From f14db21745e1e149e03ad029ce9a3e96208d979d Mon Sep 17 00:00:00 2001
From: Icecream95 <ixn@keemail.me>
Date: Sun, 17 May 2020 19:52:23 +1200
Subject: [PATCH 0001/2859] Make disableShadowsForStateSet a no-op when shadows
 are disabled

Otherwise the GPU has to do useless shadow comparisons when shadows
are disabled.
---
 components/sceneutil/shadow.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/components/sceneutil/shadow.cpp b/components/sceneutil/shadow.cpp
index a1cd1d660b..8c564f2249 100644
--- a/components/sceneutil/shadow.cpp
+++ b/components/sceneutil/shadow.cpp
@@ -69,6 +69,9 @@ namespace SceneUtil
 
     void ShadowManager::disableShadowsForStateSet(osg::ref_ptr<osg::StateSet> stateset)
     {
+        if (!Settings::Manager::getBool("enable shadows", "Shadows"))
+            return;
+
         int numberOfShadowMapsPerLight = Settings::Manager::getInt("number of shadow maps", "Shadows");
         numberOfShadowMapsPerLight = std::max(1, std::min(numberOfShadowMapsPerLight, 8));
 

From dee91d12c2ee9633a20e37c4beb1a54982bad95d Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 13 Nov 2020 16:26:08 +0100
Subject: [PATCH 0002/2859] Update .travis.yml

---
 .travis.yml | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2f457798a7..fb029fcf39 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,13 +2,7 @@ language: cpp
 branches:
   only:
     - master
-    - coverity_scan
     - /openmw-.*$/
-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: "jybGzAdUbqt9vWR/GEnRd96BgAi/7Zd1+2HK68j/i/8+/1YH2XxLOy4Jv/DUBhBlJIkxs/Xv8dRcUlFOclZDHX1d/9Qnsqd3oUVkD7k1y7cTOWy9TBQaE/v/kZo3LpzA3xPwwthrb0BvqIbOfIELi5fS5s8ba85WFRg3AX70wWE="
 cache: ccache
 addons:
   apt:
@@ -27,28 +21,17 @@ addons:
       # The other ones from OpenMW ppa
       libbullet-dev, libopenscenegraph-dev, libmygui-dev
     ]
-  coverity_scan:  # TODO: currently takes too long, disabled openmw/openmw-cs for now.
-    project:
-      name: "OpenMW/openmw"
-      description: "<Your project description here>"
-    branch_pattern: coverity_scan
-    notification_email: 1122069+psi29a@users.noreply.github.com
-    build_command_prepend: "cov-configure --comptype gcc --compiler gcc-5 --template; cmake . -DBUILD_OPENMW=FALSE -DBUILD_OPENCS=FALSE"
-    build_command: "make VERBOSE=1 -j3"
 matrix:
   include:
     - name: OpenMW (all) on MacOS 10.15 with Xcode 11.6
       os: osx
       osx_image: xcode11.6
-      if: branch != coverity_scan
     - name: OpenMW (all) on Ubuntu Focal with GCC
       os: linux
       dist: focal
-      if: branch != coverity_scan
     - name: OpenMW (tests only) on Ubuntu Focal with GCC
       os: linux
       dist: focal
-      if: branch != coverity_scan
       env:
         - BUILD_TESTS_ONLY: 1
     - name: OpenMW (openmw) on Ubuntu Focal with Clang's Static Analysis
@@ -57,16 +40,7 @@ matrix:
       env:
         - MATRIX_EVAL="CC=clang && CXX=clang++"
         - ANALYZE="scan-build --force-analyze-debug-code --use-cc clang --use-c++ clang++"
-      if: branch != coverity_scan
       compiler: clang
-    - name: OpenMW Components Coverity Scan
-      os: linux
-      dist: focal
-      if: branch = coverity_scan
-#   allow_failures:
-#    - name: OpenMW (openmw) on Ubuntu Focal with GCC-10
-#      env:
-#        - MATRIX_EVAL="CC=gcc-10 && CXX=g++-10"
 
 before_install:
     - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then eval "${MATRIX_EVAL}"; fi

From df2ae6e86651935c4c3c95bec84bedcb9d011230 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 13 Nov 2020 16:29:11 +0100
Subject: [PATCH 0003/2859] Update .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index fb029fcf39..8ec35a6713 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 language: cpp
+dist: focal
 branches:
   only:
     - master
@@ -8,7 +9,6 @@ addons:
   apt:
     sources:
       - sourceline: 'ppa:openmw/openmw'
-      # - ubuntu-toolchain-r-test  # for GCC-10
     packages: [
       # Dev
       build-essential, cmake, clang-tools, ccache,

From e15716eb0c09dcaa834a99982c169042feaa9bc7 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 13 Nov 2020 16:38:53 +0100
Subject: [PATCH 0004/2859] Update .travis.yml

---
 .travis.yml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8ec35a6713..956997f25d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 language: cpp
+os: [ linux, osx ]
 dist: focal
 branches:
   only:
@@ -17,7 +18,7 @@ addons:
       # FFmpeg
       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
+      libsdl2-dev, libqt5opengl5-dev, libopenal-dev, libunshield-dev, libtinyxml-dev, liblz4-dev,
       # The other ones from OpenMW ppa
       libbullet-dev, libopenscenegraph-dev, libmygui-dev
     ]
@@ -44,17 +45,17 @@ matrix:
 
 before_install:
     - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then eval "${MATRIX_EVAL}"; fi
-    - if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then ./CI/before_install.${TRAVIS_OS_NAME}.sh; fi
+    - ./CI/before_install.${TRAVIS_OS_NAME}.sh
 before_script:
     - ccache -z
-    - if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then ./CI/before_script.${TRAVIS_OS_NAME}.sh; fi
+    -  ./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}" = "osx" ]; then ../CI/check_package.osx.sh; fi
- - if [ "${COVERITY_SCAN_BRANCH}" != 1 ] && [ "${TRAVIS_OS_NAME}" = "linux" ] && [ "${BUILD_TESTS_ONLY}" ]; then ./openmw_test_suite; fi
- - if [ "${COVERITY_SCAN_BRANCH}" != 1 ] && [ "${TRAVIS_OS_NAME}" = "linux" ]; then cd .. && ./CI/check_tabs.sh; fi
+ - ${ANALYZE} make -j3;
+ - 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:

From 8b0475037d30453dad616ca69be3b090331c0bd7 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 13 Nov 2020 16:42:10 +0100
Subject: [PATCH 0005/2859] Update .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 956997f25d..54ef006981 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,7 +48,7 @@ before_install:
     - ./CI/before_install.${TRAVIS_OS_NAME}.sh
 before_script:
     - ccache -z
-    -  ./CI/before_script.${TRAVIS_OS_NAME}.sh
+    - ./CI/before_script.${TRAVIS_OS_NAME}.sh
 script:
  - cd ./build
  - ${ANALYZE} make -j3;

From 68836aa0fd35a8c3938177a16d197ca9d5d4224d Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 13 Nov 2020 16:44:06 +0100
Subject: [PATCH 0006/2859] Update .travis.yml

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 54ef006981..e84a9ad712 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,4 @@
 language: cpp
-os: [ linux, osx ]
-dist: focal
 branches:
   only:
     - master

From 8a6d3d1b4f2836e09d663354a4074d8bdce0e46d Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Fri, 13 Nov 2020 22:53:12 +0300
Subject: [PATCH 0007/2859] Minor fixes

Fix extra semicolon
Disable collision avoidance if AI is disabled
---
 apps/openmw/mwmechanics/actors.cpp | 3 +++
 components/nifosg/controller.hpp   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 8f3675ef7e..047741baca 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1731,6 +1731,9 @@ namespace MWMechanics
 
     void Actors::predictAndAvoidCollisions()
     {
+        if (!MWBase::Environment::get().getMechanicsManager()->isAIActive())
+            return;
+
         const float minGap = 10.f;
         const float maxDistForPartialAvoiding = 200.f;
         const float maxDistForStrictAvoiding = 100.f;
diff --git a/components/nifosg/controller.hpp b/components/nifosg/controller.hpp
index a29fabefd0..996e4ef979 100644
--- a/components/nifosg/controller.hpp
+++ b/components/nifosg/controller.hpp
@@ -83,7 +83,7 @@ namespace NifOsg
                 mLastLowKey = mKeys->mKeys.end();
                 mLastHighKey = mKeys->mKeys.end();
             }
-        };
+        }
 
         ValueInterpolator(std::shared_ptr<const MapT> keys, ValueT defaultVal = ValueT())
             : mKeys(keys)

From 117697ea227933cf8c3a6c4b784bc8d659991559 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sat, 14 Nov 2020 01:12:32 +0300
Subject: [PATCH 0008/2859] Fix NiStringPalette loading

---
 components/nif/data.cpp | 16 ++--------------
 components/nif/data.hpp |  2 +-
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/components/nif/data.cpp b/components/nif/data.cpp
index 1eb5c40fe6..235825e4a6 100644
--- a/components/nif/data.cpp
+++ b/components/nif/data.cpp
@@ -460,21 +460,9 @@ void NiPalette::read(NIFStream *nif)
 
 void NiStringPalette::read(NIFStream *nif)
 {
-    unsigned int size = nif->getUInt();
-    if (!size)
-        return;
-    std::vector<char> source;
-    nif->getChars(source, size);
-    if (nif->getUInt() != size)
+    palette = nif->getString();
+    if (nif->getUInt() != palette.size())
         nif->file->warn("Failed size check in NiStringPalette");
-    if (source[source.size()-1] != '\0')
-        source.emplace_back('\0');
-    const char* buffer = source.data();
-    while (static_cast<size_t>(buffer - source.data()) < source.size())
-    {
-        palette.emplace_back(buffer);
-        buffer += palette.back().size() + 1;
-    }
 }
 
 void NiBoolData::read(NIFStream *nif)
diff --git a/components/nif/data.hpp b/components/nif/data.hpp
index 4d13afb9d0..35f329573e 100644
--- a/components/nif/data.hpp
+++ b/components/nif/data.hpp
@@ -262,7 +262,7 @@ public:
 
 struct NiStringPalette : public Record
 {
-    std::vector<std::string> palette;
+    std::string palette;
     void read(NIFStream *nif) override;
 };
 

From 89d73c5fc74ecc1a2f8c4b807f06967d5e83a960 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Sat, 14 Nov 2020 02:04:46 +0000
Subject: [PATCH 0009/2859] Only reroute stdout etc. to new console if not
 already redirected

This should fix the issue where Windows Release builds (compiled as
/SUBSYSTEM:WINDOWS instead of /SUBSYSTEM:CONSOLE) can't have their
output redirected.

Basically, a console application creates a console if not given one, so
you get a console window behind OpenMW while it's running. It was
decided that this was ugly, so we set Release builds to be windows
applications, which don't get an automatic console and don't
automatically connect to a console if given one anyway.

Of course, we still wanted to actually be able to print to a console if
given one, so we manually attach to the parent process' console if it
exists, then reopen the standard streams connected to CON, the Windows
pseudo-file representing the current console.

This is a little like connecting a second wire into a dumb terminal in
that you're pumping characters into the display rather than onto a
pipeline, so output can't be redirected.

It turns out, though, that if a /SUBSYSTEM:WINDOWS application has its
standard streams redirected by the calling process, it still gets its
handles as normal, so everything starts off connected just how we want
it and we were clobbering this good setup with the straight-to-console
fix.

All we need to do to fix that is check if we've got valid standard
handles and that they go somewhere useful, and if so, avoid reopening
them once the console is attached. Simples.
---
 components/debug/debugging.cpp | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/components/debug/debugging.cpp b/components/debug/debugging.cpp
index dfed077e37..c4f3af3072 100644
--- a/components/debug/debugging.cpp
+++ b/components/debug/debugging.cpp
@@ -11,11 +11,22 @@
 namespace Debug
 {
 #ifdef _WIN32
+    bool isRedirected(DWORD nStdHandle)
+    {
+        DWORD fileType = GetFileType(GetStdHandle(nStdHandle));
+
+        return (fileType == FILE_TYPE_DISK) || (fileType == FILE_TYPE_PIPE);
+    }
+
     bool attachParentConsole()
     {
         if (GetConsoleWindow() != nullptr)
             return true;
 
+        bool inRedirected = isRedirected(STD_INPUT_HANDLE);
+        bool outRedirected = isRedirected(STD_OUTPUT_HANDLE);
+        bool errRedirected = isRedirected(STD_ERROR_HANDLE);
+
         if (AttachConsole(ATTACH_PARENT_PROCESS))
         {
             fflush(stdout);
@@ -24,12 +35,21 @@ namespace Debug
             std::cerr.flush();
 
             // this looks dubious but is really the right way
-            _wfreopen(L"CON", L"w", stdout);
-            _wfreopen(L"CON", L"w", stderr);
-            _wfreopen(L"CON", L"r", stdin);
-            freopen("CON", "w", stdout);
-            freopen("CON", "w", stderr);
-            freopen("CON", "r", stdin);
+            if (!inRedirected)
+            {
+                _wfreopen(L"CON", L"r", stdin);
+                freopen("CON", "r", stdin);
+            }
+            if (!outRedirected)
+            {
+                _wfreopen(L"CON", L"w", stdout);
+                freopen("CON", "w", stdout);
+            }
+            if (!errRedirected)
+            {
+                _wfreopen(L"CON", L"w", stderr);
+                freopen("CON", "w", stderr);
+            }
 
             return true;
         }

From df9667e92348a9fadb4615c911ef54ef266ee05a Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sat, 14 Nov 2020 03:42:15 +0300
Subject: [PATCH 0010/2859] Read NIF bounding volume data correctly

---
 .../nifloader/testbulletnifloader.cpp         |  66 ++++++----
 components/nif/node.hpp                       | 124 ++++++++++++++++--
 components/nifbullet/bulletnifloader.cpp      |  27 +++-
 components/nifbullet/bulletnifloader.hpp      |   4 +-
 4 files changed, 178 insertions(+), 43 deletions(-)

diff --git a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
index 72dcd30664..7da8f0fd5b 100644
--- a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
+++ b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
@@ -373,6 +373,7 @@ namespace
     TEST_F(TestBulletNifLoader, for_zero_num_roots_should_return_default)
     {
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(0));
+        EXPECT_CALL(mNifFile, getFilename()).WillOnce(Return("test.nif"));
         const auto result = mLoader.load(mNifFile);
 
         Resource::BulletShape expected;
@@ -422,11 +423,13 @@ namespace
     {
         mNode.hasBounds = true;
         mNode.flags |= Nif::NiNode::Flag_BBoxCollision;
-        mNode.boundXYZ = osg::Vec3f(1, 2, 3);
-        mNode.boundPos = osg::Vec3f(-1, -2, -3);
+        mNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
+        mNode.bounds.box.extents = osg::Vec3f(1, 2, 3);
+        mNode.bounds.box.center = osg::Vec3f(-1, -2, -3);
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
         EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNode));
+        EXPECT_CALL(mNifFile, getFilename()).WillOnce(Return("test.nif"));
         const auto result = mLoader.load(mNifFile);
 
         Resource::BulletShape expected;
@@ -444,12 +447,14 @@ namespace
     {
         mNode.hasBounds = true;
         mNode.flags |= Nif::NiNode::Flag_BBoxCollision;
-        mNode.boundXYZ = osg::Vec3f(1, 2, 3);
-        mNode.boundPos = osg::Vec3f(-1, -2, -3);
+        mNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
+        mNode.bounds.box.extents = osg::Vec3f(1, 2, 3);
+        mNode.bounds.box.center = osg::Vec3f(-1, -2, -3);
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNode)}));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
         EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiNode));
+        EXPECT_CALL(mNifFile, getFilename()).WillOnce(Return("test.nif"));
         const auto result = mLoader.load(mNifFile);
 
         Resource::BulletShape expected;
@@ -467,16 +472,19 @@ namespace
     {
         mNode.hasBounds = true;
         mNode.flags |= Nif::NiNode::Flag_BBoxCollision;
-        mNode.boundXYZ = osg::Vec3f(1, 2, 3);
-        mNode.boundPos = osg::Vec3f(-1, -2, -3);
+        mNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
+        mNode.bounds.box.extents = osg::Vec3f(1, 2, 3);
+        mNode.bounds.box.center = osg::Vec3f(-1, -2, -3);
 
         mNiNode.hasBounds = true;
-        mNiNode.boundXYZ = osg::Vec3f(4, 5, 6);
-        mNiNode.boundPos = osg::Vec3f(-4, -5, -6);
+        mNiNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
+        mNiNode.bounds.box.extents = osg::Vec3f(4, 5, 6);
+        mNiNode.bounds.box.center = osg::Vec3f(-4, -5, -6);
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNode)}));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
         EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiNode));
+        EXPECT_CALL(mNifFile, getFilename()).WillOnce(Return("test.nif"));
         const auto result = mLoader.load(mNifFile);
 
         Resource::BulletShape expected;
@@ -494,20 +502,24 @@ namespace
     {
         mNode.hasBounds = true;
         mNode.flags |= Nif::NiNode::Flag_BBoxCollision;
-        mNode.boundXYZ = osg::Vec3f(1, 2, 3);
-        mNode.boundPos = osg::Vec3f(-1, -2, -3);
+        mNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
+        mNode.bounds.box.extents = osg::Vec3f(1, 2, 3);
+        mNode.bounds.box.center = osg::Vec3f(-1, -2, -3);
 
         mNode2.hasBounds = true;
-        mNode2.boundXYZ = osg::Vec3f(4, 5, 6);
-        mNode2.boundPos = osg::Vec3f(-4, -5, -6);
+        mNode2.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
+        mNode2.bounds.box.extents = osg::Vec3f(4, 5, 6);
+        mNode2.bounds.box.center = osg::Vec3f(-4, -5, -6);
 
         mNiNode.hasBounds = true;
-        mNiNode.boundXYZ = osg::Vec3f(7, 8, 9);
-        mNiNode.boundPos = osg::Vec3f(-7, -8, -9);
+        mNiNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
+        mNiNode.bounds.box.extents = osg::Vec3f(7, 8, 9);
+        mNiNode.bounds.box.center = osg::Vec3f(-7, -8, -9);
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNode), Nif::NodePtr(&mNode2)}));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
         EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiNode));
+        EXPECT_CALL(mNifFile, getFilename()).WillOnce(Return("test.nif"));
         const auto result = mLoader.load(mNifFile);
 
         Resource::BulletShape expected;
@@ -524,21 +536,25 @@ namespace
     TEST_F(TestBulletNifLoader, for_root_and_two_children_where_both_with_bounds_but_only_second_with_flag_should_use_second_bounds)
     {
         mNode.hasBounds = true;
-        mNode.boundXYZ = osg::Vec3f(1, 2, 3);
-        mNode.boundPos = osg::Vec3f(-1, -2, -3);
+        mNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
+        mNode.bounds.box.extents = osg::Vec3f(1, 2, 3);
+        mNode.bounds.box.center = osg::Vec3f(-1, -2, -3);
 
         mNode2.hasBounds = true;
         mNode2.flags |= Nif::NiNode::Flag_BBoxCollision;
-        mNode2.boundXYZ = osg::Vec3f(4, 5, 6);
-        mNode2.boundPos = osg::Vec3f(-4, -5, -6);
+        mNode2.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
+        mNode2.bounds.box.extents = osg::Vec3f(4, 5, 6);
+        mNode2.bounds.box.center = osg::Vec3f(-4, -5, -6);
 
         mNiNode.hasBounds = true;
-        mNiNode.boundXYZ = osg::Vec3f(7, 8, 9);
-        mNiNode.boundPos = osg::Vec3f(-7, -8, -9);
+        mNiNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
+        mNiNode.bounds.box.extents = osg::Vec3f(7, 8, 9);
+        mNiNode.bounds.box.center = osg::Vec3f(-7, -8, -9);
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNode), Nif::NodePtr(&mNode2)}));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
         EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiNode));
+        EXPECT_CALL(mNifFile, getFilename()).WillOnce(Return("test.nif"));
         const auto result = mLoader.load(mNifFile);
 
         Resource::BulletShape expected;
@@ -555,8 +571,9 @@ namespace
     TEST_F(TestBulletNifLoader, for_root_nif_node_with_bounds_but_without_flag_should_return_shape_with_bounds_but_with_null_collision_shape)
     {
         mNode.hasBounds = true;
-        mNode.boundXYZ = osg::Vec3f(1, 2, 3);
-        mNode.boundPos = osg::Vec3f(-1, -2, -3);
+        mNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
+        mNode.bounds.box.extents = osg::Vec3f(1, 2, 3);
+        mNode.bounds.box.center = osg::Vec3f(-1, -2, -3);
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
         EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNode));
@@ -588,8 +605,9 @@ namespace
     TEST_F(TestBulletNifLoader, for_tri_shape_root_node_with_bounds_should_return_shape_with_bounds_but_with_null_collision_shape)
     {
         mNiTriShape.hasBounds = true;
-        mNiTriShape.boundXYZ = osg::Vec3f(1, 2, 3);
-        mNiTriShape.boundPos = osg::Vec3f(-1, -2, -3);
+        mNiTriShape.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
+        mNiTriShape.bounds.box.extents = osg::Vec3f(1, 2, 3);
+        mNiTriShape.bounds.box.center = osg::Vec3f(-1, -2, -3);
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
         EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiTriShape));
diff --git a/components/nif/node.hpp b/components/nif/node.hpp
index 72adfe06cd..0b958d2c25 100644
--- a/components/nif/node.hpp
+++ b/components/nif/node.hpp
@@ -16,6 +16,117 @@ namespace Nif
 
 struct NiNode;
 
+struct NiBoundingVolume
+{
+    enum Type
+    {
+        SPHERE_BV = 0,
+        BOX_BV = 1,
+        CAPSULE_BV = 2,
+        LOZENGE_BV = 3,
+        UNION_BV = 4,
+        HALFSPACE_BV = 5
+    };
+
+    struct NiSphereBV
+    {
+        osg::Vec3f center;
+        float radius{0.f};
+    };
+
+    struct NiBoxBV
+    {
+        osg::Vec3f center;
+        Matrix3 axis;
+        osg::Vec3f extents;
+    };
+
+    struct NiCapsuleBV
+    {
+        osg::Vec3f center, axis;
+        float extent{0.f}, radius{0.f};
+    };
+
+    struct NiLozengeBV
+    {
+        float radius{0.f}, extent0{0.f}, extent1{0.f};
+        osg::Vec3f center, axis0, axis1;
+    };
+
+    struct NiHalfSpaceBV
+    {
+        osg::Vec3f center, normal;
+    };
+
+    unsigned int type;
+    NiSphereBV sphere;
+    NiBoxBV box;
+    NiCapsuleBV capsule;
+    NiLozengeBV lozenge;
+    std::vector<NiBoundingVolume> children;
+    NiHalfSpaceBV plane;
+    void read(NIFStream* nif)
+    {
+        type = nif->getUInt();
+        switch (type)
+        {
+            case SPHERE_BV:
+            {
+                sphere.center = nif->getVector3();
+                sphere.radius = nif->getFloat();
+                break;
+            }
+            case BOX_BV:
+            {
+                box.center = nif->getVector3();
+                box.axis = nif->getMatrix3();
+                box.extents = nif->getVector3();
+                break;
+            }
+            case CAPSULE_BV:
+            {
+                capsule.center = nif->getVector3();
+                capsule.axis = nif->getVector3();
+                capsule.extent = nif->getFloat();
+                capsule.radius = nif->getFloat();
+                break;
+            }
+            case LOZENGE_BV:
+            {
+                lozenge.radius = nif->getFloat();
+                lozenge.extent0 = nif->getFloat();
+                lozenge.extent1 = nif->getFloat();
+                lozenge.center = nif->getVector3();
+                lozenge.axis0 = nif->getVector3();
+                lozenge.axis1 = nif->getVector3();
+                break;
+            }
+            case UNION_BV:
+            {
+                unsigned int numChildren = nif->getUInt();
+                if (numChildren == 0)
+                    break;
+                children.resize(numChildren);
+                for (NiBoundingVolume& child : children)
+                    child.read(nif);
+                break;
+            }
+            case HALFSPACE_BV:
+            {
+                plane.center = nif->getVector3();
+                plane.normal = nif->getVector3();
+                break;
+            }
+            default:
+            {
+                std::stringstream error;
+                error << "Unhandled NiBoundingVolume type: " << type;
+                nif->file->fail(error.str());
+            }
+        }
+    }
+};
+
 /** A Node is an object that's part of the main NIF tree. It has
     parent node (unless it's the root), and transformation (location
     and rotation) relative to it's parent.
@@ -31,9 +142,7 @@ public:
 
     // Bounding box info
     bool hasBounds{false};
-    osg::Vec3f boundPos;
-    Matrix3 boundRot;
-    osg::Vec3f boundXYZ; // Box size
+    NiBoundingVolume bounds;
 
     void read(NIFStream *nif) override
     {
@@ -48,13 +157,8 @@ public:
 
         if (nif->getVersion() <= NIFStream::generateVersion(4,2,2,0))
             hasBounds = nif->getBoolean();
-        if(hasBounds)
-        {
-            nif->getInt(); // always 1
-            boundPos = nif->getVector3();
-            boundRot = nif->getMatrix3();
-            boundXYZ = nif->getVector3();
-        }
+        if (hasBounds)
+            bounds.read(nif);
         // Reference to the collision object in Gamebryo files.
         if (nif->getVersion() >= NIFStream::generateVersion(10,0,1,0))
             nif->skip(4);
diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index 5b531121ee..b1461e5367 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -132,13 +132,14 @@ osg::ref_ptr<Resource::BulletShape> BulletNifLoader::load(const Nif::File& nif)
         if ((node = dynamic_cast<Nif::Node*>(r)))
             break;
     }
+    const std::string filename = nif.getFilename();
     if (!node)
     {
-        warn("Found no root nodes in NIF.");
+        warn("Found no root nodes in NIF file " + filename);
         return mShape;
     }
 
-    if (findBoundingBox(node))
+    if (findBoundingBox(node, filename))
     {
         const btVector3 halfExtents = Misc::Convert::toBullet(mShape->mCollisionBoxHalfExtents);
         const btVector3 origin = Misc::Convert::toBullet(mShape->mCollisionBoxTranslate);
@@ -158,7 +159,6 @@ osg::ref_ptr<Resource::BulletShape> BulletNifLoader::load(const Nif::File& nif)
 
         // files with the name convention xmodel.nif usually have keyframes stored in a separate file xmodel.kf (see Animation::addAnimSource).
         // assume all nodes in the file will be animated
-        const auto filename = nif.getFilename();
         const bool isAnimated = pathFileNameStartsWithX(filename);
 
         handleNode(filename, node, 0, autogenerated, isAnimated, autogenerated);
@@ -194,12 +194,25 @@ osg::ref_ptr<Resource::BulletShape> BulletNifLoader::load(const Nif::File& nif)
 
 // Find a boundingBox in the node hierarchy.
 // Return: use bounding box for collision?
-bool BulletNifLoader::findBoundingBox(const Nif::Node* node)
+bool BulletNifLoader::findBoundingBox(const Nif::Node* node, const std::string& filename)
 {
     if (node->hasBounds)
     {
-        mShape->mCollisionBoxHalfExtents = node->boundXYZ;
-        mShape->mCollisionBoxTranslate = node->boundPos;
+        unsigned int type = node->bounds.type;
+        switch (type)
+        {
+            case Nif::NiBoundingVolume::Type::BOX_BV:
+                mShape->mCollisionBoxHalfExtents = node->bounds.box.extents;
+                mShape->mCollisionBoxTranslate = node->bounds.box.center;
+                break;
+            default:
+            {
+                std::stringstream warning;
+                warning << "Unsupported NiBoundingVolume type " << type << " in node " << node->recIndex;
+                warning << " in file " << filename;
+                warn(warning.str());
+            }
+        }
 
         if (node->flags & Nif::NiNode::Flag_BBoxCollision)
         {
@@ -215,7 +228,7 @@ bool BulletNifLoader::findBoundingBox(const Nif::Node* node)
         {
             if(!list[i].empty())
             {
-                bool found = findBoundingBox (list[i].getPtr());
+                bool found = findBoundingBox (list[i].getPtr(), filename);
                 if (found)
                     return true;
             }
diff --git a/components/nifbullet/bulletnifloader.hpp b/components/nifbullet/bulletnifloader.hpp
index e423e51496..054b33fedb 100644
--- a/components/nifbullet/bulletnifloader.hpp
+++ b/components/nifbullet/bulletnifloader.hpp
@@ -40,7 +40,7 @@ class BulletNifLoader
 public:
     void warn(const std::string &msg)
     {
-        Log(Debug::Warning) << "NIFLoader: Warn:" << msg;
+        Log(Debug::Warning) << "NIFLoader: Warn: " << msg;
     }
 
     void fail(const std::string &msg)
@@ -52,7 +52,7 @@ public:
     osg::ref_ptr<Resource::BulletShape> load(const Nif::File& file);
 
 private:
-    bool findBoundingBox(const Nif::Node* node);
+    bool findBoundingBox(const Nif::Node* node, const std::string& filename);
 
     void handleNode(const std::string& fileName, Nif::Node const *node, int flags, bool isCollisionNode,
                     bool isAnimated=false, bool autogenerated=false, bool avoid=false);

From e5fa457fe7bcd4d346b8d10c33e4ee6601bac37b Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sun, 1 Nov 2020 17:14:59 +0100
Subject: [PATCH 0011/2859] Properly account for interleaved move of actors.

Before this change, if an actor position was changed while the physics
simulation was running, the simulation result would be discarded. It is
fine in case of one off event such as teleport, but in the case of
scripts making use of this functionality to make lifts or conveyor (such
as Sotha Sil Expanded mod) it broke actor movement.

To alleviate this issue, at the end of the simulation, the position of the Actor
in the world is compared to the position it had at the beginning of the
simulation. A difference indicate a force move occured. In this case,
the Actor mPosition and mPreviousPosition are translated by the difference of position.

Since the Actor position will be really set while the next simulation runs, we
save it in the mNextPosition field.
---
 apps/openmw/mwphysics/actor.cpp               | 90 ++++++++-----------
 apps/openmw/mwphysics/actor.hpp               | 19 ++--
 apps/openmw/mwphysics/mtphysics.cpp           | 53 +++++------
 apps/openmw/mwphysics/mtphysics.hpp           |  1 -
 apps/openmw/mwphysics/physicssystem.cpp       |  7 +-
 apps/openmw/mwphysics/physicssystem.hpp       |  3 +-
 .../mwscript/transformationextensions.cpp     |  6 +-
 apps/openmw/mwworld/worldimp.cpp              |  6 +-
 8 files changed, 91 insertions(+), 94 deletions(-)

diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index 5caaba5c9b..760e21cce1 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -75,9 +75,10 @@ Actor::Actor(const MWWorld::Ptr& ptr, const Resource::BulletShape* shape, Physic
     updateRotation();
     updateScale();
     updatePosition();
+    setPosition(mWorldPosition, true);
 
     addCollisionMask(getCollisionMask());
-    commitPositionChange();
+    updateCollisionObjectPosition();
 }
 
 Actor::~Actor()
@@ -122,88 +123,77 @@ int Actor::getCollisionMask() const
 
 void Actor::updatePosition()
 {
-    std::unique_lock<std::mutex> lock(mPositionMutex);
-    osg::Vec3f position = mPtr.getRefData().getPosition().asVec3();
+    std::scoped_lock lock(mPositionMutex);
+    mWorldPosition = mPtr.getRefData().getPosition().asVec3();
+}
 
-    mPosition = position;
-    mPreviousPosition = position;
+osg::Vec3f Actor::getWorldPosition() const
+{
+    std::scoped_lock lock(mPositionMutex);
+    return mWorldPosition;
+}
 
-    mTransformUpdatePending = true;
-    updateCollisionObjectPosition();
+void Actor::setNextPosition(const osg::Vec3f& position)
+{
+    mNextPosition = position;
+}
+
+osg::Vec3f Actor::getNextPosition() const
+{
+    return mNextPosition;
 }
 
 void Actor::updateCollisionObjectPosition()
 {
+    std::scoped_lock lock(mPositionMutex);
+    mShape->setLocalScaling(Misc::Convert::toBullet(mScale));
     osg::Vec3f scaledTranslation = mRotation * osg::componentMultiply(mMeshTranslation, mScale);
     osg::Vec3f newPosition = scaledTranslation + mPosition;
     mLocalTransform.setOrigin(Misc::Convert::toBullet(newPosition));
     mLocalTransform.setRotation(Misc::Convert::toBullet(mRotation));
-
-}
-
-void Actor::commitPositionChange()
-{
-    std::unique_lock<std::mutex> lock(mPositionMutex);
-    if (mScaleUpdatePending)
-    {
-        mShape->setLocalScaling(Misc::Convert::toBullet(mScale));
-        mScaleUpdatePending = false;
-    }
-    if (mTransformUpdatePending)
-    {
-        mCollisionObject->setWorldTransform(mLocalTransform);
-        mTransformUpdatePending = false;
-    }
+    mCollisionObject->setWorldTransform(mLocalTransform);
 }
 
 osg::Vec3f Actor::getCollisionObjectPosition() const
 {
-    std::unique_lock<std::mutex> lock(mPositionMutex);
+    std::scoped_lock lock(mPositionMutex);
     return Misc::Convert::toOsg(mLocalTransform.getOrigin());
 }
 
-void Actor::setPosition(const osg::Vec3f &position, bool updateCollisionObject)
+void Actor::setPosition(const osg::Vec3f& position, bool reset)
 {
-    std::unique_lock<std::mutex> lock(mPositionMutex);
-    if (mTransformUpdatePending)
+    if (reset)
     {
-        mCollisionObject->setWorldTransform(mLocalTransform);
-        mTransformUpdatePending = false;
+        mPreviousPosition = position;
+        mNextPosition = position;
     }
     else
-    {
         mPreviousPosition = mPosition;
+    mPosition = position;
+}
 
-        mPosition = position;
-        if (updateCollisionObject)
-        {
-            updateCollisionObjectPosition();
-            mCollisionObject->setWorldTransform(mLocalTransform);
-        }
-    }
+void Actor::adjustPosition(const osg::Vec3f& offset)
+{
+    mPosition += offset;
+    mPreviousPosition += offset;
 }
 
 osg::Vec3f Actor::getPosition() const
 {
-    std::unique_lock<std::mutex> lock(mPositionMutex);
     return mPosition;
 }
 
 osg::Vec3f Actor::getPreviousPosition() const
 {
-    std::unique_lock<std::mutex> lock(mPositionMutex);
     return mPreviousPosition;
 }
 
 void Actor::updateRotation ()
 {
-    std::unique_lock<std::mutex> lock(mPositionMutex);
+    std::scoped_lock lock(mPositionMutex);
     if (mRotation == mPtr.getRefData().getBaseNode()->getAttitude())
         return;
     mRotation = mPtr.getRefData().getBaseNode()->getAttitude();
-
-    mTransformUpdatePending = true;
-    updateCollisionObjectPosition();
 }
 
 bool Actor::isRotationallyInvariant() const
@@ -213,37 +203,33 @@ bool Actor::isRotationallyInvariant() const
 
 void Actor::updateScale()
 {
-    std::unique_lock<std::mutex> lock(mPositionMutex);
+    std::scoped_lock lock(mPositionMutex);
     float scale = mPtr.getCellRef().getScale();
     osg::Vec3f scaleVec(scale,scale,scale);
 
     mPtr.getClass().adjustScale(mPtr, scaleVec, false);
     mScale = scaleVec;
-    mScaleUpdatePending = true;
 
     scaleVec = osg::Vec3f(scale,scale,scale);
     mPtr.getClass().adjustScale(mPtr, scaleVec, true);
     mRenderingScale = scaleVec;
-
-    mTransformUpdatePending = true;
-    updateCollisionObjectPosition();
 }
 
 osg::Vec3f Actor::getHalfExtents() const
 {
-    std::unique_lock<std::mutex> lock(mPositionMutex);
+    std::scoped_lock lock(mPositionMutex);
     return osg::componentMultiply(mHalfExtents, mScale);
 }
 
 osg::Vec3f Actor::getOriginalHalfExtents() const
 {
-    std::unique_lock<std::mutex> lock(mPositionMutex);
+    std::scoped_lock lock(mPositionMutex);
     return mHalfExtents;
 }
 
 osg::Vec3f Actor::getRenderingHalfExtents() const
 {
-    std::unique_lock<std::mutex> lock(mPositionMutex);
+    std::scoped_lock lock(mPositionMutex);
     return osg::componentMultiply(mHalfExtents, mRenderingScale);
 }
 
@@ -274,7 +260,7 @@ void Actor::setWalkingOnWater(bool walkingOnWater)
 
 void Actor::setCanWaterWalk(bool waterWalk)
 {
-    std::unique_lock<std::mutex> lock(mPositionMutex);
+    std::scoped_lock lock(mPositionMutex);
     if (waterWalk != mCanWaterWalk)
     {
         mCanWaterWalk = waterWalk;
diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index ef7b368b99..00ba162afd 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -57,13 +57,20 @@ namespace MWPhysics
         bool isRotationallyInvariant() const;
 
         /**
-         * Set mPosition and mPreviousPosition to the position in the Ptr's RefData. This should be used
+         * Set mWorldPosition to the position in the Ptr's RefData. This is used by the physics simulation to account for 
          * when an object is "instantly" moved/teleported as opposed to being moved by the physics simulation.
          */
         void updatePosition();
+        osg::Vec3f getWorldPosition() const;
+
+        /**
+        * Used by the physics simulation to store the simulation result. Used in conjunction with mWorldPosition
+        * to account for e.g. scripted movements
+        */
+        void setNextPosition(const osg::Vec3f& position);
+        osg::Vec3f getNextPosition() const;
 
         void updateCollisionObjectPosition();
-        void commitPositionChange();
 
         /**
          * Returns the half extents of the collision body (scaled according to collision scale)
@@ -83,9 +90,9 @@ namespace MWPhysics
 
         /**
           * Store the current position into mPreviousPosition, then move to this position.
-          * Optionally, inform the physics engine about the change of position.
           */
-        void setPosition(const osg::Vec3f& position, bool updateCollisionObject=true);
+        void setPosition(const osg::Vec3f& position, bool reset=false);
+        void adjustPosition(const osg::Vec3f& offset);
 
         osg::Vec3f getPosition() const;
 
@@ -159,11 +166,11 @@ namespace MWPhysics
 
         osg::Vec3f mScale;
         osg::Vec3f mRenderingScale;
+        osg::Vec3f mWorldPosition;
+        osg::Vec3f mNextPosition;
         osg::Vec3f mPosition;
         osg::Vec3f mPreviousPosition;
         btTransform mLocalTransform;
-        bool mScaleUpdatePending;
-        bool mTransformUpdatePending;
         mutable std::mutex mPositionMutex;
 
         osg::Vec3f mForce;
diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index f105efce5e..1b99b4c3f6 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -102,9 +102,18 @@ namespace
             stats.addToFallHeight(-actorData.mFallHeight);
     }
 
-    osg::Vec3f interpolateMovements(const MWPhysics::ActorFrameData& actorData, float timeAccum, float physicsDt)
+    osg::Vec3f interpolateMovements(MWPhysics::ActorFrameData& actorData, float timeAccum, float physicsDt)
     {
         const float interpolationFactor = timeAccum / physicsDt;
+
+        // account for force change of actor's position in the main thread
+        const auto correction = actorData.mActorRaw->getWorldPosition() - actorData.mOrigin;
+        if (correction.length() != 0)
+        {
+            actorData.mActorRaw->adjustPosition(correction);
+            actorData.mPosition = actorData.mActorRaw->getPosition();
+        }
+
         return actorData.mPosition * interpolationFactor + actorData.mActorRaw->getPreviousPosition() * (1.f - interpolationFactor);
     }
 
@@ -182,7 +191,6 @@ namespace MWPhysics
 
         mPostSimBarrier = std::make_unique<Misc::Barrier>(mNumThreads, [&]()
             {
-                udpateActorsAabbs();
                 mNewFrame = false;
                 if (mLOSCacheExpiry >= 0)
                 {
@@ -229,6 +237,9 @@ namespace MWPhysics
                 updateMechanics(data);
                 if (mAdvanceSimulation)
                     updateStandingCollision(data, standingCollisions);
+
+                if (mMovementResults.find(data.mPtr) != mMovementResults.end())
+                    data.mActorRaw->setNextPosition(mMovementResults[data.mPtr]);
             }
         }
 
@@ -245,10 +256,6 @@ namespace MWPhysics
         if (mAdvanceSimulation)
             mWorldFrameData = std::make_unique<WorldFrameData>();
 
-        // update each actor position based on latest data
-        for (auto& data : mActorsFrameData)
-            data.updatePosition();
-
         // we are asked to skip the simulation (load a savegame for instance)
         // just return the actors' reference position without applying the movements
         if (skipSimulation)
@@ -256,7 +263,10 @@ namespace MWPhysics
             standingCollisions.clear();
             mMovementResults.clear();
             for (const auto& m : mActorsFrameData)
-                mMovementResults[m.mPtr] = m.mPosition;
+            {
+                m.mActorRaw->setPosition(m.mActorRaw->getWorldPosition(), true);
+                mMovementResults[m.mPtr] = m.mActorRaw->getWorldPosition();
+            }
             return mMovementResults;
         }
 
@@ -271,6 +281,11 @@ namespace MWPhysics
                 for (auto& data : mActorsFrameData)
                     updateStandingCollision(data, standingCollisions);
             }
+            for (auto& data : mActorsFrameData)
+            {
+                if (mMovementResults.find(data.mPtr) != mMovementResults.end())
+                    data.mActorRaw->setNextPosition(mMovementResults[data.mPtr]);
+            }
             return mMovementResults;
         }
 
@@ -427,7 +442,7 @@ namespace MWPhysics
         {
             if (const auto actor = std::dynamic_pointer_cast<Actor>(p))
             {
-                actor->commitPositionChange();
+                actor->updateCollisionObjectPosition();
                 mCollisionWorld->updateSingleAabb(actor->getCollisionObject());
             }
             else if (const auto object = std::dynamic_pointer_cast<Object>(p))
@@ -485,28 +500,17 @@ namespace MWPhysics
         {
             if(const auto actor = actorData.mActor.lock())
             {
-                if (actorData.mPosition == actor->getPosition())
-                    actor->setPosition(actorData.mPosition, false); // update previous position to make sure interpolation is correct
-                else
+                bool positionChanged = actorData.mPosition != actorData.mActorRaw->getPosition();
+                actorData.mActorRaw->setPosition(actorData.mPosition);
+                if (positionChanged)
                 {
-                    actorData.mPositionChanged = true;
-                    actor->setPosition(actorData.mPosition);
+                    actor->updateCollisionObjectPosition();
+                    mCollisionWorld->updateSingleAabb(actor->getCollisionObject());
                 }
             }
         }
     }
 
-    void PhysicsTaskScheduler::udpateActorsAabbs()
-    {
-        std::unique_lock lock(mCollisionWorldMutex);
-        for (const auto& actorData : mActorsFrameData)
-            if (actorData.mPositionChanged)
-            {
-                if(const auto actor = actorData.mActor.lock())
-                    mCollisionWorld->updateSingleAabb(actor->getCollisionObject());
-            }
-    }
-
     bool PhysicsTaskScheduler::hasLineOfSight(const Actor* actor1, const Actor* actor2)
     {
         btVector3 pos1  = Misc::Convert::toBullet(actor1->getCollisionObjectPosition() + osg::Vec3f(0,0,actor1->getHalfExtents().z() * 0.9)); // eye level
@@ -538,6 +542,5 @@ namespace MWPhysics
             mMovementResults[actorData.mPtr] = interpolateMovements(actorData, mTimeAccum, mPhysicsDt);
             updateMechanics(actorData);
         }
-        udpateActorsAabbs();
     }
 }
diff --git a/apps/openmw/mwphysics/mtphysics.hpp b/apps/openmw/mwphysics/mtphysics.hpp
index 100e71a907..84ea93c088 100644
--- a/apps/openmw/mwphysics/mtphysics.hpp
+++ b/apps/openmw/mwphysics/mtphysics.hpp
@@ -49,7 +49,6 @@ namespace MWPhysics
             void syncComputation();
             void worker();
             void updateActorsPositions();
-            void udpateActorsAabbs();
             bool hasLineOfSight(const Actor* actor1, const Actor* actor2);
             void refreshLOSCache();
             void updateAabbs();
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 9a777bd454..6b94ef43b6 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -883,7 +883,7 @@ namespace MWPhysics
     ActorFrameData::ActorFrameData(const std::shared_ptr<Actor>& actor, const MWWorld::Ptr character, const MWWorld::Ptr standingOn,
             bool moveToWaterSurface, osg::Vec3f movement, float slowFall, float waterlevel)
         : mActor(actor), mActorRaw(actor.get()), mStandingOn(standingOn),
-        mPositionChanged(false), mDidJump(false), mNeedLand(false), mMoveToWaterSurface(moveToWaterSurface),
+        mDidJump(false), mNeedLand(false), mMoveToWaterSurface(moveToWaterSurface),
         mWaterlevel(waterlevel), mSlowFall(slowFall), mOldHeight(0), mFallHeight(0), mMovement(movement), mPosition(), mRefpos()
     {
         const MWBase::World *world = MWBase::Environment::get().getWorld();
@@ -893,10 +893,9 @@ namespace MWPhysics
         mWantJump = mPtr.getClass().getMovementSettings(mPtr).mPosition[2] != 0;
         mIsDead = mPtr.getClass().getCreatureStats(mPtr).isDead();
         mWasOnGround = actor->getOnGround();
-    }
 
-    void ActorFrameData::updatePosition()
-    {
+        mActorRaw->updatePosition();
+        mOrigin = mActorRaw->getNextPosition();
         mPosition = mActorRaw->getPosition();
         if (mMoveToWaterSurface)
         {
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 36ef762d3e..4844b5e8ea 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -78,14 +78,12 @@ namespace MWPhysics
     struct ActorFrameData
     {
         ActorFrameData(const std::shared_ptr<Actor>& actor, const MWWorld::Ptr character, const MWWorld::Ptr standingOn, bool moveToWaterSurface, osg::Vec3f movement, float slowFall, float waterlevel);
-        void updatePosition();
         std::weak_ptr<Actor> mActor;
         Actor* mActorRaw;
         MWWorld::Ptr mPtr;
         MWWorld::Ptr mStandingOn;
         bool mFlying;
         bool mSwimming;
-        bool mPositionChanged;
         bool mWasOnGround;
         bool mWantJump;
         bool mDidJump;
@@ -97,6 +95,7 @@ namespace MWPhysics
         float mOldHeight;
         float mFallHeight;
         osg::Vec3f mMovement;
+        osg::Vec3f mOrigin;
         osg::Vec3f mPosition;
         ESM::Position mRefpos;
     };
diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index 41df1870c5..ce45729b3b 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -32,7 +32,11 @@ namespace MWScript
             std::vector<MWWorld::Ptr> actors;
             MWBase::Environment::get().getWorld()->getActorsStandingOn (ptr, actors);
             for (auto& actor : actors)
-                MWBase::Environment::get().getWorld()->queueMovement(actor, diff);
+            {
+                osg::Vec3f actorPos(actor.getRefData().getPosition().asVec3());
+                actorPos += diff;
+                MWBase::Environment::get().getWorld()->moveObject(actor, actorPos.x(), actorPos.y(), actorPos.z());
+            }
         }
 
         template<class R>
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index be32765ad4..ad6c337909 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1504,11 +1504,11 @@ namespace MWWorld
         const auto results = mPhysics->applyQueuedMovement(duration, mDiscardMovements);
         mDiscardMovements = false;
 
-        for(const auto& result : results)
+        for(const auto& [actor, position]: results)
         {
             // Handle player last, in case a cell transition occurs
-            if(result.first != getPlayerPtr())
-                moveObjectImp(result.first, result.second.x(), result.second.y(), result.second.z(), false);
+            if(actor != getPlayerPtr())
+                moveObjectImp(actor, position.x(), position.y(), position.z(), false);
         }
 
         const auto player = results.find(getPlayerPtr());

From d64ed6cf53f9d35edfd9dddc5521939db89cb4f5 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sat, 7 Nov 2020 18:30:52 +0100
Subject: [PATCH 0012/2859] Get rid of the StandingActorsMap. Just embed the
 necessary info into Actor class.

---
 apps/openmw/mwphysics/actor.cpp         | 14 ++++++-
 apps/openmw/mwphysics/actor.hpp         |  4 ++
 apps/openmw/mwphysics/mtphysics.cpp     | 25 +++---------
 apps/openmw/mwphysics/mtphysics.hpp     |  2 +-
 apps/openmw/mwphysics/physicssystem.cpp | 51 +++++++++----------------
 apps/openmw/mwphysics/physicssystem.hpp |  8 ----
 6 files changed, 40 insertions(+), 64 deletions(-)

diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index 760e21cce1..0f3d69d217 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -19,7 +19,7 @@ namespace MWPhysics
 
 
 Actor::Actor(const MWWorld::Ptr& ptr, const Resource::BulletShape* shape, PhysicsTaskScheduler* scheduler)
-  : mCanWaterWalk(false), mWalkingOnWater(false)
+  : mStandingOnPtr(nullptr), mCanWaterWalk(false), mWalkingOnWater(false)
   , mCollisionObject(nullptr), mMeshTranslation(shape->mCollisionBoxTranslate), mHalfExtents(shape->mCollisionBoxHalfExtents)
   , mForce(0.f, 0.f, 0.f), mOnGround(true), mOnSlope(false)
   , mInternalCollisionMode(true)
@@ -268,4 +268,16 @@ void Actor::setCanWaterWalk(bool waterWalk)
     }
 }
 
+MWWorld::Ptr Actor::getStandingOnPtr() const
+{
+    std::scoped_lock lock(mPositionMutex);
+    return mStandingOnPtr;
+}
+
+void Actor::setStandingOnPtr(const MWWorld::Ptr& ptr)
+{
+    std::scoped_lock lock(mPositionMutex);
+    mStandingOnPtr = ptr;
+}
+
 }
diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index 00ba162afd..6b23b31d3d 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -144,7 +144,11 @@ namespace MWPhysics
         void setWalkingOnWater(bool walkingOnWater);
         bool isWalkingOnWater() const;
 
+        MWWorld::Ptr getStandingOnPtr() const;
+        void setStandingOnPtr(const MWWorld::Ptr& ptr);
+
     private:
+        MWWorld::Ptr mStandingOnPtr;
         /// Removes then re-adds the collision object to the dynamics world
         void updateCollisionMask();
         void addCollisionMask(int collisionMask);
diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 1b99b4c3f6..ff676413bd 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -82,14 +82,6 @@ namespace
         ptr.getClass().getMovementSettings(ptr).mPosition[2] = 0;
     }
 
-    void updateStandingCollision(MWPhysics::ActorFrameData& actorData, MWPhysics::CollisionMap& standingCollisions)
-    {
-        if (!actorData.mStandingOn.isEmpty())
-            standingCollisions[actorData.mPtr] = actorData.mStandingOn;
-        else
-            standingCollisions.erase(actorData.mPtr);
-    }
-
     void updateMechanics(MWPhysics::ActorFrameData& actorData)
     {
         if (actorData.mDidJump)
@@ -215,7 +207,7 @@ namespace MWPhysics
             thread.join();
     }
 
-    const PtrPositionList& PhysicsTaskScheduler::moveActors(int numSteps, float timeAccum, std::vector<ActorFrameData>&& actorsData, CollisionMap& standingCollisions, bool skipSimulation)
+    const PtrPositionList& PhysicsTaskScheduler::moveActors(int numSteps, float timeAccum, std::vector<ActorFrameData>&& actorsData, bool skipSimulation)
     {
         // This function run in the main thread.
         // While the mSimulationMutex is held, background physics threads can't run.
@@ -225,9 +217,6 @@ namespace MWPhysics
         // start by finishing previous background computation
         if (mNumThreads != 0)
         {
-            if (mAdvanceSimulation)
-                standingCollisions.clear();
-
             for (auto& data : mActorsFrameData)
             {
                 // Ignore actors that were deleted while the background thread was running
@@ -236,7 +225,7 @@ namespace MWPhysics
 
                 updateMechanics(data);
                 if (mAdvanceSimulation)
-                    updateStandingCollision(data, standingCollisions);
+                    data.mActorRaw->setStandingOnPtr(data.mStandingOn);
 
                 if (mMovementResults.find(data.mPtr) != mMovementResults.end())
                     data.mActorRaw->setNextPosition(mMovementResults[data.mPtr]);
@@ -260,10 +249,10 @@ namespace MWPhysics
         // just return the actors' reference position without applying the movements
         if (skipSimulation)
         {
-            standingCollisions.clear();
             mMovementResults.clear();
             for (const auto& m : mActorsFrameData)
             {
+                m.mActorRaw->setStandingOnPtr(nullptr);
                 m.mActorRaw->setPosition(m.mActorRaw->getWorldPosition(), true);
                 mMovementResults[m.mPtr] = m.mActorRaw->getWorldPosition();
             }
@@ -275,14 +264,10 @@ namespace MWPhysics
             mMovementResults.clear();
             syncComputation();
 
-            if (mAdvanceSimulation)
-            {
-                standingCollisions.clear();
-                for (auto& data : mActorsFrameData)
-                    updateStandingCollision(data, standingCollisions);
-            }
             for (auto& data : mActorsFrameData)
             {
+                if (mAdvanceSimulation)
+                    data.mActorRaw->setStandingOnPtr(data.mStandingOn);
                 if (mMovementResults.find(data.mPtr) != mMovementResults.end())
                     data.mActorRaw->setNextPosition(mMovementResults[data.mPtr]);
             }
diff --git a/apps/openmw/mwphysics/mtphysics.hpp b/apps/openmw/mwphysics/mtphysics.hpp
index 84ea93c088..ef1c90b873 100644
--- a/apps/openmw/mwphysics/mtphysics.hpp
+++ b/apps/openmw/mwphysics/mtphysics.hpp
@@ -30,7 +30,7 @@ namespace MWPhysics
             /// @param timeAccum accumulated time from previous run to interpolate movements
             /// @param actorsData per actor data needed to compute new positions
             /// @return new position of each actor
-            const PtrPositionList& moveActors(int numSteps, float timeAccum, std::vector<ActorFrameData>&& actorsData, CollisionMap& standingCollisions, bool skip);
+            const PtrPositionList& moveActors(int numSteps, float timeAccum, std::vector<ActorFrameData>&& actorsData, bool skip);
 
             // Thread safe wrappers
             void rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, btCollisionWorld::RayResultCallback& resultCallback) const;
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 6b94ef43b6..5de26fdfcb 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -148,11 +148,11 @@ namespace MWPhysics
         if (!physactor || !physactor->getOnGround())
             return false;
 
-        CollisionMap::const_iterator found = mStandingCollisions.find(actor);
-        if (found == mStandingCollisions.end())
+        const auto obj = physactor->getStandingOnPtr();
+        if (obj.isEmpty())
             return true; // assume standing on terrain (which is a non-object, so not collision tracked)
 
-        ObjectMap::const_iterator foundObj = mObjects.find(found->second);
+        ObjectMap::const_iterator foundObj = mObjects.find(obj);
         if (foundObj == mObjects.end())
             return false;
 
@@ -501,22 +501,6 @@ namespace MWPhysics
         }
     }
 
-    void PhysicsSystem::updateCollisionMapPtr(CollisionMap& map, const MWWorld::Ptr &old, const MWWorld::Ptr &updated)
-    {
-        CollisionMap::iterator found = map.find(old);
-        if (found != map.end())
-        {
-            map[updated] = found->second;
-            map.erase(found);
-        }
-
-        for (auto& collision : map)
-        {
-            if (collision.second == old)
-                collision.second = updated;
-        }
-    }
-
     void PhysicsSystem::updatePtr(const MWWorld::Ptr &old, const MWWorld::Ptr &updated)
     {
         ObjectMap::iterator found = mObjects.find(old);
@@ -537,7 +521,11 @@ namespace MWPhysics
             mActors.emplace(updated, std::move(actor));
         }
 
-        updateCollisionMapPtr(mStandingCollisions, old, updated);
+        for (auto& [_, actor] : mActors)
+        {
+            if (actor->getStandingOnPtr() == old)
+                actor->setStandingOnPtr(updated);
+        }
     }
 
     Actor *PhysicsSystem::getActor(const MWWorld::Ptr &ptr)
@@ -675,7 +663,6 @@ namespace MWPhysics
     void PhysicsSystem::clearQueuedMovement()
     {
         mMovementQueue.clear();
-        mStandingCollisions.clear();
     }
 
     const PtrPositionList& PhysicsSystem::applyQueuedMovement(float dt, bool skipSimulation)
@@ -688,7 +675,7 @@ namespace MWPhysics
 
         mTimeAccum -= numSteps * mPhysicsDt;
 
-        return mTaskScheduler->moveActors(numSteps, mTimeAccum, prepareFrameData(numSteps), mStandingCollisions, skipSimulation);
+        return mTaskScheduler->moveActors(numSteps, mTimeAccum, prepareFrameData(numSteps), skipSimulation);
     }
 
     std::vector<ActorFrameData> PhysicsSystem::prepareFrameData(int numSteps)
@@ -700,10 +687,8 @@ namespace MWPhysics
         {
             const auto foundActor = mActors.find(character);
             if (foundActor == mActors.end()) // actor was already removed from the scene
-            {
-                mStandingCollisions.erase(character);
                 continue;
-            }
+
             auto physicActor = foundActor->second;
 
             float waterlevel = -std::numeric_limits<float>::max();
@@ -734,7 +719,7 @@ namespace MWPhysics
             // Ue current value only if we don't advance the simulation. Otherwise we might get a stale value.
             MWWorld::Ptr standingOn;
             if (numSteps == 0)
-                standingOn = mStandingCollisions[character];
+                standingOn = physicActor->getStandingOnPtr();
 
             actorsFrameData.emplace_back(std::move(physicActor), character, standingOn, moveToWaterSurface, movement, slowFall, waterlevel);
         }
@@ -774,20 +759,18 @@ namespace MWPhysics
 
     bool PhysicsSystem::isActorStandingOn(const MWWorld::Ptr &actor, const MWWorld::ConstPtr &object) const
     {
-        for (const auto& standingActor : mStandingCollisions)
-        {
-            if (standingActor.first == actor && standingActor.second == object)
-                return true;
-        }
+        const auto physActor = mActors.find(actor);
+        if (physActor != mActors.end())
+            return physActor->second->getStandingOnPtr() == object;
         return false;
     }
 
     void PhysicsSystem::getActorsStandingOn(const MWWorld::ConstPtr &object, std::vector<MWWorld::Ptr> &out) const
     {
-        for (const auto& standingActor : mStandingCollisions)
+        for (const auto& [_, actor] : mActors)
         {
-            if (standingActor.second == object)
-                out.push_back(standingActor.first);
+            if (actor->getStandingOnPtr() == object)
+                out.emplace_back(actor->getPtr());
         }
     }
 
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 4844b5e8ea..ccfca5422a 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -50,7 +50,6 @@ class btVector3;
 namespace MWPhysics
 {
     using PtrPositionList = std::map<MWWorld::Ptr, osg::Vec3f>;
-    using CollisionMap = std::map<MWWorld::Ptr, MWWorld::Ptr>;
 
     class HeightField;
     class Object;
@@ -272,13 +271,6 @@ namespace MWPhysics
 
             bool mDebugDrawEnabled;
 
-            // Tracks standing collisions happening during a single frame. <actor handle, collided handle>
-            // This will detect standing on an object, but won't detect running e.g. against a wall.
-            CollisionMap mStandingCollisions;
-
-            // replaces all occurrences of 'old' in the map by 'updated', no matter if it's a key or value
-            void updateCollisionMapPtr(CollisionMap& map, const MWWorld::Ptr &old, const MWWorld::Ptr &updated);
-
             using PtrVelocityList = std::vector<std::pair<MWWorld::Ptr, osg::Vec3f>>;
             PtrVelocityList mMovementQueue;
 

From bb5213670c41634c666dd705e196832c74b8aa52 Mon Sep 17 00:00:00 2001
From: Frederic Chardon <chardon.frederic@gmail.com>
Date: Mon, 16 Nov 2020 11:09:08 +0100
Subject: [PATCH 0013/2859] Use bigger hammer to set Actor's position after
 teleporting. Otherwise traceDown() would use old collision object transform
 and gives incorrect results, making the Actor "fall" in the new position.

---
 apps/openmw/mwphysics/actor.cpp         | 24 ++++++++++++------------
 apps/openmw/mwphysics/actor.hpp         |  3 ++-
 apps/openmw/mwphysics/mtphysics.cpp     |  2 +-
 apps/openmw/mwphysics/physicssystem.cpp |  4 ++--
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index 0f3d69d217..430bd4deef 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -74,11 +74,8 @@ Actor::Actor(const MWWorld::Ptr& ptr, const Resource::BulletShape* shape, Physic
 
     updateRotation();
     updateScale();
-    updatePosition();
-    setPosition(mWorldPosition, true);
-
+    resetPosition();
     addCollisionMask(getCollisionMask());
-    updateCollisionObjectPosition();
 }
 
 Actor::~Actor()
@@ -160,15 +157,9 @@ osg::Vec3f Actor::getCollisionObjectPosition() const
     return Misc::Convert::toOsg(mLocalTransform.getOrigin());
 }
 
-void Actor::setPosition(const osg::Vec3f& position, bool reset)
+void Actor::setPosition(const osg::Vec3f& position)
 {
-    if (reset)
-    {
-        mPreviousPosition = position;
-        mNextPosition = position;
-    }
-    else
-        mPreviousPosition = mPosition;
+    mPreviousPosition = mPosition;
     mPosition = position;
 }
 
@@ -178,6 +169,15 @@ void Actor::adjustPosition(const osg::Vec3f& offset)
     mPreviousPosition += offset;
 }
 
+void Actor::resetPosition()
+{
+    updatePosition();
+    mPreviousPosition = mWorldPosition;
+    mPosition = mWorldPosition;
+    mNextPosition = mWorldPosition;
+    updateCollisionObjectPosition();
+}
+
 osg::Vec3f Actor::getPosition() const
 {
     return mPosition;
diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index 6b23b31d3d..3d6f93ae05 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -91,7 +91,8 @@ namespace MWPhysics
         /**
           * Store the current position into mPreviousPosition, then move to this position.
           */
-        void setPosition(const osg::Vec3f& position, bool reset=false);
+        void setPosition(const osg::Vec3f& position);
+        void resetPosition();
         void adjustPosition(const osg::Vec3f& offset);
 
         osg::Vec3f getPosition() const;
diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index ff676413bd..dbb714fac5 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -253,7 +253,7 @@ namespace MWPhysics
             for (const auto& m : mActorsFrameData)
             {
                 m.mActorRaw->setStandingOnPtr(nullptr);
-                m.mActorRaw->setPosition(m.mActorRaw->getWorldPosition(), true);
+                m.mActorRaw->resetPosition();
                 mMovementResults[m.mPtr] = m.mActorRaw->getWorldPosition();
             }
             return mMovementResults;
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 5de26fdfcb..42ead3606e 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -433,8 +433,8 @@ namespace MWPhysics
         ActorMap::iterator found = mActors.find(ptr);
         if (found ==  mActors.end())
             return ptr.getRefData().getPosition().asVec3();
-        else
-            return MovementSolver::traceDown(ptr, position, found->second.get(), mCollisionWorld.get(), maxHeight);
+        found->second->resetPosition();
+        return MovementSolver::traceDown(ptr, position, found->second.get(), mCollisionWorld.get(), maxHeight);
     }
 
     void PhysicsSystem::addHeightField (const float* heights, int x, int y, float triSize, float sqrtVerts, float minH, float maxH, const osg::Object* holdObject)

From 7768556ce64c240bdcf361910e6520b2e32b224f Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Mon, 16 Nov 2020 21:01:20 +0000
Subject: [PATCH 0014/2859] Set dummy state when disabling shadows indoors

As we don't reconfigure all shaders without shadows when we disable them
indoors (as it'd probably add a hitch to transitioning in and out) we
need to set up dummy state so the shaders don't do anything illegal.

This hadn't had symptoms for most objects as when indoors, nearly
everything would be drawn first in one of the water RTTs, which had
dummy state to disable shadows already. This wasn't true of the water
plane itself, though, yet somehow it took until just now for anyone to
report that.

This resolves vtastek's issue where the water would be invisible indoors
---
 components/sceneutil/mwshadowtechnique.cpp | 26 +++++++++++++++++++++-
 components/sceneutil/mwshadowtechnique.hpp |  3 ++-
 components/sceneutil/shadow.cpp            |  2 +-
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
index 0411dbc431..c49a147776 100644
--- a/components/sceneutil/mwshadowtechnique.cpp
+++ b/components/sceneutil/mwshadowtechnique.cpp
@@ -820,9 +820,10 @@ void MWShadowTechnique::enableShadows()
     _enableShadows = true;
 }
 
-void MWShadowTechnique::disableShadows()
+void MWShadowTechnique::disableShadows(bool setDummyState)
 {
     _enableShadows = false;
+    mSetDummyStateWhenDisabled = setDummyState;
 }
 
 void SceneUtil::MWShadowTechnique::enableDebugHUD()
@@ -914,7 +915,28 @@ void MWShadowTechnique::cull(osgUtil::CullVisitor& cv)
 {
     if (!_enableShadows)
     {
+        if (mSetDummyStateWhenDisabled)
+        {
+            osg::ref_ptr<osg::StateSet> dummyState = new osg::StateSet();
+
+            ShadowSettings* settings = getShadowedScene()->getShadowSettings();
+            int baseUnit = settings->getBaseShadowTextureUnit();
+            int endUnit = baseUnit + settings->getNumShadowMapsPerLight();
+            for (int i = baseUnit; i < endUnit; ++i)
+            {
+                dummyState->setTextureAttributeAndModes(i, _fallbackShadowMapTexture, osg::StateAttribute::ON);
+                dummyState->addUniform(new osg::Uniform(("shadowTexture" + std::to_string(i - baseUnit)).c_str(), i));
+                dummyState->addUniform(new osg::Uniform(("shadowTextureUnit" + std::to_string(i - baseUnit)).c_str(), i));
+            }
+
+            cv.pushStateSet(dummyState);
+        }
+
         _shadowedScene->osg::Group::traverse(cv);
+
+        if (mSetDummyStateWhenDisabled)
+            cv.popStateSet();
+
         return;
     }
 
@@ -1577,6 +1599,8 @@ void MWShadowTechnique::createShaders()
         _fallbackShadowMapTexture->setWrap(osg::Texture2D::WRAP_T,osg::Texture2D::REPEAT);
         _fallbackShadowMapTexture->setFilter(osg::Texture2D::MIN_FILTER,osg::Texture2D::NEAREST);
         _fallbackShadowMapTexture->setFilter(osg::Texture2D::MAG_FILTER,osg::Texture2D::NEAREST);
+        _fallbackShadowMapTexture->setShadowComparison(true);
+        _fallbackShadowMapTexture->setShadowCompareFunc(osg::Texture::ShadowCompareFunc::ALWAYS);
 
     }
 
diff --git a/components/sceneutil/mwshadowtechnique.hpp b/components/sceneutil/mwshadowtechnique.hpp
index a7208cfa6d..5125247dda 100644
--- a/components/sceneutil/mwshadowtechnique.hpp
+++ b/components/sceneutil/mwshadowtechnique.hpp
@@ -67,7 +67,7 @@ namespace SceneUtil {
 
         virtual void enableShadows();
 
-        virtual void disableShadows();
+        virtual void disableShadows(bool setDummyState = false);
 
         virtual void enableDebugHUD();
 
@@ -252,6 +252,7 @@ namespace SceneUtil {
         osg::ref_ptr<osg::Program>              _program;
 
         bool                                    _enableShadows;
+        bool                                    mSetDummyStateWhenDisabled;
 
         double                                  _splitPointUniformLogRatio = 0.5;
         double                                  _splitPointDeltaBias = 0.0;
diff --git a/components/sceneutil/shadow.cpp b/components/sceneutil/shadow.cpp
index 1e14fbbb13..35646b834e 100644
--- a/components/sceneutil/shadow.cpp
+++ b/components/sceneutil/shadow.cpp
@@ -168,7 +168,7 @@ namespace SceneUtil
         if (Settings::Manager::getBool("enable indoor shadows", "Shadows"))
             mShadowSettings->setCastsShadowTraversalMask(mIndoorShadowCastingMask);
         else
-            mShadowTechnique->disableShadows();
+            mShadowTechnique->disableShadows(true);
     }
 
     void ShadowManager::enableOutdoorMode()

From 06ae2a0536274b45fc04d0b1a1a3585fda25ac3a Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Mon, 16 Nov 2020 21:07:30 +0000
Subject: [PATCH 0015/2859] Add changelog entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f19783ef5..51babd907b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -65,6 +65,7 @@
     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 #5688: Water shader broken indoors with enable indoor shadows = false
     Feature #390: 3rd person look "over the shoulder"
     Feature #2386: Distant Statics in the form of Object Paging
     Feature #2404: Levelled List can not be placed into a container

From 211894a178481ff4ae5434840e4da1bbacf32247 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Tue, 17 Nov 2020 16:14:05 +0000
Subject: [PATCH 0016/2859] Fix extraction with 7z 9.10

This is still used in the wild as lots of people install 7zip and never update it because it works. We can't check the version and abort if it's too old as the changelog doesn't make it clear which version fixed the behaviour.
---
 CI/before_script.msvc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 2a0db9c91d..0ef67f47ef 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -913,7 +913,7 @@ printf "LZ4 1.9.2... "
 		printf "Exists. "
 	elif [ -z $SKIP_EXTRACT ]; then
 		rm -rf LZ4_1.9.2
-		eval 7z x -y lz4_win${BITS}_v1_9_2.7z -o./LZ4_1.9.2 $STRIP
+		eval 7z x -y lz4_win${BITS}_v1_9_2.7z -o$(real_pwd)/LZ4_1.9.2 $STRIP
 	fi
 	export LZ4DIR="$(real_pwd)/LZ4_1.9.2"
 	add_cmake_opts -DLZ4_INCLUDE_DIR="${LZ4DIR}/include" \

From 48ea9960b92c2e31c6888e04775aae8aaab4981a Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Tue, 17 Nov 2020 16:45:13 +0000
Subject: [PATCH 0017/2859] Fix Debian GCC timeout on forks

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 25a04d536e..810e23d38e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,6 +37,8 @@ Debian_GCC:
     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

From 06d1e70aacba6b18a9751e99db5625dc4a7e39ff Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Wed, 18 Nov 2020 15:34:21 +0000
Subject: [PATCH 0018/2859] Make Bullet DebugDrawer's default state match the
 physics system

---
 apps/openmw/mwphysics/physicssystem.cpp  | 2 +-
 apps/openmw/mwrender/bulletdebugdraw.cpp | 8 +++-----
 apps/openmw/mwrender/bulletdebugdraw.hpp | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 42ead3606e..8a58919ca5 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -93,7 +93,7 @@ namespace MWPhysics
         }
 
         mTaskScheduler = std::make_unique<PhysicsTaskScheduler>(mPhysicsDt, mCollisionWorld);
-        mDebugDrawer = std::make_unique<MWRender::DebugDrawer>(mParentNode, mCollisionWorld.get());
+        mDebugDrawer = std::make_unique<MWRender::DebugDrawer>(mParentNode, mCollisionWorld.get(), mDebugDrawEnabled);
     }
 
     PhysicsSystem::~PhysicsSystem()
diff --git a/apps/openmw/mwrender/bulletdebugdraw.cpp b/apps/openmw/mwrender/bulletdebugdraw.cpp
index 61570be452..00529ef80d 100644
--- a/apps/openmw/mwrender/bulletdebugdraw.cpp
+++ b/apps/openmw/mwrender/bulletdebugdraw.cpp
@@ -14,13 +14,11 @@
 namespace MWRender
 {
 
-DebugDrawer::DebugDrawer(osg::ref_ptr<osg::Group> parentNode, btCollisionWorld *world)
+DebugDrawer::DebugDrawer(osg::ref_ptr<osg::Group> parentNode, btCollisionWorld *world, int debugMode)
     : mParentNode(parentNode),
-      mWorld(world),
-      mDebugOn(true)
+      mWorld(world)
 {
-
-    createGeometry();
+    setDebugMode(debugMode);
 }
 
 void DebugDrawer::createGeometry()
diff --git a/apps/openmw/mwrender/bulletdebugdraw.hpp b/apps/openmw/mwrender/bulletdebugdraw.hpp
index f07ce2e2ed..ec421bd742 100644
--- a/apps/openmw/mwrender/bulletdebugdraw.hpp
+++ b/apps/openmw/mwrender/bulletdebugdraw.hpp
@@ -48,7 +48,7 @@ protected:
 
 public:
 
-    DebugDrawer(osg::ref_ptr<osg::Group> parentNode, btCollisionWorld *world);
+    DebugDrawer(osg::ref_ptr<osg::Group> parentNode, btCollisionWorld *world, int debugMode = 1);
     ~DebugDrawer();
 
     void step();

From c126d8801f938c6b188d8ab4bd708a9f4e48ba82 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 18 Nov 2020 17:28:09 +0100
Subject: [PATCH 0019/2859] Fix #5689

---
 apps/openmw/mwstate/statemanagerimp.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index e409e5b3b9..72e4b1ae02 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -48,8 +48,8 @@ void MWState::StateManager::cleanup (bool force)
         MWBase::Environment::get().getDialogueManager()->clear();
         MWBase::Environment::get().getJournal()->clear();
         MWBase::Environment::get().getScriptManager()->clear();
-        MWBase::Environment::get().getWorld()->clear();
         MWBase::Environment::get().getWindowManager()->clear();
+        MWBase::Environment::get().getWorld()->clear();
         MWBase::Environment::get().getInputManager()->clear();
         MWBase::Environment::get().getMechanicsManager()->clear();
 

From 9363bc2d4825705fcf8c60f42b150828b3ba332b Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 18 Nov 2020 18:03:29 +0100
Subject: [PATCH 0020/2859] Update recastnavigation to
 6624e7aef5e15df11cb2f5673574df8e4c96af6a

---
 extern/recastnavigation/.id                   |  2 +-
 extern/recastnavigation/CMakeLists.txt        |  6 ++++++
 .../DebugUtils/CMakeLists.txt                 | 19 ++++++++++---------
 extern/recastnavigation/Detour/CMakeLists.txt | 19 ++++++++++---------
 .../DetourCrowd/CMakeLists.txt                | 19 ++++++++++---------
 .../DetourCrowd/Source/DetourCrowd.cpp        |  8 +++++---
 .../DetourTileCache/CMakeLists.txt            | 19 ++++++++++---------
 extern/recastnavigation/Recast/CMakeLists.txt | 19 ++++++++++---------
 8 files changed, 62 insertions(+), 49 deletions(-)

diff --git a/extern/recastnavigation/.id b/extern/recastnavigation/.id
index 81e564671a..b53727263d 100644
--- a/extern/recastnavigation/.id
+++ b/extern/recastnavigation/.id
@@ -1 +1 @@
-57610fa6ef31b39020231906f8c5d40eaa8294ae
+6624e7aef5e15df11cb2f5673574df8e4c96af6a
diff --git a/extern/recastnavigation/CMakeLists.txt b/extern/recastnavigation/CMakeLists.txt
index 0d31c2e367..cf35af1e87 100644
--- a/extern/recastnavigation/CMakeLists.txt
+++ b/extern/recastnavigation/CMakeLists.txt
@@ -13,6 +13,12 @@ SET(VERSION 1.0.0)
 
 option(RECASTNAVIGATION_STATIC "Build static libraries" ON)
 
+if(MSVC AND BUILD_SHARED_LIBS)
+    set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
+endif()
+
+include(GNUInstallDirs)
+
 add_subdirectory(DebugUtils)
 add_subdirectory(Detour)
 add_subdirectory(DetourCrowd)
diff --git a/extern/recastnavigation/DebugUtils/CMakeLists.txt b/extern/recastnavigation/DebugUtils/CMakeLists.txt
index 8b6a3fcf62..21d8f8f9d9 100644
--- a/extern/recastnavigation/DebugUtils/CMakeLists.txt
+++ b/extern/recastnavigation/DebugUtils/CMakeLists.txt
@@ -1,12 +1,8 @@
 file(GLOB SOURCES Source/*.cpp)
-
-if (RECASTNAVIGATION_STATIC)
-    add_library(DebugUtils STATIC ${SOURCES})
-else()
-    add_library(DebugUtils SHARED ${SOURCES})
-endif()
+add_library(DebugUtils ${SOURCES})
 
 add_library(RecastNavigation::DebugUtils ALIAS DebugUtils)
+set_target_properties(DebugUtils PROPERTIES DEBUG_POSTFIX -d)
 
 set(DebugUtils_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Include")
 
@@ -23,13 +19,18 @@ target_link_libraries(DebugUtils
 set_target_properties(DebugUtils PROPERTIES
         SOVERSION ${SOVERSION}
         VERSION ${VERSION}
+        COMPILE_PDB_OUTPUT_DIRECTORY .
+        COMPILE_PDB_NAME "DebugUtils-d"
         )
 
 install(TARGETS DebugUtils
-        ARCHIVE DESTINATION lib
-        LIBRARY DESTINATION lib
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
         COMPONENT library
         )
 
 file(GLOB INCLUDES Include/*.h)
-install(FILES ${INCLUDES} DESTINATION include)
+install(FILES ${INCLUDES} DESTINATION
+    ${CMAKE_INSTALL_INCLUDEDIR}/recastnavigation)
+install(FILES "$<TARGET_FILE_DIR:DebugUtils>/DebugUtils-d.pdb" CONFIGURATIONS "Debug" DESTINATION "lib") 
diff --git a/extern/recastnavigation/Detour/CMakeLists.txt b/extern/recastnavigation/Detour/CMakeLists.txt
index de88111d56..5cb47ec0e2 100644
--- a/extern/recastnavigation/Detour/CMakeLists.txt
+++ b/extern/recastnavigation/Detour/CMakeLists.txt
@@ -1,12 +1,8 @@
 file(GLOB SOURCES Source/*.cpp)
-
-if(RECASTNAVIGATION_STATIC)
-    add_library(Detour STATIC ${SOURCES})
-else()
-    add_library(Detour SHARED ${SOURCES})
-endif()
+add_library(Detour ${SOURCES})
 
 add_library(RecastNavigation::Detour ALIAS Detour)
+set_target_properties(Detour PROPERTIES DEBUG_POSTFIX -d)
 
 set(Detour_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Include")
 
@@ -17,13 +13,18 @@ target_include_directories(Detour PUBLIC
 set_target_properties(Detour PROPERTIES
         SOVERSION ${SOVERSION}
         VERSION ${VERSION}
+        COMPILE_PDB_OUTPUT_DIRECTORY .
+        COMPILE_PDB_NAME "Detour-d"
         )
 
 install(TARGETS Detour
-        ARCHIVE DESTINATION lib
-        LIBRARY DESTINATION lib
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
         COMPONENT library
         )
 
 file(GLOB INCLUDES Include/*.h)
-install(FILES ${INCLUDES} DESTINATION include)
+install(FILES ${INCLUDES} DESTINATION
+    ${CMAKE_INSTALL_INCLUDEDIR}/recastnavigation)
+install(FILES "$<TARGET_FILE_DIR:Detour>/Detour-d.pdb" CONFIGURATIONS "Debug" DESTINATION "lib") 
diff --git a/extern/recastnavigation/DetourCrowd/CMakeLists.txt b/extern/recastnavigation/DetourCrowd/CMakeLists.txt
index 73cdf7ce84..d0e186be07 100644
--- a/extern/recastnavigation/DetourCrowd/CMakeLists.txt
+++ b/extern/recastnavigation/DetourCrowd/CMakeLists.txt
@@ -1,12 +1,8 @@
 file(GLOB SOURCES Source/*.cpp)
-
-if (RECASTNAVIGATION_STATIC)
-    add_library(DetourCrowd STATIC ${SOURCES})
-else ()
-    add_library(DetourCrowd SHARED ${SOURCES})
-endif ()
+add_library(DetourCrowd ${SOURCES})
 
 add_library(RecastNavigation::DetourCrowd ALIAS DetourCrowd)
+set_target_properties(DetourCrowd PROPERTIES DEBUG_POSTFIX -d)
 
 set(DetourCrowd_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Include")
 
@@ -21,13 +17,18 @@ target_link_libraries(DetourCrowd
 set_target_properties(DetourCrowd PROPERTIES
         SOVERSION ${SOVERSION}
         VERSION ${VERSION}
+        COMPILE_PDB_OUTPUT_DIRECTORY .
+        COMPILE_PDB_NAME "DetourCrowd-d"
         )
 
 install(TARGETS DetourCrowd
-        ARCHIVE DESTINATION lib
-        LIBRARY DESTINATION lib
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
         COMPONENT library
         )
 
 file(GLOB INCLUDES Include/*.h)
-install(FILES ${INCLUDES} DESTINATION include)
+install(FILES ${INCLUDES} DESTINATION
+    ${CMAKE_INSTALL_INCLUDEDIR}/recastnavigation)
+install(FILES "$<TARGET_FILE_DIR:DetourCrowd>/DetourCrowd-d.pdb" CONFIGURATIONS "Debug" DESTINATION "lib") 
diff --git a/extern/recastnavigation/DetourCrowd/Source/DetourCrowd.cpp b/extern/recastnavigation/DetourCrowd/Source/DetourCrowd.cpp
index 1e76e40ce2..3f0311f7ff 100644
--- a/extern/recastnavigation/DetourCrowd/Source/DetourCrowd.cpp
+++ b/extern/recastnavigation/DetourCrowd/Source/DetourCrowd.cpp
@@ -1409,12 +1409,14 @@ void dtCrowd::update(const float dt, dtCrowdAgentDebugInfo* debug)
 	}
 	
 	// Update agents using off-mesh connection.
-	for (int i = 0; i < m_maxAgents; ++i)
+	for (int i = 0; i < nagents; ++i)
 	{
-		dtCrowdAgentAnimation* anim = &m_agentAnims[i];
+		dtCrowdAgent* ag = agents[i];
+		const int idx = (int)(ag - m_agents);
+		dtCrowdAgentAnimation* anim = &m_agentAnims[idx];
 		if (!anim->active)
 			continue;
-		dtCrowdAgent* ag = agents[i];
+		
 
 		anim->t += dt;
 		if (anim->t > anim->tmax)
diff --git a/extern/recastnavigation/DetourTileCache/CMakeLists.txt b/extern/recastnavigation/DetourTileCache/CMakeLists.txt
index 121b8edcc7..3703ebb929 100644
--- a/extern/recastnavigation/DetourTileCache/CMakeLists.txt
+++ b/extern/recastnavigation/DetourTileCache/CMakeLists.txt
@@ -1,12 +1,8 @@
 file(GLOB SOURCES Source/*.cpp)
-
-if (RECASTNAVIGATION_STATIC)
-    add_library(DetourTileCache STATIC ${SOURCES})
-else ()
-    add_library(DetourTileCache SHARED ${SOURCES})
-endif ()
+add_library(DetourTileCache ${SOURCES})
 
 add_library(RecastNavigation::DetourTileCache ALIAS DetourTileCache)
+set_target_properties(DetourTileCache PROPERTIES DEBUG_POSTFIX -d)
 
 set(DetourTileCache_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Include")
 
@@ -21,14 +17,19 @@ target_link_libraries(DetourTileCache
 set_target_properties(DetourTileCache PROPERTIES
         SOVERSION ${SOVERSION}
         VERSION ${VERSION}
+        COMPILE_PDB_OUTPUT_DIRECTORY .
+        COMPILE_PDB_NAME "DetourTileCache-d"
         )
 
 
 install(TARGETS DetourTileCache
-        ARCHIVE DESTINATION lib
-        LIBRARY DESTINATION lib
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
         COMPONENT library
         )
 
 file(GLOB INCLUDES Include/*.h)
-install(FILES ${INCLUDES} DESTINATION include)
+install(FILES ${INCLUDES} DESTINATION
+    ${CMAKE_INSTALL_INCLUDEDIR}/recastnavigation)
+install(FILES "$<TARGET_FILE_DIR:DetourTileCache>/DetourTileCache-d.pdb" CONFIGURATIONS "Debug" DESTINATION "lib") 
diff --git a/extern/recastnavigation/Recast/CMakeLists.txt b/extern/recastnavigation/Recast/CMakeLists.txt
index 5e843762e5..3606544642 100644
--- a/extern/recastnavigation/Recast/CMakeLists.txt
+++ b/extern/recastnavigation/Recast/CMakeLists.txt
@@ -1,12 +1,8 @@
 file(GLOB SOURCES Source/*.cpp)
-
-if (RECASTNAVIGATION_STATIC)
-    add_library(Recast STATIC ${SOURCES})
-else ()
-    add_library(Recast SHARED ${SOURCES})
-endif ()
+add_library(Recast ${SOURCES})
 
 add_library(RecastNavigation::Recast ALIAS Recast)
+set_target_properties(Recast PROPERTIES DEBUG_POSTFIX -d)
 
 set(Recast_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Include")
 
@@ -17,13 +13,18 @@ target_include_directories(Recast PUBLIC
 set_target_properties(Recast PROPERTIES
         SOVERSION ${SOVERSION}
         VERSION ${VERSION}
+        COMPILE_PDB_OUTPUT_DIRECTORY .
+        COMPILE_PDB_NAME "Recast-d"
         )
 
 install(TARGETS Recast
-        ARCHIVE DESTINATION lib
-        LIBRARY DESTINATION lib
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
         COMPONENT library
         )
 
 file(GLOB INCLUDES Include/*.h)
-install(FILES ${INCLUDES} DESTINATION include)
+install(FILES ${INCLUDES} DESTINATION
+    ${CMAKE_INSTALL_INCLUDEDIR}/recastnavigation)
+install(FILES "$<TARGET_FILE_DIR:Recast>/Recast-d.pdb" CONFIGURATIONS "Debug" DESTINATION "lib") 

From 9b11b8a27b42782ea528b1b2f5e2f884352bdb13 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 18 Nov 2020 18:52:00 +0100
Subject: [PATCH 0021/2859] Fix boundary check

---
 components/detournavigator/chunkytrimesh.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/detournavigator/chunkytrimesh.cpp b/components/detournavigator/chunkytrimesh.cpp
index 3a8fc34802..ffd39d0a97 100644
--- a/components/detournavigator/chunkytrimesh.cpp
+++ b/components/detournavigator/chunkytrimesh.cpp
@@ -51,7 +51,7 @@ namespace DetourNavigator
             const auto inum = imax - imin;
             const auto icur = curNode;
 
-            if (curNode > nodes.size())
+            if (curNode >= nodes.size())
                 return;
 
             ChunkyTriMeshNode& node = nodes[curNode++];

From f78a5d795c0395c48d441989ddaeaffb6eae02d4 Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Wed, 18 Nov 2020 22:48:47 +0200
Subject: [PATCH 0022/2859] Separate keyframes logic to provide basis for
 osgAnimation integration.

---
 apps/openmw/mwmechanics/character.cpp         |  2 +-
 apps/openmw/mwmechanics/character.hpp         |  2 +-
 apps/openmw/mwrender/animation.cpp            | 43 ++++++------
 apps/openmw/mwrender/animation.hpp            | 20 +++---
 apps/openmw/mwrender/npcanimation.cpp         |  5 +-
 components/nifosg/controller.cpp              |  3 +-
 components/nifosg/controller.hpp              |  6 +-
 components/nifosg/nifloader.cpp               | 18 ++---
 components/nifosg/nifloader.hpp               | 38 +----------
 components/resource/keyframemanager.cpp       | 53 +++++++++++++--
 components/resource/keyframemanager.hpp       | 10 ++-
 components/resource/resourcesystem.cpp        |  2 +-
 components/sceneutil/keyframe.hpp             | 68 +++++++++++++++++++
 .../{nifosg => sceneutil}/textkeymap.hpp      |  6 +-
 14 files changed, 174 insertions(+), 102 deletions(-)
 create mode 100644 components/sceneutil/keyframe.hpp
 rename components/{nifosg => sceneutil}/textkeymap.hpp (94%)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 657f2e2eca..9b3c8576ea 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -936,7 +936,7 @@ void split(const std::string &s, char delim, std::vector<std::string> &elems) {
     }
 }
 
-void CharacterController::handleTextKey(const std::string &groupname, NifOsg::TextKeyMap::ConstIterator key, const NifOsg::TextKeyMap& map)
+void CharacterController::handleTextKey(const std::string &groupname, SceneUtil::TextKeyMap::ConstIterator key, const SceneUtil::TextKeyMap& map)
 {
     const std::string &evt = key->second;
 
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index 949affcfde..2308ba971d 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -241,7 +241,7 @@ public:
     CharacterController(const MWWorld::Ptr &ptr, MWRender::Animation *anim);
     virtual ~CharacterController();
 
-    void handleTextKey(const std::string &groupname, NifOsg::TextKeyMap::ConstIterator key, const NifOsg::TextKeyMap& map) override;
+    void handleTextKey(const std::string &groupname, SceneUtil::TextKeyMap::ConstIterator key, const SceneUtil::TextKeyMap& map) override;
 
     // Be careful when to call this, see comment in Actors
     void updateContinuousVfx();
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 10a6b2be42..f8ff3780d3 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -20,8 +20,7 @@
 #include <components/misc/constants.hpp>
 #include <components/misc/resourcehelpers.hpp>
 
-#include <components/nifosg/nifloader.hpp> // KeyframeHolder
-#include <components/nifosg/controller.hpp>
+#include <components/sceneutil/keyframe.hpp>
 
 #include <components/vfs/manager.hpp>
 
@@ -148,7 +147,7 @@ namespace
         }
     };
 
-    float calcAnimVelocity(const NifOsg::TextKeyMap& keys, NifOsg::KeyframeController *nonaccumctrl,
+    float calcAnimVelocity(const SceneUtil::TextKeyMap& keys, SceneUtil::KeyframeController *nonaccumctrl,
                            const osg::Vec3f& accum, const std::string &groupname)
     {
         const std::string start = groupname+": start";
@@ -530,13 +529,13 @@ namespace MWRender
 
     struct Animation::AnimSource
     {
-        osg::ref_ptr<const NifOsg::KeyframeHolder> mKeyframes;
+        osg::ref_ptr<const SceneUtil::KeyframeHolder> mKeyframes;
 
-        typedef std::map<std::string, osg::ref_ptr<NifOsg::KeyframeController> > ControllerMap;
+        typedef std::map<std::string, osg::ref_ptr<SceneUtil::KeyframeController> > ControllerMap;
 
         ControllerMap mControllerMap[Animation::sNumBlendMasks];
 
-        const NifOsg::TextKeyMap& getTextKeys() const;
+        const SceneUtil::TextKeyMap& getTextKeys() const;
     };
 
     void UpdateVfxCallback::operator()(osg::Node* node, osg::NodeVisitor* nv)
@@ -688,7 +687,7 @@ namespace MWRender
         return 0;
     }
 
-    const NifOsg::TextKeyMap &Animation::AnimSource::getTextKeys() const
+    const SceneUtil::TextKeyMap &Animation::AnimSource::getTextKeys() const
     {
         return mKeyframes->mTextKeys;
     }
@@ -729,8 +728,6 @@ namespace MWRender
 
         if(kfname.size() > 4 && kfname.compare(kfname.size()-4, 4, ".nif") == 0)
             kfname.replace(kfname.size()-4, 4, ".kf");
-        else
-            return;
 
         addSingleAnimSource(kfname, baseModel);
 
@@ -753,7 +750,7 @@ namespace MWRender
 
         const NodeMap& nodeMap = getNodeMap();
 
-        for (NifOsg::KeyframeHolder::KeyframeControllerMap::const_iterator it = animsrc->mKeyframes->mKeyframeControllers.begin();
+        for (SceneUtil::KeyframeHolder::KeyframeControllerMap::const_iterator it = animsrc->mKeyframes->mKeyframeControllers.begin();
              it != animsrc->mKeyframes->mKeyframeControllers.end(); ++it)
         {
             std::string bonename = Misc::StringUtils::lowerCase(it->first);
@@ -769,7 +766,7 @@ namespace MWRender
             size_t blendMask = detectBlendMask(node);
 
             // clone the controller, because each Animation needs its own ControllerSource
-            osg::ref_ptr<NifOsg::KeyframeController> cloned = new NifOsg::KeyframeController(*it->second, osg::CopyOp::SHALLOW_COPY);
+            osg::ref_ptr<SceneUtil::KeyframeController> cloned = osg::clone(it->second.get(), osg::CopyOp::SHALLOW_COPY);
             cloned->setSource(mAnimationTimePtr[blendMask]);
 
             animsrc->mControllerMap[blendMask].insert(std::make_pair(bonename, cloned));
@@ -810,7 +807,7 @@ namespace MWRender
         AnimSourceList::const_iterator iter(mAnimSources.begin());
         for(;iter != mAnimSources.end();++iter)
         {
-            const NifOsg::TextKeyMap &keys = (*iter)->getTextKeys();
+            const SceneUtil::TextKeyMap &keys = (*iter)->getTextKeys();
             if (keys.hasGroupStart(anim))
                 return true;
         }
@@ -822,7 +819,7 @@ namespace MWRender
     {
         for(AnimSourceList::const_reverse_iterator iter(mAnimSources.rbegin()); iter != mAnimSources.rend(); ++iter)
         {
-            const NifOsg::TextKeyMap &keys = (*iter)->getTextKeys();
+            const SceneUtil::TextKeyMap &keys = (*iter)->getTextKeys();
 
             const auto found = keys.findGroupStart(groupname);
             if(found != keys.end())
@@ -835,7 +832,7 @@ namespace MWRender
     {
         for(AnimSourceList::const_reverse_iterator iter(mAnimSources.rbegin()); iter != mAnimSources.rend(); ++iter)
         {
-            const NifOsg::TextKeyMap &keys = (*iter)->getTextKeys();
+            const SceneUtil::TextKeyMap &keys = (*iter)->getTextKeys();
 
             for(auto iterKey = keys.begin(); iterKey != keys.end(); ++iterKey)
             {
@@ -847,8 +844,8 @@ namespace MWRender
         return -1.f;
     }
 
-    void Animation::handleTextKey(AnimState &state, const std::string &groupname, NifOsg::TextKeyMap::ConstIterator key,
-                       const NifOsg::TextKeyMap& map)
+    void Animation::handleTextKey(AnimState &state, const std::string &groupname, SceneUtil::TextKeyMap::ConstIterator key,
+                       const SceneUtil::TextKeyMap& map)
     {
         const std::string &evt = key->second;
 
@@ -911,7 +908,7 @@ namespace MWRender
         AnimSourceList::reverse_iterator iter(mAnimSources.rbegin());
         for(;iter != mAnimSources.rend();++iter)
         {
-            const NifOsg::TextKeyMap &textkeys = (*iter)->getTextKeys();
+            const SceneUtil::TextKeyMap &textkeys = (*iter)->getTextKeys();
             if(reset(state, textkeys, groupname, start, stop, startpoint, loopfallback))
             {
                 state.mSource = *iter;
@@ -956,7 +953,7 @@ namespace MWRender
         resetActiveGroups();
     }
 
-    bool Animation::reset(AnimState &state, const NifOsg::TextKeyMap &keys, const std::string &groupname, const std::string &start, const std::string &stop, float startpoint, bool loopfallback)
+    bool Animation::reset(AnimState &state, const SceneUtil::TextKeyMap &keys, const std::string &groupname, const std::string &start, const std::string &stop, float startpoint, bool loopfallback)
     {
         // Look for text keys in reverse. This normally wouldn't matter, but for some reason undeadwolf_2.nif has two
         // separate walkforward keys, and the last one is supposed to be used.
@@ -1186,7 +1183,7 @@ namespace MWRender
         AnimSourceList::const_reverse_iterator animsrc(mAnimSources.rbegin());
         for(;animsrc != mAnimSources.rend();++animsrc)
         {
-            const NifOsg::TextKeyMap &keys = (*animsrc)->getTextKeys();
+            const SceneUtil::TextKeyMap &keys = (*animsrc)->getTextKeys();
             if (keys.hasGroupStart(groupname))
                 break;
         }
@@ -1194,7 +1191,7 @@ namespace MWRender
             return 0.0f;
 
         float velocity = 0.0f;
-        const NifOsg::TextKeyMap &keys = (*animsrc)->getTextKeys();
+        const SceneUtil::TextKeyMap &keys = (*animsrc)->getTextKeys();
 
         const AnimSource::ControllerMap& ctrls = (*animsrc)->mControllerMap[0];
         for (AnimSource::ControllerMap::const_iterator it = ctrls.begin(); it != ctrls.end(); ++it)
@@ -1215,7 +1212,7 @@ namespace MWRender
 
             while(!(velocity > 1.0f) && ++animiter != mAnimSources.rend())
             {
-                const NifOsg::TextKeyMap &keys2 = (*animiter)->getTextKeys();
+                const SceneUtil::TextKeyMap &keys2 = (*animiter)->getTextKeys();
 
                 const AnimSource::ControllerMap& ctrls2 = (*animiter)->mControllerMap[0];
                 for (AnimSource::ControllerMap::const_iterator it = ctrls2.begin(); it != ctrls2.end(); ++it)
@@ -1265,7 +1262,7 @@ namespace MWRender
                 continue;
             }
 
-            const NifOsg::TextKeyMap &textkeys = state.mSource->getTextKeys();
+            const SceneUtil::TextKeyMap &textkeys = state.mSource->getTextKeys();
             auto textkey = textkeys.upperBound(state.getTime());
 
             float timepassed = duration * state.mSpeedMult;
@@ -1839,7 +1836,7 @@ namespace MWRender
         osg::Callback* cb = node->getUpdateCallback();
         while (cb)
         {
-            if (dynamic_cast<NifOsg::KeyframeController*>(cb))
+            if (dynamic_cast<SceneUtil::KeyframeController*>(cb))
             {
                 foundKeyframeCtrl = true;
                 break;
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index 9d03831be5..ebfe8a2e59 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -4,8 +4,8 @@
 #include "../mwworld/ptr.hpp"
 
 #include <components/sceneutil/controller.hpp>
+#include <components/sceneutil/textkeymap.hpp>
 #include <components/sceneutil/util.hpp>
-#include <components/nifosg/textkeymap.hpp>
 
 #include <vector>
 
@@ -20,14 +20,10 @@ namespace Resource
     class ResourceSystem;
 }
 
-namespace NifOsg
+namespace SceneUtil
 {
     class KeyframeHolder;
     class KeyframeController;
-}
-
-namespace SceneUtil
-{
     class LightSource;
     class LightListCallback;
     class Skeleton;
@@ -150,8 +146,8 @@ public:
     class TextKeyListener
     {
     public:
-        virtual void handleTextKey(const std::string &groupname, NifOsg::TextKeyMap::ConstIterator key,
-                                   const NifOsg::TextKeyMap& map) = 0;
+        virtual void handleTextKey(const std::string &groupname, SceneUtil::TextKeyMap::ConstIterator key,
+                                   const SceneUtil::TextKeyMap& map) = 0;
 
         virtual ~TextKeyListener() = default;
     };
@@ -242,7 +238,7 @@ protected:
     osg::ref_ptr<osg::Node> mAccumRoot;
 
     // The controller animating that node.
-    osg::ref_ptr<NifOsg::KeyframeController> mAccumCtrl;
+    osg::ref_ptr<SceneUtil::KeyframeController> mAccumCtrl;
 
     // Used to reset the position of the accumulation root every frame - the movement should be applied to the physics system
     osg::ref_ptr<ResetAccumRootCallback> mResetAccumRootCallback;
@@ -306,12 +302,12 @@ protected:
      * the marker is not found, or if the markers are the same, it returns
      * false.
      */
-    bool reset(AnimState &state, const NifOsg::TextKeyMap &keys,
+    bool reset(AnimState &state, const SceneUtil::TextKeyMap &keys,
                const std::string &groupname, const std::string &start, const std::string &stop,
                float startpoint, bool loopfallback);
 
-    void handleTextKey(AnimState &state, const std::string &groupname, NifOsg::TextKeyMap::ConstIterator key,
-                       const NifOsg::TextKeyMap& map);
+    void handleTextKey(AnimState &state, const std::string &groupname, SceneUtil::TextKeyMap::ConstIterator key,
+                       const SceneUtil::TextKeyMap& map);
 
     /** Sets the root model of the object.
      *
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 36213fc96d..d97e57115a 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -19,11 +19,10 @@
 #include <components/sceneutil/attach.hpp>
 #include <components/sceneutil/visitor.hpp>
 #include <components/sceneutil/skeleton.hpp>
+#include <components/sceneutil/keyframe.hpp>
 
 #include <components/settings/settings.hpp>
 
-#include <components/nifosg/nifloader.hpp> // TextKeyMapHolder
-
 #include <components/vfs/manager.hpp>
 
 #include "../mwworld/esmstore.hpp"
@@ -864,7 +863,7 @@ bool NpcAnimation::addOrReplaceIndividualPart(ESM::PartReferenceType type, int g
                 for (unsigned int i=0; i<node->getUserDataContainer()->getNumUserObjects(); ++i)
                 {
                     osg::Object* obj = node->getUserDataContainer()->getUserObject(i);
-                    if (NifOsg::TextKeyMapHolder* keys = dynamic_cast<NifOsg::TextKeyMapHolder*>(obj))
+                    if (SceneUtil::TextKeyMapHolder* keys = dynamic_cast<SceneUtil::TextKeyMapHolder*>(obj))
                     {
                         for (const auto &key : keys->mTextKeys)
                         {
diff --git a/components/nifosg/controller.cpp b/components/nifosg/controller.cpp
index 64e9f7de6c..31fd92b43e 100644
--- a/components/nifosg/controller.cpp
+++ b/components/nifosg/controller.cpp
@@ -71,8 +71,7 @@ KeyframeController::KeyframeController()
 }
 
 KeyframeController::KeyframeController(const KeyframeController &copy, const osg::CopyOp &copyop)
-    : osg::NodeCallback(copy, copyop)
-    , Controller(copy)
+    : SceneUtil::KeyframeController(copy, copyop)
     , mRotations(copy.mRotations)
     , mXRotations(copy.mXRotations)
     , mYRotations(copy.mYRotations)
diff --git a/components/nifosg/controller.hpp b/components/nifosg/controller.hpp
index 996e4ef979..0063b2ec0f 100644
--- a/components/nifosg/controller.hpp
+++ b/components/nifosg/controller.hpp
@@ -6,7 +6,7 @@
 #include <components/nif/controller.hpp>
 #include <components/nif/data.hpp>
 
-#include <components/sceneutil/controller.hpp>
+#include <components/sceneutil/keyframe.hpp>
 #include <components/sceneutil/statesetupdater.hpp>
 
 #include <set>
@@ -226,7 +226,7 @@ namespace NifOsg
         std::vector<FloatInterpolator> mKeyFrames;
     };
 
-    class KeyframeController : public osg::NodeCallback, public SceneUtil::Controller
+    class KeyframeController : public SceneUtil::KeyframeController
     {
     public:
         // This is used if there's no interpolator but there is data (Morrowind meshes).
@@ -242,7 +242,7 @@ namespace NifOsg
 
         META_Object(NifOsg, KeyframeController)
 
-        virtual osg::Vec3f getTranslation(float time) const;
+        osg::Vec3f getTranslation(float time) const override;
 
         void operator() (osg::Node*, osg::NodeVisitor*) override;
 
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index a5a61b3176..751bdb51fe 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -139,7 +139,7 @@ namespace
         }
     };
 
-    void extractTextKeys(const Nif::NiTextKeyExtraData *tk, NifOsg::TextKeyMap &textkeys)
+    void extractTextKeys(const Nif::NiTextKeyExtraData *tk, SceneUtil::TextKeyMap &textkeys)
     {
         for(size_t i = 0;i < tk->list.size();i++)
         {
@@ -234,7 +234,7 @@ namespace NifOsg
         // This is used to queue emitters that weren't attached to their node yet.
         std::vector<std::pair<size_t, osg::ref_ptr<Emitter>>> mEmitterQueue;
 
-        static void loadKf(Nif::NIFFilePtr nif, KeyframeHolder& target)
+        static void loadKf(Nif::NIFFilePtr nif, SceneUtil::KeyframeHolder& target)
         {
             const Nif::NiSequenceStreamHelper *seq = nullptr;
             const size_t numRoots = nif->numRoots();
@@ -284,7 +284,7 @@ namespace NifOsg
                 if (key->data.empty() && key->interpolator.empty())
                     continue;
 
-                osg::ref_ptr<NifOsg::KeyframeController> callback(handleKeyframeController(key));
+                osg::ref_ptr<SceneUtil::KeyframeController> callback(handleKeyframeController(key));
                 callback->setFunction(std::shared_ptr<NifOsg::ControllerFunction>(new NifOsg::ControllerFunction(key)));
 
                 if (!target.mKeyframeControllers.emplace(strdata->string, callback).second)
@@ -305,7 +305,7 @@ namespace NifOsg
             if (!nifNode)
                 nif->fail("Found no root nodes");
 
-            osg::ref_ptr<TextKeyMapHolder> textkeys (new TextKeyMapHolder);
+            osg::ref_ptr<SceneUtil::TextKeyMapHolder> textkeys (new SceneUtil::TextKeyMapHolder);
 
             osg::ref_ptr<osg::Node> created = handleNode(nifNode, nullptr, imageManager, std::vector<unsigned int>(), 0, false, false, false, &textkeys->mTextKeys);
 
@@ -353,10 +353,10 @@ namespace NifOsg
                     else if (props[i].getPtr()->recType == Nif::RC_NiTexturingProperty)
                     {
                         if (props[i].getPtr()->recIndex == mFirstRootTextureIndex)
-                            applyTo->setUserValue("overrideFx", 1);                
+                            applyTo->setUserValue("overrideFx", 1);
                     }
                     handleProperty(props[i].getPtr(), applyTo, composite, imageManager, boundTextures, animflags);
-                }              
+                }
             }
         }
 
@@ -514,7 +514,7 @@ namespace NifOsg
         }
 
         osg::ref_ptr<osg::Node> handleNode(const Nif::Node* nifNode, osg::Group* parentNode, Resource::ImageManager* imageManager,
-                                std::vector<unsigned int> boundTextures, int animflags, bool skipMeshes, bool hasMarkers, bool hasAnimatedParents, TextKeyMap* textKeys, osg::Node* rootNode=nullptr)
+                                std::vector<unsigned int> boundTextures, int animflags, bool skipMeshes, bool hasMarkers, bool hasAnimatedParents, SceneUtil::TextKeyMap* textKeys, osg::Node* rootNode=nullptr)
         {
             if (rootNode != nullptr && Misc::StringUtils::ciEqual(nifNode->name, "Bounding Box"))
                 return nullptr;
@@ -1197,7 +1197,7 @@ namespace NifOsg
                         for (const auto& strip : data->strips)
                         {
                             if (strip.size() >= 3)
-                                geometry->addPrimitiveSet(new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLE_STRIP, strip.size(), 
+                                geometry->addPrimitiveSet(new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLE_STRIP, strip.size(),
                                                                                     (unsigned short*)strip.data()));
                         }
                     }
@@ -1929,7 +1929,7 @@ namespace NifOsg
         return impl.load(file, imageManager);
     }
 
-    void Loader::loadKf(Nif::NIFFilePtr kf, KeyframeHolder& target)
+    void Loader::loadKf(Nif::NIFFilePtr kf, SceneUtil::KeyframeHolder& target)
     {
         LoaderImpl impl(kf->getFilename(), kf->getVersion(), kf->getUserVersion(), kf->getBethVersion());
         impl.loadKf(kf, target);
diff --git a/components/nifosg/nifloader.hpp b/components/nifosg/nifloader.hpp
index 49a78ad5f6..8ee6b41674 100644
--- a/components/nifosg/nifloader.hpp
+++ b/components/nifosg/nifloader.hpp
@@ -2,12 +2,13 @@
 #define OPENMW_COMPONENTS_NIFOSG_LOADER
 
 #include <components/nif/niffile.hpp>
+#include <components/sceneutil/keyframe.hpp>
+#include <components/sceneutil/textkeymap.hpp>
 
 #include <osg/ref_ptr>
 #include <osg/Referenced>
 
 #include "controller.hpp"
-#include "textkeymap.hpp"
 
 namespace osg
 {
@@ -21,39 +22,6 @@ namespace Resource
 
 namespace NifOsg
 {
-    struct TextKeyMapHolder : public osg::Object
-    {
-    public:
-        TextKeyMapHolder() {}
-        TextKeyMapHolder(const TextKeyMapHolder& copy, const osg::CopyOp& copyop)
-            : osg::Object(copy, copyop)
-            , mTextKeys(copy.mTextKeys)
-        {}
-
-        TextKeyMap mTextKeys;
-
-        META_Object(NifOsg, TextKeyMapHolder)
-
-    };
-
-    class KeyframeHolder : public osg::Object
-    {
-    public:
-        KeyframeHolder() {}
-        KeyframeHolder(const KeyframeHolder& copy, const osg::CopyOp& copyop)
-            : mTextKeys(copy.mTextKeys)
-            , mKeyframeControllers(copy.mKeyframeControllers)
-        {
-        }
-
-        TextKeyMap mTextKeys;
-
-        META_Object(OpenMW, KeyframeHolder)
-
-        typedef std::map<std::string, osg::ref_ptr<const KeyframeController> > KeyframeControllerMap;
-        KeyframeControllerMap mKeyframeControllers;
-    };
-
     /// The main class responsible for loading NIF files into an OSG-Scenegraph.
     /// @par This scene graph is self-contained and can be cloned using osg::clone if desired. Particle emitters
     ///      and programs hold a pointer to their ParticleSystem, which would need to be manually updated when cloning.
@@ -64,7 +32,7 @@ namespace NifOsg
         static osg::ref_ptr<osg::Node> load(Nif::NIFFilePtr file, Resource::ImageManager* imageManager);
 
         /// Load keyframe controllers from the given kf file.
-        static void loadKf(Nif::NIFFilePtr kf, KeyframeHolder& target);
+        static void loadKf(Nif::NIFFilePtr kf, SceneUtil::KeyframeHolder& target);
 
         /// Set whether or not nodes marked as "MRK" should be shown.
         /// These should be hidden ingame, but visible in the editor.
diff --git a/components/resource/keyframemanager.cpp b/components/resource/keyframemanager.cpp
index 8c5c50adca..ef6339adb5 100644
--- a/components/resource/keyframemanager.cpp
+++ b/components/resource/keyframemanager.cpp
@@ -2,13 +2,45 @@
 
 #include <components/vfs/manager.hpp>
 
+#include <components/nifosg/nifloader.hpp>
+
 #include "objectcache.hpp"
+#include "scenemanager.hpp"
+
+namespace
+{
+    class RetrieveAnimationsVisitor : public osg::NodeVisitor
+    {
+    public:
+        RetrieveAnimationsVisitor(SceneUtil::KeyframeHolder& target) : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN), mTarget(target) {}
+
+
+        virtual void apply(osg::Node& node)
+        {
+            if (node.libraryName() == std::string("osgAnimation"))
+                std::cout << "found an " << node.className() << std::endl;
+            traverse(node);
+        }
+
+    private:
+        SceneUtil::KeyframeHolder& mTarget;
+    };
+
+    std::string getFileExtension(const std::string& file)
+    {
+        size_t extPos = file.find_last_of('.');
+        if (extPos != std::string::npos && extPos+1 < file.size())
+            return file.substr(extPos+1);
+        return std::string();
+    }
+}
 
 namespace Resource
 {
 
-    KeyframeManager::KeyframeManager(const VFS::Manager* vfs)
+    KeyframeManager::KeyframeManager(const VFS::Manager* vfs, SceneManager* sceneManager)
         : ResourceManager(vfs)
+        , mSceneManager(sceneManager)
     {
     }
 
@@ -16,19 +48,28 @@ namespace Resource
     {
     }
 
-    osg::ref_ptr<const NifOsg::KeyframeHolder> KeyframeManager::get(const std::string &name)
+    osg::ref_ptr<const SceneUtil::KeyframeHolder> KeyframeManager::get(const std::string &name)
     {
         std::string normalized = name;
         mVFS->normalizeFilename(normalized);
 
         osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(normalized);
         if (obj)
-            return osg::ref_ptr<const NifOsg::KeyframeHolder>(static_cast<NifOsg::KeyframeHolder*>(obj.get()));
+            return osg::ref_ptr<const SceneUtil::KeyframeHolder>(static_cast<SceneUtil::KeyframeHolder*>(obj.get()));
         else
         {
-            osg::ref_ptr<NifOsg::KeyframeHolder> loaded (new NifOsg::KeyframeHolder);
-            NifOsg::Loader::loadKf(Nif::NIFFilePtr(new Nif::NIFFile(mVFS->getNormalized(normalized), normalized)), *loaded.get());
-
+            osg::ref_ptr<SceneUtil::KeyframeHolder> loaded (new SceneUtil::KeyframeHolder);
+            std::string ext = getFileExtension(normalized);
+            if (ext == "kf")
+            {
+                NifOsg::Loader::loadKf(Nif::NIFFilePtr(new Nif::NIFFile(mVFS->getNormalized(normalized), normalized)), *loaded.get());
+            }
+            else
+            {
+                osg::ref_ptr<const osg::Node> scene = mSceneManager->getTemplate(normalized);
+                RetrieveAnimationsVisitor rav(*loaded.get());
+                const_cast<osg::Node*>(scene.get())->accept(rav); // const_cast required because there is no const version of osg::NodeVisitor
+            }
             mCache->addEntryToObjectCache(normalized, loaded);
             return loaded;
         }
diff --git a/components/resource/keyframemanager.hpp b/components/resource/keyframemanager.hpp
index fe1c4014e0..e186e2783b 100644
--- a/components/resource/keyframemanager.hpp
+++ b/components/resource/keyframemanager.hpp
@@ -4,26 +4,30 @@
 #include <osg/ref_ptr>
 #include <string>
 
-#include <components/nifosg/nifloader.hpp>
+#include <components/sceneutil/keyframe.hpp>
 
 #include "resourcemanager.hpp"
 
 namespace Resource
 {
 
+    class SceneManager;
+
     /// @brief Managing of keyframe resources
     /// @note May be used from any thread.
     class KeyframeManager : public ResourceManager
     {
     public:
-        KeyframeManager(const VFS::Manager* vfs);
+        KeyframeManager(const VFS::Manager* vfs, SceneManager* sceneManager);
         ~KeyframeManager();
 
         /// Retrieve a read-only keyframe resource by name (case-insensitive).
         /// @note Throws an exception if the resource is not found.
-        osg::ref_ptr<const NifOsg::KeyframeHolder> get(const std::string& name);
+        osg::ref_ptr<const SceneUtil::KeyframeHolder> get(const std::string& name);
 
         void reportStats(unsigned int frameNumber, osg::Stats* stats) const override;
+    private:
+        SceneManager* mSceneManager;
     };
 
 }
diff --git a/components/resource/resourcesystem.cpp b/components/resource/resourcesystem.cpp
index 2015ba874d..ab9d0aba2c 100644
--- a/components/resource/resourcesystem.cpp
+++ b/components/resource/resourcesystem.cpp
@@ -14,9 +14,9 @@ namespace Resource
         : mVFS(vfs)
     {
         mNifFileManager.reset(new NifFileManager(vfs));
-        mKeyframeManager.reset(new KeyframeManager(vfs));
         mImageManager.reset(new ImageManager(vfs));
         mSceneManager.reset(new SceneManager(vfs, mImageManager.get(), mNifFileManager.get()));
+        mKeyframeManager.reset(new KeyframeManager(vfs, mSceneManager.get()));
 
         addResourceManager(mNifFileManager.get());
         addResourceManager(mKeyframeManager.get());
diff --git a/components/sceneutil/keyframe.hpp b/components/sceneutil/keyframe.hpp
new file mode 100644
index 0000000000..c993c7b7c7
--- /dev/null
+++ b/components/sceneutil/keyframe.hpp
@@ -0,0 +1,68 @@
+#ifndef OPENMW_COMPONENTS_SCENEUTIL_KEYFRAME_HPP
+#define OPENMW_COMPONENTS_SCENEUTIL_KEYFRAME_HPP
+
+#include <map>
+
+#include <osg/Node>
+
+#include <components/sceneutil/controller.hpp>
+#include <components/sceneutil/textkeymap.hpp>
+
+namespace SceneUtil
+{
+
+    class KeyframeController : public osg::NodeCallback, public SceneUtil::Controller
+    {
+    public:
+        KeyframeController() {}
+
+        KeyframeController(const KeyframeController& copy, const osg::CopyOp& copyop)
+            : osg::NodeCallback(copy, copyop)
+            , SceneUtil::Controller(copy)
+        {}
+        META_Object(SceneUtil, KeyframeController)
+
+        virtual osg::Vec3f getTranslation(float time) const  { return osg::Vec3f(); }
+
+        virtual void operator() (osg::Node* node, osg::NodeVisitor* nodeVisitor) { traverse(node, nodeVisitor); }
+    };
+
+    /// Wrapper object containing an animation track as a ref-countable osg::Object.
+    struct TextKeyMapHolder : public osg::Object
+    {
+    public:
+        TextKeyMapHolder() {}
+        TextKeyMapHolder(const TextKeyMapHolder& copy, const osg::CopyOp& copyop)
+            : osg::Object(copy, copyop)
+            , mTextKeys(copy.mTextKeys)
+        {}
+
+        TextKeyMap mTextKeys;
+
+        META_Object(SceneUtil, TextKeyMapHolder)
+
+    };
+
+    /// Wrapper object containing the animation track and its KeyframeControllers.
+    class KeyframeHolder : public osg::Object
+    {
+    public:
+        KeyframeHolder() {}
+        KeyframeHolder(const KeyframeHolder& copy, const osg::CopyOp& copyop)
+            : mTextKeys(copy.mTextKeys)
+            , mKeyframeControllers(copy.mKeyframeControllers)
+        {
+        }
+
+        TextKeyMap mTextKeys;
+
+        META_Object(SceneUtil, KeyframeHolder)
+
+        /// Controllers mapped to node name.
+        typedef std::map<std::string, osg::ref_ptr<const KeyframeController> > KeyframeControllerMap;
+        KeyframeControllerMap mKeyframeControllers;
+    };
+
+}
+
+#endif
diff --git a/components/nifosg/textkeymap.hpp b/components/sceneutil/textkeymap.hpp
similarity index 94%
rename from components/nifosg/textkeymap.hpp
rename to components/sceneutil/textkeymap.hpp
index 49e1e461e4..ee58bc72a7 100644
--- a/components/nifosg/textkeymap.hpp
+++ b/components/sceneutil/textkeymap.hpp
@@ -1,12 +1,12 @@
-#ifndef OPENMW_COMPONENTS_NIFOSG_TEXTKEYMAP
-#define OPENMW_COMPONENTS_NIFOSG_TEXTKEYMAP
+#ifndef OPENMW_COMPONENTS_SCENEUTIL_TEXTKEYMAP
+#define OPENMW_COMPONENTS_SCENEUTIL_TEXTKEYMAP
 
 #include <algorithm>
 #include <map>
 #include <set>
 #include <string>
 
-namespace NifOsg
+namespace SceneUtil
 {
     class TextKeyMap
     {

From 6e77ad1f6a77cd31bd7fbf8ed7007015899013e9 Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Thu, 19 Nov 2020 01:11:56 +0200
Subject: [PATCH 0023/2859] OSG-Collada animation support

---
 CMakeLists.txt                          |   2 +-
 apps/openmw/mwrender/animation.cpp      |   2 +
 components/CMakeLists.txt               |   5 +-
 components/resource/animation.cpp       |  40 +++++
 components/resource/animation.hpp       |  39 +++++
 components/resource/keyframemanager.cpp |  94 +++++++++---
 components/resource/keyframemanager.hpp |  20 +++
 components/resource/scenemanager.cpp    |   2 +-
 components/sceneutil/clone.cpp          |  12 +-
 components/sceneutil/keyframe.hpp       |  13 ++
 components/sceneutil/osgacontroller.cpp | 195 ++++++++++++++++++++++++
 components/sceneutil/osgacontroller.hpp |  70 +++++++++
 12 files changed, 471 insertions(+), 23 deletions(-)
 create mode 100644 components/resource/animation.cpp
 create mode 100644 components/resource/animation.hpp
 create mode 100644 components/sceneutil/osgacontroller.cpp
 create mode 100644 components/sceneutil/osgacontroller.hpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 37696f44c4..76764fbd93 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -259,7 +259,7 @@ if(NOT HAVE_STDINT_H)
 endif()
 
 
-find_package(OpenSceneGraph 3.3.4 REQUIRED osgDB osgViewer osgText osgGA osgParticle osgUtil osgFX osgShadow)
+find_package(OpenSceneGraph 3.3.4 REQUIRED osgDB osgViewer osgText osgGA osgParticle osgUtil osgFX osgShadow osgAnimation)
 include_directories(SYSTEM ${OPENSCENEGRAPH_INCLUDE_DIRS})
 
 set(USED_OSG_PLUGINS
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index f8ff3780d3..8c9f5f4939 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -782,6 +782,8 @@ namespace MWRender
             NodeMap::const_iterator found = nodeMap.find("bip01");
             if (found == nodeMap.end())
                 found = nodeMap.find("root bone");
+            if (found == nodeMap.end())
+                found = nodeMap.find("root");
 
             if (found != nodeMap.end())
                 mAccumRoot = found->second;
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 08f183f5e8..3c18990375 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -41,7 +41,8 @@ add_component_dir (vfs
     )
 
 add_component_dir (resource
-    scenemanager keyframemanager imagemanager bulletshapemanager bulletshape niffilemanager objectcache multiobjectcache resourcesystem resourcemanager stats
+    scenemanager keyframemanager imagemanager bulletshapemanager bulletshape niffilemanager objectcache multiobjectcache resourcesystem
+    resourcemanager stats animation
     )
 
 add_component_dir (shader
@@ -51,7 +52,7 @@ add_component_dir (shader
 add_component_dir (sceneutil
     clone attach visitor util statesetupdater controller skeleton riggeometry morphgeometry lightcontroller
     lightmanager lightutil positionattitudetransform workqueue unrefqueue pathgridutil waterutil writescene serialize optimizer
-    actorutil detourdebugdraw navmesh agentpath shadow mwshadowtechnique recastmesh shadowsbin
+    actorutil detourdebugdraw navmesh agentpath shadow mwshadowtechnique recastmesh shadowsbin osgacontroller
     )
 
 add_component_dir (nif
diff --git a/components/resource/animation.cpp b/components/resource/animation.cpp
new file mode 100644
index 0000000000..34ae162ee7
--- /dev/null
+++ b/components/resource/animation.cpp
@@ -0,0 +1,40 @@
+#include <components/resource/animation.hpp>
+
+#include <osg/ref_ptr>
+#include <osgAnimation/Channel>
+
+namespace Resource
+{
+    Animation::Animation(const Animation& anim, const osg::CopyOp& copyop): osg::Object(anim, copyop),
+        mDuration(0.0f),
+        mStartTime(0.0f)
+    {
+        const osgAnimation::ChannelList& channels = anim.getChannels();
+        for (const osg::ref_ptr<osgAnimation::Channel> channel: channels)
+            addChannel(channel.get()->clone());
+    }
+
+    void Animation::addChannel(osg::ref_ptr<osgAnimation::Channel> pChannel)
+    {
+        mChannels.push_back(pChannel);
+    }
+
+    std::vector<osg::ref_ptr<osgAnimation::Channel>>& Animation::getChannels()
+    {
+        return mChannels;
+    }
+
+    const std::vector<osg::ref_ptr<osgAnimation::Channel>>& Animation::getChannels() const
+    {
+        return mChannels;
+    }
+
+    bool Animation::update (double time)
+    {
+        for (const osg::ref_ptr<osgAnimation::Channel> channel: mChannels)
+        {
+            channel->update(time, 1.0f, 0);
+        }
+        return true;
+    }
+}
diff --git a/components/resource/animation.hpp b/components/resource/animation.hpp
new file mode 100644
index 0000000000..885394747e
--- /dev/null
+++ b/components/resource/animation.hpp
@@ -0,0 +1,39 @@
+#ifndef OPENMW_COMPONENTS_RESOURCE_ANIMATION_HPP
+#define OPENMW_COMPONENTS_RESOURCE_ANIMATION_HPP
+
+#include <vector>
+
+#include <osg/Node>
+#include <osg/Object>
+#include <osgAnimation/Channel>
+
+namespace Resource
+{
+    /// Stripped down class of osgAnimation::Animation, only needed for OSG's plugin formats like dae
+    class Animation : public osg::Object
+    {
+        public:
+            META_Object(Resource, Animation)
+
+            Animation() :
+                mDuration(0.0), mStartTime(0) {}
+
+            Animation(const Animation&, const osg::CopyOp&);
+            ~Animation() {}
+
+            void addChannel (osg::ref_ptr<osgAnimation::Channel> pChannel);
+
+            std::vector<osg::ref_ptr<osgAnimation::Channel>>& getChannels();
+
+            const std::vector<osg::ref_ptr<osgAnimation::Channel>>& getChannels() const;
+
+            bool update (double time);
+
+        protected:
+            double mDuration;
+            double mStartTime;
+            std::vector<osg::ref_ptr<osgAnimation::Channel>> mChannels;
+        };
+}
+
+#endif
diff --git a/components/resource/keyframemanager.cpp b/components/resource/keyframemanager.cpp
index ef6339adb5..6cda9728cd 100644
--- a/components/resource/keyframemanager.cpp
+++ b/components/resource/keyframemanager.cpp
@@ -2,29 +2,86 @@
 
 #include <components/vfs/manager.hpp>
 
+#include <osgAnimation/Animation>
+#include <osgAnimation/BasicAnimationManager>
+#include <osgAnimation/Channel>
+
 #include <components/nifosg/nifloader.hpp>
+#include <components/sceneutil/keyframe.hpp>
+#include <components/sceneutil/osgacontroller.hpp>
 
+#include "animation.hpp"
 #include "objectcache.hpp"
 #include "scenemanager.hpp"
 
-namespace
+namespace OsgAOpenMW
 {
-    class RetrieveAnimationsVisitor : public osg::NodeVisitor
-    {
-    public:
-        RetrieveAnimationsVisitor(SceneUtil::KeyframeHolder& target) : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN), mTarget(target) {}
 
+    RetrieveAnimationsVisitor::RetrieveAnimationsVisitor(SceneUtil::KeyframeHolder& target, osg::ref_ptr<osgAnimation::BasicAnimationManager> animationManager) : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN), mTarget(target), mAnimationManager(animationManager) {}
 
-        virtual void apply(osg::Node& node)
-        {
-            if (node.libraryName() == std::string("osgAnimation"))
-                std::cout << "found an " << node.className() << std::endl;
-            traverse(node);
-        }
+    void RetrieveAnimationsVisitor::apply(osg::Node& node)
+    {
+        if (node.libraryName() == std::string("osgAnimation") && node.className() == std::string("Bone") && node.getName() == std::string("root"))
+            {
+                if (!mAnimationManager)
+                {
+                    traverse(node);
+                    return;
+                }
+
+                osg::ref_ptr<OsgaController::KeyframeController> callback = new OsgaController::KeyframeController();
+
+                std::vector<SceneUtil::EmulatedAnimation> emulatedAnimations;
+
+                for (auto animation : mAnimationManager->getAnimationList())
+                {
+                    if (animation)
+                    {
+                        if (animation->getName() == "Default") //"Default" is osg dae plugin's default naming scheme for unnamed animations
+                        {
+                            animation->setName(std::string("idle")); // animation naming scheme "idle: start" and "idle: stop" is the default idle animation that OpenMW seems to want to play
+                        }
+
+                        osg::ref_ptr<Resource::Animation> mergedAnimationTrack = new Resource::Animation;
+                        std::string animationName = animation->getName();
+                        std::string start = animationName + std::string(": start");
+                        std::string stop = animationName + std::string(": stop");
+                        std::string loopstart = animationName + std::string(": loop start");
+                        std::string loopstop = animationName + std::string(": loop stop");
+
+                        const osgAnimation::ChannelList& channels = animation->getChannels();
+                        for (const osg::ref_ptr<osgAnimation::Channel> channel: channels)
+                        {
+                            mergedAnimationTrack->addChannel(channel.get()->clone()); // is ->clone needed?
+                        }
+                        mergedAnimationTrack->setName(animation->getName());
+                        callback->addMergedAnimationTrack(mergedAnimationTrack);
+
+                        float startTime = animation->getStartTime();
+                        float stopTime = startTime + animation->getDuration();
+
+                        // mTextKeys is a nif-thing, used by OpenMW's animation system
+                        // Format is likely "AnimationName: [Keyword_optional] [Start OR Stop]"
+                        // AnimationNames are keywords like idle2, idle3... AiPackages and various mechanics control which animations are played
+                        // Keywords can be stuff like Loop, Equip, Unequip, Block, InventoryHandtoHand, InventoryWeaponOneHand, PickProbe, Slash, Thrust, Chop... even "Slash Small Follow"
+                        mTarget.mTextKeys.emplace(startTime, std::move(start));
+                        mTarget.mTextKeys.emplace(stopTime, std::move(stop));
+                        mTarget.mTextKeys.emplace(startTime, std::move(loopstart));
+                        mTarget.mTextKeys.emplace(stopTime, std::move(loopstop));
+
+                        SceneUtil::EmulatedAnimation emulatedAnimation;
+                        emulatedAnimation.mStartTime = startTime;
+                        emulatedAnimation.mStopTime = stopTime;
+                        emulatedAnimation.mName = animationName;
+                        emulatedAnimations.emplace_back(emulatedAnimation);
+                    }
+                }
+                callback->setEmulatedAnimations(emulatedAnimations);
+                mTarget.mKeyframeControllers.emplace(node.getName(), callback);
+            }
 
-    private:
-        SceneUtil::KeyframeHolder& mTarget;
-    };
+        traverse(node);
+    }
 
     std::string getFileExtension(const std::string& file)
     {
@@ -59,16 +116,17 @@ namespace Resource
         else
         {
             osg::ref_ptr<SceneUtil::KeyframeHolder> loaded (new SceneUtil::KeyframeHolder);
-            std::string ext = getFileExtension(normalized);
+            std::string ext = OsgAOpenMW::getFileExtension(normalized);
             if (ext == "kf")
             {
                 NifOsg::Loader::loadKf(Nif::NIFFilePtr(new Nif::NIFFile(mVFS->getNormalized(normalized), normalized)), *loaded.get());
             }
             else
             {
-                osg::ref_ptr<const osg::Node> scene = mSceneManager->getTemplate(normalized);
-                RetrieveAnimationsVisitor rav(*loaded.get());
-                const_cast<osg::Node*>(scene.get())->accept(rav); // const_cast required because there is no const version of osg::NodeVisitor
+                osg::ref_ptr<osg::Node> scene = const_cast<osg::Node*> ( mSceneManager->getTemplate(normalized).get() );
+                osg::ref_ptr<osgAnimation::BasicAnimationManager> bam = dynamic_cast<osgAnimation::BasicAnimationManager*> (scene->getUpdateCallback());
+                OsgAOpenMW::RetrieveAnimationsVisitor rav(*loaded.get(), bam);
+                scene->accept(rav);
             }
             mCache->addEntryToObjectCache(normalized, loaded);
             return loaded;
diff --git a/components/resource/keyframemanager.hpp b/components/resource/keyframemanager.hpp
index e186e2783b..4f83196f34 100644
--- a/components/resource/keyframemanager.hpp
+++ b/components/resource/keyframemanager.hpp
@@ -2,12 +2,32 @@
 #define OPENMW_COMPONENTS_KEYFRAMEMANAGER_H
 
 #include <osg/ref_ptr>
+#include <osgAnimation/BasicAnimationManager>
 #include <string>
 
 #include <components/sceneutil/keyframe.hpp>
 
 #include "resourcemanager.hpp"
 
+namespace OsgAOpenMW
+{
+    /// @brief extract animations to OpenMW's animation system
+    class RetrieveAnimationsVisitor : public osg::NodeVisitor
+    {
+        public:
+            RetrieveAnimationsVisitor(SceneUtil::KeyframeHolder& target, osg::ref_ptr<osgAnimation::BasicAnimationManager> animationManager);
+
+            virtual void apply(osg::Node& node);
+
+        private:
+            SceneUtil::KeyframeHolder& mTarget;
+            osg::ref_ptr<osgAnimation::BasicAnimationManager> mAnimationManager;
+
+    };
+
+    std::string getFileExtension(const std::string& file);
+}
+
 namespace Resource
 {
 
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 44ba7e6878..e99003b749 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -492,7 +492,7 @@ namespace Resource
             }
             catch (std::exception& e)
             {
-                static const char * const sMeshTypes[] = { "nif", "osg", "osgt", "osgb", "osgx", "osg2" };
+                static const char * const sMeshTypes[] = { "nif", "osg", "osgt", "osgb", "osgx", "osg2", "dae" };
 
                 for (unsigned int i=0; i<sizeof(sMeshTypes)/sizeof(sMeshTypes[0]); ++i)
                 {
diff --git a/components/sceneutil/clone.cpp b/components/sceneutil/clone.cpp
index 1de7bfd91e..07a6e691ad 100644
--- a/components/sceneutil/clone.cpp
+++ b/components/sceneutil/clone.cpp
@@ -2,6 +2,11 @@
 
 #include <osg/StateSet>
 
+#include <osgAnimation/Bone>
+#include <osgAnimation/Skeleton>
+#include <osgAnimation/MorphGeometry>
+#include <osgAnimation/RigGeometry>
+
 #include <osgParticle/ParticleProcessor>
 #include <osgParticle/ParticleSystemUpdater>
 #include <osgParticle/Emitter>
@@ -30,6 +35,11 @@ namespace SceneUtil
             mUpdaterToOldPs[cloned] = updater->getParticleSystem(0);
             return cloned;
         }
+
+        if (dynamic_cast<const osgAnimation::Bone*>(node) || dynamic_cast<const osgAnimation::Skeleton*>(node))
+        {
+            return osg::clone(node, *this);
+        }
         return osg::CopyOp::operator()(node);
     }
 
@@ -38,7 +48,7 @@ namespace SceneUtil
         if (const osgParticle::ParticleSystem* partsys = dynamic_cast<const osgParticle::ParticleSystem*>(drawable))
             return operator()(partsys);
 
-        if (dynamic_cast<const SceneUtil::RigGeometry*>(drawable) || dynamic_cast<const SceneUtil::MorphGeometry*>(drawable))
+        if (dynamic_cast<const SceneUtil::RigGeometry*>(drawable) || dynamic_cast<const SceneUtil::MorphGeometry*>(drawable) || dynamic_cast<const osgAnimation::RigGeometry*>(drawable) || dynamic_cast<const osgAnimation::MorphGeometry*>(drawable))
         {
             return static_cast<osg::Drawable*>(drawable->clone(*this));
         }
diff --git a/components/sceneutil/keyframe.hpp b/components/sceneutil/keyframe.hpp
index c993c7b7c7..5a0435469c 100644
--- a/components/sceneutil/keyframe.hpp
+++ b/components/sceneutil/keyframe.hpp
@@ -7,9 +7,16 @@
 
 #include <components/sceneutil/controller.hpp>
 #include <components/sceneutil/textkeymap.hpp>
+#include <components/resource/animation.hpp>
 
 namespace SceneUtil
 {
+    struct EmulatedAnimation
+    {
+        float mStartTime;
+        float mStopTime;
+        std::string mName;
+    };
 
     class KeyframeController : public osg::NodeCallback, public SceneUtil::Controller
     {
@@ -19,12 +26,18 @@ namespace SceneUtil
         KeyframeController(const KeyframeController& copy, const osg::CopyOp& copyop)
             : osg::NodeCallback(copy, copyop)
             , SceneUtil::Controller(copy)
+            , mMergedAnimationTracks(copy.mMergedAnimationTracks)
+            , mEmulatedAnimations(copy.mEmulatedAnimations)
         {}
         META_Object(SceneUtil, KeyframeController)
 
         virtual osg::Vec3f getTranslation(float time) const  { return osg::Vec3f(); }
 
         virtual void operator() (osg::Node* node, osg::NodeVisitor* nodeVisitor) { traverse(node, nodeVisitor); }
+
+    protected:
+        std::vector<osg::ref_ptr<Resource::Animation>> mMergedAnimationTracks; // Used only by osgAnimation-based formats (e.g. dae)
+        std::vector<EmulatedAnimation> mEmulatedAnimations;
     };
 
     /// Wrapper object containing an animation track as a ref-countable osg::Object.
diff --git a/components/sceneutil/osgacontroller.cpp b/components/sceneutil/osgacontroller.cpp
new file mode 100644
index 0000000000..6b635d4ea1
--- /dev/null
+++ b/components/sceneutil/osgacontroller.cpp
@@ -0,0 +1,195 @@
+#include <components/sceneutil/osgacontroller.hpp>
+
+#include <osg/Geode>
+#include <osg/Node>
+#include <osg/NodeVisitor>
+#include <osg/ref_ptr>
+#include <osg/StateSet>
+
+#include <osgAnimation/Animation>
+#include <osgAnimation/AnimationUpdateCallback>
+#include <osgAnimation/Channel>
+#include <osgAnimation/BasicAnimationManager>
+#include <osgAnimation/Bone>
+#include <osgAnimation/Sampler>
+#include <osgAnimation/Skeleton>
+#include <osgAnimation/RigGeometry>
+#include <osgAnimation/UpdateMatrixTransform>
+
+#include <components/debug/debuglog.hpp>
+#include <components/resource/animation.hpp>
+#include <components/sceneutil/controller.hpp>
+#include <components/sceneutil/keyframe.hpp>
+
+namespace OsgaController
+{
+    LinkVisitor::LinkVisitor() : osg::NodeVisitor( TRAVERSE_ALL_CHILDREN )
+    {
+        mAnimation = nullptr;
+    }
+
+    void LinkVisitor::link(osgAnimation::UpdateMatrixTransform* umt)
+    {
+        const osgAnimation::ChannelList& channels = mAnimation->getChannels();
+        for (const osg::ref_ptr<osgAnimation::Channel> channel: channels)
+        {
+            const std::string& channelName = channel->getName();
+            const std::string& channelTargetName = channel->getTargetName();
+
+            if (channelTargetName != umt->getName()) continue;
+
+            // check if we can link a StackedTransformElement to the current Channel
+            for (auto stackedTransform : umt->getStackedTransforms())
+            {
+                osgAnimation::StackedTransformElement* element = stackedTransform.get();
+                if (element && !element->getName().empty() && channelName == element->getName())
+                {
+                    osgAnimation::Target* target = element->getOrCreateTarget();
+                    if (target)
+                    {
+                        channel->setTarget(target);
+                    }
+                }
+            }
+        }
+    }
+
+    void LinkVisitor::handle_stateset(osg::StateSet* stateset)
+    {
+        if (!stateset)
+            return;
+        const osg::StateSet::AttributeList& attributeList = stateset->getAttributeList();
+        for (auto attribute : attributeList)
+        {
+            osg::StateAttribute* sattr = attribute.second.first.get();
+            osgAnimation::UpdateMatrixTransform* umt = dynamic_cast<osgAnimation::UpdateMatrixTransform*>(sattr->getUpdateCallback()); //Can this even be in sa?
+            if (umt) link(umt);
+        }
+    }
+
+    void LinkVisitor::setAnimation(Resource::Animation* animation)
+    {
+        mAnimation = animation;
+    }
+
+    void LinkVisitor::apply(osg::Node& node)
+    {
+        osg::StateSet* st = node.getStateSet();
+        if (st)
+        handle_stateset(st);
+
+        osg::Callback* cb = node.getUpdateCallback();
+        while (cb)
+        {
+            osgAnimation::UpdateMatrixTransform* umt = dynamic_cast<osgAnimation::UpdateMatrixTransform*>(cb);
+            if (umt)
+                if (node.getName() != "root") link(umt);
+            cb = cb->getNestedCallback();
+        }
+
+        traverse( node );
+    }
+
+    void LinkVisitor::apply(osg::Geode& node)
+    {
+        for (unsigned int i = 0; i < node.getNumDrawables(); i++)
+        {
+            osg::Drawable* drawable = node.getDrawable(i);
+            if (drawable && drawable->getStateSet())
+                handle_stateset(drawable->getStateSet());
+        }
+        apply(static_cast<osg::Node&>(node));
+    }
+
+    KeyframeController::KeyframeController(const KeyframeController &copy, const osg::CopyOp &copyop) : SceneUtil::KeyframeController(copy, copyop)
+    {
+        mLinker = nullptr;
+    }
+
+    osg::Vec3f KeyframeController::getTranslation(float time) const
+    {
+        osg::Vec3f translationValue;
+        std::string animationName;
+        float newTime = time;
+
+        //Find the correct animation based on time
+        for (auto emulatedAnimation : mEmulatedAnimations)
+        {
+            if (time > emulatedAnimation.mStartTime && time < emulatedAnimation.mStopTime)
+            {
+                newTime = time - emulatedAnimation.mStartTime;
+                animationName = emulatedAnimation.mName;
+            }
+        }
+
+        //Find the root transform track in animation
+        for (auto mergedAnimationTrack : mMergedAnimationTracks)
+        {
+            if (mergedAnimationTrack->getName() != animationName) continue;
+
+            const osgAnimation::ChannelList& channels = mergedAnimationTrack->getChannels();
+
+            for (const osg::ref_ptr<osgAnimation::Channel> channel: channels)
+            {
+                if (channel->getTargetName() != "root" || channel->getName() != "transform") continue;
+
+                if ( osgAnimation::MatrixLinearSampler* templateSampler = dynamic_cast<osgAnimation::MatrixLinearSampler*> (channel->getSampler()) )
+                {
+                    osg::Matrixf matrix;
+                    templateSampler->getValueAt(newTime, matrix);
+                    translationValue = matrix.getTrans();
+                    return osg::Vec3f(translationValue[0], translationValue[1], translationValue[2]);
+                }
+            }
+        }
+
+        return osg::Vec3f();
+    }
+
+    void KeyframeController::update(float time, std::string animationName)
+    {
+        for (auto mergedAnimationTrack : mMergedAnimationTracks)
+        {
+            if (mergedAnimationTrack->getName() == animationName) mergedAnimationTrack->update(time);
+        }
+    }
+
+    void KeyframeController::operator() (osg::Node* node, osg::NodeVisitor* nv)
+    {
+        if (hasInput())
+        {
+            if (mNeedToLink)
+            {
+                for (auto mergedAnimationTrack : mMergedAnimationTracks)
+                {
+                    if (!mLinker.valid()) mLinker = new LinkVisitor();
+                    mLinker->setAnimation(mergedAnimationTrack);
+                    node->accept(*mLinker);
+                }
+                mNeedToLink = false;
+            }
+
+            float time = getInputValue(nv);
+
+            for (auto emulatedAnimation : mEmulatedAnimations)
+            {
+                if (time > emulatedAnimation.mStartTime && time < emulatedAnimation.mStopTime)
+                {
+                    update(time - emulatedAnimation.mStartTime, emulatedAnimation.mName);
+                }
+            }
+        }
+
+        traverse(node, nv);
+    }
+
+    void KeyframeController::setEmulatedAnimations(std::vector<SceneUtil::EmulatedAnimation> emulatedAnimations)
+    {
+        mEmulatedAnimations = emulatedAnimations;
+    }
+
+    void KeyframeController::addMergedAnimationTrack(osg::ref_ptr<Resource::Animation> animationTrack)
+    {
+        mMergedAnimationTracks.emplace_back(animationTrack);
+    }
+}
diff --git a/components/sceneutil/osgacontroller.hpp b/components/sceneutil/osgacontroller.hpp
new file mode 100644
index 0000000000..4ae1221992
--- /dev/null
+++ b/components/sceneutil/osgacontroller.hpp
@@ -0,0 +1,70 @@
+#ifndef OPENMW_COMPONENTS_SCENEUTIL_OSGACONTROLLER_HPP
+#define OPENMW_COMPONENTS_SCENEUTIL_OSGACONTROLLER_HPP
+
+#include <osg/Node>
+#include <osg/NodeVisitor>
+#include <osg/StateSet>
+#include <osg/ref_ptr>
+#include <osgAnimation/Animation>
+#include <osgAnimation/AnimationUpdateCallback>
+#include <osgAnimation/Channel>
+#include <osgAnimation/BasicAnimationManager>
+#include <osgAnimation/StackedTransform>
+#include <osgAnimation/UpdateMatrixTransform>
+
+#include <components/sceneutil/controller.hpp>
+#include <components/sceneutil/keyframe.hpp>
+#include <components/resource/animation.hpp>
+
+namespace OsgaController
+{
+    class LinkVisitor : public osg::NodeVisitor
+    {
+        public:
+            LinkVisitor();
+
+            virtual void link(osgAnimation::UpdateMatrixTransform* umt);
+
+            virtual void handle_stateset(osg::StateSet* stateset);
+
+            virtual void setAnimation(Resource::Animation* animation);
+
+            virtual void apply(osg::Node& node);
+
+            virtual void apply(osg::Geode& node);
+
+        protected:
+            Resource::Animation* mAnimation;
+    };
+
+    class KeyframeController : public SceneUtil::KeyframeController
+    {
+    public:
+        /// @brief Handles the animation for osgAnimation formats
+        KeyframeController() {};
+
+        KeyframeController(const KeyframeController& copy, const osg::CopyOp& copyop);
+
+        META_Object(OsgaController, KeyframeController)
+
+        /// @brief Handles the location of the instance
+        osg::Vec3f getTranslation(float time) const override;
+
+        /// @brief Calls animation track update()
+        void update(float time, std::string animationName);
+
+        /// @brief Called every frame for osgAnimation
+        void operator() (osg::Node*, osg::NodeVisitor*) override;
+
+        /// @brief Sets details of the animations
+        void setEmulatedAnimations(std::vector<SceneUtil::EmulatedAnimation> emulatedAnimations);
+
+        /// @brief Adds an animation track to a model
+        void addMergedAnimationTrack(osg::ref_ptr<Resource::Animation> animationTrack);
+    private:
+        bool mNeedToLink = true;
+        osg::ref_ptr<LinkVisitor> mLinker;
+    };
+}
+
+#endif

From 2413de38b52d6c6184f5b393f800d20086345b37 Mon Sep 17 00:00:00 2001
From: jefetienne <etienneayoub@gmail.com>
Date: Tue, 17 Nov 2020 19:47:56 -0500
Subject: [PATCH 0024/2859] Extend spell/item search to search by magic effect
 name

---
 apps/openmw/mwgui/spellmodel.cpp | 46 +++++++++++++++++++++++++++++---
 apps/openmw/mwgui/spellmodel.hpp |  3 +++
 2 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwgui/spellmodel.cpp b/apps/openmw/mwgui/spellmodel.cpp
index 1dedfa10b1..2ae92e33fe 100644
--- a/apps/openmw/mwgui/spellmodel.cpp
+++ b/apps/openmw/mwgui/spellmodel.cpp
@@ -42,6 +42,44 @@ namespace MWGui
     {
     }
 
+    bool SpellModel::matchingEffectExists(std::string filter, const ESM::EffectList &effects)
+    {
+        auto wm = MWBase::Environment::get().getWindowManager();
+        const MWWorld::ESMStore &store =
+            MWBase::Environment::get().getWorld()->getStore();
+
+        for (unsigned int i = 0; i < effects.mList.size(); ++i)
+        {
+            short effectId = effects.mList[i].mEffectID;
+            const ESM::MagicEffect *magicEffect =
+                store.get<ESM::MagicEffect>().search(effectId);
+
+            if (effectId != -1)
+            {
+                std::string effectIDStr = ESM::MagicEffect::effectIdToString(effectId);
+                std::string fullEffectName = wm->getGameSettingString(effectIDStr, "");
+
+                if (magicEffect->mData.mFlags & ESM::MagicEffect::TargetSkill && effects.mList[i].mSkill != -1)
+                {
+                    fullEffectName += " " + wm->getGameSettingString(ESM::Skill::sSkillNameIds[effects.mList[i].mSkill], "");
+                }
+
+                if (magicEffect->mData.mFlags & ESM::MagicEffect::TargetAttribute && effects.mList[i].mAttribute != -1)
+                {
+                    fullEffectName += " " + wm->getGameSettingString(ESM::Attribute::sGmstAttributeIds[effects.mList[i].mAttribute], "");
+                }
+
+                std::string convert = Misc::StringUtils::lowerCaseUtf8(fullEffectName);
+                if (convert.find(filter) != std::string::npos)
+                {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
     void SpellModel::update()
     {
         mSpells.clear();
@@ -61,8 +99,9 @@ namespace MWGui
                 continue;
 
             std::string name = Misc::StringUtils::lowerCaseUtf8(spell->mName);
-
-            if (name.find(filter) == std::string::npos)
+ 
+            if (name.find(filter) == std::string::npos 
+                && !matchingEffectExists(filter, spell->mEffects))
                 continue;
 
             Spell newSpell;
@@ -103,7 +142,8 @@ namespace MWGui
 
             std::string name = Misc::StringUtils::lowerCaseUtf8(item.getClass().getName(item));
 
-            if (name.find(filter) == std::string::npos)
+            if (name.find(filter) == std::string::npos
+                && !matchingEffectExists(filter, enchant->mEffects))
                 continue;
 
             Spell newSpell;
diff --git a/apps/openmw/mwgui/spellmodel.hpp b/apps/openmw/mwgui/spellmodel.hpp
index d191cba0e0..2404610bf1 100644
--- a/apps/openmw/mwgui/spellmodel.hpp
+++ b/apps/openmw/mwgui/spellmodel.hpp
@@ -2,6 +2,7 @@
 #define OPENMW_GUI_SPELLMODEL_H
 
 #include "../mwworld/ptr.hpp"
+#include <components/esm/effectlist.hpp>
 
 namespace MWGui
 {
@@ -57,6 +58,8 @@ namespace MWGui
         std::vector<Spell> mSpells;
 
         std::string mFilter;
+
+        bool matchingEffectExists(std::string filter, const ESM::EffectList &effects);
     };
 
 }

From bc6f46465f9d3bf09aebbd44689898673998efe4 Mon Sep 17 00:00:00 2001
From: jefetienne <etienneayoub@gmail.com>
Date: Wed, 18 Nov 2020 14:30:41 -0500
Subject: [PATCH 0025/2859] Add to changelog, authors. Move variable
 declaration inside block

---
 AUTHORS.md                       | 1 +
 CHANGELOG.md                     | 1 +
 apps/openmw/mwgui/spellmodel.cpp | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index 25004078e0..09ab784125 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -96,6 +96,7 @@ Programmers
     Jan Borsodi (am0s)
     Jason Hooks (jhooks)
     jeaye
+    jefetienne
     Jeffrey Haines (Jyby)
     Jengerer
     Jiří Kuneš (kunesj)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51babd907b..8f909a19fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -87,6 +87,7 @@
     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
     Task #5480: Drop Qt4 support
     Task #5520: Improve cell name autocompleter implementation
 
diff --git a/apps/openmw/mwgui/spellmodel.cpp b/apps/openmw/mwgui/spellmodel.cpp
index 2ae92e33fe..136547c4c1 100644
--- a/apps/openmw/mwgui/spellmodel.cpp
+++ b/apps/openmw/mwgui/spellmodel.cpp
@@ -51,11 +51,11 @@ namespace MWGui
         for (unsigned int i = 0; i < effects.mList.size(); ++i)
         {
             short effectId = effects.mList[i].mEffectID;
-            const ESM::MagicEffect *magicEffect =
-                store.get<ESM::MagicEffect>().search(effectId);
 
             if (effectId != -1)
             {
+                const ESM::MagicEffect *magicEffect =
+                    store.get<ESM::MagicEffect>().search(effectId);
                 std::string effectIDStr = ESM::MagicEffect::effectIdToString(effectId);
                 std::string fullEffectName = wm->getGameSettingString(effectIDStr, "");
 

From 32d4344803702efb99d435b0732a4c883c4c360a Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Fri, 20 Nov 2020 19:38:29 +0200
Subject: [PATCH 0026/2859] Don't copy osga-data in base class
 keyframecontroller, fix warnings.

---
 components/resource/keyframemanager.cpp |  4 ++--
 components/resource/keyframemanager.hpp |  2 +-
 components/sceneutil/keyframe.hpp       | 15 +--------------
 components/sceneutil/osgacontroller.cpp |  4 +++-
 components/sceneutil/osgacontroller.hpp | 16 +++++++++++++---
 5 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/components/resource/keyframemanager.cpp b/components/resource/keyframemanager.cpp
index 6cda9728cd..d084d6a08e 100644
--- a/components/resource/keyframemanager.cpp
+++ b/components/resource/keyframemanager.cpp
@@ -31,7 +31,7 @@ namespace OsgAOpenMW
 
                 osg::ref_ptr<OsgaController::KeyframeController> callback = new OsgaController::KeyframeController();
 
-                std::vector<SceneUtil::EmulatedAnimation> emulatedAnimations;
+                std::vector<OsgaController::EmulatedAnimation> emulatedAnimations;
 
                 for (auto animation : mAnimationManager->getAnimationList())
                 {
@@ -69,7 +69,7 @@ namespace OsgAOpenMW
                         mTarget.mTextKeys.emplace(startTime, std::move(loopstart));
                         mTarget.mTextKeys.emplace(stopTime, std::move(loopstop));
 
-                        SceneUtil::EmulatedAnimation emulatedAnimation;
+                        OsgaController::EmulatedAnimation emulatedAnimation;
                         emulatedAnimation.mStartTime = startTime;
                         emulatedAnimation.mStopTime = stopTime;
                         emulatedAnimation.mName = animationName;
diff --git a/components/resource/keyframemanager.hpp b/components/resource/keyframemanager.hpp
index 4f83196f34..778b4bc9a9 100644
--- a/components/resource/keyframemanager.hpp
+++ b/components/resource/keyframemanager.hpp
@@ -17,7 +17,7 @@ namespace OsgAOpenMW
         public:
             RetrieveAnimationsVisitor(SceneUtil::KeyframeHolder& target, osg::ref_ptr<osgAnimation::BasicAnimationManager> animationManager);
 
-            virtual void apply(osg::Node& node);
+            virtual void apply(osg::Node& node) override;
 
         private:
             SceneUtil::KeyframeHolder& mTarget;
diff --git a/components/sceneutil/keyframe.hpp b/components/sceneutil/keyframe.hpp
index 5a0435469c..e09541cb9a 100644
--- a/components/sceneutil/keyframe.hpp
+++ b/components/sceneutil/keyframe.hpp
@@ -11,13 +11,6 @@
 
 namespace SceneUtil
 {
-    struct EmulatedAnimation
-    {
-        float mStartTime;
-        float mStopTime;
-        std::string mName;
-    };
-
     class KeyframeController : public osg::NodeCallback, public SceneUtil::Controller
     {
     public:
@@ -26,18 +19,12 @@ namespace SceneUtil
         KeyframeController(const KeyframeController& copy, const osg::CopyOp& copyop)
             : osg::NodeCallback(copy, copyop)
             , SceneUtil::Controller(copy)
-            , mMergedAnimationTracks(copy.mMergedAnimationTracks)
-            , mEmulatedAnimations(copy.mEmulatedAnimations)
         {}
         META_Object(SceneUtil, KeyframeController)
 
         virtual osg::Vec3f getTranslation(float time) const  { return osg::Vec3f(); }
 
-        virtual void operator() (osg::Node* node, osg::NodeVisitor* nodeVisitor) { traverse(node, nodeVisitor); }
-
-    protected:
-        std::vector<osg::ref_ptr<Resource::Animation>> mMergedAnimationTracks; // Used only by osgAnimation-based formats (e.g. dae)
-        std::vector<EmulatedAnimation> mEmulatedAnimations;
+        virtual void operator() (osg::Node* node, osg::NodeVisitor* nodeVisitor) override { traverse(node, nodeVisitor); }
     };
 
     /// Wrapper object containing an animation track as a ref-countable osg::Object.
diff --git a/components/sceneutil/osgacontroller.cpp b/components/sceneutil/osgacontroller.cpp
index 6b635d4ea1..e20ecb5b89 100644
--- a/components/sceneutil/osgacontroller.cpp
+++ b/components/sceneutil/osgacontroller.cpp
@@ -102,6 +102,8 @@ namespace OsgaController
     }
 
     KeyframeController::KeyframeController(const KeyframeController &copy, const osg::CopyOp &copyop) : SceneUtil::KeyframeController(copy, copyop)
+    , mMergedAnimationTracks(copy.mMergedAnimationTracks)
+    , mEmulatedAnimations(copy.mEmulatedAnimations)
     {
         mLinker = nullptr;
     }
@@ -183,7 +185,7 @@ namespace OsgaController
         traverse(node, nv);
     }
 
-    void KeyframeController::setEmulatedAnimations(std::vector<SceneUtil::EmulatedAnimation> emulatedAnimations)
+    void KeyframeController::setEmulatedAnimations(std::vector<EmulatedAnimation> emulatedAnimations)
     {
         mEmulatedAnimations = emulatedAnimations;
     }
diff --git a/components/sceneutil/osgacontroller.hpp b/components/sceneutil/osgacontroller.hpp
index 4ae1221992..a3072088aa 100644
--- a/components/sceneutil/osgacontroller.hpp
+++ b/components/sceneutil/osgacontroller.hpp
@@ -18,6 +18,13 @@
 
 namespace OsgaController
 {
+    struct EmulatedAnimation
+    {
+        float mStartTime;
+        float mStopTime;
+        std::string mName;
+    };
+
     class LinkVisitor : public osg::NodeVisitor
     {
         public:
@@ -29,9 +36,9 @@ namespace OsgaController
 
             virtual void setAnimation(Resource::Animation* animation);
 
-            virtual void apply(osg::Node& node);
+            virtual void apply(osg::Node& node) override;
 
-            virtual void apply(osg::Geode& node);
+            virtual void apply(osg::Geode& node) override;
 
         protected:
             Resource::Animation* mAnimation;
@@ -57,13 +64,16 @@ namespace OsgaController
         void operator() (osg::Node*, osg::NodeVisitor*) override;
 
         /// @brief Sets details of the animations
-        void setEmulatedAnimations(std::vector<SceneUtil::EmulatedAnimation> emulatedAnimations);
+        void setEmulatedAnimations(std::vector<EmulatedAnimation> emulatedAnimations);
 
         /// @brief Adds an animation track to a model
         void addMergedAnimationTrack(osg::ref_ptr<Resource::Animation> animationTrack);
+
     private:
         bool mNeedToLink = true;
         osg::ref_ptr<LinkVisitor> mLinker;
+        std::vector<osg::ref_ptr<Resource::Animation>> mMergedAnimationTracks; // Used only by osgAnimation-based formats (e.g. dae)
+        std::vector<EmulatedAnimation> mEmulatedAnimations;
     };
 }
 

From 3232faa703bfe5963895c35a69534def1c283e21 Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Fri, 20 Nov 2020 19:41:01 +0200
Subject: [PATCH 0027/2859] Use const ref instead of value

---
 components/sceneutil/osgacontroller.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/sceneutil/osgacontroller.cpp b/components/sceneutil/osgacontroller.cpp
index e20ecb5b89..503d9cf022 100644
--- a/components/sceneutil/osgacontroller.cpp
+++ b/components/sceneutil/osgacontroller.cpp
@@ -115,7 +115,7 @@ namespace OsgaController
         float newTime = time;
 
         //Find the correct animation based on time
-        for (auto emulatedAnimation : mEmulatedAnimations)
+        for (const EmulatedAnimation& emulatedAnimation : mEmulatedAnimations)
         {
             if (time > emulatedAnimation.mStartTime && time < emulatedAnimation.mStopTime)
             {
@@ -125,7 +125,7 @@ namespace OsgaController
         }
 
         //Find the root transform track in animation
-        for (auto mergedAnimationTrack : mMergedAnimationTracks)
+        for (const osg::ref_ptr<Resource::Animation> mergedAnimationTrack : mMergedAnimationTracks)
         {
             if (mergedAnimationTrack->getName() != animationName) continue;
 
@@ -150,7 +150,7 @@ namespace OsgaController
 
     void KeyframeController::update(float time, std::string animationName)
     {
-        for (auto mergedAnimationTrack : mMergedAnimationTracks)
+        for (const osg::ref_ptr<Resource::Animation> mergedAnimationTrack : mMergedAnimationTracks)
         {
             if (mergedAnimationTrack->getName() == animationName) mergedAnimationTrack->update(time);
         }
@@ -162,7 +162,7 @@ namespace OsgaController
         {
             if (mNeedToLink)
             {
-                for (auto mergedAnimationTrack : mMergedAnimationTracks)
+                for (const osg::ref_ptr<Resource::Animation> mergedAnimationTrack : mMergedAnimationTracks)
                 {
                     if (!mLinker.valid()) mLinker = new LinkVisitor();
                     mLinker->setAnimation(mergedAnimationTrack);
@@ -173,7 +173,7 @@ namespace OsgaController
 
             float time = getInputValue(nv);
 
-            for (auto emulatedAnimation : mEmulatedAnimations)
+            for (const EmulatedAnimation& emulatedAnimation : mEmulatedAnimations)
             {
                 if (time > emulatedAnimation.mStartTime && time < emulatedAnimation.mStopTime)
                 {

From 08dcbe30b37cb266bebf3c8171e9130e5bea9d5d Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Fri, 20 Nov 2020 19:46:08 +0200
Subject: [PATCH 0028/2859] Earlier nullptr check

---
 components/resource/keyframemanager.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/components/resource/keyframemanager.cpp b/components/resource/keyframemanager.cpp
index d084d6a08e..421b0ddf7b 100644
--- a/components/resource/keyframemanager.cpp
+++ b/components/resource/keyframemanager.cpp
@@ -23,12 +23,6 @@ namespace OsgAOpenMW
     {
         if (node.libraryName() == std::string("osgAnimation") && node.className() == std::string("Bone") && node.getName() == std::string("root"))
             {
-                if (!mAnimationManager)
-                {
-                    traverse(node);
-                    return;
-                }
-
                 osg::ref_ptr<OsgaController::KeyframeController> callback = new OsgaController::KeyframeController();
 
                 std::vector<OsgaController::EmulatedAnimation> emulatedAnimations;
@@ -125,8 +119,11 @@ namespace Resource
             {
                 osg::ref_ptr<osg::Node> scene = const_cast<osg::Node*> ( mSceneManager->getTemplate(normalized).get() );
                 osg::ref_ptr<osgAnimation::BasicAnimationManager> bam = dynamic_cast<osgAnimation::BasicAnimationManager*> (scene->getUpdateCallback());
-                OsgAOpenMW::RetrieveAnimationsVisitor rav(*loaded.get(), bam);
-                scene->accept(rav);
+                if (bam)
+                {
+                    OsgAOpenMW::RetrieveAnimationsVisitor rav(*loaded.get(), bam);
+                    scene->accept(rav);
+                }
             }
             mCache->addEntryToObjectCache(normalized, loaded);
             return loaded;

From 9aba55a21a0d7423b91a40ae9234144e3b823ec2 Mon Sep 17 00:00:00 2001
From: Frederic Chardon <chardon.frederic@gmail.com>
Date: Fri, 20 Nov 2020 13:11:53 +0100
Subject: [PATCH 0029/2859] Add the async physics worker to the profiler
 overlay.

---
 apps/openmw/engine.cpp                  | 10 +++++++++-
 apps/openmw/mwbase/world.hpp            |  4 +++-
 apps/openmw/mwphysics/mtphysics.cpp     | 17 ++++++++++++++++-
 apps/openmw/mwphysics/mtphysics.hpp     | 10 +++++++++-
 apps/openmw/mwphysics/physicssystem.cpp |  5 +++--
 apps/openmw/mwphysics/physicssystem.hpp |  3 ++-
 apps/openmw/mwworld/worldimp.cpp        |  9 +++++----
 apps/openmw/mwworld/worldimp.hpp        |  4 ++--
 8 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 49a4b40590..0bfd67dd77 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -94,6 +94,7 @@ namespace
         Script,
         Mechanics,
         Physics,
+        PhysicsWorker,
         World,
         Gui,
 
@@ -124,6 +125,9 @@ namespace
     template <>
     const UserStats UserStatsValue<UserStatsType::Physics>::sValue {"Phys", "physics"};
 
+    template <>
+    const UserStats UserStatsValue<UserStatsType::PhysicsWorker>::sValue {" -Async", "physicsworker"};
+
     template <>
     const UserStats UserStatsValue<UserStatsType::World>::sValue {"World", "world"};
 
@@ -203,6 +207,10 @@ namespace
             profiler.addUserStatsLine(v.mLabel, textColor, barColor, v.mTaken, multiplier,
                                       average, averageInInverseSpace, v.mBegin, v.mEnd, maxValue);
         });
+        // the forEachUserStatsValue loop is "run" at compile time, hence the settings manager is not available.
+        // Unconditionnally add the async physics stats, and then remove it at runtime if necessary
+        if (Settings::Manager::getInt("async num threads", "Physics") == 0)
+            profiler.removeUserStatsLine(" -Async");
     }
 }
 
@@ -318,7 +326,7 @@ bool OMW::Engine::frame(float frametime)
 
             if (mEnvironment.getStateManager()->getState() != MWBase::StateManager::State_NoGame)
             {
-                mEnvironment.getWorld()->updatePhysics(frametime, guiActive);
+                mEnvironment.getWorld()->updatePhysics(frametime, guiActive, frameStart, frameNumber, *stats);
             }
         }
 
diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index f9cbc89723..49bc76a761 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -10,6 +10,8 @@
 
 #include <components/esm/cellid.hpp>
 
+#include <osg/Timer>
+
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/doorstate.hpp"
 
@@ -391,7 +393,7 @@ namespace MWBase
             /// \return pointer to created record
 
             virtual void update (float duration, bool paused) = 0;
-            virtual void updatePhysics (float duration, bool paused) = 0;
+            virtual void updatePhysics (float duration, bool paused, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats) = 0;
 
             virtual void updateWindowManager () = 0;
 
diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index dbb714fac5..8c06e01403 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -1,6 +1,8 @@
 #include <BulletCollision/BroadphaseCollision/btDbvtBroadphase.h>
 #include <BulletCollision/CollisionShapes/btCollisionShape.h>
 
+#include <osg/Stats>
+
 #include "components/debug/debuglog.hpp"
 #include <components/misc/barrier.hpp>
 #include "components/misc/convert.hpp"
@@ -154,6 +156,8 @@ namespace MWPhysics
           , mQuit(false)
           , mNextJob(0)
           , mNextLOS(0)
+          , mFrameNumber(0)
+          , mTimer(osg::Timer::instance())
     {
         mNumThreads = Config::computeNumThreads(mThreadSafeBullet);
 
@@ -192,6 +196,7 @@ namespace MWPhysics
                                 [](const LOSRequest& req) { return req.mStale; }),
                             mLOSCache.end());
                 }
+                mTimeEnd = mTimer->tick();
             });
     }
 
@@ -207,7 +212,7 @@ namespace MWPhysics
             thread.join();
     }
 
-    const PtrPositionList& PhysicsTaskScheduler::moveActors(int numSteps, float timeAccum, std::vector<ActorFrameData>&& actorsData, bool skipSimulation)
+    const PtrPositionList& PhysicsTaskScheduler::moveActors(int numSteps, float timeAccum, std::vector<ActorFrameData>&& actorsData, bool skipSimulation, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
     {
         // This function run in the main thread.
         // While the mSimulationMutex is held, background physics threads can't run.
@@ -230,6 +235,16 @@ namespace MWPhysics
                 if (mMovementResults.find(data.mPtr) != mMovementResults.end())
                     data.mActorRaw->setNextPosition(mMovementResults[data.mPtr]);
             }
+
+            if (mFrameNumber == frameNumber - 1)
+            {
+                stats.setAttribute(mFrameNumber, "physicsworker_time_begin", mTimer->delta_s(mFrameStart, mTimeBegin));
+                stats.setAttribute(mFrameNumber, "physicsworker_time_taken", mTimer->delta_s(mTimeBegin, mTimeEnd));
+                stats.setAttribute(mFrameNumber, "physicsworker_time_end", mTimer->delta_s(mFrameStart, mTimeEnd));
+            }
+            mFrameStart = frameStart;
+            mTimeBegin = mTimer->tick();
+            mFrameNumber = frameNumber;
         }
 
         // init
diff --git a/apps/openmw/mwphysics/mtphysics.hpp b/apps/openmw/mwphysics/mtphysics.hpp
index ef1c90b873..c061fe01da 100644
--- a/apps/openmw/mwphysics/mtphysics.hpp
+++ b/apps/openmw/mwphysics/mtphysics.hpp
@@ -9,6 +9,8 @@
 
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 
+#include <osg/Timer>
+
 #include "physicssystem.hpp"
 #include "ptrholder.hpp"
 
@@ -30,7 +32,7 @@ namespace MWPhysics
             /// @param timeAccum accumulated time from previous run to interpolate movements
             /// @param actorsData per actor data needed to compute new positions
             /// @return new position of each actor
-            const PtrPositionList& moveActors(int numSteps, float timeAccum, std::vector<ActorFrameData>&& actorsData, bool skip);
+            const PtrPositionList& moveActors(int numSteps, float timeAccum, std::vector<ActorFrameData>&& actorsData, bool skip, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
 
             // Thread safe wrappers
             void rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, btCollisionWorld::RayResultCallback& resultCallback) const;
@@ -87,6 +89,12 @@ namespace MWPhysics
             mutable std::shared_mutex mLOSCacheMutex;
             mutable std::mutex mUpdateAabbMutex;
             std::condition_variable_any mHasJob;
+
+            unsigned int mFrameNumber;
+            const osg::Timer* mTimer;
+            osg::Timer_t mTimeBegin;
+            osg::Timer_t mTimeEnd;
+            osg::Timer_t mFrameStart;
     };
 
 }
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 8a58919ca5..1ceba2f315 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -5,6 +5,7 @@
 #include <memory>
 #include <osg/Group>
 #include <osg/Stats>
+#include <osg/Timer>
 
 #include <BulletCollision/CollisionShapes/btConeShape.h>
 #include <BulletCollision/CollisionShapes/btSphereShape.h>
@@ -665,7 +666,7 @@ namespace MWPhysics
         mMovementQueue.clear();
     }
 
-    const PtrPositionList& PhysicsSystem::applyQueuedMovement(float dt, bool skipSimulation)
+    const PtrPositionList& PhysicsSystem::applyQueuedMovement(float dt, bool skipSimulation, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
     {
         mTimeAccum += dt;
 
@@ -675,7 +676,7 @@ namespace MWPhysics
 
         mTimeAccum -= numSteps * mPhysicsDt;
 
-        return mTaskScheduler->moveActors(numSteps, mTimeAccum, prepareFrameData(numSteps), skipSimulation);
+        return mTaskScheduler->moveActors(numSteps, mTimeAccum, prepareFrameData(numSteps), skipSimulation, frameStart, frameNumber, stats);
     }
 
     std::vector<ActorFrameData> PhysicsSystem::prepareFrameData(int numSteps)
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index ccfca5422a..379aea1dd4 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -10,6 +10,7 @@
 #include <osg/Quat>
 #include <osg/BoundingBox>
 #include <osg/ref_ptr>
+#include <osg/Timer>
 
 #include "../mwworld/ptr.hpp"
 
@@ -200,7 +201,7 @@ namespace MWPhysics
             void queueObjectMovement(const MWWorld::Ptr &ptr, const osg::Vec3f &velocity);
 
             /// Apply all queued movements, then clear the list.
-            const PtrPositionList& applyQueuedMovement(float dt, bool skipSimulation);
+            const PtrPositionList& applyQueuedMovement(float dt, bool skipSimulation, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
 
             /// Clear the queued movements list without applying.
             void clearQueuedMovement();
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index ad6c337909..54b94833e3 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -2,6 +2,7 @@
 
 #include <osg/Group>
 #include <osg/ComputeBoundsVisitor>
+#include <osg/Timer>
 
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 #include <BulletCollision/CollisionShapes/btCompoundShape.h>
@@ -1494,14 +1495,14 @@ namespace MWWorld
         mPhysics->updateAnimatedCollisionShape(ptr);
     }
 
-    void World::doPhysics(float duration)
+    void World::doPhysics(float duration, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
     {
         mPhysics->stepSimulation();
         processDoors(duration);
 
         mProjectileManager->update(duration);
 
-        const auto results = mPhysics->applyQueuedMovement(duration, mDiscardMovements);
+        const auto results = mPhysics->applyQueuedMovement(duration, mDiscardMovements, frameStart, frameNumber, stats);
         mDiscardMovements = false;
 
         for(const auto& [actor, position]: results)
@@ -1830,11 +1831,11 @@ namespace MWWorld
         }
     }
 
-    void World::updatePhysics (float duration, bool paused)
+    void World::updatePhysics (float duration, bool paused, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
     {
         if (!paused)
         {
-            doPhysics (duration);
+            doPhysics (duration, frameStart, frameNumber, stats);
         }
     }
 
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 909ac1d412..41ab9cf2ca 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -157,7 +157,7 @@ namespace MWWorld
             void processDoors(float duration);
             ///< Run physics simulation and modify \a world accordingly.
 
-            void doPhysics(float duration);
+            void doPhysics(float duration, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
             ///< Run physics simulation and modify \a world accordingly.
 
             void updateNavigator();
@@ -493,7 +493,7 @@ namespace MWWorld
             /// \return pointer to created record
 
             void update (float duration, bool paused) override;
-            void updatePhysics (float duration, bool paused) override;
+            void updatePhysics (float duration, bool paused, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats) override;
 
             void updateWindowManager () override;
 

From 96e22bd44e58e69487456759ffc0a11125ecc7b7 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Mon, 23 Nov 2020 06:05:45 +0000
Subject: [PATCH 0030/2859] Merge branch 'fastforwardpos' into 'master'

Discard physics simulation results after fast forward

See merge request OpenMW/openmw!423

(cherry picked from commit ff2d7695698341ef059c75707aa092cef48deea4)

03a37433 In case of time fast forward (resting, jail), force reset of positions
---
 apps/openmw/mwworld/worldimp.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 54b94833e3..20ee7625b4 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -890,6 +890,7 @@ namespace MWWorld
         {
             mRendering->notifyWorldSpaceChanged();
             mProjectileManager->clear();
+            mDiscardMovements = true;
         }
     }
 

From 4acd910b3768f0f0d3e941d318dad8480d15e0f0 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Fri, 13 Nov 2020 10:36:26 +0400
Subject: [PATCH 0031/2859] Rework file error messages handling

---
 components/files/lowlevelfile.cpp | 100 +++++++++++++++++++-----------
 1 file changed, 65 insertions(+), 35 deletions(-)

diff --git a/components/files/lowlevelfile.cpp b/components/files/lowlevelfile.cpp
index 424527b9d9..07915abba0 100644
--- a/components/files/lowlevelfile.cpp
+++ b/components/files/lowlevelfile.cpp
@@ -4,6 +4,11 @@
 #include <sstream>
 #include <cassert>
 
+#if FILE_API == FILE_API_STDIO
+#include <errno.h>
+#include <string.h>
+#endif
+
 #if FILE_API == FILE_API_POSIX
 #include <sys/types.h>
 #include <unistd.h>
@@ -39,7 +44,7 @@ void LowLevelFile::open (char const * filename)
     if (mHandle == nullptr)
     {
         std::ostringstream os;
-        os << "Failed to open '" << filename << "' for reading.";
+        os << "Failed to open '" << filename << "' for reading: " << strerror(errno);
         throw std::runtime_error (os.str ());
     }
 }
@@ -58,42 +63,63 @@ size_t LowLevelFile::size ()
     assert (mHandle != nullptr);
 
     long oldPosition = ftell (mHandle);
-
     if (oldPosition == -1)
-        throw std::runtime_error ("A query operation on a file failed.");
+    {
+        std::ostringstream os;
+        os << "An ftell() call failed: " << strerror(errno);
+        throw std::runtime_error (os.str ());
+    }
 
     if (fseek (mHandle, 0, SEEK_END) != 0)
-        throw std::runtime_error ("A query operation on a file failed.");
-
-    long Size = ftell (mHandle);
+    {
+        std::ostringstream os;
+        os << "An fseek() call failed: " << strerror(errno);
+        throw std::runtime_error (os.str ());
+    }
 
-    if (Size == -1)
-        throw std::runtime_error ("A query operation on a file failed.");
+    long size = ftell (mHandle);
+    if (size == -1)
+    {
+        std::ostringstream os;
+        os << "An ftell() call failed: " << strerror(errno);
+        throw std::runtime_error (os.str ());
+    }
 
     if (fseek (mHandle, oldPosition, SEEK_SET) != 0)
-        throw std::runtime_error ("A query operation on a file failed.");
+    {
+        std::ostringstream os;
+        os << "An fseek() call failed: " << strerror(errno);
+        throw std::runtime_error (os.str ());
+    }
 
-    return size_t (Size);
+    return size_t (size);
 }
 
-void LowLevelFile::seek (size_t Position)
+void LowLevelFile::seek (size_t position)
 {
     assert (mHandle != nullptr);
 
-    if (fseek (mHandle, Position, SEEK_SET) != 0)
-        throw std::runtime_error ("A seek operation on a file failed.");
+    if (fseek (mHandle, position, SEEK_SET) != 0)
+    {
+        std::ostringstream os;
+        os << "An fseek() call failed: " << strerror(errno);
+        throw std::runtime_error (os.str ());
+    }
 }
 
 size_t LowLevelFile::tell ()
 {
     assert (mHandle != nullptr);
 
-    long Position = ftell (mHandle);
-
-    if (Position == -1)
-        throw std::runtime_error ("A query operation on a file failed.");
+    long position = ftell (mHandle);
+    if (position == -1)
+    {
+        std::ostringstream os;
+        os << "An ftell() call failed: " << strerror(errno);
+        throw std::runtime_error (os.str ());
+    }
 
-    return size_t (Position);
+    return size_t (position);
 }
 
 size_t LowLevelFile::read (void * data, size_t size)
@@ -103,7 +129,11 @@ size_t LowLevelFile::read (void * data, size_t size)
     int amount = fread (data, 1, size, mHandle);
 
     if (amount == 0 && ferror (mHandle))
-        throw std::runtime_error ("A read operation on a file failed.");
+    {
+        std::ostringstream os;
+        os << "An attempt to read " << size << " bytes failed: " << strerror(errno);
+        throw std::runtime_error (os.str ());
+    }
 
     return amount;
 }
@@ -164,37 +194,37 @@ size_t LowLevelFile::size ()
     if (oldPosition == size_t (-1))
     {
         std::ostringstream os;
-        os << "An lseek() call failed:" << strerror(errno);
+        os << "An lseek() call failed: " << strerror(errno);
         throw std::runtime_error (os.str ());
     }
 
-    size_t Size = ::lseek (mHandle, 0, SEEK_END);
+    size_t size = ::lseek (mHandle, 0, SEEK_END);
 
-    if (Size == size_t (-1))
+    if (size == size_t (-1))
     {
         std::ostringstream os;
-        os << "An lseek() call failed:" << strerror(errno);
+        os << "An lseek() call failed: " << strerror(errno);
         throw std::runtime_error (os.str ());
     }
 
     if (lseek (mHandle, oldPosition, SEEK_SET) == -1)
     {
         std::ostringstream os;
-        os << "An lseek() call failed:" << strerror(errno);
+        os << "An lseek() call failed: " << strerror(errno);
         throw std::runtime_error (os.str ());
     }
 
-    return Size;
+    return size;
 }
 
-void LowLevelFile::seek (size_t Position)
+void LowLevelFile::seek (size_t position)
 {
     assert (mHandle != -1);
 
-    if (::lseek (mHandle, Position, SEEK_SET) == -1)
+    if (::lseek (mHandle, position, SEEK_SET) == -1)
     {
         std::ostringstream os;
-        os << "An lseek() call failed:" << strerror(errno);
+        os << "An lseek() call failed: " << strerror(errno);
         throw std::runtime_error (os.str ());
     }
 }
@@ -203,16 +233,16 @@ size_t LowLevelFile::tell ()
 {
     assert (mHandle != -1);
 
-    size_t Position = ::lseek (mHandle, 0, SEEK_CUR);
+    size_t position = ::lseek (mHandle, 0, SEEK_CUR);
 
-    if (Position == size_t (-1))
+    if (position == size_t (-1))
     {
         std::ostringstream os;
-        os << "An lseek() call failed:" << strerror(errno);
+        os << "An lseek() call failed: " << strerror(errno);
         throw std::runtime_error (os.str ());
     }
 
-    return Position;
+    return position;
 }
 
 size_t LowLevelFile::read (void * data, size_t size)
@@ -224,7 +254,7 @@ size_t LowLevelFile::read (void * data, size_t size)
     if (amount == -1)
     {
         std::ostringstream os;
-        os << "An attempt to read " << size << "bytes failed:" << strerror(errno);
+        os << "An attempt to read " << size << " bytes failed: " << strerror(errno);
         throw std::runtime_error (os.str ());
     }
 
@@ -292,11 +322,11 @@ size_t LowLevelFile::size ()
     return info.nFileSizeLow;
 }
 
-void LowLevelFile::seek (size_t Position)
+void LowLevelFile::seek (size_t position)
 {
     assert (mHandle != INVALID_HANDLE_VALUE);
 
-    if (SetFilePointer (mHandle, Position, nullptr, SEEK_SET) == INVALID_SET_FILE_POINTER)
+    if (SetFilePointer (mHandle, position, nullptr, SEEK_SET) == INVALID_SET_FILE_POINTER)
         if (GetLastError () != NO_ERROR)
             throw std::runtime_error ("A seek operation on a file failed.");
 }

From 5b6377b061b1814b25e81d5927285acce8f70825 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sat, 28 Nov 2020 13:12:30 +0300
Subject: [PATCH 0032/2859] Handle multiple root nodes (bug #5604)

---
 CHANGELOG.md                             |  1 +
 components/nifbullet/bulletnifloader.cpp | 95 +++++++++++++-----------
 components/nifosg/nifloader.cpp          | 53 +++++++------
 3 files changed, 81 insertions(+), 68 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f909a19fd..7257e23386 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -58,6 +58,7 @@
     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 #5622: Can't properly interact with the console when in pause menu
     Bug #5633: Damage Spells in effect before god mode is enabled continue to hurt the player character and can kill them
diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index b1461e5367..db9d5ae437 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -123,73 +123,79 @@ osg::ref_ptr<Resource::BulletShape> BulletNifLoader::load(const Nif::File& nif)
     mStaticMesh.reset();
     mAvoidStaticMesh.reset();
 
-    Nif::Node* node = nullptr;
     const size_t numRoots = nif.numRoots();
+    std::vector<Nif::Node*> roots;
     for (size_t i = 0; i < numRoots; ++i)
     {
         Nif::Record* r = nif.getRoot(i);
         assert(r != nullptr);
+        Nif::Node* node = nullptr;
         if ((node = dynamic_cast<Nif::Node*>(r)))
-            break;
+            roots.emplace_back(node);
     }
     const std::string filename = nif.getFilename();
-    if (!node)
+    if (roots.empty())
     {
         warn("Found no root nodes in NIF file " + filename);
         return mShape;
     }
 
-    if (findBoundingBox(node, filename))
+    // Try to find a valid bounding box first. If one's found for any root node, use that.
+    for (const Nif::Node* node : roots)
     {
-        const btVector3 halfExtents = Misc::Convert::toBullet(mShape->mCollisionBoxHalfExtents);
-        const btVector3 origin = Misc::Convert::toBullet(mShape->mCollisionBoxTranslate);
-        std::unique_ptr<btCompoundShape> compound (new btCompoundShape);
-        std::unique_ptr<btBoxShape> boxShape(new btBoxShape(halfExtents));
-        btTransform transform = btTransform::getIdentity();
-        transform.setOrigin(origin);
-        compound->addChildShape(transform, boxShape.get());
-        boxShape.release();
-
-        mShape->mCollisionShape = compound.release();
-        return mShape;
+        if (findBoundingBox(node, filename))
+        {
+            const btVector3 halfExtents = Misc::Convert::toBullet(mShape->mCollisionBoxHalfExtents);
+            const btVector3 origin = Misc::Convert::toBullet(mShape->mCollisionBoxTranslate);
+            std::unique_ptr<btCompoundShape> compound (new btCompoundShape);
+            std::unique_ptr<btBoxShape> boxShape(new btBoxShape(halfExtents));
+            btTransform transform = btTransform::getIdentity();
+            transform.setOrigin(origin);
+            compound->addChildShape(transform, boxShape.get());
+            boxShape.release();
+
+            mShape->mCollisionShape = compound.release();
+            return mShape;
+        }
     }
-    else
+    // files with the name convention xmodel.nif usually have keyframes stored in a separate file xmodel.kf (see Animation::addAnimSource).
+    // assume all nodes in the file will be animated
+    const bool isAnimated = pathFileNameStartsWithX(filename);
+
+    // If there's no bounding box, we'll have to generate a Bullet collision shape
+    // from the collision data present in every root node.
+    for (const Nif::Node* node : roots)
     {
         bool autogenerated = hasAutoGeneratedCollision(node);
-
-        // files with the name convention xmodel.nif usually have keyframes stored in a separate file xmodel.kf (see Animation::addAnimSource).
-        // assume all nodes in the file will be animated
-        const bool isAnimated = pathFileNameStartsWithX(filename);
-
         handleNode(filename, node, 0, autogenerated, isAnimated, autogenerated);
+    }
 
-        if (mCompoundShape)
-        {
-            if (mStaticMesh)
-            {
-                btTransform trans;
-                trans.setIdentity();
-                std::unique_ptr<btCollisionShape> child(new Resource::TriangleMeshShape(mStaticMesh.get(), true));
-                mCompoundShape->addChildShape(trans, child.get());
-                child.release();
-                mStaticMesh.release();
-            }
-            mShape->mCollisionShape = mCompoundShape.release();
-        }
-        else if (mStaticMesh)
+    if (mCompoundShape)
+    {
+        if (mStaticMesh)
         {
-            mShape->mCollisionShape = new Resource::TriangleMeshShape(mStaticMesh.get(), true);
+            btTransform trans;
+            trans.setIdentity();
+            std::unique_ptr<btCollisionShape> child(new Resource::TriangleMeshShape(mStaticMesh.get(), true));
+            mCompoundShape->addChildShape(trans, child.get());
+            child.release();
             mStaticMesh.release();
         }
+        mShape->mCollisionShape = mCompoundShape.release();
+    }
+    else if (mStaticMesh)
+    {
+        mShape->mCollisionShape = new Resource::TriangleMeshShape(mStaticMesh.get(), true);
+        mStaticMesh.release();
+    }
 
-        if (mAvoidStaticMesh)
-        {
-            mShape->mAvoidCollisionShape = new Resource::TriangleMeshShape(mAvoidStaticMesh.get(), false);
-            mAvoidStaticMesh.release();
-        }
-
-        return mShape;
+    if (mAvoidStaticMesh)
+    {
+        mShape->mAvoidCollisionShape = new Resource::TriangleMeshShape(mAvoidStaticMesh.get(), false);
+        mAvoidStaticMesh.release();
     }
+
+    return mShape;
 }
 
 // Find a boundingBox in the node hierarchy.
@@ -228,8 +234,7 @@ bool BulletNifLoader::findBoundingBox(const Nif::Node* node, const std::string&
         {
             if(!list[i].empty())
             {
-                bool found = findBoundingBox (list[i].getPtr(), filename);
-                if (found)
+                if (findBoundingBox(list[i].getPtr(), filename))
                     return true;
             }
         }
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index a5a61b3176..815f1aef20 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -231,6 +231,9 @@ namespace NifOsg
         size_t mFirstRootTextureIndex = -1;
         bool mFoundFirstRootTexturingProperty = false;
 
+        bool mHasNightDayLabel = false;
+        bool mHasHerbalismLabel = false;
+
         // This is used to queue emitters that weren't attached to their node yet.
         std::vector<std::pair<size_t, osg::ref_ptr<Emitter>>> mEmitterQueue;
 
@@ -294,20 +297,31 @@ namespace NifOsg
 
         osg::ref_ptr<osg::Node> load(Nif::NIFFilePtr nif, Resource::ImageManager* imageManager)
         {
-            const Nif::Node* nifNode = nullptr;
             const size_t numRoots = nif->numRoots();
+            std::vector<const Nif::Node*> roots;
             for (size_t i = 0; i < numRoots; ++i)
             {
                 const Nif::Record* r = nif->getRoot(i);
+                const Nif::Node* nifNode = nullptr;
                 if ((nifNode = dynamic_cast<const Nif::Node*>(r)))
-                    break;
+                    roots.emplace_back(nifNode);
             }
-            if (!nifNode)
+            if (roots.empty())
                 nif->fail("Found no root nodes");
 
             osg::ref_ptr<TextKeyMapHolder> textkeys (new TextKeyMapHolder);
 
-            osg::ref_ptr<osg::Node> created = handleNode(nifNode, nullptr, imageManager, std::vector<unsigned int>(), 0, false, false, false, &textkeys->mTextKeys);
+            osg::ref_ptr<osg::Group> created(new osg::Group);
+            created->setDataVariance(osg::Object::STATIC);
+            for (const Nif::Node* root : roots)
+            {
+                auto node = handleNode(root, nullptr, imageManager, std::vector<unsigned int>(), 0, false, false, false, &textkeys->mTextKeys);
+                created->addChild(node);
+            }
+            if (mHasNightDayLabel)
+                created->getOrCreateUserDataContainer()->addDescription(Constants::NightDayLabel);
+            if (mHasHerbalismLabel)
+                created->getOrCreateUserDataContainer()->addDescription(Constants::HerbalismLabel);
 
             // Attach particle emitters to their nodes which should all be loaded by now.
             handleQueuedParticleEmitters(created, nif);
@@ -315,18 +329,11 @@ namespace NifOsg
             if (nif->getUseSkinning())
             {
                 osg::ref_ptr<SceneUtil::Skeleton> skel = new SceneUtil::Skeleton;
-
-                osg::Group* root = created->asGroup();
-                if (root && root->getDataVariance() == osg::Object::STATIC && !root->asTransform())
-                {
-                    skel->setStateSet(root->getStateSet());
-                    skel->setName(root->getName());
-                    for (unsigned int i=0; i<root->getNumChildren(); ++i)
-                        skel->addChild(root->getChild(i));
-                    root->removeChildren(0, root->getNumChildren());
-                }
-                else
-                    skel->addChild(created);
+                skel->setStateSet(created->getStateSet());
+                skel->setName(created->getName());
+                for (unsigned int i=0; i < created->getNumChildren(); ++i)
+                    skel->addChild(created->getChild(i));
+                created->removeChildren(0, created->getNumChildren());
                 created = skel;
             }
 
@@ -632,7 +639,7 @@ namespace NifOsg
             }
 
             if(nifNode->recType == Nif::RC_NiAutoNormalParticles || nifNode->recType == Nif::RC_NiRotatingParticles)
-                handleParticleSystem(nifNode, node, composite, animflags, rootNode);
+                handleParticleSystem(nifNode, node, composite, animflags);
 
             if (composite->getNumControllers() > 0)
             {
@@ -662,10 +669,10 @@ namespace NifOsg
                 const Nif::NiSwitchNode* niSwitchNode = static_cast<const Nif::NiSwitchNode*>(nifNode);
                 osg::ref_ptr<osg::Switch> switchNode = handleSwitchNode(niSwitchNode);
                 node->addChild(switchNode);
-                if (niSwitchNode->name == Constants::NightDayLabel && !SceneUtil::hasUserDescription(rootNode, Constants::NightDayLabel))
-                    rootNode->getOrCreateUserDataContainer()->addDescription(Constants::NightDayLabel);
-                else if (niSwitchNode->name == Constants::HerbalismLabel && !SceneUtil::hasUserDescription(rootNode, Constants::HerbalismLabel))
-                    rootNode->getOrCreateUserDataContainer()->addDescription(Constants::HerbalismLabel);
+                if (niSwitchNode->name == Constants::NightDayLabel)
+                    mHasNightDayLabel = true;
+                else if (niSwitchNode->name == Constants::HerbalismLabel)
+                    mHasHerbalismLabel = true;
 
                 currentNode = switchNode;
             }
@@ -1023,7 +1030,7 @@ namespace NifOsg
             return emitter;
         }
 
-        void handleQueuedParticleEmitters(osg::Node* rootNode, Nif::NIFFilePtr nif)
+        void handleQueuedParticleEmitters(osg::Group* rootNode, Nif::NIFFilePtr nif)
         {
             for (const auto& emitterPair : mEmitterQueue)
             {
@@ -1044,7 +1051,7 @@ namespace NifOsg
             mEmitterQueue.clear();
         }
 
-        void handleParticleSystem(const Nif::Node *nifNode, osg::Group *parentNode, SceneUtil::CompositeStateSetUpdater* composite, int animflags, osg::Node* rootNode)
+        void handleParticleSystem(const Nif::Node *nifNode, osg::Group *parentNode, SceneUtil::CompositeStateSetUpdater* composite, int animflags)
         {
             osg::ref_ptr<ParticleSystem> partsys (new ParticleSystem);
             partsys->setSortMode(osgParticle::ParticleSystem::SORT_BACK_TO_FRONT);

From 55dcc6582a7b5024994368fbdf07a998b1394cbd Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Sat, 28 Nov 2020 15:03:10 +0200
Subject: [PATCH 0033/2859] Don't duplicate getFileExtension, use OpenMW's
 namespaces

---
 components/resource/keyframemanager.cpp | 20 ++++++--------------
 components/resource/keyframemanager.hpp |  4 +---
 components/resource/scenemanager.cpp    | 17 ++++++++---------
 components/resource/scenemanager.hpp    |  1 +
 components/sceneutil/osgacontroller.cpp | 14 +++++++-------
 components/sceneutil/osgacontroller.hpp | 10 +++++-----
 6 files changed, 28 insertions(+), 38 deletions(-)

diff --git a/components/resource/keyframemanager.cpp b/components/resource/keyframemanager.cpp
index 421b0ddf7b..af0f365ee5 100644
--- a/components/resource/keyframemanager.cpp
+++ b/components/resource/keyframemanager.cpp
@@ -14,7 +14,7 @@
 #include "objectcache.hpp"
 #include "scenemanager.hpp"
 
-namespace OsgAOpenMW
+namespace Resource
 {
 
     RetrieveAnimationsVisitor::RetrieveAnimationsVisitor(SceneUtil::KeyframeHolder& target, osg::ref_ptr<osgAnimation::BasicAnimationManager> animationManager) : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN), mTarget(target), mAnimationManager(animationManager) {}
@@ -23,9 +23,9 @@ namespace OsgAOpenMW
     {
         if (node.libraryName() == std::string("osgAnimation") && node.className() == std::string("Bone") && node.getName() == std::string("root"))
             {
-                osg::ref_ptr<OsgaController::KeyframeController> callback = new OsgaController::KeyframeController();
+                osg::ref_ptr<SceneUtil::OsgAnimationController> callback = new SceneUtil::OsgAnimationController();
 
-                std::vector<OsgaController::EmulatedAnimation> emulatedAnimations;
+                std::vector<SceneUtil::EmulatedAnimation> emulatedAnimations;
 
                 for (auto animation : mAnimationManager->getAnimationList())
                 {
@@ -63,7 +63,7 @@ namespace OsgAOpenMW
                         mTarget.mTextKeys.emplace(startTime, std::move(loopstart));
                         mTarget.mTextKeys.emplace(stopTime, std::move(loopstop));
 
-                        OsgaController::EmulatedAnimation emulatedAnimation;
+                        SceneUtil::EmulatedAnimation emulatedAnimation;
                         emulatedAnimation.mStartTime = startTime;
                         emulatedAnimation.mStopTime = stopTime;
                         emulatedAnimation.mName = animationName;
@@ -76,14 +76,6 @@ namespace OsgAOpenMW
 
         traverse(node);
     }
-
-    std::string getFileExtension(const std::string& file)
-    {
-        size_t extPos = file.find_last_of('.');
-        if (extPos != std::string::npos && extPos+1 < file.size())
-            return file.substr(extPos+1);
-        return std::string();
-    }
 }
 
 namespace Resource
@@ -110,7 +102,7 @@ namespace Resource
         else
         {
             osg::ref_ptr<SceneUtil::KeyframeHolder> loaded (new SceneUtil::KeyframeHolder);
-            std::string ext = OsgAOpenMW::getFileExtension(normalized);
+            std::string ext = Resource::getFileExtension(normalized);
             if (ext == "kf")
             {
                 NifOsg::Loader::loadKf(Nif::NIFFilePtr(new Nif::NIFFile(mVFS->getNormalized(normalized), normalized)), *loaded.get());
@@ -121,7 +113,7 @@ namespace Resource
                 osg::ref_ptr<osgAnimation::BasicAnimationManager> bam = dynamic_cast<osgAnimation::BasicAnimationManager*> (scene->getUpdateCallback());
                 if (bam)
                 {
-                    OsgAOpenMW::RetrieveAnimationsVisitor rav(*loaded.get(), bam);
+                    Resource::RetrieveAnimationsVisitor rav(*loaded.get(), bam);
                     scene->accept(rav);
                 }
             }
diff --git a/components/resource/keyframemanager.hpp b/components/resource/keyframemanager.hpp
index 778b4bc9a9..3e992ac5e9 100644
--- a/components/resource/keyframemanager.hpp
+++ b/components/resource/keyframemanager.hpp
@@ -9,7 +9,7 @@
 
 #include "resourcemanager.hpp"
 
-namespace OsgAOpenMW
+namespace Resource
 {
     /// @brief extract animations to OpenMW's animation system
     class RetrieveAnimationsVisitor : public osg::NodeVisitor
@@ -24,8 +24,6 @@ namespace OsgAOpenMW
             osg::ref_ptr<osgAnimation::BasicAnimationManager> mAnimationManager;
 
     };
-
-    std::string getFileExtension(const std::string& file);
 }
 
 namespace Resource
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index e99003b749..2630cd4536 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -338,17 +338,9 @@ namespace Resource
         Resource::ImageManager* mImageManager;
     };
 
-    std::string getFileExtension(const std::string& file)
-    {
-        size_t extPos = file.find_last_of('.');
-        if (extPos != std::string::npos && extPos+1 < file.size())
-            return file.substr(extPos+1);
-        return std::string();
-    }
-
     osg::ref_ptr<osg::Node> load (Files::IStreamPtr file, const std::string& normalizedFilename, Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager)
     {
-        std::string ext = getFileExtension(normalizedFilename);
+        std::string ext = Resource::getFileExtension(normalizedFilename);
         if (ext == "nif")
             return NifOsg::Loader::load(nifFileManager->get(normalizedFilename), imageManager);
         else
@@ -780,4 +772,11 @@ namespace Resource
         return shaderVisitor;
     }
 
+    std::string getFileExtension(const std::string& file)
+    {
+        size_t extPos = file.find_last_of('.');
+        if (extPos != std::string::npos && extPos+1 < file.size())
+            return file.substr(extPos+1);
+        return std::string();
+    }
 }
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index 8df556158e..fd75070a18 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -181,6 +181,7 @@ namespace Resource
         void operator = (const SceneManager&);
     };
 
+    std::string getFileExtension(const std::string& file);
 }
 
 #endif
diff --git a/components/sceneutil/osgacontroller.cpp b/components/sceneutil/osgacontroller.cpp
index 503d9cf022..87e6f02fee 100644
--- a/components/sceneutil/osgacontroller.cpp
+++ b/components/sceneutil/osgacontroller.cpp
@@ -21,7 +21,7 @@
 #include <components/sceneutil/controller.hpp>
 #include <components/sceneutil/keyframe.hpp>
 
-namespace OsgaController
+namespace SceneUtil
 {
     LinkVisitor::LinkVisitor() : osg::NodeVisitor( TRAVERSE_ALL_CHILDREN )
     {
@@ -101,14 +101,14 @@ namespace OsgaController
         apply(static_cast<osg::Node&>(node));
     }
 
-    KeyframeController::KeyframeController(const KeyframeController &copy, const osg::CopyOp &copyop) : SceneUtil::KeyframeController(copy, copyop)
+    OsgAnimationController::OsgAnimationController(const OsgAnimationController &copy, const osg::CopyOp &copyop) : SceneUtil::KeyframeController(copy, copyop)
     , mMergedAnimationTracks(copy.mMergedAnimationTracks)
     , mEmulatedAnimations(copy.mEmulatedAnimations)
     {
         mLinker = nullptr;
     }
 
-    osg::Vec3f KeyframeController::getTranslation(float time) const
+    osg::Vec3f OsgAnimationController::getTranslation(float time) const
     {
         osg::Vec3f translationValue;
         std::string animationName;
@@ -148,7 +148,7 @@ namespace OsgaController
         return osg::Vec3f();
     }
 
-    void KeyframeController::update(float time, std::string animationName)
+    void OsgAnimationController::update(float time, std::string animationName)
     {
         for (const osg::ref_ptr<Resource::Animation> mergedAnimationTrack : mMergedAnimationTracks)
         {
@@ -156,7 +156,7 @@ namespace OsgaController
         }
     }
 
-    void KeyframeController::operator() (osg::Node* node, osg::NodeVisitor* nv)
+    void OsgAnimationController::operator() (osg::Node* node, osg::NodeVisitor* nv)
     {
         if (hasInput())
         {
@@ -185,12 +185,12 @@ namespace OsgaController
         traverse(node, nv);
     }
 
-    void KeyframeController::setEmulatedAnimations(std::vector<EmulatedAnimation> emulatedAnimations)
+    void OsgAnimationController::setEmulatedAnimations(std::vector<EmulatedAnimation> emulatedAnimations)
     {
         mEmulatedAnimations = emulatedAnimations;
     }
 
-    void KeyframeController::addMergedAnimationTrack(osg::ref_ptr<Resource::Animation> animationTrack)
+    void OsgAnimationController::addMergedAnimationTrack(osg::ref_ptr<Resource::Animation> animationTrack)
     {
         mMergedAnimationTracks.emplace_back(animationTrack);
     }
diff --git a/components/sceneutil/osgacontroller.hpp b/components/sceneutil/osgacontroller.hpp
index a3072088aa..f1c1584c2a 100644
--- a/components/sceneutil/osgacontroller.hpp
+++ b/components/sceneutil/osgacontroller.hpp
@@ -16,7 +16,7 @@
 #include <components/sceneutil/keyframe.hpp>
 #include <components/resource/animation.hpp>
 
-namespace OsgaController
+namespace SceneUtil
 {
     struct EmulatedAnimation
     {
@@ -44,15 +44,15 @@ namespace OsgaController
             Resource::Animation* mAnimation;
     };
 
-    class KeyframeController : public SceneUtil::KeyframeController
+    class OsgAnimationController : public SceneUtil::KeyframeController
     {
     public:
         /// @brief Handles the animation for osgAnimation formats
-        KeyframeController() {};
+        OsgAnimationController() {};
 
-        KeyframeController(const KeyframeController& copy, const osg::CopyOp& copyop);
+        OsgAnimationController(const OsgAnimationController& copy, const osg::CopyOp& copyop);
 
-        META_Object(OsgaController, KeyframeController)
+        META_Object(SceneUtil, OsgAnimationController)
 
         /// @brief Handles the location of the instance
         osg::Vec3f getTranslation(float time) const override;

From ea2ba27084c38485ee3ad5fb2fa27e370e9e0e82 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sat, 28 Nov 2020 20:45:23 +0100
Subject: [PATCH 0034/2859] Move the moment when the actor origin is saved
 before simulation so to be sure the simulation is over. Otherwise, if the
 simulation is too slow the position is wrong, and the actors would jump back
 and forth between old and new position instead of actually moving.

---
 apps/openmw/mwphysics/actor.cpp         | 33 +++++++++++++++++--------
 apps/openmw/mwphysics/actor.hpp         |  8 +++---
 apps/openmw/mwphysics/mtphysics.cpp     |  7 ++++--
 apps/openmw/mwphysics/physicssystem.cpp |  5 +++-
 apps/openmw/mwphysics/physicssystem.hpp |  1 +
 5 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index 430bd4deef..0e557378df 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -118,10 +118,15 @@ int Actor::getCollisionMask() const
     return collisionMask;
 }
 
+void Actor::updatePositionUnsafe()
+{
+    mWorldPosition = mPtr.getRefData().getPosition().asVec3();
+}
+
 void Actor::updatePosition()
 {
     std::scoped_lock lock(mPositionMutex);
-    mWorldPosition = mPtr.getRefData().getPosition().asVec3();
+    updatePositionUnsafe();
 }
 
 osg::Vec3f Actor::getWorldPosition() const
@@ -130,19 +135,18 @@ osg::Vec3f Actor::getWorldPosition() const
     return mWorldPosition;
 }
 
-void Actor::setNextPosition(const osg::Vec3f& position)
+void Actor::setSimulationPosition(const osg::Vec3f& position)
 {
-    mNextPosition = position;
+    mSimulationPosition = position;
 }
 
-osg::Vec3f Actor::getNextPosition() const
+osg::Vec3f Actor::getSimulationPosition() const
 {
-    return mNextPosition;
+    return mSimulationPosition;
 }
 
-void Actor::updateCollisionObjectPosition()
+void Actor::updateCollisionObjectPositionUnsafe()
 {
-    std::scoped_lock lock(mPositionMutex);
     mShape->setLocalScaling(Misc::Convert::toBullet(mScale));
     osg::Vec3f scaledTranslation = mRotation * osg::componentMultiply(mMeshTranslation, mScale);
     osg::Vec3f newPosition = scaledTranslation + mPosition;
@@ -151,6 +155,12 @@ void Actor::updateCollisionObjectPosition()
     mCollisionObject->setWorldTransform(mLocalTransform);
 }
 
+void Actor::updateCollisionObjectPosition()
+{
+    std::scoped_lock lock(mPositionMutex);
+    updateCollisionObjectPositionUnsafe();
+}
+
 osg::Vec3f Actor::getCollisionObjectPosition() const
 {
     std::scoped_lock lock(mPositionMutex);
@@ -159,23 +169,26 @@ osg::Vec3f Actor::getCollisionObjectPosition() const
 
 void Actor::setPosition(const osg::Vec3f& position)
 {
+    std::scoped_lock lock(mPositionMutex);
     mPreviousPosition = mPosition;
     mPosition = position;
 }
 
 void Actor::adjustPosition(const osg::Vec3f& offset)
 {
+    std::scoped_lock lock(mPositionMutex);
     mPosition += offset;
     mPreviousPosition += offset;
 }
 
 void Actor::resetPosition()
 {
-    updatePosition();
+    std::scoped_lock lock(mPositionMutex);
+    updatePositionUnsafe();
     mPreviousPosition = mWorldPosition;
     mPosition = mWorldPosition;
-    mNextPosition = mWorldPosition;
-    updateCollisionObjectPosition();
+    mSimulationPosition = mWorldPosition;
+    updateCollisionObjectPositionUnsafe();
 }
 
 osg::Vec3f Actor::getPosition() const
diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index 3d6f93ae05..07a9bebd28 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -67,8 +67,8 @@ namespace MWPhysics
         * Used by the physics simulation to store the simulation result. Used in conjunction with mWorldPosition
         * to account for e.g. scripted movements
         */
-        void setNextPosition(const osg::Vec3f& position);
-        osg::Vec3f getNextPosition() const;
+        void setSimulationPosition(const osg::Vec3f& position);
+        osg::Vec3f getSimulationPosition() const;
 
         void updateCollisionObjectPosition();
 
@@ -154,6 +154,8 @@ namespace MWPhysics
         void updateCollisionMask();
         void addCollisionMask(int collisionMask);
         int getCollisionMask() const;
+        void updateCollisionObjectPositionUnsafe();
+        void updatePositionUnsafe();
 
         bool mCanWaterWalk;
         std::atomic<bool> mWalkingOnWater;
@@ -172,7 +174,7 @@ namespace MWPhysics
         osg::Vec3f mScale;
         osg::Vec3f mRenderingScale;
         osg::Vec3f mWorldPosition;
-        osg::Vec3f mNextPosition;
+        osg::Vec3f mSimulationPosition;
         osg::Vec3f mPosition;
         osg::Vec3f mPreviousPosition;
         btTransform mLocalTransform;
diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 8c06e01403..2d4009e7d8 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -219,6 +219,9 @@ namespace MWPhysics
 
         std::unique_lock lock(mSimulationMutex);
 
+        for (auto& data : actorsData)
+            data.updatePosition();
+
         // start by finishing previous background computation
         if (mNumThreads != 0)
         {
@@ -233,7 +236,7 @@ namespace MWPhysics
                     data.mActorRaw->setStandingOnPtr(data.mStandingOn);
 
                 if (mMovementResults.find(data.mPtr) != mMovementResults.end())
-                    data.mActorRaw->setNextPosition(mMovementResults[data.mPtr]);
+                    data.mActorRaw->setSimulationPosition(mMovementResults[data.mPtr]);
             }
 
             if (mFrameNumber == frameNumber - 1)
@@ -284,7 +287,7 @@ namespace MWPhysics
                 if (mAdvanceSimulation)
                     data.mActorRaw->setStandingOnPtr(data.mStandingOn);
                 if (mMovementResults.find(data.mPtr) != mMovementResults.end())
-                    data.mActorRaw->setNextPosition(mMovementResults[data.mPtr]);
+                    data.mActorRaw->setSimulationPosition(mMovementResults[data.mPtr]);
             }
             return mMovementResults;
         }
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 1ceba2f315..7aa1f59141 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -877,9 +877,12 @@ namespace MWPhysics
         mWantJump = mPtr.getClass().getMovementSettings(mPtr).mPosition[2] != 0;
         mIsDead = mPtr.getClass().getCreatureStats(mPtr).isDead();
         mWasOnGround = actor->getOnGround();
+    }
 
+    void ActorFrameData::updatePosition()
+    {
         mActorRaw->updatePosition();
-        mOrigin = mActorRaw->getNextPosition();
+        mOrigin = mActorRaw->getSimulationPosition();
         mPosition = mActorRaw->getPosition();
         if (mMoveToWaterSurface)
         {
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 379aea1dd4..03ae789934 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -78,6 +78,7 @@ namespace MWPhysics
     struct ActorFrameData
     {
         ActorFrameData(const std::shared_ptr<Actor>& actor, const MWWorld::Ptr character, const MWWorld::Ptr standingOn, bool moveToWaterSurface, osg::Vec3f movement, float slowFall, float waterlevel);
+        void  updatePosition();
         std::weak_ptr<Actor> mActor;
         Actor* mActorRaw;
         MWWorld::Ptr mPtr;

From 8084a336b52f0d0a1938f1d22732f91baf21a3e3 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Fri, 13 Nov 2020 11:39:47 +0400
Subject: [PATCH 0035/2859] Replace zeroes and nulls by nullptrs

---
 apps/launcher/advancedpage.hpp                |  2 +-
 apps/launcher/datafilespage.hpp               |  2 +-
 apps/launcher/graphicspage.hpp                |  2 +-
 apps/launcher/maindialog.hpp                  |  2 +-
 apps/launcher/playpage.hpp                    |  2 +-
 apps/launcher/settingspage.hpp                |  2 +-
 apps/launcher/utils/lineedit.hpp              |  2 +-
 apps/launcher/utils/profilescombobox.cpp      |  2 +-
 apps/launcher/utils/profilescombobox.hpp      |  4 +-
 apps/launcher/utils/textinputdialog.cpp       |  2 +-
 apps/launcher/utils/textinputdialog.hpp       |  2 +-
 apps/opencs/model/doc/operationholder.hpp     |  2 +-
 apps/opencs/model/doc/runner.cpp              |  8 +-
 apps/opencs/model/prefs/boolsetting.cpp       |  4 +-
 apps/opencs/model/prefs/coloursetting.cpp     |  2 +-
 apps/opencs/model/prefs/doublesetting.cpp     |  2 +-
 apps/opencs/model/prefs/enumsetting.cpp       |  2 +-
 apps/opencs/model/prefs/intsetting.cpp        |  2 +-
 apps/opencs/model/prefs/modifiersetting.cpp   |  2 +-
 apps/opencs/model/prefs/shortcut.cpp          |  8 +-
 apps/opencs/model/prefs/shortcutmanager.cpp   |  2 +-
 apps/opencs/model/prefs/shortcutsetting.cpp   |  2 +-
 apps/opencs/model/prefs/state.cpp             |  4 +-
 apps/opencs/model/tools/mergestages.cpp       |  2 +-
 apps/opencs/model/tools/mergestages.hpp       |  2 +-
 apps/opencs/model/tools/scriptcheck.cpp       |  6 +-
 apps/opencs/model/tools/searchstage.cpp       |  2 +-
 apps/opencs/model/tools/tools.cpp             |  6 +-
 apps/opencs/model/world/columnimp.hpp         |  8 +-
 apps/opencs/model/world/commanddispatcher.hpp |  2 +-
 apps/opencs/model/world/commands.cpp          |  4 +-
 apps/opencs/model/world/commands.hpp          | 18 ++---
 apps/opencs/model/world/data.cpp              | 18 ++---
 apps/opencs/model/world/idtableproxymodel.hpp |  2 +-
 .../model/world/infotableproxymodel.hpp       |  2 +-
 apps/opencs/model/world/record.hpp            |  2 +-
 apps/opencs/model/world/refidcollection.cpp   |  2 +-
 apps/opencs/model/world/resources.hpp         |  4 +-
 apps/opencs/view/doc/adjusterwidget.hpp       |  2 +-
 apps/opencs/view/doc/filedialog.cpp           |  2 +-
 apps/opencs/view/doc/filedialog.hpp           |  2 +-
 apps/opencs/view/doc/filewidget.hpp           |  2 +-
 .../view/doc/globaldebugprofilemenu.cpp       |  4 +-
 .../view/doc/globaldebugprofilemenu.hpp       |  2 +-
 apps/opencs/view/doc/loader.cpp               |  2 +-
 apps/opencs/view/doc/sizehint.hpp             |  2 +-
 apps/opencs/view/doc/view.cpp                 |  2 +-
 apps/opencs/view/doc/viewmanager.hpp          |  2 +-
 apps/opencs/view/filter/editwidget.hpp        |  2 +-
 apps/opencs/view/filter/filterbox.hpp         |  2 +-
 apps/opencs/view/filter/recordfilterbox.hpp   |  2 +-
 apps/opencs/view/prefs/keybindingpage.cpp     |  6 +-
 apps/opencs/view/render/cell.cpp              |  4 +-
 apps/opencs/view/render/cellwater.cpp         |  8 +-
 apps/opencs/view/render/editmode.hpp          |  2 +-
 apps/opencs/view/render/instancemode.cpp      |  6 +-
 apps/opencs/view/render/instancemode.hpp      |  2 +-
 apps/opencs/view/render/instancemovemode.hpp  |  2 +-
 apps/opencs/view/render/lighting.hpp          |  2 +-
 apps/opencs/view/render/object.cpp            |  2 +-
 apps/opencs/view/render/orbitcameramode.cpp   |  4 +-
 .../view/render/pagedworldspacewidget.cpp     |  2 +-
 apps/opencs/view/render/pathgrid.cpp          | 12 +--
 apps/opencs/view/render/pathgridmode.cpp      |  6 +-
 apps/opencs/view/render/pathgridmode.hpp      |  2 +-
 apps/opencs/view/render/previewwidget.hpp     |  2 +-
 apps/opencs/view/render/scenewidget.cpp       |  4 +-
 apps/opencs/view/render/terrainshapemode.cpp  | 16 ++--
 .../opencs/view/render/terraintexturemode.cpp | 18 ++---
 apps/opencs/view/render/worldspacewidget.cpp  | 10 +--
 apps/opencs/view/render/worldspacewidget.hpp  |  2 +-
 apps/opencs/view/tools/merge.cpp              |  4 +-
 apps/opencs/view/tools/merge.hpp              |  2 +-
 apps/opencs/view/tools/reporttable.cpp        |  6 +-
 apps/opencs/view/tools/reporttable.hpp        |  2 +-
 apps/opencs/view/tools/searchbox.hpp          |  2 +-
 apps/opencs/view/tools/searchsubview.cpp      |  2 +-
 apps/opencs/view/widget/coloreditor.hpp       |  6 +-
 apps/opencs/view/widget/completerpopup.hpp    |  2 +-
 apps/opencs/view/widget/droplineedit.hpp      |  2 +-
 apps/opencs/view/widget/modebutton.hpp        |  2 +-
 apps/opencs/view/widget/pushbutton.hpp        |  4 +-
 apps/opencs/view/widget/scenetoolbar.hpp      |  4 +-
 apps/opencs/view/widget/scenetoolmode.cpp     |  4 +-
 .../view/widget/scenetoolshapebrush.hpp       |  2 +-
 .../view/widget/scenetooltexturebrush.hpp     |  2 +-
 apps/opencs/view/widget/scenetooltoggle.cpp   |  2 +-
 apps/opencs/view/widget/scenetooltoggle2.cpp  |  2 +-
 apps/opencs/view/world/creator.cpp            |  2 +-
 apps/opencs/view/world/dialoguespinbox.hpp    |  4 +-
 apps/opencs/view/world/dialoguesubview.cpp    | 12 +--
 apps/opencs/view/world/dialoguesubview.hpp    |  4 +-
 apps/opencs/view/world/enumdelegate.cpp       |  2 +-
 .../world/extendedcommandconfigurator.hpp     |  2 +-
 apps/opencs/view/world/genericcreator.cpp     |  8 +-
 .../view/world/idcompletiondelegate.cpp       |  2 +-
 apps/opencs/view/world/idvalidator.hpp        |  2 +-
 apps/opencs/view/world/recordbuttonbar.hpp    |  4 +-
 .../view/world/recordstatusdelegate.hpp       |  2 +-
 apps/opencs/view/world/regionmap.hpp          |  2 +-
 apps/opencs/view/world/scriptedit.cpp         |  4 +-
 apps/opencs/view/world/scripterrortable.hpp   |  2 +-
 apps/opencs/view/world/scriptsubview.cpp      |  4 +-
 apps/opencs/view/world/tablebottombox.hpp     |  2 +-
 apps/opencs/view/world/tableeditidaction.hpp  |  2 +-
 apps/opencs/view/world/util.cpp               |  8 +-
 apps/openmw/engine.cpp                        |  2 +-
 apps/openmw/mwbase/environment.cpp            | 26 +++----
 apps/openmw/mwbase/statemanager.hpp           |  2 +-
 apps/openmw/mwbase/world.hpp                  |  2 +-
 apps/openmw/mwclass/creature.cpp              |  2 +-
 apps/openmw/mwgui/bookpage.cpp                |  6 +-
 apps/openmw/mwgui/charactercreation.cpp       | 54 +++++++-------
 apps/openmw/mwgui/class.cpp                   | 16 ++--
 apps/openmw/mwgui/console.cpp                 |  2 +-
 apps/openmw/mwgui/draganddrop.cpp             |  2 +-
 apps/openmw/mwgui/mainmenu.cpp                |  2 +-
 apps/openmw/mwgui/mapwindow.cpp               |  2 +-
 apps/openmw/mwgui/quickkeysmenu.cpp           |  6 +-
 apps/openmw/mwgui/review.cpp                  |  2 +-
 apps/openmw/mwgui/spellcreationdialog.cpp     |  8 +-
 apps/openmw/mwgui/tooltips.cpp                |  4 +-
 apps/openmw/mwgui/widgets.cpp                 |  4 +-
 apps/openmw/mwgui/windowmanagerimp.cpp        |  2 +-
 apps/openmw/mwinput/mousemanager.cpp          |  2 +-
 apps/openmw/mwmechanics/alchemy.cpp           |  2 +-
 .../mwscript/transformationextensions.cpp     |  4 +-
 apps/openmw/mwsound/ffmpeg_decoder.cpp        |  2 +-
 apps/openmw/mwsound/openal_output.cpp         | 24 +++---
 apps/openmw/mwsound/sound_buffer.hpp          |  2 +-
 apps/openmw/mwsound/soundmanagerimp.cpp       |  4 +-
 apps/openmw/mwstate/character.cpp             |  4 +-
 apps/openmw/mwstate/charactermanager.cpp      |  2 +-
 apps/openmw/mwstate/statemanagerimp.hpp       |  2 +-
 apps/openmw/mwworld/cells.cpp                 |  6 +-
 apps/openmw/mwworld/cellstore.cpp             |  2 +-
 apps/openmw/mwworld/containerstore.cpp        | 28 +++----
 apps/openmw/mwworld/esmstore.cpp              |  4 +-
 apps/openmw/mwworld/esmstore.hpp              |  6 +-
 apps/openmw/mwworld/manualref.cpp             |  2 +-
 apps/openmw/mwworld/player.cpp                |  8 +-
 apps/openmw/mwworld/ptr.cpp                   |  4 +-
 apps/openmw/mwworld/ptr.hpp                   | 24 +++---
 apps/openmw/mwworld/refdata.cpp               | 18 ++---
 apps/openmw/mwworld/scene.cpp                 |  4 +-
 apps/openmw/mwworld/store.cpp                 | 34 ++++-----
 apps/openmw/mwworld/store.hpp                 |  2 +-
 apps/openmw/mwworld/worldimp.cpp              | 12 +--
 apps/openmw/mwworld/worldimp.hpp              |  2 +-
 apps/wizard/mainwizard.hpp                    |  2 +-
 apps/wizard/unshield/unshieldworker.hpp       |  2 +-
 apps/wizard/utils/componentlistwidget.hpp     |  2 +-
 components/compiler/context.hpp               |  4 +-
 .../contentselector/model/contentmodel.cpp    |  6 +-
 components/contentselector/model/esmfile.hpp  |  2 +-
 .../contentselector/model/modelitem.hpp       |  2 +-
 components/contentselector/view/combobox.cpp  |  2 +-
 components/contentselector/view/combobox.hpp  |  2 +-
 .../contentselector/view/contentselector.hpp  |  2 +-
 components/crashcatcher/crashcatcher.cpp      |  2 +-
 components/detournavigator/findsmoothpath.cpp |  4 +-
 components/detournavigator/findsmoothpath.hpp |  4 +-
 components/esm/loadcell.hpp                   |  2 +-
 components/esm/variant.cpp                    | 14 ++--
 components/esm/variantimp.hpp                 |  6 +-
 components/esmterrain/storage.cpp             | 14 ++--
 components/files/constrainedfilestream.cpp    |  6 +-
 components/interpreter/runtime.cpp            |  6 +-
 .../myguiplatform/myguirendermanager.cpp      |  2 +-
 components/nifosg/particle.cpp                |  2 +-
 components/resource/imagemanager.cpp          |  2 +-
 components/resource/objectcache.hpp           |  2 +-
 components/sceneutil/lightmanager.cpp         |  4 +-
 components/sdlutil/sdlcursormanager.cpp       |  4 +-
 components/sdlutil/sdlgraphicswindow.cpp      |  6 +-
 components/sdlutil/sdlgraphicswindow.hpp      |  2 +-
 components/terrain/quadtreenode.cpp           |  2 +-
 components/widgets/box.cpp                    |  8 +-
 components/widgets/list.cpp                   |  8 +-
 .../osg-ffmpeg-videoplayer/audiodecoder.cpp   |  8 +-
 extern/osg-ffmpeg-videoplayer/videoplayer.cpp |  6 +-
 extern/osg-ffmpeg-videoplayer/videostate.cpp  | 74 +++++++++----------
 extern/osg-ffmpeg-videoplayer/videostate.hpp  |  2 +-
 183 files changed, 483 insertions(+), 483 deletions(-)

diff --git a/apps/launcher/advancedpage.hpp b/apps/launcher/advancedpage.hpp
index bdf5af0c85..ef2f4740f3 100644
--- a/apps/launcher/advancedpage.hpp
+++ b/apps/launcher/advancedpage.hpp
@@ -20,7 +20,7 @@ namespace Launcher
 
     public:
         AdvancedPage(Files::ConfigurationManager &cfg, Config::GameSettings &gameSettings,
-                     Settings::Manager &engineSettings, QWidget *parent = 0);
+                     Settings::Manager &engineSettings, QWidget *parent = nullptr);
 
         bool loadSettings();
         void saveSettings();
diff --git a/apps/launcher/datafilespage.hpp b/apps/launcher/datafilespage.hpp
index af54fe75e4..92984847e2 100644
--- a/apps/launcher/datafilespage.hpp
+++ b/apps/launcher/datafilespage.hpp
@@ -32,7 +32,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;
 
diff --git a/apps/launcher/graphicspage.hpp b/apps/launcher/graphicspage.hpp
index 3b03a72bdd..55178e0d75 100644
--- a/apps/launcher/graphicspage.hpp
+++ b/apps/launcher/graphicspage.hpp
@@ -20,7 +20,7 @@ namespace Launcher
         Q_OBJECT
 
     public:
-        GraphicsPage(Files::ConfigurationManager &cfg, Settings::Manager &engineSettings, QWidget *parent = 0);
+        GraphicsPage(Files::ConfigurationManager &cfg, Settings::Manager &engineSettings, QWidget *parent = nullptr);
 
         void saveSettings();
         bool loadSettings();
diff --git a/apps/launcher/maindialog.hpp b/apps/launcher/maindialog.hpp
index 214d31dd4a..de74233305 100644
--- a/apps/launcher/maindialog.hpp
+++ b/apps/launcher/maindialog.hpp
@@ -48,7 +48,7 @@ namespace Launcher
         Q_OBJECT
 
     public:
-        explicit MainDialog(QWidget *parent = 0);
+        explicit MainDialog(QWidget *parent = nullptr);
         ~MainDialog();
 
         FirstRunDialogResult showFirstRunDialog();
diff --git a/apps/launcher/playpage.hpp b/apps/launcher/playpage.hpp
index 1dc5bb0fe0..b0bd3ee277 100644
--- a/apps/launcher/playpage.hpp
+++ b/apps/launcher/playpage.hpp
@@ -16,7 +16,7 @@ namespace Launcher
         Q_OBJECT
 
     public:
-        PlayPage(QWidget *parent = 0);
+        PlayPage(QWidget *parent = nullptr);
         void setProfilesModel(QAbstractItemModel *model);
 
     signals:
diff --git a/apps/launcher/settingspage.hpp b/apps/launcher/settingspage.hpp
index ccc2061dd7..97b099dd62 100644
--- a/apps/launcher/settingspage.hpp
+++ b/apps/launcher/settingspage.hpp
@@ -24,7 +24,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();
diff --git a/apps/launcher/utils/lineedit.hpp b/apps/launcher/utils/lineedit.hpp
index 50da730459..da28e858ce 100644
--- a/apps/launcher/utils/lineedit.hpp
+++ b/apps/launcher/utils/lineedit.hpp
@@ -24,7 +24,7 @@ class LineEdit : public QLineEdit
     QString mPlaceholderText;
 
 public:
-    LineEdit(QWidget *parent = 0);
+    LineEdit(QWidget *parent = nullptr);
 
 protected:
     void resizeEvent(QResizeEvent *) override;
diff --git a/apps/launcher/utils/profilescombobox.cpp b/apps/launcher/utils/profilescombobox.cpp
index 7df89098e2..462c2ebc27 100644
--- a/apps/launcher/utils/profilescombobox.cpp
+++ b/apps/launcher/utils/profilescombobox.cpp
@@ -33,7 +33,7 @@ void ProfilesComboBox::setEditEnabled(bool editable)
     ComboBoxLineEdit *edit = new ComboBoxLineEdit(this);
 
     setLineEdit(edit);
-    setCompleter(0);
+    setCompleter(nullptr);
 
     connect(lineEdit(), SIGNAL(editingFinished()), this,
                 SLOT(slotEditingFinished()));
diff --git a/apps/launcher/utils/profilescombobox.hpp b/apps/launcher/utils/profilescombobox.hpp
index 7b83c41b2f..065682f3d1 100644
--- a/apps/launcher/utils/profilescombobox.hpp
+++ b/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)
     {
diff --git a/apps/launcher/utils/textinputdialog.cpp b/apps/launcher/utils/textinputdialog.cpp
index 385d086fd0..70b827596e 100644
--- a/apps/launcher/utils/textinputdialog.cpp
+++ b/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);
diff --git a/apps/launcher/utils/textinputdialog.hpp b/apps/launcher/utils/textinputdialog.hpp
index a9353956a0..de06599639 100644
--- a/apps/launcher/utils/textinputdialog.hpp
+++ b/apps/launcher/utils/textinputdialog.hpp
@@ -15,7 +15,7 @@ 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; }
diff --git a/apps/opencs/model/doc/operationholder.hpp b/apps/opencs/model/doc/operationholder.hpp
index b73d61dab1..69af6ed66c 100644
--- a/apps/opencs/model/doc/operationholder.hpp
+++ b/apps/opencs/model/doc/operationholder.hpp
@@ -25,7 +25,7 @@ namespace CSMDoc
 
         public:
 
-            OperationHolder (Operation *operation = 0);
+            OperationHolder (Operation *operation = nullptr);
 
             void setOperation (Operation *operation);
 
diff --git a/apps/opencs/model/doc/runner.cpp b/apps/opencs/model/doc/runner.cpp
index 84bc61a9a0..ccdff1444f 100644
--- a/apps/opencs/model/doc/runner.cpp
+++ b/apps/opencs/model/doc/runner.cpp
@@ -8,7 +8,7 @@
 #include "operationholder.hpp"
 
 CSMDoc::Runner::Runner (const boost::filesystem::path& projectPath)
-: mRunning (false), mStartup (0), mProjectPath (projectPath)
+: mRunning (false), mStartup (nullptr), mProjectPath (projectPath)
 {
     connect (&mProcess, SIGNAL (finished (int, QProcess::ExitStatus)),
         this, SLOT (finished (int, QProcess::ExitStatus)));
@@ -25,7 +25,7 @@ CSMDoc::Runner::~Runner()
 {
     if (mRunning)
     {
-        disconnect (&mProcess, 0, this, 0);
+        disconnect (&mProcess, nullptr, this, nullptr);
         mProcess.kill();
         mProcess.waitForFinished();
     }
@@ -36,7 +36,7 @@ void CSMDoc::Runner::start (bool delayed)
     if (mStartup)
     {
         delete mStartup;
-        mStartup = 0;
+        mStartup = nullptr;
     }
 
     if (!delayed)
@@ -102,7 +102,7 @@ void CSMDoc::Runner::start (bool delayed)
 void CSMDoc::Runner::stop()
 {
     delete mStartup;
-    mStartup = 0;
+    mStartup = nullptr;
 
     if (mProcess.state()==QProcess::NotRunning)
     {
diff --git a/apps/opencs/model/prefs/boolsetting.cpp b/apps/opencs/model/prefs/boolsetting.cpp
index 6431dc6af3..0058753490 100644
--- a/apps/opencs/model/prefs/boolsetting.cpp
+++ b/apps/opencs/model/prefs/boolsetting.cpp
@@ -11,7 +11,7 @@
 
 CSMPrefs::BoolSetting::BoolSetting (Category *parent, Settings::Manager *values,
   QMutex *mutex, const std::string& key, const std::string& label, bool default_)
-: Setting (parent, values, mutex, key, label),  mDefault (default_), mWidget(0)
+: Setting (parent, values, mutex, key, label),  mDefault (default_), mWidget(nullptr)
 {}
 
 CSMPrefs::BoolSetting& CSMPrefs::BoolSetting::setTooltip (const std::string& tooltip)
@@ -33,7 +33,7 @@ std::pair<QWidget *, QWidget *> CSMPrefs::BoolSetting::makeWidgets (QWidget *par
 
     connect (mWidget, SIGNAL (stateChanged (int)), this, SLOT (valueChanged (int)));
 
-    return std::make_pair (static_cast<QWidget *> (0), mWidget);
+    return std::make_pair (static_cast<QWidget *> (nullptr), mWidget);
 }
 
 void CSMPrefs::BoolSetting::updateWidget()
diff --git a/apps/opencs/model/prefs/coloursetting.cpp b/apps/opencs/model/prefs/coloursetting.cpp
index 1a41621da2..e676ad91c3 100644
--- a/apps/opencs/model/prefs/coloursetting.cpp
+++ b/apps/opencs/model/prefs/coloursetting.cpp
@@ -14,7 +14,7 @@
 
 CSMPrefs::ColourSetting::ColourSetting (Category *parent, Settings::Manager *values,
   QMutex *mutex, const std::string& key, const std::string& label, QColor default_)
-: Setting (parent, values, mutex, key, label), mDefault (default_), mWidget(0)
+: Setting (parent, values, mutex, key, label), mDefault (default_), mWidget(nullptr)
 {}
 
 CSMPrefs::ColourSetting& CSMPrefs::ColourSetting::setTooltip (const std::string& tooltip)
diff --git a/apps/opencs/model/prefs/doublesetting.cpp b/apps/opencs/model/prefs/doublesetting.cpp
index 8ae6f4818c..757b67389a 100644
--- a/apps/opencs/model/prefs/doublesetting.cpp
+++ b/apps/opencs/model/prefs/doublesetting.cpp
@@ -16,7 +16,7 @@ CSMPrefs::DoubleSetting::DoubleSetting (Category *parent, Settings::Manager *val
   QMutex *mutex, const std::string& key, const std::string& label, double default_)
 : Setting (parent, values, mutex, key, label),
   mPrecision(2), mMin (0), mMax (std::numeric_limits<double>::max()),
-  mDefault (default_), mWidget(0)
+  mDefault (default_), mWidget(nullptr)
 {}
 
 CSMPrefs::DoubleSetting& CSMPrefs::DoubleSetting::setPrecision(int precision)
diff --git a/apps/opencs/model/prefs/enumsetting.cpp b/apps/opencs/model/prefs/enumsetting.cpp
index 62cac062a7..ec3fca328f 100644
--- a/apps/opencs/model/prefs/enumsetting.cpp
+++ b/apps/opencs/model/prefs/enumsetting.cpp
@@ -42,7 +42,7 @@ CSMPrefs::EnumValues& CSMPrefs::EnumValues::add (const std::string& value, const
 
 CSMPrefs::EnumSetting::EnumSetting (Category *parent, Settings::Manager *values,
   QMutex *mutex, const std::string& key, const std::string& label, const EnumValue& default_)
-: Setting (parent, values, mutex, key, label), mDefault (default_), mWidget(0)
+: Setting (parent, values, mutex, key, label), mDefault (default_), mWidget(nullptr)
 {}
 
 CSMPrefs::EnumSetting& CSMPrefs::EnumSetting::setTooltip (const std::string& tooltip)
diff --git a/apps/opencs/model/prefs/intsetting.cpp b/apps/opencs/model/prefs/intsetting.cpp
index 25dbf78c29..407ed11f05 100644
--- a/apps/opencs/model/prefs/intsetting.cpp
+++ b/apps/opencs/model/prefs/intsetting.cpp
@@ -15,7 +15,7 @@
 CSMPrefs::IntSetting::IntSetting (Category *parent, Settings::Manager *values,
   QMutex *mutex, const std::string& key, const std::string& label, int default_)
 : Setting (parent, values, mutex, key, label), mMin (0), mMax (std::numeric_limits<int>::max()),
-  mDefault (default_), mWidget(0)
+  mDefault (default_), mWidget(nullptr)
 {}
 
 CSMPrefs::IntSetting& CSMPrefs::IntSetting::setRange (int min, int max)
diff --git a/apps/opencs/model/prefs/modifiersetting.cpp b/apps/opencs/model/prefs/modifiersetting.cpp
index da6b2ccddf..288926d00b 100644
--- a/apps/opencs/model/prefs/modifiersetting.cpp
+++ b/apps/opencs/model/prefs/modifiersetting.cpp
@@ -15,7 +15,7 @@ namespace CSMPrefs
     ModifierSetting::ModifierSetting(Category* parent, Settings::Manager* values, QMutex* mutex, const std::string& key,
         const std::string& label)
         : Setting(parent, values, mutex, key, label)
-        , mButton(0)
+        , mButton(nullptr)
         , mEditorActive(false)
     {
     }
diff --git a/apps/opencs/model/prefs/shortcut.cpp b/apps/opencs/model/prefs/shortcut.cpp
index 924b9535e2..ff7b949a4a 100644
--- a/apps/opencs/model/prefs/shortcut.cpp
+++ b/apps/opencs/model/prefs/shortcut.cpp
@@ -23,7 +23,7 @@ namespace CSMPrefs
         , mLastPos(0)
         , mActivationStatus(AS_Inactive)
         , mModifierStatus(false)
-        , mAction(0)
+        , mAction(nullptr)
     {
         assert (parent);
 
@@ -42,7 +42,7 @@ namespace CSMPrefs
         , mLastPos(0)
         , mActivationStatus(AS_Inactive)
         , mModifierStatus(false)
-        , mAction(0)
+        , mAction(nullptr)
     {
         assert (parent);
 
@@ -62,7 +62,7 @@ namespace CSMPrefs
         , mLastPos(0)
         , mActivationStatus(AS_Inactive)
         , mModifierStatus(false)
-        , mAction(0)
+        , mAction(nullptr)
     {
         assert (parent);
 
@@ -218,6 +218,6 @@ namespace CSMPrefs
 
     void Shortcut::actionDeleted()
     {
-        mAction = 0;
+        mAction = nullptr;
     }
 }
diff --git a/apps/opencs/model/prefs/shortcutmanager.cpp b/apps/opencs/model/prefs/shortcutmanager.cpp
index f39492c6c7..781ad4de31 100644
--- a/apps/opencs/model/prefs/shortcutmanager.cpp
+++ b/apps/opencs/model/prefs/shortcutmanager.cpp
@@ -781,7 +781,7 @@ namespace CSMPrefs
         std::make_pair((int)Qt::Key_LastNumberRedial       , "LastNumberRedial"),
         std::make_pair((int)Qt::Key_Camera                 , "Camera"),
         std::make_pair((int)Qt::Key_CameraFocus            , "CameraFocus"),
-        std::make_pair(0                                   , (const char*) 0)
+        std::make_pair(0                                   , (const char*) nullptr)
     };
 
 }
diff --git a/apps/opencs/model/prefs/shortcutsetting.cpp b/apps/opencs/model/prefs/shortcutsetting.cpp
index de495b9fc9..1c065f7da7 100644
--- a/apps/opencs/model/prefs/shortcutsetting.cpp
+++ b/apps/opencs/model/prefs/shortcutsetting.cpp
@@ -18,7 +18,7 @@ namespace CSMPrefs
     ShortcutSetting::ShortcutSetting(Category* parent, Settings::Manager* values, QMutex* mutex, const std::string& key,
         const std::string& label)
         : Setting(parent, values, mutex, key, label)
-        , mButton(0)
+        , mButton(nullptr)
         , mEditorActive(false)
         , mEditorPos(0)
     {
diff --git a/apps/opencs/model/prefs/state.cpp b/apps/opencs/model/prefs/state.cpp
index abd1ddfc8d..39aae48bda 100644
--- a/apps/opencs/model/prefs/state.cpp
+++ b/apps/opencs/model/prefs/state.cpp
@@ -12,7 +12,7 @@
 #include "shortcutsetting.hpp"
 #include "modifiersetting.hpp"
 
-CSMPrefs::State *CSMPrefs::State::sThis = 0;
+CSMPrefs::State *CSMPrefs::State::sThis = nullptr;
 
 void CSMPrefs::State::load()
 {
@@ -599,7 +599,7 @@ CSMPrefs::State::State (const Files::ConfigurationManager& configurationManager)
 
 CSMPrefs::State::~State()
 {
-    sThis = 0;
+    sThis = nullptr;
 }
 
 void CSMPrefs::State::save()
diff --git a/apps/opencs/model/tools/mergestages.cpp b/apps/opencs/model/tools/mergestages.cpp
index 897c3329c5..016e2da392 100644
--- a/apps/opencs/model/tools/mergestages.cpp
+++ b/apps/opencs/model/tools/mergestages.cpp
@@ -104,7 +104,7 @@ void CSMTools::MergeReferencesStage::perform (int stage, CSMDoc::Messages& messa
         ref.mNew = false;
 
         CSMWorld::Record<CSMWorld::CellRef> newRecord (
-            CSMWorld::RecordBase::State_ModifiedOnly, 0, &ref);
+            CSMWorld::RecordBase::State_ModifiedOnly, nullptr, &ref);
 
         mState.mTarget->getData().getReferences().appendRecord (newRecord);
     }
diff --git a/apps/opencs/model/tools/mergestages.hpp b/apps/opencs/model/tools/mergestages.hpp
index bcb3fe2ad2..a6b6de58f8 100644
--- a/apps/opencs/model/tools/mergestages.hpp
+++ b/apps/opencs/model/tools/mergestages.hpp
@@ -82,7 +82,7 @@ namespace CSMTools
         const CSMWorld::Record<RecordType>& record = source.getRecord (stage);
 
         if (!record.isDeleted())
-            target.appendRecord (CSMWorld::Record<RecordType> (CSMWorld::RecordBase::State_ModifiedOnly, 0, &record.get()));
+            target.appendRecord (CSMWorld::Record<RecordType> (CSMWorld::RecordBase::State_ModifiedOnly, nullptr, &record.get()));
     }
 
     class MergeRefIdsStage : public CSMDoc::Stage
diff --git a/apps/opencs/model/tools/scriptcheck.cpp b/apps/opencs/model/tools/scriptcheck.cpp
index 952127edf2..46a74362b0 100644
--- a/apps/opencs/model/tools/scriptcheck.cpp
+++ b/apps/opencs/model/tools/scriptcheck.cpp
@@ -50,7 +50,7 @@ void CSMTools::ScriptCheckStage::report (const std::string& message, Type type)
 }
 
 CSMTools::ScriptCheckStage::ScriptCheckStage (const CSMDoc::Document& document)
-: mDocument (document), mContext (document.getData()), mMessages (0), mWarningMode (Mode_Ignore)
+: mDocument (document), mContext (document.getData()), mMessages (nullptr), mWarningMode (Mode_Ignore)
 {
     /// \todo add an option to configure warning mode
     setWarningsMode (0);
@@ -73,7 +73,7 @@ int CSMTools::ScriptCheckStage::setup()
         mWarningMode = Mode_Strict;
 
     mContext.clear();
-    mMessages = 0;
+    mMessages = nullptr;
     mId.clear();
     Compiler::ErrorHandler::reset();
 
@@ -130,5 +130,5 @@ void CSMTools::ScriptCheckStage::perform (int stage, CSMDoc::Messages& messages)
         messages.add (id, stream.str(), "", CSMDoc::Message::Severity_SeriousError);
     }
 
-    mMessages = 0;
+    mMessages = nullptr;
 }
diff --git a/apps/opencs/model/tools/searchstage.cpp b/apps/opencs/model/tools/searchstage.cpp
index 3db10b0c37..7cd3f49243 100644
--- a/apps/opencs/model/tools/searchstage.cpp
+++ b/apps/opencs/model/tools/searchstage.cpp
@@ -5,7 +5,7 @@
 #include "searchoperation.hpp"
 
 CSMTools::SearchStage::SearchStage (const CSMWorld::IdTableBase *model)
-: mModel (model), mOperation (0)
+: mModel (model), mOperation (nullptr)
 {}
 
 int CSMTools::SearchStage::setup()
diff --git a/apps/opencs/model/tools/tools.cpp b/apps/opencs/model/tools/tools.cpp
index 07a721e8e2..a3d7db497f 100644
--- a/apps/opencs/model/tools/tools.cpp
+++ b/apps/opencs/model/tools/tools.cpp
@@ -43,7 +43,7 @@ CSMDoc::OperationHolder *CSMTools::Tools::get (int type)
         case CSMDoc::State_Merging: return &mMerge;
     }
 
-    return 0;
+    return nullptr;
 }
 
 const CSMDoc::OperationHolder *CSMTools::Tools::get (int type) const
@@ -138,8 +138,8 @@ CSMDoc::OperationHolder *CSMTools::Tools::getVerifier()
 }
 
 CSMTools::Tools::Tools (CSMDoc::Document& document, ToUTF8::FromType encoding)
-: mDocument (document), mData (document.getData()), mVerifierOperation (0),
-  mSearchOperation (0), mMergeOperation (0), mNextReportNumber (0), mEncoding (encoding)
+: mDocument (document), mData (document.getData()), mVerifierOperation (nullptr),
+  mSearchOperation (nullptr), mMergeOperation (nullptr), mNextReportNumber (0), mEncoding (encoding)
 {
     // index 0: load error log
     mReports.insert (std::make_pair (mNextReportNumber++, new ReportModel));
diff --git a/apps/opencs/model/world/columnimp.hpp b/apps/opencs/model/world/columnimp.hpp
index c69ca1d842..17518937c2 100644
--- a/apps/opencs/model/world/columnimp.hpp
+++ b/apps/opencs/model/world/columnimp.hpp
@@ -2254,7 +2254,7 @@ namespace CSMWorld
 
         QVariant get (const Record<ESXRecordT>& record) const override
         {
-            const std::string *string = 0;
+            const std::string *string = nullptr;
 
             switch (this->mColumnId)
             {
@@ -2272,7 +2272,7 @@ namespace CSMWorld
 
         void set (Record<ESXRecordT>& record, const QVariant& data) override
         {
-            std::string *string = 0;
+            std::string *string = nullptr;
 
             ESXRecordT record2 = record.get();
 
@@ -2312,7 +2312,7 @@ namespace CSMWorld
 
         QVariant get (const Record<ESXRecordT>& record) const override
         {
-            const std::string *string = 0;
+            const std::string *string = nullptr;
 
             switch (this->mColumnId)
             {
@@ -2330,7 +2330,7 @@ namespace CSMWorld
 
         void set (Record<ESXRecordT>& record, const QVariant& data) override
         {
-            std::string *string = 0;
+            std::string *string = nullptr;
 
             ESXRecordT record2 = record.get();
 
diff --git a/apps/opencs/model/world/commanddispatcher.hpp b/apps/opencs/model/world/commanddispatcher.hpp
index 1d29e48c19..538fd7f188 100644
--- a/apps/opencs/model/world/commanddispatcher.hpp
+++ b/apps/opencs/model/world/commanddispatcher.hpp
@@ -34,7 +34,7 @@ namespace CSMWorld
         public:
 
             CommandDispatcher (CSMDoc::Document& document, const CSMWorld::UniversalId& id,
-                QObject *parent = 0);
+                QObject *parent = nullptr);
             ///< \param id ID of the table the commands should operate on primarily.
 
             void setEditLock (bool locked);
diff --git a/apps/opencs/model/world/commands.cpp b/apps/opencs/model/world/commands.cpp
index e9682d7c9a..e33be11397 100644
--- a/apps/opencs/model/world/commands.cpp
+++ b/apps/opencs/model/world/commands.cpp
@@ -290,7 +290,7 @@ void CSMWorld::CreateCommand::undo()
 }
 
 CSMWorld::RevertCommand::RevertCommand (IdTable& model, const std::string& id, QUndoCommand* parent)
-: QUndoCommand (parent), mModel (model), mId (id), mOld (0)
+: QUndoCommand (parent), mModel (model), mId (id), mOld (nullptr)
 {
     setText (("Revert record " + id).c_str());
 
@@ -326,7 +326,7 @@ void CSMWorld::RevertCommand::undo()
 
 CSMWorld::DeleteCommand::DeleteCommand (IdTable& model,
         const std::string& id, CSMWorld::UniversalId::Type type, QUndoCommand* parent)
-: QUndoCommand (parent), mModel (model), mId (id), mOld (0), mType(type)
+: QUndoCommand (parent), mModel (model), mId (id), mOld (nullptr), mType(type)
 {
     setText (("Delete record " + id).c_str());
 
diff --git a/apps/opencs/model/world/commands.hpp b/apps/opencs/model/world/commands.hpp
index 88af32636b..5776cae363 100644
--- a/apps/opencs/model/world/commands.hpp
+++ b/apps/opencs/model/world/commands.hpp
@@ -140,7 +140,7 @@ namespace CSMWorld
         public:
 
             ModifyCommand (QAbstractItemModel& model, const QModelIndex& index, const QVariant& new_,
-                QUndoCommand *parent = 0);
+                QUndoCommand *parent = nullptr);
 
             void redo() override;
 
@@ -167,7 +167,7 @@ namespace CSMWorld
 
         public:
 
-            CreateCommand (IdTable& model, const std::string& id, QUndoCommand *parent = 0);
+            CreateCommand (IdTable& model, const std::string& id, QUndoCommand *parent = nullptr);
 
             void setType (UniversalId::Type type);
 
@@ -189,7 +189,7 @@ namespace CSMWorld
             CloneCommand (IdTable& model, const std::string& idOrigin,
                           const std::string& IdDestination,
                           const UniversalId::Type type,
-                          QUndoCommand* parent = 0);
+                          QUndoCommand* parent = nullptr);
 
             void redo() override;
 
@@ -208,7 +208,7 @@ namespace CSMWorld
 
         public:
 
-            RevertCommand (IdTable& model, const std::string& id, QUndoCommand *parent = 0);
+            RevertCommand (IdTable& model, const std::string& id, QUndoCommand *parent = nullptr);
 
             virtual ~RevertCommand();
 
@@ -231,7 +231,7 @@ namespace CSMWorld
         public:
 
             DeleteCommand (IdTable& model, const std::string& id,
-                    UniversalId::Type type = UniversalId::Type_None, QUndoCommand *parent = 0);
+                    UniversalId::Type type = UniversalId::Type_None, QUndoCommand *parent = nullptr);
 
             virtual ~DeleteCommand();
 
@@ -259,7 +259,7 @@ namespace CSMWorld
     {
         public:
 
-            CreatePathgridCommand(IdTable& model, const std::string& id, QUndoCommand *parent = 0);
+            CreatePathgridCommand(IdTable& model, const std::string& id, QUndoCommand *parent = nullptr);
 
             void redo() override;
     };
@@ -279,7 +279,7 @@ namespace CSMWorld
 
         public:
 
-            UpdateCellCommand (IdTable& model, int row, QUndoCommand *parent = 0);
+            UpdateCellCommand (IdTable& model, int row, QUndoCommand *parent = nullptr);
 
             void redo() override;
 
@@ -316,7 +316,7 @@ namespace CSMWorld
 
         public:
 
-            DeleteNestedCommand (IdTree& model, const std::string& id, int nestedRow, int parentColumn, QUndoCommand* parent = 0);
+            DeleteNestedCommand (IdTree& model, const std::string& id, int nestedRow, int parentColumn, QUndoCommand* parent = nullptr);
 
             void redo() override;
 
@@ -338,7 +338,7 @@ namespace CSMWorld
 
         public:
 
-            AddNestedCommand(IdTree& model, const std::string& id, int nestedRow, int parentColumn, QUndoCommand* parent = 0);
+            AddNestedCommand(IdTree& model, const std::string& id, int nestedRow, int parentColumn, QUndoCommand* parent = nullptr);
 
             void redo() override;
 
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 23720a99a6..70c496e3f2 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -68,7 +68,7 @@ int CSMWorld::Data::count (RecordBase::State state, const CollectionBase& collec
 CSMWorld::Data::Data (ToUTF8::FromType encoding, bool fsStrict, const Files::PathContainer& dataPaths,
     const std::vector<std::string>& archives, const boost::filesystem::path& resDir)
 : mEncoder (encoding), mPathgrids (mCells), mRefs (mCells),
-  mReader (0), mDialogue (0), mReaderIndex(1),
+  mReader (nullptr), mDialogue (nullptr), mReaderIndex(1),
   mFsStrict(fsStrict), mDataPaths(dataPaths), mArchives(archives)
 {
     mVFS.reset(new VFS::Manager(mFsStrict));
@@ -916,7 +916,7 @@ const CSMWorld::MetaData& CSMWorld::Data::getMetaData() const
 
 void CSMWorld::Data::setMetaData (const MetaData& metaData)
 {
-    Record<MetaData> record (RecordBase::State_ModifiedOnly, 0, &metaData);
+    Record<MetaData> record (RecordBase::State_ModifiedOnly, nullptr, &metaData);
     mMetaData.setRecord (0, record);
 }
 
@@ -932,7 +932,7 @@ QAbstractItemModel *CSMWorld::Data::getTableModel (const CSMWorld::UniversalId&
         // construction of the ESX data where no update signals are available.
         if (id.getType()==UniversalId::Type_RegionMap)
         {
-            RegionMap *table = 0;
+            RegionMap *table = nullptr;
             addModel (table = new RegionMap (*this), UniversalId::Type_RegionMap, false);
             return table;
         }
@@ -962,9 +962,9 @@ int CSMWorld::Data::startLoading (const boost::filesystem::path& path, bool base
     // Don't delete the Reader yet. Some record types store a reference to the Reader to handle on-demand loading
     std::shared_ptr<ESM::ESMReader> ptr(mReader);
     mReaders.push_back(ptr);
-    mReader = 0;
+    mReader = nullptr;
 
-    mDialogue = 0;
+    mDialogue = nullptr;
 
     mReader = new ESM::ESMReader;
     mReader->setEncoder (&mEncoder);
@@ -982,7 +982,7 @@ int CSMWorld::Data::startLoading (const boost::filesystem::path& path, bool base
         metaData.mId = "sys::meta";
         metaData.load (*mReader);
 
-        mMetaData.setRecord (0, Record<MetaData> (RecordBase::State_ModifiedOnly, 0, &metaData));
+        mMetaData.setRecord (0, Record<MetaData> (RecordBase::State_ModifiedOnly, nullptr, &metaData));
     }
 
     // Fix uninitialized master data index
@@ -1064,9 +1064,9 @@ bool CSMWorld::Data::continueLoading (CSMDoc::Messages& messages)
         else
             delete mReader;
 
-        mReader = 0;
+        mReader = nullptr;
 
-        mDialogue = 0;
+        mDialogue = nullptr;
 
         loadFallbackEntries();
 
@@ -1151,7 +1151,7 @@ bool CSMWorld::Data::continueLoading (CSMDoc::Messages& messages)
             if (isDeleted)
             {
                 // record vector can be shuffled around which would make pointer to record invalid
-                mDialogue = 0;
+                mDialogue = nullptr;
 
                 if (mJournals.tryDelete (record.mId))
                 {
diff --git a/apps/opencs/model/world/idtableproxymodel.hpp b/apps/opencs/model/world/idtableproxymodel.hpp
index 14d7057924..7e0563834a 100644
--- a/apps/opencs/model/world/idtableproxymodel.hpp
+++ b/apps/opencs/model/world/idtableproxymodel.hpp
@@ -35,7 +35,7 @@ namespace CSMWorld
 
         public:
 
-            IdTableProxyModel (QObject *parent = 0);
+            IdTableProxyModel (QObject *parent = nullptr);
 
             virtual QModelIndex getModelIndex (const std::string& id, int column) const;
 
diff --git a/apps/opencs/model/world/infotableproxymodel.hpp b/apps/opencs/model/world/infotableproxymodel.hpp
index 6a8e66b4f8..92afdabdc5 100644
--- a/apps/opencs/model/world/infotableproxymodel.hpp
+++ b/apps/opencs/model/world/infotableproxymodel.hpp
@@ -28,7 +28,7 @@ namespace CSMWorld
             ///< \a currentRow is a row of the source model.
 
         public:
-            InfoTableProxyModel(UniversalId::Type type, QObject *parent = 0);
+            InfoTableProxyModel(UniversalId::Type type, QObject *parent = nullptr);
 
             void setSourceModel(QAbstractItemModel *sourceModel) override;
 
diff --git a/apps/opencs/model/world/record.hpp b/apps/opencs/model/world/record.hpp
index 82f2abe770..5f67a93b12 100644
--- a/apps/opencs/model/world/record.hpp
+++ b/apps/opencs/model/world/record.hpp
@@ -87,7 +87,7 @@ namespace CSMWorld
     template <typename ESXRecordT>
     RecordBase *Record<ESXRecordT>::modifiedCopy() const
     {
-        return new Record<ESXRecordT> (State_ModifiedOnly, 0, &(this->get()));
+        return new Record<ESXRecordT> (State_ModifiedOnly, nullptr, &(this->get()));
     }
 
     template <typename ESXRecordT>
diff --git a/apps/opencs/model/world/refidcollection.cpp b/apps/opencs/model/world/refidcollection.cpp
index 535a31dddb..cd2dd89dff 100644
--- a/apps/opencs/model/world/refidcollection.cpp
+++ b/apps/opencs/model/world/refidcollection.cpp
@@ -350,7 +350,7 @@ CSMWorld::RefIdCollection::RefIdCollection()
     };
 
     // for re-use in NPC records
-    const RefIdColumn *essential = 0;
+    const RefIdColumn *essential = nullptr;
 
     for (int i=0; sCreatureFlagTable[i].mName!=-1; ++i)
     {
diff --git a/apps/opencs/model/world/resources.hpp b/apps/opencs/model/world/resources.hpp
index 5e9872ea84..c217b793d3 100644
--- a/apps/opencs/model/world/resources.hpp
+++ b/apps/opencs/model/world/resources.hpp
@@ -25,9 +25,9 @@ namespace CSMWorld
 
             /// \param type Type of resources in this table.
             Resources (const VFS::Manager* vfs, const std::string& baseDirectory, UniversalId::Type type,
-                const char * const *extensions = 0);
+                const char * const *extensions = nullptr);
 
-            void recreate(const VFS::Manager* vfs, const char * const *extensions = 0);
+            void recreate(const VFS::Manager* vfs, const char * const *extensions = nullptr);
 
             int getSize() const;
 
diff --git a/apps/opencs/view/doc/adjusterwidget.hpp b/apps/opencs/view/doc/adjusterwidget.hpp
index 91e308236f..cec9ca2291 100644
--- a/apps/opencs/view/doc/adjusterwidget.hpp
+++ b/apps/opencs/view/doc/adjusterwidget.hpp
@@ -32,7 +32,7 @@ namespace CSVDoc
 
         public:
 
-            AdjusterWidget (QWidget *parent = 0);
+            AdjusterWidget (QWidget *parent = nullptr);
 
             void setLocalData (const boost::filesystem::path& localData);
             void setAction (ContentAction action);
diff --git a/apps/opencs/view/doc/filedialog.cpp b/apps/opencs/view/doc/filedialog.cpp
index 7a3fe398f4..69490edca2 100644
--- a/apps/opencs/view/doc/filedialog.cpp
+++ b/apps/opencs/view/doc/filedialog.cpp
@@ -18,7 +18,7 @@
 #include "adjusterwidget.hpp"
 
 CSVDoc::FileDialog::FileDialog(QWidget *parent) :
-    QDialog(parent), mSelector (0), mAction(ContentAction_Undefined), mFileWidget (0), mAdjusterWidget (0), mDialogBuilt(false)
+    QDialog(parent), mSelector (nullptr), mAction(ContentAction_Undefined), mFileWidget (nullptr), mAdjusterWidget (nullptr), mDialogBuilt(false)
 {
     ui.setupUi (this);
     resize(400, 400);
diff --git a/apps/opencs/view/doc/filedialog.hpp b/apps/opencs/view/doc/filedialog.hpp
index bec2c68695..6c48fa78b9 100644
--- a/apps/opencs/view/doc/filedialog.hpp
+++ b/apps/opencs/view/doc/filedialog.hpp
@@ -42,7 +42,7 @@ namespace CSVDoc
 
     public:
 
-        explicit FileDialog(QWidget *parent = 0);
+        explicit FileDialog(QWidget *parent = nullptr);
         void showDialog (ContentAction action);
 
         void addFiles (const QString &path);
diff --git a/apps/opencs/view/doc/filewidget.hpp b/apps/opencs/view/doc/filewidget.hpp
index ab06f37f18..626b8d77d8 100644
--- a/apps/opencs/view/doc/filewidget.hpp
+++ b/apps/opencs/view/doc/filewidget.hpp
@@ -23,7 +23,7 @@ namespace CSVDoc
 
         public:
 
-            FileWidget (QWidget *parent = 0);
+            FileWidget (QWidget *parent = nullptr);
 
             void setType (bool addon);
 
diff --git a/apps/opencs/view/doc/globaldebugprofilemenu.cpp b/apps/opencs/view/doc/globaldebugprofilemenu.cpp
index f0d9655dd0..c898b819c2 100644
--- a/apps/opencs/view/doc/globaldebugprofilemenu.cpp
+++ b/apps/opencs/view/doc/globaldebugprofilemenu.cpp
@@ -13,7 +13,7 @@ void CSVDoc::GlobalDebugProfileMenu::rebuild()
     clear();
 
     delete mActions;
-    mActions = 0;
+    mActions = nullptr;
 
     int idColumn = mDebugProfiles->findColumnIndex (CSMWorld::Columns::ColumnId_Id);
     int stateColumn = mDebugProfiles->findColumnIndex (CSMWorld::Columns::ColumnId_Modification);
@@ -48,7 +48,7 @@ void CSVDoc::GlobalDebugProfileMenu::rebuild()
 
 CSVDoc::GlobalDebugProfileMenu::GlobalDebugProfileMenu (CSMWorld::IdTable *debugProfiles,
     QWidget *parent)
-: QMenu (parent), mDebugProfiles (debugProfiles), mActions (0)
+: QMenu (parent), mDebugProfiles (debugProfiles), mActions (nullptr)
 {
     rebuild();
 
diff --git a/apps/opencs/view/doc/globaldebugprofilemenu.hpp b/apps/opencs/view/doc/globaldebugprofilemenu.hpp
index 0d7906ccef..e12ee306a1 100644
--- a/apps/opencs/view/doc/globaldebugprofilemenu.hpp
+++ b/apps/opencs/view/doc/globaldebugprofilemenu.hpp
@@ -26,7 +26,7 @@ namespace CSVDoc
 
         public:
 
-            GlobalDebugProfileMenu (CSMWorld::IdTable *debugProfiles, QWidget *parent = 0);
+            GlobalDebugProfileMenu (CSMWorld::IdTable *debugProfiles, QWidget *parent = nullptr);
 
             void updateActions (bool running);
 
diff --git a/apps/opencs/view/doc/loader.cpp b/apps/opencs/view/doc/loader.cpp
index 49a53e1794..1cdfc01733 100644
--- a/apps/opencs/view/doc/loader.cpp
+++ b/apps/opencs/view/doc/loader.cpp
@@ -17,7 +17,7 @@ void CSVDoc::LoadingDocument::closeEvent (QCloseEvent *event)
 }
 
 CSVDoc::LoadingDocument::LoadingDocument (CSMDoc::Document *document)
-: mDocument (document), mAborted (false), mMessages (0), mTotalRecords (0)
+: mDocument (document), mAborted (false), mMessages (nullptr), mTotalRecords (0)
 {
     setWindowTitle (QString::fromUtf8((std::string("Opening ") + document->getSavePath().filename().string()).c_str()));
 
diff --git a/apps/opencs/view/doc/sizehint.hpp b/apps/opencs/view/doc/sizehint.hpp
index 1b3c52eb8a..14ec7b1865 100644
--- a/apps/opencs/view/doc/sizehint.hpp
+++ b/apps/opencs/view/doc/sizehint.hpp
@@ -11,7 +11,7 @@ namespace CSVDoc
             QSize mSize;
 
         public:
-            SizeHintWidget(QWidget *parent = 0);
+            SizeHintWidget(QWidget *parent = nullptr);
             ~SizeHintWidget();
 
             QSize sizeHint() const override;
diff --git a/apps/opencs/view/doc/view.cpp b/apps/opencs/view/doc/view.cpp
index ac7c8ebf97..be3fe51423 100644
--- a/apps/opencs/view/doc/view.cpp
+++ b/apps/opencs/view/doc/view.cpp
@@ -733,7 +733,7 @@ void CSVDoc::View::infoAbout()
 #endif
 
     // Get current year
-    time_t now = time(NULL);
+    time_t now = time(nullptr);
     struct tm tstruct;
     char copyrightInfo[40];
     tstruct = *localtime(&now);
diff --git a/apps/opencs/view/doc/viewmanager.hpp b/apps/opencs/view/doc/viewmanager.hpp
index 70431107f6..8424be6f89 100644
--- a/apps/opencs/view/doc/viewmanager.hpp
+++ b/apps/opencs/view/doc/viewmanager.hpp
@@ -43,7 +43,7 @@ namespace CSVDoc
             ViewManager& operator= (const ViewManager&);
 
             void updateIndices();
-            bool notifySaveOnClose (View *view = 0);
+            bool notifySaveOnClose (View *view = nullptr);
             bool showModifiedDocumentMessageBox (View *view);
             bool showSaveInProgressMessageBox (View *view);
             bool removeDocument(View *view);
diff --git a/apps/opencs/view/filter/editwidget.hpp b/apps/opencs/view/filter/editwidget.hpp
index b47a884a38..f933ec92eb 100644
--- a/apps/opencs/view/filter/editwidget.hpp
+++ b/apps/opencs/view/filter/editwidget.hpp
@@ -30,7 +30,7 @@ namespace CSVFilter
 
         public:
 
-            EditWidget (CSMWorld::Data& data, QWidget *parent = 0);
+            EditWidget (CSMWorld::Data& data, QWidget *parent = nullptr);
 
             void createFilterRequest(std::vector<std::pair<std::string, std::vector<std::string> > >& filterSource,
                                      Qt::DropAction action);
diff --git a/apps/opencs/view/filter/filterbox.hpp b/apps/opencs/view/filter/filterbox.hpp
index 94aa80b844..94b5fced30 100644
--- a/apps/opencs/view/filter/filterbox.hpp
+++ b/apps/opencs/view/filter/filterbox.hpp
@@ -25,7 +25,7 @@ namespace CSVFilter
             RecordFilterBox *mRecordFilterBox;
 
         public:
-            FilterBox (CSMWorld::Data& data, QWidget *parent = 0);
+            FilterBox (CSMWorld::Data& data, QWidget *parent = nullptr);
 
             void setRecordFilter (const std::string& filter);
 
diff --git a/apps/opencs/view/filter/recordfilterbox.hpp b/apps/opencs/view/filter/recordfilterbox.hpp
index 77a07c92bc..3bcd7c57b4 100644
--- a/apps/opencs/view/filter/recordfilterbox.hpp
+++ b/apps/opencs/view/filter/recordfilterbox.hpp
@@ -25,7 +25,7 @@ namespace CSVFilter
 
         public:
 
-            RecordFilterBox (CSMWorld::Data& data, QWidget *parent = 0);
+            RecordFilterBox (CSMWorld::Data& data, QWidget *parent = nullptr);
 
             void setFilter (const std::string& filter);
 
diff --git a/apps/opencs/view/prefs/keybindingpage.cpp b/apps/opencs/view/prefs/keybindingpage.cpp
index eed5c0eb8e..39c9f78ec1 100644
--- a/apps/opencs/view/prefs/keybindingpage.cpp
+++ b/apps/opencs/view/prefs/keybindingpage.cpp
@@ -16,9 +16,9 @@ namespace CSVPrefs
 {
     KeyBindingPage::KeyBindingPage(CSMPrefs::Category& category, QWidget* parent)
         : PageBase(category, parent)
-        , mStackedLayout(0)
-        , mPageLayout(0)
-        , mPageSelector(0)
+        , mStackedLayout(nullptr)
+        , mPageLayout(nullptr)
+        , mPageSelector(nullptr)
     {
         // Need one widget for scroll area
         QWidget* topWidget = new QWidget();
diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index 23b5aa91e4..75d83cf639 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -504,12 +504,12 @@ void CSVRender::Cell::setCellArrows (int mask)
 
         bool enable = mask & direction;
 
-        if (enable!=(mCellArrows[i].get()!=0))
+        if (enable!=(mCellArrows[i].get()!=nullptr))
         {
             if (enable)
                 mCellArrows[i].reset (new CellArrow (mCellNode, direction, mCoordinates));
             else
-                mCellArrows[i].reset (0);
+                mCellArrows[i].reset (nullptr);
         }
     }
 }
diff --git a/apps/opencs/view/render/cellwater.cpp b/apps/opencs/view/render/cellwater.cpp
index 4351788609..f8857c3afc 100644
--- a/apps/opencs/view/render/cellwater.cpp
+++ b/apps/opencs/view/render/cellwater.cpp
@@ -27,9 +27,9 @@ namespace CSVRender
         : mData(data)
         , mId(id)
         , mParentNode(cellNode)
-        , mWaterTransform(0)
-        , mWaterNode(0)
-        , mWaterGeometry(0)
+        , mWaterTransform(nullptr)
+        , mWaterNode(nullptr)
+        , mWaterGeometry(nullptr)
         , mDeleted(false)
         , mExterior(false)
         , mHasWater(false)
@@ -137,7 +137,7 @@ namespace CSVRender
         if (mWaterGeometry)
         {
             mWaterNode->removeDrawable(mWaterGeometry);
-            mWaterGeometry = 0;
+            mWaterGeometry = nullptr;
         }
 
         if (mDeleted || !mHasWater)
diff --git a/apps/opencs/view/render/editmode.hpp b/apps/opencs/view/render/editmode.hpp
index c0482c81a6..52c35811d2 100644
--- a/apps/opencs/view/render/editmode.hpp
+++ b/apps/opencs/view/render/editmode.hpp
@@ -30,7 +30,7 @@ namespace CSVRender
         public:
 
             EditMode (WorldspaceWidget *worldspaceWidget, const QIcon& icon, unsigned int mask,
-                const QString& tooltip = "", QWidget *parent = 0);
+                const QString& tooltip = "", QWidget *parent = nullptr);
 
             unsigned int getInteractionMask() const;
 
diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index 987dea437b..19018fae6c 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -98,7 +98,7 @@ osg::Vec3f CSVRender::InstanceMode::getScreenCoords(const osg::Vec3f& pos)
 
 CSVRender::InstanceMode::InstanceMode (WorldspaceWidget *worldspaceWidget,  osg::ref_ptr<osg::Group> parentNode,  QWidget *parent)
 : EditMode (worldspaceWidget, QIcon (":scenetoolbar/editing-instance"), Mask_Reference | Mask_Terrain, "Instance editing",
-  parent), mSubMode (0), mSubModeId ("move"), mSelectionMode (0), mDragMode (DragMode_None),
+  parent), mSubMode (nullptr), mSubModeId ("move"), mSelectionMode (nullptr), mDragMode (DragMode_None),
   mDragAxis (-1), mLocked (false), mUnitScaleDist(1), mParentNode (parentNode)
 {
     connect(this, SIGNAL(requestFocus(const std::string&)),
@@ -169,14 +169,14 @@ void CSVRender::InstanceMode::deactivate (CSVWidget::SceneToolbar *toolbar)
     {
         toolbar->removeTool (mSelectionMode);
         delete mSelectionMode;
-        mSelectionMode = 0;
+        mSelectionMode = nullptr;
     }
 
     if (mSubMode)
     {
         toolbar->removeTool (mSubMode);
         delete mSubMode;
-        mSubMode = 0;
+        mSubMode = nullptr;
     }
 
     EditMode::deactivate (toolbar);
diff --git a/apps/opencs/view/render/instancemode.hpp b/apps/opencs/view/render/instancemode.hpp
index 29955feef6..32dd4ac67d 100644
--- a/apps/opencs/view/render/instancemode.hpp
+++ b/apps/opencs/view/render/instancemode.hpp
@@ -62,7 +62,7 @@ namespace CSVRender
 
         public:
 
-            InstanceMode (WorldspaceWidget *worldspaceWidget, osg::ref_ptr<osg::Group> parentNode, QWidget *parent = 0);
+            InstanceMode (WorldspaceWidget *worldspaceWidget, osg::ref_ptr<osg::Group> parentNode, QWidget *parent = nullptr);
 
             void activate (CSVWidget::SceneToolbar *toolbar) override;
 
diff --git a/apps/opencs/view/render/instancemovemode.hpp b/apps/opencs/view/render/instancemovemode.hpp
index bd0e28dac8..62e6b6a1f8 100644
--- a/apps/opencs/view/render/instancemovemode.hpp
+++ b/apps/opencs/view/render/instancemovemode.hpp
@@ -11,7 +11,7 @@ namespace CSVRender
 
         public:
 
-            InstanceMoveMode (QWidget *parent = 0);
+            InstanceMoveMode (QWidget *parent = nullptr);
     };
 }
 
diff --git a/apps/opencs/view/render/lighting.hpp b/apps/opencs/view/render/lighting.hpp
index 66b0eec000..d9d90767f0 100644
--- a/apps/opencs/view/render/lighting.hpp
+++ b/apps/opencs/view/render/lighting.hpp
@@ -16,7 +16,7 @@ namespace CSVRender
     {
         public:
 
-            Lighting() : mRootNode(0) {}
+            Lighting() : mRootNode(nullptr) {}
             virtual ~Lighting();
 
             virtual void activate (osg::Group* rootNode, bool isExterior) = 0;
diff --git a/apps/opencs/view/render/object.cpp b/apps/opencs/view/render/object.cpp
index f9d2c8872e..2bb537d74a 100644
--- a/apps/opencs/view/render/object.cpp
+++ b/apps/opencs/view/render/object.cpp
@@ -413,7 +413,7 @@ osg::Vec3f CSVRender::Object::getMarkerPosition (float x, float y, float z, int
 
 CSVRender::Object::Object (CSMWorld::Data& data, osg::Group* parentNode,
     const std::string& id, bool referenceable, bool forceBaseToZero)
-: mData (data), mBaseNode(0), mSelected(false), mParentNode(parentNode), mResourceSystem(data.getResourceSystem().get()), mForceBaseToZero (forceBaseToZero),
+: mData (data), mBaseNode(nullptr), mSelected(false), mParentNode(parentNode), mResourceSystem(data.getResourceSystem().get()), mForceBaseToZero (forceBaseToZero),
   mScaleOverride (1), mOverrideFlags (0), mSubMode (-1), mMarkerTransparency(0.5f)
 {
     mRootNode = new osg::PositionAttitudeTransform;
diff --git a/apps/opencs/view/render/orbitcameramode.cpp b/apps/opencs/view/render/orbitcameramode.cpp
index ba25beaba9..79ac0167ab 100644
--- a/apps/opencs/view/render/orbitcameramode.cpp
+++ b/apps/opencs/view/render/orbitcameramode.cpp
@@ -13,7 +13,7 @@ namespace CSVRender
         QWidget* parent)
         : ModeButton(icon, tooltip, parent)
         , mWorldspaceWidget(worldspaceWidget)
-        , mCenterOnSelection(0)
+        , mCenterOnSelection(nullptr)
     {
         mCenterShortcut = new CSMPrefs::Shortcut("orbit-center-selection", worldspaceWidget);
         mCenterShortcut->enable(false);
@@ -35,7 +35,7 @@ namespace CSVRender
 
     void OrbitCameraMode::deactivate(CSVWidget::SceneToolbar* toolbar)
     {
-        mCenterShortcut->associateAction(0);
+        mCenterShortcut->associateAction(nullptr);
         mCenterShortcut->enable(false);
     }
 
diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index b5d9234e42..dca5549af4 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -787,7 +787,7 @@ CSVRender::Cell* CSVRender::PagedWorldspaceWidget::getCell(const osg::Vec3d& poi
     if (searchResult != mCells.end())
         return searchResult->second;
     else
-        return 0;
+        return nullptr;
 }
 
 CSVRender::Cell* CSVRender::PagedWorldspaceWidget::getCell(const CSMWorld::CellCoordinates& coords) const
diff --git a/apps/opencs/view/render/pathgrid.cpp b/apps/opencs/view/render/pathgrid.cpp
index 7f0454d8fe..470a3d0928 100644
--- a/apps/opencs/view/render/pathgrid.cpp
+++ b/apps/opencs/view/render/pathgrid.cpp
@@ -60,8 +60,8 @@ namespace CSVRender
         , mRemoveGeometry(false)
         , mUseOffset(true)
         , mParent(parent)
-        , mPathgridGeometry(0)
-        , mDragGeometry(0)
+        , mPathgridGeometry(nullptr)
+        , mDragGeometry(nullptr)
         , mTag(new PathgridTag(this))
     {
         const float CoordScalar = ESM::Land::REAL_SIZE;
@@ -219,7 +219,7 @@ namespace CSVRender
         mMoveOffset.set(0, 0, 0);
 
         mPathgridGeode->removeDrawable(mDragGeometry);
-        mDragGeometry = 0;
+        mDragGeometry = nullptr;
     }
 
     void Pathgrid::applyPoint(CSMWorld::CommandMacro& commands, const osg::Vec3d& worldPos)
@@ -557,7 +557,7 @@ namespace CSVRender
         if (mPathgridGeometry)
         {
             mPathgridGeode->removeDrawable(mPathgridGeometry);
-            mPathgridGeometry = 0;
+            mPathgridGeometry = nullptr;
         }
     }
 
@@ -566,7 +566,7 @@ namespace CSVRender
         if (mSelectedGeometry)
         {
             mPathgridGeode->removeDrawable(mSelectedGeometry);
-            mSelectedGeometry = 0;
+            mSelectedGeometry = nullptr;
         }
     }
 
@@ -612,7 +612,7 @@ namespace CSVRender
             return &mPathgridCollection.getRecord(index).get();
         }
 
-        return 0;
+        return nullptr;
     }
 
     int Pathgrid::edgeExists(const CSMWorld::Pathgrid& source, unsigned short node1, unsigned short node2)
diff --git a/apps/opencs/view/render/pathgridmode.cpp b/apps/opencs/view/render/pathgridmode.cpp
index 8863ad235c..7a3fc8ecf7 100644
--- a/apps/opencs/view/render/pathgridmode.cpp
+++ b/apps/opencs/view/render/pathgridmode.cpp
@@ -27,7 +27,7 @@ namespace CSVRender
             getTooltip(), parent)
         , mDragMode(DragMode_None)
         , mFromNode(0)
-        , mSelectionMode(0)
+        , mSelectionMode(nullptr)
     {
     }
 
@@ -59,7 +59,7 @@ namespace CSVRender
         {
             toolbar->removeTool (mSelectionMode);
             delete mSelectionMode;
-            mSelectionMode = 0;
+            mSelectionMode = nullptr;
         }
     }
 
@@ -214,7 +214,7 @@ namespace CSVRender
             Cell* cell = getWorldspaceWidget().getCell(hit.worldPos);
             if (cell && cell->getPathgrid())
             {
-                PathgridTag* tag = 0;
+                PathgridTag* tag = nullptr;
                 if (hit.tag && (tag = dynamic_cast<PathgridTag*>(hit.tag.get())) && tag->getPathgrid()->getId() == mEdgeId)
                 {
                     unsigned short node = SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.index0));
diff --git a/apps/opencs/view/render/pathgridmode.hpp b/apps/opencs/view/render/pathgridmode.hpp
index 6d8f96e8c3..cc61dfe9b0 100644
--- a/apps/opencs/view/render/pathgridmode.hpp
+++ b/apps/opencs/view/render/pathgridmode.hpp
@@ -15,7 +15,7 @@ namespace CSVRender
 
         public:
 
-            PathgridMode(WorldspaceWidget* worldspace, QWidget* parent=0);
+            PathgridMode(WorldspaceWidget* worldspace, QWidget* parent=nullptr);
 
             void activate(CSVWidget::SceneToolbar* toolbar) override;
 
diff --git a/apps/opencs/view/render/previewwidget.hpp b/apps/opencs/view/render/previewwidget.hpp
index 630ccf293d..a8d73729a4 100644
--- a/apps/opencs/view/render/previewwidget.hpp
+++ b/apps/opencs/view/render/previewwidget.hpp
@@ -29,7 +29,7 @@ namespace CSVRender
         public:
 
             PreviewWidget (CSMWorld::Data& data, const std::string& id, bool referenceable,
-                QWidget *parent = 0);
+                QWidget *parent = nullptr);
 
         signals:
 
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index f3186e76a9..3abc01d2e6 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -36,7 +36,7 @@ namespace CSVRender
 
 RenderWidget::RenderWidget(QWidget *parent, Qt::WindowFlags f)
     : QWidget(parent, f)
-    , mRootNode(0)
+    , mRootNode(nullptr)
 {
 
     osgViewer::CompositeViewer& viewer = CompositeViewer::get();
@@ -257,7 +257,7 @@ void SceneWidget::setLighting(Lighting *lighting)
     mLighting = lighting;
     mLighting->activate (mRootNode, mIsExterior);
 
-    osg::Vec4f ambient = mLighting->getAmbientColour(mHasDefaultAmbient ? &mDefaultAmbient : 0);
+    osg::Vec4f ambient = mLighting->getAmbientColour(mHasDefaultAmbient ? &mDefaultAmbient : nullptr);
     setAmbient(ambient);
 
     flagAsModified();
diff --git a/apps/opencs/view/render/terrainshapemode.cpp b/apps/opencs/view/render/terrainshapemode.cpp
index 5664378ca9..e495d23555 100644
--- a/apps/opencs/view/render/terrainshapemode.cpp
+++ b/apps/opencs/view/render/terrainshapemode.cpp
@@ -99,7 +99,7 @@ void CSVRender::TerrainShapeMode::primaryOpenPressed (const WorldspaceHitResult&
 
 void CSVRender::TerrainShapeMode::primaryEditPressed(const WorldspaceHitResult& hit)
 {
-    if (hit.hit && hit.tag == 0)
+    if (hit.hit && hit.tag == nullptr)
     {
         if (mShapeEditTool == ShapeEditTool_Flatten)
             setFlattenToolTargetHeight(hit);
@@ -124,7 +124,7 @@ void CSVRender::TerrainShapeMode::primaryEditPressed(const WorldspaceHitResult&
 
 void CSVRender::TerrainShapeMode::primarySelectPressed(const WorldspaceHitResult& hit)
 {
-    if(hit.hit && hit.tag == 0)
+    if(hit.hit && hit.tag == nullptr)
     {
         selectTerrainShapes(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), 0, false);
     }
@@ -132,7 +132,7 @@ void CSVRender::TerrainShapeMode::primarySelectPressed(const WorldspaceHitResult
 
 void CSVRender::TerrainShapeMode::secondarySelectPressed(const WorldspaceHitResult& hit)
 {
-    if(hit.hit && hit.tag == 0)
+    if(hit.hit && hit.tag == nullptr)
     {
         selectTerrainShapes(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), 1, false);
     }
@@ -144,7 +144,7 @@ bool CSVRender::TerrainShapeMode::primaryEditStartDrag (const QPoint& pos)
 
     mDragMode = InteractionType_PrimaryEdit;
 
-    if (hit.hit && hit.tag == 0)
+    if (hit.hit && hit.tag == nullptr)
     {
         mEditingPos = hit.worldPos;
         mIsEditing = true;
@@ -164,7 +164,7 @@ bool CSVRender::TerrainShapeMode::primarySelectStartDrag (const QPoint& pos)
 {
     WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
     mDragMode = InteractionType_PrimarySelect;
-    if (!hit.hit || hit.tag != 0)
+    if (!hit.hit || hit.tag != nullptr)
     {
         mDragMode = InteractionType_None;
         return false;
@@ -177,7 +177,7 @@ bool CSVRender::TerrainShapeMode::secondarySelectStartDrag (const QPoint& pos)
 {
     WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
     mDragMode = InteractionType_SecondarySelect;
-    if (!hit.hit || hit.tag != 0)
+    if (!hit.hit || hit.tag != nullptr)
     {
         mDragMode = InteractionType_None;
         return false;
@@ -202,13 +202,13 @@ void CSVRender::TerrainShapeMode::drag (const QPoint& pos, int diffX, int diffY,
     if (mDragMode == InteractionType_PrimarySelect)
     {
         WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
-        if (hit.hit && hit.tag == 0) selectTerrainShapes(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), 0, true);
+        if (hit.hit && hit.tag == nullptr) selectTerrainShapes(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), 0, true);
     }
 
     if (mDragMode == InteractionType_SecondarySelect)
     {
         WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
-        if (hit.hit && hit.tag == 0) selectTerrainShapes(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), 1, true);
+        if (hit.hit && hit.tag == nullptr) selectTerrainShapes(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), 1, true);
     }
 }
 
diff --git a/apps/opencs/view/render/terraintexturemode.cpp b/apps/opencs/view/render/terraintexturemode.cpp
index ae57118813..c8d63f32e8 100644
--- a/apps/opencs/view/render/terraintexturemode.cpp
+++ b/apps/opencs/view/render/terraintexturemode.cpp
@@ -119,7 +119,7 @@ void CSVRender::TerrainTextureMode::primaryEditPressed(const WorldspaceHitResult
     CSMWorld::IdCollection<CSMWorld::LandTexture>& landtexturesCollection = document.getData().getLandTextures();
     int index = landtexturesCollection.searchId(mBrushTexture);
 
-    if (index != -1 && !landtexturesCollection.getRecord(index).isDeleted() && hit.hit && hit.tag == 0)
+    if (index != -1 && !landtexturesCollection.getRecord(index).isDeleted() && hit.hit && hit.tag == nullptr)
     {
         undoStack.beginMacro ("Edit texture records");
         if(allowLandTextureEditing(mCellId))
@@ -133,7 +133,7 @@ void CSVRender::TerrainTextureMode::primaryEditPressed(const WorldspaceHitResult
 
 void CSVRender::TerrainTextureMode::primarySelectPressed(const WorldspaceHitResult& hit)
 {
-    if(hit.hit && hit.tag == 0)
+    if(hit.hit && hit.tag == nullptr)
     {
         selectTerrainTextures(CSMWorld::CellCoordinates::toTextureCoords(hit.worldPos), 0, false);
     }
@@ -141,7 +141,7 @@ void CSVRender::TerrainTextureMode::primarySelectPressed(const WorldspaceHitResu
 
 void CSVRender::TerrainTextureMode::secondarySelectPressed(const WorldspaceHitResult& hit)
 {
-    if(hit.hit && hit.tag == 0)
+    if(hit.hit && hit.tag == nullptr)
     {
         selectTerrainTextures(CSMWorld::CellCoordinates::toTextureCoords(hit.worldPos), 1, false);
     }
@@ -166,7 +166,7 @@ bool CSVRender::TerrainTextureMode::primaryEditStartDrag (const QPoint& pos)
     CSMWorld::IdCollection<CSMWorld::LandTexture>& landtexturesCollection = document.getData().getLandTextures();
     int index = landtexturesCollection.searchId(mBrushTexture);
 
-    if (index != -1 && !landtexturesCollection.getRecord(index).isDeleted() && hit.hit && hit.tag == 0)
+    if (index != -1 && !landtexturesCollection.getRecord(index).isDeleted() && hit.hit && hit.tag == nullptr)
     {
         undoStack.beginMacro ("Edit texture records");
         mIsEditing = true;
@@ -189,7 +189,7 @@ bool CSVRender::TerrainTextureMode::primarySelectStartDrag (const QPoint& pos)
 {
     WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
     mDragMode = InteractionType_PrimarySelect;
-    if (!hit.hit || hit.tag != 0)
+    if (!hit.hit || hit.tag != nullptr)
     {
         mDragMode = InteractionType_None;
         return false;
@@ -202,7 +202,7 @@ bool CSVRender::TerrainTextureMode::secondarySelectStartDrag (const QPoint& pos)
 {
     WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
     mDragMode = InteractionType_SecondarySelect;
-    if (!hit.hit || hit.tag != 0)
+    if (!hit.hit || hit.tag != nullptr)
     {
         mDragMode = InteractionType_None;
         return false;
@@ -222,7 +222,7 @@ void CSVRender::TerrainTextureMode::drag (const QPoint& pos, int diffX, int diff
         CSMWorld::IdCollection<CSMWorld::LandTexture>& landtexturesCollection = document.getData().getLandTextures();
         int index = landtexturesCollection.searchId(mBrushTexture);
 
-        if (index != -1 && !landtexturesCollection.getRecord(index).isDeleted() && hit.hit && hit.tag == 0)
+        if (index != -1 && !landtexturesCollection.getRecord(index).isDeleted() && hit.hit && hit.tag == nullptr)
         {
             editTerrainTextureGrid(hit);
         }
@@ -231,13 +231,13 @@ void CSVRender::TerrainTextureMode::drag (const QPoint& pos, int diffX, int diff
     if (mDragMode == InteractionType_PrimarySelect)
     {
         WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
-        if (hit.hit && hit.tag == 0) selectTerrainTextures(CSMWorld::CellCoordinates::toTextureCoords(hit.worldPos), 0, true);
+        if (hit.hit && hit.tag == nullptr) selectTerrainTextures(CSMWorld::CellCoordinates::toTextureCoords(hit.worldPos), 0, true);
     }
 
     if (mDragMode == InteractionType_SecondarySelect)
     {
         WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
-        if (hit.hit && hit.tag == 0) selectTerrainTextures(CSMWorld::CellCoordinates::toTextureCoords(hit.worldPos), 1, true);
+        if (hit.hit && hit.tag == nullptr) selectTerrainTextures(CSMWorld::CellCoordinates::toTextureCoords(hit.worldPos), 1, true);
     }
 }
 
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index 4535b5e8af..82a1459f2d 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -34,11 +34,11 @@
 
 CSVRender::WorldspaceWidget::WorldspaceWidget (CSMDoc::Document& document, QWidget* parent)
     : SceneWidget (document.getData().getResourceSystem(), parent, Qt::WindowFlags(), false)
-    , mSceneElements(0)
-    , mRun(0)
+    , mSceneElements(nullptr)
+    , mRun(nullptr)
     , mDocument(document)
     , mInteractionMask (0)
-    , mEditMode (0)
+    , mEditMode (nullptr)
     , mLocked (false)
     , mDragMode(InteractionType_None)
     , mDragging (false)
@@ -435,7 +435,7 @@ CSVRender::WorldspaceHitResult CSVRender::WorldspaceWidget::mousePick (const QPo
         }
 
         // Something untagged, probably terrain
-        WorldspaceHitResult hit = { true, 0, 0, 0, 0, intersection.getWorldIntersectPoint() };
+        WorldspaceHitResult hit = { true, nullptr, 0, 0, 0, intersection.getWorldIntersectPoint() };
         if (intersection.indexList.size() >= 3)
         {
             hit.index0 = intersection.indexList[0];
@@ -449,7 +449,7 @@ CSVRender::WorldspaceHitResult CSVRender::WorldspaceWidget::mousePick (const QPo
     direction.normalize();
     direction *= CSMPrefs::get()["3D Scene Editing"]["distance"].toInt();
 
-    WorldspaceHitResult hit = { false, 0, 0, 0, 0, start + direction };
+    WorldspaceHitResult hit = { false, nullptr, 0, 0, 0, start + direction };
     return hit;
 }
 
diff --git a/apps/opencs/view/render/worldspacewidget.hpp b/apps/opencs/view/render/worldspacewidget.hpp
index 5ed3d01b35..3b8cf70c2a 100644
--- a/apps/opencs/view/render/worldspacewidget.hpp
+++ b/apps/opencs/view/render/worldspacewidget.hpp
@@ -96,7 +96,7 @@ namespace CSVRender
                 InteractionType_None
             };
 
-            WorldspaceWidget (CSMDoc::Document& document, QWidget *parent = 0);
+            WorldspaceWidget (CSMDoc::Document& document, QWidget *parent = nullptr);
             ~WorldspaceWidget ();
 
             CSVWidget::SceneToolMode *makeNavigationSelector (CSVWidget::SceneToolbar *parent);
diff --git a/apps/opencs/view/tools/merge.cpp b/apps/opencs/view/tools/merge.cpp
index c49044ccd4..f50a85f2fc 100644
--- a/apps/opencs/view/tools/merge.cpp
+++ b/apps/opencs/view/tools/merge.cpp
@@ -27,7 +27,7 @@ void CSVTools::Merge::keyPressEvent (QKeyEvent *event)
 }
 
 CSVTools::Merge::Merge (CSMDoc::DocumentManager& documentManager, QWidget *parent)
-: QWidget (parent), mDocument (0), mDocumentManager (documentManager)
+: QWidget (parent), mDocument (nullptr), mDocumentManager (documentManager)
 {
     setWindowTitle ("Merge Content Files into a new Game File");
 
@@ -117,7 +117,7 @@ CSMDoc::Document *CSVTools::Merge::getDocument() const
 
 void CSVTools::Merge::cancel()
 {
-    mDocument = 0;
+    mDocument = nullptr;
     hide();
 }
 
diff --git a/apps/opencs/view/tools/merge.hpp b/apps/opencs/view/tools/merge.hpp
index c82feba14d..d394a431ed 100644
--- a/apps/opencs/view/tools/merge.hpp
+++ b/apps/opencs/view/tools/merge.hpp
@@ -39,7 +39,7 @@ namespace CSVTools
 
         public:
 
-            Merge (CSMDoc::DocumentManager& documentManager, QWidget *parent = 0);
+            Merge (CSMDoc::DocumentManager& documentManager, QWidget *parent = nullptr);
 
             /// Configure dialogue for a new merge
             void configure (CSMDoc::Document *document);
diff --git a/apps/opencs/view/tools/reporttable.cpp b/apps/opencs/view/tools/reporttable.cpp
index 7b28f2b0fd..c1297d475b 100644
--- a/apps/opencs/view/tools/reporttable.cpp
+++ b/apps/opencs/view/tools/reporttable.cpp
@@ -25,7 +25,7 @@ namespace CSVTools
     {
         public:
 
-            RichTextDelegate (QObject *parent = 0);
+            RichTextDelegate (QObject *parent = nullptr);
 
             void paint(QPainter *painter, const QStyleOptionViewItem& option,
                 const QModelIndex& index) const override;
@@ -142,7 +142,7 @@ CSVTools::ReportTable::ReportTable (CSMDoc::Document& document,
     const CSMWorld::UniversalId& id, bool richTextDescription, int refreshState,
     QWidget *parent)
 : CSVWorld::DragRecordTable (document, parent), mModel (document.getReport (id)),
-  mRefreshAction (0), mRefreshState (refreshState)
+  mRefreshAction (nullptr), mRefreshState (refreshState)
 {
     horizontalHeader()->setSectionResizeMode (QHeaderView::Interactive);
     horizontalHeader()->setStretchLastSection (true);
@@ -159,7 +159,7 @@ CSVTools::ReportTable::ReportTable (CSMDoc::Document& document,
     setModel (mProxyModel);
     setColumnHidden (2, true);
 
-    mIdTypeDelegate = CSVWorld::IdTypeDelegateFactory().makeDelegate (0,
+    mIdTypeDelegate = CSVWorld::IdTypeDelegateFactory().makeDelegate (nullptr,
         mDocument, this);
 
     setItemDelegateForColumn (0, mIdTypeDelegate);
diff --git a/apps/opencs/view/tools/reporttable.hpp b/apps/opencs/view/tools/reporttable.hpp
index 4c169a9862..f39dd6f857 100644
--- a/apps/opencs/view/tools/reporttable.hpp
+++ b/apps/opencs/view/tools/reporttable.hpp
@@ -62,7 +62,7 @@ namespace CSVTools
             /// 0 no refresh function exists. If the document current has the specified state
             /// the refresh function is disabled.
             ReportTable (CSMDoc::Document& document, const CSMWorld::UniversalId& id,
-                bool richTextDescription, int refreshState = 0, QWidget *parent = 0);
+                bool richTextDescription, int refreshState = 0, QWidget *parent = nullptr);
 
             std::vector<CSMWorld::UniversalId> getDraggedRecords() const override;
 
diff --git a/apps/opencs/view/tools/searchbox.hpp b/apps/opencs/view/tools/searchbox.hpp
index eff5296b4a..cbeb150d8b 100644
--- a/apps/opencs/view/tools/searchbox.hpp
+++ b/apps/opencs/view/tools/searchbox.hpp
@@ -41,7 +41,7 @@ namespace CSVTools
             
         public:
 
-            SearchBox (QWidget *parent = 0);
+            SearchBox (QWidget *parent = nullptr);
 
             void setSearchMode (bool enabled);
 
diff --git a/apps/opencs/view/tools/searchsubview.cpp b/apps/opencs/view/tools/searchsubview.cpp
index 9bada22af3..07ba7907e7 100644
--- a/apps/opencs/view/tools/searchsubview.cpp
+++ b/apps/opencs/view/tools/searchsubview.cpp
@@ -30,7 +30,7 @@ void CSVTools::SearchSubView::replace (bool selection)
     bool autoDelete = CSMPrefs::get()["Search & Replace"]["auto-delete"].isTrue();
 
     CSMTools::Search search (mSearch);
-    CSMWorld::IdTableBase *currentTable = 0;
+    CSMWorld::IdTableBase *currentTable = nullptr;
 
     // We are running through the indices in reverse order to avoid messing up multiple results
     // in a single string.
diff --git a/apps/opencs/view/widget/coloreditor.hpp b/apps/opencs/view/widget/coloreditor.hpp
index d4a802ca2f..aa746da682 100644
--- a/apps/opencs/view/widget/coloreditor.hpp
+++ b/apps/opencs/view/widget/coloreditor.hpp
@@ -22,8 +22,8 @@ namespace CSVWidget
             QPoint calculatePopupPosition();
 
         public:
-            ColorEditor(const QColor &color, QWidget *parent = 0, const bool popupOnStart = false);
-            ColorEditor(const int colorInt, QWidget *parent = 0, const bool popupOnStart = false);
+            ColorEditor(const QColor &color, QWidget *parent = nullptr, const bool popupOnStart = false);
+            ColorEditor(const int colorInt, QWidget *parent = nullptr, const bool popupOnStart = false);
 
             QColor color() const;
 
@@ -41,7 +41,7 @@ namespace CSVWidget
             void showEvent(QShowEvent *event) override;
 
         private:
-            ColorEditor(QWidget *parent = 0, const bool popupOnStart = false);
+            ColorEditor(QWidget *parent = nullptr, const bool popupOnStart = false);
 
         private slots:
             void showPicker();
diff --git a/apps/opencs/view/widget/completerpopup.hpp b/apps/opencs/view/widget/completerpopup.hpp
index 62fdf5388f..96675f56f4 100644
--- a/apps/opencs/view/widget/completerpopup.hpp
+++ b/apps/opencs/view/widget/completerpopup.hpp
@@ -8,7 +8,7 @@ namespace CSVWidget
     class CompleterPopup : public QListView
     {
         public:
-            CompleterPopup(QWidget *parent = 0);
+            CompleterPopup(QWidget *parent = nullptr);
 
             int sizeHintForRow(int row) const override;
     };
diff --git a/apps/opencs/view/widget/droplineedit.hpp b/apps/opencs/view/widget/droplineedit.hpp
index ed991af0dd..9110518736 100644
--- a/apps/opencs/view/widget/droplineedit.hpp
+++ b/apps/opencs/view/widget/droplineedit.hpp
@@ -26,7 +26,7 @@ namespace CSVWidget
             ///< The accepted Display type for this LineEdit.
 
         public:
-            DropLineEdit(CSMWorld::ColumnBase::Display type, QWidget *parent = 0);
+            DropLineEdit(CSMWorld::ColumnBase::Display type, QWidget *parent = nullptr);
 
         protected:
             void dragEnterEvent(QDragEnterEvent *event) override;
diff --git a/apps/opencs/view/widget/modebutton.hpp b/apps/opencs/view/widget/modebutton.hpp
index 1615ff298a..f595969231 100644
--- a/apps/opencs/view/widget/modebutton.hpp
+++ b/apps/opencs/view/widget/modebutton.hpp
@@ -17,7 +17,7 @@ namespace CSVWidget
         public:
 
             ModeButton (const QIcon& icon, const QString& tooltip = "",
-                QWidget *parent = 0);
+                QWidget *parent = nullptr);
 
             /// Default-Implementation: do nothing
             virtual void activate (SceneToolbar *toolbar);
diff --git a/apps/opencs/view/widget/pushbutton.hpp b/apps/opencs/view/widget/pushbutton.hpp
index 5522cd74f6..b3aaaebef2 100644
--- a/apps/opencs/view/widget/pushbutton.hpp
+++ b/apps/opencs/view/widget/pushbutton.hpp
@@ -48,11 +48,11 @@ namespace CSVWidget
 
             /// \param push Do not maintain a toggle state
             PushButton (const QIcon& icon, Type type, const QString& tooltip = "",
-                QWidget *parent = 0);
+                QWidget *parent = nullptr);
 
             /// \param push Do not maintain a toggle state
             PushButton (Type type, const QString& tooltip = "",
-                QWidget *parent = 0);
+                QWidget *parent = nullptr);
 
             bool hasKeepOpen() const;
 
diff --git a/apps/opencs/view/widget/scenetoolbar.hpp b/apps/opencs/view/widget/scenetoolbar.hpp
index d9998eefc0..70f5807652 100644
--- a/apps/opencs/view/widget/scenetoolbar.hpp
+++ b/apps/opencs/view/widget/scenetoolbar.hpp
@@ -23,11 +23,11 @@ namespace CSVWidget
 
         public:
 
-            SceneToolbar (int buttonSize, QWidget *parent = 0);
+            SceneToolbar (int buttonSize, QWidget *parent = nullptr);
 
             /// If insertPoint==0, insert \a tool at the end of the scrollbar. Otherwise
             /// insert tool after \a insertPoint.
-            void addTool (SceneTool *tool, SceneTool *insertPoint = 0);
+            void addTool (SceneTool *tool, SceneTool *insertPoint = nullptr);
 
             void removeTool (SceneTool *tool);
 
diff --git a/apps/opencs/view/widget/scenetoolmode.cpp b/apps/opencs/view/widget/scenetoolmode.cpp
index 7b2ff64db4..3aec44f1ba 100644
--- a/apps/opencs/view/widget/scenetoolmode.cpp
+++ b/apps/opencs/view/widget/scenetoolmode.cpp
@@ -33,7 +33,7 @@ void CSVWidget::SceneToolMode::adjustToolTip (const ModeButton *activeMode)
 
     toolTip += "<p>(left click to change mode)";
 
-    if (createContextMenu (0))
+    if (createContextMenu (nullptr))
         toolTip += "<br>(right click to access context menu)";
 
     setToolTip (toolTip);
@@ -62,7 +62,7 @@ void CSVWidget::SceneToolMode::setButton (std::map<ModeButton *, std::string>::i
 
 CSVWidget::SceneToolMode::SceneToolMode (SceneToolbar *parent, const QString& toolTip)
 : SceneTool (parent), mButtonSize (parent->getButtonSize()), mIconSize (parent->getIconSize()),
-  mToolTip (toolTip), mFirst (0), mCurrent (0), mToolbar (parent)
+  mToolTip (toolTip), mFirst (nullptr), mCurrent (nullptr), mToolbar (parent)
 {
     mPanel = new QFrame (this, Qt::Popup);
 
diff --git a/apps/opencs/view/widget/scenetoolshapebrush.hpp b/apps/opencs/view/widget/scenetoolshapebrush.hpp
index 76c0dfa04e..3afd7f8b3b 100644
--- a/apps/opencs/view/widget/scenetoolshapebrush.hpp
+++ b/apps/opencs/view/widget/scenetoolshapebrush.hpp
@@ -54,7 +54,7 @@ namespace CSVWidget
 
         public:
 
-            ShapeBrushWindow(CSMDoc::Document& document, QWidget *parent = 0);
+            ShapeBrushWindow(CSMDoc::Document& document, QWidget *parent = nullptr);
             void configureButtonInitialSettings(QPushButton *button);
 
             const QString toolTipPoint = "Paint single point";
diff --git a/apps/opencs/view/widget/scenetooltexturebrush.hpp b/apps/opencs/view/widget/scenetooltexturebrush.hpp
index c6f0b5e527..5f42800cb3 100644
--- a/apps/opencs/view/widget/scenetooltexturebrush.hpp
+++ b/apps/opencs/view/widget/scenetooltexturebrush.hpp
@@ -57,7 +57,7 @@ namespace CSVWidget
         Q_OBJECT
 
         public:
-            TextureBrushWindow(CSMDoc::Document& document, QWidget *parent = 0);
+            TextureBrushWindow(CSMDoc::Document& document, QWidget *parent = nullptr);
             void configureButtonInitialSettings(QPushButton *button);
 
             const QString toolTipPoint = "Paint single point";
diff --git a/apps/opencs/view/widget/scenetooltoggle.cpp b/apps/opencs/view/widget/scenetooltoggle.cpp
index 5919a280af..fa0be31555 100644
--- a/apps/opencs/view/widget/scenetooltoggle.cpp
+++ b/apps/opencs/view/widget/scenetooltoggle.cpp
@@ -115,7 +115,7 @@ QRect CSVWidget::SceneToolToggle::getIconBox (int index) const
 CSVWidget::SceneToolToggle::SceneToolToggle (SceneToolbar *parent, const QString& toolTip,
     const std::string& emptyIcon)
 : SceneTool (parent), mEmptyIcon (emptyIcon), mButtonSize (parent->getButtonSize()),
-  mIconSize (parent->getIconSize()), mToolTip (toolTip), mFirst (0)
+  mIconSize (parent->getIconSize()), mToolTip (toolTip), mFirst (nullptr)
 {
     mPanel = new QFrame (this, Qt::Popup);
 
diff --git a/apps/opencs/view/widget/scenetooltoggle2.cpp b/apps/opencs/view/widget/scenetooltoggle2.cpp
index 720da6a964..cf9bfe349b 100644
--- a/apps/opencs/view/widget/scenetooltoggle2.cpp
+++ b/apps/opencs/view/widget/scenetooltoggle2.cpp
@@ -57,7 +57,7 @@ CSVWidget::SceneToolToggle2::SceneToolToggle2 (SceneToolbar *parent, const QStri
     const std::string& compositeIcon, const std::string& singleIcon)
 : SceneTool (parent), mCompositeIcon (compositeIcon), mSingleIcon (singleIcon),
   mButtonSize (parent->getButtonSize()), mIconSize (parent->getIconSize()), mToolTip (toolTip),
-  mFirst (0)
+  mFirst (nullptr)
 {
     mPanel = new QFrame (this, Qt::Popup);
 
diff --git a/apps/opencs/view/world/creator.cpp b/apps/opencs/view/world/creator.cpp
index 7a93339c5b..53664c186a 100644
--- a/apps/opencs/view/world/creator.cpp
+++ b/apps/opencs/view/world/creator.cpp
@@ -17,5 +17,5 @@ CSVWorld::CreatorFactoryBase::~CreatorFactoryBase() {}
 CSVWorld::Creator *CSVWorld::NullCreatorFactory::makeCreator (CSMDoc::Document& document, 
                                                               const CSMWorld::UniversalId& id) const
 {
-    return 0;
+    return nullptr;
 }
diff --git a/apps/opencs/view/world/dialoguespinbox.hpp b/apps/opencs/view/world/dialoguespinbox.hpp
index b7c4889a50..90fe8d20cd 100644
--- a/apps/opencs/view/world/dialoguespinbox.hpp
+++ b/apps/opencs/view/world/dialoguespinbox.hpp
@@ -12,7 +12,7 @@ namespace CSVWorld
 
         public:
 
-            DialogueSpinBox (QWidget *parent = 0);
+            DialogueSpinBox (QWidget *parent = nullptr);
 
         protected:
 
@@ -27,7 +27,7 @@ namespace CSVWorld
 
         public:
 
-            DialogueDoubleSpinBox (QWidget *parent = 0);
+            DialogueDoubleSpinBox (QWidget *parent = nullptr);
 
         protected:
 
diff --git a/apps/opencs/view/world/dialoguesubview.cpp b/apps/opencs/view/world/dialoguesubview.cpp
index e29fcb779a..3d3b3cdbe1 100644
--- a/apps/opencs/view/world/dialoguesubview.cpp
+++ b/apps/opencs/view/world/dialoguesubview.cpp
@@ -498,7 +498,7 @@ void CSVWorld::EditWidget::remake(int row)
 
     if (mDispatcher)
         delete mDispatcher;
-    mDispatcher = new DialogueDelegateDispatcher(0/*this*/, mTable, mCommandDispatcher, mDocument);
+    mDispatcher = new DialogueDelegateDispatcher(nullptr/*this*/, mTable, mCommandDispatcher, mDocument);
 
     if (mNestedTableDispatcher)
         delete mNestedTableDispatcher;
@@ -648,7 +648,7 @@ void CSVWorld::EditWidget::remake(int row)
                 mNestedTableMapper->setModel(tree);
                 // FIXME: lack MIME support?
                 mNestedTableDispatcher =
-                        new DialogueDelegateDispatcher (0/*this*/, mTable, mCommandDispatcher, mDocument, tree);
+                        new DialogueDelegateDispatcher (nullptr/*this*/, mTable, mCommandDispatcher, mDocument, tree);
                 mNestedTableMapper->setRootIndex (tree->index(row, i));
                 mNestedTableMapper->setItemDelegate(mNestedTableDispatcher);
 
@@ -732,7 +732,7 @@ bool CSVWorld::SimpleDialogueSubView::isLocked() const
 
 CSVWorld::SimpleDialogueSubView::SimpleDialogueSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document) :
     SubView (id),
-    mEditWidget(0),
+    mEditWidget(nullptr),
     mMainLayout(nullptr),
     mTable(dynamic_cast<CSMWorld::IdTable*>(document.getData().getTableModel(id))),
     mLocked(false),
@@ -834,7 +834,7 @@ void CSVWorld::SimpleDialogueSubView::rowsAboutToBeRemoved(const QModelIndex &pa
         if(mEditWidget)
         {
             delete mEditWidget;
-            mEditWidget = 0;
+            mEditWidget = nullptr;
         }
         emit closeRequest(this);
     }
@@ -869,7 +869,7 @@ void CSVWorld::DialogueSubView::addButtonBar()
 
 CSVWorld::DialogueSubView::DialogueSubView (const CSMWorld::UniversalId& id,
     CSMDoc::Document& document, const CreatorFactoryBase& creatorFactory, bool sorting)
-: SimpleDialogueSubView (id, document), mButtons (0)
+: SimpleDialogueSubView (id, document), mButtons (nullptr)
 {
     // bottom box
     mBottom = new TableBottomBox (creatorFactory, document, id, this);
@@ -905,7 +905,7 @@ void CSVWorld::DialogueSubView::settingChanged (const CSMPrefs::Setting *setting
         {
             getMainLayout().removeWidget (mButtons);
             delete mButtons;
-            mButtons = 0;
+            mButtons = nullptr;
         }
     }
 }
diff --git a/apps/opencs/view/world/dialoguesubview.hpp b/apps/opencs/view/world/dialoguesubview.hpp
index eb14efa8e5..2cf05f711e 100644
--- a/apps/opencs/view/world/dialoguesubview.hpp
+++ b/apps/opencs/view/world/dialoguesubview.hpp
@@ -50,7 +50,7 @@ namespace CSVWorld
         const CSMWorld::IdTable* mTable;
     public:
         NotEditableSubDelegate(const CSMWorld::IdTable* table,
-                               QObject * parent = 0);
+                               QObject * parent = nullptr);
 
         void setEditorData (QWidget* editor, const QModelIndex& index) const override;
 
@@ -126,7 +126,7 @@ namespace CSVWorld
                                    CSMWorld::IdTable* table,
                                    CSMWorld::CommandDispatcher& commandDispatcher,
                                    CSMDoc::Document& document,
-                                   QAbstractItemModel* model = 0);
+                                   QAbstractItemModel* model = nullptr);
 
         ~DialogueDelegateDispatcher();
 
diff --git a/apps/opencs/view/world/enumdelegate.cpp b/apps/opencs/view/world/enumdelegate.cpp
index 3140adc485..65ded46c7f 100644
--- a/apps/opencs/view/world/enumdelegate.cpp
+++ b/apps/opencs/view/world/enumdelegate.cpp
@@ -71,7 +71,7 @@ QWidget *CSVWorld::EnumDelegate::createEditor(QWidget *parent, const QStyleOptio
     const QModelIndex& index, CSMWorld::ColumnBase::Display display) const
 {
     if (!index.data(Qt::EditRole).isValid() && !index.data(Qt::DisplayRole).isValid())
-        return 0;
+        return nullptr;
 
     QComboBox *comboBox = new QComboBox (parent);
 
diff --git a/apps/opencs/view/world/extendedcommandconfigurator.hpp b/apps/opencs/view/world/extendedcommandconfigurator.hpp
index 42573924a8..85862ac49e 100644
--- a/apps/opencs/view/world/extendedcommandconfigurator.hpp
+++ b/apps/opencs/view/world/extendedcommandconfigurator.hpp
@@ -57,7 +57,7 @@ namespace CSVWorld
         public:
             ExtendedCommandConfigurator(CSMDoc::Document &document,
                                         const CSMWorld::UniversalId &id,
-                                        QWidget *parent = 0);
+                                        QWidget *parent = nullptr);
 
             void configure(Mode mode, const std::vector<std::string> &selectedIds);
             void setEditLock(bool locked);
diff --git a/apps/opencs/view/world/genericcreator.cpp b/apps/opencs/view/world/genericcreator.cpp
index 5e2118e9b2..23813f8066 100644
--- a/apps/opencs/view/world/genericcreator.cpp
+++ b/apps/opencs/view/world/genericcreator.cpp
@@ -148,8 +148,8 @@ void CSVWorld::GenericCreator::addScope (const QString& name, CSMWorld::Scope sc
 CSVWorld::GenericCreator::GenericCreator (CSMWorld::Data& data, QUndoStack& undoStack,
     const CSMWorld::UniversalId& id, bool relaxedIdRules)
 : mData (data), mUndoStack (undoStack), mListId (id), mLocked (false),
-  mClonedType (CSMWorld::UniversalId::Type_None), mScopes (CSMWorld::Scope_Content), mScope (0),
-  mScopeLabel (0), mCloneMode (false)
+  mClonedType (CSMWorld::UniversalId::Type_None), mScopes (CSMWorld::Scope_Content), mScope (nullptr),
+  mScopeLabel (nullptr), mCloneMode (false)
 {
     // If the collection ID has a parent type, use it instead.
     // It will change IDs with Record/SubRecord class (used for creators in Dialogue subviews)
@@ -322,10 +322,10 @@ void CSVWorld::GenericCreator::setScope (unsigned int scope)
     else
     {
         delete mScope;
-        mScope = 0;
+        mScope = nullptr;
 
         delete mScopeLabel;
-        mScopeLabel = 0;
+        mScopeLabel = nullptr;
     }
 
     updateNamespace();
diff --git a/apps/opencs/view/world/idcompletiondelegate.cpp b/apps/opencs/view/world/idcompletiondelegate.cpp
index 4ff850b9f4..447bcc25d9 100644
--- a/apps/opencs/view/world/idcompletiondelegate.cpp
+++ b/apps/opencs/view/world/idcompletiondelegate.cpp
@@ -74,7 +74,7 @@ QWidget *CSVWorld::IdCompletionDelegate::createEditor(QWidget *parent,
             {
                 return new CSVWidget::DropLineEdit(display, parent);
             }
-            default: return 0; // The rest of them can't be edited anyway
+            default: return nullptr; // The rest of them can't be edited anyway
         }
     }
 
diff --git a/apps/opencs/view/world/idvalidator.hpp b/apps/opencs/view/world/idvalidator.hpp
index 17624a243b..278335a65b 100644
--- a/apps/opencs/view/world/idvalidator.hpp
+++ b/apps/opencs/view/world/idvalidator.hpp
@@ -19,7 +19,7 @@ namespace CSVWorld
 
         public:
 
-            IdValidator (bool relaxed = false, QObject *parent = 0);
+            IdValidator (bool relaxed = false, QObject *parent = nullptr);
             ///< \param relaxed Relaxed rules for IDs that also functino as user visible text
 
             State validate (QString& input, int& pos) const override;
diff --git a/apps/opencs/view/world/recordbuttonbar.hpp b/apps/opencs/view/world/recordbuttonbar.hpp
index fbee066cea..aca3211f8a 100644
--- a/apps/opencs/view/world/recordbuttonbar.hpp
+++ b/apps/opencs/view/world/recordbuttonbar.hpp
@@ -58,8 +58,8 @@ namespace CSVWorld
         public:
 
             RecordButtonBar (const CSMWorld::UniversalId& id,
-                CSMWorld::IdTable& table, TableBottomBox *bottomBox = 0,
-                CSMWorld::CommandDispatcher *commandDispatcher = 0, QWidget *parent = 0);
+                CSMWorld::IdTable& table, TableBottomBox *bottomBox = nullptr,
+                CSMWorld::CommandDispatcher *commandDispatcher = nullptr, QWidget *parent = nullptr);
 
             void setEditLock (bool locked);
 
diff --git a/apps/opencs/view/world/recordstatusdelegate.hpp b/apps/opencs/view/world/recordstatusdelegate.hpp
index 6ec8c37bd8..38f066862b 100644
--- a/apps/opencs/view/world/recordstatusdelegate.hpp
+++ b/apps/opencs/view/world/recordstatusdelegate.hpp
@@ -19,7 +19,7 @@ namespace CSVWorld
 
         RecordStatusDelegate (const ValueList& values, const IconList& icons,
             CSMWorld::CommandDispatcher *dispatcher, CSMDoc::Document& document,
-            QObject *parent = 0);
+            QObject *parent = nullptr);
     };
 
     class RecordStatusDelegateFactory : public DataDisplayDelegateFactory
diff --git a/apps/opencs/view/world/regionmap.hpp b/apps/opencs/view/world/regionmap.hpp
index b1f7cdc674..443de9ce3d 100644
--- a/apps/opencs/view/world/regionmap.hpp
+++ b/apps/opencs/view/world/regionmap.hpp
@@ -61,7 +61,7 @@ namespace CSVWorld
         public:
 
             RegionMap (const CSMWorld::UniversalId& universalId, CSMDoc::Document& document,
-                QWidget *parent = 0);
+                QWidget *parent = nullptr);
 
             std::vector<CSMWorld::UniversalId> getDraggedRecords() const override;
 
diff --git a/apps/opencs/view/world/scriptedit.cpp b/apps/opencs/view/world/scriptedit.cpp
index 9083359d27..743df9c765 100644
--- a/apps/opencs/view/world/scriptedit.cpp
+++ b/apps/opencs/view/world/scriptedit.cpp
@@ -47,7 +47,7 @@ CSVWorld::ScriptEdit::ScriptEdit(
 ) : QPlainTextEdit(parent),
     mChangeLocked(0),
     mShowLineNum(false),
-    mLineNumberArea(0),
+    mLineNumberArea(nullptr),
     mDefaultFont(font()),
     mMonoFont(QFont("Monospace")),
     mTabCharCount(4),
@@ -314,7 +314,7 @@ void CSVWorld::ScriptEdit::markOccurrences()
         // prevent infinite recursion with cursor.select(),
         // which ends up calling this function again
         // could be fixed with blockSignals, but mDocument is const
-        disconnect(this, SIGNAL(cursorPositionChanged()), this, 0);
+        disconnect(this, SIGNAL(cursorPositionChanged()), this, nullptr);
         cursor.select(QTextCursor::WordUnderCursor);
         connect(this, SIGNAL(cursorPositionChanged()), this, SLOT(markOccurrences()));
 
diff --git a/apps/opencs/view/world/scripterrortable.hpp b/apps/opencs/view/world/scripterrortable.hpp
index ad287707dd..7165d0fc6a 100644
--- a/apps/opencs/view/world/scripterrortable.hpp
+++ b/apps/opencs/view/world/scripterrortable.hpp
@@ -41,7 +41,7 @@ namespace CSVWorld
 
         public:
 
-            ScriptErrorTable (const CSMDoc::Document& document, QWidget *parent = 0);
+            ScriptErrorTable (const CSMDoc::Document& document, QWidget *parent = nullptr);
 
             void update (const std::string& source);
 
diff --git a/apps/opencs/view/world/scriptsubview.cpp b/apps/opencs/view/world/scriptsubview.cpp
index 58ad094519..096fc8a9e7 100644
--- a/apps/opencs/view/world/scriptsubview.cpp
+++ b/apps/opencs/view/world/scriptsubview.cpp
@@ -88,7 +88,7 @@ void CSVWorld::ScriptSubView::adjustSplitter()
 }
 
 CSVWorld::ScriptSubView::ScriptSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document)
-: SubView (id), mDocument (document), mColumn (-1), mBottom(0), mButtons (0),
+: SubView (id), mDocument (document), mColumn (-1), mBottom(nullptr), mButtons (nullptr),
   mCommandDispatcher (document, CSMWorld::UniversalId::getParentType (id.getType())),
   mErrorHeight (CSMPrefs::get()["Scripts"]["error-height"].toInt())
 {
@@ -177,7 +177,7 @@ void CSVWorld::ScriptSubView::settingChanged (const CSMPrefs::Setting *setting)
         {
             mLayout.removeWidget (mButtons);
             delete mButtons;
-            mButtons = 0;
+            mButtons = nullptr;
         }
     }
     else if (*setting=="Scripts/compile-delay")
diff --git a/apps/opencs/view/world/tablebottombox.hpp b/apps/opencs/view/world/tablebottombox.hpp
index 50d61150f3..6ad2dbd821 100644
--- a/apps/opencs/view/world/tablebottombox.hpp
+++ b/apps/opencs/view/world/tablebottombox.hpp
@@ -59,7 +59,7 @@ namespace CSVWorld
             TableBottomBox (const CreatorFactoryBase& creatorFactory,
                             CSMDoc::Document& document,
                             const CSMWorld::UniversalId& id,
-                            QWidget *parent = 0);
+                            QWidget *parent = nullptr);
 
             virtual ~TableBottomBox();
 
diff --git a/apps/opencs/view/world/tableeditidaction.hpp b/apps/opencs/view/world/tableeditidaction.hpp
index f2cf0b7bd0..9fe41b0de2 100644
--- a/apps/opencs/view/world/tableeditidaction.hpp
+++ b/apps/opencs/view/world/tableeditidaction.hpp
@@ -19,7 +19,7 @@ namespace CSVWorld
             CellData getCellData(int row, int column) const;
 
         public:
-            TableEditIdAction(const QTableView &table, QWidget *parent = 0);
+            TableEditIdAction(const QTableView &table, QWidget *parent = nullptr);
 
             void setCell(int row, int column);
 
diff --git a/apps/opencs/view/world/util.cpp b/apps/opencs/view/world/util.cpp
index 5a45033622..ba9f408474 100644
--- a/apps/opencs/view/world/util.cpp
+++ b/apps/opencs/view/world/util.cpp
@@ -57,7 +57,7 @@ QVariant CSVWorld::NastyTableModelHack::getData() const
 CSVWorld::CommandDelegateFactory::~CommandDelegateFactory() {}
 
 
-CSVWorld::CommandDelegateFactoryCollection *CSVWorld::CommandDelegateFactoryCollection::sThis = 0;
+CSVWorld::CommandDelegateFactoryCollection *CSVWorld::CommandDelegateFactoryCollection::sThis = nullptr;
 
 CSVWorld::CommandDelegateFactoryCollection::CommandDelegateFactoryCollection()
 {
@@ -69,7 +69,7 @@ CSVWorld::CommandDelegateFactoryCollection::CommandDelegateFactoryCollection()
 
 CSVWorld::CommandDelegateFactoryCollection::~CommandDelegateFactoryCollection()
 {
-    sThis = 0;
+    sThis = nullptr;
 
     for (std::map<CSMWorld::ColumnBase::Display, CommandDelegateFactory *>::iterator iter (
         mFactories.begin());
@@ -193,7 +193,7 @@ QWidget *CSVWorld::CommandDelegate::createEditor (QWidget *parent, const QStyleO
         variant = index.data(Qt::DisplayRole);
         if (!variant.isValid())
         {
-            return 0;
+            return nullptr;
         }
     }
 
@@ -362,7 +362,7 @@ void CSVWorld::CommandDelegate::setEditorData (QWidget *editor, const QModelInde
     if (!n.isEmpty())
     {
         if (!variant.isValid())
-            variant = QVariant(editor->property(n).userType(), (const void *)0);
+            variant = QVariant(editor->property(n).userType(), (const void *)nullptr);
         editor->setProperty(n, variant);
     }
 
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 0bfd67dd77..8092bb770b 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -380,7 +380,7 @@ OMW::Engine::Engine(Files::ConfigurationManager& configurationManager)
   , mGrab(true)
   , mExportFonts(false)
   , mRandomSeed(0)
-  , mScriptContext (0)
+  , mScriptContext (nullptr)
   , mFSStrict (false)
   , mScriptBlacklistUse (true)
   , mNewGame (false)
diff --git a/apps/openmw/mwbase/environment.cpp b/apps/openmw/mwbase/environment.cpp
index 764a07ec96..aca2685e06 100644
--- a/apps/openmw/mwbase/environment.cpp
+++ b/apps/openmw/mwbase/environment.cpp
@@ -14,11 +14,11 @@
 #include "windowmanager.hpp"
 #include "statemanager.hpp"
 
-MWBase::Environment *MWBase::Environment::sThis = 0;
+MWBase::Environment *MWBase::Environment::sThis = nullptr;
 
 MWBase::Environment::Environment()
-: mWorld (0), mSoundManager (0), mScriptManager (0), mWindowManager (0),
-  mMechanicsManager (0),  mDialogueManager (0), mJournal (0), mInputManager (0), mStateManager (0),
+: mWorld (nullptr), mSoundManager (nullptr), mScriptManager (nullptr), mWindowManager (nullptr),
+  mMechanicsManager (nullptr),  mDialogueManager (nullptr), mJournal (nullptr), mInputManager (nullptr), mStateManager (nullptr),
   mFrameDuration (0), mFrameRateLimit(0.f)
 {
     assert (!sThis);
@@ -28,7 +28,7 @@ MWBase::Environment::Environment()
 MWBase::Environment::~Environment()
 {
     cleanup();
-    sThis = 0;
+    sThis = nullptr;
 }
 
 void MWBase::Environment::setWorld (World *world)
@@ -166,31 +166,31 @@ float MWBase::Environment::getFrameDuration() const
 void MWBase::Environment::cleanup()
 {
     delete mMechanicsManager;
-    mMechanicsManager = 0;
+    mMechanicsManager = nullptr;
 
     delete mDialogueManager;
-    mDialogueManager = 0;
+    mDialogueManager = nullptr;
 
     delete mJournal;
-    mJournal = 0;
+    mJournal = nullptr;
 
     delete mScriptManager;
-    mScriptManager = 0;
+    mScriptManager = nullptr;
 
     delete mWindowManager;
-    mWindowManager = 0;
+    mWindowManager = nullptr;
 
     delete mWorld;
-    mWorld = 0;
+    mWorld = nullptr;
 
     delete mSoundManager;
-    mSoundManager = 0;
+    mSoundManager = nullptr;
 
     delete mInputManager;
-    mInputManager = 0;
+    mInputManager = nullptr;
 
     delete mStateManager;
-    mStateManager = 0;
+    mStateManager = nullptr;
 }
 
 const MWBase::Environment& MWBase::Environment::get()
diff --git a/apps/openmw/mwbase/statemanager.hpp b/apps/openmw/mwbase/statemanager.hpp
index 643695c37c..157833a0ee 100644
--- a/apps/openmw/mwbase/statemanager.hpp
+++ b/apps/openmw/mwbase/statemanager.hpp
@@ -59,7 +59,7 @@ namespace MWBase
 
             virtual void deleteGame (const MWState::Character *character, const MWState::Slot *slot) = 0;
 
-            virtual void saveGame (const std::string& description, const MWState::Slot *slot = 0) = 0;
+            virtual void saveGame (const std::string& description, const MWState::Slot *slot = nullptr) = 0;
             ///< Write a saved game to \a slot or create a new slot if \a slot == 0.
             ///
             /// \note Slot must belong to the current character.
diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 49bc76a761..d4f1d2f8ab 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -180,7 +180,7 @@ namespace MWBase
             virtual char getGlobalVariableType (const std::string& name) const = 0;
             ///< Return ' ', if there is no global variable with this name.
 
-            virtual std::string getCellName (const MWWorld::CellStore *cell = 0) const = 0;
+            virtual std::string getCellName (const MWWorld::CellStore *cell = nullptr) const = 0;
             ///< Return name of the cell.
             ///
             /// \note If cell==0, the cell the player is currently in will be used instead to
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index c51eab513f..31341db730 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -69,7 +69,7 @@ namespace MWClass
             return *this;
         }
 
-        CreatureCustomData() : mContainerStore(0) {}
+        CreatureCustomData() : mContainerStore(nullptr) {}
         virtual ~CreatureCustomData() { delete mContainerStore; }
     };
 
diff --git a/apps/openmw/mwgui/bookpage.cpp b/apps/openmw/mwgui/bookpage.cpp
index 8a6ec998da..c70783f39c 100644
--- a/apps/openmw/mwgui/bookpage.cpp
+++ b/apps/openmw/mwgui/bookpage.cpp
@@ -925,7 +925,7 @@ public:
 
     void dirtyFocusItem ()
     {
-        if (mFocusItem != 0)
+        if (mFocusItem != nullptr)
         {
             MyGUI::IFont* Font = mBook->affectedFont (mFocusItem);
 
@@ -946,7 +946,7 @@ public:
 
         dirtyFocusItem ();
 
-        mFocusItem = 0;
+        mFocusItem = nullptr;
         mItemActive = false;
     }
 
@@ -976,7 +976,7 @@ public:
             }
         }
         else
-        if (mFocusItem != 0)
+        if (mFocusItem != nullptr)
         {
             bool newItemActive = hit == mFocusItem;
 
diff --git a/apps/openmw/mwgui/charactercreation.cpp b/apps/openmw/mwgui/charactercreation.cpp
index 31fe3afb04..827f87c7d6 100644
--- a/apps/openmw/mwgui/charactercreation.cpp
+++ b/apps/openmw/mwgui/charactercreation.cpp
@@ -87,15 +87,15 @@ namespace MWGui
     CharacterCreation::CharacterCreation(osg::Group* parent, Resource::ResourceSystem* resourceSystem)
         : mParent(parent)
         , mResourceSystem(resourceSystem)
-        , mNameDialog(0)
-        , mRaceDialog(0)
-        , mClassChoiceDialog(0)
-        , mGenerateClassQuestionDialog(0)
-        , mGenerateClassResultDialog(0)
-        , mPickClassDialog(0)
-        , mCreateClassDialog(0)
-        , mBirthSignDialog(0)
-        , mReviewDialog(0)
+        , mNameDialog(nullptr)
+        , mRaceDialog(nullptr)
+        , mClassChoiceDialog(nullptr)
+        , mGenerateClassQuestionDialog(nullptr)
+        , mGenerateClassResultDialog(nullptr)
+        , mPickClassDialog(nullptr)
+        , mCreateClassDialog(nullptr)
+        , mBirthSignDialog(nullptr)
+        , mReviewDialog(nullptr)
         , mGenerateClassStep(0)
     {
         mCreationStage = CSE_NotStarted;
@@ -184,7 +184,7 @@ namespace MWGui
             {
                 case GM_Name:
                     MWBase::Environment::get().getWindowManager()->removeDialog(mNameDialog);
-                    mNameDialog = 0;
+                    mNameDialog = nullptr;
                     mNameDialog = new TextInputDialog();
                     mNameDialog->setTextLabel(MWBase::Environment::get().getWindowManager()->getGameSettingString("sName", "Name"));
                     mNameDialog->setTextInput(mPlayerName);
@@ -195,7 +195,7 @@ namespace MWGui
 
                 case GM_Race:
                     MWBase::Environment::get().getWindowManager()->removeDialog(mRaceDialog);
-                    mRaceDialog = 0;
+                    mRaceDialog = nullptr;
                     mRaceDialog = new RaceDialog(mParent, mResourceSystem);
                     mRaceDialog->setNextButtonShow(mCreationStage >= CSE_RaceChosen);
                     mRaceDialog->setRaceId(mPlayerRaceId);
@@ -208,7 +208,7 @@ namespace MWGui
 
                 case GM_Class:
                     MWBase::Environment::get().getWindowManager()->removeDialog(mClassChoiceDialog);
-                    mClassChoiceDialog = 0;
+                    mClassChoiceDialog = nullptr;
                     mClassChoiceDialog = new ClassChoiceDialog();
                     mClassChoiceDialog->eventButtonSelected += MyGUI::newDelegate(this, &CharacterCreation::onClassChoice);
                     mClassChoiceDialog->setVisible(true);
@@ -218,7 +218,7 @@ namespace MWGui
 
                 case GM_ClassPick:
                     MWBase::Environment::get().getWindowManager()->removeDialog(mPickClassDialog);
-                    mPickClassDialog = 0;
+                    mPickClassDialog = nullptr;
                     mPickClassDialog = new PickClassDialog();
                     mPickClassDialog->setNextButtonShow(mCreationStage >= CSE_ClassChosen);
                     mPickClassDialog->setClassId(mPlayerClass.mId);
@@ -231,7 +231,7 @@ namespace MWGui
 
                 case GM_Birth:
                     MWBase::Environment::get().getWindowManager()->removeDialog(mBirthSignDialog);
-                    mBirthSignDialog = 0;
+                    mBirthSignDialog = nullptr;
                     mBirthSignDialog = new BirthDialog();
                     mBirthSignDialog->setNextButtonShow(mCreationStage >= CSE_BirthSignChosen);
                     mBirthSignDialog->setBirthId(mPlayerBirthSignId);
@@ -266,7 +266,7 @@ namespace MWGui
                     break;
                 case GM_Review:
                     MWBase::Environment::get().getWindowManager()->removeDialog(mReviewDialog);
-                    mReviewDialog = 0;
+                    mReviewDialog = nullptr;
                     mReviewDialog = new ReviewDialog();
 
                     MWBase::World *world = MWBase::Environment::get().getWorld();
@@ -316,7 +316,7 @@ namespace MWGui
     void CharacterCreation::onReviewDialogDone(WindowBase* parWindow)
     {
         MWBase::Environment::get().getWindowManager()->removeDialog(mReviewDialog);
-        mReviewDialog = 0;
+        mReviewDialog = nullptr;
 
         MWBase::Environment::get().getWindowManager()->popGuiMode();
     }
@@ -324,7 +324,7 @@ namespace MWGui
     void CharacterCreation::onReviewDialogBack()
     {
         MWBase::Environment::get().getWindowManager()->removeDialog(mReviewDialog);
-        mReviewDialog = 0;
+        mReviewDialog = nullptr;
         mCreationStage = CSE_ReviewBack;
 
         MWBase::Environment::get().getWindowManager()->popGuiMode();
@@ -334,7 +334,7 @@ namespace MWGui
     void CharacterCreation::onReviewActivateDialog(int parDialog)
     {
         MWBase::Environment::get().getWindowManager()->removeDialog(mReviewDialog);
-        mReviewDialog = 0;
+        mReviewDialog = nullptr;
         mCreationStage = CSE_ReviewNext;
 
         MWBase::Environment::get().getWindowManager()->popGuiMode();
@@ -370,7 +370,7 @@ namespace MWGui
                 mPlayerClass = *klass;
             }
             MWBase::Environment::get().getWindowManager()->removeDialog(mPickClassDialog);
-            mPickClassDialog = 0;
+            mPickClassDialog = nullptr;
         }
 
         updatePlayerHealth();
@@ -394,7 +394,7 @@ namespace MWGui
     void CharacterCreation::onClassChoice(int _index)
     {
         MWBase::Environment::get().getWindowManager()->removeDialog(mClassChoiceDialog);
-        mClassChoiceDialog = 0;
+        mClassChoiceDialog = nullptr;
 
         MWBase::Environment::get().getWindowManager()->popGuiMode();
 
@@ -423,7 +423,7 @@ namespace MWGui
             mPlayerName = mNameDialog->getTextInput();
             MWBase::Environment::get().getMechanicsManager()->setPlayerName(mPlayerName);
             MWBase::Environment::get().getWindowManager()->removeDialog(mNameDialog);
-            mNameDialog = 0;
+            mNameDialog = nullptr;
         }
 
         handleDialogDone(CSE_NameChosen, GM_Race);
@@ -446,7 +446,7 @@ namespace MWGui
             MWBase::Environment::get().getWindowManager()->getInventoryWindow()->rebuildAvatar();
 
             MWBase::Environment::get().getWindowManager()->removeDialog(mRaceDialog);
-            mRaceDialog = 0;
+            mRaceDialog = nullptr;
         }
 
         updatePlayerHealth();
@@ -475,7 +475,7 @@ namespace MWGui
             if (!mPlayerBirthSignId.empty())
                 MWBase::Environment::get().getMechanicsManager()->setPlayerBirthsign(mPlayerBirthSignId);
             MWBase::Environment::get().getWindowManager()->removeDialog(mBirthSignDialog);
-            mBirthSignDialog = 0;
+            mBirthSignDialog = nullptr;
         }
 
         updatePlayerHealth();
@@ -551,7 +551,7 @@ namespace MWGui
         MWBase::Environment::get().getSoundManager()->stopSay();
 
         MWBase::Environment::get().getWindowManager()->removeDialog(mGenerateClassQuestionDialog);
-        mGenerateClassQuestionDialog = 0;
+        mGenerateClassQuestionDialog = nullptr;
 
         if (_index < 0 || _index >= 3)
         {
@@ -669,7 +669,7 @@ namespace MWGui
             }
 
             MWBase::Environment::get().getWindowManager()->removeDialog(mGenerateClassResultDialog);
-            mGenerateClassResultDialog = 0;
+            mGenerateClassResultDialog = nullptr;
 
             mGenerateClassResultDialog = new GenerateClassResultDialog();
             mGenerateClassResultDialog->setClassId(mGenerateClass);
@@ -687,7 +687,7 @@ namespace MWGui
         }
 
         MWBase::Environment::get().getWindowManager()->removeDialog(mGenerateClassQuestionDialog);
-        mGenerateClassQuestionDialog = 0;
+        mGenerateClassQuestionDialog = nullptr;
 
         mGenerateClassQuestionDialog = new InfoBoxDialog();
 
@@ -711,7 +711,7 @@ namespace MWGui
     void CharacterCreation::selectGeneratedClass()
     {
         MWBase::Environment::get().getWindowManager()->removeDialog(mGenerateClassResultDialog);
-        mGenerateClassResultDialog = 0;
+        mGenerateClassResultDialog = nullptr;
 
         MWBase::Environment::get().getMechanicsManager()->setPlayerClass(mGenerateClass);
 
diff --git a/apps/openmw/mwgui/class.cpp b/apps/openmw/mwgui/class.cpp
index cfbf5e5fb5..ee5fe59399 100644
--- a/apps/openmw/mwgui/class.cpp
+++ b/apps/openmw/mwgui/class.cpp
@@ -550,16 +550,16 @@ namespace MWGui
     void CreateClassDialog::onDialogCancel()
     {
         MWBase::Environment::get().getWindowManager()->removeDialog(mSpecDialog);
-        mSpecDialog = 0;
+        mSpecDialog = nullptr;
 
         MWBase::Environment::get().getWindowManager()->removeDialog(mAttribDialog);
-        mAttribDialog = 0;
+        mAttribDialog = nullptr;
 
         MWBase::Environment::get().getWindowManager()->removeDialog(mSkillDialog);
-        mSkillDialog = 0;
+        mSkillDialog = nullptr;
 
         MWBase::Environment::get().getWindowManager()->removeDialog(mDescDialog);
-        mDescDialog = 0;
+        mDescDialog = nullptr;
     }
 
     void CreateClassDialog::onSpecializationClicked(MyGUI::Widget* _sender)
@@ -577,7 +577,7 @@ namespace MWGui
         setSpecialization(mSpecializationId);
 
         MWBase::Environment::get().getWindowManager()->removeDialog(mSpecDialog);
-        mSpecDialog = 0;
+        mSpecDialog = nullptr;
     }
 
     void CreateClassDialog::setSpecialization(int id)
@@ -618,7 +618,7 @@ namespace MWGui
         }
         mAffectedAttribute->setAttributeId(id);
         MWBase::Environment::get().getWindowManager()->removeDialog(mAttribDialog);
-        mAttribDialog = 0;
+        mAttribDialog = nullptr;
 
         update();
     }
@@ -651,7 +651,7 @@ namespace MWGui
 
         mAffectedSkill->setSkillId(mSkillDialog->getSkillId());
         MWBase::Environment::get().getWindowManager()->removeDialog(mSkillDialog);
-        mSkillDialog = 0;
+        mSkillDialog = nullptr;
         update();
     }
 
@@ -667,7 +667,7 @@ namespace MWGui
     {
         mDescription = mDescDialog->getTextInput();
         MWBase::Environment::get().getWindowManager()->removeDialog(mDescDialog);
-        mDescDialog = 0;
+        mDescDialog = nullptr;
     }
 
     void CreateClassDialog::onOkClicked(MyGUI::Widget* _sender)
diff --git a/apps/openmw/mwgui/console.cpp b/apps/openmw/mwgui/console.cpp
index e56cd170c8..89ba5d388d 100644
--- a/apps/openmw/mwgui/console.cpp
+++ b/apps/openmw/mwgui/console.cpp
@@ -36,7 +36,7 @@ namespace MWGui
     ConsoleInterpreterContext::ConsoleInterpreterContext (Console& console,
         MWWorld::Ptr reference)
     : MWScript::InterpreterContext (
-        reference.isEmpty() ? 0 : &reference.getRefData().getLocals(), reference),
+        reference.isEmpty() ? nullptr : &reference.getRefData().getLocals(), reference),
       mConsole (console)
     {}
 
diff --git a/apps/openmw/mwgui/draganddrop.cpp b/apps/openmw/mwgui/draganddrop.cpp
index daf9f66367..cfe60db5dd 100644
--- a/apps/openmw/mwgui/draganddrop.cpp
+++ b/apps/openmw/mwgui/draganddrop.cpp
@@ -135,7 +135,7 @@ void DragAndDrop::finish()
     MWBase::Environment::get().getWindowManager()->getInventoryWindow()->updateItemView();
 
     MyGUI::Gui::getInstance().destroyWidget(mDraggedWidget);
-    mDraggedWidget = 0;
+    mDraggedWidget = nullptr;
     MWBase::Environment::get().getWindowManager()->setDragDrop(false);
 }
 
diff --git a/apps/openmw/mwgui/mainmenu.cpp b/apps/openmw/mwgui/mainmenu.cpp
index a5d8f7344d..4e695710ff 100644
--- a/apps/openmw/mwgui/mainmenu.cpp
+++ b/apps/openmw/mwgui/mainmenu.cpp
@@ -24,7 +24,7 @@ namespace MWGui
     MainMenu::MainMenu(int w, int h, const VFS::Manager* vfs, const std::string& versionDescription)
         : WindowBase("openmw_mainmenu.layout")
         , mWidth (w), mHeight (h)
-        , mVFS(vfs), mButtonBox(0)
+        , mVFS(vfs), mButtonBox(nullptr)
         , mBackground(nullptr)
         , mVideoBackground(nullptr)
         , mVideo(nullptr)
diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index acf1319269..6e8804a43f 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -644,7 +644,7 @@ namespace MWGui
         : WindowPinnableBase("openmw_map_window.layout")
         , LocalMapBase(customMarkers, localMapRender)
         , NoDrop(drag, mMainWidget)
-        , mGlobalMap(0)
+        , mGlobalMap(nullptr)
         , mGlobalMapImage(nullptr)
         , mGlobalMapOverlay(nullptr)
         , mGlobal(Settings::Manager::getBool("global", "Map"))
diff --git a/apps/openmw/mwgui/quickkeysmenu.cpp b/apps/openmw/mwgui/quickkeysmenu.cpp
index 214e529428..a6bfac2a45 100644
--- a/apps/openmw/mwgui/quickkeysmenu.cpp
+++ b/apps/openmw/mwgui/quickkeysmenu.cpp
@@ -37,9 +37,9 @@ namespace MWGui
         , mKey(std::vector<keyData>(10))
         , mSelected(nullptr)
         , mActivated(nullptr)
-        , mAssignDialog(0)
-        , mItemSelectionDialog(0)
-        , mMagicSelectionDialog(0)
+        , mAssignDialog(nullptr)
+        , mItemSelectionDialog(nullptr)
+        , mMagicSelectionDialog(nullptr)
 
     {
         getWidget(mOkButton, "OKButton");
diff --git a/apps/openmw/mwgui/review.cpp b/apps/openmw/mwgui/review.cpp
index e76cbe7706..101b6956d0 100644
--- a/apps/openmw/mwgui/review.cpp
+++ b/apps/openmw/mwgui/review.cpp
@@ -86,7 +86,7 @@ namespace MWGui
         for (int i = 0; i < ESM::Skill::Length; ++i)
         {
             mSkillValues.insert(std::make_pair(i, MWMechanics::SkillValue()));
-            mSkillWidgetMap.insert(std::make_pair(i, static_cast<MyGUI::TextBox*> (0)));
+            mSkillWidgetMap.insert(std::make_pair(i, static_cast<MyGUI::TextBox*> (nullptr)));
         }
 
         MyGUI::Button* backButton;
diff --git a/apps/openmw/mwgui/spellcreationdialog.cpp b/apps/openmw/mwgui/spellcreationdialog.cpp
index 1f086507fd..f9de469e20 100644
--- a/apps/openmw/mwgui/spellcreationdialog.cpp
+++ b/apps/openmw/mwgui/spellcreationdialog.cpp
@@ -587,7 +587,7 @@ namespace MWGui
         mAddEffectDialog.newEffect(effect);
         mAddEffectDialog.setAttribute (mSelectAttributeDialog->getAttributeId());
         MWBase::Environment::get().getWindowManager ()->removeDialog (mSelectAttributeDialog);
-        mSelectAttributeDialog = 0;
+        mSelectAttributeDialog = nullptr;
     }
 
     void EffectEditorBase::onSelectSkill ()
@@ -598,7 +598,7 @@ namespace MWGui
         mAddEffectDialog.newEffect(effect);
         mAddEffectDialog.setSkill (mSelectSkillDialog->getSkillId());
         MWBase::Environment::get().getWindowManager ()->removeDialog (mSelectSkillDialog);
-        mSelectSkillDialog = 0;
+        mSelectSkillDialog = nullptr;
     }
 
     void EffectEditorBase::onAttributeOrSkillCancel ()
@@ -608,8 +608,8 @@ namespace MWGui
         if (mSelectAttributeDialog)
             MWBase::Environment::get().getWindowManager ()->removeDialog (mSelectAttributeDialog);
 
-        mSelectSkillDialog = 0;
-        mSelectAttributeDialog = 0;
+        mSelectSkillDialog = nullptr;
+        mSelectAttributeDialog = nullptr;
     }
 
     void EffectEditorBase::onAvailableEffectClicked (MyGUI::Widget* sender)
diff --git a/apps/openmw/mwgui/tooltips.cpp b/apps/openmw/mwgui/tooltips.cpp
index c0db57b1b1..e0a8e4d3e0 100644
--- a/apps/openmw/mwgui/tooltips.cpp
+++ b/apps/openmw/mwgui/tooltips.cpp
@@ -153,7 +153,7 @@ namespace MWGui
                     return;
 
                 MyGUI::Widget* focus = MyGUI::InputManager::getInstance().getMouseFocusWidget();
-                if (focus == 0)
+                if (focus == nullptr)
                     return;
 
                 MyGUI::IntSize tooltipSize;
@@ -410,7 +410,7 @@ namespace MWGui
         if (text.size() > 0 && text[0] == '\n')
             text.erase(0, 1);
 
-        const ESM::Enchantment* enchant = 0;
+        const ESM::Enchantment* enchant = nullptr;
         const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
         if (info.enchant != "")
         {
diff --git a/apps/openmw/mwgui/widgets.cpp b/apps/openmw/mwgui/widgets.cpp
index 74076641a9..fb8521f067 100644
--- a/apps/openmw/mwgui/widgets.cpp
+++ b/apps/openmw/mwgui/widgets.cpp
@@ -101,7 +101,7 @@ namespace MWGui
                 button->eventMouseButtonClick += MyGUI::newDelegate(this, &MWSkill::onClicked);
             }
 
-            button = 0;
+            button = nullptr;
             assignWidget(button, "StatValueButton");
             if (button)
             {
@@ -192,7 +192,7 @@ namespace MWGui
                 button->eventMouseButtonClick += MyGUI::newDelegate(this, &MWAttribute::onClicked);
             }
 
-            button = 0;
+            button = nullptr;
             assignWidget(button, "StatValueButton");
             if (button)
             {
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 840f0f9cfa..bfce908103 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -1957,7 +1957,7 @@ namespace MWGui
     {
         if (_type != "Text")
             return;
-        char* text=0;
+        char* text=nullptr;
         text = SDL_GetClipboardText();
         if (text)
             _data = MyGUI::TextIterator::toTagsString(text);
diff --git a/apps/openmw/mwinput/mousemanager.cpp b/apps/openmw/mwinput/mousemanager.cpp
index ac30d4487b..4816470ffb 100644
--- a/apps/openmw/mwinput/mousemanager.cpp
+++ b/apps/openmw/mwinput/mousemanager.cpp
@@ -154,7 +154,7 @@ namespace MWInput
         {
             guiMode = MWBase::Environment::get().getWindowManager()->isGuiMode();
             guiMode = MyGUI::InputManager::getInstance().injectMousePress(static_cast<int>(mGuiCursorX), static_cast<int>(mGuiCursorY), sdlButtonToMyGUI(id)) && guiMode;
-            if (MyGUI::InputManager::getInstance().getMouseFocusWidget () != 0)
+            if (MyGUI::InputManager::getInstance().getMouseFocusWidget () != nullptr)
             {
                 MyGUI::Button* b = MyGUI::InputManager::getInstance().getMouseFocusWidget()->castType<MyGUI::Button>(false);
                 if (b && b->getEnabled() && id == SDL_BUTTON_LEFT)
diff --git a/apps/openmw/mwmechanics/alchemy.cpp b/apps/openmw/mwmechanics/alchemy.cpp
index 116937fcdb..6d06724f00 100644
--- a/apps/openmw/mwmechanics/alchemy.cpp
+++ b/apps/openmw/mwmechanics/alchemy.cpp
@@ -255,7 +255,7 @@ const ESM::Potion *MWMechanics::Alchemy::getRecord(const ESM::Potion& toFind) co
             return &(*iter);
     }
 
-    return 0;
+    return nullptr;
 }
 
 void MWMechanics::Alchemy::removeIngredients()
diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index ce45729b3b..a908940ed9 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -368,7 +368,7 @@ namespace MWScript
                     std::string cellID = runtime.getStringLiteral (runtime[0].mInteger);
                     runtime.pop();
 
-                    MWWorld::CellStore* store = 0;
+                    MWWorld::CellStore* store = nullptr;
                     try
                     {
                         store = MWBase::Environment::get().getWorld()->getInterior(cellID);
@@ -481,7 +481,7 @@ namespace MWScript
                     Interpreter::Type_Float zRotDegrees = runtime[0].mFloat;
                     runtime.pop();
 
-                    MWWorld::CellStore* store = 0;
+                    MWWorld::CellStore* store = nullptr;
                     try
                     {
                         store = MWBase::Environment::get().getWorld()->getInterior(cellID);
diff --git a/apps/openmw/mwsound/ffmpeg_decoder.cpp b/apps/openmw/mwsound/ffmpeg_decoder.cpp
index 6c334978c0..95ed9eeed8 100644
--- a/apps/openmw/mwsound/ffmpeg_decoder.cpp
+++ b/apps/openmw/mwsound/ffmpeg_decoder.cpp
@@ -437,7 +437,7 @@ FFmpeg_Decoder::FFmpeg_Decoder(const VFS::Manager* vfs)
   , mFrameSize(0)
   , mFramePos(0)
   , mNextPts(0.0)
-  , mSwr(0)
+  , mSwr(nullptr)
   , mOutputSampleFormat(AV_SAMPLE_FMT_NONE)
   , mOutputChannelLayout(0)
   , mDataBuf(nullptr)
diff --git a/apps/openmw/mwsound/openal_output.cpp b/apps/openmw/mwsound/openal_output.cpp
index a7be5a743f..67b52309d5 100644
--- a/apps/openmw/mwsound/openal_output.cpp
+++ b/apps/openmw/mwsound/openal_output.cpp
@@ -624,7 +624,7 @@ bool OpenAL_Output::init(const std::string &devname, const std::string &hrtfname
     attrs.reserve(15);
     if(ALC.SOFT_HRTF)
     {
-        LPALCGETSTRINGISOFT alcGetStringiSOFT = 0;
+        LPALCGETSTRINGISOFT alcGetStringiSOFT = nullptr;
         getALCFunc(alcGetStringiSOFT, mDevice, "alcGetStringiSOFT");
 
         attrs.push_back(ALC_HRTF_SOFT);
@@ -850,13 +850,13 @@ void OpenAL_Output::deinit()
         alDeleteFilters(1, &mWaterFilter);
     mWaterFilter = 0;
 
-    alcMakeContextCurrent(0);
+    alcMakeContextCurrent(nullptr);
     if(mContext)
         alcDestroyContext(mContext);
-    mContext = 0;
+    mContext = nullptr;
     if(mDevice)
         alcCloseDevice(mDevice);
-    mDevice = 0;
+    mDevice = nullptr;
 
     mInitialized = false;
 }
@@ -869,7 +869,7 @@ std::vector<std::string> OpenAL_Output::enumerateHrtf()
     if(!mDevice || !ALC.SOFT_HRTF)
         return ret;
 
-    LPALCGETSTRINGISOFT alcGetStringiSOFT = 0;
+    LPALCGETSTRINGISOFT alcGetStringiSOFT = nullptr;
     getALCFunc(alcGetStringiSOFT, mDevice, "alcGetStringiSOFT");
 
     ALCint num_hrtf;
@@ -892,10 +892,10 @@ void OpenAL_Output::setHrtf(const std::string &hrtfname, HrtfMode hrtfmode)
         return;
     }
 
-    LPALCGETSTRINGISOFT alcGetStringiSOFT = 0;
+    LPALCGETSTRINGISOFT alcGetStringiSOFT = nullptr;
     getALCFunc(alcGetStringiSOFT, mDevice, "alcGetStringiSOFT");
 
-    LPALCRESETDEVICESOFT alcResetDeviceSOFT = 0;
+    LPALCRESETDEVICESOFT alcResetDeviceSOFT = nullptr;
     getALCFunc(alcResetDeviceSOFT, mDevice, "alcResetDeviceSOFT");
 
     std::vector<ALCint> attrs;
@@ -1213,7 +1213,7 @@ void OpenAL_Output::finishSound(Sound *sound)
 {
     if(!sound->mHandle) return;
     ALuint source = GET_PTRID(sound->mHandle);
-    sound->mHandle = 0;
+    sound->mHandle = nullptr;
 
     // Rewind the stream to put the source back into an AL_INITIAL state, for
     // the next time it's used.
@@ -1316,7 +1316,7 @@ void OpenAL_Output::finishStream(Stream *sound)
     OpenAL_SoundStream *stream = reinterpret_cast<OpenAL_SoundStream*>(sound->mHandle);
     ALuint source = stream->mSource;
 
-    sound->mHandle = 0;
+    sound->mHandle = nullptr;
     mStreamThread->remove(stream);
 
     // Rewind the stream to put the source back into an AL_INITIAL state, for
@@ -1462,7 +1462,7 @@ void OpenAL_Output::pauseActiveDevice()
 
     if(alcIsExtensionPresent(mDevice, "ALC_SOFT_PAUSE_DEVICE"))
     {
-        LPALCDEVICEPAUSESOFT alcDevicePauseSOFT = 0;
+        LPALCDEVICEPAUSESOFT alcDevicePauseSOFT = nullptr;
         getALCFunc(alcDevicePauseSOFT, mDevice, "alcDevicePauseSOFT");
         alcDevicePauseSOFT(mDevice);
         getALCError(mDevice);
@@ -1478,7 +1478,7 @@ void OpenAL_Output::resumeActiveDevice()
 
     if(alcIsExtensionPresent(mDevice, "ALC_SOFT_PAUSE_DEVICE"))
     {
-        LPALCDEVICERESUMESOFT alcDeviceResumeSOFT = 0;
+        LPALCDEVICERESUMESOFT alcDeviceResumeSOFT = nullptr;
         getALCFunc(alcDeviceResumeSOFT, mDevice, "alcDeviceResumeSOFT");
         alcDeviceResumeSOFT(mDevice);
         getALCError(mDevice);
@@ -1513,7 +1513,7 @@ void OpenAL_Output::resumeSounds(int types)
 
 OpenAL_Output::OpenAL_Output(SoundManager &mgr)
   : Sound_Output(mgr)
-  , mDevice(0), mContext(0)
+  , mDevice(nullptr), mContext(nullptr)
   , mListenerPos(0.0f, 0.0f, 0.0f), mListenerEnv(Env_Normal)
   , mWaterFilter(0), mWaterEffect(0), mDefaultEffect(0), mEffectSlot(0)
   , mStreamThread(new StreamThread)
diff --git a/apps/openmw/mwsound/sound_buffer.hpp b/apps/openmw/mwsound/sound_buffer.hpp
index 5ca3a45da7..83b08d6be8 100644
--- a/apps/openmw/mwsound/sound_buffer.hpp
+++ b/apps/openmw/mwsound/sound_buffer.hpp
@@ -20,7 +20,7 @@ namespace MWSound
         size_t mUses;
 
         Sound_Buffer(std::string resname, float volume, float mindist, float maxdist)
-          : mResourceName(resname), mVolume(volume), mMinDist(mindist), mMaxDist(maxdist), mHandle(0), mUses(0)
+          : mResourceName(resname), mVolume(volume), mMinDist(mindist), mMaxDist(maxdist), mHandle(nullptr), mUses(0)
         { }
     };
 }
diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index 1a90dceedf..37ba80820d 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -120,7 +120,7 @@ namespace MWSound
         {
             if(sfx.mHandle)
                 mOutput->unloadSound(sfx.mHandle);
-            sfx.mHandle = 0;
+            sfx.mHandle = nullptr;
         }
         mUnusedBuffers.clear();
         mOutput.reset();
@@ -229,7 +229,7 @@ namespace MWSound
 
                     size = mOutput->unloadSound(unused->mHandle);
                     mBufferCacheSize -= size;
-                    unused->mHandle = 0;
+                    unused->mHandle = nullptr;
 
                     mUnusedBuffers.pop_back();
                 } while(mBufferCacheSize > mBufferCacheMin);
diff --git a/apps/openmw/mwstate/character.cpp b/apps/openmw/mwstate/character.cpp
index 3c5c4f8b2a..df1ab1bdfb 100644
--- a/apps/openmw/mwstate/character.cpp
+++ b/apps/openmw/mwstate/character.cpp
@@ -64,7 +64,7 @@ void MWState::Character::addSlot (const ESM::SavedGame& profile)
     }
 
     slot.mProfile = profile;
-    slot.mTimeStamp = std::time (0);
+    slot.mTimeStamp = std::time (nullptr);
 
     mSlots.push_back (slot);
 }
@@ -143,7 +143,7 @@ const MWState::Slot *MWState::Character::updateSlot (const Slot *slot, const ESM
 
     Slot newSlot = *slot;
     newSlot.mProfile = profile;
-    newSlot.mTimeStamp = std::time (0);
+    newSlot.mTimeStamp = std::time (nullptr);
 
     mSlots.erase (mSlots.begin()+index);
 
diff --git a/apps/openmw/mwstate/charactermanager.cpp b/apps/openmw/mwstate/charactermanager.cpp
index b5868c3e5a..a324dfe0f7 100644
--- a/apps/openmw/mwstate/charactermanager.cpp
+++ b/apps/openmw/mwstate/charactermanager.cpp
@@ -7,7 +7,7 @@
 
 MWState::CharacterManager::CharacterManager (const boost::filesystem::path& saves,
     const std::string& game)
-: mPath (saves), mCurrent (0), mGame (game)
+: mPath (saves), mCurrent (nullptr), mGame (game)
 {
     if (!boost::filesystem::is_directory (mPath))
     {
diff --git a/apps/openmw/mwstate/statemanagerimp.hpp b/apps/openmw/mwstate/statemanagerimp.hpp
index 11984b7f50..3534dabf2b 100644
--- a/apps/openmw/mwstate/statemanagerimp.hpp
+++ b/apps/openmw/mwstate/statemanagerimp.hpp
@@ -53,7 +53,7 @@ namespace MWState
             void deleteGame (const MWState::Character *character, const MWState::Slot *slot) override;
             ///< Delete a saved game slot from this character. If all save slots are deleted, the character will be deleted too.
 
-            void saveGame (const std::string& description, const Slot *slot = 0) override;
+            void saveGame (const std::string& description, const Slot *slot = nullptr) override;
             ///< Write a saved game to \a slot or create a new slot if \a slot == 0.
             ///
             /// \note Slot must belong to the current character.
diff --git a/apps/openmw/mwworld/cells.cpp b/apps/openmw/mwworld/cells.cpp
index 94c78b4332..15c1b46bab 100644
--- a/apps/openmw/mwworld/cells.cpp
+++ b/apps/openmw/mwworld/cells.cpp
@@ -94,7 +94,7 @@ void MWWorld::Cells::clear()
 {
     mInteriors.clear();
     mExteriors.clear();
-    std::fill(mIdCache.begin(), mIdCache.end(), std::make_pair("", (MWWorld::CellStore*)0));
+    std::fill(mIdCache.begin(), mIdCache.end(), std::make_pair("", (MWWorld::CellStore*)nullptr));
     mIdCacheIndex = 0;
 }
 
@@ -132,7 +132,7 @@ void MWWorld::Cells::writeCell (ESM::ESMWriter& writer, CellStore& cell) const
 
 MWWorld::Cells::Cells (const MWWorld::ESMStore& store, std::vector<ESM::ESMReader>& reader)
 : mStore (store), mReader (reader),
-  mIdCache (Settings::Manager::getInt("pointers cache size", "Cells"), std::pair<std::string, CellStore *> ("", (CellStore*)0)),
+  mIdCache (Settings::Manager::getInt("pointers cache size", "Cells"), std::pair<std::string, CellStore *> ("", (CellStore*)nullptr)),
   mIdCacheIndex (0)
 {}
 
@@ -449,7 +449,7 @@ bool MWWorld::Cells::readRecord (ESM::ESMReader& reader, uint32_t type,
         ESM::CellState state;
         state.mId.load (reader);
 
-        CellStore *cellStore = 0;
+        CellStore *cellStore = nullptr;
 
         try
         {
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 14b96b27c6..b48fe74a68 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -37,7 +37,7 @@ namespace
         for (typename MWWorld::CellRefList<T>::List::iterator iter (containerList.mList.begin());
              iter!=containerList.mList.end(); ++iter)
         {
-            MWWorld::Ptr container (&*iter, 0);
+            MWWorld::Ptr container (&*iter, nullptr);
 
             if (container.getRefData().getCustomData() == nullptr)
                 continue;
diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index 6fad429263..17c35489f5 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -67,7 +67,7 @@ namespace
         {
             if (Misc::StringUtils::ciEqual(iter->mBase->mId, id2) && iter->mData.getCount())
             {
-                MWWorld::Ptr ptr (&*iter, 0);
+                MWWorld::Ptr ptr (&*iter, nullptr);
                 ptr.setContainerStore (store);
                 return ptr;
             }
@@ -326,7 +326,7 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::add (const Ptr& itemPtr
         if (actorPtr == player)
         {
             // Items in player's inventory have cell set to 0, so their scripts will never be removed
-            item.mCell = 0;
+            item.mCell = nullptr;
         }
         else
         {
@@ -1138,18 +1138,18 @@ PtrType MWWorld::ContainerStoreIteratorBase<PtrType>::operator*() const
 
     switch (mType)
     {
-        case ContainerStore::Type_Potion: ptr = PtrType (&*mPotion, 0); break;
-        case ContainerStore::Type_Apparatus: ptr = PtrType (&*mApparatus, 0); break;
-        case ContainerStore::Type_Armor: ptr = PtrType (&*mArmor, 0); break;
-        case ContainerStore::Type_Book: ptr = PtrType (&*mBook, 0); break;
-        case ContainerStore::Type_Clothing: ptr = PtrType (&*mClothing, 0); break;
-        case ContainerStore::Type_Ingredient: ptr = PtrType (&*mIngredient, 0); break;
-        case ContainerStore::Type_Light: ptr = PtrType (&*mLight, 0); break;
-        case ContainerStore::Type_Lockpick: ptr = PtrType (&*mLockpick, 0); break;
-        case ContainerStore::Type_Miscellaneous: ptr = PtrType (&*mMiscellaneous, 0); break;
-        case ContainerStore::Type_Probe: ptr = PtrType (&*mProbe, 0); break;
-        case ContainerStore::Type_Repair: ptr = PtrType (&*mRepair, 0); break;
-        case ContainerStore::Type_Weapon: ptr = PtrType (&*mWeapon, 0); break;
+        case ContainerStore::Type_Potion: ptr = PtrType (&*mPotion, nullptr); break;
+        case ContainerStore::Type_Apparatus: ptr = PtrType (&*mApparatus, nullptr); break;
+        case ContainerStore::Type_Armor: ptr = PtrType (&*mArmor, nullptr); break;
+        case ContainerStore::Type_Book: ptr = PtrType (&*mBook, nullptr); break;
+        case ContainerStore::Type_Clothing: ptr = PtrType (&*mClothing, nullptr); break;
+        case ContainerStore::Type_Ingredient: ptr = PtrType (&*mIngredient, nullptr); break;
+        case ContainerStore::Type_Light: ptr = PtrType (&*mLight, nullptr); break;
+        case ContainerStore::Type_Lockpick: ptr = PtrType (&*mLockpick, nullptr); break;
+        case ContainerStore::Type_Miscellaneous: ptr = PtrType (&*mMiscellaneous, nullptr); break;
+        case ContainerStore::Type_Probe: ptr = PtrType (&*mProbe, nullptr); break;
+        case ContainerStore::Type_Repair: ptr = PtrType (&*mRepair, nullptr); break;
+        case ContainerStore::Type_Weapon: ptr = PtrType (&*mWeapon, nullptr); break;
     }
 
     if (ptr.isEmpty())
diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index 942d5feeba..90bc80b484 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -71,7 +71,7 @@ void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener)
 {
     listener->setProgressRange(1000);
 
-    ESM::Dialogue *dialogue = 0;
+    ESM::Dialogue *dialogue = nullptr;
 
     // Land texture loading needs to use a separate internal store for each plugin.
     // We set the number of plugins here to avoid continual resizes during loading,
@@ -153,7 +153,7 @@ void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener)
             if (n.intval==ESM::REC_DIAL) {
                 dialogue = const_cast<ESM::Dialogue*>(mDialogs.find(id.mId));
             } else {
-                dialogue = 0;
+                dialogue = nullptr;
             }
         }
         listener->setProgress(static_cast<size_t>(esm.getFileOffset() / (float)esm.getFileSize() * 1000));
diff --git a/apps/openmw/mwworld/esmstore.hpp b/apps/openmw/mwworld/esmstore.hpp
index 99db96ac10..d69c56d8c0 100644
--- a/apps/openmw/mwworld/esmstore.hpp
+++ b/apps/openmw/mwworld/esmstore.hpp
@@ -196,7 +196,7 @@ namespace MWWorld
             const std::string id = "$dynamic" + std::to_string(mDynamicCount++);
 
             Store<T> &store = const_cast<Store<T> &>(get<T>());
-            if (store.search(id) != 0)
+            if (store.search(id) != nullptr)
             {
                 const std::string msg = "Try to override existing record '" + id + "'";
                 throw std::runtime_error(msg);
@@ -234,7 +234,7 @@ namespace MWWorld
             const std::string id = "$dynamic" + std::to_string(mDynamicCount++);
 
             Store<T> &store = const_cast<Store<T> &>(get<T>());
-            if (store.search(id) != 0)
+            if (store.search(id) != nullptr)
             {
                 const std::string msg = "Try to override existing record '" + id + "'";
                 throw std::runtime_error(msg);
@@ -286,7 +286,7 @@ namespace MWWorld
         {
             return mNpcs.insert(npc);
         }
-        else if (mNpcs.search(id) != 0)
+        else if (mNpcs.search(id) != nullptr)
         {
             const std::string msg = "Try to override existing record '" + id + "'";
             throw std::runtime_error(msg);
diff --git a/apps/openmw/mwworld/manualref.cpp b/apps/openmw/mwworld/manualref.cpp
index 48270d224d..7f7fd60335 100644
--- a/apps/openmw/mwworld/manualref.cpp
+++ b/apps/openmw/mwworld/manualref.cpp
@@ -26,7 +26,7 @@ namespace
         MWWorld::LiveCellRef<T> ref(cellRef, base);
 
         refValue = ref;
-        ptrValue = MWWorld::Ptr(&boost::any_cast<MWWorld::LiveCellRef<T>&>(refValue), 0);
+        ptrValue = MWWorld::Ptr(&boost::any_cast<MWWorld::LiveCellRef<T>&>(refValue), nullptr);
     }
 }
 
diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp
index 66ae4e3194..d8e2fb2f0d 100644
--- a/apps/openmw/mwworld/player.cpp
+++ b/apps/openmw/mwworld/player.cpp
@@ -29,7 +29,7 @@
 namespace MWWorld
 {
     Player::Player (const ESM::NPC *player)
-      : mCellStore(0),
+      : mCellStore(nullptr),
         mLastKnownExteriorPosition(0,0,0),
         mMarkedPosition(ESM::Position()),
         mMarkedCell(nullptr),
@@ -299,9 +299,9 @@ namespace MWWorld
 
     void Player::clear()
     {
-        mCellStore = 0;
+        mCellStore = nullptr;
         mSign.clear();
-        mMarkedCell = 0;
+        mMarkedCell = nullptr;
         mAutoMove = false;
         mForwardBackward = 0;
         mTeleported = false;
@@ -448,7 +448,7 @@ namespace MWWorld
             }
             else
             {
-                mMarkedCell = 0;
+                mMarkedCell = nullptr;
             }
 
             mForwardBackward = 0;
diff --git a/apps/openmw/mwworld/ptr.cpp b/apps/openmw/mwworld/ptr.cpp
index 12c44b0b31..e16a196297 100644
--- a/apps/openmw/mwworld/ptr.cpp
+++ b/apps/openmw/mwworld/ptr.cpp
@@ -8,7 +8,7 @@
 
 const std::string& MWWorld::Ptr::getTypeName() const
 {
-    if(mRef != 0)
+    if(mRef != nullptr)
         return mRef->mClass->getTypeName();
     throw std::runtime_error("Can't get type name from an empty object.");
 }
@@ -57,7 +57,7 @@ MWWorld::Ptr::operator const void *()
 
 const std::string &MWWorld::ConstPtr::getTypeName() const
 {
-    if(mRef != 0)
+    if(mRef != nullptr)
         return mRef->mClass->getTypeName();
     throw std::runtime_error("Can't get type name from an empty object.");
 }
diff --git a/apps/openmw/mwworld/ptr.hpp b/apps/openmw/mwworld/ptr.hpp
index d7c170e456..9ab18d7f48 100644
--- a/apps/openmw/mwworld/ptr.hpp
+++ b/apps/openmw/mwworld/ptr.hpp
@@ -25,21 +25,21 @@ namespace MWWorld
             ContainerStore *mContainerStore;
 
         public:
-            Ptr(MWWorld::LiveCellRefBase *liveCellRef=0, CellStore *cell=0)
-              : mRef(liveCellRef), mCell(cell), mContainerStore(0)
+            Ptr(MWWorld::LiveCellRefBase *liveCellRef=nullptr, CellStore *cell=nullptr)
+              : mRef(liveCellRef), mCell(cell), mContainerStore(nullptr)
             {
             }
 
             bool isEmpty() const
             {
-                return mRef == 0;
+                return mRef == nullptr;
             }
 
             const std::string& getTypeName() const;
 
             const Class& getClass() const
             {
-                if(mRef != 0)
+                if(mRef != nullptr)
                     return *(mRef->mClass);
                 throw std::runtime_error("Cannot get class of an empty object");
             }
@@ -52,7 +52,7 @@ namespace MWWorld
 
                 std::stringstream str;
                 str<< "Bad LiveCellRef cast to "<<typeid(T).name()<<" from ";
-                if(mRef != 0) str<< getTypeName();
+                if(mRef != nullptr) str<< getTypeName();
                 else str<< "an empty object";
 
                 throw std::runtime_error(str.str());
@@ -72,7 +72,7 @@ namespace MWWorld
 
             bool isInCell() const
             {
-                return (mContainerStore == 0) && (mCell != 0);
+                return (mContainerStore == nullptr) && (mCell != nullptr);
             }
 
             void setContainerStore (ContainerStore *store);
@@ -96,8 +96,8 @@ namespace MWWorld
         const ContainerStore *mContainerStore;
 
     public:
-        ConstPtr(const MWWorld::LiveCellRefBase *liveCellRef=0, const CellStore *cell=0)
-          : mRef(liveCellRef), mCell(cell), mContainerStore(0)
+        ConstPtr(const MWWorld::LiveCellRefBase *liveCellRef=nullptr, const CellStore *cell=nullptr)
+          : mRef(liveCellRef), mCell(cell), mContainerStore(nullptr)
         {
         }
 
@@ -108,14 +108,14 @@ namespace MWWorld
 
         bool isEmpty() const
         {
-            return mRef == 0;
+            return mRef == nullptr;
         }
 
         const std::string& getTypeName() const;
 
         const Class& getClass() const
         {
-            if(mRef != 0)
+            if(mRef != nullptr)
                 return *(mRef->mClass);
             throw std::runtime_error("Cannot get class of an empty object");
         }
@@ -128,7 +128,7 @@ namespace MWWorld
 
             std::stringstream str;
             str<< "Bad LiveCellRef cast to "<<typeid(T).name()<<" from ";
-            if(mRef != 0) str<< getTypeName();
+            if(mRef != nullptr) str<< getTypeName();
             else str<< "an empty object";
 
             throw std::runtime_error(str.str());
@@ -156,7 +156,7 @@ namespace MWWorld
 
         bool isInCell() const
         {
-            return (mContainerStore == 0) && (mCell != 0);
+            return (mContainerStore == nullptr) && (mCell != nullptr);
         }
         
         void setContainerStore (const ContainerStore *store);
diff --git a/apps/openmw/mwworld/refdata.cpp b/apps/openmw/mwworld/refdata.cpp
index a5f8ef4b14..71ff6d040d 100644
--- a/apps/openmw/mwworld/refdata.cpp
+++ b/apps/openmw/mwworld/refdata.cpp
@@ -34,19 +34,19 @@ namespace MWWorld
 
         mAnimationState = refData.mAnimationState;
 
-        mCustomData = refData.mCustomData ? refData.mCustomData->clone() : 0;
+        mCustomData = refData.mCustomData ? refData.mCustomData->clone() : nullptr;
     }
 
     void RefData::cleanup()
     {
-        mBaseNode = 0;
+        mBaseNode = nullptr;
 
         delete mCustomData;
-        mCustomData = 0;
+        mCustomData = nullptr;
     }
 
     RefData::RefData()
-    : mBaseNode(0), mDeletedByContentFile(false), mEnabled (true), mCount (1), mCustomData (0), mChanged(false), mFlags(0)
+    : mBaseNode(nullptr), mDeletedByContentFile(false), mEnabled (true), mCount (1), mCustomData (nullptr), mChanged(false), mFlags(0)
     {
         for (int i=0; i<3; ++i)
         {
@@ -56,20 +56,20 @@ namespace MWWorld
     }
 
     RefData::RefData (const ESM::CellRef& cellRef)
-    : mBaseNode(0), mDeletedByContentFile(false), mEnabled (true),
+    : mBaseNode(nullptr), mDeletedByContentFile(false), mEnabled (true),
       mCount (1), mPosition (cellRef.mPos),
-      mCustomData (0),
+      mCustomData (nullptr),
       mChanged(false), mFlags(0) // Loading from ESM/ESP files -> assume unchanged
     {
     }
 
     RefData::RefData (const ESM::ObjectState& objectState, bool deletedByContentFile)
-    : mBaseNode(0), mDeletedByContentFile(deletedByContentFile),
+    : mBaseNode(nullptr), mDeletedByContentFile(deletedByContentFile),
       mEnabled (objectState.mEnabled != 0),
       mCount (objectState.mCount),
       mPosition (objectState.mPosition),
       mAnimationState(objectState.mAnimationState),
-      mCustomData (0),
+      mCustomData (nullptr),
       mChanged(true), mFlags(objectState.mFlags) // Loading from a savegame -> assume changed
     {
         // "Note that the ActivationFlag_UseEnabled is saved to the reference,
@@ -79,7 +79,7 @@ namespace MWWorld
     }
 
     RefData::RefData (const RefData& refData)
-    : mBaseNode(0), mCustomData (0)
+    : mBaseNode(nullptr), mCustomData (nullptr)
     {
         try
         {
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index d01cc741cb..47b62862f7 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -397,7 +397,7 @@ namespace MWWorld
             if (!test && cell->getCell()->isExterior())
             {
                 osg::ref_ptr<const ESMTerrain::LandObject> land = mRendering.getLandManager()->getLand(cellX, cellY);
-                const ESM::Land::LandData* data = land ? land->getData(ESM::Land::DATA_VHGT) : 0;
+                const ESM::Land::LandData* data = land ? land->getData(ESM::Land::DATA_VHGT) : nullptr;
                 if (data)
                 {
                     mPhysics->addHeightField (data->mHeights, cellX, cellY, worldsize / (verts-1), verts, data->mMinHeight, data->mMaxHeight, land.get());
@@ -755,7 +755,7 @@ namespace MWWorld
 
     Scene::Scene (MWRender::RenderingManager& rendering, MWPhysics::PhysicsSystem *physics,
                   DetourNavigator::Navigator& navigator)
-    : mCurrentCell (0), mCellChanged (false), mPhysics(physics), mRendering(rendering), mNavigator(navigator)
+    : mCurrentCell (nullptr), mCellChanged (false), mPhysics(physics), mRendering(rendering), mNavigator(navigator)
     , mCellLoadingThreshold(1024.f)
     , mPreloadDistance(Settings::Manager::getInt("preload distance", "Cells"))
     , mPreloadEnabled(Settings::Manager::getBool("preload enabled", "Cells"))
diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index f8ec8c7c27..69ca1f8c27 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -101,7 +101,7 @@ namespace MWWorld
     const T *IndexedStore<T>::find(int index) const
     {
         const T *ptr = search(index);
-        if (ptr == 0)
+        if (ptr == nullptr)
         {
             const std::string msg = T::getRecordType() + " with index " + std::to_string(index) + " not found";
             throw std::runtime_error(msg);
@@ -146,7 +146,7 @@ namespace MWWorld
         if (it != mStatic.end())
             return &(it->second);
 
-        return 0;
+        return nullptr;
     }
     template<typename T>
     const T *Store<T>::searchStatic(const std::string &id) const
@@ -156,7 +156,7 @@ namespace MWWorld
         if (it != mStatic.end())
             return &(it->second);
 
-        return 0;
+        return nullptr;
     }
 
     template<typename T>
@@ -178,7 +178,7 @@ namespace MWWorld
     const T *Store<T>::find(const std::string &id) const
     {
         const T *ptr = search(id);
-        if (ptr == 0)
+        if (ptr == nullptr)
         {
             const std::string msg = T::getRecordType() + " '" + id + "' not found";
             throw std::runtime_error(msg);
@@ -189,7 +189,7 @@ namespace MWWorld
     const T *Store<T>::findRandom(const std::string &id) const
     {
         const T *ptr = searchRandom(id);
-        if(ptr == 0)
+        if(ptr == nullptr)
         {
             const std::string msg = T::getRecordType() + " starting with '" + id + "' not found";
             throw std::runtime_error(msg);
@@ -370,7 +370,7 @@ namespace MWWorld
     const ESM::LandTexture *Store<ESM::LandTexture>::find(size_t index, size_t plugin) const
     {
         const ESM::LandTexture *ptr = search(index, plugin);
-        if (ptr == 0)
+        if (ptr == nullptr)
         {
             const std::string msg = "Land texture with index " + std::to_string(index) + " not found";
             throw std::runtime_error(msg);
@@ -471,12 +471,12 @@ namespace MWWorld
         if (it != mStatic.end() && (*it)->mX == x && (*it)->mY == y) {
             return *it;
         }
-        return 0;
+        return nullptr;
     }
     const ESM::Land *Store<ESM::Land>::find(int x, int y) const
     {
         const ESM::Land *ptr = search(x, y);
-        if (ptr == 0)
+        if (ptr == nullptr)
         {
             const std::string msg = "Land at (" + std::to_string(x) + ", " + std::to_string(y) + ") not found";
             throw std::runtime_error(msg);
@@ -570,7 +570,7 @@ namespace MWWorld
             return &dit->second;
         }
 
-        return 0;
+        return nullptr;
     }
     const ESM::Cell *Store<ESM::Cell>::search(int x, int y) const
     {
@@ -588,7 +588,7 @@ namespace MWWorld
             return &dit->second;
         }
 
-        return 0;
+        return nullptr;
     }
     const ESM::Cell *Store<ESM::Cell>::searchStatic(int x, int y) const
     {
@@ -600,7 +600,7 @@ namespace MWWorld
         if (it != mExt.end()) {
             return &(it->second);
         }
-        return 0;
+        return nullptr;
     }
     const ESM::Cell *Store<ESM::Cell>::searchOrCreate(int x, int y)
     {
@@ -628,7 +628,7 @@ namespace MWWorld
     const ESM::Cell *Store<ESM::Cell>::find(const std::string &id) const
     {
         const ESM::Cell *ptr = search(id);
-        if (ptr == 0)
+        if (ptr == nullptr)
         {
             const std::string msg = "Cell '" + id + "' not found";
             throw std::runtime_error(msg);
@@ -638,7 +638,7 @@ namespace MWWorld
     const ESM::Cell *Store<ESM::Cell>::find(int x, int y) const
     {
         const ESM::Cell *ptr = search(x, y);
-        if (ptr == 0)
+        if (ptr == nullptr)
         {
             const std::string msg = "Exterior at (" + std::to_string(x) + ", " + std::to_string(y) + ") not found";
             throw std::runtime_error(msg);
@@ -781,7 +781,7 @@ namespace MWWorld
         {
             if (Misc::StringUtils::ciEqual(sharedCell->mName, id))
             {
-                if (cell == 0 ||
+                if (cell == nullptr ||
                     (sharedCell->mData.mX > cell->mData.mX) ||
                     (sharedCell->mData.mX == cell->mData.mX && sharedCell->mData.mY > cell->mData.mY))
                 {
@@ -831,7 +831,7 @@ namespace MWWorld
     }
     ESM::Cell *Store<ESM::Cell>::insert(const ESM::Cell &cell)
     {
-        if (search(cell) != 0)
+        if (search(cell) != nullptr)
         {
             const std::string cellType = (cell.isExterior()) ? "exterior" : "interior";
             throw std::runtime_error("Failed to create " + cellType + " cell");
@@ -1032,7 +1032,7 @@ namespace MWWorld
     const ESM::Attribute *Store<ESM::Attribute>::search(size_t index) const
     {
         if (index >= mStatic.size()) {
-            return 0;
+            return nullptr;
         }
         return &mStatic.at(index);
     }
@@ -1040,7 +1040,7 @@ namespace MWWorld
     const ESM::Attribute *Store<ESM::Attribute>::find(size_t index) const
     {
         const ESM::Attribute *ptr = search(index);
-        if (ptr == 0)
+        if (ptr == nullptr)
         {
             const std::string msg = "Attribute with index " + std::to_string(index) + " not found";
             throw std::runtime_error(msg);
diff --git a/apps/openmw/mwworld/store.hpp b/apps/openmw/mwworld/store.hpp
index d2406b602b..cb9f4f1e02 100644
--- a/apps/openmw/mwworld/store.hpp
+++ b/apps/openmw/mwworld/store.hpp
@@ -412,7 +412,7 @@ namespace MWWorld
         const ESM::WeaponType *search(const int id) const;
         const ESM::WeaponType *find(const int id) const;
 
-        RecordId load(ESM::ESMReader &esm) override { return RecordId(0, false); }
+        RecordId load(ESM::ESMReader &esm) override { return RecordId(nullptr, false); }
 
         ESM::WeaponType* insert(const ESM::WeaponType &weaponType);
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 20ee7625b4..224925dd55 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -302,7 +302,7 @@ namespace MWWorld
         if (mPlayer)
         {
             mPlayer->clear();
-            mPlayer->setCell(0);
+            mPlayer->setCell(nullptr);
             mPlayer->getPlayer().getRefData() = RefData();
             mPlayer->set(mStore.get<ESM::NPC>().find ("player"));
         }
@@ -1010,7 +1010,7 @@ namespace MWWorld
 
             if (!facedObject.isEmpty() && !facedObject.getClass().allowTelekinesis(facedObject)
                 && mDistanceToFacedObject > getMaxActivationDistance() && !MWBase::Environment::get().getWindowManager()->isGuiMode())
-                return 0;
+                return nullptr;
         }
         return facedObject;
     }
@@ -1180,7 +1180,7 @@ namespace MWWorld
                     haveToMove = false;
 
                     newPtr = currCell->moveTo(ptr, newCell);
-                    newPtr.getRefData().setBaseNode(0);
+                    newPtr.getRefData().setBaseNode(nullptr);
                 }
                 else if (!currCellActive && !newCellActive)
                     newPtr = currCell->moveTo(ptr, newCell);
@@ -1263,7 +1263,7 @@ namespace MWWorld
             mWorldScene->removeFromPagedRefs(ptr);
         }
 
-        if(ptr.getRefData().getBaseNode() != 0)
+        if(ptr.getRefData().getBaseNode() != nullptr)
             mWorldScene->updateObjectScale(ptr);
 
         if (mPhysics->getActor(ptr))
@@ -1311,7 +1311,7 @@ namespace MWWorld
         mRendering->pagingBlacklistObject(mStore.find(ptr.getCellRef().getRefId()), ptr);
         mWorldScene->removeFromPagedRefs(ptr);
 
-        if(ptr.getRefData().getBaseNode() != 0)
+        if(ptr.getRefData().getBaseNode() != nullptr)
         {
             const auto order = flags & MWBase::RotationFlag_inverseOrder
                 ? RotationOrder::inverse : RotationOrder::direct;
@@ -1396,7 +1396,7 @@ namespace MWWorld
 
     void World::rotateWorldObject (const Ptr& ptr, osg::Quat rotate)
     {
-        if(ptr.getRefData().getBaseNode() != 0)
+        if(ptr.getRefData().getBaseNode() != nullptr)
         {
             mRendering->pagingBlacklistObject(mStore.find(ptr.getCellRef().getRefId()), ptr);
             mWorldScene->removeFromPagedRefs(ptr);
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 41ab9cf2ca..1fc5ebc20d 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -275,7 +275,7 @@ namespace MWWorld
             char getGlobalVariableType (const std::string& name) const override;
             ///< Return ' ', if there is no global variable with this name.
 
-            std::string getCellName (const MWWorld::CellStore *cell = 0) const override;
+            std::string getCellName (const MWWorld::CellStore *cell = nullptr) const override;
             ///< Return name of the cell.
             ///
             /// \note If cell==0, the cell the player is currently in will be used instead to
diff --git a/apps/wizard/mainwizard.hpp b/apps/wizard/mainwizard.hpp
index 8d9623baa1..4c221635ef 100644
--- a/apps/wizard/mainwizard.hpp
+++ b/apps/wizard/mainwizard.hpp
@@ -41,7 +41,7 @@ namespace Wizard
             Page_Conclusion
         };
 
-        MainWizard(QWidget *parent = 0);
+        MainWizard(QWidget *parent = nullptr);
         ~MainWizard();
 
         bool findFiles(const QString &name, const QString &path);
diff --git a/apps/wizard/unshield/unshieldworker.hpp b/apps/wizard/unshield/unshieldworker.hpp
index 3f922ad78a..2553d1bef8 100644
--- a/apps/wizard/unshield/unshieldworker.hpp
+++ b/apps/wizard/unshield/unshieldworker.hpp
@@ -26,7 +26,7 @@ namespace Wizard
         Q_OBJECT
 
     public:
-        UnshieldWorker(QObject *parent = 0);
+        UnshieldWorker(QObject *parent = nullptr);
         ~UnshieldWorker();
 
         void stopWorker();
diff --git a/apps/wizard/utils/componentlistwidget.hpp b/apps/wizard/utils/componentlistwidget.hpp
index 23965f8a6b..be15ea49f7 100644
--- a/apps/wizard/utils/componentlistwidget.hpp
+++ b/apps/wizard/utils/componentlistwidget.hpp
@@ -10,7 +10,7 @@ class ComponentListWidget : public QListWidget
     Q_PROPERTY(QStringList mCheckedItems READ checkedItems)
 
 public:
-    ComponentListWidget(QWidget *parent = 0);
+    ComponentListWidget(QWidget *parent = nullptr);
 
     QStringList mCheckedItems;
     QStringList checkedItems();
diff --git a/components/compiler/context.hpp b/components/compiler/context.hpp
index 2d6af0e451..399e8125bb 100644
--- a/components/compiler/context.hpp
+++ b/components/compiler/context.hpp
@@ -13,14 +13,14 @@ namespace Compiler
 
         public:
 
-            Context() : mExtensions (0) {}
+            Context() : mExtensions (nullptr) {}
 
             virtual ~Context() = default;
 
             virtual bool canDeclareLocals() const = 0;
             ///< Is the compiler allowed to declare local variables?
 
-            void setExtensions (const Extensions *extensions = 0)
+            void setExtensions (const Extensions *extensions = nullptr)
             {
                 mExtensions = extensions;
             }
diff --git a/components/contentselector/model/contentmodel.cpp b/components/contentselector/model/contentmodel.cpp
index 86208d7af6..e51c1809a9 100644
--- a/components/contentselector/model/contentmodel.cpp
+++ b/components/contentselector/model/contentmodel.cpp
@@ -53,7 +53,7 @@ const ContentSelectorModel::EsmFile *ContentSelectorModel::ContentModel::item(in
     if (row >= 0 && row < mFiles.size())
         return mFiles.at(row);
 
-    return 0;
+    return nullptr;
 }
 
 ContentSelectorModel::EsmFile *ContentSelectorModel::ContentModel::item(int row)
@@ -61,7 +61,7 @@ ContentSelectorModel::EsmFile *ContentSelectorModel::ContentModel::item(int row)
     if (row >= 0 && row < mFiles.count())
         return mFiles.at(row);
 
-    return 0;
+    return nullptr;
 }
 const ContentSelectorModel::EsmFile *ContentSelectorModel::ContentModel::item(const QString &name) const
 {
@@ -75,7 +75,7 @@ const ContentSelectorModel::EsmFile *ContentSelectorModel::ContentModel::item(co
         if (name.compare(file->fileProperty (fp).toString(), Qt::CaseInsensitive) == 0)
             return file;
     }
-    return 0;
+    return nullptr;
 }
 
 QModelIndex ContentSelectorModel::ContentModel::indexFromItem(const EsmFile *item) const
diff --git a/components/contentselector/model/esmfile.hpp b/components/contentselector/model/esmfile.hpp
index 614eee2987..66863d7c61 100644
--- a/components/contentselector/model/esmfile.hpp
+++ b/components/contentselector/model/esmfile.hpp
@@ -28,7 +28,7 @@ namespace ContentSelectorModel
             FileProperty_GameFile       = 6
         };
 
-        EsmFile(QString fileName = QString(), ModelItem *parent = 0);
+        EsmFile(QString fileName = QString(), ModelItem *parent = nullptr);
      //   EsmFile(const EsmFile &);
 
         ~EsmFile()
diff --git a/components/contentselector/model/modelitem.hpp b/components/contentselector/model/modelitem.hpp
index e4ea7acc6a..a860b1891a 100644
--- a/components/contentselector/model/modelitem.hpp
+++ b/components/contentselector/model/modelitem.hpp
@@ -11,7 +11,7 @@ namespace ContentSelectorModel
         Q_OBJECT
 
     public:
-        ModelItem(ModelItem *parent = 0);
+        ModelItem(ModelItem *parent = nullptr);
         //ModelItem(const ModelItem *parent = 0);
 
         ~ModelItem();
diff --git a/components/contentselector/view/combobox.cpp b/components/contentselector/view/combobox.cpp
index 1ef9f9bd75..742e236b30 100644
--- a/components/contentselector/view/combobox.cpp
+++ b/components/contentselector/view/combobox.cpp
@@ -9,7 +9,7 @@ ContentSelectorView::ComboBox::ComboBox(QWidget *parent) :
     mValidator = new QRegExpValidator(QRegExp("^[a-zA-Z0-9_]*$"), this); // Alpha-numeric + underscore
     setValidator(mValidator);
     setEditable(true);
-    setCompleter(0);
+    setCompleter(nullptr);
     setEnabled (true);
 
     setInsertPolicy(QComboBox::NoInsert);
diff --git a/components/contentselector/view/combobox.hpp b/components/contentselector/view/combobox.hpp
index c57a5f1169..9af3c83af8 100644
--- a/components/contentselector/view/combobox.hpp
+++ b/components/contentselector/view/combobox.hpp
@@ -14,7 +14,7 @@ namespace ContentSelectorView
         Q_OBJECT
 
     public:
-        explicit ComboBox (QWidget *parent = 0);
+        explicit ComboBox (QWidget *parent = nullptr);
 
         void setPlaceholderText(const QString &text);
 
diff --git a/components/contentselector/view/contentselector.hpp b/components/contentselector/view/contentselector.hpp
index f1058d510f..1b50f1e5e8 100644
--- a/components/contentselector/view/contentselector.hpp
+++ b/components/contentselector/view/contentselector.hpp
@@ -23,7 +23,7 @@ namespace ContentSelectorView
 
     public:
 
-        explicit ContentSelector(QWidget *parent = 0);
+        explicit ContentSelector(QWidget *parent = nullptr);
 
         QString currentFile() const;
 
diff --git a/components/crashcatcher/crashcatcher.cpp b/components/crashcatcher/crashcatcher.cpp
index 307c08d95f..4ad8565483 100644
--- a/components/crashcatcher/crashcatcher.cpp
+++ b/components/crashcatcher/crashcatcher.cpp
@@ -451,7 +451,7 @@ static void getExecPath(char **argv)
 
     if(argv[0][0] == '/')
         snprintf(argv0, sizeof(argv0), "%s", argv[0]);
-    else if (getcwd(argv0, sizeof(argv0)) != NULL)
+    else if (getcwd(argv0, sizeof(argv0)) != nullptr)
     {
         cwdlen = strlen(argv0);
         snprintf(argv0+cwdlen, sizeof(argv0)-cwdlen, "/%s", argv[0]);
diff --git a/components/detournavigator/findsmoothpath.cpp b/components/detournavigator/findsmoothpath.cpp
index 8e443def98..a13b83abd8 100644
--- a/components/detournavigator/findsmoothpath.cpp
+++ b/components/detournavigator/findsmoothpath.cpp
@@ -58,8 +58,8 @@ namespace DetourNavigator
             return path;
 
         // Get connected polygons
-        const dtMeshTile* tile = 0;
-        const dtPoly* poly = 0;
+        const dtMeshTile* tile = nullptr;
+        const dtPoly* poly = nullptr;
         if (dtStatusFailed(navQuery.getAttachedNavMesh()->getTileAndPolyByRef(path[0], &tile, &poly)))
             return path;
 
diff --git a/components/detournavigator/findsmoothpath.hpp b/components/detournavigator/findsmoothpath.hpp
index dcdddce8a6..a351f8279c 100644
--- a/components/detournavigator/findsmoothpath.hpp
+++ b/components/detournavigator/findsmoothpath.hpp
@@ -158,10 +158,10 @@ namespace DetourNavigator
     {
         // Iterate over the path to find smooth path on the detail mesh surface.
         osg::Vec3f iterPos;
-        navMeshQuery.closestPointOnPoly(polygonPath.front(), start.ptr(), iterPos.ptr(), 0);
+        navMeshQuery.closestPointOnPoly(polygonPath.front(), start.ptr(), iterPos.ptr(), nullptr);
 
         osg::Vec3f targetPos;
-        navMeshQuery.closestPointOnPoly(polygonPath.back(), end.ptr(), targetPos.ptr(), 0);
+        navMeshQuery.closestPointOnPoly(polygonPath.back(), end.ptr(), targetPos.ptr(), nullptr);
 
         const float SLOP = 0.01f;
 
diff --git a/components/esm/loadcell.hpp b/components/esm/loadcell.hpp
index 132c869ad5..d06b509c5a 100644
--- a/components/esm/loadcell.hpp
+++ b/components/esm/loadcell.hpp
@@ -185,7 +185,7 @@ struct Cell
                          CellRef &ref, 
                          bool &isDeleted, 
                          bool ignoreMoves = false, 
-                         MovedCellRef *mref = 0);
+                         MovedCellRef *mref = nullptr);
 
   /* This fetches an MVRF record, which is used to track moved references.
    * Since they are comparably rare, we use a separate method for this.
diff --git a/components/esm/variant.cpp b/components/esm/variant.cpp
index c65eed5e09..6ff31dc442 100644
--- a/components/esm/variant.cpp
+++ b/components/esm/variant.cpp
@@ -16,11 +16,11 @@ namespace
     const uint32_t STTV = ESM::FourCC<'S','T','T','V'>::value;
 }
 
-ESM::Variant::Variant() : mType (VT_None), mData (0) {}
+ESM::Variant::Variant() : mType (VT_None), mData (nullptr) {}
 
 ESM::Variant::Variant(const std::string &value)
 {
-    mData = 0;
+    mData = nullptr;
     mType = VT_None;
     setType(VT_String);
     setString(value);
@@ -28,7 +28,7 @@ ESM::Variant::Variant(const std::string &value)
 
 ESM::Variant::Variant(int value)
 {
-    mData = 0;
+    mData = nullptr;
     mType = VT_None;
     setType(VT_Long);
     setInteger(value);
@@ -36,7 +36,7 @@ ESM::Variant::Variant(int value)
 
 ESM::Variant::Variant(float value)
 {
-    mData = 0;
+    mData = nullptr;
     mType = VT_None;
     setType(VT_Float);
     setFloat(value);
@@ -51,7 +51,7 @@ ESM::Variant& ESM::Variant::operator= (const Variant& variant)
 {
     if (&variant!=this)
     {
-        VariantDataBase *newData = variant.mData ? variant.mData->clone() : 0;
+        VariantDataBase *newData = variant.mData ? variant.mData->clone() : nullptr;
 
         delete mData;
 
@@ -63,7 +63,7 @@ ESM::Variant& ESM::Variant::operator= (const Variant& variant)
 }
 
 ESM::Variant::Variant (const Variant& variant)
-: mType (variant.mType), mData (variant.mData ? variant.mData->clone() : 0)
+: mType (variant.mType), mData (variant.mData ? variant.mData->clone() : nullptr)
 {}
 
 ESM::VarType ESM::Variant::getType() const
@@ -254,7 +254,7 @@ void ESM::Variant::setType (VarType type)
 {
     if (type!=mType)
     {
-        VariantDataBase *newData = 0;
+        VariantDataBase *newData = nullptr;
 
         switch (type)
         {
diff --git a/components/esm/variantimp.hpp b/components/esm/variantimp.hpp
index e7ac722b1e..c1203ddf86 100644
--- a/components/esm/variantimp.hpp
+++ b/components/esm/variantimp.hpp
@@ -71,7 +71,7 @@ namespace ESM
 
         public:
 
-            VariantStringData (const VariantDataBase *data = 0);
+            VariantStringData (const VariantDataBase *data = nullptr);
             ///< Calling the constructor with an incompatible data type will result in a silent
             /// default initialisation.
 
@@ -103,7 +103,7 @@ namespace ESM
 
         public:
 
-            VariantIntegerData (const VariantDataBase *data = 0);
+            VariantIntegerData (const VariantDataBase *data = nullptr);
             ///< Calling the constructor with an incompatible data type will result in a silent
             /// default initialisation.
 
@@ -142,7 +142,7 @@ namespace ESM
 
         public:
 
-            VariantFloatData (const VariantDataBase *data = 0);
+            VariantFloatData (const VariantDataBase *data = nullptr);
             ///< Calling the constructor with an incompatible data type will result in a silent
             /// default initialisation.
 
diff --git a/components/esmterrain/storage.cpp b/components/esmterrain/storage.cpp
index cf27b7128d..4d3f3c3059 100644
--- a/components/esmterrain/storage.cpp
+++ b/components/esmterrain/storage.cpp
@@ -71,7 +71,7 @@ namespace ESMTerrain
         int endColumn = startColumn + size * (ESM::Land::LAND_SIZE-1) + 1;
 
         osg::ref_ptr<const LandObject> land = getLand (cellX, cellY);
-        const ESM::Land::LandData* data = land ? land->getData(ESM::Land::DATA_VHGT) : 0;
+        const ESM::Land::LandData* data = land ? land->getData(ESM::Land::DATA_VHGT) : nullptr;
         if (data)
         {
             min = std::numeric_limits<float>::max();
@@ -119,7 +119,7 @@ namespace ESMTerrain
         }
 
         const LandObject* land = getLand(cellX, cellY, cache);
-        const ESM::Land::LandData* data = land ? land->getData(ESM::Land::DATA_VNML) : 0;
+        const ESM::Land::LandData* data = land ? land->getData(ESM::Land::DATA_VNML) : nullptr;
         if (data)
         {
             normal.x() = data->mNormals[col*ESM::Land::LAND_SIZE*3+row*3];
@@ -156,7 +156,7 @@ namespace ESMTerrain
         }
 
         const LandObject* land = getLand(cellX, cellY, cache);
-        const ESM::Land::LandData* data = land ? land->getData(ESM::Land::DATA_VCLR) : 0;
+        const ESM::Land::LandData* data = land ? land->getData(ESM::Land::DATA_VCLR) : nullptr;
         if (data)
         {
             color.r() = data->mColours[col*ESM::Land::LAND_SIZE*3+row*3];
@@ -207,9 +207,9 @@ namespace ESMTerrain
             for (int cellX = startCellX; cellX < startCellX + std::ceil(size); ++cellX)
             {
                 const LandObject* land = getLand(cellX, cellY, cache);
-                const ESM::Land::LandData *heightData = 0;
-                const ESM::Land::LandData *normalData = 0;
-                const ESM::Land::LandData *colourData = 0;
+                const ESM::Land::LandData *heightData = nullptr;
+                const ESM::Land::LandData *normalData = nullptr;
+                const ESM::Land::LandData *colourData = nullptr;
                 if (land)
                 {
                     heightData = land->getData(ESM::Land::DATA_VHGT);
@@ -341,7 +341,7 @@ namespace ESMTerrain
 
         const LandObject* land = getLand(cellX, cellY, cache);
 
-        const ESM::Land::LandData *data = land ? land->getData(ESM::Land::DATA_VTEX) : 0;
+        const ESM::Land::LandData *data = land ? land->getData(ESM::Land::DATA_VTEX) : nullptr;
         if (data)
         {
             int tex = data->mTextures[y * ESM::Land::LAND_TEXTURE_SIZE + x];
diff --git a/components/files/constrainedfilestream.cpp b/components/files/constrainedfilestream.cpp
index d2802218f0..baab1b081f 100644
--- a/components/files/constrainedfilestream.cpp
+++ b/components/files/constrainedfilestream.cpp
@@ -32,7 +32,7 @@ namespace Files
             if (start != 0)
                 mFile.seek(start);
 
-            setg(0,0,0);
+            setg(nullptr,nullptr,nullptr);
 
             mOrigin = start;
         }
@@ -81,7 +81,7 @@ namespace Files
             mFile.seek(mOrigin+newPos);
 
             // Clear read pointers so underflow() gets called on the next read attempt.
-            setg(0, 0, 0);
+            setg(nullptr, nullptr, nullptr);
 
             return newPos;
         }
@@ -97,7 +97,7 @@ namespace Files
             mFile.seek(mOrigin + pos);
 
             // Clear read pointers so underflow() gets called on the next read attempt.
-            setg(0, 0, 0);
+            setg(nullptr, nullptr, nullptr);
             return pos;
         }
 
diff --git a/components/interpreter/runtime.cpp b/components/interpreter/runtime.cpp
index a90bda94bc..35ad93a8a6 100644
--- a/components/interpreter/runtime.cpp
+++ b/components/interpreter/runtime.cpp
@@ -6,7 +6,7 @@
 
 namespace Interpreter
 {
-    Runtime::Runtime() : mContext (0), mCode (0), mCodeSize(0), mPC (0) {}
+    Runtime::Runtime() : mContext (nullptr), mCode (nullptr), mCodeSize(0), mPC (0) {}
 
     int Runtime::getPC() const
     {
@@ -65,8 +65,8 @@ namespace Interpreter
 
     void Runtime::clear()
     {
-        mContext = 0;
-        mCode = 0;
+        mContext = nullptr;
+        mCode = nullptr;
         mCodeSize = 0;
         mStack.clear();
     }
diff --git a/components/myguiplatform/myguirendermanager.cpp b/components/myguiplatform/myguirendermanager.cpp
index bba7df702b..dc771f11f2 100644
--- a/components/myguiplatform/myguirendermanager.cpp
+++ b/components/myguiplatform/myguirendermanager.cpp
@@ -127,7 +127,7 @@ public:
             if(texture)
                 state->applyTextureAttribute(0, texture);
 
-            osg::GLBufferObject* bufferobject = state->isVertexBufferObjectSupported() ? vbo->getOrCreateGLBufferObject(state->getContextID()) : 0;
+            osg::GLBufferObject* bufferobject = state->isVertexBufferObjectSupported() ? vbo->getOrCreateGLBufferObject(state->getContextID()) : nullptr;
             if (bufferobject)
             {
                 state->bindVertexBufferObject(bufferobject);
diff --git a/components/nifosg/particle.cpp b/components/nifosg/particle.cpp
index 2cb0ffc629..e2e1f92cf3 100644
--- a/components/nifosg/particle.cpp
+++ b/components/nifosg/particle.cpp
@@ -344,7 +344,7 @@ void Emitter::emitParticles(double dt)
 
     for (int i=0; i<n; ++i)
     {
-        osgParticle::Particle* P = getParticleSystem()->createParticle(0);
+        osgParticle::Particle* P = getParticleSystem()->createParticle(nullptr);
         if (P)
         {
             mPlacer->place(P);
diff --git a/components/resource/imagemanager.cpp b/components/resource/imagemanager.cpp
index ff6fb04a65..dd34ed1a1f 100644
--- a/components/resource/imagemanager.cpp
+++ b/components/resource/imagemanager.cpp
@@ -151,7 +151,7 @@ namespace Resource
             image->setFileName(normalized);
             if (!checkSupported(image, filename))
             {
-                static bool uncompress = (getenv("OPENMW_DECOMPRESS_TEXTURES") != 0);
+                static bool uncompress = (getenv("OPENMW_DECOMPRESS_TEXTURES") != nullptr);
                 if (!uncompress)
                 {
                     Log(Debug::Error) << "Error loading " << filename << ": no S3TC texture compression support installed";
diff --git a/components/resource/objectcache.hpp b/components/resource/objectcache.hpp
index 6e309a7f77..5c4b511f0a 100644
--- a/components/resource/objectcache.hpp
+++ b/components/resource/objectcache.hpp
@@ -119,7 +119,7 @@ class GenericObjectCache : public osg::Referenced
             typename ObjectCacheMap::iterator itr = _objectCache.find(key);
             if (itr!=_objectCache.end())
                 return itr->second.first;
-            else return 0;
+            else return nullptr;
         }
 
         /** Check if an object is in the cache, and if it is, update its usage time stamp. */
diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 673e01f33c..2ebce241d5 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -111,11 +111,11 @@ namespace SceneUtil
     {
     public:
         CollectLightCallback()
-            : mLightManager(0) { }
+            : mLightManager(nullptr) { }
 
         CollectLightCallback(const CollectLightCallback& copy, const osg::CopyOp& copyop)
             : osg::NodeCallback(copy, copyop)
-            , mLightManager(0) { }
+            , mLightManager(nullptr) { }
 
         META_Object(SceneUtil, SceneUtil::CollectLightCallback)
 
diff --git a/components/sdlutil/sdlcursormanager.cpp b/components/sdlutil/sdlcursormanager.cpp
index 82854cb2f8..56225868e3 100644
--- a/components/sdlutil/sdlcursormanager.cpp
+++ b/components/sdlutil/sdlcursormanager.cpp
@@ -50,7 +50,7 @@ namespace CursorDecompression
                 traits->alpha = 8;
                 traits->windowDecoration = false;
                 traits->doubleBuffer = false;
-                traits->sharedContext = 0;
+                traits->sharedContext = nullptr;
                 traits->pbuffer = true;
 
                 osg::GraphicsContext::ScreenIdentifier si;
@@ -267,7 +267,7 @@ namespace SDLUtil
         if (mCursorMap.find(name) != mCursorMap.end())
             return;
 
-        static bool forceSoftwareDecompression = (getenv("OPENMW_DECOMPRESS_TEXTURES") != 0);
+        static bool forceSoftwareDecompression = (getenv("OPENMW_DECOMPRESS_TEXTURES") != nullptr);
 
         SurfaceUniquePtr (*decompressionFunction)(osg::ref_ptr<osg::Image>, float);
         if (forceSoftwareDecompression || CursorDecompression::DXTCSupported) {
diff --git a/components/sdlutil/sdlgraphicswindow.cpp b/components/sdlutil/sdlgraphicswindow.cpp
index 0a19517001..ad7ecd9ae3 100644
--- a/components/sdlutil/sdlgraphicswindow.cpp
+++ b/components/sdlutil/sdlgraphicswindow.cpp
@@ -11,8 +11,8 @@ GraphicsWindowSDL2::~GraphicsWindowSDL2()
 }
 
 GraphicsWindowSDL2::GraphicsWindowSDL2(osg::GraphicsContext::Traits *traits)
-    : mWindow(0)
-    , mContext(0)
+    : mWindow(nullptr)
+    , mContext(nullptr)
     , mValid(false)
     , mRealized(false)
     , mOwnsWindow(false)
@@ -79,7 +79,7 @@ void GraphicsWindowSDL2::init()
     WindowData *inheritedWindowData = dynamic_cast<WindowData*>(_traits->inheritedWindowData.get());
     mWindow = inheritedWindowData ? inheritedWindowData->mWindow : nullptr;
 
-    mOwnsWindow = (mWindow == 0);
+    mOwnsWindow = (mWindow == nullptr);
     if(mOwnsWindow)
     {
         OSG_FATAL<<"Error: No SDL window provided."<<std::endl;
diff --git a/components/sdlutil/sdlgraphicswindow.hpp b/components/sdlutil/sdlgraphicswindow.hpp
index 01a97e7545..559deda675 100644
--- a/components/sdlutil/sdlgraphicswindow.hpp
+++ b/components/sdlutil/sdlgraphicswindow.hpp
@@ -24,7 +24,7 @@ class GraphicsWindowSDL2 : public osgViewer::GraphicsWindow
 public:
     GraphicsWindowSDL2(osg::GraphicsContext::Traits *traits);
 
-    bool isSameKindAs(const Object* object) const override { return dynamic_cast<const GraphicsWindowSDL2*>(object)!=0; }
+    bool isSameKindAs(const Object* object) const override { return dynamic_cast<const GraphicsWindowSDL2*>(object)!=nullptr; }
     const char* libraryName() const override { return "osgViewer"; }
     const char* className() const override { return "GraphicsWindowSDL2"; }
 
diff --git a/components/terrain/quadtreenode.cpp b/components/terrain/quadtreenode.cpp
index 7baea45c82..c113a629c5 100644
--- a/components/terrain/quadtreenode.cpp
+++ b/components/terrain/quadtreenode.cpp
@@ -63,7 +63,7 @@ QuadTreeNode::QuadTreeNode(QuadTreeNode* parent, ChildDirection direction, float
     , mCenter(center)
 {
     for (unsigned int i=0; i<4; ++i)
-        mNeighbours[i] = 0;
+        mNeighbours[i] = nullptr;
 }
 
 QuadTreeNode::~QuadTreeNode()
diff --git a/components/widgets/box.cpp b/components/widgets/box.cpp
index 1db1933202..23a108ee92 100644
--- a/components/widgets/box.cpp
+++ b/components/widgets/box.cpp
@@ -8,7 +8,7 @@ namespace Gui
     void AutoSizedWidget::notifySizeChange (MyGUI::Widget* w)
     {
         MyGUI::Widget * parent = w->getParent();
-        if (parent != 0)
+        if (parent != nullptr)
         {
             if (mExpandDirection.isLeft())
             {
@@ -17,7 +17,7 @@ namespace Gui
             }
             w->setSize(getRequestedSize ());
 
-            while (parent != 0)
+            while (parent != nullptr)
             {
                 Box * b = dynamic_cast<Box*>(parent);
                 if (b)
@@ -280,7 +280,7 @@ namespace Gui
     void HBox::initialiseOverride()
     {
         Base::initialiseOverride();
-        MyGUI::Widget* client = 0;
+        MyGUI::Widget* client = nullptr;
         assignWidget(client, "Client");
         setWidgetClient(client);
     }
@@ -435,7 +435,7 @@ namespace Gui
     void VBox::initialiseOverride()
     {
         Base::initialiseOverride();
-        MyGUI::Widget* client = 0;
+        MyGUI::Widget* client = nullptr;
         assignWidget(client, "Client");
         setWidgetClient(client);
     }
diff --git a/components/widgets/list.cpp b/components/widgets/list.cpp
index bf24acf7e1..73ca94929f 100644
--- a/components/widgets/list.cpp
+++ b/components/widgets/list.cpp
@@ -7,9 +7,9 @@
 namespace Gui
 {
 
-    MWList::MWList() :
-        mScrollView(0)
-        ,mClient(0)
+    MWList::MWList()
+        : mScrollView(nullptr)
+        , mClient(nullptr)
         , mItemHeight(0)
     {
     }
@@ -19,7 +19,7 @@ namespace Gui
         Base::initialiseOverride();
 
         assignWidget(mClient, "Client");
-        if (mClient == 0)
+        if (mClient == nullptr)
             mClient = this;
 
         mScrollView = mClient->createWidgetReal<MyGUI::ScrollView>(
diff --git a/extern/osg-ffmpeg-videoplayer/audiodecoder.cpp b/extern/osg-ffmpeg-videoplayer/audiodecoder.cpp
index 0c314ec7da..3373826793 100644
--- a/extern/osg-ffmpeg-videoplayer/audiodecoder.cpp
+++ b/extern/osg-ffmpeg-videoplayer/audiodecoder.cpp
@@ -30,7 +30,7 @@ namespace Video
 struct AudioResampler
 {
     AudioResampler()
-        : mSwr(NULL)
+        : mSwr(nullptr)
     {
     }
 
@@ -51,8 +51,8 @@ MovieAudioDecoder::MovieAudioDecoder(VideoState* videoState)
     , mFramePos(0)
     , mFrameSize(0)
     , mAudioClock(0.0)
-    , mDataBuf(NULL)
-    , mFrameData(NULL)
+    , mDataBuf(nullptr)
+    , mFrameData(nullptr)
     , mDataBufLen(0)
     , mFrame(av_frame_alloc())
     , mGetNextPacket(true)
@@ -125,7 +125,7 @@ void MovieAudioDecoder::setupFormat()
                           inputSampleFormat,
                           inputSampleRate,
                           0,                             // logging level offset
-                          NULL);                         // log context
+                          nullptr);                      // log context
         if(!mAudioResampler->mSwr)
             fail(std::string("Couldn't allocate SwrContext"));
         if(swr_init(mAudioResampler->mSwr) < 0)
diff --git a/extern/osg-ffmpeg-videoplayer/videoplayer.cpp b/extern/osg-ffmpeg-videoplayer/videoplayer.cpp
index c6544de9c6..28ac3b36c2 100644
--- a/extern/osg-ffmpeg-videoplayer/videoplayer.cpp
+++ b/extern/osg-ffmpeg-videoplayer/videoplayer.cpp
@@ -11,7 +11,7 @@ namespace Video
 {
 
 VideoPlayer::VideoPlayer()
-    : mState(NULL)
+    : mState(nullptr)
 {
 
 }
@@ -87,13 +87,13 @@ void VideoPlayer::close()
         mState->deinit();
 
         delete mState;
-        mState = NULL;
+        mState = nullptr;
     }
 }
 
 bool VideoPlayer::hasAudioStream()
 {
-    return mState && mState->audio_st != NULL;
+    return mState && mState->audio_st != nullptr;
 }
 
 void VideoPlayer::play()
diff --git a/extern/osg-ffmpeg-videoplayer/videostate.cpp b/extern/osg-ffmpeg-videoplayer/videostate.cpp
index c176fe0f29..5858d985a8 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.cpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.cpp
@@ -42,14 +42,14 @@ namespace Video
 {
 
 VideoState::VideoState()
-    : mAudioFactory(NULL)
-    , format_ctx(NULL)
-    , video_ctx(NULL)
-    , audio_ctx(NULL)
+    : mAudioFactory(nullptr)
+    , format_ctx(nullptr)
+    , video_ctx(nullptr)
+    , audio_ctx(nullptr)
     , av_sync_type(AV_SYNC_DEFAULT)
-    , audio_st(NULL)
-    , video_st(NULL), frame_last_pts(0.0)
-    , video_clock(0.0), sws_context(NULL), rgbaFrame(NULL), pictq_size(0)
+    , audio_st(nullptr)
+    , video_st(nullptr), frame_last_pts(0.0)
+    , video_clock(0.0), sws_context(nullptr), rgbaFrame(nullptr), pictq_size(0)
     , pictq_rindex(0), pictq_windex(0)
     , mSeekRequested(false)
     , mSeekPos(0)
@@ -86,7 +86,7 @@ void PacketQueue::put(AVPacket *pkt)
         throw std::runtime_error("Failed to duplicate packet");
 
     pkt1->pkt = *pkt;
-    pkt1->next = NULL;
+    pkt1->next = nullptr;
 
     this->mutex.lock ();
 
@@ -112,7 +112,7 @@ int PacketQueue::get(AVPacket *pkt, VideoState *is)
         {
             this->first_pkt = pkt1->next;
             if(!this->first_pkt)
-                this->last_pkt = NULL;
+                this->last_pkt = nullptr;
             this->nb_packets--;
             this->size -= pkt1->pkt.size;
 
@@ -141,15 +141,15 @@ void PacketQueue::clear()
     AVPacketList *pkt, *pkt1;
 
     this->mutex.lock();
-    for(pkt = this->first_pkt; pkt != NULL; pkt = pkt1)
+    for(pkt = this->first_pkt; pkt != nullptr; pkt = pkt1)
     {
         pkt1 = pkt->next;
         if (pkt->pkt.data != flush_pkt.data)
             av_packet_unref(&pkt->pkt);
         av_freep(&pkt);
     }
-    this->last_pkt = NULL;
-    this->first_pkt = NULL;
+    this->last_pkt = nullptr;
+    this->first_pkt = nullptr;
     this->nb_packets = 0;
     this->size = 0;
     this->mutex.unlock ();
@@ -296,14 +296,14 @@ int VideoState::queue_picture(AVFrame *pFrame, double pts)
     // Convert the image into RGBA format
     // TODO: we could do this in a pixel shader instead, if the source format
     // matches a commonly used format (ie YUV420P)
-    if(this->sws_context == NULL)
+    if(this->sws_context == nullptr)
     {
         int w = this->video_ctx->width;
         int h = this->video_ctx->height;
         this->sws_context = sws_getContext(w, h, this->video_ctx->pix_fmt,
                                            w, h, AV_PIX_FMT_RGBA, SWS_BICUBIC,
-                                           NULL, NULL, NULL);
-        if(this->sws_context == NULL)
+                                           nullptr, nullptr, nullptr);
+        if(this->sws_context == nullptr)
             throw std::runtime_error("Cannot initialize the conversion context!\n");
     }
 
@@ -587,7 +587,7 @@ int VideoState::stream_open(int stream_index, AVFormatContext *pFormatCtx)
         av_codec_set_pkt_timebase(this->audio_ctx, pFormatCtx->streams[stream_index]->time_base);
 #endif
 
-        if (avcodec_open2(this->audio_ctx, codec, NULL) < 0)
+        if (avcodec_open2(this->audio_ctx, codec, nullptr) < 0)
         {
             fprintf(stderr, "Unsupported codec!\n");
             return -1;
@@ -597,7 +597,7 @@ int VideoState::stream_open(int stream_index, AVFormatContext *pFormatCtx)
         {
             std::cerr << "No audio factory registered, can not play audio stream" << std::endl;
             avcodec_free_context(&this->audio_ctx);
-            this->audio_st = NULL;
+            this->audio_st = nullptr;
             return -1;
         }
 
@@ -606,7 +606,7 @@ int VideoState::stream_open(int stream_index, AVFormatContext *pFormatCtx)
         {
             std::cerr << "Failed to create audio decoder, can not play audio stream" << std::endl;
             avcodec_free_context(&this->audio_ctx);
-            this->audio_st = NULL;
+            this->audio_st = nullptr;
             return -1;
         }
         mAudioDecoder->setupFormat();
@@ -624,7 +624,7 @@ int VideoState::stream_open(int stream_index, AVFormatContext *pFormatCtx)
         av_codec_set_pkt_timebase(this->video_ctx, pFormatCtx->streams[stream_index]->time_base);
 #endif
 
-        if (avcodec_open2(this->video_ctx, codec, NULL) < 0)
+        if (avcodec_open2(this->video_ctx, codec, nullptr) < 0)
         {
             fprintf(stderr, "Unsupported codec!\n");
             return -1;
@@ -653,7 +653,7 @@ void VideoState::init(std::shared_ptr<std::istream> inputstream, const std::stri
     if(!this->stream.get())
         throw std::runtime_error("Failed to open video resource");
 
-    AVIOContext *ioCtx = avio_alloc_context(NULL, 0, 0, this, istream_read, istream_write, istream_seek);
+    AVIOContext *ioCtx = avio_alloc_context(nullptr, 0, 0, this, istream_read, istream_write, istream_seek);
     if(!ioCtx) throw std::runtime_error("Failed to allocate AVIOContext");
 
     this->format_ctx = avformat_alloc_context();
@@ -667,27 +667,27 @@ void VideoState::init(std::shared_ptr<std::istream> inputstream, const std::stri
     ///
     /// https://trac.ffmpeg.org/ticket/1357
     ///
-    if(!this->format_ctx || avformat_open_input(&this->format_ctx, name.c_str(), NULL, NULL))
+    if(!this->format_ctx || avformat_open_input(&this->format_ctx, name.c_str(), nullptr, nullptr))
     {
-        if (this->format_ctx != NULL)
+        if (this->format_ctx != nullptr)
         {
-          if (this->format_ctx->pb != NULL)
+          if (this->format_ctx->pb != nullptr)
           {
               av_free(this->format_ctx->pb->buffer);
-              this->format_ctx->pb->buffer = NULL;
+              this->format_ctx->pb->buffer = nullptr;
 
               av_free(this->format_ctx->pb);
-              this->format_ctx->pb = NULL;
+              this->format_ctx->pb = nullptr;
           }
         }
         // "Note that a user-supplied AVFormatContext will be freed on failure."
-        this->format_ctx = NULL;
+        this->format_ctx = nullptr;
         av_free(ioCtx);
         throw std::runtime_error("Failed to open video input");
     }
 
     // Retrieve stream information
-    if(avformat_find_stream_info(this->format_ctx, NULL) < 0)
+    if(avformat_find_stream_info(this->format_ctx, nullptr) < 0)
         throw std::runtime_error("Failed to retrieve stream information");
 
     // Dump information about file onto standard error
@@ -735,16 +735,16 @@ void VideoState::deinit()
 
     if(this->audio_ctx)
         avcodec_free_context(&this->audio_ctx);
-    this->audio_st = NULL;
-    this->audio_ctx = NULL;
+    this->audio_st = nullptr;
+    this->audio_ctx = nullptr;
     if(this->video_ctx)
         avcodec_free_context(&this->video_ctx);
-    this->video_st = NULL;
-    this->video_ctx = NULL;
+    this->video_st = nullptr;
+    this->video_ctx = nullptr;
 
     if(this->sws_context)
         sws_freeContext(this->sws_context);
-    this->sws_context = NULL;
+    this->sws_context = nullptr;
 
     if(this->format_ctx)
     {
@@ -754,13 +754,13 @@ void VideoState::deinit()
         ///
         /// https://trac.ffmpeg.org/ticket/1357
         ///
-        if (this->format_ctx->pb != NULL)
+        if (this->format_ctx->pb != nullptr)
         {
             av_free(this->format_ctx->pb->buffer);
-            this->format_ctx->pb->buffer = NULL;
+            this->format_ctx->pb->buffer = nullptr;
 
             av_free(this->format_ctx->pb);
-            this->format_ctx->pb = NULL;
+            this->format_ctx->pb = nullptr;
         }
         avformat_close_input(&this->format_ctx);
     }
@@ -768,8 +768,8 @@ void VideoState::deinit()
     if (mTexture)
     {
         // reset Image separately, it's pointing to *this and there might still be outside references to mTexture
-        mTexture->setImage(NULL);
-        mTexture = NULL;
+        mTexture->setImage(nullptr);
+        mTexture = nullptr;
     }
 }
 
diff --git a/extern/osg-ffmpeg-videoplayer/videostate.hpp b/extern/osg-ffmpeg-videoplayer/videostate.hpp
index 984050cd6f..641fce04be 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.hpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.hpp
@@ -71,7 +71,7 @@ struct ExternalClock
 
 struct PacketQueue {
     PacketQueue()
-      : first_pkt(NULL), last_pkt(NULL), flushing(false), nb_packets(0), size(0)
+      : first_pkt(nullptr), last_pkt(nullptr), flushing(false), nb_packets(0), size(0)
     { }
     ~PacketQueue()
     { clear(); }

From b0e3bd6ff931dd0c68e9de622b86d59333ce3744 Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Sun, 29 Nov 2020 23:25:34 +0200
Subject: [PATCH 0036/2859] Fix crash caused by QStatusBar

---
 apps/opencs/view/world/tablebottombox.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/opencs/view/world/tablebottombox.cpp b/apps/opencs/view/world/tablebottombox.cpp
index f6b060a8f3..1b065da49e 100644
--- a/apps/opencs/view/world/tablebottombox.cpp
+++ b/apps/opencs/view/world/tablebottombox.cpp
@@ -95,7 +95,7 @@ CSVWorld::TableBottomBox::TableBottomBox (const CreatorFactoryBase& creatorFacto
 
     mStatus = new QLabel;
 
-    mStatusBar = new QStatusBar;
+    mStatusBar = new QStatusBar(this);
 
     mStatusBar->addWidget (mStatus);
 

From db9c174ca848b7d7297150ca58498019f3f5d7c0 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Thu, 26 Nov 2020 21:04:56 +0300
Subject: [PATCH 0037/2859] Make NIF particle node handling more generic

---
 components/nif/data.cpp         |  4 ++--
 components/nif/data.hpp         |  4 ++--
 components/nif/niffile.cpp      | 10 ++++++----
 components/nif/node.hpp         | 27 +++++----------------------
 components/nif/record.hpp       |  7 +++----
 components/nif/recordptr.hpp    |  6 ++----
 components/nifosg/nifloader.cpp | 12 +++++-------
 7 files changed, 25 insertions(+), 45 deletions(-)

diff --git a/components/nif/data.cpp b/components/nif/data.cpp
index 235825e4a6..415a013b3a 100644
--- a/components/nif/data.cpp
+++ b/components/nif/data.cpp
@@ -184,7 +184,7 @@ void NiLinesData::read(NIFStream *nif)
     }
 }
 
-void NiAutoNormalParticlesData::read(NIFStream *nif)
+void NiParticlesData::read(NIFStream *nif)
 {
     NiGeometryData::read(nif);
 
@@ -216,7 +216,7 @@ void NiAutoNormalParticlesData::read(NIFStream *nif)
 
 void NiRotatingParticlesData::read(NIFStream *nif)
 {
-    NiAutoNormalParticlesData::read(nif);
+    NiParticlesData::read(nif);
 
     if (nif->getVersion() <= NIFStream::generateVersion(4,2,2,0) && nif->getBoolean())
         nif->getQuaternions(rotations, vertices.size());
diff --git a/components/nif/data.hpp b/components/nif/data.hpp
index 35f329573e..908313f504 100644
--- a/components/nif/data.hpp
+++ b/components/nif/data.hpp
@@ -70,7 +70,7 @@ struct NiLinesData : public NiGeometryData
     void read(NIFStream *nif) override;
 };
 
-class NiAutoNormalParticlesData : public NiGeometryData
+class NiParticlesData : public NiGeometryData
 {
 public:
     int numParticles{0};
@@ -84,7 +84,7 @@ public:
     void read(NIFStream *nif) override;
 };
 
-class NiRotatingParticlesData : public NiAutoNormalParticlesData
+class NiRotatingParticlesData : public NiParticlesData
 {
 public:
     void read(NIFStream *nif) override;
diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index 7915908d1b..67c864f473 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -47,8 +47,9 @@ static std::map<std::string,RecordFactoryEntry> makeFactory()
     factory["NiTriShape"]                   = {&construct <NiTriShape>                  , RC_NiTriShape                 };
     factory["NiTriStrips"]                  = {&construct <NiTriStrips>                 , RC_NiTriStrips                };
     factory["NiLines"]                      = {&construct <NiLines>                     , RC_NiLines                    };
-    factory["NiRotatingParticles"]          = {&construct <NiRotatingParticles>         , RC_NiRotatingParticles        };
-    factory["NiAutoNormalParticles"]        = {&construct <NiAutoNormalParticles>       , RC_NiAutoNormalParticles      };
+    factory["NiParticles"]                  = {&construct <NiParticles>                 , RC_NiParticles                };
+    factory["NiRotatingParticles"]          = {&construct <NiParticles>                 , RC_NiParticles                };
+    factory["NiAutoNormalParticles"]        = {&construct <NiParticles>                 , RC_NiParticles                };
     factory["NiCamera"]                     = {&construct <NiCamera>                    , RC_NiCamera                   };
     factory["RootCollisionNode"]            = {&construct <NiNode>                      , RC_RootCollisionNode          };
     factory["NiTexturingProperty"]          = {&construct <NiTexturingProperty>         , RC_NiTexturingProperty        };
@@ -99,8 +100,9 @@ static std::map<std::string,RecordFactoryEntry> makeFactory()
     factory["NiSkinData"]                   = {&construct <NiSkinData>                  , RC_NiSkinData                 };
     factory["NiUVData"]                     = {&construct <NiUVData>                    , RC_NiUVData                   };
     factory["NiPosData"]                    = {&construct <NiPosData>                   , RC_NiPosData                  };
-    factory["NiRotatingParticlesData"]      = {&construct <NiRotatingParticlesData>     , RC_NiRotatingParticlesData    };
-    factory["NiAutoNormalParticlesData"]    = {&construct <NiAutoNormalParticlesData>   , RC_NiAutoNormalParticlesData  };
+    factory["NiParticlesData"]              = {&construct <NiParticlesData>             , RC_NiParticlesData            };
+    factory["NiRotatingParticlesData"]      = {&construct <NiRotatingParticlesData>     , RC_NiParticlesData            };
+    factory["NiAutoNormalParticlesData"]    = {&construct <NiParticlesData>             , RC_NiParticlesData            };
     factory["NiSequenceStreamHelper"]       = {&construct <NiSequenceStreamHelper>      , RC_NiSequenceStreamHelper     };
     factory["NiSourceTexture"]              = {&construct <NiSourceTexture>             , RC_NiSourceTexture            };
     factory["NiSkinInstance"]               = {&construct <NiSkinInstance>              , RC_NiSkinInstance             };
diff --git a/components/nif/node.hpp b/components/nif/node.hpp
index 0b958d2c25..58397bdca4 100644
--- a/components/nif/node.hpp
+++ b/components/nif/node.hpp
@@ -401,39 +401,22 @@ struct NiCamera : Node
     }
 };
 
-struct NiAutoNormalParticles : Node
+struct NiParticles : NiGeometry
 {
-    NiAutoNormalParticlesDataPtr data;
-
+    NiParticlesDataPtr data;
     void read(NIFStream *nif) override
     {
         Node::read(nif);
         data.read(nif);
-        nif->getInt(); // -1
-    }
-
-    void post(NIFFile *nif) override
-    {
-        Node::post(nif);
-        data.post(nif);
-    }
-};
-
-struct NiRotatingParticles : Node
-{
-    NiRotatingParticlesDataPtr data;
-
-    void read(NIFStream *nif) override
-    {
-        Node::read(nif);
-        data.read(nif);
-        nif->getInt(); // -1
+        skin.read(nif);
+        materialData.read(nif);
     }
 
     void post(NIFFile *nif) override
     {
         Node::post(nif);
         data.post(nif);
+        skin.post(nif);
     }
 };
 
diff --git a/components/nif/record.hpp b/components/nif/record.hpp
index c5773643a0..2217c588ee 100644
--- a/components/nif/record.hpp
+++ b/components/nif/record.hpp
@@ -44,8 +44,7 @@ enum RecordType
   RC_NiTriShape,
   RC_NiTriStrips,
   RC_NiLines,
-  RC_NiRotatingParticles,
-  RC_NiAutoNormalParticles,
+  RC_NiParticles,
   RC_NiBSParticleNode,
   RC_NiCamera,
   RC_NiTexturingProperty,
@@ -94,7 +93,7 @@ enum RecordType
   RC_NiUVData,
   RC_NiPosData,
   RC_NiRotatingParticlesData,
-  RC_NiAutoNormalParticlesData,
+  RC_NiParticlesData,
   RC_NiSequenceStreamHelper,
   RC_NiSourceTexture,
   RC_NiSkinInstance,
@@ -119,7 +118,7 @@ enum RecordType
   RC_NiFloatInterpolator,
   RC_NiPoint3Interpolator,
   RC_NiBoolInterpolator,
-  RC_NiTransformInterpolator,
+  RC_NiTransformInterpolator
 };
 
 /// Base class for all records
diff --git a/components/nif/recordptr.hpp b/components/nif/recordptr.hpp
index b40a175838..ed8f7ef6b9 100644
--- a/components/nif/recordptr.hpp
+++ b/components/nif/recordptr.hpp
@@ -138,8 +138,7 @@ class NiTriShapeData;
 class NiTriStripsData;
 class NiSkinInstance;
 class NiSourceTexture;
-class NiRotatingParticlesData;
-class NiAutoNormalParticlesData;
+class NiParticlesData;
 class NiPalette;
 struct NiParticleModifier;
 struct NiLinesData;
@@ -167,8 +166,7 @@ using NiTriStripsDataPtr = RecordPtrT<NiTriStripsData>;
 using NiLinesDataPtr = RecordPtrT<NiLinesData>;
 using NiSkinInstancePtr = RecordPtrT<NiSkinInstance>;
 using NiSourceTexturePtr = RecordPtrT<NiSourceTexture>;
-using NiRotatingParticlesDataPtr = RecordPtrT<NiRotatingParticlesData>;
-using NiAutoNormalParticlesDataPtr = RecordPtrT<NiAutoNormalParticlesData>;
+using NiParticlesDataPtr = RecordPtrT<NiParticlesData>;
 using NiPalettePtr = RecordPtrT<NiPalette>;
 using NiParticleModifierPtr = RecordPtrT<NiParticleModifier>;
 using NiBoolDataPtr = RecordPtrT<NiBoolData>;
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 4bc48637ce..0db15237ec 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -638,7 +638,7 @@ namespace NifOsg
                 }
             }
 
-            if(nifNode->recType == Nif::RC_NiAutoNormalParticles || nifNode->recType == Nif::RC_NiRotatingParticles)
+            if (nifNode->recType == Nif::RC_NiParticles)
                 handleParticleSystem(nifNode, node, composite, animflags);
 
             if (composite->getNumControllers() > 0)
@@ -946,14 +946,12 @@ namespace NifOsg
         // Load the initial state of the particle system, i.e. the initial particles and their positions, velocity and colors.
         void handleParticleInitialState(const Nif::Node* nifNode, osgParticle::ParticleSystem* partsys, const Nif::NiParticleSystemController* partctrl)
         {
-            const Nif::NiAutoNormalParticlesData *particledata = nullptr;
-            if(nifNode->recType == Nif::RC_NiAutoNormalParticles)
-                particledata = static_cast<const Nif::NiAutoNormalParticles*>(nifNode)->data.getPtr();
-            else if(nifNode->recType == Nif::RC_NiRotatingParticles)
-                particledata = static_cast<const Nif::NiRotatingParticles*>(nifNode)->data.getPtr();
-            else
+            const auto particleNode = static_cast<const Nif::NiParticles*>(nifNode);
+            if (particleNode->data.empty())
                 return;
 
+            const Nif::NiParticlesData* particledata = particleNode->data.getPtr();
+
             osg::BoundingBox box;
 
             int i=0;

From b416c52978131166259f73c0794ad80605660b22 Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Wed, 2 Dec 2020 16:01:07 +0200
Subject: [PATCH 0038/2859] Changelog additions

---
 CHANGELOG.md    | 2 ++
 CHANGELOG_PR.md | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7257e23386..f0c6dd5ee9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -67,6 +67,7 @@
     Bug #5656: Sneaking characters block hits while standing
     Bug #5661: Region sounds don't play at the right interval
     Bug #5688: Water shader broken indoors with enable indoor shadows = false
+    Bug #5703: OpenMW-CS menu system crashing on XFCE
     Feature #390: 3rd person look "over the shoulder"
     Feature #2386: Distant Statics in the form of Object Paging
     Feature #2404: Levelled List can not be placed into a container
@@ -75,6 +76,7 @@
     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 #5519: Code Patch tab in launcher
diff --git a/CHANGELOG_PR.md b/CHANGELOG_PR.md
index 0a039ec3fa..6a16b76585 100644
--- a/CHANGELOG_PR.md
+++ b/CHANGELOG_PR.md
@@ -18,6 +18,7 @@ Known Issues:
 
 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:
 - ?
@@ -34,6 +35,7 @@ Bug Fixes:
 
 Editor Bug Fixes:
 - Verifier no longer checks for alleged 'race' entries in clothing body parts (#5400)
+- Flicker and crashing on XFCE4 fixed (#5703)
 
 Miscellaneous:
 - Prevent save-game bloating by using an appropriate fog texture format (#5108)

From 6f0b90e6066bb2cbbba865958eda02803a726d75 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Wed, 2 Dec 2020 23:03:10 +0000
Subject: [PATCH 0039/2859] documented that currently underwater shadows are
 mutually exclusive to refraction scale; to be fixed in follow up issue #5709;
 documentation fixes

---
 apps/openmw/mwrender/renderingmanager.cpp        | 2 +-
 apps/openmw/mwrender/water.cpp                   | 6 ++++--
 docs/source/reference/modding/settings/water.rst | 5 ++++-
 files/shaders/water_fragment.glsl                | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 63d3743a97..217f0b73ca 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -305,7 +305,7 @@ namespace MWRender
         mTerrain->setWorkQueue(mWorkQueue.get());
 
         // water goes after terrain for correct waterculling order
-        mWater.reset(new Water(mRootNode, sceneRoot, mResourceSystem, mViewer->getIncrementalCompileOperation(), resourcePath));
+        mWater.reset(new Water(sceneRoot->getParent(0), sceneRoot, mResourceSystem, mViewer->getIncrementalCompileOperation(), resourcePath));
 
         mCamera.reset(new Camera(mViewer->getCamera()));
         if (Settings::Manager::getBool("view over shoulder", "Camera"))
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index b569f1bfab..b9018e0a27 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -235,13 +235,14 @@ public:
     Refraction()
     {
         unsigned int rttSize = Settings::Manager::getInt("rtt size", "Water");
-        setRenderOrder(osg::Camera::PRE_RENDER);
+        setRenderOrder(osg::Camera::PRE_RENDER, 1);
         setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
         setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT);
         setReferenceFrame(osg::Camera::RELATIVE_RF);
         setSmallFeatureCullingPixelSize(Settings::Manager::getInt("small feature culling pixel size", "Water"));
         setName("RefractionCamera");
         setCullCallback(new InheritViewPointCallback);
+        setComputeNearFarMode(osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR);
 
         setCullMask(Mask_Effect|Mask_Scene|Mask_Object|Mask_Static|Mask_Terrain|Mask_Actor|Mask_ParticleSystem|Mask_Sky|Mask_Sun|Mask_Player|Mask_Lighting);
         setNodeMask(Mask_RenderToTexture);
@@ -284,7 +285,8 @@ public:
 
         attach(osg::Camera::DEPTH_BUFFER, mRefractionDepthTexture);
 
-        SceneUtil::ShadowManager::disableShadowsForStateSet(getOrCreateStateSet());
+        if (Settings::Manager::getFloat("refraction scale", "Water") != 1) // TODO: to be removed with issue #5709
+            SceneUtil::ShadowManager::disableShadowsForStateSet(getOrCreateStateSet());
     }
 
     void setScene(osg::Node* scene)
diff --git a/docs/source/reference/modding/settings/water.rst b/docs/source/reference/modding/settings/water.rst
index 3581efb991..b79daacb7d 100644
--- a/docs/source/reference/modding/settings/water.rst
+++ b/docs/source/reference/modding/settings/water.rst
@@ -59,7 +59,7 @@ This setting has no effect if the shader setting is false.
 This setting can be toggled with the 'Refraction' button in the Water tab of the Video panel of the Options menu.
 
 reflection detail
---------------
+-----------------
 
 :Type:		integer
 :Range:		0, 1, 2, 3, 4
@@ -111,3 +111,6 @@ This setting only applies if water shader is on and refractions are enabled. Not
 setting if off, there will still be small refractions caused by the water waves, which however do not cause such significant
 distortion.
 
+.. warning::
+    The `refraction scale` is currently mutually exclusive to underwater shadows. Setting this to any value except 1.0
+    will cause underwater shadows to be disabled. This will be addressed in issue https://gitlab.com/OpenMW/openmw/-/issues/5709
diff --git a/files/shaders/water_fragment.glsl b/files/shaders/water_fragment.glsl
index 93ba156beb..d9b9463ad9 100644
--- a/files/shaders/water_fragment.glsl
+++ b/files/shaders/water_fragment.glsl
@@ -246,7 +246,7 @@ void main(void)
     float sunHeight = lVec.z;
     vec3 scatterColour = mix(SCATTER_COLOUR*vec3(1.0,0.4,0.0), SCATTER_COLOUR, clamp(1.0-exp(-sunHeight*SUN_EXT), 0.0, 1.0));
     vec3 lR = reflect(lVec, lNormal);
-    float lightScatter = shadow * clamp(dot(lVec,lNormal)*0.7+0.3, 0.0, 1.0) * clamp(dot(lR, vVec)*2.0-1.2, 0.0, 1.0) * SCATTER_AMOUNT * sunFade * clamp(1.0-exp(-sunHeight), 0.0, 1.0);
+    float lightScatter = clamp(dot(lVec,lNormal)*0.7+0.3, 0.0, 1.0) * clamp(dot(lR, vVec)*2.0-1.2, 0.0, 1.0) * SCATTER_AMOUNT * sunFade * clamp(1.0-exp(-sunHeight), 0.0, 1.0);
     gl_FragData[0].xyz = mix( mix(refraction,  scatterColour,  lightScatter),  reflection,  fresnel) + specular * gl_LightSource[0].specular.xyz + vec3(rainRipple.w) * 0.2;
     gl_FragData[0].w = 1.0;
 #else

From 5a4872393a77c0dc35f1f633a15143bf13e87dba Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Thu, 3 Dec 2020 12:57:57 +0100
Subject: [PATCH 0040/2859] Rework actor position reset. While solving the
 issue with invalid position being used under heavy load, I introduced a
 regression that prevented the position to be updated in case of teleport.
 Move the logic in its own function and decide in PhysicsSystem whether a
 reset is needed.

---
 apps/openmw/mwphysics/mtphysics.cpp     | 25 ++++++++++---------------
 apps/openmw/mwphysics/mtphysics.hpp     |  4 +++-
 apps/openmw/mwphysics/physicssystem.cpp | 12 +++++++++++-
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 2d4009e7d8..bdffcef44f 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -212,7 +212,7 @@ namespace MWPhysics
             thread.join();
     }
 
-    const PtrPositionList& PhysicsTaskScheduler::moveActors(int numSteps, float timeAccum, std::vector<ActorFrameData>&& actorsData, bool skipSimulation, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
+    const PtrPositionList& PhysicsTaskScheduler::moveActors(int numSteps, float timeAccum, std::vector<ActorFrameData>&& actorsData, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
     {
         // This function run in the main thread.
         // While the mSimulationMutex is held, background physics threads can't run.
@@ -263,20 +263,6 @@ namespace MWPhysics
         if (mAdvanceSimulation)
             mWorldFrameData = std::make_unique<WorldFrameData>();
 
-        // we are asked to skip the simulation (load a savegame for instance)
-        // just return the actors' reference position without applying the movements
-        if (skipSimulation)
-        {
-            mMovementResults.clear();
-            for (const auto& m : mActorsFrameData)
-            {
-                m.mActorRaw->setStandingOnPtr(nullptr);
-                m.mActorRaw->resetPosition();
-                mMovementResults[m.mPtr] = m.mActorRaw->getWorldPosition();
-            }
-            return mMovementResults;
-        }
-
         if (mNumThreads == 0)
         {
             mMovementResults.clear();
@@ -311,6 +297,15 @@ namespace MWPhysics
         return mPreviousMovementResults;
     }
 
+    const PtrPositionList& PhysicsTaskScheduler::resetSimulation()
+    {
+        std::unique_lock lock(mSimulationMutex);
+        mMovementResults.clear();
+        mPreviousMovementResults.clear();
+        mActorsFrameData.clear();
+        return mMovementResults;
+    }
+
     void PhysicsTaskScheduler::rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, btCollisionWorld::RayResultCallback& resultCallback) const
     {
         MaybeSharedLock lock(mCollisionWorldMutex, mThreadSafeBullet);
diff --git a/apps/openmw/mwphysics/mtphysics.hpp b/apps/openmw/mwphysics/mtphysics.hpp
index c061fe01da..f7a131ca26 100644
--- a/apps/openmw/mwphysics/mtphysics.hpp
+++ b/apps/openmw/mwphysics/mtphysics.hpp
@@ -32,7 +32,9 @@ namespace MWPhysics
             /// @param timeAccum accumulated time from previous run to interpolate movements
             /// @param actorsData per actor data needed to compute new positions
             /// @return new position of each actor
-            const PtrPositionList& moveActors(int numSteps, float timeAccum, std::vector<ActorFrameData>&& actorsData, bool skip, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
+            const PtrPositionList& moveActors(int numSteps, float timeAccum, std::vector<ActorFrameData>&& actorsData, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
+
+            const PtrPositionList& resetSimulation();
 
             // Thread safe wrappers
             void rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, btCollisionWorld::RayResultCallback& resultCallback) const;
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 7aa1f59141..cdbad2cddd 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -676,7 +676,17 @@ namespace MWPhysics
 
         mTimeAccum -= numSteps * mPhysicsDt;
 
-        return mTaskScheduler->moveActors(numSteps, mTimeAccum, prepareFrameData(numSteps), skipSimulation, frameStart, frameNumber, stats);
+        if (skipSimulation)
+        {
+            for (auto& [_, actor] : mActors)
+            {
+                actor->resetPosition();
+                actor->setStandingOnPtr(nullptr);
+            }
+            return mTaskScheduler->resetSimulation();
+        }
+
+        return mTaskScheduler->moveActors(numSteps, mTimeAccum, prepareFrameData(numSteps), frameStart, frameNumber, stats);
     }
 
     std::vector<ActorFrameData> PhysicsSystem::prepareFrameData(int numSteps)

From 5ad297e6ff6f9fae76b3ae2c00d4bc312ed0a0e6 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Thu, 3 Dec 2020 18:41:32 +0000
Subject: [PATCH 0041/2859] Guarantee glow updater regenerates shaders on
 completion

Previously, it would edit the odd numbered stateset, then regenerate
shaders for the even-numbered one, then edit the even numbered one, and
regenerate shaders for the odd numbered one (or vice versa if it
finished during an even numbered frame). This would leave one of the
shader programs still trying to use the state that had been removed.
---
 components/sceneutil/util.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/sceneutil/util.cpp b/components/sceneutil/util.cpp
index a23f3f1090..2c0d8efa0c 100644
--- a/components/sceneutil/util.cpp
+++ b/components/sceneutil/util.cpp
@@ -112,6 +112,8 @@ void GlowUpdater::apply(osg::StateSet *stateset, osg::NodeVisitor *nv)
             removeTexture(stateset);
             this->reset();
             mDone = true;
+            // normally done in StateSetUpdater::operator(), but needs doing here so the shader visitor sees the right StateSet
+            mNode->setStateSet(stateset);
             mResourceSystem->getSceneManager()->recreateShaders(mNode);
         }
         if (mOriginalDuration < 0) // if this glowupdater was originally a permanent glow

From 48f397f168ba32965e209c498643413a1533f468 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Thu, 3 Dec 2020 21:06:02 +0000
Subject: [PATCH 0042/2859] Remove existing shader when no longer required

---
 components/shader/shadervisitor.cpp | 20 ++++++++++++++++++++
 components/shader/shadervisitor.hpp |  1 +
 2 files changed, 21 insertions(+)

diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 10e9e606e5..e908b6aaa8 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -294,7 +294,10 @@ namespace Shader
     void ShaderVisitor::createProgram(const ShaderRequirements &reqs)
     {
         if (!reqs.mShaderRequired && !mForceShaders)
+        {
+            ensureFFP(*reqs.mNode);
             return;
+        }
 
         osg::Node& node = *reqs.mNode;
         osg::StateSet* writableStateSet = nullptr;
@@ -333,6 +336,19 @@ namespace Shader
         }
     }
 
+    void ShaderVisitor::ensureFFP(osg::Node& node)
+    {
+        if (!node.getStateSet() || !node.getStateSet()->getAttribute(osg::StateAttribute::PROGRAM))
+            return;
+        osg::StateSet* writableStateSet = nullptr;
+        if (mAllowedToModifyStateSets)
+            writableStateSet = node.getStateSet();
+        else
+            writableStateSet = getWritableStateSet(node);
+
+        writableStateSet->removeAttribute(osg::StateAttribute::PROGRAM);
+    }
+
     bool ShaderVisitor::adjustGeometry(osg::Geometry& sourceGeometry, const ShaderRequirements& reqs)
     {
         bool useShader = reqs.mShaderRequired || mForceShaders;
@@ -380,6 +396,8 @@ namespace Shader
 
             createProgram(reqs);
         }
+        else
+            ensureFFP(geometry);
 
         if (needPop)
             popRequirements();
@@ -414,6 +432,8 @@ namespace Shader
                     morph->setSourceGeometry(sourceGeometry);
             }
         }
+        else
+            ensureFFP(drawable);
 
         if (needPop)
             popRequirements();
diff --git a/components/shader/shadervisitor.hpp b/components/shader/shadervisitor.hpp
index 6b2353b662..6031dbfe6c 100644
--- a/components/shader/shadervisitor.hpp
+++ b/components/shader/shadervisitor.hpp
@@ -94,6 +94,7 @@ namespace Shader
         std::string mDefaultFsTemplate;
 
         void createProgram(const ShaderRequirements& reqs);
+        void ensureFFP(osg::Node& node);
         bool adjustGeometry(osg::Geometry& sourceGeometry, const ShaderRequirements& reqs);
     };
 

From 84e1a29700169afd0440ccce9f9061e22a69f711 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Fri, 27 Nov 2020 00:34:07 +0300
Subject: [PATCH 0043/2859] Make AI cast self-targeted spells at the ground
 (bug #5695)

---
 CHANGELOG.md                       |  1 +
 apps/openmw/mwmechanics/aicast.cpp | 32 ++++++++++++++++--------------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0c6dd5ee9..2f38ce17f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -67,6 +67,7 @@
     Bug #5656: Sneaking characters block hits while standing
     Bug #5661: Region sounds don't play at the right interval
     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
     Feature #390: 3rd person look "over the shoulder"
     Feature #2386: Distant Statics in the form of Object Paging
diff --git a/apps/openmw/mwmechanics/aicast.cpp b/apps/openmw/mwmechanics/aicast.cpp
index 9ad7b4c56d..af3aac340e 100644
--- a/apps/openmw/mwmechanics/aicast.cpp
+++ b/apps/openmw/mwmechanics/aicast.cpp
@@ -46,26 +46,28 @@ bool MWMechanics::AiCast::execute(const MWWorld::Ptr& actor, MWMechanics::Charac
         {
             return false;
         }
+    }
 
-        osg::Vec3f targetPos = target.getRefData().getPosition().asVec3();
-        if (target.getClass().isActor())
-        {
-            osg::Vec3f halfExtents = MWBase::Environment::get().getWorld()->getHalfExtents(target);
-            targetPos.z() += halfExtents.z() * 2 * 0.75f;
-        }
+    osg::Vec3f targetPos = target.getRefData().getPosition().asVec3();
+    // If the target of an on-target spell is an actor that is not the caster
+    // the target position must be adjusted so that it's not casted at the actor's feet.
+    if (target != actor && target.getClass().isActor())
+    {
+        osg::Vec3f halfExtents = MWBase::Environment::get().getWorld()->getHalfExtents(target);
+        targetPos.z() += halfExtents.z() * 2 * 0.75f;
+    }
 
-        osg::Vec3f actorPos = actor.getRefData().getPosition().asVec3();
-        osg::Vec3f halfExtents = MWBase::Environment::get().getWorld()->getHalfExtents(actor);
-        actorPos.z() += halfExtents.z() * 2 * 0.75f;
+    osg::Vec3f actorPos = actor.getRefData().getPosition().asVec3();
+    osg::Vec3f halfExtents = MWBase::Environment::get().getWorld()->getHalfExtents(actor);
+    actorPos.z() += halfExtents.z() * 2 * 0.75f;
 
-        osg::Vec3f dir = targetPos - actorPos;
+    osg::Vec3f dir = targetPos - actorPos;
 
-        bool turned = smoothTurn(actor, getZAngleToDir(dir), 2, osg::DegreesToRadians(3.f));
-        turned &= smoothTurn(actor, getXAngleToDir(dir), 0, osg::DegreesToRadians(3.f));
+    bool turned = smoothTurn(actor, getZAngleToDir(dir), 2, osg::DegreesToRadians(3.f));
+    turned &= smoothTurn(actor, getXAngleToDir(dir), 0, osg::DegreesToRadians(3.f));
 
-        if (!turned)
-            return false;
-    }
+    if (!turned)
+        return false;
 
     // Check if the actor is already casting another spell
     bool isCasting = MWBase::Environment::get().getMechanicsManager()->isCastingSpell(actor);

From 078de86e608b8fe9c1dca53d83fed7bc53a852cf Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Fri, 4 Dec 2020 18:34:51 +0100
Subject: [PATCH 0044/2859] Use range based for loops and auto

---
 apps/openmw/mwgui/spellmodel.cpp       | 12 ++---
 apps/openmw/mwworld/containerstore.cpp | 64 +++++++++++---------------
 2 files changed, 34 insertions(+), 42 deletions(-)

diff --git a/apps/openmw/mwgui/spellmodel.cpp b/apps/openmw/mwgui/spellmodel.cpp
index 136547c4c1..78b9171e59 100644
--- a/apps/openmw/mwgui/spellmodel.cpp
+++ b/apps/openmw/mwgui/spellmodel.cpp
@@ -48,9 +48,9 @@ namespace MWGui
         const MWWorld::ESMStore &store =
             MWBase::Environment::get().getWorld()->getStore();
 
-        for (unsigned int i = 0; i < effects.mList.size(); ++i)
+        for (const auto& effect : effects.mList)
         {
-            short effectId = effects.mList[i].mEffectID;
+            short effectId = effect.mEffectID;
 
             if (effectId != -1)
             {
@@ -59,14 +59,14 @@ namespace MWGui
                 std::string effectIDStr = ESM::MagicEffect::effectIdToString(effectId);
                 std::string fullEffectName = wm->getGameSettingString(effectIDStr, "");
 
-                if (magicEffect->mData.mFlags & ESM::MagicEffect::TargetSkill && effects.mList[i].mSkill != -1)
+                if (magicEffect->mData.mFlags & ESM::MagicEffect::TargetSkill && effect.mSkill != -1)
                 {
-                    fullEffectName += " " + wm->getGameSettingString(ESM::Skill::sSkillNameIds[effects.mList[i].mSkill], "");
+                    fullEffectName += " " + wm->getGameSettingString(ESM::Skill::sSkillNameIds[effect.mSkill], "");
                 }
 
-                if (magicEffect->mData.mFlags & ESM::MagicEffect::TargetAttribute && effects.mList[i].mAttribute != -1)
+                if (magicEffect->mData.mFlags & ESM::MagicEffect::TargetAttribute && effect.mAttribute != -1)
                 {
-                    fullEffectName += " " + wm->getGameSettingString(ESM::Attribute::sGmstAttributeIds[effects.mList[i].mAttribute], "");
+                    fullEffectName += " " + wm->getGameSettingString(ESM::Attribute::sGmstAttributeIds[effect.mAttribute], "");
                 }
 
                 std::string convert = Misc::StringUtils::lowerCaseUtf8(fullEffectName);
diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index 17c35489f5..635485dde8 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -26,7 +26,7 @@ namespace
     void addScripts(MWWorld::ContainerStore& store, MWWorld::CellStore* cell)
     {
         auto& scripts = MWBase::Environment::get().getWorld()->getLocalScripts();
-        for(const MWWorld::Ptr& ptr : store)
+        for(const auto&& ptr : store)
         {
             const std::string& script = ptr.getClass().getScript(ptr);
             if(!script.empty())
@@ -43,13 +43,10 @@ namespace
     {
         float sum = 0;
 
-        for (typename MWWorld::CellRefList<T>::List::const_iterator iter (
-            cellRefList.mList.begin());
-            iter!=cellRefList.mList.end();
-            ++iter)
+        for (const auto& iter : cellRefList.mList)
         {
-            if (iter->mData.getCount()>0)
-                sum += iter->mData.getCount()*iter->mBase->mData.mWeight;
+            if (iter.mData.getCount()>0)
+                sum += iter.mData.getCount()*iter.mBase->mData.mWeight;
         }
 
         return sum;
@@ -62,12 +59,11 @@ namespace
         store->resolve();
         std::string id2 = Misc::StringUtils::lowerCase (id);
 
-        for (typename MWWorld::CellRefList<T>::List::iterator iter (list.mList.begin());
-             iter!=list.mList.end(); ++iter)
+        for (auto& iter : list.mList)
         {
-            if (Misc::StringUtils::ciEqual(iter->mBase->mId, id2) && iter->mData.getCount())
+            if (Misc::StringUtils::ciEqual(iter.mBase->mId, id2) && iter.mData.getCount())
             {
-                MWWorld::Ptr ptr (&*iter, nullptr);
+                MWWorld::Ptr ptr (&iter, nullptr);
                 ptr.setContainerStore (store);
                 return ptr;
             }
@@ -81,7 +77,7 @@ MWWorld::ResolutionListener::~ResolutionListener()
 {
     if(!mStore.mModified && mStore.mResolved && !mStore.mPtr.isEmpty())
     {
-        for(const MWWorld::Ptr& ptr : mStore)
+        for(const auto&& ptr : mStore)
             ptr.getRefData().setCount(0);
         mStore.fillNonRandom(mStore.mPtr.get<ESM::Container>()->mBase->mInventory, "", mStore.mSeed);
         addScripts(mStore, mStore.mPtr.mCell);
@@ -127,15 +123,14 @@ template<typename T>
 void MWWorld::ContainerStore::storeStates (const CellRefList<T>& collection,
     ESM::InventoryState& inventory, int& index, bool equipable) const
 {
-    for (typename CellRefList<T>::List::const_iterator iter (collection.mList.begin());
-        iter!=collection.mList.end(); ++iter)
+    for (const auto& iter : collection.mList)
     {
-        if (iter->mData.getCount() == 0)
+        if (iter.mData.getCount() == 0)
             continue;
         ESM::ObjectState state;
-        storeState (*iter, state);
+        storeState (iter, state);
         if (equipable)
-            storeEquipmentState(*iter, index, inventory);
+            storeEquipmentState(iter, index, inventory);
         inventory.mItems.push_back (state);
         ++index;
     }
@@ -188,7 +183,7 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::end()
 int MWWorld::ContainerStore::count(const std::string &id) const
 {
     int total=0;
-    for (const auto& iter : *this)
+    for (const auto&& iter : *this)
         if (Misc::StringUtils::ciEqual(iter.getCellRef().getRefId(), id))
             total += iter.getRefData().getCount();
     return total;
@@ -430,14 +425,14 @@ void MWWorld::ContainerStore::rechargeItems(float duration)
         updateRechargingItems();
         mRechargingItemsUpToDate = true;
     }
-    for (TRechargingItems::iterator it = mRechargingItems.begin(); it != mRechargingItems.end(); ++it)
+    for (auto& it : mRechargingItems)
     {
-        if (!MWMechanics::rechargeItem(*it->first, it->second, duration))
+        if (!MWMechanics::rechargeItem(*it.first, it.second, duration))
             continue;
 
         // attempt to restack when fully recharged
-        if (it->first->getCellRef().getEnchantmentCharge() == it->second)
-            it->first = restack(*it->first);
+        if (it.first->getCellRef().getEnchantmentCharge() == it.second)
+            it.first = restack(*it.first);
     }
 }
 
@@ -481,9 +476,9 @@ int MWWorld::ContainerStore::remove(const std::string& itemId, int count, const
 
 bool MWWorld::ContainerStore::hasVisibleItems() const
 {
-    for (auto iter(begin()); iter != end(); ++iter)
+    for (const auto&& iter : *this)
     {
-        if (iter->getClass().showsInInventory(*iter))
+        if (iter.getClass().showsInInventory(iter))
             return true;
     }
 
@@ -601,8 +596,8 @@ void MWWorld::ContainerStore::addInitialItemImp(const MWWorld::Ptr& ptr, const s
 
 void MWWorld::ContainerStore::clear()
 {
-    for (ContainerStoreIterator iter (begin()); iter!=end(); ++iter)
-        iter->getRefData().setCount (0);
+    for (auto&& iter : *this)
+        iter.getRefData().setCount (0);
 
     flagAsModified();
     mModified = true;
@@ -623,7 +618,7 @@ void MWWorld::ContainerStore::resolve()
 {
     if(!mResolved && !mPtr.isEmpty())
     {
-        for(const MWWorld::Ptr& ptr : *this)
+        for(const auto&& ptr : *this)
             ptr.getRefData().setCount(0);
         Misc::Rng::Seed seed{mSeed};
         fill(mPtr.get<ESM::Container>()->mBase->mInventory, "", seed);
@@ -644,7 +639,7 @@ MWWorld::ResolutionHandle MWWorld::ContainerStore::resolveTemporarily()
     }
     if(!mResolved && !mPtr.isEmpty())
     {
-        for(const MWWorld::Ptr& ptr : *this)
+        for(const auto&& ptr : *this)
             ptr.getRefData().setCount(0);
         Misc::Rng::Seed seed{mSeed};
         fill(mPtr.get<ESM::Container>()->mBase->mInventory, "", seed);
@@ -727,10 +722,10 @@ MWWorld::Ptr MWWorld::ContainerStore::findReplacement(const std::string& id)
 {
     MWWorld::Ptr item;
     int itemHealth = 1;
-    for (MWWorld::ContainerStoreIterator iter = begin(); iter != end(); ++iter)
+    for (auto&& iter : *this)
     {
-        int iterHealth = iter->getClass().hasItemHealth(*iter) ? iter->getClass().getItemHealth(*iter) : 1;
-        if (Misc::StringUtils::ciEqual(iter->getCellRef().getRefId(), id))
+        int iterHealth = iter.getClass().hasItemHealth(iter) ? iter.getClass().getItemHealth(iter) : 1;
+        if (Misc::StringUtils::ciEqual(iter.getCellRef().getRefId(), id))
         {
             // Prefer the stack with the lowest remaining uses
             // Try to get item with zero durability only if there are no other items found
@@ -738,7 +733,7 @@ MWWorld::Ptr MWWorld::ContainerStore::findReplacement(const std::string& id)
                 (iterHealth > 0 && iterHealth < itemHealth) ||
                 (itemHealth <= 0 && iterHealth > 0))
             {
-                item = *iter;
+                item = iter;
                 itemHealth = iterHealth;
             }
         }
@@ -867,11 +862,8 @@ void MWWorld::ContainerStore::readState (const ESM::InventoryState& inventory)
     mResolved = true;
 
     int index = 0;
-    for (std::vector<ESM::ObjectState>::const_iterator
-        iter (inventory.mItems.begin()); iter!=inventory.mItems.end(); ++iter)
+    for (const ESM::ObjectState& state : inventory.mItems)
     {
-        const ESM::ObjectState& state = *iter;
-
         int type = MWBase::Environment::get().getWorld()->getStore().find(state.mRef.mRefID);
 
         int thisIndex = index++;

From 7843dad35d772a1c0835dd8eb7dba4040ac3d7ff Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sat, 5 Dec 2020 01:09:43 +0100
Subject: [PATCH 0045/2859] Don't let the actor "nowhere" after a teleport but
 move them in their place. This solve the problem where after loading, an
 empty frame was rendered because the player is "nowhere".

---
 apps/openmw/mwphysics/mtphysics.cpp     | 9 ++++++++-
 apps/openmw/mwphysics/mtphysics.hpp     | 2 +-
 apps/openmw/mwphysics/physicssystem.cpp | 9 +--------
 apps/openmw/mwphysics/physicssystem.hpp | 3 ++-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index bdffcef44f..50cfd808ff 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -297,12 +297,19 @@ namespace MWPhysics
         return mPreviousMovementResults;
     }
 
-    const PtrPositionList& PhysicsTaskScheduler::resetSimulation()
+    const PtrPositionList& PhysicsTaskScheduler::resetSimulation(const ActorMap& actors)
     {
         std::unique_lock lock(mSimulationMutex);
         mMovementResults.clear();
         mPreviousMovementResults.clear();
         mActorsFrameData.clear();
+
+        for (const auto& [_, actor] : actors)
+        {
+            actor->resetPosition();
+            actor->setStandingOnPtr(nullptr);
+            mMovementResults[actor->getPtr()] = actor->getWorldPosition();
+        }
         return mMovementResults;
     }
 
diff --git a/apps/openmw/mwphysics/mtphysics.hpp b/apps/openmw/mwphysics/mtphysics.hpp
index f7a131ca26..3a761829b5 100644
--- a/apps/openmw/mwphysics/mtphysics.hpp
+++ b/apps/openmw/mwphysics/mtphysics.hpp
@@ -34,7 +34,7 @@ namespace MWPhysics
             /// @return new position of each actor
             const PtrPositionList& moveActors(int numSteps, float timeAccum, std::vector<ActorFrameData>&& actorsData, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
 
-            const PtrPositionList& resetSimulation();
+            const PtrPositionList& resetSimulation(const ActorMap& actors);
 
             // Thread safe wrappers
             void rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, btCollisionWorld::RayResultCallback& resultCallback) const;
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index cdbad2cddd..b750970d9c 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -677,14 +677,7 @@ namespace MWPhysics
         mTimeAccum -= numSteps * mPhysicsDt;
 
         if (skipSimulation)
-        {
-            for (auto& [_, actor] : mActors)
-            {
-                actor->resetPosition();
-                actor->setStandingOnPtr(nullptr);
-            }
-            return mTaskScheduler->resetSimulation();
-        }
+            return mTaskScheduler->resetSimulation(mActors);
 
         return mTaskScheduler->moveActors(numSteps, mTimeAccum, prepareFrameData(numSteps), frameStart, frameNumber, stats);
     }
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 03ae789934..4137b1e098 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -57,6 +57,8 @@ namespace MWPhysics
     class Actor;
     class PhysicsTaskScheduler;
 
+    using ActorMap = std::map<MWWorld::ConstPtr, std::shared_ptr<Actor>>;
+
     struct ContactPoint
     {
         MWWorld::Ptr mObject;
@@ -265,7 +267,6 @@ namespace MWPhysics
 
             std::set<Object*> mAnimatedObjects; // stores pointers to elements in mObjects
 
-            using ActorMap = std::map<MWWorld::ConstPtr, std::shared_ptr<Actor>>;
             ActorMap mActors;
 
             using HeightFieldMap = std::map<std::pair<int, int>, HeightField *>;

From 5734551ff3dfcc7d157a4eebfa724f793ac3478e Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Fri, 4 Dec 2020 11:17:49 +0100
Subject: [PATCH 0046/2859] Add time to logs. Redirect OSG log to OpenMW log.

---
 apps/openmw/main.cpp           | 37 ++++++++++++++++++++++++++++++++++
 components/debug/debugging.cpp | 34 ++++++++++++++++++++++++++++---
 2 files changed, 68 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index d3d9849010..3a6dc526a8 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -223,6 +223,42 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     return true;
 }
 
+namespace
+{
+    class OSGLogHandler : public osg::NotifyHandler
+    {
+        void notify(osg::NotifySeverity severity, const char* msg) override
+        {
+            // Copy, because osg logging is not thread safe.
+            std::string msgCopy(msg);
+            if (msgCopy.empty())
+                return;
+
+            Debug::Level level;
+            switch (severity)
+            {
+            case osg::ALWAYS:
+            case osg::FATAL:
+                level = Debug::Error;
+                break;
+            case osg::WARN:
+            case osg::NOTICE:
+                level = Debug::Warning;
+                break;
+            case osg::INFO:
+                level = Debug::Info;
+                break;
+            case osg::DEBUG_INFO:
+            case osg::DEBUG_FP:
+            default:
+                level = Debug::Debug;
+            }
+            std::string_view s(msgCopy);
+            Log(level) << (s.back() == '\n' ? s.substr(0, s.size() - 1) : s);
+        }
+    };
+}
+
 int runApplication(int argc, char *argv[])
 {
 #ifdef __APPLE__
@@ -231,6 +267,7 @@ int runApplication(int argc, char *argv[])
     setenv("OSG_GL_TEXTURE_STORAGE", "OFF", 0);
 #endif
 
+    osg::setNotifyHandler(new OSGLogHandler());
     Files::ConfigurationManager cfgMgr;
     std::unique_ptr<OMW::Engine> engine;
     engine.reset(new OMW::Engine(cfgMgr));
diff --git a/components/debug/debugging.cpp b/components/debug/debugging.cpp
index c4f3af3072..88219dcbe1 100644
--- a/components/debug/debugging.cpp
+++ b/components/debug/debugging.cpp
@@ -1,5 +1,7 @@
 #include "debugging.hpp"
 
+#include <chrono>
+
 #include <components/crashcatcher/crashcatcher.hpp>
 
 #ifdef _WIN32
@@ -60,15 +62,40 @@ namespace Debug
 
     std::streamsize DebugOutputBase::write(const char *str, std::streamsize size)
     {
+        if (size <= 0)
+            return size;
+        std::string_view msg{str, size_t(size)};
+
         // Skip debug level marker
         Level level = getLevelMarker(str);
         if (level != NoLevel)
+            msg = msg.substr(1);
+
+        char prefix[32];
+        int prefixSize;
         {
-            writeImpl(str+1, size-1, level);
-            return size;
+            prefix[0] = '[';
+            uint64_t ms = std::chrono::duration_cast<std::chrono::milliseconds>(
+                std::chrono::high_resolution_clock::now().time_since_epoch()).count();
+            std::time_t t = ms / 1000;
+            prefixSize = std::strftime(prefix + 1, sizeof(prefix) - 1, "%T", std::localtime(&t)) + 1;
+            char levelLetter = " EWIVD*"[int(level)];
+            prefixSize += snprintf(prefix + prefixSize, sizeof(prefix) - prefixSize,
+                                   ".%03u %c] ", static_cast<unsigned>(ms % 1000), levelLetter);
+        }
+
+        while (!msg.empty())
+        {
+            if (msg[0] == 0)
+                break;
+            size_t lineSize = 1;
+            while (lineSize < msg.size() && msg[lineSize - 1] != '\n')
+                lineSize++;
+            writeImpl(prefix, prefixSize, level);
+            writeImpl(msg.data(), lineSize, level);
+            msg = msg.substr(lineSize);
         }
 
-        writeImpl(str, size, NoLevel);
         return size;
     }
 
@@ -172,6 +199,7 @@ int wrapApplication(int (*innerApplication)(int argc, char *argv[]), int argc, c
     // Restore cout and cerr
     std::cout.rdbuf(cout_rdbuf);
     std::cerr.rdbuf(cerr_rdbuf);
+    Debug::CurrentDebugLevel = Debug::NoLevel;
 
     return ret;
 }

From b79f6ac808e71f7ee1fed5cbe46ce718491fc51c Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sun, 6 Dec 2020 13:20:37 +0100
Subject: [PATCH 0047/2859] Force reset position of actor after snapping to the
 ground. Otherwise the interpolation calculation would kick in and make the
 actor goes upward if the spawn point is higher than summoner or downward if
 lower. The actor would then either jump or fall through terrain.

---
 apps/openmw/mwworld/worldimp.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 224925dd55..05051f3003 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1351,6 +1351,8 @@ namespace MWWorld
         }
 
         moveObject(ptr, ptr.getCell(), pos.x(), pos.y(), pos.z());
+        if (force) // force physics to use the new position
+            mPhysics->getActor(ptr)->resetPosition();
     }
 
     void World::fixPosition()

From 08e73a09ec41fc791166473acdf91a3c0b39c0bb Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sun, 6 Dec 2020 13:24:42 +0100
Subject: [PATCH 0048/2859] Make the code more compact by mean of std::min /
 max and ternary operator.

---
 apps/openmw/mwworld/worldimp.cpp | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 05051f3003..265e45d37f 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1332,22 +1332,15 @@ namespace MWWorld
             return;
         }
 
-        float terrainHeight = -std::numeric_limits<float>::max();
-        if (ptr.getCell()->isExterior())
-            terrainHeight = getTerrainHeightAt(pos);
-
-        if (pos.z() < terrainHeight)
-            pos.z() = terrainHeight;
-
-        pos.z() += 20; // place slightly above. will snap down to ground with code below
+        const float terrainHeight = ptr.getCell()->isExterior() ? getTerrainHeightAt(pos) : -std::numeric_limits<float>::max();
+        pos.z() = std::max(pos.z(), terrainHeight + 20); // place slightly above terrain. will snap down to ground with code below
 
         // We still should trace down dead persistent actors - they do not use the "swimdeath" animation.
         bool swims = ptr.getClass().isActor() && isSwimming(ptr) && !(ptr.getClass().isPersistent(ptr) && ptr.getClass().getCreatureStats(ptr).isDeathAnimationFinished());
         if (force || !ptr.getClass().isActor() || (!isFlying(ptr) && !swims && isActorCollisionEnabled(ptr)))
         {
             osg::Vec3f traced = mPhysics->traceDown(ptr, pos, Constants::CellSizeInUnits);
-            if (traced.z() < pos.z())
-                pos.z() = traced.z();
+            pos.z() = std::min(pos.z(), traced.z());
         }
 
         moveObject(ptr, ptr.getCell(), pos.x(), pos.y(), pos.z());

From c6c02a6f16384533d1c09a32bb81e5f0ad554cb4 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sun, 6 Dec 2020 13:26:43 +0100
Subject: [PATCH 0049/2859] Remove useless code. ipos is already initialized
 with the correct values.

---
 apps/openmw/mwworld/worldimp.cpp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 265e45d37f..49e6a729a8 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1444,17 +1444,11 @@ namespace MWWorld
         ipos.pos[1] = spawnPoint.y();
         ipos.pos[2] = spawnPoint.z();
 
-        if (!referenceObject.getClass().isActor())
-        {
-            ipos.rot[0] = referenceObject.getRefData().getPosition().rot[0];
-            ipos.rot[1] = referenceObject.getRefData().getPosition().rot[1];
-        }
-        else
+        if (referenceObject.getClass().isActor())
         {
             ipos.rot[0] = 0;
             ipos.rot[1] = 0;
         }
-        ipos.rot[2] = referenceObject.getRefData().getPosition().rot[2];
 
         MWWorld::Ptr placed = copyObjectToCell(ptr, referenceCell, ipos, ptr.getRefData().getCount(), false);
         adjustPosition(placed, true); // snap to ground

From 6bfdf0e57fd67142fcaad37388b002ad57b6770a Mon Sep 17 00:00:00 2001
From: CedricMocquillon <cedric.mocquillon@sage.com>
Date: Fri, 4 Dec 2020 22:21:23 +0100
Subject: [PATCH 0050/2859] Add more information on mouse over level

---
 apps/openmw/mwgui/statswindow.cpp    | 9 +++++++++
 apps/openmw/mwmechanics/npcstats.cpp | 5 +++++
 apps/openmw/mwmechanics/npcstats.hpp | 2 ++
 files/mygui/openmw_tooltips.layout   | 6 ++++++
 4 files changed, 22 insertions(+)

diff --git a/apps/openmw/mwgui/statswindow.cpp b/apps/openmw/mwgui/statswindow.cpp
index 2a3e2cd85c..e02b2f45f1 100644
--- a/apps/openmw/mwgui/statswindow.cpp
+++ b/apps/openmw/mwgui/statswindow.cpp
@@ -335,6 +335,15 @@ namespace MWGui
         {
             int max = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("iLevelUpTotal")->mValue.getInteger();
             getWidget(levelWidget, i==0 ? "Level_str" : "LevelText");
+
+            std::string detail;
+            for (int i = 0; i < ESM::Attribute::Length; ++i)
+            {
+                if (auto increase = PCstats.getLevelUpAttributeIncrease(i))
+                    detail += (detail.empty() ? "" : "\n") + ESM::Attribute::sAttributeNames[i] + " x" + MyGUI::utility::toString(increase);
+            }
+            if (!detail.empty())
+                levelWidget->setUserString("Caption_LevelDetailText", detail);
             levelWidget->setUserString("RangePosition_LevelProgress", MyGUI::utility::toString(PCstats.getLevelProgress()));
             levelWidget->setUserString("Range_LevelProgress", MyGUI::utility::toString(max));
             levelWidget->setUserString("Caption_LevelProgressText", MyGUI::utility::toString(PCstats.getLevelProgress()) + "/"
diff --git a/apps/openmw/mwmechanics/npcstats.cpp b/apps/openmw/mwmechanics/npcstats.cpp
index 5d19368bf6..71453cd07c 100644
--- a/apps/openmw/mwmechanics/npcstats.cpp
+++ b/apps/openmw/mwmechanics/npcstats.cpp
@@ -322,6 +322,11 @@ void MWMechanics::NpcStats::updateHealth()
     setHealth(floor(0.5f * (strength + endurance)));
 }
 
+int MWMechanics::NpcStats::getLevelUpAttributeIncrease(int attribute) const
+{
+    return mSkillIncreases[attribute];
+}
+
 int MWMechanics::NpcStats::getLevelupAttributeMultiplier(int attribute) const
 {
     int num = mSkillIncreases[attribute];
diff --git a/apps/openmw/mwmechanics/npcstats.hpp b/apps/openmw/mwmechanics/npcstats.hpp
index 9bd8e20ad7..cab52cb281 100644
--- a/apps/openmw/mwmechanics/npcstats.hpp
+++ b/apps/openmw/mwmechanics/npcstats.hpp
@@ -87,6 +87,8 @@ namespace MWMechanics
 
             int getLevelProgress() const;
 
+            int getLevelUpAttributeIncrease(int attribute) const;
+
             int getLevelupAttributeMultiplier(int attribute) const;
 
             int getSkillIncreasesForSpecialization(int spec) const;
diff --git a/files/mygui/openmw_tooltips.layout b/files/mygui/openmw_tooltips.layout
index 70246fa4e9..59050f932b 100644
--- a/files/mygui/openmw_tooltips.layout
+++ b/files/mygui/openmw_tooltips.layout
@@ -267,6 +267,12 @@
                     <Property key="TextAlign" value="HCenter Top"/>
                 </Widget>
             </Widget>
+
+            <Widget type="AutoSizedTextBox" skin="SandText" position="0 0 0 0" align="Left Top" name="LevelDetailText">
+                <Property key="AutoResize" value="true"/>
+                <Property key="MultiLine" value="true"/>
+                <Property key="Shrink" value="true"/>
+            </Widget>
         </Widget>
 
         <!-- Birthsign tooltip -->

From 2d3d22025a5f278ffa350fd6d69dd8bb0dab59eb Mon Sep 17 00:00:00 2001
From: CedricMocquillon <cedric.mocquillon@sage.com>
Date: Fri, 4 Dec 2020 22:28:36 +0100
Subject: [PATCH 0051/2859] Avoid height for empty message in AutoSizedTextBox

---
 components/widgets/box.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/widgets/box.cpp b/components/widgets/box.cpp
index 23a108ee92..3e8f62b4ba 100644
--- a/components/widgets/box.cpp
+++ b/components/widgets/box.cpp
@@ -32,7 +32,7 @@ namespace Gui
 
     MyGUI::IntSize AutoSizedTextBox::getRequestedSize()
     {
-        return getTextSize();
+        return getCaption().empty() ? MyGUI::IntSize{0, 0} : getTextSize();
     }
 
     void AutoSizedTextBox::setCaption(const MyGUI::UString& _value)

From 86c31ded533a737d681297e63f5917060993a9f3 Mon Sep 17 00:00:00 2001
From: CedricMocquillon <cedric.mocquillon@sage.com>
Date: Mon, 7 Dec 2020 14:56:29 +0100
Subject: [PATCH 0052/2859] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0c6dd5ee9..e1e71256a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -69,6 +69,7 @@
     Bug #5688: Water shader broken indoors with enable indoor shadows = false
     Bug #5703: OpenMW-CS menu system crashing on XFCE
     Feature #390: 3rd person look "over the shoulder"
+    Feature #1536: Show more information about level on menu
     Feature #2386: Distant Statics in the form of Object Paging
     Feature #2404: Levelled List can not be placed into a container
     Feature #4894: Consider actors as obstacles for pathfinding

From 807367ca3f771a99b4ab270c31f6ae9cbfdb3360 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 7 Dec 2020 19:09:58 +0400
Subject: [PATCH 0053/2859] Mark mock methods as overrides (requires GTest
 1.10)

---
 apps/openmw_test_suite/CMakeLists.txt         |  4 ++--
 .../nifloader/testbulletnifloader.cpp         | 24 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index cd2d2e80a6..5658a5eefc 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -1,5 +1,5 @@
-find_package(GTest REQUIRED)
-find_package(GMock REQUIRED)
+find_package(GTest 1.10 REQUIRED)
+find_package(GMock 1.10 REQUIRED)
 
 if (GTEST_FOUND AND GMOCK_FOUND)
     include_directories(SYSTEM ${GTEST_INCLUDE_DIRS})
diff --git a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
index 7da8f0fd5b..355bfdb1c0 100644
--- a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
+++ b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
@@ -293,22 +293,22 @@ namespace
 
     struct NifFileMock : Nif::File
     {
-        MOCK_CONST_METHOD1(getRecord, Nif::Record* (std::size_t));
-        MOCK_CONST_METHOD0(numRecords, std::size_t ());
-        MOCK_CONST_METHOD1(getRoot, Nif::Record* (std::size_t));
-        MOCK_CONST_METHOD0(numRoots, std::size_t ());
-        MOCK_CONST_METHOD1(getString, std::string (uint32_t));
-        MOCK_METHOD1(setUseSkinning, void (bool));
-        MOCK_CONST_METHOD0(getUseSkinning, bool ());
-        MOCK_CONST_METHOD0(getFilename, std::string ());
-        MOCK_CONST_METHOD0(getVersion, unsigned int ());
-        MOCK_CONST_METHOD0(getUserVersion, unsigned int ());
-        MOCK_CONST_METHOD0(getBethVersion, unsigned int ());
+        MOCK_METHOD(Nif::Record*, getRecord, (std::size_t), (const, override));
+        MOCK_METHOD(std::size_t, numRecords, (), (const, override));
+        MOCK_METHOD(Nif::Record*, getRoot, (std::size_t), (const, override));
+        MOCK_METHOD(std::size_t, numRoots, (), (const, override));
+        MOCK_METHOD(std::string, getString, (uint32_t), (const, override));
+        MOCK_METHOD(void, setUseSkinning, (bool), (override));
+        MOCK_METHOD(bool, getUseSkinning, (), (const, override));
+        MOCK_METHOD(std::string, getFilename, (), (const, override));
+        MOCK_METHOD(unsigned int, getVersion, (), (const, override));
+        MOCK_METHOD(unsigned int, getUserVersion, (), (const, override));
+        MOCK_METHOD(unsigned int, getBethVersion, (), (const, override));
     };
 
     struct RecordMock : Nif::Record
     {
-        MOCK_METHOD1(read, void (Nif::NIFStream *nif));
+        MOCK_METHOD(void, read, (Nif::NIFStream *nif), (override));
     };
 
     struct TestBulletNifLoader : Test

From e62fff5f2eaae841a4378e6bf18fb6a9b50b3d16 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 7 Dec 2020 19:04:32 +0100
Subject: [PATCH 0054/2859] Add a setting to disable graphical herbalism

---
 apps/openmw/engine.cpp            |  4 ++--
 apps/openmw/mwclass/container.cpp | 10 +++++++++-
 apps/openmw/mwclass/container.hpp |  5 +++++
 files/settings-default.cfg        |  3 +++
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 8092bb770b..8f23f710dd 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -386,8 +386,6 @@ OMW::Engine::Engine(Files::ConfigurationManager& configurationManager)
   , mNewGame (false)
   , mCfgMgr(configurationManager)
 {
-    MWClass::registerClasses();
-
     SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, "0"); // We use only gamepads
 
     Uint32 flags = SDL_INIT_VIDEO|SDL_INIT_NOPARACHUTE|SDL_INIT_GAMECONTROLLER|SDL_INIT_JOYSTICK|SDL_INIT_SENSOR;
@@ -838,6 +836,8 @@ void OMW::Engine::go()
     std::string settingspath;
     settingspath = loadSettings (settings);
 
+    MWClass::registerClasses();
+
     // Create encoder
     mEncoder = new ToUTF8::Utf8Encoder(mEncoding);
 
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index a27e3debdd..5ae22cf05f 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -2,6 +2,7 @@
 
 #include <components/esm/loadcont.hpp>
 #include <components/esm/containerstate.hpp>
+#include <components/settings/settings.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
@@ -59,6 +60,11 @@ namespace MWClass
         return *this;
     }
 
+    Container::Container()
+    {
+        mHarvestEnabled = Settings::Manager::getBool("enable graphic herbalism", "Game");
+    }
+
     void Container::ensureCustomData (const MWWorld::Ptr& ptr) const
     {
         if (!ptr.getRefData().getCustomData())
@@ -72,8 +78,10 @@ namespace MWClass
         }
     }
 
-    bool canBeHarvested(const MWWorld::ConstPtr& ptr)
+    bool Container::canBeHarvested(const MWWorld::ConstPtr& ptr) const
     {
+        if (!mHarvestEnabled)
+            return false;
         const MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(ptr);
         if (animation == nullptr)
             return false;
diff --git a/apps/openmw/mwclass/container.hpp b/apps/openmw/mwclass/container.hpp
index 57dbf0c76c..2dc0c06cae 100644
--- a/apps/openmw/mwclass/container.hpp
+++ b/apps/openmw/mwclass/container.hpp
@@ -30,11 +30,16 @@ namespace MWClass
 
     class Container : public MWWorld::Class
     {
+            bool mHarvestEnabled;
+
             void ensureCustomData (const MWWorld::Ptr& ptr) const;
 
             MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
 
+            bool canBeHarvested(const MWWorld::ConstPtr& ptr) const;
+
         public:
+            Container();
 
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 0b307ba09d..fbf646b38e 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -361,6 +361,9 @@ trainers training skills based on base skill = false
 # Make stealing items from NPCs that were knocked down possible during combat.
 always allow stealing from knocked out actors = false
 
+# Enables visually harvesting plants for models that support it.
+enable graphic herbalism = true
+
 [General]
 
 # Anisotropy reduces distortion in textures at low angles (e.g. 0 to 16).

From 275b9aea4d6d245b69eab91401ba11b8d764a756 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 7 Dec 2020 21:56:41 +0100
Subject: [PATCH 0055/2859] rename setting

---
 apps/openmw/mwclass/container.cpp | 2 +-
 files/settings-default.cfg        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index 5ae22cf05f..28305c394e 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -62,7 +62,7 @@ namespace MWClass
 
     Container::Container()
     {
-        mHarvestEnabled = Settings::Manager::getBool("enable graphic herbalism", "Game");
+        mHarvestEnabled = Settings::Manager::getBool("graphic herbalism", "Game");
     }
 
     void Container::ensureCustomData (const MWWorld::Ptr& ptr) const
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index fbf646b38e..c8805faa39 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -362,7 +362,7 @@ trainers training skills based on base skill = false
 always allow stealing from knocked out actors = false
 
 # Enables visually harvesting plants for models that support it.
-enable graphic herbalism = true
+graphic herbalism = true
 
 [General]
 

From 242dd8d496b8ec819edb8ace9ff0c107e142de5c Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Tue, 8 Dec 2020 11:06:30 +0400
Subject: [PATCH 0056/2859] Use a logging system instead of cout for a couple
 of missing messages

---
 apps/openmw/main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index 3a6dc526a8..aca0505920 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -153,13 +153,13 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     cfgMgr.mergeComposingVariables(variables, composingVariables, desc);
 
     Version::Version v = Version::getOpenmwVersion(variables["resources"].as<Files::EscapePath>().mPath.string());
-    std::cout << v.describe() << std::endl;
+    Log(Debug::Info) << v.describe();
 
     engine.setGrabMouse(!variables["no-grab"].as<bool>());
 
     // Font encoding settings
     std::string encoding(variables["encoding"].as<Files::EscapeHashString>().toStdString());
-    std::cout << ToUTF8::encodingUsingMessage(encoding) << std::endl;
+    Log(Debug::Info) << ToUTF8::encodingUsingMessage(encoding);
     engine.setEncoding(ToUTF8::calculateEncoding(encoding));
 
     // directory settings

From dc7b48e92ed2ddfaed796df236811bfc5f7005d8 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Wed, 13 Feb 2019 11:30:16 +0400
Subject: [PATCH 0057/2859] Generate physics collisions for projectiles (bug
 #3372)

Remove redundant now mHit field
---
 CHANGELOG.md                                  |   1 +
 apps/openmw/CMakeLists.txt                    |   4 +-
 apps/openmw/mwbase/world.hpp                  |   2 +
 apps/openmw/mwphysics/actor.cpp               |   2 +-
 .../closestnotmeconvexresultcallback.cpp      |  22 +++-
 .../closestnotmerayresultcallback.cpp         |  14 +-
 .../closestnotmerayresultcallback.hpp         |   3 +-
 apps/openmw/mwphysics/object.cpp              |   2 +-
 apps/openmw/mwphysics/physicssystem.cpp       |  54 +++++++-
 apps/openmw/mwphysics/physicssystem.hpp       |  22 +++-
 apps/openmw/mwphysics/projectile.cpp          |  64 +++++++++
 apps/openmw/mwphysics/projectile.hpp          |  68 ++++++++++
 apps/openmw/mwphysics/trace.cpp               |   3 +
 apps/openmw/mwworld/projectilemanager.cpp     | 123 ++++++++++++++++--
 apps/openmw/mwworld/projectilemanager.hpp     |   7 +
 apps/openmw/mwworld/worldimp.cpp              |   5 +
 apps/openmw/mwworld/worldimp.hpp              |   2 +
 17 files changed, 372 insertions(+), 26 deletions(-)
 create mode 100644 apps/openmw/mwphysics/projectile.cpp
 create mode 100644 apps/openmw/mwphysics/projectile.hpp

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f38ce17f7..e545156760 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
     Bug #2473: Unable to overstock merchants
     Bug #2798: Mutable ESM records
     Bug #2976 [reopened]: Issues combining settings from the command line and both config files
+    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
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index d943c7836b..6b6134dfb9 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -66,13 +66,13 @@ add_openmw_dir (mwworld
     cells localscripts customdata inventorystore ptr actionopen actionread actionharvest
     actionequip timestamp actionalchemy cellstore actionapply actioneat
     store esmstore recordcmp fallback actionrepair actionsoulgem livecellref actiondoor
-    contentloader esmloader actiontrap cellreflist cellref physicssystem weather projectilemanager
+    contentloader esmloader actiontrap cellreflist cellref weather projectilemanager
     cellpreloader datetimemanager
     )
 
 add_openmw_dir (mwphysics
     physicssystem trace collisiontype actor convert object heightfield closestnotmerayresultcallback
-    contacttestresultcallback deepestnotmecontacttestresultcallback stepper movementsolver
+    contacttestresultcallback deepestnotmecontacttestresultcallback stepper movementsolver projectile
     closestnotmeconvexresultcallback raycasting mtphysics
     )
 
diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index d4f1d2f8ab..c4b3771af0 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -610,6 +610,8 @@ namespace MWBase
 
             virtual bool isPlayerInJail() const = 0;
 
+            virtual void manualProjectileHit(int projectileId, const MWWorld::Ptr& target, const osg::Vec3f& pos) = 0;
+
             virtual void rest(double hours) = 0;
             virtual void rechargeItems(double duration, bool activeOnly) = 0;
 
diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index 0e557378df..77b07cde53 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -70,7 +70,7 @@ Actor::Actor(const MWWorld::Ptr& ptr, const Resource::BulletShape* shape, Physic
     mCollisionObject->setCollisionFlags(btCollisionObject::CF_KINEMATIC_OBJECT);
     mCollisionObject->setActivationState(DISABLE_DEACTIVATION);
     mCollisionObject->setCollisionShape(mShape.get());
-    mCollisionObject->setUserPointer(static_cast<PtrHolder*>(this));
+    mCollisionObject->setUserPointer(this);
 
     updateRotation();
     updateScale();
diff --git a/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp b/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp
index ddfdb8a42f..3b97a3a341 100644
--- a/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp
+++ b/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp
@@ -2,6 +2,14 @@
 
 #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
 
+#include <components/misc/convert.hpp>
+
+#include "../mwbase/world.hpp"
+#include "../mwbase/environment.hpp"
+
+#include "collisiontype.hpp"
+#include "projectile.hpp"
+
 namespace MWPhysics
 {
     ClosestNotMeConvexResultCallback::ClosestNotMeConvexResultCallback(const btCollisionObject *me, const btVector3 &motion, btScalar minCollisionDot)
@@ -10,11 +18,23 @@ namespace MWPhysics
     {
     }
 
-    btScalar ClosestNotMeConvexResultCallback::addSingleResult(btCollisionWorld::LocalConvexResult& convexResult,bool normalInWorldSpace)
+    btScalar ClosestNotMeConvexResultCallback::addSingleResult(btCollisionWorld::LocalConvexResult& convexResult, bool normalInWorldSpace)
     {
         if (convexResult.m_hitCollisionObject == mMe)
             return btScalar(1);
 
+        if (convexResult.m_hitCollisionObject->getBroadphaseHandle()->m_collisionFilterGroup == CollisionType_Projectile)
+        {
+            Projectile* projectileHolder = static_cast<Projectile*>(convexResult.m_hitCollisionObject->getUserPointer());
+            int projectileId = projectileHolder->getProjectileId();
+            PtrHolder* targetHolder = static_cast<PtrHolder*>(mMe->getUserPointer());
+            const MWWorld::Ptr target = targetHolder->getPtr();
+
+            osg::Vec3f pos = Misc::Convert::makeOsgVec3f(convexResult.m_hitPointLocal);
+            MWBase::Environment::get().getWorld()->manualProjectileHit(projectileId, target, pos);
+            return btScalar(1);
+        }
+
         btVector3 hitNormalWorld;
         if (normalInWorldSpace)
             hitNormalWorld = convexResult.m_hitNormalLocal;
diff --git a/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp b/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp
index 86763a7933..43e1d5c628 100644
--- a/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp
+++ b/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp
@@ -6,13 +6,14 @@
 
 #include "../mwworld/class.hpp"
 
+#include "projectile.hpp"
 #include "ptrholder.hpp"
 
 namespace MWPhysics
 {
-    ClosestNotMeRayResultCallback::ClosestNotMeRayResultCallback(const btCollisionObject* me, const std::vector<const btCollisionObject*>& targets, const btVector3& from, const btVector3& to)
+    ClosestNotMeRayResultCallback::ClosestNotMeRayResultCallback(const btCollisionObject* me, const std::vector<const btCollisionObject*>& targets, const btVector3& from, const btVector3& to, int projId)
     : btCollisionWorld::ClosestRayResultCallback(from, to)
-    , mMe(me), mTargets(targets)
+    , mMe(me), mTargets(targets), mProjectileId(projId)
     {
     }
 
@@ -29,6 +30,15 @@ namespace MWPhysics
                     return 1.f;
             }
         }
+
+        if (mProjectileId >= 0)
+        {
+            PtrHolder* holder = static_cast<PtrHolder*>(rayResult.m_collisionObject->getUserPointer());
+            Projectile* projectile = dynamic_cast<Projectile*>(holder);
+            if (projectile && projectile->getProjectileId() == mProjectileId)
+                return 1.f;
+        }
+
         return btCollisionWorld::ClosestRayResultCallback::addSingleResult(rayResult, normalInWorldSpace);
     }
 }
diff --git a/apps/openmw/mwphysics/closestnotmerayresultcallback.hpp b/apps/openmw/mwphysics/closestnotmerayresultcallback.hpp
index 23d52998ca..d27d64c535 100644
--- a/apps/openmw/mwphysics/closestnotmerayresultcallback.hpp
+++ b/apps/openmw/mwphysics/closestnotmerayresultcallback.hpp
@@ -12,12 +12,13 @@ namespace MWPhysics
     class ClosestNotMeRayResultCallback : public btCollisionWorld::ClosestRayResultCallback
     {
     public:
-        ClosestNotMeRayResultCallback(const btCollisionObject* me, const std::vector<const btCollisionObject*>& targets, const btVector3& from, const btVector3& to);
+        ClosestNotMeRayResultCallback(const btCollisionObject* me, const std::vector<const btCollisionObject*>& targets, const btVector3& from, const btVector3& to, int projId=-1);
 
         btScalar addSingleResult(btCollisionWorld::LocalRayResult& rayResult, bool normalInWorldSpace) override;
     private:
         const btCollisionObject* mMe;
         const std::vector<const btCollisionObject*> mTargets;
+        const int mProjectileId;
     };
 }
 
diff --git a/apps/openmw/mwphysics/object.cpp b/apps/openmw/mwphysics/object.cpp
index c822bbcbe0..910f7bf15c 100644
--- a/apps/openmw/mwphysics/object.cpp
+++ b/apps/openmw/mwphysics/object.cpp
@@ -24,7 +24,7 @@ namespace MWPhysics
         mCollisionObject.reset(new btCollisionObject);
         mCollisionObject->setCollisionShape(shapeInstance->getCollisionShape());
 
-        mCollisionObject->setUserPointer(static_cast<PtrHolder*>(this));
+        mCollisionObject->setUserPointer(this);
 
         setScale(ptr.getCellRef().getScale());
         setRotation(Misc::Convert::toBullet(ptr.getRefData().getBaseNode()->getAttitude()));
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index b750970d9c..8933c9d025 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -46,6 +46,8 @@
 
 #include "collisiontype.hpp"
 #include "actor.hpp"
+
+#include "projectile.hpp"
 #include "trace.h"
 #include "object.hpp"
 #include "heightfield.hpp"
@@ -64,6 +66,7 @@ namespace MWPhysics
         , mResourceSystem(resourceSystem)
         , mDebugDrawEnabled(false)
         , mTimeAccum(0.0f)
+        , mProjectileId(0)
         , mWaterHeight(0)
         , mWaterEnabled(false)
         , mParentNode(parentNode)
@@ -113,6 +116,10 @@ namespace MWPhysics
         mObjects.clear();
         mActors.clear();
 
+        for (ProjectileMap::iterator it = mProjectiles.begin(); it != mProjectiles.end(); ++it)
+        {
+            delete it->second;
+        }
     }
 
     void PhysicsSystem::setUnrefQueue(SceneUtil::UnrefQueue *unrefQueue)
@@ -248,7 +255,7 @@ namespace MWPhysics
         return 0.f;
     }
 
-    RayCastingResult PhysicsSystem::castRay(const osg::Vec3f &from, const osg::Vec3f &to, const MWWorld::ConstPtr& ignore, std::vector<MWWorld::Ptr> targets, int mask, int group) const
+    PhysicsSystem::RayResult PhysicsSystem::castRay(const osg::Vec3f &from, const osg::Vec3f &to, const MWWorld::ConstPtr& ignore, std::vector<MWWorld::Ptr> targets, int mask, int group, int projId) const
     {
         if (from == to)
         {
@@ -285,7 +292,7 @@ namespace MWPhysics
             }
         }
 
-        ClosestNotMeRayResultCallback resultCallback(me, targetCollisionObjects, btFrom, btTo);
+        ClosestNotMeRayResultCallback resultCallback(me, targetCollisionObjects, btFrom, btTo, projId);
         resultCallback.m_collisionFilterGroup = group;
         resultCallback.m_collisionFilterMask = mask;
 
@@ -298,7 +305,17 @@ namespace MWPhysics
             result.mHitPos = Misc::Convert::toOsg(resultCallback.m_hitPointWorld);
             result.mHitNormal = Misc::Convert::toOsg(resultCallback.m_hitNormalWorld);
             if (PtrHolder* ptrHolder = static_cast<PtrHolder*>(resultCallback.m_collisionObject->getUserPointer()))
+            {
                 result.mHitObject = ptrHolder->getPtr();
+
+                if (group == CollisionType_Projectile)
+                {
+                    Projectile* projectile = static_cast<Projectile*>(ptrHolder);
+                    result.mProjectileId = projectile->getProjectileId();
+                }
+                else
+                    result.mProjectileId = -1;
+            }
         }
         return result;
     }
@@ -502,6 +519,19 @@ namespace MWPhysics
         }
     }
 
+    void PhysicsSystem::removeProjectile(const int projectileId)
+    {
+        ProjectileMap::iterator foundProjectile = mProjectiles.find(projectileId);
+        if (foundProjectile != mProjectiles.end())
+        {
+            delete foundProjectile->second;
+            mProjectiles.erase(foundProjectile);
+
+            if (projectileId == mProjectileId)
+                mProjectileId--;
+        }
+    }
+
     void PhysicsSystem::updatePtr(const MWWorld::Ptr &old, const MWWorld::Ptr &updated)
     {
         ObjectMap::iterator found = mObjects.find(old);
@@ -572,6 +602,17 @@ namespace MWPhysics
         }
     }
 
+    void PhysicsSystem::updateProjectile(const int projectileId, const osg::Vec3f &position)
+    {
+        ProjectileMap::iterator foundProjectile = mProjectiles.find(projectileId);
+        if (foundProjectile != mProjectiles.end())
+        {
+            foundProjectile->second->setPosition(position);
+            mCollisionWorld->updateSingleAabb(foundProjectile->second->getCollisionObject());
+            return;
+        }
+    }
+
     void PhysicsSystem::updateRotation(const MWWorld::Ptr &ptr)
     {
         ObjectMap::iterator found = mObjects.find(ptr);
@@ -632,6 +673,15 @@ namespace MWPhysics
         mActors.emplace(ptr, std::move(actor));
     }
 
+    int PhysicsSystem::addProjectile (const osg::Vec3f& position)
+    {
+        mProjectileId++;
+        Projectile* projectile = new Projectile(mProjectileId, position, mCollisionWorld);
+        mProjectiles.insert(std::make_pair(mProjectileId, projectile));
+
+        return mProjectileId;
+    }
+
     bool PhysicsSystem::toggleCollisionMode()
     {
         ActorMap::iterator found = mActors.find(MWMechanics::getPlayer());
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 4137b1e098..4b2aa0384d 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -56,6 +56,7 @@ namespace MWPhysics
     class Object;
     class Actor;
     class PhysicsTaskScheduler;
+    class Projectile;
 
     using ActorMap = std::map<MWWorld::ConstPtr, std::shared_ptr<Actor>>;
 
@@ -127,6 +128,10 @@ namespace MWPhysics
             void addObject (const MWWorld::Ptr& ptr, const std::string& mesh, int collisionType = CollisionType_World);
             void addActor (const MWWorld::Ptr& ptr, const std::string& mesh);
 
+            int addProjectile(const osg::Vec3f& position);
+            void updateProjectile(const int projectileId, const osg::Vec3f &position);
+            void removeProjectile(const int projectileId);
+
             void updatePtr (const MWWorld::Ptr& old, const MWWorld::Ptr& updated);
 
             Actor* getActor(const MWWorld::Ptr& ptr);
@@ -141,7 +146,6 @@ namespace MWPhysics
             void updateRotation (const MWWorld::Ptr& ptr);
             void updatePosition (const MWWorld::Ptr& ptr);
 
-
             void addHeightField (const float* heights, int x, int y, float triSize, float sqrtVerts, float minH, float maxH, const osg::Object* holdObject);
 
             void removeHeightField (int x, int y);
@@ -169,10 +173,19 @@ namespace MWPhysics
             /// \note Only Actor targets are supported at the moment.
             float getHitDistance(const osg::Vec3f& point, const MWWorld::ConstPtr& target) const override;
 
+            struct RayResult
+            {
+                bool mHit;
+                osg::Vec3f mHitPos;
+                osg::Vec3f mHitNormal;
+                MWWorld::Ptr mHitObject;
+                int mProjectileId;
+            };
+
             /// @param me Optional, a Ptr to ignore in the list of results. targets are actors to filter for, ignoring all other actors.
             RayCastingResult castRay(const osg::Vec3f &from, const osg::Vec3f &to, const MWWorld::ConstPtr& ignore = MWWorld::ConstPtr(),
                     std::vector<MWWorld::Ptr> targets = std::vector<MWWorld::Ptr>(),
-                    int mask = CollisionType_World|CollisionType_HeightMap|CollisionType_Actor|CollisionType_Door, int group=0xff) const override;
+                    int mask = CollisionType_World|CollisionType_HeightMap|CollisionType_Actor|CollisionType_Door, int group=0xff, int projId=-1) const override;
 
             RayCastingResult castSphere(const osg::Vec3f& from, const osg::Vec3f& to, float radius) const override;
 
@@ -269,6 +282,9 @@ namespace MWPhysics
 
             ActorMap mActors;
 
+            using ProjectileMap = std::map<int, Projectile *>;
+            ProjectileMap mProjectiles;
+
             using HeightFieldMap = std::map<std::pair<int, int>, HeightField *>;
             HeightFieldMap mHeightFields;
 
@@ -279,6 +295,8 @@ namespace MWPhysics
 
             float mTimeAccum;
 
+            int mProjectileId;
+
             float mWaterHeight;
             bool mWaterEnabled;
 
diff --git a/apps/openmw/mwphysics/projectile.cpp b/apps/openmw/mwphysics/projectile.cpp
new file mode 100644
index 0000000000..f129b8f78c
--- /dev/null
+++ b/apps/openmw/mwphysics/projectile.cpp
@@ -0,0 +1,64 @@
+#include "projectile.hpp"
+
+#include <BulletCollision/CollisionShapes/btSphereShape.h>
+#include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
+
+#include <components/sceneutil/positionattitudetransform.hpp>
+#include <components/resource/bulletshape.hpp>
+#include <components/debug/debuglog.hpp>
+#include <components/misc/convert.hpp>
+
+#include "../mwworld/class.hpp"
+
+#include "collisiontype.hpp"
+
+namespace MWPhysics
+{
+Projectile::Projectile(int projectileId, const osg::Vec3f& position, btCollisionWorld* world)
+    : mCollisionWorld(world)
+{
+    mProjectileId = projectileId;
+
+    mShape.reset(new btSphereShape(1.f));
+    mConvexShape = static_cast<btConvexShape*>(mShape.get());
+
+    mCollisionObject.reset(new btCollisionObject);
+    mCollisionObject->setCollisionFlags(btCollisionObject::CF_KINEMATIC_OBJECT);
+    mCollisionObject->setActivationState(DISABLE_DEACTIVATION);
+    mCollisionObject->setCollisionShape(mShape.get());
+    mCollisionObject->setUserPointer(this);
+
+    setPosition(position);
+
+    const int collisionMask = CollisionType_World | CollisionType_HeightMap |
+        CollisionType_Actor | CollisionType_Door | CollisionType_Water;
+    mCollisionWorld->addCollisionObject(mCollisionObject.get(), CollisionType_Projectile, collisionMask);
+}
+
+Projectile::~Projectile()
+{
+    if (mCollisionObject.get())
+        mCollisionWorld->removeCollisionObject(mCollisionObject.get());
+}
+
+void Projectile::updateCollisionObjectPosition()
+{
+    btTransform tr = mCollisionObject->getWorldTransform();
+   // osg::Vec3f scaledTranslation = mRotation * mMeshTranslation;
+   // osg::Vec3f newPosition = scaledTranslation + mPosition;
+    tr.setOrigin(Misc::Convert::toBullet(mPosition));
+    mCollisionObject->setWorldTransform(tr);
+}
+
+void Projectile::setPosition(const osg::Vec3f &position)
+{
+    mPosition = position;
+    updateCollisionObjectPosition();
+}
+
+osg::Vec3f Projectile::getPosition() const
+{
+    return mPosition;
+}
+
+}
diff --git a/apps/openmw/mwphysics/projectile.hpp b/apps/openmw/mwphysics/projectile.hpp
new file mode 100644
index 0000000000..180802555b
--- /dev/null
+++ b/apps/openmw/mwphysics/projectile.hpp
@@ -0,0 +1,68 @@
+#ifndef OPENMW_MWPHYSICS_PROJECTILE_H
+#define OPENMW_MWPHYSICS_PROJECTILE_H
+
+#include <memory>
+
+#include "ptrholder.hpp"
+
+#include <osg/Vec3f>
+#include <osg/Quat>
+#include <osg/ref_ptr>
+
+class btCollisionWorld;
+class btCollisionShape;
+class btCollisionObject;
+class btConvexShape;
+
+namespace Resource
+{
+    class BulletShape;
+}
+
+namespace MWPhysics
+{
+    class Projectile : public PtrHolder
+    {
+    public:
+        Projectile(const int projectileId, const osg::Vec3f& position, btCollisionWorld* world);
+        ~Projectile();
+
+        btConvexShape* getConvexShape() const { return mConvexShape; }
+
+        void updateCollisionObjectPosition();
+
+        void setPosition(const osg::Vec3f& position);
+
+        osg::Vec3f getPosition() const;
+
+        btCollisionObject* getCollisionObject() const
+        {
+            return mCollisionObject.get();
+        }
+
+        int getProjectileId() const
+        {
+            return mProjectileId;
+        }
+
+    private:
+
+        std::unique_ptr<btCollisionShape> mShape;
+        btConvexShape* mConvexShape;
+
+        std::unique_ptr<btCollisionObject> mCollisionObject;
+
+        osg::Vec3f mPosition;
+
+        btCollisionWorld* mCollisionWorld;
+
+        Projectile(const Projectile&);
+        Projectile& operator=(const Projectile&);
+
+        int mProjectileId;
+    };
+
+}
+
+
+#endif
diff --git a/apps/openmw/mwphysics/trace.cpp b/apps/openmw/mwphysics/trace.cpp
index 58082f4db2..4d2fccdb7b 100644
--- a/apps/openmw/mwphysics/trace.cpp
+++ b/apps/openmw/mwphysics/trace.cpp
@@ -5,6 +5,9 @@
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 #include <BulletCollision/CollisionShapes/btConvexShape.h>
 
+#include "../mwbase/world.hpp"
+#include "../mwbase/environment.hpp"
+
 #include "collisiontype.hpp"
 #include "actor.hpp"
 #include "closestnotmeconvexresultcallback.hpp"
diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index 39cdc3e722..3b61e0522a 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -302,6 +302,7 @@ namespace MWWorld
         MWWorld::Ptr ptr = ref.getPtr();
 
         osg::Vec4 lightDiffuseColor = getMagicBoltLightDiffuseColor(state.mEffects);
+
         createModel(state, ptr.getClass().getModel(ptr), pos, orient, true, true, lightDiffuseColor, texture);
 
         MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
@@ -312,7 +313,8 @@ namespace MWWorld
             if (sound)
                 state.mSounds.push_back(sound);
         }
-            
+
+        state.mProjectileId = mPhysics->addProjectile(pos);
         mMagicBolts.push_back(state);
     }
 
@@ -325,7 +327,6 @@ namespace MWWorld
         state.mIdArrow = projectile.getCellRef().getRefId();
         state.mCasterHandle = actor;
         state.mAttackStrength = attackStrength;
-
         int type = projectile.get<ESM::Weapon>()->mBase->mData.mType;
         state.mThrown = MWMechanics::getWeaponType(type)->mWeaponClass == ESM::WeaponType::Thrown;
 
@@ -336,6 +337,7 @@ namespace MWWorld
         if (!ptr.getClass().getEnchantment(ptr).empty())
             SceneUtil::addEnchantedGlow(state.mNode, mResourceSystem, ptr.getClass().getEnchantmentColor(ptr));
 
+        state.mProjectileId = mPhysics->addProjectile(pos);
         mProjectiles.push_back(state);
     }
 
@@ -416,6 +418,8 @@ namespace MWWorld
 
             it->mNode->setPosition(newPos);
 
+            mPhysics->updateProjectile(it->mProjectileId, newPos);
+
             update(*it, duration);
 
             // For AI actors, get combat targets to use in the ray cast. Only those targets will return a positive hit result.
@@ -425,7 +429,7 @@ namespace MWWorld
 
             // Check for impact
             // TODO: use a proper btRigidBody / btGhostObject?
-            MWPhysics::RayCastingResult result = mPhysics->castRay(pos, newPos, caster, targetActors, 0xff, MWPhysics::CollisionType_Projectile);
+            MWPhysics::PhysicsSystem::RayResult result = mPhysics->castRay(pos, newPos, caster, targetActors, 0xff, MWPhysics::CollisionType_Projectile, it->mProjectileId);
 
             bool hit = false;
             if (result.mHit)
@@ -433,7 +437,7 @@ namespace MWWorld
                 hit = true;
                 if (result.mHitObject.isEmpty())
                 {
-                    // terrain
+                    // terrain or projectile
                 }
                 else
                 {
@@ -456,11 +460,7 @@ namespace MWWorld
                 MWBase::Environment::get().getWorld()->explodeSpell(pos, it->mEffects, caster, result.mHitObject,
                                                                     ESM::RT_Target, it->mSpellId, it->mSourceName);
 
-                MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
-                for (size_t soundIter = 0; soundIter != it->mSounds.size(); soundIter++)
-                    sndMgr->stopSound(it->mSounds.at(soundIter));
-
-                mParent->removeChild(it->mNode);
+                cleanupMagicBolt(*it);
 
                 it = mMagicBolts.erase(it);
                 continue;
@@ -491,6 +491,8 @@ namespace MWWorld
 
             it->mNode->setPosition(newPos);
 
+            mPhysics->updateProjectile(it->mProjectileId, newPos);
+
             update(*it, duration);
 
             MWWorld::Ptr caster = it->getCaster();
@@ -502,15 +504,14 @@ namespace MWWorld
 
             // Check for impact
             // TODO: use a proper btRigidBody / btGhostObject?
-            MWPhysics::RayCastingResult result = mPhysics->castRay(pos, newPos, caster, targetActors, 0xff, MWPhysics::CollisionType_Projectile);
+            MWPhysics::PhysicsSystem::RayResult result = mPhysics->castRay(pos, newPos, caster, targetActors, 0xff, MWPhysics::CollisionType_Projectile, it->mProjectileId);
 
             bool underwater = MWBase::Environment::get().getWorld()->isUnderwater(MWMechanics::getPlayer().getCell(), newPos);
 
             if (result.mHit || underwater)
             {
-                MWWorld::ManualRef projectileRef(MWBase::Environment::get().getWorld()->getStore(), it->mIdArrow);
-
                 // Try to get a Ptr to the bow that was used. It might no longer exist.
+                MWWorld::ManualRef projectileRef(MWBase::Environment::get().getWorld()->getStore(), it->mIdArrow);
                 MWWorld::Ptr bow = projectileRef.getPtr();
                 if (!caster.isEmpty() && it->mIdArrow != it->mBowId)
                 {
@@ -529,8 +530,9 @@ namespace MWWorld
                 if (underwater)
                     mRendering->emitWaterRipple(newPos);
 
-                mParent->removeChild(it->mNode);
+                cleanupProjectile(*it);
                 it = mProjectiles.erase(it);
+
                 continue;
             }
 
@@ -538,14 +540,105 @@ namespace MWWorld
         }
     }
 
+    void ProjectileManager::manualHit(int projectileId, const MWWorld::Ptr& target, const osg::Vec3f& pos)
+    {
+        for (std::vector<ProjectileState>::iterator it = mProjectiles.begin(); it != mProjectiles.end(); ++it)
+        {
+            if (it->mProjectileId == projectileId)
+            {
+                MWWorld::Ptr caster = it->getCaster();
+                if (caster == target)
+                    return;
+
+                if (!isValidTarget(caster, target))
+                    return;
+
+                if (caster.isEmpty())
+                    caster = target;
+
+                // Try to get a Ptr to the bow that was used. It might no longer exist.
+                MWWorld::ManualRef projectileRef(MWBase::Environment::get().getWorld()->getStore(), it->mIdArrow);
+                MWWorld::Ptr bow = projectileRef.getPtr();
+                if (!caster.isEmpty() && it->mIdArrow != it->mBowId)
+                {
+                    MWWorld::InventoryStore& inv = caster.getClass().getInventoryStore(caster);
+                    MWWorld::ContainerStoreIterator invIt = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
+                    if (invIt != inv.end() && Misc::StringUtils::ciEqual(invIt->getCellRef().getRefId(), it->mBowId))
+                        bow = *invIt;
+                }
+
+                it->mHitPosition = pos;
+                cleanupProjectile(*it);
+                MWMechanics::projectileHit(caster, target, bow, projectileRef.getPtr(), pos, it->mAttackStrength);
+                mProjectiles.erase(it);
+                return;
+            }
+        }
+        for (std::vector<MagicBoltState>::iterator it = mMagicBolts.begin(); it != mMagicBolts.end(); ++it)
+        {
+            if (it->mProjectileId == projectileId)
+            {
+                MWWorld::Ptr caster = it->getCaster();
+                if (caster == target)
+                    return;
+
+                if (!isValidTarget(caster, target))
+                    return;
+
+                it->mHitPosition = pos;
+                cleanupMagicBolt(*it);
+
+                MWMechanics::CastSpell cast(caster, target);
+                cast.mHitPosition = pos;
+                cast.mId = it->mSpellId;
+                cast.mSourceName = it->mSourceName;
+                cast.mStack = false;
+                cast.inflict(target, caster, it->mEffects, ESM::RT_Target, false, true);
+
+                MWBase::Environment::get().getWorld()->explodeSpell(pos, it->mEffects, caster, target, ESM::RT_Target, it->mSpellId, it->mSourceName);
+                mMagicBolts.erase(it);
+
+                return;
+            }
+        }
+    }
+
+    bool ProjectileManager::isValidTarget(const MWWorld::Ptr& caster, const MWWorld::Ptr& target)
+    {
+        // For AI actors, get combat targets to use in the ray cast. Only those targets will return a positive hit result.
+        std::vector<MWWorld::Ptr> targetActors;
+        if (!caster.isEmpty() && caster.getClass().isActor() && caster != MWMechanics::getPlayer())
+        {
+            caster.getClass().getCreatureStats(caster).getAiSequence().getCombatTargets(targetActors);
+            if (!targetActors.empty())
+            {
+                bool validTarget = false;
+                for (MWWorld::Ptr& targetActor : targetActors)
+                {
+                    if (targetActor == target)
+                    {
+                        validTarget = true;
+                        break;
+                    }
+                }
+
+                return validTarget;
+            }
+        }
+
+        return true;
+    }
+
     void ProjectileManager::cleanupProjectile(ProjectileManager::ProjectileState& state)
     {
         mParent->removeChild(state.mNode);
+        mPhysics->removeProjectile(state.mProjectileId);
     }
 
     void ProjectileManager::cleanupMagicBolt(ProjectileManager::MagicBoltState& state)
     {
         mParent->removeChild(state.mNode);
+        mPhysics->removeProjectile(state.mProjectileId);
         for (size_t soundIter = 0; soundIter != state.mSounds.size(); soundIter++)
         {
             MWBase::Environment::get().getSoundManager()->stopSound(state.mSounds.at(soundIter));
@@ -626,9 +719,10 @@ namespace MWWorld
                 MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), esm.mId);
                 MWWorld::Ptr ptr = ref.getPtr();
                 model = ptr.getClass().getModel(ptr);
-
                 int weaponType = ptr.get<ESM::Weapon>()->mBase->mData.mType;
                 state.mThrown = MWMechanics::getWeaponType(weaponType)->mWeaponClass == ESM::WeaponType::Thrown;
+
+                state.mProjectileId = mPhysics->addProjectile(osg::Vec3f(esm.mPosition));
             }
             catch(...)
             {
@@ -672,6 +766,7 @@ namespace MWWorld
                 MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), state.mIdMagic.at(0));
                 MWWorld::Ptr ptr = ref.getPtr();
                 model = ptr.getClass().getModel(ptr);
+                state.mProjectileId = mPhysics->addProjectile(osg::Vec3f(esm.mPosition));
             }
             catch(...)
             {
diff --git a/apps/openmw/mwworld/projectilemanager.hpp b/apps/openmw/mwworld/projectilemanager.hpp
index c7b1056b72..58e0ecbf8f 100644
--- a/apps/openmw/mwworld/projectilemanager.hpp
+++ b/apps/openmw/mwworld/projectilemanager.hpp
@@ -56,6 +56,8 @@ namespace MWWorld
 
         void update(float dt);
 
+        void manualHit(int projectileId, const MWWorld::Ptr& target, const osg::Vec3f& pos);
+
         /// Removes all current projectiles. Should be called when switching to a new worldspace.
         void clear();
 
@@ -76,6 +78,9 @@ namespace MWWorld
             std::shared_ptr<MWRender::EffectAnimationTime> mEffectAnimationTime;
 
             int mActorId;
+            int mProjectileId;
+
+            osg::Vec3f mHitPosition;
 
             // TODO: this will break when the game is saved and reloaded, since there is currently
             // no way to write identifiers for non-actors to a savegame.
@@ -125,6 +130,8 @@ namespace MWWorld
         void moveProjectiles(float dt);
         void moveMagicBolts(float dt);
 
+        bool isValidTarget(const MWWorld::Ptr& caster, const MWWorld::Ptr& target);
+
         void createModel (State& state, const std::string& model, const osg::Vec3f& pos, const osg::Quat& orient,
                             bool rotate, bool createLight, osg::Vec4 lightDiffuseColor, std::string texture = "");
         void update (State& state, float duration);
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 49e6a729a8..931791fbc9 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -843,6 +843,11 @@ namespace MWWorld
         }
     }
 
+    void World::manualProjectileHit(int projectileId, const MWWorld::Ptr& target, const osg::Vec3f& pos)
+    {
+        mProjectileManager->manualHit(projectileId, target, pos);
+    }
+
     void World::disable (const Ptr& reference)
     {
         if (!reference.getRefData().isEnabled())
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 1fc5ebc20d..a913108ad2 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -584,6 +584,8 @@ namespace MWWorld
             RestPermitted canRest() const override;
             ///< check if the player is allowed to rest
 
+            void manualProjectileHit(int projectileId, const MWWorld::Ptr& target, const osg::Vec3f& pos);
+
             void rest(double hours) override;
             void rechargeItems(double duration, bool activeOnly) override;
 

From 66fe3b0d38469f280a1f6ec4747b5ed8d889d9bd Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Fri, 23 Oct 2020 20:27:07 +0200
Subject: [PATCH 0058/2859] Modify projectile collision to work with async
 physics

---
 apps/openmw/mwbase/world.hpp                  |   2 -
 .../closestnotmeconvexresultcallback.cpp      |   5 +-
 apps/openmw/mwphysics/mtphysics.cpp           |   6 +
 apps/openmw/mwphysics/physicssystem.cpp       |  38 +--
 apps/openmw/mwphysics/physicssystem.hpp       |  15 +-
 apps/openmw/mwphysics/projectile.cpp          |  58 ++--
 apps/openmw/mwphysics/projectile.hpp          |  59 ++++-
 apps/openmw/mwphysics/raycasting.hpp          |   2 +-
 apps/openmw/mwworld/projectilemanager.cpp     | 249 +++++++++---------
 apps/openmw/mwworld/projectilemanager.hpp     |   4 +-
 apps/openmw/mwworld/worldimp.cpp              |   6 +-
 apps/openmw/mwworld/worldimp.hpp              |   2 -
 12 files changed, 241 insertions(+), 205 deletions(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index c4b3771af0..d4f1d2f8ab 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -610,8 +610,6 @@ namespace MWBase
 
             virtual bool isPlayerInJail() const = 0;
 
-            virtual void manualProjectileHit(int projectileId, const MWWorld::Ptr& target, const osg::Vec3f& pos) = 0;
-
             virtual void rest(double hours) = 0;
             virtual void rechargeItems(double duration, bool activeOnly) = 0;
 
diff --git a/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp b/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp
index 3b97a3a341..b709811f41 100644
--- a/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp
+++ b/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp
@@ -26,12 +26,13 @@ namespace MWPhysics
         if (convexResult.m_hitCollisionObject->getBroadphaseHandle()->m_collisionFilterGroup == CollisionType_Projectile)
         {
             Projectile* projectileHolder = static_cast<Projectile*>(convexResult.m_hitCollisionObject->getUserPointer());
-            int projectileId = projectileHolder->getProjectileId();
+            if (!projectileHolder->isActive())
+                return btScalar(1);
             PtrHolder* targetHolder = static_cast<PtrHolder*>(mMe->getUserPointer());
             const MWWorld::Ptr target = targetHolder->getPtr();
 
             osg::Vec3f pos = Misc::Convert::makeOsgVec3f(convexResult.m_hitPointLocal);
-            MWBase::Environment::get().getWorld()->manualProjectileHit(projectileId, target, pos);
+            projectileHolder->hit(target, pos);
             return btScalar(1);
         }
 
diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 50cfd808ff..a78a307883 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -17,6 +17,7 @@
 #include "mtphysics.hpp"
 #include "object.hpp"
 #include "physicssystem.hpp"
+#include "projectile.hpp"
 
 namespace
 {
@@ -455,6 +456,11 @@ namespace MWPhysics
                 object->commitPositionChange();
                 mCollisionWorld->updateSingleAabb(object->getCollisionObject());
             }
+            else if (const auto projectile = std::dynamic_pointer_cast<Projectile>(p))
+            {
+                projectile->commitPositionChange();
+                mCollisionWorld->updateSingleAabb(projectile->getCollisionObject());
+            }
         };
     }
 
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 8933c9d025..78010fb0ee 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -115,11 +115,7 @@ namespace MWPhysics
 
         mObjects.clear();
         mActors.clear();
-
-        for (ProjectileMap::iterator it = mProjectiles.begin(); it != mProjectiles.end(); ++it)
-        {
-            delete it->second;
-        }
+        mProjectiles.clear();
     }
 
     void PhysicsSystem::setUnrefQueue(SceneUtil::UnrefQueue *unrefQueue)
@@ -255,7 +251,7 @@ namespace MWPhysics
         return 0.f;
     }
 
-    PhysicsSystem::RayResult PhysicsSystem::castRay(const osg::Vec3f &from, const osg::Vec3f &to, const MWWorld::ConstPtr& ignore, std::vector<MWWorld::Ptr> targets, int mask, int group, int projId) const
+    RayCastingResult PhysicsSystem::castRay(const osg::Vec3f &from, const osg::Vec3f &to, const MWWorld::ConstPtr& ignore, std::vector<MWWorld::Ptr> targets, int mask, int group, int projId) const
     {
         if (from == to)
         {
@@ -305,17 +301,7 @@ namespace MWPhysics
             result.mHitPos = Misc::Convert::toOsg(resultCallback.m_hitPointWorld);
             result.mHitNormal = Misc::Convert::toOsg(resultCallback.m_hitNormalWorld);
             if (PtrHolder* ptrHolder = static_cast<PtrHolder*>(resultCallback.m_collisionObject->getUserPointer()))
-            {
                 result.mHitObject = ptrHolder->getPtr();
-
-                if (group == CollisionType_Projectile)
-                {
-                    Projectile* projectile = static_cast<Projectile*>(ptrHolder);
-                    result.mProjectileId = projectile->getProjectileId();
-                }
-                else
-                    result.mProjectileId = -1;
-            }
         }
         return result;
     }
@@ -523,13 +509,7 @@ namespace MWPhysics
     {
         ProjectileMap::iterator foundProjectile = mProjectiles.find(projectileId);
         if (foundProjectile != mProjectiles.end())
-        {
-            delete foundProjectile->second;
             mProjectiles.erase(foundProjectile);
-
-            if (projectileId == mProjectileId)
-                mProjectileId--;
-        }
     }
 
     void PhysicsSystem::updatePtr(const MWWorld::Ptr &old, const MWWorld::Ptr &updated)
@@ -583,6 +563,14 @@ namespace MWPhysics
         return nullptr;
     }
 
+    Projectile* PhysicsSystem::getProjectile(int projectileId) const
+    {
+        ProjectileMap::const_iterator found = mProjectiles.find(projectileId);
+        if (found != mProjectiles.end())
+            return found->second.get();
+        return nullptr;
+    }
+
     void PhysicsSystem::updateScale(const MWWorld::Ptr &ptr)
     {
         ObjectMap::iterator found = mObjects.find(ptr);
@@ -608,7 +596,7 @@ namespace MWPhysics
         if (foundProjectile != mProjectiles.end())
         {
             foundProjectile->second->setPosition(position);
-            mCollisionWorld->updateSingleAabb(foundProjectile->second->getCollisionObject());
+            mTaskScheduler->updateSingleAabb(foundProjectile->second);
             return;
         }
     }
@@ -676,8 +664,8 @@ namespace MWPhysics
     int PhysicsSystem::addProjectile (const osg::Vec3f& position)
     {
         mProjectileId++;
-        Projectile* projectile = new Projectile(mProjectileId, position, mCollisionWorld);
-        mProjectiles.insert(std::make_pair(mProjectileId, projectile));
+        auto projectile = std::make_shared<Projectile>(mProjectileId, position, mTaskScheduler.get());
+        mProjectiles.emplace(mProjectileId, std::move(projectile));
 
         return mProjectileId;
     }
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 4b2aa0384d..6721a2d918 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -139,6 +139,8 @@ namespace MWPhysics
 
             const Object* getObject(const MWWorld::ConstPtr& ptr) const;
 
+            Projectile* getProjectile(int projectileId) const;
+
             // Object or Actor
             void remove (const MWWorld::Ptr& ptr);
 
@@ -173,15 +175,6 @@ namespace MWPhysics
             /// \note Only Actor targets are supported at the moment.
             float getHitDistance(const osg::Vec3f& point, const MWWorld::ConstPtr& target) const override;
 
-            struct RayResult
-            {
-                bool mHit;
-                osg::Vec3f mHitPos;
-                osg::Vec3f mHitNormal;
-                MWWorld::Ptr mHitObject;
-                int mProjectileId;
-            };
-
             /// @param me Optional, a Ptr to ignore in the list of results. targets are actors to filter for, ignoring all other actors.
             RayCastingResult castRay(const osg::Vec3f &from, const osg::Vec3f &to, const MWWorld::ConstPtr& ignore = MWWorld::ConstPtr(),
                     std::vector<MWWorld::Ptr> targets = std::vector<MWWorld::Ptr>(),
@@ -282,7 +275,7 @@ namespace MWPhysics
 
             ActorMap mActors;
 
-            using ProjectileMap = std::map<int, Projectile *>;
+            using ProjectileMap = std::map<int, std::shared_ptr<Projectile>>;
             ProjectileMap mProjectiles;
 
             using HeightFieldMap = std::map<std::pair<int, int>, HeightField *>;
@@ -295,7 +288,7 @@ namespace MWPhysics
 
             float mTimeAccum;
 
-            int mProjectileId;
+            unsigned int mProjectileId;
 
             float mWaterHeight;
             bool mWaterEnabled;
diff --git a/apps/openmw/mwphysics/projectile.cpp b/apps/openmw/mwphysics/projectile.cpp
index f129b8f78c..8abf238cf2 100644
--- a/apps/openmw/mwphysics/projectile.cpp
+++ b/apps/openmw/mwphysics/projectile.cpp
@@ -1,24 +1,28 @@
-#include "projectile.hpp"
+#include <memory>
 
 #include <BulletCollision/CollisionShapes/btSphereShape.h>
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 
-#include <components/sceneutil/positionattitudetransform.hpp>
-#include <components/resource/bulletshape.hpp>
+#include <LinearMath/btVector3.h>
+
 #include <components/debug/debuglog.hpp>
 #include <components/misc/convert.hpp>
+#include <components/resource/bulletshape.hpp>
+#include <components/sceneutil/positionattitudetransform.hpp>
 
 #include "../mwworld/class.hpp"
 
 #include "collisiontype.hpp"
+#include "mtphysics.hpp"
+#include "projectile.hpp"
 
 namespace MWPhysics
 {
-Projectile::Projectile(int projectileId, const osg::Vec3f& position, btCollisionWorld* world)
-    : mCollisionWorld(world)
+Projectile::Projectile(int projectileId, const osg::Vec3f& position, PhysicsTaskScheduler* scheduler)
+    : mActive(true)
+    , mTaskScheduler(scheduler)
+    , mProjectileId(projectileId)
 {
-    mProjectileId = projectileId;
-
     mShape.reset(new btSphereShape(1.f));
     mConvexShape = static_cast<btConvexShape*>(mShape.get());
 
@@ -32,33 +36,47 @@ Projectile::Projectile(int projectileId, const osg::Vec3f& position, btCollision
 
     const int collisionMask = CollisionType_World | CollisionType_HeightMap |
         CollisionType_Actor | CollisionType_Door | CollisionType_Water;
-    mCollisionWorld->addCollisionObject(mCollisionObject.get(), CollisionType_Projectile, collisionMask);
+    mTaskScheduler->addCollisionObject(mCollisionObject.get(), CollisionType_Projectile, collisionMask);
+
+    commitPositionChange();
 }
 
 Projectile::~Projectile()
 {
-    if (mCollisionObject.get())
-        mCollisionWorld->removeCollisionObject(mCollisionObject.get());
+    if (mCollisionObject)
+        mTaskScheduler->removeCollisionObject(mCollisionObject.get());
 }
 
-void Projectile::updateCollisionObjectPosition()
+void Projectile::commitPositionChange()
 {
-    btTransform tr = mCollisionObject->getWorldTransform();
-   // osg::Vec3f scaledTranslation = mRotation * mMeshTranslation;
-   // osg::Vec3f newPosition = scaledTranslation + mPosition;
-    tr.setOrigin(Misc::Convert::toBullet(mPosition));
-    mCollisionObject->setWorldTransform(tr);
+    std::unique_lock<std::mutex> lock(mPositionMutex);
+    if (mTransformUpdatePending)
+    {
+        mCollisionObject->setWorldTransform(mLocalTransform);
+        mTransformUpdatePending = false;
+    }
 }
 
 void Projectile::setPosition(const osg::Vec3f &position)
 {
-    mPosition = position;
-    updateCollisionObjectPosition();
+    std::unique_lock<std::mutex> lock(mPositionMutex);
+    mLocalTransform.setOrigin(Misc::Convert::toBullet(position));
+    mTransformUpdatePending = true;
 }
 
-osg::Vec3f Projectile::getPosition() const
+void Projectile::hit(MWWorld::Ptr target, osg::Vec3f pos)
 {
-    return mPosition;
+    if (!mActive.load(std::memory_order_acquire))
+        return;
+    std::unique_lock<std::mutex> lock(mPositionMutex);
+    mHitTarget = target;
+    mHitPosition = pos;
+    mActive.store(false, std::memory_order_release);
 }
 
+void Projectile::activate()
+{
+    assert(!mActive);
+    mActive.store(true, std::memory_order_release);
+}
 }
diff --git a/apps/openmw/mwphysics/projectile.hpp b/apps/openmw/mwphysics/projectile.hpp
index 180802555b..7ad0a31246 100644
--- a/apps/openmw/mwphysics/projectile.hpp
+++ b/apps/openmw/mwphysics/projectile.hpp
@@ -1,18 +1,23 @@
 #ifndef OPENMW_MWPHYSICS_PROJECTILE_H
 #define OPENMW_MWPHYSICS_PROJECTILE_H
 
+#include <atomic>
 #include <memory>
+#include <mutex>
 
-#include "ptrholder.hpp"
+#include <components/misc/convert.hpp>
 
-#include <osg/Vec3f>
-#include <osg/Quat>
-#include <osg/ref_ptr>
+#include "ptrholder.hpp"
 
-class btCollisionWorld;
-class btCollisionShape;
 class btCollisionObject;
+class btCollisionShape;
 class btConvexShape;
+class btVector3;
+
+namespace osg
+{
+    class Vec3f;
+}
 
 namespace Resource
 {
@@ -21,20 +26,21 @@ namespace Resource
 
 namespace MWPhysics
 {
-    class Projectile : public PtrHolder
+    class PhysicsTaskScheduler;
+    class PhysicsSystem;
+
+    class Projectile final : public PtrHolder
     {
     public:
-        Projectile(const int projectileId, const osg::Vec3f& position, btCollisionWorld* world);
-        ~Projectile();
+        Projectile(const int projectileId, const osg::Vec3f& position, PhysicsTaskScheduler* scheduler);
+        ~Projectile() override;
 
         btConvexShape* getConvexShape() const { return mConvexShape; }
 
-        void updateCollisionObjectPosition();
+        void commitPositionChange();
 
         void setPosition(const osg::Vec3f& position);
 
-        osg::Vec3f getPosition() const;
-
         btCollisionObject* getCollisionObject() const
         {
             return mCollisionObject.get();
@@ -45,16 +51,43 @@ namespace MWPhysics
             return mProjectileId;
         }
 
+        bool isActive() const
+        {
+            return mActive.load(std::memory_order_acquire);
+        }
+
+        MWWorld::Ptr getTarget() const
+        {
+            assert(!mActive);
+            return mHitTarget;
+        }
+
+        osg::Vec3f getHitPos() const
+        {
+            assert(!mActive);
+            return Misc::Convert::toOsg(mHitPosition);
+        }
+
+        void hit(MWWorld::Ptr target, osg::Vec3f pos);
+        void activate();
+
     private:
 
         std::unique_ptr<btCollisionShape> mShape;
         btConvexShape* mConvexShape;
 
         std::unique_ptr<btCollisionObject> mCollisionObject;
+        btTransform mLocalTransform;
+        bool mTransformUpdatePending;
+        std::atomic<bool> mActive;
+        MWWorld::Ptr mHitTarget;
+        osg::Vec3f mHitPosition;
+
+        mutable std::mutex mPositionMutex;
 
         osg::Vec3f mPosition;
 
-        btCollisionWorld* mCollisionWorld;
+        PhysicsTaskScheduler *mTaskScheduler;
 
         Projectile(const Projectile&);
         Projectile& operator=(const Projectile&);
diff --git a/apps/openmw/mwphysics/raycasting.hpp b/apps/openmw/mwphysics/raycasting.hpp
index 7afbe93214..8ca6965d8e 100644
--- a/apps/openmw/mwphysics/raycasting.hpp
+++ b/apps/openmw/mwphysics/raycasting.hpp
@@ -29,7 +29,7 @@ namespace MWPhysics
             /// @param me Optional, a Ptr to ignore in the list of results. targets are actors to filter for, ignoring all other actors.
             virtual RayCastingResult castRay(const osg::Vec3f &from, const osg::Vec3f &to, const MWWorld::ConstPtr& ignore = MWWorld::ConstPtr(),
                     std::vector<MWWorld::Ptr> targets = std::vector<MWWorld::Ptr>(),
-                    int mask = CollisionType_World|CollisionType_HeightMap|CollisionType_Actor|CollisionType_Door, int group=0xff) const = 0;
+                    int mask = CollisionType_World|CollisionType_HeightMap|CollisionType_Actor|CollisionType_Door, int group=0xff, int projId=-1) const = 0;
 
             virtual RayCastingResult castSphere(const osg::Vec3f& from, const osg::Vec3f& to, float radius) const = 0;
 
diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index 3b61e0522a..626c57ac32 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -2,6 +2,7 @@
 
 #include <iomanip>
 
+#include <memory>
 #include <osg/PositionAttitudeTransform>
 
 #include <components/debug/debuglog.hpp>
@@ -43,6 +44,7 @@
 #include "../mwsound/sound.hpp"
 
 #include "../mwphysics/physicssystem.hpp"
+#include "../mwphysics/projectile.hpp"
 
 namespace
 {
@@ -284,7 +286,7 @@ namespace MWWorld
         else
             state.mActorId = -1;
 
-        std::string texture = "";
+        std::string texture;
 
         state.mEffects = getMagicBoltData(state.mIdMagic, state.mSoundIds, state.mSpeed, texture, state.mSourceName, state.mSpellId);
 
@@ -315,6 +317,7 @@ namespace MWWorld
         }
 
         state.mProjectileId = mPhysics->addProjectile(pos);
+        state.mToDelete = false;
         mMagicBolts.push_back(state);
     }
 
@@ -338,6 +341,7 @@ namespace MWWorld
             SceneUtil::addEnchantedGlow(state.mNode, mResourceSystem, ptr.getClass().getEnchantmentColor(ptr));
 
         state.mProjectileId = mPhysics->addProjectile(pos);
+        state.mToDelete = false;
         mProjectiles.push_back(state);
     }
 
@@ -362,65 +366,58 @@ namespace MWWorld
                 return (state.mNode->getPosition() - playerPos).length2() >= farawayThreshold*farawayThreshold;
             };
 
-            for (std::vector<ProjectileState>::iterator it = mProjectiles.begin(); it != mProjectiles.end();)
+            for (auto& projectileState : mProjectiles)
             {
-                if (isCleanable(*it))
-                {
-                    cleanupProjectile(*it);
-                    it = mProjectiles.erase(it);
-                }
-                else
-                    ++it;
+                if (isCleanable(projectileState))
+                    cleanupProjectile(projectileState);
             }
 
-            for (std::vector<MagicBoltState>::iterator it = mMagicBolts.begin(); it != mMagicBolts.end();)
+            for (auto& magicBoltState : mMagicBolts)
             {
-                if (isCleanable(*it))
-                {
-                    cleanupMagicBolt(*it);
-                    it = mMagicBolts.erase(it);
-                }
-                else
-                    ++it;
+                if (isCleanable(magicBoltState))
+                    cleanupMagicBolt(magicBoltState);
             }
         }
     }
 
     void ProjectileManager::moveMagicBolts(float duration)
     {
-        for (std::vector<MagicBoltState>::iterator it = mMagicBolts.begin(); it != mMagicBolts.end();)
+        for (auto& magicBoltState : mMagicBolts)
         {
+            if (magicBoltState.mToDelete)
+                continue;
+
+            const auto* projectile = mPhysics->getProjectile(magicBoltState.mProjectileId);
+            if (!projectile->isActive())
+                continue;
             // If the actor caster is gone, the magic bolt needs to be removed from the scene during the next frame.
-            MWWorld::Ptr caster = it->getCaster();
+            MWWorld::Ptr caster = magicBoltState.getCaster();
             if (!caster.isEmpty() && caster.getClass().isActor())
             {
                 if (caster.getRefData().getCount() <= 0 || caster.getClass().getCreatureStats(caster).isDead())
                 {
-                    cleanupMagicBolt(*it);
-                    it = mMagicBolts.erase(it);
+                    cleanupMagicBolt(magicBoltState);
                     continue;
                 }
             }
 
-            osg::Quat orient = it->mNode->getAttitude();
+            osg::Quat orient = magicBoltState.mNode->getAttitude();
             static float fTargetSpellMaxSpeed = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>()
                         .find("fTargetSpellMaxSpeed")->mValue.getFloat();
-            float speed = fTargetSpellMaxSpeed * it->mSpeed;
+            float speed = fTargetSpellMaxSpeed * magicBoltState.mSpeed;
             osg::Vec3f direction = orient * osg::Vec3f(0,1,0);
             direction.normalize();
-            osg::Vec3f pos(it->mNode->getPosition());
+            osg::Vec3f pos(magicBoltState.mNode->getPosition());
             osg::Vec3f newPos = pos + direction * duration * speed;
 
-            for (size_t soundIter = 0; soundIter != it->mSounds.size(); soundIter++)
-            {
-                it->mSounds.at(soundIter)->setPosition(newPos);
-            }
+            for (const auto& sound : magicBoltState.mSounds)
+                sound->setPosition(newPos);
 
-            it->mNode->setPosition(newPos);
+            magicBoltState.mNode->setPosition(newPos);
 
-            mPhysics->updateProjectile(it->mProjectileId, newPos);
+            mPhysics->updateProjectile(magicBoltState.mProjectileId, newPos);
 
-            update(*it, duration);
+            update(magicBoltState, duration);
 
             // For AI actors, get combat targets to use in the ray cast. Only those targets will return a positive hit result.
             std::vector<MWWorld::Ptr> targetActors;
@@ -429,7 +426,7 @@ namespace MWWorld
 
             // Check for impact
             // TODO: use a proper btRigidBody / btGhostObject?
-            MWPhysics::PhysicsSystem::RayResult result = mPhysics->castRay(pos, newPos, caster, targetActors, 0xff, MWPhysics::CollisionType_Projectile, it->mProjectileId);
+            const auto result = mPhysics->castRay(pos, newPos, caster, targetActors, 0xff, MWPhysics::CollisionType_Projectile, magicBoltState.mProjectileId);
 
             bool hit = false;
             if (result.mHit)
@@ -443,10 +440,10 @@ namespace MWWorld
                 {
                     MWMechanics::CastSpell cast(caster, result.mHitObject);
                     cast.mHitPosition = pos;
-                    cast.mId = it->mSpellId;
-                    cast.mSourceName = it->mSourceName;
+                    cast.mId = magicBoltState.mSpellId;
+                    cast.mSourceName = magicBoltState.mSourceName;
                     cast.mStack = false;
-                    cast.inflict(result.mHitObject, caster, it->mEffects, ESM::RT_Target, false, true);
+                    cast.inflict(result.mHitObject, caster, magicBoltState.mEffects, ESM::RT_Target, false, true);
                     mPhysics->reportCollision(Misc::Convert::toBullet(result.mHitPos), Misc::Convert::toBullet(result.mHitNormal));
                 }
             }
@@ -457,45 +454,46 @@ namespace MWWorld
 
             if (hit)
             {
-                MWBase::Environment::get().getWorld()->explodeSpell(pos, it->mEffects, caster, result.mHitObject,
-                                                                    ESM::RT_Target, it->mSpellId, it->mSourceName);
-
-                cleanupMagicBolt(*it);
+                MWBase::Environment::get().getWorld()->explodeSpell(pos, magicBoltState.mEffects, caster, result.mHitObject,
+                                                                    ESM::RT_Target, magicBoltState.mSpellId, magicBoltState.mSourceName);
 
-                it = mMagicBolts.erase(it);
-                continue;
+                cleanupMagicBolt(magicBoltState);
             }
-            else
-                ++it;
         }
     }
 
     void ProjectileManager::moveProjectiles(float duration)
     {
-        for (std::vector<ProjectileState>::iterator it = mProjectiles.begin(); it != mProjectiles.end();)
+        for (auto& projectileState : mProjectiles)
         {
+            if (projectileState.mToDelete)
+                continue;
+
+            const auto* projectile = mPhysics->getProjectile(projectileState.mProjectileId);
+            if (!projectile->isActive())
+                continue;
             // gravity constant - must be way lower than the gravity affecting actors, since we're not
             // simulating aerodynamics at all
-            it->mVelocity -= osg::Vec3f(0, 0, Constants::GravityConst * Constants::UnitsPerMeter * 0.1f) * duration;
+            projectileState.mVelocity -= osg::Vec3f(0, 0, Constants::GravityConst * Constants::UnitsPerMeter * 0.1f) * duration;
 
-            osg::Vec3f pos(it->mNode->getPosition());
-            osg::Vec3f newPos = pos + it->mVelocity * duration;
+            osg::Vec3f pos(projectileState.mNode->getPosition());
+            osg::Vec3f newPos = pos + projectileState.mVelocity * duration;
 
             // rotation does not work well for throwing projectiles - their roll angle will depend on shooting direction.
-            if (!it->mThrown)
+            if (!projectileState.mThrown)
             {
                 osg::Quat orient;
-                orient.makeRotate(osg::Vec3f(0,1,0), it->mVelocity);
-                it->mNode->setAttitude(orient);
+                orient.makeRotate(osg::Vec3f(0,1,0), projectileState.mVelocity);
+                projectileState.mNode->setAttitude(orient);
             }
 
-            it->mNode->setPosition(newPos);
+            projectileState.mNode->setPosition(newPos);
 
-            mPhysics->updateProjectile(it->mProjectileId, newPos);
+            mPhysics->updateProjectile(projectileState.mProjectileId, newPos);
 
-            update(*it, duration);
+            update(projectileState, duration);
 
-            MWWorld::Ptr caster = it->getCaster();
+            MWWorld::Ptr caster = projectileState.getCaster();
 
             // For AI actors, get combat targets to use in the ray cast. Only those targets will return a positive hit result.
             std::vector<MWWorld::Ptr> targetActors;
@@ -504,103 +502,107 @@ namespace MWWorld
 
             // Check for impact
             // TODO: use a proper btRigidBody / btGhostObject?
-            MWPhysics::PhysicsSystem::RayResult result = mPhysics->castRay(pos, newPos, caster, targetActors, 0xff, MWPhysics::CollisionType_Projectile, it->mProjectileId);
+            const auto result = mPhysics->castRay(pos, newPos, caster, targetActors, 0xff, MWPhysics::CollisionType_Projectile, projectileState.mProjectileId);
 
             bool underwater = MWBase::Environment::get().getWorld()->isUnderwater(MWMechanics::getPlayer().getCell(), newPos);
 
             if (result.mHit || underwater)
             {
                 // Try to get a Ptr to the bow that was used. It might no longer exist.
-                MWWorld::ManualRef projectileRef(MWBase::Environment::get().getWorld()->getStore(), it->mIdArrow);
+                MWWorld::ManualRef projectileRef(MWBase::Environment::get().getWorld()->getStore(), projectileState.mIdArrow);
                 MWWorld::Ptr bow = projectileRef.getPtr();
-                if (!caster.isEmpty() && it->mIdArrow != it->mBowId)
+                if (!caster.isEmpty() && projectileState.mIdArrow != projectileState.mBowId)
                 {
                     MWWorld::InventoryStore& inv = caster.getClass().getInventoryStore(caster);
                     MWWorld::ContainerStoreIterator invIt = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
-                    if (invIt != inv.end() && Misc::StringUtils::ciEqual(invIt->getCellRef().getRefId(), it->mBowId))
+                    if (invIt != inv.end() && Misc::StringUtils::ciEqual(invIt->getCellRef().getRefId(), projectileState.mBowId))
                         bow = *invIt;
                 }
 
                 if (caster.isEmpty())
                     caster = result.mHitObject;
 
-                MWMechanics::projectileHit(caster, result.mHitObject, bow, projectileRef.getPtr(), result.mHit ? result.mHitPos : newPos, it->mAttackStrength);
+                MWMechanics::projectileHit(caster, result.mHitObject, bow, projectileRef.getPtr(), result.mHit ? result.mHitPos : newPos, projectileState.mAttackStrength);
                 mPhysics->reportCollision(Misc::Convert::toBullet(result.mHitPos), Misc::Convert::toBullet(result.mHitNormal));
 
                 if (underwater)
                     mRendering->emitWaterRipple(newPos);
 
-                cleanupProjectile(*it);
-                it = mProjectiles.erase(it);
-
-                continue;
+                cleanupProjectile(projectileState);
             }
-
-            ++it;
         }
     }
 
-    void ProjectileManager::manualHit(int projectileId, const MWWorld::Ptr& target, const osg::Vec3f& pos)
+    void ProjectileManager::processHits()
     {
-        for (std::vector<ProjectileState>::iterator it = mProjectiles.begin(); it != mProjectiles.end(); ++it)
+        for (auto& projectileState : mProjectiles)
         {
-            if (it->mProjectileId == projectileId)
-            {
-                MWWorld::Ptr caster = it->getCaster();
-                if (caster == target)
-                    return;
-
-                if (!isValidTarget(caster, target))
-                    return;
+            if (projectileState.mToDelete)
+                continue;
 
-                if (caster.isEmpty())
-                    caster = target;
+            auto* projectile = mPhysics->getProjectile(projectileState.mProjectileId);
+            if (projectile->isActive())
+                continue;
+            const auto target = projectile->getTarget();
+            const auto pos = projectile->getHitPos();
+            MWWorld::Ptr caster = projectileState.getCaster();
+            if (caster == target || !isValidTarget(caster, target))
+            {
+                projectile->activate();
+                continue;
+            }
 
-                // Try to get a Ptr to the bow that was used. It might no longer exist.
-                MWWorld::ManualRef projectileRef(MWBase::Environment::get().getWorld()->getStore(), it->mIdArrow);
-                MWWorld::Ptr bow = projectileRef.getPtr();
-                if (!caster.isEmpty() && it->mIdArrow != it->mBowId)
-                {
-                    MWWorld::InventoryStore& inv = caster.getClass().getInventoryStore(caster);
-                    MWWorld::ContainerStoreIterator invIt = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
-                    if (invIt != inv.end() && Misc::StringUtils::ciEqual(invIt->getCellRef().getRefId(), it->mBowId))
-                        bow = *invIt;
-                }
+            if (caster.isEmpty())
+                caster = target;
 
-                it->mHitPosition = pos;
-                cleanupProjectile(*it);
-                MWMechanics::projectileHit(caster, target, bow, projectileRef.getPtr(), pos, it->mAttackStrength);
-                mProjectiles.erase(it);
-                return;
+            // Try to get a Ptr to the bow that was used. It might no longer exist.
+            MWWorld::ManualRef projectileRef(MWBase::Environment::get().getWorld()->getStore(), projectileState.mIdArrow);
+            MWWorld::Ptr bow = projectileRef.getPtr();
+            if (!caster.isEmpty() && projectileState.mIdArrow != projectileState.mBowId)
+            {
+                MWWorld::InventoryStore& inv = caster.getClass().getInventoryStore(caster);
+                MWWorld::ContainerStoreIterator invIt = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
+                if (invIt != inv.end() && Misc::StringUtils::ciEqual(invIt->getCellRef().getRefId(), projectileState.mBowId))
+                    bow = *invIt;
             }
+
+            projectileState.mHitPosition = pos;
+            cleanupProjectile(projectileState);
+            MWMechanics::projectileHit(caster, target, bow, projectileRef.getPtr(), pos, projectileState.mAttackStrength);
         }
-        for (std::vector<MagicBoltState>::iterator it = mMagicBolts.begin(); it != mMagicBolts.end(); ++it)
+        for (auto& magicBoltState : mMagicBolts)
         {
-            if (it->mProjectileId == projectileId)
-            {
-                MWWorld::Ptr caster = it->getCaster();
-                if (caster == target)
-                    return;
-
-                if (!isValidTarget(caster, target))
-                    return;
+            if (magicBoltState.mToDelete)
+                continue;
 
-                it->mHitPosition = pos;
-                cleanupMagicBolt(*it);
+            auto* projectile = mPhysics->getProjectile(magicBoltState.mProjectileId);
+            if (projectile->isActive())
+                continue;
+            const auto target = projectile->getTarget();
+            const auto pos = projectile->getHitPos();
+            MWWorld::Ptr caster = magicBoltState.getCaster();
+            if (caster == target || !isValidTarget(caster, target))
+            {
+                projectile->activate();
+                continue;
+            }
 
-                MWMechanics::CastSpell cast(caster, target);
-                cast.mHitPosition = pos;
-                cast.mId = it->mSpellId;
-                cast.mSourceName = it->mSourceName;
-                cast.mStack = false;
-                cast.inflict(target, caster, it->mEffects, ESM::RT_Target, false, true);
+            magicBoltState.mHitPosition = pos;
+            cleanupMagicBolt(magicBoltState);
 
-                MWBase::Environment::get().getWorld()->explodeSpell(pos, it->mEffects, caster, target, ESM::RT_Target, it->mSpellId, it->mSourceName);
-                mMagicBolts.erase(it);
+            MWMechanics::CastSpell cast(caster, target);
+            cast.mHitPosition = pos;
+            cast.mId = magicBoltState.mSpellId;
+            cast.mSourceName = magicBoltState.mSourceName;
+            cast.mStack = false;
+            cast.inflict(target, caster, magicBoltState.mEffects, ESM::RT_Target, false, true);
 
-                return;
-            }
+            MWBase::Environment::get().getWorld()->explodeSpell(pos, magicBoltState.mEffects, caster, target, ESM::RT_Target, magicBoltState.mSpellId, magicBoltState.mSourceName);
         }
+        mProjectiles.erase(std::remove_if(mProjectiles.begin(), mProjectiles.end(), [](const State& state) { return state.mToDelete; }),
+                mProjectiles.end());
+        mMagicBolts.erase(std::remove_if(mMagicBolts.begin(), mMagicBolts.end(), [](const State& state) { return state.mToDelete; }),
+                mMagicBolts.end());
     }
 
     bool ProjectileManager::isValidTarget(const MWWorld::Ptr& caster, const MWWorld::Ptr& target)
@@ -633,12 +635,14 @@ namespace MWWorld
     {
         mParent->removeChild(state.mNode);
         mPhysics->removeProjectile(state.mProjectileId);
+        state.mToDelete = true;
     }
 
     void ProjectileManager::cleanupMagicBolt(ProjectileManager::MagicBoltState& state)
     {
         mParent->removeChild(state.mNode);
         mPhysics->removeProjectile(state.mProjectileId);
+        state.mToDelete = true;
         for (size_t soundIter = 0; soundIter != state.mSounds.size(); soundIter++)
         {
             MWBase::Environment::get().getSoundManager()->stopSound(state.mSounds.at(soundIter));
@@ -647,15 +651,12 @@ namespace MWWorld
 
     void ProjectileManager::clear()
     {
-        for (std::vector<ProjectileState>::iterator it = mProjectiles.begin(); it != mProjectiles.end(); ++it)
-        {
-            cleanupProjectile(*it);
-        }
+        for (auto& mProjectile : mProjectiles)
+            cleanupProjectile(mProjectile);
         mProjectiles.clear();
-        for (std::vector<MagicBoltState>::iterator it = mMagicBolts.begin(); it != mMagicBolts.end(); ++it)
-        {
-            cleanupMagicBolt(*it);
-        }
+
+        for (auto& mMagicBolt : mMagicBolts)
+            cleanupMagicBolt(mMagicBolt);
         mMagicBolts.clear();
     }
 
@@ -712,6 +713,7 @@ namespace MWWorld
             state.mVelocity = esm.mVelocity;
             state.mIdArrow = esm.mId;
             state.mAttackStrength = esm.mAttackStrength;
+            state.mToDelete = false;
 
             std::string model;
             try
@@ -734,7 +736,7 @@ namespace MWWorld
             mProjectiles.push_back(state);
             return true;
         }
-        else if (type == ESM::REC_MPRJ)
+        if (type == ESM::REC_MPRJ)
         {
             ESM::MagicBoltState esm;
             esm.load(reader);
@@ -743,7 +745,8 @@ namespace MWWorld
             state.mIdMagic.push_back(esm.mId);
             state.mSpellId = esm.mSpellId;
             state.mActorId = esm.mActorId;
-            std::string texture = "";
+            state.mToDelete = false;
+            std::string texture;
 
             try
             {
diff --git a/apps/openmw/mwworld/projectilemanager.hpp b/apps/openmw/mwworld/projectilemanager.hpp
index 58e0ecbf8f..d589e985e5 100644
--- a/apps/openmw/mwworld/projectilemanager.hpp
+++ b/apps/openmw/mwworld/projectilemanager.hpp
@@ -56,7 +56,7 @@ namespace MWWorld
 
         void update(float dt);
 
-        void manualHit(int projectileId, const MWWorld::Ptr& target, const osg::Vec3f& pos);
+        void processHits();
 
         /// Removes all current projectiles. Should be called when switching to a new worldspace.
         void clear();
@@ -93,6 +93,8 @@ namespace MWWorld
 
             // MW-id of an arrow projectile
             std::string mIdArrow;
+
+            bool mToDelete;
         };
 
         struct MagicBoltState : public State
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 931791fbc9..9a2dd11819 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -843,11 +843,6 @@ namespace MWWorld
         }
     }
 
-    void World::manualProjectileHit(int projectileId, const MWWorld::Ptr& target, const osg::Vec3f& pos)
-    {
-        mProjectileManager->manualHit(projectileId, target, pos);
-    }
-
     void World::disable (const Ptr& reference)
     {
         if (!reference.getRefData().isEnabled())
@@ -1498,6 +1493,7 @@ namespace MWWorld
         mProjectileManager->update(duration);
 
         const auto results = mPhysics->applyQueuedMovement(duration, mDiscardMovements, frameStart, frameNumber, stats);
+        mProjectileManager->processHits();
         mDiscardMovements = false;
 
         for(const auto& [actor, position]: results)
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index a913108ad2..1fc5ebc20d 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -584,8 +584,6 @@ namespace MWWorld
             RestPermitted canRest() const override;
             ///< check if the player is allowed to rest
 
-            void manualProjectileHit(int projectileId, const MWWorld::Ptr& target, const osg::Vec3f& pos);
-
             void rest(double hours) override;
             void rechargeItems(double duration, bool activeOnly) override;
 

From 7e85235220dfefca9f44f75098c271709e70e001 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sat, 31 Oct 2020 14:01:14 +0100
Subject: [PATCH 0059/2859] Projectile to projectile collision

---
 .../closestnotmeconvexresultcallback.cpp      |  4 +--
 .../closestnotmerayresultcallback.cpp         | 28 +++++++++++++------
 .../closestnotmerayresultcallback.hpp         |  6 ++--
 apps/openmw/mwphysics/physicssystem.cpp       |  4 +--
 apps/openmw/mwphysics/projectile.cpp          | 12 ++++++--
 apps/openmw/mwphysics/projectile.hpp          | 10 ++++---
 6 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp b/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp
index b709811f41..bbffe16a8e 100644
--- a/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp
+++ b/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp
@@ -30,9 +30,7 @@ namespace MWPhysics
                 return btScalar(1);
             PtrHolder* targetHolder = static_cast<PtrHolder*>(mMe->getUserPointer());
             const MWWorld::Ptr target = targetHolder->getPtr();
-
-            osg::Vec3f pos = Misc::Convert::makeOsgVec3f(convexResult.m_hitPointLocal);
-            projectileHolder->hit(target, pos);
+            projectileHolder->hit(target, convexResult.m_hitPointLocal, convexResult.m_hitNormalLocal);
             return btScalar(1);
         }
 
diff --git a/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp b/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp
index 43e1d5c628..422ca78bd5 100644
--- a/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp
+++ b/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp
@@ -1,19 +1,22 @@
 #include "closestnotmerayresultcallback.hpp"
 
 #include <algorithm>
+#include <utility>
 
 #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
 
 #include "../mwworld/class.hpp"
 
+#include "actor.hpp"
+#include "collisiontype.hpp"
 #include "projectile.hpp"
 #include "ptrholder.hpp"
 
 namespace MWPhysics
 {
-    ClosestNotMeRayResultCallback::ClosestNotMeRayResultCallback(const btCollisionObject* me, const std::vector<const btCollisionObject*>& targets, const btVector3& from, const btVector3& to, int projId)
+    ClosestNotMeRayResultCallback::ClosestNotMeRayResultCallback(const btCollisionObject* me, std::vector<const btCollisionObject*>  targets, const btVector3& from, const btVector3& to, Projectile* proj)
     : btCollisionWorld::ClosestRayResultCallback(from, to)
-    , mMe(me), mTargets(targets), mProjectileId(projId)
+    , mMe(me), mTargets(std::move(targets)), mProjectile(proj)
     {
     }
 
@@ -25,20 +28,27 @@ namespace MWPhysics
         {
             if ((std::find(mTargets.begin(), mTargets.end(), rayResult.m_collisionObject) == mTargets.end()))
             {
-                PtrHolder* holder = static_cast<PtrHolder*>(rayResult.m_collisionObject->getUserPointer());
+                auto* holder = static_cast<PtrHolder*>(rayResult.m_collisionObject->getUserPointer());
                 if (holder && !holder->getPtr().isEmpty() && holder->getPtr().getClass().isActor())
                     return 1.f;
             }
         }
 
-        if (mProjectileId >= 0)
+        btCollisionWorld::ClosestRayResultCallback::addSingleResult(rayResult, normalInWorldSpace);
+        if (mProjectile)
         {
-            PtrHolder* holder = static_cast<PtrHolder*>(rayResult.m_collisionObject->getUserPointer());
-            Projectile* projectile = dynamic_cast<Projectile*>(holder);
-            if (projectile && projectile->getProjectileId() == mProjectileId)
-                return 1.f;
+            auto* holder = static_cast<PtrHolder*>(rayResult.m_collisionObject->getUserPointer());
+            if (auto* target = dynamic_cast<Actor*>(holder))
+            {
+                mProjectile->hit(target->getPtr(), m_hitPointWorld, m_hitNormalWorld);
+            }
+            else if (auto* target = dynamic_cast<Projectile*>(holder))
+            {
+                target->hit(mProjectile->getPtr(), m_hitPointWorld, m_hitNormalWorld);
+                mProjectile->hit(target->getPtr(), m_hitPointWorld, m_hitNormalWorld);
+            }
         }
 
-        return btCollisionWorld::ClosestRayResultCallback::addSingleResult(rayResult, normalInWorldSpace);
+        return rayResult.m_hitFraction;
     }
 }
diff --git a/apps/openmw/mwphysics/closestnotmerayresultcallback.hpp b/apps/openmw/mwphysics/closestnotmerayresultcallback.hpp
index d27d64c535..b86427165a 100644
--- a/apps/openmw/mwphysics/closestnotmerayresultcallback.hpp
+++ b/apps/openmw/mwphysics/closestnotmerayresultcallback.hpp
@@ -9,16 +9,18 @@ class btCollisionObject;
 
 namespace MWPhysics
 {
+    class Projectile;
+
     class ClosestNotMeRayResultCallback : public btCollisionWorld::ClosestRayResultCallback
     {
     public:
-        ClosestNotMeRayResultCallback(const btCollisionObject* me, const std::vector<const btCollisionObject*>& targets, const btVector3& from, const btVector3& to, int projId=-1);
+        ClosestNotMeRayResultCallback(const btCollisionObject* me, std::vector<const btCollisionObject*> targets, const btVector3& from, const btVector3& to, Projectile* proj=nullptr);
 
         btScalar addSingleResult(btCollisionWorld::LocalRayResult& rayResult, bool normalInWorldSpace) override;
     private:
         const btCollisionObject* mMe;
         const std::vector<const btCollisionObject*> mTargets;
-        const int mProjectileId;
+        Projectile* mProjectile;
     };
 }
 
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 78010fb0ee..7da2a69643 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -288,7 +288,7 @@ namespace MWPhysics
             }
         }
 
-        ClosestNotMeRayResultCallback resultCallback(me, targetCollisionObjects, btFrom, btTo, projId);
+        ClosestNotMeRayResultCallback resultCallback(me, targetCollisionObjects, btFrom, btTo, getProjectile(projId));
         resultCallback.m_collisionFilterGroup = group;
         resultCallback.m_collisionFilterMask = mask;
 
@@ -664,7 +664,7 @@ namespace MWPhysics
     int PhysicsSystem::addProjectile (const osg::Vec3f& position)
     {
         mProjectileId++;
-        auto projectile = std::make_shared<Projectile>(mProjectileId, position, mTaskScheduler.get());
+        auto projectile = std::make_shared<Projectile>(mProjectileId, position, mTaskScheduler.get(), this);
         mProjectiles.emplace(mProjectileId, std::move(projectile));
 
         return mProjectileId;
diff --git a/apps/openmw/mwphysics/projectile.cpp b/apps/openmw/mwphysics/projectile.cpp
index 8abf238cf2..cbc5b19814 100644
--- a/apps/openmw/mwphysics/projectile.cpp
+++ b/apps/openmw/mwphysics/projectile.cpp
@@ -18,8 +18,9 @@
 
 namespace MWPhysics
 {
-Projectile::Projectile(int projectileId, const osg::Vec3f& position, PhysicsTaskScheduler* scheduler)
+Projectile::Projectile(int projectileId, const osg::Vec3f& position, PhysicsTaskScheduler* scheduler, PhysicsSystem* physicssystem)
     : mActive(true)
+    , mPhysics(physicssystem)
     , mTaskScheduler(scheduler)
     , mProjectileId(projectileId)
 {
@@ -35,7 +36,7 @@ Projectile::Projectile(int projectileId, const osg::Vec3f& position, PhysicsTask
     setPosition(position);
 
     const int collisionMask = CollisionType_World | CollisionType_HeightMap |
-        CollisionType_Actor | CollisionType_Door | CollisionType_Water;
+        CollisionType_Actor | CollisionType_Door | CollisionType_Water | CollisionType_Projectile;
     mTaskScheduler->addCollisionObject(mCollisionObject.get(), CollisionType_Projectile, collisionMask);
 
     commitPositionChange();
@@ -44,7 +45,11 @@ Projectile::Projectile(int projectileId, const osg::Vec3f& position, PhysicsTask
 Projectile::~Projectile()
 {
     if (mCollisionObject)
+    {
+        if (!mActive)
+            mPhysics->reportCollision(mHitPosition, mHitNormal);
         mTaskScheduler->removeCollisionObject(mCollisionObject.get());
+    }
 }
 
 void Projectile::commitPositionChange()
@@ -64,13 +69,14 @@ void Projectile::setPosition(const osg::Vec3f &position)
     mTransformUpdatePending = true;
 }
 
-void Projectile::hit(MWWorld::Ptr target, osg::Vec3f pos)
+void Projectile::hit(MWWorld::Ptr target, btVector3 pos, btVector3 normal)
 {
     if (!mActive.load(std::memory_order_acquire))
         return;
     std::unique_lock<std::mutex> lock(mPositionMutex);
     mHitTarget = target;
     mHitPosition = pos;
+    mHitNormal = normal;
     mActive.store(false, std::memory_order_release);
 }
 
diff --git a/apps/openmw/mwphysics/projectile.hpp b/apps/openmw/mwphysics/projectile.hpp
index 7ad0a31246..6e8aba60b8 100644
--- a/apps/openmw/mwphysics/projectile.hpp
+++ b/apps/openmw/mwphysics/projectile.hpp
@@ -5,7 +5,7 @@
 #include <memory>
 #include <mutex>
 
-#include <components/misc/convert.hpp>
+#include "components/misc/convert.hpp"
 
 #include "ptrholder.hpp"
 
@@ -32,7 +32,7 @@ namespace MWPhysics
     class Projectile final : public PtrHolder
     {
     public:
-        Projectile(const int projectileId, const osg::Vec3f& position, PhysicsTaskScheduler* scheduler);
+        Projectile(const int projectileId, const osg::Vec3f& position, PhysicsTaskScheduler* scheduler, PhysicsSystem* physicssystem);
         ~Projectile() override;
 
         btConvexShape* getConvexShape() const { return mConvexShape; }
@@ -68,7 +68,7 @@ namespace MWPhysics
             return Misc::Convert::toOsg(mHitPosition);
         }
 
-        void hit(MWWorld::Ptr target, osg::Vec3f pos);
+        void hit(MWWorld::Ptr target, btVector3 pos, btVector3 normal);
         void activate();
 
     private:
@@ -81,12 +81,14 @@ namespace MWPhysics
         bool mTransformUpdatePending;
         std::atomic<bool> mActive;
         MWWorld::Ptr mHitTarget;
-        osg::Vec3f mHitPosition;
+        btVector3 mHitPosition;
+        btVector3 mHitNormal;
 
         mutable std::mutex mPositionMutex;
 
         osg::Vec3f mPosition;
 
+        PhysicsSystem *mPhysics;
         PhysicsTaskScheduler *mTaskScheduler;
 
         Projectile(const Projectile&);

From 4fbe1ed12cbe2e2adaa4b95eefee42a24af8f5a4 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sat, 21 Nov 2020 16:26:45 +0100
Subject: [PATCH 0060/2859] Ignore caster collision shape. Sometimes the magic
 bolt get launched inside too near its caster.

---
 .../mwphysics/closestnotmeconvexresultcallback.cpp | 12 ++++++++----
 apps/openmw/mwphysics/physicssystem.cpp            |  4 ++--
 apps/openmw/mwphysics/physicssystem.hpp            |  2 +-
 apps/openmw/mwphysics/projectile.cpp               |  3 ++-
 apps/openmw/mwphysics/projectile.hpp               |  5 ++++-
 apps/openmw/mwworld/projectilemanager.cpp          | 14 ++++++++------
 6 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp b/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp
index bbffe16a8e..8f72422765 100644
--- a/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp
+++ b/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp
@@ -25,13 +25,17 @@ namespace MWPhysics
 
         if (convexResult.m_hitCollisionObject->getBroadphaseHandle()->m_collisionFilterGroup == CollisionType_Projectile)
         {
-            Projectile* projectileHolder = static_cast<Projectile*>(convexResult.m_hitCollisionObject->getUserPointer());
+            auto* projectileHolder = static_cast<Projectile*>(convexResult.m_hitCollisionObject->getUserPointer());
             if (!projectileHolder->isActive())
                 return btScalar(1);
-            PtrHolder* targetHolder = static_cast<PtrHolder*>(mMe->getUserPointer());
+            auto* targetHolder = static_cast<PtrHolder*>(mMe->getUserPointer());
             const MWWorld::Ptr target = targetHolder->getPtr();
-            projectileHolder->hit(target, convexResult.m_hitPointLocal, convexResult.m_hitNormalLocal);
-            return btScalar(1);
+            // do nothing if we hit the caster. Sometimes the launching origin is inside of caster collision shape
+            if (projectileHolder->getCaster() != target)
+            {
+                projectileHolder->hit(target, convexResult.m_hitPointLocal, convexResult.m_hitNormalLocal);
+                return btScalar(1);
+            }
         }
 
         btVector3 hitNormalWorld;
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 7da2a69643..324b1db2d7 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -661,10 +661,10 @@ namespace MWPhysics
         mActors.emplace(ptr, std::move(actor));
     }
 
-    int PhysicsSystem::addProjectile (const osg::Vec3f& position)
+    int PhysicsSystem::addProjectile (const MWWorld::Ptr& caster, const osg::Vec3f& position)
     {
         mProjectileId++;
-        auto projectile = std::make_shared<Projectile>(mProjectileId, position, mTaskScheduler.get(), this);
+        auto projectile = std::make_shared<Projectile>(mProjectileId, caster, position, mTaskScheduler.get(), this);
         mProjectiles.emplace(mProjectileId, std::move(projectile));
 
         return mProjectileId;
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 6721a2d918..b33d829a46 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -128,7 +128,7 @@ namespace MWPhysics
             void addObject (const MWWorld::Ptr& ptr, const std::string& mesh, int collisionType = CollisionType_World);
             void addActor (const MWWorld::Ptr& ptr, const std::string& mesh);
 
-            int addProjectile(const osg::Vec3f& position);
+            int addProjectile(const MWWorld::Ptr& caster, const osg::Vec3f& position);
             void updateProjectile(const int projectileId, const osg::Vec3f &position);
             void removeProjectile(const int projectileId);
 
diff --git a/apps/openmw/mwphysics/projectile.cpp b/apps/openmw/mwphysics/projectile.cpp
index cbc5b19814..5f5bc778ba 100644
--- a/apps/openmw/mwphysics/projectile.cpp
+++ b/apps/openmw/mwphysics/projectile.cpp
@@ -18,8 +18,9 @@
 
 namespace MWPhysics
 {
-Projectile::Projectile(int projectileId, const osg::Vec3f& position, PhysicsTaskScheduler* scheduler, PhysicsSystem* physicssystem)
+Projectile::Projectile(int projectileId, const MWWorld::Ptr& caster, const osg::Vec3f& position, PhysicsTaskScheduler* scheduler, PhysicsSystem* physicssystem)
     : mActive(true)
+    , mCaster(caster)
     , mPhysics(physicssystem)
     , mTaskScheduler(scheduler)
     , mProjectileId(projectileId)
diff --git a/apps/openmw/mwphysics/projectile.hpp b/apps/openmw/mwphysics/projectile.hpp
index 6e8aba60b8..ed0fdce150 100644
--- a/apps/openmw/mwphysics/projectile.hpp
+++ b/apps/openmw/mwphysics/projectile.hpp
@@ -32,7 +32,7 @@ namespace MWPhysics
     class Projectile final : public PtrHolder
     {
     public:
-        Projectile(const int projectileId, const osg::Vec3f& position, PhysicsTaskScheduler* scheduler, PhysicsSystem* physicssystem);
+        Projectile(const int projectileId, const MWWorld::Ptr& caster, const osg::Vec3f& position, PhysicsTaskScheduler* scheduler, PhysicsSystem* physicssystem);
         ~Projectile() override;
 
         btConvexShape* getConvexShape() const { return mConvexShape; }
@@ -62,6 +62,8 @@ namespace MWPhysics
             return mHitTarget;
         }
 
+        MWWorld::Ptr getCaster() const { return mCaster; }
+
         osg::Vec3f getHitPos() const
         {
             assert(!mActive);
@@ -80,6 +82,7 @@ namespace MWPhysics
         btTransform mLocalTransform;
         bool mTransformUpdatePending;
         std::atomic<bool> mActive;
+        MWWorld::Ptr mCaster;
         MWWorld::Ptr mHitTarget;
         btVector3 mHitPosition;
         btVector3 mHitNormal;
diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index 626c57ac32..dba4289a23 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -316,7 +316,7 @@ namespace MWWorld
                 state.mSounds.push_back(sound);
         }
 
-        state.mProjectileId = mPhysics->addProjectile(pos);
+        state.mProjectileId = mPhysics->addProjectile(caster, pos);
         state.mToDelete = false;
         mMagicBolts.push_back(state);
     }
@@ -340,7 +340,7 @@ namespace MWWorld
         if (!ptr.getClass().getEnchantment(ptr).empty())
             SceneUtil::addEnchantedGlow(state.mNode, mResourceSystem, ptr.getClass().getEnchantmentColor(ptr));
 
-        state.mProjectileId = mPhysics->addProjectile(pos);
+        state.mProjectileId = mPhysics->addProjectile(actor, pos);
         state.mToDelete = false;
         mProjectiles.push_back(state);
     }
@@ -546,7 +546,8 @@ namespace MWWorld
             const auto target = projectile->getTarget();
             const auto pos = projectile->getHitPos();
             MWWorld::Ptr caster = projectileState.getCaster();
-            if (caster == target || !isValidTarget(caster, target))
+            assert(target != caster);
+            if (!isValidTarget(caster, target))
             {
                 projectile->activate();
                 continue;
@@ -581,7 +582,8 @@ namespace MWWorld
             const auto target = projectile->getTarget();
             const auto pos = projectile->getHitPos();
             MWWorld::Ptr caster = magicBoltState.getCaster();
-            if (caster == target || !isValidTarget(caster, target))
+            assert(target != caster);
+            if (!isValidTarget(caster, target))
             {
                 projectile->activate();
                 continue;
@@ -724,7 +726,7 @@ namespace MWWorld
                 int weaponType = ptr.get<ESM::Weapon>()->mBase->mData.mType;
                 state.mThrown = MWMechanics::getWeaponType(weaponType)->mWeaponClass == ESM::WeaponType::Thrown;
 
-                state.mProjectileId = mPhysics->addProjectile(osg::Vec3f(esm.mPosition));
+                state.mProjectileId = mPhysics->addProjectile(state.getCaster(), osg::Vec3f(esm.mPosition));
             }
             catch(...)
             {
@@ -769,7 +771,7 @@ namespace MWWorld
                 MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), state.mIdMagic.at(0));
                 MWWorld::Ptr ptr = ref.getPtr();
                 model = ptr.getClass().getModel(ptr);
-                state.mProjectileId = mPhysics->addProjectile(osg::Vec3f(esm.mPosition));
+                state.mProjectileId = mPhysics->addProjectile(state.getCaster(), osg::Vec3f(esm.mPosition));
             }
             catch(...)
             {

From 39ac0cbb4ab37a373e4c67b8c2c18be74e45cde8 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Tue, 8 Dec 2020 17:47:25 +0100
Subject: [PATCH 0061/2859] Don't crash the game when placing a non-actor

---
 apps/openmw/mwworld/worldimp.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 9a2dd11819..d00fabb66d 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1345,7 +1345,11 @@ namespace MWWorld
 
         moveObject(ptr, ptr.getCell(), pos.x(), pos.y(), pos.z());
         if (force) // force physics to use the new position
-            mPhysics->getActor(ptr)->resetPosition();
+        {
+            auto actor = mPhysics->getActor(ptr);
+            if(actor)
+                actor->resetPosition();
+        }
     }
 
     void World::fixPosition()

From 61a4a0807b4ed2398b8169b477132b12a1a3a106 Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Wed, 9 Dec 2020 00:10:58 +0200
Subject: [PATCH 0062/2859] Load master index in refId to mContentFile, keep
 master index also in mIndex

---
 apps/opencs/model/world/refcollection.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/model/world/refcollection.cpp b/apps/opencs/model/world/refcollection.cpp
index d8f6b391b7..126a0ea789 100644
--- a/apps/opencs/model/world/refcollection.cpp
+++ b/apps/opencs/model/world/refcollection.cpp
@@ -64,10 +64,12 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
 
         // ignore content file number
         std::map<ESM::RefNum, std::string>::iterator iter = cache.begin();
-        ref.mRefNum.mIndex = ref.mRefNum.mIndex & 0x00ffffff;
+        unsigned int thisIndex = ref.mRefNum.mIndex & 0x00ffffff;
+        if (ref.mRefNum.mContentFile != -1 && !base) ref.mRefNum.mContentFile = ref.mRefNum.mIndex >> 24;
+
         for (; iter != cache.end(); ++iter)
         {
-            if (ref.mRefNum.mIndex == iter->first.mIndex)
+            if (thisIndex == iter->first.mIndex)
                 break;
         }
 

From 49c6e50c31082b00ce54c76d6ff7a7fe0c1e4d7d Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Tue, 8 Dec 2020 22:23:11 +0100
Subject: [PATCH 0063/2859] Print '--version' and '--help' messages without
 timestamps

---
 CHANGELOG.md                   | 1 +
 apps/openmw/main.cpp           | 4 ++--
 components/debug/debugging.cpp | 9 +++++++++
 components/debug/debugging.hpp | 3 +++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e545156760..b09c60abb5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -73,6 +73,7 @@
     Feature #390: 3rd person look "over the shoulder"
     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 #4894: Consider actors as obstacles for pathfinding
     Feature #5043: Head Bobbing
     Feature #5297: Add a search function to the "Datafiles" tab of the OpenMW launcher
diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index aca0505920..89aa2b9fd5 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -135,7 +135,7 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
 
     if (variables.count ("help"))
     {
-        std::cout << desc << std::endl;
+        getRawStdout() << desc << std::endl;
         return false;
     }
 
@@ -144,7 +144,7 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
         cfgMgr.readConfiguration(variables, desc, true);
 
         Version::Version v = Version::getOpenmwVersion(variables["resources"].as<Files::EscapePath>().mPath.string());
-        std::cout << v.describe() << std::endl;
+        getRawStdout() << v.describe() << std::endl;
         return false;
     }
 
diff --git a/components/debug/debugging.cpp b/components/debug/debugging.cpp
index 88219dcbe1..987a3db7e1 100644
--- a/components/debug/debugging.cpp
+++ b/components/debug/debugging.cpp
@@ -1,6 +1,7 @@
 #include "debugging.hpp"
 
 #include <chrono>
+#include <memory>
 
 #include <components/crashcatcher/crashcatcher.hpp>
 
@@ -133,11 +134,19 @@ namespace Debug
     }
 }
 
+static std::unique_ptr<std::ostream> rawStdout = nullptr;
+
+std::ostream& getRawStdout()
+{
+    return rawStdout ? *rawStdout : std::cout;
+}
+
 int wrapApplication(int (*innerApplication)(int argc, char *argv[]), int argc, char *argv[], const std::string& appName)
 {
 #if defined _WIN32
     (void)Debug::attachParentConsole();
 #endif
+    rawStdout = std::make_unique<std::ostream>(std::cout.rdbuf());
 
     // Some objects used to redirect cout and cerr
     // Scope must be here, so this still works inside the catch block for logging exceptions
diff --git a/components/debug/debugging.hpp b/components/debug/debugging.hpp
index 39390446ff..d8849cd896 100644
--- a/components/debug/debugging.hpp
+++ b/components/debug/debugging.hpp
@@ -135,6 +135,9 @@ namespace Debug
 #endif
 }
 
+// Can be used to print messages without timestamps
+std::ostream& getRawStdout();
+
 int wrapApplication(int (*innerApplication)(int argc, char *argv[]), int argc, char *argv[], const std::string& appName);
 
 #endif

From fd4a62ce35d5d2dc65e4b6353c38192a6f381554 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Wed, 9 Dec 2020 00:32:01 +0000
Subject: [PATCH 0064/2859] Use correct variable types when loading config for
 tests

---
 apps/openmw_test_suite/mwworld/test_store.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/apps/openmw_test_suite/mwworld/test_store.cpp b/apps/openmw_test_suite/mwworld/test_store.cpp
index 77aaccfdd0..f3b2bb3dcb 100644
--- a/apps/openmw_test_suite/mwworld/test_store.cpp
+++ b/apps/openmw_test_suite/mwworld/test_store.cpp
@@ -3,6 +3,7 @@
 #include <boost/filesystem/fstream.hpp>
 
 #include <components/files/configurationmanager.hpp>
+#include <components/files/escape.hpp>
 #include <components/esm/esmreader.hpp>
 #include <components/esm/esmwriter.hpp>
 #include <components/loadinglistener/loadinglistener.hpp>
@@ -58,10 +59,10 @@ struct ContentFileTest : public ::testing::Test
 
         boost::program_options::options_description desc("Allowed options");
         desc.add_options()
-        ("data", boost::program_options::value<Files::PathContainer>()->default_value(Files::PathContainer(), "data")->multitoken()->composing())
-        ("content", boost::program_options::value<std::vector<std::string> >()->default_value(std::vector<std::string>(), "")
-            ->multitoken(), "content file(s): esm/esp, or omwgame/omwaddon")
-        ("data-local", boost::program_options::value<std::string>()->default_value(""));
+        ("data", boost::program_options::value<Files::EscapePathContainer>()->default_value(Files::EscapePathContainer(), "data")->multitoken()->composing())
+        ("content", boost::program_options::value<Files::EscapeStringVector>()->default_value(Files::EscapeStringVector(), "")
+            ->multitoken()->composing(), "content file(s): esm/esp, or omwgame/omwaddon")
+        ("data-local", boost::program_options::value<Files::EscapePath>()->default_value(Files::EscapePath(), ""));
 
         boost::program_options::notify(variables);
 
@@ -69,12 +70,12 @@ struct ContentFileTest : public ::testing::Test
 
         Files::PathContainer dataDirs, dataLocal;
         if (!variables["data"].empty()) {
-            dataDirs = Files::PathContainer(variables["data"].as<Files::PathContainer>());
+            dataDirs = Files::EscapePath::toPathContainer(variables["data"].as<Files::EscapePathContainer>());
         }
 
-        std::string local = variables["data-local"].as<std::string>();
+        Files::PathContainer::value_type local(variables["data-local"].as<Files::EscapePath>().mPath);
         if (!local.empty()) {
-            dataLocal.push_back(Files::PathContainer::value_type(local));
+            dataLocal.push_back(local);
         }
 
         mConfigurationManager.processPaths (dataDirs);
@@ -85,7 +86,7 @@ struct ContentFileTest : public ::testing::Test
 
         Files::Collections collections (dataDirs, true);
 
-        std::vector<std::string> contentFiles = variables["content"].as<std::vector<std::string> >();
+        std::vector<std::string> contentFiles = variables["content"].as<Files::EscapeStringVector>().toStdStringVector();
         for (auto & contentFile : contentFiles)
             mContentFiles.push_back(collections.getPath(contentFile));
     }

From 525292b18418989c6ae37351bffb17cd30f42b4e Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 10 Dec 2020 19:02:38 +0100
Subject: [PATCH 0065/2859] Add graphic herbalism to the launcher

---
 CHANGELOG.md                                    |  1 +
 apps/launcher/advancedpage.cpp                  |  2 ++
 docs/source/reference/modding/settings/game.rst | 11 +++++++++++
 files/ui/advancedpage.ui                        | 10 ++++++++++
 4 files changed, 24 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b09c60abb5..b16480b02d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -94,6 +94,7 @@
     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
     Task #5480: Drop Qt4 support
     Task #5520: Improve cell name autocompleter implementation
 
diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index b35e786395..ed04072351 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -153,6 +153,7 @@ bool Launcher::AdvancedPage::loadSettings()
         if (showOwnedIndex >= 0 && showOwnedIndex <= 3)
             showOwnedComboBox->setCurrentIndex(showOwnedIndex);
         loadSettingBool(stretchBackgroundCheckBox, "stretch menu background", "GUI");
+        loadSettingBool(graphicHerbalismCheckBox, "graphic herbalism", "Game");
     }
 
     // Bug fixes
@@ -279,6 +280,7 @@ void Launcher::AdvancedPage::saveSettings()
         if (showOwnedCurrentIndex != mEngineSettings.getInt("show owned", "Game"))
             mEngineSettings.setInt("show owned", "Game", showOwnedCurrentIndex);
         saveSettingBool(stretchBackgroundCheckBox, "stretch menu background", "GUI");
+        saveSettingBool(graphicHerbalismCheckBox, "graphic herbalism", "Game");
     }
 
     // Bug fixes
diff --git a/docs/source/reference/modding/settings/game.rst b/docs/source/reference/modding/settings/game.rst
index fd93eba61b..4e1fe13183 100644
--- a/docs/source/reference/modding/settings/game.rst
+++ b/docs/source/reference/modding/settings/game.rst
@@ -428,3 +428,14 @@ even if the fighting NPC is knocked out.
 This setting allows the player to steal items from fighting NPCs that were knocked out if enabled.
 
 This setting can be controlled in Advanced tab of the launcher.
+
+graphic herbalism
+-----------------
+
+:Type:      boolean
+:Range:		True/False
+:Default:	True
+
+Some mods add harvestable container models. When this setting is enabled, activating a container using a harvestable model will visually harvest from it instead of opening the menu.
+
+When this setting is turned off or when activating a regular container, the menu will open as usual.
diff --git a/files/ui/advancedpage.ui b/files/ui/advancedpage.ui
index 3f53180daf..a3601ce94d 100644
--- a/files/ui/advancedpage.ui
+++ b/files/ui/advancedpage.ui
@@ -724,6 +724,16 @@ True: In non-combat mode camera is positioned behind the character's shoulder. C
          </property>
         </widget>
        </item>
+       <item>
+        <widget class="QCheckBox" name="graphicHerbalismCheckBox">
+         <property name="toolTip">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, containers supporting graphic herbalism will do so instead of opening the menu.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="text">
+          <string>Enable graphic herbalism</string>
+         </property>
+        </widget>
+       </item>
        <item>
         <spacer name="verticalSpacer_2">
          <property name="orientation">

From 7156b11dbc4e924a3d97654ed657f1d5b3dae88f Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Thu, 10 Dec 2020 21:30:05 +0000
Subject: [PATCH 0066/2859] be explicit about narrowing to resolve: error: type
 'btScalar *' (aka 'float *') cannot be narrowed to 'bool' in initializer list
 [-Wc++11-narrowing]

---
 apps/openmw_test_suite/detournavigator/recastmeshobject.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw_test_suite/detournavigator/recastmeshobject.cpp b/apps/openmw_test_suite/detournavigator/recastmeshobject.cpp
index a3606f8273..621db51a89 100644
--- a/apps/openmw_test_suite/detournavigator/recastmeshobject.cpp
+++ b/apps/openmw_test_suite/detournavigator/recastmeshobject.cpp
@@ -15,7 +15,7 @@ namespace
     struct DetourNavigatorRecastMeshObjectTest : Test
     {
         btBoxShape mBoxShape {btVector3(1, 2, 3)};
-        btCompoundShape mCompoundShape {btVector3(1, 2, 3)};
+        btCompoundShape mCompoundShape {true};
         btTransform mTransform {btQuaternion(btVector3(1, 2, 3), 1), btVector3(1, 2, 3)};
 
         DetourNavigatorRecastMeshObjectTest()

From 842ea9d6ed06cbfc3044387f96582fda2b6316c2 Mon Sep 17 00:00:00 2001
From: Coleman Smith <coleman.d.smith@gmail.com>
Date: Thu, 10 Dec 2020 21:36:46 +0000
Subject: [PATCH 0067/2859] simplifying a bit - attaching gradient camera
 directly to the main camera - using Vec4ub

---
 apps/opencs/model/prefs/state.cpp       |  13 ++
 apps/opencs/view/render/cellarrow.cpp   |   4 +-
 apps/opencs/view/render/scenewidget.cpp | 154 ++++++++++++++++++++++--
 apps/opencs/view/render/scenewidget.hpp |   7 +-
 4 files changed, 168 insertions(+), 10 deletions(-)

diff --git a/apps/opencs/model/prefs/state.cpp b/apps/opencs/model/prefs/state.cpp
index 39aae48bda..588be9ccb3 100644
--- a/apps/opencs/model/prefs/state.cpp
+++ b/apps/opencs/model/prefs/state.cpp
@@ -210,6 +210,19 @@ void CSMPrefs::State::declare()
         setTooltip("Size of the orthographic frustum, greater value will allow the camera to see more of the world.").
         setRange(10, 10000);
     declareDouble ("object-marker-alpha", "Object Marker Transparency", 0.5).setPrecision(2).setRange(0,1);
+    declareBool("scene-use-gradient", "Use Gradient Background", true);
+    declareColour ("scene-day-background-colour", "Day Background Colour", QColor (110, 120, 128, 255));
+    declareColour ("scene-day-gradient-colour", "Day Gradient  Colour", QColor (47, 51, 51, 255)).
+        setTooltip("Sets the gradient color to use in conjunction with the day background color. Ignored if "
+                   "the gradient option is disabled.");
+    declareColour ("scene-bright-background-colour", "Scene Bright Background Colour", QColor (79, 87, 92, 255));
+    declareColour ("scene-bright-gradient-colour", "Scene Bright Gradient Colour", QColor (47, 51, 51, 255)).
+        setTooltip("Sets the gradient color to use in conjunction with the bright background color. Ignored if "
+            "the gradient option is disabled.");
+    declareColour ("scene-night-background-colour", "Scene Night Background Colour", QColor (64, 77, 79, 255));
+    declareColour ("scene-night-gradient-colour", "Scene Night Gradient Colour", QColor (47, 51, 51, 255)).
+        setTooltip("Sets the gradient color to use in conjunction with the night background color. Ignored if "
+            "the gradient option is disabled.");
 
     declareCategory ("Tooltips");
     declareBool ("scene", "Show Tooltips in 3D scenes", true);
diff --git a/apps/opencs/view/render/cellarrow.cpp b/apps/opencs/view/render/cellarrow.cpp
index b6fee15459..ac260fe83a 100644
--- a/apps/opencs/view/render/cellarrow.cpp
+++ b/apps/opencs/view/render/cellarrow.cpp
@@ -151,9 +151,9 @@ void CSVRender::CellArrow::buildShape()
     osg::Vec4Array *colours = new osg::Vec4Array;
 
     for (int i=0; i<6; ++i)
-        colours->push_back (osg::Vec4f (1.0f, 0.0f, 0.0f, 1.0f));
+        colours->push_back (osg::Vec4f (0.11, 0.6f, 0.95f, 1.0f));
     for (int i=0; i<6; ++i)
-        colours->push_back (osg::Vec4f (0.8f, (i==2 || i==5) ? 0.6f : 0.4f, 0.0f, 1.0f));
+        colours->push_back (osg::Vec4f (0.08f, 0.44f, 0.7f, 1.0f));
 
     geometry->setColorArray (colours, osg::Array::BIND_PER_VERTEX);
 
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index 3abc01d2e6..b2648da675 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -69,7 +69,6 @@ RenderWidget::RenderWidget(QWidget *parent, Qt::WindowFlags f)
     setLayout(layout);
 
     mView->getCamera()->setGraphicsContext(window);
-    mView->getCamera()->setClearColor( osg::Vec4(0.2, 0.2, 0.6, 1.0) );
     mView->getCamera()->setViewport( new osg::Viewport(0, 0, traits->width, traits->height) );
 
     SceneUtil::LightManager* lightMgr = new SceneUtil::LightManager;
@@ -212,6 +211,25 @@ SceneWidget::SceneWidget(std::shared_ptr<Resource::ResourceSystem> resourceSyste
 
     mOrbitCamControl->setConstRoll( CSMPrefs::get()["3D Scene Input"]["navi-orbit-const-roll"].isTrue() );
 
+    // set up gradient view or configured clear color
+    QColor bgColour = CSMPrefs::get()["Rendering"]["scene-day-background-colour"].toColor();
+
+    if (CSMPrefs::get()["Rendering"]["scene-use-gradient"].isTrue()) {
+        QColor gradientColour = CSMPrefs::get()["Rendering"]["scene-day-gradient-colour"].toColor();
+        mGradientCamera = createGradientCamera(bgColour, gradientColour);
+
+        mView->getCamera()->setClearMask(0);
+        mView->getCamera()->addChild(mGradientCamera.get());
+    }
+    else {
+        mView->getCamera()->setClearColor(osg::Vec4(
+            bgColour.redF(),
+            bgColour.greenF(),
+            bgColour.blueF(),
+            1.0f
+        ));
+    }
+
     // we handle lighting manually
     mView->setLightingMode(osgViewer::View::NO_LIGHT);
 
@@ -249,6 +267,81 @@ SceneWidget::~SceneWidget()
     mResourceSystem->releaseGLObjects(mView->getCamera()->getGraphicsContext()->getState());
 }
 
+
+osg::ref_ptr<osg::Geometry> SceneWidget::createGradientRectangle(QColor bgColour, QColor gradientColour)
+{
+    osg::ref_ptr<osg::Geometry> geometry = new osg::Geometry;
+
+    osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array;
+
+    vertices->push_back(osg::Vec3(0.0f, 0.0f, -1.0f));
+    vertices->push_back(osg::Vec3(1.0f, 0.0f, -1.0f));
+    vertices->push_back(osg::Vec3(0.0f, 1.0f, -1.0f));
+    vertices->push_back(osg::Vec3(1.0f, 1.0f, -1.0f));
+
+    geometry->setVertexArray(vertices);
+
+    osg::ref_ptr<osg::DrawElementsUShort> primitives = new osg::DrawElementsUShort (osg::PrimitiveSet::TRIANGLES, 0);
+
+    // triangle 1
+    primitives->push_back (0);
+    primitives->push_back (1);
+    primitives->push_back (2);
+
+    // triangle 2
+    primitives->push_back (2);
+    primitives->push_back (1);
+    primitives->push_back (3);
+
+    geometry->addPrimitiveSet(primitives);
+
+    osg::ref_ptr <osg::Vec4ubArray> colours = new osg::Vec4ubArray;
+    colours->push_back(osg::Vec4ub(gradientColour.red(), gradientColour.green(), gradientColour.blue(), 1.0f));
+    colours->push_back(osg::Vec4ub(gradientColour.red(), gradientColour.green(), gradientColour.blue(), 1.0f));
+    colours->push_back(osg::Vec4ub(bgColour.red(), bgColour.green(), bgColour.blue(), 1.0f));
+    colours->push_back(osg::Vec4ub(bgColour.red(), bgColour.green(), bgColour.blue(), 1.0f));
+
+    osg::Vec4ub bgVec = osg::Vec4ub(bgColour.red(), bgColour.green(), bgColour.blue(), 1.0f);
+
+    geometry->setColorArray(colours, osg::Array::BIND_PER_VERTEX);
+
+    geometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+    geometry->getOrCreateStateSet()->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
+
+    return geometry;
+}
+
+
+osg::ref_ptr<osg::Camera> SceneWidget::createGradientCamera(QColor bgColour, QColor gradientColour)
+{
+    osg::ref_ptr<osg::Camera> camera = new osg::Camera();
+    camera->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
+    camera->setProjectionMatrix(osg::Matrix::ortho2D(0, 1.0f, 0, 1.0f));
+    camera->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
+    camera->setViewMatrix(osg::Matrix::identity());
+
+    camera->setClearMask(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
+    camera->setAllowEventFocus(false);
+
+    // draw subgraph before main camera view.
+    camera->setRenderOrder(osg::Camera::PRE_RENDER);
+
+    camera->getOrCreateStateSet()->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
+
+    osg::ref_ptr<osg::Geometry> gradientQuad = createGradientRectangle(bgColour, gradientColour);
+
+    camera->addChild(gradientQuad);
+    return camera;
+}
+
+
+void SceneWidget::updateGradientCamera(QColor bgColour, QColor gradientColour)
+{
+    osg::ref_ptr<osg::Geometry> gradientRect = createGradientRectangle(bgColour, gradientColour);
+    // Replaces previous rectangle
+    mGradientCamera->setChild(0, gradientRect.get());
+}
+
 void SceneWidget::setLighting(Lighting *lighting)
 {
     if (mLighting)
@@ -276,12 +369,59 @@ void SceneWidget::setAmbient(const osg::Vec4f& ambient)
 
 void SceneWidget::selectLightingMode (const std::string& mode)
 {
-    if (mode=="day")
-        setLighting (&mLightingDay);
-    else if (mode=="night")
-        setLighting (&mLightingNight);
-    else if (mode=="bright")
-        setLighting (&mLightingBright);
+    QColor backgroundColour;
+    QColor gradientColour;
+    if (mode == "day")
+    {
+        backgroundColour = CSMPrefs::get()["Rendering"]["scene-day-background-colour"].toColor();
+        gradientColour = CSMPrefs::get()["Rendering"]["scene-day-gradient-colour"].toColor();
+        setLighting(&mLightingDay);
+    }
+    else if (mode == "night")
+    {
+        backgroundColour = CSMPrefs::get()["Rendering"]["scene-night-background-colour"].toColor();
+        gradientColour = CSMPrefs::get()["Rendering"]["scene-night-gradient-colour"].toColor();
+        setLighting(&mLightingNight);
+    }
+    else if (mode == "bright")
+    {
+        backgroundColour = CSMPrefs::get()["Rendering"]["scene-bright-background-colour"].toColor();
+        gradientColour = CSMPrefs::get()["Rendering"]["scene-bright-gradient-colour"].toColor();
+        setLighting(&mLightingBright);
+    }
+    if (CSMPrefs::get()["Rendering"]["scene-use-gradient"].isTrue()) {
+        if (mGradientCamera.get() != nullptr) {
+            // we can go ahead and update since this camera still exists
+            updateGradientCamera(backgroundColour, gradientColour);
+
+            if (!mView->getCamera()->containsNode(mGradientCamera.get()))
+            {
+                // need to re-attach the gradient camera
+                mView->getCamera()->setClearMask(0);
+                mView->getCamera()->addChild(mGradientCamera.get());
+            }
+        } 
+        else {
+            // need to create the gradient camera
+            mGradientCamera = createGradientCamera(backgroundColour, gradientColour);
+            mView->getCamera()->setClearMask(0);
+            mView->getCamera()->addChild(mGradientCamera.get());
+        }
+    }
+    else {
+        // Fall back to using the clear color for the camera
+        mView->getCamera()->setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+        mView->getCamera()->setClearColor(osg::Vec4(
+            backgroundColour.redF(),
+            backgroundColour.greenF(),
+            backgroundColour.blueF(),
+            1.0f
+        ));
+        if (mGradientCamera.get() != nullptr && mView->getCamera()->containsNode(mGradientCamera.get())) {
+            // Remove the child to prevent the gradient from rendering
+            mView->getCamera()->removeChild(mGradientCamera.get());
+        }
+    }
 }
 
 CSVWidget::SceneToolMode *SceneWidget::makeLightingSelector (CSVWidget::SceneToolbar *parent)
diff --git a/apps/opencs/view/render/scenewidget.hpp b/apps/opencs/view/render/scenewidget.hpp
index 6a94254b99..d7d9dba0c5 100644
--- a/apps/opencs/view/render/scenewidget.hpp
+++ b/apps/opencs/view/render/scenewidget.hpp
@@ -100,10 +100,15 @@ namespace CSVRender
             void mouseMoveEvent (QMouseEvent *event) override;
             void wheelEvent (QWheelEvent *event) override;
 
+            osg::ref_ptr<osg::Geometry> createGradientRectangle(QColor bgColour, QColor gradientColour);
+            osg::ref_ptr<osg::Camera> createGradientCamera(QColor bgColour, QColor gradientColour);
+            void updateGradientCamera(QColor bgColour, QColor gradientColour);
+
             std::shared_ptr<Resource::ResourceSystem> mResourceSystem;
 
             Lighting* mLighting;
-
+            
+            osg::ref_ptr<osg::Camera> mGradientCamera;
             osg::Vec4f mDefaultAmbient;
             bool mHasDefaultAmbient;
             bool mIsExterior;

From d35715e5dcc7023cbac7949415c10ba94bc56c34 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Thu, 10 Dec 2020 22:39:54 +0100
Subject: [PATCH 0068/2859] add olcoal to authors and feature 5199 to changelog

---
 AUTHORS.md   | 1 +
 CHANGELOG.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/AUTHORS.md b/AUTHORS.md
index 09ab784125..e8134a681e 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -49,6 +49,7 @@ Programmers
     Cédric Mocquillon
     Chris Boyce (slothlife)
     Chris Robinson (KittyCat)
+    Coleman Smith (olcoal)
     Cory F. Cohen (cfcohen)
     Cris Mihalache (Mirceam)
     crussell187
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b16480b02d..219234a388 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -76,6 +76,7 @@
     Feature #2686: Timestamps in openmw.log
     Feature #4894: Consider actors as obstacles for pathfinding
     Feature #5043: Head Bobbing
+    Feature #5199: Improve Scene 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

From 3b9db413463dfc30d97836bf164066ead187c305 Mon Sep 17 00:00:00 2001
From: Coleman Smith <coleman.d.smith@gmail.com>
Date: Thu, 10 Dec 2020 17:03:10 -0800
Subject: [PATCH 0069/2859] removing unneeded variable

---
 apps/opencs/view/render/scenewidget.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index b2648da675..4d73cde153 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -301,8 +301,6 @@ osg::ref_ptr<osg::Geometry> SceneWidget::createGradientRectangle(QColor bgColour
     colours->push_back(osg::Vec4ub(bgColour.red(), bgColour.green(), bgColour.blue(), 1.0f));
     colours->push_back(osg::Vec4ub(bgColour.red(), bgColour.green(), bgColour.blue(), 1.0f));
 
-    osg::Vec4ub bgVec = osg::Vec4ub(bgColour.red(), bgColour.green(), bgColour.blue(), 1.0f);
-
     geometry->setColorArray(colours, osg::Array::BIND_PER_VERTEX);
 
     geometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);

From 32601e0ae48da869347b9509d4d5e05049c0f6c3 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Fri, 11 Dec 2020 08:56:28 +0300
Subject: [PATCH 0070/2859] Properly reserve body parts for skirts (bug #5731)

---
 CHANGELOG.md                             |  1 +
 apps/opencs/model/world/actoradapter.cpp | 47 ++++++------------------
 2 files changed, 13 insertions(+), 35 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 219234a388..d399bcb30e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -70,6 +70,7 @@
     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 #5731: Editor: skirts are invisible on characters
     Feature #390: 3rd person look "over the shoulder"
     Feature #2386: Distant Statics in the form of Object Paging
     Feature #2404: Levelled List can not be placed into a container
diff --git a/apps/opencs/model/world/actoradapter.cpp b/apps/opencs/model/world/actoradapter.cpp
index 5ed80a1e4e..8558aa9bc9 100644
--- a/apps/opencs/model/world/actoradapter.cpp
+++ b/apps/opencs/model/world/actoradapter.cpp
@@ -593,56 +593,33 @@ namespace CSMWorld
         }
         else if (type == UniversalId::Type_Clothing)
         {
-            int priority = 0;
-            // TODO: reserve bodyparts for robes and skirts
             auto& clothing = dynamic_cast<const Record<ESM::Clothing>&>(record).get();
 
+            std::vector<ESM::PartReferenceType> parts;
             if (clothing.mData.mType == ESM::Clothing::Robe)
             {
-                auto reservedList = std::vector<ESM::PartReference>();
-
-                ESM::PartReference pr;
-                pr.mMale = "";
-                pr.mFemale = "";
-
-                ESM::PartReferenceType parts[] = {
+                parts = {
                     ESM::PRT_Groin, ESM::PRT_Skirt, ESM::PRT_RLeg, ESM::PRT_LLeg,
                     ESM::PRT_RUpperarm, ESM::PRT_LUpperarm, ESM::PRT_RKnee, ESM::PRT_LKnee,
-                    ESM::PRT_RForearm, ESM::PRT_LForearm
+                    ESM::PRT_RForearm, ESM::PRT_LForearm, ESM::PRT_Cuirass
                 };
-                size_t parts_size = sizeof(parts)/sizeof(parts[0]);
-                for(size_t p = 0;p < parts_size;++p)
-                {
-                    pr.mPart = parts[p];
-                    reservedList.push_back(pr);
-                }
-
-                priority = parts_size;
-                addParts(reservedList, priority);
             }
             else if (clothing.mData.mType == ESM::Clothing::Skirt)
             {
-                auto reservedList = std::vector<ESM::PartReference>();
+                parts = {ESM::PRT_Groin, ESM::PRT_RLeg, ESM::PRT_LLeg};
+            }
 
+            std::vector<ESM::PartReference> reservedList;
+            for (const auto& p : parts)
+            {
                 ESM::PartReference pr;
-                pr.mMale = "";
-                pr.mFemale = "";
-
-                ESM::PartReferenceType parts[] = {
-                    ESM::PRT_Groin, ESM::PRT_RLeg, ESM::PRT_LLeg
-                };
-                size_t parts_size = sizeof(parts)/sizeof(parts[0]);
-                for(size_t p = 0;p < parts_size;++p)
-                {
-                    pr.mPart = parts[p];
-                    reservedList.push_back(pr);
-                }
-
-                priority = parts_size;
-                addParts(reservedList, priority);
+                pr.mPart = p;
+                reservedList.emplace_back(pr);
             }
 
+            int priority = parts.size();
             addParts(clothing.mParts.mParts, priority);
+            addParts(reservedList, priority);
 
             // Changing parts could affect what is picked for rendering
             data->addOtherDependency(itemId);

From 899b8422faccc8d77ab88e5d2a38035e25c97d3f Mon Sep 17 00:00:00 2001
From: Frederic Chardon <chardon.frederic@gmail.com>
Date: Thu, 10 Dec 2020 22:00:33 +0100
Subject: [PATCH 0071/2859] explicitely use a reference, auto can't infer it
 and make a copy

---
 apps/openmw/mwworld/worldimp.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index d00fabb66d..c24597b842 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1496,7 +1496,7 @@ namespace MWWorld
 
         mProjectileManager->update(duration);
 
-        const auto results = mPhysics->applyQueuedMovement(duration, mDiscardMovements, frameStart, frameNumber, stats);
+        const auto& results = mPhysics->applyQueuedMovement(duration, mDiscardMovements, frameStart, frameNumber, stats);
         mProjectileManager->processHits();
         mDiscardMovements = false;
 

From 460e5abb55d6233814c043de7f6475368573ccd1 Mon Sep 17 00:00:00 2001
From: Frederic Chardon <chardon.frederic@gmail.com>
Date: Thu, 10 Dec 2020 21:54:47 +0100
Subject: [PATCH 0072/2859] Update physics object position after spawning.

---
 apps/openmw/mwworld/scene.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 47b62862f7..631253bd43 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -253,7 +253,7 @@ namespace
         bool operator() (const MWWorld::Ptr& ptr)
         {
             if (!ptr.getRefData().isDeleted() && ptr.getRefData().isEnabled())
-                ptr.getClass().adjustPosition (ptr, false);
+                ptr.getClass().adjustPosition (ptr, true);
             return true;
         }
     };

From 15291f15d3e5ce7e5eb777e235a308c3eb34cc02 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Mon, 16 Nov 2020 19:37:30 +0300
Subject: [PATCH 0073/2859] Make actor collision box components a struct

---
 apps/openmw/mwphysics/actor.cpp               |  2 +-
 apps/openmw/mwphysics/physicssystem.cpp       |  2 +-
 .../nifloader/testbulletnifloader.cpp         | 35 ++++++++++---------
 components/nifbullet/bulletnifloader.cpp      | 12 +++----
 components/resource/bulletshape.cpp           |  6 ++--
 components/resource/bulletshape.hpp           |  8 +++--
 6 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index 77b07cde53..b1f219e338 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -20,7 +20,7 @@ namespace MWPhysics
 
 Actor::Actor(const MWWorld::Ptr& ptr, const Resource::BulletShape* shape, PhysicsTaskScheduler* scheduler)
   : mStandingOnPtr(nullptr), mCanWaterWalk(false), mWalkingOnWater(false)
-  , mCollisionObject(nullptr), mMeshTranslation(shape->mCollisionBoxTranslate), mHalfExtents(shape->mCollisionBoxHalfExtents)
+  , mCollisionObject(nullptr), mMeshTranslation(shape->mCollisionBox.center), mHalfExtents(shape->mCollisionBox.extents)
   , mForce(0.f, 0.f, 0.f), mOnGround(true), mOnSlope(false)
   , mInternalCollisionMode(true)
   , mExternalCollisionMode(true)
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 324b1db2d7..8106a78ea1 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -645,7 +645,7 @@ namespace MWPhysics
         osg::ref_ptr<const Resource::BulletShape> shape = mShapeManager->getShape(mesh);
 
         // Try to get shape from basic model as fallback for creatures
-        if (!ptr.getClass().isNpc() && shape && shape->mCollisionBoxHalfExtents.length2() == 0)
+        if (!ptr.getClass().isNpc() && shape && shape->mCollisionBox.extents.length2() == 0)
         {
             const std::string fallbackModel = ptr.getClass().getModel(ptr);
             if (fallbackModel != mesh)
diff --git a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
index 7da8f0fd5b..3a854bf5c9 100644
--- a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
+++ b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
@@ -162,8 +162,8 @@ namespace Resource
     {
         return compareObjects(lhs.mCollisionShape, rhs.mCollisionShape)
             && compareObjects(lhs.mAvoidCollisionShape, rhs.mAvoidCollisionShape)
-            && lhs.mCollisionBoxHalfExtents == rhs.mCollisionBoxHalfExtents
-            && lhs.mCollisionBoxTranslate == rhs.mCollisionBoxTranslate
+            && lhs.mCollisionBox.extents == rhs.mCollisionBox.extents
+            && lhs.mCollisionBox.center == rhs.mCollisionBox.center
             && lhs.mAnimatedShapes == rhs.mAnimatedShapes;
     }
 
@@ -172,7 +172,8 @@ namespace Resource
         return stream << "Resource::BulletShape {"
             << value.mCollisionShape << ", "
             << value.mAvoidCollisionShape << ", "
-            << "osg::Vec3f {" << value.mCollisionBoxHalfExtents << "}" << ", "
+            << "osg::Vec3f {" << value.mCollisionBox.extents << "}" << ", "
+            << "osg::Vec3f {" << value.mCollisionBox.center << "}" << ", "
             << value.mAnimatedShapes
             << "}";
     }
@@ -433,8 +434,8 @@ namespace
         const auto result = mLoader.load(mNifFile);
 
         Resource::BulletShape expected;
-        expected.mCollisionBoxHalfExtents = osg::Vec3f(1, 2, 3);
-        expected.mCollisionBoxTranslate = osg::Vec3f(-1, -2, -3);
+        expected.mCollisionBox.extents = osg::Vec3f(1, 2, 3);
+        expected.mCollisionBox.center = osg::Vec3f(-1, -2, -3);
         std::unique_ptr<btBoxShape> box(new btBoxShape(btVector3(1, 2, 3)));
         std::unique_ptr<btCompoundShape> shape(new btCompoundShape);
         shape->addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(-1, -2, -3)), box.release());
@@ -458,8 +459,8 @@ namespace
         const auto result = mLoader.load(mNifFile);
 
         Resource::BulletShape expected;
-        expected.mCollisionBoxHalfExtents = osg::Vec3f(1, 2, 3);
-        expected.mCollisionBoxTranslate = osg::Vec3f(-1, -2, -3);
+        expected.mCollisionBox.extents = osg::Vec3f(1, 2, 3);
+        expected.mCollisionBox.center = osg::Vec3f(-1, -2, -3);
         std::unique_ptr<btBoxShape> box(new btBoxShape(btVector3(1, 2, 3)));
         std::unique_ptr<btCompoundShape> shape(new btCompoundShape);
         shape->addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(-1, -2, -3)), box.release());
@@ -488,8 +489,8 @@ namespace
         const auto result = mLoader.load(mNifFile);
 
         Resource::BulletShape expected;
-        expected.mCollisionBoxHalfExtents = osg::Vec3f(1, 2, 3);
-        expected.mCollisionBoxTranslate = osg::Vec3f(-1, -2, -3);
+        expected.mCollisionBox.extents = osg::Vec3f(1, 2, 3);
+        expected.mCollisionBox.center = osg::Vec3f(-1, -2, -3);
         std::unique_ptr<btBoxShape> box(new btBoxShape(btVector3(1, 2, 3)));
         std::unique_ptr<btCompoundShape> shape(new btCompoundShape);
         shape->addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(-1, -2, -3)), box.release());
@@ -523,8 +524,8 @@ namespace
         const auto result = mLoader.load(mNifFile);
 
         Resource::BulletShape expected;
-        expected.mCollisionBoxHalfExtents = osg::Vec3f(1, 2, 3);
-        expected.mCollisionBoxTranslate = osg::Vec3f(-1, -2, -3);
+        expected.mCollisionBox.extents = osg::Vec3f(1, 2, 3);
+        expected.mCollisionBox.center = osg::Vec3f(-1, -2, -3);
         std::unique_ptr<btBoxShape> box(new btBoxShape(btVector3(1, 2, 3)));
         std::unique_ptr<btCompoundShape> shape(new btCompoundShape);
         shape->addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(-1, -2, -3)), box.release());
@@ -558,8 +559,8 @@ namespace
         const auto result = mLoader.load(mNifFile);
 
         Resource::BulletShape expected;
-        expected.mCollisionBoxHalfExtents = osg::Vec3f(4, 5, 6);
-        expected.mCollisionBoxTranslate = osg::Vec3f(-4, -5, -6);
+        expected.mCollisionBox.extents = osg::Vec3f(4, 5, 6);
+        expected.mCollisionBox.center = osg::Vec3f(-4, -5, -6);
         std::unique_ptr<btBoxShape> box(new btBoxShape(btVector3(4, 5, 6)));
         std::unique_ptr<btCompoundShape> shape(new btCompoundShape);
         shape->addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(-4, -5, -6)), box.release());
@@ -581,8 +582,8 @@ namespace
         const auto result = mLoader.load(mNifFile);
 
         Resource::BulletShape expected;
-        expected.mCollisionBoxHalfExtents = osg::Vec3f(1, 2, 3);
-        expected.mCollisionBoxTranslate = osg::Vec3f(-1, -2, -3);
+        expected.mCollisionBox.extents = osg::Vec3f(1, 2, 3);
+        expected.mCollisionBox.center = osg::Vec3f(-1, -2, -3);
 
         EXPECT_EQ(*result, expected);
     }
@@ -615,8 +616,8 @@ namespace
         const auto result = mLoader.load(mNifFile);
 
         Resource::BulletShape expected;
-        expected.mCollisionBoxHalfExtents = osg::Vec3f(1, 2, 3);
-        expected.mCollisionBoxTranslate = osg::Vec3f(-1, -2, -3);
+        expected.mCollisionBox.extents = osg::Vec3f(1, 2, 3);
+        expected.mCollisionBox.center = osg::Vec3f(-1, -2, -3);
 
         EXPECT_EQ(*result, expected);
     }
diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index db9d5ae437..b24d08fd8c 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -145,12 +145,12 @@ osg::ref_ptr<Resource::BulletShape> BulletNifLoader::load(const Nif::File& nif)
     {
         if (findBoundingBox(node, filename))
         {
-            const btVector3 halfExtents = Misc::Convert::toBullet(mShape->mCollisionBoxHalfExtents);
-            const btVector3 origin = Misc::Convert::toBullet(mShape->mCollisionBoxTranslate);
+            const btVector3 extents = Misc::Convert::toBullet(mShape->mCollisionBox.extents);
+            const btVector3 center = Misc::Convert::toBullet(mShape->mCollisionBox.center);
             std::unique_ptr<btCompoundShape> compound (new btCompoundShape);
-            std::unique_ptr<btBoxShape> boxShape(new btBoxShape(halfExtents));
+            std::unique_ptr<btBoxShape> boxShape(new btBoxShape(extents));
             btTransform transform = btTransform::getIdentity();
-            transform.setOrigin(origin);
+            transform.setOrigin(center);
             compound->addChildShape(transform, boxShape.get());
             boxShape.release();
 
@@ -208,8 +208,8 @@ bool BulletNifLoader::findBoundingBox(const Nif::Node* node, const std::string&
         switch (type)
         {
             case Nif::NiBoundingVolume::Type::BOX_BV:
-                mShape->mCollisionBoxHalfExtents = node->bounds.box.extents;
-                mShape->mCollisionBoxTranslate = node->bounds.box.center;
+                mShape->mCollisionBox.extents = node->bounds.box.extents;
+                mShape->mCollisionBox.center = node->bounds.box.center;
                 break;
             default:
             {
diff --git a/components/resource/bulletshape.cpp b/components/resource/bulletshape.cpp
index 7dd0964e8b..fc68c55458 100644
--- a/components/resource/bulletshape.cpp
+++ b/components/resource/bulletshape.cpp
@@ -20,8 +20,7 @@ BulletShape::BulletShape()
 BulletShape::BulletShape(const BulletShape &copy, const osg::CopyOp &copyop)
     : mCollisionShape(duplicateCollisionShape(copy.mCollisionShape))
     , mAvoidCollisionShape(duplicateCollisionShape(copy.mAvoidCollisionShape))
-    , mCollisionBoxHalfExtents(copy.mCollisionBoxHalfExtents)
-    , mCollisionBoxTranslate(copy.mCollisionBoxTranslate)
+    , mCollisionBox(copy.mCollisionBox)
     , mAnimatedShapes(copy.mAnimatedShapes)
 {
 }
@@ -106,8 +105,7 @@ BulletShapeInstance::BulletShapeInstance(osg::ref_ptr<const BulletShape> source)
     : BulletShape()
     , mSource(source)
 {
-    mCollisionBoxHalfExtents = source->mCollisionBoxHalfExtents;
-    mCollisionBoxTranslate = source->mCollisionBoxTranslate;
+    mCollisionBox = source->mCollisionBox;
 
     mAnimatedShapes = source->mAnimatedShapes;
 
diff --git a/components/resource/bulletshape.hpp b/components/resource/bulletshape.hpp
index e77c96327f..7d9577ba02 100644
--- a/components/resource/bulletshape.hpp
+++ b/components/resource/bulletshape.hpp
@@ -27,10 +27,14 @@ namespace Resource
         btCollisionShape* mCollisionShape;
         btCollisionShape* mAvoidCollisionShape;
 
+        struct CollisionBox
+        {
+            osg::Vec3f extents;
+            osg::Vec3f center;
+        };
         // Used for actors. mCollisionShape is used for actors only when we need to autogenerate collision box for creatures.
         // For now, use one file <-> one resource for simplicity.
-        osg::Vec3f mCollisionBoxHalfExtents;
-        osg::Vec3f mCollisionBoxTranslate;
+        CollisionBox mCollisionBox;
 
         // Stores animated collision shapes. If any collision nodes in the NIF are animated, then mCollisionShape
         // will be a btCompoundShape (which consists of one or more child shapes).

From a314f196eb792e3f1bcb90f8ec40a287c9192d19 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sat, 12 Dec 2020 18:02:46 +0100
Subject: [PATCH 0074/2859] Unconditionally call actor->resetPosition in
 adjustPosition.

Revert broken change that would force adjust all actors in cell upon
loading. That break floating corpses (and probably others things).
---
 apps/openmw/mwworld/scene.cpp    | 2 +-
 apps/openmw/mwworld/worldimp.cpp | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 631253bd43..47b62862f7 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -253,7 +253,7 @@ namespace
         bool operator() (const MWWorld::Ptr& ptr)
         {
             if (!ptr.getRefData().isDeleted() && ptr.getRefData().isEnabled())
-                ptr.getClass().adjustPosition (ptr, true);
+                ptr.getClass().adjustPosition (ptr, false);
             return true;
         }
     };
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index c24597b842..f59c92c6a6 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1344,12 +1344,8 @@ namespace MWWorld
         }
 
         moveObject(ptr, ptr.getCell(), pos.x(), pos.y(), pos.z());
-        if (force) // force physics to use the new position
-        {
-            auto actor = mPhysics->getActor(ptr);
-            if(actor)
-                actor->resetPosition();
-        }
+        if (ptr.getClass().isActor())
+            mPhysics->getActor(ptr)->resetPosition();
     }
 
     void World::fixPosition()

From 28c79227df36a3b27cce106837650842dbcec034 Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Sat, 12 Dec 2020 21:04:59 +0200
Subject: [PATCH 0075/2859] Editor changelog additions

---
 CHANGELOG.md    | 2 ++
 CHANGELOG_PR.md | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ac8168ebc..d896ca55cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 0.47.0
 ------
 
+    Bug #832: OpenMW-CS: Handle deleted references
     Bug #1662: Qt4 and Windows binaries crash if there's a non-ASCII character in a file path/config path
     Bug #1952: Incorrect particle lighting
     Bug #2069: Fireflies in Fireflies invade Morrowind look wrong
@@ -67,6 +68,7 @@
     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 #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
diff --git a/CHANGELOG_PR.md b/CHANGELOG_PR.md
index 6a16b76585..8a7948bb70 100644
--- a/CHANGELOG_PR.md
+++ b/CHANGELOG_PR.md
@@ -34,7 +34,9 @@ Bug Fixes:
 - 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)
 - Verifier no longer checks for alleged 'race' entries in clothing body parts (#5400)
+- Loading mods now keeps the master index (#5675)
 - Flicker and crashing on XFCE4 fixed (#5703)
 
 Miscellaneous:

From 73afc55462ba1fc11ebebf83cbeb9cfcb2738bd1 Mon Sep 17 00:00:00 2001
From: CedricMocquillon <cedric.mocquillon@sage.com>
Date: Sat, 12 Dec 2020 17:29:29 +0100
Subject: [PATCH 0076/2859] Fork the current process to monitor exe, generate
 minidump on crash

---
 components/CMakeLists.txt                     |   8 +-
 .../crashcatcher/windows_crashcatcher.cpp     | 200 ++++++++++++++++++
 .../crashcatcher/windows_crashcatcher.hpp     |  79 +++++++
 .../crashcatcher/windows_crashmonitor.cpp     | 185 ++++++++++++++++
 .../crashcatcher/windows_crashmonitor.hpp     |  49 +++++
 components/crashcatcher/windows_crashshm.hpp  |  44 ++++
 components/debug/debugging.cpp                |   9 +-
 7 files changed, 571 insertions(+), 3 deletions(-)
 create mode 100644 components/crashcatcher/windows_crashcatcher.cpp
 create mode 100644 components/crashcatcher/windows_crashcatcher.hpp
 create mode 100644 components/crashcatcher/windows_crashmonitor.cpp
 create mode 100644 components/crashcatcher/windows_crashmonitor.hpp
 create mode 100644 components/crashcatcher/windows_crashshm.hpp

diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 3c18990375..10a5d22fbe 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -151,7 +151,13 @@ add_component_dir (fallback
     fallback validate
     )
 
-if(NOT WIN32 AND NOT ANDROID)
+if(WIN32)
+    add_component_dir (crashcatcher
+        windows_crashcatcher
+        windows_crashmonitor
+        windows_crashshm
+    )
+elseif(NOT ANDROID)
     add_component_dir (crashcatcher
         crashcatcher
     )
diff --git a/components/crashcatcher/windows_crashcatcher.cpp b/components/crashcatcher/windows_crashcatcher.cpp
new file mode 100644
index 0000000000..3291631c10
--- /dev/null
+++ b/components/crashcatcher/windows_crashcatcher.cpp
@@ -0,0 +1,200 @@
+#include <cassert>
+#include <cwchar>
+#include <iostream>
+#include <sstream>
+#include <thread>
+
+#include "windows_crashcatcher.hpp"
+#include "windows_crashmonitor.hpp"
+#include "windows_crashshm.hpp"
+#include <SDL_messagebox.h>
+
+namespace Crash
+{
+
+    HANDLE duplicateHandle(HANDLE handle)
+    {
+        HANDLE duplicate;
+        if (!DuplicateHandle(GetCurrentProcess(), handle,
+                             GetCurrentProcess(), &duplicate,
+                             0, TRUE, DUPLICATE_SAME_ACCESS))
+        {
+            throw std::runtime_error("Crash monitor could not duplicate handle");
+        }
+        return duplicate;
+    }
+
+    CrashCatcher* CrashCatcher::sInstance = nullptr;
+
+    CrashCatcher::CrashCatcher(int argc, char **argv, const std::string& crashLogPath)
+    {
+        assert(sInstance == nullptr); // don't allow two instances
+
+        sInstance = this;
+
+        HANDLE shmHandle = nullptr;
+        for (int i=0; i<argc; ++i)
+        {
+            if (strcmp(argv[i], "--crash-monitor"))
+                continue;
+
+            if (i >= argc - 1)
+                throw std::runtime_error("Crash monitor is missing the SHM handle argument");
+
+            sscanf(argv[i + 1], "%p", &shmHandle);
+            break;
+        }
+
+        if (!shmHandle)
+        {
+            setupIpc();
+            startMonitorProcess(crashLogPath);
+            installHandler();
+        }
+        else
+        {
+            CrashMonitor(shmHandle).run();
+            exit(0);
+        }
+    }
+
+    CrashCatcher::~CrashCatcher()
+    {
+        sInstance = nullptr;
+
+        if (mShm && mSignalMonitorEvent)
+        {
+            shmLock();
+            mShm->mEvent = CrashSHM::Event::Shutdown;
+            shmUnlock();
+
+            SetEvent(mSignalMonitorEvent);
+        }
+
+        if (mShmHandle)
+            CloseHandle(mShmHandle);
+    }
+
+    void CrashCatcher::setupIpc()
+    {
+        SECURITY_ATTRIBUTES attributes;
+        ZeroMemory(&attributes, sizeof(attributes));
+        attributes.bInheritHandle = TRUE;
+
+        mSignalAppEvent = CreateEventW(&attributes, FALSE, FALSE, NULL);
+        mSignalMonitorEvent = CreateEventW(&attributes, FALSE, FALSE, NULL);
+
+        mShmHandle = CreateFileMappingW(INVALID_HANDLE_VALUE, &attributes, PAGE_READWRITE, HIWORD(sizeof(CrashSHM)), LOWORD(sizeof(CrashSHM)), NULL);
+        if (mShmHandle == nullptr)
+            throw std::runtime_error("Failed to allocate crash catcher shared memory");
+
+        mShm = reinterpret_cast<CrashSHM*>(MapViewOfFile(mShmHandle, FILE_MAP_ALL_ACCESS, 0, 0, sizeof(CrashSHM)));
+        if (mShm == nullptr)
+            throw std::runtime_error("Failed to map crash catcher shared memory");
+
+        mShmMutex = CreateMutexW(&attributes, FALSE, NULL);
+        if (mShmMutex == nullptr)
+            throw std::runtime_error("Failed to create crash catcher shared memory mutex");
+    }
+
+    void CrashCatcher::shmLock()
+    {
+        if (WaitForSingleObject(mShmMutex, CrashCatcherTimeout) != WAIT_OBJECT_0)
+            throw std::runtime_error("SHM lock timed out");
+    }
+
+    void CrashCatcher::shmUnlock()
+    {
+        ReleaseMutex(mShmMutex);
+    }
+
+    void CrashCatcher::waitMonitor()
+    {
+        if (WaitForSingleObject(mSignalAppEvent, CrashCatcherTimeout) != WAIT_OBJECT_0)
+            throw std::runtime_error("Waiting for monitor failed");
+    }
+
+    void CrashCatcher::signalMonitor()
+    {
+        SetEvent(mSignalMonitorEvent);
+    }
+
+    void CrashCatcher::installHandler()
+    {
+        SetUnhandledExceptionFilter(vectoredExceptionHandler);
+    }
+
+    void CrashCatcher::startMonitorProcess(const std::string& crashLogPath)
+    {
+        WCHAR executablePath[MAX_PATH + 1];
+        GetModuleFileNameW(NULL, executablePath, MAX_PATH + 1);
+
+        memset(mShm->mStartup.mLogFilePath, 0, sizeof(mShm->mStartup.mLogFilePath));
+        int length = crashLogPath.length();
+        if (length > MAX_PATH) length = MAX_PATH;
+        strncpy(mShm->mStartup.mLogFilePath, crashLogPath.c_str(), length);
+        mShm->mStartup.mLogFilePath[length] = '\0';
+
+        // note that we don't need to lock the SHM here, the other process has not started yet
+        mShm->mEvent = CrashSHM::Event::Startup;
+        mShm->mStartup.mShmMutex = duplicateHandle(mShmMutex);
+        mShm->mStartup.mAppProcessHandle = duplicateHandle(GetCurrentProcess());
+        mShm->mStartup.mSignalApp = duplicateHandle(mSignalAppEvent);
+        mShm->mStartup.mSignalMonitor = duplicateHandle(mSignalMonitorEvent);
+
+        std::wstringstream ss;
+        ss << "--crash-monitor " << std::hex << duplicateHandle(mShmHandle);
+        std::wstring argumetns(ss.str());
+
+        STARTUPINFOW si;
+        ZeroMemory(&si, sizeof(si));
+
+        PROCESS_INFORMATION pi;
+        ZeroMemory(&pi, sizeof(pi));
+
+        if (!CreateProcessW(executablePath, &argumetns[0], NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi))
+            throw std::runtime_error("Could not start crash monitor process");
+
+        waitMonitor();
+    }
+
+    LONG CrashCatcher::vectoredExceptionHandler(PEXCEPTION_POINTERS info)
+    {
+        switch (info->ExceptionRecord->ExceptionCode)
+        {
+        case EXCEPTION_SINGLE_STEP:
+        case EXCEPTION_BREAKPOINT:
+        case DBG_PRINTEXCEPTION_C:
+            return EXCEPTION_EXECUTE_HANDLER;
+        }
+        if (!sInstance)
+            return EXCEPTION_EXECUTE_HANDLER;
+
+        sInstance->handleVectoredException(info);
+
+        _Exit(1);
+
+        return EXCEPTION_CONTINUE_SEARCH;
+    }
+
+    void CrashCatcher::handleVectoredException(PEXCEPTION_POINTERS info)
+    {
+        shmLock();
+
+        mShm->mEvent = CrashSHM::Event::Crashed;
+        mShm->mCrashed.mThreadId = GetCurrentThreadId();
+        mShm->mCrashed.mContext = *info->ContextRecord;
+        mShm->mCrashed.mExceptionRecord = *info->ExceptionRecord;
+
+        shmUnlock();
+
+        signalMonitor();
+
+        // must remain until monitor has finished
+        waitMonitor();
+
+        std::string message = "OpenMW has encountered a fatal error.\nCrash log saved to '" + std::string(mShm->mStartup.mLogFilePath) + "'.\n Please report this to https://gitlab.com/OpenMW/openmw/issues !";
+        SDL_ShowSimpleMessageBox(0, "Fatal Error", message.c_str(), nullptr);
+    }
+
+} // namespace Crash
diff --git a/components/crashcatcher/windows_crashcatcher.hpp b/components/crashcatcher/windows_crashcatcher.hpp
new file mode 100644
index 0000000000..e1857271e9
--- /dev/null
+++ b/components/crashcatcher/windows_crashcatcher.hpp
@@ -0,0 +1,79 @@
+#ifndef WINDOWS_CRASHCATCHER_HPP
+#define WINDOWS_CRASHCATCHER_HPP
+
+#include <string>
+
+#undef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
+#include <components/crashcatcher/crashcatcher.hpp>
+
+namespace Crash
+{
+
+    // The implementation spawns the current executable as a monitor process which waits
+    // for a global synchronization event which is sent when the parent process crashes.
+    // The monitor process then extracts crash information from the parent process while
+    // the parent process waits for the monitor process to finish. The crashed process
+    // quits and the monitor writes the crash information to a file.
+    //
+    // To detect unexpected shutdowns of the application which are not handled by the
+    // crash handler, the monitor periodically checks the exit code of the parent
+    // process and exits if it does not return STILL_ACTIVE. You can test this by closing
+    // the main openmw process in task manager.
+
+    static constexpr const int CrashCatcherTimeout = 2500;
+
+    struct CrashSHM;
+
+    class CrashCatcher final
+    {
+    public:
+
+        CrashCatcher(int argc, char **argv, const std::string& crashLogPath);
+        ~CrashCatcher();
+
+    private:
+
+        static CrashCatcher* sInstance;
+
+        //  mapped SHM area
+        CrashSHM* mShm = nullptr;
+        // the handle is allocated by the catcher and passed to the monitor
+        // process via the command line which maps the SHM and sends / receives
+        // events through it
+        HANDLE mShmHandle = nullptr;
+        // mutex which guards SHM area
+        HANDLE mShmMutex = nullptr;
+
+        // triggered when the monitor signals the application
+        HANDLE mSignalAppEvent = INVALID_HANDLE_VALUE;
+
+        // triggered when the application wants to wake the monitor process
+        HANDLE mSignalMonitorEvent = INVALID_HANDLE_VALUE;
+
+        void setupIpc();
+
+        void shmLock();
+
+        void shmUnlock();
+
+        void startMonitorProcess(const std::string& crashLogPath);
+
+        void waitMonitor();
+
+        void signalMonitor();
+
+        void installHandler();
+
+        void handleVectoredException(PEXCEPTION_POINTERS info);
+
+    public:
+
+        static LONG WINAPI vectoredExceptionHandler(PEXCEPTION_POINTERS info);
+    };
+
+} // namespace Crash
+
+#endif // WINDOWS_CRASHCATCHER_HPP
diff --git a/components/crashcatcher/windows_crashmonitor.cpp b/components/crashcatcher/windows_crashmonitor.cpp
new file mode 100644
index 0000000000..56f8bbdd4c
--- /dev/null
+++ b/components/crashcatcher/windows_crashmonitor.cpp
@@ -0,0 +1,185 @@
+#undef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+#include <Psapi.h>
+
+#include <DbgHelp.h>
+
+#include <iostream>
+#include <memory>
+#include <sstream>
+
+#include "windows_crashcatcher.hpp"
+#include "windows_crashmonitor.hpp"
+#include "windows_crashshm.hpp"
+#include <components/debug/debuglog.hpp>
+
+namespace Crash
+{
+
+    CrashMonitor::CrashMonitor(HANDLE shmHandle)
+        : mShmHandle(shmHandle)
+    {
+        mShm = reinterpret_cast<CrashSHM*>(MapViewOfFile(mShmHandle, FILE_MAP_ALL_ACCESS, 0, 0, sizeof(CrashSHM)));
+        if (mShm == nullptr)
+            throw std::runtime_error("Failed to map crash monitor shared memory");
+
+        // accessing SHM without lock is OK here, the parent waits for a signal before continuing
+
+        mShmMutex = mShm->mStartup.mShmMutex;
+        mAppProcessHandle = mShm->mStartup.mAppProcessHandle;
+        mSignalAppEvent = mShm->mStartup.mSignalApp;
+        mSignalMonitorEvent = mShm->mStartup.mSignalMonitor;
+    }
+
+    CrashMonitor::~CrashMonitor()
+    {
+        if (mShm)
+            UnmapViewOfFile(mShm);
+
+        // the handles received from the app are duplicates, we must close them
+
+        if (mShmHandle)
+            CloseHandle(mShmHandle);
+
+        if (mShmMutex)
+            CloseHandle(mShmMutex);
+
+        if (mSignalAppEvent)
+            CloseHandle(mSignalAppEvent);
+
+        if (mSignalMonitorEvent)
+            CloseHandle(mSignalMonitorEvent);
+    }
+
+    void CrashMonitor::shmLock()
+    {
+        if (WaitForSingleObject(mShmMutex, CrashCatcherTimeout) != WAIT_OBJECT_0)
+            throw std::runtime_error("SHM monitor lock timed out");
+    }
+
+    void CrashMonitor::shmUnlock()
+    {
+        ReleaseMutex(mShmMutex);
+    }
+
+    void CrashMonitor::signalApp() const
+    {
+        SetEvent(mSignalAppEvent);
+    }
+
+    bool CrashMonitor::waitApp() const
+    {
+        return WaitForSingleObject(mSignalMonitorEvent, CrashCatcherTimeout) == WAIT_OBJECT_0;
+    }
+
+    bool CrashMonitor::isAppAlive() const
+    {
+        DWORD code = 0;
+        GetExitCodeProcess(mAppProcessHandle, &code);
+        return code == STILL_ACTIVE;
+    }
+
+    void CrashMonitor::run()
+    {
+        try
+        {
+            // app waits for monitor start up, let it continue
+            signalApp();
+
+            bool running = true;
+            while (isAppAlive() && running)
+            {
+                if (waitApp())
+                {
+                    shmLock();
+
+                    switch (mShm->mEvent)
+                    {
+                    case CrashSHM::Event::None:
+                        break;
+                    case CrashSHM::Event::Crashed:
+                        handleCrash();
+                        running = false;
+                        break;
+                    case CrashSHM::Event::Shutdown:
+                        running = false;
+                        break;
+                    case CrashSHM::Event::Startup:
+                        break;
+                    }
+
+                    shmUnlock();
+                }
+            }
+
+        } 
+        catch (...)
+        {
+            Log(Debug::Error) << "Exception in crash monitor, exiting";
+        }
+        signalApp();
+    }
+
+    std::wstring utf8ToUtf16(const std::string& utf8)
+    {
+        const int nLenWide = MultiByteToWideChar(CP_UTF8, 0, utf8.c_str(), utf8.size(), nullptr, 0);
+
+        std::wstring utf16;
+        utf16.resize(nLenWide);
+        if (MultiByteToWideChar(CP_UTF8, 0, utf8.c_str(), utf8.size(), utf16.data(), nLenWide) != nLenWide)
+            return {};
+
+        return utf16;
+    }
+
+    void CrashMonitor::handleCrash()
+    {
+        DWORD processId = GetProcessId(mAppProcessHandle);
+
+        try
+        {
+            HMODULE dbghelp = LoadLibraryA("dbghelp.dll");
+            if (dbghelp == NULL)
+                return;
+    
+            using MiniDumpWirteDumpFn = BOOL (WINAPI*)(
+                HANDLE hProcess, DWORD ProcessId, HANDLE hFile, MINIDUMP_TYPE DumpType, PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam,
+                PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam, PMINIDUMP_CALLBACK_INFORMATION CallbackParam
+            );
+    
+            MiniDumpWirteDumpFn miniDumpWriteDump = (MiniDumpWirteDumpFn)GetProcAddress(dbghelp, "MiniDumpWriteDump");
+            if (miniDumpWriteDump == NULL)
+                return;
+
+            const std::wstring utf16Path = utf8ToUtf16(mShm->mStartup.mLogFilePath);
+            if (utf16Path.empty())
+                return;
+
+            HANDLE hCrashLog = CreateFileW(utf16Path.c_str(), GENERIC_READ | GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr);
+            if (hCrashLog == NULL || hCrashLog == INVALID_HANDLE_VALUE)
+                return;
+            if (auto err = GetLastError(); err != ERROR_ALREADY_EXISTS && err != 0)
+                return;
+
+            EXCEPTION_POINTERS exp;
+            exp.ContextRecord = &mShm->mCrashed.mContext;
+            exp.ExceptionRecord = &mShm->mCrashed.mExceptionRecord;
+            MINIDUMP_EXCEPTION_INFORMATION infos = {};
+            infos.ThreadId = mShm->mCrashed.mThreadId;
+            infos.ExceptionPointers = &exp;
+            infos.ClientPointers = FALSE;
+            MINIDUMP_TYPE type = (MINIDUMP_TYPE)(MiniDumpWithDataSegs | MiniDumpWithHandleData);
+            miniDumpWriteDump(mAppProcessHandle, processId, hCrashLog, type, &infos, 0, 0);
+        }
+        catch (const std::exception&e)
+        {
+            Log(Debug::Error) << "CrashMonitor: " << e.what();
+        }
+        catch (...)
+        {
+            Log(Debug::Error) << "CrashMonitor: unknown exception";
+        }
+    }
+
+} // namespace Crash
diff --git a/components/crashcatcher/windows_crashmonitor.hpp b/components/crashcatcher/windows_crashmonitor.hpp
new file mode 100644
index 0000000000..678d38435c
--- /dev/null
+++ b/components/crashcatcher/windows_crashmonitor.hpp
@@ -0,0 +1,49 @@
+#ifndef WINDOWS_CRASHMONITOR_HPP
+#define WINDOWS_CRASHMONITOR_HPP
+
+#include <windef.h>
+
+namespace Crash
+{
+
+struct CrashSHM;
+
+class CrashMonitor final
+{
+public:
+
+    CrashMonitor(HANDLE shmHandle);
+
+    ~CrashMonitor();
+
+    void run();
+
+private:
+
+    HANDLE mAppProcessHandle = nullptr;
+
+    // triggered when the monitor process wants to wake the parent process (received via SHM)
+    HANDLE mSignalAppEvent = nullptr;
+    // triggered when the application wants to wake the monitor process (received via SHM)
+    HANDLE mSignalMonitorEvent = nullptr;
+
+    CrashSHM* mShm = nullptr;
+    HANDLE mShmHandle = nullptr;
+    HANDLE mShmMutex = nullptr;
+
+    void signalApp() const;
+
+    bool waitApp() const;
+
+    bool isAppAlive() const;
+
+    void shmLock();
+
+    void shmUnlock();
+
+    void handleCrash();
+};
+
+} // namespace Crash
+
+#endif // WINDOWS_CRASHMONITOR_HPP
diff --git a/components/crashcatcher/windows_crashshm.hpp b/components/crashcatcher/windows_crashshm.hpp
new file mode 100644
index 0000000000..80e47f07b7
--- /dev/null
+++ b/components/crashcatcher/windows_crashshm.hpp
@@ -0,0 +1,44 @@
+#ifndef WINDOWS_CRASHSHM_HPP
+#define WINDOWS_CRASHSHM_HPP
+
+#undef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
+namespace Crash
+{
+
+    // Used to communicate between the app and the monitor, fields are is overwritten with each event.
+
+    struct CrashSHM
+    {
+        enum class Event
+        {
+            None,
+            Startup,
+            Crashed,
+            Shutdown
+        };
+
+        Event mEvent;
+
+        struct Startup
+        {
+            HANDLE mAppProcessHandle;
+            HANDLE mSignalApp;
+            HANDLE mSignalMonitor;
+            HANDLE mShmMutex;
+            char mLogFilePath[MAX_PATH + 1];
+        } mStartup;
+
+        struct Crashed
+        {
+            DWORD mThreadId;
+            CONTEXT mContext;
+            EXCEPTION_RECORD mExceptionRecord;
+        } mCrashed;
+    };
+
+} // namespace Crash
+
+#endif // WINDOWS_CRASHSHM_HPP
diff --git a/components/debug/debugging.cpp b/components/debug/debugging.cpp
index 987a3db7e1..657c04d0f6 100644
--- a/components/debug/debugging.cpp
+++ b/components/debug/debugging.cpp
@@ -2,10 +2,12 @@
 
 #include <chrono>
 #include <memory>
+#include <functional>
 
 #include <components/crashcatcher/crashcatcher.hpp>
 
 #ifdef _WIN32
+#   include <components/crashcatcher/windows_crashcatcher.hpp>
 #   undef WIN32_LEAN_AND_MEAN
 #   define WIN32_LEAN_AND_MEAN
 #   include <windows.h>
@@ -187,13 +189,16 @@ int wrapApplication(int (*innerApplication)(int argc, char *argv[]), int argc, c
         std::cerr.rdbuf (&cerrsb);
 #endif
 
+#if defined(_WIN32)
+        Crash::CrashCatcher crashy(argc, argv, (cfgMgr.getLogPath() / crashLogName).make_preferred().string());
+#else
         // install the crash handler as soon as possible. note that the log path
         // does not depend on config being read.
         crashCatcherInstall(argc, argv, (cfgMgr.getLogPath() / crashLogName).string());
-
+#endif
         ret = innerApplication(argc, argv);
     }
-    catch (std::exception& e)
+    catch (const std::exception& e)
     {
 #if (defined(__APPLE__) || defined(__linux) || defined(__unix) || defined(__posix))
         if (!isatty(fileno(stdin)))

From 817ac4cfbdc96a79d751cb5bb9b8d8e8ca78a865 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sat, 12 Dec 2020 22:43:06 +0300
Subject: [PATCH 0077/2859] Don't regenerate the topics list unconditionally

---
 apps/openmw/mwgui/dialogue.cpp | 15 ++++++++++-----
 apps/openmw/mwgui/dialogue.hpp |  3 ++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp
index fde029d77f..ace051a025 100644
--- a/apps/openmw/mwgui/dialogue.cpp
+++ b/apps/openmw/mwgui/dialogue.cpp
@@ -451,6 +451,7 @@ namespace MWGui
         setTitle(mPtr.getClass().getName(mPtr));
 
         updateTopics();
+        updateTopicsPane(); // force update for new services
 
         updateDisposition();
         restock();
@@ -487,12 +488,14 @@ namespace MWGui
         mHistoryContents.clear();
     }
 
-    void DialogueWindow::setKeywords(std::list<std::string> keyWords)
+    bool DialogueWindow::setKeywords(std::list<std::string> keyWords)
     {
         if (mKeywords == keyWords && isCompanion() == mIsCompanion)
-            return;
+            return false;
         mIsCompanion = isCompanion();
         mKeywords = keyWords;
+        updateTopicsPane();
+        return true;
     }
 
     void DialogueWindow::updateTopicsPane()
@@ -556,6 +559,8 @@ namespace MWGui
         mTopicsList->adjustSize();
 
         updateHistory();
+        // The topics list has been regenerated so topic formatting needs to be updated
+        updateTopicFormat();
     }
 
     void DialogueWindow::updateHistory(bool scrollbar)
@@ -758,9 +763,9 @@ namespace MWGui
 
     void DialogueWindow::updateTopics()
     {
-        setKeywords(MWBase::Environment::get().getDialogueManager()->getAvailableTopics());
-        updateTopicsPane();
-        updateTopicFormat();
+        // Topic formatting needs to be updated regardless of whether the topic list has changed
+        if (!setKeywords(MWBase::Environment::get().getDialogueManager()->getAvailableTopics()))
+            updateTopicFormat();
     }
 
     bool DialogueWindow::isCompanion()
diff --git a/apps/openmw/mwgui/dialogue.hpp b/apps/openmw/mwgui/dialogue.hpp
index ed4c39afed..02401f2e14 100644
--- a/apps/openmw/mwgui/dialogue.hpp
+++ b/apps/openmw/mwgui/dialogue.hpp
@@ -122,7 +122,8 @@ namespace MWGui
 
         void setPtr(const MWWorld::Ptr& actor) override;
 
-        void setKeywords(std::list<std::string> keyWord);
+        /// @return true if stale keywords were updated successfully
+        bool setKeywords(std::list<std::string> keyWord);
 
         void addResponse (const std::string& title, const std::string& text, bool needMargin = true);
 

From 256aa5e71d59b817753dbe440ac3ee06e186dc7a Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Sat, 12 Dec 2020 22:23:20 +0200
Subject: [PATCH 0078/2859] Use const auto&

---
 components/resource/animation.cpp       |  4 ++--
 components/resource/keyframemanager.cpp |  2 +-
 components/sceneutil/osgacontroller.cpp | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/components/resource/animation.cpp b/components/resource/animation.cpp
index 34ae162ee7..d2d7d08d55 100644
--- a/components/resource/animation.cpp
+++ b/components/resource/animation.cpp
@@ -10,7 +10,7 @@ namespace Resource
         mStartTime(0.0f)
     {
         const osgAnimation::ChannelList& channels = anim.getChannels();
-        for (const osg::ref_ptr<osgAnimation::Channel> channel: channels)
+        for (const auto& channel: channels)
             addChannel(channel.get()->clone());
     }
 
@@ -31,7 +31,7 @@ namespace Resource
 
     bool Animation::update (double time)
     {
-        for (const osg::ref_ptr<osgAnimation::Channel> channel: mChannels)
+        for (const auto& channel: mChannels)
         {
             channel->update(time, 1.0f, 0);
         }
diff --git a/components/resource/keyframemanager.cpp b/components/resource/keyframemanager.cpp
index af0f365ee5..41b10bd65d 100644
--- a/components/resource/keyframemanager.cpp
+++ b/components/resource/keyframemanager.cpp
@@ -44,7 +44,7 @@ namespace Resource
                         std::string loopstop = animationName + std::string(": loop stop");
 
                         const osgAnimation::ChannelList& channels = animation->getChannels();
-                        for (const osg::ref_ptr<osgAnimation::Channel> channel: channels)
+                        for (const auto& channel: channels)
                         {
                             mergedAnimationTrack->addChannel(channel.get()->clone()); // is ->clone needed?
                         }
diff --git a/components/sceneutil/osgacontroller.cpp b/components/sceneutil/osgacontroller.cpp
index 87e6f02fee..d77b8d666c 100644
--- a/components/sceneutil/osgacontroller.cpp
+++ b/components/sceneutil/osgacontroller.cpp
@@ -31,7 +31,7 @@ namespace SceneUtil
     void LinkVisitor::link(osgAnimation::UpdateMatrixTransform* umt)
     {
         const osgAnimation::ChannelList& channels = mAnimation->getChannels();
-        for (const osg::ref_ptr<osgAnimation::Channel> channel: channels)
+        for (const auto& channel: channels)
         {
             const std::string& channelName = channel->getName();
             const std::string& channelTargetName = channel->getTargetName();
@@ -125,13 +125,13 @@ namespace SceneUtil
         }
 
         //Find the root transform track in animation
-        for (const osg::ref_ptr<Resource::Animation> mergedAnimationTrack : mMergedAnimationTracks)
+        for (const auto& mergedAnimationTrack : mMergedAnimationTracks)
         {
             if (mergedAnimationTrack->getName() != animationName) continue;
 
             const osgAnimation::ChannelList& channels = mergedAnimationTrack->getChannels();
 
-            for (const osg::ref_ptr<osgAnimation::Channel> channel: channels)
+            for (const auto& channel: channels)
             {
                 if (channel->getTargetName() != "root" || channel->getName() != "transform") continue;
 
@@ -150,7 +150,7 @@ namespace SceneUtil
 
     void OsgAnimationController::update(float time, std::string animationName)
     {
-        for (const osg::ref_ptr<Resource::Animation> mergedAnimationTrack : mMergedAnimationTracks)
+        for (const auto& mergedAnimationTrack : mMergedAnimationTracks)
         {
             if (mergedAnimationTrack->getName() == animationName) mergedAnimationTrack->update(time);
         }
@@ -162,7 +162,7 @@ namespace SceneUtil
         {
             if (mNeedToLink)
             {
-                for (const osg::ref_ptr<Resource::Animation> mergedAnimationTrack : mMergedAnimationTracks)
+                for (const auto& mergedAnimationTrack : mMergedAnimationTracks)
                 {
                     if (!mLinker.valid()) mLinker = new LinkVisitor();
                     mLinker->setAnimation(mergedAnimationTrack);

From e2041de9690f4257c2b2b01a4cf9704a6da23068 Mon Sep 17 00:00:00 2001
From: CedricMocquillon <cedric.mocquillon@sage.com>
Date: Sat, 12 Dec 2020 21:47:50 +0100
Subject: [PATCH 0079/2859] Use the incremental approach to handle long path

---
 components/crashcatcher/windows_crashcatcher.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/components/crashcatcher/windows_crashcatcher.cpp b/components/crashcatcher/windows_crashcatcher.cpp
index 3291631c10..129907fc3b 100644
--- a/components/crashcatcher/windows_crashcatcher.cpp
+++ b/components/crashcatcher/windows_crashcatcher.cpp
@@ -126,8 +126,13 @@ namespace Crash
 
     void CrashCatcher::startMonitorProcess(const std::string& crashLogPath)
     {
-        WCHAR executablePath[MAX_PATH + 1];
-        GetModuleFileNameW(NULL, executablePath, MAX_PATH + 1);
+        std::wstring executablePath;
+        DWORD copied = 0;
+        do {
+            executablePath.resize(executablePath.size() + MAX_PATH);
+            copied = GetModuleFileNameW(nullptr, &executablePath[0], executablePath.size());
+        } while (copied >= executablePath.size());
+        executablePath.resize(copied);
 
         memset(mShm->mStartup.mLogFilePath, 0, sizeof(mShm->mStartup.mLogFilePath));
         int length = crashLogPath.length();
@@ -152,7 +157,7 @@ namespace Crash
         PROCESS_INFORMATION pi;
         ZeroMemory(&pi, sizeof(pi));
 
-        if (!CreateProcessW(executablePath, &argumetns[0], NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi))
+        if (!CreateProcessW(&executablePath[0], &argumetns[0], NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi))
             throw std::runtime_error("Could not start crash monitor process");
 
         waitMonitor();

From 3eb2b321239b294c4922e38c0af88c344ab136a7 Mon Sep 17 00:00:00 2001
From: CedricMocquillon <cedric.mocquillon@sage.com>
Date: Sun, 13 Dec 2020 14:09:14 +0100
Subject: [PATCH 0080/2859] Fix typpo issue on arguments

---
 components/crashcatcher/windows_crashcatcher.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/crashcatcher/windows_crashcatcher.cpp b/components/crashcatcher/windows_crashcatcher.cpp
index 129907fc3b..8495e84f8d 100644
--- a/components/crashcatcher/windows_crashcatcher.cpp
+++ b/components/crashcatcher/windows_crashcatcher.cpp
@@ -149,7 +149,7 @@ namespace Crash
 
         std::wstringstream ss;
         ss << "--crash-monitor " << std::hex << duplicateHandle(mShmHandle);
-        std::wstring argumetns(ss.str());
+        std::wstring arguments(ss.str());
 
         STARTUPINFOW si;
         ZeroMemory(&si, sizeof(si));
@@ -157,7 +157,7 @@ namespace Crash
         PROCESS_INFORMATION pi;
         ZeroMemory(&pi, sizeof(pi));
 
-        if (!CreateProcessW(&executablePath[0], &argumetns[0], NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi))
+        if (!CreateProcessW(&executablePath[0], &arguments[0], NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi))
             throw std::runtime_error("Could not start crash monitor process");
 
         waitMonitor();

From f400116bcd139c44cb8622670a0403f1f3222580 Mon Sep 17 00:00:00 2001
From: CedricMocquillon <cedric.mocquillon@sage.com>
Date: Sun, 13 Dec 2020 14:09:44 +0100
Subject: [PATCH 0081/2859] Use 32767 characters for log path

---
 components/crashcatcher/windows_crashcatcher.cpp | 2 +-
 components/crashcatcher/windows_crashshm.hpp     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/crashcatcher/windows_crashcatcher.cpp b/components/crashcatcher/windows_crashcatcher.cpp
index 8495e84f8d..dc10f4dcb5 100644
--- a/components/crashcatcher/windows_crashcatcher.cpp
+++ b/components/crashcatcher/windows_crashcatcher.cpp
@@ -136,7 +136,7 @@ namespace Crash
 
         memset(mShm->mStartup.mLogFilePath, 0, sizeof(mShm->mStartup.mLogFilePath));
         int length = crashLogPath.length();
-        if (length > MAX_PATH) length = MAX_PATH;
+        if (length > MAX_LONG_PATH) length = MAX_LONG_PATH;
         strncpy(mShm->mStartup.mLogFilePath, crashLogPath.c_str(), length);
         mShm->mStartup.mLogFilePath[length] = '\0';
 
diff --git a/components/crashcatcher/windows_crashshm.hpp b/components/crashcatcher/windows_crashshm.hpp
index 80e47f07b7..47929a45fe 100644
--- a/components/crashcatcher/windows_crashshm.hpp
+++ b/components/crashcatcher/windows_crashshm.hpp
@@ -9,6 +9,7 @@ namespace Crash
 {
 
     // Used to communicate between the app and the monitor, fields are is overwritten with each event.
+    static constexpr const int MAX_LONG_PATH = 0x7fff;
 
     struct CrashSHM
     {
@@ -28,7 +29,7 @@ namespace Crash
             HANDLE mSignalApp;
             HANDLE mSignalMonitor;
             HANDLE mShmMutex;
-            char mLogFilePath[MAX_PATH + 1];
+            char mLogFilePath[MAX_LONG_PATH];
         } mStartup;
 
         struct Crashed

From adeb4fe02f92637395c4b1742f2d60405105c75c Mon Sep 17 00:00:00 2001
From: CedricMocquillon <cedric.mocquillon@sage.com>
Date: Sun, 13 Dec 2020 14:10:44 +0100
Subject: [PATCH 0082/2859] Handle case where the log path has more that
 MAX_PATH characters

---
 components/crashcatcher/windows_crashmonitor.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/components/crashcatcher/windows_crashmonitor.cpp b/components/crashcatcher/windows_crashmonitor.cpp
index 56f8bbdd4c..8976deb2ea 100644
--- a/components/crashcatcher/windows_crashmonitor.cpp
+++ b/components/crashcatcher/windows_crashmonitor.cpp
@@ -152,10 +152,13 @@ namespace Crash
             if (miniDumpWriteDump == NULL)
                 return;
 
-            const std::wstring utf16Path = utf8ToUtf16(mShm->mStartup.mLogFilePath);
+            std::wstring utf16Path = utf8ToUtf16(mShm->mStartup.mLogFilePath);
             if (utf16Path.empty())
                 return;
 
+            if (utf16Path.length() > MAX_PATH)
+                utf16Path = LR"(\\?\)" + utf16Path;
+
             HANDLE hCrashLog = CreateFileW(utf16Path.c_str(), GENERIC_READ | GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr);
             if (hCrashLog == NULL || hCrashLog == INVALID_HANDLE_VALUE)
                 return;

From 112437cf287b7873ec04b54dbf01f64822740b69 Mon Sep 17 00:00:00 2001
From: CedricMocquillon <cedric.mocquillon@sage.com>
Date: Sun, 13 Dec 2020 14:13:07 +0100
Subject: [PATCH 0083/2859] Change crash file to dmp on window to avoid
 renaming it

---
 components/debug/debugging.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/debug/debugging.cpp b/components/debug/debugging.cpp
index 657c04d0f6..e9bcf8ad75 100644
--- a/components/debug/debugging.cpp
+++ b/components/debug/debugging.cpp
@@ -165,7 +165,6 @@ int wrapApplication(int (*innerApplication)(int argc, char *argv[]), int argc, c
 #endif
 
     const std::string logName = Misc::StringUtils::lowerCase(appName) + ".log";
-    const std::string crashLogName = Misc::StringUtils::lowerCase(appName) + "-crash.log";
     boost::filesystem::ofstream logfile;
 
     int ret = 0;
@@ -190,8 +189,10 @@ int wrapApplication(int (*innerApplication)(int argc, char *argv[]), int argc, c
 #endif
 
 #if defined(_WIN32)
+        const std::string crashLogName = Misc::StringUtils::lowerCase(appName) + "-crash.dmp";
         Crash::CrashCatcher crashy(argc, argv, (cfgMgr.getLogPath() / crashLogName).make_preferred().string());
 #else
+        const std::string crashLogName = Misc::StringUtils::lowerCase(appName) + "-crash.log";
         // install the crash handler as soon as possible. note that the log path
         // does not depend on config being read.
         crashCatcherInstall(argc, argv, (cfgMgr.getLogPath() / crashLogName).string());

From cc5c6fe3ad642394bdf64983ee1e3367c896cd4c Mon Sep 17 00:00:00 2001
From: CedricMocquillon <cedric.mocquillon@sage.com>
Date: Sun, 13 Dec 2020 19:03:04 +0100
Subject: [PATCH 0084/2859] Use data() method

---
 components/crashcatcher/windows_crashcatcher.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/crashcatcher/windows_crashcatcher.cpp b/components/crashcatcher/windows_crashcatcher.cpp
index dc10f4dcb5..4c3dfa8f63 100644
--- a/components/crashcatcher/windows_crashcatcher.cpp
+++ b/components/crashcatcher/windows_crashcatcher.cpp
@@ -130,7 +130,7 @@ namespace Crash
         DWORD copied = 0;
         do {
             executablePath.resize(executablePath.size() + MAX_PATH);
-            copied = GetModuleFileNameW(nullptr, &executablePath[0], executablePath.size());
+            copied = GetModuleFileNameW(nullptr, executablePath.data(), executablePath.size());
         } while (copied >= executablePath.size());
         executablePath.resize(copied);
 
@@ -157,7 +157,7 @@ namespace Crash
         PROCESS_INFORMATION pi;
         ZeroMemory(&pi, sizeof(pi));
 
-        if (!CreateProcessW(&executablePath[0], &arguments[0], NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi))
+        if (!CreateProcessW(executablePath.data(), arguments.data(), NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi))
             throw std::runtime_error("Could not start crash monitor process");
 
         waitMonitor();

From 201999c4a99866a64795aef6852f066663e79625 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Mon, 14 Dec 2020 03:01:26 +0300
Subject: [PATCH 0085/2859] Make sure adjustPosition() is safe to call for any
 actor

---
 apps/openmw/mwworld/worldimp.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index f59c92c6a6..3756ea04b8 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1345,7 +1345,11 @@ namespace MWWorld
 
         moveObject(ptr, ptr.getCell(), pos.x(), pos.y(), pos.z());
         if (ptr.getClass().isActor())
-            mPhysics->getActor(ptr)->resetPosition();
+        {
+            MWPhysics::Actor* actor = mPhysics->getActor(ptr);
+            if (actor)
+                actor->resetPosition();
+        }
     }
 
     void World::fixPosition()

From ab789e37e1136465c8bfdb1ccb1b3aee6a9f52cf Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Mon, 14 Dec 2020 03:45:03 +0300
Subject: [PATCH 0086/2859] Wizard: fix "file is already opened" warning

---
 apps/wizard/mainwizard.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/wizard/mainwizard.cpp b/apps/wizard/mainwizard.cpp
index 160c6f7217..d92f5b029c 100644
--- a/apps/wizard/mainwizard.cpp
+++ b/apps/wizard/mainwizard.cpp
@@ -157,6 +157,8 @@ void Wizard::MainWizard::setupGameSettings()
         mGameSettings.readUserFile(stream);
     }
 
+    file.close();
+
     // Now the rest
     QStringList paths;
     paths.append(userPath + QLatin1String("openmw.cfg"));

From 1c83e4936d30d4873b785b62d43e3718547fbd0e Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sun, 13 Dec 2020 02:35:57 +0300
Subject: [PATCH 0087/2859] Read BSShaderTextureSet and NiColorInterpolator

Accept boolean-based and 4D vector-based NiInterpolators in ValueInterpolator constructor
---
 components/nif/controlled.cpp    |  5 +++++
 components/nif/controlled.hpp    | 18 ++++++++++++++++++
 components/nif/controller.cpp    | 11 +++++++++++
 components/nif/controller.hpp    |  8 ++++++++
 components/nif/niffile.cpp       |  2 ++
 components/nif/record.hpp        |  4 +++-
 components/nif/recordptr.hpp     |  2 ++
 components/nifosg/controller.hpp |  4 +++-
 8 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/components/nif/controlled.cpp b/components/nif/controlled.cpp
index ab2b8dc173..c8116ce74e 100644
--- a/components/nif/controlled.cpp
+++ b/components/nif/controlled.cpp
@@ -47,6 +47,11 @@ namespace Nif
         data.post(nif);
     }
 
+    void BSShaderTextureSet::read(NIFStream *nif)
+    {
+        nif->getSizedStrings(textures, nif->getUInt());
+    }
+
     void NiParticleModifier::read(NIFStream *nif)
     {
         next.read(nif);
diff --git a/components/nif/controlled.hpp b/components/nif/controlled.hpp
index 57d538f839..ac48e50498 100644
--- a/components/nif/controlled.hpp
+++ b/components/nif/controlled.hpp
@@ -66,6 +66,24 @@ public:
     void post(NIFFile *nif) override;
 };
 
+struct BSShaderTextureSet : public Record
+{
+    enum TextureType
+    {
+        TextureType_Base = 0,
+        TextureType_Normal = 1,
+        TextureType_Glow = 2,
+        TextureType_Parallax = 3,
+        TextureType_Env = 4,
+        TextureType_EnvMask = 5,
+        TextureType_Subsurface = 6,
+        TextureType_BackLighting = 7
+    };
+    std::vector<std::string> textures;
+
+    void read(NIFStream *nif) override;
+};
+
 struct NiParticleModifier : public Record
 {
     NiParticleModifierPtr next;
diff --git a/components/nif/controller.cpp b/components/nif/controller.cpp
index 1e909120e4..704c4928e6 100644
--- a/components/nif/controller.cpp
+++ b/components/nif/controller.cpp
@@ -325,4 +325,15 @@ namespace Nif
         data.post(nif);
     }
 
+    void NiColorInterpolator::read(NIFStream *nif)
+    {
+        defaultVal = nif->getVector4();
+        data.read(nif);
+    }
+
+    void NiColorInterpolator::post(NIFFile *nif)
+    {
+        data.post(nif);
+    }
+
 }
diff --git a/components/nif/controller.hpp b/components/nif/controller.hpp
index 6b84d3749b..71afdef264 100644
--- a/components/nif/controller.hpp
+++ b/components/nif/controller.hpp
@@ -230,5 +230,13 @@ struct NiTransformInterpolator : public Interpolator
     void post(NIFFile *nif) override;
 };
 
+struct NiColorInterpolator : public Interpolator
+{
+    osg::Vec4f defaultVal;
+    NiColorDataPtr data;
+    void read(NIFStream *nif) override;
+    void post(NIFFile *nif) override;
+};
+
 } // Namespace
 #endif
diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index 67c864f473..c96bf30d63 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -129,6 +129,8 @@ static std::map<std::string,RecordFactoryEntry> makeFactory()
     factory["NiPoint3Interpolator"]         = {&construct <NiPoint3Interpolator>        , RC_NiPoint3Interpolator       };
     factory["NiTransformController"]        = {&construct <NiKeyframeController>        , RC_NiKeyframeController       };
     factory["NiTransformInterpolator"]      = {&construct <NiTransformInterpolator>     , RC_NiTransformInterpolator    };
+    factory["NiColorInterpolator"]          = {&construct <NiColorInterpolator>         , RC_NiColorInterpolator        };
+    factory["BSShaderTextureSet"]           = {&construct <BSShaderTextureSet>          , RC_BSShaderTextureSet         };
     return factory;
 }
 
diff --git a/components/nif/record.hpp b/components/nif/record.hpp
index 2217c588ee..041122731a 100644
--- a/components/nif/record.hpp
+++ b/components/nif/record.hpp
@@ -118,7 +118,9 @@ enum RecordType
   RC_NiFloatInterpolator,
   RC_NiPoint3Interpolator,
   RC_NiBoolInterpolator,
-  RC_NiTransformInterpolator
+  RC_NiTransformInterpolator,
+  RC_NiColorInterpolator,
+  RC_BSShaderTextureSet
 };
 
 /// Base class for all records
diff --git a/components/nif/recordptr.hpp b/components/nif/recordptr.hpp
index ed8f7ef6b9..0f5615a687 100644
--- a/components/nif/recordptr.hpp
+++ b/components/nif/recordptr.hpp
@@ -147,6 +147,7 @@ struct NiSkinPartition;
 struct NiFloatInterpolator;
 struct NiPoint3Interpolator;
 struct NiTransformInterpolator;
+struct BSShaderTextureSet;
 
 using NodePtr = RecordPtrT<Node>;
 using ExtraPtr = RecordPtrT<Extra>;
@@ -174,6 +175,7 @@ using NiSkinPartitionPtr = RecordPtrT<NiSkinPartition>;
 using NiFloatInterpolatorPtr = RecordPtrT<NiFloatInterpolator>;
 using NiPoint3InterpolatorPtr = RecordPtrT<NiPoint3Interpolator>;
 using NiTransformInterpolatorPtr = RecordPtrT<NiTransformInterpolator>;
+using BSShaderTextureSetPtr = RecordPtrT<BSShaderTextureSet>;
 
 using NodeList = RecordListT<Node>;
 using PropertyList = RecordListT<Property>;
diff --git a/components/nifosg/controller.hpp b/components/nifosg/controller.hpp
index 0063b2ec0f..96beafcbb8 100644
--- a/components/nifosg/controller.hpp
+++ b/components/nifosg/controller.hpp
@@ -66,7 +66,9 @@ namespace NifOsg
                 std::conjunction_v<
                     std::disjunction<
                         std::is_same<ValueT, float>,
-                        std::is_same<ValueT, osg::Vec3f>
+                        std::is_same<ValueT, osg::Vec3f>,
+                        std::is_same<ValueT, bool>,
+                        std::is_same<ValueT, osg::Vec4f>
                     >,
                     std::is_same<decltype(T::defaultVal), ValueT>
                 >,

From 5310dd6807a25564399fbff4cda9442d88bac800 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sun, 13 Dec 2020 02:46:33 +0300
Subject: [PATCH 0088/2859] Clean up particle vertex handling

---
 components/nif/controller.hpp   |  2 +-
 components/nifosg/nifloader.cpp | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/components/nif/controller.hpp b/components/nif/controller.hpp
index 71afdef264..4016188ce0 100644
--- a/components/nif/controller.hpp
+++ b/components/nif/controller.hpp
@@ -37,7 +37,7 @@ public:
         float lifetime;
         float lifespan;
         float timestamp;
-        int vertex;
+        unsigned short vertex;
     };
 
     float velocity;
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 0db15237ec..b172e386e7 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -963,6 +963,9 @@ namespace NifOsg
                 if (particle.lifespan <= 0)
                     continue;
 
+                if (particle.vertex >= particledata->vertices.size())
+                    continue;
+
                 ParticleAgeSetter particletemplate(std::max(0.f, particle.lifetime));
 
                 osgParticle::Particle* created = partsys->createParticle(&particletemplate);
@@ -971,16 +974,16 @@ namespace NifOsg
                 // Note this position and velocity is not correct for a particle system with absolute reference frame,
                 // which can not be done in this loader since we are not attached to the scene yet. Will be fixed up post-load in the SceneManager.
                 created->setVelocity(particle.velocity);
-                const osg::Vec3f& position = particledata->vertices.at(particle.vertex);
+                const osg::Vec3f& position = particledata->vertices[particle.vertex];
                 created->setPosition(position);
 
                 osg::Vec4f partcolor (1.f,1.f,1.f,1.f);
-                if (particle.vertex < int(particledata->colors.size()))
-                    partcolor = particledata->colors.at(particle.vertex);
+                if (particle.vertex < particledata->colors.size())
+                    partcolor = particledata->colors[particle.vertex];
 
                 float size = partctrl->size;
-                if (particle.vertex < int(particledata->sizes.size()))
-                    size *= particledata->sizes.at(particle.vertex);
+                if (particle.vertex < particledata->sizes.size())
+                    size *= particledata->sizes[particle.vertex];
 
                 created->setSizeRange(osgParticle::rangef(size, size));
                 box.expandBy(osg::BoundingSphere(position, size));

From 8ca324af0ad83cfc6d863322420ae8542cb33971 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sun, 13 Dec 2020 02:49:12 +0300
Subject: [PATCH 0089/2859] Handle emissive TexEnv creation in one place

---
 components/nifosg/nifloader.cpp | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index b172e386e7..3120b0d748 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -466,19 +466,12 @@ namespace NifOsg
             texture2d->setWrap(osg::Texture::WRAP_S, wrapS ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
             texture2d->setWrap(osg::Texture::WRAP_T, wrapT ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
 
-            osg::ref_ptr<osg::TexEnvCombine> texEnv = new osg::TexEnvCombine;
-            texEnv->setCombine_Alpha(osg::TexEnvCombine::REPLACE);
-            texEnv->setSource0_Alpha(osg::TexEnvCombine::PREVIOUS);
-            texEnv->setCombine_RGB(osg::TexEnvCombine::ADD);
-            texEnv->setSource0_RGB(osg::TexEnvCombine::PREVIOUS);
-            texEnv->setSource1_RGB(osg::TexEnvCombine::TEXTURE);
-
             int texUnit = 3; // FIXME
 
             osg::StateSet* stateset = node->getOrCreateStateSet();
             stateset->setTextureAttributeAndModes(texUnit, texture2d, osg::StateAttribute::ON);
             stateset->setTextureAttributeAndModes(texUnit, texGen, osg::StateAttribute::ON);
-            stateset->setTextureAttributeAndModes(texUnit, texEnv, osg::StateAttribute::ON);
+            stateset->setTextureAttributeAndModes(texUnit, createEmissiveTexEnv(), osg::StateAttribute::ON);
 
             stateset->addUniform(new osg::Uniform("envMapColor", osg::Vec4f(1,1,1,1)));
         }
@@ -1484,6 +1477,17 @@ namespace NifOsg
             return image;
         }
 
+        osg::ref_ptr<osg::TexEnvCombine> createEmissiveTexEnv()
+        {
+            osg::ref_ptr<osg::TexEnvCombine> texEnv(new osg::TexEnvCombine);
+            texEnv->setCombine_Alpha(osg::TexEnvCombine::REPLACE);
+            texEnv->setSource0_Alpha(osg::TexEnvCombine::PREVIOUS);
+            texEnv->setCombine_RGB(osg::TexEnvCombine::ADD);
+            texEnv->setSource0_RGB(osg::TexEnvCombine::PREVIOUS);
+            texEnv->setSource1_RGB(osg::TexEnvCombine::TEXTURE);
+            return texEnv;
+        }
+
         void handleTextureProperty(const Nif::NiTexturingProperty* texprop, const std::string& nodeName, osg::StateSet* stateset, SceneUtil::CompositeStateSetUpdater* composite, Resource::ImageManager* imageManager, std::vector<unsigned int>& boundTextures, int animflags)
         {
             if (!boundTextures.empty())
@@ -1570,14 +1574,7 @@ namespace NifOsg
 
                     if (i == Nif::NiTexturingProperty::GlowTexture)
                     {
-                        osg::TexEnvCombine* texEnv = new osg::TexEnvCombine;
-                        texEnv->setCombine_Alpha(osg::TexEnvCombine::REPLACE);
-                        texEnv->setSource0_Alpha(osg::TexEnvCombine::PREVIOUS);
-                        texEnv->setCombine_RGB(osg::TexEnvCombine::ADD);
-                        texEnv->setSource0_RGB(osg::TexEnvCombine::PREVIOUS);
-                        texEnv->setSource1_RGB(osg::TexEnvCombine::TEXTURE);
-
-                        stateset->setTextureAttributeAndModes(texUnit, texEnv, osg::StateAttribute::ON);
+                        stateset->setTextureAttributeAndModes(texUnit, createEmissiveTexEnv(), osg::StateAttribute::ON);
                     }
                     else if (i == Nif::NiTexturingProperty::DarkTexture)
                     {

From 8fd45d85ec0ae1c209c51dab942bcfba7d8be14e Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sun, 13 Dec 2020 03:16:05 +0300
Subject: [PATCH 0090/2859] Unify NiGeometry/NiGeometryData handling

---
 .../nifloader/testbulletnifloader.cpp         |  22 +++-
 components/nif/node.hpp                       | 121 +++++-------------
 components/nif/recordptr.hpp                  |  10 +-
 components/nifbullet/bulletnifloader.cpp      |  51 ++++----
 components/nifosg/nifloader.cpp               |  81 ++++++------
 5 files changed, 115 insertions(+), 170 deletions(-)

diff --git a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
index 3a854bf5c9..5769b1d0a8 100644
--- a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
+++ b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
@@ -259,14 +259,19 @@ namespace
         value.isBone = false;
     }
 
-    void init(Nif::NiTriShape& value)
+    void init(Nif::NiGeometry& value)
     {
         init(static_cast<Nif::Node&>(value));
-        value.recType = Nif::RC_NiTriShape;
-        value.data = Nif::NiTriShapeDataPtr(nullptr);
+        value.data = Nif::NiGeometryDataPtr(nullptr);
         value.skin = Nif::NiSkinInstancePtr(nullptr);
     }
 
+    void init(Nif::NiTriShape& value)
+    {
+        init(static_cast<Nif::NiGeometry&>(value));
+        value.recType = Nif::RC_NiTriShape;
+    }
+
     void init(Nif::NiSkinInstance& value)
     {
         value.data = Nif::NiSkinDataPtr(nullptr);
@@ -361,13 +366,15 @@ namespace
             init(mNiStringExtraData2);
             init(mController);
 
+            mNiTriShapeData.recType = Nif::RC_NiTriShapeData;
             mNiTriShapeData.vertices = {osg::Vec3f(0, 0, 0), osg::Vec3f(1, 0, 0), osg::Vec3f(1, 1, 0)};
             mNiTriShapeData.triangles = {0, 1, 2};
-            mNiTriShape.data = Nif::NiTriShapeDataPtr(&mNiTriShapeData);
+            mNiTriShape.data = Nif::NiGeometryDataPtr(&mNiTriShapeData);
 
+            mNiTriShapeData2.recType = Nif::RC_NiTriShapeData;
             mNiTriShapeData2.vertices = {osg::Vec3f(0, 0, 1), osg::Vec3f(1, 0, 1), osg::Vec3f(1, 1, 1)};
             mNiTriShapeData2.triangles = {0, 1, 2};
-            mNiTriShape2.data = Nif::NiTriShapeDataPtr(&mNiTriShapeData2);
+            mNiTriShape2.data = Nif::NiGeometryDataPtr(&mNiTriShapeData2);
         }
     };
 
@@ -873,7 +880,7 @@ namespace
 
     TEST_F(TestBulletNifLoader, for_tri_shape_child_node_with_empty_data_should_return_shape_with_null_collision_shape)
     {
-        mNiTriShape.data = Nif::NiTriShapeDataPtr(nullptr);
+        mNiTriShape.data = Nif::NiGeometryDataPtr(nullptr);
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
@@ -888,7 +895,8 @@ namespace
 
     TEST_F(TestBulletNifLoader, for_tri_shape_child_node_with_empty_data_triangles_should_return_shape_with_null_collision_shape)
     {
-        mNiTriShape.data->triangles.clear();
+        auto data = static_cast<Nif::NiTriShapeData*>(mNiTriShape.data.getPtr());
+        data->triangles.clear();
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
diff --git a/components/nif/node.hpp b/components/nif/node.hpp
index 58397bdca4..3106e368bb 100644
--- a/components/nif/node.hpp
+++ b/components/nif/node.hpp
@@ -241,80 +241,52 @@ struct NiNode : Node
 
 struct NiGeometry : Node
 {
+    /* Possible flags:
+        0x40 - mesh has no vertex normals ?
+
+        Only flags included in 0x47 (ie. 0x01, 0x02, 0x04 and 0x40) have
+        been observed so far.
+    */
+
     struct MaterialData
     {
-        std::vector<std::string> materialNames;
-        std::vector<int> materialExtraData;
-        unsigned int activeMaterial{0};
-        bool materialNeedsUpdate{false};
+        std::vector<std::string> names;
+        std::vector<int> extra;
+        unsigned int active{0};
+        bool needsUpdate{false};
         void read(NIFStream *nif)
         {
             if (nif->getVersion() <= NIFStream::generateVersion(10,0,1,0))
                 return;
-            unsigned int numMaterials = 0;
+            unsigned int num = 0;
             if (nif->getVersion() <= NIFStream::generateVersion(20,1,0,3))
-                numMaterials = nif->getBoolean(); // Has Shader
+                num = nif->getBoolean(); // Has Shader
             else if (nif->getVersion() >= NIFStream::generateVersion(20,2,0,5))
-                numMaterials = nif->getUInt();
-            if (numMaterials)
+                num = nif->getUInt();
+            if (num)
             {
-                nif->getStrings(materialNames, numMaterials);
-                nif->getInts(materialExtraData, numMaterials);
+                nif->getStrings(names, num);
+                nif->getInts(extra, num);
             }
             if (nif->getVersion() >= NIFStream::generateVersion(20,2,0,5))
-                activeMaterial = nif->getUInt();
+                active = nif->getUInt();
             if (nif->getVersion() >= NIFFile::NIFVersion::VER_BGS)
-            {
-                materialNeedsUpdate = nif->getBoolean();
-                if (nif->getVersion() == NIFFile::NIFVersion::VER_BGS && nif->getBethVersion() > NIFFile::BethVersion::BETHVER_FO3)
-                    nif->skip(8);
-            }
+                needsUpdate = nif->getBoolean();
         }
     };
 
+    NiGeometryDataPtr data;
     NiSkinInstancePtr skin;
-    MaterialData materialData;
-};
-
-struct NiTriShape : NiGeometry
-{
-    /* Possible flags:
-        0x40 - mesh has no vertex normals ?
-
-        Only flags included in 0x47 (ie. 0x01, 0x02, 0x04 and 0x40) have
-        been observed so far.
-    */
-
-    NiTriShapeDataPtr data;
-
-    void read(NIFStream *nif) override
-    {
-        Node::read(nif);
-        data.read(nif);
-        skin.read(nif);
-        materialData.read(nif);
-    }
-
-    void post(NIFFile *nif) override
-    {
-        Node::post(nif);
-        data.post(nif);
-        skin.post(nif);
-        if (!skin.empty())
-            nif->setUseSkinning(true);
-    }
-};
-
-struct NiTriStrips : NiGeometry
-{
-    NiTriStripsDataPtr data;
+    MaterialData material;
 
     void read(NIFStream *nif) override
     {
         Node::read(nif);
         data.read(nif);
         skin.read(nif);
-        materialData.read(nif);
+        material.read(nif);
+        if (nif->getVersion() == NIFFile::NIFVersion::VER_BGS && nif->getBethVersion() > NIFFile::BethVersion::BETHVER_FO3)
+            nif->skip(8);
     }
 
     void post(NIFFile *nif) override
@@ -322,31 +294,15 @@ struct NiTriStrips : NiGeometry
         Node::post(nif);
         data.post(nif);
         skin.post(nif);
-        if (!skin.empty())
+        if (recType != RC_NiParticles && !skin.empty())
             nif->setUseSkinning(true);
     }
 };
 
-struct NiLines : NiGeometry
-{
-    NiLinesDataPtr data;
-
-    void read(NIFStream *nif) override
-    {
-        Node::read(nif);
-        data.read(nif);
-        skin.read(nif);
-    }
-
-    void post(NIFFile *nif) override
-    {
-        Node::post(nif);
-        data.post(nif);
-        skin.post(nif);
-        if (!skin.empty())
-            nif->setUseSkinning(true);
-    }
-};
+struct NiTriShape : NiGeometry {};
+struct NiTriStrips : NiGeometry {};
+struct NiLines : NiGeometry {};
+struct NiParticles : NiGeometry { };
 
 struct NiCamera : Node
 {
@@ -401,25 +357,6 @@ struct NiCamera : Node
     }
 };
 
-struct NiParticles : NiGeometry
-{
-    NiParticlesDataPtr data;
-    void read(NIFStream *nif) override
-    {
-        Node::read(nif);
-        data.read(nif);
-        skin.read(nif);
-        materialData.read(nif);
-    }
-
-    void post(NIFFile *nif) override
-    {
-        Node::post(nif);
-        data.post(nif);
-        skin.post(nif);
-    }
-};
-
 // A node used as the base to switch between child nodes, such as for LOD levels.
 struct NiSwitchNode : public NiNode
 {
diff --git a/components/nif/recordptr.hpp b/components/nif/recordptr.hpp
index 0f5615a687..dd6e357084 100644
--- a/components/nif/recordptr.hpp
+++ b/components/nif/recordptr.hpp
@@ -134,20 +134,18 @@ struct NiMorphData;
 class NiPixelData;
 class NiColorData;
 struct NiKeyframeData;
-class NiTriShapeData;
 class NiTriStripsData;
 class NiSkinInstance;
 class NiSourceTexture;
-class NiParticlesData;
 class NiPalette;
 struct NiParticleModifier;
-struct NiLinesData;
 struct NiBoolData;
 struct NiSkinPartition;
 struct NiFloatInterpolator;
 struct NiPoint3Interpolator;
 struct NiTransformInterpolator;
 struct BSShaderTextureSet;
+struct NiGeometryData;
 
 using NodePtr = RecordPtrT<Node>;
 using ExtraPtr = RecordPtrT<Extra>;
@@ -162,12 +160,8 @@ using NiPixelDataPtr = RecordPtrT<NiPixelData>;
 using NiFloatDataPtr = RecordPtrT<NiFloatData>;
 using NiColorDataPtr = RecordPtrT<NiColorData>;
 using NiKeyframeDataPtr = RecordPtrT<NiKeyframeData>;
-using NiTriShapeDataPtr = RecordPtrT<NiTriShapeData>;
-using NiTriStripsDataPtr = RecordPtrT<NiTriStripsData>;
-using NiLinesDataPtr = RecordPtrT<NiLinesData>;
 using NiSkinInstancePtr = RecordPtrT<NiSkinInstance>;
 using NiSourceTexturePtr = RecordPtrT<NiSourceTexture>;
-using NiParticlesDataPtr = RecordPtrT<NiParticlesData>;
 using NiPalettePtr = RecordPtrT<NiPalette>;
 using NiParticleModifierPtr = RecordPtrT<NiParticleModifier>;
 using NiBoolDataPtr = RecordPtrT<NiBoolData>;
@@ -176,12 +170,14 @@ using NiFloatInterpolatorPtr = RecordPtrT<NiFloatInterpolator>;
 using NiPoint3InterpolatorPtr = RecordPtrT<NiPoint3Interpolator>;
 using NiTransformInterpolatorPtr = RecordPtrT<NiTransformInterpolator>;
 using BSShaderTextureSetPtr = RecordPtrT<BSShaderTextureSet>;
+using NiGeometryDataPtr = RecordPtrT<NiGeometryData>;
 
 using NodeList = RecordListT<Node>;
 using PropertyList = RecordListT<Property>;
 using ExtraList = RecordListT<Extra>;
 using NiSourceTextureList = RecordListT<NiSourceTexture>;
 using NiFloatInterpolatorList = RecordListT<NiFloatInterpolator>;
+using NiTriStripsDataList = RecordListT<NiTriStripsData>;
 
 } // Namespace
 #endif
diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index b24d08fd8c..a14672636a 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -34,11 +34,10 @@ bool pathFileNameStartsWithX(const std::string& path)
 
 void fillTriangleMesh(btTriangleMesh& mesh, const Nif::NiTriShapeData& data, const osg::Matrixf &transform)
 {
-    mesh.preallocateVertices(static_cast<int>(data.vertices.size()));
-    mesh.preallocateIndices(static_cast<int>(data.triangles.size()));
-
     const std::vector<osg::Vec3f> &vertices = data.vertices;
     const std::vector<unsigned short> &triangles = data.triangles;
+    mesh.preallocateVertices(static_cast<int>(vertices.size()));
+    mesh.preallocateIndices(static_cast<int>(triangles.size()));
 
     for (std::size_t i = 0; i < triangles.size(); i += 3)
     {
@@ -54,8 +53,6 @@ void fillTriangleMesh(btTriangleMesh& mesh, const Nif::NiTriStripsData& data, co
 {
     const std::vector<osg::Vec3f> &vertices = data.vertices;
     const std::vector<std::vector<unsigned short>> &strips = data.strips;
-    if (vertices.empty() || strips.empty())
-        return;
     mesh.preallocateVertices(static_cast<int>(vertices.size()));
     int numTriangles = 0;
     for (const std::vector<unsigned short>& strip : strips)
@@ -102,12 +99,12 @@ void fillTriangleMesh(btTriangleMesh& mesh, const Nif::NiTriStripsData& data, co
     }
 }
 
-void fillTriangleMesh(btTriangleMesh& mesh, const Nif::Node* nifNode, const osg::Matrixf &transform = osg::Matrixf())
+void fillTriangleMesh(btTriangleMesh& mesh, const Nif::NiGeometry* geometry, const osg::Matrixf &transform = osg::Matrixf())
 {
-    if (nifNode->recType == Nif::RC_NiTriShape)
-        fillTriangleMesh(mesh, static_cast<const Nif::NiTriShape*>(nifNode)->data.get(), transform);
-    else if (nifNode->recType == Nif::RC_NiTriStrips)
-        fillTriangleMesh(mesh, static_cast<const Nif::NiTriStrips*>(nifNode)->data.get(), transform);
+    if (geometry->recType == Nif::RC_NiTriShape)
+        fillTriangleMesh(mesh, static_cast<const Nif::NiTriShapeData&>(geometry->data.get()), transform);
+    else if (geometry->recType == Nif::RC_NiTriStrips)
+        fillTriangleMesh(mesh, static_cast<const Nif::NiTriStripsData&>(geometry->data.get()), transform);
 }
 
 }
@@ -341,23 +338,31 @@ void BulletNifLoader::handleNiTriShape(const Nif::Node *nifNode, int flags, cons
     if ((flags & 0x800))
         return;
 
-    if (nifNode->recType == Nif::RC_NiTriShape)
+    auto niGeometry = static_cast<const Nif::NiGeometry*>(nifNode);
+    if (niGeometry->data.empty() || niGeometry->data->vertices.empty())
+        return;
+
+    if (niGeometry->recType == Nif::RC_NiTriShape)
     {
-        const Nif::NiTriShape* shape = static_cast<const Nif::NiTriShape*>(nifNode);
-        if (!shape->skin.empty())
-            isAnimated = false;
-        if (shape->data.empty() || shape->data->triangles.empty())
+        if (niGeometry->data->recType != Nif::RC_NiTriShapeData)
+            return;
+
+        auto data = static_cast<const Nif::NiTriShapeData*>(niGeometry->data.getPtr());
+        if (data->triangles.empty())
             return;
     }
-    else
+    else if (niGeometry->recType == Nif::RC_NiTriStrips)
     {
-        const Nif::NiTriStrips* shape = static_cast<const Nif::NiTriStrips*>(nifNode);
-        if (!shape->skin.empty())
-            isAnimated = false;
-        if (shape->data.empty() || shape->data->strips.empty())
+        if (niGeometry->data->recType != Nif::RC_NiTriStripsData)
+            return;
+
+        auto data = static_cast<const Nif::NiTriStripsData*>(niGeometry->data.getPtr());
+        if (data->strips.empty())
             return;
     }
 
+    if (!niGeometry->skin.empty())
+        isAnimated = false;
 
     if (isAnimated)
     {
@@ -366,7 +371,7 @@ void BulletNifLoader::handleNiTriShape(const Nif::Node *nifNode, int flags, cons
 
         std::unique_ptr<btTriangleMesh> childMesh(new btTriangleMesh);
 
-        fillTriangleMesh(*childMesh, nifNode);
+        fillTriangleMesh(*childMesh, niGeometry);
 
         std::unique_ptr<Resource::TriangleMeshShape> childShape(new Resource::TriangleMeshShape(childMesh.get(), true));
         childMesh.release();
@@ -394,7 +399,7 @@ void BulletNifLoader::handleNiTriShape(const Nif::Node *nifNode, int flags, cons
         if (!mAvoidStaticMesh)
             mAvoidStaticMesh.reset(new btTriangleMesh(false));
 
-        fillTriangleMesh(*mAvoidStaticMesh, nifNode, transform);
+        fillTriangleMesh(*mAvoidStaticMesh, niGeometry, transform);
     }
     else
     {
@@ -402,7 +407,7 @@ void BulletNifLoader::handleNiTriShape(const Nif::Node *nifNode, int flags, cons
             mStaticMesh.reset(new btTriangleMesh(false));
 
         // Static shape, just transform all vertices into position
-        fillTriangleMesh(*mStaticMesh, nifNode, transform);
+        fillTriangleMesh(*mStaticMesh, niGeometry, transform);
     }
 }
 
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 3120b0d748..7ebb9bf8d4 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -939,11 +939,11 @@ namespace NifOsg
         // Load the initial state of the particle system, i.e. the initial particles and their positions, velocity and colors.
         void handleParticleInitialState(const Nif::Node* nifNode, osgParticle::ParticleSystem* partsys, const Nif::NiParticleSystemController* partctrl)
         {
-            const auto particleNode = static_cast<const Nif::NiParticles*>(nifNode);
-            if (particleNode->data.empty())
+            auto particleNode = static_cast<const Nif::NiParticles*>(nifNode);
+            if (particleNode->data.empty() || particleNode->data->recType != Nif::RC_NiParticlesData)
                 return;
 
-            const Nif::NiParticlesData* particledata = particleNode->data.getPtr();
+            auto particledata = static_cast<const Nif::NiParticlesData*>(particleNode->data.getPtr());
 
             osg::BoundingBox box;
 
@@ -1173,51 +1173,50 @@ namespace NifOsg
 
         void handleNiGeometry(const Nif::Node *nifNode, osg::Geometry *geometry, osg::Node* parentNode, SceneUtil::CompositeStateSetUpdater* composite, const std::vector<unsigned int>& boundTextures, int animflags)
         {
-            const Nif::NiGeometryData* niGeometryData = nullptr;
-            if (nifNode->recType == Nif::RC_NiTriShape)
+            const Nif::NiGeometry* niGeometry = static_cast<const Nif::NiGeometry*>(nifNode);
+            if (niGeometry->data.empty())
+                return;
+            const Nif::NiGeometryData* niGeometryData = niGeometry->data.getPtr();
+
+            if (niGeometry->recType == Nif::RC_NiTriShape)
             {
-                const Nif::NiTriShape* triShape = static_cast<const Nif::NiTriShape*>(nifNode);
-                if (!triShape->data.empty())
-                {
-                    const Nif::NiTriShapeData* data = triShape->data.getPtr();
-                    niGeometryData = static_cast<const Nif::NiGeometryData*>(data);
-                    if (!data->triangles.empty())
-                        geometry->addPrimitiveSet(new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLES, data->triangles.size(),
-                                                                                (unsigned short*)data->triangles.data()));
-                }
+                if (niGeometryData->recType != Nif::RC_NiTriShapeData)
+                    return;
+                auto triangles = static_cast<const Nif::NiTriShapeData*>(niGeometryData)->triangles;
+                if (triangles.empty())
+                    return;
+                geometry->addPrimitiveSet(new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLES, triangles.size(),
+                                                                        (unsigned short*)triangles.data()));
             }
-            else if (nifNode->recType == Nif::RC_NiTriStrips)
+            else if (niGeometry->recType == Nif::RC_NiTriStrips)
             {
-                const Nif::NiTriStrips* triStrips = static_cast<const Nif::NiTriStrips*>(nifNode);
-                if (!triStrips->data.empty())
+                if (niGeometryData->recType != Nif::RC_NiTriStripsData)
+                    return;
+                auto data = static_cast<const Nif::NiTriStripsData*>(niGeometryData);
+                bool hasGeometry = false;
+                for (const auto& strip : data->strips)
                 {
-                    const Nif::NiTriStripsData* data = triStrips->data.getPtr();
-                    niGeometryData = static_cast<const Nif::NiGeometryData*>(data);
-                    if (!data->strips.empty())
-                    {
-                        for (const auto& strip : data->strips)
-                        {
-                            if (strip.size() >= 3)
-                                geometry->addPrimitiveSet(new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLE_STRIP, strip.size(),
-                                                                                    (unsigned short*)strip.data()));
-                        }
-                    }
+                    if (strip.size() < 3)
+                        continue;
+                    geometry->addPrimitiveSet(new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLE_STRIP, strip.size(),
+                                                                            (unsigned short*)strip.data()));
+                    hasGeometry = true;
                 }
+                if (!hasGeometry)
+                    return;
             }
-            else if (nifNode->recType == Nif::RC_NiLines)
+            else if (niGeometry->recType == Nif::RC_NiLines)
             {
-                const Nif::NiLines* lines = static_cast<const Nif::NiLines*>(nifNode);
-                if (!lines->data.empty())
-                {
-                    const Nif::NiLinesData* data = lines->data.getPtr();
-                    niGeometryData = static_cast<const Nif::NiGeometryData*>(data);
-                    const auto& line = data->lines;
-                    if (!line.empty())
-                        geometry->addPrimitiveSet(new osg::DrawElementsUShort(osg::PrimitiveSet::LINES, line.size(), (unsigned short*)line.data()));
-                }
+                if (niGeometryData->recType != Nif::RC_NiLinesData)
+                    return;
+                auto data = static_cast<const Nif::NiLinesData*>(niGeometryData);
+                const auto& line = data->lines;
+                if (line.empty())
+                    return;
+                geometry->addPrimitiveSet(new osg::DrawElementsUShort(osg::PrimitiveSet::LINES, line.size(),
+                                                                        (unsigned short*)line.data()));
             }
-            if (niGeometryData)
-                handleNiGeometryData(geometry, niGeometryData, boundTextures, nifNode->name);
+            handleNiGeometryData(geometry, niGeometryData, boundTextures, nifNode->name);
 
             // osg::Material properties are handled here for two reasons:
             // - if there are no vertex colors, we need to disable colorMode.
@@ -1225,7 +1224,7 @@ namespace NifOsg
             //   above the actual renderable would be tedious.
             std::vector<const Nif::Property*> drawableProps;
             collectDrawableProperties(nifNode, drawableProps);
-            applyDrawableProperties(parentNode, drawableProps, composite, niGeometryData && !niGeometryData->colors.empty(), animflags);
+            applyDrawableProperties(parentNode, drawableProps, composite, !niGeometryData->colors.empty(), animflags);
         }
 
         void handleGeometry(const Nif::Node* nifNode, osg::Group* parentNode, SceneUtil::CompositeStateSetUpdater* composite, const std::vector<unsigned int>& boundTextures, int animflags)

From 42226533d8d2a3bde55e88c4f934b0a915013f68 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sun, 13 Dec 2020 03:45:29 +0300
Subject: [PATCH 0091/2859] Handle BSLODTriShape

Its levels of detail are currently not handled
---
 components/nif/niffile.cpp               |  1 +
 components/nif/node.hpp                  | 11 +++++++++++
 components/nif/record.hpp                |  3 ++-
 components/nifbullet/bulletnifloader.cpp |  8 +++++---
 components/nifosg/nifloader.cpp          |  3 ++-
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index c96bf30d63..8aa0b60350 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -131,6 +131,7 @@ static std::map<std::string,RecordFactoryEntry> makeFactory()
     factory["NiTransformInterpolator"]      = {&construct <NiTransformInterpolator>     , RC_NiTransformInterpolator    };
     factory["NiColorInterpolator"]          = {&construct <NiColorInterpolator>         , RC_NiColorInterpolator        };
     factory["BSShaderTextureSet"]           = {&construct <BSShaderTextureSet>          , RC_BSShaderTextureSet         };
+    factory["BSLODTriShape"]                = {&construct <BSLODTriShape>               , RC_BSLODTriShape              };
     return factory;
 }
 
diff --git a/components/nif/node.hpp b/components/nif/node.hpp
index 3106e368bb..75041e187d 100644
--- a/components/nif/node.hpp
+++ b/components/nif/node.hpp
@@ -300,6 +300,17 @@ struct NiGeometry : Node
 };
 
 struct NiTriShape : NiGeometry {};
+struct BSLODTriShape : NiTriShape
+{
+    unsigned int lod0, lod1, lod2;
+    void read(NIFStream *nif) override
+    {
+        NiTriShape::read(nif);
+        lod0 = nif->getUInt();
+        lod1 = nif->getUInt();
+        lod2 = nif->getUInt();
+    }
+};
 struct NiTriStrips : NiGeometry {};
 struct NiLines : NiGeometry {};
 struct NiParticles : NiGeometry { };
diff --git a/components/nif/record.hpp b/components/nif/record.hpp
index 041122731a..6834c554ee 100644
--- a/components/nif/record.hpp
+++ b/components/nif/record.hpp
@@ -120,7 +120,8 @@ enum RecordType
   RC_NiBoolInterpolator,
   RC_NiTransformInterpolator,
   RC_NiColorInterpolator,
-  RC_BSShaderTextureSet
+  RC_BSShaderTextureSet,
+  RC_BSLODTriShape
 };
 
 /// Base class for all records
diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index a14672636a..033cfcab68 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -101,7 +101,7 @@ void fillTriangleMesh(btTriangleMesh& mesh, const Nif::NiTriStripsData& data, co
 
 void fillTriangleMesh(btTriangleMesh& mesh, const Nif::NiGeometry* geometry, const osg::Matrixf &transform = osg::Matrixf())
 {
-    if (geometry->recType == Nif::RC_NiTriShape)
+    if (geometry->recType == Nif::RC_NiTriShape || geometry->recType == Nif::RC_BSLODTriShape)
         fillTriangleMesh(mesh, static_cast<const Nif::NiTriShapeData&>(geometry->data.get()), transform);
     else if (geometry->recType == Nif::RC_NiTriStrips)
         fillTriangleMesh(mesh, static_cast<const Nif::NiTriStripsData&>(geometry->data.get()), transform);
@@ -309,7 +309,9 @@ void BulletNifLoader::handleNode(const std::string& fileName, const Nif::Node *n
         // NOTE: a trishape with hasBounds=true, but no BBoxCollision flag should NOT go through handleNiTriShape!
         // It must be ignored completely.
         // (occurs in tr_ex_imp_wall_arch_04.nif)
-        if(!node->hasBounds && (node->recType == Nif::RC_NiTriShape || node->recType == Nif::RC_NiTriStrips))
+        if(!node->hasBounds && (node->recType == Nif::RC_NiTriShape
+                             || node->recType == Nif::RC_NiTriStrips
+                             || node->recType == Nif::RC_BSLODTriShape))
         {
             handleNiTriShape(node, flags, getWorldTransform(node), isAnimated, avoid);
         }
@@ -342,7 +344,7 @@ void BulletNifLoader::handleNiTriShape(const Nif::Node *nifNode, int flags, cons
     if (niGeometry->data.empty() || niGeometry->data->vertices.empty())
         return;
 
-    if (niGeometry->recType == Nif::RC_NiTriShape)
+    if (niGeometry->recType == Nif::RC_NiTriShape || niGeometry->recType == Nif::RC_BSLODTriShape)
     {
         if (niGeometry->data->recType != Nif::RC_NiTriShapeData)
             return;
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 7ebb9bf8d4..c3f4e50cf8 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -67,6 +67,7 @@ namespace
             case Nif::RC_NiTriShape:
             case Nif::RC_NiTriStrips:
             case Nif::RC_NiLines:
+            case Nif::RC_BSLODTriShape:
                 return true;
         }
         return false;
@@ -1178,7 +1179,7 @@ namespace NifOsg
                 return;
             const Nif::NiGeometryData* niGeometryData = niGeometry->data.getPtr();
 
-            if (niGeometry->recType == Nif::RC_NiTriShape)
+            if (niGeometry->recType == Nif::RC_NiTriShape || nifNode->recType == Nif::RC_BSLODTriShape)
             {
                 if (niGeometryData->recType != Nif::RC_NiTriShapeData)
                     return;

From c0b9823372e3da7e91d57c8c2029a957efa5a481 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sun, 13 Dec 2020 04:04:14 +0300
Subject: [PATCH 0092/2859] Read BSShaderProperty and handle NiGeometry
 properties

---
 components/nif/niffile.cpp      |  1 +
 components/nif/node.hpp         |  9 ++++++++-
 components/nif/property.cpp     | 12 ++++++++++++
 components/nif/property.hpp     |  7 +++++++
 components/nif/record.hpp       |  3 ++-
 components/nif/recordptr.hpp    |  4 ++++
 components/nifosg/nifloader.cpp | 14 ++++++++++++++
 7 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index 8aa0b60350..665533c91b 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -132,6 +132,7 @@ static std::map<std::string,RecordFactoryEntry> makeFactory()
     factory["NiColorInterpolator"]          = {&construct <NiColorInterpolator>         , RC_NiColorInterpolator        };
     factory["BSShaderTextureSet"]           = {&construct <BSShaderTextureSet>          , RC_BSShaderTextureSet         };
     factory["BSLODTriShape"]                = {&construct <BSLODTriShape>               , RC_BSLODTriShape              };
+    factory["BSShaderProperty"]             = {&construct <BSShaderProperty>            , RC_BSShaderProperty           };
     return factory;
 }
 
diff --git a/components/nif/node.hpp b/components/nif/node.hpp
index 75041e187d..08f066e361 100644
--- a/components/nif/node.hpp
+++ b/components/nif/node.hpp
@@ -278,6 +278,8 @@ struct NiGeometry : Node
     NiGeometryDataPtr data;
     NiSkinInstancePtr skin;
     MaterialData material;
+    BSShaderPropertyPtr shaderprop;
+    NiAlphaPropertyPtr alphaprop;
 
     void read(NIFStream *nif) override
     {
@@ -286,7 +288,10 @@ struct NiGeometry : Node
         skin.read(nif);
         material.read(nif);
         if (nif->getVersion() == NIFFile::NIFVersion::VER_BGS && nif->getBethVersion() > NIFFile::BethVersion::BETHVER_FO3)
-            nif->skip(8);
+        {
+            shaderprop.read(nif);
+            alphaprop.read(nif);
+        }
     }
 
     void post(NIFFile *nif) override
@@ -294,6 +299,8 @@ struct NiGeometry : Node
         Node::post(nif);
         data.post(nif);
         skin.post(nif);
+        shaderprop.post(nif);
+        alphaprop.post(nif);
         if (recType != RC_NiParticles && !skin.empty())
             nif->setUseSkinning(true);
     }
diff --git a/components/nif/property.cpp b/components/nif/property.cpp
index e6ae71c241..55113d7c88 100644
--- a/components/nif/property.cpp
+++ b/components/nif/property.cpp
@@ -99,6 +99,18 @@ void NiTexturingProperty::post(NIFFile *nif)
         shaderTextures[i].post(nif);
 }
 
+void BSShaderProperty::read(NIFStream *nif)
+{
+    NiShadeProperty::read(nif);
+    if (nif->getBethVersion() <= NIFFile::BethVersion::BETHVER_FO3)
+    {
+        type = nif->getUInt();
+        flags1 = nif->getUInt();
+        flags2 = nif->getUInt();
+        envMapIntensity = nif->getFloat();
+    }
+}
+
 void NiFogProperty::read(NIFStream *nif)
 {
     Property::read(nif);
diff --git a/components/nif/property.hpp b/components/nif/property.hpp
index c821b7c37e..5bc0c52dba 100644
--- a/components/nif/property.hpp
+++ b/components/nif/property.hpp
@@ -118,6 +118,13 @@ struct NiShadeProperty : public Property
     }
 };
 
+struct BSShaderProperty : public NiShadeProperty
+{
+    unsigned int type{0u}, flags1{0u}, flags2{0u};
+    float envMapIntensity{0.f};
+    void read(NIFStream *nif) override;
+};
+
 struct NiDitherProperty : public Property
 {
     unsigned short flags;
diff --git a/components/nif/record.hpp b/components/nif/record.hpp
index 6834c554ee..efacd82462 100644
--- a/components/nif/record.hpp
+++ b/components/nif/record.hpp
@@ -121,7 +121,8 @@ enum RecordType
   RC_NiTransformInterpolator,
   RC_NiColorInterpolator,
   RC_BSShaderTextureSet,
-  RC_BSLODTriShape
+  RC_BSLODTriShape,
+  RC_BSShaderProperty
 };
 
 /// Base class for all records
diff --git a/components/nif/recordptr.hpp b/components/nif/recordptr.hpp
index dd6e357084..4792895e2d 100644
--- a/components/nif/recordptr.hpp
+++ b/components/nif/recordptr.hpp
@@ -146,6 +146,8 @@ struct NiPoint3Interpolator;
 struct NiTransformInterpolator;
 struct BSShaderTextureSet;
 struct NiGeometryData;
+struct BSShaderProperty;
+class NiAlphaProperty;
 
 using NodePtr = RecordPtrT<Node>;
 using ExtraPtr = RecordPtrT<Extra>;
@@ -171,6 +173,8 @@ using NiPoint3InterpolatorPtr = RecordPtrT<NiPoint3Interpolator>;
 using NiTransformInterpolatorPtr = RecordPtrT<NiTransformInterpolator>;
 using BSShaderTextureSetPtr = RecordPtrT<BSShaderTextureSet>;
 using NiGeometryDataPtr = RecordPtrT<NiGeometryData>;
+using BSShaderPropertyPtr = RecordPtrT<BSShaderProperty>;
+using NiAlphaPropertyPtr = RecordPtrT<NiAlphaProperty>;
 
 using NodeList = RecordListT<Node>;
 using PropertyList = RecordListT<Property>;
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index c3f4e50cf8..5f68b12291 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -96,6 +96,15 @@ namespace
                 }
             }
         }
+
+        auto geometry = dynamic_cast<const Nif::NiGeometry*>(nifNode);
+        if (geometry)
+        {
+            if (!geometry->shaderprop.empty())
+                out.emplace_back(geometry->shaderprop.getPtr());
+            if (!geometry->alphaprop.empty())
+                out.emplace_back(geometry->alphaprop.getPtr());
+        }
     }
 
     // NodeCallback used to have a node always oriented towards the camera. The node can have translation and scale
@@ -366,6 +375,11 @@ namespace NifOsg
                     handleProperty(props[i].getPtr(), applyTo, composite, imageManager, boundTextures, animflags);
                 }
             }
+
+            auto geometry = dynamic_cast<const Nif::NiGeometry*>(nifNode);
+            // NiGeometry's NiAlphaProperty doesn't get handled here because it's a drawable property
+            if (geometry && !geometry->shaderprop.empty())
+                handleProperty(geometry->shaderprop.getPtr(), applyTo, composite, imageManager, boundTextures, animflags);
         }
 
         void setupController(const Nif::Controller* ctrl, SceneUtil::Controller* toSetup, int animflags)

From 085ea44af52d2780a25fee2ecd1d278c1170c9ec Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sun, 13 Dec 2020 04:19:14 +0300
Subject: [PATCH 0093/2859] Add BSShaderLightingProperty abstraction

---
 components/nif/property.cpp | 7 +++++++
 components/nif/property.hpp | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/components/nif/property.cpp b/components/nif/property.cpp
index 55113d7c88..d5357e1230 100644
--- a/components/nif/property.cpp
+++ b/components/nif/property.cpp
@@ -111,6 +111,13 @@ void BSShaderProperty::read(NIFStream *nif)
     }
 }
 
+void BSShaderLightingProperty::read(NIFStream *nif)
+{
+    BSShaderProperty::read(nif);
+    if (nif->getBethVersion() <= NIFFile::BethVersion::BETHVER_FO3)
+        clamp = nif->getUInt();
+}
+
 void NiFogProperty::read(NIFStream *nif)
 {
     Property::read(nif);
diff --git a/components/nif/property.hpp b/components/nif/property.hpp
index 5bc0c52dba..813a1888d8 100644
--- a/components/nif/property.hpp
+++ b/components/nif/property.hpp
@@ -125,6 +125,12 @@ struct BSShaderProperty : public NiShadeProperty
     void read(NIFStream *nif) override;
 };
 
+struct BSShaderLightingProperty : public BSShaderProperty
+{
+    unsigned int clamp{0u};
+    void read(NIFStream *nif) override;
+};
+
 struct NiDitherProperty : public Property
 {
     unsigned short flags;

From 53e1e57eef3954b5b61dd44c98aeb3c26932d679 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sun, 13 Dec 2020 16:51:20 +0300
Subject: [PATCH 0094/2859] Formatting

---
 components/nifbullet/bulletnifloader.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index 033cfcab68..d72cef1940 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -310,8 +310,8 @@ void BulletNifLoader::handleNode(const std::string& fileName, const Nif::Node *n
         // It must be ignored completely.
         // (occurs in tr_ex_imp_wall_arch_04.nif)
         if(!node->hasBounds && (node->recType == Nif::RC_NiTriShape
-                             || node->recType == Nif::RC_NiTriStrips
-                             || node->recType == Nif::RC_BSLODTriShape))
+                                || node->recType == Nif::RC_NiTriStrips
+                                || node->recType == Nif::RC_BSLODTriShape))
         {
             handleNiTriShape(node, flags, getWorldTransform(node), isAnimated, avoid);
         }

From b39437dfb63156fa32a93515d0404e01efdf70e2 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Mon, 14 Dec 2020 22:23:01 +0100
Subject: [PATCH 0095/2859] Don't allow projectiles to stand still when they
 hit an ally.

When an NPC fire a projectile, it should affect only its targeted actor.
To this end, after a hit is detected the target is checked against the
list of AI targets and reactivated if necessary.
Problem occurs when the hit occurs as a result of a friendly actor going
into the projectile (detected in ClosestNotMeConvexResultCallback):
while the projectile is inside the friend's collision box, it is
deactivated, just to be immediately reactivated. Effectively, the
projectile does nothing until the actor moves out.

Add a check inside the ClosestNotMeConvexResultCallback before declaring
a hit.
Since the necessary data is not safely accessible from the async thread,
maintain a copy inside the Projectile class.
---
 .../closestnotmeconvexresultcallback.cpp      |  7 +--
 apps/openmw/mwphysics/physicssystem.cpp       |  7 +++
 apps/openmw/mwphysics/projectile.cpp          | 48 +++++++++++++++++--
 apps/openmw/mwphysics/projectile.hpp          | 10 +++-
 apps/openmw/mwworld/projectilemanager.cpp     | 36 +++-----------
 apps/openmw/mwworld/projectilemanager.hpp     |  2 -
 6 files changed, 68 insertions(+), 42 deletions(-)

diff --git a/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp b/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp
index 8f72422765..3ec09d00d2 100644
--- a/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp
+++ b/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp
@@ -30,12 +30,9 @@ namespace MWPhysics
                 return btScalar(1);
             auto* targetHolder = static_cast<PtrHolder*>(mMe->getUserPointer());
             const MWWorld::Ptr target = targetHolder->getPtr();
-            // do nothing if we hit the caster. Sometimes the launching origin is inside of caster collision shape
-            if (projectileHolder->getCaster() != target)
-            {
+            if (projectileHolder->isValidTarget(target))
                 projectileHolder->hit(target, convexResult.m_hitPointLocal, convexResult.m_hitNormalLocal);
-                return btScalar(1);
-            }
+            return btScalar(1);
         }
 
         btVector3 hitNormalWorld;
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 8106a78ea1..151801e67d 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -537,6 +537,13 @@ namespace MWPhysics
             if (actor->getStandingOnPtr() == old)
                 actor->setStandingOnPtr(updated);
         }
+
+        for (auto& [_, projectile] : mProjectiles)
+        {
+            if (projectile->getCaster() == old)
+                projectile->setCaster(updated);
+        }
+
     }
 
     Actor *PhysicsSystem::getActor(const MWWorld::Ptr &ptr)
diff --git a/apps/openmw/mwphysics/projectile.cpp b/apps/openmw/mwphysics/projectile.cpp
index 5f5bc778ba..a8aaeb72a4 100644
--- a/apps/openmw/mwphysics/projectile.cpp
+++ b/apps/openmw/mwphysics/projectile.cpp
@@ -55,7 +55,7 @@ Projectile::~Projectile()
 
 void Projectile::commitPositionChange()
 {
-    std::unique_lock<std::mutex> lock(mPositionMutex);
+    std::scoped_lock lock(mMutex);
     if (mTransformUpdatePending)
     {
         mCollisionObject->setWorldTransform(mLocalTransform);
@@ -65,7 +65,7 @@ void Projectile::commitPositionChange()
 
 void Projectile::setPosition(const osg::Vec3f &position)
 {
-    std::unique_lock<std::mutex> lock(mPositionMutex);
+    std::scoped_lock lock(mMutex);
     mLocalTransform.setOrigin(Misc::Convert::toBullet(position));
     mTransformUpdatePending = true;
 }
@@ -74,7 +74,7 @@ void Projectile::hit(MWWorld::Ptr target, btVector3 pos, btVector3 normal)
 {
     if (!mActive.load(std::memory_order_acquire))
         return;
-    std::unique_lock<std::mutex> lock(mPositionMutex);
+    std::scoped_lock lock(mMutex);
     mHitTarget = target;
     mHitPosition = pos;
     mHitNormal = normal;
@@ -86,4 +86,46 @@ void Projectile::activate()
     assert(!mActive);
     mActive.store(true, std::memory_order_release);
 }
+
+MWWorld::Ptr Projectile::getCaster() const
+{
+    std::scoped_lock lock(mMutex);
+    return mCaster;
+}
+
+void Projectile::setCaster(MWWorld::Ptr caster)
+{
+    std::scoped_lock lock(mMutex);
+    mCaster = caster;
+}
+
+void Projectile::setValidTargets(const std::vector<MWWorld::Ptr>& targets)
+{
+    std::scoped_lock lock(mMutex);
+    mValidTargets = targets;
+}
+
+bool Projectile::isValidTarget(const MWWorld::Ptr& target) const
+{
+    std::scoped_lock lock(mMutex);
+    if (mCaster == target)
+        return false;
+
+    if (!mValidTargets.empty())
+    {
+        bool validTarget = false;
+        for (const auto& targetActor : mValidTargets)
+        {
+            if (targetActor == target)
+            {
+                validTarget = true;
+                break;
+            }
+        }
+
+        return validTarget;
+    }
+    return true;
+}
+
 }
diff --git a/apps/openmw/mwphysics/projectile.hpp b/apps/openmw/mwphysics/projectile.hpp
index ed0fdce150..5ae963b9a8 100644
--- a/apps/openmw/mwphysics/projectile.hpp
+++ b/apps/openmw/mwphysics/projectile.hpp
@@ -62,7 +62,8 @@ namespace MWPhysics
             return mHitTarget;
         }
 
-        MWWorld::Ptr getCaster() const { return mCaster; }
+        MWWorld::Ptr getCaster() const;
+        void setCaster(MWWorld::Ptr caster);
 
         osg::Vec3f getHitPos() const
         {
@@ -73,6 +74,9 @@ namespace MWPhysics
         void hit(MWWorld::Ptr target, btVector3 pos, btVector3 normal);
         void activate();
 
+        void setValidTargets(const std::vector<MWWorld::Ptr>& targets);
+        bool isValidTarget(const MWWorld::Ptr& target) const;
+
     private:
 
         std::unique_ptr<btCollisionShape> mShape;
@@ -87,7 +91,9 @@ namespace MWPhysics
         btVector3 mHitPosition;
         btVector3 mHitNormal;
 
-        mutable std::mutex mPositionMutex;
+        std::vector<MWWorld::Ptr> mValidTargets;
+
+        mutable std::mutex mMutex;
 
         osg::Vec3f mPosition;
 
diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index dba4289a23..08c9e46627 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -387,7 +387,7 @@ namespace MWWorld
             if (magicBoltState.mToDelete)
                 continue;
 
-            const auto* projectile = mPhysics->getProjectile(magicBoltState.mProjectileId);
+            auto* projectile = mPhysics->getProjectile(magicBoltState.mProjectileId);
             if (!projectile->isActive())
                 continue;
             // If the actor caster is gone, the magic bolt needs to be removed from the scene during the next frame.
@@ -423,6 +423,7 @@ namespace MWWorld
             std::vector<MWWorld::Ptr> targetActors;
             if (!caster.isEmpty() && caster.getClass().isActor() && caster != MWMechanics::getPlayer())
                 caster.getClass().getCreatureStats(caster).getAiSequence().getCombatTargets(targetActors);
+            projectile->setValidTargets(targetActors);
 
             // Check for impact
             // TODO: use a proper btRigidBody / btGhostObject?
@@ -469,7 +470,7 @@ namespace MWWorld
             if (projectileState.mToDelete)
                 continue;
 
-            const auto* projectile = mPhysics->getProjectile(projectileState.mProjectileId);
+            auto* projectile = mPhysics->getProjectile(projectileState.mProjectileId);
             if (!projectile->isActive())
                 continue;
             // gravity constant - must be way lower than the gravity affecting actors, since we're not
@@ -499,6 +500,7 @@ namespace MWWorld
             std::vector<MWWorld::Ptr> targetActors;
             if (!caster.isEmpty() && caster.getClass().isActor() && caster != MWMechanics::getPlayer())
                 caster.getClass().getCreatureStats(caster).getAiSequence().getCombatTargets(targetActors);
+            projectile->setValidTargets(targetActors);
 
             // Check for impact
             // TODO: use a proper btRigidBody / btGhostObject?
@@ -547,7 +549,7 @@ namespace MWWorld
             const auto pos = projectile->getHitPos();
             MWWorld::Ptr caster = projectileState.getCaster();
             assert(target != caster);
-            if (!isValidTarget(caster, target))
+            if (!projectile->isValidTarget(target))
             {
                 projectile->activate();
                 continue;
@@ -583,7 +585,7 @@ namespace MWWorld
             const auto pos = projectile->getHitPos();
             MWWorld::Ptr caster = magicBoltState.getCaster();
             assert(target != caster);
-            if (!isValidTarget(caster, target))
+            if (!projectile->isValidTarget(target))
             {
                 projectile->activate();
                 continue;
@@ -607,32 +609,6 @@ namespace MWWorld
                 mMagicBolts.end());
     }
 
-    bool ProjectileManager::isValidTarget(const MWWorld::Ptr& caster, const MWWorld::Ptr& target)
-    {
-        // For AI actors, get combat targets to use in the ray cast. Only those targets will return a positive hit result.
-        std::vector<MWWorld::Ptr> targetActors;
-        if (!caster.isEmpty() && caster.getClass().isActor() && caster != MWMechanics::getPlayer())
-        {
-            caster.getClass().getCreatureStats(caster).getAiSequence().getCombatTargets(targetActors);
-            if (!targetActors.empty())
-            {
-                bool validTarget = false;
-                for (MWWorld::Ptr& targetActor : targetActors)
-                {
-                    if (targetActor == target)
-                    {
-                        validTarget = true;
-                        break;
-                    }
-                }
-
-                return validTarget;
-            }
-        }
-
-        return true;
-    }
-
     void ProjectileManager::cleanupProjectile(ProjectileManager::ProjectileState& state)
     {
         mParent->removeChild(state.mNode);
diff --git a/apps/openmw/mwworld/projectilemanager.hpp b/apps/openmw/mwworld/projectilemanager.hpp
index d589e985e5..2cd570847b 100644
--- a/apps/openmw/mwworld/projectilemanager.hpp
+++ b/apps/openmw/mwworld/projectilemanager.hpp
@@ -132,8 +132,6 @@ namespace MWWorld
         void moveProjectiles(float dt);
         void moveMagicBolts(float dt);
 
-        bool isValidTarget(const MWWorld::Ptr& caster, const MWWorld::Ptr& target);
-
         void createModel (State& state, const std::string& model, const osg::Vec3f& pos, const osg::Quat& orient,
                             bool rotate, bool createLight, osg::Vec4 lightDiffuseColor, std::string texture = "");
         void update (State& state, float duration);

From 3195716a2c7cae7d34c5da5c360cf4c068aa9ba1 Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Tue, 15 Dec 2020 13:49:25 +0200
Subject: [PATCH 0096/2859] Don't force loop textkey

---
 components/resource/keyframemanager.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/components/resource/keyframemanager.cpp b/components/resource/keyframemanager.cpp
index 41b10bd65d..0ffe597122 100644
--- a/components/resource/keyframemanager.cpp
+++ b/components/resource/keyframemanager.cpp
@@ -40,8 +40,6 @@ namespace Resource
                         std::string animationName = animation->getName();
                         std::string start = animationName + std::string(": start");
                         std::string stop = animationName + std::string(": stop");
-                        std::string loopstart = animationName + std::string(": loop start");
-                        std::string loopstop = animationName + std::string(": loop stop");
 
                         const osgAnimation::ChannelList& channels = animation->getChannels();
                         for (const auto& channel: channels)
@@ -60,8 +58,6 @@ namespace Resource
                         // Keywords can be stuff like Loop, Equip, Unequip, Block, InventoryHandtoHand, InventoryWeaponOneHand, PickProbe, Slash, Thrust, Chop... even "Slash Small Follow"
                         mTarget.mTextKeys.emplace(startTime, std::move(start));
                         mTarget.mTextKeys.emplace(stopTime, std::move(stop));
-                        mTarget.mTextKeys.emplace(startTime, std::move(loopstart));
-                        mTarget.mTextKeys.emplace(stopTime, std::move(loopstop));
 
                         SceneUtil::EmulatedAnimation emulatedAnimation;
                         emulatedAnimation.mStartTime = startTime;

From 6c1f6169c0e191dd2a6c6414f484e031470a0e96 Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Tue, 15 Dec 2020 13:50:19 +0200
Subject: [PATCH 0097/2859] Fix root movement glitch

---
 components/sceneutil/osgacontroller.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/sceneutil/osgacontroller.cpp b/components/sceneutil/osgacontroller.cpp
index d77b8d666c..f0eb7da6f9 100644
--- a/components/sceneutil/osgacontroller.cpp
+++ b/components/sceneutil/osgacontroller.cpp
@@ -117,7 +117,7 @@ namespace SceneUtil
         //Find the correct animation based on time
         for (const EmulatedAnimation& emulatedAnimation : mEmulatedAnimations)
         {
-            if (time > emulatedAnimation.mStartTime && time < emulatedAnimation.mStopTime)
+            if (time >= emulatedAnimation.mStartTime && time <= emulatedAnimation.mStopTime)
             {
                 newTime = time - emulatedAnimation.mStartTime;
                 animationName = emulatedAnimation.mName;

From 8b2bf12e8fa55327ac9896c741ef366993a87570 Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Tue, 15 Dec 2020 13:51:49 +0200
Subject: [PATCH 0098/2859] Use bip01 for root bone name

---
 apps/openmw/mwrender/animation.cpp      | 2 --
 components/resource/keyframemanager.cpp | 2 +-
 components/sceneutil/osgacontroller.cpp | 4 ++--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 8c9f5f4939..f8ff3780d3 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -782,8 +782,6 @@ namespace MWRender
             NodeMap::const_iterator found = nodeMap.find("bip01");
             if (found == nodeMap.end())
                 found = nodeMap.find("root bone");
-            if (found == nodeMap.end())
-                found = nodeMap.find("root");
 
             if (found != nodeMap.end())
                 mAccumRoot = found->second;
diff --git a/components/resource/keyframemanager.cpp b/components/resource/keyframemanager.cpp
index 0ffe597122..d739392e8b 100644
--- a/components/resource/keyframemanager.cpp
+++ b/components/resource/keyframemanager.cpp
@@ -21,7 +21,7 @@ namespace Resource
 
     void RetrieveAnimationsVisitor::apply(osg::Node& node)
     {
-        if (node.libraryName() == std::string("osgAnimation") && node.className() == std::string("Bone") && node.getName() == std::string("root"))
+        if (node.libraryName() == std::string("osgAnimation") && node.className() == std::string("Bone") && node.getName() == std::string("bip01"))
             {
                 osg::ref_ptr<SceneUtil::OsgAnimationController> callback = new SceneUtil::OsgAnimationController();
 
diff --git a/components/sceneutil/osgacontroller.cpp b/components/sceneutil/osgacontroller.cpp
index f0eb7da6f9..37aa525af1 100644
--- a/components/sceneutil/osgacontroller.cpp
+++ b/components/sceneutil/osgacontroller.cpp
@@ -83,7 +83,7 @@ namespace SceneUtil
         {
             osgAnimation::UpdateMatrixTransform* umt = dynamic_cast<osgAnimation::UpdateMatrixTransform*>(cb);
             if (umt)
-                if (node.getName() != "root") link(umt);
+                if (node.getName() != "bip01") link(umt);
             cb = cb->getNestedCallback();
         }
 
@@ -133,7 +133,7 @@ namespace SceneUtil
 
             for (const auto& channel: channels)
             {
-                if (channel->getTargetName() != "root" || channel->getName() != "transform") continue;
+                if (channel->getTargetName() != "bip01" || channel->getName() != "transform") continue;
 
                 if ( osgAnimation::MatrixLinearSampler* templateSampler = dynamic_cast<osgAnimation::MatrixLinearSampler*> (channel->getSampler()) )
                 {

From 259d52280088c50f6399f55549f7db8b91d98277 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Tue, 15 Dec 2020 21:34:58 +0100
Subject: [PATCH 0099/2859] When doing a ray cast to the next projectile
 position, ignore collisions that occurs with the projectile own collision
 object. Otherwise a magic bolt can explode "spontaneously".

---
 apps/openmw/mwphysics/closestnotmerayresultcallback.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp b/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp
index 422ca78bd5..f9dc3bdd50 100644
--- a/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp
+++ b/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp
@@ -24,6 +24,10 @@ namespace MWPhysics
     {
         if (rayResult.m_collisionObject == mMe)
             return 1.f;
+
+        if (mProjectile && rayResult.m_collisionObject == mProjectile->getCollisionObject())
+            return 1.f;
+
         if (!mTargets.empty())
         {
             if ((std::find(mTargets.begin(), mTargets.end(), rayResult.m_collisionObject) == mTargets.end()))

From 1e6156e04ae35dbe04dca932ff61a3dc61c9c9a4 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Wed, 16 Dec 2020 01:06:05 +0300
Subject: [PATCH 0100/2859] Turn all NIF records into structs

---
 components/nif/base.hpp        |  9 +++-----
 components/nif/controlled.hpp  | 21 ++++++-----------
 components/nif/controller.hpp  | 31 +++++++++----------------
 components/nif/data.hpp        | 42 ++++++++++++----------------------
 components/nif/extra.hpp       |  9 +++-----
 components/nif/node.hpp        |  3 +--
 components/nif/property.hpp    | 12 ++++------
 components/nif/recordptr.hpp   | 34 +++++++++++++--------------
 components/nifosg/particle.hpp |  8 +++----
 9 files changed, 65 insertions(+), 104 deletions(-)

diff --git a/components/nif/base.hpp b/components/nif/base.hpp
index 711272abb0..022e5224a0 100644
--- a/components/nif/base.hpp
+++ b/components/nif/base.hpp
@@ -11,9 +11,8 @@
 namespace Nif
 {
 // An extra data record. All the extra data connected to an object form a linked list.
-class Extra : public Record
+struct Extra : public Record
 {
-public:
     std::string name;
     ExtraPtr next; // Next extra data record in the list
 
@@ -31,9 +30,8 @@ public:
     void post(NIFFile *nif) override { next.post(nif); }
 };
 
-class Controller : public Record
+struct Controller : public Record
 {
-public:
     ControllerPtr next;
     int flags;
     float frequency, phase;
@@ -45,9 +43,8 @@ public:
 };
 
 /// Has name, extra-data and controller
-class Named : public Record
+struct Named : public Record
 {
-public:
     std::string name;
     ExtraPtr extra;
     ExtraList extralist;
diff --git a/components/nif/controlled.hpp b/components/nif/controlled.hpp
index ac48e50498..0d93381eab 100644
--- a/components/nif/controlled.hpp
+++ b/components/nif/controlled.hpp
@@ -29,9 +29,8 @@
 namespace Nif
 {
 
-class NiSourceTexture : public Named
+struct NiSourceTexture : public Named
 {
-public:
     // Is this an external (references a separate texture file) or
     // internal (data is inside the nif itself) texture?
     bool external;
@@ -93,27 +92,24 @@ struct NiParticleModifier : public Record
     void post(NIFFile *nif) override;
 };
 
-class NiParticleGrowFade : public NiParticleModifier
+struct NiParticleGrowFade : public NiParticleModifier
 {
-public:
     float growTime;
     float fadeTime;
 
     void read(NIFStream *nif) override;
 };
 
-class NiParticleColorModifier : public NiParticleModifier
+struct NiParticleColorModifier : public NiParticleModifier
 {
-public:
     NiColorDataPtr data;
 
     void read(NIFStream *nif) override;
     void post(NIFFile *nif) override;
 };
 
-class NiGravity : public NiParticleModifier
+struct NiGravity : public NiParticleModifier
 {
-public:
     float mForce;
     /* 0 - Wind (fixed direction)
      * 1 - Point (fixed origin)
@@ -133,27 +129,24 @@ struct NiParticleCollider : public NiParticleModifier
 };
 
 // NiPinaColada
-class NiPlanarCollider : public NiParticleCollider
+struct NiPlanarCollider : public NiParticleCollider
 {
-public:
     void read(NIFStream *nif) override;
 
     osg::Vec3f mPlaneNormal;
     float mPlaneDistance;
 };
 
-class NiSphericalCollider : public NiParticleCollider
+struct NiSphericalCollider : public NiParticleCollider
 {
-public:
     float mRadius;
     osg::Vec3f mCenter;
 
     void read(NIFStream *nif) override;
 };
 
-class NiParticleRotation : public NiParticleModifier
+struct NiParticleRotation : public NiParticleModifier
 {
-public:
     void read(NIFStream *nif) override;
 };
 
diff --git a/components/nif/controller.hpp b/components/nif/controller.hpp
index 4016188ce0..503710fe90 100644
--- a/components/nif/controller.hpp
+++ b/components/nif/controller.hpp
@@ -29,9 +29,8 @@
 namespace Nif
 {
 
-class NiParticleSystemController : public Controller
+struct NiParticleSystemController : public Controller
 {
-public:
     struct Particle {
         osg::Vec3f velocity;
         float lifetime;
@@ -80,9 +79,8 @@ public:
 };
 using NiBSPArrayController = NiParticleSystemController;
 
-class NiMaterialColorController : public Controller
+struct NiMaterialColorController : public Controller
 {
-public:
     NiPoint3InterpolatorPtr interpolator;
     NiPosDataPtr data;
     unsigned int targetColor;
@@ -91,9 +89,8 @@ public:
     void post(NIFFile *nif) override;
 };
 
-class NiPathController : public Controller
+struct NiPathController : public Controller
 {
-public:
     NiPosDataPtr posData;
     NiFloatDataPtr floatData;
 
@@ -115,9 +112,8 @@ public:
     void post(NIFFile *nif) override;
 };
 
-class NiLookAtController : public Controller
+struct NiLookAtController : public Controller
 {
-public:
     NodePtr target;
     unsigned short lookAtFlags{0};
 
@@ -125,9 +121,8 @@ public:
     void post(NIFFile *nif) override;
 };
 
-class NiUVController : public Controller
+struct NiUVController : public Controller
 {
-public:
     NiUVDataPtr data;
     unsigned int uvSet;
 
@@ -135,9 +130,8 @@ public:
     void post(NIFFile *nif) override;
 };
 
-class NiKeyframeController : public Controller
+struct NiKeyframeController : public Controller
 {
-public:
     NiKeyframeDataPtr data;
     NiTransformInterpolatorPtr interpolator;
 
@@ -154,12 +148,11 @@ struct NiFloatInterpController : public Controller
     void post(NIFFile *nif) override;
 };
 
-class NiAlphaController : public NiFloatInterpController { };
-class NiRollController : public NiFloatInterpController { };
+struct NiAlphaController : public NiFloatInterpController { };
+struct NiRollController : public NiFloatInterpController { };
 
-class NiGeomMorpherController : public Controller
+struct NiGeomMorpherController : public Controller
 {
-public:
     NiMorphDataPtr data;
     NiFloatInterpolatorList interpolators;
 
@@ -167,18 +160,16 @@ public:
     void post(NIFFile *nif) override;
 };
 
-class NiVisController : public Controller
+struct NiVisController : public Controller
 {
-public:
     NiVisDataPtr data;
 
     void read(NIFStream *nif) override;
     void post(NIFFile *nif) override;
 };
 
-class NiFlipController : public Controller
+struct NiFlipController : public Controller
 {
-public:
     NiFloatInterpolatorPtr mInterpolator;
     int mTexSlot; // NiTexturingProperty::TextureType
     float mDelta; // Time between two flips. delta = (start_time - stop_time) / num_sources
diff --git a/components/nif/data.hpp b/components/nif/data.hpp
index 908313f504..66a391afc3 100644
--- a/components/nif/data.hpp
+++ b/components/nif/data.hpp
@@ -32,9 +32,8 @@ namespace Nif
 {
 
 // Common ancestor for several data classes
-class NiGeometryData : public Record
+struct NiGeometryData : public Record
 {
-public:
     std::vector<osg::Vec3f> vertices, normals, tangents, bitangents;
     std::vector<osg::Vec4f> colors;
     std::vector< std::vector<osg::Vec2f> > uvlist;
@@ -44,18 +43,16 @@ public:
     void read(NIFStream *nif) override;
 };
 
-class NiTriShapeData : public NiGeometryData
+struct NiTriShapeData : public NiGeometryData
 {
-public:
     // Triangles, three vertex indices per triangle
     std::vector<unsigned short> triangles;
 
     void read(NIFStream *nif) override;
 };
 
-class NiTriStripsData : public NiGeometryData
+struct NiTriStripsData : public NiGeometryData
 {
-public:
     // Triangle strips, series of vertex indices.
     std::vector<std::vector<unsigned short>> strips;
 
@@ -70,9 +67,8 @@ struct NiLinesData : public NiGeometryData
     void read(NIFStream *nif) override;
 };
 
-class NiParticlesData : public NiGeometryData
+struct NiParticlesData : public NiGeometryData
 {
-public:
     int numParticles{0};
 
     int activeCount;
@@ -84,39 +80,34 @@ public:
     void read(NIFStream *nif) override;
 };
 
-class NiRotatingParticlesData : public NiParticlesData
+struct NiRotatingParticlesData : public NiParticlesData
 {
-public:
     void read(NIFStream *nif) override;
 };
 
-class NiPosData : public Record
+struct NiPosData : public Record
 {
-public:
     Vector3KeyMapPtr mKeyList;
 
     void read(NIFStream *nif) override;
 };
 
-class NiUVData : public Record
+struct NiUVData : public Record
 {
-public:
     FloatKeyMapPtr mKeyList[4];
 
     void read(NIFStream *nif) override;
 };
 
-class NiFloatData : public Record
+struct NiFloatData : public Record
 {
-public:
     FloatKeyMapPtr mKeyList;
 
     void read(NIFStream *nif) override;
 };
 
-class NiPixelData : public Record
+struct NiPixelData : public Record
 {
-public:
     enum Format
     {
         NIPXFMT_RGB8,
@@ -150,17 +141,15 @@ public:
     void post(NIFFile *nif) override;
 };
 
-class NiColorData : public Record
+struct NiColorData : public Record
 {
-public:
     Vector4KeyMapPtr mKeyMap;
 
     void read(NIFStream *nif) override;
 };
 
-class NiVisData : public Record
+struct NiVisData : public Record
 {
-public:
     struct VisData {
         float time;
         bool isSet;
@@ -170,9 +159,8 @@ public:
     void read(NIFStream *nif) override;
 };
 
-class NiSkinInstance : public Record
+struct NiSkinInstance : public Record
 {
-public:
     NiSkinDataPtr data;
     NiSkinPartitionPtr partitions;
     NodePtr root;
@@ -182,9 +170,8 @@ public:
     void post(NIFFile *nif) override;
 };
 
-class NiSkinData : public Record
+struct NiSkinData : public Record
 {
-public:
     struct VertWeight
     {
         unsigned short vertex;
@@ -251,9 +238,8 @@ struct NiKeyframeData : public Record
     void read(NIFStream *nif) override;
 };
 
-class NiPalette : public Record
+struct NiPalette : public Record
 {
-public:
     // 32-bit RGBA colors that correspond to 8-bit indices
     std::vector<unsigned int> colors;
 
diff --git a/components/nif/extra.hpp b/components/nif/extra.hpp
index 5d7aa0c3b2..6d345a18ea 100644
--- a/components/nif/extra.hpp
+++ b/components/nif/extra.hpp
@@ -29,15 +29,13 @@
 namespace Nif
 {
 
-class NiVertWeightsExtraData : public Extra
+struct NiVertWeightsExtraData : public Extra
 {
-public:
     void read(NIFStream *nif) override;
 };
 
-class NiTextKeyExtraData : public Extra
+struct NiTextKeyExtraData : public Extra
 {
-public:
     struct TextKey
     {
         float time;
@@ -48,9 +46,8 @@ public:
     void read(NIFStream *nif) override;
 };
 
-class NiStringExtraData : public Extra
+struct NiStringExtraData : public Extra
 {
-public:
     /* Two known meanings:
        "MRK" - marker, only visible in the editor, not rendered in-game
        "NCO" - no collision
diff --git a/components/nif/node.hpp b/components/nif/node.hpp
index 08f066e361..1d082b8f9b 100644
--- a/components/nif/node.hpp
+++ b/components/nif/node.hpp
@@ -131,9 +131,8 @@ struct NiBoundingVolume
     parent node (unless it's the root), and transformation (location
     and rotation) relative to it's parent.
  */
-class Node : public Named
+struct Node : public Named
 {
-public:
     // Node flags. Interpretation depends somewhat on the type of node.
     unsigned int flags;
     Transformation trafo;
diff --git a/components/nif/property.hpp b/components/nif/property.hpp
index 813a1888d8..eccb442f7e 100644
--- a/components/nif/property.hpp
+++ b/components/nif/property.hpp
@@ -29,11 +29,10 @@
 namespace Nif
 {
 
-class Property : public Named { };
+struct Property : public Named { };
 
-class NiTexturingProperty : public Property
+struct NiTexturingProperty : public Property
 {
-public:
     unsigned short flags{0u};
 
     // A sub-texture
@@ -96,9 +95,8 @@ public:
     void post(NIFFile *nif) override;
 };
 
-class NiFogProperty : public Property
+struct NiFogProperty : public Property
 {
-public:
     unsigned short mFlags;
     float mFogDepth;
     osg::Vec3f mColour;
@@ -307,8 +305,8 @@ struct S_StencilProperty
     void read(NIFStream *nif);
 };
 
-class NiAlphaProperty : public StructPropT<S_AlphaProperty> { };
-class NiVertexColorProperty : public StructPropT<S_VertexColorProperty> { };
+struct NiAlphaProperty : public StructPropT<S_AlphaProperty> { };
+struct NiVertexColorProperty : public StructPropT<S_VertexColorProperty> { };
 struct NiStencilProperty : public Property
 {
     S_StencilProperty data;
diff --git a/components/nif/recordptr.hpp b/components/nif/recordptr.hpp
index 4792895e2d..b30d99fbe4 100644
--- a/components/nif/recordptr.hpp
+++ b/components/nif/recordptr.hpp
@@ -120,24 +120,24 @@ public:
 };
 
 
-class Node;
-class Extra;
-class Property;
-class NiUVData;
-class NiPosData;
-class NiVisData;
-class Controller;
-class Named;
-class NiSkinData;
-class NiFloatData;
+struct Node;
+struct Extra;
+struct Property;
+struct NiUVData;
+struct NiPosData;
+struct NiVisData;
+struct Controller;
+struct Named;
+struct NiSkinData;
+struct NiFloatData;
 struct NiMorphData;
-class NiPixelData;
-class NiColorData;
+struct NiPixelData;
+struct NiColorData;
 struct NiKeyframeData;
-class NiTriStripsData;
-class NiSkinInstance;
-class NiSourceTexture;
-class NiPalette;
+struct NiTriStripsData;
+struct NiSkinInstance;
+struct NiSourceTexture;
+struct NiPalette;
 struct NiParticleModifier;
 struct NiBoolData;
 struct NiSkinPartition;
@@ -147,7 +147,7 @@ struct NiTransformInterpolator;
 struct BSShaderTextureSet;
 struct NiGeometryData;
 struct BSShaderProperty;
-class NiAlphaProperty;
+struct NiAlphaProperty;
 
 using NodePtr = RecordPtrT<Node>;
 using ExtraPtr = RecordPtrT<Extra>;
diff --git a/components/nifosg/particle.hpp b/components/nifosg/particle.hpp
index dd89f4501d..b0a46f0ca5 100644
--- a/components/nifosg/particle.hpp
+++ b/components/nifosg/particle.hpp
@@ -14,10 +14,10 @@
 
 namespace Nif
 {
-    class NiGravity;
-    class NiPlanarCollider;
-    class NiSphericalCollider;
-    class NiColorData;
+    struct NiGravity;
+    struct NiPlanarCollider;
+    struct NiSphericalCollider;
+    struct NiColorData;
 }
 
 namespace NifOsg

From 9f81dcbd1afbd1904254e3c7a8f27a6bc22be8a8 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Wed, 16 Dec 2020 13:21:00 +0000
Subject: [PATCH 0101/2859] Per request via PM:

"I would like to request that my name is removed from the teams page as my contributions has all been replaced by better solutions years ago." by vorenon, Manuel Edelmann
---
 AUTHORS.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index e8134a681e..e6ff67293a 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -123,7 +123,6 @@ Programmers
     Lordrea
     Łukasz Gołębiewski (lukago)
     Lukasz Gromanowski (lgro)
-    Manuel Edelmann (vorenon)
     Marc Bouvier (CramitDeFrog)
     Marcin Hulist (Gohan)
     Mark Siewert (mark76)

From 640420eaaa61b38307b16aa6e5b14180f26bc4b8 Mon Sep 17 00:00:00 2001
From: Mads Buvik Sandvei <madssandvei@protonmail.com>
Date: Wed, 16 Dec 2020 21:46:52 +0100
Subject: [PATCH 0102/2859] No longer delete and recreate
 CopyFramebufferToTextureCallback, remove oneshot functionality. Instead just
 remove the callback after the traversals. Use addInitialDrawCallback instead
 of setInitialDrawCallback to avoid messing with existing callbacks.

---
 apps/openmw/mwgui/loadingscreen.cpp | 17 +++++++++--------
 apps/openmw/mwgui/loadingscreen.hpp |  2 ++
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwgui/loadingscreen.cpp b/apps/openmw/mwgui/loadingscreen.cpp
index cd0384bb02..2e2de578e3 100644
--- a/apps/openmw/mwgui/loadingscreen.cpp
+++ b/apps/openmw/mwgui/loadingscreen.cpp
@@ -137,15 +137,11 @@ namespace MWGui
     public:
         CopyFramebufferToTextureCallback(osg::Texture2D* texture)
             : mTexture(texture)
-            , oneshot(true)
         {
         }
 
         void operator () (osg::RenderInfo& renderInfo) const override
         {
-            if (!oneshot)
-                return;
-            oneshot = false;
             int w = renderInfo.getCurrentCamera()->getViewport()->width();
             int h = renderInfo.getCurrentCamera()->getViewport()->height();
             mTexture->copyTexImage2D(*renderInfo.getState(), 0, 0, w, h);
@@ -153,7 +149,6 @@ namespace MWGui
 
     private:
         osg::ref_ptr<osg::Texture2D> mTexture;
-        mutable bool oneshot;
     };
 
     class DontComputeBoundCallback : public osg::Node::ComputeBoundingSphereCallback
@@ -322,9 +317,12 @@ namespace MWGui
             mGuiTexture.reset(new osgMyGUI::OSGTexture(mTexture));
         }
 
-        // Notice that the next time this is called, the current CopyFramebufferToTextureCallback will be deleted
-        // so there's no memory leak as at most one object of type CopyFramebufferToTextureCallback is allocated at a time.
-        mViewer->getCamera()->setInitialDrawCallback(new CopyFramebufferToTextureCallback(mTexture));
+        if (!mCopyFramebufferToTextureCallback)
+        {
+            mCopyFramebufferToTextureCallback = new CopyFramebufferToTextureCallback(mTexture);
+        }
+
+        mViewer->getCamera()->addInitialDrawCallback(mCopyFramebufferToTextureCallback);
 
         mBackgroundImage->setBackgroundImage("");
         mBackgroundImage->setVisible(false);
@@ -367,6 +365,9 @@ namespace MWGui
         mViewer->renderingTraversals();
         mViewer->advance(mViewer->getFrameStamp()->getSimulationTime());
 
+        if(mCopyFramebufferToTextureCallback)
+            mViewer->getCamera()->removeInitialDrawCallback(mCopyFramebufferToTextureCallback);
+
         mLastRenderTime = mTimer.time_m();
     }
 
diff --git a/apps/openmw/mwgui/loadingscreen.hpp b/apps/openmw/mwgui/loadingscreen.hpp
index 2577827aaa..ac911ab60b 100644
--- a/apps/openmw/mwgui/loadingscreen.hpp
+++ b/apps/openmw/mwgui/loadingscreen.hpp
@@ -28,6 +28,7 @@ namespace Resource
 namespace MWGui
 {
     class BackgroundImage;
+    class CopyFramebufferToTextureCallback;
 
     class LoadingScreen : public WindowBase, public Loading::Listener
     {
@@ -84,6 +85,7 @@ namespace MWGui
         std::vector<std::string> mSplashScreens;
 
         osg::ref_ptr<osg::Texture2D> mTexture;
+        osg::ref_ptr<CopyFramebufferToTextureCallback> mCopyFramebufferToTextureCallback;
         std::unique_ptr<MyGUI::ITexture> mGuiTexture;
 
         void changeWallpaper();

From bc961a13f54842aa1dd75a459fabfe98ccce2cad Mon Sep 17 00:00:00 2001
From: Mads Buvik Sandvei <madssandvei@protonmail.com>
Date: Wed, 16 Dec 2020 22:03:16 +0100
Subject: [PATCH 0103/2859] avoid redundant calls to removeInitialDrawCallback

---
 apps/openmw/mwgui/loadingscreen.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/loadingscreen.cpp b/apps/openmw/mwgui/loadingscreen.cpp
index 2e2de578e3..20586ef4af 100644
--- a/apps/openmw/mwgui/loadingscreen.cpp
+++ b/apps/openmw/mwgui/loadingscreen.cpp
@@ -365,8 +365,11 @@ namespace MWGui
         mViewer->renderingTraversals();
         mViewer->advance(mViewer->getFrameStamp()->getSimulationTime());
 
-        if(mCopyFramebufferToTextureCallback)
+        if (mCopyFramebufferToTextureCallback)
+        {
             mViewer->getCamera()->removeInitialDrawCallback(mCopyFramebufferToTextureCallback);
+            mCopyFramebufferToTextureCallback = nullptr;
+        }
 
         mLastRenderTime = mTimer.time_m();
     }

From ce2bcba5d41631a63ae24d0491578f0ddf187cd2 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Wed, 16 Dec 2020 23:44:15 +0000
Subject: [PATCH 0104/2859] Replace deprecated alpha test in shader visitor

---
 components/CMakeLists.txt                  |   2 +-
 components/sceneutil/mwshadowtechnique.cpp |  19 ++-
 components/sceneutil/mwshadowtechnique.hpp |   4 +-
 components/sceneutil/shadowsbin.cpp        |  57 ++++++-
 components/sceneutil/shadowsbin.hpp        |  27 ++--
 components/shader/removedalphafunc.cpp     |  27 ++++
 components/shader/removedalphafunc.hpp     |  40 +++++
 components/shader/shadervisitor.cpp        | 172 +++++++++++++++++----
 components/shader/shadervisitor.hpp        |   4 +
 files/shaders/CMakeLists.txt               |   1 +
 files/shaders/alpha.glsl                   |  38 +++++
 files/shaders/objects_fragment.glsl        |   4 +
 files/shaders/shadowcasting_fragment.glsl  |   7 +-
 13 files changed, 342 insertions(+), 60 deletions(-)
 create mode 100644 components/shader/removedalphafunc.cpp
 create mode 100644 components/shader/removedalphafunc.hpp
 create mode 100644 files/shaders/alpha.glsl

diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 3c18990375..45864a6e83 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -46,7 +46,7 @@ add_component_dir (resource
     )
 
 add_component_dir (shader
-    shadermanager shadervisitor
+    shadermanager shadervisitor removedalphafunc
     )
 
 add_component_dir (sceneutil
diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
index c49a147776..31267f75ce 100644
--- a/components/sceneutil/mwshadowtechnique.cpp
+++ b/components/sceneutil/mwshadowtechnique.cpp
@@ -278,7 +278,7 @@ void VDSMCameraCullCallback::operator()(osg::Node* node, osg::NodeVisitor* nv)
     static osg::ref_ptr<osg::StateSet> ss;
     if (!ss)
     {
-        ShadowsBinAdder adder("ShadowsBin");
+        ShadowsBinAdder adder("ShadowsBin", _vdsm->getCastingPrograms());
         ss = new osg::StateSet;
         ss->setRenderBinDetails(osg::StateSet::OPAQUE_BIN, "ShadowsBin", osg::StateSet::OVERRIDE_PROTECTED_RENDERBIN_DETAILS);
     }
@@ -882,11 +882,15 @@ void SceneUtil::MWShadowTechnique::disableFrontFaceCulling()
 void SceneUtil::MWShadowTechnique::setupCastingShader(Shader::ShaderManager & shaderManager)
 {
     // This can't be part of the constructor as OSG mandates that there be a trivial constructor available
-    
-    _castingProgram = new osg::Program();
 
-    _castingProgram->addShader(shaderManager.getShader("shadowcasting_vertex.glsl", Shader::ShaderManager::DefineMap(), osg::Shader::VERTEX));
-    _castingProgram->addShader(shaderManager.getShader("shadowcasting_fragment.glsl", Shader::ShaderManager::DefineMap(), osg::Shader::FRAGMENT));
+    osg::ref_ptr<osg::Shader> castingVertexShader = shaderManager.getShader("shadowcasting_vertex.glsl", {}, osg::Shader::VERTEX);
+    for (int alphaFunc = GL_NEVER; alphaFunc <= GL_ALWAYS; ++alphaFunc)
+    {
+        auto& program = _castingPrograms[alphaFunc - GL_NEVER];
+        program = new osg::Program();
+        program->addShader(castingVertexShader);
+        program->addShader(shaderManager.getShader("shadowcasting_fragment.glsl", { {"alphaFunc", std::to_string(alphaFunc)} }, osg::Shader::FRAGMENT));
+    }
 }
 
 MWShadowTechnique::ViewDependentData* MWShadowTechnique::createViewDependentData(osgUtil::CullVisitor* /*cv*/)
@@ -1604,10 +1608,11 @@ void MWShadowTechnique::createShaders()
 
     }
 
-    if (!_castingProgram)
+    if (!_castingPrograms[GL_ALWAYS - GL_NEVER])
         OSG_NOTICE << "Shadow casting shader has not been set up. Remember to call setupCastingShader(Shader::ShaderManager &)" << std::endl;
 
-    _shadowCastingStateSet->setAttributeAndModes(_castingProgram, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+    // Always use the GL_ALWAYS shader as the shadows bin will change it if necessary
+    _shadowCastingStateSet->setAttributeAndModes(_castingPrograms[GL_ALWAYS - GL_NEVER], osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
     // The casting program uses a sampler, so to avoid undefined behaviour, we must bind a dummy texture in case no other is supplied
     _shadowCastingStateSet->setTextureAttributeAndModes(0, _fallbackBaseTexture.get(), osg::StateAttribute::ON);
     _shadowCastingStateSet->addUniform(new osg::Uniform("useDiffuseMapForShadowAlpha", true));
diff --git a/components/sceneutil/mwshadowtechnique.hpp b/components/sceneutil/mwshadowtechnique.hpp
index 5125247dda..96b1c7d0ed 100644
--- a/components/sceneutil/mwshadowtechnique.hpp
+++ b/components/sceneutil/mwshadowtechnique.hpp
@@ -215,6 +215,8 @@ namespace SceneUtil {
 
         virtual void createShaders();
 
+        virtual std::array<osg::ref_ptr<osg::Program>, GL_ALWAYS - GL_NEVER> getCastingPrograms() const { return _castingPrograms; }
+
         virtual bool selectActiveLights(osgUtil::CullVisitor* cv, ViewDependentData* vdd) const;
 
         virtual osg::Polytope computeLightViewFrustumPolytope(Frustum& frustum, LightData& positionedLight);
@@ -288,7 +290,7 @@ namespace SceneUtil {
         };
 
         osg::ref_ptr<DebugHUD>                  _debugHud;
-        osg::ref_ptr<osg::Program>              _castingProgram;
+        std::array<osg::ref_ptr<osg::Program>, GL_ALWAYS - GL_NEVER> _castingPrograms;
     };
 
 }
diff --git a/components/sceneutil/shadowsbin.cpp b/components/sceneutil/shadowsbin.cpp
index 520ad0362f..9e6d461ae7 100644
--- a/components/sceneutil/shadowsbin.cpp
+++ b/components/sceneutil/shadowsbin.cpp
@@ -1,7 +1,9 @@
 #include "shadowsbin.hpp"
 #include <unordered_set>
 #include <osg/StateSet>
+#include <osg/AlphaFunc>
 #include <osg/Material>
+#include <osg/Program>
 #include <osgUtil/StateGraph>
 
 using namespace osgUtil;
@@ -40,6 +42,10 @@ namespace
 namespace SceneUtil
 {
 
+std::array<osg::ref_ptr<osg::Program>, GL_ALWAYS - GL_NEVER> ShadowsBin::sCastingPrograms = {
+    nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr
+};
+
 ShadowsBin::ShadowsBin()
 {
     mNoTestStateSet = new osg::StateSet;
@@ -49,6 +55,12 @@ ShadowsBin::ShadowsBin()
     mShaderAlphaTestStateSet = new osg::StateSet;
     mShaderAlphaTestStateSet->addUniform(new osg::Uniform("alphaTestShadows", true));
     mShaderAlphaTestStateSet->setMode(GL_BLEND, osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE);
+
+    for (size_t i = 0; i < sCastingPrograms.size(); ++i)
+    {
+        mAlphaFuncShaders[i] = new osg::StateSet;
+        mAlphaFuncShaders[i]->setAttribute(sCastingPrograms[i], osg::StateAttribute::ON | osg::StateAttribute::PROTECTED | osg::StateAttribute::OVERRIDE);
+    }
 }
 
 StateGraph* ShadowsBin::cullStateGraph(StateGraph* sg, StateGraph* root, std::unordered_set<StateGraph*>& uninterestingCache)
@@ -71,7 +83,6 @@ StateGraph* ShadowsBin::cullStateGraph(StateGraph* sg, StateGraph* root, std::un
             continue;
 
         accumulateModeState(ss, state.mAlphaBlend, state.mAlphaBlendOverride, GL_BLEND);
-        accumulateModeState(ss, state.mAlphaTest, state.mAlphaTestOverride, GL_ALPHA_TEST);
 
         const osg::StateSet::AttributeList& attributes = ss->getAttributeList();
         osg::StateSet::AttributeList::const_iterator found = attributes.find(std::make_pair(osg::StateAttribute::MATERIAL, 0));
@@ -83,6 +94,14 @@ StateGraph* ShadowsBin::cullStateGraph(StateGraph* sg, StateGraph* root, std::un
                 state.mMaterial = nullptr;
         }
 
+        found = attributes.find(std::make_pair(osg::StateAttribute::ALPHAFUNC, 0));
+        if (found != attributes.end())
+        {
+            // As force shaders is on, we know this is really a RemovedAlphaFunc
+            const osg::StateSet::RefAttributePair& rap = found->second;
+            accumulateState(state.mAlphaFunc, static_cast<osg::AlphaFunc*>(rap.first.get()), state.mAlphaFuncOverride, rap.second);
+        }
+
         // osg::FrontFace specifies triangle winding, not front-face culling. We can't safely reparent anything under it.
         found = attributes.find(std::make_pair(osg::StateAttribute::FRONTFACE, 0));
         if (found != attributes.end())
@@ -113,16 +132,44 @@ StateGraph* ShadowsBin::cullStateGraph(StateGraph* sg, StateGraph* root, std::un
             leaf->_parent = sg_new;
             sg_new->_leaves.push_back(leaf);
         }
-        return sg_new;
+        sg = sg_new;
+    }
+
+    // GL_ALWAYS is set by default by mwshadowtechnique
+    if (state.mAlphaFunc && state.mAlphaFunc->getFunction() != GL_ALWAYS)
+    {
+        sg_new = sg->find_or_insert(mAlphaFuncShaders[state.mAlphaFunc->getFunction() - GL_NEVER]);
+        for (RenderLeaf* leaf : sg->_leaves)
+        {
+            leaf->_parent = sg_new;
+            sg_new->_leaves.push_back(leaf);
+        }
+        sg = sg_new;
     }
+
     return sg;
 }
 
+void ShadowsBin::addPrototype(const std::string & name, const std::array<osg::ref_ptr<osg::Program>, GL_ALWAYS - GL_NEVER>& castingPrograms)
+{
+    sCastingPrograms = castingPrograms;
+    osg::ref_ptr<osgUtil::RenderBin> bin(new ShadowsBin);
+    osgUtil::RenderBin::addRenderBinPrototype(name, bin);
+}
+
+inline bool ShadowsBin::State::needTexture() const
+{
+    return mAlphaBlend || (mAlphaFunc && mAlphaFunc->getFunction() != GL_ALWAYS);
+}
+
 bool ShadowsBin::State::needShadows() const
 {
-    if (!mMaterial)
-        return true;
-    return materialNeedShadows(mMaterial);
+    if (mAlphaFunc && mAlphaFunc->getFunction() == GL_NEVER)
+        return false;
+    // other alpha func + material combinations might be skippable
+    if (mAlphaBlend && mMaterial)
+        return materialNeedShadows(mMaterial);
+    return true;
 }
 
 void ShadowsBin::sortImplementation()
diff --git a/components/sceneutil/shadowsbin.hpp b/components/sceneutil/shadowsbin.hpp
index cc6fd3525c..7247a9af4e 100644
--- a/components/sceneutil/shadowsbin.hpp
+++ b/components/sceneutil/shadowsbin.hpp
@@ -1,11 +1,13 @@
 #ifndef OPENMW_COMPONENTS_SCENEUTIL_SHADOWBIN_H
 #define OPENMW_COMPONENTS_SCENEUTIL_SHADOWBIN_H
+#include <array>
 #include <unordered_set>
 #include <osgUtil/RenderBin>
 
 namespace osg
 {
     class Material;
+    class AlphaFunc;
 }
 
 namespace SceneUtil
@@ -15,8 +17,12 @@ namespace SceneUtil
     class ShadowsBin : public osgUtil::RenderBin
     {
     private:
+        static std::array<osg::ref_ptr<osg::Program>, GL_ALWAYS - GL_NEVER> sCastingPrograms;
+
         osg::ref_ptr<osg::StateSet> mNoTestStateSet;
         osg::ref_ptr<osg::StateSet> mShaderAlphaTestStateSet;
+
+        std::array<osg::ref_ptr<osg::StateSet>, GL_ALWAYS - GL_NEVER> mAlphaFuncShaders;
     public:
         META_Object(SceneUtil, ShadowsBin)
         ShadowsBin();
@@ -24,6 +30,7 @@ namespace SceneUtil
             : osgUtil::RenderBin(rhs, copyop)
             , mNoTestStateSet(rhs.mNoTestStateSet)
             , mShaderAlphaTestStateSet(rhs.mShaderAlphaTestStateSet)
+            , mAlphaFuncShaders(rhs.mAlphaFuncShaders)
             {}
 
         void sortImplementation() override;
@@ -33,8 +40,8 @@ namespace SceneUtil
             State()
                 : mAlphaBlend(false)
                 , mAlphaBlendOverride(false)
-                , mAlphaTest(false)
-                , mAlphaTestOverride(false)
+                , mAlphaFunc(nullptr)
+                , mAlphaFuncOverride(false)
                 , mMaterial(nullptr)
                 , mMaterialOverride(false)
                 , mImportantState(false)
@@ -42,33 +49,29 @@ namespace SceneUtil
 
             bool mAlphaBlend;
             bool mAlphaBlendOverride;
-            bool mAlphaTest;
-            bool mAlphaTestOverride;
+            osg::AlphaFunc* mAlphaFunc;
+            bool mAlphaFuncOverride;
             osg::Material* mMaterial;
             bool mMaterialOverride;
             bool mImportantState;
-            bool needTexture() const { return mAlphaBlend || mAlphaTest; }
+            bool needTexture() const;
             bool needShadows() const;
             // A state is interesting if there's anything about it that might affect whether we can optimise child state
             bool interesting() const
             {
-                return !needShadows() || needTexture() || mAlphaBlendOverride || mAlphaTestOverride || mMaterialOverride || mImportantState;
+                return !needShadows() || needTexture() || mAlphaBlendOverride || mAlphaFuncOverride || mMaterialOverride || mImportantState;
             }
         };
 
         osgUtil::StateGraph* cullStateGraph(osgUtil::StateGraph* sg, osgUtil::StateGraph* root, std::unordered_set<osgUtil::StateGraph*>& uninteresting);
 
-        static void addPrototype(const std::string& name)
-        {
-            osg::ref_ptr<osgUtil::RenderBin> bin (new ShadowsBin);
-            osgUtil::RenderBin::addRenderBinPrototype(name, bin);
-        }
+        static void addPrototype(const std::string& name, const std::array<osg::ref_ptr<osg::Program>, GL_ALWAYS - GL_NEVER>& castingPrograms);
     };
 
     class ShadowsBinAdder
     {
         public:
-        ShadowsBinAdder(const std::string& name){ ShadowsBin::addPrototype(name); }
+        ShadowsBinAdder(const std::string& name, const std::array<osg::ref_ptr<osg::Program>, GL_ALWAYS - GL_NEVER>& castingPrograms){ ShadowsBin::addPrototype(name, castingPrograms); }
     };
 
 }
diff --git a/components/shader/removedalphafunc.cpp b/components/shader/removedalphafunc.cpp
new file mode 100644
index 0000000000..15d0fb0f19
--- /dev/null
+++ b/components/shader/removedalphafunc.cpp
@@ -0,0 +1,27 @@
+#include "removedalphafunc.hpp"
+
+#include <cassert>
+
+#include <osg/State>
+
+namespace Shader
+{
+    std::array<osg::ref_ptr<RemovedAlphaFunc>, GL_ALWAYS - GL_NEVER> RemovedAlphaFunc::sInstances{
+        nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr
+    };
+
+    osg::ref_ptr<RemovedAlphaFunc> RemovedAlphaFunc::getInstance(GLenum func)
+    {
+        assert(func >= GL_NEVER && func <= GL_ALWAYS);
+        if (!sInstances[func - GL_NEVER])
+            sInstances[func - GL_NEVER] = new RemovedAlphaFunc(static_cast<osg::AlphaFunc::ComparisonFunction>(func), 1.0);
+        return sInstances[func - GL_NEVER];
+    }
+
+    void RemovedAlphaFunc::apply(osg::State & state) const
+    {
+        // Hopefully, anything genuinely requiring the default alpha func of GL_ALWAYS explicitly sets it
+        if (!state.getGlobalDefaultAttribute(ALPHAFUNC)->getType() != getType())
+            state.setGlobalDefaultAttribute(static_cast<const osg::StateAttribute*>(cloneType()));
+    }
+}
diff --git a/components/shader/removedalphafunc.hpp b/components/shader/removedalphafunc.hpp
new file mode 100644
index 0000000000..a8165b0dc7
--- /dev/null
+++ b/components/shader/removedalphafunc.hpp
@@ -0,0 +1,40 @@
+#ifndef OPENMW_COMPONENTS_REMOVEDALPHAFUNC_H
+#define OPENMW_COMPONENTS_REMOVEDALPHAFUNC_H
+
+#include <array>
+
+#include <osg/AlphaFunc>
+
+namespace Shader
+{
+    // State attribute used when shader visitor replaces the deprecated alpha function with a shader
+    // Prevents redundant glAlphaFunc calls and lets the shadowsbin know the stateset had alpha testing
+    class RemovedAlphaFunc : public osg::AlphaFunc
+    {
+    public:
+        // Get a singleton-like instance with the right func (but a default threshold)
+        static osg::ref_ptr<RemovedAlphaFunc> getInstance(GLenum func);
+
+        RemovedAlphaFunc()
+            : osg::AlphaFunc()
+        {}
+
+        RemovedAlphaFunc(ComparisonFunction func, float ref)
+            : osg::AlphaFunc(func, ref)
+        {}
+
+        RemovedAlphaFunc(const RemovedAlphaFunc& raf, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY)
+            : osg::AlphaFunc(raf, copyop)
+        {}
+
+        META_StateAttribute(Shader, RemovedAlphaFunc, ALPHAFUNC);
+
+        void apply(osg::State& state) const override;
+
+    protected:
+        virtual ~RemovedAlphaFunc() = default;
+
+        static std::array<osg::ref_ptr<RemovedAlphaFunc>, GL_ALWAYS - GL_NEVER> sInstances;
+    };
+}
+#endif //OPENMW_COMPONENTS_REMOVEDALPHAFUNC_H
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index e908b6aaa8..aeec391c67 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -1,5 +1,6 @@
 #include "shadervisitor.hpp"
 
+#include <osg/AlphaFunc>
 #include <osg/Geometry>
 #include <osg/Material>
 #include <osg/Texture>
@@ -13,6 +14,7 @@
 #include <components/sceneutil/riggeometry.hpp>
 #include <components/sceneutil/morphgeometry.hpp>
 
+#include "removedalphafunc.hpp"
 #include "shadermanager.hpp"
 
 namespace Shader
@@ -22,6 +24,9 @@ namespace Shader
         : mShaderRequired(false)
         , mColorMode(0)
         , mMaterialOverridden(false)
+        , mAlphaTestOverridden(false)
+        , mAlphaFunc(GL_ALWAYS)
+        , mAlphaRef(1.0)
         , mNormalHeight(false)
         , mTexStageRequiringTangents(-1)
         , mNode(nullptr)
@@ -76,6 +81,34 @@ namespace Shader
         return newStateSet.get();
     }
 
+    osg::UserDataContainer* getWritableUserDataContainer(osg::Object& object)
+    {
+        if (!object.getUserDataContainer())
+            return object.getOrCreateUserDataContainer();
+
+        osg::ref_ptr<osg::UserDataContainer> newUserData = static_cast<osg::UserDataContainer *>(object.getUserDataContainer()->clone(osg::CopyOp::SHALLOW_COPY));
+        object.setUserDataContainer(newUserData);
+        return newUserData.get();
+    }
+
+    osg::StateSet* getRemovedState(osg::StateSet& stateSet)
+    {
+        if (!stateSet.getUserDataContainer())
+            return nullptr;
+
+        return static_cast<osg::StateSet *>(stateSet.getUserDataContainer()->getUserObject("removedState"));
+    }
+
+    void updateRemovedState(osg::UserDataContainer& userData, osg::StateSet* stateSet)
+    {
+        unsigned int index = userData.getUserObjectIndex("removedState");
+        if (index < userData.getNumUserObjects())
+            userData.setUserObject(index, stateSet);
+        else
+            userData.addUserObject(stateSet);
+        stateSet->setName("removedState");
+    }
+
     const char* defaultTextures[] = { "diffuseMap", "normalMap", "emissiveMap", "darkMap", "detailMap", "envMap", "specularMap", "decalMap", "bumpMap" };
     bool isTextureNameRecognized(const std::string& name)
     {
@@ -234,49 +267,67 @@ namespace Shader
         }
 
         const osg::StateSet::AttributeList& attributes = stateset->getAttributeList();
-        for (osg::StateSet::AttributeList::const_iterator it = attributes.begin(); it != attributes.end(); ++it)
+        osg::StateSet::AttributeList removedAttributes;
+        osg::ref_ptr<osg::StateSet> removedState;
+        if (removedState = getRemovedState(*stateset))
+            removedAttributes = removedState->getAttributeList();
+        for (const auto& attributeMap : { attributes, removedAttributes })
         {
-            if (it->first.first == osg::StateAttribute::MATERIAL)
+            for (osg::StateSet::AttributeList::const_iterator it = attributeMap.begin(); it != attributeMap.end(); ++it)
             {
-                // This should probably be moved out of ShaderRequirements and be applied directly now it's a uniform instead of a define
-                if (!mRequirements.back().mMaterialOverridden || it->second.second & osg::StateAttribute::PROTECTED)
+                if (it->first.first == osg::StateAttribute::MATERIAL)
                 {
-                    if (it->second.second & osg::StateAttribute::OVERRIDE)
-                        mRequirements.back().mMaterialOverridden = true;
+                    // This should probably be moved out of ShaderRequirements and be applied directly now it's a uniform instead of a define
+                    if (!mRequirements.back().mMaterialOverridden || it->second.second & osg::StateAttribute::PROTECTED)
+                    {
+                        if (it->second.second & osg::StateAttribute::OVERRIDE)
+                            mRequirements.back().mMaterialOverridden = true;
 
-                    const osg::Material* mat = static_cast<const osg::Material*>(it->second.first.get());
+                        const osg::Material* mat = static_cast<const osg::Material*>(it->second.first.get());
 
-                    if (!writableStateSet)
-                        writableStateSet = getWritableStateSet(node);
+                        if (!writableStateSet)
+                            writableStateSet = getWritableStateSet(node);
 
-                    int colorMode;
-                    switch (mat->getColorMode())
-                    {
-                    case osg::Material::OFF:
-                        colorMode = 0;
-                        break;
-                    case osg::Material::EMISSION:
-                        colorMode = 1;
-                        break;
-                    default:
-                    case osg::Material::AMBIENT_AND_DIFFUSE:
-                        colorMode = 2;
-                        break;
-                    case osg::Material::AMBIENT:
-                        colorMode = 3;
-                        break;
-                    case osg::Material::DIFFUSE:
-                        colorMode = 4;
-                        break;
-                    case osg::Material::SPECULAR:
-                        colorMode = 5;
-                        break;
+                        int colorMode;
+                        switch (mat->getColorMode())
+                        {
+                        case osg::Material::OFF:
+                            colorMode = 0;
+                            break;
+                        case osg::Material::EMISSION:
+                            colorMode = 1;
+                            break;
+                        default:
+                        case osg::Material::AMBIENT_AND_DIFFUSE:
+                            colorMode = 2;
+                            break;
+                        case osg::Material::AMBIENT:
+                            colorMode = 3;
+                            break;
+                        case osg::Material::DIFFUSE:
+                            colorMode = 4;
+                            break;
+                        case osg::Material::SPECULAR:
+                            colorMode = 5;
+                            break;
+                        }
+
+                        mRequirements.back().mColorMode = colorMode;
                     }
+                }
+                else if (it->first.first == osg::StateAttribute::ALPHAFUNC)
+                {
+                    if (!mRequirements.back().mAlphaTestOverridden || it->second.second & osg::StateAttribute::PROTECTED)
+                    {
+                        if (it->second.second & osg::StateAttribute::OVERRIDE)
+                            mRequirements.back().mAlphaTestOverridden = true;
 
-                    mRequirements.back().mColorMode = colorMode;
+                        const osg::AlphaFunc* alpha = static_cast<const osg::AlphaFunc*>(it->second.first.get());
+                        mRequirements.back().mAlphaFunc = alpha->getFunction();
+                        mRequirements.back().mAlphaRef = alpha->getReferenceValue();
+                    }
                 }
             }
-            // Eventually, move alpha testing to discard in shader adn remove deprecated state here
         }
     }
 
@@ -322,6 +373,42 @@ namespace Shader
 
         writableStateSet->addUniform(new osg::Uniform("colorMode", reqs.mColorMode));
 
+        defineMap["alphaFunc"] = std::to_string(reqs.mAlphaFunc);
+        if (reqs.mAlphaFunc != osg::AlphaFunc::ALWAYS)
+        {
+            writableStateSet->addUniform(new osg::Uniform("alphaRef", reqs.mAlphaRef));
+
+            // back up removed state in case recreateShaders gets rid of the shader later
+            osg::ref_ptr<osg::StateSet> removedState;
+            if ((removedState = getRemovedState(*writableStateSet)) && !mAllowedToModifyStateSets)
+                removedState = new osg::StateSet(*removedState, osg::CopyOp::SHALLOW_COPY);
+            if (!removedState)
+                removedState = new osg::StateSet();
+
+            if (writableStateSet->getMode(GL_ALPHA_TEST) != osg::StateAttribute::INHERIT)
+                removedState->setMode(GL_ALPHA_TEST, writableStateSet->getMode(GL_ALPHA_TEST));
+            // This disables the deprecated fixed-function alpha test
+            writableStateSet->setMode(GL_ALPHA_TEST, osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED);
+
+            const auto* alphaFunc = writableStateSet->getAttributePair(osg::StateAttribute::ALPHAFUNC);
+            if (alphaFunc)
+                removedState->setAttribute(alphaFunc->first, alphaFunc->second);
+            // This prevents redundant glAlphaFunc calls while letting the shadows bin still see the test
+            writableStateSet->setAttribute(RemovedAlphaFunc::getInstance(reqs.mAlphaFunc), osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+
+            if (!removedState->getModeList().empty() || !removedState->getAttributeList().empty())
+            {
+                // user data is normally shallow copied so shared with the original stateset
+                osg::ref_ptr<osg::UserDataContainer> writableUserData;
+                if (mAllowedToModifyStateSets)
+                    writableUserData = writableStateSet->getOrCreateUserDataContainer();
+                else
+                    writableUserData = getWritableUserDataContainer(*writableStateSet);
+
+                updateRemovedState(*writableUserData, removedState);
+            }
+        }
+
         osg::ref_ptr<osg::Shader> vertexShader (mShaderManager.getShader(mDefaultVsTemplate, defineMap, osg::Shader::VERTEX));
         osg::ref_ptr<osg::Shader> fragmentShader (mShaderManager.getShader(mDefaultFsTemplate, defineMap, osg::Shader::FRAGMENT));
 
@@ -347,6 +434,25 @@ namespace Shader
             writableStateSet = getWritableStateSet(node);
 
         writableStateSet->removeAttribute(osg::StateAttribute::PROGRAM);
+
+        osg::ref_ptr<osg::StateSet> removedState;
+        if (removedState = getRemovedState(*writableStateSet))
+        {
+            // user data is normally shallow copied so shared with the original stateset
+            osg::ref_ptr<osg::UserDataContainer> writableUserData;
+            if (mAllowedToModifyStateSets)
+                writableUserData = writableStateSet->getUserDataContainer();
+            else
+                writableUserData = getWritableUserDataContainer(*writableStateSet);
+            unsigned int index = writableUserData->getUserObjectIndex("removedState");
+            writableUserData->removeUserObject(index);
+
+            for (const auto& [mode, value] : removedState->getModeList())
+                writableStateSet->setMode(mode, value);
+
+            for (const auto& attribute : removedState->getAttributeList())
+                writableStateSet->setAttribute(attribute.second.first, attribute.second.second);
+        }
     }
 
     bool ShaderVisitor::adjustGeometry(osg::Geometry& sourceGeometry, const ShaderRequirements& reqs)
diff --git a/components/shader/shadervisitor.hpp b/components/shader/shadervisitor.hpp
index 6031dbfe6c..2ba18107b5 100644
--- a/components/shader/shadervisitor.hpp
+++ b/components/shader/shadervisitor.hpp
@@ -79,6 +79,10 @@ namespace Shader
             int mColorMode;
             
             bool mMaterialOverridden;
+            bool mAlphaTestOverridden;
+
+            GLenum mAlphaFunc;
+            float mAlphaRef;
 
             bool mNormalHeight; // true if normal map has height info in alpha channel
 
diff --git a/files/shaders/CMakeLists.txt b/files/shaders/CMakeLists.txt
index 8012c2bc10..16aedd16db 100644
--- a/files/shaders/CMakeLists.txt
+++ b/files/shaders/CMakeLists.txt
@@ -10,6 +10,7 @@ set(SHADER_FILES
     water_vertex.glsl
     water_fragment.glsl
     water_nm.png
+    alpha.glsl
     objects_vertex.glsl
     objects_fragment.glsl
     terrain_vertex.glsl
diff --git a/files/shaders/alpha.glsl b/files/shaders/alpha.glsl
new file mode 100644
index 0000000000..9dee7bd314
--- /dev/null
+++ b/files/shaders/alpha.glsl
@@ -0,0 +1,38 @@
+
+#define FUNC_NEVER                          0x0200
+#define FUNC_LESS                           0x0201
+#define FUNC_EQUAL                          0x0202
+#define FUNC_LEQUAL                         0x0203
+#define FUNC_GREATER                        0x0204
+#define FUNC_NOTEQUAL                       0x0205
+#define FUNC_GEQUAL                         0x0206
+#define FUNC_ALWAYS                         0x0207
+
+#if @alphaFunc != FUNC_ALWAYS && @alphaFunc != FUNC_NEVER
+uniform float alphaRef;
+#endif
+
+void alphaTest()
+{
+    #if @alphaFunc == FUNC_NEVER
+        discard;
+    #elif @alphaFunc == FUNC_LESS
+        if (gl_FragData[0].a > alphaRef)
+            discard;
+    #elif @alphaFunc == FUNC_EQUAL
+        if (gl_FragData[0].a != alphaRef)
+            discard;
+    #elif @alphaFunc == FUNC_LEQUAL
+        if (gl_FragData[0].a >= alphaRef)
+            discard;
+    #elif @alphaFunc == FUNC_GREATER
+        if (gl_FragData[0].a < alphaRef)
+            discard;
+    #elif @alphaFunc == FUNC_NOTEQUAL
+        if (gl_FragData[0].a == alphaRef)
+            discard;
+    #elif @alphaFunc == FUNC_GEQUAL
+        if (gl_FragData[0].a <= alphaRef)
+            discard;
+    #endif
+}
\ No newline at end of file
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index d5716c378b..ac631308cb 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -67,6 +67,7 @@ varying vec3 passNormal;
 #include "shadows_fragment.glsl"
 #include "lighting.glsl"
 #include "parallax.glsl"
+#include "alpha.glsl"
 
 void main()
 {
@@ -108,6 +109,7 @@ void main()
 
 #if @diffuseMap
     gl_FragData[0] = texture2D(diffuseMap, adjustedDiffuseUV);
+    alphaTest();
 #else
     gl_FragData[0] = vec4(1.0);
 #endif
@@ -164,6 +166,8 @@ void main()
     gl_FragData[0] *= doLighting(passViewPos, normalize(viewNormal), passColor, shadowing);
 #endif
 
+    alphaTest();
+
 #if @envMap && !@preLightEnv
     gl_FragData[0].xyz += texture2D(envMap, envTexCoordGen).xyz * envMapColor.xyz * envLuma;
 #endif
diff --git a/files/shaders/shadowcasting_fragment.glsl b/files/shaders/shadowcasting_fragment.glsl
index a5410d0089..8c53c542bd 100644
--- a/files/shaders/shadowcasting_fragment.glsl
+++ b/files/shaders/shadowcasting_fragment.glsl
@@ -8,6 +8,8 @@ varying float alphaPassthrough;
 uniform bool useDiffuseMapForShadowAlpha;
 uniform bool alphaTestShadows;
 
+#include "alpha.glsl"
+
 void main()
 {
     gl_FragData[0].rgb = vec3(1.0);
@@ -16,7 +18,10 @@ void main()
     else
         gl_FragData[0].a = alphaPassthrough;
 
-    // Prevent translucent things casting shadow (including the player using an invisibility effect). For now, rely on the deprecated FF test for non-blended stuff.
+    alphaTest();
+
+    // Prevent translucent things casting shadow (including the player using an invisibility effect).
+    // This replaces alpha blending, which obviously doesn't work with depth buffers
     if (alphaTestShadows && gl_FragData[0].a <= 0.5)
         discard;
 }

From 46ec40fa9291c8cf763f21906c6197cd2cf11a69 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Fri, 18 Dec 2020 00:20:40 +0300
Subject: [PATCH 0105/2859] Make sure NIFLoader avoids working further with
 empty geometry

---
 components/nifosg/nifloader.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 5f68b12291..902f15fb35 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -1245,9 +1245,12 @@ namespace NifOsg
         void handleGeometry(const Nif::Node* nifNode, osg::Group* parentNode, SceneUtil::CompositeStateSetUpdater* composite, const std::vector<unsigned int>& boundTextures, int animflags)
         {
             assert(isTypeGeometry(nifNode->recType));
-            osg::ref_ptr<osg::Drawable> drawable;
             osg::ref_ptr<osg::Geometry> geom (new osg::Geometry);
             handleNiGeometry(nifNode, geom, parentNode, composite, boundTextures, animflags);
+            // If the record had no valid geometry data in it, early-out
+            if (geom->empty())
+                return;
+            osg::ref_ptr<osg::Drawable> drawable;
             for (Nif::ControllerPtr ctrl = nifNode->controller; !ctrl.empty(); ctrl = ctrl->next)
             {
                 if (!(ctrl->flags & Nif::NiNode::ControllerFlag_Active))
@@ -1292,6 +1295,8 @@ namespace NifOsg
             assert(isTypeGeometry(nifNode->recType));
             osg::ref_ptr<osg::Geometry> geometry (new osg::Geometry);
             handleNiGeometry(nifNode, geometry, parentNode, composite, boundTextures, animflags);
+            if (geometry->empty())
+                return;
             osg::ref_ptr<SceneUtil::RigGeometry> rig(new SceneUtil::RigGeometry);
             rig->setSourceGeometry(geometry);
             rig->setName(nifNode->name);

From 96a87b582c41f2c83a373a019a776a5ec16f1b6e Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Thu, 17 Dec 2020 22:51:04 +0000
Subject: [PATCH 0106/2859] Merge branch 'loadingScreen_initialdrawcallback'
 into 'master'

Fix for !472 for older versions of OSG

See merge request OpenMW/openmw!474

(cherry picked from commit 35e25d79b9a6c76807084be5ca2584c4fd9b9c35)

4447dd41 osg versions
06f4d63b Preserve callback in older osg version
---
 apps/openmw/mwgui/loadingscreen.cpp | 14 ++++++++++++++
 apps/openmw/mwgui/loadingscreen.hpp |  2 ++
 2 files changed, 16 insertions(+)

diff --git a/apps/openmw/mwgui/loadingscreen.cpp b/apps/openmw/mwgui/loadingscreen.cpp
index 20586ef4af..9ab5e32a3f 100644
--- a/apps/openmw/mwgui/loadingscreen.cpp
+++ b/apps/openmw/mwgui/loadingscreen.cpp
@@ -5,6 +5,7 @@
 #include <osgViewer/Viewer>
 
 #include <osg/Texture2D>
+#include <osg/Version>
 
 #include <MyGUI_RenderManager.h>
 #include <MyGUI_ScrollBar.h>
@@ -43,6 +44,7 @@ namespace MWGui
         , mNestedLoadingCount(0)
         , mProgress(0)
         , mShowWallpaper(true)
+        , mOldCallback(nullptr)
     {
         mMainWidget->setSize(MyGUI::RenderManager::getInstance().getViewSize());
 
@@ -322,7 +324,13 @@ namespace MWGui
             mCopyFramebufferToTextureCallback = new CopyFramebufferToTextureCallback(mTexture);
         }
 
+#if OSG_VERSION_GREATER_OR_EQUAL(3, 5, 10)
         mViewer->getCamera()->addInitialDrawCallback(mCopyFramebufferToTextureCallback);
+#else
+        // TODO: Remove once we officially end support for OSG versions pre 3.5.10
+        mOldCallback = mViewer->getCamera()->getInitialDrawCallback();
+        mViewer->getCamera()->setInitialDrawCallback(mCopyFramebufferToTextureCallback);
+#endif
 
         mBackgroundImage->setBackgroundImage("");
         mBackgroundImage->setVisible(false);
@@ -367,7 +375,13 @@ namespace MWGui
 
         if (mCopyFramebufferToTextureCallback)
         {
+            
+#if OSG_VERSION_GREATER_OR_EQUAL(3, 5, 10)
             mViewer->getCamera()->removeInitialDrawCallback(mCopyFramebufferToTextureCallback);
+#else
+            // TODO: Remove once we officially end support for OSG versions pre 3.5.10
+            mViewer->getCamera()->setInitialDrawCallback(mOldCallback);
+#endif
             mCopyFramebufferToTextureCallback = nullptr;
         }
 
diff --git a/apps/openmw/mwgui/loadingscreen.hpp b/apps/openmw/mwgui/loadingscreen.hpp
index ac911ab60b..d58899eae4 100644
--- a/apps/openmw/mwgui/loadingscreen.hpp
+++ b/apps/openmw/mwgui/loadingscreen.hpp
@@ -3,6 +3,7 @@
 
 #include <memory>
 
+#include <osg/Camera>
 #include <osg/Timer>
 #include <osg/ref_ptr>
 
@@ -86,6 +87,7 @@ namespace MWGui
 
         osg::ref_ptr<osg::Texture2D> mTexture;
         osg::ref_ptr<CopyFramebufferToTextureCallback> mCopyFramebufferToTextureCallback;
+        osg::ref_ptr<osg::Camera::DrawCallback> mOldCallback;
         std::unique_ptr<MyGUI::ITexture> mGuiTexture;
 
         void changeWallpaper();

From a0800715887135576ff0f863df00c897481b28b8 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Fri, 18 Dec 2020 00:02:51 +0000
Subject: [PATCH 0107/2859] Set default state sensibly

---
 apps/openmw/mwrender/renderingmanager.cpp | 5 +++++
 components/shader/removedalphafunc.cpp    | 7 -------
 components/shader/removedalphafunc.hpp    | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 217f0b73ca..9cb5146dc3 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -32,6 +32,8 @@
 #include <components/resource/imagemanager.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/resource/keyframemanager.hpp>
+
+#include <components/shader/removedalphafunc.hpp>
 #include <components/shader/shadermanager.hpp>
 
 #include <components/settings/settings.hpp>
@@ -376,6 +378,9 @@ namespace MWRender
         mRootNode->getOrCreateStateSet()->addUniform(new osg::Uniform("far", mViewDistance));
         mRootNode->getOrCreateStateSet()->addUniform(new osg::Uniform("simpleWater", false));
 
+        // Hopefully, anything genuinely requiring the default alpha func of GL_ALWAYS explicitly sets it
+        mRootNode->getOrCreateStateSet()->setAttribute(Shader::RemovedAlphaFunc::getInstance(GL_GREATER));
+
         mUniformNear = mRootNode->getOrCreateStateSet()->getUniform("near");
         mUniformFar = mRootNode->getOrCreateStateSet()->getUniform("far");
         updateProjectionMatrix();
diff --git a/components/shader/removedalphafunc.cpp b/components/shader/removedalphafunc.cpp
index 15d0fb0f19..0da36ab48f 100644
--- a/components/shader/removedalphafunc.cpp
+++ b/components/shader/removedalphafunc.cpp
@@ -17,11 +17,4 @@ namespace Shader
             sInstances[func - GL_NEVER] = new RemovedAlphaFunc(static_cast<osg::AlphaFunc::ComparisonFunction>(func), 1.0);
         return sInstances[func - GL_NEVER];
     }
-
-    void RemovedAlphaFunc::apply(osg::State & state) const
-    {
-        // Hopefully, anything genuinely requiring the default alpha func of GL_ALWAYS explicitly sets it
-        if (!state.getGlobalDefaultAttribute(ALPHAFUNC)->getType() != getType())
-            state.setGlobalDefaultAttribute(static_cast<const osg::StateAttribute*>(cloneType()));
-    }
 }
diff --git a/components/shader/removedalphafunc.hpp b/components/shader/removedalphafunc.hpp
index a8165b0dc7..1aa9978cfe 100644
--- a/components/shader/removedalphafunc.hpp
+++ b/components/shader/removedalphafunc.hpp
@@ -29,7 +29,7 @@ namespace Shader
 
         META_StateAttribute(Shader, RemovedAlphaFunc, ALPHAFUNC);
 
-        void apply(osg::State& state) const override;
+        void apply(osg::State& state) const override {}
 
     protected:
         virtual ~RemovedAlphaFunc() = default;

From a4f32a469efbc7744146b3ab7d2c75d6e2fa91e9 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Fri, 18 Dec 2020 01:36:20 +0000
Subject: [PATCH 0108/2859] Work around Nvidia driver bug

https://www.khronos.org/registry/OpenGL/specs/gl/GLSLangSpec.1.20.pdf
Section 4.1.3 says that hexadecimal integer literals are supported, but
Nvidia have never read a specification since their founding, so their
engineers didn't know that hexadecimal integer literals are requires to
be supported to advertise support OpenGL versions with GLSL support.
---
 files/shaders/alpha.glsl | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/files/shaders/alpha.glsl b/files/shaders/alpha.glsl
index 9dee7bd314..0c69df0ab2 100644
--- a/files/shaders/alpha.glsl
+++ b/files/shaders/alpha.glsl
@@ -1,12 +1,12 @@
 
-#define FUNC_NEVER                          0x0200
-#define FUNC_LESS                           0x0201
-#define FUNC_EQUAL                          0x0202
-#define FUNC_LEQUAL                         0x0203
-#define FUNC_GREATER                        0x0204
-#define FUNC_NOTEQUAL                       0x0205
-#define FUNC_GEQUAL                         0x0206
-#define FUNC_ALWAYS                         0x0207
+#define FUNC_NEVER                          512 // 0x0200
+#define FUNC_LESS                           513 // 0x0201
+#define FUNC_EQUAL                          514 // 0x0202
+#define FUNC_LEQUAL                         515 // 0x0203
+#define FUNC_GREATER                        516 // 0x0204
+#define FUNC_NOTEQUAL                       517 // 0x0205
+#define FUNC_GEQUAL                         518 // 0x0206
+#define FUNC_ALWAYS                         519 // 0x0207
 
 #if @alphaFunc != FUNC_ALWAYS && @alphaFunc != FUNC_NEVER
 uniform float alphaRef;

From 05ad44d0b1527339f8da788898cf9fa1ab92ba84 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Fri, 18 Dec 2020 01:44:46 +0000
Subject: [PATCH 0109/2859] Set correct array size

---
 components/sceneutil/mwshadowtechnique.hpp | 4 ++--
 components/sceneutil/shadowsbin.cpp        | 6 +++---
 components/sceneutil/shadowsbin.hpp        | 8 ++++----
 components/shader/removedalphafunc.cpp     | 4 ++--
 components/shader/removedalphafunc.hpp     | 2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/components/sceneutil/mwshadowtechnique.hpp b/components/sceneutil/mwshadowtechnique.hpp
index 96b1c7d0ed..7ffe687b47 100644
--- a/components/sceneutil/mwshadowtechnique.hpp
+++ b/components/sceneutil/mwshadowtechnique.hpp
@@ -215,7 +215,7 @@ namespace SceneUtil {
 
         virtual void createShaders();
 
-        virtual std::array<osg::ref_ptr<osg::Program>, GL_ALWAYS - GL_NEVER> getCastingPrograms() const { return _castingPrograms; }
+        virtual std::array<osg::ref_ptr<osg::Program>, GL_ALWAYS - GL_NEVER + 1> getCastingPrograms() const { return _castingPrograms; }
 
         virtual bool selectActiveLights(osgUtil::CullVisitor* cv, ViewDependentData* vdd) const;
 
@@ -290,7 +290,7 @@ namespace SceneUtil {
         };
 
         osg::ref_ptr<DebugHUD>                  _debugHud;
-        std::array<osg::ref_ptr<osg::Program>, GL_ALWAYS - GL_NEVER> _castingPrograms;
+        std::array<osg::ref_ptr<osg::Program>, GL_ALWAYS - GL_NEVER + 1> _castingPrograms;
     };
 
 }
diff --git a/components/sceneutil/shadowsbin.cpp b/components/sceneutil/shadowsbin.cpp
index 9e6d461ae7..de778f14b5 100644
--- a/components/sceneutil/shadowsbin.cpp
+++ b/components/sceneutil/shadowsbin.cpp
@@ -42,8 +42,8 @@ namespace
 namespace SceneUtil
 {
 
-std::array<osg::ref_ptr<osg::Program>, GL_ALWAYS - GL_NEVER> ShadowsBin::sCastingPrograms = {
-    nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr
+std::array<osg::ref_ptr<osg::Program>, GL_ALWAYS - GL_NEVER + 1> ShadowsBin::sCastingPrograms = {
+    nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr
 };
 
 ShadowsBin::ShadowsBin()
@@ -150,7 +150,7 @@ StateGraph* ShadowsBin::cullStateGraph(StateGraph* sg, StateGraph* root, std::un
     return sg;
 }
 
-void ShadowsBin::addPrototype(const std::string & name, const std::array<osg::ref_ptr<osg::Program>, GL_ALWAYS - GL_NEVER>& castingPrograms)
+void ShadowsBin::addPrototype(const std::string & name, const std::array<osg::ref_ptr<osg::Program>, GL_ALWAYS - GL_NEVER + 1>& castingPrograms)
 {
     sCastingPrograms = castingPrograms;
     osg::ref_ptr<osgUtil::RenderBin> bin(new ShadowsBin);
diff --git a/components/sceneutil/shadowsbin.hpp b/components/sceneutil/shadowsbin.hpp
index 7247a9af4e..d8bdd86071 100644
--- a/components/sceneutil/shadowsbin.hpp
+++ b/components/sceneutil/shadowsbin.hpp
@@ -17,12 +17,12 @@ namespace SceneUtil
     class ShadowsBin : public osgUtil::RenderBin
     {
     private:
-        static std::array<osg::ref_ptr<osg::Program>, GL_ALWAYS - GL_NEVER> sCastingPrograms;
+        static std::array<osg::ref_ptr<osg::Program>, GL_ALWAYS - GL_NEVER + 1> sCastingPrograms;
 
         osg::ref_ptr<osg::StateSet> mNoTestStateSet;
         osg::ref_ptr<osg::StateSet> mShaderAlphaTestStateSet;
 
-        std::array<osg::ref_ptr<osg::StateSet>, GL_ALWAYS - GL_NEVER> mAlphaFuncShaders;
+        std::array<osg::ref_ptr<osg::StateSet>, GL_ALWAYS - GL_NEVER + 1> mAlphaFuncShaders;
     public:
         META_Object(SceneUtil, ShadowsBin)
         ShadowsBin();
@@ -65,13 +65,13 @@ namespace SceneUtil
 
         osgUtil::StateGraph* cullStateGraph(osgUtil::StateGraph* sg, osgUtil::StateGraph* root, std::unordered_set<osgUtil::StateGraph*>& uninteresting);
 
-        static void addPrototype(const std::string& name, const std::array<osg::ref_ptr<osg::Program>, GL_ALWAYS - GL_NEVER>& castingPrograms);
+        static void addPrototype(const std::string& name, const std::array<osg::ref_ptr<osg::Program>, GL_ALWAYS - GL_NEVER + 1>& castingPrograms);
     };
 
     class ShadowsBinAdder
     {
         public:
-        ShadowsBinAdder(const std::string& name, const std::array<osg::ref_ptr<osg::Program>, GL_ALWAYS - GL_NEVER>& castingPrograms){ ShadowsBin::addPrototype(name, castingPrograms); }
+        ShadowsBinAdder(const std::string& name, const std::array<osg::ref_ptr<osg::Program>, GL_ALWAYS - GL_NEVER + 1>& castingPrograms){ ShadowsBin::addPrototype(name, castingPrograms); }
     };
 
 }
diff --git a/components/shader/removedalphafunc.cpp b/components/shader/removedalphafunc.cpp
index 0da36ab48f..6b701b8900 100644
--- a/components/shader/removedalphafunc.cpp
+++ b/components/shader/removedalphafunc.cpp
@@ -6,8 +6,8 @@
 
 namespace Shader
 {
-    std::array<osg::ref_ptr<RemovedAlphaFunc>, GL_ALWAYS - GL_NEVER> RemovedAlphaFunc::sInstances{
-        nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr
+    std::array<osg::ref_ptr<RemovedAlphaFunc>, GL_ALWAYS - GL_NEVER + 1> RemovedAlphaFunc::sInstances{
+        nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr
     };
 
     osg::ref_ptr<RemovedAlphaFunc> RemovedAlphaFunc::getInstance(GLenum func)
diff --git a/components/shader/removedalphafunc.hpp b/components/shader/removedalphafunc.hpp
index 1aa9978cfe..c744391e56 100644
--- a/components/shader/removedalphafunc.hpp
+++ b/components/shader/removedalphafunc.hpp
@@ -34,7 +34,7 @@ namespace Shader
     protected:
         virtual ~RemovedAlphaFunc() = default;
 
-        static std::array<osg::ref_ptr<RemovedAlphaFunc>, GL_ALWAYS - GL_NEVER> sInstances;
+        static std::array<osg::ref_ptr<RemovedAlphaFunc>, GL_ALWAYS - GL_NEVER + 1> sInstances;
     };
 }
 #endif //OPENMW_COMPONENTS_REMOVEDALPHAFUNC_H

From 0b5d5eab4c997789b1a3eab5b9da8406f6fc1552 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Fri, 18 Dec 2020 02:11:51 +0000
Subject: [PATCH 0110/2859] Move is faster

---
 components/sceneutil/shadowsbin.cpp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/components/sceneutil/shadowsbin.cpp b/components/sceneutil/shadowsbin.cpp
index de778f14b5..312d4226b5 100644
--- a/components/sceneutil/shadowsbin.cpp
+++ b/components/sceneutil/shadowsbin.cpp
@@ -127,11 +127,9 @@ StateGraph* ShadowsBin::cullStateGraph(StateGraph* sg, StateGraph* root, std::un
     if (state.mAlphaBlend)
     {
         sg_new = sg->find_or_insert(mShaderAlphaTestStateSet);
-        for (RenderLeaf* leaf : sg->_leaves)
-        {
+        sg_new->_leaves = std::move(sg->_leaves);
+        for (RenderLeaf* leaf : sg_new->_leaves)
             leaf->_parent = sg_new;
-            sg_new->_leaves.push_back(leaf);
-        }
         sg = sg_new;
     }
 
@@ -139,11 +137,9 @@ StateGraph* ShadowsBin::cullStateGraph(StateGraph* sg, StateGraph* root, std::un
     if (state.mAlphaFunc && state.mAlphaFunc->getFunction() != GL_ALWAYS)
     {
         sg_new = sg->find_or_insert(mAlphaFuncShaders[state.mAlphaFunc->getFunction() - GL_NEVER]);
-        for (RenderLeaf* leaf : sg->_leaves)
-        {
+        sg_new->_leaves = std::move(sg->_leaves);
+        for (RenderLeaf* leaf : sg_new->_leaves)
             leaf->_parent = sg_new;
-            sg_new->_leaves.push_back(leaf);
-        }
         sg = sg_new;
     }
 

From 7bae6691b63878e76777ec497a1fe14bb00eb48c Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Fri, 18 Dec 2020 08:18:07 +0100
Subject: [PATCH 0111/2859] Introduce World::moveObjectBy() function to
 translate an object relatively to its current position. Use it in relevant
 MWScripts opcode (move and moveworld). Remove the fragile detection of
 scripted translation from PhysicsTaskScheduler.

No user visible change, just a more robust mechanism.
---
 apps/openmw/mwbase/world.hpp                  |  3 +++
 apps/openmw/mwphysics/actor.cpp               | 17 ++++++++++++-----
 apps/openmw/mwphysics/actor.hpp               |  5 ++++-
 apps/openmw/mwphysics/mtphysics.cpp           | 13 +------------
 .../mwscript/transformationextensions.cpp     | 19 ++++++-------------
 apps/openmw/mwworld/worldimp.cpp              | 12 ++++++++++++
 apps/openmw/mwworld/worldimp.hpp              |  3 +++
 7 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index d4f1d2f8ab..619bbbdf5e 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -286,6 +286,9 @@ namespace MWBase
             virtual MWWorld::Ptr moveObject(const MWWorld::Ptr &ptr, MWWorld::CellStore* newCell, float x, float y, float z, bool movePhysics=true) = 0;
             ///< @return an updated Ptr
 
+            virtual MWWorld::Ptr moveObjectBy(const MWWorld::Ptr &ptr, osg::Vec3f vec) = 0;
+            ///< @return an updated Ptr
+
             virtual void scaleObject (const MWWorld::Ptr& ptr, float scale) = 0;
 
             virtual void rotateObject(const MWWorld::Ptr& ptr, float x, float y, float z,
diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index b1f219e338..e7fe93b35d 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -120,6 +120,8 @@ int Actor::getCollisionMask() const
 
 void Actor::updatePositionUnsafe()
 {
+    if (!mWorldPositionChanged && mWorldPosition != mPtr.getRefData().getPosition().asVec3())
+        mWorldPositionChanged = true;
     mWorldPosition = mPtr.getRefData().getPosition().asVec3();
 }
 
@@ -153,6 +155,7 @@ void Actor::updateCollisionObjectPositionUnsafe()
     mLocalTransform.setOrigin(Misc::Convert::toBullet(newPosition));
     mLocalTransform.setRotation(Misc::Convert::toBullet(mRotation));
     mCollisionObject->setWorldTransform(mLocalTransform);
+    mWorldPositionChanged = false;
 }
 
 void Actor::updateCollisionObjectPosition()
@@ -167,18 +170,20 @@ osg::Vec3f Actor::getCollisionObjectPosition() const
     return Misc::Convert::toOsg(mLocalTransform.getOrigin());
 }
 
-void Actor::setPosition(const osg::Vec3f& position)
+bool Actor::setPosition(const osg::Vec3f& position)
 {
     std::scoped_lock lock(mPositionMutex);
-    mPreviousPosition = mPosition;
-    mPosition = position;
+    bool hasChanged = mPosition != position || mPositionOffset.length() != 0 || mWorldPositionChanged;
+    mPreviousPosition = mPosition + mPositionOffset;
+    mPosition = position + mPositionOffset;
+    mPositionOffset = osg::Vec3f();
+    return hasChanged;
 }
 
 void Actor::adjustPosition(const osg::Vec3f& offset)
 {
     std::scoped_lock lock(mPositionMutex);
-    mPosition += offset;
-    mPreviousPosition += offset;
+    mPositionOffset += offset;
 }
 
 void Actor::resetPosition()
@@ -189,6 +194,8 @@ void Actor::resetPosition()
     mPosition = mWorldPosition;
     mSimulationPosition = mWorldPosition;
     updateCollisionObjectPositionUnsafe();
+    mStandingOnPtr = nullptr;
+    mWorldPositionChanged = false;
 }
 
 osg::Vec3f Actor::getPosition() const
diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index 07a9bebd28..7c8ea0b734 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -90,8 +90,9 @@ namespace MWPhysics
 
         /**
           * Store the current position into mPreviousPosition, then move to this position.
+          * Returns true if the new position is different.
           */
-        void setPosition(const osg::Vec3f& position);
+        bool setPosition(const osg::Vec3f& position);
         void resetPosition();
         void adjustPosition(const osg::Vec3f& offset);
 
@@ -177,6 +178,8 @@ namespace MWPhysics
         osg::Vec3f mSimulationPosition;
         osg::Vec3f mPosition;
         osg::Vec3f mPreviousPosition;
+        osg::Vec3f mPositionOffset;
+        bool mWorldPositionChanged;
         btTransform mLocalTransform;
         mutable std::mutex mPositionMutex;
 
diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index a78a307883..95c61edc7f 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -100,15 +100,6 @@ namespace
     osg::Vec3f interpolateMovements(MWPhysics::ActorFrameData& actorData, float timeAccum, float physicsDt)
     {
         const float interpolationFactor = timeAccum / physicsDt;
-
-        // account for force change of actor's position in the main thread
-        const auto correction = actorData.mActorRaw->getWorldPosition() - actorData.mOrigin;
-        if (correction.length() != 0)
-        {
-            actorData.mActorRaw->adjustPosition(correction);
-            actorData.mPosition = actorData.mActorRaw->getPosition();
-        }
-
         return actorData.mPosition * interpolationFactor + actorData.mActorRaw->getPreviousPosition() * (1.f - interpolationFactor);
     }
 
@@ -511,9 +502,7 @@ namespace MWPhysics
         {
             if(const auto actor = actorData.mActor.lock())
             {
-                bool positionChanged = actorData.mPosition != actorData.mActorRaw->getPosition();
-                actorData.mActorRaw->setPosition(actorData.mPosition);
-                if (positionChanged)
+                if (actor->setPosition(actorData.mPosition))
                 {
                     actor->updateCollisionObjectPosition();
                     mCollisionWorld->updateSingleAabb(actor->getCollisionObject());
diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index a908940ed9..103c6629d2 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -32,11 +32,7 @@ namespace MWScript
             std::vector<MWWorld::Ptr> actors;
             MWBase::Environment::get().getWorld()->getActorsStandingOn (ptr, actors);
             for (auto& actor : actors)
-            {
-                osg::Vec3f actorPos(actor.getRefData().getPosition().asVec3());
-                actorPos += diff;
-                MWBase::Environment::get().getWorld()->moveObject(actor, actorPos.x(), actorPos.y(), actorPos.z());
-            }
+                MWBase::Environment::get().getWorld()->moveObjectBy(actor, diff);
         }
 
         template<class R>
@@ -727,14 +723,12 @@ namespace MWScript
                         return;
 
                     osg::Vec3f diff = ptr.getRefData().getBaseNode()->getAttitude() * posChange;
-                    osg::Vec3f worldPos(ptr.getRefData().getPosition().asVec3());
-                    worldPos += diff;
 
                     // We should move actors, standing on moving object, too.
                     // This approach can be used to create elevators.
                     moveStandingActors(ptr, diff);
                     dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(ptr,
-                        MWBase::Environment::get().getWorld()->moveObject(ptr, worldPos.x(), worldPos.y(), worldPos.z()));
+                        MWBase::Environment::get().getWorld()->moveObjectBy(ptr, diff));
                 }
         };
 
@@ -755,15 +749,14 @@ namespace MWScript
                     Interpreter::Type_Float movement = (runtime[0].mFloat*MWBase::Environment::get().getFrameDuration());
                     runtime.pop();
 
-                    const float *objPos = ptr.getRefData().getPosition().pos;
                     osg::Vec3f diff;
 
                     if (axis == "x")
-                        diff.x() += movement;
+                        diff.x() = movement;
                     else if (axis == "y")
-                        diff.y() += movement;
+                        diff.y() = movement;
                     else if (axis == "z")
-                        diff.z() += movement;
+                        diff.z() = movement;
                     else
                         return;
 
@@ -771,7 +764,7 @@ namespace MWScript
                     // This approach can be used to create elevators.
                     moveStandingActors(ptr, diff);
                     dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(ptr,
-                        MWBase::Environment::get().getWorld()->moveObject(ptr, objPos[0]+diff.x(), objPos[1]+diff.y(), objPos[2]+diff.z()));
+                        MWBase::Environment::get().getWorld()->moveObjectBy(ptr, diff));
                 }
         };
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 3756ea04b8..3086fed833 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1251,6 +1251,18 @@ namespace MWWorld
         return moveObjectImp(ptr, x, y, z, true, moveToActive);
     }
 
+    MWWorld::Ptr World::moveObjectBy(const Ptr& ptr, osg::Vec3f vec)
+    {
+        auto* actor = mPhysics->getActor(ptr);
+        if (actor)
+        {
+            actor->adjustPosition(vec);
+            return ptr;
+        }
+        osg::Vec3f newpos = ptr.getRefData().getPosition().asVec3() + vec;
+        return moveObject(ptr, newpos.x(), newpos.y(), newpos.z());
+    }
+
     void World::scaleObject (const Ptr& ptr, float scale)
     {
         if (mPhysics->getActor(ptr))
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 1fc5ebc20d..75717b16b2 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -380,6 +380,9 @@ namespace MWWorld
             MWWorld::Ptr moveObject (const Ptr& ptr, CellStore* newCell, float x, float y, float z, bool movePhysics=true) override;
             ///< @return an updated Ptr
 
+            MWWorld::Ptr moveObjectBy(const Ptr& ptr, osg::Vec3f vec) override;
+            ///< @return an updated Ptr
+
             void scaleObject (const Ptr& ptr, float scale) override;
 
             /// World rotates object, uses radians

From ea8f98b33960f1d8b3e05900362f9294b93b1686 Mon Sep 17 00:00:00 2001
From: Mads Buvik Sandvei <madssandvei@protonmail.com>
Date: Fri, 18 Dec 2020 08:48:39 +0000
Subject: [PATCH 0112/2859] Wait for initialDrawCallback to finish before
 removing it

---
 apps/openmw/mwgui/loadingscreen.cpp | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/loadingscreen.cpp b/apps/openmw/mwgui/loadingscreen.cpp
index 9ab5e32a3f..5f0e9f33a3 100644
--- a/apps/openmw/mwgui/loadingscreen.cpp
+++ b/apps/openmw/mwgui/loadingscreen.cpp
@@ -1,6 +1,7 @@
 #include "loadingscreen.hpp"
 
 #include <array>
+#include <condition_variable>
 
 #include <osgViewer/Viewer>
 
@@ -139,6 +140,7 @@ namespace MWGui
     public:
         CopyFramebufferToTextureCallback(osg::Texture2D* texture)
             : mTexture(texture)
+            , mOneshot(true)
         {
         }
 
@@ -147,9 +149,25 @@ namespace MWGui
             int w = renderInfo.getCurrentCamera()->getViewport()->width();
             int h = renderInfo.getCurrentCamera()->getViewport()->height();
             mTexture->copyTexImage2D(*renderInfo.getState(), 0, 0, w, h);
+
+            {
+                std::unique_lock<std::mutex> lock(mMutex);
+                mOneshot = false;
+            }
+            mSignal.notify_all();
+        }
+
+        void wait()
+        {
+            std::unique_lock<std::mutex> lock(mMutex);
+            while (mOneshot)
+                mSignal.wait(lock);
         }
 
     private:
+        mutable bool mOneshot;
+        mutable std::mutex mMutex;
+        mutable std::condition_variable mSignal;
         osg::ref_ptr<osg::Texture2D> mTexture;
     };
 
@@ -375,7 +393,7 @@ namespace MWGui
 
         if (mCopyFramebufferToTextureCallback)
         {
-            
+            mCopyFramebufferToTextureCallback->wait();
 #if OSG_VERSION_GREATER_OR_EQUAL(3, 5, 10)
             mViewer->getCamera()->removeInitialDrawCallback(mCopyFramebufferToTextureCallback);
 #else

From 4e7c9b66960258bfb7e51d71ea79130ca3758581 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Fri, 18 Dec 2020 09:22:02 +0100
Subject: [PATCH 0113/2859] Embed physics simulation results inside of actor
 class.

This gives finer control over reseting positions (switch off tcl is no
longer glitchy) and solve most of the erroneous usage of stale World::Ptr
indicated by:
"Error in frame: moveTo: object is not in this cell"
---
 apps/openmw/mwphysics/actor.cpp         |  7 ++-
 apps/openmw/mwphysics/actor.hpp         |  1 +
 apps/openmw/mwphysics/mtphysics.cpp     | 84 ++++++++++---------------
 apps/openmw/mwphysics/mtphysics.hpp     |  9 ++-
 apps/openmw/mwphysics/physicssystem.cpp | 18 +++++-
 apps/openmw/mwphysics/physicssystem.hpp |  6 +-
 apps/openmw/mwworld/worldimp.cpp        | 23 ++++---
 7 files changed, 73 insertions(+), 75 deletions(-)

diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index e7fe93b35d..10fd463fb0 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -76,6 +76,7 @@ Actor::Actor(const MWWorld::Ptr& ptr, const Resource::BulletShape* shape, Physic
     updateScale();
     resetPosition();
     addCollisionMask(getCollisionMask());
+    updateCollisionObjectPosition();
 }
 
 Actor::~Actor()
@@ -139,7 +140,9 @@ osg::Vec3f Actor::getWorldPosition() const
 
 void Actor::setSimulationPosition(const osg::Vec3f& position)
 {
-    mSimulationPosition = position;
+    if (!mResetSimulation)
+        mSimulationPosition = position;
+    mResetSimulation = false;
 }
 
 osg::Vec3f Actor::getSimulationPosition() const
@@ -193,9 +196,9 @@ void Actor::resetPosition()
     mPreviousPosition = mWorldPosition;
     mPosition = mWorldPosition;
     mSimulationPosition = mWorldPosition;
-    updateCollisionObjectPositionUnsafe();
     mStandingOnPtr = nullptr;
     mWorldPositionChanged = false;
+    mResetSimulation = true;
 }
 
 osg::Vec3f Actor::getPosition() const
diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index 7c8ea0b734..b26b52d144 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -180,6 +180,7 @@ namespace MWPhysics
         osg::Vec3f mPreviousPosition;
         osg::Vec3f mPositionOffset;
         bool mWorldPositionChanged;
+        bool mResetSimulation;
         btTransform mLocalTransform;
         mutable std::mutex mPositionMutex;
 
diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 95c61edc7f..60a7259f80 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -204,31 +204,31 @@ namespace MWPhysics
             thread.join();
     }
 
-    const PtrPositionList& PhysicsTaskScheduler::moveActors(int numSteps, float timeAccum, std::vector<ActorFrameData>&& actorsData, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
+    const std::vector<MWWorld::Ptr>& PhysicsTaskScheduler::moveActors(int numSteps, float timeAccum, std::vector<ActorFrameData>&& actorsData, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
     {
         // This function run in the main thread.
         // While the mSimulationMutex is held, background physics threads can't run.
 
         std::unique_lock lock(mSimulationMutex);
 
-        for (auto& data : actorsData)
-            data.updatePosition();
+        mMovedActors.clear();
 
         // start by finishing previous background computation
         if (mNumThreads != 0)
         {
             for (auto& data : mActorsFrameData)
             {
-                // Ignore actors that were deleted while the background thread was running
-                if (!data.mActor.lock())
-                    continue;
-
-                updateMechanics(data);
-                if (mAdvanceSimulation)
-                    data.mActorRaw->setStandingOnPtr(data.mStandingOn);
+                // Only return actors that are still part of the scene
+                if (std::any_of(actorsData.begin(), actorsData.end(), [&data](const auto& newFrameData) { return data.mActorRaw->getPtr() == newFrameData.mActorRaw->getPtr(); }))
+                {
+                    updateMechanics(data);
 
-                if (mMovementResults.find(data.mPtr) != mMovementResults.end())
-                    data.mActorRaw->setSimulationPosition(mMovementResults[data.mPtr]);
+                    // these variables are accessed directly from the main thread, update them here to prevent accessing "too new" values
+                    if (mAdvanceSimulation)
+                        data.mActorRaw->setStandingOnPtr(data.mStandingOn);
+                    data.mActorRaw->setSimulationPosition(interpolateMovements(data, mTimeAccum, mPhysicsDt));
+                    mMovedActors.emplace_back(data.mActorRaw->getPtr());
+                }
             }
 
             if (mFrameNumber == frameNumber - 1)
@@ -243,6 +243,8 @@ namespace MWPhysics
         }
 
         // init
+        for (auto& data : actorsData)
+            data.updatePosition();
         mRemainingSteps = numSteps;
         mTimeAccum = timeAccum;
         mActorsFrameData = std::move(actorsData);
@@ -257,52 +259,28 @@ namespace MWPhysics
 
         if (mNumThreads == 0)
         {
-            mMovementResults.clear();
             syncComputation();
-
-            for (auto& data : mActorsFrameData)
-            {
-                if (mAdvanceSimulation)
-                    data.mActorRaw->setStandingOnPtr(data.mStandingOn);
-                if (mMovementResults.find(data.mPtr) != mMovementResults.end())
-                    data.mActorRaw->setSimulationPosition(mMovementResults[data.mPtr]);
-            }
-            return mMovementResults;
-        }
-
-        // Remove actors that were deleted while the background thread was running
-        for (auto& data : mActorsFrameData)
-        {
-            if (!data.mActor.lock())
-                mMovementResults.erase(data.mPtr);
+            return mMovedActors;
         }
-        std::swap(mMovementResults, mPreviousMovementResults);
-
-        // mMovementResults is shared between all workers instance
-        // pre-allocate all nodes so that we don't need synchronization
-        mMovementResults.clear();
-        for (const auto& m : mActorsFrameData)
-            mMovementResults[m.mPtr] = m.mPosition;
 
         lock.unlock();
         mHasJob.notify_all();
-        return mPreviousMovementResults;
+        return mMovedActors;
     }
 
-    const PtrPositionList& PhysicsTaskScheduler::resetSimulation(const ActorMap& actors)
+    const std::vector<MWWorld::Ptr>& PhysicsTaskScheduler::resetSimulation(const ActorMap& actors)
     {
         std::unique_lock lock(mSimulationMutex);
-        mMovementResults.clear();
-        mPreviousMovementResults.clear();
+        mMovedActors.clear();
         mActorsFrameData.clear();
-
         for (const auto& [_, actor] : actors)
         {
             actor->resetPosition();
-            actor->setStandingOnPtr(nullptr);
-            mMovementResults[actor->getPtr()] = actor->getWorldPosition();
+            actor->setSimulationPosition(actor->getWorldPosition()); // resetPosition skip next simulation, now we need to "consume" it
+            actor->updateCollisionObjectPosition();
+            mMovedActors.emplace_back(actor->getPtr());
         }
-        return mMovementResults;
+        return mMovedActors;
     }
 
     void PhysicsTaskScheduler::rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, btCollisionWorld::RayResultCallback& resultCallback) const
@@ -370,17 +348,17 @@ namespace MWPhysics
         mCollisionWorld->removeCollisionObject(collisionObject);
     }
 
-    void PhysicsTaskScheduler::updateSingleAabb(std::weak_ptr<PtrHolder> ptr)
+    void PhysicsTaskScheduler::updateSingleAabb(std::weak_ptr<PtrHolder> ptr, bool immediate)
     {
-        if (mDeferAabbUpdate)
+        if (!mDeferAabbUpdate || immediate)
         {
-            std::unique_lock lock(mUpdateAabbMutex);
-            mUpdateAabb.insert(std::move(ptr));
+            std::unique_lock lock(mCollisionWorldMutex);
+            updatePtrAabb(ptr);
         }
         else
         {
-            std::unique_lock lock(mCollisionWorldMutex);
-            updatePtrAabb(ptr);
+            std::unique_lock lock(mUpdateAabbMutex);
+            mUpdateAabb.insert(std::move(ptr));
         }
     }
 
@@ -484,7 +462,6 @@ namespace MWPhysics
                     {
                         auto& actorData = mActorsFrameData[job];
                         handleFall(actorData, mAdvanceSimulation);
-                        mMovementResults[actorData.mPtr] = interpolateMovements(actorData, mTimeAccum, mPhysicsDt);
                     }
                 }
 
@@ -539,8 +516,11 @@ namespace MWPhysics
         for (auto& actorData : mActorsFrameData)
         {
             handleFall(actorData, mAdvanceSimulation);
-            mMovementResults[actorData.mPtr] = interpolateMovements(actorData, mTimeAccum, mPhysicsDt);
+            actorData.mActorRaw->setSimulationPosition(interpolateMovements(actorData, mTimeAccum, mPhysicsDt));
             updateMechanics(actorData);
+            mMovedActors.emplace_back(actorData.mActorRaw->getPtr());
+            if (mAdvanceSimulation)
+                actorData.mActorRaw->setStandingOnPtr(actorData.mStandingOn);
         }
     }
 }
diff --git a/apps/openmw/mwphysics/mtphysics.hpp b/apps/openmw/mwphysics/mtphysics.hpp
index 3a761829b5..90e1007b87 100644
--- a/apps/openmw/mwphysics/mtphysics.hpp
+++ b/apps/openmw/mwphysics/mtphysics.hpp
@@ -32,9 +32,9 @@ namespace MWPhysics
             /// @param timeAccum accumulated time from previous run to interpolate movements
             /// @param actorsData per actor data needed to compute new positions
             /// @return new position of each actor
-            const PtrPositionList& moveActors(int numSteps, float timeAccum, std::vector<ActorFrameData>&& actorsData, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
+            const std::vector<MWWorld::Ptr>& moveActors(int numSteps, float timeAccum, std::vector<ActorFrameData>&& actorsData, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
 
-            const PtrPositionList& resetSimulation(const ActorMap& actors);
+            const std::vector<MWWorld::Ptr>& resetSimulation(const ActorMap& actors);
 
             // Thread safe wrappers
             void rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, btCollisionWorld::RayResultCallback& resultCallback) const;
@@ -46,7 +46,7 @@ namespace MWPhysics
             void setCollisionFilterMask(btCollisionObject* collisionObject, int collisionFilterMask);
             void addCollisionObject(btCollisionObject* collisionObject, int collisionFilterGroup, int collisionFilterMask);
             void removeCollisionObject(btCollisionObject* collisionObject);
-            void updateSingleAabb(std::weak_ptr<PtrHolder> ptr);
+            void updateSingleAabb(std::weak_ptr<PtrHolder> ptr, bool immediate=false);
             bool getLineOfSight(const std::weak_ptr<Actor>& actor1, const std::weak_ptr<Actor>& actor2);
 
         private:
@@ -60,8 +60,7 @@ namespace MWPhysics
 
             std::unique_ptr<WorldFrameData> mWorldFrameData;
             std::vector<ActorFrameData> mActorsFrameData;
-            PtrPositionList mMovementResults;
-            PtrPositionList mPreviousMovementResults;
+            std::vector<MWWorld::Ptr> mMovedActors;
             const float mPhysicsDt;
             float mTimeAccum;
             std::shared_ptr<btCollisionWorld> mCollisionWorld;
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 151801e67d..8b9cb0a79f 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -437,7 +437,7 @@ namespace MWPhysics
         ActorMap::iterator found = mActors.find(ptr);
         if (found ==  mActors.end())
             return ptr.getRefData().getPosition().asVec3();
-        found->second->resetPosition();
+        resetPosition(ptr);
         return MovementSolver::traceDown(ptr, position, found->second.get(), mCollisionWorld.get(), maxHeight);
     }
 
@@ -647,6 +647,17 @@ namespace MWPhysics
         }
     }
 
+    void PhysicsSystem::resetPosition(const MWWorld::ConstPtr &ptr)
+    {
+        ActorMap::iterator foundActor = mActors.find(ptr);
+        if (foundActor != mActors.end())
+        {
+            foundActor->second->resetPosition();
+            mTaskScheduler->updateSingleAabb(foundActor->second, true);
+            return;
+        }
+    }
+
     void PhysicsSystem::addActor (const MWWorld::Ptr& ptr, const std::string& mesh)
     {
         osg::ref_ptr<const Resource::BulletShape> shape = mShapeManager->getShape(mesh);
@@ -683,6 +694,8 @@ namespace MWPhysics
         if (found != mActors.end())
         {
             bool cmode = found->second->getCollisionMode();
+            if (cmode)
+                resetPosition(found->first);
             cmode = !cmode;
             found->second->enableCollisionMode(cmode);
             // NB: Collision body isn't disabled for vanilla TCL compatibility
@@ -711,7 +724,7 @@ namespace MWPhysics
         mMovementQueue.clear();
     }
 
-    const PtrPositionList& PhysicsSystem::applyQueuedMovement(float dt, bool skipSimulation, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
+    const std::vector<MWWorld::Ptr>& PhysicsSystem::applyQueuedMovement(float dt, bool skipSimulation, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
     {
         mTimeAccum += dt;
 
@@ -930,7 +943,6 @@ namespace MWPhysics
     void ActorFrameData::updatePosition()
     {
         mActorRaw->updatePosition();
-        mOrigin = mActorRaw->getSimulationPosition();
         mPosition = mActorRaw->getPosition();
         if (mMoveToWaterSurface)
         {
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index b33d829a46..8c76749913 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -50,8 +50,6 @@ class btVector3;
 
 namespace MWPhysics
 {
-    using PtrPositionList = std::map<MWWorld::Ptr, osg::Vec3f>;
-
     class HeightField;
     class Object;
     class Actor;
@@ -99,7 +97,6 @@ namespace MWPhysics
         float mOldHeight;
         float mFallHeight;
         osg::Vec3f mMovement;
-        osg::Vec3f mOrigin;
         osg::Vec3f mPosition;
         ESM::Position mRefpos;
     };
@@ -147,6 +144,7 @@ namespace MWPhysics
             void updateScale (const MWWorld::Ptr& ptr);
             void updateRotation (const MWWorld::Ptr& ptr);
             void updatePosition (const MWWorld::Ptr& ptr);
+            void resetPosition(const MWWorld::ConstPtr &ptr);
 
             void addHeightField (const float* heights, int x, int y, float triSize, float sqrtVerts, float minH, float maxH, const osg::Object* holdObject);
 
@@ -210,7 +208,7 @@ namespace MWPhysics
             void queueObjectMovement(const MWWorld::Ptr &ptr, const osg::Vec3f &velocity);
 
             /// Apply all queued movements, then clear the list.
-            const PtrPositionList& applyQueuedMovement(float dt, bool skipSimulation, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
+            const std::vector<MWWorld::Ptr>& applyQueuedMovement(float dt, bool skipSimulation, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
 
             /// Clear the queued movements list without applying.
             void clearQueuedMovement();
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 3086fed833..c2ad6e22f2 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1356,12 +1356,7 @@ namespace MWWorld
         }
 
         moveObject(ptr, ptr.getCell(), pos.x(), pos.y(), pos.z());
-        if (ptr.getClass().isActor())
-        {
-            MWPhysics::Actor* actor = mPhysics->getActor(ptr);
-            if (actor)
-                actor->resetPosition();
-        }
+        mPhysics->resetPosition(ptr);
     }
 
     void World::fixPosition()
@@ -1512,16 +1507,26 @@ namespace MWWorld
         mProjectileManager->processHits();
         mDiscardMovements = false;
 
-        for(const auto& [actor, position]: results)
+        for(const auto& actor : results)
         {
             // Handle player last, in case a cell transition occurs
             if(actor != getPlayerPtr())
+            {
+                auto* physactor = mPhysics->getActor(actor);
+                assert(physactor);
+                const auto position = physactor->getSimulationPosition();
                 moveObjectImp(actor, position.x(), position.y(), position.z(), false);
+            }
         }
 
-        const auto player = results.find(getPlayerPtr());
+        const auto player = std::find(results.begin(), results.end(), getPlayerPtr());
         if (player != results.end())
-            moveObjectImp(player->first, player->second.x(), player->second.y(), player->second.z(), false);
+        {
+            auto* physactor = mPhysics->getActor(*player);
+            assert(physactor);
+            const auto position = physactor->getSimulationPosition();
+            moveObjectImp(*player, position.x(), position.y(), position.z(), false);
+        }
     }
 
     void World::updateNavigator()

From 2ecd00b6db190476f4f8d713044fd3c42dd5f220 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Fri, 18 Dec 2020 16:31:21 +0000
Subject: [PATCH 0114/2859] Don't accidentally enable alpha testing for all
 shadow casting

---
 apps/openmw/mwrender/renderingmanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 9cb5146dc3..736e4f2ee1 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -379,7 +379,7 @@ namespace MWRender
         mRootNode->getOrCreateStateSet()->addUniform(new osg::Uniform("simpleWater", false));
 
         // Hopefully, anything genuinely requiring the default alpha func of GL_ALWAYS explicitly sets it
-        mRootNode->getOrCreateStateSet()->setAttribute(Shader::RemovedAlphaFunc::getInstance(GL_GREATER));
+        mRootNode->getOrCreateStateSet()->setAttribute(Shader::RemovedAlphaFunc::getInstance(GL_ALWAYS));
 
         mUniformNear = mRootNode->getOrCreateStateSet()->getUniform("near");
         mUniformFar = mRootNode->getOrCreateStateSet()->getUniform("far");

From eec2ba3623f0ad74e3f6747c9dcb959d28321edd Mon Sep 17 00:00:00 2001
From: Mads Buvik Sandvei <madssandvei@protonmail.com>
Date: Fri, 18 Dec 2020 18:15:14 +0000
Subject: [PATCH 0115/2859] Loading screen initialdrawcallback 4th time's the
 charm

---
 apps/openmw/mwgui/loadingscreen.cpp | 34 ++++++++++++++++++++++++-----
 apps/openmw/mwgui/loadingscreen.hpp |  1 +
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwgui/loadingscreen.cpp b/apps/openmw/mwgui/loadingscreen.cpp
index 5f0e9f33a3..7ddc8c5507 100644
--- a/apps/openmw/mwgui/loadingscreen.cpp
+++ b/apps/openmw/mwgui/loadingscreen.cpp
@@ -46,6 +46,7 @@ namespace MWGui
         , mProgress(0)
         , mShowWallpaper(true)
         , mOldCallback(nullptr)
+        , mHasCallback(false)
     {
         mMainWidget->setSize(MyGUI::RenderManager::getInstance().getViewSize());
 
@@ -139,13 +140,19 @@ namespace MWGui
     {
     public:
         CopyFramebufferToTextureCallback(osg::Texture2D* texture)
-            : mTexture(texture)
-            , mOneshot(true)
+            : mOneshot(true)
+            , mTexture(texture)
         {
         }
 
         void operator () (osg::RenderInfo& renderInfo) const override
         {
+            {
+                std::unique_lock<std::mutex> lock(mMutex);
+                mOneshot = false;
+            }
+            mSignal.notify_all();
+
             int w = renderInfo.getCurrentCamera()->getViewport()->width();
             int h = renderInfo.getCurrentCamera()->getViewport()->height();
             mTexture->copyTexImage2D(*renderInfo.getState(), 0, 0, w, h);
@@ -164,6 +171,18 @@ namespace MWGui
                 mSignal.wait(lock);
         }
 
+        void waitUntilInvoked()
+        {
+            std::unique_lock<std::mutex> lock(mMutex);
+            while (mOneshot)
+                mSignal.wait(lock);
+        }
+
+        void reset()
+        {
+            mOneshot = true;
+        }
+
     private:
         mutable bool mOneshot;
         mutable std::mutex mMutex;
@@ -349,6 +368,8 @@ namespace MWGui
         mOldCallback = mViewer->getCamera()->getInitialDrawCallback();
         mViewer->getCamera()->setInitialDrawCallback(mCopyFramebufferToTextureCallback);
 #endif
+        mCopyFramebufferToTextureCallback->reset();
+        mHasCallback = true;
 
         mBackgroundImage->setBackgroundImage("");
         mBackgroundImage->setVisible(false);
@@ -391,16 +412,19 @@ namespace MWGui
         mViewer->renderingTraversals();
         mViewer->advance(mViewer->getFrameStamp()->getSimulationTime());
 
-        if (mCopyFramebufferToTextureCallback)
+        if (mHasCallback)
         {
-            mCopyFramebufferToTextureCallback->wait();
+            mCopyFramebufferToTextureCallback->waitUntilInvoked();
+
+            // Note that we are removing the callback before the draw thread has returned from it.
+            // This is OK as we are retaining the ref_ptr.
 #if OSG_VERSION_GREATER_OR_EQUAL(3, 5, 10)
             mViewer->getCamera()->removeInitialDrawCallback(mCopyFramebufferToTextureCallback);
 #else
             // TODO: Remove once we officially end support for OSG versions pre 3.5.10
             mViewer->getCamera()->setInitialDrawCallback(mOldCallback);
 #endif
-            mCopyFramebufferToTextureCallback = nullptr;
+            mHasCallback = false;
         }
 
         mLastRenderTime = mTimer.time_m();
diff --git a/apps/openmw/mwgui/loadingscreen.hpp b/apps/openmw/mwgui/loadingscreen.hpp
index d58899eae4..5d86ed3896 100644
--- a/apps/openmw/mwgui/loadingscreen.hpp
+++ b/apps/openmw/mwgui/loadingscreen.hpp
@@ -88,6 +88,7 @@ namespace MWGui
         osg::ref_ptr<osg::Texture2D> mTexture;
         osg::ref_ptr<CopyFramebufferToTextureCallback> mCopyFramebufferToTextureCallback;
         osg::ref_ptr<osg::Camera::DrawCallback> mOldCallback;
+        bool mHasCallback;
         std::unique_ptr<MyGUI::ITexture> mGuiTexture;
 
         void changeWallpaper();

From a2a462f416b7c3c8b1f0c126833e2f101b9d5049 Mon Sep 17 00:00:00 2001
From: Mads Buvik Sandvei <madssandvei@protonmail.com>
Date: Fri, 18 Dec 2020 20:04:24 +0000
Subject: [PATCH 0116/2859] Update CMakeLists.txt to disable MSVC warning 4866

---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76764fbd93..f0f7a3fc5d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -557,6 +557,7 @@ if (WIN32)
         # caused by MyGUI
         4275 # non dll-interface class 'std::exception' used as base for dll-interface class 'MyGUI::Exception'
         4297 # function assumed not to throw an exception but does
+        4866 # compiler may not enforce left-to-right evaluation order for call
 
         # OpenMW specific warnings
         4099 # Type mismatch, declared class or struct is defined with other type

From 24a8b8c66ad09f12850cf5ef2ce5334adeb5b611 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Fri, 18 Dec 2020 21:16:48 +0100
Subject: [PATCH 0117/2859] Remove redundant call to resetPosition().
 adjustPosition() takes care of it,

---
 apps/openmw/mwphysics/physicssystem.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 8b9cb0a79f..3ea48a1f29 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -694,8 +694,6 @@ namespace MWPhysics
         if (found != mActors.end())
         {
             bool cmode = found->second->getCollisionMode();
-            if (cmode)
-                resetPosition(found->first);
             cmode = !cmode;
             found->second->enableCollisionMode(cmode);
             // NB: Collision body isn't disabled for vanilla TCL compatibility

From 58297ffbf46abf178f02f4bb73d424817e4627ed Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Fri, 18 Dec 2020 21:18:04 +0100
Subject: [PATCH 0118/2859] Move stats update into their own function.

---
 apps/openmw/mwphysics/mtphysics.cpp | 24 ++++++++++++++----------
 apps/openmw/mwphysics/mtphysics.hpp |  1 +
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 60a7259f80..4838cab505 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -230,16 +230,7 @@ namespace MWPhysics
                     mMovedActors.emplace_back(data.mActorRaw->getPtr());
                 }
             }
-
-            if (mFrameNumber == frameNumber - 1)
-            {
-                stats.setAttribute(mFrameNumber, "physicsworker_time_begin", mTimer->delta_s(mFrameStart, mTimeBegin));
-                stats.setAttribute(mFrameNumber, "physicsworker_time_taken", mTimer->delta_s(mTimeBegin, mTimeEnd));
-                stats.setAttribute(mFrameNumber, "physicsworker_time_end", mTimer->delta_s(mFrameStart, mTimeEnd));
-            }
-            mFrameStart = frameStart;
-            mTimeBegin = mTimer->tick();
-            mFrameNumber = frameNumber;
+            updateStats(frameStart, frameNumber, stats);
         }
 
         // init
@@ -523,4 +514,17 @@ namespace MWPhysics
                 actorData.mActorRaw->setStandingOnPtr(actorData.mStandingOn);
         }
     }
+
+    void PhysicsTaskScheduler::updateStats(osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
+    {
+        if (mFrameNumber == frameNumber - 1)
+        {
+            stats.setAttribute(mFrameNumber, "physicsworker_time_begin", mTimer->delta_s(mFrameStart, mTimeBegin));
+            stats.setAttribute(mFrameNumber, "physicsworker_time_taken", mTimer->delta_s(mTimeBegin, mTimeEnd));
+            stats.setAttribute(mFrameNumber, "physicsworker_time_end", mTimer->delta_s(mFrameStart, mTimeEnd));
+        }
+        mFrameStart = frameStart;
+        mTimeBegin = mTimer->tick();
+        mFrameNumber = frameNumber;
+    }
 }
diff --git a/apps/openmw/mwphysics/mtphysics.hpp b/apps/openmw/mwphysics/mtphysics.hpp
index 90e1007b87..b35ebd5ee9 100644
--- a/apps/openmw/mwphysics/mtphysics.hpp
+++ b/apps/openmw/mwphysics/mtphysics.hpp
@@ -57,6 +57,7 @@ namespace MWPhysics
             void refreshLOSCache();
             void updateAabbs();
             void updatePtrAabb(const std::weak_ptr<PtrHolder>& ptr);
+            void updateStats(osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
 
             std::unique_ptr<WorldFrameData> mWorldFrameData;
             std::vector<ActorFrameData> mActorsFrameData;

From 8e084dea2e44e0d48513261c1365ce477651e87a Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Fri, 18 Dec 2020 20:40:27 +0100
Subject: [PATCH 0119/2859] Don't cache Ptr, it can be updated while the
 simulation is running.

---
 apps/openmw/mwphysics/movementsolver.cpp |  9 ++++++---
 apps/openmw/mwphysics/mtphysics.cpp      | 14 ++++++++++----
 apps/openmw/mwphysics/physicssystem.cpp  | 16 ++++++++--------
 apps/openmw/mwphysics/physicssystem.hpp  |  3 +--
 apps/openmw/mwphysics/ptrholder.hpp      |  8 ++++++++
 5 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/apps/openmw/mwphysics/movementsolver.cpp b/apps/openmw/mwphysics/movementsolver.cpp
index 3c78104dc7..e55ec9166c 100644
--- a/apps/openmw/mwphysics/movementsolver.cpp
+++ b/apps/openmw/mwphysics/movementsolver.cpp
@@ -78,12 +78,14 @@ namespace MWPhysics
                                            WorldFrameData& worldData)
     {
         auto* physicActor = actor.mActorRaw;
-        auto ptr = actor.mPtr;
         const ESM::Position& refpos = actor.mRefpos;
         // Early-out for totally static creatures
         // (Not sure if gravity should still apply?)
-        if (!ptr.getClass().isMobile(ptr))
-            return;
+        {
+            const auto ptr = physicActor->getPtr();
+            if (!ptr.getClass().isMobile(ptr))
+                return;
+        }
 
         // Reset per-frame data
         physicActor->setWalkingOnWater(false);
@@ -211,6 +213,7 @@ namespace MWPhysics
             if (result)
             {
                 // don't let pure water creatures move out of water after stepMove
+                const auto ptr = physicActor->getPtr();
                 if (ptr.getClass().isPureWaterCreature(ptr) && newPosition.z() + halfExtents.z() > actor.mWaterlevel)
                     newPosition = oldPosition;
             }
diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 60a7259f80..bedcaba6ac 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -87,12 +87,13 @@ namespace
 
     void updateMechanics(MWPhysics::ActorFrameData& actorData)
     {
+        auto ptr = actorData.mActorRaw->getPtr();
         if (actorData.mDidJump)
-            handleJump(actorData.mPtr);
+            handleJump(ptr);
 
-        MWMechanics::CreatureStats& stats = actorData.mPtr.getClass().getCreatureStats(actorData.mPtr);
+        MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
         if (actorData.mNeedLand)
-            stats.land(actorData.mPtr == MWMechanics::getPlayer() && (actorData.mFlying || actorData.mSwimming));
+            stats.land(ptr == MWMechanics::getPlayer() && (actorData.mFlying || actorData.mSwimming));
         else if (actorData.mFallHeight < 0)
             stats.addToFallHeight(-actorData.mFallHeight);
     }
@@ -218,8 +219,13 @@ namespace MWPhysics
         {
             for (auto& data : mActorsFrameData)
             {
+                const auto actorActive = [&data](const auto& newFrameData) -> bool
+                {
+                    const auto actor = data.mActor.lock();
+                    return actor && actor->getPtr() == newFrameData.mActorRaw->getPtr();
+                };
                 // Only return actors that are still part of the scene
-                if (std::any_of(actorsData.begin(), actorsData.end(), [&data](const auto& newFrameData) { return data.mActorRaw->getPtr() == newFrameData.mActorRaw->getPtr(); }))
+                if (std::any_of(actorsData.begin(), actorsData.end(), actorActive))
                 {
                     updateMechanics(data);
 
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 8b9cb0a79f..9c239200bf 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -783,7 +783,7 @@ namespace MWPhysics
             if (numSteps == 0)
                 standingOn = physicActor->getStandingOnPtr();
 
-            actorsFrameData.emplace_back(std::move(physicActor), character, standingOn, moveToWaterSurface, movement, slowFall, waterlevel);
+            actorsFrameData.emplace_back(std::move(physicActor), standingOn, moveToWaterSurface, movement, slowFall, waterlevel);
         }
         mMovementQueue.clear();
         return actorsFrameData;
@@ -925,18 +925,18 @@ namespace MWPhysics
             mDebugDrawer->addCollision(position, normal);
     }
 
-    ActorFrameData::ActorFrameData(const std::shared_ptr<Actor>& actor, const MWWorld::Ptr character, const MWWorld::Ptr standingOn,
+    ActorFrameData::ActorFrameData(const std::shared_ptr<Actor>& actor, const MWWorld::Ptr standingOn,
             bool moveToWaterSurface, osg::Vec3f movement, float slowFall, float waterlevel)
         : mActor(actor), mActorRaw(actor.get()), mStandingOn(standingOn),
         mDidJump(false), mNeedLand(false), mMoveToWaterSurface(moveToWaterSurface),
         mWaterlevel(waterlevel), mSlowFall(slowFall), mOldHeight(0), mFallHeight(0), mMovement(movement), mPosition(), mRefpos()
     {
         const MWBase::World *world = MWBase::Environment::get().getWorld();
-        mPtr = actor->getPtr();
-        mFlying = world->isFlying(character);
-        mSwimming = world->isSwimming(character);
-        mWantJump = mPtr.getClass().getMovementSettings(mPtr).mPosition[2] != 0;
-        mIsDead = mPtr.getClass().getCreatureStats(mPtr).isDead();
+        const auto ptr = actor->getPtr();
+        mFlying = world->isFlying(ptr);
+        mSwimming = world->isSwimming(ptr);
+        mWantJump = ptr.getClass().getMovementSettings(ptr).mPosition[2] != 0;
+        mIsDead = ptr.getClass().getCreatureStats(ptr).isDead();
         mWasOnGround = actor->getOnGround();
     }
 
@@ -950,7 +950,7 @@ namespace MWPhysics
             mActorRaw->setPosition(mPosition);
         }
         mOldHeight = mPosition.z();
-        mRefpos = mPtr.getRefData().getPosition();
+        mRefpos = mActorRaw->getPtr().getRefData().getPosition();
     }
 
     WorldFrameData::WorldFrameData()
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 8c76749913..39bf9dd8be 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -78,11 +78,10 @@ namespace MWPhysics
 
     struct ActorFrameData
     {
-        ActorFrameData(const std::shared_ptr<Actor>& actor, const MWWorld::Ptr character, const MWWorld::Ptr standingOn, bool moveToWaterSurface, osg::Vec3f movement, float slowFall, float waterlevel);
+        ActorFrameData(const std::shared_ptr<Actor>& actor, const MWWorld::Ptr standingOn, bool moveToWaterSurface, osg::Vec3f movement, float slowFall, float waterlevel);
         void  updatePosition();
         std::weak_ptr<Actor> mActor;
         Actor* mActorRaw;
-        MWWorld::Ptr mPtr;
         MWWorld::Ptr mStandingOn;
         bool mFlying;
         bool mSwimming;
diff --git a/apps/openmw/mwphysics/ptrholder.hpp b/apps/openmw/mwphysics/ptrholder.hpp
index f8188b43ed..152a5d64fc 100644
--- a/apps/openmw/mwphysics/ptrholder.hpp
+++ b/apps/openmw/mwphysics/ptrholder.hpp
@@ -1,6 +1,8 @@
 #ifndef OPENMW_MWPHYSICS_PTRHOLDER_H
 #define OPENMW_MWPHYSICS_PTRHOLDER_H
 
+#include <mutex>
+
 #include "../mwworld/ptr.hpp"
 
 namespace MWPhysics
@@ -12,21 +14,27 @@ namespace MWPhysics
 
         void updatePtr(const MWWorld::Ptr& updated)
         {
+            std::scoped_lock lock(mMutex);
             mPtr = updated;
         }
 
         MWWorld::Ptr getPtr()
         {
+            std::scoped_lock lock(mMutex);
             return mPtr;
         }
 
         MWWorld::ConstPtr getPtr() const
         {
+            std::scoped_lock lock(mMutex);
             return mPtr;
         }
 
     protected:
         MWWorld::Ptr mPtr;
+
+    private:
+        mutable std::mutex mMutex;
     };
 }
 

From 93a12fe388236f28b7451cdedffc339f8c23c304 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Fri, 18 Dec 2020 23:47:01 +0100
Subject: [PATCH 0120/2859] Avoid dynamic_cast when possible.

---
 .../closestnotmerayresultcallback.cpp         | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp b/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp
index f9dc3bdd50..c3104f8603 100644
--- a/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp
+++ b/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp
@@ -41,15 +41,21 @@ namespace MWPhysics
         btCollisionWorld::ClosestRayResultCallback::addSingleResult(rayResult, normalInWorldSpace);
         if (mProjectile)
         {
-            auto* holder = static_cast<PtrHolder*>(rayResult.m_collisionObject->getUserPointer());
-            if (auto* target = dynamic_cast<Actor*>(holder))
+            switch (rayResult.m_collisionObject->getBroadphaseHandle()->m_collisionFilterGroup)
             {
-                mProjectile->hit(target->getPtr(), m_hitPointWorld, m_hitNormalWorld);
-            }
-            else if (auto* target = dynamic_cast<Projectile*>(holder))
-            {
-                target->hit(mProjectile->getPtr(), m_hitPointWorld, m_hitNormalWorld);
-                mProjectile->hit(target->getPtr(), m_hitPointWorld, m_hitNormalWorld);
+                case CollisionType_Actor:
+                {
+                    auto* target = static_cast<Actor*>(rayResult.m_collisionObject->getUserPointer());
+                    mProjectile->hit(target->getPtr(), m_hitPointWorld, m_hitNormalWorld);
+                    break;
+                }
+                case CollisionType_Projectile:
+                {
+                    auto* target = static_cast<Projectile*>(rayResult.m_collisionObject->getUserPointer());
+                    target->hit(mProjectile->getPtr(), m_hitPointWorld, m_hitNormalWorld);
+                    mProjectile->hit(target->getPtr(), m_hitPointWorld, m_hitNormalWorld);
+                    break;
+                }
             }
         }
 

From 637c76f438774eb691b1980ad1636f1918e889f5 Mon Sep 17 00:00:00 2001
From: Mads Buvik Sandvei <madssandvei@protonmail.com>
Date: Sat, 19 Dec 2020 08:34:36 +0000
Subject: [PATCH 0121/2859] Update CMakeLists.txt

---
 CMakeLists.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0f7a3fc5d..be7bc79e3f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -557,7 +557,6 @@ if (WIN32)
         # caused by MyGUI
         4275 # non dll-interface class 'std::exception' used as base for dll-interface class 'MyGUI::Exception'
         4297 # function assumed not to throw an exception but does
-        4866 # compiler may not enforce left-to-right evaluation order for call
 
         # OpenMW specific warnings
         4099 # Type mismatch, declared class or struct is defined with other type
@@ -585,6 +584,12 @@ if (WIN32)
             5031 # #pragma warning(pop): likely mismatch, popping warning state pushed in different file (config_begin.hpp, config_end.hpp)
         )
     endif()
+    
+    if( "${MyGUI_VERSION}" VERSION_LESS_EQUAL "3.4.0" )
+        set(WARNINGS_DISABLE ${WARNINGS_DISABLE}
+        4866 # compiler may not enforce left-to-right evaluation order for call
+        )
+    endif()
 
     foreach(d ${WARNINGS_DISABLE})
         set(WARNINGS "${WARNINGS} /wd${d}")

From e5f0c7f117c12d4b229833355a7ad9b9c3c46a15 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sat, 19 Dec 2020 16:54:50 +0100
Subject: [PATCH 0122/2859] Fix a typo introduced in
 08e73a09ec41fc791166473acdf91a3c0b39c0bb

It closes #5752
---
 apps/openmw/mwworld/worldimp.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index c2ad6e22f2..6a7e396447 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1345,7 +1345,7 @@ namespace MWWorld
         }
 
         const float terrainHeight = ptr.getCell()->isExterior() ? getTerrainHeightAt(pos) : -std::numeric_limits<float>::max();
-        pos.z() = std::max(pos.z(), terrainHeight + 20); // place slightly above terrain. will snap down to ground with code below
+        pos.z() = std::max(pos.z(), terrainHeight) + 20; // place slightly above terrain. will snap down to ground with code below
 
         // We still should trace down dead persistent actors - they do not use the "swimdeath" animation.
         bool swims = ptr.getClass().isActor() && isSwimming(ptr) && !(ptr.getClass().isPersistent(ptr) && ptr.getClass().getCreatureStats(ptr).isDeathAnimationFinished());

From cc2ce9fa3e49b86fe1501eb2fe3b26e80918c995 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Sat, 19 Dec 2020 21:57:42 +0000
Subject: [PATCH 0123/2859] Explicitly default-construct array

The docs seem to imply this is automatic when the array contains a
class-type, which osg::ref_ptr is, but I got a crash log that doesn't
make sense if that's true.
---
 components/sceneutil/mwshadowtechnique.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
index 31267f75ce..39e47b0ea3 100644
--- a/components/sceneutil/mwshadowtechnique.cpp
+++ b/components/sceneutil/mwshadowtechnique.cpp
@@ -782,13 +782,15 @@ void MWShadowTechnique::ViewDependentData::releaseGLObjects(osg::State* state) c
 MWShadowTechnique::MWShadowTechnique():
     ShadowTechnique(),
     _enableShadows(false),
-    _debugHud(nullptr)
+    _debugHud(nullptr),
+    _castingPrograms{ nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr }
 {
     _shadowRecievingPlaceholderStateSet = new osg::StateSet;
 }
 
 MWShadowTechnique::MWShadowTechnique(const MWShadowTechnique& vdsm, const osg::CopyOp& copyop):
     ShadowTechnique(vdsm,copyop)
+    , _castingPrograms(vdsm._castingPrograms)
 {
     _shadowRecievingPlaceholderStateSet = new osg::StateSet;
     _enableShadows = vdsm._enableShadows;

From 0e4e8eb0f3af47ea236dac8c7372da97eb39dbdb Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Sun, 20 Dec 2020 01:22:14 +0000
Subject: [PATCH 0124/2859] Add glDebugGroup support

---
 components/debug/gldebug.cpp | 306 +++++++++++++++++++++++------------
 components/debug/gldebug.hpp |  60 +++++++
 2 files changed, 267 insertions(+), 99 deletions(-)

diff --git a/components/debug/gldebug.cpp b/components/debug/gldebug.cpp
index 3c5ec728ac..22d7bbe682 100644
--- a/components/debug/gldebug.cpp
+++ b/components/debug/gldebug.cpp
@@ -38,127 +38,235 @@ either expressed or implied, of the FreeBSD Project.
 // OpenGL constants not provided by OSG:
 #include <SDL_opengl_glext.h>
 
-void debugCallback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const void *userParam)
+namespace Debug
 {
-#ifdef GL_DEBUG_OUTPUT
-    std::string srcStr;
-    switch (source)
+
+    void debugCallback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const void *userParam)
     {
-    case GL_DEBUG_SOURCE_API:
-        srcStr = "API";
-        break;
-    case GL_DEBUG_SOURCE_WINDOW_SYSTEM:
-        srcStr = "WINDOW_SYSTEM";
-        break;
-    case GL_DEBUG_SOURCE_SHADER_COMPILER:
-        srcStr = "SHADER_COMPILER";
-        break;
-    case GL_DEBUG_SOURCE_THIRD_PARTY:
-        srcStr = "THIRD_PARTY";
-        break;
-    case GL_DEBUG_SOURCE_APPLICATION:
-        srcStr = "APPLICATION";
-        break;
-    case GL_DEBUG_SOURCE_OTHER:
-        srcStr = "OTHER";
-        break;
-    default:
-        srcStr = "UNDEFINED";
-        break;
+#ifdef GL_DEBUG_OUTPUT
+        std::string srcStr;
+        switch (source)
+        {
+        case GL_DEBUG_SOURCE_API:
+            srcStr = "API";
+            break;
+        case GL_DEBUG_SOURCE_WINDOW_SYSTEM:
+            srcStr = "WINDOW_SYSTEM";
+            break;
+        case GL_DEBUG_SOURCE_SHADER_COMPILER:
+            srcStr = "SHADER_COMPILER";
+            break;
+        case GL_DEBUG_SOURCE_THIRD_PARTY:
+            srcStr = "THIRD_PARTY";
+            break;
+        case GL_DEBUG_SOURCE_APPLICATION:
+            srcStr = "APPLICATION";
+            break;
+        case GL_DEBUG_SOURCE_OTHER:
+            srcStr = "OTHER";
+            break;
+        default:
+            srcStr = "UNDEFINED";
+            break;
+        }
+
+        std::string typeStr;
+
+        Level logSeverity = Warning;
+        switch (type)
+        {
+        case GL_DEBUG_TYPE_ERROR:
+            typeStr = "ERROR";
+            logSeverity = Error;
+            break;
+        case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR:
+            typeStr = "DEPRECATED_BEHAVIOR";
+            break;
+        case GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR:
+            typeStr = "UNDEFINED_BEHAVIOR";
+            break;
+        case GL_DEBUG_TYPE_PORTABILITY:
+            typeStr = "PORTABILITY";
+            break;
+        case GL_DEBUG_TYPE_PERFORMANCE:
+            typeStr = "PERFORMANCE";
+            break;
+        case GL_DEBUG_TYPE_OTHER:
+            typeStr = "OTHER";
+            break;
+        default:
+            typeStr = "UNDEFINED";
+            break;
+        }
+
+        Log(logSeverity) << "OpenGL " << typeStr << " [" << srcStr << "]: " << message;
+#endif
     }
 
-    std::string typeStr;
+    class PushDebugGroup
+    {
+    public:
+        static std::unique_ptr<PushDebugGroup> sInstance;
+
+        void (GL_APIENTRY * glPushDebugGroup) (GLenum source, GLuint id, GLsizei length, const GLchar * message);
+
+        void (GL_APIENTRY * glPopDebugGroup) (void);
 
-    Debug::Level logSeverity = Debug::Warning;
-    switch (type)
+        bool valid()
+        {
+            return glPushDebugGroup && glPopDebugGroup;
+        }
+    };
+
+    std::unique_ptr<PushDebugGroup> PushDebugGroup::sInstance{ std::make_unique<PushDebugGroup>() };
+
+    EnableGLDebugOperation::EnableGLDebugOperation() : osg::GraphicsOperation("EnableGLDebugOperation", false)
     {
-    case GL_DEBUG_TYPE_ERROR:
-        typeStr = "ERROR";
-        logSeverity = Debug::Error;
-        break;
-    case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR:
-        typeStr = "DEPRECATED_BEHAVIOR";
-        break;
-    case GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR:
-        typeStr = "UNDEFINED_BEHAVIOR";
-        break;
-    case GL_DEBUG_TYPE_PORTABILITY:
-        typeStr = "PORTABILITY";
-        break;
-    case GL_DEBUG_TYPE_PERFORMANCE:
-        typeStr = "PERFORMANCE";
-        break;
-    case GL_DEBUG_TYPE_OTHER:
-        typeStr = "OTHER";
-        break;
-    default:
-        typeStr = "UNDEFINED";
-        break;
     }
 
-    Log(logSeverity) << "OpenGL " << typeStr << " [" << srcStr << "]: " << message;
+    void EnableGLDebugOperation::operator()(osg::GraphicsContext* graphicsContext)
+    {
+#ifdef GL_DEBUG_OUTPUT
+        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mMutex);
+
+        unsigned int contextID = graphicsContext->getState()->getContextID();
+
+        typedef void (GL_APIENTRY *DEBUGPROC)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const void *userParam);
+        typedef void (GL_APIENTRY *GLDebugMessageControlFunction)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
+        typedef void (GL_APIENTRY *GLDebugMessageCallbackFunction)(DEBUGPROC, const void* userParam);
+
+        GLDebugMessageControlFunction glDebugMessageControl = nullptr;
+        GLDebugMessageCallbackFunction glDebugMessageCallback = nullptr;
+
+        if (osg::isGLExtensionSupported(contextID, "GL_KHR_debug"))
+        {
+            osg::setGLExtensionFuncPtr(glDebugMessageCallback, "glDebugMessageCallback");
+            osg::setGLExtensionFuncPtr(glDebugMessageControl, "glDebugMessageControl");
+            osg::setGLExtensionFuncPtr(PushDebugGroup::sInstance->glPushDebugGroup, "glPushDebugGroup");
+            osg::setGLExtensionFuncPtr(PushDebugGroup::sInstance->glPopDebugGroup, "glPopDebugGroup");
+        }
+        else if (osg::isGLExtensionSupported(contextID, "GL_ARB_debug_output"))
+        {
+            osg::setGLExtensionFuncPtr(glDebugMessageCallback, "glDebugMessageCallbackARB");
+            osg::setGLExtensionFuncPtr(glDebugMessageControl, "glDebugMessageControlARB");
+        }
+        else if (osg::isGLExtensionSupported(contextID, "GL_AMD_debug_output"))
+        {
+            osg::setGLExtensionFuncPtr(glDebugMessageCallback, "glDebugMessageCallbackAMD");
+            osg::setGLExtensionFuncPtr(glDebugMessageControl, "glDebugMessageControlAMD");
+        }
+
+        if (glDebugMessageCallback && glDebugMessageControl)
+        {
+            glEnable(GL_DEBUG_OUTPUT);
+            glDebugMessageControl(GL_DONT_CARE, GL_DEBUG_TYPE_ERROR, GL_DEBUG_SEVERITY_MEDIUM, 0, nullptr, true);
+            glDebugMessageCallback(debugCallback, nullptr);
+
+            Log(Info) << "OpenGL debug callback attached.";
+        }
+        else
 #endif
-}
+            Log(Error) << "Unable to attach OpenGL debug callback.";
+    }
 
-void enableGLDebugExtension(unsigned int contextID)
-{
-#ifdef GL_DEBUG_OUTPUT
-    typedef void (GL_APIENTRY *DEBUGPROC)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const void *userParam);
-    typedef void (GL_APIENTRY *GLDebugMessageControlFunction)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
-    typedef void (GL_APIENTRY *GLDebugMessageCallbackFunction)(DEBUGPROC, const void* userParam);
-    
-    GLDebugMessageControlFunction glDebugMessageControl = nullptr;
-    GLDebugMessageCallbackFunction glDebugMessageCallback = nullptr;
-
-    if (osg::isGLExtensionSupported(contextID, "GL_KHR_debug"))
+    bool shouldDebugOpenGL()
+    {
+        const char* env = std::getenv("OPENMW_DEBUG_OPENGL");
+        if (!env)
+            return false;
+        std::string str(env);
+        if (str.length() == 0)
+            return true;
+
+        return str.find("OFF") == std::string::npos && str.find("0") == std::string::npos && str.find("NO") == std::string::npos;
+    }
+
+    DebugGroup::DebugGroup(const std::string & message, GLuint id)
+        : mSource(GL_DEBUG_SOURCE_APPLICATION)
+        , mId(id)
+        , mMessage(message)
     {
-        osg::setGLExtensionFuncPtr(glDebugMessageCallback, "glDebugMessageCallback");
-        osg::setGLExtensionFuncPtr(glDebugMessageControl, "glDebugMessageControl");
     }
-    else if (osg::isGLExtensionSupported(contextID, "GL_ARB_debug_output"))
+
+    DebugGroup::DebugGroup(const DebugGroup & debugGroup, const osg::CopyOp & copyop)
+        : osg::StateAttribute(debugGroup, copyop)
+        , mSource(debugGroup.mSource)
+        , mId(debugGroup.mId)
+        , mMessage(debugGroup.mMessage)
     {
-        osg::setGLExtensionFuncPtr(glDebugMessageCallback, "glDebugMessageCallbackARB");
-        osg::setGLExtensionFuncPtr(glDebugMessageControl, "glDebugMessageControlARB");
     }
-    else if (osg::isGLExtensionSupported(contextID, "GL_AMD_debug_output"))
+
+    void DebugGroup::apply(osg::State & state) const
     {
-        osg::setGLExtensionFuncPtr(glDebugMessageCallback, "glDebugMessageCallbackAMD");
-        osg::setGLExtensionFuncPtr(glDebugMessageControl, "glDebugMessageControlAMD");
+        if (!PushDebugGroup::sInstance->valid())
+        {
+            Log(Error) << "OpenGL debug groups not supported on this system, or OPENMW_DEBUG_OPENGL environment variable not set.";
+            return;
+        }
+
+        auto& attributeVec = state.getAttributeVec(this);
+        auto& lastAppliedStack = sLastAppliedStack[state.getContextID()];
+
+        size_t firstNonMatch = 0;
+        while (firstNonMatch < lastAppliedStack.size()
+               && ((firstNonMatch < attributeVec.size() && lastAppliedStack[firstNonMatch] == attributeVec[firstNonMatch].first)
+                   || lastAppliedStack[firstNonMatch] == this))
+            firstNonMatch++;
+
+        for (size_t i = lastAppliedStack.size(); i > firstNonMatch; --i)
+            lastAppliedStack[i - 1]->pop(state);
+        lastAppliedStack.resize(firstNonMatch);
+
+        lastAppliedStack.reserve(attributeVec.size());
+        for (size_t i = firstNonMatch; i < attributeVec.size(); ++i)
+        {
+            const DebugGroup* group = static_cast<const DebugGroup*>(attributeVec[i].first);
+            group->push(state);
+            lastAppliedStack.push_back(group);
+        }
+        if (!(lastAppliedStack.back() == this))
+        {
+            push(state);
+            lastAppliedStack.push_back(this);
+        }
     }
 
-    if (glDebugMessageCallback && glDebugMessageControl)
+    int DebugGroup::compare(const StateAttribute & sa) const
     {
-        glEnable(GL_DEBUG_OUTPUT);
-        glDebugMessageControl(GL_DONT_CARE, GL_DEBUG_TYPE_ERROR, GL_DEBUG_SEVERITY_MEDIUM, 0, nullptr, true);
-        glDebugMessageCallback(debugCallback, nullptr);
+        COMPARE_StateAttribute_Types(DebugGroup, sa);
+
+        COMPARE_StateAttribute_Parameter(mSource);
+        COMPARE_StateAttribute_Parameter(mId);
+        COMPARE_StateAttribute_Parameter(mMessage);
 
-        Log(Debug::Info) << "OpenGL debug callback attached.";
+        return 0;
     }
-    else
-#endif
-        Log(Debug::Error) << "Unable to attach OpenGL debug callback.";
-}
 
-Debug::EnableGLDebugOperation::EnableGLDebugOperation() : osg::GraphicsOperation("EnableGLDebugOperation", false)
-{
-}
+    void DebugGroup::releaseGLObjects(osg::State * state) const
+    {
+        if (state)
+            sLastAppliedStack.erase(state->getContextID());
+        else
+            sLastAppliedStack.clear();
+    }
 
-void Debug::EnableGLDebugOperation::operator()(osg::GraphicsContext* graphicsContext)
-{
-    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mMutex);
+    bool DebugGroup::isValid() const
+    {
+        return mSource || mId || mMessage.length();
+    }
 
-    unsigned int contextID = graphicsContext->getState()->getContextID();
-    enableGLDebugExtension(contextID);
-}
+    void DebugGroup::push(osg::State & state) const
+    {
+        if (isValid())
+            PushDebugGroup::sInstance->glPushDebugGroup(mSource, mId, mMessage.size(), mMessage.c_str());
+    }
+
+    void DebugGroup::pop(osg::State & state) const
+    {
+        if (isValid())
+            PushDebugGroup::sInstance->glPopDebugGroup();
+    }
+
+    std::map<unsigned int, std::vector<const DebugGroup *>> DebugGroup::sLastAppliedStack{};
 
-bool Debug::shouldDebugOpenGL()
-{
-    const char* env = std::getenv("OPENMW_DEBUG_OPENGL");
-    if (!env)
-        return false;
-    std::string str(env);
-    if (str.length() == 0)
-        return true;
-
-    return str.find("OFF") == std::string::npos && str.find("0") == std::string::npos && str.find("NO") == std::string::npos;
 }
diff --git a/components/debug/gldebug.hpp b/components/debug/gldebug.hpp
index 8be747afe8..b6f32c9cff 100644
--- a/components/debug/gldebug.hpp
+++ b/components/debug/gldebug.hpp
@@ -17,5 +17,65 @@ namespace Debug
     };
 
     bool shouldDebugOpenGL();
+
+
+    /*
+        Debug groups allow rendering to be annotated, making debugging via APITrace/CodeXL/NSight etc. much clearer.
+
+        Because I've not thought of a quick and clean way of doing it without incurring a small performance cost,
+        there are no uses of this class checked in. For now, add annotations locally when you need them.
+
+        To use this class, add it to a StateSet just like any other StateAttribute. Prefer the string-only constructor.
+        You'll need OPENMW_DEBUG_OPENGL set to true, or shouldDebugOpenGL() redefined to just return true as otherwise
+        the extension function pointers won't get set up. That can maybe be cleaned up in the future.
+
+        Beware that consecutive identical debug groups (i.e. pointers match) won't always get applied due to OSG thinking
+        it's already applied them. Either avoid nesting the same object, add dummy groups so they're not consecutive, or
+        ensure the leaf group isn't identical to its parent.
+    */
+    class DebugGroup : public osg::StateAttribute
+    {
+    public:
+        DebugGroup()
+            : mSource(0)
+            , mId(0)
+            , mMessage("")
+        {}
+
+        DebugGroup(GLenum source, GLuint id, const std::string& message)
+            : mSource(source)
+            , mId(id)
+            , mMessage(message)
+        {}
+
+        DebugGroup(const std::string& message, GLuint id = 0);
+
+        DebugGroup(const DebugGroup& debugGroup, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY);
+
+        META_StateAttribute(Debug, DebugGroup, osg::StateAttribute::Type(101));
+
+        void apply(osg::State& state) const override;
+
+        int compare(const StateAttribute& sa) const override;
+
+        void releaseGLObjects(osg::State* state = nullptr) const override;
+
+        virtual bool isValid() const;
+
+    protected:
+        virtual ~DebugGroup() = default;
+
+        virtual void push(osg::State& state) const;
+
+        virtual void pop(osg::State& state) const;
+
+        GLenum mSource;
+        GLuint mId;
+        std::string mMessage;
+
+        static std::map<unsigned int, std::vector<const DebugGroup *>> sLastAppliedStack;
+
+        friend EnableGLDebugOperation;
+    };
 }
 #endif

From 657da50d996d304cca4ee27884c46a290bb05223 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Sun, 20 Dec 2020 01:36:34 +0000
Subject: [PATCH 0125/2859] Ensure GL_BLEND is disabled when drawing shadow
 maps

---
 components/sceneutil/shadowsbin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/sceneutil/shadowsbin.cpp b/components/sceneutil/shadowsbin.cpp
index 312d4226b5..8b5c788dd0 100644
--- a/components/sceneutil/shadowsbin.cpp
+++ b/components/sceneutil/shadowsbin.cpp
@@ -54,7 +54,7 @@ ShadowsBin::ShadowsBin()
 
     mShaderAlphaTestStateSet = new osg::StateSet;
     mShaderAlphaTestStateSet->addUniform(new osg::Uniform("alphaTestShadows", true));
-    mShaderAlphaTestStateSet->setMode(GL_BLEND, osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE);
+    mShaderAlphaTestStateSet->setMode(GL_BLEND, osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED | osg::StateAttribute::OVERRIDE);
 
     for (size_t i = 0; i < sCastingPrograms.size(); ++i)
     {

From 7e045cff7560a16015ab60b984d1713fb549c42e Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Sun, 20 Dec 2020 01:51:45 +0000
Subject: [PATCH 0126/2859] #include <memory>

---
 components/debug/gldebug.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/debug/gldebug.cpp b/components/debug/gldebug.cpp
index 22d7bbe682..ee7dd608e4 100644
--- a/components/debug/gldebug.cpp
+++ b/components/debug/gldebug.cpp
@@ -32,6 +32,7 @@ either expressed or implied, of the FreeBSD Project.
 #include "gldebug.hpp"
 
 #include <cstdlib>
+#include <memory>
 
 #include <components/debug/debuglog.hpp>
 

From 33eb09f5345387f47eb6193385103a6c24405d8d Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sun, 20 Dec 2020 18:28:21 +0100
Subject: [PATCH 0127/2859] Remove unused headers

---
 apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp | 5 -----
 apps/openmw/mwphysics/trace.cpp                            | 3 ---
 2 files changed, 8 deletions(-)

diff --git a/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp b/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp
index 3ec09d00d2..18c196e444 100644
--- a/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp
+++ b/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp
@@ -2,11 +2,6 @@
 
 #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
 
-#include <components/misc/convert.hpp>
-
-#include "../mwbase/world.hpp"
-#include "../mwbase/environment.hpp"
-
 #include "collisiontype.hpp"
 #include "projectile.hpp"
 
diff --git a/apps/openmw/mwphysics/trace.cpp b/apps/openmw/mwphysics/trace.cpp
index 4d2fccdb7b..58082f4db2 100644
--- a/apps/openmw/mwphysics/trace.cpp
+++ b/apps/openmw/mwphysics/trace.cpp
@@ -5,9 +5,6 @@
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 #include <BulletCollision/CollisionShapes/btConvexShape.h>
 
-#include "../mwbase/world.hpp"
-#include "../mwbase/environment.hpp"
-
 #include "collisiontype.hpp"
 #include "actor.hpp"
 #include "closestnotmeconvexresultcallback.hpp"

From 5bd921fa3aa494af76972abf6299bcf44ec74b7f Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sat, 19 Dec 2020 20:25:46 +0100
Subject: [PATCH 0128/2859] Restore pre-async handling of absolute actors
 positionning

One of the issue since the introduction of async physics is the quirky
handling of scripted moves. Previous attempt to account for them was
based on detecting changes in actor position while the physics thread is
running. To this end, semantics of Actor::updatePosition() (which is
responsible for set the absolute position of an actor in the world) was
toned down to merely store the desired position, with the physics system
actually responsible for moving the actor. For the cases were complete
override of the physics simulation was needed, I introduced
Actor::resetPosition(), which actually have same semantics as
original updatePosition(). This in turn introduced a loads of new bugs
when the weakened semantics broke key assumptions inside the engine
(spawning, summoning, teleport, etc).
Instead of tracking them down, count on the newly introduced support for
object relative movements in the engine (World::moveObjectBy) to
register relative movements and restore original handling of absolute positionning.

Changes are relatively small:
- move resetPosition() content into updatePosition()
- call updatePosition() everywhere it was called before
- remove all added calls to the now non-existing resetPosition()

tldr; ditch last month worth of bug introduction and eradication and redo
it properly
---
 apps/openmw/mwphysics/actor.cpp         | 51 +++++++++----------------
 apps/openmw/mwphysics/actor.hpp         |  8 ++--
 apps/openmw/mwphysics/mtphysics.cpp     |  4 +-
 apps/openmw/mwphysics/physicssystem.cpp | 16 +-------
 apps/openmw/mwphysics/physicssystem.hpp |  1 -
 apps/openmw/mwworld/worldimp.cpp        |  1 -
 6 files changed, 23 insertions(+), 58 deletions(-)

diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index 10fd463fb0..015424db58 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -74,7 +74,7 @@ Actor::Actor(const MWWorld::Ptr& ptr, const Resource::BulletShape* shape, Physic
 
     updateRotation();
     updateScale();
-    resetPosition();
+    updatePosition();
     addCollisionMask(getCollisionMask());
     updateCollisionObjectPosition();
 }
@@ -119,30 +119,34 @@ int Actor::getCollisionMask() const
     return collisionMask;
 }
 
-void Actor::updatePositionUnsafe()
+void Actor::updatePosition()
 {
-    if (!mWorldPositionChanged && mWorldPosition != mPtr.getRefData().getPosition().asVec3())
-        mWorldPositionChanged = true;
-    mWorldPosition = mPtr.getRefData().getPosition().asVec3();
+    std::scoped_lock lock(mPositionMutex);
+    updateWorldPosition();
+    mPreviousPosition = mWorldPosition;
+    mPosition = mWorldPosition;
+    mSimulationPosition = mWorldPosition;
+    mStandingOnPtr = nullptr;
+    mSkipSimulation = true;
 }
 
-void Actor::updatePosition()
+void Actor::updateWorldPosition()
 {
-    std::scoped_lock lock(mPositionMutex);
-    updatePositionUnsafe();
+    if (mWorldPosition != mPtr.getRefData().getPosition().asVec3())
+        mWorldPositionChanged = true;
+    mWorldPosition = mPtr.getRefData().getPosition().asVec3();
 }
 
 osg::Vec3f Actor::getWorldPosition() const
 {
-    std::scoped_lock lock(mPositionMutex);
     return mWorldPosition;
 }
 
 void Actor::setSimulationPosition(const osg::Vec3f& position)
 {
-    if (!mResetSimulation)
+    if (!mSkipSimulation)
         mSimulationPosition = position;
-    mResetSimulation = false;
+    mSkipSimulation = false;
 }
 
 osg::Vec3f Actor::getSimulationPosition() const
@@ -150,8 +154,9 @@ osg::Vec3f Actor::getSimulationPosition() const
     return mSimulationPosition;
 }
 
-void Actor::updateCollisionObjectPositionUnsafe()
+void Actor::updateCollisionObjectPosition()
 {
+    std::scoped_lock lock(mPositionMutex);
     mShape->setLocalScaling(Misc::Convert::toBullet(mScale));
     osg::Vec3f scaledTranslation = mRotation * osg::componentMultiply(mMeshTranslation, mScale);
     osg::Vec3f newPosition = scaledTranslation + mPosition;
@@ -161,12 +166,6 @@ void Actor::updateCollisionObjectPositionUnsafe()
     mWorldPositionChanged = false;
 }
 
-void Actor::updateCollisionObjectPosition()
-{
-    std::scoped_lock lock(mPositionMutex);
-    updateCollisionObjectPositionUnsafe();
-}
-
 osg::Vec3f Actor::getCollisionObjectPosition() const
 {
     std::scoped_lock lock(mPositionMutex);
@@ -189,18 +188,6 @@ void Actor::adjustPosition(const osg::Vec3f& offset)
     mPositionOffset += offset;
 }
 
-void Actor::resetPosition()
-{
-    std::scoped_lock lock(mPositionMutex);
-    updatePositionUnsafe();
-    mPreviousPosition = mWorldPosition;
-    mPosition = mWorldPosition;
-    mSimulationPosition = mWorldPosition;
-    mStandingOnPtr = nullptr;
-    mWorldPositionChanged = false;
-    mResetSimulation = true;
-}
-
 osg::Vec3f Actor::getPosition() const
 {
     return mPosition;
@@ -214,8 +201,6 @@ osg::Vec3f Actor::getPreviousPosition() const
 void Actor::updateRotation ()
 {
     std::scoped_lock lock(mPositionMutex);
-    if (mRotation == mPtr.getRefData().getBaseNode()->getAttitude())
-        return;
     mRotation = mPtr.getRefData().getBaseNode()->getAttitude();
 }
 
@@ -246,7 +231,6 @@ osg::Vec3f Actor::getHalfExtents() const
 
 osg::Vec3f Actor::getOriginalHalfExtents() const
 {
-    std::scoped_lock lock(mPositionMutex);
     return mHalfExtents;
 }
 
@@ -283,7 +267,6 @@ void Actor::setWalkingOnWater(bool walkingOnWater)
 
 void Actor::setCanWaterWalk(bool waterWalk)
 {
-    std::scoped_lock lock(mPositionMutex);
     if (waterWalk != mCanWaterWalk)
     {
         mCanWaterWalk = waterWalk;
diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index b26b52d144..18419c2c80 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -60,7 +60,7 @@ namespace MWPhysics
          * Set mWorldPosition to the position in the Ptr's RefData. This is used by the physics simulation to account for 
          * when an object is "instantly" moved/teleported as opposed to being moved by the physics simulation.
          */
-        void updatePosition();
+        void updateWorldPosition();
         osg::Vec3f getWorldPosition() const;
 
         /**
@@ -93,7 +93,7 @@ namespace MWPhysics
           * Returns true if the new position is different.
           */
         bool setPosition(const osg::Vec3f& position);
-        void resetPosition();
+        void updatePosition();
         void adjustPosition(const osg::Vec3f& offset);
 
         osg::Vec3f getPosition() const;
@@ -155,8 +155,6 @@ namespace MWPhysics
         void updateCollisionMask();
         void addCollisionMask(int collisionMask);
         int getCollisionMask() const;
-        void updateCollisionObjectPositionUnsafe();
-        void updatePositionUnsafe();
 
         bool mCanWaterWalk;
         std::atomic<bool> mWalkingOnWater;
@@ -180,7 +178,7 @@ namespace MWPhysics
         osg::Vec3f mPreviousPosition;
         osg::Vec3f mPositionOffset;
         bool mWorldPositionChanged;
-        bool mResetSimulation;
+        bool mSkipSimulation;
         btTransform mLocalTransform;
         mutable std::mutex mPositionMutex;
 
diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index bedcaba6ac..3774ee7347 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -281,8 +281,8 @@ namespace MWPhysics
         mActorsFrameData.clear();
         for (const auto& [_, actor] : actors)
         {
-            actor->resetPosition();
-            actor->setSimulationPosition(actor->getWorldPosition()); // resetPosition skip next simulation, now we need to "consume" it
+            actor->updatePosition();
+            actor->setSimulationPosition(actor->getWorldPosition()); // updatePosition skip next simulation, now we need to "consume" it
             actor->updateCollisionObjectPosition();
             mMovedActors.emplace_back(actor->getPtr());
         }
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 9c239200bf..0b3cdbff50 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -437,7 +437,6 @@ namespace MWPhysics
         ActorMap::iterator found = mActors.find(ptr);
         if (found ==  mActors.end())
             return ptr.getRefData().getPosition().asVec3();
-        resetPosition(ptr);
         return MovementSolver::traceDown(ptr, position, found->second.get(), mCollisionWorld.get(), maxHeight);
     }
 
@@ -642,17 +641,6 @@ namespace MWPhysics
         if (foundActor != mActors.end())
         {
             foundActor->second->updatePosition();
-            mTaskScheduler->updateSingleAabb(foundActor->second);
-            return;
-        }
-    }
-
-    void PhysicsSystem::resetPosition(const MWWorld::ConstPtr &ptr)
-    {
-        ActorMap::iterator foundActor = mActors.find(ptr);
-        if (foundActor != mActors.end())
-        {
-            foundActor->second->resetPosition();
             mTaskScheduler->updateSingleAabb(foundActor->second, true);
             return;
         }
@@ -694,8 +682,6 @@ namespace MWPhysics
         if (found != mActors.end())
         {
             bool cmode = found->second->getCollisionMode();
-            if (cmode)
-                resetPosition(found->first);
             cmode = !cmode;
             found->second->enableCollisionMode(cmode);
             // NB: Collision body isn't disabled for vanilla TCL compatibility
@@ -942,7 +928,7 @@ namespace MWPhysics
 
     void ActorFrameData::updatePosition()
     {
-        mActorRaw->updatePosition();
+        mActorRaw->updateWorldPosition();
         mPosition = mActorRaw->getPosition();
         if (mMoveToWaterSurface)
         {
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 39bf9dd8be..9ebd587f51 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -143,7 +143,6 @@ namespace MWPhysics
             void updateScale (const MWWorld::Ptr& ptr);
             void updateRotation (const MWWorld::Ptr& ptr);
             void updatePosition (const MWWorld::Ptr& ptr);
-            void resetPosition(const MWWorld::ConstPtr &ptr);
 
             void addHeightField (const float* heights, int x, int y, float triSize, float sqrtVerts, float minH, float maxH, const osg::Object* holdObject);
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 6a7e396447..b3a9dbb022 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1356,7 +1356,6 @@ namespace MWWorld
         }
 
         moveObject(ptr, ptr.getCell(), pos.x(), pos.y(), pos.z());
-        mPhysics->resetPosition(ptr);
     }
 
     void World::fixPosition()

From 09759c66208d61d2bad0e85d7a0438fe3767a93a Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sat, 19 Dec 2020 20:17:42 +0300
Subject: [PATCH 0129/2859] Clean up shader lighting

---
 files/shaders/CMakeLists.txt        |  1 +
 files/shaders/lighting.glsl         | 83 +++++++----------------------
 files/shaders/objects_fragment.glsl | 29 +++++-----
 files/shaders/objects_vertex.glsl   | 14 +++--
 files/shaders/terrain_fragment.glsl | 29 +++++-----
 files/shaders/terrain_vertex.glsl   | 14 +++--
 files/shaders/vertexcolors.glsl     | 38 +++++++++++++
 7 files changed, 107 insertions(+), 101 deletions(-)
 create mode 100644 files/shaders/vertexcolors.glsl

diff --git a/files/shaders/CMakeLists.txt b/files/shaders/CMakeLists.txt
index 8012c2bc10..47670e7a03 100644
--- a/files/shaders/CMakeLists.txt
+++ b/files/shaders/CMakeLists.txt
@@ -22,6 +22,7 @@ set(SHADER_FILES
     shadows_fragment.glsl
     shadowcasting_vertex.glsl
     shadowcasting_fragment.glsl
+    vertexcolors.glsl
 )
 
 copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_SHADERS_ROOT} ${DDIRRELATIVE} "${SHADER_FILES}")
diff --git a/files/shaders/lighting.glsl b/files/shaders/lighting.glsl
index 1ed162eeac..930f4de264 100644
--- a/files/shaders/lighting.glsl
+++ b/files/shaders/lighting.glsl
@@ -1,85 +1,38 @@
 #define MAX_LIGHTS 8
 
-uniform int colorMode;
-
-const int ColorMode_None = 0;
-const int ColorMode_Emission = 1;
-const int ColorMode_AmbientAndDiffuse = 2;
-const int ColorMode_Ambient = 3;
-const int ColorMode_Diffuse = 4;
-const int ColorMode_Specular = 5;
-
-void perLight(out vec3 ambientOut, out vec3 diffuseOut, int lightIndex, vec3 viewPos, vec3 viewNormal, vec4 diffuse, vec3 ambient)
+void perLight(out vec3 ambientOut, out vec3 diffuseOut, int lightIndex, vec3 viewPos, vec3 viewNormal)
 {
-    vec3 lightDir;
-    float lightDistance;
-
-    lightDir = gl_LightSource[lightIndex].position.xyz - (viewPos.xyz * gl_LightSource[lightIndex].position.w);
-    lightDistance = length(lightDir);
+    vec3 lightDir = gl_LightSource[lightIndex].position.xyz - viewPos * gl_LightSource[lightIndex].position.w;
+    float lightDistance = length(lightDir);
     lightDir = normalize(lightDir);
     float illumination = clamp(1.0 / (gl_LightSource[lightIndex].constantAttenuation + gl_LightSource[lightIndex].linearAttenuation * lightDistance + gl_LightSource[lightIndex].quadraticAttenuation * lightDistance * lightDistance), 0.0, 1.0);
 
-    ambientOut = ambient * gl_LightSource[lightIndex].ambient.xyz * illumination;
-    diffuseOut = diffuse.xyz * gl_LightSource[lightIndex].diffuse.xyz * max(dot(viewNormal.xyz, lightDir), 0.0) * illumination;
+    ambientOut = gl_LightSource[lightIndex].ambient.xyz * illumination;
+    diffuseOut = gl_LightSource[lightIndex].diffuse.xyz * max(dot(viewNormal, lightDir), 0.0) * illumination;
 }
 
 #if PER_PIXEL_LIGHTING
-vec4 doLighting(vec3 viewPos, vec3 viewNormal, vec4 vertexColor, float shadowing)
+void doLighting(vec3 viewPos, vec3 viewNormal, float shadowing, out vec3 diffuseLight, out vec3 ambientLight)
 #else
-vec4 doLighting(vec3 viewPos, vec3 viewNormal, vec4 vertexColor, out vec3 shadowDiffuse)
+void doLighting(vec3 viewPos, vec3 viewNormal, out vec3 diffuseLight, out vec3 ambientLight, out vec3 shadowDiffuse)
 #endif
 {
-    vec4 diffuse;
-    vec3 ambient;
-    if (colorMode == ColorMode_AmbientAndDiffuse)
-    {
-        diffuse = vertexColor;
-        ambient = vertexColor.xyz;
-    }
-    else if (colorMode == ColorMode_Diffuse)
-    {
-        diffuse = vertexColor;
-        ambient = gl_FrontMaterial.ambient.xyz;
-    }
-    else if (colorMode == ColorMode_Ambient)
-    {
-        diffuse = gl_FrontMaterial.diffuse;
-        ambient = vertexColor.xyz;
-    }
-    else
-    {
-        diffuse = gl_FrontMaterial.diffuse;
-        ambient = gl_FrontMaterial.ambient.xyz;
-    }
-    vec4 lightResult = vec4(0.0, 0.0, 0.0, diffuse.a);
-
-    vec3 diffuseLight, ambientLight;
-    perLight(ambientLight, diffuseLight, 0, viewPos, viewNormal, diffuse, ambient);
+    vec3 ambientOut, diffuseOut;
+    // This light gets added a second time in the loop to fix Mesa users' slowdown, so we need to negate its contribution here.
+    perLight(ambientOut, diffuseOut, 0, viewPos, viewNormal);
 #if PER_PIXEL_LIGHTING
-    lightResult.xyz += diffuseLight * shadowing - diffuseLight; // This light gets added a second time in the loop to fix Mesa users' slowdown, so we need to negate its contribution here.
+    diffuseLight = diffuseOut * shadowing - diffuseOut;
 #else
-    shadowDiffuse = diffuseLight;
-    lightResult.xyz -= shadowDiffuse; // This light gets added a second time in the loop to fix Mesa users' slowdown, so we need to negate its contribution here.
+    shadowDiffuse = diffuseOut;
+    diffuseLight = -diffuseOut;
 #endif
+    ambientLight = gl_LightModel.ambient.xyz;
     for (int i=0; i<MAX_LIGHTS; ++i)
     {
-        perLight(ambientLight, diffuseLight, i, viewPos, viewNormal, diffuse, ambient);
-        lightResult.xyz += ambientLight + diffuseLight;
+        perLight(ambientOut, diffuseOut, i, viewPos, viewNormal);
+        ambientLight += ambientOut;
+        diffuseLight += diffuseOut;
     }
-
-    lightResult.xyz += gl_LightModel.ambient.xyz * ambient;
-
-    if (colorMode == ColorMode_Emission)
-        lightResult.xyz += vertexColor.xyz;
-    else
-        lightResult.xyz += gl_FrontMaterial.emission.xyz;
-
-#if @clamp
-    lightResult = clamp(lightResult, vec4(0.0), vec4(1.0));
-#else
-    lightResult = max(lightResult, 0.0);
-#endif
-    return lightResult;
 }
 
 
@@ -88,7 +41,7 @@ vec3 getSpecular(vec3 viewNormal, vec3 viewDirection, float shininess, vec3 matS
     vec3 lightDir = normalize(gl_LightSource[0].position.xyz);
     float NdotL = dot(viewNormal, lightDir);
     if (NdotL <= 0.0)
-        return vec3(0.,0.,0.);
+        return vec3(0.0);
     vec3 halfVec = normalize(lightDir - viewDirection);
     float NdotH = dot(viewNormal, halfVec);
     return pow(max(NdotH, 0.0), max(1e-4, shininess)) * gl_LightSource[0].specular.xyz * matSpec;
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index d5716c378b..78660685f6 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -57,13 +57,13 @@ varying float linearDepth;
 #define PER_PIXEL_LIGHTING (@normalMap || @forcePPL)
 
 #if !PER_PIXEL_LIGHTING
-centroid varying vec4 lighting;
+centroid varying vec3 passLighting;
 centroid varying vec3 shadowDiffuseLighting;
 #endif
-centroid varying vec4 passColor;
 varying vec3 passViewPos;
 varying vec3 passNormal;
 
+#include "vertexcolors.glsl"
 #include "shadows_fragment.glsl"
 #include "lighting.glsl"
 #include "parallax.glsl"
@@ -150,20 +150,27 @@ void main()
 
 #endif
 
-    float shadowing = unshadowedLightRatio(linearDepth);
+    vec4 diffuseColor = getDiffuseColor();
+    gl_FragData[0].a *= diffuseColor.a;
 
+    float shadowing = unshadowedLightRatio(linearDepth);
+    vec3 lighting;
 #if !PER_PIXEL_LIGHTING
-
-#if @clamp
-    gl_FragData[0] *= clamp(lighting + vec4(shadowDiffuseLighting * shadowing, 0), vec4(0.0), vec4(1.0));
+    lighting = passLighting + shadowDiffuseLighting * shadowing;
 #else
-    gl_FragData[0] *= lighting + vec4(shadowDiffuseLighting * shadowing, 0);
+    vec3 diffuseLight, ambientLight;
+    doLighting(passViewPos, normalize(viewNormal), shadowing, diffuseLight, ambientLight);
+    lighting = diffuseColor.xyz * diffuseLight + getAmbientColor().xyz * ambientLight + getEmissionColor().xyz;
 #endif
 
+#if @clamp
+    lighting = clamp(lighting, vec3(0.0), vec3(1.0));
 #else
-    gl_FragData[0] *= doLighting(passViewPos, normalize(viewNormal), passColor, shadowing);
+    lighting = max(lighting, 0.0);
 #endif
 
+    gl_FragData[0].xyz *= lighting;
+
 #if @envMap && !@preLightEnv
     gl_FragData[0].xyz += texture2D(envMap, envTexCoordGen).xyz * envMapColor.xyz * envLuma;
 #endif
@@ -178,11 +185,7 @@ void main()
     vec3 matSpec = specTex.xyz;
 #else
     float shininess = gl_FrontMaterial.shininess;
-    vec3 matSpec;
-    if (colorMode == ColorMode_Specular)
-        matSpec = passColor.xyz;
-    else
-        matSpec = gl_FrontMaterial.specular.xyz;
+    vec3 matSpec = getSpecularColor().xyz;
 #endif
 
     if (matSpec != vec3(0.0))
diff --git a/files/shaders/objects_vertex.glsl b/files/shaders/objects_vertex.glsl
index 40c448de99..15467933b7 100644
--- a/files/shaders/objects_vertex.glsl
+++ b/files/shaders/objects_vertex.glsl
@@ -43,13 +43,13 @@ varying float linearDepth;
 #define PER_PIXEL_LIGHTING (@normalMap || @forcePPL)
 
 #if !PER_PIXEL_LIGHTING
-centroid varying vec4 lighting;
+centroid varying vec3 passLighting;
 centroid varying vec3 shadowDiffuseLighting;
 #endif
-centroid varying vec4 passColor;
 varying vec3 passViewPos;
 varying vec3 passNormal;
 
+#include "vertexcolors.glsl"
 #include "shadows_vertex.glsl"
 
 #include "lighting.glsl"
@@ -107,13 +107,17 @@ void main(void)
     specularMapUV = (gl_TextureMatrix[@specularMapUV] * gl_MultiTexCoord@specularMapUV).xy;
 #endif
 
-#if !PER_PIXEL_LIGHTING
-    lighting = doLighting(viewPos.xyz, viewNormal, gl_Color, shadowDiffuseLighting);
-#endif
     passColor = gl_Color;
     passViewPos = viewPos.xyz;
     passNormal = gl_Normal.xyz;
 
+#if !PER_PIXEL_LIGHTING
+    vec3 diffuseLight, ambientLight;
+    doLighting(viewPos.xyz, viewNormal, diffuseLight, ambientLight, shadowDiffuseLighting);
+    passLighting = getDiffuseColor().xyz * diffuseLight + getAmbientColor().xyz * ambientLight + getEmissionColor().xyz;
+    shadowDiffuseLighting *= getDiffuseColor().xyz;
+#endif
+
 #if (@shadows_enabled)
     setupShadowCoords(viewPos, viewNormal);
 #endif
diff --git a/files/shaders/terrain_fragment.glsl b/files/shaders/terrain_fragment.glsl
index 7409ce0455..4736bb9b78 100644
--- a/files/shaders/terrain_fragment.glsl
+++ b/files/shaders/terrain_fragment.glsl
@@ -18,13 +18,13 @@ varying float linearDepth;
 #define PER_PIXEL_LIGHTING (@normalMap || @forcePPL)
 
 #if !PER_PIXEL_LIGHTING
-centroid varying vec4 lighting;
+centroid varying vec3 passLighting;
 centroid varying vec3 shadowDiffuseLighting;
 #endif
-centroid varying vec4 passColor;
 varying vec3 passViewPos;
 varying vec3 passNormal;
 
+#include "vertexcolors.glsl"
 #include "shadows_fragment.glsl"
 #include "lighting.glsl"
 #include "parallax.glsl"
@@ -68,30 +68,33 @@ void main()
     gl_FragData[0].a *= texture2D(blendMap, blendMapUV).a;
 #endif
 
-    float shadowing = unshadowedLightRatio(linearDepth);
+    vec4 diffuseColor = getDiffuseColor();
+    gl_FragData[0].a *= diffuseColor.a;
 
+    float shadowing = unshadowedLightRatio(linearDepth);
+    vec3 lighting;
 #if !PER_PIXEL_LIGHTING
-
-#if @clamp
-    gl_FragData[0] *= clamp(lighting + vec4(shadowDiffuseLighting * shadowing, 0), vec4(0.0), vec4(1.0));
+    lighting = passLighting + shadowDiffuseLighting * shadowing;
 #else
-    gl_FragData[0] *= lighting + vec4(shadowDiffuseLighting * shadowing, 0);
+    vec3 diffuseLight, ambientLight;
+    doLighting(passViewPos, normalize(viewNormal), shadowing, diffuseLight, ambientLight);
+    lighting = diffuseColor.xyz * diffuseLight + getAmbientColor().xyz * ambientLight + getEmissionColor().xyz;
 #endif
 
+#if @clamp
+    lighting = clamp(lighting, vec3(0.0), vec3(1.0));
 #else
-    gl_FragData[0] *= doLighting(passViewPos, normalize(viewNormal), passColor, shadowing);
+    lighting = max(lighting, 0.0);
 #endif
 
+    gl_FragData[0].xyz *= lighting;
+
 #if @specularMap
     float shininess = 128.0; // TODO: make configurable
     vec3 matSpec = vec3(diffuseTex.a);
 #else
     float shininess = gl_FrontMaterial.shininess;
-    vec3 matSpec;
-    if (colorMode == ColorMode_Specular)
-        matSpec = passColor.xyz;
-    else
-        matSpec = gl_FrontMaterial.specular.xyz;
+    vec3 matSpec = getSpecularColor().xyz;
 #endif
 
     if (matSpec != vec3(0.0))
diff --git a/files/shaders/terrain_vertex.glsl b/files/shaders/terrain_vertex.glsl
index bf337cf548..4b00ea525b 100644
--- a/files/shaders/terrain_vertex.glsl
+++ b/files/shaders/terrain_vertex.glsl
@@ -7,13 +7,13 @@ varying float linearDepth;
 #define PER_PIXEL_LIGHTING (@normalMap || @forcePPL)
 
 #if !PER_PIXEL_LIGHTING
-centroid varying vec4 lighting;
+centroid varying vec3 passLighting;
 centroid varying vec3 shadowDiffuseLighting;
 #endif
-centroid varying vec4 passColor;
 varying vec3 passViewPos;
 varying vec3 passNormal;
 
+#include "vertexcolors.glsl"
 #include "shadows_vertex.glsl"
 
 #include "lighting.glsl"
@@ -31,13 +31,17 @@ void main(void)
     vec3 viewNormal = normalize((gl_NormalMatrix * gl_Normal).xyz);
 #endif
 
-#if !PER_PIXEL_LIGHTING
-    lighting = doLighting(viewPos.xyz, viewNormal, gl_Color, shadowDiffuseLighting);
-#endif
     passColor = gl_Color;
     passNormal = gl_Normal.xyz;
     passViewPos = viewPos.xyz;
 
+#if !PER_PIXEL_LIGHTING
+    vec3 diffuseLight, ambientLight;
+    doLighting(viewPos.xyz, viewNormal, diffuseLight, ambientLight, shadowDiffuseLighting);
+    passLighting = getDiffuseColor().xyz * diffuseLight + getAmbientColor().xyz * ambientLight + getEmissionColor().xyz;
+    shadowDiffuseLighting *= getDiffuseColor().xyz;
+#endif
+
     uv = gl_MultiTexCoord0.xy;
 
 #if (@shadows_enabled)
diff --git a/files/shaders/vertexcolors.glsl b/files/shaders/vertexcolors.glsl
new file mode 100644
index 0000000000..38026d6acf
--- /dev/null
+++ b/files/shaders/vertexcolors.glsl
@@ -0,0 +1,38 @@
+centroid varying vec4 passColor;
+
+uniform int colorMode;
+
+const int ColorMode_None = 0;
+const int ColorMode_Emission = 1;
+const int ColorMode_AmbientAndDiffuse = 2;
+const int ColorMode_Ambient = 3;
+const int ColorMode_Diffuse = 4;
+const int ColorMode_Specular = 5;
+
+vec4 getEmissionColor()
+{
+    if (colorMode == ColorMode_Emission)
+        return passColor;
+    return gl_FrontMaterial.emission;
+}
+
+vec4 getAmbientColor()
+{
+    if (colorMode == ColorMode_AmbientAndDiffuse || colorMode == ColorMode_Ambient)
+        return passColor;
+    return gl_FrontMaterial.ambient;
+}
+
+vec4 getDiffuseColor()
+{
+    if (colorMode == ColorMode_AmbientAndDiffuse || colorMode == ColorMode_Diffuse)
+        return passColor;
+    return gl_FrontMaterial.diffuse;
+}
+
+vec4 getSpecularColor()
+{
+    if (colorMode == ColorMode_Specular)
+        return passColor;
+    return gl_FrontMaterial.specular;
+}

From f5af09aed94402dde25f9c8fc4b63ebde886ad52 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Tue, 22 Dec 2020 05:56:59 +0300
Subject: [PATCH 0130/2859] Fix AI sequence looping code (bug #5706)

---
 CHANGELOG.md                           |  1 +
 apps/openmw/mwmechanics/aisequence.cpp | 13 ++++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d896ca55cb..fc6eb2d282 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -72,6 +72,7 @@
     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 #5731: Editor: skirts are invisible on characters
     Feature #390: 3rd person look "over the shoulder"
     Feature #1536: Show more information about level on menu
diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index 57d32898cc..575a03434f 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -403,7 +403,7 @@ const AiPackage& MWMechanics::AiSequence::getActivePackage()
 void AiSequence::fill(const ESM::AIPackageList &list)
 {
     // If there is more than one package in the list, enable repeating
-    if (!list.mList.empty() && list.mList.begin() != (list.mList.end()-1))
+    if (list.mList.size() >= 2)
         mRepeat = true;
 
     for (const auto& esmPackage : list.mList)
@@ -459,8 +459,15 @@ void AiSequence::readState(const ESM::AiSequence::AiSequence &sequence)
     int count = 0;
     for (auto& container : sequence.mPackages)
     {
-        if (isActualAiPackage(static_cast<AiPackageTypeId>(container.mType)))
-            count++;
+        switch (container.mType)
+        {
+            case ESM::AiSequence::Ai_Wander:
+            case ESM::AiSequence::Ai_Travel:
+            case ESM::AiSequence::Ai_Escort:
+            case ESM::AiSequence::Ai_Follow:
+            case ESM::AiSequence::Ai_Activate:
+                ++count;
+        }
     }
 
     if (count > 1)

From 218597b13d5c45df2d5928dec91dc78a8c4b958b Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Tue, 22 Dec 2020 06:13:35 +0300
Subject: [PATCH 0131/2859] Fix paralyze for levitating actors

---
 apps/openmw/mwworld/worldimp.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index b3a9dbb022..2ac6cca796 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -2302,8 +2302,12 @@ namespace MWWorld
         if (stats.isDead())
             return false;
 
+        const bool isPlayer = ptr == getPlayerConstPtr();
+        if (!(isPlayer && mGodMode) && stats.isParalyzed())
+            return false;
+
         if (ptr.getClass().canFly(ptr))
-            return !stats.isParalyzed();
+            return true;
 
         if(stats.getMagicEffects().get(ESM::MagicEffect::Levitate).getMagnitude() > 0
                 && isLevitationEnabled())

From 22476281da55ea908ae60d1072c6e6e0fd50d9f4 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Tue, 22 Dec 2020 06:19:18 +0300
Subject: [PATCH 0132/2859] Fix paralyze for swimming actors

---
 apps/openmw/mwbase/world.hpp             |  2 +-
 apps/openmw/mwmechanics/character.cpp    | 10 ++++++++--
 apps/openmw/mwphysics/movementsolver.cpp |  5 +++--
 apps/openmw/mwphysics/physicssystem.cpp  |  4 +++-
 apps/openmw/mwphysics/physicssystem.hpp  |  2 +-
 apps/openmw/mwworld/worldimp.cpp         |  2 +-
 apps/openmw/mwworld/worldimp.hpp         |  2 +-
 7 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 619bbbdf5e..958fcfb0ea 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -519,7 +519,7 @@ namespace MWBase
             /// Returns true if levitation spell effect is allowed.
             virtual bool isLevitationEnabled() const = 0;
 
-            virtual bool getGodModeState() = 0;
+            virtual bool getGodModeState() const = 0;
 
             virtual bool toggleGodMode() = 0;
 
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 9b3c8576ea..1784869651 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -2439,8 +2439,14 @@ void CharacterController::update(float duration, bool animationOnly)
         }
     }
 
-    if (mFloatToSurface && cls.isActor() && cls.getCreatureStats(mPtr).isDead() && cls.canSwim(mPtr))
-        moved.z() = 1.0;
+    if (mFloatToSurface && cls.isActor() && cls.canSwim(mPtr))
+    {
+        if (cls.getCreatureStats(mPtr).isDead()
+            || (!godmode && cls.getCreatureStats(mPtr).isParalyzed()))
+        {
+            moved.z() = 1.0;
+        }
+    }    
 
     // Update movement
     if(!animationOnly && mMovementAnimationControlled && mPtr.getClass().isActor())
diff --git a/apps/openmw/mwphysics/movementsolver.cpp b/apps/openmw/mwphysics/movementsolver.cpp
index e55ec9166c..1feaf3c94e 100644
--- a/apps/openmw/mwphysics/movementsolver.cpp
+++ b/apps/openmw/mwphysics/movementsolver.cpp
@@ -130,8 +130,9 @@ namespace MWPhysics
                 velocity = velocity + inertia;
         }
 
-        // dead actors underwater will float to the surface, if the CharacterController tells us to do so
-        if (actor.mMovement.z() > 0 && actor.mIsDead && actor.mPosition.z() < swimlevel)
+        // Dead and paralyzed actors underwater will float to the surface,
+        // if the CharacterController tells us to do so
+        if (actor.mMovement.z() > 0 && actor.mFloatToSurface && actor.mPosition.z() < swimlevel)
             velocity = osg::Vec3f(0,0,1) * 25;
 
         if (actor.mWantJump)
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 0b3cdbff50..cc4d6bba8c 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -922,7 +922,9 @@ namespace MWPhysics
         mFlying = world->isFlying(ptr);
         mSwimming = world->isSwimming(ptr);
         mWantJump = ptr.getClass().getMovementSettings(ptr).mPosition[2] != 0;
-        mIsDead = ptr.getClass().getCreatureStats(ptr).isDead();
+        auto& stats = ptr.getClass().getCreatureStats(ptr);
+        const bool godmode = ptr == world->getPlayerConstPtr() && world->getGodModeState();
+        mFloatToSurface = stats.isDead() || (!godmode && stats.isParalyzed());
         mWasOnGround = actor->getOnGround();
     }
 
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 9ebd587f51..2de8d153b9 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -88,7 +88,7 @@ namespace MWPhysics
         bool mWasOnGround;
         bool mWantJump;
         bool mDidJump;
-        bool mIsDead;
+        bool mFloatToSurface;
         bool mNeedLand;
         bool mMoveToWaterSurface;
         float mWaterlevel;
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 2ac6cca796..8b95ee1221 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -2917,7 +2917,7 @@ namespace MWWorld
         mRendering->rebuildPtr(getPlayerPtr());
     }
 
-    bool World::getGodModeState()
+    bool World::getGodModeState() const
     {
         return mGodMode;
     }
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 75717b16b2..9f05014133 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -619,7 +619,7 @@ namespace MWWorld
             /// Returns true if levitation spell effect is allowed.
             bool isLevitationEnabled() const override;
 
-            bool getGodModeState() override;
+            bool getGodModeState() const override;
 
             bool toggleGodMode() override;
 

From eaa65ec60a39029b816b893d8e367e67fdfbce11 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Tue, 22 Dec 2020 06:20:26 +0300
Subject: [PATCH 0133/2859] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d896ca55cb..a132a85bea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -73,6 +73,7 @@
     Bug #5695: ExplodeSpell for actors doesn't target the ground
     Bug #5703: OpenMW-CS menu system crashing on XFCE
     Bug #5731: Editor: skirts are invisible on characters
+    Bug #5758: Paralyzed actors behavior is inconsistent with vanilla
     Feature #390: 3rd person look "over the shoulder"
     Feature #1536: Show more information about level on menu
     Feature #2386: Distant Statics in the form of Object Paging

From f6ab2cd4a4df76cc6e58c0362a5f053175ced372 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Tue, 22 Dec 2020 14:34:09 +0400
Subject: [PATCH 0134/2859] Update info about font-related settings

---
 docs/source/reference/modding/font.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/reference/modding/font.rst b/docs/source/reference/modding/font.rst
index fa89b33ea6..3778ac5ed2 100644
--- a/docs/source/reference/modding/font.rst
+++ b/docs/source/reference/modding/font.rst
@@ -26,7 +26,7 @@ Now Fonts folder should include ``openmw_font.xml`` file and three ``.ttf`` file
 
 If desired, you can now delete the ``Data Files/Fonts`` directory.
 
-It is also possible to adjust the font size and resolution::
+It is also possible to adjust the font size and resolution via ``settings.cfg`` file::
 
 			[GUI]
 			font size = 16

From 32cc14981eb4fafcb1396edf62d83aa6da0aaf02 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Tue, 22 Dec 2020 20:40:52 +0300
Subject: [PATCH 0135/2859] Don't move characters if their animation can't move
 them

---
 apps/openmw/mwmechanics/character.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 1784869651..1eb58f4d30 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -2423,7 +2423,7 @@ void CharacterController::update(float duration, bool animationOnly)
     moved.y() *= scale;
 
     // Ensure we're moving in generally the right direction...
-    if(speed > 0.f)
+    if (speed > 0.f && moved != osg::Vec3f())
     {
         float l = moved.length();
         if (std::abs(movement.x() - moved.x()) > std::abs(moved.x()) / 2 ||

From a36ed5f129ff4cb008c29413d1683da4fac59e9a Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Wed, 23 Dec 2020 00:23:49 +0000
Subject: [PATCH 0136/2859] Optimise out redundant call

We already had the results
---
 components/sceneutil/shadowsbin.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/sceneutil/shadowsbin.cpp b/components/sceneutil/shadowsbin.cpp
index 8b5c788dd0..a2424fe363 100644
--- a/components/sceneutil/shadowsbin.cpp
+++ b/components/sceneutil/shadowsbin.cpp
@@ -27,9 +27,9 @@ namespace
         osg::StateSet::ModeList::const_iterator mf = l.find(mode);
         if (mf == l.end())
             return;
-        int flags = mf->second;
+        unsigned int flags = mf->second;
         bool newValue = flags & osg::StateAttribute::ON;
-        accumulateState(currentValue, newValue, isOverride, ss->getMode(mode));
+        accumulateState(currentValue, newValue, isOverride, flags);
     }
 
     inline bool materialNeedShadows(osg::Material* m)

From fd77ef6b0113a30997cc594d1ef3440ad4daad91 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Wed, 23 Dec 2020 03:33:34 +0300
Subject: [PATCH 0137/2859] Only ignore plain text after the last EOL tag
 (#5627)

---
 CHANGELOG.md                     |  1 +
 apps/openmw/mwgui/formatting.cpp | 23 ++++++++++++++---------
 apps/openmw/mwgui/formatting.hpp |  2 ++
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b75a179b1d..e557c7bcb2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -63,6 +63,7 @@
     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 #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
diff --git a/apps/openmw/mwgui/formatting.cpp b/apps/openmw/mwgui/formatting.cpp
index 75bf8a3426..156dc5b0d6 100644
--- a/apps/openmw/mwgui/formatting.cpp
+++ b/apps/openmw/mwgui/formatting.cpp
@@ -30,14 +30,18 @@ namespace MWGui
 
             // vanilla game does not show any text after the last EOL tag.
             const std::string lowerText = Misc::StringUtils::lowerCase(mText);
-            int brIndex = lowerText.rfind("<br>");
-            int pIndex = lowerText.rfind("<p>");
-            if (brIndex == pIndex)
-                mText = "";
-            else if (brIndex > pIndex)
-                mText = mText.substr(0, brIndex+4);
-            else
-                mText = mText.substr(0, pIndex+3);
+            size_t brIndex = lowerText.rfind("<br>");
+            size_t pIndex = lowerText.rfind("<p>");
+            mPlainTextEnd = 0;
+            if (brIndex != pIndex)
+            {
+                if (brIndex != std::string::npos && pIndex != std::string::npos)
+                    mPlainTextEnd = std::max(brIndex, pIndex);
+                else if (brIndex != std::string::npos)
+                    mPlainTextEnd = brIndex;
+                else
+                    mPlainTextEnd = pIndex;
+            }
 
             registerTag("br", Event_BrTag);
             registerTag("p", Event_PTag);
@@ -103,7 +107,8 @@ namespace MWGui
                 {
                     if (!mIgnoreLineEndings || ch != '\n')
                     {
-                        mBuffer.push_back(ch);
+                        if (mIndex < mPlainTextEnd)
+                            mBuffer.push_back(ch);
                         mIgnoreLineEndings = false;
                         mIgnoreNewlineTags = false;
                     }
diff --git a/apps/openmw/mwgui/formatting.hpp b/apps/openmw/mwgui/formatting.hpp
index d563514148..12a3d46caa 100644
--- a/apps/openmw/mwgui/formatting.hpp
+++ b/apps/openmw/mwgui/formatting.hpp
@@ -73,6 +73,8 @@ namespace MWGui
                 bool mClosingTag;
                 std::map<std::string, Events> mTagTypes;
                 std::string mBuffer;
+
+                size_t mPlainTextEnd;
         };
 
         class Paginator

From 11b4af49ce2166057c68994bf8258a253e504137 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Wed, 23 Dec 2020 01:24:15 +0000
Subject: [PATCH 0138/2859] Allow shadowsbin to optimise clockwise-wound meshes
 when face culling is off

---
 components/sceneutil/mwshadowtechnique.cpp |  6 +++++
 components/sceneutil/shadowsbin.cpp        | 31 +++++++++++++++++-----
 components/sceneutil/shadowsbin.hpp        |  2 +-
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
index 39e47b0ea3..cfc94ba863 100644
--- a/components/sceneutil/mwshadowtechnique.cpp
+++ b/components/sceneutil/mwshadowtechnique.cpp
@@ -870,7 +870,10 @@ void SceneUtil::MWShadowTechnique::enableFrontFaceCulling()
     _useFrontFaceCulling = true;
 
     if (_shadowCastingStateSet)
+    {
         _shadowCastingStateSet->setAttribute(new osg::CullFace(osg::CullFace::FRONT), osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+        _shadowCastingStateSet->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
+    }
 }
 
 void SceneUtil::MWShadowTechnique::disableFrontFaceCulling()
@@ -878,7 +881,10 @@ void SceneUtil::MWShadowTechnique::disableFrontFaceCulling()
     _useFrontFaceCulling = false;
 
     if (_shadowCastingStateSet)
+    {
+        _shadowCastingStateSet->removeAttribute(osg::StateAttribute::CULLFACE);
         _shadowCastingStateSet->setMode(GL_CULL_FACE, osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE);
+    }
 }
 
 void SceneUtil::MWShadowTechnique::setupCastingShader(Shader::ShaderManager & shaderManager)
diff --git a/components/sceneutil/shadowsbin.cpp b/components/sceneutil/shadowsbin.cpp
index a2424fe363..26cbd58c31 100644
--- a/components/sceneutil/shadowsbin.cpp
+++ b/components/sceneutil/shadowsbin.cpp
@@ -63,7 +63,7 @@ ShadowsBin::ShadowsBin()
     }
 }
 
-StateGraph* ShadowsBin::cullStateGraph(StateGraph* sg, StateGraph* root, std::unordered_set<StateGraph*>& uninterestingCache)
+StateGraph* ShadowsBin::cullStateGraph(StateGraph* sg, StateGraph* root, std::unordered_set<StateGraph*>& uninterestingCache, bool cullFaceOverridden)
 {
     std::vector<StateGraph*> return_path;
     State state;
@@ -102,10 +102,13 @@ StateGraph* ShadowsBin::cullStateGraph(StateGraph* sg, StateGraph* root, std::un
             accumulateState(state.mAlphaFunc, static_cast<osg::AlphaFunc*>(rap.first.get()), state.mAlphaFuncOverride, rap.second);
         }
 
-        // osg::FrontFace specifies triangle winding, not front-face culling. We can't safely reparent anything under it.
-        found = attributes.find(std::make_pair(osg::StateAttribute::FRONTFACE, 0));
-        if (found != attributes.end())
-            state.mImportantState = true;
+        if (!cullFaceOverridden)
+        {
+            // osg::FrontFace specifies triangle winding, not front-face culling. We can't safely reparent anything under it unless GL_CULL_FACE is off or we flip face culling.
+            found = attributes.find(std::make_pair(osg::StateAttribute::FRONTFACE, 0));
+            if (found != attributes.end())
+                state.mImportantState = true;
+        }
 
         if ((*itr) != sg && !state.interesting())
             uninterestingCache.insert(*itr);
@@ -188,7 +191,21 @@ void ShadowsBin::sortImplementation()
             return;
     }
     StateGraph* noTestRoot = root->find_or_insert(mNoTestStateSet.get());
-    // root is now a stategraph with useDiffuseMapForShadowAlpha disabled but minimal other state
+    // noTestRoot is now a stategraph with useDiffuseMapForShadowAlpha disabled but minimal other state
+
+    bool cullFaceOverridden = false;
+    while (root = root->_parent)
+    {
+        if (!root->getStateSet())
+            continue;
+        unsigned int cullFaceFlags = root->getStateSet()->getMode(GL_CULL_FACE);
+        if (cullFaceFlags & osg::StateAttribute::OVERRIDE && !(cullFaceFlags & osg::StateAttribute::ON))
+        {
+            cullFaceOverridden = true;
+            break;
+        }
+    }
+
     noTestRoot->_leaves.reserve(_stateGraphList.size());
     StateGraphList newList;
     std::unordered_set<StateGraph*> uninterestingCache;
@@ -197,7 +214,7 @@ void ShadowsBin::sortImplementation()
         // Render leaves which shouldn't use the diffuse map for shadow alpha but do cast shadows become children of root, so graph is now empty. Don't add to newList.
         // Graphs containing just render leaves which don't cast shadows are discarded. Don't add to newList.
         // Graphs containing other leaves need to be in newList.
-        StateGraph* graphToAdd = cullStateGraph(graph, noTestRoot, uninterestingCache);
+        StateGraph* graphToAdd = cullStateGraph(graph, noTestRoot, uninterestingCache, cullFaceOverridden);
         if (graphToAdd)
             newList.push_back(graphToAdd);
     }
diff --git a/components/sceneutil/shadowsbin.hpp b/components/sceneutil/shadowsbin.hpp
index d8bdd86071..1c63caf4bb 100644
--- a/components/sceneutil/shadowsbin.hpp
+++ b/components/sceneutil/shadowsbin.hpp
@@ -63,7 +63,7 @@ namespace SceneUtil
             }
         };
 
-        osgUtil::StateGraph* cullStateGraph(osgUtil::StateGraph* sg, osgUtil::StateGraph* root, std::unordered_set<osgUtil::StateGraph*>& uninteresting);
+        osgUtil::StateGraph* cullStateGraph(osgUtil::StateGraph* sg, osgUtil::StateGraph* root, std::unordered_set<osgUtil::StateGraph*>& uninteresting, bool cullFaceOverridden);
 
         static void addPrototype(const std::string& name, const std::array<osg::ref_ptr<osg::Program>, GL_ALWAYS - GL_NEVER + 1>& castingPrograms);
     };

From 8c3a786e5408cc8d2e857afc02ff1590c0ca8ef9 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Thu, 24 Dec 2020 00:32:15 +0000
Subject: [PATCH 0139/2859] Unconditionally disable alpha testing when shaders
 are used

---
 components/shader/shadervisitor.cpp | 45 +++++++++++++++--------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index aeec391c67..7db9933169 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -374,39 +374,40 @@ namespace Shader
         writableStateSet->addUniform(new osg::Uniform("colorMode", reqs.mColorMode));
 
         defineMap["alphaFunc"] = std::to_string(reqs.mAlphaFunc);
+
+        // back up removed state in case recreateShaders gets rid of the shader later
+        osg::ref_ptr<osg::StateSet> removedState;
+        if ((removedState = getRemovedState(*writableStateSet)) && !mAllowedToModifyStateSets)
+            removedState = new osg::StateSet(*removedState, osg::CopyOp::SHALLOW_COPY);
+        if (!removedState)
+            removedState = new osg::StateSet();
+
         if (reqs.mAlphaFunc != osg::AlphaFunc::ALWAYS)
         {
             writableStateSet->addUniform(new osg::Uniform("alphaRef", reqs.mAlphaRef));
 
-            // back up removed state in case recreateShaders gets rid of the shader later
-            osg::ref_ptr<osg::StateSet> removedState;
-            if ((removedState = getRemovedState(*writableStateSet)) && !mAllowedToModifyStateSets)
-                removedState = new osg::StateSet(*removedState, osg::CopyOp::SHALLOW_COPY);
-            if (!removedState)
-                removedState = new osg::StateSet();
-
-            if (writableStateSet->getMode(GL_ALPHA_TEST) != osg::StateAttribute::INHERIT)
-                removedState->setMode(GL_ALPHA_TEST, writableStateSet->getMode(GL_ALPHA_TEST));
-            // This disables the deprecated fixed-function alpha test
-            writableStateSet->setMode(GL_ALPHA_TEST, osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED);
-
             const auto* alphaFunc = writableStateSet->getAttributePair(osg::StateAttribute::ALPHAFUNC);
             if (alphaFunc)
                 removedState->setAttribute(alphaFunc->first, alphaFunc->second);
             // This prevents redundant glAlphaFunc calls while letting the shadows bin still see the test
             writableStateSet->setAttribute(RemovedAlphaFunc::getInstance(reqs.mAlphaFunc), osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+        }
 
-            if (!removedState->getModeList().empty() || !removedState->getAttributeList().empty())
-            {
-                // user data is normally shallow copied so shared with the original stateset
-                osg::ref_ptr<osg::UserDataContainer> writableUserData;
-                if (mAllowedToModifyStateSets)
-                    writableUserData = writableStateSet->getOrCreateUserDataContainer();
-                else
-                    writableUserData = getWritableUserDataContainer(*writableStateSet);
+        if (writableStateSet->getMode(GL_ALPHA_TEST) != osg::StateAttribute::INHERIT)
+            removedState->setMode(GL_ALPHA_TEST, writableStateSet->getMode(GL_ALPHA_TEST));
+        // This disables the deprecated fixed-function alpha test
+        writableStateSet->setMode(GL_ALPHA_TEST, osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED);
 
-                updateRemovedState(*writableUserData, removedState);
-            }
+        if (!removedState->getModeList().empty() || !removedState->getAttributeList().empty())
+        {
+            // user data is normally shallow copied so shared with the original stateset
+            osg::ref_ptr<osg::UserDataContainer> writableUserData;
+            if (mAllowedToModifyStateSets)
+                writableUserData = writableStateSet->getOrCreateUserDataContainer();
+            else
+                writableUserData = getWritableUserDataContainer(*writableStateSet);
+
+            updateRemovedState(*writableUserData, removedState);
         }
 
         osg::ref_ptr<osg::Shader> vertexShader (mShaderManager.getShader(mDefaultVsTemplate, defineMap, osg::Shader::VERTEX));

From 51d63a4152509b2fb0924cbb2185952f71d8eed1 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Thu, 24 Dec 2020 03:39:59 +0100
Subject: [PATCH 0140/2859] Fix minor bug: mSmoothedSpeed is not updating in
 first person mode, that leads to an incorrect value after switching to first
 person mode and back.

Additional refactoring: move `setSideMovementAngle` from camera.cpp to character.cpp as this logic shouldn't belong to Camera.
---
 apps/openmw/mwmechanics/character.cpp | 9 +++++++--
 apps/openmw/mwrender/camera.cpp       | 3 ---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 1784869651..8d27d78ef6 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -1965,7 +1965,7 @@ void CharacterController::update(float duration, bool animationOnly)
             movementSettings.mSpeedFactor *= 2.f;
 
         static const bool smoothMovement = Settings::Manager::getBool("smooth movement", "Game");
-        if (smoothMovement && !isFirstPersonPlayer)
+        if (smoothMovement)
         {
             static const float playerTurningCoef = 1.0 / std::max(0.01f, Settings::Manager::getFloat("smooth movement player turning delay", "Game"));
             float angle = mPtr.getRefData().getPosition().rot[2];
@@ -1975,7 +1975,9 @@ void CharacterController::update(float duration, bool animationOnly)
             float deltaLen = delta.length();
 
             float maxDelta;
-            if (std::abs(speedDelta) < deltaLen / 2)
+            if (isFirstPersonPlayer)
+                maxDelta = 1;
+            else if (std::abs(speedDelta) < deltaLen / 2)
                 // Turning is smooth for player and less smooth for NPCs (otherwise NPC can miss a path point).
                 maxDelta = duration * (isPlayer ? playerTurningCoef : 6.f);
             else if (isPlayer && speedDelta < -deltaLen / 2)
@@ -2013,7 +2015,10 @@ void CharacterController::update(float duration, bool animationOnly)
         bool canMove = cls.getMaxSpeed(mPtr) > 0;
         static const bool turnToMovementDirection = Settings::Manager::getBool("turn to movement direction", "Game");
         if (!turnToMovementDirection || isFirstPersonPlayer)
+        {
             movementSettings.mIsStrafing = std::abs(vec.x()) > std::abs(vec.y()) * 2;
+            stats.setSideMovementAngle(0);
+        }
         else if (canMove)
         {
             float targetMovementAngle = vec.y() >= 0 ? std::atan2(-vec.x(), vec.y()) : std::atan2(vec.x(), -vec.y());
diff --git a/apps/openmw/mwrender/camera.cpp b/apps/openmw/mwrender/camera.cpp
index b964eacffb..12e6ef3ce9 100644
--- a/apps/openmw/mwrender/camera.cpp
+++ b/apps/openmw/mwrender/camera.cpp
@@ -356,9 +356,6 @@ namespace MWRender
         else
             mViewModeToggleQueued = false;
 
-        if (mTrackingPtr.getClass().isActor())
-            mTrackingPtr.getClass().getCreatureStats(mTrackingPtr).setSideMovementAngle(0);
-
         mFirstPersonView = !mFirstPersonView;
         updateStandingPreviewMode();
         instantTransition();

From 8b3088a9e5e33acf3e6ae123e91e9d91269b4dae Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Thu, 24 Dec 2020 03:00:09 +0100
Subject: [PATCH 0141/2859] Fix #5743

---
 apps/openmw/mwmechanics/character.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 1784869651..483492034d 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -2265,18 +2265,19 @@ void CharacterController::update(float duration, bool animationOnly)
                 sndMgr->playSound3D(mPtr, sound, 1.f, 1.f, MWSound::Type::Foot, MWSound::PlayMode::NoPlayerLocal);
         }
 
-        if (turnToMovementDirection)
+        if (turnToMovementDirection && !isFirstPersonPlayer &&
+            (movestate == CharState_SwimRunForward || movestate == CharState_SwimWalkForward ||
+             movestate == CharState_SwimRunBack || movestate == CharState_SwimWalkBack))
         {
-            float targetSwimmingPitch;
-            if (inwater && vec.y() != 0 && !isFirstPersonPlayer && !movementSettings.mIsStrafing)
-                targetSwimmingPitch = -mPtr.getRefData().getPosition().rot[0];
-            else
-                targetSwimmingPitch = 0;
-            float maxSwimPitchDelta = 3.0f * duration;
             float swimmingPitch = mAnimation->getBodyPitchRadians();
+            float targetSwimmingPitch = -mPtr.getRefData().getPosition().rot[0];
+            float maxSwimPitchDelta = 3.0f * duration;
             swimmingPitch += osg::clampBetween(targetSwimmingPitch - swimmingPitch, -maxSwimPitchDelta, maxSwimPitchDelta);
             mAnimation->setBodyPitchRadians(swimmingPitch);
         }
+        else
+            mAnimation->setBodyPitchRadians(0);
+
         static const bool swimUpwardCorrection = Settings::Manager::getBool("swim upward correction", "Game");
         if (inwater && isPlayer && !isFirstPersonPlayer && swimUpwardCorrection)
         {

From bdcbb412a5b8bda4e3fbf59e84b19459c60b5333 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Fri, 25 Dec 2020 13:03:09 +0100
Subject: [PATCH 0142/2859] Don't restore focus to hidden/unrelated buttons

---
 apps/openmw/mwgui/keyboardnavigation.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/keyboardnavigation.cpp b/apps/openmw/mwgui/keyboardnavigation.cpp
index 6dd66029b8..b65cd98081 100644
--- a/apps/openmw/mwgui/keyboardnavigation.cpp
+++ b/apps/openmw/mwgui/keyboardnavigation.cpp
@@ -67,7 +67,7 @@ void KeyboardNavigation::saveFocus(int mode)
     {
         mKeyFocus[mode] = focus;
     }
-    else
+    else if(shouldAcceptKeyFocus(mCurrentFocus))
     {
         mKeyFocus[mode] = mCurrentFocus;
     }

From 1f1755ae48537b2b3b5f2bde712bba3163421fbc Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Fri, 25 Dec 2020 13:05:41 +0100
Subject: [PATCH 0143/2859] Add version checks

---
 apps/openmw/mwgui/keyboardnavigation.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwgui/keyboardnavigation.cpp b/apps/openmw/mwgui/keyboardnavigation.cpp
index b65cd98081..b718b712c0 100644
--- a/apps/openmw/mwgui/keyboardnavigation.cpp
+++ b/apps/openmw/mwgui/keyboardnavigation.cpp
@@ -93,6 +93,7 @@ void KeyboardNavigation::_unlinkWidget(MyGUI::Widget *widget)
         mCurrentFocus = nullptr;
 }
 
+#if MYGUI_VERSION < MYGUI_DEFINE_VERSION(3,2,3)
 void styleFocusedButton(MyGUI::Widget* w)
 {
     if (w)
@@ -103,6 +104,7 @@ void styleFocusedButton(MyGUI::Widget* w)
         }
     }
 }
+#endif
 
 bool isRootParent(MyGUI::Widget* widget, MyGUI::Widget* root)
 {
@@ -126,7 +128,9 @@ void KeyboardNavigation::onFrame()
 
     if (focus == mCurrentFocus)
     {
+#if MYGUI_VERSION < MYGUI_DEFINE_VERSION(3,2,3)
         styleFocusedButton(mCurrentFocus);
+#endif
         return;
     }
 
@@ -137,19 +141,21 @@ void KeyboardNavigation::onFrame()
         focus = mCurrentFocus;
     }
 
-    // style highlighted button (won't be needed for MyGUI 3.2.3)
     if (focus != mCurrentFocus)
     {
+#if MYGUI_VERSION < MYGUI_DEFINE_VERSION(3,2,3)
         if (mCurrentFocus)
         {
             if (MyGUI::Button* b = mCurrentFocus->castType<MyGUI::Button>(false))
                 b->_setWidgetState("normal");
         }
-
+#endif
         mCurrentFocus = focus;
     }
 
+#if MYGUI_VERSION < MYGUI_DEFINE_VERSION(3,2,3)
     styleFocusedButton(mCurrentFocus);
+#endif
 }
 
 void KeyboardNavigation::setDefaultFocus(MyGUI::Widget *window, MyGUI::Widget *defaultFocus)

From d2a28d915a31bec236abaf6207b8199bb8d3ca88 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Fri, 25 Dec 2020 15:58:11 +0100
Subject: [PATCH 0144/2859] Don't consider a path completed unless we're close

---
 apps/openmw/mwmechanics/aipackage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index 4bffd28baa..8880820dd0 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -158,7 +158,7 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
         zTurn(actor, getZAngleToPoint(position, dest));
         smoothTurn(actor, getXAngleToPoint(position, dest), 0);
         world->removeActorPath(actor);
-        return true;
+        return isDestReached;
     }
 
     world->updateActorPath(actor, mPathFinder.getPath(), halfExtents, position, dest);

From 7cac7fa87052e9e14a2e2ec3b5fb489a4820cdbb Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Fri, 25 Dec 2020 23:57:01 +0100
Subject: [PATCH 0145/2859] Make followers keep a distance dependant on the
 fattest party member

---
 apps/openmw/mwbase/mechanicsmanager.hpp       |  1 +
 apps/openmw/mwmechanics/actors.cpp            | 97 +++++++++++--------
 apps/openmw/mwmechanics/actors.hpp            |  1 +
 apps/openmw/mwmechanics/aifollow.cpp          | 27 +++---
 .../mwmechanics/mechanicsmanagerimp.cpp       |  5 +
 .../mwmechanics/mechanicsmanagerimp.hpp       |  1 +
 6 files changed, 78 insertions(+), 54 deletions(-)

diff --git a/apps/openmw/mwbase/mechanicsmanager.hpp b/apps/openmw/mwbase/mechanicsmanager.hpp
index b6ce4d0619..967504552d 100644
--- a/apps/openmw/mwbase/mechanicsmanager.hpp
+++ b/apps/openmw/mwbase/mechanicsmanager.hpp
@@ -199,6 +199,7 @@ namespace MWBase
             virtual std::list<MWWorld::Ptr> getActorsSidingWith(const MWWorld::Ptr& actor) = 0;
             virtual std::list<MWWorld::Ptr> getActorsFollowing(const MWWorld::Ptr& actor) = 0;
             virtual std::list<int> getActorsFollowingIndices(const MWWorld::Ptr& actor) = 0;
+            virtual std::map<int, MWWorld::Ptr> getActorsFollowingByIndex(const MWWorld::Ptr& actor) = 0;
 
             ///Returns a list of actors who are fighting the given actor within the fAlarmDistance
             /** ie AiCombat is active and the target is the actor **/
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 047741baca..88c402b14c 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -142,6 +142,29 @@ void getRestorationPerHourOfSleep (const MWWorld::Ptr& ptr, float& health, float
     magicka = fRestMagicMult * stats.getAttribute(ESM::Attribute::Intelligence).getModified();
 }
 
+template<class T>
+void forEachFollowingPackage(MWMechanics::Actors::PtrActorMap& actors, const MWWorld::Ptr& actor, const MWWorld::Ptr& player, T&& func)
+{
+    for(auto& iter : actors)
+    {
+        const MWWorld::Ptr &iteratedActor = iter.first;
+        if (iteratedActor == player || iteratedActor == actor)
+            continue;
+
+        const MWMechanics::CreatureStats &stats = iteratedActor.getClass().getCreatureStats(iteratedActor);
+        if (stats.isDead())
+            continue;
+
+        // An actor counts as following if AiFollow is the current AiPackage,
+        // or there are only Combat and Wander packages before the AiFollow package
+        for (const auto& package : stats.getAiSequence())
+        {
+            if(!func(iter, package))
+                break;
+        }
+    }
+}
+
 }
 
 namespace MWMechanics
@@ -2512,26 +2535,14 @@ namespace MWMechanics
     std::list<MWWorld::Ptr> Actors::getActorsFollowing(const MWWorld::Ptr& actor)
     {
         std::list<MWWorld::Ptr> list;
-        for(PtrActorMap::iterator iter(mActors.begin());iter != mActors.end();++iter)
-        {
-            const MWWorld::Ptr &iteratedActor = iter->first;
-            if (iteratedActor == getPlayer() || iteratedActor == actor)
-                continue;
-
-            const CreatureStats &stats = iteratedActor.getClass().getCreatureStats(iteratedActor);
-            if (stats.isDead())
-                continue;
-
-            // An actor counts as following if AiFollow is the current AiPackage,
-            // or there are only Combat and Wander packages before the AiFollow package
-            for (const auto& package : stats.getAiSequence())
-            {
-                if (package->followTargetThroughDoors() && package->getTarget() == actor)
-                    list.push_back(iteratedActor);
-                else if (package->getTypeId() != AiPackageTypeId::Combat && package->getTypeId() != AiPackageTypeId::Wander)
-                    break;
-            }
-        }
+        forEachFollowingPackage(mActors, actor, getPlayer(), [&] (auto& iter, const std::unique_ptr<AiPackage>& package)
+        {
+            if (package->followTargetThroughDoors() && package->getTarget() == actor)
+                list.push_back(iter.first);
+            else if (package->getTypeId() != AiPackageTypeId::Combat && package->getTypeId() != AiPackageTypeId::Wander)
+                return false;
+            return true;
+        });
         return list;
     }
 
@@ -2575,32 +2586,38 @@ namespace MWMechanics
     std::list<int> Actors::getActorsFollowingIndices(const MWWorld::Ptr &actor)
     {
         std::list<int> list;
-        for(PtrActorMap::iterator iter(mActors.begin());iter != mActors.end();++iter)
+        forEachFollowingPackage(mActors, actor, getPlayer(), [&] (auto& iter, const std::unique_ptr<AiPackage>& package)
         {
-            const MWWorld::Ptr &iteratedActor = iter->first;
-            if (iteratedActor == getPlayer() || iteratedActor == actor)
-                continue;
-
-            const CreatureStats &stats = iteratedActor.getClass().getCreatureStats(iteratedActor);
-            if (stats.isDead())
-                continue;
-
-            // An actor counts as following if AiFollow is the current AiPackage,
-            // or there are only Combat and Wander packages before the AiFollow package
-            for (const auto& package : stats.getAiSequence())
+            if (package->followTargetThroughDoors() && package->getTarget() == actor)
             {
-                if (package->followTargetThroughDoors() && package->getTarget() == actor)
-                {
-                    list.push_back(static_cast<const AiFollow*>(package.get())->getFollowIndex());
-                    break;
-                }
-                else if (package->getTypeId() != AiPackageTypeId::Combat && package->getTypeId() != AiPackageTypeId::Wander)
-                    break;
+                list.push_back(static_cast<const AiFollow*>(package.get())->getFollowIndex());
+                return false;
             }
-        }
+            else if (package->getTypeId() != AiPackageTypeId::Combat && package->getTypeId() != AiPackageTypeId::Wander)
+                return false;
+            return true;
+        });
         return list;
     }
 
+    std::map<int, MWWorld::Ptr> Actors::getActorsFollowingByIndex(const MWWorld::Ptr &actor)
+    {
+        std::map<int, MWWorld::Ptr> map;
+        forEachFollowingPackage(mActors, actor, getPlayer(), [&] (auto& iter, const std::unique_ptr<AiPackage>& package)
+        {
+            if (package->followTargetThroughDoors() && package->getTarget() == actor)
+            {
+                int index = static_cast<const AiFollow*>(package.get())->getFollowIndex();
+                map[index] = iter.first;
+                return false;
+            }
+            else if (package->getTypeId() != AiPackageTypeId::Combat && package->getTypeId() != AiPackageTypeId::Wander)
+                return false;
+            return true;
+        });
+        return map;
+    }
+
     std::list<MWWorld::Ptr> Actors::getActorsFighting(const MWWorld::Ptr& actor) {
         std::list<MWWorld::Ptr> list;
         std::vector<MWWorld::Ptr> neighbors;
diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index 4535400016..59814bcc22 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -181,6 +181,7 @@ namespace MWMechanics
 
             /// Get the list of AiFollow::mFollowIndex for all actors following this target
             std::list<int> getActorsFollowingIndices(const MWWorld::Ptr& actor);
+            std::map<int, MWWorld::Ptr> getActorsFollowingByIndex(const MWWorld::Ptr& actor);
 
             ///Returns the list of actors which are fighting the given actor
             /**ie AiCombat is active and the target is the actor **/
diff --git a/apps/openmw/mwmechanics/aifollow.cpp b/apps/openmw/mwmechanics/aifollow.cpp
index b3c308d75f..1e4fb206e3 100644
--- a/apps/openmw/mwmechanics/aifollow.cpp
+++ b/apps/openmw/mwmechanics/aifollow.cpp
@@ -113,24 +113,23 @@ bool AiFollow::execute (const MWWorld::Ptr& actor, CharacterController& characte
     if (!mActive)
         return false;
 
-    // The distances below are approximations based on observations of the original engine.
-    // If only one actor is following the target, it uses 186.
-    // If there are multiple actors following the same target, they form a group with each group member at 313 + (130 * i) distance to the target.
-
-    short followDistance = 186;
-    std::list<int> followers = MWBase::Environment::get().getMechanicsManager()->getActorsFollowingIndices(target);
-    if (followers.size() >= 2)
+    // In the original engine the first follower stays closer to the player than any subsequent followers.
+    // Followers beyond the first usually attempt to stand inside each other.
+    osg::Vec3f::value_type floatingDistance = 0;
+    auto followers = MWBase::Environment::get().getMechanicsManager()->getActorsFollowingByIndex(target);
+    if (followers.size() >= 2 && followers.cbegin()->first != mFollowIndex)
     {
-        followDistance = 313;
-        short i = 0;
-        followers.sort();
-        for (int followIndex : followers)
+        osg::Vec3f::value_type maxSize = 0;
+        for(auto& follower : followers)
         {
-            if (followIndex == mFollowIndex)
-                followDistance += 130 * i;
-            ++i;
+            auto halfExtent = MWBase::Environment::get().getWorld()->getHalfExtents(follower.second).y();
+            if(halfExtent > floatingDistance)
+                floatingDistance = halfExtent;
         }
     }
+    floatingDistance += MWBase::Environment::get().getWorld()->getHalfExtents(target).y();
+    floatingDistance += MWBase::Environment::get().getWorld()->getHalfExtents(actor).y() * 2;
+    short followDistance = static_cast<short>(floatingDistance);
 
     if (!mAlwaysFollow) //Update if you only follow for a bit
     {
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index b1db2562b2..fb67218532 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -1654,6 +1654,11 @@ namespace MWMechanics
         return mActors.getActorsFollowingIndices(actor);
     }
 
+    std::map<int, MWWorld::Ptr> MechanicsManager::getActorsFollowingByIndex(const MWWorld::Ptr& actor)
+    {
+        return mActors.getActorsFollowingByIndex(actor);
+    }
+
     std::list<MWWorld::Ptr> MechanicsManager::getActorsFighting(const MWWorld::Ptr& actor) {
         return mActors.getActorsFighting(actor);
     }
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
index 28f62b7774..3f2c3f5e98 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
@@ -150,6 +150,7 @@ namespace MWMechanics
             std::list<MWWorld::Ptr> getActorsSidingWith(const MWWorld::Ptr& actor) override;
             std::list<MWWorld::Ptr> getActorsFollowing(const MWWorld::Ptr& actor) override;
             std::list<int> getActorsFollowingIndices(const MWWorld::Ptr& actor) override;
+            std::map<int, MWWorld::Ptr> getActorsFollowingByIndex(const MWWorld::Ptr& actor) override;
 
             std::list<MWWorld::Ptr> getActorsFighting(const MWWorld::Ptr& actor) override;
             std::list<MWWorld::Ptr> getEnemiesNearby(const MWWorld::Ptr& actor) override;

From f981dd99167eaed067ead892b409c1093ca46c8c Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Fri, 25 Dec 2020 23:58:23 +0100
Subject: [PATCH 0146/2859] update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b75a179b1d..c9f3d18161 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,7 @@
     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

From 8f4b856b449f4ad15e002dbb2afa88cd10ace588 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Sat, 26 Dec 2020 22:45:53 +0000
Subject: [PATCH 0147/2859] Initial A2C implementation

---
 apps/openmw/mwrender/renderingmanager.cpp     |  1 +
 components/resource/scenemanager.cpp          |  6 ++
 components/resource/scenemanager.hpp          |  3 +
 components/sceneutil/mwshadowtechnique.cpp    |  2 +-
 components/shader/shadervisitor.cpp           | 13 ++++
 components/shader/shadervisitor.hpp           |  4 ++
 .../reference/modding/settings/shaders.rst    | 11 ++++
 files/settings-default.cfg                    |  5 ++
 files/shaders/alpha.glsl                      | 60 +++++++++++++------
 9 files changed, 86 insertions(+), 19 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 736e4f2ee1..a60077a169 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -219,6 +219,7 @@ namespace MWRender
         resourceSystem->getSceneManager()->setAutoUseSpecularMaps(Settings::Manager::getBool("auto use object specular maps", "Shaders"));
         resourceSystem->getSceneManager()->setSpecularMapPattern(Settings::Manager::getString("specular map pattern", "Shaders"));
         resourceSystem->getSceneManager()->setApplyLightingToEnvMaps(Settings::Manager::getBool("apply lighting to environment maps", "Shaders"));
+        resourceSystem->getSceneManager()->setConvertAlphaTestToAlphaToCoverage(Settings::Manager::getBool("convert alpha test to alpha-to-coverage", "Shaders"));
 
         osg::ref_ptr<SceneUtil::LightManager> sceneRoot = new SceneUtil::LightManager;
         sceneRoot->setLightingMask(Mask_Lighting);
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 2630cd4536..5f7116722e 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -290,6 +290,11 @@ namespace Resource
         mApplyLightingToEnvMaps = apply;
     }
 
+    void SceneManager::setConvertAlphaTestToAlphaToCoverage(bool convert)
+    {
+        mConvertAlphaTestToAlphaToCoverage = convert;
+    }
+
     SceneManager::~SceneManager()
     {
         // this has to be defined in the .cpp file as we can't delete incomplete types
@@ -769,6 +774,7 @@ namespace Resource
         shaderVisitor->setAutoUseSpecularMaps(mAutoUseSpecularMaps);
         shaderVisitor->setSpecularMapPattern(mSpecularMapPattern);
         shaderVisitor->setApplyLightingToEnvMaps(mApplyLightingToEnvMaps);
+        shaderVisitor->setConvertAlphaTestToAlphaToCoverage(mConvertAlphaTestToAlphaToCoverage);
         return shaderVisitor;
     }
 
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index fd75070a18..aae7d143f2 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -75,6 +75,8 @@ namespace Resource
 
         void setApplyLightingToEnvMaps(bool apply);
 
+        void setConvertAlphaTestToAlphaToCoverage(bool convert);
+
         void setShaderPath(const std::string& path);
 
         /// Check if a given scene is loaded and if so, update its usage timestamp to prevent it from being unloaded
@@ -159,6 +161,7 @@ namespace Resource
         bool mAutoUseSpecularMaps;
         std::string mSpecularMapPattern;
         bool mApplyLightingToEnvMaps;
+        bool mConvertAlphaTestToAlphaToCoverage;
 
         osg::ref_ptr<MultiObjectCache> mInstanceCache;
 
diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
index cfc94ba863..c781318faf 100644
--- a/components/sceneutil/mwshadowtechnique.cpp
+++ b/components/sceneutil/mwshadowtechnique.cpp
@@ -897,7 +897,7 @@ void SceneUtil::MWShadowTechnique::setupCastingShader(Shader::ShaderManager & sh
         auto& program = _castingPrograms[alphaFunc - GL_NEVER];
         program = new osg::Program();
         program->addShader(castingVertexShader);
-        program->addShader(shaderManager.getShader("shadowcasting_fragment.glsl", { {"alphaFunc", std::to_string(alphaFunc)} }, osg::Shader::FRAGMENT));
+        program->addShader(shaderManager.getShader("shadowcasting_fragment.glsl", { {"alphaFunc", std::to_string(alphaFunc)}, {"alphaToCoverage", "0"} }, osg::Shader::FRAGMENT));
     }
 }
 
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 7db9933169..4762549a7a 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -3,6 +3,7 @@
 #include <osg/AlphaFunc>
 #include <osg/Geometry>
 #include <osg/Material>
+#include <osg/Multisample>
 #include <osg/Texture>
 
 #include <osgUtil/TangentSpaceGenerator>
@@ -382,6 +383,7 @@ namespace Shader
         if (!removedState)
             removedState = new osg::StateSet();
 
+        defineMap["alphaToCoverage"] = "0";
         if (reqs.mAlphaFunc != osg::AlphaFunc::ALWAYS)
         {
             writableStateSet->addUniform(new osg::Uniform("alphaRef", reqs.mAlphaRef));
@@ -391,6 +393,12 @@ namespace Shader
                 removedState->setAttribute(alphaFunc->first, alphaFunc->second);
             // This prevents redundant glAlphaFunc calls while letting the shadows bin still see the test
             writableStateSet->setAttribute(RemovedAlphaFunc::getInstance(reqs.mAlphaFunc), osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+
+            if (mConvertAlphaTestToAlphaToCoverage)
+            {
+                writableStateSet->setMode(GL_SAMPLE_ALPHA_TO_COVERAGE_ARB, osg::StateAttribute::ON);
+                defineMap["alphaToCoverage"] = "1";
+            }
         }
 
         if (writableStateSet->getMode(GL_ALPHA_TEST) != osg::StateAttribute::INHERIT)
@@ -581,4 +589,9 @@ namespace Shader
         mApplyLightingToEnvMaps = apply;
     }
 
+    void ShaderVisitor::setConvertAlphaTestToAlphaToCoverage(bool convert)
+    {
+        mConvertAlphaTestToAlphaToCoverage = convert;
+    }
+
 }
diff --git a/components/shader/shadervisitor.hpp b/components/shader/shadervisitor.hpp
index 2ba18107b5..606e06df97 100644
--- a/components/shader/shadervisitor.hpp
+++ b/components/shader/shadervisitor.hpp
@@ -40,6 +40,8 @@ namespace Shader
 
         void setApplyLightingToEnvMaps(bool apply);
 
+        void setConvertAlphaTestToAlphaToCoverage(bool convert);
+
         void apply(osg::Node& node) override;
 
         void apply(osg::Drawable& drawable) override;
@@ -63,6 +65,8 @@ namespace Shader
 
         bool mApplyLightingToEnvMaps;
 
+        bool mConvertAlphaTestToAlphaToCoverage;
+
         ShaderManager& mShaderManager;
         Resource::ImageManager& mImageManager;
 
diff --git a/docs/source/reference/modding/settings/shaders.rst b/docs/source/reference/modding/settings/shaders.rst
index e23cc3d548..49ada897e4 100644
--- a/docs/source/reference/modding/settings/shaders.rst
+++ b/docs/source/reference/modding/settings/shaders.rst
@@ -146,3 +146,14 @@ radial fog
 By default, the fog becomes thicker proportionally to your distance from the clipping plane set at the clipping distance, which causes distortion at the edges of the screen.
 This setting makes the fog use the actual eye point distance (or so called Euclidean distance) to calculate the fog, which makes the fog look less artificial, especially if you have a wide FOV.
 Note that the rendering will act as if you have 'force shaders' option enabled with this on, which means that shaders will be used to render all objects and the terrain.
+
+convert alpha test to alpha-to-coverage
+---------------------------------------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	False
+
+Convert the alpha test (cutout/punchthrough alpha) to alpha-to-coverage.
+This allows MSAA to work with alpha-tested meshes, producing better-looking edges without pixelation.
+When MSAA is off, this setting will have no visible effect, but might have a performance cost.
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index c8805faa39..6629cb503e 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -442,6 +442,11 @@ apply lighting to environment maps = false
 # This makes fogging independent from the viewing angle. Shaders will be used to render all objects.
 radial fog = false
 
+# Convert the alpha test (cutout/punchthrough alpha) to alpha-to-coverage.
+# This allows MSAA to work with alpha-tested meshes, producing better-looking edges without pixelation.
+# When MSAA is off, this setting will have no visible effect, but might have a performance cost.
+convert alpha test to alpha-to-coverage = false
+
 [Input]
 
 # Capture control of the cursor prevent movement outside the window.
diff --git a/files/shaders/alpha.glsl b/files/shaders/alpha.glsl
index 0c69df0ab2..b1c7ed149e 100644
--- a/files/shaders/alpha.glsl
+++ b/files/shaders/alpha.glsl
@@ -14,25 +14,49 @@ uniform float alphaRef;
 
 void alphaTest()
 {
-    #if @alphaFunc == FUNC_NEVER
-        discard;
-    #elif @alphaFunc == FUNC_LESS
-        if (gl_FragData[0].a > alphaRef)
-            discard;
-    #elif @alphaFunc == FUNC_EQUAL
-        if (gl_FragData[0].a != alphaRef)
-            discard;
-    #elif @alphaFunc == FUNC_LEQUAL
-        if (gl_FragData[0].a >= alphaRef)
-            discard;
-    #elif @alphaFunc == FUNC_GREATER
-        if (gl_FragData[0].a < alphaRef)
-            discard;
-    #elif @alphaFunc == FUNC_NOTEQUAL
-        if (gl_FragData[0].a == alphaRef)
+    #if @alphaToCoverage 
+        float coverageAlpha = (gl_FragData[0].a - alphaRef) / max(fwidth(gl_FragData[0].a), 0.0001) + 0.5;
+
+        // Some functions don't make sense with A2C or are a pain to think about and no meshes use them anyway
+        // Use regular alpha testing in such cases until someone complains.
+        #if @alphaFunc == FUNC_NEVER
             discard;
-    #elif @alphaFunc == FUNC_GEQUAL
-        if (gl_FragData[0].a <= alphaRef)
+        #elif @alphaFunc == FUNC_LESS
+            gl_FragData[0].a = 1.0 - coverageAlpha;
+        #elif @alphaFunc == FUNC_EQUAL
+            if (gl_FragData[0].a != alphaRef)
+                discard;
+        #elif @alphaFunc == FUNC_LEQUAL
+            gl_FragData[0].a = 1.0 - coverageAlpha;
+        #elif @alphaFunc == FUNC_GREATER
+            gl_FragData[0].a = coverageAlpha;
+        #elif @alphaFunc == FUNC_NOTEQUAL
+            if (gl_FragData[0].a == alphaRef)
+                discard;
+        #elif @alphaFunc == FUNC_GEQUAL
+            gl_FragData[0].a = coverageAlpha;
+        #endif
+    #else
+        #if @alphaFunc == FUNC_NEVER
             discard;
+        #elif @alphaFunc == FUNC_LESS
+            if (gl_FragData[0].a > alphaRef)
+                discard;
+        #elif @alphaFunc == FUNC_EQUAL
+            if (gl_FragData[0].a != alphaRef)
+                discard;
+        #elif @alphaFunc == FUNC_LEQUAL
+            if (gl_FragData[0].a >= alphaRef)
+                discard;
+        #elif @alphaFunc == FUNC_GREATER
+            if (gl_FragData[0].a < alphaRef)
+                discard;
+        #elif @alphaFunc == FUNC_NOTEQUAL
+            if (gl_FragData[0].a == alphaRef)
+                discard;
+        #elif @alphaFunc == FUNC_GEQUAL
+            if (gl_FragData[0].a <= alphaRef)
+                discard;
+        #endif
     #endif
 }
\ No newline at end of file

From 54d465e3dcb5e5f98cbe12b8f85e6abc394968ea Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Sun, 27 Dec 2020 03:07:04 +0000
Subject: [PATCH 0148/2859] Do all alpha testing early and only once

---
 files/shaders/objects_fragment.glsl | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index c79ad5e196..995c2adaf3 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -109,11 +109,14 @@ void main()
 
 #if @diffuseMap
     gl_FragData[0] = texture2D(diffuseMap, adjustedDiffuseUV);
-    alphaTest();
 #else
     gl_FragData[0] = vec4(1.0);
 #endif
 
+    vec4 diffuseColor = getDiffuseColor();
+    gl_FragData[0].a *= diffuseColor.a;
+    alphaTest();
+
 #if @detailMap
     gl_FragData[0].xyz *= texture2D(detailMap, detailMapUV).xyz * 2.0;
 #endif
@@ -152,10 +155,6 @@ void main()
 
 #endif
 
-    vec4 diffuseColor = getDiffuseColor();
-    gl_FragData[0].a *= diffuseColor.a;
-    alphaTest();
-
     float shadowing = unshadowedLightRatio(linearDepth);
     vec3 lighting;
 #if !PER_PIXEL_LIGHTING

From ebb564ad226aaba712e69c2207d7baff69473f26 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sun, 27 Dec 2020 17:31:55 +0100
Subject: [PATCH 0149/2859] call moveObject() after applying waterwalking

This unbreak abot's boat mods: they're continually teleporting
the boats (who is an actor with waterwalking effect). As such, the
physics simulation was never run and the boat never went to sea level.
---
 apps/openmw/mwphysics/physicssystem.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index cc4d6bba8c..b50366ade9 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -935,7 +935,7 @@ namespace MWPhysics
         if (mMoveToWaterSurface)
         {
             mPosition.z() = mWaterlevel;
-            mActorRaw->setPosition(mPosition);
+            MWBase::Environment::get().getWorld()->moveObject(mActorRaw->getPtr(), mPosition.x(), mPosition.y(), mPosition.z());
         }
         mOldHeight = mPosition.z();
         mRefpos = mActorRaw->getPtr().getRefData().getPosition();

From 18ef32ca82bd9c3cfcdc9f420131e4697ee054c9 Mon Sep 17 00:00:00 2001
From: wareya <wareya@gmail.com>
Date: Sun, 27 Dec 2020 22:16:11 +0000
Subject: [PATCH 0150/2859] values for this higher than sGroundOffset cause
 jittering on some surface; use safe-seeming value slightly less than
 sGroundOffset

---
 CHANGELOG.md                                  |  10 +
 CHANGELOG_PR.md                               |   2 +-
 CI/before_install.android.sh                  |   2 +-
 CI/before_script.msvc.sh                      |   2 +-
 CMakeLists.txt                                |   5 +-
 apps/openmw/CMakeLists.txt                    |   2 +-
 apps/openmw/mwphysics/actor.cpp               |  26 +-
 apps/openmw/mwphysics/actor.hpp               |   3 +
 .../closestnotmeconvexresultcallback.cpp      |  61 +++-
 .../closestnotmeconvexresultcallback.hpp      |   3 +-
 apps/openmw/mwphysics/constants.hpp           |  12 +-
 apps/openmw/mwphysics/contacttestwrapper.cpp  |  21 ++
 apps/openmw/mwphysics/contacttestwrapper.h    |  14 +
 apps/openmw/mwphysics/movementsolver.cpp      | 331 ++++++++++++++----
 apps/openmw/mwphysics/movementsolver.hpp      |  37 +-
 apps/openmw/mwphysics/mtphysics.cpp           |  16 +-
 apps/openmw/mwphysics/raycasting.hpp          |   2 +-
 apps/openmw/mwphysics/stepper.cpp             | 239 +++++++------
 apps/openmw/mwphysics/stepper.hpp             |   3 +-
 apps/openmw/mwphysics/trace.cpp               |   4 +-
 appveyor.yml                                  |   2 +-
 cmake/OSIdentity.cmake                        |  67 ++++
 components/CMakeLists.txt                     |   7 +-
 23 files changed, 658 insertions(+), 213 deletions(-)
 create mode 100644 apps/openmw/mwphysics/contacttestwrapper.cpp
 create mode 100644 apps/openmw/mwphysics/contacttestwrapper.h
 create mode 100644 cmake/OSIdentity.cmake

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b139253f8..661a058d4c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,12 +3,14 @@
 
     Bug #832: OpenMW-CS: Handle deleted references
     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 #2798: Mutable ESM records
     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
@@ -18,6 +20,11 @@
     Bug #4021: Attributes and skills are not stored as floats
     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 #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
@@ -71,12 +78,15 @@
     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 #5681: Player character can clip or pass through bridges instead of colliding against them
+    Bug #5683: Player character can get stuck with MR's balmora's wooden gate
     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 #5731: Editor: skirts are invisible on characters
     Bug #5758: Paralyzed actors behavior is inconsistent with vanilla
+    Bug #5762: Movement solver is insufficiently robust
     Feature #390: 3rd person look "over the shoulder"
     Feature #1536: Show more information about level on menu
     Feature #2386: Distant Statics in the form of Object Paging
diff --git a/CHANGELOG_PR.md b/CHANGELOG_PR.md
index 8a7948bb70..69ad0cc1b9 100644
--- a/CHANGELOG_PR.md
+++ b/CHANGELOG_PR.md
@@ -41,4 +41,4 @@ Editor Bug Fixes:
 
 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)
\ No newline at end of file
+- Ensure that 'Enchantment autocalc" flag is treated as flag in OpenMW-CS and in our esm tools (#5363)
diff --git a/CI/before_install.android.sh b/CI/before_install.android.sh
index 791377dd96..0243a96092 100755
--- a/CI/before_install.android.sh
+++ b/CI/before_install.android.sh
@@ -1,4 +1,4 @@
 #!/bin/sh -ex
 
-curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/android/openmw-android-deps-20201018.zip -o ~/openmw-android-deps.zip
+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
diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 0ef67f47ef..0c26801cc4 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -73,7 +73,7 @@ CONFIGURATIONS=()
 TEST_FRAMEWORK=""
 GOOGLE_INSTALL_ROOT=""
 INSTALL_PREFIX="."
-BULLET_DOUBLE=""
+BULLET_DOUBLE=true
 BULLET_DBL=""
 BULLET_DBL_DISPLAY="Single precision"
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index be7bc79e3f..4a615e8432 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,9 @@ cmake_minimum_required(VERSION 3.1.0)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
+# Detect OS
+include(cmake/OSIdentity.cmake)
+
 # for link time optimization, remove if cmake version is >= 3.9
 if(POLICY CMP0069)
     cmake_policy(SET CMP0069 NEW)
@@ -21,7 +24,7 @@ option(BUILD_NIFTEST            "Build nif file tester" ON)
 option(BUILD_DOCS               "Build documentation." OFF )
 option(BUILD_WITH_CODE_COVERAGE "Enable code coverage with gconv" OFF)
 option(BUILD_UNITTESTS          "Enable Unittests with Google C++ Unittest" OFF)
-option(BULLET_USE_DOUBLES       "Use double precision for Bullet" OFF)
+option(BULLET_USE_DOUBLES       "Use double precision for Bullet" ON)
 
 set(OpenGL_GL_PREFERENCE LEGACY)  # Use LEGACY as we use GL2; GLNVD is for GL3 and up.
 
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 6b6134dfb9..a4c3b91361 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -73,7 +73,7 @@ add_openmw_dir (mwworld
 add_openmw_dir (mwphysics
     physicssystem trace collisiontype actor convert object heightfield closestnotmerayresultcallback
     contacttestresultcallback deepestnotmecontacttestresultcallback stepper movementsolver projectile
-    closestnotmeconvexresultcallback raycasting mtphysics
+    closestnotmeconvexresultcallback raycasting mtphysics contacttestwrapper
     )
 
 add_openmw_dir (mwclass
diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index 015424db58..3b7b0d0616 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -1,6 +1,5 @@
 #include "actor.hpp"
 
-#include <BulletCollision/CollisionShapes/btCapsuleShape.h>
 #include <BulletCollision/CollisionShapes/btBoxShape.h>
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 
@@ -14,6 +13,8 @@
 #include "collisiontype.hpp"
 #include "mtphysics.hpp"
 
+#include <cmath>
+
 namespace MWPhysics
 {
 
@@ -52,17 +53,8 @@ Actor::Actor(const MWWorld::Ptr& ptr, const Resource::BulletShape* shape, Physic
             Log(Debug::Error) << "Error: Failed to calculate bounding box for actor \"" << ptr.getCellRef().getRefId() << "\".";
     }
 
-    // Use capsule shape only if base is square (nonuniform scaling apparently doesn't work on it)
-    if (std::abs(mHalfExtents.x()-mHalfExtents.y())<mHalfExtents.x()*0.05 && mHalfExtents.z() >= mHalfExtents.x())
-    {
-        mShape.reset(new btCapsuleShapeZ(mHalfExtents.x(), 2*mHalfExtents.z() - 2*mHalfExtents.x()));
-        mRotationallyInvariant = true;
-    }
-    else
-    {
-        mShape.reset(new btBoxShape(Misc::Convert::toBullet(mHalfExtents)));
-        mRotationallyInvariant = false;
-    }
+    mShape.reset(new btBoxShape(Misc::Convert::toBullet(mHalfExtents)));
+    mRotationallyInvariant = (mMeshTranslation.x() == 0.0 && mMeshTranslation.y() == 0.0) && std::fabs(mHalfExtents.x() - mHalfExtents.y()) < 2.2;
 
     mConvexShape = static_cast<btConvexShape*>(mShape.get());
 
@@ -72,8 +64,11 @@ Actor::Actor(const MWWorld::Ptr& ptr, const Resource::BulletShape* shape, Physic
     mCollisionObject->setCollisionShape(mShape.get());
     mCollisionObject->setUserPointer(this);
 
-    updateRotation();
     updateScale();
+
+    if(!mRotationallyInvariant)
+        updateRotation();
+
     updatePosition();
     addCollisionMask(getCollisionMask());
     updateCollisionObjectPosition();
@@ -154,6 +149,11 @@ osg::Vec3f Actor::getSimulationPosition() const
     return mSimulationPosition;
 }
 
+osg::Vec3f Actor::getScaledMeshTranslation() const
+{
+    return mRotation * osg::componentMultiply(mMeshTranslation, mScale);
+}
+
 void Actor::updateCollisionObjectPosition()
 {
     std::scoped_lock lock(mPositionMutex);
diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index 18419c2c80..9d129f2ba6 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -82,6 +82,9 @@ namespace MWPhysics
          */
         osg::Vec3f getOriginalHalfExtents() const;
 
+        /// Returns the mesh translation, scaled and rotated as necessary
+        osg::Vec3f getScaledMeshTranslation() const;
+
         /**
          * Returns the position of the collision body
          * @note The collision shape's origin is in its center, so the position returned can be described as center of the actor collision box in world space.
diff --git a/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp b/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp
index 18c196e444..8dd5a624fc 100644
--- a/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp
+++ b/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp
@@ -1,15 +1,39 @@
+#include <mutex>
+
 #include "closestnotmeconvexresultcallback.hpp"
+#include "collisiontype.hpp"
+#include "contacttestwrapper.h"
 
 #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
+#include <components/misc/convert.hpp>
 
 #include "collisiontype.hpp"
 #include "projectile.hpp"
 
 namespace MWPhysics
 {
-    ClosestNotMeConvexResultCallback::ClosestNotMeConvexResultCallback(const btCollisionObject *me, const btVector3 &motion, btScalar minCollisionDot)
+    class ActorOverlapTester : public btCollisionWorld::ContactResultCallback
+    {
+    public:
+        bool overlapping = false;
+
+        btScalar addSingleResult(btManifoldPoint& cp,
+            const btCollisionObjectWrapper* colObj0Wrap,
+            int partId0,
+            int index0,
+            const btCollisionObjectWrapper* colObj1Wrap,
+            int partId1,
+            int index1)
+        {
+            if(cp.getDistance() <= 0.0f)
+                overlapping = true;
+            return btScalar(1);
+        }
+    };
+
+    ClosestNotMeConvexResultCallback::ClosestNotMeConvexResultCallback(const btCollisionObject *me, const btVector3 &motion, btScalar minCollisionDot, const btCollisionWorld * world)
     : btCollisionWorld::ClosestConvexResultCallback(btVector3(0.0, 0.0, 0.0), btVector3(0.0, 0.0, 0.0)),
-      mMe(me), mMotion(motion), mMinCollisionDot(minCollisionDot)
+      mMe(me), mMotion(motion), mMinCollisionDot(minCollisionDot), mWorld(world)
     {
     }
 
@@ -18,6 +42,39 @@ namespace MWPhysics
         if (convexResult.m_hitCollisionObject == mMe)
             return btScalar(1);
 
+        // override data for actor-actor collisions
+        // vanilla Morrowind seems to make overlapping actors collide as though they are both cylinders with a diameter of the distance between them
+        // For some reason this doesn't work as well as it should when using capsules, but it still helps a lot.
+        if(convexResult.m_hitCollisionObject->getBroadphaseHandle()->m_collisionFilterGroup == CollisionType_Actor)
+        {
+            ActorOverlapTester isOverlapping;
+            // FIXME: This is absolutely terrible and bullet should feel terrible for not making contactPairTest const-correct.
+            ContactTestWrapper::contactPairTest(const_cast<btCollisionWorld*>(mWorld), const_cast<btCollisionObject*>(mMe), const_cast<btCollisionObject*>(convexResult.m_hitCollisionObject), isOverlapping);
+
+            if(isOverlapping.overlapping)
+            {
+                auto originA = Misc::Convert::toOsg(mMe->getWorldTransform().getOrigin());
+                auto originB = Misc::Convert::toOsg(convexResult.m_hitCollisionObject->getWorldTransform().getOrigin());
+                osg::Vec3f motion = Misc::Convert::toOsg(mMotion);
+                osg::Vec3f normal = (originA-originB);
+                normal.z() = 0;
+                normal.normalize();
+                // only collide if horizontally moving towards the hit actor (note: the motion vector appears to be inverted)
+                // FIXME: This kinda screws with standing on actors that walk up slopes for some reason. Makes you fall through them.
+                // It happens in vanilla Morrowind too, but much less often.
+                // I tried hunting down why but couldn't figure it out. Possibly a stair stepping or ground ejection bug.
+                if(normal * motion > 0.0f)
+                {
+                    convexResult.m_hitFraction = 0.0f;
+                    convexResult.m_hitNormalLocal = Misc::Convert::toBullet(normal);
+                    return ClosestConvexResultCallback::addSingleResult(convexResult, true);
+                }
+                else
+                {
+                    return btScalar(1);
+                }
+            }
+        }
         if (convexResult.m_hitCollisionObject->getBroadphaseHandle()->m_collisionFilterGroup == CollisionType_Projectile)
         {
             auto* projectileHolder = static_cast<Projectile*>(convexResult.m_hitCollisionObject->getUserPointer());
diff --git a/apps/openmw/mwphysics/closestnotmeconvexresultcallback.hpp b/apps/openmw/mwphysics/closestnotmeconvexresultcallback.hpp
index 97aaa64a1c..538721ad80 100644
--- a/apps/openmw/mwphysics/closestnotmeconvexresultcallback.hpp
+++ b/apps/openmw/mwphysics/closestnotmeconvexresultcallback.hpp
@@ -10,7 +10,7 @@ namespace MWPhysics
     class ClosestNotMeConvexResultCallback : public btCollisionWorld::ClosestConvexResultCallback
     {
     public:
-        ClosestNotMeConvexResultCallback(const btCollisionObject *me, const btVector3 &motion, btScalar minCollisionDot);
+        ClosestNotMeConvexResultCallback(const btCollisionObject *me, const btVector3 &motion, btScalar minCollisionDot, const btCollisionWorld * world);
 
         btScalar addSingleResult(btCollisionWorld::LocalConvexResult& convexResult,bool normalInWorldSpace) override;
 
@@ -18,6 +18,7 @@ namespace MWPhysics
         const btCollisionObject *mMe;
         const btVector3 mMotion;
         const btScalar mMinCollisionDot;
+        const btCollisionWorld * mWorld;
     };
 }
 
diff --git a/apps/openmw/mwphysics/constants.hpp b/apps/openmw/mwphysics/constants.hpp
index 46367ab343..c6f2f3b530 100644
--- a/apps/openmw/mwphysics/constants.hpp
+++ b/apps/openmw/mwphysics/constants.hpp
@@ -5,12 +5,22 @@ namespace MWPhysics
 {
     static const float sStepSizeUp = 34.0f;
     static const float sStepSizeDown = 62.0f;
-    static const float sMinStep = 10.f;
+
+    static const float sMinStep = 10.0f; // hack to skip over tiny unwalkable slopes
+    static const float sMinStep2 = 20.0f; // hack to skip over shorter but longer/wider/further unwalkable slopes
+    // whether to do the above stairstepping logic hacks to work around bad morrowind assets - disabling causes problems but improves performance
+    static const bool sDoExtraStairHacks = true;
+
     static const float sGroundOffset = 1.0f;
     static const float sMaxSlope = 49.0f;
 
     // Arbitrary number. To prevent infinite loops. They shouldn't happen but it's good to be prepared.
     static const int sMaxIterations = 8;
+    // Allows for more precise movement solving without getting stuck or snagging too easily.
+    static const float sCollisionMargin = 0.1;
+    // Allow for a small amount of penetration to prevent numerical precision issues from causing the "unstuck"ing code to run unnecessarily
+    // Currently set to 0 because having the "unstuck"ing code run whenever possible prevents some glitchy snagging issues
+    static const float sAllowedPenetration = 0.0;
 }
 
 #endif
diff --git a/apps/openmw/mwphysics/contacttestwrapper.cpp b/apps/openmw/mwphysics/contacttestwrapper.cpp
new file mode 100644
index 0000000000..c11a7e2926
--- /dev/null
+++ b/apps/openmw/mwphysics/contacttestwrapper.cpp
@@ -0,0 +1,21 @@
+#include <mutex>
+
+#include "contacttestwrapper.h"
+
+namespace MWPhysics
+{
+    // Concurrent calls to contactPairTest (and by extension contactTest) are forbidden.
+    static std::mutex contactMutex;
+    void ContactTestWrapper::contactTest(btCollisionWorld* collisionWorld, btCollisionObject* colObj, btCollisionWorld::ContactResultCallback& resultCallback)
+    {
+        std::unique_lock lock(contactMutex);
+        collisionWorld->contactTest(colObj, resultCallback);
+    }
+
+    void ContactTestWrapper::contactPairTest(btCollisionWorld* collisionWorld, btCollisionObject* colObjA, btCollisionObject* colObjB, btCollisionWorld::ContactResultCallback& resultCallback)
+    {
+        std::unique_lock lock(contactMutex);
+        collisionWorld->contactPairTest(colObjA, colObjB, resultCallback);
+    }
+
+}
diff --git a/apps/openmw/mwphysics/contacttestwrapper.h b/apps/openmw/mwphysics/contacttestwrapper.h
new file mode 100644
index 0000000000..b3b6edc59a
--- /dev/null
+++ b/apps/openmw/mwphysics/contacttestwrapper.h
@@ -0,0 +1,14 @@
+#ifndef OPENMW_MWPHYSICS_CONTACTTESTWRAPPER_H
+#define OPENMW_MWPHYSICS_CONTACTTESTWRAPPER_H
+
+#include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
+
+namespace MWPhysics
+{
+    struct ContactTestWrapper
+    {
+        static void contactTest(btCollisionWorld* collisionWorld, btCollisionObject* colObj, btCollisionWorld::ContactResultCallback& resultCallback);
+        static void contactPairTest(btCollisionWorld* collisionWorld, btCollisionObject* colObjA, btCollisionObject* colObjB, btCollisionWorld::ContactResultCallback& resultCallback);
+    };
+}
+#endif
diff --git a/apps/openmw/mwphysics/movementsolver.cpp b/apps/openmw/mwphysics/movementsolver.cpp
index 1feaf3c94e..69bf042369 100644
--- a/apps/openmw/mwphysics/movementsolver.cpp
+++ b/apps/openmw/mwphysics/movementsolver.cpp
@@ -17,10 +17,13 @@
 #include "actor.hpp"
 #include "collisiontype.hpp"
 #include "constants.hpp"
+#include "contacttestwrapper.h"
 #include "physicssystem.hpp"
 #include "stepper.hpp"
 #include "trace.h"
 
+#include <cmath>
+
 namespace MWPhysics
 {
     static bool isActor(const btCollisionObject *obj)
@@ -29,12 +32,50 @@ namespace MWPhysics
         return obj->getBroadphaseHandle()->m_collisionFilterGroup == CollisionType_Actor;
     }
 
-    template <class Vec3>
-    static bool isWalkableSlope(const Vec3 &normal)
+    class ContactCollectionCallback : public btCollisionWorld::ContactResultCallback
     {
-        static const float sMaxSlopeCos = std::cos(osg::DegreesToRadians(sMaxSlope));
-        return (normal.z() > sMaxSlopeCos);
-    }
+    public:
+        ContactCollectionCallback(const btCollisionObject * me, osg::Vec3f velocity) : mMe(me)
+        {
+            m_collisionFilterGroup = me->getBroadphaseHandle()->m_collisionFilterGroup;
+            m_collisionFilterMask = me->getBroadphaseHandle()->m_collisionFilterMask;
+            mVelocity = Misc::Convert::toBullet(velocity);
+        }
+        virtual btScalar addSingleResult(btManifoldPoint & contact, const btCollisionObjectWrapper * colObj0Wrap, int partId0, int index0, const btCollisionObjectWrapper * colObj1Wrap, int partId1, int index1)
+        {
+            if (isActor(colObj0Wrap->getCollisionObject()) && isActor(colObj1Wrap->getCollisionObject()))
+                return 0.0;
+            // ignore overlap if we're moving in the same direction as it would push us out (don't change this to >=, that would break detection when not moving)
+            if (contact.m_normalWorldOnB.dot(mVelocity) > 0.0)
+                return 0.0;
+            auto delta = contact.m_normalWorldOnB * -contact.m_distance1;
+            mContactSum += delta;
+            mMaxX = std::max(std::abs(delta.x()), mMaxX);
+            mMaxY = std::max(std::abs(delta.y()), mMaxY);
+            mMaxZ = std::max(std::abs(delta.z()), mMaxZ);
+            if (contact.m_distance1 < mDistance)
+            {
+                mDistance = contact.m_distance1;
+                mNormal = contact.m_normalWorldOnB;
+                mDelta = delta;
+                return mDistance;
+            }
+            else
+            {
+                return 0.0;
+            }
+        }
+        btScalar mMaxX = 0.0;
+        btScalar mMaxY = 0.0;
+        btScalar mMaxZ = 0.0;
+        btVector3 mContactSum{0.0, 0.0, 0.0};
+        btVector3 mNormal{0.0, 0.0, 0.0}; // points towards "me"
+        btVector3 mDelta{0.0, 0.0, 0.0}; // points towards "me"
+        btScalar mDistance = 0.0; // negative or zero
+    protected:
+        btVector3 mVelocity;
+        const btCollisionObject * mMe;
+    };
 
     osg::Vec3f MovementSolver::traceDown(const MWWorld::Ptr &ptr, const osg::Vec3f& position, Actor* actor, btCollisionWorld* collisionWorld, float maxHeight)
     {
@@ -99,13 +140,13 @@ namespace MWPhysics
         }
 
         const btCollisionObject *colobj = physicActor->getCollisionObject();
-        osg::Vec3f halfExtents = physicActor->getHalfExtents();
 
-        // NOTE: here we don't account for the collision box translation (i.e. physicActor->getPosition() - refpos.pos).
-        // That means the collision shape used for moving this actor is in a different spot than the collision shape
-        // other actors are using to collide against this actor.
-        // While this is strictly speaking wrong, it's needed for MW compatibility.
-        actor.mPosition.z() += halfExtents.z();
+        // Adjust for collision mesh offset relative to actor's "location"
+        // (doTrace doesn't take local/interior collision shape translation into account, so we have to do it on our own)
+        // for compatibility with vanilla assets, we have to derive this from the vertical half extent instead of from internal hull translation
+        // if not for this hack, the "correct" collision hull position would be physicActor->getScaledMeshTranslation()
+        osg::Vec3f halfExtents = physicActor->getHalfExtents();
+        actor.mPosition.z() += halfExtents.z(); // vanilla-accurate
 
         static const float fSwimHeightScale = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fSwimHeightScale")->mValue.getFloat();
         float swimlevel = actor.mWaterlevel + halfExtents.z() - (physicActor->getRenderingHalfExtents().z() * 2 * fSwimHeightScale);
@@ -156,6 +197,13 @@ namespace MWPhysics
          * The initial velocity was set earlier (see above).
         */
         float remainingTime = time;
+        bool seenGround = physicActor->getOnGround() && !physicActor->getOnSlope() && !actor.mFlying;
+
+        int numTimesSlid = 0;
+        osg::Vec3f lastSlideNormal(0,0,1);
+        osg::Vec3f lastSlideNormalFallback(0,0,1);
+        bool forceGroundTest = false;
+
         for (int iterations = 0; iterations < sMaxIterations && remainingTime > 0.01f; ++iterations)
         {
             osg::Vec3f nextpos = newPosition + velocity * remainingTime;
@@ -164,7 +212,7 @@ namespace MWPhysics
             if(!actor.mFlying && nextpos.z() > swimlevel && newPosition.z() < swimlevel)
             {
                 const osg::Vec3f down(0,0,-1);
-                velocity = slide(velocity, down);
+                velocity = reject(velocity, down);
                 // NOTE: remainingTime is unchanged before the loop continues
                 continue; // velocity updated, calculate nextpos again
             }
@@ -193,92 +241,158 @@ namespace MWPhysics
                 break;
             }
 
-            // We are touching something.
-            if (tracer.mFraction < 1E-9f)
-            {
-                // Try to separate by backing off slighly to unstuck the solver
-                osg::Vec3f backOff = (newPosition - tracer.mHitPoint) * 1E-2f;
-                newPosition += backOff;
-            }
+            if (isWalkableSlope(tracer.mPlaneNormal) && !actor.mFlying && newPosition.z() >= swimlevel)
+                seenGround = true;
 
             // We hit something. Check if we can step up.
             float hitHeight = tracer.mHitPoint.z() - tracer.mEndPos.z() + halfExtents.z();
             osg::Vec3f oldPosition = newPosition;
-            bool result = false;
+            bool usedStepLogic = false;
             if (hitHeight < sStepSizeUp && !isActor(tracer.mHitObject))
             {
                 // Try to step up onto it.
-                // NOTE: stepMove does not allow stepping over, modifies newPosition if successful
-                result = stepper.step(newPosition, velocity*remainingTime, remainingTime);
+                // NOTE: this modifies newPosition and velocity on its own if successful
+                usedStepLogic = stepper.step(newPosition, velocity, remainingTime, seenGround, iterations == 0);
             }
-            if (result)
+            if (usedStepLogic)
             {
                 // don't let pure water creatures move out of water after stepMove
                 const auto ptr = physicActor->getPtr();
                 if (ptr.getClass().isPureWaterCreature(ptr) && newPosition.z() + halfExtents.z() > actor.mWaterlevel)
                     newPosition = oldPosition;
+                else if(!actor.mFlying && actor.mPosition.z() >= swimlevel)
+                    forceGroundTest = true;
             }
             else
             {
-                // Can't move this way, try to find another spot along the plane
-                osg::Vec3f newVelocity = slide(velocity, tracer.mPlaneNormal);
+                // Can't step up, so slide against what we ran into
+                remainingTime *= (1.0f-tracer.mFraction);
+
+                auto planeNormal = tracer.mPlaneNormal;
+
+                // If we touched the ground this frame, and whatever we ran into is a wall of some sort,
+                // pretend that its collision normal is pointing horizontally
+                // (fixes snagging on slightly downward-facing walls, and crawling up the bases of very steep walls because of the collision margin)
+                if (seenGround && !isWalkableSlope(planeNormal) && planeNormal.z() != 0)
+                {
+                    planeNormal.z() = 0;
+                    planeNormal.normalize();
+                }
+
+                // Move up to what we ran into (with a bit of a collision margin)
+                if ((newPosition-tracer.mEndPos).length2() > sCollisionMargin*sCollisionMargin)
+                {
+                    auto direction = velocity;
+                    direction.normalize();
+                    newPosition = tracer.mEndPos;
+                    newPosition -= direction*sCollisionMargin;
+                }
+
+                osg::Vec3f newVelocity = (velocity * planeNormal <= 0.0) ? reject(velocity, planeNormal) : velocity;
+                bool usedSeamLogic = false;
+
+                // check for the current and previous collision planes forming an acute angle; slide along the seam if they do
+                if(numTimesSlid > 0)
+                {
+                    auto dotA = lastSlideNormal * planeNormal;
+                    auto dotB = lastSlideNormalFallback * planeNormal;
+                    if(numTimesSlid <= 1) // ignore fallback normal if this is only the first or second slide
+                        dotB = 1.0;
+                    if(dotA <= 0.0 || dotB <= 0.0)
+                    {
+                        osg::Vec3f bestNormal = lastSlideNormal;
+                        // use previous-to-previous collision plane if it's acute with current plane but actual previous plane isn't
+                        if(dotB < dotA)
+                        {
+                            bestNormal = lastSlideNormalFallback;
+                            lastSlideNormal = lastSlideNormalFallback;
+                        }
+
+                        auto constraintVector = bestNormal ^ planeNormal; // cross product
+                        if(constraintVector.length2() > 0) // only if it's not zero length
+                        {
+                            constraintVector.normalize();
+                            newVelocity = project(velocity, constraintVector);
+
+                            // version of surface rejection for acute crevices/seams
+                            auto averageNormal = bestNormal + planeNormal;
+                            averageNormal.normalize();
+                            tracer.doTrace(colobj, newPosition, newPosition + averageNormal*(sCollisionMargin*2.0), collisionWorld);
+                            newPosition = (newPosition + tracer.mEndPos)/2.0;
+
+                            usedSeamLogic = true;
+                        }
+                    }
+                }
+                // otherwise just keep the normal vector rejection
+
+                // if this isn't the first iteration, or if the first iteration is also the last iteration,
+                // move away from the collision plane slightly, if possible
+                // this reduces getting stuck in some concave geometry, like the gaps above the railings in some ald'ruhn buildings
+                // this is different from the normal collision margin, because the normal collision margin is along the movement path,
+                // but this is along the collision normal
+                if(!usedSeamLogic && (iterations > 0 || remainingTime < 0.01f))
+                {
+                    tracer.doTrace(colobj, newPosition, newPosition + planeNormal*(sCollisionMargin*2.0), collisionWorld);
+                    newPosition = (newPosition + tracer.mEndPos)/2.0;
+                }
 
-                // Do not allow sliding upward if there is gravity.
-                // Stepping will have taken care of that.
-                if(!(newPosition.z() < swimlevel || actor.mFlying))
-                    newVelocity.z() = std::min(newVelocity.z(), 0.0f);
+                // Do not allow sliding up steep slopes if there is gravity.
+                if (newPosition.z() >= swimlevel && !actor.mFlying && !isWalkableSlope(planeNormal))
+                    newVelocity.z() = std::min(newVelocity.z(), velocity.z());
 
-                if ((newVelocity-velocity).length2() < 0.01)
+                if (newVelocity * origVelocity <= 0.0f)
                     break;
-                if ((newVelocity * origVelocity) <= 0.f)
-                    break; // ^ dot product
 
+                numTimesSlid += 1;
+                lastSlideNormalFallback = lastSlideNormal;
+                lastSlideNormal = planeNormal;
                 velocity = newVelocity;
             }
         }
 
         bool isOnGround = false;
         bool isOnSlope = false;
-        if (!(inertia.z() > 0.f) && !(newPosition.z() < swimlevel))
+        if (forceGroundTest || (inertia.z() <= 0.f && newPosition.z() >= swimlevel))
         {
             osg::Vec3f from = newPosition;
-            osg::Vec3f to = newPosition - (physicActor->getOnGround() ? osg::Vec3f(0,0,sStepSizeDown + 2*sGroundOffset) : osg::Vec3f(0,0,2*sGroundOffset));
+            auto dropDistance = 2*sGroundOffset + (physicActor->getOnGround() ? sStepSizeDown : 0);
+            osg::Vec3f to = newPosition - osg::Vec3f(0,0,dropDistance);
             tracer.doTrace(colobj, from, to, collisionWorld);
-            if(tracer.mFraction < 1.0f && !isActor(tracer.mHitObject))
+            if(tracer.mFraction < 1.0f)
             {
-                const btCollisionObject* standingOn = tracer.mHitObject;
-                PtrHolder* ptrHolder = static_cast<PtrHolder*>(standingOn->getUserPointer());
-                if (ptrHolder)
-                    actor.mStandingOn = ptrHolder->getPtr();
-
-                if (standingOn->getBroadphaseHandle()->m_collisionFilterGroup == CollisionType_Water)
-                    physicActor->setWalkingOnWater(true);
-                if (!actor.mFlying)
-                    newPosition.z() = tracer.mEndPos.z() + sGroundOffset;
+                if (!isActor(tracer.mHitObject))
+                {
+                    isOnGround = true;
+                    isOnSlope = !isWalkableSlope(tracer.mPlaneNormal);
 
-                isOnGround = true;
+                    const btCollisionObject* standingOn = tracer.mHitObject;
+                    PtrHolder* ptrHolder = static_cast<PtrHolder*>(standingOn->getUserPointer());
+                    if (ptrHolder)
+                        actor.mStandingOn = ptrHolder->getPtr();
 
-                isOnSlope = !isWalkableSlope(tracer.mPlaneNormal);
-            }
-            else
-            {
-                // standing on actors is not allowed (see above).
-                // in addition to that, apply a sliding effect away from the center of the actor,
-                // so that we do not stay suspended in air indefinitely.
-                if (tracer.mFraction < 1.0f && isActor(tracer.mHitObject))
-                {
-                    if (osg::Vec3f(velocity.x(), velocity.y(), 0).length2() < 100.f*100.f)
+                    if (standingOn->getBroadphaseHandle()->m_collisionFilterGroup == CollisionType_Water)
+                        physicActor->setWalkingOnWater(true);
+                    if (!actor.mFlying && !isOnSlope)
                     {
-                        btVector3 aabbMin, aabbMax;
-                        tracer.mHitObject->getCollisionShape()->getAabb(tracer.mHitObject->getWorldTransform(), aabbMin, aabbMax);
-                        btVector3 center = (aabbMin + aabbMax) / 2.f;
-                        inertia = osg::Vec3f(actor.mPosition.x() - center.x(), actor.mPosition.y() - center.y(), 0);
-                        inertia.normalize();
-                        inertia *= 100;
+                        if (tracer.mFraction*dropDistance > sGroundOffset)
+                            newPosition.z() = tracer.mEndPos.z() + sGroundOffset;
+                        else
+                        {
+                            newPosition.z() = tracer.mEndPos.z();
+                            tracer.doTrace(colobj, newPosition, newPosition + osg::Vec3f(0, 0, 2*sGroundOffset), collisionWorld);
+                            newPosition = (newPosition+tracer.mEndPos)/2.0;
+                        }
                     }
                 }
+                else
+                {
+                    // Vanilla allows actors to float on top of other actors. Do not push them off.
+                    if (!actor.mFlying && isWalkableSlope(tracer.mPlaneNormal) && tracer.mEndPos.z()+sGroundOffset <= newPosition.z())
+                        newPosition.z() = tracer.mEndPos.z() + sGroundOffset;
 
-                isOnGround = false;
+                    isOnGround = false;
+                }
             }
         }
 
@@ -298,7 +412,98 @@ namespace MWPhysics
         physicActor->setOnGround(isOnGround);
         physicActor->setOnSlope(isOnSlope);
 
-        newPosition.z() -= halfExtents.z(); // remove what was added at the beginning
         actor.mPosition = newPosition;
+        // remove what was added earlier in compensating for doTrace not taking interior transformation into account
+        actor.mPosition.z() -= halfExtents.z(); // vanilla-accurate
+    }
+
+    btVector3 addMarginToDelta(btVector3 delta)
+    {
+        if(delta.length2() == 0.0)
+            return delta;
+        return delta + delta.normalized() * sCollisionMargin;
+    }
+
+    void MovementSolver::unstuck(ActorFrameData& actor, const btCollisionWorld* collisionWorld)
+    {
+        const auto& ptr = actor.mActorRaw->getPtr();
+        if (!ptr.getClass().isMobile(ptr))
+            return;
+
+        auto* physicActor = actor.mActorRaw;
+        if(!physicActor->getCollisionMode()) // noclipping/tcl
+            return;
+
+        auto* collisionObject = physicActor->getCollisionObject();
+        auto tempPosition = actor.mPosition;
+
+        // use vanilla-accurate collision hull position hack (do same hitbox offset hack as movement solver)
+        // if vanilla compatibility didn't matter, the "correct" collision hull position would be physicActor->getScaledMeshTranslation()
+        const auto verticalHalfExtent = osg::Vec3f(0.0, 0.0, physicActor->getHalfExtents().z());
+
+        // use a 3d approximation of the movement vector to better judge player intent
+        const ESM::Position& refpos = ptr.getRefData().getPosition();
+        auto velocity = (osg::Quat(refpos.rot[0], osg::Vec3f(-1, 0, 0)) * osg::Quat(refpos.rot[2], osg::Vec3f(0, 0, -1))) * actor.mMovement;
+        // try to pop outside of the world before doing anything else if we're inside of it
+        if (!physicActor->getOnGround() || physicActor->getOnSlope())
+                velocity += physicActor->getInertialForce();
+
+        // because of the internal collision box offset hack, and the fact that we're moving the collision box manually,
+        // we need to replicate part of the collision box's transform process from scratch
+        osg::Vec3f refPosition = tempPosition + verticalHalfExtent;
+        osg::Vec3f goodPosition = refPosition;
+        const btTransform oldTransform = collisionObject->getWorldTransform();
+        btTransform newTransform = oldTransform;
+
+        auto gatherContacts = [&](btVector3 newOffset) -> ContactCollectionCallback
+        {
+            goodPosition = refPosition + Misc::Convert::toOsg(addMarginToDelta(newOffset));
+            newTransform.setOrigin(Misc::Convert::toBullet(goodPosition));
+            collisionObject->setWorldTransform(newTransform);
+
+            ContactCollectionCallback callback{collisionObject, velocity};
+            ContactTestWrapper::contactTest(const_cast<btCollisionWorld*>(collisionWorld), collisionObject, callback);
+            return callback;
+        };
+
+        // check whether we're inside the world with our collision box with manually-derived offset
+        auto contactCallback = gatherContacts({0.0, 0.0, 0.0});
+        if(contactCallback.mDistance < -sAllowedPenetration)
+        {
+            // we are; try moving it out of the world
+            auto positionDelta = contactCallback.mContactSum;
+            // limit rejection delta to the largest known individual rejections
+            if(std::abs(positionDelta.x()) > contactCallback.mMaxX)
+                positionDelta *= contactCallback.mMaxX / std::abs(positionDelta.x());
+            if(std::abs(positionDelta.y()) > contactCallback.mMaxY)
+                positionDelta *= contactCallback.mMaxY / std::abs(positionDelta.y());
+            if(std::abs(positionDelta.z()) > contactCallback.mMaxZ)
+                positionDelta *= contactCallback.mMaxZ / std::abs(positionDelta.z());
+
+            auto contactCallback2 = gatherContacts(positionDelta);
+            // successfully moved further out from contact (does not have to be in open space, just less inside of things)
+            if(contactCallback2.mDistance > contactCallback.mDistance)
+                tempPosition = goodPosition - verticalHalfExtent;
+            // try again but only upwards (fixes some bad coc floors)
+            else
+            {
+                // upwards-only offset
+                auto contactCallback3 = gatherContacts({0.0, 0.0, std::abs(positionDelta.z())});
+                // success
+                if(contactCallback3.mDistance > contactCallback.mDistance)
+                    tempPosition = goodPosition - verticalHalfExtent;
+                else
+                // try again but fixed distance up
+                {
+                    auto contactCallback4 = gatherContacts({0.0, 0.0, 10.0});
+                    // success
+                    if(contactCallback4.mDistance > contactCallback.mDistance)
+                        tempPosition = goodPosition - verticalHalfExtent;
+                }
+            }
+        }
+
+        collisionObject->setWorldTransform(oldTransform);
+        actor.mPosition = tempPosition;
     }
 }
diff --git a/apps/openmw/mwphysics/movementsolver.hpp b/apps/openmw/mwphysics/movementsolver.hpp
index 75fba1cf0e..76141ec0e9 100644
--- a/apps/openmw/mwphysics/movementsolver.hpp
+++ b/apps/openmw/mwphysics/movementsolver.hpp
@@ -5,6 +5,9 @@
 
 #include <osg/Vec3f>
 
+#include "constants.hpp"
+#include "../mwworld/ptr.hpp"
+
 class btCollisionWorld;
 
 namespace MWWorld
@@ -14,29 +17,35 @@ namespace MWWorld
 
 namespace MWPhysics
 {
+    /// Vector projection
+    static inline osg::Vec3f project(const osg::Vec3f& u, const osg::Vec3f &v)
+    {
+        return v * (u * v);
+    }
+
+    /// Vector rejection
+    static inline osg::Vec3f reject(const osg::Vec3f& direction, const osg::Vec3f &planeNormal)
+    {
+        return direction - project(direction, planeNormal);
+    }
+
+    template <class Vec3>
+    static bool isWalkableSlope(const Vec3 &normal)
+    {
+        static const float sMaxSlopeCos = std::cos(osg::DegreesToRadians(sMaxSlope));
+        return (normal.z() > sMaxSlopeCos);
+    }
+
     class Actor;
     struct ActorFrameData;
     struct WorldFrameData;
 
     class MovementSolver
     {
-    private:
-        ///Project a vector u on another vector v
-        static inline osg::Vec3f project(const osg::Vec3f& u, const osg::Vec3f &v)
-        {
-            return v * (u * v);
-            //            ^ dot product
-        }
-
-        ///Helper for computing the character sliding
-        static inline osg::Vec3f slide(const osg::Vec3f& direction, const osg::Vec3f &planeNormal)
-        {
-            return direction - project(direction, planeNormal);
-        }
-
     public:
         static osg::Vec3f traceDown(const MWWorld::Ptr &ptr, const osg::Vec3f& position, Actor* actor, btCollisionWorld* collisionWorld, float maxHeight);
         static void move(ActorFrameData& actor, float time, const btCollisionWorld* collisionWorld, WorldFrameData& worldData);
+        static void unstuck(ActorFrameData& actor, const btCollisionWorld* collisionWorld);
     };
 }
 
diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index f610ceaea3..0d1e5962a0 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -13,6 +13,7 @@
 #include "../mwworld/player.hpp"
 
 #include "actor.hpp"
+#include "contacttestwrapper.h"
 #include "movementsolver.hpp"
 #include "mtphysics.hpp"
 #include "object.hpp"
@@ -167,7 +168,14 @@ namespace MWPhysics
 
         mPreStepBarrier = std::make_unique<Misc::Barrier>(mNumThreads, [&]()
             {
+            if (mDeferAabbUpdate)
                 updateAabbs();
+            for (auto& data : mActorsFrameData)
+                if (data.mActor.lock())
+                {
+                    std::unique_lock lock(mCollisionWorldMutex);
+                    MovementSolver::unstuck(data, mCollisionWorld.get());
+                }
             });
 
         mPostStepBarrier = std::make_unique<Misc::Barrier>(mNumThreads, [&]()
@@ -295,7 +303,7 @@ namespace MWPhysics
     void PhysicsTaskScheduler::contactTest(btCollisionObject* colObj, btCollisionWorld::ContactResultCallback& resultCallback)
     {
         std::shared_lock lock(mCollisionWorldMutex);
-        mCollisionWorld->contactTest(colObj, resultCallback);
+        ContactTestWrapper::contactTest(mCollisionWorld.get(), colObj, resultCallback);
     }
 
     std::optional<btVector3> PhysicsTaskScheduler::getHitPoint(const btTransform& from, btCollisionObject* target)
@@ -438,8 +446,7 @@ namespace MWPhysics
             if (!mNewFrame)
                 mHasJob.wait(lock, [&]() { return mQuit || mNewFrame; });
 
-            if (mDeferAabbUpdate)
-                mPreStepBarrier->wait();
+            mPreStepBarrier->wait();
 
             int job = 0;
             while (mRemainingSteps && (job = mNextJob.fetch_add(1, std::memory_order_relaxed)) < mNumJobs)
@@ -505,7 +512,10 @@ namespace MWPhysics
         while (mRemainingSteps--)
         {
             for (auto& actorData : mActorsFrameData)
+            {
+                MovementSolver::unstuck(actorData, mCollisionWorld.get());
                 MovementSolver::move(actorData, mPhysicsDt, mCollisionWorld.get(), *mWorldFrameData);
+            }
 
             updateActorsPositions();
         }
diff --git a/apps/openmw/mwphysics/raycasting.hpp b/apps/openmw/mwphysics/raycasting.hpp
index 8ca6965d8e..b176e83304 100644
--- a/apps/openmw/mwphysics/raycasting.hpp
+++ b/apps/openmw/mwphysics/raycasting.hpp
@@ -16,7 +16,7 @@ namespace MWPhysics
         osg::Vec3f mHitNormal;
         MWWorld::Ptr mHitObject;
     };
-    
+
     class RayCastingInterface
     {
         public:
diff --git a/apps/openmw/mwphysics/stepper.cpp b/apps/openmw/mwphysics/stepper.cpp
index 0ab383dd1e..2a28381bee 100644
--- a/apps/openmw/mwphysics/stepper.cpp
+++ b/apps/openmw/mwphysics/stepper.cpp
@@ -7,6 +7,7 @@
 
 #include "collisiontype.hpp"
 #include "constants.hpp"
+#include "movementsolver.hpp"
 
 namespace MWPhysics
 {
@@ -24,125 +25,155 @@ namespace MWPhysics
     Stepper::Stepper(const btCollisionWorld *colWorld, const btCollisionObject *colObj)
         : mColWorld(colWorld)
         , mColObj(colObj)
-        , mHaveMoved(true)
     {
     }
 
-    bool Stepper::step(osg::Vec3f &position, const osg::Vec3f &toMove, float &remainingTime)
+    bool Stepper::step(osg::Vec3f &position, osg::Vec3f &velocity, float &remainingTime, const bool & onGround, bool firstIteration)
     {
-        /*
-         * Slide up an incline or set of stairs.  Should be called only after a
-         * collision detection otherwise unnecessary tracing will be performed.
-         *
-         * NOTE: with a small change this method can be used to step over an obstacle
-         * of height sStepSize.
-         *
-         * If successful return 'true' and update 'position' to the new possible
-         * location and adjust 'remainingTime'.
-         *
-         * If not successful return 'false'.  May fail for these reasons:
-         *    - can't move directly up from current position
-         *    - having moved up by between epsilon() and sStepSize, can't move forward
-         *    - having moved forward by between epsilon() and toMove,
-         *        = moved down between 0 and just under sStepSize but slope was too steep, or
-         *        = moved the full sStepSize down (FIXME: this could be a bug)
-         *
-         * Starting position.  Obstacle or stairs with height upto sStepSize in front.
-         *
-         *     +--+                          +--+       |XX
-         *     |  | -------> toMove          |  |    +--+XX
-         *     |  |                          |  |    |XXXXX
-         *     |  | +--+                     |  | +--+XXXXX
-         *     |  | |XX|                     |  | |XXXXXXXX
-         *     +--+ +--+                     +--+ +--------
-         *    ==============================================
-         */
-
-        /*
-         * Try moving up sStepSize using stepper.
-         * FIXME: does not work in case there is no front obstacle but there is one above
-         *
-         *     +--+                         +--+
-         *     |  |                         |  |
-         *     |  |                         |  |       |XX
-         *     |  |                         |  |    +--+XX
-         *     |  |                         |  |    |XXXXX
-         *     +--+ +--+                    +--+ +--+XXXXX
-         *          |XX|                         |XXXXXXXX
-         *          +--+                         +--------
-         *    ==============================================
-         */
-        if (mHaveMoved)
-        {
-            mHaveMoved = false;
+        if(velocity.x() == 0.0 && velocity.y() == 0.0)
+            return false;
+
+        // Stairstepping algorithms work by moving up to avoid the step, moving forwards, then moving back down onto the ground.
+        // This algorithm has a couple of minor problems, but they don't cause problems for sane geometry, and just prevent stepping on insane geometry.
 
-            mUpStepper.doTrace(mColObj, position, position+osg::Vec3f(0.0f,0.0f,sStepSizeUp), mColWorld);
-            if (mUpStepper.mFraction < std::numeric_limits<float>::epsilon())
-                return false; // didn't even move the smallest representable amount
-                              // (TODO: shouldn't this be larger? Why bother with such a small amount?)
+        mUpStepper.doTrace(mColObj, position, position+osg::Vec3f(0.0f,0.0f,sStepSizeUp), mColWorld);
+
+        float upDistance = 0;
+        if(!mUpStepper.mHitObject)
+            upDistance = sStepSizeUp;
+        else if(mUpStepper.mFraction*sStepSizeUp > sCollisionMargin)
+            upDistance = mUpStepper.mFraction*sStepSizeUp - sCollisionMargin;
+        else
+        {
+            return false;
         }
 
-        /*
-         * Try moving from the elevated position using tracer.
-         *
-         *                          +--+  +--+
-         *                          |  |  |YY|   FIXME: collision with object YY
-         *                          |  |  +--+
-         *                          |  |
-         *     <------------------->|  |
-         *          +--+            +--+
-         *          |XX|      the moved amount is toMove*tracer.mFraction
-         *          +--+
-         *    ==============================================
-         */
-        osg::Vec3f tracerPos = mUpStepper.mEndPos;
-        mTracer.doTrace(mColObj, tracerPos, tracerPos + toMove, mColWorld);
-        if (mTracer.mFraction < std::numeric_limits<float>::epsilon())
-            return false; // didn't even move the smallest representable amount
-
-        /*
-         * Try moving back down sStepSizeDown using stepper.
-         * NOTE: if there is an obstacle below (e.g. stairs), we'll be "stepping up".
-         * Below diagram is the case where we "stepped over" an obstacle in front.
-         *
-         *                                +--+
-         *                                |YY|
-         *                          +--+  +--+
-         *                          |  |
-         *                          |  |
-         *          +--+            |  |
-         *          |XX|            |  |
-         *          +--+            +--+
-         *    ==============================================
-         */
-        mDownStepper.doTrace(mColObj, mTracer.mEndPos, mTracer.mEndPos-osg::Vec3f(0.0f,0.0f,sStepSizeDown), mColWorld);
-        if (!canStepDown(mDownStepper))
+        auto toMove = velocity * remainingTime;
+
+        osg::Vec3f tracerPos = position + osg::Vec3f(0.0f, 0.0f, upDistance);
+
+        osg::Vec3f tracerDest;
+        auto normalMove = toMove;
+        auto moveDistance = normalMove.normalize();
+        // attempt 1: normal movement
+        // attempt 2: fixed distance movement, only happens on the first movement solver iteration/bounce each frame to avoid a glitch
+        // attempt 3: further, less tall fixed distance movement, same as above
+        // If you're making a full conversion you should purge the logic for attempts 2 and 3. Attempts 2 and 3 just try to work around problems with vanilla Morrowind assets.
+        int attempt = 0;
+        float downStepSize;
+        while(attempt < 3)
         {
-            // Try again with increased step length
-            if (mTracer.mFraction < 1.0f || toMove.length2() > sMinStep*sMinStep)
-                return false;
+            attempt++;
 
-            osg::Vec3f direction = toMove;
-            direction.normalize();
-            mTracer.doTrace(mColObj, tracerPos, tracerPos + direction*sMinStep, mColWorld);
-            if (mTracer.mFraction < 0.001f)
+            if(attempt == 1)
+                tracerDest = tracerPos + toMove;
+            else if (!firstIteration || !sDoExtraStairHacks) // first attempt failed and not on first movement solver iteration, can't retry -- or we have extra hacks disabled
+            {
                 return false;
+            }
+            else if(attempt == 2)
+            {
+                moveDistance = sMinStep;
+                tracerDest = tracerPos + normalMove*sMinStep;
+            }
+            else if(attempt == 3)
+            {
+                if(upDistance > sStepSizeUp)
+                {
+                    upDistance = sStepSizeUp;
+                    tracerPos = position + osg::Vec3f(0.0f, 0.0f, upDistance);
+                }
+                moveDistance = sMinStep2;
+                tracerDest = tracerPos + normalMove*sMinStep2;
+            }
+
+            mTracer.doTrace(mColObj, tracerPos, tracerDest, mColWorld);
+            if(mTracer.mHitObject)
+            {
+                // map against what we hit, minus the safety margin
+                moveDistance *= mTracer.mFraction;
+                if(moveDistance <= sCollisionMargin) // didn't move enough to accomplish anything
+                {
+                    return false;
+                }
+
+                moveDistance -= sCollisionMargin;
+                tracerDest = tracerPos + normalMove*moveDistance;
+
+                // safely eject from what we hit by the safety margin
+                auto tempDest = tracerDest + mTracer.mPlaneNormal*sCollisionMargin*2;
+
+                ActorTracer tempTracer;
+                tempTracer.doTrace(mColObj, tracerDest, tempDest, mColWorld);
+
+                if(tempTracer.mFraction > 0.5f) // distance to any object is greater than sCollisionMargin (we checked sCollisionMargin*2 distance)
+                {
+                    auto effectiveFraction = tempTracer.mFraction*2.0f - 1.0f;
+                    tracerDest += mTracer.mPlaneNormal*sCollisionMargin*effectiveFraction;
+                }
+            }
+
+            if(attempt > 2) // do not allow stepping down below original height for attempt 3
+                downStepSize = upDistance;
+            else
+                downStepSize = moveDistance + upDistance + sStepSizeDown;
+            mDownStepper.doTrace(mColObj, tracerDest, tracerDest + osg::Vec3f(0.0f, 0.0f, -downStepSize), mColWorld);
+
+            // can't step down onto air, non-walkable-slopes, or actors
+            // NOTE: using a capsule causes isWalkableSlope (used in canStepDown) to fail on certain geometry that were intended to be valid at the bottoms of stairs
+            // (like the bottoms of the staircases in aldruhn's guild of mages)
+            // The old code worked around this by trying to do mTracer again with a fixed distance of sMinStep (10.0) but it caused all sorts of other problems.
+            // Switched back to cylinders to avoid that and similer problems.
+            if(canStepDown(mDownStepper))
+            {
+                break;
+            }
+            else
+            {
+                // do not try attempt 3 if we just tried attempt 2 and the horizontal distance was rather large
+                // (forces actor to get snug against the defective ledge for attempt 3 to be tried)
+                if(attempt == 2 && moveDistance > upDistance-(mDownStepper.mFraction*downStepSize))
+                {
+                    return false;
+                }
+                // do next attempt if first iteration of movement solver and not out of attempts
+                if(firstIteration && attempt < 3)
+                {
+                    continue;
+                }
 
-            mDownStepper.doTrace(mColObj, mTracer.mEndPos, mTracer.mEndPos-osg::Vec3f(0.0f,0.0f,sStepSizeDown), mColWorld);
-            if (!canStepDown(mDownStepper))
                 return false;
+            }
         }
 
-        if (mDownStepper.mFraction < 1.0f)
+        // note: can't downstep onto actors so no need to pick safety margin
+        float downDistance = 0;
+        if(mDownStepper.mFraction*downStepSize > sCollisionMargin)
+            downDistance = mDownStepper.mFraction*downStepSize - sCollisionMargin;
+
+        if(downDistance-sCollisionMargin-sGroundOffset > upDistance && !onGround)
+            return false;
+
+        auto newpos = tracerDest + osg::Vec3f(0.0f, 0.0f, -downDistance);
+
+        if((position-newpos).length2() < sCollisionMargin*sCollisionMargin)
+            return false;
+
+        if(mTracer.mHitObject)
         {
-            // only step down onto semi-horizontal surfaces. don't step down onto the side of a house or a wall.
-            // TODO: stepper.mPlaneNormal does not appear to be reliable - needs more testing
-            // NOTE: caller's variables 'position' & 'remainingTime' are modified here
-            position = mDownStepper.mEndPos;
-            remainingTime *= (1.0f-mTracer.mFraction); // remaining time is proportional to remaining distance
-            mHaveMoved = true;
-            return true;
+            auto planeNormal = mTracer.mPlaneNormal;
+            if (onGround && !isWalkableSlope(planeNormal) && planeNormal.z() != 0)
+            {
+                planeNormal.z() = 0;
+                planeNormal.normalize();
+            }
+            velocity = reject(velocity, planeNormal);
         }
-        return false;
+        velocity = reject(velocity, mDownStepper.mPlaneNormal);
+
+        position = newpos;
+
+        remainingTime *= (1.0f-mTracer.mFraction); // remaining time is proportional to remaining distance
+        return true;
     }
 }
diff --git a/apps/openmw/mwphysics/stepper.hpp b/apps/openmw/mwphysics/stepper.hpp
index 27e6294b05..512493c524 100644
--- a/apps/openmw/mwphysics/stepper.hpp
+++ b/apps/openmw/mwphysics/stepper.hpp
@@ -20,12 +20,11 @@ namespace MWPhysics
         const btCollisionObject *mColObj;
 
         ActorTracer mTracer, mUpStepper, mDownStepper;
-        bool mHaveMoved;
 
     public:
         Stepper(const btCollisionWorld *colWorld, const btCollisionObject *colObj);
 
-        bool step(osg::Vec3f &position, const osg::Vec3f &toMove, float &remainingTime);
+        bool step(osg::Vec3f &position, osg::Vec3f &velocity, float &remainingTime, const bool & onGround, bool firstIteration);
     };
 }
 
diff --git a/apps/openmw/mwphysics/trace.cpp b/apps/openmw/mwphysics/trace.cpp
index 58082f4db2..f50b6100a6 100644
--- a/apps/openmw/mwphysics/trace.cpp
+++ b/apps/openmw/mwphysics/trace.cpp
@@ -24,7 +24,7 @@ void ActorTracer::doTrace(const btCollisionObject *actor, const osg::Vec3f& star
     to.setOrigin(btend);
 
     const btVector3 motion = btstart-btend;
-    ClosestNotMeConvexResultCallback newTraceCallback(actor, motion, btScalar(0.0));
+    ClosestNotMeConvexResultCallback newTraceCallback(actor, motion, btScalar(0.0), world);
     // Inherit the actor's collision group and mask
     newTraceCallback.m_collisionFilterGroup = actor->getBroadphaseHandle()->m_collisionFilterGroup;
     newTraceCallback.m_collisionFilterMask = actor->getBroadphaseHandle()->m_collisionFilterMask;
@@ -62,7 +62,7 @@ void ActorTracer::findGround(const Actor* actor, const osg::Vec3f& start, const
     btTransform to(trans.getBasis(), btend);
 
     const btVector3 motion = btstart-btend;
-    ClosestNotMeConvexResultCallback newTraceCallback(actor->getCollisionObject(), motion, btScalar(0.0));
+    ClosestNotMeConvexResultCallback newTraceCallback(actor->getCollisionObject(), motion, btScalar(0.0), world);
     // Inherit the actor's collision group and mask
     newTraceCallback.m_collisionFilterGroup = actor->getCollisionObject()->getBroadphaseHandle()->m_collisionFilterGroup;
     newTraceCallback.m_collisionFilterMask = actor->getCollisionObject()->getBroadphaseHandle()->m_collisionFilterMask;
diff --git a/appveyor.yml b/appveyor.yml
index e2c13ed948..ed6f727be5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -50,7 +50,7 @@ install:
 
 before_build:
     - cmd: git submodule update --init --recursive
-    - cmd: sh %APPVEYOR_BUILD_FOLDER%\CI\before_script.msvc.sh -c %configuration% -p %PLATFORM% -v %msvc% -V -i %APPVEYOR_BUILD_FOLDER%\install
+    - cmd: sh %APPVEYOR_BUILD_FOLDER%\CI\before_script.msvc.sh -c %configuration% -p %PLATFORM% -v %msvc% -V -i %APPVEYOR_BUILD_FOLDER%\install -D
 
 build_script:
     - cmd: if %PLATFORM%==Win32 set build=MSVC%msvc%_32
diff --git a/cmake/OSIdentity.cmake b/cmake/OSIdentity.cmake
new file mode 100644
index 0000000000..40b7b20895
--- /dev/null
+++ b/cmake/OSIdentity.cmake
@@ -0,0 +1,67 @@
+if (UNIX)
+
+    if (APPLE)
+
+        set(CMAKE_OS_NAME "OSX" CACHE STRING "Operating system name" FORCE)
+
+    else (APPLE)
+
+        ## Check for Debian GNU/Linux ________________
+
+        find_file(DEBIAN_FOUND debian_version debconf.conf
+                PATHS /etc
+                )
+        if (DEBIAN_FOUND)
+            set(CMAKE_OS_NAME "Debian" CACHE STRING "Operating system name" FORCE)
+        endif (DEBIAN_FOUND)
+
+        ##  Check for Fedora _________________________
+
+        find_file(FEDORA_FOUND fedora-release
+                PATHS /etc
+                )
+        if (FEDORA_FOUND)
+            set(CMAKE_OS_NAME "Fedora" CACHE STRING "Operating system name" FORCE)
+        endif (FEDORA_FOUND)
+
+        ##  Check for RedHat _________________________
+
+        find_file(REDHAT_FOUND redhat-release inittab.RH
+                PATHS /etc
+                )
+        if (REDHAT_FOUND)
+            set(CMAKE_OS_NAME "RedHat" CACHE STRING "Operating system name" FORCE)
+        endif (REDHAT_FOUND)
+
+        ## Extra check for Ubuntu ____________________
+
+        if (DEBIAN_FOUND)
+
+            ## At its core Ubuntu is a Debian system, with
+            ## a slightly altered configuration; hence from
+            ## a first superficial inspection a system will
+            ## be considered as Debian, which signifies an
+            ## extra check is required.
+
+            find_file(UBUNTU_EXTRA legal issue
+                    PATHS /etc
+                    )
+
+            if (UBUNTU_EXTRA)
+                ## Scan contents of file
+                file(STRINGS ${UBUNTU_EXTRA} UBUNTU_FOUND
+                        REGEX Ubuntu
+                        )
+                ## Check result of string search
+                if (UBUNTU_FOUND)
+                    set(CMAKE_OS_NAME "Ubuntu" CACHE STRING "Operating system name" FORCE)
+                    set(DEBIAN_FOUND FALSE)
+                endif (UBUNTU_FOUND)
+
+            endif (UBUNTU_EXTRA)
+
+        endif (DEBIAN_FOUND)
+
+    endif (APPLE)
+
+endif (UNIX)
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 10a5d22fbe..832fc611f6 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -236,7 +236,6 @@ target_link_libraries(components
     ${OSGGA_LIBRARIES}
     ${OSGSHADOW_LIBRARIES}
     ${OSGANIMATION_LIBRARIES}
-    ${BULLET_LIBRARIES}
     ${SDL2_LIBRARIES}
     ${OPENGL_gl_LIBRARY}
     ${MyGUI_LIBRARIES}
@@ -246,6 +245,12 @@ target_link_libraries(components
     RecastNavigation::Recast
     )
 
+if (BULLET_USE_DOUBLES AND (UBUNTU_FOUND OR DEBIAN_FOUND))
+    target_link_libraries(components BulletCollision-float64 LinearMath-float64)
+else()
+    target_link_libraries(components ${BULLET_LIBRARIES})
+endif()
+
 if (WIN32)
     target_link_libraries(components
     ${Boost_LOCALE_LIBRARY}

From 6a12c2b58b80ca69c93575820be8666d493f60b1 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 28 Dec 2020 12:06:41 +0400
Subject: [PATCH 0151/2859] Fix GCC build warnings

---
 apps/openmw/mwmechanics/aifollow.cpp                       | 1 -
 apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp | 2 +-
 apps/openmw/mwphysics/movementsolver.cpp                   | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwmechanics/aifollow.cpp b/apps/openmw/mwmechanics/aifollow.cpp
index 1e4fb206e3..f31be9c10a 100644
--- a/apps/openmw/mwmechanics/aifollow.cpp
+++ b/apps/openmw/mwmechanics/aifollow.cpp
@@ -119,7 +119,6 @@ bool AiFollow::execute (const MWWorld::Ptr& actor, CharacterController& characte
     auto followers = MWBase::Environment::get().getMechanicsManager()->getActorsFollowingByIndex(target);
     if (followers.size() >= 2 && followers.cbegin()->first != mFollowIndex)
     {
-        osg::Vec3f::value_type maxSize = 0;
         for(auto& follower : followers)
         {
             auto halfExtent = MWBase::Environment::get().getWorld()->getHalfExtents(follower.second).y();
diff --git a/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp b/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp
index 8dd5a624fc..27e7a390c4 100644
--- a/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp
+++ b/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp
@@ -23,7 +23,7 @@ namespace MWPhysics
             int index0,
             const btCollisionObjectWrapper* colObj1Wrap,
             int partId1,
-            int index1)
+            int index1) override
         {
             if(cp.getDistance() <= 0.0f)
                 overlapping = true;
diff --git a/apps/openmw/mwphysics/movementsolver.cpp b/apps/openmw/mwphysics/movementsolver.cpp
index 69bf042369..9d29574098 100644
--- a/apps/openmw/mwphysics/movementsolver.cpp
+++ b/apps/openmw/mwphysics/movementsolver.cpp
@@ -41,7 +41,7 @@ namespace MWPhysics
             m_collisionFilterMask = me->getBroadphaseHandle()->m_collisionFilterMask;
             mVelocity = Misc::Convert::toBullet(velocity);
         }
-        virtual btScalar addSingleResult(btManifoldPoint & contact, const btCollisionObjectWrapper * colObj0Wrap, int partId0, int index0, const btCollisionObjectWrapper * colObj1Wrap, int partId1, int index1)
+        btScalar addSingleResult(btManifoldPoint & contact, const btCollisionObjectWrapper * colObj0Wrap, int partId0, int index0, const btCollisionObjectWrapper * colObj1Wrap, int partId1, int index1) override
         {
             if (isActor(colObj0Wrap->getCollisionObject()) && isActor(colObj1Wrap->getCollisionObject()))
                 return 0.0;

From 66fee6dccbc539770a3adc3ead060c0dbd14e27b Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 28 Dec 2020 11:45:17 +0400
Subject: [PATCH 0152/2859] Enhance level-up tooltip

---
 apps/openmw/mwgui/statswindow.cpp  | 11 +++++++----
 files/mygui/openmw_tooltips.layout |  1 +
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwgui/statswindow.cpp b/apps/openmw/mwgui/statswindow.cpp
index e02b2f45f1..66a1ea1eff 100644
--- a/apps/openmw/mwgui/statswindow.cpp
+++ b/apps/openmw/mwgui/statswindow.cpp
@@ -5,6 +5,7 @@
 #include <MyGUI_ProgressBar.h>
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_InputManager.h>
+#include <MyGUI_LanguageManager.h>
 #include <MyGUI_Gui.h>
 
 #include <components/settings/settings.hpp>
@@ -336,14 +337,16 @@ namespace MWGui
             int max = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("iLevelUpTotal")->mValue.getInteger();
             getWidget(levelWidget, i==0 ? "Level_str" : "LevelText");
 
-            std::string detail;
+            std::stringstream detail;
             for (int i = 0; i < ESM::Attribute::Length; ++i)
             {
                 if (auto increase = PCstats.getLevelUpAttributeIncrease(i))
-                    detail += (detail.empty() ? "" : "\n") + ESM::Attribute::sAttributeNames[i] + " x" + MyGUI::utility::toString(increase);
+                    detail << (detail.str().empty() ? "" : "\n") << "#{"
+                    << MyGUI::TextIterator::toTagsString(ESM::Attribute::sGmstAttributeIds[i])
+                    << "} x" << MyGUI::utility::toString(increase);
             }
-            if (!detail.empty())
-                levelWidget->setUserString("Caption_LevelDetailText", detail);
+            if (!detail.str().empty())
+                levelWidget->setUserString("Caption_LevelDetailText", MyGUI::LanguageManager::getInstance().replaceTags(detail.str()));
             levelWidget->setUserString("RangePosition_LevelProgress", MyGUI::utility::toString(PCstats.getLevelProgress()));
             levelWidget->setUserString("Range_LevelProgress", MyGUI::utility::toString(max));
             levelWidget->setUserString("Caption_LevelProgressText", MyGUI::utility::toString(PCstats.getLevelProgress()) + "/"
diff --git a/files/mygui/openmw_tooltips.layout b/files/mygui/openmw_tooltips.layout
index 59050f932b..bb505d2539 100644
--- a/files/mygui/openmw_tooltips.layout
+++ b/files/mygui/openmw_tooltips.layout
@@ -272,6 +272,7 @@
                 <Property key="AutoResize" value="true"/>
                 <Property key="MultiLine" value="true"/>
                 <Property key="Shrink" value="true"/>
+                <Property key="TextAlign" value="HCenter Top"/>
             </Widget>
         </Widget>
 

From ee2416017ecd15baed2dd213d1cca8184d916dfc Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 28 Dec 2020 12:19:22 +0400
Subject: [PATCH 0153/2859] Fix tag mismatch

---
 components/nifbullet/bulletnifloader.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/nifbullet/bulletnifloader.hpp b/components/nifbullet/bulletnifloader.hpp
index 054b33fedb..17a0d3e8b9 100644
--- a/components/nifbullet/bulletnifloader.hpp
+++ b/components/nifbullet/bulletnifloader.hpp
@@ -23,7 +23,7 @@ class btCollisionShape;
 
 namespace Nif
 {
-    class Node;
+    struct Node;
     struct Transformation;
     struct NiTriShape;
     struct NiTriStrips;

From 694b9c15059f7fd3d3cc67acb94339d15e30b918 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 28 Dec 2020 18:11:51 +0100
Subject: [PATCH 0154/2859] Fixed by 7cac7fa87052e9e14a2e2ec3b5fb489a4820cdbb

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 661a058d4c..15bb77e739 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
     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

From e80d34268ca8d1c5c37ec51d5bb7dec8e67d13cf Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 28 Dec 2020 21:11:58 +0400
Subject: [PATCH 0155/2859] Fix defines names

---
 apps/openmw/mwrender/landmanager.hpp  | 4 ++--
 apps/openmw/mwrender/objectpaging.hpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwrender/landmanager.hpp b/apps/openmw/mwrender/landmanager.hpp
index ea73f11c2b..1694bd243b 100644
--- a/apps/openmw/mwrender/landmanager.hpp
+++ b/apps/openmw/mwrender/landmanager.hpp
@@ -1,5 +1,5 @@
-#ifndef OPENMW_COMPONENTS_ESMTERRAIN_LANDMANAGER_H
-#define OPENMW_COMPONENTS_ESMTERRAIN_LANDMANAGER_H
+#ifndef OPENMW_MWRENDER_LANDMANAGER_H
+#define OPENMW_MWRENDER_LANDMANAGER_H
 
 #include <osg/Object>
 
diff --git a/apps/openmw/mwrender/objectpaging.hpp b/apps/openmw/mwrender/objectpaging.hpp
index ff32dadd4d..65f53d530c 100644
--- a/apps/openmw/mwrender/objectpaging.hpp
+++ b/apps/openmw/mwrender/objectpaging.hpp
@@ -1,5 +1,5 @@
-#ifndef OPENMW_COMPONENTS_ESMPAGING_CHUNKMANAGER_H
-#define OPENMW_COMPONENTS_ESMPAGING_CHUNKMANAGER_H
+#ifndef OPENMW_MWRENDER_OBJECTPAGING_H
+#define OPENMW_MWRENDER_OBJECTPAGING_H
 
 #include <components/terrain/quadtreeworld.hpp>
 #include <components/resource/resourcemanager.hpp>

From e4e19bab1b3b7bbd1f0eb45c58209f731d6d55f2 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Mon, 28 Dec 2020 21:42:04 +0300
Subject: [PATCH 0156/2859] Make min and max view distance accurate to vanilla

---
 docs/source/reference/modding/settings/camera.rst |  2 +-
 files/mygui/openmw_settings_window.layout         | 10 +++++-----
 files/settings-default.cfg                        |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/source/reference/modding/settings/camera.rst b/docs/source/reference/modding/settings/camera.rst
index 5701947dc4..c30dcb3f3b 100644
--- a/docs/source/reference/modding/settings/camera.rst
+++ b/docs/source/reference/modding/settings/camera.rst
@@ -46,7 +46,7 @@ viewing distance
 
 :Type:		floating point
 :Range:		> 0
-:Default:	6656.0
+:Default:	7168.0
 
 This value controls the maximum visible distance (also called the far clipping plane).
 Larger values significantly improve rendering in exterior spaces,
diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index f61af5a100..14ab7c9de5 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -377,25 +377,25 @@
                             <Property key="Caption" value="#{sRender_Distance}"/>
                         </Widget>
                         <Widget type="ScrollBar" skin="MW_HScroll" position="0 154 352 18" align="HStretch Top" name="RenderingDistanceSlider">
-                            <Property key="Range" value="4609"/>
+                            <Property key="Range" value="4669"/>
                             <Property key="Page" value="128"/>
                             <UserString key="SettingType" value="Slider"/>
                             <UserString key="SettingCategory" value="Camera"/>
                             <UserString key="SettingName" value="viewing distance"/>
                             <UserString key="SettingValueType" value="Integer"/>
-                            <UserString key="SettingMin" value="2048"/>
-                            <UserString key="SettingMax" value="6656"/>
+                            <UserString key="SettingMin" value="2500"/>
+                            <UserString key="SettingMax" value="7168"/>
                             <UserString key="SettingLabelWidget" value="RenderDistanceLabel"/>
                             <UserString key="SettingLabelCaption" value="#{sRender_Distance} (%s)"/>
                         </Widget>
                         <Widget type="ScrollBar" skin="MW_HScroll" position="0 154 352 18" align="HStretch Top" name="LargeRenderingDistanceSlider">
-                            <Property key="Range" value="79873"/>
+                            <Property key="Range" value="79421"/>
                             <Property key="Page" value="2048"/>
                             <UserString key="SettingType" value="Slider"/>
                             <UserString key="SettingCategory" value="Camera"/>
                             <UserString key="SettingName" value="viewing distance"/>
                             <UserString key="SettingValueType" value="Cell"/>
-                            <UserString key="SettingMin" value="2048"/>
+                            <UserString key="SettingMin" value="2500"/>
                             <UserString key="SettingMax" value="81920"/>
                             <UserString key="SettingLabelWidget" value="RenderDistanceLabel"/>
                             <UserString key="SettingLabelCaption" value="#{sRender_Distance} (x%s)"/>
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index c8805faa39..d0793fc819 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -23,7 +23,7 @@ small feature culling pixel size = 2.0
 
 # Maximum visible distance. Caution: this setting
 # can dramatically affect performance, see documentation for details.
-viewing distance = 6656.0
+viewing distance = 7168.0
 
 # Camera field of view in degrees (e.g. 30.0 to 110.0).
 # Does not affect the player's hands in the first person camera.

From 54853380cdbdeb76195244a5f85ac75a956dd005 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Mon, 28 Dec 2020 22:39:09 +0000
Subject: [PATCH 0157/2859] Enable multisampling in RTTs to support A2C

---
 apps/openmw/mwrender/characterpreview.cpp |  3 ++-
 apps/openmw/mwrender/localmap.cpp         | 12 +++++++++++-
 apps/openmw/mwrender/water.cpp            | 24 +++++++++++++++++++++--
 3 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index 89db3e5f46..061f4d5094 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -17,6 +17,7 @@
 #include <components/fallback/fallback.hpp>
 #include <components/sceneutil/lightmanager.hpp>
 #include <components/sceneutil/shadow.hpp>
+#include <components/settings/settings.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
@@ -135,7 +136,7 @@ namespace MWRender
         mCamera->setProjectionMatrixAsPerspective(fovYDegrees, sizeX/static_cast<float>(sizeY), 0.1f, 10000.f); // zNear and zFar are autocomputed
         mCamera->setViewport(0, 0, sizeX, sizeY);
         mCamera->setRenderOrder(osg::Camera::PRE_RENDER);
-        mCamera->attach(osg::Camera::COLOR_BUFFER, mTexture);
+        mCamera->attach(osg::Camera::COLOR_BUFFER, mTexture, 0, 0, false, Settings::Manager::getInt("antialiasing", "Video"));
         mCamera->setName("CharacterPreview");
         mCamera->setComputeNearFarMode(osg::Camera::COMPUTE_NEAR_FAR_USING_BOUNDING_VOLUMES);
         mCamera->setCullMask(~(Mask_UpdateVisitor));
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index 401e21ae46..90c85f39fa 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -233,7 +233,17 @@ void LocalMap::setupRenderToTexture(osg::ref_ptr<osg::Camera> camera, int x, int
     texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
     texture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
 
-    camera->attach(osg::Camera::COLOR_BUFFER, texture);
+    unsigned int samples = 0;
+    unsigned int colourSamples = 0;
+    if (Settings::Manager::getBool("convert alpha test to alpha-to-coverage", "Shaders"))
+    {
+        // Alpha-to-coverage requires a multisampled framebuffer.
+        // OSG will set that up automatically and resolve it to the specified single-sample texture for us.
+        // For some reason, two samples are needed, at least with some drivers.
+        samples = 2;
+        colourSamples = 1;
+    }
+    camera->attach(osg::Camera::COLOR_BUFFER, texture, 0, 0, false, samples, colourSamples);
 
     camera->addChild(mSceneRoot);
     mRoot->addChild(camera);
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index b9018e0a27..3d3ec4ef6e 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -271,7 +271,17 @@ public:
         mRefractionTexture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
         mRefractionTexture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
 
-        attach(osg::Camera::COLOR_BUFFER, mRefractionTexture);
+        unsigned int samples = 0;
+        unsigned int colourSamples = 0;
+        if (Settings::Manager::getBool("convert alpha test to alpha-to-coverage", "Shaders"))
+        {
+            // Alpha-to-coverage requires a multisampled framebuffer.
+            // OSG will set that up automatically and resolve it to the specified single-sample texture for us.
+            // For some reason, two samples are needed, at least with some drivers.
+            samples = 2;
+            colourSamples = 1;
+        }
+        attach(osg::Camera::COLOR_BUFFER, mRefractionTexture, 0, 0, false, samples, colourSamples);
 
         mRefractionDepthTexture = new osg::Texture2D;
         mRefractionDepthTexture->setTextureSize(rttSize, rttSize);
@@ -356,7 +366,17 @@ public:
         mReflectionTexture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
         mReflectionTexture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
 
-        attach(osg::Camera::COLOR_BUFFER, mReflectionTexture);
+        unsigned int samples = 0;
+        unsigned int colourSamples = 0;
+        if (Settings::Manager::getBool("convert alpha test to alpha-to-coverage", "Shaders"))
+        {
+            // Alpha-to-coverage requires a multisampled framebuffer.
+            // OSG will set that up automatically and resolve it to the specified single-sample texture for us.
+            // For some reason, two samples are needed, at least with some drivers.
+            samples = 2;
+            colourSamples = 1;
+        }
+        attach(osg::Camera::COLOR_BUFFER, mReflectionTexture, 0, 0, false, samples, colourSamples);
 
         // XXX: should really flip the FrontFace on each renderable instead of forcing clockwise.
         osg::ref_ptr<osg::FrontFace> frontFace (new osg::FrontFace);

From e46472442a01ca792371b6da20e42f74033bda26 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Tue, 29 Dec 2020 01:40:30 +0000
Subject: [PATCH 0158/2859] Switch torches to shields for hostile NPCs

---
 CHANGELOG.md                           | 1 +
 apps/openmw/mwmechanics/actors.cpp     | 7 +++++++
 apps/openmw/mwworld/inventorystore.cpp | 8 ++++++++
 apps/openmw/mwworld/inventorystore.hpp | 2 ++
 4 files changed, 18 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15bb77e739..ce0cce9522 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@
     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
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 88c402b14c..c9fcf82804 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1430,6 +1430,13 @@ namespace MWMechanics
                         if (heldIter != inventoryStore.end() && heldIter->getTypeName() != typeid(ESM::Light).name())
                             inventoryStore.unequipItem(*heldIter, ptr);
                     }
+                    else if (heldIter == inventoryStore.end() || heldIter->getTypeName() == typeid(ESM::Light).name())
+                    {
+                        // For hostile NPCs, see if they have anything better to equip first
+                        auto shield = inventoryStore.getPreferredShield(ptr);
+                        if(shield != inventoryStore.end())
+                            inventoryStore.equip(MWWorld::InventoryStore::Slot_CarriedLeft, shield, ptr);
+                    }
 
                     heldIter = inventoryStore.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
 
diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp
index 386bbb30a4..38007c1cbb 100644
--- a/apps/openmw/mwworld/inventorystore.cpp
+++ b/apps/openmw/mwworld/inventorystore.cpp
@@ -556,6 +556,14 @@ void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& actor)
     }
 }
 
+MWWorld::ContainerStoreIterator MWWorld::InventoryStore::getPreferredShield(const MWWorld::Ptr& actor)
+{
+    TSlots slots;
+    initSlots (slots);
+    autoEquipArmor(actor, slots);
+    return slots[Slot_CarriedLeft];
+}
+
 const MWMechanics::MagicEffects& MWWorld::InventoryStore::getMagicEffects() const
 {
     return mMagicEffects;
diff --git a/apps/openmw/mwworld/inventorystore.hpp b/apps/openmw/mwworld/inventorystore.hpp
index e70c214809..df69a57090 100644
--- a/apps/openmw/mwworld/inventorystore.hpp
+++ b/apps/openmw/mwworld/inventorystore.hpp
@@ -153,6 +153,8 @@ namespace MWWorld
             ContainerStoreIterator getSlot (int slot);
             ConstContainerStoreIterator getSlot(int slot) const;
 
+            ContainerStoreIterator getPreferredShield(const MWWorld::Ptr& actor);
+
             void unequipAll(const MWWorld::Ptr& actor);
             ///< Unequip all currently equipped items.
 

From 396667f801927b6ea8912e5fded9c5445a4bdc15 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Tue, 29 Dec 2020 14:49:22 +0300
Subject: [PATCH 0159/2859] Fix weather particle fading

Update rain particle system setup
---
 apps/openmw/mwrender/sky.cpp | 147 ++++++++++++++++-------------------
 apps/openmw/mwrender/sky.hpp |   4 +-
 2 files changed, 70 insertions(+), 81 deletions(-)

diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index 2920e07dde..3c63c58c66 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -45,6 +45,8 @@
 #include <components/sceneutil/visitor.hpp>
 #include <components/sceneutil/shadow.hpp>
 
+#include <components/nifosg/particle.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
@@ -1136,7 +1138,7 @@ SkyManager::SkyManager(osg::Group* parentNode, Resource::SceneManager* sceneMana
     , mWindSpeed(0.f)
     , mEnabled(true)
     , mSunEnabled(true)
-    , mWeatherAlpha(0.f)
+    , mEffectFade(0.f)
 {
     osg::ref_ptr<CameraRelativeTransform> skyroot (new CameraRelativeTransform);
     skyroot->setName("Sky Root");
@@ -1277,16 +1279,10 @@ private:
 class AlphaFader : public SceneUtil::StateSetUpdater
 {
 public:
-    /// @param alphaUpdate variable which to update with alpha value
-    AlphaFader(float *alphaUpdate)
-        : mAlpha(1.f)
-    {
-        mAlphaUpdate = alphaUpdate;
-    }
-
-    void setAlpha(float alpha)
+    /// @param alpha the variable alpha value is recovered from
+    AlphaFader(float& alpha)
+        : mAlpha(alpha)
     {
-        mAlpha = alpha;
     }
 
     void setDefaults(osg::StateSet* stateset) override
@@ -1300,19 +1296,16 @@ public:
     {
         osg::Material* mat = static_cast<osg::Material*>(stateset->getAttribute(osg::StateAttribute::MATERIAL));
         mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0,0,0,mAlpha));
-
-        if (mAlphaUpdate)
-            *mAlphaUpdate = mAlpha;
     }
 
     // Helper for adding AlphaFaders to a subgraph
     class SetupVisitor : public osg::NodeVisitor
     {
     public:
-        SetupVisitor(float *alphaUpdate)
+        SetupVisitor(float &alpha)
             : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+            , mAlpha(alpha)
         {
-            mAlphaUpdate = alphaUpdate;
         }
 
         void apply(osg::Node &node) override
@@ -1332,56 +1325,24 @@ public:
                         callback = callback->getNestedCallback();
                     }
 
-                    osg::ref_ptr<AlphaFader> alphaFader (new AlphaFader(mAlphaUpdate));
+                    osg::ref_ptr<AlphaFader> alphaFader (new AlphaFader(mAlpha));
 
                     if (composite)
                         composite->addController(alphaFader);
                     else
                         node.addUpdateCallback(alphaFader);
-
-                    mAlphaFaders.push_back(alphaFader);
                 }
             }
 
             traverse(node);
         }
 
-        std::vector<osg::ref_ptr<AlphaFader> > getAlphaFaders()
-        {
-            return mAlphaFaders;
-        }
-
     private:
-        std::vector<osg::ref_ptr<AlphaFader> > mAlphaFaders;
-        float *mAlphaUpdate;
+        float &mAlpha;
     };
 
 protected:
-    float mAlpha;
-    float *mAlphaUpdate;
-};
-
-class RainFader : public AlphaFader
-{
-public:
-    RainFader(float *alphaUpdate): AlphaFader(alphaUpdate)
-    {
-    }
-
-    void setDefaults(osg::StateSet* stateset) override
-    {
-        osg::ref_ptr<osg::Material> mat (new osg::Material);
-        mat->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
-        mat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(0,0,0,1));
-        mat->setColorMode(osg::Material::OFF);
-        stateset->setAttributeAndModes(mat, osg::StateAttribute::ON);
-    }
-
-    void apply(osg::StateSet *stateset, osg::NodeVisitor *nv) override
-    {
-        AlphaFader::apply(stateset,nv);
-        *mAlphaUpdate = mAlpha * 2.0;  // mAlpha is limited to 0.6 so multiply by 2 to reach full intensity
-    }
+    float &mAlpha;
 };
 
 void SkyManager::setCamera(osg::Camera *camera)
@@ -1465,6 +1426,37 @@ protected:
     }
 };
 
+class WeatherAlphaOperator : public osgParticle::Operator
+{
+public:
+    WeatherAlphaOperator(float& alpha, bool rain)
+        : mAlpha(alpha)
+        , mIsRain(rain)
+    {
+    }
+
+    osg::Object *cloneType() const override
+    {
+        return nullptr;
+    }
+
+    osg::Object *clone(const osg::CopyOp &op) const override
+    {
+        return nullptr;
+    }
+
+    void operate(osgParticle::Particle *particle, double dt) override
+    {
+        constexpr float rainThreshold = 0.6f; // Rain_Threshold?
+        const float alpha = mIsRain ? mAlpha * rainThreshold : mAlpha;
+        particle->setAlphaRange(osgParticle::rangef(alpha, alpha));
+    }
+
+private:
+    float &mAlpha;
+    bool mIsRain;
+};
+
 void SkyManager::createRain()
 {
     if (mRainNode)
@@ -1472,7 +1464,7 @@ void SkyManager::createRain()
 
     mRainNode = new osg::Group;
 
-    mRainParticleSystem = new osgParticle::ParticleSystem;
+    mRainParticleSystem = new NifOsg::ParticleSystem;
     osg::Vec3 rainRange = osg::Vec3(mRainDiameter, mRainDiameter, (mRainMinHeight+mRainMaxHeight)/2.f);
 
     mRainParticleSystem->setParticleAlignment(osgParticle::ParticleSystem::FIXED);
@@ -1491,6 +1483,12 @@ void SkyManager::createRain()
     stateset->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
     stateset->setMode(GL_BLEND, osg::StateAttribute::ON);
 
+    osg::ref_ptr<osg::Material> mat (new osg::Material);
+    mat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
+    mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
+    mat->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
+    stateset->setAttributeAndModes(mat, osg::StateAttribute::ON);
+
     osgParticle::Particle& particleTemplate = mRainParticleSystem->getDefaultParticleTemplate();
     particleTemplate.setSizeRange(osgParticle::rangef(5.f, 15.f));
     particleTemplate.setAlphaRange(osgParticle::rangef(1.f, 1.f));
@@ -1523,6 +1521,7 @@ void SkyManager::createRain()
 
     osg::ref_ptr<osgParticle::ModularProgram> program (new osgParticle::ModularProgram);
     program->addOperator(new WrapAroundOperator(mCamera,rainRange));
+    program->addOperator(new WeatherAlphaOperator(mEffectFade, true));
     program->setParticleSystem(mRainParticleSystem);
     mRainNode->addChild(program);
 
@@ -1530,8 +1529,7 @@ void SkyManager::createRain()
     mRainNode->addChild(mRainParticleSystem);
     mRainNode->addChild(updater);
 
-    mRainFader = new RainFader(&mWeatherAlpha);
-    mRainNode->addUpdateCallback(mRainFader);
+    // Note: if we ever switch to regular geometry rain, it'll need to use an AlphaFader.
     mRainNode->addCullCallback(mUnderwaterSwitch);
     mRainNode->setNodeMask(Mask_WeatherParticles);
 
@@ -1549,7 +1547,6 @@ void SkyManager::destroyRain()
     mCounter = nullptr;
     mRainParticleSystem = nullptr;
     mRainShooter = nullptr;
-    mRainFader = nullptr;
 }
 
 SkyManager::~SkyManager()
@@ -1588,17 +1585,18 @@ void SkyManager::update(float duration)
     if (!mEnabled)
     {
         if (mRainIntensityUniform)
-            mRainIntensityUniform->set((float) 0.0);
+            mRainIntensityUniform->set(0.f);
 
         return;
     }
 
     if (mRainIntensityUniform)
     {
-        if (mIsStorm || (!hasRain() && !mParticleNode))
-            mRainIntensityUniform->set((float) 0.0);
-        else
-            mRainIntensityUniform->set((float) mWeatherAlpha);
+        float rainIntensity = 0.f;
+        if (!mIsStorm && (hasRain() || mParticleNode))
+            rainIntensity = mEffectFade;
+
+        mRainIntensityUniform->set(rainIntensity);
     }
 
     switchUnderwaterRain();
@@ -1712,7 +1710,6 @@ void SkyManager::setWeather(const WeatherResult& weather)
         {
             mParticleNode->removeChild(mParticleEffect);
             mParticleEffect = nullptr;
-            mParticleFaders.clear();
         }
 
         if (mCurrentParticleEffect.empty())
@@ -1738,28 +1735,26 @@ void SkyManager::setWeather(const WeatherResult& weather)
             SceneUtil::AssignControllerSourcesVisitor assignVisitor(std::shared_ptr<SceneUtil::ControllerSource>(new SceneUtil::FrameTimeSource));
             mParticleEffect->accept(assignVisitor);
 
-            AlphaFader::SetupVisitor alphaFaderSetupVisitor(&mWeatherAlpha);
+            AlphaFader::SetupVisitor alphaFaderSetupVisitor(mEffectFade);
 
             mParticleEffect->accept(alphaFaderSetupVisitor);
-            mParticleFaders = alphaFaderSetupVisitor.getAlphaFaders();
 
             SceneUtil::DisableFreezeOnCullVisitor disableFreezeOnCullVisitor;
             mParticleEffect->accept(disableFreezeOnCullVisitor);
 
-            if (!weather.mIsStorm)
-            {
-                SceneUtil::FindByClassVisitor findPSVisitor(std::string("ParticleSystem"));
-                mParticleEffect->accept(findPSVisitor);
+            SceneUtil::FindByClassVisitor findPSVisitor(std::string("ParticleSystem"));
+            mParticleEffect->accept(findPSVisitor);
 
-                for (unsigned int i = 0; i < findPSVisitor.mFoundNodes.size(); ++i)
-                {
-                    osgParticle::ParticleSystem *ps = static_cast<osgParticle::ParticleSystem *>(findPSVisitor.mFoundNodes[i]);
+            for (unsigned int i = 0; i < findPSVisitor.mFoundNodes.size(); ++i)
+            {
+                osgParticle::ParticleSystem *ps = static_cast<osgParticle::ParticleSystem *>(findPSVisitor.mFoundNodes[i]);
                     
-                    osg::ref_ptr<osgParticle::ModularProgram> program (new osgParticle::ModularProgram);
+                osg::ref_ptr<osgParticle::ModularProgram> program (new osgParticle::ModularProgram);
+                if (!mIsStorm)
                     program->addOperator(new WrapAroundOperator(mCamera,osg::Vec3(1024,1024,800)));
-                    program->setParticleSystem(ps);
-                    mParticleNode->addChild(program);
-                }
+                program->addOperator(new WeatherAlphaOperator(mEffectFade, false));
+                program->setParticleSystem(ps);
+                mParticleNode->addChild(program);
             }
         }
     }
@@ -1846,11 +1841,7 @@ void SkyManager::setWeather(const WeatherResult& weather)
 
     mAtmosphereNightNode->setNodeMask(weather.mNight ? ~0 : 0);
 
-    if (mRainFader)
-        mRainFader->setAlpha(weather.mEffectFade * 0.6); // * Rain_Threshold?
-
-    for (AlphaFader* fader : mParticleFaders)
-        fader->setAlpha(weather.mEffectFade);
+    mEffectFade = weather.mEffectFade;
 }
 
 void SkyManager::sunEnable()
diff --git a/apps/openmw/mwrender/sky.hpp b/apps/openmw/mwrender/sky.hpp
index cf697bd44f..c4e0b57738 100644
--- a/apps/openmw/mwrender/sky.hpp
+++ b/apps/openmw/mwrender/sky.hpp
@@ -200,7 +200,6 @@ namespace MWRender
 
         osg::ref_ptr<osg::PositionAttitudeTransform> mParticleNode;
         osg::ref_ptr<osg::Node> mParticleEffect;
-        std::vector<osg::ref_ptr<AlphaFader> > mParticleFaders;
         osg::ref_ptr<UnderwaterSwitchCallback> mUnderwaterSwitch;
 
         osg::ref_ptr<osg::PositionAttitudeTransform> mCloudNode;
@@ -227,7 +226,6 @@ namespace MWRender
         osg::ref_ptr<osgParticle::BoxPlacer> mPlacer;
         osg::ref_ptr<RainCounter> mCounter;
         osg::ref_ptr<RainShooter> mRainShooter;
-        osg::ref_ptr<RainFader> mRainFader;
 
         bool mCreated;
 
@@ -269,7 +267,7 @@ namespace MWRender
         bool mEnabled;
         bool mSunEnabled;
 
-        float mWeatherAlpha;
+        float mEffectFade;
 
         osg::Vec4f mMoonScriptColor;
     };

From 3bf641d3ce975fd0d39c22036822e800508146d0 Mon Sep 17 00:00:00 2001
From: unknown <malusluminis@hotmail.com>
Date: Tue, 29 Dec 2020 21:45:59 +0100
Subject: [PATCH 0160/2859] Show mesh origin

---
 CHANGELOG.md                            |  1 +
 apps/openmw/engine.cpp                  |  1 +
 apps/openmw/mwbase/environment.cpp      | 12 ++++++++++++
 apps/openmw/mwbase/environment.hpp      | 10 ++++++++++
 apps/openmw/mwscript/miscextensions.cpp | 15 ++++++++++++++-
 components/bsa/bsa_file.hpp             |  5 +++++
 components/vfs/archive.hpp              |  5 +++++
 components/vfs/bsaarchive.cpp           | 17 +++++++++++++++++
 components/vfs/bsaarchive.hpp           |  2 ++
 components/vfs/filesystemarchive.cpp    | 15 +++++++++++++++
 components/vfs/filesystemarchive.hpp    |  3 +++
 components/vfs/manager.cpp              | 11 +++++++++++
 components/vfs/manager.hpp              |  1 +
 13 files changed, 97 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce0cce9522..141edcad28 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -116,6 +116,7 @@
     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.
     Task #5480: Drop Qt4 support
     Task #5520: Improve cell name autocompleter implementation
 
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 8f23f710dd..81a97b0f2d 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -749,6 +749,7 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     // Create dialog system
     mEnvironment.setJournal (new MWDialogue::Journal);
     mEnvironment.setDialogueManager (new MWDialogue::DialogueManager (mExtensions, mTranslationDataStorage));
+    mEnvironment.setResourceSystem(mResourceSystem.get());
 
     // scripts
     if (mCompileAll)
diff --git a/apps/openmw/mwbase/environment.cpp b/apps/openmw/mwbase/environment.cpp
index aca2685e06..edb10d9456 100644
--- a/apps/openmw/mwbase/environment.cpp
+++ b/apps/openmw/mwbase/environment.cpp
@@ -4,6 +4,8 @@
 #include <chrono>
 #include <thread>
 
+#include <components/resource/resourcesystem.hpp>
+
 #include "world.hpp"
 #include "scriptmanager.hpp"
 #include "dialoguemanager.hpp"
@@ -76,6 +78,11 @@ void MWBase::Environment::setStateManager (StateManager *stateManager)
     mStateManager = stateManager;
 }
 
+void MWBase::Environment::setResourceSystem (Resource::ResourceSystem *resourceSystem)
+{
+    mResourceSystem = resourceSystem;
+}
+
 void MWBase::Environment::setFrameDuration (float duration)
 {
     mFrameDuration = duration;
@@ -158,6 +165,11 @@ MWBase::StateManager *MWBase::Environment::getStateManager() const
     return mStateManager;
 }
 
+Resource::ResourceSystem *MWBase::Environment::getResourceSystem() const
+{
+    return mResourceSystem;
+}
+
 float MWBase::Environment::getFrameDuration() const
 {
     return mFrameDuration;
diff --git a/apps/openmw/mwbase/environment.hpp b/apps/openmw/mwbase/environment.hpp
index 80e6a6243c..7871153cc5 100644
--- a/apps/openmw/mwbase/environment.hpp
+++ b/apps/openmw/mwbase/environment.hpp
@@ -6,6 +6,11 @@ namespace osg
     class Stats;
 }
 
+namespace Resource
+{
+    class ResourceSystem;
+}
+
 namespace MWBase
 {
     class World;
@@ -37,6 +42,7 @@ namespace MWBase
             Journal *mJournal;
             InputManager *mInputManager;
             StateManager *mStateManager;
+            Resource::ResourceSystem *mResourceSystem;
             float mFrameDuration;
             float mFrameRateLimit;
 
@@ -70,6 +76,8 @@ namespace MWBase
 
             void setStateManager (StateManager *stateManager);
 
+            void setResourceSystem (Resource::ResourceSystem *resourceSystem);
+
             void setFrameDuration (float duration);
             ///< Set length of current frame in seconds.
 
@@ -95,6 +103,8 @@ namespace MWBase
 
             StateManager *getStateManager() const;
 
+            Resource::ResourceSystem *getResourceSystem() const;
+
             float getFrameDuration() const;
 
             void cleanup();
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index a288d66730..d78337a627 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -13,10 +13,15 @@
 #include <components/interpreter/opcodes.hpp>
 
 #include <components/misc/rng.hpp>
+#include <components/misc/resourcehelpers.hpp>
+
+#include <components/resource/resourcesystem.hpp>
 
 #include <components/esm/loadmgef.hpp>
 #include <components/esm/loadcrea.hpp>
 
+#include <components/vfs/manager.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/scriptmanager.hpp"
@@ -1377,7 +1382,15 @@ namespace MWScript
                         msg << "Grid: " << cell->getCell()->getGridX() << " " << cell->getCell()->getGridY() << std::endl;
                     osg::Vec3f pos (ptr.getRefData().getPosition().asVec3());
                     msg << "Coordinates: " << pos.x() << " " << pos.y() << " " << pos.z() << std::endl;
-                    msg << "Model: " << ptr.getClass().getModel(ptr) << std::endl;
+                    auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+                    std::string model = ::Misc::ResourceHelpers::correctActorModelPath(ptr.getClass().getModel(ptr), vfs);
+                    msg << "Model: " << model << std::endl;
+                    if(!model.empty())
+                    {
+                        const std::string archive = vfs->getArchive(model);
+                        if(!archive.empty())
+                            msg << "(" << archive << ")" << std::endl;
+                    }
                     if (!ptr.getClass().getScript(ptr).empty())
                         msg << "Script: " << ptr.getClass().getScript(ptr) << std::endl;
                 }
diff --git a/components/bsa/bsa_file.hpp b/components/bsa/bsa_file.hpp
index 0378027397..3e7538401d 100644
--- a/components/bsa/bsa_file.hpp
+++ b/components/bsa/bsa_file.hpp
@@ -135,6 +135,11 @@ public:
     /// @note Thread safe.
     const FileList &getList() const
     { return mFiles; }
+
+    const std::string& getFilename() const
+    {
+        return mFilename;
+    }
 };
 
 }
diff --git a/components/vfs/archive.hpp b/components/vfs/archive.hpp
index b36c7117b0..971ac15b39 100644
--- a/components/vfs/archive.hpp
+++ b/components/vfs/archive.hpp
@@ -23,6 +23,11 @@ namespace VFS
 
         /// List all resources contained in this archive, and run the resource names through the given normalize function.
         virtual void listResources(std::map<std::string, File*>& out, char (*normalize_function) (char)) = 0;
+
+        /// True if this archive contains the provided normalized file.
+        virtual bool contains(const std::string& file, char (*normalize_function) (char)) const = 0;
+
+        virtual std::string getDescription() const = 0;
     };
 
 }
diff --git a/components/vfs/bsaarchive.cpp b/components/vfs/bsaarchive.cpp
index ac65c58a1c..e6d779aabc 100644
--- a/components/vfs/bsaarchive.cpp
+++ b/components/vfs/bsaarchive.cpp
@@ -39,6 +39,23 @@ void BsaArchive::listResources(std::map<std::string, File *> &out, char (*normal
     }
 }
 
+bool BsaArchive::contains(const std::string& file, char (*normalize_function)(char)) const
+{
+    for (const auto& it : mResources)
+    {
+        std::string ent = it.mInfo->name;
+        std::transform(ent.begin(), ent.end(), ent.begin(), normalize_function);
+        if(file == ent)
+            return true;
+    }
+    return false;
+}
+
+std::string BsaArchive::getDescription() const
+{
+    return std::string{"BSA: "} + mFile->getFilename();
+}
+
 // ------------------------------------------------------------------------------
 
 BsaArchiveFile::BsaArchiveFile(const Bsa::BSAFile::FileStruct *info, Bsa::BSAFile* bsa)
diff --git a/components/vfs/bsaarchive.hpp b/components/vfs/bsaarchive.hpp
index 65a9db16c1..c979b5ce7e 100644
--- a/components/vfs/bsaarchive.hpp
+++ b/components/vfs/bsaarchive.hpp
@@ -24,6 +24,8 @@ namespace VFS
         BsaArchive(const std::string& filename);
         virtual ~BsaArchive();
         void listResources(std::map<std::string, File*>& out, char (*normalize_function) (char)) override;
+        bool contains(const std::string& file, char (*normalize_function) (char)) const override;
+        std::string getDescription() const override;
 
     private:
         std::unique_ptr<Bsa::BSAFile> mFile;
diff --git a/components/vfs/filesystemarchive.cpp b/components/vfs/filesystemarchive.cpp
index ce4ff020ef..17f3891ec6 100644
--- a/components/vfs/filesystemarchive.cpp
+++ b/components/vfs/filesystemarchive.cpp
@@ -53,6 +53,21 @@ namespace VFS
         }
     }
 
+    bool FileSystemArchive::contains(const std::string& file, char (*normalize_function)(char)) const
+    {
+        for (const auto& it : mIndex)
+        {
+            if(it.first == file)
+                return true;
+        }
+        return false;
+    }
+
+    std::string FileSystemArchive::getDescription() const
+    {
+        return std::string{"DIR: "} + mPath;
+    }
+
     // ----------------------------------------------------------------------------------
 
     FileSystemArchiveFile::FileSystemArchiveFile(const std::string &path)
diff --git a/components/vfs/filesystemarchive.hpp b/components/vfs/filesystemarchive.hpp
index d228ba87c5..70463d32f2 100644
--- a/components/vfs/filesystemarchive.hpp
+++ b/components/vfs/filesystemarchive.hpp
@@ -25,6 +25,9 @@ namespace VFS
 
         void listResources(std::map<std::string, File*>& out, char (*normalize_function) (char)) override;
 
+        bool contains(const std::string& file, char (*normalize_function) (char)) const override;
+
+        std::string getDescription() const override;
 
     private:
         typedef std::map <std::string, FileSystemArchiveFile> index;
diff --git a/components/vfs/manager.cpp b/components/vfs/manager.cpp
index c198823811..c7abc2483a 100644
--- a/components/vfs/manager.cpp
+++ b/components/vfs/manager.cpp
@@ -96,4 +96,15 @@ namespace VFS
         normalize_path(name, mStrict);
     }
 
+    std::string Manager::getArchive(const std::string& name) const
+    {
+        std::string normalized = name;
+        normalize_path(normalized, mStrict);
+        for(const auto archive : mArchives)
+        {
+            if(archive->contains(normalized, mStrict ? &strict_normalize_char : &nonstrict_normalize_char))
+                return archive->getDescription();
+        }
+        return {};
+    }
 }
diff --git a/components/vfs/manager.hpp b/components/vfs/manager.hpp
index c5f0a8fec3..5a09a995eb 100644
--- a/components/vfs/manager.hpp
+++ b/components/vfs/manager.hpp
@@ -58,6 +58,7 @@ namespace VFS
         /// @note May be called from any thread once the index has been built.
         Files::IStreamPtr getNormalized(const std::string& normalizedName) const;
 
+        std::string getArchive(const std::string& name) const;
     private:
         bool mStrict;
 

From 630ec36d1fcaa68805731c4ac6bc4123b173a8f0 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 30 Dec 2020 10:35:51 +0100
Subject: [PATCH 0161/2859] iterate in reverse order

---
 components/vfs/manager.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/vfs/manager.cpp b/components/vfs/manager.cpp
index c7abc2483a..045fe3cf5c 100644
--- a/components/vfs/manager.cpp
+++ b/components/vfs/manager.cpp
@@ -100,10 +100,10 @@ namespace VFS
     {
         std::string normalized = name;
         normalize_path(normalized, mStrict);
-        for(const auto archive : mArchives)
+        for(auto it = mArchives.rbegin(); it != mArchives.rend(); ++it)
         {
-            if(archive->contains(normalized, mStrict ? &strict_normalize_char : &nonstrict_normalize_char))
-                return archive->getDescription();
+            if((*it)->contains(normalized, mStrict ? &strict_normalize_char : &nonstrict_normalize_char))
+                return (*it)->getDescription();
         }
         return {};
     }

From 57c92673bc804653fd9502fa2b90c597f3620562 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 30 Dec 2020 16:09:12 +0100
Subject: [PATCH 0162/2859] Consider a path completed if it was non-empty

---
 apps/openmw/mwmechanics/aipackage.cpp   | 2 +-
 apps/openmw/mwmechanics/pathfinding.cpp | 4 ++++
 apps/openmw/mwmechanics/pathfinding.hpp | 9 +++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index 8880820dd0..8af2c71ed5 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -158,7 +158,7 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
         zTurn(actor, getZAngleToPoint(position, dest));
         smoothTurn(actor, getXAngleToPoint(position, dest), 0);
         world->removeActorPath(actor);
-        return isDestReached;
+        return isDestReached || mPathFinder.pathWasPossible();
     }
 
     world->updateActorPath(actor, mPathFinder.getPath(), halfExtents, position, dest);
diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp
index a82dcf7173..77ab78fd79 100644
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@@ -318,6 +318,7 @@ namespace MWMechanics
         mPath.clear();
         mPath.push_back(endPoint);
         mConstructed = true;
+        mPossible = true;
     }
 
     void PathFinder::buildPathByPathgrid(const osg::Vec3f& startPoint, const osg::Vec3f& endPoint,
@@ -329,6 +330,7 @@ namespace MWMechanics
         buildPathByPathgridImpl(startPoint, endPoint, pathgridGraph, std::back_inserter(mPath));
 
         mConstructed = true;
+        mPossible = !mPath.empty();
     }
 
     void PathFinder::buildPathByNavMesh(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint,
@@ -342,6 +344,7 @@ namespace MWMechanics
             mPath.push_back(endPoint);
 
         mConstructed = true;
+        mPossible = !mPath.empty();
     }
 
     void PathFinder::buildPath(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint, const osg::Vec3f& endPoint,
@@ -367,6 +370,7 @@ namespace MWMechanics
             mPath.push_back(endPoint);
 
         mConstructed = true;
+        mPossible = !mPath.empty();
     }
 
     bool PathFinder::buildPathByNavigatorImpl(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint,
diff --git a/apps/openmw/mwmechanics/pathfinding.hpp b/apps/openmw/mwmechanics/pathfinding.hpp
index 5af822fee7..ed786dc846 100644
--- a/apps/openmw/mwmechanics/pathfinding.hpp
+++ b/apps/openmw/mwmechanics/pathfinding.hpp
@@ -74,6 +74,7 @@ namespace MWMechanics
         public:
             PathFinder()
                 : mConstructed(false)
+                , mPossible(false)
                 , mCell(nullptr)
             {
             }
@@ -81,6 +82,7 @@ namespace MWMechanics
             void clearPath()
             {
                 mConstructed = false;
+                mPossible = false;
                 mPath.clear();
                 mCell = nullptr;
             }
@@ -109,6 +111,11 @@ namespace MWMechanics
                 return mConstructed && mPath.empty();
             }
 
+            bool pathWasPossible() const
+            {
+                return mPossible;
+            }
+
             /// In radians
             float getZAngleToNext(float x, float y) const;
 
@@ -137,6 +144,7 @@ namespace MWMechanics
             void addPointToPath(const osg::Vec3f& point)
             {
                 mConstructed = true;
+                mPossible = true;
                 mPath.push_back(point);
             }
 
@@ -196,6 +204,7 @@ namespace MWMechanics
 
         private:
             bool mConstructed;
+            bool mPossible;
             std::deque<osg::Vec3f> mPath;
 
             const MWWorld::CellStore* mCell;

From dbdd397716b366baf492f21af3a71ed12e885e0d Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Fri, 1 Jan 2021 16:54:45 +0100
Subject: [PATCH 0163/2859] Remove deadcode.

---
 apps/launcher/advancedpage.cpp         | 4 +---
 apps/launcher/advancedpage.hpp         | 4 +---
 apps/launcher/datafilespage.hpp        | 4 ----
 apps/launcher/graphicspage.cpp         | 3 +--
 apps/launcher/graphicspage.hpp         | 3 +--
 apps/launcher/maindialog.cpp           | 4 ++--
 apps/launcher/utils/cellnameloader.cpp | 3 ++-
 components/config/gamesettings.cpp     | 2 --
 components/config/gamesettings.hpp     | 5 ++---
 components/config/launchersettings.cpp | 4 ----
 components/config/launchersettings.hpp | 3 ---
 11 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index ed04072351..6f59ade7ab 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -10,11 +10,9 @@
 
 #include <cmath>
 
-Launcher::AdvancedPage::AdvancedPage(Files::ConfigurationManager &cfg,
-                                     Config::GameSettings &gameSettings,
+Launcher::AdvancedPage::AdvancedPage(Config::GameSettings &gameSettings,
                                      Settings::Manager &engineSettings, QWidget *parent)
         : QWidget(parent)
-        , mCfgMgr(cfg)
         , mGameSettings(gameSettings)
         , mEngineSettings(engineSettings)
 {
diff --git a/apps/launcher/advancedpage.hpp b/apps/launcher/advancedpage.hpp
index ef2f4740f3..a373fae430 100644
--- a/apps/launcher/advancedpage.hpp
+++ b/apps/launcher/advancedpage.hpp
@@ -9,7 +9,6 @@
 
 #include <components/settings/settings.hpp>
 
-namespace Files { struct ConfigurationManager; }
 namespace Config { class GameSettings; }
 
 namespace Launcher
@@ -19,7 +18,7 @@ namespace Launcher
         Q_OBJECT
 
     public:
-        AdvancedPage(Files::ConfigurationManager &cfg, Config::GameSettings &gameSettings,
+        AdvancedPage(Config::GameSettings &gameSettings,
                      Settings::Manager &engineSettings, QWidget *parent = nullptr);
 
         bool loadSettings();
@@ -35,7 +34,6 @@ namespace Launcher
         void slotViewOverShoulderToggled(bool checked);
 
     private:
-        Files::ConfigurationManager &mCfgMgr;
         Config::GameSettings &mGameSettings;
         Settings::Manager &mEngineSettings;
         QCompleter mCellNameCompleter;
diff --git a/apps/launcher/datafilespage.hpp b/apps/launcher/datafilespage.hpp
index 92984847e2..3d200e6d2d 100644
--- a/apps/launcher/datafilespage.hpp
+++ b/apps/launcher/datafilespage.hpp
@@ -88,11 +88,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);
diff --git a/apps/launcher/graphicspage.cpp b/apps/launcher/graphicspage.cpp
index d7e7eabc50..d1cf3aa6ff 100644
--- a/apps/launcher/graphicspage.cpp
+++ b/apps/launcher/graphicspage.cpp
@@ -29,9 +29,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(Settings::Manager &engineSettings, QWidget *parent)
     : QWidget(parent)
-    , mCfgMgr(cfg)
     , mEngineSettings(engineSettings)
 {
     setObjectName ("GraphicsPage");
diff --git a/apps/launcher/graphicspage.hpp b/apps/launcher/graphicspage.hpp
index 55178e0d75..35f7115003 100644
--- a/apps/launcher/graphicspage.hpp
+++ b/apps/launcher/graphicspage.hpp
@@ -20,7 +20,7 @@ namespace Launcher
         Q_OBJECT
 
     public:
-        GraphicsPage(Files::ConfigurationManager &cfg, Settings::Manager &engineSettings, QWidget *parent = nullptr);
+        GraphicsPage(Settings::Manager &engineSettings, QWidget *parent = nullptr);
 
         void saveSettings();
         bool loadSettings();
@@ -35,7 +35,6 @@ namespace Launcher
         void slotShadowDistLimitToggled(bool checked);
 
     private:
-        Files::ConfigurationManager &mCfgMgr;
         Settings::Manager &mEngineSettings;
 
         QVector<QStringList> mResolutionsPerScreen;
diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp
index df2ba68910..215258bcd2 100644
--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@@ -126,9 +126,9 @@ void Launcher::MainDialog::createPages()
 
     mPlayPage = new PlayPage(this);
     mDataFilesPage = new DataFilesPage(mCfgMgr, mGameSettings, mLauncherSettings, this);
-    mGraphicsPage = new GraphicsPage(mCfgMgr, mEngineSettings, this);
+    mGraphicsPage = new GraphicsPage(mEngineSettings, this);
     mSettingsPage = new SettingsPage(mCfgMgr, mGameSettings, mLauncherSettings, this);
-    mAdvancedPage = new AdvancedPage(mCfgMgr, mGameSettings, mEngineSettings, this);
+    mAdvancedPage = new AdvancedPage(mGameSettings, mEngineSettings, this);
 
     // Set the combobox of the play page to imitate the combobox on the datafilespage
     mPlayPage->setProfilesModel(mDataFilesPage->profilesModel());
diff --git a/apps/launcher/utils/cellnameloader.cpp b/apps/launcher/utils/cellnameloader.cpp
index 6d1ed2f494..e7f6e83e74 100644
--- a/apps/launcher/utils/cellnameloader.cpp
+++ b/apps/launcher/utils/cellnameloader.cpp
@@ -45,4 +45,5 @@ QString CellNameLoader::getCellName(ESM::ESMReader &esmReader)
     cell.loadNameAndData(esmReader, isDeleted);
 
     return QString::fromStdString(cell.mName);
-}
\ No newline at end of file
+}
+
diff --git a/components/config/gamesettings.cpp b/components/config/gamesettings.cpp
index 85c090a3ff..d7fe7da948 100644
--- a/components/config/gamesettings.cpp
+++ b/components/config/gamesettings.cpp
@@ -14,8 +14,6 @@ Config::GameSettings::GameSettings(Files::ConfigurationManager &cfg)
 {
 }
 
-Config::GameSettings::~GameSettings() = default;
-
 void Config::GameSettings::validatePaths()
 {
     QStringList paths = mSettings.values(QString("data"));
diff --git a/components/config/gamesettings.hpp b/components/config/gamesettings.hpp
index ccb1d5fd25..263a151c93 100644
--- a/components/config/gamesettings.hpp
+++ b/components/config/gamesettings.hpp
@@ -21,7 +21,6 @@ namespace Config
     {
     public:
         GameSettings(Files::ConfigurationManager &cfg);
-        ~GameSettings();
 
         inline QString value(const QString &key, const QString &defaultValue = QString())
         {
@@ -54,11 +53,11 @@ namespace Config
             mUserSettings.remove(key);
         }
 
-        inline QStringList getDataDirs() { return mDataDirs; }
+        inline QStringList getDataDirs() const { return mDataDirs; }
 
         inline void removeDataDir(const QString &dir) { if(!dir.isEmpty()) mDataDirs.removeAll(dir); }
         inline void addDataDir(const QString &dir) { if(!dir.isEmpty()) mDataDirs.append(dir); }
-        inline QString getDataLocal() {return mDataLocal; }
+        inline QString getDataLocal() const {return mDataLocal; }
 
         bool hasMaster();
 
diff --git a/components/config/launchersettings.cpp b/components/config/launchersettings.cpp
index ff2c38438f..025bc43827 100644
--- a/components/config/launchersettings.cpp
+++ b/components/config/launchersettings.cpp
@@ -12,10 +12,6 @@ const char Config::LauncherSettings::sLauncherConfigFileName[] = "launcher.cfg";
 const char Config::LauncherSettings::sContentListsSectionPrefix[] = "Profiles/";
 const char Config::LauncherSettings::sContentListSuffix[] = "/content";
 
-Config::LauncherSettings::LauncherSettings() = default;
-
-Config::LauncherSettings::~LauncherSettings() = default;
-
 QStringList Config::LauncherSettings::subKeys(const QString &key)
 {
     QMultiMap<QString, QString> settings = SettingsBase::getSettings();
diff --git a/components/config/launchersettings.hpp b/components/config/launchersettings.hpp
index 1483052bbc..da492c85ce 100644
--- a/components/config/launchersettings.hpp
+++ b/components/config/launchersettings.hpp
@@ -9,9 +9,6 @@ namespace Config
     class LauncherSettings : public SettingsBase<QMultiMap<QString, QString> >
     {
     public:
-        LauncherSettings();
-        ~LauncherSettings();
-
         bool writeFile(QTextStream &stream);
 
         /// \return names of all Content Lists in the launcher's .cfg file. 

From 9b99c76032bb96002fae6a5d67a41423a935119f Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Fri, 1 Jan 2021 16:01:33 +0000
Subject: [PATCH 0164/2859] Clamp alpha reference to avoid degenerate case

---
 files/shaders/alpha.glsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/shaders/alpha.glsl b/files/shaders/alpha.glsl
index b1c7ed149e..cb38831c5b 100644
--- a/files/shaders/alpha.glsl
+++ b/files/shaders/alpha.glsl
@@ -15,7 +15,7 @@ uniform float alphaRef;
 void alphaTest()
 {
     #if @alphaToCoverage 
-        float coverageAlpha = (gl_FragData[0].a - alphaRef) / max(fwidth(gl_FragData[0].a), 0.0001) + 0.5;
+        float coverageAlpha = (gl_FragData[0].a - clamp(alphaRef, 0.0001, 0.9999)) / max(fwidth(gl_FragData[0].a), 0.0001) + 0.5;
 
         // Some functions don't make sense with A2C or are a pain to think about and no meshes use them anyway
         // Use regular alpha testing in such cases until someone complains.

From 5215ffd964aaa13297f8fd15d96a2f1a9e79eb9e Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Tue, 22 Dec 2020 14:51:16 +0100
Subject: [PATCH 0165/2859] The debug drawer rely on Bullet to determines the
 vertices of collision shapes. It doesn't work in the case of spheres (used by
 projectiles): resulting shape is malformed. It can also leads to this error
 which makes the debug drawer non-working till game restart:
 CullVisitor::apply(Geode&) detected NaN,     depth=nan, center=(nan nan nan),
     matrix={        -0.265814 -0.0639702 0.9619 0        0.964024 -0.0176387
 0.265228 0        -4.29769e-09 0.997796 0.0663574 0        18178.6 -3550.91
 42154.4 1 }

Avoid this issue by using osg::Sphere

While here, remove an unused function. We don't use Bullet's solver so
we never have any contact points (in Bullet parlance).
---
 apps/openmw/mwrender/bulletdebugdraw.cpp | 22 +++++++++++++++++-----
 apps/openmw/mwrender/bulletdebugdraw.hpp |  4 +++-
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwrender/bulletdebugdraw.cpp b/apps/openmw/mwrender/bulletdebugdraw.cpp
index 00529ef80d..207b0ee504 100644
--- a/apps/openmw/mwrender/bulletdebugdraw.cpp
+++ b/apps/openmw/mwrender/bulletdebugdraw.cpp
@@ -7,6 +7,9 @@
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/convert.hpp>
+#include <osg/PolygonMode>
+#include <osg/ShapeDrawable>
+#include <osg/StateSet>
 
 #include "bulletdebugdraw.hpp"
 #include "vismask.hpp"
@@ -41,6 +44,14 @@ void DebugDrawer::createGeometry()
         mGeometry->addPrimitiveSet(mDrawArrays);
 
         mParentNode->addChild(mGeometry);
+
+        auto* stateSet = new osg::StateSet;
+        stateSet->setAttributeAndModes(new osg::PolygonMode(osg::PolygonMode::FRONT_AND_BACK, osg::PolygonMode::LINE), osg::StateAttribute::ON);
+        mShapesRoot = new osg::Group;
+        mShapesRoot->setStateSet(stateSet);
+        mShapesRoot->setDataVariance(osg::Object::DYNAMIC);
+        mShapesRoot->setNodeMask(Mask_Debug);
+        mParentNode->addChild(mShapesRoot);
     }
 }
 
@@ -49,6 +60,7 @@ void DebugDrawer::destroyGeometry()
     if (mGeometry)
     {
         mParentNode->removeChild(mGeometry);
+        mParentNode->removeChild(mShapesRoot);
         mGeometry = nullptr;
         mVertices = nullptr;
         mDrawArrays = nullptr;
@@ -66,6 +78,7 @@ void DebugDrawer::step()
     {
         mVertices->clear();
         mColors->clear();
+        mShapesRoot->removeChildren(0, mShapesRoot->getNumChildren());
         mWorld->debugDrawWorld();
         showCollisions();
         mDrawArrays->setCount(mVertices->size());
@@ -106,12 +119,11 @@ void DebugDrawer::showCollisions()
             mCollisionViews.end());
 }
 
-void DebugDrawer::drawContactPoint(const btVector3 &PointOnB, const btVector3 &normalOnB, btScalar distance, int lifeTime, const btVector3 &color)
+void DebugDrawer::drawSphere(btScalar radius, const btTransform& transform, const btVector3& color)
 {
-    mVertices->push_back(Misc::Convert::toOsg(PointOnB));
-    mVertices->push_back(Misc::Convert::toOsg(PointOnB) + (Misc::Convert::toOsg(normalOnB) * distance * 20));
-    mColors->push_back({1,1,1,1});
-    mColors->push_back({1,1,1,1});
+    auto* geom = new osg::ShapeDrawable(new osg::Sphere(Misc::Convert::toOsg(transform.getOrigin()), radius));
+    geom->setColor(osg::Vec4(1, 1, 1, 1));
+    mShapesRoot->addChild(geom);
 }
 
 void DebugDrawer::reportErrorWarning(const char *warningString)
diff --git a/apps/openmw/mwrender/bulletdebugdraw.hpp b/apps/openmw/mwrender/bulletdebugdraw.hpp
index ec421bd742..b24640427d 100644
--- a/apps/openmw/mwrender/bulletdebugdraw.hpp
+++ b/apps/openmw/mwrender/bulletdebugdraw.hpp
@@ -32,6 +32,7 @@ private:
         CollisionView(btVector3 orig, btVector3 normal) : mOrig(orig), mEnd(orig + normal * 20), mCreated(std::chrono::steady_clock::now()) {};
     };
     std::vector<CollisionView> mCollisionViews;
+    osg::ref_ptr<osg::Group> mShapesRoot;
 
 protected:
     osg::ref_ptr<osg::Group> mParentNode;
@@ -59,7 +60,8 @@ public:
 
     void showCollisions();
 
-    void drawContactPoint(const btVector3& PointOnB,const btVector3& normalOnB,btScalar distance,int lifeTime,const btVector3& color) override;
+    void drawContactPoint(const btVector3& PointOnB,const btVector3& normalOnB,btScalar distance,int lifeTime,const btVector3& color) override {};
+    void drawSphere(btScalar radius, const btTransform& transform, const btVector3& color) override;
 
     void reportErrorWarning(const char* warningString) override;
 

From c75d7ceada68c67ba62cb6111a850d9f34aa2f19 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Sat, 2 Jan 2021 02:50:19 +0000
Subject: [PATCH 0166/2859] Ensure alpha test is off by default

---
 apps/openmw/mwrender/renderingmanager.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index a60077a169..567cd88ac6 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -381,6 +381,8 @@ namespace MWRender
 
         // Hopefully, anything genuinely requiring the default alpha func of GL_ALWAYS explicitly sets it
         mRootNode->getOrCreateStateSet()->setAttribute(Shader::RemovedAlphaFunc::getInstance(GL_ALWAYS));
+        // The transparent renderbin sets alpha testing on because that was faster on old GPUs. It's now slower and breaks things.
+        mRootNode->getOrCreateStateSet()->setMode(GL_ALPHA_TEST, osg::StateAttribute::OFF);
 
         mUniformNear = mRootNode->getOrCreateStateSet()->getUniform("near");
         mUniformFar = mRootNode->getOrCreateStateSet()->getUniform("far");

From 69386df03602b6c1f1b4acc0e72d31f84dcb538d Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Sat, 2 Jan 2021 18:27:25 +0000
Subject: [PATCH 0167/2859] Correct alpha testing functions

---
 files/shaders/alpha.glsl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/files/shaders/alpha.glsl b/files/shaders/alpha.glsl
index cb38831c5b..2551a02052 100644
--- a/files/shaders/alpha.glsl
+++ b/files/shaders/alpha.glsl
@@ -40,22 +40,22 @@ void alphaTest()
         #if @alphaFunc == FUNC_NEVER
             discard;
         #elif @alphaFunc == FUNC_LESS
-            if (gl_FragData[0].a > alphaRef)
+            if (gl_FragData[0].a >= alphaRef)
                 discard;
         #elif @alphaFunc == FUNC_EQUAL
             if (gl_FragData[0].a != alphaRef)
                 discard;
         #elif @alphaFunc == FUNC_LEQUAL
-            if (gl_FragData[0].a >= alphaRef)
+            if (gl_FragData[0].a > alphaRef)
                 discard;
         #elif @alphaFunc == FUNC_GREATER
-            if (gl_FragData[0].a < alphaRef)
+            if (gl_FragData[0].a <= alphaRef)
                 discard;
         #elif @alphaFunc == FUNC_NOTEQUAL
             if (gl_FragData[0].a == alphaRef)
                 discard;
         #elif @alphaFunc == FUNC_GEQUAL
-            if (gl_FragData[0].a <= alphaRef)
+            if (gl_FragData[0].a < alphaRef)
                 discard;
         #endif
     #endif

From f2eed5594a1ebd46909312eb6bf76742214853ab Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Sat, 2 Jan 2021 18:27:46 +0000
Subject: [PATCH 0168/2859] Don't use A2C when MSAA is off

---
 apps/openmw/mwrender/localmap.cpp         | 2 +-
 apps/openmw/mwrender/renderingmanager.cpp | 2 +-
 apps/openmw/mwrender/water.cpp            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index 90c85f39fa..28b7c816bc 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -235,7 +235,7 @@ void LocalMap::setupRenderToTexture(osg::ref_ptr<osg::Camera> camera, int x, int
 
     unsigned int samples = 0;
     unsigned int colourSamples = 0;
-    if (Settings::Manager::getBool("convert alpha test to alpha-to-coverage", "Shaders"))
+    if (Settings::Manager::getBool("convert alpha test to alpha-to-coverage", "Shaders") && Settings::Manager::getInt("antialiasing", "Video") > 1)
     {
         // Alpha-to-coverage requires a multisampled framebuffer.
         // OSG will set that up automatically and resolve it to the specified single-sample texture for us.
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 567cd88ac6..17a6527fc9 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -219,7 +219,7 @@ namespace MWRender
         resourceSystem->getSceneManager()->setAutoUseSpecularMaps(Settings::Manager::getBool("auto use object specular maps", "Shaders"));
         resourceSystem->getSceneManager()->setSpecularMapPattern(Settings::Manager::getString("specular map pattern", "Shaders"));
         resourceSystem->getSceneManager()->setApplyLightingToEnvMaps(Settings::Manager::getBool("apply lighting to environment maps", "Shaders"));
-        resourceSystem->getSceneManager()->setConvertAlphaTestToAlphaToCoverage(Settings::Manager::getBool("convert alpha test to alpha-to-coverage", "Shaders"));
+        resourceSystem->getSceneManager()->setConvertAlphaTestToAlphaToCoverage(Settings::Manager::getBool("convert alpha test to alpha-to-coverage", "Shaders") && Settings::Manager::getInt("antialiasing", "Video") > 1);
 
         osg::ref_ptr<SceneUtil::LightManager> sceneRoot = new SceneUtil::LightManager;
         sceneRoot->setLightingMask(Mask_Lighting);
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index 3d3ec4ef6e..8955248810 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -273,7 +273,7 @@ public:
 
         unsigned int samples = 0;
         unsigned int colourSamples = 0;
-        if (Settings::Manager::getBool("convert alpha test to alpha-to-coverage", "Shaders"))
+        if (Settings::Manager::getBool("convert alpha test to alpha-to-coverage", "Shaders") && Settings::Manager::getInt("antialiasing", "Video") > 1)
         {
             // Alpha-to-coverage requires a multisampled framebuffer.
             // OSG will set that up automatically and resolve it to the specified single-sample texture for us.
@@ -368,7 +368,7 @@ public:
 
         unsigned int samples = 0;
         unsigned int colourSamples = 0;
-        if (Settings::Manager::getBool("convert alpha test to alpha-to-coverage", "Shaders"))
+        if (Settings::Manager::getBool("convert alpha test to alpha-to-coverage", "Shaders") && Settings::Manager::getInt("antialiasing", "Video") > 1)
         {
             // Alpha-to-coverage requires a multisampled framebuffer.
             // OSG will set that up automatically and resolve it to the specified single-sample texture for us.

From e3fd5efcfefc22d9323463c7f274252b895c1b01 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Sat, 2 Jan 2021 19:09:06 +0000
Subject: [PATCH 0169/2859] Disable A2C for alpha-blended drawables

---
 components/shader/shadervisitor.cpp | 14 +++++++++++++-
 components/shader/shadervisitor.hpp |  2 ++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 4762549a7a..165be6745d 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -26,8 +26,10 @@ namespace Shader
         , mColorMode(0)
         , mMaterialOverridden(false)
         , mAlphaTestOverridden(false)
+        , mAlphaBlendOverridden(false)
         , mAlphaFunc(GL_ALWAYS)
         , mAlphaRef(1.0)
+        , mAlphaBlend(false)
         , mNormalHeight(false)
         , mTexStageRequiringTangents(-1)
         , mNode(nullptr)
@@ -330,6 +332,15 @@ namespace Shader
                 }
             }
         }
+
+        unsigned int alphaBlend = stateset->getMode(GL_BLEND);
+        if (alphaBlend != osg::StateAttribute::INHERIT && (!mRequirements.back().mAlphaBlendOverridden || alphaBlend & osg::StateAttribute::PROTECTED))
+        {
+            if (alphaBlend & osg::StateAttribute::OVERRIDE)
+                mRequirements.back().mAlphaBlendOverridden = true;
+
+            mRequirements.back().mAlphaBlend = alphaBlend & osg::StateAttribute::ON;
+        }
     }
 
     void ShaderVisitor::pushRequirements(osg::Node& node)
@@ -394,7 +405,8 @@ namespace Shader
             // This prevents redundant glAlphaFunc calls while letting the shadows bin still see the test
             writableStateSet->setAttribute(RemovedAlphaFunc::getInstance(reqs.mAlphaFunc), osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
 
-            if (mConvertAlphaTestToAlphaToCoverage)
+            // Blending won't work with A2C as we use the alpha channel for coverage. gl_SampleCoverage from ARB_sample_shading would save the day, but requires GLSL 130
+            if (mConvertAlphaTestToAlphaToCoverage && !reqs.mAlphaBlend)
             {
                 writableStateSet->setMode(GL_SAMPLE_ALPHA_TO_COVERAGE_ARB, osg::StateAttribute::ON);
                 defineMap["alphaToCoverage"] = "1";
diff --git a/components/shader/shadervisitor.hpp b/components/shader/shadervisitor.hpp
index 606e06df97..9daeab29ba 100644
--- a/components/shader/shadervisitor.hpp
+++ b/components/shader/shadervisitor.hpp
@@ -84,9 +84,11 @@ namespace Shader
             
             bool mMaterialOverridden;
             bool mAlphaTestOverridden;
+            bool mAlphaBlendOverridden;
 
             GLenum mAlphaFunc;
             float mAlphaRef;
+            bool mAlphaBlend;
 
             bool mNormalHeight; // true if normal map has height info in alpha channel
 

From d061ae809601ae2b258fe6627d456c236f93ffc9 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Sat, 2 Jan 2021 23:27:28 +0000
Subject: [PATCH 0170/2859] Add changelog entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9f3d18161..214159db16 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -82,6 +82,7 @@
     Feature #2404: Levelled List can not be placed into a container
     Feature #2686: Timestamps in openmw.log
     Feature #4894: Consider actors as obstacles for pathfinding
+    Feature #4899: Alpha-To-Coverage Anti-Aliasing for alpha testing
     Feature #5043: Head Bobbing
     Feature #5199: Improve Scene Colors
     Feature #5297: Add a search function to the "Datafiles" tab of the OpenMW launcher

From 701a5662b02b4d92c884774ddf75905b3f7b1909 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alex462002@gmail.com>
Date: Sun, 3 Jan 2021 09:33:03 +0000
Subject: [PATCH 0171/2859] Remove #5683 changelog entry

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce0cce9522..fa35722820 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -81,7 +81,6 @@
     Bug #5661: Region sounds don't play at the right interval
     Bug #5675: OpenMW-cs. FRMR subrecords are saved with the wrong MastIdx
     Bug #5681: Player character can clip or pass through bridges instead of colliding against them
-    Bug #5683: Player character can get stuck with MR's balmora's wooden gate
     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

From d13459ecf98c4dfe0949d10ad4b5dec73817ab62 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Tue, 5 Jan 2021 22:21:54 +0000
Subject: [PATCH 0172/2859] Scale mipmap alpha to preserve coverage

---
 files/shaders/alpha.glsl                  | 23 +++++++++++++++++++++++
 files/shaders/objects_fragment.glsl       |  3 +++
 files/shaders/shadowcasting_fragment.glsl |  2 ++
 3 files changed, 28 insertions(+)

diff --git a/files/shaders/alpha.glsl b/files/shaders/alpha.glsl
index 2551a02052..6ead9e6ca2 100644
--- a/files/shaders/alpha.glsl
+++ b/files/shaders/alpha.glsl
@@ -12,6 +12,29 @@
 uniform float alphaRef;
 #endif
 
+float mipmapLevel(vec2 scaleduv)
+{
+    vec2 dUVdx = dFdx(scaleduv);
+    vec2 dUVdy = dFdy(scaleduv);
+    float maxDUVSquared = max(dot(dUVdx, dUVdx), dot(dUVdy, dUVdy));
+    return max(0.0, 0.5 * log2(maxDUVSquared));
+}
+
+float coveragePreservingAlphaScale(sampler2D diffuseMap, vec2 uv)
+{
+    #if @alphaFunc != FUNC_ALWAYS && @alphaFunc != FUNC_NEVER
+        vec2 textureSize;
+        #ifdef GL_EXT_gpu_shader4
+            textureSize = textureSize2D(diffuseMap, 0);
+        #else
+            textureSize = 256.0;
+        #endif
+            return 1.0 + mipmapLevel(uv * textureSize) * 0.25;
+    #else
+        return 1.0;
+    #endif
+}
+
 void alphaTest()
 {
     #if @alphaToCoverage 
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index 995c2adaf3..c5f397789a 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -1,5 +1,7 @@
 #version 120
 
+#extension EXT_gpu_shader4: enable
+
 #if @diffuseMap
 uniform sampler2D diffuseMap;
 varying vec2 diffuseMapUV;
@@ -109,6 +111,7 @@ void main()
 
 #if @diffuseMap
     gl_FragData[0] = texture2D(diffuseMap, adjustedDiffuseUV);
+    gl_FragData[0].a *= coveragePreservingAlphaScale(diffuseMap, adjustedDiffuseUV);
 #else
     gl_FragData[0] = vec4(1.0);
 #endif
diff --git a/files/shaders/shadowcasting_fragment.glsl b/files/shaders/shadowcasting_fragment.glsl
index 8c53c542bd..ea8a63313e 100644
--- a/files/shaders/shadowcasting_fragment.glsl
+++ b/files/shaders/shadowcasting_fragment.glsl
@@ -1,5 +1,7 @@
 #version 120
 
+#extension EXT_gpu_shader4: enable
+
 uniform sampler2D diffuseMap;
 varying vec2 diffuseMapUV;
 

From 4ed32520018dff5debf8d66ff7e1d7aa367a6c3b Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Thu, 7 Jan 2021 18:13:51 +0000
Subject: [PATCH 0173/2859] Check for EXT_gpu_shader4 CPU-side

Mesa lies and always defines GL_EXT_gpu_shader4 even when the extension
isn't present.
---
 apps/openmw/mwrender/renderingmanager.cpp  | 1 +
 components/sceneutil/mwshadowtechnique.cpp | 7 ++++++-
 components/shader/shadervisitor.cpp        | 7 +++++++
 files/shaders/alpha.glsl                   | 4 ++--
 files/shaders/objects_fragment.glsl        | 4 +++-
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 17a6527fc9..95e98f55b2 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -252,6 +252,7 @@ namespace MWRender
         globalDefines["clamp"] = Settings::Manager::getBool("clamp lighting", "Shaders") ? "1" : "0";
         globalDefines["preLightEnv"] = Settings::Manager::getBool("apply lighting to environment maps", "Shaders") ? "1" : "0";
         globalDefines["radialFog"] = Settings::Manager::getBool("radial fog", "Shaders") ? "1" : "0";
+        globalDefines["useGPUShader4"] = "0";
 
         // It is unnecessary to stop/start the viewer as no frames are being rendered yet.
         mResourceSystem->getSceneManager()->getShaderManager().setGlobalDefines(globalDefines);
diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
index c781318faf..41e64e1247 100644
--- a/components/sceneutil/mwshadowtechnique.cpp
+++ b/components/sceneutil/mwshadowtechnique.cpp
@@ -892,12 +892,17 @@ void SceneUtil::MWShadowTechnique::setupCastingShader(Shader::ShaderManager & sh
     // This can't be part of the constructor as OSG mandates that there be a trivial constructor available
 
     osg::ref_ptr<osg::Shader> castingVertexShader = shaderManager.getShader("shadowcasting_vertex.glsl", {}, osg::Shader::VERTEX);
+    osg::ref_ptr<osg::GLExtensions> exts = osg::GLExtensions::Get(0, false);
+    std::string useGPUShader4 = exts && exts->isGpuShader4Supported ? "1" : "0";
     for (int alphaFunc = GL_NEVER; alphaFunc <= GL_ALWAYS; ++alphaFunc)
     {
         auto& program = _castingPrograms[alphaFunc - GL_NEVER];
         program = new osg::Program();
         program->addShader(castingVertexShader);
-        program->addShader(shaderManager.getShader("shadowcasting_fragment.glsl", { {"alphaFunc", std::to_string(alphaFunc)}, {"alphaToCoverage", "0"} }, osg::Shader::FRAGMENT));
+        program->addShader(shaderManager.getShader("shadowcasting_fragment.glsl", { {"alphaFunc", std::to_string(alphaFunc)},
+                                                                                    {"alphaToCoverage", "0"},
+                                                                                    {"useGPUShader4", useGPUShader4}
+                                                                                  }, osg::Shader::FRAGMENT));
     }
 }
 
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 165be6745d..d719daec28 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -2,6 +2,7 @@
 
 #include <osg/AlphaFunc>
 #include <osg/Geometry>
+#include <osg/GLExtensions>
 #include <osg/Material>
 #include <osg/Multisample>
 #include <osg/Texture>
@@ -411,6 +412,12 @@ namespace Shader
                 writableStateSet->setMode(GL_SAMPLE_ALPHA_TO_COVERAGE_ARB, osg::StateAttribute::ON);
                 defineMap["alphaToCoverage"] = "1";
             }
+
+            // Preventing alpha tested stuff shrinking as lower mip levels are used requires knowing the texture size
+            osg::ref_ptr<osg::GLExtensions> exts = osg::GLExtensions::Get(0, false);
+            if (exts && exts->isGpuShader4Supported)
+                defineMap["useGPUShader4"] = "1";
+            // We could fall back to a texture size uniform if EXT_gpu_shader4 is missing
         }
 
         if (writableStateSet->getMode(GL_ALPHA_TEST) != osg::StateAttribute::INHERIT)
diff --git a/files/shaders/alpha.glsl b/files/shaders/alpha.glsl
index 6ead9e6ca2..05be801e93 100644
--- a/files/shaders/alpha.glsl
+++ b/files/shaders/alpha.glsl
@@ -24,10 +24,10 @@ float coveragePreservingAlphaScale(sampler2D diffuseMap, vec2 uv)
 {
     #if @alphaFunc != FUNC_ALWAYS && @alphaFunc != FUNC_NEVER
         vec2 textureSize;
-        #ifdef GL_EXT_gpu_shader4
+        #if @useGPUShader4
             textureSize = textureSize2D(diffuseMap, 0);
         #else
-            textureSize = 256.0;
+            textureSize = vec2(256.0);
         #endif
             return 1.0 + mipmapLevel(uv * textureSize) * 0.25;
     #else
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index c5f397789a..37cca273fc 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -1,6 +1,8 @@
 #version 120
 
-#extension EXT_gpu_shader4: enable
+#if @useGPUShader4
+    #extension EXT_gpu_shader4: require
+#endif
 
 #if @diffuseMap
 uniform sampler2D diffuseMap;

From 2a583e2337f8003a8ba47ac08fd8ab65d03d149b Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Fri, 8 Jan 2021 17:24:13 +0100
Subject: [PATCH 0174/2859] consider empty paths as not constructed

---
 apps/openmw/mwmechanics/aipackage.cpp   |  4 +++-
 apps/openmw/mwmechanics/pathfinding.cpp | 10 +++-------
 apps/openmw/mwmechanics/pathfinding.hpp |  9 ---------
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index 8af2c71ed5..ce5673909f 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -158,8 +158,10 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
         zTurn(actor, getZAngleToPoint(position, dest));
         smoothTurn(actor, getXAngleToPoint(position, dest), 0);
         world->removeActorPath(actor);
-        return isDestReached || mPathFinder.pathWasPossible();
+        return true;
     }
+    else if (mPathFinder.getPath().empty())
+        return false;
 
     world->updateActorPath(actor, mPathFinder.getPath(), halfExtents, position, dest);
 
diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp
index 77ab78fd79..276321b81a 100644
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@@ -318,7 +318,6 @@ namespace MWMechanics
         mPath.clear();
         mPath.push_back(endPoint);
         mConstructed = true;
-        mPossible = true;
     }
 
     void PathFinder::buildPathByPathgrid(const osg::Vec3f& startPoint, const osg::Vec3f& endPoint,
@@ -329,8 +328,7 @@ namespace MWMechanics
 
         buildPathByPathgridImpl(startPoint, endPoint, pathgridGraph, std::back_inserter(mPath));
 
-        mConstructed = true;
-        mPossible = !mPath.empty();
+        mConstructed = !mPath.empty();
     }
 
     void PathFinder::buildPathByNavMesh(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint,
@@ -343,8 +341,7 @@ namespace MWMechanics
         if (!buildPathByNavigatorImpl(actor, startPoint, endPoint, halfExtents, flags, areaCosts, std::back_inserter(mPath)))
             mPath.push_back(endPoint);
 
-        mConstructed = true;
-        mPossible = !mPath.empty();
+        mConstructed = !mPath.empty();
     }
 
     void PathFinder::buildPath(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint, const osg::Vec3f& endPoint,
@@ -369,8 +366,7 @@ namespace MWMechanics
         if (!hasNavMesh && mPath.empty())
             mPath.push_back(endPoint);
 
-        mConstructed = true;
-        mPossible = !mPath.empty();
+        mConstructed = !mPath.empty();
     }
 
     bool PathFinder::buildPathByNavigatorImpl(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint,
diff --git a/apps/openmw/mwmechanics/pathfinding.hpp b/apps/openmw/mwmechanics/pathfinding.hpp
index ed786dc846..5af822fee7 100644
--- a/apps/openmw/mwmechanics/pathfinding.hpp
+++ b/apps/openmw/mwmechanics/pathfinding.hpp
@@ -74,7 +74,6 @@ namespace MWMechanics
         public:
             PathFinder()
                 : mConstructed(false)
-                , mPossible(false)
                 , mCell(nullptr)
             {
             }
@@ -82,7 +81,6 @@ namespace MWMechanics
             void clearPath()
             {
                 mConstructed = false;
-                mPossible = false;
                 mPath.clear();
                 mCell = nullptr;
             }
@@ -111,11 +109,6 @@ namespace MWMechanics
                 return mConstructed && mPath.empty();
             }
 
-            bool pathWasPossible() const
-            {
-                return mPossible;
-            }
-
             /// In radians
             float getZAngleToNext(float x, float y) const;
 
@@ -144,7 +137,6 @@ namespace MWMechanics
             void addPointToPath(const osg::Vec3f& point)
             {
                 mConstructed = true;
-                mPossible = true;
                 mPath.push_back(point);
             }
 
@@ -204,7 +196,6 @@ namespace MWMechanics
 
         private:
             bool mConstructed;
-            bool mPossible;
             std::deque<osg::Vec3f> mPath;
 
             const MWWorld::CellStore* mCell;

From 0068c7bb252428571c1f6ae4ca57220873d0c701 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Fri, 8 Jan 2021 17:32:15 +0000
Subject: [PATCH 0175/2859] Spec says GL_

---
 files/shaders/objects_fragment.glsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index 37cca273fc..693c045847 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -1,7 +1,7 @@
 #version 120
 
 #if @useGPUShader4
-    #extension EXT_gpu_shader4: require
+    #extension GL_EXT_gpu_shader4: require
 #endif
 
 #if @diffuseMap

From 7d551b0cfde472da8acb7e8a8f1a0b1899694ad9 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Fri, 8 Jan 2021 23:21:39 +0100
Subject: [PATCH 0176/2859] Split long osg log messages into lines.

---
 apps/openmw/main.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index 89aa2b9fd5..8eaac36e81 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -254,7 +254,19 @@ namespace
                 level = Debug::Debug;
             }
             std::string_view s(msgCopy);
-            Log(level) << (s.back() == '\n' ? s.substr(0, s.size() - 1) : s);
+            if (s.size() < 1024)
+                Log(level) << (s.back() == '\n' ? s.substr(0, s.size() - 1) : s);
+            else
+            {
+                while (!s.empty())
+                {
+                    size_t lineSize = 1;
+                    while (lineSize < s.size() && s[lineSize - 1] != '\n')
+                        lineSize++;
+                    Log(level) << s.substr(0, s[lineSize - 1] == '\n' ? lineSize - 1 : lineSize);
+                    s = s.substr(lineSize);
+                }
+            }
         }
     };
 }

From 944033db4e4e3d7d0205480a8763f4d714652d59 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 18 Jul 2020 23:56:14 +0200
Subject: [PATCH 0177/2859] Separate sound buffer pool from sound manager

---
 apps/openmw/CMakeLists.txt              |   1 +
 apps/openmw/mwsound/sound.hpp           |   7 +
 apps/openmw/mwsound/sound_buffer.cpp    | 154 +++++++++++++++++++++
 apps/openmw/mwsound/sound_buffer.hpp    |  91 +++++++++++--
 apps/openmw/mwsound/sound_output.hpp    |   9 +-
 apps/openmw/mwsound/soundmanagerimp.cpp | 169 +++---------------------
 apps/openmw/mwsound/soundmanagerimp.hpp |  29 +---
 7 files changed, 276 insertions(+), 184 deletions(-)
 create mode 100644 apps/openmw/mwsound/sound_buffer.cpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index a4c3b91361..f32240a915 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -58,6 +58,7 @@ add_openmw_dir (mwscript
 add_openmw_dir (mwsound
     soundmanagerimp openal_output ffmpeg_decoder sound sound_buffer sound_decoder sound_output
     loudness movieaudiofactory alext efx efx-presets regionsoundselector watersoundupdater volumesettings
+    sound_buffer
     )
 
 add_openmw_dir (mwworld
diff --git a/apps/openmw/mwsound/sound.hpp b/apps/openmw/mwsound/sound.hpp
index 9d264e1b69..d2e65c9895 100644
--- a/apps/openmw/mwsound/sound.hpp
+++ b/apps/openmw/mwsound/sound.hpp
@@ -7,6 +7,13 @@
 
 namespace MWSound
 {
+    // Extra play flags, not intended for caller use
+    enum PlayModeEx
+    {
+        Play_2D = 0,
+        Play_3D = 1 << 31,
+    };
+
     // For testing individual PlayMode flags
     inline int operator&(int a, PlayMode b) { return a & static_cast<int>(b); }
     inline int operator&(PlayMode a, PlayMode b) { return static_cast<int>(a) & static_cast<int>(b); }
diff --git a/apps/openmw/mwsound/sound_buffer.cpp b/apps/openmw/mwsound/sound_buffer.cpp
new file mode 100644
index 0000000000..0e25ff6015
--- /dev/null
+++ b/apps/openmw/mwsound/sound_buffer.cpp
@@ -0,0 +1,154 @@
+#include "sound_buffer.hpp"
+
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+#include "../mwworld/esmstore.hpp"
+
+#include <components/debug/debuglog.hpp>
+#include <components/settings/settings.hpp>
+#include <components/vfs/manager.hpp>
+
+#include <algorithm>
+#include <cmath>
+
+namespace MWSound
+{
+    namespace
+    {
+        struct AudioParams
+        {
+            float mAudioDefaultMinDistance;
+            float mAudioDefaultMaxDistance;
+            float mAudioMinDistanceMult;
+            float mAudioMaxDistanceMult;
+        };
+
+        AudioParams makeAudioParams(const MWBase::World& world)
+        {
+            const auto& settings = world.getStore().get<ESM::GameSetting>();
+            AudioParams params;
+            params.mAudioDefaultMinDistance = settings.find("fAudioDefaultMinDistance")->mValue.getFloat();
+            params.mAudioDefaultMaxDistance = settings.find("fAudioDefaultMaxDistance")->mValue.getFloat();
+            params.mAudioMinDistanceMult = settings.find("fAudioMinDistanceMult")->mValue.getFloat();
+            params.mAudioMaxDistanceMult = settings.find("fAudioMaxDistanceMult")->mValue.getFloat();
+            return params;
+        }
+    }
+
+    SoundBufferPool::SoundBufferPool(const VFS::Manager& vfs, Sound_Output& output) :
+        mVfs(&vfs),
+        mOutput(&output),
+        mBufferCacheMax(std::max(Settings::Manager::getInt("buffer cache max", "Sound"), 1) * 1024 * 1024),
+        mBufferCacheMin(std::min(static_cast<std::size_t>(std::max(Settings::Manager::getInt("buffer cache min", "Sound"), 1)) * 1024 * 1024, mBufferCacheMax))
+    {
+    }
+
+    SoundBufferPool::~SoundBufferPool()
+    {
+        clear();
+    }
+
+    Sound_Buffer* SoundBufferPool::lookup(const std::string& soundId) const
+    {
+        const auto it = mBufferNameMap.find(soundId);
+        if (it != mBufferNameMap.end())
+        {
+            Sound_Buffer* sfx = it->second;
+            if (sfx->getHandle() != nullptr)
+                return sfx;
+        }
+        return nullptr;
+    }
+
+    Sound_Buffer* SoundBufferPool::load(const std::string& soundId)
+    {
+        if (mBufferNameMap.empty())
+        {
+            for (const ESM::Sound& sound : MWBase::Environment::get().getWorld()->getStore().get<ESM::Sound>())
+                insertSound(Misc::StringUtils::lowerCase(sound.mId), sound);
+        }
+
+        Sound_Buffer* sfx;
+        const auto it = mBufferNameMap.find(soundId);
+        if (it != mBufferNameMap.end())
+            sfx = it->second;
+        else
+        {
+            const ESM::Sound *sound = MWBase::Environment::get().getWorld()->getStore().get<ESM::Sound>().search(soundId);
+            if (sound == nullptr)
+                return {};
+            sfx = insertSound(soundId, *sound);
+        }
+
+        if (sfx->getHandle() == nullptr)
+        {
+            Sound_Handle handle;
+            size_t size;
+            std::tie(handle, size) = mOutput->loadSound(sfx->getResourceName());
+            if (handle == nullptr)
+                return {};
+
+            sfx->mHandle = handle;
+
+            mBufferCacheSize += size;
+            if (mBufferCacheSize > mBufferCacheMax)
+            {
+                unloadUnused();
+                if (!mUnusedBuffers.empty() && mBufferCacheSize > mBufferCacheMax)
+                    Log(Debug::Warning) << "No unused sound buffers to free, using " << mBufferCacheSize << " bytes!";
+            }
+            mUnusedBuffers.push_front(sfx);
+        }
+
+        return sfx;
+    }
+
+    void SoundBufferPool::clear()
+    {
+        for (auto &sfx : mSoundBuffers)
+        {
+            if(sfx.mHandle)
+                mOutput->unloadSound(sfx.mHandle);
+            sfx.mHandle = nullptr;
+        }
+        mUnusedBuffers.clear();
+    }
+
+    Sound_Buffer* SoundBufferPool::insertSound(const std::string& soundId, const ESM::Sound& sound)
+    {
+        static const AudioParams audioParams = makeAudioParams(*MWBase::Environment::get().getWorld());
+
+        float volume = static_cast<float>(std::pow(10.0, (sound.mData.mVolume / 255.0 * 3348.0 - 3348.0) / 2000.0));
+        float min = sound.mData.mMinRange;
+        float max = sound.mData.mMaxRange;
+        if (min == 0 && max == 0)
+        {
+            min = audioParams.mAudioDefaultMinDistance;
+            max = audioParams.mAudioDefaultMaxDistance;
+        }
+
+        min *= audioParams.mAudioMinDistanceMult;
+        max *= audioParams.mAudioMaxDistanceMult;
+        min = std::max(min, 1.0f);
+        max = std::max(min, max);
+
+        Sound_Buffer& sfx = mSoundBuffers.emplace_back("Sound/" + sound.mSound, volume, min, max);
+        mVfs->normalizeFilename(sfx.mResourceName);
+
+        mBufferNameMap.emplace(soundId, &sfx);
+        return &sfx;
+    }
+
+    void SoundBufferPool::unloadUnused()
+    {
+        while (!mUnusedBuffers.empty() && mBufferCacheSize > mBufferCacheMin)
+        {
+            Sound_Buffer* const unused = mUnusedBuffers.back();
+
+            mBufferCacheSize -= mOutput->unloadSound(unused->getHandle());
+            unused->mHandle = nullptr;
+
+            mUnusedBuffers.pop_back();
+        }
+    }
+}
diff --git a/apps/openmw/mwsound/sound_buffer.hpp b/apps/openmw/mwsound/sound_buffer.hpp
index 83b08d6be8..e623923003 100644
--- a/apps/openmw/mwsound/sound_buffer.hpp
+++ b/apps/openmw/mwsound/sound_buffer.hpp
@@ -1,27 +1,100 @@
 #ifndef GAME_SOUND_SOUND_BUFFER_H
 #define GAME_SOUND_SOUND_BUFFER_H
 
+#include <algorithm>
 #include <string>
+#include <deque>
+#include <unordered_map>
 
 #include "sound_output.hpp"
 
+namespace ESM
+{
+    struct Sound;
+}
+
+namespace VFS
+{
+    class Manager;
+}
+
 namespace MWSound
 {
+    class SoundBufferPool;
+
     class Sound_Buffer
     {
-    public:
-        std::string mResourceName;
+        public:
+            Sound_Buffer(std::string resname, float volume, float mindist, float maxdist)
+                : mResourceName(std::move(resname)), mVolume(volume), mMinDist(mindist), mMaxDist(maxdist)
+            {}
+
+            const std::string& getResourceName() const noexcept { return mResourceName; }
+
+            Sound_Handle getHandle() const noexcept { return mHandle; }
+
+            float getVolume() const noexcept { return mVolume; }
+
+            float getMinDist() const noexcept { return mMinDist; }
+
+            float getMaxDist() const noexcept { return mMaxDist; }
+
+        private:
+            std::string mResourceName;
+            float mVolume = 0;
+            float mMinDist = 0;
+            float mMaxDist = 0;
+            Sound_Handle mHandle = nullptr;
+            std::size_t mUses = 0;
+
+            friend class SoundBufferPool;
+    };
+
+    class SoundBufferPool
+    {
+        public:
+            SoundBufferPool(const VFS::Manager& vfs, Sound_Output& output);
+
+            SoundBufferPool(const SoundBufferPool&) = delete;
+
+            ~SoundBufferPool();
+
+            Sound_Buffer* lookup(const std::string& soundId) const;
+
+            Sound_Buffer* load(const std::string& soundId);
+
+            void use(Sound_Buffer& sfx)
+            {
+                if (sfx.mUses++ == 0)
+                {
+                    const auto it = std::find(mUnusedBuffers.begin(), mUnusedBuffers.end(), &sfx);
+                    if (it != mUnusedBuffers.end())
+                        mUnusedBuffers.erase(it);
+                }
+            }
+
+            void release(Sound_Buffer& sfx)
+            {
+                if (--sfx.mUses == 0)
+                    mUnusedBuffers.push_front(&sfx);
+            }
 
-        float mVolume;
-        float mMinDist, mMaxDist;
+            void clear();
 
-        Sound_Handle mHandle;
+        private:
+            const VFS::Manager* const mVfs;
+            Sound_Output* mOutput;
+            std::deque<Sound_Buffer> mSoundBuffers;
+            std::unordered_map<std::string, Sound_Buffer*> mBufferNameMap;
+            std::size_t mBufferCacheMax;
+            std::size_t mBufferCacheMin;
+            std::size_t mBufferCacheSize = 0;
+            // NOTE: unused buffers are stored in front-newest order.
+            std::deque<Sound_Buffer*> mUnusedBuffers;
 
-        size_t mUses;
+            inline Sound_Buffer* insertSound(const std::string& soundId, const ESM::Sound& sound);
 
-        Sound_Buffer(std::string resname, float volume, float mindist, float maxdist)
-          : mResourceName(resname), mVolume(volume), mMinDist(mindist), mMaxDist(maxdist), mHandle(nullptr), mUses(0)
-        { }
+            inline void unloadUnused();
     };
 }
 
diff --git a/apps/openmw/mwsound/sound_output.hpp b/apps/openmw/mwsound/sound_output.hpp
index 4075e36ccd..9ec8b17dc9 100644
--- a/apps/openmw/mwsound/sound_output.hpp
+++ b/apps/openmw/mwsound/sound_output.hpp
@@ -5,7 +5,7 @@
 #include <memory>
 #include <vector>
 
-#include "soundmanagerimp.hpp"
+#include "../mwbase/soundmanager.hpp"
 
 namespace MWSound
 {
@@ -25,6 +25,12 @@ namespace MWSound
         Auto
     };
 
+    enum Environment
+    {
+        Env_Normal,
+        Env_Underwater
+    };
+
     class Sound_Output
     {
         SoundManager &mManager;
@@ -81,6 +87,7 @@ namespace MWSound
 
         friend class OpenAL_Output;
         friend class SoundManager;
+        friend class SoundBufferPool;
     };
 }
 
diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index 37ba80820d..03ad58088a 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -56,8 +56,7 @@ namespace MWSound
         : mVFS(vfs)
         , mOutput(new DEFAULT_OUTPUT(*this))
         , mWaterSoundUpdater(makeWaterSoundUpdaterSettings())
-        , mSoundBuffers(new SoundBufferList::element_type())
-        , mBufferCacheSize(0)
+        , mSoundBuffers(*vfs, *mOutput)
         , mListenerUnderwater(false)
         , mListenerPos(0,0,0)
         , mListenerDir(1,0,0)
@@ -69,11 +68,6 @@ namespace MWSound
         , mLastCell(nullptr)
         , mCurrentRegionSound(nullptr)
     {
-        mBufferCacheMin = std::max(Settings::Manager::getInt("buffer cache min", "Sound"), 1);
-        mBufferCacheMax = std::max(Settings::Manager::getInt("buffer cache max", "Sound"), 1);
-        mBufferCacheMax *= 1024*1024;
-        mBufferCacheMin = std::min(mBufferCacheMin*1024*1024, mBufferCacheMax);
-
         if(!useSound)
         {
             Log(Debug::Info) << "Sound disabled.";
@@ -116,13 +110,7 @@ namespace MWSound
     SoundManager::~SoundManager()
     {
         clear();
-        for(Sound_Buffer &sfx : *mSoundBuffers)
-        {
-            if(sfx.mHandle)
-                mOutput->unloadSound(sfx.mHandle);
-            sfx.mHandle = nullptr;
-        }
-        mUnusedBuffers.clear();
+        mSoundBuffers.clear();
         mOutput.reset();
     }
 
@@ -132,112 +120,18 @@ namespace MWSound
         return DecoderPtr(new DEFAULT_DECODER (mVFS));
     }
 
-    Sound_Buffer *SoundManager::insertSound(const std::string &soundId, const ESM::Sound *sound)
-    {
-        MWBase::World* world = MWBase::Environment::get().getWorld();
-        static const float fAudioDefaultMinDistance = world->getStore().get<ESM::GameSetting>().find("fAudioDefaultMinDistance")->mValue.getFloat();
-        static const float fAudioDefaultMaxDistance = world->getStore().get<ESM::GameSetting>().find("fAudioDefaultMaxDistance")->mValue.getFloat();
-        static const float fAudioMinDistanceMult = world->getStore().get<ESM::GameSetting>().find("fAudioMinDistanceMult")->mValue.getFloat();
-        static const float fAudioMaxDistanceMult = world->getStore().get<ESM::GameSetting>().find("fAudioMaxDistanceMult")->mValue.getFloat();
-        float volume, min, max;
-
-        volume = static_cast<float>(pow(10.0, (sound->mData.mVolume / 255.0*3348.0 - 3348.0) / 2000.0));
-        min = sound->mData.mMinRange;
-        max = sound->mData.mMaxRange;
-        if (min == 0 && max == 0)
-        {
-            min = fAudioDefaultMinDistance;
-            max = fAudioDefaultMaxDistance;
-        }
-
-        min *= fAudioMinDistanceMult;
-        max *= fAudioMaxDistanceMult;
-        min = std::max(min, 1.0f);
-        max = std::max(min, max);
-
-        Sound_Buffer *sfx = &*mSoundBuffers->insert(mSoundBuffers->end(),
-            Sound_Buffer("Sound/"+sound->mSound, volume, min, max)
-        );
-        mVFS->normalizeFilename(sfx->mResourceName);
-
-        mBufferNameMap.insert(std::make_pair(soundId, sfx));
-
-        return sfx;
-    }
-
     // Lookup a soundId for its sound data (resource name, local volume,
     // minRange, and maxRange)
     Sound_Buffer *SoundManager::lookupSound(const std::string &soundId) const
     {
-        NameBufferMap::const_iterator snd = mBufferNameMap.find(soundId);
-        if(snd != mBufferNameMap.end())
-        {
-            Sound_Buffer *sfx = snd->second;
-            if(sfx->mHandle) return sfx;
-        }
-        return nullptr;
+        return mSoundBuffers.lookup(soundId);
     }
 
     // Lookup a soundId for its sound data (resource name, local volume,
     // minRange, and maxRange), and ensure it's ready for use.
     Sound_Buffer *SoundManager::loadSound(const std::string &soundId)
     {
-#ifdef __GNUC__
-#define LIKELY(x) __builtin_expect((bool)(x), true)
-#define UNLIKELY(x) __builtin_expect((bool)(x), false)
-#else
-#define LIKELY(x) (bool)(x)
-#define UNLIKELY(x) (bool)(x)
-#endif
-        if(UNLIKELY(mBufferNameMap.empty()))
-        {
-            MWBase::World *world = MWBase::Environment::get().getWorld();
-            for(const ESM::Sound &sound : world->getStore().get<ESM::Sound>())
-                insertSound(Misc::StringUtils::lowerCase(sound.mId), &sound);
-        }
-
-        Sound_Buffer *sfx;
-        NameBufferMap::const_iterator snd = mBufferNameMap.find(soundId);
-        if(LIKELY(snd != mBufferNameMap.end()))
-            sfx = snd->second;
-        else
-        {
-            MWBase::World *world = MWBase::Environment::get().getWorld();
-            const ESM::Sound *sound = world->getStore().get<ESM::Sound>().search(soundId);
-            if(!sound) return nullptr;
-            sfx = insertSound(soundId, sound);
-        }
-#undef LIKELY
-#undef UNLIKELY
-
-        if(!sfx->mHandle)
-        {
-            size_t size;
-            std::tie(sfx->mHandle, size) = mOutput->loadSound(sfx->mResourceName);
-            if(!sfx->mHandle) return nullptr;
-
-            mBufferCacheSize += size;
-            if(mBufferCacheSize > mBufferCacheMax)
-            {
-                do {
-                    if(mUnusedBuffers.empty())
-                    {
-                        Log(Debug::Warning) << "No unused sound buffers to free, using " << mBufferCacheSize << " bytes!";
-                        break;
-                    }
-                    Sound_Buffer *unused = mUnusedBuffers.back();
-
-                    size = mOutput->unloadSound(unused->mHandle);
-                    mBufferCacheSize -= size;
-                    unused->mHandle = nullptr;
-
-                    mUnusedBuffers.pop_back();
-                } while(mBufferCacheSize > mBufferCacheMin);
-            }
-            mUnusedBuffers.push_front(sfx);
-        }
-
-        return sfx;
+        return mSoundBuffers.load(soundId);
     }
 
     DecoderPtr SoundManager::loadVoice(const std::string &voicefile)
@@ -624,23 +518,18 @@ namespace MWSound
         SoundPtr sound = getSoundRef();
         sound->init([&] {
             SoundParams params;
-            params.mVolume = volume * sfx->mVolume;
+            params.mVolume = volume * sfx->getVolume();
             params.mBaseVolume = volumeFromType(type);
             params.mPitch = pitch;
             params.mFlags = mode | type | Play_2D;
             return params;
         } ());
-        if(!mOutput->playSound(sound.get(), sfx->mHandle, offset))
+        if(!mOutput->playSound(sound.get(), sfx->getHandle(), offset))
             return nullptr;
 
-        if(sfx->mUses++ == 0)
-        {
-            SoundList::iterator iter = std::find(mUnusedBuffers.begin(), mUnusedBuffers.end(), sfx);
-            if(iter != mUnusedBuffers.end())
-                mUnusedBuffers.erase(iter);
-        }
         Sound* result = sound.get();
         mActiveSounds[MWWorld::ConstPtr()].emplace_back(std::move(sound), sfx);
+        mSoundBuffers.use(*sfx);
         return result;
     }
 
@@ -668,40 +557,35 @@ namespace MWSound
         {
             sound->init([&] {
                 SoundParams params;
-                params.mVolume = volume * sfx->mVolume;
+                params.mVolume = volume * sfx->getVolume();
                 params.mBaseVolume = volumeFromType(type);
                 params.mPitch = pitch;
                 params.mFlags = mode | type | Play_2D;
                 return params;
             } ());
-            played = mOutput->playSound(sound.get(), sfx->mHandle, offset);
+            played = mOutput->playSound(sound.get(), sfx->getHandle(), offset);
         }
         else
         {
             sound->init([&] {
                 SoundParams params;
                 params.mPos = objpos;
-                params.mVolume = volume * sfx->mVolume;
+                params.mVolume = volume * sfx->getVolume();
                 params.mBaseVolume = volumeFromType(type);
                 params.mPitch = pitch;
-                params.mMinDistance = sfx->mMinDist;
-                params.mMaxDistance = sfx->mMaxDist;
+                params.mMinDistance = sfx->getMinDist();
+                params.mMaxDistance = sfx->getMaxDist();
                 params.mFlags = mode | type | Play_3D;
                 return params;
             } ());
-            played = mOutput->playSound3D(sound.get(), sfx->mHandle, offset);
+            played = mOutput->playSound3D(sound.get(), sfx->getHandle(), offset);
         }
         if(!played)
             return nullptr;
 
-        if(sfx->mUses++ == 0)
-        {
-            SoundList::iterator iter = std::find(mUnusedBuffers.begin(), mUnusedBuffers.end(), sfx);
-            if(iter != mUnusedBuffers.end())
-                mUnusedBuffers.erase(iter);
-        }
         Sound* result = sound.get();
         mActiveSounds[ptr].emplace_back(std::move(sound), sfx);
+        mSoundBuffers.use(*sfx);
         return result;
     }
 
@@ -720,25 +604,20 @@ namespace MWSound
         sound->init([&] {
             SoundParams params;
             params.mPos = initialPos;
-            params.mVolume = volume * sfx->mVolume;
+            params.mVolume = volume * sfx->getVolume();
             params.mBaseVolume = volumeFromType(type);
             params.mPitch = pitch;
-            params.mMinDistance = sfx->mMinDist;
-            params.mMaxDistance = sfx->mMaxDist;
+            params.mMinDistance = sfx->getMinDist();
+            params.mMaxDistance = sfx->getMaxDist();
             params.mFlags = mode | type | Play_3D;
             return params;
         } ());
-        if(!mOutput->playSound3D(sound.get(), sfx->mHandle, offset))
+        if(!mOutput->playSound3D(sound.get(), sfx->getHandle(), offset))
             return nullptr;
 
-        if(sfx->mUses++ == 0)
-        {
-            SoundList::iterator iter = std::find(mUnusedBuffers.begin(), mUnusedBuffers.end(), sfx);
-            if(iter != mUnusedBuffers.end())
-                mUnusedBuffers.erase(iter);
-        }
         Sound* result = sound.get();
         mActiveSounds[MWWorld::ConstPtr()].emplace_back(std::move(sound), sfx);
+        mSoundBuffers.use(*sfx);
         return result;
     }
 
@@ -921,7 +800,7 @@ namespace MWSound
             case WaterSoundAction::DoNothing:
                 break;
             case WaterSoundAction::SetVolume:
-                mNearWaterSound->setVolume(update.mVolume * sfx->mVolume);
+                mNearWaterSound->setVolume(update.mVolume * sfx->getVolume());
                 break;
             case WaterSoundAction::FinishSound:
                 mOutput->finishSound(mNearWaterSound);
@@ -1028,7 +907,6 @@ namespace MWSound
             while(sndidx != snditer->second.end())
             {
                 Sound *sound = sndidx->first.get();
-                Sound_Buffer *sfx = sndidx->second;
 
                 if(!ptr.isEmpty() && sound->getIs3D())
                 {
@@ -1050,8 +928,7 @@ namespace MWSound
                         mUnderwaterSound = nullptr;
                     if (sound == mNearWaterSound)
                         mNearWaterSound = nullptr;
-                    if(sfx->mUses-- == 1)
-                        mUnusedBuffers.push_front(sfx);
+                    mSoundBuffers.release(*sndidx->second);
                     sndidx = snditer->second.erase(sndidx);
                 }
                 else
@@ -1313,9 +1190,7 @@ namespace MWSound
             for(SoundBufferRefPair &sndbuf : snd.second)
             {
                 mOutput->finishSound(sndbuf.first.get());
-                Sound_Buffer *sfx = sndbuf.second;
-                if(sfx->mUses-- == 1)
-                    mUnusedBuffers.push_front(sfx);
+                mSoundBuffers.release(*sndbuf.second);
             }
         }
         mActiveSounds.clear();
diff --git a/apps/openmw/mwsound/soundmanagerimp.hpp b/apps/openmw/mwsound/soundmanagerimp.hpp
index f69171a09e..21004dc94a 100644
--- a/apps/openmw/mwsound/soundmanagerimp.hpp
+++ b/apps/openmw/mwsound/soundmanagerimp.hpp
@@ -4,7 +4,6 @@
 #include <memory>
 #include <string>
 #include <utility>
-#include <deque>
 #include <map>
 #include <unordered_map>
 
@@ -18,6 +17,7 @@
 #include "watersoundupdater.hpp"
 #include "type.hpp"
 #include "volumesettings.hpp"
+#include "sound_buffer.hpp"
 
 namespace VFS
 {
@@ -36,17 +36,6 @@ namespace MWSound
     struct Sound_Decoder;
     class Sound;
     class Stream;
-    class Sound_Buffer;
-
-    enum Environment {
-        Env_Normal,
-        Env_Underwater
-    };
-    // Extra play flags, not intended for caller use
-    enum PlayModeEx {
-        Play_2D = 0,
-        Play_3D = 1<<31
-    };
 
     using SoundPtr = Misc::ObjectPtr<Sound>;
     using StreamPtr = Misc::ObjectPtr<Stream>;
@@ -66,21 +55,7 @@ namespace MWSound
 
         WaterSoundUpdater mWaterSoundUpdater;
 
-        typedef std::unique_ptr<std::deque<Sound_Buffer> > SoundBufferList;
-        // List of sound buffers, grown as needed. New enties are added to the
-        // back, allowing existing Sound_Buffer references/pointers to remain
-        // valid.
-        SoundBufferList mSoundBuffers;
-        size_t mBufferCacheMin;
-        size_t mBufferCacheMax;
-        size_t mBufferCacheSize;
-
-        typedef std::unordered_map<std::string,Sound_Buffer*> NameBufferMap;
-        NameBufferMap mBufferNameMap;
-
-        // NOTE: unused buffers are stored in front-newest order.
-        typedef std::deque<Sound_Buffer*> SoundList;
-        SoundList mUnusedBuffers;
+        SoundBufferPool mSoundBuffers;
 
         Misc::ObjectPool<Sound> mSounds;
 

From 799bd3379c36d14635bf200f28f8fe7938bb7e1a Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Fri, 8 Jan 2021 19:33:51 +0400
Subject: [PATCH 0178/2859] Move screenshots handling to the separate class

---
 apps/openmw/CMakeLists.txt                 |   2 +-
 apps/openmw/mwbase/world.hpp               |   2 +-
 apps/openmw/mwinput/actionmanager.cpp      |  10 +-
 apps/openmw/mwrender/renderingmanager.cpp  | 290 +-----------------
 apps/openmw/mwrender/renderingmanager.hpp  |   9 +-
 apps/openmw/mwrender/screenshotmanager.cpp | 324 +++++++++++++++++++++
 apps/openmw/mwrender/screenshotmanager.hpp |  40 +++
 apps/openmw/mwworld/worldimp.cpp           |   6 +-
 apps/openmw/mwworld/worldimp.hpp           |   2 +-
 9 files changed, 386 insertions(+), 299 deletions(-)
 create mode 100644 apps/openmw/mwrender/screenshotmanager.cpp
 create mode 100644 apps/openmw/mwrender/screenshotmanager.hpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index a4c3b91361..f96ddb27f8 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -19,7 +19,7 @@ source_group(game FILES ${GAME} ${GAME_HEADER})
 
 add_openmw_dir (mwrender
     actors objects renderingmanager animation rotatecontroller sky npcanimation vismask
-    creatureanimation effectmanager util renderinginterface pathgrid rendermode weaponanimation
+    creatureanimation effectmanager util renderinginterface pathgrid rendermode weaponanimation screenshotmanager
     bulletdebugdraw globalmap characterpreview camera viewovershoulder localmap water terrainstorage ripplesimulation
     renderbin actoranimation landmanager navmesh actorspaths recastmesh fogmanager objectpaging
     )
diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 958fcfb0ea..a3b035a8dd 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -497,7 +497,7 @@ namespace MWBase
 
             /// \todo this does not belong here
             virtual void screenshot (osg::Image* image, int w, int h) = 0;
-            virtual bool screenshot360 (osg::Image* image, std::string settingStr) = 0;
+            virtual bool screenshot360 (osg::Image* image) = 0;
 
             /// Find default position inside exterior cell specified by name
             /// \return false if exterior with given name not exists, true otherwise
diff --git a/apps/openmw/mwinput/actionmanager.cpp b/apps/openmw/mwinput/actionmanager.cpp
index b29aa58a29..e0fcc5ccfc 100644
--- a/apps/openmw/mwinput/actionmanager.cpp
+++ b/apps/openmw/mwinput/actionmanager.cpp
@@ -333,12 +333,8 @@ namespace MWInput
 
     void ActionManager::screenshot()
     {
-        bool regularScreenshot = true;
-
-        std::string settingStr;
-
-        settingStr = Settings::Manager::getString("screenshot type","Video");
-        regularScreenshot = settingStr.size() == 0 || settingStr.compare("regular") == 0;
+        const std::string& settingStr = Settings::Manager::getString("screenshot type", "Video");
+        bool regularScreenshot = settingStr.size() == 0 || settingStr.compare("regular") == 0;
 
         if (regularScreenshot)
         {
@@ -349,7 +345,7 @@ namespace MWInput
         {
             osg::ref_ptr<osg::Image> screenshot (new osg::Image);
 
-            if (MWBase::Environment::get().getWorld()->screenshot360(screenshot.get(), settingStr))
+            if (MWBase::Environment::get().getWorld()->screenshot360(screenshot.get()))
             {
                 (*mScreenCaptureOperation) (*(screenshot.get()), 0);
                 // FIXME: mScreenCaptureHandler->getCaptureOperation() causes crash for some reason
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 217f0b73ca..6ce431d2e2 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -2,8 +2,6 @@
 
 #include <limits>
 #include <cstdlib>
-#include <condition_variable>
-#include <mutex>
 
 #include <osg/Light>
 #include <osg/LightModel>
@@ -13,25 +11,20 @@
 #include <osg/Group>
 #include <osg/UserDataContainer>
 #include <osg/ComputeBoundsVisitor>
-#include <osg/ShapeDrawable>
-#include <osg/TextureCubeMap>
 
 #include <osgUtil/LineSegmentIntersector>
 
-#include <osg/ImageUtils>
-
 #include <osgViewer/Viewer>
 
 #include <components/nifosg/nifloader.hpp>
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/misc/stringops.hpp>
-
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/imagemanager.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/resource/keyframemanager.hpp>
+
 #include <components/shader/shadermanager.hpp>
 
 #include <components/settings/settings.hpp>
@@ -74,7 +67,7 @@
 #include "recastmesh.hpp"
 #include "fogmanager.hpp"
 #include "objectpaging.hpp"
-
+#include "screenshotmanager.hpp"
 
 namespace MWRender
 {
@@ -311,6 +304,8 @@ namespace MWRender
         if (Settings::Manager::getBool("view over shoulder", "Camera"))
             mViewOverShoulderController.reset(new ViewOverShoulderController(mCamera.get()));
 
+        mScreenshotManager.reset(new ScreenshotManager(viewer, mRootNode, sceneRoot, mResourceSystem, mWater.get()));
+
         mViewer->setLightingMode(osgViewer::View::NO_LIGHT);
 
         osg::ref_ptr<osg::LightSource> source = new osg::LightSource;
@@ -695,298 +690,31 @@ namespace MWRender
         mSky->setWaterHeight(height);
     }
 
-    class NotifyDrawCompletedCallback : public osg::Camera::DrawCallback
+    void RenderingManager::screenshot(osg::Image* image, int w, int h)
     {
-    public:
-        NotifyDrawCompletedCallback(unsigned int frame)
-            : mDone(false), mFrame(frame)
-        {
-        }
-
-        void operator () (osg::RenderInfo& renderInfo) const override
-        {
-            std::lock_guard<std::mutex> lock(mMutex);
-            if (renderInfo.getState()->getFrameStamp()->getFrameNumber() >= mFrame)
-            {
-                mDone = true;
-                mCondition.notify_one();
-            }
-        }
-
-        void waitTillDone()
-        {
-            std::unique_lock<std::mutex> lock(mMutex);
-            if (mDone)
-                return;
-            mCondition.wait(lock);
-        }
-
-        mutable std::condition_variable mCondition;
-        mutable std::mutex mMutex;
-        mutable bool mDone;
-        unsigned int mFrame;
-    };
+        mScreenshotManager->screenshot(image, w, h);
+    }
 
-    bool RenderingManager::screenshot360(osg::Image* image, std::string settingStr)
+    bool RenderingManager::screenshot360(osg::Image* image)
     {
-        int screenshotW = mViewer->getCamera()->getViewport()->width();
-        int screenshotH = mViewer->getCamera()->getViewport()->height();
-        int screenshotMapping = 0;
-
-        std::vector<std::string> settingArgs;
-        Misc::StringUtils::split(settingStr, settingArgs);
-
-        if (settingArgs.size() > 0)
-        {
-            std::string typeStrings[4] = {"spherical","cylindrical","planet","cubemap"};
-            bool found = false;
-
-            for (int i = 0; i < 4; ++i)
-                if (settingArgs[0].compare(typeStrings[i]) == 0)
-                {
-                    screenshotMapping = i;
-                    found = true;
-                    break;
-                }
-
-            if (!found)
-            {
-                Log(Debug::Warning) << "Wrong screenshot type: " << settingArgs[0] << ".";
-                return false;
-            }
-        }
-
-        // planet mapping needs higher resolution
-        int cubeSize = screenshotMapping == 2 ? screenshotW : screenshotW / 2;
-
-        if (settingArgs.size() > 1)
-            screenshotW = std::min(10000,std::atoi(settingArgs[1].c_str()));
-
-        if (settingArgs.size() > 2)
-            screenshotH = std::min(10000,std::atoi(settingArgs[2].c_str()));
-
-        if (settingArgs.size() > 3)
-            cubeSize = std::min(5000,std::atoi(settingArgs[3].c_str()));
-
         if (mCamera->isVanityOrPreviewModeEnabled())
         {
             Log(Debug::Warning) << "Spherical screenshots are not allowed in preview mode.";
             return false;
         }
 
-        bool rawCubemap = screenshotMapping == 3;
-
-        if (rawCubemap)
-            screenshotW = cubeSize * 6;  // the image will consist of 6 cube sides in a row
-        else if (screenshotMapping == 2)
-            screenshotH = screenshotW;   // use square resolution for planet mapping
-
-        std::vector<osg::ref_ptr<osg::Image>> images;
-
-        for (int i = 0; i < 6; ++i)
-            images.push_back(new osg::Image);
-
-        osg::Vec3 directions[6] = {
-            rawCubemap ? osg::Vec3(1,0,0) : osg::Vec3(0,0,1),
-            osg::Vec3(0,0,-1),
-            osg::Vec3(-1,0,0),
-            rawCubemap ? osg::Vec3(0,0,1) : osg::Vec3(1,0,0),
-            osg::Vec3(0,1,0),
-            osg::Vec3(0,-1,0)};
-
-        double rotations[] = {
-            -osg::PI / 2.0,
-            osg::PI / 2.0,
-            osg::PI,
-            0,
-            osg::PI / 2.0,
-            osg::PI / 2.0};
-
-        double fovBackup = mFieldOfView;
-        mFieldOfView = 90.0;             // each cubemap side sees 90 degrees
-
         int maskBackup = mPlayerAnimation->getObjectRoot()->getNodeMask();
 
         if (mCamera->isFirstPerson())
             mPlayerAnimation->getObjectRoot()->setNodeMask(0);
 
-        for (int i = 0; i < 6; ++i)      // for each cubemap side
-        {
-            osg::Matrixd transform = osg::Matrixd::rotate(osg::Vec3(0,0,-1),directions[i]);
-
-            if (!rawCubemap)
-                transform *= osg::Matrixd::rotate(rotations[i],osg::Vec3(0,0,-1));
-
-            osg::Image *sideImage = images[i].get();
-            screenshot(sideImage,cubeSize,cubeSize,transform);
-
-            if (!rawCubemap)
-                sideImage->flipHorizontal();
-        }
+        mScreenshotManager->screenshot360(image);
 
         mPlayerAnimation->getObjectRoot()->setNodeMask(maskBackup);
-        mFieldOfView = fovBackup;
-
-        if (rawCubemap)    // for raw cubemap don't run on GPU, just merge the images
-        {
-            image->allocateImage(cubeSize * 6,cubeSize,images[0]->r(),images[0]->getPixelFormat(),images[0]->getDataType());
-
-            for (int i = 0; i < 6; ++i)
-                osg::copyImage(images[i].get(),0,0,0,images[i]->s(),images[i]->t(),images[i]->r(),image,i * cubeSize,0,0);
-
-            return true;
-        }
-
-        // run on GPU now:
-
-        osg::ref_ptr<osg::TextureCubeMap> cubeTexture (new osg::TextureCubeMap);
-        cubeTexture->setResizeNonPowerOfTwoHint(false);
-
-        cubeTexture->setFilter(osg::Texture::MIN_FILTER,osg::Texture::NEAREST);
-        cubeTexture->setFilter(osg::Texture::MAG_FILTER,osg::Texture::NEAREST);
-
-        cubeTexture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
-        cubeTexture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
-
-        for (int i = 0; i < 6; ++i)
-            cubeTexture->setImage(i,images[i].get());
-
-        osg::ref_ptr<osg::Camera> screenshotCamera (new osg::Camera);
-        osg::ref_ptr<osg::ShapeDrawable> quad (new osg::ShapeDrawable(new osg::Box(osg::Vec3(0,0,0),2.0)));
-
-        std::map<std::string, std::string> defineMap;
-
-        Shader::ShaderManager& shaderMgr = mResourceSystem->getSceneManager()->getShaderManager();
-        osg::ref_ptr<osg::Shader> fragmentShader (shaderMgr.getShader("s360_fragment.glsl",defineMap,osg::Shader::FRAGMENT));
-        osg::ref_ptr<osg::Shader> vertexShader (shaderMgr.getShader("s360_vertex.glsl", defineMap, osg::Shader::VERTEX));
-        osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
-
-        osg::ref_ptr<osg::Program> program (new osg::Program);
-        program->addShader(fragmentShader);
-        program->addShader(vertexShader);
-        stateset->setAttributeAndModes(program, osg::StateAttribute::ON);
-
-        stateset->addUniform(new osg::Uniform("cubeMap",0));
-        stateset->addUniform(new osg::Uniform("mapping",screenshotMapping));
-        stateset->setTextureAttributeAndModes(0,cubeTexture,osg::StateAttribute::ON);
-
-        quad->setStateSet(stateset);
-        quad->setUpdateCallback(nullptr);
-
-        screenshotCamera->addChild(quad);
-
-        renderCameraToImage(screenshotCamera,image,screenshotW,screenshotH);
 
         return true;
     }
 
-    void RenderingManager::renderCameraToImage(osg::Camera *camera, osg::Image *image, int w, int h)
-    {
-        camera->setNodeMask(Mask_RenderToTexture);
-        camera->attach(osg::Camera::COLOR_BUFFER, image);
-        camera->setRenderOrder(osg::Camera::PRE_RENDER);
-        camera->setReferenceFrame(osg::Camera::ABSOLUTE_RF);
-        camera->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT,osg::Camera::PIXEL_BUFFER_RTT);
-
-        camera->setViewport(0, 0, w, h);
-
-        osg::ref_ptr<osg::Texture2D> texture (new osg::Texture2D);
-        texture->setInternalFormat(GL_RGB);
-        texture->setTextureSize(w,h);
-        texture->setResizeNonPowerOfTwoHint(false);
-        texture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
-        texture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
-        camera->attach(osg::Camera::COLOR_BUFFER,texture);
-
-        image->setDataType(GL_UNSIGNED_BYTE);
-        image->setPixelFormat(texture->getInternalFormat());
-
-        mRootNode->addChild(camera);
-
-        // The draw needs to complete before we can copy back our image.
-        osg::ref_ptr<NotifyDrawCompletedCallback> callback (new NotifyDrawCompletedCallback(0));
-        camera->setFinalDrawCallback(callback);
-
-        MWBase::Environment::get().getWindowManager()->getLoadingScreen()->loadingOn(false);
-
-        mViewer->eventTraversal();
-        mViewer->updateTraversal();
-        mViewer->renderingTraversals();
-        callback->waitTillDone();
-
-        MWBase::Environment::get().getWindowManager()->getLoadingScreen()->loadingOff();
-
-        // now that we've "used up" the current frame, get a fresh framenumber for the next frame() following after the screenshot is completed
-        mViewer->advance(mViewer->getFrameStamp()->getSimulationTime());
-
-        camera->removeChildren(0, camera->getNumChildren());
-        mRootNode->removeChild(camera);
-    }
-
-    class ReadImageFromFramebufferCallback : public osg::Drawable::DrawCallback
-    {
-    public:
-        ReadImageFromFramebufferCallback(osg::Image* image, int width, int height)
-            : mWidth(width), mHeight(height), mImage(image)
-        {
-        }
-        void drawImplementation(osg::RenderInfo& renderInfo,const osg::Drawable* /*drawable*/) const override
-        {
-            int screenW = renderInfo.getCurrentCamera()->getViewport()->width();
-            int screenH = renderInfo.getCurrentCamera()->getViewport()->height();
-            double imageaspect = (double)mWidth/(double)mHeight;
-            int leftPadding = std::max(0, static_cast<int>(screenW - screenH * imageaspect) / 2);
-            int topPadding = std::max(0, static_cast<int>(screenH - screenW / imageaspect) / 2);
-            int width = screenW - leftPadding*2;
-            int height = screenH - topPadding*2;
-            mImage->readPixels(leftPadding, topPadding, width, height, GL_RGB, GL_UNSIGNED_BYTE);
-            mImage->scaleImage(mWidth, mHeight, 1);
-        }
-    private:
-        int mWidth;
-        int mHeight;
-        osg::ref_ptr<osg::Image> mImage;
-    };
-
-    void RenderingManager::screenshotFramebuffer(osg::Image* image, int w, int h)
-    {
-        osg::Camera* camera = mViewer->getCamera();
-        osg::ref_ptr<osg::Drawable> tempDrw = new osg::Drawable;
-        tempDrw->setDrawCallback(new ReadImageFromFramebufferCallback(image, w, h));
-        tempDrw->setCullingActive(false);
-        tempDrw->getOrCreateStateSet()->setRenderBinDetails(100, "RenderBin", osg::StateSet::USE_RENDERBIN_DETAILS); // so its after all scene bins but before POST_RENDER gui camera
-        camera->addChild(tempDrw);
-        osg::ref_ptr<NotifyDrawCompletedCallback> callback (new NotifyDrawCompletedCallback(mViewer->getFrameStamp()->getFrameNumber()));
-        camera->setFinalDrawCallback(callback);
-        mViewer->eventTraversal();
-        mViewer->updateTraversal();
-        mViewer->renderingTraversals();
-        callback->waitTillDone();
-        // now that we've "used up" the current frame, get a fresh frame number for the next frame() following after the screenshot is completed
-        mViewer->advance(mViewer->getFrameStamp()->getSimulationTime());
-        camera->removeChild(tempDrw);
-        camera->setFinalDrawCallback(nullptr);
-    }
-
-    void RenderingManager::screenshot(osg::Image *image, int w, int h, osg::Matrixd cameraTransform)
-    {
-        osg::ref_ptr<osg::Camera> rttCamera (new osg::Camera);
-        rttCamera->setProjectionMatrixAsPerspective(mFieldOfView, w/float(h), mNearClip, mViewDistance);
-        rttCamera->setViewMatrix(mViewer->getCamera()->getViewMatrix() * cameraTransform);
-
-        rttCamera->setUpdateCallback(new NoTraverseCallback);
-        rttCamera->addChild(mSceneRoot);
-
-        rttCamera->addChild(mWater->getReflectionCamera());
-        rttCamera->addChild(mWater->getRefractionCamera());
-
-        rttCamera->setCullMask(mViewer->getCamera()->getCullMask() & (~Mask_GUI));
-
-        rttCamera->setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-        renderCameraToImage(rttCamera.get(),image,w,h);
-    }
-
     osg::Vec4f RenderingManager::getScreenBounds(const osg::BoundingBox &worldbb)
     {
         if (!worldbb.valid()) return osg::Vec4f();
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index ef28cf544e..39d1a0194e 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -74,6 +74,7 @@ namespace MWRender
     class StateUpdater;
 
     class EffectManager;
+    class ScreenshotManager;
     class FogManager;
     class SkyManager;
     class NpcAnimation;
@@ -148,9 +149,8 @@ namespace MWRender
         void setWaterHeight(float level);
 
         /// Take a screenshot of w*h onto the given image, not including the GUI.
-        void screenshot(osg::Image* image, int w, int h, osg::Matrixd cameraTransform=osg::Matrixd()); // make a new render at given size
-        void screenshotFramebuffer(osg::Image* image, int w, int h); // copy directly from framebuffer and scale to given size
-        bool screenshot360(osg::Image* image, std::string settingStr);
+        void screenshot(osg::Image* image, int w, int h);
+        bool screenshot360(osg::Image* image);
 
         struct RayResult
         {
@@ -248,8 +248,6 @@ namespace MWRender
 
         void reportStats() const;
 
-        void renderCameraToImage(osg::Camera *camera, osg::Image *image, int w, int h);
-
         void updateNavMesh();
 
         void updateRecastMesh();
@@ -281,6 +279,7 @@ namespace MWRender
         std::unique_ptr<ObjectPaging> mObjectPaging;
         std::unique_ptr<SkyManager> mSky;
         std::unique_ptr<FogManager> mFog;
+        std::unique_ptr<ScreenshotManager> mScreenshotManager;
         std::unique_ptr<EffectManager> mEffectManager;
         std::unique_ptr<SceneUtil::ShadowManager> mShadowManager;
         osg::ref_ptr<NpcAnimation> mPlayerAnimation;
diff --git a/apps/openmw/mwrender/screenshotmanager.cpp b/apps/openmw/mwrender/screenshotmanager.cpp
new file mode 100644
index 0000000000..89b225da42
--- /dev/null
+++ b/apps/openmw/mwrender/screenshotmanager.cpp
@@ -0,0 +1,324 @@
+#include "screenshotmanager.hpp"
+
+#include <condition_variable>
+#include <mutex>
+
+#include <osg/ImageUtils>
+#include <osg/ShapeDrawable>
+#include <osg/Texture2D>
+#include <osg/TextureCubeMap>
+
+#include <components/misc/stringops.hpp>
+#include <components/resource/resourcesystem.hpp>
+#include <components/resource/scenemanager.hpp>
+#include <components/shader/shadermanager.hpp>
+
+#include <components/settings/settings.hpp>
+
+#include "../mwgui/loadingscreen.hpp"
+#include "../mwbase/environment.hpp"
+#include "../mwbase/windowmanager.hpp"
+
+#include "util.hpp"
+#include "vismask.hpp"
+#include "water.hpp"
+
+namespace MWRender
+{
+    enum Screenshot360Type
+    {
+        Spherical,
+        Cylindrical,
+        Planet,
+        RawCubemap
+    };
+
+    class NotifyDrawCompletedCallback : public osg::Camera::DrawCallback
+    {
+    public:
+        NotifyDrawCompletedCallback(unsigned int frame)
+            : mDone(false), mFrame(frame)
+        {
+        }
+
+        void operator () (osg::RenderInfo& renderInfo) const override
+        {
+            std::lock_guard<std::mutex> lock(mMutex);
+            if (renderInfo.getState()->getFrameStamp()->getFrameNumber() >= mFrame)
+            {
+                mDone = true;
+                mCondition.notify_one();
+            }
+        }
+
+        void waitTillDone()
+        {
+            std::unique_lock<std::mutex> lock(mMutex);
+            if (mDone)
+                return;
+            mCondition.wait(lock);
+        }
+
+        mutable std::condition_variable mCondition;
+        mutable std::mutex mMutex;
+        mutable bool mDone;
+        unsigned int mFrame;
+    };
+
+    class ReadImageFromFramebufferCallback : public osg::Drawable::DrawCallback
+    {
+    public:
+        ReadImageFromFramebufferCallback(osg::Image* image, int width, int height)
+            : mWidth(width), mHeight(height), mImage(image)
+        {
+        }
+        void drawImplementation(osg::RenderInfo& renderInfo,const osg::Drawable* /*drawable*/) const override
+        {
+            int screenW = renderInfo.getCurrentCamera()->getViewport()->width();
+            int screenH = renderInfo.getCurrentCamera()->getViewport()->height();
+            double imageaspect = (double)mWidth/(double)mHeight;
+            int leftPadding = std::max(0, static_cast<int>(screenW - screenH * imageaspect) / 2);
+            int topPadding = std::max(0, static_cast<int>(screenH - screenW / imageaspect) / 2);
+            int width = screenW - leftPadding*2;
+            int height = screenH - topPadding*2;
+            mImage->readPixels(leftPadding, topPadding, width, height, GL_RGB, GL_UNSIGNED_BYTE);
+            mImage->scaleImage(mWidth, mHeight, 1);
+        }
+    private:
+        int mWidth;
+        int mHeight;
+        osg::ref_ptr<osg::Image> mImage;
+    };
+
+    ScreenshotManager::ScreenshotManager(osgViewer::Viewer* viewer, osg::ref_ptr<osg::Group> rootNode, osg::ref_ptr<osg::Group> sceneRoot, Resource::ResourceSystem* resourceSystem, Water* water)
+        : mViewer(viewer)
+        , mRootNode(rootNode)
+        , mSceneRoot(sceneRoot)
+        , mResourceSystem(resourceSystem)
+        , mWater(water)
+    {
+    }
+
+    void ScreenshotManager::screenshot(osg::Image* image, int w, int h)
+    {
+        osg::Camera* camera = mViewer->getCamera();
+        osg::ref_ptr<osg::Drawable> tempDrw = new osg::Drawable;
+        tempDrw->setDrawCallback(new ReadImageFromFramebufferCallback(image, w, h));
+        tempDrw->setCullingActive(false);
+        tempDrw->getOrCreateStateSet()->setRenderBinDetails(100, "RenderBin", osg::StateSet::USE_RENDERBIN_DETAILS); // so its after all scene bins but before POST_RENDER gui camera
+        camera->addChild(tempDrw);
+        osg::ref_ptr<NotifyDrawCompletedCallback> callback (new NotifyDrawCompletedCallback(mViewer->getFrameStamp()->getFrameNumber()));
+        camera->setFinalDrawCallback(callback);
+        mViewer->eventTraversal();
+        mViewer->updateTraversal();
+        mViewer->renderingTraversals();
+        callback->waitTillDone();
+        // now that we've "used up" the current frame, get a fresh frame number for the next frame() following after the screenshot is completed
+        mViewer->advance(mViewer->getFrameStamp()->getSimulationTime());
+        camera->removeChild(tempDrw);
+        camera->setFinalDrawCallback(nullptr);
+    }
+
+    bool ScreenshotManager::screenshot360(osg::Image* image)
+    {
+        int screenshotW = mViewer->getCamera()->getViewport()->width();
+        int screenshotH = mViewer->getCamera()->getViewport()->height();
+        Screenshot360Type screenshotMapping = Spherical;
+
+        const std::string& settingStr = Settings::Manager::getString("screenshot type", "Video");
+        std::vector<std::string> settingArgs;
+        Misc::StringUtils::split(settingStr, settingArgs);
+
+        if (settingArgs.size() > 0)
+        {
+            std::string typeStrings[4] = {"spherical", "cylindrical", "planet", "cubemap"};
+            bool found = false;
+
+            for (int i = 0; i < 4; ++i)
+            {
+                if (settingArgs[0].compare(typeStrings[i]) == 0)
+                {
+                    screenshotMapping = static_cast<Screenshot360Type>(i);
+                    found = true;
+                    break;
+                }
+            }
+
+            if (!found)
+            {
+                Log(Debug::Warning) << "Wrong screenshot type: " << settingArgs[0] << ".";
+                return false;
+            }
+        }
+
+        // planet mapping needs higher resolution
+        int cubeSize = screenshotMapping == Planet ? screenshotW : screenshotW / 2;
+
+        if (settingArgs.size() > 1)
+            screenshotW = std::min(10000, std::atoi(settingArgs[1].c_str()));
+
+        if (settingArgs.size() > 2)
+            screenshotH = std::min(10000, std::atoi(settingArgs[2].c_str()));
+
+        if (settingArgs.size() > 3)
+            cubeSize = std::min(5000, std::atoi(settingArgs[3].c_str()));
+
+        bool rawCubemap = screenshotMapping == RawCubemap;
+
+        if (rawCubemap)
+            screenshotW = cubeSize * 6;  // the image will consist of 6 cube sides in a row
+        else if (screenshotMapping == Planet)
+            screenshotH = screenshotW;   // use square resolution for planet mapping
+
+        std::vector<osg::ref_ptr<osg::Image>> images;
+
+        for (int i = 0; i < 6; ++i)
+            images.push_back(new osg::Image);
+
+        osg::Vec3 directions[6] = {
+            rawCubemap ? osg::Vec3(1,0,0) : osg::Vec3(0,0,1),
+            osg::Vec3(0,0,-1),
+            osg::Vec3(-1,0,0),
+            rawCubemap ? osg::Vec3(0,0,1) : osg::Vec3(1,0,0),
+            osg::Vec3(0,1,0),
+            osg::Vec3(0,-1,0)};
+
+        double rotations[] = {
+            -osg::PI / 2.0,
+            osg::PI / 2.0,
+            osg::PI,
+            0,
+            osg::PI / 2.0,
+            osg::PI / 2.0 };
+
+        for (int i = 0; i < 6; ++i) // for each cubemap side
+        {
+            osg::Matrixd transform = osg::Matrixd::rotate(osg::Vec3(0,0,-1), directions[i]);
+
+            if (!rawCubemap)
+                transform *= osg::Matrixd::rotate(rotations[i],osg::Vec3(0,0,-1));
+
+            osg::Image *sideImage = images[i].get();
+            makeCubemapScreenshot(sideImage, cubeSize, cubeSize, transform);
+
+            if (!rawCubemap)
+                sideImage->flipHorizontal();
+        }
+
+        if (rawCubemap) // for raw cubemap don't run on GPU, just merge the images
+        {
+            image->allocateImage(cubeSize * 6,cubeSize,images[0]->r(),images[0]->getPixelFormat(),images[0]->getDataType());
+
+            for (int i = 0; i < 6; ++i)
+                osg::copyImage(images[i].get(),0,0,0,images[i]->s(),images[i]->t(),images[i]->r(),image,i * cubeSize,0,0);
+
+            return true;
+        }
+
+        // run on GPU now:
+        osg::ref_ptr<osg::TextureCubeMap> cubeTexture (new osg::TextureCubeMap);
+        cubeTexture->setResizeNonPowerOfTwoHint(false);
+
+        cubeTexture->setFilter(osg::Texture::MIN_FILTER,osg::Texture::NEAREST);
+        cubeTexture->setFilter(osg::Texture::MAG_FILTER,osg::Texture::NEAREST);
+
+        cubeTexture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+        cubeTexture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+
+        for (int i = 0; i < 6; ++i)
+            cubeTexture->setImage(i, images[i].get());
+
+        osg::ref_ptr<osg::Camera> screenshotCamera(new osg::Camera);
+        osg::ref_ptr<osg::ShapeDrawable> quad(new osg::ShapeDrawable(new osg::Box(osg::Vec3(0,0,0), 2.0)));
+
+        std::map<std::string, std::string> defineMap;
+
+        Shader::ShaderManager& shaderMgr = mResourceSystem->getSceneManager()->getShaderManager();
+        osg::ref_ptr<osg::Shader> fragmentShader(shaderMgr.getShader("s360_fragment.glsl", defineMap,osg::Shader::FRAGMENT));
+        osg::ref_ptr<osg::Shader> vertexShader(shaderMgr.getShader("s360_vertex.glsl", defineMap, osg::Shader::VERTEX));
+        osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
+
+        osg::ref_ptr<osg::Program> program(new osg::Program);
+        program->addShader(fragmentShader);
+        program->addShader(vertexShader);
+        stateset->setAttributeAndModes(program, osg::StateAttribute::ON);
+
+        stateset->addUniform(new osg::Uniform("cubeMap", 0));
+        stateset->addUniform(new osg::Uniform("mapping", screenshotMapping));
+        stateset->setTextureAttributeAndModes(0, cubeTexture, osg::StateAttribute::ON);
+
+        quad->setStateSet(stateset);
+        quad->setUpdateCallback(nullptr);
+
+        screenshotCamera->addChild(quad);
+
+        renderCameraToImage(screenshotCamera, image, screenshotW, screenshotH);
+
+        return true;
+    }
+
+    void ScreenshotManager::renderCameraToImage(osg::Camera *camera, osg::Image *image, int w, int h)
+    {
+        camera->setNodeMask(Mask_RenderToTexture);
+        camera->attach(osg::Camera::COLOR_BUFFER, image);
+        camera->setRenderOrder(osg::Camera::PRE_RENDER);
+        camera->setReferenceFrame(osg::Camera::ABSOLUTE_RF);
+        camera->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT,osg::Camera::PIXEL_BUFFER_RTT);
+
+        camera->setViewport(0, 0, w, h);
+
+        osg::ref_ptr<osg::Texture2D> texture (new osg::Texture2D);
+        texture->setInternalFormat(GL_RGB);
+        texture->setTextureSize(w,h);
+        texture->setResizeNonPowerOfTwoHint(false);
+        texture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
+        texture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
+        camera->attach(osg::Camera::COLOR_BUFFER,texture);
+
+        image->setDataType(GL_UNSIGNED_BYTE);
+        image->setPixelFormat(texture->getInternalFormat());
+
+        mRootNode->addChild(camera);
+
+        // The draw needs to complete before we can copy back our image.
+        osg::ref_ptr<NotifyDrawCompletedCallback> callback (new NotifyDrawCompletedCallback(0));
+        camera->setFinalDrawCallback(callback);
+
+        MWBase::Environment::get().getWindowManager()->getLoadingScreen()->loadingOn(false);
+
+        mViewer->eventTraversal();
+        mViewer->updateTraversal();
+        mViewer->renderingTraversals();
+        callback->waitTillDone();
+
+        MWBase::Environment::get().getWindowManager()->getLoadingScreen()->loadingOff();
+
+        // now that we've "used up" the current frame, get a fresh framenumber for the next frame() following after the screenshot is completed
+        mViewer->advance(mViewer->getFrameStamp()->getSimulationTime());
+
+        camera->removeChildren(0, camera->getNumChildren());
+        mRootNode->removeChild(camera);
+    }
+
+    void ScreenshotManager::makeCubemapScreenshot(osg::Image *image, int w, int h, osg::Matrixd cameraTransform)
+    {
+        osg::ref_ptr<osg::Camera> rttCamera (new osg::Camera);
+        float nearClip = Settings::Manager::getFloat("near clip", "Camera");
+        float viewDistance = Settings::Manager::getFloat("viewing distance", "Camera");
+        // each cubemap side sees 90 degrees
+        rttCamera->setProjectionMatrixAsPerspective(90.0, w/float(h), nearClip, viewDistance);
+        rttCamera->setViewMatrix(mViewer->getCamera()->getViewMatrix() * cameraTransform);
+
+        rttCamera->setUpdateCallback(new NoTraverseCallback);
+        rttCamera->addChild(mSceneRoot);
+
+        rttCamera->addChild(mWater->getReflectionCamera());
+        rttCamera->addChild(mWater->getRefractionCamera());
+
+        rttCamera->setCullMask(mViewer->getCamera()->getCullMask() & (~Mask_GUI));
+
+        rttCamera->setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+        renderCameraToImage(rttCamera.get(),image,w,h);
+    }
+}
diff --git a/apps/openmw/mwrender/screenshotmanager.hpp b/apps/openmw/mwrender/screenshotmanager.hpp
new file mode 100644
index 0000000000..2ac50bdf0c
--- /dev/null
+++ b/apps/openmw/mwrender/screenshotmanager.hpp
@@ -0,0 +1,40 @@
+#ifndef MWRENDER_SCREENSHOTMANAGER_H
+#define MWRENDER_SCREENSHOTMANAGER_H
+
+#include <memory>
+
+#include <osg/Group>
+#include <osg/ref_ptr>
+
+#include <osgViewer/Viewer>
+
+namespace Resource
+{
+    class ResourceSystem;
+}
+
+namespace MWRender
+{
+    class Water;
+
+    class ScreenshotManager
+    {
+    public:
+        ScreenshotManager(osgViewer::Viewer* viewer, osg::ref_ptr<osg::Group> rootNode, osg::ref_ptr<osg::Group> sceneRoot, Resource::ResourceSystem* resourceSystem, Water* water);
+
+        void screenshot(osg::Image* image, int w, int h);
+        bool screenshot360(osg::Image* image);
+
+    private:
+        osg::ref_ptr<osgViewer::Viewer> mViewer;
+        osg::ref_ptr<osg::Group> mRootNode;
+        osg::ref_ptr<osg::Group> mSceneRoot;
+        Resource::ResourceSystem* mResourceSystem;
+        Water* mWater;
+
+        void renderCameraToImage(osg::Camera *camera, osg::Image *image, int w, int h);
+        void makeCubemapScreenshot(osg::Image* image, int w, int h, osg::Matrixd cameraTransform=osg::Matrixd());
+    };
+}
+
+#endif
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 8b95ee1221..bf5b6db738 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -2536,12 +2536,12 @@ namespace MWWorld
 
     void World::screenshot(osg::Image* image, int w, int h)
     {
-        mRendering->screenshotFramebuffer(image, w, h);
+        mRendering->screenshot(image, w, h);
     }
 
-    bool World::screenshot360(osg::Image* image, std::string settingStr)
+    bool World::screenshot360(osg::Image* image)
     {
-        return mRendering->screenshot360(image,settingStr);
+        return mRendering->screenshot360(image);
     }
 
     void World::activateDoor(const MWWorld::Ptr& door)
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 9f05014133..79c8a4980e 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -597,7 +597,7 @@ namespace MWWorld
 
             /// \todo this does not belong here
             void screenshot (osg::Image* image, int w, int h) override;
-            bool screenshot360 (osg::Image* image, std::string settingStr) override;
+            bool screenshot360 (osg::Image* image) override;
 
             /// Find center of exterior cell above land surface
             /// \return false if exterior with given name not exists, true otherwise

From c5a36ad440a55ebf999a2e9d452e5437b62180ec Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 9 Jan 2021 13:19:41 +0400
Subject: [PATCH 0179/2859] Do not cast enums to booleans

---
 apps/launcher/advancedpage.cpp | 2 +-
 apps/launcher/graphicspage.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index 6f59ade7ab..54fbbdfe01 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -108,7 +108,7 @@ bool Launcher::AdvancedPage::loadSettings()
         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())
+        if (animSourcesCheckBox->checkState() != Qt::Unchecked)
         {
             loadSettingBool(weaponSheathingCheckBox, "weapon sheathing", "Game");
             loadSettingBool(shieldSheathingCheckBox, "shield sheathing", "Game");
diff --git a/apps/launcher/graphicspage.cpp b/apps/launcher/graphicspage.cpp
index d1cf3aa6ff..01205043ec 100644
--- a/apps/launcher/graphicspage.cpp
+++ b/apps/launcher/graphicspage.cpp
@@ -206,7 +206,7 @@ void Launcher::GraphicsPage::saveSettings()
     if (cScreen != mEngineSettings.getInt("screen", "Video"))
         mEngineSettings.setInt("screen", "Video", cScreen);
 
-    if (framerateLimitCheckBox->checkState())
+    if (framerateLimitCheckBox->checkState() != Qt::Unchecked)
     {
         float cFpsLimit = framerateLimitSpinBox->value();
         if (cFpsLimit != mEngineSettings.getFloat("framerate limit", "Video"))
@@ -217,7 +217,7 @@ void Launcher::GraphicsPage::saveSettings()
         mEngineSettings.setFloat("framerate limit", "Video", 0);
     }
 
-    int cShadowDist = shadowDistanceCheckBox->checkState() ? shadowDistanceSpinBox->value() : 0;
+    int cShadowDist = shadowDistanceCheckBox->checkState() != Qt::Unchecked ? shadowDistanceSpinBox->value() : 0;
     if (mEngineSettings.getInt("maximum shadow map distance", "Shadows") != cShadowDist)
         mEngineSettings.setInt("maximum shadow map distance", "Shadows", cShadowDist);
     float cFadeStart = fadeStartSpinBox->value();

From 801e2d6ad0f66ce9646c06ff6b73793c54349ce4 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 9 Jan 2021 13:36:40 +0400
Subject: [PATCH 0180/2859] Avoid to use uninitialized variables

---
 apps/opencs/model/world/refidadapterimp.cpp |  2 +-
 apps/opencs/model/world/refidadapterimp.hpp |  2 +-
 components/files/constrainedfilestream.cpp  |  2 +-
 components/nif/data.hpp                     | 10 +++++-----
 components/sceneutil/mwshadowtechnique.cpp  |  2 ++
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/apps/opencs/model/world/refidadapterimp.cpp b/apps/opencs/model/world/refidadapterimp.cpp
index d85fcc068f..d944adc23e 100644
--- a/apps/opencs/model/world/refidadapterimp.cpp
+++ b/apps/opencs/model/world/refidadapterimp.cpp
@@ -10,7 +10,7 @@
 #include "nestedtablewrapper.hpp"
 
 CSMWorld::PotionColumns::PotionColumns (const InventoryColumns& columns)
-: InventoryColumns (columns) {}
+: InventoryColumns (columns), mEffects(nullptr) {}
 
 CSMWorld::PotionRefIdAdapter::PotionRefIdAdapter (const PotionColumns& columns,
     const RefIdColumn *autoCalc)
diff --git a/apps/opencs/model/world/refidadapterimp.hpp b/apps/opencs/model/world/refidadapterimp.hpp
index 7695e9acec..a73f76af9d 100644
--- a/apps/opencs/model/world/refidadapterimp.hpp
+++ b/apps/opencs/model/world/refidadapterimp.hpp
@@ -115,7 +115,7 @@ namespace CSMWorld
     {
         const RefIdColumn *mModel;
 
-        ModelColumns (const BaseColumns& base) : BaseColumns (base) {}
+        ModelColumns (const BaseColumns& base) : BaseColumns (base), mModel(nullptr) {}
     };
 
     /// \brief Adapter for IDs with models (all but levelled lists)
diff --git a/components/files/constrainedfilestream.cpp b/components/files/constrainedfilestream.cpp
index baab1b081f..b9968038d1 100644
--- a/components/files/constrainedfilestream.cpp
+++ b/components/files/constrainedfilestream.cpp
@@ -21,7 +21,7 @@ namespace Files
 
         LowLevelFile mFile;
 
-        char mBuffer[sBufferSize];
+        char mBuffer[sBufferSize]{0};
 
     public:
         ConstrainedFileStreamBuf(const std::string &fname, size_t start, size_t length)
diff --git a/components/nif/data.hpp b/components/nif/data.hpp
index 66a391afc3..efbe138c53 100644
--- a/components/nif/data.hpp
+++ b/components/nif/data.hpp
@@ -71,7 +71,7 @@ struct NiParticlesData : public NiGeometryData
 {
     int numParticles{0};
 
-    int activeCount;
+    int activeCount{0};
 
     std::vector<float> particleRadii, sizes, rotationAngles;
     std::vector<osg::Quat> rotations;
@@ -119,14 +119,14 @@ struct NiPixelData : public Record
         NIPXFMT_DXT5,
         NIPXFMT_DXT5_ALT
     };
-    Format fmt;
+    Format fmt{NIPXFMT_RGB8};
 
-    unsigned int colorMask[4];
-    unsigned int bpp, pixelTiling{0};
+    unsigned int colorMask[4]{0};
+    unsigned int bpp{0}, pixelTiling{0};
     bool sRGB{false};
 
     NiPalettePtr palette;
-    unsigned int numberOfMipmaps;
+    unsigned int numberOfMipmaps{0};
 
     struct Mipmap
     {
diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
index c49a147776..294780cfd7 100644
--- a/components/sceneutil/mwshadowtechnique.cpp
+++ b/components/sceneutil/mwshadowtechnique.cpp
@@ -785,6 +785,7 @@ MWShadowTechnique::MWShadowTechnique():
     _debugHud(nullptr)
 {
     _shadowRecievingPlaceholderStateSet = new osg::StateSet;
+    mSetDummyStateWhenDisabled = false;
 }
 
 MWShadowTechnique::MWShadowTechnique(const MWShadowTechnique& vdsm, const osg::CopyOp& copyop):
@@ -792,6 +793,7 @@ MWShadowTechnique::MWShadowTechnique(const MWShadowTechnique& vdsm, const osg::C
 {
     _shadowRecievingPlaceholderStateSet = new osg::StateSet;
     _enableShadows = vdsm._enableShadows;
+    mSetDummyStateWhenDisabled = vdsm.mSetDummyStateWhenDisabled;
 }
 
 MWShadowTechnique::~MWShadowTechnique()

From 7fc4c9f3f69d81be16d2294a7c390859ae63e278 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 9 Jan 2021 13:52:01 +0400
Subject: [PATCH 0181/2859] Avoid dead code

---
 apps/opencs/model/filter/parser.cpp            |  6 ------
 apps/opencs/view/render/terraintexturemode.cpp |  8 ++------
 apps/openmw/mwgui/journalwindow.cpp            |  2 +-
 apps/openmw/mwmechanics/character.cpp          |  4 ++--
 components/compiler/scanner.hpp                | 11 ++++-------
 extern/oics/ICSInputControlSystem_joystick.cpp |  2 +-
 6 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/apps/opencs/model/filter/parser.cpp b/apps/opencs/model/filter/parser.cpp
index d2a4f2a356..d363b4849d 100644
--- a/apps/opencs/model/filter/parser.cpp
+++ b/apps/opencs/model/filter/parser.cpp
@@ -325,12 +325,6 @@ std::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseNAry (const Token& keyw
             break;
     }
 
-    if (nodes.empty())
-    {
-        error();
-        return std::shared_ptr<Node>();
-    }
-
     switch (keyword.mType)
     {
         case Token::Type_Keyword_And: return std::shared_ptr<CSMFilter::Node> (new AndNode (nodes));
diff --git a/apps/opencs/view/render/terraintexturemode.cpp b/apps/opencs/view/render/terraintexturemode.cpp
index c8d63f32e8..09d6b135a1 100644
--- a/apps/opencs/view/render/terraintexturemode.cpp
+++ b/apps/opencs/view/render/terraintexturemode.cpp
@@ -429,12 +429,8 @@ void CSVRender::TerrainTextureMode::editTerrainTextureGrid(const WorldspaceHitRe
                             {
                                 int distanceX(0);
                                 int distanceY(0);
-                                if (i_cell < cellX) distanceX = xHitInCell + landTextureSize * abs(i_cell-cellX) - i;
-                                if (j_cell < cellY) distanceY = yHitInCell + landTextureSize * abs(j_cell-cellY) - j;
-                                if (i_cell > cellX) distanceX = -xHitInCell + landTextureSize* abs(i_cell-cellX) + i;
-                                if (j_cell > cellY) distanceY = -yHitInCell + landTextureSize * abs(j_cell-cellY) + j;
-                                if (i_cell == cellX) distanceX = abs(i-xHitInCell);
-                                if (j_cell == cellY) distanceY = abs(j-yHitInCell);
+                                distanceX = abs(i-xHitInCell);
+                                distanceY = abs(j-yHitInCell);
                                 float distance = std::round(sqrt(pow(distanceX, 2)+pow(distanceY, 2)));
                                 float rf = static_cast<float>(mBrushSize) / 2;
                                 if (distance < rf) newTerrain[j*landTextureSize+i] = brushInt;
diff --git a/apps/openmw/mwgui/journalwindow.cpp b/apps/openmw/mwgui/journalwindow.cpp
index 1474becf08..96c42549a5 100644
--- a/apps/openmw/mwgui/journalwindow.cpp
+++ b/apps/openmw/mwgui/journalwindow.cpp
@@ -561,7 +561,7 @@ namespace
             if (mAllQuests)
             {
                 SetNamesInactive setInactive(list);
-                mModel->visitQuestNames(!mAllQuests, setInactive);
+                mModel->visitQuestNames(false, setInactive);
             }
 
             MWBase::Environment::get().getWindowManager()->playSound("book page");
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index b9bfe6bc0f..b9ef50bf7f 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -446,9 +446,9 @@ std::string CharacterController::fallbackShortWeaponGroup(const std::string& bas
     const ESM::WeaponType* weapInfo = getWeaponType(mWeaponType);
 
     // For real two-handed melee weapons use 2h swords animations as fallback, otherwise use the 1h ones
-    if (isRealWeapon && weapInfo->mFlags & ESM::WeaponType::TwoHanded && weapInfo->mWeaponClass == ESM::WeaponType::Melee)
+    if (weapInfo->mFlags & ESM::WeaponType::TwoHanded && weapInfo->mWeaponClass == ESM::WeaponType::Melee)
         groupName += twoHandFallback;
-    else if (isRealWeapon)
+    else
         groupName += oneHandFallback;
 
     // Special case for crossbows - we shouls apply 1h animations a fallback only for lower body
diff --git a/components/compiler/scanner.hpp b/components/compiler/scanner.hpp
index 2139f04b26..9c7bd656ed 100644
--- a/components/compiler/scanner.hpp
+++ b/components/compiler/scanner.hpp
@@ -140,15 +140,12 @@ namespace Compiler
 
             for (int i = 0; i <= length; i++)
             {
-                if (length >= i)
-                {
-                    in.get (ch);
+                in.get (ch);
 
-                    if (!in.good())
-                        return false;
+                if (!in.good())
+                    return false;
 
-                    mData[i] = ch;
-                }
+                mData[i] = ch;
             }
 
             mLength = length;
diff --git a/extern/oics/ICSInputControlSystem_joystick.cpp b/extern/oics/ICSInputControlSystem_joystick.cpp
index 38199436ba..697d0ed3d3 100644
--- a/extern/oics/ICSInputControlSystem_joystick.cpp
+++ b/extern/oics/ICSInputControlSystem_joystick.cpp
@@ -286,7 +286,7 @@ namespace ICS
 				//ControlAxisBinderItem joystickBinderItem = mControlsJoystickAxisBinderMap[ evt.which ][ axis ]; // joystic axis start at 0 index
 				//Control* ctrl = joystickBinderItem.control;
 				//if(ctrl && ctrl->isAxisBindable())
-				if(mDetectingBindingControl && mDetectingBindingControl->isAxisBindable())
+				if(mDetectingBindingControl->isAxisBindable())
 				{
 					if( abs( evt.value ) > ICS_JOYSTICK_AXIS_BINDING_MARGIN)
 					{

From 8283ec6cadef7bcafdc4a830f2d60d00b26b6c9b Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 9 Jan 2021 14:03:48 +0400
Subject: [PATCH 0182/2859] Do not use & for boolean arguments

---
 apps/opencs/view/doc/view.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/view/doc/view.cpp b/apps/opencs/view/doc/view.cpp
index be3fe51423..6fe01dc27d 100644
--- a/apps/opencs/view/doc/view.cpp
+++ b/apps/opencs/view/doc/view.cpp
@@ -438,8 +438,8 @@ void CSVDoc::View::updateActions()
     for (std::vector<QAction *>::iterator iter (mEditingActions.begin()); iter!=mEditingActions.end(); ++iter)
         (*iter)->setEnabled (editing);
 
-    mUndo->setEnabled (editing & mDocument->getUndoStack().canUndo());
-    mRedo->setEnabled (editing & mDocument->getUndoStack().canRedo());
+    mUndo->setEnabled (editing && mDocument->getUndoStack().canUndo());
+    mRedo->setEnabled (editing && mDocument->getUndoStack().canRedo());
 
     mSave->setEnabled (!(mDocument->getState() & CSMDoc::State_Saving) && !running);
     mVerify->setEnabled (!(mDocument->getState() & CSMDoc::State_Verifying));

From 56666c60d44fa7809f8e9ab811827c4c908ce6d9 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 9 Jan 2021 14:17:59 +0400
Subject: [PATCH 0183/2859] Remove dead code

---
 apps/openmw/mwmechanics/weapontype.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/openmw/mwmechanics/weapontype.cpp b/apps/openmw/mwmechanics/weapontype.cpp
index 07345557f0..2f8e45f7ff 100644
--- a/apps/openmw/mwmechanics/weapontype.cpp
+++ b/apps/openmw/mwmechanics/weapontype.cpp
@@ -4,8 +4,6 @@
 
 namespace MWMechanics
 {
-    static const ESM::WeaponType *sWeaponTypeListEnd = &sWeaponTypeList[sizeof(sWeaponTypeList)/sizeof(sWeaponTypeList[0])];
-
     MWWorld::ContainerStoreIterator getActiveWeapon(MWWorld::Ptr actor, int *weaptype)
     {
         MWWorld::InventoryStore &inv = actor.getClass().getInventoryStore(actor);

From c1512b8b6cc47a8615c8400d91ed913e0ae35a82 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 9 Jan 2021 14:18:38 +0400
Subject: [PATCH 0184/2859] Convert loop to condition

---
 apps/openmw/mwworld/localscripts.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/localscripts.cpp b/apps/openmw/mwworld/localscripts.cpp
index 42914d4ac0..1661d6b9f7 100644
--- a/apps/openmw/mwworld/localscripts.cpp
+++ b/apps/openmw/mwworld/localscripts.cpp
@@ -76,7 +76,7 @@ void MWWorld::LocalScripts::startIteration()
 
 bool MWWorld::LocalScripts::getNext(std::pair<std::string, Ptr>& script)
 {
-    while (mIter!=mScripts.end())
+    if (mIter!=mScripts.end())
     {
         std::list<std::pair<std::string, Ptr> >::iterator iter = mIter++;
         script = *iter;

From 33648313a68efad40eebf4d218261b5d00845ea1 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 9 Jan 2021 14:21:57 +0400
Subject: [PATCH 0185/2859] Initialize variables

---
 apps/openmw/mwphysics/mtphysics.cpp | 3 +++
 components/nif/node.hpp             | 4 ++--
 components/nif/property.hpp         | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 0d1e5962a0..3e4ed9b478 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -152,6 +152,9 @@ namespace MWPhysics
           , mNextLOS(0)
           , mFrameNumber(0)
           , mTimer(osg::Timer::instance())
+          , mTimeBegin(0)
+          , mTimeEnd(0)
+          , mFrameStart(0)
     {
         mNumThreads = Config::computeNumThreads(mThreadSafeBullet);
 
diff --git a/components/nif/node.hpp b/components/nif/node.hpp
index 1d082b8f9b..406a4d4549 100644
--- a/components/nif/node.hpp
+++ b/components/nif/node.hpp
@@ -177,7 +177,7 @@ struct Node : public Named
     // NiNodes (or types derived from NiNodes) can be parents.
     NiNode *parent;
 
-    bool isBone;
+    bool isBone{false};
 
     void setBone()
     {
@@ -378,7 +378,7 @@ struct NiCamera : Node
 struct NiSwitchNode : public NiNode
 {
     unsigned int switchFlags{0};
-    unsigned int initialIndex;
+    unsigned int initialIndex{0};
 
     void read(NIFStream *nif) override
     {
diff --git a/components/nif/property.hpp b/components/nif/property.hpp
index eccb442f7e..008e84515c 100644
--- a/components/nif/property.hpp
+++ b/components/nif/property.hpp
@@ -61,7 +61,7 @@ struct NiTexturingProperty : public Property
         3 - hilight  // These two are for PS2 only?
         4 - hilight2
     */
-    unsigned int apply;
+    unsigned int apply{0};
 
     /*
      * The textures in this list are as follows:
@@ -193,7 +193,7 @@ struct S_MaterialProperty
     // The vector components are R,G,B
     osg::Vec3f ambient{1.f,1.f,1.f}, diffuse{1.f,1.f,1.f};
     osg::Vec3f specular, emissive;
-    float glossiness, alpha;
+    float glossiness{0.f}, alpha{0.f};
 
     void read(NIFStream *nif);
 };

From c9b885ffd4e3f01943d08488722abd7fbb539e61 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 9 Jan 2021 14:24:04 +0400
Subject: [PATCH 0186/2859] Avoid possible null dereferencing

---
 apps/opencs/view/world/dragdroputils.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/opencs/view/world/dragdroputils.cpp b/apps/opencs/view/world/dragdroputils.cpp
index 789d4f33dc..808125a601 100644
--- a/apps/opencs/view/world/dragdroputils.cpp
+++ b/apps/opencs/view/world/dragdroputils.cpp
@@ -20,7 +20,8 @@ CSMWorld::UniversalId CSVWorld::DragDropUtils::getAcceptedData(const QDropEvent
 {
     if (canAcceptData(event, type))
     {
-        return getTableMimeData(event)->returnMatching(type);
+        if (const CSMWorld::TableMimeData *data = getTableMimeData(event))
+            return data->returnMatching(type);
     }
     return CSMWorld::UniversalId::Type_None;
 }

From 8e5f26c109da6e1b2b5d7126e3e66b6a61ce073d Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 9 Jan 2021 14:41:10 +0400
Subject: [PATCH 0187/2859] Code cleanup

---
 apps/opencs/view/world/dragrecordtable.cpp | 12 ++++--------
 apps/openmw/mwgui/hud.cpp                  |  2 +-
 apps/openmw/mwrender/globalmap.cpp         |  2 +-
 components/terrain/terraindrawable.cpp     |  2 +-
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/apps/opencs/view/world/dragrecordtable.cpp b/apps/opencs/view/world/dragrecordtable.cpp
index d795bd5de1..f84bf639da 100644
--- a/apps/opencs/view/world/dragrecordtable.cpp
+++ b/apps/opencs/view/world/dragrecordtable.cpp
@@ -19,14 +19,10 @@ void CSVWorld::DragRecordTable::startDragFromTable (const CSVWorld::DragRecordTa
     }
 
     CSMWorld::TableMimeData* mime = new CSMWorld::TableMimeData (records, mDocument);
-
-    if (mime)
-    {
-        QDrag* drag = new QDrag (this);
-        drag->setMimeData (mime);
-        drag->setPixmap (QString::fromUtf8 (mime->getIcon().c_str()));
-        drag->exec (Qt::CopyAction);
-    }
+    QDrag* drag = new QDrag (this);
+    drag->setMimeData (mime);
+    drag->setPixmap (QString::fromUtf8 (mime->getIcon().c_str()));
+    drag->exec (Qt::CopyAction);
 }
 
 CSVWorld::DragRecordTable::DragRecordTable (CSMDoc::Document& document, QWidget* parent) :
diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp
index a4ab20fd68..45defe9a56 100644
--- a/apps/openmw/mwgui/hud.cpp
+++ b/apps/openmw/mwgui/hud.cpp
@@ -587,7 +587,7 @@ namespace MWGui
         // effect box can have variable width -> variable left coordinate
         int effectsDx = 0;
         if (!mMinimapBox->getVisible ())
-            effectsDx = (viewSize.width - mMinimapBoxBaseRight) - (viewSize.width - mEffectBoxBaseRight);
+            effectsDx = mEffectBoxBaseRight - mMinimapBoxBaseRight;
 
         mMapVisible = mMinimapBox->getVisible ();
         if (!mMapVisible)
diff --git a/apps/openmw/mwrender/globalmap.cpp b/apps/openmw/mwrender/globalmap.cpp
index ba300accbc..366da6439c 100644
--- a/apps/openmw/mwrender/globalmap.cpp
+++ b/apps/openmw/mwrender/globalmap.cpp
@@ -583,7 +583,7 @@ namespace MWRender
             }
 
             mOverlayImage->copySubImage(imageDest.mX, imageDest.mY, 0, imageDest.mImage);
-            it = mPendingImageDest.erase(it);
+            mPendingImageDest.erase(it);
             return true;
         }
     }
diff --git a/components/terrain/terraindrawable.cpp b/components/terrain/terraindrawable.cpp
index 0d82be4fff..746534abb4 100644
--- a/components/terrain/terraindrawable.cpp
+++ b/components/terrain/terraindrawable.cpp
@@ -78,7 +78,7 @@ void TerrainDrawable::cull(osgUtil::CullVisitor *cv)
 
     osg::RefMatrix& matrix = *cv->getModelViewMatrix();
 
-    if (cv->getComputeNearFarMode() && bb.valid())
+    if (cv->getComputeNearFarMode() != osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR && bb.valid())
     {
         if (!cv->updateCalculatedNearFar(matrix, *this, false))
             return;

From a80ee7a76a6ad94bc17fbda46b53affeb96968a6 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 9 Jan 2021 14:43:00 +0400
Subject: [PATCH 0188/2859] Avoid possible memory leak in the mInterMessageBoxe
 field

---
 apps/openmw/mwgui/messagebox.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/apps/openmw/mwgui/messagebox.cpp b/apps/openmw/mwgui/messagebox.cpp
index d64ec9c37a..5bd8ceb5ae 100644
--- a/apps/openmw/mwgui/messagebox.cpp
+++ b/apps/openmw/mwgui/messagebox.cpp
@@ -28,10 +28,7 @@ namespace MWGui
 
     MessageBoxManager::~MessageBoxManager ()
     {
-        for (MessageBox* messageBox : mMessageBoxes)
-        {
-            delete messageBox;
-        }
+        MessageBoxManager::clear();
     }
 
     int MessageBoxManager::getMessagesCount()

From 24f8a2db27acf5ecb8c38b8022f4ba4006aee4d8 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 9 Jan 2021 14:07:30 +0100
Subject: [PATCH 0189/2859] Use perfect forwarding in Sound_Buffer ctor

---
 apps/openmw/mwsound/sound_buffer.hpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwsound/sound_buffer.hpp b/apps/openmw/mwsound/sound_buffer.hpp
index e623923003..02e3c499b8 100644
--- a/apps/openmw/mwsound/sound_buffer.hpp
+++ b/apps/openmw/mwsound/sound_buffer.hpp
@@ -25,8 +25,9 @@ namespace MWSound
     class Sound_Buffer
     {
         public:
-            Sound_Buffer(std::string resname, float volume, float mindist, float maxdist)
-                : mResourceName(std::move(resname)), mVolume(volume), mMinDist(mindist), mMaxDist(maxdist)
+            template <class T>
+            Sound_Buffer(T&& resname, float volume, float mindist, float maxdist)
+                : mResourceName(std::forward<T>(resname)), mVolume(volume), mMinDist(mindist), mMaxDist(maxdist)
             {}
 
             const std::string& getResourceName() const noexcept { return mResourceName; }

From 90c8e77e2ce75860ed7d674e3e068e164cec7a39 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 9 Jan 2021 14:08:54 +0100
Subject: [PATCH 0190/2859] Remove redundant default Sound_Buffer fields
 initialization

---
 apps/openmw/mwsound/sound_buffer.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwsound/sound_buffer.hpp b/apps/openmw/mwsound/sound_buffer.hpp
index 02e3c499b8..61d569e131 100644
--- a/apps/openmw/mwsound/sound_buffer.hpp
+++ b/apps/openmw/mwsound/sound_buffer.hpp
@@ -42,9 +42,9 @@ namespace MWSound
 
         private:
             std::string mResourceName;
-            float mVolume = 0;
-            float mMinDist = 0;
-            float mMaxDist = 0;
+            float mVolume;
+            float mMinDist;
+            float mMaxDist;
             Sound_Handle mHandle = nullptr;
             std::size_t mUses = 0;
 

From e4cce88142f383b8ef9dd086c23a545db57ce121 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 9 Jan 2021 14:09:27 +0100
Subject: [PATCH 0191/2859] Replace std::tie by structured binding

---
 apps/openmw/mwsound/sound_buffer.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/openmw/mwsound/sound_buffer.cpp b/apps/openmw/mwsound/sound_buffer.cpp
index 0e25ff6015..cb71cb56d2 100644
--- a/apps/openmw/mwsound/sound_buffer.cpp
+++ b/apps/openmw/mwsound/sound_buffer.cpp
@@ -82,9 +82,7 @@ namespace MWSound
 
         if (sfx->getHandle() == nullptr)
         {
-            Sound_Handle handle;
-            size_t size;
-            std::tie(handle, size) = mOutput->loadSound(sfx->getResourceName());
+            auto [handle, size] = mOutput->loadSound(sfx->getResourceName());
             if (handle == nullptr)
                 return {};
 

From a6aba83741218241db323590cb2042232b2e7f9d Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 9 Jan 2021 14:11:49 +0100
Subject: [PATCH 0192/2859] Remove redundant SoundManager::lookupSound and
 loadSound

---
 apps/openmw/mwsound/sound_buffer.hpp    |  4 ++++
 apps/openmw/mwsound/soundmanagerimp.cpp | 28 +++++++------------------
 apps/openmw/mwsound/soundmanagerimp.hpp |  3 ---
 3 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/apps/openmw/mwsound/sound_buffer.hpp b/apps/openmw/mwsound/sound_buffer.hpp
index 61d569e131..5c45ac08aa 100644
--- a/apps/openmw/mwsound/sound_buffer.hpp
+++ b/apps/openmw/mwsound/sound_buffer.hpp
@@ -60,8 +60,12 @@ namespace MWSound
 
             ~SoundBufferPool();
 
+            /// Lookup a soundId for its sound data (resource name, local volume,
+            /// minRange, and maxRange)
             Sound_Buffer* lookup(const std::string& soundId) const;
 
+            /// Lookup a soundId for its sound data (resource name, local volume,
+            /// minRange, and maxRange), and ensure it's ready for use.
             Sound_Buffer* load(const std::string& soundId);
 
             void use(Sound_Buffer& sfx)
diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index 03ad58088a..44465e5a76 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -120,20 +120,6 @@ namespace MWSound
         return DecoderPtr(new DEFAULT_DECODER (mVFS));
     }
 
-    // Lookup a soundId for its sound data (resource name, local volume,
-    // minRange, and maxRange)
-    Sound_Buffer *SoundManager::lookupSound(const std::string &soundId) const
-    {
-        return mSoundBuffers.lookup(soundId);
-    }
-
-    // Lookup a soundId for its sound data (resource name, local volume,
-    // minRange, and maxRange), and ensure it's ready for use.
-    Sound_Buffer *SoundManager::loadSound(const std::string &soundId)
-    {
-        return mSoundBuffers.load(soundId);
-    }
-
     DecoderPtr SoundManager::loadVoice(const std::string &voicefile)
     {
         try
@@ -509,7 +495,7 @@ namespace MWSound
         if(!mOutput->isInitialized())
             return nullptr;
 
-        Sound_Buffer *sfx = loadSound(Misc::StringUtils::lowerCase(soundId));
+        Sound_Buffer *sfx = mSoundBuffers.load(Misc::StringUtils::lowerCase(soundId));
         if(!sfx) return nullptr;
 
         // Only one copy of given sound can be played at time, so stop previous copy
@@ -545,7 +531,7 @@ namespace MWSound
             return nullptr;
 
         // Look up the sound in the ESM data
-        Sound_Buffer *sfx = loadSound(Misc::StringUtils::lowerCase(soundId));
+        Sound_Buffer *sfx = mSoundBuffers.load(Misc::StringUtils::lowerCase(soundId));
         if(!sfx) return nullptr;
 
         // Only one copy of given sound can be played at time on ptr, so stop previous copy
@@ -597,7 +583,7 @@ namespace MWSound
             return nullptr;
 
         // Look up the sound in the ESM data
-        Sound_Buffer *sfx = loadSound(Misc::StringUtils::lowerCase(soundId));
+        Sound_Buffer *sfx = mSoundBuffers.load(Misc::StringUtils::lowerCase(soundId));
         if(!sfx) return nullptr;
 
         SoundPtr sound = getSoundRef();
@@ -645,7 +631,7 @@ namespace MWSound
         if(!mOutput->isInitialized())
             return;
 
-        Sound_Buffer *sfx = lookupSound(Misc::StringUtils::lowerCase(soundId));
+        Sound_Buffer *sfx = mSoundBuffers.lookup(Misc::StringUtils::lowerCase(soundId));
         if (!sfx) return;
 
         stopSound(sfx, ptr);
@@ -697,7 +683,7 @@ namespace MWSound
         SoundMap::iterator snditer = mActiveSounds.find(ptr);
         if(snditer != mActiveSounds.end())
         {
-            Sound_Buffer *sfx = lookupSound(Misc::StringUtils::lowerCase(soundId));
+            Sound_Buffer *sfx = mSoundBuffers.lookup(Misc::StringUtils::lowerCase(soundId));
             if (sfx == nullptr)
                 return;
             for(SoundBufferRefPair &sndbuf : snditer->second)
@@ -713,7 +699,7 @@ namespace MWSound
         SoundMap::const_iterator snditer = mActiveSounds.find(ptr);
         if(snditer != mActiveSounds.end())
         {
-            Sound_Buffer *sfx = lookupSound(Misc::StringUtils::lowerCase(soundId));
+            Sound_Buffer *sfx = mSoundBuffers.lookup(Misc::StringUtils::lowerCase(soundId));
             return std::find_if(snditer->second.cbegin(), snditer->second.cend(),
                 [this,sfx](const SoundBufferRefPair &snd) -> bool
                 { return snd.second == sfx && mOutput->isSoundPlaying(snd.first.get()); }
@@ -826,7 +812,7 @@ namespace MWSound
 
             bool soundIdChanged = false;
 
-            Sound_Buffer* sfx = lookupSound(update.mId);
+            Sound_Buffer* sfx = mSoundBuffers.lookup(update.mId);
             if (mLastCell != cell)
             {
                 const auto snditer = mActiveSounds.find(MWWorld::ConstPtr());
diff --git a/apps/openmw/mwsound/soundmanagerimp.hpp b/apps/openmw/mwsound/soundmanagerimp.hpp
index 21004dc94a..6b9de800f0 100644
--- a/apps/openmw/mwsound/soundmanagerimp.hpp
+++ b/apps/openmw/mwsound/soundmanagerimp.hpp
@@ -99,9 +99,6 @@ namespace MWSound
 
         Sound_Buffer *insertSound(const std::string &soundId, const ESM::Sound *sound);
 
-        Sound_Buffer *lookupSound(const std::string &soundId) const;
-        Sound_Buffer *loadSound(const std::string &soundId);
-
         // returns a decoder to start streaming, or nullptr if the sound was not found
         DecoderPtr loadVoice(const std::string &voicefile);
 

From 33da0af1d1760f5cd6b79a853aa0a6fe3fe848ff Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 9 Jan 2021 18:25:48 +0400
Subject: [PATCH 0193/2859] Use explicit calls for virtual methods in
 constructors

---
 apps/openmw/mwrender/water.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index b9018e0a27..e786ce9372 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -135,7 +135,7 @@ public:
 
         mClipNodeTransform = new osg::Group;
         mClipNodeTransform->addCullCallback(new FlipCallback(&mPlane));
-        addChild(mClipNodeTransform);
+        osg::Group::addChild(mClipNodeTransform);
 
         mClipNode = new osg::ClipNode;
 
@@ -240,7 +240,7 @@ public:
         setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT);
         setReferenceFrame(osg::Camera::RELATIVE_RF);
         setSmallFeatureCullingPixelSize(Settings::Manager::getInt("small feature culling pixel size", "Water"));
-        setName("RefractionCamera");
+        osg::Camera::setName("RefractionCamera");
         setCullCallback(new InheritViewPointCallback);
         setComputeNearFarMode(osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR);
 
@@ -261,7 +261,7 @@ public:
         getOrCreateStateSet()->setAttributeAndModes(fog, osg::StateAttribute::OFF|osg::StateAttribute::OVERRIDE);
 
         mClipCullNode = new ClipCullNode;
-        addChild(mClipCullNode);
+        osg::Camera::addChild(mClipCullNode);
 
         mRefractionTexture = new osg::Texture2D;
         mRefractionTexture->setTextureSize(rttSize, rttSize);
@@ -335,7 +335,7 @@ public:
         setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT);
         setReferenceFrame(osg::Camera::RELATIVE_RF);
         setSmallFeatureCullingPixelSize(Settings::Manager::getInt("small feature culling pixel size", "Water"));
-        setName("ReflectionCamera");
+        osg::Camera::setName("ReflectionCamera");
         setCullCallback(new InheritViewPointCallback);
 
         setInterior(isInterior);
@@ -364,7 +364,7 @@ public:
         getOrCreateStateSet()->setAttributeAndModes(frontFace, osg::StateAttribute::ON);
 
         mClipCullNode = new ClipCullNode;
-        addChild(mClipCullNode);
+        osg::Camera::addChild(mClipCullNode);
 
         SceneUtil::ShadowManager::disableShadowsForStateSet(getOrCreateStateSet());
     }

From 80ee1b55ea636184ec38718fa2d7dd928e1c5306 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 9 Jan 2021 18:28:26 +0400
Subject: [PATCH 0194/2859] Protect assignment operator from this == &src case

---
 apps/openmw/mwworld/inventorystore.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp
index 38007c1cbb..fd05957034 100644
--- a/apps/openmw/mwworld/inventorystore.cpp
+++ b/apps/openmw/mwworld/inventorystore.cpp
@@ -120,6 +120,9 @@ MWWorld::InventoryStore::InventoryStore (const InventoryStore& store)
 
 MWWorld::InventoryStore& MWWorld::InventoryStore::operator= (const InventoryStore& store)
 {
+    if (this == &store)
+        return *this;
+
     mListener = store.mListener;
     mInventoryListener = store.mInventoryListener;
     mMagicEffects = store.mMagicEffects;

From a2d8a0b61a18da0c85a55930d480fbec8fb202dd Mon Sep 17 00:00:00 2001
From: Mads Buvik Sandvei <madssandvei@protonmail.com>
Date: Sat, 9 Jan 2021 14:44:15 +0000
Subject: [PATCH 0195/2859] engine.cpp typos

---
 apps/openmw/engine.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 8f23f710dd..6f501e5ad1 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -589,8 +589,8 @@ void OMW::Engine::createWindow(Settings::Manager& settings)
             Log(Debug::Warning) << "Warning: Framebuffer only has a " << traits->green << " bit green channel.";
         if (traits->blue < 8)
             Log(Debug::Warning) << "Warning: Framebuffer only has a " << traits->blue << " bit blue channel.";
-        if (traits->depth < 8)
-            Log(Debug::Warning) << "Warning: Framebuffer only has " << traits->red << " bits of depth precision.";
+        if (traits->depth < 24)
+            Log(Debug::Warning) << "Warning: Framebuffer only has " << traits->depth << " bits of depth precision.";
 
         traits->alpha = 0; // set to 0 to stop ScreenCaptureHandler reading the alpha channel
     }

From 874348fb4681d4608d403e984ed9363972a19f4f Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 9 Jan 2021 19:19:38 +0400
Subject: [PATCH 0196/2859] Remove redundant code

---
 apps/openmw/mwmechanics/aiwander.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/aiwander.hpp b/apps/openmw/mwmechanics/aiwander.hpp
index 68bcddf228..8e718061e2 100644
--- a/apps/openmw/mwmechanics/aiwander.hpp
+++ b/apps/openmw/mwmechanics/aiwander.hpp
@@ -99,7 +99,6 @@ namespace MWMechanics
             {
                 AiPackage::Options options;
                 options.mUseVariableSpeed = true;
-                options.mRepeat = false;
                 return options;
             }
 

From 50e4600b160174024654a8d4fe8f82b0bb1cc99b Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 9 Jan 2021 20:00:51 +0400
Subject: [PATCH 0197/2859] Reduce code duplication

---
 apps/opencs/view/world/util.cpp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/apps/opencs/view/world/util.cpp b/apps/opencs/view/world/util.cpp
index ba9f408474..58d3d49e44 100644
--- a/apps/opencs/view/world/util.cpp
+++ b/apps/opencs/view/world/util.cpp
@@ -261,16 +261,10 @@ QWidget *CSVWorld::CommandDelegate::createEditor (QWidget *parent, const QStyleO
             return dsb;
         }
 
+        /// \todo implement size limit. QPlainTextEdit does not support a size limit.
         case CSMWorld::ColumnBase::Display_LongString:
-        {
-            QPlainTextEdit *edit = new QPlainTextEdit(parent);
-            edit->setUndoRedoEnabled (false);
-            return edit;
-        }
-
         case CSMWorld::ColumnBase::Display_LongString256:
         {
-            /// \todo implement size limit. QPlainTextEdit does not support a size limit.
             QPlainTextEdit *edit = new QPlainTextEdit(parent);
             edit->setUndoRedoEnabled (false);
             return edit;

From 1930f8f37d45c246186d996fc9edc30c74d5fab3 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 9 Jan 2021 20:03:12 +0400
Subject: [PATCH 0198/2859] Fix copy-paste error

---
 apps/opencs/model/world/refidadapterimp.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/opencs/model/world/refidadapterimp.hpp b/apps/opencs/model/world/refidadapterimp.hpp
index a73f76af9d..0a29afcad7 100644
--- a/apps/opencs/model/world/refidadapterimp.hpp
+++ b/apps/opencs/model/world/refidadapterimp.hpp
@@ -1858,18 +1858,18 @@ namespace CSMWorld
                     break; // always save
                 case 16:
                     if (content.mType == ESM::AI_Travel)
-                        content.mTravel.mZ = value.toFloat();
+                        content.mTravel.mX = value.toFloat();
                     else if (content.mType == ESM::AI_Follow || content.mType == ESM::AI_Escort)
-                        content.mTarget.mZ = value.toFloat();
+                        content.mTarget.mX = value.toFloat();
                     else
                         return; // return without saving
 
                     break; // always save
                 case 17:
                     if (content.mType == ESM::AI_Travel)
-                        content.mTravel.mZ = value.toFloat();
+                        content.mTravel.mY = value.toFloat();
                     else if (content.mType == ESM::AI_Follow || content.mType == ESM::AI_Escort)
-                        content.mTarget.mZ = value.toFloat();
+                        content.mTarget.mY = value.toFloat();
                     else
                         return; // return without saving
 

From 564a0d7d559622d4d8ff7baebdbf9e4c950eb160 Mon Sep 17 00:00:00 2001
From: unknown <malusluminis@hotmail.com>
Date: Sat, 9 Jan 2021 18:25:46 +0100
Subject: [PATCH 0199/2859] Don't nuke fog when bounds have changed

---
 CHANGELOG.md                      |   1 +
 apps/openmw/mwrender/localmap.cpp | 126 +++++++++++++++++-------------
 2 files changed, 74 insertions(+), 53 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa35722820..3dce266d90 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,6 +56,7 @@
     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 #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
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index 401e21ae46..5fa1a0e299 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -65,6 +65,15 @@ namespace
         return val*val;
     }
 
+    std::pair<int, int> divideIntoSegments(const osg::BoundingBox& bounds, float mapSize)
+    {
+        osg::Vec2f min(bounds.xMin(), bounds.yMin());
+        osg::Vec2f max(bounds.xMax(), bounds.yMax());
+        osg::Vec2f length = max - min;
+        const int segsX = static_cast<int>(std::ceil(length.x() / mapSize));
+        const int segsY = static_cast<int>(std::ceil(length.y() / mapSize));
+        return {segsX, segsY};
+    }
 }
 
 namespace MWRender
@@ -127,12 +136,7 @@ void LocalMap::saveFogOfWar(MWWorld::CellStore* cell)
     }
     else
     {
-        // FIXME: segmenting code duplicated from requestMap
-        osg::Vec2f min(mBounds.xMin(), mBounds.yMin());
-        osg::Vec2f max(mBounds.xMax(), mBounds.yMax());
-        osg::Vec2f length = max-min;
-        const int segsX = static_cast<int>(std::ceil(length.x() / mMapWorldSize));
-        const int segsY = static_cast<int>(std::ceil(length.y() / mMapWorldSize));
+        auto segments = divideIntoSegments(mBounds, mMapWorldSize);
 
         std::unique_ptr<ESM::FogState> fog (new ESM::FogState());
 
@@ -142,11 +146,11 @@ void LocalMap::saveFogOfWar(MWWorld::CellStore* cell)
         fog->mBounds.mMaxY = mBounds.yMax();
         fog->mNorthMarkerAngle = mAngle;
 
-        fog->mFogTextures.reserve(segsX*segsY);
+        fog->mFogTextures.reserve(segments.first * segments.second);
 
-        for (int x=0; x<segsX; ++x)
+        for (int x = 0; x < segments.first; ++x)
         {
-            for (int y=0; y<segsY; ++y)
+            for (int y = 0; y < segments.second; ++y)
             {
                 const MapSegment& segment = mSegments[std::make_pair(x,y)];
 
@@ -422,56 +426,74 @@ void LocalMap::requestInteriorMap(const MWWorld::CellStore* cell)
     // If there is fog state in the CellStore (e.g. when it came from a savegame) we need to do some checks
     // to see if this state is still valid.
     // Both the cell bounds and the NorthMarker rotation could be changed by the content files or exchanged models.
-    // If they changed by too much (for bounds, < padding is considered acceptable) then parts of the interior might not
-    // be covered by the map anymore.
+    // If they changed by too much then parts of the interior might not be covered by the map anymore.
     // The following code detects this, and discards the CellStore's fog state if it needs to.
-    bool cellHasValidFog = false;
+    std::vector<std::pair<int, int>> segmentMappings;
     if (cell->getFog())
     {
         ESM::FogState* fog = cell->getFog();
 
-        osg::Vec3f newMin (fog->mBounds.mMinX, fog->mBounds.mMinY, zMin);
-        osg::Vec3f newMax (fog->mBounds.mMaxX, fog->mBounds.mMaxY, zMax);
-
-        osg::Vec3f minDiff = newMin - mBounds._min;
-        osg::Vec3f maxDiff = newMax - mBounds._max;
-
-        if (std::abs(minDiff.x()) > padding || std::abs(minDiff.y()) > padding
-            || std::abs(maxDiff.x()) > padding || std::abs(maxDiff.y()) > padding
-                || std::abs(mAngle - fog->mNorthMarkerAngle) > osg::DegreesToRadians(5.f))
+        if (std::abs(mAngle - fog->mNorthMarkerAngle) < osg::DegreesToRadians(5.f))
         {
-            // Nuke it
-            cellHasValidFog = false;
-        }
-        else
-        {
-            // Looks sane, use it
-            mBounds = osg::BoundingBox(newMin, newMax);
+            // Expand mBounds so the saved textures fit the same grid
+            int xOffset = 0;
+            int yOffset = 0;
+            if(fog->mBounds.mMinX < mBounds.xMin())
+            {
+                mBounds.xMin() = fog->mBounds.mMinX;
+            }
+            else if(fog->mBounds.mMinX > mBounds.xMin())
+            {
+                float diff = fog->mBounds.mMinX - mBounds.xMin();
+                xOffset += diff / mMapWorldSize;
+                xOffset++;
+                mBounds.xMin() = fog->mBounds.mMinX - xOffset * mMapWorldSize;
+            }
+            if(fog->mBounds.mMinY < mBounds.yMin())
+            {
+                mBounds.yMin() = fog->mBounds.mMinY;
+            }
+            else if(fog->mBounds.mMinY > mBounds.yMin())
+            {
+                float diff = fog->mBounds.mMinY - mBounds.yMin();
+                yOffset += diff / mMapWorldSize;
+                yOffset++;
+                mBounds.yMin() = fog->mBounds.mMinY - yOffset * mMapWorldSize;
+            }
+            mBounds.xMax() = std::max(mBounds.xMax(), fog->mBounds.mMaxX);
+            mBounds.yMax() = std::max(mBounds.yMax(), fog->mBounds.mMaxY);
+
+            if(xOffset != 0 || yOffset != 0)
+                Log(Debug::Warning) << "Warning: expanding fog by " << xOffset << ", " << yOffset;
+
+            const auto& textures = fog->mFogTextures;
+            segmentMappings.reserve(textures.size());
+            osg::BoundingBox savedBounds{
+                fog->mBounds.mMinX, fog->mBounds.mMinY, 0,
+                fog->mBounds.mMaxX, fog->mBounds.mMaxY, 0
+            };
+            auto segments = divideIntoSegments(savedBounds, mMapWorldSize);
+            for (int x = 0; x < segments.first; ++x)
+                for (int y = 0; y < segments.second; ++y)
+                    segmentMappings.emplace_back(std::make_pair(x + xOffset, y + yOffset));
+
             mAngle = fog->mNorthMarkerAngle;
-            cellHasValidFog = true;
         }
     }
 
     osg::Vec2f min(mBounds.xMin(), mBounds.yMin());
-    osg::Vec2f max(mBounds.xMax(), mBounds.yMax());
-
-    osg::Vec2f length = max-min;
 
-    osg::Vec2f center(bounds.center().x(), bounds.center().y());
+    osg::Vec2f center(mBounds.center().x(), mBounds.center().y());
+    osg::Quat cameraOrient (mAngle, osg::Vec3d(0,0,-1));
 
-    // divide into segments
-    const int segsX = static_cast<int>(std::ceil(length.x() / mMapWorldSize));
-    const int segsY = static_cast<int>(std::ceil(length.y() / mMapWorldSize));
-
-    int i = 0;
-    for (int x=0; x<segsX; ++x)
+    auto segments = divideIntoSegments(mBounds, mMapWorldSize);
+    for (int x = 0; x < segments.first; ++x)
     {
-        for (int y=0; y<segsY; ++y)
+        for (int y = 0; y < segments.second; ++y)
         {
             osg::Vec2f start = min + osg::Vec2f(mMapWorldSize*x, mMapWorldSize*y);
             osg::Vec2f newcenter = start + osg::Vec2f(mMapWorldSize/2.f, mMapWorldSize/2.f);
 
-            osg::Quat cameraOrient (mAngle, osg::Vec3d(0,0,-1));
             osg::Vec2f a = newcenter - center;
             osg::Vec3f rotatedCenter = cameraOrient * (osg::Vec3f(a.x(), a.y(), 0));
 
@@ -483,26 +505,24 @@ void LocalMap::requestInteriorMap(const MWWorld::CellStore* cell)
 
             setupRenderToTexture(camera, x, y);
 
-            MapSegment& segment = mSegments[std::make_pair(x,y)];
+            auto coords = std::make_pair(x,y);
+            MapSegment& segment = mSegments[coords];
             if (!segment.mFogOfWarImage)
             {
-                if (!cellHasValidFog)
-                    segment.initFogOfWar();
-                else
+                bool loaded = false;
+                for(size_t index{}; index < segmentMappings.size(); index++)
                 {
-                    ESM::FogState* fog = cell->getFog();
-
-                    // We are using the same bounds and angle as we were using when the textures were originally made. Segments should come out the same.
-                    if (i >= int(fog->mFogTextures.size()))
+                    if(segmentMappings[index] == coords)
                     {
-                        Log(Debug::Warning) << "Warning: fog texture count mismatch";
+                        ESM::FogState* fog = cell->getFog();
+                        segment.loadFogOfWar(fog->mFogTextures[index]);
+                        loaded = true;
                         break;
                     }
-
-                    segment.loadFogOfWar(fog->mFogTextures[i]);
                 }
+                if(!loaded)
+                    segment.initFogOfWar();
             }
-            ++i;
         }
     }
 }

From ad101de733b383c4f708079c31abe42fedc840ec Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 9 Jan 2021 22:58:54 +0400
Subject: [PATCH 0200/2859] Merge declaration and initialization

---
 apps/opencs/view/render/terraintexturemode.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/apps/opencs/view/render/terraintexturemode.cpp b/apps/opencs/view/render/terraintexturemode.cpp
index 09d6b135a1..f4a3f461c9 100644
--- a/apps/opencs/view/render/terraintexturemode.cpp
+++ b/apps/opencs/view/render/terraintexturemode.cpp
@@ -427,10 +427,8 @@ void CSVRender::TerrainTextureMode::editTerrainTextureGrid(const WorldspaceHitRe
                         {
                             if (i_cell == cellX && j_cell == cellY && abs(i-xHitInCell) < r && abs(j-yHitInCell) < r)
                             {
-                                int distanceX(0);
-                                int distanceY(0);
-                                distanceX = abs(i-xHitInCell);
-                                distanceY = abs(j-yHitInCell);
+                                int distanceX = abs(i-xHitInCell);
+                                int distanceY = abs(j-yHitInCell);
                                 float distance = std::round(sqrt(pow(distanceX, 2)+pow(distanceY, 2)));
                                 float rf = static_cast<float>(mBrushSize) / 2;
                                 if (distance < rf) newTerrain[j*landTextureSize+i] = brushInt;

From 9bc687e20992cf5b7941343d7bce379f2c66b252 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sat, 9 Jan 2021 20:56:20 +0100
Subject: [PATCH 0201/2859] Avoid a rare but possible deadlock around
 mCollisionWorldMutex.

What happened is that the last handle to an Actor shared_ptr was a
promoted weak_ptr. When the shared_ptr goes out of scope, the Actor dtor
is invoked. That involves removing the Actor collision object after
exclusively locking mCollisionWorldMutex. In this case, the lock was
already held in the outter scope of the promoted weak_ptr.

Reduce the scope of the mCollisionWorldMutex to never encompass the
lifetime of a promoted weak_ptr.
---
 apps/openmw/mwphysics/mtphysics.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 0d1e5962a0..c77bc6acd5 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -357,7 +357,6 @@ namespace MWPhysics
     {
         if (!mDeferAabbUpdate || immediate)
         {
-            std::unique_lock lock(mCollisionWorldMutex);
             updatePtrAabb(ptr);
         }
         else
@@ -410,7 +409,7 @@ namespace MWPhysics
 
     void PhysicsTaskScheduler::updateAabbs()
     {
-        std::scoped_lock lock(mCollisionWorldMutex, mUpdateAabbMutex);
+        std::scoped_lock lock(mUpdateAabbMutex);
         std::for_each(mUpdateAabb.begin(), mUpdateAabb.end(),
             [this](const std::weak_ptr<PtrHolder>& ptr) { updatePtrAabb(ptr); });
         mUpdateAabb.clear();
@@ -420,6 +419,7 @@ namespace MWPhysics
     {
         if (const auto p = ptr.lock())
         {
+            std::scoped_lock lock(mCollisionWorldMutex);
             if (const auto actor = std::dynamic_pointer_cast<Actor>(p))
             {
                 actor->updateCollisionObjectPosition();
@@ -451,9 +451,11 @@ namespace MWPhysics
             int job = 0;
             while (mRemainingSteps && (job = mNextJob.fetch_add(1, std::memory_order_relaxed)) < mNumJobs)
             {
-                MaybeSharedLock lockColWorld(mCollisionWorldMutex, mThreadSafeBullet);
                 if(const auto actor = mActorsFrameData[job].mActor.lock())
+                {
+                    MaybeSharedLock lockColWorld(mCollisionWorldMutex, mThreadSafeBullet);
                     MovementSolver::move(mActorsFrameData[job], mPhysicsDt, mCollisionWorld.get(), *mWorldFrameData);
+                }
             }
 
             mPostStepBarrier->wait();
@@ -478,13 +480,13 @@ namespace MWPhysics
 
     void PhysicsTaskScheduler::updateActorsPositions()
     {
-        std::unique_lock lock(mCollisionWorldMutex);
         for (auto& actorData : mActorsFrameData)
         {
             if(const auto actor = actorData.mActor.lock())
             {
                 if (actor->setPosition(actorData.mPosition))
                 {
+                    std::scoped_lock lock(mCollisionWorldMutex);
                     actor->updateCollisionObjectPosition();
                     mCollisionWorld->updateSingleAabb(actor->getCollisionObject());
                 }

From 60f66f5e29a43f8ef566d3855b5abc699e24527a Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Thu, 7 Jan 2021 11:00:57 +0100
Subject: [PATCH 0202/2859] Remove never used parameter from
 CharacterController:update()

---
 apps/openmw/mwmechanics/character.cpp | 13 ++++++-------
 apps/openmw/mwmechanics/character.hpp |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index b9bfe6bc0f..5c50c547c6 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -1898,7 +1898,7 @@ void CharacterController::updateAnimQueue()
         mAnimation->setLoopingEnabled(mAnimQueue.front().mGroup, mAnimQueue.size() <= 1);
 }
 
-void CharacterController::update(float duration, bool animationOnly)
+void CharacterController::update(float duration)
 {
     MWBase::World *world = MWBase::Environment::get().getWorld();
     const MWWorld::Class &cls = mPtr.getClass();
@@ -2386,10 +2386,10 @@ void CharacterController::update(float duration, bool animationOnly)
                     world->rotateObject(mPtr, rot.x(), rot.y(), 0.0f, true);
             }
 
-            if (!animationOnly && !mMovementAnimationControlled)
+            if (!mMovementAnimationControlled)
                 world->queueMovement(mPtr, vec);
         }
-        else if (!animationOnly)
+        else
             // We must always queue movement, even if there is none, to apply gravity.
             world->queueMovement(mPtr, osg::Vec3f(0.f, 0.f, 0.f));
 
@@ -2414,8 +2414,7 @@ void CharacterController::update(float duration, bool animationOnly)
                 playDeath(1.f, mDeathState);
         }
         // We must always queue movement, even if there is none, to apply gravity.
-        if (!animationOnly)
-            world->queueMovement(mPtr, osg::Vec3f(0.f, 0.f, 0.f));
+        world->queueMovement(mPtr, osg::Vec3f(0.f, 0.f, 0.f));
     }
 
     bool isPersist = isPersistentAnimPlaying();
@@ -2452,10 +2451,10 @@ void CharacterController::update(float duration, bool animationOnly)
         {
             moved.z() = 1.0;
         }
-    }    
+    }
 
     // Update movement
-    if(!animationOnly && mMovementAnimationControlled && mPtr.getClass().isActor())
+    if(mMovementAnimationControlled && mPtr.getClass().isActor())
         world->queueMovement(mPtr, moved);
 
     mSkipAnim = false;
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index 2308ba971d..0821b32250 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -248,7 +248,7 @@ public:
 
     void updatePtr(const MWWorld::Ptr &ptr);
 
-    void update(float duration, bool animationOnly=false);
+    void update(float duration);
 
     bool onOpen();
     void onClose();

From 313e8959129c05145a16194c0893282cb27523ad Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Sat, 9 Jan 2021 21:35:07 +0000
Subject: [PATCH 0203/2859] [OpenMW-CS] Cube and sphere instance selection

---
 CHANGELOG.md                                  |   1 +
 CHANGELOG_PR.md                               |   2 +-
 apps/opencs/model/prefs/state.cpp             |  15 +
 apps/opencs/view/render/cell.cpp              |  47 +++
 apps/opencs/view/render/cell.hpp              |   7 +
 apps/opencs/view/render/instancedragmodes.hpp |  18 +
 apps/opencs/view/render/instancemode.cpp      | 106 +++++-
 apps/opencs/view/render/instancemode.hpp      |  16 +-
 .../view/render/instanceselectionmode.cpp     | 347 +++++++++++++++++-
 .../view/render/instanceselectionmode.hpp     |  32 +-
 .../view/render/pagedworldspacewidget.cpp     |  16 +
 .../view/render/pagedworldspacewidget.hpp     |   5 +
 apps/opencs/view/render/selectionmode.cpp     |  21 +-
 .../view/render/unpagedworldspacewidget.cpp   |  10 +
 .../view/render/unpagedworldspacewidget.hpp   |   4 +
 apps/opencs/view/render/worldspacewidget.hpp  |   5 +
 16 files changed, 627 insertions(+), 25 deletions(-)
 create mode 100644 apps/opencs/view/render/instancedragmodes.hpp

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce0cce9522..fa33b6647e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -94,6 +94,7 @@
     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 #3171: OpenMW-CS: Instance drag selection
     Feature #4894: Consider actors as obstacles for pathfinding
     Feature #5043: Head Bobbing
     Feature #5199: Improve Scene Colors
diff --git a/CHANGELOG_PR.md b/CHANGELOG_PR.md
index 69ad0cc1b9..fdf27dc932 100644
--- a/CHANGELOG_PR.md
+++ b/CHANGELOG_PR.md
@@ -21,7 +21,7 @@ New Features:
 - 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)
diff --git a/apps/opencs/model/prefs/state.cpp b/apps/opencs/model/prefs/state.cpp
index 588be9ccb3..32b1ee33f8 100644
--- a/apps/opencs/model/prefs/state.cpp
+++ b/apps/opencs/model/prefs/state.cpp
@@ -247,6 +247,15 @@ void CSMPrefs::State::declare()
     EnumValues landeditOutsideVisibleCell;
     landeditOutsideVisibleCell.add (showAndLandEdit).add (dontLandEdit);
 
+    EnumValue SelectOnly ("Select only");
+    EnumValue SelectAdd ("Add to selection");
+    EnumValue SelectRemove ("Remove from selection");
+    EnumValue selectInvert ("Invert selection");
+    EnumValues primarySelectAction;
+    primarySelectAction.add (SelectOnly).add (SelectAdd).add (SelectRemove).add (selectInvert);
+    EnumValues secondarySelectAction;
+    secondarySelectAction.add (SelectOnly).add (SelectAdd).add (SelectRemove).add (selectInvert);
+
     declareCategory ("3D Scene Editing");
     declareInt ("distance", "Drop Distance", 50).
         setTooltip ("If an instance drop can not be placed against another object at the "
@@ -276,6 +285,12 @@ void CSMPrefs::State::declare()
     declareBool ("open-list-view", "Open displays list view", false).
         setTooltip ("When opening a reference from the scene view, it will open the"
         " instance list view instead of the individual instance record view.");
+    declareEnum ("primary-select-action", "Action for primary select", SelectOnly).
+        setTooltip("Selection can be chosen between select only, add to selection, remove from selection and invert selection.").
+        addValues (primarySelectAction);
+    declareEnum ("secondary-select-action", "Action for secondary select", SelectAdd).
+        setTooltip("Selection can be chosen between select only, add to selection, remove from selection and invert selection.").
+        addValues (secondarySelectAction);
 
     declareCategory ("Key Bindings");
 
diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index 75d83cf639..2502dc1fd0 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -1,5 +1,7 @@
 #include "cell.hpp"
 
+#include <math.h>
+
 #include <osg/PositionAttitudeTransform>
 #include <osg/Geode>
 #include <osg/Geometry>
@@ -25,6 +27,7 @@
 #include "pathgrid.hpp"
 #include "terrainstorage.hpp"
 #include "object.hpp"
+#include "instancedragmodes.hpp"
 
 namespace CSVRender
 {
@@ -496,6 +499,50 @@ void CSVRender::Cell::selectAllWithSameParentId (int elementMask)
     }
 }
 
+void CSVRender::Cell::handleSelectDrag(Object* object, DragMode dragMode)
+{
+    if (dragMode == DragMode_Select_Only || dragMode == DragMode_Select_Add)
+        object->setSelected(true);
+
+    else if (dragMode == DragMode_Select_Remove)
+        object->setSelected(false);
+
+    else if (dragMode == DragMode_Select_Invert)
+        object->setSelected (!object->getSelected());
+}
+
+void CSVRender::Cell::selectInsideCube(const osg::Vec3d& pointA, const osg::Vec3d& pointB, DragMode dragMode)
+{
+    for (auto& object : mObjects)
+    {
+        if (dragMode == DragMode_Select_Only) object.second->setSelected (false);
+
+        if ( ( object.second->getPosition().pos[0] > pointA[0] && object.second->getPosition().pos[0] < pointB[0] ) ||
+             ( object.second->getPosition().pos[0] > pointB[0] && object.second->getPosition().pos[0] < pointA[0] ))
+        {
+            if ( ( object.second->getPosition().pos[1] > pointA[1] && object.second->getPosition().pos[1] < pointB[1] ) ||
+                 ( object.second->getPosition().pos[1] > pointB[1] && object.second->getPosition().pos[1] < pointA[1] ))
+            {
+                if ( ( object.second->getPosition().pos[2] > pointA[2] && object.second->getPosition().pos[2] < pointB[2] ) ||
+                     ( object.second->getPosition().pos[2] > pointB[2] && object.second->getPosition().pos[2] < pointA[2] ))
+                    handleSelectDrag(object.second, dragMode);
+            }
+
+        }
+    }
+}
+
+void CSVRender::Cell::selectWithinDistance(const osg::Vec3d& point, float distance, DragMode dragMode)
+{
+    for (auto& object : mObjects)
+    {
+        if (dragMode == DragMode_Select_Only) object.second->setSelected (false);
+
+        float distanceFromObject = (point - object.second->getPosition().asVec3()).length();
+        if (distanceFromObject < distance) handleSelectDrag(object.second, dragMode);
+    }
+}
+
 void CSVRender::Cell::setCellArrows (int mask)
 {
     for (int i=0; i<4; ++i)
diff --git a/apps/opencs/view/render/cell.hpp b/apps/opencs/view/render/cell.hpp
index 281ac67356..5998a4ee62 100644
--- a/apps/opencs/view/render/cell.hpp
+++ b/apps/opencs/view/render/cell.hpp
@@ -10,6 +10,7 @@
 
 #include "../../model/world/cellcoordinates.hpp"
 #include "terrainstorage.hpp"
+#include "instancedragmodes.hpp"
 
 class QModelIndex;
 
@@ -152,6 +153,12 @@ namespace CSVRender
             // already selected
             void selectAllWithSameParentId (int elementMask);
 
+            void handleSelectDrag(Object* object, DragMode dragMode);
+
+            void selectInsideCube(const osg::Vec3d& pointA, const osg::Vec3d& pointB, DragMode dragMode);
+
+            void selectWithinDistance(const osg::Vec3d& pointA, float distance, DragMode dragMode);
+
             void setCellArrows (int mask);
 
             /// \brief Set marker for this cell.
diff --git a/apps/opencs/view/render/instancedragmodes.hpp b/apps/opencs/view/render/instancedragmodes.hpp
new file mode 100644
index 0000000000..01547545ae
--- /dev/null
+++ b/apps/opencs/view/render/instancedragmodes.hpp
@@ -0,0 +1,18 @@
+#ifndef CSV_WIDGET_INSTANCEDRAGMODES_H
+#define CSV_WIDGET_INSTANCEDRAGMODES_H
+
+namespace CSVRender
+{
+    enum DragMode
+    {
+        DragMode_None,
+        DragMode_Move,
+        DragMode_Rotate,
+        DragMode_Scale,
+        DragMode_Select_Only,
+        DragMode_Select_Add,
+        DragMode_Select_Remove,
+        DragMode_Select_Invert
+    };
+}
+#endif
diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index 19018fae6c..4f6759cdb8 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -96,6 +96,33 @@ osg::Vec3f CSVRender::InstanceMode::getScreenCoords(const osg::Vec3f& pos)
     return pos * combined;
 }
 
+osg::Vec3f CSVRender::InstanceMode::getProjectionSpaceCoords(const osg::Vec3f& pos)
+{
+    osg::Matrix viewMatrix = getWorldspaceWidget().getCamera()->getViewMatrix();
+    osg::Matrix projMatrix = getWorldspaceWidget().getCamera()->getProjectionMatrix();
+    osg::Matrix combined = viewMatrix * projMatrix;
+
+    return pos * combined;
+}
+
+osg::Vec3f CSVRender::InstanceMode::getMousePlaneCoords(const QPoint& point, const osg::Vec3d& dragStart)
+{
+    osg::Matrix viewMatrix;
+    viewMatrix.invert(getWorldspaceWidget().getCamera()->getViewMatrix());
+    osg::Matrix projMatrix;
+    projMatrix.invert(getWorldspaceWidget().getCamera()->getProjectionMatrix());
+    osg::Matrix combined = projMatrix * viewMatrix;
+
+    /* calculate viewport normalized coordinates
+       note: is there a reason to use getCamera()->getViewport()->computeWindowMatrix() instead? */
+    float x = (point.x() * 2) / getWorldspaceWidget().getCamera()->getViewport()->width() - 1.0f;
+    float y = 1.0f - (point.y() * 2) / getWorldspaceWidget().getCamera()->getViewport()->height();
+
+    osg::Vec3f mousePlanePoint = osg::Vec3f(x, y, dragStart.z()) * combined;
+
+    return mousePlanePoint;
+}
+
 CSVRender::InstanceMode::InstanceMode (WorldspaceWidget *worldspaceWidget,  osg::ref_ptr<osg::Group> parentNode,  QWidget *parent)
 : EditMode (worldspaceWidget, QIcon (":scenetoolbar/editing-instance"), Mask_Reference | Mask_Terrain, "Instance editing",
   parent), mSubMode (nullptr), mSubModeId ("move"), mSelectionMode (nullptr), mDragMode (DragMode_None),
@@ -146,7 +173,7 @@ void CSVRender::InstanceMode::activate (CSVWidget::SceneToolbar *toolbar)
     }
 
     if (!mSelectionMode)
-        mSelectionMode = new InstanceSelectionMode (toolbar, getWorldspaceWidget());
+        mSelectionMode = new InstanceSelectionMode (toolbar, getWorldspaceWidget(), mParentNode);
 
     mDragMode = DragMode_None;
 
@@ -322,6 +349,42 @@ bool CSVRender::InstanceMode::secondaryEditStartDrag (const QPoint& pos)
     return false;
 }
 
+bool CSVRender::InstanceMode::primarySelectStartDrag (const QPoint& pos)
+{
+    if (mDragMode!=DragMode_None || mLocked)
+        return false;
+
+    std::string primarySelectAction = CSMPrefs::get()["3D Scene Editing"]["primary-select-action"].toString();
+
+    if ( primarySelectAction == "Select only" ) mDragMode = DragMode_Select_Only;
+    else if ( primarySelectAction == "Add to selection" ) mDragMode = DragMode_Select_Add;
+    else if ( primarySelectAction == "Remove from selection" ) mDragMode = DragMode_Select_Remove;
+    else if ( primarySelectAction == "Invert selection" ) mDragMode = DragMode_Select_Invert;
+
+    WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
+    mSelectionMode->setDragStart(hit.worldPos);
+
+    return true;
+}
+
+bool CSVRender::InstanceMode::secondarySelectStartDrag (const QPoint& pos)
+{
+    if (mDragMode!=DragMode_None || mLocked)
+        return false;
+
+    std::string secondarySelectAction = CSMPrefs::get()["3D Scene Editing"]["secondary-select-action"].toString();
+
+    if ( secondarySelectAction == "Select only" ) mDragMode = DragMode_Select_Only;
+    else if ( secondarySelectAction == "Add to selection" ) mDragMode = DragMode_Select_Add;
+    else if ( secondarySelectAction == "Remove from selection" ) mDragMode = DragMode_Select_Remove;
+    else if ( secondarySelectAction == "Invert selection" ) mDragMode = DragMode_Select_Invert;
+
+    WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
+    mSelectionMode->setDragStart(hit.worldPos);
+
+    return true;
+}
+
 void CSVRender::InstanceMode::drag (const QPoint& pos, int diffX, int diffY, double speedFactor)
 {
     osg::Vec3f offset;
@@ -432,6 +495,24 @@ void CSVRender::InstanceMode::drag (const QPoint& pos, int diffX, int diffY, dou
         // Only uniform scaling is currently supported
         offset = osg::Vec3f(scale, scale, scale);
     }
+    else if (mSelectionMode->getCurrentId() == "cube-centre")
+    {
+        osg::Vec3f mousePlanePoint = getMousePlaneCoords(pos, getProjectionSpaceCoords(mSelectionMode->getDragStart()));
+        mSelectionMode->drawSelectionCubeCentre (mousePlanePoint);
+        return;
+    }
+    else if (mSelectionMode->getCurrentId() == "cube-corner")
+    {
+        osg::Vec3f mousePlanePoint = getMousePlaneCoords(pos, getProjectionSpaceCoords(mSelectionMode->getDragStart()));
+        mSelectionMode->drawSelectionCubeCorner (mousePlanePoint);
+        return;
+    }
+    else if (mSelectionMode->getCurrentId() == "sphere")
+    {
+        osg::Vec3f mousePlanePoint = getMousePlaneCoords(pos, getProjectionSpaceCoords(mSelectionMode->getDragStart()));
+        mSelectionMode->drawSelectionSphere (mousePlanePoint);
+        return;
+    }
 
     // Apply
     for (std::vector<osg::ref_ptr<TagBase> >::iterator iter (selection.begin()); iter!=selection.end(); ++iter)
@@ -495,6 +576,22 @@ void CSVRender::InstanceMode::dragCompleted(const QPoint& pos)
         case DragMode_Move: description = "Move Instances"; break;
         case DragMode_Rotate: description = "Rotate Instances"; break;
         case DragMode_Scale: description = "Scale Instances"; break;
+        case DragMode_Select_Only :
+            handleSelectDrag(pos);
+            return;
+            break;
+        case DragMode_Select_Add :
+            handleSelectDrag(pos);
+            return;
+            break;
+        case DragMode_Select_Remove :
+            handleSelectDrag(pos);
+            return;
+            break;
+        case DragMode_Select_Invert :
+            handleSelectDrag(pos);
+            return;
+            break;
 
         case DragMode_None: break;
     }
@@ -680,6 +777,13 @@ void CSVRender::InstanceMode::subModeChanged (const std::string& id)
     getWorldspaceWidget().setSubMode (getSubModeFromId (id), Mask_Reference);
 }
 
+void CSVRender::InstanceMode::handleSelectDrag(const QPoint& pos)
+{
+    osg::Vec3f mousePlanePoint = getMousePlaneCoords(pos, getProjectionSpaceCoords(mSelectionMode->getDragStart()));
+    mSelectionMode->dragEnded (mousePlanePoint, mDragMode);
+    mDragMode = DragMode_None;
+}
+
 void CSVRender::InstanceMode::deleteSelectedInstances(bool active)
 {
     std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection (Mask_Reference);
diff --git a/apps/opencs/view/render/instancemode.hpp b/apps/opencs/view/render/instancemode.hpp
index 32dd4ac67d..0a4f2e4788 100644
--- a/apps/opencs/view/render/instancemode.hpp
+++ b/apps/opencs/view/render/instancemode.hpp
@@ -9,6 +9,7 @@
 #include <osg/Vec3f>
 
 #include "editmode.hpp"
+#include "instancedragmodes.hpp"
 
 namespace CSVWidget
 {
@@ -25,14 +26,6 @@ namespace CSVRender
     {
             Q_OBJECT
 
-            enum DragMode
-            {
-                DragMode_None,
-                DragMode_Move,
-                DragMode_Rotate,
-                DragMode_Scale
-            };
-
             enum DropMode
             {
                 Collision,
@@ -57,6 +50,9 @@ namespace CSVRender
 
             osg::Vec3f getSelectionCenter(const std::vector<osg::ref_ptr<TagBase> >& selection) const;
             osg::Vec3f getScreenCoords(const osg::Vec3f& pos);
+            osg::Vec3f getProjectionSpaceCoords(const osg::Vec3f& pos);
+            osg::Vec3f getMousePlaneCoords(const QPoint& point, const osg::Vec3d& dragStart);
+            void handleSelectDrag(const QPoint& pos);
             void dropInstance(DropMode dropMode, CSVRender::Object* object, float objectHeight);
             float getDropHeight(DropMode dropMode, CSVRender::Object* object, float objectHeight);
 
@@ -84,6 +80,10 @@ namespace CSVRender
 
             bool secondaryEditStartDrag (const QPoint& pos) override;
 
+            bool primarySelectStartDrag(const QPoint& pos) override;
+
+            bool secondarySelectStartDrag(const QPoint& pos) override;
+
             void drag (const QPoint& pos, int diffX, int diffY, double speedFactor) override;
 
             void dragCompleted(const QPoint& pos) override;
diff --git a/apps/opencs/view/render/instanceselectionmode.cpp b/apps/opencs/view/render/instanceselectionmode.cpp
index bf8ede0eb4..9b5fb759cc 100644
--- a/apps/opencs/view/render/instanceselectionmode.cpp
+++ b/apps/opencs/view/render/instanceselectionmode.cpp
@@ -2,17 +2,24 @@
 
 #include <QMenu>
 #include <QAction>
+#include <QPoint>
+
+#include <osg/Group>
+#include <osg/PositionAttitudeTransform>
+#include <osg/ref_ptr>
+#include <osg/Vec3d>
 
 #include "../../model/world/idtable.hpp"
 #include "../../model/world/commands.hpp"
 
+#include "instancedragmodes.hpp"
 #include "worldspacewidget.hpp"
 #include "object.hpp"
 
 namespace CSVRender
 {
-    InstanceSelectionMode::InstanceSelectionMode(CSVWidget::SceneToolbar* parent, WorldspaceWidget& worldspaceWidget)
-        : SelectionMode(parent, worldspaceWidget, Mask_Reference)
+    InstanceSelectionMode::InstanceSelectionMode(CSVWidget::SceneToolbar* parent, WorldspaceWidget& worldspaceWidget, osg::Group *cellNode)
+        : SelectionMode(parent, worldspaceWidget, Mask_Reference), mParentNode(cellNode)
     {
         mSelectSame = new QAction("Extend selection to instances with same object ID", this);
         mDeleteSelection = new QAction("Delete selected instances", this);
@@ -21,6 +28,342 @@ namespace CSVRender
         connect(mDeleteSelection, SIGNAL(triggered()), this, SLOT(deleteSelection()));
     }
 
+    InstanceSelectionMode::~InstanceSelectionMode()
+    {
+        mParentNode->removeChild(mBaseNode);
+    }
+
+    void InstanceSelectionMode::setDragStart(const osg::Vec3d& dragStart)
+    {
+        mDragStart = dragStart;
+    }
+
+    const osg::Vec3d& InstanceSelectionMode::getDragStart()
+    {
+        return mDragStart;
+    }
+
+    void InstanceSelectionMode::dragEnded(const osg::Vec3d& dragEndPoint, DragMode dragMode)
+    {
+        float dragDistance = (mDragStart - dragEndPoint).length();
+        if (mBaseNode) mParentNode->removeChild (mBaseNode);
+        if (getCurrentId() == "cube-centre")
+        {
+            osg::Vec3d pointA(mDragStart[0] - dragDistance, mDragStart[1] - dragDistance, mDragStart[2] - dragDistance);
+            osg::Vec3d pointB(mDragStart[0] + dragDistance, mDragStart[1] + dragDistance, mDragStart[2] + dragDistance);
+            getWorldspaceWidget().selectInsideCube(pointA, pointB, dragMode);
+        }
+        else if (getCurrentId() == "cube-corner")
+        {
+            getWorldspaceWidget().selectInsideCube(mDragStart, dragEndPoint, dragMode);
+        }
+        else if (getCurrentId() == "sphere")
+        {
+            getWorldspaceWidget().selectWithinDistance(mDragStart, dragDistance, dragMode);
+        }
+    }
+
+    void InstanceSelectionMode::drawSelectionCubeCentre(const osg::Vec3f& mousePlanePoint)
+    {
+        float dragDistance = (mDragStart - mousePlanePoint).length();
+        drawSelectionCube(mDragStart, dragDistance);
+    }
+
+    void InstanceSelectionMode::drawSelectionCubeCorner(const osg::Vec3f& mousePlanePoint)
+    {
+        drawSelectionBox(mDragStart, mousePlanePoint);
+    }
+
+    void InstanceSelectionMode::drawSelectionBox(const osg::Vec3d& pointA, const osg::Vec3d& pointB)
+    {
+        if (mBaseNode) mParentNode->removeChild (mBaseNode);
+        mBaseNode = new osg::PositionAttitudeTransform;
+        mBaseNode->setPosition(pointA);
+
+        osg::ref_ptr<osg::Geometry> geometry (new osg::Geometry);
+
+        osg::Vec3Array *vertices = new osg::Vec3Array;
+        vertices->push_back (osg::Vec3f (0.0f, 0.0f, 0.0f));
+        vertices->push_back (osg::Vec3f (0.0f, 0.0f, pointB[2] - pointA[2]));
+        vertices->push_back (osg::Vec3f (0.0f, pointB[1] - pointA[1], 0.0f));
+        vertices->push_back (osg::Vec3f (0.0f, pointB[1] - pointA[1], pointB[2] - pointA[2]));
+
+        vertices->push_back (osg::Vec3f (pointB[0] - pointA[0], 0.0f, 0.0f));
+        vertices->push_back (osg::Vec3f (pointB[0] - pointA[0], 0.0f, pointB[2] - pointA[2]));
+        vertices->push_back (osg::Vec3f (pointB[0] - pointA[0], pointB[1] - pointA[1], 0.0f));
+        vertices->push_back (osg::Vec3f (pointB[0] - pointA[0], pointB[1] - pointA[1], pointB[2] - pointA[2]));
+
+        geometry->setVertexArray (vertices);
+
+        osg::DrawElementsUShort *primitives = new osg::DrawElementsUShort (osg::PrimitiveSet::TRIANGLES, 0);
+
+        // top
+        primitives->push_back (2);
+        primitives->push_back (1);
+        primitives->push_back (0);
+
+        primitives->push_back (3);
+        primitives->push_back (1);
+        primitives->push_back (2);
+
+        // bottom
+        primitives->push_back (4);
+        primitives->push_back (5);
+        primitives->push_back (6);
+
+        primitives->push_back (6);
+        primitives->push_back (5);
+        primitives->push_back (7);
+
+        // sides
+        primitives->push_back (1);
+        primitives->push_back (4);
+        primitives->push_back (0);
+
+        primitives->push_back (4);
+        primitives->push_back (1);
+        primitives->push_back (5);
+
+        primitives->push_back (4);
+        primitives->push_back (2);
+        primitives->push_back (0);
+
+        primitives->push_back (6);
+        primitives->push_back (2);
+        primitives->push_back (4);
+
+        primitives->push_back (6);
+        primitives->push_back (3);
+        primitives->push_back (2);
+
+        primitives->push_back (7);
+        primitives->push_back (3);
+        primitives->push_back (6);
+
+        primitives->push_back (1);
+        primitives->push_back (3);
+        primitives->push_back (5);
+
+        primitives->push_back (5);
+        primitives->push_back (3);
+        primitives->push_back (7);
+
+        geometry->addPrimitiveSet (primitives);
+
+        osg::Vec4Array *colours = new osg::Vec4Array;
+
+        colours->push_back (osg::Vec4f (0.3f, 0.3f, 0.5f, 0.2f));
+        colours->push_back (osg::Vec4f (0.9f, 0.9f, 1.0f, 0.2f));
+        colours->push_back (osg::Vec4f (0.3f, 0.3f, 0.4f, 0.2f));
+        colours->push_back (osg::Vec4f (0.9f, 0.9f, 1.0f, 0.2f));
+        colours->push_back (osg::Vec4f (0.3f, 0.3f, 0.4f, 0.2f));
+        colours->push_back (osg::Vec4f (0.9f, 0.9f, 1.0f, 0.2f));
+        colours->push_back (osg::Vec4f (0.3f, 0.3f, 0.4f, 0.2f));
+        colours->push_back (osg::Vec4f (0.9f, 0.9f, 1.0f, 0.2f));
+
+        geometry->setColorArray (colours, osg::Array::BIND_PER_VERTEX);
+
+        geometry->getOrCreateStateSet()->setMode (GL_LIGHTING, osg::StateAttribute::OFF);
+        geometry->getOrCreateStateSet()->setMode (GL_BLEND, osg::StateAttribute::ON);
+        geometry->getOrCreateStateSet()->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
+        geometry->getOrCreateStateSet()->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
+
+        mBaseNode->addChild (geometry);
+        mParentNode->addChild(mBaseNode);
+    }
+
+    void InstanceSelectionMode::drawSelectionCube(const osg::Vec3d& point, float radius)
+    {
+        if (mBaseNode) mParentNode->removeChild (mBaseNode);
+        mBaseNode = new osg::PositionAttitudeTransform;
+        mBaseNode->setPosition(point);
+
+        osg::ref_ptr<osg::Geometry> geometry (new osg::Geometry);
+
+        osg::Vec3Array *vertices = new osg::Vec3Array;
+        for (int i = 0; i < 2; ++i)
+        {
+            float height = i ? -radius : radius;
+            vertices->push_back (osg::Vec3f (height, -radius, -radius));
+            vertices->push_back (osg::Vec3f (height, -radius,  radius));
+            vertices->push_back (osg::Vec3f (height,  radius, -radius));
+            vertices->push_back (osg::Vec3f (height,  radius,  radius));
+        }
+
+        geometry->setVertexArray (vertices);
+
+        osg::DrawElementsUShort *primitives = new osg::DrawElementsUShort (osg::PrimitiveSet::TRIANGLES, 0);
+
+        // top
+        primitives->push_back (2);
+        primitives->push_back (1);
+        primitives->push_back (0);
+
+        primitives->push_back (3);
+        primitives->push_back (1);
+        primitives->push_back (2);
+
+        // bottom
+        primitives->push_back (4);
+        primitives->push_back (5);
+        primitives->push_back (6);
+
+        primitives->push_back (6);
+        primitives->push_back (5);
+        primitives->push_back (7);
+
+        // sides
+        primitives->push_back (1);
+        primitives->push_back (4);
+        primitives->push_back (0);
+
+        primitives->push_back (4);
+        primitives->push_back (1);
+        primitives->push_back (5);
+
+        primitives->push_back (4);
+        primitives->push_back (2);
+        primitives->push_back (0);
+
+        primitives->push_back (6);
+        primitives->push_back (2);
+        primitives->push_back (4);
+
+        primitives->push_back (6);
+        primitives->push_back (3);
+        primitives->push_back (2);
+
+        primitives->push_back (7);
+        primitives->push_back (3);
+        primitives->push_back (6);
+
+        primitives->push_back (1);
+        primitives->push_back (3);
+        primitives->push_back (5);
+
+        primitives->push_back (5);
+        primitives->push_back (3);
+        primitives->push_back (7);
+
+        geometry->addPrimitiveSet (primitives);
+
+        osg::Vec4Array *colours = new osg::Vec4Array;
+
+        colours->push_back (osg::Vec4f (0.3f, 0.3f, 0.5f, 0.2f));
+        colours->push_back (osg::Vec4f (0.9f, 0.9f, 1.0f, 0.2f));
+        colours->push_back (osg::Vec4f (0.3f, 0.3f, 0.4f, 0.2f));
+        colours->push_back (osg::Vec4f (0.9f, 0.9f, 1.0f, 0.2f));
+        colours->push_back (osg::Vec4f (0.3f, 0.3f, 0.4f, 0.2f));
+        colours->push_back (osg::Vec4f (0.9f, 0.9f, 1.0f, 0.2f));
+        colours->push_back (osg::Vec4f (0.3f, 0.3f, 0.4f, 0.2f));
+        colours->push_back (osg::Vec4f (0.9f, 0.9f, 1.0f, 0.2f));
+
+        geometry->setColorArray (colours, osg::Array::BIND_PER_VERTEX);
+
+        geometry->getOrCreateStateSet()->setMode (GL_LIGHTING, osg::StateAttribute::OFF);
+        geometry->getOrCreateStateSet()->setMode (GL_BLEND, osg::StateAttribute::ON);
+        geometry->getOrCreateStateSet()->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
+        geometry->getOrCreateStateSet()->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
+
+        mBaseNode->addChild (geometry);
+        mParentNode->addChild(mBaseNode);
+    }
+
+    void InstanceSelectionMode::drawSelectionSphere(const osg::Vec3f& mousePlanePoint)
+    {
+        float dragDistance = (mDragStart - mousePlanePoint).length();
+        drawSelectionSphere(mDragStart, dragDistance);
+    }
+
+    void InstanceSelectionMode::drawSelectionSphere(const osg::Vec3d& point, float radius)
+    {
+        if (mBaseNode) mParentNode->removeChild (mBaseNode);
+        mBaseNode = new osg::PositionAttitudeTransform;
+        mBaseNode->setPosition(point);
+
+        osg::ref_ptr<osg::Geometry> geometry (new osg::Geometry);
+
+        osg::Vec3Array *vertices = new osg::Vec3Array;
+        int resolution = 32;
+        float radiusPerResolution = radius / resolution;
+        float reciprocalResolution = 1.0f / resolution;
+        float doubleReciprocalRes = reciprocalResolution * 2;
+
+        osg::Vec4Array *colours = new osg::Vec4Array;
+
+        for (float i = 0.0; i <= resolution; i += 2)
+        {
+            float iShifted = (static_cast<float>(i) - resolution / 2.0f); // i - 16 = -16 ... 16
+            float xPercentile = iShifted * doubleReciprocalRes;
+            float x = xPercentile * radius;
+            float thisRadius = sqrt (radius * radius - x * x);
+
+            //the next row
+            float iShifted2 = (static_cast<float>(i + 1) - resolution / 2.0f);
+            float xPercentile2 = iShifted2 * doubleReciprocalRes;
+            float x2 = xPercentile2 * radius;
+            float thisRadius2 = sqrt (radius * radius - x2 * x2);
+
+            for (int j = 0; j < resolution; ++j)
+            {
+                float vertexX = thisRadius * sin(j * reciprocalResolution * osg::PI * 2);
+                float vertexY = i * radiusPerResolution * 2 - radius;
+                float vertexZ = thisRadius * cos(j * reciprocalResolution * osg::PI * 2);
+                float heightPercentage = (vertexZ + radius) / (radius * 2);
+                vertices->push_back (osg::Vec3f (vertexX, vertexY, vertexZ));
+                colours->push_back (osg::Vec4f (heightPercentage, heightPercentage, heightPercentage, 0.3f));
+
+                float vertexNextRowX = thisRadius2 * sin(j * reciprocalResolution * osg::PI * 2);
+                float vertexNextRowY = (i + 1) * radiusPerResolution * 2 - radius;
+                float vertexNextRowZ = thisRadius2 * cos(j * reciprocalResolution * osg::PI * 2);
+                float heightPercentageNextRow = (vertexZ + radius) / (radius * 2);
+                vertices->push_back (osg::Vec3f (vertexNextRowX, vertexNextRowY, vertexNextRowZ));
+                colours->push_back (osg::Vec4f (heightPercentageNextRow, heightPercentageNextRow, heightPercentageNextRow, 0.3f));
+            }
+        }
+
+        geometry->setVertexArray (vertices);
+
+        osg::DrawElementsUShort *primitives = new osg::DrawElementsUShort (osg::PrimitiveSet::TRIANGLE_STRIP, 0);
+
+        for (int i = 0; i < resolution; ++i)
+        {
+            //Even
+            for (int j = 0; j < resolution * 2; ++j)
+            {
+                if (i * resolution * 2 + j > static_cast<int>(vertices->size()) - 1) continue;
+                primitives->push_back (i * resolution * 2 + j);
+            }
+            if (i * resolution * 2 > static_cast<int>(vertices->size()) - 1) continue;
+            primitives->push_back (i * resolution * 2);
+            primitives->push_back (i * resolution * 2 + 1);
+
+            //Odd
+            for (int j = 1; j < resolution * 2 - 2; j += 2)
+            {
+                if ((i + 1) * resolution * 2 + j - 1 > static_cast<int>(vertices->size()) - 1) continue;
+                primitives->push_back ((i + 1) * resolution * 2 + j - 1);
+                primitives->push_back (i * resolution * 2 + j + 2);
+            }
+            if ((i + 2) * resolution * 2 - 2 > static_cast<int>(vertices->size()) - 1) continue;
+            primitives->push_back ((i + 2) * resolution * 2 - 2);
+            primitives->push_back (i * resolution * 2 + 1);
+            primitives->push_back ((i + 1) * resolution * 2);
+        }
+
+        geometry->addPrimitiveSet (primitives);
+
+        geometry->setColorArray (colours, osg::Array::BIND_PER_VERTEX);
+
+        geometry->getOrCreateStateSet()->setMode (GL_LIGHTING, osg::StateAttribute::OFF);
+        geometry->getOrCreateStateSet()->setMode (GL_BLEND, osg::StateAttribute::ON);
+        geometry->getOrCreateStateSet()->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
+        geometry->getOrCreateStateSet()->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
+
+        mBaseNode->addChild (geometry);
+        mParentNode->addChild(mBaseNode);
+    }
+
     bool InstanceSelectionMode::createContextMenu(QMenu* menu)
     {
         if (menu)
diff --git a/apps/opencs/view/render/instanceselectionmode.hpp b/apps/opencs/view/render/instanceselectionmode.hpp
index a238116710..81795d5d3e 100644
--- a/apps/opencs/view/render/instanceselectionmode.hpp
+++ b/apps/opencs/view/render/instanceselectionmode.hpp
@@ -1,7 +1,13 @@
 #ifndef CSV_RENDER_INSTANCE_SELECTION_MODE_H
 #define CSV_RENDER_INSTANCE_SELECTION_MODE_H
 
+#include <QPoint>
+
+#include <osg/PositionAttitudeTransform>
+#include <osg/Vec3d>
+
 #include "selectionmode.hpp"
+#include "instancedragmodes.hpp"
 
 namespace CSVRender
 {
@@ -11,8 +17,25 @@ namespace CSVRender
 
         public:
 
-            InstanceSelectionMode(CSVWidget::SceneToolbar* parent, WorldspaceWidget& worldspaceWidget);
+            InstanceSelectionMode(CSVWidget::SceneToolbar* parent, WorldspaceWidget& worldspaceWidget, osg::Group *cellNode);
+
+            ~InstanceSelectionMode();
+
+            /// Store the worldspace-coordinate when drag begins
+            void setDragStart(const osg::Vec3d& dragStart);
 
+            /// Store the worldspace-coordinate when drag begins
+            const osg::Vec3d& getDragStart();
+
+            /// Store the screen-coordinate when drag begins
+            void setScreenDragStart(const QPoint& dragStartPoint);
+
+            /// Apply instance selection changes
+            void dragEnded(const osg::Vec3d& dragEndPoint, DragMode dragMode);
+
+            void drawSelectionCubeCentre(const osg::Vec3f& mousePlanePoint );
+            void drawSelectionCubeCorner(const osg::Vec3f& mousePlanePoint );
+            void drawSelectionSphere(const osg::Vec3f& mousePlanePoint );
         protected:
 
             /// Add context menu items to \a menu.
@@ -25,8 +48,15 @@ namespace CSVRender
 
         private:
 
+            void drawSelectionBox(const osg::Vec3d& pointA, const osg::Vec3d& pointB);
+            void drawSelectionCube(const osg::Vec3d& point, float radius);
+            void drawSelectionSphere(const osg::Vec3d& point, float radius);
+
             QAction* mDeleteSelection;
             QAction* mSelectSame;
+            osg::Vec3d mDragStart;
+            osg::Group* mParentNode;
+            osg::ref_ptr<osg::PositionAttitudeTransform> mBaseNode;
 
         private slots:
 
diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index dca5549af4..ed35584226 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -768,6 +768,22 @@ void CSVRender::PagedWorldspaceWidget::selectAllWithSameParentId (int elementMas
     flagAsModified();
 }
 
+void CSVRender::PagedWorldspaceWidget::selectInsideCube(const osg::Vec3d& pointA, const osg::Vec3d& pointB, DragMode dragMode)
+{
+    for (auto& cell : mCells)
+    {
+        cell.second->selectInsideCube (pointA, pointB, dragMode);
+    }
+}
+
+void CSVRender::PagedWorldspaceWidget::selectWithinDistance(const osg::Vec3d& point, float distance, DragMode dragMode)
+{
+    for (auto& cell : mCells)
+    {
+        cell.second->selectWithinDistance (point, distance, dragMode);
+    }
+}
+
 std::string CSVRender::PagedWorldspaceWidget::getCellId (const osg::Vec3f& point) const
 {
     CSMWorld::CellCoordinates cellCoordinates (
diff --git a/apps/opencs/view/render/pagedworldspacewidget.hpp b/apps/opencs/view/render/pagedworldspacewidget.hpp
index d17670cfa7..beab0c575b 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.hpp
@@ -7,6 +7,7 @@
 
 #include "worldspacewidget.hpp"
 #include "cell.hpp"
+#include "instancedragmodes.hpp"
 
 namespace CSVWidget
 {
@@ -120,6 +121,10 @@ namespace CSVRender
             /// \param elementMask Elements to be affected by the select operation
             void selectAllWithSameParentId (int elementMask) override;
 
+            void selectInsideCube(const osg::Vec3d& pointA, const osg::Vec3d& pointB, DragMode dragMode) override;
+
+            void selectWithinDistance(const osg::Vec3d& point, float distance, DragMode dragMode) override;
+
             std::string getCellId (const osg::Vec3f& point) const override;
 
             Cell* getCell(const osg::Vec3d& point) const override;
diff --git a/apps/opencs/view/render/selectionmode.cpp b/apps/opencs/view/render/selectionmode.cpp
index b5ccda5ad4..e7e7d47b5a 100644
--- a/apps/opencs/view/render/selectionmode.cpp
+++ b/apps/opencs/view/render/selectionmode.cpp
@@ -15,30 +15,27 @@ namespace CSVRender
     {
         addButton(":scenetoolbar/selection-mode-cube", "cube-centre",
             "Centred cube"
-            "<ul><li>Drag with {scene-select-primary} (make instances the selection) or {scene-select-secondary} "
-                "(invert selection state) from the centre of the selection cube outwards</li>"
+            "<ul><li>Drag with {scene-select-primary} for primary select or {scene-select-secondary} for secondary select "
+                "from the centre of the selection cube outwards.</li>"
             "<li>The selection cube is aligned to the word space axis</li>"
             "<li>If context selection mode is enabled, a drag with {scene-edit-primary} or {scene-edit-secondary} not "
                 "starting on an instance will have the same effect</li>"
-            "</ul>"
-            "<font color=Red>Not implemented yet</font color>");
+            "</ul>");
         addButton(":scenetoolbar/selection-mode-cube-corner", "cube-corner",
             "Cube corner to corner"
-            "<ul><li>Drag with {scene-select-primary} (make instances the selection) or {scene-select-secondary} "
-                "(invert selection state) from one corner of the selection cube to the opposite corner</li>"
+            "<ul><li>Drag with {scene-select-primary} for primary select or {scene-select-secondary} for secondary select "
+                "from one corner of the selection cube to the opposite corner</li>"
             "<li>The selection cube is aligned to the word space axis</li>"
             "<li>If context selection mode is enabled, a drag with {scene-edit-primary} or {scene-edit-secondary} not "
                 "starting on an instance will have the same effect</li>"
-            "</ul>"
-            "<font color=Red>Not implemented yet</font color>");
+            "</ul>");
         addButton(":scenetoolbar/selection-mode-cube-sphere", "sphere",
             "Centred sphere"
-            "<ul><li>Drag with {scene-select-primary} (make instances the selection) or {scene-select-secondary} "
-                "(invert selection state) from the centre of the selection sphere outwards</li>"
+            "<ul><li>Drag with {scene-select-primary} for primary select or {scene-select-secondary} for secondary select  "
+                "from the centre of the selection sphere outwards</li>"
             "<li>If context selection mode is enabled, a drag with {scene-edit-primary} or {scene-edit-secondary} not "
                 "starting on an instance will have the same effect</li>"
-            "</ul>"
-            "<font color=Red>Not implemented yet</font color>");
+            "</ul>");
 
         mSelectAll = new QAction("Select all", this);
         mDeselectAll = new QAction("Clear selection", this);
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.cpp b/apps/opencs/view/render/unpagedworldspacewidget.cpp
index b1088aa60e..c4fef45dd7 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.cpp
@@ -140,6 +140,16 @@ void CSVRender::UnpagedWorldspaceWidget::selectAllWithSameParentId (int elementM
     flagAsModified();
 }
 
+void CSVRender::UnpagedWorldspaceWidget::selectInsideCube(const osg::Vec3d& pointA, const osg::Vec3d& pointB, DragMode dragMode)
+{
+    mCell->selectInsideCube (pointA, pointB, dragMode);
+}
+
+void CSVRender::UnpagedWorldspaceWidget::selectWithinDistance(const osg::Vec3d& point, float distance, DragMode dragMode)
+{
+    mCell->selectWithinDistance (point, distance, dragMode);
+}
+
 std::string CSVRender::UnpagedWorldspaceWidget::getCellId (const osg::Vec3f& point) const
 {
     return mCellId;
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.hpp b/apps/opencs/view/render/unpagedworldspacewidget.hpp
index eec1b01f34..83233c3270 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.hpp
@@ -60,6 +60,10 @@ namespace CSVRender
             /// \param elementMask Elements to be affected by the select operation
             void selectAllWithSameParentId (int elementMask) override;
 
+            void selectInsideCube(const osg::Vec3d& pointA, const osg::Vec3d& pointB, DragMode dragMode) override;
+
+            void selectWithinDistance(const osg::Vec3d& point, float distance, DragMode dragMode) override;
+
             std::string getCellId (const osg::Vec3f& point) const override;
 
             Cell* getCell(const osg::Vec3d& point) const override;
diff --git a/apps/opencs/view/render/worldspacewidget.hpp b/apps/opencs/view/render/worldspacewidget.hpp
index 3b8cf70c2a..5e224b3803 100644
--- a/apps/opencs/view/render/worldspacewidget.hpp
+++ b/apps/opencs/view/render/worldspacewidget.hpp
@@ -7,6 +7,7 @@
 #include "../../model/doc/document.hpp"
 #include "../../model/world/tablemimedata.hpp"
 
+#include "instancedragmodes.hpp"
 #include "scenewidget.hpp"
 #include "mask.hpp"
 
@@ -160,6 +161,10 @@ namespace CSVRender
             /// \param elementMask Elements to be affected by the select operation
             virtual void selectAllWithSameParentId (int elementMask) = 0;
 
+            virtual void selectInsideCube(const osg::Vec3d& pointA, const osg::Vec3d& pointB, DragMode dragMode) = 0;
+
+            virtual void selectWithinDistance(const osg::Vec3d& point, float distance, DragMode dragMode) = 0;
+
             /// Return the next intersection with scene elements matched by
             /// \a interactionMask based on \a localPos and the camera vector.
             /// If there is no such intersection, instead a point "in front" of \a localPos will be

From 7b54415c40a184b2cd4c41e726f63d61ad3ab41a Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 9 Jan 2021 21:38:56 +0100
Subject: [PATCH 0204/2859] Fix reference binding to null

/usr/include/c++/10.2.0/bits/stl_vector.h:1046:34: runtime error: reference binding to null pointer of type 'value_type'
    #0 0x55e37f50008a in std::vector<char, std::allocator<char> >::operator[](unsigned long) /usr/include/c++/10.2.0/bits/stl_vector.h:1046
    #1 0x55e37f50008a in ESM::SavedGame::load(ESM::ESMReader&) /home/elsid/dev/openmw/components/esm/savedgame.cpp:28
    #2 0x55e37e726139 in MWState::Character::addSlot(boost::filesystem::path const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) /home/elsid/dev/openmw/apps/openmw/mwstate/character.cpp:31
    #3 0x55e37e742b39 in MWState::Character::Character(boost::filesystem::path const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) /home/elsid/dev/openmw/apps/openmw/mwstate/character.cpp:88
    #4 0x55e37e7006e1 in MWState::CharacterManager::CharacterManager(boost::filesystem::path const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) /home/elsid/dev/openmw/apps/openmw/mwstate/charactermanager.cpp:25
    #5 0x55e37e6d4140 in MWState::StateManager::StateManager(boost::filesystem::path const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) /home/elsid/dev/openmw/apps/openmw/mwstate/statemanagerimp.cpp:90
    #6 0x55e37e82595a in OMW::Engine::prepareEngine(Settings::Manager&) /home/elsid/dev/openmw/apps/openmw/engine.cpp:641
    #7 0x55e37e8439fd in OMW::Engine::go() /home/elsid/dev/openmw/apps/openmw/engine.cpp:867
    #8 0x55e37e782760 in runApplication(int, char**) /home/elsid/dev/openmw/apps/openmw/main.cpp:289
    #9 0x55e37f6483c3 in wrapApplication(int (*)(int, char**), int, char**, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) /home/elsid/dev/openmw/components/debug/debugging.cpp:200
    #10 0x55e37ba8e3fe in main /home/elsid/dev/openmw/apps/openmw/main.cpp:301
    #11 0x7f013e845151 in __libc_start_main (/usr/lib/libc.so.6+0x28151)
    #12 0x55e37baa0e3d in _start (/home/elsid/dev/openmw/build/gcc/ubsan/openmw+0x6c11e3d)
---
 components/esm/savedgame.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/esm/savedgame.cpp b/components/esm/savedgame.cpp
index 9edcb1a671..7cb30f2dd2 100644
--- a/components/esm/savedgame.cpp
+++ b/components/esm/savedgame.cpp
@@ -25,7 +25,7 @@ void ESM::SavedGame::load (ESMReader &esm)
     esm.getSubNameIs("SCRN");
     esm.getSubHeader();
     mScreenshot.resize(esm.getSubSize());
-    esm.getExact(&mScreenshot[0], mScreenshot.size());
+    esm.getExact(mScreenshot.data(), mScreenshot.size());
 }
 
 void ESM::SavedGame::save (ESMWriter &esm) const

From d2d8a7a940b47660f7bd51cc065fbf13119c0179 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 9 Jan 2021 21:58:27 +0100
Subject: [PATCH 0205/2859] Fix passing null to memcpy

/home/elsid/dev/openmw/components/detournavigator/navmeshtilescache.cpp:36:24: runtime error: null pointer passed as argument 2, which is declared to never be null
    #0 0x55e37ba4cda5 in makeNavMeshKey /home/elsid/dev/openmw/components/detournavigator/navmeshtilescache.cpp:36
    #1 0x55e37ba4cda5 in DetourNavigator::NavMeshTilesCache::set(osg::Vec3f const&, osg::Vec2i const&, DetourNavigator::RecastMesh const&, std::vector<DetourNavigator::OffMeshConnection, std::allocator<DetourNavigator::OffMeshConnection> > const&, DetourNavigator::NavMeshData&&) /home/elsid/dev/openmw/components/detournavigator/navmeshtilescache.cpp:81
    #2 0x55e37fe3c861 in DetourNavigator::updateNavMesh(osg::Vec3f const&, DetourNavigator::RecastMesh const*, osg::Vec2i const&, osg::Vec2i const&, std::vector<DetourNavigator::OffMeshConnection, std::allocator<DetourNavigator::OffMeshConnection> > const&, DetourNavigator::Settings const&, std::shared_ptr<Misc::ScopeGuarded<DetourNavigator::NavMeshCacheItem> > const&, DetourNavigator::NavMeshTilesCache&) /home/elsid/dev/openmw/components/detournavigator/makenavmesh.cpp:582
    #3 0x55e37fb796ce in DetourNavigator::AsyncNavMeshUpdater::processJob(DetourNavigator::AsyncNavMeshUpdater::Job const&) /home/elsid/dev/openmw/components/detournavigator/asyncnavmeshupdater.cpp:178
    #4 0x55e37fb9a125 in DetourNavigator::AsyncNavMeshUpdater::process() /home/elsid/dev/openmw/components/detournavigator/asyncnavmeshupdater.cpp:144
    #5 0x7f013f585c23 in execute_native_thread_routine /build/gcc/src/gcc/libstdc++-v3/src/c++11/thread.cc:80
    #6 0x7f013f8c63e8 in start_thread (/usr/lib/libpthread.so.0+0x93e8)
    #7 0x7f013e91d292 in __GI___clone (/usr/lib/libc.so.6+0x100292)
---
 .../detournavigator/navmeshtilescache.cpp     | 31 +++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/components/detournavigator/navmeshtilescache.cpp b/components/detournavigator/navmeshtilescache.cpp
index f554cd4143..cff93ac0e5 100644
--- a/components/detournavigator/navmeshtilescache.cpp
+++ b/components/detournavigator/navmeshtilescache.cpp
@@ -21,19 +21,32 @@ namespace DetourNavigator
             std::vector<unsigned char> result(indicesSize + verticesSize + areaTypesSize + waterSize + offMeshConnectionsSize);
             unsigned char* dst = result.data();
 
-            std::memcpy(dst, recastMesh.getIndices().data(), indicesSize);
-            dst += indicesSize;
+            if (indicesSize > 0)
+            {
+                std::memcpy(dst, recastMesh.getIndices().data(), indicesSize);
+                dst += indicesSize;
+            }
 
-            std::memcpy(dst, recastMesh.getVertices().data(), verticesSize);
-            dst += verticesSize;
+            if (verticesSize > 0)
+            {
+                std::memcpy(dst, recastMesh.getVertices().data(), verticesSize);
+                dst += verticesSize;
+            }
 
-            std::memcpy(dst, recastMesh.getAreaTypes().data(), areaTypesSize);
-            dst += areaTypesSize;
+            if (areaTypesSize > 0)
+            {
+                std::memcpy(dst, recastMesh.getAreaTypes().data(), areaTypesSize);
+                dst += areaTypesSize;
+            }
 
-            std::memcpy(dst, recastMesh.getWater().data(), waterSize);
-            dst += waterSize;
+            if (waterSize > 0)
+            {
+                std::memcpy(dst, recastMesh.getWater().data(), waterSize);
+                dst += waterSize;
+            }
 
-            std::memcpy(dst, offMeshConnections.data(), offMeshConnectionsSize);
+            if (offMeshConnectionsSize > 0)
+                std::memcpy(dst, offMeshConnections.data(), offMeshConnectionsSize);
 
             return result;
         }

From 5f1d3e0e2fb2c209d7ad23c6c53d69d4258e6788 Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Sat, 9 Jan 2021 22:20:57 +0200
Subject: [PATCH 0206/2859] Use the Topic ID of the cloned target from
 topicinfos

---
 apps/opencs/model/world/collection.hpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/apps/opencs/model/world/collection.hpp b/apps/opencs/model/world/collection.hpp
index 451ef9d0e1..f657c67a1c 100644
--- a/apps/opencs/model/world/collection.hpp
+++ b/apps/opencs/model/world/collection.hpp
@@ -15,6 +15,7 @@
 
 #include "columnbase.hpp"
 #include "collectionbase.hpp"
+#include "info.hpp"
 #include "land.hpp"
 #include "landtexture.hpp"
 #include "ref.hpp"
@@ -264,6 +265,13 @@ namespace CSMWorld
             CSMWorld::CellRef* ptr = (CSMWorld::CellRef*) &copy.mModified;
             ptr->mRefNum.mIndex = 0;
         }
+        if (type == UniversalId::Type_TopicInfo || type == UniversalId::Type_JournalInfo)
+        {
+            CSMWorld::Info* ptr = (CSMWorld::Info*) &copy.mModified;
+            std::vector<std::string> splitStringContainer;
+            Misc::StringUtils::split(destination, splitStringContainer, "#");
+            ptr->mTopicId = splitStringContainer[0];
+        }
 
         int index = getAppendIndex(destination, type);
         insertRecord(copy, getAppendIndex(destination, type));

From 29416269b27434f0e1bf7854f736fb2ada47c9eb Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Sun, 10 Jan 2021 01:07:03 +0200
Subject: [PATCH 0207/2859] Update changelog

---
 CHANGELOG.md    | 1 +
 CHANGELOG_PR.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee84ae6d70..123936d42e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@
     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 #4363: Editor: 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
diff --git a/CHANGELOG_PR.md b/CHANGELOG_PR.md
index fdf27dc932..f70fbad575 100644
--- a/CHANGELOG_PR.md
+++ b/CHANGELOG_PR.md
@@ -35,6 +35,7 @@ Bug Fixes:
 
 Editor Bug Fixes:
 - Deleted and moved objects within a cell are now saved properly (#832)
+- 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)
 - Loading mods now keeps the master index (#5675)
 - Flicker and crashing on XFCE4 fixed (#5703)

From 3045d20a970afd0da6a63081186e545ca940bfe6 Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Sun, 10 Jan 2021 01:25:40 +0200
Subject: [PATCH 0208/2859] Make sure that vector isn't empty, just in case

---
 apps/opencs/model/world/collection.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/opencs/model/world/collection.hpp b/apps/opencs/model/world/collection.hpp
index f657c67a1c..16ebb3a616 100644
--- a/apps/opencs/model/world/collection.hpp
+++ b/apps/opencs/model/world/collection.hpp
@@ -270,7 +270,7 @@ namespace CSMWorld
             CSMWorld::Info* ptr = (CSMWorld::Info*) &copy.mModified;
             std::vector<std::string> splitStringContainer;
             Misc::StringUtils::split(destination, splitStringContainer, "#");
-            ptr->mTopicId = splitStringContainer[0];
+            if (!splitStringContainer.empty()) ptr->mTopicId = splitStringContainer[0];
         }
 
         int index = getAppendIndex(destination, type);

From a257567b8077a0c272eb987569947e4cdac3ad71 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 10 Jan 2021 08:04:06 +0000
Subject: [PATCH 0209/2859] Don't update magic effects when unequipping items
 to equip something else

---
 CHANGELOG.md                           | 1 +
 apps/openmw/mwworld/inventorystore.cpp | 9 +++++----
 apps/openmw/mwworld/inventorystore.hpp | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa35722820..db1e4042c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -81,6 +81,7 @@
     Bug #5661: Region sounds don't play at the right interval
     Bug #5675: OpenMW-cs. FRMR subrecords are saved with the wrong MastIdx
     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
diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp
index 38007c1cbb..c9b1d8bc1f 100644
--- a/apps/openmw/mwworld/inventorystore.cpp
+++ b/apps/openmw/mwworld/inventorystore.cpp
@@ -762,7 +762,7 @@ int MWWorld::InventoryStore::remove(const Ptr& item, int count, const Ptr& actor
     return retCount;
 }
 
-MWWorld::ContainerStoreIterator MWWorld::InventoryStore::unequipSlot(int slot, const MWWorld::Ptr& actor, bool fireEvent)
+MWWorld::ContainerStoreIterator MWWorld::InventoryStore::unequipSlot(int slot, const MWWorld::Ptr& actor, bool applyUpdates)
 {
     if (slot<0 || slot>=static_cast<int> (mSlots.size()))
         throw std::runtime_error ("slot number out of range");
@@ -794,10 +794,11 @@ MWWorld::ContainerStoreIterator MWWorld::InventoryStore::unequipSlot(int slot, c
             }
         }
 
-        if (fireEvent)
+        if (applyUpdates)
+        {
             fireEquipmentChangedEvent(actor);
-
-        updateMagicEffects(actor);
+            updateMagicEffects(actor);
+        }
 
         return retval;
     }
diff --git a/apps/openmw/mwworld/inventorystore.hpp b/apps/openmw/mwworld/inventorystore.hpp
index df69a57090..bfe0a99922 100644
--- a/apps/openmw/mwworld/inventorystore.hpp
+++ b/apps/openmw/mwworld/inventorystore.hpp
@@ -173,7 +173,7 @@ namespace MWWorld
             ///
             /// @return the number of items actually removed
 
-            ContainerStoreIterator unequipSlot(int slot, const Ptr& actor, bool fireEvent=true);
+            ContainerStoreIterator unequipSlot(int slot, const Ptr& actor, bool applyUpdates = true);
             ///< Unequip \a slot.
             ///
             /// @return an iterator to the item that was previously in the slot

From d015f17a6ce290a0a338db51745dc9a98329cba6 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Fri, 25 Dec 2020 18:20:42 +0100
Subject: [PATCH 0210/2859] Make all physics object manage their own resources
 Use smart pointer for heightfields and their members. Move collision object
 addition inside of Object's ctor, as for Actors and HeightFields

---
 apps/openmw/mwphysics/actor.cpp         |  5 ++---
 apps/openmw/mwphysics/heightfield.cpp   | 25 +++++++++++++------------
 apps/openmw/mwphysics/heightfield.hpp   | 11 ++++++++---
 apps/openmw/mwphysics/object.cpp        | 12 ++++++------
 apps/openmw/mwphysics/object.hpp        |  2 +-
 apps/openmw/mwphysics/physicssystem.cpp | 24 ++++--------------------
 apps/openmw/mwphysics/physicssystem.hpp |  2 +-
 apps/openmw/mwphysics/projectile.cpp    | 11 ++++-------
 8 files changed, 39 insertions(+), 53 deletions(-)

diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index 3b7b0d0616..3b52ee934f 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -58,7 +58,7 @@ Actor::Actor(const MWWorld::Ptr& ptr, const Resource::BulletShape* shape, Physic
 
     mConvexShape = static_cast<btConvexShape*>(mShape.get());
 
-    mCollisionObject.reset(new btCollisionObject);
+    mCollisionObject = std::make_unique<btCollisionObject>();
     mCollisionObject->setCollisionFlags(btCollisionObject::CF_KINEMATIC_OBJECT);
     mCollisionObject->setActivationState(DISABLE_DEACTIVATION);
     mCollisionObject->setCollisionShape(mShape.get());
@@ -76,8 +76,7 @@ Actor::Actor(const MWWorld::Ptr& ptr, const Resource::BulletShape* shape, Physic
 
 Actor::~Actor()
 {
-    if (mCollisionObject)
-        mTaskScheduler->removeCollisionObject(mCollisionObject.get());
+    mTaskScheduler->removeCollisionObject(mCollisionObject.get());
 }
 
 void Actor::enableCollisionMode(bool collision)
diff --git a/apps/openmw/mwphysics/heightfield.cpp b/apps/openmw/mwphysics/heightfield.cpp
index e1448116bf..436cdfe8fa 100644
--- a/apps/openmw/mwphysics/heightfield.cpp
+++ b/apps/openmw/mwphysics/heightfield.cpp
@@ -1,4 +1,5 @@
 #include "heightfield.hpp"
+#include "mtphysics.hpp"
 
 #include <osg/Object>
 
@@ -42,10 +43,12 @@ namespace
 
 namespace MWPhysics
 {
-    HeightField::HeightField(const float* heights, int x, int y, float triSize, float sqrtVerts, float minH, float maxH, const osg::Object* holdObject)
-        : mHeights(makeHeights(heights, sqrtVerts))
+    HeightField::HeightField(const float* heights, int x, int y, float triSize, float sqrtVerts, float minH, float maxH, const osg::Object* holdObject, PhysicsTaskScheduler* scheduler)
+        : mHoldObject(holdObject)
+        , mHeights(makeHeights(heights, sqrtVerts))
+        , mTaskScheduler(scheduler)
     {
-        mShape = new btHeightfieldTerrainShape(
+        mShape = std::make_unique<btHeightfieldTerrainShape>(
             sqrtVerts, sqrtVerts,
             getHeights(heights, mHeights),
             1,
@@ -60,31 +63,29 @@ namespace MWPhysics
                                           (y+0.5f) * triSize * (sqrtVerts-1),
                                           (maxH+minH)*0.5f));
 
-        mCollisionObject = new btCollisionObject;
-        mCollisionObject->setCollisionShape(mShape);
+        mCollisionObject = std::make_unique<btCollisionObject>();
+        mCollisionObject->setCollisionShape(mShape.get());
         mCollisionObject->setWorldTransform(transform);
-
-        mHoldObject = holdObject;
+        mTaskScheduler->addCollisionObject(mCollisionObject.get(), CollisionType_HeightMap, CollisionType_Actor|CollisionType_Projectile);
     }
 
     HeightField::~HeightField()
     {
-        delete mCollisionObject;
-        delete mShape;
+        mTaskScheduler->removeCollisionObject(mCollisionObject.get());
     }
 
     btCollisionObject* HeightField::getCollisionObject()
     {
-        return mCollisionObject;
+        return mCollisionObject.get();
     }
 
     const btCollisionObject* HeightField::getCollisionObject() const
     {
-        return mCollisionObject;
+        return mCollisionObject.get();
     }
 
     const btHeightfieldTerrainShape* HeightField::getShape() const
     {
-        return mShape;
+        return mShape.get();
     }
 }
diff --git a/apps/openmw/mwphysics/heightfield.hpp b/apps/openmw/mwphysics/heightfield.hpp
index 2ba58afff8..c76f8b9437 100644
--- a/apps/openmw/mwphysics/heightfield.hpp
+++ b/apps/openmw/mwphysics/heightfield.hpp
@@ -5,6 +5,7 @@
 
 #include <LinearMath/btScalar.h>
 
+#include <memory>
 #include <vector>
 
 class btCollisionObject;
@@ -17,10 +18,12 @@ namespace osg
 
 namespace MWPhysics
 {
+    class PhysicsTaskScheduler;
+
     class HeightField
     {
     public:
-        HeightField(const float* heights, int x, int y, float triSize, float sqrtVerts, float minH, float maxH, const osg::Object* holdObject);
+        HeightField(const float* heights, int x, int y, float triSize, float sqrtVerts, float minH, float maxH, const osg::Object* holdObject, PhysicsTaskScheduler* scheduler);
         ~HeightField();
 
         btCollisionObject* getCollisionObject();
@@ -28,11 +31,13 @@ namespace MWPhysics
         const btHeightfieldTerrainShape* getShape() const;
 
     private:
-        btHeightfieldTerrainShape* mShape;
-        btCollisionObject* mCollisionObject;
+        std::unique_ptr<btHeightfieldTerrainShape> mShape;
+        std::unique_ptr<btCollisionObject> mCollisionObject;
         osg::ref_ptr<const osg::Object> mHoldObject;
         std::vector<btScalar> mHeights;
 
+        PhysicsTaskScheduler* mTaskScheduler;
+
         void operator=(const HeightField&);
         HeightField(const HeightField&);
     };
diff --git a/apps/openmw/mwphysics/object.cpp b/apps/openmw/mwphysics/object.cpp
index 910f7bf15c..e3615989dd 100644
--- a/apps/openmw/mwphysics/object.cpp
+++ b/apps/openmw/mwphysics/object.cpp
@@ -14,29 +14,29 @@
 
 namespace MWPhysics
 {
-    Object::Object(const MWWorld::Ptr& ptr, osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance, PhysicsTaskScheduler* scheduler)
+    Object::Object(const MWWorld::Ptr& ptr, osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance, int collisionType, PhysicsTaskScheduler* scheduler)
         : mShapeInstance(shapeInstance)
         , mSolid(true)
         , mTaskScheduler(scheduler)
     {
         mPtr = ptr;
 
-        mCollisionObject.reset(new btCollisionObject);
+        mCollisionObject = std::make_unique<btCollisionObject>();
         mCollisionObject->setCollisionShape(shapeInstance->getCollisionShape());
 
         mCollisionObject->setUserPointer(this);
 
         setScale(ptr.getCellRef().getScale());
         setRotation(Misc::Convert::toBullet(ptr.getRefData().getBaseNode()->getAttitude()));
-        const float* pos = ptr.getRefData().getPosition().pos;
-        setOrigin(btVector3(pos[0], pos[1], pos[2]));
+        setOrigin(Misc::Convert::toBullet(ptr.getRefData().getPosition().asVec3()));
         commitPositionChange();
+
+        mTaskScheduler->addCollisionObject(mCollisionObject.get(), collisionType, CollisionType_Actor|CollisionType_HeightMap|CollisionType_Projectile);
     }
 
     Object::~Object()
     {
-        if (mCollisionObject)
-            mTaskScheduler->removeCollisionObject(mCollisionObject.get());
+        mTaskScheduler->removeCollisionObject(mCollisionObject.get());
     }
 
     const Resource::BulletShapeInstance* Object::getShapeInstance() const
diff --git a/apps/openmw/mwphysics/object.hpp b/apps/openmw/mwphysics/object.hpp
index 876e35651f..cae8771809 100644
--- a/apps/openmw/mwphysics/object.hpp
+++ b/apps/openmw/mwphysics/object.hpp
@@ -26,7 +26,7 @@ namespace MWPhysics
     class Object final : public PtrHolder
     {
     public:
-        Object(const MWWorld::Ptr& ptr, osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance, PhysicsTaskScheduler* scheduler);
+        Object(const MWWorld::Ptr& ptr, osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance, int collisionType, PhysicsTaskScheduler* scheduler);
         ~Object() override;
 
         const Resource::BulletShapeInstance* getShapeInstance() const;
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index b50366ade9..95d1ec70aa 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -107,12 +107,7 @@ namespace MWPhysics
         if (mWaterCollisionObject)
             mTaskScheduler->removeCollisionObject(mWaterCollisionObject.get());
 
-        for (auto& heightField : mHeightFields)
-        {
-            mTaskScheduler->removeCollisionObject(heightField.second->getCollisionObject());
-            delete heightField.second;
-        }
-
+        mHeightFields.clear();
         mObjects.clear();
         mActors.clear();
         mProjectiles.clear();
@@ -442,22 +437,14 @@ namespace MWPhysics
 
     void PhysicsSystem::addHeightField (const float* heights, int x, int y, float triSize, float sqrtVerts, float minH, float maxH, const osg::Object* holdObject)
     {
-        HeightField *heightfield = new HeightField(heights, x, y, triSize, sqrtVerts, minH, maxH, holdObject);
-        mHeightFields[std::make_pair(x,y)] = heightfield;
-
-        mTaskScheduler->addCollisionObject(heightfield->getCollisionObject(), CollisionType_HeightMap,
-            CollisionType_Actor|CollisionType_Projectile);
+        mHeightFields[std::make_pair(x,y)] = std::make_unique<HeightField>(heights, x, y, triSize, sqrtVerts, minH, maxH, holdObject, mTaskScheduler.get());
     }
 
     void PhysicsSystem::removeHeightField (int x, int y)
     {
         HeightFieldMap::iterator heightfield = mHeightFields.find(std::make_pair(x,y));
         if(heightfield != mHeightFields.end())
-        {
-            mTaskScheduler->removeCollisionObject(heightfield->second->getCollisionObject());
-            delete heightfield->second;
             mHeightFields.erase(heightfield);
-        }
     }
 
     const HeightField* PhysicsSystem::getHeightField(int x, int y) const
@@ -465,7 +452,7 @@ namespace MWPhysics
         const auto heightField = mHeightFields.find(std::make_pair(x, y));
         if (heightField == mHeightFields.end())
             return nullptr;
-        return heightField->second;
+        return heightField->second.get();
     }
 
     void PhysicsSystem::addObject (const MWWorld::Ptr& ptr, const std::string& mesh, int collisionType)
@@ -474,14 +461,11 @@ namespace MWPhysics
         if (!shapeInstance || !shapeInstance->getCollisionShape())
             return;
 
-        auto obj = std::make_shared<Object>(ptr, shapeInstance, mTaskScheduler.get());
+        auto obj = std::make_shared<Object>(ptr, shapeInstance, collisionType, mTaskScheduler.get());
         mObjects.emplace(ptr, obj);
 
         if (obj->isAnimated())
             mAnimatedObjects.insert(obj.get());
-
-        mTaskScheduler->addCollisionObject(obj->getCollisionObject(), collisionType,
-                                           CollisionType_Actor|CollisionType_HeightMap|CollisionType_Projectile);
     }
 
     void PhysicsSystem::remove(const MWWorld::Ptr &ptr)
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 2de8d153b9..4492099743 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -274,7 +274,7 @@ namespace MWPhysics
             using ProjectileMap = std::map<int, std::shared_ptr<Projectile>>;
             ProjectileMap mProjectiles;
 
-            using HeightFieldMap = std::map<std::pair<int, int>, HeightField *>;
+            using HeightFieldMap = std::map<std::pair<int, int>, std::unique_ptr<HeightField>>;
             HeightFieldMap mHeightFields;
 
             bool mDebugDrawEnabled;
diff --git a/apps/openmw/mwphysics/projectile.cpp b/apps/openmw/mwphysics/projectile.cpp
index a8aaeb72a4..1b9beca5ff 100644
--- a/apps/openmw/mwphysics/projectile.cpp
+++ b/apps/openmw/mwphysics/projectile.cpp
@@ -28,7 +28,7 @@ Projectile::Projectile(int projectileId, const MWWorld::Ptr& caster, const osg::
     mShape.reset(new btSphereShape(1.f));
     mConvexShape = static_cast<btConvexShape*>(mShape.get());
 
-    mCollisionObject.reset(new btCollisionObject);
+    mCollisionObject = std::make_unique<btCollisionObject>();
     mCollisionObject->setCollisionFlags(btCollisionObject::CF_KINEMATIC_OBJECT);
     mCollisionObject->setActivationState(DISABLE_DEACTIVATION);
     mCollisionObject->setCollisionShape(mShape.get());
@@ -45,12 +45,9 @@ Projectile::Projectile(int projectileId, const MWWorld::Ptr& caster, const osg::
 
 Projectile::~Projectile()
 {
-    if (mCollisionObject)
-    {
-        if (!mActive)
-            mPhysics->reportCollision(mHitPosition, mHitNormal);
-        mTaskScheduler->removeCollisionObject(mCollisionObject.get());
-    }
+    if (!mActive)
+        mPhysics->reportCollision(mHitPosition, mHitNormal);
+    mTaskScheduler->removeCollisionObject(mCollisionObject.get());
 }
 
 void Projectile::commitPositionChange()

From 1ab4683dcecb4947b81dcf6606407b6c46a1eacb Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 28 Dec 2020 19:19:07 +0100
Subject: [PATCH 0211/2859] Tweak follow distance to be more like the original

---
 apps/openmw/mwmechanics/aifollow.cpp | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwmechanics/aifollow.cpp b/apps/openmw/mwmechanics/aifollow.cpp
index f31be9c10a..ec23679977 100644
--- a/apps/openmw/mwmechanics/aifollow.cpp
+++ b/apps/openmw/mwmechanics/aifollow.cpp
@@ -14,6 +14,16 @@
 #include "movement.hpp"
 #include "steering.hpp"
 
+namespace
+{
+osg::Vec3f::value_type getHalfExtents(const MWWorld::ConstPtr& actor)
+{
+    if(actor.getClass().isNpc())
+        return 64;
+    return MWBase::Environment::get().getWorld()->getHalfExtents(actor).y();
+}
+}
+
 namespace MWMechanics
 {
 int AiFollow::mFollowIndexCounter = 0;
@@ -121,13 +131,14 @@ bool AiFollow::execute (const MWWorld::Ptr& actor, CharacterController& characte
     {
         for(auto& follower : followers)
         {
-            auto halfExtent = MWBase::Environment::get().getWorld()->getHalfExtents(follower.second).y();
+            auto halfExtent = getHalfExtents(follower.second);
             if(halfExtent > floatingDistance)
                 floatingDistance = halfExtent;
         }
+        floatingDistance += 128;
     }
-    floatingDistance += MWBase::Environment::get().getWorld()->getHalfExtents(target).y();
-    floatingDistance += MWBase::Environment::get().getWorld()->getHalfExtents(actor).y() * 2;
+    floatingDistance += getHalfExtents(target) + 64;
+    floatingDistance += getHalfExtents(actor) * 2;
     short followDistance = static_cast<short>(floatingDistance);
 
     if (!mAlwaysFollow) //Update if you only follow for a bit

From 14dd11372f3e76a7289d929387ef38c06f0fbc8d Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Tue, 5 Jan 2021 22:20:09 +0100
Subject: [PATCH 0212/2859] Utility functions for little-endian <-> big-endian
 conversion.

---
 components/misc/endianness.hpp | 82 ++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 components/misc/endianness.hpp

diff --git a/components/misc/endianness.hpp b/components/misc/endianness.hpp
new file mode 100644
index 0000000000..1b43e584e5
--- /dev/null
+++ b/components/misc/endianness.hpp
@@ -0,0 +1,82 @@
+#ifndef COMPONENTS_MISC_ENDIANNESS_H
+#define COMPONENTS_MISC_ENDIANNESS_H
+
+#include <cstdint>
+
+namespace Misc
+{
+
+    // Two-way conversion little-endian <-> big-endian
+    template <typename T>
+    void swapEndiannessInplace(T& v)
+    {
+        static_assert(std::is_arithmetic_v<T>);
+        static_assert(sizeof(T) == 1 || sizeof(T) == 2 || sizeof(T) == 4 || sizeof(T) == 8);
+
+        if constexpr (sizeof(T) == 2)
+        {
+            uint16_t& v16 = *reinterpret_cast<uint16_t*>(&v);
+            v16 = (v16 >> 8) | (v16 << 8);
+        }
+        if constexpr (sizeof(T) == 4)
+        {
+            uint32_t& v32 = *reinterpret_cast<uint32_t*>(&v);
+            v32 = (v32 >> 24) | ((v32 >> 8) & 0xff00) | ((v32 & 0xff00) << 8) || v32 << 24;
+        }
+        if constexpr (sizeof(T) == 8)
+        {
+            uint64_t& v64 = *reinterpret_cast<uint64_t*>(&v);
+            v64 = (v64 >> 56) | ((v64 & 0x00ff'0000'0000'0000) >> 40) | ((v64 & 0x0000'ff00'0000'0000) >> 24)
+                | ((v64 & 0x0000'00ff'0000'0000) >> 8) | ((v64 & 0x0000'0000'ff00'0000) << 8)
+                | ((v64 & 0x0000'0000'00ff'0000) << 24) | ((v64 & 0x0000'0000'0000'ff00) << 40) | (v64 << 56);
+        }
+    }
+
+    #ifdef _WIN32
+    constexpr bool IS_LITTLE_ENDIAN = true;
+    constexpr bool IS_BIG_ENDIAN = false;
+    #else
+    constexpr bool IS_LITTLE_ENDIAN = __BYTE_ORDER__ != __ORDER_BIG_ENDIAN__;
+    constexpr bool IS_BIG_ENDIAN = __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__;
+    #endif
+
+    // Usage: swapEndiannessInplaceIf<IS_BIG_ENDIAN>(v)  - native to little-endian or back
+    //        swapEndiannessInplaceIf<IS_LITTLE_ENDIAN>(v)  - native to big-endian or back
+    template <bool C, typename T>
+    void swapEndiannessInplaceIf(T& v)
+    {
+        static_assert(std::is_arithmetic_v<T>);
+        static_assert(sizeof(T) == 1 || sizeof(T) == 2 || sizeof(T) == 4 || sizeof(T) == 8);
+        if constexpr (C)
+            swapEndiannessInplace(v);
+    }
+
+    template <typename T>
+    T toLittleEndian(T v)
+    {
+        swapEndiannessInplaceIf<IS_BIG_ENDIAN>(v);
+        return v;
+    }
+    template <typename T>
+    T fromLittleEndian(T v)
+    {
+        swapEndiannessInplaceIf<IS_BIG_ENDIAN>(v);
+        return v;
+    }
+
+    template <typename T>
+    T toBigEndian(T v)
+    {
+        swapEndiannessInplaceIf<IS_LITTLE_ENDIAN>(v);
+        return v;
+    }
+    template <typename T>
+    T fromBigEndian(T v)
+    {
+        swapEndiannessInplaceIf<IS_LITTLE_ENDIAN>(v);
+        return v;
+    }
+
+}
+
+#endif // COMPONENTS_MISC_ENDIANNESS_H

From eaaa2f4a1c4daff1e035208eda662476449a4a1f Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Fri, 8 Jan 2021 23:02:19 +0100
Subject: [PATCH 0213/2859] Use misc/endianness.hpp in components/nif/nifstream

---
 components/nif/nifstream.cpp |  2 +-
 components/nif/nifstream.hpp | 98 +++++++++++++-----------------------
 2 files changed, 35 insertions(+), 65 deletions(-)

diff --git a/components/nif/nifstream.cpp b/components/nif/nifstream.cpp
index 69f1a905b0..07c9c917ce 100644
--- a/components/nif/nifstream.cpp
+++ b/components/nif/nifstream.cpp
@@ -7,7 +7,7 @@ namespace Nif
     osg::Quat NIFStream::getQuaternion()
     {
         float f[4];
-        readLittleEndianBufferOfType<4, float,uint32_t>(inp, (float*)&f);
+        readLittleEndianBufferOfType<4, float>(inp, (float*)&f);
         osg::Quat quat;
         quat.w() = f[0];
         quat.x() = f[1];
diff --git a/components/nif/nifstream.hpp b/components/nif/nifstream.hpp
index 97075c288c..4d221b8676 100644
--- a/components/nif/nifstream.hpp
+++ b/components/nif/nifstream.hpp
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include <components/files/constrainedfilestream.hpp>
+#include <components/misc/endianness.hpp>
 
 #include <osg/Vec3f>
 #include <osg/Vec4f>
@@ -22,61 +23,30 @@ namespace Nif
 class NIFFile;
 
 /* 
-    readLittleEndianBufferOfType: This template should only be used with non POD data types
+    readLittleEndianBufferOfType: This template should only be used with arithmetic types
 */
-template <uint32_t numInstances, typename T, typename IntegerT> inline void readLittleEndianBufferOfType(Files::IStreamPtr &pIStream, T* dest)
+template <uint32_t numInstances, typename T> inline void readLittleEndianBufferOfType(Files::IStreamPtr &pIStream, T* dest)
 {
-#if defined(__x86_64__) || defined(_M_X64) || defined(__i386) || defined(_M_IX86)
     pIStream->read((char*)dest, numInstances * sizeof(T));
-#else
-    uint8_t* destByteBuffer = (uint8_t*)dest;
-    pIStream->read((char*)dest, numInstances * sizeof(T));
-    /*
-        Due to the loop iterations being known at compile time,
-        this nested loop will most likely be unrolled
-        For example, for 2 instances of a 4 byte data type, you should get the below result
-    */
-    union {
-        IntegerT i;
-        T t;
-    } u;
-    for (uint32_t i = 0; i < numInstances; i++)
-    {
-        u = { 0 };
-        for (uint32_t byte = 0; byte < sizeof(T); byte++)
-            u.i |= (((IntegerT)destByteBuffer[i * sizeof(T) + byte]) << (byte * 8));
-        dest[i] = u.t;
-    }
-#endif
+    if constexpr (Misc::IS_BIG_ENDIAN)
+        for (uint32_t i = 0; i < numInstances; i++)
+            Misc::swapEndiannessInplace(dest[i]);
 }
 
 /*
-    readLittleEndianDynamicBufferOfType: This template should only be used with non POD data types
+    readLittleEndianDynamicBufferOfType: This template should only be used with arithmetic types
 */
-template <typename T, typename IntegerT> inline void readLittleEndianDynamicBufferOfType(Files::IStreamPtr &pIStream, T* dest, uint32_t numInstances)
+template <typename T> inline void readLittleEndianDynamicBufferOfType(Files::IStreamPtr &pIStream, T* dest, uint32_t numInstances)
 {
-#if defined(__x86_64__) || defined(_M_X64) || defined(__i386) || defined(_M_IX86)
     pIStream->read((char*)dest, numInstances * sizeof(T));
-#else
-    uint8_t* destByteBuffer = (uint8_t*)dest;
-    pIStream->read((char*)dest, numInstances * sizeof(T));
-    union {
-        IntegerT i;
-        T t;
-    } u;
-    for (uint32_t i = 0; i < numInstances; i++)
-    {
-        u.i = 0;
-        for (uint32_t byte = 0; byte < sizeof(T); byte++)
-            u.i |= ((IntegerT)destByteBuffer[i * sizeof(T) + byte]) << (byte * 8);
-        dest[i] = u.t;
-    }
-#endif
+    if constexpr (Misc::IS_BIG_ENDIAN)
+        for (uint32_t i = 0; i < numInstances; i++)
+            Misc::swapEndiannessInplace(dest[i]);
 }
-template<typename type, typename IntegerT> type inline readLittleEndianType(Files::IStreamPtr &pIStream)
+template<typename type> type inline readLittleEndianType(Files::IStreamPtr &pIStream)
 {
     type val;
-    readLittleEndianBufferOfType<1,type,IntegerT>(pIStream, (type*)&val);
+    readLittleEndianBufferOfType<1, type>(pIStream, (type*)&val);
     return val;
 }
 
@@ -95,59 +65,59 @@ public:
 
     char getChar()
     {
-        return readLittleEndianType<char,char>(inp);
+        return readLittleEndianType<char>(inp);
     }
 
     short getShort()
     {
-        return readLittleEndianType<short,short>(inp);
+        return readLittleEndianType<short>(inp);
     }
 
     unsigned short getUShort()
     {
-        return readLittleEndianType<unsigned short,unsigned short>(inp);
+        return readLittleEndianType<unsigned short>(inp);
     }
 
     int getInt()
     {
-        return readLittleEndianType<int,int>(inp);
+        return readLittleEndianType<int>(inp);
     }
 
     unsigned int getUInt()
     {
-        return readLittleEndianType<unsigned int,unsigned int>(inp);
+        return readLittleEndianType<unsigned int>(inp);
     }
 
     float getFloat()
     {
-        return readLittleEndianType<float,uint32_t>(inp);
+        return readLittleEndianType<float>(inp);
     }
 
     osg::Vec2f getVector2()
     {
         osg::Vec2f vec;
-        readLittleEndianBufferOfType<2,float,uint32_t>(inp, (float*)&vec._v[0]);
+        readLittleEndianBufferOfType<2,float>(inp, (float*)&vec._v[0]);
         return vec;
     }
 
     osg::Vec3f getVector3()
     {
         osg::Vec3f vec;
-        readLittleEndianBufferOfType<3, float,uint32_t>(inp, (float*)&vec._v[0]);
+        readLittleEndianBufferOfType<3, float>(inp, (float*)&vec._v[0]);
         return vec;
     }
 
     osg::Vec4f getVector4()
     {
         osg::Vec4f vec;
-        readLittleEndianBufferOfType<4, float,uint32_t>(inp, (float*)&vec._v[0]);
+        readLittleEndianBufferOfType<4, float>(inp, (float*)&vec._v[0]);
         return vec;
     }
 
     Matrix3 getMatrix3()
     {
         Matrix3 mat;
-        readLittleEndianBufferOfType<9, float,uint32_t>(inp, (float*)&mat.mValues);
+        readLittleEndianBufferOfType<9, float>(inp, (float*)&mat.mValues);
         return mat;
     }
 
@@ -181,14 +151,14 @@ public:
     ///Read in a string of the length specified in the file
     std::string getSizedString()
     {
-        size_t size = readLittleEndianType<uint32_t,uint32_t>(inp);
+        size_t size = readLittleEndianType<uint32_t>(inp);
         return getSizedString(size);
     }
 
     ///Specific to Bethesda headers, uses a byte for length
     std::string getExportString()
     {
-        size_t size = static_cast<size_t>(readLittleEndianType<uint8_t,uint8_t>(inp));
+        size_t size = static_cast<size_t>(readLittleEndianType<uint8_t>(inp));
         return getSizedString(size);
     }
 
@@ -203,58 +173,58 @@ public:
     void getChars(std::vector<char> &vec, size_t size)
     {
         vec.resize(size);
-        readLittleEndianDynamicBufferOfType<char,char>(inp, vec.data(), size);
+        readLittleEndianDynamicBufferOfType<char>(inp, vec.data(), size);
     }
 
     void getUChars(std::vector<unsigned char> &vec, size_t size)
     {
         vec.resize(size);
-        readLittleEndianDynamicBufferOfType<unsigned char,unsigned char>(inp, vec.data(), size);
+        readLittleEndianDynamicBufferOfType<unsigned char>(inp, vec.data(), size);
     }
 
     void getUShorts(std::vector<unsigned short> &vec, size_t size)
     {
         vec.resize(size);
-        readLittleEndianDynamicBufferOfType<unsigned short,unsigned short>(inp, vec.data(), size);
+        readLittleEndianDynamicBufferOfType<unsigned short>(inp, vec.data(), size);
     }
 
     void getFloats(std::vector<float> &vec, size_t size)
     {
         vec.resize(size);
-        readLittleEndianDynamicBufferOfType<float,uint32_t>(inp, vec.data(), size);
+        readLittleEndianDynamicBufferOfType<float>(inp, vec.data(), size);
     }
 
     void getInts(std::vector<int> &vec, size_t size)
     {
         vec.resize(size);
-        readLittleEndianDynamicBufferOfType<int,int>(inp, vec.data(), size);
+        readLittleEndianDynamicBufferOfType<int>(inp, vec.data(), size);
     }
 
     void getUInts(std::vector<unsigned int> &vec, size_t size)
     {
         vec.resize(size);
-        readLittleEndianDynamicBufferOfType<unsigned int,unsigned int>(inp, vec.data(), size);
+        readLittleEndianDynamicBufferOfType<unsigned int>(inp, vec.data(), size);
     }
 
     void getVector2s(std::vector<osg::Vec2f> &vec, size_t size)
     {
         vec.resize(size);
         /* The packed storage of each Vec2f is 2 floats exactly */
-        readLittleEndianDynamicBufferOfType<float,uint32_t>(inp,(float*)vec.data(), size*2);
+        readLittleEndianDynamicBufferOfType<float>(inp,(float*)vec.data(), size*2);
     }
 
     void getVector3s(std::vector<osg::Vec3f> &vec, size_t size)
     {
         vec.resize(size);
         /* The packed storage of each Vec3f is 3 floats exactly */
-        readLittleEndianDynamicBufferOfType<float,uint32_t>(inp, (float*)vec.data(), size*3);
+        readLittleEndianDynamicBufferOfType<float>(inp, (float*)vec.data(), size*3);
     }
 
     void getVector4s(std::vector<osg::Vec4f> &vec, size_t size)
     {
         vec.resize(size);
         /* The packed storage of each Vec4f is 4 floats exactly */
-        readLittleEndianDynamicBufferOfType<float,uint32_t>(inp, (float*)vec.data(), size*4);
+        readLittleEndianDynamicBufferOfType<float>(inp, (float*)vec.data(), size*4);
     }
 
     void getQuaternions(std::vector<osg::Quat> &quat, size_t size)

From 7196ad74557d8c608a9401273a51220fd786f8db Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Sun, 10 Jan 2021 21:23:52 +0200
Subject: [PATCH 0214/2859] Implement an override-value when cloning, use when
 cloning info records

---
 apps/opencs/model/world/collection.hpp | 8 --------
 apps/opencs/model/world/commands.cpp   | 9 +++++++++
 apps/opencs/model/world/commands.hpp   | 3 +++
 apps/opencs/view/world/infocreator.cpp | 4 ++++
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/apps/opencs/model/world/collection.hpp b/apps/opencs/model/world/collection.hpp
index 16ebb3a616..451ef9d0e1 100644
--- a/apps/opencs/model/world/collection.hpp
+++ b/apps/opencs/model/world/collection.hpp
@@ -15,7 +15,6 @@
 
 #include "columnbase.hpp"
 #include "collectionbase.hpp"
-#include "info.hpp"
 #include "land.hpp"
 #include "landtexture.hpp"
 #include "ref.hpp"
@@ -265,13 +264,6 @@ namespace CSMWorld
             CSMWorld::CellRef* ptr = (CSMWorld::CellRef*) &copy.mModified;
             ptr->mRefNum.mIndex = 0;
         }
-        if (type == UniversalId::Type_TopicInfo || type == UniversalId::Type_JournalInfo)
-        {
-            CSMWorld::Info* ptr = (CSMWorld::Info*) &copy.mModified;
-            std::vector<std::string> splitStringContainer;
-            Misc::StringUtils::split(destination, splitStringContainer, "#");
-            if (!splitStringContainer.empty()) ptr->mTopicId = splitStringContainer[0];
-        }
 
         int index = getAppendIndex(destination, type);
         insertRecord(copy, getAppendIndex(destination, type));
diff --git a/apps/opencs/model/world/commands.cpp b/apps/opencs/model/world/commands.cpp
index e33be11397..34485a46d7 100644
--- a/apps/opencs/model/world/commands.cpp
+++ b/apps/opencs/model/world/commands.cpp
@@ -397,6 +397,10 @@ void CSMWorld::CloneCommand::redo()
 {
     mModel.cloneRecord (mIdOrigin, mId, mType);
     applyModifications();
+    for (auto& value : mOverrideValues)
+    {
+        mModel.setData(mModel.getModelIndex (mId, value.first), value.second);
+    }
 }
 
 void CSMWorld::CloneCommand::undo()
@@ -404,6 +408,11 @@ void CSMWorld::CloneCommand::undo()
     mModel.removeRow (mModel.getModelIndex (mId, 0).row());
 }
 
+void CSMWorld::CloneCommand::setOverrideValue(int column, QVariant value)
+{
+    mOverrideValues.emplace_back(std::make_pair(column, value));
+}
+
 CSMWorld::CreatePathgridCommand::CreatePathgridCommand(IdTable& model, const std::string& id, QUndoCommand *parent)
     : CreateCommand(model, id, parent)
 {
diff --git a/apps/opencs/model/world/commands.hpp b/apps/opencs/model/world/commands.hpp
index 5776cae363..33608304f4 100644
--- a/apps/opencs/model/world/commands.hpp
+++ b/apps/opencs/model/world/commands.hpp
@@ -183,6 +183,7 @@ namespace CSMWorld
     class CloneCommand : public CreateCommand
     {
             std::string mIdOrigin;
+            std::vector<std::pair<int, QVariant>> mOverrideValues;
 
         public:
 
@@ -194,6 +195,8 @@ namespace CSMWorld
             void redo() override;
 
             void undo() override;
+
+            void setOverrideValue(int column, QVariant value);
     };
 
     class RevertCommand : public QUndoCommand
diff --git a/apps/opencs/view/world/infocreator.cpp b/apps/opencs/view/world/infocreator.cpp
index 2f1615c876..505de753c6 100644
--- a/apps/opencs/view/world/infocreator.cpp
+++ b/apps/opencs/view/world/infocreator.cpp
@@ -40,10 +40,14 @@ void CSVWorld::InfoCreator::configureCreateCommand (CSMWorld::CreateCommand& com
         command.addValue (table.findColumnIndex(CSMWorld::Columns::ColumnId_Rank), -1);
         command.addValue (table.findColumnIndex(CSMWorld::Columns::ColumnId_Gender), -1);
         command.addValue (table.findColumnIndex(CSMWorld::Columns::ColumnId_PcRank), -1);
+        CSMWorld::CloneCommand* cloneCommand = dynamic_cast<CSMWorld::CloneCommand*> (&command);
+        if (cloneCommand) cloneCommand->setOverrideValue(table.findColumnIndex(CSMWorld::Columns::ColumnId_Topic), mTopic->text());
     }
     else
     {
         command.addValue (table.findColumnIndex(CSMWorld::Columns::ColumnId_Journal), mTopic->text());
+        CSMWorld::CloneCommand* cloneCommand = dynamic_cast<CSMWorld::CloneCommand*> (&command);
+        if (cloneCommand) cloneCommand->setOverrideValue(table.findColumnIndex(CSMWorld::Columns::ColumnId_Journal), mTopic->text());
     }
 }
 

From 7be7af13d753d7cdbf7a8fa3b6ef9331a79b063b Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Mon, 11 Jan 2021 06:53:23 +0300
Subject: [PATCH 0215/2859] Downgrade FOV-dependent view distance factor to a
 recommendation

---
 apps/launcher/advancedpage.cpp                |  4 +--
 apps/openmw/mwrender/fogmanager.cpp           |  4 +--
 .../reference/modding/settings/camera.rst     | 33 +++++++------------
 3 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index 54fbbdfe01..d82dd1be2e 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -62,12 +62,12 @@ namespace
 
     double convertToCells(double unitRadius)
     {
-        return std::round((unitRadius / 0.93 + 1024) / CellSizeInUnits);
+        return std::round((unitRadius + 1024) / CellSizeInUnits);
     }
 
     double convertToUnits(double CellGridRadius)
     {
-        return (CellSizeInUnits * CellGridRadius - 1024) * 0.93;
+        return CellSizeInUnits * CellGridRadius - 1024;
     }
 }
 
diff --git a/apps/openmw/mwrender/fogmanager.cpp b/apps/openmw/mwrender/fogmanager.cpp
index 837e6ad041..b151882922 100644
--- a/apps/openmw/mwrender/fogmanager.cpp
+++ b/apps/openmw/mwrender/fogmanager.cpp
@@ -76,8 +76,8 @@ namespace MWRender
                 mLandFogStart = viewDistance * (1 - fogDepth);
                 mLandFogEnd = viewDistance;
             }
-            mUnderwaterFogStart = std::min(viewDistance, 6666.f) * (1 - underwaterFog);
-            mUnderwaterFogEnd = std::min(viewDistance, 6666.f);
+            mUnderwaterFogStart = std::min(viewDistance, 7168.f) * (1 - underwaterFog);
+            mUnderwaterFogEnd = std::min(viewDistance, 7168.f);
         }
         mFogColor = color;
     }
diff --git a/docs/source/reference/modding/settings/camera.rst b/docs/source/reference/modding/settings/camera.rst
index c30dcb3f3b..e15b06e749 100644
--- a/docs/source/reference/modding/settings/camera.rst
+++ b/docs/source/reference/modding/settings/camera.rst
@@ -51,39 +51,28 @@ viewing distance
 This value controls the maximum visible distance (also called the far clipping plane).
 Larger values significantly improve rendering in exterior spaces,
 but also increase the amount of rendered geometry and significantly reduce the frame rate.
-Note that when cells are visible before loading (when not using a Distant Land), the geometry will "pop-in" suddenly,
-creating a jarring visual effect. To prevent this effect, this value must be less than::
+Note that when cells are visible before loading, the geometry will "pop-in" suddenly,
+creating a jarring visual effect. To prevent this effect, this value should not be greater than:
 
-	(CellSizeInUnits * CellGridRadius - 1024) * 0.93
+	CellSizeInUnits * CellGridRadius - 1024
 
 The CellSizeInUnits is the size of a game cell in units (8192 by default), CellGridRadius determines how many
 neighboring cells to current one to load (1 by default - 3x3 grid), and 1024 is the threshold distance for loading a new cell.
-Additionally, the field of view setting also interacts with this setting because the view frustum end is a plane,
+The field of view setting also interacts with this setting because the view frustum end is a plane,
 so you can see further at the edges of the screen than you should be able to.
 This can be observed in game by looking at distant objects
 and rotating the camera so the objects are near the edge of the screen.
-As a result, this setting should further be reduced by a factor that depends on the field of view setting.
-In the default configuration this reduction is 7%, hence the factor of 0.93 above.
-Using this factor, approximate values recommended for other CellGridRadius values are:
-
-======= ========
-Cells	Viewing
-        Distance
-=======	========
-2		14285
-3		21903
-4		29522
-5		35924
-=======	========
-
-Reductions of up to 25% or more can be required to completely eliminate pop-in for wide fields of view
-and long viewing distances near the edges of the screen.
+As a result, this distance is recommended to further be reduced to avoid pop-in for wide fields of view
+and long viewing distances near the edges of the screen if distant terrain and object paging are not used.
+
+Reductions of up to 25% or more can be required to completely eliminate this pop-in.
 Such situations are unusual and probably not worth the performance penalty introduced
 by loading geometry obscured by fog in the center of the screen.
 See RenderingManager::configureFog for the relevant source code.
 
-This setting can be adjusted in game from the ridiculously low value of 2048.0 to a maximum of 81920.0
-using the View Distance slider in the Detail tab of the Video panel of the Options menu.
+This setting can be adjusted in game from the ridiculously low value of 2500 units to a maximum of 7168 units
+using the View Distance slider in the Detail tab of the Video panel of the Options menu, unless distant terrain is enabled,
+in which case the maximum is increased to 81920 units.
 
 field of view
 -------------

From 93b1b444f2a3abd13d5105b0bb35c41fc5498cd3 Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Mon, 11 Jan 2021 12:53:34 +0200
Subject: [PATCH 0216/2859] Optimize CreateCommand and CloneCommand
 configuration

---
 apps/opencs/view/world/infocreator.cpp | 27 +++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/apps/opencs/view/world/infocreator.cpp b/apps/opencs/view/world/infocreator.cpp
index 505de753c6..cf1b48a195 100644
--- a/apps/opencs/view/world/infocreator.cpp
+++ b/apps/opencs/view/world/infocreator.cpp
@@ -34,20 +34,29 @@ void CSVWorld::InfoCreator::configureCreateCommand (CSMWorld::CreateCommand& com
 {
     CSMWorld::IdTable& table = dynamic_cast<CSMWorld::IdTable&> (*getData().getTableModel (getCollectionId()));
 
+    CSMWorld::CloneCommand* cloneCommand = dynamic_cast<CSMWorld::CloneCommand*> (&command);
     if (getCollectionId() == CSMWorld::UniversalId::Type_TopicInfos)
     {
-        command.addValue (table.findColumnIndex(CSMWorld::Columns::ColumnId_Topic), mTopic->text());
-        command.addValue (table.findColumnIndex(CSMWorld::Columns::ColumnId_Rank), -1);
-        command.addValue (table.findColumnIndex(CSMWorld::Columns::ColumnId_Gender), -1);
-        command.addValue (table.findColumnIndex(CSMWorld::Columns::ColumnId_PcRank), -1);
-        CSMWorld::CloneCommand* cloneCommand = dynamic_cast<CSMWorld::CloneCommand*> (&command);
-        if (cloneCommand) cloneCommand->setOverrideValue(table.findColumnIndex(CSMWorld::Columns::ColumnId_Topic), mTopic->text());
+        if (!cloneCommand)
+        {
+            command.addValue (table.findColumnIndex(CSMWorld::Columns::ColumnId_Topic), mTopic->text());
+            command.addValue (table.findColumnIndex(CSMWorld::Columns::ColumnId_Rank), -1);
+            command.addValue (table.findColumnIndex(CSMWorld::Columns::ColumnId_Gender), -1);
+            command.addValue (table.findColumnIndex(CSMWorld::Columns::ColumnId_PcRank), -1);
+        }
+        else
+        {
+            cloneCommand->setOverrideValue(table.findColumnIndex(CSMWorld::Columns::ColumnId_Topic), mTopic->text());
+        }
     }
     else
     {
-        command.addValue (table.findColumnIndex(CSMWorld::Columns::ColumnId_Journal), mTopic->text());
-        CSMWorld::CloneCommand* cloneCommand = dynamic_cast<CSMWorld::CloneCommand*> (&command);
-        if (cloneCommand) cloneCommand->setOverrideValue(table.findColumnIndex(CSMWorld::Columns::ColumnId_Journal), mTopic->text());
+        if (!cloneCommand)
+        {
+            command.addValue (table.findColumnIndex(CSMWorld::Columns::ColumnId_Journal), mTopic->text());
+        }
+        else
+            cloneCommand->setOverrideValue(table.findColumnIndex(CSMWorld::Columns::ColumnId_Journal), mTopic->text());
     }
 }
 

From 3087ce9c7039bb072c7587b723d0a58623e81d75 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Mon, 11 Jan 2021 17:56:34 +0100
Subject: [PATCH 0217/2859] Use saved fallheight to determine a character's
 jump state.

The jump state initial state is "none", and it is set after physics simulation.
If a save is done just above the ground, the character may land before
the first run of the simulation, effectively cancelling the effect of
falling.
---
 CHANGELOG.md                          | 1 +
 apps/openmw/mwmechanics/character.cpp | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa35722820..5b2e1b260b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -86,6 +86,7 @@
     Bug #5703: OpenMW-CS menu system crashing on XFCE
     Bug #5706: AI sequences stop looping after the saved game is reloaded
     Bug #5731: Editor: 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
     Feature #390: 3rd person look "over the shoulder"
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index b9bfe6bc0f..53c8e4a8b7 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -883,7 +883,11 @@ CharacterController::CharacterController(const MWWorld::Ptr &ptr, MWRender::Anim
         }
 
         if(!cls.getCreatureStats(mPtr).isDead())
+        {
             mIdleState = CharState_Idle;
+            if (cls.getCreatureStats(mPtr).getFallHeight() > 0)
+                mJumpState = JumpState_InAir;
+        }
         else
         {
             const MWMechanics::CreatureStats& cStats = mPtr.getClass().getCreatureStats(mPtr);

From 70087e16feaeda3bdd8789b209d0f7cdbca75044 Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Mon, 11 Jan 2021 13:43:44 +0200
Subject: [PATCH 0218/2859] Disable dialogue info table sorting

---
 apps/opencs/view/world/subviews.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/view/world/subviews.cpp b/apps/opencs/view/world/subviews.cpp
index 3e72f9a9e6..169bc2e94e 100644
--- a/apps/opencs/view/world/subviews.cpp
+++ b/apps/opencs/view/world/subviews.cpp
@@ -75,10 +75,10 @@ void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
         new CSVDoc::SubViewFactoryWithCreator<TableSubView, JournalCreatorFactory>);
 
     manager.add (CSMWorld::UniversalId::Type_TopicInfos,
-        new CSVDoc::SubViewFactoryWithCreator<TableSubView, InfoCreatorFactory>);
+        new CSVDoc::SubViewFactoryWithCreator<TableSubView, InfoCreatorFactory>(false));
 
     manager.add (CSMWorld::UniversalId::Type_JournalInfos,
-        new CSVDoc::SubViewFactoryWithCreator<TableSubView, InfoCreatorFactory>);
+        new CSVDoc::SubViewFactoryWithCreator<TableSubView, InfoCreatorFactory>(false));
 
     manager.add (CSMWorld::UniversalId::Type_Pathgrids,
         new CSVDoc::SubViewFactoryWithCreator<TableSubView, PathgridCreatorFactory>);

From 390314215225099ef09ef6c10b7365b587d3767b Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Tue, 12 Jan 2021 12:05:17 +0000
Subject: [PATCH 0219/2859] Update apps/openmw/mwbase/environment.cpp

---
 apps/openmw/mwbase/environment.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwbase/environment.cpp b/apps/openmw/mwbase/environment.cpp
index edb10d9456..d639dd4c69 100644
--- a/apps/openmw/mwbase/environment.cpp
+++ b/apps/openmw/mwbase/environment.cpp
@@ -19,7 +19,7 @@
 MWBase::Environment *MWBase::Environment::sThis = nullptr;
 
 MWBase::Environment::Environment()
-: mWorld (nullptr), mSoundManager (nullptr), mScriptManager (nullptr), mWindowManager (nullptr),
+: mWorld (nullptr), mSoundManager (nullptr), mScriptManager (nullptr), mWindowManager (nullptr), mResourceSystem (nullptr),
   mMechanicsManager (nullptr),  mDialogueManager (nullptr), mJournal (nullptr), mInputManager (nullptr), mStateManager (nullptr),
   mFrameDuration (0), mFrameRateLimit(0.f)
 {

From 4638fc36b46c8a0961f84ae5c3a026c59e72a7e5 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Tue, 12 Jan 2021 15:46:19 +0300
Subject: [PATCH 0220/2859] Allow all creatures to float to the water surface

---
 apps/openmw/mwmechanics/character.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index abff30bb90..172ddb25cf 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -2448,7 +2448,7 @@ void CharacterController::update(float duration)
         }
     }
 
-    if (mFloatToSurface && cls.isActor() && cls.canSwim(mPtr))
+    if (mFloatToSurface && cls.isActor())
     {
         if (cls.getCreatureStats(mPtr).isDead()
             || (!godmode && cls.getCreatureStats(mPtr).isParalyzed()))

From 73740013a30cece6cb99f0ea9312bb95dd96d94f Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Tue, 12 Jan 2021 19:58:46 +0100
Subject: [PATCH 0221/2859] mResourceSystem initialization reorder

---
 apps/openmw/mwbase/environment.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwbase/environment.cpp b/apps/openmw/mwbase/environment.cpp
index d639dd4c69..9014fafff9 100644
--- a/apps/openmw/mwbase/environment.cpp
+++ b/apps/openmw/mwbase/environment.cpp
@@ -19,9 +19,9 @@
 MWBase::Environment *MWBase::Environment::sThis = nullptr;
 
 MWBase::Environment::Environment()
-: mWorld (nullptr), mSoundManager (nullptr), mScriptManager (nullptr), mWindowManager (nullptr), mResourceSystem (nullptr),
-  mMechanicsManager (nullptr),  mDialogueManager (nullptr), mJournal (nullptr), mInputManager (nullptr), mStateManager (nullptr),
-  mFrameDuration (0), mFrameRateLimit(0.f)
+: mWorld (nullptr), mSoundManager (nullptr), mScriptManager (nullptr), mWindowManager (nullptr),
+  mMechanicsManager (nullptr),  mDialogueManager (nullptr), mJournal (nullptr), mInputManager (nullptr),
+    mStateManager (nullptr), mResourceSystem (nullptr),  mFrameDuration (0), mFrameRateLimit(0.f)
 {
     assert (!sThis);
     sThis = this;

From 823e7bea382ef028643b114dfb85d49a147b2e6e Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Wed, 13 Jan 2021 02:48:54 +0000
Subject: [PATCH 0222/2859] Fix MyGUI detection

`libfind_pkg_detect` used `pkg_check_modules`, which requires all the
given modules to be found.

This means it always failed for MyGUI, which passes
`MyGUI${MYGUI_STATIC_SUFFIX} MYGUI${MYGUI_STATIC_SUFFIX}` to it.

Replaces `pkg_check_modules` with `pkg_search_module`, which finds the
first match instead.
---
 cmake/LibFindMacros.cmake | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmake/LibFindMacros.cmake b/cmake/LibFindMacros.cmake
index 2be27c5fcb..3044601f6b 100644
--- a/cmake/LibFindMacros.cmake
+++ b/cmake/LibFindMacros.cmake
@@ -19,11 +19,11 @@ macro (libfind_package PREFIX PKG)
 endmacro()
 
 # A simple wrapper to make pkg-config searches a bit easier.
-# Works the same as CMake's internal pkg_check_modules but is always quiet.
-macro (libfind_pkg_check_modules)
+# Works the same as CMake's internal pkg_search_module but is always quiet.
+macro (libfind_pkg_search_module)
   find_package(PkgConfig QUIET)
   if (PKG_CONFIG_FOUND)
-    pkg_check_modules(${ARGN} QUIET)
+    pkg_search_module(${ARGN} QUIET)
   endif()
 endmacro()
 
@@ -47,7 +47,7 @@ function (libfind_pkg_detect PREFIX)
     message(FATAL_ERROR "libfind_pkg_detect requires at least a pkg_config package name to be passed.")
   endif()
   # Find library
-  libfind_pkg_check_modules(${PREFIX}_PKGCONF ${pkgargs})
+  libfind_pkg_search_module(${PREFIX}_PKGCONF ${pkgargs})
   if (pathargs)
     find_path(${PREFIX}_INCLUDE_DIR NAMES ${pathargs} HINTS ${${PREFIX}_PKGCONF_INCLUDE_DIRS})
   endif()

From f175beb3047d97dffabc3caa9ffc57746760060a Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Wed, 13 Jan 2021 13:33:46 +0400
Subject: [PATCH 0223/2859] Define template ref classes in components

---
 apps/openmw/mwrender/objectpaging.cpp | 13 ++-----------
 components/resource/scenemanager.cpp  | 18 ++++--------------
 components/resource/scenemanager.hpp  | 25 +++++++++++++++++++++++++
 components/sceneutil/serialize.cpp    |  1 +
 4 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index a5015f377b..d8e856e769 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -249,15 +249,6 @@ namespace MWRender
         }
     };
 
-    class TemplateRef : public osg::Object
-    {
-    public:
-        TemplateRef() {}
-        TemplateRef(const TemplateRef& copy, const osg::CopyOp&) : mObjects(copy.mObjects) {}
-        META_Object(MWRender, TemplateRef)
-        std::vector<osg::ref_ptr<const Object>> mObjects;
-    };
-
     class RefnumSet : public osg::Object
     {
     public:
@@ -530,7 +521,7 @@ namespace MWRender
 
         osg::ref_ptr<osg::Group> group = new osg::Group;
         osg::ref_ptr<osg::Group> mergeGroup = new osg::Group;
-        osg::ref_ptr<TemplateRef> templateRefs = new TemplateRef;
+        osg::ref_ptr<Resource::TemplateMultiRef> templateRefs = new Resource::TemplateMultiRef;
         osgUtil::StateToCompile stateToCompile(0, nullptr);
         CopyOp copyop;
         for (const auto& pair : nodes)
@@ -596,7 +587,7 @@ namespace MWRender
             if (numinstances > 0)
             {
                 // add a ref to the original template, to hint to the cache that it's still being used and should be kept in cache
-                templateRefs->mObjects.emplace_back(cnode);
+                templateRefs->addRef(cnode);
 
                 if (pair.second.mNeedCompile)
                 {
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 2630cd4536..e75fa4f74e 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -110,6 +110,10 @@ namespace
 
 namespace Resource
 {
+    void TemplateMultiRef::addRef(const osg::Node* node)
+    {
+        mObjects.emplace_back(node);
+    }
 
     class SharedStateManager : public osgDB::SharedStateManager
     {
@@ -554,20 +558,6 @@ namespace Resource
         return node;
     }
 
-    class TemplateRef : public osg::Object
-    {
-    public:
-        TemplateRef(const Object* object)
-            : mObject(object) {}
-        TemplateRef() {}
-        TemplateRef(const TemplateRef& copy, const osg::CopyOp&) : mObject(copy.mObject) {}
-
-        META_Object(Resource, TemplateRef)
-
-    private:
-        osg::ref_ptr<const Object> mObject;
-    };
-
     osg::ref_ptr<osg::Node> SceneManager::createInstance(const std::string& name)
     {
         osg::ref_ptr<const osg::Node> scene = getTemplate(name);
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index fd75070a18..e897566a8b 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -37,6 +37,31 @@ namespace Shader
 
 namespace Resource
 {
+    class TemplateRef : public osg::Object
+    {
+    public:
+        TemplateRef(const Object* object) : mObject(object) {}
+        TemplateRef() {}
+        TemplateRef(const TemplateRef& copy, const osg::CopyOp&) : mObject(copy.mObject) {}
+
+        META_Object(Resource, TemplateRef)
+
+    private:
+        osg::ref_ptr<const Object> mObject;
+    };
+
+    class TemplateMultiRef : public osg::Object
+    {
+    public:
+        TemplateMultiRef() {}
+        TemplateMultiRef(const TemplateMultiRef& copy, const osg::CopyOp&) : mObjects(copy.mObjects) {}
+        void addRef(const osg::Node* node);
+
+        META_Object(Resource, TemplateMultiRef)
+
+    private:
+        std::vector<osg::ref_ptr<const Object>> mObjects;
+    };
 
     class MultiObjectCache;
 
diff --git a/components/sceneutil/serialize.cpp b/components/sceneutil/serialize.cpp
index d03612fc1d..7e176be3dd 100644
--- a/components/sceneutil/serialize.cpp
+++ b/components/sceneutil/serialize.cpp
@@ -121,6 +121,7 @@ void registerSerializers()
         const char* ignore[] = {
             "MWRender::PtrHolder",
             "Resource::TemplateRef",
+            "Resource::TemplateMultiRef",
             "SceneUtil::CompositeStateSetUpdater",
             "SceneUtil::LightListCallback",
             "SceneUtil::LightManagerUpdateCallback",

From 0418e8e7a6eccef17a6995470d4f9ce2e95d1106 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Wed, 13 Jan 2021 13:41:02 +0400
Subject: [PATCH 0224/2859] Add an API to get base wind speed (which is from
 openmw.cfg)

---
 apps/openmw/mwrender/sky.cpp    | 9 +++++++++
 apps/openmw/mwrender/sky.hpp    | 4 ++++
 apps/openmw/mwworld/weather.cpp | 2 ++
 3 files changed, 15 insertions(+)

diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index 2920e07dde..93061022c3 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -1134,6 +1134,7 @@ SkyManager::SkyManager(osg::Group* parentNode, Resource::SceneManager* sceneMana
     , mRainEntranceSpeed(1)
     , mRainMaxRaindrops(0)
     , mWindSpeed(0.f)
+    , mBaseWindSpeed(0.f)
     , mEnabled(true)
     , mSunEnabled(true)
     , mWeatherAlpha(0.f)
@@ -1685,6 +1686,7 @@ void SkyManager::setWeather(const WeatherResult& weather)
     mRainMaxHeight = weather.mRainMaxHeight;
     mRainSpeed = weather.mRainSpeed;
     mWindSpeed = weather.mWindSpeed;
+    mBaseWindSpeed = weather.mBaseWindSpeed;
 
     if (mRainEffect != weather.mRainEffect)
     {
@@ -1853,6 +1855,13 @@ void SkyManager::setWeather(const WeatherResult& weather)
         fader->setAlpha(weather.mEffectFade);
 }
 
+float SkyManager::getBaseWindSpeed() const
+{
+    if (!mCreated) return 0.f;
+
+    return mBaseWindSpeed;
+}
+
 void SkyManager::sunEnable()
 {
     if (!mCreated) return;
diff --git a/apps/openmw/mwrender/sky.hpp b/apps/openmw/mwrender/sky.hpp
index cf697bd44f..2ec134d09d 100644
--- a/apps/openmw/mwrender/sky.hpp
+++ b/apps/openmw/mwrender/sky.hpp
@@ -70,6 +70,7 @@ namespace MWRender
         float mDLFogOffset;
 
         float mWindSpeed;
+        float mBaseWindSpeed;
         float mCurrentWindSpeed;
         float mNextWindSpeed;
 
@@ -181,6 +182,8 @@ namespace MWRender
 
         void setRainIntensityUniform(osg::Uniform *uniform);
 
+        float getBaseWindSpeed() const;
+
     private:
         void create();
         ///< no need to call this, automatically done on first enable()
@@ -265,6 +268,7 @@ namespace MWRender
         float mRainEntranceSpeed;
         int mRainMaxRaindrops;
         float mWindSpeed;
+        float mBaseWindSpeed;
 
         bool mEnabled;
         bool mSunEnabled;
diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index 6a4a227a49..415e69d20b 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -1123,6 +1123,7 @@ inline void WeatherManager::calculateResult(const int weatherID, const float gam
     mResult.mCloudBlendFactor = 0;
     mResult.mNextWindSpeed = 0;
     mResult.mWindSpeed = mResult.mCurrentWindSpeed = calculateWindSpeed(weatherID, mWindSpeed);
+    mResult.mBaseWindSpeed = mWeatherSettings[weatherID].mWindSpeed;
 
     mResult.mCloudSpeed = current.mCloudSpeed;
     mResult.mGlareView = current.mGlareView;
@@ -1214,6 +1215,7 @@ inline void WeatherManager::calculateTransitionResult(const float factor, const
 
     mResult.mCurrentWindSpeed = calculateWindSpeed(mCurrentWeather, mCurrentWindSpeed);
     mResult.mNextWindSpeed = calculateWindSpeed(mNextWeather, mNextWindSpeed);
+    mResult.mBaseWindSpeed = lerp(current.mBaseWindSpeed, other.mBaseWindSpeed, factor);
 
     mResult.mWindSpeed = lerp(mResult.mCurrentWindSpeed, mResult.mNextWindSpeed, factor);
     mResult.mCloudSpeed = lerp(current.mCloudSpeed, other.mCloudSpeed, factor);

From 89f3f860ed99ce1b19c4ee3ec07373ad2f4cdcf1 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Wed, 13 Jan 2021 13:57:05 +0400
Subject: [PATCH 0225/2859] Allow to get a rotation vector from ESM::Position

---
 components/esm/defs.hpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/components/esm/defs.hpp b/components/esm/defs.hpp
index 0f9cefab12..9bf9b01f3d 100644
--- a/components/esm/defs.hpp
+++ b/components/esm/defs.hpp
@@ -54,6 +54,11 @@ struct Position
     {
         return osg::Vec3f(pos[0], pos[1], pos[2]);
     }
+
+    osg::Vec3f asRotationVec3() const
+    {
+        return osg::Vec3f(rot[0], rot[1], rot[2]);
+    }
 };
 #pragma pack(pop)
 

From 16e03c151a783fc9902bce6cde73026c58cb6ddc Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Wed, 13 Jan 2021 15:38:29 +0200
Subject: [PATCH 0226/2859] Implement basic move algorithm, connect it to
 drag&drop

---
 apps/opencs/view/world/dragdroputils.cpp   | 10 +++-
 apps/opencs/view/world/dragdroputils.hpp   |  3 +
 apps/opencs/view/world/dragrecordtable.cpp |  7 ++-
 apps/opencs/view/world/dragrecordtable.hpp |  5 ++
 apps/opencs/view/world/table.cpp           | 70 ++++++++++++++++++++++
 apps/opencs/view/world/table.hpp           |  2 +
 6 files changed, 95 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/view/world/dragdroputils.cpp b/apps/opencs/view/world/dragdroputils.cpp
index 808125a601..bb4d972737 100644
--- a/apps/opencs/view/world/dragdroputils.cpp
+++ b/apps/opencs/view/world/dragdroputils.cpp
@@ -15,7 +15,15 @@ bool CSVWorld::DragDropUtils::canAcceptData(const QDropEvent &event, CSMWorld::C
     return data != nullptr && data->holdsType(type);
 }
 
-CSMWorld::UniversalId CSVWorld::DragDropUtils::getAcceptedData(const QDropEvent &event, 
+bool CSVWorld::DragDropUtils::isInfo(const QDropEvent &event, CSMWorld::ColumnBase::Display type)
+{
+    const CSMWorld::TableMimeData *data = getTableMimeData(event);
+    return data != nullptr && (
+        data->holdsType(CSMWorld::UniversalId::Type_TopicInfo) ||
+        data->holdsType(CSMWorld::UniversalId::Type_JournalInfo) );
+}
+
+CSMWorld::UniversalId CSVWorld::DragDropUtils::getAcceptedData(const QDropEvent &event,
                                                                CSMWorld::ColumnBase::Display type)
 {
     if (canAcceptData(event, type))
diff --git a/apps/opencs/view/world/dragdroputils.hpp b/apps/opencs/view/world/dragdroputils.hpp
index d1d780708e..2181e7606b 100644
--- a/apps/opencs/view/world/dragdroputils.hpp
+++ b/apps/opencs/view/world/dragdroputils.hpp
@@ -20,6 +20,9 @@ namespace CSVWorld
         bool canAcceptData(const QDropEvent &event, CSMWorld::ColumnBase::Display type);
         ///< Checks whether the \a event contains a valid CSMWorld::TableMimeData that holds the \a type
 
+        bool isInfo(const QDropEvent &event, CSMWorld::ColumnBase::Display type);
+        ///< Info types can be dragged to sort the info table
+
         CSMWorld::UniversalId getAcceptedData(const QDropEvent &event, CSMWorld::ColumnBase::Display type);
         ///< Gets the accepted data from the \a event using the \a type
         ///< \return Type_None if the \a event data doesn't holds the \a type
diff --git a/apps/opencs/view/world/dragrecordtable.cpp b/apps/opencs/view/world/dragrecordtable.cpp
index f84bf639da..58041af9fc 100644
--- a/apps/opencs/view/world/dragrecordtable.cpp
+++ b/apps/opencs/view/world/dragrecordtable.cpp
@@ -46,7 +46,8 @@ void CSVWorld::DragRecordTable::dragEnterEvent(QDragEnterEvent *event)
 void CSVWorld::DragRecordTable::dragMoveEvent(QDragMoveEvent *event)
 {
     QModelIndex index = indexAt(event->pos());
-    if (CSVWorld::DragDropUtils::canAcceptData(*event, getIndexDisplayType(index)))
+    if (CSVWorld::DragDropUtils::canAcceptData(*event, getIndexDisplayType(index)) ||
+        CSVWorld::DragDropUtils::isInfo(*event, getIndexDisplayType(index)) )
     {
         if (index.flags() & Qt::ItemIsEditable)
         {
@@ -75,6 +76,10 @@ void CSVWorld::DragRecordTable::dropEvent(QDropEvent *event)
             }
         }
     }
+    else if (CSVWorld::DragDropUtils::isInfo(*event, display) && event->source() == this)
+    {
+        emit moveRecordsFromSameTable(event);
+    }
 }
 
 CSMWorld::ColumnBase::Display CSVWorld::DragRecordTable::getIndexDisplayType(const QModelIndex &index) const
diff --git a/apps/opencs/view/world/dragrecordtable.hpp b/apps/opencs/view/world/dragrecordtable.hpp
index a6b6756aa0..f6c3fa8909 100644
--- a/apps/opencs/view/world/dragrecordtable.hpp
+++ b/apps/opencs/view/world/dragrecordtable.hpp
@@ -23,6 +23,8 @@ namespace CSVWorld
 {
     class DragRecordTable : public QTableView
     {
+        Q_OBJECT
+
         protected:
             CSMDoc::Document& mDocument;
             bool mEditLock;
@@ -45,6 +47,9 @@ namespace CSVWorld
 
         private:
             CSMWorld::ColumnBase::Display getIndexDisplayType(const QModelIndex &index) const;
+
+        signals:
+            void moveRecordsFromSameTable(QDropEvent *event);
     };
 }
 
diff --git a/apps/opencs/view/world/table.cpp b/apps/opencs/view/world/table.cpp
index e5f4e36c5b..03d7dbbfab 100644
--- a/apps/opencs/view/world/table.cpp
+++ b/apps/opencs/view/world/table.cpp
@@ -7,6 +7,7 @@
 #include <QString>
 #include <QtCore/qnamespace.h>
 
+#include <components/debug/debuglog.hpp>
 #include <components/misc/helpviewer.hpp>
 #include <components/misc/stringops.hpp>
 
@@ -248,6 +249,7 @@ CSVWorld::Table::Table (const CSMWorld::UniversalId& id,
     if (isInfoTable)
     {
         mProxyModel = new CSMWorld::InfoTableProxyModel(id.getType(), this);
+        connect (this, &CSVWorld::DragRecordTable::moveRecordsFromSameTable, this, &CSVWorld::Table::moveRecords);
     }
     else if (isLtexTable)
     {
@@ -563,6 +565,74 @@ void CSVWorld::Table::moveDownRecord()
     }
 }
 
+void CSVWorld::Table::moveRecords(QDropEvent *event)
+{
+    if (mEditLock || (mModel->getFeatures() & CSMWorld::IdTableBase::Feature_Constant))
+        return;
+
+    QModelIndex targedIndex = indexAt(event->pos());
+
+    QModelIndexList selectedRows = selectionModel()->selectedRows();
+    int targetRow = targedIndex.row();
+    int baseRow = targedIndex.row() - 1;
+    int highestDifference = 0;
+
+    for (const auto& thisRowData : selectedRows)
+    {
+        if (std::abs(targetRow - thisRowData.row()) > highestDifference) highestDifference = std::abs(targetRow - thisRowData.row());
+        if (thisRowData.row() - 1 < baseRow) baseRow = thisRowData.row() - 1;
+    }
+
+    std::vector<int> newOrder (highestDifference + 1);
+
+    for (long unsigned int i = 0; i < newOrder.size(); ++i)
+    {
+        newOrder[i] = i;
+    }
+
+    if (selectedRows.size() > 1)
+    {
+        Log(Debug::Warning) << "Move operation failed: Moving multiple selections isn't implemented.";
+        return;
+    }
+
+    for (const auto& thisRowData : selectedRows)
+    {
+        /*
+            Moving algorithm description
+            a) Remove the (ORIGIN + 1)th list member.
+            b) Add (ORIGIN+1)th list member with value TARGET
+            c) If ORIGIN > TARGET,d_INC; ELSE d_DEC
+            d_INC) increase all members after (and including) the TARGET by one, stop before hitting ORIGINth address
+            d_DEC)  decrease all members after the ORIGIN by one, stop after hitting address TARGET
+        */
+
+        int originRow = thisRowData.row();
+        //int sourceMappedOriginRow = mProxyModel->mapToSource (mProxyModel->index (originRow, 0)).row();
+
+        newOrder.erase(newOrder.begin() +  originRow - baseRow - 1);
+        newOrder.emplace(newOrder.begin() + originRow - baseRow - 1, targetRow - baseRow - 1);
+
+        if (originRow > targetRow)
+        {
+            for (int i = targetRow - baseRow - 1; i < originRow - baseRow - 1; ++i)
+            {
+                ++newOrder[i];
+            }
+        }
+        else
+        {
+            for (int i = originRow - baseRow; i <= targetRow - baseRow - 1; ++i)
+            {
+                --newOrder[i];
+            }
+        }
+
+    }
+    mDocument.getUndoStack().push (new CSMWorld::ReorderRowsCommand (
+        dynamic_cast<CSMWorld::IdTable&> (*mModel), baseRow + 1, newOrder));
+}
+
 void CSVWorld::Table::editCell()
 {
     emit editRequest(mEditIdAction->getCurrentId(), "");
diff --git a/apps/opencs/view/world/table.hpp b/apps/opencs/view/world/table.hpp
index 61dd57c061..9c4b9b5e5a 100644
--- a/apps/opencs/view/world/table.hpp
+++ b/apps/opencs/view/world/table.hpp
@@ -141,6 +141,8 @@ namespace CSVWorld
 
             void moveDownRecord();
 
+            void moveRecords(QDropEvent *event);
+
             void viewRecord();
 
             void previewRecord();

From f2fc02cdff69cabafa00a33de95bd942511d2eb7 Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Wed, 13 Jan 2021 15:55:16 +0200
Subject: [PATCH 0227/2859] Support filtered tables (mapToSource for indexes)

---
 apps/opencs/view/world/table.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/apps/opencs/view/world/table.cpp b/apps/opencs/view/world/table.cpp
index 03d7dbbfab..c676a5ecc0 100644
--- a/apps/opencs/view/world/table.cpp
+++ b/apps/opencs/view/world/table.cpp
@@ -573,14 +573,17 @@ void CSVWorld::Table::moveRecords(QDropEvent *event)
     QModelIndex targedIndex = indexAt(event->pos());
 
     QModelIndexList selectedRows = selectionModel()->selectedRows();
-    int targetRow = targedIndex.row();
-    int baseRow = targedIndex.row() - 1;
+    int targetRowRaw = targedIndex.row();
+    int targetRow = mProxyModel->mapToSource (mProxyModel->index (targetRowRaw, 0)).row();
+    int baseRowRaw = targedIndex.row() - 1;
+    int baseRow = mProxyModel->mapToSource (mProxyModel->index (baseRowRaw, 0)).row();
     int highestDifference = 0;
 
     for (const auto& thisRowData : selectedRows)
     {
-        if (std::abs(targetRow - thisRowData.row()) > highestDifference) highestDifference = std::abs(targetRow - thisRowData.row());
-        if (thisRowData.row() - 1 < baseRow) baseRow = thisRowData.row() - 1;
+        int thisRow = mProxyModel->mapToSource (mProxyModel->index (thisRowData.row(), 0)).row();
+        if (std::abs(targetRow - thisRow) > highestDifference) highestDifference = std::abs(targetRow - thisRow);
+        if (thisRow - 1 < baseRow) baseRow = thisRow - 1;
     }
 
     std::vector<int> newOrder (highestDifference + 1);
@@ -607,8 +610,8 @@ void CSVWorld::Table::moveRecords(QDropEvent *event)
             d_DEC)  decrease all members after the ORIGIN by one, stop after hitting address TARGET
         */
 
-        int originRow = thisRowData.row();
-        //int sourceMappedOriginRow = mProxyModel->mapToSource (mProxyModel->index (originRow, 0)).row();
+        int originRowRaw = thisRowData.row();
+        int originRow = mProxyModel->mapToSource (mProxyModel->index (originRowRaw, 0)).row();
 
         newOrder.erase(newOrder.begin() +  originRow - baseRow - 1);
         newOrder.emplace(newOrder.begin() + originRow - baseRow - 1, targetRow - baseRow - 1);

From 5740258d3b006977a5a8fa78f71b4cbb5d11f837 Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Wed, 13 Jan 2021 16:23:59 +0200
Subject: [PATCH 0228/2859] Add changelog entry

---
 CHANGELOG.md    | 1 +
 CHANGELOG_PR.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 943dcbe898..b628a847a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@
     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: Editor: 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
diff --git a/CHANGELOG_PR.md b/CHANGELOG_PR.md
index f70fbad575..c7abb6fec2 100644
--- a/CHANGELOG_PR.md
+++ b/CHANGELOG_PR.md
@@ -35,6 +35,7 @@ Bug Fixes:
 
 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)
 - Loading mods now keeps the master index (#5675)

From d24a5f7b89a775baa09febcfd960138ae36eaf3e Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Wed, 13 Jan 2021 20:45:34 +0000
Subject: [PATCH 0229/2859] Fix OSG USE_GRAPHICSWINDOW check

When OSG is built with `-DOSG_WINDOWING_SYSTEM=None`, this macro does not exist.

Replaces the Android-specific check with a general one.
---
 components/sdlutil/sdlcursormanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/sdlutil/sdlcursormanager.cpp b/components/sdlutil/sdlcursormanager.cpp
index 56225868e3..964762ec76 100644
--- a/components/sdlutil/sdlcursormanager.cpp
+++ b/components/sdlutil/sdlcursormanager.cpp
@@ -20,7 +20,7 @@
 
 #include "imagetosurface.hpp"
 
-#if defined(OSG_LIBRARY_STATIC) && !defined(ANDROID)
+#if defined(OSG_LIBRARY_STATIC) && defined(USE_GRAPHICSWINDOW)
 // Sets the default windowing system interface according to the OS.
 // Necessary for OpenSceneGraph to do some things, like decompression.
 USE_GRAPHICSWINDOW()

From 24d8412c0cab3b1eb146389168ec601acf222537 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Thu, 14 Jan 2021 02:52:59 +0000
Subject: [PATCH 0230/2859] cmake: Fix missing OPENGL_INCLUDE_DIR

OPENGL_INCLUDE_DIR wasn't being included.
It is usually just /usr/include but if it was custom the build failed.
---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a615e8432..226511b527 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -323,6 +323,7 @@ include_directories("."
     ${Boost_INCLUDE_DIR}
     ${MyGUI_INCLUDE_DIRS}
     ${OPENAL_INCLUDE_DIR}
+    ${OPENGL_INCLUDE_DIR}
     ${BULLET_INCLUDE_DIRS}
 )
 

From 11dfb9daff116ae9e1ccda971ebb8852831bfc6e Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Fri, 15 Jan 2021 15:11:50 +0000
Subject: [PATCH 0231/2859] cmake/FindOSGPlugins: Support lib-prefixed plugins

With a regular OSG build, the plugin names are prefixed with
`lib`, e.g. `libosgdb_jpeg.a` for a static build.

However, on Debian on Ubuntu they are not.

With this commit we now try both options.

Fixes #5972

Signed-off-by: Gleb Mazovetskiy <glex.spb@gmail.com>
---
 cmake/FindOSGPlugins.cmake | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/cmake/FindOSGPlugins.cmake b/cmake/FindOSGPlugins.cmake
index c210466c08..457abf665c 100644
--- a/cmake/FindOSGPlugins.cmake
+++ b/cmake/FindOSGPlugins.cmake
@@ -27,9 +27,12 @@ foreach(_library ${OSGPlugins_FIND_COMPONENTS})
     string(TOUPPER ${_library} _library_uc)
     set(_component OSGPlugins_${_library})
 
-    set(${_library_uc}_DIR ${OSGPlugins_LIB_DIR}) # to help function osg_find_library
+    # On some systems, notably Debian and Ubuntu, the OSG plugins do not have
+    # the usual "lib" prefix. We temporarily add the empty string to the list
+    # of prefixes CMake searches for (via osg_find_library) to support these systems.
     set(_saved_lib_prefix ${CMAKE_FIND_LIBRARY_PREFIXES}) # save CMAKE_FIND_LIBRARY_PREFIXES
-    set(CMAKE_FIND_LIBRARY_PREFIXES "") # search libraries with no prefix
+    list(APPEND CMAKE_FIND_LIBRARY_PREFIXES "") # search libraries with no prefix
+    set(${_library_uc}_DIR ${OSGPlugins_LIB_DIR}) # to help function osg_find_library
     osg_find_library(${_library_uc} ${_library}) # find it into ${_library_uc}_LIBRARIES
     set(CMAKE_FIND_LIBRARY_PREFIXES ${_saved_lib_prefix}) # restore prefix
 

From 4974b64cbf4f54d446386a0303962d08cd518026 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Sun, 17 Jan 2021 15:58:43 +0000
Subject: [PATCH 0232/2859] Update CI/before_install.osx.sh

---
 CI/before_install.osx.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index 85434fa06d..ba0ff00ca7 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -1,5 +1,9 @@
 #!/bin/sh -e
 
+# workaround python issue on travis
+HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies python@3.8 || true
+HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies python@3.9 || true
+
 # 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

From e37e5d4d16fd3240bd57355df40abc889e3ce8db Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Mon, 18 Jan 2021 17:42:03 +0100
Subject: [PATCH 0233/2859] Don't run unstuck if there is no simulation running
 in async case.

In this case, the actor mPreviousPosition is not updated, so the actor
position is interpolated between an old (stucked) position and the new
(unstucked) position. The new position is most likely "stucked", so the
unstuck code strikes again, making the actor "vibrates".

That's exactly what the sync code path does, and it doesn't exhibit this
behavior.
---
 apps/openmw/mwphysics/mtphysics.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 2781a5b1bc..6c7c573a49 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -173,6 +173,8 @@ namespace MWPhysics
             {
             if (mDeferAabbUpdate)
                 updateAabbs();
+            if (!mRemainingSteps)
+                return;
             for (auto& data : mActorsFrameData)
                 if (data.mActor.lock())
                 {

From 54ea8eb5c79d4a6bb88159cd6a67ce0dd4e17235 Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Mon, 18 Jan 2021 19:21:02 +0200
Subject: [PATCH 0234/2859] Fix string corruption with Qt on linux-systems

---
 apps/opencs/main.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/opencs/main.cpp b/apps/opencs/main.cpp
index 5287c8b191..c7d57a256e 100644
--- a/apps/opencs/main.cpp
+++ b/apps/opencs/main.cpp
@@ -63,6 +63,9 @@ int runApplication(int argc, char *argv[])
     application.setWindowIcon (QIcon (":./openmw-cs.png"));
 
     CS::Editor editor(argc, argv);
+#ifdef __linux__
+    setlocale(LC_NUMERIC,"C");
+#endif
 
     if(!editor.makeIPCServer())
     {

From 9f0f3eaeb2224a725fee002b986ebd56eb02b57c Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Mon, 18 Jan 2021 19:22:01 +0200
Subject: [PATCH 0235/2859] Add collada to supported formats

---
 apps/opencs/model/world/resourcesmanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/opencs/model/world/resourcesmanager.cpp b/apps/opencs/model/world/resourcesmanager.cpp
index 1af9c5e9b1..378ba7c6bb 100644
--- a/apps/opencs/model/world/resourcesmanager.cpp
+++ b/apps/opencs/model/world/resourcesmanager.cpp
@@ -17,7 +17,7 @@ void CSMWorld::ResourcesManager::addResources (const Resources& resources)
 const char * const * CSMWorld::ResourcesManager::getMeshExtensions()
 {
     // maybe we could go over the osgDB::Registry to list all supported node formats
-    static const char * const sMeshTypes[] = { "nif", "osg", "osgt", "osgb", "osgx", "osg2", 0 };
+    static const char * const sMeshTypes[] = { "nif", "osg", "osgt", "osgb", "osgx", "osg2", "dae", 0 };
     return sMeshTypes;
 }
 

From 0acae08e526846838f8e5f5f0673e3af7cca4d83 Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Mon, 18 Jan 2021 19:24:38 +0200
Subject: [PATCH 0236/2859] Add changelog entry

---
 CHANGELOG.md    | 1 +
 CHANGELOG_PR.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75fd4cbe3c..47cfd00310 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -87,6 +87,7 @@
     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: Editor: 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
diff --git a/CHANGELOG_PR.md b/CHANGELOG_PR.md
index f70fbad575..944b260442 100644
--- a/CHANGELOG_PR.md
+++ b/CHANGELOG_PR.md
@@ -39,6 +39,7 @@ Editor Bug Fixes:
 - Verifier no longer checks for alleged 'race' entries in clothing body parts (#5400)
 - Loading mods now keeps the master index (#5675)
 - Flicker and crashing on XFCE4 fixed (#5703)
+- Collada models render properly in the Editor (#5713)
 
 Miscellaneous:
 - Prevent save-game bloating by using an appropriate fog texture format (#5108)

From 8af8ad38406c35182dcb23a3c511be007a87dd9c Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Wed, 20 Jan 2021 01:17:16 +0000
Subject: [PATCH 0237/2859] Always write opaque fragments instead of relying on
 blending being off for translucent RTT

---
 apps/openmw/mwrender/characterpreview.cpp | 26 +++++++++++++++++++++--
 apps/openmw/mwrender/renderingmanager.cpp |  1 +
 files/shaders/objects_fragment.glsl       |  4 ++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index 89db3e5f46..f21e667eb0 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -5,6 +5,7 @@
 #include <osg/Material>
 #include <osg/Fog>
 #include <osg/BlendFunc>
+#include <osg/TexEnvCombine>
 #include <osg/Texture2D>
 #include <osg/Camera>
 #include <osg/PositionAttitudeTransform>
@@ -85,7 +86,7 @@ namespace MWRender
     class SetUpBlendVisitor : public osg::NodeVisitor
     {
     public:
-        SetUpBlendVisitor(): osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+        SetUpBlendVisitor(): osg::NodeVisitor(TRAVERSE_ALL_CHILDREN), mNoAlphaUniform(new osg::Uniform("noAlpha", false))
         {
         }
 
@@ -102,10 +103,17 @@ namespace MWRender
                     newStateSet->setAttribute(newBlendFunc, osg::StateAttribute::ON);
                     node.setStateSet(newStateSet);
                 }
-
+                if (stateset->getMode(GL_BLEND) & osg::StateAttribute::ON)
+                {
+                    // Disable noBlendAlphaEnv
+                    stateset->setTextureMode(7, GL_TEXTURE_2D, osg::StateAttribute::OFF);
+                    stateset->addUniform(mNoAlphaUniform);
+                }
             }
             traverse(node);
         }
+    private:
+        osg::ref_ptr<osg::Uniform> mNoAlphaUniform;
     };
 
     CharacterPreview::CharacterPreview(osg::Group* parent, Resource::ResourceSystem* resourceSystem,
@@ -164,6 +172,20 @@ namespace MWRender
         fog->setEnd(10000000);
         stateset->setAttributeAndModes(fog, osg::StateAttribute::OFF|osg::StateAttribute::OVERRIDE);
 
+        // Opaque stuff must have 1 as its fragment alpha as the FBO is translucent, so having blending off isn't enough
+        osg::ref_ptr<osg::TexEnvCombine> noBlendAlphaEnv = new osg::TexEnvCombine();
+        noBlendAlphaEnv->setCombine_Alpha(osg::TexEnvCombine::REPLACE);
+        noBlendAlphaEnv->setSource0_Alpha(osg::TexEnvCombine::CONSTANT);
+        noBlendAlphaEnv->setConstantColor(osg::Vec4(0.0, 0.0, 0.0, 1.0));
+        noBlendAlphaEnv->setCombine_RGB(osg::TexEnvCombine::REPLACE);
+        noBlendAlphaEnv->setSource0_RGB(osg::TexEnvCombine::PREVIOUS);
+        osg::ref_ptr<osg::Texture2D> dummyTexture = new osg::Texture2D();
+        dummyTexture->setInternalFormat(GL_RED);
+        dummyTexture->setTextureSize(1, 1);
+        stateset->setTextureAttributeAndModes(7, dummyTexture, osg::StateAttribute::ON);
+        stateset->setTextureAttribute(7, noBlendAlphaEnv, osg::StateAttribute::ON);
+        stateset->addUniform(new osg::Uniform("noAlpha", true));
+
         osg::ref_ptr<osg::LightModel> lightmodel = new osg::LightModel;
         lightmodel->setAmbientIntensity(osg::Vec4(0.0, 0.0, 0.0, 1.0));
         stateset->setAttributeAndModes(lightmodel, osg::StateAttribute::ON);
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 6ce431d2e2..e1f6f0dd96 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -370,6 +370,7 @@ namespace MWRender
         mRootNode->getOrCreateStateSet()->addUniform(new osg::Uniform("near", mNearClip));
         mRootNode->getOrCreateStateSet()->addUniform(new osg::Uniform("far", mViewDistance));
         mRootNode->getOrCreateStateSet()->addUniform(new osg::Uniform("simpleWater", false));
+        mRootNode->getOrCreateStateSet()->addUniform(new osg::Uniform("noAlpha", false));
 
         mUniformNear = mRootNode->getOrCreateStateSet()->getUniform("near");
         mUniformFar = mRootNode->getOrCreateStateSet()->getUniform("far");
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index 78660685f6..bd2bd5909f 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -50,6 +50,7 @@ uniform mat2 bumpMapMatrix;
 #endif
 
 uniform bool simpleWater;
+uniform bool noAlpha;
 
 varying float euclideanDepth;
 varying float linearDepth;
@@ -208,5 +209,8 @@ void main()
 #endif
     gl_FragData[0].xyz = mix(gl_FragData[0].xyz, gl_Fog.color.xyz, fogValue);
 
+    if (noAlpha)
+        gl_FragData[0].a = 1.0;
+
     applyShadowDebugOverlay();
 }

From 35fab974783e6a3f3b384ec09ce31f22432c89eb Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Wed, 20 Jan 2021 01:24:05 +0000
Subject: [PATCH 0238/2859] Add changelog entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75fd4cbe3c..ce1fb07e8b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@
     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: Editor: Verifier checks race of non-skin bodyparts
     Bug #5403: Enchantment effect doesn't show on an enemy during death animation

From b6e92c9c6deedfb9c4a4acfd106d57eb3e1628e8 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Wed, 20 Jan 2021 23:37:19 +0000
Subject: [PATCH 0239/2859] Use ShaderVisitor to skip translucent framebuffer
 specific stuff

---
 apps/openmw/mwrender/characterpreview.cpp |  3 +++
 apps/openmw/mwrender/renderingmanager.cpp |  1 -
 components/resource/scenemanager.cpp      |  7 ++++---
 components/resource/scenemanager.hpp      |  4 ++--
 components/shader/shadervisitor.cpp       | 10 +++++++++-
 components/shader/shadervisitor.hpp       |  4 ++++
 files/shaders/objects_fragment.glsl       |  3 +++
 7 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index f21e667eb0..14735050ce 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -16,6 +16,8 @@
 
 #include <components/debug/debuglog.hpp>
 #include <components/fallback/fallback.hpp>
+#include <components/resource/scenemanager.hpp>
+#include <components/resource/resourcesystem.hpp>
 #include <components/sceneutil/lightmanager.hpp>
 #include <components/sceneutil/shadow.hpp>
 
@@ -249,6 +251,7 @@ namespace MWRender
 
     void CharacterPreview::setBlendMode()
     {
+        mResourceSystem->getSceneManager()->recreateShaders(mNode, "objects", true);
         SetUpBlendVisitor visitor;
         mNode->accept(visitor);
     }
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index e1f6f0dd96..6ce431d2e2 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -370,7 +370,6 @@ namespace MWRender
         mRootNode->getOrCreateStateSet()->addUniform(new osg::Uniform("near", mNearClip));
         mRootNode->getOrCreateStateSet()->addUniform(new osg::Uniform("far", mViewDistance));
         mRootNode->getOrCreateStateSet()->addUniform(new osg::Uniform("simpleWater", false));
-        mRootNode->getOrCreateStateSet()->addUniform(new osg::Uniform("noAlpha", false));
 
         mUniformNear = mRootNode->getOrCreateStateSet()->getUniform("near");
         mUniformFar = mRootNode->getOrCreateStateSet()->getUniform("far");
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index e75fa4f74e..d937b992b1 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -247,9 +247,9 @@ namespace Resource
         return mForceShaders;
     }
 
-    void SceneManager::recreateShaders(osg::ref_ptr<osg::Node> node, const std::string& shaderPrefix)
+    void SceneManager::recreateShaders(osg::ref_ptr<osg::Node> node, const std::string& shaderPrefix, bool translucentFramebuffer)
     {
-        osg::ref_ptr<Shader::ShaderVisitor> shaderVisitor(createShaderVisitor(shaderPrefix));
+        osg::ref_ptr<Shader::ShaderVisitor> shaderVisitor(createShaderVisitor(shaderPrefix, translucentFramebuffer));
         shaderVisitor->setAllowedToModifyStateSets(false);
         node->accept(*shaderVisitor);
     }
@@ -749,7 +749,7 @@ namespace Resource
         stats->setAttribute(frameNumber, "Node Instance", mInstanceCache->getCacheSize());
     }
 
-    Shader::ShaderVisitor *SceneManager::createShaderVisitor(const std::string& shaderPrefix)
+    Shader::ShaderVisitor *SceneManager::createShaderVisitor(const std::string& shaderPrefix, bool translucentFramebuffer)
     {
         Shader::ShaderVisitor* shaderVisitor = new Shader::ShaderVisitor(*mShaderManager.get(), *mImageManager, shaderPrefix+"_vertex.glsl", shaderPrefix+"_fragment.glsl");
         shaderVisitor->setForceShaders(mForceShaders);
@@ -759,6 +759,7 @@ namespace Resource
         shaderVisitor->setAutoUseSpecularMaps(mAutoUseSpecularMaps);
         shaderVisitor->setSpecularMapPattern(mSpecularMapPattern);
         shaderVisitor->setApplyLightingToEnvMaps(mApplyLightingToEnvMaps);
+        shaderVisitor->setTranslucentFramebuffer(translucentFramebuffer);
         return shaderVisitor;
     }
 
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index e897566a8b..a815a324f2 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -76,7 +76,7 @@ namespace Resource
         Shader::ShaderManager& getShaderManager();
 
         /// Re-create shaders for this node, need to call this if texture stages or vertex color mode have changed.
-        void recreateShaders(osg::ref_ptr<osg::Node> node, const std::string& shaderPrefix = "objects");
+        void recreateShaders(osg::ref_ptr<osg::Node> node, const std::string& shaderPrefix = "objects", bool translucentFramebuffer = false);
 
         /// @see ShaderVisitor::setForceShaders
         void setForceShaders(bool force);
@@ -173,7 +173,7 @@ namespace Resource
 
     private:
 
-        Shader::ShaderVisitor* createShaderVisitor(const std::string& shaderPrefix = "objects");
+        Shader::ShaderVisitor* createShaderVisitor(const std::string& shaderPrefix = "objects", bool translucentFramebuffer = false);
 
         std::unique_ptr<Shader::ShaderManager> mShaderManager;
         bool mForceShaders;
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index e908b6aaa8..9dec5522ca 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -40,6 +40,7 @@ namespace Shader
         , mAutoUseNormalMaps(false)
         , mAutoUseSpecularMaps(false)
         , mApplyLightingToEnvMaps(false)
+        , mTranslucentFramebuffer(false)
         , mShaderManager(shaderManager)
         , mImageManager(imageManager)
         , mDefaultVsTemplate(defaultVsTemplate)
@@ -146,7 +147,7 @@ namespace Shader
                                 mRequirements.back().mShaderRequired = true;
                             }
                         }
-                        else
+                        else if (!mTranslucentFramebuffer)
                             Log(Debug::Error) << "ShaderVisitor encountered unknown texture " << texture;
                     }
                 }
@@ -322,6 +323,8 @@ namespace Shader
 
         writableStateSet->addUniform(new osg::Uniform("colorMode", reqs.mColorMode));
 
+        defineMap["translucentFramebuffer"] = mTranslucentFramebuffer ? "1" : "0";
+
         osg::ref_ptr<osg::Shader> vertexShader (mShaderManager.getShader(mDefaultVsTemplate, defineMap, osg::Shader::VERTEX));
         osg::ref_ptr<osg::Shader> fragmentShader (mShaderManager.getShader(mDefaultFsTemplate, defineMap, osg::Shader::FRAGMENT));
 
@@ -474,4 +477,9 @@ namespace Shader
         mApplyLightingToEnvMaps = apply;
     }
 
+    void ShaderVisitor::setTranslucentFramebuffer(bool translucent)
+    {
+        mTranslucentFramebuffer = translucent;
+    }
+
 }
diff --git a/components/shader/shadervisitor.hpp b/components/shader/shadervisitor.hpp
index 6031dbfe6c..11b37c9230 100644
--- a/components/shader/shadervisitor.hpp
+++ b/components/shader/shadervisitor.hpp
@@ -40,6 +40,8 @@ namespace Shader
 
         void setApplyLightingToEnvMaps(bool apply);
 
+        void setTranslucentFramebuffer(bool translucent);
+
         void apply(osg::Node& node) override;
 
         void apply(osg::Drawable& drawable) override;
@@ -63,6 +65,8 @@ namespace Shader
 
         bool mApplyLightingToEnvMaps;
 
+        bool mTranslucentFramebuffer;
+
         ShaderManager& mShaderManager;
         Resource::ImageManager& mImageManager;
 
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index bd2bd5909f..50bb77145a 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -209,8 +209,11 @@ void main()
 #endif
     gl_FragData[0].xyz = mix(gl_FragData[0].xyz, gl_Fog.color.xyz, fogValue);
 
+#if @translucentFramebuffer
+    // having testing & blending isn't enough - we need to write an opaque pixel to be opaque
     if (noAlpha)
         gl_FragData[0].a = 1.0;
+#endif
 
     applyShadowDebugOverlay();
 }

From cc24f13b391b3c3db25d8a1d77cb95b65fcfafee Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 21 Jan 2021 13:08:50 +0100
Subject: [PATCH 0240/2859] Remove duplicated sound_buffer entry

---
 apps/openmw/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 56875a8c3f..f96ddb27f8 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -58,7 +58,6 @@ add_openmw_dir (mwscript
 add_openmw_dir (mwsound
     soundmanagerimp openal_output ffmpeg_decoder sound sound_buffer sound_decoder sound_output
     loudness movieaudiofactory alext efx efx-presets regionsoundselector watersoundupdater volumesettings
-    sound_buffer
     )
 
 add_openmw_dir (mwworld

From 1f4c85520f33a1f340765597e0b1dbf837670b64 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Thu, 7 Jan 2021 11:02:53 +0100
Subject: [PATCH 0241/2859] Use convexSweepTest for projectile movement to
 solve any imprecision issue with projectile collision detection. Simplify the
 mechanics: manage hits in one spot. Give magic projectiles a collision shape
 similar in size to their visible model.

Rename the 2 convex result callback to clearly state their purpose.
---
 CHANGELOG.md                                  |   1 +
 apps/openmw/CMakeLists.txt                    |   2 +-
 apps/openmw/mwmechanics/spellcasting.cpp      |  35 ++---
 ...ltcallback.cpp => actorconvexcallback.cpp} |   6 +-
 ...ltcallback.hpp => actorconvexcallback.hpp} |   8 +-
 .../closestnotmerayresultcallback.cpp         |  33 +---
 .../closestnotmerayresultcallback.hpp         |   4 +-
 apps/openmw/mwphysics/physicssystem.cpp       |  54 +++++--
 apps/openmw/mwphysics/physicssystem.hpp       |   6 +-
 apps/openmw/mwphysics/projectile.cpp          |  61 +++++---
 apps/openmw/mwphysics/projectile.hpp          |  26 ++--
 .../mwphysics/projectileconvexcallback.cpp    |  67 +++++++++
 .../mwphysics/projectileconvexcallback.hpp    |  27 ++++
 apps/openmw/mwphysics/raycasting.hpp          |   2 +-
 apps/openmw/mwphysics/trace.cpp               |   6 +-
 apps/openmw/mwworld/projectilemanager.cpp     | 142 ++++--------------
 apps/openmw/mwworld/projectilemanager.hpp     |   4 +-
 17 files changed, 259 insertions(+), 225 deletions(-)
 rename apps/openmw/mwphysics/{closestnotmeconvexresultcallback.cpp => actorconvexcallback.cpp} (92%)
 rename apps/openmw/mwphysics/{closestnotmeconvexresultcallback.hpp => actorconvexcallback.hpp} (54%)
 create mode 100644 apps/openmw/mwphysics/projectileconvexcallback.cpp
 create mode 100644 apps/openmw/mwphysics/projectileconvexcallback.hpp

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75fd4cbe3c..a2eaa32596 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
     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 #4201: Projectile-projectile collision
     Bug #4247: Cannot walk up stairs in Ebonheart docks
     Bug #4363: Editor: Defect in Clone Function for Dialogue Info records
     Bug #4447: Actor collision capsule shape allows looking through some walls
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 56875a8c3f..412041f74f 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -74,7 +74,7 @@ add_openmw_dir (mwworld
 add_openmw_dir (mwphysics
     physicssystem trace collisiontype actor convert object heightfield closestnotmerayresultcallback
     contacttestresultcallback deepestnotmecontacttestresultcallback stepper movementsolver projectile
-    closestnotmeconvexresultcallback raycasting mtphysics contacttestwrapper
+    actorconvexcallback raycasting mtphysics contacttestwrapper projectileconvexcallback
     )
 
 add_openmw_dir (mwclass
diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index 81b3a353df..142914c358 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -60,7 +60,10 @@ namespace MWMechanics
     void CastSpell::inflict(const MWWorld::Ptr &target, const MWWorld::Ptr &caster,
                             const ESM::EffectList &effects, ESM::RangeType range, bool reflected, bool exploded)
     {
-        if (!target.isEmpty() && target.getClass().isActor())
+        if (target.isEmpty())
+            return;
+
+        if (target.getClass().isActor())
         {
             // Early-out for characters that have departed.
             const auto& stats = target.getClass().getCreatureStats(target);
@@ -82,7 +85,7 @@ namespace MWMechanics
             return;
 
         const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search (mId);
-        if (spell && !target.isEmpty() && (spell->mData.mType == ESM::Spell::ST_Disease || spell->mData.mType == ESM::Spell::ST_Blight))
+        if (spell && target.getClass().isActor() && (spell->mData.mType == ESM::Spell::ST_Disease || spell->mData.mType == ESM::Spell::ST_Blight))
         {
             int requiredResistance = (spell->mData.mType == ESM::Spell::ST_Disease) ?
                 ESM::MagicEffect::ResistCommonDisease
@@ -105,13 +108,13 @@ namespace MWMechanics
         // This is required for Weakness effects in a spell to apply to any subsequent effects in the spell.
         // Otherwise, they'd only apply after the whole spell was added.
         MagicEffects targetEffects;
-        if (!target.isEmpty() && target.getClass().isActor())
+        if (target.getClass().isActor())
             targetEffects += target.getClass().getCreatureStats(target).getMagicEffects();
 
         bool castByPlayer = (!caster.isEmpty() && caster == getPlayer());
 
         ActiveSpells targetSpells;
-        if (!target.isEmpty() && target.getClass().isActor())
+        if (target.getClass().isActor())
             targetSpells = target.getClass().getCreatureStats(target).getActiveSpells();
 
         bool canCastAnEffect = false;    // For bound equipment.If this remains false
@@ -123,7 +126,7 @@ namespace MWMechanics
 
         int currentEffectIndex = 0;
         for (std::vector<ESM::ENAMstruct>::const_iterator effectIt (effects.mList.begin());
-             !target.isEmpty() && effectIt != effects.mList.end(); ++effectIt, ++currentEffectIndex)
+             effectIt != effects.mList.end(); ++effectIt, ++currentEffectIndex)
         {
             if (effectIt->mRange != range)
                 continue;
@@ -267,7 +270,7 @@ namespace MWMechanics
                 }
 
                 // Re-casting a summon effect will remove the creature from previous castings of that effect.
-                if (isSummoningEffect(effectIt->mEffectID) && !target.isEmpty() && target.getClass().isActor())
+                if (isSummoningEffect(effectIt->mEffectID) && target.getClass().isActor())
                 {
                     CreatureStats& targetStats = target.getClass().getCreatureStats(target);
                     ESM::SummonKey key(effectIt->mEffectID, mId, currentEffectIndex);
@@ -310,18 +313,16 @@ namespace MWMechanics
         if (!exploded)
             MWBase::Environment::get().getWorld()->explodeSpell(mHitPosition, effects, caster, target, range, mId, mSourceName, mFromProjectile);
 
-        if (!target.isEmpty()) {
-            if (!reflectedEffects.mList.empty())
-                inflict(caster, target, reflectedEffects, range, true, exploded);
+        if (!reflectedEffects.mList.empty())
+            inflict(caster, target, reflectedEffects, range, true, exploded);
 
-            if (!appliedLastingEffects.empty())
-            {
-                int casterActorId = -1;
-                if (!caster.isEmpty() && caster.getClass().isActor())
-                    casterActorId = caster.getClass().getCreatureStats(caster).getActorId();
-                target.getClass().getCreatureStats(target).getActiveSpells().addSpell(mId, mStack, appliedLastingEffects,
-                                                                                      mSourceName, casterActorId);
-            }
+        if (!appliedLastingEffects.empty())
+        {
+            int casterActorId = -1;
+            if (!caster.isEmpty() && caster.getClass().isActor())
+                casterActorId = caster.getClass().getCreatureStats(caster).getActorId();
+            target.getClass().getCreatureStats(target).getActiveSpells().addSpell(mId, mStack, appliedLastingEffects,
+                    mSourceName, casterActorId);
         }
     }
 
diff --git a/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp b/apps/openmw/mwphysics/actorconvexcallback.cpp
similarity index 92%
rename from apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp
rename to apps/openmw/mwphysics/actorconvexcallback.cpp
index 27e7a390c4..f99b706d74 100644
--- a/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp
+++ b/apps/openmw/mwphysics/actorconvexcallback.cpp
@@ -1,6 +1,6 @@
 #include <mutex>
 
-#include "closestnotmeconvexresultcallback.hpp"
+#include "actorconvexcallback.hpp"
 #include "collisiontype.hpp"
 #include "contacttestwrapper.h"
 
@@ -31,13 +31,13 @@ namespace MWPhysics
         }
     };
 
-    ClosestNotMeConvexResultCallback::ClosestNotMeConvexResultCallback(const btCollisionObject *me, const btVector3 &motion, btScalar minCollisionDot, const btCollisionWorld * world)
+    ActorConvexCallback::ActorConvexCallback(const btCollisionObject *me, const btVector3 &motion, btScalar minCollisionDot, const btCollisionWorld * world)
     : btCollisionWorld::ClosestConvexResultCallback(btVector3(0.0, 0.0, 0.0), btVector3(0.0, 0.0, 0.0)),
       mMe(me), mMotion(motion), mMinCollisionDot(minCollisionDot), mWorld(world)
     {
     }
 
-    btScalar ClosestNotMeConvexResultCallback::addSingleResult(btCollisionWorld::LocalConvexResult& convexResult, bool normalInWorldSpace)
+    btScalar ActorConvexCallback::addSingleResult(btCollisionWorld::LocalConvexResult& convexResult, bool normalInWorldSpace)
     {
         if (convexResult.m_hitCollisionObject == mMe)
             return btScalar(1);
diff --git a/apps/openmw/mwphysics/closestnotmeconvexresultcallback.hpp b/apps/openmw/mwphysics/actorconvexcallback.hpp
similarity index 54%
rename from apps/openmw/mwphysics/closestnotmeconvexresultcallback.hpp
rename to apps/openmw/mwphysics/actorconvexcallback.hpp
index 538721ad80..1c28ee6cc4 100644
--- a/apps/openmw/mwphysics/closestnotmeconvexresultcallback.hpp
+++ b/apps/openmw/mwphysics/actorconvexcallback.hpp
@@ -1,5 +1,5 @@
-#ifndef OPENMW_MWPHYSICS_CLOSESTNOTMECONVEXRESULTCALLBACK_H
-#define OPENMW_MWPHYSICS_CLOSESTNOTMECONVEXRESULTCALLBACK_H
+#ifndef OPENMW_MWPHYSICS_ACTORCONVEXCALLBACK_H
+#define OPENMW_MWPHYSICS_ACTORCONVEXCALLBACK_H
 
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 
@@ -7,10 +7,10 @@ class btCollisionObject;
 
 namespace MWPhysics
 {
-    class ClosestNotMeConvexResultCallback : public btCollisionWorld::ClosestConvexResultCallback
+    class ActorConvexCallback : public btCollisionWorld::ClosestConvexResultCallback
     {
     public:
-        ClosestNotMeConvexResultCallback(const btCollisionObject *me, const btVector3 &motion, btScalar minCollisionDot, const btCollisionWorld * world);
+        ActorConvexCallback(const btCollisionObject *me, const btVector3 &motion, btScalar minCollisionDot, const btCollisionWorld * world);
 
         btScalar addSingleResult(btCollisionWorld::LocalConvexResult& convexResult,bool normalInWorldSpace) override;
 
diff --git a/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp b/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp
index c3104f8603..32d97d6c75 100644
--- a/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp
+++ b/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp
@@ -7,16 +7,13 @@
 
 #include "../mwworld/class.hpp"
 
-#include "actor.hpp"
-#include "collisiontype.hpp"
-#include "projectile.hpp"
 #include "ptrholder.hpp"
 
 namespace MWPhysics
 {
-    ClosestNotMeRayResultCallback::ClosestNotMeRayResultCallback(const btCollisionObject* me, std::vector<const btCollisionObject*>  targets, const btVector3& from, const btVector3& to, Projectile* proj)
+    ClosestNotMeRayResultCallback::ClosestNotMeRayResultCallback(const btCollisionObject* me, std::vector<const btCollisionObject*>  targets, const btVector3& from, const btVector3& to)
     : btCollisionWorld::ClosestRayResultCallback(from, to)
-    , mMe(me), mTargets(std::move(targets)), mProjectile(proj)
+    , mMe(me), mTargets(std::move(targets))
     {
     }
 
@@ -25,9 +22,6 @@ namespace MWPhysics
         if (rayResult.m_collisionObject == mMe)
             return 1.f;
 
-        if (mProjectile && rayResult.m_collisionObject == mProjectile->getCollisionObject())
-            return 1.f;
-
         if (!mTargets.empty())
         {
             if ((std::find(mTargets.begin(), mTargets.end(), rayResult.m_collisionObject) == mTargets.end()))
@@ -38,27 +32,6 @@ namespace MWPhysics
             }
         }
 
-        btCollisionWorld::ClosestRayResultCallback::addSingleResult(rayResult, normalInWorldSpace);
-        if (mProjectile)
-        {
-            switch (rayResult.m_collisionObject->getBroadphaseHandle()->m_collisionFilterGroup)
-            {
-                case CollisionType_Actor:
-                {
-                    auto* target = static_cast<Actor*>(rayResult.m_collisionObject->getUserPointer());
-                    mProjectile->hit(target->getPtr(), m_hitPointWorld, m_hitNormalWorld);
-                    break;
-                }
-                case CollisionType_Projectile:
-                {
-                    auto* target = static_cast<Projectile*>(rayResult.m_collisionObject->getUserPointer());
-                    target->hit(mProjectile->getPtr(), m_hitPointWorld, m_hitNormalWorld);
-                    mProjectile->hit(target->getPtr(), m_hitPointWorld, m_hitNormalWorld);
-                    break;
-                }
-            }
-        }
-
-        return rayResult.m_hitFraction;
+        return btCollisionWorld::ClosestRayResultCallback::addSingleResult(rayResult, normalInWorldSpace);
     }
 }
diff --git a/apps/openmw/mwphysics/closestnotmerayresultcallback.hpp b/apps/openmw/mwphysics/closestnotmerayresultcallback.hpp
index b86427165a..1fa32ef686 100644
--- a/apps/openmw/mwphysics/closestnotmerayresultcallback.hpp
+++ b/apps/openmw/mwphysics/closestnotmerayresultcallback.hpp
@@ -14,13 +14,13 @@ namespace MWPhysics
     class ClosestNotMeRayResultCallback : public btCollisionWorld::ClosestRayResultCallback
     {
     public:
-        ClosestNotMeRayResultCallback(const btCollisionObject* me, std::vector<const btCollisionObject*> targets, const btVector3& from, const btVector3& to, Projectile* proj=nullptr);
+        ClosestNotMeRayResultCallback(const btCollisionObject* me, std::vector<const btCollisionObject*> targets, const btVector3& from, const btVector3& to);
 
         btScalar addSingleResult(btCollisionWorld::LocalRayResult& rayResult, bool normalInWorldSpace) override;
+
     private:
         const btCollisionObject* mMe;
         const std::vector<const btCollisionObject*> mTargets;
-        Projectile* mProjectile;
     };
 }
 
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 95d1ec70aa..ed0e0c915d 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -55,6 +55,7 @@
 #include "deepestnotmecontacttestresultcallback.hpp"
 #include "closestnotmerayresultcallback.hpp"
 #include "contacttestresultcallback.hpp"
+#include "projectileconvexcallback.hpp"
 #include "constants.hpp"
 #include "movementsolver.hpp"
 #include "mtphysics.hpp"
@@ -246,7 +247,7 @@ namespace MWPhysics
         return 0.f;
     }
 
-    RayCastingResult PhysicsSystem::castRay(const osg::Vec3f &from, const osg::Vec3f &to, const MWWorld::ConstPtr& ignore, std::vector<MWWorld::Ptr> targets, int mask, int group, int projId) const
+    RayCastingResult PhysicsSystem::castRay(const osg::Vec3f &from, const osg::Vec3f &to, const MWWorld::ConstPtr& ignore, std::vector<MWWorld::Ptr> targets, int mask, int group) const
     {
         if (from == to)
         {
@@ -283,7 +284,7 @@ namespace MWPhysics
             }
         }
 
-        ClosestNotMeRayResultCallback resultCallback(me, targetCollisionObjects, btFrom, btTo, getProjectile(projId));
+        ClosestNotMeRayResultCallback resultCallback(me, targetCollisionObjects, btFrom, btTo);
         resultCallback.m_collisionFilterGroup = group;
         resultCallback.m_collisionFilterMask = mask;
 
@@ -580,15 +581,44 @@ namespace MWPhysics
         }
     }
 
-    void PhysicsSystem::updateProjectile(const int projectileId, const osg::Vec3f &position)
+    void PhysicsSystem::updateProjectile(const int projectileId, const osg::Vec3f &position) const
     {
-        ProjectileMap::iterator foundProjectile = mProjectiles.find(projectileId);
-        if (foundProjectile != mProjectiles.end())
-        {
-            foundProjectile->second->setPosition(position);
-            mTaskScheduler->updateSingleAabb(foundProjectile->second);
+        const auto foundProjectile = mProjectiles.find(projectileId);
+        assert(foundProjectile != mProjectiles.end());
+        auto* projectile = foundProjectile->second.get();
+
+        btVector3 btFrom = Misc::Convert::toBullet(projectile->getPosition());
+        btVector3 btTo = Misc::Convert::toBullet(position);
+
+        if (btFrom == btTo)
             return;
-        }
+
+        const auto casterPtr = projectile->getCaster();
+        const auto* caster = [this,&casterPtr]() -> const btCollisionObject*
+        {
+            const Actor* actor = getActor(casterPtr);
+            if (actor)
+                return actor->getCollisionObject();
+            const Object* object = getObject(casterPtr);
+            if (object)
+                return object->getCollisionObject();
+            return nullptr;
+        }();
+        assert(caster);
+
+        ProjectileConvexCallback resultCallback(caster, btFrom, btTo, projectile);
+        resultCallback.m_collisionFilterMask = 0xff;
+        resultCallback.m_collisionFilterGroup = CollisionType_Projectile;
+
+        const btQuaternion btrot = btQuaternion::getIdentity();
+        btTransform from_ (btrot, btFrom);
+        btTransform to_ (btrot, btTo);
+
+        mTaskScheduler->convexSweepTest(projectile->getConvexShape(), from_, to_, resultCallback);
+
+        const auto newpos = projectile->isActive() ? position : Misc::Convert::toOsg(resultCallback.m_hitPointWorld);
+        projectile->setPosition(newpos);
+        mTaskScheduler->updateSingleAabb(foundProjectile->second);
     }
 
     void PhysicsSystem::updateRotation(const MWWorld::Ptr &ptr)
@@ -651,10 +681,10 @@ namespace MWPhysics
         mActors.emplace(ptr, std::move(actor));
     }
 
-    int PhysicsSystem::addProjectile (const MWWorld::Ptr& caster, const osg::Vec3f& position)
+    int PhysicsSystem::addProjectile (const MWWorld::Ptr& caster, const osg::Vec3f& position, float radius, bool canTraverseWater)
     {
         mProjectileId++;
-        auto projectile = std::make_shared<Projectile>(mProjectileId, caster, position, mTaskScheduler.get(), this);
+        auto projectile = std::make_shared<Projectile>(caster, position, radius, canTraverseWater, mTaskScheduler.get(), this);
         mProjectiles.emplace(mProjectileId, std::move(projectile));
 
         return mProjectileId;
@@ -863,7 +893,7 @@ namespace MWPhysics
         mWaterCollisionShape.reset(new btStaticPlaneShape(btVector3(0,0,1), mWaterHeight));
         mWaterCollisionObject->setCollisionShape(mWaterCollisionShape.get());
         mTaskScheduler->addCollisionObject(mWaterCollisionObject.get(), CollisionType_Water,
-                                                    CollisionType_Actor);
+                                                    CollisionType_Actor|CollisionType_Projectile);
     }
 
     bool PhysicsSystem::isAreaOccupiedByOtherActor(const osg::Vec3f& position, const float radius, const MWWorld::ConstPtr& ignore) const
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 4492099743..6f901067a2 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -124,8 +124,8 @@ namespace MWPhysics
             void addObject (const MWWorld::Ptr& ptr, const std::string& mesh, int collisionType = CollisionType_World);
             void addActor (const MWWorld::Ptr& ptr, const std::string& mesh);
 
-            int addProjectile(const MWWorld::Ptr& caster, const osg::Vec3f& position);
-            void updateProjectile(const int projectileId, const osg::Vec3f &position);
+            int addProjectile(const MWWorld::Ptr& caster, const osg::Vec3f& position, float radius, bool canTraverseWater);
+            void updateProjectile(const int projectileId, const osg::Vec3f &position) const;
             void removeProjectile(const int projectileId);
 
             void updatePtr (const MWWorld::Ptr& old, const MWWorld::Ptr& updated);
@@ -174,7 +174,7 @@ namespace MWPhysics
             /// @param me Optional, a Ptr to ignore in the list of results. targets are actors to filter for, ignoring all other actors.
             RayCastingResult castRay(const osg::Vec3f &from, const osg::Vec3f &to, const MWWorld::ConstPtr& ignore = MWWorld::ConstPtr(),
                     std::vector<MWWorld::Ptr> targets = std::vector<MWWorld::Ptr>(),
-                    int mask = CollisionType_World|CollisionType_HeightMap|CollisionType_Actor|CollisionType_Door, int group=0xff, int projId=-1) const override;
+                    int mask = CollisionType_World|CollisionType_HeightMap|CollisionType_Actor|CollisionType_Door, int group=0xff) const override;
 
             RayCastingResult castSphere(const osg::Vec3f& from, const osg::Vec3f& to, float radius) const override;
 
diff --git a/apps/openmw/mwphysics/projectile.cpp b/apps/openmw/mwphysics/projectile.cpp
index 1b9beca5ff..a931219975 100644
--- a/apps/openmw/mwphysics/projectile.cpp
+++ b/apps/openmw/mwphysics/projectile.cpp
@@ -13,19 +13,22 @@
 #include "../mwworld/class.hpp"
 
 #include "collisiontype.hpp"
+#include "memory"
 #include "mtphysics.hpp"
 #include "projectile.hpp"
 
 namespace MWPhysics
 {
-Projectile::Projectile(int projectileId, const MWWorld::Ptr& caster, const osg::Vec3f& position, PhysicsTaskScheduler* scheduler, PhysicsSystem* physicssystem)
-    : mActive(true)
+Projectile::Projectile(const MWWorld::Ptr& caster, const osg::Vec3f& position, float radius, bool canCrossWaterSurface, PhysicsTaskScheduler* scheduler, PhysicsSystem* physicssystem)
+    : mCanCrossWaterSurface(canCrossWaterSurface)
+    , mCrossedWaterSurface(false)
+    , mActive(true)
     , mCaster(caster)
+    , mWaterHitPosition(std::nullopt)
     , mPhysics(physicssystem)
     , mTaskScheduler(scheduler)
-    , mProjectileId(projectileId)
 {
-    mShape.reset(new btSphereShape(1.f));
+    mShape = std::make_unique<btSphereShape>(radius);
     mConvexShape = static_cast<btConvexShape*>(mShape.get());
 
     mCollisionObject = std::make_unique<btCollisionObject>();
@@ -67,6 +70,17 @@ void Projectile::setPosition(const osg::Vec3f &position)
     mTransformUpdatePending = true;
 }
 
+osg::Vec3f Projectile::getPosition() const
+{
+    std::scoped_lock lock(mMutex);
+    return Misc::Convert::toOsg(mLocalTransform.getOrigin());
+}
+
+bool Projectile::canTraverseWater() const
+{
+    return mCanCrossWaterSurface;
+}
+
 void Projectile::hit(MWWorld::Ptr target, btVector3 pos, btVector3 normal)
 {
     if (!mActive.load(std::memory_order_acquire))
@@ -78,12 +92,6 @@ void Projectile::hit(MWWorld::Ptr target, btVector3 pos, btVector3 normal)
     mActive.store(false, std::memory_order_release);
 }
 
-void Projectile::activate()
-{
-    assert(!mActive);
-    mActive.store(true, std::memory_order_release);
-}
-
 MWWorld::Ptr Projectile::getCaster() const
 {
     std::scoped_lock lock(mMutex);
@@ -108,21 +116,32 @@ bool Projectile::isValidTarget(const MWWorld::Ptr& target) const
     if (mCaster == target)
         return false;
 
-    if (!mValidTargets.empty())
+    if (target.isEmpty() || mValidTargets.empty())
+        return true;
+
+    bool validTarget = false;
+    for (const auto& targetActor : mValidTargets)
     {
-        bool validTarget = false;
-        for (const auto& targetActor : mValidTargets)
+        if (targetActor == target)
         {
-            if (targetActor == target)
-            {
-                validTarget = true;
-                break;
-            }
+            validTarget = true;
+            break;
         }
-
-        return validTarget;
     }
-    return true;
+    return validTarget;
+}
+
+std::optional<btVector3> Projectile::getWaterHitPosition()
+{
+    return std::exchange(mWaterHitPosition, std::nullopt);
+}
+
+void Projectile::setWaterHitPosition(btVector3 pos)
+{
+    if (mCrossedWaterSurface)
+        return;
+    mCrossedWaterSurface = true;
+    mWaterHitPosition = pos;
 }
 
 }
diff --git a/apps/openmw/mwphysics/projectile.hpp b/apps/openmw/mwphysics/projectile.hpp
index 5ae963b9a8..fb50eebde8 100644
--- a/apps/openmw/mwphysics/projectile.hpp
+++ b/apps/openmw/mwphysics/projectile.hpp
@@ -4,6 +4,7 @@
 #include <atomic>
 #include <memory>
 #include <mutex>
+#include <optional>
 
 #include "components/misc/convert.hpp"
 
@@ -32,7 +33,7 @@ namespace MWPhysics
     class Projectile final : public PtrHolder
     {
     public:
-        Projectile(const int projectileId, const MWWorld::Ptr& caster, const osg::Vec3f& position, PhysicsTaskScheduler* scheduler, PhysicsSystem* physicssystem);
+        Projectile(const MWWorld::Ptr& caster, const osg::Vec3f& position, float radius, bool canCrossWaterSurface, PhysicsTaskScheduler* scheduler, PhysicsSystem* physicssystem);
         ~Projectile() override;
 
         btConvexShape* getConvexShape() const { return mConvexShape; }
@@ -40,17 +41,13 @@ namespace MWPhysics
         void commitPositionChange();
 
         void setPosition(const osg::Vec3f& position);
+        osg::Vec3f getPosition() const;
 
         btCollisionObject* getCollisionObject() const
         {
             return mCollisionObject.get();
         }
 
-        int getProjectileId() const
-        {
-            return mProjectileId;
-        }
-
         bool isActive() const
         {
             return mActive.load(std::memory_order_acquire);
@@ -65,18 +62,16 @@ namespace MWPhysics
         MWWorld::Ptr getCaster() const;
         void setCaster(MWWorld::Ptr caster);
 
-        osg::Vec3f getHitPos() const
-        {
-            assert(!mActive);
-            return Misc::Convert::toOsg(mHitPosition);
-        }
+        bool canTraverseWater() const;
 
         void hit(MWWorld::Ptr target, btVector3 pos, btVector3 normal);
-        void activate();
 
         void setValidTargets(const std::vector<MWWorld::Ptr>& targets);
         bool isValidTarget(const MWWorld::Ptr& target) const;
 
+        std::optional<btVector3> getWaterHitPosition();
+        void setWaterHitPosition(btVector3 pos);
+
     private:
 
         std::unique_ptr<btCollisionShape> mShape;
@@ -85,9 +80,12 @@ namespace MWPhysics
         std::unique_ptr<btCollisionObject> mCollisionObject;
         btTransform mLocalTransform;
         bool mTransformUpdatePending;
+        bool mCanCrossWaterSurface;
+        bool mCrossedWaterSurface;
         std::atomic<bool> mActive;
         MWWorld::Ptr mCaster;
         MWWorld::Ptr mHitTarget;
+        std::optional<btVector3> mWaterHitPosition;
         btVector3 mHitPosition;
         btVector3 mHitNormal;
 
@@ -95,15 +93,11 @@ namespace MWPhysics
 
         mutable std::mutex mMutex;
 
-        osg::Vec3f mPosition;
-
         PhysicsSystem *mPhysics;
         PhysicsTaskScheduler *mTaskScheduler;
 
         Projectile(const Projectile&);
         Projectile& operator=(const Projectile&);
-
-        int mProjectileId;
     };
 
 }
diff --git a/apps/openmw/mwphysics/projectileconvexcallback.cpp b/apps/openmw/mwphysics/projectileconvexcallback.cpp
new file mode 100644
index 0000000000..0d0ac87202
--- /dev/null
+++ b/apps/openmw/mwphysics/projectileconvexcallback.cpp
@@ -0,0 +1,67 @@
+#include "../mwworld/class.hpp"
+
+#include "actor.hpp"
+#include "collisiontype.hpp"
+#include "projectile.hpp"
+#include "projectileconvexcallback.hpp"
+#include "ptrholder.hpp"
+
+namespace MWPhysics
+{
+    ProjectileConvexCallback::ProjectileConvexCallback(const btCollisionObject* me, const btVector3& from, const btVector3& to, Projectile* proj)
+        : btCollisionWorld::ClosestConvexResultCallback(from, to)
+        , mMe(me), mProjectile(proj)
+    {
+        assert(mProjectile);
+    }
+
+    btScalar ProjectileConvexCallback::addSingleResult(btCollisionWorld::LocalConvexResult& result, bool normalInWorldSpace)
+    {
+        // don't hit the caster
+        if (result.m_hitCollisionObject == mMe)
+            return 1.f;
+
+        // don't hit the projectile
+        if (result.m_hitCollisionObject == mProjectile->getCollisionObject())
+            return 1.f;
+
+        btCollisionWorld::ClosestConvexResultCallback::addSingleResult(result, normalInWorldSpace);
+        switch (result.m_hitCollisionObject->getBroadphaseHandle()->m_collisionFilterGroup)
+        {
+            case CollisionType_Actor:
+                {
+                    auto* target = static_cast<Actor*>(result.m_hitCollisionObject->getUserPointer());
+                    if (!mProjectile->isValidTarget(target->getPtr()))
+                        return 1.f;
+                    mProjectile->hit(target->getPtr(), result.m_hitPointLocal, result.m_hitNormalLocal);
+                    break;
+                }
+            case CollisionType_Projectile:
+                {
+                    auto* target = static_cast<Projectile*>(result.m_hitCollisionObject->getUserPointer());
+                    if (!mProjectile->isValidTarget(target->getCaster()))
+                        return 1.f;
+                    target->hit(mProjectile->getPtr(), m_hitPointWorld, m_hitNormalWorld);
+                    mProjectile->hit(target->getPtr(), m_hitPointWorld, m_hitNormalWorld);
+                    break;
+                }
+            case CollisionType_Water:
+                {
+                    mProjectile->setWaterHitPosition(m_hitPointWorld);
+                    if (mProjectile->canTraverseWater())
+                        return 1.f;
+                    mProjectile->hit(MWWorld::Ptr(), m_hitPointWorld, m_hitNormalWorld);
+                    break;
+                }
+            default:
+                {
+                    mProjectile->hit(MWWorld::Ptr(), m_hitPointWorld, m_hitNormalWorld);
+                    break;
+                }
+        }
+
+        return result.m_hitFraction;
+    }
+
+}
+
diff --git a/apps/openmw/mwphysics/projectileconvexcallback.hpp b/apps/openmw/mwphysics/projectileconvexcallback.hpp
new file mode 100644
index 0000000000..c687de36c0
--- /dev/null
+++ b/apps/openmw/mwphysics/projectileconvexcallback.hpp
@@ -0,0 +1,27 @@
+#ifndef OPENMW_MWPHYSICS_PROJECTILECONVEXCALLBACK_H
+#define OPENMW_MWPHYSICS_PROJECTILECONVEXCALLBACK_H
+
+#include <vector>
+
+#include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
+
+class btCollisionObject;
+
+namespace MWPhysics
+{
+    class Projectile;
+
+    class ProjectileConvexCallback : public btCollisionWorld::ClosestConvexResultCallback
+    {
+    public:
+        ProjectileConvexCallback(const btCollisionObject* me, const btVector3& from, const btVector3& to, Projectile* proj);
+
+        btScalar addSingleResult(btCollisionWorld::LocalConvexResult& result, bool normalInWorldSpace) override;
+
+    private:
+        const btCollisionObject* mMe;
+        Projectile* mProjectile;
+    };
+}
+
+#endif
diff --git a/apps/openmw/mwphysics/raycasting.hpp b/apps/openmw/mwphysics/raycasting.hpp
index b176e83304..7c8375cb5a 100644
--- a/apps/openmw/mwphysics/raycasting.hpp
+++ b/apps/openmw/mwphysics/raycasting.hpp
@@ -29,7 +29,7 @@ namespace MWPhysics
             /// @param me Optional, a Ptr to ignore in the list of results. targets are actors to filter for, ignoring all other actors.
             virtual RayCastingResult castRay(const osg::Vec3f &from, const osg::Vec3f &to, const MWWorld::ConstPtr& ignore = MWWorld::ConstPtr(),
                     std::vector<MWWorld::Ptr> targets = std::vector<MWWorld::Ptr>(),
-                    int mask = CollisionType_World|CollisionType_HeightMap|CollisionType_Actor|CollisionType_Door, int group=0xff, int projId=-1) const = 0;
+                    int mask = CollisionType_World|CollisionType_HeightMap|CollisionType_Actor|CollisionType_Door, int group=0xff) const = 0;
 
             virtual RayCastingResult castSphere(const osg::Vec3f& from, const osg::Vec3f& to, float radius) const = 0;
 
diff --git a/apps/openmw/mwphysics/trace.cpp b/apps/openmw/mwphysics/trace.cpp
index f50b6100a6..049d026e8e 100644
--- a/apps/openmw/mwphysics/trace.cpp
+++ b/apps/openmw/mwphysics/trace.cpp
@@ -7,7 +7,7 @@
 
 #include "collisiontype.hpp"
 #include "actor.hpp"
-#include "closestnotmeconvexresultcallback.hpp"
+#include "actorconvexcallback.hpp"
 
 namespace MWPhysics
 {
@@ -24,7 +24,7 @@ void ActorTracer::doTrace(const btCollisionObject *actor, const osg::Vec3f& star
     to.setOrigin(btend);
 
     const btVector3 motion = btstart-btend;
-    ClosestNotMeConvexResultCallback newTraceCallback(actor, motion, btScalar(0.0), world);
+    ActorConvexCallback newTraceCallback(actor, motion, btScalar(0.0), world);
     // Inherit the actor's collision group and mask
     newTraceCallback.m_collisionFilterGroup = actor->getBroadphaseHandle()->m_collisionFilterGroup;
     newTraceCallback.m_collisionFilterMask = actor->getBroadphaseHandle()->m_collisionFilterMask;
@@ -62,7 +62,7 @@ void ActorTracer::findGround(const Actor* actor, const osg::Vec3f& start, const
     btTransform to(trans.getBasis(), btend);
 
     const btVector3 motion = btstart-btend;
-    ClosestNotMeConvexResultCallback newTraceCallback(actor->getCollisionObject(), motion, btScalar(0.0), world);
+    ActorConvexCallback newTraceCallback(actor->getCollisionObject(), motion, btScalar(0.0), world);
     // Inherit the actor's collision group and mask
     newTraceCallback.m_collisionFilterGroup = actor->getCollisionObject()->getBroadphaseHandle()->m_collisionFilterGroup;
     newTraceCallback.m_collisionFilterMask = actor->getCollisionObject()->getBroadphaseHandle()->m_collisionFilterMask;
diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index 08c9e46627..c87f625053 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -3,6 +3,7 @@
 #include <iomanip>
 
 #include <memory>
+#include <optional>
 #include <osg/PositionAttitudeTransform>
 
 #include <components/debug/debuglog.hpp>
@@ -43,6 +44,7 @@
 
 #include "../mwsound/sound.hpp"
 
+#include "../mwphysics/collisiontype.hpp"
 #include "../mwphysics/physicssystem.hpp"
 #include "../mwphysics/projectile.hpp"
 
@@ -187,7 +189,7 @@ namespace MWWorld
     };
 
 
-    void ProjectileManager::createModel(State &state, const std::string &model, const osg::Vec3f& pos, const osg::Quat& orient,
+    float ProjectileManager::createModel(State &state, const std::string &model, const osg::Vec3f& pos, const osg::Quat& orient,
                                         bool rotate, bool createLight, osg::Vec4 lightDiffuseColor, std::string texture)
     {
         state.mNode = new osg::PositionAttitudeTransform;
@@ -251,6 +253,7 @@ namespace MWWorld
         state.mNode->accept(assignVisitor);
 
         MWRender::overrideFirstRootTexture(texture, mResourceSystem, projectile);
+        return projectile->getBound().radius();
     }
 
     void ProjectileManager::update(State& state, float duration)
@@ -305,7 +308,7 @@ namespace MWWorld
 
         osg::Vec4 lightDiffuseColor = getMagicBoltLightDiffuseColor(state.mEffects);
 
-        createModel(state, ptr.getClass().getModel(ptr), pos, orient, true, true, lightDiffuseColor, texture);
+        const auto radius = createModel(state, ptr.getClass().getModel(ptr), pos, orient, true, true, lightDiffuseColor, texture);
 
         MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
         for (const std::string &soundid : state.mSoundIds)
@@ -316,7 +319,7 @@ namespace MWWorld
                 state.mSounds.push_back(sound);
         }
 
-        state.mProjectileId = mPhysics->addProjectile(caster, pos);
+        state.mProjectileId = mPhysics->addProjectile(caster, pos, radius, false);
         state.mToDelete = false;
         mMagicBolts.push_back(state);
     }
@@ -340,7 +343,7 @@ namespace MWWorld
         if (!ptr.getClass().getEnchantment(ptr).empty())
             SceneUtil::addEnchantedGlow(state.mNode, mResourceSystem, ptr.getClass().getEnchantmentColor(ptr));
 
-        state.mProjectileId = mPhysics->addProjectile(actor, pos);
+        state.mProjectileId = mPhysics->addProjectile(actor, pos, 1.f, true);
         state.mToDelete = false;
         mProjectiles.push_back(state);
     }
@@ -407,15 +410,7 @@ namespace MWWorld
             float speed = fTargetSpellMaxSpeed * magicBoltState.mSpeed;
             osg::Vec3f direction = orient * osg::Vec3f(0,1,0);
             direction.normalize();
-            osg::Vec3f pos(magicBoltState.mNode->getPosition());
-            osg::Vec3f newPos = pos + direction * duration * speed;
-
-            for (const auto& sound : magicBoltState.mSounds)
-                sound->setPosition(newPos);
-
-            magicBoltState.mNode->setPosition(newPos);
-
-            mPhysics->updateProjectile(magicBoltState.mProjectileId, newPos);
+            osg::Vec3f newPos = projectile->getPosition() + direction * duration * speed;
 
             update(magicBoltState, duration);
 
@@ -425,41 +420,7 @@ namespace MWWorld
                 caster.getClass().getCreatureStats(caster).getAiSequence().getCombatTargets(targetActors);
             projectile->setValidTargets(targetActors);
 
-            // Check for impact
-            // TODO: use a proper btRigidBody / btGhostObject?
-            const auto result = mPhysics->castRay(pos, newPos, caster, targetActors, 0xff, MWPhysics::CollisionType_Projectile, magicBoltState.mProjectileId);
-
-            bool hit = false;
-            if (result.mHit)
-            {
-                hit = true;
-                if (result.mHitObject.isEmpty())
-                {
-                    // terrain or projectile
-                }
-                else
-                {
-                    MWMechanics::CastSpell cast(caster, result.mHitObject);
-                    cast.mHitPosition = pos;
-                    cast.mId = magicBoltState.mSpellId;
-                    cast.mSourceName = magicBoltState.mSourceName;
-                    cast.mStack = false;
-                    cast.inflict(result.mHitObject, caster, magicBoltState.mEffects, ESM::RT_Target, false, true);
-                    mPhysics->reportCollision(Misc::Convert::toBullet(result.mHitPos), Misc::Convert::toBullet(result.mHitNormal));
-                }
-            }
-
-            // Explodes when hitting water
-            if (MWBase::Environment::get().getWorld()->isUnderwater(MWMechanics::getPlayer().getCell(), newPos))
-                hit = true;
-
-            if (hit)
-            {
-                MWBase::Environment::get().getWorld()->explodeSpell(pos, magicBoltState.mEffects, caster, result.mHitObject,
-                                                                    ESM::RT_Target, magicBoltState.mSpellId, magicBoltState.mSourceName);
-
-                cleanupMagicBolt(magicBoltState);
-            }
+            mPhysics->updateProjectile(magicBoltState.mProjectileId, newPos);
         }
     }
 
@@ -467,9 +428,6 @@ namespace MWWorld
     {
         for (auto& projectileState : mProjectiles)
         {
-            if (projectileState.mToDelete)
-                continue;
-
             auto* projectile = mPhysics->getProjectile(projectileState.mProjectileId);
             if (!projectile->isActive())
                 continue;
@@ -477,8 +435,7 @@ namespace MWWorld
             // simulating aerodynamics at all
             projectileState.mVelocity -= osg::Vec3f(0, 0, Constants::GravityConst * Constants::UnitsPerMeter * 0.1f) * duration;
 
-            osg::Vec3f pos(projectileState.mNode->getPosition());
-            osg::Vec3f newPos = pos + projectileState.mVelocity * duration;
+            osg::Vec3f newPos = projectile->getPosition() + projectileState.mVelocity * duration;
 
             // rotation does not work well for throwing projectiles - their roll angle will depend on shooting direction.
             if (!projectileState.mThrown)
@@ -488,10 +445,6 @@ namespace MWWorld
                 projectileState.mNode->setAttitude(orient);
             }
 
-            projectileState.mNode->setPosition(newPos);
-
-            mPhysics->updateProjectile(projectileState.mProjectileId, newPos);
-
             update(projectileState, duration);
 
             MWWorld::Ptr caster = projectileState.getCaster();
@@ -502,36 +455,7 @@ namespace MWWorld
                 caster.getClass().getCreatureStats(caster).getAiSequence().getCombatTargets(targetActors);
             projectile->setValidTargets(targetActors);
 
-            // Check for impact
-            // TODO: use a proper btRigidBody / btGhostObject?
-            const auto result = mPhysics->castRay(pos, newPos, caster, targetActors, 0xff, MWPhysics::CollisionType_Projectile, projectileState.mProjectileId);
-
-            bool underwater = MWBase::Environment::get().getWorld()->isUnderwater(MWMechanics::getPlayer().getCell(), newPos);
-
-            if (result.mHit || underwater)
-            {
-                // Try to get a Ptr to the bow that was used. It might no longer exist.
-                MWWorld::ManualRef projectileRef(MWBase::Environment::get().getWorld()->getStore(), projectileState.mIdArrow);
-                MWWorld::Ptr bow = projectileRef.getPtr();
-                if (!caster.isEmpty() && projectileState.mIdArrow != projectileState.mBowId)
-                {
-                    MWWorld::InventoryStore& inv = caster.getClass().getInventoryStore(caster);
-                    MWWorld::ContainerStoreIterator invIt = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
-                    if (invIt != inv.end() && Misc::StringUtils::ciEqual(invIt->getCellRef().getRefId(), projectileState.mBowId))
-                        bow = *invIt;
-                }
-
-                if (caster.isEmpty())
-                    caster = result.mHitObject;
-
-                MWMechanics::projectileHit(caster, result.mHitObject, bow, projectileRef.getPtr(), result.mHit ? result.mHitPos : newPos, projectileState.mAttackStrength);
-                mPhysics->reportCollision(Misc::Convert::toBullet(result.mHitPos), Misc::Convert::toBullet(result.mHitNormal));
-
-                if (underwater)
-                    mRendering->emitWaterRipple(newPos);
-
-                cleanupProjectile(projectileState);
-            }
+            mPhysics->updateProjectile(projectileState.mProjectileId, newPos);
         }
     }
 
@@ -543,17 +467,19 @@ namespace MWWorld
                 continue;
 
             auto* projectile = mPhysics->getProjectile(projectileState.mProjectileId);
+
+            if (const auto hitWaterPos = projectile->getWaterHitPosition())
+                mRendering->emitWaterRipple(Misc::Convert::toOsg(*hitWaterPos));
+
+            const auto pos = projectile->getPosition();
+            projectileState.mNode->setPosition(pos);
+
             if (projectile->isActive())
                 continue;
+
             const auto target = projectile->getTarget();
-            const auto pos = projectile->getHitPos();
-            MWWorld::Ptr caster = projectileState.getCaster();
+            auto caster = projectileState.getCaster();
             assert(target != caster);
-            if (!projectile->isValidTarget(target))
-            {
-                projectile->activate();
-                continue;
-            }
 
             if (caster.isEmpty())
                 caster = target;
@@ -569,9 +495,8 @@ namespace MWWorld
                     bow = *invIt;
             }
 
-            projectileState.mHitPosition = pos;
-            cleanupProjectile(projectileState);
             MWMechanics::projectileHit(caster, target, bow, projectileRef.getPtr(), pos, projectileState.mAttackStrength);
+            cleanupProjectile(projectileState);
         }
         for (auto& magicBoltState : mMagicBolts)
         {
@@ -579,20 +504,18 @@ namespace MWWorld
                 continue;
 
             auto* projectile = mPhysics->getProjectile(magicBoltState.mProjectileId);
+
+            const auto pos = projectile->getPosition();
+            magicBoltState.mNode->setPosition(pos);
+            for (const auto& sound : magicBoltState.mSounds)
+                sound->setPosition(pos);
+
             if (projectile->isActive())
                 continue;
+
             const auto target = projectile->getTarget();
-            const auto pos = projectile->getHitPos();
-            MWWorld::Ptr caster = magicBoltState.getCaster();
+            const auto caster = magicBoltState.getCaster();
             assert(target != caster);
-            if (!projectile->isValidTarget(target))
-            {
-                projectile->activate();
-                continue;
-            }
-
-            magicBoltState.mHitPosition = pos;
-            cleanupMagicBolt(magicBoltState);
 
             MWMechanics::CastSpell cast(caster, target);
             cast.mHitPosition = pos;
@@ -602,6 +525,7 @@ namespace MWWorld
             cast.inflict(target, caster, magicBoltState.mEffects, ESM::RT_Target, false, true);
 
             MWBase::Environment::get().getWorld()->explodeSpell(pos, magicBoltState.mEffects, caster, target, ESM::RT_Target, magicBoltState.mSpellId, magicBoltState.mSourceName);
+            cleanupMagicBolt(magicBoltState);
         }
         mProjectiles.erase(std::remove_if(mProjectiles.begin(), mProjectiles.end(), [](const State& state) { return state.mToDelete; }),
                 mProjectiles.end());
@@ -702,7 +626,7 @@ namespace MWWorld
                 int weaponType = ptr.get<ESM::Weapon>()->mBase->mData.mType;
                 state.mThrown = MWMechanics::getWeaponType(weaponType)->mWeaponClass == ESM::WeaponType::Thrown;
 
-                state.mProjectileId = mPhysics->addProjectile(state.getCaster(), osg::Vec3f(esm.mPosition));
+                state.mProjectileId = mPhysics->addProjectile(state.getCaster(), osg::Vec3f(esm.mPosition), 1.f, true);
             }
             catch(...)
             {
@@ -747,7 +671,6 @@ namespace MWWorld
                 MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), state.mIdMagic.at(0));
                 MWWorld::Ptr ptr = ref.getPtr();
                 model = ptr.getClass().getModel(ptr);
-                state.mProjectileId = mPhysics->addProjectile(state.getCaster(), osg::Vec3f(esm.mPosition));
             }
             catch(...)
             {
@@ -755,7 +678,8 @@ namespace MWWorld
             }
 
             osg::Vec4 lightDiffuseColor = getMagicBoltLightDiffuseColor(state.mEffects);
-            createModel(state, model, osg::Vec3f(esm.mPosition), osg::Quat(esm.mOrientation), true, true, lightDiffuseColor, texture);
+            const auto radius = createModel(state, model, osg::Vec3f(esm.mPosition), osg::Quat(esm.mOrientation), true, true, lightDiffuseColor, texture);
+            state.mProjectileId = mPhysics->addProjectile(state.getCaster(), osg::Vec3f(esm.mPosition), radius, false);
 
             MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
             for (const std::string &soundid : state.mSoundIds)
diff --git a/apps/openmw/mwworld/projectilemanager.hpp b/apps/openmw/mwworld/projectilemanager.hpp
index 2cd570847b..e088dd7011 100644
--- a/apps/openmw/mwworld/projectilemanager.hpp
+++ b/apps/openmw/mwworld/projectilemanager.hpp
@@ -80,8 +80,6 @@ namespace MWWorld
             int mActorId;
             int mProjectileId;
 
-            osg::Vec3f mHitPosition;
-
             // TODO: this will break when the game is saved and reloaded, since there is currently
             // no way to write identifiers for non-actors to a savegame.
             MWWorld::Ptr mCasterHandle;
@@ -132,7 +130,7 @@ namespace MWWorld
         void moveProjectiles(float dt);
         void moveMagicBolts(float dt);
 
-        void createModel (State& state, const std::string& model, const osg::Vec3f& pos, const osg::Quat& orient,
+        float createModel (State& state, const std::string& model, const osg::Vec3f& pos, const osg::Quat& orient,
                             bool rotate, bool createLight, osg::Vec4 lightDiffuseColor, std::string texture = "");
         void update (State& state, float duration);
 

From cd5e31dc4ba2cdbbc80de93bf59ccc83c3bbda70 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Fri, 22 Jan 2021 19:04:07 +0000
Subject: [PATCH 0242/2859] Revert "Merge branch 'windowing-system' into
 'master'"

This reverts merge request !541
---
 components/sdlutil/sdlcursormanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/sdlutil/sdlcursormanager.cpp b/components/sdlutil/sdlcursormanager.cpp
index 964762ec76..56225868e3 100644
--- a/components/sdlutil/sdlcursormanager.cpp
+++ b/components/sdlutil/sdlcursormanager.cpp
@@ -20,7 +20,7 @@
 
 #include "imagetosurface.hpp"
 
-#if defined(OSG_LIBRARY_STATIC) && defined(USE_GRAPHICSWINDOW)
+#if defined(OSG_LIBRARY_STATIC) && !defined(ANDROID)
 // Sets the default windowing system interface according to the OS.
 // Necessary for OpenSceneGraph to do some things, like decompression.
 USE_GRAPHICSWINDOW()

From eb80c997b8255e86b86096bc4ac9218929eaeddd Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Fri, 22 Jan 2021 19:44:22 +0000
Subject: [PATCH 0243/2859] Avoid OSG setting array binding from multiple
 threads

---
 components/terrain/buffercache.cpp  | 2 +-
 components/terrain/chunkmanager.cpp | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/components/terrain/buffercache.cpp b/components/terrain/buffercache.cpp
index 5871b96bc0..f9eb7ae635 100644
--- a/components/terrain/buffercache.cpp
+++ b/components/terrain/buffercache.cpp
@@ -186,7 +186,7 @@ namespace Terrain
 
         int vertexCount = numVerts * numVerts;
 
-        osg::ref_ptr<osg::Vec2Array> uvs (new osg::Vec2Array);
+        osg::ref_ptr<osg::Vec2Array> uvs (new osg::Vec2Array(osg::Array::BIND_PER_VERTEX));
         uvs->reserve(vertexCount);
 
         for (unsigned int col = 0; col < numVerts; ++col)
diff --git a/components/terrain/chunkmanager.cpp b/components/terrain/chunkmanager.cpp
index 041414a87a..50724628dd 100644
--- a/components/terrain/chunkmanager.cpp
+++ b/components/terrain/chunkmanager.cpp
@@ -197,8 +197,7 @@ osg::ref_ptr<osg::Node> ChunkManager::createChunk(float chunkSize, const osg::Ve
     bool useCompositeMap = chunkSize >= mCompositeMapLevel;
     unsigned int numUvSets = useCompositeMap ? 1 : 2;
 
-    for (unsigned int i=0; i<numUvSets; ++i)
-        geometry->setTexCoordArray(i, mBufferCache.getUVBuffer(numVerts));
+    geometry->setTexCoordArrayList(osg::Geometry::ArrayList(numUvSets, mBufferCache.getUVBuffer(numVerts)));
 
     geometry->createClusterCullingCallback();
 

From a401c517bfa000347443c2837a0b55718000a53a Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 23 Jan 2021 00:56:46 +0100
Subject: [PATCH 0244/2859] Always unload height fields

loadCell always adds a height field, but unloadCell only removed it for
cells with height data. Reloading a cell overwrote the height field
added earlier (leading to its destruction) while the navigator retained
a reference to the now deleted collision shape, leading to a crash.
---
 apps/openmw/mwworld/scene.cpp | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 47b62862f7..427ee3aa8b 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -340,17 +340,9 @@ namespace MWWorld
 
         if ((*iter)->getCell()->isExterior())
         {
-            const ESM::Land* land =
-                MWBase::Environment::get().getWorld()->getStore().get<ESM::Land>().search(
-                    (*iter)->getCell()->getGridX(),
-                    (*iter)->getCell()->getGridY()
-                );
-            if (land && land->mDataTypes&ESM::Land::DATA_VHGT)
-            {
-                if (const auto heightField = mPhysics->getHeightField(cellX, cellY))
-                    navigator->removeObject(DetourNavigator::ObjectId(heightField));
-                mPhysics->removeHeightField(cellX, cellY);
-            }
+            if (const auto heightField = mPhysics->getHeightField(cellX, cellY))
+                navigator->removeObject(DetourNavigator::ObjectId(heightField));
+            mPhysics->removeHeightField(cellX, cellY);
         }
 
         if ((*iter)->getCell()->hasWater())

From bd7d5a8f92640ceadaa70b22e650a5644f1b030f Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Sat, 23 Jan 2021 04:08:39 +0000
Subject: [PATCH 0245/2859] Fix memory leak in FontLoader::loadFontFromXml

Tried building with -DCMAKE_CXX_FLAGS='-fsanitize=address -fsanitize-recover=address'
and this was one of the reported leaks.
---
 components/fontloader/fontloader.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index 605d552435..09bf0b190b 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -630,6 +630,7 @@ namespace Gui
             }
 
             MyGUI::ResourceManager::getInstance().loadFromXmlNode(copy, _file, _version);
+            delete copy;
         }
     }
 

From 3300e26c86ecd4c84cc6b099e2abe918a6a5ef3c Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Sat, 23 Jan 2021 15:25:05 +0000
Subject: [PATCH 0246/2859] Add changelog entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b3a3438a1..cede01f631 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@
     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 #5101: Hostile followers travel with the player
     Bug #5108: Savegame bloating due to inefficient fog textures format

From 1e113710efb68183300c228ffa05136072789659 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Sat, 23 Jan 2021 17:14:56 +0000
Subject: [PATCH 0247/2859] Clean-up FontLoader::loadFontFromXml fix

Follow-up to !559
---
 components/fontloader/fontloader.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index 09bf0b190b..2bed079e17 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -593,7 +593,7 @@ namespace Gui
 
         if (createCopy)
         {
-            MyGUI::xml::ElementPtr copy = _node->createCopy();
+            std::unique_ptr<MyGUI::xml::Element> copy{_node->createCopy()};
 
             MyGUI::xml::ElementEnumerator copyFont = copy->getElementEnumerator();
             while (copyFont.next("Resource"))
@@ -629,8 +629,7 @@ namespace Gui
                 }
             }
 
-            MyGUI::ResourceManager::getInstance().loadFromXmlNode(copy, _file, _version);
-            delete copy;
+            MyGUI::ResourceManager::getInstance().loadFromXmlNode(copy.get(), _file, _version);
         }
     }
 

From 165c7314928dc281a364fa1a0143c45fd6d2adfd Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sat, 23 Jan 2021 10:43:32 +0100
Subject: [PATCH 0248/2859] Remove physics dependency on basenode

Necessary to be able to load physics objects from inactive cells.
---
 apps/openmw/mwclass/activator.cpp       |  4 +--
 apps/openmw/mwclass/activator.hpp       |  2 +-
 apps/openmw/mwclass/actor.cpp           |  6 +----
 apps/openmw/mwclass/actor.hpp           | 10 +++----
 apps/openmw/mwclass/apparatus.cpp       |  5 ----
 apps/openmw/mwclass/apparatus.hpp       |  2 --
 apps/openmw/mwclass/armor.cpp           |  5 ----
 apps/openmw/mwclass/armor.hpp           |  2 --
 apps/openmw/mwclass/bodypart.cpp        |  4 ---
 apps/openmw/mwclass/bodypart.hpp        |  2 --
 apps/openmw/mwclass/book.cpp            |  5 ----
 apps/openmw/mwclass/book.hpp            |  2 --
 apps/openmw/mwclass/clothing.cpp        |  5 ----
 apps/openmw/mwclass/clothing.hpp        |  2 --
 apps/openmw/mwclass/container.cpp       |  4 +--
 apps/openmw/mwclass/container.hpp       |  2 +-
 apps/openmw/mwclass/door.cpp            |  4 +--
 apps/openmw/mwclass/door.hpp            |  2 +-
 apps/openmw/mwclass/ingredient.cpp      |  5 ----
 apps/openmw/mwclass/ingredient.hpp      |  2 --
 apps/openmw/mwclass/light.cpp           |  4 +--
 apps/openmw/mwclass/light.hpp           |  2 +-
 apps/openmw/mwclass/lockpick.cpp        |  5 ----
 apps/openmw/mwclass/lockpick.hpp        |  2 --
 apps/openmw/mwclass/misc.cpp            |  5 ----
 apps/openmw/mwclass/misc.hpp            |  2 --
 apps/openmw/mwclass/potion.cpp          |  5 ----
 apps/openmw/mwclass/potion.hpp          |  2 --
 apps/openmw/mwclass/probe.cpp           |  5 ----
 apps/openmw/mwclass/probe.hpp           |  2 --
 apps/openmw/mwclass/repair.cpp          |  5 ----
 apps/openmw/mwclass/repair.hpp          |  2 --
 apps/openmw/mwclass/static.cpp          |  4 +--
 apps/openmw/mwclass/static.hpp          |  2 +-
 apps/openmw/mwclass/weapon.cpp          |  5 ----
 apps/openmw/mwclass/weapon.hpp          |  2 --
 apps/openmw/mwphysics/actor.cpp         |  6 ++---
 apps/openmw/mwphysics/actor.hpp         |  2 +-
 apps/openmw/mwphysics/object.cpp        | 11 +++++---
 apps/openmw/mwphysics/object.hpp        |  4 +--
 apps/openmw/mwphysics/physicssystem.cpp | 10 +++----
 apps/openmw/mwphysics/physicssystem.hpp |  4 +--
 apps/openmw/mwworld/class.cpp           |  6 +----
 apps/openmw/mwworld/class.hpp           | 13 +++++----
 apps/openmw/mwworld/scene.cpp           | 36 +++++++++++++------------
 apps/openmw/mwworld/worldimp.cpp        |  2 +-
 46 files changed, 68 insertions(+), 155 deletions(-)

diff --git a/apps/openmw/mwclass/activator.cpp b/apps/openmw/mwclass/activator.cpp
index c54b1c3691..716e548e1d 100644
--- a/apps/openmw/mwclass/activator.cpp
+++ b/apps/openmw/mwclass/activator.cpp
@@ -38,10 +38,10 @@ namespace MWClass
         }
     }
 
-    void Activator::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
+    void Activator::insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics) const
     {
         if(!model.empty())
-            physics.addObject(ptr, model);
+            physics.addObject(ptr, model, rotation);
     }
 
     std::string Activator::getModel(const MWWorld::ConstPtr &ptr) const
diff --git a/apps/openmw/mwclass/activator.hpp b/apps/openmw/mwclass/activator.hpp
index 10ace6f74d..c7b65ef679 100644
--- a/apps/openmw/mwclass/activator.hpp
+++ b/apps/openmw/mwclass/activator.hpp
@@ -17,7 +17,7 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics) const override;
 
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
diff --git a/apps/openmw/mwclass/actor.cpp b/apps/openmw/mwclass/actor.cpp
index 33aeb26bb0..1789f1b19a 100644
--- a/apps/openmw/mwclass/actor.cpp
+++ b/apps/openmw/mwclass/actor.cpp
@@ -17,16 +17,12 @@
 
 namespace MWClass
 {
-    Actor::Actor() {}
-
-    Actor::~Actor() {}
-
     void Actor::adjustPosition(const MWWorld::Ptr& ptr, bool force) const
     {
         MWBase::Environment::get().getWorld()->adjustPosition(ptr, force);
     }
 
-    void Actor::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
+    void Actor::insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics) const
     {
         if (!model.empty())
         {
diff --git a/apps/openmw/mwclass/actor.hpp b/apps/openmw/mwclass/actor.hpp
index 3d509b2768..98998b4eb2 100644
--- a/apps/openmw/mwclass/actor.hpp
+++ b/apps/openmw/mwclass/actor.hpp
@@ -15,16 +15,16 @@ namespace MWClass
     {
     protected:
 
-        Actor();
+        Actor() = default;
 
     public:
-        virtual ~Actor();
+         ~Actor() override = default;
 
         void adjustPosition(const MWWorld::Ptr& ptr, bool force) const override;
         ///< Adjust position to stand on ground. Must be called post model load
         /// @param force do this even if the ptr is flying
 
-        void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
+        void insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics) const override;
 
         bool useAnim() const override;
 
@@ -46,8 +46,8 @@ namespace MWClass
         float getCurrentSpeed(const MWWorld::Ptr& ptr) const override;
         
         // not implemented
-        Actor(const Actor&);
-        Actor& operator= (const Actor&);
+        Actor(const Actor&) = delete;
+        Actor& operator= (const Actor&) = delete;
     };
 }
 
diff --git a/apps/openmw/mwclass/apparatus.cpp b/apps/openmw/mwclass/apparatus.cpp
index 518695fabf..e09e4804ce 100644
--- a/apps/openmw/mwclass/apparatus.cpp
+++ b/apps/openmw/mwclass/apparatus.cpp
@@ -26,11 +26,6 @@ namespace MWClass
         }
     }
 
-    void Apparatus::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
-    {
-        // TODO: add option somewhere to enable collision for placeable objects
-    }
-
     std::string Apparatus::getModel(const MWWorld::ConstPtr &ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Apparatus> *ref = ptr.get<ESM::Apparatus>();
diff --git a/apps/openmw/mwclass/apparatus.hpp b/apps/openmw/mwclass/apparatus.hpp
index 8087c57ba3..828abef25e 100644
--- a/apps/openmw/mwclass/apparatus.hpp
+++ b/apps/openmw/mwclass/apparatus.hpp
@@ -17,8 +17,6 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
-
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index 3f9bfb859f..817adbc1f5 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -34,11 +34,6 @@ namespace MWClass
         }
     }
 
-    void Armor::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
-    {
-        // TODO: add option somewhere to enable collision for placeable objects
-    }
-
     std::string Armor::getModel(const MWWorld::ConstPtr &ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Armor> *ref = ptr.get<ESM::Armor>();
diff --git a/apps/openmw/mwclass/armor.hpp b/apps/openmw/mwclass/armor.hpp
index 4f04e0824b..f64f138a29 100644
--- a/apps/openmw/mwclass/armor.hpp
+++ b/apps/openmw/mwclass/armor.hpp
@@ -16,8 +16,6 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
-
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwclass/bodypart.cpp b/apps/openmw/mwclass/bodypart.cpp
index 0315d3ddb0..7fe798e27d 100644
--- a/apps/openmw/mwclass/bodypart.cpp
+++ b/apps/openmw/mwclass/bodypart.cpp
@@ -22,10 +22,6 @@ namespace MWClass
         }
     }
 
-    void BodyPart::insertObject(const MWWorld::Ptr &ptr, const std::string &model, MWPhysics::PhysicsSystem &physics) const
-    {
-    }
-
     std::string BodyPart::getName(const MWWorld::ConstPtr &ptr) const
     {
         return std::string();
diff --git a/apps/openmw/mwclass/bodypart.hpp b/apps/openmw/mwclass/bodypart.hpp
index 13d9141386..0e372b884a 100644
--- a/apps/openmw/mwclass/bodypart.hpp
+++ b/apps/openmw/mwclass/bodypart.hpp
@@ -15,8 +15,6 @@ namespace MWClass
         void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
         ///< Add reference into a cell for rendering
 
-        void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
-
         std::string getName (const MWWorld::ConstPtr& ptr) const override;
         ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwclass/book.cpp b/apps/openmw/mwclass/book.cpp
index 4ea71e3ac2..51b9e39d7a 100644
--- a/apps/openmw/mwclass/book.cpp
+++ b/apps/openmw/mwclass/book.cpp
@@ -31,11 +31,6 @@ namespace MWClass
         }
     }
 
-    void Book::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
-    {
-        // TODO: add option somewhere to enable collision for placeable objects
-    }
-
     std::string Book::getModel(const MWWorld::ConstPtr &ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Book> *ref = ptr.get<ESM::Book>();
diff --git a/apps/openmw/mwclass/book.hpp b/apps/openmw/mwclass/book.hpp
index c58e68ad87..f3d34c5168 100644
--- a/apps/openmw/mwclass/book.hpp
+++ b/apps/openmw/mwclass/book.hpp
@@ -14,8 +14,6 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
-
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index 6d7960aac2..400cd97e41 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -29,11 +29,6 @@ namespace MWClass
         }
     }
 
-    void Clothing::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
-    {
-        // TODO: add option somewhere to enable collision for placeable objects
-    }
-
     std::string Clothing::getModel(const MWWorld::ConstPtr &ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Clothing> *ref = ptr.get<ESM::Clothing>();
diff --git a/apps/openmw/mwclass/clothing.hpp b/apps/openmw/mwclass/clothing.hpp
index a87e0cbe00..3d5c162aa4 100644
--- a/apps/openmw/mwclass/clothing.hpp
+++ b/apps/openmw/mwclass/clothing.hpp
@@ -14,8 +14,6 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
-
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index 28305c394e..3023466f08 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -111,10 +111,10 @@ namespace MWClass
         }
     }
 
-    void Container::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
+    void Container::insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics) const
     {
         if(!model.empty())
-            physics.addObject(ptr, model);
+            physics.addObject(ptr, model, rotation);
     }
 
     std::string Container::getModel(const MWWorld::ConstPtr &ptr) const
diff --git a/apps/openmw/mwclass/container.hpp b/apps/openmw/mwclass/container.hpp
index 2dc0c06cae..74d9ac0da2 100644
--- a/apps/openmw/mwclass/container.hpp
+++ b/apps/openmw/mwclass/container.hpp
@@ -44,7 +44,7 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics) const override;
 
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index ba51d9c2bc..983953c20d 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -62,10 +62,10 @@ namespace MWClass
         }
     }
 
-    void Door::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
+    void Door::insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics) const
     {
         if(!model.empty())
-            physics.addObject(ptr, model, MWPhysics::CollisionType_Door);
+            physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_Door);
 
         // Resume the door's opening/closing animation if it wasn't finished
         if (ptr.getRefData().getCustomData())
diff --git a/apps/openmw/mwclass/door.hpp b/apps/openmw/mwclass/door.hpp
index 6c2fa26b80..6d40a840b1 100644
--- a/apps/openmw/mwclass/door.hpp
+++ b/apps/openmw/mwclass/door.hpp
@@ -18,7 +18,7 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics) const override;
 
             bool isDoor() const override;
 
diff --git a/apps/openmw/mwclass/ingredient.cpp b/apps/openmw/mwclass/ingredient.cpp
index a007ad115f..20f9576dff 100644
--- a/apps/openmw/mwclass/ingredient.cpp
+++ b/apps/openmw/mwclass/ingredient.cpp
@@ -28,11 +28,6 @@ namespace MWClass
         }
     }
 
-    void Ingredient::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
-    {
-        // TODO: add option somewhere to enable collision for placeable objects
-    }
-
     std::string Ingredient::getModel(const MWWorld::ConstPtr &ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Ingredient> *ref = ptr.get<ESM::Ingredient>();
diff --git a/apps/openmw/mwclass/ingredient.hpp b/apps/openmw/mwclass/ingredient.hpp
index 5219cf39ce..2aa831f868 100644
--- a/apps/openmw/mwclass/ingredient.hpp
+++ b/apps/openmw/mwclass/ingredient.hpp
@@ -14,8 +14,6 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
-
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index 3bdf10f475..d4d196bc4b 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -33,7 +33,7 @@ namespace MWClass
         renderingInterface.getObjects().insertModel(ptr, model, true, !(ref->mBase->mData.mFlags & ESM::Light::OffDefault));
     }
 
-    void Light::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
+    void Light::insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics) const
     {
         MWWorld::LiveCellRef<ESM::Light> *ref =
             ptr.get<ESM::Light>();
@@ -41,7 +41,7 @@ namespace MWClass
 
         // TODO: add option somewhere to enable collision for placeable objects
         if (!model.empty() && (ref->mBase->mData.mFlags & ESM::Light::Carry) == 0)
-            physics.addObject(ptr, model);
+            physics.addObject(ptr, model, rotation);
 
         if (!ref->mBase->mSound.empty() && !(ref->mBase->mData.mFlags & ESM::Light::OffDefault))
             MWBase::Environment::get().getSoundManager()->playSound3D(ptr, ref->mBase->mSound, 1.0, 1.0,
diff --git a/apps/openmw/mwclass/light.hpp b/apps/openmw/mwclass/light.hpp
index e37dddc250..1b1794d4a7 100644
--- a/apps/openmw/mwclass/light.hpp
+++ b/apps/openmw/mwclass/light.hpp
@@ -14,7 +14,7 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics) const override;
 
             bool useAnim() const override;
 
diff --git a/apps/openmw/mwclass/lockpick.cpp b/apps/openmw/mwclass/lockpick.cpp
index 9b8abc8f23..985b087711 100644
--- a/apps/openmw/mwclass/lockpick.cpp
+++ b/apps/openmw/mwclass/lockpick.cpp
@@ -28,11 +28,6 @@ namespace MWClass
         }
     }
 
-    void Lockpick::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
-    {
-        // TODO: add option somewhere to enable collision for placeable objects
-    }
-
     std::string Lockpick::getModel(const MWWorld::ConstPtr &ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Lockpick> *ref = ptr.get<ESM::Lockpick>();
diff --git a/apps/openmw/mwclass/lockpick.hpp b/apps/openmw/mwclass/lockpick.hpp
index fabae33435..d4b265e397 100644
--- a/apps/openmw/mwclass/lockpick.hpp
+++ b/apps/openmw/mwclass/lockpick.hpp
@@ -14,8 +14,6 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
-
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwclass/misc.cpp b/apps/openmw/mwclass/misc.cpp
index 8d3cda6fe5..facab9d51c 100644
--- a/apps/openmw/mwclass/misc.cpp
+++ b/apps/openmw/mwclass/misc.cpp
@@ -37,11 +37,6 @@ namespace MWClass
         }
     }
 
-    void Miscellaneous::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
-    {
-        // TODO: add option somewhere to enable collision for placeable objects
-    }
-
     std::string Miscellaneous::getModel(const MWWorld::ConstPtr &ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Miscellaneous> *ref = ptr.get<ESM::Miscellaneous>();
diff --git a/apps/openmw/mwclass/misc.hpp b/apps/openmw/mwclass/misc.hpp
index 9bff85ca56..18788c7ed8 100644
--- a/apps/openmw/mwclass/misc.hpp
+++ b/apps/openmw/mwclass/misc.hpp
@@ -14,8 +14,6 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
-
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwclass/potion.cpp b/apps/openmw/mwclass/potion.cpp
index 4af97e6345..56d9dff279 100644
--- a/apps/openmw/mwclass/potion.cpp
+++ b/apps/openmw/mwclass/potion.cpp
@@ -30,11 +30,6 @@ namespace MWClass
         }
     }
 
-    void Potion::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
-    {
-        // TODO: add option somewhere to enable collision for placeable objects
-    }
-
     std::string Potion::getModel(const MWWorld::ConstPtr &ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Potion> *ref = ptr.get<ESM::Potion>();
diff --git a/apps/openmw/mwclass/potion.hpp b/apps/openmw/mwclass/potion.hpp
index 75d923f0ba..75b962164b 100644
--- a/apps/openmw/mwclass/potion.hpp
+++ b/apps/openmw/mwclass/potion.hpp
@@ -14,8 +14,6 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
-
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwclass/probe.cpp b/apps/openmw/mwclass/probe.cpp
index dba4e8c063..51273337a6 100644
--- a/apps/openmw/mwclass/probe.cpp
+++ b/apps/openmw/mwclass/probe.cpp
@@ -28,11 +28,6 @@ namespace MWClass
         }
     }
 
-    void Probe::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
-    {
-        // TODO: add option somewhere to enable collision for placeable objects
-    }
-
     std::string Probe::getModel(const MWWorld::ConstPtr &ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Probe> *ref = ptr.get<ESM::Probe>();
diff --git a/apps/openmw/mwclass/probe.hpp b/apps/openmw/mwclass/probe.hpp
index a0a41dcfb6..ef9273a379 100644
--- a/apps/openmw/mwclass/probe.hpp
+++ b/apps/openmw/mwclass/probe.hpp
@@ -14,8 +14,6 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
-
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwclass/repair.cpp b/apps/openmw/mwclass/repair.cpp
index 8907c8212e..f1b88e422b 100644
--- a/apps/openmw/mwclass/repair.cpp
+++ b/apps/openmw/mwclass/repair.cpp
@@ -25,11 +25,6 @@ namespace MWClass
         }
     }
 
-    void Repair::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
-    {
-        // TODO: add option somewhere to enable collision for placeable objects
-    }
-
     std::string Repair::getModel(const MWWorld::ConstPtr &ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Repair> *ref = ptr.get<ESM::Repair>();
diff --git a/apps/openmw/mwclass/repair.hpp b/apps/openmw/mwclass/repair.hpp
index b9791e9cf4..c403449e18 100644
--- a/apps/openmw/mwclass/repair.hpp
+++ b/apps/openmw/mwclass/repair.hpp
@@ -14,8 +14,6 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
-
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwclass/static.cpp b/apps/openmw/mwclass/static.cpp
index 5551b3d731..108c4eaa20 100644
--- a/apps/openmw/mwclass/static.cpp
+++ b/apps/openmw/mwclass/static.cpp
@@ -23,10 +23,10 @@ namespace MWClass
         }
     }
 
-    void Static::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
+    void Static::insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics) const
     {
         if(!model.empty())
-            physics.addObject(ptr, model);
+            physics.addObject(ptr, model, rotation);
     }
 
     std::string Static::getModel(const MWWorld::ConstPtr &ptr) const
diff --git a/apps/openmw/mwclass/static.hpp b/apps/openmw/mwclass/static.hpp
index 6bc783dad0..f856e9fd94 100644
--- a/apps/openmw/mwclass/static.hpp
+++ b/apps/openmw/mwclass/static.hpp
@@ -14,7 +14,7 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics) const override;
 
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index 0d6a27cf60..6246c8fb09 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -34,11 +34,6 @@ namespace MWClass
         }
     }
 
-    void Weapon::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
-    {
-        // TODO: add option somewhere to enable collision for placeable objects
-    }
-
     std::string Weapon::getModel(const MWWorld::ConstPtr &ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Weapon> *ref = ptr.get<ESM::Weapon>();
diff --git a/apps/openmw/mwclass/weapon.hpp b/apps/openmw/mwclass/weapon.hpp
index f1824b7d14..db17e6b70f 100644
--- a/apps/openmw/mwclass/weapon.hpp
+++ b/apps/openmw/mwclass/weapon.hpp
@@ -15,8 +15,6 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
-
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index 3b52ee934f..06600fd6ac 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -67,7 +67,7 @@ Actor::Actor(const MWWorld::Ptr& ptr, const Resource::BulletShape* shape, Physic
     updateScale();
 
     if(!mRotationallyInvariant)
-        updateRotation();
+        setRotation(mPtr.getRefData().getBaseNode()->getAttitude());
 
     updatePosition();
     addCollisionMask(getCollisionMask());
@@ -197,10 +197,10 @@ osg::Vec3f Actor::getPreviousPosition() const
     return mPreviousPosition;
 }
 
-void Actor::updateRotation ()
+void Actor::setRotation(osg::Quat quat)
 {
     std::scoped_lock lock(mPositionMutex);
-    mRotation = mPtr.getRefData().getBaseNode()->getAttitude();
+    mRotation = quat;
 }
 
 bool Actor::isRotationallyInvariant() const
diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index 9d129f2ba6..4039f44811 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -49,7 +49,7 @@ namespace MWPhysics
         void enableCollisionBody(bool collision);
 
         void updateScale();
-        void updateRotation();
+        void setRotation(osg::Quat quat);
 
         /**
          * Return true if the collision shape looks the same no matter how its Z rotated.
diff --git a/apps/openmw/mwphysics/object.cpp b/apps/openmw/mwphysics/object.cpp
index e3615989dd..0a7b9540c5 100644
--- a/apps/openmw/mwphysics/object.cpp
+++ b/apps/openmw/mwphysics/object.cpp
@@ -14,7 +14,7 @@
 
 namespace MWPhysics
 {
-    Object::Object(const MWWorld::Ptr& ptr, osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance, int collisionType, PhysicsTaskScheduler* scheduler)
+    Object::Object(const MWWorld::Ptr& ptr, osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance, osg::Quat rotation, int collisionType, PhysicsTaskScheduler* scheduler)
         : mShapeInstance(shapeInstance)
         , mSolid(true)
         , mTaskScheduler(scheduler)
@@ -27,7 +27,7 @@ namespace MWPhysics
         mCollisionObject->setUserPointer(this);
 
         setScale(ptr.getCellRef().getScale());
-        setRotation(Misc::Convert::toBullet(ptr.getRefData().getBaseNode()->getAttitude()));
+        setRotation(rotation);
         setOrigin(Misc::Convert::toBullet(ptr.getRefData().getPosition().asVec3()));
         commitPositionChange();
 
@@ -51,10 +51,10 @@ namespace MWPhysics
         mScaleUpdatePending = true;
     }
 
-    void Object::setRotation(const btQuaternion& quat)
+    void Object::setRotation(osg::Quat quat)
     {
         std::unique_lock<std::mutex> lock(mPositionMutex);
-        mLocalTransform.setRotation(quat);
+        mLocalTransform.setRotation(Misc::Convert::toBullet(quat));
         mTransformUpdatePending = true;
     }
 
@@ -116,6 +116,9 @@ namespace MWPhysics
         if (mShapeInstance->mAnimatedShapes.empty())
             return false;
 
+        if (mPtr.getRefData().getBaseNode() == nullptr)
+            return true;
+
         assert (mShapeInstance->getCollisionShape()->isCompound());
 
         btCompoundShape* compound = static_cast<btCompoundShape*>(mShapeInstance->getCollisionShape());
diff --git a/apps/openmw/mwphysics/object.hpp b/apps/openmw/mwphysics/object.hpp
index cae8771809..c2273831e5 100644
--- a/apps/openmw/mwphysics/object.hpp
+++ b/apps/openmw/mwphysics/object.hpp
@@ -26,12 +26,12 @@ namespace MWPhysics
     class Object final : public PtrHolder
     {
     public:
-        Object(const MWWorld::Ptr& ptr, osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance, int collisionType, PhysicsTaskScheduler* scheduler);
+        Object(const MWWorld::Ptr& ptr, osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance, osg::Quat rotation, int collisionType, PhysicsTaskScheduler* scheduler);
         ~Object() override;
 
         const Resource::BulletShapeInstance* getShapeInstance() const;
         void setScale(float scale);
-        void setRotation(const btQuaternion& quat);
+        void setRotation(osg::Quat quat);
         void setOrigin(const btVector3& vec);
         void commitPositionChange();
         btCollisionObject* getCollisionObject();
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index ed0e0c915d..68cec48bcb 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -456,13 +456,13 @@ namespace MWPhysics
         return heightField->second.get();
     }
 
-    void PhysicsSystem::addObject (const MWWorld::Ptr& ptr, const std::string& mesh, int collisionType)
+    void PhysicsSystem::addObject (const MWWorld::Ptr& ptr, const std::string& mesh, osg::Quat rotation, int collisionType)
     {
         osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance = mShapeManager->getInstance(mesh);
         if (!shapeInstance || !shapeInstance->getCollisionShape())
             return;
 
-        auto obj = std::make_shared<Object>(ptr, shapeInstance, collisionType, mTaskScheduler.get());
+        auto obj = std::make_shared<Object>(ptr, shapeInstance, rotation, collisionType, mTaskScheduler.get());
         mObjects.emplace(ptr, obj);
 
         if (obj->isAnimated())
@@ -621,12 +621,12 @@ namespace MWPhysics
         mTaskScheduler->updateSingleAabb(foundProjectile->second);
     }
 
-    void PhysicsSystem::updateRotation(const MWWorld::Ptr &ptr)
+    void PhysicsSystem::updateRotation(const MWWorld::Ptr &ptr, osg::Quat rotate)
     {
         ObjectMap::iterator found = mObjects.find(ptr);
         if (found != mObjects.end())
         {
-            found->second->setRotation(Misc::Convert::toBullet(ptr.getRefData().getBaseNode()->getAttitude()));
+            found->second->setRotation(rotate);
             mTaskScheduler->updateSingleAabb(found->second);
             return;
         }
@@ -635,7 +635,7 @@ namespace MWPhysics
         {
             if (!foundActor->second->isRotationallyInvariant())
             {
-                foundActor->second->updateRotation();
+                foundActor->second->setRotation(rotate);
                 mTaskScheduler->updateSingleAabb(foundActor->second);
             }
             return;
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 6f901067a2..c61b368f8e 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -121,7 +121,7 @@ namespace MWPhysics
             void setWaterHeight(float height);
             void disableWater();
 
-            void addObject (const MWWorld::Ptr& ptr, const std::string& mesh, int collisionType = CollisionType_World);
+            void addObject (const MWWorld::Ptr& ptr, const std::string& mesh, osg::Quat rotation, int collisionType = CollisionType_World);
             void addActor (const MWWorld::Ptr& ptr, const std::string& mesh);
 
             int addProjectile(const MWWorld::Ptr& caster, const osg::Vec3f& position, float radius, bool canTraverseWater);
@@ -141,7 +141,7 @@ namespace MWPhysics
             void remove (const MWWorld::Ptr& ptr);
 
             void updateScale (const MWWorld::Ptr& ptr);
-            void updateRotation (const MWWorld::Ptr& ptr);
+            void updateRotation (const MWWorld::Ptr& ptr, osg::Quat rotate);
             void updatePosition (const MWWorld::Ptr& ptr);
 
             void addHeightField (const float* heights, int x, int y, float triSize, float sqrtVerts, float minH, float maxH, const osg::Object* holdObject);
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index 950c8a6d49..becf912eaa 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -25,16 +25,12 @@ namespace MWWorld
 {
     std::map<std::string, std::shared_ptr<Class> > Class::sClasses;
 
-    Class::Class() {}
-
-    Class::~Class() {}
-
     void Class::insertObjectRendering (const Ptr& ptr, const std::string& mesh, MWRender::RenderingInterface& renderingInterface) const
     {
 
     }
 
-    void Class::insertObject(const Ptr& ptr, const std::string& mesh, MWPhysics::PhysicsSystem& physics) const
+    void Class::insertObject(const Ptr& ptr, const std::string& mesh, osg::Quat rotation, MWPhysics::PhysicsSystem& physics) const
     {
 
     }
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index 1b3d4029e4..39fb6fe4c5 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -6,6 +6,7 @@
 #include <string>
 #include <vector>
 
+#include <osg/Quat>
 #include <osg/Vec4f>
 
 #include "ptr.hpp"
@@ -57,13 +58,9 @@ namespace MWWorld
 
             std::string mTypeName;
 
-            // not implemented
-            Class (const Class&);
-            Class& operator= (const Class&);
-
         protected:
 
-            Class();
+            Class() = default;
 
             std::shared_ptr<Action> defaultItemActivate(const Ptr &ptr, const Ptr &actor) const;
             ///< Generate default action for activating inventory items
@@ -72,14 +69,16 @@ namespace MWWorld
 
         public:
 
-            virtual ~Class();
+            virtual ~Class() = default;
+            Class (const Class&) = delete;
+            Class& operator= (const Class&) = delete;
 
             const std::string& getTypeName() const {
                 return mTypeName;
             }
 
             virtual void insertObjectRendering (const Ptr& ptr, const std::string& mesh, MWRender::RenderingInterface& renderingInterface) const;
-            virtual void insertObject(const Ptr& ptr, const std::string& mesh, MWPhysics::PhysicsSystem& physics) const;
+            virtual void insertObject(const Ptr& ptr, const std::string& mesh, osg::Quat rotation, MWPhysics::PhysicsSystem& physics) const;
             ///< Add reference into a cell for rendering (default implementation: don't render anything).
 
             virtual std::string getName (const ConstPtr& ptr) const = 0;
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 427ee3aa8b..313e9a1527 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -75,18 +75,20 @@ namespace
             * osg::Quat(xr, osg::Vec3(-1, 0, 0));
     }
 
-    void setNodeRotation(const MWWorld::Ptr& ptr, MWRender::RenderingManager& rendering, RotationOrder order)
+    osg::Quat makeNodeRotation(const MWWorld::Ptr& ptr, RotationOrder order)
     {
-        if (!ptr.getRefData().getBaseNode())
-            return;
+        const auto pos = ptr.getRefData().getPosition();
+
+        const auto rot = ptr.getClass().isActor() ? makeActorOsgQuat(pos)
+            : (order == RotationOrder::inverse ? makeInversedOrderObjectOsgQuat(pos) : makeObjectOsgQuat(pos));
+
+        return rot;
+    }
 
-        rendering.rotateObject(ptr,
-            ptr.getClass().isActor()
-            ? makeActorOsgQuat(ptr.getRefData().getPosition())
-            : (order == RotationOrder::inverse
-                ? makeInversedOrderObjectOsgQuat(ptr.getRefData().getPosition())
-                : makeObjectOsgQuat(ptr.getRefData().getPosition()))
-        );
+    void setNodeRotation(const MWWorld::Ptr& ptr, MWRender::RenderingManager& rendering, osg::Quat rotation)
+    {
+        if (ptr.getRefData().getBaseNode())
+            rendering.rotateObject(ptr, rotation);
     }
 
     std::string getModel(const MWWorld::Ptr &ptr, const VFS::Manager *vfs)
@@ -117,11 +119,10 @@ namespace
         const ESM::RefNum& refnum = ptr.getCellRef().getRefNum();
         if (!refnum.hasContentFile() || pagedRefs.find(refnum) == pagedRefs.end())
             ptr.getClass().insertObjectRendering(ptr, model, rendering);
-        else
-            ptr.getRefData().setBaseNode(new SceneUtil::PositionAttitudeTransform); // FIXME remove this when physics code is fixed not to depend on basenode
-        setNodeRotation(ptr, rendering, RotationOrder::direct);
 
-        ptr.getClass().insertObject (ptr, model, physics);
+        const auto rotation = makeNodeRotation(ptr, RotationOrder::direct);
+        setNodeRotation(ptr, rendering, rotation);
+        ptr.getClass().insertObject (ptr, model, rotation, physics);
 
         if (useAnim)
             MWBase::Environment::get().getMechanicsManager()->add(ptr);
@@ -276,7 +277,7 @@ namespace MWWorld
         {
             if (!ptr.getRefData().getBaseNode()) return;
             ptr.getClass().insertObjectRendering(ptr, getModel(ptr, mRendering.getResourceSystem()->getVFS()), mRendering);
-            setNodeRotation(ptr, mRendering, RotationOrder::direct);
+            setNodeRotation(ptr, mRendering, makeNodeRotation(ptr, RotationOrder::direct));
             reloadTerrain();
         }
     }
@@ -292,8 +293,9 @@ namespace MWWorld
 
     void Scene::updateObjectRotation(const Ptr &ptr, RotationOrder order)
     {
-        setNodeRotation(ptr, mRendering, order);
-        mPhysics->updateRotation(ptr);
+        const auto rot = makeNodeRotation(ptr, order);
+        setNodeRotation(ptr, mRendering, rot);
+        mPhysics->updateRotation(ptr, rot);
     }
 
     void Scene::updateObjectScale(const Ptr &ptr)
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index bf5b6db738..af9a5e0bb3 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1407,7 +1407,7 @@ namespace MWWorld
             mWorldScene->removeFromPagedRefs(ptr);
 
             mRendering->rotateObject(ptr, rotate);
-            mPhysics->updateRotation(ptr);
+            mPhysics->updateRotation(ptr, rotate);
 
             if (const auto object = mPhysics->getObject(ptr))
                 updateNavigatorObject(object);

From f031a191b847443c848637b17d0936a43b5070b5 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sat, 23 Jan 2021 20:59:24 +0100
Subject: [PATCH 0249/2859] Some actors are supposed to spawn on a static
 object that belong to an adjacent cell. Since actors can be active in 3x3
 grid around the player, we need to first load all statics in a 5x5 grid
 around the player.

Split load and unloading in 2 phases. Add an mInactiveCells set into the
scene, which contains all cells inside the aforementioned 5x5 grid.
These cells contains only heightfields and physics objects of static
class.
---
 apps/openmw/mwclass/static.cpp          |   5 +
 apps/openmw/mwclass/static.hpp          |   2 +
 apps/openmw/mwphysics/physicssystem.cpp |   5 +-
 apps/openmw/mwphysics/physicssystem.hpp |   2 +-
 apps/openmw/mwworld/cellvisitors.hpp    |  13 +-
 apps/openmw/mwworld/class.hpp           |   4 +
 apps/openmw/mwworld/scene.cpp           | 405 ++++++++++++++----------
 apps/openmw/mwworld/scene.hpp           |  15 +-
 8 files changed, 269 insertions(+), 182 deletions(-)

diff --git a/apps/openmw/mwclass/static.cpp b/apps/openmw/mwclass/static.cpp
index 108c4eaa20..28156c97f6 100644
--- a/apps/openmw/mwclass/static.cpp
+++ b/apps/openmw/mwclass/static.cpp
@@ -63,4 +63,9 @@ namespace MWClass
 
         return MWWorld::Ptr(cell.insert(ref), &cell);
     }
+
+    bool Static::isStatic() const
+    {
+        return true;
+    }
 }
diff --git a/apps/openmw/mwclass/static.hpp b/apps/openmw/mwclass/static.hpp
index f856e9fd94..d0f4913f0f 100644
--- a/apps/openmw/mwclass/static.hpp
+++ b/apps/openmw/mwclass/static.hpp
@@ -25,6 +25,8 @@ namespace MWClass
             static void registerSelf();
 
             std::string getModel(const MWWorld::ConstPtr &ptr) const override;
+
+            bool isStatic() const override;
     };
 }
 
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 68cec48bcb..5a9a0be832 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -469,7 +469,7 @@ namespace MWPhysics
             mAnimatedObjects.insert(obj.get());
     }
 
-    void PhysicsSystem::remove(const MWWorld::Ptr &ptr)
+    void PhysicsSystem::remove(const MWWorld::Ptr &ptr, bool keepObject)
     {
         ObjectMap::iterator found = mObjects.find(ptr);
         if (found != mObjects.end())
@@ -479,7 +479,8 @@ namespace MWPhysics
 
             mAnimatedObjects.erase(found->second.get());
 
-            mObjects.erase(found);
+            if (!keepObject)
+                mObjects.erase(found);
         }
 
         ActorMap::iterator foundActor = mActors.find(ptr);
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index c61b368f8e..715a6cd1a2 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -138,7 +138,7 @@ namespace MWPhysics
             Projectile* getProjectile(int projectileId) const;
 
             // Object or Actor
-            void remove (const MWWorld::Ptr& ptr);
+            void remove (const MWWorld::Ptr& ptr, bool keepObject = false);
 
             void updateScale (const MWWorld::Ptr& ptr);
             void updateRotation (const MWWorld::Ptr& ptr, osg::Quat rotate);
diff --git a/apps/openmw/mwworld/cellvisitors.hpp b/apps/openmw/mwworld/cellvisitors.hpp
index e68b383b77..5985d06fb6 100644
--- a/apps/openmw/mwworld/cellvisitors.hpp
+++ b/apps/openmw/mwworld/cellvisitors.hpp
@@ -18,12 +18,23 @@ namespace MWWorld
             if (ptr.getRefData().getBaseNode())
             {
                 ptr.getRefData().setBaseNode(nullptr);
-                mObjects.push_back (ptr);
             }
+            mObjects.push_back (ptr);
 
             return true;
         }
     };
+
+    struct ListObjectsVisitor
+    {
+        std::vector<MWWorld::Ptr> mObjects;
+
+        bool operator() (MWWorld::Ptr ptr)
+        {
+            mObjects.push_back (ptr);
+            return true;
+        }
+    };
 }
 
 #endif
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index 39fb6fe4c5..592552d47f 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -318,6 +318,10 @@ namespace MWWorld
                 return false;
             }
 
+            virtual bool isStatic() const {
+                return false;
+            }
+
             virtual bool isBipedal(const MWWorld::ConstPtr& ptr) const;
             virtual bool canFly(const MWWorld::ConstPtr& ptr) const;
             virtual bool canSwim(const MWWorld::ConstPtr& ptr) const;
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 313e9a1527..fcf2c4b387 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -105,7 +105,7 @@ namespace
     }
 
     void addObject(const MWWorld::Ptr& ptr, MWPhysics::PhysicsSystem& physics,
-                   MWRender::RenderingManager& rendering, std::set<ESM::RefNum>& pagedRefs)
+                   MWRender::RenderingManager& rendering, std::set<ESM::RefNum>& pagedRefs, bool onlyPhysics)
     {
         if (ptr.getRefData().getBaseNode() || physics.getActor(ptr))
         {
@@ -113,25 +113,29 @@ namespace
             return;
         }
 
-        bool useAnim = ptr.getClass().useAnim();
         std::string model = getModel(ptr, rendering.getResourceSystem()->getVFS());
+        const auto rotation = makeNodeRotation(ptr, RotationOrder::direct);
+        if (!onlyPhysics)
+        {
+            bool useAnim = ptr.getClass().useAnim();
 
-        const ESM::RefNum& refnum = ptr.getCellRef().getRefNum();
-        if (!refnum.hasContentFile() || pagedRefs.find(refnum) == pagedRefs.end())
-            ptr.getClass().insertObjectRendering(ptr, model, rendering);
+            const ESM::RefNum& refnum = ptr.getCellRef().getRefNum();
+            if (!refnum.hasContentFile() || pagedRefs.find(refnum) == pagedRefs.end())
+                ptr.getClass().insertObjectRendering(ptr, model, rendering);
 
-        const auto rotation = makeNodeRotation(ptr, RotationOrder::direct);
-        setNodeRotation(ptr, rendering, rotation);
-        ptr.getClass().insertObject (ptr, model, rotation, physics);
+            setNodeRotation(ptr, rendering, rotation);
 
-        if (useAnim)
-            MWBase::Environment::get().getMechanicsManager()->add(ptr);
+            if (useAnim)
+                MWBase::Environment::get().getMechanicsManager()->add(ptr);
 
-        if (ptr.getClass().isActor())
-            rendering.addWaterRippleEmitter(ptr);
+            if (ptr.getClass().isActor())
+                rendering.addWaterRippleEmitter(ptr);
 
-        // Restore effect particles
-        MWBase::Environment::get().getWorld()->applyLoopingParticles(ptr);
+            // Restore effect particles
+            MWBase::Environment::get().getWorld()->applyLoopingParticles(ptr);
+        }
+        if (!physics.getObject(ptr))
+            ptr.getClass().insertObject (ptr, model, rotation, physics);
     }
 
     void addObject(const MWWorld::Ptr& ptr, const MWPhysics::PhysicsSystem& physics, DetourNavigator::Navigator& navigator)
@@ -202,11 +206,12 @@ namespace
     {
         MWWorld::CellStore& mCell;
         Loading::Listener& mLoadingListener;
+        bool mOnlyStatics;
         bool mTest;
 
         std::vector<MWWorld::Ptr> mToInsert;
 
-        InsertVisitor (MWWorld::CellStore& cell, Loading::Listener& loadingListener, bool test);
+        InsertVisitor (MWWorld::CellStore& cell, Loading::Listener& loadingListener, bool onlyStatics, bool test);
 
         bool operator() (const MWWorld::Ptr& ptr);
 
@@ -214,8 +219,8 @@ namespace
         void insert(AddObject&& addObject);
     };
 
-    InsertVisitor::InsertVisitor (MWWorld::CellStore& cell, Loading::Listener& loadingListener, bool test)
-    : mCell (cell), mLoadingListener (loadingListener), mTest(test)
+    InsertVisitor::InsertVisitor (MWWorld::CellStore& cell, Loading::Listener& loadingListener, bool onlyStatics, bool test)
+    : mCell (cell), mLoadingListener (loadingListener), mOnlyStatics(onlyStatics), mTest(test)
     {}
 
     bool InsertVisitor::operator() (const MWWorld::Ptr& ptr)
@@ -231,7 +236,7 @@ namespace
     {
         for (MWWorld::Ptr& ptr : mToInsert)
         {
-            if (!ptr.getRefData().isDeleted() && ptr.getRefData().isEnabled())
+            if (!ptr.getRefData().isDeleted() && ptr.getRefData().isEnabled() && ((mOnlyStatics && ptr.getClass().isStatic()) || !mOnlyStatics))
             {
                 try
                 {
@@ -264,6 +269,16 @@ namespace
         return std::abs(cellPosition.first) + std::abs(cellPosition.second);
     }
 
+    bool isCellInCollection(int x, int y, MWWorld::Scene::CellStoreCollection& collection)
+    {
+        for (auto *cell : collection)
+        {
+            assert(cell->getCell()->isExterior());
+            if (x == cell->getCell()->getGridX() && y == cell->getCell()->getGridY())
+                return true;
+        }
+        return false;
+    }
 }
 
 
@@ -315,15 +330,41 @@ namespace MWWorld
         mRendering.update (duration, paused);
     }
 
-    void Scene::unloadCell (CellStoreCollection::iterator iter, bool test)
+    void Scene::unloadInactiveCell (CellStore* cell, bool test)
+    {
+        assert(mActiveCells.find(cell) == mActiveCells.end());
+        assert(mInactiveCells.find(cell) != mInactiveCells.end());
+        if (!test)
+            Log(Debug::Info) << "Unloading cell " << cell->getCell()->getDescription();
+
+        ListObjectsVisitor visitor;
+
+        cell->forEach(visitor);
+        for (const auto& ptr : visitor.mObjects)
+            mPhysics->remove(ptr);
+
+        if (cell->getCell()->isExterior())
+        {
+            const auto cellX = cell->getCell()->getGridX();
+            const auto cellY = cell->getCell()->getGridY();
+            mPhysics->removeHeightField(cellX, cellY);
+        }
+
+        mInactiveCells.erase(cell);
+    }
+
+    void Scene::deactivateCell(CellStore* cell, bool test)
     {
+        assert(mInactiveCells.find(cell) != mInactiveCells.end());
+        if (mActiveCells.find(cell) == mActiveCells.end())
+            return;
         if (!test)
-            Log(Debug::Info) << "Unloading cell " << (*iter)->getCell()->getDescription();
+            Log(Debug::Info) << "Deactivate cell " << cell->getCell()->getDescription();
 
         const auto navigator = MWBase::Environment::get().getWorld()->getNavigator();
         ListAndResetObjectsVisitor visitor;
 
-        (*iter)->forEach(visitor);
+        cell->forEach(visitor);
         const auto world = MWBase::Environment::get().getWorld();
         for (const auto& ptr : visitor.mObjects)
         {
@@ -334,140 +375,157 @@ namespace MWWorld
                 navigator->removeAgent(world->getPathfindingHalfExtents(ptr));
                 mRendering.removeActorPath(ptr);
             }
-            mPhysics->remove(ptr);
+            mPhysics->remove(ptr, ptr.getClass().isStatic());
         }
 
-        const auto cellX = (*iter)->getCell()->getGridX();
-        const auto cellY = (*iter)->getCell()->getGridY();
+        const auto cellX = cell->getCell()->getGridX();
+        const auto cellY = cell->getCell()->getGridY();
 
-        if ((*iter)->getCell()->isExterior())
+        if (cell->getCell()->isExterior())
         {
             if (const auto heightField = mPhysics->getHeightField(cellX, cellY))
                 navigator->removeObject(DetourNavigator::ObjectId(heightField));
-            mPhysics->removeHeightField(cellX, cellY);
         }
 
-        if ((*iter)->getCell()->hasWater())
+        if (cell->getCell()->hasWater())
             navigator->removeWater(osg::Vec2i(cellX, cellY));
 
-        if (const auto pathgrid = world->getStore().get<ESM::Pathgrid>().search(*(*iter)->getCell()))
+        if (const auto pathgrid = world->getStore().get<ESM::Pathgrid>().search(*cell->getCell()))
             navigator->removePathgrid(*pathgrid);
 
         const auto player = world->getPlayerPtr();
         navigator->update(player.getRefData().getPosition().asVec3());
 
-        MWBase::Environment::get().getMechanicsManager()->drop (*iter);
+        MWBase::Environment::get().getMechanicsManager()->drop (cell);
 
-        mRendering.removeCell(*iter);
-        MWBase::Environment::get().getWindowManager()->removeCell(*iter);
+        mRendering.removeCell(cell);
+        MWBase::Environment::get().getWindowManager()->removeCell(cell);
 
-        MWBase::Environment::get().getWorld()->getLocalScripts().clearCell (*iter);
+        MWBase::Environment::get().getWorld()->getLocalScripts().clearCell (cell);
 
-        MWBase::Environment::get().getSoundManager()->stopSound (*iter);
-        mActiveCells.erase(*iter);
+        MWBase::Environment::get().getSoundManager()->stopSound (cell);
+        mActiveCells.erase(cell);
     }
 
-    void Scene::loadCell (CellStore *cell, Loading::Listener* loadingListener, bool respawn, bool test)
+    void Scene::activateCell (CellStore *cell, Loading::Listener* loadingListener, bool respawn, bool test)
     {
-        std::pair<CellStoreCollection::iterator, bool> result = mActiveCells.insert(cell);
+        assert(mActiveCells.find(cell) == mActiveCells.end());
+        assert(mInactiveCells.find(cell) != mInactiveCells.end());
+        mActiveCells.insert(cell);
+
+        if (test)
+            Log(Debug::Info) << "Testing cell " << cell->getCell()->getDescription();
+        else
+            Log(Debug::Info) << "Loading cell " << cell->getCell()->getDescription();
+
+        const auto world = MWBase::Environment::get().getWorld();
+        const auto navigator = world->getNavigator();
+
+        const int cellX = cell->getCell()->getGridX();
+        const int cellY = cell->getCell()->getGridY();
 
-        if(result.second)
+        if (!test && cell->getCell()->isExterior())
         {
-            if (test)
-                Log(Debug::Info) << "Testing cell " << cell->getCell()->getDescription();
-            else
-                Log(Debug::Info) << "Loading cell " << cell->getCell()->getDescription();
+            if (const auto heightField = mPhysics->getHeightField(cellX, cellY))
+                navigator->addObject(DetourNavigator::ObjectId(heightField), *heightField->getShape(),
+                        heightField->getCollisionObject()->getWorldTransform());
+        }
 
-            float verts = ESM::Land::LAND_SIZE;
-            float worldsize = ESM::Land::REAL_SIZE;
+        if (const auto pathgrid = world->getStore().get<ESM::Pathgrid>().search(*cell->getCell()))
+            navigator->addPathgrid(*cell->getCell(), *pathgrid);
 
-            const auto world = MWBase::Environment::get().getWorld();
-            const auto navigator = world->getNavigator();
+        // register local scripts
+        // do this before insertCell, to make sure we don't add scripts from levelled creature spawning twice
+        MWBase::Environment::get().getWorld()->getLocalScripts().addCell (cell);
 
-            const int cellX = cell->getCell()->getGridX();
-            const int cellY = cell->getCell()->getGridY();
+        if (respawn)
+            cell->respawn();
+
+        insertCell (*cell, loadingListener, false, test);
 
-            // Load terrain physics first...
-            if (!test && cell->getCell()->isExterior())
+        mRendering.addCell(cell);
+        if (!test)
+        {
+            MWBase::Environment::get().getWindowManager()->addCell(cell);
+            bool waterEnabled = cell->getCell()->hasWater() || cell->isExterior();
+            float waterLevel = cell->getWaterLevel();
+            mRendering.setWaterEnabled(waterEnabled);
+            if (waterEnabled)
             {
-                osg::ref_ptr<const ESMTerrain::LandObject> land = mRendering.getLandManager()->getLand(cellX, cellY);
-                const ESM::Land::LandData* data = land ? land->getData(ESM::Land::DATA_VHGT) : nullptr;
-                if (data)
+                mPhysics->enableWater(waterLevel);
+                mRendering.setWaterHeight(waterLevel);
+
+                if (cell->getCell()->isExterior())
                 {
-                    mPhysics->addHeightField (data->mHeights, cellX, cellY, worldsize / (verts-1), verts, data->mMinHeight, data->mMaxHeight, land.get());
+                    if (const auto heightField = mPhysics->getHeightField(cellX, cellY))
+                        navigator->addWater(osg::Vec2i(cellX, cellY), ESM::Land::REAL_SIZE,
+                                cell->getWaterLevel(), heightField->getCollisionObject()->getWorldTransform());
                 }
                 else
                 {
-                    static std::vector<float> defaultHeight;
-                    defaultHeight.resize(verts*verts, ESM::Land::DEFAULT_HEIGHT);
-                    mPhysics->addHeightField (&defaultHeight[0], cell->getCell()->getGridX(), cell->getCell()->getGridY(), worldsize / (verts-1), verts, ESM::Land::DEFAULT_HEIGHT, ESM::Land::DEFAULT_HEIGHT, land.get());
+                    navigator->addWater(osg::Vec2i(cellX, cellY), std::numeric_limits<int>::max(),
+                            cell->getWaterLevel(), btTransform::getIdentity());
                 }
-
-                if (const auto heightField = mPhysics->getHeightField(cellX, cellY))
-                    navigator->addObject(DetourNavigator::ObjectId(heightField), *heightField->getShape(),
-                            heightField->getCollisionObject()->getWorldTransform());
             }
+            else
+                mPhysics->disableWater();
 
-            if (const auto pathgrid = world->getStore().get<ESM::Pathgrid>().search(*cell->getCell()))
-                navigator->addPathgrid(*cell->getCell(), *pathgrid);
-
-            // register local scripts
-            // do this before insertCell, to make sure we don't add scripts from levelled creature spawning twice
-            MWBase::Environment::get().getWorld()->getLocalScripts().addCell (cell);
+            const auto player = MWBase::Environment::get().getWorld()->getPlayerPtr();
+            navigator->update(player.getRefData().getPosition().asVec3());
 
-            if (respawn)
-                cell->respawn();
+            if (!cell->isExterior() && !(cell->getCell()->mData.mFlags & ESM::Cell::QuasiEx))
+                mRendering.configureAmbient(cell->getCell());
+        }
 
-            // ... then references. This is important for adjustPosition to work correctly.
-            insertCell (*cell, loadingListener, test);
+        mPreloader->notifyLoaded(cell);
+    }
 
-            mRendering.addCell(cell);
-            if (!test)
-            {
-                MWBase::Environment::get().getWindowManager()->addCell(cell);
-                bool waterEnabled = cell->getCell()->hasWater() || cell->isExterior();
-                float waterLevel = cell->getWaterLevel();
-                mRendering.setWaterEnabled(waterEnabled);
-                if (waterEnabled)
-                {
-                    mPhysics->enableWater(waterLevel);
-                    mRendering.setWaterHeight(waterLevel);
+    void Scene::loadInactiveCell (CellStore *cell, Loading::Listener* loadingListener, bool test)
+    {
+        assert(mActiveCells.find(cell) == mActiveCells.end());
+        assert(mInactiveCells.find(cell) == mInactiveCells.end());
+        mInactiveCells.insert(cell);
 
-                    if (cell->getCell()->isExterior())
-                    {
-                        if (const auto heightField = mPhysics->getHeightField(cellX, cellY))
-                            navigator->addWater(osg::Vec2i(cellX, cellY), ESM::Land::REAL_SIZE,
-                                cell->getWaterLevel(), heightField->getCollisionObject()->getWorldTransform());
-                    }
-                    else
-                    {
-                        navigator->addWater(osg::Vec2i(cellX, cellY), std::numeric_limits<int>::max(),
-                            cell->getWaterLevel(), btTransform::getIdentity());
-                    }
-                }
-                else
-                    mPhysics->disableWater();
+        if (test)
+            Log(Debug::Info) << "Testing inactive cell " << cell->getCell()->getDescription();
+        else
+            Log(Debug::Info) << "Loading inactive cell " << cell->getCell()->getDescription();
 
-                const auto player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-                navigator->update(player.getRefData().getPosition().asVec3());
+        if (!test && cell->getCell()->isExterior())
+        {
+            float verts = ESM::Land::LAND_SIZE;
+            float worldsize = ESM::Land::REAL_SIZE;
 
-                if (!cell->isExterior() && !(cell->getCell()->mData.mFlags & ESM::Cell::QuasiEx))
-                {
+            const int cellX = cell->getCell()->getGridX();
+            const int cellY = cell->getCell()->getGridY();
 
-                    mRendering.configureAmbient(cell->getCell());
-                }
+            osg::ref_ptr<const ESMTerrain::LandObject> land = mRendering.getLandManager()->getLand(cellX, cellY);
+            const ESM::Land::LandData* data = land ? land->getData(ESM::Land::DATA_VHGT) : nullptr;
+            if (data)
+            {
+                mPhysics->addHeightField (data->mHeights, cellX, cellY, worldsize / (verts-1), verts, data->mMinHeight, data->mMaxHeight, land.get());
+            }
+            else
+            {
+                static std::vector<float> defaultHeight;
+                defaultHeight.resize(verts*verts, ESM::Land::DEFAULT_HEIGHT);
+                mPhysics->addHeightField (&defaultHeight[0], cell->getCell()->getGridX(), cell->getCell()->getGridY(), worldsize / (verts-1), verts, ESM::Land::DEFAULT_HEIGHT, ESM::Land::DEFAULT_HEIGHT, land.get());
             }
         }
 
-        mPreloader->notifyLoaded(cell);
+        insertCell (*cell, loadingListener, true, test);
     }
 
     void Scene::clear()
     {
-        CellStoreCollection::iterator active = mActiveCells.begin();
-        while (active!=mActiveCells.end())
-            unloadCell (active++);
+        for (auto iter = mInactiveCells.begin(); iter!=mInactiveCells.end(); )
+        {
+            auto* cell = *iter++;
+            deactivateCell(cell);
+            unloadInactiveCell (cell);
+        }
         assert(mActiveCells.empty());
+        assert(mInactiveCells.empty());
         mCurrentCell = nullptr;
 
         mPreloader->clear();
@@ -510,20 +568,24 @@ namespace MWWorld
 
     void Scene::changeCellGrid (const osg::Vec3f &pos, int playerCellX, int playerCellY, bool changeEvent)
     {
-        CellStoreCollection::iterator active = mActiveCells.begin();
-        while (active!=mActiveCells.end())
+        for (auto iter = mInactiveCells.begin(); iter != mInactiveCells.end(); )
         {
-            if ((*active)->getCell()->isExterior())
+            auto* cell = *iter++;
+            if (cell->getCell()->isExterior())
             {
-                if (std::abs (playerCellX-(*active)->getCell()->getGridX())<=mHalfGridSize &&
-                    std::abs (playerCellY-(*active)->getCell()->getGridY())<=mHalfGridSize)
-                {
-                    // keep cells within the new grid
-                    ++active;
-                    continue;
-                }
+                const auto dx = std::abs(playerCellX - cell->getCell()->getGridX());
+                const auto dy = std::abs(playerCellY - cell->getCell()->getGridY());
+                if (dx > mHalfGridSize || dy > mHalfGridSize)
+                    deactivateCell(cell);
+
+                if (dx > mHalfGridSize+1 || dy > mHalfGridSize+1)
+                    unloadInactiveCell(cell);
+            }
+            else
+            {
+                deactivateCell(cell);
+                unloadInactiveCell(cell);
             }
-            unloadCell (active++);
         }
 
         mCurrentGridCenter = osg::Vec2i(playerCellX, playerCellY);
@@ -535,32 +597,24 @@ namespace MWWorld
         mRendering.getPagedRefnums(newGrid, mPagedRefs);
 
         std::size_t refsToLoad = 0;
-        std::vector<std::pair<int, int>> cellsPositionsToLoad;
-        // get the number of refs to load
-        for (int x = playerCellX - mHalfGridSize; x <= playerCellX + mHalfGridSize; ++x)
+        const auto cellsToLoad = [&playerCellX,&playerCellY,&refsToLoad](CellStoreCollection& collection, int range) -> std::vector<std::pair<int,int>>
         {
-            for (int y = playerCellY - mHalfGridSize; y <= playerCellY + mHalfGridSize; ++y)
+            std::vector<std::pair<int, int>> cellsPositionsToLoad;
+            for (int x = playerCellX - range; x <= playerCellX + range; ++x)
             {
-                CellStoreCollection::iterator iter = mActiveCells.begin();
-
-                while (iter!=mActiveCells.end())
+                for (int y = playerCellY - range; y <= playerCellY + range; ++y)
                 {
-                    assert ((*iter)->getCell()->isExterior());
-
-                    if (x==(*iter)->getCell()->getGridX() &&
-                        y==(*iter)->getCell()->getGridY())
-                        break;
-
-                    ++iter;
-                }
-
-                if (iter==mActiveCells.end())
-                {
-                    refsToLoad += MWBase::Environment::get().getWorld()->getExterior(x, y)->count();
-                    cellsPositionsToLoad.emplace_back(x, y);
+                    if (!isCellInCollection(x, y, collection))
+                    {
+                        refsToLoad += MWBase::Environment::get().getWorld()->getExterior(x, y)->count();
+                        cellsPositionsToLoad.emplace_back(x, y);
+                    }
                 }
             }
-        }
+            return cellsPositionsToLoad;
+        };
+        auto cellsPositionsToLoad = cellsToLoad(mActiveCells,mHalfGridSize);
+        auto cellsPositionsToLoadInactive = cellsToLoad(mInactiveCells,mHalfGridSize+1);
 
         Loading::Listener* loadingListener = MWBase::Environment::get().getWindowManager()->getLoadingScreen();
         Loading::ScopedLoad load(loadingListener);
@@ -584,30 +638,26 @@ namespace MWWorld
                 return getCellPositionPriority(lhs) < getCellPositionPriority(rhs);
             });
 
+        std::sort(cellsPositionsToLoadInactive.begin(), cellsPositionsToLoadInactive.end(),
+            [&] (const std::pair<int, int>& lhs, const std::pair<int, int>& rhs) {
+                return getCellPositionPriority(lhs) < getCellPositionPriority(rhs);
+            });
+
         // Load cells
-        for (const auto& cellPosition : cellsPositionsToLoad)
+        for (const auto& [x,y] : cellsPositionsToLoadInactive)
         {
-            const auto x = cellPosition.first;
-            const auto y = cellPosition.second;
-
-            CellStoreCollection::iterator iter = mActiveCells.begin();
-
-            while (iter != mActiveCells.end())
+            if (!isCellInCollection(x, y, mInactiveCells))
             {
-                assert ((*iter)->getCell()->isExterior());
-
-                if (x == (*iter)->getCell()->getGridX() &&
-                    y == (*iter)->getCell()->getGridY())
-                    break;
-
-                ++iter;
+                CellStore *cell = MWBase::Environment::get().getWorld()->getExterior(x, y);
+                loadInactiveCell (cell, loadingListener);
             }
-
-            if (iter == mActiveCells.end())
+        }
+        for (const auto& [x,y] : cellsPositionsToLoad)
+        {
+            if (!isCellInCollection(x, y, mActiveCells))
             {
                 CellStore *cell = MWBase::Environment::get().getWorld()->getExterior(x, y);
-
-                loadCell (cell, loadingListener, changeEvent);
+                activateCell (cell, loadingListener, changeEvent);
             }
         }
 
@@ -640,7 +690,8 @@ namespace MWWorld
             CellStoreCollection::iterator iter = mActiveCells.begin();
 
             CellStore *cell = MWBase::Environment::get().getWorld()->getExterior(it->mData.mX, it->mData.mY);
-            loadCell (cell, loadingListener, false, true);
+            loadInactiveCell (cell, loadingListener, true);
+            activateCell (cell, loadingListener, false, true);
 
             iter = mActiveCells.begin();
             while (iter != mActiveCells.end())
@@ -648,7 +699,8 @@ namespace MWWorld
                 if (it->isExterior() && it->mData.mX == (*iter)->getCell()->getGridX() &&
                     it->mData.mY == (*iter)->getCell()->getGridY())
                 {
-                    unloadCell(iter, true);
+                    deactivateCell(*iter, true);
+                    unloadInactiveCell (*iter, true);
                     break;
                 }
 
@@ -686,7 +738,8 @@ namespace MWWorld
             loadingListener->setLabel("Testing interior cells ("+std::to_string(i)+"/"+std::to_string(cells.getIntSize())+")...");
 
             CellStore *cell = MWBase::Environment::get().getWorld()->getInterior(it->mName);
-            loadCell (cell, loadingListener, false, true);
+            loadInactiveCell (cell, loadingListener, true);
+            activateCell (cell, loadingListener, false, true);
 
             CellStoreCollection::iterator iter = mActiveCells.begin();
             while (iter != mActiveCells.end())
@@ -695,7 +748,8 @@ namespace MWWorld
 
                 if (it->mName == (*iter)->getCell()->mName)
                 {
-                    unloadCell(iter, true);
+                    deactivateCell(*iter, true);
+                    unloadInactiveCell (*iter, true);
                     break;
                 }
 
@@ -818,15 +872,21 @@ namespace MWWorld
         Log(Debug::Info) << "Changing to interior";
 
         // unload
-        CellStoreCollection::iterator active = mActiveCells.begin();
-        while (active!=mActiveCells.end())
-            unloadCell (active++);
+        for (auto iter = mInactiveCells.begin(); iter!=mInactiveCells.end(); )
+        {
+            auto* cell = *iter++;
+            deactivateCell(cell);
+            unloadInactiveCell(cell);
+        }
+        assert(mActiveCells.empty());
+        assert(mInactiveCells.empty());
 
         loadingListener->setProgressRange(cell->count());
 
         // Load cell.
         mPagedRefs.clear();
-        loadCell (cell, loadingListener, changeEvent);
+        loadInactiveCell (cell, loadingListener);
+        activateCell (cell, loadingListener, changeEvent);
 
         changePlayerCell(cell, position, adjustPlayerPos);
 
@@ -874,23 +934,26 @@ namespace MWWorld
         mCellChanged = false;
     }
 
-    void Scene::insertCell (CellStore &cell, Loading::Listener* loadingListener, bool test)
+    void Scene::insertCell (CellStore &cell, Loading::Listener* loadingListener, bool onlyStatics, bool test)
     {
-        InsertVisitor insertVisitor (cell, *loadingListener, test);
+        InsertVisitor insertVisitor (cell, *loadingListener, onlyStatics, test);
         cell.forEach (insertVisitor);
-        insertVisitor.insert([&] (const MWWorld::Ptr& ptr) { addObject(ptr, *mPhysics, mRendering, mPagedRefs); });
-        insertVisitor.insert([&] (const MWWorld::Ptr& ptr) { addObject(ptr, *mPhysics, mNavigator); });
+        insertVisitor.insert([&] (const MWWorld::Ptr& ptr) { addObject(ptr, *mPhysics, mRendering, mPagedRefs, onlyStatics); });
+        if (!onlyStatics)
+        {
+            insertVisitor.insert([&] (const MWWorld::Ptr& ptr) { addObject(ptr, *mPhysics, mNavigator); });
 
-        // do adjustPosition (snapping actors to ground) after objects are loaded, so we don't depend on the loading order
-        PositionVisitor posVisitor;
-        cell.forEach (posVisitor);
+            // do adjustPosition (snapping actors to ground) after objects are loaded, so we don't depend on the loading order
+            PositionVisitor posVisitor;
+            cell.forEach (posVisitor);
+        }
     }
 
     void Scene::addObjectToScene (const Ptr& ptr)
     {
         try
         {
-            addObject(ptr, *mPhysics, mRendering, mPagedRefs);
+            addObject(ptr, *mPhysics, mRendering, mPagedRefs, false);
             addObject(ptr, *mPhysics, mNavigator);
             MWBase::Environment::get().getWorld()->scaleObject(ptr, ptr.getCellRef().getScale());
             const auto navigator = MWBase::Environment::get().getWorld()->getNavigator();
diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp
index a70d3ccdd5..33c7b78d09 100644
--- a/apps/openmw/mwworld/scene.hpp
+++ b/apps/openmw/mwworld/scene.hpp
@@ -65,13 +65,13 @@ namespace MWWorld
     class Scene
     {
         public:
-
-            typedef std::set<CellStore *> CellStoreCollection;
+            using CellStoreCollection = std::set<CellStore *>;
 
         private:
 
             CellStore* mCurrentCell; // the cell the player is in
             CellStoreCollection mActiveCells;
+            CellStoreCollection mInactiveCells;
             bool mCellChanged;
             MWPhysics::PhysicsSystem *mPhysics;
             MWRender::RenderingManager& mRendering;
@@ -92,7 +92,7 @@ namespace MWWorld
 
             std::set<ESM::RefNum> mPagedRefs;
 
-            void insertCell (CellStore &cell, Loading::Listener* loadingListener, bool test = false);
+            void insertCell (CellStore &cell, Loading::Listener* loadingListener, bool onlyStatics, bool test = false);
             osg::Vec2i mCurrentGridCenter;
 
             // Load and unload cells as necessary to create a cell grid with "X" and "Y" in the center
@@ -108,6 +108,11 @@ namespace MWWorld
             osg::Vec4i gridCenterToBounds(const osg::Vec2i &centerCell) const;
             osg::Vec2i getNewGridCenter(const osg::Vec3f &pos, const osg::Vec2i *currentGridCenter = nullptr) const;
 
+            void unloadInactiveCell (CellStore* cell, bool test = false);
+            void deactivateCell (CellStore* cell, bool test = false);
+            void activateCell (CellStore *cell, Loading::Listener* loadingListener, bool respawn, bool test = false);
+            void loadInactiveCell (CellStore *cell, Loading::Listener* loadingListener, bool test = false);
+
         public:
 
             Scene (MWRender::RenderingManager& rendering, MWPhysics::PhysicsSystem *physics,
@@ -119,10 +124,6 @@ namespace MWWorld
             void preloadTerrain(const osg::Vec3f& pos, bool sync=false);
             void reloadTerrain();
 
-            void unloadCell (CellStoreCollection::iterator iter, bool test = false);
-
-            void loadCell (CellStore *cell, Loading::Listener* loadingListener, bool respawn, bool test = false);
-
             void playerMoved (const osg::Vec3f& pos);
 
             void changePlayerCell (CellStore* newCell, const ESM::Position& position, bool adjustPlayerPos);

From f219c5992bc6efe688ab128915f2d36c39da47a0 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sun, 24 Jan 2021 11:28:26 +0100
Subject: [PATCH 0250/2859] Add changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cede01f631..64528e5c2e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@
     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 #5379: Wandering NPCs falling through cantons
     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

From a2171875a069c2704ee035f1a407eaacee2a3979 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 24 Jan 2021 15:15:51 +0100
Subject: [PATCH 0251/2859] Prevent nullptr access

---
 apps/openmw/mwworld/projectilemanager.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index c87f625053..092ce270e9 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -428,6 +428,9 @@ namespace MWWorld
     {
         for (auto& projectileState : mProjectiles)
         {
+            if (projectileState.mToDelete)
+                continue;
+
             auto* projectile = mPhysics->getProjectile(projectileState.mProjectileId);
             if (!projectile->isActive())
                 continue;

From fe815d3d8dcfe5007b229082370113865c5ba930 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Sun, 24 Jan 2021 15:22:27 +0000
Subject: [PATCH 0252/2859] Fix memory leak in MWInput

mListener wasn't being cleaned up
---
 apps/openmw/mwinput/bindingsmanager.cpp | 13 ++++++-------
 apps/openmw/mwinput/bindingsmanager.hpp |  5 +++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwinput/bindingsmanager.cpp b/apps/openmw/mwinput/bindingsmanager.cpp
index 18fac6ae29..851e33a87c 100644
--- a/apps/openmw/mwinput/bindingsmanager.cpp
+++ b/apps/openmw/mwinput/bindingsmanager.cpp
@@ -171,16 +171,16 @@ namespace MWInput
         , mDragDrop(false)
     {
         std::string file = userFileExists ? userFile : "";
-        mInputBinder = new InputControlSystem(file);
-        mListener = new BindingsListener(mInputBinder, this);
-        mInputBinder->setDetectingBindingListener(mListener);
+        mInputBinder = std::make_unique<InputControlSystem>(file);
+        mListener = std::make_unique<BindingsListener>(mInputBinder.get(), this);
+        mInputBinder->setDetectingBindingListener(mListener.get());
 
         loadKeyDefaults();
         loadControllerDefaults();
 
         for (int i = 0; i < A_Last; ++i)
         {
-            mInputBinder->getChannel(i)->addListener(mListener);
+            mInputBinder->getChannel(i)->addListener(mListener.get());
         }
     }
 
@@ -192,7 +192,6 @@ namespace MWInput
     BindingsManager::~BindingsManager()
     {
         mInputBinder->save(mUserFile);
-        delete mInputBinder;
     }
 
     void BindingsManager::update(float dt)
@@ -315,7 +314,7 @@ namespace MWInput
                       && mInputBinder->getMouseButtonBinding(control, ICS::Control::INCREASE) == ICS_MAX_DEVICE_BUTTONS
                       && mInputBinder->getMouseWheelBinding(control, ICS::Control::INCREASE) == ICS::InputControlSystem::MouseWheelClick::UNASSIGNED))
             {
-                clearAllKeyBindings(mInputBinder, control);
+                clearAllKeyBindings(mInputBinder.get(), control);
 
                 if (defaultKeyBindings.find(i) != defaultKeyBindings.end()
                         && (force || !mInputBinder->isKeyBound(defaultKeyBindings[i])))
@@ -402,7 +401,7 @@ namespace MWInput
             if (!controlExists || force || (mInputBinder->getJoystickAxisBinding(control, sFakeDeviceId, ICS::Control::INCREASE) == ICS::InputControlSystem::UNASSIGNED &&
                 mInputBinder->getJoystickButtonBinding(control, sFakeDeviceId, ICS::Control::INCREASE) == ICS_MAX_DEVICE_BUTTONS))
             {
-                clearAllControllerBindings(mInputBinder, control);
+                clearAllControllerBindings(mInputBinder.get(), control);
 
                 if (defaultButtonBindings.find(i) != defaultButtonBindings.end()
                         && (force || !mInputBinder->isJoystickButtonBound(sFakeDeviceId, defaultButtonBindings[i])))
diff --git a/apps/openmw/mwinput/bindingsmanager.hpp b/apps/openmw/mwinput/bindingsmanager.hpp
index 7a44a1a335..74416d3c7f 100644
--- a/apps/openmw/mwinput/bindingsmanager.hpp
+++ b/apps/openmw/mwinput/bindingsmanager.hpp
@@ -1,6 +1,7 @@
 #ifndef MWINPUT_MWBINDINGSMANAGER_H
 #define MWINPUT_MWBINDINGSMANAGER_H
 
+#include <memory>
 #include <string>
 #include <vector>
 
@@ -64,8 +65,8 @@ namespace MWInput
     private:
         void setupSDLKeyMappings();
 
-        InputControlSystem* mInputBinder;
-        BindingsListener* mListener;
+        std::unique_ptr<InputControlSystem> mInputBinder;
+        std::unique_ptr<BindingsListener> mListener;
 
         std::string mUserFile;
 

From 3bb551a6f12e1c90f884a82b7806832a38bf2284 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Mocquillon?= <cedric.mocquillon@gmail.com>
Date: Mon, 25 Jan 2021 10:01:39 +0000
Subject: [PATCH 0253/2859] Show level multipliers in levelup tooltip

---
 apps/openmw/mwgui/statswindow.cpp    | 21 +++++++++++----------
 apps/openmw/mwmechanics/npcstats.cpp |  5 -----
 apps/openmw/mwmechanics/npcstats.hpp |  2 --
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/apps/openmw/mwgui/statswindow.cpp b/apps/openmw/mwgui/statswindow.cpp
index 66a1ea1eff..4c4450ee00 100644
--- a/apps/openmw/mwgui/statswindow.cpp
+++ b/apps/openmw/mwgui/statswindow.cpp
@@ -337,21 +337,22 @@ namespace MWGui
             int max = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("iLevelUpTotal")->mValue.getInteger();
             getWidget(levelWidget, i==0 ? "Level_str" : "LevelText");
 
-            std::stringstream detail;
-            for (int i = 0; i < ESM::Attribute::Length; ++i)
-            {
-                if (auto increase = PCstats.getLevelUpAttributeIncrease(i))
-                    detail << (detail.str().empty() ? "" : "\n") << "#{"
-                    << MyGUI::TextIterator::toTagsString(ESM::Attribute::sGmstAttributeIds[i])
-                    << "} x" << MyGUI::utility::toString(increase);
-            }
-            if (!detail.str().empty())
-                levelWidget->setUserString("Caption_LevelDetailText", MyGUI::LanguageManager::getInstance().replaceTags(detail.str()));
             levelWidget->setUserString("RangePosition_LevelProgress", MyGUI::utility::toString(PCstats.getLevelProgress()));
             levelWidget->setUserString("Range_LevelProgress", MyGUI::utility::toString(max));
             levelWidget->setUserString("Caption_LevelProgressText", MyGUI::utility::toString(PCstats.getLevelProgress()) + "/"
                                        + MyGUI::utility::toString(max));
         }
+        std::stringstream detail;
+        for (int attribute = 0; attribute < ESM::Attribute::Length; ++attribute)
+        {
+            float mult = PCstats.getLevelupAttributeMultiplier(attribute);
+            mult = std::min(mult, 100 - PCstats.getAttribute(attribute).getBase());
+            if (mult > 1)
+                detail << (detail.str().empty() ? "" : "\n") << "#{"
+                << MyGUI::TextIterator::toTagsString(ESM::Attribute::sGmstAttributeIds[attribute])
+                << "} x" << MyGUI::utility::toString(mult);
+        }
+        levelWidget->setUserString("Caption_LevelDetailText", MyGUI::LanguageManager::getInstance().replaceTags(detail.str()));
 
         setFactions(PCstats.getFactionRanks());
         setExpelled(PCstats.getExpelled ());
diff --git a/apps/openmw/mwmechanics/npcstats.cpp b/apps/openmw/mwmechanics/npcstats.cpp
index 71453cd07c..5d19368bf6 100644
--- a/apps/openmw/mwmechanics/npcstats.cpp
+++ b/apps/openmw/mwmechanics/npcstats.cpp
@@ -322,11 +322,6 @@ void MWMechanics::NpcStats::updateHealth()
     setHealth(floor(0.5f * (strength + endurance)));
 }
 
-int MWMechanics::NpcStats::getLevelUpAttributeIncrease(int attribute) const
-{
-    return mSkillIncreases[attribute];
-}
-
 int MWMechanics::NpcStats::getLevelupAttributeMultiplier(int attribute) const
 {
     int num = mSkillIncreases[attribute];
diff --git a/apps/openmw/mwmechanics/npcstats.hpp b/apps/openmw/mwmechanics/npcstats.hpp
index cab52cb281..9bd8e20ad7 100644
--- a/apps/openmw/mwmechanics/npcstats.hpp
+++ b/apps/openmw/mwmechanics/npcstats.hpp
@@ -87,8 +87,6 @@ namespace MWMechanics
 
             int getLevelProgress() const;
 
-            int getLevelUpAttributeIncrease(int attribute) const;
-
             int getLevelupAttributeMultiplier(int attribute) const;
 
             int getSkillIncreasesForSpecialization(int spec) const;

From bc2cec86e9ca16abdab140aff40a1739e35c066a Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Thu, 24 Dec 2020 04:18:39 +0100
Subject: [PATCH 0254/2859] Fix bug: NPCs doesn't move if the target is exactly
 above or exactly below.

---
 apps/openmw/mwmechanics/pathfinding.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp
index 276321b81a..595f9d629c 100644
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@@ -309,7 +309,7 @@ namespace MWMechanics
         if (mPath.size() > 1 && isAlmostStraight(position, mPath[0], mPath[1], pointTolerance))
             mPath.pop_front();
 
-        if (mPath.size() == 1 && sqrDistanceIgnoreZ(mPath.front(), position) < destinationTolerance * destinationTolerance)
+        if (mPath.size() == 1 && (mPath.front() - position).length2() < destinationTolerance * destinationTolerance)
             mPath.pop_front();
     }
 

From 663e0a10551fbd394d27aa4aa31321cda88b382b Mon Sep 17 00:00:00 2001
From: madsbuvi <madssandvei@zoho.com>
Date: Tue, 26 Jan 2021 19:28:09 +0100
Subject: [PATCH 0255/2859] Fix a race condition in loading screen.

---
 apps/openmw/mwgui/loadingscreen.cpp | 49 ++---------------------------
 apps/openmw/mwgui/loadingscreen.hpp |  2 --
 2 files changed, 2 insertions(+), 49 deletions(-)

diff --git a/apps/openmw/mwgui/loadingscreen.cpp b/apps/openmw/mwgui/loadingscreen.cpp
index 7ddc8c5507..aeaacaa638 100644
--- a/apps/openmw/mwgui/loadingscreen.cpp
+++ b/apps/openmw/mwgui/loadingscreen.cpp
@@ -45,8 +45,6 @@ namespace MWGui
         , mNestedLoadingCount(0)
         , mProgress(0)
         , mShowWallpaper(true)
-        , mOldCallback(nullptr)
-        , mHasCallback(false)
     {
         mMainWidget->setSize(MyGUI::RenderManager::getInstance().getViewSize());
 
@@ -147,35 +145,11 @@ namespace MWGui
 
         void operator () (osg::RenderInfo& renderInfo) const override
         {
-            {
-                std::unique_lock<std::mutex> lock(mMutex);
-                mOneshot = false;
-            }
-            mSignal.notify_all();
-
             int w = renderInfo.getCurrentCamera()->getViewport()->width();
             int h = renderInfo.getCurrentCamera()->getViewport()->height();
             mTexture->copyTexImage2D(*renderInfo.getState(), 0, 0, w, h);
 
-            {
-                std::unique_lock<std::mutex> lock(mMutex);
-                mOneshot = false;
-            }
-            mSignal.notify_all();
-        }
-
-        void wait()
-        {
-            std::unique_lock<std::mutex> lock(mMutex);
-            while (mOneshot)
-                mSignal.wait(lock);
-        }
-
-        void waitUntilInvoked()
-        {
-            std::unique_lock<std::mutex> lock(mMutex);
-            while (mOneshot)
-                mSignal.wait(lock);
+            mOneshot = false;
         }
 
         void reset()
@@ -185,8 +159,6 @@ namespace MWGui
 
     private:
         mutable bool mOneshot;
-        mutable std::mutex mMutex;
-        mutable std::condition_variable mSignal;
         osg::ref_ptr<osg::Texture2D> mTexture;
     };
 
@@ -362,14 +334,12 @@ namespace MWGui
         }
 
 #if OSG_VERSION_GREATER_OR_EQUAL(3, 5, 10)
+        mViewer->getCamera()->removeInitialDrawCallback(mCopyFramebufferToTextureCallback);
         mViewer->getCamera()->addInitialDrawCallback(mCopyFramebufferToTextureCallback);
 #else
-        // TODO: Remove once we officially end support for OSG versions pre 3.5.10
-        mOldCallback = mViewer->getCamera()->getInitialDrawCallback();
         mViewer->getCamera()->setInitialDrawCallback(mCopyFramebufferToTextureCallback);
 #endif
         mCopyFramebufferToTextureCallback->reset();
-        mHasCallback = true;
 
         mBackgroundImage->setBackgroundImage("");
         mBackgroundImage->setVisible(false);
@@ -412,21 +382,6 @@ namespace MWGui
         mViewer->renderingTraversals();
         mViewer->advance(mViewer->getFrameStamp()->getSimulationTime());
 
-        if (mHasCallback)
-        {
-            mCopyFramebufferToTextureCallback->waitUntilInvoked();
-
-            // Note that we are removing the callback before the draw thread has returned from it.
-            // This is OK as we are retaining the ref_ptr.
-#if OSG_VERSION_GREATER_OR_EQUAL(3, 5, 10)
-            mViewer->getCamera()->removeInitialDrawCallback(mCopyFramebufferToTextureCallback);
-#else
-            // TODO: Remove once we officially end support for OSG versions pre 3.5.10
-            mViewer->getCamera()->setInitialDrawCallback(mOldCallback);
-#endif
-            mHasCallback = false;
-        }
-
         mLastRenderTime = mTimer.time_m();
     }
 
diff --git a/apps/openmw/mwgui/loadingscreen.hpp b/apps/openmw/mwgui/loadingscreen.hpp
index 5d86ed3896..e1c652386d 100644
--- a/apps/openmw/mwgui/loadingscreen.hpp
+++ b/apps/openmw/mwgui/loadingscreen.hpp
@@ -87,8 +87,6 @@ namespace MWGui
 
         osg::ref_ptr<osg::Texture2D> mTexture;
         osg::ref_ptr<CopyFramebufferToTextureCallback> mCopyFramebufferToTextureCallback;
-        osg::ref_ptr<osg::Camera::DrawCallback> mOldCallback;
-        bool mHasCallback;
         std::unique_ptr<MyGUI::ITexture> mGuiTexture;
 
         void changeWallpaper();

From 14cf0ce1dc67d561a04a3e5b13fa633af54ca939 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sun, 12 Jan 2020 11:42:47 +0400
Subject: [PATCH 0256/2859] Implement instanced groundcover

---
 apps/openmw/CMakeLists.txt                    |   2 +-
 apps/openmw/engine.cpp                        |   9 +-
 apps/openmw/engine.hpp                        |   2 +
 apps/openmw/main.cpp                          |  15 +-
 apps/openmw/mwgui/settingswindow.cpp          |   4 +-
 apps/openmw/mwrender/groundcover.cpp          | 264 ++++++++++++++++++
 apps/openmw/mwrender/groundcover.hpp          |  69 +++++
 apps/openmw/mwrender/objectpaging.cpp         |   1 +
 apps/openmw/mwrender/renderingmanager.cpp     |  77 ++++-
 apps/openmw/mwrender/renderingmanager.hpp     |   9 +-
 apps/openmw/mwrender/vismask.hpp              |   4 +-
 apps/openmw/mwrender/water.cpp                |   5 +-
 apps/openmw/mwworld/cellpreloader.cpp         |   7 +
 apps/openmw/mwworld/cellreflist.hpp           |   2 +
 apps/openmw/mwworld/cellstore.cpp             |  13 +
 apps/openmw/mwworld/contentloader.hpp         |   2 +-
 apps/openmw/mwworld/esmloader.cpp             |  18 +-
 apps/openmw/mwworld/esmloader.hpp             |   2 +-
 apps/openmw/mwworld/esmstore.cpp              |   9 +
 apps/openmw/mwworld/esmstore.hpp              |  17 ++
 apps/openmw/mwworld/worldimp.cpp              |  29 +-
 apps/openmw/mwworld/worldimp.hpp              |   3 +-
 components/config/gamesettings.cpp            |   2 +
 components/esm/esmreader.cpp                  |   9 +-
 components/esm/esmreader.hpp                  |   6 +-
 components/esm/loadstat.cpp                   |   2 +
 components/esm/loadstat.hpp                   |   2 +
 components/resource/scenemanager.cpp          |   6 +-
 components/resource/scenemanager.hpp          |   2 +-
 components/resource/stats.cpp                 |   4 +-
 components/shader/shadermanager.cpp           |   2 +
 components/terrain/chunkmanager.cpp           |   2 +-
 components/terrain/chunkmanager.hpp           |   2 +-
 components/terrain/quadtreeworld.cpp          |  29 +-
 components/terrain/quadtreeworld.hpp          |   5 +-
 components/terrain/terraingrid.cpp            |   8 +
 components/terrain/terraingrid.hpp            |   1 +
 components/terrain/world.cpp                  |  41 ++-
 components/terrain/world.hpp                  |   1 +
 docs/source/reference/modding/extended.rst    |  56 +++-
 .../modding/settings/groundcover.rst          |  68 +++++
 .../reference/modding/settings/index.rst      |   1 +
 .../reference/modding/settings/shaders.rst    |   1 +
 .../reference/modding/settings/water.rst      |   3 +-
 files/mygui/openmw_settings_window.layout     |   1 +
 files/settings-default.cfg                    |  19 ++
 files/shaders/CMakeLists.txt                  |   2 +
 files/shaders/groundcover_fragment.glsl       |  93 ++++++
 files/shaders/groundcover_vertex.glsl         | 143 ++++++++++
 files/shaders/lighting.glsl                   |  15 +-
 50 files changed, 1015 insertions(+), 74 deletions(-)
 create mode 100644 apps/openmw/mwrender/groundcover.cpp
 create mode 100644 apps/openmw/mwrender/groundcover.hpp
 create mode 100644 docs/source/reference/modding/settings/groundcover.rst
 create mode 100644 files/shaders/groundcover_fragment.glsl
 create mode 100644 files/shaders/groundcover_vertex.glsl

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index c01cbe60c7..fdc47e8d7c 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -21,7 +21,7 @@ add_openmw_dir (mwrender
     actors objects renderingmanager animation rotatecontroller sky npcanimation vismask
     creatureanimation effectmanager util renderinginterface pathgrid rendermode weaponanimation screenshotmanager
     bulletdebugdraw globalmap characterpreview camera viewovershoulder localmap water terrainstorage ripplesimulation
-    renderbin actoranimation landmanager navmesh actorspaths recastmesh fogmanager objectpaging
+    renderbin actoranimation landmanager navmesh actorspaths recastmesh fogmanager objectpaging groundcover
     )
 
 add_openmw_dir (mwinput
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index ead2726cd3..103d06f31d 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -460,6 +460,11 @@ void OMW::Engine::addContentFile(const std::string& file)
     mContentFiles.push_back(file);
 }
 
+void OMW::Engine::addGroundcoverFile(const std::string& file)
+{
+    mGroundcoverFiles.emplace_back(file);
+}
+
 void OMW::Engine::setSkipMenu (bool skipMenu, bool newGame)
 {
     mSkipMenu = skipMenu;
@@ -720,8 +725,8 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     }
 
     // Create the world
-    mEnvironment.setWorld( new MWWorld::World (mViewer, rootNode, mResourceSystem.get(), mWorkQueue.get(),
-        mFileCollections, mContentFiles, mEncoder, mActivationDistanceOverride, mCellName,
+    mEnvironment.setWorld(new MWWorld::World (mViewer, rootNode, mResourceSystem.get(), mWorkQueue.get(),
+        mFileCollections, mContentFiles, mGroundcoverFiles, mEncoder, mActivationDistanceOverride, mCellName,
         mStartupScript, mResDir.string(), mCfgMgr.getUserDataPath().string()));
     mEnvironment.getWorld()->setupPlayer();
 
diff --git a/apps/openmw/engine.hpp b/apps/openmw/engine.hpp
index 3dd1a69b27..ff362f4b69 100644
--- a/apps/openmw/engine.hpp
+++ b/apps/openmw/engine.hpp
@@ -85,6 +85,7 @@ namespace OMW
             osgViewer::ScreenCaptureHandler::CaptureOperation *mScreenCaptureOperation;
             std::string mCellName;
             std::vector<std::string> mContentFiles;
+            std::vector<std::string> mGroundcoverFiles;
             bool mSkipMenu;
             bool mUseSound;
             bool mCompileAll;
@@ -155,6 +156,7 @@ namespace OMW
              * @param file - filename (extension is required)
              */
             void addContentFile(const std::string& file);
+            void addGroundcoverFile(const std::string& file);
 
             /// Disable or enable all sounds
             void setSoundUsage(bool soundUsage);
diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index 8eaac36e81..709ffda2cb 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -62,6 +62,9 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
         ("content", bpo::value<Files::EscapeStringVector>()->default_value(Files::EscapeStringVector(), "")
             ->multitoken()->composing(), "content file(s): esm/esp, or omwgame/omwaddon")
 
+        ("groundcover", bpo::value<Files::EscapeStringVector>()->default_value(Files::EscapeStringVector(), "")
+            ->multitoken()->composing(), "groundcover content file(s): esm/esp, or omwgame/omwaddon")
+
         ("no-sound", bpo::value<bool>()->implicit_value(true)
             ->default_value(false), "disable all sounds")
 
@@ -190,11 +193,15 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
         return false;
     }
 
-    StringsVector::const_iterator it(content.begin());
-    StringsVector::const_iterator end(content.end());
-    for (; it != end; ++it)
+    for (auto& file : content)
+    {
+        engine.addContentFile(file);
+    }
+
+    StringsVector groundcover = variables["groundcover"].as<Files::EscapeStringVector>().toStdStringVector();
+    for (auto& file : groundcover)
     {
-      engine.addContentFile(*it);
+        engine.addGroundcoverFile(file);
     }
 
     // startup-settings
diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index 68dac4a95c..538b3db5ed 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -269,7 +269,7 @@ namespace MWGui
             mWaterTextureSize->setIndexSelected(2);
 
         int waterReflectionDetail = Settings::Manager::getInt("reflection detail", "Water");
-        waterReflectionDetail = std::min(4, std::max(0, waterReflectionDetail));
+        waterReflectionDetail = std::min(5, std::max(0, waterReflectionDetail));
         mWaterReflectionDetail->setIndexSelected(waterReflectionDetail);
 
         mWindowBorderButton->setEnabled(!Settings::Manager::getBool("fullscreen", "Video"));
@@ -353,7 +353,7 @@ namespace MWGui
 
     void SettingsWindow::onWaterReflectionDetailChanged(MyGUI::ComboBox* _sender, size_t pos)
     {
-        unsigned int level = std::min((unsigned int)4, (unsigned int)pos);
+        unsigned int level = std::min((unsigned int)5, (unsigned int)pos);
         Settings::Manager::setInt("reflection detail", "Water", level);
         apply();
     }
diff --git a/apps/openmw/mwrender/groundcover.cpp b/apps/openmw/mwrender/groundcover.cpp
new file mode 100644
index 0000000000..b9fdc2e280
--- /dev/null
+++ b/apps/openmw/mwrender/groundcover.cpp
@@ -0,0 +1,264 @@
+#include "groundcover.hpp"
+
+#include <osg/Geometry>
+#include <osg/VertexAttribDivisor>
+
+#include <components/esm/esmreader.hpp>
+
+#include "apps/openmw/mwworld/esmstore.hpp"
+#include "apps/openmw/mwbase/environment.hpp"
+#include "apps/openmw/mwbase/world.hpp"
+
+#include "vismask.hpp"
+
+namespace MWRender
+{
+    void GroundcoverUpdater::setWindSpeed(float windSpeed)
+    {
+        mWindSpeed = windSpeed;
+    }
+
+    void GroundcoverUpdater::setPlayerPos(osg::Vec3f playerPos)
+    {
+        mPlayerPos = playerPos;
+    }
+
+    void GroundcoverUpdater::setDefaults(osg::StateSet *stateset)
+    {
+        osg::ref_ptr<osg::Uniform> windUniform = new osg::Uniform("windSpeed", 0.0f);
+        stateset->addUniform(windUniform.get());
+
+        osg::ref_ptr<osg::Uniform> playerPosUniform = new osg::Uniform("playerPos", osg::Vec3f(0.f, 0.f, 0.f));
+        stateset->addUniform(playerPosUniform.get());
+    }
+
+    void GroundcoverUpdater::apply(osg::StateSet *stateset, osg::NodeVisitor *nv)
+    {
+        osg::ref_ptr<osg::Uniform> windUniform = stateset->getUniform("windSpeed");
+        if (windUniform != nullptr)
+            windUniform->set(mWindSpeed);
+
+        osg::ref_ptr<osg::Uniform> playerPosUniform = stateset->getUniform("playerPos");
+        if (playerPosUniform != nullptr)
+            playerPosUniform->set(mPlayerPos);
+    }
+
+    class InstancingVisitor : public osg::NodeVisitor
+    {
+    public:
+        InstancingVisitor(std::vector<Groundcover::GroundcoverEntry>& instances, osg::Vec3f& chunkPosition)
+        : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+        , mInstances(instances)
+        , mChunkPosition(chunkPosition)
+        {
+        }
+
+        void apply(osg::Node& node) override
+        {
+            osg::ref_ptr<osg::StateSet> ss = node.getStateSet();
+            if (ss != nullptr)
+            {
+                removeAlpha(ss);
+            }
+
+            traverse(node);
+        }
+
+        void apply(osg::Geometry& geom) override
+        {
+            for (unsigned int i = 0; i < geom.getNumPrimitiveSets(); ++i)
+            {
+                geom.getPrimitiveSet(i)->setNumInstances(mInstances.size());
+            }
+
+            osg::ref_ptr<osg::Vec4Array> transforms = new osg::Vec4Array(mInstances.size());
+            osg::BoundingBox box;
+            float radius = geom.getBoundingBox().radius();
+            for (unsigned int i = 0; i < transforms->getNumElements(); i++)
+            {
+                osg::Vec3f pos(mInstances[i].mPos.asVec3());
+                osg::Vec3f relativePos = pos - mChunkPosition;
+                (*transforms)[i] = osg::Vec4f(relativePos, mInstances[i].mScale);
+
+                // Use an additional margin due to groundcover animation
+                float instanceRadius = radius * mInstances[i].mScale * 1.1f;
+                osg::BoundingSphere instanceBounds(relativePos, instanceRadius);
+                box.expandBy(instanceBounds);
+            }
+
+            geom.setInitialBound(box);
+
+            osg::ref_ptr<osg::Vec3Array> rotations = new osg::Vec3Array(mInstances.size());
+            for (unsigned int i = 0; i < rotations->getNumElements(); i++)
+            {
+                (*rotations)[i] = mInstances[i].mPos.asRotationVec3();
+            }
+
+            geom.setVertexAttribArray(6, transforms.get(), osg::Array::BIND_PER_VERTEX);
+            geom.setVertexAttribArray(7, rotations.get(), osg::Array::BIND_PER_VERTEX);
+
+            osg::ref_ptr<osg::StateSet> ss = geom.getOrCreateStateSet();
+            ss->setAttribute(new osg::VertexAttribDivisor(6, 1));
+            ss->setAttribute(new osg::VertexAttribDivisor(7, 1));
+
+            removeAlpha(ss);
+
+            traverse(geom);
+        }
+    private:
+        std::vector<Groundcover::GroundcoverEntry> mInstances;
+        osg::Vec3f mChunkPosition;
+
+        void removeAlpha(osg::StateSet* stateset)
+        {
+            // MGE uses default alpha settings for groundcover, so we can not rely on alpha properties
+            stateset->removeAttribute(osg::StateAttribute::ALPHAFUNC);
+            stateset->removeMode(GL_ALPHA_TEST);
+            stateset->removeAttribute(osg::StateAttribute::BLENDFUNC);
+            stateset->removeMode(GL_BLEND);
+            stateset->setRenderBinToInherit();
+        }
+    };
+
+    class DensityCalculator
+    {
+    public:
+        DensityCalculator(float density)
+            : mDensity(density)
+        {
+        }
+
+        bool isInstanceEnabled()
+        {
+            if (mDensity >= 1.f) return true;
+
+            mCurrentGroundcover += mDensity;
+            if (mCurrentGroundcover < 1.f) return false;
+
+            mCurrentGroundcover -= 1.f;
+
+            return true;
+        }
+        void reset() { mCurrentGroundcover = 0.f; }
+
+    private:
+        float mCurrentGroundcover = 0.f;
+        float mDensity = 0.f;
+    };
+
+    inline bool isInChunkBorders(ESM::CellRef& ref, osg::Vec2f& minBound, osg::Vec2f& maxBound)
+    {
+        osg::Vec2f size = maxBound - minBound;
+        if (size.x() >=1 && size.y() >=1) return true;
+
+        osg::Vec3f pos = ref.mPos.asVec3();
+        osg::Vec3f cellPos = pos / ESM::Land::REAL_SIZE;
+        if ((minBound.x() > std::floor(minBound.x()) && cellPos.x() < minBound.x()) || (minBound.y() > std::floor(minBound.y()) && cellPos.y() < minBound.y())
+            || (maxBound.x() < std::ceil(maxBound.x()) && cellPos.x() >= maxBound.x()) || (minBound.y() < std::ceil(maxBound.y()) && cellPos.y() >= maxBound.y()))
+            return false;
+
+        return true;
+    }
+
+    osg::ref_ptr<osg::Node> Groundcover::getChunk(float size, const osg::Vec2f& center, unsigned char lod, unsigned int lodFlags, bool activeGrid, const osg::Vec3f& viewPoint, bool compile)
+    {
+        ChunkId id = std::make_tuple(center, size, activeGrid);
+
+        osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(id);
+        if (obj)
+            return obj->asNode();
+        else
+        {
+            InstanceMap instances;
+            collectInstances(instances, size, center);
+            osg::ref_ptr<osg::Node> node = createChunk(instances, center);
+            mCache->addEntryToObjectCache(id, node.get());
+            return node;
+        }
+    }
+
+    Groundcover::Groundcover(Resource::SceneManager* sceneManager, float density)
+         : GenericResourceManager<ChunkId>(nullptr)
+         , mSceneManager(sceneManager)
+         , mDensity(density)
+    {
+    }
+
+    void Groundcover::collectInstances(InstanceMap& instances, float size, const osg::Vec2f& center)
+    {
+        const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
+        osg::Vec2f minBound = (center - osg::Vec2f(size/2.f, size/2.f));
+        osg::Vec2f maxBound = (center + osg::Vec2f(size/2.f, size/2.f));
+        DensityCalculator calculator(mDensity);
+        std::vector<ESM::ESMReader> esm;
+        osg::Vec2i startCell = osg::Vec2i(std::floor(center.x() - size/2.f), std::floor(center.y() - size/2.f));
+        for (int cellX = startCell.x(); cellX < startCell.x() + size; ++cellX)
+        {
+            for (int cellY = startCell.y(); cellY < startCell.y() + size; ++cellY)
+            {
+                const ESM::Cell* cell = store.get<ESM::Cell>().searchStatic(cellX, cellY);
+                if (!cell) continue;
+
+                calculator.reset();
+                for (size_t i=0; i<cell->mContextList.size(); ++i)
+                {
+                    unsigned int index = cell->mContextList.at(i).index;
+                    if (esm.size() <= index)
+                        esm.resize(index+1);
+                    cell->restore(esm[index], i);
+                    ESM::CellRef ref;
+                    ref.mRefNum.mContentFile = ESM::RefNum::RefNum_NoContentFile;
+                    bool deleted = false;
+                    while(cell->getNextRef(esm[index], ref, deleted))
+                    {
+                        if (deleted) continue;
+                        Misc::StringUtils::lowerCaseInPlace(ref.mRefID);
+                        std::string model;
+                        if (!store.isGroundcover(ref.mRefID, model)) continue;
+                        if (model.empty()) continue;
+
+                        if (!calculator.isInstanceEnabled()) continue;
+                        if (!isInChunkBorders(ref, minBound, maxBound)) continue;
+
+                        model = "meshes/" + model;
+                        instances[model].emplace_back(ref, model);
+                    }
+                }
+            }
+        }
+    }
+
+    osg::ref_ptr<osg::Node> Groundcover::createChunk(InstanceMap& instances, const osg::Vec2f& center)
+    {
+        osg::ref_ptr<osg::Group> group = new osg::Group;
+        osg::Vec3f worldCenter = osg::Vec3f(center.x(), center.y(), 0)*ESM::Land::REAL_SIZE;
+        for (auto& pair : instances)
+        {
+            const osg::Node* temp = mSceneManager->getTemplate(pair.first);
+            osg::ref_ptr<osg::Node> node = static_cast<osg::Node*>(temp->clone(osg::CopyOp::DEEP_COPY_ALL&(~osg::CopyOp::DEEP_COPY_TEXTURES)));
+
+            // Keep link to original mesh to keep it in cache
+            group->getOrCreateUserDataContainer()->addUserObject(new Resource::TemplateRef(temp));
+
+            InstancingVisitor visitor(pair.second, worldCenter);
+            node->accept(visitor);
+            group->addChild(node);
+        }
+
+        group->getBound();
+        group->setNodeMask(Mask_Groundcover);
+        mSceneManager->recreateShaders(group, "groundcover", false, true);
+
+        return group;
+    }
+
+    unsigned int Groundcover::getNodeMask()
+    {
+        return Mask_Groundcover;
+    }
+
+    void Groundcover::reportStats(unsigned int frameNumber, osg::Stats *stats) const
+    {
+        stats->setAttribute(frameNumber, "Groundcover Chunk", mCache->getCacheSize());
+    }
+}
diff --git a/apps/openmw/mwrender/groundcover.hpp b/apps/openmw/mwrender/groundcover.hpp
new file mode 100644
index 0000000000..cd80978bef
--- /dev/null
+++ b/apps/openmw/mwrender/groundcover.hpp
@@ -0,0 +1,69 @@
+#ifndef OPENMW_MWRENDER_GROUNDCOVER_H
+#define OPENMW_MWRENDER_GROUNDCOVER_H
+
+#include <components/terrain/quadtreeworld.hpp>
+#include <components/resource/scenemanager.hpp>
+#include <components/sceneutil/statesetupdater.hpp>
+#include <components/esm/loadcell.hpp>
+
+namespace MWRender
+{
+    class GroundcoverUpdater : public SceneUtil::StateSetUpdater
+    {
+    public:
+        GroundcoverUpdater()
+            : mWindSpeed(0.f)
+            , mPlayerPos(osg::Vec3f())
+        {
+        }
+
+        void setWindSpeed(float windSpeed);
+        void setPlayerPos(osg::Vec3f playerPos);
+
+    protected:
+        void setDefaults(osg::StateSet *stateset) override;
+        void apply(osg::StateSet *stateset, osg::NodeVisitor *nv) override;
+
+    private:
+        float mWindSpeed;
+        osg::Vec3f mPlayerPos;
+    };
+
+    typedef std::tuple<osg::Vec2f, float, bool> ChunkId; // Center, Size, ActiveGrid
+    class Groundcover : public Resource::GenericResourceManager<ChunkId>, public Terrain::QuadTreeWorld::ChunkManager
+    {
+    public:
+        Groundcover(Resource::SceneManager* sceneManager, float density);
+        ~Groundcover() = default;
+
+        osg::ref_ptr<osg::Node> getChunk(float size, const osg::Vec2f& center, unsigned char lod, unsigned int lodFlags, bool activeGrid, const osg::Vec3f& viewPoint, bool compile) override;
+
+        unsigned int getNodeMask() override;
+
+        void reportStats(unsigned int frameNumber, osg::Stats* stats) const override;
+
+        struct GroundcoverEntry
+        {
+            ESM::Position mPos;
+            float mScale;
+            std::string mModel;
+
+            GroundcoverEntry(const ESM::CellRef& ref, const std::string& model)
+            {
+                mPos = ref.mPos;
+                mScale = ref.mScale;
+                mModel = model;
+            }
+        };
+
+    private:
+        Resource::SceneManager* mSceneManager;
+        float mDensity;
+
+        typedef std::map<std::string, std::vector<GroundcoverEntry>> InstanceMap;
+        osg::ref_ptr<osg::Node> createChunk(InstanceMap& instances, const osg::Vec2f& center);
+        void collectInstances(InstanceMap& instances, float size, const osg::Vec2f& center);
+    };
+}
+
+#endif
diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index d8e856e769..478fde0f86 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -398,6 +398,7 @@ namespace MWRender
                             int type = store.findStatic(ref.mRefID);
                             if (!typeFilter(type,size>=2)) continue;
                             if (deleted) { refs.erase(ref.mRefNum); continue; }
+                            if (store.isGroundcover(ref.mRefID)) continue;
                             refs[ref.mRefNum] = ref;
                         }
                     }
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 6ce431d2e2..c755f46f83 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -3,6 +3,7 @@
 #include <limits>
 #include <cstdlib>
 
+#include <osg/AlphaFunc>
 #include <osg/Light>
 #include <osg/LightModel>
 #include <osg/Fog>
@@ -68,10 +69,10 @@
 #include "fogmanager.hpp"
 #include "objectpaging.hpp"
 #include "screenshotmanager.hpp"
+#include "groundcover.hpp"
 
 namespace MWRender
 {
-
     class StateUpdater : public SceneUtil::StateSetUpdater
     {
     public:
@@ -243,6 +244,10 @@ namespace MWRender
         globalDefines["preLightEnv"] = Settings::Manager::getBool("apply lighting to environment maps", "Shaders") ? "1" : "0";
         globalDefines["radialFog"] = Settings::Manager::getBool("radial fog", "Shaders") ? "1" : "0";
 
+        float groundcoverDistance = (Constants::CellSizeInUnits * Settings::Manager::getInt("distance", "Groundcover") - 1024) * 0.93;
+        globalDefines["groundcoverFadeStart"] = std::to_string(groundcoverDistance * Settings::Manager::getFloat("fade start", "Groundcover"));
+        globalDefines["groundcoverFadeEnd"] = std::to_string(groundcoverDistance);
+
         // It is unnecessary to stop/start the viewer as no frames are being rendered yet.
         mResourceSystem->getSceneManager()->getShaderManager().setGlobalDefines(globalDefines);
 
@@ -269,7 +274,8 @@ namespace MWRender
         const bool useTerrainNormalMaps = Settings::Manager::getBool("auto use terrain normal maps", "Shaders");
         const bool useTerrainSpecularMaps = Settings::Manager::getBool("auto use terrain specular maps", "Shaders");
 
-        mTerrainStorage = new TerrainStorage(mResourceSystem, normalMapPattern, heightMapPattern, useTerrainNormalMaps, specularMapPattern, useTerrainSpecularMaps);
+        mTerrainStorage.reset(new TerrainStorage(mResourceSystem, normalMapPattern, heightMapPattern, useTerrainNormalMaps, specularMapPattern, useTerrainSpecularMaps));
+        const float lodFactor = Settings::Manager::getFloat("lod factor", "Terrain");
 
         if (Settings::Manager::getBool("distant terrain", "Terrain"))
         {
@@ -277,12 +283,11 @@ namespace MWRender
             int compMapPower = Settings::Manager::getInt("composite map level", "Terrain");
             compMapPower = std::max(-3, compMapPower);
             float compMapLevel = pow(2, compMapPower);
-            const float lodFactor = Settings::Manager::getFloat("lod factor", "Terrain");
             const int vertexLodMod = Settings::Manager::getInt("vertex lod mod", "Terrain");
             float maxCompGeometrySize = Settings::Manager::getFloat("max composite geometry size", "Terrain");
             maxCompGeometrySize = std::max(maxCompGeometrySize, 1.f);
             mTerrain.reset(new Terrain::QuadTreeWorld(
-                sceneRoot, mRootNode, mResourceSystem, mTerrainStorage, Mask_Terrain, Mask_PreCompile, Mask_Debug,
+                sceneRoot, mRootNode, mResourceSystem, mTerrainStorage.get(), Mask_Terrain, Mask_PreCompile, Mask_Debug,
                 compMapResolution, compMapLevel, lodFactor, vertexLodMod, maxCompGeometrySize));
             if (Settings::Manager::getBool("object paging", "Terrain"))
             {
@@ -292,11 +297,43 @@ namespace MWRender
             }
         }
         else
-            mTerrain.reset(new Terrain::TerrainGrid(sceneRoot, mRootNode, mResourceSystem, mTerrainStorage, Mask_Terrain, Mask_PreCompile, Mask_Debug));
+            mTerrain.reset(new Terrain::TerrainGrid(sceneRoot, mRootNode, mResourceSystem, mTerrainStorage.get(), Mask_Terrain, Mask_PreCompile, Mask_Debug));
 
         mTerrain->setTargetFrameRate(Settings::Manager::getFloat("target framerate", "Cells"));
         mTerrain->setWorkQueue(mWorkQueue.get());
 
+        if (Settings::Manager::getBool("enabled", "Groundcover"))
+        {
+            osg::ref_ptr<osg::Group> groundcoverRoot = new osg::Group;
+            groundcoverRoot->setNodeMask(Mask_Groundcover);
+            groundcoverRoot->setName("Groundcover Root");
+            sceneRoot->addChild(groundcoverRoot);
+
+            // Force a unified alpha handling instead of data from meshes
+            osg::ref_ptr<osg::AlphaFunc> alpha = new osg::AlphaFunc(osg::AlphaFunc::GEQUAL, 128.f/255.f);
+            groundcoverRoot->getOrCreateStateSet()->setAttributeAndModes(alpha.get(), osg::StateAttribute::ON);
+
+            mGroundcoverUpdater = new GroundcoverUpdater;
+            groundcoverRoot->addUpdateCallback(mGroundcoverUpdater);
+
+            float chunkSize = Settings::Manager::getFloat("min chunk size", "Groundcover");
+            if (chunkSize >= 1.0f)
+                chunkSize = 1.0f;
+            else if (chunkSize >= 0.5f)
+                chunkSize = 0.5f;
+            else if (chunkSize >= 0.25f)
+                chunkSize = 0.25f;
+            else if (chunkSize != 0.125f)
+                chunkSize = 0.125f;
+
+            float density = Settings::Manager::getFloat("density", "Groundcover");
+            density = std::clamp(density, 0.f, 1.f);
+
+            mGroundcoverWorld.reset(new Terrain::QuadTreeWorld(groundcoverRoot, mTerrainStorage.get(), Mask_Groundcover, lodFactor, chunkSize));
+            mGroundcover.reset(new Groundcover(mResourceSystem->getSceneManager(), density));
+            static_cast<Terrain::QuadTreeWorld*>(mGroundcoverWorld.get())->addChunkManager(mGroundcover.get());
+            mResourceSystem->addResourceManager(mGroundcover.get());
+        }
         // water goes after terrain for correct waterculling order
         mWater.reset(new Water(sceneRoot->getParent(0), sceneRoot, mResourceSystem, mViewer->getIncrementalCompileOperation(), resourcePath));
 
@@ -508,7 +545,11 @@ namespace MWRender
         mWater->changeCell(store);
 
         if (store->getCell()->isExterior())
+        {
             mTerrain->loadCell(store->getCell()->getGridX(), store->getCell()->getGridY());
+            if (mGroundcoverWorld)
+                mGroundcoverWorld->loadCell(store->getCell()->getGridX(), store->getCell()->getGridY());
+        }
     }
     void RenderingManager::removeCell(const MWWorld::CellStore *store)
     {
@@ -517,7 +558,11 @@ namespace MWRender
         mObjects->removeCell(store);
 
         if (store->getCell()->isExterior())
+        {
             mTerrain->unloadCell(store->getCell()->getGridX(), store->getCell()->getGridY());
+            if (mGroundcoverWorld)
+                mGroundcoverWorld->unloadCell(store->getCell()->getGridX(), store->getCell()->getGridY());
+        }
 
         mWater->removeCell(store);
     }
@@ -527,6 +572,8 @@ namespace MWRender
         if (!enable)
             mWater->setCullCallback(nullptr);
         mTerrain->enable(enable);
+        if (mGroundcoverWorld)
+            mGroundcoverWorld->enable(enable);
     }
 
     void RenderingManager::setSkyEnabled(bool enabled)
@@ -612,6 +659,16 @@ namespace MWRender
             mEffectManager->update(dt);
             mSky->update(dt);
             mWater->update(dt);
+
+            if (mGroundcoverUpdater)
+            {
+                const MWWorld::Ptr& player = mPlayerAnimation->getPtr();
+                osg::Vec3f playerPos(player.getRefData().getPosition().asVec3());
+
+                float windSpeed = mSky->getBaseWindSpeed();
+                mGroundcoverUpdater->setWindSpeed(windSpeed);
+                mGroundcoverUpdater->setPlayerPos(playerPos);
+            }
         }
 
         updateNavMesh();
@@ -805,7 +862,7 @@ namespace MWRender
         mIntersectionVisitor->setIntersector(intersector);
 
         int mask = ~0;
-        mask &= ~(Mask_RenderToTexture|Mask_Sky|Mask_Debug|Mask_Effect|Mask_Water|Mask_SimpleWater);
+        mask &= ~(Mask_RenderToTexture|Mask_Sky|Mask_Debug|Mask_Effect|Mask_Water|Mask_SimpleWater|Mask_Groundcover);
         if (ignorePlayer)
             mask &= ~(Mask_Player);
         if (ignoreActors)
@@ -964,6 +1021,12 @@ namespace MWRender
         fov = std::min(mFieldOfView, 140.f);
         float distanceMult = std::cos(osg::DegreesToRadians(fov)/2.f);
         mTerrain->setViewDistance(mViewDistance * (distanceMult ? 1.f/distanceMult : 1.f));
+
+        if (mGroundcoverWorld)
+        {
+            int groundcoverDistance = Constants::CellSizeInUnits * Settings::Manager::getInt("distance", "Groundcover");
+            mGroundcoverWorld->setViewDistance(groundcoverDistance * (distanceMult ? 1.f/distanceMult : 1.f));
+        }
     }
 
     void RenderingManager::updateTextureFiltering()
@@ -1158,6 +1221,8 @@ namespace MWRender
     void RenderingManager::setActiveGrid(const osg::Vec4i &grid)
     {
         mTerrain->setActiveGrid(grid);
+        if (mGroundcoverWorld)
+            mGroundcoverWorld->setActiveGrid(grid);
     }
     bool RenderingManager::pagingEnableObject(int type, const MWWorld::ConstPtr& ptr, bool enabled)
     {
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index 39d1a0194e..a7afa2fa0d 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -70,7 +70,7 @@ namespace DetourNavigator
 
 namespace MWRender
 {
-
+    class GroundcoverUpdater;
     class StateUpdater;
 
     class EffectManager;
@@ -88,6 +88,7 @@ namespace MWRender
     class ActorsPaths;
     class RecastMesh;
     class ObjectPaging;
+    class Groundcover;
 
     class RenderingManager : public MWRender::RenderingInterface
     {
@@ -261,6 +262,8 @@ namespace MWRender
         osg::ref_ptr<osg::Group> mSceneRoot;
         Resource::ResourceSystem* mResourceSystem;
 
+        osg::ref_ptr<GroundcoverUpdater> mGroundcoverUpdater;
+
         osg::ref_ptr<SceneUtil::WorkQueue> mWorkQueue;
         osg::ref_ptr<SceneUtil::UnrefQueue> mUnrefQueue;
 
@@ -275,8 +278,10 @@ namespace MWRender
         std::unique_ptr<Objects> mObjects;
         std::unique_ptr<Water> mWater;
         std::unique_ptr<Terrain::World> mTerrain;
-        TerrainStorage* mTerrainStorage;
+        std::unique_ptr<Terrain::World> mGroundcoverWorld;
+        std::unique_ptr<TerrainStorage> mTerrainStorage;
         std::unique_ptr<ObjectPaging> mObjectPaging;
+        std::unique_ptr<Groundcover> mGroundcover;
         std::unique_ptr<SkyManager> mSky;
         std::unique_ptr<FogManager> mFog;
         std::unique_ptr<ScreenshotManager> mScreenshotManager;
diff --git a/apps/openmw/mwrender/vismask.hpp b/apps/openmw/mwrender/vismask.hpp
index f9f9dc74ca..bc3d3f1920 100644
--- a/apps/openmw/mwrender/vismask.hpp
+++ b/apps/openmw/mwrender/vismask.hpp
@@ -53,7 +53,9 @@ namespace MWRender
         Mask_PreCompile = (1<<18),
 
         // Set on a camera's cull mask to enable the LightManager
-        Mask_Lighting = (1<<19)
+        Mask_Lighting = (1<<19),
+
+        Mask_Groundcover = (1<<20),
     };
 
 }
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index e786ce9372..1cc5a3cb7c 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -244,7 +244,7 @@ public:
         setCullCallback(new InheritViewPointCallback);
         setComputeNearFarMode(osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR);
 
-        setCullMask(Mask_Effect|Mask_Scene|Mask_Object|Mask_Static|Mask_Terrain|Mask_Actor|Mask_ParticleSystem|Mask_Sky|Mask_Sun|Mask_Player|Mask_Lighting);
+        setCullMask(Mask_Effect|Mask_Scene|Mask_Object|Mask_Static|Mask_Terrain|Mask_Actor|Mask_ParticleSystem|Mask_Sky|Mask_Sun|Mask_Player|Mask_Lighting|Mask_Groundcover);
         setNodeMask(Mask_RenderToTexture);
         setViewport(0, 0, rttSize, rttSize);
 
@@ -372,12 +372,13 @@ public:
     void setInterior(bool isInterior)
     {
         int reflectionDetail = Settings::Manager::getInt("reflection detail", "Water");
-        reflectionDetail = std::min(4, std::max(isInterior ? 2 : 0, reflectionDetail));
+        reflectionDetail = std::min(5, std::max(isInterior ? 2 : 0, reflectionDetail));
         unsigned int extraMask = 0;
         if(reflectionDetail >= 1) extraMask |= Mask_Terrain;
         if(reflectionDetail >= 2) extraMask |= Mask_Static;
         if(reflectionDetail >= 3) extraMask |= Mask_Effect|Mask_ParticleSystem|Mask_Object;
         if(reflectionDetail >= 4) extraMask |= Mask_Player|Mask_Actor;
+        if(reflectionDetail >= 5) extraMask |= Mask_Groundcover;
         setCullMask(Mask_Scene|Mask_Sky|Mask_Lighting|extraMask);
     }
 
diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index 31af5b24bd..937491f622 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -36,6 +36,13 @@ namespace MWWorld
 
         virtual bool operator()(const MWWorld::Ptr& ptr)
         {
+            if (ptr.getTypeName()==typeid (ESM::Static).name())
+            {
+                const MWWorld::LiveCellRef<ESM::Static> *ref = ptr.get<ESM::Static>();
+                if (ref->mBase->mIsGroundcover)
+                    return true;
+            }
+
             ptr.getClass().getModelsToPreload(ptr, mOut);
 
             return true;
diff --git a/apps/openmw/mwworld/cellreflist.hpp b/apps/openmw/mwworld/cellreflist.hpp
index 30be4a6610..69161c8400 100644
--- a/apps/openmw/mwworld/cellreflist.hpp
+++ b/apps/openmw/mwworld/cellreflist.hpp
@@ -24,6 +24,8 @@ namespace MWWorld
         /// all methods are known.
         void load (ESM::CellRef &ref, bool deleted, const MWWorld::ESMStore &esmStore);
 
+        inline bool ignoreInstance (const X* ptr);
+
         LiveRef &insert (const LiveRef &item)
         {
             mList.push_back(item);
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index b48fe74a68..d8e2eb65fe 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -169,6 +169,17 @@ namespace
 
 namespace MWWorld
 {
+    template <typename X>
+    bool CellRefList<X>::ignoreInstance (const X* ptr)
+    {
+        return false;
+    }
+
+    template <>
+    bool CellRefList<ESM::Static>::ignoreInstance (const ESM::Static* ptr)
+    {
+        return ptr->mIsGroundcover;
+    }
 
     template <typename X>
     void CellRefList<X>::load(ESM::CellRef &ref, bool deleted, const MWWorld::ESMStore &esmStore)
@@ -177,6 +188,8 @@ namespace MWWorld
 
         if (const X *ptr = store.search (ref.mRefID))
         {
+            if (ignoreInstance(ptr)) return;
+
             typename std::list<LiveRef>::iterator iter =
                 std::find(mList.begin(), mList.end(), ref.mRefNum);
 
diff --git a/apps/openmw/mwworld/contentloader.hpp b/apps/openmw/mwworld/contentloader.hpp
index b529ae9db8..b559df0832 100644
--- a/apps/openmw/mwworld/contentloader.hpp
+++ b/apps/openmw/mwworld/contentloader.hpp
@@ -21,7 +21,7 @@ struct ContentLoader
     {
     }
 
-    virtual void load(const boost::filesystem::path& filepath, int& index)
+    virtual void load(const boost::filesystem::path& filepath, int& index, bool isGroundcover)
     {
         Log(Debug::Info) << "Loading content file " << filepath.string();
         mListener.setLabel(MyGUI::TextIterator::toTagsString(filepath.string()));
diff --git a/apps/openmw/mwworld/esmloader.cpp b/apps/openmw/mwworld/esmloader.cpp
index b12d646e70..c966182152 100644
--- a/apps/openmw/mwworld/esmloader.cpp
+++ b/apps/openmw/mwworld/esmloader.cpp
@@ -15,17 +15,17 @@ EsmLoader::EsmLoader(MWWorld::ESMStore& store, std::vector<ESM::ESMReader>& read
 {
 }
 
-void EsmLoader::load(const boost::filesystem::path& filepath, int& index)
+void EsmLoader::load(const boost::filesystem::path& filepath, int& index, bool isGroundcover)
 {
-  ContentLoader::load(filepath.filename(), index);
+    ContentLoader::load(filepath.filename(), index, isGroundcover);
 
-  ESM::ESMReader lEsm;
-  lEsm.setEncoder(mEncoder);
-  lEsm.setIndex(index);
-  lEsm.setGlobalReaderList(&mEsm);
-  lEsm.open(filepath.string());
-  mEsm[index] = lEsm;
-  mStore.load(mEsm[index], &mListener);
+    ESM::ESMReader lEsm;
+    lEsm.setEncoder(mEncoder);
+    lEsm.setIndex(index);
+    lEsm.setGlobalReaderList(&mEsm);
+    lEsm.open(filepath.string(), isGroundcover);
+    mEsm[index] = lEsm;
+    mStore.load(mEsm[index], &mListener);
 }
 
 } /* namespace MWWorld */
diff --git a/apps/openmw/mwworld/esmloader.hpp b/apps/openmw/mwworld/esmloader.hpp
index 506105bebb..cc4c15a15e 100644
--- a/apps/openmw/mwworld/esmloader.hpp
+++ b/apps/openmw/mwworld/esmloader.hpp
@@ -25,7 +25,7 @@ struct EsmLoader : public ContentLoader
     EsmLoader(MWWorld::ESMStore& store, std::vector<ESM::ESMReader>& readers,
       ToUTF8::Utf8Encoder* encoder, Loading::Listener& listener);
 
-    void load(const boost::filesystem::path& filepath, int& index) override;
+    void load(const boost::filesystem::path& filepath, int& index, bool isGroundcover) override;
 
     private:
       std::vector<ESM::ESMReader>& mEsm;
diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index 90bc80b484..2731d7eb17 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -190,6 +190,15 @@ void ESMStore::setUp(bool validateRecords)
     {
         validate();
         countRecords();
+
+        if (mGroundcovers.empty())
+        {
+            for (const ESM::Static& record : mStatics)
+            {
+                if (record.mIsGroundcover)
+                    mGroundcovers[record.mId] = record.mModel;
+            }
+        }
     }
 }
 
diff --git a/apps/openmw/mwworld/esmstore.hpp b/apps/openmw/mwworld/esmstore.hpp
index d69c56d8c0..18bb95580d 100644
--- a/apps/openmw/mwworld/esmstore.hpp
+++ b/apps/openmw/mwworld/esmstore.hpp
@@ -75,6 +75,7 @@ namespace MWWorld
         // maps the id name to the record type.
         std::map<std::string, int> mIds;
         std::map<std::string, int> mStaticIds;
+        std::map<std::string, std::string> mGroundcovers;
 
         std::map<std::string, int> mRefCount;
 
@@ -121,6 +122,22 @@ namespace MWWorld
             return it->second;
         }
 
+        bool isGroundcover(const std::string &id, std::string &model) const
+        {
+            std::map<std::string, std::string>::const_iterator it = mGroundcovers.find(id);
+            if (it == mGroundcovers.end()) {
+                return false;
+            }
+            model = it->second;
+            return true;
+        }
+
+        bool isGroundcover(const std::string &id) const
+        {
+            std::map<std::string, std::string>::const_iterator it = mGroundcovers.find(id);
+            return (it != mGroundcovers.end());
+        }
+
         ESMStore()
           : mDynamicCount(0)
         {
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index af9a5e0bb3..93d1a799c0 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -103,12 +103,12 @@ namespace MWWorld
             return mLoaders.insert(std::make_pair(extension, loader)).second;
         }
 
-        void load(const boost::filesystem::path& filepath, int& index) override
+        void load(const boost::filesystem::path& filepath, int& index, bool isGroundcover) override
         {
             LoadersContainer::iterator it(mLoaders.find(Misc::StringUtils::lowerCase(filepath.extension().string())));
             if (it != mLoaders.end())
             {
-                it->second->load(filepath, index);
+                it->second->load(filepath, index, isGroundcover);
             }
             else
             {
@@ -140,6 +140,7 @@ namespace MWWorld
         Resource::ResourceSystem* resourceSystem, SceneUtil::WorkQueue* workQueue,
         const Files::Collections& fileCollections,
         const std::vector<std::string>& contentFiles,
+        const std::vector<std::string>& groundcoverFiles,
         ToUTF8::Utf8Encoder* encoder, int activationDistanceOverride,
         const std::string& startCell, const std::string& startupScript,
         const std::string& resourcePath, const std::string& userDataPath)
@@ -152,7 +153,7 @@ namespace MWWorld
       mLevitationEnabled(true), mGoToJail(false), mDaysInPrison(0),
       mPlayerTraveling(false), mPlayerInJail(false), mSpellPreloadTimer(0.f)
     {
-        mEsm.resize(contentFiles.size());
+        mEsm.resize(contentFiles.size() + groundcoverFiles.size());
         Loading::Listener* listener = MWBase::Environment::get().getWindowManager()->getLoadingScreen();
         listener->loadingOn();
 
@@ -165,7 +166,7 @@ namespace MWWorld
         gameContentLoader.addLoader(".omwaddon", &esmLoader);
         gameContentLoader.addLoader(".project", &esmLoader);
 
-        loadContentFiles(fileCollections, contentFiles, gameContentLoader);
+        loadContentFiles(fileCollections, contentFiles, groundcoverFiles, gameContentLoader);
 
         listener->loadingOff();
 
@@ -2941,7 +2942,7 @@ namespace MWWorld
     }
 
     void World::loadContentFiles(const Files::Collections& fileCollections,
-        const std::vector<std::string>& content, ContentLoader& contentLoader)
+        const std::vector<std::string>& content, const std::vector<std::string>& groundcover, ContentLoader& contentLoader)
     {
         int idx = 0;
         for (const std::string &file : content)
@@ -2950,7 +2951,7 @@ namespace MWWorld
             const Files::MultiDirCollection& col = fileCollections.getCollection(filename.extension().string());
             if (col.doesExist(file))
             {
-                contentLoader.load(col.getPath(file), idx);
+                contentLoader.load(col.getPath(file), idx, false);
             }
             else
             {
@@ -2959,6 +2960,22 @@ namespace MWWorld
             }
             idx++;
         }
+
+        for (const std::string &file : groundcover)
+        {
+            boost::filesystem::path filename(file);
+            const Files::MultiDirCollection& col = fileCollections.getCollection(filename.extension().string());
+            if (col.doesExist(file))
+            {
+                contentLoader.load(col.getPath(file), idx, true);
+            }
+            else
+            {
+                std::string message = "Failed loading " + file + ": the groundcover file does not exist";
+                throw std::runtime_error(message);
+            }
+            idx++;
+        }
     }
 
     bool World::startSpellCast(const Ptr &actor)
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 79c8a4980e..29d29a1604 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -177,7 +177,7 @@ namespace MWWorld
              * @param contentLoader -
              */
             void loadContentFiles(const Files::Collections& fileCollections,
-                const std::vector<std::string>& content, ContentLoader& contentLoader);
+                const std::vector<std::string>& content, const std::vector<std::string>& groundcover, ContentLoader& contentLoader);
 
             float feetToGameUnits(float feet);
             float getActivationDistancePlusTelekinesis();
@@ -196,6 +196,7 @@ namespace MWWorld
                 Resource::ResourceSystem* resourceSystem, SceneUtil::WorkQueue* workQueue,
                 const Files::Collections& fileCollections,
                 const std::vector<std::string>& contentFiles,
+                const std::vector<std::string>& groundcoverFiles,
                 ToUTF8::Utf8Encoder* encoder, int activationDistanceOverride,
                 const std::string& startCell, const std::string& startupScript,
                 const std::string& resourcePath, const std::string& userDataPath);
diff --git a/components/config/gamesettings.cpp b/components/config/gamesettings.cpp
index d7fe7da948..8717a6839b 100644
--- a/components/config/gamesettings.cpp
+++ b/components/config/gamesettings.cpp
@@ -100,6 +100,7 @@ bool Config::GameSettings::readFile(QTextStream &stream, QMultiMap<QString, QStr
             if (key != QLatin1String("data")
                 && key != QLatin1String("fallback-archive")
                 && key != QLatin1String("content")
+                && key != QLatin1String("groundcover")
                 && key != QLatin1String("script-blacklist"))
                 settings.remove(key);
 
@@ -200,6 +201,7 @@ bool Config::GameSettings::isOrderedLine(const QString& line)
            || line.contains(QRegExp("^\\s*data\\s*="))
            || line.contains(QRegExp("^\\s*data-local\\s*="))
            || line.contains(QRegExp("^\\s*resources\\s*="))
+           || line.contains(QRegExp("^\\s*groundcover\\s*="))
            || line.contains(QRegExp("^\\s*content\\s*="));
 }
 
diff --git a/components/esm/esmreader.cpp b/components/esm/esmreader.cpp
index 1b6eca7346..63d2f4d4f7 100644
--- a/components/esm/esmreader.cpp
+++ b/components/esm/esmreader.cpp
@@ -25,6 +25,7 @@ ESMReader::ESMReader()
     , mGlobalReaderList(nullptr)
     , mEncoder(nullptr)
     , mFileSize(0)
+    , mIsGroundcoverFile(false)
 {
     clearCtx();
 }
@@ -80,8 +81,10 @@ void ESMReader::openRaw(const std::string& filename)
     openRaw(Files::openConstrainedFileStream(filename.c_str()), filename);
 }
 
-void ESMReader::open(Files::IStreamPtr _esm, const std::string &name)
+void ESMReader::open(Files::IStreamPtr _esm, const std::string &name, bool isGroundcover)
 {
+    mIsGroundcoverFile = isGroundcover;
+
     openRaw(_esm, name);
 
     if (getRecName() != "TES3")
@@ -92,9 +95,9 @@ void ESMReader::open(Files::IStreamPtr _esm, const std::string &name)
     mHeader.load (*this);
 }
 
-void ESMReader::open(const std::string &file)
+void ESMReader::open(const std::string &file, bool isGroundcover)
 {
-    open (Files::openConstrainedFileStream (file.c_str ()), file);
+    open (Files::openConstrainedFileStream (file.c_str ()), file, isGroundcover);
 }
 
 int64_t ESMReader::getHNLong(const char *name)
diff --git a/components/esm/esmreader.hpp b/components/esm/esmreader.hpp
index 761756e8fb..600cd497b0 100644
--- a/components/esm/esmreader.hpp
+++ b/components/esm/esmreader.hpp
@@ -31,6 +31,7 @@ public:
 
   int getVer() const { return mHeader.mData.version; }
   int getRecordCount() const { return mHeader.mData.records; }
+  bool isGroundcoverFile() const { return mIsGroundcoverFile; }
   float getFVer() const { return (mHeader.mData.version == VER_12) ? 1.2f : 1.3f; }
   const std::string getAuthor() const { return mHeader.mData.author; }
   const std::string getDesc() const { return mHeader.mData.desc; }
@@ -66,9 +67,9 @@ public:
 
   /// Load ES file from a new stream, parses the header. Closes the
   /// currently open file first, if any.
-  void open(Files::IStreamPtr _esm, const std::string &name);
+  void open(Files::IStreamPtr _esm, const std::string &name, bool isGroundcover = false);
 
-  void open(const std::string &file);
+  void open(const std::string &file, bool isGroundcover = false);
 
   void openRaw(const std::string &filename);
 
@@ -290,6 +291,7 @@ private:
 
   size_t mFileSize;
 
+  bool mIsGroundcoverFile;
 };
 }
 #endif
diff --git a/components/esm/loadstat.cpp b/components/esm/loadstat.cpp
index 6c9de22bd1..85e366f1c9 100644
--- a/components/esm/loadstat.cpp
+++ b/components/esm/loadstat.cpp
@@ -37,6 +37,8 @@ namespace ESM
 
         if (!hasName)
             esm.fail("Missing NAME subrecord");
+
+        mIsGroundcover = esm.isGroundcoverFile();
     }
     void Static::save(ESMWriter &esm, bool isDeleted) const
     {
diff --git a/components/esm/loadstat.hpp b/components/esm/loadstat.hpp
index 3d91440402..da94c4b8d5 100644
--- a/components/esm/loadstat.hpp
+++ b/components/esm/loadstat.hpp
@@ -28,6 +28,8 @@ struct Static
 
     std::string mId, mModel;
 
+    bool mIsGroundcover = false;
+
     void load(ESMReader &esm, bool &isDeleted);
     void save(ESMWriter &esm, bool isDeleted = false) const;
 
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index d937b992b1..0a4faed014 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -247,10 +247,12 @@ namespace Resource
         return mForceShaders;
     }
 
-    void SceneManager::recreateShaders(osg::ref_ptr<osg::Node> node, const std::string& shaderPrefix, bool translucentFramebuffer)
+    void SceneManager::recreateShaders(osg::ref_ptr<osg::Node> node, const std::string& shaderPrefix, bool translucentFramebuffer, bool forceShadersForNode)
     {
         osg::ref_ptr<Shader::ShaderVisitor> shaderVisitor(createShaderVisitor(shaderPrefix, translucentFramebuffer));
         shaderVisitor->setAllowedToModifyStateSets(false);
+        if (forceShadersForNode)
+            shaderVisitor->setForceShaders(true);
         node->accept(*shaderVisitor);
     }
 
@@ -512,7 +514,7 @@ namespace Resource
             SetFilterSettingsControllerVisitor setFilterSettingsControllerVisitor(mMinFilter, mMagFilter, mMaxAnisotropy);
             loaded->accept(setFilterSettingsControllerVisitor);
 
-            osg::ref_ptr<Shader::ShaderVisitor> shaderVisitor (createShaderVisitor());
+            osg::ref_ptr<Shader::ShaderVisitor> shaderVisitor (createShaderVisitor("objects"));
             loaded->accept(*shaderVisitor);
 
             // share state
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index a815a324f2..9da6bc500d 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -76,7 +76,7 @@ namespace Resource
         Shader::ShaderManager& getShaderManager();
 
         /// Re-create shaders for this node, need to call this if texture stages or vertex color mode have changed.
-        void recreateShaders(osg::ref_ptr<osg::Node> node, const std::string& shaderPrefix = "objects", bool translucentFramebuffer = false);
+        void recreateShaders(osg::ref_ptr<osg::Node> node, const std::string& shaderPrefix = "objects", bool translucentFramebuffer = false, bool forceShadersForNode = false);
 
         /// @see ShaderVisitor::setForceShaders
         void setForceShaders(bool force);
diff --git a/components/resource/stats.cpp b/components/resource/stats.cpp
index 942bd92d80..05f97b3ed9 100644
--- a/components/resource/stats.cpp
+++ b/components/resource/stats.cpp
@@ -281,6 +281,7 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase *viewer)
             "FrameNumber",
             "",
             "Compiling",
+            "UnrefQueue",
             "WorkQueue",
             "WorkThread",
             "",
@@ -294,14 +295,13 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase *viewer)
             "Nif",
             "Keyframe",
             "",
+            "Groundcover Chunk",
             "Object Chunk",
             "Terrain Chunk",
             "Terrain Texture",
             "Land",
             "Composite",
             "",
-            "UnrefQueue",
-            "",
             "NavMesh UpdateJobs",
             "NavMesh CacheSize",
             "NavMesh UsedTiles",
diff --git a/components/shader/shadermanager.cpp b/components/shader/shadermanager.cpp
index 788a8720bc..4f887e659b 100644
--- a/components/shader/shadermanager.cpp
+++ b/components/shader/shadermanager.cpp
@@ -342,6 +342,8 @@ namespace Shader
             osg::ref_ptr<osg::Program> program (new osg::Program);
             program->addShader(vertexShader);
             program->addShader(fragmentShader);
+            program->addBindAttribLocation("aOffset", 6);
+            program->addBindAttribLocation("aRotation", 7);
             found = mPrograms.insert(std::make_pair(std::make_pair(vertexShader, fragmentShader), program)).first;
         }
         return found->second;
diff --git a/components/terrain/chunkmanager.cpp b/components/terrain/chunkmanager.cpp
index 50724628dd..a744471de5 100644
--- a/components/terrain/chunkmanager.cpp
+++ b/components/terrain/chunkmanager.cpp
@@ -40,7 +40,7 @@ ChunkManager::ChunkManager(Storage *storage, Resource::SceneManager *sceneMgr, T
     mMultiPassRoot->setAttributeAndModes(material, osg::StateAttribute::ON);
 }
 
-osg::ref_ptr<osg::Node> ChunkManager::getChunk(float size, const osg::Vec2f &center, unsigned char lod, unsigned int lodFlags, bool far, const osg::Vec3f& viewPoint, bool compile)
+osg::ref_ptr<osg::Node> ChunkManager::getChunk(float size, const osg::Vec2f& center, unsigned char lod, unsigned int lodFlags, bool activeGrid, const osg::Vec3f& viewPoint, bool compile)
 {
     ChunkId id = std::make_tuple(center, lod, lodFlags);
     osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(id);
diff --git a/components/terrain/chunkmanager.hpp b/components/terrain/chunkmanager.hpp
index 118df698f1..9b7dbf3ee1 100644
--- a/components/terrain/chunkmanager.hpp
+++ b/components/terrain/chunkmanager.hpp
@@ -35,7 +35,7 @@ namespace Terrain
     public:
         ChunkManager(Storage* storage, Resource::SceneManager* sceneMgr, TextureManager* textureManager, CompositeMapRenderer* renderer);
 
-        osg::ref_ptr<osg::Node> getChunk(float size, const osg::Vec2f& center, unsigned char lod, unsigned int lodFlags, bool far, const osg::Vec3f& viewPoint, bool compile) override;
+        osg::ref_ptr<osg::Node> getChunk(float size, const osg::Vec2f& center, unsigned char lod, unsigned int lodFlags, bool activeGrid, const osg::Vec3f& viewPoint, bool compile) override;
 
         void setCompositeMapSize(unsigned int size) { mCompositeMapSize = size; }
         void setCompositeMapLevel(float level) { mCompositeMapLevel = level; }
diff --git a/components/terrain/quadtreeworld.cpp b/components/terrain/quadtreeworld.cpp
index 57c09000c1..7f184c70eb 100644
--- a/components/terrain/quadtreeworld.cpp
+++ b/components/terrain/quadtreeworld.cpp
@@ -90,8 +90,6 @@ private:
     osg::Vec4i mActiveGrid;
 };
 
-const float MIN_SIZE = 1/8.f;
-
 class RootNode : public QuadTreeNode
 {
 public:
@@ -250,6 +248,7 @@ QuadTreeWorld::QuadTreeWorld(osg::Group *parent, osg::Group *compileRoot, Resour
     , mLodFactor(lodFactor)
     , mVertexLodMod(vertexLodMod)
     , mViewDistance(std::numeric_limits<float>::max())
+    , mMinSize(1/8.f)
 {
     mChunkManager->setCompositeMapSize(compMapResolution);
     mChunkManager->setCompositeMapLevel(compMapLevel);
@@ -257,6 +256,17 @@ QuadTreeWorld::QuadTreeWorld(osg::Group *parent, osg::Group *compileRoot, Resour
     mChunkManagers.push_back(mChunkManager.get());
 }
 
+QuadTreeWorld::QuadTreeWorld(osg::Group *parent, Storage *storage, int nodeMask, float lodFactor, float chunkSize)
+    : TerrainGrid(parent, storage, nodeMask)
+    , mViewDataMap(new ViewDataMap)
+    , mQuadTreeBuilt(false)
+    , mLodFactor(lodFactor)
+    , mVertexLodMod(0)
+    , mViewDistance(std::numeric_limits<float>::max())
+    , mMinSize(chunkSize)
+{
+}
+
 QuadTreeWorld::~QuadTreeWorld()
 {
 }
@@ -425,7 +435,7 @@ void QuadTreeWorld::accept(osg::NodeVisitor &nv)
     if (needsUpdate)
     {
         vd->reset();
-        DefaultLodCallback lodCallback(mLodFactor, MIN_SIZE, mViewDistance, mActiveGrid);
+        DefaultLodCallback lodCallback(mLodFactor, mMinSize, mViewDistance, mActiveGrid);
         mRootNode->traverseNodes(vd, nv.getViewPoint(), &lodCallback);
     }
 
@@ -438,7 +448,7 @@ void QuadTreeWorld::accept(osg::NodeVisitor &nv)
         entry.mRenderingNode->accept(nv);
     }
 
-    if (isCullVisitor)
+    if (mHeightCullCallback && isCullVisitor)
         updateWaterCullingView(mHeightCullCallback, vd, static_cast<osgUtil::CullVisitor*>(&nv), mStorage->getCellWorldSize(), !isGridEmpty());
 
     vd->markUnchanged();
@@ -457,7 +467,7 @@ void QuadTreeWorld::ensureQuadTreeBuilt()
     if (mQuadTreeBuilt)
         return;
 
-    QuadTreeBuilder builder(mStorage, MIN_SIZE);
+    QuadTreeBuilder builder(mStorage, mMinSize);
     builder.build();
 
     mRootNode = builder.getRootNode();
@@ -491,7 +501,7 @@ void QuadTreeWorld::preload(View *view, const osg::Vec3f &viewPoint, const osg::
     ViewData* vd = static_cast<ViewData*>(view);
     vd->setViewPoint(viewPoint);
     vd->setActiveGrid(grid);
-    DefaultLodCallback lodCallback(mLodFactor, MIN_SIZE, mViewDistance, grid);
+    DefaultLodCallback lodCallback(mLodFactor, mMinSize, mViewDistance, grid);
     mRootNode->traverseNodes(vd, viewPoint, &lodCallback);
 
     if (!progressTotal)
@@ -515,14 +525,15 @@ bool QuadTreeWorld::storeView(const View* view, double referenceTime)
 
 void QuadTreeWorld::reportStats(unsigned int frameNumber, osg::Stats *stats)
 {
-    stats->setAttribute(frameNumber, "Composite", mCompositeMapRenderer->getCompileSetSize());
+    if (mCompositeMapRenderer)
+        stats->setAttribute(frameNumber, "Composite", mCompositeMapRenderer->getCompileSetSize());
 }
 
 void QuadTreeWorld::loadCell(int x, int y)
 {
     // fallback behavior only for undefined cells (every other is already handled in quadtree)
     float dummy;
-    if (!mStorage->getMinMaxHeights(1, osg::Vec2f(x+0.5, y+0.5), dummy, dummy))
+    if (mChunkManager && !mStorage->getMinMaxHeights(1, osg::Vec2f(x+0.5, y+0.5), dummy, dummy))
         TerrainGrid::loadCell(x,y);
     else
         World::loadCell(x,y);
@@ -532,7 +543,7 @@ void QuadTreeWorld::unloadCell(int x, int y)
 {
     // fallback behavior only for undefined cells (every other is already handled in quadtree)
     float dummy;
-    if (!mStorage->getMinMaxHeights(1, osg::Vec2f(x+0.5, y+0.5), dummy, dummy))
+    if (mChunkManager && !mStorage->getMinMaxHeights(1, osg::Vec2f(x+0.5, y+0.5), dummy, dummy))
         TerrainGrid::unloadCell(x,y);
     else
         World::unloadCell(x,y);
diff --git a/components/terrain/quadtreeworld.hpp b/components/terrain/quadtreeworld.hpp
index 4c05efe646..aba2dccf3b 100644
--- a/components/terrain/quadtreeworld.hpp
+++ b/components/terrain/quadtreeworld.hpp
@@ -22,6 +22,8 @@ namespace Terrain
     public:
         QuadTreeWorld(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem, Storage* storage, int nodeMask, int preCompileMask, int borderMask, int compMapResolution, float comMapLevel, float lodFactor, int vertexLodMod, float maxCompGeometrySize);
 
+        QuadTreeWorld(osg::Group *parent, Storage *storage, int nodeMask, float lodFactor, float chunkSize);
+
         ~QuadTreeWorld();
 
         void accept(osg::NodeVisitor& nv);
@@ -47,7 +49,7 @@ namespace Terrain
         {
         public:
             virtual ~ChunkManager(){}
-            virtual osg::ref_ptr<osg::Node> getChunk(float size, const osg::Vec2f& center, unsigned char lod, unsigned int lodFlags, bool far, const osg::Vec3f& viewPoint, bool compile) = 0;
+            virtual osg::ref_ptr<osg::Node> getChunk(float size, const osg::Vec2f& center, unsigned char lod, unsigned int lodFlags, bool activeGrid, const osg::Vec3f& viewPoint, bool compile) = 0;
             virtual unsigned int getNodeMask() { return 0; }
         };
         void addChunkManager(ChunkManager*);
@@ -66,6 +68,7 @@ namespace Terrain
         float mLodFactor;
         int mVertexLodMod;
         float mViewDistance;
+        float mMinSize;
     };
 
 }
diff --git a/components/terrain/terraingrid.cpp b/components/terrain/terraingrid.cpp
index 679597971e..cf8debc696 100644
--- a/components/terrain/terraingrid.cpp
+++ b/components/terrain/terraingrid.cpp
@@ -26,6 +26,12 @@ TerrainGrid::TerrainGrid(osg::Group* parent, osg::Group* compileRoot, Resource::
 {
 }
 
+TerrainGrid::TerrainGrid(osg::Group* parent, Storage* storage, int nodeMask)
+    : Terrain::World(parent, storage, nodeMask)
+    , mNumSplits(4)
+{
+}
+
 TerrainGrid::~TerrainGrid()
 {
     while (!mGrid.empty())
@@ -107,6 +113,8 @@ void TerrainGrid::unloadCell(int x, int y)
 
 void TerrainGrid::updateWaterCulling()
 {
+    if (!mHeightCullCallback) return;
+
     osg::ComputeBoundsVisitor computeBoundsVisitor;
     mTerrainRoot->accept(computeBoundsVisitor);
     float lowZ = computeBoundsVisitor.getBoundingBox()._min.z();
diff --git a/components/terrain/terraingrid.hpp b/components/terrain/terraingrid.hpp
index f8b0fb2590..dc9203466d 100644
--- a/components/terrain/terraingrid.hpp
+++ b/components/terrain/terraingrid.hpp
@@ -15,6 +15,7 @@ namespace Terrain
     {
     public:
         TerrainGrid(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem, Storage* storage, int nodeMask, int preCompileMask=~0, int borderMask=0);
+        TerrainGrid(osg::Group* parent, Storage* storage, int nodeMask=~0);
         ~TerrainGrid();
 
         void cacheCell(View* view, int x, int y) override;
diff --git a/components/terrain/world.cpp b/components/terrain/world.cpp
index 5b4807b387..15ec72973d 100644
--- a/components/terrain/world.cpp
+++ b/components/terrain/world.cpp
@@ -49,17 +49,38 @@ World::World(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSyst
     mResourceSystem->addResourceManager(mTextureManager.get());
 }
 
+World::World(osg::Group* parent, Storage* storage, int nodeMask)
+    : mStorage(storage)
+    , mParent(parent)
+    , mCompositeMapCamera(nullptr)
+    , mCompositeMapRenderer(nullptr)
+    , mResourceSystem(nullptr)
+    , mTextureManager(nullptr)
+    , mChunkManager(nullptr)
+    , mCellBorder(nullptr)
+    , mBorderVisible(false)
+    , mHeightCullCallback(nullptr)
+{
+    mTerrainRoot = new osg::Group;
+    mTerrainRoot->setNodeMask(nodeMask);
+
+    mParent->addChild(mTerrainRoot);
+}
+
 World::~World()
 {
-    mResourceSystem->removeResourceManager(mChunkManager.get());
-    mResourceSystem->removeResourceManager(mTextureManager.get());
+    if (mResourceSystem && mChunkManager)
+        mResourceSystem->removeResourceManager(mChunkManager.get());
+    if (mResourceSystem && mTextureManager)
+        mResourceSystem->removeResourceManager(mTextureManager.get());
 
     mParent->removeChild(mTerrainRoot);
 
-    mCompositeMapCamera->removeChild(mCompositeMapRenderer);
-    mCompositeMapCamera->getParent(0)->removeChild(mCompositeMapCamera);
-
-    delete mStorage;
+    if (mCompositeMapCamera && mCompositeMapRenderer)
+    {
+        mCompositeMapCamera->removeChild(mCompositeMapRenderer);
+        mCompositeMapCamera->getParent(0)->removeChild(mCompositeMapCamera);
+    }
 }
 
 void World::setWorkQueue(SceneUtil::WorkQueue* workQueue)
@@ -108,16 +129,20 @@ float World::getHeightAt(const osg::Vec3f &worldPos)
 
 void World::updateTextureFiltering()
 {
-    mTextureManager->updateTextureFiltering();
+    if (mTextureManager)
+        mTextureManager->updateTextureFiltering();
 }
 
 void World::clearAssociatedCaches()
 {
-    mChunkManager->clearCache();
+    if (mChunkManager)
+        mChunkManager->clearCache();
 }
 
 osg::Callback* World::getHeightCullCallback(float highz, unsigned int mask)
 {
+    if (!mHeightCullCallback) return nullptr;
+
     mHeightCullCallback->setHighZ(highz);
     mHeightCullCallback->setCullMask(mask);
     return mHeightCullCallback;
diff --git a/components/terrain/world.hpp b/components/terrain/world.hpp
index d94125100e..a4be57e8ef 100644
--- a/components/terrain/world.hpp
+++ b/components/terrain/world.hpp
@@ -106,6 +106,7 @@ namespace Terrain
         /// @param nodeMask mask for the terrain root
         /// @param preCompileMask mask for pre compiling textures
         World(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem, Storage* storage, int nodeMask, int preCompileMask, int borderMask);
+        World(osg::Group* parent, Storage* storage, int nodeMask);
         virtual ~World();
 
         /// Set a WorkQueue to delete objects in the background thread.
diff --git a/docs/source/reference/modding/extended.rst b/docs/source/reference/modding/extended.rst
index 9e8db49fd4..98b3e7f001 100644
--- a/docs/source/reference/modding/extended.rst
+++ b/docs/source/reference/modding/extended.rst
@@ -223,10 +223,10 @@ For example, to attach a custom weapon bone, you'll need to follow this NIF reco
 
 ::
 
-NiNode "root"
-    NiNode "Bip01 L Hand"
-        NiNode "Weapon Bone Left"
-            NiStringExtraData "BONE"
+    NiNode "root"
+        NiNode "Bip01 L Hand"
+            NiNode "Weapon Bone Left"
+                NiStringExtraData "BONE"
 
 OpenMW will detect ``Weapon Bone Left`` node and attach it to ``Bip01 L Hand`` bone of the target skeleton.
 
@@ -276,6 +276,54 @@ Also it is possible to add a "Bip01 Arrow" bone to actor skeletons. In this case
 Such approach allows to implement better shooting animations (for example, beast races have tail, so quivers should be attached under different angle and
 default arrow fetching animation does not look good).
 
+Groundcover support
+-------------------
+
+Groundcover objects is a special kind of objects (e.g. grass), which can be used to improve visual fidelity.
+They use these assumptions:
+
+1. Each object is independent, so part of objects can be removed from scene without causing graphical artifacts.
+
+2. Groundover should not have collisions.
+
+3. They are not important for some parts of game scene (e.g. local map).
+
+4. They can not be moved or disabled on the fly.
+
+5. They can not be interacted with.
+
+As result, such objects can be treated in the separate way:
+
+1. It is possible to tweak groundcover objects density.
+
+2. It is possible to safely merge such objects even near player.
+
+3. Such objects can be animated (to simulate wind, for example).
+
+4. Some parts of processing can be skipped.
+
+For example, we do not need to have collision or animation objects for groundcover,
+do not need to render groundcover on the map, do not need to render it for the whole visible area (which can be very large with Distant Terrain). It allows to increase performance a lot.
+
+General advices to create assets for this feature:
+1. Alpha properties from Nif files are not used, a unified alpha settings are used (alpha testing, "greater of equal" function, 128/255 threshold).
+2. Use a single NiTriShape in groundocver mesh, or at least use same properties (texture, alpha, material, etc), so OpenMW can merge them on the fly. Otherwise animations may not work properly.
+3. Smooth fading does not work for meshes, which have textures without alpha (e.g. rock).
+
+Groundcover mods can be registered in the openmw.cfg via "groundcover" entries instead of "content" ones:
+
+::
+
+    groundcover=my_grass_mod.esp
+
+Every static from such mod is treated as a groundcover object.
+Also groundcover detection should be enabled via settings.cfg:
+
+::
+
+    [Groundcover]
+    enabled = true
+
 .. _`Graphic Herbalism`: https://www.nexusmods.com/morrowind/mods/46599
 .. _`OpenMW Containers Animated`: https://www.nexusmods.com/morrowind/mods/46232
 .. _`Glow in the Dahrk`: https://www.nexusmods.com/morrowind/mods/45886
diff --git a/docs/source/reference/modding/settings/groundcover.rst b/docs/source/reference/modding/settings/groundcover.rst
new file mode 100644
index 0000000000..9b00d85a1a
--- /dev/null
+++ b/docs/source/reference/modding/settings/groundcover.rst
@@ -0,0 +1,68 @@
+Groundcover Settings
+####################
+
+enabled
+-------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	False
+
+Allows the engine to use groundcover.
+Groundcover objects are static objects which come from ESP files, registered via
+"groundcover" entries from openmw.cfg rather than "content" ones.
+We assume that groundcover objects have no collisions, can not be moved or interacted with,
+so we can merge them to pages and animate them indifferently from distance from player.
+
+This setting can only be configured by editing the settings configuration file.
+
+fade start
+----------
+
+:Type:		floating point
+:Range:		0.0 to 1.0
+:Default:	0.85
+
+Determines on which distance from player groundcover fading starts.
+Does not work for meshes which textures do not have transparency (e.g. rocks).
+
+This setting can only be configured by editing the settings configuration file.
+
+density
+-------
+
+:Type:		floating point
+:Range:		0.0 (0%) to 1.0 (100%)
+:Default:	1.0
+
+Determines how many groundcover instances from content files
+are used in the game. Can affect performance a lot.
+
+This setting can only be configured by editing the settings configuration file.
+
+distance
+--------
+
+:Type:		integer
+:Range:		> 0
+:Default:	1
+
+Determines on which distance in cells grass pages are rendered.
+Default 1 value means 3x3 cells area (active grid).
+May affect performance a lot.
+
+This setting can only be configured by editing the settings configuration file.
+
+min chunk size
+--------------
+
+:Type:		floating point
+:Range:		0.125, 0.25, 0.5, 1.0
+:Default:	0.5
+
+Determines a minimum size of groundcover chunks in cells. For example, with 0.5 value
+chunks near player will have size 4096x4096 game units. Larger chunks reduce CPU usage
+(Draw and Cull bars), but can increase GPU usage (GPU bar) since culling becomes less efficient.
+Smaller values do an opposite.
+
+This setting can only be configured by editing the settings configuration file.
diff --git a/docs/source/reference/modding/settings/index.rst b/docs/source/reference/modding/settings/index.rst
index 586a99dbb7..220ee88c4b 100644
--- a/docs/source/reference/modding/settings/index.rst
+++ b/docs/source/reference/modding/settings/index.rst
@@ -42,6 +42,7 @@ The ranges included with each setting are the physically possible ranges, not re
 	camera
 	cells
 	fog
+	groundcover
 	map
 	GUI
 	HUD
diff --git a/docs/source/reference/modding/settings/shaders.rst b/docs/source/reference/modding/settings/shaders.rst
index e23cc3d548..ed43b19a2a 100644
--- a/docs/source/reference/modding/settings/shaders.rst
+++ b/docs/source/reference/modding/settings/shaders.rst
@@ -26,6 +26,7 @@ Has no effect if the 'force shaders' option is false.
 Enabling per-pixel lighting results in visual differences to the original MW engine.
 It is not recommended to enable this option when using vanilla Morrowind files,
 because certain lights in Morrowind rely on vertex lighting to look as intended.
+Note that groundcover shaders ignore this setting.
 
 clamp lighting
 --------------
diff --git a/docs/source/reference/modding/settings/water.rst b/docs/source/reference/modding/settings/water.rst
index b79daacb7d..b3a6f8c1f2 100644
--- a/docs/source/reference/modding/settings/water.rst
+++ b/docs/source/reference/modding/settings/water.rst
@@ -62,7 +62,7 @@ reflection detail
 -----------------
 
 :Type:		integer
-:Range:		0, 1, 2, 3, 4
+:Range:		0, 1, 2, 3, 4, 5
 :Default:	2
 
 Controls what kinds of things are rendered in water reflections.
@@ -72,6 +72,7 @@ Controls what kinds of things are rendered in water reflections.
 2: statics, activators, and doors are also reflected
 3: items, containers, and particles are also reflected
 4: actors are also reflected
+5: groundcover objects are also reflected
 
 In interiors the lowest level is 2.
 This setting can be changed ingame with the "Reflection shader detail" dropdown under the Water tab of the Video panel in the Options menu.
diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index 14ab7c9de5..b57d362ed0 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -449,6 +449,7 @@
                                     <Property key="AddItem" value="World"/>
                                     <Property key="AddItem" value="Objects"/>
                                     <Property key="AddItem" value="Actors"/>
+                                    <Property key="AddItem" value="Groundcover"/>
                                 </Widget>
                                 <Widget type="AutoSizedTextBox" skin="SandText" position="64 4 90 16" align="Left Top">
                                     <Property key="Caption" value="Reflection shader detail"/>
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index d0793fc819..f6bfff7b10 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -950,6 +950,25 @@ lineofsight keep inactive cache = 0
 defer aabb update = true
 
 [Models]
+
 # Attempt to load any valid NIF file regardless of its version and track the progress.
 # Loading arbitrary meshes is not advised and may cause instability.
 load unsupported nif files = false
+
+[Groundcover]
+
+# enable separate groundcover handling
+enabled = false
+
+# configure groundcover fade out threshold
+fade start = 0.85
+
+# A groundcover density (0.0 <= value <= 1.0)
+# 1.0 means 100% density
+density = 1.0
+
+# A maximum distance in cells on which groundcover is rendered.
+distance = 1
+
+# A minimum size of groundcover chunk in cells (0.125, 0.25, 0.5, 1.0)
+min chunk size = 0.5
diff --git a/files/shaders/CMakeLists.txt b/files/shaders/CMakeLists.txt
index 47670e7a03..a4e898e4b0 100644
--- a/files/shaders/CMakeLists.txt
+++ b/files/shaders/CMakeLists.txt
@@ -7,6 +7,8 @@ set(SDIR ${CMAKE_CURRENT_SOURCE_DIR})
 set(DDIRRELATIVE resources/shaders)
 
 set(SHADER_FILES
+    groundcover_vertex.glsl
+    groundcover_fragment.glsl
     water_vertex.glsl
     water_fragment.glsl
     water_nm.png
diff --git a/files/shaders/groundcover_fragment.glsl b/files/shaders/groundcover_fragment.glsl
new file mode 100644
index 0000000000..9c680853af
--- /dev/null
+++ b/files/shaders/groundcover_fragment.glsl
@@ -0,0 +1,93 @@
+#version 120
+
+#define GROUNDCOVER
+
+#if @diffuseMap
+uniform sampler2D diffuseMap;
+varying vec2 diffuseMapUV;
+#endif
+
+#if @normalMap
+uniform sampler2D normalMap;
+varying vec2 normalMapUV;
+varying vec4 passTangent;
+#endif
+
+// Other shaders respect forcePPL, but legacy groundcover mods were designed to work with vertex lighting.
+// They may do not look as intended with per-pixel lighting, so ignore this setting for now.
+#define PER_PIXEL_LIGHTING @normalMap
+
+varying float euclideanDepth;
+varying float linearDepth;
+
+#if PER_PIXEL_LIGHTING
+varying vec3 passViewPos;
+varying vec3 passNormal;
+#else
+centroid varying vec3 passLighting;
+centroid varying vec3 shadowDiffuseLighting;
+#endif
+
+#include "shadows_fragment.glsl"
+#include "lighting.glsl"
+
+float calc_coverage(float a, float alpha_ref, float falloff_rate)
+{
+    return clamp(falloff_rate * (a - alpha_ref) + alpha_ref, 0.0, 1.0);
+}
+
+void main()
+{
+#if @normalMap
+    vec4 normalTex = texture2D(normalMap, normalMapUV);
+
+    vec3 normalizedNormal = normalize(passNormal);
+    vec3 normalizedTangent = normalize(passTangent.xyz);
+    vec3 binormal = cross(normalizedTangent, normalizedNormal) * passTangent.w;
+    mat3 tbnTranspose = mat3(normalizedTangent, binormal, normalizedNormal);
+
+    vec3 viewNormal = gl_NormalMatrix * normalize(tbnTranspose * (normalTex.xyz * 2.0 - 1.0));
+#endif
+
+#if (!@normalMap && @forcePPL && false)
+    vec3 viewNormal = gl_NormalMatrix * normalize(passNormal);
+#endif
+
+#if @diffuseMap
+    gl_FragData[0] = texture2D(diffuseMap, diffuseMapUV);
+#else
+    gl_FragData[0] = vec4(1.0);
+#endif
+
+    gl_FragData[0].a = calc_coverage(gl_FragData[0].a, 128.0/255.0, 4.0);
+
+    float shadowing = unshadowedLightRatio(linearDepth);
+    if (euclideanDepth > @groundcoverFadeStart)
+        gl_FragData[0].a *= 1.0-smoothstep(@groundcoverFadeStart, @groundcoverFadeEnd, euclideanDepth);
+
+    vec3 lighting;
+#if !PER_PIXEL_LIGHTING
+    lighting = passLighting + shadowDiffuseLighting * shadowing;
+#else
+    vec3 diffuseLight, ambientLight;
+    doLighting(passViewPos, normalize(viewNormal), shadowing, diffuseLight, ambientLight);
+    lighting = diffuseLight + ambientLight;
+#endif
+
+#if @clamp
+    lighting = clamp(lighting, vec3(0.0), vec3(1.0));
+#else
+    lighting = max(lighting, 0.0);
+#endif
+
+    gl_FragData[0].xyz *= lighting;
+
+#if @radialFog
+    float fogValue = clamp((euclideanDepth - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);
+#else
+    float fogValue = clamp((linearDepth - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);
+#endif
+    gl_FragData[0].xyz = mix(gl_FragData[0].xyz, gl_Fog.color.xyz, fogValue);
+
+    applyShadowDebugOverlay();
+}
diff --git a/files/shaders/groundcover_vertex.glsl b/files/shaders/groundcover_vertex.glsl
new file mode 100644
index 0000000000..4f3303b037
--- /dev/null
+++ b/files/shaders/groundcover_vertex.glsl
@@ -0,0 +1,143 @@
+#version 120
+
+#define GROUNDCOVER
+
+attribute vec4 aOffset;
+attribute vec3 aRotation;
+
+#if @diffuseMap
+varying vec2 diffuseMapUV;
+#endif
+
+#if @normalMap
+varying vec2 normalMapUV;
+varying vec4 passTangent;
+#endif
+
+// Other shaders respect forcePPL, but legacy groundcover mods were designed to work with vertex lighting.
+// They may do not look as intended with per-pixel lighting, so ignore this setting for now.
+#define PER_PIXEL_LIGHTING @normalMap
+
+varying float euclideanDepth;
+varying float linearDepth;
+
+#if PER_PIXEL_LIGHTING
+varying vec3 passViewPos;
+varying vec3 passNormal;
+#else
+centroid varying vec3 passLighting;
+centroid varying vec3 shadowDiffuseLighting;
+#endif
+
+#include "shadows_vertex.glsl"
+#include "lighting.glsl"
+
+uniform float osg_SimulationTime;
+uniform mat4 osg_ViewMatrixInverse;
+uniform mat4 osg_ViewMatrix;
+uniform float windSpeed;
+uniform vec3 playerPos;
+
+vec2 groundcoverDisplacement(in vec3 worldpos, float h)
+{
+    vec2 windDirection = vec2(1.0);
+    vec3 footPos = playerPos;
+    vec3 windVec = vec3(windSpeed * windDirection, 1.0);
+
+    float v = length(windVec);
+    vec2 displace = vec2(2.0 * windVec + 0.1);
+    vec2 harmonics = vec2(0.0);
+
+    harmonics += vec2((1.0 - 0.10*v) * sin(1.0*osg_SimulationTime + worldpos.xy / 1100.0));
+    harmonics += vec2((1.0 - 0.04*v) * cos(2.0*osg_SimulationTime + worldpos.xy / 750.0));
+    harmonics += vec2((1.0 + 0.14*v) * sin(3.0*osg_SimulationTime + worldpos.xy / 500.0));
+    harmonics += vec2((1.0 + 0.28*v) * sin(5.0*osg_SimulationTime + worldpos.xy / 200.0));
+
+    // FIXME: stomping function does not work well in MGE:
+    // 1. It does not take in account Z coordinate, so it works even when player levitates.
+    // 2. It works more-or-less well only for grass meshes, but not for other types of plants.
+    // So disable this function for now, until we find a better one.
+    vec2 stomp = vec2(0.0);
+    //float d = length(worldpos.xy - footPos.xy);
+    //if (d < 150.0 && d > 0.0)
+    //{
+    //    stomp = (60.0 / d - 0.4) * (worldpos.xy - footPos.xy);
+    //}
+
+    return clamp(0.02 * h, 0.0, 1.0) * (harmonics * displace + stomp);
+}
+
+mat4 rotation(in vec3 angle)
+{
+    float sin_x = sin(angle.x);
+    float cos_x = cos(angle.x);
+    float sin_y = sin(angle.y);
+    float cos_y = cos(angle.y);
+    float sin_z = sin(angle.z);
+    float cos_z = cos(angle.z);
+
+    return mat4(
+        cos_z*cos_y+sin_x*sin_y*sin_z, -sin_z*cos_x, cos_z*sin_y+sin_z*sin_x*cos_y, 0.0,
+        sin_z*cos_y+cos_z*sin_x*sin_y, cos_z*cos_x, sin_z*sin_y-cos_z*sin_x*cos_y, 0.0,
+        -sin_y*cos_x, sin_x, cos_x*cos_y, 0.0,
+        0.0, 0.0, 0.0, 1.0);
+}
+
+mat3 rotation3(in mat4 rot4)
+{
+    return mat3(
+        rot4[0].xyz,
+        rot4[1].xyz,
+        rot4[2].xyz);
+}
+
+void main(void)
+{
+    vec3 position = aOffset.xyz;
+    float scale = aOffset.w;
+
+    mat4 rotation = rotation(aRotation);
+    vec4 displacedVertex = rotation * scale * gl_Vertex;
+
+    displacedVertex = vec4(displacedVertex.xyz + position, 1.0);
+
+    vec4 worldPos = osg_ViewMatrixInverse * gl_ModelViewMatrix * displacedVertex;
+    worldPos.xy += groundcoverDisplacement(worldPos.xyz, gl_Vertex.z);
+    vec4 viewPos = osg_ViewMatrix * worldPos;
+
+    gl_ClipVertex = viewPos;
+    euclideanDepth = length(viewPos.xyz);
+
+    if (length(gl_ModelViewMatrix * vec4(position, 1.0)) > @groundcoverFadeEnd)
+        gl_Position = vec4(0.0, 0.0, 0.0, 1.0);
+    else
+        gl_Position = gl_ProjectionMatrix * viewPos;
+
+    linearDepth = gl_Position.z;
+
+#if (!PER_PIXEL_LIGHTING || @shadows_enabled)
+    vec3 viewNormal = normalize((gl_NormalMatrix * rotation3(rotation) * gl_Normal).xyz);
+#endif
+
+#if @diffuseMap
+    diffuseMapUV = (gl_TextureMatrix[@diffuseMapUV] * gl_MultiTexCoord@diffuseMapUV).xy;
+#endif
+
+#if @normalMap
+    normalMapUV = (gl_TextureMatrix[@normalMapUV] * gl_MultiTexCoord@normalMapUV).xy;
+    passTangent = gl_MultiTexCoord7.xyzw * rotation;
+#endif
+
+#if PER_PIXEL_LIGHTING
+    passViewPos = viewPos.xyz;
+    passNormal = rotation3(rotation) * gl_Normal.xyz;
+#else
+    vec3 diffuseLight, ambientLight;
+    doLighting(viewPos.xyz, viewNormal, diffuseLight, ambientLight, shadowDiffuseLighting);
+    passLighting = diffuseLight + ambientLight;
+#endif
+
+#if (@shadows_enabled)
+    setupShadowCoords(viewPos, viewNormal);
+#endif
+}
diff --git a/files/shaders/lighting.glsl b/files/shaders/lighting.glsl
index 930f4de264..1b3ff288a0 100644
--- a/files/shaders/lighting.glsl
+++ b/files/shaders/lighting.glsl
@@ -8,7 +8,20 @@ void perLight(out vec3 ambientOut, out vec3 diffuseOut, int lightIndex, vec3 vie
     float illumination = clamp(1.0 / (gl_LightSource[lightIndex].constantAttenuation + gl_LightSource[lightIndex].linearAttenuation * lightDistance + gl_LightSource[lightIndex].quadraticAttenuation * lightDistance * lightDistance), 0.0, 1.0);
 
     ambientOut = gl_LightSource[lightIndex].ambient.xyz * illumination;
-    diffuseOut = gl_LightSource[lightIndex].diffuse.xyz * max(dot(viewNormal, lightDir), 0.0) * illumination;
+
+    float lambert = dot(viewNormal.xyz, lightDir) * illumination;
+#ifndef GROUNDCOVER
+    lambert = max(lambert, 0.0);
+#else
+    {
+        // might need to be < 0 depending on direction of viewPos
+        if (dot(viewPos, viewNormal.xyz) > 0)
+            lambert = -lambert;
+        if (lambert < 0)
+            lambert *= -0.3;
+    }
+#endif
+    diffuseOut = gl_LightSource[lightIndex].diffuse.xyz * lambert;
 }
 
 #if PER_PIXEL_LIGHTING

From 5124e81348ecdc915dd7248c8b088353f2037ea2 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sun, 22 Nov 2020 10:17:20 +0400
Subject: [PATCH 0257/2859] Use linear interpolation instead of abrupt
 transitions for groundcover lighting

---
 files/shaders/lighting.glsl | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/files/shaders/lighting.glsl b/files/shaders/lighting.glsl
index 1b3ff288a0..5eae890291 100644
--- a/files/shaders/lighting.glsl
+++ b/files/shaders/lighting.glsl
@@ -14,11 +14,20 @@ void perLight(out vec3 ambientOut, out vec3 diffuseOut, int lightIndex, vec3 vie
     lambert = max(lambert, 0.0);
 #else
     {
-        // might need to be < 0 depending on direction of viewPos
-        if (dot(viewPos, viewNormal.xyz) > 0)
-            lambert = -lambert;
-        if (lambert < 0)
-            lambert *= -0.3;
+        float cosine = dot(normalize(viewPos), normalize(viewNormal.xyz));
+        if (lambert >= 0.0)
+            cosine = -cosine;
+
+        float mult = 1.0;
+        float divisor = 8.0;
+
+        if (cosine < 0.0 && cosine >= -1.0/divisor)
+            mult = mix(1.0, 0.3, -cosine*divisor);
+        else if (cosine < -1.0/divisor)
+            mult = 0.3;
+
+        lambert *= mult;
+        lambert = abs(lambert);
     }
 #endif
     diffuseOut = gl_LightSource[lightIndex].diffuse.xyz * lambert;

From 36fc573375dcea73cc412d9452e6684f0de9f9ec Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Thu, 17 Dec 2020 13:55:20 +0400
Subject: [PATCH 0258/2859] Take in account Z direction for stomping

---
 files/shaders/groundcover_vertex.glsl | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/files/shaders/groundcover_vertex.glsl b/files/shaders/groundcover_vertex.glsl
index 4f3303b037..407599effd 100644
--- a/files/shaders/groundcover_vertex.glsl
+++ b/files/shaders/groundcover_vertex.glsl
@@ -53,18 +53,14 @@ vec2 groundcoverDisplacement(in vec3 worldpos, float h)
     harmonics += vec2((1.0 + 0.14*v) * sin(3.0*osg_SimulationTime + worldpos.xy / 500.0));
     harmonics += vec2((1.0 + 0.28*v) * sin(5.0*osg_SimulationTime + worldpos.xy / 200.0));
 
-    // FIXME: stomping function does not work well in MGE:
-    // 1. It does not take in account Z coordinate, so it works even when player levitates.
-    // 2. It works more-or-less well only for grass meshes, but not for other types of plants.
-    // So disable this function for now, until we find a better one.
-    vec2 stomp = vec2(0.0);
-    //float d = length(worldpos.xy - footPos.xy);
-    //if (d < 150.0 && d > 0.0)
-    //{
-    //    stomp = (60.0 / d - 0.4) * (worldpos.xy - footPos.xy);
-    //}
-
-    return clamp(0.02 * h, 0.0, 1.0) * (harmonics * displace + stomp);
+    float d = length(worldpos - footPos.xyz);
+    vec3 stomp = vec3(0.0);
+    if (d < 150.0 && d > 0.0)
+    {
+        stomp = (60.0 / d - 0.4) * (worldpos - footPos.xyz);
+    }
+
+    return clamp(0.02 * h, 0.0, 1.0) * (harmonics * displace + stomp.xy);
 }
 
 mat4 rotation(in vec3 angle)

From a09f03c85062180d5ae82796a92b5eab4ce27543 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Fri, 18 Dec 2020 14:52:30 +0400
Subject: [PATCH 0259/2859] Drop groundcover materials - they are not used

---
 apps/openmw/mwrender/groundcover.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/openmw/mwrender/groundcover.cpp b/apps/openmw/mwrender/groundcover.cpp
index b9fdc2e280..1a5ccc29f6 100644
--- a/apps/openmw/mwrender/groundcover.cpp
+++ b/apps/openmw/mwrender/groundcover.cpp
@@ -58,6 +58,7 @@ namespace MWRender
             osg::ref_ptr<osg::StateSet> ss = node.getStateSet();
             if (ss != nullptr)
             {
+                ss->removeAttribute(osg::StateAttribute::MATERIAL);
                 removeAlpha(ss);
             }
 
@@ -101,6 +102,7 @@ namespace MWRender
             ss->setAttribute(new osg::VertexAttribDivisor(6, 1));
             ss->setAttribute(new osg::VertexAttribDivisor(7, 1));
 
+            ss->removeAttribute(osg::StateAttribute::MATERIAL);
             removeAlpha(ss);
 
             traverse(geom);

From 859cd0fd0c34ef6256b0c70cd4be0bef9797a5a0 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 9 Jan 2021 22:47:19 +0400
Subject: [PATCH 0260/2859] Do not use display lists for instanced meshes

---
 apps/openmw/mwrender/groundcover.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/openmw/mwrender/groundcover.cpp b/apps/openmw/mwrender/groundcover.cpp
index 1a5ccc29f6..11a155f9ff 100644
--- a/apps/openmw/mwrender/groundcover.cpp
+++ b/apps/openmw/mwrender/groundcover.cpp
@@ -95,6 +95,9 @@ namespace MWRender
                 (*rotations)[i] = mInstances[i].mPos.asRotationVec3();
             }
 
+            // Display lists do not support instancing in OSG 3.4
+            geom.setUseDisplayList(false);
+
             geom.setVertexAttribArray(6, transforms.get(), osg::Array::BIND_PER_VERTEX);
             geom.setVertexAttribArray(7, rotations.get(), osg::Array::BIND_PER_VERTEX);
 

From 1a6c06f7b59c05c60b31693f46f9a25940881332 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sun, 10 Jan 2021 16:36:25 +0400
Subject: [PATCH 0261/2859] Do not allow to set distance to non-positive values

---
 apps/openmw/mwrender/renderingmanager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index c755f46f83..1b4b0cf270 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -244,7 +244,7 @@ namespace MWRender
         globalDefines["preLightEnv"] = Settings::Manager::getBool("apply lighting to environment maps", "Shaders") ? "1" : "0";
         globalDefines["radialFog"] = Settings::Manager::getBool("radial fog", "Shaders") ? "1" : "0";
 
-        float groundcoverDistance = (Constants::CellSizeInUnits * Settings::Manager::getInt("distance", "Groundcover") - 1024) * 0.93;
+        float groundcoverDistance = (Constants::CellSizeInUnits * std::max(1, Settings::Manager::getInt("distance", "Groundcover")) - 1024) * 0.93;
         globalDefines["groundcoverFadeStart"] = std::to_string(groundcoverDistance * Settings::Manager::getFloat("fade start", "Groundcover"));
         globalDefines["groundcoverFadeEnd"] = std::to_string(groundcoverDistance);
 
@@ -1024,7 +1024,7 @@ namespace MWRender
 
         if (mGroundcoverWorld)
         {
-            int groundcoverDistance = Constants::CellSizeInUnits * Settings::Manager::getInt("distance", "Groundcover");
+            int groundcoverDistance = Constants::CellSizeInUnits * std::max(1, Settings::Manager::getInt("distance", "Groundcover"));
             mGroundcoverWorld->setViewDistance(groundcoverDistance * (distanceMult ? 1.f/distanceMult : 1.f));
         }
     }

From 8874e88ff1e0339afdf8365ed793a43bf4a750ea Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 11 Jan 2021 09:59:57 +0400
Subject: [PATCH 0262/2859] Drop fading setting

---
 apps/openmw/mwrender/renderingmanager.cpp            |  2 +-
 .../reference/modding/settings/groundcover.rst       | 12 ------------
 files/settings-default.cfg                           |  3 ---
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 1b4b0cf270..68576cf44f 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -245,7 +245,7 @@ namespace MWRender
         globalDefines["radialFog"] = Settings::Manager::getBool("radial fog", "Shaders") ? "1" : "0";
 
         float groundcoverDistance = (Constants::CellSizeInUnits * std::max(1, Settings::Manager::getInt("distance", "Groundcover")) - 1024) * 0.93;
-        globalDefines["groundcoverFadeStart"] = std::to_string(groundcoverDistance * Settings::Manager::getFloat("fade start", "Groundcover"));
+        globalDefines["groundcoverFadeStart"] = std::to_string(groundcoverDistance * 0.9f);
         globalDefines["groundcoverFadeEnd"] = std::to_string(groundcoverDistance);
 
         // It is unnecessary to stop/start the viewer as no frames are being rendered yet.
diff --git a/docs/source/reference/modding/settings/groundcover.rst b/docs/source/reference/modding/settings/groundcover.rst
index 9b00d85a1a..f0c37b7388 100644
--- a/docs/source/reference/modding/settings/groundcover.rst
+++ b/docs/source/reference/modding/settings/groundcover.rst
@@ -16,18 +16,6 @@ so we can merge them to pages and animate them indifferently from distance from
 
 This setting can only be configured by editing the settings configuration file.
 
-fade start
-----------
-
-:Type:		floating point
-:Range:		0.0 to 1.0
-:Default:	0.85
-
-Determines on which distance from player groundcover fading starts.
-Does not work for meshes which textures do not have transparency (e.g. rocks).
-
-This setting can only be configured by editing the settings configuration file.
-
 density
 -------
 
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index f6bfff7b10..3660f56f0a 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -960,9 +960,6 @@ load unsupported nif files = false
 # enable separate groundcover handling
 enabled = false
 
-# configure groundcover fade out threshold
-fade start = 0.85
-
 # A groundcover density (0.0 <= value <= 1.0)
 # 1.0 means 100% density
 density = 1.0

From d12a0fdcb3dbbe056ae4734f8e931fd3e060274f Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 11 Jan 2021 10:02:55 +0400
Subject: [PATCH 0263/2859] Mark only instances from groundcover files as
 groundcover objects

---
 apps/openmw/mwrender/groundcover.cpp  | 21 +++++++++++++++++----
 apps/openmw/mwrender/objectpaging.cpp |  3 +--
 apps/openmw/mwworld/cellpreloader.cpp |  8 ++------
 apps/openmw/mwworld/cellstore.cpp     | 20 +++++---------------
 apps/openmw/mwworld/contentloader.hpp |  2 +-
 apps/openmw/mwworld/esmloader.cpp     |  6 +++---
 apps/openmw/mwworld/esmloader.hpp     |  2 +-
 apps/openmw/mwworld/esmstore.cpp      |  9 ---------
 apps/openmw/mwworld/esmstore.hpp      | 17 -----------------
 apps/openmw/mwworld/worldimp.cpp      | 10 ++++++----
 components/esm/cellref.cpp            |  5 +++++
 components/esm/cellref.hpp            |  5 +++++
 components/esm/esmreader.cpp          |  9 +++------
 components/esm/esmreader.hpp          |  7 ++-----
 components/esm/loadstat.cpp           |  2 --
 components/esm/loadstat.hpp           |  2 --
 16 files changed, 51 insertions(+), 77 deletions(-)

diff --git a/apps/openmw/mwrender/groundcover.cpp b/apps/openmw/mwrender/groundcover.cpp
index 11a155f9ff..049118c904 100644
--- a/apps/openmw/mwrender/groundcover.cpp
+++ b/apps/openmw/mwrender/groundcover.cpp
@@ -13,6 +13,17 @@
 
 namespace MWRender
 {
+    std::string getGroundcoverModel(int type, const std::string& id, const MWWorld::ESMStore& store)
+    {
+        switch (type)
+        {
+          case ESM::REC_STAT:
+            return store.get<ESM::Static>().searchStatic(id)->mModel;
+          default:
+            return std::string();
+        }
+    }
+
     void GroundcoverUpdater::setWindSpeed(float windSpeed)
     {
         mWindSpeed = windSpeed;
@@ -217,15 +228,17 @@ namespace MWRender
                     while(cell->getNextRef(esm[index], ref, deleted))
                     {
                         if (deleted) continue;
-                        Misc::StringUtils::lowerCaseInPlace(ref.mRefID);
-                        std::string model;
-                        if (!store.isGroundcover(ref.mRefID, model)) continue;
-                        if (model.empty()) continue;
+                        if (!ref.mRefNum.fromGroundcoverFile()) continue;
 
                         if (!calculator.isInstanceEnabled()) continue;
                         if (!isInChunkBorders(ref, minBound, maxBound)) continue;
 
+                        Misc::StringUtils::lowerCaseInPlace(ref.mRefID);
+                        int type = store.findStatic(ref.mRefID);
+                        std::string model = getGroundcoverModel(type, ref.mRefID, store);
+                        if (model.empty()) continue;
                         model = "meshes/" + model;
+
                         instances[model].emplace_back(ref, model);
                     }
                 }
diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index 478fde0f86..b85358c208 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -373,7 +373,6 @@ namespace MWRender
         std::map<ESM::RefNum, ESM::CellRef> refs;
         std::vector<ESM::ESMReader> esm;
         const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
-
         for (int cellX = startCell.x(); cellX < startCell.x() + size; ++cellX)
         {
             for (int cellY = startCell.y(); cellY < startCell.y() + size; ++cellY)
@@ -398,7 +397,7 @@ namespace MWRender
                             int type = store.findStatic(ref.mRefID);
                             if (!typeFilter(type,size>=2)) continue;
                             if (deleted) { refs.erase(ref.mRefNum); continue; }
-                            if (store.isGroundcover(ref.mRefID)) continue;
+                            if (ref.mRefNum.fromGroundcoverFile()) continue;
                             refs[ref.mRefNum] = ref;
                         }
                     }
diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index 937491f622..421de4a7d6 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -1,5 +1,6 @@
 #include "cellpreloader.hpp"
 
+#include <algorithm>
 #include <atomic>
 #include <limits>
 
@@ -36,12 +37,7 @@ namespace MWWorld
 
         virtual bool operator()(const MWWorld::Ptr& ptr)
         {
-            if (ptr.getTypeName()==typeid (ESM::Static).name())
-            {
-                const MWWorld::LiveCellRef<ESM::Static> *ref = ptr.get<ESM::Static>();
-                if (ref->mBase->mIsGroundcover)
-                    return true;
-            }
+            if (ptr.getCellRef().getRefNum().fromGroundcoverFile()) return true;
 
             ptr.getClass().getModelsToPreload(ptr, mOut);
 
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index d8e2eb65fe..7ca35a1dfa 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -169,18 +169,6 @@ namespace
 
 namespace MWWorld
 {
-    template <typename X>
-    bool CellRefList<X>::ignoreInstance (const X* ptr)
-    {
-        return false;
-    }
-
-    template <>
-    bool CellRefList<ESM::Static>::ignoreInstance (const ESM::Static* ptr)
-    {
-        return ptr->mIsGroundcover;
-    }
-
     template <typename X>
     void CellRefList<X>::load(ESM::CellRef &ref, bool deleted, const MWWorld::ESMStore &esmStore)
     {
@@ -188,8 +176,6 @@ namespace MWWorld
 
         if (const X *ptr = store.search (ref.mRefID))
         {
-            if (ignoreInstance(ptr)) return;
-
             typename std::list<LiveRef>::iterator iter =
                 std::find(mList.begin(), mList.end(), ref.mRefNum);
 
@@ -700,7 +686,11 @@ namespace MWWorld
             case ESM::REC_NPC_: mNpcs.load(ref, deleted, store); break;
             case ESM::REC_PROB: mProbes.load(ref, deleted, store); break;
             case ESM::REC_REPA: mRepairs.load(ref, deleted, store); break;
-            case ESM::REC_STAT: mStatics.load(ref, deleted, store); break;
+            case ESM::REC_STAT:
+            {
+                if (ref.mRefNum.fromGroundcoverFile()) return;
+                mStatics.load(ref, deleted, store); break;
+            }
             case ESM::REC_WEAP: mWeapons.load(ref, deleted, store); break;
             case ESM::REC_BODY: mBodyParts.load(ref, deleted, store); break;
 
diff --git a/apps/openmw/mwworld/contentloader.hpp b/apps/openmw/mwworld/contentloader.hpp
index b559df0832..b529ae9db8 100644
--- a/apps/openmw/mwworld/contentloader.hpp
+++ b/apps/openmw/mwworld/contentloader.hpp
@@ -21,7 +21,7 @@ struct ContentLoader
     {
     }
 
-    virtual void load(const boost::filesystem::path& filepath, int& index, bool isGroundcover)
+    virtual void load(const boost::filesystem::path& filepath, int& index)
     {
         Log(Debug::Info) << "Loading content file " << filepath.string();
         mListener.setLabel(MyGUI::TextIterator::toTagsString(filepath.string()));
diff --git a/apps/openmw/mwworld/esmloader.cpp b/apps/openmw/mwworld/esmloader.cpp
index c966182152..46b806582b 100644
--- a/apps/openmw/mwworld/esmloader.cpp
+++ b/apps/openmw/mwworld/esmloader.cpp
@@ -15,15 +15,15 @@ EsmLoader::EsmLoader(MWWorld::ESMStore& store, std::vector<ESM::ESMReader>& read
 {
 }
 
-void EsmLoader::load(const boost::filesystem::path& filepath, int& index, bool isGroundcover)
+void EsmLoader::load(const boost::filesystem::path& filepath, int& index)
 {
-    ContentLoader::load(filepath.filename(), index, isGroundcover);
+    ContentLoader::load(filepath.filename(), index);
 
     ESM::ESMReader lEsm;
     lEsm.setEncoder(mEncoder);
     lEsm.setIndex(index);
     lEsm.setGlobalReaderList(&mEsm);
-    lEsm.open(filepath.string(), isGroundcover);
+    lEsm.open(filepath.string());
     mEsm[index] = lEsm;
     mStore.load(mEsm[index], &mListener);
 }
diff --git a/apps/openmw/mwworld/esmloader.hpp b/apps/openmw/mwworld/esmloader.hpp
index cc4c15a15e..506105bebb 100644
--- a/apps/openmw/mwworld/esmloader.hpp
+++ b/apps/openmw/mwworld/esmloader.hpp
@@ -25,7 +25,7 @@ struct EsmLoader : public ContentLoader
     EsmLoader(MWWorld::ESMStore& store, std::vector<ESM::ESMReader>& readers,
       ToUTF8::Utf8Encoder* encoder, Loading::Listener& listener);
 
-    void load(const boost::filesystem::path& filepath, int& index, bool isGroundcover) override;
+    void load(const boost::filesystem::path& filepath, int& index) override;
 
     private:
       std::vector<ESM::ESMReader>& mEsm;
diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index 2731d7eb17..90bc80b484 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -190,15 +190,6 @@ void ESMStore::setUp(bool validateRecords)
     {
         validate();
         countRecords();
-
-        if (mGroundcovers.empty())
-        {
-            for (const ESM::Static& record : mStatics)
-            {
-                if (record.mIsGroundcover)
-                    mGroundcovers[record.mId] = record.mModel;
-            }
-        }
     }
 }
 
diff --git a/apps/openmw/mwworld/esmstore.hpp b/apps/openmw/mwworld/esmstore.hpp
index 18bb95580d..d69c56d8c0 100644
--- a/apps/openmw/mwworld/esmstore.hpp
+++ b/apps/openmw/mwworld/esmstore.hpp
@@ -75,7 +75,6 @@ namespace MWWorld
         // maps the id name to the record type.
         std::map<std::string, int> mIds;
         std::map<std::string, int> mStaticIds;
-        std::map<std::string, std::string> mGroundcovers;
 
         std::map<std::string, int> mRefCount;
 
@@ -122,22 +121,6 @@ namespace MWWorld
             return it->second;
         }
 
-        bool isGroundcover(const std::string &id, std::string &model) const
-        {
-            std::map<std::string, std::string>::const_iterator it = mGroundcovers.find(id);
-            if (it == mGroundcovers.end()) {
-                return false;
-            }
-            model = it->second;
-            return true;
-        }
-
-        bool isGroundcover(const std::string &id) const
-        {
-            std::map<std::string, std::string>::const_iterator it = mGroundcovers.find(id);
-            return (it != mGroundcovers.end());
-        }
-
         ESMStore()
           : mDynamicCount(0)
         {
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 93d1a799c0..98af121a5e 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -103,12 +103,12 @@ namespace MWWorld
             return mLoaders.insert(std::make_pair(extension, loader)).second;
         }
 
-        void load(const boost::filesystem::path& filepath, int& index, bool isGroundcover) override
+        void load(const boost::filesystem::path& filepath, int& index) override
         {
             LoadersContainer::iterator it(mLoaders.find(Misc::StringUtils::lowerCase(filepath.extension().string())));
             if (it != mLoaders.end())
             {
-                it->second->load(filepath, index, isGroundcover);
+                it->second->load(filepath, index);
             }
             else
             {
@@ -2951,7 +2951,7 @@ namespace MWWorld
             const Files::MultiDirCollection& col = fileCollections.getCollection(filename.extension().string());
             if (col.doesExist(file))
             {
-                contentLoader.load(col.getPath(file), idx, false);
+                contentLoader.load(col.getPath(file), idx);
             }
             else
             {
@@ -2961,13 +2961,15 @@ namespace MWWorld
             idx++;
         }
 
+        ESM::GroundcoverIndex = idx;
+
         for (const std::string &file : groundcover)
         {
             boost::filesystem::path filename(file);
             const Files::MultiDirCollection& col = fileCollections.getCollection(filename.extension().string());
             if (col.doesExist(file))
             {
-                contentLoader.load(col.getPath(file), idx, true);
+                contentLoader.load(col.getPath(file), idx);
             }
             else
             {
diff --git a/components/esm/cellref.cpp b/components/esm/cellref.cpp
index 4b9852d656..b4d6ac7a72 100644
--- a/components/esm/cellref.cpp
+++ b/components/esm/cellref.cpp
@@ -5,6 +5,11 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
+namespace ESM
+{
+    int GroundcoverIndex = std::numeric_limits<int>::max();
+}
+
 void ESM::RefNum::load (ESMReader& esm, bool wide, const std::string& tag)
 {
     if (wide)
diff --git a/components/esm/cellref.hpp b/components/esm/cellref.hpp
index 5bb7fbc531..c2f7ff6de5 100644
--- a/components/esm/cellref.hpp
+++ b/components/esm/cellref.hpp
@@ -12,6 +12,7 @@ namespace ESM
     class ESMReader;
 
     const int UnbreakableLock = std::numeric_limits<int>::max();
+    extern int GroundcoverIndex;
 
     struct RefNum
     {
@@ -25,6 +26,10 @@ namespace ESM
         enum { RefNum_NoContentFile = -1 };
         inline bool hasContentFile() const { return mContentFile != RefNum_NoContentFile; }
         inline void unset() { mIndex = 0; mContentFile = RefNum_NoContentFile; }
+
+        // Note: this method should not be used for objects with invalid RefNum
+        // (for example, for objects from disabled plugins in savegames).
+        inline bool fromGroundcoverFile() const { return mContentFile >= GroundcoverIndex; }
     };
 
     /* Cell reference. This represents ONE object (of many) inside the
diff --git a/components/esm/esmreader.cpp b/components/esm/esmreader.cpp
index 63d2f4d4f7..1b6eca7346 100644
--- a/components/esm/esmreader.cpp
+++ b/components/esm/esmreader.cpp
@@ -25,7 +25,6 @@ ESMReader::ESMReader()
     , mGlobalReaderList(nullptr)
     , mEncoder(nullptr)
     , mFileSize(0)
-    , mIsGroundcoverFile(false)
 {
     clearCtx();
 }
@@ -81,10 +80,8 @@ void ESMReader::openRaw(const std::string& filename)
     openRaw(Files::openConstrainedFileStream(filename.c_str()), filename);
 }
 
-void ESMReader::open(Files::IStreamPtr _esm, const std::string &name, bool isGroundcover)
+void ESMReader::open(Files::IStreamPtr _esm, const std::string &name)
 {
-    mIsGroundcoverFile = isGroundcover;
-
     openRaw(_esm, name);
 
     if (getRecName() != "TES3")
@@ -95,9 +92,9 @@ void ESMReader::open(Files::IStreamPtr _esm, const std::string &name, bool isGro
     mHeader.load (*this);
 }
 
-void ESMReader::open(const std::string &file, bool isGroundcover)
+void ESMReader::open(const std::string &file)
 {
-    open (Files::openConstrainedFileStream (file.c_str ()), file, isGroundcover);
+    open (Files::openConstrainedFileStream (file.c_str ()), file);
 }
 
 int64_t ESMReader::getHNLong(const char *name)
diff --git a/components/esm/esmreader.hpp b/components/esm/esmreader.hpp
index 600cd497b0..c660b0ddab 100644
--- a/components/esm/esmreader.hpp
+++ b/components/esm/esmreader.hpp
@@ -31,7 +31,6 @@ public:
 
   int getVer() const { return mHeader.mData.version; }
   int getRecordCount() const { return mHeader.mData.records; }
-  bool isGroundcoverFile() const { return mIsGroundcoverFile; }
   float getFVer() const { return (mHeader.mData.version == VER_12) ? 1.2f : 1.3f; }
   const std::string getAuthor() const { return mHeader.mData.author; }
   const std::string getDesc() const { return mHeader.mData.desc; }
@@ -67,9 +66,9 @@ public:
 
   /// Load ES file from a new stream, parses the header. Closes the
   /// currently open file first, if any.
-  void open(Files::IStreamPtr _esm, const std::string &name, bool isGroundcover = false);
+  void open(Files::IStreamPtr _esm, const std::string &name);
 
-  void open(const std::string &file, bool isGroundcover = false);
+  void open(const std::string &file);
 
   void openRaw(const std::string &filename);
 
@@ -290,8 +289,6 @@ private:
   ToUTF8::Utf8Encoder* mEncoder;
 
   size_t mFileSize;
-
-  bool mIsGroundcoverFile;
 };
 }
 #endif
diff --git a/components/esm/loadstat.cpp b/components/esm/loadstat.cpp
index 85e366f1c9..6c9de22bd1 100644
--- a/components/esm/loadstat.cpp
+++ b/components/esm/loadstat.cpp
@@ -37,8 +37,6 @@ namespace ESM
 
         if (!hasName)
             esm.fail("Missing NAME subrecord");
-
-        mIsGroundcover = esm.isGroundcoverFile();
     }
     void Static::save(ESMWriter &esm, bool isDeleted) const
     {
diff --git a/components/esm/loadstat.hpp b/components/esm/loadstat.hpp
index da94c4b8d5..3d91440402 100644
--- a/components/esm/loadstat.hpp
+++ b/components/esm/loadstat.hpp
@@ -28,8 +28,6 @@ struct Static
 
     std::string mId, mModel;
 
-    bool mIsGroundcover = false;
-
     void load(ESMReader &esm, bool &isDeleted);
     void save(ESMWriter &esm, bool isDeleted = false) const;
 

From b975f16e6b9ef5ee8f11dbed504d067a2087b9b1 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Tue, 12 Jan 2021 11:23:36 +0400
Subject: [PATCH 0264/2859] Remove redundant check - groundcover is not present
 in the CellStore

---
 apps/openmw/mwworld/cellpreloader.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index 421de4a7d6..31af5b24bd 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -1,6 +1,5 @@
 #include "cellpreloader.hpp"
 
-#include <algorithm>
 #include <atomic>
 #include <limits>
 
@@ -37,8 +36,6 @@ namespace MWWorld
 
         virtual bool operator()(const MWWorld::Ptr& ptr)
         {
-            if (ptr.getCellRef().getRefNum().fromGroundcoverFile()) return true;
-
             ptr.getClass().getModelsToPreload(ptr, mOut);
 
             return true;

From f40e22768673eb9a7d8ffe2126f853659111d599 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Tue, 12 Jan 2021 12:39:19 +0400
Subject: [PATCH 0265/2859] Remove redundant formatting changes

---
 apps/openmw/engine.cpp                    |  2 +-
 apps/openmw/mwrender/objectpaging.cpp     |  1 +
 apps/openmw/mwrender/renderingmanager.cpp |  1 +
 apps/openmw/mwworld/cellreflist.hpp       |  2 --
 apps/openmw/mwworld/cellstore.cpp         |  1 +
 apps/openmw/mwworld/esmloader.cpp         | 16 ++++++++--------
 components/esm/esmreader.hpp              |  1 +
 7 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 103d06f31d..dfaf09c21a 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -725,7 +725,7 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     }
 
     // Create the world
-    mEnvironment.setWorld(new MWWorld::World (mViewer, rootNode, mResourceSystem.get(), mWorkQueue.get(),
+    mEnvironment.setWorld( new MWWorld::World (mViewer, rootNode, mResourceSystem.get(), mWorkQueue.get(),
         mFileCollections, mContentFiles, mGroundcoverFiles, mEncoder, mActivationDistanceOverride, mCellName,
         mStartupScript, mResDir.string(), mCfgMgr.getUserDataPath().string()));
     mEnvironment.getWorld()->setupPlayer();
diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index b85358c208..7386c00690 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -373,6 +373,7 @@ namespace MWRender
         std::map<ESM::RefNum, ESM::CellRef> refs;
         std::vector<ESM::ESMReader> esm;
         const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
+
         for (int cellX = startCell.x(); cellX < startCell.x() + size; ++cellX)
         {
             for (int cellY = startCell.y(); cellY < startCell.y() + size; ++cellY)
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 68576cf44f..6ba4baec54 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -73,6 +73,7 @@
 
 namespace MWRender
 {
+
     class StateUpdater : public SceneUtil::StateSetUpdater
     {
     public:
diff --git a/apps/openmw/mwworld/cellreflist.hpp b/apps/openmw/mwworld/cellreflist.hpp
index 69161c8400..30be4a6610 100644
--- a/apps/openmw/mwworld/cellreflist.hpp
+++ b/apps/openmw/mwworld/cellreflist.hpp
@@ -24,8 +24,6 @@ namespace MWWorld
         /// all methods are known.
         void load (ESM::CellRef &ref, bool deleted, const MWWorld::ESMStore &esmStore);
 
-        inline bool ignoreInstance (const X* ptr);
-
         LiveRef &insert (const LiveRef &item)
         {
             mList.push_back(item);
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 7ca35a1dfa..3f98684ae7 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -169,6 +169,7 @@ namespace
 
 namespace MWWorld
 {
+
     template <typename X>
     void CellRefList<X>::load(ESM::CellRef &ref, bool deleted, const MWWorld::ESMStore &esmStore)
     {
diff --git a/apps/openmw/mwworld/esmloader.cpp b/apps/openmw/mwworld/esmloader.cpp
index 46b806582b..b12d646e70 100644
--- a/apps/openmw/mwworld/esmloader.cpp
+++ b/apps/openmw/mwworld/esmloader.cpp
@@ -17,15 +17,15 @@ EsmLoader::EsmLoader(MWWorld::ESMStore& store, std::vector<ESM::ESMReader>& read
 
 void EsmLoader::load(const boost::filesystem::path& filepath, int& index)
 {
-    ContentLoader::load(filepath.filename(), index);
+  ContentLoader::load(filepath.filename(), index);
 
-    ESM::ESMReader lEsm;
-    lEsm.setEncoder(mEncoder);
-    lEsm.setIndex(index);
-    lEsm.setGlobalReaderList(&mEsm);
-    lEsm.open(filepath.string());
-    mEsm[index] = lEsm;
-    mStore.load(mEsm[index], &mListener);
+  ESM::ESMReader lEsm;
+  lEsm.setEncoder(mEncoder);
+  lEsm.setIndex(index);
+  lEsm.setGlobalReaderList(&mEsm);
+  lEsm.open(filepath.string());
+  mEsm[index] = lEsm;
+  mStore.load(mEsm[index], &mListener);
 }
 
 } /* namespace MWWorld */
diff --git a/components/esm/esmreader.hpp b/components/esm/esmreader.hpp
index c660b0ddab..761756e8fb 100644
--- a/components/esm/esmreader.hpp
+++ b/components/esm/esmreader.hpp
@@ -289,6 +289,7 @@ private:
   ToUTF8::Utf8Encoder* mEncoder;
 
   size_t mFileSize;
+
 };
 }
 #endif

From 24e1dfcddc50bd51a019d062cc8ad7f4ea2b1515 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Wed, 13 Jan 2021 14:30:51 +0400
Subject: [PATCH 0266/2859] Use default argument

---
 components/resource/scenemanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 0a4faed014..71f11e382e 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -514,7 +514,7 @@ namespace Resource
             SetFilterSettingsControllerVisitor setFilterSettingsControllerVisitor(mMinFilter, mMagFilter, mMaxAnisotropy);
             loaded->accept(setFilterSettingsControllerVisitor);
 
-            osg::ref_ptr<Shader::ShaderVisitor> shaderVisitor (createShaderVisitor("objects"));
+            osg::ref_ptr<Shader::ShaderVisitor> shaderVisitor (createShaderVisitor());
             loaded->accept(*shaderVisitor);
 
             // share state

From e3490c8606c3c83a981421ddfc5bdd74e25c88ae Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 23 Jan 2021 09:30:57 +0400
Subject: [PATCH 0267/2859] Remove dead code

---
 files/shaders/groundcover_fragment.glsl | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/files/shaders/groundcover_fragment.glsl b/files/shaders/groundcover_fragment.glsl
index 9c680853af..77fd32e58b 100644
--- a/files/shaders/groundcover_fragment.glsl
+++ b/files/shaders/groundcover_fragment.glsl
@@ -49,10 +49,6 @@ void main()
     vec3 viewNormal = gl_NormalMatrix * normalize(tbnTranspose * (normalTex.xyz * 2.0 - 1.0));
 #endif
 
-#if (!@normalMap && @forcePPL && false)
-    vec3 viewNormal = gl_NormalMatrix * normalize(passNormal);
-#endif
-
 #if @diffuseMap
     gl_FragData[0] = texture2D(diffuseMap, diffuseMapUV);
 #else

From 5225ec9e5045142f7191b6d81a19350f694682b3 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Tue, 26 Jan 2021 22:32:06 +0400
Subject: [PATCH 0268/2859] Add changelog entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96f0460f11..c6c7b5757a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -127,6 +127,7 @@
     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
     Task #5480: Drop Qt4 support
     Task #5520: Improve cell name autocompleter implementation
 

From 99ba45a308c09f01976da483160dba93007413d1 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Wed, 20 Jan 2021 02:25:46 +0000
Subject: [PATCH 0269/2859] Optional static builds of OSG, MyGUI, Bullet

---
 .gitignore                                   |   2 +-
 .gitlab-ci.yml                               |  49 +++++--
 CI/before_script.android.sh                  |   6 +-
 CI/before_script.linux.sh                    |  77 +++++-----
 CI/install_debian_deps.sh                    |  64 +++++++++
 CMakeLists.txt                               |  90 ++++++------
 apps/opencs/CMakeLists.txt                   |  14 ++
 apps/openmw/CMakeLists.txt                   |  35 ++---
 components/CMakeLists.txt                    |   2 +-
 extern/CMakeLists.txt                        | 139 +++++++++++++++++++
 extern/osg-ffmpeg-videoplayer/CMakeLists.txt |   1 +
 11 files changed, 361 insertions(+), 118 deletions(-)
 create mode 100755 CI/install_debian_deps.sh
 create mode 100644 extern/CMakeLists.txt

diff --git a/.gitignore b/.gitignore
index 1a164592a1..8112f683ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,7 @@ CMakeCache.txt
 cmake_install.cmake
 Makefile
 makefile
-build*
+build*/
 prebuilt
 
 ##windows build process
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 810e23d38e..7ad26bc550 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,19 +1,20 @@
+# 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: debian:bullseye
+
+.Debian:
+  extends: .Debian_Image
   cache:
     paths:
     - apt-cache/
     - ccache/
-  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 build-essential 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 libopenscenegraph-dev libunshield-dev libtinyxml-dev libmygui-dev libbullet-dev liblz4-dev ccache git clang
   stage: build
   script:
     - export CCACHE_BASEDIR="`pwd`"
@@ -33,6 +34,8 @@ 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++
@@ -41,31 +44,52 @@ Debian_GCC:
   timeout: 2h
 
 Debian_GCC_tests:
-  extends: .Debian
+  extends: Debian_GCC
   cache:
     key: Debian_GCC_tests.v2
   variables:
-    CC: gcc
-    CXX: g++
+    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
+  extends: Debian_Clang
   cache:
     key: Debian_Clang_tests.v2
   variables:
-    CC: clang
-    CXX: clang++
     CCACHE_SIZE: 1G
     BUILD_TESTS_ONLY: 1
 
@@ -286,12 +310,13 @@ Debian_AndroidNDK_arm64-v8a:
     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 -o dir::cache::archives="$APT_CACHE_DIR" install -y cmake ccache curl unzip git build-essential google-android-ndk-installer
+    - 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`"
diff --git a/CI/before_script.android.sh b/CI/before_script.android.sh
index 8f0ec77da0..3ea429f1bb 100755
--- a/CI/before_script.android.sh
+++ b/CI/before_script.android.sh
@@ -3,7 +3,7 @@
 # hack to work around: FFmpeg version is too old, 3.2 is required
 sed -i s/"NOT FFVER_OK"/"FALSE"/ CMakeLists.txt
 
-mkdir build
+mkdir -p build
 cd build
 
 cmake \
@@ -21,5 +21,7 @@ cmake \
 -DBUILD_ESSIMPORTER=0 \
 -DBUILD_OPENCS=0 \
 -DBUILD_WIZARD=0 \
--DMyGUI_LIBRARY="/usr/lib/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/libMyGUIEngineStatic.a" \
+-DOPENMW_USE_SYSTEM_MYGUI=OFF \
+-DOPENMW_USE_SYSTEM_OSG=OFF \
+-DOPENMW_USE_SYSTEM_BULLET=OFF \
 ..
diff --git a/CI/before_script.linux.sh b/CI/before_script.linux.sh
index 6df3dc32e0..ef617e0d51 100755
--- a/CI/before_script.linux.sh
+++ b/CI/before_script.linux.sh
@@ -1,44 +1,55 @@
-#!/bin/bash -ex
+#!/bin/bash
+
+set -xeo pipefail
 
 free -m
 
 if [[ "${BUILD_TESTS_ONLY}" ]]; then
-    export GOOGLETEST_DIR="$(pwd)/googletest/build/install"
-    env GENERATOR='Unix Makefiles' CONFIGURATION=Release CI/build_googletest.sh
+	export GOOGLETEST_DIR="${PWD}/googletest/build/install"
+	env GENERATOR='Unix Makefiles' CONFIGURATION=Release CI/build_googletest.sh
+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
+)
+declare -a CMAKE_CONF_ENV=()
+
+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 build
+mkdir -p build
 cd build
 
 if [[ "${BUILD_TESTS_ONLY}" ]]; then
-    ${ANALYZE} 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_INSTALL_PREFIX=install \
-        -D CMAKE_BUILD_TYPE=RelWithDebInfo \
-        -D USE_SYSTEM_TINYXML=TRUE \
-        -D BUILD_OPENMW=OFF \
-        -D BUILD_BSATOOL=OFF \
-        -D BUILD_ESMTOOL=OFF \
-        -D BUILD_LAUNCHER=OFF \
-        -D BUILD_MWINIIMPORTER=OFF \
-        -D BUILD_ESSIMPORTER=OFF \
-        -D BUILD_OPENCS=OFF \
-        -D BUILD_WIZARD=OFF \
-        -D BUILD_UNITTESTS=ON \
-        -D GTEST_ROOT="${GOOGLETEST_DIR}" \
-        -D GMOCK_ROOT="${GOOGLETEST_DIR}" \
-        ..
+	env "${CMAKE_CONF_ENV[@]}" ${ANALYZE} cmake \
+		"${CMAKE_CONF_OPTS[@]}" \
+		-DBUILD_OPENMW=OFF \
+		-DBUILD_BSATOOL=OFF \
+		-DBUILD_ESMTOOL=OFF \
+		-DBUILD_LAUNCHER=OFF \
+		-DBUILD_MWINIIMPORTER=OFF \
+		-DBUILD_ESSIMPORTER=OFF \
+		-DBUILD_OPENCS=OFF \
+		-DBUILD_WIZARD=OFF \
+		-DBUILD_UNITTESTS=ON \
+		-DGTEST_ROOT="${GOOGLETEST_DIR}" \
+		-DGMOCK_ROOT="${GOOGLETEST_DIR}" \
+		..
 else
-    ${ANALYZE} cmake \
-        -D CMAKE_C_COMPILER="${CC}" \
-        -D CMAKE_CXX_COMPILER="${CXX}" \
-        -D CMAKE_C_COMPILER_LAUNCHER=ccache \
-        -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
-        -D USE_SYSTEM_TINYXML=TRUE \
-        -D CMAKE_INSTALL_PREFIX=install \
-        -D CMAKE_BUILD_TYPE=Debug \
-        ..
+	env "${CMAKE_CONF_ENV[@]}" ${ANALYZE} cmake \
+		"${CMAKE_CONF_OPTS[@]}" \
+		..
 fi
diff --git a/CI/install_debian_deps.sh b/CI/install_debian_deps.sh
new file mode 100755
index 0000000000..82d2ff6819
--- /dev/null
+++ b/CI/install_debian_deps.sh
@@ -0,0 +1,64 @@
+#!/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
+  "
+
+  # These dependencies can alternatively be built and linked statically.
+  [openmw-deps-dynamic]="libmygui-dev libopenscenegraph-dev"
+
+  # 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 "${deps[@]}"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 226511b527..be1f4dae4f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,16 +1,11 @@
 project(OpenMW)
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.11) # CMP0083 NEW
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # Detect OS
 include(cmake/OSIdentity.cmake)
 
-# for link time optimization, remove if cmake version is >= 3.9
-if(POLICY CMP0069)
-    cmake_policy(SET CMP0069 NEW)
-endif()
-
 # Apps and tools
 option(BUILD_OPENMW             "Build OpenMW" ON)
 option(BUILD_LAUNCHER           "Build Launcher" ON)
@@ -52,7 +47,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
 
 if (ANDROID)
     set(CMAKE_FIND_ROOT_PATH ${OPENMW_DEPENDENCIES_DIR} "${CMAKE_FIND_ROOT_PATH}")
-    set (OSG_PLUGINS_DIR CACHE STRING "")
 endif()
 
 # Version
@@ -100,12 +94,18 @@ include(OpenMWMacros)
 
 configure_file ("${OpenMW_SOURCE_DIR}/docs/mainpage.hpp.cmake" "${OpenMW_BINARY_DIR}/docs/mainpage.hpp")
 
-option(MYGUI_STATIC "Link static build of Mygui into the binaries" FALSE)
 option(BOOST_STATIC "Link static build of Boost into the binaries" FALSE)
 option(SDL2_STATIC "Link static build of SDL into the binaries" FALSE)
-option(OSG_STATIC "Link static build of OpenSceneGraph into the binaries" FALSE)
 option(QT_STATIC "Link static build of QT into the binaries" FALSE)
 
+option(OPENMW_USE_SYSTEM_OSG "Use system provided OpenSceneGraph libraries" ON)
+option(OSG_STATIC "Link static build of OpenSceneGraph into the binaries" OFF)
+
+option(OPENMW_USE_SYSTEM_BULLET "Use system provided bullet physics library" ON)
+
+option(OPENMW_USE_SYSTEM_MYGUI "Use system provided mygui library" ON)
+option(MYGUI_STATIC "Link static build of Mygui into the binaries" OFF)
+
 option(OPENMW_UNITY_BUILD "Use fewer compilation units to speed up compile time" FALSE)
 option(OPENMW_LTO_BUILD "Build OpenMW with Link-Time Optimization (Needs ~2GB of RAM)" OFF)
 
@@ -168,6 +168,8 @@ if (USE_QT)
     #set(CMAKE_AUTOMOC ON)
 endif()
 
+add_subdirectory(extern)
+
 # Sound setup
 
 # Require at least ffmpeg 3.2 for now
@@ -243,6 +245,15 @@ if (WIN32)
     add_definitions(-DNOMINMAX -DWIN32_LEAN_AND_MEAN)
 endif()
 
+if(OPENMW_USE_SYSTEM_BULLET)
+    set(REQUIRED_BULLET_VERSION 286) # Bullet 286 required due to runtime bugfixes for btCapsuleShape
+    if (DEFINED ENV{TRAVIS_BRANCH} OR DEFINED ENV{APPVEYOR})
+        set(REQUIRED_BULLET_VERSION 283) # but for build testing, 283 is fine
+    endif()
+
+    find_package(Bullet ${REQUIRED_BULLET_VERSION} REQUIRED COMPONENTS BulletCollision LinearMath)
+endif()
+
 if (NOT WIN32 AND BUILD_WIZARD) # windows users can just run the morrowind installer
     find_package(LIBUNSHIELD REQUIRED) # required only for non win32 when building openmw-wizard
     set(OPENMW_USE_UNSHIELD TRUE)
@@ -261,35 +272,25 @@ if(NOT HAVE_STDINT_H)
     message(FATAL_ERROR "stdint.h was not found" )
 endif()
 
+if(OPENMW_USE_SYSTEM_OSG)
+    find_package(OpenSceneGraph 3.3.4 REQUIRED ${USED_OSG_COMPONENTS})
+    if(OSG_STATIC)
+        unset(OSGPlugins_LIB_DIR)
+        foreach(OSGDB_LIB ${OSGDB_LIBRARY})
+            # Skip library type names
+            if(EXISTS ${OSGDB_LIB} AND NOT IS_DIRECTORY ${OSGDB_LIB})
+                get_filename_component(OSG_LIB_DIR ${OSGDB_LIB} DIRECTORY)
+                list(APPEND OSGPlugins_LIB_DIR "${OSG_LIB_DIR}/osgPlugins-${OPENSCENEGRAPH_VERSION}")
+            endif()
+        endforeach(OSGDB_LIB)
+        find_package(OSGPlugins REQUIRED COMPONENTS ${USED_OSG_PLUGINS})
+    endif()
+endif()
 
-find_package(OpenSceneGraph 3.3.4 REQUIRED osgDB osgViewer osgText osgGA osgParticle osgUtil osgFX osgShadow osgAnimation)
-include_directories(SYSTEM ${OPENSCENEGRAPH_INCLUDE_DIRS})
-
-set(USED_OSG_PLUGINS
-                    osgdb_bmp
-                    osgdb_dds
-                    osgdb_freetype
-                    osgdb_jpeg
-                    osgdb_osg
-                    osgdb_png
-                    osgdb_serializers_osg
-                    osgdb_tga
-                  )
-
-set(OSGPlugins_LIB_DIR "")
-foreach(OSGDB_LIB ${OSGDB_LIBRARY})
-	# Skip library type names
-	if(EXISTS ${OSGDB_LIB} AND NOT IS_DIRECTORY ${OSGDB_LIB})
-		get_filename_component(OSG_LIB_DIR ${OSGDB_LIB} DIRECTORY)
-		list(APPEND OSGPlugins_LIB_DIR "${OSG_LIB_DIR}/osgPlugins-${OPENSCENEGRAPH_VERSION}")
-	endif()
-endforeach(OSGDB_LIB)
+include_directories(BEFORE SYSTEM ${OPENSCENEGRAPH_INCLUDE_DIRS})
 
 if(OSG_STATIC)
     add_definitions(-DOSG_LIBRARY_STATIC)
-
-    find_package(OSGPlugins REQUIRED COMPONENTS ${USED_OSG_PLUGINS})
-    list(APPEND OPENSCENEGRAPH_LIBRARIES ${OSGPlugins_LIBRARIES})
 endif()
 
 set(BOOST_COMPONENTS system filesystem program_options iostreams)
@@ -304,21 +305,18 @@ IF(BOOST_STATIC)
     set(Boost_USE_STATIC_LIBS   ON)
 endif()
 
-set(REQUIRED_BULLET_VERSION 286) # Bullet 286 required due to runtime bugfixes for btCapsuleShape
-if (DEFINED ENV{TRAVIS_BRANCH} OR DEFINED ENV{APPVEYOR})
-    set(REQUIRED_BULLET_VERSION 283) # but for build testing, 283 is fine
-endif()
-
 set(Boost_NO_BOOST_CMAKE ON)
 
 find_package(Boost 1.6.2 REQUIRED COMPONENTS ${BOOST_COMPONENTS})
-find_package(MyGUI 3.2.2 REQUIRED)
+if(OPENMW_USE_SYSTEM_MYGUI)
+    find_package(MyGUI 3.2.2 REQUIRED)
+endif()
 find_package(SDL2 2.0.9 REQUIRED)
 find_package(OpenAL REQUIRED)
-find_package(Bullet ${REQUIRED_BULLET_VERSION} REQUIRED COMPONENTS BulletCollision LinearMath)
 
-include_directories("."
-    SYSTEM
+include_directories(
+    BEFORE SYSTEM
+    "."
     ${SDL2_INCLUDE_DIR}
     ${Boost_INCLUDE_DIR}
     ${MyGUI_INCLUDE_DIRS}
@@ -848,11 +846,7 @@ elseif(NOT APPLE)
 
         # Install binaries
         IF(BUILD_OPENMW)
-            IF(ANDROID)
-                INSTALL(PROGRAMS "${INSTALL_SOURCE}/libopenmw.so" DESTINATION "${BINDIR}" )
-            ELSE(ANDROID)
-                INSTALL(PROGRAMS "${INSTALL_SOURCE}/openmw" DESTINATION "${BINDIR}" )
-            ENDIF(ANDROID)
+            INSTALL(PROGRAMS "$<TARGET_FILE:openmw>" DESTINATION "${BINDIR}" )
         ENDIF(BUILD_OPENMW)
         IF(BUILD_LAUNCHER)
             INSTALL(PROGRAMS "${INSTALL_SOURCE}/openmw-launcher" DESTINATION "${BINDIR}" )
diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index b20920904c..e6df909194 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -228,6 +228,20 @@ target_link_libraries(openmw-cs
     components
 )
 
+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)
+        list(APPEND _osg_plugins_static_files $<TARGET_FILE:${${_plugin_uc}_LIBRARY}>)
+        target_link_libraries(openmw_cs_osg_plugins INTERFACE ${${_plugin_uc}_LIBRARY})
+    endforeach()
+    # We use --whole-archive because OSG plugins use registration.
+    target_link_options(openmw_cs_osg_plugins INTERFACE
+        -Wl,--whole-archive ${_osg_plugins_static_files} -Wl,--no-whole-archive)
+    target_link_libraries(openmw-cs openmw_cs_osg_plugins)
+endif(OSG_STATIC)
+
 target_link_libraries(openmw-cs Qt5::Widgets Qt5::Core Qt5::Network Qt5::OpenGL)
 
 if (WIN32)
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index c01cbe60c7..c87a96b3a3 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -143,29 +143,22 @@ target_link_libraries(openmw
     components
 )
 
-if (ANDROID)
-    set (OSG_PLUGINS
-        -Wl,--whole-archive
-    )
-    foreach(PLUGIN_NAME ${USED_OSG_PLUGINS})
-        set(OSG_PLUGINS ${OSG_PLUGINS} ${OSG_PLUGINS_DIR}/lib${PLUGIN_NAME}.a)
+if(OSG_STATIC)
+    unset(_osg_plugins_static_files)
+    add_library(openmw_osg_plugins INTERFACE)
+    foreach(_plugin ${USED_OSG_PLUGINS})
+        string(TOUPPER ${_plugin} _plugin_uc)
+        list(APPEND _osg_plugins_static_files $<TARGET_FILE:${${_plugin_uc}_LIBRARY}>)
+        target_link_libraries(openmw_osg_plugins INTERFACE ${${_plugin_uc}_LIBRARY})
     endforeach()
+    # We use --whole-archive because OSG plugins use registration.
+    target_link_options(openmw_osg_plugins INTERFACE
+        -Wl,--whole-archive ${_osg_plugins_static_files} -Wl,--no-whole-archive)
+    target_link_libraries(openmw openmw_osg_plugins)
+endif(OSG_STATIC)
 
-    set (OSG_PLUGINS
-        ${OSG_PLUGINS} -Wl,--no-whole-archive
-    )
-
-    target_link_libraries(openmw
-        EGL
-        android
-        log
-        dl
-        z
-        ${OPENSCENEGRAPH_LIBRARIES}
-        freetype
-        jpeg
-    	png
-    )
+if (ANDROID)
+    target_link_libraries(openmw EGL android log z)
 endif (ANDROID)
 
 if (USE_SYSTEM_TINYXML)
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 832fc611f6..09a2edb050 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -245,7 +245,7 @@ target_link_libraries(components
     RecastNavigation::Recast
     )
 
-if (BULLET_USE_DOUBLES AND (UBUNTU_FOUND OR DEBIAN_FOUND))
+if (BULLET_USE_DOUBLES AND (UBUNTU_FOUND OR DEBIAN_FOUND) AND OPENMW_USE_SYSTEM_BULLET)
     target_link_libraries(components BulletCollision-float64 LinearMath-float64)
 else()
     target_link_libraries(components ${BULLET_LIBRARIES})
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
new file mode 100644
index 0000000000..f5743307ae
--- /dev/null
+++ b/extern/CMakeLists.txt
@@ -0,0 +1,139 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# Like `FetchContent_MakeAvailable` but passes EXCLUDE_FROM_ALL to `add_subdirectory`.
+macro(FetchContent_MakeAvailableExcludeFromAll)
+    foreach(contentName IN ITEMS ${ARGV})
+        string(TOLOWER ${contentName} contentNameLower)
+        FetchContent_GetProperties(${contentName})
+        if(NOT ${contentNameLower}_POPULATED)
+            FetchContent_Populate(${contentName})
+            if(EXISTS ${${contentNameLower}_SOURCE_DIR}/CMakeLists.txt)
+                add_subdirectory(${${contentNameLower}_SOURCE_DIR}
+                    ${${contentNameLower}_BINARY_DIR} EXCLUDE_FROM_ALL)
+            endif()
+        endif()
+    endforeach()
+endmacro()
+
+if(NOT OPENMW_USE_SYSTEM_BULLET)
+    set(BUILD_BULLET3 OFF CACHE BOOL "")
+    set(BUILD_EXTRAS OFF CACHE BOOL "")
+    set(BUILD_OPENGL3_DEMOS OFF CACHE BOOL "")
+    set(BUILD_UNIT_TESTS OFF CACHE BOOL "")
+    set(BUILD_BULLET2_DEMOS OFF CACHE BOOL "")
+    set(BUILD_CLSOCKET OFF CACHE BOOL "")
+    set(BUILD_ENET OFF CACHE BOOL "")
+    set(BUILD_CPU_DEMOS OFF CACHE BOOL "")
+    set(BUILD_EGL OFF CACHE BOOL "")
+
+    set(USE_DOUBLE_PRECISION ${BULLET_USE_DOUBLES} CACHE BOOL "")
+    set(BULLET2_MULTITHREADING ON CACHE BOOL "")
+
+    # Version 3.08 with the following changes:
+    # 1. Fixes the linking of Threads:
+    #    https://github.com/bulletphysics/bullet3/pull/3237
+    # 2. Removes ~300 MiB of files not used here:
+    #    rm -rf build3 data docs examples test Doxyfile
+    include(FetchContent)
+    FetchContent_Declare(bullet
+        URL https://github.com/glebm/bullet3/archive/ed5256454f4f84bd2c1728c88ddb0405d614e7d2.zip
+        URL_HASH MD5=e3c94fac35a7be885ad8843f828a0f96
+        SOURCE_DIR fetched/bullet
+    )
+    FetchContent_MakeAvailableExcludeFromAll(bullet)
+
+    set(BULLET_INCLUDE_DIRS ${bullet_SOURCE_DIR}/src PARENT_SCOPE)
+
+    # The order here is important to work around a bug in Bullet:
+    # https://github.com/bulletphysics/bullet3/issues/3233
+    set(BULLET_LIBRARIES BulletCollision LinearMath PARENT_SCOPE)
+endif()
+
+if(NOT OPENMW_USE_SYSTEM_MYGUI)
+    set(MYGUI_STATIC ON CACHE BOOL "")
+
+    set(MYGUI_RENDERSYSTEM 4 CACHE STRING "")
+    set(MYGUI_DISABLE_PLUGINS TRUE CACHE BOOL "")
+    set(MYGUI_BUILD_DEMOS OFF CACHE BOOL "")
+    set(MYGUI_BUILD_PLUGINS OFF CACHE BOOL "")
+    set(MYGUI_BUILD_TOOLS OFF CACHE BOOL "")
+
+    include(FetchContent)
+    FetchContent_Declare(mygui
+        URL https://github.com/MyGUI/mygui/archive/MyGUI3.4.0.zip
+        URL_HASH MD5=9e990a4240430cbf567bfe73488a274e
+        SOURCE_DIR fetched/mygui
+    )
+    FetchContent_MakeAvailableExcludeFromAll(mygui)
+
+    set(MyGUI_INCLUDE_DIRS ${mygui_SOURCE_DIR}/MyGUIEngine/include PARENT_SCOPE)
+    set(MyGUI_LIBRARIES MyGUIEngine PARENT_SCOPE)
+endif()
+
+set(USED_OSG_COMPONENTS
+    osgDB
+    osgViewer
+    osgText
+    osgGA
+    osgParticle
+    osgUtil
+    osgFX
+    osgShadow
+    osgAnimation)
+set(USED_OSG_COMPONENTS ${USED_OSG_COMPONENTS} PARENT_SCOPE)
+set(USED_OSG_PLUGINS
+    osgdb_bmp
+    osgdb_dds
+    osgdb_freetype
+    osgdb_jpeg
+    osgdb_osg
+    osgdb_png
+    osgdb_serializers_osg
+    osgdb_tga)
+set(USED_OSG_PLUGINS ${USED_OSG_PLUGINS} PARENT_SCOPE)
+if(NOT OPENMW_USE_SYSTEM_OSG)
+    set(OSG_STATIC ON CACHE BOOL "")
+
+    set(DYNAMIC_OPENTHREADS OFF CACHE BOOL "")
+    set(DYNAMIC_OPENSCENEGRAPH OFF CACHE BOOL "")
+    set(BUILD_OSG_APPLICATIONS OFF CACHE BOOL "")
+    set(BUILD_OSG_DEPRECATED_SERIALIZERS OFF CACHE BOOL "")
+
+    set(BUILD_OSG_PLUGINS_BY_DEFAULT OFF CACHE BOOL "")
+    set(BUILD_OSG_PLUGIN_BMP ON CACHE BOOL "")
+    set(BUILD_OSG_PLUGIN_DDS ON CACHE BOOL "")
+    set(BUILD_OSG_PLUGIN_FREETYPE ON CACHE BOOL "")
+    set(BUILD_OSG_PLUGIN_JPEG ON CACHE BOOL "")
+    set(BUILD_OSG_PLUGIN_OSG ON CACHE BOOL "")
+    set(BUILD_OSG_PLUGIN_PNG ON CACHE BOOL "")
+    set(BUILD_OSG_PLUGIN_TGA ON CACHE BOOL "")
+    set(BUILD_OSG_PLUGIN_KTX ON CACHE BOOL "")
+
+    set(OSG_USE_FLOAT_MATRIX ON CACHE BOOL "")
+    set(OSG_USE_FLOAT_PLANE ON CACHE BOOL "")
+    set(OSG_USE_FLOAT_QUAT ON CACHE BOOL "")
+
+    set(OPENGL_PROFILE "GL2" CACHE STRING "")
+
+    # branch OpenSceneGraph-3.6 on 18 Jan 2021.
+    # + https://github.com/openscenegraph/OpenSceneGraph/pull/1032
+    # + https://github.com/openscenegraph/OpenSceneGraph/pull/1033
+    include(FetchContent)
+    FetchContent_Declare(osg
+        URL https://github.com/glebm/OpenSceneGraph/archive/041090d84d9d4b72f1202457fceae0ec6f79b663.zip
+        URL_HASH MD5=2cbf8126b27a45a2a44efe9fa39090f3
+        SOURCE_DIR fetched/osg
+    )
+    FetchContent_MakeAvailableExcludeFromAll(osg)
+
+    set(OPENSCENEGRAPH_INCLUDE_DIRS ${osg_SOURCE_DIR}/include ${osg_BINARY_DIR}/include PARENT_SCOPE)
+    set(OSG_LIBRARIES OpenThreads osg PARENT_SCOPE)
+    foreach(_name ${USED_OSG_COMPONENTS})
+        string(TOUPPER ${_name} _name_uc)
+        set(${_name_uc}_LIBRARIES ${_name} PARENT_SCOPE)
+    endforeach()
+    foreach(_name ${USED_OSG_PLUGINS})
+        string(TOUPPER ${_name} _name_uc)
+        set(${_name_uc}_LIBRARY ${_name} PARENT_SCOPE)
+    endforeach()
+endif()
diff --git a/extern/osg-ffmpeg-videoplayer/CMakeLists.txt b/extern/osg-ffmpeg-videoplayer/CMakeLists.txt
index 5289cd3af9..8ab51196a8 100644
--- a/extern/osg-ffmpeg-videoplayer/CMakeLists.txt
+++ b/extern/osg-ffmpeg-videoplayer/CMakeLists.txt
@@ -13,5 +13,6 @@ set(OSG_FFMPEG_VIDEOPLAYER_SOURCE_FILES
 include_directories(${FFmpeg_INCLUDE_DIRS})
 add_library(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} STATIC ${OSG_FFMPEG_VIDEOPLAYER_SOURCE_FILES})
 target_link_libraries(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} ${FFmpeg_LIBRARIES} ${Boost_THREAD_LIBRARY})
+target_link_libraries(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} ${OSG_LIBRARIES})
 
 link_directories(${CMAKE_CURRENT_BINARY_DIR})

From 93fe84aea8921a87f7aaf7fc949b425324a3c276 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Wed, 20 Jan 2021 19:03:54 +0000
Subject: [PATCH 0270/2859] cmake: Move USED_OSG_(COMPONENTS|PLUGINS) from
 extern to top-level

---
 CMakeLists.txt        | 19 +++++++++++++++++++
 extern/CMakeLists.txt | 21 ---------------------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index be1f4dae4f..f883aecfc7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -272,6 +272,25 @@ if(NOT HAVE_STDINT_H)
     message(FATAL_ERROR "stdint.h was not found" )
 endif()
 
+set(USED_OSG_COMPONENTS
+    osgDB
+    osgViewer
+    osgText
+    osgGA
+    osgParticle
+    osgUtil
+    osgFX
+    osgShadow
+    osgAnimation)
+set(USED_OSG_PLUGINS
+    osgdb_bmp
+    osgdb_dds
+    osgdb_freetype
+    osgdb_jpeg
+    osgdb_osg
+    osgdb_png
+    osgdb_serializers_osg
+    osgdb_tga)
 if(OPENMW_USE_SYSTEM_OSG)
     find_package(OpenSceneGraph 3.3.4 REQUIRED ${USED_OSG_COMPONENTS})
     if(OSG_STATIC)
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index f5743307ae..b426ac4bff 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -70,27 +70,6 @@ if(NOT OPENMW_USE_SYSTEM_MYGUI)
     set(MyGUI_LIBRARIES MyGUIEngine PARENT_SCOPE)
 endif()
 
-set(USED_OSG_COMPONENTS
-    osgDB
-    osgViewer
-    osgText
-    osgGA
-    osgParticle
-    osgUtil
-    osgFX
-    osgShadow
-    osgAnimation)
-set(USED_OSG_COMPONENTS ${USED_OSG_COMPONENTS} PARENT_SCOPE)
-set(USED_OSG_PLUGINS
-    osgdb_bmp
-    osgdb_dds
-    osgdb_freetype
-    osgdb_jpeg
-    osgdb_osg
-    osgdb_png
-    osgdb_serializers_osg
-    osgdb_tga)
-set(USED_OSG_PLUGINS ${USED_OSG_PLUGINS} PARENT_SCOPE)
 if(NOT OPENMW_USE_SYSTEM_OSG)
     set(OSG_STATIC ON CACHE BOOL "")
 

From 8737453498d7dc4b62458e53f5318c76bc40865d Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Wed, 20 Jan 2021 19:19:36 +0000
Subject: [PATCH 0271/2859] cmake: Compiler-specific whole-archive macro

---
 CMakeLists.txt             |  1 +
 apps/opencs/CMakeLists.txt |  4 ++--
 apps/openmw/CMakeLists.txt |  4 ++--
 cmake/WholeArchive.cmake   | 10 ++++++++++
 4 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 cmake/WholeArchive.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f883aecfc7..658a961f35 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,6 +89,7 @@ endif(EXISTS ${PROJECT_SOURCE_DIR}/.git)
 
 # Macros
 include(OpenMWMacros)
+include(WholeArchive)
 
 # doxygen main page
 
diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index e6df909194..17b3375f59 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -237,8 +237,8 @@ if(OSG_STATIC)
         target_link_libraries(openmw_cs_osg_plugins INTERFACE ${${_plugin_uc}_LIBRARY})
     endforeach()
     # We use --whole-archive because OSG plugins use registration.
-    target_link_options(openmw_cs_osg_plugins INTERFACE
-        -Wl,--whole-archive ${_osg_plugins_static_files} -Wl,--no-whole-archive)
+    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)
 endif(OSG_STATIC)
 
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index c87a96b3a3..308b8bd5e5 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -152,8 +152,8 @@ if(OSG_STATIC)
         target_link_libraries(openmw_osg_plugins INTERFACE ${${_plugin_uc}_LIBRARY})
     endforeach()
     # We use --whole-archive because OSG plugins use registration.
-    target_link_options(openmw_osg_plugins INTERFACE
-        -Wl,--whole-archive ${_osg_plugins_static_files} -Wl,--no-whole-archive)
+    get_whole_archive_options(_opts ${_osg_plugins_static_files})
+    target_link_options(openmw_osg_plugins INTERFACE ${_opts})
     target_link_libraries(openmw openmw_osg_plugins)
 endif(OSG_STATIC)
 
diff --git a/cmake/WholeArchive.cmake b/cmake/WholeArchive.cmake
new file mode 100644
index 0000000000..a834e830e0
--- /dev/null
+++ b/cmake/WholeArchive.cmake
@@ -0,0 +1,10 @@
+macro (get_whole_archive_options OUT_VAR)
+    # We use --whole-archive because OSG plugins use registration.
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+        set(${OUT_VAR} -Wl,--whole-archive ${ARGN} -Wl,--no-whole-archive)
+    elseif (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+        set(${OUT_VAR} -Wl,-all_load ${ARGN} -Wl,-noall_load)
+    else ()
+        message(FATAL_ERROR "get_whole_archive_options not implemented for CMAKE_CXX_COMPILER_ID ${CMAKE_CXX_COMPILER_ID}")
+    endif()
+endmacro (whole_archive_options)

From a06f598442e99e9ae7869a9db106e51ab5b9cfe8 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Wed, 20 Jan 2021 19:59:34 +0000
Subject: [PATCH 0272/2859] cmake: Move USED_OSG_(COMPONENTS|PLUGINS) before
 add_subdirectory(extern)

---
 CMakeLists.txt | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 658a961f35..5e7e59713a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -169,6 +169,26 @@ if (USE_QT)
     #set(CMAKE_AUTOMOC ON)
 endif()
 
+set(USED_OSG_COMPONENTS
+    osgDB
+    osgViewer
+    osgText
+    osgGA
+    osgParticle
+    osgUtil
+    osgFX
+    osgShadow
+    osgAnimation)
+set(USED_OSG_PLUGINS
+    osgdb_bmp
+    osgdb_dds
+    osgdb_freetype
+    osgdb_jpeg
+    osgdb_osg
+    osgdb_png
+    osgdb_serializers_osg
+    osgdb_tga)
+
 add_subdirectory(extern)
 
 # Sound setup
@@ -273,25 +293,6 @@ if(NOT HAVE_STDINT_H)
     message(FATAL_ERROR "stdint.h was not found" )
 endif()
 
-set(USED_OSG_COMPONENTS
-    osgDB
-    osgViewer
-    osgText
-    osgGA
-    osgParticle
-    osgUtil
-    osgFX
-    osgShadow
-    osgAnimation)
-set(USED_OSG_PLUGINS
-    osgdb_bmp
-    osgdb_dds
-    osgdb_freetype
-    osgdb_jpeg
-    osgdb_osg
-    osgdb_png
-    osgdb_serializers_osg
-    osgdb_tga)
 if(OPENMW_USE_SYSTEM_OSG)
     find_package(OpenSceneGraph 3.3.4 REQUIRED ${USED_OSG_COMPONENTS})
     if(OSG_STATIC)

From 90766dcc82309f806b0243ab272585b8a47bab7d Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Wed, 20 Jan 2021 20:01:32 +0000
Subject: [PATCH 0273/2859] cmake: get_whole_archive_options macro -> function

---
 cmake/WholeArchive.cmake | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmake/WholeArchive.cmake b/cmake/WholeArchive.cmake
index a834e830e0..2def95e8ad 100644
--- a/cmake/WholeArchive.cmake
+++ b/cmake/WholeArchive.cmake
@@ -1,10 +1,10 @@
-macro (get_whole_archive_options OUT_VAR)
+function (get_whole_archive_options OUT_VAR)
     # We use --whole-archive because OSG plugins use registration.
     if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-        set(${OUT_VAR} -Wl,--whole-archive ${ARGN} -Wl,--no-whole-archive)
+        set(${OUT_VAR} -Wl,--whole-archive ${ARGN} -Wl,--no-whole-archive PARENT_SCOPE)
     elseif (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
-        set(${OUT_VAR} -Wl,-all_load ${ARGN} -Wl,-noall_load)
+        set(${OUT_VAR} -Wl,-all_load ${ARGN} -Wl,-noall_load PARENT_SCOPE)
     else ()
         message(FATAL_ERROR "get_whole_archive_options not implemented for CMAKE_CXX_COMPILER_ID ${CMAKE_CXX_COMPILER_ID}")
     endif()
-endmacro (whole_archive_options)
+endfunction (whole_archive_options)

From 98564b0aae7df4b9bf9cf52b4a06c44c4b6d1fff Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Wed, 20 Jan 2021 20:14:12 +0000
Subject: [PATCH 0274/2859] cmake: move cmake_minimum_required bump to
 extern/CMakeLists.txt

---
 CMakeLists.txt        | 2 +-
 extern/CMakeLists.txt | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e7e59713a..5a497733c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 project(OpenMW)
-cmake_minimum_required(VERSION 3.11) # CMP0083 NEW
+cmake_minimum_required(VERSION 3.1.0) # CMP0083 NEW
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index b426ac4bff..646558897e 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -16,6 +16,8 @@ macro(FetchContent_MakeAvailableExcludeFromAll)
 endmacro()
 
 if(NOT OPENMW_USE_SYSTEM_BULLET)
+    cmake_minimum_required(VERSION 3.11) # for FetchContent
+
     set(BUILD_BULLET3 OFF CACHE BOOL "")
     set(BUILD_EXTRAS OFF CACHE BOOL "")
     set(BUILD_OPENGL3_DEMOS OFF CACHE BOOL "")
@@ -50,6 +52,8 @@ if(NOT OPENMW_USE_SYSTEM_BULLET)
 endif()
 
 if(NOT OPENMW_USE_SYSTEM_MYGUI)
+    cmake_minimum_required(VERSION 3.11) # for FetchContent
+
     set(MYGUI_STATIC ON CACHE BOOL "")
 
     set(MYGUI_RENDERSYSTEM 4 CACHE STRING "")
@@ -71,6 +75,8 @@ if(NOT OPENMW_USE_SYSTEM_MYGUI)
 endif()
 
 if(NOT OPENMW_USE_SYSTEM_OSG)
+    cmake_minimum_required(VERSION 3.11) # for FetchContent
+
     set(OSG_STATIC ON CACHE BOOL "")
 
     set(DYNAMIC_OPENTHREADS OFF CACHE BOOL "")

From 4dc0fd299f45006e95b813dfdfd714ff0dd94def Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Wed, 20 Jan 2021 22:19:10 +0000
Subject: [PATCH 0275/2859] cmake/WholeArchive.cmake: fix typo

---
 cmake/WholeArchive.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/WholeArchive.cmake b/cmake/WholeArchive.cmake
index 2def95e8ad..be88da8181 100644
--- a/cmake/WholeArchive.cmake
+++ b/cmake/WholeArchive.cmake
@@ -7,4 +7,4 @@ function (get_whole_archive_options OUT_VAR)
     else ()
         message(FATAL_ERROR "get_whole_archive_options not implemented for CMAKE_CXX_COMPILER_ID ${CMAKE_CXX_COMPILER_ID}")
     endif()
-endfunction (whole_archive_options)
+endfunction (get_whole_archive_options)

From 26814b238626f2c204a8756257bd52ff2445a6b7 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Wed, 20 Jan 2021 22:32:40 +0000
Subject: [PATCH 0276/2859] CMakeLists.txt: Restore policies as we unbumped
 cmake version

---
 CMakeLists.txt | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a497733c4..336e8cb524 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,18 @@
 project(OpenMW)
-cmake_minimum_required(VERSION 3.1.0) # CMP0083 NEW
+cmake_minimum_required(VERSION 3.1.0)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
+# for link time optimization, remove if cmake version is >= 3.9
+if(POLICY CMP0069) # LTO
+  cmake_policy(SET CMP0069 NEW)
+endif()
+
+# for position-independent executable, remove if cmake version is >= 3.14
+if(POLICY CMP0083)
+  cmake_policy(SET CMP0083 NEW)
+endif()
+
 # Detect OS
 include(cmake/OSIdentity.cmake)
 

From 402e43678c7219aef4afbf0abec57b7b213c69d8 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Wed, 20 Jan 2021 22:44:46 +0000
Subject: [PATCH 0277/2859] extern/CMakeLists.txt: Bump OSG

---
 extern/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 646558897e..f3ebfa00f1 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -105,8 +105,8 @@ if(NOT OPENMW_USE_SYSTEM_OSG)
     # + https://github.com/openscenegraph/OpenSceneGraph/pull/1033
     include(FetchContent)
     FetchContent_Declare(osg
-        URL https://github.com/glebm/OpenSceneGraph/archive/041090d84d9d4b72f1202457fceae0ec6f79b663.zip
-        URL_HASH MD5=2cbf8126b27a45a2a44efe9fa39090f3
+        URL https://github.com/glebm/OpenSceneGraph/archive/7fd71578dfe9283f15b999e82e802ccfda87d936.zip
+        URL_HASH MD5=c1bad7cc5e263ac650ae1269f212b752
         SOURCE_DIR fetched/osg
     )
     FetchContent_MakeAvailableExcludeFromAll(osg)

From f0febe095ca16235dd1b505163df08cfc0776521 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Thu, 21 Jan 2021 13:52:52 +0000
Subject: [PATCH 0278/2859] extern/CMakeLists.txt: Set OSG/MYGUI_STATIC on
 PARENT_SCOPE

---
 extern/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index f3ebfa00f1..4ba3d8af19 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -54,7 +54,7 @@ endif()
 if(NOT OPENMW_USE_SYSTEM_MYGUI)
     cmake_minimum_required(VERSION 3.11) # for FetchContent
 
-    set(MYGUI_STATIC ON CACHE BOOL "")
+    set(MYGUI_STATIC ON CACHE BOOL "" PARENT_SCOPE)
 
     set(MYGUI_RENDERSYSTEM 4 CACHE STRING "")
     set(MYGUI_DISABLE_PLUGINS TRUE CACHE BOOL "")
@@ -77,7 +77,7 @@ endif()
 if(NOT OPENMW_USE_SYSTEM_OSG)
     cmake_minimum_required(VERSION 3.11) # for FetchContent
 
-    set(OSG_STATIC ON CACHE BOOL "")
+    set(OSG_STATIC ON CACHE BOOL "" PARENT_SCOPE)
 
     set(DYNAMIC_OPENTHREADS OFF CACHE BOOL "")
     set(DYNAMIC_OPENSCENEGRAPH OFF CACHE BOOL "")

From eba151884e57eb92883c989ac5ce22563ff74261 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Thu, 21 Jan 2021 16:26:41 +0000
Subject: [PATCH 0279/2859] Fix Android build

https://github.com/openscenegraph/OpenSceneGraph/pull/1037
---
 extern/CMakeLists.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 4ba3d8af19..6d3d46fb0e 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -83,6 +83,7 @@ if(NOT OPENMW_USE_SYSTEM_OSG)
     set(DYNAMIC_OPENSCENEGRAPH OFF CACHE BOOL "")
     set(BUILD_OSG_APPLICATIONS OFF CACHE BOOL "")
     set(BUILD_OSG_DEPRECATED_SERIALIZERS OFF CACHE BOOL "")
+    set(OSG_FIND_3RD_PARTY_DEPS OFF CACHE BOOL "")
 
     set(BUILD_OSG_PLUGINS_BY_DEFAULT OFF CACHE BOOL "")
     set(BUILD_OSG_PLUGIN_BMP ON CACHE BOOL "")
@@ -103,10 +104,11 @@ if(NOT OPENMW_USE_SYSTEM_OSG)
     # branch OpenSceneGraph-3.6 on 18 Jan 2021.
     # + https://github.com/openscenegraph/OpenSceneGraph/pull/1032
     # + https://github.com/openscenegraph/OpenSceneGraph/pull/1033
+    # + https://github.com/openscenegraph/OpenSceneGraph/pull/1037
     include(FetchContent)
     FetchContent_Declare(osg
-        URL https://github.com/glebm/OpenSceneGraph/archive/7fd71578dfe9283f15b999e82e802ccfda87d936.zip
-        URL_HASH MD5=c1bad7cc5e263ac650ae1269f212b752
+        URL https://github.com/glebm/OpenSceneGraph/archive/7684224d8a9a8f60447d6561faf32a7b58fb5204.zip
+        URL_HASH MD5=d67088aeb976486287343c1287b56ba3
         SOURCE_DIR fetched/osg
     )
     FetchContent_MakeAvailableExcludeFromAll(osg)

From 377bd27aa75d5c807b4c87a4531a1d17fb9b948d Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Fri, 22 Jan 2021 16:01:11 +0000
Subject: [PATCH 0280/2859] set(BUILD_SHARED_LIBS ${OSG/MYGUI_STATIC})

---
 extern/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 6d3d46fb0e..4fd4536015 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -68,6 +68,7 @@ if(NOT OPENMW_USE_SYSTEM_MYGUI)
         URL_HASH MD5=9e990a4240430cbf567bfe73488a274e
         SOURCE_DIR fetched/mygui
     )
+    set(BUILD_SHARED_LIBS ${MYGUI_STATIC})
     FetchContent_MakeAvailableExcludeFromAll(mygui)
 
     set(MyGUI_INCLUDE_DIRS ${mygui_SOURCE_DIR}/MyGUIEngine/include PARENT_SCOPE)
@@ -111,6 +112,7 @@ if(NOT OPENMW_USE_SYSTEM_OSG)
         URL_HASH MD5=d67088aeb976486287343c1287b56ba3
         SOURCE_DIR fetched/osg
     )
+    set(BUILD_SHARED_LIBS ${OSG_STATIC})
     FetchContent_MakeAvailableExcludeFromAll(osg)
 
     set(OPENSCENEGRAPH_INCLUDE_DIRS ${osg_SOURCE_DIR}/include ${osg_BINARY_DIR}/include PARENT_SCOPE)

From daf080ff192ad664f2fb714ccfe64a056be52040 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Fri, 22 Jan 2021 19:37:07 +0000
Subject: [PATCH 0281/2859] cmake: Move MYGUI/OSG_STATIC default to top-level

Makes it clear that the USE_SYSTEM variables affect the defaults of
STATIC variables.
---
 CMakeLists.txt        | 6 ++++++
 extern/CMakeLists.txt | 4 ----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 336e8cb524..fc0d1b32c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -111,11 +111,17 @@ option(QT_STATIC "Link static build of QT into the binaries" FALSE)
 
 option(OPENMW_USE_SYSTEM_OSG "Use system provided OpenSceneGraph libraries" ON)
 option(OSG_STATIC "Link static build of OpenSceneGraph into the binaries" OFF)
+if(NOT OPENMW_USE_SYSTEM_OSG)
+    set(OSG_STATIC ON CACHE BOOL "")
+endif()
 
 option(OPENMW_USE_SYSTEM_BULLET "Use system provided bullet physics library" ON)
 
 option(OPENMW_USE_SYSTEM_MYGUI "Use system provided mygui library" ON)
 option(MYGUI_STATIC "Link static build of Mygui into the binaries" OFF)
+if(NOT OPENMW_USE_SYSTEM_MYGUI)
+    set(MYGUI_STATIC ON CACHE BOOL "")
+endif()
 
 option(OPENMW_UNITY_BUILD "Use fewer compilation units to speed up compile time" FALSE)
 option(OPENMW_LTO_BUILD "Build OpenMW with Link-Time Optimization (Needs ~2GB of RAM)" OFF)
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 4fd4536015..de2f80ddfc 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -54,8 +54,6 @@ endif()
 if(NOT OPENMW_USE_SYSTEM_MYGUI)
     cmake_minimum_required(VERSION 3.11) # for FetchContent
 
-    set(MYGUI_STATIC ON CACHE BOOL "" PARENT_SCOPE)
-
     set(MYGUI_RENDERSYSTEM 4 CACHE STRING "")
     set(MYGUI_DISABLE_PLUGINS TRUE CACHE BOOL "")
     set(MYGUI_BUILD_DEMOS OFF CACHE BOOL "")
@@ -78,8 +76,6 @@ endif()
 if(NOT OPENMW_USE_SYSTEM_OSG)
     cmake_minimum_required(VERSION 3.11) # for FetchContent
 
-    set(OSG_STATIC ON CACHE BOOL "" PARENT_SCOPE)
-
     set(DYNAMIC_OPENTHREADS OFF CACHE BOOL "")
     set(DYNAMIC_OPENSCENEGRAPH OFF CACHE BOOL "")
     set(BUILD_OSG_APPLICATIONS OFF CACHE BOOL "")

From 99061345cc652d827e4a1dea9af49958ef207f6e Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Fri, 22 Jan 2021 20:44:21 +0000
Subject: [PATCH 0282/2859] WholeArchive.cmake: Fix mismatched args warning

---
 cmake/WholeArchive.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/WholeArchive.cmake b/cmake/WholeArchive.cmake
index be88da8181..0e4a09c796 100644
--- a/cmake/WholeArchive.cmake
+++ b/cmake/WholeArchive.cmake
@@ -7,4 +7,4 @@ function (get_whole_archive_options OUT_VAR)
     else ()
         message(FATAL_ERROR "get_whole_archive_options not implemented for CMAKE_CXX_COMPILER_ID ${CMAKE_CXX_COMPILER_ID}")
     endif()
-endfunction (get_whole_archive_options)
+endfunction ()

From 3d334dae754fdc67851812cc2ef5c2be8c8909fd Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Fri, 22 Jan 2021 21:33:07 +0000
Subject: [PATCH 0283/2859] Fix MYGUI/OSG_STATIC and BUILD_SHARED_LIBS

---
 CMakeLists.txt        | 20 ++++++++++++--------
 extern/CMakeLists.txt | 14 ++++++++++++--
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc0d1b32c0..5ba48c01d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,19 +109,23 @@ option(BOOST_STATIC "Link static build of Boost into the binaries" FALSE)
 option(SDL2_STATIC "Link static build of SDL into the binaries" FALSE)
 option(QT_STATIC "Link static build of QT into the binaries" FALSE)
 
+option(OPENMW_USE_SYSTEM_BULLET "Use system provided bullet physics library" ON)
+
 option(OPENMW_USE_SYSTEM_OSG "Use system provided OpenSceneGraph libraries" ON)
-option(OSG_STATIC "Link static build of OpenSceneGraph into the binaries" OFF)
-if(NOT OPENMW_USE_SYSTEM_OSG)
-    set(OSG_STATIC ON CACHE BOOL "")
+if(OPENMW_USE_SYSTEM_OSG)
+    set(_osg_static_default OFF)
+else()
+    set(_osg_static_default ON)
 endif()
-
-option(OPENMW_USE_SYSTEM_BULLET "Use system provided bullet physics library" ON)
+option(OSG_STATIC "Link static build of OpenSceneGraph into the binaries" ${_osg_static_default})
 
 option(OPENMW_USE_SYSTEM_MYGUI "Use system provided mygui library" ON)
-option(MYGUI_STATIC "Link static build of Mygui into the binaries" OFF)
-if(NOT OPENMW_USE_SYSTEM_MYGUI)
-    set(MYGUI_STATIC ON CACHE BOOL "")
+if(OPENMW_USE_SYSTEM_MYGUI)
+    set(_mygui_static_default OFF)
+else()
+    set(_mygui_static_default ON)
 endif()
+option(MYGUI_STATIC "Link static build of Mygui into the binaries" ${_mygui_static_default})
 
 option(OPENMW_UNITY_BUILD "Use fewer compilation units to speed up compile time" FALSE)
 option(OPENMW_LTO_BUILD "Build OpenMW with Link-Time Optimization (Needs ~2GB of RAM)" OFF)
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index de2f80ddfc..a8e741bd99 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -60,13 +60,18 @@ if(NOT OPENMW_USE_SYSTEM_MYGUI)
     set(MYGUI_BUILD_PLUGINS OFF CACHE BOOL "")
     set(MYGUI_BUILD_TOOLS OFF CACHE BOOL "")
 
+    if(MYGUI_STATIC)
+        set(BUILD_SHARED_LIBS OFF)
+    else()
+        set(BUILD_SHARED_LIBS ON)
+    endif()
+
     include(FetchContent)
     FetchContent_Declare(mygui
         URL https://github.com/MyGUI/mygui/archive/MyGUI3.4.0.zip
         URL_HASH MD5=9e990a4240430cbf567bfe73488a274e
         SOURCE_DIR fetched/mygui
     )
-    set(BUILD_SHARED_LIBS ${MYGUI_STATIC})
     FetchContent_MakeAvailableExcludeFromAll(mygui)
 
     set(MyGUI_INCLUDE_DIRS ${mygui_SOURCE_DIR}/MyGUIEngine/include PARENT_SCOPE)
@@ -98,6 +103,12 @@ if(NOT OPENMW_USE_SYSTEM_OSG)
 
     set(OPENGL_PROFILE "GL2" CACHE STRING "")
 
+    if(OSG_STATIC)
+        set(BUILD_SHARED_LIBS OFF)
+    else()
+        set(BUILD_SHARED_LIBS ON)
+    endif()
+
     # branch OpenSceneGraph-3.6 on 18 Jan 2021.
     # + https://github.com/openscenegraph/OpenSceneGraph/pull/1032
     # + https://github.com/openscenegraph/OpenSceneGraph/pull/1033
@@ -108,7 +119,6 @@ if(NOT OPENMW_USE_SYSTEM_OSG)
         URL_HASH MD5=d67088aeb976486287343c1287b56ba3
         SOURCE_DIR fetched/osg
     )
-    set(BUILD_SHARED_LIBS ${OSG_STATIC})
     FetchContent_MakeAvailableExcludeFromAll(osg)
 
     set(OPENSCENEGRAPH_INCLUDE_DIRS ${osg_SOURCE_DIR}/include ${osg_BINARY_DIR}/include PARENT_SCOPE)

From 4098b455f59f6e3f5b8e8d11a5a212db7a65a06b Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Fri, 22 Jan 2021 22:37:10 +0000
Subject: [PATCH 0284/2859] extern/CMakeLists.txt: Bump OSG

All the necessary fixes have been upstreamed
---
 extern/CMakeLists.txt | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index a8e741bd99..d82f57b209 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -109,14 +109,11 @@ if(NOT OPENMW_USE_SYSTEM_OSG)
         set(BUILD_SHARED_LIBS ON)
     endif()
 
-    # branch OpenSceneGraph-3.6 on 18 Jan 2021.
-    # + https://github.com/openscenegraph/OpenSceneGraph/pull/1032
-    # + https://github.com/openscenegraph/OpenSceneGraph/pull/1033
-    # + https://github.com/openscenegraph/OpenSceneGraph/pull/1037
+    # branch OpenSceneGraph-3.6 on 23 Jan 2021.
     include(FetchContent)
     FetchContent_Declare(osg
-        URL https://github.com/glebm/OpenSceneGraph/archive/7684224d8a9a8f60447d6561faf32a7b58fb5204.zip
-        URL_HASH MD5=d67088aeb976486287343c1287b56ba3
+        URL https://github.com/openscenegraph/OpenSceneGraph/archive/b8862d04203c7d5576fc8189fe4df83c4e855b9b.zip
+        URL_HASH MD5=d80a42eb9c983c08b40ecd103bae03f4
         SOURCE_DIR fetched/osg
     )
     FetchContent_MakeAvailableExcludeFromAll(osg)

From 3308c717f877423aa4c3640374ea462b21a3ce82 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Sun, 24 Jan 2021 01:20:23 +0000
Subject: [PATCH 0285/2859] extern/CMakeLists.txt: Switch to openmw's OSG

---
 extern/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index d82f57b209..fd21b70722 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -112,8 +112,8 @@ if(NOT OPENMW_USE_SYSTEM_OSG)
     # branch OpenSceneGraph-3.6 on 23 Jan 2021.
     include(FetchContent)
     FetchContent_Declare(osg
-        URL https://github.com/openscenegraph/OpenSceneGraph/archive/b8862d04203c7d5576fc8189fe4df83c4e855b9b.zip
-        URL_HASH MD5=d80a42eb9c983c08b40ecd103bae03f4
+        URL https://github.com/OpenMW/osg/archive/e65f47c4ab3a0b53cc19f517961671e5f840a08d.zip
+        URL_HASH MD5=0c967fe48d80744f6956f6b0b67ef7c6
         SOURCE_DIR fetched/osg
     )
     FetchContent_MakeAvailableExcludeFromAll(osg)

From 2798db541844fffe4b1f9b572087e0ee7f20deed Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Sun, 24 Jan 2021 18:44:18 +0000
Subject: [PATCH 0286/2859] CI/before_script.linux.sh: <tab> -> 4 spaces and
 remove unused ENV

---
 CI/before_script.linux.sh | 67 +++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 34 deletions(-)

diff --git a/CI/before_script.linux.sh b/CI/before_script.linux.sh
index ef617e0d51..5f74b47147 100755
--- a/CI/before_script.linux.sh
+++ b/CI/before_script.linux.sh
@@ -5,51 +5,50 @@ set -xeo pipefail
 free -m
 
 if [[ "${BUILD_TESTS_ONLY}" ]]; then
-	export GOOGLETEST_DIR="${PWD}/googletest/build/install"
-	env GENERATOR='Unix Makefiles' CONFIGURATION=Release CI/build_googletest.sh
+    export GOOGLETEST_DIR="${PWD}/googletest/build/install"
+    env GENERATOR='Unix Makefiles' CONFIGURATION=Release CI/build_googletest.sh
 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
+    -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
 )
-declare -a CMAKE_CONF_ENV=()
 
 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
-	)
+    CMAKE_CONF_OPTS+=(
+        -DOPENMW_USE_SYSTEM_MYGUI=OFF
+        -DOPENMW_USE_SYSTEM_OSG=OFF
+        -DOPENMW_USE_SYSTEM_BULLET=OFF
+    )
 fi
 
 mkdir -p build
 cd build
 
 if [[ "${BUILD_TESTS_ONLY}" ]]; then
-	env "${CMAKE_CONF_ENV[@]}" ${ANALYZE} cmake \
-		"${CMAKE_CONF_OPTS[@]}" \
-		-DBUILD_OPENMW=OFF \
-		-DBUILD_BSATOOL=OFF \
-		-DBUILD_ESMTOOL=OFF \
-		-DBUILD_LAUNCHER=OFF \
-		-DBUILD_MWINIIMPORTER=OFF \
-		-DBUILD_ESSIMPORTER=OFF \
-		-DBUILD_OPENCS=OFF \
-		-DBUILD_WIZARD=OFF \
-		-DBUILD_UNITTESTS=ON \
-		-DGTEST_ROOT="${GOOGLETEST_DIR}" \
-		-DGMOCK_ROOT="${GOOGLETEST_DIR}" \
-		..
+    ${ANALYZE} cmake \
+        "${CMAKE_CONF_OPTS[@]}" \
+        -DBUILD_OPENMW=OFF \
+        -DBUILD_BSATOOL=OFF \
+        -DBUILD_ESMTOOL=OFF \
+        -DBUILD_LAUNCHER=OFF \
+        -DBUILD_MWINIIMPORTER=OFF \
+        -DBUILD_ESSIMPORTER=OFF \
+        -DBUILD_OPENCS=OFF \
+        -DBUILD_WIZARD=OFF \
+        -DBUILD_UNITTESTS=ON \
+        -DGTEST_ROOT="${GOOGLETEST_DIR}" \
+        -DGMOCK_ROOT="${GOOGLETEST_DIR}" \
+        ..
 else
-	env "${CMAKE_CONF_ENV[@]}" ${ANALYZE} cmake \
-		"${CMAKE_CONF_OPTS[@]}" \
-		..
+    ${ANALYZE} cmake \
+        "${CMAKE_CONF_OPTS[@]}" \
+        ..
 fi

From 93bc5848af328457a29406a25460343b01c897f7 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Mon, 25 Jan 2021 21:02:29 +0000
Subject: [PATCH 0287/2859] .gitlab-ci.yml: Bump Android cache key to v3

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ad26bc550..42c70c9806 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -306,7 +306,7 @@ Debian_AndroidNDK_arm64-v8a:
   variables:
     CCACHE_SIZE: 3G
   cache:
-    key: Debian_AndroidNDK_arm64-v8a.v2
+    key: Debian_AndroidNDK_arm64-v8a.v3
     paths:
       - apt-cache/
       - ccache/

From c8db4b9b3407ddedea2b3e665abe8b9c8ed61716 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Tue, 26 Jan 2021 19:01:52 +0000
Subject: [PATCH 0288/2859] .gitlab-ci.yml: Increase Android timeout (1h ->
 1h30m)

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 42c70c9806..e63a8b9d92 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -331,3 +331,5 @@ Debian_AndroidNDK_arm64-v8a:
   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

From 64475ebedb803a853c62062eb199df2183076005 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Wed, 27 Jan 2021 07:15:09 +0100
Subject: [PATCH 0289/2859] Remove a brainfart from precise projectile
 handling: all non-actor non-projectile objects were treated as ground.

---
 apps/openmw/mwphysics/projectileconvexcallback.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwphysics/projectileconvexcallback.cpp b/apps/openmw/mwphysics/projectileconvexcallback.cpp
index 0d0ac87202..b803c4400b 100644
--- a/apps/openmw/mwphysics/projectileconvexcallback.cpp
+++ b/apps/openmw/mwphysics/projectileconvexcallback.cpp
@@ -55,7 +55,9 @@ namespace MWPhysics
                 }
             default:
                 {
-                    mProjectile->hit(MWWorld::Ptr(), m_hitPointWorld, m_hitNormalWorld);
+                    auto* target = static_cast<PtrHolder*>(result.m_hitCollisionObject->getUserPointer());
+                    auto ptr = target ? target->getPtr() : MWWorld::Ptr();
+                    mProjectile->hit(ptr, m_hitPointWorld, m_hitNormalWorld);
                     break;
                 }
         }

From 7cd7fa2f08eaba7de05532a2a1998f2f751959f7 Mon Sep 17 00:00:00 2001
From: Frederic Chardon <chardon.frederic@gmail.com>
Date: Wed, 27 Jan 2021 08:04:33 +0000
Subject: [PATCH 0290/2859] Collect all available stats if
 OPENMW_OSG_STATS_FILE is set and point to a valid file.

---
 apps/openmw/engine.cpp              |  27 ++++---
 apps/openmw/mwphysics/mtphysics.cpp |   2 +
 components/resource/stats.cpp       | 110 +++++++++++++++++++++++++++-
 components/resource/stats.hpp       |  11 ++-
 4 files changed, 135 insertions(+), 15 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index ead2726cd3..a81a373375 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -177,6 +177,8 @@ namespace
 
             ~ScopedProfile()
             {
+                if (!mStats.collectStats("engine"))
+                    return;
                 const osg::Timer_t end = mTimer.tick();
                 const UserStats& stats = UserStatsValue<sType>::sValue;
 
@@ -863,16 +865,29 @@ void OMW::Engine::go()
 
     prepareEngine (settings);
 
+    std::ofstream stats;
+    if (const auto path = std::getenv("OPENMW_OSG_STATS_FILE"))
+    {
+        stats.open(path, std::ios_base::out);
+        if (stats.is_open())
+            Log(Debug::Info) << "Stats will be written to: " << path;
+        else
+            Log(Debug::Warning) << "Failed to open file for stats: " << path;
+    }
+
     // Setup profiler
-    osg::ref_ptr<Resource::Profiler> statshandler = new Resource::Profiler;
+    osg::ref_ptr<Resource::Profiler> statshandler = new Resource::Profiler(stats.is_open());
 
     initStatsHandler(*statshandler);
 
     mViewer->addEventHandler(statshandler);
 
-    osg::ref_ptr<Resource::StatsHandler> resourceshandler = new Resource::StatsHandler;
+    osg::ref_ptr<Resource::StatsHandler> resourceshandler = new Resource::StatsHandler(stats.is_open());
     mViewer->addEventHandler(resourceshandler);
 
+    if (stats.is_open())
+        Resource::CollectStatistics(mViewer);
+
     // Start the game
     if (!mSaveGameFile.empty())
     {
@@ -897,14 +912,6 @@ void OMW::Engine::go()
         mEnvironment.getWindowManager()->executeInConsole(mStartupScript);
     }
 
-    std::ofstream stats;
-    if (const auto path = std::getenv("OPENMW_OSG_STATS_FILE"))
-    {
-        stats.open(path, std::ios_base::out);
-        if (!stats)
-            Log(Debug::Warning) << "Failed to open file for stats: " << path;
-    }
-
     // Start the main rendering loop
     osg::Timer frameTimer;
     double simulationTime = 0.0;
diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 6c7c573a49..754bb60afe 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -540,6 +540,8 @@ namespace MWPhysics
 
     void PhysicsTaskScheduler::updateStats(osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
     {
+        if (!stats.collectStats("engine"))
+            return;
         if (mFrameNumber == frameNumber - 1)
         {
             stats.setAttribute(mFrameNumber, "physicsworker_time_begin", mTimer->delta_s(mFrameStart, mTimeBegin));
diff --git a/components/resource/stats.cpp b/components/resource/stats.cpp
index 942bd92d80..28b90c31c2 100644
--- a/components/resource/stats.cpp
+++ b/components/resource/stats.cpp
@@ -18,10 +18,72 @@
 namespace Resource
 {
 
-StatsHandler::StatsHandler():
+static bool collectStatRendering = false;
+static bool collectStatCameraObjects = false;
+static bool collectStatViewerObjects = false;
+static bool collectStatResource = false;
+static bool collectStatGPU = false;
+static bool collectStatEvent = false;
+static bool collectStatFrameRate = false;
+static bool collectStatUpdate = false;
+static bool collectStatEngine = false;
+
+static void setupStatCollection()
+{
+    const char* envList = getenv("OPENMW_OSG_STATS_LIST");
+    if (envList == nullptr)
+        return;
+
+    std::string_view kwList(envList);
+
+    auto kwBegin = kwList.begin();
+
+    while (kwBegin != kwList.end())
+    {
+        auto kwEnd = std::find(kwBegin, kwList.end(), ';');
+
+        const auto kw = kwList.substr(std::distance(kwList.begin(), kwBegin), std::distance(kwBegin, kwEnd));
+
+        if (kw.compare("gpu") == 0)
+            collectStatGPU = true;
+        else if (kw.compare("event") == 0)
+            collectStatEvent = true;
+        else if (kw.compare("frame_rate") == 0)
+            collectStatFrameRate = true;
+        else if (kw.compare("update") == 0)
+            collectStatUpdate = true;
+        else if (kw.compare("engine") == 0)
+            collectStatEngine = true;
+        else if (kw.compare("rendering") == 0)
+            collectStatRendering = true;
+        else if (kw.compare("cameraobjects") == 0)
+            collectStatCameraObjects = true;
+        else if (kw.compare("viewerobjects") == 0)
+            collectStatViewerObjects = true;
+        else if (kw.compare("resource") == 0)
+            collectStatResource = true;
+        else if (kw.compare("times") == 0)
+        {
+            collectStatGPU = true;
+            collectStatEvent = true;
+            collectStatFrameRate = true;
+            collectStatUpdate = true;
+            collectStatEngine = true;
+            collectStatRendering = true;
+        }
+
+        if (kwEnd == kwList.end())
+            break;
+
+        kwBegin = std::next(kwEnd);
+    }
+}
+
+StatsHandler::StatsHandler(bool offlineCollect):
     _key(osgGA::GUIEventAdapter::KEY_F4),
     _initialized(false),
     _statsType(false),
+    _offlineCollect(offlineCollect),
     _statsWidth(1280.0f),
     _statsHeight(1024.0f),
     _font(""),
@@ -38,7 +100,8 @@ StatsHandler::StatsHandler():
         _font = osgMyGUI::DataManager::getInstance().getDataPath("DejaVuLGCSansMono.ttf");
 }
 
-Profiler::Profiler()
+Profiler::Profiler(bool offlineCollect):
+    _offlineCollect(offlineCollect)
 {
     if (osgDB::Registry::instance()->getReaderWriterForExtension("ttf"))
         _font = osgMyGUI::DataManager::getInstance().getDataPath("DejaVuLGCSansMono.ttf");
@@ -48,6 +111,28 @@ Profiler::Profiler()
     _characterSize = 18;
 
     setKeyEventTogglesOnScreenStats(osgGA::GUIEventAdapter::KEY_F3);
+    setupStatCollection();
+}
+
+bool Profiler::handle(const osgGA::GUIEventAdapter &ea, osgGA::GUIActionAdapter &aa)
+{
+    osgViewer::ViewerBase* viewer = nullptr;
+
+    bool handled = StatsHandler::handle(ea, aa);
+
+    auto* view = dynamic_cast<osgViewer::View*>(&aa);
+    if (view)
+        viewer = view->getViewerBase();
+
+    if (viewer)
+    {
+        // Add/remove openmw stats to the osd as necessary
+        viewer->getViewerStats()->collectStats("engine", _statsType == StatsHandler::StatsType::VIEWER_STATS);
+
+        if (_offlineCollect)
+            CollectStatistics(viewer);
+    }
+    return handled;
 }
 
 bool StatsHandler::handle(const osgGA::GUIEventAdapter &ea, osgGA::GUIActionAdapter &aa)
@@ -67,6 +152,9 @@ bool StatsHandler::handle(const osgGA::GUIEventAdapter &ea, osgGA::GUIActionAdap
 
                 toggle(viewer);
 
+                if (_offlineCollect)
+                    CollectStatistics(viewer);
+
                 aa.requestRedraw();
                 return true;
             }
@@ -370,6 +458,22 @@ void StatsHandler::getUsage(osg::ApplicationUsage &usage) const
     usage.addKeyboardMouseBinding(_key, "On screen resource usage stats.");
 }
 
-
+void CollectStatistics(osgViewer::ViewerBase* viewer)
+{
+    osgViewer::Viewer::Cameras cameras;
+    viewer->getCameras(cameras);
+    for (auto* camera : cameras)
+    {
+        if (collectStatGPU)           camera->getStats()->collectStats("gpu", true);
+        if (collectStatRendering)     camera->getStats()->collectStats("rendering", true);
+        if (collectStatCameraObjects) camera->getStats()->collectStats("scene", true);
+    }
+    if (collectStatEvent)         viewer->getViewerStats()->collectStats("event", true);
+    if (collectStatFrameRate)     viewer->getViewerStats()->collectStats("frame_rate", true);
+    if (collectStatUpdate)        viewer->getViewerStats()->collectStats("update", true);
+    if (collectStatResource)      viewer->getViewerStats()->collectStats("resource", true);
+    if (collectStatViewerObjects) viewer->getViewerStats()->collectStats("scene", true);
+    if (collectStatEngine)        viewer->getViewerStats()->collectStats("engine", true);
+}
 
 }
diff --git a/components/resource/stats.hpp b/components/resource/stats.hpp
index 9fa583cca4..560275d701 100644
--- a/components/resource/stats.hpp
+++ b/components/resource/stats.hpp
@@ -18,13 +18,17 @@ namespace Resource
     class Profiler : public osgViewer::StatsHandler
     {
     public:
-        Profiler();
+        Profiler(bool offlineCollect);
+        bool handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa) override;
+
+    private:
+        bool _offlineCollect;
     };
 
     class StatsHandler : public osgGA::GUIEventHandler
     {
     public:
-        StatsHandler();
+        StatsHandler(bool offlineCollect);
 
         void setKey(int key) { _key = key; }
         int getKey() const { return _key; }
@@ -47,6 +51,7 @@ namespace Resource
         osg::ref_ptr<osg::Camera>  _camera;
         bool _initialized;
         bool _statsType;
+        bool _offlineCollect;
 
         float                               _statsWidth;
         float                               _statsHeight;
@@ -58,6 +63,8 @@ namespace Resource
 
     };
 
+    void CollectStatistics(osgViewer::ViewerBase* viewer);
+
 }
 
 #endif

From 3194520dcd5eecb04540af0fc936bd303b38c566 Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Wed, 30 Dec 2020 22:11:32 +0200
Subject: [PATCH 0291/2859] Move base_anim settings to settings-default.cfg

---
 apps/openmw/mwclass/npc.cpp                | 12 ++++++------
 apps/openmw/mwrender/animation.cpp         |  2 +-
 apps/openmw/mwrender/creatureanimation.cpp |  6 +++---
 apps/openmw/mwrender/npcanimation.cpp      |  4 ++--
 apps/openmw/mwrender/renderingmanager.cpp  | 15 +++++++++------
 components/resource/scenemanager.cpp       |  2 ++
 components/sceneutil/actorutil.cpp         | 18 ++++++++++--------
 files/settings-default.cfg                 | 16 ++++++++++++++++
 8 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 27c98bbce5..1f7e77daf0 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -418,10 +418,10 @@ namespace MWClass
     {
         const MWWorld::LiveCellRef<ESM::NPC> *ref = ptr.get<ESM::NPC>();
 
-        std::string model = "meshes\\base_anim.nif";
+        std::string model = Settings::Manager::getString("xbaseanim", "Models");
         const ESM::Race* race = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(ref->mBase->mRace);
         if(race->mData.mFlags & ESM::Race::Beast)
-            model = "meshes\\base_animkna.nif";
+            model = Settings::Manager::getString("baseanimkna", "Models");
 
         return model;
     }
@@ -431,12 +431,12 @@ namespace MWClass
         const MWWorld::LiveCellRef<ESM::NPC> *npc = ptr.get<ESM::NPC>();
         const ESM::Race* race = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().search(npc->mBase->mRace);
         if(race && race->mData.mFlags & ESM::Race::Beast)
-            models.emplace_back("meshes\\base_animkna.nif");
+            models.emplace_back(Settings::Manager::getString("baseanimkna", "Models"));
 
         // keep these always loaded just in case
-        models.emplace_back("meshes/xargonian_swimkna.nif");
-        models.emplace_back("meshes/xbase_anim_female.nif");
-        models.emplace_back("meshes/xbase_anim.nif");
+        models.emplace_back(Settings::Manager::getString("xargonianswimkna", "Models"));
+        models.emplace_back(Settings::Manager::getString("xbaseanimfemale", "Models"));
+        models.emplace_back(Settings::Manager::getString("xbaseanim", "Models"));
 
         if (!npc->mBase->mModel.empty())
             models.push_back("meshes/"+npc->mBase->mModel);
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index f8ff3780d3..d8c7599358 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -1500,7 +1500,7 @@ namespace MWRender
                 MWWorld::LiveCellRef<ESM::Creature> *ref = mPtr.get<ESM::Creature>();
                 if(ref->mBase->mFlags & ESM::Creature::Bipedal)
                 {
-                    defaultSkeleton = "meshes\\xbase_anim.nif";
+                    defaultSkeleton = Settings::Manager::getString("xbaseanim", "Models");
                     inject = true;
                 }
             }
diff --git a/apps/openmw/mwrender/creatureanimation.cpp b/apps/openmw/mwrender/creatureanimation.cpp
index f1df6c90fc..2987111621 100644
--- a/apps/openmw/mwrender/creatureanimation.cpp
+++ b/apps/openmw/mwrender/creatureanimation.cpp
@@ -10,7 +10,7 @@
 #include <components/sceneutil/visitor.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/sceneutil/skeleton.hpp>
-
+#include <components/settings/settings.hpp>
 #include <components/misc/stringops.hpp>
 
 #include "../mwbase/environment.hpp"
@@ -35,7 +35,7 @@ CreatureAnimation::CreatureAnimation(const MWWorld::Ptr &ptr,
         setObjectRoot(model, false, false, true);
 
         if((ref->mBase->mFlags&ESM::Creature::Bipedal))
-            addAnimSource("meshes\\xbase_anim.nif", model);
+            addAnimSource(Settings::Manager::getString("xbaseanim", "Models"), model);
         addAnimSource(model, model);
     }
 }
@@ -54,7 +54,7 @@ CreatureWeaponAnimation::CreatureWeaponAnimation(const MWWorld::Ptr &ptr, const
 
         if((ref->mBase->mFlags&ESM::Creature::Bipedal))
         {
-            addAnimSource("meshes\\xbase_anim.nif", model);
+            addAnimSource(Settings::Manager::getString("xbaseanim", "Models"), model);
         }
         addAnimSource(model, model);
 
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index d97e57115a..b538f0b7b6 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -524,7 +524,7 @@ void NpcAnimation::updateNpcBase()
 
     if(!is1stPerson)
     {
-        const std::string base = "meshes\\xbase_anim.nif";
+        const std::string base = Settings::Manager::getString("xbaseanim", "Models");
         if (smodel != base && !isWerewolf)
             addAnimSource(base, smodel);
 
@@ -538,7 +538,7 @@ void NpcAnimation::updateNpcBase()
     }
     else
     {
-        const std::string base = "meshes\\xbase_anim.1st.nif";
+        const std::string base = Settings::Manager::getString("xbaseanim1st", "Models");
         if (smodel != base && !isWerewolf)
             addAnimSource(base, smodel);
 
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 6ba4baec54..a3aee5c0fa 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -456,12 +456,15 @@ namespace MWRender
         mSky->listAssetsToPreload(workItem->mModels, workItem->mTextures);
         mWater->listAssetsToPreload(workItem->mTextures);
 
-        const char* basemodels[] = {"xbase_anim", "xbase_anim.1st", "xbase_anim_female", "xbase_animkna"};
-        for (size_t i=0; i<sizeof(basemodels)/sizeof(basemodels[0]); ++i)
-        {
-            workItem->mModels.push_back(std::string("meshes/") + basemodels[i] + ".nif");
-            workItem->mKeyframes.push_back(std::string("meshes/") + basemodels[i] + ".kf");
-        }
+        workItem->mModels.push_back(Settings::Manager::getString("xbaseanim", "Models"));
+        workItem->mModels.push_back(Settings::Manager::getString("xbaseanim1st", "Models"));
+        workItem->mModels.push_back(Settings::Manager::getString("xbaseanimfemale", "Models"));
+        workItem->mModels.push_back(Settings::Manager::getString("xargonianswimkna", "Models"));
+
+        workItem->mKeyframes.push_back(Settings::Manager::getString("xbaseanimkf", "Models"));
+        workItem->mKeyframes.push_back(Settings::Manager::getString("xbaseanim1stkf", "Models"));
+        workItem->mKeyframes.push_back(Settings::Manager::getString("xbaseanimfemalekf", "Models"));
+        workItem->mKeyframes.push_back(Settings::Manager::getString("xargonianswimknakf", "Models"));
 
         workItem->mTextures.emplace_back("textures/_land_default.dds");
 
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 71f11e382e..92de2e0dd5 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -26,6 +26,8 @@
 #include <components/sceneutil/controller.hpp>
 #include <components/sceneutil/optimizer.hpp>
 
+#include <components/settings/settings.hpp>
+
 #include <components/shader/shadervisitor.hpp>
 #include <components/shader/shadermanager.hpp>
 
diff --git a/components/sceneutil/actorutil.cpp b/components/sceneutil/actorutil.cpp
index 988a61f60e..a0785e413d 100644
--- a/components/sceneutil/actorutil.cpp
+++ b/components/sceneutil/actorutil.cpp
@@ -1,5 +1,7 @@
 #include "actorutil.hpp"
 
+#include <components/settings/settings.hpp>
+
 namespace SceneUtil
 {
     std::string getActorSkeleton(bool firstPerson, bool isFemale, bool isBeast, bool isWerewolf)
@@ -7,24 +9,24 @@ namespace SceneUtil
         if (!firstPerson)
         {
             if (isWerewolf)
-                return "meshes\\wolf\\skin.nif";
+                return Settings::Manager::getString("wolfskin", "Models");
             else if (isBeast)
-                return "meshes\\base_animkna.nif";
+                return Settings::Manager::getString("baseanimkna", "Models");
             else if (isFemale)
-                return "meshes\\base_anim_female.nif";
+                return Settings::Manager::getString("baseanimfemale", "Models");
             else
-                return "meshes\\base_anim.nif";
+                return Settings::Manager::getString("baseanim", "Models");
         }
         else
         {
             if (isWerewolf)
-                return "meshes\\wolf\\skin.1st.nif";
+                return Settings::Manager::getString("wolfskin1st", "Models");
             else if (isBeast)
-                return "meshes\\base_animkna.1st.nif";
+                return Settings::Manager::getString("baseanimkna1st", "Models");
             else if (isFemale)
-                return "meshes\\base_anim_female.1st.nif";
+                return Settings::Manager::getString("baseanimfemale1st", "Models");
             else
-                return "meshes\\base_anim.1st.nif";
+                return Settings::Manager::getString("xbaseanim1st", "Models");
         }
     }
 }
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 3660f56f0a..db947f8ed0 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -969,3 +969,19 @@ distance = 1
 
 # A minimum size of groundcover chunk in cells (0.125, 0.25, 0.5, 1.0)
 min chunk size = 0.5
+
+xbaseanim = meshes\xbase_anim.nif
+baseanim = meshes\base_anim.nif
+xbaseanim1st = meshes\xbase_anim.1st.nif
+baseanimkna = meshes\base_animkna.nif
+baseanimkna1st = meshes\base_animkna.1st.nif
+xbaseanimfemale = meshes/xbase_anim_female.nif
+baseanimfemale = meshes/base_anim_female.nif
+baseanimfemale1st = meshes\base_anim_female.1st.nif
+wolfskin = meshes\wolf\skin.nif
+wolfskin1st = meshes\wolf\skin.1st.nif
+xargonianswimkna = meshes/xargonian_swimkna.nif
+xbaseanimkf = meshes\xbase_anim.kf
+xbaseanim1stkf = meshes\xbase_anim.1st.kf
+xbaseanimfemalekf = meshes/xbase_anim_female.kf
+xargonianswimknakf = meshes/xargonian_swimkna.kf

From 83ee1cc582e355a78e836d674bb228ec47cd1c9e Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Fri, 1 Jan 2021 22:51:23 +0200
Subject: [PATCH 0292/2859] fix xbase to baseanim

---
 apps/openmw/mwclass/npc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 1f7e77daf0..5de4c197e6 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -418,7 +418,7 @@ namespace MWClass
     {
         const MWWorld::LiveCellRef<ESM::NPC> *ref = ptr.get<ESM::NPC>();
 
-        std::string model = Settings::Manager::getString("xbaseanim", "Models");
+        std::string model = Settings::Manager::getString("baseanim", "Models");
         const ESM::Race* race = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(ref->mBase->mRace);
         if(race->mData.mFlags & ESM::Race::Beast)
             model = Settings::Manager::getString("baseanimkna", "Models");

From 23137d0c54f555b30323359953e3db81ded3f361 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Wed, 27 Jan 2021 16:24:11 +0100
Subject: [PATCH 0293/2859] Revert a wrong change introduced in MR 546

A prerequisite to create physics objects for statics was to remove the
dependency on base node (since it doesn't yet exists) for object
position. It is still necessary for animation though.

Restore the basenode (and the associated FIXME) so that animated objects works properly.
---
 apps/openmw/mwphysics/object.cpp | 3 ---
 apps/openmw/mwworld/scene.cpp    | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwphysics/object.cpp b/apps/openmw/mwphysics/object.cpp
index 0a7b9540c5..6d3954088a 100644
--- a/apps/openmw/mwphysics/object.cpp
+++ b/apps/openmw/mwphysics/object.cpp
@@ -116,9 +116,6 @@ namespace MWPhysics
         if (mShapeInstance->mAnimatedShapes.empty())
             return false;
 
-        if (mPtr.getRefData().getBaseNode() == nullptr)
-            return true;
-
         assert (mShapeInstance->getCollisionShape()->isCompound());
 
         btCompoundShape* compound = static_cast<btCompoundShape*>(mShapeInstance->getCollisionShape());
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index fcf2c4b387..2abedcd788 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -122,6 +122,8 @@ namespace
             const ESM::RefNum& refnum = ptr.getCellRef().getRefNum();
             if (!refnum.hasContentFile() || pagedRefs.find(refnum) == pagedRefs.end())
                 ptr.getClass().insertObjectRendering(ptr, model, rendering);
+            else
+                ptr.getRefData().setBaseNode(new SceneUtil::PositionAttitudeTransform); // FIXME remove this when physics code is fixed not to depend on basenode
 
             setNodeRotation(ptr, rendering, rotation);
 

From a3ab8dfbb44aef52e895e8746e525d82519799b5 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 28 Jan 2021 12:48:19 +0000
Subject: [PATCH 0294/2859] Revert "Merge branch 'movement_fix2' into 'master'"

This reverts merge request !496
---
 apps/openmw/mwmechanics/pathfinding.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp
index 595f9d629c..276321b81a 100644
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@@ -309,7 +309,7 @@ namespace MWMechanics
         if (mPath.size() > 1 && isAlmostStraight(position, mPath[0], mPath[1], pointTolerance))
             mPath.pop_front();
 
-        if (mPath.size() == 1 && (mPath.front() - position).length2() < destinationTolerance * destinationTolerance)
+        if (mPath.size() == 1 && sqrDistanceIgnoreZ(mPath.front(), position) < destinationTolerance * destinationTolerance)
             mPath.pop_front();
     }
 

From 3b9f8b5fa2318e35bae594ad94a759e2d6d4a998 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Thu, 28 Jan 2021 18:37:47 +0400
Subject: [PATCH 0295/2859] Avoid null dereference for objects without cells

---
 apps/openmw/mwworld/worldimp.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 98af121a5e..ef00315cbb 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1337,6 +1337,12 @@ namespace MWWorld
 
     void World::adjustPosition(const Ptr &ptr, bool force)
     {
+        if (ptr.isEmpty())
+        {
+            Log(Debug::Warning) << "Unable to adjust position for empty object";
+            return;
+        }
+
         osg::Vec3f pos (ptr.getRefData().getPosition().asVec3());
 
         if(!ptr.getRefData().getBaseNode())
@@ -1345,6 +1351,12 @@ namespace MWWorld
             return;
         }
 
+        if (!ptr.isInCell())
+        {
+            Log(Debug::Warning) << "Unable to adjust position for object '" << ptr.getCellRef().getRefId() << "' - it has no cell";
+            return;
+        }
+
         const float terrainHeight = ptr.getCell()->isExterior() ? getTerrainHeightAt(pos) : -std::numeric_limits<float>::max();
         pos.z() = std::max(pos.z(), terrainHeight) + 20; // place slightly above terrain. will snap down to ground with code below
 

From 36cd81815504cef195fe853b0b93046ac04c3c19 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Thu, 28 Jan 2021 22:10:33 +0100
Subject: [PATCH 0296/2859] Fix separate drop, refactor for code reuse

---
 apps/opencs/view/render/instancemode.cpp | 116 ++++++++---------------
 apps/opencs/view/render/instancemode.hpp |  21 ++--
 2 files changed, 54 insertions(+), 83 deletions(-)

diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index 4f6759cdb8..2489f4f570 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -802,39 +802,15 @@ void CSVRender::InstanceMode::deleteSelectedInstances(bool active)
     getWorldspaceWidget().clearSelection (Mask_Reference);
 }
 
-void CSVRender::InstanceMode::dropInstance(DropMode dropMode, CSVRender::Object* object, float objectHeight)
+void CSVRender::InstanceMode::dropInstance(CSVRender::Object* object, float dropHeight)
 {
-    osg::Vec3d point = object->getPosition().asVec3();
-
-    osg::Vec3d start = point;
-    start.z() += objectHeight;
-    osg::Vec3d end = point;
-    end.z() = std::numeric_limits<float>::lowest();
-
-    osg::ref_ptr<osgUtil::LineSegmentIntersector> intersector (new osgUtil::LineSegmentIntersector(
-        osgUtil::Intersector::MODEL, start, end) );
-    intersector->setIntersectionLimit(osgUtil::LineSegmentIntersector::NO_LIMIT);
-    osgUtil::IntersectionVisitor visitor(intersector);
-
-    if (dropMode == TerrainSep)
-        visitor.setTraversalMask(Mask_Terrain);
-    if (dropMode == CollisionSep)
-        visitor.setTraversalMask(Mask_Terrain | Mask_Reference);
-
-    mParentNode->accept(visitor);
-
-    osgUtil::LineSegmentIntersector::Intersections::iterator it = intersector->getIntersections().begin();
-    if (it != intersector->getIntersections().end())
-    {
-        osgUtil::LineSegmentIntersector::Intersection intersection = *it;
-        ESM::Position position = object->getPosition();
-        object->setEdited (Object::Override_Position);
-        position.pos[2] = intersection.getWorldIntersectPoint().z() + objectHeight;
-        object->setPosition(position.pos);
-    }
+    object->setEdited(Object::Override_Position);
+    ESM::Position position = object->getPosition();
+    position.pos[2] -= dropHeight;
+    object->setPosition(position.pos);
 }
 
-float CSVRender::InstanceMode::getDropHeight(DropMode dropMode, CSVRender::Object* object, float objectHeight)
+float CSVRender::InstanceMode::calculateDropHeight(DropMode dropMode, CSVRender::Object* object, float objectHeight)
 {
     osg::Vec3d point = object->getPosition().asVec3();
 
@@ -848,9 +824,9 @@ float CSVRender::InstanceMode::getDropHeight(DropMode dropMode, CSVRender::Objec
     intersector->setIntersectionLimit(osgUtil::LineSegmentIntersector::NO_LIMIT);
     osgUtil::IntersectionVisitor visitor(intersector);
 
-    if (dropMode == Terrain)
+    if (dropMode & Terrain)
         visitor.setTraversalMask(Mask_Terrain);
-    if (dropMode == Collision)
+    if (dropMode & Collision)
         visitor.setTraversalMask(Mask_Terrain | Mask_Reference);
 
     mParentNode->accept(visitor);
@@ -897,52 +873,44 @@ void CSVRender::InstanceMode::handleDropMethod(DropMode dropMode, QString comman
 
     CSMWorld::CommandMacro macro (undoStack, commandMsg);
 
-    DropObjectDataHandler dropObjectDataHandler(&getWorldspaceWidget());
+    DropObjectHeightHandler dropObjectDataHandler(&getWorldspaceWidget());
 
-    switch (dropMode)
+    if(dropMode & Separate)
     {
-        case Terrain:
-        case Collision:
-        {
-            float smallestDropHeight = std::numeric_limits<float>::max();
-            int counter = 0;
-                for(osg::ref_ptr<TagBase> tag: selection)
-                    if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (tag.get()))
-                    {
-                        float thisDrop = getDropHeight(dropMode, objectTag->mObject, dropObjectDataHandler.mObjectHeights[counter]);
-                        if (thisDrop < smallestDropHeight)
-                            smallestDropHeight = thisDrop;
-                        counter++;
-                    }
-                for(osg::ref_ptr<TagBase> tag: selection)
-                    if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (tag.get()))
-                    {
-                        objectTag->mObject->setEdited (Object::Override_Position);
-                        ESM::Position position = objectTag->mObject->getPosition();
-                        position.pos[2] -= smallestDropHeight;
-                        objectTag->mObject->setPosition(position.pos);
-                        objectTag->mObject->apply (macro);
-                    }
-        }
-            break;
-
-        case TerrainSep:
-        case CollisionSep:
-        {
-            int counter = 0;
-            for(osg::ref_ptr<TagBase> tag: selection)
-                if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (tag.get()))
-                {
-                    dropInstance(dropMode, objectTag->mObject, dropObjectDataHandler.mObjectHeights[counter]);
-                    objectTag->mObject->apply (macro);
-                    counter++;
-                }
-        }
-            break;
+        int counter = 0;
+        for (osg::ref_ptr<TagBase> tag : selection)
+            if (CSVRender::ObjectTag* objectTag = dynamic_cast<CSVRender::ObjectTag*>(tag.get()))
+            {
+                float objectHeight = dropObjectDataHandler.mObjectHeights[counter];
+                float dropHeight = calculateDropHeight(dropMode, objectTag->mObject, objectHeight);
+                dropInstance(objectTag->mObject, dropHeight);
+                objectTag->mObject->apply(macro);
+                counter++;
+            }
+    }
+    else
+    {
+        float smallestDropHeight = std::numeric_limits<float>::max();
+        int counter = 0;
+        for (osg::ref_ptr<TagBase> tag : selection)
+            if (CSVRender::ObjectTag* objectTag = dynamic_cast<CSVRender::ObjectTag*>(tag.get()))
+            {
+                float objectHeight = dropObjectDataHandler.mObjectHeights[counter];
+                float thisDrop = calculateDropHeight(dropMode, objectTag->mObject, objectHeight);
+                if (thisDrop < smallestDropHeight)
+                    smallestDropHeight = thisDrop;
+                counter++;
+            }
+        for (osg::ref_ptr<TagBase> tag : selection)
+            if (CSVRender::ObjectTag* objectTag = dynamic_cast<CSVRender::ObjectTag*>(tag.get()))
+            {
+                dropInstance(objectTag->mObject, smallestDropHeight);
+                objectTag->mObject->apply(macro);
+            }
     }
 }
 
-CSVRender::DropObjectDataHandler::DropObjectDataHandler(WorldspaceWidget* worldspacewidget)
+CSVRender::DropObjectHeightHandler::DropObjectHeightHandler(WorldspaceWidget* worldspacewidget)
     : mWorldspaceWidget(worldspacewidget)
 {
     std::vector<osg::ref_ptr<TagBase> > selection = mWorldspaceWidget->getSelection (Mask_Reference);
@@ -969,7 +937,7 @@ CSVRender::DropObjectDataHandler::DropObjectDataHandler(WorldspaceWidget* worlds
     }
 }
 
-CSVRender::DropObjectDataHandler::~DropObjectDataHandler()
+CSVRender::DropObjectHeightHandler::~DropObjectHeightHandler()
 {
     std::vector<osg::ref_ptr<TagBase> > selection = mWorldspaceWidget->getSelection (Mask_Reference);
     int counter = 0;
diff --git a/apps/opencs/view/render/instancemode.hpp b/apps/opencs/view/render/instancemode.hpp
index 0a4f2e4788..d0a263ed84 100644
--- a/apps/opencs/view/render/instancemode.hpp
+++ b/apps/opencs/view/render/instancemode.hpp
@@ -28,10 +28,13 @@ namespace CSVRender
 
             enum DropMode
             {
-                Collision,
-                Terrain,
-                CollisionSep,
-                TerrainSep
+                Separate = 0x1,
+
+                Collision = 0b10,
+                Terrain = 0b100,
+
+                CollisionSep = Collision | Separate,
+                TerrainSep = Terrain | Separate,
             };
 
             CSVWidget::SceneToolMode *mSubMode;
@@ -53,8 +56,8 @@ namespace CSVRender
             osg::Vec3f getProjectionSpaceCoords(const osg::Vec3f& pos);
             osg::Vec3f getMousePlaneCoords(const QPoint& point, const osg::Vec3d& dragStart);
             void handleSelectDrag(const QPoint& pos);
-            void dropInstance(DropMode dropMode, CSVRender::Object* object, float objectHeight);
-            float getDropHeight(DropMode dropMode, CSVRender::Object* object, float objectHeight);
+            void dropInstance(CSVRender::Object* object, float objectHeight);
+            float calculateDropHeight(DropMode dropMode, CSVRender::Object* object, float objectHeight);
 
         public:
 
@@ -116,11 +119,11 @@ namespace CSVRender
     };
 
     /// \brief Helper class to handle object mask data in safe way
-    class DropObjectDataHandler
+    class DropObjectHeightHandler
     {
         public:
-            DropObjectDataHandler(WorldspaceWidget* worldspacewidget);
-            ~DropObjectDataHandler();
+            DropObjectHeightHandler(WorldspaceWidget* worldspacewidget);
+            ~DropObjectHeightHandler();
             std::vector<float> mObjectHeights;
 
         private:

From edc6d5c3e725a2da0c53d82dc025f718008e185d Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Thu, 28 Jan 2021 22:22:48 +0100
Subject: [PATCH 0297/2859] Fix a typo in separate drop binds

---
 apps/opencs/view/render/instancemode.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index 2489f4f570..99ddce7f7d 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -854,12 +854,12 @@ void CSVRender::InstanceMode::dropSelectedInstancesToTerrain()
 
 void CSVRender::InstanceMode::dropSelectedInstancesToCollisionSeparately()
 {
-    handleDropMethod(TerrainSep, "Drop instances to next collision level separately");
+    handleDropMethod(CollisionSep, "Drop instances to next collision level separately");
 }
 
 void CSVRender::InstanceMode::dropSelectedInstancesToTerrainSeparately()
 {
-    handleDropMethod(CollisionSep, "Drop instances to terrain level separately");
+    handleDropMethod(TerrainSep, "Drop instances to terrain level separately");
 }
 
 void CSVRender::InstanceMode::handleDropMethod(DropMode dropMode, QString commandMsg)

From eca0d8b7ea9a9e63779a8dff55623c12a151f870 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Thu, 28 Jan 2021 22:40:44 +0100
Subject: [PATCH 0298/2859] Fix typo in DropMode enum

---
 apps/opencs/view/render/instancemode.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/opencs/view/render/instancemode.hpp b/apps/opencs/view/render/instancemode.hpp
index d0a263ed84..c81c153d44 100644
--- a/apps/opencs/view/render/instancemode.hpp
+++ b/apps/opencs/view/render/instancemode.hpp
@@ -28,7 +28,7 @@ namespace CSVRender
 
             enum DropMode
             {
-                Separate = 0x1,
+                Separate = 0b1,
 
                 Collision = 0b10,
                 Terrain = 0b100,

From ee2f0e7eb33d1226f4e9b961f8a355224bff079f Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Thu, 28 Jan 2021 23:47:38 +0100
Subject: [PATCH 0299/2859] Fix inconsistent argument name

---
 apps/opencs/view/render/instancemode.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/opencs/view/render/instancemode.hpp b/apps/opencs/view/render/instancemode.hpp
index c81c153d44..73b7fff12a 100644
--- a/apps/opencs/view/render/instancemode.hpp
+++ b/apps/opencs/view/render/instancemode.hpp
@@ -56,7 +56,7 @@ namespace CSVRender
             osg::Vec3f getProjectionSpaceCoords(const osg::Vec3f& pos);
             osg::Vec3f getMousePlaneCoords(const QPoint& point, const osg::Vec3d& dragStart);
             void handleSelectDrag(const QPoint& pos);
-            void dropInstance(CSVRender::Object* object, float objectHeight);
+            void dropInstance(CSVRender::Object* object, float dropHeight);
             float calculateDropHeight(DropMode dropMode, CSVRender::Object* object, float objectHeight);
 
         public:

From f8e8496d36b2a232c15c421b1d55c3c8a9cf49f4 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Fri, 29 Jan 2021 16:50:39 +0400
Subject: [PATCH 0300/2859] Revert "Revert a wrong change introduced in MR 546"

This reverts commit 23137d0c54f555b30323359953e3db81ded3f361.
---
 apps/openmw/mwphysics/object.cpp | 3 +++
 apps/openmw/mwworld/scene.cpp    | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwphysics/object.cpp b/apps/openmw/mwphysics/object.cpp
index 6d3954088a..0a7b9540c5 100644
--- a/apps/openmw/mwphysics/object.cpp
+++ b/apps/openmw/mwphysics/object.cpp
@@ -116,6 +116,9 @@ namespace MWPhysics
         if (mShapeInstance->mAnimatedShapes.empty())
             return false;
 
+        if (mPtr.getRefData().getBaseNode() == nullptr)
+            return true;
+
         assert (mShapeInstance->getCollisionShape()->isCompound());
 
         btCompoundShape* compound = static_cast<btCompoundShape*>(mShapeInstance->getCollisionShape());
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 2abedcd788..fcf2c4b387 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -122,8 +122,6 @@ namespace
             const ESM::RefNum& refnum = ptr.getCellRef().getRefNum();
             if (!refnum.hasContentFile() || pagedRefs.find(refnum) == pagedRefs.end())
                 ptr.getClass().insertObjectRendering(ptr, model, rendering);
-            else
-                ptr.getRefData().setBaseNode(new SceneUtil::PositionAttitudeTransform); // FIXME remove this when physics code is fixed not to depend on basenode
 
             setNodeRotation(ptr, rendering, rotation);
 

From 8019fd594defac7d18e88c690f1bde910811a85d Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Fri, 29 Jan 2021 16:50:56 +0400
Subject: [PATCH 0301/2859] Revert "Add changelog"

This reverts commit f219c5992bc6efe688ab128915f2d36c39da47a0.
---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c6c7b5757a..f347fb46eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,7 +44,6 @@
     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 #5379: Wandering NPCs falling through cantons
     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

From 165af1c365628a4e2ae1bec6a54cc39b335db83a Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Fri, 29 Jan 2021 16:51:05 +0400
Subject: [PATCH 0302/2859] Revert "Some actors are supposed to spawn on a
 static object that belong to an adjacent cell."

This reverts commit f031a191b847443c848637b17d0936a43b5070b5.
---
 apps/openmw/mwclass/static.cpp          |   5 -
 apps/openmw/mwclass/static.hpp          |   2 -
 apps/openmw/mwphysics/physicssystem.cpp |   5 +-
 apps/openmw/mwphysics/physicssystem.hpp |   2 +-
 apps/openmw/mwworld/cellvisitors.hpp    |  13 +-
 apps/openmw/mwworld/class.hpp           |   4 -
 apps/openmw/mwworld/scene.cpp           | 405 ++++++++++--------------
 apps/openmw/mwworld/scene.hpp           |  15 +-
 8 files changed, 182 insertions(+), 269 deletions(-)

diff --git a/apps/openmw/mwclass/static.cpp b/apps/openmw/mwclass/static.cpp
index 28156c97f6..108c4eaa20 100644
--- a/apps/openmw/mwclass/static.cpp
+++ b/apps/openmw/mwclass/static.cpp
@@ -63,9 +63,4 @@ namespace MWClass
 
         return MWWorld::Ptr(cell.insert(ref), &cell);
     }
-
-    bool Static::isStatic() const
-    {
-        return true;
-    }
 }
diff --git a/apps/openmw/mwclass/static.hpp b/apps/openmw/mwclass/static.hpp
index d0f4913f0f..f856e9fd94 100644
--- a/apps/openmw/mwclass/static.hpp
+++ b/apps/openmw/mwclass/static.hpp
@@ -25,8 +25,6 @@ namespace MWClass
             static void registerSelf();
 
             std::string getModel(const MWWorld::ConstPtr &ptr) const override;
-
-            bool isStatic() const override;
     };
 }
 
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 5a9a0be832..68cec48bcb 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -469,7 +469,7 @@ namespace MWPhysics
             mAnimatedObjects.insert(obj.get());
     }
 
-    void PhysicsSystem::remove(const MWWorld::Ptr &ptr, bool keepObject)
+    void PhysicsSystem::remove(const MWWorld::Ptr &ptr)
     {
         ObjectMap::iterator found = mObjects.find(ptr);
         if (found != mObjects.end())
@@ -479,8 +479,7 @@ namespace MWPhysics
 
             mAnimatedObjects.erase(found->second.get());
 
-            if (!keepObject)
-                mObjects.erase(found);
+            mObjects.erase(found);
         }
 
         ActorMap::iterator foundActor = mActors.find(ptr);
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 715a6cd1a2..c61b368f8e 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -138,7 +138,7 @@ namespace MWPhysics
             Projectile* getProjectile(int projectileId) const;
 
             // Object or Actor
-            void remove (const MWWorld::Ptr& ptr, bool keepObject = false);
+            void remove (const MWWorld::Ptr& ptr);
 
             void updateScale (const MWWorld::Ptr& ptr);
             void updateRotation (const MWWorld::Ptr& ptr, osg::Quat rotate);
diff --git a/apps/openmw/mwworld/cellvisitors.hpp b/apps/openmw/mwworld/cellvisitors.hpp
index 5985d06fb6..e68b383b77 100644
--- a/apps/openmw/mwworld/cellvisitors.hpp
+++ b/apps/openmw/mwworld/cellvisitors.hpp
@@ -18,23 +18,12 @@ namespace MWWorld
             if (ptr.getRefData().getBaseNode())
             {
                 ptr.getRefData().setBaseNode(nullptr);
+                mObjects.push_back (ptr);
             }
-            mObjects.push_back (ptr);
 
             return true;
         }
     };
-
-    struct ListObjectsVisitor
-    {
-        std::vector<MWWorld::Ptr> mObjects;
-
-        bool operator() (MWWorld::Ptr ptr)
-        {
-            mObjects.push_back (ptr);
-            return true;
-        }
-    };
 }
 
 #endif
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index 592552d47f..39fb6fe4c5 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -318,10 +318,6 @@ namespace MWWorld
                 return false;
             }
 
-            virtual bool isStatic() const {
-                return false;
-            }
-
             virtual bool isBipedal(const MWWorld::ConstPtr& ptr) const;
             virtual bool canFly(const MWWorld::ConstPtr& ptr) const;
             virtual bool canSwim(const MWWorld::ConstPtr& ptr) const;
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index fcf2c4b387..313e9a1527 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -105,7 +105,7 @@ namespace
     }
 
     void addObject(const MWWorld::Ptr& ptr, MWPhysics::PhysicsSystem& physics,
-                   MWRender::RenderingManager& rendering, std::set<ESM::RefNum>& pagedRefs, bool onlyPhysics)
+                   MWRender::RenderingManager& rendering, std::set<ESM::RefNum>& pagedRefs)
     {
         if (ptr.getRefData().getBaseNode() || physics.getActor(ptr))
         {
@@ -113,29 +113,25 @@ namespace
             return;
         }
 
+        bool useAnim = ptr.getClass().useAnim();
         std::string model = getModel(ptr, rendering.getResourceSystem()->getVFS());
-        const auto rotation = makeNodeRotation(ptr, RotationOrder::direct);
-        if (!onlyPhysics)
-        {
-            bool useAnim = ptr.getClass().useAnim();
 
-            const ESM::RefNum& refnum = ptr.getCellRef().getRefNum();
-            if (!refnum.hasContentFile() || pagedRefs.find(refnum) == pagedRefs.end())
-                ptr.getClass().insertObjectRendering(ptr, model, rendering);
+        const ESM::RefNum& refnum = ptr.getCellRef().getRefNum();
+        if (!refnum.hasContentFile() || pagedRefs.find(refnum) == pagedRefs.end())
+            ptr.getClass().insertObjectRendering(ptr, model, rendering);
 
-            setNodeRotation(ptr, rendering, rotation);
+        const auto rotation = makeNodeRotation(ptr, RotationOrder::direct);
+        setNodeRotation(ptr, rendering, rotation);
+        ptr.getClass().insertObject (ptr, model, rotation, physics);
 
-            if (useAnim)
-                MWBase::Environment::get().getMechanicsManager()->add(ptr);
+        if (useAnim)
+            MWBase::Environment::get().getMechanicsManager()->add(ptr);
 
-            if (ptr.getClass().isActor())
-                rendering.addWaterRippleEmitter(ptr);
+        if (ptr.getClass().isActor())
+            rendering.addWaterRippleEmitter(ptr);
 
-            // Restore effect particles
-            MWBase::Environment::get().getWorld()->applyLoopingParticles(ptr);
-        }
-        if (!physics.getObject(ptr))
-            ptr.getClass().insertObject (ptr, model, rotation, physics);
+        // Restore effect particles
+        MWBase::Environment::get().getWorld()->applyLoopingParticles(ptr);
     }
 
     void addObject(const MWWorld::Ptr& ptr, const MWPhysics::PhysicsSystem& physics, DetourNavigator::Navigator& navigator)
@@ -206,12 +202,11 @@ namespace
     {
         MWWorld::CellStore& mCell;
         Loading::Listener& mLoadingListener;
-        bool mOnlyStatics;
         bool mTest;
 
         std::vector<MWWorld::Ptr> mToInsert;
 
-        InsertVisitor (MWWorld::CellStore& cell, Loading::Listener& loadingListener, bool onlyStatics, bool test);
+        InsertVisitor (MWWorld::CellStore& cell, Loading::Listener& loadingListener, bool test);
 
         bool operator() (const MWWorld::Ptr& ptr);
 
@@ -219,8 +214,8 @@ namespace
         void insert(AddObject&& addObject);
     };
 
-    InsertVisitor::InsertVisitor (MWWorld::CellStore& cell, Loading::Listener& loadingListener, bool onlyStatics, bool test)
-    : mCell (cell), mLoadingListener (loadingListener), mOnlyStatics(onlyStatics), mTest(test)
+    InsertVisitor::InsertVisitor (MWWorld::CellStore& cell, Loading::Listener& loadingListener, bool test)
+    : mCell (cell), mLoadingListener (loadingListener), mTest(test)
     {}
 
     bool InsertVisitor::operator() (const MWWorld::Ptr& ptr)
@@ -236,7 +231,7 @@ namespace
     {
         for (MWWorld::Ptr& ptr : mToInsert)
         {
-            if (!ptr.getRefData().isDeleted() && ptr.getRefData().isEnabled() && ((mOnlyStatics && ptr.getClass().isStatic()) || !mOnlyStatics))
+            if (!ptr.getRefData().isDeleted() && ptr.getRefData().isEnabled())
             {
                 try
                 {
@@ -269,16 +264,6 @@ namespace
         return std::abs(cellPosition.first) + std::abs(cellPosition.second);
     }
 
-    bool isCellInCollection(int x, int y, MWWorld::Scene::CellStoreCollection& collection)
-    {
-        for (auto *cell : collection)
-        {
-            assert(cell->getCell()->isExterior());
-            if (x == cell->getCell()->getGridX() && y == cell->getCell()->getGridY())
-                return true;
-        }
-        return false;
-    }
 }
 
 
@@ -330,41 +315,15 @@ namespace MWWorld
         mRendering.update (duration, paused);
     }
 
-    void Scene::unloadInactiveCell (CellStore* cell, bool test)
-    {
-        assert(mActiveCells.find(cell) == mActiveCells.end());
-        assert(mInactiveCells.find(cell) != mInactiveCells.end());
-        if (!test)
-            Log(Debug::Info) << "Unloading cell " << cell->getCell()->getDescription();
-
-        ListObjectsVisitor visitor;
-
-        cell->forEach(visitor);
-        for (const auto& ptr : visitor.mObjects)
-            mPhysics->remove(ptr);
-
-        if (cell->getCell()->isExterior())
-        {
-            const auto cellX = cell->getCell()->getGridX();
-            const auto cellY = cell->getCell()->getGridY();
-            mPhysics->removeHeightField(cellX, cellY);
-        }
-
-        mInactiveCells.erase(cell);
-    }
-
-    void Scene::deactivateCell(CellStore* cell, bool test)
+    void Scene::unloadCell (CellStoreCollection::iterator iter, bool test)
     {
-        assert(mInactiveCells.find(cell) != mInactiveCells.end());
-        if (mActiveCells.find(cell) == mActiveCells.end())
-            return;
         if (!test)
-            Log(Debug::Info) << "Deactivate cell " << cell->getCell()->getDescription();
+            Log(Debug::Info) << "Unloading cell " << (*iter)->getCell()->getDescription();
 
         const auto navigator = MWBase::Environment::get().getWorld()->getNavigator();
         ListAndResetObjectsVisitor visitor;
 
-        cell->forEach(visitor);
+        (*iter)->forEach(visitor);
         const auto world = MWBase::Environment::get().getWorld();
         for (const auto& ptr : visitor.mObjects)
         {
@@ -375,157 +334,140 @@ namespace MWWorld
                 navigator->removeAgent(world->getPathfindingHalfExtents(ptr));
                 mRendering.removeActorPath(ptr);
             }
-            mPhysics->remove(ptr, ptr.getClass().isStatic());
+            mPhysics->remove(ptr);
         }
 
-        const auto cellX = cell->getCell()->getGridX();
-        const auto cellY = cell->getCell()->getGridY();
+        const auto cellX = (*iter)->getCell()->getGridX();
+        const auto cellY = (*iter)->getCell()->getGridY();
 
-        if (cell->getCell()->isExterior())
+        if ((*iter)->getCell()->isExterior())
         {
             if (const auto heightField = mPhysics->getHeightField(cellX, cellY))
                 navigator->removeObject(DetourNavigator::ObjectId(heightField));
+            mPhysics->removeHeightField(cellX, cellY);
         }
 
-        if (cell->getCell()->hasWater())
+        if ((*iter)->getCell()->hasWater())
             navigator->removeWater(osg::Vec2i(cellX, cellY));
 
-        if (const auto pathgrid = world->getStore().get<ESM::Pathgrid>().search(*cell->getCell()))
+        if (const auto pathgrid = world->getStore().get<ESM::Pathgrid>().search(*(*iter)->getCell()))
             navigator->removePathgrid(*pathgrid);
 
         const auto player = world->getPlayerPtr();
         navigator->update(player.getRefData().getPosition().asVec3());
 
-        MWBase::Environment::get().getMechanicsManager()->drop (cell);
+        MWBase::Environment::get().getMechanicsManager()->drop (*iter);
 
-        mRendering.removeCell(cell);
-        MWBase::Environment::get().getWindowManager()->removeCell(cell);
+        mRendering.removeCell(*iter);
+        MWBase::Environment::get().getWindowManager()->removeCell(*iter);
 
-        MWBase::Environment::get().getWorld()->getLocalScripts().clearCell (cell);
+        MWBase::Environment::get().getWorld()->getLocalScripts().clearCell (*iter);
 
-        MWBase::Environment::get().getSoundManager()->stopSound (cell);
-        mActiveCells.erase(cell);
+        MWBase::Environment::get().getSoundManager()->stopSound (*iter);
+        mActiveCells.erase(*iter);
     }
 
-    void Scene::activateCell (CellStore *cell, Loading::Listener* loadingListener, bool respawn, bool test)
+    void Scene::loadCell (CellStore *cell, Loading::Listener* loadingListener, bool respawn, bool test)
     {
-        assert(mActiveCells.find(cell) == mActiveCells.end());
-        assert(mInactiveCells.find(cell) != mInactiveCells.end());
-        mActiveCells.insert(cell);
-
-        if (test)
-            Log(Debug::Info) << "Testing cell " << cell->getCell()->getDescription();
-        else
-            Log(Debug::Info) << "Loading cell " << cell->getCell()->getDescription();
-
-        const auto world = MWBase::Environment::get().getWorld();
-        const auto navigator = world->getNavigator();
-
-        const int cellX = cell->getCell()->getGridX();
-        const int cellY = cell->getCell()->getGridY();
+        std::pair<CellStoreCollection::iterator, bool> result = mActiveCells.insert(cell);
 
-        if (!test && cell->getCell()->isExterior())
+        if(result.second)
         {
-            if (const auto heightField = mPhysics->getHeightField(cellX, cellY))
-                navigator->addObject(DetourNavigator::ObjectId(heightField), *heightField->getShape(),
-                        heightField->getCollisionObject()->getWorldTransform());
-        }
-
-        if (const auto pathgrid = world->getStore().get<ESM::Pathgrid>().search(*cell->getCell()))
-            navigator->addPathgrid(*cell->getCell(), *pathgrid);
+            if (test)
+                Log(Debug::Info) << "Testing cell " << cell->getCell()->getDescription();
+            else
+                Log(Debug::Info) << "Loading cell " << cell->getCell()->getDescription();
 
-        // register local scripts
-        // do this before insertCell, to make sure we don't add scripts from levelled creature spawning twice
-        MWBase::Environment::get().getWorld()->getLocalScripts().addCell (cell);
+            float verts = ESM::Land::LAND_SIZE;
+            float worldsize = ESM::Land::REAL_SIZE;
 
-        if (respawn)
-            cell->respawn();
+            const auto world = MWBase::Environment::get().getWorld();
+            const auto navigator = world->getNavigator();
 
-        insertCell (*cell, loadingListener, false, test);
+            const int cellX = cell->getCell()->getGridX();
+            const int cellY = cell->getCell()->getGridY();
 
-        mRendering.addCell(cell);
-        if (!test)
-        {
-            MWBase::Environment::get().getWindowManager()->addCell(cell);
-            bool waterEnabled = cell->getCell()->hasWater() || cell->isExterior();
-            float waterLevel = cell->getWaterLevel();
-            mRendering.setWaterEnabled(waterEnabled);
-            if (waterEnabled)
+            // Load terrain physics first...
+            if (!test && cell->getCell()->isExterior())
             {
-                mPhysics->enableWater(waterLevel);
-                mRendering.setWaterHeight(waterLevel);
-
-                if (cell->getCell()->isExterior())
+                osg::ref_ptr<const ESMTerrain::LandObject> land = mRendering.getLandManager()->getLand(cellX, cellY);
+                const ESM::Land::LandData* data = land ? land->getData(ESM::Land::DATA_VHGT) : nullptr;
+                if (data)
                 {
-                    if (const auto heightField = mPhysics->getHeightField(cellX, cellY))
-                        navigator->addWater(osg::Vec2i(cellX, cellY), ESM::Land::REAL_SIZE,
-                                cell->getWaterLevel(), heightField->getCollisionObject()->getWorldTransform());
+                    mPhysics->addHeightField (data->mHeights, cellX, cellY, worldsize / (verts-1), verts, data->mMinHeight, data->mMaxHeight, land.get());
                 }
                 else
                 {
-                    navigator->addWater(osg::Vec2i(cellX, cellY), std::numeric_limits<int>::max(),
-                            cell->getWaterLevel(), btTransform::getIdentity());
+                    static std::vector<float> defaultHeight;
+                    defaultHeight.resize(verts*verts, ESM::Land::DEFAULT_HEIGHT);
+                    mPhysics->addHeightField (&defaultHeight[0], cell->getCell()->getGridX(), cell->getCell()->getGridY(), worldsize / (verts-1), verts, ESM::Land::DEFAULT_HEIGHT, ESM::Land::DEFAULT_HEIGHT, land.get());
                 }
+
+                if (const auto heightField = mPhysics->getHeightField(cellX, cellY))
+                    navigator->addObject(DetourNavigator::ObjectId(heightField), *heightField->getShape(),
+                            heightField->getCollisionObject()->getWorldTransform());
             }
-            else
-                mPhysics->disableWater();
 
-            const auto player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-            navigator->update(player.getRefData().getPosition().asVec3());
+            if (const auto pathgrid = world->getStore().get<ESM::Pathgrid>().search(*cell->getCell()))
+                navigator->addPathgrid(*cell->getCell(), *pathgrid);
 
-            if (!cell->isExterior() && !(cell->getCell()->mData.mFlags & ESM::Cell::QuasiEx))
-                mRendering.configureAmbient(cell->getCell());
-        }
+            // register local scripts
+            // do this before insertCell, to make sure we don't add scripts from levelled creature spawning twice
+            MWBase::Environment::get().getWorld()->getLocalScripts().addCell (cell);
 
-        mPreloader->notifyLoaded(cell);
-    }
+            if (respawn)
+                cell->respawn();
 
-    void Scene::loadInactiveCell (CellStore *cell, Loading::Listener* loadingListener, bool test)
-    {
-        assert(mActiveCells.find(cell) == mActiveCells.end());
-        assert(mInactiveCells.find(cell) == mInactiveCells.end());
-        mInactiveCells.insert(cell);
+            // ... then references. This is important for adjustPosition to work correctly.
+            insertCell (*cell, loadingListener, test);
 
-        if (test)
-            Log(Debug::Info) << "Testing inactive cell " << cell->getCell()->getDescription();
-        else
-            Log(Debug::Info) << "Loading inactive cell " << cell->getCell()->getDescription();
+            mRendering.addCell(cell);
+            if (!test)
+            {
+                MWBase::Environment::get().getWindowManager()->addCell(cell);
+                bool waterEnabled = cell->getCell()->hasWater() || cell->isExterior();
+                float waterLevel = cell->getWaterLevel();
+                mRendering.setWaterEnabled(waterEnabled);
+                if (waterEnabled)
+                {
+                    mPhysics->enableWater(waterLevel);
+                    mRendering.setWaterHeight(waterLevel);
 
-        if (!test && cell->getCell()->isExterior())
-        {
-            float verts = ESM::Land::LAND_SIZE;
-            float worldsize = ESM::Land::REAL_SIZE;
+                    if (cell->getCell()->isExterior())
+                    {
+                        if (const auto heightField = mPhysics->getHeightField(cellX, cellY))
+                            navigator->addWater(osg::Vec2i(cellX, cellY), ESM::Land::REAL_SIZE,
+                                cell->getWaterLevel(), heightField->getCollisionObject()->getWorldTransform());
+                    }
+                    else
+                    {
+                        navigator->addWater(osg::Vec2i(cellX, cellY), std::numeric_limits<int>::max(),
+                            cell->getWaterLevel(), btTransform::getIdentity());
+                    }
+                }
+                else
+                    mPhysics->disableWater();
 
-            const int cellX = cell->getCell()->getGridX();
-            const int cellY = cell->getCell()->getGridY();
+                const auto player = MWBase::Environment::get().getWorld()->getPlayerPtr();
+                navigator->update(player.getRefData().getPosition().asVec3());
 
-            osg::ref_ptr<const ESMTerrain::LandObject> land = mRendering.getLandManager()->getLand(cellX, cellY);
-            const ESM::Land::LandData* data = land ? land->getData(ESM::Land::DATA_VHGT) : nullptr;
-            if (data)
-            {
-                mPhysics->addHeightField (data->mHeights, cellX, cellY, worldsize / (verts-1), verts, data->mMinHeight, data->mMaxHeight, land.get());
-            }
-            else
-            {
-                static std::vector<float> defaultHeight;
-                defaultHeight.resize(verts*verts, ESM::Land::DEFAULT_HEIGHT);
-                mPhysics->addHeightField (&defaultHeight[0], cell->getCell()->getGridX(), cell->getCell()->getGridY(), worldsize / (verts-1), verts, ESM::Land::DEFAULT_HEIGHT, ESM::Land::DEFAULT_HEIGHT, land.get());
+                if (!cell->isExterior() && !(cell->getCell()->mData.mFlags & ESM::Cell::QuasiEx))
+                {
+
+                    mRendering.configureAmbient(cell->getCell());
+                }
             }
         }
 
-        insertCell (*cell, loadingListener, true, test);
+        mPreloader->notifyLoaded(cell);
     }
 
     void Scene::clear()
     {
-        for (auto iter = mInactiveCells.begin(); iter!=mInactiveCells.end(); )
-        {
-            auto* cell = *iter++;
-            deactivateCell(cell);
-            unloadInactiveCell (cell);
-        }
+        CellStoreCollection::iterator active = mActiveCells.begin();
+        while (active!=mActiveCells.end())
+            unloadCell (active++);
         assert(mActiveCells.empty());
-        assert(mInactiveCells.empty());
         mCurrentCell = nullptr;
 
         mPreloader->clear();
@@ -568,24 +510,20 @@ namespace MWWorld
 
     void Scene::changeCellGrid (const osg::Vec3f &pos, int playerCellX, int playerCellY, bool changeEvent)
     {
-        for (auto iter = mInactiveCells.begin(); iter != mInactiveCells.end(); )
+        CellStoreCollection::iterator active = mActiveCells.begin();
+        while (active!=mActiveCells.end())
         {
-            auto* cell = *iter++;
-            if (cell->getCell()->isExterior())
-            {
-                const auto dx = std::abs(playerCellX - cell->getCell()->getGridX());
-                const auto dy = std::abs(playerCellY - cell->getCell()->getGridY());
-                if (dx > mHalfGridSize || dy > mHalfGridSize)
-                    deactivateCell(cell);
-
-                if (dx > mHalfGridSize+1 || dy > mHalfGridSize+1)
-                    unloadInactiveCell(cell);
-            }
-            else
+            if ((*active)->getCell()->isExterior())
             {
-                deactivateCell(cell);
-                unloadInactiveCell(cell);
+                if (std::abs (playerCellX-(*active)->getCell()->getGridX())<=mHalfGridSize &&
+                    std::abs (playerCellY-(*active)->getCell()->getGridY())<=mHalfGridSize)
+                {
+                    // keep cells within the new grid
+                    ++active;
+                    continue;
+                }
             }
+            unloadCell (active++);
         }
 
         mCurrentGridCenter = osg::Vec2i(playerCellX, playerCellY);
@@ -597,24 +535,32 @@ namespace MWWorld
         mRendering.getPagedRefnums(newGrid, mPagedRefs);
 
         std::size_t refsToLoad = 0;
-        const auto cellsToLoad = [&playerCellX,&playerCellY,&refsToLoad](CellStoreCollection& collection, int range) -> std::vector<std::pair<int,int>>
+        std::vector<std::pair<int, int>> cellsPositionsToLoad;
+        // get the number of refs to load
+        for (int x = playerCellX - mHalfGridSize; x <= playerCellX + mHalfGridSize; ++x)
         {
-            std::vector<std::pair<int, int>> cellsPositionsToLoad;
-            for (int x = playerCellX - range; x <= playerCellX + range; ++x)
+            for (int y = playerCellY - mHalfGridSize; y <= playerCellY + mHalfGridSize; ++y)
             {
-                for (int y = playerCellY - range; y <= playerCellY + range; ++y)
+                CellStoreCollection::iterator iter = mActiveCells.begin();
+
+                while (iter!=mActiveCells.end())
                 {
-                    if (!isCellInCollection(x, y, collection))
-                    {
-                        refsToLoad += MWBase::Environment::get().getWorld()->getExterior(x, y)->count();
-                        cellsPositionsToLoad.emplace_back(x, y);
-                    }
+                    assert ((*iter)->getCell()->isExterior());
+
+                    if (x==(*iter)->getCell()->getGridX() &&
+                        y==(*iter)->getCell()->getGridY())
+                        break;
+
+                    ++iter;
+                }
+
+                if (iter==mActiveCells.end())
+                {
+                    refsToLoad += MWBase::Environment::get().getWorld()->getExterior(x, y)->count();
+                    cellsPositionsToLoad.emplace_back(x, y);
                 }
             }
-            return cellsPositionsToLoad;
-        };
-        auto cellsPositionsToLoad = cellsToLoad(mActiveCells,mHalfGridSize);
-        auto cellsPositionsToLoadInactive = cellsToLoad(mInactiveCells,mHalfGridSize+1);
+        }
 
         Loading::Listener* loadingListener = MWBase::Environment::get().getWindowManager()->getLoadingScreen();
         Loading::ScopedLoad load(loadingListener);
@@ -638,26 +584,30 @@ namespace MWWorld
                 return getCellPositionPriority(lhs) < getCellPositionPriority(rhs);
             });
 
-        std::sort(cellsPositionsToLoadInactive.begin(), cellsPositionsToLoadInactive.end(),
-            [&] (const std::pair<int, int>& lhs, const std::pair<int, int>& rhs) {
-                return getCellPositionPriority(lhs) < getCellPositionPriority(rhs);
-            });
-
         // Load cells
-        for (const auto& [x,y] : cellsPositionsToLoadInactive)
+        for (const auto& cellPosition : cellsPositionsToLoad)
         {
-            if (!isCellInCollection(x, y, mInactiveCells))
+            const auto x = cellPosition.first;
+            const auto y = cellPosition.second;
+
+            CellStoreCollection::iterator iter = mActiveCells.begin();
+
+            while (iter != mActiveCells.end())
             {
-                CellStore *cell = MWBase::Environment::get().getWorld()->getExterior(x, y);
-                loadInactiveCell (cell, loadingListener);
+                assert ((*iter)->getCell()->isExterior());
+
+                if (x == (*iter)->getCell()->getGridX() &&
+                    y == (*iter)->getCell()->getGridY())
+                    break;
+
+                ++iter;
             }
-        }
-        for (const auto& [x,y] : cellsPositionsToLoad)
-        {
-            if (!isCellInCollection(x, y, mActiveCells))
+
+            if (iter == mActiveCells.end())
             {
                 CellStore *cell = MWBase::Environment::get().getWorld()->getExterior(x, y);
-                activateCell (cell, loadingListener, changeEvent);
+
+                loadCell (cell, loadingListener, changeEvent);
             }
         }
 
@@ -690,8 +640,7 @@ namespace MWWorld
             CellStoreCollection::iterator iter = mActiveCells.begin();
 
             CellStore *cell = MWBase::Environment::get().getWorld()->getExterior(it->mData.mX, it->mData.mY);
-            loadInactiveCell (cell, loadingListener, true);
-            activateCell (cell, loadingListener, false, true);
+            loadCell (cell, loadingListener, false, true);
 
             iter = mActiveCells.begin();
             while (iter != mActiveCells.end())
@@ -699,8 +648,7 @@ namespace MWWorld
                 if (it->isExterior() && it->mData.mX == (*iter)->getCell()->getGridX() &&
                     it->mData.mY == (*iter)->getCell()->getGridY())
                 {
-                    deactivateCell(*iter, true);
-                    unloadInactiveCell (*iter, true);
+                    unloadCell(iter, true);
                     break;
                 }
 
@@ -738,8 +686,7 @@ namespace MWWorld
             loadingListener->setLabel("Testing interior cells ("+std::to_string(i)+"/"+std::to_string(cells.getIntSize())+")...");
 
             CellStore *cell = MWBase::Environment::get().getWorld()->getInterior(it->mName);
-            loadInactiveCell (cell, loadingListener, true);
-            activateCell (cell, loadingListener, false, true);
+            loadCell (cell, loadingListener, false, true);
 
             CellStoreCollection::iterator iter = mActiveCells.begin();
             while (iter != mActiveCells.end())
@@ -748,8 +695,7 @@ namespace MWWorld
 
                 if (it->mName == (*iter)->getCell()->mName)
                 {
-                    deactivateCell(*iter, true);
-                    unloadInactiveCell (*iter, true);
+                    unloadCell(iter, true);
                     break;
                 }
 
@@ -872,21 +818,15 @@ namespace MWWorld
         Log(Debug::Info) << "Changing to interior";
 
         // unload
-        for (auto iter = mInactiveCells.begin(); iter!=mInactiveCells.end(); )
-        {
-            auto* cell = *iter++;
-            deactivateCell(cell);
-            unloadInactiveCell(cell);
-        }
-        assert(mActiveCells.empty());
-        assert(mInactiveCells.empty());
+        CellStoreCollection::iterator active = mActiveCells.begin();
+        while (active!=mActiveCells.end())
+            unloadCell (active++);
 
         loadingListener->setProgressRange(cell->count());
 
         // Load cell.
         mPagedRefs.clear();
-        loadInactiveCell (cell, loadingListener);
-        activateCell (cell, loadingListener, changeEvent);
+        loadCell (cell, loadingListener, changeEvent);
 
         changePlayerCell(cell, position, adjustPlayerPos);
 
@@ -934,26 +874,23 @@ namespace MWWorld
         mCellChanged = false;
     }
 
-    void Scene::insertCell (CellStore &cell, Loading::Listener* loadingListener, bool onlyStatics, bool test)
+    void Scene::insertCell (CellStore &cell, Loading::Listener* loadingListener, bool test)
     {
-        InsertVisitor insertVisitor (cell, *loadingListener, onlyStatics, test);
+        InsertVisitor insertVisitor (cell, *loadingListener, test);
         cell.forEach (insertVisitor);
-        insertVisitor.insert([&] (const MWWorld::Ptr& ptr) { addObject(ptr, *mPhysics, mRendering, mPagedRefs, onlyStatics); });
-        if (!onlyStatics)
-        {
-            insertVisitor.insert([&] (const MWWorld::Ptr& ptr) { addObject(ptr, *mPhysics, mNavigator); });
+        insertVisitor.insert([&] (const MWWorld::Ptr& ptr) { addObject(ptr, *mPhysics, mRendering, mPagedRefs); });
+        insertVisitor.insert([&] (const MWWorld::Ptr& ptr) { addObject(ptr, *mPhysics, mNavigator); });
 
-            // do adjustPosition (snapping actors to ground) after objects are loaded, so we don't depend on the loading order
-            PositionVisitor posVisitor;
-            cell.forEach (posVisitor);
-        }
+        // do adjustPosition (snapping actors to ground) after objects are loaded, so we don't depend on the loading order
+        PositionVisitor posVisitor;
+        cell.forEach (posVisitor);
     }
 
     void Scene::addObjectToScene (const Ptr& ptr)
     {
         try
         {
-            addObject(ptr, *mPhysics, mRendering, mPagedRefs, false);
+            addObject(ptr, *mPhysics, mRendering, mPagedRefs);
             addObject(ptr, *mPhysics, mNavigator);
             MWBase::Environment::get().getWorld()->scaleObject(ptr, ptr.getCellRef().getScale());
             const auto navigator = MWBase::Environment::get().getWorld()->getNavigator();
diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp
index 33c7b78d09..a70d3ccdd5 100644
--- a/apps/openmw/mwworld/scene.hpp
+++ b/apps/openmw/mwworld/scene.hpp
@@ -65,13 +65,13 @@ namespace MWWorld
     class Scene
     {
         public:
-            using CellStoreCollection = std::set<CellStore *>;
+
+            typedef std::set<CellStore *> CellStoreCollection;
 
         private:
 
             CellStore* mCurrentCell; // the cell the player is in
             CellStoreCollection mActiveCells;
-            CellStoreCollection mInactiveCells;
             bool mCellChanged;
             MWPhysics::PhysicsSystem *mPhysics;
             MWRender::RenderingManager& mRendering;
@@ -92,7 +92,7 @@ namespace MWWorld
 
             std::set<ESM::RefNum> mPagedRefs;
 
-            void insertCell (CellStore &cell, Loading::Listener* loadingListener, bool onlyStatics, bool test = false);
+            void insertCell (CellStore &cell, Loading::Listener* loadingListener, bool test = false);
             osg::Vec2i mCurrentGridCenter;
 
             // Load and unload cells as necessary to create a cell grid with "X" and "Y" in the center
@@ -108,11 +108,6 @@ namespace MWWorld
             osg::Vec4i gridCenterToBounds(const osg::Vec2i &centerCell) const;
             osg::Vec2i getNewGridCenter(const osg::Vec3f &pos, const osg::Vec2i *currentGridCenter = nullptr) const;
 
-            void unloadInactiveCell (CellStore* cell, bool test = false);
-            void deactivateCell (CellStore* cell, bool test = false);
-            void activateCell (CellStore *cell, Loading::Listener* loadingListener, bool respawn, bool test = false);
-            void loadInactiveCell (CellStore *cell, Loading::Listener* loadingListener, bool test = false);
-
         public:
 
             Scene (MWRender::RenderingManager& rendering, MWPhysics::PhysicsSystem *physics,
@@ -124,6 +119,10 @@ namespace MWWorld
             void preloadTerrain(const osg::Vec3f& pos, bool sync=false);
             void reloadTerrain();
 
+            void unloadCell (CellStoreCollection::iterator iter, bool test = false);
+
+            void loadCell (CellStore *cell, Loading::Listener* loadingListener, bool respawn, bool test = false);
+
             void playerMoved (const osg::Vec3f& pos);
 
             void changePlayerCell (CellStore* newCell, const ESM::Position& position, bool adjustPlayerPos);

From 7b727e4d70df35560fe08da8a0ba839e8d6790de Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Fri, 29 Jan 2021 16:51:13 +0400
Subject: [PATCH 0303/2859] Revert "Remove physics dependency on basenode"

This reverts commit 165c7314928dc281a364fa1a0143c45fd6d2adfd.
---
 apps/openmw/mwclass/activator.cpp       |  4 +--
 apps/openmw/mwclass/activator.hpp       |  2 +-
 apps/openmw/mwclass/actor.cpp           |  6 ++++-
 apps/openmw/mwclass/actor.hpp           | 10 +++----
 apps/openmw/mwclass/apparatus.cpp       |  5 ++++
 apps/openmw/mwclass/apparatus.hpp       |  2 ++
 apps/openmw/mwclass/armor.cpp           |  5 ++++
 apps/openmw/mwclass/armor.hpp           |  2 ++
 apps/openmw/mwclass/bodypart.cpp        |  4 +++
 apps/openmw/mwclass/bodypart.hpp        |  2 ++
 apps/openmw/mwclass/book.cpp            |  5 ++++
 apps/openmw/mwclass/book.hpp            |  2 ++
 apps/openmw/mwclass/clothing.cpp        |  5 ++++
 apps/openmw/mwclass/clothing.hpp        |  2 ++
 apps/openmw/mwclass/container.cpp       |  4 +--
 apps/openmw/mwclass/container.hpp       |  2 +-
 apps/openmw/mwclass/door.cpp            |  4 +--
 apps/openmw/mwclass/door.hpp            |  2 +-
 apps/openmw/mwclass/ingredient.cpp      |  5 ++++
 apps/openmw/mwclass/ingredient.hpp      |  2 ++
 apps/openmw/mwclass/light.cpp           |  4 +--
 apps/openmw/mwclass/light.hpp           |  2 +-
 apps/openmw/mwclass/lockpick.cpp        |  5 ++++
 apps/openmw/mwclass/lockpick.hpp        |  2 ++
 apps/openmw/mwclass/misc.cpp            |  5 ++++
 apps/openmw/mwclass/misc.hpp            |  2 ++
 apps/openmw/mwclass/potion.cpp          |  5 ++++
 apps/openmw/mwclass/potion.hpp          |  2 ++
 apps/openmw/mwclass/probe.cpp           |  5 ++++
 apps/openmw/mwclass/probe.hpp           |  2 ++
 apps/openmw/mwclass/repair.cpp          |  5 ++++
 apps/openmw/mwclass/repair.hpp          |  2 ++
 apps/openmw/mwclass/static.cpp          |  4 +--
 apps/openmw/mwclass/static.hpp          |  2 +-
 apps/openmw/mwclass/weapon.cpp          |  5 ++++
 apps/openmw/mwclass/weapon.hpp          |  2 ++
 apps/openmw/mwphysics/actor.cpp         |  6 ++---
 apps/openmw/mwphysics/actor.hpp         |  2 +-
 apps/openmw/mwphysics/object.cpp        | 11 +++-----
 apps/openmw/mwphysics/object.hpp        |  4 +--
 apps/openmw/mwphysics/physicssystem.cpp | 10 +++----
 apps/openmw/mwphysics/physicssystem.hpp |  4 +--
 apps/openmw/mwworld/class.cpp           |  6 ++++-
 apps/openmw/mwworld/class.hpp           | 13 ++++-----
 apps/openmw/mwworld/scene.cpp           | 36 ++++++++++++-------------
 apps/openmw/mwworld/worldimp.cpp        |  2 +-
 46 files changed, 155 insertions(+), 68 deletions(-)

diff --git a/apps/openmw/mwclass/activator.cpp b/apps/openmw/mwclass/activator.cpp
index 716e548e1d..c54b1c3691 100644
--- a/apps/openmw/mwclass/activator.cpp
+++ b/apps/openmw/mwclass/activator.cpp
@@ -38,10 +38,10 @@ namespace MWClass
         }
     }
 
-    void Activator::insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics) const
+    void Activator::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
     {
         if(!model.empty())
-            physics.addObject(ptr, model, rotation);
+            physics.addObject(ptr, model);
     }
 
     std::string Activator::getModel(const MWWorld::ConstPtr &ptr) const
diff --git a/apps/openmw/mwclass/activator.hpp b/apps/openmw/mwclass/activator.hpp
index c7b65ef679..10ace6f74d 100644
--- a/apps/openmw/mwclass/activator.hpp
+++ b/apps/openmw/mwclass/activator.hpp
@@ -17,7 +17,7 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics) const override;
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
 
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
diff --git a/apps/openmw/mwclass/actor.cpp b/apps/openmw/mwclass/actor.cpp
index 1789f1b19a..33aeb26bb0 100644
--- a/apps/openmw/mwclass/actor.cpp
+++ b/apps/openmw/mwclass/actor.cpp
@@ -17,12 +17,16 @@
 
 namespace MWClass
 {
+    Actor::Actor() {}
+
+    Actor::~Actor() {}
+
     void Actor::adjustPosition(const MWWorld::Ptr& ptr, bool force) const
     {
         MWBase::Environment::get().getWorld()->adjustPosition(ptr, force);
     }
 
-    void Actor::insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics) const
+    void Actor::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
     {
         if (!model.empty())
         {
diff --git a/apps/openmw/mwclass/actor.hpp b/apps/openmw/mwclass/actor.hpp
index 98998b4eb2..3d509b2768 100644
--- a/apps/openmw/mwclass/actor.hpp
+++ b/apps/openmw/mwclass/actor.hpp
@@ -15,16 +15,16 @@ namespace MWClass
     {
     protected:
 
-        Actor() = default;
+        Actor();
 
     public:
-         ~Actor() override = default;
+        virtual ~Actor();
 
         void adjustPosition(const MWWorld::Ptr& ptr, bool force) const override;
         ///< Adjust position to stand on ground. Must be called post model load
         /// @param force do this even if the ptr is flying
 
-        void insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics) const override;
+        void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
 
         bool useAnim() const override;
 
@@ -46,8 +46,8 @@ namespace MWClass
         float getCurrentSpeed(const MWWorld::Ptr& ptr) const override;
         
         // not implemented
-        Actor(const Actor&) = delete;
-        Actor& operator= (const Actor&) = delete;
+        Actor(const Actor&);
+        Actor& operator= (const Actor&);
     };
 }
 
diff --git a/apps/openmw/mwclass/apparatus.cpp b/apps/openmw/mwclass/apparatus.cpp
index e09e4804ce..518695fabf 100644
--- a/apps/openmw/mwclass/apparatus.cpp
+++ b/apps/openmw/mwclass/apparatus.cpp
@@ -26,6 +26,11 @@ namespace MWClass
         }
     }
 
+    void Apparatus::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
+    {
+        // TODO: add option somewhere to enable collision for placeable objects
+    }
+
     std::string Apparatus::getModel(const MWWorld::ConstPtr &ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Apparatus> *ref = ptr.get<ESM::Apparatus>();
diff --git a/apps/openmw/mwclass/apparatus.hpp b/apps/openmw/mwclass/apparatus.hpp
index 828abef25e..8087c57ba3 100644
--- a/apps/openmw/mwclass/apparatus.hpp
+++ b/apps/openmw/mwclass/apparatus.hpp
@@ -17,6 +17,8 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
+
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index 817adbc1f5..3f9bfb859f 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -34,6 +34,11 @@ namespace MWClass
         }
     }
 
+    void Armor::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
+    {
+        // TODO: add option somewhere to enable collision for placeable objects
+    }
+
     std::string Armor::getModel(const MWWorld::ConstPtr &ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Armor> *ref = ptr.get<ESM::Armor>();
diff --git a/apps/openmw/mwclass/armor.hpp b/apps/openmw/mwclass/armor.hpp
index f64f138a29..4f04e0824b 100644
--- a/apps/openmw/mwclass/armor.hpp
+++ b/apps/openmw/mwclass/armor.hpp
@@ -16,6 +16,8 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
+
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwclass/bodypart.cpp b/apps/openmw/mwclass/bodypart.cpp
index 7fe798e27d..0315d3ddb0 100644
--- a/apps/openmw/mwclass/bodypart.cpp
+++ b/apps/openmw/mwclass/bodypart.cpp
@@ -22,6 +22,10 @@ namespace MWClass
         }
     }
 
+    void BodyPart::insertObject(const MWWorld::Ptr &ptr, const std::string &model, MWPhysics::PhysicsSystem &physics) const
+    {
+    }
+
     std::string BodyPart::getName(const MWWorld::ConstPtr &ptr) const
     {
         return std::string();
diff --git a/apps/openmw/mwclass/bodypart.hpp b/apps/openmw/mwclass/bodypart.hpp
index 0e372b884a..13d9141386 100644
--- a/apps/openmw/mwclass/bodypart.hpp
+++ b/apps/openmw/mwclass/bodypart.hpp
@@ -15,6 +15,8 @@ namespace MWClass
         void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
         ///< Add reference into a cell for rendering
 
+        void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
+
         std::string getName (const MWWorld::ConstPtr& ptr) const override;
         ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwclass/book.cpp b/apps/openmw/mwclass/book.cpp
index 51b9e39d7a..4ea71e3ac2 100644
--- a/apps/openmw/mwclass/book.cpp
+++ b/apps/openmw/mwclass/book.cpp
@@ -31,6 +31,11 @@ namespace MWClass
         }
     }
 
+    void Book::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
+    {
+        // TODO: add option somewhere to enable collision for placeable objects
+    }
+
     std::string Book::getModel(const MWWorld::ConstPtr &ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Book> *ref = ptr.get<ESM::Book>();
diff --git a/apps/openmw/mwclass/book.hpp b/apps/openmw/mwclass/book.hpp
index f3d34c5168..c58e68ad87 100644
--- a/apps/openmw/mwclass/book.hpp
+++ b/apps/openmw/mwclass/book.hpp
@@ -14,6 +14,8 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
+
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index 400cd97e41..6d7960aac2 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -29,6 +29,11 @@ namespace MWClass
         }
     }
 
+    void Clothing::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
+    {
+        // TODO: add option somewhere to enable collision for placeable objects
+    }
+
     std::string Clothing::getModel(const MWWorld::ConstPtr &ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Clothing> *ref = ptr.get<ESM::Clothing>();
diff --git a/apps/openmw/mwclass/clothing.hpp b/apps/openmw/mwclass/clothing.hpp
index 3d5c162aa4..a87e0cbe00 100644
--- a/apps/openmw/mwclass/clothing.hpp
+++ b/apps/openmw/mwclass/clothing.hpp
@@ -14,6 +14,8 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
+
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index 3023466f08..28305c394e 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -111,10 +111,10 @@ namespace MWClass
         }
     }
 
-    void Container::insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics) const
+    void Container::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
     {
         if(!model.empty())
-            physics.addObject(ptr, model, rotation);
+            physics.addObject(ptr, model);
     }
 
     std::string Container::getModel(const MWWorld::ConstPtr &ptr) const
diff --git a/apps/openmw/mwclass/container.hpp b/apps/openmw/mwclass/container.hpp
index 74d9ac0da2..2dc0c06cae 100644
--- a/apps/openmw/mwclass/container.hpp
+++ b/apps/openmw/mwclass/container.hpp
@@ -44,7 +44,7 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics) const override;
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
 
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index 983953c20d..ba51d9c2bc 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -62,10 +62,10 @@ namespace MWClass
         }
     }
 
-    void Door::insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics) const
+    void Door::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
     {
         if(!model.empty())
-            physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_Door);
+            physics.addObject(ptr, model, MWPhysics::CollisionType_Door);
 
         // Resume the door's opening/closing animation if it wasn't finished
         if (ptr.getRefData().getCustomData())
diff --git a/apps/openmw/mwclass/door.hpp b/apps/openmw/mwclass/door.hpp
index 6d40a840b1..6c2fa26b80 100644
--- a/apps/openmw/mwclass/door.hpp
+++ b/apps/openmw/mwclass/door.hpp
@@ -18,7 +18,7 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics) const override;
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
 
             bool isDoor() const override;
 
diff --git a/apps/openmw/mwclass/ingredient.cpp b/apps/openmw/mwclass/ingredient.cpp
index 20f9576dff..a007ad115f 100644
--- a/apps/openmw/mwclass/ingredient.cpp
+++ b/apps/openmw/mwclass/ingredient.cpp
@@ -28,6 +28,11 @@ namespace MWClass
         }
     }
 
+    void Ingredient::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
+    {
+        // TODO: add option somewhere to enable collision for placeable objects
+    }
+
     std::string Ingredient::getModel(const MWWorld::ConstPtr &ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Ingredient> *ref = ptr.get<ESM::Ingredient>();
diff --git a/apps/openmw/mwclass/ingredient.hpp b/apps/openmw/mwclass/ingredient.hpp
index 2aa831f868..5219cf39ce 100644
--- a/apps/openmw/mwclass/ingredient.hpp
+++ b/apps/openmw/mwclass/ingredient.hpp
@@ -14,6 +14,8 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
+
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index d4d196bc4b..3bdf10f475 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -33,7 +33,7 @@ namespace MWClass
         renderingInterface.getObjects().insertModel(ptr, model, true, !(ref->mBase->mData.mFlags & ESM::Light::OffDefault));
     }
 
-    void Light::insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics) const
+    void Light::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
     {
         MWWorld::LiveCellRef<ESM::Light> *ref =
             ptr.get<ESM::Light>();
@@ -41,7 +41,7 @@ namespace MWClass
 
         // TODO: add option somewhere to enable collision for placeable objects
         if (!model.empty() && (ref->mBase->mData.mFlags & ESM::Light::Carry) == 0)
-            physics.addObject(ptr, model, rotation);
+            physics.addObject(ptr, model);
 
         if (!ref->mBase->mSound.empty() && !(ref->mBase->mData.mFlags & ESM::Light::OffDefault))
             MWBase::Environment::get().getSoundManager()->playSound3D(ptr, ref->mBase->mSound, 1.0, 1.0,
diff --git a/apps/openmw/mwclass/light.hpp b/apps/openmw/mwclass/light.hpp
index 1b1794d4a7..e37dddc250 100644
--- a/apps/openmw/mwclass/light.hpp
+++ b/apps/openmw/mwclass/light.hpp
@@ -14,7 +14,7 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics) const override;
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
 
             bool useAnim() const override;
 
diff --git a/apps/openmw/mwclass/lockpick.cpp b/apps/openmw/mwclass/lockpick.cpp
index 985b087711..9b8abc8f23 100644
--- a/apps/openmw/mwclass/lockpick.cpp
+++ b/apps/openmw/mwclass/lockpick.cpp
@@ -28,6 +28,11 @@ namespace MWClass
         }
     }
 
+    void Lockpick::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
+    {
+        // TODO: add option somewhere to enable collision for placeable objects
+    }
+
     std::string Lockpick::getModel(const MWWorld::ConstPtr &ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Lockpick> *ref = ptr.get<ESM::Lockpick>();
diff --git a/apps/openmw/mwclass/lockpick.hpp b/apps/openmw/mwclass/lockpick.hpp
index d4b265e397..fabae33435 100644
--- a/apps/openmw/mwclass/lockpick.hpp
+++ b/apps/openmw/mwclass/lockpick.hpp
@@ -14,6 +14,8 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
+
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwclass/misc.cpp b/apps/openmw/mwclass/misc.cpp
index facab9d51c..8d3cda6fe5 100644
--- a/apps/openmw/mwclass/misc.cpp
+++ b/apps/openmw/mwclass/misc.cpp
@@ -37,6 +37,11 @@ namespace MWClass
         }
     }
 
+    void Miscellaneous::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
+    {
+        // TODO: add option somewhere to enable collision for placeable objects
+    }
+
     std::string Miscellaneous::getModel(const MWWorld::ConstPtr &ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Miscellaneous> *ref = ptr.get<ESM::Miscellaneous>();
diff --git a/apps/openmw/mwclass/misc.hpp b/apps/openmw/mwclass/misc.hpp
index 18788c7ed8..9bff85ca56 100644
--- a/apps/openmw/mwclass/misc.hpp
+++ b/apps/openmw/mwclass/misc.hpp
@@ -14,6 +14,8 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
+
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwclass/potion.cpp b/apps/openmw/mwclass/potion.cpp
index 56d9dff279..4af97e6345 100644
--- a/apps/openmw/mwclass/potion.cpp
+++ b/apps/openmw/mwclass/potion.cpp
@@ -30,6 +30,11 @@ namespace MWClass
         }
     }
 
+    void Potion::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
+    {
+        // TODO: add option somewhere to enable collision for placeable objects
+    }
+
     std::string Potion::getModel(const MWWorld::ConstPtr &ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Potion> *ref = ptr.get<ESM::Potion>();
diff --git a/apps/openmw/mwclass/potion.hpp b/apps/openmw/mwclass/potion.hpp
index 75b962164b..75d923f0ba 100644
--- a/apps/openmw/mwclass/potion.hpp
+++ b/apps/openmw/mwclass/potion.hpp
@@ -14,6 +14,8 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
+
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwclass/probe.cpp b/apps/openmw/mwclass/probe.cpp
index 51273337a6..dba4e8c063 100644
--- a/apps/openmw/mwclass/probe.cpp
+++ b/apps/openmw/mwclass/probe.cpp
@@ -28,6 +28,11 @@ namespace MWClass
         }
     }
 
+    void Probe::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
+    {
+        // TODO: add option somewhere to enable collision for placeable objects
+    }
+
     std::string Probe::getModel(const MWWorld::ConstPtr &ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Probe> *ref = ptr.get<ESM::Probe>();
diff --git a/apps/openmw/mwclass/probe.hpp b/apps/openmw/mwclass/probe.hpp
index ef9273a379..a0a41dcfb6 100644
--- a/apps/openmw/mwclass/probe.hpp
+++ b/apps/openmw/mwclass/probe.hpp
@@ -14,6 +14,8 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
+
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwclass/repair.cpp b/apps/openmw/mwclass/repair.cpp
index f1b88e422b..8907c8212e 100644
--- a/apps/openmw/mwclass/repair.cpp
+++ b/apps/openmw/mwclass/repair.cpp
@@ -25,6 +25,11 @@ namespace MWClass
         }
     }
 
+    void Repair::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
+    {
+        // TODO: add option somewhere to enable collision for placeable objects
+    }
+
     std::string Repair::getModel(const MWWorld::ConstPtr &ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Repair> *ref = ptr.get<ESM::Repair>();
diff --git a/apps/openmw/mwclass/repair.hpp b/apps/openmw/mwclass/repair.hpp
index c403449e18..b9791e9cf4 100644
--- a/apps/openmw/mwclass/repair.hpp
+++ b/apps/openmw/mwclass/repair.hpp
@@ -14,6 +14,8 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
+
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwclass/static.cpp b/apps/openmw/mwclass/static.cpp
index 108c4eaa20..5551b3d731 100644
--- a/apps/openmw/mwclass/static.cpp
+++ b/apps/openmw/mwclass/static.cpp
@@ -23,10 +23,10 @@ namespace MWClass
         }
     }
 
-    void Static::insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics) const
+    void Static::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
     {
         if(!model.empty())
-            physics.addObject(ptr, model, rotation);
+            physics.addObject(ptr, model);
     }
 
     std::string Static::getModel(const MWWorld::ConstPtr &ptr) const
diff --git a/apps/openmw/mwclass/static.hpp b/apps/openmw/mwclass/static.hpp
index f856e9fd94..6bc783dad0 100644
--- a/apps/openmw/mwclass/static.hpp
+++ b/apps/openmw/mwclass/static.hpp
@@ -14,7 +14,7 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics) const override;
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
 
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index 6246c8fb09..0d6a27cf60 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -34,6 +34,11 @@ namespace MWClass
         }
     }
 
+    void Weapon::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
+    {
+        // TODO: add option somewhere to enable collision for placeable objects
+    }
+
     std::string Weapon::getModel(const MWWorld::ConstPtr &ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Weapon> *ref = ptr.get<ESM::Weapon>();
diff --git a/apps/openmw/mwclass/weapon.hpp b/apps/openmw/mwclass/weapon.hpp
index db17e6b70f..f1824b7d14 100644
--- a/apps/openmw/mwclass/weapon.hpp
+++ b/apps/openmw/mwclass/weapon.hpp
@@ -15,6 +15,8 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
+
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index 06600fd6ac..3b52ee934f 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -67,7 +67,7 @@ Actor::Actor(const MWWorld::Ptr& ptr, const Resource::BulletShape* shape, Physic
     updateScale();
 
     if(!mRotationallyInvariant)
-        setRotation(mPtr.getRefData().getBaseNode()->getAttitude());
+        updateRotation();
 
     updatePosition();
     addCollisionMask(getCollisionMask());
@@ -197,10 +197,10 @@ osg::Vec3f Actor::getPreviousPosition() const
     return mPreviousPosition;
 }
 
-void Actor::setRotation(osg::Quat quat)
+void Actor::updateRotation ()
 {
     std::scoped_lock lock(mPositionMutex);
-    mRotation = quat;
+    mRotation = mPtr.getRefData().getBaseNode()->getAttitude();
 }
 
 bool Actor::isRotationallyInvariant() const
diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index 4039f44811..9d129f2ba6 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -49,7 +49,7 @@ namespace MWPhysics
         void enableCollisionBody(bool collision);
 
         void updateScale();
-        void setRotation(osg::Quat quat);
+        void updateRotation();
 
         /**
          * Return true if the collision shape looks the same no matter how its Z rotated.
diff --git a/apps/openmw/mwphysics/object.cpp b/apps/openmw/mwphysics/object.cpp
index 0a7b9540c5..e3615989dd 100644
--- a/apps/openmw/mwphysics/object.cpp
+++ b/apps/openmw/mwphysics/object.cpp
@@ -14,7 +14,7 @@
 
 namespace MWPhysics
 {
-    Object::Object(const MWWorld::Ptr& ptr, osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance, osg::Quat rotation, int collisionType, PhysicsTaskScheduler* scheduler)
+    Object::Object(const MWWorld::Ptr& ptr, osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance, int collisionType, PhysicsTaskScheduler* scheduler)
         : mShapeInstance(shapeInstance)
         , mSolid(true)
         , mTaskScheduler(scheduler)
@@ -27,7 +27,7 @@ namespace MWPhysics
         mCollisionObject->setUserPointer(this);
 
         setScale(ptr.getCellRef().getScale());
-        setRotation(rotation);
+        setRotation(Misc::Convert::toBullet(ptr.getRefData().getBaseNode()->getAttitude()));
         setOrigin(Misc::Convert::toBullet(ptr.getRefData().getPosition().asVec3()));
         commitPositionChange();
 
@@ -51,10 +51,10 @@ namespace MWPhysics
         mScaleUpdatePending = true;
     }
 
-    void Object::setRotation(osg::Quat quat)
+    void Object::setRotation(const btQuaternion& quat)
     {
         std::unique_lock<std::mutex> lock(mPositionMutex);
-        mLocalTransform.setRotation(Misc::Convert::toBullet(quat));
+        mLocalTransform.setRotation(quat);
         mTransformUpdatePending = true;
     }
 
@@ -116,9 +116,6 @@ namespace MWPhysics
         if (mShapeInstance->mAnimatedShapes.empty())
             return false;
 
-        if (mPtr.getRefData().getBaseNode() == nullptr)
-            return true;
-
         assert (mShapeInstance->getCollisionShape()->isCompound());
 
         btCompoundShape* compound = static_cast<btCompoundShape*>(mShapeInstance->getCollisionShape());
diff --git a/apps/openmw/mwphysics/object.hpp b/apps/openmw/mwphysics/object.hpp
index c2273831e5..cae8771809 100644
--- a/apps/openmw/mwphysics/object.hpp
+++ b/apps/openmw/mwphysics/object.hpp
@@ -26,12 +26,12 @@ namespace MWPhysics
     class Object final : public PtrHolder
     {
     public:
-        Object(const MWWorld::Ptr& ptr, osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance, osg::Quat rotation, int collisionType, PhysicsTaskScheduler* scheduler);
+        Object(const MWWorld::Ptr& ptr, osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance, int collisionType, PhysicsTaskScheduler* scheduler);
         ~Object() override;
 
         const Resource::BulletShapeInstance* getShapeInstance() const;
         void setScale(float scale);
-        void setRotation(osg::Quat quat);
+        void setRotation(const btQuaternion& quat);
         void setOrigin(const btVector3& vec);
         void commitPositionChange();
         btCollisionObject* getCollisionObject();
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 68cec48bcb..ed0e0c915d 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -456,13 +456,13 @@ namespace MWPhysics
         return heightField->second.get();
     }
 
-    void PhysicsSystem::addObject (const MWWorld::Ptr& ptr, const std::string& mesh, osg::Quat rotation, int collisionType)
+    void PhysicsSystem::addObject (const MWWorld::Ptr& ptr, const std::string& mesh, int collisionType)
     {
         osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance = mShapeManager->getInstance(mesh);
         if (!shapeInstance || !shapeInstance->getCollisionShape())
             return;
 
-        auto obj = std::make_shared<Object>(ptr, shapeInstance, rotation, collisionType, mTaskScheduler.get());
+        auto obj = std::make_shared<Object>(ptr, shapeInstance, collisionType, mTaskScheduler.get());
         mObjects.emplace(ptr, obj);
 
         if (obj->isAnimated())
@@ -621,12 +621,12 @@ namespace MWPhysics
         mTaskScheduler->updateSingleAabb(foundProjectile->second);
     }
 
-    void PhysicsSystem::updateRotation(const MWWorld::Ptr &ptr, osg::Quat rotate)
+    void PhysicsSystem::updateRotation(const MWWorld::Ptr &ptr)
     {
         ObjectMap::iterator found = mObjects.find(ptr);
         if (found != mObjects.end())
         {
-            found->second->setRotation(rotate);
+            found->second->setRotation(Misc::Convert::toBullet(ptr.getRefData().getBaseNode()->getAttitude()));
             mTaskScheduler->updateSingleAabb(found->second);
             return;
         }
@@ -635,7 +635,7 @@ namespace MWPhysics
         {
             if (!foundActor->second->isRotationallyInvariant())
             {
-                foundActor->second->setRotation(rotate);
+                foundActor->second->updateRotation();
                 mTaskScheduler->updateSingleAabb(foundActor->second);
             }
             return;
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index c61b368f8e..6f901067a2 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -121,7 +121,7 @@ namespace MWPhysics
             void setWaterHeight(float height);
             void disableWater();
 
-            void addObject (const MWWorld::Ptr& ptr, const std::string& mesh, osg::Quat rotation, int collisionType = CollisionType_World);
+            void addObject (const MWWorld::Ptr& ptr, const std::string& mesh, int collisionType = CollisionType_World);
             void addActor (const MWWorld::Ptr& ptr, const std::string& mesh);
 
             int addProjectile(const MWWorld::Ptr& caster, const osg::Vec3f& position, float radius, bool canTraverseWater);
@@ -141,7 +141,7 @@ namespace MWPhysics
             void remove (const MWWorld::Ptr& ptr);
 
             void updateScale (const MWWorld::Ptr& ptr);
-            void updateRotation (const MWWorld::Ptr& ptr, osg::Quat rotate);
+            void updateRotation (const MWWorld::Ptr& ptr);
             void updatePosition (const MWWorld::Ptr& ptr);
 
             void addHeightField (const float* heights, int x, int y, float triSize, float sqrtVerts, float minH, float maxH, const osg::Object* holdObject);
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index becf912eaa..950c8a6d49 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -25,12 +25,16 @@ namespace MWWorld
 {
     std::map<std::string, std::shared_ptr<Class> > Class::sClasses;
 
+    Class::Class() {}
+
+    Class::~Class() {}
+
     void Class::insertObjectRendering (const Ptr& ptr, const std::string& mesh, MWRender::RenderingInterface& renderingInterface) const
     {
 
     }
 
-    void Class::insertObject(const Ptr& ptr, const std::string& mesh, osg::Quat rotation, MWPhysics::PhysicsSystem& physics) const
+    void Class::insertObject(const Ptr& ptr, const std::string& mesh, MWPhysics::PhysicsSystem& physics) const
     {
 
     }
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index 39fb6fe4c5..1b3d4029e4 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -6,7 +6,6 @@
 #include <string>
 #include <vector>
 
-#include <osg/Quat>
 #include <osg/Vec4f>
 
 #include "ptr.hpp"
@@ -58,9 +57,13 @@ namespace MWWorld
 
             std::string mTypeName;
 
+            // not implemented
+            Class (const Class&);
+            Class& operator= (const Class&);
+
         protected:
 
-            Class() = default;
+            Class();
 
             std::shared_ptr<Action> defaultItemActivate(const Ptr &ptr, const Ptr &actor) const;
             ///< Generate default action for activating inventory items
@@ -69,16 +72,14 @@ namespace MWWorld
 
         public:
 
-            virtual ~Class() = default;
-            Class (const Class&) = delete;
-            Class& operator= (const Class&) = delete;
+            virtual ~Class();
 
             const std::string& getTypeName() const {
                 return mTypeName;
             }
 
             virtual void insertObjectRendering (const Ptr& ptr, const std::string& mesh, MWRender::RenderingInterface& renderingInterface) const;
-            virtual void insertObject(const Ptr& ptr, const std::string& mesh, osg::Quat rotation, MWPhysics::PhysicsSystem& physics) const;
+            virtual void insertObject(const Ptr& ptr, const std::string& mesh, MWPhysics::PhysicsSystem& physics) const;
             ///< Add reference into a cell for rendering (default implementation: don't render anything).
 
             virtual std::string getName (const ConstPtr& ptr) const = 0;
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 313e9a1527..427ee3aa8b 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -75,20 +75,18 @@ namespace
             * osg::Quat(xr, osg::Vec3(-1, 0, 0));
     }
 
-    osg::Quat makeNodeRotation(const MWWorld::Ptr& ptr, RotationOrder order)
+    void setNodeRotation(const MWWorld::Ptr& ptr, MWRender::RenderingManager& rendering, RotationOrder order)
     {
-        const auto pos = ptr.getRefData().getPosition();
-
-        const auto rot = ptr.getClass().isActor() ? makeActorOsgQuat(pos)
-            : (order == RotationOrder::inverse ? makeInversedOrderObjectOsgQuat(pos) : makeObjectOsgQuat(pos));
-
-        return rot;
-    }
+        if (!ptr.getRefData().getBaseNode())
+            return;
 
-    void setNodeRotation(const MWWorld::Ptr& ptr, MWRender::RenderingManager& rendering, osg::Quat rotation)
-    {
-        if (ptr.getRefData().getBaseNode())
-            rendering.rotateObject(ptr, rotation);
+        rendering.rotateObject(ptr,
+            ptr.getClass().isActor()
+            ? makeActorOsgQuat(ptr.getRefData().getPosition())
+            : (order == RotationOrder::inverse
+                ? makeInversedOrderObjectOsgQuat(ptr.getRefData().getPosition())
+                : makeObjectOsgQuat(ptr.getRefData().getPosition()))
+        );
     }
 
     std::string getModel(const MWWorld::Ptr &ptr, const VFS::Manager *vfs)
@@ -119,10 +117,11 @@ namespace
         const ESM::RefNum& refnum = ptr.getCellRef().getRefNum();
         if (!refnum.hasContentFile() || pagedRefs.find(refnum) == pagedRefs.end())
             ptr.getClass().insertObjectRendering(ptr, model, rendering);
+        else
+            ptr.getRefData().setBaseNode(new SceneUtil::PositionAttitudeTransform); // FIXME remove this when physics code is fixed not to depend on basenode
+        setNodeRotation(ptr, rendering, RotationOrder::direct);
 
-        const auto rotation = makeNodeRotation(ptr, RotationOrder::direct);
-        setNodeRotation(ptr, rendering, rotation);
-        ptr.getClass().insertObject (ptr, model, rotation, physics);
+        ptr.getClass().insertObject (ptr, model, physics);
 
         if (useAnim)
             MWBase::Environment::get().getMechanicsManager()->add(ptr);
@@ -277,7 +276,7 @@ namespace MWWorld
         {
             if (!ptr.getRefData().getBaseNode()) return;
             ptr.getClass().insertObjectRendering(ptr, getModel(ptr, mRendering.getResourceSystem()->getVFS()), mRendering);
-            setNodeRotation(ptr, mRendering, makeNodeRotation(ptr, RotationOrder::direct));
+            setNodeRotation(ptr, mRendering, RotationOrder::direct);
             reloadTerrain();
         }
     }
@@ -293,9 +292,8 @@ namespace MWWorld
 
     void Scene::updateObjectRotation(const Ptr &ptr, RotationOrder order)
     {
-        const auto rot = makeNodeRotation(ptr, order);
-        setNodeRotation(ptr, mRendering, rot);
-        mPhysics->updateRotation(ptr, rot);
+        setNodeRotation(ptr, mRendering, order);
+        mPhysics->updateRotation(ptr);
     }
 
     void Scene::updateObjectScale(const Ptr &ptr)
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index ef00315cbb..442672d2bf 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1420,7 +1420,7 @@ namespace MWWorld
             mWorldScene->removeFromPagedRefs(ptr);
 
             mRendering->rotateObject(ptr, rotate);
-            mPhysics->updateRotation(ptr, rotate);
+            mPhysics->updateRotation(ptr);
 
             if (const auto object = mPhysics->getObject(ptr))
                 updateNavigatorObject(object);

From 642ca02e3501f0d6691642b6d9476af0745d424e Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Fri, 29 Jan 2021 21:07:24 +0100
Subject: [PATCH 0304/2859] Shorten almost straight paths only if smooth
 movement is enabled; reduce angle limit for the shortening.

---
 apps/openmw/mwmechanics/aipackage.cpp   |  4 ++--
 apps/openmw/mwmechanics/pathfinding.cpp | 21 ++++++++++++---------
 apps/openmw/mwmechanics/pathfinding.hpp |  2 +-
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index ce5673909f..da1766f4d9 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -150,7 +150,8 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
             + 1.2 * std::max(halfExtents.x(), halfExtents.y());
     const float pointTolerance = std::max(MIN_TOLERANCE, actorTolerance);
 
-    mPathFinder.update(position, pointTolerance, DEFAULT_TOLERANCE);
+    static const bool smoothMovement = Settings::Manager::getBool("smooth movement", "Game");
+    mPathFinder.update(position, pointTolerance, DEFAULT_TOLERANCE, /*shortenIfAlmostStraight=*/smoothMovement);
 
     if (isDestReached || mPathFinder.checkPathCompleted()) // if path is finished
     {
@@ -180,7 +181,6 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
     const auto destination = mPathFinder.getPath().empty() ? dest : mPathFinder.getPath().front();
     mObstacleCheck.update(actor, destination, duration);
 
-    static const bool smoothMovement = Settings::Manager::getBool("smooth movement", "Game");
     if (smoothMovement)
     {
         const float smoothTurnReservedDist = 150;
diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp
index 276321b81a..cc28b7995e 100644
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@@ -97,12 +97,12 @@ namespace
         float dotProduct = v1.x() * v3.x() + v1.y() * v3.y();
         float crossProduct = v1.x() * v3.y() - v1.y() * v3.x();
 
-        // Check that the angle between v1 and v3 is less or equal than 10 degrees.
-        static const float cos170 = std::cos(osg::PI / 180 * 170);
-        bool checkAngle = dotProduct <= cos170 * v1.length() * v3.length();
+        // Check that the angle between v1 and v3 is less or equal than 5 degrees.
+        static const float cos175 = std::cos(osg::PI * (175.0 / 180));
+        bool checkAngle = dotProduct <= cos175 * v1.length() * v3.length();
 
         // Check that distance from p2 to the line (p1, p3) is less or equal than `pointTolerance`.
-        bool checkDist = std::abs(crossProduct) <= pointTolerance * (p3 - p1).length() * 2;
+        bool checkDist = std::abs(crossProduct) <= pointTolerance * (p3 - p1).length();
 
         return checkAngle && checkDist;
     }
@@ -296,7 +296,7 @@ namespace MWMechanics
         return getXAngleToDir(dir);
     }
 
-    void PathFinder::update(const osg::Vec3f& position, const float pointTolerance, const float destinationTolerance)
+    void PathFinder::update(const osg::Vec3f& position, float pointTolerance, float destinationTolerance, bool shortenIfAlmostStraight)
     {
         if (mPath.empty())
             return;
@@ -304,10 +304,13 @@ namespace MWMechanics
         while (mPath.size() > 1 && sqrDistanceIgnoreZ(mPath.front(), position) < pointTolerance * pointTolerance)
             mPath.pop_front();
 
-        while (mPath.size() > 2 && isAlmostStraight(mPath[0], mPath[1], mPath[2], pointTolerance))
-            mPath.erase(mPath.begin() + 1);
-        if (mPath.size() > 1 && isAlmostStraight(position, mPath[0], mPath[1], pointTolerance))
-            mPath.pop_front();
+        if (shortenIfAlmostStraight)
+        {
+            while (mPath.size() > 2 && isAlmostStraight(mPath[0], mPath[1], mPath[2], pointTolerance))
+                mPath.erase(mPath.begin() + 1);
+            if (mPath.size() > 1 && isAlmostStraight(position, mPath[0], mPath[1], pointTolerance))
+                mPath.pop_front();
+        }
 
         if (mPath.size() == 1 && sqrDistanceIgnoreZ(mPath.front(), position) < destinationTolerance * destinationTolerance)
             mPath.pop_front();
diff --git a/apps/openmw/mwmechanics/pathfinding.hpp b/apps/openmw/mwmechanics/pathfinding.hpp
index 5af822fee7..bd81bbfe1f 100644
--- a/apps/openmw/mwmechanics/pathfinding.hpp
+++ b/apps/openmw/mwmechanics/pathfinding.hpp
@@ -102,7 +102,7 @@ namespace MWMechanics
                 const DetourNavigator::Flags flags, const DetourNavigator::AreaCosts& areaCosts);
 
             /// Remove front point if exist and within tolerance
-            void update(const osg::Vec3f& position, const float pointTolerance, const float destinationTolerance);
+            void update(const osg::Vec3f& position, float pointTolerance, float destinationTolerance, bool shortenIfAlmostStraight);
 
             bool checkPathCompleted() const
             {

From 9590377f224c49b62eb86ac6a8505ef023b50c9c Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Fri, 29 Jan 2021 21:27:22 +0100
Subject: [PATCH 0305/2859] Don't ignore Z in path finding if actor can move by
 Z.

---
 apps/openmw/mwmechanics/aipackage.cpp   |  5 +++--
 apps/openmw/mwmechanics/pathfinding.cpp | 15 ++++++++++++---
 apps/openmw/mwmechanics/pathfinding.hpp |  3 ++-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index da1766f4d9..99132b711a 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -96,6 +96,7 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
 
     const float distToTarget = distance(position, dest);
     const bool isDestReached = (distToTarget <= destTolerance);
+    const bool actorCanMoveByZ = canActorMoveByZAxis(actor);
 
     if (!isDestReached && mTimer > AI_REACTION_TIME)
     {
@@ -104,7 +105,6 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
 
         const bool wasShortcutting = mIsShortcutting;
         bool destInLOS = false;
-        const bool actorCanMoveByZ = canActorMoveByZAxis(actor);
 
         // Prohibit shortcuts for AiWander, if the actor can not move in 3 dimensions.
         mIsShortcutting = actorCanMoveByZ
@@ -151,7 +151,8 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
     const float pointTolerance = std::max(MIN_TOLERANCE, actorTolerance);
 
     static const bool smoothMovement = Settings::Manager::getBool("smooth movement", "Game");
-    mPathFinder.update(position, pointTolerance, DEFAULT_TOLERANCE, /*shortenIfAlmostStraight=*/smoothMovement);
+    mPathFinder.update(position, pointTolerance, DEFAULT_TOLERANCE,
+                       /*shortenIfAlmostStraight=*/smoothMovement, actorCanMoveByZ);
 
     if (isDestReached || mPathFinder.checkPathCompleted()) // if path is finished
     {
diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp
index cc28b7995e..93ae90547c 100644
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@@ -296,7 +296,8 @@ namespace MWMechanics
         return getXAngleToDir(dir);
     }
 
-    void PathFinder::update(const osg::Vec3f& position, float pointTolerance, float destinationTolerance, bool shortenIfAlmostStraight)
+    void PathFinder::update(const osg::Vec3f& position, float pointTolerance, float destinationTolerance,
+                            bool shortenIfAlmostStraight, bool canMoveByZ)
     {
         if (mPath.empty())
             return;
@@ -312,8 +313,16 @@ namespace MWMechanics
                 mPath.pop_front();
         }
 
-        if (mPath.size() == 1 && sqrDistanceIgnoreZ(mPath.front(), position) < destinationTolerance * destinationTolerance)
-            mPath.pop_front();
+        if (mPath.size() == 1)
+        {
+            float distSqr;
+            if (canMoveByZ)
+                distSqr = (mPath.front() - position).length2();
+            else
+                distSqr = sqrDistanceIgnoreZ(mPath.front(), position);
+            if (distSqr < destinationTolerance * destinationTolerance)
+                mPath.pop_front();
+        }
     }
 
     void PathFinder::buildStraightPath(const osg::Vec3f& endPoint)
diff --git a/apps/openmw/mwmechanics/pathfinding.hpp b/apps/openmw/mwmechanics/pathfinding.hpp
index bd81bbfe1f..b5c376b8ca 100644
--- a/apps/openmw/mwmechanics/pathfinding.hpp
+++ b/apps/openmw/mwmechanics/pathfinding.hpp
@@ -102,7 +102,8 @@ namespace MWMechanics
                 const DetourNavigator::Flags flags, const DetourNavigator::AreaCosts& areaCosts);
 
             /// Remove front point if exist and within tolerance
-            void update(const osg::Vec3f& position, float pointTolerance, float destinationTolerance, bool shortenIfAlmostStraight);
+            void update(const osg::Vec3f& position, float pointTolerance, float destinationTolerance,
+                        bool shortenIfAlmostStraight, bool canMoveByZ);
 
             bool checkPathCompleted() const
             {

From 157b14cdaa07395a8e2cf17c0242d57d908d3ae1 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Fri, 29 Jan 2021 22:53:02 +0100
Subject: [PATCH 0306/2859] Fix #5821: NPCs from mods getting removed if mod
 order was changed

---
 CHANGELOG.md                      | 1 +
 apps/openmw/mwworld/cellstore.cpp | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f347fb46eb..aa74164d95 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -97,6 +97,7 @@
     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 #5821: NPCs from mods getting removed if mod order was changed
     Feature #390: 3rd person look "over the shoulder"
     Feature #1536: Show more information about level on menu
     Feature #2386: Distant Statics in the form of Object Paging
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 3f98684ae7..cc614133aa 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -921,6 +921,13 @@ namespace MWWorld
             refnum.load(reader, true, "MVRF");
             movedTo.load(reader);
 
+            if (refnum.hasContentFile())
+            {
+                auto iter = contentFileMap.find(refnum.mContentFile);
+                if (iter != contentFileMap.end())
+                    refnum.mContentFile = iter->second;
+            }
+
             // Search for the reference. It might no longer exist if its content file was removed.
             Ptr movedRef = searchViaRefNum(refnum);
             if (movedRef.isEmpty())

From f87c45c92a6cfba68d431398a1ceab57976b74ff Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Sat, 30 Jan 2021 16:03:02 +0200
Subject: [PATCH 0307/2859] Get collision box extents and center from
 btBvhTriangleMeshShape

---
 components/resource/bulletshapemanager.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/components/resource/bulletshapemanager.cpp b/components/resource/bulletshapemanager.cpp
index bcadf51c4e..d1da9090dd 100644
--- a/components/resource/bulletshapemanager.cpp
+++ b/components/resource/bulletshapemanager.cpp
@@ -86,7 +86,17 @@ public:
             return osg::ref_ptr<BulletShape>();
 
         osg::ref_ptr<BulletShape> shape (new BulletShape);
-        shape->mCollisionShape = new TriangleMeshShape(mTriangleMesh.release(), true);
+        btBvhTriangleMeshShape* triangleMeshShape = new TriangleMeshShape(mTriangleMesh.release(), true);
+        btVector3 aabbMin = triangleMeshShape->getLocalAabbMin();
+        btVector3 aabbMax = triangleMeshShape->getLocalAabbMax();
+        shape->mCollisionBox.extents[0] = (aabbMax[0] - aabbMin[0]) / 2.0f;
+        shape->mCollisionBox.extents[1] = (aabbMax[1] - aabbMin[1]) / 2.0f;
+        shape->mCollisionBox.extents[2] = (aabbMax[2] - aabbMin[2]) / 2.0f;
+        shape->mCollisionBox.center = osg::Vec3f( (aabbMax[0] + aabbMin[0]) / 2.0f,
+                                                  (aabbMax[1] + aabbMin[1]) / 2.0f,
+                                                  (aabbMax[2] + aabbMin[2]) / 2.0f );
+        shape->mCollisionShape = triangleMeshShape;
+
         return shape;
     }
 

From 7edaa50195baad8ac126ca116b12049d0fe29e5d Mon Sep 17 00:00:00 2001
From: madsbuvi <madssandvei@zoho.com>
Date: Sun, 31 Jan 2021 18:02:05 +0100
Subject: [PATCH 0308/2859] another approach

---
 components/sceneutil/mwshadowtechnique.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
index 294780cfd7..7476bc2190 100644
--- a/components/sceneutil/mwshadowtechnique.cpp
+++ b/components/sceneutil/mwshadowtechnique.cpp
@@ -997,9 +997,9 @@ void MWShadowTechnique::cull(osgUtil::CullVisitor& cv)
     }
 
     // 1. Traverse main scene graph
-    cv.pushStateSet( _shadowRecievingPlaceholderStateSet.get() );
-
-    osg::ref_ptr<osgUtil::StateGraph> decoratorStateGraph = cv.getCurrentStateGraph();
+    auto* shadowReceiverStateSet = vdd->getStateSet(cv.getTraversalNumber());
+    shadowReceiverStateSet->clear();
+    cv.pushStateSet(shadowReceiverStateSet);
 
     cullShadowReceivingScene(&cv);
 
@@ -1426,7 +1426,7 @@ void MWShadowTechnique::cull(osgUtil::CullVisitor& cv)
 
     if (numValidShadows>0)
     {
-        decoratorStateGraph->setStateSet(selectStateSetForRenderingShadow(*vdd, cv.getTraversalNumber()));
+        selectStateSetForRenderingShadow(*vdd, cv.getTraversalNumber());
     }
 
     // OSG_NOTICE<<"End of shadow setup Projection matrix "<<*cv.getProjectionMatrix()<<std::endl;

From 0d1c073cfa58c59087c0f8f9ce2de72ff33d6e66 Mon Sep 17 00:00:00 2001
From: Jordan Francis Moran-Meyers <peterpan0413@live.com>
Date: Mon, 1 Feb 2021 18:34:10 +0000
Subject: [PATCH 0309/2859] Fix the regression involving Cure

---
 apps/openmw/mwmechanics/actors.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index c9fcf82804..cb3570d21f 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -958,22 +958,22 @@ namespace MWMechanics
             if (actor.getClass().hasInventoryStore(actor))
                 actor.getClass().getInventoryStore(actor).purgeEffect(ESM::MagicEffect::Paralyze);
         }
-        else if (effects.get(ESM::MagicEffect::CureCommonDisease).getModifier() > 0)
+        if (effects.get(ESM::MagicEffect::CureCommonDisease).getModifier() > 0)
         {
             creatureStats.getSpells().purgeCommonDisease();
         }
-        else if (effects.get(ESM::MagicEffect::CureBlightDisease).getModifier() > 0)
+        if (effects.get(ESM::MagicEffect::CureBlightDisease).getModifier() > 0)
         {
             creatureStats.getSpells().purgeBlightDisease();
         }
-        else if (effects.get(ESM::MagicEffect::CureCorprusDisease).getModifier() > 0)
+        if (effects.get(ESM::MagicEffect::CureCorprusDisease).getModifier() > 0)
         {
             creatureStats.getActiveSpells().purgeCorprusDisease();
             creatureStats.getSpells().purgeCorprusDisease();
             if (actor.getClass().hasInventoryStore(actor))
                 actor.getClass().getInventoryStore(actor).purgeEffect(ESM::MagicEffect::Corprus, true);
         }
-        else if (effects.get(ESM::MagicEffect::RemoveCurse).getModifier() > 0)
+        if (effects.get(ESM::MagicEffect::RemoveCurse).getModifier() > 0)
         {
             creatureStats.getSpells().purgeCurses();
         }

From 7d3f2bc113aed491a004abab576e7871788eb400 Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Tue, 2 Feb 2021 17:33:40 +0200
Subject: [PATCH 0310/2859] Convert underscores in bone names to whitespaces

---
 components/sceneutil/visitor.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/components/sceneutil/visitor.cpp b/components/sceneutil/visitor.cpp
index 00d18ffcb8..169e07adae 100644
--- a/components/sceneutil/visitor.cpp
+++ b/components/sceneutil/visitor.cpp
@@ -60,7 +60,19 @@ namespace SceneUtil
     void NodeMapVisitor::apply(osg::MatrixTransform& trans)
     {
         // Take transformation for first found node in file
-        const std::string nodeName = Misc::StringUtils::lowerCase(trans.getName());
+        std::string originalNodeName = Misc::StringUtils::lowerCase(trans.getName());
+
+        // Convert underscores to whitespaces as a workaround for Collada (OpenMW's animation system uses whitespace-separated names)
+        std::string underscore = "_";
+        std::size_t foundUnderscore = originalNodeName.find(underscore);
+
+        if (foundUnderscore != std::string::npos)
+        {
+            std::replace(originalNodeName.begin(), originalNodeName.end(), '_', ' ');
+            //originalNodeName.replace(foundUnderscore.begin(), foundPageNumberEnd - foundPageNumber - 6, " ") );
+        }
+        const std::string nodeName = originalNodeName;
+
         mMap.emplace(nodeName, &trans);
 
         traverse(trans);

From 2162b97fefd91678154d9a8b1c13723e64c266ab Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Tue, 2 Feb 2021 17:34:02 +0200
Subject: [PATCH 0311/2859] Handle case in osgAnimation bone names

---
 components/resource/keyframemanager.cpp | 3 ++-
 components/sceneutil/osgacontroller.cpp | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/components/resource/keyframemanager.cpp b/components/resource/keyframemanager.cpp
index d739392e8b..b6417597d5 100644
--- a/components/resource/keyframemanager.cpp
+++ b/components/resource/keyframemanager.cpp
@@ -9,6 +9,7 @@
 #include <components/nifosg/nifloader.hpp>
 #include <components/sceneutil/keyframe.hpp>
 #include <components/sceneutil/osgacontroller.hpp>
+#include <components/misc/stringops.hpp>
 
 #include "animation.hpp"
 #include "objectcache.hpp"
@@ -21,7 +22,7 @@ namespace Resource
 
     void RetrieveAnimationsVisitor::apply(osg::Node& node)
     {
-        if (node.libraryName() == std::string("osgAnimation") && node.className() == std::string("Bone") && node.getName() == std::string("bip01"))
+        if (node.libraryName() == std::string("osgAnimation") && node.className() == std::string("Bone") && Misc::StringUtils::lowerCase(node.getName()) == std::string("bip01"))
             {
                 osg::ref_ptr<SceneUtil::OsgAnimationController> callback = new SceneUtil::OsgAnimationController();
 
diff --git a/components/sceneutil/osgacontroller.cpp b/components/sceneutil/osgacontroller.cpp
index 37aa525af1..8f447621f6 100644
--- a/components/sceneutil/osgacontroller.cpp
+++ b/components/sceneutil/osgacontroller.cpp
@@ -17,6 +17,7 @@
 #include <osgAnimation/UpdateMatrixTransform>
 
 #include <components/debug/debuglog.hpp>
+#include <components/misc/stringops.hpp>
 #include <components/resource/animation.hpp>
 #include <components/sceneutil/controller.hpp>
 #include <components/sceneutil/keyframe.hpp>
@@ -83,7 +84,7 @@ namespace SceneUtil
         {
             osgAnimation::UpdateMatrixTransform* umt = dynamic_cast<osgAnimation::UpdateMatrixTransform*>(cb);
             if (umt)
-                if (node.getName() != "bip01") link(umt);
+                if (Misc::StringUtils::lowerCase(node.getName()) != "bip01") link(umt);
             cb = cb->getNestedCallback();
         }
 

From 5b88d16a50bc3c5def4aa2bcb22501e7a0d2b0a0 Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Tue, 2 Feb 2021 21:09:50 +0200
Subject: [PATCH 0312/2859] Clean-up

---
 components/resource/scenemanager.cpp | 2 --
 components/sceneutil/visitor.cpp     | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 92de2e0dd5..71f11e382e 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -26,8 +26,6 @@
 #include <components/sceneutil/controller.hpp>
 #include <components/sceneutil/optimizer.hpp>
 
-#include <components/settings/settings.hpp>
-
 #include <components/shader/shadervisitor.hpp>
 #include <components/shader/shadermanager.hpp>
 
diff --git a/components/sceneutil/visitor.cpp b/components/sceneutil/visitor.cpp
index 169e07adae..e632e7ce91 100644
--- a/components/sceneutil/visitor.cpp
+++ b/components/sceneutil/visitor.cpp
@@ -67,10 +67,8 @@ namespace SceneUtil
         std::size_t foundUnderscore = originalNodeName.find(underscore);
 
         if (foundUnderscore != std::string::npos)
-        {
             std::replace(originalNodeName.begin(), originalNodeName.end(), '_', ' ');
-            //originalNodeName.replace(foundUnderscore.begin(), foundPageNumberEnd - foundPageNumber - 6, " ") );
-        }
+
         const std::string nodeName = originalNodeName;
 
         mMap.emplace(nodeName, &trans);

From 2c67f34c6d8ca8ba794e3b7bd810e7fdc07e8773 Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Tue, 2 Feb 2021 21:18:14 +0200
Subject: [PATCH 0313/2859] Update base_anim file settings

---
 files/settings-default.cfg | 59 ++++++++++++++++++++++++++++----------
 1 file changed, 44 insertions(+), 15 deletions(-)

diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index db947f8ed0..8e365690d4 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -955,33 +955,62 @@ defer aabb update = true
 # Loading arbitrary meshes is not advised and may cause instability.
 load unsupported nif files = false
 
-[Groundcover]
-
-# enable separate groundcover handling
-enabled = false
-
-# A groundcover density (0.0 <= value <= 1.0)
-# 1.0 means 100% density
-density = 1.0
-
-# A maximum distance in cells on which groundcover is rendered.
-distance = 1
-
-# A minimum size of groundcover chunk in cells (0.125, 0.25, 0.5, 1.0)
-min chunk size = 0.5
-
+# 3rd person base animation model that looks also for the corresponding kf-file
 xbaseanim = meshes\xbase_anim.nif
+
+# 3rd person base model with textkeys-data
 baseanim = meshes\base_anim.nif
+
+# 1st person base animation model that looks also for corresponding kf-file
 xbaseanim1st = meshes\xbase_anim.1st.nif
+
+# 3rd person beast race base model with textkeys-data
 baseanimkna = meshes\base_animkna.nif
+
+# 1st person beast race base animation model
 baseanimkna1st = meshes\base_animkna.1st.nif
+
+# 3rd person female base animation model
 xbaseanimfemale = meshes/xbase_anim_female.nif
+
+# 3rd person female base model with textkeys-data
 baseanimfemale = meshes/base_anim_female.nif
+
+# 1st person female base model with textkeys-data
 baseanimfemale1st = meshes\base_anim_female.1st.nif
+
+# 3rd person werewolf skin
 wolfskin = meshes\wolf\skin.nif
+
+# 1st person werewolf skin
 wolfskin1st = meshes\wolf\skin.1st.nif
+
+# Argonian smimkna
 xargonianswimkna = meshes/xargonian_swimkna.nif
+
+# File to load xbaseanim 3rd person animations
 xbaseanimkf = meshes\xbase_anim.kf
+
+# File to load xbaseanim 3rd person animations
 xbaseanim1stkf = meshes\xbase_anim.1st.kf
+
+# File to load xbaseanim animations from
 xbaseanimfemalekf = meshes/xbase_anim_female.kf
+
+# File to load xargonianswimkna animations from
 xargonianswimknakf = meshes/xargonian_swimkna.kf
+
+[Groundcover]
+
+# enable separate groundcover handling
+enabled = false
+
+# A groundcover density (0.0 <= value <= 1.0)
+# 1.0 means 100% density
+density = 1.0
+
+# A maximum distance in cells on which groundcover is rendered.
+distance = 1
+
+# A minimum size of groundcover chunk in cells (0.125, 0.25, 0.5, 1.0)
+min chunk size = 0.5

From 1221889cf7c099ae0b00e7752b24448a1deac9e0 Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Tue, 2 Feb 2021 21:41:17 +0200
Subject: [PATCH 0314/2859] Limit conversion of underscores to nodes origating
 from osgAnimation  library

---
 components/sceneutil/visitor.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/components/sceneutil/visitor.cpp b/components/sceneutil/visitor.cpp
index e632e7ce91..60f99b2fef 100644
--- a/components/sceneutil/visitor.cpp
+++ b/components/sceneutil/visitor.cpp
@@ -62,12 +62,15 @@ namespace SceneUtil
         // Take transformation for first found node in file
         std::string originalNodeName = Misc::StringUtils::lowerCase(trans.getName());
 
-        // Convert underscores to whitespaces as a workaround for Collada (OpenMW's animation system uses whitespace-separated names)
-        std::string underscore = "_";
-        std::size_t foundUnderscore = originalNodeName.find(underscore);
+        if (trans.libraryName() == std::string("osgAnimation"))
+        {
+            // Convert underscores to whitespaces as a workaround for Collada (OpenMW's animation system uses whitespace-separated names)
+            std::string underscore = "_";
+            std::size_t foundUnderscore = originalNodeName.find(underscore);
 
-        if (foundUnderscore != std::string::npos)
-            std::replace(originalNodeName.begin(), originalNodeName.end(), '_', ' ');
+            if (foundUnderscore != std::string::npos)
+                std::replace(originalNodeName.begin(), originalNodeName.end(), '_', ' ');
+        }
 
         const std::string nodeName = originalNodeName;
 

From 382324173b3587fcf46ca00ce47cf2b71e75d9ac Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Tue, 2 Feb 2021 21:42:25 +0200
Subject: [PATCH 0315/2859] \ to /

---
 files/settings-default.cfg | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 8e365690d4..67d944d195 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -956,19 +956,19 @@ defer aabb update = true
 load unsupported nif files = false
 
 # 3rd person base animation model that looks also for the corresponding kf-file
-xbaseanim = meshes\xbase_anim.nif
+xbaseanim = meshes/xbase_anim.nif
 
 # 3rd person base model with textkeys-data
-baseanim = meshes\base_anim.nif
+baseanim = meshes/base_anim.nif
 
 # 1st person base animation model that looks also for corresponding kf-file
-xbaseanim1st = meshes\xbase_anim.1st.nif
+xbaseanim1st = meshes/xbase_anim.1st.nif
 
 # 3rd person beast race base model with textkeys-data
-baseanimkna = meshes\base_animkna.nif
+baseanimkna = meshes/base_animkna.nif
 
 # 1st person beast race base animation model
-baseanimkna1st = meshes\base_animkna.1st.nif
+baseanimkna1st = meshes/base_animkna.1st.nif
 
 # 3rd person female base animation model
 xbaseanimfemale = meshes/xbase_anim_female.nif
@@ -977,22 +977,22 @@ xbaseanimfemale = meshes/xbase_anim_female.nif
 baseanimfemale = meshes/base_anim_female.nif
 
 # 1st person female base model with textkeys-data
-baseanimfemale1st = meshes\base_anim_female.1st.nif
+baseanimfemale1st = meshes/base_anim_female.1st.nif
 
 # 3rd person werewolf skin
-wolfskin = meshes\wolf\skin.nif
+wolfskin = meshes/wolf/skin.nif
 
 # 1st person werewolf skin
-wolfskin1st = meshes\wolf\skin.1st.nif
+wolfskin1st = meshes/wolf/skin.1st.nif
 
 # Argonian smimkna
 xargonianswimkna = meshes/xargonian_swimkna.nif
 
 # File to load xbaseanim 3rd person animations
-xbaseanimkf = meshes\xbase_anim.kf
+xbaseanimkf = meshes/xbase_anim.kf
 
 # File to load xbaseanim 3rd person animations
-xbaseanim1stkf = meshes\xbase_anim.1st.kf
+xbaseanim1stkf = meshes/xbase_anim.1st.kf
 
 # File to load xbaseanim animations from
 xbaseanimfemalekf = meshes/xbase_anim_female.kf

From 6c0c28c2eb8d41ee26dd562f332ce72c6a2c76c3 Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Sat, 30 Jan 2021 16:03:02 +0200
Subject: [PATCH 0316/2859] Get collision box extents and center from
 btBvhTriangleMeshShape

---
 components/resource/bulletshapemanager.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/components/resource/bulletshapemanager.cpp b/components/resource/bulletshapemanager.cpp
index bcadf51c4e..d1da9090dd 100644
--- a/components/resource/bulletshapemanager.cpp
+++ b/components/resource/bulletshapemanager.cpp
@@ -86,7 +86,17 @@ public:
             return osg::ref_ptr<BulletShape>();
 
         osg::ref_ptr<BulletShape> shape (new BulletShape);
-        shape->mCollisionShape = new TriangleMeshShape(mTriangleMesh.release(), true);
+        btBvhTriangleMeshShape* triangleMeshShape = new TriangleMeshShape(mTriangleMesh.release(), true);
+        btVector3 aabbMin = triangleMeshShape->getLocalAabbMin();
+        btVector3 aabbMax = triangleMeshShape->getLocalAabbMax();
+        shape->mCollisionBox.extents[0] = (aabbMax[0] - aabbMin[0]) / 2.0f;
+        shape->mCollisionBox.extents[1] = (aabbMax[1] - aabbMin[1]) / 2.0f;
+        shape->mCollisionBox.extents[2] = (aabbMax[2] - aabbMin[2]) / 2.0f;
+        shape->mCollisionBox.center = osg::Vec3f( (aabbMax[0] + aabbMin[0]) / 2.0f,
+                                                  (aabbMax[1] + aabbMin[1]) / 2.0f,
+                                                  (aabbMax[2] + aabbMin[2]) / 2.0f );
+        shape->mCollisionShape = triangleMeshShape;
+
         return shape;
     }
 

From b28d8251aaa7fbf0e5ccab4fede1c34e1e62ad00 Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Sat, 30 Jan 2021 15:27:47 +0200
Subject: [PATCH 0317/2859] Clone animation tracks

---
 components/sceneutil/osgacontroller.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/components/sceneutil/osgacontroller.cpp b/components/sceneutil/osgacontroller.cpp
index 8f447621f6..766d0cb79f 100644
--- a/components/sceneutil/osgacontroller.cpp
+++ b/components/sceneutil/osgacontroller.cpp
@@ -103,10 +103,14 @@ namespace SceneUtil
     }
 
     OsgAnimationController::OsgAnimationController(const OsgAnimationController &copy, const osg::CopyOp &copyop) : SceneUtil::KeyframeController(copy, copyop)
-    , mMergedAnimationTracks(copy.mMergedAnimationTracks)
     , mEmulatedAnimations(copy.mEmulatedAnimations)
     {
         mLinker = nullptr;
+        for (const auto& mergedAnimationTrack : copy.mMergedAnimationTracks)
+        {
+            Resource::Animation* copiedAnimationTrack = dynamic_cast<Resource::Animation*>(mergedAnimationTrack.get()->clone(copyop));
+            mMergedAnimationTracks.emplace_back(copiedAnimationTrack);
+        }
     }
 
     osg::Vec3f OsgAnimationController::getTranslation(float time) const

From bae27e81993813d7de75fe9eb466fa7c50a9a6ad Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Tue, 2 Feb 2021 18:00:14 +0200
Subject: [PATCH 0318/2859] dynamic_cast to static_cast

---
 components/sceneutil/osgacontroller.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/sceneutil/osgacontroller.cpp b/components/sceneutil/osgacontroller.cpp
index 766d0cb79f..b2d819117f 100644
--- a/components/sceneutil/osgacontroller.cpp
+++ b/components/sceneutil/osgacontroller.cpp
@@ -108,7 +108,7 @@ namespace SceneUtil
         mLinker = nullptr;
         for (const auto& mergedAnimationTrack : copy.mMergedAnimationTracks)
         {
-            Resource::Animation* copiedAnimationTrack = dynamic_cast<Resource::Animation*>(mergedAnimationTrack.get()->clone(copyop));
+            Resource::Animation* copiedAnimationTrack = static_cast<Resource::Animation*>(mergedAnimationTrack.get()->clone(copyop));
             mMergedAnimationTracks.emplace_back(copiedAnimationTrack);
         }
     }

From 384112746c3e7c7999853afb77076c23be4e2de1 Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Wed, 3 Feb 2021 14:25:09 +0200
Subject: [PATCH 0319/2859] Add option for custom collision node with non-nif
 files

---
 apps/openmw/mwworld/scene.cpp              |  4 +--
 components/resource/bulletshapemanager.cpp | 32 +++++++++++++++++++---
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index fcf2c4b387..57da414ddb 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -115,6 +115,8 @@ namespace
 
         std::string model = getModel(ptr, rendering.getResourceSystem()->getVFS());
         const auto rotation = makeNodeRotation(ptr, RotationOrder::direct);
+        if (!physics.getObject(ptr))
+            ptr.getClass().insertObject (ptr, model, rotation, physics);
         if (!onlyPhysics)
         {
             bool useAnim = ptr.getClass().useAnim();
@@ -134,8 +136,6 @@ namespace
             // Restore effect particles
             MWBase::Environment::get().getWorld()->applyLoopingParticles(ptr);
         }
-        if (!physics.getObject(ptr))
-            ptr.getClass().insertObject (ptr, model, rotation, physics);
     }
 
     void addObject(const MWWorld::Ptr& ptr, const MWPhysics::PhysicsSystem& physics, DetourNavigator::Navigator& navigator)
diff --git a/components/resource/bulletshapemanager.cpp b/components/resource/bulletshapemanager.cpp
index d1da9090dd..aceb9bb35c 100644
--- a/components/resource/bulletshapemanager.cpp
+++ b/components/resource/bulletshapemanager.cpp
@@ -8,6 +8,7 @@
 
 #include <BulletCollision/CollisionShapes/btTriangleMesh.h>
 
+#include <components/sceneutil/visitor.hpp>
 #include <components/vfs/manager.hpp>
 
 #include <components/nifbullet/bulletnifloader.hpp>
@@ -145,11 +146,34 @@ osg::ref_ptr<const BulletShape> BulletShapeManager::getShape(const std::string &
 
             osg::ref_ptr<const osg::Node> constNode (mSceneManager->getTemplate(normalized));
             osg::ref_ptr<osg::Node> node (const_cast<osg::Node*>(constNode.get())); // const-trickery required because there is no const version of NodeVisitor
-            NodeToShapeVisitor visitor;
-            node->accept(visitor);
-            shape = visitor.getShape();
+
+            // Check first if there's a custom collision node
+            SceneUtil::FindByNameVisitor nameFinder("Collision");
+            node->accept(nameFinder);
+            if (nameFinder.mFoundNode)
+            {
+                NodeToShapeVisitor visitor;
+                nameFinder.mFoundNode->accept(visitor);
+                shape = visitor.getShape();
+                for (unsigned int i = 0; i < nameFinder.mFoundNode->getNumParents(); ++i)
+                {
+                    nameFinder.mFoundNode->getParent(i)->removeChild(nameFinder.mFoundNode);
+                }
+
+                /* // CleanObjectRootVisitor is an alternative method
+                SceneUtil::CleanObjectRootVisitor cleanerVisitor;
+                nameFinder.mFoundNode->accept(cleanerVisitor);*/
+            }
+
+            // Generate a collision shape from the mesh
             if (!shape)
-                return osg::ref_ptr<BulletShape>();
+            {
+                NodeToShapeVisitor visitor;
+                node->accept(visitor);
+                shape = visitor.getShape();
+                if (!shape)
+                    return osg::ref_ptr<BulletShape>();
+            }
         }
 
         mCache->addEntryToObjectCache(normalized, shape);

From 5c32460153497359ef3815c6b79e4437c3667480 Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Wed, 3 Feb 2021 14:25:50 +0200
Subject: [PATCH 0320/2859] Add underscore-separated node-names to
 reserved-list

---
 components/resource/scenemanager.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 71f11e382e..70320760f5 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -390,7 +390,8 @@ namespace Resource
             {
                 const char* reserved[] = {"Head", "Neck", "Chest", "Groin", "Right Hand", "Left Hand", "Right Wrist", "Left Wrist", "Shield Bone", "Right Forearm", "Left Forearm", "Right Upper Arm",
                                           "Left Upper Arm", "Right Foot", "Left Foot", "Right Ankle", "Left Ankle", "Right Knee", "Left Knee", "Right Upper Leg", "Left Upper Leg", "Right Clavicle",
-                                          "Left Clavicle", "Weapon Bone", "Tail", "Bip01", "Root Bone", "BoneOffset", "AttachLight", "Arrow", "Camera"};
+                                          "Left Clavicle", "Weapon Bone", "Tail", "Bip01", "Root Bone", "BoneOffset", "AttachLight", "Arrow", "Camera", "Collision", "Right_Wrist", "Left_Wrist",
+                                          "Shield_Bone", "Right_Forearm", "Left_Forearm", "Right_Upper_Arm", "Left_Clavicle", "Weapon_Bone", "Root_Bone"};
 
                 reservedNames = std::vector<std::string>(reserved, reserved + sizeof(reserved)/sizeof(reserved[0]));
 

From 0639f8b7c6d5536f8a0ab03a058ab16bfb54c8bb Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Wed, 3 Feb 2021 18:45:22 +0000
Subject: [PATCH 0321/2859] Make the dummy texture for the character preview
 shadow-friendly

---
 apps/openmw/mwrender/characterpreview.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index 14735050ce..262b03229f 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -184,6 +184,9 @@ namespace MWRender
         osg::ref_ptr<osg::Texture2D> dummyTexture = new osg::Texture2D();
         dummyTexture->setInternalFormat(GL_RED);
         dummyTexture->setTextureSize(1, 1);
+        // This might clash with a shadow map, so make sure it doesn't cast shadows
+        dummyTexture->setShadowComparison(true);
+        dummyTexture->setShadowCompareFunc(osg::Texture::ShadowCompareFunc::ALWAYS);
         stateset->setTextureAttributeAndModes(7, dummyTexture, osg::StateAttribute::ON);
         stateset->setTextureAttribute(7, noBlendAlphaEnv, osg::StateAttribute::ON);
         stateset->addUniform(new osg::Uniform("noAlpha", true));

From e91d1a2b42aa3b28e5f86acc83201702c08cc2b7 Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Wed, 3 Feb 2021 21:16:26 +0200
Subject: [PATCH 0322/2859] Fix earlier broken commit

---
 apps/openmw/mwworld/scene.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 57da414ddb..fcf2c4b387 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -115,8 +115,6 @@ namespace
 
         std::string model = getModel(ptr, rendering.getResourceSystem()->getVFS());
         const auto rotation = makeNodeRotation(ptr, RotationOrder::direct);
-        if (!physics.getObject(ptr))
-            ptr.getClass().insertObject (ptr, model, rotation, physics);
         if (!onlyPhysics)
         {
             bool useAnim = ptr.getClass().useAnim();
@@ -136,6 +134,8 @@ namespace
             // Restore effect particles
             MWBase::Environment::get().getWorld()->applyLoopingParticles(ptr);
         }
+        if (!physics.getObject(ptr))
+            ptr.getClass().insertObject (ptr, model, rotation, physics);
     }
 
     void addObject(const MWWorld::Ptr& ptr, const MWPhysics::PhysicsSystem& physics, DetourNavigator::Navigator& navigator)

From 45fde84f4ff005d476a05b628a27329ce01d976a Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Wed, 3 Feb 2021 21:16:54 +0200
Subject: [PATCH 0323/2859] Use nodemasks and visitors for detecting custom
 collision shapes

---
 components/resource/bulletshapemanager.cpp | 13 +++++--------
 components/resource/scenemanager.cpp       |  9 +++++++++
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/components/resource/bulletshapemanager.cpp b/components/resource/bulletshapemanager.cpp
index aceb9bb35c..ad37eda0dd 100644
--- a/components/resource/bulletshapemanager.cpp
+++ b/components/resource/bulletshapemanager.cpp
@@ -148,21 +148,18 @@ osg::ref_ptr<const BulletShape> BulletShapeManager::getShape(const std::string &
             osg::ref_ptr<osg::Node> node (const_cast<osg::Node*>(constNode.get())); // const-trickery required because there is no const version of NodeVisitor
 
             // Check first if there's a custom collision node
+            unsigned int visitAllNodesMask = 0xffffffff;
             SceneUtil::FindByNameVisitor nameFinder("Collision");
+            nameFinder.setTraversalMask(visitAllNodesMask);
+            nameFinder.setNodeMaskOverride(visitAllNodesMask);
             node->accept(nameFinder);
             if (nameFinder.mFoundNode)
             {
                 NodeToShapeVisitor visitor;
+                visitor.setTraversalMask(visitAllNodesMask);
+                visitor.setNodeMaskOverride(visitAllNodesMask);
                 nameFinder.mFoundNode->accept(visitor);
                 shape = visitor.getShape();
-                for (unsigned int i = 0; i < nameFinder.mFoundNode->getNumParents(); ++i)
-                {
-                    nameFinder.mFoundNode->getParent(i)->removeChild(nameFinder.mFoundNode);
-                }
-
-                /* // CleanObjectRootVisitor is an alternative method
-                SceneUtil::CleanObjectRootVisitor cleanerVisitor;
-                nameFinder.mFoundNode->accept(cleanerVisitor);*/
             }
 
             // Generate a collision shape from the mesh
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 70320760f5..19cc96433b 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -25,6 +25,7 @@
 #include <components/sceneutil/util.hpp>
 #include <components/sceneutil/controller.hpp>
 #include <components/sceneutil/optimizer.hpp>
+#include <components/sceneutil/visitor.hpp>
 
 #include <components/shader/shadervisitor.hpp>
 #include <components/shader/shadermanager.hpp>
@@ -373,6 +374,14 @@ namespace Resource
                 errormsg << "Error loading " << normalizedFilename << ": " << result.message() << " code " << result.status() << std::endl;
                 throw std::runtime_error(errormsg.str());
             }
+
+            // Recognize and hide collision node
+            unsigned int hiddenNodeMask = 0;
+            SceneUtil::FindByNameVisitor nameFinder("Collision");
+            result.getNode()->accept(nameFinder);
+            if (nameFinder.mFoundNode)
+                nameFinder.mFoundNode->setNodeMask(hiddenNodeMask);
+
             return result.getNode();
         }
     }

From 88ca4a1db6e10eeeecd0d9f97fbe61dd5b8a9411 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 4 Feb 2021 00:18:25 +0100
Subject: [PATCH 0324/2859] Count navmesh cache hit rate

---
 components/detournavigator/navmeshtilescache.cpp | 12 +++++++++++-
 components/detournavigator/navmeshtilescache.hpp |  2 ++
 components/resource/stats.cpp                    |  1 +
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/components/detournavigator/navmeshtilescache.cpp b/components/detournavigator/navmeshtilescache.cpp
index cff93ac0e5..1b90ea89eb 100644
--- a/components/detournavigator/navmeshtilescache.cpp
+++ b/components/detournavigator/navmeshtilescache.cpp
@@ -53,13 +53,16 @@ namespace DetourNavigator
     }
 
     NavMeshTilesCache::NavMeshTilesCache(const std::size_t maxNavMeshDataSize)
-        : mMaxNavMeshDataSize(maxNavMeshDataSize), mUsedNavMeshDataSize(0), mFreeNavMeshDataSize(0) {}
+        : mMaxNavMeshDataSize(maxNavMeshDataSize), mUsedNavMeshDataSize(0), mFreeNavMeshDataSize(0),
+          mHitCount(0), mGetCount(0){}
 
     NavMeshTilesCache::Value NavMeshTilesCache::get(const osg::Vec3f& agentHalfExtents, const TilePosition& changedTile,
         const RecastMesh& recastMesh, const std::vector<OffMeshConnection>& offMeshConnections)
     {
         const std::lock_guard<std::mutex> lock(mMutex);
 
+        ++mGetCount;
+
         const auto agentValues = mValues.find(agentHalfExtents);
         if (agentValues == mValues.end())
             return Value();
@@ -74,6 +77,8 @@ namespace DetourNavigator
 
         acquireItemUnsafe(tile->second);
 
+        ++mHitCount;
+
         return Value(*this, tile->second);
     }
 
@@ -123,17 +128,22 @@ namespace DetourNavigator
         std::size_t navMeshCacheSize = 0;
         std::size_t usedNavMeshTiles = 0;
         std::size_t cachedNavMeshTiles = 0;
+        std::size_t hitCount = 0;
+        std::size_t getCount = 0;
 
         {
             const std::lock_guard<std::mutex> lock(mMutex);
             navMeshCacheSize = mUsedNavMeshDataSize;
             usedNavMeshTiles = mBusyItems.size();
             cachedNavMeshTiles = mFreeItems.size();
+            hitCount = mHitCount;
+            getCount = mGetCount;
         }
 
         stats.setAttribute(frameNumber, "NavMesh CacheSize", navMeshCacheSize);
         stats.setAttribute(frameNumber, "NavMesh UsedTiles", usedNavMeshTiles);
         stats.setAttribute(frameNumber, "NavMesh CachedTiles", cachedNavMeshTiles);
+        stats.setAttribute(frameNumber, "NavMesh CacheHitRate", static_cast<double>(hitCount) / getCount * 100.0);
     }
 
     void NavMeshTilesCache::removeLeastRecentlyUsed()
diff --git a/components/detournavigator/navmeshtilescache.hpp b/components/detournavigator/navmeshtilescache.hpp
index 064d9e185b..a6dd1ed9a7 100644
--- a/components/detournavigator/navmeshtilescache.hpp
+++ b/components/detournavigator/navmeshtilescache.hpp
@@ -194,6 +194,8 @@ namespace DetourNavigator
         std::size_t mMaxNavMeshDataSize;
         std::size_t mUsedNavMeshDataSize;
         std::size_t mFreeNavMeshDataSize;
+        std::size_t mHitCount;
+        std::size_t mGetCount;
         std::list<Item> mBusyItems;
         std::list<Item> mFreeItems;
         std::map<osg::Vec3f, std::map<TilePosition, TileMap>> mValues;
diff --git a/components/resource/stats.cpp b/components/resource/stats.cpp
index 3649af0896..690814f91d 100644
--- a/components/resource/stats.cpp
+++ b/components/resource/stats.cpp
@@ -394,6 +394,7 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase *viewer)
             "NavMesh CacheSize",
             "NavMesh UsedTiles",
             "NavMesh CachedTiles",
+            "NavMesh CacheHitRate",
             "",
             "Mechanics Actors",
             "Mechanics Objects",

From 489107c5eed4de2ce0cef3a88d1cedf0cb811311 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 4 Feb 2021 00:44:15 +0100
Subject: [PATCH 0325/2859] Count navmesh cache key once in item size

Key is stored only in NavMeshTilesCache::Item, TileMap uses KeyView with
a pointer to a vector.
---
 .../detournavigator/navmeshtilescache.cpp     | 22 +++++++++----------
 .../detournavigator/navmeshtilescache.cpp     |  2 +-
 .../detournavigator/navmeshtilescache.hpp     |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
index e8e7820d91..5bc7af6467 100644
--- a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
+++ b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
@@ -68,7 +68,7 @@ namespace
     {
         const std::size_t navMeshDataSize = 1;
         const std::size_t navMeshKeySize = cRecastMeshKeySize;
-        const std::size_t maxSize = navMeshDataSize + 2 * navMeshKeySize;
+        const std::size_t maxSize = navMeshDataSize + navMeshKeySize;
         NavMeshTilesCache cache(maxSize);
 
         const auto result = cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections,
@@ -81,7 +81,7 @@ namespace
     {
         const std::size_t navMeshDataSize = 1;
         const std::size_t navMeshKeySize = cRecastMeshKeySize;
-        const std::size_t maxSize = 2 * (navMeshDataSize + 2 * navMeshKeySize);
+        const std::size_t maxSize = 2 * (navMeshDataSize + navMeshKeySize);
         NavMeshTilesCache cache(maxSize);
         const auto anotherData = reinterpret_cast<unsigned char*>(dtAlloc(1, DT_ALLOC_PERM));
         NavMeshData anotherNavMeshData {anotherData, 1};
@@ -97,7 +97,7 @@ namespace
     {
         const std::size_t navMeshDataSize = 1;
         const std::size_t navMeshKeySize = cRecastMeshKeySize;
-        const std::size_t maxSize = navMeshDataSize + 2 * navMeshKeySize;
+        const std::size_t maxSize = navMeshDataSize + navMeshKeySize;
         NavMeshTilesCache cache(maxSize);
 
         cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections, std::move(mNavMeshData));
@@ -142,7 +142,7 @@ namespace
     {
         const std::size_t navMeshDataSize = 1;
         const std::size_t navMeshKeySize = cRecastMeshWithWaterKeySize;
-        const std::size_t maxSize = navMeshDataSize + 2 * navMeshKeySize;
+        const std::size_t maxSize = navMeshDataSize + navMeshKeySize;
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<RecastMesh::Water> water {1, RecastMesh::Water {1, btTransform::getIdentity()}};
@@ -163,7 +163,7 @@ namespace
     {
         const std::size_t navMeshDataSize = 1;
         const std::size_t navMeshKeySize = cRecastMeshKeySize;
-        const std::size_t maxSize = navMeshDataSize + 2 * navMeshKeySize;
+        const std::size_t maxSize = navMeshDataSize + navMeshKeySize;
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<RecastMesh::Water> water {1, RecastMesh::Water {1, btTransform::getIdentity()}};
@@ -182,7 +182,7 @@ namespace
     {
         const std::size_t navMeshDataSize = 1;
         const std::size_t navMeshKeySize = cRecastMeshWithWaterKeySize;
-        const std::size_t maxSize = 2 * (navMeshDataSize + 2 * navMeshKeySize);
+        const std::size_t maxSize = 2 * (navMeshDataSize + navMeshKeySize);
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<RecastMesh::Water> leastRecentlySetWater {1, RecastMesh::Water {1, btTransform::getIdentity()}};
@@ -214,7 +214,7 @@ namespace
     {
         const std::size_t navMeshDataSize = 1;
         const std::size_t navMeshKeySize = cRecastMeshWithWaterKeySize;
-        const std::size_t maxSize = 2 * (navMeshDataSize + 2 * navMeshKeySize);
+        const std::size_t maxSize = 2 * (navMeshDataSize + navMeshKeySize);
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<RecastMesh::Water> leastRecentlyUsedWater {1, RecastMesh::Water {1, btTransform::getIdentity()}};
@@ -258,7 +258,7 @@ namespace
     {
         const std::size_t navMeshDataSize = 1;
         const std::size_t navMeshKeySize = cRecastMeshKeySize;
-        const std::size_t maxSize = 2 * (navMeshDataSize + 2 * navMeshKeySize);
+        const std::size_t maxSize = 2 * (navMeshDataSize + navMeshKeySize);
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<RecastMesh::Water> water {1, RecastMesh::Water {1, btTransform::getIdentity()}};
@@ -277,7 +277,7 @@ namespace
         const std::size_t navMeshDataSize = 1;
         const std::size_t navMeshKeySize1 = cRecastMeshKeySize;
         const std::size_t navMeshKeySize2 = cRecastMeshWithWaterKeySize;
-        const std::size_t maxSize = 2 * navMeshDataSize + 2 * navMeshKeySize1 + 2 * navMeshKeySize2;
+        const std::size_t maxSize = 2 * navMeshDataSize + navMeshKeySize1 + navMeshKeySize2;
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<RecastMesh::Water> anotherWater {1, RecastMesh::Water {1, btTransform::getIdentity()}};
@@ -306,7 +306,7 @@ namespace
     {
         const std::size_t navMeshDataSize = 1;
         const std::size_t navMeshKeySize = cRecastMeshKeySize;
-        const std::size_t maxSize = navMeshDataSize + 2 * navMeshKeySize;
+        const std::size_t maxSize = navMeshDataSize + navMeshKeySize;
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<RecastMesh::Water> water {1, RecastMesh::Water {1, btTransform::getIdentity()}};
@@ -330,7 +330,7 @@ namespace
     {
         const std::size_t navMeshDataSize = 1;
         const std::size_t navMeshKeySize = cRecastMeshKeySize;
-        const std::size_t maxSize = navMeshDataSize + 2 * navMeshKeySize;
+        const std::size_t maxSize = navMeshDataSize + navMeshKeySize;
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<RecastMesh::Water> water {1, RecastMesh::Water {1, btTransform::getIdentity()}};
diff --git a/components/detournavigator/navmeshtilescache.cpp b/components/detournavigator/navmeshtilescache.cpp
index 1b90ea89eb..d9879fcbb6 100644
--- a/components/detournavigator/navmeshtilescache.cpp
+++ b/components/detournavigator/navmeshtilescache.cpp
@@ -97,7 +97,7 @@ namespace DetourNavigator
             return Value();
 
         auto navMeshKey = makeNavMeshKey(recastMesh, offMeshConnections);
-        const auto itemSize = navMeshSize + 2 * navMeshKey.size();
+        const auto itemSize = navMeshSize + navMeshKey.size();
 
         if (itemSize > mFreeNavMeshDataSize + (mMaxNavMeshDataSize - mUsedNavMeshDataSize))
             return Value();
diff --git a/components/detournavigator/navmeshtilescache.hpp b/components/detournavigator/navmeshtilescache.hpp
index a6dd1ed9a7..338ead3aad 100644
--- a/components/detournavigator/navmeshtilescache.hpp
+++ b/components/detournavigator/navmeshtilescache.hpp
@@ -208,7 +208,7 @@ namespace DetourNavigator
 
         static std::size_t getSize(const Item& item)
         {
-            return static_cast<std::size_t>(item.mNavMeshData.mSize) + 2 * item.mNavMeshKey.size();
+            return static_cast<std::size_t>(item.mNavMeshData.mSize) + item.mNavMeshKey.size();
         }
     };
 }

From ad1f8c1e8445acdb2f40f7fcee767b587e5df11c Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 4 Feb 2021 00:14:29 +0100
Subject: [PATCH 0326/2859] Sort water and off mesh connections for recast mesh

Inconsisten order of these objects in navmesh cache key leads to cache misses
due to key inequality.
---
 components/bullethelpers/operators.hpp            | 15 +++++++++++++++
 components/detournavigator/offmeshconnection.hpp  |  7 +++++++
 .../detournavigator/offmeshconnectionsmanager.hpp |  2 ++
 components/detournavigator/recastmesh.hpp         |  8 ++++++++
 components/detournavigator/recastmeshbuilder.cpp  |  1 +
 5 files changed, 33 insertions(+)

diff --git a/components/bullethelpers/operators.hpp b/components/bullethelpers/operators.hpp
index ea88deddf0..dd2ec8017c 100644
--- a/components/bullethelpers/operators.hpp
+++ b/components/bullethelpers/operators.hpp
@@ -68,4 +68,19 @@ inline std::ostream& operator <<(std::ostream& stream, BroadphaseNativeTypes val
     }
 }
 
+inline bool operator <(const btVector3& lhs, const btVector3& rhs)
+{
+    return std::tie(lhs.x(), lhs.y(), lhs.z()) < std::tie(rhs.x(), rhs.y(), rhs.z());
+}
+
+inline bool operator <(const btMatrix3x3& lhs, const btMatrix3x3& rhs)
+{
+    return std::tie(lhs[0], lhs[1], lhs[2]) < std::tie(rhs[0], rhs[1], rhs[2]);
+}
+
+inline bool operator <(const btTransform& lhs, const btTransform& rhs)
+{
+    return std::tie(lhs.getBasis(), lhs.getOrigin()) < std::tie(rhs.getBasis(), rhs.getOrigin());
+}
+
 #endif
diff --git a/components/detournavigator/offmeshconnection.hpp b/components/detournavigator/offmeshconnection.hpp
index ca999dbdb9..01bae02732 100644
--- a/components/detournavigator/offmeshconnection.hpp
+++ b/components/detournavigator/offmeshconnection.hpp
@@ -5,6 +5,8 @@
 
 #include <osg/Vec3f>
 
+#include <tuple>
+
 namespace DetourNavigator
 {
     struct OffMeshConnection
@@ -13,6 +15,11 @@ namespace DetourNavigator
         osg::Vec3f mEnd;
         AreaType mAreaType;
     };
+
+    inline bool operator<(const OffMeshConnection& lhs, const OffMeshConnection& rhs)
+    {
+        return std::tie(lhs.mStart, lhs.mEnd, lhs.mAreaType) < std::tie(rhs.mStart, rhs.mEnd, rhs.mAreaType);
+    }
 }
 
 #endif
diff --git a/components/detournavigator/offmeshconnectionsmanager.hpp b/components/detournavigator/offmeshconnectionsmanager.hpp
index de707f3a86..1ad96e3b97 100644
--- a/components/detournavigator/offmeshconnectionsmanager.hpp
+++ b/components/detournavigator/offmeshconnectionsmanager.hpp
@@ -85,6 +85,8 @@ namespace DetourNavigator
                     std::for_each(byId.first, byId.second, [&] (const auto& v) { result.push_back(v.second); });
                 });
 
+            std::sort(result.begin(), result.end());
+
             return result;
         }
 
diff --git a/components/detournavigator/recastmesh.hpp b/components/detournavigator/recastmesh.hpp
index f3259903f3..29f37822ec 100644
--- a/components/detournavigator/recastmesh.hpp
+++ b/components/detournavigator/recastmesh.hpp
@@ -5,9 +5,12 @@
 #include "chunkytrimesh.hpp"
 #include "bounds.hpp"
 
+#include <components/bullethelpers/operators.hpp>
+
 #include <memory>
 #include <string>
 #include <vector>
+#include <tuple>
 
 #include <osg/Vec3f>
 
@@ -87,6 +90,11 @@ namespace DetourNavigator
         ChunkyTriMesh mChunkyTriMesh;
         Bounds mBounds;
     };
+
+    inline bool operator<(const RecastMesh::Water& lhs, const RecastMesh::Water& rhs)
+    {
+        return std::tie(lhs.mCellSize, lhs.mTransform) < std::tie(rhs.mCellSize, rhs.mTransform);
+    }
 }
 
 #endif
diff --git a/components/detournavigator/recastmeshbuilder.cpp b/components/detournavigator/recastmeshbuilder.cpp
index ee014b9328..f8456acf0b 100644
--- a/components/detournavigator/recastmeshbuilder.cpp
+++ b/components/detournavigator/recastmeshbuilder.cpp
@@ -155,6 +155,7 @@ namespace DetourNavigator
     std::shared_ptr<RecastMesh> RecastMeshBuilder::create(std::size_t generation, std::size_t revision)
     {
         optimizeRecastMesh(mIndices, mVertices);
+        std::sort(mWater.begin(), mWater.end());
         return std::make_shared<RecastMesh>(generation, revision, mIndices, mVertices, mAreaTypes,
             mWater, mSettings.get().mTrianglesPerChunk);
     }

From 3a2cea52714b26c69dfd89672dd1ad6a9886acac Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 4 Feb 2021 00:15:54 +0100
Subject: [PATCH 0327/2859] Use raw recast mesh data and off mesh connections
 for navmesh key

Serialization into a vector of chars produces inconsistent results that leads
to reduced cache hit rate. Using a structured object is a more clear solution
and allows to remove serialization and nontrivial key compare logic with more
straigt forward structured object comparison.
---
 .../detournavigator/navmeshtilescache.cpp     | 123 ++-----------
 .../detournavigator/navmeshtilescache.hpp     | 168 ++++++++++--------
 components/detournavigator/recastmesh.hpp     |   6 +
 3 files changed, 110 insertions(+), 187 deletions(-)

diff --git a/components/detournavigator/navmeshtilescache.cpp b/components/detournavigator/navmeshtilescache.cpp
index d9879fcbb6..84c658653a 100644
--- a/components/detournavigator/navmeshtilescache.cpp
+++ b/components/detournavigator/navmeshtilescache.cpp
@@ -9,52 +9,21 @@ namespace DetourNavigator
 {
     namespace
     {
-        inline std::vector<unsigned char> makeNavMeshKey(const RecastMesh& recastMesh,
-            const std::vector<OffMeshConnection>& offMeshConnections)
+        inline std::size_t getSize(const RecastMesh& recastMesh,
+                                   const std::vector<OffMeshConnection>& offMeshConnections)
         {
             const std::size_t indicesSize = recastMesh.getIndices().size() * sizeof(int);
             const std::size_t verticesSize = recastMesh.getVertices().size() * sizeof(float);
             const std::size_t areaTypesSize = recastMesh.getAreaTypes().size() * sizeof(AreaType);
             const std::size_t waterSize = recastMesh.getWater().size() * sizeof(RecastMesh::Water);
             const std::size_t offMeshConnectionsSize = offMeshConnections.size() * sizeof(OffMeshConnection);
-
-            std::vector<unsigned char> result(indicesSize + verticesSize + areaTypesSize + waterSize + offMeshConnectionsSize);
-            unsigned char* dst = result.data();
-
-            if (indicesSize > 0)
-            {
-                std::memcpy(dst, recastMesh.getIndices().data(), indicesSize);
-                dst += indicesSize;
-            }
-
-            if (verticesSize > 0)
-            {
-                std::memcpy(dst, recastMesh.getVertices().data(), verticesSize);
-                dst += verticesSize;
-            }
-
-            if (areaTypesSize > 0)
-            {
-                std::memcpy(dst, recastMesh.getAreaTypes().data(), areaTypesSize);
-                dst += areaTypesSize;
-            }
-
-            if (waterSize > 0)
-            {
-                std::memcpy(dst, recastMesh.getWater().data(), waterSize);
-                dst += waterSize;
-            }
-
-            if (offMeshConnectionsSize > 0)
-                std::memcpy(dst, offMeshConnections.data(), offMeshConnectionsSize);
-
-            return result;
+            return indicesSize + verticesSize + areaTypesSize + waterSize + offMeshConnectionsSize;
         }
     }
 
     NavMeshTilesCache::NavMeshTilesCache(const std::size_t maxNavMeshDataSize)
         : mMaxNavMeshDataSize(maxNavMeshDataSize), mUsedNavMeshDataSize(0), mFreeNavMeshDataSize(0),
-          mHitCount(0), mGetCount(0){}
+          mHitCount(0), mGetCount(0) {}
 
     NavMeshTilesCache::Value NavMeshTilesCache::get(const osg::Vec3f& agentHalfExtents, const TilePosition& changedTile,
         const RecastMesh& recastMesh, const std::vector<OffMeshConnection>& offMeshConnections)
@@ -71,7 +40,7 @@ namespace DetourNavigator
         if (tileValues == agentValues->second.end())
             return Value();
 
-        const auto tile = tileValues->second.mMap.find(RecastMeshKeyView(recastMesh, offMeshConnections));
+        const auto tile = tileValues->second.mMap.find(NavMeshKeyView(recastMesh, offMeshConnections));
         if (tile == tileValues->second.mMap.end())
             return Value();
 
@@ -96,8 +65,11 @@ namespace DetourNavigator
         if (navMeshSize > mFreeNavMeshDataSize + (mMaxNavMeshDataSize - mUsedNavMeshDataSize))
             return Value();
 
-        auto navMeshKey = makeNavMeshKey(recastMesh, offMeshConnections);
-        const auto itemSize = navMeshSize + navMeshKey.size();
+        NavMeshKey navMeshKey {
+            RecastMeshData {recastMesh.getIndices(), recastMesh.getVertices(), recastMesh.getAreaTypes(), recastMesh.getWater()},
+            offMeshConnections
+        };
+        const auto itemSize = navMeshSize + getSize(recastMesh, offMeshConnections);
 
         if (itemSize > mFreeNavMeshDataSize + (mMaxNavMeshDataSize - mUsedNavMeshDataSize))
             return Value();
@@ -105,7 +77,7 @@ namespace DetourNavigator
         while (!mFreeItems.empty() && mUsedNavMeshDataSize + itemSize > mMaxNavMeshDataSize)
             removeLeastRecentlyUsed();
 
-        const auto iterator = mFreeItems.emplace(mFreeItems.end(), agentHalfExtents, changedTile, std::move(navMeshKey));
+        const auto iterator = mFreeItems.emplace(mFreeItems.end(), agentHalfExtents, changedTile, std::move(navMeshKey), itemSize);
         const auto emplaced = mValues[agentHalfExtents][changedTile].mMap.emplace(iterator->mNavMeshKey, iterator);
 
         if (!emplaced.second)
@@ -162,8 +134,8 @@ namespace DetourNavigator
         if (value == tileValues->second.mMap.end())
             return;
 
-        mUsedNavMeshDataSize -= getSize(item);
-        mFreeNavMeshDataSize -= getSize(item);
+        mUsedNavMeshDataSize -= item.mSize;
+        mFreeNavMeshDataSize -= item.mSize;
 
         tileValues->second.mMap.erase(value);
         mFreeItems.pop_back();
@@ -184,7 +156,7 @@ namespace DetourNavigator
             return;
 
         mBusyItems.splice(mBusyItems.end(), mFreeItems, iterator);
-        mFreeNavMeshDataSize -= getSize(*iterator);
+        mFreeNavMeshDataSize -= iterator->mSize;
     }
 
     void NavMeshTilesCache::releaseItem(ItemIterator iterator)
@@ -195,71 +167,6 @@ namespace DetourNavigator
         const std::lock_guard<std::mutex> lock(mMutex);
 
         mFreeItems.splice(mFreeItems.begin(), mBusyItems, iterator);
-        mFreeNavMeshDataSize += getSize(*iterator);
-    }
-
-    namespace
-    {
-        struct CompareBytes
-        {
-            const unsigned char* mRhsIt;
-            const unsigned char* const mRhsEnd;
-
-            template <class T>
-            int operator ()(const std::vector<T>& lhs)
-            {
-                const auto lhsBegin = reinterpret_cast<const char*>(lhs.data());
-                const auto lhsEnd = reinterpret_cast<const char*>(lhs.data() + lhs.size());
-                const auto lhsSize = static_cast<std::ptrdiff_t>(lhsEnd - lhsBegin);
-                const auto rhsSize = static_cast<std::ptrdiff_t>(mRhsEnd - mRhsIt);
-
-                if (lhsBegin == nullptr || mRhsIt == nullptr)
-                {
-                    if (lhsSize < rhsSize)
-                        return -1;
-                    else if (lhsSize > rhsSize)
-                        return 1;
-                    else
-                        return 0;
-                }
-
-                const auto size = std::min(lhsSize, rhsSize);
-
-                if (const auto result = std::memcmp(lhsBegin, mRhsIt, size))
-                    return result;
-
-                if (lhsSize > rhsSize)
-                    return 1;
-
-                mRhsIt += size;
-
-                return 0;
-            }
-        };
-    }
-
-    int NavMeshTilesCache::RecastMeshKeyView::compare(const std::vector<unsigned char>& other) const
-    {
-        CompareBytes compareBytes {other.data(), other.data() + other.size()};
-
-        if (const auto result = compareBytes(mRecastMesh.get().getIndices()))
-            return result;
-
-        if (const auto result = compareBytes(mRecastMesh.get().getVertices()))
-            return result;
-
-        if (const auto result = compareBytes(mRecastMesh.get().getAreaTypes()))
-            return result;
-
-        if (const auto result = compareBytes(mRecastMesh.get().getWater()))
-            return result;
-
-        if (const auto result = compareBytes(mOffMeshConnections.get()))
-            return result;
-
-        if (compareBytes.mRhsIt < compareBytes.mRhsEnd)
-            return -1;
-
-        return 0;
+        mFreeNavMeshDataSize += iterator->mSize;
     }
 }
diff --git a/components/detournavigator/navmeshtilescache.hpp b/components/detournavigator/navmeshtilescache.hpp
index 338ead3aad..25f4dc1878 100644
--- a/components/detournavigator/navmeshtilescache.hpp
+++ b/components/detournavigator/navmeshtilescache.hpp
@@ -27,6 +27,89 @@ namespace DetourNavigator
         int mSize;
     };
 
+    struct RecastMeshData
+    {
+        std::vector<int> mIndices;
+        std::vector<float> mVertices;
+        std::vector<AreaType> mAreaTypes;
+        std::vector<RecastMesh::Water> mWater;
+    };
+
+    inline bool operator <(const RecastMeshData& lhs, const RecastMeshData& rhs)
+    {
+        return std::tie(lhs.mIndices, lhs.mVertices, lhs.mAreaTypes, lhs.mWater)
+                < std::tie(rhs.mIndices, rhs.mVertices, rhs.mAreaTypes, rhs.mWater);
+    }
+
+    inline bool operator <(const RecastMeshData& lhs, const RecastMesh& rhs)
+    {
+        return std::tie(lhs.mIndices, lhs.mVertices, lhs.mAreaTypes, lhs.mWater)
+                < std::tie(rhs.getIndices(), rhs.getVertices(), rhs.getAreaTypes(), rhs.getWater());
+    }
+
+    inline bool operator <(const RecastMesh& lhs, const RecastMeshData& rhs)
+    {
+        return std::tie(lhs.getIndices(), lhs.getVertices(), lhs.getAreaTypes(), lhs.getWater())
+                < std::tie(rhs.mIndices, rhs.mVertices, rhs.mAreaTypes, rhs.mWater);
+    }
+
+    struct NavMeshKey
+    {
+        RecastMeshData mRecastMesh;
+        std::vector<OffMeshConnection> mOffMeshConnections;
+    };
+
+    inline bool operator <(const NavMeshKey& lhs, const NavMeshKey& rhs)
+    {
+        return std::tie(lhs.mRecastMesh, lhs.mOffMeshConnections)
+                < std::tie(rhs.mRecastMesh, rhs.mOffMeshConnections);
+    }
+
+    struct NavMeshKeyRef
+    {
+        std::reference_wrapper<const NavMeshKey> mRef;
+
+        explicit NavMeshKeyRef(const NavMeshKey& ref) : mRef(ref) {}
+    };
+
+    inline bool operator <(const NavMeshKeyRef& lhs, const NavMeshKeyRef& rhs)
+    {
+        return lhs.mRef.get() < rhs.mRef.get();
+    }
+
+    struct NavMeshKeyView
+    {
+        std::reference_wrapper<const RecastMesh> mRecastMesh;
+        std::reference_wrapper<const std::vector<OffMeshConnection>> mOffMeshConnections;
+
+        NavMeshKeyView(const RecastMesh& recastMesh, const std::vector<OffMeshConnection>& offMeshConnections)
+            : mRecastMesh(recastMesh), mOffMeshConnections(offMeshConnections) {}
+    };
+
+    inline bool operator <(const NavMeshKeyView& lhs, const NavMeshKey& rhs)
+    {
+        return std::tie(lhs.mRecastMesh.get(), lhs.mOffMeshConnections.get())
+                < std::tie(rhs.mRecastMesh, rhs.mOffMeshConnections);
+    }
+
+    inline bool operator <(const NavMeshKey& lhs, const NavMeshKeyView& rhs)
+    {
+        return std::tie(lhs.mRecastMesh, lhs.mOffMeshConnections)
+                < std::tie(rhs.mRecastMesh.get(), rhs.mOffMeshConnections.get());
+    }
+
+    template <class R>
+    inline bool operator <(const NavMeshKeyRef& lhs, const R& rhs)
+    {
+        return lhs.mRef.get() < rhs;
+    }
+
+    template <class L>
+    inline bool operator <(const L& lhs, const NavMeshKeyRef& rhs)
+    {
+        return lhs < rhs.mRef.get();
+    }
+
     class NavMeshTilesCache
     {
     public:
@@ -35,14 +118,16 @@ namespace DetourNavigator
             std::atomic<std::int64_t> mUseCount;
             osg::Vec3f mAgentHalfExtents;
             TilePosition mChangedTile;
-            std::vector<unsigned char> mNavMeshKey;
+            NavMeshKey mNavMeshKey;
             NavMeshData mNavMeshData;
+            std::size_t mSize;
 
-            Item(const osg::Vec3f& agentHalfExtents, const TilePosition& changedTile, std::vector<unsigned char>&& navMeshKey)
+            Item(const osg::Vec3f& agentHalfExtents, const TilePosition& changedTile, NavMeshKey&& navMeshKey, std::size_t size)
                 : mUseCount(0)
                 , mAgentHalfExtents(agentHalfExtents)
                 , mChangedTile(changedTile)
-                , mNavMeshKey(std::move(navMeshKey))
+                , mNavMeshKey(navMeshKey)
+                , mSize(size)
             {}
         };
 
@@ -115,79 +200,9 @@ namespace DetourNavigator
         void reportStats(unsigned int frameNumber, osg::Stats& stats) const;
 
     private:
-        class KeyView
-        {
-        public:
-            KeyView() = default;
-
-            virtual ~KeyView() = default;
-
-            KeyView(const std::vector<unsigned char>& value)
-                : mValue(&value) {}
-
-            const std::vector<unsigned char>& getValue() const
-            {
-                assert(mValue);
-                return *mValue;
-            }
-
-            virtual int compare(const std::vector<unsigned char>& other) const
-            {
-                assert(mValue);
-
-                const auto valueSize = mValue->size();
-                const auto otherSize = other.size();
-
-                if (const auto result = std::memcmp(mValue->data(), other.data(), std::min(valueSize, otherSize)))
-                    return result;
-
-                if (valueSize < otherSize)
-                    return -1;
-
-                if (valueSize > otherSize)
-                    return 1;
-
-                return 0;
-            }
-
-            virtual bool isLess(const KeyView& other) const
-            {
-                assert(mValue);
-                return other.compare(*mValue) > 0;
-            }
-
-            friend bool operator <(const KeyView& lhs, const KeyView& rhs)
-            {
-                return lhs.isLess(rhs);
-            }
-
-        private:
-            const std::vector<unsigned char>* mValue = nullptr;
-        };
-
-        class RecastMeshKeyView : public KeyView
-        {
-        public:
-            RecastMeshKeyView(const RecastMesh& recastMesh, const std::vector<OffMeshConnection>& offMeshConnections)
-                : mRecastMesh(recastMesh), mOffMeshConnections(offMeshConnections) {}
-
-            int compare(const std::vector<unsigned char>& other) const override;
-
-            bool isLess(const KeyView& other) const override
-            {
-                return compare(other.getValue()) < 0;
-            }
-
-            virtual ~RecastMeshKeyView() = default;
-
-        private:
-            std::reference_wrapper<const RecastMesh> mRecastMesh;
-            std::reference_wrapper<const std::vector<OffMeshConnection>> mOffMeshConnections;
-        };
-
         struct TileMap
         {
-            std::map<KeyView, ItemIterator> mMap;
+            std::map<NavMeshKeyRef, ItemIterator, std::less<>> mMap;
         };
 
         mutable std::mutex mMutex;
@@ -205,11 +220,6 @@ namespace DetourNavigator
         void acquireItemUnsafe(ItemIterator iterator);
 
         void releaseItem(ItemIterator iterator);
-
-        static std::size_t getSize(const Item& item)
-        {
-            return static_cast<std::size_t>(item.mNavMeshData.mSize) + item.mNavMeshKey.size();
-        }
     };
 }
 
diff --git a/components/detournavigator/recastmesh.hpp b/components/detournavigator/recastmesh.hpp
index 29f37822ec..746422ac82 100644
--- a/components/detournavigator/recastmesh.hpp
+++ b/components/detournavigator/recastmesh.hpp
@@ -95,6 +95,12 @@ namespace DetourNavigator
     {
         return std::tie(lhs.mCellSize, lhs.mTransform) < std::tie(rhs.mCellSize, rhs.mTransform);
     }
+
+    inline bool operator <(const RecastMesh& lhs, const RecastMesh& rhs)
+    {
+        return std::tie(lhs.getIndices(), lhs.getVertices(), lhs.getAreaTypes(), lhs.getWater())
+                < std::tie(rhs.getIndices(), rhs.getVertices(), rhs.getAreaTypes(), rhs.getWater());
+    }
 }
 
 #endif

From 68fe6b91145350c12487332cc26483f032f2ec64 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 4 Feb 2021 01:12:52 +0100
Subject: [PATCH 0328/2859] Use only item size to check whether item fits cache

Item size has to be counted anyway and there is no reason to check only navmesh
data first.
---
 components/detournavigator/navmeshtilescache.cpp | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/components/detournavigator/navmeshtilescache.cpp b/components/detournavigator/navmeshtilescache.cpp
index 84c658653a..b6048da589 100644
--- a/components/detournavigator/navmeshtilescache.cpp
+++ b/components/detournavigator/navmeshtilescache.cpp
@@ -55,27 +55,20 @@ namespace DetourNavigator
         const RecastMesh& recastMesh, const std::vector<OffMeshConnection>& offMeshConnections,
         NavMeshData&& value)
     {
-        const auto navMeshSize = static_cast<std::size_t>(value.mSize);
+        const auto itemSize = static_cast<std::size_t>(value.mSize) + getSize(recastMesh, offMeshConnections);
 
         const std::lock_guard<std::mutex> lock(mMutex);
 
-        if (navMeshSize > mMaxNavMeshDataSize)
+        if (itemSize > mFreeNavMeshDataSize + (mMaxNavMeshDataSize - mUsedNavMeshDataSize))
             return Value();
 
-        if (navMeshSize > mFreeNavMeshDataSize + (mMaxNavMeshDataSize - mUsedNavMeshDataSize))
-            return Value();
+        while (!mFreeItems.empty() && mUsedNavMeshDataSize + itemSize > mMaxNavMeshDataSize)
+            removeLeastRecentlyUsed();
 
         NavMeshKey navMeshKey {
             RecastMeshData {recastMesh.getIndices(), recastMesh.getVertices(), recastMesh.getAreaTypes(), recastMesh.getWater()},
             offMeshConnections
         };
-        const auto itemSize = navMeshSize + getSize(recastMesh, offMeshConnections);
-
-        if (itemSize > mFreeNavMeshDataSize + (mMaxNavMeshDataSize - mUsedNavMeshDataSize))
-            return Value();
-
-        while (!mFreeItems.empty() && mUsedNavMeshDataSize + itemSize > mMaxNavMeshDataSize)
-            removeLeastRecentlyUsed();
 
         const auto iterator = mFreeItems.emplace(mFreeItems.end(), agentHalfExtents, changedTile, std::move(navMeshKey), itemSize);
         const auto emplaced = mValues[agentHalfExtents][changedTile].mMap.emplace(iterator->mNavMeshKey, iterator);

From 61e014a7657092bf8ea1e426665ea3934169c560 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 4 Feb 2021 21:25:38 +0100
Subject: [PATCH 0329/2859] Allow negative values for ai stats

---
 CHANGELOG.md                          | 1 +
 apps/openmw/mwmechanics/stat.cpp      | 4 +++-
 apps/openmw/mwmechanics/stat.hpp      | 2 +-
 apps/openmw/mwscript/aiextensions.cpp | 6 ++----
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa74164d95..b5b66ee01b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -98,6 +98,7 @@
     Bug #5758: Paralyzed actors behavior is inconsistent with vanilla
     Bug #5762: Movement solver is insufficiently robust
     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
     Feature #390: 3rd person look "over the shoulder"
     Feature #1536: Show more information about level on menu
     Feature #2386: Distant Statics in the form of Object Paging
diff --git a/apps/openmw/mwmechanics/stat.cpp b/apps/openmw/mwmechanics/stat.cpp
index 7f71cf9b18..c87de2ccbb 100644
--- a/apps/openmw/mwmechanics/stat.cpp
+++ b/apps/openmw/mwmechanics/stat.cpp
@@ -18,8 +18,10 @@ namespace MWMechanics
     }
 
     template<typename T>
-    T Stat<T>::getModified() const
+    T Stat<T>::getModified(bool capped) const
     {
+        if(!capped)
+            return mModified;
         return std::max(static_cast<T>(0), mModified);
     }
 
diff --git a/apps/openmw/mwmechanics/stat.hpp b/apps/openmw/mwmechanics/stat.hpp
index 5f49da48e8..fb9dca9221 100644
--- a/apps/openmw/mwmechanics/stat.hpp
+++ b/apps/openmw/mwmechanics/stat.hpp
@@ -28,7 +28,7 @@ namespace MWMechanics
 
             const T& getBase() const;
 
-            T getModified() const;
+            T getModified(bool capped = true) const;
             T getCurrentModified() const;
             T getModifier() const;
             T getCurrentModifier() const;
diff --git a/apps/openmw/mwscript/aiextensions.cpp b/apps/openmw/mwscript/aiextensions.cpp
index 499c2f672d..223ae3a152 100644
--- a/apps/openmw/mwscript/aiextensions.cpp
+++ b/apps/openmw/mwscript/aiextensions.cpp
@@ -241,7 +241,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    runtime.push(ptr.getClass().getCreatureStats (ptr).getAiSetting (mIndex).getModified());
+                    runtime.push(ptr.getClass().getCreatureStats (ptr).getAiSetting (mIndex).getModified(false));
                 }
         };
         template<class R>
@@ -276,9 +276,7 @@ namespace MWScript
                     Interpreter::Type_Integer value = runtime[0].mInteger;
                     runtime.pop();
 
-                    MWMechanics::Stat<int> stat = ptr.getClass().getCreatureStats(ptr).getAiSetting(mIndex);
-                    stat.setModified(value, 0);
-                    ptr.getClass().getCreatureStats(ptr).setAiSetting(mIndex, stat);
+                    ptr.getClass().getCreatureStats(ptr).setAiSetting(mIndex, value);
                     ptr.getClass().setBaseAISetting(ptr.getCellRef().getRefId(), mIndex, value);
                 }
         };

From d5844b098295389c3b757a5a3c54f0627780d59b Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Thu, 4 Feb 2021 23:14:21 +0200
Subject: [PATCH 0330/2859] Use accompanying txt file for textkeys in
 osgAnimation formats

---
 components/resource/keyframemanager.cpp | 68 ++++++++++++++++++++-----
 components/resource/keyframemanager.hpp | 10 +++-
 2 files changed, 65 insertions(+), 13 deletions(-)

diff --git a/components/resource/keyframemanager.cpp b/components/resource/keyframemanager.cpp
index b6417597d5..923ce43265 100644
--- a/components/resource/keyframemanager.cpp
+++ b/components/resource/keyframemanager.cpp
@@ -18,7 +18,9 @@
 namespace Resource
 {
 
-    RetrieveAnimationsVisitor::RetrieveAnimationsVisitor(SceneUtil::KeyframeHolder& target, osg::ref_ptr<osgAnimation::BasicAnimationManager> animationManager) : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN), mTarget(target), mAnimationManager(animationManager) {}
+    RetrieveAnimationsVisitor::RetrieveAnimationsVisitor(SceneUtil::KeyframeHolder& target, osg::ref_ptr<osgAnimation::BasicAnimationManager> animationManager,
+        const std::string& normalized, const VFS::Manager* vfs) :
+        osg::NodeVisitor(TRAVERSE_ALL_CHILDREN), mTarget(target), mAnimationManager(animationManager), mNormalized(normalized), mVFS(vfs) {}
 
     void RetrieveAnimationsVisitor::apply(osg::Node& node)
     {
@@ -39,27 +41,19 @@ namespace Resource
 
                         osg::ref_ptr<Resource::Animation> mergedAnimationTrack = new Resource::Animation;
                         std::string animationName = animation->getName();
-                        std::string start = animationName + std::string(": start");
-                        std::string stop = animationName + std::string(": stop");
+                        mergedAnimationTrack->setName(animationName);
 
                         const osgAnimation::ChannelList& channels = animation->getChannels();
                         for (const auto& channel: channels)
                         {
                             mergedAnimationTrack->addChannel(channel.get()->clone()); // is ->clone needed?
                         }
-                        mergedAnimationTrack->setName(animation->getName());
+
                         callback->addMergedAnimationTrack(mergedAnimationTrack);
 
                         float startTime = animation->getStartTime();
                         float stopTime = startTime + animation->getDuration();
 
-                        // mTextKeys is a nif-thing, used by OpenMW's animation system
-                        // Format is likely "AnimationName: [Keyword_optional] [Start OR Stop]"
-                        // AnimationNames are keywords like idle2, idle3... AiPackages and various mechanics control which animations are played
-                        // Keywords can be stuff like Loop, Equip, Unequip, Block, InventoryHandtoHand, InventoryWeaponOneHand, PickProbe, Slash, Thrust, Chop... even "Slash Small Follow"
-                        mTarget.mTextKeys.emplace(startTime, std::move(start));
-                        mTarget.mTextKeys.emplace(stopTime, std::move(stop));
-
                         SceneUtil::EmulatedAnimation emulatedAnimation;
                         emulatedAnimation.mStartTime = startTime;
                         emulatedAnimation.mStopTime = stopTime;
@@ -67,12 +61,62 @@ namespace Resource
                         emulatedAnimations.emplace_back(emulatedAnimation);
                     }
                 }
+
+                // mTextKeys is a nif-thing, used by OpenMW's animation system
+                // Format is likely "AnimationName: [Keyword_optional] [Start OR Stop]"
+                // AnimationNames are keywords like idle2, idle3... AiPackages and various mechanics control which animations are played
+                // Keywords can be stuff like Loop, Equip, Unequip, Block, InventoryHandtoHand, InventoryWeaponOneHand, PickProbe, Slash, Thrust, Chop... even "Slash Small Follow"
+                // osgAnimation formats should have a .txt file with the same name, each line holding a textkey and whitespace separated time value
+                // e.g. idle: start 0.0333
+                try
+                {
+                    Files::IStreamPtr textKeysFile = mVFS->get(changeFileExtension(mNormalized, "txt"));
+                    std::string line;
+                    while ( getline (*textKeysFile, line) )
+                    {
+                        Log(Debug::Warning) << "add textkey ***" << parseTextKey(line) << "***" << parseTimeSignature(line) << "***";
+                        mTarget.mTextKeys.emplace(parseTimeSignature(line), std::move(parseTextKey(line)));
+                    }
+                }
+                catch (std::exception& e)
+                {
+                    Log(Debug::Warning) << "No textkey file found for " << mNormalized;
+                }
+
                 callback->setEmulatedAnimations(emulatedAnimations);
                 mTarget.mKeyframeControllers.emplace(node.getName(), callback);
             }
 
         traverse(node);
     }
+
+    std::string RetrieveAnimationsVisitor::parseTextKey(const std::string& line)
+    {
+        size_t spacePos = line.find_last_of(' ');
+        if (spacePos != std::string::npos)
+             return line.substr(0, spacePos);
+        return "";
+    }
+
+    double RetrieveAnimationsVisitor::parseTimeSignature(const std::string& line)
+    {
+        size_t spacePos = line.find_last_of(' ');
+        double time = 0.0;
+        if (spacePos != std::string::npos && spacePos + 1 < line.size())
+             time = std::stod(line.substr(spacePos + 1));
+        return time;
+    }
+
+    std::string RetrieveAnimationsVisitor::changeFileExtension(const std::string file, const std::string ext)
+    {
+        size_t extPos = file.find_last_of('.');
+        if (extPos != std::string::npos && extPos+1 < file.size())
+        {
+            return file.substr(0, extPos + 1) + ext;
+        }
+        return file;
+    }
+
 }
 
 namespace Resource
@@ -110,7 +154,7 @@ namespace Resource
                 osg::ref_ptr<osgAnimation::BasicAnimationManager> bam = dynamic_cast<osgAnimation::BasicAnimationManager*> (scene->getUpdateCallback());
                 if (bam)
                 {
-                    Resource::RetrieveAnimationsVisitor rav(*loaded.get(), bam);
+                    Resource::RetrieveAnimationsVisitor rav(*loaded.get(), bam, normalized, mVFS);
                     scene->accept(rav);
                 }
             }
diff --git a/components/resource/keyframemanager.hpp b/components/resource/keyframemanager.hpp
index 3e992ac5e9..87a20b97a5 100644
--- a/components/resource/keyframemanager.hpp
+++ b/components/resource/keyframemanager.hpp
@@ -15,13 +15,21 @@ namespace Resource
     class RetrieveAnimationsVisitor : public osg::NodeVisitor
     {
         public:
-            RetrieveAnimationsVisitor(SceneUtil::KeyframeHolder& target, osg::ref_ptr<osgAnimation::BasicAnimationManager> animationManager);
+            RetrieveAnimationsVisitor(SceneUtil::KeyframeHolder& target, osg::ref_ptr<osgAnimation::BasicAnimationManager> animationManager,
+                const std::string& normalized, const VFS::Manager* vfs);
 
             virtual void apply(osg::Node& node) override;
 
         private:
+
+            std::string changeFileExtension(const std::string file, const std::string ext);
+            std::string parseTextKey(const std::string& line);
+            double parseTimeSignature(const std::string& line);
+
             SceneUtil::KeyframeHolder& mTarget;
             osg::ref_ptr<osgAnimation::BasicAnimationManager> mAnimationManager;
+            std::string mNormalized;
+            const VFS::Manager* mVFS;
 
     };
 }

From 303f1912a6af88e49f96fc8260621a8e7519e48a Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Thu, 4 Feb 2021 23:14:52 +0200
Subject: [PATCH 0331/2859] less debug spam

---
 components/resource/keyframemanager.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/resource/keyframemanager.cpp b/components/resource/keyframemanager.cpp
index 923ce43265..0c33428e01 100644
--- a/components/resource/keyframemanager.cpp
+++ b/components/resource/keyframemanager.cpp
@@ -74,7 +74,6 @@ namespace Resource
                     std::string line;
                     while ( getline (*textKeysFile, line) )
                     {
-                        Log(Debug::Warning) << "add textkey ***" << parseTextKey(line) << "***" << parseTimeSignature(line) << "***";
                         mTarget.mTextKeys.emplace(parseTimeSignature(line), std::move(parseTextKey(line)));
                     }
                 }

From e42b67ee50b8d5950e183db51d750198d87db7f2 Mon Sep 17 00:00:00 2001
From: Noah Gooder <peterpan0413@live.com>
Date: Fri, 5 Feb 2021 17:59:36 +0000
Subject: [PATCH 0332/2859] Modified actors.cpp and Authors.md

---
 AUTHORS.md                         | 1 +
 apps/openmw/mwmechanics/actors.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index e6ff67293a..53efdd286f 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -215,6 +215,7 @@ Programmers
     Yohaulticetl
     Yuri Krupenin
     zelurker
+    Noah Gooder
 
 Documentation
 -------------
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index cb3570d21f..c0a1371585 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -951,7 +951,7 @@ namespace MWMechanics
             if (actor.getClass().hasInventoryStore(actor))
                 actor.getClass().getInventoryStore(actor).purgeEffect(ESM::MagicEffect::Poison);
         }
-        else if (effects.get(ESM::MagicEffect::CureParalyzation).getModifier() > 0)
+        if (effects.get(ESM::MagicEffect::CureParalyzation).getModifier() > 0)
         {
             creatureStats.getActiveSpells().purgeEffect(ESM::MagicEffect::Paralyze);
             creatureStats.getSpells().purgeEffect(ESM::MagicEffect::Paralyze);

From 3007cb14a9fa10ef2d17f53a2519030135d737db Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Fri, 5 Feb 2021 19:00:35 +0100
Subject: [PATCH 0333/2859] Also allow negative AI values in dialogue

---
 CHANGELOG.md                      | 1 +
 apps/openmw/mwdialogue/filter.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5b66ee01b..d25984a83d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -99,6 +99,7 @@
     Bug #5762: Movement solver is insufficiently robust
     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
     Feature #390: 3rd person look "over the shoulder"
     Feature #1536: Show more information about level on menu
     Feature #2386: Distant Statics in the form of Object Paging
diff --git a/apps/openmw/mwdialogue/filter.cpp b/apps/openmw/mwdialogue/filter.cpp
index a3c326ab8f..334a9db39f 100644
--- a/apps/openmw/mwdialogue/filter.cpp
+++ b/apps/openmw/mwdialogue/filter.cpp
@@ -316,7 +316,7 @@ int MWDialogue::Filter::getSelectStructInteger (const SelectWrapper& select) con
         case SelectWrapper::Function_AiSetting:
 
             return mActor.getClass().getCreatureStats (mActor).getAiSetting (
-                        (MWMechanics::CreatureStats::AiSetting)select.getArgument()).getModified();
+                        (MWMechanics::CreatureStats::AiSetting)select.getArgument()).getModified(false);
 
         case SelectWrapper::Function_PcAttribute:
 

From 6e969ca3fae992a54aea6452a81caf32e8418135 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Fri, 5 Feb 2021 12:12:34 +0100
Subject: [PATCH 0334/2859] Use mesh collision box instead of node bounding
 sphere for projectile size. The bounding sphere is much bigger than the mesh.

---
 apps/openmw/mwphysics/physicssystem.cpp   |  7 ++++++-
 apps/openmw/mwphysics/physicssystem.hpp   |  2 +-
 apps/openmw/mwworld/projectilemanager.cpp | 22 +++++++++++++---------
 apps/openmw/mwworld/projectilemanager.hpp |  2 +-
 components/resource/bulletshape.hpp       |  2 +-
 5 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 5a9a0be832..b434ff3406 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -682,9 +682,14 @@ namespace MWPhysics
         mActors.emplace(ptr, std::move(actor));
     }
 
-    int PhysicsSystem::addProjectile (const MWWorld::Ptr& caster, const osg::Vec3f& position, float radius, bool canTraverseWater)
+    int PhysicsSystem::addProjectile (const MWWorld::Ptr& caster, const osg::Vec3f& position, const std::string& mesh, bool computeRadius, bool canTraverseWater)
     {
+        osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance = mShapeManager->getInstance(mesh);
+        assert(shapeInstance);
+        float radius = computeRadius ? shapeInstance->mCollisionBox.extents.length() / 2.f : 1.f;
+
         mProjectileId++;
+
         auto projectile = std::make_shared<Projectile>(caster, position, radius, canTraverseWater, mTaskScheduler.get(), this);
         mProjectiles.emplace(mProjectileId, std::move(projectile));
 
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 715a6cd1a2..03d3020b9c 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -124,7 +124,7 @@ namespace MWPhysics
             void addObject (const MWWorld::Ptr& ptr, const std::string& mesh, osg::Quat rotation, int collisionType = CollisionType_World);
             void addActor (const MWWorld::Ptr& ptr, const std::string& mesh);
 
-            int addProjectile(const MWWorld::Ptr& caster, const osg::Vec3f& position, float radius, bool canTraverseWater);
+            int addProjectile(const MWWorld::Ptr& caster, const osg::Vec3f& position, const std::string& mesh, bool computeRadius, bool canTraverseWater);
             void updateProjectile(const int projectileId, const osg::Vec3f &position) const;
             void removeProjectile(const int projectileId);
 
diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index 092ce270e9..3ffc7bb953 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -189,7 +189,7 @@ namespace MWWorld
     };
 
 
-    float ProjectileManager::createModel(State &state, const std::string &model, const osg::Vec3f& pos, const osg::Quat& orient,
+    void ProjectileManager::createModel(State &state, const std::string &model, const osg::Vec3f& pos, const osg::Quat& orient,
                                         bool rotate, bool createLight, osg::Vec4 lightDiffuseColor, std::string texture)
     {
         state.mNode = new osg::PositionAttitudeTransform;
@@ -253,7 +253,6 @@ namespace MWWorld
         state.mNode->accept(assignVisitor);
 
         MWRender::overrideFirstRootTexture(texture, mResourceSystem, projectile);
-        return projectile->getBound().radius();
     }
 
     void ProjectileManager::update(State& state, float duration)
@@ -308,7 +307,8 @@ namespace MWWorld
 
         osg::Vec4 lightDiffuseColor = getMagicBoltLightDiffuseColor(state.mEffects);
 
-        const auto radius = createModel(state, ptr.getClass().getModel(ptr), pos, orient, true, true, lightDiffuseColor, texture);
+        auto model = ptr.getClass().getModel(ptr);
+        createModel(state, model, pos, orient, true, true, lightDiffuseColor, texture);
 
         MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
         for (const std::string &soundid : state.mSoundIds)
@@ -319,7 +319,10 @@ namespace MWWorld
                 state.mSounds.push_back(sound);
         }
 
-        state.mProjectileId = mPhysics->addProjectile(caster, pos, radius, false);
+        // in case there are multiple effects, the model is a dummy without geometry. Use the second effect for physics shape
+        if (state.mIdMagic.size() > 1)
+            model = "meshes\\" + MWBase::Environment::get().getWorld()->getStore().get<ESM::Weapon>().find(state.mIdMagic.at(1))->mModel;
+        state.mProjectileId = mPhysics->addProjectile(caster, pos, model, true, false);
         state.mToDelete = false;
         mMagicBolts.push_back(state);
     }
@@ -339,11 +342,12 @@ namespace MWWorld
         MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), projectile.getCellRef().getRefId());
         MWWorld::Ptr ptr = ref.getPtr();
 
-        createModel(state, ptr.getClass().getModel(ptr), pos, orient, false, false, osg::Vec4(0,0,0,0));
+        const auto model = ptr.getClass().getModel(ptr);
+        createModel(state, model, pos, orient, false, false, osg::Vec4(0,0,0,0));
         if (!ptr.getClass().getEnchantment(ptr).empty())
             SceneUtil::addEnchantedGlow(state.mNode, mResourceSystem, ptr.getClass().getEnchantmentColor(ptr));
 
-        state.mProjectileId = mPhysics->addProjectile(actor, pos, 1.f, true);
+        state.mProjectileId = mPhysics->addProjectile(actor, pos, model, false, true);
         state.mToDelete = false;
         mProjectiles.push_back(state);
     }
@@ -629,7 +633,7 @@ namespace MWWorld
                 int weaponType = ptr.get<ESM::Weapon>()->mBase->mData.mType;
                 state.mThrown = MWMechanics::getWeaponType(weaponType)->mWeaponClass == ESM::WeaponType::Thrown;
 
-                state.mProjectileId = mPhysics->addProjectile(state.getCaster(), osg::Vec3f(esm.mPosition), 1.f, true);
+                state.mProjectileId = mPhysics->addProjectile(state.getCaster(), osg::Vec3f(esm.mPosition), model, false, true);
             }
             catch(...)
             {
@@ -681,8 +685,8 @@ namespace MWWorld
             }
 
             osg::Vec4 lightDiffuseColor = getMagicBoltLightDiffuseColor(state.mEffects);
-            const auto radius = createModel(state, model, osg::Vec3f(esm.mPosition), osg::Quat(esm.mOrientation), true, true, lightDiffuseColor, texture);
-            state.mProjectileId = mPhysics->addProjectile(state.getCaster(), osg::Vec3f(esm.mPosition), radius, false);
+            createModel(state, model, osg::Vec3f(esm.mPosition), osg::Quat(esm.mOrientation), true, true, lightDiffuseColor, texture);
+            state.mProjectileId = mPhysics->addProjectile(state.getCaster(), osg::Vec3f(esm.mPosition), model, true, false);
 
             MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
             for (const std::string &soundid : state.mSoundIds)
diff --git a/apps/openmw/mwworld/projectilemanager.hpp b/apps/openmw/mwworld/projectilemanager.hpp
index e088dd7011..c047d90ddf 100644
--- a/apps/openmw/mwworld/projectilemanager.hpp
+++ b/apps/openmw/mwworld/projectilemanager.hpp
@@ -130,7 +130,7 @@ namespace MWWorld
         void moveProjectiles(float dt);
         void moveMagicBolts(float dt);
 
-        float createModel (State& state, const std::string& model, const osg::Vec3f& pos, const osg::Quat& orient,
+        void createModel (State& state, const std::string& model, const osg::Vec3f& pos, const osg::Quat& orient,
                             bool rotate, bool createLight, osg::Vec4 lightDiffuseColor, std::string texture = "");
         void update (State& state, float duration);
 
diff --git a/components/resource/bulletshape.hpp b/components/resource/bulletshape.hpp
index 7d9577ba02..8ad13fae14 100644
--- a/components/resource/bulletshape.hpp
+++ b/components/resource/bulletshape.hpp
@@ -32,7 +32,7 @@ namespace Resource
             osg::Vec3f extents;
             osg::Vec3f center;
         };
-        // Used for actors. mCollisionShape is used for actors only when we need to autogenerate collision box for creatures.
+        // Used for actors and projectiles. mCollisionShape is used for actors only when we need to autogenerate collision box for creatures.
         // For now, use one file <-> one resource for simplicity.
         CollisionBox mCollisionBox;
 

From 3e273a759acc8e238de5ce2ceb03d877405a6f0f Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Sat, 6 Feb 2021 16:41:46 +0000
Subject: [PATCH 0335/2859] Clarify method name now we're using it differently

---
 components/sceneutil/mwshadowtechnique.cpp | 6 +++---
 components/sceneutil/mwshadowtechnique.hpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
index 7476bc2190..ba903f6db3 100644
--- a/components/sceneutil/mwshadowtechnique.cpp
+++ b/components/sceneutil/mwshadowtechnique.cpp
@@ -1426,7 +1426,7 @@ void MWShadowTechnique::cull(osgUtil::CullVisitor& cv)
 
     if (numValidShadows>0)
     {
-        selectStateSetForRenderingShadow(*vdd, cv.getTraversalNumber());
+        prepareStateSetForRenderingShadow(*vdd, cv.getTraversalNumber());
     }
 
     // OSG_NOTICE<<"End of shadow setup Projection matrix "<<*cv.getProjectionMatrix()<<std::endl;
@@ -3004,9 +3004,9 @@ void MWShadowTechnique::cullShadowCastingScene(osgUtil::CullVisitor* cv, osg::Ca
     return;
 }
 
-osg::StateSet* MWShadowTechnique::selectStateSetForRenderingShadow(ViewDependentData& vdd, unsigned int traversalNumber) const
+osg::StateSet* MWShadowTechnique::prepareStateSetForRenderingShadow(ViewDependentData& vdd, unsigned int traversalNumber) const
 {
-    OSG_INFO<<"   selectStateSetForRenderingShadow() "<<vdd.getStateSet(traversalNumber)<<std::endl;
+    OSG_INFO<<"   prepareStateSetForRenderingShadow() "<<vdd.getStateSet(traversalNumber)<<std::endl;
 
     osg::ref_ptr<osg::StateSet> stateset = vdd.getStateSet(traversalNumber);
 
diff --git a/components/sceneutil/mwshadowtechnique.hpp b/components/sceneutil/mwshadowtechnique.hpp
index 5125247dda..7b934b7984 100644
--- a/components/sceneutil/mwshadowtechnique.hpp
+++ b/components/sceneutil/mwshadowtechnique.hpp
@@ -231,7 +231,7 @@ namespace SceneUtil {
 
         virtual void cullShadowCastingScene(osgUtil::CullVisitor* cv, osg::Camera* camera) const;
 
-        virtual osg::StateSet* selectStateSetForRenderingShadow(ViewDependentData& vdd, unsigned int traversalNumber) const;
+        virtual osg::StateSet* prepareStateSetForRenderingShadow(ViewDependentData& vdd, unsigned int traversalNumber) const;
 
     protected:
         virtual ~MWShadowTechnique();

From 6aa75c287aa86e7e1c44cd7cd15ae89cef0894c8 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 7 Feb 2021 00:15:01 +0100
Subject: [PATCH 0336/2859] Don't check magicka when casting free spells

---
 CHANGELOG.md                          | 1 +
 apps/openmw/mwmechanics/spellutil.cpp | 2 +-
 apps/openmw/mwworld/worldimp.cpp      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa74164d95..3e29a292f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -98,6 +98,7 @@
     Bug #5758: Paralyzed actors behavior is inconsistent with vanilla
     Bug #5762: Movement solver is insufficiently robust
     Bug #5821: NPCs from mods getting removed if mod order was changed
+    Bug #5841: Can't Cast Zero Cost Spells When Magicka is < 0
     Feature #390: 3rd person look "over the shoulder"
     Feature #1536: Show more information about level on menu
     Feature #2386: Distant Statics in the form of Object Paging
diff --git a/apps/openmw/mwmechanics/spellutil.cpp b/apps/openmw/mwmechanics/spellutil.cpp
index 8b2f5c46c8..0c667e680a 100644
--- a/apps/openmw/mwmechanics/spellutil.cpp
+++ b/apps/openmw/mwmechanics/spellutil.cpp
@@ -123,7 +123,7 @@ namespace MWMechanics
         if (spell->mData.mType != ESM::Spell::ST_Spell)
             return 100;
 
-        if (checkMagicka && stats.getMagicka().getCurrent() < spell->mData.mCost)
+        if (checkMagicka && spell->mData.mCost > 0 && stats.getMagicka().getCurrent() < spell->mData.mCost)
             return 0;
 
         if (spell->mData.mFlags & ESM::Spell::F_Always)
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 442672d2bf..d21c17a512 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -3009,7 +3009,7 @@ namespace MWWorld
             // Check mana
             bool godmode = (isPlayer && mGodMode);
             MWMechanics::DynamicStat<float> magicka = stats.getMagicka();
-            if (magicka.getCurrent() < spell->mData.mCost && !godmode)
+            if (spell->mData.mCost > 0 && magicka.getCurrent() < spell->mData.mCost && !godmode)
             {
                 message = "#{sMagicInsufficientSP}";
                 fail = true;

From 31b5150e0db3f2094d4ac4a67990a82529c69a83 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 7 Feb 2021 09:12:38 +0100
Subject: [PATCH 0337/2859] Fix implementation of Misc::swapEndiannessInplace

---
 components/misc/endianness.hpp | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/components/misc/endianness.hpp b/components/misc/endianness.hpp
index 1b43e584e5..8019d33ed8 100644
--- a/components/misc/endianness.hpp
+++ b/components/misc/endianness.hpp
@@ -2,6 +2,8 @@
 #define COMPONENTS_MISC_ENDIANNESS_H
 
 #include <cstdint>
+#include <cstring>
+#include <type_traits>
 
 namespace Misc
 {
@@ -15,20 +17,26 @@ namespace Misc
 
         if constexpr (sizeof(T) == 2)
         {
-            uint16_t& v16 = *reinterpret_cast<uint16_t*>(&v);
+            uint16_t v16;
+            std::memcpy(&v16, &v, sizeof(T));
             v16 = (v16 >> 8) | (v16 << 8);
+            std::memcpy(&v, &v16, sizeof(T));
         }
         if constexpr (sizeof(T) == 4)
         {
-            uint32_t& v32 = *reinterpret_cast<uint32_t*>(&v);
-            v32 = (v32 >> 24) | ((v32 >> 8) & 0xff00) | ((v32 & 0xff00) << 8) || v32 << 24;
+            uint32_t v32;
+            std::memcpy(&v32, &v, sizeof(T));
+            v32 = (v32 >> 24) | ((v32 >> 8) & 0xff00) | ((v32 & 0xff00) << 8) | v32 << 24;
+            std::memcpy(&v, &v32, sizeof(T));
         }
         if constexpr (sizeof(T) == 8)
         {
-            uint64_t& v64 = *reinterpret_cast<uint64_t*>(&v);
+            uint64_t v64;
+            std::memcpy(&v64, &v, sizeof(T));
             v64 = (v64 >> 56) | ((v64 & 0x00ff'0000'0000'0000) >> 40) | ((v64 & 0x0000'ff00'0000'0000) >> 24)
                 | ((v64 & 0x0000'00ff'0000'0000) >> 8) | ((v64 & 0x0000'0000'ff00'0000) << 8)
                 | ((v64 & 0x0000'0000'00ff'0000) << 24) | ((v64 & 0x0000'0000'0000'ff00) << 40) | (v64 << 56);
+            std::memcpy(&v, &v64, sizeof(T));
         }
     }
 

From f1caeea4445cbe8c0b235203867a86512cd5f120 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 7 Feb 2021 11:58:23 +0100
Subject: [PATCH 0338/2859] Don't return negative values from GetMagicka

---
 apps/openmw/mwscript/statsextensions.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp
index 58a943e1a9..ab3287c9a4 100644
--- a/apps/openmw/mwscript/statsextensions.cpp
+++ b/apps/openmw/mwscript/statsextensions.cpp
@@ -187,6 +187,9 @@ namespace MWScript
                                 .getCreatureStats(ptr)
                                 .getDynamic(mIndex)
                                 .getCurrent();
+                        // GetMagicka shouldn't return negative values
+                        if(mIndex == 1 && value < 0)
+                            value = 0;
                     }
                     runtime.push (value);
                 }

From 39c2c19daee5d4cff5379a077bdee4d75ab07d7a Mon Sep 17 00:00:00 2001
From: Jonas Tobias Hopusch <jotoho-git@mailbox.org>
Date: Sun, 7 Feb 2021 12:53:06 +0100
Subject: [PATCH 0339/2859] Update 'toggle sneak' documentation

The docs now correctly say that this setting can be changed in the launcher,
instead of insisting it's a config-file-only setting.
Closes #5844

Signed-off-by: Jonas Tobias Hopusch <jotoho-git@mailbox.org>
---
 CHANGELOG.md                                     | 1 +
 docs/source/reference/modding/settings/input.rst | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d25984a83d..20932c89f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -132,6 +132,7 @@
     Feature #5813: Instanced groundcover support
     Task #5480: Drop Qt4 support
     Task #5520: Improve cell name autocompleter implementation
+    Task #5844: Update 'toggle sneak' documentation
 
 0.46.0
 ------
diff --git a/docs/source/reference/modding/settings/input.rst b/docs/source/reference/modding/settings/input.rst
index 8a95686cfc..d04c267a76 100644
--- a/docs/source/reference/modding/settings/input.rst
+++ b/docs/source/reference/modding/settings/input.rst
@@ -38,7 +38,7 @@ This setting causes the behavior of the sneak key (bound to Ctrl by default)
 to toggle sneaking on and off rather than requiring the key to be held down while sneaking.
 Players that spend significant time sneaking may find the character easier to control with this option enabled.
 
-This setting can only be configured by editing the settings configuration file.
+This setting can be toggled in the launcher under "Advanced" -> "Game Mechanics" -> "Toggle sneak".
 
 always run
 ----------

From af0f94f03e373f79823a86fa40e59de9fbfa0788 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 7 Feb 2021 12:55:10 +0100
Subject: [PATCH 0340/2859] Play damage sound when hurt by elemental shields

---
 CHANGELOG.md                       | 1 +
 apps/openmw/mwmechanics/combat.cpp | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d25984a83d..6c4c241b93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -100,6 +100,7 @@
     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 #5840: GetSoundPlaying "Health Damage" doesn't play when NPC hits target with shield effect ( vanilla engine behavior )
     Feature #390: 3rd person look "over the shoulder"
     Feature #1536: Show more information about level on menu
     Feature #2386: Distant Statics in the form of Object Paging
diff --git a/apps/openmw/mwmechanics/combat.cpp b/apps/openmw/mwmechanics/combat.cpp
index 183845b8c1..fd3f318117 100644
--- a/apps/openmw/mwmechanics/combat.cpp
+++ b/apps/openmw/mwmechanics/combat.cpp
@@ -345,6 +345,8 @@ namespace MWMechanics
             MWMechanics::DynamicStat<float> health = attackerStats.getHealth();
             health.setCurrent(health.getCurrent() - x);
             attackerStats.setHealth(health);
+
+            MWBase::Environment::get().getSoundManager()->playSound3D(attacker, "Health Damage", 1.0f, 1.0f);
         }
     }
 

From b78820de5563c92184d31c1d44af122b4b830364 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sun, 7 Feb 2021 18:32:03 +0100
Subject: [PATCH 0341/2859] Ignore projectiles inside of
 MovementSolver::unstuck. It is normal for actors to be inside of a projectile
 collision shape. A side effect of moving actors outside of projectile
 collision shape is that if both the actor and the projectile are near a wall,
 the actor could get moved outside of the world.

---
 apps/openmw/mwphysics/movementsolver.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwphysics/movementsolver.cpp b/apps/openmw/mwphysics/movementsolver.cpp
index 9d29574098..5f0322a1f2 100644
--- a/apps/openmw/mwphysics/movementsolver.cpp
+++ b/apps/openmw/mwphysics/movementsolver.cpp
@@ -38,7 +38,7 @@ namespace MWPhysics
         ContactCollectionCallback(const btCollisionObject * me, osg::Vec3f velocity) : mMe(me)
         {
             m_collisionFilterGroup = me->getBroadphaseHandle()->m_collisionFilterGroup;
-            m_collisionFilterMask = me->getBroadphaseHandle()->m_collisionFilterMask;
+            m_collisionFilterMask = me->getBroadphaseHandle()->m_collisionFilterMask & ~CollisionType_Projectile;
             mVelocity = Misc::Convert::toBullet(velocity);
         }
         btScalar addSingleResult(btManifoldPoint & contact, const btCollisionObjectWrapper * colObj0Wrap, int partId0, int index0, const btCollisionObjectWrapper * colObj1Wrap, int partId1, int index1) override

From da6223fc4b7f5bb98143b6a5bd1585ce93fd9a92 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Sun, 7 Feb 2021 23:27:45 +0000
Subject: [PATCH 0342/2859] Use default icon.tga when inventory icon is missing

---
 apps/openmw/mwgui/itemwidget.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/itemwidget.cpp b/apps/openmw/mwgui/itemwidget.cpp
index 940e95a7e9..7c7fa88287 100644
--- a/apps/openmw/mwgui/itemwidget.cpp
+++ b/apps/openmw/mwgui/itemwidget.cpp
@@ -6,6 +6,9 @@
 #include <MyGUI_TextBox.h>
 
 // correctIconPath
+#include <components/resource/resourcesystem.hpp>
+#include <components/vfs/manager.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 
@@ -106,7 +109,10 @@ namespace MWGui
         std::string invIcon = ptr.getClass().getInventoryIcon(ptr);
         if (invIcon.empty())
             invIcon = "default icon.tga";
-        setIcon(MWBase::Environment::get().getWindowManager()->correctIconPath(invIcon));
+        invIcon = MWBase::Environment::get().getWindowManager()->correctIconPath(invIcon);
+        if (!MWBase::Environment::get().getResourceSystem()->getVFS()->exists(invIcon))
+            invIcon = MWBase::Environment::get().getWindowManager()->correctIconPath("default icon.tga");
+        setIcon(invIcon);
     }
 
 

From 034a7a9dbca2094e3e76bcd075b06ea30ca03ddd Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Sun, 7 Feb 2021 23:45:53 +0000
Subject: [PATCH 0343/2859] Add changelog entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b88e9ee81..83ad5725e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -109,6 +109,7 @@
     Feature #2686: Timestamps in openmw.log
     Feature #3171: OpenMW-CS: Instance drag selection
     Feature #4894: Consider actors as obstacles for pathfinding
+    Feature #4977: Use the "default icon.tga" when an item's icon is not found
     Feature #5043: Head Bobbing
     Feature #5199: Improve Scene Colors
     Feature #5297: Add a search function to the "Datafiles" tab of the OpenMW launcher

From f3271cb66b1222cfbce3a588858c5b0fe004dcf7 Mon Sep 17 00:00:00 2001
From: Sergey Fukanchik <fukanchik@gmail.com>
Date: Tue, 9 Feb 2021 13:09:36 -0500
Subject: [PATCH 0344/2859] Add unit test for swapEndiannessInplace(). Part of
 Bug #5837

---
 apps/openmw_test_suite/CMakeLists.txt         |   1 +
 .../misc/test_endianness.cpp                  | 122 ++++++++++++++++++
 components/misc/endianness.hpp                |   2 +-
 3 files changed, 124 insertions(+), 1 deletion(-)
 create mode 100644 apps/openmw_test_suite/misc/test_endianness.cpp

diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index 5658a5eefc..a3bb0c6f87 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -15,6 +15,7 @@ if (GTEST_FOUND AND GMOCK_FOUND)
         esm/test_fixed_string.cpp
 
         misc/test_stringops.cpp
+        misc/test_endianness.cpp
 
         nifloader/testbulletnifloader.cpp
 
diff --git a/apps/openmw_test_suite/misc/test_endianness.cpp b/apps/openmw_test_suite/misc/test_endianness.cpp
new file mode 100644
index 0000000000..240e4a49ac
--- /dev/null
+++ b/apps/openmw_test_suite/misc/test_endianness.cpp
@@ -0,0 +1,122 @@
+#include <gtest/gtest.h>
+#include "components/misc/endianness.hpp"
+
+struct EndiannessTest : public ::testing::Test {};
+
+TEST_F(EndiannessTest, test_swap_endianness_inplace1)
+{
+  uint8_t zero=0x00;
+  uint8_t ff=0xFF;
+  uint8_t fortytwo=0x42;
+  uint8_t half=128;
+
+  Misc::swapEndiannessInplace(zero);
+  EXPECT_EQ(zero, 0x00);
+
+  Misc::swapEndiannessInplace(ff);
+  EXPECT_EQ(ff, 0xFF);
+
+  Misc::swapEndiannessInplace(fortytwo);
+  EXPECT_EQ(fortytwo, 0x42);
+
+  Misc::swapEndiannessInplace(half);
+  EXPECT_EQ(half, 128);
+}
+
+TEST_F(EndiannessTest, test_swap_endianness_inplace2)
+{
+  uint16_t zero = 0x0000;
+  uint16_t ffff = 0xFFFF;
+  uint16_t n12 = 0x0102;
+  uint16_t fortytwo = 0x0042;
+
+  Misc::swapEndiannessInplace(zero);
+  EXPECT_EQ(zero, 0x0000);
+  Misc::swapEndiannessInplace(zero);
+  EXPECT_EQ(zero, 0x0000);
+
+  Misc::swapEndiannessInplace(ffff);
+  EXPECT_EQ(ffff, 0xFFFF);
+  Misc::swapEndiannessInplace(ffff);
+  EXPECT_EQ(ffff, 0xFFFF);
+
+  Misc::swapEndiannessInplace(n12);
+  EXPECT_EQ(n12, 0x0201);
+  Misc::swapEndiannessInplace(n12);
+  EXPECT_EQ(n12, 0x0102);
+
+  Misc::swapEndiannessInplace(fortytwo);
+  EXPECT_EQ(fortytwo, 0x4200);
+  Misc::swapEndiannessInplace(fortytwo);
+  EXPECT_EQ(fortytwo, 0x0042);
+}
+
+TEST_F(EndiannessTest, test_swap_endianness_inplace4)
+{
+  uint32_t zero = 0x00000000;
+  uint32_t n1234 = 0x01020304;
+  uint32_t ffff = 0xFFFFFFFF;
+
+  Misc::swapEndiannessInplace(zero);
+  EXPECT_EQ(zero, 0x00000000);
+  Misc::swapEndiannessInplace(zero);
+  EXPECT_EQ(zero, 0x00000000);
+
+  Misc::swapEndiannessInplace(n1234);
+  EXPECT_EQ(n1234, 0x04030201);
+  Misc::swapEndiannessInplace(n1234);
+  EXPECT_EQ(n1234, 0x01020304);
+  
+  Misc::swapEndiannessInplace(ffff);
+  EXPECT_EQ(ffff, 0xFFFFFFFF);
+  Misc::swapEndiannessInplace(ffff);
+  EXPECT_EQ(ffff, 0xFFFFFFFF);
+}
+
+TEST_F(EndiannessTest, test_swap_endianness_inplace8)
+{
+  uint64_t zero = 0x0000'0000'0000'0000;
+  uint64_t n1234 = 0x0102'0304'0506'0708;
+  uint64_t ffff = 0xFFFF'FFFF'FFFF'FFFF;
+
+  Misc::swapEndiannessInplace(zero);
+  EXPECT_EQ(zero, 0x0000'0000'0000'0000);
+  Misc::swapEndiannessInplace(zero);
+  EXPECT_EQ(zero, 0x0000'0000'0000'0000);
+  
+  Misc::swapEndiannessInplace(ffff);
+  EXPECT_EQ(ffff, 0xFFFF'FFFF'FFFF'FFFF);
+  Misc::swapEndiannessInplace(ffff);
+  EXPECT_EQ(ffff, 0xFFFF'FFFF'FFFF'FFFF);
+
+  Misc::swapEndiannessInplace(n1234);
+  EXPECT_EQ(n1234, 0x0807'0605'0403'0201);
+  Misc::swapEndiannessInplace(n1234);
+  EXPECT_EQ(n1234, 0x0102'0304'0506'0708);
+}
+
+TEST_F(EndiannessTest, test_swap_endianness_inplace_float)
+{
+  const uint32_t original = 0x4023d70a;
+  const uint32_t expected = 0x0ad72340;
+
+  float number;
+  memcpy(&number, &original, sizeof(original));
+
+  Misc::swapEndiannessInplace(number);
+
+  EXPECT_TRUE(!memcmp(&number, &expected, sizeof(expected)));
+}
+
+TEST_F(EndiannessTest, test_swap_endianness_inplace_double)
+{
+  const uint64_t original = 0x040047ae147ae147ul;
+  const uint64_t expected = 0x47e17a14ae470004ul;
+
+  double number;
+  memcpy(&number, &original, sizeof(original));
+
+  Misc::swapEndiannessInplace(number);
+
+  EXPECT_TRUE(!memcmp(&number, &expected, sizeof(expected)) );
+}
diff --git a/components/misc/endianness.hpp b/components/misc/endianness.hpp
index 8019d33ed8..ad8aba18c7 100644
--- a/components/misc/endianness.hpp
+++ b/components/misc/endianness.hpp
@@ -26,7 +26,7 @@ namespace Misc
         {
             uint32_t v32;
             std::memcpy(&v32, &v, sizeof(T));
-            v32 = (v32 >> 24) | ((v32 >> 8) & 0xff00) | ((v32 & 0xff00) << 8) | v32 << 24;
+            v32 = (v32 >> 24) | ((v32 >> 8) & 0xff00) | ((v32 & 0xff00) << 8) | (v32 << 24);
             std::memcpy(&v, &v32, sizeof(T));
         }
         if constexpr (sizeof(T) == 8)

From f8f6d63d4c34d0284123e664dfcdcde6db7b1c15 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Tue, 9 Feb 2021 21:56:21 +0000
Subject: [PATCH 0345/2859] Optimise groundcover lighting

---
 files/shaders/lighting.glsl | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/files/shaders/lighting.glsl b/files/shaders/lighting.glsl
index 5eae890291..a2dcc758a8 100644
--- a/files/shaders/lighting.glsl
+++ b/files/shaders/lighting.glsl
@@ -13,22 +13,13 @@ void perLight(out vec3 ambientOut, out vec3 diffuseOut, int lightIndex, vec3 vie
 #ifndef GROUNDCOVER
     lambert = max(lambert, 0.0);
 #else
+    float eyeCosine = dot(normalize(viewPos), viewNormal.xyz);
+    if (lambert < 0.0)
     {
-        float cosine = dot(normalize(viewPos), normalize(viewNormal.xyz));
-        if (lambert >= 0.0)
-            cosine = -cosine;
-
-        float mult = 1.0;
-        float divisor = 8.0;
-
-        if (cosine < 0.0 && cosine >= -1.0/divisor)
-            mult = mix(1.0, 0.3, -cosine*divisor);
-        else if (cosine < -1.0/divisor)
-            mult = 0.3;
-
-        lambert *= mult;
-        lambert = abs(lambert);
+        lambert = -lambert;
+        eyeCosine = -eyeCosine;
     }
+    lambert *= clamp(-8.0 * (1.0 - 0.3) * eyeCosine + 1.0, 0.3, 1.0);
 #endif
     diffuseOut = gl_LightSource[lightIndex].diffuse.xyz * lambert;
 }

From 2e73d2c1451f080d854b51de89ce77893ebbf67d Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 10 Feb 2021 22:13:04 +0100
Subject: [PATCH 0346/2859] Fallback to default cell name for door destination

---
 CHANGELOG.md                     |  1 +
 apps/openmw/mwbase/world.hpp     |  1 +
 apps/openmw/mwclass/door.cpp     | 27 ++++++---------------------
 apps/openmw/mwworld/worldimp.cpp | 16 +++++++++++-----
 apps/openmw/mwworld/worldimp.hpp |  1 +
 5 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83ad5725e6..acfdc9e50b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -100,6 +100,7 @@
     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
     Feature #390: 3rd person look "over the shoulder"
diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index a3b035a8dd..194e8f6956 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -185,6 +185,7 @@ namespace MWBase
             ///
             /// \note If cell==0, the cell the player is currently in will be used instead to
             /// generate a name.
+            virtual std::string getCellName(const ESM::Cell* cell) const = 0;
 
             virtual void removeRefScript (MWWorld::RefData *ref) = 0;
             //< Remove the script attached to ref from mLocalScripts
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index ba51d9c2bc..25f7fc4568 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -302,30 +302,15 @@ namespace MWClass
 
     std::string Door::getDestination (const MWWorld::LiveCellRef<ESM::Door>& door)
     {
-        const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
-
-        std::string dest;
-        if (door.mRef.getDestCell() != "")
-        {
-            // door leads to an interior, use interior name as tooltip
-            dest = door.mRef.getDestCell();
-        }
-        else
+        std::string dest = door.mRef.getDestCell();
+        if (dest.empty())
         {
             // door leads to exterior, use cell name (if any), otherwise translated region name
             int x,y;
-            MWBase::Environment::get().getWorld()->positionToIndex (door.mRef.getDoorDest().pos[0], door.mRef.getDoorDest().pos[1], x, y);
-            const ESM::Cell* cell = store.get<ESM::Cell>().find(x,y);
-            if (cell->mName != "")
-                dest = cell->mName;
-            else
-            {
-                const ESM::Region* region =
-                    store.get<ESM::Region>().find(cell->mRegion);
-
-                //name as is, not a token
-                return MyGUI::TextIterator::toTagsString(region->mName);
-            }
+            auto world = MWBase::Environment::get().getWorld();
+            world->positionToIndex (door.mRef.getDoorDest().pos[0], door.mRef.getDoorDest().pos[1], x, y);
+            const ESM::Cell* cell = world->getStore().get<ESM::Cell>().search(x,y);
+            dest = world->getCellName(cell);
         }
 
         return "#{sCell=" + dest + "}";
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index d21c17a512..651d93ec58 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -656,13 +656,19 @@ namespace MWWorld
     {
         if (!cell)
             cell = mWorldScene->getCurrentCell();
+        return getCellName(cell->getCell());
+    }
 
-        if (!cell->getCell()->isExterior() || !cell->getCell()->mName.empty())
-            return cell->getCell()->mName;
-
-        if (const ESM::Region* region = mStore.get<ESM::Region>().search (cell->getCell()->mRegion))
-            return region->mName;
+    std::string World::getCellName(const ESM::Cell* cell) const
+    {
+        if (cell)
+        {
+            if (!cell->isExterior() || !cell->mName.empty())
+                return cell->mName;
 
+            if (const ESM::Region* region = mStore.get<ESM::Region>().search (cell->mRegion))
+                return region->mName;
+        }
         return mStore.get<ESM::GameSetting>().find ("sDefaultCellname")->mValue.getString();
     }
 
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 29d29a1604..bc2baafd8a 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -281,6 +281,7 @@ namespace MWWorld
             ///
             /// \note If cell==0, the cell the player is currently in will be used instead to
             /// generate a name.
+            std::string getCellName(const ESM::Cell* cell) const override;
 
             void removeRefScript (MWWorld::RefData *ref) override;
             //< Remove the script attached to ref from mLocalScripts

From c97980a0f679e2f89955c4ab1ab6900e4ac271a8 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Thu, 11 Feb 2021 01:35:32 +0000
Subject: [PATCH 0347/2859] Don't force linker to work with doubly-defined
 symbols

---
 CMakeLists.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 226511b527..fe88618158 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -440,8 +440,6 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
     if (CMAKE_CXX_COMPILER_ID STREQUAL GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 5.0 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 5.0)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsuggest-override")
     endif()
-elseif (MSVC)
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /FORCE:MULTIPLE")
 endif (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
 
 # Extern

From 8ab5fd9b406408fdab50a52a37871aeb69fb326a Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 11 Feb 2021 18:19:55 +0100
Subject: [PATCH 0348/2859] Fix frame rate limit

Measure time at the computation end but before sleep. This allows to adjust
sleep interval for the next frame in case sleep is not precise due to syscall
overhead or too low timer resolution.

Remove old frame limiting mechanism.
---
 apps/openmw/engine.cpp                 | 14 ++++---
 apps/openmw/mwbase/environment.cpp     | 15 -------
 apps/openmw/mwbase/environment.hpp     |  1 -
 apps/openmw/mwgui/windowmanagerimp.cpp | 15 ++++---
 components/misc/frameratelimiter.hpp   | 56 ++++++++++++++++++++++++++
 5 files changed, 72 insertions(+), 29 deletions(-)
 create mode 100644 components/misc/frameratelimiter.hpp

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 0e4cf762ac..d7c315323d 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -38,6 +38,8 @@
 
 #include <components/detournavigator/navigator.hpp>
 
+#include <components/misc/frameratelimiter.hpp>
+
 #include "mwinput/inputmanagerimp.hpp"
 
 #include "mwgui/windowmanagerimp.hpp"
@@ -918,13 +920,15 @@ void OMW::Engine::go()
     }
 
     // Start the main rendering loop
-    osg::Timer frameTimer;
     double simulationTime = 0.0;
+    Misc::FrameRateLimiter frameRateLimiter = Misc::makeFrameRateLimiter(mEnvironment.getFrameRateLimit());
+    const std::chrono::steady_clock::duration maxSimulationInterval(std::chrono::milliseconds(200));
     while (!mViewer->done() && !mEnvironment.getStateManager()->hasQuitRequest())
     {
-        double dt = frameTimer.time_s();
-        frameTimer.setStartTick();
-        dt = std::min(dt, 0.2);
+        const double dt = std::chrono::duration_cast<std::chrono::duration<double>>(std::min(
+            frameRateLimiter.getLastFrameDuration(),
+            maxSimulationInterval
+        )).count();
 
         mViewer->advance(simulationTime);
 
@@ -960,7 +964,7 @@ void OMW::Engine::go()
             }
         }
 
-        mEnvironment.limitFrameRate(frameTimer.time_s());
+        frameRateLimiter.limit();
     }
 
     // Save user settings
diff --git a/apps/openmw/mwbase/environment.cpp b/apps/openmw/mwbase/environment.cpp
index 9014fafff9..b7235edd4b 100644
--- a/apps/openmw/mwbase/environment.cpp
+++ b/apps/openmw/mwbase/environment.cpp
@@ -1,8 +1,6 @@
 #include "environment.hpp"
 
 #include <cassert>
-#include <chrono>
-#include <thread>
 
 #include <components/resource/resourcesystem.hpp>
 
@@ -98,19 +96,6 @@ float MWBase::Environment::getFrameRateLimit() const
     return mFrameRateLimit;
 }
 
-void MWBase::Environment::limitFrameRate(double dt) const
-{
-    if (mFrameRateLimit > 0.f)
-    {
-        double thisFrameTime = dt;
-        double minFrameTime = 1.0 / static_cast<double>(mFrameRateLimit);
-        if (thisFrameTime < minFrameTime)
-        {
-            std::this_thread::sleep_for(std::chrono::duration<double>(minFrameTime - thisFrameTime));
-        }
-    }
-}
-
 MWBase::World *MWBase::Environment::getWorld() const
 {
     assert (mWorld);
diff --git a/apps/openmw/mwbase/environment.hpp b/apps/openmw/mwbase/environment.hpp
index 7871153cc5..3b57e4e7c1 100644
--- a/apps/openmw/mwbase/environment.hpp
+++ b/apps/openmw/mwbase/environment.hpp
@@ -83,7 +83,6 @@ namespace MWBase
 
             void setFrameRateLimit(float frameRateLimit);
             float getFrameRateLimit() const;
-            void limitFrameRate(double dt) const;
 
             World *getWorld() const;
 
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index bfce908103..7da8cb7bd8 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -50,6 +50,7 @@
 #include <components/widgets/tags.hpp>
 
 #include <components/misc/resourcehelpers.hpp>
+#include <components/misc/frameratelimiter.hpp>
 
 #include "../mwbase/inputmanager.hpp"
 #include "../mwbase/statemanager.hpp"
@@ -710,12 +711,11 @@ namespace MWGui
 
         if (block)
         {
-            osg::Timer frameTimer;
+            Misc::FrameRateLimiter frameRateLimiter = Misc::makeFrameRateLimiter(MWBase::Environment::get().getFrameRateLimit());
             while (mMessageBoxManager->readPressedButton(false) == -1
                    && !MWBase::Environment::get().getStateManager()->hasQuitRequest())
             {
-                double dt = frameTimer.time_s();
-                frameTimer.setStartTick();
+                const double dt = std::chrono::duration_cast<std::chrono::duration<double>>(frameRateLimiter.getLastFrameDuration()).count();
 
                 mKeyboardNavigation->onFrame();
                 mMessageBoxManager->onFrame(dt);
@@ -734,7 +734,7 @@ namespace MWGui
                 // refer to the advance() and frame() order in Engine::go()
                 mViewer->advance(mViewer->getFrameStamp()->getSimulationTime());
 
-                MWBase::Environment::get().limitFrameRate(frameTimer.time_s());
+                frameRateLimiter.limit();
             }
         }
     }
@@ -1750,11 +1750,10 @@ namespace MWGui
                 ~MWSound::Type::Movie & MWSound::Type::Mask
             );
 
-        osg::Timer frameTimer;
+        Misc::FrameRateLimiter frameRateLimiter = Misc::makeFrameRateLimiter(MWBase::Environment::get().getFrameRateLimit());
         while (mVideoWidget->update() && !MWBase::Environment::get().getStateManager()->hasQuitRequest())
         {
-            double dt = frameTimer.time_s();
-            frameTimer.setStartTick();
+            const double dt = std::chrono::duration_cast<std::chrono::duration<double>>(frameRateLimiter.getLastFrameDuration()).count();
 
             MWBase::Environment::get().getInputManager()->update(dt, true, false);
 
@@ -1777,7 +1776,7 @@ namespace MWGui
             // refer to the advance() and frame() order in Engine::go()
             mViewer->advance(mViewer->getFrameStamp()->getSimulationTime());
 
-            MWBase::Environment::get().limitFrameRate(frameTimer.time_s());
+            frameRateLimiter.limit();
         }
         mVideoWidget->stop();
 
diff --git a/components/misc/frameratelimiter.hpp b/components/misc/frameratelimiter.hpp
new file mode 100644
index 0000000000..b8e2101651
--- /dev/null
+++ b/components/misc/frameratelimiter.hpp
@@ -0,0 +1,56 @@
+#ifndef OPENMW_COMPONENTS_MISC_FRAMERATELIMITER_H
+#define OPENMW_COMPONENTS_MISC_FRAMERATELIMITER_H
+
+#include <chrono>
+#include <thread>
+
+namespace Misc
+{
+    class FrameRateLimiter
+    {
+        public:
+            template <class Rep, class Ratio>
+            explicit FrameRateLimiter(std::chrono::duration<Rep, Ratio> maxFrameDuration,
+                                      std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now())
+                : mMaxFrameDuration(std::chrono::duration_cast<std::chrono::steady_clock::duration>(maxFrameDuration))
+                , mLastMeasurement(now)
+            {}
+
+            std::chrono::steady_clock::duration getLastFrameDuration() const
+            {
+                return mLastFrameDuration;
+            }
+
+            void limit(std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now())
+            {
+                const auto passed = now - mLastMeasurement;
+                const auto left = mMaxFrameDuration - passed;
+                if (left > left.zero())
+                {
+                    std::this_thread::sleep_for(left);
+                    mLastMeasurement = now + left;
+                    mLastFrameDuration = mMaxFrameDuration;
+                }
+                else
+                {
+                    mLastMeasurement = now;
+                    mLastFrameDuration = passed;
+                }
+            }
+
+        private:
+            std::chrono::steady_clock::duration mMaxFrameDuration;
+            std::chrono::steady_clock::time_point mLastMeasurement;
+            std::chrono::steady_clock::duration mLastFrameDuration;
+    };
+
+    inline Misc::FrameRateLimiter makeFrameRateLimiter(float frameRateLimit)
+    {
+        if (frameRateLimit > 0.0f)
+            return Misc::FrameRateLimiter(std::chrono::duration<float>(1.0f / frameRateLimit));
+        else
+            return Misc::FrameRateLimiter(std::chrono::steady_clock::duration::zero());
+    }
+}
+
+#endif

From bc4047d81552d825ea9f960cdaffe6fdc2ef3a6a Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Fri, 12 Feb 2021 19:03:02 +0100
Subject: [PATCH 0349/2859] Update engine stats for all levels above first, not
 only at the second.

---
 components/resource/stats.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/resource/stats.cpp b/components/resource/stats.cpp
index 690814f91d..4d07889d0c 100644
--- a/components/resource/stats.cpp
+++ b/components/resource/stats.cpp
@@ -127,7 +127,7 @@ bool Profiler::handle(const osgGA::GUIEventAdapter &ea, osgGA::GUIActionAdapter
     if (viewer)
     {
         // Add/remove openmw stats to the osd as necessary
-        viewer->getViewerStats()->collectStats("engine", _statsType == StatsHandler::StatsType::VIEWER_STATS);
+        viewer->getViewerStats()->collectStats("engine", _statsType >= StatsHandler::StatsType::VIEWER_STATS);
 
         if (_offlineCollect)
             CollectStatistics(viewer);

From 9d90e250cf51993d817874209936dd6dd59d3fb1 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Fri, 12 Feb 2021 19:33:08 +0100
Subject: [PATCH 0350/2859] Physics is not running while paused, so zero the
 stats for the async thread instead of keeping whatever value was before the
 pause.

---
 apps/openmw/mwworld/worldimp.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index d21c17a512..1f3a2428c5 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1861,6 +1861,13 @@ namespace MWWorld
         {
             doPhysics (duration, frameStart, frameNumber, stats);
         }
+        else
+        {
+            // zero the async stats if we are paused
+            stats.setAttribute(frameNumber, "physicsworker_time_begin", 0);
+            stats.setAttribute(frameNumber, "physicsworker_time_taken", 0);
+            stats.setAttribute(frameNumber, "physicsworker_time_end", 0);
+        }
     }
 
     void World::updatePlayer()

From c4e909c29e4f1bbb4c463bc015daf42610ad6ec5 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Fri, 12 Feb 2021 19:36:03 +0100
Subject: [PATCH 0351/2859] Silence a clang warning:     warning: moving a
 temporary object prevents copy elision [-Wpessimizing-move]

---
 components/resource/keyframemanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/resource/keyframemanager.cpp b/components/resource/keyframemanager.cpp
index 0c33428e01..f4ab79519e 100644
--- a/components/resource/keyframemanager.cpp
+++ b/components/resource/keyframemanager.cpp
@@ -74,7 +74,7 @@ namespace Resource
                     std::string line;
                     while ( getline (*textKeysFile, line) )
                     {
-                        mTarget.mTextKeys.emplace(parseTimeSignature(line), std::move(parseTextKey(line)));
+                        mTarget.mTextKeys.emplace(parseTimeSignature(line), parseTextKey(line));
                     }
                 }
                 catch (std::exception& e)

From 0736fec148fa68680a54a928c7fdc186bca9bab5 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Fri, 12 Feb 2021 19:21:07 +0000
Subject: [PATCH 0352/2859] Give binaries static filename

---
 .gitlab-ci.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 810e23d38e..2c45e19e66 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -116,12 +116,13 @@ variables: &cs-targets
     - .\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_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_symbols.zip '*.pdb'
+        7z a -tzip ..\..\OpenMW_MSVC2019_64_${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_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}.zip '*'
+    - 7z a -tzip ..\..\OpenMW_MSVC2019_64_${config}.zip '*'
   after_script:
     - Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log
   cache:
@@ -206,12 +207,13 @@ Windows_Ninja_CS_RelWithDebInfo:
     - 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_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_symbols.zip '*.pdb'
+        7z a -tzip ..\..\OpenMW_MSVC2019_64_${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_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}.zip '*'
+    - 7z a -tzip ..\..\OpenMW_MSVC2019_64_${config}.zip '*'
   after_script:
     - Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log
   cache:

From becccf3b5e30cff03a358295cf6dd1f547542022 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 10 Feb 2021 22:34:15 +0100
Subject: [PATCH 0353/2859] Make actor flee from a combat when cannot reach a
 target

---
 apps/openmw/mwmechanics/aicombat.cpp | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index b98d5ef491..4b01281191 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -262,6 +262,25 @@ namespace MWMechanics
             // start new attack
             storage.startAttackIfReady(actor, characterController, weapon, isRangedCombat);
         }
+        else if (!isRangedCombat && !mPathFinder.isPathConstructed() && storage.mCurrentAction->isAttackingOrSpell())
+        {
+            const osg::Vec3f position = actor.getRefData().getPosition().asVec3();
+            const osg::Vec3f destination = target.getRefData().getPosition().asVec3();
+            const osg::Vec3f halfExtents = MWBase::Environment::get().getWorld()->getPathfindingHalfExtents(actor);
+            mPathFinder.buildPath(actor, position, destination, actor.getCell(), getPathGridGraph(actor.getCell()),
+                                  halfExtents, getNavigatorFlags(actor), getAreaCosts(actor));
+
+            if (!mPathFinder.isPathConstructed())
+            {
+                storage.stopAttack();
+                characterController.setAttackingOrSpell(false);
+                currentAction.reset(new ActionFlee());
+                actionCooldown = currentAction->getActionCooldown();
+                storage.startFleeing();
+                MWBase::Environment::get().getDialogueManager()->say(actor, "flee");
+            }
+        }
+
         return false;
     }
 

From 5e5c0a1d8982fad48dbed3784da59201ba3954aa Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Sat, 13 Feb 2021 00:28:18 +0000
Subject: [PATCH 0354/2859] Add branch name back to filename

The URL needs to contain the branch name anyway, so there's no point
removing it.
---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2c45e19e66..6bfe0bf23a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -122,7 +122,7 @@ variables: &cs-targets
         7z a -tzip ..\..\OpenMW_MSVC2019_64_${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_${config}.zip '*'
+    - 7z a -tzip ..\..\OpenMW_MSVC2019_64_${config}_${CI_COMMIT_REF_NAME}.zip '*'
   after_script:
     - Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log
   cache:
@@ -213,7 +213,7 @@ Windows_Ninja_CS_RelWithDebInfo:
         7z a -tzip ..\..\OpenMW_MSVC2019_64_${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_${config}.zip '*'
+    - 7z a -tzip ..\..\OpenMW_MSVC2019_64_${config}_${CI_COMMIT_REF_NAME}.zip '*'
   after_script:
     - Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log
   cache:

From 8dba61f7aed8072edac0755454e0df7edd269531 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 14 Feb 2021 04:07:08 +0100
Subject: [PATCH 0355/2859] Use navmesh raycast to find reachable position
 around target

---
 apps/openmw/mwmechanics/aicombat.cpp          | 80 ++++++++++++++-----
 apps/openmw/mwmechanics/aicombat.hpp          |  7 +-
 .../detournavigator/navigator.cpp             | 22 +++++
 components/CMakeLists.txt                     |  1 +
 components/detournavigator/navigator.cpp      | 16 ++++
 components/detournavigator/navigator.hpp      | 11 +++
 components/detournavigator/raycast.cpp        | 44 ++++++++++
 components/detournavigator/raycast.hpp        | 19 +++++
 8 files changed, 178 insertions(+), 22 deletions(-)
 create mode 100644 components/detournavigator/raycast.cpp
 create mode 100644 components/detournavigator/raycast.hpp

diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index 4b01281191..58a9086720 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -8,6 +8,7 @@
 #include <components/misc/mathutil.hpp>
 
 #include <components/sceneutil/positionattitudetransform.hpp>
+#include <components/detournavigator/navigator.hpp>
 
 #include "../mwphysics/collisiontype.hpp"
 
@@ -127,10 +128,11 @@ namespace MWMechanics
             {
                 //Update every frame. UpdateLOS uses a timer, so the LOS check does not happen every frame.
                 updateLOS(actor, target, duration, storage);
-                float targetReachedTolerance = 0.0f;
-                if (storage.mLOS)
-                    targetReachedTolerance = storage.mAttackRange;
-                const bool is_target_reached = pathTo(actor, target.getRefData().getPosition().asVec3(), duration, targetReachedTolerance);
+                const float targetReachedTolerance = storage.mLOS && !storage.mUseCustomDestination
+                        ? storage.mAttackRange : 0.0f;
+                const osg::Vec3f destination = storage.mUseCustomDestination
+                        ? storage.mCustomDestination : target.getRefData().getPosition().asVec3();
+                const bool is_target_reached = pathTo(actor, destination, duration, targetReachedTolerance);
                 if (is_target_reached) storage.mReadyToAttack = true;
             }
 
@@ -232,8 +234,8 @@ namespace MWMechanics
         const ESM::Weapon* weapon = currentAction->getWeapon();
 
         ESM::Position pos = actor.getRefData().getPosition();
-        osg::Vec3f vActorPos(pos.asVec3());
-        osg::Vec3f vTargetPos(target.getRefData().getPosition().asVec3());
+        const osg::Vec3f vActorPos(pos.asVec3());
+        const osg::Vec3f vTargetPos(target.getRefData().getPosition().asVec3());
 
         osg::Vec3f vAimDir = MWBase::Environment::get().getWorld()->aimToTarget(actor, target);
         float distToTarget = MWBase::Environment::get().getWorld()->getHitDistance(actor, target);
@@ -243,9 +245,7 @@ namespace MWMechanics
         if (isRangedCombat)
         {
             // rotate actor taking into account target movement direction and projectile speed
-            osg::Vec3f& lastTargetPos = storage.mLastTargetPos;
-            vAimDir = AimDirToMovingTarget(actor, target, lastTargetPos, AI_REACTION_TIME, (weapon ? weapon->mData.mType : 0), storage.mStrength);
-            lastTargetPos = vTargetPos;
+            vAimDir = AimDirToMovingTarget(actor, target, storage.mLastTargetPos, AI_REACTION_TIME, (weapon ? weapon->mData.mType : 0), storage.mStrength);
 
             storage.mMovement.mRotation[0] = getXAngleToDir(vAimDir);
             storage.mMovement.mRotation[2] = getZAngleToDir(vAimDir);
@@ -256,28 +256,66 @@ namespace MWMechanics
             storage.mMovement.mRotation[2] = getZAngleToDir((vTargetPos-vActorPos)); // using vAimDir results in spastic movements since the head is animated
         }
 
+        storage.mLastTargetPos = vTargetPos;
+
         if (storage.mReadyToAttack)
         {
             storage.startCombatMove(isRangedCombat, distToTarget, rangeAttack, actor, target);
             // start new attack
             storage.startAttackIfReady(actor, characterController, weapon, isRangedCombat);
         }
-        else if (!isRangedCombat && !mPathFinder.isPathConstructed() && storage.mCurrentAction->isAttackingOrSpell())
+
+        // If actor uses custom destination it has to try to rebuild path because environment can change
+        // (door is opened between actor and target) or target position has changed and current custom destination
+        // is not good enough to attack target.
+        if (storage.mCurrentAction->isAttackingOrSpell()
+            && ((!storage.mReadyToAttack && !mPathFinder.isPathConstructed())
+                || (storage.mUseCustomDestination && (storage.mCustomDestination - vTargetPos).length() > rangeAttack)))
         {
-            const osg::Vec3f position = actor.getRefData().getPosition().asVec3();
-            const osg::Vec3f destination = target.getRefData().getPosition().asVec3();
-            const osg::Vec3f halfExtents = MWBase::Environment::get().getWorld()->getPathfindingHalfExtents(actor);
-            mPathFinder.buildPath(actor, position, destination, actor.getCell(), getPathGridGraph(actor.getCell()),
-                                  halfExtents, getNavigatorFlags(actor), getAreaCosts(actor));
+            // Try to build path to the target.
+            const auto halfExtents = MWBase::Environment::get().getWorld()->getPathfindingHalfExtents(actor);
+            const auto navigatorFlags = getNavigatorFlags(actor);
+            const auto areaCosts = getAreaCosts(actor);
+            const auto pathGridGraph = getPathGridGraph(actor.getCell());
+            mPathFinder.buildPath(actor, vActorPos, vTargetPos, actor.getCell(), pathGridGraph, halfExtents, navigatorFlags, areaCosts);
 
             if (!mPathFinder.isPathConstructed())
             {
-                storage.stopAttack();
-                characterController.setAttackingOrSpell(false);
-                currentAction.reset(new ActionFlee());
-                actionCooldown = currentAction->getActionCooldown();
-                storage.startFleeing();
-                MWBase::Environment::get().getDialogueManager()->say(actor, "flee");
+                // If there is no path, try to find a point on a line from the actor position to target projected
+                // on navmesh to attack the target from there.
+                const MWBase::World* world = MWBase::Environment::get().getWorld();
+                const auto halfExtents = world->getPathfindingHalfExtents(actor);
+                const auto navigator = world->getNavigator();
+                const auto navigatorFlags = getNavigatorFlags(actor);
+                const auto areaCosts = getAreaCosts(actor);
+                const auto hit = navigator->raycast(halfExtents, vActorPos, vTargetPos, navigatorFlags);
+
+                if (hit.has_value() && (*hit - vTargetPos).length() <= rangeAttack)
+                {
+                    // If the point is close enough, try to find a path to that point.
+                    mPathFinder.buildPath(actor, vActorPos, *hit, actor.getCell(), pathGridGraph, halfExtents, navigatorFlags, areaCosts);
+                    if (mPathFinder.isPathConstructed())
+                    {
+                        // If path to that point is found use it as custom destination.
+                        storage.mCustomDestination = *hit;
+                        storage.mUseCustomDestination = true;
+                    }
+                }
+
+                if (!mPathFinder.isPathConstructed())
+                {
+                    storage.mUseCustomDestination = false;
+                    storage.stopAttack();
+                    characterController.setAttackingOrSpell(false);
+                    currentAction.reset(new ActionFlee());
+                    actionCooldown = currentAction->getActionCooldown();
+                    storage.startFleeing();
+                    MWBase::Environment::get().getDialogueManager()->say(actor, "flee");
+                }
+            }
+            else
+            {
+                storage.mUseCustomDestination = false;
             }
         }
 
diff --git a/apps/openmw/mwmechanics/aicombat.hpp b/apps/openmw/mwmechanics/aicombat.hpp
index 64645ca941..3a77aa8e8e 100644
--- a/apps/openmw/mwmechanics/aicombat.hpp
+++ b/apps/openmw/mwmechanics/aicombat.hpp
@@ -55,6 +55,9 @@ namespace MWMechanics
         float mFleeBlindRunTimer;
         ESM::Pathgrid::Point mFleeDest;
 
+        bool mUseCustomDestination;
+        osg::Vec3f mCustomDestination;
+
         AiCombatStorage():
         mAttackCooldown(0.0f),
         mTimerReact(AI_REACTION_TIME),
@@ -74,7 +77,9 @@ namespace MWMechanics
         mFleeState(FleeState_None),
         mLOS(false),
         mUpdateLOSTimer(0.0f),
-        mFleeBlindRunTimer(0.0f)
+        mFleeBlindRunTimer(0.0f),
+        mUseCustomDestination(false),
+        mCustomDestination()
         {}
 
         void startCombatMove(bool isDistantCombat, float distToTarget, float rangeAttack, const MWWorld::Ptr& actor, const MWWorld::Ptr& target);
diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index ae345d187f..c6d093d5f7 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -802,4 +802,26 @@ namespace
         EXPECT_GT(duration, mSettings.mMinUpdateInterval)
             << std::chrono::duration_cast<std::chrono::duration<float, std::milli>>(duration).count() << " ms";
     }
+
+    TEST_F(DetourNavigatorNavigatorTest, update_then_raycast_should_return_position)
+    {
+        const std::array<btScalar, 5 * 5> heightfieldData {{
+            0,   0,    0,    0,    0,
+            0, -25,  -25,  -25,  -25,
+            0, -25, -100, -100, -100,
+            0, -25, -100, -100, -100,
+            0, -25, -100, -100, -100,
+        }};
+        btHeightfieldTerrainShape shape(5, 5, heightfieldData.data(), 1, 0, 0, 2, PHY_FLOAT, false);
+        shape.setLocalScaling(btVector3(128, 128, 1));
+
+        mNavigator->addAgent(mAgentHalfExtents);
+        mNavigator->addObject(ObjectId(&shape), shape, btTransform::getIdentity());
+        mNavigator->update(mPlayerPosition);
+        mNavigator->wait();
+
+        const auto result = mNavigator->raycast(mAgentHalfExtents, mStart, mEnd, Flag_walk);
+
+        ASSERT_THAT(result, Optional(Vec3fEq(mEnd.x(), mEnd.y(), 1.87719)));
+    }
 }
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 832fc611f6..44813180e5 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -181,6 +181,7 @@ add_component_dir(detournavigator
     settings
     navigator
     findrandompointaroundcircle
+    raycast
     )
 
 set (ESM_UI ${CMAKE_SOURCE_DIR}/files/ui/contentselector.ui
diff --git a/components/detournavigator/navigator.cpp b/components/detournavigator/navigator.cpp
index 658e539ad9..700217c52f 100644
--- a/components/detournavigator/navigator.cpp
+++ b/components/detournavigator/navigator.cpp
@@ -1,5 +1,6 @@
 #include "findrandompointaroundcircle.hpp"
 #include "navigator.hpp"
+#include "raycast.hpp"
 
 namespace DetourNavigator
 {
@@ -17,4 +18,19 @@ namespace DetourNavigator
             return std::optional<osg::Vec3f>();
         return std::optional<osg::Vec3f>(fromNavMeshCoordinates(settings, *result));
     }
+
+    std::optional<osg::Vec3f> Navigator::raycast(const osg::Vec3f& agentHalfExtents, const osg::Vec3f& start,
+        const osg::Vec3f& end, const Flags includeFlags) const
+    {
+        const auto navMesh = getNavMesh(agentHalfExtents);
+        if (navMesh == nullptr)
+            return {};
+        const auto settings = getSettings();
+        const auto result = DetourNavigator::raycast(navMesh->lockConst()->getImpl(),
+            toNavMeshCoordinates(settings, agentHalfExtents), toNavMeshCoordinates(settings, start),
+            toNavMeshCoordinates(settings, end), includeFlags, settings);
+        if (!result)
+            return {};
+        return fromNavMeshCoordinates(settings, *result);
+    }
 }
diff --git a/components/detournavigator/navigator.hpp b/components/detournavigator/navigator.hpp
index a79aa59d42..ef61f78c68 100644
--- a/components/detournavigator/navigator.hpp
+++ b/components/detournavigator/navigator.hpp
@@ -223,6 +223,17 @@ namespace DetourNavigator
         std::optional<osg::Vec3f> findRandomPointAroundCircle(const osg::Vec3f& agentHalfExtents,
             const osg::Vec3f& start, const float maxRadius, const Flags includeFlags) const;
 
+        /**
+         * @brief raycast finds farest navmesh point from start on a line from start to end that has path from start.
+         * @param agentHalfExtents allows to find navmesh for given actor.
+         * @param start of the line
+         * @param end of the line
+         * @param includeFlags setup allowed surfaces for actor to walk.
+         * @return not empty optional with position if point is found and empty optional if point is not found.
+         */
+        std::optional<osg::Vec3f> raycast(const osg::Vec3f& agentHalfExtents, const osg::Vec3f& start,
+            const osg::Vec3f& end, const Flags includeFlags) const;
+
         virtual RecastMeshTiles getRecastMeshTiles() = 0;
     };
 }
diff --git a/components/detournavigator/raycast.cpp b/components/detournavigator/raycast.cpp
new file mode 100644
index 0000000000..86fabe9c1f
--- /dev/null
+++ b/components/detournavigator/raycast.cpp
@@ -0,0 +1,44 @@
+#include "raycast.hpp"
+#include "settings.hpp"
+#include "findsmoothpath.hpp"
+
+#include <DetourCommon.h>
+#include <DetourNavMesh.h>
+#include <DetourNavMeshQuery.h>
+
+#include <array>
+
+namespace DetourNavigator
+{
+    std::optional<osg::Vec3f> raycast(const dtNavMesh& navMesh, const osg::Vec3f& halfExtents,
+        const osg::Vec3f& start, const osg::Vec3f& end, const Flags includeFlags, const Settings& settings)
+    {
+        dtNavMeshQuery navMeshQuery;
+        if (!initNavMeshQuery(navMeshQuery, navMesh, settings.mMaxNavMeshQueryNodes))
+            return {};
+
+        dtQueryFilter queryFilter;
+        queryFilter.setIncludeFlags(includeFlags);
+
+        dtPolyRef ref = 0;
+        if (dtStatus status = navMeshQuery.findNearestPoly(start.ptr(), halfExtents.ptr(), &queryFilter, &ref, nullptr);
+            dtStatusFailed(status) || ref == 0)
+            return {};
+
+        const unsigned options = 0;
+        std::array<dtPolyRef, 16> path;
+        dtRaycastHit hit;
+        hit.path = path.data();
+        hit.maxPath = path.size();
+        if (dtStatus status = navMeshQuery.raycast(ref, start.ptr(), end.ptr(), &queryFilter, options, &hit);
+            dtStatusFailed(status) || hit.pathCount == 0)
+            return {};
+
+        osg::Vec3f hitPosition;
+        if (dtStatus status = navMeshQuery.closestPointOnPoly(path[hit.pathCount - 1], end.ptr(), hitPosition.ptr(), nullptr);
+            dtStatusFailed(status))
+            return {};
+
+        return hitPosition;
+    }
+}
diff --git a/components/detournavigator/raycast.hpp b/components/detournavigator/raycast.hpp
new file mode 100644
index 0000000000..ddf61b49f4
--- /dev/null
+++ b/components/detournavigator/raycast.hpp
@@ -0,0 +1,19 @@
+#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_RAYCAST_H
+#define OPENMW_COMPONENTS_DETOURNAVIGATOR_RAYCAST_H
+
+#include "flags.hpp"
+
+#include <optional>
+#include <osg/Vec3f>
+
+class dtNavMesh;
+
+namespace DetourNavigator
+{
+    struct Settings;
+
+    std::optional<osg::Vec3f> raycast(const dtNavMesh& navMesh, const osg::Vec3f& halfExtents,
+        const osg::Vec3f& start, const osg::Vec3f& end, const Flags includeFlags, const Settings& settings);
+}
+
+#endif

From e7afbc74d82351e59e671343f2a9f40a7603c4e5 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Wed, 27 Jan 2021 20:57:11 +0100
Subject: [PATCH 0356/2859] Wizard: Only allow to select Morrowind.esm master
 files, display an error if Morrowind.bsa is missing

---
 apps/wizard/existinginstallationpage.cpp | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/apps/wizard/existinginstallationpage.cpp b/apps/wizard/existinginstallationpage.cpp
index 2434f42cfe..886fcd95db 100644
--- a/apps/wizard/existinginstallationpage.cpp
+++ b/apps/wizard/existinginstallationpage.cpp
@@ -95,9 +95,9 @@ void Wizard::ExistingInstallationPage::on_browseButton_clicked()
 {
     QString selectedFile = QFileDialog::getOpenFileName(
                 this,
-                tr("Select master file"),
+                tr("Select Morrowind.esm (located in Data Files)"),
                 QDir::currentPath(),
-                QString(tr("Morrowind master file (*.esm)")),
+                QString(tr("Morrowind master file (Morrowind.esm)")),
                 nullptr,
                 QFileDialog::DontResolveSymlinks);
 
@@ -110,7 +110,18 @@ void Wizard::ExistingInstallationPage::on_browseButton_clicked()
         return;
 
     if (!mWizard->findFiles(QLatin1String("Morrowind"), info.absolutePath()))
-        return; // No valid Morrowind installation found
+    {
+        QMessageBox msgBox;
+        msgBox.setWindowTitle(tr("Error detecting Morrowind files"));
+        msgBox.setIcon(QMessageBox::Warning);
+        msgBox.setStandardButtons(QMessageBox::Ok);
+        msgBox.setText(QObject::tr(
+            "<b>Morrowind.bsa</b> is missing!<br>\
+            Make sure your Morrowind installation is complete."
+        ));
+        msgBox.exec();
+        return;
+    }
 
     QString path(QDir::toNativeSeparators(info.absolutePath()));
     QList<QListWidgetItem*> items = installationsList->findItems(path, Qt::MatchExactly);

From 70a059d4bfaefc128e9d0844a4370df7c6e402e7 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Sun, 14 Feb 2021 16:31:16 +0000
Subject: [PATCH 0357/2859] Use different filenames for Engine and CS packages

---
 .gitlab-ci.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6bfe0bf23a..823a92cc2f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -89,9 +89,11 @@ MacOS:
 
 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"
 
 .Windows_Ninja_Base:
   tags:
@@ -119,10 +121,10 @@ variables: &cs-targets
     - 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_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_symbols.zip '*.pdb' CI-ID.txt
+        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_${config}_${CI_COMMIT_REF_NAME}.zip '*'
+    - 7z a -tzip ..\..\OpenMW_MSVC2019_64_${package}_${config}_${CI_COMMIT_REF_NAME}.zip '*'
   after_script:
     - Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log
   cache:
@@ -210,10 +212,10 @@ Windows_Ninja_CS_RelWithDebInfo:
     - 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_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_symbols.zip '*.pdb' CI-ID.txt
+        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_${config}_${CI_COMMIT_REF_NAME}.zip '*'
+    - 7z a -tzip ..\..\OpenMW_MSVC2019_64_${package}_${config}_${CI_COMMIT_REF_NAME}.zip '*'
   after_script:
     - Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log
   cache:

From 6291b9304b98945b571cd9dcf87f129921df8648 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Sun, 14 Feb 2021 16:56:21 +0000
Subject: [PATCH 0358/2859] Log when icon is missing and fallback is used

---
 apps/openmw/mwgui/itemwidget.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/openmw/mwgui/itemwidget.cpp b/apps/openmw/mwgui/itemwidget.cpp
index 7c7fa88287..d2dfa827b4 100644
--- a/apps/openmw/mwgui/itemwidget.cpp
+++ b/apps/openmw/mwgui/itemwidget.cpp
@@ -5,6 +5,7 @@
 #include <MyGUI_RenderManager.h>
 #include <MyGUI_TextBox.h>
 
+#include <components/debug/debuglog.hpp>
 // correctIconPath
 #include <components/resource/resourcesystem.hpp>
 #include <components/vfs/manager.hpp>
@@ -111,7 +112,10 @@ namespace MWGui
             invIcon = "default icon.tga";
         invIcon = MWBase::Environment::get().getWindowManager()->correctIconPath(invIcon);
         if (!MWBase::Environment::get().getResourceSystem()->getVFS()->exists(invIcon))
+        {
+            Log(Debug::Error) << "Failed to open image: '" << invIcon << "' not found, falling back to 'default-icon.tga'";
             invIcon = MWBase::Environment::get().getWindowManager()->correctIconPath("default icon.tga");
+        }
         setIcon(invIcon);
     }
 

From d3ab6c972fe2876e889ddabba81d38884e3526ad Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 14 Feb 2021 01:00:43 +0100
Subject: [PATCH 0359/2859] Avoid set unused position from
 dtNavMeshQuery::findNearestPoly result

---
 components/detournavigator/findrandompointaroundcircle.cpp | 3 +--
 components/detournavigator/findsmoothpath.hpp              | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/components/detournavigator/findrandompointaroundcircle.cpp b/components/detournavigator/findrandompointaroundcircle.cpp
index f2e815c918..444050ed7c 100644
--- a/components/detournavigator/findrandompointaroundcircle.cpp
+++ b/components/detournavigator/findrandompointaroundcircle.cpp
@@ -21,11 +21,10 @@ namespace DetourNavigator
         queryFilter.setIncludeFlags(includeFlags);
 
         dtPolyRef startRef = 0;
-        osg::Vec3f startPolygonPosition;
         for (int i = 0; i < 3; ++i)
         {
             const auto status = navMeshQuery.findNearestPoly(start.ptr(), (halfExtents * (1 << i)).ptr(), &queryFilter,
-                &startRef, startPolygonPosition.ptr());
+                &startRef, nullptr);
             if (!dtStatusFailed(status) && startRef != 0)
                 break;
         }
diff --git a/components/detournavigator/findsmoothpath.hpp b/components/detournavigator/findsmoothpath.hpp
index a351f8279c..f757a511f4 100644
--- a/components/detournavigator/findsmoothpath.hpp
+++ b/components/detournavigator/findsmoothpath.hpp
@@ -283,11 +283,10 @@ namespace DetourNavigator
         queryFilter.setAreaCost(AreaType_ground, areaCosts.mGround);
 
         dtPolyRef startRef = 0;
-        osg::Vec3f startPolygonPosition;
         for (int i = 0; i < 3; ++i)
         {
             const auto status = navMeshQuery.findNearestPoly(start.ptr(), (halfExtents * (1 << i)).ptr(), &queryFilter,
-                &startRef, startPolygonPosition.ptr());
+                &startRef, nullptr);
             if (!dtStatusFailed(status) && startRef != 0)
                 break;
         }
@@ -296,11 +295,10 @@ namespace DetourNavigator
             return Status::StartPolygonNotFound;
 
         dtPolyRef endRef = 0;
-        osg::Vec3f endPolygonPosition;
         for (int i = 0; i < 3; ++i)
         {
             const auto status = navMeshQuery.findNearestPoly(end.ptr(), (halfExtents * (1 << i)).ptr(), &queryFilter,
-                &endRef, endPolygonPosition.ptr());
+                &endRef, nullptr);
             if (!dtStatusFailed(status) && endRef != 0)
                 break;
         }

From a7fe6c7ba16ea16775d9324fa00cc346f07c4959 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 14 Feb 2021 01:08:14 +0100
Subject: [PATCH 0360/2859] Move duplicated usage patter of
 dtNavMeshQuery::findNearestPoly into a separate function

---
 .../findrandompointaroundcircle.cpp           | 10 +-------
 components/detournavigator/findsmoothpath.cpp | 13 +++++++++++
 components/detournavigator/findsmoothpath.hpp | 23 ++++---------------
 3 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/components/detournavigator/findrandompointaroundcircle.cpp b/components/detournavigator/findrandompointaroundcircle.cpp
index 444050ed7c..29d4e9da44 100644
--- a/components/detournavigator/findrandompointaroundcircle.cpp
+++ b/components/detournavigator/findrandompointaroundcircle.cpp
@@ -20,15 +20,7 @@ namespace DetourNavigator
         dtQueryFilter queryFilter;
         queryFilter.setIncludeFlags(includeFlags);
 
-        dtPolyRef startRef = 0;
-        for (int i = 0; i < 3; ++i)
-        {
-            const auto status = navMeshQuery.findNearestPoly(start.ptr(), (halfExtents * (1 << i)).ptr(), &queryFilter,
-                &startRef, nullptr);
-            if (!dtStatusFailed(status) && startRef != 0)
-                break;
-        }
-
+        dtPolyRef startRef = findNearestPolyExpanding(navMeshQuery, queryFilter, start, halfExtents);
         if (startRef == 0)
             return std::optional<osg::Vec3f>();
 
diff --git a/components/detournavigator/findsmoothpath.cpp b/components/detournavigator/findsmoothpath.cpp
index a13b83abd8..84ccf34a44 100644
--- a/components/detournavigator/findsmoothpath.cpp
+++ b/components/detournavigator/findsmoothpath.cpp
@@ -140,4 +140,17 @@ namespace DetourNavigator
 
         return result;
     }
+
+    dtPolyRef findNearestPolyExpanding(const dtNavMeshQuery& query, const dtQueryFilter& filter,
+            const osg::Vec3f& center, const osg::Vec3f& halfExtents)
+    {
+        dtPolyRef ref = 0;
+        for (int i = 0; i < 3; ++i)
+        {
+            const dtStatus status = query.findNearestPoly(center.ptr(), (halfExtents * (1 << i)).ptr(), &filter, &ref, nullptr);
+            if (!dtStatusFailed(status) && ref != 0)
+                break;
+        }
+        return ref;
+    }
 }
diff --git a/components/detournavigator/findsmoothpath.hpp b/components/detournavigator/findsmoothpath.hpp
index f757a511f4..3dc4999740 100644
--- a/components/detournavigator/findsmoothpath.hpp
+++ b/components/detournavigator/findsmoothpath.hpp
@@ -103,6 +103,9 @@ namespace DetourNavigator
         return dtStatusSucceed(status);
     }
 
+    dtPolyRef findNearestPolyExpanding(const dtNavMeshQuery& query, const dtQueryFilter& filter,
+            const osg::Vec3f& center, const osg::Vec3f& halfExtents);
+
     struct MoveAlongSurfaceResult
     {
         osg::Vec3f mResultPos;
@@ -282,27 +285,11 @@ namespace DetourNavigator
         queryFilter.setAreaCost(AreaType_pathgrid, areaCosts.mPathgrid);
         queryFilter.setAreaCost(AreaType_ground, areaCosts.mGround);
 
-        dtPolyRef startRef = 0;
-        for (int i = 0; i < 3; ++i)
-        {
-            const auto status = navMeshQuery.findNearestPoly(start.ptr(), (halfExtents * (1 << i)).ptr(), &queryFilter,
-                &startRef, nullptr);
-            if (!dtStatusFailed(status) && startRef != 0)
-                break;
-        }
-
+        dtPolyRef startRef = findNearestPolyExpanding(navMeshQuery, queryFilter, start, halfExtents);
         if (startRef == 0)
             return Status::StartPolygonNotFound;
 
-        dtPolyRef endRef = 0;
-        for (int i = 0; i < 3; ++i)
-        {
-            const auto status = navMeshQuery.findNearestPoly(end.ptr(), (halfExtents * (1 << i)).ptr(), &queryFilter,
-                &endRef, nullptr);
-            if (!dtStatusFailed(status) && endRef != 0)
-                break;
-        }
-
+        dtPolyRef endRef = findNearestPolyExpanding(navMeshQuery, queryFilter, end, halfExtents);
         if (endRef == 0)
             return Status::EndPolygonNotFound;
 

From 3a9b1ce63a365d8e759f51b4e156303728c79cd5 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 14 Feb 2021 23:11:57 +0100
Subject: [PATCH 0361/2859] Use camel case for local constant

---
 components/detournavigator/findsmoothpath.cpp | 10 +++++-----
 components/detournavigator/findsmoothpath.hpp |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/components/detournavigator/findsmoothpath.cpp b/components/detournavigator/findsmoothpath.cpp
index 84ccf34a44..8974be5321 100644
--- a/components/detournavigator/findsmoothpath.cpp
+++ b/components/detournavigator/findsmoothpath.cpp
@@ -108,13 +108,13 @@ namespace DetourNavigator
     {
         // Find steer target.
         SteerTarget result;
-        const int MAX_STEER_POINTS = 3;
-        std::array<float, MAX_STEER_POINTS * 3> steerPath;
-        std::array<unsigned char, MAX_STEER_POINTS> steerPathFlags;
-        std::array<dtPolyRef, MAX_STEER_POINTS> steerPathPolys;
+        constexpr int maxSteerPoints = 3;
+        std::array<float, maxSteerPoints * 3> steerPath;
+        std::array<unsigned char, maxSteerPoints> steerPathFlags;
+        std::array<dtPolyRef, maxSteerPoints> steerPathPolys;
         int nsteerPath = 0;
         navQuery.findStraightPath(startPos.ptr(), endPos.ptr(), path.data(), int(path.size()), steerPath.data(),
-                                    steerPathFlags.data(), steerPathPolys.data(), &nsteerPath, MAX_STEER_POINTS);
+            steerPathFlags.data(), steerPathPolys.data(), &nsteerPath, maxSteerPoints);
         assert(nsteerPath >= 0);
         if (!nsteerPath)
             return std::nullopt;
diff --git a/components/detournavigator/findsmoothpath.hpp b/components/detournavigator/findsmoothpath.hpp
index 3dc4999740..29a3ce8050 100644
--- a/components/detournavigator/findsmoothpath.hpp
+++ b/components/detournavigator/findsmoothpath.hpp
@@ -166,7 +166,7 @@ namespace DetourNavigator
         osg::Vec3f targetPos;
         navMeshQuery.closestPointOnPoly(polygonPath.back(), end.ptr(), targetPos.ptr(), nullptr);
 
-        const float SLOP = 0.01f;
+        constexpr float slop = 0.01f;
 
         *out++ = iterPos;
 
@@ -177,7 +177,7 @@ namespace DetourNavigator
         while (!polygonPath.empty() && smoothPathSize < maxSmoothPathSize)
         {
             // Find location to steer towards.
-            const auto steerTarget = getSteerTarget(navMeshQuery, iterPos, targetPos, SLOP, polygonPath);
+            const auto steerTarget = getSteerTarget(navMeshQuery, iterPos, targetPos, slop, polygonPath);
 
             if (!steerTarget)
                 break;
@@ -209,7 +209,7 @@ namespace DetourNavigator
             iterPos.y() = h;
 
             // Handle end of path and off-mesh links when close enough.
-            if (endOfPath && inRange(iterPos, steerTarget->steerPos, SLOP, 1.0f))
+            if (endOfPath && inRange(iterPos, steerTarget->steerPos, slop, 1.0f))
             {
                 // Reached end of path.
                 iterPos = targetPos;
@@ -217,7 +217,7 @@ namespace DetourNavigator
                 ++smoothPathSize;
                 break;
             }
-            else if (offMeshConnection && inRange(iterPos, steerTarget->steerPos, SLOP, 1.0f))
+            else if (offMeshConnection && inRange(iterPos, steerTarget->steerPos, slop, 1.0f))
             {
                 // Advance the path up to and over the off-mesh connection.
                 dtPolyRef prevRef = 0;

From bb0c4789540c4da23da1975473df288bb3d2d7a1 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 15 Feb 2021 00:01:34 +0100
Subject: [PATCH 0362/2859] Add missing include and use std malloc and free

---
 components/detournavigator/recastglobalallocator.hpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/components/detournavigator/recastglobalallocator.hpp b/components/detournavigator/recastglobalallocator.hpp
index 7c4b2c5343..313d311009 100644
--- a/components/detournavigator/recastglobalallocator.hpp
+++ b/components/detournavigator/recastglobalallocator.hpp
@@ -3,6 +3,8 @@
 
 #include "recasttempallocator.hpp"
 
+#include <cstdlib>
+
 namespace DetourNavigator
 {
     class RecastGlobalAllocator
@@ -32,7 +34,7 @@ namespace DetourNavigator
             else
             {
                 assert(BufferType_perm == getDataPtrBufferType(ptr));
-                ::free(getPermDataPtrHeapPtr(ptr));
+                std::free(getPermDataPtrHeapPtr(ptr));
             }
         }
 
@@ -56,7 +58,7 @@ namespace DetourNavigator
 
         static void* allocPerm(size_t size)
         {
-            const auto ptr = ::malloc(size + sizeof(std::size_t));
+            const auto ptr = std::malloc(size + sizeof(std::size_t));
             if (rcUnlikely(!ptr))
                 return ptr;
             setPermPtrBufferType(ptr, BufferType_perm);

From 4983684fda3266ca3308a13b5e7668fd63f24f0f Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 15 Feb 2021 00:07:20 +0100
Subject: [PATCH 0363/2859] Fix implicit int to float conversion warning

---
 components/detournavigator/settingsutils.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/detournavigator/settingsutils.hpp b/components/detournavigator/settingsutils.hpp
index a22205b2aa..39ffc03d19 100644
--- a/components/detournavigator/settingsutils.hpp
+++ b/components/detournavigator/settingsutils.hpp
@@ -52,7 +52,7 @@ namespace DetourNavigator
 
     inline float getTileSize(const Settings& settings)
     {
-        return settings.mTileSize * settings.mCellSize;
+        return static_cast<float>(settings.mTileSize) * settings.mCellSize;
     }
 
     inline TilePosition getTilePosition(const Settings& settings, const osg::Vec3f& position)
@@ -73,7 +73,7 @@ namespace DetourNavigator
 
     inline float getBorderSize(const Settings& settings)
     {
-        return settings.mBorderSize * settings.mCellSize;
+        return static_cast<float>(settings.mBorderSize) * settings.mCellSize;
     }
 
     inline float getSwimLevel(const Settings& settings, const float agentHalfExtentsZ)

From bc67669a970df2e58e3571f2b9fa4d8050434090 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 15 Feb 2021 00:22:48 +0100
Subject: [PATCH 0364/2859] Comment unused argument

---
 components/detournavigator/navigatorstub.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/detournavigator/navigatorstub.hpp b/components/detournavigator/navigatorstub.hpp
index 8b81bde197..f1f9e06ef3 100644
--- a/components/detournavigator/navigatorstub.hpp
+++ b/components/detournavigator/navigatorstub.hpp
@@ -66,7 +66,7 @@ namespace DetourNavigator
 
         void update(const osg::Vec3f& /*playerPosition*/) override {}
 
-        void setUpdatesEnabled(bool enabled) override {}
+        void setUpdatesEnabled(bool /*enabled*/) override {}
 
         void wait() override {}
 

From b8ee32e3173c9226d92cf0d9f60a07fe1c75a479 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Sun, 14 Feb 2021 23:32:04 +0000
Subject: [PATCH 0365/2859] Support A2C for groundcover

---
 files/shaders/groundcover_fragment.glsl | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/files/shaders/groundcover_fragment.glsl b/files/shaders/groundcover_fragment.glsl
index 77fd32e58b..c3339ba763 100644
--- a/files/shaders/groundcover_fragment.glsl
+++ b/files/shaders/groundcover_fragment.glsl
@@ -30,11 +30,7 @@ centroid varying vec3 shadowDiffuseLighting;
 
 #include "shadows_fragment.glsl"
 #include "lighting.glsl"
-
-float calc_coverage(float a, float alpha_ref, float falloff_rate)
-{
-    return clamp(falloff_rate * (a - alpha_ref) + alpha_ref, 0.0, 1.0);
-}
+#include "alpha.glsl"
 
 void main()
 {
@@ -55,12 +51,13 @@ void main()
     gl_FragData[0] = vec4(1.0);
 #endif
 
-    gl_FragData[0].a = calc_coverage(gl_FragData[0].a, 128.0/255.0, 4.0);
-
-    float shadowing = unshadowedLightRatio(linearDepth);
     if (euclideanDepth > @groundcoverFadeStart)
         gl_FragData[0].a *= 1.0-smoothstep(@groundcoverFadeStart, @groundcoverFadeEnd, euclideanDepth);
 
+    alphaTest();
+
+    float shadowing = unshadowedLightRatio(linearDepth);
+
     vec3 lighting;
 #if !PER_PIXEL_LIGHTING
     lighting = passLighting + shadowDiffuseLighting * shadowing;

From 1c9245bd58a07f6e3709b4136c934f441c1272f7 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Sun, 24 Jan 2021 01:43:43 +0000
Subject: [PATCH 0366/2859] Move recastnavigation to FetchContent

---
 CMakeLists.txt                                |   10 +-
 extern/CMakeLists.txt                         |   21 +
 extern/recastnavigation/.editorconfig         |   12 -
 extern/recastnavigation/.gitignore            |   49 -
 extern/recastnavigation/.id                   |    1 -
 extern/recastnavigation/.url                  |    1 -
 extern/recastnavigation/CMakeLists.txt        |   26 -
 .../DebugUtils/CMakeLists.txt                 |   36 -
 .../DebugUtils/Include/DebugDraw.h            |  223 -
 .../DebugUtils/Include/DetourDebugDraw.h      |   48 -
 .../DebugUtils/Include/RecastDebugDraw.h      |   42 -
 .../DebugUtils/Include/RecastDump.h           |   43 -
 .../DebugUtils/Source/DebugDraw.cpp           |  612 ---
 .../DebugUtils/Source/DetourDebugDraw.cpp     |  864 ----
 .../DebugUtils/Source/RecastDebugDraw.cpp     | 1064 -----
 .../DebugUtils/Source/RecastDump.cpp          |  451 --
 extern/recastnavigation/Detour/CMakeLists.txt |   30 -
 .../Detour/Include/DetourAlloc.h              |   61 -
 .../Detour/Include/DetourAssert.h             |   56 -
 .../Detour/Include/DetourCommon.h             |  572 ---
 .../Detour/Include/DetourMath.h               |   24 -
 .../Detour/Include/DetourNavMesh.h            |  785 ----
 .../Detour/Include/DetourNavMeshBuilder.h     |  149 -
 .../Detour/Include/DetourNavMeshQuery.h       |  573 ---
 .../Detour/Include/DetourNode.h               |  168 -
 .../Detour/Include/DetourStatus.h             |   65 -
 .../Detour/Source/DetourAlloc.cpp             |   50 -
 .../Detour/Source/DetourAssert.cpp            |   35 -
 .../Detour/Source/DetourCommon.cpp            |  387 --
 .../Detour/Source/DetourNavMesh.cpp           | 1584 -------
 .../Detour/Source/DetourNavMeshBuilder.cpp    |  802 ----
 .../Detour/Source/DetourNavMeshQuery.cpp      | 3663 -----------------
 .../Detour/Source/DetourNode.cpp              |  200 -
 .../DetourCrowd/CMakeLists.txt                |   34 -
 .../DetourCrowd/Include/DetourCrowd.h         |  460 ---
 .../DetourCrowd/Include/DetourLocalBoundary.h |   66 -
 .../Include/DetourObstacleAvoidance.h         |  159 -
 .../DetourCrowd/Include/DetourPathCorridor.h  |  151 -
 .../DetourCrowd/Include/DetourPathQueue.h     |   79 -
 .../DetourCrowd/Include/DetourProximityGrid.h |   74 -
 .../DetourCrowd/Source/DetourCrowd.cpp        | 1450 -------
 .../Source/DetourLocalBoundary.cpp            |  137 -
 .../Source/DetourObstacleAvoidance.cpp        |  619 ---
 .../DetourCrowd/Source/DetourPathCorridor.cpp |  597 ---
 .../DetourCrowd/Source/DetourPathQueue.cpp    |  200 -
 .../Source/DetourProximityGrid.cpp            |  194 -
 .../DetourTileCache/CMakeLists.txt            |   35 -
 .../DetourTileCache/Include/DetourTileCache.h |  262 --
 .../Include/DetourTileCacheBuilder.h          |  156 -
 .../Source/DetourTileCache.cpp                |  820 ----
 .../Source/DetourTileCacheBuilder.cpp         | 2250 ----------
 extern/recastnavigation/License.txt           |   18 -
 extern/recastnavigation/Recast/CMakeLists.txt |   30 -
 .../recastnavigation/Recast/Include/Recast.h  | 1208 ------
 .../Recast/Include/RecastAlloc.h              |  342 --
 .../Recast/Include/RecastAssert.h             |   56 -
 .../recastnavigation/Recast/Source/Recast.cpp |  575 ---
 .../Recast/Source/RecastAlloc.cpp             |   60 -
 .../Recast/Source/RecastArea.cpp              |  591 ---
 .../Recast/Source/RecastAssert.cpp            |   35 -
 .../Recast/Source/RecastContour.cpp           | 1105 -----
 .../Recast/Source/RecastFilter.cpp            |  202 -
 .../Recast/Source/RecastLayers.cpp            |  644 ---
 .../Recast/Source/RecastMesh.cpp              | 1552 -------
 .../Recast/Source/RecastMeshDetail.cpp        | 1464 -------
 .../Recast/Source/RecastRasterization.cpp     |  454 --
 .../Recast/Source/RecastRegion.cpp            | 1812 --------
 67 files changed, 29 insertions(+), 30569 deletions(-)
 delete mode 100644 extern/recastnavigation/.editorconfig
 delete mode 100644 extern/recastnavigation/.gitignore
 delete mode 100644 extern/recastnavigation/.id
 delete mode 100644 extern/recastnavigation/.url
 delete mode 100644 extern/recastnavigation/CMakeLists.txt
 delete mode 100644 extern/recastnavigation/DebugUtils/CMakeLists.txt
 delete mode 100644 extern/recastnavigation/DebugUtils/Include/DebugDraw.h
 delete mode 100755 extern/recastnavigation/DebugUtils/Include/DetourDebugDraw.h
 delete mode 100644 extern/recastnavigation/DebugUtils/Include/RecastDebugDraw.h
 delete mode 100644 extern/recastnavigation/DebugUtils/Include/RecastDump.h
 delete mode 100644 extern/recastnavigation/DebugUtils/Source/DebugDraw.cpp
 delete mode 100644 extern/recastnavigation/DebugUtils/Source/DetourDebugDraw.cpp
 delete mode 100644 extern/recastnavigation/DebugUtils/Source/RecastDebugDraw.cpp
 delete mode 100644 extern/recastnavigation/DebugUtils/Source/RecastDump.cpp
 delete mode 100644 extern/recastnavigation/Detour/CMakeLists.txt
 delete mode 100644 extern/recastnavigation/Detour/Include/DetourAlloc.h
 delete mode 100644 extern/recastnavigation/Detour/Include/DetourAssert.h
 delete mode 100644 extern/recastnavigation/Detour/Include/DetourCommon.h
 delete mode 100644 extern/recastnavigation/Detour/Include/DetourMath.h
 delete mode 100644 extern/recastnavigation/Detour/Include/DetourNavMesh.h
 delete mode 100644 extern/recastnavigation/Detour/Include/DetourNavMeshBuilder.h
 delete mode 100644 extern/recastnavigation/Detour/Include/DetourNavMeshQuery.h
 delete mode 100644 extern/recastnavigation/Detour/Include/DetourNode.h
 delete mode 100644 extern/recastnavigation/Detour/Include/DetourStatus.h
 delete mode 100644 extern/recastnavigation/Detour/Source/DetourAlloc.cpp
 delete mode 100644 extern/recastnavigation/Detour/Source/DetourAssert.cpp
 delete mode 100644 extern/recastnavigation/Detour/Source/DetourCommon.cpp
 delete mode 100644 extern/recastnavigation/Detour/Source/DetourNavMesh.cpp
 delete mode 100644 extern/recastnavigation/Detour/Source/DetourNavMeshBuilder.cpp
 delete mode 100644 extern/recastnavigation/Detour/Source/DetourNavMeshQuery.cpp
 delete mode 100644 extern/recastnavigation/Detour/Source/DetourNode.cpp
 delete mode 100644 extern/recastnavigation/DetourCrowd/CMakeLists.txt
 delete mode 100644 extern/recastnavigation/DetourCrowd/Include/DetourCrowd.h
 delete mode 100644 extern/recastnavigation/DetourCrowd/Include/DetourLocalBoundary.h
 delete mode 100644 extern/recastnavigation/DetourCrowd/Include/DetourObstacleAvoidance.h
 delete mode 100644 extern/recastnavigation/DetourCrowd/Include/DetourPathCorridor.h
 delete mode 100644 extern/recastnavigation/DetourCrowd/Include/DetourPathQueue.h
 delete mode 100644 extern/recastnavigation/DetourCrowd/Include/DetourProximityGrid.h
 delete mode 100644 extern/recastnavigation/DetourCrowd/Source/DetourCrowd.cpp
 delete mode 100644 extern/recastnavigation/DetourCrowd/Source/DetourLocalBoundary.cpp
 delete mode 100644 extern/recastnavigation/DetourCrowd/Source/DetourObstacleAvoidance.cpp
 delete mode 100644 extern/recastnavigation/DetourCrowd/Source/DetourPathCorridor.cpp
 delete mode 100644 extern/recastnavigation/DetourCrowd/Source/DetourPathQueue.cpp
 delete mode 100644 extern/recastnavigation/DetourCrowd/Source/DetourProximityGrid.cpp
 delete mode 100644 extern/recastnavigation/DetourTileCache/CMakeLists.txt
 delete mode 100644 extern/recastnavigation/DetourTileCache/Include/DetourTileCache.h
 delete mode 100644 extern/recastnavigation/DetourTileCache/Include/DetourTileCacheBuilder.h
 delete mode 100644 extern/recastnavigation/DetourTileCache/Source/DetourTileCache.cpp
 delete mode 100644 extern/recastnavigation/DetourTileCache/Source/DetourTileCacheBuilder.cpp
 delete mode 100644 extern/recastnavigation/License.txt
 delete mode 100644 extern/recastnavigation/Recast/CMakeLists.txt
 delete mode 100644 extern/recastnavigation/Recast/Include/Recast.h
 delete mode 100644 extern/recastnavigation/Recast/Include/RecastAlloc.h
 delete mode 100644 extern/recastnavigation/Recast/Include/RecastAssert.h
 delete mode 100644 extern/recastnavigation/Recast/Source/Recast.cpp
 delete mode 100644 extern/recastnavigation/Recast/Source/RecastAlloc.cpp
 delete mode 100644 extern/recastnavigation/Recast/Source/RecastArea.cpp
 delete mode 100644 extern/recastnavigation/Recast/Source/RecastAssert.cpp
 delete mode 100644 extern/recastnavigation/Recast/Source/RecastContour.cpp
 delete mode 100644 extern/recastnavigation/Recast/Source/RecastFilter.cpp
 delete mode 100644 extern/recastnavigation/Recast/Source/RecastLayers.cpp
 delete mode 100644 extern/recastnavigation/Recast/Source/RecastMesh.cpp
 delete mode 100644 extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
 delete mode 100644 extern/recastnavigation/Recast/Source/RecastRasterization.cpp
 delete mode 100644 extern/recastnavigation/Recast/Source/RecastRegion.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b02ec055d2..1a7412253b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -127,6 +127,14 @@ else()
 endif()
 option(MYGUI_STATIC "Link static build of Mygui into the binaries" ${_mygui_static_default})
 
+option(OPENMW_USE_SYSTEM_RECASTNAVIGATION "Use system provided recastnavigation library" OFF)
+if(OPENMW_USE_SYSTEM_RECASTNAVIGATION)
+    set(_recastnavigation_static_default OFF)
+else()
+    set(_recastnavigation_static_default ON)
+endif()
+option(RECASTNAVIGATION_STATIC "Build recastnavigation static libraries" ${_recastnavigation_static_default})
+
 option(OPENMW_UNITY_BUILD "Use fewer compilation units to speed up compile time" FALSE)
 option(OPENMW_LTO_BUILD "Build OpenMW with Link-Time Optimization (Needs ~2GB of RAM)" OFF)
 
@@ -482,9 +490,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
 endif (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
 
 # Extern
-set(RECASTNAVIGATION_STATIC ON CACHE BOOL "Build recastnavigation static libraries")
 
-add_subdirectory (extern/recastnavigation EXCLUDE_FROM_ALL)
 add_subdirectory (extern/osg-ffmpeg-videoplayer)
 add_subdirectory (extern/oics)
 if (BUILD_OPENCS)
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index fd21b70722..b4182a1053 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -129,3 +129,24 @@ if(NOT OPENMW_USE_SYSTEM_OSG)
         set(${_name_uc}_LIBRARY ${_name} PARENT_SCOPE)
     endforeach()
 endif()
+
+if(NOT OPENMW_USE_SYSTEM_RECASTNAVIGATION)
+    if(RECASTNAVIGATION_STATIC)
+        set(BUILD_SHARED_LIBS OFF)
+    else()
+        set(BUILD_SHARED_LIBS ON)
+    endif()
+
+    set(RECASTNAVIGATION_DEMO OFF CACHE BOOL "")
+    set(RECASTNAVIGATION_TESTS OFF CACHE BOOL "")
+    set(RECASTNAVIGATION_EXAMPLES OFF CACHE BOOL "")
+
+    # master on 15 Feb 2021
+    include(FetchContent)
+    FetchContent_Declare(recastnavigation
+        URL https://github.com/recastnavigation/recastnavigation/archive/e75adf86f91eb3082220085e42dda62679f9a3ea.zip
+        URL_HASH MD5=af905d121ef9d1cdfa979b0495cba059
+        SOURCE_DIR fetched/recastnavigation
+    )
+    FetchContent_MakeAvailableExcludeFromAll(recastnavigation)
+endif()
diff --git a/extern/recastnavigation/.editorconfig b/extern/recastnavigation/.editorconfig
deleted file mode 100644
index 08f28f4417..0000000000
--- a/extern/recastnavigation/.editorconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-# editorconfig.org
-
-# top-most EditorConfig file
-root = true
-
-[*]
-indent_size = 4
-indent_style = tab
-
-[*.yml]
-indent_size = 2
-indent_style = space
diff --git a/extern/recastnavigation/.gitignore b/extern/recastnavigation/.gitignore
deleted file mode 100644
index 98f17e4b73..0000000000
--- a/extern/recastnavigation/.gitignore
+++ /dev/null
@@ -1,49 +0,0 @@
-## Compiled source #
-*.com
-*.class
-*.dll
-*.exe
-*.ilk
-*.o
-*.pdb
-*.so
-*.idb
-
-## Linux exes have no extension
-RecastDemo/Bin/RecastDemo
-RecastDemo/Bin/Tests
-
-# Build directory
-RecastDemo/Build
-
-# Ignore meshes
-RecastDemo/Bin/Meshes/*
-
-## Logs and databases #
-*.log
-*.sql
-*.sqlite
-
-## OS generated files #
-.DS_Store
-.DS_Store?
-._*
-.Spotlight-V100
-.Trashes
-ehthumbs.db
-Thumbs.db
-*.swp
-*.swo
-
-## xcode specific
-*xcuserdata*
-
-## SDL contrib
-RecastDemo/Contrib/SDL/*
-
-## Generated doc files
-Docs/html
-
-## IDE files
-.idea/
-cmake-build-*/
diff --git a/extern/recastnavigation/.id b/extern/recastnavigation/.id
deleted file mode 100644
index b53727263d..0000000000
--- a/extern/recastnavigation/.id
+++ /dev/null
@@ -1 +0,0 @@
-6624e7aef5e15df11cb2f5673574df8e4c96af6a
diff --git a/extern/recastnavigation/.url b/extern/recastnavigation/.url
deleted file mode 100644
index b38b1645f3..0000000000
--- a/extern/recastnavigation/.url
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/recastnavigation/recastnavigation.git
diff --git a/extern/recastnavigation/CMakeLists.txt b/extern/recastnavigation/CMakeLists.txt
deleted file mode 100644
index cf35af1e87..0000000000
--- a/extern/recastnavigation/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-cmake_minimum_required(VERSION 3.0)
-
-# for link time optimization, remove if cmake version is >= 3.9
-if(POLICY CMP0069)
-    cmake_policy(SET CMP0069 NEW)
-endif()
-
-project(RecastNavigation)
-
-# lib versions
-SET(SOVERSION 1)
-SET(VERSION 1.0.0)
-
-option(RECASTNAVIGATION_STATIC "Build static libraries" ON)
-
-if(MSVC AND BUILD_SHARED_LIBS)
-    set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-endif()
-
-include(GNUInstallDirs)
-
-add_subdirectory(DebugUtils)
-add_subdirectory(Detour)
-add_subdirectory(DetourCrowd)
-add_subdirectory(DetourTileCache)
-add_subdirectory(Recast)
diff --git a/extern/recastnavigation/DebugUtils/CMakeLists.txt b/extern/recastnavigation/DebugUtils/CMakeLists.txt
deleted file mode 100644
index 21d8f8f9d9..0000000000
--- a/extern/recastnavigation/DebugUtils/CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-file(GLOB SOURCES Source/*.cpp)
-add_library(DebugUtils ${SOURCES})
-
-add_library(RecastNavigation::DebugUtils ALIAS DebugUtils)
-set_target_properties(DebugUtils PROPERTIES DEBUG_POSTFIX -d)
-
-set(DebugUtils_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Include")
-
-target_include_directories(DebugUtils PUBLIC
-    "$<BUILD_INTERFACE:${DebugUtils_INCLUDE_DIR}>"
-)
-
-target_link_libraries(DebugUtils
-    Recast
-    Detour
-    DetourTileCache
-)
-
-set_target_properties(DebugUtils PROPERTIES
-        SOVERSION ${SOVERSION}
-        VERSION ${VERSION}
-        COMPILE_PDB_OUTPUT_DIRECTORY .
-        COMPILE_PDB_NAME "DebugUtils-d"
-        )
-
-install(TARGETS DebugUtils
-        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        COMPONENT library
-        )
-
-file(GLOB INCLUDES Include/*.h)
-install(FILES ${INCLUDES} DESTINATION
-    ${CMAKE_INSTALL_INCLUDEDIR}/recastnavigation)
-install(FILES "$<TARGET_FILE_DIR:DebugUtils>/DebugUtils-d.pdb" CONFIGURATIONS "Debug" DESTINATION "lib") 
diff --git a/extern/recastnavigation/DebugUtils/Include/DebugDraw.h b/extern/recastnavigation/DebugUtils/Include/DebugDraw.h
deleted file mode 100644
index f47df0b7bf..0000000000
--- a/extern/recastnavigation/DebugUtils/Include/DebugDraw.h
+++ /dev/null
@@ -1,223 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef DEBUGDRAW_H
-#define DEBUGDRAW_H
-
-// Some math headers don't have PI defined.
-static const float DU_PI = 3.14159265f;
-
-enum duDebugDrawPrimitives
-{
-	DU_DRAW_POINTS,
-	DU_DRAW_LINES,
-	DU_DRAW_TRIS,
-	DU_DRAW_QUADS,	
-};
-
-/// Abstract debug draw interface.
-struct duDebugDraw
-{
-	virtual ~duDebugDraw() = 0;
-	
-	virtual void depthMask(bool state) = 0;
-
-	virtual void texture(bool state) = 0;
-
-	/// Begin drawing primitives.
-	///  @param prim [in] primitive type to draw, one of rcDebugDrawPrimitives.
-	///  @param size [in] size of a primitive, applies to point size and line width only.
-	virtual void begin(duDebugDrawPrimitives prim, float size = 1.0f) = 0;
-
-	/// Submit a vertex
-	///  @param pos [in] position of the verts.
-	///  @param color [in] color of the verts.
-	virtual void vertex(const float* pos, unsigned int color) = 0;
-
-	/// Submit a vertex
-	///  @param x,y,z [in] position of the verts.
-	///  @param color [in] color of the verts.
-	virtual void vertex(const float x, const float y, const float z, unsigned int color) = 0;
-
-	/// Submit a vertex
-	///  @param pos [in] position of the verts.
-	///  @param color [in] color of the verts.
-	virtual void vertex(const float* pos, unsigned int color, const float* uv) = 0;
-	
-	/// Submit a vertex
-	///  @param x,y,z [in] position of the verts.
-	///  @param color [in] color of the verts.
-	virtual void vertex(const float x, const float y, const float z, unsigned int color, const float u, const float v) = 0;
-	
-	/// End drawing primitives.
-	virtual void end() = 0;
-
-	/// Compute a color for given area.
-	virtual unsigned int areaToCol(unsigned int area);
-};
-
-inline unsigned int duRGBA(int r, int g, int b, int a)
-{
-	return ((unsigned int)r) | ((unsigned int)g << 8) | ((unsigned int)b << 16) | ((unsigned int)a << 24);
-}
-
-inline unsigned int duRGBAf(float fr, float fg, float fb, float fa)
-{
-	unsigned char r = (unsigned char)(fr*255.0f);
-	unsigned char g = (unsigned char)(fg*255.0f);
-	unsigned char b = (unsigned char)(fb*255.0f);
-	unsigned char a = (unsigned char)(fa*255.0f);
-	return duRGBA(r,g,b,a);
-}
-
-unsigned int duIntToCol(int i, int a);
-void duIntToCol(int i, float* col);
-
-inline unsigned int duMultCol(const unsigned int col, const unsigned int d)
-{
-	const unsigned int r = col & 0xff;
-	const unsigned int g = (col >> 8) & 0xff;
-	const unsigned int b = (col >> 16) & 0xff;
-	const unsigned int a = (col >> 24) & 0xff;
-	return duRGBA((r*d) >> 8, (g*d) >> 8, (b*d) >> 8, a);
-}
-
-inline unsigned int duDarkenCol(unsigned int col)
-{
-	return ((col >> 1) & 0x007f7f7f) | (col & 0xff000000);
-}
-
-inline unsigned int duLerpCol(unsigned int ca, unsigned int cb, unsigned int u)
-{
-	const unsigned int ra = ca & 0xff;
-	const unsigned int ga = (ca >> 8) & 0xff;
-	const unsigned int ba = (ca >> 16) & 0xff;
-	const unsigned int aa = (ca >> 24) & 0xff;
-	const unsigned int rb = cb & 0xff;
-	const unsigned int gb = (cb >> 8) & 0xff;
-	const unsigned int bb = (cb >> 16) & 0xff;
-	const unsigned int ab = (cb >> 24) & 0xff;
-	
-	unsigned int r = (ra*(255-u) + rb*u)/255;
-	unsigned int g = (ga*(255-u) + gb*u)/255;
-	unsigned int b = (ba*(255-u) + bb*u)/255;
-	unsigned int a = (aa*(255-u) + ab*u)/255;
-	return duRGBA(r,g,b,a);
-}
-
-inline unsigned int duTransCol(unsigned int c, unsigned int a)
-{
-	return (a<<24) | (c & 0x00ffffff);
-}
-
-
-void duCalcBoxColors(unsigned int* colors, unsigned int colTop, unsigned int colSide);
-
-void duDebugDrawCylinderWire(struct duDebugDraw* dd, float minx, float miny, float minz,
-							 float maxx, float maxy, float maxz, unsigned int col, const float lineWidth);
-
-void duDebugDrawBoxWire(struct duDebugDraw* dd, float minx, float miny, float minz,
-						float maxx, float maxy, float maxz, unsigned int col, const float lineWidth);
-
-void duDebugDrawArc(struct duDebugDraw* dd, const float x0, const float y0, const float z0,
-					const float x1, const float y1, const float z1, const float h,
-					const float as0, const float as1, unsigned int col, const float lineWidth);
-
-void duDebugDrawArrow(struct duDebugDraw* dd, const float x0, const float y0, const float z0,
-					  const float x1, const float y1, const float z1,
-					  const float as0, const float as1, unsigned int col, const float lineWidth);
-
-void duDebugDrawCircle(struct duDebugDraw* dd, const float x, const float y, const float z,
-					   const float r, unsigned int col, const float lineWidth);
-
-void duDebugDrawCross(struct duDebugDraw* dd, const float x, const float y, const float z,
-					  const float size, unsigned int col, const float lineWidth);
-
-void duDebugDrawBox(struct duDebugDraw* dd, float minx, float miny, float minz,
-					float maxx, float maxy, float maxz, const unsigned int* fcol);
-
-void duDebugDrawCylinder(struct duDebugDraw* dd, float minx, float miny, float minz,
-						 float maxx, float maxy, float maxz, unsigned int col);
-
-void duDebugDrawGridXZ(struct duDebugDraw* dd, const float ox, const float oy, const float oz,
-					   const int w, const int h, const float size,
-					   const unsigned int col, const float lineWidth);
-
-
-// Versions without begin/end, can be used to draw multiple primitives.
-void duAppendCylinderWire(struct duDebugDraw* dd, float minx, float miny, float minz,
-						  float maxx, float maxy, float maxz, unsigned int col);
-
-void duAppendBoxWire(struct duDebugDraw* dd, float minx, float miny, float minz,
-					 float maxx, float maxy, float maxz, unsigned int col);
-
-void duAppendBoxPoints(struct duDebugDraw* dd, float minx, float miny, float minz,
-					   float maxx, float maxy, float maxz, unsigned int col);
-
-void duAppendArc(struct duDebugDraw* dd, const float x0, const float y0, const float z0,
-				 const float x1, const float y1, const float z1, const float h,
-				 const float as0, const float as1, unsigned int col);
-
-void duAppendArrow(struct duDebugDraw* dd, const float x0, const float y0, const float z0,
-				   const float x1, const float y1, const float z1,
-				   const float as0, const float as1, unsigned int col);
-
-void duAppendCircle(struct duDebugDraw* dd, const float x, const float y, const float z,
-					const float r, unsigned int col);
-
-void duAppendCross(struct duDebugDraw* dd, const float x, const float y, const float z,
-				   const float size, unsigned int col);
-
-void duAppendBox(struct duDebugDraw* dd, float minx, float miny, float minz,
-				 float maxx, float maxy, float maxz, const unsigned int* fcol);
-
-void duAppendCylinder(struct duDebugDraw* dd, float minx, float miny, float minz,
-					  float maxx, float maxy, float maxz, unsigned int col);
-
-
-class duDisplayList : public duDebugDraw
-{
-	float* m_pos;
-	unsigned int* m_color;
-	int m_size;
-	int m_cap;
-
-	bool m_depthMask;
-	duDebugDrawPrimitives m_prim;
-	float m_primSize;
-	
-	void resize(int cap);
-	
-public:
-	duDisplayList(int cap = 512);
-	~duDisplayList();
-	void depthMask(bool state) override;
-	void begin(duDebugDrawPrimitives prim, float size = 1.0f) override;
-	void vertex(const float x, const float y, const float z, unsigned int color) override;
-	void vertex(const float* pos, unsigned int color) override;
-	void end() override;
-	void clear();
-	void draw(struct duDebugDraw* dd);
-private:
-	// Explicitly disabled copy constructor and copy assignment operator.
-	duDisplayList(const duDisplayList&);
-	duDisplayList& operator=(const duDisplayList&);
-};
-
-
-#endif // DEBUGDRAW_H
diff --git a/extern/recastnavigation/DebugUtils/Include/DetourDebugDraw.h b/extern/recastnavigation/DebugUtils/Include/DetourDebugDraw.h
deleted file mode 100755
index ff2ca2f9d1..0000000000
--- a/extern/recastnavigation/DebugUtils/Include/DetourDebugDraw.h
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef DETOURDEBUGDRAW_H
-#define DETOURDEBUGDRAW_H
-
-#include "DetourNavMesh.h"
-#include "DetourNavMeshQuery.h"
-#include "DetourTileCacheBuilder.h"
-
-enum DrawNavMeshFlags
-{
-	DU_DRAWNAVMESH_OFFMESHCONS = 0x01,
-	DU_DRAWNAVMESH_CLOSEDLIST = 0x02,
-	DU_DRAWNAVMESH_COLOR_TILES = 0x04,
-};
-
-void duDebugDrawNavMesh(struct duDebugDraw* dd, const dtNavMesh& mesh, unsigned char flags);
-void duDebugDrawNavMeshWithClosedList(struct duDebugDraw* dd, const dtNavMesh& mesh, const dtNavMeshQuery& query, unsigned char flags);
-void duDebugDrawNavMeshNodes(struct duDebugDraw* dd, const dtNavMeshQuery& query);
-void duDebugDrawNavMeshBVTree(struct duDebugDraw* dd, const dtNavMesh& mesh);
-void duDebugDrawNavMeshPortals(struct duDebugDraw* dd, const dtNavMesh& mesh);
-void duDebugDrawNavMeshPolysWithFlags(struct duDebugDraw* dd, const dtNavMesh& mesh, const unsigned short polyFlags, const unsigned int col);
-void duDebugDrawNavMeshPoly(struct duDebugDraw* dd, const dtNavMesh& mesh, dtPolyRef ref, const unsigned int col);
-
-void duDebugDrawTileCacheLayerAreas(struct duDebugDraw* dd, const dtTileCacheLayer& layer, const float cs, const float ch);
-void duDebugDrawTileCacheLayerRegions(struct duDebugDraw* dd, const dtTileCacheLayer& layer, const float cs, const float ch);
-void duDebugDrawTileCacheContours(duDebugDraw* dd, const struct dtTileCacheContourSet& lcset,
-								  const float* orig, const float cs, const float ch);
-void duDebugDrawTileCachePolyMesh(duDebugDraw* dd, const struct dtTileCachePolyMesh& lmesh,
-								  const float* orig, const float cs, const float ch);
-
-#endif // DETOURDEBUGDRAW_H
diff --git a/extern/recastnavigation/DebugUtils/Include/RecastDebugDraw.h b/extern/recastnavigation/DebugUtils/Include/RecastDebugDraw.h
deleted file mode 100644
index 6a55fa6472..0000000000
--- a/extern/recastnavigation/DebugUtils/Include/RecastDebugDraw.h
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef RECAST_DEBUGDRAW_H
-#define RECAST_DEBUGDRAW_H
-
-void duDebugDrawTriMesh(struct duDebugDraw* dd, const float* verts, int nverts, const int* tris, const float* normals, int ntris, const unsigned char* flags, const float texScale);
-void duDebugDrawTriMeshSlope(struct duDebugDraw* dd, const float* verts, int nverts, const int* tris, const float* normals, int ntris, const float walkableSlopeAngle, const float texScale);
-
-void duDebugDrawHeightfieldSolid(struct duDebugDraw* dd, const struct rcHeightfield& hf);
-void duDebugDrawHeightfieldWalkable(struct duDebugDraw* dd, const struct rcHeightfield& hf);
-
-void duDebugDrawCompactHeightfieldSolid(struct duDebugDraw* dd, const struct rcCompactHeightfield& chf);
-void duDebugDrawCompactHeightfieldRegions(struct duDebugDraw* dd, const struct rcCompactHeightfield& chf);
-void duDebugDrawCompactHeightfieldDistance(struct duDebugDraw* dd, const struct rcCompactHeightfield& chf);
-
-void duDebugDrawHeightfieldLayer(duDebugDraw* dd, const struct rcHeightfieldLayer& layer, const int idx);
-void duDebugDrawHeightfieldLayers(duDebugDraw* dd, const struct rcHeightfieldLayerSet& lset);
-void duDebugDrawHeightfieldLayersRegions(duDebugDraw* dd, const struct rcHeightfieldLayerSet& lset);
-
-void duDebugDrawRegionConnections(struct duDebugDraw* dd, const struct rcContourSet& cset, const float alpha = 1.0f);
-void duDebugDrawRawContours(struct duDebugDraw* dd, const struct rcContourSet& cset, const float alpha = 1.0f);
-void duDebugDrawContours(struct duDebugDraw* dd, const struct rcContourSet& cset, const float alpha = 1.0f);
-void duDebugDrawPolyMesh(struct duDebugDraw* dd, const struct rcPolyMesh& mesh);
-void duDebugDrawPolyMeshDetail(struct duDebugDraw* dd, const struct rcPolyMeshDetail& dmesh);
-
-#endif // RECAST_DEBUGDRAW_H
diff --git a/extern/recastnavigation/DebugUtils/Include/RecastDump.h b/extern/recastnavigation/DebugUtils/Include/RecastDump.h
deleted file mode 100644
index 6a722fdaea..0000000000
--- a/extern/recastnavigation/DebugUtils/Include/RecastDump.h
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef RECAST_DUMP_H
-#define RECAST_DUMP_H
-
-struct duFileIO
-{
-	virtual ~duFileIO() = 0;
-	virtual bool isWriting() const = 0;
-	virtual bool isReading() const = 0;
-	virtual bool write(const void* ptr, const size_t size) = 0;
-	virtual bool read(void* ptr, const size_t size) = 0;
-};
-
-bool duDumpPolyMeshToObj(struct rcPolyMesh& pmesh, duFileIO* io);
-bool duDumpPolyMeshDetailToObj(struct rcPolyMeshDetail& dmesh, duFileIO* io);
-
-bool duDumpContourSet(struct rcContourSet& cset, duFileIO* io);
-bool duReadContourSet(struct rcContourSet& cset, duFileIO* io);
-
-bool duDumpCompactHeightfield(struct rcCompactHeightfield& chf, duFileIO* io);
-bool duReadCompactHeightfield(struct rcCompactHeightfield& chf, duFileIO* io);
-
-void duLogBuildTimes(rcContext& ctx, const int totalTileUsec);
-
-
-#endif // RECAST_DUMP_H
diff --git a/extern/recastnavigation/DebugUtils/Source/DebugDraw.cpp b/extern/recastnavigation/DebugUtils/Source/DebugDraw.cpp
deleted file mode 100644
index d0179bca23..0000000000
--- a/extern/recastnavigation/DebugUtils/Source/DebugDraw.cpp
+++ /dev/null
@@ -1,612 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#define _USE_MATH_DEFINES
-#include <string.h>
-#include "DebugDraw.h"
-#include "DetourMath.h"
-#include "DetourNavMesh.h"
-
-
-duDebugDraw::~duDebugDraw()
-{
-	// Empty
-}
-
-unsigned int duDebugDraw::areaToCol(unsigned int area)
-{
-	if (area == 0)
-	{
-		// Treat zero area type as default.
-		return duRGBA(0, 192, 255, 255);
-	}
-	else
-	{
-		return duIntToCol(area, 255);
-	}
-}
-
-inline int bit(int a, int b)
-{
-	return (a & (1 << b)) >> b;
-}
-
-unsigned int duIntToCol(int i, int a)
-{
-	int	r = bit(i, 1) + bit(i, 3) * 2 + 1;
-	int	g = bit(i, 2) + bit(i, 4) * 2 + 1;
-	int	b = bit(i, 0) + bit(i, 5) * 2 + 1;
-	return duRGBA(r*63,g*63,b*63,a);
-}
-
-void duIntToCol(int i, float* col)
-{
-	int	r = bit(i, 0) + bit(i, 3) * 2 + 1;
-	int	g = bit(i, 1) + bit(i, 4) * 2 + 1;
-	int	b = bit(i, 2) + bit(i, 5) * 2 + 1;
-	col[0] = 1 - r*63.0f/255.0f;
-	col[1] = 1 - g*63.0f/255.0f;
-	col[2] = 1 - b*63.0f/255.0f;
-}
-
-void duCalcBoxColors(unsigned int* colors, unsigned int colTop, unsigned int colSide)
-{
-	if (!colors) return;
-	
-	colors[0] = duMultCol(colTop, 250);
-	colors[1] = duMultCol(colSide, 140);
-	colors[2] = duMultCol(colSide, 165);
-	colors[3] = duMultCol(colSide, 217);
-	colors[4] = duMultCol(colSide, 165);
-	colors[5] = duMultCol(colSide, 217);
-}
-
-void duDebugDrawCylinderWire(struct duDebugDraw* dd, float minx, float miny, float minz,
-							 float maxx, float maxy, float maxz, unsigned int col, const float lineWidth)
-{
-	if (!dd) return;
-	
-	dd->begin(DU_DRAW_LINES, lineWidth);
-	duAppendCylinderWire(dd, minx,miny,minz, maxx,maxy,maxz, col);
-	dd->end();
-}
-
-void duDebugDrawBoxWire(struct duDebugDraw* dd, float minx, float miny, float minz,
-						float maxx, float maxy, float maxz, unsigned int col, const float lineWidth)
-{
-	if (!dd) return;
-	
-	dd->begin(DU_DRAW_LINES, lineWidth);
-	duAppendBoxWire(dd, minx,miny,minz, maxx,maxy,maxz, col);
-	dd->end();
-}
-
-void duDebugDrawArc(struct duDebugDraw* dd, const float x0, const float y0, const float z0,
-					const float x1, const float y1, const float z1, const float h,
-					const float as0, const float as1, unsigned int col, const float lineWidth)
-{
-	if (!dd) return;
-	
-	dd->begin(DU_DRAW_LINES, lineWidth);
-	duAppendArc(dd, x0,y0,z0, x1,y1,z1, h, as0, as1, col);
-	dd->end();
-}
-
-void duDebugDrawArrow(struct duDebugDraw* dd, const float x0, const float y0, const float z0,
-					  const float x1, const float y1, const float z1,
-					  const float as0, const float as1, unsigned int col, const float lineWidth)
-{
-	if (!dd) return;
-	
-	dd->begin(DU_DRAW_LINES, lineWidth);
-	duAppendArrow(dd, x0,y0,z0, x1,y1,z1, as0, as1, col);
-	dd->end();
-}
-
-void duDebugDrawCircle(struct duDebugDraw* dd, const float x, const float y, const float z,
-					   const float r, unsigned int col, const float lineWidth)
-{
-	if (!dd) return;
-	
-	dd->begin(DU_DRAW_LINES, lineWidth);
-	duAppendCircle(dd, x,y,z, r, col);
-	dd->end();
-}
-
-void duDebugDrawCross(struct duDebugDraw* dd, const float x, const float y, const float z,
-					  const float size, unsigned int col, const float lineWidth)
-{
-	if (!dd) return;
-	
-	dd->begin(DU_DRAW_LINES, lineWidth);
-	duAppendCross(dd, x,y,z, size, col);
-	dd->end();
-}
-
-void duDebugDrawBox(struct duDebugDraw* dd, float minx, float miny, float minz,
-					float maxx, float maxy, float maxz, const unsigned int* fcol)
-{
-	if (!dd) return;
-	
-	dd->begin(DU_DRAW_QUADS);
-	duAppendBox(dd, minx,miny,minz, maxx,maxy,maxz, fcol);
-	dd->end();
-}
-
-void duDebugDrawCylinder(struct duDebugDraw* dd, float minx, float miny, float minz,
-						 float maxx, float maxy, float maxz, unsigned int col)
-{
-	if (!dd) return;
-	
-	dd->begin(DU_DRAW_TRIS);
-	duAppendCylinder(dd, minx,miny,minz, maxx,maxy,maxz, col);
-	dd->end();
-}
-
-void duDebugDrawGridXZ(struct duDebugDraw* dd, const float ox, const float oy, const float oz,
-					   const int w, const int h, const float size,
-					   const unsigned int col, const float lineWidth)
-{
-	if (!dd) return;
-
-	dd->begin(DU_DRAW_LINES, lineWidth);
-	for (int i = 0; i <= h; ++i)
-	{
-		dd->vertex(ox,oy,oz+i*size, col);
-		dd->vertex(ox+w*size,oy,oz+i*size, col);
-	}
-	for (int i = 0; i <= w; ++i)
-	{
-		dd->vertex(ox+i*size,oy,oz, col);
-		dd->vertex(ox+i*size,oy,oz+h*size, col);
-	}
-	dd->end();
-}
-		 
-
-void duAppendCylinderWire(struct duDebugDraw* dd, float minx, float miny, float minz,
-						  float maxx, float maxy, float maxz, unsigned int col)
-{
-	if (!dd) return;
-
-	static const int NUM_SEG = 16;
-	static float dir[NUM_SEG*2];
-	static bool init = false;
-	if (!init)
-	{
-		init = true;
-		for (int i = 0; i < NUM_SEG; ++i)
-		{
-			const float a = (float)i/(float)NUM_SEG*DU_PI*2;
-			dir[i*2] = dtMathCosf(a);
-			dir[i*2+1] = dtMathSinf(a);
-		}
-	}
-	
-	const float cx = (maxx + minx)/2;
-	const float cz = (maxz + minz)/2;
-	const float rx = (maxx - minx)/2;
-	const float rz = (maxz - minz)/2;
-	
-	for (int i = 0, j = NUM_SEG-1; i < NUM_SEG; j = i++)
-	{
-		dd->vertex(cx+dir[j*2+0]*rx, miny, cz+dir[j*2+1]*rz, col);
-		dd->vertex(cx+dir[i*2+0]*rx, miny, cz+dir[i*2+1]*rz, col);
-		dd->vertex(cx+dir[j*2+0]*rx, maxy, cz+dir[j*2+1]*rz, col);
-		dd->vertex(cx+dir[i*2+0]*rx, maxy, cz+dir[i*2+1]*rz, col);
-	}
-	for (int i = 0; i < NUM_SEG; i += NUM_SEG/4)
-	{
-		dd->vertex(cx+dir[i*2+0]*rx, miny, cz+dir[i*2+1]*rz, col);
-		dd->vertex(cx+dir[i*2+0]*rx, maxy, cz+dir[i*2+1]*rz, col);
-	}
-}
-
-void duAppendBoxWire(struct duDebugDraw* dd, float minx, float miny, float minz,
-					 float maxx, float maxy, float maxz, unsigned int col)
-{
-	if (!dd) return;
-	// Top
-	dd->vertex(minx, miny, minz, col);
-	dd->vertex(maxx, miny, minz, col);
-	dd->vertex(maxx, miny, minz, col);
-	dd->vertex(maxx, miny, maxz, col);
-	dd->vertex(maxx, miny, maxz, col);
-	dd->vertex(minx, miny, maxz, col);
-	dd->vertex(minx, miny, maxz, col);
-	dd->vertex(minx, miny, minz, col);
-	
-	// bottom
-	dd->vertex(minx, maxy, minz, col);
-	dd->vertex(maxx, maxy, minz, col);
-	dd->vertex(maxx, maxy, minz, col);
-	dd->vertex(maxx, maxy, maxz, col);
-	dd->vertex(maxx, maxy, maxz, col);
-	dd->vertex(minx, maxy, maxz, col);
-	dd->vertex(minx, maxy, maxz, col);
-	dd->vertex(minx, maxy, minz, col);
-	
-	// Sides
-	dd->vertex(minx, miny, minz, col);
-	dd->vertex(minx, maxy, minz, col);
-	dd->vertex(maxx, miny, minz, col);
-	dd->vertex(maxx, maxy, minz, col);
-	dd->vertex(maxx, miny, maxz, col);
-	dd->vertex(maxx, maxy, maxz, col);
-	dd->vertex(minx, miny, maxz, col);
-	dd->vertex(minx, maxy, maxz, col);
-}
-
-void duAppendBoxPoints(struct duDebugDraw* dd, float minx, float miny, float minz,
-					   float maxx, float maxy, float maxz, unsigned int col)
-{
-	if (!dd) return;
-	// Top
-	dd->vertex(minx, miny, minz, col);
-	dd->vertex(maxx, miny, minz, col);
-	dd->vertex(maxx, miny, minz, col);
-	dd->vertex(maxx, miny, maxz, col);
-	dd->vertex(maxx, miny, maxz, col);
-	dd->vertex(minx, miny, maxz, col);
-	dd->vertex(minx, miny, maxz, col);
-	dd->vertex(minx, miny, minz, col);
-	
-	// bottom
-	dd->vertex(minx, maxy, minz, col);
-	dd->vertex(maxx, maxy, minz, col);
-	dd->vertex(maxx, maxy, minz, col);
-	dd->vertex(maxx, maxy, maxz, col);
-	dd->vertex(maxx, maxy, maxz, col);
-	dd->vertex(minx, maxy, maxz, col);
-	dd->vertex(minx, maxy, maxz, col);
-	dd->vertex(minx, maxy, minz, col);
-}
-
-void duAppendBox(struct duDebugDraw* dd, float minx, float miny, float minz,
-				 float maxx, float maxy, float maxz, const unsigned int* fcol)
-{
-	if (!dd) return;
-	const float verts[8*3] =
-	{
-		minx, miny, minz,
-		maxx, miny, minz,
-		maxx, miny, maxz,
-		minx, miny, maxz,
-		minx, maxy, minz,
-		maxx, maxy, minz,
-		maxx, maxy, maxz,
-		minx, maxy, maxz,
-	};
-	static const unsigned char inds[6*4] =
-	{
-		7, 6, 5, 4,
-		0, 1, 2, 3,
-		1, 5, 6, 2,
-		3, 7, 4, 0,
-		2, 6, 7, 3,
-		0, 4, 5, 1,
-	};
-	
-	const unsigned char* in = inds;
-	for (int i = 0; i < 6; ++i)
-	{
-		dd->vertex(&verts[*in*3], fcol[i]); in++;
-		dd->vertex(&verts[*in*3], fcol[i]); in++;
-		dd->vertex(&verts[*in*3], fcol[i]); in++;
-		dd->vertex(&verts[*in*3], fcol[i]); in++;
-	}
-}
-
-void duAppendCylinder(struct duDebugDraw* dd, float minx, float miny, float minz,
-					  float maxx, float maxy, float maxz, unsigned int col)
-{
-	if (!dd) return;
-	
-	static const int NUM_SEG = 16;
-	static float dir[NUM_SEG*2];
-	static bool init = false;
-	if (!init)
-	{
-		init = true;
-		for (int i = 0; i < NUM_SEG; ++i)
-		{
-			const float a = (float)i/(float)NUM_SEG*DU_PI*2;
-			dir[i*2] = cosf(a);
-			dir[i*2+1] = sinf(a);
-		}
-	}
-	
-	unsigned int col2 = duMultCol(col, 160);
-	
-	const float cx = (maxx + minx)/2;
-	const float cz = (maxz + minz)/2;
-	const float rx = (maxx - minx)/2;
-	const float rz = (maxz - minz)/2;
-
-	for (int i = 2; i < NUM_SEG; ++i)
-	{
-		const int a = 0, b = i-1, c = i;
-		dd->vertex(cx+dir[a*2+0]*rx, miny, cz+dir[a*2+1]*rz, col2);
-		dd->vertex(cx+dir[b*2+0]*rx, miny, cz+dir[b*2+1]*rz, col2);
-		dd->vertex(cx+dir[c*2+0]*rx, miny, cz+dir[c*2+1]*rz, col2);
-	}
-	for (int i = 2; i < NUM_SEG; ++i)
-	{
-		const int a = 0, b = i, c = i-1;
-		dd->vertex(cx+dir[a*2+0]*rx, maxy, cz+dir[a*2+1]*rz, col);
-		dd->vertex(cx+dir[b*2+0]*rx, maxy, cz+dir[b*2+1]*rz, col);
-		dd->vertex(cx+dir[c*2+0]*rx, maxy, cz+dir[c*2+1]*rz, col);
-	}
-	for (int i = 0, j = NUM_SEG-1; i < NUM_SEG; j = i++)
-	{
-		dd->vertex(cx+dir[i*2+0]*rx, miny, cz+dir[i*2+1]*rz, col2);
-		dd->vertex(cx+dir[j*2+0]*rx, miny, cz+dir[j*2+1]*rz, col2);
-		dd->vertex(cx+dir[j*2+0]*rx, maxy, cz+dir[j*2+1]*rz, col);
-
-		dd->vertex(cx+dir[i*2+0]*rx, miny, cz+dir[i*2+1]*rz, col2);
-		dd->vertex(cx+dir[j*2+0]*rx, maxy, cz+dir[j*2+1]*rz, col);
-		dd->vertex(cx+dir[i*2+0]*rx, maxy, cz+dir[i*2+1]*rz, col);
-	}
-}
-
-
-inline void evalArc(const float x0, const float y0, const float z0,
-					const float dx, const float dy, const float dz,
-					const float h, const float u, float* res)
-{
-	res[0] = x0 + dx * u;
-	res[1] = y0 + dy * u + h * (1-(u*2-1)*(u*2-1));
-	res[2] = z0 + dz * u;
-}
-
-
-inline void vcross(float* dest, const float* v1, const float* v2)
-{
-	dest[0] = v1[1]*v2[2] - v1[2]*v2[1];
-	dest[1] = v1[2]*v2[0] - v1[0]*v2[2];
-	dest[2] = v1[0]*v2[1] - v1[1]*v2[0]; 
-}
-
-inline void vnormalize(float* v)
-{
-	float d = 1.0f / sqrtf(v[0]*v[0] + v[1]*v[1] + v[2]*v[2]);
-	v[0] *= d;
-	v[1] *= d;
-	v[2] *= d;
-}
-
-inline void vsub(float* dest, const float* v1, const float* v2)
-{
-	dest[0] = v1[0]-v2[0];
-	dest[1] = v1[1]-v2[1];
-	dest[2] = v1[2]-v2[2];
-}
-
-inline float vdistSqr(const float* v1, const float* v2)
-{
-	const float x = v1[0]-v2[0];
-	const float y = v1[1]-v2[1];
-	const float z = v1[2]-v2[2];
-	return x*x + y*y + z*z;
-}
-
-
-void appendArrowHead(struct duDebugDraw* dd, const float* p, const float* q,
-					 const float s, unsigned int col)
-{
-	const float eps = 0.001f;
-	if (!dd) return;
-	if (vdistSqr(p,q) < eps*eps) return;
-	float ax[3], ay[3] = {0,1,0}, az[3];
-	vsub(az, q, p);
-	vnormalize(az);
-	vcross(ax, ay, az);
-	vcross(ay, az, ax);
-	vnormalize(ay);
-
-	dd->vertex(p, col);
-//	dd->vertex(p[0]+az[0]*s+ay[0]*s/2, p[1]+az[1]*s+ay[1]*s/2, p[2]+az[2]*s+ay[2]*s/2, col);
-	dd->vertex(p[0]+az[0]*s+ax[0]*s/3, p[1]+az[1]*s+ax[1]*s/3, p[2]+az[2]*s+ax[2]*s/3, col);
-
-	dd->vertex(p, col);
-//	dd->vertex(p[0]+az[0]*s-ay[0]*s/2, p[1]+az[1]*s-ay[1]*s/2, p[2]+az[2]*s-ay[2]*s/2, col);
-	dd->vertex(p[0]+az[0]*s-ax[0]*s/3, p[1]+az[1]*s-ax[1]*s/3, p[2]+az[2]*s-ax[2]*s/3, col);
-	
-}
-
-void duAppendArc(struct duDebugDraw* dd, const float x0, const float y0, const float z0,
-				 const float x1, const float y1, const float z1, const float h,
-				 const float as0, const float as1, unsigned int col)
-{
-	if (!dd) return;
-	static const int NUM_ARC_PTS = 8;
-	static const float PAD = 0.05f;
-	static const float ARC_PTS_SCALE = (1.0f-PAD*2) / (float)NUM_ARC_PTS;
-	const float dx = x1 - x0;
-	const float dy = y1 - y0;
-	const float dz = z1 - z0;
-	const float len = sqrtf(dx*dx + dy*dy + dz*dz);
-	float prev[3];
-	evalArc(x0,y0,z0, dx,dy,dz, len*h, PAD, prev);
-	for (int i = 1; i <= NUM_ARC_PTS; ++i)
-	{
-		const float u = PAD + i * ARC_PTS_SCALE;
-		float pt[3];
-		evalArc(x0,y0,z0, dx,dy,dz, len*h, u, pt);
-		dd->vertex(prev[0],prev[1],prev[2], col);
-		dd->vertex(pt[0],pt[1],pt[2], col);
-		prev[0] = pt[0]; prev[1] = pt[1]; prev[2] = pt[2];
-	}
-	
-	// End arrows
-	if (as0 > 0.001f)
-	{
-		float p[3], q[3];
-		evalArc(x0,y0,z0, dx,dy,dz, len*h, PAD, p);
-		evalArc(x0,y0,z0, dx,dy,dz, len*h, PAD+0.05f, q);
-		appendArrowHead(dd, p, q, as0, col);
-	}
-
-	if (as1 > 0.001f)
-	{
-		float p[3], q[3];
-		evalArc(x0,y0,z0, dx,dy,dz, len*h, 1-PAD, p);
-		evalArc(x0,y0,z0, dx,dy,dz, len*h, 1-(PAD+0.05f), q);
-		appendArrowHead(dd, p, q, as1, col);
-	}
-}
-
-void duAppendArrow(struct duDebugDraw* dd, const float x0, const float y0, const float z0,
-				   const float x1, const float y1, const float z1,
-				   const float as0, const float as1, unsigned int col)
-{
-	if (!dd) return;
-
-	dd->vertex(x0,y0,z0, col);
-	dd->vertex(x1,y1,z1, col);
-	
-	// End arrows
-	const float p[3] = {x0,y0,z0}, q[3] = {x1,y1,z1};
-	if (as0 > 0.001f)
-		appendArrowHead(dd, p, q, as0, col);
-	if (as1 > 0.001f)
-		appendArrowHead(dd, q, p, as1, col);
-}
-
-void duAppendCircle(struct duDebugDraw* dd, const float x, const float y, const float z,
-					const float r, unsigned int col)
-{
-	if (!dd) return;
-	static const int NUM_SEG = 40;
-	static float dir[40*2];
-	static bool init = false;
-	if (!init)
-	{
-		init = true;
-		for (int i = 0; i < NUM_SEG; ++i)
-		{
-			const float a = (float)i/(float)NUM_SEG*DU_PI*2;
-			dir[i*2] = cosf(a);
-			dir[i*2+1] = sinf(a);
-		}
-	}
-	
-	for (int i = 0, j = NUM_SEG-1; i < NUM_SEG; j = i++)
-	{
-		dd->vertex(x+dir[j*2+0]*r, y, z+dir[j*2+1]*r, col);
-		dd->vertex(x+dir[i*2+0]*r, y, z+dir[i*2+1]*r, col);
-	}
-}
-
-void duAppendCross(struct duDebugDraw* dd, const float x, const float y, const float z,
-				   const float s, unsigned int col)
-{
-	if (!dd) return;
-	dd->vertex(x-s,y,z, col);
-	dd->vertex(x+s,y,z, col);
-	dd->vertex(x,y-s,z, col);
-	dd->vertex(x,y+s,z, col);
-	dd->vertex(x,y,z-s, col);
-	dd->vertex(x,y,z+s, col);
-}
-
-duDisplayList::duDisplayList(int cap) :
-	m_pos(0),
-	m_color(0),
-	m_size(0),
-	m_cap(0),
-	m_depthMask(true),
-	m_prim(DU_DRAW_LINES),
-	m_primSize(1.0f)
-{
-	if (cap < 8)
-		cap = 8;
-	resize(cap);
-}
-
-duDisplayList::~duDisplayList()
-{
-	delete [] m_pos;
-	delete [] m_color;
-}
-
-void duDisplayList::resize(int cap)
-{
-	float* newPos = new float[cap*3];
-	if (m_size)
-		memcpy(newPos, m_pos, sizeof(float)*3*m_size);
-	delete [] m_pos;
-	m_pos = newPos;
-
-	unsigned int* newColor = new unsigned int[cap];
-	if (m_size)
-		memcpy(newColor, m_color, sizeof(unsigned int)*m_size);
-	delete [] m_color;
-	m_color = newColor;
-	
-	m_cap = cap;
-}
-
-void duDisplayList::clear()
-{
-	m_size = 0;
-}
-
-void duDisplayList::depthMask(bool state)
-{
-	m_depthMask = state;
-}
-
-void duDisplayList::begin(duDebugDrawPrimitives prim, float size)
-{
-	clear();
-	m_prim = prim;
-	m_primSize = size;
-}
-
-void duDisplayList::vertex(const float x, const float y, const float z, unsigned int color)
-{
-	if (m_size+1 >= m_cap)
-		resize(m_cap*2);
-	float* p = &m_pos[m_size*3];
-	p[0] = x;
-	p[1] = y;
-	p[2] = z;
-	m_color[m_size] = color;
-	m_size++;
-}
-
-void duDisplayList::vertex(const float* pos, unsigned int color)
-{
-	vertex(pos[0],pos[1],pos[2],color);
-}
-
-void duDisplayList::end()
-{
-}
-
-void duDisplayList::draw(struct duDebugDraw* dd)
-{
-	if (!dd) return;
-	if (!m_size) return;
-	dd->depthMask(m_depthMask);
-	dd->begin(m_prim, m_primSize);
-	for (int i = 0; i < m_size; ++i)
-		dd->vertex(&m_pos[i*3], m_color[i]);
-	dd->end();
-}
diff --git a/extern/recastnavigation/DebugUtils/Source/DetourDebugDraw.cpp b/extern/recastnavigation/DebugUtils/Source/DetourDebugDraw.cpp
deleted file mode 100644
index 4ca0581c77..0000000000
--- a/extern/recastnavigation/DebugUtils/Source/DetourDebugDraw.cpp
+++ /dev/null
@@ -1,864 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#include "DebugDraw.h"
-#include "DetourDebugDraw.h"
-#include "DetourNavMesh.h"
-#include "DetourCommon.h"
-#include "DetourNode.h"
-
-
-static float distancePtLine2d(const float* pt, const float* p, const float* q)
-{
-	float pqx = q[0] - p[0];
-	float pqz = q[2] - p[2];
-	float dx = pt[0] - p[0];
-	float dz = pt[2] - p[2];
-	float d = pqx*pqx + pqz*pqz;
-	float t = pqx*dx + pqz*dz;
-	if (d != 0) t /= d;
-	dx = p[0] + t*pqx - pt[0];
-	dz = p[2] + t*pqz - pt[2];
-	return dx*dx + dz*dz;
-}
-
-static void drawPolyBoundaries(duDebugDraw* dd, const dtMeshTile* tile,
-							   const unsigned int col, const float linew,
-							   bool inner)
-{
-	static const float thr = 0.01f*0.01f;
-
-	dd->begin(DU_DRAW_LINES, linew);
-
-	for (int i = 0; i < tile->header->polyCount; ++i)
-	{
-		const dtPoly* p = &tile->polys[i];
-		
-		if (p->getType() == DT_POLYTYPE_OFFMESH_CONNECTION) continue;
-		
-		const dtPolyDetail* pd = &tile->detailMeshes[i];
-		
-		for (int j = 0, nj = (int)p->vertCount; j < nj; ++j)
-		{
-			unsigned int c = col;
-			if (inner)
-			{
-				if (p->neis[j] == 0) continue;
-				if (p->neis[j] & DT_EXT_LINK)
-				{
-					bool con = false;
-					for (unsigned int k = p->firstLink; k != DT_NULL_LINK; k = tile->links[k].next)
-					{
-						if (tile->links[k].edge == j)
-						{
-							con = true;
-							break;
-						}
-					}
-					if (con)
-						c = duRGBA(255,255,255,48);
-					else
-						c = duRGBA(0,0,0,48);
-				}
-				else
-					c = duRGBA(0,48,64,32);
-			}
-			else
-			{
-				if (p->neis[j] != 0) continue;
-			}
-			
-			const float* v0 = &tile->verts[p->verts[j]*3];
-			const float* v1 = &tile->verts[p->verts[(j+1) % nj]*3];
-			
-			// Draw detail mesh edges which align with the actual poly edge.
-			// This is really slow.
-			for (int k = 0; k < pd->triCount; ++k)
-			{
-				const unsigned char* t = &tile->detailTris[(pd->triBase+k)*4];
-				const float* tv[3];
-				for (int m = 0; m < 3; ++m)
-				{
-					if (t[m] < p->vertCount)
-						tv[m] = &tile->verts[p->verts[t[m]]*3];
-					else
-						tv[m] = &tile->detailVerts[(pd->vertBase+(t[m]-p->vertCount))*3];
-				}
-				for (int m = 0, n = 2; m < 3; n=m++)
-				{
-					if ((dtGetDetailTriEdgeFlags(t[3], n) & DT_DETAIL_EDGE_BOUNDARY) == 0)
-						continue;
-
-					if (distancePtLine2d(tv[n],v0,v1) < thr &&
-						distancePtLine2d(tv[m],v0,v1) < thr)
-					{
-						dd->vertex(tv[n], c);
-						dd->vertex(tv[m], c);
-					}
-				}
-			}
-		}
-	}
-	dd->end();
-}
-
-static void drawMeshTile(duDebugDraw* dd, const dtNavMesh& mesh, const dtNavMeshQuery* query,
-						 const dtMeshTile* tile, unsigned char flags)
-{
-	dtPolyRef base = mesh.getPolyRefBase(tile);
-
-	int tileNum = mesh.decodePolyIdTile(base);
-	const unsigned int tileColor = duIntToCol(tileNum, 128);
-	
-	dd->depthMask(false);
-
-	dd->begin(DU_DRAW_TRIS);
-	for (int i = 0; i < tile->header->polyCount; ++i)
-	{
-		const dtPoly* p = &tile->polys[i];
-		if (p->getType() == DT_POLYTYPE_OFFMESH_CONNECTION)	// Skip off-mesh links.
-			continue;
-			
-		const dtPolyDetail* pd = &tile->detailMeshes[i];
-
-		unsigned int col;
-		if (query && query->isInClosedList(base | (dtPolyRef)i))
-			col = duRGBA(255,196,0,64);
-		else
-		{
-			if (flags & DU_DRAWNAVMESH_COLOR_TILES)
-				col = tileColor;
-			else
-				col = duTransCol(dd->areaToCol(p->getArea()), 64);
-		}
-		
-		for (int j = 0; j < pd->triCount; ++j)
-		{
-			const unsigned char* t = &tile->detailTris[(pd->triBase+j)*4];
-			for (int k = 0; k < 3; ++k)
-			{
-				if (t[k] < p->vertCount)
-					dd->vertex(&tile->verts[p->verts[t[k]]*3], col);
-				else
-					dd->vertex(&tile->detailVerts[(pd->vertBase+t[k]-p->vertCount)*3], col);
-			}
-		}
-	}
-	dd->end();
-	
-	// Draw inter poly boundaries
-	drawPolyBoundaries(dd, tile, duRGBA(0,48,64,32), 1.5f, true);
-	
-	// Draw outer poly boundaries
-	drawPolyBoundaries(dd, tile, duRGBA(0,48,64,220), 2.5f, false);
-
-	if (flags & DU_DRAWNAVMESH_OFFMESHCONS)
-	{
-		dd->begin(DU_DRAW_LINES, 2.0f);
-		for (int i = 0; i < tile->header->polyCount; ++i)
-		{
-			const dtPoly* p = &tile->polys[i];
-			if (p->getType() != DT_POLYTYPE_OFFMESH_CONNECTION)	// Skip regular polys.
-				continue;
-			
-			unsigned int col, col2;
-			if (query && query->isInClosedList(base | (dtPolyRef)i))
-				col = duRGBA(255,196,0,220);
-			else
-				col = duDarkenCol(duTransCol(dd->areaToCol(p->getArea()), 220));
-
-			const dtOffMeshConnection* con = &tile->offMeshCons[i - tile->header->offMeshBase];
-			const float* va = &tile->verts[p->verts[0]*3];
-			const float* vb = &tile->verts[p->verts[1]*3];
-
-			// Check to see if start and end end-points have links.
-			bool startSet = false;
-			bool endSet = false;
-			for (unsigned int k = p->firstLink; k != DT_NULL_LINK; k = tile->links[k].next)
-			{
-				if (tile->links[k].edge == 0)
-					startSet = true;
-				if (tile->links[k].edge == 1)
-					endSet = true;
-			}
-			
-			// End points and their on-mesh locations.
-			dd->vertex(va[0],va[1],va[2], col);
-			dd->vertex(con->pos[0],con->pos[1],con->pos[2], col);
-			col2 = startSet ? col : duRGBA(220,32,16,196);
-			duAppendCircle(dd, con->pos[0],con->pos[1]+0.1f,con->pos[2], con->rad, col2);
-
-			dd->vertex(vb[0],vb[1],vb[2], col);
-			dd->vertex(con->pos[3],con->pos[4],con->pos[5], col);
-			col2 = endSet ? col : duRGBA(220,32,16,196);
-			duAppendCircle(dd, con->pos[3],con->pos[4]+0.1f,con->pos[5], con->rad, col2);
-			
-			// End point vertices.
-			dd->vertex(con->pos[0],con->pos[1],con->pos[2], duRGBA(0,48,64,196));
-			dd->vertex(con->pos[0],con->pos[1]+0.2f,con->pos[2], duRGBA(0,48,64,196));
-			
-			dd->vertex(con->pos[3],con->pos[4],con->pos[5], duRGBA(0,48,64,196));
-			dd->vertex(con->pos[3],con->pos[4]+0.2f,con->pos[5], duRGBA(0,48,64,196));
-			
-			// Connection arc.
-			duAppendArc(dd, con->pos[0],con->pos[1],con->pos[2], con->pos[3],con->pos[4],con->pos[5], 0.25f,
-						(con->flags & 1) ? 0.6f : 0, 0.6f, col);
-		}
-		dd->end();
-	}
-	
-	const unsigned int vcol = duRGBA(0,0,0,196);
-	dd->begin(DU_DRAW_POINTS, 3.0f);
-	for (int i = 0; i < tile->header->vertCount; ++i)
-	{
-		const float* v = &tile->verts[i*3];
-		dd->vertex(v[0], v[1], v[2], vcol);
-	}
-	dd->end();
-
-	dd->depthMask(true);
-}
-
-void duDebugDrawNavMesh(duDebugDraw* dd, const dtNavMesh& mesh, unsigned char flags)
-{
-	if (!dd) return;
-	
-	for (int i = 0; i < mesh.getMaxTiles(); ++i)
-	{
-		const dtMeshTile* tile = mesh.getTile(i);
-		if (!tile->header) continue;
-		drawMeshTile(dd, mesh, 0, tile, flags);
-	}
-}
-
-void duDebugDrawNavMeshWithClosedList(struct duDebugDraw* dd, const dtNavMesh& mesh, const dtNavMeshQuery& query, unsigned char flags)
-{
-	if (!dd) return;
-
-	const dtNavMeshQuery* q = (flags & DU_DRAWNAVMESH_CLOSEDLIST) ? &query : 0;
-	
-	for (int i = 0; i < mesh.getMaxTiles(); ++i)
-	{
-		const dtMeshTile* tile = mesh.getTile(i);
-		if (!tile->header) continue;
-		drawMeshTile(dd, mesh, q, tile, flags);
-	}
-}
-
-void duDebugDrawNavMeshNodes(struct duDebugDraw* dd, const dtNavMeshQuery& query)
-{
-	if (!dd) return;
-	
-	const dtNodePool* pool = query.getNodePool();
-	if (pool)
-	{
-		const float off = 0.5f;
-		dd->begin(DU_DRAW_POINTS, 4.0f);
-		for (int i = 0; i < pool->getHashSize(); ++i)
-		{
-			for (dtNodeIndex j = pool->getFirst(i); j != DT_NULL_IDX; j = pool->getNext(j))
-			{
-				const dtNode* node = pool->getNodeAtIdx(j+1);
-				if (!node) continue;
-				dd->vertex(node->pos[0],node->pos[1]+off,node->pos[2], duRGBA(255,192,0,255));
-			}
-		}
-		dd->end();
-		
-		dd->begin(DU_DRAW_LINES, 2.0f);
-		for (int i = 0; i < pool->getHashSize(); ++i)
-		{
-			for (dtNodeIndex j = pool->getFirst(i); j != DT_NULL_IDX; j = pool->getNext(j))
-			{
-				const dtNode* node = pool->getNodeAtIdx(j+1);
-				if (!node) continue;
-				if (!node->pidx) continue;
-				const dtNode* parent = pool->getNodeAtIdx(node->pidx);
-				if (!parent) continue;
-				dd->vertex(node->pos[0],node->pos[1]+off,node->pos[2], duRGBA(255,192,0,128));
-				dd->vertex(parent->pos[0],parent->pos[1]+off,parent->pos[2], duRGBA(255,192,0,128));
-			}
-		}
-		dd->end();
-	}
-}
-
-
-static void drawMeshTileBVTree(duDebugDraw* dd, const dtMeshTile* tile)
-{
-	// Draw BV nodes.
-	const float cs = 1.0f / tile->header->bvQuantFactor;
-	dd->begin(DU_DRAW_LINES, 1.0f);
-	for (int i = 0; i < tile->header->bvNodeCount; ++i)
-	{
-		const dtBVNode* n = &tile->bvTree[i];
-		if (n->i < 0) // Leaf indices are positive.
-			continue;
-		duAppendBoxWire(dd, tile->header->bmin[0] + n->bmin[0]*cs,
-						tile->header->bmin[1] + n->bmin[1]*cs,
-						tile->header->bmin[2] + n->bmin[2]*cs,
-						tile->header->bmin[0] + n->bmax[0]*cs,
-						tile->header->bmin[1] + n->bmax[1]*cs,
-						tile->header->bmin[2] + n->bmax[2]*cs,
-						duRGBA(255,255,255,128));
-	}
-	dd->end();
-}
-
-void duDebugDrawNavMeshBVTree(duDebugDraw* dd, const dtNavMesh& mesh)
-{
-	if (!dd) return;
-	
-	for (int i = 0; i < mesh.getMaxTiles(); ++i)
-	{
-		const dtMeshTile* tile = mesh.getTile(i);
-		if (!tile->header) continue;
-		drawMeshTileBVTree(dd, tile);
-	}
-}
-
-static void drawMeshTilePortal(duDebugDraw* dd, const dtMeshTile* tile)
-{
-	// Draw portals
-	const float padx = 0.04f;
-	const float pady = tile->header->walkableClimb;
-
-	dd->begin(DU_DRAW_LINES, 2.0f);
-
-	for (int side = 0; side < 8; ++side)
-	{
-		unsigned short m = DT_EXT_LINK | (unsigned short)side;
-		
-		for (int i = 0; i < tile->header->polyCount; ++i)
-		{
-			dtPoly* poly = &tile->polys[i];
-			
-			// Create new links.
-			const int nv = poly->vertCount;
-			for (int j = 0; j < nv; ++j)
-			{
-				// Skip edges which do not point to the right side.
-				if (poly->neis[j] != m)
-					continue;
-				
-				// Create new links
-				const float* va = &tile->verts[poly->verts[j]*3];
-				const float* vb = &tile->verts[poly->verts[(j+1) % nv]*3];
-				
-				if (side == 0 || side == 4)
-				{
-					unsigned int col = side == 0 ? duRGBA(128,0,0,128) : duRGBA(128,0,128,128);
-
-					const float x = va[0] + ((side == 0) ? -padx : padx);
-					
-					dd->vertex(x,va[1]-pady,va[2], col);
-					dd->vertex(x,va[1]+pady,va[2], col);
-
-					dd->vertex(x,va[1]+pady,va[2], col);
-					dd->vertex(x,vb[1]+pady,vb[2], col);
-
-					dd->vertex(x,vb[1]+pady,vb[2], col);
-					dd->vertex(x,vb[1]-pady,vb[2], col);
-
-					dd->vertex(x,vb[1]-pady,vb[2], col);
-					dd->vertex(x,va[1]-pady,va[2], col);
-				}
-				else if (side == 2 || side == 6)
-				{
-					unsigned int col = side == 2 ? duRGBA(0,128,0,128) : duRGBA(0,128,128,128);
-
-					const float z = va[2] + ((side == 2) ? -padx : padx);
-					
-					dd->vertex(va[0],va[1]-pady,z, col);
-					dd->vertex(va[0],va[1]+pady,z, col);
-					
-					dd->vertex(va[0],va[1]+pady,z, col);
-					dd->vertex(vb[0],vb[1]+pady,z, col);
-					
-					dd->vertex(vb[0],vb[1]+pady,z, col);
-					dd->vertex(vb[0],vb[1]-pady,z, col);
-					
-					dd->vertex(vb[0],vb[1]-pady,z, col);
-					dd->vertex(va[0],va[1]-pady,z, col);
-				}
-
-			}
-		}
-	}
-	
-	dd->end();
-}
-
-void duDebugDrawNavMeshPortals(duDebugDraw* dd, const dtNavMesh& mesh)
-{
-	if (!dd) return;
-	
-	for (int i = 0; i < mesh.getMaxTiles(); ++i)
-	{
-		const dtMeshTile* tile = mesh.getTile(i);
-		if (!tile->header) continue;
-		drawMeshTilePortal(dd, tile);
-	}
-}
-
-void duDebugDrawNavMeshPolysWithFlags(struct duDebugDraw* dd, const dtNavMesh& mesh,
-									  const unsigned short polyFlags, const unsigned int col)
-{
-	if (!dd) return;
-	
-	for (int i = 0; i < mesh.getMaxTiles(); ++i)
-	{
-		const dtMeshTile* tile = mesh.getTile(i);
-		if (!tile->header) continue;
-		dtPolyRef base = mesh.getPolyRefBase(tile);
-
-		for (int j = 0; j < tile->header->polyCount; ++j)
-		{
-			const dtPoly* p = &tile->polys[j];
-			if ((p->flags & polyFlags) == 0) continue;
-			duDebugDrawNavMeshPoly(dd, mesh, base|(dtPolyRef)j, col);
-		}
-	}
-}
-
-void duDebugDrawNavMeshPoly(duDebugDraw* dd, const dtNavMesh& mesh, dtPolyRef ref, const unsigned int col)
-{
-	if (!dd) return;
-	
-	const dtMeshTile* tile = 0;
-	const dtPoly* poly = 0;
-	if (dtStatusFailed(mesh.getTileAndPolyByRef(ref, &tile, &poly)))
-		return;
-	
-	dd->depthMask(false);
-	
-	const unsigned int c = duTransCol(col, 64);
-	const unsigned int ip = (unsigned int)(poly - tile->polys);
-
-	if (poly->getType() == DT_POLYTYPE_OFFMESH_CONNECTION)
-	{
-		dtOffMeshConnection* con = &tile->offMeshCons[ip - tile->header->offMeshBase];
-
-		dd->begin(DU_DRAW_LINES, 2.0f);
-
-		// Connection arc.
-		duAppendArc(dd, con->pos[0],con->pos[1],con->pos[2], con->pos[3],con->pos[4],con->pos[5], 0.25f,
-					(con->flags & 1) ? 0.6f : 0.0f, 0.6f, c);
-		
-		dd->end();
-	}
-	else
-	{
-		const dtPolyDetail* pd = &tile->detailMeshes[ip];
-
-		dd->begin(DU_DRAW_TRIS);
-		for (int i = 0; i < pd->triCount; ++i)
-		{
-			const unsigned char* t = &tile->detailTris[(pd->triBase+i)*4];
-			for (int j = 0; j < 3; ++j)
-			{
-				if (t[j] < poly->vertCount)
-					dd->vertex(&tile->verts[poly->verts[t[j]]*3], c);
-				else
-					dd->vertex(&tile->detailVerts[(pd->vertBase+t[j]-poly->vertCount)*3], c);
-			}
-		}
-		dd->end();
-	}
-	
-	dd->depthMask(true);
-
-}
-
-static void debugDrawTileCachePortals(struct duDebugDraw* dd, const dtTileCacheLayer& layer, const float cs, const float ch)
-{
-	const int w = (int)layer.header->width;
-	const int h = (int)layer.header->height;
-	const float* bmin = layer.header->bmin;
-
-	// Portals
-	unsigned int pcol = duRGBA(255,255,255,255);
-	
-	const int segs[4*4] = {0,0,0,1, 0,1,1,1, 1,1,1,0, 1,0,0,0};
-	
-	// Layer portals
-	dd->begin(DU_DRAW_LINES, 2.0f);
-	for (int y = 0; y < h; ++y)
-	{
-		for (int x = 0; x < w; ++x)
-		{
-			const int idx = x+y*w;
-			const int lh = (int)layer.heights[idx];
-			if (lh == 0xff) continue;
-			
-			for (int dir = 0; dir < 4; ++dir)
-			{
-				if (layer.cons[idx] & (1<<(dir+4)))
-				{
-					const int* seg = &segs[dir*4];
-					const float ax = bmin[0] + (x+seg[0])*cs;
-					const float ay = bmin[1] + (lh+2)*ch;
-					const float az = bmin[2] + (y+seg[1])*cs;
-					const float bx = bmin[0] + (x+seg[2])*cs;
-					const float by = bmin[1] + (lh+2)*ch;
-					const float bz = bmin[2] + (y+seg[3])*cs;
-					dd->vertex(ax, ay, az, pcol);
-					dd->vertex(bx, by, bz, pcol);
-				}
-			}
-		}
-	}
-	dd->end();
-}
-
-void duDebugDrawTileCacheLayerAreas(struct duDebugDraw* dd, const dtTileCacheLayer& layer, const float cs, const float ch)
-{
-	const int w = (int)layer.header->width;
-	const int h = (int)layer.header->height;
-	const float* bmin = layer.header->bmin;
-	const float* bmax = layer.header->bmax;
-	const int idx = layer.header->tlayer;
-	
-	unsigned int color = duIntToCol(idx+1, 255);
-	
-	// Layer bounds
-	float lbmin[3], lbmax[3];
-	lbmin[0] = bmin[0] + layer.header->minx*cs;
-	lbmin[1] = bmin[1];
-	lbmin[2] = bmin[2] + layer.header->miny*cs;
-	lbmax[0] = bmin[0] + (layer.header->maxx+1)*cs;
-	lbmax[1] = bmax[1];
-	lbmax[2] = bmin[2] + (layer.header->maxy+1)*cs;
-	duDebugDrawBoxWire(dd, lbmin[0],lbmin[1],lbmin[2], lbmax[0],lbmax[1],lbmax[2], duTransCol(color,128), 2.0f);
-	
-	// Layer height
-	dd->begin(DU_DRAW_QUADS);
-	for (int y = 0; y < h; ++y)
-	{
-		for (int x = 0; x < w; ++x)
-		{
-			const int lidx = x+y*w;
-			const int lh = (int)layer.heights[lidx];
-			if (lh == 0xff) continue;
-
-			const unsigned char area = layer.areas[lidx];
-			unsigned int col;
-			if (area == 63)
-				col = duLerpCol(color, duRGBA(0,192,255,64), 32);
-			else if (area == 0)
-				col = duLerpCol(color, duRGBA(0,0,0,64), 32);
-			else
-				col = duLerpCol(color, dd->areaToCol(area), 32);
-			
-			const float fx = bmin[0] + x*cs;
-			const float fy = bmin[1] + (lh+1)*ch;
-			const float fz = bmin[2] + y*cs;
-			
-			dd->vertex(fx, fy, fz, col);
-			dd->vertex(fx, fy, fz+cs, col);
-			dd->vertex(fx+cs, fy, fz+cs, col);
-			dd->vertex(fx+cs, fy, fz, col);
-		}
-	}
-	dd->end();
-	
-	debugDrawTileCachePortals(dd, layer, cs, ch);
-}
-
-void duDebugDrawTileCacheLayerRegions(struct duDebugDraw* dd, const dtTileCacheLayer& layer, const float cs, const float ch)
-{
-	const int w = (int)layer.header->width;
-	const int h = (int)layer.header->height;
-	const float* bmin = layer.header->bmin;
-	const float* bmax = layer.header->bmax;
-	const int idx = layer.header->tlayer;
-	
-	unsigned int color = duIntToCol(idx+1, 255);
-	
-	// Layer bounds
-	float lbmin[3], lbmax[3];
-	lbmin[0] = bmin[0] + layer.header->minx*cs;
-	lbmin[1] = bmin[1];
-	lbmin[2] = bmin[2] + layer.header->miny*cs;
-	lbmax[0] = bmin[0] + (layer.header->maxx+1)*cs;
-	lbmax[1] = bmax[1];
-	lbmax[2] = bmin[2] + (layer.header->maxy+1)*cs;
-	duDebugDrawBoxWire(dd, lbmin[0],lbmin[1],lbmin[2], lbmax[0],lbmax[1],lbmax[2], duTransCol(color,128), 2.0f);
-	
-	// Layer height
-	dd->begin(DU_DRAW_QUADS);
-	for (int y = 0; y < h; ++y)
-	{
-		for (int x = 0; x < w; ++x)
-		{
-			const int lidx = x+y*w;
-			const int lh = (int)layer.heights[lidx];
-			if (lh == 0xff) continue;
-			const unsigned char reg = layer.regs[lidx];
-			
-			unsigned int col = duLerpCol(color, duIntToCol(reg, 255), 192);
-			
-			const float fx = bmin[0] + x*cs;
-			const float fy = bmin[1] + (lh+1)*ch;
-			const float fz = bmin[2] + y*cs;
-			
-			dd->vertex(fx, fy, fz, col);
-			dd->vertex(fx, fy, fz+cs, col);
-			dd->vertex(fx+cs, fy, fz+cs, col);
-			dd->vertex(fx+cs, fy, fz, col);
-		}
-	}
-	dd->end();
-	
-	debugDrawTileCachePortals(dd, layer, cs, ch);
-}
-
-
-
-
-/*struct dtTileCacheContour
-{
-	int nverts;
-	unsigned char* verts;
-	unsigned char reg;
-	unsigned char area;
-};
-
-struct dtTileCacheContourSet
-{
-	int nconts;
-	dtTileCacheContour* conts;
-};*/
-
-void duDebugDrawTileCacheContours(duDebugDraw* dd, const struct dtTileCacheContourSet& lcset,
-								  const float* orig, const float cs, const float ch)
-{
-	if (!dd) return;
-	
-	const unsigned char a = 255;// (unsigned char)(alpha*255.0f);
-	
-	const int offs[2*4] = {-1,0, 0,1, 1,0, 0,-1};
-	
-	dd->begin(DU_DRAW_LINES, 2.0f);
-	
-	for (int i = 0; i < lcset.nconts; ++i)
-	{
-		const dtTileCacheContour& c = lcset.conts[i];
-		unsigned int color = 0;
-		
-		color = duIntToCol(i, a);
-		
-		for (int j = 0; j < c.nverts; ++j)
-		{
-			const int k = (j+1) % c.nverts;
-			const unsigned char* va = &c.verts[j*4];
-			const unsigned char* vb = &c.verts[k*4];
-			const float ax = orig[0] + va[0]*cs;
-			const float ay = orig[1] + (va[1]+1+(i&1))*ch;
-			const float az = orig[2] + va[2]*cs;
-			const float bx = orig[0] + vb[0]*cs;
-			const float by = orig[1] + (vb[1]+1+(i&1))*ch;
-			const float bz = orig[2] + vb[2]*cs;
-			unsigned int col = color;
-			if ((va[3] & 0xf) != 0xf)
-			{
-				// Portal segment
-				col = duRGBA(255,255,255,128);
-				int d = va[3] & 0xf;
-				
-				const float cx = (ax+bx)*0.5f;
-				const float cy = (ay+by)*0.5f;
-				const float cz = (az+bz)*0.5f;
-				
-				const float dx = cx + offs[d*2+0]*2*cs;
-				const float dy = cy;
-				const float dz = cz + offs[d*2+1]*2*cs;
-				
-				dd->vertex(cx,cy,cz,duRGBA(255,0,0,255));
-				dd->vertex(dx,dy,dz,duRGBA(255,0,0,255));
-			}
-			
-			duAppendArrow(dd, ax,ay,az, bx,by,bz, 0.0f, cs*0.5f, col);
-		}
-	}
-	dd->end();
-	
-	dd->begin(DU_DRAW_POINTS, 4.0f);	
-	
-	for (int i = 0; i < lcset.nconts; ++i)
-	{
-		const dtTileCacheContour& c = lcset.conts[i];
-		unsigned int color = 0;
-		
-		for (int j = 0; j < c.nverts; ++j)
-		{
-			const unsigned char* va = &c.verts[j*4];
-			
-			color = duDarkenCol(duIntToCol(i, a));
-			if (va[3] & 0x80)
-			{
-				// Border vertex
-				color = duRGBA(255,0,0,255);
-			}
-			
-			float fx = orig[0] + va[0]*cs;
-			float fy = orig[1] + (va[1]+1+(i&1))*ch;
-			float fz = orig[2] + va[2]*cs;
-			dd->vertex(fx,fy,fz, color);
-		}
-	}
-	dd->end();
-}
-
-void duDebugDrawTileCachePolyMesh(duDebugDraw* dd, const struct dtTileCachePolyMesh& lmesh,
-								  const float* orig, const float cs, const float ch)
-{
-	if (!dd) return;
-	
-	const int nvp = lmesh.nvp;
-	
-	const int offs[2*4] = {-1,0, 0,1, 1,0, 0,-1};
-	
-	dd->begin(DU_DRAW_TRIS);
-	
-	for (int i = 0; i < lmesh.npolys; ++i)
-	{
-		const unsigned short* p = &lmesh.polys[i*nvp*2];
-		const unsigned char area = lmesh.areas[i];
-		
-		unsigned int color;
-		if (area == DT_TILECACHE_WALKABLE_AREA)
-			color = duRGBA(0,192,255,64);
-		else if (area == DT_TILECACHE_NULL_AREA)
-			color = duRGBA(0,0,0,64);
-		else
-			color = dd->areaToCol(area);
-		
-		unsigned short vi[3];
-		for (int j = 2; j < nvp; ++j)
-		{
-			if (p[j] == DT_TILECACHE_NULL_IDX) break;
-			vi[0] = p[0];
-			vi[1] = p[j-1];
-			vi[2] = p[j];
-			for (int k = 0; k < 3; ++k)
-			{
-				const unsigned short* v = &lmesh.verts[vi[k]*3];
-				const float x = orig[0] + v[0]*cs;
-				const float y = orig[1] + (v[1]+1)*ch;
-				const float z = orig[2] + v[2]*cs;
-				dd->vertex(x,y,z, color);
-			}
-		}
-	}
-	dd->end();
-	
-	// Draw neighbours edges
-	const unsigned int coln = duRGBA(0,48,64,32);
-	dd->begin(DU_DRAW_LINES, 1.5f);
-	for (int i = 0; i < lmesh.npolys; ++i)
-	{
-		const unsigned short* p = &lmesh.polys[i*nvp*2];
-		for (int j = 0; j < nvp; ++j)
-		{
-			if (p[j] == DT_TILECACHE_NULL_IDX) break;
-			if (p[nvp+j] & 0x8000) continue;
-			const int nj = (j+1 >= nvp || p[j+1] == DT_TILECACHE_NULL_IDX) ? 0 : j+1; 
-			int vi[2] = {p[j], p[nj]};
-			
-			for (int k = 0; k < 2; ++k)
-			{
-				const unsigned short* v = &lmesh.verts[vi[k]*3];
-				const float x = orig[0] + v[0]*cs;
-				const float y = orig[1] + (v[1]+1)*ch + 0.1f;
-				const float z = orig[2] + v[2]*cs;
-				dd->vertex(x, y, z, coln);
-			}
-		}
-	}
-	dd->end();
-	
-	// Draw boundary edges
-	const unsigned int colb = duRGBA(0,48,64,220);
-	dd->begin(DU_DRAW_LINES, 2.5f);
-	for (int i = 0; i < lmesh.npolys; ++i)
-	{
-		const unsigned short* p = &lmesh.polys[i*nvp*2];
-		for (int j = 0; j < nvp; ++j)
-		{
-			if (p[j] == DT_TILECACHE_NULL_IDX) break;
-			if ((p[nvp+j] & 0x8000) == 0) continue;
-			const int nj = (j+1 >= nvp || p[j+1] == DT_TILECACHE_NULL_IDX) ? 0 : j+1; 
-			int vi[2] = {p[j], p[nj]};
-			
-			unsigned int col = colb;
-			if ((p[nvp+j] & 0xf) != 0xf)
-			{
-				const unsigned short* va = &lmesh.verts[vi[0]*3];
-				const unsigned short* vb = &lmesh.verts[vi[1]*3];
-				
-				const float ax = orig[0] + va[0]*cs;
-				const float ay = orig[1] + (va[1]+1+(i&1))*ch;
-				const float az = orig[2] + va[2]*cs;
-				const float bx = orig[0] + vb[0]*cs;
-				const float by = orig[1] + (vb[1]+1+(i&1))*ch;
-				const float bz = orig[2] + vb[2]*cs;
-				
-				const float cx = (ax+bx)*0.5f;
-				const float cy = (ay+by)*0.5f;
-				const float cz = (az+bz)*0.5f;
-				
-				int d = p[nvp+j] & 0xf;
-				
-				const float dx = cx + offs[d*2+0]*2*cs;
-				const float dy = cy;
-				const float dz = cz + offs[d*2+1]*2*cs;
-				
-				dd->vertex(cx,cy,cz,duRGBA(255,0,0,255));
-				dd->vertex(dx,dy,dz,duRGBA(255,0,0,255));
-				
-				col = duRGBA(255,255,255,128);
-			}
-			
-			for (int k = 0; k < 2; ++k)
-			{
-				const unsigned short* v = &lmesh.verts[vi[k]*3];
-				const float x = orig[0] + v[0]*cs;
-				const float y = orig[1] + (v[1]+1)*ch + 0.1f;
-				const float z = orig[2] + v[2]*cs;
-				dd->vertex(x, y, z, col);
-			}
-		}
-	}
-	dd->end();
-	
-	dd->begin(DU_DRAW_POINTS, 3.0f);
-	const unsigned int colv = duRGBA(0,0,0,220);
-	for (int i = 0; i < lmesh.nverts; ++i)
-	{
-		const unsigned short* v = &lmesh.verts[i*3];
-		const float x = orig[0] + v[0]*cs;
-		const float y = orig[1] + (v[1]+1)*ch + 0.1f;
-		const float z = orig[2] + v[2]*cs;
-		dd->vertex(x,y,z, colv);
-	}
-	dd->end();
-}
-
-
-
diff --git a/extern/recastnavigation/DebugUtils/Source/RecastDebugDraw.cpp b/extern/recastnavigation/DebugUtils/Source/RecastDebugDraw.cpp
deleted file mode 100644
index c1a73a168e..0000000000
--- a/extern/recastnavigation/DebugUtils/Source/RecastDebugDraw.cpp
+++ /dev/null
@@ -1,1064 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include "DebugDraw.h"
-#include "RecastDebugDraw.h"
-#include "Recast.h"
-
-void duDebugDrawTriMesh(duDebugDraw* dd, const float* verts, int /*nverts*/,
-						const int* tris, const float* normals, int ntris,
-						const unsigned char* flags, const float texScale)
-{
-	if (!dd) return;
-	if (!verts) return;
-	if (!tris) return;
-	if (!normals) return;
-
-	float uva[2];
-	float uvb[2];
-	float uvc[2];
-
-	const unsigned int unwalkable = duRGBA(192,128,0,255);
-
-	dd->texture(true);
-
-	dd->begin(DU_DRAW_TRIS);
-	for (int i = 0; i < ntris*3; i += 3)
-	{
-		const float* norm = &normals[i];
-		unsigned int color;
-		unsigned char a = (unsigned char)(220*(2+norm[0]+norm[1])/4);
-		if (flags && !flags[i/3])
-			color = duLerpCol(duRGBA(a,a,a,255), unwalkable, 64);
-		else
-			color = duRGBA(a,a,a,255);
-
-		const float* va = &verts[tris[i+0]*3];
-		const float* vb = &verts[tris[i+1]*3];
-		const float* vc = &verts[tris[i+2]*3];
-		
-		int ax = 0, ay = 0;
-		if (rcAbs(norm[1]) > rcAbs(norm[ax]))
-			ax = 1;
-		if (rcAbs(norm[2]) > rcAbs(norm[ax]))
-			ax = 2;
-		ax = (1<<ax)&3; // +1 mod 3
-		ay = (1<<ax)&3; // +1 mod 3
-
-		uva[0] = va[ax]*texScale;
-		uva[1] = va[ay]*texScale;
-		uvb[0] = vb[ax]*texScale;
-		uvb[1] = vb[ay]*texScale;
-		uvc[0] = vc[ax]*texScale;
-		uvc[1] = vc[ay]*texScale;
-		
-		dd->vertex(va, color, uva);
-		dd->vertex(vb, color, uvb);
-		dd->vertex(vc, color, uvc);
-	}
-	dd->end();
-	dd->texture(false);
-}
-
-void duDebugDrawTriMeshSlope(duDebugDraw* dd, const float* verts, int /*nverts*/,
-							 const int* tris, const float* normals, int ntris,
-							 const float walkableSlopeAngle, const float texScale)
-{
-	if (!dd) return;
-	if (!verts) return;
-	if (!tris) return;
-	if (!normals) return;
-	
-	const float walkableThr = cosf(walkableSlopeAngle/180.0f*DU_PI);
-	
-	float uva[2];
-	float uvb[2];
-	float uvc[2];
-	
-	dd->texture(true);
-
-	const unsigned int unwalkable = duRGBA(192,128,0,255);
-	
-	dd->begin(DU_DRAW_TRIS);
-	for (int i = 0; i < ntris*3; i += 3)
-	{
-		const float* norm = &normals[i];
-		unsigned int color;
-		unsigned char a = (unsigned char)(220*(2+norm[0]+norm[1])/4);
-		if (norm[1] < walkableThr)
-			color = duLerpCol(duRGBA(a,a,a,255), unwalkable, 64);
-		else
-			color = duRGBA(a,a,a,255);
-		
-		const float* va = &verts[tris[i+0]*3];
-		const float* vb = &verts[tris[i+1]*3];
-		const float* vc = &verts[tris[i+2]*3];
-		
-		int ax = 0, ay = 0;
-		if (rcAbs(norm[1]) > rcAbs(norm[ax]))
-			ax = 1;
-		if (rcAbs(norm[2]) > rcAbs(norm[ax]))
-			ax = 2;
-		ax = (1<<ax)&3; // +1 mod 3
-		ay = (1<<ax)&3; // +1 mod 3
-		
-		uva[0] = va[ax]*texScale;
-		uva[1] = va[ay]*texScale;
-		uvb[0] = vb[ax]*texScale;
-		uvb[1] = vb[ay]*texScale;
-		uvc[0] = vc[ax]*texScale;
-		uvc[1] = vc[ay]*texScale;
-		
-		dd->vertex(va, color, uva);
-		dd->vertex(vb, color, uvb);
-		dd->vertex(vc, color, uvc);
-	}
-	dd->end();
-
-	dd->texture(false);
-}
-
-void duDebugDrawHeightfieldSolid(duDebugDraw* dd, const rcHeightfield& hf)
-{
-	if (!dd) return;
-
-	const float* orig = hf.bmin;
-	const float cs = hf.cs;
-	const float ch = hf.ch;
-	
-	const int w = hf.width;
-	const int h = hf.height;
-		
-	unsigned int fcol[6];
-	duCalcBoxColors(fcol, duRGBA(255,255,255,255), duRGBA(255,255,255,255));
-	
-	dd->begin(DU_DRAW_QUADS);
-	
-	for (int y = 0; y < h; ++y)
-	{
-		for (int x = 0; x < w; ++x)
-		{
-			float fx = orig[0] + x*cs;
-			float fz = orig[2] + y*cs;
-			const rcSpan* s = hf.spans[x + y*w];
-			while (s)
-			{
-				duAppendBox(dd, fx, orig[1]+s->smin*ch, fz, fx+cs, orig[1] + s->smax*ch, fz+cs, fcol);
-				s = s->next;
-			}
-		}
-	}
-	dd->end();
-}
-
-void duDebugDrawHeightfieldWalkable(duDebugDraw* dd, const rcHeightfield& hf)
-{
-	if (!dd) return;
-
-	const float* orig = hf.bmin;
-	const float cs = hf.cs;
-	const float ch = hf.ch;
-	
-	const int w = hf.width;
-	const int h = hf.height;
-	
-	unsigned int fcol[6];
-	duCalcBoxColors(fcol, duRGBA(255,255,255,255), duRGBA(217,217,217,255));
-
-	dd->begin(DU_DRAW_QUADS);
-	
-	for (int y = 0; y < h; ++y)
-	{
-		for (int x = 0; x < w; ++x)
-		{
-			float fx = orig[0] + x*cs;
-			float fz = orig[2] + y*cs;
-			const rcSpan* s = hf.spans[x + y*w];
-			while (s)
-			{
-				if (s->area == RC_WALKABLE_AREA)
-					fcol[0] = duRGBA(64,128,160,255);
-				else if (s->area == RC_NULL_AREA)
-					fcol[0] = duRGBA(64,64,64,255);
-				else
-					fcol[0] = duMultCol(dd->areaToCol(s->area), 200);
-				
-				duAppendBox(dd, fx, orig[1]+s->smin*ch, fz, fx+cs, orig[1] + s->smax*ch, fz+cs, fcol);
-				s = s->next;
-			}
-		}
-	}
-	
-	dd->end();
-}
-
-void duDebugDrawCompactHeightfieldSolid(duDebugDraw* dd, const rcCompactHeightfield& chf)
-{
-	if (!dd) return;
-
-	const float cs = chf.cs;
-	const float ch = chf.ch;
-
-	dd->begin(DU_DRAW_QUADS);
-	
-	for (int y = 0; y < chf.height; ++y)
-	{
-		for (int x = 0; x < chf.width; ++x)
-		{
-			const float fx = chf.bmin[0] + x*cs;
-			const float fz = chf.bmin[2] + y*cs;
-			const rcCompactCell& c = chf.cells[x+y*chf.width];
-
-			for (unsigned i = c.index, ni = c.index+c.count; i < ni; ++i)
-			{
-				const rcCompactSpan& s = chf.spans[i];
-
-				const unsigned char area = chf.areas[i];
-				unsigned int color;
-				if (area == RC_WALKABLE_AREA)
-					color = duRGBA(0,192,255,64);
-				else if (area == RC_NULL_AREA)
-					color = duRGBA(0,0,0,64);
-				else
-					color = dd->areaToCol(area);
-				
-				const float fy = chf.bmin[1] + (s.y+1)*ch;
-				dd->vertex(fx, fy, fz, color);
-				dd->vertex(fx, fy, fz+cs, color);
-				dd->vertex(fx+cs, fy, fz+cs, color);
-				dd->vertex(fx+cs, fy, fz, color);
-			}
-		}
-	}
-	dd->end();
-}
-
-void duDebugDrawCompactHeightfieldRegions(duDebugDraw* dd, const rcCompactHeightfield& chf)
-{
-	if (!dd) return;
-
-	const float cs = chf.cs;
-	const float ch = chf.ch;
-
-	dd->begin(DU_DRAW_QUADS);
-
-	for (int y = 0; y < chf.height; ++y)
-	{
-		for (int x = 0; x < chf.width; ++x)
-		{
-			const float fx = chf.bmin[0] + x*cs;
-			const float fz = chf.bmin[2] + y*cs;
-			const rcCompactCell& c = chf.cells[x+y*chf.width];
-			
-			for (unsigned i = c.index, ni = c.index+c.count; i < ni; ++i)
-			{
-				const rcCompactSpan& s = chf.spans[i];
-				const float fy = chf.bmin[1] + (s.y)*ch;
-				unsigned int color;
-				if (s.reg)
-					color = duIntToCol(s.reg, 192);
-				else
-					color = duRGBA(0,0,0,64);
-
-				dd->vertex(fx, fy, fz, color);
-				dd->vertex(fx, fy, fz+cs, color);
-				dd->vertex(fx+cs, fy, fz+cs, color);
-				dd->vertex(fx+cs, fy, fz, color);
-			}
-		}
-	}
-	
-	dd->end();
-}
-
-
-void duDebugDrawCompactHeightfieldDistance(duDebugDraw* dd, const rcCompactHeightfield& chf)
-{
-	if (!dd) return;
-	if (!chf.dist) return;
-		
-	const float cs = chf.cs;
-	const float ch = chf.ch;
-			
-	float maxd = chf.maxDistance;
-	if (maxd < 1.0f) maxd = 1;
-	const float dscale = 255.0f / maxd;
-	
-	dd->begin(DU_DRAW_QUADS);
-	
-	for (int y = 0; y < chf.height; ++y)
-	{
-		for (int x = 0; x < chf.width; ++x)
-		{
-			const float fx = chf.bmin[0] + x*cs;
-			const float fz = chf.bmin[2] + y*cs;
-			const rcCompactCell& c = chf.cells[x+y*chf.width];
-			
-			for (unsigned i = c.index, ni = c.index+c.count; i < ni; ++i)
-			{
-				const rcCompactSpan& s = chf.spans[i];
-				const float fy = chf.bmin[1] + (s.y+1)*ch;
-				const unsigned char cd = (unsigned char)(chf.dist[i] * dscale);
-				const unsigned int color = duRGBA(cd,cd,cd,255);
-				dd->vertex(fx, fy, fz, color);
-				dd->vertex(fx, fy, fz+cs, color);
-				dd->vertex(fx+cs, fy, fz+cs, color);
-				dd->vertex(fx+cs, fy, fz, color);
-			}
-		}
-	}
-	dd->end();
-}
-
-static void drawLayerPortals(duDebugDraw* dd, const rcHeightfieldLayer* layer)
-{
-	const float cs = layer->cs;
-	const float ch = layer->ch;
-	const int w = layer->width;
-	const int h = layer->height;
-	
-	unsigned int pcol = duRGBA(255,255,255,255);
-	
-	const int segs[4*4] = {0,0,0,1, 0,1,1,1, 1,1,1,0, 1,0,0,0};
-	
-	// Layer portals
-	dd->begin(DU_DRAW_LINES, 2.0f);
-	for (int y = 0; y < h; ++y)
-	{
-		for (int x = 0; x < w; ++x)
-		{
-			const int idx = x+y*w;
-			const int lh = (int)layer->heights[idx];
-			if (lh == 255) continue;
-			
-			for (int dir = 0; dir < 4; ++dir)
-			{
-				if (layer->cons[idx] & (1<<(dir+4)))
-				{
-					const int* seg = &segs[dir*4];
-					const float ax = layer->bmin[0] + (x+seg[0])*cs;
-					const float ay = layer->bmin[1] + (lh+2)*ch;
-					const float az = layer->bmin[2] + (y+seg[1])*cs;
-					const float bx = layer->bmin[0] + (x+seg[2])*cs;
-					const float by = layer->bmin[1] + (lh+2)*ch;
-					const float bz = layer->bmin[2] + (y+seg[3])*cs;
-					dd->vertex(ax, ay, az, pcol);
-					dd->vertex(bx, by, bz, pcol);
-				}
-			}
-		}
-	}
-	dd->end();
-}
-
-void duDebugDrawHeightfieldLayer(duDebugDraw* dd, const struct rcHeightfieldLayer& layer, const int idx)
-{
-	const float cs = layer.cs;
-	const float ch = layer.ch;
-	const int w = layer.width;
-	const int h = layer.height;
-	
-	unsigned int color = duIntToCol(idx+1, 255);
-	
-	// Layer bounds
-	float bmin[3], bmax[3];
-	bmin[0] = layer.bmin[0] + layer.minx*cs;
-	bmin[1] = layer.bmin[1];
-	bmin[2] = layer.bmin[2] + layer.miny*cs;
-	bmax[0] = layer.bmin[0] + (layer.maxx+1)*cs;
-	bmax[1] = layer.bmax[1];
-	bmax[2] = layer.bmin[2] + (layer.maxy+1)*cs;
-	duDebugDrawBoxWire(dd, bmin[0],bmin[1],bmin[2], bmax[0],bmax[1],bmax[2], duTransCol(color,128), 2.0f);
-	
-	// Layer height
-	dd->begin(DU_DRAW_QUADS);
-	for (int y = 0; y < h; ++y)
-	{
-		for (int x = 0; x < w; ++x)
-		{
-			const int lidx = x+y*w;
-			const int lh = (int)layer.heights[lidx];
-			if (h == 0xff) continue;
-			const unsigned char area = layer.areas[lidx];
-			
-			unsigned int col;
-			if (area == RC_WALKABLE_AREA)
-				col = duLerpCol(color, duRGBA(0,192,255,64), 32);
-			else if (area == RC_NULL_AREA)
-				col = duLerpCol(color, duRGBA(0,0,0,64), 32);
-			else
-				col = duLerpCol(color, dd->areaToCol(area), 32);
-			
-			const float fx = layer.bmin[0] + x*cs;
-			const float fy = layer.bmin[1] + (lh+1)*ch;
-			const float fz = layer.bmin[2] + y*cs;
-			
-			dd->vertex(fx, fy, fz, col);
-			dd->vertex(fx, fy, fz+cs, col);
-			dd->vertex(fx+cs, fy, fz+cs, col);
-			dd->vertex(fx+cs, fy, fz, col);
-		}
-	}
-	dd->end();
-	
-	// Portals
-	drawLayerPortals(dd, &layer);
-}
-
-void duDebugDrawHeightfieldLayers(duDebugDraw* dd, const struct rcHeightfieldLayerSet& lset)
-{
-	if (!dd) return;
-	for (int i = 0; i < lset.nlayers; ++i)
-		duDebugDrawHeightfieldLayer(dd, lset.layers[i], i);
-}
-
-/*
-void duDebugDrawLayerContours(duDebugDraw* dd, const struct rcLayerContourSet& lcset)
-{
-	if (!dd) return;
-	
-	const float* orig = lcset.bmin;
-	const float cs = lcset.cs;
-	const float ch = lcset.ch;
-	
-	const unsigned char a = 255;// (unsigned char)(alpha*255.0f);
-	
-	const int offs[2*4] = {-1,0, 0,1, 1,0, 0,-1};
-
-	dd->begin(DU_DRAW_LINES, 2.0f);
-	
-	for (int i = 0; i < lcset.nconts; ++i)
-	{
-		const rcLayerContour& c = lcset.conts[i];
-		unsigned int color = 0;
-
-		color = duIntToCol(i, a);
-
-		for (int j = 0; j < c.nverts; ++j)
-		{
-			const int k = (j+1) % c.nverts;
-			const unsigned char* va = &c.verts[j*4];
-			const unsigned char* vb = &c.verts[k*4];
-			const float ax = orig[0] + va[0]*cs;
-			const float ay = orig[1] + (va[1]+1+(i&1))*ch;
-			const float az = orig[2] + va[2]*cs;
-			const float bx = orig[0] + vb[0]*cs;
-			const float by = orig[1] + (vb[1]+1+(i&1))*ch;
-			const float bz = orig[2] + vb[2]*cs;
-			unsigned int col = color;
-			if ((va[3] & 0xf) != 0xf)
-			{
-				col = duRGBA(255,255,255,128);
-				int d = va[3] & 0xf;
-				
-				const float cx = (ax+bx)*0.5f;
-				const float cy = (ay+by)*0.5f;
-				const float cz = (az+bz)*0.5f;
-				
-				const float dx = cx + offs[d*2+0]*2*cs;
-				const float dy = cy;
-				const float dz = cz + offs[d*2+1]*2*cs;
-				
-				dd->vertex(cx,cy,cz,duRGBA(255,0,0,255));
-				dd->vertex(dx,dy,dz,duRGBA(255,0,0,255));
-			}
-			
-			duAppendArrow(dd, ax,ay,az, bx,by,bz, 0.0f, cs*0.5f, col);
-		}
-	}
-	dd->end();
-	
-	dd->begin(DU_DRAW_POINTS, 4.0f);	
-	
-	for (int i = 0; i < lcset.nconts; ++i)
-	{
-		const rcLayerContour& c = lcset.conts[i];
-		unsigned int color = 0;
-		
-		for (int j = 0; j < c.nverts; ++j)
-		{
-			const unsigned char* va = &c.verts[j*4];
-
-			color = duDarkenCol(duIntToCol(i, a));
-			if (va[3] & 0x80)
-				color = duRGBA(255,0,0,255);
-
-			float fx = orig[0] + va[0]*cs;
-			float fy = orig[1] + (va[1]+1+(i&1))*ch;
-			float fz = orig[2] + va[2]*cs;
-			dd->vertex(fx,fy,fz, color);
-		}
-	}
-	dd->end();
-}
-
-void duDebugDrawLayerPolyMesh(duDebugDraw* dd, const struct rcLayerPolyMesh& lmesh)
-{
-	if (!dd) return;
-	
-	const int nvp = lmesh.nvp;
-	const float cs = lmesh.cs;
-	const float ch = lmesh.ch;
-	const float* orig = lmesh.bmin;
-	
-	const int offs[2*4] = {-1,0, 0,1, 1,0, 0,-1};
-
-	dd->begin(DU_DRAW_TRIS);
-	
-	for (int i = 0; i < lmesh.npolys; ++i)
-	{
-		const unsigned short* p = &lmesh.polys[i*nvp*2];
-		
-		unsigned int color;
-		if (lmesh.areas[i] == RC_WALKABLE_AREA)
-			color = duRGBA(0,192,255,64);
-		else if (lmesh.areas[i] == RC_NULL_AREA)
-			color = duRGBA(0,0,0,64);
-		else
-			color = duIntToCol(lmesh.areas[i], 255);
-		
-		unsigned short vi[3];
-		for (int j = 2; j < nvp; ++j)
-		{
-			if (p[j] == RC_MESH_NULL_IDX) break;
-			vi[0] = p[0];
-			vi[1] = p[j-1];
-			vi[2] = p[j];
-			for (int k = 0; k < 3; ++k)
-			{
-				const unsigned short* v = &lmesh.verts[vi[k]*3];
-				const float x = orig[0] + v[0]*cs;
-				const float y = orig[1] + (v[1]+1)*ch;
-				const float z = orig[2] + v[2]*cs;
-				dd->vertex(x,y,z, color);
-			}
-		}
-	}
-	dd->end();
-	
-	// Draw neighbours edges
-	const unsigned int coln = duRGBA(0,48,64,32);
-	dd->begin(DU_DRAW_LINES, 1.5f);
-	for (int i = 0; i < lmesh.npolys; ++i)
-	{
-		const unsigned short* p = &lmesh.polys[i*nvp*2];
-		for (int j = 0; j < nvp; ++j)
-		{
-			if (p[j] == RC_MESH_NULL_IDX) break;
-			if (p[nvp+j] & 0x8000) continue;
-			const int nj = (j+1 >= nvp || p[j+1] == RC_MESH_NULL_IDX) ? 0 : j+1; 
-			int vi[2] = {p[j], p[nj]};
-			
-			for (int k = 0; k < 2; ++k)
-			{
-				const unsigned short* v = &lmesh.verts[vi[k]*3];
-				const float x = orig[0] + v[0]*cs;
-				const float y = orig[1] + (v[1]+1)*ch + 0.1f;
-				const float z = orig[2] + v[2]*cs;
-				dd->vertex(x, y, z, coln);
-			}
-		}
-	}
-	dd->end();
-	
-	// Draw boundary edges
-	const unsigned int colb = duRGBA(0,48,64,220);
-	dd->begin(DU_DRAW_LINES, 2.5f);
-	for (int i = 0; i < lmesh.npolys; ++i)
-	{
-		const unsigned short* p = &lmesh.polys[i*nvp*2];
-		for (int j = 0; j < nvp; ++j)
-		{
-			if (p[j] == RC_MESH_NULL_IDX) break;
-			if ((p[nvp+j] & 0x8000) == 0) continue;
-			const int nj = (j+1 >= nvp || p[j+1] == RC_MESH_NULL_IDX) ? 0 : j+1; 
-			int vi[2] = {p[j], p[nj]};
-			
-			unsigned int col = colb;
-			if ((p[nvp+j] & 0xf) != 0xf)
-			{
-				const unsigned short* va = &lmesh.verts[vi[0]*3];
-				const unsigned short* vb = &lmesh.verts[vi[1]*3];
-
-				const float ax = orig[0] + va[0]*cs;
-				const float ay = orig[1] + (va[1]+1+(i&1))*ch;
-				const float az = orig[2] + va[2]*cs;
-				const float bx = orig[0] + vb[0]*cs;
-				const float by = orig[1] + (vb[1]+1+(i&1))*ch;
-				const float bz = orig[2] + vb[2]*cs;
-				
-				const float cx = (ax+bx)*0.5f;
-				const float cy = (ay+by)*0.5f;
-				const float cz = (az+bz)*0.5f;
-				
-				int d = p[nvp+j] & 0xf;
-				
-				const float dx = cx + offs[d*2+0]*2*cs;
-				const float dy = cy;
-				const float dz = cz + offs[d*2+1]*2*cs;
-				
-				dd->vertex(cx,cy,cz,duRGBA(255,0,0,255));
-				dd->vertex(dx,dy,dz,duRGBA(255,0,0,255));
-				
-				col = duRGBA(255,255,255,128);
-			}
-							 
-			for (int k = 0; k < 2; ++k)
-			{
-				const unsigned short* v = &lmesh.verts[vi[k]*3];
-				const float x = orig[0] + v[0]*cs;
-				const float y = orig[1] + (v[1]+1)*ch + 0.1f;
-				const float z = orig[2] + v[2]*cs;
-				dd->vertex(x, y, z, col);
-			}
-		}
-	}
-	dd->end();
-	
-	dd->begin(DU_DRAW_POINTS, 3.0f);
-	const unsigned int colv = duRGBA(0,0,0,220);
-	for (int i = 0; i < lmesh.nverts; ++i)
-	{
-		const unsigned short* v = &lmesh.verts[i*3];
-		const float x = orig[0] + v[0]*cs;
-		const float y = orig[1] + (v[1]+1)*ch + 0.1f;
-		const float z = orig[2] + v[2]*cs;
-		dd->vertex(x,y,z, colv);
-	}
-	dd->end();
-}
-*/
-
-static void getContourCenter(const rcContour* cont, const float* orig, float cs, float ch, float* center)
-{
-	center[0] = 0;
-	center[1] = 0;
-	center[2] = 0;
-	if (!cont->nverts)
-		return;
-	for (int i = 0; i < cont->nverts; ++i)
-	{
-		const int* v = &cont->verts[i*4];
-		center[0] += (float)v[0];
-		center[1] += (float)v[1];
-		center[2] += (float)v[2];
-	}
-	const float s = 1.0f / cont->nverts;
-	center[0] *= s * cs;
-	center[1] *= s * ch;
-	center[2] *= s * cs;
-	center[0] += orig[0];
-	center[1] += orig[1] + 4*ch;
-	center[2] += orig[2];
-}
-
-static const rcContour* findContourFromSet(const rcContourSet& cset, unsigned short reg)
-{
-	for (int i = 0; i < cset.nconts; ++i)
-	{
-		if (cset.conts[i].reg == reg)
-			return &cset.conts[i];
-	}
-	return 0;
-}
-
-void duDebugDrawRegionConnections(duDebugDraw* dd, const rcContourSet& cset, const float alpha)
-{
-	if (!dd) return;
-	
-	const float* orig = cset.bmin;
-	const float cs = cset.cs;
-	const float ch = cset.ch;
-	
-	// Draw centers
-	float pos[3], pos2[3];
-
-	unsigned int color = duRGBA(0,0,0,196);
-
-	dd->begin(DU_DRAW_LINES, 2.0f);
-
-	for (int i = 0; i < cset.nconts; ++i)
-	{
-		const rcContour* cont = &cset.conts[i];
-		getContourCenter(cont, orig, cs, ch, pos);
-		for (int j = 0; j < cont->nverts; ++j)
-		{
-			const int* v = &cont->verts[j*4];
-			if (v[3] == 0 || (unsigned short)v[3] < cont->reg) continue;
-			const rcContour* cont2 = findContourFromSet(cset, (unsigned short)v[3]);
-			if (cont2)
-			{
-				getContourCenter(cont2, orig, cs, ch, pos2);
-				duAppendArc(dd, pos[0],pos[1],pos[2], pos2[0],pos2[1],pos2[2], 0.25f, 0.6f, 0.6f, color);
-			}
-		}
-	}
-	
-	dd->end();
-
-	unsigned char a = (unsigned char)(alpha * 255.0f);
-
-	dd->begin(DU_DRAW_POINTS, 7.0f);
-
-	for (int i = 0; i < cset.nconts; ++i)
-	{
-		const rcContour* cont = &cset.conts[i];
-		unsigned int col = duDarkenCol(duIntToCol(cont->reg,a));
-		getContourCenter(cont, orig, cs, ch, pos);
-		dd->vertex(pos, col);
-	}
-	dd->end();
-}
-
-void duDebugDrawRawContours(duDebugDraw* dd, const rcContourSet& cset, const float alpha)
-{
-	if (!dd) return;
-
-	const float* orig = cset.bmin;
-	const float cs = cset.cs;
-	const float ch = cset.ch;
-	
-	const unsigned char a = (unsigned char)(alpha*255.0f);
-	
-	dd->begin(DU_DRAW_LINES, 2.0f);
-			
-	for (int i = 0; i < cset.nconts; ++i)
-	{
-		const rcContour& c = cset.conts[i];
-		unsigned int color = duIntToCol(c.reg, a);
-
-		for (int j = 0; j < c.nrverts; ++j)
-		{
-			const int* v = &c.rverts[j*4];
-			float fx = orig[0] + v[0]*cs;
-			float fy = orig[1] + (v[1]+1+(i&1))*ch;
-			float fz = orig[2] + v[2]*cs;
-			dd->vertex(fx,fy,fz,color);
-			if (j > 0)
-				dd->vertex(fx,fy,fz,color);
-		}
-		// Loop last segment.
-		const int* v = &c.rverts[0];
-		float fx = orig[0] + v[0]*cs;
-		float fy = orig[1] + (v[1]+1+(i&1))*ch;
-		float fz = orig[2] + v[2]*cs;
-		dd->vertex(fx,fy,fz,color);
-	}
-	dd->end();
-
-	dd->begin(DU_DRAW_POINTS, 2.0f);	
-
-	for (int i = 0; i < cset.nconts; ++i)
-	{
-		const rcContour& c = cset.conts[i];
-		unsigned int color = duDarkenCol(duIntToCol(c.reg, a));
-		
-		for (int j = 0; j < c.nrverts; ++j)
-		{
-			const int* v = &c.rverts[j*4];
-			float off = 0;
-			unsigned int colv = color;
-			if (v[3] & RC_BORDER_VERTEX)
-			{
-				colv = duRGBA(255,255,255,a);
-				off = ch*2;
-			}
-			
-			float fx = orig[0] + v[0]*cs;
-			float fy = orig[1] + (v[1]+1+(i&1))*ch + off;
-			float fz = orig[2] + v[2]*cs;
-			dd->vertex(fx,fy,fz, colv);
-		}
-	}
-	dd->end();
-}
-
-void duDebugDrawContours(duDebugDraw* dd, const rcContourSet& cset, const float alpha)
-{
-	if (!dd) return;
-
-	const float* orig = cset.bmin;
-	const float cs = cset.cs;
-	const float ch = cset.ch;
-	
-	const unsigned char a = (unsigned char)(alpha*255.0f);
-	
-	dd->begin(DU_DRAW_LINES, 2.5f);
-	
-	for (int i = 0; i < cset.nconts; ++i)
-	{
-		const rcContour& c = cset.conts[i];
-		if (!c.nverts)
-			continue;
-		const unsigned int color = duIntToCol(c.reg, a);
-		const unsigned int bcolor = duLerpCol(color,duRGBA(255,255,255,a),128);
-		for (int j = 0, k = c.nverts-1; j < c.nverts; k=j++)
-		{
-			const int* va = &c.verts[k*4];
-			const int* vb = &c.verts[j*4];
-			unsigned int col = (va[3] & RC_AREA_BORDER) ? bcolor : color; 
-			float fx,fy,fz;
-			fx = orig[0] + va[0]*cs;
-			fy = orig[1] + (va[1]+1+(i&1))*ch;
-			fz = orig[2] + va[2]*cs;
-			dd->vertex(fx,fy,fz, col);
-			fx = orig[0] + vb[0]*cs;
-			fy = orig[1] + (vb[1]+1+(i&1))*ch;
-			fz = orig[2] + vb[2]*cs;
-			dd->vertex(fx,fy,fz, col);
-		}
-	}
-	dd->end();
-
-	dd->begin(DU_DRAW_POINTS, 3.0f);
-	
-	for (int i = 0; i < cset.nconts; ++i)
-	{
-		const rcContour& c = cset.conts[i];
-		unsigned int color = duDarkenCol(duIntToCol(c.reg, a));
-		for (int j = 0; j < c.nverts; ++j)
-		{
-			const int* v = &c.verts[j*4];
-			float off = 0;
-			unsigned int colv = color;
-			if (v[3] & RC_BORDER_VERTEX)
-			{
-				colv = duRGBA(255,255,255,a);
-				off = ch*2;
-			}
-
-			float fx = orig[0] + v[0]*cs;
-			float fy = orig[1] + (v[1]+1+(i&1))*ch + off;
-			float fz = orig[2] + v[2]*cs;
-			dd->vertex(fx,fy,fz, colv);
-		}
-	}
-	dd->end();
-}
-
-void duDebugDrawPolyMesh(duDebugDraw* dd, const struct rcPolyMesh& mesh)
-{
-	if (!dd) return;
-
-	const int nvp = mesh.nvp;
-	const float cs = mesh.cs;
-	const float ch = mesh.ch;
-	const float* orig = mesh.bmin;
-	
-	dd->begin(DU_DRAW_TRIS);
-	
-	for (int i = 0; i < mesh.npolys; ++i)
-	{
-		const unsigned short* p = &mesh.polys[i*nvp*2];
-		const unsigned char area = mesh.areas[i];
-		
-		unsigned int color;
-		if (area == RC_WALKABLE_AREA)
-			color = duRGBA(0,192,255,64);
-		else if (area == RC_NULL_AREA)
-			color = duRGBA(0,0,0,64);
-		else
-			color = dd->areaToCol(area);
-		
-		unsigned short vi[3];
-		for (int j = 2; j < nvp; ++j)
-		{
-			if (p[j] == RC_MESH_NULL_IDX) break;
-			vi[0] = p[0];
-			vi[1] = p[j-1];
-			vi[2] = p[j];
-			for (int k = 0; k < 3; ++k)
-			{
-				const unsigned short* v = &mesh.verts[vi[k]*3];
-				const float x = orig[0] + v[0]*cs;
-				const float y = orig[1] + (v[1]+1)*ch;
-				const float z = orig[2] + v[2]*cs;
-				dd->vertex(x,y,z, color);
-			}
-		}
-	}
-	dd->end();
-
-	// Draw neighbours edges
-	const unsigned int coln = duRGBA(0,48,64,32);
-	dd->begin(DU_DRAW_LINES, 1.5f);
-	for (int i = 0; i < mesh.npolys; ++i)
-	{
-		const unsigned short* p = &mesh.polys[i*nvp*2];
-		for (int j = 0; j < nvp; ++j)
-		{
-			if (p[j] == RC_MESH_NULL_IDX) break;
-			if (p[nvp+j] & 0x8000) continue;
-			const int nj = (j+1 >= nvp || p[j+1] == RC_MESH_NULL_IDX) ? 0 : j+1; 
-			const int vi[2] = {p[j], p[nj]};
-			
-			for (int k = 0; k < 2; ++k)
-			{
-				const unsigned short* v = &mesh.verts[vi[k]*3];
-				const float x = orig[0] + v[0]*cs;
-				const float y = orig[1] + (v[1]+1)*ch + 0.1f;
-				const float z = orig[2] + v[2]*cs;
-				dd->vertex(x, y, z, coln);
-			}
-		}
-	}
-	dd->end();
-	
-	// Draw boundary edges
-	const unsigned int colb = duRGBA(0,48,64,220);
-	dd->begin(DU_DRAW_LINES, 2.5f);
-	for (int i = 0; i < mesh.npolys; ++i)
-	{
-		const unsigned short* p = &mesh.polys[i*nvp*2];
-		for (int j = 0; j < nvp; ++j)
-		{
-			if (p[j] == RC_MESH_NULL_IDX) break;
-			if ((p[nvp+j] & 0x8000) == 0) continue;
-			const int nj = (j+1 >= nvp || p[j+1] == RC_MESH_NULL_IDX) ? 0 : j+1; 
-			const int vi[2] = {p[j], p[nj]};
-			
-			unsigned int col = colb;
-			if ((p[nvp+j] & 0xf) != 0xf)
-				col = duRGBA(255,255,255,128);
-			for (int k = 0; k < 2; ++k)
-			{
-				const unsigned short* v = &mesh.verts[vi[k]*3];
-				const float x = orig[0] + v[0]*cs;
-				const float y = orig[1] + (v[1]+1)*ch + 0.1f;
-				const float z = orig[2] + v[2]*cs;
-				dd->vertex(x, y, z, col);
-			}
-		}
-	}
-	dd->end();
-	
-	dd->begin(DU_DRAW_POINTS, 3.0f);
-	const unsigned int colv = duRGBA(0,0,0,220);
-	for (int i = 0; i < mesh.nverts; ++i)
-	{
-		const unsigned short* v = &mesh.verts[i*3];
-		const float x = orig[0] + v[0]*cs;
-		const float y = orig[1] + (v[1]+1)*ch + 0.1f;
-		const float z = orig[2] + v[2]*cs;
-		dd->vertex(x,y,z, colv);
-	}
-	dd->end();
-}
-
-void duDebugDrawPolyMeshDetail(duDebugDraw* dd, const struct rcPolyMeshDetail& dmesh)
-{
-	if (!dd) return;
-
-	dd->begin(DU_DRAW_TRIS);
-	
-	for (int i = 0; i < dmesh.nmeshes; ++i)
-	{
-		const unsigned int* m = &dmesh.meshes[i*4];
-		const unsigned int bverts = m[0];
-		const unsigned int btris = m[2];
-		const int ntris = (int)m[3];
-		const float* verts = &dmesh.verts[bverts*3];
-		const unsigned char* tris = &dmesh.tris[btris*4];
-
-		unsigned int color = duIntToCol(i, 192);
-
-		for (int j = 0; j < ntris; ++j)
-		{
-			dd->vertex(&verts[tris[j*4+0]*3], color);
-			dd->vertex(&verts[tris[j*4+1]*3], color);
-			dd->vertex(&verts[tris[j*4+2]*3], color);
-		}
-	}
-	dd->end();
-
-	// Internal edges.
-	dd->begin(DU_DRAW_LINES, 1.0f);
-	const unsigned int coli = duRGBA(0,0,0,64);
-	for (int i = 0; i < dmesh.nmeshes; ++i)
-	{
-		const unsigned int* m = &dmesh.meshes[i*4];
-		const unsigned int bverts = m[0];
-		const unsigned int btris = m[2];
-		const int ntris = (int)m[3];
-		const float* verts = &dmesh.verts[bverts*3];
-		const unsigned char* tris = &dmesh.tris[btris*4];
-		
-		for (int j = 0; j < ntris; ++j)
-		{
-			const unsigned char* t = &tris[j*4];
-			for (int k = 0, kp = 2; k < 3; kp=k++)
-			{
-				unsigned char ef = (t[3] >> (kp*2)) & 0x3;
-				if (ef == 0)
-				{
-					// Internal edge
-					if (t[kp] < t[k])
-					{
-						dd->vertex(&verts[t[kp]*3], coli);
-						dd->vertex(&verts[t[k]*3], coli);
-					}
-				}
-			}
-		}
-	}
-	dd->end();
-	
-	// External edges.
-	dd->begin(DU_DRAW_LINES, 2.0f);
-	const unsigned int cole = duRGBA(0,0,0,64);
-	for (int i = 0; i < dmesh.nmeshes; ++i)
-	{
-		const unsigned int* m = &dmesh.meshes[i*4];
-		const unsigned int bverts = m[0];
-		const unsigned int btris = m[2];
-		const int ntris = (int)m[3];
-		const float* verts = &dmesh.verts[bverts*3];
-		const unsigned char* tris = &dmesh.tris[btris*4];
-		
-		for (int j = 0; j < ntris; ++j)
-		{
-			const unsigned char* t = &tris[j*4];
-			for (int k = 0, kp = 2; k < 3; kp=k++)
-			{
-				unsigned char ef = (t[3] >> (kp*2)) & 0x3;
-				if (ef != 0)
-				{
-					// Ext edge
-					dd->vertex(&verts[t[kp]*3], cole);
-					dd->vertex(&verts[t[k]*3], cole);
-				}
-			}
-		}
-	}
-	dd->end();
-	
-	dd->begin(DU_DRAW_POINTS, 3.0f);
-	const unsigned int colv = duRGBA(0,0,0,64);
-	for (int i = 0; i < dmesh.nmeshes; ++i)
-	{
-		const unsigned int* m = &dmesh.meshes[i*4];
-		const unsigned int bverts = m[0];
-		const int nverts = (int)m[1];
-		const float* verts = &dmesh.verts[bverts*3];
-		for (int j = 0; j < nverts; ++j)
-			dd->vertex(&verts[j*3], colv);
-	}
-	dd->end();
-}
diff --git a/extern/recastnavigation/DebugUtils/Source/RecastDump.cpp b/extern/recastnavigation/DebugUtils/Source/RecastDump.cpp
deleted file mode 100644
index 2093825157..0000000000
--- a/extern/recastnavigation/DebugUtils/Source/RecastDump.cpp
+++ /dev/null
@@ -1,451 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-#include "Recast.h"
-#include "RecastAlloc.h"
-#include "RecastDump.h"
-
-
-duFileIO::~duFileIO()
-{
-	// Empty
-}
-	
-static void ioprintf(duFileIO* io, const char* format, ...)
-{
-	char line[256];
-	va_list ap;
-	va_start(ap, format);
-	const int n = vsnprintf(line, sizeof(line), format, ap);
-	va_end(ap);
-	if (n > 0)
-		io->write(line, sizeof(char)*n);
-}
-
-bool duDumpPolyMeshToObj(rcPolyMesh& pmesh, duFileIO* io)
-{
-	if (!io)
-	{
-		printf("duDumpPolyMeshToObj: input IO is null.\n"); 
-		return false;
-	}
-	if (!io->isWriting())
-	{
-		printf("duDumpPolyMeshToObj: input IO not writing.\n"); 
-		return false;
-	}
-	
-	const int nvp = pmesh.nvp;
-	const float cs = pmesh.cs;
-	const float ch = pmesh.ch;
-	const float* orig = pmesh.bmin;
-	
-	ioprintf(io, "# Recast Navmesh\n");
-	ioprintf(io, "o NavMesh\n");
-
-	ioprintf(io, "\n");
-	
-	for (int i = 0; i < pmesh.nverts; ++i)
-	{
-		const unsigned short* v = &pmesh.verts[i*3];
-		const float x = orig[0] + v[0]*cs;
-		const float y = orig[1] + (v[1]+1)*ch + 0.1f;
-		const float z = orig[2] + v[2]*cs;
-		ioprintf(io, "v %f %f %f\n", x,y,z);
-	}
-
-	ioprintf(io, "\n");
-
-	for (int i = 0; i < pmesh.npolys; ++i)
-	{
-		const unsigned short* p = &pmesh.polys[i*nvp*2];
-		for (int j = 2; j < nvp; ++j)
-		{
-			if (p[j] == RC_MESH_NULL_IDX) break;
-			ioprintf(io, "f %d %d %d\n", p[0]+1, p[j-1]+1, p[j]+1); 
-		}
-	}
-	
-	return true;
-}
-
-bool duDumpPolyMeshDetailToObj(rcPolyMeshDetail& dmesh, duFileIO* io)
-{
-	if (!io)
-	{
-		printf("duDumpPolyMeshDetailToObj: input IO is null.\n"); 
-		return false;
-	}
-	if (!io->isWriting())
-	{
-		printf("duDumpPolyMeshDetailToObj: input IO not writing.\n"); 
-		return false;
-	}
-	
-	ioprintf(io, "# Recast Navmesh\n");
-	ioprintf(io, "o NavMesh\n");
-	
-	ioprintf(io, "\n");
-
-	for (int i = 0; i < dmesh.nverts; ++i)
-	{
-		const float* v = &dmesh.verts[i*3];
-		ioprintf(io, "v %f %f %f\n", v[0],v[1],v[2]);
-	}
-	
-	ioprintf(io, "\n");
-	
-	for (int i = 0; i < dmesh.nmeshes; ++i)
-	{
-		const unsigned int* m = &dmesh.meshes[i*4];
-		const unsigned int bverts = m[0];
-		const unsigned int btris = m[2];
-		const unsigned int ntris = m[3];
-		const unsigned char* tris = &dmesh.tris[btris*4];
-		for (unsigned int j = 0; j < ntris; ++j)
-		{
-			ioprintf(io, "f %d %d %d\n",
-					(int)(bverts+tris[j*4+0])+1,
-					(int)(bverts+tris[j*4+1])+1,
-					(int)(bverts+tris[j*4+2])+1);
-		}
-	}
-	
-	return true;
-}
-
-static const int CSET_MAGIC = ('c' << 24) | ('s' << 16) | ('e' << 8) | 't';
-static const int CSET_VERSION = 2;
-
-bool duDumpContourSet(struct rcContourSet& cset, duFileIO* io)
-{
-	if (!io)
-	{
-		printf("duDumpContourSet: input IO is null.\n"); 
-		return false;
-	}
-	if (!io->isWriting())
-	{
-		printf("duDumpContourSet: input IO not writing.\n"); 
-		return false;
-	}
-	
-	io->write(&CSET_MAGIC, sizeof(CSET_MAGIC));
-	io->write(&CSET_VERSION, sizeof(CSET_VERSION));
-
-	io->write(&cset.nconts, sizeof(cset.nconts));
-	
-	io->write(cset.bmin, sizeof(cset.bmin));
-	io->write(cset.bmax, sizeof(cset.bmax));
-	
-	io->write(&cset.cs, sizeof(cset.cs));
-	io->write(&cset.ch, sizeof(cset.ch));
-
-	io->write(&cset.width, sizeof(cset.width));
-	io->write(&cset.height, sizeof(cset.height));
-	io->write(&cset.borderSize, sizeof(cset.borderSize));
-
-	for (int i = 0; i < cset.nconts; ++i)
-	{
-		const rcContour& cont = cset.conts[i];
-		io->write(&cont.nverts, sizeof(cont.nverts));
-		io->write(&cont.nrverts, sizeof(cont.nrverts));
-		io->write(&cont.reg, sizeof(cont.reg));
-		io->write(&cont.area, sizeof(cont.area));
-		io->write(cont.verts, sizeof(int)*4*cont.nverts);
-		io->write(cont.rverts, sizeof(int)*4*cont.nrverts);
-	}
-
-	return true;
-}
-
-bool duReadContourSet(struct rcContourSet& cset, duFileIO* io)
-{
-	if (!io)
-	{
-		printf("duReadContourSet: input IO is null.\n"); 
-		return false;
-	}
-	if (!io->isReading())
-	{
-		printf("duReadContourSet: input IO not reading.\n"); 
-		return false;
-	}
-	
-	int magic = 0;
-	int version = 0;
-	
-	io->read(&magic, sizeof(magic));
-	io->read(&version, sizeof(version));
-	
-	if (magic != CSET_MAGIC)
-	{
-		printf("duReadContourSet: Bad voodoo.\n");
-		return false;
-	}
-	if (version != CSET_VERSION)
-	{
-		printf("duReadContourSet: Bad version.\n");
-		return false;
-	}
-	
-	io->read(&cset.nconts, sizeof(cset.nconts));
-
-	cset.conts = (rcContour*)rcAlloc(sizeof(rcContour)*cset.nconts, RC_ALLOC_PERM);
-	if (!cset.conts)
-	{
-		printf("duReadContourSet: Could not alloc contours (%d)\n", cset.nconts);
-		return false;
-	}
-	memset(cset.conts, 0, sizeof(rcContour)*cset.nconts);
-	
-	io->read(cset.bmin, sizeof(cset.bmin));
-	io->read(cset.bmax, sizeof(cset.bmax));
-	
-	io->read(&cset.cs, sizeof(cset.cs));
-	io->read(&cset.ch, sizeof(cset.ch));
-	
-	io->read(&cset.width, sizeof(cset.width));
-	io->read(&cset.height, sizeof(cset.height));
-	io->read(&cset.borderSize, sizeof(cset.borderSize));
-	
-	for (int i = 0; i < cset.nconts; ++i)
-	{
-		rcContour& cont = cset.conts[i];
-		io->read(&cont.nverts, sizeof(cont.nverts));
-		io->read(&cont.nrverts, sizeof(cont.nrverts));
-		io->read(&cont.reg, sizeof(cont.reg));
-		io->read(&cont.area, sizeof(cont.area));
-
-		cont.verts = (int*)rcAlloc(sizeof(int)*4*cont.nverts, RC_ALLOC_PERM);
-		if (!cont.verts)
-		{
-			printf("duReadContourSet: Could not alloc contour verts (%d)\n", cont.nverts);
-			return false;
-		}
-		cont.rverts = (int*)rcAlloc(sizeof(int)*4*cont.nrverts, RC_ALLOC_PERM);
-		if (!cont.rverts)
-		{
-			printf("duReadContourSet: Could not alloc contour rverts (%d)\n", cont.nrverts);
-			return false;
-		}
-		
-		io->read(cont.verts, sizeof(int)*4*cont.nverts);
-		io->read(cont.rverts, sizeof(int)*4*cont.nrverts);
-	}
-	
-	return true;
-}
-	
-
-static const int CHF_MAGIC = ('r' << 24) | ('c' << 16) | ('h' << 8) | 'f';
-static const int CHF_VERSION = 3;
-
-bool duDumpCompactHeightfield(struct rcCompactHeightfield& chf, duFileIO* io)
-{
-	if (!io)
-	{
-		printf("duDumpCompactHeightfield: input IO is null.\n"); 
-		return false;
-	}
-	if (!io->isWriting())
-	{
-		printf("duDumpCompactHeightfield: input IO not writing.\n"); 
-		return false;
-	}
-	
-	io->write(&CHF_MAGIC, sizeof(CHF_MAGIC));
-	io->write(&CHF_VERSION, sizeof(CHF_VERSION));
-	
-	io->write(&chf.width, sizeof(chf.width));
-	io->write(&chf.height, sizeof(chf.height));
-	io->write(&chf.spanCount, sizeof(chf.spanCount));
-
-	io->write(&chf.walkableHeight, sizeof(chf.walkableHeight));
-	io->write(&chf.walkableClimb, sizeof(chf.walkableClimb));
-	io->write(&chf.borderSize, sizeof(chf.borderSize));
-
-	io->write(&chf.maxDistance, sizeof(chf.maxDistance));
-	io->write(&chf.maxRegions, sizeof(chf.maxRegions));
-
-	io->write(chf.bmin, sizeof(chf.bmin));
-	io->write(chf.bmax, sizeof(chf.bmax));
-
-	io->write(&chf.cs, sizeof(chf.cs));
-	io->write(&chf.ch, sizeof(chf.ch));
-
-	int tmp = 0;
-	if (chf.cells) tmp |= 1;
-	if (chf.spans) tmp |= 2;
-	if (chf.dist) tmp |= 4;
-	if (chf.areas) tmp |= 8;
-
-	io->write(&tmp, sizeof(tmp));
-
-	if (chf.cells)
-		io->write(chf.cells, sizeof(rcCompactCell)*chf.width*chf.height);
-	if (chf.spans)
-		io->write(chf.spans, sizeof(rcCompactSpan)*chf.spanCount);
-	if (chf.dist)
-		io->write(chf.dist, sizeof(unsigned short)*chf.spanCount);
-	if (chf.areas)
-		io->write(chf.areas, sizeof(unsigned char)*chf.spanCount);
-
-	return true;
-}
-
-bool duReadCompactHeightfield(struct rcCompactHeightfield& chf, duFileIO* io)
-{
-	if (!io)
-	{
-		printf("duReadCompactHeightfield: input IO is null.\n"); 
-		return false;
-	}
-	if (!io->isReading())
-	{
-		printf("duReadCompactHeightfield: input IO not reading.\n"); 
-		return false;
-	}
-
-	int magic = 0;
-	int version = 0;
-	
-	io->read(&magic, sizeof(magic));
-	io->read(&version, sizeof(version));
-	
-	if (magic != CHF_MAGIC)
-	{
-		printf("duReadCompactHeightfield: Bad voodoo.\n");
-		return false;
-	}
-	if (version != CHF_VERSION)
-	{
-		printf("duReadCompactHeightfield: Bad version.\n");
-		return false;
-	}
-	
-	io->read(&chf.width, sizeof(chf.width));
-	io->read(&chf.height, sizeof(chf.height));
-	io->read(&chf.spanCount, sizeof(chf.spanCount));
-	
-	io->read(&chf.walkableHeight, sizeof(chf.walkableHeight));
-	io->read(&chf.walkableClimb, sizeof(chf.walkableClimb));
-	io->read(&chf.borderSize, sizeof(chf.borderSize));
-
-	io->read(&chf.maxDistance, sizeof(chf.maxDistance));
-	io->read(&chf.maxRegions, sizeof(chf.maxRegions));
-	
-	io->read(chf.bmin, sizeof(chf.bmin));
-	io->read(chf.bmax, sizeof(chf.bmax));
-	
-	io->read(&chf.cs, sizeof(chf.cs));
-	io->read(&chf.ch, sizeof(chf.ch));
-	
-	int tmp = 0;
-	io->read(&tmp, sizeof(tmp));
-	
-	if (tmp & 1)
-	{
-		chf.cells = (rcCompactCell*)rcAlloc(sizeof(rcCompactCell)*chf.width*chf.height, RC_ALLOC_PERM);
-		if (!chf.cells)
-		{
-			printf("duReadCompactHeightfield: Could not alloc cells (%d)\n", chf.width*chf.height);
-			return false;
-		}
-		io->read(chf.cells, sizeof(rcCompactCell)*chf.width*chf.height);
-	}
-	if (tmp & 2)
-	{
-		chf.spans = (rcCompactSpan*)rcAlloc(sizeof(rcCompactSpan)*chf.spanCount, RC_ALLOC_PERM);
-		if (!chf.spans)
-		{
-			printf("duReadCompactHeightfield: Could not alloc spans (%d)\n", chf.spanCount);
-			return false;
-		}
-		io->read(chf.spans, sizeof(rcCompactSpan)*chf.spanCount);
-	}
-	if (tmp & 4)
-	{
-		chf.dist = (unsigned short*)rcAlloc(sizeof(unsigned short)*chf.spanCount, RC_ALLOC_PERM);
-		if (!chf.dist)
-		{
-			printf("duReadCompactHeightfield: Could not alloc dist (%d)\n", chf.spanCount);
-			return false;
-		}
-		io->read(chf.dist, sizeof(unsigned short)*chf.spanCount);
-	}
-	if (tmp & 8)
-	{
-		chf.areas = (unsigned char*)rcAlloc(sizeof(unsigned char)*chf.spanCount, RC_ALLOC_PERM);
-		if (!chf.areas)
-		{
-			printf("duReadCompactHeightfield: Could not alloc areas (%d)\n", chf.spanCount);
-			return false;
-		}
-		io->read(chf.areas, sizeof(unsigned char)*chf.spanCount);
-	}
-	
-	return true;
-}
-
-
-static void logLine(rcContext& ctx, rcTimerLabel label, const char* name, const float pc)
-{
-	const int t = ctx.getAccumulatedTime(label);
-	if (t < 0) return;
-	ctx.log(RC_LOG_PROGRESS, "%s:\t%.2fms\t(%.1f%%)", name, t/1000.0f, t*pc);
-}
-
-void duLogBuildTimes(rcContext& ctx, const int totalTimeUsec)
-{
-	const float pc = 100.0f / totalTimeUsec;
- 
-	ctx.log(RC_LOG_PROGRESS, "Build Times");
-	logLine(ctx, RC_TIMER_RASTERIZE_TRIANGLES,		"- Rasterize", pc);
-	logLine(ctx, RC_TIMER_BUILD_COMPACTHEIGHTFIELD,	"- Build Compact", pc);
-	logLine(ctx, RC_TIMER_FILTER_BORDER,				"- Filter Border", pc);
-	logLine(ctx, RC_TIMER_FILTER_WALKABLE,			"- Filter Walkable", pc);
-	logLine(ctx, RC_TIMER_ERODE_AREA,				"- Erode Area", pc);
-	logLine(ctx, RC_TIMER_MEDIAN_AREA,				"- Median Area", pc);
-	logLine(ctx, RC_TIMER_MARK_BOX_AREA,				"- Mark Box Area", pc);
-	logLine(ctx, RC_TIMER_MARK_CONVEXPOLY_AREA,		"- Mark Convex Area", pc);
-	logLine(ctx, RC_TIMER_MARK_CYLINDER_AREA,		"- Mark Cylinder Area", pc);
-	logLine(ctx, RC_TIMER_BUILD_DISTANCEFIELD,		"- Build Distance Field", pc);
-	logLine(ctx, RC_TIMER_BUILD_DISTANCEFIELD_DIST,	"    - Distance", pc);
-	logLine(ctx, RC_TIMER_BUILD_DISTANCEFIELD_BLUR,	"    - Blur", pc);
-	logLine(ctx, RC_TIMER_BUILD_REGIONS,				"- Build Regions", pc);
-	logLine(ctx, RC_TIMER_BUILD_REGIONS_WATERSHED,	"    - Watershed", pc);
-	logLine(ctx, RC_TIMER_BUILD_REGIONS_EXPAND,		"      - Expand", pc);
-	logLine(ctx, RC_TIMER_BUILD_REGIONS_FLOOD,		"      - Find Basins", pc);
-	logLine(ctx, RC_TIMER_BUILD_REGIONS_FILTER,		"    - Filter", pc);
-	logLine(ctx, RC_TIMER_BUILD_LAYERS,				"- Build Layers", pc);
-	logLine(ctx, RC_TIMER_BUILD_CONTOURS,			"- Build Contours", pc);
-	logLine(ctx, RC_TIMER_BUILD_CONTOURS_TRACE,		"    - Trace", pc);
-	logLine(ctx, RC_TIMER_BUILD_CONTOURS_SIMPLIFY,	"    - Simplify", pc);
-	logLine(ctx, RC_TIMER_BUILD_POLYMESH,			"- Build Polymesh", pc);
-	logLine(ctx, RC_TIMER_BUILD_POLYMESHDETAIL,		"- Build Polymesh Detail", pc);
-	logLine(ctx, RC_TIMER_MERGE_POLYMESH,			"- Merge Polymeshes", pc);
-	logLine(ctx, RC_TIMER_MERGE_POLYMESHDETAIL,		"- Merge Polymesh Details", pc);
-	ctx.log(RC_LOG_PROGRESS, "=== TOTAL:\t%.2fms", totalTimeUsec/1000.0f);
-}
-
diff --git a/extern/recastnavigation/Detour/CMakeLists.txt b/extern/recastnavigation/Detour/CMakeLists.txt
deleted file mode 100644
index 5cb47ec0e2..0000000000
--- a/extern/recastnavigation/Detour/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-file(GLOB SOURCES Source/*.cpp)
-add_library(Detour ${SOURCES})
-
-add_library(RecastNavigation::Detour ALIAS Detour)
-set_target_properties(Detour PROPERTIES DEBUG_POSTFIX -d)
-
-set(Detour_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Include")
-
-target_include_directories(Detour PUBLIC
-    "$<BUILD_INTERFACE:${Detour_INCLUDE_DIR}>"
-)
-
-set_target_properties(Detour PROPERTIES
-        SOVERSION ${SOVERSION}
-        VERSION ${VERSION}
-        COMPILE_PDB_OUTPUT_DIRECTORY .
-        COMPILE_PDB_NAME "Detour-d"
-        )
-
-install(TARGETS Detour
-        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        COMPONENT library
-        )
-
-file(GLOB INCLUDES Include/*.h)
-install(FILES ${INCLUDES} DESTINATION
-    ${CMAKE_INSTALL_INCLUDEDIR}/recastnavigation)
-install(FILES "$<TARGET_FILE_DIR:Detour>/Detour-d.pdb" CONFIGURATIONS "Debug" DESTINATION "lib") 
diff --git a/extern/recastnavigation/Detour/Include/DetourAlloc.h b/extern/recastnavigation/Detour/Include/DetourAlloc.h
deleted file mode 100644
index f87b454acb..0000000000
--- a/extern/recastnavigation/Detour/Include/DetourAlloc.h
+++ /dev/null
@@ -1,61 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef DETOURALLOCATOR_H
-#define DETOURALLOCATOR_H
-
-#include <stddef.h>
-
-/// Provides hint values to the memory allocator on how long the
-/// memory is expected to be used.
-enum dtAllocHint
-{
-	DT_ALLOC_PERM,		///< Memory persist after a function call.
-	DT_ALLOC_TEMP		///< Memory used temporarily within a function.
-};
-
-/// A memory allocation function.
-//  @param[in]		size			The size, in bytes of memory, to allocate.
-//  @param[in]		rcAllocHint	A hint to the allocator on how long the memory is expected to be in use.
-//  @return A pointer to the beginning of the allocated memory block, or null if the allocation failed.
-///  @see dtAllocSetCustom
-typedef void* (dtAllocFunc)(size_t size, dtAllocHint hint);
-
-/// A memory deallocation function.
-///  @param[in]		ptr		A pointer to a memory block previously allocated using #dtAllocFunc.
-/// @see dtAllocSetCustom
-typedef void (dtFreeFunc)(void* ptr);
-
-/// Sets the base custom allocation functions to be used by Detour.
-///  @param[in]		allocFunc	The memory allocation function to be used by #dtAlloc
-///  @param[in]		freeFunc	The memory de-allocation function to be used by #dtFree
-void dtAllocSetCustom(dtAllocFunc *allocFunc, dtFreeFunc *freeFunc);
-
-/// Allocates a memory block.
-///  @param[in]		size	The size, in bytes of memory, to allocate.
-///  @param[in]		hint	A hint to the allocator on how long the memory is expected to be in use.
-///  @return A pointer to the beginning of the allocated memory block, or null if the allocation failed.
-/// @see dtFree
-void* dtAlloc(size_t size, dtAllocHint hint);
-
-/// Deallocates a memory block.
-///  @param[in]		ptr		A pointer to a memory block previously allocated using #dtAlloc.
-/// @see dtAlloc
-void dtFree(void* ptr);
-
-#endif
diff --git a/extern/recastnavigation/Detour/Include/DetourAssert.h b/extern/recastnavigation/Detour/Include/DetourAssert.h
deleted file mode 100644
index e05fd66fa5..0000000000
--- a/extern/recastnavigation/Detour/Include/DetourAssert.h
+++ /dev/null
@@ -1,56 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef DETOURASSERT_H
-#define DETOURASSERT_H
-
-// Note: This header file's only purpose is to include define assert.
-// Feel free to change the file and include your own implementation instead.
-
-#ifdef NDEBUG
-
-// From http://cnicholson.net/2009/02/stupid-c-tricks-adventures-in-assert/
-#	define dtAssert(x) do { (void)sizeof(x); } while((void)(__LINE__==-1),false)  
-
-#else
-
-/// An assertion failure function.
-//  @param[in]		expression  asserted expression.
-//  @param[in]		file  Filename of the failed assertion.
-//  @param[in]		line  Line number of the failed assertion.
-///  @see dtAssertFailSetCustom
-typedef void (dtAssertFailFunc)(const char* expression, const char* file, int line);
-
-/// Sets the base custom assertion failure function to be used by Detour.
-///  @param[in]		assertFailFunc	The function to be invoked in case of failure of #dtAssert
-void dtAssertFailSetCustom(dtAssertFailFunc *assertFailFunc);
-
-/// Gets the base custom assertion failure function to be used by Detour.
-dtAssertFailFunc* dtAssertFailGetCustom();
-
-#	include <assert.h> 
-#	define dtAssert(expression) \
-		{ \
-			dtAssertFailFunc* failFunc = dtAssertFailGetCustom(); \
-			if(failFunc == NULL) { assert(expression); } \
-			else if(!(expression)) { (*failFunc)(#expression, __FILE__, __LINE__); } \
-		}
-
-#endif
-
-#endif // DETOURASSERT_H
diff --git a/extern/recastnavigation/Detour/Include/DetourCommon.h b/extern/recastnavigation/Detour/Include/DetourCommon.h
deleted file mode 100644
index 113e8c3361..0000000000
--- a/extern/recastnavigation/Detour/Include/DetourCommon.h
+++ /dev/null
@@ -1,572 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef DETOURCOMMON_H
-#define DETOURCOMMON_H
-
-#include "DetourMath.h"
-#include <stddef.h>
-
-/**
-@defgroup detour Detour
-
-Members in this module are used to create, manipulate, and query navigation 
-meshes.
-
-@note This is a summary list of members.  Use the index or search 
-feature to find minor members.
-*/
-
-/// @name General helper functions
-/// @{
-
-/// Used to ignore a function parameter.  VS complains about unused parameters
-/// and this silences the warning.
-///  @param [in] _ Unused parameter
-template<class T> void dtIgnoreUnused(const T&) { }
-
-/// Swaps the values of the two parameters.
-///  @param[in,out]	a	Value A
-///  @param[in,out]	b	Value B
-template<class T> inline void dtSwap(T& a, T& b) { T t = a; a = b; b = t; }
-
-/// Returns the minimum of two values.
-///  @param[in]		a	Value A
-///  @param[in]		b	Value B
-///  @return The minimum of the two values.
-template<class T> inline T dtMin(T a, T b) { return a < b ? a : b; }
-
-/// Returns the maximum of two values.
-///  @param[in]		a	Value A
-///  @param[in]		b	Value B
-///  @return The maximum of the two values.
-template<class T> inline T dtMax(T a, T b) { return a > b ? a : b; }
-
-/// Returns the absolute value.
-///  @param[in]		a	The value.
-///  @return The absolute value of the specified value.
-template<class T> inline T dtAbs(T a) { return a < 0 ? -a : a; }
-
-/// Returns the square of the value.
-///  @param[in]		a	The value.
-///  @return The square of the value.
-template<class T> inline T dtSqr(T a) { return a*a; }
-
-/// Clamps the value to the specified range.
-///  @param[in]		v	The value to clamp.
-///  @param[in]		mn	The minimum permitted return value.
-///  @param[in]		mx	The maximum permitted return value.
-///  @return The value, clamped to the specified range.
-template<class T> inline T dtClamp(T v, T mn, T mx) { return v < mn ? mn : (v > mx ? mx : v); }
-
-/// @}
-/// @name Vector helper functions.
-/// @{
-
-/// Derives the cross product of two vectors. (@p v1 x @p v2)
-///  @param[out]	dest	The cross product. [(x, y, z)]
-///  @param[in]		v1		A Vector [(x, y, z)]
-///  @param[in]		v2		A vector [(x, y, z)]
-inline void dtVcross(float* dest, const float* v1, const float* v2)
-{
-	dest[0] = v1[1]*v2[2] - v1[2]*v2[1];
-	dest[1] = v1[2]*v2[0] - v1[0]*v2[2];
-	dest[2] = v1[0]*v2[1] - v1[1]*v2[0]; 
-}
-
-/// Derives the dot product of two vectors. (@p v1 . @p v2)
-///  @param[in]		v1	A Vector [(x, y, z)]
-///  @param[in]		v2	A vector [(x, y, z)]
-/// @return The dot product.
-inline float dtVdot(const float* v1, const float* v2)
-{
-	return v1[0]*v2[0] + v1[1]*v2[1] + v1[2]*v2[2];
-}
-
-/// Performs a scaled vector addition. (@p v1 + (@p v2 * @p s))
-///  @param[out]	dest	The result vector. [(x, y, z)]
-///  @param[in]		v1		The base vector. [(x, y, z)]
-///  @param[in]		v2		The vector to scale and add to @p v1. [(x, y, z)]
-///  @param[in]		s		The amount to scale @p v2 by before adding to @p v1.
-inline void dtVmad(float* dest, const float* v1, const float* v2, const float s)
-{
-	dest[0] = v1[0]+v2[0]*s;
-	dest[1] = v1[1]+v2[1]*s;
-	dest[2] = v1[2]+v2[2]*s;
-}
-
-/// Performs a linear interpolation between two vectors. (@p v1 toward @p v2)
-///  @param[out]	dest	The result vector. [(x, y, x)]
-///  @param[in]		v1		The starting vector.
-///  @param[in]		v2		The destination vector.
-///	 @param[in]		t		The interpolation factor. [Limits: 0 <= value <= 1.0]
-inline void dtVlerp(float* dest, const float* v1, const float* v2, const float t)
-{
-	dest[0] = v1[0]+(v2[0]-v1[0])*t;
-	dest[1] = v1[1]+(v2[1]-v1[1])*t;
-	dest[2] = v1[2]+(v2[2]-v1[2])*t;
-}
-
-/// Performs a vector addition. (@p v1 + @p v2)
-///  @param[out]	dest	The result vector. [(x, y, z)]
-///  @param[in]		v1		The base vector. [(x, y, z)]
-///  @param[in]		v2		The vector to add to @p v1. [(x, y, z)]
-inline void dtVadd(float* dest, const float* v1, const float* v2)
-{
-	dest[0] = v1[0]+v2[0];
-	dest[1] = v1[1]+v2[1];
-	dest[2] = v1[2]+v2[2];
-}
-
-/// Performs a vector subtraction. (@p v1 - @p v2)
-///  @param[out]	dest	The result vector. [(x, y, z)]
-///  @param[in]		v1		The base vector. [(x, y, z)]
-///  @param[in]		v2		The vector to subtract from @p v1. [(x, y, z)]
-inline void dtVsub(float* dest, const float* v1, const float* v2)
-{
-	dest[0] = v1[0]-v2[0];
-	dest[1] = v1[1]-v2[1];
-	dest[2] = v1[2]-v2[2];
-}
-
-/// Scales the vector by the specified value. (@p v * @p t)
-///  @param[out]	dest	The result vector. [(x, y, z)]
-///  @param[in]		v		The vector to scale. [(x, y, z)]
-///  @param[in]		t		The scaling factor.
-inline void dtVscale(float* dest, const float* v, const float t)
-{
-	dest[0] = v[0]*t;
-	dest[1] = v[1]*t;
-	dest[2] = v[2]*t;
-}
-
-/// Selects the minimum value of each element from the specified vectors.
-///  @param[in,out]	mn	A vector.  (Will be updated with the result.) [(x, y, z)]
-///  @param[in]	v	A vector. [(x, y, z)]
-inline void dtVmin(float* mn, const float* v)
-{
-	mn[0] = dtMin(mn[0], v[0]);
-	mn[1] = dtMin(mn[1], v[1]);
-	mn[2] = dtMin(mn[2], v[2]);
-}
-
-/// Selects the maximum value of each element from the specified vectors.
-///  @param[in,out]	mx	A vector.  (Will be updated with the result.) [(x, y, z)]
-///  @param[in]		v	A vector. [(x, y, z)]
-inline void dtVmax(float* mx, const float* v)
-{
-	mx[0] = dtMax(mx[0], v[0]);
-	mx[1] = dtMax(mx[1], v[1]);
-	mx[2] = dtMax(mx[2], v[2]);
-}
-
-/// Sets the vector elements to the specified values.
-///  @param[out]	dest	The result vector. [(x, y, z)]
-///  @param[in]		x		The x-value of the vector.
-///  @param[in]		y		The y-value of the vector.
-///  @param[in]		z		The z-value of the vector.
-inline void dtVset(float* dest, const float x, const float y, const float z)
-{
-	dest[0] = x; dest[1] = y; dest[2] = z;
-}
-
-/// Performs a vector copy.
-///  @param[out]	dest	The result. [(x, y, z)]
-///  @param[in]		a		The vector to copy. [(x, y, z)]
-inline void dtVcopy(float* dest, const float* a)
-{
-	dest[0] = a[0];
-	dest[1] = a[1];
-	dest[2] = a[2];
-}
-
-/// Derives the scalar length of the vector.
-///  @param[in]		v The vector. [(x, y, z)]
-/// @return The scalar length of the vector.
-inline float dtVlen(const float* v)
-{
-	return dtMathSqrtf(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]);
-}
-
-/// Derives the square of the scalar length of the vector. (len * len)
-///  @param[in]		v The vector. [(x, y, z)]
-/// @return The square of the scalar length of the vector.
-inline float dtVlenSqr(const float* v)
-{
-	return v[0]*v[0] + v[1]*v[1] + v[2]*v[2];
-}
-
-/// Returns the distance between two points.
-///  @param[in]		v1	A point. [(x, y, z)]
-///  @param[in]		v2	A point. [(x, y, z)]
-/// @return The distance between the two points.
-inline float dtVdist(const float* v1, const float* v2)
-{
-	const float dx = v2[0] - v1[0];
-	const float dy = v2[1] - v1[1];
-	const float dz = v2[2] - v1[2];
-	return dtMathSqrtf(dx*dx + dy*dy + dz*dz);
-}
-
-/// Returns the square of the distance between two points.
-///  @param[in]		v1	A point. [(x, y, z)]
-///  @param[in]		v2	A point. [(x, y, z)]
-/// @return The square of the distance between the two points.
-inline float dtVdistSqr(const float* v1, const float* v2)
-{
-	const float dx = v2[0] - v1[0];
-	const float dy = v2[1] - v1[1];
-	const float dz = v2[2] - v1[2];
-	return dx*dx + dy*dy + dz*dz;
-}
-
-/// Derives the distance between the specified points on the xz-plane.
-///  @param[in]		v1	A point. [(x, y, z)]
-///  @param[in]		v2	A point. [(x, y, z)]
-/// @return The distance between the point on the xz-plane.
-///
-/// The vectors are projected onto the xz-plane, so the y-values are ignored.
-inline float dtVdist2D(const float* v1, const float* v2)
-{
-	const float dx = v2[0] - v1[0];
-	const float dz = v2[2] - v1[2];
-	return dtMathSqrtf(dx*dx + dz*dz);
-}
-
-/// Derives the square of the distance between the specified points on the xz-plane.
-///  @param[in]		v1	A point. [(x, y, z)]
-///  @param[in]		v2	A point. [(x, y, z)]
-/// @return The square of the distance between the point on the xz-plane.
-inline float dtVdist2DSqr(const float* v1, const float* v2)
-{
-	const float dx = v2[0] - v1[0];
-	const float dz = v2[2] - v1[2];
-	return dx*dx + dz*dz;
-}
-
-/// Normalizes the vector.
-///  @param[in,out]	v	The vector to normalize. [(x, y, z)]
-inline void dtVnormalize(float* v)
-{
-	float d = 1.0f / dtMathSqrtf(dtSqr(v[0]) + dtSqr(v[1]) + dtSqr(v[2]));
-	v[0] *= d;
-	v[1] *= d;
-	v[2] *= d;
-}
-
-/// Performs a 'sloppy' colocation check of the specified points.
-///  @param[in]		p0	A point. [(x, y, z)]
-///  @param[in]		p1	A point. [(x, y, z)]
-/// @return True if the points are considered to be at the same location.
-///
-/// Basically, this function will return true if the specified points are 
-/// close enough to eachother to be considered colocated.
-inline bool dtVequal(const float* p0, const float* p1)
-{
-	static const float thr = dtSqr(1.0f/16384.0f);
-	const float d = dtVdistSqr(p0, p1);
-	return d < thr;
-}
-
-/// Checks that the specified vector's components are all finite.
-///  @param[in]		v	A point. [(x, y, z)]
-/// @return True if all of the point's components are finite, i.e. not NaN
-/// or any of the infinities.
-inline bool dtVisfinite(const float* v)
-{
-	bool result =
-		dtMathIsfinite(v[0]) &&
-		dtMathIsfinite(v[1]) &&
-		dtMathIsfinite(v[2]);
-
-	return result;
-}
-
-/// Checks that the specified vector's 2D components are finite.
-///  @param[in]		v	A point. [(x, y, z)]
-inline bool dtVisfinite2D(const float* v)
-{
-	bool result = dtMathIsfinite(v[0]) && dtMathIsfinite(v[2]);
-	return result;
-}
-
-/// Derives the dot product of two vectors on the xz-plane. (@p u . @p v)
-///  @param[in]		u		A vector [(x, y, z)]
-///  @param[in]		v		A vector [(x, y, z)]
-/// @return The dot product on the xz-plane.
-///
-/// The vectors are projected onto the xz-plane, so the y-values are ignored.
-inline float dtVdot2D(const float* u, const float* v)
-{
-	return u[0]*v[0] + u[2]*v[2];
-}
-
-/// Derives the xz-plane 2D perp product of the two vectors. (uz*vx - ux*vz)
-///  @param[in]		u		The LHV vector [(x, y, z)]
-///  @param[in]		v		The RHV vector [(x, y, z)]
-/// @return The dot product on the xz-plane.
-///
-/// The vectors are projected onto the xz-plane, so the y-values are ignored.
-inline float dtVperp2D(const float* u, const float* v)
-{
-	return u[2]*v[0] - u[0]*v[2];
-}
-
-/// @}
-/// @name Computational geometry helper functions.
-/// @{
-
-/// Derives the signed xz-plane area of the triangle ABC, or the relationship of line AB to point C.
-///  @param[in]		a		Vertex A. [(x, y, z)]
-///  @param[in]		b		Vertex B. [(x, y, z)]
-///  @param[in]		c		Vertex C. [(x, y, z)]
-/// @return The signed xz-plane area of the triangle.
-inline float dtTriArea2D(const float* a, const float* b, const float* c)
-{
-	const float abx = b[0] - a[0];
-	const float abz = b[2] - a[2];
-	const float acx = c[0] - a[0];
-	const float acz = c[2] - a[2];
-	return acx*abz - abx*acz;
-}
-
-/// Determines if two axis-aligned bounding boxes overlap.
-///  @param[in]		amin	Minimum bounds of box A. [(x, y, z)]
-///  @param[in]		amax	Maximum bounds of box A. [(x, y, z)]
-///  @param[in]		bmin	Minimum bounds of box B. [(x, y, z)]
-///  @param[in]		bmax	Maximum bounds of box B. [(x, y, z)]
-/// @return True if the two AABB's overlap.
-/// @see dtOverlapBounds
-inline bool dtOverlapQuantBounds(const unsigned short amin[3], const unsigned short amax[3],
-								 const unsigned short bmin[3], const unsigned short bmax[3])
-{
-	bool overlap = true;
-	overlap = (amin[0] > bmax[0] || amax[0] < bmin[0]) ? false : overlap;
-	overlap = (amin[1] > bmax[1] || amax[1] < bmin[1]) ? false : overlap;
-	overlap = (amin[2] > bmax[2] || amax[2] < bmin[2]) ? false : overlap;
-	return overlap;
-}
-
-/// Determines if two axis-aligned bounding boxes overlap.
-///  @param[in]		amin	Minimum bounds of box A. [(x, y, z)]
-///  @param[in]		amax	Maximum bounds of box A. [(x, y, z)]
-///  @param[in]		bmin	Minimum bounds of box B. [(x, y, z)]
-///  @param[in]		bmax	Maximum bounds of box B. [(x, y, z)]
-/// @return True if the two AABB's overlap.
-/// @see dtOverlapQuantBounds
-inline bool dtOverlapBounds(const float* amin, const float* amax,
-							const float* bmin, const float* bmax)
-{
-	bool overlap = true;
-	overlap = (amin[0] > bmax[0] || amax[0] < bmin[0]) ? false : overlap;
-	overlap = (amin[1] > bmax[1] || amax[1] < bmin[1]) ? false : overlap;
-	overlap = (amin[2] > bmax[2] || amax[2] < bmin[2]) ? false : overlap;
-	return overlap;
-}
-
-/// Derives the closest point on a triangle from the specified reference point.
-///  @param[out]	closest	The closest point on the triangle.	
-///  @param[in]		p		The reference point from which to test. [(x, y, z)]
-///  @param[in]		a		Vertex A of triangle ABC. [(x, y, z)]
-///  @param[in]		b		Vertex B of triangle ABC. [(x, y, z)]
-///  @param[in]		c		Vertex C of triangle ABC. [(x, y, z)]
-void dtClosestPtPointTriangle(float* closest, const float* p,
-							  const float* a, const float* b, const float* c);
-
-/// Derives the y-axis height of the closest point on the triangle from the specified reference point.
-///  @param[in]		p		The reference point from which to test. [(x, y, z)]
-///  @param[in]		a		Vertex A of triangle ABC. [(x, y, z)]
-///  @param[in]		b		Vertex B of triangle ABC. [(x, y, z)]
-///  @param[in]		c		Vertex C of triangle ABC. [(x, y, z)]
-///  @param[out]	h		The resulting height.
-bool dtClosestHeightPointTriangle(const float* p, const float* a, const float* b, const float* c, float& h);
-
-bool dtIntersectSegmentPoly2D(const float* p0, const float* p1,
-							  const float* verts, int nverts,
-							  float& tmin, float& tmax,
-							  int& segMin, int& segMax);
-
-bool dtIntersectSegSeg2D(const float* ap, const float* aq,
-						 const float* bp, const float* bq,
-						 float& s, float& t);
-
-/// Determines if the specified point is inside the convex polygon on the xz-plane.
-///  @param[in]		pt		The point to check. [(x, y, z)]
-///  @param[in]		verts	The polygon vertices. [(x, y, z) * @p nverts]
-///  @param[in]		nverts	The number of vertices. [Limit: >= 3]
-/// @return True if the point is inside the polygon.
-bool dtPointInPolygon(const float* pt, const float* verts, const int nverts);
-
-bool dtDistancePtPolyEdgesSqr(const float* pt, const float* verts, const int nverts,
-							float* ed, float* et);
-
-float dtDistancePtSegSqr2D(const float* pt, const float* p, const float* q, float& t);
-
-/// Derives the centroid of a convex polygon.
-///  @param[out]	tc		The centroid of the polgyon. [(x, y, z)]
-///  @param[in]		idx		The polygon indices. [(vertIndex) * @p nidx]
-///  @param[in]		nidx	The number of indices in the polygon. [Limit: >= 3]
-///  @param[in]		verts	The polygon vertices. [(x, y, z) * vertCount]
-void dtCalcPolyCenter(float* tc, const unsigned short* idx, int nidx, const float* verts);
-
-/// Determines if the two convex polygons overlap on the xz-plane.
-///  @param[in]		polya		Polygon A vertices.	[(x, y, z) * @p npolya]
-///  @param[in]		npolya		The number of vertices in polygon A.
-///  @param[in]		polyb		Polygon B vertices.	[(x, y, z) * @p npolyb]
-///  @param[in]		npolyb		The number of vertices in polygon B.
-/// @return True if the two polygons overlap.
-bool dtOverlapPolyPoly2D(const float* polya, const int npolya,
-						 const float* polyb, const int npolyb);
-
-/// @}
-/// @name Miscellanious functions.
-/// @{
-
-inline unsigned int dtNextPow2(unsigned int v)
-{
-	v--;
-	v |= v >> 1;
-	v |= v >> 2;
-	v |= v >> 4;
-	v |= v >> 8;
-	v |= v >> 16;
-	v++;
-	return v;
-}
-
-inline unsigned int dtIlog2(unsigned int v)
-{
-	unsigned int r;
-	unsigned int shift;
-	r = (v > 0xffff) << 4; v >>= r;
-	shift = (v > 0xff) << 3; v >>= shift; r |= shift;
-	shift = (v > 0xf) << 2; v >>= shift; r |= shift;
-	shift = (v > 0x3) << 1; v >>= shift; r |= shift;
-	r |= (v >> 1);
-	return r;
-}
-
-inline int dtAlign4(int x) { return (x+3) & ~3; }
-
-inline int dtOppositeTile(int side) { return (side+4) & 0x7; }
-
-inline void dtSwapByte(unsigned char* a, unsigned char* b)
-{
-	unsigned char tmp = *a;
-	*a = *b;
-	*b = tmp;
-}
-
-inline void dtSwapEndian(unsigned short* v)
-{
-	unsigned char* x = (unsigned char*)v;
-	dtSwapByte(x+0, x+1);
-}
-
-inline void dtSwapEndian(short* v)
-{
-	unsigned char* x = (unsigned char*)v;
-	dtSwapByte(x+0, x+1);
-}
-
-inline void dtSwapEndian(unsigned int* v)
-{
-	unsigned char* x = (unsigned char*)v;
-	dtSwapByte(x+0, x+3); dtSwapByte(x+1, x+2);
-}
-
-inline void dtSwapEndian(int* v)
-{
-	unsigned char* x = (unsigned char*)v;
-	dtSwapByte(x+0, x+3); dtSwapByte(x+1, x+2);
-}
-
-inline void dtSwapEndian(float* v)
-{
-	unsigned char* x = (unsigned char*)v;
-	dtSwapByte(x+0, x+3); dtSwapByte(x+1, x+2);
-}
-
-void dtRandomPointInConvexPoly(const float* pts, const int npts, float* areas,
-							   const float s, const float t, float* out);
-
-template<typename TypeToRetrieveAs>
-TypeToRetrieveAs* dtGetThenAdvanceBufferPointer(const unsigned char*& buffer, const size_t distanceToAdvance)
-{
-	TypeToRetrieveAs* returnPointer = reinterpret_cast<TypeToRetrieveAs*>(buffer);
-	buffer += distanceToAdvance;
-	return returnPointer;
-}
-
-template<typename TypeToRetrieveAs>
-TypeToRetrieveAs* dtGetThenAdvanceBufferPointer(unsigned char*& buffer, const size_t distanceToAdvance)
-{
-	TypeToRetrieveAs* returnPointer = reinterpret_cast<TypeToRetrieveAs*>(buffer);
-	buffer += distanceToAdvance;
-	return returnPointer;
-}
-
-
-/// @}
-
-#endif // DETOURCOMMON_H
-
-///////////////////////////////////////////////////////////////////////////
-
-// This section contains detailed documentation for members that don't have
-// a source file. It reduces clutter in the main section of the header.
-
-/**
-
-@fn float dtTriArea2D(const float* a, const float* b, const float* c)
-@par
-
-The vertices are projected onto the xz-plane, so the y-values are ignored.
-
-This is a low cost function than can be used for various purposes.  Its main purpose
-is for point/line relationship testing.
-
-In all cases: A value of zero indicates that all vertices are collinear or represent the same point.
-(On the xz-plane.)
-
-When used for point/line relationship tests, AB usually represents a line against which
-the C point is to be tested.  In this case:
-
-A positive value indicates that point C is to the left of line AB, looking from A toward B.<br/>
-A negative value indicates that point C is to the right of lineAB, looking from A toward B.
-
-When used for evaluating a triangle:
-
-The absolute value of the return value is two times the area of the triangle when it is
-projected onto the xz-plane.
-
-A positive return value indicates:
-
-<ul>
-<li>The vertices are wrapped in the normal Detour wrap direction.</li>
-<li>The triangle's 3D face normal is in the general up direction.</li>
-</ul>
-
-A negative return value indicates:
-
-<ul>
-<li>The vertices are reverse wrapped. (Wrapped opposite the normal Detour wrap direction.)</li>
-<li>The triangle's 3D face normal is in the general down direction.</li>
-</ul>
-
-*/
diff --git a/extern/recastnavigation/Detour/Include/DetourMath.h b/extern/recastnavigation/Detour/Include/DetourMath.h
deleted file mode 100644
index 54af8af095..0000000000
--- a/extern/recastnavigation/Detour/Include/DetourMath.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
-@defgroup detour Detour
-
-Members in this module are wrappers around the standard math library
-*/
-
-#ifndef DETOURMATH_H
-#define DETOURMATH_H
-
-#include <math.h>
-// This include is required because libstdc++ has problems with isfinite
-// if cmath is included before math.h.
-#include <cmath>
-
-inline float dtMathFabsf(float x) { return fabsf(x); }
-inline float dtMathSqrtf(float x) { return sqrtf(x); }
-inline float dtMathFloorf(float x) { return floorf(x); }
-inline float dtMathCeilf(float x) { return ceilf(x); }
-inline float dtMathCosf(float x) { return cosf(x); }
-inline float dtMathSinf(float x) { return sinf(x); }
-inline float dtMathAtan2f(float y, float x) { return atan2f(y, x); }
-inline bool dtMathIsfinite(float x) { return std::isfinite(x); }
-
-#endif
diff --git a/extern/recastnavigation/Detour/Include/DetourNavMesh.h b/extern/recastnavigation/Detour/Include/DetourNavMesh.h
deleted file mode 100644
index caf77eb1b3..0000000000
--- a/extern/recastnavigation/Detour/Include/DetourNavMesh.h
+++ /dev/null
@@ -1,785 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef DETOURNAVMESH_H
-#define DETOURNAVMESH_H
-
-#include "DetourAlloc.h"
-#include "DetourStatus.h"
-
-// Undefine (or define in a build cofnig) the following line to use 64bit polyref.
-// Generally not needed, useful for very large worlds.
-// Note: tiles build using 32bit refs are not compatible with 64bit refs!
-//#define DT_POLYREF64 1
-
-#ifdef DT_POLYREF64
-// TODO: figure out a multiplatform version of uint64_t
-// - maybe: https://code.google.com/p/msinttypes/
-// - or: http://www.azillionmonkeys.com/qed/pstdint.h
-#include <stdint.h>
-#endif
-
-// Note: If you want to use 64-bit refs, change the types of both dtPolyRef & dtTileRef.
-// It is also recommended that you change dtHashRef() to a proper 64-bit hash.
-
-/// A handle to a polygon within a navigation mesh tile.
-/// @ingroup detour
-#ifdef DT_POLYREF64
-static const unsigned int DT_SALT_BITS = 16;
-static const unsigned int DT_TILE_BITS = 28;
-static const unsigned int DT_POLY_BITS = 20;
-typedef uint64_t dtPolyRef;
-#else
-typedef unsigned int dtPolyRef;
-#endif
-
-/// A handle to a tile within a navigation mesh.
-/// @ingroup detour
-#ifdef DT_POLYREF64
-typedef uint64_t dtTileRef;
-#else
-typedef unsigned int dtTileRef;
-#endif
-
-/// The maximum number of vertices per navigation polygon.
-/// @ingroup detour
-static const int DT_VERTS_PER_POLYGON = 6;
-
-/// @{
-/// @name Tile Serialization Constants
-/// These constants are used to detect whether a navigation tile's data
-/// and state format is compatible with the current build.
-///
-
-/// A magic number used to detect compatibility of navigation tile data.
-static const int DT_NAVMESH_MAGIC = 'D'<<24 | 'N'<<16 | 'A'<<8 | 'V';
-
-/// A version number used to detect compatibility of navigation tile data.
-static const int DT_NAVMESH_VERSION = 7;
-
-/// A magic number used to detect the compatibility of navigation tile states.
-static const int DT_NAVMESH_STATE_MAGIC = 'D'<<24 | 'N'<<16 | 'M'<<8 | 'S';
-
-/// A version number used to detect compatibility of navigation tile states.
-static const int DT_NAVMESH_STATE_VERSION = 1;
-
-/// @}
-
-/// A flag that indicates that an entity links to an external entity.
-/// (E.g. A polygon edge is a portal that links to another polygon.)
-static const unsigned short DT_EXT_LINK = 0x8000;
-
-/// A value that indicates the entity does not link to anything.
-static const unsigned int DT_NULL_LINK = 0xffffffff;
-
-/// A flag that indicates that an off-mesh connection can be traversed in both directions. (Is bidirectional.)
-static const unsigned int DT_OFFMESH_CON_BIDIR = 1;
-
-/// The maximum number of user defined area ids.
-/// @ingroup detour
-static const int DT_MAX_AREAS = 64;
-
-/// Tile flags used for various functions and fields.
-/// For an example, see dtNavMesh::addTile().
-enum dtTileFlags
-{
-	/// The navigation mesh owns the tile memory and is responsible for freeing it.
-	DT_TILE_FREE_DATA = 0x01,
-};
-
-/// Vertex flags returned by dtNavMeshQuery::findStraightPath.
-enum dtStraightPathFlags
-{
-	DT_STRAIGHTPATH_START = 0x01,				///< The vertex is the start position in the path.
-	DT_STRAIGHTPATH_END = 0x02,					///< The vertex is the end position in the path.
-	DT_STRAIGHTPATH_OFFMESH_CONNECTION = 0x04,	///< The vertex is the start of an off-mesh connection.
-};
-
-/// Options for dtNavMeshQuery::findStraightPath.
-enum dtStraightPathOptions
-{
-	DT_STRAIGHTPATH_AREA_CROSSINGS = 0x01,	///< Add a vertex at every polygon edge crossing where area changes.
-	DT_STRAIGHTPATH_ALL_CROSSINGS = 0x02,	///< Add a vertex at every polygon edge crossing.
-};
-
-
-/// Options for dtNavMeshQuery::initSlicedFindPath and updateSlicedFindPath
-enum dtFindPathOptions
-{
-	DT_FINDPATH_ANY_ANGLE	= 0x02,		///< use raycasts during pathfind to "shortcut" (raycast still consider costs)
-};
-
-/// Options for dtNavMeshQuery::raycast
-enum dtRaycastOptions
-{
-	DT_RAYCAST_USE_COSTS = 0x01,		///< Raycast should calculate movement cost along the ray and fill RaycastHit::cost
-};
-
-enum dtDetailTriEdgeFlags
-{
-	DT_DETAIL_EDGE_BOUNDARY = 0x01,		///< Detail triangle edge is part of the poly boundary
-};
-
-
-/// Limit raycasting during any angle pahfinding
-/// The limit is given as a multiple of the character radius
-static const float DT_RAY_CAST_LIMIT_PROPORTIONS = 50.0f;
-
-/// Flags representing the type of a navigation mesh polygon.
-enum dtPolyTypes
-{
-	/// The polygon is a standard convex polygon that is part of the surface of the mesh.
-	DT_POLYTYPE_GROUND = 0,
-	/// The polygon is an off-mesh connection consisting of two vertices.
-	DT_POLYTYPE_OFFMESH_CONNECTION = 1,
-};
-
-
-/// Defines a polygon within a dtMeshTile object.
-/// @ingroup detour
-struct dtPoly
-{
-	/// Index to first link in linked list. (Or #DT_NULL_LINK if there is no link.)
-	unsigned int firstLink;
-
-	/// The indices of the polygon's vertices.
-	/// The actual vertices are located in dtMeshTile::verts.
-	unsigned short verts[DT_VERTS_PER_POLYGON];
-
-	/// Packed data representing neighbor polygons references and flags for each edge.
-	unsigned short neis[DT_VERTS_PER_POLYGON];
-
-	/// The user defined polygon flags.
-	unsigned short flags;
-
-	/// The number of vertices in the polygon.
-	unsigned char vertCount;
-
-	/// The bit packed area id and polygon type.
-	/// @note Use the structure's set and get methods to acess this value.
-	unsigned char areaAndtype;
-
-	/// Sets the user defined area id. [Limit: < #DT_MAX_AREAS]
-	inline void setArea(unsigned char a) { areaAndtype = (areaAndtype & 0xc0) | (a & 0x3f); }
-
-	/// Sets the polygon type. (See: #dtPolyTypes.)
-	inline void setType(unsigned char t) { areaAndtype = (areaAndtype & 0x3f) | (t << 6); }
-
-	/// Gets the user defined area id.
-	inline unsigned char getArea() const { return areaAndtype & 0x3f; }
-
-	/// Gets the polygon type. (See: #dtPolyTypes)
-	inline unsigned char getType() const { return areaAndtype >> 6; }
-};
-
-/// Defines the location of detail sub-mesh data within a dtMeshTile.
-struct dtPolyDetail
-{
-	unsigned int vertBase;			///< The offset of the vertices in the dtMeshTile::detailVerts array.
-	unsigned int triBase;			///< The offset of the triangles in the dtMeshTile::detailTris array.
-	unsigned char vertCount;		///< The number of vertices in the sub-mesh.
-	unsigned char triCount;			///< The number of triangles in the sub-mesh.
-};
-
-/// Defines a link between polygons.
-/// @note This structure is rarely if ever used by the end user.
-/// @see dtMeshTile
-struct dtLink
-{
-	dtPolyRef ref;					///< Neighbour reference. (The neighbor that is linked to.)
-	unsigned int next;				///< Index of the next link.
-	unsigned char edge;				///< Index of the polygon edge that owns this link.
-	unsigned char side;				///< If a boundary link, defines on which side the link is.
-	unsigned char bmin;				///< If a boundary link, defines the minimum sub-edge area.
-	unsigned char bmax;				///< If a boundary link, defines the maximum sub-edge area.
-};
-
-/// Bounding volume node.
-/// @note This structure is rarely if ever used by the end user.
-/// @see dtMeshTile
-struct dtBVNode
-{
-	unsigned short bmin[3];			///< Minimum bounds of the node's AABB. [(x, y, z)]
-	unsigned short bmax[3];			///< Maximum bounds of the node's AABB. [(x, y, z)]
-	int i;							///< The node's index. (Negative for escape sequence.)
-};
-
-/// Defines an navigation mesh off-mesh connection within a dtMeshTile object.
-/// An off-mesh connection is a user defined traversable connection made up to two vertices.
-struct dtOffMeshConnection
-{
-	/// The endpoints of the connection. [(ax, ay, az, bx, by, bz)]
-	float pos[6];
-
-	/// The radius of the endpoints. [Limit: >= 0]
-	float rad;		
-
-	/// The polygon reference of the connection within the tile.
-	unsigned short poly;
-
-	/// Link flags. 
-	/// @note These are not the connection's user defined flags. Those are assigned via the 
-	/// connection's dtPoly definition. These are link flags used for internal purposes.
-	unsigned char flags;
-
-	/// End point side.
-	unsigned char side;
-
-	/// The id of the offmesh connection. (User assigned when the navigation mesh is built.)
-	unsigned int userId;
-};
-
-/// Provides high level information related to a dtMeshTile object.
-/// @ingroup detour
-struct dtMeshHeader
-{
-	int magic;				///< Tile magic number. (Used to identify the data format.)
-	int version;			///< Tile data format version number.
-	int x;					///< The x-position of the tile within the dtNavMesh tile grid. (x, y, layer)
-	int y;					///< The y-position of the tile within the dtNavMesh tile grid. (x, y, layer)
-	int layer;				///< The layer of the tile within the dtNavMesh tile grid. (x, y, layer)
-	unsigned int userId;	///< The user defined id of the tile.
-	int polyCount;			///< The number of polygons in the tile.
-	int vertCount;			///< The number of vertices in the tile.
-	int maxLinkCount;		///< The number of allocated links.
-	int detailMeshCount;	///< The number of sub-meshes in the detail mesh.
-	
-	/// The number of unique vertices in the detail mesh. (In addition to the polygon vertices.)
-	int detailVertCount;
-	
-	int detailTriCount;			///< The number of triangles in the detail mesh.
-	int bvNodeCount;			///< The number of bounding volume nodes. (Zero if bounding volumes are disabled.)
-	int offMeshConCount;		///< The number of off-mesh connections.
-	int offMeshBase;			///< The index of the first polygon which is an off-mesh connection.
-	float walkableHeight;		///< The height of the agents using the tile.
-	float walkableRadius;		///< The radius of the agents using the tile.
-	float walkableClimb;		///< The maximum climb height of the agents using the tile.
-	float bmin[3];				///< The minimum bounds of the tile's AABB. [(x, y, z)]
-	float bmax[3];				///< The maximum bounds of the tile's AABB. [(x, y, z)]
-	
-	/// The bounding volume quantization factor. 
-	float bvQuantFactor;
-};
-
-/// Defines a navigation mesh tile.
-/// @ingroup detour
-struct dtMeshTile
-{
-	unsigned int salt;					///< Counter describing modifications to the tile.
-
-	unsigned int linksFreeList;			///< Index to the next free link.
-	dtMeshHeader* header;				///< The tile header.
-	dtPoly* polys;						///< The tile polygons. [Size: dtMeshHeader::polyCount]
-	float* verts;						///< The tile vertices. [Size: dtMeshHeader::vertCount]
-	dtLink* links;						///< The tile links. [Size: dtMeshHeader::maxLinkCount]
-	dtPolyDetail* detailMeshes;			///< The tile's detail sub-meshes. [Size: dtMeshHeader::detailMeshCount]
-	
-	/// The detail mesh's unique vertices. [(x, y, z) * dtMeshHeader::detailVertCount]
-	float* detailVerts;	
-
-	/// The detail mesh's triangles. [(vertA, vertB, vertC, triFlags) * dtMeshHeader::detailTriCount].
-	/// See dtDetailTriEdgeFlags and dtGetDetailTriEdgeFlags.
-	unsigned char* detailTris;	
-
-	/// The tile bounding volume nodes. [Size: dtMeshHeader::bvNodeCount]
-	/// (Will be null if bounding volumes are disabled.)
-	dtBVNode* bvTree;
-
-	dtOffMeshConnection* offMeshCons;		///< The tile off-mesh connections. [Size: dtMeshHeader::offMeshConCount]
-		
-	unsigned char* data;					///< The tile data. (Not directly accessed under normal situations.)
-	int dataSize;							///< Size of the tile data.
-	int flags;								///< Tile flags. (See: #dtTileFlags)
-	dtMeshTile* next;						///< The next free tile, or the next tile in the spatial grid.
-// OpenMW code - make dtMeshTile POD since R&D init it by memset
-//private:
-//	dtMeshTile(const dtMeshTile&);
-//	dtMeshTile& operator=(const dtMeshTile&);
-};
-
-/// Get flags for edge in detail triangle.
-/// @param	triFlags[in]		The flags for the triangle (last component of detail vertices above).
-/// @param	edgeIndex[in]		The index of the first vertex of the edge. For instance, if 0,
-///								returns flags for edge AB.
-inline int dtGetDetailTriEdgeFlags(unsigned char triFlags, int edgeIndex)
-{
-	return (triFlags >> (edgeIndex * 2)) & 0x3;
-}
-
-/// Configuration parameters used to define multi-tile navigation meshes.
-/// The values are used to allocate space during the initialization of a navigation mesh.
-/// @see dtNavMesh::init()
-/// @ingroup detour
-struct dtNavMeshParams
-{
-	float orig[3];					///< The world space origin of the navigation mesh's tile space. [(x, y, z)]
-	float tileWidth;				///< The width of each tile. (Along the x-axis.)
-	float tileHeight;				///< The height of each tile. (Along the z-axis.)
-	int maxTiles;					///< The maximum number of tiles the navigation mesh can contain.
-	int maxPolys;					///< The maximum number of polygons each tile can contain.
-};
-
-/// A navigation mesh based on tiles of convex polygons.
-/// @ingroup detour
-class dtNavMesh
-{
-public:
-	dtNavMesh();
-	~dtNavMesh();
-
-	/// @{
-	/// @name Initialization and Tile Management
-
-	/// Initializes the navigation mesh for tiled use.
-	///  @param[in]	params		Initialization parameters.
-	/// @return The status flags for the operation.
-	dtStatus init(const dtNavMeshParams* params);
-
-	/// Initializes the navigation mesh for single tile use.
-	///  @param[in]	data		Data of the new tile. (See: #dtCreateNavMeshData)
-	///  @param[in]	dataSize	The data size of the new tile.
-	///  @param[in]	flags		The tile flags. (See: #dtTileFlags)
-	/// @return The status flags for the operation.
-	///  @see dtCreateNavMeshData
-	dtStatus init(unsigned char* data, const int dataSize, const int flags);
-	
-	/// The navigation mesh initialization params.
-	const dtNavMeshParams* getParams() const;
-
-	/// Adds a tile to the navigation mesh.
-	///  @param[in]		data		Data for the new tile mesh. (See: #dtCreateNavMeshData)
-	///  @param[in]		dataSize	Data size of the new tile mesh.
-	///  @param[in]		flags		Tile flags. (See: #dtTileFlags)
-	///  @param[in]		lastRef		The desired reference for the tile. (When reloading a tile.) [opt] [Default: 0]
-	///  @param[out]	result		The tile reference. (If the tile was succesfully added.) [opt]
-	/// @return The status flags for the operation.
-	dtStatus addTile(unsigned char* data, int dataSize, int flags, dtTileRef lastRef, dtTileRef* result);
-	
-	/// Removes the specified tile from the navigation mesh.
-	///  @param[in]		ref			The reference of the tile to remove.
-	///  @param[out]	data		Data associated with deleted tile.
-	///  @param[out]	dataSize	Size of the data associated with deleted tile.
-	/// @return The status flags for the operation.
-	dtStatus removeTile(dtTileRef ref, unsigned char** data, int* dataSize);
-
-	/// @}
-
-	/// @{
-	/// @name Query Functions
-
-	/// Calculates the tile grid location for the specified world position.
-	///  @param[in]	pos  The world position for the query. [(x, y, z)]
-	///  @param[out]	tx		The tile's x-location. (x, y)
-	///  @param[out]	ty		The tile's y-location. (x, y)
-	void calcTileLoc(const float* pos, int* tx, int* ty) const;
-
-	/// Gets the tile at the specified grid location.
-	///  @param[in]	x		The tile's x-location. (x, y, layer)
-	///  @param[in]	y		The tile's y-location. (x, y, layer)
-	///  @param[in]	layer	The tile's layer. (x, y, layer)
-	/// @return The tile, or null if the tile does not exist.
-	const dtMeshTile* getTileAt(const int x, const int y, const int layer) const;
-
-	/// Gets all tiles at the specified grid location. (All layers.)
-	///  @param[in]		x			The tile's x-location. (x, y)
-	///  @param[in]		y			The tile's y-location. (x, y)
-	///  @param[out]	tiles		A pointer to an array of tiles that will hold the result.
-	///  @param[in]		maxTiles	The maximum tiles the tiles parameter can hold.
-	/// @return The number of tiles returned in the tiles array.
-	int getTilesAt(const int x, const int y,
-				   dtMeshTile const** tiles, const int maxTiles) const;
-	
-	/// Gets the tile reference for the tile at specified grid location.
-	///  @param[in]	x		The tile's x-location. (x, y, layer)
-	///  @param[in]	y		The tile's y-location. (x, y, layer)
-	///  @param[in]	layer	The tile's layer. (x, y, layer)
-	/// @return The tile reference of the tile, or 0 if there is none.
-	dtTileRef getTileRefAt(int x, int y, int layer) const;
-
-	/// Gets the tile reference for the specified tile.
-	///  @param[in]	tile	The tile.
-	/// @return The tile reference of the tile.
-	dtTileRef getTileRef(const dtMeshTile* tile) const;
-
-	/// Gets the tile for the specified tile reference.
-	///  @param[in]	ref		The tile reference of the tile to retrieve.
-	/// @return The tile for the specified reference, or null if the 
-	///		reference is invalid.
-	const dtMeshTile* getTileByRef(dtTileRef ref) const;
-	
-	/// The maximum number of tiles supported by the navigation mesh.
-	/// @return The maximum number of tiles supported by the navigation mesh.
-	int getMaxTiles() const;
-	
-	/// Gets the tile at the specified index.
-	///  @param[in]	i		The tile index. [Limit: 0 >= index < #getMaxTiles()]
-	/// @return The tile at the specified index.
-	const dtMeshTile* getTile(int i) const;
-
-	/// Gets the tile and polygon for the specified polygon reference.
-	///  @param[in]		ref		The reference for the a polygon.
-	///  @param[out]	tile	The tile containing the polygon.
-	///  @param[out]	poly	The polygon.
-	/// @return The status flags for the operation.
-	dtStatus getTileAndPolyByRef(const dtPolyRef ref, const dtMeshTile** tile, const dtPoly** poly) const;
-	
-	/// Returns the tile and polygon for the specified polygon reference.
-	///  @param[in]		ref		A known valid reference for a polygon.
-	///  @param[out]	tile	The tile containing the polygon.
-	///  @param[out]	poly	The polygon.
-	void getTileAndPolyByRefUnsafe(const dtPolyRef ref, const dtMeshTile** tile, const dtPoly** poly) const;
-
-	/// Checks the validity of a polygon reference.
-	///  @param[in]	ref		The polygon reference to check.
-	/// @return True if polygon reference is valid for the navigation mesh.
-	bool isValidPolyRef(dtPolyRef ref) const;
-	
-	/// Gets the polygon reference for the tile's base polygon.
-	///  @param[in]	tile		The tile.
-	/// @return The polygon reference for the base polygon in the specified tile.
-	dtPolyRef getPolyRefBase(const dtMeshTile* tile) const;
-	
-	/// Gets the endpoints for an off-mesh connection, ordered by "direction of travel".
-	///  @param[in]		prevRef		The reference of the polygon before the connection.
-	///  @param[in]		polyRef		The reference of the off-mesh connection polygon.
-	///  @param[out]	startPos	The start position of the off-mesh connection. [(x, y, z)]
-	///  @param[out]	endPos		The end position of the off-mesh connection. [(x, y, z)]
-	/// @return The status flags for the operation.
-	dtStatus getOffMeshConnectionPolyEndPoints(dtPolyRef prevRef, dtPolyRef polyRef, float* startPos, float* endPos) const;
-
-	/// Gets the specified off-mesh connection.
-	///  @param[in]	ref		The polygon reference of the off-mesh connection.
-	/// @return The specified off-mesh connection, or null if the polygon reference is not valid.
-	const dtOffMeshConnection* getOffMeshConnectionByRef(dtPolyRef ref) const;
-	
-	/// @}
-
-	/// @{
-	/// @name State Management
-	/// These functions do not effect #dtTileRef or #dtPolyRef's. 
-
-	/// Sets the user defined flags for the specified polygon.
-	///  @param[in]	ref		The polygon reference.
-	///  @param[in]	flags	The new flags for the polygon.
-	/// @return The status flags for the operation.
-	dtStatus setPolyFlags(dtPolyRef ref, unsigned short flags);
-
-	/// Gets the user defined flags for the specified polygon.
-	///  @param[in]		ref				The polygon reference.
-	///  @param[out]	resultFlags		The polygon flags.
-	/// @return The status flags for the operation.
-	dtStatus getPolyFlags(dtPolyRef ref, unsigned short* resultFlags) const;
-
-	/// Sets the user defined area for the specified polygon.
-	///  @param[in]	ref		The polygon reference.
-	///  @param[in]	area	The new area id for the polygon. [Limit: < #DT_MAX_AREAS]
-	/// @return The status flags for the operation.
-	dtStatus setPolyArea(dtPolyRef ref, unsigned char area);
-
-	/// Gets the user defined area for the specified polygon.
-	///  @param[in]		ref			The polygon reference.
-	///  @param[out]	resultArea	The area id for the polygon.
-	/// @return The status flags for the operation.
-	dtStatus getPolyArea(dtPolyRef ref, unsigned char* resultArea) const;
-
-	/// Gets the size of the buffer required by #storeTileState to store the specified tile's state.
-	///  @param[in]	tile	The tile.
-	/// @return The size of the buffer required to store the state.
-	int getTileStateSize(const dtMeshTile* tile) const;
-	
-	/// Stores the non-structural state of the tile in the specified buffer. (Flags, area ids, etc.)
-	///  @param[in]		tile			The tile.
-	///  @param[out]	data			The buffer to store the tile's state in.
-	///  @param[in]		maxDataSize		The size of the data buffer. [Limit: >= #getTileStateSize]
-	/// @return The status flags for the operation.
-	dtStatus storeTileState(const dtMeshTile* tile, unsigned char* data, const int maxDataSize) const;
-	
-	/// Restores the state of the tile.
-	///  @param[in]	tile			The tile.
-	///  @param[in]	data			The new state. (Obtained from #storeTileState.)
-	///  @param[in]	maxDataSize		The size of the state within the data buffer.
-	/// @return The status flags for the operation.
-	dtStatus restoreTileState(dtMeshTile* tile, const unsigned char* data, const int maxDataSize);
-	
-	/// @}
-
-	/// @{
-	/// @name Encoding and Decoding
-	/// These functions are generally meant for internal use only.
-
-	/// Derives a standard polygon reference.
-	///  @note This function is generally meant for internal use only.
-	///  @param[in]	salt	The tile's salt value.
-	///  @param[in]	it		The index of the tile.
-	///  @param[in]	ip		The index of the polygon within the tile.
-	inline dtPolyRef encodePolyId(unsigned int salt, unsigned int it, unsigned int ip) const
-	{
-#ifdef DT_POLYREF64
-		return ((dtPolyRef)salt << (DT_POLY_BITS+DT_TILE_BITS)) | ((dtPolyRef)it << DT_POLY_BITS) | (dtPolyRef)ip;
-#else
-		return ((dtPolyRef)salt << (m_polyBits+m_tileBits)) | ((dtPolyRef)it << m_polyBits) | (dtPolyRef)ip;
-#endif
-	}
-	
-	/// Decodes a standard polygon reference.
-	///  @note This function is generally meant for internal use only.
-	///  @param[in]	ref   The polygon reference to decode.
-	///  @param[out]	salt	The tile's salt value.
-	///  @param[out]	it		The index of the tile.
-	///  @param[out]	ip		The index of the polygon within the tile.
-	///  @see #encodePolyId
-	inline void decodePolyId(dtPolyRef ref, unsigned int& salt, unsigned int& it, unsigned int& ip) const
-	{
-#ifdef DT_POLYREF64
-		const dtPolyRef saltMask = ((dtPolyRef)1<<DT_SALT_BITS)-1;
-		const dtPolyRef tileMask = ((dtPolyRef)1<<DT_TILE_BITS)-1;
-		const dtPolyRef polyMask = ((dtPolyRef)1<<DT_POLY_BITS)-1;
-		salt = (unsigned int)((ref >> (DT_POLY_BITS+DT_TILE_BITS)) & saltMask);
-		it = (unsigned int)((ref >> DT_POLY_BITS) & tileMask);
-		ip = (unsigned int)(ref & polyMask);
-#else
-		const dtPolyRef saltMask = ((dtPolyRef)1<<m_saltBits)-1;
-		const dtPolyRef tileMask = ((dtPolyRef)1<<m_tileBits)-1;
-		const dtPolyRef polyMask = ((dtPolyRef)1<<m_polyBits)-1;
-		salt = (unsigned int)((ref >> (m_polyBits+m_tileBits)) & saltMask);
-		it = (unsigned int)((ref >> m_polyBits) & tileMask);
-		ip = (unsigned int)(ref & polyMask);
-#endif
-	}
-
-	/// Extracts a tile's salt value from the specified polygon reference.
-	///  @note This function is generally meant for internal use only.
-	///  @param[in]	ref		The polygon reference.
-	///  @see #encodePolyId
-	inline unsigned int decodePolyIdSalt(dtPolyRef ref) const
-	{
-#ifdef DT_POLYREF64
-		const dtPolyRef saltMask = ((dtPolyRef)1<<DT_SALT_BITS)-1;
-		return (unsigned int)((ref >> (DT_POLY_BITS+DT_TILE_BITS)) & saltMask);
-#else
-		const dtPolyRef saltMask = ((dtPolyRef)1<<m_saltBits)-1;
-		return (unsigned int)((ref >> (m_polyBits+m_tileBits)) & saltMask);
-#endif
-	}
-	
-	/// Extracts the tile's index from the specified polygon reference.
-	///  @note This function is generally meant for internal use only.
-	///  @param[in]	ref		The polygon reference.
-	///  @see #encodePolyId
-	inline unsigned int decodePolyIdTile(dtPolyRef ref) const
-	{
-#ifdef DT_POLYREF64
-		const dtPolyRef tileMask = ((dtPolyRef)1<<DT_TILE_BITS)-1;
-		return (unsigned int)((ref >> DT_POLY_BITS) & tileMask);
-#else
-		const dtPolyRef tileMask = ((dtPolyRef)1<<m_tileBits)-1;
-		return (unsigned int)((ref >> m_polyBits) & tileMask);
-#endif
-	}
-	
-	/// Extracts the polygon's index (within its tile) from the specified polygon reference.
-	///  @note This function is generally meant for internal use only.
-	///  @param[in]	ref		The polygon reference.
-	///  @see #encodePolyId
-	inline unsigned int decodePolyIdPoly(dtPolyRef ref) const
-	{
-#ifdef DT_POLYREF64
-		const dtPolyRef polyMask = ((dtPolyRef)1<<DT_POLY_BITS)-1;
-		return (unsigned int)(ref & polyMask);
-#else
-		const dtPolyRef polyMask = ((dtPolyRef)1<<m_polyBits)-1;
-		return (unsigned int)(ref & polyMask);
-#endif
-	}
-
-	/// @}
-	
-private:
-	// Explicitly disabled copy constructor and copy assignment operator.
-	dtNavMesh(const dtNavMesh&);
-	dtNavMesh& operator=(const dtNavMesh&);
-
-	/// Returns pointer to tile in the tile array.
-	dtMeshTile* getTile(int i);
-
-	/// Returns neighbour tile based on side.
-	int getTilesAt(const int x, const int y,
-				   dtMeshTile** tiles, const int maxTiles) const;
-
-	/// Returns neighbour tile based on side.
-	int getNeighbourTilesAt(const int x, const int y, const int side,
-							dtMeshTile** tiles, const int maxTiles) const;
-	
-	/// Returns all polygons in neighbour tile based on portal defined by the segment.
-	int findConnectingPolys(const float* va, const float* vb,
-							const dtMeshTile* tile, int side,
-							dtPolyRef* con, float* conarea, int maxcon) const;
-	
-	/// Builds internal polygons links for a tile.
-	void connectIntLinks(dtMeshTile* tile);
-	/// Builds internal polygons links for a tile.
-	void baseOffMeshLinks(dtMeshTile* tile);
-
-	/// Builds external polygon links for a tile.
-	void connectExtLinks(dtMeshTile* tile, dtMeshTile* target, int side);
-	/// Builds external polygon links for a tile.
-	void connectExtOffMeshLinks(dtMeshTile* tile, dtMeshTile* target, int side);
-	
-	/// Removes external links at specified side.
-	void unconnectLinks(dtMeshTile* tile, dtMeshTile* target);
-	
-
-	// TODO: These methods are duplicates from dtNavMeshQuery, but are needed for off-mesh connection finding.
-	
-	/// Queries polygons within a tile.
-	int queryPolygonsInTile(const dtMeshTile* tile, const float* qmin, const float* qmax,
-							dtPolyRef* polys, const int maxPolys) const;
-	/// Find nearest polygon within a tile.
-	dtPolyRef findNearestPolyInTile(const dtMeshTile* tile, const float* center,
-									const float* halfExtents, float* nearestPt) const;
-	/// Returns whether position is over the poly and the height at the position if so.
-	bool getPolyHeight(const dtMeshTile* tile, const dtPoly* poly, const float* pos, float* height) const;
-	/// Returns closest point on polygon.
-	void closestPointOnPoly(dtPolyRef ref, const float* pos, float* closest, bool* posOverPoly) const;
-	
-	dtNavMeshParams m_params;			///< Current initialization params. TODO: do not store this info twice.
-	float m_orig[3];					///< Origin of the tile (0,0)
-	float m_tileWidth, m_tileHeight;	///< Dimensions of each tile.
-	int m_maxTiles;						///< Max number of tiles.
-	int m_tileLutSize;					///< Tile hash lookup size (must be pot).
-	int m_tileLutMask;					///< Tile hash lookup mask.
-
-	dtMeshTile** m_posLookup;			///< Tile hash lookup.
-	dtMeshTile* m_nextFree;				///< Freelist of tiles.
-	dtMeshTile* m_tiles;				///< List of tiles.
-		
-#ifndef DT_POLYREF64
-	unsigned int m_saltBits;			///< Number of salt bits in the tile ID.
-	unsigned int m_tileBits;			///< Number of tile bits in the tile ID.
-	unsigned int m_polyBits;			///< Number of poly bits in the tile ID.
-#endif
-
-	friend class dtNavMeshQuery;
-};
-
-/// Allocates a navigation mesh object using the Detour allocator.
-/// @return A navigation mesh that is ready for initialization, or null on failure.
-///  @ingroup detour
-dtNavMesh* dtAllocNavMesh();
-
-/// Frees the specified navigation mesh object using the Detour allocator.
-///  @param[in]	navmesh		A navigation mesh allocated using #dtAllocNavMesh
-///  @ingroup detour
-void dtFreeNavMesh(dtNavMesh* navmesh);
-
-#endif // DETOURNAVMESH_H
-
-///////////////////////////////////////////////////////////////////////////
-
-// This section contains detailed documentation for members that don't have
-// a source file. It reduces clutter in the main section of the header.
-
-/**
-
-@typedef dtPolyRef
-@par
-
-Polygon references are subject to the same invalidate/preserve/restore 
-rules that apply to #dtTileRef's.  If the #dtTileRef for the polygon's
-tile changes, the polygon reference becomes invalid.
-
-Changing a polygon's flags, area id, etc. does not impact its polygon
-reference.
-
-@typedef dtTileRef
-@par
-
-The following changes will invalidate a tile reference:
-
-- The referenced tile has been removed from the navigation mesh.
-- The navigation mesh has been initialized using a different set
-  of #dtNavMeshParams.
-
-A tile reference is preserved/restored if the tile is added to a navigation 
-mesh initialized with the original #dtNavMeshParams and is added at the
-original reference location. (E.g. The lastRef parameter is used with
-dtNavMesh::addTile.)
-
-Basically, if the storage structure of a tile changes, its associated
-tile reference changes.
-
-
-@var unsigned short dtPoly::neis[DT_VERTS_PER_POLYGON]
-@par
-
-Each entry represents data for the edge starting at the vertex of the same index. 
-E.g. The entry at index n represents the edge data for vertex[n] to vertex[n+1].
-
-A value of zero indicates the edge has no polygon connection. (It makes up the 
-border of the navigation mesh.)
-
-The information can be extracted as follows: 
-@code 
-neighborRef = neis[n] & 0xff; // Get the neighbor polygon reference.
-
-if (neis[n] & #DT_EX_LINK)
-{
-    // The edge is an external (portal) edge.
-}
-@endcode
-
-@var float dtMeshHeader::bvQuantFactor
-@par
-
-This value is used for converting between world and bounding volume coordinates.
-For example:
-@code
-const float cs = 1.0f / tile->header->bvQuantFactor;
-const dtBVNode* n = &tile->bvTree[i];
-if (n->i >= 0)
-{
-    // This is a leaf node.
-    float worldMinX = tile->header->bmin[0] + n->bmin[0]*cs;
-    float worldMinY = tile->header->bmin[0] + n->bmin[1]*cs;
-    // Etc...
-}
-@endcode
-
-@struct dtMeshTile
-@par
-
-Tiles generally only exist within the context of a dtNavMesh object.
-
-Some tile content is optional.  For example, a tile may not contain any
-off-mesh connections.  In this case the associated pointer will be null.
-
-If a detail mesh exists it will share vertices with the base polygon mesh.  
-Only the vertices unique to the detail mesh will be stored in #detailVerts.
-
-@warning Tiles returned by a dtNavMesh object are not guarenteed to be populated.
-For example: The tile at a location might not have been loaded yet, or may have been removed.
-In this case, pointers will be null.  So if in doubt, check the polygon count in the 
-tile's header to determine if a tile has polygons defined.
-
-@var float dtOffMeshConnection::pos[6]
-@par
-
-For a properly built navigation mesh, vertex A will always be within the bounds of the mesh. 
-Vertex B is not required to be within the bounds of the mesh.
-
-*/
diff --git a/extern/recastnavigation/Detour/Include/DetourNavMeshBuilder.h b/extern/recastnavigation/Detour/Include/DetourNavMeshBuilder.h
deleted file mode 100644
index 9425a7a789..0000000000
--- a/extern/recastnavigation/Detour/Include/DetourNavMeshBuilder.h
+++ /dev/null
@@ -1,149 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef DETOURNAVMESHBUILDER_H
-#define DETOURNAVMESHBUILDER_H
-
-#include "DetourAlloc.h"
-
-/// Represents the source data used to build an navigation mesh tile.
-/// @ingroup detour
-struct dtNavMeshCreateParams
-{
-
-	/// @name Polygon Mesh Attributes
-	/// Used to create the base navigation graph.
-	/// See #rcPolyMesh for details related to these attributes.
-	/// @{
-
-	const unsigned short* verts;			///< The polygon mesh vertices. [(x, y, z) * #vertCount] [Unit: vx]
-	int vertCount;							///< The number vertices in the polygon mesh. [Limit: >= 3]
-	const unsigned short* polys;			///< The polygon data. [Size: #polyCount * 2 * #nvp]
-	const unsigned short* polyFlags;		///< The user defined flags assigned to each polygon. [Size: #polyCount]
-	const unsigned char* polyAreas;			///< The user defined area ids assigned to each polygon. [Size: #polyCount]
-	int polyCount;							///< Number of polygons in the mesh. [Limit: >= 1]
-	int nvp;								///< Number maximum number of vertices per polygon. [Limit: >= 3]
-
-	/// @}
-	/// @name Height Detail Attributes (Optional)
-	/// See #rcPolyMeshDetail for details related to these attributes.
-	/// @{
-
-	const unsigned int* detailMeshes;		///< The height detail sub-mesh data. [Size: 4 * #polyCount]
-	const float* detailVerts;				///< The detail mesh vertices. [Size: 3 * #detailVertsCount] [Unit: wu]
-	int detailVertsCount;					///< The number of vertices in the detail mesh.
-	const unsigned char* detailTris;		///< The detail mesh triangles. [Size: 4 * #detailTriCount]
-	int detailTriCount;						///< The number of triangles in the detail mesh.
-
-	/// @}
-	/// @name Off-Mesh Connections Attributes (Optional)
-	/// Used to define a custom point-to-point edge within the navigation graph, an 
-	/// off-mesh connection is a user defined traversable connection made up to two vertices, 
-	/// at least one of which resides within a navigation mesh polygon.
-	/// @{
-
-	/// Off-mesh connection vertices. [(ax, ay, az, bx, by, bz) * #offMeshConCount] [Unit: wu]
-	const float* offMeshConVerts;
-	/// Off-mesh connection radii. [Size: #offMeshConCount] [Unit: wu]
-	const float* offMeshConRad;
-	/// User defined flags assigned to the off-mesh connections. [Size: #offMeshConCount]
-	const unsigned short* offMeshConFlags;
-	/// User defined area ids assigned to the off-mesh connections. [Size: #offMeshConCount]
-	const unsigned char* offMeshConAreas;
-	/// The permitted travel direction of the off-mesh connections. [Size: #offMeshConCount]
-	///
-	/// 0 = Travel only from endpoint A to endpoint B.<br/>
-	/// #DT_OFFMESH_CON_BIDIR = Bidirectional travel.
-	const unsigned char* offMeshConDir;	
-	/// The user defined ids of the off-mesh connection. [Size: #offMeshConCount]
-	const unsigned int* offMeshConUserID;
-	/// The number of off-mesh connections. [Limit: >= 0]
-	int offMeshConCount;
-
-	/// @}
-	/// @name Tile Attributes
-	/// @note The tile grid/layer data can be left at zero if the destination is a single tile mesh.
-	/// @{
-
-	unsigned int userId;	///< The user defined id of the tile.
-	int tileX;				///< The tile's x-grid location within the multi-tile destination mesh. (Along the x-axis.)
-	int tileY;				///< The tile's y-grid location within the multi-tile desitation mesh. (Along the z-axis.)
-	int tileLayer;			///< The tile's layer within the layered destination mesh. [Limit: >= 0] (Along the y-axis.)
-	float bmin[3];			///< The minimum bounds of the tile. [(x, y, z)] [Unit: wu]
-	float bmax[3];			///< The maximum bounds of the tile. [(x, y, z)] [Unit: wu]
-
-	/// @}
-	/// @name General Configuration Attributes
-	/// @{
-
-	float walkableHeight;	///< The agent height. [Unit: wu]
-	float walkableRadius;	///< The agent radius. [Unit: wu]
-	float walkableClimb;	///< The agent maximum traversable ledge. (Up/Down) [Unit: wu]
-	float cs;				///< The xz-plane cell size of the polygon mesh. [Limit: > 0] [Unit: wu]
-	float ch;				///< The y-axis cell height of the polygon mesh. [Limit: > 0] [Unit: wu]
-
-	/// True if a bounding volume tree should be built for the tile.
-	/// @note The BVTree is not normally needed for layered navigation meshes.
-	bool buildBvTree;
-
-	/// @}
-};
-
-/// Builds navigation mesh tile data from the provided tile creation data.
-/// @ingroup detour
-///  @param[in]		params		Tile creation data.
-///  @param[out]	outData		The resulting tile data.
-///  @param[out]	outDataSize	The size of the tile data array.
-/// @return True if the tile data was successfully created.
-bool dtCreateNavMeshData(dtNavMeshCreateParams* params, unsigned char** outData, int* outDataSize);
-
-/// Swaps the endianess of the tile data's header (#dtMeshHeader).
-///  @param[in,out]	data		The tile data array.
-///  @param[in]		dataSize	The size of the data array.
-bool dtNavMeshHeaderSwapEndian(unsigned char* data, const int dataSize);
-
-/// Swaps endianess of the tile data.
-///  @param[in,out]	data		The tile data array.
-///  @param[in]		dataSize	The size of the data array.
-bool dtNavMeshDataSwapEndian(unsigned char* data, const int dataSize);
-
-#endif // DETOURNAVMESHBUILDER_H
-
-// This section contains detailed documentation for members that don't have
-// a source file. It reduces clutter in the main section of the header.
-
-/**
-
-@struct dtNavMeshCreateParams
-@par
-
-This structure is used to marshal data between the Recast mesh generation pipeline and Detour navigation components.
-
-See the rcPolyMesh and rcPolyMeshDetail documentation for detailed information related to mesh structure.
-
-Units are usually in voxels (vx) or world units (wu). The units for voxels, grid size, and cell size 
-are all based on the values of #cs and #ch.
-
-The standard navigation mesh build process is to create tile data using dtCreateNavMeshData, then add the tile 
-to a navigation mesh using either the dtNavMesh single tile <tt>init()</tt> function or the dtNavMesh::addTile()
-function.
-
-@see dtCreateNavMeshData
-
-*/
-
diff --git a/extern/recastnavigation/Detour/Include/DetourNavMeshQuery.h b/extern/recastnavigation/Detour/Include/DetourNavMeshQuery.h
deleted file mode 100644
index 0b40371beb..0000000000
--- a/extern/recastnavigation/Detour/Include/DetourNavMeshQuery.h
+++ /dev/null
@@ -1,573 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef DETOURNAVMESHQUERY_H
-#define DETOURNAVMESHQUERY_H
-
-#include "DetourNavMesh.h"
-#include "DetourStatus.h"
-
-
-// Define DT_VIRTUAL_QUERYFILTER if you wish to derive a custom filter from dtQueryFilter.
-// On certain platforms indirect or virtual function call is expensive. The default
-// setting is to use non-virtual functions, the actual implementations of the functions
-// are declared as inline for maximum speed. 
-
-//#define DT_VIRTUAL_QUERYFILTER 1
-
-/// Defines polygon filtering and traversal costs for navigation mesh query operations.
-/// @ingroup detour
-class dtQueryFilter
-{
-	float m_areaCost[DT_MAX_AREAS];		///< Cost per area type. (Used by default implementation.)
-	unsigned short m_includeFlags;		///< Flags for polygons that can be visited. (Used by default implementation.)
-	unsigned short m_excludeFlags;		///< Flags for polygons that should not be visted. (Used by default implementation.)
-	
-public:
-	dtQueryFilter();
-	
-#ifdef DT_VIRTUAL_QUERYFILTER
-	virtual ~dtQueryFilter() { }
-#endif
-	
-	/// Returns true if the polygon can be visited.  (I.e. Is traversable.)
-	///  @param[in]		ref		The reference id of the polygon test.
-	///  @param[in]		tile	The tile containing the polygon.
-	///  @param[in]		poly  The polygon to test.
-#ifdef DT_VIRTUAL_QUERYFILTER
-	virtual bool passFilter(const dtPolyRef ref,
-							const dtMeshTile* tile,
-							const dtPoly* poly) const;
-#else
-	bool passFilter(const dtPolyRef ref,
-					const dtMeshTile* tile,
-					const dtPoly* poly) const;
-#endif
-
-	/// Returns cost to move from the beginning to the end of a line segment
-	/// that is fully contained within a polygon.
-	///  @param[in]		pa			The start position on the edge of the previous and current polygon. [(x, y, z)]
-	///  @param[in]		pb			The end position on the edge of the current and next polygon. [(x, y, z)]
-	///  @param[in]		prevRef		The reference id of the previous polygon. [opt]
-	///  @param[in]		prevTile	The tile containing the previous polygon. [opt]
-	///  @param[in]		prevPoly	The previous polygon. [opt]
-	///  @param[in]		curRef		The reference id of the current polygon.
-	///  @param[in]		curTile		The tile containing the current polygon.
-	///  @param[in]		curPoly		The current polygon.
-	///  @param[in]		nextRef		The refernece id of the next polygon. [opt]
-	///  @param[in]		nextTile	The tile containing the next polygon. [opt]
-	///  @param[in]		nextPoly	The next polygon. [opt]
-#ifdef DT_VIRTUAL_QUERYFILTER
-	virtual float getCost(const float* pa, const float* pb,
-						  const dtPolyRef prevRef, const dtMeshTile* prevTile, const dtPoly* prevPoly,
-						  const dtPolyRef curRef, const dtMeshTile* curTile, const dtPoly* curPoly,
-						  const dtPolyRef nextRef, const dtMeshTile* nextTile, const dtPoly* nextPoly) const;
-#else
-	float getCost(const float* pa, const float* pb,
-				  const dtPolyRef prevRef, const dtMeshTile* prevTile, const dtPoly* prevPoly,
-				  const dtPolyRef curRef, const dtMeshTile* curTile, const dtPoly* curPoly,
-				  const dtPolyRef nextRef, const dtMeshTile* nextTile, const dtPoly* nextPoly) const;
-#endif
-
-	/// @name Getters and setters for the default implementation data.
-	///@{
-
-	/// Returns the traversal cost of the area.
-	///  @param[in]		i		The id of the area.
-	/// @returns The traversal cost of the area.
-	inline float getAreaCost(const int i) const { return m_areaCost[i]; }
-
-	/// Sets the traversal cost of the area.
-	///  @param[in]		i		The id of the area.
-	///  @param[in]		cost	The new cost of traversing the area.
-	inline void setAreaCost(const int i, const float cost) { m_areaCost[i] = cost; } 
-
-	/// Returns the include flags for the filter.
-	/// Any polygons that include one or more of these flags will be
-	/// included in the operation.
-	inline unsigned short getIncludeFlags() const { return m_includeFlags; }
-
-	/// Sets the include flags for the filter.
-	/// @param[in]		flags	The new flags.
-	inline void setIncludeFlags(const unsigned short flags) { m_includeFlags = flags; }
-
-	/// Returns the exclude flags for the filter.
-	/// Any polygons that include one ore more of these flags will be
-	/// excluded from the operation.
-	inline unsigned short getExcludeFlags() const { return m_excludeFlags; }
-
-	/// Sets the exclude flags for the filter.
-	/// @param[in]		flags		The new flags.
-	inline void setExcludeFlags(const unsigned short flags) { m_excludeFlags = flags; }	
-
-	///@}
-
-};
-
-/// Provides information about raycast hit
-/// filled by dtNavMeshQuery::raycast
-/// @ingroup detour
-struct dtRaycastHit
-{
-	/// The hit parameter. (FLT_MAX if no wall hit.)
-	float t; 
-	
-	/// hitNormal	The normal of the nearest wall hit. [(x, y, z)]
-	float hitNormal[3];
-
-	/// The index of the edge on the final polygon where the wall was hit.
-	int hitEdgeIndex;
-	
-	/// Pointer to an array of reference ids of the visited polygons. [opt]
-	dtPolyRef* path;
-	
-	/// The number of visited polygons. [opt]
-	int pathCount;
-
-	/// The maximum number of polygons the @p path array can hold.
-	int maxPath;
-
-	///  The cost of the path until hit.
-	float pathCost;
-};
-
-/// Provides custom polygon query behavior.
-/// Used by dtNavMeshQuery::queryPolygons.
-/// @ingroup detour
-class dtPolyQuery
-{
-public:
-	virtual ~dtPolyQuery() { }
-
-	/// Called for each batch of unique polygons touched by the search area in dtNavMeshQuery::queryPolygons.
-	/// This can be called multiple times for a single query.
-	virtual void process(const dtMeshTile* tile, dtPoly** polys, dtPolyRef* refs, int count) = 0;
-};
-
-/// Provides the ability to perform pathfinding related queries against
-/// a navigation mesh.
-/// @ingroup detour
-class dtNavMeshQuery
-{
-public:
-	dtNavMeshQuery();
-	~dtNavMeshQuery();
-	
-	/// Initializes the query object.
-	///  @param[in]		nav			Pointer to the dtNavMesh object to use for all queries.
-	///  @param[in]		maxNodes	Maximum number of search nodes. [Limits: 0 < value <= 65535]
-	/// @returns The status flags for the query.
-	dtStatus init(const dtNavMesh* nav, const int maxNodes);
-	
-	/// @name Standard Pathfinding Functions
-	// /@{
-
-	/// Finds a path from the start polygon to the end polygon.
-	///  @param[in]		startRef	The refrence id of the start polygon.
-	///  @param[in]		endRef		The reference id of the end polygon.
-	///  @param[in]		startPos	A position within the start polygon. [(x, y, z)]
-	///  @param[in]		endPos		A position within the end polygon. [(x, y, z)]
-	///  @param[in]		filter		The polygon filter to apply to the query.
-	///  @param[out]	path		An ordered list of polygon references representing the path. (Start to end.) 
-	///  							[(polyRef) * @p pathCount]
-	///  @param[out]	pathCount	The number of polygons returned in the @p path array.
-	///  @param[in]		maxPath		The maximum number of polygons the @p path array can hold. [Limit: >= 1]
-	dtStatus findPath(dtPolyRef startRef, dtPolyRef endRef,
-					  const float* startPos, const float* endPos,
-					  const dtQueryFilter* filter,
-					  dtPolyRef* path, int* pathCount, const int maxPath) const;
-
-	/// Finds the straight path from the start to the end position within the polygon corridor.
-	///  @param[in]		startPos			Path start position. [(x, y, z)]
-	///  @param[in]		endPos				Path end position. [(x, y, z)]
-	///  @param[in]		path				An array of polygon references that represent the path corridor.
-	///  @param[in]		pathSize			The number of polygons in the @p path array.
-	///  @param[out]	straightPath		Points describing the straight path. [(x, y, z) * @p straightPathCount].
-	///  @param[out]	straightPathFlags	Flags describing each point. (See: #dtStraightPathFlags) [opt]
-	///  @param[out]	straightPathRefs	The reference id of the polygon that is being entered at each point. [opt]
-	///  @param[out]	straightPathCount	The number of points in the straight path.
-	///  @param[in]		maxStraightPath		The maximum number of points the straight path arrays can hold.  [Limit: > 0]
-	///  @param[in]		options				Query options. (see: #dtStraightPathOptions)
-	/// @returns The status flags for the query.
-	dtStatus findStraightPath(const float* startPos, const float* endPos,
-							  const dtPolyRef* path, const int pathSize,
-							  float* straightPath, unsigned char* straightPathFlags, dtPolyRef* straightPathRefs,
-							  int* straightPathCount, const int maxStraightPath, const int options = 0) const;
-
-	///@}
-	/// @name Sliced Pathfinding Functions
-	/// Common use case:
-	///	-# Call initSlicedFindPath() to initialize the sliced path query.
-	///	-# Call updateSlicedFindPath() until it returns complete.
-	///	-# Call finalizeSlicedFindPath() to get the path.
-	///@{ 
-
-	/// Intializes a sliced path query.
-	///  @param[in]		startRef	The refrence id of the start polygon.
-	///  @param[in]		endRef		The reference id of the end polygon.
-	///  @param[in]		startPos	A position within the start polygon. [(x, y, z)]
-	///  @param[in]		endPos		A position within the end polygon. [(x, y, z)]
-	///  @param[in]		filter		The polygon filter to apply to the query.
-	///  @param[in]		options		query options (see: #dtFindPathOptions)
-	/// @returns The status flags for the query.
-	dtStatus initSlicedFindPath(dtPolyRef startRef, dtPolyRef endRef,
-								const float* startPos, const float* endPos,
-								const dtQueryFilter* filter, const unsigned int options = 0);
-
-	/// Updates an in-progress sliced path query.
-	///  @param[in]		maxIter		The maximum number of iterations to perform.
-	///  @param[out]	doneIters	The actual number of iterations completed. [opt]
-	/// @returns The status flags for the query.
-	dtStatus updateSlicedFindPath(const int maxIter, int* doneIters);
-
-	/// Finalizes and returns the results of a sliced path query.
-	///  @param[out]	path		An ordered list of polygon references representing the path. (Start to end.) 
-	///  							[(polyRef) * @p pathCount]
-	///  @param[out]	pathCount	The number of polygons returned in the @p path array.
-	///  @param[in]		maxPath		The max number of polygons the path array can hold. [Limit: >= 1]
-	/// @returns The status flags for the query.
-	dtStatus finalizeSlicedFindPath(dtPolyRef* path, int* pathCount, const int maxPath);
-	
-	/// Finalizes and returns the results of an incomplete sliced path query, returning the path to the furthest
-	/// polygon on the existing path that was visited during the search.
-	///  @param[in]		existing		An array of polygon references for the existing path.
-	///  @param[in]		existingSize	The number of polygon in the @p existing array.
-	///  @param[out]	path			An ordered list of polygon references representing the path. (Start to end.) 
-	///  								[(polyRef) * @p pathCount]
-	///  @param[out]	pathCount		The number of polygons returned in the @p path array.
-	///  @param[in]		maxPath			The max number of polygons the @p path array can hold. [Limit: >= 1]
-	/// @returns The status flags for the query.
-	dtStatus finalizeSlicedFindPathPartial(const dtPolyRef* existing, const int existingSize,
-										   dtPolyRef* path, int* pathCount, const int maxPath);
-
-	///@}
-	/// @name Dijkstra Search Functions
-	/// @{ 
-
-	/// Finds the polygons along the navigation graph that touch the specified circle.
-	///  @param[in]		startRef		The reference id of the polygon where the search starts.
-	///  @param[in]		centerPos		The center of the search circle. [(x, y, z)]
-	///  @param[in]		radius			The radius of the search circle.
-	///  @param[in]		filter			The polygon filter to apply to the query.
-	///  @param[out]	resultRef		The reference ids of the polygons touched by the circle. [opt]
-	///  @param[out]	resultParent	The reference ids of the parent polygons for each result. 
-	///  								Zero if a result polygon has no parent. [opt]
-	///  @param[out]	resultCost		The search cost from @p centerPos to the polygon. [opt]
-	///  @param[out]	resultCount		The number of polygons found. [opt]
-	///  @param[in]		maxResult		The maximum number of polygons the result arrays can hold.
-	/// @returns The status flags for the query.
-	dtStatus findPolysAroundCircle(dtPolyRef startRef, const float* centerPos, const float radius,
-								   const dtQueryFilter* filter,
-								   dtPolyRef* resultRef, dtPolyRef* resultParent, float* resultCost,
-								   int* resultCount, const int maxResult) const;
-	
-	/// Finds the polygons along the naviation graph that touch the specified convex polygon.
-	///  @param[in]		startRef		The reference id of the polygon where the search starts.
-	///  @param[in]		verts			The vertices describing the convex polygon. (CCW) 
-	///  								[(x, y, z) * @p nverts]
-	///  @param[in]		nverts			The number of vertices in the polygon.
-	///  @param[in]		filter			The polygon filter to apply to the query.
-	///  @param[out]	resultRef		The reference ids of the polygons touched by the search polygon. [opt]
-	///  @param[out]	resultParent	The reference ids of the parent polygons for each result. Zero if a 
-	///  								result polygon has no parent. [opt]
-	///  @param[out]	resultCost		The search cost from the centroid point to the polygon. [opt]
-	///  @param[out]	resultCount		The number of polygons found.
-	///  @param[in]		maxResult		The maximum number of polygons the result arrays can hold.
-	/// @returns The status flags for the query.
-	dtStatus findPolysAroundShape(dtPolyRef startRef, const float* verts, const int nverts,
-								  const dtQueryFilter* filter,
-								  dtPolyRef* resultRef, dtPolyRef* resultParent, float* resultCost,
-								  int* resultCount, const int maxResult) const;
-	
-	/// Gets a path from the explored nodes in the previous search.
-	///  @param[in]		endRef		The reference id of the end polygon.
-	///  @param[out]	path		An ordered list of polygon references representing the path. (Start to end.)
-	///  							[(polyRef) * @p pathCount]
-	///  @param[out]	pathCount	The number of polygons returned in the @p path array.
-	///  @param[in]		maxPath		The maximum number of polygons the @p path array can hold. [Limit: >= 0]
-	///  @returns		The status flags. Returns DT_FAILURE | DT_INVALID_PARAM if any parameter is wrong, or if
-	///  				@p endRef was not explored in the previous search. Returns DT_SUCCESS | DT_BUFFER_TOO_SMALL
-	///  				if @p path cannot contain the entire path. In this case it is filled to capacity with a partial path.
-	///  				Otherwise returns DT_SUCCESS.
-	///  @remarks		The result of this function depends on the state of the query object. For that reason it should only
-	///  				be used immediately after one of the two Dijkstra searches, findPolysAroundCircle or findPolysAroundShape.
-	dtStatus getPathFromDijkstraSearch(dtPolyRef endRef, dtPolyRef* path, int* pathCount, int maxPath) const;
-
-	/// @}
-	/// @name Local Query Functions
-	///@{
-
-	/// Finds the polygon nearest to the specified center point.
-	///  @param[in]		center		The center of the search box. [(x, y, z)]
-	///  @param[in]		halfExtents		The search distance along each axis. [(x, y, z)]
-	///  @param[in]		filter		The polygon filter to apply to the query.
-	///  @param[out]	nearestRef	The reference id of the nearest polygon.
-	///  @param[out]	nearestPt	The nearest point on the polygon. [opt] [(x, y, z)]
-	/// @returns The status flags for the query.
-	dtStatus findNearestPoly(const float* center, const float* halfExtents,
-							 const dtQueryFilter* filter,
-							 dtPolyRef* nearestRef, float* nearestPt) const;
-	
-	/// Finds polygons that overlap the search box.
-	///  @param[in]		center		The center of the search box. [(x, y, z)]
-	///  @param[in]		halfExtents		The search distance along each axis. [(x, y, z)]
-	///  @param[in]		filter		The polygon filter to apply to the query.
-	///  @param[out]	polys		The reference ids of the polygons that overlap the query box.
-	///  @param[out]	polyCount	The number of polygons in the search result.
-	///  @param[in]		maxPolys	The maximum number of polygons the search result can hold.
-	/// @returns The status flags for the query.
-	dtStatus queryPolygons(const float* center, const float* halfExtents,
-						   const dtQueryFilter* filter,
-						   dtPolyRef* polys, int* polyCount, const int maxPolys) const;
-
-	/// Finds polygons that overlap the search box.
-	///  @param[in]		center		The center of the search box. [(x, y, z)]
-	///  @param[in]		halfExtents		The search distance along each axis. [(x, y, z)]
-	///  @param[in]		filter		The polygon filter to apply to the query.
-	///  @param[in]		query		The query. Polygons found will be batched together and passed to this query.
-	dtStatus queryPolygons(const float* center, const float* halfExtents,
-						   const dtQueryFilter* filter, dtPolyQuery* query) const;
-
-	/// Finds the non-overlapping navigation polygons in the local neighbourhood around the center position.
-	///  @param[in]		startRef		The reference id of the polygon where the search starts.
-	///  @param[in]		centerPos		The center of the query circle. [(x, y, z)]
-	///  @param[in]		radius			The radius of the query circle.
-	///  @param[in]		filter			The polygon filter to apply to the query.
-	///  @param[out]	resultRef		The reference ids of the polygons touched by the circle.
-	///  @param[out]	resultParent	The reference ids of the parent polygons for each result. 
-	///  								Zero if a result polygon has no parent. [opt]
-	///  @param[out]	resultCount		The number of polygons found.
-	///  @param[in]		maxResult		The maximum number of polygons the result arrays can hold.
-	/// @returns The status flags for the query.
-	dtStatus findLocalNeighbourhood(dtPolyRef startRef, const float* centerPos, const float radius,
-									const dtQueryFilter* filter,
-									dtPolyRef* resultRef, dtPolyRef* resultParent,
-									int* resultCount, const int maxResult) const;
-
-	/// Moves from the start to the end position constrained to the navigation mesh.
-	///  @param[in]		startRef		The reference id of the start polygon.
-	///  @param[in]		startPos		A position of the mover within the start polygon. [(x, y, x)]
-	///  @param[in]		endPos			The desired end position of the mover. [(x, y, z)]
-	///  @param[in]		filter			The polygon filter to apply to the query.
-	///  @param[out]	resultPos		The result position of the mover. [(x, y, z)]
-	///  @param[out]	visited			The reference ids of the polygons visited during the move.
-	///  @param[out]	visitedCount	The number of polygons visited during the move.
-	///  @param[in]		maxVisitedSize	The maximum number of polygons the @p visited array can hold.
-	/// @returns The status flags for the query.
-	dtStatus moveAlongSurface(dtPolyRef startRef, const float* startPos, const float* endPos,
-							  const dtQueryFilter* filter,
-							  float* resultPos, dtPolyRef* visited, int* visitedCount, const int maxVisitedSize) const;
-	
-	/// Casts a 'walkability' ray along the surface of the navigation mesh from 
-	/// the start position toward the end position.
-	/// @note A wrapper around raycast(..., RaycastHit*). Retained for backward compatibility.
-	///  @param[in]		startRef	The reference id of the start polygon.
-	///  @param[in]		startPos	A position within the start polygon representing 
-	///  							the start of the ray. [(x, y, z)]
-	///  @param[in]		endPos		The position to cast the ray toward. [(x, y, z)]
-	///  @param[out]	t			The hit parameter. (FLT_MAX if no wall hit.)
-	///  @param[out]	hitNormal	The normal of the nearest wall hit. [(x, y, z)]
-	///  @param[in]		filter		The polygon filter to apply to the query.
-	///  @param[out]	path		The reference ids of the visited polygons. [opt]
-	///  @param[out]	pathCount	The number of visited polygons. [opt]
-	///  @param[in]		maxPath		The maximum number of polygons the @p path array can hold.
-	/// @returns The status flags for the query.
-	dtStatus raycast(dtPolyRef startRef, const float* startPos, const float* endPos,
-					 const dtQueryFilter* filter,
-					 float* t, float* hitNormal, dtPolyRef* path, int* pathCount, const int maxPath) const;
-	
-	/// Casts a 'walkability' ray along the surface of the navigation mesh from 
-	/// the start position toward the end position.
-	///  @param[in]		startRef	The reference id of the start polygon.
-	///  @param[in]		startPos	A position within the start polygon representing 
-	///  							the start of the ray. [(x, y, z)]
-	///  @param[in]		endPos		The position to cast the ray toward. [(x, y, z)]
-	///  @param[in]		filter		The polygon filter to apply to the query.
-	///  @param[in]		flags		govern how the raycast behaves. See dtRaycastOptions
-	///  @param[out]	hit			Pointer to a raycast hit structure which will be filled by the results.
-	///  @param[in]		prevRef		parent of start ref. Used during for cost calculation [opt]
-	/// @returns The status flags for the query.
-	dtStatus raycast(dtPolyRef startRef, const float* startPos, const float* endPos,
-					 const dtQueryFilter* filter, const unsigned int options,
-					 dtRaycastHit* hit, dtPolyRef prevRef = 0) const;
-
-
-	/// Finds the distance from the specified position to the nearest polygon wall.
-	///  @param[in]		startRef		The reference id of the polygon containing @p centerPos.
-	///  @param[in]		centerPos		The center of the search circle. [(x, y, z)]
-	///  @param[in]		maxRadius		The radius of the search circle.
-	///  @param[in]		filter			The polygon filter to apply to the query.
-	///  @param[out]	hitDist			The distance to the nearest wall from @p centerPos.
-	///  @param[out]	hitPos			The nearest position on the wall that was hit. [(x, y, z)]
-	///  @param[out]	hitNormal		The normalized ray formed from the wall point to the 
-	///  								source point. [(x, y, z)]
-	/// @returns The status flags for the query.
-	dtStatus findDistanceToWall(dtPolyRef startRef, const float* centerPos, const float maxRadius,
-								const dtQueryFilter* filter,
-								float* hitDist, float* hitPos, float* hitNormal) const;
-	
-	/// Returns the segments for the specified polygon, optionally including portals.
-	///  @param[in]		ref				The reference id of the polygon.
-	///  @param[in]		filter			The polygon filter to apply to the query.
-	///  @param[out]	segmentVerts	The segments. [(ax, ay, az, bx, by, bz) * segmentCount]
-	///  @param[out]	segmentRefs		The reference ids of each segment's neighbor polygon. 
-	///  								Or zero if the segment is a wall. [opt] [(parentRef) * @p segmentCount] 
-	///  @param[out]	segmentCount	The number of segments returned.
-	///  @param[in]		maxSegments		The maximum number of segments the result arrays can hold.
-	/// @returns The status flags for the query.
-	dtStatus getPolyWallSegments(dtPolyRef ref, const dtQueryFilter* filter,
-								 float* segmentVerts, dtPolyRef* segmentRefs, int* segmentCount,
-								 const int maxSegments) const;
-
-	/// Returns random location on navmesh.
-	/// Polygons are chosen weighted by area. The search runs in linear related to number of polygon.
-	///  @param[in]		filter			The polygon filter to apply to the query.
-	///  @param[in]		frand			Function returning a random number [0..1).
-	///  @param[out]	randomRef		The reference id of the random location.
-	///  @param[out]	randomPt		The random location. 
-	/// @returns The status flags for the query.
-	dtStatus findRandomPoint(const dtQueryFilter* filter, float (*frand)(),
-							 dtPolyRef* randomRef, float* randomPt) const;
-
-	/// Returns random location on navmesh within the reach of specified location.
-	/// Polygons are chosen weighted by area. The search runs in linear related to number of polygon.
-	/// The location is not exactly constrained by the circle, but it limits the visited polygons.
-	///  @param[in]		startRef		The reference id of the polygon where the search starts.
-	///  @param[in]		centerPos		The center of the search circle. [(x, y, z)]
-	///  @param[in]		filter			The polygon filter to apply to the query.
-	///  @param[in]		frand			Function returning a random number [0..1).
-	///  @param[out]	randomRef		The reference id of the random location.
-	///  @param[out]	randomPt		The random location. [(x, y, z)]
-	/// @returns The status flags for the query.
-	dtStatus findRandomPointAroundCircle(dtPolyRef startRef, const float* centerPos, const float maxRadius,
-										 const dtQueryFilter* filter, float (*frand)(),
-										 dtPolyRef* randomRef, float* randomPt) const;
-	
-	/// Finds the closest point on the specified polygon.
-	///  @param[in]		ref			The reference id of the polygon.
-	///  @param[in]		pos			The position to check. [(x, y, z)]
-	///  @param[out]	closest		The closest point on the polygon. [(x, y, z)]
-	///  @param[out]	posOverPoly	True of the position is over the polygon.
-	/// @returns The status flags for the query.
-	dtStatus closestPointOnPoly(dtPolyRef ref, const float* pos, float* closest, bool* posOverPoly) const;
-	
-	/// Returns a point on the boundary closest to the source point if the source point is outside the 
-	/// polygon's xz-bounds.
-	///  @param[in]		ref			The reference id to the polygon.
-	///  @param[in]		pos			The position to check. [(x, y, z)]
-	///  @param[out]	closest		The closest point. [(x, y, z)]
-	/// @returns The status flags for the query.
-	dtStatus closestPointOnPolyBoundary(dtPolyRef ref, const float* pos, float* closest) const;
-	
-	/// Gets the height of the polygon at the provided position using the height detail. (Most accurate.)
-	///  @param[in]		ref			The reference id of the polygon.
-	///  @param[in]		pos			A position within the xz-bounds of the polygon. [(x, y, z)]
-	///  @param[out]	height		The height at the surface of the polygon.
-	/// @returns The status flags for the query.
-	dtStatus getPolyHeight(dtPolyRef ref, const float* pos, float* height) const;
-
-	/// @}
-	/// @name Miscellaneous Functions
-	/// @{
-
-	/// Returns true if the polygon reference is valid and passes the filter restrictions.
-	///  @param[in]		ref			The polygon reference to check.
-	///  @param[in]		filter		The filter to apply.
-	bool isValidPolyRef(dtPolyRef ref, const dtQueryFilter* filter) const;
-
-	/// Returns true if the polygon reference is in the closed list. 
-	///  @param[in]		ref		The reference id of the polygon to check.
-	/// @returns True if the polygon is in closed list.
-	bool isInClosedList(dtPolyRef ref) const;
-	
-	/// Gets the node pool.
-	/// @returns The node pool.
-	class dtNodePool* getNodePool() const { return m_nodePool; }
-	
-	/// Gets the navigation mesh the query object is using.
-	/// @return The navigation mesh the query object is using.
-	const dtNavMesh* getAttachedNavMesh() const { return m_nav; }
-
-	/// @}
-	
-private:
-	// Explicitly disabled copy constructor and copy assignment operator
-	dtNavMeshQuery(const dtNavMeshQuery&);
-	dtNavMeshQuery& operator=(const dtNavMeshQuery&);
-	
-	/// Queries polygons within a tile.
-	void queryPolygonsInTile(const dtMeshTile* tile, const float* qmin, const float* qmax,
-							 const dtQueryFilter* filter, dtPolyQuery* query) const;
-
-	/// Returns portal points between two polygons.
-	dtStatus getPortalPoints(dtPolyRef from, dtPolyRef to, float* left, float* right,
-							 unsigned char& fromType, unsigned char& toType) const;
-	dtStatus getPortalPoints(dtPolyRef from, const dtPoly* fromPoly, const dtMeshTile* fromTile,
-							 dtPolyRef to, const dtPoly* toPoly, const dtMeshTile* toTile,
-							 float* left, float* right) const;
-	
-	/// Returns edge mid point between two polygons.
-	dtStatus getEdgeMidPoint(dtPolyRef from, dtPolyRef to, float* mid) const;
-	dtStatus getEdgeMidPoint(dtPolyRef from, const dtPoly* fromPoly, const dtMeshTile* fromTile,
-							 dtPolyRef to, const dtPoly* toPoly, const dtMeshTile* toTile,
-							 float* mid) const;
-	
-	// Appends vertex to a straight path
-	dtStatus appendVertex(const float* pos, const unsigned char flags, const dtPolyRef ref,
-						  float* straightPath, unsigned char* straightPathFlags, dtPolyRef* straightPathRefs,
-						  int* straightPathCount, const int maxStraightPath) const;
-
-	// Appends intermediate portal points to a straight path.
-	dtStatus appendPortals(const int startIdx, const int endIdx, const float* endPos, const dtPolyRef* path,
-						   float* straightPath, unsigned char* straightPathFlags, dtPolyRef* straightPathRefs,
-						   int* straightPathCount, const int maxStraightPath, const int options) const;
-
-	// Gets the path leading to the specified end node.
-	dtStatus getPathToNode(struct dtNode* endNode, dtPolyRef* path, int* pathCount, int maxPath) const;
-	
-	const dtNavMesh* m_nav;				///< Pointer to navmesh data.
-
-	struct dtQueryData
-	{
-		dtStatus status;
-		struct dtNode* lastBestNode;
-		float lastBestNodeCost;
-		dtPolyRef startRef, endRef;
-		float startPos[3], endPos[3];
-		const dtQueryFilter* filter;
-		unsigned int options;
-		float raycastLimitSqr;
-	};
-	dtQueryData m_query;				///< Sliced query state.
-
-	class dtNodePool* m_tinyNodePool;	///< Pointer to small node pool.
-	class dtNodePool* m_nodePool;		///< Pointer to node pool.
-	class dtNodeQueue* m_openList;		///< Pointer to open list queue.
-};
-
-/// Allocates a query object using the Detour allocator.
-/// @return An allocated query object, or null on failure.
-/// @ingroup detour
-dtNavMeshQuery* dtAllocNavMeshQuery();
-
-/// Frees the specified query object using the Detour allocator.
-///  @param[in]		query		A query object allocated using #dtAllocNavMeshQuery
-/// @ingroup detour
-void dtFreeNavMeshQuery(dtNavMeshQuery* query);
-
-#endif // DETOURNAVMESHQUERY_H
diff --git a/extern/recastnavigation/Detour/Include/DetourNode.h b/extern/recastnavigation/Detour/Include/DetourNode.h
deleted file mode 100644
index db09747080..0000000000
--- a/extern/recastnavigation/Detour/Include/DetourNode.h
+++ /dev/null
@@ -1,168 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef DETOURNODE_H
-#define DETOURNODE_H
-
-#include "DetourNavMesh.h"
-
-enum dtNodeFlags
-{
-	DT_NODE_OPEN = 0x01,
-	DT_NODE_CLOSED = 0x02,
-	DT_NODE_PARENT_DETACHED = 0x04, // parent of the node is not adjacent. Found using raycast.
-};
-
-typedef unsigned short dtNodeIndex;
-static const dtNodeIndex DT_NULL_IDX = (dtNodeIndex)~0;
-
-static const int DT_NODE_PARENT_BITS = 24;
-static const int DT_NODE_STATE_BITS = 2;
-struct dtNode
-{
-	float pos[3];								///< Position of the node.
-	float cost;									///< Cost from previous node to current node.
-	float total;								///< Cost up to the node.
-	unsigned int pidx : DT_NODE_PARENT_BITS;	///< Index to parent node.
-	unsigned int state : DT_NODE_STATE_BITS;	///< extra state information. A polyRef can have multiple nodes with different extra info. see DT_MAX_STATES_PER_NODE
-	unsigned int flags : 3;						///< Node flags. A combination of dtNodeFlags.
-	dtPolyRef id;								///< Polygon ref the node corresponds to.
-};
-
-static const int DT_MAX_STATES_PER_NODE = 1 << DT_NODE_STATE_BITS;	// number of extra states per node. See dtNode::state
-
-class dtNodePool
-{
-public:
-	dtNodePool(int maxNodes, int hashSize);
-	~dtNodePool();
-	void clear();
-
-	// Get a dtNode by ref and extra state information. If there is none then - allocate
-	// There can be more than one node for the same polyRef but with different extra state information
-	dtNode* getNode(dtPolyRef id, unsigned char state=0);	
-	dtNode* findNode(dtPolyRef id, unsigned char state);
-	unsigned int findNodes(dtPolyRef id, dtNode** nodes, const int maxNodes);
-
-	inline unsigned int getNodeIdx(const dtNode* node) const
-	{
-		if (!node) return 0;
-		return (unsigned int)(node - m_nodes) + 1;
-	}
-
-	inline dtNode* getNodeAtIdx(unsigned int idx)
-	{
-		if (!idx) return 0;
-		return &m_nodes[idx - 1];
-	}
-
-	inline const dtNode* getNodeAtIdx(unsigned int idx) const
-	{
-		if (!idx) return 0;
-		return &m_nodes[idx - 1];
-	}
-	
-	inline int getMemUsed() const
-	{
-		return sizeof(*this) +
-			sizeof(dtNode)*m_maxNodes +
-			sizeof(dtNodeIndex)*m_maxNodes +
-			sizeof(dtNodeIndex)*m_hashSize;
-	}
-	
-	inline int getMaxNodes() const { return m_maxNodes; }
-	
-	inline int getHashSize() const { return m_hashSize; }
-	inline dtNodeIndex getFirst(int bucket) const { return m_first[bucket]; }
-	inline dtNodeIndex getNext(int i) const { return m_next[i]; }
-	inline int getNodeCount() const { return m_nodeCount; }
-	
-private:
-	// Explicitly disabled copy constructor and copy assignment operator.
-	dtNodePool(const dtNodePool&);
-	dtNodePool& operator=(const dtNodePool&);
-	
-	dtNode* m_nodes;
-	dtNodeIndex* m_first;
-	dtNodeIndex* m_next;
-	const int m_maxNodes;
-	const int m_hashSize;
-	int m_nodeCount;
-};
-
-class dtNodeQueue
-{
-public:
-	dtNodeQueue(int n);
-	~dtNodeQueue();
-	
-	inline void clear() { m_size = 0; }
-	
-	inline dtNode* top() { return m_heap[0]; }
-	
-	inline dtNode* pop()
-	{
-		dtNode* result = m_heap[0];
-		m_size--;
-		trickleDown(0, m_heap[m_size]);
-		return result;
-	}
-	
-	inline void push(dtNode* node)
-	{
-		m_size++;
-		bubbleUp(m_size-1, node);
-	}
-	
-	inline void modify(dtNode* node)
-	{
-		for (int i = 0; i < m_size; ++i)
-		{
-			if (m_heap[i] == node)
-			{
-				bubbleUp(i, node);
-				return;
-			}
-		}
-	}
-	
-	inline bool empty() const { return m_size == 0; }
-	
-	inline int getMemUsed() const
-	{
-		return sizeof(*this) +
-		sizeof(dtNode*) * (m_capacity + 1);
-	}
-	
-	inline int getCapacity() const { return m_capacity; }
-	
-private:
-	// Explicitly disabled copy constructor and copy assignment operator.
-	dtNodeQueue(const dtNodeQueue&);
-	dtNodeQueue& operator=(const dtNodeQueue&);
-
-	void bubbleUp(int i, dtNode* node);
-	void trickleDown(int i, dtNode* node);
-	
-	dtNode** m_heap;
-	const int m_capacity;
-	int m_size;
-};		
-
-
-#endif // DETOURNODE_H
diff --git a/extern/recastnavigation/Detour/Include/DetourStatus.h b/extern/recastnavigation/Detour/Include/DetourStatus.h
deleted file mode 100644
index 8e1bb44b9d..0000000000
--- a/extern/recastnavigation/Detour/Include/DetourStatus.h
+++ /dev/null
@@ -1,65 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef DETOURSTATUS_H
-#define DETOURSTATUS_H
-
-typedef unsigned int dtStatus;
-
-// High level status.
-static const unsigned int DT_FAILURE = 1u << 31;			// Operation failed.
-static const unsigned int DT_SUCCESS = 1u << 30;			// Operation succeed.
-static const unsigned int DT_IN_PROGRESS = 1u << 29;		// Operation still in progress.
-
-// Detail information for status.
-static const unsigned int DT_STATUS_DETAIL_MASK = 0x0ffffff;
-static const unsigned int DT_WRONG_MAGIC = 1 << 0;		// Input data is not recognized.
-static const unsigned int DT_WRONG_VERSION = 1 << 1;	// Input data is in wrong version.
-static const unsigned int DT_OUT_OF_MEMORY = 1 << 2;	// Operation ran out of memory.
-static const unsigned int DT_INVALID_PARAM = 1 << 3;	// An input parameter was invalid.
-static const unsigned int DT_BUFFER_TOO_SMALL = 1 << 4;	// Result buffer for the query was too small to store all results.
-static const unsigned int DT_OUT_OF_NODES = 1 << 5;		// Query ran out of nodes during search.
-static const unsigned int DT_PARTIAL_RESULT = 1 << 6;	// Query did not reach the end location, returning best guess. 
-static const unsigned int DT_ALREADY_OCCUPIED = 1 << 7;	// A tile has already been assigned to the given x,y coordinate
-
-
-// Returns true of status is success.
-inline bool dtStatusSucceed(dtStatus status)
-{
-	return (status & DT_SUCCESS) != 0;
-}
-
-// Returns true of status is failure.
-inline bool dtStatusFailed(dtStatus status)
-{
-	return (status & DT_FAILURE) != 0;
-}
-
-// Returns true of status is in progress.
-inline bool dtStatusInProgress(dtStatus status)
-{
-	return (status & DT_IN_PROGRESS) != 0;
-}
-
-// Returns true if specific detail is set.
-inline bool dtStatusDetail(dtStatus status, unsigned int detail)
-{
-	return (status & detail) != 0;
-}
-
-#endif // DETOURSTATUS_H
diff --git a/extern/recastnavigation/Detour/Source/DetourAlloc.cpp b/extern/recastnavigation/Detour/Source/DetourAlloc.cpp
deleted file mode 100644
index d9ad1fc013..0000000000
--- a/extern/recastnavigation/Detour/Source/DetourAlloc.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#include <stdlib.h>
-#include "DetourAlloc.h"
-
-static void *dtAllocDefault(size_t size, dtAllocHint)
-{
-	return malloc(size);
-}
-
-static void dtFreeDefault(void *ptr)
-{
-	free(ptr);
-}
-
-static dtAllocFunc* sAllocFunc = dtAllocDefault;
-static dtFreeFunc* sFreeFunc = dtFreeDefault;
-
-void dtAllocSetCustom(dtAllocFunc *allocFunc, dtFreeFunc *freeFunc)
-{
-	sAllocFunc = allocFunc ? allocFunc : dtAllocDefault;
-	sFreeFunc = freeFunc ? freeFunc : dtFreeDefault;
-}
-
-void* dtAlloc(size_t size, dtAllocHint hint)
-{
-	return sAllocFunc(size, hint);
-}
-
-void dtFree(void* ptr)
-{
-	if (ptr)
-		sFreeFunc(ptr);
-}
diff --git a/extern/recastnavigation/Detour/Source/DetourAssert.cpp b/extern/recastnavigation/Detour/Source/DetourAssert.cpp
deleted file mode 100644
index 5e019e0cfc..0000000000
--- a/extern/recastnavigation/Detour/Source/DetourAssert.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#include "DetourAssert.h"
-
-#ifndef NDEBUG
-
-static dtAssertFailFunc* sAssertFailFunc = 0;
-
-void dtAssertFailSetCustom(dtAssertFailFunc *assertFailFunc)
-{
-	sAssertFailFunc = assertFailFunc;
-}
-
-dtAssertFailFunc* dtAssertFailGetCustom()
-{
-	return sAssertFailFunc;
-}
-
-#endif
diff --git a/extern/recastnavigation/Detour/Source/DetourCommon.cpp b/extern/recastnavigation/Detour/Source/DetourCommon.cpp
deleted file mode 100644
index b89d7512c4..0000000000
--- a/extern/recastnavigation/Detour/Source/DetourCommon.cpp
+++ /dev/null
@@ -1,387 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#include "DetourCommon.h"
-#include "DetourMath.h"
-
-//////////////////////////////////////////////////////////////////////////////////////////
-
-void dtClosestPtPointTriangle(float* closest, const float* p,
-							  const float* a, const float* b, const float* c)
-{
-	// Check if P in vertex region outside A
-	float ab[3], ac[3], ap[3];
-	dtVsub(ab, b, a);
-	dtVsub(ac, c, a);
-	dtVsub(ap, p, a);
-	float d1 = dtVdot(ab, ap);
-	float d2 = dtVdot(ac, ap);
-	if (d1 <= 0.0f && d2 <= 0.0f)
-	{
-		// barycentric coordinates (1,0,0)
-		dtVcopy(closest, a);
-		return;
-	}
-	
-	// Check if P in vertex region outside B
-	float bp[3];
-	dtVsub(bp, p, b);
-	float d3 = dtVdot(ab, bp);
-	float d4 = dtVdot(ac, bp);
-	if (d3 >= 0.0f && d4 <= d3)
-	{
-		// barycentric coordinates (0,1,0)
-		dtVcopy(closest, b);
-		return;
-	}
-	
-	// Check if P in edge region of AB, if so return projection of P onto AB
-	float vc = d1*d4 - d3*d2;
-	if (vc <= 0.0f && d1 >= 0.0f && d3 <= 0.0f)
-	{
-		// barycentric coordinates (1-v,v,0)
-		float v = d1 / (d1 - d3);
-		closest[0] = a[0] + v * ab[0];
-		closest[1] = a[1] + v * ab[1];
-		closest[2] = a[2] + v * ab[2];
-		return;
-	}
-	
-	// Check if P in vertex region outside C
-	float cp[3];
-	dtVsub(cp, p, c);
-	float d5 = dtVdot(ab, cp);
-	float d6 = dtVdot(ac, cp);
-	if (d6 >= 0.0f && d5 <= d6)
-	{
-		// barycentric coordinates (0,0,1)
-		dtVcopy(closest, c);
-		return;
-	}
-	
-	// Check if P in edge region of AC, if so return projection of P onto AC
-	float vb = d5*d2 - d1*d6;
-	if (vb <= 0.0f && d2 >= 0.0f && d6 <= 0.0f)
-	{
-		// barycentric coordinates (1-w,0,w)
-		float w = d2 / (d2 - d6);
-		closest[0] = a[0] + w * ac[0];
-		closest[1] = a[1] + w * ac[1];
-		closest[2] = a[2] + w * ac[2];
-		return;
-	}
-	
-	// Check if P in edge region of BC, if so return projection of P onto BC
-	float va = d3*d6 - d5*d4;
-	if (va <= 0.0f && (d4 - d3) >= 0.0f && (d5 - d6) >= 0.0f)
-	{
-		// barycentric coordinates (0,1-w,w)
-		float w = (d4 - d3) / ((d4 - d3) + (d5 - d6));
-		closest[0] = b[0] + w * (c[0] - b[0]);
-		closest[1] = b[1] + w * (c[1] - b[1]);
-		closest[2] = b[2] + w * (c[2] - b[2]);
-		return;
-	}
-	
-	// P inside face region. Compute Q through its barycentric coordinates (u,v,w)
-	float denom = 1.0f / (va + vb + vc);
-	float v = vb * denom;
-	float w = vc * denom;
-	closest[0] = a[0] + ab[0] * v + ac[0] * w;
-	closest[1] = a[1] + ab[1] * v + ac[1] * w;
-	closest[2] = a[2] + ab[2] * v + ac[2] * w;
-}
-
-bool dtIntersectSegmentPoly2D(const float* p0, const float* p1,
-							  const float* verts, int nverts,
-							  float& tmin, float& tmax,
-							  int& segMin, int& segMax)
-{
-	static const float EPS = 0.00000001f;
-	
-	tmin = 0;
-	tmax = 1;
-	segMin = -1;
-	segMax = -1;
-	
-	float dir[3];
-	dtVsub(dir, p1, p0);
-	
-	for (int i = 0, j = nverts-1; i < nverts; j=i++)
-	{
-		float edge[3], diff[3];
-		dtVsub(edge, &verts[i*3], &verts[j*3]);
-		dtVsub(diff, p0, &verts[j*3]);
-		const float n = dtVperp2D(edge, diff);
-		const float d = dtVperp2D(dir, edge);
-		if (fabsf(d) < EPS)
-		{
-			// S is nearly parallel to this edge
-			if (n < 0)
-				return false;
-			else
-				continue;
-		}
-		const float t = n / d;
-		if (d < 0)
-		{
-			// segment S is entering across this edge
-			if (t > tmin)
-			{
-				tmin = t;
-				segMin = j;
-				// S enters after leaving polygon
-				if (tmin > tmax)
-					return false;
-			}
-		}
-		else
-		{
-			// segment S is leaving across this edge
-			if (t < tmax)
-			{
-				tmax = t;
-				segMax = j;
-				// S leaves before entering polygon
-				if (tmax < tmin)
-					return false;
-			}
-		}
-	}
-	
-	return true;
-}
-
-float dtDistancePtSegSqr2D(const float* pt, const float* p, const float* q, float& t)
-{
-	float pqx = q[0] - p[0];
-	float pqz = q[2] - p[2];
-	float dx = pt[0] - p[0];
-	float dz = pt[2] - p[2];
-	float d = pqx*pqx + pqz*pqz;
-	t = pqx*dx + pqz*dz;
-	if (d > 0) t /= d;
-	if (t < 0) t = 0;
-	else if (t > 1) t = 1;
-	dx = p[0] + t*pqx - pt[0];
-	dz = p[2] + t*pqz - pt[2];
-	return dx*dx + dz*dz;
-}
-
-void dtCalcPolyCenter(float* tc, const unsigned short* idx, int nidx, const float* verts)
-{
-	tc[0] = 0.0f;
-	tc[1] = 0.0f;
-	tc[2] = 0.0f;
-	for (int j = 0; j < nidx; ++j)
-	{
-		const float* v = &verts[idx[j]*3];
-		tc[0] += v[0];
-		tc[1] += v[1];
-		tc[2] += v[2];
-	}
-	const float s = 1.0f / nidx;
-	tc[0] *= s;
-	tc[1] *= s;
-	tc[2] *= s;
-}
-
-bool dtClosestHeightPointTriangle(const float* p, const float* a, const float* b, const float* c, float& h)
-{
-	const float EPS = 1e-6f;
-	float v0[3], v1[3], v2[3];
-
-	dtVsub(v0, c, a);
-	dtVsub(v1, b, a);
-	dtVsub(v2, p, a);
-
-	// Compute scaled barycentric coordinates
-	float denom = v0[0] * v1[2] - v0[2] * v1[0];
-	if (fabsf(denom) < EPS)
-		return false;
-
-	float u = v1[2] * v2[0] - v1[0] * v2[2];
-	float v = v0[0] * v2[2] - v0[2] * v2[0];
-
-	if (denom < 0) {
-		denom = -denom;
-		u = -u;
-		v = -v;
-	}
-
-	// If point lies inside the triangle, return interpolated ycoord.
-	if (u >= 0.0f && v >= 0.0f && (u + v) <= denom) {
-		h = a[1] + (v0[1] * u + v1[1] * v) / denom;
-		return true;
-	}
-	return false;
-}
-
-/// @par
-///
-/// All points are projected onto the xz-plane, so the y-values are ignored.
-bool dtPointInPolygon(const float* pt, const float* verts, const int nverts)
-{
-	// TODO: Replace pnpoly with triArea2D tests?
-	int i, j;
-	bool c = false;
-	for (i = 0, j = nverts-1; i < nverts; j = i++)
-	{
-		const float* vi = &verts[i*3];
-		const float* vj = &verts[j*3];
-		if (((vi[2] > pt[2]) != (vj[2] > pt[2])) &&
-			(pt[0] < (vj[0]-vi[0]) * (pt[2]-vi[2]) / (vj[2]-vi[2]) + vi[0]) )
-			c = !c;
-	}
-	return c;
-}
-
-bool dtDistancePtPolyEdgesSqr(const float* pt, const float* verts, const int nverts,
-							  float* ed, float* et)
-{
-	// TODO: Replace pnpoly with triArea2D tests?
-	int i, j;
-	bool c = false;
-	for (i = 0, j = nverts-1; i < nverts; j = i++)
-	{
-		const float* vi = &verts[i*3];
-		const float* vj = &verts[j*3];
-		if (((vi[2] > pt[2]) != (vj[2] > pt[2])) &&
-			(pt[0] < (vj[0]-vi[0]) * (pt[2]-vi[2]) / (vj[2]-vi[2]) + vi[0]) )
-			c = !c;
-		ed[j] = dtDistancePtSegSqr2D(pt, vj, vi, et[j]);
-	}
-	return c;
-}
-
-static void projectPoly(const float* axis, const float* poly, const int npoly,
-						float& rmin, float& rmax)
-{
-	rmin = rmax = dtVdot2D(axis, &poly[0]);
-	for (int i = 1; i < npoly; ++i)
-	{
-		const float d = dtVdot2D(axis, &poly[i*3]);
-		rmin = dtMin(rmin, d);
-		rmax = dtMax(rmax, d);
-	}
-}
-
-inline bool overlapRange(const float amin, const float amax,
-						 const float bmin, const float bmax,
-						 const float eps)
-{
-	return ((amin+eps) > bmax || (amax-eps) < bmin) ? false : true;
-}
-
-/// @par
-///
-/// All vertices are projected onto the xz-plane, so the y-values are ignored.
-bool dtOverlapPolyPoly2D(const float* polya, const int npolya,
-						 const float* polyb, const int npolyb)
-{
-	const float eps = 1e-4f;
-	
-	for (int i = 0, j = npolya-1; i < npolya; j=i++)
-	{
-		const float* va = &polya[j*3];
-		const float* vb = &polya[i*3];
-		const float n[3] = { vb[2]-va[2], 0, -(vb[0]-va[0]) };
-		float amin,amax,bmin,bmax;
-		projectPoly(n, polya, npolya, amin,amax);
-		projectPoly(n, polyb, npolyb, bmin,bmax);
-		if (!overlapRange(amin,amax, bmin,bmax, eps))
-		{
-			// Found separating axis
-			return false;
-		}
-	}
-	for (int i = 0, j = npolyb-1; i < npolyb; j=i++)
-	{
-		const float* va = &polyb[j*3];
-		const float* vb = &polyb[i*3];
-		const float n[3] = { vb[2]-va[2], 0, -(vb[0]-va[0]) };
-		float amin,amax,bmin,bmax;
-		projectPoly(n, polya, npolya, amin,amax);
-		projectPoly(n, polyb, npolyb, bmin,bmax);
-		if (!overlapRange(amin,amax, bmin,bmax, eps))
-		{
-			// Found separating axis
-			return false;
-		}
-	}
-	return true;
-}
-
-// Returns a random point in a convex polygon.
-// Adapted from Graphics Gems article.
-void dtRandomPointInConvexPoly(const float* pts, const int npts, float* areas,
-							   const float s, const float t, float* out)
-{
-	// Calc triangle araes
-	float areasum = 0.0f;
-	for (int i = 2; i < npts; i++) {
-		areas[i] = dtTriArea2D(&pts[0], &pts[(i-1)*3], &pts[i*3]);
-		areasum += dtMax(0.001f, areas[i]);
-	}
-	// Find sub triangle weighted by area.
-	const float thr = s*areasum;
-	float acc = 0.0f;
-	float u = 1.0f;
-	int tri = npts - 1;
-	for (int i = 2; i < npts; i++) {
-		const float dacc = areas[i];
-		if (thr >= acc && thr < (acc+dacc))
-		{
-			u = (thr - acc) / dacc;
-			tri = i;
-			break;
-		}
-		acc += dacc;
-	}
-	
-	float v = dtMathSqrtf(t);
-	
-	const float a = 1 - v;
-	const float b = (1 - u) * v;
-	const float c = u * v;
-	const float* pa = &pts[0];
-	const float* pb = &pts[(tri-1)*3];
-	const float* pc = &pts[tri*3];
-	
-	out[0] = a*pa[0] + b*pb[0] + c*pc[0];
-	out[1] = a*pa[1] + b*pb[1] + c*pc[1];
-	out[2] = a*pa[2] + b*pb[2] + c*pc[2];
-}
-
-inline float vperpXZ(const float* a, const float* b) { return a[0]*b[2] - a[2]*b[0]; }
-
-bool dtIntersectSegSeg2D(const float* ap, const float* aq,
-						 const float* bp, const float* bq,
-						 float& s, float& t)
-{
-	float u[3], v[3], w[3];
-	dtVsub(u,aq,ap);
-	dtVsub(v,bq,bp);
-	dtVsub(w,ap,bp);
-	float d = vperpXZ(u,v);
-	if (fabsf(d) < 1e-6f) return false;
-	s = vperpXZ(v,w) / d;
-	t = vperpXZ(u,w) / d;
-	return true;
-}
-
diff --git a/extern/recastnavigation/Detour/Source/DetourNavMesh.cpp b/extern/recastnavigation/Detour/Source/DetourNavMesh.cpp
deleted file mode 100644
index a655d1d89a..0000000000
--- a/extern/recastnavigation/Detour/Source/DetourNavMesh.cpp
+++ /dev/null
@@ -1,1584 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#include <float.h>
-#include <string.h>
-#include <stdio.h>
-#include "DetourNavMesh.h"
-#include "DetourNode.h"
-#include "DetourCommon.h"
-#include "DetourMath.h"
-#include "DetourAlloc.h"
-#include "DetourAssert.h"
-#include <new>
-
-
-inline bool overlapSlabs(const float* amin, const float* amax,
-						 const float* bmin, const float* bmax,
-						 const float px, const float py)
-{
-	// Check for horizontal overlap.
-	// The segment is shrunken a little so that slabs which touch
-	// at end points are not connected.
-	const float minx = dtMax(amin[0]+px,bmin[0]+px);
-	const float maxx = dtMin(amax[0]-px,bmax[0]-px);
-	if (minx > maxx)
-		return false;
-	
-	// Check vertical overlap.
-	const float ad = (amax[1]-amin[1]) / (amax[0]-amin[0]);
-	const float ak = amin[1] - ad*amin[0];
-	const float bd = (bmax[1]-bmin[1]) / (bmax[0]-bmin[0]);
-	const float bk = bmin[1] - bd*bmin[0];
-	const float aminy = ad*minx + ak;
-	const float amaxy = ad*maxx + ak;
-	const float bminy = bd*minx + bk;
-	const float bmaxy = bd*maxx + bk;
-	const float dmin = bminy - aminy;
-	const float dmax = bmaxy - amaxy;
-		
-	// Crossing segments always overlap.
-	if (dmin*dmax < 0)
-		return true;
-		
-	// Check for overlap at endpoints.
-	const float thr = dtSqr(py*2);
-	if (dmin*dmin <= thr || dmax*dmax <= thr)
-		return true;
-		
-	return false;
-}
-
-static float getSlabCoord(const float* va, const int side)
-{
-	if (side == 0 || side == 4)
-		return va[0];
-	else if (side == 2 || side == 6)
-		return va[2];
-	return 0;
-}
-
-static void calcSlabEndPoints(const float* va, const float* vb, float* bmin, float* bmax, const int side)
-{
-	if (side == 0 || side == 4)
-	{
-		if (va[2] < vb[2])
-		{
-			bmin[0] = va[2];
-			bmin[1] = va[1];
-			bmax[0] = vb[2];
-			bmax[1] = vb[1];
-		}
-		else
-		{
-			bmin[0] = vb[2];
-			bmin[1] = vb[1];
-			bmax[0] = va[2];
-			bmax[1] = va[1];
-		}
-	}
-	else if (side == 2 || side == 6)
-	{
-		if (va[0] < vb[0])
-		{
-			bmin[0] = va[0];
-			bmin[1] = va[1];
-			bmax[0] = vb[0];
-			bmax[1] = vb[1];
-		}
-		else
-		{
-			bmin[0] = vb[0];
-			bmin[1] = vb[1];
-			bmax[0] = va[0];
-			bmax[1] = va[1];
-		}
-	}
-}
-
-inline int computeTileHash(int x, int y, const int mask)
-{
-	const unsigned int h1 = 0x8da6b343; // Large multiplicative constants;
-	const unsigned int h2 = 0xd8163841; // here arbitrarily chosen primes
-	unsigned int n = h1 * x + h2 * y;
-	return (int)(n & mask);
-}
-
-inline unsigned int allocLink(dtMeshTile* tile)
-{
-	if (tile->linksFreeList == DT_NULL_LINK)
-		return DT_NULL_LINK;
-	unsigned int link = tile->linksFreeList;
-	tile->linksFreeList = tile->links[link].next;
-	return link;
-}
-
-inline void freeLink(dtMeshTile* tile, unsigned int link)
-{
-	tile->links[link].next = tile->linksFreeList;
-	tile->linksFreeList = link;
-}
-
-
-dtNavMesh* dtAllocNavMesh()
-{
-	void* mem = dtAlloc(sizeof(dtNavMesh), DT_ALLOC_PERM);
-	if (!mem) return 0;
-	return new(mem) dtNavMesh;
-}
-
-/// @par
-///
-/// This function will only free the memory for tiles with the #DT_TILE_FREE_DATA
-/// flag set.
-void dtFreeNavMesh(dtNavMesh* navmesh)
-{
-	if (!navmesh) return;
-	navmesh->~dtNavMesh();
-	dtFree(navmesh);
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////
-
-/**
-@class dtNavMesh
-
-The navigation mesh consists of one or more tiles defining three primary types of structural data:
-
-A polygon mesh which defines most of the navigation graph. (See rcPolyMesh for its structure.)
-A detail mesh used for determining surface height on the polygon mesh. (See rcPolyMeshDetail for its structure.)
-Off-mesh connections, which define custom point-to-point edges within the navigation graph.
-
-The general build process is as follows:
-
--# Create rcPolyMesh and rcPolyMeshDetail data using the Recast build pipeline.
--# Optionally, create off-mesh connection data.
--# Combine the source data into a dtNavMeshCreateParams structure.
--# Create a tile data array using dtCreateNavMeshData().
--# Allocate at dtNavMesh object and initialize it. (For single tile navigation meshes,
-   the tile data is loaded during this step.)
--# For multi-tile navigation meshes, load the tile data using dtNavMesh::addTile().
-
-Notes:
-
-- This class is usually used in conjunction with the dtNavMeshQuery class for pathfinding.
-- Technically, all navigation meshes are tiled. A 'solo' mesh is simply a navigation mesh initialized 
-  to have only a single tile.
-- This class does not implement any asynchronous methods. So the ::dtStatus result of all methods will 
-  always contain either a success or failure flag.
-
-@see dtNavMeshQuery, dtCreateNavMeshData, dtNavMeshCreateParams, #dtAllocNavMesh, #dtFreeNavMesh
-*/
-
-dtNavMesh::dtNavMesh() :
-	m_tileWidth(0),
-	m_tileHeight(0),
-	m_maxTiles(0),
-	m_tileLutSize(0),
-	m_tileLutMask(0),
-	m_posLookup(0),
-	m_nextFree(0),
-	m_tiles(0)
-{
-#ifndef DT_POLYREF64
-	m_saltBits = 0;
-	m_tileBits = 0;
-	m_polyBits = 0;
-#endif
-	memset(&m_params, 0, sizeof(dtNavMeshParams));
-	m_orig[0] = 0;
-	m_orig[1] = 0;
-	m_orig[2] = 0;
-}
-
-dtNavMesh::~dtNavMesh()
-{
-	for (int i = 0; i < m_maxTiles; ++i)
-	{
-		if (m_tiles[i].flags & DT_TILE_FREE_DATA)
-		{
-			dtFree(m_tiles[i].data);
-			m_tiles[i].data = 0;
-			m_tiles[i].dataSize = 0;
-		}
-	}
-	dtFree(m_posLookup);
-	dtFree(m_tiles);
-}
-		
-dtStatus dtNavMesh::init(const dtNavMeshParams* params)
-{
-	memcpy(&m_params, params, sizeof(dtNavMeshParams));
-	dtVcopy(m_orig, params->orig);
-	m_tileWidth = params->tileWidth;
-	m_tileHeight = params->tileHeight;
-	
-	// Init tiles
-	m_maxTiles = params->maxTiles;
-	m_tileLutSize = dtNextPow2(params->maxTiles/4);
-	if (!m_tileLutSize) m_tileLutSize = 1;
-	m_tileLutMask = m_tileLutSize-1;
-	
-	m_tiles = (dtMeshTile*)dtAlloc(sizeof(dtMeshTile)*m_maxTiles, DT_ALLOC_PERM);
-	if (!m_tiles)
-		return DT_FAILURE | DT_OUT_OF_MEMORY;
-	m_posLookup = (dtMeshTile**)dtAlloc(sizeof(dtMeshTile*)*m_tileLutSize, DT_ALLOC_PERM);
-	if (!m_posLookup)
-		return DT_FAILURE | DT_OUT_OF_MEMORY;
-	memset(m_tiles, 0, sizeof(dtMeshTile)*m_maxTiles);
-	memset(m_posLookup, 0, sizeof(dtMeshTile*)*m_tileLutSize);
-	m_nextFree = 0;
-	for (int i = m_maxTiles-1; i >= 0; --i)
-	{
-		m_tiles[i].salt = 1;
-		m_tiles[i].next = m_nextFree;
-		m_nextFree = &m_tiles[i];
-	}
-	
-	// Init ID generator values.
-#ifndef DT_POLYREF64
-	m_tileBits = dtIlog2(dtNextPow2((unsigned int)params->maxTiles));
-	m_polyBits = dtIlog2(dtNextPow2((unsigned int)params->maxPolys));
-	// Only allow 31 salt bits, since the salt mask is calculated using 32bit uint and it will overflow.
-	m_saltBits = dtMin((unsigned int)31, 32 - m_tileBits - m_polyBits);
-
-	if (m_saltBits < 10)
-		return DT_FAILURE | DT_INVALID_PARAM;
-#endif
-	
-	return DT_SUCCESS;
-}
-
-dtStatus dtNavMesh::init(unsigned char* data, const int dataSize, const int flags)
-{
-	// Make sure the data is in right format.
-	dtMeshHeader* header = (dtMeshHeader*)data;
-	if (header->magic != DT_NAVMESH_MAGIC)
-		return DT_FAILURE | DT_WRONG_MAGIC;
-	if (header->version != DT_NAVMESH_VERSION)
-		return DT_FAILURE | DT_WRONG_VERSION;
-
-	dtNavMeshParams params;
-	dtVcopy(params.orig, header->bmin);
-	params.tileWidth = header->bmax[0] - header->bmin[0];
-	params.tileHeight = header->bmax[2] - header->bmin[2];
-	params.maxTiles = 1;
-	params.maxPolys = header->polyCount;
-	
-	dtStatus status = init(&params);
-	if (dtStatusFailed(status))
-		return status;
-
-	return addTile(data, dataSize, flags, 0, 0);
-}
-
-/// @par
-///
-/// @note The parameters are created automatically when the single tile
-/// initialization is performed.
-const dtNavMeshParams* dtNavMesh::getParams() const
-{
-	return &m_params;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////
-int dtNavMesh::findConnectingPolys(const float* va, const float* vb,
-								   const dtMeshTile* tile, int side,
-								   dtPolyRef* con, float* conarea, int maxcon) const
-{
-	if (!tile) return 0;
-	
-	float amin[2], amax[2];
-	calcSlabEndPoints(va, vb, amin, amax, side);
-	const float apos = getSlabCoord(va, side);
-
-	// Remove links pointing to 'side' and compact the links array. 
-	float bmin[2], bmax[2];
-	unsigned short m = DT_EXT_LINK | (unsigned short)side;
-	int n = 0;
-	
-	dtPolyRef base = getPolyRefBase(tile);
-	
-	for (int i = 0; i < tile->header->polyCount; ++i)
-	{
-		dtPoly* poly = &tile->polys[i];
-		const int nv = poly->vertCount;
-		for (int j = 0; j < nv; ++j)
-		{
-			// Skip edges which do not point to the right side.
-			if (poly->neis[j] != m) continue;
-			
-			const float* vc = &tile->verts[poly->verts[j]*3];
-			const float* vd = &tile->verts[poly->verts[(j+1) % nv]*3];
-			const float bpos = getSlabCoord(vc, side);
-			
-			// Segments are not close enough.
-			if (dtAbs(apos-bpos) > 0.01f)
-				continue;
-			
-			// Check if the segments touch.
-			calcSlabEndPoints(vc,vd, bmin,bmax, side);
-			
-			if (!overlapSlabs(amin,amax, bmin,bmax, 0.01f, tile->header->walkableClimb)) continue;
-			
-			// Add return value.
-			if (n < maxcon)
-			{
-				conarea[n*2+0] = dtMax(amin[0], bmin[0]);
-				conarea[n*2+1] = dtMin(amax[0], bmax[0]);
-				con[n] = base | (dtPolyRef)i;
-				n++;
-			}
-			break;
-		}
-	}
-	return n;
-}
-
-void dtNavMesh::unconnectLinks(dtMeshTile* tile, dtMeshTile* target)
-{
-	if (!tile || !target) return;
-
-	const unsigned int targetNum = decodePolyIdTile(getTileRef(target));
-
-	for (int i = 0; i < tile->header->polyCount; ++i)
-	{
-		dtPoly* poly = &tile->polys[i];
-		unsigned int j = poly->firstLink;
-		unsigned int pj = DT_NULL_LINK;
-		while (j != DT_NULL_LINK)
-		{
-			if (decodePolyIdTile(tile->links[j].ref) == targetNum)
-			{
-				// Remove link.
-				unsigned int nj = tile->links[j].next;
-				if (pj == DT_NULL_LINK)
-					poly->firstLink = nj;
-				else
-					tile->links[pj].next = nj;
-				freeLink(tile, j);
-				j = nj;
-			}
-			else
-			{
-				// Advance
-				pj = j;
-				j = tile->links[j].next;
-			}
-		}
-	}
-}
-
-void dtNavMesh::connectExtLinks(dtMeshTile* tile, dtMeshTile* target, int side)
-{
-	if (!tile) return;
-	
-	// Connect border links.
-	for (int i = 0; i < tile->header->polyCount; ++i)
-	{
-		dtPoly* poly = &tile->polys[i];
-
-		// Create new links.
-//		unsigned short m = DT_EXT_LINK | (unsigned short)side;
-		
-		const int nv = poly->vertCount;
-		for (int j = 0; j < nv; ++j)
-		{
-			// Skip non-portal edges.
-			if ((poly->neis[j] & DT_EXT_LINK) == 0)
-				continue;
-			
-			const int dir = (int)(poly->neis[j] & 0xff);
-			if (side != -1 && dir != side)
-				continue;
-			
-			// Create new links
-			const float* va = &tile->verts[poly->verts[j]*3];
-			const float* vb = &tile->verts[poly->verts[(j+1) % nv]*3];
-			dtPolyRef nei[4];
-			float neia[4*2];
-			int nnei = findConnectingPolys(va,vb, target, dtOppositeTile(dir), nei,neia,4);
-			for (int k = 0; k < nnei; ++k)
-			{
-				unsigned int idx = allocLink(tile);
-				if (idx != DT_NULL_LINK)
-				{
-					dtLink* link = &tile->links[idx];
-					link->ref = nei[k];
-					link->edge = (unsigned char)j;
-					link->side = (unsigned char)dir;
-					
-					link->next = poly->firstLink;
-					poly->firstLink = idx;
-
-					// Compress portal limits to a byte value.
-					if (dir == 0 || dir == 4)
-					{
-						float tmin = (neia[k*2+0]-va[2]) / (vb[2]-va[2]);
-						float tmax = (neia[k*2+1]-va[2]) / (vb[2]-va[2]);
-						if (tmin > tmax)
-							dtSwap(tmin,tmax);
-						link->bmin = (unsigned char)(dtClamp(tmin, 0.0f, 1.0f)*255.0f);
-						link->bmax = (unsigned char)(dtClamp(tmax, 0.0f, 1.0f)*255.0f);
-					}
-					else if (dir == 2 || dir == 6)
-					{
-						float tmin = (neia[k*2+0]-va[0]) / (vb[0]-va[0]);
-						float tmax = (neia[k*2+1]-va[0]) / (vb[0]-va[0]);
-						if (tmin > tmax)
-							dtSwap(tmin,tmax);
-						link->bmin = (unsigned char)(dtClamp(tmin, 0.0f, 1.0f)*255.0f);
-						link->bmax = (unsigned char)(dtClamp(tmax, 0.0f, 1.0f)*255.0f);
-					}
-				}
-			}
-		}
-	}
-}
-
-void dtNavMesh::connectExtOffMeshLinks(dtMeshTile* tile, dtMeshTile* target, int side)
-{
-	if (!tile) return;
-	
-	// Connect off-mesh links.
-	// We are interested on links which land from target tile to this tile.
-	const unsigned char oppositeSide = (side == -1) ? 0xff : (unsigned char)dtOppositeTile(side);
-	
-	for (int i = 0; i < target->header->offMeshConCount; ++i)
-	{
-		dtOffMeshConnection* targetCon = &target->offMeshCons[i];
-		if (targetCon->side != oppositeSide)
-			continue;
-
-		dtPoly* targetPoly = &target->polys[targetCon->poly];
-		// Skip off-mesh connections which start location could not be connected at all.
-		if (targetPoly->firstLink == DT_NULL_LINK)
-			continue;
-		
-		const float halfExtents[3] = { targetCon->rad, target->header->walkableClimb, targetCon->rad };
-		
-		// Find polygon to connect to.
-		const float* p = &targetCon->pos[3];
-		float nearestPt[3];
-		dtPolyRef ref = findNearestPolyInTile(tile, p, halfExtents, nearestPt);
-		if (!ref)
-			continue;
-		// findNearestPoly may return too optimistic results, further check to make sure. 
-		if (dtSqr(nearestPt[0]-p[0])+dtSqr(nearestPt[2]-p[2]) > dtSqr(targetCon->rad))
-			continue;
-		// Make sure the location is on current mesh.
-		float* v = &target->verts[targetPoly->verts[1]*3];
-		dtVcopy(v, nearestPt);
-				
-		// Link off-mesh connection to target poly.
-		unsigned int idx = allocLink(target);
-		if (idx != DT_NULL_LINK)
-		{
-			dtLink* link = &target->links[idx];
-			link->ref = ref;
-			link->edge = (unsigned char)1;
-			link->side = oppositeSide;
-			link->bmin = link->bmax = 0;
-			// Add to linked list.
-			link->next = targetPoly->firstLink;
-			targetPoly->firstLink = idx;
-		}
-		
-		// Link target poly to off-mesh connection.
-		if (targetCon->flags & DT_OFFMESH_CON_BIDIR)
-		{
-			unsigned int tidx = allocLink(tile);
-			if (tidx != DT_NULL_LINK)
-			{
-				const unsigned short landPolyIdx = (unsigned short)decodePolyIdPoly(ref);
-				dtPoly* landPoly = &tile->polys[landPolyIdx];
-				dtLink* link = &tile->links[tidx];
-				link->ref = getPolyRefBase(target) | (dtPolyRef)(targetCon->poly);
-				link->edge = 0xff;
-				link->side = (unsigned char)(side == -1 ? 0xff : side);
-				link->bmin = link->bmax = 0;
-				// Add to linked list.
-				link->next = landPoly->firstLink;
-				landPoly->firstLink = tidx;
-			}
-		}
-	}
-
-}
-
-void dtNavMesh::connectIntLinks(dtMeshTile* tile)
-{
-	if (!tile) return;
-
-	dtPolyRef base = getPolyRefBase(tile);
-
-	for (int i = 0; i < tile->header->polyCount; ++i)
-	{
-		dtPoly* poly = &tile->polys[i];
-		poly->firstLink = DT_NULL_LINK;
-
-		if (poly->getType() == DT_POLYTYPE_OFFMESH_CONNECTION)
-			continue;
-			
-		// Build edge links backwards so that the links will be
-		// in the linked list from lowest index to highest.
-		for (int j = poly->vertCount-1; j >= 0; --j)
-		{
-			// Skip hard and non-internal edges.
-			if (poly->neis[j] == 0 || (poly->neis[j] & DT_EXT_LINK)) continue;
-
-			unsigned int idx = allocLink(tile);
-			if (idx != DT_NULL_LINK)
-			{
-				dtLink* link = &tile->links[idx];
-				link->ref = base | (dtPolyRef)(poly->neis[j]-1);
-				link->edge = (unsigned char)j;
-				link->side = 0xff;
-				link->bmin = link->bmax = 0;
-				// Add to linked list.
-				link->next = poly->firstLink;
-				poly->firstLink = idx;
-			}
-		}			
-	}
-}
-
-void dtNavMesh::baseOffMeshLinks(dtMeshTile* tile)
-{
-	if (!tile) return;
-	
-	dtPolyRef base = getPolyRefBase(tile);
-	
-	// Base off-mesh connection start points.
-	for (int i = 0; i < tile->header->offMeshConCount; ++i)
-	{
-		dtOffMeshConnection* con = &tile->offMeshCons[i];
-		dtPoly* poly = &tile->polys[con->poly];
-	
-		const float halfExtents[3] = { con->rad, tile->header->walkableClimb, con->rad };
-		
-		// Find polygon to connect to.
-		const float* p = &con->pos[0]; // First vertex
-		float nearestPt[3];
-		dtPolyRef ref = findNearestPolyInTile(tile, p, halfExtents, nearestPt);
-		if (!ref) continue;
-		// findNearestPoly may return too optimistic results, further check to make sure. 
-		if (dtSqr(nearestPt[0]-p[0])+dtSqr(nearestPt[2]-p[2]) > dtSqr(con->rad))
-			continue;
-		// Make sure the location is on current mesh.
-		float* v = &tile->verts[poly->verts[0]*3];
-		dtVcopy(v, nearestPt);
-
-		// Link off-mesh connection to target poly.
-		unsigned int idx = allocLink(tile);
-		if (idx != DT_NULL_LINK)
-		{
-			dtLink* link = &tile->links[idx];
-			link->ref = ref;
-			link->edge = (unsigned char)0;
-			link->side = 0xff;
-			link->bmin = link->bmax = 0;
-			// Add to linked list.
-			link->next = poly->firstLink;
-			poly->firstLink = idx;
-		}
-
-		// Start end-point is always connect back to off-mesh connection. 
-		unsigned int tidx = allocLink(tile);
-		if (tidx != DT_NULL_LINK)
-		{
-			const unsigned short landPolyIdx = (unsigned short)decodePolyIdPoly(ref);
-			dtPoly* landPoly = &tile->polys[landPolyIdx];
-			dtLink* link = &tile->links[tidx];
-			link->ref = base | (dtPolyRef)(con->poly);
-			link->edge = 0xff;
-			link->side = 0xff;
-			link->bmin = link->bmax = 0;
-			// Add to linked list.
-			link->next = landPoly->firstLink;
-			landPoly->firstLink = tidx;
-		}
-	}
-}
-
-namespace
-{
-	template<bool onlyBoundary>
-	void closestPointOnDetailEdges(const dtMeshTile* tile, const dtPoly* poly, const float* pos, float* closest)
-	{
-		const unsigned int ip = (unsigned int)(poly - tile->polys);
-		const dtPolyDetail* pd = &tile->detailMeshes[ip];
-
-		float dmin = FLT_MAX;
-		float tmin = 0;
-		const float* pmin = 0;
-		const float* pmax = 0;
-
-		for (int i = 0; i < pd->triCount; i++)
-		{
-			const unsigned char* tris = &tile->detailTris[(pd->triBase + i) * 4];
-			const int ANY_BOUNDARY_EDGE =
-				(DT_DETAIL_EDGE_BOUNDARY << 0) |
-				(DT_DETAIL_EDGE_BOUNDARY << 2) |
-				(DT_DETAIL_EDGE_BOUNDARY << 4);
-			if (onlyBoundary && (tris[3] & ANY_BOUNDARY_EDGE) == 0)
-				continue;
-
-			const float* v[3];
-			for (int j = 0; j < 3; ++j)
-			{
-				if (tris[j] < poly->vertCount)
-					v[j] = &tile->verts[poly->verts[tris[j]] * 3];
-				else
-					v[j] = &tile->detailVerts[(pd->vertBase + (tris[j] - poly->vertCount)) * 3];
-			}
-
-			for (int k = 0, j = 2; k < 3; j = k++)
-			{
-				if ((dtGetDetailTriEdgeFlags(tris[3], j) & DT_DETAIL_EDGE_BOUNDARY) == 0 &&
-					(onlyBoundary || tris[j] < tris[k]))
-				{
-					// Only looking at boundary edges and this is internal, or
-					// this is an inner edge that we will see again or have already seen.
-					continue;
-				}
-
-				float t;
-				float d = dtDistancePtSegSqr2D(pos, v[j], v[k], t);
-				if (d < dmin)
-				{
-					dmin = d;
-					tmin = t;
-					pmin = v[j];
-					pmax = v[k];
-				}
-			}
-		}
-
-		dtVlerp(closest, pmin, pmax, tmin);
-	}
-}
-
-bool dtNavMesh::getPolyHeight(const dtMeshTile* tile, const dtPoly* poly, const float* pos, float* height) const
-{
-	// Off-mesh connections do not have detail polys and getting height
-	// over them does not make sense.
-	if (poly->getType() == DT_POLYTYPE_OFFMESH_CONNECTION)
-		return false;
-
-	const unsigned int ip = (unsigned int)(poly - tile->polys);
-	const dtPolyDetail* pd = &tile->detailMeshes[ip];
-	
-	float verts[DT_VERTS_PER_POLYGON*3];	
-	const int nv = poly->vertCount;
-	for (int i = 0; i < nv; ++i)
-		dtVcopy(&verts[i*3], &tile->verts[poly->verts[i]*3]);
-	
-	if (!dtPointInPolygon(pos, verts, nv))
-		return false;
-
-	if (!height)
-		return true;
-	
-	// Find height at the location.
-	for (int j = 0; j < pd->triCount; ++j)
-	{
-		const unsigned char* t = &tile->detailTris[(pd->triBase+j)*4];
-		const float* v[3];
-		for (int k = 0; k < 3; ++k)
-		{
-			if (t[k] < poly->vertCount)
-				v[k] = &tile->verts[poly->verts[t[k]]*3];
-			else
-				v[k] = &tile->detailVerts[(pd->vertBase+(t[k]-poly->vertCount))*3];
-		}
-		float h;
-		if (dtClosestHeightPointTriangle(pos, v[0], v[1], v[2], h))
-		{
-			*height = h;
-			return true;
-		}
-	}
-
-	// If all triangle checks failed above (can happen with degenerate triangles
-	// or larger floating point values) the point is on an edge, so just select
-	// closest. This should almost never happen so the extra iteration here is
-	// ok.
-	float closest[3];
-	closestPointOnDetailEdges<false>(tile, poly, pos, closest);
-	*height = closest[1];
-	return true;
-}
-
-void dtNavMesh::closestPointOnPoly(dtPolyRef ref, const float* pos, float* closest, bool* posOverPoly) const
-{
-	const dtMeshTile* tile = 0;
-	const dtPoly* poly = 0;
-	getTileAndPolyByRefUnsafe(ref, &tile, &poly);
-
-	dtVcopy(closest, pos);
-	if (getPolyHeight(tile, poly, pos, &closest[1]))
-	{
-		if (posOverPoly)
-			*posOverPoly = true;
-		return;
-	}
-
-	if (posOverPoly)
-		*posOverPoly = false;
-
-	// Off-mesh connections don't have detail polygons.
-	if (poly->getType() == DT_POLYTYPE_OFFMESH_CONNECTION)
-	{
-		const float* v0 = &tile->verts[poly->verts[0]*3];
-		const float* v1 = &tile->verts[poly->verts[1]*3];
-		float t;
-		dtDistancePtSegSqr2D(pos, v0, v1, t);
-		dtVlerp(closest, v0, v1, t);
-		return;
-	}
-
-	// Outside poly that is not an offmesh connection.
-	closestPointOnDetailEdges<true>(tile, poly, pos, closest);
-}
-
-dtPolyRef dtNavMesh::findNearestPolyInTile(const dtMeshTile* tile,
-										   const float* center, const float* halfExtents,
-										   float* nearestPt) const
-{
-	float bmin[3], bmax[3];
-	dtVsub(bmin, center, halfExtents);
-	dtVadd(bmax, center, halfExtents);
-	
-	// Get nearby polygons from proximity grid.
-	dtPolyRef polys[128];
-	int polyCount = queryPolygonsInTile(tile, bmin, bmax, polys, 128);
-	
-	// Find nearest polygon amongst the nearby polygons.
-	dtPolyRef nearest = 0;
-	float nearestDistanceSqr = FLT_MAX;
-	for (int i = 0; i < polyCount; ++i)
-	{
-		dtPolyRef ref = polys[i];
-		float closestPtPoly[3];
-		float diff[3];
-		bool posOverPoly = false;
-		float d;
-		closestPointOnPoly(ref, center, closestPtPoly, &posOverPoly);
-
-		// If a point is directly over a polygon and closer than
-		// climb height, favor that instead of straight line nearest point.
-		dtVsub(diff, center, closestPtPoly);
-		if (posOverPoly)
-		{
-			d = dtAbs(diff[1]) - tile->header->walkableClimb;
-			d = d > 0 ? d*d : 0;			
-		}
-		else
-		{
-			d = dtVlenSqr(diff);
-		}
-		
-		if (d < nearestDistanceSqr)
-		{
-			dtVcopy(nearestPt, closestPtPoly);
-			nearestDistanceSqr = d;
-			nearest = ref;
-		}
-	}
-	
-	return nearest;
-}
-
-int dtNavMesh::queryPolygonsInTile(const dtMeshTile* tile, const float* qmin, const float* qmax,
-								   dtPolyRef* polys, const int maxPolys) const
-{
-	if (tile->bvTree)
-	{
-		const dtBVNode* node = &tile->bvTree[0];
-		const dtBVNode* end = &tile->bvTree[tile->header->bvNodeCount];
-		const float* tbmin = tile->header->bmin;
-		const float* tbmax = tile->header->bmax;
-		const float qfac = tile->header->bvQuantFactor;
-		
-		// Calculate quantized box
-		unsigned short bmin[3], bmax[3];
-		// dtClamp query box to world box.
-		float minx = dtClamp(qmin[0], tbmin[0], tbmax[0]) - tbmin[0];
-		float miny = dtClamp(qmin[1], tbmin[1], tbmax[1]) - tbmin[1];
-		float minz = dtClamp(qmin[2], tbmin[2], tbmax[2]) - tbmin[2];
-		float maxx = dtClamp(qmax[0], tbmin[0], tbmax[0]) - tbmin[0];
-		float maxy = dtClamp(qmax[1], tbmin[1], tbmax[1]) - tbmin[1];
-		float maxz = dtClamp(qmax[2], tbmin[2], tbmax[2]) - tbmin[2];
-		// Quantize
-		bmin[0] = (unsigned short)(qfac * minx) & 0xfffe;
-		bmin[1] = (unsigned short)(qfac * miny) & 0xfffe;
-		bmin[2] = (unsigned short)(qfac * minz) & 0xfffe;
-		bmax[0] = (unsigned short)(qfac * maxx + 1) | 1;
-		bmax[1] = (unsigned short)(qfac * maxy + 1) | 1;
-		bmax[2] = (unsigned short)(qfac * maxz + 1) | 1;
-		
-		// Traverse tree
-		dtPolyRef base = getPolyRefBase(tile);
-		int n = 0;
-		while (node < end)
-		{
-			const bool overlap = dtOverlapQuantBounds(bmin, bmax, node->bmin, node->bmax);
-			const bool isLeafNode = node->i >= 0;
-			
-			if (isLeafNode && overlap)
-			{
-				if (n < maxPolys)
-					polys[n++] = base | (dtPolyRef)node->i;
-			}
-			
-			if (overlap || isLeafNode)
-				node++;
-			else
-			{
-				const int escapeIndex = -node->i;
-				node += escapeIndex;
-			}
-		}
-		
-		return n;
-	}
-	else
-	{
-		float bmin[3], bmax[3];
-		int n = 0;
-		dtPolyRef base = getPolyRefBase(tile);
-		for (int i = 0; i < tile->header->polyCount; ++i)
-		{
-			dtPoly* p = &tile->polys[i];
-			// Do not return off-mesh connection polygons.
-			if (p->getType() == DT_POLYTYPE_OFFMESH_CONNECTION)
-				continue;
-			// Calc polygon bounds.
-			const float* v = &tile->verts[p->verts[0]*3];
-			dtVcopy(bmin, v);
-			dtVcopy(bmax, v);
-			for (int j = 1; j < p->vertCount; ++j)
-			{
-				v = &tile->verts[p->verts[j]*3];
-				dtVmin(bmin, v);
-				dtVmax(bmax, v);
-			}
-			if (dtOverlapBounds(qmin,qmax, bmin,bmax))
-			{
-				if (n < maxPolys)
-					polys[n++] = base | (dtPolyRef)i;
-			}
-		}
-		return n;
-	}
-}
-
-/// @par
-///
-/// The add operation will fail if the data is in the wrong format, the allocated tile
-/// space is full, or there is a tile already at the specified reference.
-///
-/// The lastRef parameter is used to restore a tile with the same tile
-/// reference it had previously used.  In this case the #dtPolyRef's for the
-/// tile will be restored to the same values they were before the tile was 
-/// removed.
-///
-/// The nav mesh assumes exclusive access to the data passed and will make
-/// changes to the dynamic portion of the data. For that reason the data
-/// should not be reused in other nav meshes until the tile has been successfully
-/// removed from this nav mesh.
-///
-/// @see dtCreateNavMeshData, #removeTile
-dtStatus dtNavMesh::addTile(unsigned char* data, int dataSize, int flags,
-							dtTileRef lastRef, dtTileRef* result)
-{
-	// Make sure the data is in right format.
-	dtMeshHeader* header = (dtMeshHeader*)data;
-	if (header->magic != DT_NAVMESH_MAGIC)
-		return DT_FAILURE | DT_WRONG_MAGIC;
-	if (header->version != DT_NAVMESH_VERSION)
-		return DT_FAILURE | DT_WRONG_VERSION;
-		
-	// Make sure the location is free.
-	if (getTileAt(header->x, header->y, header->layer))
-		return DT_FAILURE | DT_ALREADY_OCCUPIED;
-		
-	// Allocate a tile.
-	dtMeshTile* tile = 0;
-	if (!lastRef)
-	{
-		if (m_nextFree)
-		{
-			tile = m_nextFree;
-			m_nextFree = tile->next;
-			tile->next = 0;
-		}
-	}
-	else
-	{
-		// Try to relocate the tile to specific index with same salt.
-		int tileIndex = (int)decodePolyIdTile((dtPolyRef)lastRef);
-		if (tileIndex >= m_maxTiles)
-			return DT_FAILURE | DT_OUT_OF_MEMORY;
-		// Try to find the specific tile id from the free list.
-		dtMeshTile* target = &m_tiles[tileIndex];
-		dtMeshTile* prev = 0;
-		tile = m_nextFree;
-		while (tile && tile != target)
-		{
-			prev = tile;
-			tile = tile->next;
-		}
-		// Could not find the correct location.
-		if (tile != target)
-			return DT_FAILURE | DT_OUT_OF_MEMORY;
-		// Remove from freelist
-		if (!prev)
-			m_nextFree = tile->next;
-		else
-			prev->next = tile->next;
-
-		// Restore salt.
-		tile->salt = decodePolyIdSalt((dtPolyRef)lastRef);
-	}
-
-	// Make sure we could allocate a tile.
-	if (!tile)
-		return DT_FAILURE | DT_OUT_OF_MEMORY;
-	
-	// Insert tile into the position lut.
-	int h = computeTileHash(header->x, header->y, m_tileLutMask);
-	tile->next = m_posLookup[h];
-	m_posLookup[h] = tile;
-	
-	// Patch header pointers.
-	const int headerSize = dtAlign4(sizeof(dtMeshHeader));
-	const int vertsSize = dtAlign4(sizeof(float)*3*header->vertCount);
-	const int polysSize = dtAlign4(sizeof(dtPoly)*header->polyCount);
-	const int linksSize = dtAlign4(sizeof(dtLink)*(header->maxLinkCount));
-	const int detailMeshesSize = dtAlign4(sizeof(dtPolyDetail)*header->detailMeshCount);
-	const int detailVertsSize = dtAlign4(sizeof(float)*3*header->detailVertCount);
-	const int detailTrisSize = dtAlign4(sizeof(unsigned char)*4*header->detailTriCount);
-	const int bvtreeSize = dtAlign4(sizeof(dtBVNode)*header->bvNodeCount);
-	const int offMeshLinksSize = dtAlign4(sizeof(dtOffMeshConnection)*header->offMeshConCount);
-	
-	unsigned char* d = data + headerSize;
-	tile->verts = dtGetThenAdvanceBufferPointer<float>(d, vertsSize);
-	tile->polys = dtGetThenAdvanceBufferPointer<dtPoly>(d, polysSize);
-	tile->links = dtGetThenAdvanceBufferPointer<dtLink>(d, linksSize);
-	tile->detailMeshes = dtGetThenAdvanceBufferPointer<dtPolyDetail>(d, detailMeshesSize);
-	tile->detailVerts = dtGetThenAdvanceBufferPointer<float>(d, detailVertsSize);
-	tile->detailTris = dtGetThenAdvanceBufferPointer<unsigned char>(d, detailTrisSize);
-	tile->bvTree = dtGetThenAdvanceBufferPointer<dtBVNode>(d, bvtreeSize);
-	tile->offMeshCons = dtGetThenAdvanceBufferPointer<dtOffMeshConnection>(d, offMeshLinksSize);
-
-	// If there are no items in the bvtree, reset the tree pointer.
-	if (!bvtreeSize)
-		tile->bvTree = 0;
-
-	// Build links freelist
-	tile->linksFreeList = 0;
-	tile->links[header->maxLinkCount-1].next = DT_NULL_LINK;
-	for (int i = 0; i < header->maxLinkCount-1; ++i)
-		tile->links[i].next = i+1;
-
-	// Init tile.
-	tile->header = header;
-	tile->data = data;
-	tile->dataSize = dataSize;
-	tile->flags = flags;
-
-	connectIntLinks(tile);
-
-	// Base off-mesh connections to their starting polygons and connect connections inside the tile.
-	baseOffMeshLinks(tile);
-	connectExtOffMeshLinks(tile, tile, -1);
-
-	// Create connections with neighbour tiles.
-	static const int MAX_NEIS = 32;
-	dtMeshTile* neis[MAX_NEIS];
-	int nneis;
-	
-	// Connect with layers in current tile.
-	nneis = getTilesAt(header->x, header->y, neis, MAX_NEIS);
-	for (int j = 0; j < nneis; ++j)
-	{
-		if (neis[j] == tile)
-			continue;
-	
-		connectExtLinks(tile, neis[j], -1);
-		connectExtLinks(neis[j], tile, -1);
-		connectExtOffMeshLinks(tile, neis[j], -1);
-		connectExtOffMeshLinks(neis[j], tile, -1);
-	}
-	
-	// Connect with neighbour tiles.
-	for (int i = 0; i < 8; ++i)
-	{
-		nneis = getNeighbourTilesAt(header->x, header->y, i, neis, MAX_NEIS);
-		for (int j = 0; j < nneis; ++j)
-		{
-			connectExtLinks(tile, neis[j], i);
-			connectExtLinks(neis[j], tile, dtOppositeTile(i));
-			connectExtOffMeshLinks(tile, neis[j], i);
-			connectExtOffMeshLinks(neis[j], tile, dtOppositeTile(i));
-		}
-	}
-	
-	if (result)
-		*result = getTileRef(tile);
-	
-	return DT_SUCCESS;
-}
-
-const dtMeshTile* dtNavMesh::getTileAt(const int x, const int y, const int layer) const
-{
-	// Find tile based on hash.
-	int h = computeTileHash(x,y,m_tileLutMask);
-	dtMeshTile* tile = m_posLookup[h];
-	while (tile)
-	{
-		if (tile->header &&
-			tile->header->x == x &&
-			tile->header->y == y &&
-			tile->header->layer == layer)
-		{
-			return tile;
-		}
-		tile = tile->next;
-	}
-	return 0;
-}
-
-int dtNavMesh::getNeighbourTilesAt(const int x, const int y, const int side, dtMeshTile** tiles, const int maxTiles) const
-{
-	int nx = x, ny = y;
-	switch (side)
-	{
-		case 0: nx++; break;
-		case 1: nx++; ny++; break;
-		case 2: ny++; break;
-		case 3: nx--; ny++; break;
-		case 4: nx--; break;
-		case 5: nx--; ny--; break;
-		case 6: ny--; break;
-		case 7: nx++; ny--; break;
-	};
-
-	return getTilesAt(nx, ny, tiles, maxTiles);
-}
-
-int dtNavMesh::getTilesAt(const int x, const int y, dtMeshTile** tiles, const int maxTiles) const
-{
-	int n = 0;
-	
-	// Find tile based on hash.
-	int h = computeTileHash(x,y,m_tileLutMask);
-	dtMeshTile* tile = m_posLookup[h];
-	while (tile)
-	{
-		if (tile->header &&
-			tile->header->x == x &&
-			tile->header->y == y)
-		{
-			if (n < maxTiles)
-				tiles[n++] = tile;
-		}
-		tile = tile->next;
-	}
-	
-	return n;
-}
-
-/// @par
-///
-/// This function will not fail if the tiles array is too small to hold the
-/// entire result set.  It will simply fill the array to capacity.
-int dtNavMesh::getTilesAt(const int x, const int y, dtMeshTile const** tiles, const int maxTiles) const
-{
-	int n = 0;
-	
-	// Find tile based on hash.
-	int h = computeTileHash(x,y,m_tileLutMask);
-	dtMeshTile* tile = m_posLookup[h];
-	while (tile)
-	{
-		if (tile->header &&
-			tile->header->x == x &&
-			tile->header->y == y)
-		{
-			if (n < maxTiles)
-				tiles[n++] = tile;
-		}
-		tile = tile->next;
-	}
-	
-	return n;
-}
-
-
-dtTileRef dtNavMesh::getTileRefAt(const int x, const int y, const int layer) const
-{
-	// Find tile based on hash.
-	int h = computeTileHash(x,y,m_tileLutMask);
-	dtMeshTile* tile = m_posLookup[h];
-	while (tile)
-	{
-		if (tile->header &&
-			tile->header->x == x &&
-			tile->header->y == y &&
-			tile->header->layer == layer)
-		{
-			return getTileRef(tile);
-		}
-		tile = tile->next;
-	}
-	return 0;
-}
-
-const dtMeshTile* dtNavMesh::getTileByRef(dtTileRef ref) const
-{
-	if (!ref)
-		return 0;
-	unsigned int tileIndex = decodePolyIdTile((dtPolyRef)ref);
-	unsigned int tileSalt = decodePolyIdSalt((dtPolyRef)ref);
-	if ((int)tileIndex >= m_maxTiles)
-		return 0;
-	const dtMeshTile* tile = &m_tiles[tileIndex];
-	if (tile->salt != tileSalt)
-		return 0;
-	return tile;
-}
-
-int dtNavMesh::getMaxTiles() const
-{
-	return m_maxTiles;
-}
-
-dtMeshTile* dtNavMesh::getTile(int i)
-{
-	return &m_tiles[i];
-}
-
-const dtMeshTile* dtNavMesh::getTile(int i) const
-{
-	return &m_tiles[i];
-}
-
-void dtNavMesh::calcTileLoc(const float* pos, int* tx, int* ty) const
-{
-	*tx = (int)floorf((pos[0]-m_orig[0]) / m_tileWidth);
-	*ty = (int)floorf((pos[2]-m_orig[2]) / m_tileHeight);
-}
-
-dtStatus dtNavMesh::getTileAndPolyByRef(const dtPolyRef ref, const dtMeshTile** tile, const dtPoly** poly) const
-{
-	if (!ref) return DT_FAILURE;
-	unsigned int salt, it, ip;
-	decodePolyId(ref, salt, it, ip);
-	if (it >= (unsigned int)m_maxTiles) return DT_FAILURE | DT_INVALID_PARAM;
-	if (m_tiles[it].salt != salt || m_tiles[it].header == 0) return DT_FAILURE | DT_INVALID_PARAM;
-	if (ip >= (unsigned int)m_tiles[it].header->polyCount) return DT_FAILURE | DT_INVALID_PARAM;
-	*tile = &m_tiles[it];
-	*poly = &m_tiles[it].polys[ip];
-	return DT_SUCCESS;
-}
-
-/// @par
-///
-/// @warning Only use this function if it is known that the provided polygon
-/// reference is valid. This function is faster than #getTileAndPolyByRef, but
-/// it does not validate the reference.
-void dtNavMesh::getTileAndPolyByRefUnsafe(const dtPolyRef ref, const dtMeshTile** tile, const dtPoly** poly) const
-{
-	unsigned int salt, it, ip;
-	decodePolyId(ref, salt, it, ip);
-	*tile = &m_tiles[it];
-	*poly = &m_tiles[it].polys[ip];
-}
-
-bool dtNavMesh::isValidPolyRef(dtPolyRef ref) const
-{
-	if (!ref) return false;
-	unsigned int salt, it, ip;
-	decodePolyId(ref, salt, it, ip);
-	if (it >= (unsigned int)m_maxTiles) return false;
-	if (m_tiles[it].salt != salt || m_tiles[it].header == 0) return false;
-	if (ip >= (unsigned int)m_tiles[it].header->polyCount) return false;
-	return true;
-}
-
-/// @par
-///
-/// This function returns the data for the tile so that, if desired,
-/// it can be added back to the navigation mesh at a later point.
-///
-/// @see #addTile
-dtStatus dtNavMesh::removeTile(dtTileRef ref, unsigned char** data, int* dataSize)
-{
-	if (!ref)
-		return DT_FAILURE | DT_INVALID_PARAM;
-	unsigned int tileIndex = decodePolyIdTile((dtPolyRef)ref);
-	unsigned int tileSalt = decodePolyIdSalt((dtPolyRef)ref);
-	if ((int)tileIndex >= m_maxTiles)
-		return DT_FAILURE | DT_INVALID_PARAM;
-	dtMeshTile* tile = &m_tiles[tileIndex];
-	if (tile->salt != tileSalt)
-		return DT_FAILURE | DT_INVALID_PARAM;
-	
-	// Remove tile from hash lookup.
-	int h = computeTileHash(tile->header->x,tile->header->y,m_tileLutMask);
-	dtMeshTile* prev = 0;
-	dtMeshTile* cur = m_posLookup[h];
-	while (cur)
-	{
-		if (cur == tile)
-		{
-			if (prev)
-				prev->next = cur->next;
-			else
-				m_posLookup[h] = cur->next;
-			break;
-		}
-		prev = cur;
-		cur = cur->next;
-	}
-	
-	// Remove connections to neighbour tiles.
-	static const int MAX_NEIS = 32;
-	dtMeshTile* neis[MAX_NEIS];
-	int nneis;
-	
-	// Disconnect from other layers in current tile.
-	nneis = getTilesAt(tile->header->x, tile->header->y, neis, MAX_NEIS);
-	for (int j = 0; j < nneis; ++j)
-	{
-		if (neis[j] == tile) continue;
-		unconnectLinks(neis[j], tile);
-	}
-	
-	// Disconnect from neighbour tiles.
-	for (int i = 0; i < 8; ++i)
-	{
-		nneis = getNeighbourTilesAt(tile->header->x, tile->header->y, i, neis, MAX_NEIS);
-		for (int j = 0; j < nneis; ++j)
-			unconnectLinks(neis[j], tile);
-	}
-		
-	// Reset tile.
-	if (tile->flags & DT_TILE_FREE_DATA)
-	{
-		// Owns data
-		dtFree(tile->data);
-		tile->data = 0;
-		tile->dataSize = 0;
-		if (data) *data = 0;
-		if (dataSize) *dataSize = 0;
-	}
-	else
-	{
-		if (data) *data = tile->data;
-		if (dataSize) *dataSize = tile->dataSize;
-	}
-
-	tile->header = 0;
-	tile->flags = 0;
-	tile->linksFreeList = 0;
-	tile->polys = 0;
-	tile->verts = 0;
-	tile->links = 0;
-	tile->detailMeshes = 0;
-	tile->detailVerts = 0;
-	tile->detailTris = 0;
-	tile->bvTree = 0;
-	tile->offMeshCons = 0;
-
-	// Update salt, salt should never be zero.
-#ifdef DT_POLYREF64
-	tile->salt = (tile->salt+1) & ((1<<DT_SALT_BITS)-1);
-#else
-	tile->salt = (tile->salt+1) & ((1<<m_saltBits)-1);
-#endif
-	if (tile->salt == 0)
-		tile->salt++;
-
-	// Add to free list.
-	tile->next = m_nextFree;
-	m_nextFree = tile;
-
-	return DT_SUCCESS;
-}
-
-dtTileRef dtNavMesh::getTileRef(const dtMeshTile* tile) const
-{
-	if (!tile) return 0;
-	const unsigned int it = (unsigned int)(tile - m_tiles);
-	return (dtTileRef)encodePolyId(tile->salt, it, 0);
-}
-
-/// @par
-///
-/// Example use case:
-/// @code
-///
-/// const dtPolyRef base = navmesh->getPolyRefBase(tile);
-/// for (int i = 0; i < tile->header->polyCount; ++i)
-/// {
-///     const dtPoly* p = &tile->polys[i];
-///     const dtPolyRef ref = base | (dtPolyRef)i;
-///     
-///     // Use the reference to access the polygon data.
-/// }
-/// @endcode
-dtPolyRef dtNavMesh::getPolyRefBase(const dtMeshTile* tile) const
-{
-	if (!tile) return 0;
-	const unsigned int it = (unsigned int)(tile - m_tiles);
-	return encodePolyId(tile->salt, it, 0);
-}
-
-struct dtTileState
-{
-	int magic;								// Magic number, used to identify the data.
-	int version;							// Data version number.
-	dtTileRef ref;							// Tile ref at the time of storing the data.
-};
-
-struct dtPolyState
-{
-	unsigned short flags;						// Flags (see dtPolyFlags).
-	unsigned char area;							// Area ID of the polygon.
-};
-
-///  @see #storeTileState
-int dtNavMesh::getTileStateSize(const dtMeshTile* tile) const
-{
-	if (!tile) return 0;
-	const int headerSize = dtAlign4(sizeof(dtTileState));
-	const int polyStateSize = dtAlign4(sizeof(dtPolyState) * tile->header->polyCount);
-	return headerSize + polyStateSize;
-}
-
-/// @par
-///
-/// Tile state includes non-structural data such as polygon flags, area ids, etc.
-/// @note The state data is only valid until the tile reference changes.
-/// @see #getTileStateSize, #restoreTileState
-dtStatus dtNavMesh::storeTileState(const dtMeshTile* tile, unsigned char* data, const int maxDataSize) const
-{
-	// Make sure there is enough space to store the state.
-	const int sizeReq = getTileStateSize(tile);
-	if (maxDataSize < sizeReq)
-		return DT_FAILURE | DT_BUFFER_TOO_SMALL;
-		
-	dtTileState* tileState = dtGetThenAdvanceBufferPointer<dtTileState>(data, dtAlign4(sizeof(dtTileState)));
-	dtPolyState* polyStates = dtGetThenAdvanceBufferPointer<dtPolyState>(data, dtAlign4(sizeof(dtPolyState) * tile->header->polyCount));
-	
-	// Store tile state.
-	tileState->magic = DT_NAVMESH_STATE_MAGIC;
-	tileState->version = DT_NAVMESH_STATE_VERSION;
-	tileState->ref = getTileRef(tile);
-	
-	// Store per poly state.
-	for (int i = 0; i < tile->header->polyCount; ++i)
-	{
-		const dtPoly* p = &tile->polys[i];
-		dtPolyState* s = &polyStates[i];
-		s->flags = p->flags;
-		s->area = p->getArea();
-	}
-	
-	return DT_SUCCESS;
-}
-
-/// @par
-///
-/// Tile state includes non-structural data such as polygon flags, area ids, etc.
-/// @note This function does not impact the tile's #dtTileRef and #dtPolyRef's.
-/// @see #storeTileState
-dtStatus dtNavMesh::restoreTileState(dtMeshTile* tile, const unsigned char* data, const int maxDataSize)
-{
-	// Make sure there is enough space to store the state.
-	const int sizeReq = getTileStateSize(tile);
-	if (maxDataSize < sizeReq)
-		return DT_FAILURE | DT_INVALID_PARAM;
-	
-	const dtTileState* tileState = dtGetThenAdvanceBufferPointer<const dtTileState>(data, dtAlign4(sizeof(dtTileState)));
-	const dtPolyState* polyStates = dtGetThenAdvanceBufferPointer<const dtPolyState>(data, dtAlign4(sizeof(dtPolyState) * tile->header->polyCount));
-	
-	// Check that the restore is possible.
-	if (tileState->magic != DT_NAVMESH_STATE_MAGIC)
-		return DT_FAILURE | DT_WRONG_MAGIC;
-	if (tileState->version != DT_NAVMESH_STATE_VERSION)
-		return DT_FAILURE | DT_WRONG_VERSION;
-	if (tileState->ref != getTileRef(tile))
-		return DT_FAILURE | DT_INVALID_PARAM;
-	
-	// Restore per poly state.
-	for (int i = 0; i < tile->header->polyCount; ++i)
-	{
-		dtPoly* p = &tile->polys[i];
-		const dtPolyState* s = &polyStates[i];
-		p->flags = s->flags;
-		p->setArea(s->area);
-	}
-	
-	return DT_SUCCESS;
-}
-
-/// @par
-///
-/// Off-mesh connections are stored in the navigation mesh as special 2-vertex 
-/// polygons with a single edge. At least one of the vertices is expected to be 
-/// inside a normal polygon. So an off-mesh connection is "entered" from a 
-/// normal polygon at one of its endpoints. This is the polygon identified by 
-/// the prevRef parameter.
-dtStatus dtNavMesh::getOffMeshConnectionPolyEndPoints(dtPolyRef prevRef, dtPolyRef polyRef, float* startPos, float* endPos) const
-{
-	unsigned int salt, it, ip;
-
-	if (!polyRef)
-		return DT_FAILURE;
-	
-	// Get current polygon
-	decodePolyId(polyRef, salt, it, ip);
-	if (it >= (unsigned int)m_maxTiles) return DT_FAILURE | DT_INVALID_PARAM;
-	if (m_tiles[it].salt != salt || m_tiles[it].header == 0) return DT_FAILURE | DT_INVALID_PARAM;
-	const dtMeshTile* tile = &m_tiles[it];
-	if (ip >= (unsigned int)tile->header->polyCount) return DT_FAILURE | DT_INVALID_PARAM;
-	const dtPoly* poly = &tile->polys[ip];
-
-	// Make sure that the current poly is indeed off-mesh link.
-	if (poly->getType() != DT_POLYTYPE_OFFMESH_CONNECTION)
-		return DT_FAILURE;
-
-	// Figure out which way to hand out the vertices.
-	int idx0 = 0, idx1 = 1;
-	
-	// Find link that points to first vertex.
-	for (unsigned int i = poly->firstLink; i != DT_NULL_LINK; i = tile->links[i].next)
-	{
-		if (tile->links[i].edge == 0)
-		{
-			if (tile->links[i].ref != prevRef)
-			{
-				idx0 = 1;
-				idx1 = 0;
-			}
-			break;
-		}
-	}
-	
-	dtVcopy(startPos, &tile->verts[poly->verts[idx0]*3]);
-	dtVcopy(endPos, &tile->verts[poly->verts[idx1]*3]);
-
-	return DT_SUCCESS;
-}
-
-
-const dtOffMeshConnection* dtNavMesh::getOffMeshConnectionByRef(dtPolyRef ref) const
-{
-	unsigned int salt, it, ip;
-	
-	if (!ref)
-		return 0;
-	
-	// Get current polygon
-	decodePolyId(ref, salt, it, ip);
-	if (it >= (unsigned int)m_maxTiles) return 0;
-	if (m_tiles[it].salt != salt || m_tiles[it].header == 0) return 0;
-	const dtMeshTile* tile = &m_tiles[it];
-	if (ip >= (unsigned int)tile->header->polyCount) return 0;
-	const dtPoly* poly = &tile->polys[ip];
-	
-	// Make sure that the current poly is indeed off-mesh link.
-	if (poly->getType() != DT_POLYTYPE_OFFMESH_CONNECTION)
-		return 0;
-
-	const unsigned int idx =  ip - tile->header->offMeshBase;
-	dtAssert(idx < (unsigned int)tile->header->offMeshConCount);
-	return &tile->offMeshCons[idx];
-}
-
-
-dtStatus dtNavMesh::setPolyFlags(dtPolyRef ref, unsigned short flags)
-{
-	if (!ref) return DT_FAILURE;
-	unsigned int salt, it, ip;
-	decodePolyId(ref, salt, it, ip);
-	if (it >= (unsigned int)m_maxTiles) return DT_FAILURE | DT_INVALID_PARAM;
-	if (m_tiles[it].salt != salt || m_tiles[it].header == 0) return DT_FAILURE | DT_INVALID_PARAM;
-	dtMeshTile* tile = &m_tiles[it];
-	if (ip >= (unsigned int)tile->header->polyCount) return DT_FAILURE | DT_INVALID_PARAM;
-	dtPoly* poly = &tile->polys[ip];
-	
-	// Change flags.
-	poly->flags = flags;
-	
-	return DT_SUCCESS;
-}
-
-dtStatus dtNavMesh::getPolyFlags(dtPolyRef ref, unsigned short* resultFlags) const
-{
-	if (!ref) return DT_FAILURE;
-	unsigned int salt, it, ip;
-	decodePolyId(ref, salt, it, ip);
-	if (it >= (unsigned int)m_maxTiles) return DT_FAILURE | DT_INVALID_PARAM;
-	if (m_tiles[it].salt != salt || m_tiles[it].header == 0) return DT_FAILURE | DT_INVALID_PARAM;
-	const dtMeshTile* tile = &m_tiles[it];
-	if (ip >= (unsigned int)tile->header->polyCount) return DT_FAILURE | DT_INVALID_PARAM;
-	const dtPoly* poly = &tile->polys[ip];
-
-	*resultFlags = poly->flags;
-	
-	return DT_SUCCESS;
-}
-
-dtStatus dtNavMesh::setPolyArea(dtPolyRef ref, unsigned char area)
-{
-	if (!ref) return DT_FAILURE;
-	unsigned int salt, it, ip;
-	decodePolyId(ref, salt, it, ip);
-	if (it >= (unsigned int)m_maxTiles) return DT_FAILURE | DT_INVALID_PARAM;
-	if (m_tiles[it].salt != salt || m_tiles[it].header == 0) return DT_FAILURE | DT_INVALID_PARAM;
-	dtMeshTile* tile = &m_tiles[it];
-	if (ip >= (unsigned int)tile->header->polyCount) return DT_FAILURE | DT_INVALID_PARAM;
-	dtPoly* poly = &tile->polys[ip];
-	
-	poly->setArea(area);
-	
-	return DT_SUCCESS;
-}
-
-dtStatus dtNavMesh::getPolyArea(dtPolyRef ref, unsigned char* resultArea) const
-{
-	if (!ref) return DT_FAILURE;
-	unsigned int salt, it, ip;
-	decodePolyId(ref, salt, it, ip);
-	if (it >= (unsigned int)m_maxTiles) return DT_FAILURE | DT_INVALID_PARAM;
-	if (m_tiles[it].salt != salt || m_tiles[it].header == 0) return DT_FAILURE | DT_INVALID_PARAM;
-	const dtMeshTile* tile = &m_tiles[it];
-	if (ip >= (unsigned int)tile->header->polyCount) return DT_FAILURE | DT_INVALID_PARAM;
-	const dtPoly* poly = &tile->polys[ip];
-	
-	*resultArea = poly->getArea();
-	
-	return DT_SUCCESS;
-}
-
diff --git a/extern/recastnavigation/Detour/Source/DetourNavMeshBuilder.cpp b/extern/recastnavigation/Detour/Source/DetourNavMeshBuilder.cpp
deleted file mode 100644
index e93a97629b..0000000000
--- a/extern/recastnavigation/Detour/Source/DetourNavMeshBuilder.cpp
+++ /dev/null
@@ -1,802 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <float.h>
-#include "DetourNavMesh.h"
-#include "DetourCommon.h"
-#include "DetourMath.h"
-#include "DetourNavMeshBuilder.h"
-#include "DetourAlloc.h"
-#include "DetourAssert.h"
-
-static unsigned short MESH_NULL_IDX = 0xffff;
-
-
-struct BVItem
-{
-	unsigned short bmin[3];
-	unsigned short bmax[3];
-	int i;
-};
-
-static int compareItemX(const void* va, const void* vb)
-{
-	const BVItem* a = (const BVItem*)va;
-	const BVItem* b = (const BVItem*)vb;
-	if (a->bmin[0] < b->bmin[0])
-		return -1;
-	if (a->bmin[0] > b->bmin[0])
-		return 1;
-	return 0;
-}
-
-static int compareItemY(const void* va, const void* vb)
-{
-	const BVItem* a = (const BVItem*)va;
-	const BVItem* b = (const BVItem*)vb;
-	if (a->bmin[1] < b->bmin[1])
-		return -1;
-	if (a->bmin[1] > b->bmin[1])
-		return 1;
-	return 0;
-}
-
-static int compareItemZ(const void* va, const void* vb)
-{
-	const BVItem* a = (const BVItem*)va;
-	const BVItem* b = (const BVItem*)vb;
-	if (a->bmin[2] < b->bmin[2])
-		return -1;
-	if (a->bmin[2] > b->bmin[2])
-		return 1;
-	return 0;
-}
-
-static void calcExtends(BVItem* items, const int /*nitems*/, const int imin, const int imax,
-						unsigned short* bmin, unsigned short* bmax)
-{
-	bmin[0] = items[imin].bmin[0];
-	bmin[1] = items[imin].bmin[1];
-	bmin[2] = items[imin].bmin[2];
-	
-	bmax[0] = items[imin].bmax[0];
-	bmax[1] = items[imin].bmax[1];
-	bmax[2] = items[imin].bmax[2];
-	
-	for (int i = imin+1; i < imax; ++i)
-	{
-		const BVItem& it = items[i];
-		if (it.bmin[0] < bmin[0]) bmin[0] = it.bmin[0];
-		if (it.bmin[1] < bmin[1]) bmin[1] = it.bmin[1];
-		if (it.bmin[2] < bmin[2]) bmin[2] = it.bmin[2];
-		
-		if (it.bmax[0] > bmax[0]) bmax[0] = it.bmax[0];
-		if (it.bmax[1] > bmax[1]) bmax[1] = it.bmax[1];
-		if (it.bmax[2] > bmax[2]) bmax[2] = it.bmax[2];
-	}
-}
-
-inline int longestAxis(unsigned short x, unsigned short y, unsigned short z)
-{
-	int	axis = 0;
-	unsigned short maxVal = x;
-	if (y > maxVal)
-	{
-		axis = 1;
-		maxVal = y;
-	}
-	if (z > maxVal)
-	{
-		axis = 2;
-	}
-	return axis;
-}
-
-static void subdivide(BVItem* items, int nitems, int imin, int imax, int& curNode, dtBVNode* nodes)
-{
-	int inum = imax - imin;
-	int icur = curNode;
-	
-	dtBVNode& node = nodes[curNode++];
-	
-	if (inum == 1)
-	{
-		// Leaf
-		node.bmin[0] = items[imin].bmin[0];
-		node.bmin[1] = items[imin].bmin[1];
-		node.bmin[2] = items[imin].bmin[2];
-		
-		node.bmax[0] = items[imin].bmax[0];
-		node.bmax[1] = items[imin].bmax[1];
-		node.bmax[2] = items[imin].bmax[2];
-		
-		node.i = items[imin].i;
-	}
-	else
-	{
-		// Split
-		calcExtends(items, nitems, imin, imax, node.bmin, node.bmax);
-		
-		int	axis = longestAxis(node.bmax[0] - node.bmin[0],
-							   node.bmax[1] - node.bmin[1],
-							   node.bmax[2] - node.bmin[2]);
-		
-		if (axis == 0)
-		{
-			// Sort along x-axis
-			qsort(items+imin, inum, sizeof(BVItem), compareItemX);
-		}
-		else if (axis == 1)
-		{
-			// Sort along y-axis
-			qsort(items+imin, inum, sizeof(BVItem), compareItemY);
-		}
-		else
-		{
-			// Sort along z-axis
-			qsort(items+imin, inum, sizeof(BVItem), compareItemZ);
-		}
-		
-		int isplit = imin+inum/2;
-		
-		// Left
-		subdivide(items, nitems, imin, isplit, curNode, nodes);
-		// Right
-		subdivide(items, nitems, isplit, imax, curNode, nodes);
-		
-		int iescape = curNode - icur;
-		// Negative index means escape.
-		node.i = -iescape;
-	}
-}
-
-static int createBVTree(dtNavMeshCreateParams* params, dtBVNode* nodes, int /*nnodes*/)
-{
-	// Build tree
-	float quantFactor = 1 / params->cs;
-	BVItem* items = (BVItem*)dtAlloc(sizeof(BVItem)*params->polyCount, DT_ALLOC_TEMP);
-	for (int i = 0; i < params->polyCount; i++)
-	{
-		BVItem& it = items[i];
-		it.i = i;
-		// Calc polygon bounds. Use detail meshes if available.
-		if (params->detailMeshes)
-		{
-			int vb = (int)params->detailMeshes[i*4+0];
-			int ndv = (int)params->detailMeshes[i*4+1];
-			float bmin[3];
-			float bmax[3];
-
-			const float* dv = &params->detailVerts[vb*3];
-			dtVcopy(bmin, dv);
-			dtVcopy(bmax, dv);
-
-			for (int j = 1; j < ndv; j++)
-			{
-				dtVmin(bmin, &dv[j * 3]);
-				dtVmax(bmax, &dv[j * 3]);
-			}
-
-			// BV-tree uses cs for all dimensions
-			it.bmin[0] = (unsigned short)dtClamp((int)((bmin[0] - params->bmin[0])*quantFactor), 0, 0xffff);
-			it.bmin[1] = (unsigned short)dtClamp((int)((bmin[1] - params->bmin[1])*quantFactor), 0, 0xffff);
-			it.bmin[2] = (unsigned short)dtClamp((int)((bmin[2] - params->bmin[2])*quantFactor), 0, 0xffff);
-
-			it.bmax[0] = (unsigned short)dtClamp((int)((bmax[0] - params->bmin[0])*quantFactor), 0, 0xffff);
-			it.bmax[1] = (unsigned short)dtClamp((int)((bmax[1] - params->bmin[1])*quantFactor), 0, 0xffff);
-			it.bmax[2] = (unsigned short)dtClamp((int)((bmax[2] - params->bmin[2])*quantFactor), 0, 0xffff);
-		}
-		else
-		{
-			const unsigned short* p = &params->polys[i*params->nvp * 2];
-			it.bmin[0] = it.bmax[0] = params->verts[p[0] * 3 + 0];
-			it.bmin[1] = it.bmax[1] = params->verts[p[0] * 3 + 1];
-			it.bmin[2] = it.bmax[2] = params->verts[p[0] * 3 + 2];
-
-			for (int j = 1; j < params->nvp; ++j)
-			{
-				if (p[j] == MESH_NULL_IDX) break;
-				unsigned short x = params->verts[p[j] * 3 + 0];
-				unsigned short y = params->verts[p[j] * 3 + 1];
-				unsigned short z = params->verts[p[j] * 3 + 2];
-
-				if (x < it.bmin[0]) it.bmin[0] = x;
-				if (y < it.bmin[1]) it.bmin[1] = y;
-				if (z < it.bmin[2]) it.bmin[2] = z;
-
-				if (x > it.bmax[0]) it.bmax[0] = x;
-				if (y > it.bmax[1]) it.bmax[1] = y;
-				if (z > it.bmax[2]) it.bmax[2] = z;
-			}
-			// Remap y
-			it.bmin[1] = (unsigned short)dtMathFloorf((float)it.bmin[1] * params->ch / params->cs);
-			it.bmax[1] = (unsigned short)dtMathCeilf((float)it.bmax[1] * params->ch / params->cs);
-		}
-	}
-	
-	int curNode = 0;
-	subdivide(items, params->polyCount, 0, params->polyCount, curNode, nodes);
-	
-	dtFree(items);
-	
-	return curNode;
-}
-
-static unsigned char classifyOffMeshPoint(const float* pt, const float* bmin, const float* bmax)
-{
-	static const unsigned char XP = 1<<0;
-	static const unsigned char ZP = 1<<1;
-	static const unsigned char XM = 1<<2;
-	static const unsigned char ZM = 1<<3;	
-
-	unsigned char outcode = 0; 
-	outcode |= (pt[0] >= bmax[0]) ? XP : 0;
-	outcode |= (pt[2] >= bmax[2]) ? ZP : 0;
-	outcode |= (pt[0] < bmin[0])  ? XM : 0;
-	outcode |= (pt[2] < bmin[2])  ? ZM : 0;
-
-	switch (outcode)
-	{
-	case XP: return 0;
-	case XP|ZP: return 1;
-	case ZP: return 2;
-	case XM|ZP: return 3;
-	case XM: return 4;
-	case XM|ZM: return 5;
-	case ZM: return 6;
-	case XP|ZM: return 7;
-	};
-
-	return 0xff;	
-}
-
-// TODO: Better error handling.
-
-/// @par
-/// 
-/// The output data array is allocated using the detour allocator (dtAlloc()).  The method
-/// used to free the memory will be determined by how the tile is added to the navigation
-/// mesh.
-///
-/// @see dtNavMesh, dtNavMesh::addTile()
-bool dtCreateNavMeshData(dtNavMeshCreateParams* params, unsigned char** outData, int* outDataSize)
-{
-	if (params->nvp > DT_VERTS_PER_POLYGON)
-		return false;
-	if (params->vertCount >= 0xffff)
-		return false;
-	if (!params->vertCount || !params->verts)
-		return false;
-	if (!params->polyCount || !params->polys)
-		return false;
-
-	const int nvp = params->nvp;
-	
-	// Classify off-mesh connection points. We store only the connections
-	// whose start point is inside the tile.
-	unsigned char* offMeshConClass = 0;
-	int storedOffMeshConCount = 0;
-	int offMeshConLinkCount = 0;
-	
-	if (params->offMeshConCount > 0)
-	{
-		offMeshConClass = (unsigned char*)dtAlloc(sizeof(unsigned char)*params->offMeshConCount*2, DT_ALLOC_TEMP);
-		if (!offMeshConClass)
-			return false;
-
-		// Find tight heigh bounds, used for culling out off-mesh start locations.
-		float hmin = FLT_MAX;
-		float hmax = -FLT_MAX;
-		
-		if (params->detailVerts && params->detailVertsCount)
-		{
-			for (int i = 0; i < params->detailVertsCount; ++i)
-			{
-				const float h = params->detailVerts[i*3+1];
-				hmin = dtMin(hmin,h);
-				hmax = dtMax(hmax,h);
-			}
-		}
-		else
-		{
-			for (int i = 0; i < params->vertCount; ++i)
-			{
-				const unsigned short* iv = &params->verts[i*3];
-				const float h = params->bmin[1] + iv[1] * params->ch;
-				hmin = dtMin(hmin,h);
-				hmax = dtMax(hmax,h);
-			}
-		}
-		hmin -= params->walkableClimb;
-		hmax += params->walkableClimb;
-		float bmin[3], bmax[3];
-		dtVcopy(bmin, params->bmin);
-		dtVcopy(bmax, params->bmax);
-		bmin[1] = hmin;
-		bmax[1] = hmax;
-
-		for (int i = 0; i < params->offMeshConCount; ++i)
-		{
-			const float* p0 = &params->offMeshConVerts[(i*2+0)*3];
-			const float* p1 = &params->offMeshConVerts[(i*2+1)*3];
-			offMeshConClass[i*2+0] = classifyOffMeshPoint(p0, bmin, bmax);
-			offMeshConClass[i*2+1] = classifyOffMeshPoint(p1, bmin, bmax);
-
-			// Zero out off-mesh start positions which are not even potentially touching the mesh.
-			if (offMeshConClass[i*2+0] == 0xff)
-			{
-				if (p0[1] < bmin[1] || p0[1] > bmax[1])
-					offMeshConClass[i*2+0] = 0;
-			}
-
-			// Cound how many links should be allocated for off-mesh connections.
-			if (offMeshConClass[i*2+0] == 0xff)
-				offMeshConLinkCount++;
-			if (offMeshConClass[i*2+1] == 0xff)
-				offMeshConLinkCount++;
-
-			if (offMeshConClass[i*2+0] == 0xff)
-				storedOffMeshConCount++;
-		}
-	}
-	
-	// Off-mesh connectionss are stored as polygons, adjust values.
-	const int totPolyCount = params->polyCount + storedOffMeshConCount;
-	const int totVertCount = params->vertCount + storedOffMeshConCount*2;
-	
-	// Find portal edges which are at tile borders.
-	int edgeCount = 0;
-	int portalCount = 0;
-	for (int i = 0; i < params->polyCount; ++i)
-	{
-		const unsigned short* p = &params->polys[i*2*nvp];
-		for (int j = 0; j < nvp; ++j)
-		{
-			if (p[j] == MESH_NULL_IDX) break;
-			edgeCount++;
-			
-			if (p[nvp+j] & 0x8000)
-			{
-				unsigned short dir = p[nvp+j] & 0xf;
-				if (dir != 0xf)
-					portalCount++;
-			}
-		}
-	}
-
-	const int maxLinkCount = edgeCount + portalCount*2 + offMeshConLinkCount*2;
-	
-	// Find unique detail vertices.
-	int uniqueDetailVertCount = 0;
-	int detailTriCount = 0;
-	if (params->detailMeshes)
-	{
-		// Has detail mesh, count unique detail vertex count and use input detail tri count.
-		detailTriCount = params->detailTriCount;
-		for (int i = 0; i < params->polyCount; ++i)
-		{
-			const unsigned short* p = &params->polys[i*nvp*2];
-			int ndv = params->detailMeshes[i*4+1];
-			int nv = 0;
-			for (int j = 0; j < nvp; ++j)
-			{
-				if (p[j] == MESH_NULL_IDX) break;
-				nv++;
-			}
-			ndv -= nv;
-			uniqueDetailVertCount += ndv;
-		}
-	}
-	else
-	{
-		// No input detail mesh, build detail mesh from nav polys.
-		uniqueDetailVertCount = 0; // No extra detail verts.
-		detailTriCount = 0;
-		for (int i = 0; i < params->polyCount; ++i)
-		{
-			const unsigned short* p = &params->polys[i*nvp*2];
-			int nv = 0;
-			for (int j = 0; j < nvp; ++j)
-			{
-				if (p[j] == MESH_NULL_IDX) break;
-				nv++;
-			}
-			detailTriCount += nv-2;
-		}
-	}
-	
-	// Calculate data size
-	const int headerSize = dtAlign4(sizeof(dtMeshHeader));
-	const int vertsSize = dtAlign4(sizeof(float)*3*totVertCount);
-	const int polysSize = dtAlign4(sizeof(dtPoly)*totPolyCount);
-	const int linksSize = dtAlign4(sizeof(dtLink)*maxLinkCount);
-	const int detailMeshesSize = dtAlign4(sizeof(dtPolyDetail)*params->polyCount);
-	const int detailVertsSize = dtAlign4(sizeof(float)*3*uniqueDetailVertCount);
-	const int detailTrisSize = dtAlign4(sizeof(unsigned char)*4*detailTriCount);
-	const int bvTreeSize = params->buildBvTree ? dtAlign4(sizeof(dtBVNode)*params->polyCount*2) : 0;
-	const int offMeshConsSize = dtAlign4(sizeof(dtOffMeshConnection)*storedOffMeshConCount);
-	
-	const int dataSize = headerSize + vertsSize + polysSize + linksSize +
-						 detailMeshesSize + detailVertsSize + detailTrisSize +
-						 bvTreeSize + offMeshConsSize;
-						 
-	unsigned char* data = (unsigned char*)dtAlloc(sizeof(unsigned char)*dataSize, DT_ALLOC_PERM);
-	if (!data)
-	{
-		dtFree(offMeshConClass);
-		return false;
-	}
-	memset(data, 0, dataSize);
-	
-	unsigned char* d = data;
-
-	dtMeshHeader* header = dtGetThenAdvanceBufferPointer<dtMeshHeader>(d, headerSize);
-	float* navVerts = dtGetThenAdvanceBufferPointer<float>(d, vertsSize);
-	dtPoly* navPolys = dtGetThenAdvanceBufferPointer<dtPoly>(d, polysSize);
-	d += linksSize; // Ignore links; just leave enough space for them. They'll be created on load.
-	dtPolyDetail* navDMeshes = dtGetThenAdvanceBufferPointer<dtPolyDetail>(d, detailMeshesSize);
-	float* navDVerts = dtGetThenAdvanceBufferPointer<float>(d, detailVertsSize);
-	unsigned char* navDTris = dtGetThenAdvanceBufferPointer<unsigned char>(d, detailTrisSize);
-	dtBVNode* navBvtree = dtGetThenAdvanceBufferPointer<dtBVNode>(d, bvTreeSize);
-	dtOffMeshConnection* offMeshCons = dtGetThenAdvanceBufferPointer<dtOffMeshConnection>(d, offMeshConsSize);
-	
-	
-	// Store header
-	header->magic = DT_NAVMESH_MAGIC;
-	header->version = DT_NAVMESH_VERSION;
-	header->x = params->tileX;
-	header->y = params->tileY;
-	header->layer = params->tileLayer;
-	header->userId = params->userId;
-	header->polyCount = totPolyCount;
-	header->vertCount = totVertCount;
-	header->maxLinkCount = maxLinkCount;
-	dtVcopy(header->bmin, params->bmin);
-	dtVcopy(header->bmax, params->bmax);
-	header->detailMeshCount = params->polyCount;
-	header->detailVertCount = uniqueDetailVertCount;
-	header->detailTriCount = detailTriCount;
-	header->bvQuantFactor = 1.0f / params->cs;
-	header->offMeshBase = params->polyCount;
-	header->walkableHeight = params->walkableHeight;
-	header->walkableRadius = params->walkableRadius;
-	header->walkableClimb = params->walkableClimb;
-	header->offMeshConCount = storedOffMeshConCount;
-	header->bvNodeCount = params->buildBvTree ? params->polyCount*2 : 0;
-	
-	const int offMeshVertsBase = params->vertCount;
-	const int offMeshPolyBase = params->polyCount;
-	
-	// Store vertices
-	// Mesh vertices
-	for (int i = 0; i < params->vertCount; ++i)
-	{
-		const unsigned short* iv = &params->verts[i*3];
-		float* v = &navVerts[i*3];
-		v[0] = params->bmin[0] + iv[0] * params->cs;
-		v[1] = params->bmin[1] + iv[1] * params->ch;
-		v[2] = params->bmin[2] + iv[2] * params->cs;
-	}
-	// Off-mesh link vertices.
-	int n = 0;
-	for (int i = 0; i < params->offMeshConCount; ++i)
-	{
-		// Only store connections which start from this tile.
-		if (offMeshConClass[i*2+0] == 0xff)
-		{
-			const float* linkv = &params->offMeshConVerts[i*2*3];
-			float* v = &navVerts[(offMeshVertsBase + n*2)*3];
-			dtVcopy(&v[0], &linkv[0]);
-			dtVcopy(&v[3], &linkv[3]);
-			n++;
-		}
-	}
-	
-	// Store polygons
-	// Mesh polys
-	const unsigned short* src = params->polys;
-	for (int i = 0; i < params->polyCount; ++i)
-	{
-		dtPoly* p = &navPolys[i];
-		p->vertCount = 0;
-		p->flags = params->polyFlags[i];
-		p->setArea(params->polyAreas[i]);
-		p->setType(DT_POLYTYPE_GROUND);
-		for (int j = 0; j < nvp; ++j)
-		{
-			if (src[j] == MESH_NULL_IDX) break;
-			p->verts[j] = src[j];
-			if (src[nvp+j] & 0x8000)
-			{
-				// Border or portal edge.
-				unsigned short dir = src[nvp+j] & 0xf;
-				if (dir == 0xf) // Border
-					p->neis[j] = 0;
-				else if (dir == 0) // Portal x-
-					p->neis[j] = DT_EXT_LINK | 4;
-				else if (dir == 1) // Portal z+
-					p->neis[j] = DT_EXT_LINK | 2;
-				else if (dir == 2) // Portal x+
-					p->neis[j] = DT_EXT_LINK | 0;
-				else if (dir == 3) // Portal z-
-					p->neis[j] = DT_EXT_LINK | 6;
-			}
-			else
-			{
-				// Normal connection
-				p->neis[j] = src[nvp+j]+1;
-			}
-			
-			p->vertCount++;
-		}
-		src += nvp*2;
-	}
-	// Off-mesh connection vertices.
-	n = 0;
-	for (int i = 0; i < params->offMeshConCount; ++i)
-	{
-		// Only store connections which start from this tile.
-		if (offMeshConClass[i*2+0] == 0xff)
-		{
-			dtPoly* p = &navPolys[offMeshPolyBase+n];
-			p->vertCount = 2;
-			p->verts[0] = (unsigned short)(offMeshVertsBase + n*2+0);
-			p->verts[1] = (unsigned short)(offMeshVertsBase + n*2+1);
-			p->flags = params->offMeshConFlags[i];
-			p->setArea(params->offMeshConAreas[i]);
-			p->setType(DT_POLYTYPE_OFFMESH_CONNECTION);
-			n++;
-		}
-	}
-
-	// Store detail meshes and vertices.
-	// The nav polygon vertices are stored as the first vertices on each mesh.
-	// We compress the mesh data by skipping them and using the navmesh coordinates.
-	if (params->detailMeshes)
-	{
-		unsigned short vbase = 0;
-		for (int i = 0; i < params->polyCount; ++i)
-		{
-			dtPolyDetail& dtl = navDMeshes[i];
-			const int vb = (int)params->detailMeshes[i*4+0];
-			const int ndv = (int)params->detailMeshes[i*4+1];
-			const int nv = navPolys[i].vertCount;
-			dtl.vertBase = (unsigned int)vbase;
-			dtl.vertCount = (unsigned char)(ndv-nv);
-			dtl.triBase = (unsigned int)params->detailMeshes[i*4+2];
-			dtl.triCount = (unsigned char)params->detailMeshes[i*4+3];
-			// Copy vertices except the first 'nv' verts which are equal to nav poly verts.
-			if (ndv-nv)
-			{
-				memcpy(&navDVerts[vbase*3], &params->detailVerts[(vb+nv)*3], sizeof(float)*3*(ndv-nv));
-				vbase += (unsigned short)(ndv-nv);
-			}
-		}
-		// Store triangles.
-		memcpy(navDTris, params->detailTris, sizeof(unsigned char)*4*params->detailTriCount);
-	}
-	else
-	{
-		// Create dummy detail mesh by triangulating polys.
-		int tbase = 0;
-		for (int i = 0; i < params->polyCount; ++i)
-		{
-			dtPolyDetail& dtl = navDMeshes[i];
-			const int nv = navPolys[i].vertCount;
-			dtl.vertBase = 0;
-			dtl.vertCount = 0;
-			dtl.triBase = (unsigned int)tbase;
-			dtl.triCount = (unsigned char)(nv-2);
-			// Triangulate polygon (local indices).
-			for (int j = 2; j < nv; ++j)
-			{
-				unsigned char* t = &navDTris[tbase*4];
-				t[0] = 0;
-				t[1] = (unsigned char)(j-1);
-				t[2] = (unsigned char)j;
-				// Bit for each edge that belongs to poly boundary.
-				t[3] = (1<<2);
-				if (j == 2) t[3] |= (1<<0);
-				if (j == nv-1) t[3] |= (1<<4);
-				tbase++;
-			}
-		}
-	}
-
-	// Store and create BVtree.
-	if (params->buildBvTree)
-	{
-		createBVTree(params, navBvtree, 2*params->polyCount);
-	}
-	
-	// Store Off-Mesh connections.
-	n = 0;
-	for (int i = 0; i < params->offMeshConCount; ++i)
-	{
-		// Only store connections which start from this tile.
-		if (offMeshConClass[i*2+0] == 0xff)
-		{
-			dtOffMeshConnection* con = &offMeshCons[n];
-			con->poly = (unsigned short)(offMeshPolyBase + n);
-			// Copy connection end-points.
-			const float* endPts = &params->offMeshConVerts[i*2*3];
-			dtVcopy(&con->pos[0], &endPts[0]);
-			dtVcopy(&con->pos[3], &endPts[3]);
-			con->rad = params->offMeshConRad[i];
-			con->flags = params->offMeshConDir[i] ? DT_OFFMESH_CON_BIDIR : 0;
-			con->side = offMeshConClass[i*2+1];
-			if (params->offMeshConUserID)
-				con->userId = params->offMeshConUserID[i];
-			n++;
-		}
-	}
-		
-	dtFree(offMeshConClass);
-	
-	*outData = data;
-	*outDataSize = dataSize;
-	
-	return true;
-}
-
-bool dtNavMeshHeaderSwapEndian(unsigned char* data, const int /*dataSize*/)
-{
-	dtMeshHeader* header = (dtMeshHeader*)data;
-	
-	int swappedMagic = DT_NAVMESH_MAGIC;
-	int swappedVersion = DT_NAVMESH_VERSION;
-	dtSwapEndian(&swappedMagic);
-	dtSwapEndian(&swappedVersion);
-	
-	if ((header->magic != DT_NAVMESH_MAGIC || header->version != DT_NAVMESH_VERSION) &&
-		(header->magic != swappedMagic || header->version != swappedVersion))
-	{
-		return false;
-	}
-		
-	dtSwapEndian(&header->magic);
-	dtSwapEndian(&header->version);
-	dtSwapEndian(&header->x);
-	dtSwapEndian(&header->y);
-	dtSwapEndian(&header->layer);
-	dtSwapEndian(&header->userId);
-	dtSwapEndian(&header->polyCount);
-	dtSwapEndian(&header->vertCount);
-	dtSwapEndian(&header->maxLinkCount);
-	dtSwapEndian(&header->detailMeshCount);
-	dtSwapEndian(&header->detailVertCount);
-	dtSwapEndian(&header->detailTriCount);
-	dtSwapEndian(&header->bvNodeCount);
-	dtSwapEndian(&header->offMeshConCount);
-	dtSwapEndian(&header->offMeshBase);
-	dtSwapEndian(&header->walkableHeight);
-	dtSwapEndian(&header->walkableRadius);
-	dtSwapEndian(&header->walkableClimb);
-	dtSwapEndian(&header->bmin[0]);
-	dtSwapEndian(&header->bmin[1]);
-	dtSwapEndian(&header->bmin[2]);
-	dtSwapEndian(&header->bmax[0]);
-	dtSwapEndian(&header->bmax[1]);
-	dtSwapEndian(&header->bmax[2]);
-	dtSwapEndian(&header->bvQuantFactor);
-
-	// Freelist index and pointers are updated when tile is added, no need to swap.
-
-	return true;
-}
-
-/// @par
-///
-/// @warning This function assumes that the header is in the correct endianess already. 
-/// Call #dtNavMeshHeaderSwapEndian() first on the data if the data is expected to be in wrong endianess 
-/// to start with. Call #dtNavMeshHeaderSwapEndian() after the data has been swapped if converting from 
-/// native to foreign endianess.
-bool dtNavMeshDataSwapEndian(unsigned char* data, const int /*dataSize*/)
-{
-	// Make sure the data is in right format.
-	dtMeshHeader* header = (dtMeshHeader*)data;
-	if (header->magic != DT_NAVMESH_MAGIC)
-		return false;
-	if (header->version != DT_NAVMESH_VERSION)
-		return false;
-	
-	// Patch header pointers.
-	const int headerSize = dtAlign4(sizeof(dtMeshHeader));
-	const int vertsSize = dtAlign4(sizeof(float)*3*header->vertCount);
-	const int polysSize = dtAlign4(sizeof(dtPoly)*header->polyCount);
-	const int linksSize = dtAlign4(sizeof(dtLink)*(header->maxLinkCount));
-	const int detailMeshesSize = dtAlign4(sizeof(dtPolyDetail)*header->detailMeshCount);
-	const int detailVertsSize = dtAlign4(sizeof(float)*3*header->detailVertCount);
-	const int detailTrisSize = dtAlign4(sizeof(unsigned char)*4*header->detailTriCount);
-	const int bvtreeSize = dtAlign4(sizeof(dtBVNode)*header->bvNodeCount);
-	const int offMeshLinksSize = dtAlign4(sizeof(dtOffMeshConnection)*header->offMeshConCount);
-	
-	unsigned char* d = data + headerSize;
-	float* verts = dtGetThenAdvanceBufferPointer<float>(d, vertsSize);
-	dtPoly* polys = dtGetThenAdvanceBufferPointer<dtPoly>(d, polysSize);
-	d += linksSize; // Ignore links; they technically should be endian-swapped but all their data is overwritten on load anyway.
-	//dtLink* links = dtGetThenAdvanceBufferPointer<dtLink>(d, linksSize);
-	dtPolyDetail* detailMeshes = dtGetThenAdvanceBufferPointer<dtPolyDetail>(d, detailMeshesSize);
-	float* detailVerts = dtGetThenAdvanceBufferPointer<float>(d, detailVertsSize);
-	d += detailTrisSize; // Ignore detail tris; single bytes can't be endian-swapped.
-	//unsigned char* detailTris = dtGetThenAdvanceBufferPointer<unsigned char>(d, detailTrisSize);
-	dtBVNode* bvTree = dtGetThenAdvanceBufferPointer<dtBVNode>(d, bvtreeSize);
-	dtOffMeshConnection* offMeshCons = dtGetThenAdvanceBufferPointer<dtOffMeshConnection>(d, offMeshLinksSize);
-	
-	// Vertices
-	for (int i = 0; i < header->vertCount*3; ++i)
-	{
-		dtSwapEndian(&verts[i]);
-	}
-
-	// Polys
-	for (int i = 0; i < header->polyCount; ++i)
-	{
-		dtPoly* p = &polys[i];
-		// poly->firstLink is update when tile is added, no need to swap.
-		for (int j = 0; j < DT_VERTS_PER_POLYGON; ++j)
-		{
-			dtSwapEndian(&p->verts[j]);
-			dtSwapEndian(&p->neis[j]);
-		}
-		dtSwapEndian(&p->flags);
-	}
-
-	// Links are rebuild when tile is added, no need to swap.
-
-	// Detail meshes
-	for (int i = 0; i < header->detailMeshCount; ++i)
-	{
-		dtPolyDetail* pd = &detailMeshes[i];
-		dtSwapEndian(&pd->vertBase);
-		dtSwapEndian(&pd->triBase);
-	}
-	
-	// Detail verts
-	for (int i = 0; i < header->detailVertCount*3; ++i)
-	{
-		dtSwapEndian(&detailVerts[i]);
-	}
-
-	// BV-tree
-	for (int i = 0; i < header->bvNodeCount; ++i)
-	{
-		dtBVNode* node = &bvTree[i];
-		for (int j = 0; j < 3; ++j)
-		{
-			dtSwapEndian(&node->bmin[j]);
-			dtSwapEndian(&node->bmax[j]);
-		}
-		dtSwapEndian(&node->i);
-	}
-
-	// Off-mesh Connections.
-	for (int i = 0; i < header->offMeshConCount; ++i)
-	{
-		dtOffMeshConnection* con = &offMeshCons[i];
-		for (int j = 0; j < 6; ++j)
-			dtSwapEndian(&con->pos[j]);
-		dtSwapEndian(&con->rad);
-		dtSwapEndian(&con->poly);
-	}
-	
-	return true;
-}
diff --git a/extern/recastnavigation/Detour/Source/DetourNavMeshQuery.cpp b/extern/recastnavigation/Detour/Source/DetourNavMeshQuery.cpp
deleted file mode 100644
index 265b10b34a..0000000000
--- a/extern/recastnavigation/Detour/Source/DetourNavMeshQuery.cpp
+++ /dev/null
@@ -1,3663 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#include <float.h>
-#include <string.h>
-#include "DetourNavMeshQuery.h"
-#include "DetourNavMesh.h"
-#include "DetourNode.h"
-#include "DetourCommon.h"
-#include "DetourMath.h"
-#include "DetourAlloc.h"
-#include "DetourAssert.h"
-#include <new>
-
-/// @class dtQueryFilter
-///
-/// <b>The Default Implementation</b>
-/// 
-/// At construction: All area costs default to 1.0.  All flags are included
-/// and none are excluded.
-/// 
-/// If a polygon has both an include and an exclude flag, it will be excluded.
-/// 
-/// The way filtering works, a navigation mesh polygon must have at least one flag 
-/// set to ever be considered by a query. So a polygon with no flags will never
-/// be considered.
-///
-/// Setting the include flags to 0 will result in all polygons being excluded.
-///
-/// <b>Custom Implementations</b>
-/// 
-/// DT_VIRTUAL_QUERYFILTER must be defined in order to extend this class.
-/// 
-/// Implement a custom query filter by overriding the virtual passFilter() 
-/// and getCost() functions. If this is done, both functions should be as 
-/// fast as possible. Use cached local copies of data rather than accessing 
-/// your own objects where possible.
-/// 
-/// Custom implementations do not need to adhere to the flags or cost logic 
-/// used by the default implementation.  
-/// 
-/// In order for A* searches to work properly, the cost should be proportional to
-/// the travel distance. Implementing a cost modifier less than 1.0 is likely 
-/// to lead to problems during pathfinding.
-///
-/// @see dtNavMeshQuery
-
-dtQueryFilter::dtQueryFilter() :
-	m_includeFlags(0xffff),
-	m_excludeFlags(0)
-{
-	for (int i = 0; i < DT_MAX_AREAS; ++i)
-		m_areaCost[i] = 1.0f;
-}
-
-#ifdef DT_VIRTUAL_QUERYFILTER
-bool dtQueryFilter::passFilter(const dtPolyRef /*ref*/,
-							   const dtMeshTile* /*tile*/,
-							   const dtPoly* poly) const
-{
-	return (poly->flags & m_includeFlags) != 0 && (poly->flags & m_excludeFlags) == 0;
-}
-
-float dtQueryFilter::getCost(const float* pa, const float* pb,
-							 const dtPolyRef /*prevRef*/, const dtMeshTile* /*prevTile*/, const dtPoly* /*prevPoly*/,
-							 const dtPolyRef /*curRef*/, const dtMeshTile* /*curTile*/, const dtPoly* curPoly,
-							 const dtPolyRef /*nextRef*/, const dtMeshTile* /*nextTile*/, const dtPoly* /*nextPoly*/) const
-{
-	return dtVdist(pa, pb) * m_areaCost[curPoly->getArea()];
-}
-#else
-inline bool dtQueryFilter::passFilter(const dtPolyRef /*ref*/,
-									  const dtMeshTile* /*tile*/,
-									  const dtPoly* poly) const
-{
-	return (poly->flags & m_includeFlags) != 0 && (poly->flags & m_excludeFlags) == 0;
-}
-
-inline float dtQueryFilter::getCost(const float* pa, const float* pb,
-									const dtPolyRef /*prevRef*/, const dtMeshTile* /*prevTile*/, const dtPoly* /*prevPoly*/,
-									const dtPolyRef /*curRef*/, const dtMeshTile* /*curTile*/, const dtPoly* curPoly,
-									const dtPolyRef /*nextRef*/, const dtMeshTile* /*nextTile*/, const dtPoly* /*nextPoly*/) const
-{
-	return dtVdist(pa, pb) * m_areaCost[curPoly->getArea()];
-}
-#endif	
-	
-static const float H_SCALE = 0.999f; // Search heuristic scale.
-
-
-dtNavMeshQuery* dtAllocNavMeshQuery()
-{
-	void* mem = dtAlloc(sizeof(dtNavMeshQuery), DT_ALLOC_PERM);
-	if (!mem) return 0;
-	return new(mem) dtNavMeshQuery;
-}
-
-void dtFreeNavMeshQuery(dtNavMeshQuery* navmesh)
-{
-	if (!navmesh) return;
-	navmesh->~dtNavMeshQuery();
-	dtFree(navmesh);
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////
-
-/// @class dtNavMeshQuery
-///
-/// For methods that support undersized buffers, if the buffer is too small 
-/// to hold the entire result set the return status of the method will include 
-/// the #DT_BUFFER_TOO_SMALL flag.
-///
-/// Constant member functions can be used by multiple clients without side
-/// effects. (E.g. No change to the closed list. No impact on an in-progress
-/// sliced path query. Etc.)
-/// 
-/// Walls and portals: A @e wall is a polygon segment that is 
-/// considered impassable. A @e portal is a passable segment between polygons.
-/// A portal may be treated as a wall based on the dtQueryFilter used for a query.
-///
-/// @see dtNavMesh, dtQueryFilter, #dtAllocNavMeshQuery(), #dtAllocNavMeshQuery()
-
-dtNavMeshQuery::dtNavMeshQuery() :
-	m_nav(0),
-	m_tinyNodePool(0),
-	m_nodePool(0),
-	m_openList(0)
-{
-	memset(&m_query, 0, sizeof(dtQueryData));
-}
-
-dtNavMeshQuery::~dtNavMeshQuery()
-{
-	if (m_tinyNodePool)
-		m_tinyNodePool->~dtNodePool();
-	if (m_nodePool)
-		m_nodePool->~dtNodePool();
-	if (m_openList)
-		m_openList->~dtNodeQueue();
-	dtFree(m_tinyNodePool);
-	dtFree(m_nodePool);
-	dtFree(m_openList);
-}
-
-/// @par 
-///
-/// Must be the first function called after construction, before other
-/// functions are used.
-///
-/// This function can be used multiple times.
-dtStatus dtNavMeshQuery::init(const dtNavMesh* nav, const int maxNodes)
-{
-	if (maxNodes > DT_NULL_IDX || maxNodes > (1 << DT_NODE_PARENT_BITS) - 1)
-		return DT_FAILURE | DT_INVALID_PARAM;
-
-	m_nav = nav;
-	
-	if (!m_nodePool || m_nodePool->getMaxNodes() < maxNodes)
-	{
-		if (m_nodePool)
-		{
-			m_nodePool->~dtNodePool();
-			dtFree(m_nodePool);
-			m_nodePool = 0;
-		}
-		m_nodePool = new (dtAlloc(sizeof(dtNodePool), DT_ALLOC_PERM)) dtNodePool(maxNodes, dtNextPow2(maxNodes/4));
-		if (!m_nodePool)
-			return DT_FAILURE | DT_OUT_OF_MEMORY;
-	}
-	else
-	{
-		m_nodePool->clear();
-	}
-	
-	if (!m_tinyNodePool)
-	{
-		m_tinyNodePool = new (dtAlloc(sizeof(dtNodePool), DT_ALLOC_PERM)) dtNodePool(64, 32);
-		if (!m_tinyNodePool)
-			return DT_FAILURE | DT_OUT_OF_MEMORY;
-	}
-	else
-	{
-		m_tinyNodePool->clear();
-	}
-	
-	if (!m_openList || m_openList->getCapacity() < maxNodes)
-	{
-		if (m_openList)
-		{
-			m_openList->~dtNodeQueue();
-			dtFree(m_openList);
-			m_openList = 0;
-		}
-		m_openList = new (dtAlloc(sizeof(dtNodeQueue), DT_ALLOC_PERM)) dtNodeQueue(maxNodes);
-		if (!m_openList)
-			return DT_FAILURE | DT_OUT_OF_MEMORY;
-	}
-	else
-	{
-		m_openList->clear();
-	}
-	
-	return DT_SUCCESS;
-}
-
-dtStatus dtNavMeshQuery::findRandomPoint(const dtQueryFilter* filter, float (*frand)(),
-										 dtPolyRef* randomRef, float* randomPt) const
-{
-	dtAssert(m_nav);
-
-	if (!filter || !frand || !randomRef || !randomPt)
-		return DT_FAILURE | DT_INVALID_PARAM;
-
-	// Randomly pick one tile. Assume that all tiles cover roughly the same area.
-	const dtMeshTile* tile = 0;
-	float tsum = 0.0f;
-	for (int i = 0; i < m_nav->getMaxTiles(); i++)
-	{
-		const dtMeshTile* t = m_nav->getTile(i);
-		if (!t || !t->header) continue;
-		
-		// Choose random tile using reservoi sampling.
-		const float area = 1.0f; // Could be tile area too.
-		tsum += area;
-		const float u = frand();
-		if (u*tsum <= area)
-			tile = t;
-	}
-	if (!tile)
-		return DT_FAILURE;
-
-	// Randomly pick one polygon weighted by polygon area.
-	const dtPoly* poly = 0;
-	dtPolyRef polyRef = 0;
-	const dtPolyRef base = m_nav->getPolyRefBase(tile);
-
-	float areaSum = 0.0f;
-	for (int i = 0; i < tile->header->polyCount; ++i)
-	{
-		const dtPoly* p = &tile->polys[i];
-		// Do not return off-mesh connection polygons.
-		if (p->getType() != DT_POLYTYPE_GROUND)
-			continue;
-		// Must pass filter
-		const dtPolyRef ref = base | (dtPolyRef)i;
-		if (!filter->passFilter(ref, tile, p))
-			continue;
-
-		// Calc area of the polygon.
-		float polyArea = 0.0f;
-		for (int j = 2; j < p->vertCount; ++j)
-		{
-			const float* va = &tile->verts[p->verts[0]*3];
-			const float* vb = &tile->verts[p->verts[j-1]*3];
-			const float* vc = &tile->verts[p->verts[j]*3];
-			polyArea += dtTriArea2D(va,vb,vc);
-		}
-
-		// Choose random polygon weighted by area, using reservoi sampling.
-		areaSum += polyArea;
-		const float u = frand();
-		if (u*areaSum <= polyArea)
-		{
-			poly = p;
-			polyRef = ref;
-		}
-	}
-	
-	if (!poly)
-		return DT_FAILURE;
-
-	// Randomly pick point on polygon.
-	const float* v = &tile->verts[poly->verts[0]*3];
-	float verts[3*DT_VERTS_PER_POLYGON];
-	float areas[DT_VERTS_PER_POLYGON];
-	dtVcopy(&verts[0*3],v);
-	for (int j = 1; j < poly->vertCount; ++j)
-	{
-		v = &tile->verts[poly->verts[j]*3];
-		dtVcopy(&verts[j*3],v);
-	}
-	
-	const float s = frand();
-	const float t = frand();
-	
-	float pt[3];
-	dtRandomPointInConvexPoly(verts, poly->vertCount, areas, s, t, pt);
-	
-	float h = 0.0f;
-	dtStatus status = getPolyHeight(polyRef, pt, &h);
-	if (dtStatusFailed(status))
-		return status;
-	pt[1] = h;
-	
-	dtVcopy(randomPt, pt);
-	*randomRef = polyRef;
-
-	return DT_SUCCESS;
-}
-
-dtStatus dtNavMeshQuery::findRandomPointAroundCircle(dtPolyRef startRef, const float* centerPos, const float maxRadius,
-													 const dtQueryFilter* filter, float (*frand)(),
-													 dtPolyRef* randomRef, float* randomPt) const
-{
-	dtAssert(m_nav);
-	dtAssert(m_nodePool);
-	dtAssert(m_openList);
-	
-	// Validate input
-	if (!m_nav->isValidPolyRef(startRef) ||
-		!centerPos || !dtVisfinite(centerPos) ||
-		maxRadius < 0 || !dtMathIsfinite(maxRadius) ||
-		!filter || !frand || !randomRef || !randomPt)
-	{
-		return DT_FAILURE | DT_INVALID_PARAM;
-	}
-	
-	const dtMeshTile* startTile = 0;
-	const dtPoly* startPoly = 0;
-	m_nav->getTileAndPolyByRefUnsafe(startRef, &startTile, &startPoly);
-	if (!filter->passFilter(startRef, startTile, startPoly))
-		return DT_FAILURE | DT_INVALID_PARAM;
-	
-	m_nodePool->clear();
-	m_openList->clear();
-	
-	dtNode* startNode = m_nodePool->getNode(startRef);
-	dtVcopy(startNode->pos, centerPos);
-	startNode->pidx = 0;
-	startNode->cost = 0;
-	startNode->total = 0;
-	startNode->id = startRef;
-	startNode->flags = DT_NODE_OPEN;
-	m_openList->push(startNode);
-	
-	dtStatus status = DT_SUCCESS;
-	
-	const float radiusSqr = dtSqr(maxRadius);
-	float areaSum = 0.0f;
-
-	const dtMeshTile* randomTile = 0;
-	const dtPoly* randomPoly = 0;
-	dtPolyRef randomPolyRef = 0;
-
-	while (!m_openList->empty())
-	{
-		dtNode* bestNode = m_openList->pop();
-		bestNode->flags &= ~DT_NODE_OPEN;
-		bestNode->flags |= DT_NODE_CLOSED;
-		
-		// Get poly and tile.
-		// The API input has been cheked already, skip checking internal data.
-		const dtPolyRef bestRef = bestNode->id;
-		const dtMeshTile* bestTile = 0;
-		const dtPoly* bestPoly = 0;
-		m_nav->getTileAndPolyByRefUnsafe(bestRef, &bestTile, &bestPoly);
-
-		// Place random locations on on ground.
-		if (bestPoly->getType() == DT_POLYTYPE_GROUND)
-		{
-			// Calc area of the polygon.
-			float polyArea = 0.0f;
-			for (int j = 2; j < bestPoly->vertCount; ++j)
-			{
-				const float* va = &bestTile->verts[bestPoly->verts[0]*3];
-				const float* vb = &bestTile->verts[bestPoly->verts[j-1]*3];
-				const float* vc = &bestTile->verts[bestPoly->verts[j]*3];
-				polyArea += dtTriArea2D(va,vb,vc);
-			}
-			// Choose random polygon weighted by area, using reservoi sampling.
-			areaSum += polyArea;
-			const float u = frand();
-			if (u*areaSum <= polyArea)
-			{
-				randomTile = bestTile;
-				randomPoly = bestPoly;
-				randomPolyRef = bestRef;
-			}
-		}
-		
-		
-		// Get parent poly and tile.
-		dtPolyRef parentRef = 0;
-		const dtMeshTile* parentTile = 0;
-		const dtPoly* parentPoly = 0;
-		if (bestNode->pidx)
-			parentRef = m_nodePool->getNodeAtIdx(bestNode->pidx)->id;
-		if (parentRef)
-			m_nav->getTileAndPolyByRefUnsafe(parentRef, &parentTile, &parentPoly);
-		
-		for (unsigned int i = bestPoly->firstLink; i != DT_NULL_LINK; i = bestTile->links[i].next)
-		{
-			const dtLink* link = &bestTile->links[i];
-			dtPolyRef neighbourRef = link->ref;
-			// Skip invalid neighbours and do not follow back to parent.
-			if (!neighbourRef || neighbourRef == parentRef)
-				continue;
-			
-			// Expand to neighbour
-			const dtMeshTile* neighbourTile = 0;
-			const dtPoly* neighbourPoly = 0;
-			m_nav->getTileAndPolyByRefUnsafe(neighbourRef, &neighbourTile, &neighbourPoly);
-			
-			// Do not advance if the polygon is excluded by the filter.
-			if (!filter->passFilter(neighbourRef, neighbourTile, neighbourPoly))
-				continue;
-			
-			// Find edge and calc distance to the edge.
-			float va[3], vb[3];
-			if (!getPortalPoints(bestRef, bestPoly, bestTile, neighbourRef, neighbourPoly, neighbourTile, va, vb))
-				continue;
-			
-			// If the circle is not touching the next polygon, skip it.
-			float tseg;
-			float distSqr = dtDistancePtSegSqr2D(centerPos, va, vb, tseg);
-			if (distSqr > radiusSqr)
-				continue;
-			
-			dtNode* neighbourNode = m_nodePool->getNode(neighbourRef);
-			if (!neighbourNode)
-			{
-				status |= DT_OUT_OF_NODES;
-				continue;
-			}
-			
-			if (neighbourNode->flags & DT_NODE_CLOSED)
-				continue;
-			
-			// Cost
-			if (neighbourNode->flags == 0)
-				dtVlerp(neighbourNode->pos, va, vb, 0.5f);
-			
-			const float total = bestNode->total + dtVdist(bestNode->pos, neighbourNode->pos);
-			
-			// The node is already in open list and the new result is worse, skip.
-			if ((neighbourNode->flags & DT_NODE_OPEN) && total >= neighbourNode->total)
-				continue;
-			
-			neighbourNode->id = neighbourRef;
-			neighbourNode->flags = (neighbourNode->flags & ~DT_NODE_CLOSED);
-			neighbourNode->pidx = m_nodePool->getNodeIdx(bestNode);
-			neighbourNode->total = total;
-			
-			if (neighbourNode->flags & DT_NODE_OPEN)
-			{
-				m_openList->modify(neighbourNode);
-			}
-			else
-			{
-				neighbourNode->flags = DT_NODE_OPEN;
-				m_openList->push(neighbourNode);
-			}
-		}
-	}
-	
-	if (!randomPoly)
-		return DT_FAILURE;
-	
-	// Randomly pick point on polygon.
-	const float* v = &randomTile->verts[randomPoly->verts[0]*3];
-	float verts[3*DT_VERTS_PER_POLYGON];
-	float areas[DT_VERTS_PER_POLYGON];
-	dtVcopy(&verts[0*3],v);
-	for (int j = 1; j < randomPoly->vertCount; ++j)
-	{
-		v = &randomTile->verts[randomPoly->verts[j]*3];
-		dtVcopy(&verts[j*3],v);
-	}
-	
-	const float s = frand();
-	const float t = frand();
-	
-	float pt[3];
-	dtRandomPointInConvexPoly(verts, randomPoly->vertCount, areas, s, t, pt);
-	
-	float h = 0.0f;
-	dtStatus stat = getPolyHeight(randomPolyRef, pt, &h);
-	if (dtStatusFailed(status))
-		return stat;
-	pt[1] = h;
-	
-	dtVcopy(randomPt, pt);
-	*randomRef = randomPolyRef;
-	
-	return DT_SUCCESS;
-}
-
-
-//////////////////////////////////////////////////////////////////////////////////////////
-
-/// @par
-///
-/// Uses the detail polygons to find the surface height. (Most accurate.)
-///
-/// @p pos does not have to be within the bounds of the polygon or navigation mesh.
-///
-/// See closestPointOnPolyBoundary() for a limited but faster option.
-///
-dtStatus dtNavMeshQuery::closestPointOnPoly(dtPolyRef ref, const float* pos, float* closest, bool* posOverPoly) const
-{
-	dtAssert(m_nav);
-	if (!m_nav->isValidPolyRef(ref) ||
-		!pos || !dtVisfinite(pos) ||
-		!closest)
-	{
-		return DT_FAILURE | DT_INVALID_PARAM;
-	}
-
-	m_nav->closestPointOnPoly(ref, pos, closest, posOverPoly);
-	return DT_SUCCESS;
-}
-
-/// @par
-///
-/// Much faster than closestPointOnPoly().
-///
-/// If the provided position lies within the polygon's xz-bounds (above or below), 
-/// then @p pos and @p closest will be equal.
-///
-/// The height of @p closest will be the polygon boundary.  The height detail is not used.
-/// 
-/// @p pos does not have to be within the bounds of the polybon or the navigation mesh.
-/// 
-dtStatus dtNavMeshQuery::closestPointOnPolyBoundary(dtPolyRef ref, const float* pos, float* closest) const
-{
-	dtAssert(m_nav);
-	
-	const dtMeshTile* tile = 0;
-	const dtPoly* poly = 0;
-	if (dtStatusFailed(m_nav->getTileAndPolyByRef(ref, &tile, &poly)))
-		return DT_FAILURE | DT_INVALID_PARAM;
-
-	if (!pos || !dtVisfinite(pos) || !closest)
-		return DT_FAILURE | DT_INVALID_PARAM;
-	
-	// Collect vertices.
-	float verts[DT_VERTS_PER_POLYGON*3];	
-	float edged[DT_VERTS_PER_POLYGON];
-	float edget[DT_VERTS_PER_POLYGON];
-	int nv = 0;
-	for (int i = 0; i < (int)poly->vertCount; ++i)
-	{
-		dtVcopy(&verts[nv*3], &tile->verts[poly->verts[i]*3]);
-		nv++;
-	}		
-	
-	bool inside = dtDistancePtPolyEdgesSqr(pos, verts, nv, edged, edget);
-	if (inside)
-	{
-		// Point is inside the polygon, return the point.
-		dtVcopy(closest, pos);
-	}
-	else
-	{
-		// Point is outside the polygon, dtClamp to nearest edge.
-		float dmin = edged[0];
-		int imin = 0;
-		for (int i = 1; i < nv; ++i)
-		{
-			if (edged[i] < dmin)
-			{
-				dmin = edged[i];
-				imin = i;
-			}
-		}
-		const float* va = &verts[imin*3];
-		const float* vb = &verts[((imin+1)%nv)*3];
-		dtVlerp(closest, va, vb, edget[imin]);
-	}
-	
-	return DT_SUCCESS;
-}
-
-/// @par
-///
-/// Will return #DT_FAILURE | DT_INVALID_PARAM if the provided position is outside the xz-bounds 
-/// of the polygon.
-/// 
-dtStatus dtNavMeshQuery::getPolyHeight(dtPolyRef ref, const float* pos, float* height) const
-{
-	dtAssert(m_nav);
-
-	const dtMeshTile* tile = 0;
-	const dtPoly* poly = 0;
-	if (dtStatusFailed(m_nav->getTileAndPolyByRef(ref, &tile, &poly)))
-		return DT_FAILURE | DT_INVALID_PARAM;
-
-	if (!pos || !dtVisfinite2D(pos))
-		return DT_FAILURE | DT_INVALID_PARAM;
-
-	// We used to return success for offmesh connections, but the
-	// getPolyHeight in DetourNavMesh does not do this, so special
-	// case it here.
-	if (poly->getType() == DT_POLYTYPE_OFFMESH_CONNECTION)
-	{
-		const float* v0 = &tile->verts[poly->verts[0]*3];
-		const float* v1 = &tile->verts[poly->verts[1]*3];
-		float t;
-		dtDistancePtSegSqr2D(pos, v0, v1, t);
-		if (height)
-			*height = v0[1] + (v1[1] - v0[1])*t;
-
-		return DT_SUCCESS;
-	}
-
-	return m_nav->getPolyHeight(tile, poly, pos, height)
-		? DT_SUCCESS
-		: DT_FAILURE | DT_INVALID_PARAM;
-}
-
-class dtFindNearestPolyQuery : public dtPolyQuery
-{
-	const dtNavMeshQuery* m_query;
-	const float* m_center;
-	float m_nearestDistanceSqr;
-	dtPolyRef m_nearestRef;
-	float m_nearestPoint[3];
-
-public:
-	dtFindNearestPolyQuery(const dtNavMeshQuery* query, const float* center)
-		: m_query(query), m_center(center), m_nearestDistanceSqr(FLT_MAX), m_nearestRef(0), m_nearestPoint()
-	{
-	}
-
-	dtPolyRef nearestRef() const { return m_nearestRef; }
-	const float* nearestPoint() const { return m_nearestPoint; }
-
-	void process(const dtMeshTile* tile, dtPoly** polys, dtPolyRef* refs, int count) override
-	{
-		dtIgnoreUnused(polys);
-
-		for (int i = 0; i < count; ++i)
-		{
-			dtPolyRef ref = refs[i];
-			float closestPtPoly[3];
-			float diff[3];
-			bool posOverPoly = false;
-			float d;
-			m_query->closestPointOnPoly(ref, m_center, closestPtPoly, &posOverPoly);
-
-			// If a point is directly over a polygon and closer than
-			// climb height, favor that instead of straight line nearest point.
-			dtVsub(diff, m_center, closestPtPoly);
-			if (posOverPoly)
-			{
-				d = dtAbs(diff[1]) - tile->header->walkableClimb;
-				d = d > 0 ? d*d : 0;			
-			}
-			else
-			{
-				d = dtVlenSqr(diff);
-			}
-			
-			if (d < m_nearestDistanceSqr)
-			{
-				dtVcopy(m_nearestPoint, closestPtPoly);
-
-				m_nearestDistanceSqr = d;
-				m_nearestRef = ref;
-			}
-		}
-	}
-};
-
-/// @par 
-///
-/// @note If the search box does not intersect any polygons the search will 
-/// return #DT_SUCCESS, but @p nearestRef will be zero. So if in doubt, check 
-/// @p nearestRef before using @p nearestPt.
-///
-dtStatus dtNavMeshQuery::findNearestPoly(const float* center, const float* halfExtents,
-										 const dtQueryFilter* filter,
-										 dtPolyRef* nearestRef, float* nearestPt) const
-{
-	dtAssert(m_nav);
-
-	if (!nearestRef)
-		return DT_FAILURE | DT_INVALID_PARAM;
-
-	// queryPolygons below will check rest of params
-	
-	dtFindNearestPolyQuery query(this, center);
-
-	dtStatus status = queryPolygons(center, halfExtents, filter, &query);
-	if (dtStatusFailed(status))
-		return status;
-
-	*nearestRef = query.nearestRef();
-	// Only override nearestPt if we actually found a poly so the nearest point
-	// is valid.
-	if (nearestPt && *nearestRef)
-		dtVcopy(nearestPt, query.nearestPoint());
-	
-	return DT_SUCCESS;
-}
-
-void dtNavMeshQuery::queryPolygonsInTile(const dtMeshTile* tile, const float* qmin, const float* qmax,
-										 const dtQueryFilter* filter, dtPolyQuery* query) const
-{
-	dtAssert(m_nav);
-	static const int batchSize = 32;
-	dtPolyRef polyRefs[batchSize];
-	dtPoly* polys[batchSize];
-	int n = 0;
-
-	if (tile->bvTree)
-	{
-		const dtBVNode* node = &tile->bvTree[0];
-		const dtBVNode* end = &tile->bvTree[tile->header->bvNodeCount];
-		const float* tbmin = tile->header->bmin;
-		const float* tbmax = tile->header->bmax;
-		const float qfac = tile->header->bvQuantFactor;
-
-		// Calculate quantized box
-		unsigned short bmin[3], bmax[3];
-		// dtClamp query box to world box.
-		float minx = dtClamp(qmin[0], tbmin[0], tbmax[0]) - tbmin[0];
-		float miny = dtClamp(qmin[1], tbmin[1], tbmax[1]) - tbmin[1];
-		float minz = dtClamp(qmin[2], tbmin[2], tbmax[2]) - tbmin[2];
-		float maxx = dtClamp(qmax[0], tbmin[0], tbmax[0]) - tbmin[0];
-		float maxy = dtClamp(qmax[1], tbmin[1], tbmax[1]) - tbmin[1];
-		float maxz = dtClamp(qmax[2], tbmin[2], tbmax[2]) - tbmin[2];
-		// Quantize
-		bmin[0] = (unsigned short)(qfac * minx) & 0xfffe;
-		bmin[1] = (unsigned short)(qfac * miny) & 0xfffe;
-		bmin[2] = (unsigned short)(qfac * minz) & 0xfffe;
-		bmax[0] = (unsigned short)(qfac * maxx + 1) | 1;
-		bmax[1] = (unsigned short)(qfac * maxy + 1) | 1;
-		bmax[2] = (unsigned short)(qfac * maxz + 1) | 1;
-
-		// Traverse tree
-		const dtPolyRef base = m_nav->getPolyRefBase(tile);
-		while (node < end)
-		{
-			const bool overlap = dtOverlapQuantBounds(bmin, bmax, node->bmin, node->bmax);
-			const bool isLeafNode = node->i >= 0;
-
-			if (isLeafNode && overlap)
-			{
-				dtPolyRef ref = base | (dtPolyRef)node->i;
-				if (filter->passFilter(ref, tile, &tile->polys[node->i]))
-				{
-					polyRefs[n] = ref;
-					polys[n] = &tile->polys[node->i];
-
-					if (n == batchSize - 1)
-					{
-						query->process(tile, polys, polyRefs, batchSize);
-						n = 0;
-					}
-					else
-					{
-						n++;
-					}
-				}
-			}
-
-			if (overlap || isLeafNode)
-				node++;
-			else
-			{
-				const int escapeIndex = -node->i;
-				node += escapeIndex;
-			}
-		}
-	}
-	else
-	{
-		float bmin[3], bmax[3];
-		const dtPolyRef base = m_nav->getPolyRefBase(tile);
-		for (int i = 0; i < tile->header->polyCount; ++i)
-		{
-			dtPoly* p = &tile->polys[i];
-			// Do not return off-mesh connection polygons.
-			if (p->getType() == DT_POLYTYPE_OFFMESH_CONNECTION)
-				continue;
-			// Must pass filter
-			const dtPolyRef ref = base | (dtPolyRef)i;
-			if (!filter->passFilter(ref, tile, p))
-				continue;
-			// Calc polygon bounds.
-			const float* v = &tile->verts[p->verts[0]*3];
-			dtVcopy(bmin, v);
-			dtVcopy(bmax, v);
-			for (int j = 1; j < p->vertCount; ++j)
-			{
-				v = &tile->verts[p->verts[j]*3];
-				dtVmin(bmin, v);
-				dtVmax(bmax, v);
-			}
-			if (dtOverlapBounds(qmin, qmax, bmin, bmax))
-			{
-				polyRefs[n] = ref;
-				polys[n] = p;
-
-				if (n == batchSize - 1)
-				{
-					query->process(tile, polys, polyRefs, batchSize);
-					n = 0;
-				}
-				else
-				{
-					n++;
-				}
-			}
-		}
-	}
-
-	// Process the last polygons that didn't make a full batch.
-	if (n > 0)
-		query->process(tile, polys, polyRefs, n);
-}
-
-class dtCollectPolysQuery : public dtPolyQuery
-{
-	dtPolyRef* m_polys;
-	const int m_maxPolys;
-	int m_numCollected;
-	bool m_overflow;
-
-public:
-	dtCollectPolysQuery(dtPolyRef* polys, const int maxPolys)
-		: m_polys(polys), m_maxPolys(maxPolys), m_numCollected(0), m_overflow(false)
-	{
-	}
-
-	int numCollected() const { return m_numCollected; }
-	bool overflowed() const { return m_overflow; }
-
-	void process(const dtMeshTile* tile, dtPoly** polys, dtPolyRef* refs, int count) override
-	{
-		dtIgnoreUnused(tile);
-		dtIgnoreUnused(polys);
-
-		int numLeft = m_maxPolys - m_numCollected;
-		int toCopy = count;
-		if (toCopy > numLeft)
-		{
-			m_overflow = true;
-			toCopy = numLeft;
-		}
-
-		memcpy(m_polys + m_numCollected, refs, (size_t)toCopy * sizeof(dtPolyRef));
-		m_numCollected += toCopy;
-	}
-};
-
-/// @par 
-///
-/// If no polygons are found, the function will return #DT_SUCCESS with a
-/// @p polyCount of zero.
-///
-/// If @p polys is too small to hold the entire result set, then the array will 
-/// be filled to capacity. The method of choosing which polygons from the 
-/// full set are included in the partial result set is undefined.
-///
-dtStatus dtNavMeshQuery::queryPolygons(const float* center, const float* halfExtents,
-									   const dtQueryFilter* filter,
-									   dtPolyRef* polys, int* polyCount, const int maxPolys) const
-{
-	if (!polys || !polyCount || maxPolys < 0)
-		return DT_FAILURE | DT_INVALID_PARAM;
-
-	dtCollectPolysQuery collector(polys, maxPolys);
-
-	dtStatus status = queryPolygons(center, halfExtents, filter, &collector);
-	if (dtStatusFailed(status))
-		return status;
-
-	*polyCount = collector.numCollected();
-	return collector.overflowed() ? DT_SUCCESS | DT_BUFFER_TOO_SMALL : DT_SUCCESS;
-}
-
-/// @par 
-///
-/// The query will be invoked with batches of polygons. Polygons passed
-/// to the query have bounding boxes that overlap with the center and halfExtents
-/// passed to this function. The dtPolyQuery::process function is invoked multiple
-/// times until all overlapping polygons have been processed.
-///
-dtStatus dtNavMeshQuery::queryPolygons(const float* center, const float* halfExtents,
-									   const dtQueryFilter* filter, dtPolyQuery* query) const
-{
-	dtAssert(m_nav);
-
-	if (!center || !dtVisfinite(center) ||
-		!halfExtents || !dtVisfinite(halfExtents) ||
-		!filter || !query)
-	{
-		return DT_FAILURE | DT_INVALID_PARAM;
-	}
-
-	float bmin[3], bmax[3];
-	dtVsub(bmin, center, halfExtents);
-	dtVadd(bmax, center, halfExtents);
-	
-	// Find tiles the query touches.
-	int minx, miny, maxx, maxy;
-	m_nav->calcTileLoc(bmin, &minx, &miny);
-	m_nav->calcTileLoc(bmax, &maxx, &maxy);
-
-	static const int MAX_NEIS = 32;
-	const dtMeshTile* neis[MAX_NEIS];
-	
-	for (int y = miny; y <= maxy; ++y)
-	{
-		for (int x = minx; x <= maxx; ++x)
-		{
-			const int nneis = m_nav->getTilesAt(x,y,neis,MAX_NEIS);
-			for (int j = 0; j < nneis; ++j)
-			{
-				queryPolygonsInTile(neis[j], bmin, bmax, filter, query);
-			}
-		}
-	}
-	
-	return DT_SUCCESS;
-}
-
-/// @par
-///
-/// If the end polygon cannot be reached through the navigation graph,
-/// the last polygon in the path will be the nearest the end polygon.
-///
-/// If the path array is to small to hold the full result, it will be filled as 
-/// far as possible from the start polygon toward the end polygon.
-///
-/// The start and end positions are used to calculate traversal costs. 
-/// (The y-values impact the result.)
-///
-dtStatus dtNavMeshQuery::findPath(dtPolyRef startRef, dtPolyRef endRef,
-								  const float* startPos, const float* endPos,
-								  const dtQueryFilter* filter,
-								  dtPolyRef* path, int* pathCount, const int maxPath) const
-{
-	dtAssert(m_nav);
-	dtAssert(m_nodePool);
-	dtAssert(m_openList);
-
-	if (!pathCount)
-		return DT_FAILURE | DT_INVALID_PARAM;
-
-	*pathCount = 0;
-	
-	// Validate input
-	if (!m_nav->isValidPolyRef(startRef) || !m_nav->isValidPolyRef(endRef) ||
-		!startPos || !dtVisfinite(startPos) ||
-		!endPos || !dtVisfinite(endPos) ||
-		!filter || !path || maxPath <= 0)
-	{
-		return DT_FAILURE | DT_INVALID_PARAM;
-	}
-
-	if (startRef == endRef)
-	{
-		path[0] = startRef;
-		*pathCount = 1;
-		return DT_SUCCESS;
-	}
-	
-	m_nodePool->clear();
-	m_openList->clear();
-	
-	dtNode* startNode = m_nodePool->getNode(startRef);
-	dtVcopy(startNode->pos, startPos);
-	startNode->pidx = 0;
-	startNode->cost = 0;
-	startNode->total = dtVdist(startPos, endPos) * H_SCALE;
-	startNode->id = startRef;
-	startNode->flags = DT_NODE_OPEN;
-	m_openList->push(startNode);
-	
-	dtNode* lastBestNode = startNode;
-	float lastBestNodeCost = startNode->total;
-	
-	bool outOfNodes = false;
-	
-	while (!m_openList->empty())
-	{
-		// Remove node from open list and put it in closed list.
-		dtNode* bestNode = m_openList->pop();
-		bestNode->flags &= ~DT_NODE_OPEN;
-		bestNode->flags |= DT_NODE_CLOSED;
-		
-		// Reached the goal, stop searching.
-		if (bestNode->id == endRef)
-		{
-			lastBestNode = bestNode;
-			break;
-		}
-		
-		// Get current poly and tile.
-		// The API input has been cheked already, skip checking internal data.
-		const dtPolyRef bestRef = bestNode->id;
-		const dtMeshTile* bestTile = 0;
-		const dtPoly* bestPoly = 0;
-		m_nav->getTileAndPolyByRefUnsafe(bestRef, &bestTile, &bestPoly);
-		
-		// Get parent poly and tile.
-		dtPolyRef parentRef = 0;
-		const dtMeshTile* parentTile = 0;
-		const dtPoly* parentPoly = 0;
-		if (bestNode->pidx)
-			parentRef = m_nodePool->getNodeAtIdx(bestNode->pidx)->id;
-		if (parentRef)
-			m_nav->getTileAndPolyByRefUnsafe(parentRef, &parentTile, &parentPoly);
-		
-		for (unsigned int i = bestPoly->firstLink; i != DT_NULL_LINK; i = bestTile->links[i].next)
-		{
-			dtPolyRef neighbourRef = bestTile->links[i].ref;
-			
-			// Skip invalid ids and do not expand back to where we came from.
-			if (!neighbourRef || neighbourRef == parentRef)
-				continue;
-			
-			// Get neighbour poly and tile.
-			// The API input has been cheked already, skip checking internal data.
-			const dtMeshTile* neighbourTile = 0;
-			const dtPoly* neighbourPoly = 0;
-			m_nav->getTileAndPolyByRefUnsafe(neighbourRef, &neighbourTile, &neighbourPoly);			
-			
-			if (!filter->passFilter(neighbourRef, neighbourTile, neighbourPoly))
-				continue;
-
-			// deal explicitly with crossing tile boundaries
-			unsigned char crossSide = 0;
-			if (bestTile->links[i].side != 0xff)
-				crossSide = bestTile->links[i].side >> 1;
-
-			// get the node
-			dtNode* neighbourNode = m_nodePool->getNode(neighbourRef, crossSide);
-			if (!neighbourNode)
-			{
-				outOfNodes = true;
-				continue;
-			}
-			
-			// If the node is visited the first time, calculate node position.
-			if (neighbourNode->flags == 0)
-			{
-				getEdgeMidPoint(bestRef, bestPoly, bestTile,
-								neighbourRef, neighbourPoly, neighbourTile,
-								neighbourNode->pos);
-			}
-
-			// Calculate cost and heuristic.
-			float cost = 0;
-			float heuristic = 0;
-			
-			// Special case for last node.
-			if (neighbourRef == endRef)
-			{
-				// Cost
-				const float curCost = filter->getCost(bestNode->pos, neighbourNode->pos,
-													  parentRef, parentTile, parentPoly,
-													  bestRef, bestTile, bestPoly,
-													  neighbourRef, neighbourTile, neighbourPoly);
-				const float endCost = filter->getCost(neighbourNode->pos, endPos,
-													  bestRef, bestTile, bestPoly,
-													  neighbourRef, neighbourTile, neighbourPoly,
-													  0, 0, 0);
-				
-				cost = bestNode->cost + curCost + endCost;
-				heuristic = 0;
-			}
-			else
-			{
-				// Cost
-				const float curCost = filter->getCost(bestNode->pos, neighbourNode->pos,
-													  parentRef, parentTile, parentPoly,
-													  bestRef, bestTile, bestPoly,
-													  neighbourRef, neighbourTile, neighbourPoly);
-				cost = bestNode->cost + curCost;
-				heuristic = dtVdist(neighbourNode->pos, endPos)*H_SCALE;
-			}
-
-			const float total = cost + heuristic;
-			
-			// The node is already in open list and the new result is worse, skip.
-			if ((neighbourNode->flags & DT_NODE_OPEN) && total >= neighbourNode->total)
-				continue;
-			// The node is already visited and process, and the new result is worse, skip.
-			if ((neighbourNode->flags & DT_NODE_CLOSED) && total >= neighbourNode->total)
-				continue;
-			
-			// Add or update the node.
-			neighbourNode->pidx = m_nodePool->getNodeIdx(bestNode);
-			neighbourNode->id = neighbourRef;
-			neighbourNode->flags = (neighbourNode->flags & ~DT_NODE_CLOSED);
-			neighbourNode->cost = cost;
-			neighbourNode->total = total;
-			
-			if (neighbourNode->flags & DT_NODE_OPEN)
-			{
-				// Already in open, update node location.
-				m_openList->modify(neighbourNode);
-			}
-			else
-			{
-				// Put the node in open list.
-				neighbourNode->flags |= DT_NODE_OPEN;
-				m_openList->push(neighbourNode);
-			}
-			
-			// Update nearest node to target so far.
-			if (heuristic < lastBestNodeCost)
-			{
-				lastBestNodeCost = heuristic;
-				lastBestNode = neighbourNode;
-			}
-		}
-	}
-
-	dtStatus status = getPathToNode(lastBestNode, path, pathCount, maxPath);
-
-	if (lastBestNode->id != endRef)
-		status |= DT_PARTIAL_RESULT;
-
-	if (outOfNodes)
-		status |= DT_OUT_OF_NODES;
-	
-	return status;
-}
-
-dtStatus dtNavMeshQuery::getPathToNode(dtNode* endNode, dtPolyRef* path, int* pathCount, int maxPath) const
-{
-	// Find the length of the entire path.
-	dtNode* curNode = endNode;
-	int length = 0;
-	do
-	{
-		length++;
-		curNode = m_nodePool->getNodeAtIdx(curNode->pidx);
-	} while (curNode);
-
-	// If the path cannot be fully stored then advance to the last node we will be able to store.
-	curNode = endNode;
-	int writeCount;
-	for (writeCount = length; writeCount > maxPath; writeCount--)
-	{
-		dtAssert(curNode);
-
-		curNode = m_nodePool->getNodeAtIdx(curNode->pidx);
-	}
-
-	// Write path
-	for (int i = writeCount - 1; i >= 0; i--)
-	{
-		dtAssert(curNode);
-
-		path[i] = curNode->id;
-		curNode = m_nodePool->getNodeAtIdx(curNode->pidx);
-	}
-
-	dtAssert(!curNode);
-
-	*pathCount = dtMin(length, maxPath);
-
-	if (length > maxPath)
-		return DT_SUCCESS | DT_BUFFER_TOO_SMALL;
-
-	return DT_SUCCESS;
-}
-
-
-/// @par
-///
-/// @warning Calling any non-slice methods before calling finalizeSlicedFindPath() 
-/// or finalizeSlicedFindPathPartial() may result in corrupted data!
-///
-/// The @p filter pointer is stored and used for the duration of the sliced
-/// path query.
-///
-dtStatus dtNavMeshQuery::initSlicedFindPath(dtPolyRef startRef, dtPolyRef endRef,
-											const float* startPos, const float* endPos,
-											const dtQueryFilter* filter, const unsigned int options)
-{
-	dtAssert(m_nav);
-	dtAssert(m_nodePool);
-	dtAssert(m_openList);
-
-	// Init path state.
-	memset(&m_query, 0, sizeof(dtQueryData));
-	m_query.status = DT_FAILURE;
-	m_query.startRef = startRef;
-	m_query.endRef = endRef;
-	if (startPos)
-		dtVcopy(m_query.startPos, startPos);
-	if (endPos)
-		dtVcopy(m_query.endPos, endPos);
-	m_query.filter = filter;
-	m_query.options = options;
-	m_query.raycastLimitSqr = FLT_MAX;
-	
-	// Validate input
-	if (!m_nav->isValidPolyRef(startRef) || !m_nav->isValidPolyRef(endRef) ||
-		!startPos || !dtVisfinite(startPos) ||
-		!endPos || !dtVisfinite(endPos) || !filter)
-	{
-		return DT_FAILURE | DT_INVALID_PARAM;
-	}
-
-	// trade quality with performance?
-	if (options & DT_FINDPATH_ANY_ANGLE)
-	{
-		// limiting to several times the character radius yields nice results. It is not sensitive 
-		// so it is enough to compute it from the first tile.
-		const dtMeshTile* tile = m_nav->getTileByRef(startRef);
-		float agentRadius = tile->header->walkableRadius;
-		m_query.raycastLimitSqr = dtSqr(agentRadius * DT_RAY_CAST_LIMIT_PROPORTIONS);
-	}
-
-	if (startRef == endRef)
-	{
-		m_query.status = DT_SUCCESS;
-		return DT_SUCCESS;
-	}
-	
-	m_nodePool->clear();
-	m_openList->clear();
-	
-	dtNode* startNode = m_nodePool->getNode(startRef);
-	dtVcopy(startNode->pos, startPos);
-	startNode->pidx = 0;
-	startNode->cost = 0;
-	startNode->total = dtVdist(startPos, endPos) * H_SCALE;
-	startNode->id = startRef;
-	startNode->flags = DT_NODE_OPEN;
-	m_openList->push(startNode);
-	
-	m_query.status = DT_IN_PROGRESS;
-	m_query.lastBestNode = startNode;
-	m_query.lastBestNodeCost = startNode->total;
-	
-	return m_query.status;
-}
-	
-dtStatus dtNavMeshQuery::updateSlicedFindPath(const int maxIter, int* doneIters)
-{
-	if (!dtStatusInProgress(m_query.status))
-		return m_query.status;
-
-	// Make sure the request is still valid.
-	if (!m_nav->isValidPolyRef(m_query.startRef) || !m_nav->isValidPolyRef(m_query.endRef))
-	{
-		m_query.status = DT_FAILURE;
-		return DT_FAILURE;
-	}
-
-	dtRaycastHit rayHit;
-	rayHit.maxPath = 0;
-		
-	int iter = 0;
-	while (iter < maxIter && !m_openList->empty())
-	{
-		iter++;
-		
-		// Remove node from open list and put it in closed list.
-		dtNode* bestNode = m_openList->pop();
-		bestNode->flags &= ~DT_NODE_OPEN;
-		bestNode->flags |= DT_NODE_CLOSED;
-		
-		// Reached the goal, stop searching.
-		if (bestNode->id == m_query.endRef)
-		{
-			m_query.lastBestNode = bestNode;
-			const dtStatus details = m_query.status & DT_STATUS_DETAIL_MASK;
-			m_query.status = DT_SUCCESS | details;
-			if (doneIters)
-				*doneIters = iter;
-			return m_query.status;
-		}
-		
-		// Get current poly and tile.
-		// The API input has been cheked already, skip checking internal data.
-		const dtPolyRef bestRef = bestNode->id;
-		const dtMeshTile* bestTile = 0;
-		const dtPoly* bestPoly = 0;
-		if (dtStatusFailed(m_nav->getTileAndPolyByRef(bestRef, &bestTile, &bestPoly)))
-		{
-			// The polygon has disappeared during the sliced query, fail.
-			m_query.status = DT_FAILURE;
-			if (doneIters)
-				*doneIters = iter;
-			return m_query.status;
-		}
-		
-		// Get parent and grand parent poly and tile.
-		dtPolyRef parentRef = 0, grandpaRef = 0;
-		const dtMeshTile* parentTile = 0;
-		const dtPoly* parentPoly = 0;
-		dtNode* parentNode = 0;
-		if (bestNode->pidx)
-		{
-			parentNode = m_nodePool->getNodeAtIdx(bestNode->pidx);
-			parentRef = parentNode->id;
-			if (parentNode->pidx)
-				grandpaRef = m_nodePool->getNodeAtIdx(parentNode->pidx)->id;
-		}
-		if (parentRef)
-		{
-			bool invalidParent = dtStatusFailed(m_nav->getTileAndPolyByRef(parentRef, &parentTile, &parentPoly));
-			if (invalidParent || (grandpaRef && !m_nav->isValidPolyRef(grandpaRef)) )
-			{
-				// The polygon has disappeared during the sliced query, fail.
-				m_query.status = DT_FAILURE;
-				if (doneIters)
-					*doneIters = iter;
-				return m_query.status;
-			}
-		}
-
-		// decide whether to test raycast to previous nodes
-		bool tryLOS = false;
-		if (m_query.options & DT_FINDPATH_ANY_ANGLE)
-		{
-			if ((parentRef != 0) && (dtVdistSqr(parentNode->pos, bestNode->pos) < m_query.raycastLimitSqr))
-				tryLOS = true;
-		}
-		
-		for (unsigned int i = bestPoly->firstLink; i != DT_NULL_LINK; i = bestTile->links[i].next)
-		{
-			dtPolyRef neighbourRef = bestTile->links[i].ref;
-			
-			// Skip invalid ids and do not expand back to where we came from.
-			if (!neighbourRef || neighbourRef == parentRef)
-				continue;
-			
-			// Get neighbour poly and tile.
-			// The API input has been cheked already, skip checking internal data.
-			const dtMeshTile* neighbourTile = 0;
-			const dtPoly* neighbourPoly = 0;
-			m_nav->getTileAndPolyByRefUnsafe(neighbourRef, &neighbourTile, &neighbourPoly);			
-			
-			if (!m_query.filter->passFilter(neighbourRef, neighbourTile, neighbourPoly))
-				continue;
-			
-			// get the neighbor node
-			dtNode* neighbourNode = m_nodePool->getNode(neighbourRef, 0);
-			if (!neighbourNode)
-			{
-				m_query.status |= DT_OUT_OF_NODES;
-				continue;
-			}
-			
-			// do not expand to nodes that were already visited from the same parent
-			if (neighbourNode->pidx != 0 && neighbourNode->pidx == bestNode->pidx)
-				continue;
-
-			// If the node is visited the first time, calculate node position.
-			if (neighbourNode->flags == 0)
-			{
-				getEdgeMidPoint(bestRef, bestPoly, bestTile,
-								neighbourRef, neighbourPoly, neighbourTile,
-								neighbourNode->pos);
-			}
-			
-			// Calculate cost and heuristic.
-			float cost = 0;
-			float heuristic = 0;
-			
-			// raycast parent
-			bool foundShortCut = false;
-			rayHit.pathCost = rayHit.t = 0;
-			if (tryLOS)
-			{
-				raycast(parentRef, parentNode->pos, neighbourNode->pos, m_query.filter, DT_RAYCAST_USE_COSTS, &rayHit, grandpaRef);
-				foundShortCut = rayHit.t >= 1.0f;
-			}
-
-			// update move cost
-			if (foundShortCut)
-			{
-				// shortcut found using raycast. Using shorter cost instead
-				cost = parentNode->cost + rayHit.pathCost;
-			}
-			else
-			{
-				// No shortcut found.
-				const float curCost = m_query.filter->getCost(bestNode->pos, neighbourNode->pos,
-															  parentRef, parentTile, parentPoly,
-															bestRef, bestTile, bestPoly,
-															neighbourRef, neighbourTile, neighbourPoly);
-				cost = bestNode->cost + curCost;
-			}
-
-			// Special case for last node.
-			if (neighbourRef == m_query.endRef)
-			{
-				const float endCost = m_query.filter->getCost(neighbourNode->pos, m_query.endPos,
-															  bestRef, bestTile, bestPoly,
-															  neighbourRef, neighbourTile, neighbourPoly,
-															  0, 0, 0);
-				
-				cost = cost + endCost;
-				heuristic = 0;
-			}
-			else
-			{
-				heuristic = dtVdist(neighbourNode->pos, m_query.endPos)*H_SCALE;
-			}
-			
-			const float total = cost + heuristic;
-			
-			// The node is already in open list and the new result is worse, skip.
-			if ((neighbourNode->flags & DT_NODE_OPEN) && total >= neighbourNode->total)
-				continue;
-			// The node is already visited and process, and the new result is worse, skip.
-			if ((neighbourNode->flags & DT_NODE_CLOSED) && total >= neighbourNode->total)
-				continue;
-			
-			// Add or update the node.
-			neighbourNode->pidx = foundShortCut ? bestNode->pidx : m_nodePool->getNodeIdx(bestNode);
-			neighbourNode->id = neighbourRef;
-			neighbourNode->flags = (neighbourNode->flags & ~(DT_NODE_CLOSED | DT_NODE_PARENT_DETACHED));
-			neighbourNode->cost = cost;
-			neighbourNode->total = total;
-			if (foundShortCut)
-				neighbourNode->flags = (neighbourNode->flags | DT_NODE_PARENT_DETACHED);
-			
-			if (neighbourNode->flags & DT_NODE_OPEN)
-			{
-				// Already in open, update node location.
-				m_openList->modify(neighbourNode);
-			}
-			else
-			{
-				// Put the node in open list.
-				neighbourNode->flags |= DT_NODE_OPEN;
-				m_openList->push(neighbourNode);
-			}
-			
-			// Update nearest node to target so far.
-			if (heuristic < m_query.lastBestNodeCost)
-			{
-				m_query.lastBestNodeCost = heuristic;
-				m_query.lastBestNode = neighbourNode;
-			}
-		}
-	}
-	
-	// Exhausted all nodes, but could not find path.
-	if (m_openList->empty())
-	{
-		const dtStatus details = m_query.status & DT_STATUS_DETAIL_MASK;
-		m_query.status = DT_SUCCESS | details;
-	}
-
-	if (doneIters)
-		*doneIters = iter;
-
-	return m_query.status;
-}
-
-dtStatus dtNavMeshQuery::finalizeSlicedFindPath(dtPolyRef* path, int* pathCount, const int maxPath)
-{
-	if (!pathCount)
-		return DT_FAILURE | DT_INVALID_PARAM;
-
-	*pathCount = 0;
-
-	if (!path || maxPath <= 0)
-		return DT_FAILURE | DT_INVALID_PARAM;
-	
-	if (dtStatusFailed(m_query.status))
-	{
-		// Reset query.
-		memset(&m_query, 0, sizeof(dtQueryData));
-		return DT_FAILURE;
-	}
-
-	int n = 0;
-
-	if (m_query.startRef == m_query.endRef)
-	{
-		// Special case: the search starts and ends at same poly.
-		path[n++] = m_query.startRef;
-	}
-	else
-	{
-		// Reverse the path.
-		dtAssert(m_query.lastBestNode);
-		
-		if (m_query.lastBestNode->id != m_query.endRef)
-			m_query.status |= DT_PARTIAL_RESULT;
-		
-		dtNode* prev = 0;
-		dtNode* node = m_query.lastBestNode;
-		int prevRay = 0;
-		do
-		{
-			dtNode* next = m_nodePool->getNodeAtIdx(node->pidx);
-			node->pidx = m_nodePool->getNodeIdx(prev);
-			prev = node;
-			int nextRay = node->flags & DT_NODE_PARENT_DETACHED; // keep track of whether parent is not adjacent (i.e. due to raycast shortcut)
-			node->flags = (node->flags & ~DT_NODE_PARENT_DETACHED) | prevRay; // and store it in the reversed path's node
-			prevRay = nextRay;
-			node = next;
-		}
-		while (node);
-		
-		// Store path
-		node = prev;
-		do
-		{
-			dtNode* next = m_nodePool->getNodeAtIdx(node->pidx);
-			dtStatus status = 0;
-			if (node->flags & DT_NODE_PARENT_DETACHED)
-			{
-				float t, normal[3];
-				int m;
-				status = raycast(node->id, node->pos, next->pos, m_query.filter, &t, normal, path+n, &m, maxPath-n);
-				n += m;
-				// raycast ends on poly boundary and the path might include the next poly boundary.
-				if (path[n-1] == next->id)
-					n--; // remove to avoid duplicates
-			}
-			else
-			{
-				path[n++] = node->id;
-				if (n >= maxPath)
-					status = DT_BUFFER_TOO_SMALL;
-			}
-
-			if (status & DT_STATUS_DETAIL_MASK)
-			{
-				m_query.status |= status & DT_STATUS_DETAIL_MASK;
-				break;
-			}
-			node = next;
-		}
-		while (node);
-	}
-	
-	const dtStatus details = m_query.status & DT_STATUS_DETAIL_MASK;
-
-	// Reset query.
-	memset(&m_query, 0, sizeof(dtQueryData));
-	
-	*pathCount = n;
-	
-	return DT_SUCCESS | details;
-}
-
-dtStatus dtNavMeshQuery::finalizeSlicedFindPathPartial(const dtPolyRef* existing, const int existingSize,
-													   dtPolyRef* path, int* pathCount, const int maxPath)
-{
-	if (!pathCount)
-		return DT_FAILURE | DT_INVALID_PARAM;
-
-	*pathCount = 0;
-
-	if (!existing || existingSize <= 0 || !path || !pathCount || maxPath <= 0)
-		return DT_FAILURE | DT_INVALID_PARAM;
-	
-	if (dtStatusFailed(m_query.status))
-	{
-		// Reset query.
-		memset(&m_query, 0, sizeof(dtQueryData));
-		return DT_FAILURE;
-	}
-	
-	int n = 0;
-	
-	if (m_query.startRef == m_query.endRef)
-	{
-		// Special case: the search starts and ends at same poly.
-		path[n++] = m_query.startRef;
-	}
-	else
-	{
-		// Find furthest existing node that was visited.
-		dtNode* prev = 0;
-		dtNode* node = 0;
-		for (int i = existingSize-1; i >= 0; --i)
-		{
-			m_nodePool->findNodes(existing[i], &node, 1);
-			if (node)
-				break;
-		}
-		
-		if (!node)
-		{
-			m_query.status |= DT_PARTIAL_RESULT;
-			dtAssert(m_query.lastBestNode);
-			node = m_query.lastBestNode;
-		}
-		
-		// Reverse the path.
-		int prevRay = 0;
-		do
-		{
-			dtNode* next = m_nodePool->getNodeAtIdx(node->pidx);
-			node->pidx = m_nodePool->getNodeIdx(prev);
-			prev = node;
-			int nextRay = node->flags & DT_NODE_PARENT_DETACHED; // keep track of whether parent is not adjacent (i.e. due to raycast shortcut)
-			node->flags = (node->flags & ~DT_NODE_PARENT_DETACHED) | prevRay; // and store it in the reversed path's node
-			prevRay = nextRay;
-			node = next;
-		}
-		while (node);
-		
-		// Store path
-		node = prev;
-		do
-		{
-			dtNode* next = m_nodePool->getNodeAtIdx(node->pidx);
-			dtStatus status = 0;
-			if (node->flags & DT_NODE_PARENT_DETACHED)
-			{
-				float t, normal[3];
-				int m;
-				status = raycast(node->id, node->pos, next->pos, m_query.filter, &t, normal, path+n, &m, maxPath-n);
-				n += m;
-				// raycast ends on poly boundary and the path might include the next poly boundary.
-				if (path[n-1] == next->id)
-					n--; // remove to avoid duplicates
-			}
-			else
-			{
-				path[n++] = node->id;
-				if (n >= maxPath)
-					status = DT_BUFFER_TOO_SMALL;
-			}
-
-			if (status & DT_STATUS_DETAIL_MASK)
-			{
-				m_query.status |= status & DT_STATUS_DETAIL_MASK;
-				break;
-			}
-			node = next;
-		}
-		while (node);
-	}
-	
-	const dtStatus details = m_query.status & DT_STATUS_DETAIL_MASK;
-
-	// Reset query.
-	memset(&m_query, 0, sizeof(dtQueryData));
-	
-	*pathCount = n;
-	
-	return DT_SUCCESS | details;
-}
-
-
-dtStatus dtNavMeshQuery::appendVertex(const float* pos, const unsigned char flags, const dtPolyRef ref,
-									  float* straightPath, unsigned char* straightPathFlags, dtPolyRef* straightPathRefs,
-									  int* straightPathCount, const int maxStraightPath) const
-{
-	if ((*straightPathCount) > 0 && dtVequal(&straightPath[((*straightPathCount)-1)*3], pos))
-	{
-		// The vertices are equal, update flags and poly.
-		if (straightPathFlags)
-			straightPathFlags[(*straightPathCount)-1] = flags;
-		if (straightPathRefs)
-			straightPathRefs[(*straightPathCount)-1] = ref;
-	}
-	else
-	{
-		// Append new vertex.
-		dtVcopy(&straightPath[(*straightPathCount)*3], pos);
-		if (straightPathFlags)
-			straightPathFlags[(*straightPathCount)] = flags;
-		if (straightPathRefs)
-			straightPathRefs[(*straightPathCount)] = ref;
-		(*straightPathCount)++;
-
-		// If there is no space to append more vertices, return.
-		if ((*straightPathCount) >= maxStraightPath)
-		{
-			return DT_SUCCESS | DT_BUFFER_TOO_SMALL;
-		}
-
-		// If reached end of path, return.
-		if (flags == DT_STRAIGHTPATH_END)
-		{
-			return DT_SUCCESS;
-		}
-	}
-	return DT_IN_PROGRESS;
-}
-
-dtStatus dtNavMeshQuery::appendPortals(const int startIdx, const int endIdx, const float* endPos, const dtPolyRef* path,
-									  float* straightPath, unsigned char* straightPathFlags, dtPolyRef* straightPathRefs,
-									  int* straightPathCount, const int maxStraightPath, const int options) const
-{
-	const float* startPos = &straightPath[(*straightPathCount-1)*3];
-	// Append or update last vertex
-	dtStatus stat = 0;
-	for (int i = startIdx; i < endIdx; i++)
-	{
-		// Calculate portal
-		const dtPolyRef from = path[i];
-		const dtMeshTile* fromTile = 0;
-		const dtPoly* fromPoly = 0;
-		if (dtStatusFailed(m_nav->getTileAndPolyByRef(from, &fromTile, &fromPoly)))
-			return DT_FAILURE | DT_INVALID_PARAM;
-		
-		const dtPolyRef to = path[i+1];
-		const dtMeshTile* toTile = 0;
-		const dtPoly* toPoly = 0;
-		if (dtStatusFailed(m_nav->getTileAndPolyByRef(to, &toTile, &toPoly)))
-			return DT_FAILURE | DT_INVALID_PARAM;
-		
-		float left[3], right[3];
-		if (dtStatusFailed(getPortalPoints(from, fromPoly, fromTile, to, toPoly, toTile, left, right)))
-			break;
-	
-		if (options & DT_STRAIGHTPATH_AREA_CROSSINGS)
-		{
-			// Skip intersection if only area crossings are requested.
-			if (fromPoly->getArea() == toPoly->getArea())
-				continue;
-		}
-		
-		// Append intersection
-		float s,t;
-		if (dtIntersectSegSeg2D(startPos, endPos, left, right, s, t))
-		{
-			float pt[3];
-			dtVlerp(pt, left,right, t);
-
-			stat = appendVertex(pt, 0, path[i+1],
-								straightPath, straightPathFlags, straightPathRefs,
-								straightPathCount, maxStraightPath);
-			if (stat != DT_IN_PROGRESS)
-				return stat;
-		}
-	}
-	return DT_IN_PROGRESS;
-}
-
-/// @par
-/// 
-/// This method peforms what is often called 'string pulling'.
-///
-/// The start position is clamped to the first polygon in the path, and the 
-/// end position is clamped to the last. So the start and end positions should 
-/// normally be within or very near the first and last polygons respectively.
-///
-/// The returned polygon references represent the reference id of the polygon 
-/// that is entered at the associated path position. The reference id associated 
-/// with the end point will always be zero.  This allows, for example, matching 
-/// off-mesh link points to their representative polygons.
-///
-/// If the provided result buffers are too small for the entire result set, 
-/// they will be filled as far as possible from the start toward the end 
-/// position.
-///
-dtStatus dtNavMeshQuery::findStraightPath(const float* startPos, const float* endPos,
-										  const dtPolyRef* path, const int pathSize,
-										  float* straightPath, unsigned char* straightPathFlags, dtPolyRef* straightPathRefs,
-										  int* straightPathCount, const int maxStraightPath, const int options) const
-{
-	dtAssert(m_nav);
-
-	if (!straightPathCount)
-		return DT_FAILURE | DT_INVALID_PARAM;
-
-	*straightPathCount = 0;
-
-	if (!startPos || !dtVisfinite(startPos) ||
-		!endPos || !dtVisfinite(endPos) ||
-		!path || pathSize <= 0 || !path[0] ||
-		maxStraightPath <= 0)
-	{
-		return DT_FAILURE | DT_INVALID_PARAM;
-	}
-	
-	dtStatus stat = 0;
-	
-	// TODO: Should this be callers responsibility?
-	float closestStartPos[3];
-	if (dtStatusFailed(closestPointOnPolyBoundary(path[0], startPos, closestStartPos)))
-		return DT_FAILURE | DT_INVALID_PARAM;
-
-	float closestEndPos[3];
-	if (dtStatusFailed(closestPointOnPolyBoundary(path[pathSize-1], endPos, closestEndPos)))
-		return DT_FAILURE | DT_INVALID_PARAM;
-	
-	// Add start point.
-	stat = appendVertex(closestStartPos, DT_STRAIGHTPATH_START, path[0],
-						straightPath, straightPathFlags, straightPathRefs,
-						straightPathCount, maxStraightPath);
-	if (stat != DT_IN_PROGRESS)
-		return stat;
-	
-	if (pathSize > 1)
-	{
-		float portalApex[3], portalLeft[3], portalRight[3];
-		dtVcopy(portalApex, closestStartPos);
-		dtVcopy(portalLeft, portalApex);
-		dtVcopy(portalRight, portalApex);
-		int apexIndex = 0;
-		int leftIndex = 0;
-		int rightIndex = 0;
-		
-		unsigned char leftPolyType = 0;
-		unsigned char rightPolyType = 0;
-		
-		dtPolyRef leftPolyRef = path[0];
-		dtPolyRef rightPolyRef = path[0];
-		
-		for (int i = 0; i < pathSize; ++i)
-		{
-			float left[3], right[3];
-			unsigned char toType;
-			
-			if (i+1 < pathSize)
-			{
-				unsigned char fromType; // fromType is ignored.
-
-				// Next portal.
-				if (dtStatusFailed(getPortalPoints(path[i], path[i+1], left, right, fromType, toType)))
-				{
-					// Failed to get portal points, in practice this means that path[i+1] is invalid polygon.
-					// Clamp the end point to path[i], and return the path so far.
-					
-					if (dtStatusFailed(closestPointOnPolyBoundary(path[i], endPos, closestEndPos)))
-					{
-						// This should only happen when the first polygon is invalid.
-						return DT_FAILURE | DT_INVALID_PARAM;
-					}
-
-					// Apeend portals along the current straight path segment.
-					if (options & (DT_STRAIGHTPATH_AREA_CROSSINGS | DT_STRAIGHTPATH_ALL_CROSSINGS))
-					{
-						// Ignore status return value as we're just about to return anyway.
-						appendPortals(apexIndex, i, closestEndPos, path,
-											 straightPath, straightPathFlags, straightPathRefs,
-											 straightPathCount, maxStraightPath, options);
-					}
-
-					// Ignore status return value as we're just about to return anyway.
-					appendVertex(closestEndPos, 0, path[i],
-										straightPath, straightPathFlags, straightPathRefs,
-										straightPathCount, maxStraightPath);
-					
-					return DT_SUCCESS | DT_PARTIAL_RESULT | ((*straightPathCount >= maxStraightPath) ? DT_BUFFER_TOO_SMALL : 0);
-				}
-				
-				// If starting really close the portal, advance.
-				if (i == 0)
-				{
-					float t;
-					if (dtDistancePtSegSqr2D(portalApex, left, right, t) < dtSqr(0.001f))
-						continue;
-				}
-			}
-			else
-			{
-				// End of the path.
-				dtVcopy(left, closestEndPos);
-				dtVcopy(right, closestEndPos);
-				
-				toType = DT_POLYTYPE_GROUND;
-			}
-			
-			// Right vertex.
-			if (dtTriArea2D(portalApex, portalRight, right) <= 0.0f)
-			{
-				if (dtVequal(portalApex, portalRight) || dtTriArea2D(portalApex, portalLeft, right) > 0.0f)
-				{
-					dtVcopy(portalRight, right);
-					rightPolyRef = (i+1 < pathSize) ? path[i+1] : 0;
-					rightPolyType = toType;
-					rightIndex = i;
-				}
-				else
-				{
-					// Append portals along the current straight path segment.
-					if (options & (DT_STRAIGHTPATH_AREA_CROSSINGS | DT_STRAIGHTPATH_ALL_CROSSINGS))
-					{
-						stat = appendPortals(apexIndex, leftIndex, portalLeft, path,
-											 straightPath, straightPathFlags, straightPathRefs,
-											 straightPathCount, maxStraightPath, options);
-						if (stat != DT_IN_PROGRESS)
-							return stat;					
-					}
-				
-					dtVcopy(portalApex, portalLeft);
-					apexIndex = leftIndex;
-					
-					unsigned char flags = 0;
-					if (!leftPolyRef)
-						flags = DT_STRAIGHTPATH_END;
-					else if (leftPolyType == DT_POLYTYPE_OFFMESH_CONNECTION)
-						flags = DT_STRAIGHTPATH_OFFMESH_CONNECTION;
-					dtPolyRef ref = leftPolyRef;
-					
-					// Append or update vertex
-					stat = appendVertex(portalApex, flags, ref,
-										straightPath, straightPathFlags, straightPathRefs,
-										straightPathCount, maxStraightPath);
-					if (stat != DT_IN_PROGRESS)
-						return stat;
-					
-					dtVcopy(portalLeft, portalApex);
-					dtVcopy(portalRight, portalApex);
-					leftIndex = apexIndex;
-					rightIndex = apexIndex;
-					
-					// Restart
-					i = apexIndex;
-					
-					continue;
-				}
-			}
-			
-			// Left vertex.
-			if (dtTriArea2D(portalApex, portalLeft, left) >= 0.0f)
-			{
-				if (dtVequal(portalApex, portalLeft) || dtTriArea2D(portalApex, portalRight, left) < 0.0f)
-				{
-					dtVcopy(portalLeft, left);
-					leftPolyRef = (i+1 < pathSize) ? path[i+1] : 0;
-					leftPolyType = toType;
-					leftIndex = i;
-				}
-				else
-				{
-					// Append portals along the current straight path segment.
-					if (options & (DT_STRAIGHTPATH_AREA_CROSSINGS | DT_STRAIGHTPATH_ALL_CROSSINGS))
-					{
-						stat = appendPortals(apexIndex, rightIndex, portalRight, path,
-											 straightPath, straightPathFlags, straightPathRefs,
-											 straightPathCount, maxStraightPath, options);
-						if (stat != DT_IN_PROGRESS)
-							return stat;
-					}
-
-					dtVcopy(portalApex, portalRight);
-					apexIndex = rightIndex;
-					
-					unsigned char flags = 0;
-					if (!rightPolyRef)
-						flags = DT_STRAIGHTPATH_END;
-					else if (rightPolyType == DT_POLYTYPE_OFFMESH_CONNECTION)
-						flags = DT_STRAIGHTPATH_OFFMESH_CONNECTION;
-					dtPolyRef ref = rightPolyRef;
-
-					// Append or update vertex
-					stat = appendVertex(portalApex, flags, ref,
-										straightPath, straightPathFlags, straightPathRefs,
-										straightPathCount, maxStraightPath);
-					if (stat != DT_IN_PROGRESS)
-						return stat;
-					
-					dtVcopy(portalLeft, portalApex);
-					dtVcopy(portalRight, portalApex);
-					leftIndex = apexIndex;
-					rightIndex = apexIndex;
-					
-					// Restart
-					i = apexIndex;
-					
-					continue;
-				}
-			}
-		}
-
-		// Append portals along the current straight path segment.
-		if (options & (DT_STRAIGHTPATH_AREA_CROSSINGS | DT_STRAIGHTPATH_ALL_CROSSINGS))
-		{
-			stat = appendPortals(apexIndex, pathSize-1, closestEndPos, path,
-								 straightPath, straightPathFlags, straightPathRefs,
-								 straightPathCount, maxStraightPath, options);
-			if (stat != DT_IN_PROGRESS)
-				return stat;
-		}
-	}
-
-	// Ignore status return value as we're just about to return anyway.
-	appendVertex(closestEndPos, DT_STRAIGHTPATH_END, 0,
-						straightPath, straightPathFlags, straightPathRefs,
-						straightPathCount, maxStraightPath);
-	
-	return DT_SUCCESS | ((*straightPathCount >= maxStraightPath) ? DT_BUFFER_TOO_SMALL : 0);
-}
-
-/// @par
-///
-/// This method is optimized for small delta movement and a small number of 
-/// polygons. If used for too great a distance, the result set will form an 
-/// incomplete path.
-///
-/// @p resultPos will equal the @p endPos if the end is reached. 
-/// Otherwise the closest reachable position will be returned.
-/// 
-/// @p resultPos is not projected onto the surface of the navigation 
-/// mesh. Use #getPolyHeight if this is needed.
-///
-/// This method treats the end position in the same manner as 
-/// the #raycast method. (As a 2D point.) See that method's documentation 
-/// for details.
-/// 
-/// If the @p visited array is too small to hold the entire result set, it will 
-/// be filled as far as possible from the start position toward the end 
-/// position.
-///
-dtStatus dtNavMeshQuery::moveAlongSurface(dtPolyRef startRef, const float* startPos, const float* endPos,
-										  const dtQueryFilter* filter,
-										  float* resultPos, dtPolyRef* visited, int* visitedCount, const int maxVisitedSize) const
-{
-	dtAssert(m_nav);
-	dtAssert(m_tinyNodePool);
-
-	if (!visitedCount)
-		return DT_FAILURE | DT_INVALID_PARAM;
-
-	*visitedCount = 0;
-
-	if (!m_nav->isValidPolyRef(startRef) ||
-		!startPos || !dtVisfinite(startPos) ||
-		!endPos || !dtVisfinite(endPos) ||
-		!filter || !resultPos || !visited ||
-		maxVisitedSize <= 0)
-	{
-		return DT_FAILURE | DT_INVALID_PARAM;
-	}
-	
-	dtStatus status = DT_SUCCESS;
-	
-	static const int MAX_STACK = 48;
-	dtNode* stack[MAX_STACK];
-	int nstack = 0;
-	
-	m_tinyNodePool->clear();
-	
-	dtNode* startNode = m_tinyNodePool->getNode(startRef);
-	startNode->pidx = 0;
-	startNode->cost = 0;
-	startNode->total = 0;
-	startNode->id = startRef;
-	startNode->flags = DT_NODE_CLOSED;
-	stack[nstack++] = startNode;
-	
-	float bestPos[3];
-	float bestDist = FLT_MAX;
-	dtNode* bestNode = 0;
-	dtVcopy(bestPos, startPos);
-	
-	// Search constraints
-	float searchPos[3], searchRadSqr;
-	dtVlerp(searchPos, startPos, endPos, 0.5f);
-	searchRadSqr = dtSqr(dtVdist(startPos, endPos)/2.0f + 0.001f);
-	
-	float verts[DT_VERTS_PER_POLYGON*3];
-	
-	while (nstack)
-	{
-		// Pop front.
-		dtNode* curNode = stack[0];
-		for (int i = 0; i < nstack-1; ++i)
-			stack[i] = stack[i+1];
-		nstack--;
-		
-		// Get poly and tile.
-		// The API input has been cheked already, skip checking internal data.
-		const dtPolyRef curRef = curNode->id;
-		const dtMeshTile* curTile = 0;
-		const dtPoly* curPoly = 0;
-		m_nav->getTileAndPolyByRefUnsafe(curRef, &curTile, &curPoly);			
-		
-		// Collect vertices.
-		const int nverts = curPoly->vertCount;
-		for (int i = 0; i < nverts; ++i)
-			dtVcopy(&verts[i*3], &curTile->verts[curPoly->verts[i]*3]);
-		
-		// If target is inside the poly, stop search.
-		if (dtPointInPolygon(endPos, verts, nverts))
-		{
-			bestNode = curNode;
-			dtVcopy(bestPos, endPos);
-			break;
-		}
-		
-		// Find wall edges and find nearest point inside the walls.
-		for (int i = 0, j = (int)curPoly->vertCount-1; i < (int)curPoly->vertCount; j = i++)
-		{
-			// Find links to neighbours.
-			static const int MAX_NEIS = 8;
-			int nneis = 0;
-			dtPolyRef neis[MAX_NEIS];
-			
-			if (curPoly->neis[j] & DT_EXT_LINK)
-			{
-				// Tile border.
-				for (unsigned int k = curPoly->firstLink; k != DT_NULL_LINK; k = curTile->links[k].next)
-				{
-					const dtLink* link = &curTile->links[k];
-					if (link->edge == j)
-					{
-						if (link->ref != 0)
-						{
-							const dtMeshTile* neiTile = 0;
-							const dtPoly* neiPoly = 0;
-							m_nav->getTileAndPolyByRefUnsafe(link->ref, &neiTile, &neiPoly);
-							if (filter->passFilter(link->ref, neiTile, neiPoly))
-							{
-								if (nneis < MAX_NEIS)
-									neis[nneis++] = link->ref;
-							}
-						}
-					}
-				}
-			}
-			else if (curPoly->neis[j])
-			{
-				const unsigned int idx = (unsigned int)(curPoly->neis[j]-1);
-				const dtPolyRef ref = m_nav->getPolyRefBase(curTile) | idx;
-				if (filter->passFilter(ref, curTile, &curTile->polys[idx]))
-				{
-					// Internal edge, encode id.
-					neis[nneis++] = ref;
-				}
-			}
-			
-			if (!nneis)
-			{
-				// Wall edge, calc distance.
-				const float* vj = &verts[j*3];
-				const float* vi = &verts[i*3];
-				float tseg;
-				const float distSqr = dtDistancePtSegSqr2D(endPos, vj, vi, tseg);
-				if (distSqr < bestDist)
-				{
-                    // Update nearest distance.
-					dtVlerp(bestPos, vj,vi, tseg);
-					bestDist = distSqr;
-					bestNode = curNode;
-				}
-			}
-			else
-			{
-				for (int k = 0; k < nneis; ++k)
-				{
-					// Skip if no node can be allocated.
-					dtNode* neighbourNode = m_tinyNodePool->getNode(neis[k]);
-					if (!neighbourNode)
-						continue;
-					// Skip if already visited.
-					if (neighbourNode->flags & DT_NODE_CLOSED)
-						continue;
-					
-					// Skip the link if it is too far from search constraint.
-					// TODO: Maybe should use getPortalPoints(), but this one is way faster.
-					const float* vj = &verts[j*3];
-					const float* vi = &verts[i*3];
-					float tseg;
-					float distSqr = dtDistancePtSegSqr2D(searchPos, vj, vi, tseg);
-					if (distSqr > searchRadSqr)
-						continue;
-					
-					// Mark as the node as visited and push to queue.
-					if (nstack < MAX_STACK)
-					{
-						neighbourNode->pidx = m_tinyNodePool->getNodeIdx(curNode);
-						neighbourNode->flags |= DT_NODE_CLOSED;
-						stack[nstack++] = neighbourNode;
-					}
-				}
-			}
-		}
-	}
-	
-	int n = 0;
-	if (bestNode)
-	{
-		// Reverse the path.
-		dtNode* prev = 0;
-		dtNode* node = bestNode;
-		do
-		{
-			dtNode* next = m_tinyNodePool->getNodeAtIdx(node->pidx);
-			node->pidx = m_tinyNodePool->getNodeIdx(prev);
-			prev = node;
-			node = next;
-		}
-		while (node);
-		
-		// Store result
-		node = prev;
-		do
-		{
-			visited[n++] = node->id;
-			if (n >= maxVisitedSize)
-			{
-				status |= DT_BUFFER_TOO_SMALL;
-				break;
-			}
-			node = m_tinyNodePool->getNodeAtIdx(node->pidx);
-		}
-		while (node);
-	}
-	
-	dtVcopy(resultPos, bestPos);
-	
-	*visitedCount = n;
-	
-	return status;
-}
-
-
-dtStatus dtNavMeshQuery::getPortalPoints(dtPolyRef from, dtPolyRef to, float* left, float* right,
-										 unsigned char& fromType, unsigned char& toType) const
-{
-	dtAssert(m_nav);
-	
-	const dtMeshTile* fromTile = 0;
-	const dtPoly* fromPoly = 0;
-	if (dtStatusFailed(m_nav->getTileAndPolyByRef(from, &fromTile, &fromPoly)))
-		return DT_FAILURE | DT_INVALID_PARAM;
-	fromType = fromPoly->getType();
-
-	const dtMeshTile* toTile = 0;
-	const dtPoly* toPoly = 0;
-	if (dtStatusFailed(m_nav->getTileAndPolyByRef(to, &toTile, &toPoly)))
-		return DT_FAILURE | DT_INVALID_PARAM;
-	toType = toPoly->getType();
-		
-	return getPortalPoints(from, fromPoly, fromTile, to, toPoly, toTile, left, right);
-}
-
-// Returns portal points between two polygons.
-dtStatus dtNavMeshQuery::getPortalPoints(dtPolyRef from, const dtPoly* fromPoly, const dtMeshTile* fromTile,
-										 dtPolyRef to, const dtPoly* toPoly, const dtMeshTile* toTile,
-										 float* left, float* right) const
-{
-	// Find the link that points to the 'to' polygon.
-	const dtLink* link = 0;
-	for (unsigned int i = fromPoly->firstLink; i != DT_NULL_LINK; i = fromTile->links[i].next)
-	{
-		if (fromTile->links[i].ref == to)
-		{
-			link = &fromTile->links[i];
-			break;
-		}
-	}
-	if (!link)
-		return DT_FAILURE | DT_INVALID_PARAM;
-	
-	// Handle off-mesh connections.
-	if (fromPoly->getType() == DT_POLYTYPE_OFFMESH_CONNECTION)
-	{
-		// Find link that points to first vertex.
-		for (unsigned int i = fromPoly->firstLink; i != DT_NULL_LINK; i = fromTile->links[i].next)
-		{
-			if (fromTile->links[i].ref == to)
-			{
-				const int v = fromTile->links[i].edge;
-				dtVcopy(left, &fromTile->verts[fromPoly->verts[v]*3]);
-				dtVcopy(right, &fromTile->verts[fromPoly->verts[v]*3]);
-				return DT_SUCCESS;
-			}
-		}
-		return DT_FAILURE | DT_INVALID_PARAM;
-	}
-	
-	if (toPoly->getType() == DT_POLYTYPE_OFFMESH_CONNECTION)
-	{
-		for (unsigned int i = toPoly->firstLink; i != DT_NULL_LINK; i = toTile->links[i].next)
-		{
-			if (toTile->links[i].ref == from)
-			{
-				const int v = toTile->links[i].edge;
-				dtVcopy(left, &toTile->verts[toPoly->verts[v]*3]);
-				dtVcopy(right, &toTile->verts[toPoly->verts[v]*3]);
-				return DT_SUCCESS;
-			}
-		}
-		return DT_FAILURE | DT_INVALID_PARAM;
-	}
-	
-	// Find portal vertices.
-	const int v0 = fromPoly->verts[link->edge];
-	const int v1 = fromPoly->verts[(link->edge+1) % (int)fromPoly->vertCount];
-	dtVcopy(left, &fromTile->verts[v0*3]);
-	dtVcopy(right, &fromTile->verts[v1*3]);
-	
-	// If the link is at tile boundary, dtClamp the vertices to
-	// the link width.
-	if (link->side != 0xff)
-	{
-		// Unpack portal limits.
-		if (link->bmin != 0 || link->bmax != 255)
-		{
-			const float s = 1.0f/255.0f;
-			const float tmin = link->bmin*s;
-			const float tmax = link->bmax*s;
-			dtVlerp(left, &fromTile->verts[v0*3], &fromTile->verts[v1*3], tmin);
-			dtVlerp(right, &fromTile->verts[v0*3], &fromTile->verts[v1*3], tmax);
-		}
-	}
-	
-	return DT_SUCCESS;
-}
-
-// Returns edge mid point between two polygons.
-dtStatus dtNavMeshQuery::getEdgeMidPoint(dtPolyRef from, dtPolyRef to, float* mid) const
-{
-	float left[3], right[3];
-	unsigned char fromType, toType;
-	if (dtStatusFailed(getPortalPoints(from, to, left,right, fromType, toType)))
-		return DT_FAILURE | DT_INVALID_PARAM;
-	mid[0] = (left[0]+right[0])*0.5f;
-	mid[1] = (left[1]+right[1])*0.5f;
-	mid[2] = (left[2]+right[2])*0.5f;
-	return DT_SUCCESS;
-}
-
-dtStatus dtNavMeshQuery::getEdgeMidPoint(dtPolyRef from, const dtPoly* fromPoly, const dtMeshTile* fromTile,
-										 dtPolyRef to, const dtPoly* toPoly, const dtMeshTile* toTile,
-										 float* mid) const
-{
-	float left[3], right[3];
-	if (dtStatusFailed(getPortalPoints(from, fromPoly, fromTile, to, toPoly, toTile, left, right)))
-		return DT_FAILURE | DT_INVALID_PARAM;
-	mid[0] = (left[0]+right[0])*0.5f;
-	mid[1] = (left[1]+right[1])*0.5f;
-	mid[2] = (left[2]+right[2])*0.5f;
-	return DT_SUCCESS;
-}
-
-
-
-/// @par
-///
-/// This method is meant to be used for quick, short distance checks.
-///
-/// If the path array is too small to hold the result, it will be filled as 
-/// far as possible from the start postion toward the end position.
-///
-/// <b>Using the Hit Parameter (t)</b>
-/// 
-/// If the hit parameter is a very high value (FLT_MAX), then the ray has hit 
-/// the end position. In this case the path represents a valid corridor to the 
-/// end position and the value of @p hitNormal is undefined.
-///
-/// If the hit parameter is zero, then the start position is on the wall that 
-/// was hit and the value of @p hitNormal is undefined.
-///
-/// If 0 < t < 1.0 then the following applies:
-///
-/// @code
-/// distanceToHitBorder = distanceToEndPosition * t
-/// hitPoint = startPos + (endPos - startPos) * t
-/// @endcode
-///
-/// <b>Use Case Restriction</b>
-///
-/// The raycast ignores the y-value of the end position. (2D check.) This 
-/// places significant limits on how it can be used. For example:
-///
-/// Consider a scene where there is a main floor with a second floor balcony 
-/// that hangs over the main floor. So the first floor mesh extends below the 
-/// balcony mesh. The start position is somewhere on the first floor. The end 
-/// position is on the balcony.
-///
-/// The raycast will search toward the end position along the first floor mesh. 
-/// If it reaches the end position's xz-coordinates it will indicate FLT_MAX
-/// (no wall hit), meaning it reached the end position. This is one example of why
-/// this method is meant for short distance checks.
-///
-dtStatus dtNavMeshQuery::raycast(dtPolyRef startRef, const float* startPos, const float* endPos,
-								 const dtQueryFilter* filter,
-								 float* t, float* hitNormal, dtPolyRef* path, int* pathCount, const int maxPath) const
-{
-	dtRaycastHit hit;
-	hit.path = path;
-	hit.maxPath = maxPath;
-
-	dtStatus status = raycast(startRef, startPos, endPos, filter, 0, &hit);
-	
-	*t = hit.t;
-	if (hitNormal)
-		dtVcopy(hitNormal, hit.hitNormal);
-	if (pathCount)
-		*pathCount = hit.pathCount;
-
-	return status;
-}
-
-
-/// @par
-///
-/// This method is meant to be used for quick, short distance checks.
-///
-/// If the path array is too small to hold the result, it will be filled as 
-/// far as possible from the start postion toward the end position.
-///
-/// <b>Using the Hit Parameter t of RaycastHit</b>
-/// 
-/// If the hit parameter is a very high value (FLT_MAX), then the ray has hit 
-/// the end position. In this case the path represents a valid corridor to the 
-/// end position and the value of @p hitNormal is undefined.
-///
-/// If the hit parameter is zero, then the start position is on the wall that 
-/// was hit and the value of @p hitNormal is undefined.
-///
-/// If 0 < t < 1.0 then the following applies:
-///
-/// @code
-/// distanceToHitBorder = distanceToEndPosition * t
-/// hitPoint = startPos + (endPos - startPos) * t
-/// @endcode
-///
-/// <b>Use Case Restriction</b>
-///
-/// The raycast ignores the y-value of the end position. (2D check.) This 
-/// places significant limits on how it can be used. For example:
-///
-/// Consider a scene where there is a main floor with a second floor balcony 
-/// that hangs over the main floor. So the first floor mesh extends below the 
-/// balcony mesh. The start position is somewhere on the first floor. The end 
-/// position is on the balcony.
-///
-/// The raycast will search toward the end position along the first floor mesh. 
-/// If it reaches the end position's xz-coordinates it will indicate FLT_MAX
-/// (no wall hit), meaning it reached the end position. This is one example of why
-/// this method is meant for short distance checks.
-///
-dtStatus dtNavMeshQuery::raycast(dtPolyRef startRef, const float* startPos, const float* endPos,
-								 const dtQueryFilter* filter, const unsigned int options,
-								 dtRaycastHit* hit, dtPolyRef prevRef) const
-{
-	dtAssert(m_nav);
-
-	if (!hit)
-		return DT_FAILURE | DT_INVALID_PARAM;
-
-	hit->t = 0;
-	hit->pathCount = 0;
-	hit->pathCost = 0;
-
-	// Validate input
-	if (!m_nav->isValidPolyRef(startRef) ||
-		!startPos || !dtVisfinite(startPos) ||
-		!endPos || !dtVisfinite(endPos) ||
-		!filter ||
-		(prevRef && !m_nav->isValidPolyRef(prevRef)))
-	{
-		return DT_FAILURE | DT_INVALID_PARAM;
-	}
-	
-	float dir[3], curPos[3], lastPos[3];
-	float verts[DT_VERTS_PER_POLYGON*3+3];	
-	int n = 0;
-
-	dtVcopy(curPos, startPos);
-	dtVsub(dir, endPos, startPos);
-	dtVset(hit->hitNormal, 0, 0, 0);
-
-	dtStatus status = DT_SUCCESS;
-
-	const dtMeshTile* prevTile, *tile, *nextTile;
-	const dtPoly* prevPoly, *poly, *nextPoly;
-	dtPolyRef curRef;
-
-	// The API input has been checked already, skip checking internal data.
-	curRef = startRef;
-	tile = 0;
-	poly = 0;
-	m_nav->getTileAndPolyByRefUnsafe(curRef, &tile, &poly);
-	nextTile = prevTile = tile;
-	nextPoly = prevPoly = poly;
-	if (prevRef)
-		m_nav->getTileAndPolyByRefUnsafe(prevRef, &prevTile, &prevPoly);
-
-	while (curRef)
-	{
-		// Cast ray against current polygon.
-		
-		// Collect vertices.
-		int nv = 0;
-		for (int i = 0; i < (int)poly->vertCount; ++i)
-		{
-			dtVcopy(&verts[nv*3], &tile->verts[poly->verts[i]*3]);
-			nv++;
-		}
-		
-		float tmin, tmax;
-		int segMin, segMax;
-		if (!dtIntersectSegmentPoly2D(startPos, endPos, verts, nv, tmin, tmax, segMin, segMax))
-		{
-			// Could not hit the polygon, keep the old t and report hit.
-			hit->pathCount = n;
-			return status;
-		}
-
-		hit->hitEdgeIndex = segMax;
-
-		// Keep track of furthest t so far.
-		if (tmax > hit->t)
-			hit->t = tmax;
-		
-		// Store visited polygons.
-		if (n < hit->maxPath)
-			hit->path[n++] = curRef;
-		else
-			status |= DT_BUFFER_TOO_SMALL;
-
-		// Ray end is completely inside the polygon.
-		if (segMax == -1)
-		{
-			hit->t = FLT_MAX;
-			hit->pathCount = n;
-			
-			// add the cost
-			if (options & DT_RAYCAST_USE_COSTS)
-				hit->pathCost += filter->getCost(curPos, endPos, prevRef, prevTile, prevPoly, curRef, tile, poly, curRef, tile, poly);
-			return status;
-		}
-
-		// Follow neighbours.
-		dtPolyRef nextRef = 0;
-		
-		for (unsigned int i = poly->firstLink; i != DT_NULL_LINK; i = tile->links[i].next)
-		{
-			const dtLink* link = &tile->links[i];
-			
-			// Find link which contains this edge.
-			if ((int)link->edge != segMax)
-				continue;
-			
-			// Get pointer to the next polygon.
-			nextTile = 0;
-			nextPoly = 0;
-			m_nav->getTileAndPolyByRefUnsafe(link->ref, &nextTile, &nextPoly);
-			
-			// Skip off-mesh connections.
-			if (nextPoly->getType() == DT_POLYTYPE_OFFMESH_CONNECTION)
-				continue;
-			
-			// Skip links based on filter.
-			if (!filter->passFilter(link->ref, nextTile, nextPoly))
-				continue;
-			
-			// If the link is internal, just return the ref.
-			if (link->side == 0xff)
-			{
-				nextRef = link->ref;
-				break;
-			}
-			
-			// If the link is at tile boundary,
-			
-			// Check if the link spans the whole edge, and accept.
-			if (link->bmin == 0 && link->bmax == 255)
-			{
-				nextRef = link->ref;
-				break;
-			}
-			
-			// Check for partial edge links.
-			const int v0 = poly->verts[link->edge];
-			const int v1 = poly->verts[(link->edge+1) % poly->vertCount];
-			const float* left = &tile->verts[v0*3];
-			const float* right = &tile->verts[v1*3];
-			
-			// Check that the intersection lies inside the link portal.
-			if (link->side == 0 || link->side == 4)
-			{
-				// Calculate link size.
-				const float s = 1.0f/255.0f;
-				float lmin = left[2] + (right[2] - left[2])*(link->bmin*s);
-				float lmax = left[2] + (right[2] - left[2])*(link->bmax*s);
-				if (lmin > lmax) dtSwap(lmin, lmax);
-				
-				// Find Z intersection.
-				float z = startPos[2] + (endPos[2]-startPos[2])*tmax;
-				if (z >= lmin && z <= lmax)
-				{
-					nextRef = link->ref;
-					break;
-				}
-			}
-			else if (link->side == 2 || link->side == 6)
-			{
-				// Calculate link size.
-				const float s = 1.0f/255.0f;
-				float lmin = left[0] + (right[0] - left[0])*(link->bmin*s);
-				float lmax = left[0] + (right[0] - left[0])*(link->bmax*s);
-				if (lmin > lmax) dtSwap(lmin, lmax);
-				
-				// Find X intersection.
-				float x = startPos[0] + (endPos[0]-startPos[0])*tmax;
-				if (x >= lmin && x <= lmax)
-				{
-					nextRef = link->ref;
-					break;
-				}
-			}
-		}
-		
-		// add the cost
-		if (options & DT_RAYCAST_USE_COSTS)
-		{
-			// compute the intersection point at the furthest end of the polygon
-			// and correct the height (since the raycast moves in 2d)
-			dtVcopy(lastPos, curPos);
-			dtVmad(curPos, startPos, dir, hit->t);
-			float* e1 = &verts[segMax*3];
-			float* e2 = &verts[((segMax+1)%nv)*3];
-			float eDir[3], diff[3];
-			dtVsub(eDir, e2, e1);
-			dtVsub(diff, curPos, e1);
-			float s = dtSqr(eDir[0]) > dtSqr(eDir[2]) ? diff[0] / eDir[0] : diff[2] / eDir[2];
-			curPos[1] = e1[1] + eDir[1] * s;
-
-			hit->pathCost += filter->getCost(lastPos, curPos, prevRef, prevTile, prevPoly, curRef, tile, poly, nextRef, nextTile, nextPoly);
-		}
-
-		if (!nextRef)
-		{
-			// No neighbour, we hit a wall.
-			
-			// Calculate hit normal.
-			const int a = segMax;
-			const int b = segMax+1 < nv ? segMax+1 : 0;
-			const float* va = &verts[a*3];
-			const float* vb = &verts[b*3];
-			const float dx = vb[0] - va[0];
-			const float dz = vb[2] - va[2];
-			hit->hitNormal[0] = dz;
-			hit->hitNormal[1] = 0;
-			hit->hitNormal[2] = -dx;
-			dtVnormalize(hit->hitNormal);
-			
-			hit->pathCount = n;
-			return status;
-		}
-
-		// No hit, advance to neighbour polygon.
-		prevRef = curRef;
-		curRef = nextRef;
-		prevTile = tile;
-		tile = nextTile;
-		prevPoly = poly;
-		poly = nextPoly;
-	}
-	
-	hit->pathCount = n;
-	
-	return status;
-}
-
-/// @par
-///
-/// At least one result array must be provided.
-///
-/// The order of the result set is from least to highest cost to reach the polygon.
-///
-/// A common use case for this method is to perform Dijkstra searches. 
-/// Candidate polygons are found by searching the graph beginning at the start polygon.
-///
-/// If a polygon is not found via the graph search, even if it intersects the 
-/// search circle, it will not be included in the result set. For example:
-///
-/// polyA is the start polygon.
-/// polyB shares an edge with polyA. (Is adjacent.)
-/// polyC shares an edge with polyB, but not with polyA
-/// Even if the search circle overlaps polyC, it will not be included in the 
-/// result set unless polyB is also in the set.
-/// 
-/// The value of the center point is used as the start position for cost 
-/// calculations. It is not projected onto the surface of the mesh, so its 
-/// y-value will effect the costs.
-///
-/// Intersection tests occur in 2D. All polygons and the search circle are 
-/// projected onto the xz-plane. So the y-value of the center point does not 
-/// effect intersection tests.
-///
-/// If the result arrays are to small to hold the entire result set, they will be 
-/// filled to capacity.
-/// 
-dtStatus dtNavMeshQuery::findPolysAroundCircle(dtPolyRef startRef, const float* centerPos, const float radius,
-											   const dtQueryFilter* filter,
-											   dtPolyRef* resultRef, dtPolyRef* resultParent, float* resultCost,
-											   int* resultCount, const int maxResult) const
-{
-	dtAssert(m_nav);
-	dtAssert(m_nodePool);
-	dtAssert(m_openList);
-
-	if (!resultCount)
-		return DT_FAILURE | DT_INVALID_PARAM;
-
-	*resultCount = 0;
-
-	if (!m_nav->isValidPolyRef(startRef) ||
-		!centerPos || !dtVisfinite(centerPos) ||
-		radius < 0 || !dtMathIsfinite(radius) ||
-		!filter || maxResult < 0)
-	{
-		return DT_FAILURE | DT_INVALID_PARAM;
-	}
-	
-	m_nodePool->clear();
-	m_openList->clear();
-	
-	dtNode* startNode = m_nodePool->getNode(startRef);
-	dtVcopy(startNode->pos, centerPos);
-	startNode->pidx = 0;
-	startNode->cost = 0;
-	startNode->total = 0;
-	startNode->id = startRef;
-	startNode->flags = DT_NODE_OPEN;
-	m_openList->push(startNode);
-	
-	dtStatus status = DT_SUCCESS;
-	
-	int n = 0;
-	
-	const float radiusSqr = dtSqr(radius);
-	
-	while (!m_openList->empty())
-	{
-		dtNode* bestNode = m_openList->pop();
-		bestNode->flags &= ~DT_NODE_OPEN;
-		bestNode->flags |= DT_NODE_CLOSED;
-		
-		// Get poly and tile.
-		// The API input has been cheked already, skip checking internal data.
-		const dtPolyRef bestRef = bestNode->id;
-		const dtMeshTile* bestTile = 0;
-		const dtPoly* bestPoly = 0;
-		m_nav->getTileAndPolyByRefUnsafe(bestRef, &bestTile, &bestPoly);
-		
-		// Get parent poly and tile.
-		dtPolyRef parentRef = 0;
-		const dtMeshTile* parentTile = 0;
-		const dtPoly* parentPoly = 0;
-		if (bestNode->pidx)
-			parentRef = m_nodePool->getNodeAtIdx(bestNode->pidx)->id;
-		if (parentRef)
-			m_nav->getTileAndPolyByRefUnsafe(parentRef, &parentTile, &parentPoly);
-
-		if (n < maxResult)
-		{
-			if (resultRef)
-				resultRef[n] = bestRef;
-			if (resultParent)
-				resultParent[n] = parentRef;
-			if (resultCost)
-				resultCost[n] = bestNode->total;
-			++n;
-		}
-		else
-		{
-			status |= DT_BUFFER_TOO_SMALL;
-		}
-		
-		for (unsigned int i = bestPoly->firstLink; i != DT_NULL_LINK; i = bestTile->links[i].next)
-		{
-			const dtLink* link = &bestTile->links[i];
-			dtPolyRef neighbourRef = link->ref;
-			// Skip invalid neighbours and do not follow back to parent.
-			if (!neighbourRef || neighbourRef == parentRef)
-				continue;
-			
-			// Expand to neighbour
-			const dtMeshTile* neighbourTile = 0;
-			const dtPoly* neighbourPoly = 0;
-			m_nav->getTileAndPolyByRefUnsafe(neighbourRef, &neighbourTile, &neighbourPoly);
-		
-			// Do not advance if the polygon is excluded by the filter.
-			if (!filter->passFilter(neighbourRef, neighbourTile, neighbourPoly))
-				continue;
-			
-			// Find edge and calc distance to the edge.
-			float va[3], vb[3];
-			if (!getPortalPoints(bestRef, bestPoly, bestTile, neighbourRef, neighbourPoly, neighbourTile, va, vb))
-				continue;
-			
-			// If the circle is not touching the next polygon, skip it.
-			float tseg;
-			float distSqr = dtDistancePtSegSqr2D(centerPos, va, vb, tseg);
-			if (distSqr > radiusSqr)
-				continue;
-			
-			dtNode* neighbourNode = m_nodePool->getNode(neighbourRef);
-			if (!neighbourNode)
-			{
-				status |= DT_OUT_OF_NODES;
-				continue;
-			}
-				
-			if (neighbourNode->flags & DT_NODE_CLOSED)
-				continue;
-			
-			// Cost
-			if (neighbourNode->flags == 0)
-				dtVlerp(neighbourNode->pos, va, vb, 0.5f);
-			
-			float cost = filter->getCost(
-				bestNode->pos, neighbourNode->pos,
-				parentRef, parentTile, parentPoly,
-				bestRef, bestTile, bestPoly,
-				neighbourRef, neighbourTile, neighbourPoly);
-
-			const float total = bestNode->total + cost;
-			
-			// The node is already in open list and the new result is worse, skip.
-			if ((neighbourNode->flags & DT_NODE_OPEN) && total >= neighbourNode->total)
-				continue;
-			
-			neighbourNode->id = neighbourRef;
-			neighbourNode->pidx = m_nodePool->getNodeIdx(bestNode);
-			neighbourNode->total = total;
-			
-			if (neighbourNode->flags & DT_NODE_OPEN)
-			{
-				m_openList->modify(neighbourNode);
-			}
-			else
-			{
-				neighbourNode->flags = DT_NODE_OPEN;
-				m_openList->push(neighbourNode);
-			}
-		}
-	}
-	
-	*resultCount = n;
-	
-	return status;
-}
-
-/// @par
-///
-/// The order of the result set is from least to highest cost.
-/// 
-/// At least one result array must be provided.
-///
-/// A common use case for this method is to perform Dijkstra searches. 
-/// Candidate polygons are found by searching the graph beginning at the start 
-/// polygon.
-/// 
-/// The same intersection test restrictions that apply to findPolysAroundCircle()
-/// method apply to this method.
-/// 
-/// The 3D centroid of the search polygon is used as the start position for cost 
-/// calculations.
-/// 
-/// Intersection tests occur in 2D. All polygons are projected onto the 
-/// xz-plane. So the y-values of the vertices do not effect intersection tests.
-/// 
-/// If the result arrays are is too small to hold the entire result set, they will 
-/// be filled to capacity.
-///
-dtStatus dtNavMeshQuery::findPolysAroundShape(dtPolyRef startRef, const float* verts, const int nverts,
-											  const dtQueryFilter* filter,
-											  dtPolyRef* resultRef, dtPolyRef* resultParent, float* resultCost,
-											  int* resultCount, const int maxResult) const
-{
-	dtAssert(m_nav);
-	dtAssert(m_nodePool);
-	dtAssert(m_openList);
-
-	if (!resultCount)
-		return DT_FAILURE | DT_INVALID_PARAM;
-
-	*resultCount = 0;
-
-	if (!m_nav->isValidPolyRef(startRef) ||
-		!verts || nverts < 3 ||
-		!filter || maxResult < 0)
-	{
-		return DT_FAILURE | DT_INVALID_PARAM;
-	}
-	
-	// Validate input
-	if (!startRef || !m_nav->isValidPolyRef(startRef))
-		return DT_FAILURE | DT_INVALID_PARAM;
-	
-	m_nodePool->clear();
-	m_openList->clear();
-	
-	float centerPos[3] = {0,0,0};
-	for (int i = 0; i < nverts; ++i)
-		dtVadd(centerPos,centerPos,&verts[i*3]);
-	dtVscale(centerPos,centerPos,1.0f/nverts);
-
-	dtNode* startNode = m_nodePool->getNode(startRef);
-	dtVcopy(startNode->pos, centerPos);
-	startNode->pidx = 0;
-	startNode->cost = 0;
-	startNode->total = 0;
-	startNode->id = startRef;
-	startNode->flags = DT_NODE_OPEN;
-	m_openList->push(startNode);
-	
-	dtStatus status = DT_SUCCESS;
-
-	int n = 0;
-	
-	while (!m_openList->empty())
-	{
-		dtNode* bestNode = m_openList->pop();
-		bestNode->flags &= ~DT_NODE_OPEN;
-		bestNode->flags |= DT_NODE_CLOSED;
-		
-		// Get poly and tile.
-		// The API input has been cheked already, skip checking internal data.
-		const dtPolyRef bestRef = bestNode->id;
-		const dtMeshTile* bestTile = 0;
-		const dtPoly* bestPoly = 0;
-		m_nav->getTileAndPolyByRefUnsafe(bestRef, &bestTile, &bestPoly);
-		
-		// Get parent poly and tile.
-		dtPolyRef parentRef = 0;
-		const dtMeshTile* parentTile = 0;
-		const dtPoly* parentPoly = 0;
-		if (bestNode->pidx)
-			parentRef = m_nodePool->getNodeAtIdx(bestNode->pidx)->id;
-		if (parentRef)
-			m_nav->getTileAndPolyByRefUnsafe(parentRef, &parentTile, &parentPoly);
-
-		if (n < maxResult)
-		{
-			if (resultRef)
-				resultRef[n] = bestRef;
-			if (resultParent)
-				resultParent[n] = parentRef;
-			if (resultCost)
-				resultCost[n] = bestNode->total;
-
-			++n;
-		}
-		else
-		{
-			status |= DT_BUFFER_TOO_SMALL;
-		}
-		
-		for (unsigned int i = bestPoly->firstLink; i != DT_NULL_LINK; i = bestTile->links[i].next)
-		{
-			const dtLink* link = &bestTile->links[i];
-			dtPolyRef neighbourRef = link->ref;
-			// Skip invalid neighbours and do not follow back to parent.
-			if (!neighbourRef || neighbourRef == parentRef)
-				continue;
-			
-			// Expand to neighbour
-			const dtMeshTile* neighbourTile = 0;
-			const dtPoly* neighbourPoly = 0;
-			m_nav->getTileAndPolyByRefUnsafe(neighbourRef, &neighbourTile, &neighbourPoly);
-			
-			// Do not advance if the polygon is excluded by the filter.
-			if (!filter->passFilter(neighbourRef, neighbourTile, neighbourPoly))
-				continue;
-			
-			// Find edge and calc distance to the edge.
-			float va[3], vb[3];
-			if (!getPortalPoints(bestRef, bestPoly, bestTile, neighbourRef, neighbourPoly, neighbourTile, va, vb))
-				continue;
-			
-			// If the poly is not touching the edge to the next polygon, skip the connection it.
-			float tmin, tmax;
-			int segMin, segMax;
-			if (!dtIntersectSegmentPoly2D(va, vb, verts, nverts, tmin, tmax, segMin, segMax))
-				continue;
-			if (tmin > 1.0f || tmax < 0.0f)
-				continue;
-			
-			dtNode* neighbourNode = m_nodePool->getNode(neighbourRef);
-			if (!neighbourNode)
-			{
-				status |= DT_OUT_OF_NODES;
-				continue;
-			}
-			
-			if (neighbourNode->flags & DT_NODE_CLOSED)
-				continue;
-			
-			// Cost
-			if (neighbourNode->flags == 0)
-				dtVlerp(neighbourNode->pos, va, vb, 0.5f);
-			
-			float cost = filter->getCost(
-				bestNode->pos, neighbourNode->pos,
-				parentRef, parentTile, parentPoly,
-				bestRef, bestTile, bestPoly,
-				neighbourRef, neighbourTile, neighbourPoly);
-
-			const float total = bestNode->total + cost;
-			
-			// The node is already in open list and the new result is worse, skip.
-			if ((neighbourNode->flags & DT_NODE_OPEN) && total >= neighbourNode->total)
-				continue;
-			
-			neighbourNode->id = neighbourRef;
-			neighbourNode->pidx = m_nodePool->getNodeIdx(bestNode);
-			neighbourNode->total = total;
-			
-			if (neighbourNode->flags & DT_NODE_OPEN)
-			{
-				m_openList->modify(neighbourNode);
-			}
-			else
-			{
-				neighbourNode->flags = DT_NODE_OPEN;
-				m_openList->push(neighbourNode);
-			}
-		}
-	}
-	
-	*resultCount = n;
-	
-	return status;
-}
-
-dtStatus dtNavMeshQuery::getPathFromDijkstraSearch(dtPolyRef endRef, dtPolyRef* path, int* pathCount, int maxPath) const
-{
-	if (!m_nav->isValidPolyRef(endRef) || !path || !pathCount || maxPath < 0)
-		return DT_FAILURE | DT_INVALID_PARAM;
-
-	*pathCount = 0;
-
-	dtNode* endNode;
-	if (m_nodePool->findNodes(endRef, &endNode, 1) != 1 ||
-		(endNode->flags & DT_NODE_CLOSED) == 0)
-		return DT_FAILURE | DT_INVALID_PARAM;
-
-	return getPathToNode(endNode, path, pathCount, maxPath);
-}
-
-/// @par
-///
-/// This method is optimized for a small search radius and small number of result 
-/// polygons.
-///
-/// Candidate polygons are found by searching the navigation graph beginning at 
-/// the start polygon.
-///
-/// The same intersection test restrictions that apply to the findPolysAroundCircle 
-/// mehtod applies to this method.
-///
-/// The value of the center point is used as the start point for cost calculations. 
-/// It is not projected onto the surface of the mesh, so its y-value will effect 
-/// the costs.
-/// 
-/// Intersection tests occur in 2D. All polygons and the search circle are 
-/// projected onto the xz-plane. So the y-value of the center point does not 
-/// effect intersection tests.
-/// 
-/// If the result arrays are is too small to hold the entire result set, they will 
-/// be filled to capacity.
-/// 
-dtStatus dtNavMeshQuery::findLocalNeighbourhood(dtPolyRef startRef, const float* centerPos, const float radius,
-												const dtQueryFilter* filter,
-												dtPolyRef* resultRef, dtPolyRef* resultParent,
-												int* resultCount, const int maxResult) const
-{
-	dtAssert(m_nav);
-	dtAssert(m_tinyNodePool);
-
-	if (!resultCount)
-		return DT_FAILURE | DT_INVALID_PARAM;
-
-	*resultCount = 0;
-
-	if (!m_nav->isValidPolyRef(startRef) ||
-		!centerPos || !dtVisfinite(centerPos) ||
-		radius < 0 || !dtMathIsfinite(radius) ||
-		!filter || maxResult < 0)
-	{
-		return DT_FAILURE | DT_INVALID_PARAM;
-	}
-
-	static const int MAX_STACK = 48;
-	dtNode* stack[MAX_STACK];
-	int nstack = 0;
-	
-	m_tinyNodePool->clear();
-	
-	dtNode* startNode = m_tinyNodePool->getNode(startRef);
-	startNode->pidx = 0;
-	startNode->id = startRef;
-	startNode->flags = DT_NODE_CLOSED;
-	stack[nstack++] = startNode;
-	
-	const float radiusSqr = dtSqr(radius);
-	
-	float pa[DT_VERTS_PER_POLYGON*3];
-	float pb[DT_VERTS_PER_POLYGON*3];
-	
-	dtStatus status = DT_SUCCESS;
-	
-	int n = 0;
-	if (n < maxResult)
-	{
-		resultRef[n] = startNode->id;
-		if (resultParent)
-			resultParent[n] = 0;
-		++n;
-	}
-	else
-	{
-		status |= DT_BUFFER_TOO_SMALL;
-	}
-	
-	while (nstack)
-	{
-		// Pop front.
-		dtNode* curNode = stack[0];
-		for (int i = 0; i < nstack-1; ++i)
-			stack[i] = stack[i+1];
-		nstack--;
-		
-		// Get poly and tile.
-		// The API input has been cheked already, skip checking internal data.
-		const dtPolyRef curRef = curNode->id;
-		const dtMeshTile* curTile = 0;
-		const dtPoly* curPoly = 0;
-		m_nav->getTileAndPolyByRefUnsafe(curRef, &curTile, &curPoly);
-		
-		for (unsigned int i = curPoly->firstLink; i != DT_NULL_LINK; i = curTile->links[i].next)
-		{
-			const dtLink* link = &curTile->links[i];
-			dtPolyRef neighbourRef = link->ref;
-			// Skip invalid neighbours.
-			if (!neighbourRef)
-				continue;
-			
-			// Skip if cannot alloca more nodes.
-			dtNode* neighbourNode = m_tinyNodePool->getNode(neighbourRef);
-			if (!neighbourNode)
-				continue;
-			// Skip visited.
-			if (neighbourNode->flags & DT_NODE_CLOSED)
-				continue;
-			
-			// Expand to neighbour
-			const dtMeshTile* neighbourTile = 0;
-			const dtPoly* neighbourPoly = 0;
-			m_nav->getTileAndPolyByRefUnsafe(neighbourRef, &neighbourTile, &neighbourPoly);
-			
-			// Skip off-mesh connections.
-			if (neighbourPoly->getType() == DT_POLYTYPE_OFFMESH_CONNECTION)
-				continue;
-			
-			// Do not advance if the polygon is excluded by the filter.
-			if (!filter->passFilter(neighbourRef, neighbourTile, neighbourPoly))
-				continue;
-			
-			// Find edge and calc distance to the edge.
-			float va[3], vb[3];
-			if (!getPortalPoints(curRef, curPoly, curTile, neighbourRef, neighbourPoly, neighbourTile, va, vb))
-				continue;
-			
-			// If the circle is not touching the next polygon, skip it.
-			float tseg;
-			float distSqr = dtDistancePtSegSqr2D(centerPos, va, vb, tseg);
-			if (distSqr > radiusSqr)
-				continue;
-			
-			// Mark node visited, this is done before the overlap test so that
-			// we will not visit the poly again if the test fails.
-			neighbourNode->flags |= DT_NODE_CLOSED;
-			neighbourNode->pidx = m_tinyNodePool->getNodeIdx(curNode);
-			
-			// Check that the polygon does not collide with existing polygons.
-			
-			// Collect vertices of the neighbour poly.
-			const int npa = neighbourPoly->vertCount;
-			for (int k = 0; k < npa; ++k)
-				dtVcopy(&pa[k*3], &neighbourTile->verts[neighbourPoly->verts[k]*3]);
-			
-			bool overlap = false;
-			for (int j = 0; j < n; ++j)
-			{
-				dtPolyRef pastRef = resultRef[j];
-				
-				// Connected polys do not overlap.
-				bool connected = false;
-				for (unsigned int k = curPoly->firstLink; k != DT_NULL_LINK; k = curTile->links[k].next)
-				{
-					if (curTile->links[k].ref == pastRef)
-					{
-						connected = true;
-						break;
-					}
-				}
-				if (connected)
-					continue;
-				
-				// Potentially overlapping.
-				const dtMeshTile* pastTile = 0;
-				const dtPoly* pastPoly = 0;
-				m_nav->getTileAndPolyByRefUnsafe(pastRef, &pastTile, &pastPoly);
-				
-				// Get vertices and test overlap
-				const int npb = pastPoly->vertCount;
-				for (int k = 0; k < npb; ++k)
-					dtVcopy(&pb[k*3], &pastTile->verts[pastPoly->verts[k]*3]);
-				
-				if (dtOverlapPolyPoly2D(pa,npa, pb,npb))
-				{
-					overlap = true;
-					break;
-				}
-			}
-			if (overlap)
-				continue;
-			
-			// This poly is fine, store and advance to the poly.
-			if (n < maxResult)
-			{
-				resultRef[n] = neighbourRef;
-				if (resultParent)
-					resultParent[n] = curRef;
-				++n;
-			}
-			else
-			{
-				status |= DT_BUFFER_TOO_SMALL;
-			}
-			
-			if (nstack < MAX_STACK)
-			{
-				stack[nstack++] = neighbourNode;
-			}
-		}
-	}
-	
-	*resultCount = n;
-	
-	return status;
-}
-
-
-struct dtSegInterval
-{
-	dtPolyRef ref;
-	short tmin, tmax;
-};
-
-static void insertInterval(dtSegInterval* ints, int& nints, const int maxInts,
-						   const short tmin, const short tmax, const dtPolyRef ref)
-{
-	if (nints+1 > maxInts) return;
-	// Find insertion point.
-	int idx = 0;
-	while (idx < nints)
-	{
-		if (tmax <= ints[idx].tmin)
-			break;
-		idx++;
-	}
-	// Move current results.
-	if (nints-idx)
-		memmove(ints+idx+1, ints+idx, sizeof(dtSegInterval)*(nints-idx));
-	// Store
-	ints[idx].ref = ref;
-	ints[idx].tmin = tmin;
-	ints[idx].tmax = tmax;
-	nints++;
-}
-
-/// @par
-///
-/// If the @p segmentRefs parameter is provided, then all polygon segments will be returned. 
-/// Otherwise only the wall segments are returned.
-/// 
-/// A segment that is normally a portal will be included in the result set as a 
-/// wall if the @p filter results in the neighbor polygon becoomming impassable.
-/// 
-/// The @p segmentVerts and @p segmentRefs buffers should normally be sized for the 
-/// maximum segments per polygon of the source navigation mesh.
-/// 
-dtStatus dtNavMeshQuery::getPolyWallSegments(dtPolyRef ref, const dtQueryFilter* filter,
-											 float* segmentVerts, dtPolyRef* segmentRefs, int* segmentCount,
-											 const int maxSegments) const
-{
-	dtAssert(m_nav);
-
-	if (!segmentCount)
-		return DT_FAILURE | DT_INVALID_PARAM;
-	
-	*segmentCount = 0;
-
-	const dtMeshTile* tile = 0;
-	const dtPoly* poly = 0;
-	if (dtStatusFailed(m_nav->getTileAndPolyByRef(ref, &tile, &poly)))
-		return DT_FAILURE | DT_INVALID_PARAM;
-
-	if (!filter || !segmentVerts || maxSegments < 0)
-		return DT_FAILURE | DT_INVALID_PARAM;
-	
-	int n = 0;
-	static const int MAX_INTERVAL = 16;
-	dtSegInterval ints[MAX_INTERVAL];
-	int nints;
-	
-	const bool storePortals = segmentRefs != 0;
-	
-	dtStatus status = DT_SUCCESS;
-	
-	for (int i = 0, j = (int)poly->vertCount-1; i < (int)poly->vertCount; j = i++)
-	{
-		// Skip non-solid edges.
-		nints = 0;
-		if (poly->neis[j] & DT_EXT_LINK)
-		{
-			// Tile border.
-			for (unsigned int k = poly->firstLink; k != DT_NULL_LINK; k = tile->links[k].next)
-			{
-				const dtLink* link = &tile->links[k];
-				if (link->edge == j)
-				{
-					if (link->ref != 0)
-					{
-						const dtMeshTile* neiTile = 0;
-						const dtPoly* neiPoly = 0;
-						m_nav->getTileAndPolyByRefUnsafe(link->ref, &neiTile, &neiPoly);
-						if (filter->passFilter(link->ref, neiTile, neiPoly))
-						{
-							insertInterval(ints, nints, MAX_INTERVAL, link->bmin, link->bmax, link->ref);
-						}
-					}
-				}
-			}
-		}
-		else
-		{
-			// Internal edge
-			dtPolyRef neiRef = 0;
-			if (poly->neis[j])
-			{
-				const unsigned int idx = (unsigned int)(poly->neis[j]-1);
-				neiRef = m_nav->getPolyRefBase(tile) | idx;
-				if (!filter->passFilter(neiRef, tile, &tile->polys[idx]))
-					neiRef = 0;
-			}
-
-			// If the edge leads to another polygon and portals are not stored, skip.
-			if (neiRef != 0 && !storePortals)
-				continue;
-			
-			if (n < maxSegments)
-			{
-				const float* vj = &tile->verts[poly->verts[j]*3];
-				const float* vi = &tile->verts[poly->verts[i]*3];
-				float* seg = &segmentVerts[n*6];
-				dtVcopy(seg+0, vj);
-				dtVcopy(seg+3, vi);
-				if (segmentRefs)
-					segmentRefs[n] = neiRef;
-				n++;
-			}
-			else
-			{
-				status |= DT_BUFFER_TOO_SMALL;
-			}
-			
-			continue;
-		}
-		
-		// Add sentinels
-		insertInterval(ints, nints, MAX_INTERVAL, -1, 0, 0);
-		insertInterval(ints, nints, MAX_INTERVAL, 255, 256, 0);
-		
-		// Store segments.
-		const float* vj = &tile->verts[poly->verts[j]*3];
-		const float* vi = &tile->verts[poly->verts[i]*3];
-		for (int k = 1; k < nints; ++k)
-		{
-			// Portal segment.
-			if (storePortals && ints[k].ref)
-			{
-				const float tmin = ints[k].tmin/255.0f; 
-				const float tmax = ints[k].tmax/255.0f; 
-				if (n < maxSegments)
-				{
-					float* seg = &segmentVerts[n*6];
-					dtVlerp(seg+0, vj,vi, tmin);
-					dtVlerp(seg+3, vj,vi, tmax);
-					if (segmentRefs)
-						segmentRefs[n] = ints[k].ref;
-					n++;
-				}
-				else
-				{
-					status |= DT_BUFFER_TOO_SMALL;
-				}
-			}
-
-			// Wall segment.
-			const int imin = ints[k-1].tmax;
-			const int imax = ints[k].tmin;
-			if (imin != imax)
-			{
-				const float tmin = imin/255.0f; 
-				const float tmax = imax/255.0f; 
-				if (n < maxSegments)
-				{
-					float* seg = &segmentVerts[n*6];
-					dtVlerp(seg+0, vj,vi, tmin);
-					dtVlerp(seg+3, vj,vi, tmax);
-					if (segmentRefs)
-						segmentRefs[n] = 0;
-					n++;
-				}
-				else
-				{
-					status |= DT_BUFFER_TOO_SMALL;
-				}
-			}
-		}
-	}
-	
-	*segmentCount = n;
-	
-	return status;
-}
-
-/// @par
-///
-/// @p hitPos is not adjusted using the height detail data.
-///
-/// @p hitDist will equal the search radius if there is no wall within the 
-/// radius. In this case the values of @p hitPos and @p hitNormal are
-/// undefined.
-///
-/// The normal will become unpredicable if @p hitDist is a very small number.
-///
-dtStatus dtNavMeshQuery::findDistanceToWall(dtPolyRef startRef, const float* centerPos, const float maxRadius,
-											const dtQueryFilter* filter,
-											float* hitDist, float* hitPos, float* hitNormal) const
-{
-	dtAssert(m_nav);
-	dtAssert(m_nodePool);
-	dtAssert(m_openList);
-	
-	// Validate input
-	if (!m_nav->isValidPolyRef(startRef) ||
-		!centerPos || !dtVisfinite(centerPos) ||
-		maxRadius < 0 || !dtMathIsfinite(maxRadius) ||
-		!filter || !hitDist || !hitPos || !hitNormal)
-	{
-		return DT_FAILURE | DT_INVALID_PARAM;
-	}
-	
-	m_nodePool->clear();
-	m_openList->clear();
-	
-	dtNode* startNode = m_nodePool->getNode(startRef);
-	dtVcopy(startNode->pos, centerPos);
-	startNode->pidx = 0;
-	startNode->cost = 0;
-	startNode->total = 0;
-	startNode->id = startRef;
-	startNode->flags = DT_NODE_OPEN;
-	m_openList->push(startNode);
-	
-	float radiusSqr = dtSqr(maxRadius);
-	
-	dtStatus status = DT_SUCCESS;
-	
-	while (!m_openList->empty())
-	{
-		dtNode* bestNode = m_openList->pop();
-		bestNode->flags &= ~DT_NODE_OPEN;
-		bestNode->flags |= DT_NODE_CLOSED;
-		
-		// Get poly and tile.
-		// The API input has been cheked already, skip checking internal data.
-		const dtPolyRef bestRef = bestNode->id;
-		const dtMeshTile* bestTile = 0;
-		const dtPoly* bestPoly = 0;
-		m_nav->getTileAndPolyByRefUnsafe(bestRef, &bestTile, &bestPoly);
-		
-		// Get parent poly and tile.
-		dtPolyRef parentRef = 0;
-		const dtMeshTile* parentTile = 0;
-		const dtPoly* parentPoly = 0;
-		if (bestNode->pidx)
-			parentRef = m_nodePool->getNodeAtIdx(bestNode->pidx)->id;
-		if (parentRef)
-			m_nav->getTileAndPolyByRefUnsafe(parentRef, &parentTile, &parentPoly);
-		
-		// Hit test walls.
-		for (int i = 0, j = (int)bestPoly->vertCount-1; i < (int)bestPoly->vertCount; j = i++)
-		{
-			// Skip non-solid edges.
-			if (bestPoly->neis[j] & DT_EXT_LINK)
-			{
-				// Tile border.
-				bool solid = true;
-				for (unsigned int k = bestPoly->firstLink; k != DT_NULL_LINK; k = bestTile->links[k].next)
-				{
-					const dtLink* link = &bestTile->links[k];
-					if (link->edge == j)
-					{
-						if (link->ref != 0)
-						{
-							const dtMeshTile* neiTile = 0;
-							const dtPoly* neiPoly = 0;
-							m_nav->getTileAndPolyByRefUnsafe(link->ref, &neiTile, &neiPoly);
-							if (filter->passFilter(link->ref, neiTile, neiPoly))
-								solid = false;
-						}
-						break;
-					}
-				}
-				if (!solid) continue;
-			}
-			else if (bestPoly->neis[j])
-			{
-				// Internal edge
-				const unsigned int idx = (unsigned int)(bestPoly->neis[j]-1);
-				const dtPolyRef ref = m_nav->getPolyRefBase(bestTile) | idx;
-				if (filter->passFilter(ref, bestTile, &bestTile->polys[idx]))
-					continue;
-			}
-			
-			// Calc distance to the edge.
-			const float* vj = &bestTile->verts[bestPoly->verts[j]*3];
-			const float* vi = &bestTile->verts[bestPoly->verts[i]*3];
-			float tseg;
-			float distSqr = dtDistancePtSegSqr2D(centerPos, vj, vi, tseg);
-			
-			// Edge is too far, skip.
-			if (distSqr > radiusSqr)
-				continue;
-			
-			// Hit wall, update radius.
-			radiusSqr = distSqr;
-			// Calculate hit pos.
-			hitPos[0] = vj[0] + (vi[0] - vj[0])*tseg;
-			hitPos[1] = vj[1] + (vi[1] - vj[1])*tseg;
-			hitPos[2] = vj[2] + (vi[2] - vj[2])*tseg;
-		}
-		
-		for (unsigned int i = bestPoly->firstLink; i != DT_NULL_LINK; i = bestTile->links[i].next)
-		{
-			const dtLink* link = &bestTile->links[i];
-			dtPolyRef neighbourRef = link->ref;
-			// Skip invalid neighbours and do not follow back to parent.
-			if (!neighbourRef || neighbourRef == parentRef)
-				continue;
-			
-			// Expand to neighbour.
-			const dtMeshTile* neighbourTile = 0;
-			const dtPoly* neighbourPoly = 0;
-			m_nav->getTileAndPolyByRefUnsafe(neighbourRef, &neighbourTile, &neighbourPoly);
-			
-			// Skip off-mesh connections.
-			if (neighbourPoly->getType() == DT_POLYTYPE_OFFMESH_CONNECTION)
-				continue;
-			
-			// Calc distance to the edge.
-			const float* va = &bestTile->verts[bestPoly->verts[link->edge]*3];
-			const float* vb = &bestTile->verts[bestPoly->verts[(link->edge+1) % bestPoly->vertCount]*3];
-			float tseg;
-			float distSqr = dtDistancePtSegSqr2D(centerPos, va, vb, tseg);
-			
-			// If the circle is not touching the next polygon, skip it.
-			if (distSqr > radiusSqr)
-				continue;
-			
-			if (!filter->passFilter(neighbourRef, neighbourTile, neighbourPoly))
-				continue;
-
-			dtNode* neighbourNode = m_nodePool->getNode(neighbourRef);
-			if (!neighbourNode)
-			{
-				status |= DT_OUT_OF_NODES;
-				continue;
-			}
-			
-			if (neighbourNode->flags & DT_NODE_CLOSED)
-				continue;
-			
-			// Cost
-			if (neighbourNode->flags == 0)
-			{
-				getEdgeMidPoint(bestRef, bestPoly, bestTile,
-								neighbourRef, neighbourPoly, neighbourTile, neighbourNode->pos);
-			}
-			
-			const float total = bestNode->total + dtVdist(bestNode->pos, neighbourNode->pos);
-			
-			// The node is already in open list and the new result is worse, skip.
-			if ((neighbourNode->flags & DT_NODE_OPEN) && total >= neighbourNode->total)
-				continue;
-			
-			neighbourNode->id = neighbourRef;
-			neighbourNode->flags = (neighbourNode->flags & ~DT_NODE_CLOSED);
-			neighbourNode->pidx = m_nodePool->getNodeIdx(bestNode);
-			neighbourNode->total = total;
-				
-			if (neighbourNode->flags & DT_NODE_OPEN)
-			{
-				m_openList->modify(neighbourNode);
-			}
-			else
-			{
-				neighbourNode->flags |= DT_NODE_OPEN;
-				m_openList->push(neighbourNode);
-			}
-		}
-	}
-	
-	// Calc hit normal.
-	dtVsub(hitNormal, centerPos, hitPos);
-	dtVnormalize(hitNormal);
-	
-	*hitDist = dtMathSqrtf(radiusSqr);
-	
-	return status;
-}
-
-bool dtNavMeshQuery::isValidPolyRef(dtPolyRef ref, const dtQueryFilter* filter) const
-{
-	const dtMeshTile* tile = 0;
-	const dtPoly* poly = 0;
-	dtStatus status = m_nav->getTileAndPolyByRef(ref, &tile, &poly);
-	// If cannot get polygon, assume it does not exists and boundary is invalid.
-	if (dtStatusFailed(status))
-		return false;
-	// If cannot pass filter, assume flags has changed and boundary is invalid.
-	if (!filter->passFilter(ref, tile, poly))
-		return false;
-	return true;
-}
-
-/// @par
-///
-/// The closed list is the list of polygons that were fully evaluated during 
-/// the last navigation graph search. (A* or Dijkstra)
-/// 
-bool dtNavMeshQuery::isInClosedList(dtPolyRef ref) const
-{
-	if (!m_nodePool) return false;
-	
-	dtNode* nodes[DT_MAX_STATES_PER_NODE];
-	int n= m_nodePool->findNodes(ref, nodes, DT_MAX_STATES_PER_NODE);
-
-	for (int i=0; i<n; i++)
-	{
-		if (nodes[i]->flags & DT_NODE_CLOSED)
-			return true;
-	}		
-
-	return false;
-}
diff --git a/extern/recastnavigation/Detour/Source/DetourNode.cpp b/extern/recastnavigation/Detour/Source/DetourNode.cpp
deleted file mode 100644
index 48abbba6b5..0000000000
--- a/extern/recastnavigation/Detour/Source/DetourNode.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#include "DetourNode.h"
-#include "DetourAlloc.h"
-#include "DetourAssert.h"
-#include "DetourCommon.h"
-#include <string.h>
-
-#ifdef DT_POLYREF64
-// From Thomas Wang, https://gist.github.com/badboy/6267743
-inline unsigned int dtHashRef(dtPolyRef a)
-{
-	a = (~a) + (a << 18); // a = (a << 18) - a - 1;
-	a = a ^ (a >> 31);
-	a = a * 21; // a = (a + (a << 2)) + (a << 4);
-	a = a ^ (a >> 11);
-	a = a + (a << 6);
-	a = a ^ (a >> 22);
-	return (unsigned int)a;
-}
-#else
-inline unsigned int dtHashRef(dtPolyRef a)
-{
-	a += ~(a<<15);
-	a ^=  (a>>10);
-	a +=  (a<<3);
-	a ^=  (a>>6);
-	a += ~(a<<11);
-	a ^=  (a>>16);
-	return (unsigned int)a;
-}
-#endif
-
-//////////////////////////////////////////////////////////////////////////////////////////
-dtNodePool::dtNodePool(int maxNodes, int hashSize) :
-	m_nodes(0),
-	m_first(0),
-	m_next(0),
-	m_maxNodes(maxNodes),
-	m_hashSize(hashSize),
-	m_nodeCount(0)
-{
-	dtAssert(dtNextPow2(m_hashSize) == (unsigned int)m_hashSize);
-	// pidx is special as 0 means "none" and 1 is the first node. For that reason
-	// we have 1 fewer nodes available than the number of values it can contain.
-	dtAssert(m_maxNodes > 0 && m_maxNodes <= DT_NULL_IDX && m_maxNodes <= (1 << DT_NODE_PARENT_BITS) - 1);
-
-	m_nodes = (dtNode*)dtAlloc(sizeof(dtNode)*m_maxNodes, DT_ALLOC_PERM);
-	m_next = (dtNodeIndex*)dtAlloc(sizeof(dtNodeIndex)*m_maxNodes, DT_ALLOC_PERM);
-	m_first = (dtNodeIndex*)dtAlloc(sizeof(dtNodeIndex)*hashSize, DT_ALLOC_PERM);
-
-	dtAssert(m_nodes);
-	dtAssert(m_next);
-	dtAssert(m_first);
-
-	memset(m_first, 0xff, sizeof(dtNodeIndex)*m_hashSize);
-	memset(m_next, 0xff, sizeof(dtNodeIndex)*m_maxNodes);
-}
-
-dtNodePool::~dtNodePool()
-{
-	dtFree(m_nodes);
-	dtFree(m_next);
-	dtFree(m_first);
-}
-
-void dtNodePool::clear()
-{
-	memset(m_first, 0xff, sizeof(dtNodeIndex)*m_hashSize);
-	m_nodeCount = 0;
-}
-
-unsigned int dtNodePool::findNodes(dtPolyRef id, dtNode** nodes, const int maxNodes)
-{
-	int n = 0;
-	unsigned int bucket = dtHashRef(id) & (m_hashSize-1);
-	dtNodeIndex i = m_first[bucket];
-	while (i != DT_NULL_IDX)
-	{
-		if (m_nodes[i].id == id)
-		{
-			if (n >= maxNodes)
-				return n;
-			nodes[n++] = &m_nodes[i];
-		}
-		i = m_next[i];
-	}
-
-	return n;
-}
-
-dtNode* dtNodePool::findNode(dtPolyRef id, unsigned char state)
-{
-	unsigned int bucket = dtHashRef(id) & (m_hashSize-1);
-	dtNodeIndex i = m_first[bucket];
-	while (i != DT_NULL_IDX)
-	{
-		if (m_nodes[i].id == id && m_nodes[i].state == state)
-			return &m_nodes[i];
-		i = m_next[i];
-	}
-	return 0;
-}
-
-dtNode* dtNodePool::getNode(dtPolyRef id, unsigned char state)
-{
-	unsigned int bucket = dtHashRef(id) & (m_hashSize-1);
-	dtNodeIndex i = m_first[bucket];
-	dtNode* node = 0;
-	while (i != DT_NULL_IDX)
-	{
-		if (m_nodes[i].id == id && m_nodes[i].state == state)
-			return &m_nodes[i];
-		i = m_next[i];
-	}
-	
-	if (m_nodeCount >= m_maxNodes)
-		return 0;
-	
-	i = (dtNodeIndex)m_nodeCount;
-	m_nodeCount++;
-	
-	// Init node
-	node = &m_nodes[i];
-	node->pidx = 0;
-	node->cost = 0;
-	node->total = 0;
-	node->id = id;
-	node->state = state;
-	node->flags = 0;
-	
-	m_next[i] = m_first[bucket];
-	m_first[bucket] = i;
-	
-	return node;
-}
-
-
-//////////////////////////////////////////////////////////////////////////////////////////
-dtNodeQueue::dtNodeQueue(int n) :
-	m_heap(0),
-	m_capacity(n),
-	m_size(0)
-{
-	dtAssert(m_capacity > 0);
-	
-	m_heap = (dtNode**)dtAlloc(sizeof(dtNode*)*(m_capacity+1), DT_ALLOC_PERM);
-	dtAssert(m_heap);
-}
-
-dtNodeQueue::~dtNodeQueue()
-{
-	dtFree(m_heap);
-}
-
-void dtNodeQueue::bubbleUp(int i, dtNode* node)
-{
-	int parent = (i-1)/2;
-	// note: (index > 0) means there is a parent
-	while ((i > 0) && (m_heap[parent]->total > node->total))
-	{
-		m_heap[i] = m_heap[parent];
-		i = parent;
-		parent = (i-1)/2;
-	}
-	m_heap[i] = node;
-}
-
-void dtNodeQueue::trickleDown(int i, dtNode* node)
-{
-	int child = (i*2)+1;
-	while (child < m_size)
-	{
-		if (((child+1) < m_size) && 
-			(m_heap[child]->total > m_heap[child+1]->total))
-		{
-			child++;
-		}
-		m_heap[i] = m_heap[child];
-		i = child;
-		child = (i*2)+1;
-	}
-	bubbleUp(i, node);
-}
diff --git a/extern/recastnavigation/DetourCrowd/CMakeLists.txt b/extern/recastnavigation/DetourCrowd/CMakeLists.txt
deleted file mode 100644
index d0e186be07..0000000000
--- a/extern/recastnavigation/DetourCrowd/CMakeLists.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-file(GLOB SOURCES Source/*.cpp)
-add_library(DetourCrowd ${SOURCES})
-
-add_library(RecastNavigation::DetourCrowd ALIAS DetourCrowd)
-set_target_properties(DetourCrowd PROPERTIES DEBUG_POSTFIX -d)
-
-set(DetourCrowd_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Include")
-
-target_include_directories(DetourCrowd PUBLIC
-    "$<BUILD_INTERFACE:${DetourCrowd_INCLUDE_DIR}>"
-)
-
-target_link_libraries(DetourCrowd
-    Detour
-)
-
-set_target_properties(DetourCrowd PROPERTIES
-        SOVERSION ${SOVERSION}
-        VERSION ${VERSION}
-        COMPILE_PDB_OUTPUT_DIRECTORY .
-        COMPILE_PDB_NAME "DetourCrowd-d"
-        )
-
-install(TARGETS DetourCrowd
-        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        COMPONENT library
-        )
-
-file(GLOB INCLUDES Include/*.h)
-install(FILES ${INCLUDES} DESTINATION
-    ${CMAKE_INSTALL_INCLUDEDIR}/recastnavigation)
-install(FILES "$<TARGET_FILE_DIR:DetourCrowd>/DetourCrowd-d.pdb" CONFIGURATIONS "Debug" DESTINATION "lib") 
diff --git a/extern/recastnavigation/DetourCrowd/Include/DetourCrowd.h b/extern/recastnavigation/DetourCrowd/Include/DetourCrowd.h
deleted file mode 100644
index 952050878a..0000000000
--- a/extern/recastnavigation/DetourCrowd/Include/DetourCrowd.h
+++ /dev/null
@@ -1,460 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef DETOURCROWD_H
-#define DETOURCROWD_H
-
-#include "DetourNavMeshQuery.h"
-#include "DetourObstacleAvoidance.h"
-#include "DetourLocalBoundary.h"
-#include "DetourPathCorridor.h"
-#include "DetourProximityGrid.h"
-#include "DetourPathQueue.h"
-
-/// The maximum number of neighbors that a crowd agent can take into account
-/// for steering decisions.
-/// @ingroup crowd
-static const int DT_CROWDAGENT_MAX_NEIGHBOURS = 6;
-
-/// The maximum number of corners a crowd agent will look ahead in the path.
-/// This value is used for sizing the crowd agent corner buffers.
-/// Due to the behavior of the crowd manager, the actual number of useful
-/// corners will be one less than this number.
-/// @ingroup crowd
-static const int DT_CROWDAGENT_MAX_CORNERS = 4;
-
-/// The maximum number of crowd avoidance configurations supported by the
-/// crowd manager.
-/// @ingroup crowd
-/// @see dtObstacleAvoidanceParams, dtCrowd::setObstacleAvoidanceParams(), dtCrowd::getObstacleAvoidanceParams(),
-///		 dtCrowdAgentParams::obstacleAvoidanceType
-static const int DT_CROWD_MAX_OBSTAVOIDANCE_PARAMS = 8;
-
-/// The maximum number of query filter types supported by the crowd manager.
-/// @ingroup crowd
-/// @see dtQueryFilter, dtCrowd::getFilter() dtCrowd::getEditableFilter(),
-///		dtCrowdAgentParams::queryFilterType
-static const int DT_CROWD_MAX_QUERY_FILTER_TYPE = 16;
-
-/// Provides neighbor data for agents managed by the crowd.
-/// @ingroup crowd
-/// @see dtCrowdAgent::neis, dtCrowd
-struct dtCrowdNeighbour
-{
-	int idx;		///< The index of the neighbor in the crowd.
-	float dist;		///< The distance between the current agent and the neighbor.
-};
-
-/// The type of navigation mesh polygon the agent is currently traversing.
-/// @ingroup crowd
-enum CrowdAgentState
-{
-	DT_CROWDAGENT_STATE_INVALID,		///< The agent is not in a valid state.
-	DT_CROWDAGENT_STATE_WALKING,		///< The agent is traversing a normal navigation mesh polygon.
-	DT_CROWDAGENT_STATE_OFFMESH,		///< The agent is traversing an off-mesh connection.
-};
-
-/// Configuration parameters for a crowd agent.
-/// @ingroup crowd
-struct dtCrowdAgentParams
-{
-	float radius;						///< Agent radius. [Limit: >= 0]
-	float height;						///< Agent height. [Limit: > 0]
-	float maxAcceleration;				///< Maximum allowed acceleration. [Limit: >= 0]
-	float maxSpeed;						///< Maximum allowed speed. [Limit: >= 0]
-
-	/// Defines how close a collision element must be before it is considered for steering behaviors. [Limits: > 0]
-	float collisionQueryRange;
-
-	float pathOptimizationRange;		///< The path visibility optimization range. [Limit: > 0]
-
-	/// How aggresive the agent manager should be at avoiding collisions with this agent. [Limit: >= 0]
-	float separationWeight;
-
-	/// Flags that impact steering behavior. (See: #UpdateFlags)
-	unsigned char updateFlags;
-
-	/// The index of the avoidance configuration to use for the agent. 
-	/// [Limits: 0 <= value <= #DT_CROWD_MAX_OBSTAVOIDANCE_PARAMS]
-	unsigned char obstacleAvoidanceType;	
-
-	/// The index of the query filter used by this agent.
-	unsigned char queryFilterType;
-
-	/// User defined data attached to the agent.
-	void* userData;
-};
-
-enum MoveRequestState
-{
-	DT_CROWDAGENT_TARGET_NONE = 0,
-	DT_CROWDAGENT_TARGET_FAILED,
-	DT_CROWDAGENT_TARGET_VALID,
-	DT_CROWDAGENT_TARGET_REQUESTING,
-	DT_CROWDAGENT_TARGET_WAITING_FOR_QUEUE,
-	DT_CROWDAGENT_TARGET_WAITING_FOR_PATH,
-	DT_CROWDAGENT_TARGET_VELOCITY,
-};
-
-/// Represents an agent managed by a #dtCrowd object.
-/// @ingroup crowd
-struct dtCrowdAgent
-{
-	/// True if the agent is active, false if the agent is in an unused slot in the agent pool.
-	bool active;
-
-	/// The type of mesh polygon the agent is traversing. (See: #CrowdAgentState)
-	unsigned char state;
-
-	/// True if the agent has valid path (targetState == DT_CROWDAGENT_TARGET_VALID) and the path does not lead to the requested position, else false.
-	bool partial;
-
-	/// The path corridor the agent is using.
-	dtPathCorridor corridor;
-
-	/// The local boundary data for the agent.
-	dtLocalBoundary boundary;
-	
-	/// Time since the agent's path corridor was optimized.
-	float topologyOptTime;
-	
-	/// The known neighbors of the agent.
-	dtCrowdNeighbour neis[DT_CROWDAGENT_MAX_NEIGHBOURS];
-
-	/// The number of neighbors.
-	int nneis;
-	
-	/// The desired speed.
-	float desiredSpeed;
-
-	float npos[3];		///< The current agent position. [(x, y, z)]
-	float disp[3];		///< A temporary value used to accumulate agent displacement during iterative collision resolution. [(x, y, z)]
-	float dvel[3];		///< The desired velocity of the agent. Based on the current path, calculated from scratch each frame. [(x, y, z)]
-	float nvel[3];		///< The desired velocity adjusted by obstacle avoidance, calculated from scratch each frame. [(x, y, z)]
-	float vel[3];		///< The actual velocity of the agent. The change from nvel -> vel is constrained by max acceleration. [(x, y, z)]
-
-	/// The agent's configuration parameters.
-	dtCrowdAgentParams params;
-
-	/// The local path corridor corners for the agent. (Staight path.) [(x, y, z) * #ncorners]
-	float cornerVerts[DT_CROWDAGENT_MAX_CORNERS*3];
-
-	/// The local path corridor corner flags. (See: #dtStraightPathFlags) [(flags) * #ncorners]
-	unsigned char cornerFlags[DT_CROWDAGENT_MAX_CORNERS];
-
-	/// The reference id of the polygon being entered at the corner. [(polyRef) * #ncorners]
-	dtPolyRef cornerPolys[DT_CROWDAGENT_MAX_CORNERS];
-
-	/// The number of corners.
-	int ncorners;
-	
-	unsigned char targetState;			///< State of the movement request.
-	dtPolyRef targetRef;				///< Target polyref of the movement request.
-	float targetPos[3];					///< Target position of the movement request (or velocity in case of DT_CROWDAGENT_TARGET_VELOCITY).
-	dtPathQueueRef targetPathqRef;		///< Path finder ref.
-	bool targetReplan;					///< Flag indicating that the current path is being replanned.
-	float targetReplanTime;				/// <Time since the agent's target was replanned.
-};
-
-struct dtCrowdAgentAnimation
-{
-	bool active;
-	float initPos[3], startPos[3], endPos[3];
-	dtPolyRef polyRef;
-	float t, tmax;
-};
-
-/// Crowd agent update flags.
-/// @ingroup crowd
-/// @see dtCrowdAgentParams::updateFlags
-enum UpdateFlags
-{
-	DT_CROWD_ANTICIPATE_TURNS = 1,
-	DT_CROWD_OBSTACLE_AVOIDANCE = 2,
-	DT_CROWD_SEPARATION = 4,
-	DT_CROWD_OPTIMIZE_VIS = 8,			///< Use #dtPathCorridor::optimizePathVisibility() to optimize the agent path.
-	DT_CROWD_OPTIMIZE_TOPO = 16,		///< Use dtPathCorridor::optimizePathTopology() to optimize the agent path.
-};
-
-struct dtCrowdAgentDebugInfo
-{
-	int idx;
-	float optStart[3], optEnd[3];
-	dtObstacleAvoidanceDebugData* vod;
-};
-
-/// Provides local steering behaviors for a group of agents. 
-/// @ingroup crowd
-class dtCrowd
-{
-	int m_maxAgents;
-	dtCrowdAgent* m_agents;
-	dtCrowdAgent** m_activeAgents;
-	dtCrowdAgentAnimation* m_agentAnims;
-	
-	dtPathQueue m_pathq;
-
-	dtObstacleAvoidanceParams m_obstacleQueryParams[DT_CROWD_MAX_OBSTAVOIDANCE_PARAMS];
-	dtObstacleAvoidanceQuery* m_obstacleQuery;
-	
-	dtProximityGrid* m_grid;
-	
-	dtPolyRef* m_pathResult;
-	int m_maxPathResult;
-	
-	float m_agentPlacementHalfExtents[3];
-
-	dtQueryFilter m_filters[DT_CROWD_MAX_QUERY_FILTER_TYPE];
-
-	float m_maxAgentRadius;
-
-	int m_velocitySampleCount;
-
-	dtNavMeshQuery* m_navquery;
-
-	void updateTopologyOptimization(dtCrowdAgent** agents, const int nagents, const float dt);
-	void updateMoveRequest(const float dt);
-	void checkPathValidity(dtCrowdAgent** agents, const int nagents, const float dt);
-
-	inline int getAgentIndex(const dtCrowdAgent* agent) const  { return (int)(agent - m_agents); }
-
-	bool requestMoveTargetReplan(const int idx, dtPolyRef ref, const float* pos);
-
-	void purge();
-	
-public:
-	dtCrowd();
-	~dtCrowd();
-	
-	/// Initializes the crowd.  
-	///  @param[in]		maxAgents		The maximum number of agents the crowd can manage. [Limit: >= 1]
-	///  @param[in]		maxAgentRadius	The maximum radius of any agent that will be added to the crowd. [Limit: > 0]
-	///  @param[in]		nav				The navigation mesh to use for planning.
-	/// @return True if the initialization succeeded.
-	bool init(const int maxAgents, const float maxAgentRadius, dtNavMesh* nav);
-	
-	/// Sets the shared avoidance configuration for the specified index.
-	///  @param[in]		idx		The index. [Limits: 0 <= value < #DT_CROWD_MAX_OBSTAVOIDANCE_PARAMS]
-	///  @param[in]		params	The new configuration.
-	void setObstacleAvoidanceParams(const int idx, const dtObstacleAvoidanceParams* params);
-
-	/// Gets the shared avoidance configuration for the specified index.
-	///  @param[in]		idx		The index of the configuration to retreive. 
-	///							[Limits:  0 <= value < #DT_CROWD_MAX_OBSTAVOIDANCE_PARAMS]
-	/// @return The requested configuration.
-	const dtObstacleAvoidanceParams* getObstacleAvoidanceParams(const int idx) const;
-	
-	/// Gets the specified agent from the pool.
-	///	 @param[in]		idx		The agent index. [Limits: 0 <= value < #getAgentCount()]
-	/// @return The requested agent.
-	const dtCrowdAgent* getAgent(const int idx);
-
-	/// Gets the specified agent from the pool.
-	///	 @param[in]		idx		The agent index. [Limits: 0 <= value < #getAgentCount()]
-	/// @return The requested agent.
-	dtCrowdAgent* getEditableAgent(const int idx);
-
-	/// The maximum number of agents that can be managed by the object.
-	/// @return The maximum number of agents.
-	int getAgentCount() const;
-	
-	/// Adds a new agent to the crowd.
-	///  @param[in]		pos		The requested position of the agent. [(x, y, z)]
-	///  @param[in]		params	The configutation of the agent.
-	/// @return The index of the agent in the agent pool. Or -1 if the agent could not be added.
-	int addAgent(const float* pos, const dtCrowdAgentParams* params);
-
-	/// Updates the specified agent's configuration.
-	///  @param[in]		idx		The agent index. [Limits: 0 <= value < #getAgentCount()]
-	///  @param[in]		params	The new agent configuration.
-	void updateAgentParameters(const int idx, const dtCrowdAgentParams* params);
-
-	/// Removes the agent from the crowd.
-	///  @param[in]		idx		The agent index. [Limits: 0 <= value < #getAgentCount()]
-	void removeAgent(const int idx);
-	
-	/// Submits a new move request for the specified agent.
-	///  @param[in]		idx		The agent index. [Limits: 0 <= value < #getAgentCount()]
-	///  @param[in]		ref		The position's polygon reference.
-	///  @param[in]		pos		The position within the polygon. [(x, y, z)]
-	/// @return True if the request was successfully submitted.
-	bool requestMoveTarget(const int idx, dtPolyRef ref, const float* pos);
-
-	/// Submits a new move request for the specified agent.
-	///  @param[in]		idx		The agent index. [Limits: 0 <= value < #getAgentCount()]
-	///  @param[in]		vel		The movement velocity. [(x, y, z)]
-	/// @return True if the request was successfully submitted.
-	bool requestMoveVelocity(const int idx, const float* vel);
-
-	/// Resets any request for the specified agent.
-	///  @param[in]		idx		The agent index. [Limits: 0 <= value < #getAgentCount()]
-	/// @return True if the request was successfully reseted.
-	bool resetMoveTarget(const int idx);
-
-	/// Gets the active agents int the agent pool.
-	///  @param[out]	agents		An array of agent pointers. [(#dtCrowdAgent *) * maxAgents]
-	///  @param[in]		maxAgents	The size of the crowd agent array.
-	/// @return The number of agents returned in @p agents.
-	int getActiveAgents(dtCrowdAgent** agents, const int maxAgents);
-
-	/// Updates the steering and positions of all agents.
-	///  @param[in]		dt		The time, in seconds, to update the simulation. [Limit: > 0]
-	///  @param[out]	debug	A debug object to load with debug information. [Opt]
-	void update(const float dt, dtCrowdAgentDebugInfo* debug);
-	
-	/// Gets the filter used by the crowd.
-	/// @return The filter used by the crowd.
-	inline const dtQueryFilter* getFilter(const int i) const { return (i >= 0 && i < DT_CROWD_MAX_QUERY_FILTER_TYPE) ? &m_filters[i] : 0; }
-	
-	/// Gets the filter used by the crowd.
-	/// @return The filter used by the crowd.
-	inline dtQueryFilter* getEditableFilter(const int i) { return (i >= 0 && i < DT_CROWD_MAX_QUERY_FILTER_TYPE) ? &m_filters[i] : 0; }
-
-	/// Gets the search halfExtents [(x, y, z)] used by the crowd for query operations. 
-	/// @return The search halfExtents used by the crowd. [(x, y, z)]
-	const float* getQueryHalfExtents() const { return m_agentPlacementHalfExtents; }
-
-	/// Same as getQueryHalfExtents. Left to maintain backwards compatibility.
-	/// @return The search halfExtents used by the crowd. [(x, y, z)]
-	const float* getQueryExtents() const { return m_agentPlacementHalfExtents; }
-	
-	/// Gets the velocity sample count.
-	/// @return The velocity sample count.
-	inline int getVelocitySampleCount() const { return m_velocitySampleCount; }
-	
-	/// Gets the crowd's proximity grid.
-	/// @return The crowd's proximity grid.
-	const dtProximityGrid* getGrid() const { return m_grid; }
-
-	/// Gets the crowd's path request queue.
-	/// @return The crowd's path request queue.
-	const dtPathQueue* getPathQueue() const { return &m_pathq; }
-
-	/// Gets the query object used by the crowd.
-	const dtNavMeshQuery* getNavMeshQuery() const { return m_navquery; }
-
-private:
-	// Explicitly disabled copy constructor and copy assignment operator.
-	dtCrowd(const dtCrowd&);
-	dtCrowd& operator=(const dtCrowd&);
-};
-
-/// Allocates a crowd object using the Detour allocator.
-/// @return A crowd object that is ready for initialization, or null on failure.
-///  @ingroup crowd
-dtCrowd* dtAllocCrowd();
-
-/// Frees the specified crowd object using the Detour allocator.
-///  @param[in]		ptr		A crowd object allocated using #dtAllocCrowd
-///  @ingroup crowd
-void dtFreeCrowd(dtCrowd* ptr);
-
-
-#endif // DETOURCROWD_H
-
-///////////////////////////////////////////////////////////////////////////
-
-// This section contains detailed documentation for members that don't have
-// a source file. It reduces clutter in the main section of the header.
-
-/**
-
-@defgroup crowd Crowd
-
-Members in this module implement local steering and dynamic avoidance features.
-
-The crowd is the big beast of the navigation features. It not only handles a 
-lot of the path management for you, but also local steering and dynamic 
-avoidance between members of the crowd. I.e. It can keep your agents from 
-running into each other.
-
-Main class: #dtCrowd
-
-The #dtNavMeshQuery and #dtPathCorridor classes provide perfectly good, easy 
-to use path planning features. But in the end they only give you points that 
-your navigation client should be moving toward. When it comes to deciding things 
-like agent velocity and steering to avoid other agents, that is up to you to 
-implement. Unless, of course, you decide to use #dtCrowd.
-
-Basically, you add an agent to the crowd, providing various configuration 
-settings such as maximum speed and acceleration. You also provide a local 
-target to more toward. The crowd manager then provides, with every update, the 
-new agent position and velocity for the frame. The movement will be 
-constrained to the navigation mesh, and steering will be applied to ensure 
-agents managed by the crowd do not collide with each other.
-
-This is very powerful feature set. But it comes with limitations.
-
-The biggest limitation is that you must give control of the agent's position 
-completely over to the crowd manager. You can update things like maximum speed 
-and acceleration. But in order for the crowd manager to do its thing, it can't 
-allow you to constantly be giving it overrides to position and velocity. So 
-you give up direct control of the agent's movement. It belongs to the crowd.
-
-The second biggest limitation revolves around the fact that the crowd manager 
-deals with local planning. So the agent's target should never be more than 
-256 polygons aways from its current position. If it is, you risk 
-your agent failing to reach its target. So you may still need to do long 
-distance planning and provide the crowd manager with intermediate targets.
-
-Other significant limitations:
-
-- All agents using the crowd manager will use the same #dtQueryFilter.
-- Crowd management is relatively expensive. The maximum agents under crowd 
-  management at any one time is between 20 and 30.  A good place to start
-  is a maximum of 25 agents for 0.5ms per frame.
-
-@note This is a summary list of members.  Use the index or search 
-feature to find minor members.
-
-@struct dtCrowdAgentParams
-@see dtCrowdAgent, dtCrowd::addAgent(), dtCrowd::updateAgentParameters()
-
-@var dtCrowdAgentParams::obstacleAvoidanceType
-@par
-
-#dtCrowd permits agents to use different avoidance configurations.  This value 
-is the index of the #dtObstacleAvoidanceParams within the crowd.
-
-@see dtObstacleAvoidanceParams, dtCrowd::setObstacleAvoidanceParams(), 
-	 dtCrowd::getObstacleAvoidanceParams()
-
-@var dtCrowdAgentParams::collisionQueryRange
-@par
-
-Collision elements include other agents and navigation mesh boundaries.
-
-This value is often based on the agent radius and/or maximum speed. E.g. radius * 8
-
-@var dtCrowdAgentParams::pathOptimizationRange
-@par
-
-Only applicalbe if #updateFlags includes the #DT_CROWD_OPTIMIZE_VIS flag.
-
-This value is often based on the agent radius. E.g. radius * 30
-
-@see dtPathCorridor::optimizePathVisibility()
-
-@var dtCrowdAgentParams::separationWeight
-@par
-
-A higher value will result in agents trying to stay farther away from each other at 
-the cost of more difficult steering in tight spaces.
-
-*/
-
diff --git a/extern/recastnavigation/DetourCrowd/Include/DetourLocalBoundary.h b/extern/recastnavigation/DetourCrowd/Include/DetourLocalBoundary.h
deleted file mode 100644
index 56b5cb27c5..0000000000
--- a/extern/recastnavigation/DetourCrowd/Include/DetourLocalBoundary.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef DETOURLOCALBOUNDARY_H
-#define DETOURLOCALBOUNDARY_H
-
-#include "DetourNavMeshQuery.h"
-
-
-class dtLocalBoundary
-{
-	static const int MAX_LOCAL_SEGS = 8;
-	static const int MAX_LOCAL_POLYS = 16;
-	
-	struct Segment
-	{
-		float s[6];	///< Segment start/end
-		float d;	///< Distance for pruning.
-	};
-	
-	float m_center[3];
-	Segment m_segs[MAX_LOCAL_SEGS];
-	int m_nsegs;
-	
-	dtPolyRef m_polys[MAX_LOCAL_POLYS];
-	int m_npolys;
-
-	void addSegment(const float dist, const float* s);
-	
-public:
-	dtLocalBoundary();
-	~dtLocalBoundary();
-	
-	void reset();
-	
-	void update(dtPolyRef ref, const float* pos, const float collisionQueryRange,
-				dtNavMeshQuery* navquery, const dtQueryFilter* filter);
-	
-	bool isValid(dtNavMeshQuery* navquery, const dtQueryFilter* filter);
-	
-	inline const float* getCenter() const { return m_center; }
-	inline int getSegmentCount() const { return m_nsegs; }
-	inline const float* getSegment(int i) const { return m_segs[i].s; }
-
-private:
-	// Explicitly disabled copy constructor and copy assignment operator.
-	dtLocalBoundary(const dtLocalBoundary&);
-	dtLocalBoundary& operator=(const dtLocalBoundary&);
-};
-
-#endif // DETOURLOCALBOUNDARY_H
diff --git a/extern/recastnavigation/DetourCrowd/Include/DetourObstacleAvoidance.h b/extern/recastnavigation/DetourCrowd/Include/DetourObstacleAvoidance.h
deleted file mode 100644
index cc46347a0f..0000000000
--- a/extern/recastnavigation/DetourCrowd/Include/DetourObstacleAvoidance.h
+++ /dev/null
@@ -1,159 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef DETOUROBSTACLEAVOIDANCE_H
-#define DETOUROBSTACLEAVOIDANCE_H
-
-struct dtObstacleCircle
-{
-	float p[3];				///< Position of the obstacle
-	float vel[3];			///< Velocity of the obstacle
-	float dvel[3];			///< Velocity of the obstacle
-	float rad;				///< Radius of the obstacle
-	float dp[3], np[3];		///< Use for side selection during sampling.
-};
-
-struct dtObstacleSegment
-{
-	float p[3], q[3];		///< End points of the obstacle segment
-	bool touch;
-};
-
-
-class dtObstacleAvoidanceDebugData
-{
-public:
-	dtObstacleAvoidanceDebugData();
-	~dtObstacleAvoidanceDebugData();
-	
-	bool init(const int maxSamples);
-	void reset();
-	void addSample(const float* vel, const float ssize, const float pen,
-				   const float vpen, const float vcpen, const float spen, const float tpen);
-	
-	void normalizeSamples();
-	
-	inline int getSampleCount() const { return m_nsamples; }
-	inline const float* getSampleVelocity(const int i) const { return &m_vel[i*3]; }
-	inline float getSampleSize(const int i) const { return m_ssize[i]; }
-	inline float getSamplePenalty(const int i) const { return m_pen[i]; }
-	inline float getSampleDesiredVelocityPenalty(const int i) const { return m_vpen[i]; }
-	inline float getSampleCurrentVelocityPenalty(const int i) const { return m_vcpen[i]; }
-	inline float getSamplePreferredSidePenalty(const int i) const { return m_spen[i]; }
-	inline float getSampleCollisionTimePenalty(const int i) const { return m_tpen[i]; }
-
-private:
-	// Explicitly disabled copy constructor and copy assignment operator.
-	dtObstacleAvoidanceDebugData(const dtObstacleAvoidanceDebugData&);
-	dtObstacleAvoidanceDebugData& operator=(const dtObstacleAvoidanceDebugData&);
-
-	int m_nsamples;
-	int m_maxSamples;
-	float* m_vel;
-	float* m_ssize;
-	float* m_pen;
-	float* m_vpen;
-	float* m_vcpen;
-	float* m_spen;
-	float* m_tpen;
-};
-
-dtObstacleAvoidanceDebugData* dtAllocObstacleAvoidanceDebugData();
-void dtFreeObstacleAvoidanceDebugData(dtObstacleAvoidanceDebugData* ptr);
-
-
-static const int DT_MAX_PATTERN_DIVS = 32;	///< Max numver of adaptive divs.
-static const int DT_MAX_PATTERN_RINGS = 4;	///< Max number of adaptive rings.
-
-struct dtObstacleAvoidanceParams
-{
-	float velBias;
-	float weightDesVel;
-	float weightCurVel;
-	float weightSide;
-	float weightToi;
-	float horizTime;
-	unsigned char gridSize;	///< grid
-	unsigned char adaptiveDivs;	///< adaptive
-	unsigned char adaptiveRings;	///< adaptive
-	unsigned char adaptiveDepth;	///< adaptive
-};
-
-class dtObstacleAvoidanceQuery
-{
-public:
-	dtObstacleAvoidanceQuery();
-	~dtObstacleAvoidanceQuery();
-	
-	bool init(const int maxCircles, const int maxSegments);
-	
-	void reset();
-
-	void addCircle(const float* pos, const float rad,
-				   const float* vel, const float* dvel);
-				   
-	void addSegment(const float* p, const float* q);
-
-	int sampleVelocityGrid(const float* pos, const float rad, const float vmax,
-						   const float* vel, const float* dvel, float* nvel,
-						   const dtObstacleAvoidanceParams* params,
-						   dtObstacleAvoidanceDebugData* debug = 0);
-
-	int sampleVelocityAdaptive(const float* pos, const float rad, const float vmax,
-							   const float* vel, const float* dvel, float* nvel,
-							   const dtObstacleAvoidanceParams* params, 
-							   dtObstacleAvoidanceDebugData* debug = 0);
-	
-	inline int getObstacleCircleCount() const { return m_ncircles; }
-	const dtObstacleCircle* getObstacleCircle(const int i) { return &m_circles[i]; }
-
-	inline int getObstacleSegmentCount() const { return m_nsegments; }
-	const dtObstacleSegment* getObstacleSegment(const int i) { return &m_segments[i]; }
-
-private:
-	// Explicitly disabled copy constructor and copy assignment operator.
-	dtObstacleAvoidanceQuery(const dtObstacleAvoidanceQuery&);
-	dtObstacleAvoidanceQuery& operator=(const dtObstacleAvoidanceQuery&);
-
-	void prepare(const float* pos, const float* dvel);
-
-	float processSample(const float* vcand, const float cs,
-						const float* pos, const float rad,
-						const float* vel, const float* dvel,
-						const float minPenalty,
-						dtObstacleAvoidanceDebugData* debug);
-
-	dtObstacleAvoidanceParams m_params;
-	float m_invHorizTime;
-	float m_vmax;
-	float m_invVmax;
-
-	int m_maxCircles;
-	dtObstacleCircle* m_circles;
-	int m_ncircles;
-
-	int m_maxSegments;
-	dtObstacleSegment* m_segments;
-	int m_nsegments;
-};
-
-dtObstacleAvoidanceQuery* dtAllocObstacleAvoidanceQuery();
-void dtFreeObstacleAvoidanceQuery(dtObstacleAvoidanceQuery* ptr);
-
-
-#endif // DETOUROBSTACLEAVOIDANCE_H
diff --git a/extern/recastnavigation/DetourCrowd/Include/DetourPathCorridor.h b/extern/recastnavigation/DetourCrowd/Include/DetourPathCorridor.h
deleted file mode 100644
index f5ee8df70d..0000000000
--- a/extern/recastnavigation/DetourCrowd/Include/DetourPathCorridor.h
+++ /dev/null
@@ -1,151 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef DETOUTPATHCORRIDOR_H
-#define DETOUTPATHCORRIDOR_H
-
-#include "DetourNavMeshQuery.h"
-
-/// Represents a dynamic polygon corridor used to plan agent movement.
-/// @ingroup crowd, detour
-class dtPathCorridor
-{
-	float m_pos[3];
-	float m_target[3];
-	
-	dtPolyRef* m_path;
-	int m_npath;
-	int m_maxPath;
-	
-public:
-	dtPathCorridor();
-	~dtPathCorridor();
-	
-	/// Allocates the corridor's path buffer. 
-	///  @param[in]		maxPath		The maximum path size the corridor can handle.
-	/// @return True if the initialization succeeded.
-	bool init(const int maxPath);
-	
-	/// Resets the path corridor to the specified position.
-	///  @param[in]		ref		The polygon reference containing the position.
-	///  @param[in]		pos		The new position in the corridor. [(x, y, z)]
-	void reset(dtPolyRef ref, const float* pos);
-	
-	/// Finds the corners in the corridor from the position toward the target. (The straightened path.)
-	///  @param[out]	cornerVerts		The corner vertices. [(x, y, z) * cornerCount] [Size: <= maxCorners]
-	///  @param[out]	cornerFlags		The flag for each corner. [(flag) * cornerCount] [Size: <= maxCorners]
-	///  @param[out]	cornerPolys		The polygon reference for each corner. [(polyRef) * cornerCount] 
-	///  								[Size: <= @p maxCorners]
-	///  @param[in]		maxCorners		The maximum number of corners the buffers can hold.
-	///  @param[in]		navquery		The query object used to build the corridor.
-	///  @param[in]		filter			The filter to apply to the operation.
-	/// @return The number of corners returned in the corner buffers. [0 <= value <= @p maxCorners]
-	int findCorners(float* cornerVerts, unsigned char* cornerFlags,
-					dtPolyRef* cornerPolys, const int maxCorners,
-					dtNavMeshQuery* navquery, const dtQueryFilter* filter);
-	
-	/// Attempts to optimize the path if the specified point is visible from the current position.
-	///  @param[in]		next					The point to search toward. [(x, y, z])
-	///  @param[in]		pathOptimizationRange	The maximum range to search. [Limit: > 0]
-	///  @param[in]		navquery				The query object used to build the corridor.
-	///  @param[in]		filter					The filter to apply to the operation.			
-	void optimizePathVisibility(const float* next, const float pathOptimizationRange,
-								dtNavMeshQuery* navquery, const dtQueryFilter* filter);
-	
-	/// Attempts to optimize the path using a local area search. (Partial replanning.) 
-	///  @param[in]		navquery	The query object used to build the corridor.
-	///  @param[in]		filter		The filter to apply to the operation.	
-	bool optimizePathTopology(dtNavMeshQuery* navquery, const dtQueryFilter* filter);
-	
-	bool moveOverOffmeshConnection(dtPolyRef offMeshConRef, dtPolyRef* refs,
-								   float* startPos, float* endPos,
-								   dtNavMeshQuery* navquery);
-
-	bool fixPathStart(dtPolyRef safeRef, const float* safePos);
-
-	bool trimInvalidPath(dtPolyRef safeRef, const float* safePos,
-						 dtNavMeshQuery* navquery, const dtQueryFilter* filter);
-	
-	/// Checks the current corridor path to see if its polygon references remain valid. 
-	///  @param[in]		maxLookAhead	The number of polygons from the beginning of the corridor to search.
-	///  @param[in]		navquery		The query object used to build the corridor.
-	///  @param[in]		filter			The filter to apply to the operation.	
-	bool isValid(const int maxLookAhead, dtNavMeshQuery* navquery, const dtQueryFilter* filter);
-	
-	/// Moves the position from the current location to the desired location, adjusting the corridor 
-	/// as needed to reflect the change.
-	///  @param[in]		npos		The desired new position. [(x, y, z)]
-	///  @param[in]		navquery	The query object used to build the corridor.
-	///  @param[in]		filter		The filter to apply to the operation.
-	/// @return Returns true if move succeeded.
-	bool movePosition(const float* npos, dtNavMeshQuery* navquery, const dtQueryFilter* filter);
-
-	/// Moves the target from the curent location to the desired location, adjusting the corridor
-	/// as needed to reflect the change. 
-	///  @param[in]		npos		The desired new target position. [(x, y, z)]
-	///  @param[in]		navquery	The query object used to build the corridor.
-	///  @param[in]		filter		The filter to apply to the operation.
-	/// @return Returns true if move succeeded.
-	bool moveTargetPosition(const float* npos, dtNavMeshQuery* navquery, const dtQueryFilter* filter);
-	
-	/// Loads a new path and target into the corridor.
-	///  @param[in]		target		The target location within the last polygon of the path. [(x, y, z)]
-	///  @param[in]		path		The path corridor. [(polyRef) * @p npolys]
-	///  @param[in]		npath		The number of polygons in the path.
-	void setCorridor(const float* target, const dtPolyRef* polys, const int npath);
-	
-	/// Gets the current position within the corridor. (In the first polygon.)
-	/// @return The current position within the corridor.
-	inline const float* getPos() const { return m_pos; }
-
-	/// Gets the current target within the corridor. (In the last polygon.)
-	/// @return The current target within the corridor.
-	inline const float* getTarget() const { return m_target; }
-	
-	/// The polygon reference id of the first polygon in the corridor, the polygon containing the position.
-	/// @return The polygon reference id of the first polygon in the corridor. (Or zero if there is no path.)
-	inline dtPolyRef getFirstPoly() const { return m_npath ? m_path[0] : 0; }
-
-	/// The polygon reference id of the last polygon in the corridor, the polygon containing the target.
-	/// @return The polygon reference id of the last polygon in the corridor. (Or zero if there is no path.)
-	inline dtPolyRef getLastPoly() const { return m_npath ? m_path[m_npath-1] : 0; }
-	
-	/// The corridor's path.
-	/// @return The corridor's path. [(polyRef) * #getPathCount()]
-	inline const dtPolyRef* getPath() const { return m_path; }
-
-	/// The number of polygons in the current corridor path.
-	/// @return The number of polygons in the current corridor path.
-	inline int getPathCount() const { return m_npath; }
-
-private:
-	// Explicitly disabled copy constructor and copy assignment operator.
-	dtPathCorridor(const dtPathCorridor&);
-	dtPathCorridor& operator=(const dtPathCorridor&);
-};
-
-int dtMergeCorridorStartMoved(dtPolyRef* path, const int npath, const int maxPath,
-							  const dtPolyRef* visited, const int nvisited);
-
-int dtMergeCorridorEndMoved(dtPolyRef* path, const int npath, const int maxPath,
-							const dtPolyRef* visited, const int nvisited);
-
-int dtMergeCorridorStartShortcut(dtPolyRef* path, const int npath, const int maxPath,
-								 const dtPolyRef* visited, const int nvisited);
-
-#endif // DETOUTPATHCORRIDOR_H
diff --git a/extern/recastnavigation/DetourCrowd/Include/DetourPathQueue.h b/extern/recastnavigation/DetourCrowd/Include/DetourPathQueue.h
deleted file mode 100644
index 310721e709..0000000000
--- a/extern/recastnavigation/DetourCrowd/Include/DetourPathQueue.h
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef DETOURPATHQUEUE_H
-#define DETOURPATHQUEUE_H
-
-#include "DetourNavMesh.h"
-#include "DetourNavMeshQuery.h"
-
-static const unsigned int DT_PATHQ_INVALID = 0;
-
-typedef unsigned int dtPathQueueRef;
-
-class dtPathQueue
-{
-	struct PathQuery
-	{
-		dtPathQueueRef ref;
-		/// Path find start and end location.
-		float startPos[3], endPos[3];
-		dtPolyRef startRef, endRef;
-		/// Result.
-		dtPolyRef* path;
-		int npath;
-		/// State.
-		dtStatus status;
-		int keepAlive;
-		const dtQueryFilter* filter; ///< TODO: This is potentially dangerous!
-	};
-	
-	static const int MAX_QUEUE = 8;
-	PathQuery m_queue[MAX_QUEUE];
-	dtPathQueueRef m_nextHandle;
-	int m_maxPathSize;
-	int m_queueHead;
-	dtNavMeshQuery* m_navquery;
-	
-	void purge();
-	
-public:
-	dtPathQueue();
-	~dtPathQueue();
-	
-	bool init(const int maxPathSize, const int maxSearchNodeCount, dtNavMesh* nav);
-	
-	void update(const int maxIters);
-	
-	dtPathQueueRef request(dtPolyRef startRef, dtPolyRef endRef,
-						   const float* startPos, const float* endPos, 
-						   const dtQueryFilter* filter);
-	
-	dtStatus getRequestStatus(dtPathQueueRef ref) const;
-	
-	dtStatus getPathResult(dtPathQueueRef ref, dtPolyRef* path, int* pathSize, const int maxPath);
-	
-	inline const dtNavMeshQuery* getNavQuery() const { return m_navquery; }
-
-private:
-	// Explicitly disabled copy constructor and copy assignment operator.
-	dtPathQueue(const dtPathQueue&);
-	dtPathQueue& operator=(const dtPathQueue&);
-};
-
-#endif // DETOURPATHQUEUE_H
diff --git a/extern/recastnavigation/DetourCrowd/Include/DetourProximityGrid.h b/extern/recastnavigation/DetourCrowd/Include/DetourProximityGrid.h
deleted file mode 100644
index d8968efd56..0000000000
--- a/extern/recastnavigation/DetourCrowd/Include/DetourProximityGrid.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef DETOURPROXIMITYGRID_H
-#define DETOURPROXIMITYGRID_H
-
-class dtProximityGrid
-{
-	float m_cellSize;
-	float m_invCellSize;
-	
-	struct Item
-	{
-		unsigned short id;
-		short x,y;
-		unsigned short next;
-	};
-	Item* m_pool;
-	int m_poolHead;
-	int m_poolSize;
-	
-	unsigned short* m_buckets;
-	int m_bucketsSize;
-	
-	int m_bounds[4];
-	
-public:
-	dtProximityGrid();
-	~dtProximityGrid();
-	
-	bool init(const int poolSize, const float cellSize);
-	
-	void clear();
-	
-	void addItem(const unsigned short id,
-				 const float minx, const float miny,
-				 const float maxx, const float maxy);
-	
-	int queryItems(const float minx, const float miny,
-				   const float maxx, const float maxy,
-				   unsigned short* ids, const int maxIds) const;
-	
-	int getItemCountAt(const int x, const int y) const;
-	
-	inline const int* getBounds() const { return m_bounds; }
-	inline float getCellSize() const { return m_cellSize; }
-
-private:
-	// Explicitly disabled copy constructor and copy assignment operator.
-	dtProximityGrid(const dtProximityGrid&);
-	dtProximityGrid& operator=(const dtProximityGrid&);
-};
-
-dtProximityGrid* dtAllocProximityGrid();
-void dtFreeProximityGrid(dtProximityGrid* ptr);
-
-
-#endif // DETOURPROXIMITYGRID_H
-
diff --git a/extern/recastnavigation/DetourCrowd/Source/DetourCrowd.cpp b/extern/recastnavigation/DetourCrowd/Source/DetourCrowd.cpp
deleted file mode 100644
index 3f0311f7ff..0000000000
--- a/extern/recastnavigation/DetourCrowd/Source/DetourCrowd.cpp
+++ /dev/null
@@ -1,1450 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#define _USE_MATH_DEFINES
-#include <string.h>
-#include <float.h>
-#include <stdlib.h>
-#include <new>
-#include "DetourCrowd.h"
-#include "DetourNavMesh.h"
-#include "DetourNavMeshQuery.h"
-#include "DetourObstacleAvoidance.h"
-#include "DetourCommon.h"
-#include "DetourMath.h"
-#include "DetourAssert.h"
-#include "DetourAlloc.h"
-
-
-dtCrowd* dtAllocCrowd()
-{
-	void* mem = dtAlloc(sizeof(dtCrowd), DT_ALLOC_PERM);
-	if (!mem) return 0;
-	return new(mem) dtCrowd;
-}
-
-void dtFreeCrowd(dtCrowd* ptr)
-{
-	if (!ptr) return;
-	ptr->~dtCrowd();
-	dtFree(ptr);
-}
-
-
-static const int MAX_ITERS_PER_UPDATE = 100;
-
-static const int MAX_PATHQUEUE_NODES = 4096;
-static const int MAX_COMMON_NODES = 512;
-
-inline float tween(const float t, const float t0, const float t1)
-{
-	return dtClamp((t-t0) / (t1-t0), 0.0f, 1.0f);
-}
-
-static void integrate(dtCrowdAgent* ag, const float dt)
-{
-	// Fake dynamic constraint.
-	const float maxDelta = ag->params.maxAcceleration * dt;
-	float dv[3];
-	dtVsub(dv, ag->nvel, ag->vel);
-	float ds = dtVlen(dv);
-	if (ds > maxDelta)
-		dtVscale(dv, dv, maxDelta/ds);
-	dtVadd(ag->vel, ag->vel, dv);
-	
-	// Integrate
-	if (dtVlen(ag->vel) > 0.0001f)
-		dtVmad(ag->npos, ag->npos, ag->vel, dt);
-	else
-		dtVset(ag->vel,0,0,0);
-}
-
-static bool overOffmeshConnection(const dtCrowdAgent* ag, const float radius)
-{
-	if (!ag->ncorners)
-		return false;
-	
-	const bool offMeshConnection = (ag->cornerFlags[ag->ncorners-1] & DT_STRAIGHTPATH_OFFMESH_CONNECTION) ? true : false;
-	if (offMeshConnection)
-	{
-		const float distSq = dtVdist2DSqr(ag->npos, &ag->cornerVerts[(ag->ncorners-1)*3]);
-		if (distSq < radius*radius)
-			return true;
-	}
-	
-	return false;
-}
-
-static float getDistanceToGoal(const dtCrowdAgent* ag, const float range)
-{
-	if (!ag->ncorners)
-		return range;
-	
-	const bool endOfPath = (ag->cornerFlags[ag->ncorners-1] & DT_STRAIGHTPATH_END) ? true : false;
-	if (endOfPath)
-		return dtMin(dtVdist2D(ag->npos, &ag->cornerVerts[(ag->ncorners-1)*3]), range);
-	
-	return range;
-}
-
-static void calcSmoothSteerDirection(const dtCrowdAgent* ag, float* dir)
-{
-	if (!ag->ncorners)
-	{
-		dtVset(dir, 0,0,0);
-		return;
-	}
-	
-	const int ip0 = 0;
-	const int ip1 = dtMin(1, ag->ncorners-1);
-	const float* p0 = &ag->cornerVerts[ip0*3];
-	const float* p1 = &ag->cornerVerts[ip1*3];
-	
-	float dir0[3], dir1[3];
-	dtVsub(dir0, p0, ag->npos);
-	dtVsub(dir1, p1, ag->npos);
-	dir0[1] = 0;
-	dir1[1] = 0;
-	
-	float len0 = dtVlen(dir0);
-	float len1 = dtVlen(dir1);
-	if (len1 > 0.001f)
-		dtVscale(dir1,dir1,1.0f/len1);
-	
-	dir[0] = dir0[0] - dir1[0]*len0*0.5f;
-	dir[1] = 0;
-	dir[2] = dir0[2] - dir1[2]*len0*0.5f;
-	
-	dtVnormalize(dir);
-}
-
-static void calcStraightSteerDirection(const dtCrowdAgent* ag, float* dir)
-{
-	if (!ag->ncorners)
-	{
-		dtVset(dir, 0,0,0);
-		return;
-	}
-	dtVsub(dir, &ag->cornerVerts[0], ag->npos);
-	dir[1] = 0;
-	dtVnormalize(dir);
-}
-
-static int addNeighbour(const int idx, const float dist,
-						dtCrowdNeighbour* neis, const int nneis, const int maxNeis)
-{
-	// Insert neighbour based on the distance.
-	dtCrowdNeighbour* nei = 0;
-	if (!nneis)
-	{
-		nei = &neis[nneis];
-	}
-	else if (dist >= neis[nneis-1].dist)
-	{
-		if (nneis >= maxNeis)
-			return nneis;
-		nei = &neis[nneis];
-	}
-	else
-	{
-		int i;
-		for (i = 0; i < nneis; ++i)
-			if (dist <= neis[i].dist)
-				break;
-		
-		const int tgt = i+1;
-		const int n = dtMin(nneis-i, maxNeis-tgt);
-		
-		dtAssert(tgt+n <= maxNeis);
-		
-		if (n > 0)
-			memmove(&neis[tgt], &neis[i], sizeof(dtCrowdNeighbour)*n);
-		nei = &neis[i];
-	}
-	
-	memset(nei, 0, sizeof(dtCrowdNeighbour));
-	
-	nei->idx = idx;
-	nei->dist = dist;
-	
-	return dtMin(nneis+1, maxNeis);
-}
-
-static int getNeighbours(const float* pos, const float height, const float range,
-						 const dtCrowdAgent* skip, dtCrowdNeighbour* result, const int maxResult,
-						 dtCrowdAgent** agents, const int /*nagents*/, dtProximityGrid* grid)
-{
-	int n = 0;
-	
-	static const int MAX_NEIS = 32;
-	unsigned short ids[MAX_NEIS];
-	int nids = grid->queryItems(pos[0]-range, pos[2]-range,
-								pos[0]+range, pos[2]+range,
-								ids, MAX_NEIS);
-	
-	for (int i = 0; i < nids; ++i)
-	{
-		const dtCrowdAgent* ag = agents[ids[i]];
-		
-		if (ag == skip) continue;
-		
-		// Check for overlap.
-		float diff[3];
-		dtVsub(diff, pos, ag->npos);
-		if (dtMathFabsf(diff[1]) >= (height+ag->params.height)/2.0f)
-			continue;
-		diff[1] = 0;
-		const float distSqr = dtVlenSqr(diff);
-		if (distSqr > dtSqr(range))
-			continue;
-		
-		n = addNeighbour(ids[i], distSqr, result, n, maxResult);
-	}
-	return n;
-}
-
-static int addToOptQueue(dtCrowdAgent* newag, dtCrowdAgent** agents, const int nagents, const int maxAgents)
-{
-	// Insert neighbour based on greatest time.
-	int slot = 0;
-	if (!nagents)
-	{
-		slot = nagents;
-	}
-	else if (newag->topologyOptTime <= agents[nagents-1]->topologyOptTime)
-	{
-		if (nagents >= maxAgents)
-			return nagents;
-		slot = nagents;
-	}
-	else
-	{
-		int i;
-		for (i = 0; i < nagents; ++i)
-			if (newag->topologyOptTime >= agents[i]->topologyOptTime)
-				break;
-		
-		const int tgt = i+1;
-		const int n = dtMin(nagents-i, maxAgents-tgt);
-		
-		dtAssert(tgt+n <= maxAgents);
-		
-		if (n > 0)
-			memmove(&agents[tgt], &agents[i], sizeof(dtCrowdAgent*)*n);
-		slot = i;
-	}
-	
-	agents[slot] = newag;
-	
-	return dtMin(nagents+1, maxAgents);
-}
-
-static int addToPathQueue(dtCrowdAgent* newag, dtCrowdAgent** agents, const int nagents, const int maxAgents)
-{
-	// Insert neighbour based on greatest time.
-	int slot = 0;
-	if (!nagents)
-	{
-		slot = nagents;
-	}
-	else if (newag->targetReplanTime <= agents[nagents-1]->targetReplanTime)
-	{
-		if (nagents >= maxAgents)
-			return nagents;
-		slot = nagents;
-	}
-	else
-	{
-		int i;
-		for (i = 0; i < nagents; ++i)
-			if (newag->targetReplanTime >= agents[i]->targetReplanTime)
-				break;
-		
-		const int tgt = i+1;
-		const int n = dtMin(nagents-i, maxAgents-tgt);
-		
-		dtAssert(tgt+n <= maxAgents);
-		
-		if (n > 0)
-			memmove(&agents[tgt], &agents[i], sizeof(dtCrowdAgent*)*n);
-		slot = i;
-	}
-	
-	agents[slot] = newag;
-	
-	return dtMin(nagents+1, maxAgents);
-}
-
-
-/**
-@class dtCrowd
-@par
-
-This is the core class of the @ref crowd module.  See the @ref crowd documentation for a summary
-of the crowd features.
-
-A common method for setting up the crowd is as follows:
-
--# Allocate the crowd using #dtAllocCrowd.
--# Initialize the crowd using #init().
--# Set the avoidance configurations using #setObstacleAvoidanceParams().
--# Add agents using #addAgent() and make an initial movement request using #requestMoveTarget().
-
-A common process for managing the crowd is as follows:
-
--# Call #update() to allow the crowd to manage its agents.
--# Retrieve agent information using #getActiveAgents().
--# Make movement requests using #requestMoveTarget() when movement goal changes.
--# Repeat every frame.
-
-Some agent configuration settings can be updated using #updateAgentParameters().  But the crowd owns the
-agent position.  So it is not possible to update an active agent's position.  If agent position
-must be fed back into the crowd, the agent must be removed and re-added.
-
-Notes: 
-
-- Path related information is available for newly added agents only after an #update() has been
-  performed.
-- Agent objects are kept in a pool and re-used.  So it is important when using agent objects to check the value of
-  #dtCrowdAgent::active to determine if the agent is actually in use or not.
-- This class is meant to provide 'local' movement. There is a limit of 256 polygons in the path corridor.  
-  So it is not meant to provide automatic pathfinding services over long distances.
-
-@see dtAllocCrowd(), dtFreeCrowd(), init(), dtCrowdAgent
-
-*/
-
-dtCrowd::dtCrowd() :
-	m_maxAgents(0),
-	m_agents(0),
-	m_activeAgents(0),
-	m_agentAnims(0),
-	m_obstacleQuery(0),
-	m_grid(0),
-	m_pathResult(0),
-	m_maxPathResult(0),
-	m_maxAgentRadius(0),
-	m_velocitySampleCount(0),
-	m_navquery(0)
-{
-}
-
-dtCrowd::~dtCrowd()
-{
-	purge();
-}
-
-void dtCrowd::purge()
-{
-	for (int i = 0; i < m_maxAgents; ++i)
-		m_agents[i].~dtCrowdAgent();
-	dtFree(m_agents);
-	m_agents = 0;
-	m_maxAgents = 0;
-	
-	dtFree(m_activeAgents);
-	m_activeAgents = 0;
-
-	dtFree(m_agentAnims);
-	m_agentAnims = 0;
-	
-	dtFree(m_pathResult);
-	m_pathResult = 0;
-	
-	dtFreeProximityGrid(m_grid);
-	m_grid = 0;
-
-	dtFreeObstacleAvoidanceQuery(m_obstacleQuery);
-	m_obstacleQuery = 0;
-	
-	dtFreeNavMeshQuery(m_navquery);
-	m_navquery = 0;
-}
-
-/// @par
-///
-/// May be called more than once to purge and re-initialize the crowd.
-bool dtCrowd::init(const int maxAgents, const float maxAgentRadius, dtNavMesh* nav)
-{
-	purge();
-	
-	m_maxAgents = maxAgents;
-	m_maxAgentRadius = maxAgentRadius;
-
-	// Larger than agent radius because it is also used for agent recovery.
-	dtVset(m_agentPlacementHalfExtents, m_maxAgentRadius*2.0f, m_maxAgentRadius*1.5f, m_maxAgentRadius*2.0f);
-	
-	m_grid = dtAllocProximityGrid();
-	if (!m_grid)
-		return false;
-	if (!m_grid->init(m_maxAgents*4, maxAgentRadius*3))
-		return false;
-	
-	m_obstacleQuery = dtAllocObstacleAvoidanceQuery();
-	if (!m_obstacleQuery)
-		return false;
-	if (!m_obstacleQuery->init(6, 8))
-		return false;
-
-	// Init obstacle query params.
-	memset(m_obstacleQueryParams, 0, sizeof(m_obstacleQueryParams));
-	for (int i = 0; i < DT_CROWD_MAX_OBSTAVOIDANCE_PARAMS; ++i)
-	{
-		dtObstacleAvoidanceParams* params = &m_obstacleQueryParams[i];
-		params->velBias = 0.4f;
-		params->weightDesVel = 2.0f;
-		params->weightCurVel = 0.75f;
-		params->weightSide = 0.75f;
-		params->weightToi = 2.5f;
-		params->horizTime = 2.5f;
-		params->gridSize = 33;
-		params->adaptiveDivs = 7;
-		params->adaptiveRings = 2;
-		params->adaptiveDepth = 5;
-	}
-	
-	// Allocate temp buffer for merging paths.
-	m_maxPathResult = 256;
-	m_pathResult = (dtPolyRef*)dtAlloc(sizeof(dtPolyRef)*m_maxPathResult, DT_ALLOC_PERM);
-	if (!m_pathResult)
-		return false;
-	
-	if (!m_pathq.init(m_maxPathResult, MAX_PATHQUEUE_NODES, nav))
-		return false;
-	
-	m_agents = (dtCrowdAgent*)dtAlloc(sizeof(dtCrowdAgent)*m_maxAgents, DT_ALLOC_PERM);
-	if (!m_agents)
-		return false;
-	
-	m_activeAgents = (dtCrowdAgent**)dtAlloc(sizeof(dtCrowdAgent*)*m_maxAgents, DT_ALLOC_PERM);
-	if (!m_activeAgents)
-		return false;
-
-	m_agentAnims = (dtCrowdAgentAnimation*)dtAlloc(sizeof(dtCrowdAgentAnimation)*m_maxAgents, DT_ALLOC_PERM);
-	if (!m_agentAnims)
-		return false;
-	
-	for (int i = 0; i < m_maxAgents; ++i)
-	{
-		new(&m_agents[i]) dtCrowdAgent();
-		m_agents[i].active = false;
-		if (!m_agents[i].corridor.init(m_maxPathResult))
-			return false;
-	}
-
-	for (int i = 0; i < m_maxAgents; ++i)
-	{
-		m_agentAnims[i].active = false;
-	}
-
-	// The navquery is mostly used for local searches, no need for large node pool.
-	m_navquery = dtAllocNavMeshQuery();
-	if (!m_navquery)
-		return false;
-	if (dtStatusFailed(m_navquery->init(nav, MAX_COMMON_NODES)))
-		return false;
-	
-	return true;
-}
-
-void dtCrowd::setObstacleAvoidanceParams(const int idx, const dtObstacleAvoidanceParams* params)
-{
-	if (idx >= 0 && idx < DT_CROWD_MAX_OBSTAVOIDANCE_PARAMS)
-		memcpy(&m_obstacleQueryParams[idx], params, sizeof(dtObstacleAvoidanceParams));
-}
-
-const dtObstacleAvoidanceParams* dtCrowd::getObstacleAvoidanceParams(const int idx) const
-{
-	if (idx >= 0 && idx < DT_CROWD_MAX_OBSTAVOIDANCE_PARAMS)
-		return &m_obstacleQueryParams[idx];
-	return 0;
-}
-
-int dtCrowd::getAgentCount() const
-{
-	return m_maxAgents;
-}
-
-/// @par
-/// 
-/// Agents in the pool may not be in use.  Check #dtCrowdAgent.active before using the returned object.
-const dtCrowdAgent* dtCrowd::getAgent(const int idx)
-{
-	if (idx < 0 || idx >= m_maxAgents)
-		return 0;
-	return &m_agents[idx];
-}
-
-/// 
-/// Agents in the pool may not be in use.  Check #dtCrowdAgent.active before using the returned object.
-dtCrowdAgent* dtCrowd::getEditableAgent(const int idx)
-{
-	if (idx < 0 || idx >= m_maxAgents)
-		return 0;
-	return &m_agents[idx];
-}
-
-void dtCrowd::updateAgentParameters(const int idx, const dtCrowdAgentParams* params)
-{
-	if (idx < 0 || idx >= m_maxAgents)
-		return;
-	memcpy(&m_agents[idx].params, params, sizeof(dtCrowdAgentParams));
-}
-
-/// @par
-///
-/// The agent's position will be constrained to the surface of the navigation mesh.
-int dtCrowd::addAgent(const float* pos, const dtCrowdAgentParams* params)
-{
-	// Find empty slot.
-	int idx = -1;
-	for (int i = 0; i < m_maxAgents; ++i)
-	{
-		if (!m_agents[i].active)
-		{
-			idx = i;
-			break;
-		}
-	}
-	if (idx == -1)
-		return -1;
-	
-	dtCrowdAgent* ag = &m_agents[idx];		
-
-	updateAgentParameters(idx, params);
-	
-	// Find nearest position on navmesh and place the agent there.
-	float nearest[3];
-	dtPolyRef ref = 0;
-	dtVcopy(nearest, pos);
-	dtStatus status = m_navquery->findNearestPoly(pos, m_agentPlacementHalfExtents, &m_filters[ag->params.queryFilterType], &ref, nearest);
-	if (dtStatusFailed(status))
-	{
-		dtVcopy(nearest, pos);
-		ref = 0;
-	}
-	
-	ag->corridor.reset(ref, nearest);
-	ag->boundary.reset();
-	ag->partial = false;
-
-	ag->topologyOptTime = 0;
-	ag->targetReplanTime = 0;
-	ag->nneis = 0;
-	
-	dtVset(ag->dvel, 0,0,0);
-	dtVset(ag->nvel, 0,0,0);
-	dtVset(ag->vel, 0,0,0);
-	dtVcopy(ag->npos, nearest);
-	
-	ag->desiredSpeed = 0;
-
-	if (ref)
-		ag->state = DT_CROWDAGENT_STATE_WALKING;
-	else
-		ag->state = DT_CROWDAGENT_STATE_INVALID;
-	
-	ag->targetState = DT_CROWDAGENT_TARGET_NONE;
-	
-	ag->active = true;
-
-	return idx;
-}
-
-/// @par
-///
-/// The agent is deactivated and will no longer be processed.  Its #dtCrowdAgent object
-/// is not removed from the pool.  It is marked as inactive so that it is available for reuse.
-void dtCrowd::removeAgent(const int idx)
-{
-	if (idx >= 0 && idx < m_maxAgents)
-	{
-		m_agents[idx].active = false;
-	}
-}
-
-bool dtCrowd::requestMoveTargetReplan(const int idx, dtPolyRef ref, const float* pos)
-{
-	if (idx < 0 || idx >= m_maxAgents)
-		return false;
-	
-	dtCrowdAgent* ag = &m_agents[idx];
-	
-	// Initialize request.
-	ag->targetRef = ref;
-	dtVcopy(ag->targetPos, pos);
-	ag->targetPathqRef = DT_PATHQ_INVALID;
-	ag->targetReplan = true;
-	if (ag->targetRef)
-		ag->targetState = DT_CROWDAGENT_TARGET_REQUESTING;
-	else
-		ag->targetState = DT_CROWDAGENT_TARGET_FAILED;
-	
-	return true;
-}
-
-/// @par
-/// 
-/// This method is used when a new target is set.
-/// 
-/// The position will be constrained to the surface of the navigation mesh.
-///
-/// The request will be processed during the next #update().
-bool dtCrowd::requestMoveTarget(const int idx, dtPolyRef ref, const float* pos)
-{
-	if (idx < 0 || idx >= m_maxAgents)
-		return false;
-	if (!ref)
-		return false;
-
-	dtCrowdAgent* ag = &m_agents[idx];
-	
-	// Initialize request.
-	ag->targetRef = ref;
-	dtVcopy(ag->targetPos, pos);
-	ag->targetPathqRef = DT_PATHQ_INVALID;
-	ag->targetReplan = false;
-	if (ag->targetRef)
-		ag->targetState = DT_CROWDAGENT_TARGET_REQUESTING;
-	else
-		ag->targetState = DT_CROWDAGENT_TARGET_FAILED;
-
-	return true;
-}
-
-bool dtCrowd::requestMoveVelocity(const int idx, const float* vel)
-{
-	if (idx < 0 || idx >= m_maxAgents)
-		return false;
-	
-	dtCrowdAgent* ag = &m_agents[idx];
-	
-	// Initialize request.
-	ag->targetRef = 0;
-	dtVcopy(ag->targetPos, vel);
-	ag->targetPathqRef = DT_PATHQ_INVALID;
-	ag->targetReplan = false;
-	ag->targetState = DT_CROWDAGENT_TARGET_VELOCITY;
-	
-	return true;
-}
-
-bool dtCrowd::resetMoveTarget(const int idx)
-{
-	if (idx < 0 || idx >= m_maxAgents)
-		return false;
-	
-	dtCrowdAgent* ag = &m_agents[idx];
-	
-	// Initialize request.
-	ag->targetRef = 0;
-	dtVset(ag->targetPos, 0,0,0);
-	dtVset(ag->dvel, 0,0,0);
-	ag->targetPathqRef = DT_PATHQ_INVALID;
-	ag->targetReplan = false;
-	ag->targetState = DT_CROWDAGENT_TARGET_NONE;
-	
-	return true;
-}
-
-int dtCrowd::getActiveAgents(dtCrowdAgent** agents, const int maxAgents)
-{
-	int n = 0;
-	for (int i = 0; i < m_maxAgents; ++i)
-	{
-		if (!m_agents[i].active) continue;
-		if (n < maxAgents)
-			agents[n++] = &m_agents[i];
-	}
-	return n;
-}
-
-
-void dtCrowd::updateMoveRequest(const float /*dt*/)
-{
-	const int PATH_MAX_AGENTS = 8;
-	dtCrowdAgent* queue[PATH_MAX_AGENTS];
-	int nqueue = 0;
-	
-	// Fire off new requests.
-	for (int i = 0; i < m_maxAgents; ++i)
-	{
-		dtCrowdAgent* ag = &m_agents[i];
-		if (!ag->active)
-			continue;
-		if (ag->state == DT_CROWDAGENT_STATE_INVALID)
-			continue;
-		if (ag->targetState == DT_CROWDAGENT_TARGET_NONE || ag->targetState == DT_CROWDAGENT_TARGET_VELOCITY)
-			continue;
-
-		if (ag->targetState == DT_CROWDAGENT_TARGET_REQUESTING)
-		{
-			const dtPolyRef* path = ag->corridor.getPath();
-			const int npath = ag->corridor.getPathCount();
-			dtAssert(npath);
-
-			static const int MAX_RES = 32;
-			float reqPos[3];
-			dtPolyRef reqPath[MAX_RES];	// The path to the request location
-			int reqPathCount = 0;
-
-			// Quick search towards the goal.
-			static const int MAX_ITER = 20;
-			m_navquery->initSlicedFindPath(path[0], ag->targetRef, ag->npos, ag->targetPos, &m_filters[ag->params.queryFilterType]);
-			m_navquery->updateSlicedFindPath(MAX_ITER, 0);
-			dtStatus status = 0;
-			if (ag->targetReplan) // && npath > 10)
-			{
-				// Try to use existing steady path during replan if possible.
-				status = m_navquery->finalizeSlicedFindPathPartial(path, npath, reqPath, &reqPathCount, MAX_RES);
-			}
-			else
-			{
-				// Try to move towards target when goal changes.
-				status = m_navquery->finalizeSlicedFindPath(reqPath, &reqPathCount, MAX_RES);
-			}
-
-			if (!dtStatusFailed(status) && reqPathCount > 0)
-			{
-				// In progress or succeed.
-				if (reqPath[reqPathCount-1] != ag->targetRef)
-				{
-					// Partial path, constrain target position inside the last polygon.
-					status = m_navquery->closestPointOnPoly(reqPath[reqPathCount-1], ag->targetPos, reqPos, 0);
-					if (dtStatusFailed(status))
-						reqPathCount = 0;
-				}
-				else
-				{
-					dtVcopy(reqPos, ag->targetPos);
-				}
-			}
-			else
-			{
-				reqPathCount = 0;
-			}
-				
-			if (!reqPathCount)
-			{
-				// Could not find path, start the request from current location.
-				dtVcopy(reqPos, ag->npos);
-				reqPath[0] = path[0];
-				reqPathCount = 1;
-			}
-
-			ag->corridor.setCorridor(reqPos, reqPath, reqPathCount);
-			ag->boundary.reset();
-			ag->partial = false;
-
-			if (reqPath[reqPathCount-1] == ag->targetRef)
-			{
-				ag->targetState = DT_CROWDAGENT_TARGET_VALID;
-				ag->targetReplanTime = 0.0;
-			}
-			else
-			{
-				// The path is longer or potentially unreachable, full plan.
-				ag->targetState = DT_CROWDAGENT_TARGET_WAITING_FOR_QUEUE;
-			}
-		}
-		
-		if (ag->targetState == DT_CROWDAGENT_TARGET_WAITING_FOR_QUEUE)
-		{
-			nqueue = addToPathQueue(ag, queue, nqueue, PATH_MAX_AGENTS);
-		}
-	}
-
-	for (int i = 0; i < nqueue; ++i)
-	{
-		dtCrowdAgent* ag = queue[i];
-		ag->targetPathqRef = m_pathq.request(ag->corridor.getLastPoly(), ag->targetRef,
-											 ag->corridor.getTarget(), ag->targetPos, &m_filters[ag->params.queryFilterType]);
-		if (ag->targetPathqRef != DT_PATHQ_INVALID)
-			ag->targetState = DT_CROWDAGENT_TARGET_WAITING_FOR_PATH;
-	}
-
-	
-	// Update requests.
-	m_pathq.update(MAX_ITERS_PER_UPDATE);
-
-	dtStatus status;
-
-	// Process path results.
-	for (int i = 0; i < m_maxAgents; ++i)
-	{
-		dtCrowdAgent* ag = &m_agents[i];
-		if (!ag->active)
-			continue;
-		if (ag->targetState == DT_CROWDAGENT_TARGET_NONE || ag->targetState == DT_CROWDAGENT_TARGET_VELOCITY)
-			continue;
-		
-		if (ag->targetState == DT_CROWDAGENT_TARGET_WAITING_FOR_PATH)
-		{
-			// Poll path queue.
-			status = m_pathq.getRequestStatus(ag->targetPathqRef);
-			if (dtStatusFailed(status))
-			{
-				// Path find failed, retry if the target location is still valid.
-				ag->targetPathqRef = DT_PATHQ_INVALID;
-				if (ag->targetRef)
-					ag->targetState = DT_CROWDAGENT_TARGET_REQUESTING;
-				else
-					ag->targetState = DT_CROWDAGENT_TARGET_FAILED;
-				ag->targetReplanTime = 0.0;
-			}
-			else if (dtStatusSucceed(status))
-			{
-				const dtPolyRef* path = ag->corridor.getPath();
-				const int npath = ag->corridor.getPathCount();
-				dtAssert(npath);
-				
-				// Apply results.
-				float targetPos[3];
-				dtVcopy(targetPos, ag->targetPos);
-				
-				dtPolyRef* res = m_pathResult;
-				bool valid = true;
-				int nres = 0;
-				status = m_pathq.getPathResult(ag->targetPathqRef, res, &nres, m_maxPathResult);
-				if (dtStatusFailed(status) || !nres)
-					valid = false;
-
-				if (dtStatusDetail(status, DT_PARTIAL_RESULT))
-					ag->partial = true;
-				else
-					ag->partial = false;
-
-				// Merge result and existing path.
-				// The agent might have moved whilst the request is
-				// being processed, so the path may have changed.
-				// We assume that the end of the path is at the same location
-				// where the request was issued.
-				
-				// The last ref in the old path should be the same as
-				// the location where the request was issued..
-				if (valid && path[npath-1] != res[0])
-					valid = false;
-				
-				if (valid)
-				{
-					// Put the old path infront of the old path.
-					if (npath > 1)
-					{
-						// Make space for the old path.
-						if ((npath-1)+nres > m_maxPathResult)
-							nres = m_maxPathResult - (npath-1);
-						
-						memmove(res+npath-1, res, sizeof(dtPolyRef)*nres);
-						// Copy old path in the beginning.
-						memcpy(res, path, sizeof(dtPolyRef)*(npath-1));
-						nres += npath-1;
-						
-						// Remove trackbacks
-						for (int j = 0; j < nres; ++j)
-						{
-							if (j-1 >= 0 && j+1 < nres)
-							{
-								if (res[j-1] == res[j+1])
-								{
-									memmove(res+(j-1), res+(j+1), sizeof(dtPolyRef)*(nres-(j+1)));
-									nres -= 2;
-									j -= 2;
-								}
-							}
-						}
-						
-					}
-					
-					// Check for partial path.
-					if (res[nres-1] != ag->targetRef)
-					{
-						// Partial path, constrain target position inside the last polygon.
-						float nearest[3];
-						status = m_navquery->closestPointOnPoly(res[nres-1], targetPos, nearest, 0);
-						if (dtStatusSucceed(status))
-							dtVcopy(targetPos, nearest);
-						else
-							valid = false;
-					}
-				}
-				
-				if (valid)
-				{
-					// Set current corridor.
-					ag->corridor.setCorridor(targetPos, res, nres);
-					// Force to update boundary.
-					ag->boundary.reset();
-					ag->targetState = DT_CROWDAGENT_TARGET_VALID;
-				}
-				else
-				{
-					// Something went wrong.
-					ag->targetState = DT_CROWDAGENT_TARGET_FAILED;
-				}
-
-				ag->targetReplanTime = 0.0;
-			}
-		}
-	}
-	
-}
-
-
-void dtCrowd::updateTopologyOptimization(dtCrowdAgent** agents, const int nagents, const float dt)
-{
-	if (!nagents)
-		return;
-	
-	const float OPT_TIME_THR = 0.5f; // seconds
-	const int OPT_MAX_AGENTS = 1;
-	dtCrowdAgent* queue[OPT_MAX_AGENTS];
-	int nqueue = 0;
-	
-	for (int i = 0; i < nagents; ++i)
-	{
-		dtCrowdAgent* ag = agents[i];
-		if (ag->state != DT_CROWDAGENT_STATE_WALKING)
-			continue;
-		if (ag->targetState == DT_CROWDAGENT_TARGET_NONE || ag->targetState == DT_CROWDAGENT_TARGET_VELOCITY)
-			continue;
-		if ((ag->params.updateFlags & DT_CROWD_OPTIMIZE_TOPO) == 0)
-			continue;
-		ag->topologyOptTime += dt;
-		if (ag->topologyOptTime >= OPT_TIME_THR)
-			nqueue = addToOptQueue(ag, queue, nqueue, OPT_MAX_AGENTS);
-	}
-
-	for (int i = 0; i < nqueue; ++i)
-	{
-		dtCrowdAgent* ag = queue[i];
-		ag->corridor.optimizePathTopology(m_navquery, &m_filters[ag->params.queryFilterType]);
-		ag->topologyOptTime = 0;
-	}
-
-}
-
-void dtCrowd::checkPathValidity(dtCrowdAgent** agents, const int nagents, const float dt)
-{
-	static const int CHECK_LOOKAHEAD = 10;
-	static const float TARGET_REPLAN_DELAY = 1.0; // seconds
-	
-	for (int i = 0; i < nagents; ++i)
-	{
-		dtCrowdAgent* ag = agents[i];
-		
-		if (ag->state != DT_CROWDAGENT_STATE_WALKING)
-			continue;
-			
-		ag->targetReplanTime += dt;
-
-		bool replan = false;
-
-		// First check that the current location is valid.
-		const int idx = getAgentIndex(ag);
-		float agentPos[3];
-		dtPolyRef agentRef = ag->corridor.getFirstPoly();
-		dtVcopy(agentPos, ag->npos);
-		if (!m_navquery->isValidPolyRef(agentRef, &m_filters[ag->params.queryFilterType]))
-		{
-			// Current location is not valid, try to reposition.
-			// TODO: this can snap agents, how to handle that?
-			float nearest[3];
-			dtVcopy(nearest, agentPos);
-			agentRef = 0;
-			m_navquery->findNearestPoly(ag->npos, m_agentPlacementHalfExtents, &m_filters[ag->params.queryFilterType], &agentRef, nearest);
-			dtVcopy(agentPos, nearest);
-
-			if (!agentRef)
-			{
-				// Could not find location in navmesh, set state to invalid.
-				ag->corridor.reset(0, agentPos);
-				ag->partial = false;
-				ag->boundary.reset();
-				ag->state = DT_CROWDAGENT_STATE_INVALID;
-				continue;
-			}
-
-			// Make sure the first polygon is valid, but leave other valid
-			// polygons in the path so that replanner can adjust the path better.
-			ag->corridor.fixPathStart(agentRef, agentPos);
-//			ag->corridor.trimInvalidPath(agentRef, agentPos, m_navquery, &m_filter);
-			ag->boundary.reset();
-			dtVcopy(ag->npos, agentPos);
-
-			replan = true;
-		}
-
-		// If the agent does not have move target or is controlled by velocity, no need to recover the target nor replan.
-		if (ag->targetState == DT_CROWDAGENT_TARGET_NONE || ag->targetState == DT_CROWDAGENT_TARGET_VELOCITY)
-			continue;
-
-		// Try to recover move request position.
-		if (ag->targetState != DT_CROWDAGENT_TARGET_NONE && ag->targetState != DT_CROWDAGENT_TARGET_FAILED)
-		{
-			if (!m_navquery->isValidPolyRef(ag->targetRef, &m_filters[ag->params.queryFilterType]))
-			{
-				// Current target is not valid, try to reposition.
-				float nearest[3];
-				dtVcopy(nearest, ag->targetPos);
-				ag->targetRef = 0;
-				m_navquery->findNearestPoly(ag->targetPos, m_agentPlacementHalfExtents, &m_filters[ag->params.queryFilterType], &ag->targetRef, nearest);
-				dtVcopy(ag->targetPos, nearest);
-				replan = true;
-			}
-			if (!ag->targetRef)
-			{
-				// Failed to reposition target, fail moverequest.
-				ag->corridor.reset(agentRef, agentPos);
-				ag->partial = false;
-				ag->targetState = DT_CROWDAGENT_TARGET_NONE;
-			}
-		}
-
-		// If nearby corridor is not valid, replan.
-		if (!ag->corridor.isValid(CHECK_LOOKAHEAD, m_navquery, &m_filters[ag->params.queryFilterType]))
-		{
-			// Fix current path.
-//			ag->corridor.trimInvalidPath(agentRef, agentPos, m_navquery, &m_filter);
-//			ag->boundary.reset();
-			replan = true;
-		}
-		
-		// If the end of the path is near and it is not the requested location, replan.
-		if (ag->targetState == DT_CROWDAGENT_TARGET_VALID)
-		{
-			if (ag->targetReplanTime > TARGET_REPLAN_DELAY &&
-				ag->corridor.getPathCount() < CHECK_LOOKAHEAD &&
-				ag->corridor.getLastPoly() != ag->targetRef)
-				replan = true;
-		}
-
-		// Try to replan path to goal.
-		if (replan)
-		{
-			if (ag->targetState != DT_CROWDAGENT_TARGET_NONE)
-			{
-				requestMoveTargetReplan(idx, ag->targetRef, ag->targetPos);
-			}
-		}
-	}
-}
-	
-void dtCrowd::update(const float dt, dtCrowdAgentDebugInfo* debug)
-{
-	m_velocitySampleCount = 0;
-	
-	const int debugIdx = debug ? debug->idx : -1;
-	
-	dtCrowdAgent** agents = m_activeAgents;
-	int nagents = getActiveAgents(agents, m_maxAgents);
-
-	// Check that all agents still have valid paths.
-	checkPathValidity(agents, nagents, dt);
-	
-	// Update async move request and path finder.
-	updateMoveRequest(dt);
-
-	// Optimize path topology.
-	updateTopologyOptimization(agents, nagents, dt);
-	
-	// Register agents to proximity grid.
-	m_grid->clear();
-	for (int i = 0; i < nagents; ++i)
-	{
-		dtCrowdAgent* ag = agents[i];
-		const float* p = ag->npos;
-		const float r = ag->params.radius;
-		m_grid->addItem((unsigned short)i, p[0]-r, p[2]-r, p[0]+r, p[2]+r);
-	}
-	
-	// Get nearby navmesh segments and agents to collide with.
-	for (int i = 0; i < nagents; ++i)
-	{
-		dtCrowdAgent* ag = agents[i];
-		if (ag->state != DT_CROWDAGENT_STATE_WALKING)
-			continue;
-
-		// Update the collision boundary after certain distance has been passed or
-		// if it has become invalid.
-		const float updateThr = ag->params.collisionQueryRange*0.25f;
-		if (dtVdist2DSqr(ag->npos, ag->boundary.getCenter()) > dtSqr(updateThr) ||
-			!ag->boundary.isValid(m_navquery, &m_filters[ag->params.queryFilterType]))
-		{
-			ag->boundary.update(ag->corridor.getFirstPoly(), ag->npos, ag->params.collisionQueryRange,
-								m_navquery, &m_filters[ag->params.queryFilterType]);
-		}
-		// Query neighbour agents
-		ag->nneis = getNeighbours(ag->npos, ag->params.height, ag->params.collisionQueryRange,
-								  ag, ag->neis, DT_CROWDAGENT_MAX_NEIGHBOURS,
-								  agents, nagents, m_grid);
-		for (int j = 0; j < ag->nneis; j++)
-			ag->neis[j].idx = getAgentIndex(agents[ag->neis[j].idx]);
-	}
-	
-	// Find next corner to steer to.
-	for (int i = 0; i < nagents; ++i)
-	{
-		dtCrowdAgent* ag = agents[i];
-		
-		if (ag->state != DT_CROWDAGENT_STATE_WALKING)
-			continue;
-		if (ag->targetState == DT_CROWDAGENT_TARGET_NONE || ag->targetState == DT_CROWDAGENT_TARGET_VELOCITY)
-			continue;
-		
-		// Find corners for steering
-		ag->ncorners = ag->corridor.findCorners(ag->cornerVerts, ag->cornerFlags, ag->cornerPolys,
-												DT_CROWDAGENT_MAX_CORNERS, m_navquery, &m_filters[ag->params.queryFilterType]);
-		
-		// Check to see if the corner after the next corner is directly visible,
-		// and short cut to there.
-		if ((ag->params.updateFlags & DT_CROWD_OPTIMIZE_VIS) && ag->ncorners > 0)
-		{
-			const float* target = &ag->cornerVerts[dtMin(1,ag->ncorners-1)*3];
-			ag->corridor.optimizePathVisibility(target, ag->params.pathOptimizationRange, m_navquery, &m_filters[ag->params.queryFilterType]);
-			
-			// Copy data for debug purposes.
-			if (debugIdx == i)
-			{
-				dtVcopy(debug->optStart, ag->corridor.getPos());
-				dtVcopy(debug->optEnd, target);
-			}
-		}
-		else
-		{
-			// Copy data for debug purposes.
-			if (debugIdx == i)
-			{
-				dtVset(debug->optStart, 0,0,0);
-				dtVset(debug->optEnd, 0,0,0);
-			}
-		}
-	}
-	
-	// Trigger off-mesh connections (depends on corners).
-	for (int i = 0; i < nagents; ++i)
-	{
-		dtCrowdAgent* ag = agents[i];
-		
-		if (ag->state != DT_CROWDAGENT_STATE_WALKING)
-			continue;
-		if (ag->targetState == DT_CROWDAGENT_TARGET_NONE || ag->targetState == DT_CROWDAGENT_TARGET_VELOCITY)
-			continue;
-		
-		// Check 
-		const float triggerRadius = ag->params.radius*2.25f;
-		if (overOffmeshConnection(ag, triggerRadius))
-		{
-			// Prepare to off-mesh connection.
-			const int idx = (int)(ag - m_agents);
-			dtCrowdAgentAnimation* anim = &m_agentAnims[idx];
-			
-			// Adjust the path over the off-mesh connection.
-			dtPolyRef refs[2];
-			if (ag->corridor.moveOverOffmeshConnection(ag->cornerPolys[ag->ncorners-1], refs,
-													   anim->startPos, anim->endPos, m_navquery))
-			{
-				dtVcopy(anim->initPos, ag->npos);
-				anim->polyRef = refs[1];
-				anim->active = true;
-				anim->t = 0.0f;
-				anim->tmax = (dtVdist2D(anim->startPos, anim->endPos) / ag->params.maxSpeed) * 0.5f;
-				
-				ag->state = DT_CROWDAGENT_STATE_OFFMESH;
-				ag->ncorners = 0;
-				ag->nneis = 0;
-				continue;
-			}
-			else
-			{
-				// Path validity check will ensure that bad/blocked connections will be replanned.
-			}
-		}
-	}
-		
-	// Calculate steering.
-	for (int i = 0; i < nagents; ++i)
-	{
-		dtCrowdAgent* ag = agents[i];
-
-		if (ag->state != DT_CROWDAGENT_STATE_WALKING)
-			continue;
-		if (ag->targetState == DT_CROWDAGENT_TARGET_NONE)
-			continue;
-		
-		float dvel[3] = {0,0,0};
-
-		if (ag->targetState == DT_CROWDAGENT_TARGET_VELOCITY)
-		{
-			dtVcopy(dvel, ag->targetPos);
-			ag->desiredSpeed = dtVlen(ag->targetPos);
-		}
-		else
-		{
-			// Calculate steering direction.
-			if (ag->params.updateFlags & DT_CROWD_ANTICIPATE_TURNS)
-				calcSmoothSteerDirection(ag, dvel);
-			else
-				calcStraightSteerDirection(ag, dvel);
-			
-			// Calculate speed scale, which tells the agent to slowdown at the end of the path.
-			const float slowDownRadius = ag->params.radius*2;	// TODO: make less hacky.
-			const float speedScale = getDistanceToGoal(ag, slowDownRadius) / slowDownRadius;
-				
-			ag->desiredSpeed = ag->params.maxSpeed;
-			dtVscale(dvel, dvel, ag->desiredSpeed * speedScale);
-		}
-
-		// Separation
-		if (ag->params.updateFlags & DT_CROWD_SEPARATION)
-		{
-			const float separationDist = ag->params.collisionQueryRange; 
-			const float invSeparationDist = 1.0f / separationDist; 
-			const float separationWeight = ag->params.separationWeight;
-			
-			float w = 0;
-			float disp[3] = {0,0,0};
-			
-			for (int j = 0; j < ag->nneis; ++j)
-			{
-				const dtCrowdAgent* nei = &m_agents[ag->neis[j].idx];
-				
-				float diff[3];
-				dtVsub(diff, ag->npos, nei->npos);
-				diff[1] = 0;
-				
-				const float distSqr = dtVlenSqr(diff);
-				if (distSqr < 0.00001f)
-					continue;
-				if (distSqr > dtSqr(separationDist))
-					continue;
-				const float dist = dtMathSqrtf(distSqr);
-				const float weight = separationWeight * (1.0f - dtSqr(dist*invSeparationDist));
-				
-				dtVmad(disp, disp, diff, weight/dist);
-				w += 1.0f;
-			}
-			
-			if (w > 0.0001f)
-			{
-				// Adjust desired velocity.
-				dtVmad(dvel, dvel, disp, 1.0f/w);
-				// Clamp desired velocity to desired speed.
-				const float speedSqr = dtVlenSqr(dvel);
-				const float desiredSqr = dtSqr(ag->desiredSpeed);
-				if (speedSqr > desiredSqr)
-					dtVscale(dvel, dvel, desiredSqr/speedSqr);
-			}
-		}
-		
-		// Set the desired velocity.
-		dtVcopy(ag->dvel, dvel);
-	}
-	
-	// Velocity planning.	
-	for (int i = 0; i < nagents; ++i)
-	{
-		dtCrowdAgent* ag = agents[i];
-		
-		if (ag->state != DT_CROWDAGENT_STATE_WALKING)
-			continue;
-		
-		if (ag->params.updateFlags & DT_CROWD_OBSTACLE_AVOIDANCE)
-		{
-			m_obstacleQuery->reset();
-			
-			// Add neighbours as obstacles.
-			for (int j = 0; j < ag->nneis; ++j)
-			{
-				const dtCrowdAgent* nei = &m_agents[ag->neis[j].idx];
-				m_obstacleQuery->addCircle(nei->npos, nei->params.radius, nei->vel, nei->dvel);
-			}
-
-			// Append neighbour segments as obstacles.
-			for (int j = 0; j < ag->boundary.getSegmentCount(); ++j)
-			{
-				const float* s = ag->boundary.getSegment(j);
-				if (dtTriArea2D(ag->npos, s, s+3) < 0.0f)
-					continue;
-				m_obstacleQuery->addSegment(s, s+3);
-			}
-
-			dtObstacleAvoidanceDebugData* vod = 0;
-			if (debugIdx == i) 
-				vod = debug->vod;
-			
-			// Sample new safe velocity.
-			bool adaptive = true;
-			int ns = 0;
-
-			const dtObstacleAvoidanceParams* params = &m_obstacleQueryParams[ag->params.obstacleAvoidanceType];
-				
-			if (adaptive)
-			{
-				ns = m_obstacleQuery->sampleVelocityAdaptive(ag->npos, ag->params.radius, ag->desiredSpeed,
-															 ag->vel, ag->dvel, ag->nvel, params, vod);
-			}
-			else
-			{
-				ns = m_obstacleQuery->sampleVelocityGrid(ag->npos, ag->params.radius, ag->desiredSpeed,
-														 ag->vel, ag->dvel, ag->nvel, params, vod);
-			}
-			m_velocitySampleCount += ns;
-		}
-		else
-		{
-			// If not using velocity planning, new velocity is directly the desired velocity.
-			dtVcopy(ag->nvel, ag->dvel);
-		}
-	}
-
-	// Integrate.
-	for (int i = 0; i < nagents; ++i)
-	{
-		dtCrowdAgent* ag = agents[i];
-		if (ag->state != DT_CROWDAGENT_STATE_WALKING)
-			continue;
-		integrate(ag, dt);
-	}
-	
-	// Handle collisions.
-	static const float COLLISION_RESOLVE_FACTOR = 0.7f;
-	
-	for (int iter = 0; iter < 4; ++iter)
-	{
-		for (int i = 0; i < nagents; ++i)
-		{
-			dtCrowdAgent* ag = agents[i];
-			const int idx0 = getAgentIndex(ag);
-			
-			if (ag->state != DT_CROWDAGENT_STATE_WALKING)
-				continue;
-
-			dtVset(ag->disp, 0,0,0);
-			
-			float w = 0;
-
-			for (int j = 0; j < ag->nneis; ++j)
-			{
-				const dtCrowdAgent* nei = &m_agents[ag->neis[j].idx];
-				const int idx1 = getAgentIndex(nei);
-
-				float diff[3];
-				dtVsub(diff, ag->npos, nei->npos);
-				diff[1] = 0;
-				
-				float dist = dtVlenSqr(diff);
-				if (dist > dtSqr(ag->params.radius + nei->params.radius))
-					continue;
-				dist = dtMathSqrtf(dist);
-				float pen = (ag->params.radius + nei->params.radius) - dist;
-				if (dist < 0.0001f)
-				{
-					// Agents on top of each other, try to choose diverging separation directions.
-					if (idx0 > idx1)
-						dtVset(diff, -ag->dvel[2],0,ag->dvel[0]);
-					else
-						dtVset(diff, ag->dvel[2],0,-ag->dvel[0]);
-					pen = 0.01f;
-				}
-				else
-				{
-					pen = (1.0f/dist) * (pen*0.5f) * COLLISION_RESOLVE_FACTOR;
-				}
-				
-				dtVmad(ag->disp, ag->disp, diff, pen);			
-				
-				w += 1.0f;
-			}
-			
-			if (w > 0.0001f)
-			{
-				const float iw = 1.0f / w;
-				dtVscale(ag->disp, ag->disp, iw);
-			}
-		}
-		
-		for (int i = 0; i < nagents; ++i)
-		{
-			dtCrowdAgent* ag = agents[i];
-			if (ag->state != DT_CROWDAGENT_STATE_WALKING)
-				continue;
-			
-			dtVadd(ag->npos, ag->npos, ag->disp);
-		}
-	}
-	
-	for (int i = 0; i < nagents; ++i)
-	{
-		dtCrowdAgent* ag = agents[i];
-		if (ag->state != DT_CROWDAGENT_STATE_WALKING)
-			continue;
-		
-		// Move along navmesh.
-		ag->corridor.movePosition(ag->npos, m_navquery, &m_filters[ag->params.queryFilterType]);
-		// Get valid constrained position back.
-		dtVcopy(ag->npos, ag->corridor.getPos());
-
-		// If not using path, truncate the corridor to just one poly.
-		if (ag->targetState == DT_CROWDAGENT_TARGET_NONE || ag->targetState == DT_CROWDAGENT_TARGET_VELOCITY)
-		{
-			ag->corridor.reset(ag->corridor.getFirstPoly(), ag->npos);
-			ag->partial = false;
-		}
-
-	}
-	
-	// Update agents using off-mesh connection.
-	for (int i = 0; i < nagents; ++i)
-	{
-		dtCrowdAgent* ag = agents[i];
-		const int idx = (int)(ag - m_agents);
-		dtCrowdAgentAnimation* anim = &m_agentAnims[idx];
-		if (!anim->active)
-			continue;
-		
-
-		anim->t += dt;
-		if (anim->t > anim->tmax)
-		{
-			// Reset animation
-			anim->active = false;
-			// Prepare agent for walking.
-			ag->state = DT_CROWDAGENT_STATE_WALKING;
-			continue;
-		}
-		
-		// Update position
-		const float ta = anim->tmax*0.15f;
-		const float tb = anim->tmax;
-		if (anim->t < ta)
-		{
-			const float u = tween(anim->t, 0.0, ta);
-			dtVlerp(ag->npos, anim->initPos, anim->startPos, u);
-		}
-		else
-		{
-			const float u = tween(anim->t, ta, tb);
-			dtVlerp(ag->npos, anim->startPos, anim->endPos, u);
-		}
-			
-		// Update velocity.
-		dtVset(ag->vel, 0,0,0);
-		dtVset(ag->dvel, 0,0,0);
-	}
-	
-}
diff --git a/extern/recastnavigation/DetourCrowd/Source/DetourLocalBoundary.cpp b/extern/recastnavigation/DetourCrowd/Source/DetourLocalBoundary.cpp
deleted file mode 100644
index 79d4322063..0000000000
--- a/extern/recastnavigation/DetourCrowd/Source/DetourLocalBoundary.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#include <float.h>
-#include <string.h>
-#include "DetourLocalBoundary.h"
-#include "DetourNavMeshQuery.h"
-#include "DetourCommon.h"
-#include "DetourAssert.h"
-
-
-dtLocalBoundary::dtLocalBoundary() :
-	m_nsegs(0),
-	m_npolys(0)
-{
-	dtVset(m_center, FLT_MAX,FLT_MAX,FLT_MAX);
-}
-
-dtLocalBoundary::~dtLocalBoundary()
-{
-}
-
-void dtLocalBoundary::reset()
-{
-	dtVset(m_center, FLT_MAX,FLT_MAX,FLT_MAX);
-	m_npolys = 0;
-	m_nsegs = 0;
-}
-
-void dtLocalBoundary::addSegment(const float dist, const float* s)
-{
-	// Insert neighbour based on the distance.
-	Segment* seg = 0;
-	if (!m_nsegs)
-	{
-		// First, trivial accept.
-		seg = &m_segs[0];
-	}
-	else if (dist >= m_segs[m_nsegs-1].d)
-	{
-		// Further than the last segment, skip.
-		if (m_nsegs >= MAX_LOCAL_SEGS)
-			return;
-		// Last, trivial accept.
-		seg = &m_segs[m_nsegs];
-	}
-	else
-	{
-		// Insert inbetween.
-		int i;
-		for (i = 0; i < m_nsegs; ++i)
-			if (dist <= m_segs[i].d)
-				break;
-		const int tgt = i+1;
-		const int n = dtMin(m_nsegs-i, MAX_LOCAL_SEGS-tgt);
-		dtAssert(tgt+n <= MAX_LOCAL_SEGS);
-		if (n > 0)
-			memmove(&m_segs[tgt], &m_segs[i], sizeof(Segment)*n);
-		seg = &m_segs[i];
-	}
-	
-	seg->d = dist;
-	memcpy(seg->s, s, sizeof(float)*6);
-	
-	if (m_nsegs < MAX_LOCAL_SEGS)
-		m_nsegs++;
-}
-
-void dtLocalBoundary::update(dtPolyRef ref, const float* pos, const float collisionQueryRange,
-							 dtNavMeshQuery* navquery, const dtQueryFilter* filter)
-{
-	static const int MAX_SEGS_PER_POLY = DT_VERTS_PER_POLYGON*3;
-	
-	if (!ref)
-	{
-		dtVset(m_center, FLT_MAX,FLT_MAX,FLT_MAX);
-		m_nsegs = 0;
-		m_npolys = 0;
-		return;
-	}
-	
-	dtVcopy(m_center, pos);
-	
-	// First query non-overlapping polygons.
-	navquery->findLocalNeighbourhood(ref, pos, collisionQueryRange,
-									 filter, m_polys, 0, &m_npolys, MAX_LOCAL_POLYS);
-	
-	// Secondly, store all polygon edges.
-	m_nsegs = 0;
-	float segs[MAX_SEGS_PER_POLY*6];
-	int nsegs = 0;
-	for (int j = 0; j < m_npolys; ++j)
-	{
-		navquery->getPolyWallSegments(m_polys[j], filter, segs, 0, &nsegs, MAX_SEGS_PER_POLY);
-		for (int k = 0; k < nsegs; ++k)
-		{
-			const float* s = &segs[k*6];
-			// Skip too distant segments.
-			float tseg;
-			const float distSqr = dtDistancePtSegSqr2D(pos, s, s+3, tseg);
-			if (distSqr > dtSqr(collisionQueryRange))
-				continue;
-			addSegment(distSqr, s);
-		}
-	}
-}
-
-bool dtLocalBoundary::isValid(dtNavMeshQuery* navquery, const dtQueryFilter* filter)
-{
-	if (!m_npolys)
-		return false;
-	
-	// Check that all polygons still pass query filter.
-	for (int i = 0; i < m_npolys; ++i)
-	{
-		if (!navquery->isValidPolyRef(m_polys[i], filter))
-			return false;
-	}
-	
-	return true;
-}
-
diff --git a/extern/recastnavigation/DetourCrowd/Source/DetourObstacleAvoidance.cpp b/extern/recastnavigation/DetourCrowd/Source/DetourObstacleAvoidance.cpp
deleted file mode 100644
index 94f7df6ad0..0000000000
--- a/extern/recastnavigation/DetourCrowd/Source/DetourObstacleAvoidance.cpp
+++ /dev/null
@@ -1,619 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#include "DetourObstacleAvoidance.h"
-#include "DetourCommon.h"
-#include "DetourMath.h"
-#include "DetourAlloc.h"
-#include "DetourAssert.h"
-#include <string.h>
-#include <float.h>
-#include <new>
-
-static const float DT_PI = 3.14159265f;
-
-static int sweepCircleCircle(const float* c0, const float r0, const float* v,
-							 const float* c1, const float r1,
-							 float& tmin, float& tmax)
-{
-	static const float EPS = 0.0001f;
-	float s[3];
-	dtVsub(s,c1,c0);
-	float r = r0+r1;
-	float c = dtVdot2D(s,s) - r*r;
-	float a = dtVdot2D(v,v);
-	if (a < EPS) return 0;	// not moving
-	
-	// Overlap, calc time to exit.
-	float b = dtVdot2D(v,s);
-	float d = b*b - a*c;
-	if (d < 0.0f) return 0; // no intersection.
-	a = 1.0f / a;
-	const float rd = dtMathSqrtf(d);
-	tmin = (b - rd) * a;
-	tmax = (b + rd) * a;
-	return 1;
-}
-
-static int isectRaySeg(const float* ap, const float* u,
-					   const float* bp, const float* bq,
-					   float& t)
-{
-	float v[3], w[3];
-	dtVsub(v,bq,bp);
-	dtVsub(w,ap,bp);
-	float d = dtVperp2D(u,v);
-	if (dtMathFabsf(d) < 1e-6f) return 0;
-	d = 1.0f/d;
-	t = dtVperp2D(v,w) * d;
-	if (t < 0 || t > 1) return 0;
-	float s = dtVperp2D(u,w) * d;
-	if (s < 0 || s > 1) return 0;
-	return 1;
-}
-
-
-
-dtObstacleAvoidanceDebugData* dtAllocObstacleAvoidanceDebugData()
-{
-	void* mem = dtAlloc(sizeof(dtObstacleAvoidanceDebugData), DT_ALLOC_PERM);
-	if (!mem) return 0;
-	return new(mem) dtObstacleAvoidanceDebugData;
-}
-
-void dtFreeObstacleAvoidanceDebugData(dtObstacleAvoidanceDebugData* ptr)
-{
-	if (!ptr) return;
-	ptr->~dtObstacleAvoidanceDebugData();
-	dtFree(ptr);
-}
-
-
-dtObstacleAvoidanceDebugData::dtObstacleAvoidanceDebugData() :
-	m_nsamples(0),
-	m_maxSamples(0),
-	m_vel(0),
-	m_ssize(0),
-	m_pen(0),
-	m_vpen(0),
-	m_vcpen(0),
-	m_spen(0),
-	m_tpen(0)
-{
-}
-
-dtObstacleAvoidanceDebugData::~dtObstacleAvoidanceDebugData()
-{
-	dtFree(m_vel);
-	dtFree(m_ssize);
-	dtFree(m_pen);
-	dtFree(m_vpen);
-	dtFree(m_vcpen);
-	dtFree(m_spen);
-	dtFree(m_tpen);
-}
-		
-bool dtObstacleAvoidanceDebugData::init(const int maxSamples)
-{
-	dtAssert(maxSamples);
-	m_maxSamples = maxSamples;
-
-	m_vel = (float*)dtAlloc(sizeof(float)*3*m_maxSamples, DT_ALLOC_PERM);
-	if (!m_vel)
-		return false;
-	m_pen = (float*)dtAlloc(sizeof(float)*m_maxSamples, DT_ALLOC_PERM);
-	if (!m_pen)
-		return false;
-	m_ssize = (float*)dtAlloc(sizeof(float)*m_maxSamples, DT_ALLOC_PERM);
-	if (!m_ssize)
-		return false;
-	m_vpen = (float*)dtAlloc(sizeof(float)*m_maxSamples, DT_ALLOC_PERM);
-	if (!m_vpen)
-		return false;
-	m_vcpen = (float*)dtAlloc(sizeof(float)*m_maxSamples, DT_ALLOC_PERM);
-	if (!m_vcpen)
-		return false;
-	m_spen = (float*)dtAlloc(sizeof(float)*m_maxSamples, DT_ALLOC_PERM);
-	if (!m_spen)
-		return false;
-	m_tpen = (float*)dtAlloc(sizeof(float)*m_maxSamples, DT_ALLOC_PERM);
-	if (!m_tpen)
-		return false;
-	
-	return true;
-}
-
-void dtObstacleAvoidanceDebugData::reset()
-{
-	m_nsamples = 0;
-}
-
-void dtObstacleAvoidanceDebugData::addSample(const float* vel, const float ssize, const float pen,
-											 const float vpen, const float vcpen, const float spen, const float tpen)
-{
-	if (m_nsamples >= m_maxSamples)
-		return;
-	dtAssert(m_vel);
-	dtAssert(m_ssize);
-	dtAssert(m_pen);
-	dtAssert(m_vpen);
-	dtAssert(m_vcpen);
-	dtAssert(m_spen);
-	dtAssert(m_tpen);
-	dtVcopy(&m_vel[m_nsamples*3], vel);
-	m_ssize[m_nsamples] = ssize;
-	m_pen[m_nsamples] = pen;
-	m_vpen[m_nsamples] = vpen;
-	m_vcpen[m_nsamples] = vcpen;
-	m_spen[m_nsamples] = spen;
-	m_tpen[m_nsamples] = tpen;
-	m_nsamples++;
-}
-
-static void normalizeArray(float* arr, const int n)
-{
-	// Normalize penaly range.
-	float minPen = FLT_MAX;
-	float maxPen = -FLT_MAX;
-	for (int i = 0; i < n; ++i)
-	{
-		minPen = dtMin(minPen, arr[i]);
-		maxPen = dtMax(maxPen, arr[i]);
-	}
-	const float penRange = maxPen-minPen;
-	const float s = penRange > 0.001f ? (1.0f / penRange) : 1;
-	for (int i = 0; i < n; ++i)
-		arr[i] = dtClamp((arr[i]-minPen)*s, 0.0f, 1.0f);
-}
-
-void dtObstacleAvoidanceDebugData::normalizeSamples()
-{
-	normalizeArray(m_pen, m_nsamples);
-	normalizeArray(m_vpen, m_nsamples);
-	normalizeArray(m_vcpen, m_nsamples);
-	normalizeArray(m_spen, m_nsamples);
-	normalizeArray(m_tpen, m_nsamples);
-}
-
-
-dtObstacleAvoidanceQuery* dtAllocObstacleAvoidanceQuery()
-{
-	void* mem = dtAlloc(sizeof(dtObstacleAvoidanceQuery), DT_ALLOC_PERM);
-	if (!mem) return 0;
-	return new(mem) dtObstacleAvoidanceQuery;
-}
-
-void dtFreeObstacleAvoidanceQuery(dtObstacleAvoidanceQuery* ptr)
-{
-	if (!ptr) return;
-	ptr->~dtObstacleAvoidanceQuery();
-	dtFree(ptr);
-}
-
-
-dtObstacleAvoidanceQuery::dtObstacleAvoidanceQuery() :
-	m_invHorizTime(0),
-	m_vmax(0),
-	m_invVmax(0),
-	m_maxCircles(0),
-	m_circles(0),
-	m_ncircles(0),
-	m_maxSegments(0),
-	m_segments(0),
-	m_nsegments(0)
-{
-}
-
-dtObstacleAvoidanceQuery::~dtObstacleAvoidanceQuery()
-{
-	dtFree(m_circles);
-	dtFree(m_segments);
-}
-
-bool dtObstacleAvoidanceQuery::init(const int maxCircles, const int maxSegments)
-{
-	m_maxCircles = maxCircles;
-	m_ncircles = 0;
-	m_circles = (dtObstacleCircle*)dtAlloc(sizeof(dtObstacleCircle)*m_maxCircles, DT_ALLOC_PERM);
-	if (!m_circles)
-		return false;
-	memset(m_circles, 0, sizeof(dtObstacleCircle)*m_maxCircles);
-
-	m_maxSegments = maxSegments;
-	m_nsegments = 0;
-	m_segments = (dtObstacleSegment*)dtAlloc(sizeof(dtObstacleSegment)*m_maxSegments, DT_ALLOC_PERM);
-	if (!m_segments)
-		return false;
-	memset(m_segments, 0, sizeof(dtObstacleSegment)*m_maxSegments);
-	
-	return true;
-}
-
-void dtObstacleAvoidanceQuery::reset()
-{
-	m_ncircles = 0;
-	m_nsegments = 0;
-}
-
-void dtObstacleAvoidanceQuery::addCircle(const float* pos, const float rad,
-										 const float* vel, const float* dvel)
-{
-	if (m_ncircles >= m_maxCircles)
-		return;
-		
-	dtObstacleCircle* cir = &m_circles[m_ncircles++];
-	dtVcopy(cir->p, pos);
-	cir->rad = rad;
-	dtVcopy(cir->vel, vel);
-	dtVcopy(cir->dvel, dvel);
-}
-
-void dtObstacleAvoidanceQuery::addSegment(const float* p, const float* q)
-{
-	if (m_nsegments >= m_maxSegments)
-		return;
-	
-	dtObstacleSegment* seg = &m_segments[m_nsegments++];
-	dtVcopy(seg->p, p);
-	dtVcopy(seg->q, q);
-}
-
-void dtObstacleAvoidanceQuery::prepare(const float* pos, const float* dvel)
-{
-	// Prepare obstacles
-	for (int i = 0; i < m_ncircles; ++i)
-	{
-		dtObstacleCircle* cir = &m_circles[i];
-		
-		// Side
-		const float* pa = pos;
-		const float* pb = cir->p;
-		
-		const float orig[3] = {0,0,0};
-		float dv[3];
-		dtVsub(cir->dp,pb,pa);
-		dtVnormalize(cir->dp);
-		dtVsub(dv, cir->dvel, dvel);
-		
-		const float a = dtTriArea2D(orig, cir->dp,dv);
-		if (a < 0.01f)
-		{
-			cir->np[0] = -cir->dp[2];
-			cir->np[2] = cir->dp[0];
-		}
-		else
-		{
-			cir->np[0] = cir->dp[2];
-			cir->np[2] = -cir->dp[0];
-		}
-	}	
-
-	for (int i = 0; i < m_nsegments; ++i)
-	{
-		dtObstacleSegment* seg = &m_segments[i];
-		
-		// Precalc if the agent is really close to the segment.
-		const float r = 0.01f;
-		float t;
-		seg->touch = dtDistancePtSegSqr2D(pos, seg->p, seg->q, t) < dtSqr(r);
-	}	
-}
-
-
-/* Calculate the collision penalty for a given velocity vector
- * 
- * @param vcand sampled velocity
- * @param dvel desired velocity
- * @param minPenalty threshold penalty for early out
- */
-float dtObstacleAvoidanceQuery::processSample(const float* vcand, const float cs,
-											  const float* pos, const float rad,
-											  const float* vel, const float* dvel,
-											  const float minPenalty,
-											  dtObstacleAvoidanceDebugData* debug)
-{
-	// penalty for straying away from the desired and current velocities
-	const float vpen = m_params.weightDesVel * (dtVdist2D(vcand, dvel) * m_invVmax);
-	const float vcpen = m_params.weightCurVel * (dtVdist2D(vcand, vel) * m_invVmax);
-
-	// find the threshold hit time to bail out based on the early out penalty
-	// (see how the penalty is calculated below to understnad)
-	float minPen = minPenalty - vpen - vcpen;
-	float tThresold = (m_params.weightToi / minPen - 0.1f) * m_params.horizTime;
-	if (tThresold - m_params.horizTime > -FLT_EPSILON)
-		return minPenalty; // already too much
-
-	// Find min time of impact and exit amongst all obstacles.
-	float tmin = m_params.horizTime;
-	float side = 0;
-	int nside = 0;
-	
-	for (int i = 0; i < m_ncircles; ++i)
-	{
-		const dtObstacleCircle* cir = &m_circles[i];
-			
-		// RVO
-		float vab[3];
-		dtVscale(vab, vcand, 2);
-		dtVsub(vab, vab, vel);
-		dtVsub(vab, vab, cir->vel);
-		
-		// Side
-		side += dtClamp(dtMin(dtVdot2D(cir->dp,vab)*0.5f+0.5f, dtVdot2D(cir->np,vab)*2), 0.0f, 1.0f);
-		nside++;
-		
-		float htmin = 0, htmax = 0;
-		if (!sweepCircleCircle(pos,rad, vab, cir->p,cir->rad, htmin, htmax))
-			continue;
-		
-		// Handle overlapping obstacles.
-		if (htmin < 0.0f && htmax > 0.0f)
-		{
-			// Avoid more when overlapped.
-			htmin = -htmin * 0.5f;
-		}
-		
-		if (htmin >= 0.0f)
-		{
-			// The closest obstacle is somewhere ahead of us, keep track of nearest obstacle.
-			if (htmin < tmin)
-			{
-				tmin = htmin;
-				if (tmin < tThresold)
-					return minPenalty;
-			}
-		}
-	}
-
-	for (int i = 0; i < m_nsegments; ++i)
-	{
-		const dtObstacleSegment* seg = &m_segments[i];
-		float htmin = 0;
-		
-		if (seg->touch)
-		{
-			// Special case when the agent is very close to the segment.
-			float sdir[3], snorm[3];
-			dtVsub(sdir, seg->q, seg->p);
-			snorm[0] = -sdir[2];
-			snorm[2] = sdir[0];
-			// If the velocity is pointing towards the segment, no collision.
-			if (dtVdot2D(snorm, vcand) < 0.0f)
-				continue;
-			// Else immediate collision.
-			htmin = 0.0f;
-		}
-		else
-		{
-			if (!isectRaySeg(pos, vcand, seg->p, seg->q, htmin))
-				continue;
-		}
-		
-		// Avoid less when facing walls.
-		htmin *= 2.0f;
-		
-		// The closest obstacle is somewhere ahead of us, keep track of nearest obstacle.
-		if (htmin < tmin)
-		{
-			tmin = htmin;
-			if (tmin < tThresold)
-				return minPenalty;
-		}
-	}
-	
-	// Normalize side bias, to prevent it dominating too much.
-	if (nside)
-		side /= nside;
-	
-	const float spen = m_params.weightSide * side;
-	const float tpen = m_params.weightToi * (1.0f/(0.1f+tmin*m_invHorizTime));
-	
-	const float penalty = vpen + vcpen + spen + tpen;
-	
-	// Store different penalties for debug viewing
-	if (debug)
-		debug->addSample(vcand, cs, penalty, vpen, vcpen, spen, tpen);
-	
-	return penalty;
-}
-
-int dtObstacleAvoidanceQuery::sampleVelocityGrid(const float* pos, const float rad, const float vmax,
-												 const float* vel, const float* dvel, float* nvel,
-												 const dtObstacleAvoidanceParams* params,
-												 dtObstacleAvoidanceDebugData* debug)
-{
-	prepare(pos, dvel);
-	
-	memcpy(&m_params, params, sizeof(dtObstacleAvoidanceParams));
-	m_invHorizTime = 1.0f / m_params.horizTime;
-	m_vmax = vmax;
-	m_invVmax = vmax > 0 ? 1.0f / vmax : FLT_MAX;
-	
-	dtVset(nvel, 0,0,0);
-	
-	if (debug)
-		debug->reset();
-
-	const float cvx = dvel[0] * m_params.velBias;
-	const float cvz = dvel[2] * m_params.velBias;
-	const float cs = vmax * 2 * (1 - m_params.velBias) / (float)(m_params.gridSize-1);
-	const float half = (m_params.gridSize-1)*cs*0.5f;
-		
-	float minPenalty = FLT_MAX;
-	int ns = 0;
-		
-	for (int y = 0; y < m_params.gridSize; ++y)
-	{
-		for (int x = 0; x < m_params.gridSize; ++x)
-		{
-			float vcand[3];
-			vcand[0] = cvx + x*cs - half;
-			vcand[1] = 0;
-			vcand[2] = cvz + y*cs - half;
-			
-			if (dtSqr(vcand[0])+dtSqr(vcand[2]) > dtSqr(vmax+cs/2)) continue;
-			
-			const float penalty = processSample(vcand, cs, pos,rad,vel,dvel, minPenalty, debug);
-			ns++;
-			if (penalty < minPenalty)
-			{
-				minPenalty = penalty;
-				dtVcopy(nvel, vcand);
-			}
-		}
-	}
-	
-	return ns;
-}
-
-
-// vector normalization that ignores the y-component.
-inline void dtNormalize2D(float* v)
-{
-	float d = dtMathSqrtf(v[0] * v[0] + v[2] * v[2]);
-	if (d==0)
-		return;
-	d = 1.0f / d;
-	v[0] *= d;
-	v[2] *= d;
-}
-
-// vector normalization that ignores the y-component.
-inline void dtRorate2D(float* dest, const float* v, float ang)
-{
-	float c = cosf(ang);
-	float s = sinf(ang);
-	dest[0] = v[0]*c - v[2]*s;
-	dest[2] = v[0]*s + v[2]*c;
-	dest[1] = v[1];
-}
-
-
-int dtObstacleAvoidanceQuery::sampleVelocityAdaptive(const float* pos, const float rad, const float vmax,
-													 const float* vel, const float* dvel, float* nvel,
-													 const dtObstacleAvoidanceParams* params,
-													 dtObstacleAvoidanceDebugData* debug)
-{
-	prepare(pos, dvel);
-	
-	memcpy(&m_params, params, sizeof(dtObstacleAvoidanceParams));
-	m_invHorizTime = 1.0f / m_params.horizTime;
-	m_vmax = vmax;
-	m_invVmax = vmax > 0 ? 1.0f / vmax : FLT_MAX;
-	
-	dtVset(nvel, 0,0,0);
-	
-	if (debug)
-		debug->reset();
-
-	// Build sampling pattern aligned to desired velocity.
-	float pat[(DT_MAX_PATTERN_DIVS*DT_MAX_PATTERN_RINGS+1)*2];
-	int npat = 0;
-
-	const int ndivs = (int)m_params.adaptiveDivs;
-	const int nrings= (int)m_params.adaptiveRings;
-	const int depth = (int)m_params.adaptiveDepth;
-	
-	const int nd = dtClamp(ndivs, 1, DT_MAX_PATTERN_DIVS);
-	const int nr = dtClamp(nrings, 1, DT_MAX_PATTERN_RINGS);
-	const float da = (1.0f/nd) * DT_PI*2;
-	const float ca = cosf(da);
-	const float sa = sinf(da);
-
-	// desired direction
-	float ddir[6];
-	dtVcopy(ddir, dvel);
-	dtNormalize2D(ddir);
-	dtRorate2D (ddir+3, ddir, da*0.5f); // rotated by da/2
-
-	// Always add sample at zero
-	pat[npat*2+0] = 0;
-	pat[npat*2+1] = 0;
-	npat++;
-	
-	for (int j = 0; j < nr; ++j)
-	{
-		const float r = (float)(nr-j)/(float)nr;
-		pat[npat*2+0] = ddir[(j%2)*3] * r;
-		pat[npat*2+1] = ddir[(j%2)*3+2] * r;
-		float* last1 = pat + npat*2;
-		float* last2 = last1;
-		npat++;
-
-		for (int i = 1; i < nd-1; i+=2)
-		{
-			// get next point on the "right" (rotate CW)
-			pat[npat*2+0] = last1[0]*ca + last1[1]*sa;
-			pat[npat*2+1] = -last1[0]*sa + last1[1]*ca;
-			// get next point on the "left" (rotate CCW)
-			pat[npat*2+2] = last2[0]*ca - last2[1]*sa;
-			pat[npat*2+3] = last2[0]*sa + last2[1]*ca;
-
-			last1 = pat + npat*2;
-			last2 = last1 + 2;
-			npat += 2;
-		}
-
-		if ((nd&1) == 0)
-		{
-			pat[npat*2+2] = last2[0]*ca - last2[1]*sa;
-			pat[npat*2+3] = last2[0]*sa + last2[1]*ca;
-			npat++;
-		}
-	}
-
-
-	// Start sampling.
-	float cr = vmax * (1.0f - m_params.velBias);
-	float res[3];
-	dtVset(res, dvel[0] * m_params.velBias, 0, dvel[2] * m_params.velBias);
-	int ns = 0;
-
-	for (int k = 0; k < depth; ++k)
-	{
-		float minPenalty = FLT_MAX;
-		float bvel[3];
-		dtVset(bvel, 0,0,0);
-		
-		for (int i = 0; i < npat; ++i)
-		{
-			float vcand[3];
-			vcand[0] = res[0] + pat[i*2+0]*cr;
-			vcand[1] = 0;
-			vcand[2] = res[2] + pat[i*2+1]*cr;
-			
-			if (dtSqr(vcand[0])+dtSqr(vcand[2]) > dtSqr(vmax+0.001f)) continue;
-			
-			const float penalty = processSample(vcand,cr/10, pos,rad,vel,dvel, minPenalty, debug);
-			ns++;
-			if (penalty < minPenalty)
-			{
-				minPenalty = penalty;
-				dtVcopy(bvel, vcand);
-			}
-		}
-
-		dtVcopy(res, bvel);
-
-		cr *= 0.5f;
-	}	
-	
-	dtVcopy(nvel, res);
-	
-	return ns;
-}
diff --git a/extern/recastnavigation/DetourCrowd/Source/DetourPathCorridor.cpp b/extern/recastnavigation/DetourCrowd/Source/DetourPathCorridor.cpp
deleted file mode 100644
index e54d4637d5..0000000000
--- a/extern/recastnavigation/DetourCrowd/Source/DetourPathCorridor.cpp
+++ /dev/null
@@ -1,597 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#include <string.h>
-#include "DetourPathCorridor.h"
-#include "DetourNavMeshQuery.h"
-#include "DetourCommon.h"
-#include "DetourAssert.h"
-#include "DetourAlloc.h"
-
-
-int dtMergeCorridorStartMoved(dtPolyRef* path, const int npath, const int maxPath,
-							  const dtPolyRef* visited, const int nvisited)
-{
-	int furthestPath = -1;
-	int furthestVisited = -1;
-	
-	// Find furthest common polygon.
-	for (int i = npath-1; i >= 0; --i)
-	{
-		bool found = false;
-		for (int j = nvisited-1; j >= 0; --j)
-		{
-			if (path[i] == visited[j])
-			{
-				furthestPath = i;
-				furthestVisited = j;
-				found = true;
-			}
-		}
-		if (found)
-			break;
-	}
-	
-	// If no intersection found just return current path. 
-	if (furthestPath == -1 || furthestVisited == -1)
-		return npath;
-	
-	// Concatenate paths.	
-	
-	// Adjust beginning of the buffer to include the visited.
-	const int req = nvisited - furthestVisited;
-	const int orig = dtMin(furthestPath+1, npath);
-	int size = dtMax(0, npath-orig);
-	if (req+size > maxPath)
-		size = maxPath-req;
-	if (size)
-		memmove(path+req, path+orig, size*sizeof(dtPolyRef));
-	
-	// Store visited
-	for (int i = 0; i < req; ++i)
-		path[i] = visited[(nvisited-1)-i];				
-	
-	return req+size;
-}
-
-int dtMergeCorridorEndMoved(dtPolyRef* path, const int npath, const int maxPath,
-							const dtPolyRef* visited, const int nvisited)
-{
-	int furthestPath = -1;
-	int furthestVisited = -1;
-	
-	// Find furthest common polygon.
-	for (int i = 0; i < npath; ++i)
-	{
-		bool found = false;
-		for (int j = nvisited-1; j >= 0; --j)
-		{
-			if (path[i] == visited[j])
-			{
-				furthestPath = i;
-				furthestVisited = j;
-				found = true;
-			}
-		}
-		if (found)
-			break;
-	}
-	
-	// If no intersection found just return current path. 
-	if (furthestPath == -1 || furthestVisited == -1)
-		return npath;
-	
-	// Concatenate paths.
-	const int ppos = furthestPath+1;
-	const int vpos = furthestVisited+1;
-	const int count = dtMin(nvisited-vpos, maxPath-ppos);
-	dtAssert(ppos+count <= maxPath);
-	if (count)
-		memcpy(path+ppos, visited+vpos, sizeof(dtPolyRef)*count);
-	
-	return ppos+count;
-}
-
-int dtMergeCorridorStartShortcut(dtPolyRef* path, const int npath, const int maxPath,
-								 const dtPolyRef* visited, const int nvisited)
-{
-	int furthestPath = -1;
-	int furthestVisited = -1;
-	
-	// Find furthest common polygon.
-	for (int i = npath-1; i >= 0; --i)
-	{
-		bool found = false;
-		for (int j = nvisited-1; j >= 0; --j)
-		{
-			if (path[i] == visited[j])
-			{
-				furthestPath = i;
-				furthestVisited = j;
-				found = true;
-			}
-		}
-		if (found)
-			break;
-	}
-	
-	// If no intersection found just return current path. 
-	if (furthestPath == -1 || furthestVisited == -1)
-		return npath;
-	
-	// Concatenate paths.	
-	
-	// Adjust beginning of the buffer to include the visited.
-	const int req = furthestVisited;
-	if (req <= 0)
-		return npath;
-	
-	const int orig = furthestPath;
-	int size = dtMax(0, npath-orig);
-	if (req+size > maxPath)
-		size = maxPath-req;
-	if (size)
-		memmove(path+req, path+orig, size*sizeof(dtPolyRef));
-	
-	// Store visited
-	for (int i = 0; i < req; ++i)
-		path[i] = visited[i];
-	
-	return req+size;
-}
-
-/**
-@class dtPathCorridor
-@par
-
-The corridor is loaded with a path, usually obtained from a #dtNavMeshQuery::findPath() query. The corridor
-is then used to plan local movement, with the corridor automatically updating as needed to deal with inaccurate 
-agent locomotion.
-
-Example of a common use case:
-
--# Construct the corridor object and call #init() to allocate its path buffer.
--# Obtain a path from a #dtNavMeshQuery object.
--# Use #reset() to set the agent's current position. (At the beginning of the path.)
--# Use #setCorridor() to load the path and target.
--# Use #findCorners() to plan movement. (This handles dynamic path straightening.)
--# Use #movePosition() to feed agent movement back into the corridor. (The corridor will automatically adjust as needed.)
--# If the target is moving, use #moveTargetPosition() to update the end of the corridor. 
-   (The corridor will automatically adjust as needed.)
--# Repeat the previous 3 steps to continue to move the agent.
-
-The corridor position and target are always constrained to the navigation mesh.
-
-One of the difficulties in maintaining a path is that floating point errors, locomotion inaccuracies, and/or local 
-steering can result in the agent crossing the boundary of the path corridor, temporarily invalidating the path. 
-This class uses local mesh queries to detect and update the corridor as needed to handle these types of issues. 
-
-The fact that local mesh queries are used to move the position and target locations results in two beahviors that 
-need to be considered:
-
-Every time a move function is used there is a chance that the path will become non-optimial. Basically, the further 
-the target is moved from its original location, and the further the position is moved outside the original corridor, 
-the more likely the path will become non-optimal. This issue can be addressed by periodically running the 
-#optimizePathTopology() and #optimizePathVisibility() methods.
-
-All local mesh queries have distance limitations. (Review the #dtNavMeshQuery methods for details.) So the most accurate 
-use case is to move the position and target in small increments. If a large increment is used, then the corridor 
-may not be able to accurately find the new location.  Because of this limiation, if a position is moved in a large
-increment, then compare the desired and resulting polygon references. If the two do not match, then path replanning 
-may be needed.  E.g. If you move the target, check #getLastPoly() to see if it is the expected polygon.
-
-*/
-
-dtPathCorridor::dtPathCorridor() :
-	m_path(0),
-	m_npath(0),
-	m_maxPath(0)
-{
-}
-
-dtPathCorridor::~dtPathCorridor()
-{
-	dtFree(m_path);
-}
-
-/// @par
-///
-/// @warning Cannot be called more than once.
-bool dtPathCorridor::init(const int maxPath)
-{
-	dtAssert(!m_path);
-	m_path = (dtPolyRef*)dtAlloc(sizeof(dtPolyRef)*maxPath, DT_ALLOC_PERM);
-	if (!m_path)
-		return false;
-	m_npath = 0;
-	m_maxPath = maxPath;
-	return true;
-}
-
-/// @par
-///
-/// Essentially, the corridor is set of one polygon in size with the target
-/// equal to the position.
-void dtPathCorridor::reset(dtPolyRef ref, const float* pos)
-{
-	dtAssert(m_path);
-	dtVcopy(m_pos, pos);
-	dtVcopy(m_target, pos);
-	m_path[0] = ref;
-	m_npath = 1;
-}
-
-/**
-@par
-
-This is the function used to plan local movement within the corridor. One or more corners can be 
-detected in order to plan movement. It performs essentially the same function as #dtNavMeshQuery::findStraightPath.
-
-Due to internal optimizations, the maximum number of corners returned will be (@p maxCorners - 1) 
-For example: If the buffers are sized to hold 10 corners, the function will never return more than 9 corners. 
-So if 10 corners are needed, the buffers should be sized for 11 corners.
-
-If the target is within range, it will be the last corner and have a polygon reference id of zero.
-*/
-int dtPathCorridor::findCorners(float* cornerVerts, unsigned char* cornerFlags,
-							  dtPolyRef* cornerPolys, const int maxCorners,
-							  dtNavMeshQuery* navquery, const dtQueryFilter* /*filter*/)
-{
-	dtAssert(m_path);
-	dtAssert(m_npath);
-	
-	static const float MIN_TARGET_DIST = 0.01f;
-	
-	int ncorners = 0;
-	navquery->findStraightPath(m_pos, m_target, m_path, m_npath,
-							   cornerVerts, cornerFlags, cornerPolys, &ncorners, maxCorners);
-	
-	// Prune points in the beginning of the path which are too close.
-	while (ncorners)
-	{
-		if ((cornerFlags[0] & DT_STRAIGHTPATH_OFFMESH_CONNECTION) ||
-			dtVdist2DSqr(&cornerVerts[0], m_pos) > dtSqr(MIN_TARGET_DIST))
-			break;
-		ncorners--;
-		if (ncorners)
-		{
-			memmove(cornerFlags, cornerFlags+1, sizeof(unsigned char)*ncorners);
-			memmove(cornerPolys, cornerPolys+1, sizeof(dtPolyRef)*ncorners);
-			memmove(cornerVerts, cornerVerts+3, sizeof(float)*3*ncorners);
-		}
-	}
-	
-	// Prune points after an off-mesh connection.
-	for (int i = 0; i < ncorners; ++i)
-	{
-		if (cornerFlags[i] & DT_STRAIGHTPATH_OFFMESH_CONNECTION)
-		{
-			ncorners = i+1;
-			break;
-		}
-	}
-	
-	return ncorners;
-}
-
-/** 
-@par
-
-Inaccurate locomotion or dynamic obstacle avoidance can force the argent position significantly outside the 
-original corridor. Over time this can result in the formation of a non-optimal corridor. Non-optimal paths can 
-also form near the corners of tiles.
-
-This function uses an efficient local visibility search to try to optimize the corridor 
-between the current position and @p next.
-
-The corridor will change only if @p next is visible from the current position and moving directly toward the point 
-is better than following the existing path.
-
-The more inaccurate the agent movement, the more beneficial this function becomes. Simply adjust the frequency 
-of the call to match the needs to the agent.
-
-This function is not suitable for long distance searches.
-*/
-void dtPathCorridor::optimizePathVisibility(const float* next, const float pathOptimizationRange,
-										  dtNavMeshQuery* navquery, const dtQueryFilter* filter)
-{
-	dtAssert(m_path);
-	
-	// Clamp the ray to max distance.
-	float goal[3];
-	dtVcopy(goal, next);
-	float dist = dtVdist2D(m_pos, goal);
-	
-	// If too close to the goal, do not try to optimize.
-	if (dist < 0.01f)
-		return;
-	
-	// Overshoot a little. This helps to optimize open fields in tiled meshes.
-	dist = dtMin(dist+0.01f, pathOptimizationRange);
-	
-	// Adjust ray length.
-	float delta[3];
-	dtVsub(delta, goal, m_pos);
-	dtVmad(goal, m_pos, delta, pathOptimizationRange/dist);
-	
-	static const int MAX_RES = 32;
-	dtPolyRef res[MAX_RES];
-	float t, norm[3];
-	int nres = 0;
-	navquery->raycast(m_path[0], m_pos, goal, filter, &t, norm, res, &nres, MAX_RES);
-	if (nres > 1 && t > 0.99f)
-	{
-		m_npath = dtMergeCorridorStartShortcut(m_path, m_npath, m_maxPath, res, nres);
-	}
-}
-
-/**
-@par
-
-Inaccurate locomotion or dynamic obstacle avoidance can force the agent position significantly outside the 
-original corridor. Over time this can result in the formation of a non-optimal corridor. This function will use a 
-local area path search to try to re-optimize the corridor.
-
-The more inaccurate the agent movement, the more beneficial this function becomes. Simply adjust the frequency of 
-the call to match the needs to the agent.
-*/
-bool dtPathCorridor::optimizePathTopology(dtNavMeshQuery* navquery, const dtQueryFilter* filter)
-{
-	dtAssert(navquery);
-	dtAssert(filter);
-	dtAssert(m_path);
-	
-	if (m_npath < 3)
-		return false;
-	
-	static const int MAX_ITER = 32;
-	static const int MAX_RES = 32;
-	
-	dtPolyRef res[MAX_RES];
-	int nres = 0;
-	navquery->initSlicedFindPath(m_path[0], m_path[m_npath-1], m_pos, m_target, filter);
-	navquery->updateSlicedFindPath(MAX_ITER, 0);
-	dtStatus status = navquery->finalizeSlicedFindPathPartial(m_path, m_npath, res, &nres, MAX_RES);
-	
-	if (dtStatusSucceed(status) && nres > 0)
-	{
-		m_npath = dtMergeCorridorStartShortcut(m_path, m_npath, m_maxPath, res, nres);
-		return true;
-	}
-	
-	return false;
-}
-
-bool dtPathCorridor::moveOverOffmeshConnection(dtPolyRef offMeshConRef, dtPolyRef* refs,
-											   float* startPos, float* endPos,
-											   dtNavMeshQuery* navquery)
-{
-	dtAssert(navquery);
-	dtAssert(m_path);
-	dtAssert(m_npath);
-
-	// Advance the path up to and over the off-mesh connection.
-	dtPolyRef prevRef = 0, polyRef = m_path[0];
-	int npos = 0;
-	while (npos < m_npath && polyRef != offMeshConRef)
-	{
-		prevRef = polyRef;
-		polyRef = m_path[npos];
-		npos++;
-	}
-	if (npos == m_npath)
-	{
-		// Could not find offMeshConRef
-		return false;
-	}
-	
-	// Prune path
-	for (int i = npos; i < m_npath; ++i)
-		m_path[i-npos] = m_path[i];
-	m_npath -= npos;
-
-	refs[0] = prevRef;
-	refs[1] = polyRef;
-	
-	const dtNavMesh* nav = navquery->getAttachedNavMesh();
-	dtAssert(nav);
-
-	dtStatus status = nav->getOffMeshConnectionPolyEndPoints(refs[0], refs[1], startPos, endPos);
-	if (dtStatusSucceed(status))
-	{
-		dtVcopy(m_pos, endPos);
-		return true;
-	}
-
-	return false;
-}
-
-/**
-@par
-
-Behavior:
-
-- The movement is constrained to the surface of the navigation mesh. 
-- The corridor is automatically adjusted (shorted or lengthened) in order to remain valid. 
-- The new position will be located in the adjusted corridor's first polygon.
-
-The expected use case is that the desired position will be 'near' the current corridor. What is considered 'near' 
-depends on local polygon density, query search half extents, etc.
-
-The resulting position will differ from the desired position if the desired position is not on the navigation mesh, 
-or it can't be reached using a local search.
-*/
-bool dtPathCorridor::movePosition(const float* npos, dtNavMeshQuery* navquery, const dtQueryFilter* filter)
-{
-	dtAssert(m_path);
-	dtAssert(m_npath);
-	
-	// Move along navmesh and update new position.
-	float result[3];
-	static const int MAX_VISITED = 16;
-	dtPolyRef visited[MAX_VISITED];
-	int nvisited = 0;
-	dtStatus status = navquery->moveAlongSurface(m_path[0], m_pos, npos, filter,
-												 result, visited, &nvisited, MAX_VISITED);
-	if (dtStatusSucceed(status)) {
-		m_npath = dtMergeCorridorStartMoved(m_path, m_npath, m_maxPath, visited, nvisited);
-		
-		// Adjust the position to stay on top of the navmesh.
-		float h = m_pos[1];
-		navquery->getPolyHeight(m_path[0], result, &h);
-		result[1] = h;
-		dtVcopy(m_pos, result);
-		return true;
-	}
-	return false;
-}
-
-/**
-@par
-
-Behavior:
-
-- The movement is constrained to the surface of the navigation mesh. 
-- The corridor is automatically adjusted (shorted or lengthened) in order to remain valid. 
-- The new target will be located in the adjusted corridor's last polygon.
-
-The expected use case is that the desired target will be 'near' the current corridor. What is considered 'near' depends on local polygon density, query search half extents, etc.
-
-The resulting target will differ from the desired target if the desired target is not on the navigation mesh, or it can't be reached using a local search.
-*/
-bool dtPathCorridor::moveTargetPosition(const float* npos, dtNavMeshQuery* navquery, const dtQueryFilter* filter)
-{
-	dtAssert(m_path);
-	dtAssert(m_npath);
-	
-	// Move along navmesh and update new position.
-	float result[3];
-	static const int MAX_VISITED = 16;
-	dtPolyRef visited[MAX_VISITED];
-	int nvisited = 0;
-	dtStatus status = navquery->moveAlongSurface(m_path[m_npath-1], m_target, npos, filter,
-												 result, visited, &nvisited, MAX_VISITED);
-	if (dtStatusSucceed(status))
-	{
-		m_npath = dtMergeCorridorEndMoved(m_path, m_npath, m_maxPath, visited, nvisited);
-		// TODO: should we do that?
-		// Adjust the position to stay on top of the navmesh.
-		/*	float h = m_target[1];
-		 navquery->getPolyHeight(m_path[m_npath-1], result, &h);
-		 result[1] = h;*/
-		
-		dtVcopy(m_target, result);
-		
-		return true;
-	}
-	return false;
-}
-
-/// @par
-///
-/// The current corridor position is expected to be within the first polygon in the path. The target 
-/// is expected to be in the last polygon. 
-/// 
-/// @warning The size of the path must not exceed the size of corridor's path buffer set during #init().
-void dtPathCorridor::setCorridor(const float* target, const dtPolyRef* path, const int npath)
-{
-	dtAssert(m_path);
-	dtAssert(npath > 0);
-	dtAssert(npath < m_maxPath);
-	
-	dtVcopy(m_target, target);
-	memcpy(m_path, path, sizeof(dtPolyRef)*npath);
-	m_npath = npath;
-}
-
-bool dtPathCorridor::fixPathStart(dtPolyRef safeRef, const float* safePos)
-{
-	dtAssert(m_path);
-
-	dtVcopy(m_pos, safePos);
-	if (m_npath < 3 && m_npath > 0)
-	{
-		m_path[2] = m_path[m_npath-1];
-		m_path[0] = safeRef;
-		m_path[1] = 0;
-		m_npath = 3;
-	}
-	else
-	{
-		m_path[0] = safeRef;
-		m_path[1] = 0;
-	}
-	
-	return true;
-}
-
-bool dtPathCorridor::trimInvalidPath(dtPolyRef safeRef, const float* safePos,
-									 dtNavMeshQuery* navquery, const dtQueryFilter* filter)
-{
-	dtAssert(navquery);
-	dtAssert(filter);
-	dtAssert(m_path);
-	
-	// Keep valid path as far as possible.
-	int n = 0;
-	while (n < m_npath && navquery->isValidPolyRef(m_path[n], filter)) {
-		n++;
-	}
-	
-	if (n == m_npath)
-	{
-		// All valid, no need to fix.
-		return true;
-	}
-	else if (n == 0)
-	{
-		// The first polyref is bad, use current safe values.
-		dtVcopy(m_pos, safePos);
-		m_path[0] = safeRef;
-		m_npath = 1;
-	}
-	else
-	{
-		// The path is partially usable.
-		m_npath = n;
-	}
-	
-	// Clamp target pos to last poly
-	float tgt[3];
-	dtVcopy(tgt, m_target);
-	navquery->closestPointOnPolyBoundary(m_path[m_npath-1], tgt, m_target);
-	
-	return true;
-}
-
-/// @par
-///
-/// The path can be invalidated if there are structural changes to the underlying navigation mesh, or the state of 
-/// a polygon within the path changes resulting in it being filtered out. (E.g. An exclusion or inclusion flag changes.)
-bool dtPathCorridor::isValid(const int maxLookAhead, dtNavMeshQuery* navquery, const dtQueryFilter* filter)
-{
-	// Check that all polygons still pass query filter.
-	const int n = dtMin(m_npath, maxLookAhead);
-	for (int i = 0; i < n; ++i)
-	{
-		if (!navquery->isValidPolyRef(m_path[i], filter))
-			return false;
-	}
-
-	return true;
-}
diff --git a/extern/recastnavigation/DetourCrowd/Source/DetourPathQueue.cpp b/extern/recastnavigation/DetourCrowd/Source/DetourPathQueue.cpp
deleted file mode 100644
index 1ed0cd7ebc..0000000000
--- a/extern/recastnavigation/DetourCrowd/Source/DetourPathQueue.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#include <string.h>
-#include "DetourPathQueue.h"
-#include "DetourNavMesh.h"
-#include "DetourNavMeshQuery.h"
-#include "DetourAlloc.h"
-#include "DetourCommon.h"
-
-
-dtPathQueue::dtPathQueue() :
-	m_nextHandle(1),
-	m_maxPathSize(0),
-	m_queueHead(0),
-	m_navquery(0)
-{
-	for (int i = 0; i < MAX_QUEUE; ++i)
-		m_queue[i].path = 0;
-}
-
-dtPathQueue::~dtPathQueue()
-{
-	purge();
-}
-
-void dtPathQueue::purge()
-{
-	dtFreeNavMeshQuery(m_navquery);
-	m_navquery = 0;
-	for (int i = 0; i < MAX_QUEUE; ++i)
-	{
-		dtFree(m_queue[i].path);
-		m_queue[i].path = 0;
-	}
-}
-
-bool dtPathQueue::init(const int maxPathSize, const int maxSearchNodeCount, dtNavMesh* nav)
-{
-	purge();
-
-	m_navquery = dtAllocNavMeshQuery();
-	if (!m_navquery)
-		return false;
-	if (dtStatusFailed(m_navquery->init(nav, maxSearchNodeCount)))
-		return false;
-	
-	m_maxPathSize = maxPathSize;
-	for (int i = 0; i < MAX_QUEUE; ++i)
-	{
-		m_queue[i].ref = DT_PATHQ_INVALID;
-		m_queue[i].path = (dtPolyRef*)dtAlloc(sizeof(dtPolyRef)*m_maxPathSize, DT_ALLOC_PERM);
-		if (!m_queue[i].path)
-			return false;
-	}
-	
-	m_queueHead = 0;
-	
-	return true;
-}
-
-void dtPathQueue::update(const int maxIters)
-{
-	static const int MAX_KEEP_ALIVE = 2; // in update ticks.
-
-	// Update path request until there is nothing to update
-	// or upto maxIters pathfinder iterations has been consumed.
-	int iterCount = maxIters;
-	
-	for (int i = 0; i < MAX_QUEUE; ++i)
-	{
-		PathQuery& q = m_queue[m_queueHead % MAX_QUEUE];
-		
-		// Skip inactive requests.
-		if (q.ref == DT_PATHQ_INVALID)
-		{
-			m_queueHead++;
-			continue;
-		}
-		
-		// Handle completed request.
-		if (dtStatusSucceed(q.status) || dtStatusFailed(q.status))
-		{
-			// If the path result has not been read in few frames, free the slot.
-			q.keepAlive++;
-			if (q.keepAlive > MAX_KEEP_ALIVE)
-			{
-				q.ref = DT_PATHQ_INVALID;
-				q.status = 0;
-			}
-			
-			m_queueHead++;
-			continue;
-		}
-		
-		// Handle query start.
-		if (q.status == 0)
-		{
-			q.status = m_navquery->initSlicedFindPath(q.startRef, q.endRef, q.startPos, q.endPos, q.filter);
-		}		
-		// Handle query in progress.
-		if (dtStatusInProgress(q.status))
-		{
-			int iters = 0;
-			q.status = m_navquery->updateSlicedFindPath(iterCount, &iters);
-			iterCount -= iters;
-		}
-		if (dtStatusSucceed(q.status))
-		{
-			q.status = m_navquery->finalizeSlicedFindPath(q.path, &q.npath, m_maxPathSize);
-		}
-
-		if (iterCount <= 0)
-			break;
-
-		m_queueHead++;
-	}
-}
-
-dtPathQueueRef dtPathQueue::request(dtPolyRef startRef, dtPolyRef endRef,
-									const float* startPos, const float* endPos,
-									const dtQueryFilter* filter)
-{
-	// Find empty slot
-	int slot = -1;
-	for (int i = 0; i < MAX_QUEUE; ++i)
-	{
-		if (m_queue[i].ref == DT_PATHQ_INVALID)
-		{
-			slot = i;
-			break;
-		}
-	}
-	// Could not find slot.
-	if (slot == -1)
-		return DT_PATHQ_INVALID;
-	
-	dtPathQueueRef ref = m_nextHandle++;
-	if (m_nextHandle == DT_PATHQ_INVALID) m_nextHandle++;
-	
-	PathQuery& q = m_queue[slot];
-	q.ref = ref;
-	dtVcopy(q.startPos, startPos);
-	q.startRef = startRef;
-	dtVcopy(q.endPos, endPos);
-	q.endRef = endRef;
-	
-	q.status = 0;
-	q.npath = 0;
-	q.filter = filter;
-	q.keepAlive = 0;
-	
-	return ref;
-}
-
-dtStatus dtPathQueue::getRequestStatus(dtPathQueueRef ref) const
-{
-	for (int i = 0; i < MAX_QUEUE; ++i)
-	{
-		if (m_queue[i].ref == ref)
-			return m_queue[i].status;
-	}
-	return DT_FAILURE;
-}
-
-dtStatus dtPathQueue::getPathResult(dtPathQueueRef ref, dtPolyRef* path, int* pathSize, const int maxPath)
-{
-	for (int i = 0; i < MAX_QUEUE; ++i)
-	{
-		if (m_queue[i].ref == ref)
-		{
-			PathQuery& q = m_queue[i];
-			dtStatus details = q.status & DT_STATUS_DETAIL_MASK;
-			// Free request for reuse.
-			q.ref = DT_PATHQ_INVALID;
-			q.status = 0;
-			// Copy path
-			int n = dtMin(q.npath, maxPath);
-			memcpy(path, q.path, sizeof(dtPolyRef)*n);
-			*pathSize = n;
-			return details | DT_SUCCESS;
-		}
-	}
-	return DT_FAILURE;
-}
diff --git a/extern/recastnavigation/DetourCrowd/Source/DetourProximityGrid.cpp b/extern/recastnavigation/DetourCrowd/Source/DetourProximityGrid.cpp
deleted file mode 100644
index fc1e2e1368..0000000000
--- a/extern/recastnavigation/DetourCrowd/Source/DetourProximityGrid.cpp
+++ /dev/null
@@ -1,194 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#include <string.h>
-#include <new>
-#include "DetourProximityGrid.h"
-#include "DetourCommon.h"
-#include "DetourMath.h"
-#include "DetourAlloc.h"
-#include "DetourAssert.h"
-
-
-dtProximityGrid* dtAllocProximityGrid()
-{
-	void* mem = dtAlloc(sizeof(dtProximityGrid), DT_ALLOC_PERM);
-	if (!mem) return 0;
-	return new(mem) dtProximityGrid;
-}
-
-void dtFreeProximityGrid(dtProximityGrid* ptr)
-{
-	if (!ptr) return;
-	ptr->~dtProximityGrid();
-	dtFree(ptr);
-}
-
-
-inline int hashPos2(int x, int y, int n)
-{
-	return ((x*73856093) ^ (y*19349663)) & (n-1);
-}
-
-
-dtProximityGrid::dtProximityGrid() :
-	m_cellSize(0),
-	m_invCellSize(0),
-	m_pool(0),
-	m_poolHead(0),
-	m_poolSize(0),
-	m_buckets(0),
-	m_bucketsSize(0)
-{
-}
-
-dtProximityGrid::~dtProximityGrid()
-{
-	dtFree(m_buckets);
-	dtFree(m_pool);
-}
-
-bool dtProximityGrid::init(const int poolSize, const float cellSize)
-{
-	dtAssert(poolSize > 0);
-	dtAssert(cellSize > 0.0f);
-	
-	m_cellSize = cellSize;
-	m_invCellSize = 1.0f / m_cellSize;
-	
-	// Allocate hashs buckets
-	m_bucketsSize = dtNextPow2(poolSize);
-	m_buckets = (unsigned short*)dtAlloc(sizeof(unsigned short)*m_bucketsSize, DT_ALLOC_PERM);
-	if (!m_buckets)
-		return false;
-	
-	// Allocate pool of items.
-	m_poolSize = poolSize;
-	m_poolHead = 0;
-	m_pool = (Item*)dtAlloc(sizeof(Item)*m_poolSize, DT_ALLOC_PERM);
-	if (!m_pool)
-		return false;
-	
-	clear();
-	
-	return true;
-}
-
-void dtProximityGrid::clear()
-{
-	memset(m_buckets, 0xff, sizeof(unsigned short)*m_bucketsSize);
-	m_poolHead = 0;
-	m_bounds[0] = 0xffff;
-	m_bounds[1] = 0xffff;
-	m_bounds[2] = -0xffff;
-	m_bounds[3] = -0xffff;
-}
-
-void dtProximityGrid::addItem(const unsigned short id,
-							  const float minx, const float miny,
-							  const float maxx, const float maxy)
-{
-	const int iminx = (int)dtMathFloorf(minx * m_invCellSize);
-	const int iminy = (int)dtMathFloorf(miny * m_invCellSize);
-	const int imaxx = (int)dtMathFloorf(maxx * m_invCellSize);
-	const int imaxy = (int)dtMathFloorf(maxy * m_invCellSize);
-	
-	m_bounds[0] = dtMin(m_bounds[0], iminx);
-	m_bounds[1] = dtMin(m_bounds[1], iminy);
-	m_bounds[2] = dtMax(m_bounds[2], imaxx);
-	m_bounds[3] = dtMax(m_bounds[3], imaxy);
-	
-	for (int y = iminy; y <= imaxy; ++y)
-	{
-		for (int x = iminx; x <= imaxx; ++x)
-		{
-			if (m_poolHead < m_poolSize)
-			{
-				const int h = hashPos2(x, y, m_bucketsSize);
-				const unsigned short idx = (unsigned short)m_poolHead;
-				m_poolHead++;
-				Item& item = m_pool[idx];
-				item.x = (short)x;
-				item.y = (short)y;
-				item.id = id;
-				item.next = m_buckets[h];
-				m_buckets[h] = idx;
-			}
-		}
-	}
-}
-
-int dtProximityGrid::queryItems(const float minx, const float miny,
-								const float maxx, const float maxy,
-								unsigned short* ids, const int maxIds) const
-{
-	const int iminx = (int)dtMathFloorf(minx * m_invCellSize);
-	const int iminy = (int)dtMathFloorf(miny * m_invCellSize);
-	const int imaxx = (int)dtMathFloorf(maxx * m_invCellSize);
-	const int imaxy = (int)dtMathFloorf(maxy * m_invCellSize);
-	
-	int n = 0;
-	
-	for (int y = iminy; y <= imaxy; ++y)
-	{
-		for (int x = iminx; x <= imaxx; ++x)
-		{
-			const int h = hashPos2(x, y, m_bucketsSize);
-			unsigned short idx = m_buckets[h];
-			while (idx != 0xffff)
-			{
-				Item& item = m_pool[idx];
-				if ((int)item.x == x && (int)item.y == y)
-				{
-					// Check if the id exists already.
-					const unsigned short* end = ids + n;
-					unsigned short* i = ids;
-					while (i != end && *i != item.id)
-						++i;
-					// Item not found, add it.
-					if (i == end)
-					{
-						if (n >= maxIds)
-							return n;
-						ids[n++] = item.id;
-					}
-				}
-				idx = item.next;
-			}
-		}
-	}
-	
-	return n;
-}
-
-int dtProximityGrid::getItemCountAt(const int x, const int y) const
-{
-	int n = 0;
-	
-	const int h = hashPos2(x, y, m_bucketsSize);
-	unsigned short idx = m_buckets[h];
-	while (idx != 0xffff)
-	{
-		Item& item = m_pool[idx];
-		if ((int)item.x == x && (int)item.y == y)
-			n++;
-		idx = item.next;
-	}
-	
-	return n;
-}
diff --git a/extern/recastnavigation/DetourTileCache/CMakeLists.txt b/extern/recastnavigation/DetourTileCache/CMakeLists.txt
deleted file mode 100644
index 3703ebb929..0000000000
--- a/extern/recastnavigation/DetourTileCache/CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-file(GLOB SOURCES Source/*.cpp)
-add_library(DetourTileCache ${SOURCES})
-
-add_library(RecastNavigation::DetourTileCache ALIAS DetourTileCache)
-set_target_properties(DetourTileCache PROPERTIES DEBUG_POSTFIX -d)
-
-set(DetourTileCache_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Include")
-
-target_include_directories(DetourTileCache PUBLIC
-    "$<BUILD_INTERFACE:${DetourTileCache_INCLUDE_DIR}>"
-)
-
-target_link_libraries(DetourTileCache
-    Detour
-)
-
-set_target_properties(DetourTileCache PROPERTIES
-        SOVERSION ${SOVERSION}
-        VERSION ${VERSION}
-        COMPILE_PDB_OUTPUT_DIRECTORY .
-        COMPILE_PDB_NAME "DetourTileCache-d"
-        )
-
-
-install(TARGETS DetourTileCache
-        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        COMPONENT library
-        )
-
-file(GLOB INCLUDES Include/*.h)
-install(FILES ${INCLUDES} DESTINATION
-    ${CMAKE_INSTALL_INCLUDEDIR}/recastnavigation)
-install(FILES "$<TARGET_FILE_DIR:DetourTileCache>/DetourTileCache-d.pdb" CONFIGURATIONS "Debug" DESTINATION "lib") 
diff --git a/extern/recastnavigation/DetourTileCache/Include/DetourTileCache.h b/extern/recastnavigation/DetourTileCache/Include/DetourTileCache.h
deleted file mode 100644
index 75713366de..0000000000
--- a/extern/recastnavigation/DetourTileCache/Include/DetourTileCache.h
+++ /dev/null
@@ -1,262 +0,0 @@
-#ifndef DETOURTILECACHE_H
-#define DETOURTILECACHE_H
-
-#include "DetourStatus.h"
-
-
-
-typedef unsigned int dtObstacleRef;
-
-typedef unsigned int dtCompressedTileRef;
-
-/// Flags for addTile
-enum dtCompressedTileFlags
-{
-	DT_COMPRESSEDTILE_FREE_DATA = 0x01,					///< Navmesh owns the tile memory and should free it.
-};
-
-struct dtCompressedTile
-{
-	unsigned int salt;						///< Counter describing modifications to the tile.
-	struct dtTileCacheLayerHeader* header;
-	unsigned char* compressed;
-	int compressedSize;
-	unsigned char* data;
-	int dataSize;
-	unsigned int flags;
-	dtCompressedTile* next;
-};
-
-enum ObstacleState
-{
-	DT_OBSTACLE_EMPTY,
-	DT_OBSTACLE_PROCESSING,
-	DT_OBSTACLE_PROCESSED,
-	DT_OBSTACLE_REMOVING,
-};
-
-enum ObstacleType
-{
-	DT_OBSTACLE_CYLINDER,
-	DT_OBSTACLE_BOX, // AABB
-	DT_OBSTACLE_ORIENTED_BOX, // OBB
-};
-
-struct dtObstacleCylinder
-{
-	float pos[ 3 ];
-	float radius;
-	float height;
-};
-
-struct dtObstacleBox
-{
-	float bmin[ 3 ];
-	float bmax[ 3 ];
-};
-
-struct dtObstacleOrientedBox
-{
-	float center[ 3 ];
-	float halfExtents[ 3 ];
-	float rotAux[ 2 ]; //{ cos(0.5f*angle)*sin(-0.5f*angle); cos(0.5f*angle)*cos(0.5f*angle) - 0.5 }
-};
-
-static const int DT_MAX_TOUCHED_TILES = 8;
-struct dtTileCacheObstacle
-{
-	union
-	{
-		dtObstacleCylinder cylinder;
-		dtObstacleBox box;
-		dtObstacleOrientedBox orientedBox;
-	};
-
-	dtCompressedTileRef touched[DT_MAX_TOUCHED_TILES];
-	dtCompressedTileRef pending[DT_MAX_TOUCHED_TILES];
-	unsigned short salt;
-	unsigned char type;
-	unsigned char state;
-	unsigned char ntouched;
-	unsigned char npending;
-	dtTileCacheObstacle* next;
-};
-
-struct dtTileCacheParams
-{
-	float orig[3];
-	float cs, ch;
-	int width, height;
-	float walkableHeight;
-	float walkableRadius;
-	float walkableClimb;
-	float maxSimplificationError;
-	int maxTiles;
-	int maxObstacles;
-};
-
-struct dtTileCacheMeshProcess
-{
-	virtual ~dtTileCacheMeshProcess() { }
-
-	virtual void process(struct dtNavMeshCreateParams* params,
-						 unsigned char* polyAreas, unsigned short* polyFlags) = 0;
-};
-
-
-class dtTileCache
-{
-public:
-	dtTileCache();
-	~dtTileCache();
-	
-	struct dtTileCacheAlloc* getAlloc() { return m_talloc; }
-	struct dtTileCacheCompressor* getCompressor() { return m_tcomp; }
-	const dtTileCacheParams* getParams() const { return &m_params; }
-	
-	inline int getTileCount() const { return m_params.maxTiles; }
-	inline const dtCompressedTile* getTile(const int i) const { return &m_tiles[i]; }
-	
-	inline int getObstacleCount() const { return m_params.maxObstacles; }
-	inline const dtTileCacheObstacle* getObstacle(const int i) const { return &m_obstacles[i]; }
-	
-	const dtTileCacheObstacle* getObstacleByRef(dtObstacleRef ref);
-	
-	dtObstacleRef getObstacleRef(const dtTileCacheObstacle* obmin) const;
-	
-	dtStatus init(const dtTileCacheParams* params,
-				  struct dtTileCacheAlloc* talloc,
-				  struct dtTileCacheCompressor* tcomp,
-				  struct dtTileCacheMeshProcess* tmproc);
-	
-	int getTilesAt(const int tx, const int ty, dtCompressedTileRef* tiles, const int maxTiles) const ;
-	
-	dtCompressedTile* getTileAt(const int tx, const int ty, const int tlayer);
-	dtCompressedTileRef getTileRef(const dtCompressedTile* tile) const;
-	const dtCompressedTile* getTileByRef(dtCompressedTileRef ref) const;
-	
-	dtStatus addTile(unsigned char* data, const int dataSize, unsigned char flags, dtCompressedTileRef* result);
-	
-	dtStatus removeTile(dtCompressedTileRef ref, unsigned char** data, int* dataSize);
-	
-	// Cylinder obstacle.
-	dtStatus addObstacle(const float* pos, const float radius, const float height, dtObstacleRef* result);
-
-	// Aabb obstacle.
-	dtStatus addBoxObstacle(const float* bmin, const float* bmax, dtObstacleRef* result);
-
-	// Box obstacle: can be rotated in Y.
-	dtStatus addBoxObstacle(const float* center, const float* halfExtents, const float yRadians, dtObstacleRef* result);
-	
-	dtStatus removeObstacle(const dtObstacleRef ref);
-	
-	dtStatus queryTiles(const float* bmin, const float* bmax,
-						dtCompressedTileRef* results, int* resultCount, const int maxResults) const;
-	
-	/// Updates the tile cache by rebuilding tiles touched by unfinished obstacle requests.
-	///  @param[in]		dt			The time step size. Currently not used.
-	///  @param[in]		navmesh		The mesh to affect when rebuilding tiles.
-	///  @param[out]	upToDate	Whether the tile cache is fully up to date with obstacle requests and tile rebuilds.
-	///  							If the tile cache is up to date another (immediate) call to update will have no effect;
-	///  							otherwise another call will continue processing obstacle requests and tile rebuilds.
-	dtStatus update(const float dt, class dtNavMesh* navmesh, bool* upToDate = 0);
-	
-	dtStatus buildNavMeshTilesAt(const int tx, const int ty, class dtNavMesh* navmesh);
-	
-	dtStatus buildNavMeshTile(const dtCompressedTileRef ref, class dtNavMesh* navmesh);
-	
-	void calcTightTileBounds(const struct dtTileCacheLayerHeader* header, float* bmin, float* bmax) const;
-	
-	void getObstacleBounds(const struct dtTileCacheObstacle* ob, float* bmin, float* bmax) const;
-	
-
-	/// Encodes a tile id.
-	inline dtCompressedTileRef encodeTileId(unsigned int salt, unsigned int it) const
-	{
-		return ((dtCompressedTileRef)salt << m_tileBits) | (dtCompressedTileRef)it;
-	}
-	
-	/// Decodes a tile salt.
-	inline unsigned int decodeTileIdSalt(dtCompressedTileRef ref) const
-	{
-		const dtCompressedTileRef saltMask = ((dtCompressedTileRef)1<<m_saltBits)-1;
-		return (unsigned int)((ref >> m_tileBits) & saltMask);
-	}
-	
-	/// Decodes a tile id.
-	inline unsigned int decodeTileIdTile(dtCompressedTileRef ref) const
-	{
-		const dtCompressedTileRef tileMask = ((dtCompressedTileRef)1<<m_tileBits)-1;
-		return (unsigned int)(ref & tileMask);
-	}
-
-	/// Encodes an obstacle id.
-	inline dtObstacleRef encodeObstacleId(unsigned int salt, unsigned int it) const
-	{
-		return ((dtObstacleRef)salt << 16) | (dtObstacleRef)it;
-	}
-	
-	/// Decodes an obstacle salt.
-	inline unsigned int decodeObstacleIdSalt(dtObstacleRef ref) const
-	{
-		const dtObstacleRef saltMask = ((dtObstacleRef)1<<16)-1;
-		return (unsigned int)((ref >> 16) & saltMask);
-	}
-	
-	/// Decodes an obstacle id.
-	inline unsigned int decodeObstacleIdObstacle(dtObstacleRef ref) const
-	{
-		const dtObstacleRef tileMask = ((dtObstacleRef)1<<16)-1;
-		return (unsigned int)(ref & tileMask);
-	}
-	
-	
-private:
-	// Explicitly disabled copy constructor and copy assignment operator.
-	dtTileCache(const dtTileCache&);
-	dtTileCache& operator=(const dtTileCache&);
-
-	enum ObstacleRequestAction
-	{
-		REQUEST_ADD,
-		REQUEST_REMOVE,
-	};
-	
-	struct ObstacleRequest
-	{
-		int action;
-		dtObstacleRef ref;
-	};
-	
-	int m_tileLutSize;						///< Tile hash lookup size (must be pot).
-	int m_tileLutMask;						///< Tile hash lookup mask.
-	
-	dtCompressedTile** m_posLookup;			///< Tile hash lookup.
-	dtCompressedTile* m_nextFreeTile;		///< Freelist of tiles.
-	dtCompressedTile* m_tiles;				///< List of tiles.
-	
-	unsigned int m_saltBits;				///< Number of salt bits in the tile ID.
-	unsigned int m_tileBits;				///< Number of tile bits in the tile ID.
-	
-	dtTileCacheParams m_params;
-	
-	dtTileCacheAlloc* m_talloc;
-	dtTileCacheCompressor* m_tcomp;
-	dtTileCacheMeshProcess* m_tmproc;
-	
-	dtTileCacheObstacle* m_obstacles;
-	dtTileCacheObstacle* m_nextFreeObstacle;
-	
-	static const int MAX_REQUESTS = 64;
-	ObstacleRequest m_reqs[MAX_REQUESTS];
-	int m_nreqs;
-	
-	static const int MAX_UPDATE = 64;
-	dtCompressedTileRef m_update[MAX_UPDATE];
-	int m_nupdate;
-};
-
-dtTileCache* dtAllocTileCache();
-void dtFreeTileCache(dtTileCache* tc);
-
-#endif
diff --git a/extern/recastnavigation/DetourTileCache/Include/DetourTileCacheBuilder.h b/extern/recastnavigation/DetourTileCache/Include/DetourTileCacheBuilder.h
deleted file mode 100644
index ff61091930..0000000000
--- a/extern/recastnavigation/DetourTileCache/Include/DetourTileCacheBuilder.h
+++ /dev/null
@@ -1,156 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef DETOURTILECACHEBUILDER_H
-#define DETOURTILECACHEBUILDER_H
-
-#include "DetourAlloc.h"
-#include "DetourStatus.h"
-
-static const int DT_TILECACHE_MAGIC = 'D'<<24 | 'T'<<16 | 'L'<<8 | 'R'; ///< 'DTLR';
-static const int DT_TILECACHE_VERSION = 1;
-
-static const unsigned char DT_TILECACHE_NULL_AREA = 0;
-static const unsigned char DT_TILECACHE_WALKABLE_AREA = 63;
-static const unsigned short DT_TILECACHE_NULL_IDX = 0xffff;
-
-struct dtTileCacheLayerHeader
-{
-	int magic;								///< Data magic
-	int version;							///< Data version
-	int tx,ty,tlayer;
-	float bmin[3], bmax[3];
-	unsigned short hmin, hmax;				///< Height min/max range
-	unsigned char width, height;			///< Dimension of the layer.
-	unsigned char minx, maxx, miny, maxy;	///< Usable sub-region.
-};
-
-struct dtTileCacheLayer
-{
-	dtTileCacheLayerHeader* header;
-	unsigned char regCount;					///< Region count.
-	unsigned char* heights;
-	unsigned char* areas;
-	unsigned char* cons;
-	unsigned char* regs;
-};
-
-struct dtTileCacheContour
-{
-	int nverts;
-	unsigned char* verts;
-	unsigned char reg;
-	unsigned char area;
-};
-
-struct dtTileCacheContourSet
-{
-	int nconts;
-	dtTileCacheContour* conts;
-};
-
-struct dtTileCachePolyMesh
-{
-	int nvp;
-	int nverts;				///< Number of vertices.
-	int npolys;				///< Number of polygons.
-	unsigned short* verts;	///< Vertices of the mesh, 3 elements per vertex.
-	unsigned short* polys;	///< Polygons of the mesh, nvp*2 elements per polygon.
-	unsigned short* flags;	///< Per polygon flags.
-	unsigned char* areas;	///< Area ID of polygons.
-};
-
-
-struct dtTileCacheAlloc
-{
-	virtual ~dtTileCacheAlloc() {}
-
-	virtual void reset() {}
-	
-	virtual void* alloc(const size_t size)
-	{
-		return dtAlloc(size, DT_ALLOC_TEMP);
-	}
-	
-	virtual void free(void* ptr)
-	{
-		dtFree(ptr);
-	}
-};
-
-struct dtTileCacheCompressor
-{
-	virtual ~dtTileCacheCompressor() { }
-
-	virtual int maxCompressedSize(const int bufferSize) = 0;
-	virtual dtStatus compress(const unsigned char* buffer, const int bufferSize,
-							  unsigned char* compressed, const int maxCompressedSize, int* compressedSize) = 0;
-	virtual dtStatus decompress(const unsigned char* compressed, const int compressedSize,
-								unsigned char* buffer, const int maxBufferSize, int* bufferSize) = 0;
-};
-
-
-dtStatus dtBuildTileCacheLayer(dtTileCacheCompressor* comp,
-							   dtTileCacheLayerHeader* header,
-							   const unsigned char* heights,
-							   const unsigned char* areas,
-							   const unsigned char* cons,
-							   unsigned char** outData, int* outDataSize);
-
-void dtFreeTileCacheLayer(dtTileCacheAlloc* alloc, dtTileCacheLayer* layer);
-
-dtStatus dtDecompressTileCacheLayer(dtTileCacheAlloc* alloc, dtTileCacheCompressor* comp,
-									unsigned char* compressed, const int compressedSize,
-									dtTileCacheLayer** layerOut);
-
-dtTileCacheContourSet* dtAllocTileCacheContourSet(dtTileCacheAlloc* alloc);
-void dtFreeTileCacheContourSet(dtTileCacheAlloc* alloc, dtTileCacheContourSet* cset);
-
-dtTileCachePolyMesh* dtAllocTileCachePolyMesh(dtTileCacheAlloc* alloc);
-void dtFreeTileCachePolyMesh(dtTileCacheAlloc* alloc, dtTileCachePolyMesh* lmesh);
-
-dtStatus dtMarkCylinderArea(dtTileCacheLayer& layer, const float* orig, const float cs, const float ch,
-							const float* pos, const float radius, const float height, const unsigned char areaId);
-
-dtStatus dtMarkBoxArea(dtTileCacheLayer& layer, const float* orig, const float cs, const float ch,
-					   const float* bmin, const float* bmax, const unsigned char areaId);
-
-dtStatus dtMarkBoxArea(dtTileCacheLayer& layer, const float* orig, const float cs, const float ch,
-					   const float* center, const float* halfExtents, const float* rotAux, const unsigned char areaId);
-
-dtStatus dtBuildTileCacheRegions(dtTileCacheAlloc* alloc,
-								 dtTileCacheLayer& layer,
-								 const int walkableClimb);
-
-dtStatus dtBuildTileCacheContours(dtTileCacheAlloc* alloc,
-								  dtTileCacheLayer& layer,
-								  const int walkableClimb, 	const float maxError,
-								  dtTileCacheContourSet& lcset);
-
-dtStatus dtBuildTileCachePolyMesh(dtTileCacheAlloc* alloc,
-								  dtTileCacheContourSet& lcset,
-								  dtTileCachePolyMesh& mesh);
-
-/// Swaps the endianess of the compressed tile data's header (#dtTileCacheLayerHeader).
-/// Tile layer data does not need endian swapping as it consits only of bytes.
-///  @param[in,out]	data		The tile data array.
-///  @param[in]		dataSize	The size of the data array.
-bool dtTileCacheHeaderSwapEndian(unsigned char* data, const int dataSize);
-
-
-#endif // DETOURTILECACHEBUILDER_H
diff --git a/extern/recastnavigation/DetourTileCache/Source/DetourTileCache.cpp b/extern/recastnavigation/DetourTileCache/Source/DetourTileCache.cpp
deleted file mode 100644
index a82cd13503..0000000000
--- a/extern/recastnavigation/DetourTileCache/Source/DetourTileCache.cpp
+++ /dev/null
@@ -1,820 +0,0 @@
-#include "DetourTileCache.h"
-#include "DetourTileCacheBuilder.h"
-#include "DetourNavMeshBuilder.h"
-#include "DetourNavMesh.h"
-#include "DetourCommon.h"
-#include "DetourMath.h"
-#include "DetourAlloc.h"
-#include "DetourAssert.h"
-#include <string.h>
-#include <new>
-
-dtTileCache* dtAllocTileCache()
-{
-	void* mem = dtAlloc(sizeof(dtTileCache), DT_ALLOC_PERM);
-	if (!mem) return 0;
-	return new(mem) dtTileCache;
-}
-
-void dtFreeTileCache(dtTileCache* tc)
-{
-	if (!tc) return;
-	tc->~dtTileCache();
-	dtFree(tc);
-}
-
-static bool contains(const dtCompressedTileRef* a, const int n, const dtCompressedTileRef v)
-{
-	for (int i = 0; i < n; ++i)
-		if (a[i] == v)
-			return true;
-	return false;
-}
-
-inline int computeTileHash(int x, int y, const int mask)
-{
-	const unsigned int h1 = 0x8da6b343; // Large multiplicative constants;
-	const unsigned int h2 = 0xd8163841; // here arbitrarily chosen primes
-	unsigned int n = h1 * x + h2 * y;
-	return (int)(n & mask);
-}
-
-
-struct NavMeshTileBuildContext
-{
-	inline NavMeshTileBuildContext(struct dtTileCacheAlloc* a) : layer(0), lcset(0), lmesh(0), alloc(a) {}
-	inline ~NavMeshTileBuildContext() { purge(); }
-	void purge()
-	{
-		dtFreeTileCacheLayer(alloc, layer);
-		layer = 0;
-		dtFreeTileCacheContourSet(alloc, lcset);
-		lcset = 0;
-		dtFreeTileCachePolyMesh(alloc, lmesh);
-		lmesh = 0;
-	}
-	struct dtTileCacheLayer* layer;
-	struct dtTileCacheContourSet* lcset;
-	struct dtTileCachePolyMesh* lmesh;
-	struct dtTileCacheAlloc* alloc;
-};
-
-
-dtTileCache::dtTileCache() :
-	m_tileLutSize(0),
-	m_tileLutMask(0),
-	m_posLookup(0),
-	m_nextFreeTile(0),	
-	m_tiles(0),	
-	m_saltBits(0),
-	m_tileBits(0),
-	m_talloc(0),
-	m_tcomp(0),
-	m_tmproc(0),
-	m_obstacles(0),
-	m_nextFreeObstacle(0),
-	m_nreqs(0),
-	m_nupdate(0)
-{
-	memset(&m_params, 0, sizeof(m_params));
-	memset(m_reqs, 0, sizeof(ObstacleRequest) * MAX_REQUESTS);
-}
-	
-dtTileCache::~dtTileCache()
-{
-	for (int i = 0; i < m_params.maxTiles; ++i)
-	{
-		if (m_tiles[i].flags & DT_COMPRESSEDTILE_FREE_DATA)
-		{
-			dtFree(m_tiles[i].data);
-			m_tiles[i].data = 0;
-		}
-	}
-	dtFree(m_obstacles);
-	m_obstacles = 0;
-	dtFree(m_posLookup);
-	m_posLookup = 0;
-	dtFree(m_tiles);
-	m_tiles = 0;
-	m_nreqs = 0;
-	m_nupdate = 0;
-}
-
-const dtCompressedTile* dtTileCache::getTileByRef(dtCompressedTileRef ref) const
-{
-	if (!ref)
-		return 0;
-	unsigned int tileIndex = decodeTileIdTile(ref);
-	unsigned int tileSalt = decodeTileIdSalt(ref);
-	if ((int)tileIndex >= m_params.maxTiles)
-		return 0;
-	const dtCompressedTile* tile = &m_tiles[tileIndex];
-	if (tile->salt != tileSalt)
-		return 0;
-	return tile;
-}
-
-
-dtStatus dtTileCache::init(const dtTileCacheParams* params,
-						   dtTileCacheAlloc* talloc,
-						   dtTileCacheCompressor* tcomp,
-						   dtTileCacheMeshProcess* tmproc)
-{
-	m_talloc = talloc;
-	m_tcomp = tcomp;
-	m_tmproc = tmproc;
-	m_nreqs = 0;
-	memcpy(&m_params, params, sizeof(m_params));
-	
-	// Alloc space for obstacles.
-	m_obstacles = (dtTileCacheObstacle*)dtAlloc(sizeof(dtTileCacheObstacle)*m_params.maxObstacles, DT_ALLOC_PERM);
-	if (!m_obstacles)
-		return DT_FAILURE | DT_OUT_OF_MEMORY;
-	memset(m_obstacles, 0, sizeof(dtTileCacheObstacle)*m_params.maxObstacles);
-	m_nextFreeObstacle = 0;
-	for (int i = m_params.maxObstacles-1; i >= 0; --i)
-	{
-		m_obstacles[i].salt = 1;
-		m_obstacles[i].next = m_nextFreeObstacle;
-		m_nextFreeObstacle = &m_obstacles[i];
-	}
-	
-	// Init tiles
-	m_tileLutSize = dtNextPow2(m_params.maxTiles/4);
-	if (!m_tileLutSize) m_tileLutSize = 1;
-	m_tileLutMask = m_tileLutSize-1;
-	
-	m_tiles = (dtCompressedTile*)dtAlloc(sizeof(dtCompressedTile)*m_params.maxTiles, DT_ALLOC_PERM);
-	if (!m_tiles)
-		return DT_FAILURE | DT_OUT_OF_MEMORY;
-	m_posLookup = (dtCompressedTile**)dtAlloc(sizeof(dtCompressedTile*)*m_tileLutSize, DT_ALLOC_PERM);
-	if (!m_posLookup)
-		return DT_FAILURE | DT_OUT_OF_MEMORY;
-	memset(m_tiles, 0, sizeof(dtCompressedTile)*m_params.maxTiles);
-	memset(m_posLookup, 0, sizeof(dtCompressedTile*)*m_tileLutSize);
-	m_nextFreeTile = 0;
-	for (int i = m_params.maxTiles-1; i >= 0; --i)
-	{
-		m_tiles[i].salt = 1;
-		m_tiles[i].next = m_nextFreeTile;
-		m_nextFreeTile = &m_tiles[i];
-	}
-	
-	// Init ID generator values.
-	m_tileBits = dtIlog2(dtNextPow2((unsigned int)m_params.maxTiles));
-	// Only allow 31 salt bits, since the salt mask is calculated using 32bit uint and it will overflow.
-	m_saltBits = dtMin((unsigned int)31, 32 - m_tileBits);
-	if (m_saltBits < 10)
-		return DT_FAILURE | DT_INVALID_PARAM;
-	
-	return DT_SUCCESS;
-}
-
-int dtTileCache::getTilesAt(const int tx, const int ty, dtCompressedTileRef* tiles, const int maxTiles) const 
-{
-	int n = 0;
-	
-	// Find tile based on hash.
-	int h = computeTileHash(tx,ty,m_tileLutMask);
-	dtCompressedTile* tile = m_posLookup[h];
-	while (tile)
-	{
-		if (tile->header &&
-			tile->header->tx == tx &&
-			tile->header->ty == ty)
-		{
-			if (n < maxTiles)
-				tiles[n++] = getTileRef(tile);
-		}
-		tile = tile->next;
-	}
-	
-	return n;
-}
-
-dtCompressedTile* dtTileCache::getTileAt(const int tx, const int ty, const int tlayer)
-{
-	// Find tile based on hash.
-	int h = computeTileHash(tx,ty,m_tileLutMask);
-	dtCompressedTile* tile = m_posLookup[h];
-	while (tile)
-	{
-		if (tile->header &&
-			tile->header->tx == tx &&
-			tile->header->ty == ty &&
-			tile->header->tlayer == tlayer)
-		{
-			return tile;
-		}
-		tile = tile->next;
-	}
-	return 0;
-}
-
-dtCompressedTileRef dtTileCache::getTileRef(const dtCompressedTile* tile) const
-{
-	if (!tile) return 0;
-	const unsigned int it = (unsigned int)(tile - m_tiles);
-	return (dtCompressedTileRef)encodeTileId(tile->salt, it);
-}
-
-dtObstacleRef dtTileCache::getObstacleRef(const dtTileCacheObstacle* ob) const
-{
-	if (!ob) return 0;
-	const unsigned int idx = (unsigned int)(ob - m_obstacles);
-	return encodeObstacleId(ob->salt, idx);
-}
-
-const dtTileCacheObstacle* dtTileCache::getObstacleByRef(dtObstacleRef ref)
-{
-	if (!ref)
-		return 0;
-	unsigned int idx = decodeObstacleIdObstacle(ref);
-	if ((int)idx >= m_params.maxObstacles)
-		return 0;
-	const dtTileCacheObstacle* ob = &m_obstacles[idx];
-	unsigned int salt = decodeObstacleIdSalt(ref);
-	if (ob->salt != salt)
-		return 0;
-	return ob;
-}
-
-dtStatus dtTileCache::addTile(unsigned char* data, const int dataSize, unsigned char flags, dtCompressedTileRef* result)
-{
-	// Make sure the data is in right format.
-	dtTileCacheLayerHeader* header = (dtTileCacheLayerHeader*)data;
-	if (header->magic != DT_TILECACHE_MAGIC)
-		return DT_FAILURE | DT_WRONG_MAGIC;
-	if (header->version != DT_TILECACHE_VERSION)
-		return DT_FAILURE | DT_WRONG_VERSION;
-	
-	// Make sure the location is free.
-	if (getTileAt(header->tx, header->ty, header->tlayer))
-		return DT_FAILURE;
-	
-	// Allocate a tile.
-	dtCompressedTile* tile = 0;
-	if (m_nextFreeTile)
-	{
-		tile = m_nextFreeTile;
-		m_nextFreeTile = tile->next;
-		tile->next = 0;
-	}
-	
-	// Make sure we could allocate a tile.
-	if (!tile)
-		return DT_FAILURE | DT_OUT_OF_MEMORY;
-	
-	// Insert tile into the position lut.
-	int h = computeTileHash(header->tx, header->ty, m_tileLutMask);
-	tile->next = m_posLookup[h];
-	m_posLookup[h] = tile;
-	
-	// Init tile.
-	const int headerSize = dtAlign4(sizeof(dtTileCacheLayerHeader));
-	tile->header = (dtTileCacheLayerHeader*)data;
-	tile->data = data;
-	tile->dataSize = dataSize;
-	tile->compressed = tile->data + headerSize;
-	tile->compressedSize = tile->dataSize - headerSize;
-	tile->flags = flags;
-	
-	if (result)
-		*result = getTileRef(tile);
-	
-	return DT_SUCCESS;
-}
-
-dtStatus dtTileCache::removeTile(dtCompressedTileRef ref, unsigned char** data, int* dataSize)
-{
-	if (!ref)
-		return DT_FAILURE | DT_INVALID_PARAM;
-	unsigned int tileIndex = decodeTileIdTile(ref);
-	unsigned int tileSalt = decodeTileIdSalt(ref);
-	if ((int)tileIndex >= m_params.maxTiles)
-		return DT_FAILURE | DT_INVALID_PARAM;
-	dtCompressedTile* tile = &m_tiles[tileIndex];
-	if (tile->salt != tileSalt)
-		return DT_FAILURE | DT_INVALID_PARAM;
-	
-	// Remove tile from hash lookup.
-	const int h = computeTileHash(tile->header->tx,tile->header->ty,m_tileLutMask);
-	dtCompressedTile* prev = 0;
-	dtCompressedTile* cur = m_posLookup[h];
-	while (cur)
-	{
-		if (cur == tile)
-		{
-			if (prev)
-				prev->next = cur->next;
-			else
-				m_posLookup[h] = cur->next;
-			break;
-		}
-		prev = cur;
-		cur = cur->next;
-	}
-	
-	// Reset tile.
-	if (tile->flags & DT_COMPRESSEDTILE_FREE_DATA)
-	{
-		// Owns data
-		dtFree(tile->data);
-		tile->data = 0;
-		tile->dataSize = 0;
-		if (data) *data = 0;
-		if (dataSize) *dataSize = 0;
-	}
-	else
-	{
-		if (data) *data = tile->data;
-		if (dataSize) *dataSize = tile->dataSize;
-	}
-	
-	tile->header = 0;
-	tile->data = 0;
-	tile->dataSize = 0;
-	tile->compressed = 0;
-	tile->compressedSize = 0;
-	tile->flags = 0;
-	
-	// Update salt, salt should never be zero.
-	tile->salt = (tile->salt+1) & ((1<<m_saltBits)-1);
-	if (tile->salt == 0)
-		tile->salt++;
-	
-	// Add to free list.
-	tile->next = m_nextFreeTile;
-	m_nextFreeTile = tile;
-	
-	return DT_SUCCESS;
-}
-
-
-dtStatus dtTileCache::addObstacle(const float* pos, const float radius, const float height, dtObstacleRef* result)
-{
-	if (m_nreqs >= MAX_REQUESTS)
-		return DT_FAILURE | DT_BUFFER_TOO_SMALL;
-	
-	dtTileCacheObstacle* ob = 0;
-	if (m_nextFreeObstacle)
-	{
-		ob = m_nextFreeObstacle;
-		m_nextFreeObstacle = ob->next;
-		ob->next = 0;
-	}
-	if (!ob)
-		return DT_FAILURE | DT_OUT_OF_MEMORY;
-	
-	unsigned short salt = ob->salt;
-	memset(ob, 0, sizeof(dtTileCacheObstacle));
-	ob->salt = salt;
-	ob->state = DT_OBSTACLE_PROCESSING;
-	ob->type = DT_OBSTACLE_CYLINDER;
-	dtVcopy(ob->cylinder.pos, pos);
-	ob->cylinder.radius = radius;
-	ob->cylinder.height = height;
-	
-	ObstacleRequest* req = &m_reqs[m_nreqs++];
-	memset(req, 0, sizeof(ObstacleRequest));
-	req->action = REQUEST_ADD;
-	req->ref = getObstacleRef(ob);
-	
-	if (result)
-		*result = req->ref;
-	
-	return DT_SUCCESS;
-}
-
-dtStatus dtTileCache::addBoxObstacle(const float* bmin, const float* bmax, dtObstacleRef* result)
-{
-	if (m_nreqs >= MAX_REQUESTS)
-		return DT_FAILURE | DT_BUFFER_TOO_SMALL;
-	
-	dtTileCacheObstacle* ob = 0;
-	if (m_nextFreeObstacle)
-	{
-		ob = m_nextFreeObstacle;
-		m_nextFreeObstacle = ob->next;
-		ob->next = 0;
-	}
-	if (!ob)
-		return DT_FAILURE | DT_OUT_OF_MEMORY;
-	
-	unsigned short salt = ob->salt;
-	memset(ob, 0, sizeof(dtTileCacheObstacle));
-	ob->salt = salt;
-	ob->state = DT_OBSTACLE_PROCESSING;
-	ob->type = DT_OBSTACLE_BOX;
-	dtVcopy(ob->box.bmin, bmin);
-	dtVcopy(ob->box.bmax, bmax);
-	
-	ObstacleRequest* req = &m_reqs[m_nreqs++];
-	memset(req, 0, sizeof(ObstacleRequest));
-	req->action = REQUEST_ADD;
-	req->ref = getObstacleRef(ob);
-	
-	if (result)
-		*result = req->ref;
-	
-	return DT_SUCCESS;
-}
-
-dtStatus dtTileCache::addBoxObstacle(const float* center, const float* halfExtents, const float yRadians, dtObstacleRef* result)
-{
-	if (m_nreqs >= MAX_REQUESTS)
-		return DT_FAILURE | DT_BUFFER_TOO_SMALL;
-
-	dtTileCacheObstacle* ob = 0;
-	if (m_nextFreeObstacle)
-	{
-		ob = m_nextFreeObstacle;
-		m_nextFreeObstacle = ob->next;
-		ob->next = 0;
-	}
-	if (!ob)
-		return DT_FAILURE | DT_OUT_OF_MEMORY;
-
-	unsigned short salt = ob->salt;
-	memset(ob, 0, sizeof(dtTileCacheObstacle));
-	ob->salt = salt;
-	ob->state = DT_OBSTACLE_PROCESSING;
-	ob->type = DT_OBSTACLE_ORIENTED_BOX;
-	dtVcopy(ob->orientedBox.center, center);
-	dtVcopy(ob->orientedBox.halfExtents, halfExtents);
-
-	float coshalf= cosf(0.5f*yRadians);
-	float sinhalf = sinf(-0.5f*yRadians);
-	ob->orientedBox.rotAux[0] = coshalf*sinhalf;
-	ob->orientedBox.rotAux[1] = coshalf*coshalf - 0.5f;
-
-	ObstacleRequest* req = &m_reqs[m_nreqs++];
-	memset(req, 0, sizeof(ObstacleRequest));
-	req->action = REQUEST_ADD;
-	req->ref = getObstacleRef(ob);
-
-	if (result)
-		*result = req->ref;
-
-	return DT_SUCCESS;
-}
-
-dtStatus dtTileCache::removeObstacle(const dtObstacleRef ref)
-{
-	if (!ref)
-		return DT_SUCCESS;
-	if (m_nreqs >= MAX_REQUESTS)
-		return DT_FAILURE | DT_BUFFER_TOO_SMALL;
-	
-	ObstacleRequest* req = &m_reqs[m_nreqs++];
-	memset(req, 0, sizeof(ObstacleRequest));
-	req->action = REQUEST_REMOVE;
-	req->ref = ref;
-	
-	return DT_SUCCESS;
-}
-
-dtStatus dtTileCache::queryTiles(const float* bmin, const float* bmax,
-								 dtCompressedTileRef* results, int* resultCount, const int maxResults) const 
-{
-	const int MAX_TILES = 32;
-	dtCompressedTileRef tiles[MAX_TILES];
-	
-	int n = 0;
-	
-	const float tw = m_params.width * m_params.cs;
-	const float th = m_params.height * m_params.cs;
-	const int tx0 = (int)dtMathFloorf((bmin[0]-m_params.orig[0]) / tw);
-	const int tx1 = (int)dtMathFloorf((bmax[0]-m_params.orig[0]) / tw);
-	const int ty0 = (int)dtMathFloorf((bmin[2]-m_params.orig[2]) / th);
-	const int ty1 = (int)dtMathFloorf((bmax[2]-m_params.orig[2]) / th);
-	
-	for (int ty = ty0; ty <= ty1; ++ty)
-	{
-		for (int tx = tx0; tx <= tx1; ++tx)
-		{
-			const int ntiles = getTilesAt(tx,ty,tiles,MAX_TILES);
-			
-			for (int i = 0; i < ntiles; ++i)
-			{
-				const dtCompressedTile* tile = &m_tiles[decodeTileIdTile(tiles[i])];
-				float tbmin[3], tbmax[3];
-				calcTightTileBounds(tile->header, tbmin, tbmax);
-				
-				if (dtOverlapBounds(bmin,bmax, tbmin,tbmax))
-				{
-					if (n < maxResults)
-						results[n++] = tiles[i];
-				}
-			}
-		}
-	}
-	
-	*resultCount = n;
-	
-	return DT_SUCCESS;
-}
-
-dtStatus dtTileCache::update(const float /*dt*/, dtNavMesh* navmesh,
-							 bool* upToDate)
-{
-	if (m_nupdate == 0)
-	{
-		// Process requests.
-		for (int i = 0; i < m_nreqs; ++i)
-		{
-			ObstacleRequest* req = &m_reqs[i];
-			
-			unsigned int idx = decodeObstacleIdObstacle(req->ref);
-			if ((int)idx >= m_params.maxObstacles)
-				continue;
-			dtTileCacheObstacle* ob = &m_obstacles[idx];
-			unsigned int salt = decodeObstacleIdSalt(req->ref);
-			if (ob->salt != salt)
-				continue;
-			
-			if (req->action == REQUEST_ADD)
-			{
-				// Find touched tiles.
-				float bmin[3], bmax[3];
-				getObstacleBounds(ob, bmin, bmax);
-
-				int ntouched = 0;
-				queryTiles(bmin, bmax, ob->touched, &ntouched, DT_MAX_TOUCHED_TILES);
-				ob->ntouched = (unsigned char)ntouched;
-				// Add tiles to update list.
-				ob->npending = 0;
-				for (int j = 0; j < ob->ntouched; ++j)
-				{
-					if (m_nupdate < MAX_UPDATE)
-					{
-						if (!contains(m_update, m_nupdate, ob->touched[j]))
-							m_update[m_nupdate++] = ob->touched[j];
-						ob->pending[ob->npending++] = ob->touched[j];
-					}
-				}
-			}
-			else if (req->action == REQUEST_REMOVE)
-			{
-				// Prepare to remove obstacle.
-				ob->state = DT_OBSTACLE_REMOVING;
-				// Add tiles to update list.
-				ob->npending = 0;
-				for (int j = 0; j < ob->ntouched; ++j)
-				{
-					if (m_nupdate < MAX_UPDATE)
-					{
-						if (!contains(m_update, m_nupdate, ob->touched[j]))
-							m_update[m_nupdate++] = ob->touched[j];
-						ob->pending[ob->npending++] = ob->touched[j];
-					}
-				}
-			}
-		}
-		
-		m_nreqs = 0;
-	}
-	
-	dtStatus status = DT_SUCCESS;
-	// Process updates
-	if (m_nupdate)
-	{
-		// Build mesh
-		const dtCompressedTileRef ref = m_update[0];
-		status = buildNavMeshTile(ref, navmesh);
-		m_nupdate--;
-		if (m_nupdate > 0)
-			memmove(m_update, m_update+1, m_nupdate*sizeof(dtCompressedTileRef));
-
-		// Update obstacle states.
-		for (int i = 0; i < m_params.maxObstacles; ++i)
-		{
-			dtTileCacheObstacle* ob = &m_obstacles[i];
-			if (ob->state == DT_OBSTACLE_PROCESSING || ob->state == DT_OBSTACLE_REMOVING)
-			{
-				// Remove handled tile from pending list.
-				for (int j = 0; j < (int)ob->npending; j++)
-				{
-					if (ob->pending[j] == ref)
-					{
-						ob->pending[j] = ob->pending[(int)ob->npending-1];
-						ob->npending--;
-						break;
-					}
-				}
-				
-				// If all pending tiles processed, change state.
-				if (ob->npending == 0)
-				{
-					if (ob->state == DT_OBSTACLE_PROCESSING)
-					{
-						ob->state = DT_OBSTACLE_PROCESSED;
-					}
-					else if (ob->state == DT_OBSTACLE_REMOVING)
-					{
-						ob->state = DT_OBSTACLE_EMPTY;
-						// Update salt, salt should never be zero.
-						ob->salt = (ob->salt+1) & ((1<<16)-1);
-						if (ob->salt == 0)
-							ob->salt++;
-						// Return obstacle to free list.
-						ob->next = m_nextFreeObstacle;
-						m_nextFreeObstacle = ob;
-					}
-				}
-			}
-		}
-	}
-	
-	if (upToDate)
-		*upToDate = m_nupdate == 0 && m_nreqs == 0;
-
-	return status;
-}
-
-
-dtStatus dtTileCache::buildNavMeshTilesAt(const int tx, const int ty, dtNavMesh* navmesh)
-{
-	const int MAX_TILES = 32;
-	dtCompressedTileRef tiles[MAX_TILES];
-	const int ntiles = getTilesAt(tx,ty,tiles,MAX_TILES);
-	
-	for (int i = 0; i < ntiles; ++i)
-	{
-		dtStatus status = buildNavMeshTile(tiles[i], navmesh);
-		if (dtStatusFailed(status))
-			return status;
-	}
-	
-	return DT_SUCCESS;
-}
-
-dtStatus dtTileCache::buildNavMeshTile(const dtCompressedTileRef ref, dtNavMesh* navmesh)
-{	
-	dtAssert(m_talloc);
-	dtAssert(m_tcomp);
-	
-	unsigned int idx = decodeTileIdTile(ref);
-	if (idx > (unsigned int)m_params.maxTiles)
-		return DT_FAILURE | DT_INVALID_PARAM;
-	const dtCompressedTile* tile = &m_tiles[idx];
-	unsigned int salt = decodeTileIdSalt(ref);
-	if (tile->salt != salt)
-		return DT_FAILURE | DT_INVALID_PARAM;
-	
-	m_talloc->reset();
-	
-	NavMeshTileBuildContext bc(m_talloc);
-	const int walkableClimbVx = (int)(m_params.walkableClimb / m_params.ch);
-	dtStatus status;
-	
-	// Decompress tile layer data. 
-	status = dtDecompressTileCacheLayer(m_talloc, m_tcomp, tile->data, tile->dataSize, &bc.layer);
-	if (dtStatusFailed(status))
-		return status;
-	
-	// Rasterize obstacles.
-	for (int i = 0; i < m_params.maxObstacles; ++i)
-	{
-		const dtTileCacheObstacle* ob = &m_obstacles[i];
-		if (ob->state == DT_OBSTACLE_EMPTY || ob->state == DT_OBSTACLE_REMOVING)
-			continue;
-		if (contains(ob->touched, ob->ntouched, ref))
-		{
-			if (ob->type == DT_OBSTACLE_CYLINDER)
-			{
-				dtMarkCylinderArea(*bc.layer, tile->header->bmin, m_params.cs, m_params.ch,
-							    ob->cylinder.pos, ob->cylinder.radius, ob->cylinder.height, 0);
-			}
-			else if (ob->type == DT_OBSTACLE_BOX)
-			{
-				dtMarkBoxArea(*bc.layer, tile->header->bmin, m_params.cs, m_params.ch,
-					ob->box.bmin, ob->box.bmax, 0);
-			}
-			else if (ob->type == DT_OBSTACLE_ORIENTED_BOX)
-			{
-				dtMarkBoxArea(*bc.layer, tile->header->bmin, m_params.cs, m_params.ch,
-					ob->orientedBox.center, ob->orientedBox.halfExtents, ob->orientedBox.rotAux, 0);
-			}
-		}
-	}
-	
-	// Build navmesh
-	status = dtBuildTileCacheRegions(m_talloc, *bc.layer, walkableClimbVx);
-	if (dtStatusFailed(status))
-		return status;
-	
-	bc.lcset = dtAllocTileCacheContourSet(m_talloc);
-	if (!bc.lcset)
-		return DT_FAILURE | DT_OUT_OF_MEMORY;
-	status = dtBuildTileCacheContours(m_talloc, *bc.layer, walkableClimbVx,
-									  m_params.maxSimplificationError, *bc.lcset);
-	if (dtStatusFailed(status))
-		return status;
-	
-	bc.lmesh = dtAllocTileCachePolyMesh(m_talloc);
-	if (!bc.lmesh)
-		return DT_FAILURE | DT_OUT_OF_MEMORY;
-	status = dtBuildTileCachePolyMesh(m_talloc, *bc.lcset, *bc.lmesh);
-	if (dtStatusFailed(status))
-		return status;
-	
-	// Early out if the mesh tile is empty.
-	if (!bc.lmesh->npolys)
-	{
-		// Remove existing tile.
-		navmesh->removeTile(navmesh->getTileRefAt(tile->header->tx,tile->header->ty,tile->header->tlayer),0,0);
-		return DT_SUCCESS;
-	}
-	
-	dtNavMeshCreateParams params;
-	memset(&params, 0, sizeof(params));
-	params.verts = bc.lmesh->verts;
-	params.vertCount = bc.lmesh->nverts;
-	params.polys = bc.lmesh->polys;
-	params.polyAreas = bc.lmesh->areas;
-	params.polyFlags = bc.lmesh->flags;
-	params.polyCount = bc.lmesh->npolys;
-	params.nvp = DT_VERTS_PER_POLYGON;
-	params.walkableHeight = m_params.walkableHeight;
-	params.walkableRadius = m_params.walkableRadius;
-	params.walkableClimb = m_params.walkableClimb;
-	params.tileX = tile->header->tx;
-	params.tileY = tile->header->ty;
-	params.tileLayer = tile->header->tlayer;
-	params.cs = m_params.cs;
-	params.ch = m_params.ch;
-	params.buildBvTree = false;
-	dtVcopy(params.bmin, tile->header->bmin);
-	dtVcopy(params.bmax, tile->header->bmax);
-	
-	if (m_tmproc)
-	{
-		m_tmproc->process(&params, bc.lmesh->areas, bc.lmesh->flags);
-	}
-	
-	unsigned char* navData = 0;
-	int navDataSize = 0;
-	if (!dtCreateNavMeshData(&params, &navData, &navDataSize))
-		return DT_FAILURE;
-
-	// Remove existing tile.
-	navmesh->removeTile(navmesh->getTileRefAt(tile->header->tx,tile->header->ty,tile->header->tlayer),0,0);
-
-	// Add new tile, or leave the location empty.
-	if (navData)
-	{
-		// Let the navmesh own the data.
-		status = navmesh->addTile(navData,navDataSize,DT_TILE_FREE_DATA,0,0);
-		if (dtStatusFailed(status))
-		{
-			dtFree(navData);
-			return status;
-		}
-	}
-	
-	return DT_SUCCESS;
-}
-
-void dtTileCache::calcTightTileBounds(const dtTileCacheLayerHeader* header, float* bmin, float* bmax) const
-{
-	const float cs = m_params.cs;
-	bmin[0] = header->bmin[0] + header->minx*cs;
-	bmin[1] = header->bmin[1];
-	bmin[2] = header->bmin[2] + header->miny*cs;
-	bmax[0] = header->bmin[0] + (header->maxx+1)*cs;
-	bmax[1] = header->bmax[1];
-	bmax[2] = header->bmin[2] + (header->maxy+1)*cs;
-}
-
-void dtTileCache::getObstacleBounds(const struct dtTileCacheObstacle* ob, float* bmin, float* bmax) const
-{
-	if (ob->type == DT_OBSTACLE_CYLINDER)
-	{
-		const dtObstacleCylinder &cl = ob->cylinder;
-
-		bmin[0] = cl.pos[0] - cl.radius;
-		bmin[1] = cl.pos[1];
-		bmin[2] = cl.pos[2] - cl.radius;
-		bmax[0] = cl.pos[0] + cl.radius;
-		bmax[1] = cl.pos[1] + cl.height;
-		bmax[2] = cl.pos[2] + cl.radius;
-	}
-	else if (ob->type == DT_OBSTACLE_BOX)
-	{
-		dtVcopy(bmin, ob->box.bmin);
-		dtVcopy(bmax, ob->box.bmax);
-	}
-	else if (ob->type == DT_OBSTACLE_ORIENTED_BOX)
-	{
-		const dtObstacleOrientedBox &orientedBox = ob->orientedBox;
-
-		float maxr = 1.41f*dtMax(orientedBox.halfExtents[0], orientedBox.halfExtents[2]);
-		bmin[0] = orientedBox.center[0] - maxr;
-		bmax[0] = orientedBox.center[0] + maxr;
-		bmin[1] = orientedBox.center[1] - orientedBox.halfExtents[1];
-		bmax[1] = orientedBox.center[1] + orientedBox.halfExtents[1];
-		bmin[2] = orientedBox.center[2] - maxr;
-		bmax[2] = orientedBox.center[2] + maxr;
-	}
-}
diff --git a/extern/recastnavigation/DetourTileCache/Source/DetourTileCacheBuilder.cpp b/extern/recastnavigation/DetourTileCache/Source/DetourTileCacheBuilder.cpp
deleted file mode 100644
index 21a59f1a62..0000000000
--- a/extern/recastnavigation/DetourTileCache/Source/DetourTileCacheBuilder.cpp
+++ /dev/null
@@ -1,2250 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#include "DetourCommon.h"
-#include "DetourMath.h"
-#include "DetourStatus.h"
-#include "DetourAssert.h"
-#include "DetourTileCacheBuilder.h"
-#include <string.h>
-
-
-template<class T> class dtFixedArray
-{
-	dtTileCacheAlloc* m_alloc;
-	T* m_ptr;
-	const int m_size;
-	inline void operator=(dtFixedArray<T>& p);
-public:
-	inline dtFixedArray(dtTileCacheAlloc* a, const int s) : m_alloc(a), m_ptr((T*)a->alloc(sizeof(T)*s)), m_size(s) {}
-	inline ~dtFixedArray() { if (m_alloc) m_alloc->free(m_ptr); }
-	inline operator T*() { return m_ptr; }
-	inline int size() const { return m_size; }
-};
-
-inline int getDirOffsetX(int dir)
-{
-	const int offset[4] = { -1, 0, 1, 0, };
-	return offset[dir&0x03];
-}
-
-inline int getDirOffsetY(int dir)
-{
-	const int offset[4] = { 0, 1, 0, -1 };
-	return offset[dir&0x03];
-}
-
-static const int MAX_VERTS_PER_POLY = 6;	// TODO: use the DT_VERTS_PER_POLYGON
-static const int MAX_REM_EDGES = 48;		// TODO: make this an expression.
-
-
-
-dtTileCacheContourSet* dtAllocTileCacheContourSet(dtTileCacheAlloc* alloc)
-{
-	dtAssert(alloc);
-
-	dtTileCacheContourSet* cset = (dtTileCacheContourSet*)alloc->alloc(sizeof(dtTileCacheContourSet));
-	memset(cset, 0, sizeof(dtTileCacheContourSet));
-	return cset;
-}
-
-void dtFreeTileCacheContourSet(dtTileCacheAlloc* alloc, dtTileCacheContourSet* cset)
-{
-	dtAssert(alloc);
-
-	if (!cset) return;
-	for (int i = 0; i < cset->nconts; ++i)
-		alloc->free(cset->conts[i].verts);
-	alloc->free(cset->conts);
-	alloc->free(cset);
-}
-
-dtTileCachePolyMesh* dtAllocTileCachePolyMesh(dtTileCacheAlloc* alloc)
-{
-	dtAssert(alloc);
-
-	dtTileCachePolyMesh* lmesh = (dtTileCachePolyMesh*)alloc->alloc(sizeof(dtTileCachePolyMesh));
-	memset(lmesh, 0, sizeof(dtTileCachePolyMesh));
-	return lmesh;
-}
-
-void dtFreeTileCachePolyMesh(dtTileCacheAlloc* alloc, dtTileCachePolyMesh* lmesh)
-{
-	dtAssert(alloc);
-	
-	if (!lmesh) return;
-	alloc->free(lmesh->verts);
-	alloc->free(lmesh->polys);
-	alloc->free(lmesh->flags);
-	alloc->free(lmesh->areas);
-	alloc->free(lmesh);
-}
-
-
-
-struct dtLayerSweepSpan
-{
-	unsigned short ns;	// number samples
-	unsigned char id;	// region id
-	unsigned char nei;	// neighbour id
-};
-
-static const int DT_LAYER_MAX_NEIS = 16;
-
-struct dtLayerMonotoneRegion
-{
-	int area;
-	unsigned char neis[DT_LAYER_MAX_NEIS];
-	unsigned char nneis;
-	unsigned char regId;
-	unsigned char areaId;
-};
-
-struct dtTempContour
-{
-	inline dtTempContour(unsigned char* vbuf, const int nvbuf,
-						 unsigned short* pbuf, const int npbuf) :
-		verts(vbuf), nverts(0), cverts(nvbuf),
-		poly(pbuf), npoly(0), cpoly(npbuf) 
-	{
-	}
-	unsigned char* verts;
-	int nverts;
-	int cverts;
-	unsigned short* poly;
-	int npoly;
-	int cpoly;
-};
-
-
-
-
-inline bool overlapRangeExl(const unsigned short amin, const unsigned short amax,
-							const unsigned short bmin, const unsigned short bmax)
-{
-	return (amin >= bmax || amax <= bmin) ? false : true;
-}
-
-static void addUniqueLast(unsigned char* a, unsigned char& an, unsigned char v)
-{
-	const int n = (int)an;
-	if (n > 0 && a[n-1] == v) return;
-	a[an] = v;
-	an++;
-}
-
-inline bool isConnected(const dtTileCacheLayer& layer,
-						const int ia, const int ib, const int walkableClimb)
-{
-	if (layer.areas[ia] != layer.areas[ib]) return false;
-	if (dtAbs((int)layer.heights[ia] - (int)layer.heights[ib]) > walkableClimb) return false;
-	return true;
-}
-
-static bool canMerge(unsigned char oldRegId, unsigned char newRegId, const dtLayerMonotoneRegion* regs, const int nregs)
-{
-	int count = 0;
-	for (int i = 0; i < nregs; ++i)
-	{
-		const dtLayerMonotoneRegion& reg = regs[i];
-		if (reg.regId != oldRegId) continue;
-		const int nnei = (int)reg.nneis;
-		for (int j = 0; j < nnei; ++j)
-		{
-			if (regs[reg.neis[j]].regId == newRegId)
-				count++;
-		}
-	}
-	return count == 1;
-}
-
-
-dtStatus dtBuildTileCacheRegions(dtTileCacheAlloc* alloc,
-								 dtTileCacheLayer& layer,
-								 const int walkableClimb)
-{
-	dtAssert(alloc);
-	
-	const int w = (int)layer.header->width;
-	const int h = (int)layer.header->height;
-	
-	memset(layer.regs,0xff,sizeof(unsigned char)*w*h);
-	
-	const int nsweeps = w;
-	dtFixedArray<dtLayerSweepSpan> sweeps(alloc, nsweeps);
-	if (!sweeps)
-		return DT_FAILURE | DT_OUT_OF_MEMORY;
-	memset(sweeps,0,sizeof(dtLayerSweepSpan)*nsweeps);
-	
-	// Partition walkable area into monotone regions.
-	unsigned char prevCount[256];
-	unsigned char regId = 0;
-	
-	for (int y = 0; y < h; ++y)
-	{
-		if (regId > 0)
-			memset(prevCount,0,sizeof(unsigned char)*regId);
-		unsigned char sweepId = 0;
-		
-		for (int x = 0; x < w; ++x)
-		{
-			const int idx = x + y*w;
-			if (layer.areas[idx] == DT_TILECACHE_NULL_AREA) continue;
-			
-			unsigned char sid = 0xff;
-			
-			// -x
-			const int xidx = (x-1)+y*w;
-			if (x > 0 && isConnected(layer, idx, xidx, walkableClimb))
-			{
-				if (layer.regs[xidx] != 0xff)
-					sid = layer.regs[xidx];
-			}
-			
-			if (sid == 0xff)
-			{
-				sid = sweepId++;
-				sweeps[sid].nei = 0xff;
-				sweeps[sid].ns = 0;
-			}
-			
-			// -y
-			const int yidx = x+(y-1)*w;
-			if (y > 0 && isConnected(layer, idx, yidx, walkableClimb))
-			{
-				const unsigned char nr = layer.regs[yidx];
-				if (nr != 0xff)
-				{
-					// Set neighbour when first valid neighbour is encoutered.
-					if (sweeps[sid].ns == 0)
-						sweeps[sid].nei = nr;
-					
-					if (sweeps[sid].nei == nr)
-					{
-						// Update existing neighbour
-						sweeps[sid].ns++;
-						prevCount[nr]++;
-					}
-					else
-					{
-						// This is hit if there is nore than one neighbour.
-						// Invalidate the neighbour.
-						sweeps[sid].nei = 0xff;
-					}
-				}
-			}
-			
-			layer.regs[idx] = sid;
-		}
-		
-		// Create unique ID.
-		for (int i = 0; i < sweepId; ++i)
-		{
-			// If the neighbour is set and there is only one continuous connection to it,
-			// the sweep will be merged with the previous one, else new region is created.
-			if (sweeps[i].nei != 0xff && (unsigned short)prevCount[sweeps[i].nei] == sweeps[i].ns)
-			{
-				sweeps[i].id = sweeps[i].nei;
-			}
-			else
-			{
-				if (regId == 255)
-				{
-					// Region ID's overflow.
-					return DT_FAILURE | DT_BUFFER_TOO_SMALL;
-				}
-				sweeps[i].id = regId++;
-			}
-		}
-		
-		// Remap local sweep ids to region ids.
-		for (int x = 0; x < w; ++x)
-		{
-			const int idx = x+y*w;
-			if (layer.regs[idx] != 0xff)
-				layer.regs[idx] = sweeps[layer.regs[idx]].id;
-		}
-	}
-	
-	// Allocate and init layer regions.
-	const int nregs = (int)regId;
-	dtFixedArray<dtLayerMonotoneRegion> regs(alloc, nregs);
-	if (!regs)
-		return DT_FAILURE | DT_OUT_OF_MEMORY;
-
-	memset(regs, 0, sizeof(dtLayerMonotoneRegion)*nregs);
-	for (int i = 0; i < nregs; ++i)
-		regs[i].regId = 0xff;
-	
-	// Find region neighbours.
-	for (int y = 0; y < h; ++y)
-	{
-		for (int x = 0; x < w; ++x)
-		{
-			const int idx = x+y*w;
-			const unsigned char ri = layer.regs[idx];
-			if (ri == 0xff)
-				continue;
-			
-			// Update area.
-			regs[ri].area++;
-			regs[ri].areaId = layer.areas[idx];
-			
-			// Update neighbours
-			const int ymi = x+(y-1)*w;
-			if (y > 0 && isConnected(layer, idx, ymi, walkableClimb))
-			{
-				const unsigned char rai = layer.regs[ymi];
-				if (rai != 0xff && rai != ri)
-				{
-					addUniqueLast(regs[ri].neis, regs[ri].nneis, rai);
-					addUniqueLast(regs[rai].neis, regs[rai].nneis, ri);
-				}
-			}
-		}
-	}
-	
-	for (int i = 0; i < nregs; ++i)
-		regs[i].regId = (unsigned char)i;
-	
-	for (int i = 0; i < nregs; ++i)
-	{
-		dtLayerMonotoneRegion& reg = regs[i];
-		
-		int merge = -1;
-		int mergea = 0;
-		for (int j = 0; j < (int)reg.nneis; ++j)
-		{
-			const unsigned char nei = reg.neis[j];
-			dtLayerMonotoneRegion& regn = regs[nei];
-			if (reg.regId == regn.regId)
-				continue;
-			if (reg.areaId != regn.areaId)
-				continue;
-			if (regn.area > mergea)
-			{
-				if (canMerge(reg.regId, regn.regId, regs, nregs))
-				{
-					mergea = regn.area;
-					merge = (int)nei;
-				}
-			}
-		}
-		if (merge != -1)
-		{
-			const unsigned char oldId = reg.regId;
-			const unsigned char newId = regs[merge].regId;
-			for (int j = 0; j < nregs; ++j)
-				if (regs[j].regId == oldId)
-					regs[j].regId = newId;
-		}
-	}
-	
-	// Compact ids.
-	unsigned char remap[256];
-	memset(remap, 0, 256);
-	// Find number of unique regions.
-	regId = 0;
-	for (int i = 0; i < nregs; ++i)
-		remap[regs[i].regId] = 1;
-	for (int i = 0; i < 256; ++i)
-		if (remap[i])
-			remap[i] = regId++;
-	// Remap ids.
-	for (int i = 0; i < nregs; ++i)
-		regs[i].regId = remap[regs[i].regId];
-	
-	layer.regCount = regId;
-	
-	for (int i = 0; i < w*h; ++i)
-	{
-		if (layer.regs[i] != 0xff)
-			layer.regs[i] = regs[layer.regs[i]].regId;
-	}
-	
-	return DT_SUCCESS;
-}
-
-
-
-static bool appendVertex(dtTempContour& cont, const int x, const int y, const int z, const int r)
-{
-	// Try to merge with existing segments.
-	if (cont.nverts > 1)
-	{
-		unsigned char* pa = &cont.verts[(cont.nverts-2)*4];
-		unsigned char* pb = &cont.verts[(cont.nverts-1)*4];
-		if ((int)pb[3] == r)
-		{
-			if (pa[0] == pb[0] && (int)pb[0] == x)
-			{
-				// The verts are aligned aling x-axis, update z.
-				pb[1] = (unsigned char)y;
-				pb[2] = (unsigned char)z;
-				return true;
-			}
-			else if (pa[2] == pb[2] && (int)pb[2] == z)
-			{
-				// The verts are aligned aling z-axis, update x.
-				pb[0] = (unsigned char)x;
-				pb[1] = (unsigned char)y;
-				return true;
-			}
-		}
-	}
-	
-	// Add new point.
-	if (cont.nverts+1 > cont.cverts)
-		return false;
-	
-	unsigned char* v = &cont.verts[cont.nverts*4];
-	v[0] = (unsigned char)x;
-	v[1] = (unsigned char)y;
-	v[2] = (unsigned char)z;
-	v[3] = (unsigned char)r;
-	cont.nverts++;
-	
-	return true;
-}
-
-
-static unsigned char getNeighbourReg(dtTileCacheLayer& layer,
-									 const int ax, const int ay, const int dir)
-{
-	const int w = (int)layer.header->width;
-	const int ia = ax + ay*w;
-	
-	const unsigned char con = layer.cons[ia] & 0xf;
-	const unsigned char portal = layer.cons[ia] >> 4;
-	const unsigned char mask = (unsigned char)(1<<dir);
-	
-	if ((con & mask) == 0)
-	{
-		// No connection, return portal or hard edge.
-		if (portal & mask)
-			return 0xf8 + (unsigned char)dir;
-		return 0xff;
-	}
-	
-	const int bx = ax + getDirOffsetX(dir);
-	const int by = ay + getDirOffsetY(dir);
-	const int ib = bx + by*w;
-	
-	return layer.regs[ib];
-}
-
-static bool walkContour(dtTileCacheLayer& layer, int x, int y, dtTempContour& cont)
-{
-	const int w = (int)layer.header->width;
-	const int h = (int)layer.header->height;
-	
-	cont.nverts = 0;
-	
-	int startX = x;
-	int startY = y;
-	int startDir = -1;
-	
-	for (int i = 0; i < 4; ++i)
-	{
-		const int dir = (i+3)&3;
-		unsigned char rn = getNeighbourReg(layer, x, y, dir);
-		if (rn != layer.regs[x+y*w])
-		{
-			startDir = dir;
-			break;
-		}
-	}
-	if (startDir == -1)
-		return true;
-	
-	int dir = startDir;
-	const int maxIter = w*h;
-	
-	int iter = 0;
-	while (iter < maxIter)
-	{
-		unsigned char rn = getNeighbourReg(layer, x, y, dir);
-		
-		int nx = x;
-		int ny = y;
-		int ndir = dir;
-		
-		if (rn != layer.regs[x+y*w])
-		{
-			// Solid edge.
-			int px = x;
-			int pz = y;
-			switch(dir)
-			{
-				case 0: pz++; break;
-				case 1: px++; pz++; break;
-				case 2: px++; break;
-			}
-			
-			// Try to merge with previous vertex.
-			if (!appendVertex(cont, px, (int)layer.heights[x+y*w], pz,rn))
-				return false;
-			
-			ndir = (dir+1) & 0x3;  // Rotate CW
-		}
-		else
-		{
-			// Move to next.
-			nx = x + getDirOffsetX(dir);
-			ny = y + getDirOffsetY(dir);
-			ndir = (dir+3) & 0x3;	// Rotate CCW
-		}
-		
-		if (iter > 0 && x == startX && y == startY && dir == startDir)
-			break;
-		
-		x = nx;
-		y = ny;
-		dir = ndir;
-		
-		iter++;
-	}
-	
-	// Remove last vertex if it is duplicate of the first one.
-	unsigned char* pa = &cont.verts[(cont.nverts-1)*4];
-	unsigned char* pb = &cont.verts[0];
-	if (pa[0] == pb[0] && pa[2] == pb[2])
-		cont.nverts--;
-	
-	return true;
-}	
-
-
-static float distancePtSeg(const int x, const int z,
-						   const int px, const int pz,
-						   const int qx, const int qz)
-{
-	float pqx = (float)(qx - px);
-	float pqz = (float)(qz - pz);
-	float dx = (float)(x - px);
-	float dz = (float)(z - pz);
-	float d = pqx*pqx + pqz*pqz;
-	float t = pqx*dx + pqz*dz;
-	if (d > 0)
-		t /= d;
-	if (t < 0)
-		t = 0;
-	else if (t > 1)
-		t = 1;
-	
-	dx = px + t*pqx - x;
-	dz = pz + t*pqz - z;
-	
-	return dx*dx + dz*dz;
-}
-
-static void simplifyContour(dtTempContour& cont, const float maxError)
-{
-	cont.npoly = 0;
-	
-	for (int i = 0; i < cont.nverts; ++i)
-	{
-		int j = (i+1) % cont.nverts;
-		// Check for start of a wall segment.
-		unsigned char ra = cont.verts[j*4+3];
-		unsigned char rb = cont.verts[i*4+3];
-		if (ra != rb)
-			cont.poly[cont.npoly++] = (unsigned short)i;
-	}
-	if (cont.npoly < 2)
-	{
-		// If there is no transitions at all,
-		// create some initial points for the simplification process. 
-		// Find lower-left and upper-right vertices of the contour.
-		int llx = cont.verts[0];
-		int llz = cont.verts[2];
-		int lli = 0;
-		int urx = cont.verts[0];
-		int urz = cont.verts[2];
-		int uri = 0;
-		for (int i = 1; i < cont.nverts; ++i)
-		{
-			int x = cont.verts[i*4+0];
-			int z = cont.verts[i*4+2];
-			if (x < llx || (x == llx && z < llz))
-			{
-				llx = x;
-				llz = z;
-				lli = i;
-			}
-			if (x > urx || (x == urx && z > urz))
-			{
-				urx = x;
-				urz = z;
-				uri = i;
-			}
-		}
-		cont.npoly = 0;
-		cont.poly[cont.npoly++] = (unsigned short)lli;
-		cont.poly[cont.npoly++] = (unsigned short)uri;
-	}
-	
-	// Add points until all raw points are within
-	// error tolerance to the simplified shape.
-	for (int i = 0; i < cont.npoly; )
-	{
-		int ii = (i+1) % cont.npoly;
-		
-		const int ai = (int)cont.poly[i];
-		const int ax = (int)cont.verts[ai*4+0];
-		const int az = (int)cont.verts[ai*4+2];
-		
-		const int bi = (int)cont.poly[ii];
-		const int bx = (int)cont.verts[bi*4+0];
-		const int bz = (int)cont.verts[bi*4+2];
-		
-		// Find maximum deviation from the segment.
-		float maxd = 0;
-		int maxi = -1;
-		int ci, cinc, endi;
-		
-		// Traverse the segment in lexilogical order so that the
-		// max deviation is calculated similarly when traversing
-		// opposite segments.
-		if (bx > ax || (bx == ax && bz > az))
-		{
-			cinc = 1;
-			ci = (ai+cinc) % cont.nverts;
-			endi = bi;
-		}
-		else
-		{
-			cinc = cont.nverts-1;
-			ci = (bi+cinc) % cont.nverts;
-			endi = ai;
-		}
-		
-		// Tessellate only outer edges or edges between areas.
-		while (ci != endi)
-		{
-			float d = distancePtSeg(cont.verts[ci*4+0], cont.verts[ci*4+2], ax, az, bx, bz);
-			if (d > maxd)
-			{
-				maxd = d;
-				maxi = ci;
-			}
-			ci = (ci+cinc) % cont.nverts;
-		}
-		
-		
-		// If the max deviation is larger than accepted error,
-		// add new point, else continue to next segment.
-		if (maxi != -1 && maxd > (maxError*maxError))
-		{
-			cont.npoly++;
-			for (int j = cont.npoly-1; j > i; --j)
-				cont.poly[j] = cont.poly[j-1];
-			cont.poly[i+1] = (unsigned short)maxi;
-		}
-		else
-		{
-			++i;
-		}
-	}
-	
-	// Remap vertices
-	int start = 0;
-	for (int i = 1; i < cont.npoly; ++i)
-		if (cont.poly[i] < cont.poly[start])
-			start = i;
-	
-	cont.nverts = 0;
-	for (int i = 0; i < cont.npoly; ++i)
-	{
-		const int j = (start+i) % cont.npoly;
-		unsigned char* src = &cont.verts[cont.poly[j]*4];
-		unsigned char* dst = &cont.verts[cont.nverts*4];
-		dst[0] = src[0];
-		dst[1] = src[1];
-		dst[2] = src[2];
-		dst[3] = src[3];
-		cont.nverts++;
-	}
-}
-
-static unsigned char getCornerHeight(dtTileCacheLayer& layer,
-									 const int x, const int y, const int z,
-									 const int walkableClimb,
-									 bool& shouldRemove)
-{
-	const int w = (int)layer.header->width;
-	const int h = (int)layer.header->height;
-	
-	int n = 0;
-	
-	unsigned char portal = 0xf;
-	unsigned char height = 0;
-	unsigned char preg = 0xff;
-	bool allSameReg = true;
-	
-	for (int dz = -1; dz <= 0; ++dz)
-	{
-		for (int dx = -1; dx <= 0; ++dx)
-		{
-			const int px = x+dx;
-			const int pz = z+dz;
-			if (px >= 0 && pz >= 0 && px < w && pz < h)
-			{
-				const int idx  = px + pz*w;
-				const int lh = (int)layer.heights[idx];
-				if (dtAbs(lh-y) <= walkableClimb && layer.areas[idx] != DT_TILECACHE_NULL_AREA)
-				{
-					height = dtMax(height, (unsigned char)lh);
-					portal &= (layer.cons[idx] >> 4);
-					if (preg != 0xff && preg != layer.regs[idx])
-						allSameReg = false;
-					preg = layer.regs[idx]; 
-					n++;
-				}
-			}
-		}
-	}
-	
-	int portalCount = 0;
-	for (int dir = 0; dir < 4; ++dir)
-		if (portal & (1<<dir))
-			portalCount++;
-	
-	shouldRemove = false;
-	if (n > 1 && portalCount == 1 && allSameReg)
-	{
-		shouldRemove = true;
-	}
-	
-	return height;
-}
-
-
-// TODO: move this somewhere else, once the layer meshing is done.
-dtStatus dtBuildTileCacheContours(dtTileCacheAlloc* alloc,
-								  dtTileCacheLayer& layer,
-								  const int walkableClimb, 	const float maxError,
-								  dtTileCacheContourSet& lcset)
-{
-	dtAssert(alloc);
-
-	const int w = (int)layer.header->width;
-	const int h = (int)layer.header->height;
-	
-	lcset.nconts = layer.regCount;
-	lcset.conts = (dtTileCacheContour*)alloc->alloc(sizeof(dtTileCacheContour)*lcset.nconts);
-	if (!lcset.conts)
-		return DT_FAILURE | DT_OUT_OF_MEMORY;
-	memset(lcset.conts, 0, sizeof(dtTileCacheContour)*lcset.nconts);
-	
-	// Allocate temp buffer for contour tracing.
-	const int maxTempVerts = (w+h)*2 * 2; // Twice around the layer.
-	
-	dtFixedArray<unsigned char> tempVerts(alloc, maxTempVerts*4);
-	if (!tempVerts)
-		return DT_FAILURE | DT_OUT_OF_MEMORY;
-	
-	dtFixedArray<unsigned short> tempPoly(alloc, maxTempVerts);
-	if (!tempPoly)
-		return DT_FAILURE | DT_OUT_OF_MEMORY;
-
-	dtTempContour temp(tempVerts, maxTempVerts, tempPoly, maxTempVerts);
-	
-	// Find contours.
-	for (int y = 0; y < h; ++y)
-	{
-		for (int x = 0; x < w; ++x)
-		{
-			const int idx = x+y*w;
-			const unsigned char ri = layer.regs[idx];
-			if (ri == 0xff)
-				continue;
-			
-			dtTileCacheContour& cont = lcset.conts[ri];
-			
-			if (cont.nverts > 0)
-				continue;
-			
-			cont.reg = ri;
-			cont.area = layer.areas[idx];
-			
-			if (!walkContour(layer, x, y, temp))
-			{
-				// Too complex contour.
-				// Note: If you hit here ofte, try increasing 'maxTempVerts'.
-				return DT_FAILURE | DT_BUFFER_TOO_SMALL;
-			}
-			
-			simplifyContour(temp, maxError);
-			
-			// Store contour.
-			cont.nverts = temp.nverts;
-			if (cont.nverts > 0)
-			{
-				cont.verts = (unsigned char*)alloc->alloc(sizeof(unsigned char)*4*temp.nverts);
-				if (!cont.verts)
-					return DT_FAILURE | DT_OUT_OF_MEMORY;
-				
-				for (int i = 0, j = temp.nverts-1; i < temp.nverts; j=i++)
-				{
-					unsigned char* dst = &cont.verts[j*4];
-					unsigned char* v = &temp.verts[j*4];
-					unsigned char* vn = &temp.verts[i*4];
-					unsigned char nei = vn[3]; // The neighbour reg is stored at segment vertex of a segment. 
-					bool shouldRemove = false;
-					unsigned char lh = getCornerHeight(layer, (int)v[0], (int)v[1], (int)v[2],
-													   walkableClimb, shouldRemove);
-					
-					dst[0] = v[0];
-					dst[1] = lh;
-					dst[2] = v[2];
-					
-					// Store portal direction and remove status to the fourth component.
-					dst[3] = 0x0f;
-					if (nei != 0xff && nei >= 0xf8)
-						dst[3] = nei - 0xf8;
-					if (shouldRemove)
-						dst[3] |= 0x80;
-				}
-			}
-		}
-	}
-	
-	return DT_SUCCESS;
-}	
-
-
-
-static const int VERTEX_BUCKET_COUNT2 = (1<<8);
-
-inline int computeVertexHash2(int x, int y, int z)
-{
-	const unsigned int h1 = 0x8da6b343; // Large multiplicative constants;
-	const unsigned int h2 = 0xd8163841; // here arbitrarily chosen primes
-	const unsigned int h3 = 0xcb1ab31f;
-	unsigned int n = h1 * x + h2 * y + h3 * z;
-	return (int)(n & (VERTEX_BUCKET_COUNT2-1));
-}
-
-static unsigned short addVertex(unsigned short x, unsigned short y, unsigned short z,
-								unsigned short* verts, unsigned short* firstVert, unsigned short* nextVert, int& nv)
-{
-	int bucket = computeVertexHash2(x, 0, z);
-	unsigned short i = firstVert[bucket];
-	
-	while (i != DT_TILECACHE_NULL_IDX)
-	{
-		const unsigned short* v = &verts[i*3];
-		if (v[0] == x && v[2] == z && (dtAbs(v[1] - y) <= 2))
-			return i;
-		i = nextVert[i]; // next
-	}
-	
-	// Could not find, create new.
-	i = (unsigned short)nv; nv++;
-	unsigned short* v = &verts[i*3];
-	v[0] = x;
-	v[1] = y;
-	v[2] = z;
-	nextVert[i] = firstVert[bucket];
-	firstVert[bucket] = i;
-	
-	return (unsigned short)i;
-}
-
-
-struct rcEdge
-{
-	unsigned short vert[2];
-	unsigned short polyEdge[2];
-	unsigned short poly[2];
-};
-
-static bool buildMeshAdjacency(dtTileCacheAlloc* alloc,
-							   unsigned short* polys, const int npolys,
-							   const unsigned short* verts, const int nverts,
-							   const dtTileCacheContourSet& lcset)
-{
-	// Based on code by Eric Lengyel from:
-	// http://www.terathon.com/code/edges.php
-	
-	const int maxEdgeCount = npolys*MAX_VERTS_PER_POLY;
-	dtFixedArray<unsigned short> firstEdge(alloc, nverts + maxEdgeCount);
-	if (!firstEdge)
-		return false;
-	unsigned short* nextEdge = firstEdge + nverts;
-	int edgeCount = 0;
-	
-	dtFixedArray<rcEdge> edges(alloc, maxEdgeCount);
-	if (!edges)
-		return false;
-	
-	for (int i = 0; i < nverts; i++)
-		firstEdge[i] = DT_TILECACHE_NULL_IDX;
-	
-	for (int i = 0; i < npolys; ++i)
-	{
-		unsigned short* t = &polys[i*MAX_VERTS_PER_POLY*2];
-		for (int j = 0; j < MAX_VERTS_PER_POLY; ++j)
-		{
-			if (t[j] == DT_TILECACHE_NULL_IDX) break;
-			unsigned short v0 = t[j];
-			unsigned short v1 = (j+1 >= MAX_VERTS_PER_POLY || t[j+1] == DT_TILECACHE_NULL_IDX) ? t[0] : t[j+1];
-			if (v0 < v1)
-			{
-				rcEdge& edge = edges[edgeCount];
-				edge.vert[0] = v0;
-				edge.vert[1] = v1;
-				edge.poly[0] = (unsigned short)i;
-				edge.polyEdge[0] = (unsigned short)j;
-				edge.poly[1] = (unsigned short)i;
-				edge.polyEdge[1] = 0xff;
-				// Insert edge
-				nextEdge[edgeCount] = firstEdge[v0];
-				firstEdge[v0] = (unsigned short)edgeCount;
-				edgeCount++;
-			}
-		}
-	}
-	
-	for (int i = 0; i < npolys; ++i)
-	{
-		unsigned short* t = &polys[i*MAX_VERTS_PER_POLY*2];
-		for (int j = 0; j < MAX_VERTS_PER_POLY; ++j)
-		{
-			if (t[j] == DT_TILECACHE_NULL_IDX) break;
-			unsigned short v0 = t[j];
-			unsigned short v1 = (j+1 >= MAX_VERTS_PER_POLY || t[j+1] == DT_TILECACHE_NULL_IDX) ? t[0] : t[j+1];
-			if (v0 > v1)
-			{
-				bool found = false;
-				for (unsigned short e = firstEdge[v1]; e != DT_TILECACHE_NULL_IDX; e = nextEdge[e])
-				{
-					rcEdge& edge = edges[e];
-					if (edge.vert[1] == v0 && edge.poly[0] == edge.poly[1])
-					{
-						edge.poly[1] = (unsigned short)i;
-						edge.polyEdge[1] = (unsigned short)j;
-						found = true;
-						break;
-					}
-				}
-				if (!found)
-				{
-					// Matching edge not found, it is an open edge, add it.
-					rcEdge& edge = edges[edgeCount];
-					edge.vert[0] = v1;
-					edge.vert[1] = v0;
-					edge.poly[0] = (unsigned short)i;
-					edge.polyEdge[0] = (unsigned short)j;
-					edge.poly[1] = (unsigned short)i;
-					edge.polyEdge[1] = 0xff;
-					// Insert edge
-					nextEdge[edgeCount] = firstEdge[v1];
-					firstEdge[v1] = (unsigned short)edgeCount;
-					edgeCount++;
-				}
-			}
-		}
-	}
-	
-	// Mark portal edges.
-	for (int i = 0; i < lcset.nconts; ++i)
-	{
-		dtTileCacheContour& cont = lcset.conts[i];
-		if (cont.nverts < 3)
-			continue;
-		
-		for (int j = 0, k = cont.nverts-1; j < cont.nverts; k=j++)
-		{
-			const unsigned char* va = &cont.verts[k*4];
-			const unsigned char* vb = &cont.verts[j*4];
-			const unsigned char dir = va[3] & 0xf;
-			if (dir == 0xf)
-				continue;
-			
-			if (dir == 0 || dir == 2)
-			{
-				// Find matching vertical edge
-				const unsigned short x = (unsigned short)va[0];
-				unsigned short zmin = (unsigned short)va[2];
-				unsigned short zmax = (unsigned short)vb[2];
-				if (zmin > zmax)
-					dtSwap(zmin, zmax);
-				
-				for (int m = 0; m < edgeCount; ++m)
-				{
-					rcEdge& e = edges[m];
-					// Skip connected edges.
-					if (e.poly[0] != e.poly[1])
-						continue;
-					const unsigned short* eva = &verts[e.vert[0]*3];
-					const unsigned short* evb = &verts[e.vert[1]*3];
-					if (eva[0] == x && evb[0] == x)
-					{
-						unsigned short ezmin = eva[2];
-						unsigned short ezmax = evb[2];
-						if (ezmin > ezmax)
-							dtSwap(ezmin, ezmax);
-						if (overlapRangeExl(zmin,zmax, ezmin, ezmax))
-						{
-							// Reuse the other polyedge to store dir.
-							e.polyEdge[1] = dir;
-						}
-					}
-				}
-			}
-			else
-			{
-				// Find matching vertical edge
-				const unsigned short z = (unsigned short)va[2];
-				unsigned short xmin = (unsigned short)va[0];
-				unsigned short xmax = (unsigned short)vb[0];
-				if (xmin > xmax)
-					dtSwap(xmin, xmax);
-				for (int m = 0; m < edgeCount; ++m)
-				{
-					rcEdge& e = edges[m];
-					// Skip connected edges.
-					if (e.poly[0] != e.poly[1])
-						continue;
-					const unsigned short* eva = &verts[e.vert[0]*3];
-					const unsigned short* evb = &verts[e.vert[1]*3];
-					if (eva[2] == z && evb[2] == z)
-					{
-						unsigned short exmin = eva[0];
-						unsigned short exmax = evb[0];
-						if (exmin > exmax)
-							dtSwap(exmin, exmax);
-						if (overlapRangeExl(xmin,xmax, exmin, exmax))
-						{
-							// Reuse the other polyedge to store dir.
-							e.polyEdge[1] = dir;
-						}
-					}
-				}
-			}
-		}
-	}
-	
-	
-	// Store adjacency
-	for (int i = 0; i < edgeCount; ++i)
-	{
-		const rcEdge& e = edges[i];
-		if (e.poly[0] != e.poly[1])
-		{
-			unsigned short* p0 = &polys[e.poly[0]*MAX_VERTS_PER_POLY*2];
-			unsigned short* p1 = &polys[e.poly[1]*MAX_VERTS_PER_POLY*2];
-			p0[MAX_VERTS_PER_POLY + e.polyEdge[0]] = e.poly[1];
-			p1[MAX_VERTS_PER_POLY + e.polyEdge[1]] = e.poly[0];
-		}
-		else if (e.polyEdge[1] != 0xff)
-		{
-			unsigned short* p0 = &polys[e.poly[0]*MAX_VERTS_PER_POLY*2];
-			p0[MAX_VERTS_PER_POLY + e.polyEdge[0]] = 0x8000 | (unsigned short)e.polyEdge[1];
-		}
-		
-	}
-	
-	return true;
-}
-
-
-// Last time I checked the if version got compiled using cmov, which was a lot faster than module (with idiv).
-inline int prev(int i, int n) { return i-1 >= 0 ? i-1 : n-1; }
-inline int next(int i, int n) { return i+1 < n ? i+1 : 0; }
-
-inline int area2(const unsigned char* a, const unsigned char* b, const unsigned char* c)
-{
-	return ((int)b[0] - (int)a[0]) * ((int)c[2] - (int)a[2]) - ((int)c[0] - (int)a[0]) * ((int)b[2] - (int)a[2]);
-}
-
-//	Exclusive or: true iff exactly one argument is true.
-//	The arguments are negated to ensure that they are 0/1
-//	values.  Then the bitwise Xor operator may apply.
-//	(This idea is due to Michael Baldwin.)
-inline bool xorb(bool x, bool y)
-{
-	return !x ^ !y;
-}
-
-// Returns true iff c is strictly to the left of the directed
-// line through a to b.
-inline bool left(const unsigned char* a, const unsigned char* b, const unsigned char* c)
-{
-	return area2(a, b, c) < 0;
-}
-
-inline bool leftOn(const unsigned char* a, const unsigned char* b, const unsigned char* c)
-{
-	return area2(a, b, c) <= 0;
-}
-
-inline bool collinear(const unsigned char* a, const unsigned char* b, const unsigned char* c)
-{
-	return area2(a, b, c) == 0;
-}
-
-//	Returns true iff ab properly intersects cd: they share
-//	a point interior to both segments.  The properness of the
-//	intersection is ensured by using strict leftness.
-static bool intersectProp(const unsigned char* a, const unsigned char* b,
-						  const unsigned char* c, const unsigned char* d)
-{
-	// Eliminate improper cases.
-	if (collinear(a,b,c) || collinear(a,b,d) ||
-		collinear(c,d,a) || collinear(c,d,b))
-		return false;
-	
-	return xorb(left(a,b,c), left(a,b,d)) && xorb(left(c,d,a), left(c,d,b));
-}
-
-// Returns T iff (a,b,c) are collinear and point c lies 
-// on the closed segement ab.
-static bool between(const unsigned char* a, const unsigned char* b, const unsigned char* c)
-{
-	if (!collinear(a, b, c))
-		return false;
-	// If ab not vertical, check betweenness on x; else on y.
-	if (a[0] != b[0])
-		return ((a[0] <= c[0]) && (c[0] <= b[0])) || ((a[0] >= c[0]) && (c[0] >= b[0]));
-	else
-		return ((a[2] <= c[2]) && (c[2] <= b[2])) || ((a[2] >= c[2]) && (c[2] >= b[2]));
-}
-
-// Returns true iff segments ab and cd intersect, properly or improperly.
-static bool intersect(const unsigned char* a, const unsigned char* b,
-					  const unsigned char* c, const unsigned char* d)
-{
-	if (intersectProp(a, b, c, d))
-		return true;
-	else if (between(a, b, c) || between(a, b, d) ||
-			 between(c, d, a) || between(c, d, b))
-		return true;
-	else
-		return false;
-}
-
-static bool vequal(const unsigned char* a, const unsigned char* b)
-{
-	return a[0] == b[0] && a[2] == b[2];
-}
-
-// Returns T iff (v_i, v_j) is a proper internal *or* external
-// diagonal of P, *ignoring edges incident to v_i and v_j*.
-static bool diagonalie(int i, int j, int n, const unsigned char* verts, const unsigned short* indices)
-{
-	const unsigned char* d0 = &verts[(indices[i] & 0x7fff) * 4];
-	const unsigned char* d1 = &verts[(indices[j] & 0x7fff) * 4];
-	
-	// For each edge (k,k+1) of P
-	for (int k = 0; k < n; k++)
-	{
-		int k1 = next(k, n);
-		// Skip edges incident to i or j
-		if (!((k == i) || (k1 == i) || (k == j) || (k1 == j)))
-		{
-			const unsigned char* p0 = &verts[(indices[k] & 0x7fff) * 4];
-			const unsigned char* p1 = &verts[(indices[k1] & 0x7fff) * 4];
-			
-			if (vequal(d0, p0) || vequal(d1, p0) || vequal(d0, p1) || vequal(d1, p1))
-				continue;
-			
-			if (intersect(d0, d1, p0, p1))
-				return false;
-		}
-	}
-	return true;
-}
-
-// Returns true iff the diagonal (i,j) is strictly internal to the 
-// polygon P in the neighborhood of the i endpoint.
-static bool	inCone(int i, int j, int n, const unsigned char* verts, const unsigned short* indices)
-{
-	const unsigned char* pi = &verts[(indices[i] & 0x7fff) * 4];
-	const unsigned char* pj = &verts[(indices[j] & 0x7fff) * 4];
-	const unsigned char* pi1 = &verts[(indices[next(i, n)] & 0x7fff) * 4];
-	const unsigned char* pin1 = &verts[(indices[prev(i, n)] & 0x7fff) * 4];
-	
-	// If P[i] is a convex vertex [ i+1 left or on (i-1,i) ].
-	if (leftOn(pin1, pi, pi1))
-		return left(pi, pj, pin1) && left(pj, pi, pi1);
-	// Assume (i-1,i,i+1) not collinear.
-	// else P[i] is reflex.
-	return !(leftOn(pi, pj, pi1) && leftOn(pj, pi, pin1));
-}
-
-// Returns T iff (v_i, v_j) is a proper internal
-// diagonal of P.
-static bool diagonal(int i, int j, int n, const unsigned char* verts, const unsigned short* indices)
-{
-	return inCone(i, j, n, verts, indices) && diagonalie(i, j, n, verts, indices);
-}
-
-static int triangulate(int n, const unsigned char* verts, unsigned short* indices, unsigned short* tris)
-{
-	int ntris = 0;
-	unsigned short* dst = tris;
-	
-	// The last bit of the index is used to indicate if the vertex can be removed.
-	for (int i = 0; i < n; i++)
-	{
-		int i1 = next(i, n);
-		int i2 = next(i1, n);
-		if (diagonal(i, i2, n, verts, indices))
-			indices[i1] |= 0x8000;
-	}
-	
-	while (n > 3)
-	{
-		int minLen = -1;
-		int mini = -1;
-		for (int i = 0; i < n; i++)
-		{
-			int i1 = next(i, n);
-			if (indices[i1] & 0x8000)
-			{
-				const unsigned char* p0 = &verts[(indices[i] & 0x7fff) * 4];
-				const unsigned char* p2 = &verts[(indices[next(i1, n)] & 0x7fff) * 4];
-				
-				const int dx = (int)p2[0] - (int)p0[0];
-				const int dz = (int)p2[2] - (int)p0[2];
-				const int len = dx*dx + dz*dz;
-				if (minLen < 0 || len < minLen)
-				{
-					minLen = len;
-					mini = i;
-				}
-			}
-		}
-		
-		if (mini == -1)
-		{
-			// Should not happen.
-			/*			printf("mini == -1 ntris=%d n=%d\n", ntris, n);
-			 for (int i = 0; i < n; i++)
-			 {
-			 printf("%d ", indices[i] & 0x0fffffff);
-			 }
-			 printf("\n");*/
-			return -ntris;
-		}
-		
-		int i = mini;
-		int i1 = next(i, n);
-		int i2 = next(i1, n);
-		
-		*dst++ = indices[i] & 0x7fff;
-		*dst++ = indices[i1] & 0x7fff;
-		*dst++ = indices[i2] & 0x7fff;
-		ntris++;
-		
-		// Removes P[i1] by copying P[i+1]...P[n-1] left one index.
-		n--;
-		for (int k = i1; k < n; k++)
-			indices[k] = indices[k+1];
-		
-		if (i1 >= n) i1 = 0;
-		i = prev(i1,n);
-		// Update diagonal flags.
-		if (diagonal(prev(i, n), i1, n, verts, indices))
-			indices[i] |= 0x8000;
-		else
-			indices[i] &= 0x7fff;
-		
-		if (diagonal(i, next(i1, n), n, verts, indices))
-			indices[i1] |= 0x8000;
-		else
-			indices[i1] &= 0x7fff;
-	}
-	
-	// Append the remaining triangle.
-	*dst++ = indices[0] & 0x7fff;
-	*dst++ = indices[1] & 0x7fff;
-	*dst++ = indices[2] & 0x7fff;
-	ntris++;
-	
-	return ntris;
-}
-
-
-static int countPolyVerts(const unsigned short* p)
-{
-	for (int i = 0; i < MAX_VERTS_PER_POLY; ++i)
-		if (p[i] == DT_TILECACHE_NULL_IDX)
-			return i;
-	return MAX_VERTS_PER_POLY;
-}
-
-inline bool uleft(const unsigned short* a, const unsigned short* b, const unsigned short* c)
-{
-	return ((int)b[0] - (int)a[0]) * ((int)c[2] - (int)a[2]) -
-	((int)c[0] - (int)a[0]) * ((int)b[2] - (int)a[2]) < 0;
-}
-
-static int getPolyMergeValue(unsigned short* pa, unsigned short* pb,
-							 const unsigned short* verts, int& ea, int& eb)
-{
-	const int na = countPolyVerts(pa);
-	const int nb = countPolyVerts(pb);
-	
-	// If the merged polygon would be too big, do not merge.
-	if (na+nb-2 > MAX_VERTS_PER_POLY)
-		return -1;
-	
-	// Check if the polygons share an edge.
-	ea = -1;
-	eb = -1;
-	
-	for (int i = 0; i < na; ++i)
-	{
-		unsigned short va0 = pa[i];
-		unsigned short va1 = pa[(i+1) % na];
-		if (va0 > va1)
-			dtSwap(va0, va1);
-		for (int j = 0; j < nb; ++j)
-		{
-			unsigned short vb0 = pb[j];
-			unsigned short vb1 = pb[(j+1) % nb];
-			if (vb0 > vb1)
-				dtSwap(vb0, vb1);
-			if (va0 == vb0 && va1 == vb1)
-			{
-				ea = i;
-				eb = j;
-				break;
-			}
-		}
-	}
-	
-	// No common edge, cannot merge.
-	if (ea == -1 || eb == -1)
-		return -1;
-	
-	// Check to see if the merged polygon would be convex.
-	unsigned short va, vb, vc;
-	
-	va = pa[(ea+na-1) % na];
-	vb = pa[ea];
-	vc = pb[(eb+2) % nb];
-	if (!uleft(&verts[va*3], &verts[vb*3], &verts[vc*3]))
-		return -1;
-	
-	va = pb[(eb+nb-1) % nb];
-	vb = pb[eb];
-	vc = pa[(ea+2) % na];
-	if (!uleft(&verts[va*3], &verts[vb*3], &verts[vc*3]))
-		return -1;
-	
-	va = pa[ea];
-	vb = pa[(ea+1)%na];
-	
-	int dx = (int)verts[va*3+0] - (int)verts[vb*3+0];
-	int dy = (int)verts[va*3+2] - (int)verts[vb*3+2];
-	
-	return dx*dx + dy*dy;
-}
-
-static void mergePolys(unsigned short* pa, unsigned short* pb, int ea, int eb)
-{
-	unsigned short tmp[MAX_VERTS_PER_POLY*2];
-	
-	const int na = countPolyVerts(pa);
-	const int nb = countPolyVerts(pb);
-	
-	// Merge polygons.
-	memset(tmp, 0xff, sizeof(unsigned short)*MAX_VERTS_PER_POLY*2);
-	int n = 0;
-	// Add pa
-	for (int i = 0; i < na-1; ++i)
-		tmp[n++] = pa[(ea+1+i) % na];
-	// Add pb
-	for (int i = 0; i < nb-1; ++i)
-		tmp[n++] = pb[(eb+1+i) % nb];
-	
-	memcpy(pa, tmp, sizeof(unsigned short)*MAX_VERTS_PER_POLY);
-}
-
-
-static void pushFront(unsigned short v, unsigned short* arr, int& an)
-{
-	an++;
-	for (int i = an-1; i > 0; --i)
-		arr[i] = arr[i-1];
-	arr[0] = v;
-}
-
-static void pushBack(unsigned short v, unsigned short* arr, int& an)
-{
-	arr[an] = v;
-	an++;
-}
-
-static bool canRemoveVertex(dtTileCachePolyMesh& mesh, const unsigned short rem)
-{
-	// Count number of polygons to remove.
-	int numRemovedVerts = 0;
-	int numTouchedVerts = 0;
-	int numRemainingEdges = 0;
-	for (int i = 0; i < mesh.npolys; ++i)
-	{
-		unsigned short* p = &mesh.polys[i*MAX_VERTS_PER_POLY*2];
-		const int nv = countPolyVerts(p);
-		int numRemoved = 0;
-		int numVerts = 0;
-		for (int j = 0; j < nv; ++j)
-		{
-			if (p[j] == rem)
-			{
-				numTouchedVerts++;
-				numRemoved++;
-			}
-			numVerts++;
-		}
-		if (numRemoved)
-		{
-			numRemovedVerts += numRemoved;
-			numRemainingEdges += numVerts-(numRemoved+1);
-		}
-	}
-	
-	// There would be too few edges remaining to create a polygon.
-	// This can happen for example when a tip of a triangle is marked
-	// as deletion, but there are no other polys that share the vertex.
-	// In this case, the vertex should not be removed.
-	if (numRemainingEdges <= 2)
-		return false;
-	
-	// Check that there is enough memory for the test.
-	const int maxEdges = numTouchedVerts*2;
-	if (maxEdges > MAX_REM_EDGES)
-		return false;
-	
-	// Find edges which share the removed vertex.
-	unsigned short edges[MAX_REM_EDGES];
-	int nedges = 0;
-	
-	for (int i = 0; i < mesh.npolys; ++i)
-	{
-		unsigned short* p = &mesh.polys[i*MAX_VERTS_PER_POLY*2];
-		const int nv = countPolyVerts(p);
-		
-		// Collect edges which touches the removed vertex.
-		for (int j = 0, k = nv-1; j < nv; k = j++)
-		{
-			if (p[j] == rem || p[k] == rem)
-			{
-				// Arrange edge so that a=rem.
-				int a = p[j], b = p[k];
-				if (b == rem)
-					dtSwap(a,b);
-				
-				// Check if the edge exists
-				bool exists = false;
-				for (int m = 0; m < nedges; ++m)
-				{
-					unsigned short* e = &edges[m*3];
-					if (e[1] == b)
-					{
-						// Exists, increment vertex share count.
-						e[2]++;
-						exists = true;
-					}
-				}
-				// Add new edge.
-				if (!exists)
-				{
-					unsigned short* e = &edges[nedges*3];
-					e[0] = (unsigned short)a;
-					e[1] = (unsigned short)b;
-					e[2] = 1;
-					nedges++;
-				}
-			}
-		}
-	}
-	
-	// There should be no more than 2 open edges.
-	// This catches the case that two non-adjacent polygons
-	// share the removed vertex. In that case, do not remove the vertex.
-	int numOpenEdges = 0;
-	for (int i = 0; i < nedges; ++i)
-	{
-		if (edges[i*3+2] < 2)
-			numOpenEdges++;
-	}
-	if (numOpenEdges > 2)
-		return false;
-	
-	return true;
-}
-
-static dtStatus removeVertex(dtTileCachePolyMesh& mesh, const unsigned short rem, const int maxTris)
-{
-	// Count number of polygons to remove.
-	int numRemovedVerts = 0;
-	for (int i = 0; i < mesh.npolys; ++i)
-	{
-		unsigned short* p = &mesh.polys[i*MAX_VERTS_PER_POLY*2];
-		const int nv = countPolyVerts(p);
-		for (int j = 0; j < nv; ++j)
-		{
-			if (p[j] == rem)
-				numRemovedVerts++;
-		}
-	}
-	
-	int nedges = 0;
-	unsigned short edges[MAX_REM_EDGES*3];
-	int nhole = 0;
-	unsigned short hole[MAX_REM_EDGES];
-	int nharea = 0;
-	unsigned short harea[MAX_REM_EDGES];
-	
-	for (int i = 0; i < mesh.npolys; ++i)
-	{
-		unsigned short* p = &mesh.polys[i*MAX_VERTS_PER_POLY*2];
-		const int nv = countPolyVerts(p);
-		bool hasRem = false;
-		for (int j = 0; j < nv; ++j)
-			if (p[j] == rem) hasRem = true;
-		if (hasRem)
-		{
-			// Collect edges which does not touch the removed vertex.
-			for (int j = 0, k = nv-1; j < nv; k = j++)
-			{
-				if (p[j] != rem && p[k] != rem)
-				{
-					if (nedges >= MAX_REM_EDGES)
-						return DT_FAILURE | DT_BUFFER_TOO_SMALL;
-					unsigned short* e = &edges[nedges*3];
-					e[0] = p[k];
-					e[1] = p[j];
-					e[2] = mesh.areas[i];
-					nedges++;
-				}
-			}
-			// Remove the polygon.
-			unsigned short* p2 = &mesh.polys[(mesh.npolys-1)*MAX_VERTS_PER_POLY*2];
-			memcpy(p,p2,sizeof(unsigned short)*MAX_VERTS_PER_POLY);
-			memset(p+MAX_VERTS_PER_POLY,0xff,sizeof(unsigned short)*MAX_VERTS_PER_POLY);
-			mesh.areas[i] = mesh.areas[mesh.npolys-1];
-			mesh.npolys--;
-			--i;
-		}
-	}
-	
-	// Remove vertex.
-	for (int i = (int)rem; i < mesh.nverts; ++i)
-	{
-		mesh.verts[i*3+0] = mesh.verts[(i+1)*3+0];
-		mesh.verts[i*3+1] = mesh.verts[(i+1)*3+1];
-		mesh.verts[i*3+2] = mesh.verts[(i+1)*3+2];
-	}
-	mesh.nverts--;
-	
-	// Adjust indices to match the removed vertex layout.
-	for (int i = 0; i < mesh.npolys; ++i)
-	{
-		unsigned short* p = &mesh.polys[i*MAX_VERTS_PER_POLY*2];
-		const int nv = countPolyVerts(p);
-		for (int j = 0; j < nv; ++j)
-			if (p[j] > rem) p[j]--;
-	}
-	for (int i = 0; i < nedges; ++i)
-	{
-		if (edges[i*3+0] > rem) edges[i*3+0]--;
-		if (edges[i*3+1] > rem) edges[i*3+1]--;
-	}
-	
-	if (nedges == 0)
-		return DT_SUCCESS;
-	
-	// Start with one vertex, keep appending connected
-	// segments to the start and end of the hole.
-	pushBack(edges[0], hole, nhole);
-	pushBack(edges[2], harea, nharea);
-	
-	while (nedges)
-	{
-		bool match = false;
-		
-		for (int i = 0; i < nedges; ++i)
-		{
-			const unsigned short ea = edges[i*3+0];
-			const unsigned short eb = edges[i*3+1];
-			const unsigned short a = edges[i*3+2];
-			bool add = false;
-			if (hole[0] == eb)
-			{
-				// The segment matches the beginning of the hole boundary.
-				if (nhole >= MAX_REM_EDGES)
-					return DT_FAILURE | DT_BUFFER_TOO_SMALL;
-				pushFront(ea, hole, nhole);
-				pushFront(a, harea, nharea);
-				add = true;
-			}
-			else if (hole[nhole-1] == ea)
-			{
-				// The segment matches the end of the hole boundary.
-				if (nhole >= MAX_REM_EDGES)
-					return DT_FAILURE | DT_BUFFER_TOO_SMALL;
-				pushBack(eb, hole, nhole);
-				pushBack(a, harea, nharea);
-				add = true;
-			}
-			if (add)
-			{
-				// The edge segment was added, remove it.
-				edges[i*3+0] = edges[(nedges-1)*3+0];
-				edges[i*3+1] = edges[(nedges-1)*3+1];
-				edges[i*3+2] = edges[(nedges-1)*3+2];
-				--nedges;
-				match = true;
-				--i;
-			}
-		}
-		
-		if (!match)
-			break;
-	}
-	
-	
-	unsigned short tris[MAX_REM_EDGES*3];
-	unsigned char tverts[MAX_REM_EDGES*3];
-	unsigned short tpoly[MAX_REM_EDGES*3];
-	
-	// Generate temp vertex array for triangulation.
-	for (int i = 0; i < nhole; ++i)
-	{
-		const unsigned short pi = hole[i];
-		tverts[i*4+0] = (unsigned char)mesh.verts[pi*3+0];
-		tverts[i*4+1] = (unsigned char)mesh.verts[pi*3+1];
-		tverts[i*4+2] = (unsigned char)mesh.verts[pi*3+2];
-		tverts[i*4+3] = 0;
-		tpoly[i] = (unsigned short)i;
-	}
-	
-	// Triangulate the hole.
-	int ntris = triangulate(nhole, tverts, tpoly, tris);
-	if (ntris < 0)
-	{
-		// TODO: issue warning!
-		ntris = -ntris;
-	}
-	
-	if (ntris > MAX_REM_EDGES)
-		return DT_FAILURE | DT_BUFFER_TOO_SMALL;
-	
-	unsigned short polys[MAX_REM_EDGES*MAX_VERTS_PER_POLY];
-	unsigned char pareas[MAX_REM_EDGES];
-	
-	// Build initial polygons.
-	int npolys = 0;
-	memset(polys, 0xff, ntris*MAX_VERTS_PER_POLY*sizeof(unsigned short));
-	for (int j = 0; j < ntris; ++j)
-	{
-		unsigned short* t = &tris[j*3];
-		if (t[0] != t[1] && t[0] != t[2] && t[1] != t[2])
-		{
-			polys[npolys*MAX_VERTS_PER_POLY+0] = hole[t[0]];
-			polys[npolys*MAX_VERTS_PER_POLY+1] = hole[t[1]];
-			polys[npolys*MAX_VERTS_PER_POLY+2] = hole[t[2]];
-			pareas[npolys] = (unsigned char)harea[t[0]];
-			npolys++;
-		}
-	}
-	if (!npolys)
-		return DT_SUCCESS;
-	
-	// Merge polygons.
-	int maxVertsPerPoly = MAX_VERTS_PER_POLY;
-	if (maxVertsPerPoly > 3)
-	{
-		for (;;)
-		{
-			// Find best polygons to merge.
-			int bestMergeVal = 0;
-			int bestPa = 0, bestPb = 0, bestEa = 0, bestEb = 0;
-			
-			for (int j = 0; j < npolys-1; ++j)
-			{
-				unsigned short* pj = &polys[j*MAX_VERTS_PER_POLY];
-				for (int k = j+1; k < npolys; ++k)
-				{
-					unsigned short* pk = &polys[k*MAX_VERTS_PER_POLY];
-					int ea, eb;
-					int v = getPolyMergeValue(pj, pk, mesh.verts, ea, eb);
-					if (v > bestMergeVal)
-					{
-						bestMergeVal = v;
-						bestPa = j;
-						bestPb = k;
-						bestEa = ea;
-						bestEb = eb;
-					}
-				}
-			}
-			
-			if (bestMergeVal > 0)
-			{
-				// Found best, merge.
-				unsigned short* pa = &polys[bestPa*MAX_VERTS_PER_POLY];
-				unsigned short* pb = &polys[bestPb*MAX_VERTS_PER_POLY];
-				mergePolys(pa, pb, bestEa, bestEb);
-				memcpy(pb, &polys[(npolys-1)*MAX_VERTS_PER_POLY], sizeof(unsigned short)*MAX_VERTS_PER_POLY);
-				pareas[bestPb] = pareas[npolys-1];
-				npolys--;
-			}
-			else
-			{
-				// Could not merge any polygons, stop.
-				break;
-			}
-		}
-	}
-	
-	// Store polygons.
-	for (int i = 0; i < npolys; ++i)
-	{
-		if (mesh.npolys >= maxTris) break;
-		unsigned short* p = &mesh.polys[mesh.npolys*MAX_VERTS_PER_POLY*2];
-		memset(p,0xff,sizeof(unsigned short)*MAX_VERTS_PER_POLY*2);
-		for (int j = 0; j < MAX_VERTS_PER_POLY; ++j)
-			p[j] = polys[i*MAX_VERTS_PER_POLY+j];
-		mesh.areas[mesh.npolys] = pareas[i];
-		mesh.npolys++;
-		if (mesh.npolys > maxTris)
-			return DT_FAILURE | DT_BUFFER_TOO_SMALL;
-	}
-	
-	return DT_SUCCESS;
-}
-
-
-dtStatus dtBuildTileCachePolyMesh(dtTileCacheAlloc* alloc,
-								  dtTileCacheContourSet& lcset,
-								  dtTileCachePolyMesh& mesh)
-{
-	dtAssert(alloc);
-	
-	int maxVertices = 0;
-	int maxTris = 0;
-	int maxVertsPerCont = 0;
-	for (int i = 0; i < lcset.nconts; ++i)
-	{
-		// Skip null contours.
-		if (lcset.conts[i].nverts < 3) continue;
-		maxVertices += lcset.conts[i].nverts;
-		maxTris += lcset.conts[i].nverts - 2;
-		maxVertsPerCont = dtMax(maxVertsPerCont, lcset.conts[i].nverts);
-	}
-
-	// TODO: warn about too many vertices?
-	
-	mesh.nvp = MAX_VERTS_PER_POLY;
-	
-	dtFixedArray<unsigned char> vflags(alloc, maxVertices);
-	if (!vflags)
-		return DT_FAILURE | DT_OUT_OF_MEMORY;
-	memset(vflags, 0, maxVertices);
-	
-	mesh.verts = (unsigned short*)alloc->alloc(sizeof(unsigned short)*maxVertices*3);
-	if (!mesh.verts)
-		return DT_FAILURE | DT_OUT_OF_MEMORY;
-	
-	mesh.polys = (unsigned short*)alloc->alloc(sizeof(unsigned short)*maxTris*MAX_VERTS_PER_POLY*2);
-	if (!mesh.polys)
-		return DT_FAILURE | DT_OUT_OF_MEMORY;
-
-	mesh.areas = (unsigned char*)alloc->alloc(sizeof(unsigned char)*maxTris);
-	if (!mesh.areas)
-		return DT_FAILURE | DT_OUT_OF_MEMORY;
-
-	mesh.flags = (unsigned short*)alloc->alloc(sizeof(unsigned short)*maxTris);
-	if (!mesh.flags)
-		return DT_FAILURE | DT_OUT_OF_MEMORY;
-
-	// Just allocate and clean the mesh flags array. The user is resposible for filling it.
-	memset(mesh.flags, 0, sizeof(unsigned short) * maxTris);
-		
-	mesh.nverts = 0;
-	mesh.npolys = 0;
-	
-	memset(mesh.verts, 0, sizeof(unsigned short)*maxVertices*3);
-	memset(mesh.polys, 0xff, sizeof(unsigned short)*maxTris*MAX_VERTS_PER_POLY*2);
-	memset(mesh.areas, 0, sizeof(unsigned char)*maxTris);
-	
-	unsigned short firstVert[VERTEX_BUCKET_COUNT2];
-	for (int i = 0; i < VERTEX_BUCKET_COUNT2; ++i)
-		firstVert[i] = DT_TILECACHE_NULL_IDX;
-	
-	dtFixedArray<unsigned short> nextVert(alloc, maxVertices);
-	if (!nextVert)
-		return DT_FAILURE | DT_OUT_OF_MEMORY;
-	memset(nextVert, 0, sizeof(unsigned short)*maxVertices);
-	
-	dtFixedArray<unsigned short> indices(alloc, maxVertsPerCont);
-	if (!indices)
-		return DT_FAILURE | DT_OUT_OF_MEMORY;
-	
-	dtFixedArray<unsigned short> tris(alloc, maxVertsPerCont*3);
-	if (!tris)
-		return DT_FAILURE | DT_OUT_OF_MEMORY;
-
-	dtFixedArray<unsigned short> polys(alloc, maxVertsPerCont*MAX_VERTS_PER_POLY);
-	if (!polys)
-		return DT_FAILURE | DT_OUT_OF_MEMORY;
-	
-	for (int i = 0; i < lcset.nconts; ++i)
-	{
-		dtTileCacheContour& cont = lcset.conts[i];
-		
-		// Skip null contours.
-		if (cont.nverts < 3)
-			continue;
-		
-		// Triangulate contour
-		for (int j = 0; j < cont.nverts; ++j)
-			indices[j] = (unsigned short)j;
-		
-		int ntris = triangulate(cont.nverts, cont.verts, &indices[0], &tris[0]);
-		if (ntris <= 0)
-		{
-			// TODO: issue warning!
-			ntris = -ntris;
-		}
-		
-		// Add and merge vertices.
-		for (int j = 0; j < cont.nverts; ++j)
-		{
-			const unsigned char* v = &cont.verts[j*4];
-			indices[j] = addVertex((unsigned short)v[0], (unsigned short)v[1], (unsigned short)v[2],
-								   mesh.verts, firstVert, nextVert, mesh.nverts);
-			if (v[3] & 0x80)
-			{
-				// This vertex should be removed.
-				vflags[indices[j]] = 1;
-			}
-		}
-		
-		// Build initial polygons.
-		int npolys = 0;
-		memset(polys, 0xff, sizeof(unsigned short) * maxVertsPerCont * MAX_VERTS_PER_POLY);
-		for (int j = 0; j < ntris; ++j)
-		{
-			const unsigned short* t = &tris[j*3];
-			if (t[0] != t[1] && t[0] != t[2] && t[1] != t[2])
-			{
-				polys[npolys*MAX_VERTS_PER_POLY+0] = indices[t[0]];
-				polys[npolys*MAX_VERTS_PER_POLY+1] = indices[t[1]];
-				polys[npolys*MAX_VERTS_PER_POLY+2] = indices[t[2]];
-				npolys++;
-			}
-		}
-		if (!npolys)
-			continue;
-		
-		// Merge polygons.
-		int maxVertsPerPoly =MAX_VERTS_PER_POLY ;
-		if (maxVertsPerPoly > 3)
-		{
-			for(;;)
-			{
-				// Find best polygons to merge.
-				int bestMergeVal = 0;
-				int bestPa = 0, bestPb = 0, bestEa = 0, bestEb = 0;
-				
-				for (int j = 0; j < npolys-1; ++j)
-				{
-					unsigned short* pj = &polys[j*MAX_VERTS_PER_POLY];
-					for (int k = j+1; k < npolys; ++k)
-					{
-						unsigned short* pk = &polys[k*MAX_VERTS_PER_POLY];
-						int ea, eb;
-						int v = getPolyMergeValue(pj, pk, mesh.verts, ea, eb);
-						if (v > bestMergeVal)
-						{
-							bestMergeVal = v;
-							bestPa = j;
-							bestPb = k;
-							bestEa = ea;
-							bestEb = eb;
-						}
-					}
-				}
-				
-				if (bestMergeVal > 0)
-				{
-					// Found best, merge.
-					unsigned short* pa = &polys[bestPa*MAX_VERTS_PER_POLY];
-					unsigned short* pb = &polys[bestPb*MAX_VERTS_PER_POLY];
-					mergePolys(pa, pb, bestEa, bestEb);
-					memcpy(pb, &polys[(npolys-1)*MAX_VERTS_PER_POLY], sizeof(unsigned short)*MAX_VERTS_PER_POLY);
-					npolys--;
-				}
-				else
-				{
-					// Could not merge any polygons, stop.
-					break;
-				}
-			}
-		}
-		
-		// Store polygons.
-		for (int j = 0; j < npolys; ++j)
-		{
-			unsigned short* p = &mesh.polys[mesh.npolys*MAX_VERTS_PER_POLY*2];
-			unsigned short* q = &polys[j*MAX_VERTS_PER_POLY];
-			for (int k = 0; k < MAX_VERTS_PER_POLY; ++k)
-				p[k] = q[k];
-			mesh.areas[mesh.npolys] = cont.area;
-			mesh.npolys++;
-			if (mesh.npolys > maxTris)
-				return DT_FAILURE | DT_BUFFER_TOO_SMALL;
-		}
-	}
-	
-	
-	// Remove edge vertices.
-	for (int i = 0; i < mesh.nverts; ++i)
-	{
-		if (vflags[i])
-		{
-			if (!canRemoveVertex(mesh, (unsigned short)i))
-				continue;
-			dtStatus status = removeVertex(mesh, (unsigned short)i, maxTris);
-			if (dtStatusFailed(status))
-				return status;
-			// Remove vertex
-			// Note: mesh.nverts is already decremented inside removeVertex()!
-			for (int j = i; j < mesh.nverts; ++j)
-				vflags[j] = vflags[j+1];
-			--i;
-		}
-	}
-	
-	// Calculate adjacency.
-	if (!buildMeshAdjacency(alloc, mesh.polys, mesh.npolys, mesh.verts, mesh.nverts, lcset))
-		return DT_FAILURE | DT_OUT_OF_MEMORY;
-		
-	return DT_SUCCESS;
-}
-
-dtStatus dtMarkCylinderArea(dtTileCacheLayer& layer, const float* orig, const float cs, const float ch,
-							const float* pos, const float radius, const float height, const unsigned char areaId)
-{
-	float bmin[3], bmax[3];
-	bmin[0] = pos[0] - radius;
-	bmin[1] = pos[1];
-	bmin[2] = pos[2] - radius;
-	bmax[0] = pos[0] + radius;
-	bmax[1] = pos[1] + height;
-	bmax[2] = pos[2] + radius;
-	const float r2 = dtSqr(radius/cs + 0.5f);
-
-	const int w = (int)layer.header->width;
-	const int h = (int)layer.header->height;
-	const float ics = 1.0f/cs;
-	const float ich = 1.0f/ch;
-	
-	const float px = (pos[0]-orig[0])*ics;
-	const float pz = (pos[2]-orig[2])*ics;
-	
-	int minx = (int)dtMathFloorf((bmin[0]-orig[0])*ics);
-	int miny = (int)dtMathFloorf((bmin[1]-orig[1])*ich);
-	int minz = (int)dtMathFloorf((bmin[2]-orig[2])*ics);
-	int maxx = (int)dtMathFloorf((bmax[0]-orig[0])*ics);
-	int maxy = (int)dtMathFloorf((bmax[1]-orig[1])*ich);
-	int maxz = (int)dtMathFloorf((bmax[2]-orig[2])*ics);
-
-	if (maxx < 0) return DT_SUCCESS;
-	if (minx >= w) return DT_SUCCESS;
-	if (maxz < 0) return DT_SUCCESS;
-	if (minz >= h) return DT_SUCCESS;
-	
-	if (minx < 0) minx = 0;
-	if (maxx >= w) maxx = w-1;
-	if (minz < 0) minz = 0;
-	if (maxz >= h) maxz = h-1;
-	
-	for (int z = minz; z <= maxz; ++z)
-	{
-		for (int x = minx; x <= maxx; ++x)
-		{
-			const float dx = (float)(x+0.5f) - px;
-			const float dz = (float)(z+0.5f) - pz;
-			if (dx*dx + dz*dz > r2)
-				continue;
-			const int y = layer.heights[x+z*w];
-			if (y < miny || y > maxy)
-				continue;
-			layer.areas[x+z*w] = areaId;
-		}
-	}
-
-	return DT_SUCCESS;
-}
-
-dtStatus dtMarkBoxArea(dtTileCacheLayer& layer, const float* orig, const float cs, const float ch,
-					   const float* bmin, const float* bmax, const unsigned char areaId)
-{
-	const int w = (int)layer.header->width;
-	const int h = (int)layer.header->height;
-	const float ics = 1.0f/cs;
-	const float ich = 1.0f/ch;
-
-	int minx = (int)floorf((bmin[0]-orig[0])*ics);
-	int miny = (int)floorf((bmin[1]-orig[1])*ich);
-	int minz = (int)floorf((bmin[2]-orig[2])*ics);
-	int maxx = (int)floorf((bmax[0]-orig[0])*ics);
-	int maxy = (int)floorf((bmax[1]-orig[1])*ich);
-	int maxz = (int)floorf((bmax[2]-orig[2])*ics);
-	
-	if (maxx < 0) return DT_SUCCESS;
-	if (minx >= w) return DT_SUCCESS;
-	if (maxz < 0) return DT_SUCCESS;
-	if (minz >= h) return DT_SUCCESS;
-
-	if (minx < 0) minx = 0;
-	if (maxx >= w) maxx = w-1;
-	if (minz < 0) minz = 0;
-	if (maxz >= h) maxz = h-1;
-	
-	for (int z = minz; z <= maxz; ++z)
-	{
-		for (int x = minx; x <= maxx; ++x)
-		{
-			const int y = layer.heights[x+z*w];
-			if (y < miny || y > maxy)
-				continue;
-			layer.areas[x+z*w] = areaId;
-		}
-	}
-
-	return DT_SUCCESS;
-}
-
-dtStatus dtMarkBoxArea(dtTileCacheLayer& layer, const float* orig, const float cs, const float ch,
-					   const float* center, const float* halfExtents, const float* rotAux, const unsigned char areaId)
-{
-	const int w = (int)layer.header->width;
-	const int h = (int)layer.header->height;
-	const float ics = 1.0f/cs;
-	const float ich = 1.0f/ch;
-
-	float cx = (center[0] - orig[0])*ics;
-	float cz = (center[2] - orig[2])*ics;
-	
-	float maxr = 1.41f*dtMax(halfExtents[0], halfExtents[2]);
-	int minx = (int)floorf(cx - maxr*ics);
-	int maxx = (int)floorf(cx + maxr*ics);
-	int minz = (int)floorf(cz - maxr*ics);
-	int maxz = (int)floorf(cz + maxr*ics);
-	int miny = (int)floorf((center[1]-halfExtents[1]-orig[1])*ich);
-	int maxy = (int)floorf((center[1]+halfExtents[1]-orig[1])*ich);
-
-	if (maxx < 0) return DT_SUCCESS;
-	if (minx >= w) return DT_SUCCESS;
-	if (maxz < 0) return DT_SUCCESS;
-	if (minz >= h) return DT_SUCCESS;
-
-	if (minx < 0) minx = 0;
-	if (maxx >= w) maxx = w-1;
-	if (minz < 0) minz = 0;
-	if (maxz >= h) maxz = h-1;
-	
-	float xhalf = halfExtents[0]*ics + 0.5f;
-	float zhalf = halfExtents[2]*ics + 0.5f;
-
-	for (int z = minz; z <= maxz; ++z)
-	{
-		for (int x = minx; x <= maxx; ++x)
-		{			
-			float x2 = 2.0f*(float(x) - cx);
-			float z2 = 2.0f*(float(z) - cz);
-			float xrot = rotAux[1]*x2 + rotAux[0]*z2;
-			if (xrot > xhalf || xrot < -xhalf)
-				continue;
-			float zrot = rotAux[1]*z2 - rotAux[0]*x2;
-			if (zrot > zhalf || zrot < -zhalf)
-				continue;
-			const int y = layer.heights[x+z*w];
-			if (y < miny || y > maxy)
-				continue;
-			layer.areas[x+z*w] = areaId;
-		}
-	}
-
-	return DT_SUCCESS;
-}
-
-dtStatus dtBuildTileCacheLayer(dtTileCacheCompressor* comp,
-							   dtTileCacheLayerHeader* header,
-							   const unsigned char* heights,
-							   const unsigned char* areas,
-							   const unsigned char* cons,
-							   unsigned char** outData, int* outDataSize)
-{
-	const int headerSize = dtAlign4(sizeof(dtTileCacheLayerHeader));
-	const int gridSize = (int)header->width * (int)header->height;
-	const int maxDataSize = headerSize + comp->maxCompressedSize(gridSize*3);
-	unsigned char* data = (unsigned char*)dtAlloc(maxDataSize, DT_ALLOC_PERM);
-	if (!data)
-		return DT_FAILURE | DT_OUT_OF_MEMORY;
-	memset(data, 0, maxDataSize);
-	
-	// Store header
-	memcpy(data, header, sizeof(dtTileCacheLayerHeader));
-	
-	// Concatenate grid data for compression.
-	const int bufferSize = gridSize*3;
-	unsigned char* buffer = (unsigned char*)dtAlloc(bufferSize, DT_ALLOC_TEMP);
-	if (!buffer)
-	{
-		dtFree(data);
-		return DT_FAILURE | DT_OUT_OF_MEMORY;
-	}
-
-	memcpy(buffer, heights, gridSize);
-	memcpy(buffer+gridSize, areas, gridSize);
-	memcpy(buffer+gridSize*2, cons, gridSize);
-	
-	// Compress
-	unsigned char* compressed = data + headerSize;
-	const int maxCompressedSize = maxDataSize - headerSize;
-	int compressedSize = 0;
-	dtStatus status = comp->compress(buffer, bufferSize, compressed, maxCompressedSize, &compressedSize);
-	if (dtStatusFailed(status))
-	{
-		dtFree(buffer);
-		dtFree(data);
-		return status;
-	}
-
-	*outData = data;
-	*outDataSize = headerSize + compressedSize;
-	
-	dtFree(buffer);
-	
-	return DT_SUCCESS;
-}
-
-void dtFreeTileCacheLayer(dtTileCacheAlloc* alloc, dtTileCacheLayer* layer)
-{
-	dtAssert(alloc);
-	// The layer is allocated as one conitguous blob of data.
-	alloc->free(layer);
-}
-
-dtStatus dtDecompressTileCacheLayer(dtTileCacheAlloc* alloc, dtTileCacheCompressor* comp,
-									unsigned char* compressed, const int compressedSize,
-									dtTileCacheLayer** layerOut)
-{
-	dtAssert(alloc);
-	dtAssert(comp);
-
-	if (!layerOut)
-		return DT_FAILURE | DT_INVALID_PARAM;
-	if (!compressed)
-		return DT_FAILURE | DT_INVALID_PARAM;
-
-	*layerOut = 0;
-
-	dtTileCacheLayerHeader* compressedHeader = (dtTileCacheLayerHeader*)compressed;
-	if (compressedHeader->magic != DT_TILECACHE_MAGIC)
-		return DT_FAILURE | DT_WRONG_MAGIC;
-	if (compressedHeader->version != DT_TILECACHE_VERSION)
-		return DT_FAILURE | DT_WRONG_VERSION;
-	
-	const int layerSize = dtAlign4(sizeof(dtTileCacheLayer));
-	const int headerSize = dtAlign4(sizeof(dtTileCacheLayerHeader));
-	const int gridSize = (int)compressedHeader->width * (int)compressedHeader->height;
-	const int bufferSize = layerSize + headerSize + gridSize*4;
-	
-	unsigned char* buffer = (unsigned char*)alloc->alloc(bufferSize);
-	if (!buffer)
-		return DT_FAILURE | DT_OUT_OF_MEMORY;
-	memset(buffer, 0, bufferSize);
-
-	dtTileCacheLayer* layer = (dtTileCacheLayer*)buffer;
-	dtTileCacheLayerHeader* header = (dtTileCacheLayerHeader*)(buffer + layerSize);
-	unsigned char* grids = buffer + layerSize + headerSize;
-	const int gridsSize = bufferSize - (layerSize + headerSize); 
-	
-	// Copy header
-	memcpy(header, compressedHeader, headerSize);
-	// Decompress grid.
-	int size = 0;
-	dtStatus status = comp->decompress(compressed+headerSize, compressedSize-headerSize,
-									   grids, gridsSize, &size);
-	if (dtStatusFailed(status))
-	{
-		alloc->free(buffer);
-		return status;
-	}
-	
-	layer->header = header;
-	layer->heights = grids;
-	layer->areas = grids + gridSize;
-	layer->cons = grids + gridSize*2;
-	layer->regs = grids + gridSize*3;
-	
-	*layerOut = layer;
-	
-	return DT_SUCCESS;
-}
-
-
-
-bool dtTileCacheHeaderSwapEndian(unsigned char* data, const int dataSize)
-{
-	dtIgnoreUnused(dataSize);
-	dtTileCacheLayerHeader* header = (dtTileCacheLayerHeader*)data;
-	
-	int swappedMagic = DT_TILECACHE_MAGIC;
-	int swappedVersion = DT_TILECACHE_VERSION;
-	dtSwapEndian(&swappedMagic);
-	dtSwapEndian(&swappedVersion);
-	
-	if ((header->magic != DT_TILECACHE_MAGIC || header->version != DT_TILECACHE_VERSION) &&
-		(header->magic != swappedMagic || header->version != swappedVersion))
-	{
-		return false;
-	}
-	
-	dtSwapEndian(&header->magic);
-	dtSwapEndian(&header->version);
-	dtSwapEndian(&header->tx);
-	dtSwapEndian(&header->ty);
-	dtSwapEndian(&header->tlayer);
-	dtSwapEndian(&header->bmin[0]);
-	dtSwapEndian(&header->bmin[1]);
-	dtSwapEndian(&header->bmin[2]);
-	dtSwapEndian(&header->bmax[0]);
-	dtSwapEndian(&header->bmax[1]);
-	dtSwapEndian(&header->bmax[2]);
-	dtSwapEndian(&header->hmin);
-	dtSwapEndian(&header->hmax);
-	
-	// width, height, minx, maxx, miny, maxy are unsigned char, no need to swap.
-	
-	return true;
-}
-
diff --git a/extern/recastnavigation/License.txt b/extern/recastnavigation/License.txt
deleted file mode 100644
index c259ddf6cd..0000000000
--- a/extern/recastnavigation/License.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Copyright (c) 2009 Mikko Mononen memon@inside.org
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-claim that you wrote the original software. If you use this software
-in a product, an acknowledgment in the product documentation would be
-appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-
diff --git a/extern/recastnavigation/Recast/CMakeLists.txt b/extern/recastnavigation/Recast/CMakeLists.txt
deleted file mode 100644
index 3606544642..0000000000
--- a/extern/recastnavigation/Recast/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-file(GLOB SOURCES Source/*.cpp)
-add_library(Recast ${SOURCES})
-
-add_library(RecastNavigation::Recast ALIAS Recast)
-set_target_properties(Recast PROPERTIES DEBUG_POSTFIX -d)
-
-set(Recast_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Include")
-
-target_include_directories(Recast PUBLIC
-    "$<BUILD_INTERFACE:${Recast_INCLUDE_DIR}>"
-)
-
-set_target_properties(Recast PROPERTIES
-        SOVERSION ${SOVERSION}
-        VERSION ${VERSION}
-        COMPILE_PDB_OUTPUT_DIRECTORY .
-        COMPILE_PDB_NAME "Recast-d"
-        )
-
-install(TARGETS Recast
-        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        COMPONENT library
-        )
-
-file(GLOB INCLUDES Include/*.h)
-install(FILES ${INCLUDES} DESTINATION
-    ${CMAKE_INSTALL_INCLUDEDIR}/recastnavigation)
-install(FILES "$<TARGET_FILE_DIR:Recast>/Recast-d.pdb" CONFIGURATIONS "Debug" DESTINATION "lib") 
diff --git a/extern/recastnavigation/Recast/Include/Recast.h b/extern/recastnavigation/Recast/Include/Recast.h
deleted file mode 100644
index 4d557389b5..0000000000
--- a/extern/recastnavigation/Recast/Include/Recast.h
+++ /dev/null
@@ -1,1208 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
- 
-#ifndef RECAST_H
-#define RECAST_H
-
-/// The value of PI used by Recast.
-static const float RC_PI = 3.14159265f;
-
-/// Recast log categories.
-/// @see rcContext
-enum rcLogCategory
-{
-	RC_LOG_PROGRESS = 1,	///< A progress log entry.
-	RC_LOG_WARNING,			///< A warning log entry.
-	RC_LOG_ERROR,			///< An error log entry.
-};
-
-/// Recast performance timer categories.
-/// @see rcContext
-enum rcTimerLabel
-{
-	/// The user defined total time of the build.
-	RC_TIMER_TOTAL,
-	/// A user defined build time.
-	RC_TIMER_TEMP,
-	/// The time to rasterize the triangles. (See: #rcRasterizeTriangle)
-	RC_TIMER_RASTERIZE_TRIANGLES,
-	/// The time to build the compact heightfield. (See: #rcBuildCompactHeightfield)
-	RC_TIMER_BUILD_COMPACTHEIGHTFIELD,
-	/// The total time to build the contours. (See: #rcBuildContours)
-	RC_TIMER_BUILD_CONTOURS,
-	/// The time to trace the boundaries of the contours. (See: #rcBuildContours)
-	RC_TIMER_BUILD_CONTOURS_TRACE,
-	/// The time to simplify the contours. (See: #rcBuildContours)
-	RC_TIMER_BUILD_CONTOURS_SIMPLIFY,
-	/// The time to filter ledge spans. (See: #rcFilterLedgeSpans)
-	RC_TIMER_FILTER_BORDER,
-	/// The time to filter low height spans. (See: #rcFilterWalkableLowHeightSpans)
-	RC_TIMER_FILTER_WALKABLE,
-	/// The time to apply the median filter. (See: #rcMedianFilterWalkableArea)
-	RC_TIMER_MEDIAN_AREA,
-	/// The time to filter low obstacles. (See: #rcFilterLowHangingWalkableObstacles)
-	RC_TIMER_FILTER_LOW_OBSTACLES,
-	/// The time to build the polygon mesh. (See: #rcBuildPolyMesh)
-	RC_TIMER_BUILD_POLYMESH,
-	/// The time to merge polygon meshes. (See: #rcMergePolyMeshes)
-	RC_TIMER_MERGE_POLYMESH,
-	/// The time to erode the walkable area. (See: #rcErodeWalkableArea)
-	RC_TIMER_ERODE_AREA,
-	/// The time to mark a box area. (See: #rcMarkBoxArea)
-	RC_TIMER_MARK_BOX_AREA,
-	/// The time to mark a cylinder area. (See: #rcMarkCylinderArea)
-	RC_TIMER_MARK_CYLINDER_AREA,
-	/// The time to mark a convex polygon area. (See: #rcMarkConvexPolyArea)
-	RC_TIMER_MARK_CONVEXPOLY_AREA,
-	/// The total time to build the distance field. (See: #rcBuildDistanceField)
-	RC_TIMER_BUILD_DISTANCEFIELD,
-	/// The time to build the distances of the distance field. (See: #rcBuildDistanceField)
-	RC_TIMER_BUILD_DISTANCEFIELD_DIST,
-	/// The time to blur the distance field. (See: #rcBuildDistanceField)
-	RC_TIMER_BUILD_DISTANCEFIELD_BLUR,
-	/// The total time to build the regions. (See: #rcBuildRegions, #rcBuildRegionsMonotone)
-	RC_TIMER_BUILD_REGIONS,
-	/// The total time to apply the watershed algorithm. (See: #rcBuildRegions)
-	RC_TIMER_BUILD_REGIONS_WATERSHED,
-	/// The time to expand regions while applying the watershed algorithm. (See: #rcBuildRegions)
-	RC_TIMER_BUILD_REGIONS_EXPAND,
-	/// The time to flood regions while applying the watershed algorithm. (See: #rcBuildRegions)
-	RC_TIMER_BUILD_REGIONS_FLOOD,
-	/// The time to filter out small regions. (See: #rcBuildRegions, #rcBuildRegionsMonotone)
-	RC_TIMER_BUILD_REGIONS_FILTER,
-	/// The time to build heightfield layers. (See: #rcBuildHeightfieldLayers)
-	RC_TIMER_BUILD_LAYERS, 
-	/// The time to build the polygon mesh detail. (See: #rcBuildPolyMeshDetail)
-	RC_TIMER_BUILD_POLYMESHDETAIL,
-	/// The time to merge polygon mesh details. (See: #rcMergePolyMeshDetails)
-	RC_TIMER_MERGE_POLYMESHDETAIL,
-	/// The maximum number of timers.  (Used for iterating timers.)
-	RC_MAX_TIMERS
-};
-
-/// Provides an interface for optional logging and performance tracking of the Recast 
-/// build process.
-/// @ingroup recast
-class rcContext
-{
-public:
-
-	/// Contructor.
-	///  @param[in]		state	TRUE if the logging and performance timers should be enabled.  [Default: true]
-	inline rcContext(bool state = true) : m_logEnabled(state), m_timerEnabled(state) {}
-	virtual ~rcContext() {}
-
-	/// Enables or disables logging.
-	///  @param[in]		state	TRUE if logging should be enabled.
-	inline void enableLog(bool state) { m_logEnabled = state; }
-
-	/// Clears all log entries.
-	inline void resetLog() { if (m_logEnabled) doResetLog(); }
-
-	/// Logs a message.
-	///  @param[in]		category	The category of the message.
-	///  @param[in]		format		The message.
-	void log(const rcLogCategory category, const char* format, ...);
-
-	/// Enables or disables the performance timers.
-	///  @param[in]		state	TRUE if timers should be enabled.
-	inline void enableTimer(bool state) { m_timerEnabled = state; }
-
-	/// Clears all peformance timers. (Resets all to unused.)
-	inline void resetTimers() { if (m_timerEnabled) doResetTimers(); }
-
-	/// Starts the specified performance timer.
-	///  @param	label	The category of the timer.
-	inline void startTimer(const rcTimerLabel label) { if (m_timerEnabled) doStartTimer(label); }
-
-	/// Stops the specified performance timer.
-	///  @param	label	The category of the timer.
-	inline void stopTimer(const rcTimerLabel label) { if (m_timerEnabled) doStopTimer(label); }
-
-	/// Returns the total accumulated time of the specified performance timer.
-	///  @param	label	The category of the timer.
-	///  @return The accumulated time of the timer, or -1 if timers are disabled or the timer has never been started.
-	inline int getAccumulatedTime(const rcTimerLabel label) const { return m_timerEnabled ? doGetAccumulatedTime(label) : -1; }
-
-protected:
-
-	/// Clears all log entries.
-	virtual void doResetLog() {}
-
-	/// Logs a message.
-	///  @param[in]		category	The category of the message.
-	///  @param[in]		msg			The formatted message.
-	///  @param[in]		len			The length of the formatted message.
-	virtual void doLog(const rcLogCategory /*category*/, const char* /*msg*/, const int /*len*/) {}
-
-	/// Clears all timers. (Resets all to unused.)
-	virtual void doResetTimers() {}
-
-	/// Starts the specified performance timer.
-	///  @param[in]		label	The category of timer.
-	virtual void doStartTimer(const rcTimerLabel /*label*/) {}
-
-	/// Stops the specified performance timer.
-	///  @param[in]		label	The category of the timer.
-	virtual void doStopTimer(const rcTimerLabel /*label*/) {}
-
-	/// Returns the total accumulated time of the specified performance timer.
-	///  @param[in]		label	The category of the timer.
-	///  @return The accumulated time of the timer, or -1 if timers are disabled or the timer has never been started.
-	virtual int doGetAccumulatedTime(const rcTimerLabel /*label*/) const { return -1; }
-	
-	/// True if logging is enabled.
-	bool m_logEnabled;
-
-	/// True if the performance timers are enabled.
-	bool m_timerEnabled;
-};
-
-/// A helper to first start a timer and then stop it when this helper goes out of scope.
-/// @see rcContext
-class rcScopedTimer
-{
-public:
-	/// Constructs an instance and starts the timer.
-	///  @param[in]		ctx		The context to use.
-	///  @param[in]		label	The category of the timer.
-	inline rcScopedTimer(rcContext* ctx, const rcTimerLabel label) : m_ctx(ctx), m_label(label) { m_ctx->startTimer(m_label); }
-	inline ~rcScopedTimer() { m_ctx->stopTimer(m_label); }
-
-private:
-	// Explicitly disabled copy constructor and copy assignment operator.
-	rcScopedTimer(const rcScopedTimer&);
-	rcScopedTimer& operator=(const rcScopedTimer&);
-	
-	rcContext* const m_ctx;
-	const rcTimerLabel m_label;
-};
-
-/// Specifies a configuration to use when performing Recast builds.
-/// @ingroup recast
-struct rcConfig
-{
-	/// The width of the field along the x-axis. [Limit: >= 0] [Units: vx]
-	int width;
-
-	/// The height of the field along the z-axis. [Limit: >= 0] [Units: vx]
-	int height;
-	
-	/// The width/height size of tile's on the xz-plane. [Limit: >= 0] [Units: vx]
-	int tileSize;
-	
-	/// The size of the non-navigable border around the heightfield. [Limit: >=0] [Units: vx]
-	int borderSize;
-
-	/// The xz-plane cell size to use for fields. [Limit: > 0] [Units: wu] 
-	float cs;
-
-	/// The y-axis cell size to use for fields. [Limit: > 0] [Units: wu]
-	float ch;
-
-	/// The minimum bounds of the field's AABB. [(x, y, z)] [Units: wu]
-	float bmin[3]; 
-
-	/// The maximum bounds of the field's AABB. [(x, y, z)] [Units: wu]
-	float bmax[3];
-
-	/// The maximum slope that is considered walkable. [Limits: 0 <= value < 90] [Units: Degrees] 
-	float walkableSlopeAngle;
-
-	/// Minimum floor to 'ceiling' height that will still allow the floor area to 
-	/// be considered walkable. [Limit: >= 3] [Units: vx] 
-	int walkableHeight;
-	
-	/// Maximum ledge height that is considered to still be traversable. [Limit: >=0] [Units: vx] 
-	int walkableClimb;
-	
-	/// The distance to erode/shrink the walkable area of the heightfield away from 
-	/// obstructions.  [Limit: >=0] [Units: vx] 
-	int walkableRadius;
-	
-	/// The maximum allowed length for contour edges along the border of the mesh. [Limit: >=0] [Units: vx] 
-	int maxEdgeLen;
-	
-	/// The maximum distance a simplfied contour's border edges should deviate 
-	/// the original raw contour. [Limit: >=0] [Units: vx]
-	float maxSimplificationError;
-	
-	/// The minimum number of cells allowed to form isolated island areas. [Limit: >=0] [Units: vx] 
-	int minRegionArea;
-	
-	/// Any regions with a span count smaller than this value will, if possible, 
-	/// be merged with larger regions. [Limit: >=0] [Units: vx] 
-	int mergeRegionArea;
-	
-	/// The maximum number of vertices allowed for polygons generated during the 
-	/// contour to polygon conversion process. [Limit: >= 3] 
-	int maxVertsPerPoly;
-	
-	/// Sets the sampling distance to use when generating the detail mesh.
-	/// (For height detail only.) [Limits: 0 or >= 0.9] [Units: wu] 
-	float detailSampleDist;
-	
-	/// The maximum distance the detail mesh surface should deviate from heightfield
-	/// data. (For height detail only.) [Limit: >=0] [Units: wu] 
-	float detailSampleMaxError;
-};
-
-/// Defines the number of bits allocated to rcSpan::smin and rcSpan::smax.
-static const int RC_SPAN_HEIGHT_BITS = 13;
-/// Defines the maximum value for rcSpan::smin and rcSpan::smax.
-static const int RC_SPAN_MAX_HEIGHT = (1 << RC_SPAN_HEIGHT_BITS) - 1;
-
-/// The number of spans allocated per span spool.
-/// @see rcSpanPool
-static const int RC_SPANS_PER_POOL = 2048;
-
-/// Represents a span in a heightfield.
-/// @see rcHeightfield
-struct rcSpan
-{
-	unsigned int smin : RC_SPAN_HEIGHT_BITS; ///< The lower limit of the span. [Limit: < #smax]
-	unsigned int smax : RC_SPAN_HEIGHT_BITS; ///< The upper limit of the span. [Limit: <= #RC_SPAN_MAX_HEIGHT]
-	unsigned int area : 6;                   ///< The area id assigned to the span.
-	rcSpan* next;                            ///< The next span higher up in column.
-};
-
-/// A memory pool used for quick allocation of spans within a heightfield.
-/// @see rcHeightfield
-struct rcSpanPool
-{
-	rcSpanPool* next;					///< The next span pool.
-	rcSpan items[RC_SPANS_PER_POOL];	///< Array of spans in the pool.
-};
-
-/// A dynamic heightfield representing obstructed space.
-/// @ingroup recast
-struct rcHeightfield
-{
-	rcHeightfield();
-	~rcHeightfield();
-
-	int width;			///< The width of the heightfield. (Along the x-axis in cell units.)
-	int height;			///< The height of the heightfield. (Along the z-axis in cell units.)
-	float bmin[3];  	///< The minimum bounds in world space. [(x, y, z)]
-	float bmax[3];		///< The maximum bounds in world space. [(x, y, z)]
-	float cs;			///< The size of each cell. (On the xz-plane.)
-	float ch;			///< The height of each cell. (The minimum increment along the y-axis.)
-	rcSpan** spans;		///< Heightfield of spans (width*height).
-	rcSpanPool* pools;	///< Linked list of span pools.
-	rcSpan* freelist;	///< The next free span.
-
-private:
-	// Explicitly-disabled copy constructor and copy assignment operator.
-	rcHeightfield(const rcHeightfield&);
-	rcHeightfield& operator=(const rcHeightfield&);
-};
-
-/// Provides information on the content of a cell column in a compact heightfield. 
-struct rcCompactCell
-{
-	unsigned int index : 24;	///< Index to the first span in the column.
-	unsigned int count : 8;		///< Number of spans in the column.
-};
-
-/// Represents a span of unobstructed space within a compact heightfield.
-struct rcCompactSpan
-{
-	unsigned short y;			///< The lower extent of the span. (Measured from the heightfield's base.)
-	unsigned short reg;			///< The id of the region the span belongs to. (Or zero if not in a region.)
-	unsigned int con : 24;		///< Packed neighbor connection data.
-	unsigned int h : 8;			///< The height of the span.  (Measured from #y.)
-};
-
-/// A compact, static heightfield representing unobstructed space.
-/// @ingroup recast
-struct rcCompactHeightfield
-{
-	rcCompactHeightfield();
-	~rcCompactHeightfield();
-	int width;					///< The width of the heightfield. (Along the x-axis in cell units.)
-	int height;					///< The height of the heightfield. (Along the z-axis in cell units.)
-	int spanCount;				///< The number of spans in the heightfield.
-	int walkableHeight;			///< The walkable height used during the build of the field.  (See: rcConfig::walkableHeight)
-	int walkableClimb;			///< The walkable climb used during the build of the field. (See: rcConfig::walkableClimb)
-	int borderSize;				///< The AABB border size used during the build of the field. (See: rcConfig::borderSize)
-	unsigned short maxDistance;	///< The maximum distance value of any span within the field. 
-	unsigned short maxRegions;	///< The maximum region id of any span within the field. 
-	float bmin[3];				///< The minimum bounds in world space. [(x, y, z)]
-	float bmax[3];				///< The maximum bounds in world space. [(x, y, z)]
-	float cs;					///< The size of each cell. (On the xz-plane.)
-	float ch;					///< The height of each cell. (The minimum increment along the y-axis.)
-	rcCompactCell* cells;		///< Array of cells. [Size: #width*#height]
-	rcCompactSpan* spans;		///< Array of spans. [Size: #spanCount]
-	unsigned short* dist;		///< Array containing border distance data. [Size: #spanCount]
-	unsigned char* areas;		///< Array containing area id data. [Size: #spanCount]
-};
-
-/// Represents a heightfield layer within a layer set.
-/// @see rcHeightfieldLayerSet
-struct rcHeightfieldLayer
-{
-	float bmin[3];				///< The minimum bounds in world space. [(x, y, z)]
-	float bmax[3];				///< The maximum bounds in world space. [(x, y, z)]
-	float cs;					///< The size of each cell. (On the xz-plane.)
-	float ch;					///< The height of each cell. (The minimum increment along the y-axis.)
-	int width;					///< The width of the heightfield. (Along the x-axis in cell units.)
-	int height;					///< The height of the heightfield. (Along the z-axis in cell units.)
-	int minx;					///< The minimum x-bounds of usable data.
-	int maxx;					///< The maximum x-bounds of usable data.
-	int miny;					///< The minimum y-bounds of usable data. (Along the z-axis.)
-	int maxy;					///< The maximum y-bounds of usable data. (Along the z-axis.)
-	int hmin;					///< The minimum height bounds of usable data. (Along the y-axis.)
-	int hmax;					///< The maximum height bounds of usable data. (Along the y-axis.)
-	unsigned char* heights;		///< The heightfield. [Size: width * height]
-	unsigned char* areas;		///< Area ids. [Size: Same as #heights]
-	unsigned char* cons;		///< Packed neighbor connection information. [Size: Same as #heights]
-};
-
-/// Represents a set of heightfield layers.
-/// @ingroup recast
-/// @see rcAllocHeightfieldLayerSet, rcFreeHeightfieldLayerSet 
-struct rcHeightfieldLayerSet
-{
-	rcHeightfieldLayerSet();
-	~rcHeightfieldLayerSet();
-	rcHeightfieldLayer* layers;			///< The layers in the set. [Size: #nlayers]
-	int nlayers;						///< The number of layers in the set.
-};
-
-/// Represents a simple, non-overlapping contour in field space.
-struct rcContour
-{
-	int* verts;			///< Simplified contour vertex and connection data. [Size: 4 * #nverts]
-	int nverts;			///< The number of vertices in the simplified contour. 
-	int* rverts;		///< Raw contour vertex and connection data. [Size: 4 * #nrverts]
-	int nrverts;		///< The number of vertices in the raw contour. 
-	unsigned short reg;	///< The region id of the contour.
-	unsigned char area;	///< The area id of the contour.
-};
-
-/// Represents a group of related contours.
-/// @ingroup recast
-struct rcContourSet
-{
-	rcContourSet();
-	~rcContourSet();
-	rcContour* conts;	///< An array of the contours in the set. [Size: #nconts]
-	int nconts;			///< The number of contours in the set.
-	float bmin[3];  	///< The minimum bounds in world space. [(x, y, z)]
-	float bmax[3];		///< The maximum bounds in world space. [(x, y, z)]
-	float cs;			///< The size of each cell. (On the xz-plane.)
-	float ch;			///< The height of each cell. (The minimum increment along the y-axis.)
-	int width;			///< The width of the set. (Along the x-axis in cell units.) 
-	int height;			///< The height of the set. (Along the z-axis in cell units.) 
-	int borderSize;		///< The AABB border size used to generate the source data from which the contours were derived.
-	float maxError;		///< The max edge error that this contour set was simplified with.
-};
-
-/// Represents a polygon mesh suitable for use in building a navigation mesh. 
-/// @ingroup recast
-struct rcPolyMesh
-{
-	rcPolyMesh();
-	~rcPolyMesh();
-	unsigned short* verts;	///< The mesh vertices. [Form: (x, y, z) * #nverts]
-	unsigned short* polys;	///< Polygon and neighbor data. [Length: #maxpolys * 2 * #nvp]
-	unsigned short* regs;	///< The region id assigned to each polygon. [Length: #maxpolys]
-	unsigned short* flags;	///< The user defined flags for each polygon. [Length: #maxpolys]
-	unsigned char* areas;	///< The area id assigned to each polygon. [Length: #maxpolys]
-	int nverts;				///< The number of vertices.
-	int npolys;				///< The number of polygons.
-	int maxpolys;			///< The number of allocated polygons.
-	int nvp;				///< The maximum number of vertices per polygon.
-	float bmin[3];			///< The minimum bounds in world space. [(x, y, z)]
-	float bmax[3];			///< The maximum bounds in world space. [(x, y, z)]
-	float cs;				///< The size of each cell. (On the xz-plane.)
-	float ch;				///< The height of each cell. (The minimum increment along the y-axis.)
-	int borderSize;			///< The AABB border size used to generate the source data from which the mesh was derived.
-	float maxEdgeError;		///< The max error of the polygon edges in the mesh.
-};
-
-/// Contains triangle meshes that represent detailed height data associated 
-/// with the polygons in its associated polygon mesh object.
-/// @ingroup recast
-struct rcPolyMeshDetail
-{
-	unsigned int* meshes;	///< The sub-mesh data. [Size: 4*#nmeshes] 
-	float* verts;			///< The mesh vertices. [Size: 3*#nverts] 
-	unsigned char* tris;	///< The mesh triangles. [Size: 4*#ntris] 
-	int nmeshes;			///< The number of sub-meshes defined by #meshes.
-	int nverts;				///< The number of vertices in #verts.
-	int ntris;				///< The number of triangles in #tris.
-};
-
-/// @name Allocation Functions
-/// Functions used to allocate and de-allocate Recast objects.
-/// @see rcAllocSetCustom
-/// @{
-
-/// Allocates a heightfield object using the Recast allocator.
-///  @return A heightfield that is ready for initialization, or null on failure.
-///  @ingroup recast
-///  @see rcCreateHeightfield, rcFreeHeightField
-rcHeightfield* rcAllocHeightfield();
-
-/// Frees the specified heightfield object using the Recast allocator.
-///  @param[in]		hf	A heightfield allocated using #rcAllocHeightfield
-///  @ingroup recast
-///  @see rcAllocHeightfield
-void rcFreeHeightField(rcHeightfield* hf);
-
-/// Allocates a compact heightfield object using the Recast allocator.
-///  @return A compact heightfield that is ready for initialization, or null on failure.
-///  @ingroup recast
-///  @see rcBuildCompactHeightfield, rcFreeCompactHeightfield
-rcCompactHeightfield* rcAllocCompactHeightfield();
-
-/// Frees the specified compact heightfield object using the Recast allocator.
-///  @param[in]		chf		A compact heightfield allocated using #rcAllocCompactHeightfield
-///  @ingroup recast
-///  @see rcAllocCompactHeightfield
-void rcFreeCompactHeightfield(rcCompactHeightfield* chf);
-
-/// Allocates a heightfield layer set using the Recast allocator.
-///  @return A heightfield layer set that is ready for initialization, or null on failure.
-///  @ingroup recast
-///  @see rcBuildHeightfieldLayers, rcFreeHeightfieldLayerSet
-rcHeightfieldLayerSet* rcAllocHeightfieldLayerSet();
-
-/// Frees the specified heightfield layer set using the Recast allocator.
-///  @param[in]		lset	A heightfield layer set allocated using #rcAllocHeightfieldLayerSet
-///  @ingroup recast
-///  @see rcAllocHeightfieldLayerSet
-void rcFreeHeightfieldLayerSet(rcHeightfieldLayerSet* lset);
-
-/// Allocates a contour set object using the Recast allocator.
-///  @return A contour set that is ready for initialization, or null on failure.
-///  @ingroup recast
-///  @see rcBuildContours, rcFreeContourSet
-rcContourSet* rcAllocContourSet();
-
-/// Frees the specified contour set using the Recast allocator.
-///  @param[in]		cset	A contour set allocated using #rcAllocContourSet
-///  @ingroup recast
-///  @see rcAllocContourSet
-void rcFreeContourSet(rcContourSet* cset);
-
-/// Allocates a polygon mesh object using the Recast allocator.
-///  @return A polygon mesh that is ready for initialization, or null on failure.
-///  @ingroup recast
-///  @see rcBuildPolyMesh, rcFreePolyMesh
-rcPolyMesh* rcAllocPolyMesh();
-
-/// Frees the specified polygon mesh using the Recast allocator.
-///  @param[in]		pmesh	A polygon mesh allocated using #rcAllocPolyMesh
-///  @ingroup recast
-///  @see rcAllocPolyMesh
-void rcFreePolyMesh(rcPolyMesh* pmesh);
-
-/// Allocates a detail mesh object using the Recast allocator.
-///  @return A detail mesh that is ready for initialization, or null on failure.
-///  @ingroup recast
-///  @see rcBuildPolyMeshDetail, rcFreePolyMeshDetail
-rcPolyMeshDetail* rcAllocPolyMeshDetail();
-
-/// Frees the specified detail mesh using the Recast allocator.
-///  @param[in]		dmesh	A detail mesh allocated using #rcAllocPolyMeshDetail
-///  @ingroup recast
-///  @see rcAllocPolyMeshDetail
-void rcFreePolyMeshDetail(rcPolyMeshDetail* dmesh);
-
-/// @}
-
-/// Heighfield border flag.
-/// If a heightfield region ID has this bit set, then the region is a border 
-/// region and its spans are considered unwalkable.
-/// (Used during the region and contour build process.)
-/// @see rcCompactSpan::reg
-static const unsigned short RC_BORDER_REG = 0x8000;
-
-/// Polygon touches multiple regions.
-/// If a polygon has this region ID it was merged with or created
-/// from polygons of different regions during the polymesh
-/// build step that removes redundant border vertices. 
-/// (Used during the polymesh and detail polymesh build processes)
-/// @see rcPolyMesh::regs
-static const unsigned short RC_MULTIPLE_REGS = 0;
-
-/// Border vertex flag.
-/// If a region ID has this bit set, then the associated element lies on
-/// a tile border. If a contour vertex's region ID has this bit set, the 
-/// vertex will later be removed in order to match the segments and vertices 
-/// at tile boundaries.
-/// (Used during the build process.)
-/// @see rcCompactSpan::reg, #rcContour::verts, #rcContour::rverts
-static const int RC_BORDER_VERTEX = 0x10000;
-
-/// Area border flag.
-/// If a region ID has this bit set, then the associated element lies on
-/// the border of an area.
-/// (Used during the region and contour build process.)
-/// @see rcCompactSpan::reg, #rcContour::verts, #rcContour::rverts
-static const int RC_AREA_BORDER = 0x20000;
-
-/// Contour build flags.
-/// @see rcBuildContours
-enum rcBuildContoursFlags
-{
-	RC_CONTOUR_TESS_WALL_EDGES = 0x01,	///< Tessellate solid (impassable) edges during contour simplification.
-	RC_CONTOUR_TESS_AREA_EDGES = 0x02,	///< Tessellate edges between areas during contour simplification.
-};
-
-/// Applied to the region id field of contour vertices in order to extract the region id.
-/// The region id field of a vertex may have several flags applied to it.  So the
-/// fields value can't be used directly.
-/// @see rcContour::verts, rcContour::rverts
-static const int RC_CONTOUR_REG_MASK = 0xffff;
-
-/// An value which indicates an invalid index within a mesh.
-/// @note This does not necessarily indicate an error.
-/// @see rcPolyMesh::polys
-static const unsigned short RC_MESH_NULL_IDX = 0xffff;
-
-/// Represents the null area.
-/// When a data element is given this value it is considered to no longer be 
-/// assigned to a usable area.  (E.g. It is unwalkable.)
-static const unsigned char RC_NULL_AREA = 0;
-
-/// The default area id used to indicate a walkable polygon. 
-/// This is also the maximum allowed area id, and the only non-null area id 
-/// recognized by some steps in the build process. 
-static const unsigned char RC_WALKABLE_AREA = 63;
-
-/// The value returned by #rcGetCon if the specified direction is not connected
-/// to another span. (Has no neighbor.)
-static const int RC_NOT_CONNECTED = 0x3f;
-
-/// @name General helper functions
-/// @{
-
-/// Used to ignore a function parameter.  VS complains about unused parameters
-/// and this silences the warning.
-///  @param [in] _ Unused parameter
-template<class T> void rcIgnoreUnused(const T&) { }
-
-/// Swaps the values of the two parameters.
-///  @param[in,out]	a	Value A
-///  @param[in,out]	b	Value B
-template<class T> inline void rcSwap(T& a, T& b) { T t = a; a = b; b = t; }
-
-/// Returns the minimum of two values.
-///  @param[in]		a	Value A
-///  @param[in]		b	Value B
-///  @return The minimum of the two values.
-template<class T> inline T rcMin(T a, T b) { return a < b ? a : b; }
-
-/// Returns the maximum of two values.
-///  @param[in]		a	Value A
-///  @param[in]		b	Value B
-///  @return The maximum of the two values.
-template<class T> inline T rcMax(T a, T b) { return a > b ? a : b; }
-
-/// Returns the absolute value.
-///  @param[in]		a	The value.
-///  @return The absolute value of the specified value.
-template<class T> inline T rcAbs(T a) { return a < 0 ? -a : a; }
-
-/// Returns the square of the value.
-///  @param[in]		a	The value.
-///  @return The square of the value.
-template<class T> inline T rcSqr(T a) { return a*a; }
-
-/// Clamps the value to the specified range.
-///  @param[in]		v	The value to clamp.
-///  @param[in]		mn	The minimum permitted return value.
-///  @param[in]		mx	The maximum permitted return value.
-///  @return The value, clamped to the specified range.
-template<class T> inline T rcClamp(T v, T mn, T mx) { return v < mn ? mn : (v > mx ? mx : v); }
-
-/// Returns the square root of the value.
-///  @param[in]		x	The value.
-///  @return The square root of the vlaue.
-float rcSqrt(float x);
-
-/// @}
-/// @name Vector helper functions.
-/// @{
-
-/// Derives the cross product of two vectors. (@p v1 x @p v2)
-///  @param[out]	dest	The cross product. [(x, y, z)]
-///  @param[in]		v1		A Vector [(x, y, z)]
-///  @param[in]		v2		A vector [(x, y, z)]
-inline void rcVcross(float* dest, const float* v1, const float* v2)
-{
-	dest[0] = v1[1]*v2[2] - v1[2]*v2[1];
-	dest[1] = v1[2]*v2[0] - v1[0]*v2[2];
-	dest[2] = v1[0]*v2[1] - v1[1]*v2[0];
-}
-
-/// Derives the dot product of two vectors. (@p v1 . @p v2)
-///  @param[in]		v1	A Vector [(x, y, z)]
-///  @param[in]		v2	A vector [(x, y, z)]
-/// @return The dot product.
-inline float rcVdot(const float* v1, const float* v2)
-{
-	return v1[0]*v2[0] + v1[1]*v2[1] + v1[2]*v2[2];
-}
-
-/// Performs a scaled vector addition. (@p v1 + (@p v2 * @p s))
-///  @param[out]	dest	The result vector. [(x, y, z)]
-///  @param[in]		v1		The base vector. [(x, y, z)]
-///  @param[in]		v2		The vector to scale and add to @p v1. [(x, y, z)]
-///  @param[in]		s		The amount to scale @p v2 by before adding to @p v1.
-inline void rcVmad(float* dest, const float* v1, const float* v2, const float s)
-{
-	dest[0] = v1[0]+v2[0]*s;
-	dest[1] = v1[1]+v2[1]*s;
-	dest[2] = v1[2]+v2[2]*s;
-}
-
-/// Performs a vector addition. (@p v1 + @p v2)
-///  @param[out]	dest	The result vector. [(x, y, z)]
-///  @param[in]		v1		The base vector. [(x, y, z)]
-///  @param[in]		v2		The vector to add to @p v1. [(x, y, z)]
-inline void rcVadd(float* dest, const float* v1, const float* v2)
-{
-	dest[0] = v1[0]+v2[0];
-	dest[1] = v1[1]+v2[1];
-	dest[2] = v1[2]+v2[2];
-}
-
-/// Performs a vector subtraction. (@p v1 - @p v2)
-///  @param[out]	dest	The result vector. [(x, y, z)]
-///  @param[in]		v1		The base vector. [(x, y, z)]
-///  @param[in]		v2		The vector to subtract from @p v1. [(x, y, z)]
-inline void rcVsub(float* dest, const float* v1, const float* v2)
-{
-	dest[0] = v1[0]-v2[0];
-	dest[1] = v1[1]-v2[1];
-	dest[2] = v1[2]-v2[2];
-}
-
-/// Selects the minimum value of each element from the specified vectors.
-///  @param[in,out]	mn	A vector.  (Will be updated with the result.) [(x, y, z)]
-///  @param[in]		v	A vector. [(x, y, z)]
-inline void rcVmin(float* mn, const float* v)
-{
-	mn[0] = rcMin(mn[0], v[0]);
-	mn[1] = rcMin(mn[1], v[1]);
-	mn[2] = rcMin(mn[2], v[2]);
-}
-
-/// Selects the maximum value of each element from the specified vectors.
-///  @param[in,out]	mx	A vector.  (Will be updated with the result.) [(x, y, z)]
-///  @param[in]		v	A vector. [(x, y, z)]
-inline void rcVmax(float* mx, const float* v)
-{
-	mx[0] = rcMax(mx[0], v[0]);
-	mx[1] = rcMax(mx[1], v[1]);
-	mx[2] = rcMax(mx[2], v[2]);
-}
-
-/// Performs a vector copy.
-///  @param[out]	dest	The result. [(x, y, z)]
-///  @param[in]		v		The vector to copy. [(x, y, z)]
-inline void rcVcopy(float* dest, const float* v)
-{
-	dest[0] = v[0];
-	dest[1] = v[1];
-	dest[2] = v[2];
-}
-
-/// Returns the distance between two points.
-///  @param[in]		v1	A point. [(x, y, z)]
-///  @param[in]		v2	A point. [(x, y, z)]
-/// @return The distance between the two points.
-inline float rcVdist(const float* v1, const float* v2)
-{
-	float dx = v2[0] - v1[0];
-	float dy = v2[1] - v1[1];
-	float dz = v2[2] - v1[2];
-	return rcSqrt(dx*dx + dy*dy + dz*dz);
-}
-
-/// Returns the square of the distance between two points.
-///  @param[in]		v1	A point. [(x, y, z)]
-///  @param[in]		v2	A point. [(x, y, z)]
-/// @return The square of the distance between the two points.
-inline float rcVdistSqr(const float* v1, const float* v2)
-{
-	float dx = v2[0] - v1[0];
-	float dy = v2[1] - v1[1];
-	float dz = v2[2] - v1[2];
-	return dx*dx + dy*dy + dz*dz;
-}
-
-/// Normalizes the vector.
-///  @param[in,out]	v	The vector to normalize. [(x, y, z)]
-inline void rcVnormalize(float* v)
-{
-	float d = 1.0f / rcSqrt(rcSqr(v[0]) + rcSqr(v[1]) + rcSqr(v[2]));
-	v[0] *= d;
-	v[1] *= d;
-	v[2] *= d;
-}
-
-/// @}
-/// @name Heightfield Functions
-/// @see rcHeightfield
-/// @{
-
-/// Calculates the bounding box of an array of vertices.
-///  @ingroup recast
-///  @param[in]		verts	An array of vertices. [(x, y, z) * @p nv]
-///  @param[in]		nv		The number of vertices in the @p verts array.
-///  @param[out]	bmin	The minimum bounds of the AABB. [(x, y, z)] [Units: wu]
-///  @param[out]	bmax	The maximum bounds of the AABB. [(x, y, z)] [Units: wu]
-void rcCalcBounds(const float* verts, int nv, float* bmin, float* bmax);
-
-/// Calculates the grid size based on the bounding box and grid cell size.
-///  @ingroup recast
-///  @param[in]		bmin	The minimum bounds of the AABB. [(x, y, z)] [Units: wu]
-///  @param[in]		bmax	The maximum bounds of the AABB. [(x, y, z)] [Units: wu]
-///  @param[in]		cs		The xz-plane cell size. [Limit: > 0] [Units: wu]
-///  @param[out]	w		The width along the x-axis. [Limit: >= 0] [Units: vx]
-///  @param[out]	h		The height along the z-axis. [Limit: >= 0] [Units: vx]
-void rcCalcGridSize(const float* bmin, const float* bmax, float cs, int* w, int* h);
-
-/// Initializes a new heightfield.
-///  @ingroup recast
-///  @param[in,out]	ctx		The build context to use during the operation.
-///  @param[in,out]	hf		The allocated heightfield to initialize.
-///  @param[in]		width	The width of the field along the x-axis. [Limit: >= 0] [Units: vx]
-///  @param[in]		height	The height of the field along the z-axis. [Limit: >= 0] [Units: vx]
-///  @param[in]		bmin	The minimum bounds of the field's AABB. [(x, y, z)] [Units: wu]
-///  @param[in]		bmax	The maximum bounds of the field's AABB. [(x, y, z)] [Units: wu]
-///  @param[in]		cs		The xz-plane cell size to use for the field. [Limit: > 0] [Units: wu]
-///  @param[in]		ch		The y-axis cell size to use for field. [Limit: > 0] [Units: wu]
-///  @returns True if the operation completed successfully.
-bool rcCreateHeightfield(rcContext* ctx, rcHeightfield& hf, int width, int height,
-						 const float* bmin, const float* bmax,
-						 float cs, float ch);
-
-/// Sets the area id of all triangles with a slope below the specified value
-/// to #RC_WALKABLE_AREA.
-///  @ingroup recast
-///  @param[in,out]	ctx					The build context to use during the operation.
-///  @param[in]		walkableSlopeAngle	The maximum slope that is considered walkable.
-///  									[Limits: 0 <= value < 90] [Units: Degrees]
-///  @param[in]		verts				The vertices. [(x, y, z) * @p nv]
-///  @param[in]		nv					The number of vertices.
-///  @param[in]		tris				The triangle vertex indices. [(vertA, vertB, vertC) * @p nt]
-///  @param[in]		nt					The number of triangles.
-///  @param[out]	areas				The triangle area ids. [Length: >= @p nt]
-void rcMarkWalkableTriangles(rcContext* ctx, const float walkableSlopeAngle, const float* verts, int nv,
-							 const int* tris, int nt, unsigned char* areas); 
-
-/// Sets the area id of all triangles with a slope greater than or equal to the specified value to #RC_NULL_AREA.
-///  @ingroup recast
-///  @param[in,out]	ctx					The build context to use during the operation.
-///  @param[in]		walkableSlopeAngle	The maximum slope that is considered walkable.
-///  									[Limits: 0 <= value < 90] [Units: Degrees]
-///  @param[in]		verts				The vertices. [(x, y, z) * @p nv]
-///  @param[in]		nv					The number of vertices.
-///  @param[in]		tris				The triangle vertex indices. [(vertA, vertB, vertC) * @p nt]
-///  @param[in]		nt					The number of triangles.
-///  @param[out]	areas				The triangle area ids. [Length: >= @p nt]
-void rcClearUnwalkableTriangles(rcContext* ctx, const float walkableSlopeAngle, const float* verts, int nv,
-								const int* tris, int nt, unsigned char* areas); 
-
-/// Adds a span to the specified heightfield.
-///  @ingroup recast
-///  @param[in,out]	ctx				The build context to use during the operation.
-///  @param[in,out]	hf				An initialized heightfield.
-///  @param[in]		x				The width index where the span is to be added.
-///  								[Limits: 0 <= value < rcHeightfield::width]
-///  @param[in]		y				The height index where the span is to be added.
-///  								[Limits: 0 <= value < rcHeightfield::height]
-///  @param[in]		smin			The minimum height of the span. [Limit: < @p smax] [Units: vx]
-///  @param[in]		smax			The maximum height of the span. [Limit: <= #RC_SPAN_MAX_HEIGHT] [Units: vx]
-///  @param[in]		area			The area id of the span. [Limit: <= #RC_WALKABLE_AREA)
-///  @param[in]		flagMergeThr	The merge theshold. [Limit: >= 0] [Units: vx]
-///  @returns True if the operation completed successfully.
-bool rcAddSpan(rcContext* ctx, rcHeightfield& hf, const int x, const int y,
-			   const unsigned short smin, const unsigned short smax,
-			   const unsigned char area, const int flagMergeThr);
-
-/// Rasterizes a triangle into the specified heightfield.
-///  @ingroup recast
-///  @param[in,out]	ctx				The build context to use during the operation.
-///  @param[in]		v0				Triangle vertex 0 [(x, y, z)]
-///  @param[in]		v1				Triangle vertex 1 [(x, y, z)]
-///  @param[in]		v2				Triangle vertex 2 [(x, y, z)]
-///  @param[in]		area			The area id of the triangle. [Limit: <= #RC_WALKABLE_AREA]
-///  @param[in,out]	solid			An initialized heightfield.
-///  @param[in]		flagMergeThr	The distance where the walkable flag is favored over the non-walkable flag.
-///  								[Limit: >= 0] [Units: vx]
-///  @returns True if the operation completed successfully.
-bool rcRasterizeTriangle(rcContext* ctx, const float* v0, const float* v1, const float* v2,
-						 const unsigned char area, rcHeightfield& solid,
-						 const int flagMergeThr = 1);
-
-/// Rasterizes an indexed triangle mesh into the specified heightfield.
-///  @ingroup recast
-///  @param[in,out]	ctx				The build context to use during the operation.
-///  @param[in]		verts			The vertices. [(x, y, z) * @p nv]
-///  @param[in]		nv				The number of vertices.
-///  @param[in]		tris			The triangle indices. [(vertA, vertB, vertC) * @p nt]
-///  @param[in]		areas			The area id's of the triangles. [Limit: <= #RC_WALKABLE_AREA] [Size: @p nt]
-///  @param[in]		nt				The number of triangles.
-///  @param[in,out]	solid			An initialized heightfield.
-///  @param[in]		flagMergeThr	The distance where the walkable flag is favored over the non-walkable flag. 
-///  								[Limit: >= 0] [Units: vx]
-///  @returns True if the operation completed successfully.
-bool rcRasterizeTriangles(rcContext* ctx, const float* verts, const int nv,
-						  const int* tris, const unsigned char* areas, const int nt,
-						  rcHeightfield& solid, const int flagMergeThr = 1);
-
-/// Rasterizes an indexed triangle mesh into the specified heightfield.
-///  @ingroup recast
-///  @param[in,out]	ctx			The build context to use during the operation.
-///  @param[in]		verts		The vertices. [(x, y, z) * @p nv]
-///  @param[in]		nv			The number of vertices.
-///  @param[in]		tris		The triangle indices. [(vertA, vertB, vertC) * @p nt]
-///  @param[in]		areas		The area id's of the triangles. [Limit: <= #RC_WALKABLE_AREA] [Size: @p nt]
-///  @param[in]		nt			The number of triangles.
-///  @param[in,out]	solid		An initialized heightfield.
-///  @param[in]		flagMergeThr	The distance where the walkable flag is favored over the non-walkable flag. 
-///  							[Limit: >= 0] [Units: vx]
-///  @returns True if the operation completed successfully.
-bool rcRasterizeTriangles(rcContext* ctx, const float* verts, const int nv,
-						  const unsigned short* tris, const unsigned char* areas, const int nt,
-						  rcHeightfield& solid, const int flagMergeThr = 1);
-
-/// Rasterizes triangles into the specified heightfield.
-///  @ingroup recast
-///  @param[in,out]	ctx				The build context to use during the operation.
-///  @param[in]		verts			The triangle vertices. [(ax, ay, az, bx, by, bz, cx, by, cx) * @p nt]
-///  @param[in]		areas			The area id's of the triangles. [Limit: <= #RC_WALKABLE_AREA] [Size: @p nt]
-///  @param[in]		nt				The number of triangles.
-///  @param[in,out]	solid			An initialized heightfield.
-///  @param[in]		flagMergeThr	The distance where the walkable flag is favored over the non-walkable flag. 
-///  								[Limit: >= 0] [Units: vx]
-///  @returns True if the operation completed successfully.
-bool rcRasterizeTriangles(rcContext* ctx, const float* verts, const unsigned char* areas, const int nt,
-						  rcHeightfield& solid, const int flagMergeThr = 1);
-
-/// Marks non-walkable spans as walkable if their maximum is within @p walkableClimp of a walkable neighbor. 
-///  @ingroup recast
-///  @param[in,out]	ctx				The build context to use during the operation.
-///  @param[in]		walkableClimb	Maximum ledge height that is considered to still be traversable. 
-///  								[Limit: >=0] [Units: vx]
-///  @param[in,out]	solid			A fully built heightfield.  (All spans have been added.)
-void rcFilterLowHangingWalkableObstacles(rcContext* ctx, const int walkableClimb, rcHeightfield& solid);
-
-/// Marks spans that are ledges as not-walkable. 
-///  @ingroup recast
-///  @param[in,out]	ctx				The build context to use during the operation.
-///  @param[in]		walkableHeight	Minimum floor to 'ceiling' height that will still allow the floor area to 
-///  								be considered walkable. [Limit: >= 3] [Units: vx]
-///  @param[in]		walkableClimb	Maximum ledge height that is considered to still be traversable. 
-///  								[Limit: >=0] [Units: vx]
-///  @param[in,out]	solid			A fully built heightfield.  (All spans have been added.)
-void rcFilterLedgeSpans(rcContext* ctx, const int walkableHeight,
-						const int walkableClimb, rcHeightfield& solid);
-
-/// Marks walkable spans as not walkable if the clearence above the span is less than the specified height. 
-///  @ingroup recast
-///  @param[in,out]	ctx				The build context to use during the operation.
-///  @param[in]		walkableHeight	Minimum floor to 'ceiling' height that will still allow the floor area to 
-///  								be considered walkable. [Limit: >= 3] [Units: vx]
-///  @param[in,out]	solid			A fully built heightfield.  (All spans have been added.)
-void rcFilterWalkableLowHeightSpans(rcContext* ctx, int walkableHeight, rcHeightfield& solid);
-
-/// Returns the number of spans contained in the specified heightfield.
-///  @ingroup recast
-///  @param[in,out]	ctx		The build context to use during the operation.
-///  @param[in]		hf		An initialized heightfield.
-///  @returns The number of spans in the heightfield.
-int rcGetHeightFieldSpanCount(rcContext* ctx, rcHeightfield& hf);
-
-/// @}
-/// @name Compact Heightfield Functions
-/// @see rcCompactHeightfield
-/// @{
-
-/// Builds a compact heightfield representing open space, from a heightfield representing solid space.
-///  @ingroup recast
-///  @param[in,out]	ctx				The build context to use during the operation.
-///  @param[in]		walkableHeight	Minimum floor to 'ceiling' height that will still allow the floor area 
-///  								to be considered walkable. [Limit: >= 3] [Units: vx]
-///  @param[in]		walkableClimb	Maximum ledge height that is considered to still be traversable. 
-///  								[Limit: >=0] [Units: vx]
-///  @param[in]		hf				The heightfield to be compacted.
-///  @param[out]	chf				The resulting compact heightfield. (Must be pre-allocated.)
-///  @returns True if the operation completed successfully.
-bool rcBuildCompactHeightfield(rcContext* ctx, const int walkableHeight, const int walkableClimb,
-							   rcHeightfield& hf, rcCompactHeightfield& chf);
-
-/// Erodes the walkable area within the heightfield by the specified radius. 
-///  @ingroup recast
-///  @param[in,out]	ctx		The build context to use during the operation.
-///  @param[in]		radius	The radius of erosion. [Limits: 0 < value < 255] [Units: vx]
-///  @param[in,out]	chf		The populated compact heightfield to erode.
-///  @returns True if the operation completed successfully.
-bool rcErodeWalkableArea(rcContext* ctx, int radius, rcCompactHeightfield& chf);
-
-/// Applies a median filter to walkable area types (based on area id), removing noise.
-///  @ingroup recast
-///  @param[in,out]	ctx		The build context to use during the operation.
-///  @param[in,out]	chf		A populated compact heightfield.
-///  @returns True if the operation completed successfully.
-bool rcMedianFilterWalkableArea(rcContext* ctx, rcCompactHeightfield& chf);
-
-/// Applies an area id to all spans within the specified bounding box. (AABB) 
-///  @ingroup recast
-///  @param[in,out]	ctx		The build context to use during the operation.
-///  @param[in]		bmin	The minimum of the bounding box. [(x, y, z)]
-///  @param[in]		bmax	The maximum of the bounding box. [(x, y, z)]
-///  @param[in]		areaId	The area id to apply. [Limit: <= #RC_WALKABLE_AREA]
-///  @param[in,out]	chf		A populated compact heightfield.
-void rcMarkBoxArea(rcContext* ctx, const float* bmin, const float* bmax, unsigned char areaId,
-				   rcCompactHeightfield& chf);
-
-/// Applies the area id to the all spans within the specified convex polygon. 
-///  @ingroup recast
-///  @param[in,out]	ctx		The build context to use during the operation.
-///  @param[in]		verts	The vertices of the polygon [Fomr: (x, y, z) * @p nverts]
-///  @param[in]		nverts	The number of vertices in the polygon.
-///  @param[in]		hmin	The height of the base of the polygon.
-///  @param[in]		hmax	The height of the top of the polygon.
-///  @param[in]		areaId	The area id to apply. [Limit: <= #RC_WALKABLE_AREA]
-///  @param[in,out]	chf		A populated compact heightfield.
-void rcMarkConvexPolyArea(rcContext* ctx, const float* verts, const int nverts,
-						  const float hmin, const float hmax, unsigned char areaId,
-						  rcCompactHeightfield& chf);
-
-/// Helper function to offset voncex polygons for rcMarkConvexPolyArea.
-///  @ingroup recast
-///  @param[in]		verts		The vertices of the polygon [Form: (x, y, z) * @p nverts]
-///  @param[in]		nverts		The number of vertices in the polygon.
-///  @param[out]	outVerts	The offset vertices (should hold up to 2 * @p nverts) [Form: (x, y, z) * return value]
-///  @param[in]		maxOutVerts	The max number of vertices that can be stored to @p outVerts.
-///  @returns Number of vertices in the offset polygon or 0 if too few vertices in @p outVerts.
-int rcOffsetPoly(const float* verts, const int nverts, const float offset,
-				 float* outVerts, const int maxOutVerts);
-
-/// Applies the area id to all spans within the specified cylinder.
-///  @ingroup recast
-///  @param[in,out]	ctx		The build context to use during the operation.
-///  @param[in]		pos		The center of the base of the cylinder. [Form: (x, y, z)] 
-///  @param[in]		r		The radius of the cylinder.
-///  @param[in]		h		The height of the cylinder.
-///  @param[in]		areaId	The area id to apply. [Limit: <= #RC_WALKABLE_AREA]
-///  @param[in,out]	chf	A populated compact heightfield.
-void rcMarkCylinderArea(rcContext* ctx, const float* pos,
-						const float r, const float h, unsigned char areaId,
-						rcCompactHeightfield& chf);
-
-/// Builds the distance field for the specified compact heightfield. 
-///  @ingroup recast
-///  @param[in,out]	ctx		The build context to use during the operation.
-///  @param[in,out]	chf		A populated compact heightfield.
-///  @returns True if the operation completed successfully.
-bool rcBuildDistanceField(rcContext* ctx, rcCompactHeightfield& chf);
-
-/// Builds region data for the heightfield using watershed partitioning.
-///  @ingroup recast
-///  @param[in,out]	ctx				The build context to use during the operation.
-///  @param[in,out]	chf				A populated compact heightfield.
-///  @param[in]		borderSize		The size of the non-navigable border around the heightfield.
-///  								[Limit: >=0] [Units: vx]
-///  @param[in]		minRegionArea	The minimum number of cells allowed to form isolated island areas.
-///  								[Limit: >=0] [Units: vx].
-///  @param[in]		mergeRegionArea		Any regions with a span count smaller than this value will, if possible,
-///  								be merged with larger regions. [Limit: >=0] [Units: vx] 
-///  @returns True if the operation completed successfully.
-bool rcBuildRegions(rcContext* ctx, rcCompactHeightfield& chf,
-					const int borderSize, const int minRegionArea, const int mergeRegionArea);
-
-/// Builds region data for the heightfield by partitioning the heightfield in non-overlapping layers.
-///  @ingroup recast
-///  @param[in,out]	ctx				The build context to use during the operation.
-///  @param[in,out]	chf				A populated compact heightfield.
-///  @param[in]		borderSize		The size of the non-navigable border around the heightfield.
-///  								[Limit: >=0] [Units: vx]
-///  @param[in]		minRegionArea	The minimum number of cells allowed to form isolated island areas.
-///  								[Limit: >=0] [Units: vx].
-///  @returns True if the operation completed successfully.
-bool rcBuildLayerRegions(rcContext* ctx, rcCompactHeightfield& chf,
-						 const int borderSize, const int minRegionArea);
-
-/// Builds region data for the heightfield using simple monotone partitioning.
-///  @ingroup recast 
-///  @param[in,out]	ctx				The build context to use during the operation.
-///  @param[in,out]	chf				A populated compact heightfield.
-///  @param[in]		borderSize		The size of the non-navigable border around the heightfield.
-///  								[Limit: >=0] [Units: vx]
-///  @param[in]		minRegionArea	The minimum number of cells allowed to form isolated island areas.
-///  								[Limit: >=0] [Units: vx].
-///  @param[in]		mergeRegionArea	Any regions with a span count smaller than this value will, if possible, 
-///  								be merged with larger regions. [Limit: >=0] [Units: vx] 
-///  @returns True if the operation completed successfully.
-bool rcBuildRegionsMonotone(rcContext* ctx, rcCompactHeightfield& chf,
-							const int borderSize, const int minRegionArea, const int mergeRegionArea);
-
-/// Sets the neighbor connection data for the specified direction.
-///  @param[in]		s		The span to update.
-///  @param[in]		dir		The direction to set. [Limits: 0 <= value < 4]
-///  @param[in]		i		The index of the neighbor span.
-inline void rcSetCon(rcCompactSpan& s, int dir, int i)
-{
-	const unsigned int shift = (unsigned int)dir*6;
-	unsigned int con = s.con;
-	s.con = (con & ~(0x3f << shift)) | (((unsigned int)i & 0x3f) << shift);
-}
-
-/// Gets neighbor connection data for the specified direction.
-///  @param[in]		s		The span to check.
-///  @param[in]		dir		The direction to check. [Limits: 0 <= value < 4]
-///  @return The neighbor connection data for the specified direction,
-///  	or #RC_NOT_CONNECTED if there is no connection.
-inline int rcGetCon(const rcCompactSpan& s, int dir)
-{
-	const unsigned int shift = (unsigned int)dir*6;
-	return (s.con >> shift) & 0x3f;
-}
-
-/// Gets the standard width (x-axis) offset for the specified direction.
-///  @param[in]		dir		The direction. [Limits: 0 <= value < 4]
-///  @return The width offset to apply to the current cell position to move
-///  	in the direction.
-inline int rcGetDirOffsetX(int dir)
-{
-	static const int offset[4] = { -1, 0, 1, 0, };
-	return offset[dir&0x03];
-}
-
-/// Gets the standard height (z-axis) offset for the specified direction.
-///  @param[in]		dir		The direction. [Limits: 0 <= value < 4]
-///  @return The height offset to apply to the current cell position to move
-///  	in the direction.
-inline int rcGetDirOffsetY(int dir)
-{
-	static const int offset[4] = { 0, 1, 0, -1 };
-	return offset[dir&0x03];
-}
-
-/// Gets the direction for the specified offset. One of x and y should be 0.
-///  @param[in]		x		The x offset. [Limits: -1 <= value <= 1]
-///  @param[in]		y		The y offset. [Limits: -1 <= value <= 1]
-///  @return The direction that represents the offset.
-inline int rcGetDirForOffset(int x, int y)
-{
-	static const int dirs[5] = { 3, 0, -1, 2, 1 };
-	return dirs[((y+1)<<1)+x];
-}
-
-/// @}
-/// @name Layer, Contour, Polymesh, and Detail Mesh Functions
-/// @see rcHeightfieldLayer, rcContourSet, rcPolyMesh, rcPolyMeshDetail
-/// @{
-
-/// Builds a layer set from the specified compact heightfield.
-///  @ingroup recast
-///  @param[in,out]	ctx			The build context to use during the operation.
-///  @param[in]		chf			A fully built compact heightfield.
-///  @param[in]		borderSize	The size of the non-navigable border around the heightfield. [Limit: >=0] 
-///  							[Units: vx]
-///  @param[in]		walkableHeight	Minimum floor to 'ceiling' height that will still allow the floor area 
-///  							to be considered walkable. [Limit: >= 3] [Units: vx]
-///  @param[out]	lset		The resulting layer set. (Must be pre-allocated.)
-///  @returns True if the operation completed successfully.
-bool rcBuildHeightfieldLayers(rcContext* ctx, rcCompactHeightfield& chf, 
-							  const int borderSize, const int walkableHeight,
-							  rcHeightfieldLayerSet& lset);
-
-/// Builds a contour set from the region outlines in the provided compact heightfield.
-///  @ingroup recast
-///  @param[in,out]	ctx			The build context to use during the operation.
-///  @param[in]		chf			A fully built compact heightfield.
-///  @param[in]		maxError	The maximum distance a simplfied contour's border edges should deviate 
-///  							the original raw contour. [Limit: >=0] [Units: wu]
-///  @param[in]		maxEdgeLen	The maximum allowed length for contour edges along the border of the mesh. 
-///  							[Limit: >=0] [Units: vx]
-///  @param[out]	cset		The resulting contour set. (Must be pre-allocated.)
-///  @param[in]		buildFlags	The build flags. (See: #rcBuildContoursFlags)
-///  @returns True if the operation completed successfully.
-bool rcBuildContours(rcContext* ctx, rcCompactHeightfield& chf,
-					 const float maxError, const int maxEdgeLen,
-					 rcContourSet& cset, const int buildFlags = RC_CONTOUR_TESS_WALL_EDGES);
-
-/// Builds a polygon mesh from the provided contours.
-///  @ingroup recast
-///  @param[in,out]	ctx		The build context to use during the operation.
-///  @param[in]		cset	A fully built contour set.
-///  @param[in]		nvp		The maximum number of vertices allowed for polygons generated during the 
-///  						contour to polygon conversion process. [Limit: >= 3] 
-///  @param[out]	mesh	The resulting polygon mesh. (Must be re-allocated.)
-///  @returns True if the operation completed successfully.
-bool rcBuildPolyMesh(rcContext* ctx, rcContourSet& cset, const int nvp, rcPolyMesh& mesh);
-
-/// Merges multiple polygon meshes into a single mesh.
-///  @ingroup recast
-///  @param[in,out]	ctx		The build context to use during the operation.
-///  @param[in]		meshes	An array of polygon meshes to merge. [Size: @p nmeshes]
-///  @param[in]		nmeshes	The number of polygon meshes in the meshes array.
-///  @param[in]		mesh	The resulting polygon mesh. (Must be pre-allocated.)
-///  @returns True if the operation completed successfully.
-bool rcMergePolyMeshes(rcContext* ctx, rcPolyMesh** meshes, const int nmeshes, rcPolyMesh& mesh);
-
-/// Builds a detail mesh from the provided polygon mesh.
-///  @ingroup recast
-///  @param[in,out]	ctx				The build context to use during the operation.
-///  @param[in]		mesh			A fully built polygon mesh.
-///  @param[in]		chf				The compact heightfield used to build the polygon mesh.
-///  @param[in]		sampleDist		Sets the distance to use when samping the heightfield. [Limit: >=0] [Units: wu]
-///  @param[in]		sampleMaxError	The maximum distance the detail mesh surface should deviate from 
-///  								heightfield data. [Limit: >=0] [Units: wu]
-///  @param[out]	dmesh			The resulting detail mesh.  (Must be pre-allocated.)
-///  @returns True if the operation completed successfully.
-bool rcBuildPolyMeshDetail(rcContext* ctx, const rcPolyMesh& mesh, const rcCompactHeightfield& chf,
-						   const float sampleDist, const float sampleMaxError,
-						   rcPolyMeshDetail& dmesh);
-
-/// Copies the poly mesh data from src to dst.
-///  @ingroup recast
-///  @param[in,out]	ctx		The build context to use during the operation.
-///  @param[in]		src		The source mesh to copy from.
-///  @param[out]	dst		The resulting detail mesh. (Must be pre-allocated, must be empty mesh.)
-///  @returns True if the operation completed successfully.
-bool rcCopyPolyMesh(rcContext* ctx, const rcPolyMesh& src, rcPolyMesh& dst);
-
-/// Merges multiple detail meshes into a single detail mesh.
-///  @ingroup recast
-///  @param[in,out]	ctx		The build context to use during the operation.
-///  @param[in]		meshes	An array of detail meshes to merge. [Size: @p nmeshes]
-///  @param[in]		nmeshes	The number of detail meshes in the meshes array.
-///  @param[out]	mesh	The resulting detail mesh. (Must be pre-allocated.)
-///  @returns True if the operation completed successfully.
-bool rcMergePolyMeshDetails(rcContext* ctx, rcPolyMeshDetail** meshes, const int nmeshes, rcPolyMeshDetail& mesh);
-
-/// @}
-
-#endif // RECAST_H
-
-///////////////////////////////////////////////////////////////////////////
-
-// Due to the large amount of detail documentation for this file, 
-// the content normally located at the end of the header file has been separated
-// out to a file in /Docs/Extern.
diff --git a/extern/recastnavigation/Recast/Include/RecastAlloc.h b/extern/recastnavigation/Recast/Include/RecastAlloc.h
deleted file mode 100644
index e436af9a01..0000000000
--- a/extern/recastnavigation/Recast/Include/RecastAlloc.h
+++ /dev/null
@@ -1,342 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef RECASTALLOC_H
-#define RECASTALLOC_H
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include <RecastAssert.h>
-
-/// Provides hint values to the memory allocator on how long the
-/// memory is expected to be used.
-enum rcAllocHint
-{
-	RC_ALLOC_PERM,		///< Memory will persist after a function call.
-	RC_ALLOC_TEMP		///< Memory used temporarily within a function.
-};
-
-/// A memory allocation function.
-//  @param[in]		size			The size, in bytes of memory, to allocate.
-//  @param[in]		rcAllocHint	A hint to the allocator on how long the memory is expected to be in use.
-//  @return A pointer to the beginning of the allocated memory block, or null if the allocation failed.
-///  @see rcAllocSetCustom
-typedef void* (rcAllocFunc)(size_t size, rcAllocHint hint);
-
-/// A memory deallocation function.
-///  @param[in]		ptr		A pointer to a memory block previously allocated using #rcAllocFunc.
-/// @see rcAllocSetCustom
-typedef void (rcFreeFunc)(void* ptr);
-
-/// Sets the base custom allocation functions to be used by Recast.
-///  @param[in]		allocFunc	The memory allocation function to be used by #rcAlloc
-///  @param[in]		freeFunc	The memory de-allocation function to be used by #rcFree
-void rcAllocSetCustom(rcAllocFunc *allocFunc, rcFreeFunc *freeFunc);
-
-/// Allocates a memory block.
-///  @param[in]		size	The size, in bytes of memory, to allocate.
-///  @param[in]		hint	A hint to the allocator on how long the memory is expected to be in use.
-///  @return A pointer to the beginning of the allocated memory block, or null if the allocation failed.
-/// @see rcFree
-void* rcAlloc(size_t size, rcAllocHint hint);
-
-/// Deallocates a memory block.
-///  @param[in]		ptr		A pointer to a memory block previously allocated using #rcAlloc.
-/// @see rcAlloc
-void rcFree(void* ptr);
-
-/// An implementation of operator new usable for placement new. The default one is part of STL (which we don't use).
-/// rcNewTag is a dummy type used to differentiate our operator from the STL one, in case users import both Recast
-/// and STL.
-struct rcNewTag {};
-inline void* operator new(size_t, const rcNewTag&, void* p) { return p; }
-inline void operator delete(void*, const rcNewTag&, void*) {}
-
-/// Signed to avoid warnnings when comparing to int loop indexes, and common error with comparing to zero.
-/// MSVC2010 has a bug where ssize_t is unsigned (!!!).
-typedef intptr_t rcSizeType;
-#define RC_SIZE_MAX INTPTR_MAX
-
-/// Macros to hint to the compiler about the likeliest branch. Please add a benchmark that demonstrates a performance
-/// improvement before introducing use cases.
-#if defined(__GNUC__) || defined(__clang__)
-#define rcLikely(x) __builtin_expect((x), true)
-#define rcUnlikely(x) __builtin_expect((x), false)
-#else
-#define rcLikely(x) (x)
-#define rcUnlikely(x) (x)
-#endif
-
-/// Variable-sized storage type. Mimics the interface of std::vector<T> with some notable differences:
-///  * Uses rcAlloc()/rcFree() to handle storage.
-///  * No support for a custom allocator.
-///  * Uses signed size instead of size_t to avoid warnings in for loops: "for (int i = 0; i < foo.size(); i++)"
-///  * Omits methods of limited utility: insert/erase, (bad performance), at (we don't use exceptions), operator=.
-///  * assign() and the pre-sizing constructor follow C++11 semantics -- they don't construct a temporary if no value is provided.
-///  * push_back() and resize() support adding values from the current vector. Range-based constructors and assign(begin, end) do not.
-///  * No specialization for bool.
-template <typename T, rcAllocHint H>
-class rcVectorBase {
-	rcSizeType m_size;
-	rcSizeType m_cap;
-	T* m_data;
-	// Constructs a T at the give address with either the copy constructor or the default.
-	static void construct(T* p, const T& v) { ::new(rcNewTag(), (void*)p) T(v); }
-	static void construct(T* p) { ::new(rcNewTag(), (void*)p) T; }
-	static void construct_range(T* begin, T* end);
-	static void construct_range(T* begin, T* end, const T& value);
-	static void copy_range(T* dst, const T* begin, const T* end);
-	void destroy_range(rcSizeType begin, rcSizeType end);
-	// Creates an array of the given size, copies all of this vector's data into it, and returns it.
-	T* allocate_and_copy(rcSizeType size);
-	void resize_impl(rcSizeType size, const T* value);
- public:
-	typedef rcSizeType size_type;
-	typedef T value_type;
-
-	rcVectorBase() : m_size(0), m_cap(0), m_data(0) {};
-	rcVectorBase(const rcVectorBase<T, H>& other) : m_size(0), m_cap(0), m_data(0) { assign(other.begin(), other.end()); }
-	explicit rcVectorBase(rcSizeType count) : m_size(0), m_cap(0), m_data(0) { resize(count); }
-	rcVectorBase(rcSizeType count, const T& value) : m_size(0), m_cap(0), m_data(0) { resize(count, value); }
-	rcVectorBase(const T* begin, const T* end) : m_size(0), m_cap(0), m_data(0) { assign(begin, end); }
-	~rcVectorBase() { destroy_range(0, m_size); rcFree(m_data); }
-
-	// Unlike in std::vector, we return a bool to indicate whether the alloc was successful.
-	bool reserve(rcSizeType size);
-
-	void assign(rcSizeType count, const T& value) { clear(); resize(count, value); }
-	void assign(const T* begin, const T* end);
-
-	void resize(rcSizeType size) { resize_impl(size, NULL); }
-	void resize(rcSizeType size, const T& value) { resize_impl(size, &value); }
-	// Not implemented as resize(0) because resize requires T to be default-constructible.
-	void clear() { destroy_range(0, m_size); m_size = 0; }
-
-	void push_back(const T& value);
-	void pop_back() { rcAssert(m_size > 0); back().~T(); m_size--; }
-
-	rcSizeType size() const { return m_size; }
-	rcSizeType capacity() const { return m_cap; }
-	bool empty() const { return size() == 0; }
-
-	const T& operator[](rcSizeType i) const { rcAssert(i >= 0 && i < m_size); return m_data[i]; }
-	T& operator[](rcSizeType i) { rcAssert(i >= 0 && i < m_size); return m_data[i]; }
-
-	const T& front() const { rcAssert(m_size); return m_data[0]; }
-	T& front() { rcAssert(m_size); return m_data[0]; }
-	const T& back() const { rcAssert(m_size); return m_data[m_size - 1]; };
-	T& back() { rcAssert(m_size); return m_data[m_size - 1]; };
-	const T* data() const { return m_data; }
-	T* data() { return m_data; }
-
-	T* begin() { return m_data; }
-	T* end() { return m_data + m_size; }
-	const T* begin() const { return m_data; }
-	const T* end() const { return m_data + m_size; }
-
-	void swap(rcVectorBase<T, H>& other);
-
-	// Explicitly deleted.
-	rcVectorBase& operator=(const rcVectorBase<T, H>& other);
-};
-
-template<typename T, rcAllocHint H>
-bool rcVectorBase<T, H>::reserve(rcSizeType count) {
-	if (count <= m_cap) {
-		return true;
-	}
-	T* new_data = allocate_and_copy(count);
-	if (!new_data) {
-	  return false;
-	}
-	destroy_range(0, m_size);
-	rcFree(m_data);
-	m_data = new_data;
-	m_cap = count;
-	return true;
-}
-template <typename T, rcAllocHint H>
-T* rcVectorBase<T, H>::allocate_and_copy(rcSizeType size) {
-	rcAssert(RC_SIZE_MAX / static_cast<rcSizeType>(sizeof(T)) >= size);
-	T* new_data = static_cast<T*>(rcAlloc(sizeof(T) * size, H));
-	if (new_data) {
-		copy_range(new_data, m_data, m_data + m_size);
-	}
-	return new_data;
-}
-template <typename T, rcAllocHint H>
-void rcVectorBase<T, H>::assign(const T* begin, const T* end) {
-	clear();
-	reserve(end - begin);
-	m_size = end - begin;
-	copy_range(m_data, begin, end);
-}
-template <typename T, rcAllocHint H>
-void rcVectorBase<T, H>::push_back(const T& value) {
-	// rcLikely increases performance by ~50% on BM_rcVector_PushPreallocated,
-	// and by ~2-5% on BM_rcVector_Push.
-	if (rcLikely(m_size < m_cap)) {
-		construct(m_data + m_size++, value);
-		return;
-	}
-
-	rcAssert(RC_SIZE_MAX / 2 >= m_size);
-	rcSizeType new_cap = m_size ? 2*m_size : 1;
-	T* data = allocate_and_copy(new_cap);
-	// construct between allocate and destroy+free in case value is
-	// in this vector.
-	construct(data + m_size, value);
-	destroy_range(0, m_size);
-	m_size++;
-	m_cap = new_cap;
-	rcFree(m_data);
-	m_data = data;
-}
-template <typename T, rcAllocHint H>
-void rcVectorBase<T, H>::resize_impl(rcSizeType size, const T* value) {
-	if (size < m_size) {
-		destroy_range(size, m_size);
-		m_size = size;
-	} else if (size > m_size) {
-		T* new_data = allocate_and_copy(size);
-		// We defer deconstructing/freeing old data until after constructing
-		// new elements in case "value" is there.
-		if (value) {
-			construct_range(new_data + m_size, new_data + size, *value);
-		} else {
-			construct_range(new_data + m_size, new_data + size);
-		}
-		destroy_range(0, m_size);
-		rcFree(m_data);
-		m_data = new_data;
-		m_cap = size;
-		m_size = size;
-	}
-}
-template <typename T, rcAllocHint H>
-void rcVectorBase<T, H>::swap(rcVectorBase<T, H>& other) {
-	// TODO: Reorganize headers so we can use rcSwap here.
-	rcSizeType tmp_cap = other.m_cap;
-	rcSizeType tmp_size = other.m_size;
-	T* tmp_data = other.m_data;
-
-	other.m_cap = m_cap;
-	other.m_size = m_size;
-	other.m_data = m_data;
-
-	m_cap = tmp_cap;
-	m_size = tmp_size;
-	m_data = tmp_data;
-}
-// static
-template <typename T, rcAllocHint H>
-void rcVectorBase<T, H>::construct_range(T* begin, T* end) {
-	for (T* p = begin; p < end; p++) {
-		construct(p);
-	}
-}
-// static
-template <typename T, rcAllocHint H>
-void rcVectorBase<T, H>::construct_range(T* begin, T* end, const T& value) {
-	for (T* p = begin; p < end; p++) {
-		construct(p, value);
-	}
-}
-// static
-template <typename T, rcAllocHint H>
-void rcVectorBase<T, H>::copy_range(T* dst, const T* begin, const T* end) {
-	for (rcSizeType i = 0 ; i < end - begin; i++) {
-		construct(dst + i, begin[i]);
-	}
-}
-template <typename T, rcAllocHint H>
-void rcVectorBase<T, H>::destroy_range(rcSizeType begin, rcSizeType end) {
-	for (rcSizeType i = begin; i < end; i++) {
-		m_data[i].~T();
-	}
-}
-
-template <typename T>
-class rcTempVector : public rcVectorBase<T, RC_ALLOC_TEMP> {
-	typedef rcVectorBase<T, RC_ALLOC_TEMP> Base;
-public:
-	rcTempVector() : Base() {}
-	explicit rcTempVector(rcSizeType size) : Base(size) {}
-	rcTempVector(rcSizeType size, const T& value) : Base(size, value) {}
-	rcTempVector(const rcTempVector<T>& other) : Base(other) {}
-	rcTempVector(const T* begin, const T* end) : Base(begin, end) {}
-};
-template <typename T>
-class rcPermVector : public rcVectorBase<T, RC_ALLOC_PERM> {
-	typedef rcVectorBase<T, RC_ALLOC_PERM> Base;
-public:
-	rcPermVector() : Base() {}
-	explicit rcPermVector(rcSizeType size) : Base(size) {}
-	rcPermVector(rcSizeType size, const T& value) : Base(size, value) {}
-	rcPermVector(const rcPermVector<T>& other) : Base(other) {}
-	rcPermVector(const T* begin, const T* end) : Base(begin, end) {}
-};
-
-
-/// Legacy class. Prefer rcVector<int>.
-class rcIntArray
-{
-	rcTempVector<int> m_impl;
-public:
-	rcIntArray() {}
-	rcIntArray(int n) : m_impl(n, 0) {}
-	void push(int item) { m_impl.push_back(item); }
-	void resize(int size) { m_impl.resize(size); }
-	int pop()
-	{
-		int v = m_impl.back();
-		m_impl.pop_back();
-		return v;
-	}
-	int size() const { return static_cast<int>(m_impl.size()); }
-	int& operator[](int index) { return m_impl[index]; }
-	int operator[](int index) const { return m_impl[index]; }
-};
-
-/// A simple helper class used to delete an array when it goes out of scope.
-/// @note This class is rarely if ever used by the end user.
-template<class T> class rcScopedDelete
-{
-	T* ptr;
-public:
-
-	/// Constructs an instance with a null pointer.
-	inline rcScopedDelete() : ptr(0) {}
-
-	/// Constructs an instance with the specified pointer.
-	///  @param[in]		p	An pointer to an allocated array.
-	inline rcScopedDelete(T* p) : ptr(p) {}
-	inline ~rcScopedDelete() { rcFree(ptr); }
-
-	/// The root array pointer.
-	///  @return The root array pointer.
-	inline operator T*() { return ptr; }
-	
-private:
-	// Explicitly disabled copy constructor and copy assignment operator.
-	rcScopedDelete(const rcScopedDelete&);
-	rcScopedDelete& operator=(const rcScopedDelete&);
-};
-
-#endif
diff --git a/extern/recastnavigation/Recast/Include/RecastAssert.h b/extern/recastnavigation/Recast/Include/RecastAssert.h
deleted file mode 100644
index e7cc10e496..0000000000
--- a/extern/recastnavigation/Recast/Include/RecastAssert.h
+++ /dev/null
@@ -1,56 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef RECASTASSERT_H
-#define RECASTASSERT_H
-
-// Note: This header file's only purpose is to include define assert.
-// Feel free to change the file and include your own implementation instead.
-
-#ifdef NDEBUG
-
-// From http://cnicholson.net/2009/02/stupid-c-tricks-adventures-in-assert/
-#	define rcAssert(x) do { (void)sizeof(x); } while((void)(__LINE__==-1),false)
-
-#else
-
-/// An assertion failure function.
-//  @param[in]		expression  asserted expression.
-//  @param[in]		file  Filename of the failed assertion.
-//  @param[in]		line  Line number of the failed assertion.
-///  @see rcAssertFailSetCustom
-typedef void (rcAssertFailFunc)(const char* expression, const char* file, int line);
-
-/// Sets the base custom assertion failure function to be used by Recast.
-///  @param[in]		assertFailFunc	The function to be used in case of failure of #dtAssert
-void rcAssertFailSetCustom(rcAssertFailFunc *assertFailFunc);
-
-/// Gets the base custom assertion failure function to be used by Recast.
-rcAssertFailFunc* rcAssertFailGetCustom();
-
-#	include <assert.h> 
-#	define rcAssert(expression) \
-		{ \
-			rcAssertFailFunc* failFunc = rcAssertFailGetCustom(); \
-			if(failFunc == NULL) { assert(expression); } \
-			else if(!(expression)) { (*failFunc)(#expression, __FILE__, __LINE__); } \
-		}
-
-#endif
-
-#endif // RECASTASSERT_H
diff --git a/extern/recastnavigation/Recast/Source/Recast.cpp b/extern/recastnavigation/Recast/Source/Recast.cpp
deleted file mode 100644
index 1b71710cdc..0000000000
--- a/extern/recastnavigation/Recast/Source/Recast.cpp
+++ /dev/null
@@ -1,575 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#include <float.h>
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include "Recast.h"
-#include "RecastAlloc.h"
-#include "RecastAssert.h"
-
-namespace
-{
-/// Allocates and constructs an object of the given type, returning a pointer.
-/// TODO: Support constructor args.
-/// @param[in]		hint	Hint to the allocator.
-template <typename T>
-T* rcNew(rcAllocHint hint) {
-	T* ptr = (T*)rcAlloc(sizeof(T), hint);
-	::new(rcNewTag(), (void*)ptr) T();
-	return ptr;
-}
-
-/// Destroys and frees an object allocated with rcNew.
-/// @param[in]     ptr    The object pointer to delete.
-template <typename T>
-void rcDelete(T* ptr) {
-	if (ptr) {
-		ptr->~T();
-		rcFree((void*)ptr);
-	}
-}
-}  // namespace
-
-
-float rcSqrt(float x)
-{
-	return sqrtf(x);
-}
-
-/// @class rcContext
-/// @par
-///
-/// This class does not provide logging or timer functionality on its 
-/// own.  Both must be provided by a concrete implementation 
-/// by overriding the protected member functions.  Also, this class does not 
-/// provide an interface for extracting log messages. (Only adding them.) 
-/// So concrete implementations must provide one.
-///
-/// If no logging or timers are required, just pass an instance of this 
-/// class through the Recast build process.
-///
-
-/// @par
-///
-/// Example:
-/// @code
-/// // Where ctx is an instance of rcContext and filepath is a char array.
-/// ctx->log(RC_LOG_ERROR, "buildTiledNavigation: Could not load '%s'", filepath);
-/// @endcode
-void rcContext::log(const rcLogCategory category, const char* format, ...)
-{
-	if (!m_logEnabled)
-		return;
-	static const int MSG_SIZE = 512;
-	char msg[MSG_SIZE];
-	va_list ap;
-	va_start(ap, format);
-	int len = vsnprintf(msg, MSG_SIZE, format, ap);
-	if (len >= MSG_SIZE)
-	{
-		len = MSG_SIZE-1;
-		msg[MSG_SIZE-1] = '\0';
-	}
-	va_end(ap);
-	doLog(category, msg, len);
-}
-
-rcHeightfield* rcAllocHeightfield()
-{
-	return rcNew<rcHeightfield>(RC_ALLOC_PERM);
-}
-rcHeightfield::rcHeightfield()
-	: width()
-	, height()
-	, bmin()
-	, bmax()
-	, cs()
-	, ch()
-	, spans()
-	, pools()
-	, freelist()
-{
-}
-
-rcHeightfield::~rcHeightfield()
-{
-	// Delete span array.
-	rcFree(spans);
-	// Delete span pools.
-	while (pools)
-	{
-		rcSpanPool* next = pools->next;
-		rcFree(pools);
-		pools = next;
-	}
-}
-
-void rcFreeHeightField(rcHeightfield* hf)
-{
-	rcDelete(hf);
-}
-
-rcCompactHeightfield* rcAllocCompactHeightfield()
-{
-	return rcNew<rcCompactHeightfield>(RC_ALLOC_PERM);
-}
-
-void rcFreeCompactHeightfield(rcCompactHeightfield* chf)
-{
-	rcDelete(chf);
-}
-
-rcCompactHeightfield::rcCompactHeightfield()
-	: width(),
-	height(),
-	spanCount(),
-	walkableHeight(),
-	walkableClimb(),
-	borderSize(),
-	maxDistance(),
-	maxRegions(),
-	bmin(),
-	bmax(),
-	cs(),
-	ch(),
-	cells(),
-	spans(),
-	dist(),
-	areas()
-{
-}
-rcCompactHeightfield::~rcCompactHeightfield()
-{
-	rcFree(cells);
-	rcFree(spans);
-	rcFree(dist);
-	rcFree(areas);
-}
-
-rcHeightfieldLayerSet* rcAllocHeightfieldLayerSet()
-{
-	return rcNew<rcHeightfieldLayerSet>(RC_ALLOC_PERM);
-}
-void rcFreeHeightfieldLayerSet(rcHeightfieldLayerSet* lset)
-{
-	rcDelete(lset);
-}
-
-rcHeightfieldLayerSet::rcHeightfieldLayerSet()
-	: layers(),	nlayers() {}
-rcHeightfieldLayerSet::~rcHeightfieldLayerSet()
-{
-	for (int i = 0; i < nlayers; ++i)
-	{
-		rcFree(layers[i].heights);
-		rcFree(layers[i].areas);
-		rcFree(layers[i].cons);
-	}
-	rcFree(layers);
-}
-
-
-rcContourSet* rcAllocContourSet()
-{
-	return rcNew<rcContourSet>(RC_ALLOC_PERM);
-}
-void rcFreeContourSet(rcContourSet* cset)
-{
-	rcDelete(cset);
-}
-
-rcContourSet::rcContourSet()
-	: conts(),
-	nconts(),
-	bmin(),
-	bmax(),
-	cs(),
-	ch(),
-	width(),
-	height(),
-	borderSize(),
-	maxError() {}
-rcContourSet::~rcContourSet()
-{
-	for (int i = 0; i < nconts; ++i)
-	{
-		rcFree(conts[i].verts);
-		rcFree(conts[i].rverts);
-	}
-	rcFree(conts);
-}
-
-
-rcPolyMesh* rcAllocPolyMesh()
-{
-	return rcNew<rcPolyMesh>(RC_ALLOC_PERM);
-}
-void rcFreePolyMesh(rcPolyMesh* pmesh)
-{
-	rcDelete(pmesh);
-}
-
-rcPolyMesh::rcPolyMesh()
-	: verts(),
-	polys(),
-	regs(),
-	flags(),
-	areas(),
-	nverts(),
-	npolys(),
-	maxpolys(),
-	nvp(),
-	bmin(),
-	bmax(),
-	cs(),
-	ch(),
-	borderSize(),
-	maxEdgeError() {}
-
-rcPolyMesh::~rcPolyMesh()
-{
-	rcFree(verts);
-	rcFree(polys);
-	rcFree(regs);
-	rcFree(flags);
-	rcFree(areas);
-}
-
-rcPolyMeshDetail* rcAllocPolyMeshDetail()
-{
-	rcPolyMeshDetail* dmesh = (rcPolyMeshDetail*)rcAlloc(sizeof(rcPolyMeshDetail), RC_ALLOC_PERM);
-	memset(dmesh, 0, sizeof(rcPolyMeshDetail));
-	return dmesh;
-}
-
-void rcFreePolyMeshDetail(rcPolyMeshDetail* dmesh)
-{
-	if (!dmesh) return;
-	rcFree(dmesh->meshes);
-	rcFree(dmesh->verts);
-	rcFree(dmesh->tris);
-	rcFree(dmesh);
-}
-
-void rcCalcBounds(const float* verts, int nv, float* bmin, float* bmax)
-{
-	// Calculate bounding box.
-	rcVcopy(bmin, verts);
-	rcVcopy(bmax, verts);
-	for (int i = 1; i < nv; ++i)
-	{
-		const float* v = &verts[i*3];
-		rcVmin(bmin, v);
-		rcVmax(bmax, v);
-	}
-}
-
-void rcCalcGridSize(const float* bmin, const float* bmax, float cs, int* w, int* h)
-{
-	*w = (int)((bmax[0] - bmin[0])/cs+0.5f);
-	*h = (int)((bmax[2] - bmin[2])/cs+0.5f);
-}
-
-/// @par
-///
-/// See the #rcConfig documentation for more information on the configuration parameters.
-/// 
-/// @see rcAllocHeightfield, rcHeightfield 
-bool rcCreateHeightfield(rcContext* ctx, rcHeightfield& hf, int width, int height,
-						 const float* bmin, const float* bmax,
-						 float cs, float ch)
-{
-	rcIgnoreUnused(ctx);
-	
-	hf.width = width;
-	hf.height = height;
-	rcVcopy(hf.bmin, bmin);
-	rcVcopy(hf.bmax, bmax);
-	hf.cs = cs;
-	hf.ch = ch;
-	hf.spans = (rcSpan**)rcAlloc(sizeof(rcSpan*)*hf.width*hf.height, RC_ALLOC_PERM);
-	if (!hf.spans)
-		return false;
-	memset(hf.spans, 0, sizeof(rcSpan*)*hf.width*hf.height);
-	return true;
-}
-
-static void calcTriNormal(const float* v0, const float* v1, const float* v2, float* norm)
-{
-	float e0[3], e1[3];
-	rcVsub(e0, v1, v0);
-	rcVsub(e1, v2, v0);
-	rcVcross(norm, e0, e1);
-	rcVnormalize(norm);
-}
-
-/// @par
-///
-/// Only sets the area id's for the walkable triangles.  Does not alter the
-/// area id's for unwalkable triangles.
-/// 
-/// See the #rcConfig documentation for more information on the configuration parameters.
-/// 
-/// @see rcHeightfield, rcClearUnwalkableTriangles, rcRasterizeTriangles
-void rcMarkWalkableTriangles(rcContext* ctx, const float walkableSlopeAngle,
-							 const float* verts, int nv,
-							 const int* tris, int nt,
-							 unsigned char* areas)
-{
-	rcIgnoreUnused(ctx);
-	rcIgnoreUnused(nv);
-	
-	const float walkableThr = cosf(walkableSlopeAngle/180.0f*RC_PI);
-
-	float norm[3];
-	
-	for (int i = 0; i < nt; ++i)
-	{
-		const int* tri = &tris[i*3];
-		calcTriNormal(&verts[tri[0]*3], &verts[tri[1]*3], &verts[tri[2]*3], norm);
-		// Check if the face is walkable.
-		if (norm[1] > walkableThr)
-			areas[i] = RC_WALKABLE_AREA;
-	}
-}
-
-/// @par
-///
-/// Only sets the area id's for the unwalkable triangles.  Does not alter the
-/// area id's for walkable triangles.
-/// 
-/// See the #rcConfig documentation for more information on the configuration parameters.
-/// 
-/// @see rcHeightfield, rcClearUnwalkableTriangles, rcRasterizeTriangles
-void rcClearUnwalkableTriangles(rcContext* ctx, const float walkableSlopeAngle,
-								const float* verts, int /*nv*/,
-								const int* tris, int nt,
-								unsigned char* areas)
-{
-	rcIgnoreUnused(ctx);
-	
-	const float walkableThr = cosf(walkableSlopeAngle/180.0f*RC_PI);
-	
-	float norm[3];
-	
-	for (int i = 0; i < nt; ++i)
-	{
-		const int* tri = &tris[i*3];
-		calcTriNormal(&verts[tri[0]*3], &verts[tri[1]*3], &verts[tri[2]*3], norm);
-		// Check if the face is walkable.
-		if (norm[1] <= walkableThr)
-			areas[i] = RC_NULL_AREA;
-	}
-}
-
-int rcGetHeightFieldSpanCount(rcContext* ctx, rcHeightfield& hf)
-{
-	rcIgnoreUnused(ctx);
-	
-	const int w = hf.width;
-	const int h = hf.height;
-	int spanCount = 0;
-	for (int y = 0; y < h; ++y)
-	{
-		for (int x = 0; x < w; ++x)
-		{
-			for (rcSpan* s = hf.spans[x + y*w]; s; s = s->next)
-			{
-				if (s->area != RC_NULL_AREA)
-					spanCount++;
-			}
-		}
-	}
-	return spanCount;
-}
-
-/// @par
-///
-/// This is just the beginning of the process of fully building a compact heightfield.
-/// Various filters may be applied, then the distance field and regions built.
-/// E.g: #rcBuildDistanceField and #rcBuildRegions
-///
-/// See the #rcConfig documentation for more information on the configuration parameters.
-///
-/// @see rcAllocCompactHeightfield, rcHeightfield, rcCompactHeightfield, rcConfig
-bool rcBuildCompactHeightfield(rcContext* ctx, const int walkableHeight, const int walkableClimb,
-							   rcHeightfield& hf, rcCompactHeightfield& chf)
-{
-	rcAssert(ctx);
-	
-	rcScopedTimer timer(ctx, RC_TIMER_BUILD_COMPACTHEIGHTFIELD);
-	
-	const int w = hf.width;
-	const int h = hf.height;
-	const int spanCount = rcGetHeightFieldSpanCount(ctx, hf);
-
-	// Fill in header.
-	chf.width = w;
-	chf.height = h;
-	chf.spanCount = spanCount;
-	chf.walkableHeight = walkableHeight;
-	chf.walkableClimb = walkableClimb;
-	chf.maxRegions = 0;
-	rcVcopy(chf.bmin, hf.bmin);
-	rcVcopy(chf.bmax, hf.bmax);
-	chf.bmax[1] += walkableHeight*hf.ch;
-	chf.cs = hf.cs;
-	chf.ch = hf.ch;
-	chf.cells = (rcCompactCell*)rcAlloc(sizeof(rcCompactCell)*w*h, RC_ALLOC_PERM);
-	if (!chf.cells)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildCompactHeightfield: Out of memory 'chf.cells' (%d)", w*h);
-		return false;
-	}
-	memset(chf.cells, 0, sizeof(rcCompactCell)*w*h);
-	chf.spans = (rcCompactSpan*)rcAlloc(sizeof(rcCompactSpan)*spanCount, RC_ALLOC_PERM);
-	if (!chf.spans)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildCompactHeightfield: Out of memory 'chf.spans' (%d)", spanCount);
-		return false;
-	}
-	memset(chf.spans, 0, sizeof(rcCompactSpan)*spanCount);
-	chf.areas = (unsigned char*)rcAlloc(sizeof(unsigned char)*spanCount, RC_ALLOC_PERM);
-	if (!chf.areas)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildCompactHeightfield: Out of memory 'chf.areas' (%d)", spanCount);
-		return false;
-	}
-	memset(chf.areas, RC_NULL_AREA, sizeof(unsigned char)*spanCount);
-	
-	const int MAX_HEIGHT = 0xffff;
-	
-	// Fill in cells and spans.
-	int idx = 0;
-	for (int y = 0; y < h; ++y)
-	{
-		for (int x = 0; x < w; ++x)
-		{
-			const rcSpan* s = hf.spans[x + y*w];
-			// If there are no spans at this cell, just leave the data to index=0, count=0.
-			if (!s) continue;
-			rcCompactCell& c = chf.cells[x+y*w];
-			c.index = idx;
-			c.count = 0;
-			while (s)
-			{
-				if (s->area != RC_NULL_AREA)
-				{
-					const int bot = (int)s->smax;
-					const int top = s->next ? (int)s->next->smin : MAX_HEIGHT;
-					chf.spans[idx].y = (unsigned short)rcClamp(bot, 0, 0xffff);
-					chf.spans[idx].h = (unsigned char)rcClamp(top - bot, 0, 0xff);
-					chf.areas[idx] = s->area;
-					idx++;
-					c.count++;
-				}
-				s = s->next;
-			}
-		}
-	}
-
-	// Find neighbour connections.
-	const int MAX_LAYERS = RC_NOT_CONNECTED-1;
-	int tooHighNeighbour = 0;
-	for (int y = 0; y < h; ++y)
-	{
-		for (int x = 0; x < w; ++x)
-		{
-			const rcCompactCell& c = chf.cells[x+y*w];
-			for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
-			{
-				rcCompactSpan& s = chf.spans[i];
-				
-				for (int dir = 0; dir < 4; ++dir)
-				{
-					rcSetCon(s, dir, RC_NOT_CONNECTED);
-					const int nx = x + rcGetDirOffsetX(dir);
-					const int ny = y + rcGetDirOffsetY(dir);
-					// First check that the neighbour cell is in bounds.
-					if (nx < 0 || ny < 0 || nx >= w || ny >= h)
-						continue;
-						
-					// Iterate over all neighbour spans and check if any of the is
-					// accessible from current cell.
-					const rcCompactCell& nc = chf.cells[nx+ny*w];
-					for (int k = (int)nc.index, nk = (int)(nc.index+nc.count); k < nk; ++k)
-					{
-						const rcCompactSpan& ns = chf.spans[k];
-						const int bot = rcMax(s.y, ns.y);
-						const int top = rcMin(s.y+s.h, ns.y+ns.h);
-
-						// Check that the gap between the spans is walkable,
-						// and that the climb height between the gaps is not too high.
-						if ((top - bot) >= walkableHeight && rcAbs((int)ns.y - (int)s.y) <= walkableClimb)
-						{
-							// Mark direction as walkable.
-							const int lidx = k - (int)nc.index;
-							if (lidx < 0 || lidx > MAX_LAYERS)
-							{
-								tooHighNeighbour = rcMax(tooHighNeighbour, lidx);
-								continue;
-							}
-							rcSetCon(s, dir, lidx);
-							break;
-						}
-					}
-					
-				}
-			}
-		}
-	}
-	
-	if (tooHighNeighbour > MAX_LAYERS)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildCompactHeightfield: Heightfield has too many layers %d (max: %d)",
-				 tooHighNeighbour, MAX_LAYERS);
-	}
-	
-	return true;
-}
-
-/*
-static int getHeightfieldMemoryUsage(const rcHeightfield& hf)
-{
-	int size = 0;
-	size += sizeof(hf);
-	size += hf.width * hf.height * sizeof(rcSpan*);
-	
-	rcSpanPool* pool = hf.pools;
-	while (pool)
-	{
-		size += (sizeof(rcSpanPool) - sizeof(rcSpan)) + sizeof(rcSpan)*RC_SPANS_PER_POOL;
-		pool = pool->next;
-	}
-	return size;
-}
-
-static int getCompactHeightFieldMemoryusage(const rcCompactHeightfield& chf)
-{
-	int size = 0;
-	size += sizeof(rcCompactHeightfield);
-	size += sizeof(rcCompactSpan) * chf.spanCount;
-	size += sizeof(rcCompactCell) * chf.width * chf.height;
-	return size;
-}
-*/
diff --git a/extern/recastnavigation/Recast/Source/RecastAlloc.cpp b/extern/recastnavigation/Recast/Source/RecastAlloc.cpp
deleted file mode 100644
index bdc366116e..0000000000
--- a/extern/recastnavigation/Recast/Source/RecastAlloc.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#include <stdlib.h>
-#include <string.h>
-#include "RecastAlloc.h"
-#include "RecastAssert.h"
-
-static void *rcAllocDefault(size_t size, rcAllocHint)
-{
-	return malloc(size);
-}
-
-static void rcFreeDefault(void *ptr)
-{
-	free(ptr);
-}
-
-static rcAllocFunc* sRecastAllocFunc = rcAllocDefault;
-static rcFreeFunc* sRecastFreeFunc = rcFreeDefault;
-
-/// @see rcAlloc, rcFree
-void rcAllocSetCustom(rcAllocFunc *allocFunc, rcFreeFunc *freeFunc)
-{
-	sRecastAllocFunc = allocFunc ? allocFunc : rcAllocDefault;
-	sRecastFreeFunc = freeFunc ? freeFunc : rcFreeDefault;
-}
-
-/// @see rcAllocSetCustom
-void* rcAlloc(size_t size, rcAllocHint hint)
-{
-	return sRecastAllocFunc(size, hint);
-}
-
-/// @par
-///
-/// @warning This function leaves the value of @p ptr unchanged.  So it still
-/// points to the same (now invalid) location, and not to null.
-/// 
-/// @see rcAllocSetCustom
-void rcFree(void* ptr)
-{
-	if (ptr)
-		sRecastFreeFunc(ptr);
-}
diff --git a/extern/recastnavigation/Recast/Source/RecastArea.cpp b/extern/recastnavigation/Recast/Source/RecastArea.cpp
deleted file mode 100644
index 97139cf996..0000000000
--- a/extern/recastnavigation/Recast/Source/RecastArea.cpp
+++ /dev/null
@@ -1,591 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#include <float.h>
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include "Recast.h"
-#include "RecastAlloc.h"
-#include "RecastAssert.h"
-
-/// @par 
-/// 
-/// Basically, any spans that are closer to a boundary or obstruction than the specified radius 
-/// are marked as unwalkable.
-///
-/// This method is usually called immediately after the heightfield has been built.
-///
-/// @see rcCompactHeightfield, rcBuildCompactHeightfield, rcConfig::walkableRadius
-bool rcErodeWalkableArea(rcContext* ctx, int radius, rcCompactHeightfield& chf)
-{
-	rcAssert(ctx);
-	
-	const int w = chf.width;
-	const int h = chf.height;
-	
-	rcScopedTimer timer(ctx, RC_TIMER_ERODE_AREA);
-	
-	unsigned char* dist = (unsigned char*)rcAlloc(sizeof(unsigned char)*chf.spanCount, RC_ALLOC_TEMP);
-	if (!dist)
-	{
-		ctx->log(RC_LOG_ERROR, "erodeWalkableArea: Out of memory 'dist' (%d).", chf.spanCount);
-		return false;
-	}
-	
-	// Init distance.
-	memset(dist, 0xff, sizeof(unsigned char)*chf.spanCount);
-	
-	// Mark boundary cells.
-	for (int y = 0; y < h; ++y)
-	{
-		for (int x = 0; x < w; ++x)
-		{
-			const rcCompactCell& c = chf.cells[x+y*w];
-			for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
-			{
-				if (chf.areas[i] == RC_NULL_AREA)
-				{
-					dist[i] = 0;
-				}
-				else
-				{
-					const rcCompactSpan& s = chf.spans[i];
-					int nc = 0;
-					for (int dir = 0; dir < 4; ++dir)
-					{
-						if (rcGetCon(s, dir) != RC_NOT_CONNECTED)
-						{
-							const int nx = x + rcGetDirOffsetX(dir);
-							const int ny = y + rcGetDirOffsetY(dir);
-							const int nidx = (int)chf.cells[nx+ny*w].index + rcGetCon(s, dir);
-							if (chf.areas[nidx] != RC_NULL_AREA)
-							{
-								nc++;
-							}
-						}
-					}
-					// At least one missing neighbour.
-					if (nc != 4)
-						dist[i] = 0;
-				}
-			}
-		}
-	}
-	
-	unsigned char nd;
-	
-	// Pass 1
-	for (int y = 0; y < h; ++y)
-	{
-		for (int x = 0; x < w; ++x)
-		{
-			const rcCompactCell& c = chf.cells[x+y*w];
-			for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
-			{
-				const rcCompactSpan& s = chf.spans[i];
-				
-				if (rcGetCon(s, 0) != RC_NOT_CONNECTED)
-				{
-					// (-1,0)
-					const int ax = x + rcGetDirOffsetX(0);
-					const int ay = y + rcGetDirOffsetY(0);
-					const int ai = (int)chf.cells[ax+ay*w].index + rcGetCon(s, 0);
-					const rcCompactSpan& as = chf.spans[ai];
-					nd = (unsigned char)rcMin((int)dist[ai]+2, 255);
-					if (nd < dist[i])
-						dist[i] = nd;
-					
-					// (-1,-1)
-					if (rcGetCon(as, 3) != RC_NOT_CONNECTED)
-					{
-						const int aax = ax + rcGetDirOffsetX(3);
-						const int aay = ay + rcGetDirOffsetY(3);
-						const int aai = (int)chf.cells[aax+aay*w].index + rcGetCon(as, 3);
-						nd = (unsigned char)rcMin((int)dist[aai]+3, 255);
-						if (nd < dist[i])
-							dist[i] = nd;
-					}
-				}
-				if (rcGetCon(s, 3) != RC_NOT_CONNECTED)
-				{
-					// (0,-1)
-					const int ax = x + rcGetDirOffsetX(3);
-					const int ay = y + rcGetDirOffsetY(3);
-					const int ai = (int)chf.cells[ax+ay*w].index + rcGetCon(s, 3);
-					const rcCompactSpan& as = chf.spans[ai];
-					nd = (unsigned char)rcMin((int)dist[ai]+2, 255);
-					if (nd < dist[i])
-						dist[i] = nd;
-					
-					// (1,-1)
-					if (rcGetCon(as, 2) != RC_NOT_CONNECTED)
-					{
-						const int aax = ax + rcGetDirOffsetX(2);
-						const int aay = ay + rcGetDirOffsetY(2);
-						const int aai = (int)chf.cells[aax+aay*w].index + rcGetCon(as, 2);
-						nd = (unsigned char)rcMin((int)dist[aai]+3, 255);
-						if (nd < dist[i])
-							dist[i] = nd;
-					}
-				}
-			}
-		}
-	}
-	
-	// Pass 2
-	for (int y = h-1; y >= 0; --y)
-	{
-		for (int x = w-1; x >= 0; --x)
-		{
-			const rcCompactCell& c = chf.cells[x+y*w];
-			for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
-			{
-				const rcCompactSpan& s = chf.spans[i];
-				
-				if (rcGetCon(s, 2) != RC_NOT_CONNECTED)
-				{
-					// (1,0)
-					const int ax = x + rcGetDirOffsetX(2);
-					const int ay = y + rcGetDirOffsetY(2);
-					const int ai = (int)chf.cells[ax+ay*w].index + rcGetCon(s, 2);
-					const rcCompactSpan& as = chf.spans[ai];
-					nd = (unsigned char)rcMin((int)dist[ai]+2, 255);
-					if (nd < dist[i])
-						dist[i] = nd;
-					
-					// (1,1)
-					if (rcGetCon(as, 1) != RC_NOT_CONNECTED)
-					{
-						const int aax = ax + rcGetDirOffsetX(1);
-						const int aay = ay + rcGetDirOffsetY(1);
-						const int aai = (int)chf.cells[aax+aay*w].index + rcGetCon(as, 1);
-						nd = (unsigned char)rcMin((int)dist[aai]+3, 255);
-						if (nd < dist[i])
-							dist[i] = nd;
-					}
-				}
-				if (rcGetCon(s, 1) != RC_NOT_CONNECTED)
-				{
-					// (0,1)
-					const int ax = x + rcGetDirOffsetX(1);
-					const int ay = y + rcGetDirOffsetY(1);
-					const int ai = (int)chf.cells[ax+ay*w].index + rcGetCon(s, 1);
-					const rcCompactSpan& as = chf.spans[ai];
-					nd = (unsigned char)rcMin((int)dist[ai]+2, 255);
-					if (nd < dist[i])
-						dist[i] = nd;
-					
-					// (-1,1)
-					if (rcGetCon(as, 0) != RC_NOT_CONNECTED)
-					{
-						const int aax = ax + rcGetDirOffsetX(0);
-						const int aay = ay + rcGetDirOffsetY(0);
-						const int aai = (int)chf.cells[aax+aay*w].index + rcGetCon(as, 0);
-						nd = (unsigned char)rcMin((int)dist[aai]+3, 255);
-						if (nd < dist[i])
-							dist[i] = nd;
-					}
-				}
-			}
-		}
-	}
-	
-	const unsigned char thr = (unsigned char)(radius*2);
-	for (int i = 0; i < chf.spanCount; ++i)
-		if (dist[i] < thr)
-			chf.areas[i] = RC_NULL_AREA;
-	
-	rcFree(dist);
-	
-	return true;
-}
-
-static void insertSort(unsigned char* a, const int n)
-{
-	int i, j;
-	for (i = 1; i < n; i++)
-	{
-		const unsigned char value = a[i];
-		for (j = i - 1; j >= 0 && a[j] > value; j--)
-			a[j+1] = a[j];
-		a[j+1] = value;
-	}
-}
-
-/// @par
-///
-/// This filter is usually applied after applying area id's using functions
-/// such as #rcMarkBoxArea, #rcMarkConvexPolyArea, and #rcMarkCylinderArea.
-/// 
-/// @see rcCompactHeightfield
-bool rcMedianFilterWalkableArea(rcContext* ctx, rcCompactHeightfield& chf)
-{
-	rcAssert(ctx);
-	
-	const int w = chf.width;
-	const int h = chf.height;
-	
-	rcScopedTimer timer(ctx, RC_TIMER_MEDIAN_AREA);
-	
-	unsigned char* areas = (unsigned char*)rcAlloc(sizeof(unsigned char)*chf.spanCount, RC_ALLOC_TEMP);
-	if (!areas)
-	{
-		ctx->log(RC_LOG_ERROR, "medianFilterWalkableArea: Out of memory 'areas' (%d).", chf.spanCount);
-		return false;
-	}
-	
-	// Init distance.
-	memset(areas, 0xff, sizeof(unsigned char)*chf.spanCount);
-	
-	for (int y = 0; y < h; ++y)
-	{
-		for (int x = 0; x < w; ++x)
-		{
-			const rcCompactCell& c = chf.cells[x+y*w];
-			for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
-			{
-				const rcCompactSpan& s = chf.spans[i];
-				if (chf.areas[i] == RC_NULL_AREA)
-				{
-					areas[i] = chf.areas[i];
-					continue;
-				}
-				
-				unsigned char nei[9];
-				for (int j = 0; j < 9; ++j)
-					nei[j] = chf.areas[i];
-				
-				for (int dir = 0; dir < 4; ++dir)
-				{
-					if (rcGetCon(s, dir) != RC_NOT_CONNECTED)
-					{
-						const int ax = x + rcGetDirOffsetX(dir);
-						const int ay = y + rcGetDirOffsetY(dir);
-						const int ai = (int)chf.cells[ax+ay*w].index + rcGetCon(s, dir);
-						if (chf.areas[ai] != RC_NULL_AREA)
-							nei[dir*2+0] = chf.areas[ai];
-						
-						const rcCompactSpan& as = chf.spans[ai];
-						const int dir2 = (dir+1) & 0x3;
-						if (rcGetCon(as, dir2) != RC_NOT_CONNECTED)
-						{
-							const int ax2 = ax + rcGetDirOffsetX(dir2);
-							const int ay2 = ay + rcGetDirOffsetY(dir2);
-							const int ai2 = (int)chf.cells[ax2+ay2*w].index + rcGetCon(as, dir2);
-							if (chf.areas[ai2] != RC_NULL_AREA)
-								nei[dir*2+1] = chf.areas[ai2];
-						}
-					}
-				}
-				insertSort(nei, 9);
-				areas[i] = nei[4];
-			}
-		}
-	}
-	
-	memcpy(chf.areas, areas, sizeof(unsigned char)*chf.spanCount);
-	
-	rcFree(areas);
-	
-	return true;
-}
-
-/// @par
-///
-/// The value of spacial parameters are in world units.
-/// 
-/// @see rcCompactHeightfield, rcMedianFilterWalkableArea
-void rcMarkBoxArea(rcContext* ctx, const float* bmin, const float* bmax, unsigned char areaId,
-				   rcCompactHeightfield& chf)
-{
-	rcAssert(ctx);
-	
-	rcScopedTimer timer(ctx, RC_TIMER_MARK_BOX_AREA);
-
-	int minx = (int)((bmin[0]-chf.bmin[0])/chf.cs);
-	int miny = (int)((bmin[1]-chf.bmin[1])/chf.ch);
-	int minz = (int)((bmin[2]-chf.bmin[2])/chf.cs);
-	int maxx = (int)((bmax[0]-chf.bmin[0])/chf.cs);
-	int maxy = (int)((bmax[1]-chf.bmin[1])/chf.ch);
-	int maxz = (int)((bmax[2]-chf.bmin[2])/chf.cs);
-	
-	if (maxx < 0) return;
-	if (minx >= chf.width) return;
-	if (maxz < 0) return;
-	if (minz >= chf.height) return;
-
-	if (minx < 0) minx = 0;
-	if (maxx >= chf.width) maxx = chf.width-1;
-	if (minz < 0) minz = 0;
-	if (maxz >= chf.height) maxz = chf.height-1;	
-	
-	for (int z = minz; z <= maxz; ++z)
-	{
-		for (int x = minx; x <= maxx; ++x)
-		{
-			const rcCompactCell& c = chf.cells[x+z*chf.width];
-			for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
-			{
-				rcCompactSpan& s = chf.spans[i];
-				if ((int)s.y >= miny && (int)s.y <= maxy)
-				{
-					if (chf.areas[i] != RC_NULL_AREA)
-						chf.areas[i] = areaId;
-				}
-			}
-		}
-	}
-}
-
-
-static int pointInPoly(int nvert, const float* verts, const float* p)
-{
-	int i, j, c = 0;
-	for (i = 0, j = nvert-1; i < nvert; j = i++)
-	{
-		const float* vi = &verts[i*3];
-		const float* vj = &verts[j*3];
-		if (((vi[2] > p[2]) != (vj[2] > p[2])) &&
-			(p[0] < (vj[0]-vi[0]) * (p[2]-vi[2]) / (vj[2]-vi[2]) + vi[0]) )
-			c = !c;
-	}
-	return c;
-}
-
-/// @par
-///
-/// The value of spacial parameters are in world units.
-/// 
-/// The y-values of the polygon vertices are ignored. So the polygon is effectively 
-/// projected onto the xz-plane at @p hmin, then extruded to @p hmax.
-/// 
-/// @see rcCompactHeightfield, rcMedianFilterWalkableArea
-void rcMarkConvexPolyArea(rcContext* ctx, const float* verts, const int nverts,
-						  const float hmin, const float hmax, unsigned char areaId,
-						  rcCompactHeightfield& chf)
-{
-	rcAssert(ctx);
-	
-	rcScopedTimer timer(ctx, RC_TIMER_MARK_CONVEXPOLY_AREA);
-
-	float bmin[3], bmax[3];
-	rcVcopy(bmin, verts);
-	rcVcopy(bmax, verts);
-	for (int i = 1; i < nverts; ++i)
-	{
-		rcVmin(bmin, &verts[i*3]);
-		rcVmax(bmax, &verts[i*3]);
-	}
-	bmin[1] = hmin;
-	bmax[1] = hmax;
-
-	int minx = (int)((bmin[0]-chf.bmin[0])/chf.cs);
-	int miny = (int)((bmin[1]-chf.bmin[1])/chf.ch);
-	int minz = (int)((bmin[2]-chf.bmin[2])/chf.cs);
-	int maxx = (int)((bmax[0]-chf.bmin[0])/chf.cs);
-	int maxy = (int)((bmax[1]-chf.bmin[1])/chf.ch);
-	int maxz = (int)((bmax[2]-chf.bmin[2])/chf.cs);
-	
-	if (maxx < 0) return;
-	if (minx >= chf.width) return;
-	if (maxz < 0) return;
-	if (minz >= chf.height) return;
-	
-	if (minx < 0) minx = 0;
-	if (maxx >= chf.width) maxx = chf.width-1;
-	if (minz < 0) minz = 0;
-	if (maxz >= chf.height) maxz = chf.height-1;	
-	
-	
-	// TODO: Optimize.
-	for (int z = minz; z <= maxz; ++z)
-	{
-		for (int x = minx; x <= maxx; ++x)
-		{
-			const rcCompactCell& c = chf.cells[x+z*chf.width];
-			for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
-			{
-				rcCompactSpan& s = chf.spans[i];
-				if (chf.areas[i] == RC_NULL_AREA)
-					continue;
-				if ((int)s.y >= miny && (int)s.y <= maxy)
-				{
-					float p[3];
-					p[0] = chf.bmin[0] + (x+0.5f)*chf.cs; 
-					p[1] = 0;
-					p[2] = chf.bmin[2] + (z+0.5f)*chf.cs; 
-
-					if (pointInPoly(nverts, verts, p))
-					{
-						chf.areas[i] = areaId;
-					}
-				}
-			}
-		}
-	}
-}
-
-int rcOffsetPoly(const float* verts, const int nverts, const float offset,
-				 float* outVerts, const int maxOutVerts)
-{
-	const float	MITER_LIMIT = 1.20f;
-
-	int n = 0;
-
-	for (int i = 0; i < nverts; i++)
-	{
-		const int a = (i+nverts-1) % nverts;
-		const int b = i;
-		const int c = (i+1) % nverts;
-		const float* va = &verts[a*3];
-		const float* vb = &verts[b*3];
-		const float* vc = &verts[c*3];
-		float dx0 = vb[0] - va[0];
-		float dy0 = vb[2] - va[2];
-		float d0 = dx0*dx0 + dy0*dy0;
-		if (d0 > 1e-6f)
-		{
-			d0 = 1.0f/rcSqrt(d0);
-			dx0 *= d0;
-			dy0 *= d0;
-		}
-		float dx1 = vc[0] - vb[0];
-		float dy1 = vc[2] - vb[2];
-		float d1 = dx1*dx1 + dy1*dy1;
-		if (d1 > 1e-6f)
-		{
-			d1 = 1.0f/rcSqrt(d1);
-			dx1 *= d1;
-			dy1 *= d1;
-		}
-		const float dlx0 = -dy0;
-		const float dly0 = dx0;
-		const float dlx1 = -dy1;
-		const float dly1 = dx1;
-		float cross = dx1*dy0 - dx0*dy1;
-		float dmx = (dlx0 + dlx1) * 0.5f;
-		float dmy = (dly0 + dly1) * 0.5f;
-		float dmr2 = dmx*dmx + dmy*dmy;
-		bool bevel = dmr2 * MITER_LIMIT*MITER_LIMIT < 1.0f;
-		if (dmr2 > 1e-6f)
-		{
-			const float scale = 1.0f / dmr2;
-			dmx *= scale;
-			dmy *= scale;
-		}
-
-		if (bevel && cross < 0.0f)
-		{
-			if (n+2 >= maxOutVerts)
-				return 0;
-			float d = (1.0f - (dx0*dx1 + dy0*dy1))*0.5f;
-			outVerts[n*3+0] = vb[0] + (-dlx0+dx0*d)*offset;
-			outVerts[n*3+1] = vb[1];
-			outVerts[n*3+2] = vb[2] + (-dly0+dy0*d)*offset;
-			n++;
-			outVerts[n*3+0] = vb[0] + (-dlx1-dx1*d)*offset;
-			outVerts[n*3+1] = vb[1];
-			outVerts[n*3+2] = vb[2] + (-dly1-dy1*d)*offset;
-			n++;
-		}
-		else
-		{
-			if (n+1 >= maxOutVerts)
-				return 0;
-			outVerts[n*3+0] = vb[0] - dmx*offset;
-			outVerts[n*3+1] = vb[1];
-			outVerts[n*3+2] = vb[2] - dmy*offset;
-			n++;
-		}
-	}
-	
-	return n;
-}
-
-
-/// @par
-///
-/// The value of spacial parameters are in world units.
-/// 
-/// @see rcCompactHeightfield, rcMedianFilterWalkableArea
-void rcMarkCylinderArea(rcContext* ctx, const float* pos,
-						const float r, const float h, unsigned char areaId,
-						rcCompactHeightfield& chf)
-{
-	rcAssert(ctx);
-	
-	rcScopedTimer timer(ctx, RC_TIMER_MARK_CYLINDER_AREA);
-	
-	float bmin[3], bmax[3];
-	bmin[0] = pos[0] - r;
-	bmin[1] = pos[1];
-	bmin[2] = pos[2] - r;
-	bmax[0] = pos[0] + r;
-	bmax[1] = pos[1] + h;
-	bmax[2] = pos[2] + r;
-	const float r2 = r*r;
-	
-	int minx = (int)((bmin[0]-chf.bmin[0])/chf.cs);
-	int miny = (int)((bmin[1]-chf.bmin[1])/chf.ch);
-	int minz = (int)((bmin[2]-chf.bmin[2])/chf.cs);
-	int maxx = (int)((bmax[0]-chf.bmin[0])/chf.cs);
-	int maxy = (int)((bmax[1]-chf.bmin[1])/chf.ch);
-	int maxz = (int)((bmax[2]-chf.bmin[2])/chf.cs);
-	
-	if (maxx < 0) return;
-	if (minx >= chf.width) return;
-	if (maxz < 0) return;
-	if (minz >= chf.height) return;
-	
-	if (minx < 0) minx = 0;
-	if (maxx >= chf.width) maxx = chf.width-1;
-	if (minz < 0) minz = 0;
-	if (maxz >= chf.height) maxz = chf.height-1;	
-	
-	
-	for (int z = minz; z <= maxz; ++z)
-	{
-		for (int x = minx; x <= maxx; ++x)
-		{
-			const rcCompactCell& c = chf.cells[x+z*chf.width];
-			for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
-			{
-				rcCompactSpan& s = chf.spans[i];
-				
-				if (chf.areas[i] == RC_NULL_AREA)
-					continue;
-				
-				if ((int)s.y >= miny && (int)s.y <= maxy)
-				{
-					const float sx = chf.bmin[0] + (x+0.5f)*chf.cs; 
-					const float sz = chf.bmin[2] + (z+0.5f)*chf.cs; 
-					const float dx = sx - pos[0];
-					const float dz = sz - pos[2];
-					
-					if (dx*dx + dz*dz < r2)
-					{
-						chf.areas[i] = areaId;
-					}
-				}
-			}
-		}
-	}
-}
diff --git a/extern/recastnavigation/Recast/Source/RecastAssert.cpp b/extern/recastnavigation/Recast/Source/RecastAssert.cpp
deleted file mode 100644
index 6297d42023..0000000000
--- a/extern/recastnavigation/Recast/Source/RecastAssert.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#include "RecastAssert.h"
-
-#ifndef NDEBUG
-
-static rcAssertFailFunc* sRecastAssertFailFunc = 0;
-
-void rcAssertFailSetCustom(rcAssertFailFunc *assertFailFunc)
-{
-	sRecastAssertFailFunc = assertFailFunc;
-}
-
-rcAssertFailFunc* rcAssertFailGetCustom()
-{
-	return sRecastAssertFailFunc;
-}
-
-#endif
diff --git a/extern/recastnavigation/Recast/Source/RecastContour.cpp b/extern/recastnavigation/Recast/Source/RecastContour.cpp
deleted file mode 100644
index 6574c11b6b..0000000000
--- a/extern/recastnavigation/Recast/Source/RecastContour.cpp
+++ /dev/null
@@ -1,1105 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "Recast.h"
-#include "RecastAlloc.h"
-#include "RecastAssert.h"
-
-
-static int getCornerHeight(int x, int y, int i, int dir,
-						   const rcCompactHeightfield& chf,
-						   bool& isBorderVertex)
-{
-	const rcCompactSpan& s = chf.spans[i];
-	int ch = (int)s.y;
-	int dirp = (dir+1) & 0x3;
-	
-	unsigned int regs[4] = {0,0,0,0};
-	
-	// Combine region and area codes in order to prevent
-	// border vertices which are in between two areas to be removed.
-	regs[0] = chf.spans[i].reg | (chf.areas[i] << 16);
-	
-	if (rcGetCon(s, dir) != RC_NOT_CONNECTED)
-	{
-		const int ax = x + rcGetDirOffsetX(dir);
-		const int ay = y + rcGetDirOffsetY(dir);
-		const int ai = (int)chf.cells[ax+ay*chf.width].index + rcGetCon(s, dir);
-		const rcCompactSpan& as = chf.spans[ai];
-		ch = rcMax(ch, (int)as.y);
-		regs[1] = chf.spans[ai].reg | (chf.areas[ai] << 16);
-		if (rcGetCon(as, dirp) != RC_NOT_CONNECTED)
-		{
-			const int ax2 = ax + rcGetDirOffsetX(dirp);
-			const int ay2 = ay + rcGetDirOffsetY(dirp);
-			const int ai2 = (int)chf.cells[ax2+ay2*chf.width].index + rcGetCon(as, dirp);
-			const rcCompactSpan& as2 = chf.spans[ai2];
-			ch = rcMax(ch, (int)as2.y);
-			regs[2] = chf.spans[ai2].reg | (chf.areas[ai2] << 16);
-		}
-	}
-	if (rcGetCon(s, dirp) != RC_NOT_CONNECTED)
-	{
-		const int ax = x + rcGetDirOffsetX(dirp);
-		const int ay = y + rcGetDirOffsetY(dirp);
-		const int ai = (int)chf.cells[ax+ay*chf.width].index + rcGetCon(s, dirp);
-		const rcCompactSpan& as = chf.spans[ai];
-		ch = rcMax(ch, (int)as.y);
-		regs[3] = chf.spans[ai].reg | (chf.areas[ai] << 16);
-		if (rcGetCon(as, dir) != RC_NOT_CONNECTED)
-		{
-			const int ax2 = ax + rcGetDirOffsetX(dir);
-			const int ay2 = ay + rcGetDirOffsetY(dir);
-			const int ai2 = (int)chf.cells[ax2+ay2*chf.width].index + rcGetCon(as, dir);
-			const rcCompactSpan& as2 = chf.spans[ai2];
-			ch = rcMax(ch, (int)as2.y);
-			regs[2] = chf.spans[ai2].reg | (chf.areas[ai2] << 16);
-		}
-	}
-
-	// Check if the vertex is special edge vertex, these vertices will be removed later.
-	for (int j = 0; j < 4; ++j)
-	{
-		const int a = j;
-		const int b = (j+1) & 0x3;
-		const int c = (j+2) & 0x3;
-		const int d = (j+3) & 0x3;
-		
-		// The vertex is a border vertex there are two same exterior cells in a row,
-		// followed by two interior cells and none of the regions are out of bounds.
-		const bool twoSameExts = (regs[a] & regs[b] & RC_BORDER_REG) != 0 && regs[a] == regs[b];
-		const bool twoInts = ((regs[c] | regs[d]) & RC_BORDER_REG) == 0;
-		const bool intsSameArea = (regs[c]>>16) == (regs[d]>>16);
-		const bool noZeros = regs[a] != 0 && regs[b] != 0 && regs[c] != 0 && regs[d] != 0;
-		if (twoSameExts && twoInts && intsSameArea && noZeros)
-		{
-			isBorderVertex = true;
-			break;
-		}
-	}
-	
-	return ch;
-}
-
-static void walkContour(int x, int y, int i,
-						rcCompactHeightfield& chf,
-						unsigned char* flags, rcIntArray& points)
-{
-	// Choose the first non-connected edge
-	unsigned char dir = 0;
-	while ((flags[i] & (1 << dir)) == 0)
-		dir++;
-	
-	unsigned char startDir = dir;
-	int starti = i;
-	
-	const unsigned char area = chf.areas[i];
-	
-	int iter = 0;
-	while (++iter < 40000)
-	{
-		if (flags[i] & (1 << dir))
-		{
-			// Choose the edge corner
-			bool isBorderVertex = false;
-			bool isAreaBorder = false;
-			int px = x;
-			int py = getCornerHeight(x, y, i, dir, chf, isBorderVertex);
-			int pz = y;
-			switch(dir)
-			{
-				case 0: pz++; break;
-				case 1: px++; pz++; break;
-				case 2: px++; break;
-			}
-			int r = 0;
-			const rcCompactSpan& s = chf.spans[i];
-			if (rcGetCon(s, dir) != RC_NOT_CONNECTED)
-			{
-				const int ax = x + rcGetDirOffsetX(dir);
-				const int ay = y + rcGetDirOffsetY(dir);
-				const int ai = (int)chf.cells[ax+ay*chf.width].index + rcGetCon(s, dir);
-				r = (int)chf.spans[ai].reg;
-				if (area != chf.areas[ai])
-					isAreaBorder = true;
-			}
-			if (isBorderVertex)
-				r |= RC_BORDER_VERTEX;
-			if (isAreaBorder)
-				r |= RC_AREA_BORDER;
-			points.push(px);
-			points.push(py);
-			points.push(pz);
-			points.push(r);
-			
-			flags[i] &= ~(1 << dir); // Remove visited edges
-			dir = (dir+1) & 0x3;  // Rotate CW
-		}
-		else
-		{
-			int ni = -1;
-			const int nx = x + rcGetDirOffsetX(dir);
-			const int ny = y + rcGetDirOffsetY(dir);
-			const rcCompactSpan& s = chf.spans[i];
-			if (rcGetCon(s, dir) != RC_NOT_CONNECTED)
-			{
-				const rcCompactCell& nc = chf.cells[nx+ny*chf.width];
-				ni = (int)nc.index + rcGetCon(s, dir);
-			}
-			if (ni == -1)
-			{
-				// Should not happen.
-				return;
-			}
-			x = nx;
-			y = ny;
-			i = ni;
-			dir = (dir+3) & 0x3;	// Rotate CCW
-		}
-		
-		if (starti == i && startDir == dir)
-		{
-			break;
-		}
-	}
-}
-
-static float distancePtSeg(const int x, const int z,
-						   const int px, const int pz,
-						   const int qx, const int qz)
-{
-	float pqx = (float)(qx - px);
-	float pqz = (float)(qz - pz);
-	float dx = (float)(x - px);
-	float dz = (float)(z - pz);
-	float d = pqx*pqx + pqz*pqz;
-	float t = pqx*dx + pqz*dz;
-	if (d > 0)
-		t /= d;
-	if (t < 0)
-		t = 0;
-	else if (t > 1)
-		t = 1;
-	
-	dx = px + t*pqx - x;
-	dz = pz + t*pqz - z;
-	
-	return dx*dx + dz*dz;
-}
-
-static void simplifyContour(rcIntArray& points, rcIntArray& simplified,
-							const float maxError, const int maxEdgeLen, const int buildFlags)
-{
-	// Add initial points.
-	bool hasConnections = false;
-	for (int i = 0; i < points.size(); i += 4)
-	{
-		if ((points[i+3] & RC_CONTOUR_REG_MASK) != 0)
-		{
-			hasConnections = true;
-			break;
-		}
-	}
-	
-	if (hasConnections)
-	{
-		// The contour has some portals to other regions.
-		// Add a new point to every location where the region changes.
-		for (int i = 0, ni = points.size()/4; i < ni; ++i)
-		{
-			int ii = (i+1) % ni;
-			const bool differentRegs = (points[i*4+3] & RC_CONTOUR_REG_MASK) != (points[ii*4+3] & RC_CONTOUR_REG_MASK);
-			const bool areaBorders = (points[i*4+3] & RC_AREA_BORDER) != (points[ii*4+3] & RC_AREA_BORDER);
-			if (differentRegs || areaBorders)
-			{
-				simplified.push(points[i*4+0]);
-				simplified.push(points[i*4+1]);
-				simplified.push(points[i*4+2]);
-				simplified.push(i);
-			}
-		}
-	}
-	
-	if (simplified.size() == 0)
-	{
-		// If there is no connections at all,
-		// create some initial points for the simplification process.
-		// Find lower-left and upper-right vertices of the contour.
-		int llx = points[0];
-		int lly = points[1];
-		int llz = points[2];
-		int lli = 0;
-		int urx = points[0];
-		int ury = points[1];
-		int urz = points[2];
-		int uri = 0;
-		for (int i = 0; i < points.size(); i += 4)
-		{
-			int x = points[i+0];
-			int y = points[i+1];
-			int z = points[i+2];
-			if (x < llx || (x == llx && z < llz))
-			{
-				llx = x;
-				lly = y;
-				llz = z;
-				lli = i/4;
-			}
-			if (x > urx || (x == urx && z > urz))
-			{
-				urx = x;
-				ury = y;
-				urz = z;
-				uri = i/4;
-			}
-		}
-		simplified.push(llx);
-		simplified.push(lly);
-		simplified.push(llz);
-		simplified.push(lli);
-		
-		simplified.push(urx);
-		simplified.push(ury);
-		simplified.push(urz);
-		simplified.push(uri);
-	}
-	
-	// Add points until all raw points are within
-	// error tolerance to the simplified shape.
-	const int pn = points.size()/4;
-	for (int i = 0; i < simplified.size()/4; )
-	{
-		int ii = (i+1) % (simplified.size()/4);
-		
-		int ax = simplified[i*4+0];
-		int az = simplified[i*4+2];
-		int ai = simplified[i*4+3];
-
-		int bx = simplified[ii*4+0];
-		int bz = simplified[ii*4+2];
-		int bi = simplified[ii*4+3];
-
-		// Find maximum deviation from the segment.
-		float maxd = 0;
-		int maxi = -1;
-		int ci, cinc, endi;
-
-		// Traverse the segment in lexilogical order so that the
-		// max deviation is calculated similarly when traversing
-		// opposite segments.
-		if (bx > ax || (bx == ax && bz > az))
-		{
-			cinc = 1;
-			ci = (ai+cinc) % pn;
-			endi = bi;
-		}
-		else
-		{
-			cinc = pn-1;
-			ci = (bi+cinc) % pn;
-			endi = ai;
-			rcSwap(ax, bx);
-			rcSwap(az, bz);
-		}
-		
-		// Tessellate only outer edges or edges between areas.
-		if ((points[ci*4+3] & RC_CONTOUR_REG_MASK) == 0 ||
-			(points[ci*4+3] & RC_AREA_BORDER))
-		{
-			while (ci != endi)
-			{
-				float d = distancePtSeg(points[ci*4+0], points[ci*4+2], ax, az, bx, bz);
-				if (d > maxd)
-				{
-					maxd = d;
-					maxi = ci;
-				}
-				ci = (ci+cinc) % pn;
-			}
-		}
-		
-		
-		// If the max deviation is larger than accepted error,
-		// add new point, else continue to next segment.
-		if (maxi != -1 && maxd > (maxError*maxError))
-		{
-			// Add space for the new point.
-			simplified.resize(simplified.size()+4);
-			const int n = simplified.size()/4;
-			for (int j = n-1; j > i; --j)
-			{
-				simplified[j*4+0] = simplified[(j-1)*4+0];
-				simplified[j*4+1] = simplified[(j-1)*4+1];
-				simplified[j*4+2] = simplified[(j-1)*4+2];
-				simplified[j*4+3] = simplified[(j-1)*4+3];
-			}
-			// Add the point.
-			simplified[(i+1)*4+0] = points[maxi*4+0];
-			simplified[(i+1)*4+1] = points[maxi*4+1];
-			simplified[(i+1)*4+2] = points[maxi*4+2];
-			simplified[(i+1)*4+3] = maxi;
-		}
-		else
-		{
-			++i;
-		}
-	}
-	
-	// Split too long edges.
-	if (maxEdgeLen > 0 && (buildFlags & (RC_CONTOUR_TESS_WALL_EDGES|RC_CONTOUR_TESS_AREA_EDGES)) != 0)
-	{
-		for (int i = 0; i < simplified.size()/4; )
-		{
-			const int ii = (i+1) % (simplified.size()/4);
-			
-			const int ax = simplified[i*4+0];
-			const int az = simplified[i*4+2];
-			const int ai = simplified[i*4+3];
-			
-			const int bx = simplified[ii*4+0];
-			const int bz = simplified[ii*4+2];
-			const int bi = simplified[ii*4+3];
-			
-			// Find maximum deviation from the segment.
-			int maxi = -1;
-			int ci = (ai+1) % pn;
-			
-			// Tessellate only outer edges or edges between areas.
-			bool tess = false;
-			// Wall edges.
-			if ((buildFlags & RC_CONTOUR_TESS_WALL_EDGES) && (points[ci*4+3] & RC_CONTOUR_REG_MASK) == 0)
-				tess = true;
-			// Edges between areas.
-			if ((buildFlags & RC_CONTOUR_TESS_AREA_EDGES) && (points[ci*4+3] & RC_AREA_BORDER))
-				tess = true;
-			
-			if (tess)
-			{
-				int dx = bx - ax;
-				int dz = bz - az;
-				if (dx*dx + dz*dz > maxEdgeLen*maxEdgeLen)
-				{
-					// Round based on the segments in lexilogical order so that the
-					// max tesselation is consistent regardles in which direction
-					// segments are traversed.
-					const int n = bi < ai ? (bi+pn - ai) : (bi - ai);
-					if (n > 1)
-					{
-						if (bx > ax || (bx == ax && bz > az))
-							maxi = (ai + n/2) % pn;
-						else
-							maxi = (ai + (n+1)/2) % pn;
-					}
-				}
-			}
-			
-			// If the max deviation is larger than accepted error,
-			// add new point, else continue to next segment.
-			if (maxi != -1)
-			{
-				// Add space for the new point.
-				simplified.resize(simplified.size()+4);
-				const int n = simplified.size()/4;
-				for (int j = n-1; j > i; --j)
-				{
-					simplified[j*4+0] = simplified[(j-1)*4+0];
-					simplified[j*4+1] = simplified[(j-1)*4+1];
-					simplified[j*4+2] = simplified[(j-1)*4+2];
-					simplified[j*4+3] = simplified[(j-1)*4+3];
-				}
-				// Add the point.
-				simplified[(i+1)*4+0] = points[maxi*4+0];
-				simplified[(i+1)*4+1] = points[maxi*4+1];
-				simplified[(i+1)*4+2] = points[maxi*4+2];
-				simplified[(i+1)*4+3] = maxi;
-			}
-			else
-			{
-				++i;
-			}
-		}
-	}
-	
-	for (int i = 0; i < simplified.size()/4; ++i)
-	{
-		// The edge vertex flag is take from the current raw point,
-		// and the neighbour region is take from the next raw point.
-		const int ai = (simplified[i*4+3]+1) % pn;
-		const int bi = simplified[i*4+3];
-		simplified[i*4+3] = (points[ai*4+3] & (RC_CONTOUR_REG_MASK|RC_AREA_BORDER)) | (points[bi*4+3] & RC_BORDER_VERTEX);
-	}
-	
-}
-
-static int calcAreaOfPolygon2D(const int* verts, const int nverts)
-{
-	int area = 0;
-	for (int i = 0, j = nverts-1; i < nverts; j=i++)
-	{
-		const int* vi = &verts[i*4];
-		const int* vj = &verts[j*4];
-		area += vi[0] * vj[2] - vj[0] * vi[2];
-	}
-	return (area+1) / 2;
-}
-
-// TODO: these are the same as in RecastMesh.cpp, consider using the same.
-// Last time I checked the if version got compiled using cmov, which was a lot faster than module (with idiv).
-inline int prev(int i, int n) { return i-1 >= 0 ? i-1 : n-1; }
-inline int next(int i, int n) { return i+1 < n ? i+1 : 0; }
-
-inline int area2(const int* a, const int* b, const int* c)
-{
-	return (b[0] - a[0]) * (c[2] - a[2]) - (c[0] - a[0]) * (b[2] - a[2]);
-}
-
-//	Exclusive or: true iff exactly one argument is true.
-//	The arguments are negated to ensure that they are 0/1
-//	values.  Then the bitwise Xor operator may apply.
-//	(This idea is due to Michael Baldwin.)
-inline bool xorb(bool x, bool y)
-{
-	return !x ^ !y;
-}
-
-// Returns true iff c is strictly to the left of the directed
-// line through a to b.
-inline bool left(const int* a, const int* b, const int* c)
-{
-	return area2(a, b, c) < 0;
-}
-
-inline bool leftOn(const int* a, const int* b, const int* c)
-{
-	return area2(a, b, c) <= 0;
-}
-
-inline bool collinear(const int* a, const int* b, const int* c)
-{
-	return area2(a, b, c) == 0;
-}
-
-//	Returns true iff ab properly intersects cd: they share
-//	a point interior to both segments.  The properness of the
-//	intersection is ensured by using strict leftness.
-static bool intersectProp(const int* a, const int* b, const int* c, const int* d)
-{
-	// Eliminate improper cases.
-	if (collinear(a,b,c) || collinear(a,b,d) ||
-		collinear(c,d,a) || collinear(c,d,b))
-		return false;
-	
-	return xorb(left(a,b,c), left(a,b,d)) && xorb(left(c,d,a), left(c,d,b));
-}
-
-// Returns T iff (a,b,c) are collinear and point c lies
-// on the closed segement ab.
-static bool between(const int* a, const int* b, const int* c)
-{
-	if (!collinear(a, b, c))
-		return false;
-	// If ab not vertical, check betweenness on x; else on y.
-	if (a[0] != b[0])
-		return	((a[0] <= c[0]) && (c[0] <= b[0])) || ((a[0] >= c[0]) && (c[0] >= b[0]));
-	else
-		return	((a[2] <= c[2]) && (c[2] <= b[2])) || ((a[2] >= c[2]) && (c[2] >= b[2]));
-}
-
-// Returns true iff segments ab and cd intersect, properly or improperly.
-static bool intersect(const int* a, const int* b, const int* c, const int* d)
-{
-	if (intersectProp(a, b, c, d))
-		return true;
-	else if (between(a, b, c) || between(a, b, d) ||
-			 between(c, d, a) || between(c, d, b))
-		return true;
-	else
-		return false;
-}
-
-static bool vequal(const int* a, const int* b)
-{
-	return a[0] == b[0] && a[2] == b[2];
-}
-
-static bool intersectSegCountour(const int* d0, const int* d1, int i, int n, const int* verts)
-{
-	// For each edge (k,k+1) of P
-	for (int k = 0; k < n; k++)
-	{
-		int k1 = next(k, n);
-		// Skip edges incident to i.
-		if (i == k || i == k1)
-			continue;
-		const int* p0 = &verts[k * 4];
-		const int* p1 = &verts[k1 * 4];
-		if (vequal(d0, p0) || vequal(d1, p0) || vequal(d0, p1) || vequal(d1, p1))
-			continue;
-		
-		if (intersect(d0, d1, p0, p1))
-			return true;
-	}
-	return false;
-}
-
-static bool	inCone(int i, int n, const int* verts, const int* pj)
-{
-	const int* pi = &verts[i * 4];
-	const int* pi1 = &verts[next(i, n) * 4];
-	const int* pin1 = &verts[prev(i, n) * 4];
-	
-	// If P[i] is a convex vertex [ i+1 left or on (i-1,i) ].
-	if (leftOn(pin1, pi, pi1))
-		return left(pi, pj, pin1) && left(pj, pi, pi1);
-	// Assume (i-1,i,i+1) not collinear.
-	// else P[i] is reflex.
-	return !(leftOn(pi, pj, pi1) && leftOn(pj, pi, pin1));
-}
-
-
-static void removeDegenerateSegments(rcIntArray& simplified)
-{
-	// Remove adjacent vertices which are equal on xz-plane,
-	// or else the triangulator will get confused.
-	int npts = simplified.size()/4;
-	for (int i = 0; i < npts; ++i)
-	{
-		int ni = next(i, npts);
-		
-		if (vequal(&simplified[i*4], &simplified[ni*4]))
-		{
-			// Degenerate segment, remove.
-			for (int j = i; j < simplified.size()/4-1; ++j)
-			{
-				simplified[j*4+0] = simplified[(j+1)*4+0];
-				simplified[j*4+1] = simplified[(j+1)*4+1];
-				simplified[j*4+2] = simplified[(j+1)*4+2];
-				simplified[j*4+3] = simplified[(j+1)*4+3];
-			}
-			simplified.resize(simplified.size()-4);
-			npts--;
-		}
-	}
-}
-
-
-static bool mergeContours(rcContour& ca, rcContour& cb, int ia, int ib)
-{
-	const int maxVerts = ca.nverts + cb.nverts + 2;
-	int* verts = (int*)rcAlloc(sizeof(int)*maxVerts*4, RC_ALLOC_PERM);
-	if (!verts)
-		return false;
-	
-	int nv = 0;
-	
-	// Copy contour A.
-	for (int i = 0; i <= ca.nverts; ++i)
-	{
-		int* dst = &verts[nv*4];
-		const int* src = &ca.verts[((ia+i)%ca.nverts)*4];
-		dst[0] = src[0];
-		dst[1] = src[1];
-		dst[2] = src[2];
-		dst[3] = src[3];
-		nv++;
-	}
-
-	// Copy contour B
-	for (int i = 0; i <= cb.nverts; ++i)
-	{
-		int* dst = &verts[nv*4];
-		const int* src = &cb.verts[((ib+i)%cb.nverts)*4];
-		dst[0] = src[0];
-		dst[1] = src[1];
-		dst[2] = src[2];
-		dst[3] = src[3];
-		nv++;
-	}
-	
-	rcFree(ca.verts);
-	ca.verts = verts;
-	ca.nverts = nv;
-	
-	rcFree(cb.verts);
-	cb.verts = 0;
-	cb.nverts = 0;
-	
-	return true;
-}
-
-struct rcContourHole
-{
-	rcContour* contour;
-	int minx, minz, leftmost;
-};
-
-struct rcContourRegion
-{
-	rcContour* outline;
-	rcContourHole* holes;
-	int nholes;
-};
-
-struct rcPotentialDiagonal
-{
-	int vert;
-	int dist;
-};
-
-// Finds the lowest leftmost vertex of a contour.
-static void findLeftMostVertex(rcContour* contour, int* minx, int* minz, int* leftmost)
-{
-	*minx = contour->verts[0];
-	*minz = contour->verts[2];
-	*leftmost = 0;
-	for (int i = 1; i < contour->nverts; i++)
-	{
-		const int x = contour->verts[i*4+0];
-		const int z = contour->verts[i*4+2];
-		if (x < *minx || (x == *minx && z < *minz))
-		{
-			*minx = x;
-			*minz = z;
-			*leftmost = i;
-		}
-	}
-}
-
-static int compareHoles(const void* va, const void* vb)
-{
-	const rcContourHole* a = (const rcContourHole*)va;
-	const rcContourHole* b = (const rcContourHole*)vb;
-	if (a->minx == b->minx)
-	{
-		if (a->minz < b->minz)
-			return -1;
-		if (a->minz > b->minz)
-			return 1;
-	}
-	else
-	{
-		if (a->minx < b->minx)
-			return -1;
-		if (a->minx > b->minx)
-			return 1;
-	}
-	return 0;
-}
-
-
-static int compareDiagDist(const void* va, const void* vb)
-{
-	const rcPotentialDiagonal* a = (const rcPotentialDiagonal*)va;
-	const rcPotentialDiagonal* b = (const rcPotentialDiagonal*)vb;
-	if (a->dist < b->dist)
-		return -1;
-	if (a->dist > b->dist)
-		return 1;
-	return 0;
-}
-
-
-static void mergeRegionHoles(rcContext* ctx, rcContourRegion& region)
-{
-	// Sort holes from left to right.
-	for (int i = 0; i < region.nholes; i++)
-		findLeftMostVertex(region.holes[i].contour, &region.holes[i].minx, &region.holes[i].minz, &region.holes[i].leftmost);
-	
-	qsort(region.holes, region.nholes, sizeof(rcContourHole), compareHoles);
-	
-	int maxVerts = region.outline->nverts;
-	for (int i = 0; i < region.nholes; i++)
-		maxVerts += region.holes[i].contour->nverts;
-	
-	rcScopedDelete<rcPotentialDiagonal> diags((rcPotentialDiagonal*)rcAlloc(sizeof(rcPotentialDiagonal)*maxVerts, RC_ALLOC_TEMP));
-	if (!diags)
-	{
-		ctx->log(RC_LOG_WARNING, "mergeRegionHoles: Failed to allocated diags %d.", maxVerts);
-		return;
-	}
-	
-	rcContour* outline = region.outline;
-	
-	// Merge holes into the outline one by one.
-	for (int i = 0; i < region.nholes; i++)
-	{
-		rcContour* hole = region.holes[i].contour;
-		
-		int index = -1;
-		int bestVertex = region.holes[i].leftmost;
-		for (int iter = 0; iter < hole->nverts; iter++)
-		{
-			// Find potential diagonals.
-			// The 'best' vertex must be in the cone described by 3 cosequtive vertices of the outline.
-			// ..o j-1
-			//   |
-			//   |   * best
-			//   |
-			// j o-----o j+1
-			//         :
-			int ndiags = 0;
-			const int* corner = &hole->verts[bestVertex*4];
-			for (int j = 0; j < outline->nverts; j++)
-			{
-				if (inCone(j, outline->nverts, outline->verts, corner))
-				{
-					int dx = outline->verts[j*4+0] - corner[0];
-					int dz = outline->verts[j*4+2] - corner[2];
-					diags[ndiags].vert = j;
-					diags[ndiags].dist = dx*dx + dz*dz;
-					ndiags++;
-				}
-			}
-			// Sort potential diagonals by distance, we want to make the connection as short as possible.
-			qsort(diags, ndiags, sizeof(rcPotentialDiagonal), compareDiagDist);
-			
-			// Find a diagonal that is not intersecting the outline not the remaining holes.
-			index = -1;
-			for (int j = 0; j < ndiags; j++)
-			{
-				const int* pt = &outline->verts[diags[j].vert*4];
-				bool intersect = intersectSegCountour(pt, corner, diags[i].vert, outline->nverts, outline->verts);
-				for (int k = i; k < region.nholes && !intersect; k++)
-					intersect |= intersectSegCountour(pt, corner, -1, region.holes[k].contour->nverts, region.holes[k].contour->verts);
-				if (!intersect)
-				{
-					index = diags[j].vert;
-					break;
-				}
-			}
-			// If found non-intersecting diagonal, stop looking.
-			if (index != -1)
-				break;
-			// All the potential diagonals for the current vertex were intersecting, try next vertex.
-			bestVertex = (bestVertex + 1) % hole->nverts;
-		}
-		
-		if (index == -1)
-		{
-			ctx->log(RC_LOG_WARNING, "mergeHoles: Failed to find merge points for %p and %p.", region.outline, hole);
-			continue;
-		}
-		if (!mergeContours(*region.outline, *hole, index, bestVertex))
-		{
-			ctx->log(RC_LOG_WARNING, "mergeHoles: Failed to merge contours %p and %p.", region.outline, hole);
-			continue;
-		}
-	}
-}
-
-
-/// @par
-///
-/// The raw contours will match the region outlines exactly. The @p maxError and @p maxEdgeLen
-/// parameters control how closely the simplified contours will match the raw contours.
-///
-/// Simplified contours are generated such that the vertices for portals between areas match up.
-/// (They are considered mandatory vertices.)
-///
-/// Setting @p maxEdgeLength to zero will disabled the edge length feature.
-///
-/// See the #rcConfig documentation for more information on the configuration parameters.
-///
-/// @see rcAllocContourSet, rcCompactHeightfield, rcContourSet, rcConfig
-bool rcBuildContours(rcContext* ctx, rcCompactHeightfield& chf,
-					 const float maxError, const int maxEdgeLen,
-					 rcContourSet& cset, const int buildFlags)
-{
-	rcAssert(ctx);
-	
-	const int w = chf.width;
-	const int h = chf.height;
-	const int borderSize = chf.borderSize;
-	
-	rcScopedTimer timer(ctx, RC_TIMER_BUILD_CONTOURS);
-	
-	rcVcopy(cset.bmin, chf.bmin);
-	rcVcopy(cset.bmax, chf.bmax);
-	if (borderSize > 0)
-	{
-		// If the heightfield was build with bordersize, remove the offset.
-		const float pad = borderSize*chf.cs;
-		cset.bmin[0] += pad;
-		cset.bmin[2] += pad;
-		cset.bmax[0] -= pad;
-		cset.bmax[2] -= pad;
-	}
-	cset.cs = chf.cs;
-	cset.ch = chf.ch;
-	cset.width = chf.width - chf.borderSize*2;
-	cset.height = chf.height - chf.borderSize*2;
-	cset.borderSize = chf.borderSize;
-	cset.maxError = maxError;
-	
-	int maxContours = rcMax((int)chf.maxRegions, 8);
-	cset.conts = (rcContour*)rcAlloc(sizeof(rcContour)*maxContours, RC_ALLOC_PERM);
-	if (!cset.conts)
-		return false;
-	cset.nconts = 0;
-	
-	rcScopedDelete<unsigned char> flags((unsigned char*)rcAlloc(sizeof(unsigned char)*chf.spanCount, RC_ALLOC_TEMP));
-	if (!flags)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildContours: Out of memory 'flags' (%d).", chf.spanCount);
-		return false;
-	}
-	
-	ctx->startTimer(RC_TIMER_BUILD_CONTOURS_TRACE);
-	
-	// Mark boundaries.
-	for (int y = 0; y < h; ++y)
-	{
-		for (int x = 0; x < w; ++x)
-		{
-			const rcCompactCell& c = chf.cells[x+y*w];
-			for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
-			{
-				unsigned char res = 0;
-				const rcCompactSpan& s = chf.spans[i];
-				if (!chf.spans[i].reg || (chf.spans[i].reg & RC_BORDER_REG))
-				{
-					flags[i] = 0;
-					continue;
-				}
-				for (int dir = 0; dir < 4; ++dir)
-				{
-					unsigned short r = 0;
-					if (rcGetCon(s, dir) != RC_NOT_CONNECTED)
-					{
-						const int ax = x + rcGetDirOffsetX(dir);
-						const int ay = y + rcGetDirOffsetY(dir);
-						const int ai = (int)chf.cells[ax+ay*w].index + rcGetCon(s, dir);
-						r = chf.spans[ai].reg;
-					}
-					if (r == chf.spans[i].reg)
-						res |= (1 << dir);
-				}
-				flags[i] = res ^ 0xf; // Inverse, mark non connected edges.
-			}
-		}
-	}
-	
-	ctx->stopTimer(RC_TIMER_BUILD_CONTOURS_TRACE);
-	
-	rcIntArray verts(256);
-	rcIntArray simplified(64);
-	
-	for (int y = 0; y < h; ++y)
-	{
-		for (int x = 0; x < w; ++x)
-		{
-			const rcCompactCell& c = chf.cells[x+y*w];
-			for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
-			{
-				if (flags[i] == 0 || flags[i] == 0xf)
-				{
-					flags[i] = 0;
-					continue;
-				}
-				const unsigned short reg = chf.spans[i].reg;
-				if (!reg || (reg & RC_BORDER_REG))
-					continue;
-				const unsigned char area = chf.areas[i];
-				
-				verts.resize(0);
-				simplified.resize(0);
-				
-				ctx->startTimer(RC_TIMER_BUILD_CONTOURS_TRACE);
-				walkContour(x, y, i, chf, flags, verts);
-				ctx->stopTimer(RC_TIMER_BUILD_CONTOURS_TRACE);
-				
-				ctx->startTimer(RC_TIMER_BUILD_CONTOURS_SIMPLIFY);
-				simplifyContour(verts, simplified, maxError, maxEdgeLen, buildFlags);
-				removeDegenerateSegments(simplified);
-				ctx->stopTimer(RC_TIMER_BUILD_CONTOURS_SIMPLIFY);
-				
-				
-				// Store region->contour remap info.
-				// Create contour.
-				if (simplified.size()/4 >= 3)
-				{
-					if (cset.nconts >= maxContours)
-					{
-						// Allocate more contours.
-						// This happens when a region has holes.
-						const int oldMax = maxContours;
-						maxContours *= 2;
-						rcContour* newConts = (rcContour*)rcAlloc(sizeof(rcContour)*maxContours, RC_ALLOC_PERM);
-						for (int j = 0; j < cset.nconts; ++j)
-						{
-							newConts[j] = cset.conts[j];
-							// Reset source pointers to prevent data deletion.
-							cset.conts[j].verts = 0;
-							cset.conts[j].rverts = 0;
-						}
-						rcFree(cset.conts);
-						cset.conts = newConts;
-						
-						ctx->log(RC_LOG_WARNING, "rcBuildContours: Expanding max contours from %d to %d.", oldMax, maxContours);
-					}
-					
-					rcContour* cont = &cset.conts[cset.nconts++];
-					
-					cont->nverts = simplified.size()/4;
-					cont->verts = (int*)rcAlloc(sizeof(int)*cont->nverts*4, RC_ALLOC_PERM);
-					if (!cont->verts)
-					{
-						ctx->log(RC_LOG_ERROR, "rcBuildContours: Out of memory 'verts' (%d).", cont->nverts);
-						return false;
-					}
-					memcpy(cont->verts, &simplified[0], sizeof(int)*cont->nverts*4);
-					if (borderSize > 0)
-					{
-						// If the heightfield was build with bordersize, remove the offset.
-						for (int j = 0; j < cont->nverts; ++j)
-						{
-							int* v = &cont->verts[j*4];
-							v[0] -= borderSize;
-							v[2] -= borderSize;
-						}
-					}
-					
-					cont->nrverts = verts.size()/4;
-					cont->rverts = (int*)rcAlloc(sizeof(int)*cont->nrverts*4, RC_ALLOC_PERM);
-					if (!cont->rverts)
-					{
-						ctx->log(RC_LOG_ERROR, "rcBuildContours: Out of memory 'rverts' (%d).", cont->nrverts);
-						return false;
-					}
-					memcpy(cont->rverts, &verts[0], sizeof(int)*cont->nrverts*4);
-					if (borderSize > 0)
-					{
-						// If the heightfield was build with bordersize, remove the offset.
-						for (int j = 0; j < cont->nrverts; ++j)
-						{
-							int* v = &cont->rverts[j*4];
-							v[0] -= borderSize;
-							v[2] -= borderSize;
-						}
-					}
-					
-					cont->reg = reg;
-					cont->area = area;
-				}
-			}
-		}
-	}
-	
-	// Merge holes if needed.
-	if (cset.nconts > 0)
-	{
-		// Calculate winding of all polygons.
-		rcScopedDelete<signed char> winding((signed char*)rcAlloc(sizeof(signed char)*cset.nconts, RC_ALLOC_TEMP));
-		if (!winding)
-		{
-			ctx->log(RC_LOG_ERROR, "rcBuildContours: Out of memory 'hole' (%d).", cset.nconts);
-			return false;
-		}
-		int nholes = 0;
-		for (int i = 0; i < cset.nconts; ++i)
-		{
-			rcContour& cont = cset.conts[i];
-			// If the contour is wound backwards, it is a hole.
-			winding[i] = calcAreaOfPolygon2D(cont.verts, cont.nverts) < 0 ? -1 : 1;
-			if (winding[i] < 0)
-				nholes++;
-		}
-		
-		if (nholes > 0)
-		{
-			// Collect outline contour and holes contours per region.
-			// We assume that there is one outline and multiple holes.
-			const int nregions = chf.maxRegions+1;
-			rcScopedDelete<rcContourRegion> regions((rcContourRegion*)rcAlloc(sizeof(rcContourRegion)*nregions, RC_ALLOC_TEMP));
-			if (!regions)
-			{
-				ctx->log(RC_LOG_ERROR, "rcBuildContours: Out of memory 'regions' (%d).", nregions);
-				return false;
-			}
-			memset(regions, 0, sizeof(rcContourRegion)*nregions);
-			
-			rcScopedDelete<rcContourHole> holes((rcContourHole*)rcAlloc(sizeof(rcContourHole)*cset.nconts, RC_ALLOC_TEMP));
-			if (!holes)
-			{
-				ctx->log(RC_LOG_ERROR, "rcBuildContours: Out of memory 'holes' (%d).", cset.nconts);
-				return false;
-			}
-			memset(holes, 0, sizeof(rcContourHole)*cset.nconts);
-			
-			for (int i = 0; i < cset.nconts; ++i)
-			{
-				rcContour& cont = cset.conts[i];
-				// Positively would contours are outlines, negative holes.
-				if (winding[i] > 0)
-				{
-					if (regions[cont.reg].outline)
-						ctx->log(RC_LOG_ERROR, "rcBuildContours: Multiple outlines for region %d.", cont.reg);
-					regions[cont.reg].outline = &cont;
-				}
-				else
-				{
-					regions[cont.reg].nholes++;
-				}
-			}
-			int index = 0;
-			for (int i = 0; i < nregions; i++)
-			{
-				if (regions[i].nholes > 0)
-				{
-					regions[i].holes = &holes[index];
-					index += regions[i].nholes;
-					regions[i].nholes = 0;
-				}
-			}
-			for (int i = 0; i < cset.nconts; ++i)
-			{
-				rcContour& cont = cset.conts[i];
-				rcContourRegion& reg = regions[cont.reg];
-				if (winding[i] < 0)
-					reg.holes[reg.nholes++].contour = &cont;
-			}
-			
-			// Finally merge each regions holes into the outline.
-			for (int i = 0; i < nregions; i++)
-			{
-				rcContourRegion& reg = regions[i];
-				if (!reg.nholes) continue;
-				
-				if (reg.outline)
-				{
-					mergeRegionHoles(ctx, reg);
-				}
-				else
-				{
-					// The region does not have an outline.
-					// This can happen if the contour becaomes selfoverlapping because of
-					// too aggressive simplification settings.
-					ctx->log(RC_LOG_ERROR, "rcBuildContours: Bad outline for region %d, contour simplification is likely too aggressive.", i);
-				}
-			}
-		}
-		
-	}
-	
-	return true;
-}
diff --git a/extern/recastnavigation/Recast/Source/RecastFilter.cpp b/extern/recastnavigation/Recast/Source/RecastFilter.cpp
deleted file mode 100644
index 9d3e63c482..0000000000
--- a/extern/recastnavigation/Recast/Source/RecastFilter.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include <stdio.h>
-#include "Recast.h"
-#include "RecastAssert.h"
-
-/// @par
-///
-/// Allows the formation of walkable regions that will flow over low lying 
-/// objects such as curbs, and up structures such as stairways. 
-/// 
-/// Two neighboring spans are walkable if: <tt>rcAbs(currentSpan.smax - neighborSpan.smax) < waklableClimb</tt>
-/// 
-/// @warning Will override the effect of #rcFilterLedgeSpans.  So if both filters are used, call
-/// #rcFilterLedgeSpans after calling this filter. 
-///
-/// @see rcHeightfield, rcConfig
-void rcFilterLowHangingWalkableObstacles(rcContext* ctx, const int walkableClimb, rcHeightfield& solid)
-{
-	rcAssert(ctx);
-
-	rcScopedTimer timer(ctx, RC_TIMER_FILTER_LOW_OBSTACLES);
-	
-	const int w = solid.width;
-	const int h = solid.height;
-	
-	for (int y = 0; y < h; ++y)
-	{
-		for (int x = 0; x < w; ++x)
-		{
-			rcSpan* ps = 0;
-			bool previousWalkable = false;
-			unsigned char previousArea = RC_NULL_AREA;
-			
-			for (rcSpan* s = solid.spans[x + y*w]; s; ps = s, s = s->next)
-			{
-				const bool walkable = s->area != RC_NULL_AREA;
-				// If current span is not walkable, but there is walkable
-				// span just below it, mark the span above it walkable too.
-				if (!walkable && previousWalkable)
-				{
-					if (rcAbs((int)s->smax - (int)ps->smax) <= walkableClimb)
-						s->area = previousArea;
-				}
-				// Copy walkable flag so that it cannot propagate
-				// past multiple non-walkable objects.
-				previousWalkable = walkable;
-				previousArea = s->area;
-			}
-		}
-	}
-}
-
-/// @par
-///
-/// A ledge is a span with one or more neighbors whose maximum is further away than @p walkableClimb
-/// from the current span's maximum.
-/// This method removes the impact of the overestimation of conservative voxelization 
-/// so the resulting mesh will not have regions hanging in the air over ledges.
-/// 
-/// A span is a ledge if: <tt>rcAbs(currentSpan.smax - neighborSpan.smax) > walkableClimb</tt>
-/// 
-/// @see rcHeightfield, rcConfig
-void rcFilterLedgeSpans(rcContext* ctx, const int walkableHeight, const int walkableClimb,
-						rcHeightfield& solid)
-{
-	rcAssert(ctx);
-	
-	rcScopedTimer timer(ctx, RC_TIMER_FILTER_BORDER);
-
-	const int w = solid.width;
-	const int h = solid.height;
-	const int MAX_HEIGHT = 0xffff;
-	
-	// Mark border spans.
-	for (int y = 0; y < h; ++y)
-	{
-		for (int x = 0; x < w; ++x)
-		{
-			for (rcSpan* s = solid.spans[x + y*w]; s; s = s->next)
-			{
-				// Skip non walkable spans.
-				if (s->area == RC_NULL_AREA)
-					continue;
-				
-				const int bot = (int)(s->smax);
-				const int top = s->next ? (int)(s->next->smin) : MAX_HEIGHT;
-				
-				// Find neighbours minimum height.
-				int minh = MAX_HEIGHT;
-
-				// Min and max height of accessible neighbours.
-				int asmin = s->smax;
-				int asmax = s->smax;
-
-				for (int dir = 0; dir < 4; ++dir)
-				{
-					int dx = x + rcGetDirOffsetX(dir);
-					int dy = y + rcGetDirOffsetY(dir);
-					// Skip neighbours which are out of bounds.
-					if (dx < 0 || dy < 0 || dx >= w || dy >= h)
-					{
-						minh = rcMin(minh, -walkableClimb - bot);
-						continue;
-					}
-
-					// From minus infinity to the first span.
-					rcSpan* ns = solid.spans[dx + dy*w];
-					int nbot = -walkableClimb;
-					int ntop = ns ? (int)ns->smin : MAX_HEIGHT;
-					// Skip neightbour if the gap between the spans is too small.
-					if (rcMin(top,ntop) - rcMax(bot,nbot) > walkableHeight)
-						minh = rcMin(minh, nbot - bot);
-					
-					// Rest of the spans.
-					for (ns = solid.spans[dx + dy*w]; ns; ns = ns->next)
-					{
-						nbot = (int)ns->smax;
-						ntop = ns->next ? (int)ns->next->smin : MAX_HEIGHT;
-						// Skip neightbour if the gap between the spans is too small.
-						if (rcMin(top,ntop) - rcMax(bot,nbot) > walkableHeight)
-						{
-							minh = rcMin(minh, nbot - bot);
-						
-							// Find min/max accessible neighbour height. 
-							if (rcAbs(nbot - bot) <= walkableClimb)
-							{
-								if (nbot < asmin) asmin = nbot;
-								if (nbot > asmax) asmax = nbot;
-							}
-							
-						}
-					}
-				}
-				
-				// The current span is close to a ledge if the drop to any
-				// neighbour span is less than the walkableClimb.
-				if (minh < -walkableClimb)
-				{
-					s->area = RC_NULL_AREA;
-				}
-				// If the difference between all neighbours is too large,
-				// we are at steep slope, mark the span as ledge.
-				else if ((asmax - asmin) > walkableClimb)
-				{
-					s->area = RC_NULL_AREA;
-				}
-			}
-		}
-	}
-}
-
-/// @par
-///
-/// For this filter, the clearance above the span is the distance from the span's 
-/// maximum to the next higher span's minimum. (Same grid column.)
-/// 
-/// @see rcHeightfield, rcConfig
-void rcFilterWalkableLowHeightSpans(rcContext* ctx, int walkableHeight, rcHeightfield& solid)
-{
-	rcAssert(ctx);
-	
-	rcScopedTimer timer(ctx, RC_TIMER_FILTER_WALKABLE);
-	
-	const int w = solid.width;
-	const int h = solid.height;
-	const int MAX_HEIGHT = 0xffff;
-	
-	// Remove walkable flag from spans which do not have enough
-	// space above them for the agent to stand there.
-	for (int y = 0; y < h; ++y)
-	{
-		for (int x = 0; x < w; ++x)
-		{
-			for (rcSpan* s = solid.spans[x + y*w]; s; s = s->next)
-			{
-				const int bot = (int)(s->smax);
-				const int top = s->next ? (int)(s->next->smin) : MAX_HEIGHT;
-				if ((top - bot) <= walkableHeight)
-					s->area = RC_NULL_AREA;
-			}
-		}
-	}
-}
diff --git a/extern/recastnavigation/Recast/Source/RecastLayers.cpp b/extern/recastnavigation/Recast/Source/RecastLayers.cpp
deleted file mode 100644
index acc97e44f0..0000000000
--- a/extern/recastnavigation/Recast/Source/RecastLayers.cpp
+++ /dev/null
@@ -1,644 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#include <float.h>
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include "Recast.h"
-#include "RecastAlloc.h"
-#include "RecastAssert.h"
-
-
-// Must be 255 or smaller (not 256) because layer IDs are stored as
-// a byte where 255 is a special value.
-static const int RC_MAX_LAYERS = 63;
-static const int RC_MAX_NEIS = 16;
-
-struct rcLayerRegion
-{
-	unsigned char layers[RC_MAX_LAYERS];
-	unsigned char neis[RC_MAX_NEIS];
-	unsigned short ymin, ymax;
-	unsigned char layerId;		// Layer ID
-	unsigned char nlayers;		// Layer count
-	unsigned char nneis;		// Neighbour count
-	unsigned char base;		// Flag indicating if the region is the base of merged regions.
-};
-
-
-static bool contains(const unsigned char* a, const unsigned char an, const unsigned char v)
-{
-	const int n = (int)an;
-	for (int i = 0; i < n; ++i)
-	{
-		if (a[i] == v)
-			return true;
-	}
-	return false;
-}
-
-static bool addUnique(unsigned char* a, unsigned char& an, int anMax, unsigned char v)
-{
-	if (contains(a, an, v))
-		return true;
-
-	if ((int)an >= anMax)
-		return false;
-
-	a[an] = v;
-	an++;
-	return true;
-}
-
-
-inline bool overlapRange(const unsigned short amin, const unsigned short amax,
-						 const unsigned short bmin, const unsigned short bmax)
-{
-	return (amin > bmax || amax < bmin) ? false : true;
-}
-
-
-
-struct rcLayerSweepSpan
-{
-	unsigned short ns;	// number samples
-	unsigned char id;	// region id
-	unsigned char nei;	// neighbour id
-};
-
-/// @par
-/// 
-/// See the #rcConfig documentation for more information on the configuration parameters.
-/// 
-/// @see rcAllocHeightfieldLayerSet, rcCompactHeightfield, rcHeightfieldLayerSet, rcConfig
-bool rcBuildHeightfieldLayers(rcContext* ctx, rcCompactHeightfield& chf,
-							  const int borderSize, const int walkableHeight,
-							  rcHeightfieldLayerSet& lset)
-{
-	rcAssert(ctx);
-	
-	rcScopedTimer timer(ctx, RC_TIMER_BUILD_LAYERS);
-	
-	const int w = chf.width;
-	const int h = chf.height;
-	
-	rcScopedDelete<unsigned char> srcReg((unsigned char*)rcAlloc(sizeof(unsigned char)*chf.spanCount, RC_ALLOC_TEMP));
-	if (!srcReg)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildHeightfieldLayers: Out of memory 'srcReg' (%d).", chf.spanCount);
-		return false;
-	}
-	memset(srcReg,0xff,sizeof(unsigned char)*chf.spanCount);
-	
-	const int nsweeps = chf.width;
-	rcScopedDelete<rcLayerSweepSpan> sweeps((rcLayerSweepSpan*)rcAlloc(sizeof(rcLayerSweepSpan)*nsweeps, RC_ALLOC_TEMP));
-	if (!sweeps)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildHeightfieldLayers: Out of memory 'sweeps' (%d).", nsweeps);
-		return false;
-	}
-	
-	
-	// Partition walkable area into monotone regions.
-	int prevCount[256];
-	unsigned char regId = 0;
-
-	for (int y = borderSize; y < h-borderSize; ++y)
-	{
-		memset(prevCount,0,sizeof(int)*regId);
-		unsigned char sweepId = 0;
-		
-		for (int x = borderSize; x < w-borderSize; ++x)
-		{
-			const rcCompactCell& c = chf.cells[x+y*w];
-			
-			for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
-			{
-				const rcCompactSpan& s = chf.spans[i];
-				if (chf.areas[i] == RC_NULL_AREA) continue;
-
-				unsigned char sid = 0xff;
-
-				// -x
-				if (rcGetCon(s, 0) != RC_NOT_CONNECTED)
-				{
-					const int ax = x + rcGetDirOffsetX(0);
-					const int ay = y + rcGetDirOffsetY(0);
-					const int ai = (int)chf.cells[ax+ay*w].index + rcGetCon(s, 0);
-					if (chf.areas[ai] != RC_NULL_AREA && srcReg[ai] != 0xff)
-						sid = srcReg[ai];
-				}
-				
-				if (sid == 0xff)
-				{
-					sid = sweepId++;
-					sweeps[sid].nei = 0xff;
-					sweeps[sid].ns = 0;
-				}
-				
-				// -y
-				if (rcGetCon(s,3) != RC_NOT_CONNECTED)
-				{
-					const int ax = x + rcGetDirOffsetX(3);
-					const int ay = y + rcGetDirOffsetY(3);
-					const int ai = (int)chf.cells[ax+ay*w].index + rcGetCon(s, 3);
-					const unsigned char nr = srcReg[ai];
-					if (nr != 0xff)
-					{
-						// Set neighbour when first valid neighbour is encoutered.
-						if (sweeps[sid].ns == 0)
-							sweeps[sid].nei = nr;
-						
-						if (sweeps[sid].nei == nr)
-						{
-							// Update existing neighbour
-							sweeps[sid].ns++;
-							prevCount[nr]++;
-						}
-						else
-						{
-							// This is hit if there is nore than one neighbour.
-							// Invalidate the neighbour.
-							sweeps[sid].nei = 0xff;
-						}
-					}
-				}
-				
-				srcReg[i] = sid;
-			}
-		}
-		
-		// Create unique ID.
-		for (int i = 0; i < sweepId; ++i)
-		{
-			// If the neighbour is set and there is only one continuous connection to it,
-			// the sweep will be merged with the previous one, else new region is created.
-			if (sweeps[i].nei != 0xff && prevCount[sweeps[i].nei] == (int)sweeps[i].ns)
-			{
-				sweeps[i].id = sweeps[i].nei;
-			}
-			else
-			{
-				if (regId == 255)
-				{
-					ctx->log(RC_LOG_ERROR, "rcBuildHeightfieldLayers: Region ID overflow.");
-					return false;
-				}
-				sweeps[i].id = regId++;
-			}
-		}
-		
-		// Remap local sweep ids to region ids.
-		for (int x = borderSize; x < w-borderSize; ++x)
-		{
-			const rcCompactCell& c = chf.cells[x+y*w];
-			for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
-			{
-				if (srcReg[i] != 0xff)
-					srcReg[i] = sweeps[srcReg[i]].id;
-			}
-		}
-	}
-
-	// Allocate and init layer regions.
-	const int nregs = (int)regId;
-	rcScopedDelete<rcLayerRegion> regs((rcLayerRegion*)rcAlloc(sizeof(rcLayerRegion)*nregs, RC_ALLOC_TEMP));
-	if (!regs)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildHeightfieldLayers: Out of memory 'regs' (%d).", nregs);
-		return false;
-	}
-	memset(regs, 0, sizeof(rcLayerRegion)*nregs);
-	for (int i = 0; i < nregs; ++i)
-	{
-		regs[i].layerId = 0xff;
-		regs[i].ymin = 0xffff;
-		regs[i].ymax = 0;
-	}
-	
-	// Find region neighbours and overlapping regions.
-	for (int y = 0; y < h; ++y)
-	{
-		for (int x = 0; x < w; ++x)
-		{
-			const rcCompactCell& c = chf.cells[x+y*w];
-			
-			unsigned char lregs[RC_MAX_LAYERS];
-			int nlregs = 0;
-			
-			for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
-			{
-				const rcCompactSpan& s = chf.spans[i];
-				const unsigned char ri = srcReg[i];
-				if (ri == 0xff) continue;
-				
-				regs[ri].ymin = rcMin(regs[ri].ymin, s.y);
-				regs[ri].ymax = rcMax(regs[ri].ymax, s.y);
-				
-				// Collect all region layers.
-				if (nlregs < RC_MAX_LAYERS)
-					lregs[nlregs++] = ri;
-				
-				// Update neighbours
-				for (int dir = 0; dir < 4; ++dir)
-				{
-					if (rcGetCon(s, dir) != RC_NOT_CONNECTED)
-					{
-						const int ax = x + rcGetDirOffsetX(dir);
-						const int ay = y + rcGetDirOffsetY(dir);
-						const int ai = (int)chf.cells[ax+ay*w].index + rcGetCon(s, dir);
-						const unsigned char rai = srcReg[ai];
-						if (rai != 0xff && rai != ri)
-						{
-							// Don't check return value -- if we cannot add the neighbor
-							// it will just cause a few more regions to be created, which
-							// is fine.
-							addUnique(regs[ri].neis, regs[ri].nneis, RC_MAX_NEIS, rai);
-						}
-					}
-				}
-				
-			}
-			
-			// Update overlapping regions.
-			for (int i = 0; i < nlregs-1; ++i)
-			{
-				for (int j = i+1; j < nlregs; ++j)
-				{
-					if (lregs[i] != lregs[j])
-					{
-						rcLayerRegion& ri = regs[lregs[i]];
-						rcLayerRegion& rj = regs[lregs[j]];
-
-						if (!addUnique(ri.layers, ri.nlayers, RC_MAX_LAYERS, lregs[j]) ||
-							!addUnique(rj.layers, rj.nlayers, RC_MAX_LAYERS, lregs[i]))
-						{
-							ctx->log(RC_LOG_ERROR, "rcBuildHeightfieldLayers: layer overflow (too many overlapping walkable platforms). Try increasing RC_MAX_LAYERS.");
-							return false;
-						}
-					}
-				}
-			}
-			
-		}
-	}
-	
-	// Create 2D layers from regions.
-	unsigned char layerId = 0;
-	
-	static const int MAX_STACK = 64;
-	unsigned char stack[MAX_STACK];
-	int nstack = 0;
-	
-	for (int i = 0; i < nregs; ++i)
-	{
-		rcLayerRegion& root = regs[i];
-		// Skip already visited.
-		if (root.layerId != 0xff)
-			continue;
-
-		// Start search.
-		root.layerId = layerId;
-		root.base = 1;
-		
-		nstack = 0;
-		stack[nstack++] = (unsigned char)i;
-		
-		while (nstack)
-		{
-			// Pop front
-			rcLayerRegion& reg = regs[stack[0]];
-			nstack--;
-			for (int j = 0; j < nstack; ++j)
-				stack[j] = stack[j+1];
-			
-			const int nneis = (int)reg.nneis;
-			for (int j = 0; j < nneis; ++j)
-			{
-				const unsigned char nei = reg.neis[j];
-				rcLayerRegion& regn = regs[nei];
-				// Skip already visited.
-				if (regn.layerId != 0xff)
-					continue;
-				// Skip if the neighbour is overlapping root region.
-				if (contains(root.layers, root.nlayers, nei))
-					continue;
-				// Skip if the height range would become too large.
-				const int ymin = rcMin(root.ymin, regn.ymin);
-				const int ymax = rcMax(root.ymax, regn.ymax);
-				if ((ymax - ymin) >= 255)
-					 continue;
-
-				if (nstack < MAX_STACK)
-				{
-					// Deepen
-					stack[nstack++] = (unsigned char)nei;
-					
-					// Mark layer id
-					regn.layerId = layerId;
-					// Merge current layers to root.
-					for (int k = 0; k < regn.nlayers; ++k)
-					{
-						if (!addUnique(root.layers, root.nlayers, RC_MAX_LAYERS, regn.layers[k]))
-						{
-							ctx->log(RC_LOG_ERROR, "rcBuildHeightfieldLayers: layer overflow (too many overlapping walkable platforms). Try increasing RC_MAX_LAYERS.");
-							return false;
-						}
-					}
-					root.ymin = rcMin(root.ymin, regn.ymin);
-					root.ymax = rcMax(root.ymax, regn.ymax);
-				}
-			}
-		}
-		
-		layerId++;
-	}
-	
-	// Merge non-overlapping regions that are close in height.
-	const unsigned short mergeHeight = (unsigned short)walkableHeight * 4;
-	
-	for (int i = 0; i < nregs; ++i)
-	{
-		rcLayerRegion& ri = regs[i];
-		if (!ri.base) continue;
-		
-		unsigned char newId = ri.layerId;
-		
-		for (;;)
-		{
-			unsigned char oldId = 0xff;
-			
-			for (int j = 0; j < nregs; ++j)
-			{
-				if (i == j) continue;
-				rcLayerRegion& rj = regs[j];
-				if (!rj.base) continue;
-				
-				// Skip if the regions are not close to each other.
-				if (!overlapRange(ri.ymin,ri.ymax+mergeHeight, rj.ymin,rj.ymax+mergeHeight))
-					continue;
-				// Skip if the height range would become too large.
-				const int ymin = rcMin(ri.ymin, rj.ymin);
-				const int ymax = rcMax(ri.ymax, rj.ymax);
-				if ((ymax - ymin) >= 255)
-				  continue;
-						  
-				// Make sure that there is no overlap when merging 'ri' and 'rj'.
-				bool overlap = false;
-				// Iterate over all regions which have the same layerId as 'rj'
-				for (int k = 0; k < nregs; ++k)
-				{
-					if (regs[k].layerId != rj.layerId)
-						continue;
-					// Check if region 'k' is overlapping region 'ri'
-					// Index to 'regs' is the same as region id.
-					if (contains(ri.layers,ri.nlayers, (unsigned char)k))
-					{
-						overlap = true;
-						break;
-					}
-				}
-				// Cannot merge of regions overlap.
-				if (overlap)
-					continue;
-				
-				// Can merge i and j.
-				oldId = rj.layerId;
-				break;
-			}
-			
-			// Could not find anything to merge with, stop.
-			if (oldId == 0xff)
-				break;
-			
-			// Merge
-			for (int j = 0; j < nregs; ++j)
-			{
-				rcLayerRegion& rj = regs[j];
-				if (rj.layerId == oldId)
-				{
-					rj.base = 0;
-					// Remap layerIds.
-					rj.layerId = newId;
-					// Add overlaid layers from 'rj' to 'ri'.
-					for (int k = 0; k < rj.nlayers; ++k)
-					{
-						if (!addUnique(ri.layers, ri.nlayers, RC_MAX_LAYERS, rj.layers[k]))
-						{
-							ctx->log(RC_LOG_ERROR, "rcBuildHeightfieldLayers: layer overflow (too many overlapping walkable platforms). Try increasing RC_MAX_LAYERS.");
-							return false;
-						}
-					}
-
-					// Update height bounds.
-					ri.ymin = rcMin(ri.ymin, rj.ymin);
-					ri.ymax = rcMax(ri.ymax, rj.ymax);
-				}
-			}
-		}
-	}
-	
-	// Compact layerIds
-	unsigned char remap[256];
-	memset(remap, 0, 256);
-
-	// Find number of unique layers.
-	layerId = 0;
-	for (int i = 0; i < nregs; ++i)
-		remap[regs[i].layerId] = 1;
-	for (int i = 0; i < 256; ++i)
-	{
-		if (remap[i])
-			remap[i] = layerId++;
-		else
-			remap[i] = 0xff;
-	}
-	// Remap ids.
-	for (int i = 0; i < nregs; ++i)
-		regs[i].layerId = remap[regs[i].layerId];
-	
-	// No layers, return empty.
-	if (layerId == 0)
-		return true;
-	
-	// Create layers.
-	rcAssert(lset.layers == 0);
-	
-	const int lw = w - borderSize*2;
-	const int lh = h - borderSize*2;
-
-	// Build contracted bbox for layers.
-	float bmin[3], bmax[3];
-	rcVcopy(bmin, chf.bmin);
-	rcVcopy(bmax, chf.bmax);
-	bmin[0] += borderSize*chf.cs;
-	bmin[2] += borderSize*chf.cs;
-	bmax[0] -= borderSize*chf.cs;
-	bmax[2] -= borderSize*chf.cs;
-	
-	lset.nlayers = (int)layerId;
-	
-	lset.layers = (rcHeightfieldLayer*)rcAlloc(sizeof(rcHeightfieldLayer)*lset.nlayers, RC_ALLOC_PERM);
-	if (!lset.layers)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildHeightfieldLayers: Out of memory 'layers' (%d).", lset.nlayers);
-		return false;
-	}
-	memset(lset.layers, 0, sizeof(rcHeightfieldLayer)*lset.nlayers);
-
-	
-	// Store layers.
-	for (int i = 0; i < lset.nlayers; ++i)
-	{
-		unsigned char curId = (unsigned char)i;
-
-		rcHeightfieldLayer* layer = &lset.layers[i];
-
-		const int gridSize = sizeof(unsigned char)*lw*lh;
-
-		layer->heights = (unsigned char*)rcAlloc(gridSize, RC_ALLOC_PERM);
-		if (!layer->heights)
-		{
-			ctx->log(RC_LOG_ERROR, "rcBuildHeightfieldLayers: Out of memory 'heights' (%d).", gridSize);
-			return false;
-		}
-		memset(layer->heights, 0xff, gridSize);
-
-		layer->areas = (unsigned char*)rcAlloc(gridSize, RC_ALLOC_PERM);
-		if (!layer->areas)
-		{
-			ctx->log(RC_LOG_ERROR, "rcBuildHeightfieldLayers: Out of memory 'areas' (%d).", gridSize);
-			return false;
-		}
-		memset(layer->areas, 0, gridSize);
-
-		layer->cons = (unsigned char*)rcAlloc(gridSize, RC_ALLOC_PERM);
-		if (!layer->cons)
-		{
-			ctx->log(RC_LOG_ERROR, "rcBuildHeightfieldLayers: Out of memory 'cons' (%d).", gridSize);
-			return false;
-		}
-		memset(layer->cons, 0, gridSize);
-		
-		// Find layer height bounds.
-		int hmin = 0, hmax = 0;
-		for (int j = 0; j < nregs; ++j)
-		{
-			if (regs[j].base && regs[j].layerId == curId)
-			{
-				hmin = (int)regs[j].ymin;
-				hmax = (int)regs[j].ymax;
-			}
-		}
-
-		layer->width = lw;
-		layer->height = lh;
-		layer->cs = chf.cs;
-		layer->ch = chf.ch;
-		
-		// Adjust the bbox to fit the heightfield.
-		rcVcopy(layer->bmin, bmin);
-		rcVcopy(layer->bmax, bmax);
-		layer->bmin[1] = bmin[1] + hmin*chf.ch;
-		layer->bmax[1] = bmin[1] + hmax*chf.ch;
-		layer->hmin = hmin;
-		layer->hmax = hmax;
-
-		// Update usable data region.
-		layer->minx = layer->width;
-		layer->maxx = 0;
-		layer->miny = layer->height;
-		layer->maxy = 0;
-		
-		// Copy height and area from compact heightfield. 
-		for (int y = 0; y < lh; ++y)
-		{
-			for (int x = 0; x < lw; ++x)
-			{
-				const int cx = borderSize+x;
-				const int cy = borderSize+y;
-				const rcCompactCell& c = chf.cells[cx+cy*w];
-				for (int j = (int)c.index, nj = (int)(c.index+c.count); j < nj; ++j)
-				{
-					const rcCompactSpan& s = chf.spans[j];
-					// Skip unassigned regions.
-					if (srcReg[j] == 0xff)
-						continue;
-					// Skip of does nto belong to current layer.
-					unsigned char lid = regs[srcReg[j]].layerId;
-					if (lid != curId)
-						continue;
-					
-					// Update data bounds.
-					layer->minx = rcMin(layer->minx, x);
-					layer->maxx = rcMax(layer->maxx, x);
-					layer->miny = rcMin(layer->miny, y);
-					layer->maxy = rcMax(layer->maxy, y);
-					
-					// Store height and area type.
-					const int idx = x+y*lw;
-					layer->heights[idx] = (unsigned char)(s.y - hmin);
-					layer->areas[idx] = chf.areas[j];
-					
-					// Check connection.
-					unsigned char portal = 0;
-					unsigned char con = 0;
-					for (int dir = 0; dir < 4; ++dir)
-					{
-						if (rcGetCon(s, dir) != RC_NOT_CONNECTED)
-						{
-							const int ax = cx + rcGetDirOffsetX(dir);
-							const int ay = cy + rcGetDirOffsetY(dir);
-							const int ai = (int)chf.cells[ax+ay*w].index + rcGetCon(s, dir);
-							unsigned char alid = srcReg[ai] != 0xff ? regs[srcReg[ai]].layerId : 0xff;
-							// Portal mask
-							if (chf.areas[ai] != RC_NULL_AREA && lid != alid)
-							{
-								portal |= (unsigned char)(1<<dir);
-								// Update height so that it matches on both sides of the portal.
-								const rcCompactSpan& as = chf.spans[ai];
-								if (as.y > hmin)
-									layer->heights[idx] = rcMax(layer->heights[idx], (unsigned char)(as.y - hmin));
-							}
-							// Valid connection mask
-							if (chf.areas[ai] != RC_NULL_AREA && lid == alid)
-							{
-								const int nx = ax - borderSize;
-								const int ny = ay - borderSize;
-								if (nx >= 0 && ny >= 0 && nx < lw && ny < lh)
-									con |= (unsigned char)(1<<dir);
-							}
-						}
-					}
-					
-					layer->cons[idx] = (portal << 4) | con;
-				}
-			}
-		}
-		
-		if (layer->minx > layer->maxx)
-			layer->minx = layer->maxx = 0;
-		if (layer->miny > layer->maxy)
-			layer->miny = layer->maxy = 0;
-	}
-	
-	return true;
-}
diff --git a/extern/recastnavigation/Recast/Source/RecastMesh.cpp b/extern/recastnavigation/Recast/Source/RecastMesh.cpp
deleted file mode 100644
index e99eaebb79..0000000000
--- a/extern/recastnavigation/Recast/Source/RecastMesh.cpp
+++ /dev/null
@@ -1,1552 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include <string.h>
-#include <stdio.h>
-#include "Recast.h"
-#include "RecastAlloc.h"
-#include "RecastAssert.h"
-
-struct rcEdge
-{
-	unsigned short vert[2];
-	unsigned short polyEdge[2];
-	unsigned short poly[2];
-};
-
-static bool buildMeshAdjacency(unsigned short* polys, const int npolys,
-							   const int nverts, const int vertsPerPoly)
-{
-	// Based on code by Eric Lengyel from:
-	// http://www.terathon.com/code/edges.php
-	
-	int maxEdgeCount = npolys*vertsPerPoly;
-	unsigned short* firstEdge = (unsigned short*)rcAlloc(sizeof(unsigned short)*(nverts + maxEdgeCount), RC_ALLOC_TEMP);
-	if (!firstEdge)
-		return false;
-	unsigned short* nextEdge = firstEdge + nverts;
-	int edgeCount = 0;
-	
-	rcEdge* edges = (rcEdge*)rcAlloc(sizeof(rcEdge)*maxEdgeCount, RC_ALLOC_TEMP);
-	if (!edges)
-	{
-		rcFree(firstEdge);
-		return false;
-	}
-	
-	for (int i = 0; i < nverts; i++)
-		firstEdge[i] = RC_MESH_NULL_IDX;
-	
-	for (int i = 0; i < npolys; ++i)
-	{
-		unsigned short* t = &polys[i*vertsPerPoly*2];
-		for (int j = 0; j < vertsPerPoly; ++j)
-		{
-			if (t[j] == RC_MESH_NULL_IDX) break;
-			unsigned short v0 = t[j];
-			unsigned short v1 = (j+1 >= vertsPerPoly || t[j+1] == RC_MESH_NULL_IDX) ? t[0] : t[j+1];
-			if (v0 < v1)
-			{
-				rcEdge& edge = edges[edgeCount];
-				edge.vert[0] = v0;
-				edge.vert[1] = v1;
-				edge.poly[0] = (unsigned short)i;
-				edge.polyEdge[0] = (unsigned short)j;
-				edge.poly[1] = (unsigned short)i;
-				edge.polyEdge[1] = 0;
-				// Insert edge
-				nextEdge[edgeCount] = firstEdge[v0];
-				firstEdge[v0] = (unsigned short)edgeCount;
-				edgeCount++;
-			}
-		}
-	}
-	
-	for (int i = 0; i < npolys; ++i)
-	{
-		unsigned short* t = &polys[i*vertsPerPoly*2];
-		for (int j = 0; j < vertsPerPoly; ++j)
-		{
-			if (t[j] == RC_MESH_NULL_IDX) break;
-			unsigned short v0 = t[j];
-			unsigned short v1 = (j+1 >= vertsPerPoly || t[j+1] == RC_MESH_NULL_IDX) ? t[0] : t[j+1];
-			if (v0 > v1)
-			{
-				for (unsigned short e = firstEdge[v1]; e != RC_MESH_NULL_IDX; e = nextEdge[e])
-				{
-					rcEdge& edge = edges[e];
-					if (edge.vert[1] == v0 && edge.poly[0] == edge.poly[1])
-					{
-						edge.poly[1] = (unsigned short)i;
-						edge.polyEdge[1] = (unsigned short)j;
-						break;
-					}
-				}
-			}
-		}
-	}
-	
-	// Store adjacency
-	for (int i = 0; i < edgeCount; ++i)
-	{
-		const rcEdge& e = edges[i];
-		if (e.poly[0] != e.poly[1])
-		{
-			unsigned short* p0 = &polys[e.poly[0]*vertsPerPoly*2];
-			unsigned short* p1 = &polys[e.poly[1]*vertsPerPoly*2];
-			p0[vertsPerPoly + e.polyEdge[0]] = e.poly[1];
-			p1[vertsPerPoly + e.polyEdge[1]] = e.poly[0];
-		}
-	}
-	
-	rcFree(firstEdge);
-	rcFree(edges);
-	
-	return true;
-}
-
-
-static const int VERTEX_BUCKET_COUNT = (1<<12);
-
-inline int computeVertexHash(int x, int y, int z)
-{
-	const unsigned int h1 = 0x8da6b343; // Large multiplicative constants;
-	const unsigned int h2 = 0xd8163841; // here arbitrarily chosen primes
-	const unsigned int h3 = 0xcb1ab31f;
-	unsigned int n = h1 * x + h2 * y + h3 * z;
-	return (int)(n & (VERTEX_BUCKET_COUNT-1));
-}
-
-static unsigned short addVertex(unsigned short x, unsigned short y, unsigned short z,
-								unsigned short* verts, int* firstVert, int* nextVert, int& nv)
-{
-	int bucket = computeVertexHash(x, 0, z);
-	int i = firstVert[bucket];
-	
-	while (i != -1)
-	{
-		const unsigned short* v = &verts[i*3];
-		if (v[0] == x && (rcAbs(v[1] - y) <= 2) && v[2] == z)
-			return (unsigned short)i;
-		i = nextVert[i]; // next
-	}
-	
-	// Could not find, create new.
-	i = nv; nv++;
-	unsigned short* v = &verts[i*3];
-	v[0] = x;
-	v[1] = y;
-	v[2] = z;
-	nextVert[i] = firstVert[bucket];
-	firstVert[bucket] = i;
-	
-	return (unsigned short)i;
-}
-
-// Last time I checked the if version got compiled using cmov, which was a lot faster than module (with idiv).
-inline int prev(int i, int n) { return i-1 >= 0 ? i-1 : n-1; }
-inline int next(int i, int n) { return i+1 < n ? i+1 : 0; }
-
-inline int area2(const int* a, const int* b, const int* c)
-{
-	return (b[0] - a[0]) * (c[2] - a[2]) - (c[0] - a[0]) * (b[2] - a[2]);
-}
-
-//	Exclusive or: true iff exactly one argument is true.
-//	The arguments are negated to ensure that they are 0/1
-//	values.  Then the bitwise Xor operator may apply.
-//	(This idea is due to Michael Baldwin.)
-inline bool xorb(bool x, bool y)
-{
-	return !x ^ !y;
-}
-
-// Returns true iff c is strictly to the left of the directed
-// line through a to b.
-inline bool left(const int* a, const int* b, const int* c)
-{
-	return area2(a, b, c) < 0;
-}
-
-inline bool leftOn(const int* a, const int* b, const int* c)
-{
-	return area2(a, b, c) <= 0;
-}
-
-inline bool collinear(const int* a, const int* b, const int* c)
-{
-	return area2(a, b, c) == 0;
-}
-
-//	Returns true iff ab properly intersects cd: they share
-//	a point interior to both segments.  The properness of the
-//	intersection is ensured by using strict leftness.
-static bool intersectProp(const int* a, const int* b, const int* c, const int* d)
-{
-	// Eliminate improper cases.
-	if (collinear(a,b,c) || collinear(a,b,d) ||
-		collinear(c,d,a) || collinear(c,d,b))
-		return false;
-	
-	return xorb(left(a,b,c), left(a,b,d)) && xorb(left(c,d,a), left(c,d,b));
-}
-
-// Returns T iff (a,b,c) are collinear and point c lies 
-// on the closed segement ab.
-static bool between(const int* a, const int* b, const int* c)
-{
-	if (!collinear(a, b, c))
-		return false;
-	// If ab not vertical, check betweenness on x; else on y.
-	if (a[0] != b[0])
-		return	((a[0] <= c[0]) && (c[0] <= b[0])) || ((a[0] >= c[0]) && (c[0] >= b[0]));
-	else
-		return	((a[2] <= c[2]) && (c[2] <= b[2])) || ((a[2] >= c[2]) && (c[2] >= b[2]));
-}
-
-// Returns true iff segments ab and cd intersect, properly or improperly.
-static bool intersect(const int* a, const int* b, const int* c, const int* d)
-{
-	if (intersectProp(a, b, c, d))
-		return true;
-	else if (between(a, b, c) || between(a, b, d) ||
-			 between(c, d, a) || between(c, d, b))
-		return true;
-	else
-		return false;
-}
-
-static bool vequal(const int* a, const int* b)
-{
-	return a[0] == b[0] && a[2] == b[2];
-}
-
-// Returns T iff (v_i, v_j) is a proper internal *or* external
-// diagonal of P, *ignoring edges incident to v_i and v_j*.
-static bool diagonalie(int i, int j, int n, const int* verts, int* indices)
-{
-	const int* d0 = &verts[(indices[i] & 0x0fffffff) * 4];
-	const int* d1 = &verts[(indices[j] & 0x0fffffff) * 4];
-	
-	// For each edge (k,k+1) of P
-	for (int k = 0; k < n; k++)
-	{
-		int k1 = next(k, n);
-		// Skip edges incident to i or j
-		if (!((k == i) || (k1 == i) || (k == j) || (k1 == j)))
-		{
-			const int* p0 = &verts[(indices[k] & 0x0fffffff) * 4];
-			const int* p1 = &verts[(indices[k1] & 0x0fffffff) * 4];
-
-			if (vequal(d0, p0) || vequal(d1, p0) || vequal(d0, p1) || vequal(d1, p1))
-				continue;
-			
-			if (intersect(d0, d1, p0, p1))
-				return false;
-		}
-	}
-	return true;
-}
-
-// Returns true iff the diagonal (i,j) is strictly internal to the 
-// polygon P in the neighborhood of the i endpoint.
-static bool	inCone(int i, int j, int n, const int* verts, int* indices)
-{
-	const int* pi = &verts[(indices[i] & 0x0fffffff) * 4];
-	const int* pj = &verts[(indices[j] & 0x0fffffff) * 4];
-	const int* pi1 = &verts[(indices[next(i, n)] & 0x0fffffff) * 4];
-	const int* pin1 = &verts[(indices[prev(i, n)] & 0x0fffffff) * 4];
-
-	// If P[i] is a convex vertex [ i+1 left or on (i-1,i) ].
-	if (leftOn(pin1, pi, pi1))
-		return left(pi, pj, pin1) && left(pj, pi, pi1);
-	// Assume (i-1,i,i+1) not collinear.
-	// else P[i] is reflex.
-	return !(leftOn(pi, pj, pi1) && leftOn(pj, pi, pin1));
-}
-
-// Returns T iff (v_i, v_j) is a proper internal
-// diagonal of P.
-static bool diagonal(int i, int j, int n, const int* verts, int* indices)
-{
-	return inCone(i, j, n, verts, indices) && diagonalie(i, j, n, verts, indices);
-}
-
-
-static bool diagonalieLoose(int i, int j, int n, const int* verts, int* indices)
-{
-	const int* d0 = &verts[(indices[i] & 0x0fffffff) * 4];
-	const int* d1 = &verts[(indices[j] & 0x0fffffff) * 4];
-	
-	// For each edge (k,k+1) of P
-	for (int k = 0; k < n; k++)
-	{
-		int k1 = next(k, n);
-		// Skip edges incident to i or j
-		if (!((k == i) || (k1 == i) || (k == j) || (k1 == j)))
-		{
-			const int* p0 = &verts[(indices[k] & 0x0fffffff) * 4];
-			const int* p1 = &verts[(indices[k1] & 0x0fffffff) * 4];
-			
-			if (vequal(d0, p0) || vequal(d1, p0) || vequal(d0, p1) || vequal(d1, p1))
-				continue;
-			
-			if (intersectProp(d0, d1, p0, p1))
-				return false;
-		}
-	}
-	return true;
-}
-
-static bool	inConeLoose(int i, int j, int n, const int* verts, int* indices)
-{
-	const int* pi = &verts[(indices[i] & 0x0fffffff) * 4];
-	const int* pj = &verts[(indices[j] & 0x0fffffff) * 4];
-	const int* pi1 = &verts[(indices[next(i, n)] & 0x0fffffff) * 4];
-	const int* pin1 = &verts[(indices[prev(i, n)] & 0x0fffffff) * 4];
-	
-	// If P[i] is a convex vertex [ i+1 left or on (i-1,i) ].
-	if (leftOn(pin1, pi, pi1))
-		return leftOn(pi, pj, pin1) && leftOn(pj, pi, pi1);
-	// Assume (i-1,i,i+1) not collinear.
-	// else P[i] is reflex.
-	return !(leftOn(pi, pj, pi1) && leftOn(pj, pi, pin1));
-}
-
-static bool diagonalLoose(int i, int j, int n, const int* verts, int* indices)
-{
-	return inConeLoose(i, j, n, verts, indices) && diagonalieLoose(i, j, n, verts, indices);
-}
-
-
-static int triangulate(int n, const int* verts, int* indices, int* tris)
-{
-	int ntris = 0;
-	int* dst = tris;
-	
-	// The last bit of the index is used to indicate if the vertex can be removed.
-	for (int i = 0; i < n; i++)
-	{
-		int i1 = next(i, n);
-		int i2 = next(i1, n);
-		if (diagonal(i, i2, n, verts, indices))
-			indices[i1] |= 0x80000000;
-	}
-	
-	while (n > 3)
-	{
-		int minLen = -1;
-		int mini = -1;
-		for (int i = 0; i < n; i++)
-		{
-			int i1 = next(i, n);
-			if (indices[i1] & 0x80000000)
-			{
-				const int* p0 = &verts[(indices[i] & 0x0fffffff) * 4];
-				const int* p2 = &verts[(indices[next(i1, n)] & 0x0fffffff) * 4];
-				
-				int dx = p2[0] - p0[0];
-				int dy = p2[2] - p0[2];
-				int len = dx*dx + dy*dy;
-				
-				if (minLen < 0 || len < minLen)
-				{
-					minLen = len;
-					mini = i;
-				}
-			}
-		}
-		
-		if (mini == -1)
-		{
-			// We might get here because the contour has overlapping segments, like this:
-			//
-			//  A o-o=====o---o B
-			//   /  |C   D|    \.
-			//  o   o     o     o
-			//  :   :     :     :
-			// We'll try to recover by loosing up the inCone test a bit so that a diagonal
-			// like A-B or C-D can be found and we can continue.
-			minLen = -1;
-			mini = -1;
-			for (int i = 0; i < n; i++)
-			{
-				int i1 = next(i, n);
-				int i2 = next(i1, n);
-				if (diagonalLoose(i, i2, n, verts, indices))
-				{
-					const int* p0 = &verts[(indices[i] & 0x0fffffff) * 4];
-					const int* p2 = &verts[(indices[next(i2, n)] & 0x0fffffff) * 4];
-					int dx = p2[0] - p0[0];
-					int dy = p2[2] - p0[2];
-					int len = dx*dx + dy*dy;
-					
-					if (minLen < 0 || len < minLen)
-					{
-						minLen = len;
-						mini = i;
-					}
-				}
-			}
-			if (mini == -1)
-			{
-				// The contour is messed up. This sometimes happens
-				// if the contour simplification is too aggressive.
-				return -ntris;
-			}
-		}
-		
-		int i = mini;
-		int i1 = next(i, n);
-		int i2 = next(i1, n);
-		
-		*dst++ = indices[i] & 0x0fffffff;
-		*dst++ = indices[i1] & 0x0fffffff;
-		*dst++ = indices[i2] & 0x0fffffff;
-		ntris++;
-		
-		// Removes P[i1] by copying P[i+1]...P[n-1] left one index.
-		n--;
-		for (int k = i1; k < n; k++)
-			indices[k] = indices[k+1];
-		
-		if (i1 >= n) i1 = 0;
-		i = prev(i1,n);
-		// Update diagonal flags.
-		if (diagonal(prev(i, n), i1, n, verts, indices))
-			indices[i] |= 0x80000000;
-		else
-			indices[i] &= 0x0fffffff;
-		
-		if (diagonal(i, next(i1, n), n, verts, indices))
-			indices[i1] |= 0x80000000;
-		else
-			indices[i1] &= 0x0fffffff;
-	}
-	
-	// Append the remaining triangle.
-	*dst++ = indices[0] & 0x0fffffff;
-	*dst++ = indices[1] & 0x0fffffff;
-	*dst++ = indices[2] & 0x0fffffff;
-	ntris++;
-	
-	return ntris;
-}
-
-static int countPolyVerts(const unsigned short* p, const int nvp)
-{
-	for (int i = 0; i < nvp; ++i)
-		if (p[i] == RC_MESH_NULL_IDX)
-			return i;
-	return nvp;
-}
-
-inline bool uleft(const unsigned short* a, const unsigned short* b, const unsigned short* c)
-{
-	return ((int)b[0] - (int)a[0]) * ((int)c[2] - (int)a[2]) -
-		   ((int)c[0] - (int)a[0]) * ((int)b[2] - (int)a[2]) < 0;
-}
-
-static int getPolyMergeValue(unsigned short* pa, unsigned short* pb,
-							 const unsigned short* verts, int& ea, int& eb,
-							 const int nvp)
-{
-	const int na = countPolyVerts(pa, nvp);
-	const int nb = countPolyVerts(pb, nvp);
-	
-	// If the merged polygon would be too big, do not merge.
-	if (na+nb-2 > nvp)
-		return -1;
-	
-	// Check if the polygons share an edge.
-	ea = -1;
-	eb = -1;
-	
-	for (int i = 0; i < na; ++i)
-	{
-		unsigned short va0 = pa[i];
-		unsigned short va1 = pa[(i+1) % na];
-		if (va0 > va1)
-			rcSwap(va0, va1);
-		for (int j = 0; j < nb; ++j)
-		{
-			unsigned short vb0 = pb[j];
-			unsigned short vb1 = pb[(j+1) % nb];
-			if (vb0 > vb1)
-				rcSwap(vb0, vb1);
-			if (va0 == vb0 && va1 == vb1)
-			{
-				ea = i;
-				eb = j;
-				break;
-			}
-		}
-	}
-	
-	// No common edge, cannot merge.
-	if (ea == -1 || eb == -1)
-		return -1;
-	
-	// Check to see if the merged polygon would be convex.
-	unsigned short va, vb, vc;
-	
-	va = pa[(ea+na-1) % na];
-	vb = pa[ea];
-	vc = pb[(eb+2) % nb];
-	if (!uleft(&verts[va*3], &verts[vb*3], &verts[vc*3]))
-		return -1;
-	
-	va = pb[(eb+nb-1) % nb];
-	vb = pb[eb];
-	vc = pa[(ea+2) % na];
-	if (!uleft(&verts[va*3], &verts[vb*3], &verts[vc*3]))
-		return -1;
-	
-	va = pa[ea];
-	vb = pa[(ea+1)%na];
-	
-	int dx = (int)verts[va*3+0] - (int)verts[vb*3+0];
-	int dy = (int)verts[va*3+2] - (int)verts[vb*3+2];
-	
-	return dx*dx + dy*dy;
-}
-
-static void mergePolyVerts(unsigned short* pa, unsigned short* pb, int ea, int eb,
-						   unsigned short* tmp, const int nvp)
-{
-	const int na = countPolyVerts(pa, nvp);
-	const int nb = countPolyVerts(pb, nvp);
-	
-	// Merge polygons.
-	memset(tmp, 0xff, sizeof(unsigned short)*nvp);
-	int n = 0;
-	// Add pa
-	for (int i = 0; i < na-1; ++i)
-		tmp[n++] = pa[(ea+1+i) % na];
-	// Add pb
-	for (int i = 0; i < nb-1; ++i)
-		tmp[n++] = pb[(eb+1+i) % nb];
-	
-	memcpy(pa, tmp, sizeof(unsigned short)*nvp);
-}
-
-
-static void pushFront(int v, int* arr, int& an)
-{
-	an++;
-	for (int i = an-1; i > 0; --i) arr[i] = arr[i-1];
-	arr[0] = v;
-}
-
-static void pushBack(int v, int* arr, int& an)
-{
-	arr[an] = v;
-	an++;
-}
-
-static bool canRemoveVertex(rcContext* ctx, rcPolyMesh& mesh, const unsigned short rem)
-{
-	const int nvp = mesh.nvp;
-	
-	// Count number of polygons to remove.
-	int numRemovedVerts = 0;
-	int numTouchedVerts = 0;
-	int numRemainingEdges = 0;
-	for (int i = 0; i < mesh.npolys; ++i)
-	{
-		unsigned short* p = &mesh.polys[i*nvp*2];
-		const int nv = countPolyVerts(p, nvp);
-		int numRemoved = 0;
-		int numVerts = 0;
-		for (int j = 0; j < nv; ++j)
-		{
-			if (p[j] == rem)
-			{
-				numTouchedVerts++;
-				numRemoved++;
-			}
-			numVerts++;
-		}
-		if (numRemoved)
-		{
-			numRemovedVerts += numRemoved;
-			numRemainingEdges += numVerts-(numRemoved+1);
-		}
-	}
-	
-	// There would be too few edges remaining to create a polygon.
-	// This can happen for example when a tip of a triangle is marked
-	// as deletion, but there are no other polys that share the vertex.
-	// In this case, the vertex should not be removed.
-	if (numRemainingEdges <= 2)
-		return false;
-	
-	// Find edges which share the removed vertex.
-	const int maxEdges = numTouchedVerts*2;
-	int nedges = 0;
-	rcScopedDelete<int> edges((int*)rcAlloc(sizeof(int)*maxEdges*3, RC_ALLOC_TEMP));
-	if (!edges)
-	{
-		ctx->log(RC_LOG_WARNING, "canRemoveVertex: Out of memory 'edges' (%d).", maxEdges*3);
-		return false;
-	}
-		
-	for (int i = 0; i < mesh.npolys; ++i)
-	{
-		unsigned short* p = &mesh.polys[i*nvp*2];
-		const int nv = countPolyVerts(p, nvp);
-
-		// Collect edges which touches the removed vertex.
-		for (int j = 0, k = nv-1; j < nv; k = j++)
-		{
-			if (p[j] == rem || p[k] == rem)
-			{
-				// Arrange edge so that a=rem.
-				int a = p[j], b = p[k];
-				if (b == rem)
-					rcSwap(a,b);
-					
-				// Check if the edge exists
-				bool exists = false;
-				for (int m = 0; m < nedges; ++m)
-				{
-					int* e = &edges[m*3];
-					if (e[1] == b)
-					{
-						// Exists, increment vertex share count.
-						e[2]++;
-						exists = true;
-					}
-				}
-				// Add new edge.
-				if (!exists)
-				{
-					int* e = &edges[nedges*3];
-					e[0] = a;
-					e[1] = b;
-					e[2] = 1;
-					nedges++;
-				}
-			}
-		}
-	}
-
-	// There should be no more than 2 open edges.
-	// This catches the case that two non-adjacent polygons
-	// share the removed vertex. In that case, do not remove the vertex.
-	int numOpenEdges = 0;
-	for (int i = 0; i < nedges; ++i)
-	{
-		if (edges[i*3+2] < 2)
-			numOpenEdges++;
-	}
-	if (numOpenEdges > 2)
-		return false;
-	
-	return true;
-}
-
-static bool removeVertex(rcContext* ctx, rcPolyMesh& mesh, const unsigned short rem, const int maxTris)
-{
-	const int nvp = mesh.nvp;
-
-	// Count number of polygons to remove.
-	int numRemovedVerts = 0;
-	for (int i = 0; i < mesh.npolys; ++i)
-	{
-		unsigned short* p = &mesh.polys[i*nvp*2];
-		const int nv = countPolyVerts(p, nvp);
-		for (int j = 0; j < nv; ++j)
-		{
-			if (p[j] == rem)
-				numRemovedVerts++;
-		}
-	}
-	
-	int nedges = 0;
-	rcScopedDelete<int> edges((int*)rcAlloc(sizeof(int)*numRemovedVerts*nvp*4, RC_ALLOC_TEMP));
-	if (!edges)
-	{
-		ctx->log(RC_LOG_WARNING, "removeVertex: Out of memory 'edges' (%d).", numRemovedVerts*nvp*4);
-		return false;
-	}
-
-	int nhole = 0;
-	rcScopedDelete<int> hole((int*)rcAlloc(sizeof(int)*numRemovedVerts*nvp, RC_ALLOC_TEMP));
-	if (!hole)
-	{
-		ctx->log(RC_LOG_WARNING, "removeVertex: Out of memory 'hole' (%d).", numRemovedVerts*nvp);
-		return false;
-	}
-
-	int nhreg = 0;
-	rcScopedDelete<int> hreg((int*)rcAlloc(sizeof(int)*numRemovedVerts*nvp, RC_ALLOC_TEMP));
-	if (!hreg)
-	{
-		ctx->log(RC_LOG_WARNING, "removeVertex: Out of memory 'hreg' (%d).", numRemovedVerts*nvp);
-		return false;
-	}
-
-	int nharea = 0;
-	rcScopedDelete<int> harea((int*)rcAlloc(sizeof(int)*numRemovedVerts*nvp, RC_ALLOC_TEMP));
-	if (!harea)
-	{
-		ctx->log(RC_LOG_WARNING, "removeVertex: Out of memory 'harea' (%d).", numRemovedVerts*nvp);
-		return false;
-	}
-	
-	for (int i = 0; i < mesh.npolys; ++i)
-	{
-		unsigned short* p = &mesh.polys[i*nvp*2];
-		const int nv = countPolyVerts(p, nvp);
-		bool hasRem = false;
-		for (int j = 0; j < nv; ++j)
-			if (p[j] == rem) hasRem = true;
-		if (hasRem)
-		{
-			// Collect edges which does not touch the removed vertex.
-			for (int j = 0, k = nv-1; j < nv; k = j++)
-			{
-				if (p[j] != rem && p[k] != rem)
-				{
-					int* e = &edges[nedges*4];
-					e[0] = p[k];
-					e[1] = p[j];
-					e[2] = mesh.regs[i];
-					e[3] = mesh.areas[i];
-					nedges++;
-				}
-			}
-			// Remove the polygon.
-			unsigned short* p2 = &mesh.polys[(mesh.npolys-1)*nvp*2];
-			if (p != p2)
-				memcpy(p,p2,sizeof(unsigned short)*nvp);
-			memset(p+nvp,0xff,sizeof(unsigned short)*nvp);
-			mesh.regs[i] = mesh.regs[mesh.npolys-1];
-			mesh.areas[i] = mesh.areas[mesh.npolys-1];
-			mesh.npolys--;
-			--i;
-		}
-	}
-	
-	// Remove vertex.
-	for (int i = (int)rem; i < mesh.nverts - 1; ++i)
-	{
-		mesh.verts[i*3+0] = mesh.verts[(i+1)*3+0];
-		mesh.verts[i*3+1] = mesh.verts[(i+1)*3+1];
-		mesh.verts[i*3+2] = mesh.verts[(i+1)*3+2];
-	}
-	mesh.nverts--;
-
-	// Adjust indices to match the removed vertex layout.
-	for (int i = 0; i < mesh.npolys; ++i)
-	{
-		unsigned short* p = &mesh.polys[i*nvp*2];
-		const int nv = countPolyVerts(p, nvp);
-		for (int j = 0; j < nv; ++j)
-			if (p[j] > rem) p[j]--;
-	}
-	for (int i = 0; i < nedges; ++i)
-	{
-		if (edges[i*4+0] > rem) edges[i*4+0]--;
-		if (edges[i*4+1] > rem) edges[i*4+1]--;
-	}
-
-	if (nedges == 0)
-		return true;
-
-	// Start with one vertex, keep appending connected
-	// segments to the start and end of the hole.
-	pushBack(edges[0], hole, nhole);
-	pushBack(edges[2], hreg, nhreg);
-	pushBack(edges[3], harea, nharea);
-	
-	while (nedges)
-	{
-		bool match = false;
-		
-		for (int i = 0; i < nedges; ++i)
-		{
-			const int ea = edges[i*4+0];
-			const int eb = edges[i*4+1];
-			const int r = edges[i*4+2];
-			const int a = edges[i*4+3];
-			bool add = false;
-			if (hole[0] == eb)
-			{
-				// The segment matches the beginning of the hole boundary.
-				pushFront(ea, hole, nhole);
-				pushFront(r, hreg, nhreg);
-				pushFront(a, harea, nharea);
-				add = true;
-			}
-			else if (hole[nhole-1] == ea)
-			{
-				// The segment matches the end of the hole boundary.
-				pushBack(eb, hole, nhole);
-				pushBack(r, hreg, nhreg);
-				pushBack(a, harea, nharea);
-				add = true;
-			}
-			if (add)
-			{
-				// The edge segment was added, remove it.
-				edges[i*4+0] = edges[(nedges-1)*4+0];
-				edges[i*4+1] = edges[(nedges-1)*4+1];
-				edges[i*4+2] = edges[(nedges-1)*4+2];
-				edges[i*4+3] = edges[(nedges-1)*4+3];
-				--nedges;
-				match = true;
-				--i;
-			}
-		}
-		
-		if (!match)
-			break;
-	}
-
-	rcScopedDelete<int> tris((int*)rcAlloc(sizeof(int)*nhole*3, RC_ALLOC_TEMP));
-	if (!tris)
-	{
-		ctx->log(RC_LOG_WARNING, "removeVertex: Out of memory 'tris' (%d).", nhole*3);
-		return false;
-	}
-
-	rcScopedDelete<int> tverts((int*)rcAlloc(sizeof(int)*nhole*4, RC_ALLOC_TEMP));
-	if (!tverts)
-	{
-		ctx->log(RC_LOG_WARNING, "removeVertex: Out of memory 'tverts' (%d).", nhole*4);
-		return false;
-	}
-
-	rcScopedDelete<int> thole((int*)rcAlloc(sizeof(int)*nhole, RC_ALLOC_TEMP));
-	if (!thole)
-	{
-		ctx->log(RC_LOG_WARNING, "removeVertex: Out of memory 'thole' (%d).", nhole);
-		return false;
-	}
-
-	// Generate temp vertex array for triangulation.
-	for (int i = 0; i < nhole; ++i)
-	{
-		const int pi = hole[i];
-		tverts[i*4+0] = mesh.verts[pi*3+0];
-		tverts[i*4+1] = mesh.verts[pi*3+1];
-		tverts[i*4+2] = mesh.verts[pi*3+2];
-		tverts[i*4+3] = 0;
-		thole[i] = i;
-	}
-
-	// Triangulate the hole.
-	int ntris = triangulate(nhole, &tverts[0], &thole[0], tris);
-	if (ntris < 0)
-	{
-		ntris = -ntris;
-		ctx->log(RC_LOG_WARNING, "removeVertex: triangulate() returned bad results.");
-	}
-	
-	// Merge the hole triangles back to polygons.
-	rcScopedDelete<unsigned short> polys((unsigned short*)rcAlloc(sizeof(unsigned short)*(ntris+1)*nvp, RC_ALLOC_TEMP));
-	if (!polys)
-	{
-		ctx->log(RC_LOG_ERROR, "removeVertex: Out of memory 'polys' (%d).", (ntris+1)*nvp);
-		return false;
-	}
-	rcScopedDelete<unsigned short> pregs((unsigned short*)rcAlloc(sizeof(unsigned short)*ntris, RC_ALLOC_TEMP));
-	if (!pregs)
-	{
-		ctx->log(RC_LOG_ERROR, "removeVertex: Out of memory 'pregs' (%d).", ntris);
-		return false;
-	}
-	rcScopedDelete<unsigned char> pareas((unsigned char*)rcAlloc(sizeof(unsigned char)*ntris, RC_ALLOC_TEMP));
-	if (!pareas)
-	{
-		ctx->log(RC_LOG_ERROR, "removeVertex: Out of memory 'pareas' (%d).", ntris);
-		return false;
-	}
-	
-	unsigned short* tmpPoly = &polys[ntris*nvp];
-			
-	// Build initial polygons.
-	int npolys = 0;
-	memset(polys, 0xff, ntris*nvp*sizeof(unsigned short));
-	for (int j = 0; j < ntris; ++j)
-	{
-		int* t = &tris[j*3];
-		if (t[0] != t[1] && t[0] != t[2] && t[1] != t[2])
-		{
-			polys[npolys*nvp+0] = (unsigned short)hole[t[0]];
-			polys[npolys*nvp+1] = (unsigned short)hole[t[1]];
-			polys[npolys*nvp+2] = (unsigned short)hole[t[2]];
-
-			// If this polygon covers multiple region types then
-			// mark it as such
-			if (hreg[t[0]] != hreg[t[1]] || hreg[t[1]] != hreg[t[2]])
-				pregs[npolys] = RC_MULTIPLE_REGS;
-			else
-				pregs[npolys] = (unsigned short)hreg[t[0]];
-
-			pareas[npolys] = (unsigned char)harea[t[0]];
-			npolys++;
-		}
-	}
-	if (!npolys)
-		return true;
-	
-	// Merge polygons.
-	if (nvp > 3)
-	{
-		for (;;)
-		{
-			// Find best polygons to merge.
-			int bestMergeVal = 0;
-			int bestPa = 0, bestPb = 0, bestEa = 0, bestEb = 0;
-			
-			for (int j = 0; j < npolys-1; ++j)
-			{
-				unsigned short* pj = &polys[j*nvp];
-				for (int k = j+1; k < npolys; ++k)
-				{
-					unsigned short* pk = &polys[k*nvp];
-					int ea, eb;
-					int v = getPolyMergeValue(pj, pk, mesh.verts, ea, eb, nvp);
-					if (v > bestMergeVal)
-					{
-						bestMergeVal = v;
-						bestPa = j;
-						bestPb = k;
-						bestEa = ea;
-						bestEb = eb;
-					}
-				}
-			}
-			
-			if (bestMergeVal > 0)
-			{
-				// Found best, merge.
-				unsigned short* pa = &polys[bestPa*nvp];
-				unsigned short* pb = &polys[bestPb*nvp];
-				mergePolyVerts(pa, pb, bestEa, bestEb, tmpPoly, nvp);
-				if (pregs[bestPa] != pregs[bestPb])
-					pregs[bestPa] = RC_MULTIPLE_REGS;
-
-				unsigned short* last = &polys[(npolys-1)*nvp];
-				if (pb != last)
-					memcpy(pb, last, sizeof(unsigned short)*nvp);
-				pregs[bestPb] = pregs[npolys-1];
-				pareas[bestPb] = pareas[npolys-1];
-				npolys--;
-			}
-			else
-			{
-				// Could not merge any polygons, stop.
-				break;
-			}
-		}
-	}
-	
-	// Store polygons.
-	for (int i = 0; i < npolys; ++i)
-	{
-		if (mesh.npolys >= maxTris) break;
-		unsigned short* p = &mesh.polys[mesh.npolys*nvp*2];
-		memset(p,0xff,sizeof(unsigned short)*nvp*2);
-		for (int j = 0; j < nvp; ++j)
-			p[j] = polys[i*nvp+j];
-		mesh.regs[mesh.npolys] = pregs[i];
-		mesh.areas[mesh.npolys] = pareas[i];
-		mesh.npolys++;
-		if (mesh.npolys > maxTris)
-		{
-			ctx->log(RC_LOG_ERROR, "removeVertex: Too many polygons %d (max:%d).", mesh.npolys, maxTris);
-			return false;
-		}
-	}
-	
-	return true;
-}
-
-/// @par
-///
-/// @note If the mesh data is to be used to construct a Detour navigation mesh, then the upper 
-/// limit must be retricted to <= #DT_VERTS_PER_POLYGON.
-///
-/// @see rcAllocPolyMesh, rcContourSet, rcPolyMesh, rcConfig
-bool rcBuildPolyMesh(rcContext* ctx, rcContourSet& cset, const int nvp, rcPolyMesh& mesh)
-{
-	rcAssert(ctx);
-	
-	rcScopedTimer timer(ctx, RC_TIMER_BUILD_POLYMESH);
-
-	rcVcopy(mesh.bmin, cset.bmin);
-	rcVcopy(mesh.bmax, cset.bmax);
-	mesh.cs = cset.cs;
-	mesh.ch = cset.ch;
-	mesh.borderSize = cset.borderSize;
-	mesh.maxEdgeError = cset.maxError;
-	
-	int maxVertices = 0;
-	int maxTris = 0;
-	int maxVertsPerCont = 0;
-	for (int i = 0; i < cset.nconts; ++i)
-	{
-		// Skip null contours.
-		if (cset.conts[i].nverts < 3) continue;
-		maxVertices += cset.conts[i].nverts;
-		maxTris += cset.conts[i].nverts - 2;
-		maxVertsPerCont = rcMax(maxVertsPerCont, cset.conts[i].nverts);
-	}
-	
-	if (maxVertices >= 0xfffe)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildPolyMesh: Too many vertices %d.", maxVertices);
-		return false;
-	}
-		
-	rcScopedDelete<unsigned char> vflags((unsigned char*)rcAlloc(sizeof(unsigned char)*maxVertices, RC_ALLOC_TEMP));
-	if (!vflags)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildPolyMesh: Out of memory 'vflags' (%d).", maxVertices);
-		return false;
-	}
-	memset(vflags, 0, maxVertices);
-	
-	mesh.verts = (unsigned short*)rcAlloc(sizeof(unsigned short)*maxVertices*3, RC_ALLOC_PERM);
-	if (!mesh.verts)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildPolyMesh: Out of memory 'mesh.verts' (%d).", maxVertices);
-		return false;
-	}
-	mesh.polys = (unsigned short*)rcAlloc(sizeof(unsigned short)*maxTris*nvp*2, RC_ALLOC_PERM);
-	if (!mesh.polys)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildPolyMesh: Out of memory 'mesh.polys' (%d).", maxTris*nvp*2);
-		return false;
-	}
-	mesh.regs = (unsigned short*)rcAlloc(sizeof(unsigned short)*maxTris, RC_ALLOC_PERM);
-	if (!mesh.regs)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildPolyMesh: Out of memory 'mesh.regs' (%d).", maxTris);
-		return false;
-	}
-	mesh.areas = (unsigned char*)rcAlloc(sizeof(unsigned char)*maxTris, RC_ALLOC_PERM);
-	if (!mesh.areas)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildPolyMesh: Out of memory 'mesh.areas' (%d).", maxTris);
-		return false;
-	}
-	
-	mesh.nverts = 0;
-	mesh.npolys = 0;
-	mesh.nvp = nvp;
-	mesh.maxpolys = maxTris;
-	
-	memset(mesh.verts, 0, sizeof(unsigned short)*maxVertices*3);
-	memset(mesh.polys, 0xff, sizeof(unsigned short)*maxTris*nvp*2);
-	memset(mesh.regs, 0, sizeof(unsigned short)*maxTris);
-	memset(mesh.areas, 0, sizeof(unsigned char)*maxTris);
-	
-	rcScopedDelete<int> nextVert((int*)rcAlloc(sizeof(int)*maxVertices, RC_ALLOC_TEMP));
-	if (!nextVert)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildPolyMesh: Out of memory 'nextVert' (%d).", maxVertices);
-		return false;
-	}
-	memset(nextVert, 0, sizeof(int)*maxVertices);
-	
-	rcScopedDelete<int> firstVert((int*)rcAlloc(sizeof(int)*VERTEX_BUCKET_COUNT, RC_ALLOC_TEMP));
-	if (!firstVert)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildPolyMesh: Out of memory 'firstVert' (%d).", VERTEX_BUCKET_COUNT);
-		return false;
-	}
-	for (int i = 0; i < VERTEX_BUCKET_COUNT; ++i)
-		firstVert[i] = -1;
-	
-	rcScopedDelete<int> indices((int*)rcAlloc(sizeof(int)*maxVertsPerCont, RC_ALLOC_TEMP));
-	if (!indices)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildPolyMesh: Out of memory 'indices' (%d).", maxVertsPerCont);
-		return false;
-	}
-	rcScopedDelete<int> tris((int*)rcAlloc(sizeof(int)*maxVertsPerCont*3, RC_ALLOC_TEMP));
-	if (!tris)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildPolyMesh: Out of memory 'tris' (%d).", maxVertsPerCont*3);
-		return false;
-	}
-	rcScopedDelete<unsigned short> polys((unsigned short*)rcAlloc(sizeof(unsigned short)*(maxVertsPerCont+1)*nvp, RC_ALLOC_TEMP));
-	if (!polys)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildPolyMesh: Out of memory 'polys' (%d).", maxVertsPerCont*nvp);
-		return false;
-	}
-	unsigned short* tmpPoly = &polys[maxVertsPerCont*nvp];
-
-	for (int i = 0; i < cset.nconts; ++i)
-	{
-		rcContour& cont = cset.conts[i];
-		
-		// Skip null contours.
-		if (cont.nverts < 3)
-			continue;
-		
-		// Triangulate contour
-		for (int j = 0; j < cont.nverts; ++j)
-			indices[j] = j;
-			
-		int ntris = triangulate(cont.nverts, cont.verts, &indices[0], &tris[0]);
-		if (ntris <= 0)
-		{
-			// Bad triangulation, should not happen.
-/*			printf("\tconst float bmin[3] = {%ff,%ff,%ff};\n", cset.bmin[0], cset.bmin[1], cset.bmin[2]);
-			printf("\tconst float cs = %ff;\n", cset.cs);
-			printf("\tconst float ch = %ff;\n", cset.ch);
-			printf("\tconst int verts[] = {\n");
-			for (int k = 0; k < cont.nverts; ++k)
-			{
-				const int* v = &cont.verts[k*4];
-				printf("\t\t%d,%d,%d,%d,\n", v[0], v[1], v[2], v[3]);
-			}
-			printf("\t};\n\tconst int nverts = sizeof(verts)/(sizeof(int)*4);\n");*/
-			ctx->log(RC_LOG_WARNING, "rcBuildPolyMesh: Bad triangulation Contour %d.", i);
-			ntris = -ntris;
-		}
-				
-		// Add and merge vertices.
-		for (int j = 0; j < cont.nverts; ++j)
-		{
-			const int* v = &cont.verts[j*4];
-			indices[j] = addVertex((unsigned short)v[0], (unsigned short)v[1], (unsigned short)v[2],
-								   mesh.verts, firstVert, nextVert, mesh.nverts);
-			if (v[3] & RC_BORDER_VERTEX)
-			{
-				// This vertex should be removed.
-				vflags[indices[j]] = 1;
-			}
-		}
-
-		// Build initial polygons.
-		int npolys = 0;
-		memset(polys, 0xff, maxVertsPerCont*nvp*sizeof(unsigned short));
-		for (int j = 0; j < ntris; ++j)
-		{
-			int* t = &tris[j*3];
-			if (t[0] != t[1] && t[0] != t[2] && t[1] != t[2])
-			{
-				polys[npolys*nvp+0] = (unsigned short)indices[t[0]];
-				polys[npolys*nvp+1] = (unsigned short)indices[t[1]];
-				polys[npolys*nvp+2] = (unsigned short)indices[t[2]];
-				npolys++;
-			}
-		}
-		if (!npolys)
-			continue;
-		
-		// Merge polygons.
-		if (nvp > 3)
-		{
-			for(;;)
-			{
-				// Find best polygons to merge.
-				int bestMergeVal = 0;
-				int bestPa = 0, bestPb = 0, bestEa = 0, bestEb = 0;
-				
-				for (int j = 0; j < npolys-1; ++j)
-				{
-					unsigned short* pj = &polys[j*nvp];
-					for (int k = j+1; k < npolys; ++k)
-					{
-						unsigned short* pk = &polys[k*nvp];
-						int ea, eb;
-						int v = getPolyMergeValue(pj, pk, mesh.verts, ea, eb, nvp);
-						if (v > bestMergeVal)
-						{
-							bestMergeVal = v;
-							bestPa = j;
-							bestPb = k;
-							bestEa = ea;
-							bestEb = eb;
-						}
-					}
-				}
-				
-				if (bestMergeVal > 0)
-				{
-					// Found best, merge.
-					unsigned short* pa = &polys[bestPa*nvp];
-					unsigned short* pb = &polys[bestPb*nvp];
-					mergePolyVerts(pa, pb, bestEa, bestEb, tmpPoly, nvp);
-					unsigned short* lastPoly = &polys[(npolys-1)*nvp];
-					if (pb != lastPoly)
-						memcpy(pb, lastPoly, sizeof(unsigned short)*nvp);
-					npolys--;
-				}
-				else
-				{
-					// Could not merge any polygons, stop.
-					break;
-				}
-			}
-		}
-		
-		// Store polygons.
-		for (int j = 0; j < npolys; ++j)
-		{
-			unsigned short* p = &mesh.polys[mesh.npolys*nvp*2];
-			unsigned short* q = &polys[j*nvp];
-			for (int k = 0; k < nvp; ++k)
-				p[k] = q[k];
-			mesh.regs[mesh.npolys] = cont.reg;
-			mesh.areas[mesh.npolys] = cont.area;
-			mesh.npolys++;
-			if (mesh.npolys > maxTris)
-			{
-				ctx->log(RC_LOG_ERROR, "rcBuildPolyMesh: Too many polygons %d (max:%d).", mesh.npolys, maxTris);
-				return false;
-			}
-		}
-	}
-	
-	
-	// Remove edge vertices.
-	for (int i = 0; i < mesh.nverts; ++i)
-	{
-		if (vflags[i])
-		{
-			if (!canRemoveVertex(ctx, mesh, (unsigned short)i))
-				continue;
-			if (!removeVertex(ctx, mesh, (unsigned short)i, maxTris))
-			{
-				// Failed to remove vertex
-				ctx->log(RC_LOG_ERROR, "rcBuildPolyMesh: Failed to remove edge vertex %d.", i);
-				return false;
-			}
-			// Remove vertex
-			// Note: mesh.nverts is already decremented inside removeVertex()!
-			// Fixup vertex flags
-			for (int j = i; j < mesh.nverts; ++j)
-				vflags[j] = vflags[j+1];
-			--i;
-		}
-	}
-	
-	// Calculate adjacency.
-	if (!buildMeshAdjacency(mesh.polys, mesh.npolys, mesh.nverts, nvp))
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildPolyMesh: Adjacency failed.");
-		return false;
-	}
-	
-	// Find portal edges
-	if (mesh.borderSize > 0)
-	{
-		const int w = cset.width;
-		const int h = cset.height;
-		for (int i = 0; i < mesh.npolys; ++i)
-		{
-			unsigned short* p = &mesh.polys[i*2*nvp];
-			for (int j = 0; j < nvp; ++j)
-			{
-				if (p[j] == RC_MESH_NULL_IDX) break;
-				// Skip connected edges.
-				if (p[nvp+j] != RC_MESH_NULL_IDX)
-					continue;
-				int nj = j+1;
-				if (nj >= nvp || p[nj] == RC_MESH_NULL_IDX) nj = 0;
-				const unsigned short* va = &mesh.verts[p[j]*3];
-				const unsigned short* vb = &mesh.verts[p[nj]*3];
-
-				if ((int)va[0] == 0 && (int)vb[0] == 0)
-					p[nvp+j] = 0x8000 | 0;
-				else if ((int)va[2] == h && (int)vb[2] == h)
-					p[nvp+j] = 0x8000 | 1;
-				else if ((int)va[0] == w && (int)vb[0] == w)
-					p[nvp+j] = 0x8000 | 2;
-				else if ((int)va[2] == 0 && (int)vb[2] == 0)
-					p[nvp+j] = 0x8000 | 3;
-			}
-		}
-	}
-
-	// Just allocate the mesh flags array. The user is resposible to fill it.
-	mesh.flags = (unsigned short*)rcAlloc(sizeof(unsigned short)*mesh.npolys, RC_ALLOC_PERM);
-	if (!mesh.flags)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildPolyMesh: Out of memory 'mesh.flags' (%d).", mesh.npolys);
-		return false;
-	}
-	memset(mesh.flags, 0, sizeof(unsigned short) * mesh.npolys);
-	
-	if (mesh.nverts > 0xffff)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildPolyMesh: The resulting mesh has too many vertices %d (max %d). Data can be corrupted.", mesh.nverts, 0xffff);
-	}
-	if (mesh.npolys > 0xffff)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildPolyMesh: The resulting mesh has too many polygons %d (max %d). Data can be corrupted.", mesh.npolys, 0xffff);
-	}
-	
-	return true;
-}
-
-/// @see rcAllocPolyMesh, rcPolyMesh
-bool rcMergePolyMeshes(rcContext* ctx, rcPolyMesh** meshes, const int nmeshes, rcPolyMesh& mesh)
-{
-	rcAssert(ctx);
-	
-	if (!nmeshes || !meshes)
-		return true;
-
-	rcScopedTimer timer(ctx, RC_TIMER_MERGE_POLYMESH);
-
-	mesh.nvp = meshes[0]->nvp;
-	mesh.cs = meshes[0]->cs;
-	mesh.ch = meshes[0]->ch;
-	rcVcopy(mesh.bmin, meshes[0]->bmin);
-	rcVcopy(mesh.bmax, meshes[0]->bmax);
-
-	int maxVerts = 0;
-	int maxPolys = 0;
-	int maxVertsPerMesh = 0;
-	for (int i = 0; i < nmeshes; ++i)
-	{
-		rcVmin(mesh.bmin, meshes[i]->bmin);
-		rcVmax(mesh.bmax, meshes[i]->bmax);
-		maxVertsPerMesh = rcMax(maxVertsPerMesh, meshes[i]->nverts);
-		maxVerts += meshes[i]->nverts;
-		maxPolys += meshes[i]->npolys;
-	}
-	
-	mesh.nverts = 0;
-	mesh.verts = (unsigned short*)rcAlloc(sizeof(unsigned short)*maxVerts*3, RC_ALLOC_PERM);
-	if (!mesh.verts)
-	{
-		ctx->log(RC_LOG_ERROR, "rcMergePolyMeshes: Out of memory 'mesh.verts' (%d).", maxVerts*3);
-		return false;
-	}
-
-	mesh.npolys = 0;
-	mesh.polys = (unsigned short*)rcAlloc(sizeof(unsigned short)*maxPolys*2*mesh.nvp, RC_ALLOC_PERM);
-	if (!mesh.polys)
-	{
-		ctx->log(RC_LOG_ERROR, "rcMergePolyMeshes: Out of memory 'mesh.polys' (%d).", maxPolys*2*mesh.nvp);
-		return false;
-	}
-	memset(mesh.polys, 0xff, sizeof(unsigned short)*maxPolys*2*mesh.nvp);
-
-	mesh.regs = (unsigned short*)rcAlloc(sizeof(unsigned short)*maxPolys, RC_ALLOC_PERM);
-	if (!mesh.regs)
-	{
-		ctx->log(RC_LOG_ERROR, "rcMergePolyMeshes: Out of memory 'mesh.regs' (%d).", maxPolys);
-		return false;
-	}
-	memset(mesh.regs, 0, sizeof(unsigned short)*maxPolys);
-
-	mesh.areas = (unsigned char*)rcAlloc(sizeof(unsigned char)*maxPolys, RC_ALLOC_PERM);
-	if (!mesh.areas)
-	{
-		ctx->log(RC_LOG_ERROR, "rcMergePolyMeshes: Out of memory 'mesh.areas' (%d).", maxPolys);
-		return false;
-	}
-	memset(mesh.areas, 0, sizeof(unsigned char)*maxPolys);
-
-	mesh.flags = (unsigned short*)rcAlloc(sizeof(unsigned short)*maxPolys, RC_ALLOC_PERM);
-	if (!mesh.flags)
-	{
-		ctx->log(RC_LOG_ERROR, "rcMergePolyMeshes: Out of memory 'mesh.flags' (%d).", maxPolys);
-		return false;
-	}
-	memset(mesh.flags, 0, sizeof(unsigned short)*maxPolys);
-	
-	rcScopedDelete<int> nextVert((int*)rcAlloc(sizeof(int)*maxVerts, RC_ALLOC_TEMP));
-	if (!nextVert)
-	{
-		ctx->log(RC_LOG_ERROR, "rcMergePolyMeshes: Out of memory 'nextVert' (%d).", maxVerts);
-		return false;
-	}
-	memset(nextVert, 0, sizeof(int)*maxVerts);
-	
-	rcScopedDelete<int> firstVert((int*)rcAlloc(sizeof(int)*VERTEX_BUCKET_COUNT, RC_ALLOC_TEMP));
-	if (!firstVert)
-	{
-		ctx->log(RC_LOG_ERROR, "rcMergePolyMeshes: Out of memory 'firstVert' (%d).", VERTEX_BUCKET_COUNT);
-		return false;
-	}
-	for (int i = 0; i < VERTEX_BUCKET_COUNT; ++i)
-		firstVert[i] = -1;
-
-	rcScopedDelete<unsigned short> vremap((unsigned short*)rcAlloc(sizeof(unsigned short)*maxVertsPerMesh, RC_ALLOC_PERM));
-	if (!vremap)
-	{
-		ctx->log(RC_LOG_ERROR, "rcMergePolyMeshes: Out of memory 'vremap' (%d).", maxVertsPerMesh);
-		return false;
-	}
-	memset(vremap, 0, sizeof(unsigned short)*maxVertsPerMesh);
-	
-	for (int i = 0; i < nmeshes; ++i)
-	{
-		const rcPolyMesh* pmesh = meshes[i];
-		
-		const unsigned short ox = (unsigned short)floorf((pmesh->bmin[0]-mesh.bmin[0])/mesh.cs+0.5f);
-		const unsigned short oz = (unsigned short)floorf((pmesh->bmin[2]-mesh.bmin[2])/mesh.cs+0.5f);
-		
-		bool isMinX = (ox == 0);
-		bool isMinZ = (oz == 0);
-		bool isMaxX = ((unsigned short)floorf((mesh.bmax[0] - pmesh->bmax[0]) / mesh.cs + 0.5f)) == 0;
-		bool isMaxZ = ((unsigned short)floorf((mesh.bmax[2] - pmesh->bmax[2]) / mesh.cs + 0.5f)) == 0;
-		bool isOnBorder = (isMinX || isMinZ || isMaxX || isMaxZ);
-
-		for (int j = 0; j < pmesh->nverts; ++j)
-		{
-			unsigned short* v = &pmesh->verts[j*3];
-			vremap[j] = addVertex(v[0]+ox, v[1], v[2]+oz,
-								  mesh.verts, firstVert, nextVert, mesh.nverts);
-		}
-		
-		for (int j = 0; j < pmesh->npolys; ++j)
-		{
-			unsigned short* tgt = &mesh.polys[mesh.npolys*2*mesh.nvp];
-			unsigned short* src = &pmesh->polys[j*2*mesh.nvp];
-			mesh.regs[mesh.npolys] = pmesh->regs[j];
-			mesh.areas[mesh.npolys] = pmesh->areas[j];
-			mesh.flags[mesh.npolys] = pmesh->flags[j];
-			mesh.npolys++;
-			for (int k = 0; k < mesh.nvp; ++k)
-			{
-				if (src[k] == RC_MESH_NULL_IDX) break;
-				tgt[k] = vremap[src[k]];
-			}
-
-			if (isOnBorder)
-			{
-				for (int k = mesh.nvp; k < mesh.nvp * 2; ++k)
-				{
-					if (src[k] & 0x8000 && src[k] != 0xffff)
-					{
-						unsigned short dir = src[k] & 0xf;
-						switch (dir)
-						{
-							case 0: // Portal x-
-								if (isMinX)
-									tgt[k] = src[k];
-								break;
-							case 1: // Portal z+
-								if (isMaxZ)
-									tgt[k] = src[k];
-								break;
-							case 2: // Portal x+
-								if (isMaxX)
-									tgt[k] = src[k];
-								break;
-							case 3: // Portal z-
-								if (isMinZ)
-									tgt[k] = src[k];
-								break;
-						}
-					}
-				}
-			}
-		}
-	}
-
-	// Calculate adjacency.
-	if (!buildMeshAdjacency(mesh.polys, mesh.npolys, mesh.nverts, mesh.nvp))
-	{
-		ctx->log(RC_LOG_ERROR, "rcMergePolyMeshes: Adjacency failed.");
-		return false;
-	}
-
-	if (mesh.nverts > 0xffff)
-	{
-		ctx->log(RC_LOG_ERROR, "rcMergePolyMeshes: The resulting mesh has too many vertices %d (max %d). Data can be corrupted.", mesh.nverts, 0xffff);
-	}
-	if (mesh.npolys > 0xffff)
-	{
-		ctx->log(RC_LOG_ERROR, "rcMergePolyMeshes: The resulting mesh has too many polygons %d (max %d). Data can be corrupted.", mesh.npolys, 0xffff);
-	}
-	
-	return true;
-}
-
-bool rcCopyPolyMesh(rcContext* ctx, const rcPolyMesh& src, rcPolyMesh& dst)
-{
-	rcAssert(ctx);
-	
-	// Destination must be empty.
-	rcAssert(dst.verts == 0);
-	rcAssert(dst.polys == 0);
-	rcAssert(dst.regs == 0);
-	rcAssert(dst.areas == 0);
-	rcAssert(dst.flags == 0);
-	
-	dst.nverts = src.nverts;
-	dst.npolys = src.npolys;
-	dst.maxpolys = src.npolys;
-	dst.nvp = src.nvp;
-	rcVcopy(dst.bmin, src.bmin);
-	rcVcopy(dst.bmax, src.bmax);
-	dst.cs = src.cs;
-	dst.ch = src.ch;
-	dst.borderSize = src.borderSize;
-	dst.maxEdgeError = src.maxEdgeError;
-	
-	dst.verts = (unsigned short*)rcAlloc(sizeof(unsigned short)*src.nverts*3, RC_ALLOC_PERM);
-	if (!dst.verts)
-	{
-		ctx->log(RC_LOG_ERROR, "rcCopyPolyMesh: Out of memory 'dst.verts' (%d).", src.nverts*3);
-		return false;
-	}
-	memcpy(dst.verts, src.verts, sizeof(unsigned short)*src.nverts*3);
-	
-	dst.polys = (unsigned short*)rcAlloc(sizeof(unsigned short)*src.npolys*2*src.nvp, RC_ALLOC_PERM);
-	if (!dst.polys)
-	{
-		ctx->log(RC_LOG_ERROR, "rcCopyPolyMesh: Out of memory 'dst.polys' (%d).", src.npolys*2*src.nvp);
-		return false;
-	}
-	memcpy(dst.polys, src.polys, sizeof(unsigned short)*src.npolys*2*src.nvp);
-	
-	dst.regs = (unsigned short*)rcAlloc(sizeof(unsigned short)*src.npolys, RC_ALLOC_PERM);
-	if (!dst.regs)
-	{
-		ctx->log(RC_LOG_ERROR, "rcCopyPolyMesh: Out of memory 'dst.regs' (%d).", src.npolys);
-		return false;
-	}
-	memcpy(dst.regs, src.regs, sizeof(unsigned short)*src.npolys);
-	
-	dst.areas = (unsigned char*)rcAlloc(sizeof(unsigned char)*src.npolys, RC_ALLOC_PERM);
-	if (!dst.areas)
-	{
-		ctx->log(RC_LOG_ERROR, "rcCopyPolyMesh: Out of memory 'dst.areas' (%d).", src.npolys);
-		return false;
-	}
-	memcpy(dst.areas, src.areas, sizeof(unsigned char)*src.npolys);
-	
-	dst.flags = (unsigned short*)rcAlloc(sizeof(unsigned short)*src.npolys, RC_ALLOC_PERM);
-	if (!dst.flags)
-	{
-		ctx->log(RC_LOG_ERROR, "rcCopyPolyMesh: Out of memory 'dst.flags' (%d).", src.npolys);
-		return false;
-	}
-	memcpy(dst.flags, src.flags, sizeof(unsigned short)*src.npolys);
-	
-	return true;
-}
diff --git a/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp b/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
deleted file mode 100644
index 9a423cab8a..0000000000
--- a/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
+++ /dev/null
@@ -1,1464 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#include <float.h>
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include "Recast.h"
-#include "RecastAlloc.h"
-#include "RecastAssert.h"
-
-
-static const unsigned RC_UNSET_HEIGHT = 0xffff;
-
-struct rcHeightPatch
-{
-	inline rcHeightPatch() : data(0), xmin(0), ymin(0), width(0), height(0) {}
-	inline ~rcHeightPatch() { rcFree(data); }
-	unsigned short* data;
-	int xmin, ymin, width, height;
-};
-
-
-inline float vdot2(const float* a, const float* b)
-{
-	return a[0]*b[0] + a[2]*b[2];
-}
-
-inline float vdistSq2(const float* p, const float* q)
-{
-	const float dx = q[0] - p[0];
-	const float dy = q[2] - p[2];
-	return dx*dx + dy*dy;
-}
-
-inline float vdist2(const float* p, const float* q)
-{
-	return sqrtf(vdistSq2(p,q));
-}
-
-inline float vcross2(const float* p1, const float* p2, const float* p3)
-{
-	const float u1 = p2[0] - p1[0];
-	const float v1 = p2[2] - p1[2];
-	const float u2 = p3[0] - p1[0];
-	const float v2 = p3[2] - p1[2];
-	return u1 * v2 - v1 * u2;
-}
-
-static bool circumCircle(const float* p1, const float* p2, const float* p3,
-						 float* c, float& r)
-{
-	static const float EPS = 1e-6f;
-	// Calculate the circle relative to p1, to avoid some precision issues.
-	const float v1[3] = {0,0,0};
-	float v2[3], v3[3];
-	rcVsub(v2, p2,p1);
-	rcVsub(v3, p3,p1);
-	
-	const float cp = vcross2(v1, v2, v3);
-	if (fabsf(cp) > EPS)
-	{
-		const float v1Sq = vdot2(v1,v1);
-		const float v2Sq = vdot2(v2,v2);
-		const float v3Sq = vdot2(v3,v3);
-		c[0] = (v1Sq*(v2[2]-v3[2]) + v2Sq*(v3[2]-v1[2]) + v3Sq*(v1[2]-v2[2])) / (2*cp);
-		c[1] = 0;
-		c[2] = (v1Sq*(v3[0]-v2[0]) + v2Sq*(v1[0]-v3[0]) + v3Sq*(v2[0]-v1[0])) / (2*cp);
-		r = vdist2(c, v1);
-		rcVadd(c, c, p1);
-		return true;
-	}
-	
-	rcVcopy(c, p1);
-	r = 0;
-	return false;
-}
-
-static float distPtTri(const float* p, const float* a, const float* b, const float* c)
-{
-	float v0[3], v1[3], v2[3];
-	rcVsub(v0, c,a);
-	rcVsub(v1, b,a);
-	rcVsub(v2, p,a);
-	
-	const float dot00 = vdot2(v0, v0);
-	const float dot01 = vdot2(v0, v1);
-	const float dot02 = vdot2(v0, v2);
-	const float dot11 = vdot2(v1, v1);
-	const float dot12 = vdot2(v1, v2);
-	
-	// Compute barycentric coordinates
-	const float invDenom = 1.0f / (dot00 * dot11 - dot01 * dot01);
-	const float u = (dot11 * dot02 - dot01 * dot12) * invDenom;
-	float v = (dot00 * dot12 - dot01 * dot02) * invDenom;
-	
-	// If point lies inside the triangle, return interpolated y-coord.
-	static const float EPS = 1e-4f;
-	if (u >= -EPS && v >= -EPS && (u+v) <= 1+EPS)
-	{
-		const float y = a[1] + v0[1]*u + v1[1]*v;
-		return fabsf(y-p[1]);
-	}
-	return FLT_MAX;
-}
-
-static float distancePtSeg(const float* pt, const float* p, const float* q)
-{
-	float pqx = q[0] - p[0];
-	float pqy = q[1] - p[1];
-	float pqz = q[2] - p[2];
-	float dx = pt[0] - p[0];
-	float dy = pt[1] - p[1];
-	float dz = pt[2] - p[2];
-	float d = pqx*pqx + pqy*pqy + pqz*pqz;
-	float t = pqx*dx + pqy*dy + pqz*dz;
-	if (d > 0)
-		t /= d;
-	if (t < 0)
-		t = 0;
-	else if (t > 1)
-		t = 1;
-	
-	dx = p[0] + t*pqx - pt[0];
-	dy = p[1] + t*pqy - pt[1];
-	dz = p[2] + t*pqz - pt[2];
-	
-	return dx*dx + dy*dy + dz*dz;
-}
-
-static float distancePtSeg2d(const float* pt, const float* p, const float* q)
-{
-	float pqx = q[0] - p[0];
-	float pqz = q[2] - p[2];
-	float dx = pt[0] - p[0];
-	float dz = pt[2] - p[2];
-	float d = pqx*pqx + pqz*pqz;
-	float t = pqx*dx + pqz*dz;
-	if (d > 0)
-		t /= d;
-	if (t < 0)
-		t = 0;
-	else if (t > 1)
-		t = 1;
-	
-	dx = p[0] + t*pqx - pt[0];
-	dz = p[2] + t*pqz - pt[2];
-	
-	return dx*dx + dz*dz;
-}
-
-static float distToTriMesh(const float* p, const float* verts, const int /*nverts*/, const int* tris, const int ntris)
-{
-	float dmin = FLT_MAX;
-	for (int i = 0; i < ntris; ++i)
-	{
-		const float* va = &verts[tris[i*4+0]*3];
-		const float* vb = &verts[tris[i*4+1]*3];
-		const float* vc = &verts[tris[i*4+2]*3];
-		float d = distPtTri(p, va,vb,vc);
-		if (d < dmin)
-			dmin = d;
-	}
-	if (dmin == FLT_MAX) return -1;
-	return dmin;
-}
-
-static float distToPoly(int nvert, const float* verts, const float* p)
-{
-	
-	float dmin = FLT_MAX;
-	int i, j, c = 0;
-	for (i = 0, j = nvert-1; i < nvert; j = i++)
-	{
-		const float* vi = &verts[i*3];
-		const float* vj = &verts[j*3];
-		if (((vi[2] > p[2]) != (vj[2] > p[2])) &&
-			(p[0] < (vj[0]-vi[0]) * (p[2]-vi[2]) / (vj[2]-vi[2]) + vi[0]) )
-			c = !c;
-		dmin = rcMin(dmin, distancePtSeg2d(p, vj, vi));
-	}
-	return c ? -dmin : dmin;
-}
-
-
-static unsigned short getHeight(const float fx, const float fy, const float fz,
-								const float /*cs*/, const float ics, const float ch,
-								const int radius, const rcHeightPatch& hp)
-{
-	int ix = (int)floorf(fx*ics + 0.01f);
-	int iz = (int)floorf(fz*ics + 0.01f);
-	ix = rcClamp(ix-hp.xmin, 0, hp.width - 1);
-	iz = rcClamp(iz-hp.ymin, 0, hp.height - 1);
-	unsigned short h = hp.data[ix+iz*hp.width];
-	if (h == RC_UNSET_HEIGHT)
-	{
-		// Special case when data might be bad.
-		// Walk adjacent cells in a spiral up to 'radius', and look
-		// for a pixel which has a valid height.
-		int x = 1, z = 0, dx = 1, dz = 0;
-		int maxSize = radius * 2 + 1;
-		int maxIter = maxSize * maxSize - 1;
-
-		int nextRingIterStart = 8;
-		int nextRingIters = 16;
-
-		float dmin = FLT_MAX;
-		for (int i = 0; i < maxIter; i++)
-		{
-			const int nx = ix + x;
-			const int nz = iz + z;
-
-			if (nx >= 0 && nz >= 0 && nx < hp.width && nz < hp.height)
-			{
-				const unsigned short nh = hp.data[nx + nz*hp.width];
-				if (nh != RC_UNSET_HEIGHT)
-				{
-					const float d = fabsf(nh*ch - fy);
-					if (d < dmin)
-					{
-						h = nh;
-						dmin = d;
-					}
-				}
-			}
-
-			// We are searching in a grid which looks approximately like this:
-			//  __________
-			// |2 ______ 2|
-			// | |1 __ 1| |
-			// | | |__| | |
-			// | |______| |
-			// |__________|
-			// We want to find the best height as close to the center cell as possible. This means that
-			// if we find a height in one of the neighbor cells to the center, we don't want to
-			// expand further out than the 8 neighbors - we want to limit our search to the closest
-			// of these "rings", but the best height in the ring.
-			// For example, the center is just 1 cell. We checked that at the entrance to the function.
-			// The next "ring" contains 8 cells (marked 1 above). Those are all the neighbors to the center cell.
-			// The next one again contains 16 cells (marked 2). In general each ring has 8 additional cells, which
-			// can be thought of as adding 2 cells around the "center" of each side when we expand the ring.
-			// Here we detect if we are about to enter the next ring, and if we are and we have found
-			// a height, we abort the search.
-			if (i + 1 == nextRingIterStart)
-			{
-				if (h != RC_UNSET_HEIGHT)
-					break;
-
-				nextRingIterStart += nextRingIters;
-				nextRingIters += 8;
-			}
-
-			if ((x == z) || ((x < 0) && (x == -z)) || ((x > 0) && (x == 1 - z)))
-			{
-				int tmp = dx;
-				dx = -dz;
-				dz = tmp;
-			}
-			x += dx;
-			z += dz;
-		}
-	}
-	return h;
-}
-
-
-enum EdgeValues
-{
-	EV_UNDEF = -1,
-	EV_HULL = -2,
-};
-
-static int findEdge(const int* edges, int nedges, int s, int t)
-{
-	for (int i = 0; i < nedges; i++)
-	{
-		const int* e = &edges[i*4];
-		if ((e[0] == s && e[1] == t) || (e[0] == t && e[1] == s))
-			return i;
-	}
-	return EV_UNDEF;
-}
-
-static int addEdge(rcContext* ctx, int* edges, int& nedges, const int maxEdges, int s, int t, int l, int r)
-{
-	if (nedges >= maxEdges)
-	{
-		ctx->log(RC_LOG_ERROR, "addEdge: Too many edges (%d/%d).", nedges, maxEdges);
-		return EV_UNDEF;
-	}
-	
-	// Add edge if not already in the triangulation.
-	int e = findEdge(edges, nedges, s, t);
-	if (e == EV_UNDEF)
-	{
-		int* edge = &edges[nedges*4];
-		edge[0] = s;
-		edge[1] = t;
-		edge[2] = l;
-		edge[3] = r;
-		return nedges++;
-	}
-	else
-	{
-		return EV_UNDEF;
-	}
-}
-
-static void updateLeftFace(int* e, int s, int t, int f)
-{
-	if (e[0] == s && e[1] == t && e[2] == EV_UNDEF)
-		e[2] = f;
-	else if (e[1] == s && e[0] == t && e[3] == EV_UNDEF)
-		e[3] = f;
-}
-
-static int overlapSegSeg2d(const float* a, const float* b, const float* c, const float* d)
-{
-	const float a1 = vcross2(a, b, d);
-	const float a2 = vcross2(a, b, c);
-	if (a1*a2 < 0.0f)
-	{
-		float a3 = vcross2(c, d, a);
-		float a4 = a3 + a2 - a1;
-		if (a3 * a4 < 0.0f)
-			return 1;
-	}
-	return 0;
-}
-
-static bool overlapEdges(const float* pts, const int* edges, int nedges, int s1, int t1)
-{
-	for (int i = 0; i < nedges; ++i)
-	{
-		const int s0 = edges[i*4+0];
-		const int t0 = edges[i*4+1];
-		// Same or connected edges do not overlap.
-		if (s0 == s1 || s0 == t1 || t0 == s1 || t0 == t1)
-			continue;
-		if (overlapSegSeg2d(&pts[s0*3],&pts[t0*3], &pts[s1*3],&pts[t1*3]))
-			return true;
-	}
-	return false;
-}
-
-static void completeFacet(rcContext* ctx, const float* pts, int npts, int* edges, int& nedges, const int maxEdges, int& nfaces, int e)
-{
-	static const float EPS = 1e-5f;
-	
-	int* edge = &edges[e*4];
-	
-	// Cache s and t.
-	int s,t;
-	if (edge[2] == EV_UNDEF)
-	{
-		s = edge[0];
-		t = edge[1];
-	}
-	else if (edge[3] == EV_UNDEF)
-	{
-		s = edge[1];
-		t = edge[0];
-	}
-	else
-	{
-	    // Edge already completed.
-	    return;
-	}
-    
-	// Find best point on left of edge.
-	int pt = npts;
-	float c[3] = {0,0,0};
-	float r = -1;
-	for (int u = 0; u < npts; ++u)
-	{
-		if (u == s || u == t) continue;
-		if (vcross2(&pts[s*3], &pts[t*3], &pts[u*3]) > EPS)
-		{
-			if (r < 0)
-			{
-				// The circle is not updated yet, do it now.
-				pt = u;
-				circumCircle(&pts[s*3], &pts[t*3], &pts[u*3], c, r);
-				continue;
-			}
-			const float d = vdist2(c, &pts[u*3]);
-			const float tol = 0.001f;
-			if (d > r*(1+tol))
-			{
-				// Outside current circumcircle, skip.
-				continue;
-			}
-			else if (d < r*(1-tol))
-			{
-				// Inside safe circumcircle, update circle.
-				pt = u;
-				circumCircle(&pts[s*3], &pts[t*3], &pts[u*3], c, r);
-			}
-			else
-			{
-				// Inside epsilon circum circle, do extra tests to make sure the edge is valid.
-				// s-u and t-u cannot overlap with s-pt nor t-pt if they exists.
-				if (overlapEdges(pts, edges, nedges, s,u))
-					continue;
-				if (overlapEdges(pts, edges, nedges, t,u))
-					continue;
-				// Edge is valid.
-				pt = u;
-				circumCircle(&pts[s*3], &pts[t*3], &pts[u*3], c, r);
-			}
-		}
-	}
-	
-	// Add new triangle or update edge info if s-t is on hull.
-	if (pt < npts)
-	{
-		// Update face information of edge being completed.
-		updateLeftFace(&edges[e*4], s, t, nfaces);
-		
-		// Add new edge or update face info of old edge.
-		e = findEdge(edges, nedges, pt, s);
-		if (e == EV_UNDEF)
-		    addEdge(ctx, edges, nedges, maxEdges, pt, s, nfaces, EV_UNDEF);
-		else
-		    updateLeftFace(&edges[e*4], pt, s, nfaces);
-		
-		// Add new edge or update face info of old edge.
-		e = findEdge(edges, nedges, t, pt);
-		if (e == EV_UNDEF)
-		    addEdge(ctx, edges, nedges, maxEdges, t, pt, nfaces, EV_UNDEF);
-		else
-		    updateLeftFace(&edges[e*4], t, pt, nfaces);
-		
-		nfaces++;
-	}
-	else
-	{
-		updateLeftFace(&edges[e*4], s, t, EV_HULL);
-	}
-}
-
-static void delaunayHull(rcContext* ctx, const int npts, const float* pts,
-						 const int nhull, const int* hull,
-						 rcIntArray& tris, rcIntArray& edges)
-{
-	int nfaces = 0;
-	int nedges = 0;
-	const int maxEdges = npts*10;
-	edges.resize(maxEdges*4);
-	
-	for (int i = 0, j = nhull-1; i < nhull; j=i++)
-		addEdge(ctx, &edges[0], nedges, maxEdges, hull[j],hull[i], EV_HULL, EV_UNDEF);
-	
-	int currentEdge = 0;
-	while (currentEdge < nedges)
-	{
-		if (edges[currentEdge*4+2] == EV_UNDEF)
-			completeFacet(ctx, pts, npts, &edges[0], nedges, maxEdges, nfaces, currentEdge);
-		if (edges[currentEdge*4+3] == EV_UNDEF)
-			completeFacet(ctx, pts, npts, &edges[0], nedges, maxEdges, nfaces, currentEdge);
-		currentEdge++;
-	}
-	
-	// Create tris
-	tris.resize(nfaces*4);
-	for (int i = 0; i < nfaces*4; ++i)
-		tris[i] = -1;
-	
-	for (int i = 0; i < nedges; ++i)
-	{
-		const int* e = &edges[i*4];
-		if (e[3] >= 0)
-		{
-			// Left face
-			int* t = &tris[e[3]*4];
-			if (t[0] == -1)
-			{
-				t[0] = e[0];
-				t[1] = e[1];
-			}
-			else if (t[0] == e[1])
-				t[2] = e[0];
-			else if (t[1] == e[0])
-				t[2] = e[1];
-		}
-		if (e[2] >= 0)
-		{
-			// Right
-			int* t = &tris[e[2]*4];
-			if (t[0] == -1)
-			{
-				t[0] = e[1];
-				t[1] = e[0];
-			}
-			else if (t[0] == e[0])
-				t[2] = e[1];
-			else if (t[1] == e[1])
-				t[2] = e[0];
-		}
-	}
-	
-	for (int i = 0; i < tris.size()/4; ++i)
-	{
-		int* t = &tris[i*4];
-		if (t[0] == -1 || t[1] == -1 || t[2] == -1)
-		{
-			ctx->log(RC_LOG_WARNING, "delaunayHull: Removing dangling face %d [%d,%d,%d].", i, t[0],t[1],t[2]);
-			t[0] = tris[tris.size()-4];
-			t[1] = tris[tris.size()-3];
-			t[2] = tris[tris.size()-2];
-			t[3] = tris[tris.size()-1];
-			tris.resize(tris.size()-4);
-			--i;
-		}
-	}
-}
-
-// Calculate minimum extend of the polygon.
-static float polyMinExtent(const float* verts, const int nverts)
-{
-	float minDist = FLT_MAX;
-	for (int i = 0; i < nverts; i++)
-	{
-		const int ni = (i+1) % nverts;
-		const float* p1 = &verts[i*3];
-		const float* p2 = &verts[ni*3];
-		float maxEdgeDist = 0;
-		for (int j = 0; j < nverts; j++)
-		{
-			if (j == i || j == ni) continue;
-			float d = distancePtSeg2d(&verts[j*3], p1,p2);
-			maxEdgeDist = rcMax(maxEdgeDist, d);
-		}
-		minDist = rcMin(minDist, maxEdgeDist);
-	}
-	return rcSqrt(minDist);
-}
-
-// Last time I checked the if version got compiled using cmov, which was a lot faster than module (with idiv).
-inline int prev(int i, int n) { return i-1 >= 0 ? i-1 : n-1; }
-inline int next(int i, int n) { return i+1 < n ? i+1 : 0; }
-
-static void triangulateHull(const int /*nverts*/, const float* verts, const int nhull, const int* hull, const int nin, rcIntArray& tris)
-{
-	int start = 0, left = 1, right = nhull-1;
-	
-	// Start from an ear with shortest perimeter.
-	// This tends to favor well formed triangles as starting point.
-	float dmin = FLT_MAX;
-	for (int i = 0; i < nhull; i++)
-	{
-		if (hull[i] >= nin) continue; // Ears are triangles with original vertices as middle vertex while others are actually line segments on edges
-		int pi = prev(i, nhull);
-		int ni = next(i, nhull);
-		const float* pv = &verts[hull[pi]*3];
-		const float* cv = &verts[hull[i]*3];
-		const float* nv = &verts[hull[ni]*3];
-		const float d = vdist2(pv,cv) + vdist2(cv,nv) + vdist2(nv,pv);
-		if (d < dmin)
-		{
-			start = i;
-			left = ni;
-			right = pi;
-			dmin = d;
-		}
-	}
-	
-	// Add first triangle
-	tris.push(hull[start]);
-	tris.push(hull[left]);
-	tris.push(hull[right]);
-	tris.push(0);
-	
-	// Triangulate the polygon by moving left or right,
-	// depending on which triangle has shorter perimeter.
-	// This heuristic was chose emprically, since it seems
-	// handle tesselated straight edges well.
-	while (next(left, nhull) != right)
-	{
-		// Check to see if se should advance left or right.
-		int nleft = next(left, nhull);
-		int nright = prev(right, nhull);
-		
-		const float* cvleft = &verts[hull[left]*3];
-		const float* nvleft = &verts[hull[nleft]*3];
-		const float* cvright = &verts[hull[right]*3];
-		const float* nvright = &verts[hull[nright]*3];
-		const float dleft = vdist2(cvleft, nvleft) + vdist2(nvleft, cvright);
-		const float dright = vdist2(cvright, nvright) + vdist2(cvleft, nvright);
-		
-		if (dleft < dright)
-		{
-			tris.push(hull[left]);
-			tris.push(hull[nleft]);
-			tris.push(hull[right]);
-			tris.push(0);
-			left = nleft;
-		}
-		else
-		{
-			tris.push(hull[left]);
-			tris.push(hull[nright]);
-			tris.push(hull[right]);
-			tris.push(0);
-			right = nright;
-		}
-	}
-}
-
-
-inline float getJitterX(const int i)
-{
-	return (((i * 0x8da6b343) & 0xffff) / 65535.0f * 2.0f) - 1.0f;
-}
-
-inline float getJitterY(const int i)
-{
-	return (((i * 0xd8163841) & 0xffff) / 65535.0f * 2.0f) - 1.0f;
-}
-
-static bool buildPolyDetail(rcContext* ctx, const float* in, const int nin,
-							const float sampleDist, const float sampleMaxError,
-							const int heightSearchRadius, const rcCompactHeightfield& chf,
-							const rcHeightPatch& hp, float* verts, int& nverts,
-							rcIntArray& tris, rcIntArray& edges, rcIntArray& samples)
-{
-	static const int MAX_VERTS = 127;
-	static const int MAX_TRIS = 255;	// Max tris for delaunay is 2n-2-k (n=num verts, k=num hull verts).
-	static const int MAX_VERTS_PER_EDGE = 32;
-	float edge[(MAX_VERTS_PER_EDGE+1)*3];
-	int hull[MAX_VERTS];
-	int nhull = 0;
-	
-	nverts = nin;
-	
-	for (int i = 0; i < nin; ++i)
-		rcVcopy(&verts[i*3], &in[i*3]);
-	
-	edges.resize(0);
-	tris.resize(0);
-	
-	const float cs = chf.cs;
-	const float ics = 1.0f/cs;
-	
-	// Calculate minimum extents of the polygon based on input data.
-	float minExtent = polyMinExtent(verts, nverts);
-	
-	// Tessellate outlines.
-	// This is done in separate pass in order to ensure
-	// seamless height values across the ply boundaries.
-	if (sampleDist > 0)
-	{
-		for (int i = 0, j = nin-1; i < nin; j=i++)
-		{
-			const float* vj = &in[j*3];
-			const float* vi = &in[i*3];
-			bool swapped = false;
-			// Make sure the segments are always handled in same order
-			// using lexological sort or else there will be seams.
-			if (fabsf(vj[0]-vi[0]) < 1e-6f)
-			{
-				if (vj[2] > vi[2])
-				{
-					rcSwap(vj,vi);
-					swapped = true;
-				}
-			}
-			else
-			{
-				if (vj[0] > vi[0])
-				{
-					rcSwap(vj,vi);
-					swapped = true;
-				}
-			}
-			// Create samples along the edge.
-			float dx = vi[0] - vj[0];
-			float dy = vi[1] - vj[1];
-			float dz = vi[2] - vj[2];
-			float d = sqrtf(dx*dx + dz*dz);
-			int nn = 1 + (int)floorf(d/sampleDist);
-			if (nn >= MAX_VERTS_PER_EDGE) nn = MAX_VERTS_PER_EDGE-1;
-			if (nverts+nn >= MAX_VERTS)
-				nn = MAX_VERTS-1-nverts;
-			
-			for (int k = 0; k <= nn; ++k)
-			{
-				float u = (float)k/(float)nn;
-				float* pos = &edge[k*3];
-				pos[0] = vj[0] + dx*u;
-				pos[1] = vj[1] + dy*u;
-				pos[2] = vj[2] + dz*u;
-				pos[1] = getHeight(pos[0],pos[1],pos[2], cs, ics, chf.ch, heightSearchRadius, hp)*chf.ch;
-			}
-			// Simplify samples.
-			int idx[MAX_VERTS_PER_EDGE] = {0,nn};
-			int nidx = 2;
-			for (int k = 0; k < nidx-1; )
-			{
-				const int a = idx[k];
-				const int b = idx[k+1];
-				const float* va = &edge[a*3];
-				const float* vb = &edge[b*3];
-				// Find maximum deviation along the segment.
-				float maxd = 0;
-				int maxi = -1;
-				for (int m = a+1; m < b; ++m)
-				{
-					float dev = distancePtSeg(&edge[m*3],va,vb);
-					if (dev > maxd)
-					{
-						maxd = dev;
-						maxi = m;
-					}
-				}
-				// If the max deviation is larger than accepted error,
-				// add new point, else continue to next segment.
-				if (maxi != -1 && maxd > rcSqr(sampleMaxError))
-				{
-					for (int m = nidx; m > k; --m)
-						idx[m] = idx[m-1];
-					idx[k+1] = maxi;
-					nidx++;
-				}
-				else
-				{
-					++k;
-				}
-			}
-			
-			hull[nhull++] = j;
-			// Add new vertices.
-			if (swapped)
-			{
-				for (int k = nidx-2; k > 0; --k)
-				{
-					rcVcopy(&verts[nverts*3], &edge[idx[k]*3]);
-					hull[nhull++] = nverts;
-					nverts++;
-				}
-			}
-			else
-			{
-				for (int k = 1; k < nidx-1; ++k)
-				{
-					rcVcopy(&verts[nverts*3], &edge[idx[k]*3]);
-					hull[nhull++] = nverts;
-					nverts++;
-				}
-			}
-		}
-	}
-	
-	// If the polygon minimum extent is small (sliver or small triangle), do not try to add internal points.
-	if (minExtent < sampleDist*2)
-	{
-		triangulateHull(nverts, verts, nhull, hull, nin, tris);
-		return true;
-	}
-	
-	// Tessellate the base mesh.
-	// We're using the triangulateHull instead of delaunayHull as it tends to
-	// create a bit better triangulation for long thin triangles when there
-	// are no internal points.
-	triangulateHull(nverts, verts, nhull, hull, nin, tris);
-	
-	if (tris.size() == 0)
-	{
-		// Could not triangulate the poly, make sure there is some valid data there.
-		ctx->log(RC_LOG_WARNING, "buildPolyDetail: Could not triangulate polygon (%d verts).", nverts);
-		return true;
-	}
-	
-	if (sampleDist > 0)
-	{
-		// Create sample locations in a grid.
-		float bmin[3], bmax[3];
-		rcVcopy(bmin, in);
-		rcVcopy(bmax, in);
-		for (int i = 1; i < nin; ++i)
-		{
-			rcVmin(bmin, &in[i*3]);
-			rcVmax(bmax, &in[i*3]);
-		}
-		int x0 = (int)floorf(bmin[0]/sampleDist);
-		int x1 = (int)ceilf(bmax[0]/sampleDist);
-		int z0 = (int)floorf(bmin[2]/sampleDist);
-		int z1 = (int)ceilf(bmax[2]/sampleDist);
-		samples.resize(0);
-		for (int z = z0; z < z1; ++z)
-		{
-			for (int x = x0; x < x1; ++x)
-			{
-				float pt[3];
-				pt[0] = x*sampleDist;
-				pt[1] = (bmax[1]+bmin[1])*0.5f;
-				pt[2] = z*sampleDist;
-				// Make sure the samples are not too close to the edges.
-				if (distToPoly(nin,in,pt) > -sampleDist/2) continue;
-				samples.push(x);
-				samples.push(getHeight(pt[0], pt[1], pt[2], cs, ics, chf.ch, heightSearchRadius, hp));
-				samples.push(z);
-				samples.push(0); // Not added
-			}
-		}
-		
-		// Add the samples starting from the one that has the most
-		// error. The procedure stops when all samples are added
-		// or when the max error is within treshold.
-		const int nsamples = samples.size()/4;
-		for (int iter = 0; iter < nsamples; ++iter)
-		{
-			if (nverts >= MAX_VERTS)
-				break;
-			
-			// Find sample with most error.
-			float bestpt[3] = {0,0,0};
-			float bestd = 0;
-			int besti = -1;
-			for (int i = 0; i < nsamples; ++i)
-			{
-				const int* s = &samples[i*4];
-				if (s[3]) continue; // skip added.
-				float pt[3];
-				// The sample location is jittered to get rid of some bad triangulations
-				// which are cause by symmetrical data from the grid structure.
-				pt[0] = s[0]*sampleDist + getJitterX(i)*cs*0.1f;
-				pt[1] = s[1]*chf.ch;
-				pt[2] = s[2]*sampleDist + getJitterY(i)*cs*0.1f;
-				float d = distToTriMesh(pt, verts, nverts, &tris[0], tris.size()/4);
-				if (d < 0) continue; // did not hit the mesh.
-				if (d > bestd)
-				{
-					bestd = d;
-					besti = i;
-					rcVcopy(bestpt,pt);
-				}
-			}
-			// If the max error is within accepted threshold, stop tesselating.
-			if (bestd <= sampleMaxError || besti == -1)
-				break;
-			// Mark sample as added.
-			samples[besti*4+3] = 1;
-			// Add the new sample point.
-			rcVcopy(&verts[nverts*3],bestpt);
-			nverts++;
-			
-			// Create new triangulation.
-			// TODO: Incremental add instead of full rebuild.
-			edges.resize(0);
-			tris.resize(0);
-			delaunayHull(ctx, nverts, verts, nhull, hull, tris, edges);
-		}
-	}
-	
-	const int ntris = tris.size()/4;
-	if (ntris > MAX_TRIS)
-	{
-		tris.resize(MAX_TRIS*4);
-		ctx->log(RC_LOG_ERROR, "rcBuildPolyMeshDetail: Shrinking triangle count from %d to max %d.", ntris, MAX_TRIS);
-	}
-	
-	return true;
-}
-
-static void seedArrayWithPolyCenter(rcContext* ctx, const rcCompactHeightfield& chf,
-									const unsigned short* poly, const int npoly,
-									const unsigned short* verts, const int bs,
-									rcHeightPatch& hp, rcIntArray& array)
-{
-	// Note: Reads to the compact heightfield are offset by border size (bs)
-	// since border size offset is already removed from the polymesh vertices.
-	
-	static const int offset[9*2] =
-	{
-		0,0, -1,-1, 0,-1, 1,-1, 1,0, 1,1, 0,1, -1,1, -1,0,
-	};
-	
-	// Find cell closest to a poly vertex
-	int startCellX = 0, startCellY = 0, startSpanIndex = -1;
-	int dmin = RC_UNSET_HEIGHT;
-	for (int j = 0; j < npoly && dmin > 0; ++j)
-	{
-		for (int k = 0; k < 9 && dmin > 0; ++k)
-		{
-			const int ax = (int)verts[poly[j]*3+0] + offset[k*2+0];
-			const int ay = (int)verts[poly[j]*3+1];
-			const int az = (int)verts[poly[j]*3+2] + offset[k*2+1];
-			if (ax < hp.xmin || ax >= hp.xmin+hp.width ||
-				az < hp.ymin || az >= hp.ymin+hp.height)
-				continue;
-			
-			const rcCompactCell& c = chf.cells[(ax+bs)+(az+bs)*chf.width];
-			for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni && dmin > 0; ++i)
-			{
-				const rcCompactSpan& s = chf.spans[i];
-				int d = rcAbs(ay - (int)s.y);
-				if (d < dmin)
-				{
-					startCellX = ax;
-					startCellY = az;
-					startSpanIndex = i;
-					dmin = d;
-				}
-			}
-		}
-	}
-	
-	rcAssert(startSpanIndex != -1);
-	// Find center of the polygon
-	int pcx = 0, pcy = 0;
-	for (int j = 0; j < npoly; ++j)
-	{
-		pcx += (int)verts[poly[j]*3+0];
-		pcy += (int)verts[poly[j]*3+2];
-	}
-	pcx /= npoly;
-	pcy /= npoly;
-	
-	// Use seeds array as a stack for DFS
-	array.resize(0);
-	array.push(startCellX);
-	array.push(startCellY);
-	array.push(startSpanIndex);
-
-	int dirs[] = { 0, 1, 2, 3 };
-	memset(hp.data, 0, sizeof(unsigned short)*hp.width*hp.height);
-	// DFS to move to the center. Note that we need a DFS here and can not just move
-	// directly towards the center without recording intermediate nodes, even though the polygons
-	// are convex. In very rare we can get stuck due to contour simplification if we do not
-	// record nodes.
-	int cx = -1, cy = -1, ci = -1;
-	while (true)
-	{
-		if (array.size() < 3)
-		{
-			ctx->log(RC_LOG_WARNING, "Walk towards polygon center failed to reach center");
-			break;
-		}
-
-		ci = array.pop();
-		cy = array.pop();
-		cx = array.pop();
-
-		if (cx == pcx && cy == pcy)
-			break;
-
-		// If we are already at the correct X-position, prefer direction
-		// directly towards the center in the Y-axis; otherwise prefer
-		// direction in the X-axis
-		int directDir;
-		if (cx == pcx)
-			directDir = rcGetDirForOffset(0, pcy > cy ? 1 : -1);
-		else
-			directDir = rcGetDirForOffset(pcx > cx ? 1 : -1, 0);
-
-		// Push the direct dir last so we start with this on next iteration
-		rcSwap(dirs[directDir], dirs[3]);
-
-		const rcCompactSpan& cs = chf.spans[ci];
-		for (int i = 0; i < 4; i++)
-		{
-			int dir = dirs[i];
-			if (rcGetCon(cs, dir) == RC_NOT_CONNECTED)
-				continue;
-
-			int newX = cx + rcGetDirOffsetX(dir);
-			int newY = cy + rcGetDirOffsetY(dir);
-
-			int hpx = newX - hp.xmin;
-			int hpy = newY - hp.ymin;
-			if (hpx < 0 || hpx >= hp.width || hpy < 0 || hpy >= hp.height)
-				continue;
-
-			if (hp.data[hpx+hpy*hp.width] != 0)
-				continue;
-
-			hp.data[hpx+hpy*hp.width] = 1;
-			array.push(newX);
-			array.push(newY);
-			array.push((int)chf.cells[(newX+bs)+(newY+bs)*chf.width].index + rcGetCon(cs, dir));
-		}
-
-		rcSwap(dirs[directDir], dirs[3]);
-	}
-
-	array.resize(0);
-	// getHeightData seeds are given in coordinates with borders
-	array.push(cx+bs);
-	array.push(cy+bs);
-	array.push(ci);
-
-	memset(hp.data, 0xff, sizeof(unsigned short)*hp.width*hp.height);
-	const rcCompactSpan& cs = chf.spans[ci];
-	hp.data[cx-hp.xmin+(cy-hp.ymin)*hp.width] = cs.y;
-}
-
-
-static void push3(rcIntArray& queue, int v1, int v2, int v3)
-{
-	queue.resize(queue.size() + 3);
-	queue[queue.size() - 3] = v1;
-	queue[queue.size() - 2] = v2;
-	queue[queue.size() - 1] = v3;
-}
-
-static void getHeightData(rcContext* ctx, const rcCompactHeightfield& chf,
-						  const unsigned short* poly, const int npoly,
-						  const unsigned short* verts, const int bs,
-						  rcHeightPatch& hp, rcIntArray& queue,
-						  int region)
-{
-	// Note: Reads to the compact heightfield are offset by border size (bs)
-	// since border size offset is already removed from the polymesh vertices.
-	
-	queue.resize(0);
-	// Set all heights to RC_UNSET_HEIGHT.
-	memset(hp.data, 0xff, sizeof(unsigned short)*hp.width*hp.height);
-
-	bool empty = true;
-	
-	// We cannot sample from this poly if it was created from polys
-	// of different regions. If it was then it could potentially be overlapping
-	// with polys of that region and the heights sampled here could be wrong.
-	if (region != RC_MULTIPLE_REGS)
-	{
-		// Copy the height from the same region, and mark region borders
-		// as seed points to fill the rest.
-		for (int hy = 0; hy < hp.height; hy++)
-		{
-			int y = hp.ymin + hy + bs;
-			for (int hx = 0; hx < hp.width; hx++)
-			{
-				int x = hp.xmin + hx + bs;
-				const rcCompactCell& c = chf.cells[x + y*chf.width];
-				for (int i = (int)c.index, ni = (int)(c.index + c.count); i < ni; ++i)
-				{
-					const rcCompactSpan& s = chf.spans[i];
-					if (s.reg == region)
-					{
-						// Store height
-						hp.data[hx + hy*hp.width] = s.y;
-						empty = false;
-
-						// If any of the neighbours is not in same region,
-						// add the current location as flood fill start
-						bool border = false;
-						for (int dir = 0; dir < 4; ++dir)
-						{
-							if (rcGetCon(s, dir) != RC_NOT_CONNECTED)
-							{
-								const int ax = x + rcGetDirOffsetX(dir);
-								const int ay = y + rcGetDirOffsetY(dir);
-								const int ai = (int)chf.cells[ax + ay*chf.width].index + rcGetCon(s, dir);
-								const rcCompactSpan& as = chf.spans[ai];
-								if (as.reg != region)
-								{
-									border = true;
-									break;
-								}
-							}
-						}
-						if (border)
-							push3(queue, x, y, i);
-						break;
-					}
-				}
-			}
-		}
-	}
-	
-	// if the polygon does not contain any points from the current region (rare, but happens)
-	// or if it could potentially be overlapping polygons of the same region,
-	// then use the center as the seed point.
-	if (empty)
-		seedArrayWithPolyCenter(ctx, chf, poly, npoly, verts, bs, hp, queue);
-	
-	static const int RETRACT_SIZE = 256;
-	int head = 0;
-	
-	// We assume the seed is centered in the polygon, so a BFS to collect
-	// height data will ensure we do not move onto overlapping polygons and
-	// sample wrong heights.
-	while (head*3 < queue.size())
-	{
-		int cx = queue[head*3+0];
-		int cy = queue[head*3+1];
-		int ci = queue[head*3+2];
-		head++;
-		if (head >= RETRACT_SIZE)
-		{
-			head = 0;
-			if (queue.size() > RETRACT_SIZE*3)
-				memmove(&queue[0], &queue[RETRACT_SIZE*3], sizeof(int)*(queue.size()-RETRACT_SIZE*3));
-			queue.resize(queue.size()-RETRACT_SIZE*3);
-		}
-		
-		const rcCompactSpan& cs = chf.spans[ci];
-		for (int dir = 0; dir < 4; ++dir)
-		{
-			if (rcGetCon(cs, dir) == RC_NOT_CONNECTED) continue;
-			
-			const int ax = cx + rcGetDirOffsetX(dir);
-			const int ay = cy + rcGetDirOffsetY(dir);
-			const int hx = ax - hp.xmin - bs;
-			const int hy = ay - hp.ymin - bs;
-			
-			if ((unsigned int)hx >= (unsigned int)hp.width || (unsigned int)hy >= (unsigned int)hp.height)
-				continue;
-			
-			if (hp.data[hx + hy*hp.width] != RC_UNSET_HEIGHT)
-				continue;
-			
-			const int ai = (int)chf.cells[ax + ay*chf.width].index + rcGetCon(cs, dir);
-			const rcCompactSpan& as = chf.spans[ai];
-			
-			hp.data[hx + hy*hp.width] = as.y;
-			
-			push3(queue, ax, ay, ai);
-		}
-	}
-}
-
-static unsigned char getEdgeFlags(const float* va, const float* vb,
-								  const float* vpoly, const int npoly)
-{
-	// The flag returned by this function matches dtDetailTriEdgeFlags in Detour.
-	// Figure out if edge (va,vb) is part of the polygon boundary.
-	static const float thrSqr = rcSqr(0.001f);
-	for (int i = 0, j = npoly-1; i < npoly; j=i++)
-	{
-		if (distancePtSeg2d(va, &vpoly[j*3], &vpoly[i*3]) < thrSqr &&
-			distancePtSeg2d(vb, &vpoly[j*3], &vpoly[i*3]) < thrSqr)
-			return 1;
-	}
-	return 0;
-}
-
-static unsigned char getTriFlags(const float* va, const float* vb, const float* vc,
-								 const float* vpoly, const int npoly)
-{
-	unsigned char flags = 0;
-	flags |= getEdgeFlags(va,vb,vpoly,npoly) << 0;
-	flags |= getEdgeFlags(vb,vc,vpoly,npoly) << 2;
-	flags |= getEdgeFlags(vc,va,vpoly,npoly) << 4;
-	return flags;
-}
-
-/// @par
-///
-/// See the #rcConfig documentation for more information on the configuration parameters.
-///
-/// @see rcAllocPolyMeshDetail, rcPolyMesh, rcCompactHeightfield, rcPolyMeshDetail, rcConfig
-bool rcBuildPolyMeshDetail(rcContext* ctx, const rcPolyMesh& mesh, const rcCompactHeightfield& chf,
-						   const float sampleDist, const float sampleMaxError,
-						   rcPolyMeshDetail& dmesh)
-{
-	rcAssert(ctx);
-	
-	rcScopedTimer timer(ctx, RC_TIMER_BUILD_POLYMESHDETAIL);
-	
-	if (mesh.nverts == 0 || mesh.npolys == 0)
-		return true;
-	
-	const int nvp = mesh.nvp;
-	const float cs = mesh.cs;
-	const float ch = mesh.ch;
-	const float* orig = mesh.bmin;
-	const int borderSize = mesh.borderSize;
-	const int heightSearchRadius = rcMax(1, (int)ceilf(mesh.maxEdgeError));
-	
-	rcIntArray edges(64);
-	rcIntArray tris(512);
-	rcIntArray arr(512);
-	rcIntArray samples(512);
-	float verts[256*3];
-	rcHeightPatch hp;
-	int nPolyVerts = 0;
-	int maxhw = 0, maxhh = 0;
-	
-	rcScopedDelete<int> bounds((int*)rcAlloc(sizeof(int)*mesh.npolys*4, RC_ALLOC_TEMP));
-	if (!bounds)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildPolyMeshDetail: Out of memory 'bounds' (%d).", mesh.npolys*4);
-		return false;
-	}
-	rcScopedDelete<float> poly((float*)rcAlloc(sizeof(float)*nvp*3, RC_ALLOC_TEMP));
-	if (!poly)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildPolyMeshDetail: Out of memory 'poly' (%d).", nvp*3);
-		return false;
-	}
-	
-	// Find max size for a polygon area.
-	for (int i = 0; i < mesh.npolys; ++i)
-	{
-		const unsigned short* p = &mesh.polys[i*nvp*2];
-		int& xmin = bounds[i*4+0];
-		int& xmax = bounds[i*4+1];
-		int& ymin = bounds[i*4+2];
-		int& ymax = bounds[i*4+3];
-		xmin = chf.width;
-		xmax = 0;
-		ymin = chf.height;
-		ymax = 0;
-		for (int j = 0; j < nvp; ++j)
-		{
-			if(p[j] == RC_MESH_NULL_IDX) break;
-			const unsigned short* v = &mesh.verts[p[j]*3];
-			xmin = rcMin(xmin, (int)v[0]);
-			xmax = rcMax(xmax, (int)v[0]);
-			ymin = rcMin(ymin, (int)v[2]);
-			ymax = rcMax(ymax, (int)v[2]);
-			nPolyVerts++;
-		}
-		xmin = rcMax(0,xmin-1);
-		xmax = rcMin(chf.width,xmax+1);
-		ymin = rcMax(0,ymin-1);
-		ymax = rcMin(chf.height,ymax+1);
-		if (xmin >= xmax || ymin >= ymax) continue;
-		maxhw = rcMax(maxhw, xmax-xmin);
-		maxhh = rcMax(maxhh, ymax-ymin);
-	}
-	
-	hp.data = (unsigned short*)rcAlloc(sizeof(unsigned short)*maxhw*maxhh, RC_ALLOC_TEMP);
-	if (!hp.data)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildPolyMeshDetail: Out of memory 'hp.data' (%d).", maxhw*maxhh);
-		return false;
-	}
-	
-	dmesh.nmeshes = mesh.npolys;
-	dmesh.nverts = 0;
-	dmesh.ntris = 0;
-	dmesh.meshes = (unsigned int*)rcAlloc(sizeof(unsigned int)*dmesh.nmeshes*4, RC_ALLOC_PERM);
-	if (!dmesh.meshes)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildPolyMeshDetail: Out of memory 'dmesh.meshes' (%d).", dmesh.nmeshes*4);
-		return false;
-	}
-	
-	int vcap = nPolyVerts+nPolyVerts/2;
-	int tcap = vcap*2;
-	
-	dmesh.nverts = 0;
-	dmesh.verts = (float*)rcAlloc(sizeof(float)*vcap*3, RC_ALLOC_PERM);
-	if (!dmesh.verts)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildPolyMeshDetail: Out of memory 'dmesh.verts' (%d).", vcap*3);
-		return false;
-	}
-	dmesh.ntris = 0;
-	dmesh.tris = (unsigned char*)rcAlloc(sizeof(unsigned char)*tcap*4, RC_ALLOC_PERM);
-	if (!dmesh.tris)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildPolyMeshDetail: Out of memory 'dmesh.tris' (%d).", tcap*4);
-		return false;
-	}
-	
-	for (int i = 0; i < mesh.npolys; ++i)
-	{
-		const unsigned short* p = &mesh.polys[i*nvp*2];
-		
-		// Store polygon vertices for processing.
-		int npoly = 0;
-		for (int j = 0; j < nvp; ++j)
-		{
-			if(p[j] == RC_MESH_NULL_IDX) break;
-			const unsigned short* v = &mesh.verts[p[j]*3];
-			poly[j*3+0] = v[0]*cs;
-			poly[j*3+1] = v[1]*ch;
-			poly[j*3+2] = v[2]*cs;
-			npoly++;
-		}
-		
-		// Get the height data from the area of the polygon.
-		hp.xmin = bounds[i*4+0];
-		hp.ymin = bounds[i*4+2];
-		hp.width = bounds[i*4+1]-bounds[i*4+0];
-		hp.height = bounds[i*4+3]-bounds[i*4+2];
-		getHeightData(ctx, chf, p, npoly, mesh.verts, borderSize, hp, arr, mesh.regs[i]);
-		
-		// Build detail mesh.
-		int nverts = 0;
-		if (!buildPolyDetail(ctx, poly, npoly,
-							 sampleDist, sampleMaxError,
-							 heightSearchRadius, chf, hp,
-							 verts, nverts, tris,
-							 edges, samples))
-		{
-			return false;
-		}
-		
-		// Move detail verts to world space.
-		for (int j = 0; j < nverts; ++j)
-		{
-			verts[j*3+0] += orig[0];
-			verts[j*3+1] += orig[1] + chf.ch; // Is this offset necessary?
-			verts[j*3+2] += orig[2];
-		}
-		// Offset poly too, will be used to flag checking.
-		for (int j = 0; j < npoly; ++j)
-		{
-			poly[j*3+0] += orig[0];
-			poly[j*3+1] += orig[1];
-			poly[j*3+2] += orig[2];
-		}
-		
-		// Store detail submesh.
-		const int ntris = tris.size()/4;
-		
-		dmesh.meshes[i*4+0] = (unsigned int)dmesh.nverts;
-		dmesh.meshes[i*4+1] = (unsigned int)nverts;
-		dmesh.meshes[i*4+2] = (unsigned int)dmesh.ntris;
-		dmesh.meshes[i*4+3] = (unsigned int)ntris;
-		
-		// Store vertices, allocate more memory if necessary.
-		if (dmesh.nverts+nverts > vcap)
-		{
-			while (dmesh.nverts+nverts > vcap)
-				vcap += 256;
-			
-			float* newv = (float*)rcAlloc(sizeof(float)*vcap*3, RC_ALLOC_PERM);
-			if (!newv)
-			{
-				ctx->log(RC_LOG_ERROR, "rcBuildPolyMeshDetail: Out of memory 'newv' (%d).", vcap*3);
-				return false;
-			}
-			if (dmesh.nverts)
-				memcpy(newv, dmesh.verts, sizeof(float)*3*dmesh.nverts);
-			rcFree(dmesh.verts);
-			dmesh.verts = newv;
-		}
-		for (int j = 0; j < nverts; ++j)
-		{
-			dmesh.verts[dmesh.nverts*3+0] = verts[j*3+0];
-			dmesh.verts[dmesh.nverts*3+1] = verts[j*3+1];
-			dmesh.verts[dmesh.nverts*3+2] = verts[j*3+2];
-			dmesh.nverts++;
-		}
-		
-		// Store triangles, allocate more memory if necessary.
-		if (dmesh.ntris+ntris > tcap)
-		{
-			while (dmesh.ntris+ntris > tcap)
-				tcap += 256;
-			unsigned char* newt = (unsigned char*)rcAlloc(sizeof(unsigned char)*tcap*4, RC_ALLOC_PERM);
-			if (!newt)
-			{
-				ctx->log(RC_LOG_ERROR, "rcBuildPolyMeshDetail: Out of memory 'newt' (%d).", tcap*4);
-				return false;
-			}
-			if (dmesh.ntris)
-				memcpy(newt, dmesh.tris, sizeof(unsigned char)*4*dmesh.ntris);
-			rcFree(dmesh.tris);
-			dmesh.tris = newt;
-		}
-		for (int j = 0; j < ntris; ++j)
-		{
-			const int* t = &tris[j*4];
-			dmesh.tris[dmesh.ntris*4+0] = (unsigned char)t[0];
-			dmesh.tris[dmesh.ntris*4+1] = (unsigned char)t[1];
-			dmesh.tris[dmesh.ntris*4+2] = (unsigned char)t[2];
-			dmesh.tris[dmesh.ntris*4+3] = getTriFlags(&verts[t[0]*3], &verts[t[1]*3], &verts[t[2]*3], poly, npoly);
-			dmesh.ntris++;
-		}
-	}
-	
-	return true;
-}
-
-/// @see rcAllocPolyMeshDetail, rcPolyMeshDetail
-bool rcMergePolyMeshDetails(rcContext* ctx, rcPolyMeshDetail** meshes, const int nmeshes, rcPolyMeshDetail& mesh)
-{
-	rcAssert(ctx);
-	
-	rcScopedTimer timer(ctx, RC_TIMER_MERGE_POLYMESHDETAIL);
-	
-	int maxVerts = 0;
-	int maxTris = 0;
-	int maxMeshes = 0;
-	
-	for (int i = 0; i < nmeshes; ++i)
-	{
-		if (!meshes[i]) continue;
-		maxVerts += meshes[i]->nverts;
-		maxTris += meshes[i]->ntris;
-		maxMeshes += meshes[i]->nmeshes;
-	}
-	
-	mesh.nmeshes = 0;
-	mesh.meshes = (unsigned int*)rcAlloc(sizeof(unsigned int)*maxMeshes*4, RC_ALLOC_PERM);
-	if (!mesh.meshes)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildPolyMeshDetail: Out of memory 'pmdtl.meshes' (%d).", maxMeshes*4);
-		return false;
-	}
-	
-	mesh.ntris = 0;
-	mesh.tris = (unsigned char*)rcAlloc(sizeof(unsigned char)*maxTris*4, RC_ALLOC_PERM);
-	if (!mesh.tris)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildPolyMeshDetail: Out of memory 'dmesh.tris' (%d).", maxTris*4);
-		return false;
-	}
-	
-	mesh.nverts = 0;
-	mesh.verts = (float*)rcAlloc(sizeof(float)*maxVerts*3, RC_ALLOC_PERM);
-	if (!mesh.verts)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildPolyMeshDetail: Out of memory 'dmesh.verts' (%d).", maxVerts*3);
-		return false;
-	}
-	
-	// Merge datas.
-	for (int i = 0; i < nmeshes; ++i)
-	{
-		rcPolyMeshDetail* dm = meshes[i];
-		if (!dm) continue;
-		for (int j = 0; j < dm->nmeshes; ++j)
-		{
-			unsigned int* dst = &mesh.meshes[mesh.nmeshes*4];
-			unsigned int* src = &dm->meshes[j*4];
-			dst[0] = (unsigned int)mesh.nverts+src[0];
-			dst[1] = src[1];
-			dst[2] = (unsigned int)mesh.ntris+src[2];
-			dst[3] = src[3];
-			mesh.nmeshes++;
-		}
-		
-		for (int k = 0; k < dm->nverts; ++k)
-		{
-			rcVcopy(&mesh.verts[mesh.nverts*3], &dm->verts[k*3]);
-			mesh.nverts++;
-		}
-		for (int k = 0; k < dm->ntris; ++k)
-		{
-			mesh.tris[mesh.ntris*4+0] = dm->tris[k*4+0];
-			mesh.tris[mesh.ntris*4+1] = dm->tris[k*4+1];
-			mesh.tris[mesh.ntris*4+2] = dm->tris[k*4+2];
-			mesh.tris[mesh.ntris*4+3] = dm->tris[k*4+3];
-			mesh.ntris++;
-		}
-	}
-	
-	return true;
-}
diff --git a/extern/recastnavigation/Recast/Source/RecastRasterization.cpp b/extern/recastnavigation/Recast/Source/RecastRasterization.cpp
deleted file mode 100644
index a4cef74909..0000000000
--- a/extern/recastnavigation/Recast/Source/RecastRasterization.cpp
+++ /dev/null
@@ -1,454 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include <stdio.h>
-#include "Recast.h"
-#include "RecastAlloc.h"
-#include "RecastAssert.h"
-
-inline bool overlapBounds(const float* amin, const float* amax, const float* bmin, const float* bmax)
-{
-	bool overlap = true;
-	overlap = (amin[0] > bmax[0] || amax[0] < bmin[0]) ? false : overlap;
-	overlap = (amin[1] > bmax[1] || amax[1] < bmin[1]) ? false : overlap;
-	overlap = (amin[2] > bmax[2] || amax[2] < bmin[2]) ? false : overlap;
-	return overlap;
-}
-
-inline bool overlapInterval(unsigned short amin, unsigned short amax,
-							unsigned short bmin, unsigned short bmax)
-{
-	if (amax < bmin) return false;
-	if (amin > bmax) return false;
-	return true;
-}
-
-
-static rcSpan* allocSpan(rcHeightfield& hf)
-{
-	// If running out of memory, allocate new page and update the freelist.
-	if (!hf.freelist || !hf.freelist->next)
-	{
-		// Create new page.
-		// Allocate memory for the new pool.
-		rcSpanPool* pool = (rcSpanPool*)rcAlloc(sizeof(rcSpanPool), RC_ALLOC_PERM);
-		if (!pool) return 0;
-
-		// Add the pool into the list of pools.
-		pool->next = hf.pools;
-		hf.pools = pool;
-		// Add new items to the free list.
-		rcSpan* freelist = hf.freelist;
-		rcSpan* head = &pool->items[0];
-		rcSpan* it = &pool->items[RC_SPANS_PER_POOL];
-		do
-		{
-			--it;
-			it->next = freelist;
-			freelist = it;
-		}
-		while (it != head);
-		hf.freelist = it;
-	}
-	
-	// Pop item from in front of the free list.
-	rcSpan* it = hf.freelist;
-	hf.freelist = hf.freelist->next;
-	return it;
-}
-
-static void freeSpan(rcHeightfield& hf, rcSpan* ptr)
-{
-	if (!ptr) return;
-	// Add the node in front of the free list.
-	ptr->next = hf.freelist;
-	hf.freelist = ptr;
-}
-
-static bool addSpan(rcHeightfield& hf, const int x, const int y,
-					const unsigned short smin, const unsigned short smax,
-					const unsigned char area, const int flagMergeThr)
-{
-	
-	int idx = x + y*hf.width;
-	
-	rcSpan* s = allocSpan(hf);
-	if (!s)
-		return false;
-	s->smin = smin;
-	s->smax = smax;
-	s->area = area;
-	s->next = 0;
-	
-	// Empty cell, add the first span.
-	if (!hf.spans[idx])
-	{
-		hf.spans[idx] = s;
-		return true;
-	}
-	rcSpan* prev = 0;
-	rcSpan* cur = hf.spans[idx];
-	
-	// Insert and merge spans.
-	while (cur)
-	{
-		if (cur->smin > s->smax)
-		{
-			// Current span is further than the new span, break.
-			break;
-		}
-		else if (cur->smax < s->smin)
-		{
-			// Current span is before the new span advance.
-			prev = cur;
-			cur = cur->next;
-		}
-		else
-		{
-			// Merge spans.
-			if (cur->smin < s->smin)
-				s->smin = cur->smin;
-			if (cur->smax > s->smax)
-				s->smax = cur->smax;
-			
-			// Merge flags.
-			if (rcAbs((int)s->smax - (int)cur->smax) <= flagMergeThr)
-				s->area = rcMax(s->area, cur->area);
-			
-			// Remove current span.
-			rcSpan* next = cur->next;
-			freeSpan(hf, cur);
-			if (prev)
-				prev->next = next;
-			else
-				hf.spans[idx] = next;
-			cur = next;
-		}
-	}
-	
-	// Insert new span.
-	if (prev)
-	{
-		s->next = prev->next;
-		prev->next = s;
-	}
-	else
-	{
-		s->next = hf.spans[idx];
-		hf.spans[idx] = s;
-	}
-
-	return true;
-}
-
-/// @par
-///
-/// The span addition can be set to favor flags. If the span is merged to
-/// another span and the new @p smax is within @p flagMergeThr units
-/// from the existing span, the span flags are merged.
-///
-/// @see rcHeightfield, rcSpan.
-bool rcAddSpan(rcContext* ctx, rcHeightfield& hf, const int x, const int y,
-			   const unsigned short smin, const unsigned short smax,
-			   const unsigned char area, const int flagMergeThr)
-{
-	rcAssert(ctx);
-
-	if (!addSpan(hf, x, y, smin, smax, area, flagMergeThr))
-	{
-		ctx->log(RC_LOG_ERROR, "rcAddSpan: Out of memory.");
-		return false;
-	}
-
-	return true;
-}
-
-// divides a convex polygons into two convex polygons on both sides of a line
-static void dividePoly(const float* in, int nin,
-					  float* out1, int* nout1,
-					  float* out2, int* nout2,
-					  float x, int axis)
-{
-	float d[12];
-	for (int i = 0; i < nin; ++i)
-		d[i] = x - in[i*3+axis];
-
-	int m = 0, n = 0;
-	for (int i = 0, j = nin-1; i < nin; j=i, ++i)
-	{
-		bool ina = d[j] >= 0;
-		bool inb = d[i] >= 0;
-		if (ina != inb)
-		{
-			float s = d[j] / (d[j] - d[i]);
-			out1[m*3+0] = in[j*3+0] + (in[i*3+0] - in[j*3+0])*s;
-			out1[m*3+1] = in[j*3+1] + (in[i*3+1] - in[j*3+1])*s;
-			out1[m*3+2] = in[j*3+2] + (in[i*3+2] - in[j*3+2])*s;
-			rcVcopy(out2 + n*3, out1 + m*3);
-			m++;
-			n++;
-			// add the i'th point to the right polygon. Do NOT add points that are on the dividing line
-			// since these were already added above
-			if (d[i] > 0)
-			{
-				rcVcopy(out1 + m*3, in + i*3);
-				m++;
-			}
-			else if (d[i] < 0)
-			{
-				rcVcopy(out2 + n*3, in + i*3);
-				n++;
-			}
-		}
-		else // same side
-		{
-			// add the i'th point to the right polygon. Addition is done even for points on the dividing line
-			if (d[i] >= 0)
-			{
-				rcVcopy(out1 + m*3, in + i*3);
-				m++;
-				if (d[i] != 0)
-					continue;
-			}
-			rcVcopy(out2 + n*3, in + i*3);
-			n++;
-		}
-	}
-
-	*nout1 = m;
-	*nout2 = n;
-}
-
-
-
-static bool rasterizeTri(const float* v0, const float* v1, const float* v2,
-						 const unsigned char area, rcHeightfield& hf,
-						 const float* bmin, const float* bmax,
-						 const float cs, const float ics, const float ich,
-						 const int flagMergeThr)
-{
-	const int w = hf.width;
-	const int h = hf.height;
-	float tmin[3], tmax[3];
-	const float by = bmax[1] - bmin[1];
-	
-	// Calculate the bounding box of the triangle.
-	rcVcopy(tmin, v0);
-	rcVcopy(tmax, v0);
-	rcVmin(tmin, v1);
-	rcVmin(tmin, v2);
-	rcVmax(tmax, v1);
-	rcVmax(tmax, v2);
-	
-	// If the triangle does not touch the bbox of the heightfield, skip the triagle.
-	if (!overlapBounds(bmin, bmax, tmin, tmax))
-		return true;
-	
-	// Calculate the footprint of the triangle on the grid's y-axis
-	int y0 = (int)((tmin[2] - bmin[2])*ics);
-	int y1 = (int)((tmax[2] - bmin[2])*ics);
-	y0 = rcClamp(y0, 0, h-1);
-	y1 = rcClamp(y1, 0, h-1);
-	
-	// Clip the triangle into all grid cells it touches.
-	float buf[7*3*4];
-	float *in = buf, *inrow = buf+7*3, *p1 = inrow+7*3, *p2 = p1+7*3;
-
-	rcVcopy(&in[0], v0);
-	rcVcopy(&in[1*3], v1);
-	rcVcopy(&in[2*3], v2);
-	int nvrow, nvIn = 3;
-	
-	for (int y = y0; y <= y1; ++y)
-	{
-		// Clip polygon to row. Store the remaining polygon as well
-		const float cz = bmin[2] + y*cs;
-		dividePoly(in, nvIn, inrow, &nvrow, p1, &nvIn, cz+cs, 2);
-		rcSwap(in, p1);
-		if (nvrow < 3) continue;
-		
-		// find the horizontal bounds in the row
-		float minX = inrow[0], maxX = inrow[0];
-		for (int i=1; i<nvrow; ++i)
-		{
-			if (minX > inrow[i*3])	minX = inrow[i*3];
-			if (maxX < inrow[i*3])	maxX = inrow[i*3];
-		}
-		int x0 = (int)((minX - bmin[0])*ics);
-		int x1 = (int)((maxX - bmin[0])*ics);
-		x0 = rcClamp(x0, 0, w-1);
-		x1 = rcClamp(x1, 0, w-1);
-
-		int nv, nv2 = nvrow;
-
-		for (int x = x0; x <= x1; ++x)
-		{
-			// Clip polygon to column. store the remaining polygon as well
-			const float cx = bmin[0] + x*cs;
-			dividePoly(inrow, nv2, p1, &nv, p2, &nv2, cx+cs, 0);
-			rcSwap(inrow, p2);
-			if (nv < 3) continue;
-			
-			// Calculate min and max of the span.
-			float smin = p1[1], smax = p1[1];
-			for (int i = 1; i < nv; ++i)
-			{
-				smin = rcMin(smin, p1[i*3+1]);
-				smax = rcMax(smax, p1[i*3+1]);
-			}
-			smin -= bmin[1];
-			smax -= bmin[1];
-			// Skip the span if it is outside the heightfield bbox
-			if (smax < 0.0f) continue;
-			if (smin > by) continue;
-			// Clamp the span to the heightfield bbox.
-			if (smin < 0.0f) smin = 0;
-			if (smax > by) smax = by;
-			
-			// Snap the span to the heightfield height grid.
-			unsigned short ismin = (unsigned short)rcClamp((int)floorf(smin * ich), 0, RC_SPAN_MAX_HEIGHT);
-			unsigned short ismax = (unsigned short)rcClamp((int)ceilf(smax * ich), (int)ismin+1, RC_SPAN_MAX_HEIGHT);
-			
-			if (!addSpan(hf, x, y, ismin, ismax, area, flagMergeThr))
-				return false;
-		}
-	}
-
-	return true;
-}
-
-/// @par
-///
-/// No spans will be added if the triangle does not overlap the heightfield grid.
-///
-/// @see rcHeightfield
-bool rcRasterizeTriangle(rcContext* ctx, const float* v0, const float* v1, const float* v2,
-						 const unsigned char area, rcHeightfield& solid,
-						 const int flagMergeThr)
-{
-	rcAssert(ctx);
-
-	rcScopedTimer timer(ctx, RC_TIMER_RASTERIZE_TRIANGLES);
-
-	const float ics = 1.0f/solid.cs;
-	const float ich = 1.0f/solid.ch;
-	if (!rasterizeTri(v0, v1, v2, area, solid, solid.bmin, solid.bmax, solid.cs, ics, ich, flagMergeThr))
-	{
-		ctx->log(RC_LOG_ERROR, "rcRasterizeTriangle: Out of memory.");
-		return false;
-	}
-
-	return true;
-}
-
-/// @par
-///
-/// Spans will only be added for triangles that overlap the heightfield grid.
-///
-/// @see rcHeightfield
-bool rcRasterizeTriangles(rcContext* ctx, const float* verts, const int /*nv*/,
-						  const int* tris, const unsigned char* areas, const int nt,
-						  rcHeightfield& solid, const int flagMergeThr)
-{
-	rcAssert(ctx);
-
-	rcScopedTimer timer(ctx, RC_TIMER_RASTERIZE_TRIANGLES);
-	
-	const float ics = 1.0f/solid.cs;
-	const float ich = 1.0f/solid.ch;
-	// Rasterize triangles.
-	for (int i = 0; i < nt; ++i)
-	{
-		const float* v0 = &verts[tris[i*3+0]*3];
-		const float* v1 = &verts[tris[i*3+1]*3];
-		const float* v2 = &verts[tris[i*3+2]*3];
-		// Rasterize.
-		if (!rasterizeTri(v0, v1, v2, areas[i], solid, solid.bmin, solid.bmax, solid.cs, ics, ich, flagMergeThr))
-		{
-			ctx->log(RC_LOG_ERROR, "rcRasterizeTriangles: Out of memory.");
-			return false;
-		}
-	}
-
-	return true;
-}
-
-/// @par
-///
-/// Spans will only be added for triangles that overlap the heightfield grid.
-///
-/// @see rcHeightfield
-bool rcRasterizeTriangles(rcContext* ctx, const float* verts, const int /*nv*/,
-						  const unsigned short* tris, const unsigned char* areas, const int nt,
-						  rcHeightfield& solid, const int flagMergeThr)
-{
-	rcAssert(ctx);
-
-	rcScopedTimer timer(ctx, RC_TIMER_RASTERIZE_TRIANGLES);
-	
-	const float ics = 1.0f/solid.cs;
-	const float ich = 1.0f/solid.ch;
-	// Rasterize triangles.
-	for (int i = 0; i < nt; ++i)
-	{
-		const float* v0 = &verts[tris[i*3+0]*3];
-		const float* v1 = &verts[tris[i*3+1]*3];
-		const float* v2 = &verts[tris[i*3+2]*3];
-		// Rasterize.
-		if (!rasterizeTri(v0, v1, v2, areas[i], solid, solid.bmin, solid.bmax, solid.cs, ics, ich, flagMergeThr))
-		{
-			ctx->log(RC_LOG_ERROR, "rcRasterizeTriangles: Out of memory.");
-			return false;
-		}
-	}
-
-	return true;
-}
-
-/// @par
-///
-/// Spans will only be added for triangles that overlap the heightfield grid.
-///
-/// @see rcHeightfield
-bool rcRasterizeTriangles(rcContext* ctx, const float* verts, const unsigned char* areas, const int nt,
-						  rcHeightfield& solid, const int flagMergeThr)
-{
-	rcAssert(ctx);
-	
-	rcScopedTimer timer(ctx, RC_TIMER_RASTERIZE_TRIANGLES);
-	
-	const float ics = 1.0f/solid.cs;
-	const float ich = 1.0f/solid.ch;
-	// Rasterize triangles.
-	for (int i = 0; i < nt; ++i)
-	{
-		const float* v0 = &verts[(i*3+0)*3];
-		const float* v1 = &verts[(i*3+1)*3];
-		const float* v2 = &verts[(i*3+2)*3];
-		// Rasterize.
-		if (!rasterizeTri(v0, v1, v2, areas[i], solid, solid.bmin, solid.bmax, solid.cs, ics, ich, flagMergeThr))
-		{
-			ctx->log(RC_LOG_ERROR, "rcRasterizeTriangles: Out of memory.");
-			return false;
-		}
-	}
-
-	return true;
-}
diff --git a/extern/recastnavigation/Recast/Source/RecastRegion.cpp b/extern/recastnavigation/Recast/Source/RecastRegion.cpp
deleted file mode 100644
index e1fc0ee788..0000000000
--- a/extern/recastnavigation/Recast/Source/RecastRegion.cpp
+++ /dev/null
@@ -1,1812 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#include <float.h>
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include "Recast.h"
-#include "RecastAlloc.h"
-#include "RecastAssert.h"
-
-namespace
-{
-struct LevelStackEntry
-{
-	LevelStackEntry(int x_, int y_, int index_) : x(x_), y(y_), index(index_) {}
-	int x;
-	int y;
-	int index;
-};
-}  // namespace
-
-static void calculateDistanceField(rcCompactHeightfield& chf, unsigned short* src, unsigned short& maxDist)
-{
-	const int w = chf.width;
-	const int h = chf.height;
-	
-	// Init distance and points.
-	for (int i = 0; i < chf.spanCount; ++i)
-		src[i] = 0xffff;
-	
-	// Mark boundary cells.
-	for (int y = 0; y < h; ++y)
-	{
-		for (int x = 0; x < w; ++x)
-		{
-			const rcCompactCell& c = chf.cells[x+y*w];
-			for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
-			{
-				const rcCompactSpan& s = chf.spans[i];
-				const unsigned char area = chf.areas[i];
-				
-				int nc = 0;
-				for (int dir = 0; dir < 4; ++dir)
-				{
-					if (rcGetCon(s, dir) != RC_NOT_CONNECTED)
-					{
-						const int ax = x + rcGetDirOffsetX(dir);
-						const int ay = y + rcGetDirOffsetY(dir);
-						const int ai = (int)chf.cells[ax+ay*w].index + rcGetCon(s, dir);
-						if (area == chf.areas[ai])
-							nc++;
-					}
-				}
-				if (nc != 4)
-					src[i] = 0;
-			}
-		}
-	}
-	
-			
-	// Pass 1
-	for (int y = 0; y < h; ++y)
-	{
-		for (int x = 0; x < w; ++x)
-		{
-			const rcCompactCell& c = chf.cells[x+y*w];
-			for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
-			{
-				const rcCompactSpan& s = chf.spans[i];
-				
-				if (rcGetCon(s, 0) != RC_NOT_CONNECTED)
-				{
-					// (-1,0)
-					const int ax = x + rcGetDirOffsetX(0);
-					const int ay = y + rcGetDirOffsetY(0);
-					const int ai = (int)chf.cells[ax+ay*w].index + rcGetCon(s, 0);
-					const rcCompactSpan& as = chf.spans[ai];
-					if (src[ai]+2 < src[i])
-						src[i] = src[ai]+2;
-					
-					// (-1,-1)
-					if (rcGetCon(as, 3) != RC_NOT_CONNECTED)
-					{
-						const int aax = ax + rcGetDirOffsetX(3);
-						const int aay = ay + rcGetDirOffsetY(3);
-						const int aai = (int)chf.cells[aax+aay*w].index + rcGetCon(as, 3);
-						if (src[aai]+3 < src[i])
-							src[i] = src[aai]+3;
-					}
-				}
-				if (rcGetCon(s, 3) != RC_NOT_CONNECTED)
-				{
-					// (0,-1)
-					const int ax = x + rcGetDirOffsetX(3);
-					const int ay = y + rcGetDirOffsetY(3);
-					const int ai = (int)chf.cells[ax+ay*w].index + rcGetCon(s, 3);
-					const rcCompactSpan& as = chf.spans[ai];
-					if (src[ai]+2 < src[i])
-						src[i] = src[ai]+2;
-					
-					// (1,-1)
-					if (rcGetCon(as, 2) != RC_NOT_CONNECTED)
-					{
-						const int aax = ax + rcGetDirOffsetX(2);
-						const int aay = ay + rcGetDirOffsetY(2);
-						const int aai = (int)chf.cells[aax+aay*w].index + rcGetCon(as, 2);
-						if (src[aai]+3 < src[i])
-							src[i] = src[aai]+3;
-					}
-				}
-			}
-		}
-	}
-	
-	// Pass 2
-	for (int y = h-1; y >= 0; --y)
-	{
-		for (int x = w-1; x >= 0; --x)
-		{
-			const rcCompactCell& c = chf.cells[x+y*w];
-			for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
-			{
-				const rcCompactSpan& s = chf.spans[i];
-				
-				if (rcGetCon(s, 2) != RC_NOT_CONNECTED)
-				{
-					// (1,0)
-					const int ax = x + rcGetDirOffsetX(2);
-					const int ay = y + rcGetDirOffsetY(2);
-					const int ai = (int)chf.cells[ax+ay*w].index + rcGetCon(s, 2);
-					const rcCompactSpan& as = chf.spans[ai];
-					if (src[ai]+2 < src[i])
-						src[i] = src[ai]+2;
-					
-					// (1,1)
-					if (rcGetCon(as, 1) != RC_NOT_CONNECTED)
-					{
-						const int aax = ax + rcGetDirOffsetX(1);
-						const int aay = ay + rcGetDirOffsetY(1);
-						const int aai = (int)chf.cells[aax+aay*w].index + rcGetCon(as, 1);
-						if (src[aai]+3 < src[i])
-							src[i] = src[aai]+3;
-					}
-				}
-				if (rcGetCon(s, 1) != RC_NOT_CONNECTED)
-				{
-					// (0,1)
-					const int ax = x + rcGetDirOffsetX(1);
-					const int ay = y + rcGetDirOffsetY(1);
-					const int ai = (int)chf.cells[ax+ay*w].index + rcGetCon(s, 1);
-					const rcCompactSpan& as = chf.spans[ai];
-					if (src[ai]+2 < src[i])
-						src[i] = src[ai]+2;
-					
-					// (-1,1)
-					if (rcGetCon(as, 0) != RC_NOT_CONNECTED)
-					{
-						const int aax = ax + rcGetDirOffsetX(0);
-						const int aay = ay + rcGetDirOffsetY(0);
-						const int aai = (int)chf.cells[aax+aay*w].index + rcGetCon(as, 0);
-						if (src[aai]+3 < src[i])
-							src[i] = src[aai]+3;
-					}
-				}
-			}
-		}
-	}	
-	
-	maxDist = 0;
-	for (int i = 0; i < chf.spanCount; ++i)
-		maxDist = rcMax(src[i], maxDist);
-	
-}
-
-static unsigned short* boxBlur(rcCompactHeightfield& chf, int thr,
-							   unsigned short* src, unsigned short* dst)
-{
-	const int w = chf.width;
-	const int h = chf.height;
-	
-	thr *= 2;
-	
-	for (int y = 0; y < h; ++y)
-	{
-		for (int x = 0; x < w; ++x)
-		{
-			const rcCompactCell& c = chf.cells[x+y*w];
-			for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
-			{
-				const rcCompactSpan& s = chf.spans[i];
-				const unsigned short cd = src[i];
-				if (cd <= thr)
-				{
-					dst[i] = cd;
-					continue;
-				}
-
-				int d = (int)cd;
-				for (int dir = 0; dir < 4; ++dir)
-				{
-					if (rcGetCon(s, dir) != RC_NOT_CONNECTED)
-					{
-						const int ax = x + rcGetDirOffsetX(dir);
-						const int ay = y + rcGetDirOffsetY(dir);
-						const int ai = (int)chf.cells[ax+ay*w].index + rcGetCon(s, dir);
-						d += (int)src[ai];
-						
-						const rcCompactSpan& as = chf.spans[ai];
-						const int dir2 = (dir+1) & 0x3;
-						if (rcGetCon(as, dir2) != RC_NOT_CONNECTED)
-						{
-							const int ax2 = ax + rcGetDirOffsetX(dir2);
-							const int ay2 = ay + rcGetDirOffsetY(dir2);
-							const int ai2 = (int)chf.cells[ax2+ay2*w].index + rcGetCon(as, dir2);
-							d += (int)src[ai2];
-						}
-						else
-						{
-							d += cd;
-						}
-					}
-					else
-					{
-						d += cd*2;
-					}
-				}
-				dst[i] = (unsigned short)((d+5)/9);
-			}
-		}
-	}
-	return dst;
-}
-
-
-static bool floodRegion(int x, int y, int i,
-						unsigned short level, unsigned short r,
-						rcCompactHeightfield& chf,
-						unsigned short* srcReg, unsigned short* srcDist,
-						rcTempVector<LevelStackEntry>& stack)
-{
-	const int w = chf.width;
-	
-	const unsigned char area = chf.areas[i];
-	
-	// Flood fill mark region.
-	stack.clear();
-	stack.push_back(LevelStackEntry(x, y, i));
-	srcReg[i] = r;
-	srcDist[i] = 0;
-	
-	unsigned short lev = level >= 2 ? level-2 : 0;
-	int count = 0;
-	
-	while (stack.size() > 0)
-	{
-		LevelStackEntry& back = stack.back();
-		int cx = back.x;
-		int cy = back.y;
-		int ci = back.index;
-		stack.pop_back();
-		
-		const rcCompactSpan& cs = chf.spans[ci];
-		
-		// Check if any of the neighbours already have a valid region set.
-		unsigned short ar = 0;
-		for (int dir = 0; dir < 4; ++dir)
-		{
-			// 8 connected
-			if (rcGetCon(cs, dir) != RC_NOT_CONNECTED)
-			{
-				const int ax = cx + rcGetDirOffsetX(dir);
-				const int ay = cy + rcGetDirOffsetY(dir);
-				const int ai = (int)chf.cells[ax+ay*w].index + rcGetCon(cs, dir);
-				if (chf.areas[ai] != area)
-					continue;
-				unsigned short nr = srcReg[ai];
-				if (nr & RC_BORDER_REG) // Do not take borders into account.
-					continue;
-				if (nr != 0 && nr != r)
-				{
-					ar = nr;
-					break;
-				}
-				
-				const rcCompactSpan& as = chf.spans[ai];
-				
-				const int dir2 = (dir+1) & 0x3;
-				if (rcGetCon(as, dir2) != RC_NOT_CONNECTED)
-				{
-					const int ax2 = ax + rcGetDirOffsetX(dir2);
-					const int ay2 = ay + rcGetDirOffsetY(dir2);
-					const int ai2 = (int)chf.cells[ax2+ay2*w].index + rcGetCon(as, dir2);
-					if (chf.areas[ai2] != area)
-						continue;
-					unsigned short nr2 = srcReg[ai2];
-					if (nr2 != 0 && nr2 != r)
-					{
-						ar = nr2;
-						break;
-					}
-				}				
-			}
-		}
-		if (ar != 0)
-		{
-			srcReg[ci] = 0;
-			continue;
-		}
-		
-		count++;
-		
-		// Expand neighbours.
-		for (int dir = 0; dir < 4; ++dir)
-		{
-			if (rcGetCon(cs, dir) != RC_NOT_CONNECTED)
-			{
-				const int ax = cx + rcGetDirOffsetX(dir);
-				const int ay = cy + rcGetDirOffsetY(dir);
-				const int ai = (int)chf.cells[ax+ay*w].index + rcGetCon(cs, dir);
-				if (chf.areas[ai] != area)
-					continue;
-				if (chf.dist[ai] >= lev && srcReg[ai] == 0)
-				{
-					srcReg[ai] = r;
-					srcDist[ai] = 0;
-					stack.push_back(LevelStackEntry(ax, ay, ai));
-				}
-			}
-		}
-	}
-	
-	return count > 0;
-}
-
-// Struct to keep track of entries in the region table that have been changed.
-struct DirtyEntry
-{
-	DirtyEntry(int index_, unsigned short region_, unsigned short distance2_)
-		: index(index_), region(region_), distance2(distance2_) {}
-	int index;
-	unsigned short region;
-	unsigned short distance2;
-};
-static void expandRegions(int maxIter, unsigned short level,
-					      rcCompactHeightfield& chf,
-					      unsigned short* srcReg, unsigned short* srcDist,
-					      rcTempVector<LevelStackEntry>& stack,
-					      bool fillStack)
-{
-	const int w = chf.width;
-	const int h = chf.height;
-
-	if (fillStack)
-	{
-		// Find cells revealed by the raised level.
-		stack.clear();
-		for (int y = 0; y < h; ++y)
-		{
-			for (int x = 0; x < w; ++x)
-			{
-				const rcCompactCell& c = chf.cells[x+y*w];
-				for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
-				{
-					if (chf.dist[i] >= level && srcReg[i] == 0 && chf.areas[i] != RC_NULL_AREA)
-					{
-						stack.push_back(LevelStackEntry(x, y, i));
-					}
-				}
-			}
-		}
-	}
-	else // use cells in the input stack
-	{
-		// mark all cells which already have a region
-		for (int j=0; j<stack.size(); j++)
-		{
-			int i = stack[j].index;
-			if (srcReg[i] != 0)
-				stack[j].index = -1;
-		}
-	}
-
-	rcTempVector<DirtyEntry> dirtyEntries;
-	int iter = 0;
-	while (stack.size() > 0)
-	{
-		int failed = 0;
-		dirtyEntries.clear();
-		
-		for (int j = 0; j < stack.size(); j++)
-		{
-			int x = stack[j].x;
-			int y = stack[j].y;
-			int i = stack[j].index;
-			if (i < 0)
-			{
-				failed++;
-				continue;
-			}
-			
-			unsigned short r = srcReg[i];
-			unsigned short d2 = 0xffff;
-			const unsigned char area = chf.areas[i];
-			const rcCompactSpan& s = chf.spans[i];
-			for (int dir = 0; dir < 4; ++dir)
-			{
-				if (rcGetCon(s, dir) == RC_NOT_CONNECTED) continue;
-				const int ax = x + rcGetDirOffsetX(dir);
-				const int ay = y + rcGetDirOffsetY(dir);
-				const int ai = (int)chf.cells[ax+ay*w].index + rcGetCon(s, dir);
-				if (chf.areas[ai] != area) continue;
-				if (srcReg[ai] > 0 && (srcReg[ai] & RC_BORDER_REG) == 0)
-				{
-					if ((int)srcDist[ai]+2 < (int)d2)
-					{
-						r = srcReg[ai];
-						d2 = srcDist[ai]+2;
-					}
-				}
-			}
-			if (r)
-			{
-				stack[j].index = -1; // mark as used
-				dirtyEntries.push_back(DirtyEntry(i, r, d2));
-			}
-			else
-			{
-				failed++;
-			}
-		}
-		
-		// Copy entries that differ between src and dst to keep them in sync.
-		for (int i = 0; i < dirtyEntries.size(); i++) {
-			int idx = dirtyEntries[i].index;
-			srcReg[idx] = dirtyEntries[i].region;
-			srcDist[idx] = dirtyEntries[i].distance2;
-		}
-		
-		if (failed == stack.size())
-			break;
-		
-		if (level > 0)
-		{
-			++iter;
-			if (iter >= maxIter)
-				break;
-		}
-	}
-}
-
-
-
-static void sortCellsByLevel(unsigned short startLevel,
-							  rcCompactHeightfield& chf,
-							  const unsigned short* srcReg,
-							  unsigned int nbStacks, rcTempVector<LevelStackEntry>* stacks,
-							  unsigned short loglevelsPerStack) // the levels per stack (2 in our case) as a bit shift
-{
-	const int w = chf.width;
-	const int h = chf.height;
-	startLevel = startLevel >> loglevelsPerStack;
-
-	for (unsigned int j=0; j<nbStacks; ++j)
-		stacks[j].clear();
-
-	// put all cells in the level range into the appropriate stacks
-	for (int y = 0; y < h; ++y)
-	{
-		for (int x = 0; x < w; ++x)
-		{
-			const rcCompactCell& c = chf.cells[x+y*w];
-			for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
-			{
-				if (chf.areas[i] == RC_NULL_AREA || srcReg[i] != 0)
-					continue;
-
-				int level = chf.dist[i] >> loglevelsPerStack;
-				int sId = startLevel - level;
-				if (sId >= (int)nbStacks)
-					continue;
-				if (sId < 0)
-					sId = 0;
-
-				stacks[sId].push_back(LevelStackEntry(x, y, i));
-			}
-		}
-	}
-}
-
-
-static void appendStacks(const rcTempVector<LevelStackEntry>& srcStack,
-						 rcTempVector<LevelStackEntry>& dstStack,
-						 const unsigned short* srcReg)
-{
-	for (int j=0; j<srcStack.size(); j++)
-	{
-		int i = srcStack[j].index;
-		if ((i < 0) || (srcReg[i] != 0))
-			continue;
-		dstStack.push_back(srcStack[j]);
-	}
-}
-
-struct rcRegion
-{
-	inline rcRegion(unsigned short i) :
-		spanCount(0),
-		id(i),
-		areaType(0),
-		remap(false),
-		visited(false),
-		overlap(false),
-		connectsToBorder(false),
-		ymin(0xffff),
-		ymax(0)
-	{}
-	
-	int spanCount;					// Number of spans belonging to this region
-	unsigned short id;				// ID of the region
-	unsigned char areaType;			// Are type.
-	bool remap;
-	bool visited;
-	bool overlap;
-	bool connectsToBorder;
-	unsigned short ymin, ymax;
-	rcIntArray connections;
-	rcIntArray floors;
-};
-
-static void removeAdjacentNeighbours(rcRegion& reg)
-{
-	// Remove adjacent duplicates.
-	for (int i = 0; i < reg.connections.size() && reg.connections.size() > 1; )
-	{
-		int ni = (i+1) % reg.connections.size();
-		if (reg.connections[i] == reg.connections[ni])
-		{
-			// Remove duplicate
-			for (int j = i; j < reg.connections.size()-1; ++j)
-				reg.connections[j] = reg.connections[j+1];
-			reg.connections.pop();
-		}
-		else
-			++i;
-	}
-}
-
-static void replaceNeighbour(rcRegion& reg, unsigned short oldId, unsigned short newId)
-{
-	bool neiChanged = false;
-	for (int i = 0; i < reg.connections.size(); ++i)
-	{
-		if (reg.connections[i] == oldId)
-		{
-			reg.connections[i] = newId;
-			neiChanged = true;
-		}
-	}
-	for (int i = 0; i < reg.floors.size(); ++i)
-	{
-		if (reg.floors[i] == oldId)
-			reg.floors[i] = newId;
-	}
-	if (neiChanged)
-		removeAdjacentNeighbours(reg);
-}
-
-static bool canMergeWithRegion(const rcRegion& rega, const rcRegion& regb)
-{
-	if (rega.areaType != regb.areaType)
-		return false;
-	int n = 0;
-	for (int i = 0; i < rega.connections.size(); ++i)
-	{
-		if (rega.connections[i] == regb.id)
-			n++;
-	}
-	if (n > 1)
-		return false;
-	for (int i = 0; i < rega.floors.size(); ++i)
-	{
-		if (rega.floors[i] == regb.id)
-			return false;
-	}
-	return true;
-}
-
-static void addUniqueFloorRegion(rcRegion& reg, int n)
-{
-	for (int i = 0; i < reg.floors.size(); ++i)
-		if (reg.floors[i] == n)
-			return;
-	reg.floors.push(n);
-}
-
-static bool mergeRegions(rcRegion& rega, rcRegion& regb)
-{
-	unsigned short aid = rega.id;
-	unsigned short bid = regb.id;
-	
-	// Duplicate current neighbourhood.
-	rcIntArray acon;
-	acon.resize(rega.connections.size());
-	for (int i = 0; i < rega.connections.size(); ++i)
-		acon[i] = rega.connections[i];
-	rcIntArray& bcon = regb.connections;
-	
-	// Find insertion point on A.
-	int insa = -1;
-	for (int i = 0; i < acon.size(); ++i)
-	{
-		if (acon[i] == bid)
-		{
-			insa = i;
-			break;
-		}
-	}
-	if (insa == -1)
-		return false;
-	
-	// Find insertion point on B.
-	int insb = -1;
-	for (int i = 0; i < bcon.size(); ++i)
-	{
-		if (bcon[i] == aid)
-		{
-			insb = i;
-			break;
-		}
-	}
-	if (insb == -1)
-		return false;
-	
-	// Merge neighbours.
-	rega.connections.resize(0);
-	for (int i = 0, ni = acon.size(); i < ni-1; ++i)
-		rega.connections.push(acon[(insa+1+i) % ni]);
-		
-	for (int i = 0, ni = bcon.size(); i < ni-1; ++i)
-		rega.connections.push(bcon[(insb+1+i) % ni]);
-	
-	removeAdjacentNeighbours(rega);
-	
-	for (int j = 0; j < regb.floors.size(); ++j)
-		addUniqueFloorRegion(rega, regb.floors[j]);
-	rega.spanCount += regb.spanCount;
-	regb.spanCount = 0;
-	regb.connections.resize(0);
-
-	return true;
-}
-
-static bool isRegionConnectedToBorder(const rcRegion& reg)
-{
-	// Region is connected to border if
-	// one of the neighbours is null id.
-	for (int i = 0; i < reg.connections.size(); ++i)
-	{
-		if (reg.connections[i] == 0)
-			return true;
-	}
-	return false;
-}
-
-static bool isSolidEdge(rcCompactHeightfield& chf, const unsigned short* srcReg,
-						int x, int y, int i, int dir)
-{
-	const rcCompactSpan& s = chf.spans[i];
-	unsigned short r = 0;
-	if (rcGetCon(s, dir) != RC_NOT_CONNECTED)
-	{
-		const int ax = x + rcGetDirOffsetX(dir);
-		const int ay = y + rcGetDirOffsetY(dir);
-		const int ai = (int)chf.cells[ax+ay*chf.width].index + rcGetCon(s, dir);
-		r = srcReg[ai];
-	}
-	if (r == srcReg[i])
-		return false;
-	return true;
-}
-
-static void walkContour(int x, int y, int i, int dir,
-						rcCompactHeightfield& chf,
-						const unsigned short* srcReg,
-						rcIntArray& cont)
-{
-	int startDir = dir;
-	int starti = i;
-
-	const rcCompactSpan& ss = chf.spans[i];
-	unsigned short curReg = 0;
-	if (rcGetCon(ss, dir) != RC_NOT_CONNECTED)
-	{
-		const int ax = x + rcGetDirOffsetX(dir);
-		const int ay = y + rcGetDirOffsetY(dir);
-		const int ai = (int)chf.cells[ax+ay*chf.width].index + rcGetCon(ss, dir);
-		curReg = srcReg[ai];
-	}
-	cont.push(curReg);
-			
-	int iter = 0;
-	while (++iter < 40000)
-	{
-		const rcCompactSpan& s = chf.spans[i];
-		
-		if (isSolidEdge(chf, srcReg, x, y, i, dir))
-		{
-			// Choose the edge corner
-			unsigned short r = 0;
-			if (rcGetCon(s, dir) != RC_NOT_CONNECTED)
-			{
-				const int ax = x + rcGetDirOffsetX(dir);
-				const int ay = y + rcGetDirOffsetY(dir);
-				const int ai = (int)chf.cells[ax+ay*chf.width].index + rcGetCon(s, dir);
-				r = srcReg[ai];
-			}
-			if (r != curReg)
-			{
-				curReg = r;
-				cont.push(curReg);
-			}
-			
-			dir = (dir+1) & 0x3;  // Rotate CW
-		}
-		else
-		{
-			int ni = -1;
-			const int nx = x + rcGetDirOffsetX(dir);
-			const int ny = y + rcGetDirOffsetY(dir);
-			if (rcGetCon(s, dir) != RC_NOT_CONNECTED)
-			{
-				const rcCompactCell& nc = chf.cells[nx+ny*chf.width];
-				ni = (int)nc.index + rcGetCon(s, dir);
-			}
-			if (ni == -1)
-			{
-				// Should not happen.
-				return;
-			}
-			x = nx;
-			y = ny;
-			i = ni;
-			dir = (dir+3) & 0x3;	// Rotate CCW
-		}
-		
-		if (starti == i && startDir == dir)
-		{
-			break;
-		}
-	}
-
-	// Remove adjacent duplicates.
-	if (cont.size() > 1)
-	{
-		for (int j = 0; j < cont.size(); )
-		{
-			int nj = (j+1) % cont.size();
-			if (cont[j] == cont[nj])
-			{
-				for (int k = j; k < cont.size()-1; ++k)
-					cont[k] = cont[k+1];
-				cont.pop();
-			}
-			else
-				++j;
-		}
-	}
-}
-
-
-static bool mergeAndFilterRegions(rcContext* ctx, int minRegionArea, int mergeRegionSize,
-								  unsigned short& maxRegionId,
-								  rcCompactHeightfield& chf,
-								  unsigned short* srcReg, rcIntArray& overlaps)
-{
-	const int w = chf.width;
-	const int h = chf.height;
-	
-	const int nreg = maxRegionId+1;
-	rcTempVector<rcRegion> regions;
-	if (!regions.reserve(nreg)) {
-		ctx->log(RC_LOG_ERROR, "mergeAndFilterRegions: Out of memory 'regions' (%d).", nreg);
-		return false;
-	}
-
-	// Construct regions
-	for (int i = 0; i < nreg; ++i)
-		regions.push_back(rcRegion((unsigned short) i));
-	
-	// Find edge of a region and find connections around the contour.
-	for (int y = 0; y < h; ++y)
-	{
-		for (int x = 0; x < w; ++x)
-		{
-			const rcCompactCell& c = chf.cells[x+y*w];
-			for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
-			{
-				unsigned short r = srcReg[i];
-				if (r == 0 || r >= nreg)
-					continue;
-				
-				rcRegion& reg = regions[r];
-				reg.spanCount++;
-				
-				// Update floors.
-				for (int j = (int)c.index; j < ni; ++j)
-				{
-					if (i == j) continue;
-					unsigned short floorId = srcReg[j];
-					if (floorId == 0 || floorId >= nreg)
-						continue;
-					if (floorId == r)
-						reg.overlap = true;
-					addUniqueFloorRegion(reg, floorId);
-				}
-				
-				// Have found contour
-				if (reg.connections.size() > 0)
-					continue;
-				
-				reg.areaType = chf.areas[i];
-				
-				// Check if this cell is next to a border.
-				int ndir = -1;
-				for (int dir = 0; dir < 4; ++dir)
-				{
-					if (isSolidEdge(chf, srcReg, x, y, i, dir))
-					{
-						ndir = dir;
-						break;
-					}
-				}
-				
-				if (ndir != -1)
-				{
-					// The cell is at border.
-					// Walk around the contour to find all the neighbours.
-					walkContour(x, y, i, ndir, chf, srcReg, reg.connections);
-				}
-			}
-		}
-	}
-
-	// Remove too small regions.
-	rcIntArray stack(32);
-	rcIntArray trace(32);
-	for (int i = 0; i < nreg; ++i)
-	{
-		rcRegion& reg = regions[i];
-		if (reg.id == 0 || (reg.id & RC_BORDER_REG))
-			continue;                       
-		if (reg.spanCount == 0)
-			continue;
-		if (reg.visited)
-			continue;
-		
-		// Count the total size of all the connected regions.
-		// Also keep track of the regions connects to a tile border.
-		bool connectsToBorder = false;
-		int spanCount = 0;
-		stack.resize(0);
-		trace.resize(0);
-
-		reg.visited = true;
-		stack.push(i);
-		
-		while (stack.size())
-		{
-			// Pop
-			int ri = stack.pop();
-			
-			rcRegion& creg = regions[ri];
-
-			spanCount += creg.spanCount;
-			trace.push(ri);
-
-			for (int j = 0; j < creg.connections.size(); ++j)
-			{
-				if (creg.connections[j] & RC_BORDER_REG)
-				{
-					connectsToBorder = true;
-					continue;
-				}
-				rcRegion& neireg = regions[creg.connections[j]];
-				if (neireg.visited)
-					continue;
-				if (neireg.id == 0 || (neireg.id & RC_BORDER_REG))
-					continue;
-				// Visit
-				stack.push(neireg.id);
-				neireg.visited = true;
-			}
-		}
-		
-		// If the accumulated regions size is too small, remove it.
-		// Do not remove areas which connect to tile borders
-		// as their size cannot be estimated correctly and removing them
-		// can potentially remove necessary areas.
-		if (spanCount < minRegionArea && !connectsToBorder)
-		{
-			// Kill all visited regions.
-			for (int j = 0; j < trace.size(); ++j)
-			{
-				regions[trace[j]].spanCount = 0;
-				regions[trace[j]].id = 0;
-			}
-		}
-	}
-	
-	// Merge too small regions to neighbour regions.
-	int mergeCount = 0 ;
-	do
-	{
-		mergeCount = 0;
-		for (int i = 0; i < nreg; ++i)
-		{
-			rcRegion& reg = regions[i];
-			if (reg.id == 0 || (reg.id & RC_BORDER_REG))
-				continue;
-			if (reg.overlap)
-				continue;
-			if (reg.spanCount == 0)
-				continue;
-			
-			// Check to see if the region should be merged.
-			if (reg.spanCount > mergeRegionSize && isRegionConnectedToBorder(reg))
-				continue;
-			
-			// Small region with more than 1 connection.
-			// Or region which is not connected to a border at all.
-			// Find smallest neighbour region that connects to this one.
-			int smallest = 0xfffffff;
-			unsigned short mergeId = reg.id;
-			for (int j = 0; j < reg.connections.size(); ++j)
-			{
-				if (reg.connections[j] & RC_BORDER_REG) continue;
-				rcRegion& mreg = regions[reg.connections[j]];
-				if (mreg.id == 0 || (mreg.id & RC_BORDER_REG) || mreg.overlap) continue;
-				if (mreg.spanCount < smallest &&
-					canMergeWithRegion(reg, mreg) &&
-					canMergeWithRegion(mreg, reg))
-				{
-					smallest = mreg.spanCount;
-					mergeId = mreg.id;
-				}
-			}
-			// Found new id.
-			if (mergeId != reg.id)
-			{
-				unsigned short oldId = reg.id;
-				rcRegion& target = regions[mergeId];
-				
-				// Merge neighbours.
-				if (mergeRegions(target, reg))
-				{
-					// Fixup regions pointing to current region.
-					for (int j = 0; j < nreg; ++j)
-					{
-						if (regions[j].id == 0 || (regions[j].id & RC_BORDER_REG)) continue;
-						// If another region was already merged into current region
-						// change the nid of the previous region too.
-						if (regions[j].id == oldId)
-							regions[j].id = mergeId;
-						// Replace the current region with the new one if the
-						// current regions is neighbour.
-						replaceNeighbour(regions[j], oldId, mergeId);
-					}
-					mergeCount++;
-				}
-			}
-		}
-	}
-	while (mergeCount > 0);
-	
-	// Compress region Ids.
-	for (int i = 0; i < nreg; ++i)
-	{
-		regions[i].remap = false;
-		if (regions[i].id == 0) continue;       // Skip nil regions.
-		if (regions[i].id & RC_BORDER_REG) continue;    // Skip external regions.
-		regions[i].remap = true;
-	}
-	
-	unsigned short regIdGen = 0;
-	for (int i = 0; i < nreg; ++i)
-	{
-		if (!regions[i].remap)
-			continue;
-		unsigned short oldId = regions[i].id;
-		unsigned short newId = ++regIdGen;
-		for (int j = i; j < nreg; ++j)
-		{
-			if (regions[j].id == oldId)
-			{
-				regions[j].id = newId;
-				regions[j].remap = false;
-			}
-		}
-	}
-	maxRegionId = regIdGen;
-	
-	// Remap regions.
-	for (int i = 0; i < chf.spanCount; ++i)
-	{
-		if ((srcReg[i] & RC_BORDER_REG) == 0)
-			srcReg[i] = regions[srcReg[i]].id;
-	}
-
-	// Return regions that we found to be overlapping.
-	for (int i = 0; i < nreg; ++i)
-		if (regions[i].overlap)
-			overlaps.push(regions[i].id);
-
-	return true;
-}
-
-
-static void addUniqueConnection(rcRegion& reg, int n)
-{
-	for (int i = 0; i < reg.connections.size(); ++i)
-		if (reg.connections[i] == n)
-			return;
-	reg.connections.push(n);
-}
-
-static bool mergeAndFilterLayerRegions(rcContext* ctx, int minRegionArea,
-									   unsigned short& maxRegionId,
-									   rcCompactHeightfield& chf,
-									   unsigned short* srcReg)
-{
-	const int w = chf.width;
-	const int h = chf.height;
-	
-	const int nreg = maxRegionId+1;
-	rcTempVector<rcRegion> regions;
-	
-	// Construct regions
-	if (!regions.reserve(nreg)) {
-		ctx->log(RC_LOG_ERROR, "mergeAndFilterLayerRegions: Out of memory 'regions' (%d).", nreg);
-		return false;
-	}
-	for (int i = 0; i < nreg; ++i)
-		regions.push_back(rcRegion((unsigned short) i));
-	
-	// Find region neighbours and overlapping regions.
-	rcIntArray lregs(32);
-	for (int y = 0; y < h; ++y)
-	{
-		for (int x = 0; x < w; ++x)
-		{
-			const rcCompactCell& c = chf.cells[x+y*w];
-
-			lregs.resize(0);
-			
-			for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
-			{
-				const rcCompactSpan& s = chf.spans[i];
-				const unsigned short ri = srcReg[i];
-				if (ri == 0 || ri >= nreg) continue;
-				rcRegion& reg = regions[ri];
-				
-				reg.spanCount++;
-				
-				reg.ymin = rcMin(reg.ymin, s.y);
-				reg.ymax = rcMax(reg.ymax, s.y);
-				
-				// Collect all region layers.
-				lregs.push(ri);
-				
-				// Update neighbours
-				for (int dir = 0; dir < 4; ++dir)
-				{
-					if (rcGetCon(s, dir) != RC_NOT_CONNECTED)
-					{
-						const int ax = x + rcGetDirOffsetX(dir);
-						const int ay = y + rcGetDirOffsetY(dir);
-						const int ai = (int)chf.cells[ax+ay*w].index + rcGetCon(s, dir);
-						const unsigned short rai = srcReg[ai];
-						if (rai > 0 && rai < nreg && rai != ri)
-							addUniqueConnection(reg, rai);
-						if (rai & RC_BORDER_REG)
-							reg.connectsToBorder = true;
-					}
-				}
-				
-			}
-			
-			// Update overlapping regions.
-			for (int i = 0; i < lregs.size()-1; ++i)
-			{
-				for (int j = i+1; j < lregs.size(); ++j)
-				{
-					if (lregs[i] != lregs[j])
-					{
-						rcRegion& ri = regions[lregs[i]];
-						rcRegion& rj = regions[lregs[j]];
-						addUniqueFloorRegion(ri, lregs[j]);
-						addUniqueFloorRegion(rj, lregs[i]);
-					}
-				}
-			}
-			
-		}
-	}
-
-	// Create 2D layers from regions.
-	unsigned short layerId = 1;
-
-	for (int i = 0; i < nreg; ++i)
-		regions[i].id = 0;
-
-	// Merge montone regions to create non-overlapping areas.
-	rcIntArray stack(32);
-	for (int i = 1; i < nreg; ++i)
-	{
-		rcRegion& root = regions[i];
-		// Skip already visited.
-		if (root.id != 0)
-			continue;
-		
-		// Start search.
-		root.id = layerId;
-
-		stack.resize(0);
-		stack.push(i);
-		
-		while (stack.size() > 0)
-		{
-			// Pop front
-			rcRegion& reg = regions[stack[0]];
-			for (int j = 0; j < stack.size()-1; ++j)
-				stack[j] = stack[j+1];
-			stack.resize(stack.size()-1);
-			
-			const int ncons = (int)reg.connections.size();
-			for (int j = 0; j < ncons; ++j)
-			{
-				const int nei = reg.connections[j];
-				rcRegion& regn = regions[nei];
-				// Skip already visited.
-				if (regn.id != 0)
-					continue;
-				// Skip if the neighbour is overlapping root region.
-				bool overlap = false;
-				for (int k = 0; k < root.floors.size(); k++)
-				{
-					if (root.floors[k] == nei)
-					{
-						overlap = true;
-						break;
-					}
-				}
-				if (overlap)
-					continue;
-					
-				// Deepen
-				stack.push(nei);
-					
-				// Mark layer id
-				regn.id = layerId;
-				// Merge current layers to root.
-				for (int k = 0; k < regn.floors.size(); ++k)
-					addUniqueFloorRegion(root, regn.floors[k]);
-				root.ymin = rcMin(root.ymin, regn.ymin);
-				root.ymax = rcMax(root.ymax, regn.ymax);
-				root.spanCount += regn.spanCount;
-				regn.spanCount = 0;
-				root.connectsToBorder = root.connectsToBorder || regn.connectsToBorder;
-			}
-		}
-		
-		layerId++;
-	}
-	
-	// Remove small regions
-	for (int i = 0; i < nreg; ++i)
-	{
-		if (regions[i].spanCount > 0 && regions[i].spanCount < minRegionArea && !regions[i].connectsToBorder)
-		{
-			unsigned short reg = regions[i].id;
-			for (int j = 0; j < nreg; ++j)
-				if (regions[j].id == reg)
-					regions[j].id = 0;
-		}
-	}
-	
-	// Compress region Ids.
-	for (int i = 0; i < nreg; ++i)
-	{
-		regions[i].remap = false;
-		if (regions[i].id == 0) continue;				// Skip nil regions.
-		if (regions[i].id & RC_BORDER_REG) continue;    // Skip external regions.
-		regions[i].remap = true;
-	}
-	
-	unsigned short regIdGen = 0;
-	for (int i = 0; i < nreg; ++i)
-	{
-		if (!regions[i].remap)
-			continue;
-		unsigned short oldId = regions[i].id;
-		unsigned short newId = ++regIdGen;
-		for (int j = i; j < nreg; ++j)
-		{
-			if (regions[j].id == oldId)
-			{
-				regions[j].id = newId;
-				regions[j].remap = false;
-			}
-		}
-	}
-	maxRegionId = regIdGen;
-	
-	// Remap regions.
-	for (int i = 0; i < chf.spanCount; ++i)
-	{
-		if ((srcReg[i] & RC_BORDER_REG) == 0)
-			srcReg[i] = regions[srcReg[i]].id;
-	}
-	
-	return true;
-}
-
-
-
-/// @par
-/// 
-/// This is usually the second to the last step in creating a fully built
-/// compact heightfield.  This step is required before regions are built
-/// using #rcBuildRegions or #rcBuildRegionsMonotone.
-/// 
-/// After this step, the distance data is available via the rcCompactHeightfield::maxDistance
-/// and rcCompactHeightfield::dist fields.
-///
-/// @see rcCompactHeightfield, rcBuildRegions, rcBuildRegionsMonotone
-bool rcBuildDistanceField(rcContext* ctx, rcCompactHeightfield& chf)
-{
-	rcAssert(ctx);
-	
-	rcScopedTimer timer(ctx, RC_TIMER_BUILD_DISTANCEFIELD);
-	
-	if (chf.dist)
-	{
-		rcFree(chf.dist);
-		chf.dist = 0;
-	}
-	
-	unsigned short* src = (unsigned short*)rcAlloc(sizeof(unsigned short)*chf.spanCount, RC_ALLOC_TEMP);
-	if (!src)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildDistanceField: Out of memory 'src' (%d).", chf.spanCount);
-		return false;
-	}
-	unsigned short* dst = (unsigned short*)rcAlloc(sizeof(unsigned short)*chf.spanCount, RC_ALLOC_TEMP);
-	if (!dst)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildDistanceField: Out of memory 'dst' (%d).", chf.spanCount);
-		rcFree(src);
-		return false;
-	}
-	
-	unsigned short maxDist = 0;
-
-	{
-		rcScopedTimer timerDist(ctx, RC_TIMER_BUILD_DISTANCEFIELD_DIST);
-
-		calculateDistanceField(chf, src, maxDist);
-		chf.maxDistance = maxDist;
-	}
-
-	{
-		rcScopedTimer timerBlur(ctx, RC_TIMER_BUILD_DISTANCEFIELD_BLUR);
-
-		// Blur
-		if (boxBlur(chf, 1, src, dst) != src)
-			rcSwap(src, dst);
-
-		// Store distance.
-		chf.dist = src;
-	}
-	
-	rcFree(dst);
-	
-	return true;
-}
-
-static void paintRectRegion(int minx, int maxx, int miny, int maxy, unsigned short regId,
-							rcCompactHeightfield& chf, unsigned short* srcReg)
-{
-	const int w = chf.width;	
-	for (int y = miny; y < maxy; ++y)
-	{
-		for (int x = minx; x < maxx; ++x)
-		{
-			const rcCompactCell& c = chf.cells[x+y*w];
-			for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
-			{
-				if (chf.areas[i] != RC_NULL_AREA)
-					srcReg[i] = regId;
-			}
-		}
-	}
-}
-
-
-static const unsigned short RC_NULL_NEI = 0xffff;
-
-struct rcSweepSpan
-{
-	unsigned short rid;	// row id
-	unsigned short id;	// region id
-	unsigned short ns;	// number samples
-	unsigned short nei;	// neighbour id
-};
-
-/// @par
-/// 
-/// Non-null regions will consist of connected, non-overlapping walkable spans that form a single contour.
-/// Contours will form simple polygons.
-/// 
-/// If multiple regions form an area that is smaller than @p minRegionArea, then all spans will be
-/// re-assigned to the zero (null) region.
-/// 
-/// Partitioning can result in smaller than necessary regions. @p mergeRegionArea helps 
-/// reduce unecessarily small regions.
-/// 
-/// See the #rcConfig documentation for more information on the configuration parameters.
-/// 
-/// The region data will be available via the rcCompactHeightfield::maxRegions
-/// and rcCompactSpan::reg fields.
-/// 
-/// @warning The distance field must be created using #rcBuildDistanceField before attempting to build regions.
-/// 
-/// @see rcCompactHeightfield, rcCompactSpan, rcBuildDistanceField, rcBuildRegionsMonotone, rcConfig
-bool rcBuildRegionsMonotone(rcContext* ctx, rcCompactHeightfield& chf,
-							const int borderSize, const int minRegionArea, const int mergeRegionArea)
-{
-	rcAssert(ctx);
-	
-	rcScopedTimer timer(ctx, RC_TIMER_BUILD_REGIONS);
-	
-	const int w = chf.width;
-	const int h = chf.height;
-	unsigned short id = 1;
-	
-	rcScopedDelete<unsigned short> srcReg((unsigned short*)rcAlloc(sizeof(unsigned short)*chf.spanCount, RC_ALLOC_TEMP));
-	if (!srcReg)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildRegionsMonotone: Out of memory 'src' (%d).", chf.spanCount);
-		return false;
-	}
-	memset(srcReg,0,sizeof(unsigned short)*chf.spanCount);
-
-	const int nsweeps = rcMax(chf.width,chf.height);
-	rcScopedDelete<rcSweepSpan> sweeps((rcSweepSpan*)rcAlloc(sizeof(rcSweepSpan)*nsweeps, RC_ALLOC_TEMP));
-	if (!sweeps)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildRegionsMonotone: Out of memory 'sweeps' (%d).", nsweeps);
-		return false;
-	}
-	
-	
-	// Mark border regions.
-	if (borderSize > 0)
-	{
-		// Make sure border will not overflow.
-		const int bw = rcMin(w, borderSize);
-		const int bh = rcMin(h, borderSize);
-		// Paint regions
-		paintRectRegion(0, bw, 0, h, id|RC_BORDER_REG, chf, srcReg); id++;
-		paintRectRegion(w-bw, w, 0, h, id|RC_BORDER_REG, chf, srcReg); id++;
-		paintRectRegion(0, w, 0, bh, id|RC_BORDER_REG, chf, srcReg); id++;
-		paintRectRegion(0, w, h-bh, h, id|RC_BORDER_REG, chf, srcReg); id++;
-	}
-
-	chf.borderSize = borderSize;
-	
-	rcIntArray prev(256);
-
-	// Sweep one line at a time.
-	for (int y = borderSize; y < h-borderSize; ++y)
-	{
-		// Collect spans from this row.
-		prev.resize(id+1);
-		memset(&prev[0],0,sizeof(int)*id);
-		unsigned short rid = 1;
-		
-		for (int x = borderSize; x < w-borderSize; ++x)
-		{
-			const rcCompactCell& c = chf.cells[x+y*w];
-			
-			for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
-			{
-				const rcCompactSpan& s = chf.spans[i];
-				if (chf.areas[i] == RC_NULL_AREA) continue;
-				
-				// -x
-				unsigned short previd = 0;
-				if (rcGetCon(s, 0) != RC_NOT_CONNECTED)
-				{
-					const int ax = x + rcGetDirOffsetX(0);
-					const int ay = y + rcGetDirOffsetY(0);
-					const int ai = (int)chf.cells[ax+ay*w].index + rcGetCon(s, 0);
-					if ((srcReg[ai] & RC_BORDER_REG) == 0 && chf.areas[i] == chf.areas[ai])
-						previd = srcReg[ai];
-				}
-				
-				if (!previd)
-				{
-					previd = rid++;
-					sweeps[previd].rid = previd;
-					sweeps[previd].ns = 0;
-					sweeps[previd].nei = 0;
-				}
-
-				// -y
-				if (rcGetCon(s,3) != RC_NOT_CONNECTED)
-				{
-					const int ax = x + rcGetDirOffsetX(3);
-					const int ay = y + rcGetDirOffsetY(3);
-					const int ai = (int)chf.cells[ax+ay*w].index + rcGetCon(s, 3);
-					if (srcReg[ai] && (srcReg[ai] & RC_BORDER_REG) == 0 && chf.areas[i] == chf.areas[ai])
-					{
-						unsigned short nr = srcReg[ai];
-						if (!sweeps[previd].nei || sweeps[previd].nei == nr)
-						{
-							sweeps[previd].nei = nr;
-							sweeps[previd].ns++;
-							prev[nr]++;
-						}
-						else
-						{
-							sweeps[previd].nei = RC_NULL_NEI;
-						}
-					}
-				}
-
-				srcReg[i] = previd;
-			}
-		}
-		
-		// Create unique ID.
-		for (int i = 1; i < rid; ++i)
-		{
-			if (sweeps[i].nei != RC_NULL_NEI && sweeps[i].nei != 0 &&
-				prev[sweeps[i].nei] == (int)sweeps[i].ns)
-			{
-				sweeps[i].id = sweeps[i].nei;
-			}
-			else
-			{
-				sweeps[i].id = id++;
-			}
-		}
-		
-		// Remap IDs
-		for (int x = borderSize; x < w-borderSize; ++x)
-		{
-			const rcCompactCell& c = chf.cells[x+y*w];
-			
-			for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
-			{
-				if (srcReg[i] > 0 && srcReg[i] < rid)
-					srcReg[i] = sweeps[srcReg[i]].id;
-			}
-		}
-	}
-
-
-	{
-		rcScopedTimer timerFilter(ctx, RC_TIMER_BUILD_REGIONS_FILTER);
-
-		// Merge regions and filter out small regions.
-		rcIntArray overlaps;
-		chf.maxRegions = id;
-		if (!mergeAndFilterRegions(ctx, minRegionArea, mergeRegionArea, chf.maxRegions, chf, srcReg, overlaps))
-			return false;
-
-		// Monotone partitioning does not generate overlapping regions.
-	}
-	
-	// Store the result out.
-	for (int i = 0; i < chf.spanCount; ++i)
-		chf.spans[i].reg = srcReg[i];
-
-	return true;
-}
-
-/// @par
-/// 
-/// Non-null regions will consist of connected, non-overlapping walkable spans that form a single contour.
-/// Contours will form simple polygons.
-/// 
-/// If multiple regions form an area that is smaller than @p minRegionArea, then all spans will be
-/// re-assigned to the zero (null) region.
-/// 
-/// Watershed partitioning can result in smaller than necessary regions, especially in diagonal corridors. 
-/// @p mergeRegionArea helps reduce unecessarily small regions.
-/// 
-/// See the #rcConfig documentation for more information on the configuration parameters.
-/// 
-/// The region data will be available via the rcCompactHeightfield::maxRegions
-/// and rcCompactSpan::reg fields.
-/// 
-/// @warning The distance field must be created using #rcBuildDistanceField before attempting to build regions.
-/// 
-/// @see rcCompactHeightfield, rcCompactSpan, rcBuildDistanceField, rcBuildRegionsMonotone, rcConfig
-bool rcBuildRegions(rcContext* ctx, rcCompactHeightfield& chf,
-					const int borderSize, const int minRegionArea, const int mergeRegionArea)
-{
-	rcAssert(ctx);
-	
-	rcScopedTimer timer(ctx, RC_TIMER_BUILD_REGIONS);
-	
-	const int w = chf.width;
-	const int h = chf.height;
-	
-	rcScopedDelete<unsigned short> buf((unsigned short*)rcAlloc(sizeof(unsigned short)*chf.spanCount*2, RC_ALLOC_TEMP));
-	if (!buf)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildRegions: Out of memory 'tmp' (%d).", chf.spanCount*4);
-		return false;
-	}
-	
-	ctx->startTimer(RC_TIMER_BUILD_REGIONS_WATERSHED);
-
-	const int LOG_NB_STACKS = 3;
-	const int NB_STACKS = 1 << LOG_NB_STACKS;
-	rcTempVector<LevelStackEntry> lvlStacks[NB_STACKS];
-	for (int i=0; i<NB_STACKS; ++i)
-		lvlStacks[i].reserve(256);
-
-	rcTempVector<LevelStackEntry> stack;
-	stack.reserve(256);
-	
-	unsigned short* srcReg = buf;
-	unsigned short* srcDist = buf+chf.spanCount;
-	
-	memset(srcReg, 0, sizeof(unsigned short)*chf.spanCount);
-	memset(srcDist, 0, sizeof(unsigned short)*chf.spanCount);
-	
-	unsigned short regionId = 1;
-	unsigned short level = (chf.maxDistance+1) & ~1;
-
-	// TODO: Figure better formula, expandIters defines how much the 
-	// watershed "overflows" and simplifies the regions. Tying it to
-	// agent radius was usually good indication how greedy it could be.
-//	const int expandIters = 4 + walkableRadius * 2;
-	const int expandIters = 8;
-
-	if (borderSize > 0)
-	{
-		// Make sure border will not overflow.
-		const int bw = rcMin(w, borderSize);
-		const int bh = rcMin(h, borderSize);
-		
-		// Paint regions
-		paintRectRegion(0, bw, 0, h, regionId|RC_BORDER_REG, chf, srcReg); regionId++;
-		paintRectRegion(w-bw, w, 0, h, regionId|RC_BORDER_REG, chf, srcReg); regionId++;
-		paintRectRegion(0, w, 0, bh, regionId|RC_BORDER_REG, chf, srcReg); regionId++;
-		paintRectRegion(0, w, h-bh, h, regionId|RC_BORDER_REG, chf, srcReg); regionId++;
-	}
-
-	chf.borderSize = borderSize;
-	
-	int sId = -1;
-	while (level > 0)
-	{
-		level = level >= 2 ? level-2 : 0;
-		sId = (sId+1) & (NB_STACKS-1);
-
-//		ctx->startTimer(RC_TIMER_DIVIDE_TO_LEVELS);
-
-		if (sId == 0)
-			sortCellsByLevel(level, chf, srcReg, NB_STACKS, lvlStacks, 1);
-		else 
-			appendStacks(lvlStacks[sId-1], lvlStacks[sId], srcReg); // copy left overs from last level
-
-//		ctx->stopTimer(RC_TIMER_DIVIDE_TO_LEVELS);
-
-		{
-			rcScopedTimer timerExpand(ctx, RC_TIMER_BUILD_REGIONS_EXPAND);
-
-			// Expand current regions until no empty connected cells found.
-			expandRegions(expandIters, level, chf, srcReg, srcDist, lvlStacks[sId], false);
-		}
-		
-		{
-			rcScopedTimer timerFloor(ctx, RC_TIMER_BUILD_REGIONS_FLOOD);
-
-			// Mark new regions with IDs.
-			for (int j = 0; j<lvlStacks[sId].size(); j++)
-			{
-				LevelStackEntry current = lvlStacks[sId][j];
-				int x = current.x;
-				int y = current.y;
-				int i = current.index;
-				if (i >= 0 && srcReg[i] == 0)
-				{
-					if (floodRegion(x, y, i, level, regionId, chf, srcReg, srcDist, stack))
-					{
-						if (regionId == 0xFFFF)
-						{
-							ctx->log(RC_LOG_ERROR, "rcBuildRegions: Region ID overflow");
-							return false;
-						}
-						
-						regionId++;
-					}
-				}
-			}
-		}
-	}
-	
-	// Expand current regions until no empty connected cells found.
-	expandRegions(expandIters*8, 0, chf, srcReg, srcDist, stack, true);
-	
-	ctx->stopTimer(RC_TIMER_BUILD_REGIONS_WATERSHED);
-	
-	{
-		rcScopedTimer timerFilter(ctx, RC_TIMER_BUILD_REGIONS_FILTER);
-
-		// Merge regions and filter out smalle regions.
-		rcIntArray overlaps;
-		chf.maxRegions = regionId;
-		if (!mergeAndFilterRegions(ctx, minRegionArea, mergeRegionArea, chf.maxRegions, chf, srcReg, overlaps))
-			return false;
-
-		// If overlapping regions were found during merging, split those regions.
-		if (overlaps.size() > 0)
-		{
-			ctx->log(RC_LOG_ERROR, "rcBuildRegions: %d overlapping regions.", overlaps.size());
-		}
-	}
-		
-	// Write the result out.
-	for (int i = 0; i < chf.spanCount; ++i)
-		chf.spans[i].reg = srcReg[i];
-	
-	return true;
-}
-
-
-bool rcBuildLayerRegions(rcContext* ctx, rcCompactHeightfield& chf,
-						 const int borderSize, const int minRegionArea)
-{
-	rcAssert(ctx);
-	
-	rcScopedTimer timer(ctx, RC_TIMER_BUILD_REGIONS);
-	
-	const int w = chf.width;
-	const int h = chf.height;
-	unsigned short id = 1;
-	
-	rcScopedDelete<unsigned short> srcReg((unsigned short*)rcAlloc(sizeof(unsigned short)*chf.spanCount, RC_ALLOC_TEMP));
-	if (!srcReg)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildLayerRegions: Out of memory 'src' (%d).", chf.spanCount);
-		return false;
-	}
-	memset(srcReg,0,sizeof(unsigned short)*chf.spanCount);
-	
-	const int nsweeps = rcMax(chf.width,chf.height);
-	rcScopedDelete<rcSweepSpan> sweeps((rcSweepSpan*)rcAlloc(sizeof(rcSweepSpan)*nsweeps, RC_ALLOC_TEMP));
-	if (!sweeps)
-	{
-		ctx->log(RC_LOG_ERROR, "rcBuildLayerRegions: Out of memory 'sweeps' (%d).", nsweeps);
-		return false;
-	}
-	
-	
-	// Mark border regions.
-	if (borderSize > 0)
-	{
-		// Make sure border will not overflow.
-		const int bw = rcMin(w, borderSize);
-		const int bh = rcMin(h, borderSize);
-		// Paint regions
-		paintRectRegion(0, bw, 0, h, id|RC_BORDER_REG, chf, srcReg); id++;
-		paintRectRegion(w-bw, w, 0, h, id|RC_BORDER_REG, chf, srcReg); id++;
-		paintRectRegion(0, w, 0, bh, id|RC_BORDER_REG, chf, srcReg); id++;
-		paintRectRegion(0, w, h-bh, h, id|RC_BORDER_REG, chf, srcReg); id++;
-	}
-
-	chf.borderSize = borderSize;
-	
-	rcIntArray prev(256);
-	
-	// Sweep one line at a time.
-	for (int y = borderSize; y < h-borderSize; ++y)
-	{
-		// Collect spans from this row.
-		prev.resize(id+1);
-		memset(&prev[0],0,sizeof(int)*id);
-		unsigned short rid = 1;
-		
-		for (int x = borderSize; x < w-borderSize; ++x)
-		{
-			const rcCompactCell& c = chf.cells[x+y*w];
-			
-			for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
-			{
-				const rcCompactSpan& s = chf.spans[i];
-				if (chf.areas[i] == RC_NULL_AREA) continue;
-				
-				// -x
-				unsigned short previd = 0;
-				if (rcGetCon(s, 0) != RC_NOT_CONNECTED)
-				{
-					const int ax = x + rcGetDirOffsetX(0);
-					const int ay = y + rcGetDirOffsetY(0);
-					const int ai = (int)chf.cells[ax+ay*w].index + rcGetCon(s, 0);
-					if ((srcReg[ai] & RC_BORDER_REG) == 0 && chf.areas[i] == chf.areas[ai])
-						previd = srcReg[ai];
-				}
-				
-				if (!previd)
-				{
-					previd = rid++;
-					sweeps[previd].rid = previd;
-					sweeps[previd].ns = 0;
-					sweeps[previd].nei = 0;
-				}
-				
-				// -y
-				if (rcGetCon(s,3) != RC_NOT_CONNECTED)
-				{
-					const int ax = x + rcGetDirOffsetX(3);
-					const int ay = y + rcGetDirOffsetY(3);
-					const int ai = (int)chf.cells[ax+ay*w].index + rcGetCon(s, 3);
-					if (srcReg[ai] && (srcReg[ai] & RC_BORDER_REG) == 0 && chf.areas[i] == chf.areas[ai])
-					{
-						unsigned short nr = srcReg[ai];
-						if (!sweeps[previd].nei || sweeps[previd].nei == nr)
-						{
-							sweeps[previd].nei = nr;
-							sweeps[previd].ns++;
-							prev[nr]++;
-						}
-						else
-						{
-							sweeps[previd].nei = RC_NULL_NEI;
-						}
-					}
-				}
-				
-				srcReg[i] = previd;
-			}
-		}
-		
-		// Create unique ID.
-		for (int i = 1; i < rid; ++i)
-		{
-			if (sweeps[i].nei != RC_NULL_NEI && sweeps[i].nei != 0 &&
-				prev[sweeps[i].nei] == (int)sweeps[i].ns)
-			{
-				sweeps[i].id = sweeps[i].nei;
-			}
-			else
-			{
-				sweeps[i].id = id++;
-			}
-		}
-		
-		// Remap IDs
-		for (int x = borderSize; x < w-borderSize; ++x)
-		{
-			const rcCompactCell& c = chf.cells[x+y*w];
-			
-			for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
-			{
-				if (srcReg[i] > 0 && srcReg[i] < rid)
-					srcReg[i] = sweeps[srcReg[i]].id;
-			}
-		}
-	}
-	
-	
-	{
-		rcScopedTimer timerFilter(ctx, RC_TIMER_BUILD_REGIONS_FILTER);
-
-		// Merge monotone regions to layers and remove small regions.
-		chf.maxRegions = id;
-		if (!mergeAndFilterLayerRegions(ctx, minRegionArea, chf.maxRegions, chf, srcReg))
-			return false;
-	}
-	
-	
-	// Store the result out.
-	for (int i = 0; i < chf.spanCount; ++i)
-		chf.spans[i].reg = srcReg[i];
-	
-	return true;
-}

From e265d0bc2b34e4f91b08c1ec2a536beba99db677 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Fri, 19 Feb 2021 18:59:25 +0000
Subject: [PATCH 0367/2859] Fix OSGPlugins_LIB_DIR on the MacOS build

Moves auto-detection of OSGPlugins_LIB_DIR into FindOSGPlugins.cmake.

This should hopefully fix the error in the MacOS build.
---
 CMakeLists.txt             |  8 --------
 cmake/FindOSGPlugins.cmake | 11 +++++++++++
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b02ec055d2..401167af17 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -316,14 +316,6 @@ endif()
 if(OPENMW_USE_SYSTEM_OSG)
     find_package(OpenSceneGraph 3.3.4 REQUIRED ${USED_OSG_COMPONENTS})
     if(OSG_STATIC)
-        unset(OSGPlugins_LIB_DIR)
-        foreach(OSGDB_LIB ${OSGDB_LIBRARY})
-            # Skip library type names
-            if(EXISTS ${OSGDB_LIB} AND NOT IS_DIRECTORY ${OSGDB_LIB})
-                get_filename_component(OSG_LIB_DIR ${OSGDB_LIB} DIRECTORY)
-                list(APPEND OSGPlugins_LIB_DIR "${OSG_LIB_DIR}/osgPlugins-${OPENSCENEGRAPH_VERSION}")
-            endif()
-        endforeach(OSGDB_LIB)
         find_package(OSGPlugins REQUIRED COMPONENTS ${USED_OSG_PLUGINS})
     endif()
 endif()
diff --git a/cmake/FindOSGPlugins.cmake b/cmake/FindOSGPlugins.cmake
index 457abf665c..f7ebb0fa00 100644
--- a/cmake/FindOSGPlugins.cmake
+++ b/cmake/FindOSGPlugins.cmake
@@ -15,6 +15,17 @@
 include(LibFindMacros)
 include(Findosg_functions)
 
+if (NOT OSGPlugins_LIB_DIR)
+    unset(OSGPlugins_LIB_DIR)
+    foreach(OSGDB_LIB ${OSGDB_LIBRARY})
+        # Skip library type names
+        if(EXISTS ${OSGDB_LIB} AND NOT IS_DIRECTORY ${OSGDB_LIB})
+            get_filename_component(OSG_LIB_DIR ${OSGDB_LIB} DIRECTORY)
+            list(APPEND OSGPlugins_LIB_DIR "${OSG_LIB_DIR}/osgPlugins-${OPENSCENEGRAPH_VERSION}")
+        endif()
+    endforeach(OSGDB_LIB)
+endif()
+
 if (NOT OSGPlugins_LIB_DIR)
     set(_mode WARNING)
     if (OSGPlugins_FIND_REQUIRED)

From 9be258d26009ed7a3a1d03ca7d0d66455fd7beca Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Fri, 19 Feb 2021 19:59:48 +0000
Subject: [PATCH 0368/2859] Make it possible to reinstate FFP state easily

---
 apps/openmw/mwrender/groundcover.cpp |  2 ++
 components/resource/scenemanager.cpp |  6 +++++
 components/resource/scenemanager.hpp |  7 ++++-
 components/shader/shadervisitor.cpp  | 39 ++++++++++++++++++++++++++++
 components/shader/shadervisitor.hpp  | 11 ++++++++
 5 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/groundcover.cpp b/apps/openmw/mwrender/groundcover.cpp
index 049118c904..4390dae22c 100644
--- a/apps/openmw/mwrender/groundcover.cpp
+++ b/apps/openmw/mwrender/groundcover.cpp
@@ -258,6 +258,8 @@ namespace MWRender
             // Keep link to original mesh to keep it in cache
             group->getOrCreateUserDataContainer()->addUserObject(new Resource::TemplateRef(temp));
 
+            mSceneManager->reinstateRemovedState(node);
+
             InstancingVisitor visitor(pair.second, worldCenter);
             node->accept(visitor);
             group->addChild(node);
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 9d36f1caeb..e46ce20168 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -257,6 +257,12 @@ namespace Resource
         node->accept(*shaderVisitor);
     }
 
+    void SceneManager::reinstateRemovedState(osg::ref_ptr<osg::Node> node)
+    {
+        osg::ref_ptr<Shader::ReinstateRemovedStateVisitor> reinstateRemovedStateVisitor = new Shader::ReinstateRemovedStateVisitor(false);
+        node->accept(*reinstateRemovedStateVisitor);
+    }
+
     void SceneManager::setClampLighting(bool clamp)
     {
         mClampLighting = clamp;
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index 0648ce06fe..bf69a8c4be 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -75,9 +75,14 @@ namespace Resource
 
         Shader::ShaderManager& getShaderManager();
 
-        /// Re-create shaders for this node, need to call this if texture stages or vertex color mode have changed.
+        /// Re-create shaders for this node, need to call this if alpha testing, texture stages or vertex color mode have changed.
         void recreateShaders(osg::ref_ptr<osg::Node> node, const std::string& shaderPrefix = "objects", bool translucentFramebuffer = false, bool forceShadersForNode = false);
 
+        /// Applying shaders to a node may replace some fixed-function state.
+        /// This restores it.
+        /// When editing such state, it should be reinstated before the edits, and shaders should be recreated afterwards.
+        void reinstateRemovedState(osg::ref_ptr<osg::Node> node);
+
         /// @see ShaderVisitor::setForceShaders
         void setForceShaders(bool force);
         bool getForceShaders() const;
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index a79e24f8be..782ffa016d 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -614,4 +614,43 @@ namespace Shader
         mTranslucentFramebuffer = translucent;
     }
 
+    ReinstateRemovedStateVisitor::ReinstateRemovedStateVisitor(bool allowedToModifyStateSets)
+        : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+        , mAllowedToModifyStateSets(allowedToModifyStateSets)
+    {
+    }
+
+    void ReinstateRemovedStateVisitor::apply(osg::Node& node)
+    {
+        if (node.getStateSet())
+        {
+            osg::ref_ptr<osg::StateSet> removedState = getRemovedState(*node.getStateSet());
+            if (removedState)
+            {
+                osg::ref_ptr<osg::StateSet> writableStateSet;
+                if (mAllowedToModifyStateSets)
+                    writableStateSet = node.getStateSet();
+                else
+                    writableStateSet = getWritableStateSet(node);
+
+                // user data is normally shallow copied so shared with the original stateset
+                osg::ref_ptr<osg::UserDataContainer> writableUserData;
+                if (mAllowedToModifyStateSets)
+                    writableUserData = writableStateSet->getUserDataContainer();
+                else
+                    writableUserData = getWritableUserDataContainer(*writableStateSet);
+                unsigned int index = writableUserData->getUserObjectIndex("removedState");
+                writableUserData->removeUserObject(index);
+
+                for (const auto&[mode, value] : removedState->getModeList())
+                    writableStateSet->setMode(mode, value);
+
+                for (const auto& attribute : removedState->getAttributeList())
+                    writableStateSet->setAttribute(attribute.second.first, attribute.second.second);
+            }
+        }
+
+        traverse(node);
+    }
+
 }
diff --git a/components/shader/shadervisitor.hpp b/components/shader/shadervisitor.hpp
index daf42ff265..f7c6f83127 100644
--- a/components/shader/shadervisitor.hpp
+++ b/components/shader/shadervisitor.hpp
@@ -112,6 +112,17 @@ namespace Shader
         bool adjustGeometry(osg::Geometry& sourceGeometry, const ShaderRequirements& reqs);
     };
 
+    class ReinstateRemovedStateVisitor : public osg::NodeVisitor
+    {
+    public:
+        ReinstateRemovedStateVisitor(bool allowedToModifyStateSets);
+
+        void apply(osg::Node& node) override;
+
+    private:
+        bool mAllowedToModifyStateSets;
+    };
+
 }
 
 #endif

From 7fe39c6a3a8c7f4d2e9337566c40d2153d2e9333 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Fri, 22 Jan 2021 19:42:24 +0000
Subject: [PATCH 0369/2859] sdlcursormanager: Clarify ANDROID check

This check will not be needed in the upcoming versions of OSG.

This was originally needed due to a bug in OSG that was fixed in
https://github.com/openscenegraph/OpenSceneGraph/pull/1027
---
 components/sdlutil/sdlcursormanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/sdlutil/sdlcursormanager.cpp b/components/sdlutil/sdlcursormanager.cpp
index 56225868e3..626930291d 100644
--- a/components/sdlutil/sdlcursormanager.cpp
+++ b/components/sdlutil/sdlcursormanager.cpp
@@ -20,7 +20,7 @@
 
 #include "imagetosurface.hpp"
 
-#if defined(OSG_LIBRARY_STATIC) && !defined(ANDROID)
+#if defined(OSG_LIBRARY_STATIC) && (!defined(ANDROID) || OSG_VERSION_GREATER_THAN(3, 6, 5))
 // Sets the default windowing system interface according to the OS.
 // Necessary for OpenSceneGraph to do some things, like decompression.
 USE_GRAPHICSWINDOW()

From c7ee5d21dc9d3470b5a7f468fb4866ffdac7ddc7 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Tue, 23 Feb 2021 23:24:40 +0000
Subject: [PATCH 0370/2859] Make the dummy texture for the character preview
 even more shadow-friendly

---
 apps/openmw/mwrender/characterpreview.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index 262b03229f..633c8fcb72 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -182,7 +182,7 @@ namespace MWRender
         noBlendAlphaEnv->setCombine_RGB(osg::TexEnvCombine::REPLACE);
         noBlendAlphaEnv->setSource0_RGB(osg::TexEnvCombine::PREVIOUS);
         osg::ref_ptr<osg::Texture2D> dummyTexture = new osg::Texture2D();
-        dummyTexture->setInternalFormat(GL_RED);
+        dummyTexture->setInternalFormat(GL_DEPTH_COMPONENT);
         dummyTexture->setTextureSize(1, 1);
         // This might clash with a shadow map, so make sure it doesn't cast shadows
         dummyTexture->setShadowComparison(true);

From 153ab57ae38f4930d8e60312b1edd437b8ea0163 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Wed, 24 Feb 2021 17:45:44 +0000
Subject: [PATCH 0371/2859] Make assignment in while loop condition obviously
 intentional

---
 components/sceneutil/shadowsbin.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/sceneutil/shadowsbin.cpp b/components/sceneutil/shadowsbin.cpp
index 26cbd58c31..5a4096f5c3 100644
--- a/components/sceneutil/shadowsbin.cpp
+++ b/components/sceneutil/shadowsbin.cpp
@@ -185,7 +185,7 @@ void ShadowsBin::sortImplementation()
         root = root->_parent;
         const osg::StateSet* ss = root->getStateSet();
         if (ss->getMode(GL_NORMALIZE) & osg::StateAttribute::ON // that is root stategraph of renderingmanager cpp
-           || ss->getAttribute(osg::StateAttribute::VIEWPORT)) // fallback to rendertargets sg just in case
+           || ss->getAttribute(osg::StateAttribute::VIEWPORT)) // fallback to rendertarget's sg just in case
             break;
         if (!root->_parent)
             return;
@@ -194,7 +194,7 @@ void ShadowsBin::sortImplementation()
     // noTestRoot is now a stategraph with useDiffuseMapForShadowAlpha disabled but minimal other state
 
     bool cullFaceOverridden = false;
-    while (root = root->_parent)
+    while ((root = root->_parent))
     {
         if (!root->getStateSet())
             continue;

From 4ed67d8597520a0a4e24213125550e7b5e1b2ef9 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Wed, 24 Feb 2021 18:01:06 +0000
Subject: [PATCH 0372/2859] Improve A2C setting name

---
 apps/openmw/mwrender/localmap.cpp                  | 2 +-
 apps/openmw/mwrender/renderingmanager.cpp          | 2 +-
 apps/openmw/mwrender/water.cpp                     | 4 ++--
 docs/source/reference/modding/settings/shaders.rst | 4 ++--
 files/settings-default.cfg                         | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index f4845fa2ba..a487fb1e94 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -239,7 +239,7 @@ void LocalMap::setupRenderToTexture(osg::ref_ptr<osg::Camera> camera, int x, int
 
     unsigned int samples = 0;
     unsigned int colourSamples = 0;
-    if (Settings::Manager::getBool("convert alpha test to alpha-to-coverage", "Shaders") && Settings::Manager::getInt("antialiasing", "Video") > 1)
+    if (Settings::Manager::getBool("antialias alpha test", "Shaders") && Settings::Manager::getInt("antialiasing", "Video") > 1)
     {
         // Alpha-to-coverage requires a multisampled framebuffer.
         // OSG will set that up automatically and resolve it to the specified single-sample texture for us.
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 4770746c7e..9f89d1bff2 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -213,7 +213,7 @@ namespace MWRender
         resourceSystem->getSceneManager()->setAutoUseSpecularMaps(Settings::Manager::getBool("auto use object specular maps", "Shaders"));
         resourceSystem->getSceneManager()->setSpecularMapPattern(Settings::Manager::getString("specular map pattern", "Shaders"));
         resourceSystem->getSceneManager()->setApplyLightingToEnvMaps(Settings::Manager::getBool("apply lighting to environment maps", "Shaders"));
-        resourceSystem->getSceneManager()->setConvertAlphaTestToAlphaToCoverage(Settings::Manager::getBool("convert alpha test to alpha-to-coverage", "Shaders") && Settings::Manager::getInt("antialiasing", "Video") > 1);
+        resourceSystem->getSceneManager()->setConvertAlphaTestToAlphaToCoverage(Settings::Manager::getBool("antialias alpha test", "Shaders") && Settings::Manager::getInt("antialiasing", "Video") > 1);
 
         osg::ref_ptr<SceneUtil::LightManager> sceneRoot = new SceneUtil::LightManager;
         sceneRoot->setLightingMask(Mask_Lighting);
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index ed1fcb98f0..0ab3de7efd 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -273,7 +273,7 @@ public:
 
         unsigned int samples = 0;
         unsigned int colourSamples = 0;
-        if (Settings::Manager::getBool("convert alpha test to alpha-to-coverage", "Shaders") && Settings::Manager::getInt("antialiasing", "Video") > 1)
+        if (Settings::Manager::getBool("antialias alpha test", "Shaders") && Settings::Manager::getInt("antialiasing", "Video") > 1)
         {
             // Alpha-to-coverage requires a multisampled framebuffer.
             // OSG will set that up automatically and resolve it to the specified single-sample texture for us.
@@ -368,7 +368,7 @@ public:
 
         unsigned int samples = 0;
         unsigned int colourSamples = 0;
-        if (Settings::Manager::getBool("convert alpha test to alpha-to-coverage", "Shaders") && Settings::Manager::getInt("antialiasing", "Video") > 1)
+        if (Settings::Manager::getBool("antialias alpha test", "Shaders") && Settings::Manager::getInt("antialiasing", "Video") > 1)
         {
             // Alpha-to-coverage requires a multisampled framebuffer.
             // OSG will set that up automatically and resolve it to the specified single-sample texture for us.
diff --git a/docs/source/reference/modding/settings/shaders.rst b/docs/source/reference/modding/settings/shaders.rst
index 657f7bfc63..acc8482991 100644
--- a/docs/source/reference/modding/settings/shaders.rst
+++ b/docs/source/reference/modding/settings/shaders.rst
@@ -148,13 +148,13 @@ By default, the fog becomes thicker proportionally to your distance from the cli
 This setting makes the fog use the actual eye point distance (or so called Euclidean distance) to calculate the fog, which makes the fog look less artificial, especially if you have a wide FOV.
 Note that the rendering will act as if you have 'force shaders' option enabled with this on, which means that shaders will be used to render all objects and the terrain.
 
-convert alpha test to alpha-to-coverage
+antialias alpha test
 ---------------------------------------
 
 :Type:		boolean
 :Range:		True/False
 :Default:	False
 
-Convert the alpha test (cutout/punchthrough alpha) to alpha-to-coverage.
+Convert the alpha test (cutout/punchthrough alpha) to alpha-to-coverage when :ref:`antialiasing` is on.
 This allows MSAA to work with alpha-tested meshes, producing better-looking edges without pixelation.
 When MSAA is off, this setting will have no visible effect, but might have a performance cost.
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 9c88356463..d439c46351 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -445,7 +445,7 @@ radial fog = false
 # Convert the alpha test (cutout/punchthrough alpha) to alpha-to-coverage.
 # This allows MSAA to work with alpha-tested meshes, producing better-looking edges without pixelation.
 # When MSAA is off, this setting will have no visible effect, but might have a performance cost.
-convert alpha test to alpha-to-coverage = false
+antialias alpha test = false
 
 [Input]
 

From b7535ad9fb1022206a5e4b09d640ea7b5ea412ae Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Thu, 25 Feb 2021 11:33:48 +0400
Subject: [PATCH 0373/2859] Remove outdated entries from gitignore

---
 .gitignore | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8112f683ad..1905957d9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -84,13 +84,3 @@ moc_*.cxx
 *.[ao]
 *.so
 venv/
-
-## recastnavigation unused files
-extern/recastnavigation/.travis.yml
-extern/recastnavigation/CONTRIBUTING.md
-extern/recastnavigation/Docs/
-extern/recastnavigation/Doxyfile
-extern/recastnavigation/README.md
-extern/recastnavigation/RecastDemo/
-extern/recastnavigation/Tests/
-extern/recastnavigation/appveyor.yml

From a616af822eee470a823529342f46db77caf3e8df Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 25 Feb 2021 19:33:11 +0100
Subject: [PATCH 0374/2859] Fix Ctrl U/W behaviour to work with unicode text

---
 apps/openmw/mwgui/console.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwgui/console.cpp b/apps/openmw/mwgui/console.cpp
index 89ba5d388d..d0d3b87a69 100644
--- a/apps/openmw/mwgui/console.cpp
+++ b/apps/openmw/mwgui/console.cpp
@@ -249,7 +249,7 @@ namespace MWGui
                 size_t length = mCommandLine->getTextCursor() - max;
                 if(length > 0)
                 {
-                    std::string text = caption;
+                    auto text = caption;
                     text.erase(max, length);
                     mCommandLine->setCaption(text);
                     mCommandLine->setTextCursor(max);
@@ -259,7 +259,7 @@ namespace MWGui
             {
                 if(mCommandLine->getTextCursor() > 0)
                 {
-                    std::string text = mCommandLine->getCaption();
+                    auto text = mCommandLine->getCaption();
                     text.erase(0, mCommandLine->getTextCursor());
                     mCommandLine->setCaption(text);
                     mCommandLine->setTextCursor(0);

From 6e0f070cd1c8cd3b9aa0a9fdf7acd4093b0ec15c Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 25 Feb 2021 21:37:21 +0100
Subject: [PATCH 0375/2859] Don't assume unmapped keycodes outside the extended
 ASCII range are unprintable

---
 apps/openmw/mwinput/keyboardmanager.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwinput/keyboardmanager.cpp b/apps/openmw/mwinput/keyboardmanager.cpp
index db047a342c..8540858461 100644
--- a/apps/openmw/mwinput/keyboardmanager.cpp
+++ b/apps/openmw/mwinput/keyboardmanager.cpp
@@ -39,12 +39,14 @@ namespace MWInput
                 && MWBase::Environment::get().getWindowManager()->isConsoleMode())
             SDL_StopTextInput();
 
-        bool consumed = false;
+        bool consumed = SDL_IsTextInputActive() &&  // Little trick to check if key is printable
+                        (!(SDLK_SCANCODE_MASK & arg.keysym.sym) &&
+                        (std::isprint(arg.keysym.sym) ||
+                        // Don't trust isprint for symbols outside the extended ASCII range
+                        (kc == MyGUI::KeyCode::None && arg.keysym.sym > 0xff)));
         if (kc != MyGUI::KeyCode::None && !mBindingsManager->isDetectingBindingState())
         {
-            consumed = MWBase::Environment::get().getWindowManager()->injectKeyPress(kc, 0, arg.repeat);
-            if (SDL_IsTextInputActive() &&  // Little trick to check if key is printable
-                                    (!(SDLK_SCANCODE_MASK & arg.keysym.sym) && std::isprint(arg.keysym.sym)))
+            if (MWBase::Environment::get().getWindowManager()->injectKeyPress(kc, 0, arg.repeat))
                 consumed = true;
             mBindingsManager->setPlayerControlsEnabled(!consumed);
         }

From 1a423860b553de9853d98d890d92e31ad236a0d2 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 25 Feb 2021 21:45:15 +0100
Subject: [PATCH 0376/2859] Add changelog entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index acfdc9e50b..a46f47f530 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -103,6 +103,7 @@
     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 #5871: The console appears if you type the Russian letter "Ё" in the name of the enchantment
     Feature #390: 3rd person look "over the shoulder"
     Feature #1536: Show more information about level on menu
     Feature #2386: Distant Statics in the form of Object Paging

From 13c5b1b0c54a66ed07d18d527cd8e48bab9f3e47 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Fri, 26 Feb 2021 10:45:32 +0000
Subject: [PATCH 0377/2859] CMake: Fix support for OSG static lib paths

`$<TARGET_FILE:...>` fails if the argument is already a path (instead of
a library name). This happens when a static library is found via
`osg_find_library`.

If the argument contains `/` or `.`, do not use `$<TARGET_FILE:...>`
---
 apps/opencs/CMakeLists.txt | 6 +++++-
 apps/openmw/CMakeLists.txt | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 17b3375f59..8be1fa4d30 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -233,7 +233,11 @@ if(OSG_STATIC)
     add_library(openmw_cs_osg_plugins INTERFACE)
     foreach(_plugin ${USED_OSG_PLUGINS})
         string(TOUPPER ${_plugin} _plugin_uc)
-        list(APPEND _osg_plugins_static_files $<TARGET_FILE:${${_plugin_uc}_LIBRARY}>)
+        if (${_plugin_uc}_LIBRARY MATCHES "[/.]")
+            list(APPEND _osg_plugins_static_files ${${_plugin_uc}_LIBRARY})
+        else()
+            list(APPEND _osg_plugins_static_files $<TARGET_FILE:${${_plugin_uc}_LIBRARY}>)
+        endif()
         target_link_libraries(openmw_cs_osg_plugins INTERFACE ${${_plugin_uc}_LIBRARY})
     endforeach()
     # We use --whole-archive because OSG plugins use registration.
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 1c11825efc..dda517c44b 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -148,7 +148,11 @@ if(OSG_STATIC)
     add_library(openmw_osg_plugins INTERFACE)
     foreach(_plugin ${USED_OSG_PLUGINS})
         string(TOUPPER ${_plugin} _plugin_uc)
-        list(APPEND _osg_plugins_static_files $<TARGET_FILE:${${_plugin_uc}_LIBRARY}>)
+        if (${_plugin_uc}_LIBRARY MATCHES "[/.]")
+            list(APPEND _osg_plugins_static_files ${${_plugin_uc}_LIBRARY})
+        else()
+            list(APPEND _osg_plugins_static_files $<TARGET_FILE:${${_plugin_uc}_LIBRARY}>)
+        endif()
         target_link_libraries(openmw_osg_plugins INTERFACE ${${_plugin_uc}_LIBRARY})
     endforeach()
     # We use --whole-archive because OSG plugins use registration.

From 21a70b7d2b6d3d7697e847045fff39034d341168 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Fri, 26 Feb 2021 09:54:02 +0000
Subject: [PATCH 0378/2859] heighfield: buildAccellerator()

This enables accelleration of heightfield collisions.

Unfortunately, `btHeightfieldTerrainShape::processAllTriangle` does not
yet use the accellerator data, so this change does not improve
performance yet but might do so in future bullet versions.

References:

* Accellerator introduced in:
  https://github.com/bulletphysics/bullet3/pull/2062

* Feature request to use the accellerator in `processAllTriangle`:
  https://github.com/bulletphysics/bullet3/issues/3276
---
 apps/openmw/mwphysics/heightfield.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/openmw/mwphysics/heightfield.cpp b/apps/openmw/mwphysics/heightfield.cpp
index 436cdfe8fa..cbcc9d0246 100644
--- a/apps/openmw/mwphysics/heightfield.cpp
+++ b/apps/openmw/mwphysics/heightfield.cpp
@@ -58,6 +58,12 @@ namespace MWPhysics
         mShape->setUseDiamondSubdivision(true);
         mShape->setLocalScaling(btVector3(triSize, triSize, 1));
 
+        // Enables acceleration of heighfield collissions.
+        //
+        // Bullet does not yet use this in the most time-consuming method, `btHeightfieldTerrainShape::processAllTriangle`.
+        // See https://github.com/bulletphysics/bullet3/issues/3276
+        mShape->buildAccelerator();
+
         btTransform transform(btQuaternion::getIdentity(),
                                 btVector3((x+0.5f) * triSize * (sqrtVerts-1),
                                           (y+0.5f) * triSize * (sqrtVerts-1),

From f5a87ee46def4892ee736790fced2435cfe63dd4 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Fri, 26 Feb 2021 19:01:27 +0000
Subject: [PATCH 0379/2859] Refactor out duplicated RTT setup code

---
 apps/openmw/mwrender/localmap.cpp | 13 ++-----------
 apps/openmw/mwrender/water.cpp    | 25 +++----------------------
 components/sceneutil/util.cpp     | 16 ++++++++++++++++
 components/sceneutil/util.hpp     |  4 ++++
 4 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index a487fb1e94..64931aa880 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -18,6 +18,7 @@
 #include <components/settings/settings.hpp>
 #include <components/sceneutil/visitor.hpp>
 #include <components/sceneutil/shadow.hpp>
+#include <components/sceneutil/util.hpp>
 #include <components/files/memorystream.hpp>
 
 #include "../mwbase/environment.hpp"
@@ -237,17 +238,7 @@ void LocalMap::setupRenderToTexture(osg::ref_ptr<osg::Camera> camera, int x, int
     texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
     texture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
 
-    unsigned int samples = 0;
-    unsigned int colourSamples = 0;
-    if (Settings::Manager::getBool("antialias alpha test", "Shaders") && Settings::Manager::getInt("antialiasing", "Video") > 1)
-    {
-        // Alpha-to-coverage requires a multisampled framebuffer.
-        // OSG will set that up automatically and resolve it to the specified single-sample texture for us.
-        // For some reason, two samples are needed, at least with some drivers.
-        samples = 2;
-        colourSamples = 1;
-    }
-    camera->attach(osg::Camera::COLOR_BUFFER, texture, 0, 0, false, samples, colourSamples);
+    SceneUtil::attachAlphaToCoverageFriendlyFramebufferToCamera(camera, osg::Camera::COLOR_BUFFER, texture);
 
     camera->addChild(mSceneRoot);
     mRoot->addChild(camera);
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index 0ab3de7efd..71b1b49855 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -26,6 +26,7 @@
 #include <components/resource/scenemanager.hpp>
 
 #include <components/sceneutil/shadow.hpp>
+#include <components/sceneutil/util.hpp>
 #include <components/sceneutil/waterutil.hpp>
 
 #include <components/misc/constants.hpp>
@@ -271,17 +272,7 @@ public:
         mRefractionTexture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
         mRefractionTexture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
 
-        unsigned int samples = 0;
-        unsigned int colourSamples = 0;
-        if (Settings::Manager::getBool("antialias alpha test", "Shaders") && Settings::Manager::getInt("antialiasing", "Video") > 1)
-        {
-            // Alpha-to-coverage requires a multisampled framebuffer.
-            // OSG will set that up automatically and resolve it to the specified single-sample texture for us.
-            // For some reason, two samples are needed, at least with some drivers.
-            samples = 2;
-            colourSamples = 1;
-        }
-        attach(osg::Camera::COLOR_BUFFER, mRefractionTexture, 0, 0, false, samples, colourSamples);
+        SceneUtil::attachAlphaToCoverageFriendlyFramebufferToCamera(this, osg::Camera::COLOR_BUFFER, mRefractionTexture);
 
         mRefractionDepthTexture = new osg::Texture2D;
         mRefractionDepthTexture->setTextureSize(rttSize, rttSize);
@@ -366,17 +357,7 @@ public:
         mReflectionTexture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
         mReflectionTexture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
 
-        unsigned int samples = 0;
-        unsigned int colourSamples = 0;
-        if (Settings::Manager::getBool("antialias alpha test", "Shaders") && Settings::Manager::getInt("antialiasing", "Video") > 1)
-        {
-            // Alpha-to-coverage requires a multisampled framebuffer.
-            // OSG will set that up automatically and resolve it to the specified single-sample texture for us.
-            // For some reason, two samples are needed, at least with some drivers.
-            samples = 2;
-            colourSamples = 1;
-        }
-        attach(osg::Camera::COLOR_BUFFER, mReflectionTexture, 0, 0, false, samples, colourSamples);
+        SceneUtil::attachAlphaToCoverageFriendlyFramebufferToCamera(this, osg::Camera::COLOR_BUFFER, mReflectionTexture);
 
         // XXX: should really flip the FrontFace on each renderable instead of forcing clockwise.
         osg::ref_ptr<osg::FrontFace> frontFace (new osg::FrontFace);
diff --git a/components/sceneutil/util.cpp b/components/sceneutil/util.cpp
index 2c0d8efa0c..8a381681b1 100644
--- a/components/sceneutil/util.cpp
+++ b/components/sceneutil/util.cpp
@@ -11,6 +11,7 @@
 
 #include <components/resource/imagemanager.hpp>
 #include <components/resource/scenemanager.hpp>
+#include <components/settings/settings.hpp>
 
 namespace SceneUtil
 {
@@ -260,4 +261,19 @@ osg::ref_ptr<GlowUpdater> addEnchantedGlow(osg::ref_ptr<osg::Node> node, Resourc
     return glowUpdater;
 }
 
+bool attachAlphaToCoverageFriendlyFramebufferToCamera(osg::Camera* camera, osg::Camera::BufferComponent buffer, osg::Texture * texture, unsigned int level, unsigned int face, bool mipMapGeneration)
+{
+    unsigned int samples = 0;
+    unsigned int colourSamples = 0;
+    if (Settings::Manager::getBool("antialias alpha test", "Shaders") && Settings::Manager::getInt("antialiasing", "Video") > 1)
+    {
+        // Alpha-to-coverage requires a multisampled framebuffer.
+        // OSG will set that up automatically and resolve it to the specified single-sample texture for us.
+        // For some reason, two samples are needed, at least with some drivers.
+        samples = 2;
+        colourSamples = 1;
+    }
+    camera->attach(buffer, texture, level, face, mipMapGeneration, samples, colourSamples);
+}
+
 }
diff --git a/components/sceneutil/util.hpp b/components/sceneutil/util.hpp
index 303d609f57..8103ed87a8 100644
--- a/components/sceneutil/util.hpp
+++ b/components/sceneutil/util.hpp
@@ -3,6 +3,7 @@
 
 #include <osg/Matrix>
 #include <osg/BoundingSphere>
+#include <osg/Camera>
 #include <osg/NodeCallback>
 #include <osg/Texture2D>
 #include <osg/Vec4f>
@@ -60,6 +61,9 @@ namespace SceneUtil
     bool hasUserDescription(const osg::Node* node, const std::string pattern);
 
     osg::ref_ptr<GlowUpdater> addEnchantedGlow(osg::ref_ptr<osg::Node> node, Resource::ResourceSystem* resourceSystem, osg::Vec4f glowColor, float glowDuration=-1);
+
+    // Alpha-to-coverage requires a multisampled framebuffer, so we need to set that up for RTTs
+    bool attachAlphaToCoverageFriendlyFramebufferToCamera(osg::Camera* camera, osg::Camera::BufferComponent buffer, osg::Texture* texture, unsigned int level = 0, unsigned int face = 0, bool mipMapGeneration = false);
 }
 
 #endif

From 16e8cf89afd9a146ba3bdb345f3c46fe37e4b006 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Fri, 26 Feb 2021 20:10:03 +0000
Subject: [PATCH 0380/2859] Fix compilation of tests with MSVC

---
 components/bullethelpers/operators.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/bullethelpers/operators.hpp b/components/bullethelpers/operators.hpp
index dd2ec8017c..9250563ae9 100644
--- a/components/bullethelpers/operators.hpp
+++ b/components/bullethelpers/operators.hpp
@@ -4,6 +4,7 @@
 #include <iomanip>
 #include <limits>
 #include <ostream>
+#include <tuple>
 
 #include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
 #include <BulletCollision/CollisionShapes/btCompoundShape.h>

From 46a1715d8a63230c04755a39c34cddae8f6e6fb2 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Fri, 26 Feb 2021 20:10:58 +0000
Subject: [PATCH 0381/2859] Actually return something

---
 components/sceneutil/util.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/components/sceneutil/util.cpp b/components/sceneutil/util.cpp
index 8a381681b1..fa3c7d26da 100644
--- a/components/sceneutil/util.cpp
+++ b/components/sceneutil/util.cpp
@@ -265,7 +265,8 @@ bool attachAlphaToCoverageFriendlyFramebufferToCamera(osg::Camera* camera, osg::
 {
     unsigned int samples = 0;
     unsigned int colourSamples = 0;
-    if (Settings::Manager::getBool("antialias alpha test", "Shaders") && Settings::Manager::getInt("antialiasing", "Video") > 1)
+    bool addMSAAIntermediateTarget = Settings::Manager::getBool("antialias alpha test", "Shaders") && Settings::Manager::getInt("antialiasing", "Video") > 1;
+    if (addMSAAIntermediateTarget)
     {
         // Alpha-to-coverage requires a multisampled framebuffer.
         // OSG will set that up automatically and resolve it to the specified single-sample texture for us.
@@ -274,6 +275,7 @@ bool attachAlphaToCoverageFriendlyFramebufferToCamera(osg::Camera* camera, osg::
         colourSamples = 1;
     }
     camera->attach(buffer, texture, level, face, mipMapGeneration, samples, colourSamples);
+    return addMSAAIntermediateTarget;
 }
 
 }

From 044e7840726b19bc06b792954b9763238e9661a7 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Wed, 27 Jan 2021 00:10:50 +0000
Subject: [PATCH 0382/2859] gl4es: Delay feature detection until a context
 exists

gl4es feature detection does not work reliably with EGL.

If a context already exists, gl4es can instead reliably detect
the underlying GLES features from the context itself.

This requires gl4es to be configured with:

    -DNOEGL=ON -DNO_LOADER=ON -DNO_INIT_CONSTRUCTOR=ON

This also requires gl4es to have this fix: https://github.com/ptitSeb/gl4es/pull/271
---
 CMakeLists.txt                           |  5 ++++
 components/CMakeLists.txt                |  2 +-
 components/sdlutil/gl4es_init.cpp        | 36 ++++++++++++++++++++++++
 components/sdlutil/gl4es_init.h          | 13 +++++++++
 components/sdlutil/sdlgraphicswindow.cpp | 10 ++++++-
 5 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 components/sdlutil/gl4es_init.cpp
 create mode 100644 components/sdlutil/gl4es_init.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fdac00d1e5..14820b0759 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,11 @@ endif()
 # Detect OS
 include(cmake/OSIdentity.cmake)
 
+option(OPENMW_GL4ES_MANUAL_INIT "Manually initialize gl4es. This is more reliable on platforms without a windowing system. Requires gl4es to be configured with -DNOEGL=ON -DNO_LOADER=ON -DNO_INIT_CONSTRUCTOR=ON." OFF)
+if(OPENMW_GL4ES_MANUAL_INIT)
+    add_definitions(-DOPENMW_GL4ES_MANUAL_INIT)
+endif()
+
 # Apps and tools
 option(BUILD_OPENMW             "Build OpenMW" ON)
 option(BUILD_LAUNCHER           "Build Launcher" ON)
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 2120afc1a4..95150a5974 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -140,7 +140,7 @@ add_component_dir (fontloader
     )
 
 add_component_dir (sdlutil
-    sdlgraphicswindow imagetosurface sdlinputwrapper sdlvideowrapper events sdlcursormanager
+    gl4es_init sdlgraphicswindow imagetosurface sdlinputwrapper sdlvideowrapper events sdlcursormanager
     )
 
 add_component_dir (version
diff --git a/components/sdlutil/gl4es_init.cpp b/components/sdlutil/gl4es_init.cpp
new file mode 100644
index 0000000000..bf9e007b65
--- /dev/null
+++ b/components/sdlutil/gl4es_init.cpp
@@ -0,0 +1,36 @@
+// EGL does not work reliably for feature detection.
+// Instead, we initialize gl4es manually.
+#ifdef OPENMW_GL4ES_MANUAL_INIT
+#include "gl4es_init.h"
+
+// For glHint
+#include <GL/gl.h>
+
+extern "C" {
+
+#include <gl4es/gl4esinit.h>
+#include <gl4es/gl4eshint.h>
+
+static SDL_Window *gWindow;
+
+void openmw_gl4es_GetMainFBSize(int *width, int *height)
+{
+    SDL_GetWindowSize(gWindow, width, height);
+}
+
+void openmw_gl4es_init(SDL_Window *window)
+{
+    gWindow = window;
+    set_getprocaddress(SDL_GL_GetProcAddress);
+    set_getmainfbsize(openmw_gl4es_GetMainFBSize);
+    initialize_gl4es();
+
+    // merge glBegin/glEnd in beams and console
+    glHint(GL_BEGINEND_HINT_GL4ES, 1);
+    // dxt unpacked to 16-bit looks ugly
+    glHint(GL_AVOID16BITS_HINT_GL4ES, 1);
+}
+
+}  // extern "C"
+
+#endif  // OPENMW_GL4ES_MANUAL_INIT
diff --git a/components/sdlutil/gl4es_init.h b/components/sdlutil/gl4es_init.h
new file mode 100644
index 0000000000..11371e7aef
--- /dev/null
+++ b/components/sdlutil/gl4es_init.h
@@ -0,0 +1,13 @@
+#ifndef OPENMW_COMPONENTS_SDLUTIL_GL4ES_INIT_H
+#define OPENMW_COMPONENTS_SDLUTIL_GL4ES_INIT_H
+#ifdef OPENMW_GL4ES_MANUAL_INIT
+#include <SDL_video.h>
+
+// Must be called once SDL video mode has been set,
+// which creates a context.
+//
+// GL4ES can then query the context for features and extensions.
+extern "C" void openmw_gl4es_init(SDL_Window *window);
+
+#endif  // OPENMW_GL4ES_MANUAL_INIT
+#endif  // OPENMW_COMPONENTS_SDLUTIL_GL4ES_INIT_H
diff --git a/components/sdlutil/sdlgraphicswindow.cpp b/components/sdlutil/sdlgraphicswindow.cpp
index ad7ecd9ae3..43284c216d 100644
--- a/components/sdlutil/sdlgraphicswindow.cpp
+++ b/components/sdlutil/sdlgraphicswindow.cpp
@@ -2,6 +2,10 @@
 
 #include <SDL_video.h>
 
+#ifdef OPENMW_GL4ES_MANUAL_INIT
+#include "gl4es_init.h"
+#endif
+
 namespace SDLUtil
 {
 
@@ -91,7 +95,7 @@ void GraphicsWindowSDL2::init()
     SDL_Window *oldWin = SDL_GL_GetCurrentWindow();
     SDL_GLContext oldCtx = SDL_GL_GetCurrentContext();
    
-#if defined(ANDROID)
+#if defined(ANDROID) || defined(OPENMW_GL4ES_MANUAL_INIT)
     int major = 1;
     int minor = 1;
     char *ver = getenv("OPENMW_GLES_VERSION");
@@ -116,6 +120,10 @@ void GraphicsWindowSDL2::init()
         return;
     }
 
+#ifdef OPENMW_GL4ES_MANUAL_INIT
+    openmw_gl4es_init(mWindow);
+#endif
+
     setSwapInterval(_traits->vsync);
 
     // Update traits with what we've actually been given

From fdca76ce86f54e899e40f205b8d88b782062ab38 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 28 Feb 2021 20:42:23 +0100
Subject: [PATCH 0383/2859] Remove unused includes

---
 .../detournavigator/tilecachedrecastmeshmanager.cpp           | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
index eac3c024fe..be52090014 100644
--- a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -4,10 +4,6 @@
 #include <components/detournavigator/settingsutils.hpp>
 
 #include <BulletCollision/CollisionShapes/btBoxShape.h>
-#include <BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h>
-#include <BulletCollision/CollisionShapes/btTriangleMesh.h>
-#include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
-#include <BulletCollision/CollisionShapes/btCompoundShape.h>
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>

From fac57597481ff8cb11559f49f04430a3ad3c7f0d Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 28 Feb 2021 20:42:10 +0100
Subject: [PATCH 0384/2859] Set bounding min and max height for
 btHeightfieldTerrainShape

They must be set for proper AABB based filtering. Use
+-max(abs(min), abs(max)) to make sure bullet does not shift coordinates by z.
---
 .../detournavigator/navigator.cpp             | 41 ++++++++++++-------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index c6d093d5f7..d377aed1eb 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -76,6 +76,17 @@ namespace
         }
     };
 
+    template <std::size_t size>
+    btHeightfieldTerrainShape makeSquareHeightfieldTerrainShape(const std::array<btScalar, size>& values,
+        btScalar heightScale = 1, int upAxis = 2, PHY_ScalarType heightDataType = PHY_FLOAT, bool flipQuadEdges = false)
+    {
+        const int width = static_cast<int>(std::sqrt(size));
+        const btScalar min = *std::min_element(values.begin(), values.end());
+        const btScalar max = *std::max_element(values.begin(), values.end());
+        const btScalar greater = std::max(std::abs(min), std::abs(max));
+        return btHeightfieldTerrainShape(width, width, values.data(), heightScale, -greater, greater, upAxis, heightDataType, flipQuadEdges);
+    }
+
     TEST_F(DetourNavigatorNavigatorTest, find_path_for_empty_should_return_empty)
     {
         EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut),
@@ -108,7 +119,7 @@ namespace
             0, -25, -100, -100, -100,
             0, -25, -100, -100, -100,
         }};
-        btHeightfieldTerrainShape shape(5, 5, heightfieldData.data(), 1, 0, 0, 2, PHY_FLOAT, false);
+        btHeightfieldTerrainShape shape = makeSquareHeightfieldTerrainShape(heightfieldData);
         shape.setLocalScaling(btVector3(128, 128, 1));
 
         mNavigator->addAgent(mAgentHalfExtents);
@@ -154,7 +165,7 @@ namespace
             0, -25, -100, -100, -100,
             0, -25, -100, -100, -100,
         }};
-        btHeightfieldTerrainShape heightfieldShape(5, 5, heightfieldData.data(), 1, 0, 0, 2, PHY_FLOAT, false);
+        btHeightfieldTerrainShape heightfieldShape = makeSquareHeightfieldTerrainShape(heightfieldData);
         heightfieldShape.setLocalScaling(btVector3(128, 128, 1));
 
         btBoxShape boxShape(btVector3(20, 20, 100));
@@ -238,7 +249,7 @@ namespace
             0, -25, -100, -100, -100,
             0, -25, -100, -100, -100,
         }};
-        btHeightfieldTerrainShape heightfieldShape(5, 5, heightfieldData.data(), 1, 0, 0, 2, PHY_FLOAT, false);
+        btHeightfieldTerrainShape heightfieldShape = makeSquareHeightfieldTerrainShape(heightfieldData);
         heightfieldShape.setLocalScaling(btVector3(128, 128, 1));
 
         btBoxShape boxShape(btVector3(20, 20, 100));
@@ -325,7 +336,7 @@ namespace
             0, -25, -100, -100, -100,
             0, -25, -100, -100, -100,
         }};
-        btHeightfieldTerrainShape shape(5, 5, heightfieldData.data(), 1, 0, 0, 2, PHY_FLOAT, false);
+        btHeightfieldTerrainShape shape = makeSquareHeightfieldTerrainShape(heightfieldData);
         shape.setLocalScaling(btVector3(128, 128, 1));
 
         const std::array<btScalar, 5 * 5> heightfieldData2 {{
@@ -335,7 +346,7 @@ namespace
             -25, -25, -25, -25, -25,
             -25, -25, -25, -25, -25,
         }};
-        btHeightfieldTerrainShape shape2(5, 5, heightfieldData2.data(), 1, 0, 0, 2, PHY_FLOAT, false);
+        btHeightfieldTerrainShape shape2 = makeSquareHeightfieldTerrainShape(heightfieldData2);
         shape2.setLocalScaling(btVector3(128, 128, 1));
 
         mNavigator->addAgent(mAgentHalfExtents);
@@ -382,7 +393,7 @@ namespace
             0, -25, -100, -100, -100,
             0, -25, -100, -100, -100,
         }};
-        btHeightfieldTerrainShape shape(5, 5, heightfieldData.data(), 1, 0, 0, 2, PHY_FLOAT, false);
+        btHeightfieldTerrainShape shape = makeSquareHeightfieldTerrainShape(heightfieldData);
         shape.setLocalScaling(btVector3(128, 128, 1));
 
         std::array<btScalar, 5 * 5> heightfieldDataAvoid {{
@@ -392,7 +403,7 @@ namespace
             -25, -25, -25, -25, -25,
             -25, -25, -25, -25, -25,
         }};
-        btHeightfieldTerrainShape shapeAvoid(5, 5, heightfieldDataAvoid.data(), 1, 0, 0, 2, PHY_FLOAT, false);
+        btHeightfieldTerrainShape shapeAvoid = makeSquareHeightfieldTerrainShape(heightfieldDataAvoid);
         shapeAvoid.setLocalScaling(btVector3(128, 128, 1));
 
         mNavigator->addAgent(mAgentHalfExtents);
@@ -439,7 +450,7 @@ namespace
             -50, -100, -150, -100, -100,
               0,  -50, -100, -100, -100,
         }};
-        btHeightfieldTerrainShape shape(5, 5, heightfieldData.data(), 1, 0, 0, 2, PHY_FLOAT, false);
+        btHeightfieldTerrainShape shape = makeSquareHeightfieldTerrainShape(heightfieldData);
         shape.setLocalScaling(btVector3(128, 128, 1));
 
         mNavigator->addAgent(mAgentHalfExtents);
@@ -487,7 +498,7 @@ namespace
             0, -100, -100, -100, -100, -100, 0,
             0,    0,    0,    0,    0,    0, 0,
         }};
-        btHeightfieldTerrainShape shape(7, 7, heightfieldData.data(), 1, 0, 0, 2, PHY_FLOAT, false);
+        btHeightfieldTerrainShape shape = makeSquareHeightfieldTerrainShape(heightfieldData);
         shape.setLocalScaling(btVector3(128, 128, 1));
 
         mNavigator->addAgent(mAgentHalfExtents);
@@ -534,7 +545,7 @@ namespace
             0, -100, -100, -100, -100, -100, 0,
             0,    0,    0,    0,    0,    0, 0,
         }};
-        btHeightfieldTerrainShape shape(7, 7, heightfieldData.data(), 1, 0, 0, 2, PHY_FLOAT, false);
+        btHeightfieldTerrainShape shape = makeSquareHeightfieldTerrainShape(heightfieldData);
         shape.setLocalScaling(btVector3(128, 128, 1));
 
         mNavigator->addAgent(mAgentHalfExtents);
@@ -581,7 +592,7 @@ namespace
             0, -100, -100, -100, -100, -100, 0,
             0,    0,    0,    0,    0,    0, 0,
         }};
-        btHeightfieldTerrainShape shape(7, 7, heightfieldData.data(), 1, 0, 0, 2, PHY_FLOAT, false);
+        btHeightfieldTerrainShape shape = makeSquareHeightfieldTerrainShape(heightfieldData);
         shape.setLocalScaling(btVector3(128, 128, 1));
 
         mNavigator->addAgent(mAgentHalfExtents);
@@ -626,7 +637,7 @@ namespace
             0, -25, -100, -100, -100,
             0, -25, -100, -100, -100,
         }};
-        btHeightfieldTerrainShape shape(5, 5, heightfieldData.data(), 1, 0, 0, 2, PHY_FLOAT, false);
+        btHeightfieldTerrainShape shape = makeSquareHeightfieldTerrainShape(heightfieldData);
         shape.setLocalScaling(btVector3(128, 128, 1));
 
         mNavigator->addAgent(mAgentHalfExtents);
@@ -680,7 +691,7 @@ namespace
             0, -25, -100, -100, -100,
             0, -25, -100, -100, -100,
         }};
-        btHeightfieldTerrainShape shape(5, 5, heightfieldData.data(), 1, 0, 0, 2, PHY_FLOAT, false);
+        btHeightfieldTerrainShape shape = makeSquareHeightfieldTerrainShape(heightfieldData);
         shape.setLocalScaling(btVector3(128, 128, 1));
 
         mNavigator->addAgent(mAgentHalfExtents);
@@ -711,7 +722,7 @@ namespace
             0, -25, -100, -100, -100,
             0, -25, -100, -100, -100,
         }};
-        btHeightfieldTerrainShape heightfieldShape(5, 5, heightfieldData.data(), 1, 0, 0, 2, PHY_FLOAT, false);
+        btHeightfieldTerrainShape heightfieldShape = makeSquareHeightfieldTerrainShape(heightfieldData);
         heightfieldShape.setLocalScaling(btVector3(128, 128, 1));
 
         const std::vector<btBoxShape> boxShapes(100, btVector3(20, 20, 100));
@@ -812,7 +823,7 @@ namespace
             0, -25, -100, -100, -100,
             0, -25, -100, -100, -100,
         }};
-        btHeightfieldTerrainShape shape(5, 5, heightfieldData.data(), 1, 0, 0, 2, PHY_FLOAT, false);
+        btHeightfieldTerrainShape shape = makeSquareHeightfieldTerrainShape(heightfieldData);
         shape.setLocalScaling(btVector3(128, 128, 1));
 
         mNavigator->addAgent(mAgentHalfExtents);

From 1fb442e701213fbfec7857ea3eb34749fb6fa1f7 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Mon, 1 Mar 2021 08:12:43 +0000
Subject: [PATCH 0385/2859] heightfield: Only `buildAccelerator` on Bullet
 2.89+

Fixes #5874
---
 apps/openmw/mwphysics/heightfield.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwphysics/heightfield.cpp b/apps/openmw/mwphysics/heightfield.cpp
index cbcc9d0246..34127fe3ae 100644
--- a/apps/openmw/mwphysics/heightfield.cpp
+++ b/apps/openmw/mwphysics/heightfield.cpp
@@ -58,11 +58,14 @@ namespace MWPhysics
         mShape->setUseDiamondSubdivision(true);
         mShape->setLocalScaling(btVector3(triSize, triSize, 1));
 
-        // Enables acceleration of heighfield collissions.
+#if BT_BULLET_VERSION >= 289
+        // Accelerates some collision tests.
         //
-        // Bullet does not yet use this in the most time-consuming method, `btHeightfieldTerrainShape::processAllTriangle`.
-        // See https://github.com/bulletphysics/bullet3/issues/3276
+        // Note: The accelerator data structure in Bullet is only used
+        // in some operations. This could be improved, see:
+        // https://github.com/bulletphysics/bullet3/issues/3276
         mShape->buildAccelerator();
+#endif
 
         btTransform transform(btQuaternion::getIdentity(),
                                 btVector3((x+0.5f) * triSize * (sqrtVerts-1),

From 023bc80f550bc936b936888d50cdf170f6736ebe Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alex462002@gmail.com>
Date: Mon, 1 Mar 2021 21:37:30 +0000
Subject: [PATCH 0386/2859] Don't let elemental shields harm the player in god
 mode

---
 apps/openmw/mwmechanics/combat.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/openmw/mwmechanics/combat.cpp b/apps/openmw/mwmechanics/combat.cpp
index 183845b8c1..7c625019d2 100644
--- a/apps/openmw/mwmechanics/combat.cpp
+++ b/apps/openmw/mwmechanics/combat.cpp
@@ -305,6 +305,10 @@ namespace MWMechanics
 
     void applyElementalShields(const MWWorld::Ptr &attacker, const MWWorld::Ptr &victim)
     {
+        // Don't let elemental shields harm the player in god mode.
+        bool godmode = attacker == getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState();
+        if (godmode)
+            return;
         for (int i=0; i<3; ++i)
         {
             float magnitude = victim.getClass().getCreatureStats(victim).getMagicEffects().get(ESM::MagicEffect::FireShield+i).getMagnitude();

From 4495b67d77c958a9c33c70111dac04613a8f9701 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Sat, 23 Jan 2021 13:49:16 +0000
Subject: [PATCH 0387/2859] MyGUI HEAD compatibility

Makes OpenMW compatible with the current MyGUI HEAD at:
https://github.com/MyGUI/mygui/commit/f93d4fb614f843390cfe3492586466dc8d06c4b3

Refs #5806
---
 apps/openmw/mwgui/bookpage.hpp                |  2 +-
 components/myguiplatform/myguicompat.h        | 12 ++++++++++
 components/myguiplatform/myguidatamanager.cpp |  8 +++----
 components/myguiplatform/myguidatamanager.hpp | 11 +++++----
 .../myguiplatform/myguirendermanager.cpp      | 15 ++++++++++--
 .../myguiplatform/myguirendermanager.hpp      | 14 ++++++++---
 components/myguiplatform/myguitexture.cpp     | 19 ++++-----------
 components/myguiplatform/myguitexture.hpp     | 23 ++++++++++++++-----
 components/myguiplatform/scalinglayer.cpp     |  6 +++--
 9 files changed, 72 insertions(+), 38 deletions(-)
 create mode 100644 components/myguiplatform/myguicompat.h

diff --git a/apps/openmw/mwgui/bookpage.hpp b/apps/openmw/mwgui/bookpage.hpp
index 4e49b8f67e..f9fd930897 100644
--- a/apps/openmw/mwgui/bookpage.hpp
+++ b/apps/openmw/mwgui/bookpage.hpp
@@ -53,7 +53,7 @@ namespace MWGui
         {
             static const int fontHeight = MWBase::Environment::get().getWindowManager()->getFontHeight();
 
-            MyGUI::GlyphInfo* gi = font->getGlyphInfo(ch);
+            const MyGUI::GlyphInfo* gi = font->getGlyphInfo(ch);
             if (gi)
             {
                 const float scale = font->getDefaultHeight() / (float) fontHeight;
diff --git a/components/myguiplatform/myguicompat.h b/components/myguiplatform/myguicompat.h
new file mode 100644
index 0000000000..04ca11a79f
--- /dev/null
+++ b/components/myguiplatform/myguicompat.h
@@ -0,0 +1,12 @@
+#ifndef OPENMW_COMPONENTS_MYGUIPLATFORM_MYGUICOMPAT_H
+#define OPENMW_COMPONENTS_MYGUIPLATFORM_MYGUICOMPAT_H
+
+#include <MyGUI_Prerequest.h>
+
+#if MYGUI_VERSION > MYGUI_DEFINE_VERSION(3, 4, 0)
+    #define OPENMW_MYGUI_CONST_GETTER_3_4_1 const
+#else
+    #define OPENMW_MYGUI_CONST_GETTER_3_4_1
+#endif
+
+#endif  // OPENMW_COMPONENTS_MYGUIPLATFORM_MYGUICOMPAT_H
diff --git a/components/myguiplatform/myguidatamanager.cpp b/components/myguiplatform/myguidatamanager.cpp
index c90e092215..0310e996b9 100644
--- a/components/myguiplatform/myguidatamanager.cpp
+++ b/components/myguiplatform/myguidatamanager.cpp
@@ -15,7 +15,7 @@ void DataManager::setResourcePath(const std::string &path)
     mResourcePath = path;
 }
 
-MyGUI::IDataStream *DataManager::getData(const std::string &name)
+MyGUI::IDataStream *DataManager::getData(const std::string &name) OPENMW_MYGUI_CONST_GETTER_3_4_1
 {
     std::string fullpath = getDataPath(name);
     std::unique_ptr<boost::filesystem::ifstream> stream;
@@ -34,13 +34,13 @@ void DataManager::freeData(MyGUI::IDataStream *data)
     delete data;
 }
 
-bool DataManager::isDataExist(const std::string &name)
+bool DataManager::isDataExist(const std::string &name) OPENMW_MYGUI_CONST_GETTER_3_4_1
 {
     std::string fullpath = mResourcePath + "/" + name;
     return boost::filesystem::exists(fullpath);
 }
 
-const MyGUI::VectorString &DataManager::getDataListNames(const std::string &pattern)
+const MyGUI::VectorString &DataManager::getDataListNames(const std::string &pattern) OPENMW_MYGUI_CONST_GETTER_3_4_1
 {
     // TODO: pattern matching (unused?)
     static MyGUI::VectorString strings;
@@ -49,7 +49,7 @@ const MyGUI::VectorString &DataManager::getDataListNames(const std::string &patt
     return strings;
 }
 
-const std::string &DataManager::getDataPath(const std::string &name)
+const std::string &DataManager::getDataPath(const std::string &name) OPENMW_MYGUI_CONST_GETTER_3_4_1
 {
     static std::string result;
     result.clear();
diff --git a/components/myguiplatform/myguidatamanager.hpp b/components/myguiplatform/myguidatamanager.hpp
index a97c6ad2e0..ca2f94899c 100644
--- a/components/myguiplatform/myguidatamanager.hpp
+++ b/components/myguiplatform/myguidatamanager.hpp
@@ -3,10 +3,11 @@
 
 #include <MyGUI_DataManager.h>
 
+#include "myguicompat.h"
+
 namespace osgMyGUI
 {
 
-
 class DataManager : public MyGUI::DataManager
 {
 public:
@@ -18,7 +19,7 @@ public:
     /** Get data stream from specified resource name.
         @param _name Resource name (usually file name).
     */
-    MyGUI::IDataStream* getData(const std::string& _name) override;
+    MyGUI::IDataStream* getData(const std::string& _name) OPENMW_MYGUI_CONST_GETTER_3_4_1 override;
 
     /** Free data stream.
         @param _data Data stream.
@@ -28,18 +29,18 @@ public:
     /** Is data with specified name exist.
         @param _name Resource name.
     */
-    bool isDataExist(const std::string& _name) override;
+    bool isDataExist(const std::string& _name) OPENMW_MYGUI_CONST_GETTER_3_4_1 override;
 
     /** Get all data names with names that matches pattern.
         @param _pattern Pattern to match (for example "*.layout").
     */
-    const MyGUI::VectorString& getDataListNames(const std::string& _pattern) override;
+    const MyGUI::VectorString& getDataListNames(const std::string& _pattern) OPENMW_MYGUI_CONST_GETTER_3_4_1 override;
 
     /** Get full path to data.
         @param _name Resource name.
         @return Return full path to specified data.
     */
-    const std::string& getDataPath(const std::string& _name) override;
+    const std::string& getDataPath(const std::string& _name) OPENMW_MYGUI_CONST_GETTER_3_4_1 override;
 
 private:
     std::string mResourcePath;
diff --git a/components/myguiplatform/myguirendermanager.cpp b/components/myguiplatform/myguirendermanager.cpp
index dc771f11f2..1813c9e014 100644
--- a/components/myguiplatform/myguirendermanager.cpp
+++ b/components/myguiplatform/myguirendermanager.cpp
@@ -14,6 +14,7 @@
 
 #include <components/resource/imagemanager.hpp>
 
+#include "myguicompat.h"
 #include "myguitexture.hpp"
 
 #define MYGUI_PLATFORM_LOG_SECTION "Platform"
@@ -263,7 +264,7 @@ public:
     osg::VertexBufferObject* getVertexBuffer();
 
     void setVertexCount(size_t count) override;
-    size_t getVertexCount() override;
+    size_t getVertexCount() OPENMW_MYGUI_CONST_GETTER_3_4_1 override;
 
     MyGUI::Vertex *lock() override;
     void unlock() override;
@@ -290,7 +291,7 @@ void OSGVertexBuffer::setVertexCount(size_t count)
     mNeedVertexCount = count;
 }
 
-size_t OSGVertexBuffer::getVertexCount()
+size_t OSGVertexBuffer::getVertexCount() OPENMW_MYGUI_CONST_GETTER_3_4_1
 {
     return mNeedVertexCount;
 }
@@ -560,4 +561,14 @@ bool RenderManager::checkTexture(MyGUI::ITexture* _texture)
     return true;
 }
 
+#if MYGUI_VERSION > MYGUI_DEFINE_VERSION(3, 4, 0)
+void RenderManager::registerShader(
+    const std::string& _shaderName,
+    const std::string& _vertexProgramFile,
+    const std::string& _fragmentProgramFile)
+{
+    MYGUI_PLATFORM_LOG(Warning, "osgMyGUI::RenderManager::registerShader is not implemented");
+}
+#endif
+
 }
diff --git a/components/myguiplatform/myguirendermanager.hpp b/components/myguiplatform/myguirendermanager.hpp
index 72abebd186..3c3fb672d6 100644
--- a/components/myguiplatform/myguirendermanager.hpp
+++ b/components/myguiplatform/myguirendermanager.hpp
@@ -5,6 +5,8 @@
 
 #include <osg/ref_ptr>
 
+#include "myguicompat.h"
+
 namespace Resource
 {
     class ImageManager;
@@ -70,7 +72,8 @@ public:
     const MyGUI::IntSize& getViewSize() const override { return mViewSize; }
 
     /** @see RenderManager::getVertexFormat */
-    MyGUI::VertexColourType getVertexFormat() override { return mVertexFormat; }
+    MyGUI::VertexColourType getVertexFormat() OPENMW_MYGUI_CONST_GETTER_3_4_1 override
+    { return mVertexFormat; }
 
     /** @see RenderManager::isFormatSupported */
     bool isFormatSupported(MyGUI::PixelFormat format, MyGUI::TextureUsage usage) override;
@@ -102,17 +105,22 @@ public:
     void setInjectState(osg::StateSet* stateSet);
 
     /** @see IRenderTarget::getInfo */
-    const MyGUI::RenderTargetInfo& getInfo() override { return mInfo; }
+    const MyGUI::RenderTargetInfo& getInfo() OPENMW_MYGUI_CONST_GETTER_3_4_1 override { return mInfo; }
 
     bool checkTexture(MyGUI::ITexture* _texture);
 
     // setViewSize() is a part of MyGUI::RenderManager interface since 3.4.0 release
-#if MYGUI_VERSION < MYGUI_DEFINE_VERSION(3,4,0)
+#if MYGUI_VERSION < MYGUI_DEFINE_VERSION(3, 4, 0)
     void setViewSize(int width, int height);
 #else
     void setViewSize(int width, int height) override;
 #endif
 
+    // registerShader() is a part of MyGUI::RenderManager interface since 3.4.1 release
+#if MYGUI_VERSION > MYGUI_DEFINE_VERSION(3, 4, 0)
+    void registerShader(const std::string& _shaderName, const std::string& _vertexProgramFile, const std::string& _fragmentProgramFile) override;
+#endif
+
 /*internal:*/
 
     void collectDrawCalls();
diff --git a/components/myguiplatform/myguitexture.cpp b/components/myguiplatform/myguitexture.cpp
index 598f5a14e9..ce7332cc7e 100644
--- a/components/myguiplatform/myguitexture.cpp
+++ b/components/myguiplatform/myguitexture.cpp
@@ -115,16 +115,6 @@ namespace osgMyGUI
         Log(Debug::Warning) << "Would save image to file " << fname;
     }
 
-    int OSGTexture::getWidth()
-    {
-        return mWidth;
-    }
-
-    int OSGTexture::getHeight()
-    {
-        return mHeight;
-    }
-
     void *OSGTexture::lock(MyGUI::TextureUsage /*access*/)
     {
         if (!mTexture.valid())
@@ -167,15 +157,14 @@ namespace osgMyGUI
         mLockedImage = nullptr;
     }
 
-    bool OSGTexture::isLocked()
-    {
-        return mLockedImage.valid();
-    }
-
     // Render-to-texture not currently implemented.
     MyGUI::IRenderTarget* OSGTexture::getRenderTarget()
     {
         return nullptr;
     }
 
+#if MYGUI_VERSION > MYGUI_DEFINE_VERSION(3, 4, 0)
+    void OSGTexture::setShader(const std::string& _shaderName)
+    { Log(Debug::Warning) << "OSGTexture::setShader is not implemented"; }
+#endif
 }
diff --git a/components/myguiplatform/myguitexture.hpp b/components/myguiplatform/myguitexture.hpp
index 6baeb74591..a34f1b7628 100644
--- a/components/myguiplatform/myguitexture.hpp
+++ b/components/myguiplatform/myguitexture.hpp
@@ -5,6 +5,12 @@
 
 #include <osg/ref_ptr>
 
+#if MYGUI_VERSION > MYGUI_DEFINE_VERSION(3, 4, 0)
+    #define OPENMW_MYGUI_CONST_GETTER_3_4_1 const
+#else
+    #define OPENMW_MYGUI_CONST_GETTER_3_4_1
+#endif
+
 namespace osg
 {
     class Image;
@@ -47,17 +53,22 @@ namespace osgMyGUI
 
         void* lock(MyGUI::TextureUsage access) override;
         void unlock() override;
-        bool isLocked() override;
+        bool isLocked() OPENMW_MYGUI_CONST_GETTER_3_4_1 override { return mLockedImage.valid(); }
 
-        int getWidth() override;
-        int getHeight() override;
+        int getWidth() OPENMW_MYGUI_CONST_GETTER_3_4_1 override { return mWidth; }
+        int getHeight() OPENMW_MYGUI_CONST_GETTER_3_4_1 override { return mHeight; }
 
-        MyGUI::PixelFormat getFormat() override { return mFormat; }
-        MyGUI::TextureUsage getUsage() override { return mUsage; }
-        size_t getNumElemBytes() override { return mNumElemBytes; }
+        MyGUI::PixelFormat getFormat() OPENMW_MYGUI_CONST_GETTER_3_4_1 override { return mFormat; }
+        MyGUI::TextureUsage getUsage() OPENMW_MYGUI_CONST_GETTER_3_4_1 override { return mUsage; }
+        size_t getNumElemBytes() OPENMW_MYGUI_CONST_GETTER_3_4_1 override { return mNumElemBytes; }
 
         MyGUI::IRenderTarget *getRenderTarget() override;
 
+    // setShader() is a part of MyGUI::RenderManager interface since 3.4.1 release
+#if MYGUI_VERSION > MYGUI_DEFINE_VERSION(3, 4, 0)
+    void setShader(const std::string& _shaderName) override;
+#endif
+
     /*internal:*/
         osg::Texture2D *getTexture() const { return mTexture.get(); }
     };
diff --git a/components/myguiplatform/scalinglayer.cpp b/components/myguiplatform/scalinglayer.cpp
index 07a5161b2d..99ed6d07a3 100644
--- a/components/myguiplatform/scalinglayer.cpp
+++ b/components/myguiplatform/scalinglayer.cpp
@@ -3,6 +3,8 @@
 #include <MyGUI_RenderManager.h>
 #include <algorithm>
 
+#include "myguicompat.h"
+
 namespace osgMyGUI
 {
 
@@ -37,7 +39,7 @@ namespace osgMyGUI
             mTarget->doRender(_buffer, _texture, _count);
         }
 
-        const MyGUI::RenderTargetInfo& getInfo() override
+        const MyGUI::RenderTargetInfo& getInfo() OPENMW_MYGUI_CONST_GETTER_3_4_1 override
         {
             mInfo = mTarget->getInfo();
             mInfo.hOffset = mHOffset;
@@ -51,7 +53,7 @@ namespace osgMyGUI
         MyGUI::IRenderTarget* mTarget;
         MyGUI::IntSize mViewSize;
         float mHOffset, mVOffset;
-        MyGUI::RenderTargetInfo mInfo;
+        mutable MyGUI::RenderTargetInfo mInfo;
     };
 
     MyGUI::ILayerItem *ScalingLayer::getLayerItemByPoint(int _left, int _top) const

From 8a1644885bda27a65c86133b01737e8adcd51fa9 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Sat, 20 Feb 2021 11:20:49 +0000
Subject: [PATCH 0388/2859] MyGUI: Bump version to 3.4.1

Also set MYGUI_DONT_USE_OBSOLETE
---
 extern/CMakeLists.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index b4182a1053..d746183b0b 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -59,6 +59,7 @@ if(NOT OPENMW_USE_SYSTEM_MYGUI)
     set(MYGUI_BUILD_DEMOS OFF CACHE BOOL "")
     set(MYGUI_BUILD_PLUGINS OFF CACHE BOOL "")
     set(MYGUI_BUILD_TOOLS OFF CACHE BOOL "")
+    set(MYGUI_DONT_USE_OBSOLETE ON CACHE BOOL "")
 
     if(MYGUI_STATIC)
         set(BUILD_SHARED_LIBS OFF)
@@ -68,8 +69,8 @@ if(NOT OPENMW_USE_SYSTEM_MYGUI)
 
     include(FetchContent)
     FetchContent_Declare(mygui
-        URL https://github.com/MyGUI/mygui/archive/MyGUI3.4.0.zip
-        URL_HASH MD5=9e990a4240430cbf567bfe73488a274e
+        URL https://github.com/MyGUI/mygui/archive/MyGUI3.4.1.zip
+        URL_HASH MD5=952d4033854612c99a5d9bf4b8550c26
         SOURCE_DIR fetched/mygui
     )
     FetchContent_MakeAvailableExcludeFromAll(mygui)

From 28cb14289ae97f77ca802fda44256c090f714cd1 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Sun, 21 Feb 2021 01:03:36 +0100
Subject: [PATCH 0389/2859] initial attempt at FindRecastNavigation.cmake

---
 CI/install_debian_deps.sh        |   1 +
 CMakeLists.txt                   |   4 +
 cmake/FindRecastNavigation.cmake | 143 +++++++++++++++++++++++++++++++
 components/CMakeLists.txt        |   5 +-
 4 files changed, 151 insertions(+), 2 deletions(-)
 create mode 100644 cmake/FindRecastNavigation.cmake

diff --git a/CI/install_debian_deps.sh b/CI/install_debian_deps.sh
index 82d2ff6819..3e7ab7fca3 100755
--- a/CI/install_debian_deps.sh
+++ b/CI/install_debian_deps.sh
@@ -23,6 +23,7 @@ declare -rA GROUPED_DEPS=(
     libsdl2-dev libqt5opengl5-dev libopenal-dev libunshield-dev libtinyxml-dev
     libbullet-dev liblz4-dev libpng-dev libjpeg-dev
   "
+  # TODO: add librecastnavigation-dev when debian is ready
 
   # These dependencies can alternatively be built and linked statically.
   [openmw-deps-dynamic]="libmygui-dev libopenscenegraph-dev"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fdac00d1e5..405f4e8740 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -130,6 +130,10 @@ option(MYGUI_STATIC "Link static build of Mygui into the binaries" ${_mygui_stat
 option(OPENMW_USE_SYSTEM_RECASTNAVIGATION "Use system provided recastnavigation library" OFF)
 if(OPENMW_USE_SYSTEM_RECASTNAVIGATION)
     set(_recastnavigation_static_default OFF)
+
+    find_package(RecastNavigation REQUIRED)
+    include_directories(SYSTEM ${RecastNavigation_INCLUDE_DIRS})
+
 else()
     set(_recastnavigation_static_default ON)
 endif()
diff --git a/cmake/FindRecastNavigation.cmake b/cmake/FindRecastNavigation.cmake
new file mode 100644
index 0000000000..ae85faaaaa
--- /dev/null
+++ b/cmake/FindRecastNavigation.cmake
@@ -0,0 +1,143 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+#[=======================================================================[.rst:
+FindRecastNavigation
+-------
+
+Find the RecastNavigation include directory and library.
+
+Use this module by invoking find_package with the form::
+
+.. code-block:: cmake
+
+  find_package(RecastNavigation
+    [version]              # Minimum version e.g. 1.8.0
+    [REQUIRED]             # Fail with error if RECASTNAV is not found
+  )
+
+Imported targets
+^^^^^^^^^^^^^^^^
+
+This module defines the following :prop_tgt:`IMPORTED` targets:
+
+.. variable:: RecastNavigation::Recast
+
+  Imported target for using the RECASTNAV library, if found.
+
+Result variables
+^^^^^^^^^^^^^^^^
+
+.. variable:: RECASTNAV_FOUND
+
+  Set to true if RECASTNAV library found, otherwise false or undefined.
+
+.. variable:: RECASTNAV_INCLUDE_DIRS
+
+  Paths to include directories listed in one variable for use by RECASTNAV client.
+
+.. variable:: RECASTNAV_LIBRARIES
+
+  Paths to libraries to linked against to use RECASTNAV.
+
+.. variable:: RECAST_VERSION
+
+  The version string of RECASTNAV found.
+
+Cache variables
+^^^^^^^^^^^^^^^
+
+For users who wish to edit and control the module behavior, this module
+reads hints about search locations from the following variables::
+
+.. variable:: RECASTNAV_INCLUDE_DIR
+
+  Path to RECASTNAV include directory with ``Recast.h`` header.
+
+.. variable:: RECASTNAV_LIBRARY
+
+  Path to RECASTNAV library to be linked.
+
+NOTE: The variables above should not usually be used in CMakeLists.txt files!
+
+#]=======================================================================]
+
+### Find library ##############################################################
+
+if(NOT RECASTNAV_LIBRARY)
+    find_library(RECASTNAV_LIBRARY_RELEASE NAMES Recast)
+    find_library(RECASTNAV_LIBRARY_DEBUG NAMES Recastd)
+
+# TODO: figure out a way to get Recast, Detour and DebugUtils libs together
+#    find_library(RECAST_LIBRARY_RELEASE NAMES Recast)
+#    find_library(RECAST_LIBRARY_DEBUG NAMES Recastd)
+
+#    find_library(DETOUR_LIBRARY_RELEASE NAMES Detour)
+#    find_library(DETOUR_LIBRARY_DEBUG NAMES Detourd)
+
+#    SET(RECASTNAV_LIBRARY_RELEASE ${RECAST_LIBRARY_RELEASE} ${DETOUR_LIBRARY_RELEASE})
+#    SET(RECASTNAV_LIBRARY_DEBUG ${RECAST_LIBRARY_DEBUG} ${DETOUR_LIBRARY_DEBUG})
+
+    include(SelectLibraryConfigurations)
+    select_library_configurations(RECASTNAV)
+else()
+    file(TO_CMAKE_PATH "${RECASTNAV_LIBRARY}" RECASTNAV_LIBRARY)
+endif()
+
+### Find include directory ####################################################
+find_path(RECASTNAV_INCLUDE_DIR NAMES Recast.h PATH_SUFFIXES include RECASTNAV include/recastnavigation)
+
+if(RECASTNAV_INCLUDE_DIR AND EXISTS "${RECASTNAV_INCLUDE_DIR}/Recast.h")
+    file(STRINGS "${RECASTNAV_INCLUDE_DIR}/Recast.h" _Recast_h_contents
+            REGEX "#define RECAST_VERSION_[A-Z]+[ ]+[0-9]+")
+    string(REGEX REPLACE "#define RECAST_VERSION_MAJOR[ ]+([0-9]+).+" "\\1"
+            RECAST_VERSION_MAJOR "${_Recast_h_contents}")
+    string(REGEX REPLACE ".+#define RECAST_VERSION_MINOR[ ]+([0-9]+).+" "\\1"
+            RECAST_VERSION_MINOR "${_Recast_h_contents}")
+    string(REGEX REPLACE ".+#define RECAST_VERSION_RELEASE[ ]+([0-9]+).*" "\\1"
+            RECAST_VERSION_RELEASE "${_Recast_h_contents}")
+    set(RECAST_VERSION "${RECAST_VERSION_MAJOR}.${RECAST_VERSION_MINOR}.${RECAST_VERSION_RELEASE}")
+    unset(_Recast_h_contents)
+endif()
+
+#TODO: they don't include a version yet
+set(RECAST_VERSION "1.5.1")
+
+### Set result variables ######################################################
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(RecastNavigation DEFAULT_MSG
+        RECASTNAV_LIBRARY RECASTNAV_INCLUDE_DIR RECAST_VERSION)
+
+mark_as_advanced(RECASTNAV_INCLUDE_DIR RECASTNAV_LIBRARY)
+
+set(RECASTNAV_LIBRARIES ${RECASTNAV_LIBRARY})
+set(RECASTNAV_INCLUDE_DIRS ${RECASTNAV_INCLUDE_DIR})
+
+### Import targets ############################################################
+if(RECASTNAV_FOUND)
+    if(NOT TARGET RecastNavigation::Recast)
+        add_library(RecastNavigation::Recast UNKNOWN IMPORTED)
+        set_target_properties(RecastNavigation::Recast PROPERTIES
+                IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+                INTERFACE_INCLUDE_DIRECTORIES "${RECASTNAV_INCLUDE_DIR}")
+
+        if(RECASTNAV_LIBRARY_RELEASE)
+            set_property(TARGET RecastNavigation::Recast APPEND PROPERTY
+                    IMPORTED_CONFIGURATIONS RELEASE)
+            set_target_properties(RecastNavigation::Recast PROPERTIES
+                    IMPORTED_LOCATION_RELEASE "${RECASTNAV_LIBRARY_RELEASE}")
+        endif()
+
+        if(RECASTNAV_LIBRARY_DEBUG)
+            set_property(TARGET RecastNavigation::Recast APPEND PROPERTY
+                    IMPORTED_CONFIGURATIONS DEBUG)
+            set_target_properties(RecastNavigation::Recast PROPERTIES
+                    IMPORTED_LOCATION_DEBUG "${RECASTNAV_LIBRARY_DEBUG}")
+        endif()
+
+        if(NOT RECASTNAV_LIBRARY_RELEASE AND NOT RECASTNAV_LIBRARY_DEBUG)
+            set_property(TARGET RecastNavigation::Recast APPEND PROPERTY
+                    IMPORTED_LOCATION "${RECASTNAV_LIBRARY}")
+        endif()
+    endif()
+endif()
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 2120afc1a4..349f1cd79f 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -241,8 +241,9 @@ target_link_libraries(components
     ${OPENGL_gl_LIBRARY}
     ${MyGUI_LIBRARIES}
     LZ4::LZ4
-    RecastNavigation::DebugUtils
-    RecastNavigation::Detour
+# TODO: uncomment these when ready
+#    RecastNavigation::DebugUtils
+#    RecastNavigation::Detour
     RecastNavigation::Recast
     )
 

From ed74834e01aa68c75d36857833dbf0f177fa7556 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Sun, 21 Feb 2021 21:19:11 +0100
Subject: [PATCH 0390/2859] put back the recast stuff

---
 components/CMakeLists.txt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 349f1cd79f..2120afc1a4 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -241,9 +241,8 @@ target_link_libraries(components
     ${OPENGL_gl_LIBRARY}
     ${MyGUI_LIBRARIES}
     LZ4::LZ4
-# TODO: uncomment these when ready
-#    RecastNavigation::DebugUtils
-#    RecastNavigation::Detour
+    RecastNavigation::DebugUtils
+    RecastNavigation::Detour
     RecastNavigation::Recast
     )
 

From c4064fca0c7335b20f87579b5a848910fac51db0 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Tue, 2 Mar 2021 23:11:06 +0100
Subject: [PATCH 0391/2859] include feedback and add DebugUtils and Detour

---
 CMakeLists.txt                   |  3 -
 cmake/FindRecastNavigation.cmake | 95 +++++++++++++++++++++++++++-----
 2 files changed, 80 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 405f4e8740..055f981aa6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -130,10 +130,7 @@ option(MYGUI_STATIC "Link static build of Mygui into the binaries" ${_mygui_stat
 option(OPENMW_USE_SYSTEM_RECASTNAVIGATION "Use system provided recastnavigation library" OFF)
 if(OPENMW_USE_SYSTEM_RECASTNAVIGATION)
     set(_recastnavigation_static_default OFF)
-
     find_package(RecastNavigation REQUIRED)
-    include_directories(SYSTEM ${RecastNavigation_INCLUDE_DIRS})
-
 else()
     set(_recastnavigation_static_default ON)
 endif()
diff --git a/cmake/FindRecastNavigation.cmake b/cmake/FindRecastNavigation.cmake
index ae85faaaaa..b0ce629a97 100644
--- a/cmake/FindRecastNavigation.cmake
+++ b/cmake/FindRecastNavigation.cmake
@@ -62,30 +62,38 @@ NOTE: The variables above should not usually be used in CMakeLists.txt files!
 
 #]=======================================================================]
 
-### Find library ##############################################################
+### Find libraries ##############################################################
 
 if(NOT RECASTNAV_LIBRARY)
     find_library(RECASTNAV_LIBRARY_RELEASE NAMES Recast)
     find_library(RECASTNAV_LIBRARY_DEBUG NAMES Recastd)
-
-# TODO: figure out a way to get Recast, Detour and DebugUtils libs together
-#    find_library(RECAST_LIBRARY_RELEASE NAMES Recast)
-#    find_library(RECAST_LIBRARY_DEBUG NAMES Recastd)
-
-#    find_library(DETOUR_LIBRARY_RELEASE NAMES Detour)
-#    find_library(DETOUR_LIBRARY_DEBUG NAMES Detourd)
-
-#    SET(RECASTNAV_LIBRARY_RELEASE ${RECAST_LIBRARY_RELEASE} ${DETOUR_LIBRARY_RELEASE})
-#    SET(RECASTNAV_LIBRARY_DEBUG ${RECAST_LIBRARY_DEBUG} ${DETOUR_LIBRARY_DEBUG})
-
     include(SelectLibraryConfigurations)
     select_library_configurations(RECASTNAV)
 else()
     file(TO_CMAKE_PATH "${RECASTNAV_LIBRARY}" RECASTNAV_LIBRARY)
 endif()
 
+if(NOT DETOUR_LIBRARY)
+    find_library(DETOUR_LIBRARY_RELEASE NAMES Detour)
+    find_library(DETOUR_LIBRARY_DEBUG NAMES Detourd)
+    include(SelectLibraryConfigurations)
+    select_library_configurations(DETOUR)
+else()
+    file(TO_CMAKE_PATH "${DETOUR_LIBRARY}" DETOUR_LIBRARY)
+endif()
+
+if(NOT DEBUGUTILS_LIBRARY)
+    find_library(DEBUGUTILS_LIBRARY_RELEASE NAMES DebugUtils)
+    find_library(DEBUGUTILS_LIBRARY_DEBUG NAMES DebugUtilsd)
+    include(SelectLibraryConfigurations)
+    select_library_configurations(DEBUGUTILS)
+else()
+    file(TO_CMAKE_PATH "${DEBUGUTILS_LIBRARY}" DEBUGUTILS_LIBRARY)
+endif()
+
 ### Find include directory ####################################################
 find_path(RECASTNAV_INCLUDE_DIR NAMES Recast.h PATH_SUFFIXES include RECASTNAV include/recastnavigation)
+mark_as_advanced(RECASTNAV_INCLUDE_DIR RECASTNAV_LIBRARY)
 
 if(RECASTNAV_INCLUDE_DIR AND EXISTS "${RECASTNAV_INCLUDE_DIR}/Recast.h")
     file(STRINGS "${RECASTNAV_INCLUDE_DIR}/Recast.h" _Recast_h_contents
@@ -108,13 +116,17 @@ include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(RecastNavigation DEFAULT_MSG
         RECASTNAV_LIBRARY RECASTNAV_INCLUDE_DIR RECAST_VERSION)
 
-mark_as_advanced(RECASTNAV_INCLUDE_DIR RECASTNAV_LIBRARY)
-
 set(RECASTNAV_LIBRARIES ${RECASTNAV_LIBRARY})
 set(RECASTNAV_INCLUDE_DIRS ${RECASTNAV_INCLUDE_DIR})
 
+set(DETOUR_LIBRARIES ${DETOUR_LIBRARY})
+set(DETOUR_INCLUDE_DIRS ${RECASTNAV_INCLUDE_DIR})
+
+set(DEBUGUTILS_LIBRARIES ${DEBUGUTILS_LIBRARY})
+set(DEBUGUTILS_INCLUDE_DIRS ${RECASTNAV_INCLUDE_DIR})
+
 ### Import targets ############################################################
-if(RECASTNAV_FOUND)
+if(RecastNavigation_FOUND)
     if(NOT TARGET RecastNavigation::Recast)
         add_library(RecastNavigation::Recast UNKNOWN IMPORTED)
         set_target_properties(RecastNavigation::Recast PROPERTIES
@@ -140,4 +152,57 @@ if(RECASTNAV_FOUND)
                     IMPORTED_LOCATION "${RECASTNAV_LIBRARY}")
         endif()
     endif()
+
+    if(NOT TARGET RecastNavigation::Detour)
+        add_library(RecastNavigation::Detour UNKNOWN IMPORTED)
+        set_target_properties(RecastNavigation::Detour PROPERTIES
+                IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+                INTERFACE_INCLUDE_DIRECTORIES "${DETOUR_INCLUDE_DIR}")
+
+        if(RECASTNAV_LIBRARY_RELEASE)
+            set_property(TARGET RecastNavigation::Detour APPEND PROPERTY
+                    IMPORTED_CONFIGURATIONS RELEASE)
+            set_target_properties(RecastNavigation::Detour PROPERTIES
+                    IMPORTED_LOCATION_RELEASE "${DETOUR_LIBRARY_RELEASE}")
+        endif()
+
+        if(RECASTNAV_LIBRARY_DEBUG)
+            set_property(TARGET RecastNavigation::Detour APPEND PROPERTY
+                    IMPORTED_CONFIGURATIONS DEBUG)
+            set_target_properties(RecastNavigation::Detour PROPERTIES
+                    IMPORTED_LOCATION_DEBUG "${DETOUR_LIBRARY_DEBUG}")
+        endif()
+
+        if(NOT RECASTNAV_LIBRARY_RELEASE AND NOT RECASTNAV_LIBRARY_DEBUG)
+            set_property(TARGET RecastNavigation::Detour APPEND PROPERTY
+                    IMPORTED_LOCATION "${DETOUR_LIBRARY}")
+        endif()
+    endif()
+
+    if(NOT TARGET RecastNavigation::DebugUtils)
+        add_library(RecastNavigation::DebugUtils UNKNOWN IMPORTED)
+        set_target_properties(RecastNavigation::DebugUtils PROPERTIES
+                IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+                INTERFACE_INCLUDE_DIRECTORIES "${DEBUGUTILS_INCLUDE_DIR}")
+
+        if(RECASTNAV_LIBRARY_RELEASE)
+            set_property(TARGET RecastNavigation::DebugUtils APPEND PROPERTY
+                    IMPORTED_CONFIGURATIONS RELEASE)
+            set_target_properties(RecastNavigation::DebugUtils PROPERTIES
+                    IMPORTED_LOCATION_RELEASE "${DEBUGUTILS_LIBRARY_RELEASE}")
+        endif()
+
+        if(RECASTNAV_LIBRARY_DEBUG)
+            set_property(TARGET RecastNavigation::DebugUtils APPEND PROPERTY
+                    IMPORTED_CONFIGURATIONS DEBUG)
+            set_target_properties(RecastNavigation::DebugUtils PROPERTIES
+                    IMPORTED_LOCATION_DEBUG "${DEBUGUTILS_LIBRARY_DEBUG}")
+        endif()
+
+        if(NOT RECASTNAV_LIBRARY_RELEASE AND NOT RECASTNAV_LIBRARY_DEBUG)
+            set_property(TARGET RecastNavigation::DebugUtils APPEND PROPERTY
+                    IMPORTED_LOCATION "${DEBUGUTILS_LIBRARY}")
+        endif()
+    endif()
+
 endif()

From 2bc5a44e15162ee6557d441310080d36bc6e1787 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 3 Mar 2021 11:38:28 +0100
Subject: [PATCH 0392/2859] Added copyright, refactored to be more clear and
 marked certain things as advanced.

---
 cmake/FindRecastNavigation.cmake | 85 +++++++++++++++++---------------
 1 file changed, 44 insertions(+), 41 deletions(-)

diff --git a/cmake/FindRecastNavigation.cmake b/cmake/FindRecastNavigation.cmake
index b0ce629a97..ee6122e5d6 100644
--- a/cmake/FindRecastNavigation.cmake
+++ b/cmake/FindRecastNavigation.cmake
@@ -1,6 +1,6 @@
 # Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
 # file Copyright.txt or https://cmake.org/licensing for details.
-
+# Copyright 2021 Bret Curtis for OpenMW
 #[=======================================================================[.rst:
 FindRecastNavigation
 -------
@@ -13,7 +13,7 @@ Use this module by invoking find_package with the form::
 
   find_package(RecastNavigation
     [version]              # Minimum version e.g. 1.8.0
-    [REQUIRED]             # Fail with error if RECASTNAV is not found
+    [REQUIRED]             # Fail with error if RECAST is not found
   )
 
 Imported targets
@@ -23,26 +23,26 @@ This module defines the following :prop_tgt:`IMPORTED` targets:
 
 .. variable:: RecastNavigation::Recast
 
-  Imported target for using the RECASTNAV library, if found.
+  Imported target for using the RECAST library, if found.
 
 Result variables
 ^^^^^^^^^^^^^^^^
 
-.. variable:: RECASTNAV_FOUND
+.. variable:: RECAST_FOUND
 
-  Set to true if RECASTNAV library found, otherwise false or undefined.
+  Set to true if RECAST library found, otherwise false or undefined.
 
-.. variable:: RECASTNAV_INCLUDE_DIRS
+.. variable:: RECAST_INCLUDE_DIRS
 
-  Paths to include directories listed in one variable for use by RECASTNAV client.
+  Paths to include directories listed in one variable for use by RECAST client.
 
-.. variable:: RECASTNAV_LIBRARIES
+.. variable:: RECAST_LIBRARIES
 
-  Paths to libraries to linked against to use RECASTNAV.
+  Paths to libraries to linked against to use RECAST.
 
 .. variable:: RECAST_VERSION
 
-  The version string of RECASTNAV found.
+  The version string of RECAST found.
 
 Cache variables
 ^^^^^^^^^^^^^^^
@@ -50,13 +50,13 @@ Cache variables
 For users who wish to edit and control the module behavior, this module
 reads hints about search locations from the following variables::
 
-.. variable:: RECASTNAV_INCLUDE_DIR
+.. variable:: RECAST_INCLUDE_DIR
 
-  Path to RECASTNAV include directory with ``Recast.h`` header.
+  Path to RECAST include directory with ``Recast.h`` header.
 
-.. variable:: RECASTNAV_LIBRARY
+.. variable:: RECAST_LIBRARY
 
-  Path to RECASTNAV library to be linked.
+  Path to RECAST library to be linked.
 
 NOTE: The variables above should not usually be used in CMakeLists.txt files!
 
@@ -64,13 +64,14 @@ NOTE: The variables above should not usually be used in CMakeLists.txt files!
 
 ### Find libraries ##############################################################
 
-if(NOT RECASTNAV_LIBRARY)
-    find_library(RECASTNAV_LIBRARY_RELEASE NAMES Recast)
-    find_library(RECASTNAV_LIBRARY_DEBUG NAMES Recastd)
+if(NOT RECAST_LIBRARY)
+    find_library(RECAST_LIBRARY_RELEASE NAMES Recast)
+    find_library(RECAST_LIBRARY_DEBUG NAMES Recastd)
     include(SelectLibraryConfigurations)
-    select_library_configurations(RECASTNAV)
+    select_library_configurations(RECAST)
+    mark_as_advanced(RECAST_LIBRARY_RELEASE RECAST_LIBRARY_DEBUG)
 else()
-    file(TO_CMAKE_PATH "${RECASTNAV_LIBRARY}" RECASTNAV_LIBRARY)
+    file(TO_CMAKE_PATH "${RECAST_LIBRARY}" RECAST_LIBRARY)
 endif()
 
 if(NOT DETOUR_LIBRARY)
@@ -78,6 +79,7 @@ if(NOT DETOUR_LIBRARY)
     find_library(DETOUR_LIBRARY_DEBUG NAMES Detourd)
     include(SelectLibraryConfigurations)
     select_library_configurations(DETOUR)
+    mark_as_advanced(DETOUR_LIBRARY_RELEASE DETOUR_LIBRARY_DEBUG)
 else()
     file(TO_CMAKE_PATH "${DETOUR_LIBRARY}" DETOUR_LIBRARY)
 endif()
@@ -87,16 +89,17 @@ if(NOT DEBUGUTILS_LIBRARY)
     find_library(DEBUGUTILS_LIBRARY_DEBUG NAMES DebugUtilsd)
     include(SelectLibraryConfigurations)
     select_library_configurations(DEBUGUTILS)
+    mark_as_advanced(DEBUGUTILS_LIBRARY_RELEASE DEBUGUTILS_LIBRARY_DEBUG)
 else()
     file(TO_CMAKE_PATH "${DEBUGUTILS_LIBRARY}" DEBUGUTILS_LIBRARY)
 endif()
 
 ### Find include directory ####################################################
-find_path(RECASTNAV_INCLUDE_DIR NAMES Recast.h PATH_SUFFIXES include RECASTNAV include/recastnavigation)
-mark_as_advanced(RECASTNAV_INCLUDE_DIR RECASTNAV_LIBRARY)
+find_path(RECAST_INCLUDE_DIR NAMES Recast.h PATH_SUFFIXES include RECAST include/recastnavigation)
+mark_as_advanced(RECAST_INCLUDE_DIR)
 
-if(RECASTNAV_INCLUDE_DIR AND EXISTS "${RECASTNAV_INCLUDE_DIR}/Recast.h")
-    file(STRINGS "${RECASTNAV_INCLUDE_DIR}/Recast.h" _Recast_h_contents
+if(RECAST_INCLUDE_DIR AND EXISTS "${RECAST_INCLUDE_DIR}/Recast.h")
+    file(STRINGS "${RECAST_INCLUDE_DIR}/Recast.h" _Recast_h_contents
             REGEX "#define RECAST_VERSION_[A-Z]+[ ]+[0-9]+")
     string(REGEX REPLACE "#define RECAST_VERSION_MAJOR[ ]+([0-9]+).+" "\\1"
             RECAST_VERSION_MAJOR "${_Recast_h_contents}")
@@ -114,16 +117,16 @@ set(RECAST_VERSION "1.5.1")
 ### Set result variables ######################################################
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(RecastNavigation DEFAULT_MSG
-        RECASTNAV_LIBRARY RECASTNAV_INCLUDE_DIR RECAST_VERSION)
+        RECAST_LIBRARY RECAST_INCLUDE_DIR RECAST_VERSION)
 
-set(RECASTNAV_LIBRARIES ${RECASTNAV_LIBRARY})
-set(RECASTNAV_INCLUDE_DIRS ${RECASTNAV_INCLUDE_DIR})
+set(RECAST_LIBRARIES ${RECAST_LIBRARY})
+set(RECAST_INCLUDE_DIRS ${RECAST_INCLUDE_DIR})
 
 set(DETOUR_LIBRARIES ${DETOUR_LIBRARY})
-set(DETOUR_INCLUDE_DIRS ${RECASTNAV_INCLUDE_DIR})
+set(DETOUR_INCLUDE_DIRS ${RECAST_INCLUDE_DIR})
 
 set(DEBUGUTILS_LIBRARIES ${DEBUGUTILS_LIBRARY})
-set(DEBUGUTILS_INCLUDE_DIRS ${RECASTNAV_INCLUDE_DIR})
+set(DEBUGUTILS_INCLUDE_DIRS ${RECAST_INCLUDE_DIR})
 
 ### Import targets ############################################################
 if(RecastNavigation_FOUND)
@@ -131,25 +134,25 @@ if(RecastNavigation_FOUND)
         add_library(RecastNavigation::Recast UNKNOWN IMPORTED)
         set_target_properties(RecastNavigation::Recast PROPERTIES
                 IMPORTED_LINK_INTERFACE_LANGUAGES "C"
-                INTERFACE_INCLUDE_DIRECTORIES "${RECASTNAV_INCLUDE_DIR}")
+                INTERFACE_INCLUDE_DIRECTORIES "${RECAST_INCLUDE_DIR}")
 
-        if(RECASTNAV_LIBRARY_RELEASE)
+        if(RECAST_LIBRARY_RELEASE)
             set_property(TARGET RecastNavigation::Recast APPEND PROPERTY
                     IMPORTED_CONFIGURATIONS RELEASE)
             set_target_properties(RecastNavigation::Recast PROPERTIES
-                    IMPORTED_LOCATION_RELEASE "${RECASTNAV_LIBRARY_RELEASE}")
+                    IMPORTED_LOCATION_RELEASE "${RECAST_LIBRARY_RELEASE}")
         endif()
 
-        if(RECASTNAV_LIBRARY_DEBUG)
+        if(RECAST_LIBRARY_DEBUG)
             set_property(TARGET RecastNavigation::Recast APPEND PROPERTY
                     IMPORTED_CONFIGURATIONS DEBUG)
             set_target_properties(RecastNavigation::Recast PROPERTIES
-                    IMPORTED_LOCATION_DEBUG "${RECASTNAV_LIBRARY_DEBUG}")
+                    IMPORTED_LOCATION_DEBUG "${RECAST_LIBRARY_DEBUG}")
         endif()
 
-        if(NOT RECASTNAV_LIBRARY_RELEASE AND NOT RECASTNAV_LIBRARY_DEBUG)
+        if(NOT RECAST_LIBRARY_RELEASE AND NOT RECAST_LIBRARY_DEBUG)
             set_property(TARGET RecastNavigation::Recast APPEND PROPERTY
-                    IMPORTED_LOCATION "${RECASTNAV_LIBRARY}")
+                    IMPORTED_LOCATION "${RECAST_LIBRARY}")
         endif()
     endif()
 
@@ -159,21 +162,21 @@ if(RecastNavigation_FOUND)
                 IMPORTED_LINK_INTERFACE_LANGUAGES "C"
                 INTERFACE_INCLUDE_DIRECTORIES "${DETOUR_INCLUDE_DIR}")
 
-        if(RECASTNAV_LIBRARY_RELEASE)
+        if(RECAST_LIBRARY_RELEASE)
             set_property(TARGET RecastNavigation::Detour APPEND PROPERTY
                     IMPORTED_CONFIGURATIONS RELEASE)
             set_target_properties(RecastNavigation::Detour PROPERTIES
                     IMPORTED_LOCATION_RELEASE "${DETOUR_LIBRARY_RELEASE}")
         endif()
 
-        if(RECASTNAV_LIBRARY_DEBUG)
+        if(RECAST_LIBRARY_DEBUG)
             set_property(TARGET RecastNavigation::Detour APPEND PROPERTY
                     IMPORTED_CONFIGURATIONS DEBUG)
             set_target_properties(RecastNavigation::Detour PROPERTIES
                     IMPORTED_LOCATION_DEBUG "${DETOUR_LIBRARY_DEBUG}")
         endif()
 
-        if(NOT RECASTNAV_LIBRARY_RELEASE AND NOT RECASTNAV_LIBRARY_DEBUG)
+        if(NOT RECAST_LIBRARY_RELEASE AND NOT RECAST_LIBRARY_DEBUG)
             set_property(TARGET RecastNavigation::Detour APPEND PROPERTY
                     IMPORTED_LOCATION "${DETOUR_LIBRARY}")
         endif()
@@ -185,21 +188,21 @@ if(RecastNavigation_FOUND)
                 IMPORTED_LINK_INTERFACE_LANGUAGES "C"
                 INTERFACE_INCLUDE_DIRECTORIES "${DEBUGUTILS_INCLUDE_DIR}")
 
-        if(RECASTNAV_LIBRARY_RELEASE)
+        if(RECAST_LIBRARY_RELEASE)
             set_property(TARGET RecastNavigation::DebugUtils APPEND PROPERTY
                     IMPORTED_CONFIGURATIONS RELEASE)
             set_target_properties(RecastNavigation::DebugUtils PROPERTIES
                     IMPORTED_LOCATION_RELEASE "${DEBUGUTILS_LIBRARY_RELEASE}")
         endif()
 
-        if(RECASTNAV_LIBRARY_DEBUG)
+        if(RECAST_LIBRARY_DEBUG)
             set_property(TARGET RecastNavigation::DebugUtils APPEND PROPERTY
                     IMPORTED_CONFIGURATIONS DEBUG)
             set_target_properties(RecastNavigation::DebugUtils PROPERTIES
                     IMPORTED_LOCATION_DEBUG "${DEBUGUTILS_LIBRARY_DEBUG}")
         endif()
 
-        if(NOT RECASTNAV_LIBRARY_RELEASE AND NOT RECASTNAV_LIBRARY_DEBUG)
+        if(NOT RECAST_LIBRARY_RELEASE AND NOT RECAST_LIBRARY_DEBUG)
             set_property(TARGET RecastNavigation::DebugUtils APPEND PROPERTY
                     IMPORTED_LOCATION "${DEBUGUTILS_LIBRARY}")
         endif()

From 5e91af230d604a23268d2d22b71a59b4bed14f81 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Wed, 3 Mar 2021 21:13:05 +0300
Subject: [PATCH 0393/2859] Reset effect icon transparency when they're hidden
 (#5877)

---
 CHANGELOG.md                     | 1 +
 apps/openmw/mwgui/spellicons.cpp | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a46f47f530..8b839c1721 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -104,6 +104,7 @@
     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 #5871: The console appears if you type the Russian letter "Ё" in the name of the enchantment
+    Bug #5877: Effects appearing with empty icon
     Feature #390: 3rd person look "over the shoulder"
     Feature #1536: Show more information about level on menu
     Feature #2386: Distant Statics in the form of Object Paging
diff --git a/apps/openmw/mwgui/spellicons.cpp b/apps/openmw/mwgui/spellicons.cpp
index e6a10ee32b..405abfbae7 100644
--- a/apps/openmw/mwgui/spellicons.cpp
+++ b/apps/openmw/mwgui/spellicons.cpp
@@ -181,7 +181,9 @@ namespace MWGui
             }
             else if (mWidgetMap.find(effectId) != mWidgetMap.end())
             {
-                mWidgetMap[effectId]->setVisible(false);
+                MyGUI::ImageBox* image = mWidgetMap[effectId];
+                image->setVisible(false);
+                image->setAlpha(1.f);
             }
         }
 

From fc329050b34524ac5e9e52e3fa6d0245189806bd Mon Sep 17 00:00:00 2001
From: Dobrohotov Alexei <alexdobrohotov@yandex.ru>
Date: Wed, 3 Mar 2021 22:04:10 +0300
Subject: [PATCH 0394/2859] AIPursue: Pursue the player until LOS is
 established (#5869)

---
 CHANGELOG.md                         | 1 +
 apps/openmw/mwmechanics/aipursue.cpp | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a46f47f530..84580d9fdb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -103,6 +103,7 @@
     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
     Feature #390: 3rd person look "over the shoulder"
     Feature #1536: Show more information about level on menu
diff --git a/apps/openmw/mwmechanics/aipursue.cpp b/apps/openmw/mwmechanics/aipursue.cpp
index bfe860d6d9..5af73887cb 100644
--- a/apps/openmw/mwmechanics/aipursue.cpp
+++ b/apps/openmw/mwmechanics/aipursue.cpp
@@ -53,9 +53,14 @@ bool AiPursue::execute (const MWWorld::Ptr& actor, CharacterController& characte
 
     const float pathTolerance = 100.f;
 
-    if (pathTo(actor, dest, duration, pathTolerance) &&
-        std::abs(dest.z() - actorPos.z()) < pathTolerance) // check the true distance in case the target is far away in Z-direction
+    // check the true distance in case the target is far away in Z-direction
+    bool reached = pathTo(actor, dest, duration, pathTolerance) &&
+                   std::abs(dest.z() - actorPos.z()) < pathTolerance;
+
+    if (reached)
     {
+        if (!MWBase::Environment::get().getWorld()->getLOS(target, actor))
+            return false;
         MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Dialogue, actor); //Arrest player when reached
         return true;
     }

From 741584472e19ebe21ab8a10cc91848ddd78e44b8 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Thu, 4 Mar 2021 10:39:54 +0100
Subject: [PATCH 0395/2859] another cleanup to FindRecastNavigation.cmake

---
 cmake/FindRecastNavigation.cmake | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/cmake/FindRecastNavigation.cmake b/cmake/FindRecastNavigation.cmake
index ee6122e5d6..9ff845f32d 100644
--- a/cmake/FindRecastNavigation.cmake
+++ b/cmake/FindRecastNavigation.cmake
@@ -162,21 +162,21 @@ if(RecastNavigation_FOUND)
                 IMPORTED_LINK_INTERFACE_LANGUAGES "C"
                 INTERFACE_INCLUDE_DIRECTORIES "${DETOUR_INCLUDE_DIR}")
 
-        if(RECAST_LIBRARY_RELEASE)
+        if(DETOUR_LIBRARY_RELEASE)
             set_property(TARGET RecastNavigation::Detour APPEND PROPERTY
                     IMPORTED_CONFIGURATIONS RELEASE)
             set_target_properties(RecastNavigation::Detour PROPERTIES
                     IMPORTED_LOCATION_RELEASE "${DETOUR_LIBRARY_RELEASE}")
         endif()
 
-        if(RECAST_LIBRARY_DEBUG)
+        if(DETOUR_LIBRARY_DEBUG)
             set_property(TARGET RecastNavigation::Detour APPEND PROPERTY
                     IMPORTED_CONFIGURATIONS DEBUG)
             set_target_properties(RecastNavigation::Detour PROPERTIES
                     IMPORTED_LOCATION_DEBUG "${DETOUR_LIBRARY_DEBUG}")
         endif()
 
-        if(NOT RECAST_LIBRARY_RELEASE AND NOT RECAST_LIBRARY_DEBUG)
+        if(NOT DETOUR_LIBRARY_RELEASE AND NOT DETOUR_LIBRARY_DEBUG)
             set_property(TARGET RecastNavigation::Detour APPEND PROPERTY
                     IMPORTED_LOCATION "${DETOUR_LIBRARY}")
         endif()
@@ -188,21 +188,21 @@ if(RecastNavigation_FOUND)
                 IMPORTED_LINK_INTERFACE_LANGUAGES "C"
                 INTERFACE_INCLUDE_DIRECTORIES "${DEBUGUTILS_INCLUDE_DIR}")
 
-        if(RECAST_LIBRARY_RELEASE)
+        if(DEBUGUTILS_LIBRARY_RELEASE)
             set_property(TARGET RecastNavigation::DebugUtils APPEND PROPERTY
                     IMPORTED_CONFIGURATIONS RELEASE)
             set_target_properties(RecastNavigation::DebugUtils PROPERTIES
                     IMPORTED_LOCATION_RELEASE "${DEBUGUTILS_LIBRARY_RELEASE}")
         endif()
 
-        if(RECAST_LIBRARY_DEBUG)
+        if(DEBUGUTILS_LIBRARY_DEBUG)
             set_property(TARGET RecastNavigation::DebugUtils APPEND PROPERTY
                     IMPORTED_CONFIGURATIONS DEBUG)
             set_target_properties(RecastNavigation::DebugUtils PROPERTIES
                     IMPORTED_LOCATION_DEBUG "${DEBUGUTILS_LIBRARY_DEBUG}")
         endif()
 
-        if(NOT RECAST_LIBRARY_RELEASE AND NOT RECAST_LIBRARY_DEBUG)
+        if(NOT DEBUGUTILS_LIBRARY_RELEASE AND NOT DEBUGUTILS_LIBRARY_DEBUG)
             set_property(TARGET RecastNavigation::DebugUtils APPEND PROPERTY
                     IMPORTED_LOCATION "${DEBUGUTILS_LIBRARY}")
         endif()

From b47573f36bffe9c22488af79822cd747fbac0968 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 4 Mar 2021 18:12:08 +0100
Subject: [PATCH 0396/2859] Fix recastnavigation debug library suffixes

---
 cmake/FindRecastNavigation.cmake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmake/FindRecastNavigation.cmake b/cmake/FindRecastNavigation.cmake
index 9ff845f32d..01e4b3fbe8 100644
--- a/cmake/FindRecastNavigation.cmake
+++ b/cmake/FindRecastNavigation.cmake
@@ -66,7 +66,7 @@ NOTE: The variables above should not usually be used in CMakeLists.txt files!
 
 if(NOT RECAST_LIBRARY)
     find_library(RECAST_LIBRARY_RELEASE NAMES Recast)
-    find_library(RECAST_LIBRARY_DEBUG NAMES Recastd)
+    find_library(RECAST_LIBRARY_DEBUG NAMES Recast-d)
     include(SelectLibraryConfigurations)
     select_library_configurations(RECAST)
     mark_as_advanced(RECAST_LIBRARY_RELEASE RECAST_LIBRARY_DEBUG)
@@ -76,7 +76,7 @@ endif()
 
 if(NOT DETOUR_LIBRARY)
     find_library(DETOUR_LIBRARY_RELEASE NAMES Detour)
-    find_library(DETOUR_LIBRARY_DEBUG NAMES Detourd)
+    find_library(DETOUR_LIBRARY_DEBUG NAMES Detour-d)
     include(SelectLibraryConfigurations)
     select_library_configurations(DETOUR)
     mark_as_advanced(DETOUR_LIBRARY_RELEASE DETOUR_LIBRARY_DEBUG)
@@ -86,7 +86,7 @@ endif()
 
 if(NOT DEBUGUTILS_LIBRARY)
     find_library(DEBUGUTILS_LIBRARY_RELEASE NAMES DebugUtils)
-    find_library(DEBUGUTILS_LIBRARY_DEBUG NAMES DebugUtilsd)
+    find_library(DEBUGUTILS_LIBRARY_DEBUG NAMES DebugUtils-d)
     include(SelectLibraryConfigurations)
     select_library_configurations(DEBUGUTILS)
     mark_as_advanced(DEBUGUTILS_LIBRARY_RELEASE DEBUGUTILS_LIBRARY_DEBUG)

From b9575180b56d9dd8159e3b8ad7a4232414df2155 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 3 Mar 2021 18:15:26 +0100
Subject: [PATCH 0397/2859] Support custom recastnavigation system path

---
 cmake/FindRecastNavigation.cmake | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/cmake/FindRecastNavigation.cmake b/cmake/FindRecastNavigation.cmake
index 01e4b3fbe8..8728a5e949 100644
--- a/cmake/FindRecastNavigation.cmake
+++ b/cmake/FindRecastNavigation.cmake
@@ -65,8 +65,8 @@ NOTE: The variables above should not usually be used in CMakeLists.txt files!
 ### Find libraries ##############################################################
 
 if(NOT RECAST_LIBRARY)
-    find_library(RECAST_LIBRARY_RELEASE NAMES Recast)
-    find_library(RECAST_LIBRARY_DEBUG NAMES Recast-d)
+    find_library(RECAST_LIBRARY_RELEASE NAMES Recast HINTS ${RECASTNAVIGATION_ROOT} PATH_SUFFIXES lib)
+    find_library(RECAST_LIBRARY_DEBUG NAMES Recast-d HINTS ${RECASTNAVIGATION_ROOT} PATH_SUFFIXES lib)
     include(SelectLibraryConfigurations)
     select_library_configurations(RECAST)
     mark_as_advanced(RECAST_LIBRARY_RELEASE RECAST_LIBRARY_DEBUG)
@@ -75,8 +75,8 @@ else()
 endif()
 
 if(NOT DETOUR_LIBRARY)
-    find_library(DETOUR_LIBRARY_RELEASE NAMES Detour)
-    find_library(DETOUR_LIBRARY_DEBUG NAMES Detour-d)
+    find_library(DETOUR_LIBRARY_RELEASE NAMES Detour HINTS ${RECASTNAVIGATION_ROOT} PATH_SUFFIXES lib)
+    find_library(DETOUR_LIBRARY_DEBUG NAMES Detour-d HINTS ${RECASTNAVIGATION_ROOT} PATH_SUFFIXES lib)
     include(SelectLibraryConfigurations)
     select_library_configurations(DETOUR)
     mark_as_advanced(DETOUR_LIBRARY_RELEASE DETOUR_LIBRARY_DEBUG)
@@ -85,8 +85,8 @@ else()
 endif()
 
 if(NOT DEBUGUTILS_LIBRARY)
-    find_library(DEBUGUTILS_LIBRARY_RELEASE NAMES DebugUtils)
-    find_library(DEBUGUTILS_LIBRARY_DEBUG NAMES DebugUtils-d)
+    find_library(DEBUGUTILS_LIBRARY_RELEASE NAMES DebugUtils HINTS ${RECASTNAVIGATION_ROOT} PATH_SUFFIXES lib)
+    find_library(DEBUGUTILS_LIBRARY_DEBUG NAMES DebugUtils-d HINTS ${RECASTNAVIGATION_ROOT} PATH_SUFFIXES lib)
     include(SelectLibraryConfigurations)
     select_library_configurations(DEBUGUTILS)
     mark_as_advanced(DEBUGUTILS_LIBRARY_RELEASE DEBUGUTILS_LIBRARY_DEBUG)
@@ -95,7 +95,7 @@ else()
 endif()
 
 ### Find include directory ####################################################
-find_path(RECAST_INCLUDE_DIR NAMES Recast.h PATH_SUFFIXES include RECAST include/recastnavigation)
+find_path(RECAST_INCLUDE_DIR NAMES Recast.h HINTS ${RECASTNAVIGATION_ROOT} PATH_SUFFIXES include RECAST include/recastnavigation)
 mark_as_advanced(RECAST_INCLUDE_DIR)
 
 if(RECAST_INCLUDE_DIR AND EXISTS "${RECAST_INCLUDE_DIR}/Recast.h")

From 8ae4ee291f4fe1783223c875173e66ee2b1781dd Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 4 Mar 2021 22:52:03 +0100
Subject: [PATCH 0398/2859] Attempt to fix restocking items in old saves

---
 apps/openmw/mwworld/cellstore.cpp | 42 +++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index cc614133aa..73f69e2206 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -104,6 +104,45 @@ namespace
         }
     }
 
+    template<class RecordType, class T>
+    void fixRestockingImpl(const T* base, RecordType& state)
+    {
+        // Workaround for old saves not containing negative quantities
+        for(const auto& baseItem : base->mInventory.mList)
+        {
+            if(baseItem.mCount < 0)
+            {
+                for(auto& item : state.mInventory.mItems)
+                {
+                    if(item.mCount > 0 && Misc::StringUtils::ciEqual(baseItem.mItem, item.mRef.mRefID))
+                        item.mCount = -item.mCount;
+                }
+            }
+        }
+    }
+
+    template<class RecordType, class T>
+    void fixRestocking(const T* base, RecordType& state)
+    {}
+
+    template<>
+    void fixRestocking<>(const ESM::Creature* base, ESM::CreatureState& state)
+    {
+        fixRestockingImpl(base, state);
+    }
+
+    template<>
+    void fixRestocking<>(const ESM::NPC* base, ESM::NpcState& state)
+    {
+        fixRestockingImpl(base, state);
+    }
+
+    template<>
+    void fixRestocking<>(const ESM::Container* base, ESM::ContainerState& state)
+    {
+        fixRestockingImpl(base, state);
+    }
+
     template<typename RecordType, typename T>
     void readReferenceCollection (ESM::ESMReader& reader,
         MWWorld::CellRefList<T>& collection, const ESM::CellRef& cref, const std::map<int, int>& contentFileMap, MWWorld::CellStore* cellstore)
@@ -134,6 +173,9 @@ namespace
         if (!record)
             return;
 
+        if (state.mVersion < 15)
+            fixRestocking(record, state);
+
         if (state.mRef.mRefNum.hasContentFile())
         {
             for (typename MWWorld::CellRefList<T>::List::iterator iter (collection.mList.begin());

From 41b3090a4910f406154e283f425b4242fde692dd Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Fri, 5 Mar 2021 14:27:01 +0400
Subject: [PATCH 0399/2859] Fix formatting in the groundcover docs

---
 docs/source/reference/modding/extended.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/source/reference/modding/extended.rst b/docs/source/reference/modding/extended.rst
index 98b3e7f001..cd739cb1b2 100644
--- a/docs/source/reference/modding/extended.rst
+++ b/docs/source/reference/modding/extended.rst
@@ -306,8 +306,11 @@ For example, we do not need to have collision or animation objects for groundcov
 do not need to render groundcover on the map, do not need to render it for the whole visible area (which can be very large with Distant Terrain). It allows to increase performance a lot.
 
 General advices to create assets for this feature:
+
 1. Alpha properties from Nif files are not used, a unified alpha settings are used (alpha testing, "greater of equal" function, 128/255 threshold).
+
 2. Use a single NiTriShape in groundocver mesh, or at least use same properties (texture, alpha, material, etc), so OpenMW can merge them on the fly. Otherwise animations may not work properly.
+
 3. Smooth fading does not work for meshes, which have textures without alpha (e.g. rock).
 
 Groundcover mods can be registered in the openmw.cfg via "groundcover" entries instead of "content" ones:

From caa8b0ca1a7444a960160ffb11e315eca53be2fc Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 5 Mar 2021 13:03:21 +0100
Subject: [PATCH 0400/2859] give qt5 a show for brew

---
 CI/before_install.osx.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index ba0ff00ca7..d054158206 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -7,7 +7,7 @@ HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies python@3.9 || tru
 # 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
+command -v qmake >/dev/null 2>&1 || brew install qt5
 
 curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-f8918dd.zip -o ~/openmw-deps.zip
 unzip -o ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null

From 17059cefea659458e2550355593cc7bb47fbca5e Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 5 Mar 2021 13:07:26 +0100
Subject: [PATCH 0401/2859] give qt@5 a try

---
 CI/before_install.osx.sh | 2 +-
 CI/before_script.osx.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index d054158206..9adf4dfa5e 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -7,7 +7,7 @@ HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies python@3.9 || tru
 # 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 qt5
+command -v qmake >/dev/null 2>&1 || brew install qt@5
 
 curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-f8918dd.zip -o ~/openmw-deps.zip
 unzip -o ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null
diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh
index 8f9be16e1a..36fa792991 100755
--- a/CI/before_script.osx.sh
+++ b/CI/before_script.osx.sh
@@ -4,7 +4,7 @@ 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

From 87ede9284bafd264d0d8371cf9f15c0f87d6203f Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 5 Mar 2021 13:08:38 +0100
Subject: [PATCH 0402/2859] be more explicit

---
 CI/before_install.osx.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index 9adf4dfa5e..49b2fbe167 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh -ex
 
 # workaround python issue on travis
 HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies python@3.8 || true

From 8fc0f965bb04de2f857a9c567699545e92aa1179 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 5 Mar 2021 13:10:22 +0100
Subject: [PATCH 0403/2859] which qmake?

---
 CI/before_install.osx.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index 49b2fbe167..d8832d90ea 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -9,5 +9,8 @@ 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
 
+qmake --version
+which qmake
+
 curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-f8918dd.zip -o ~/openmw-deps.zip
 unzip -o ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null

From f03beb796359af18637ed3b8e1dbe822803f55df Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 5 Mar 2021 13:12:42 +0100
Subject: [PATCH 0404/2859] uninstall qt@6

---
 CI/before_install.osx.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index d8832d90ea..9d0774d3ca 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -3,6 +3,7 @@
 # workaround python issue on travis
 HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies python@3.8 || true
 HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies python@3.9 || true
+HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies qt@6 || true
 
 # 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

From 53cb20454ff9249dda40e30c0f3d1bc5a4590f1c Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 5 Mar 2021 13:20:03 +0100
Subject: [PATCH 0405/2859] add path hack only to verify, will remove later

---
 CI/before_install.osx.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index 9d0774d3ca..b38e04a061 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -10,6 +10,7 @@ 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"
 qmake --version
 which qmake
 

From 9fbb530dde4d95e1881a5a83b12125ede46e786a Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 5 Mar 2021 13:25:46 +0100
Subject: [PATCH 0406/2859] be explicit and print version information to
 verification

---
 CI/before_install.osx.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index b38e04a061..6dad0abc19 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -9,10 +9,11 @@ HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies qt@6 || true
 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
 
-export PATH="/usr/local/opt/qt@5/bin:$PATH"
+ccache --version
+cmake --version
 qmake --version
-which qmake
 
 curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-f8918dd.zip -o ~/openmw-deps.zip
 unzip -o ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null

From 2bfee281fdf533fbc9577ee4c9a22795f2e4c265 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alex462002@gmail.com>
Date: Thu, 25 Feb 2021 23:12:14 +0000
Subject: [PATCH 0407/2859] Merge branch 'restore_caster' into 'master'

Restore projectile caster from savegame (#5860)

See merge request OpenMW/openmw!616

(cherry picked from commit d595c7adb0fb45eafed6d3d0403ad640a91411ed)

c5426bec In the savegame, projectile caster is identified by its actor id. When
---
 apps/openmw/mwbase/world.hpp              |  1 +
 apps/openmw/mwphysics/physicssystem.cpp   | 13 ++++++++++++-
 apps/openmw/mwphysics/physicssystem.hpp   |  1 +
 apps/openmw/mwstate/statemanagerimp.cpp   |  2 ++
 apps/openmw/mwworld/projectilemanager.cpp | 23 +++++++++++++++++++++++
 apps/openmw/mwworld/projectilemanager.hpp |  2 ++
 apps/openmw/mwworld/worldimp.cpp          |  5 +++++
 apps/openmw/mwworld/worldimp.hpp          |  1 +
 8 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 194e8f6956..27980f0705 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -539,6 +539,7 @@ namespace MWBase
             virtual void launchMagicBolt (const std::string& spellId, const MWWorld::Ptr& caster, const osg::Vec3f& fallbackDirection) = 0;
             virtual void launchProjectile (MWWorld::Ptr& actor, MWWorld::Ptr& projectile,
                                            const osg::Vec3f& worldPos, const osg::Quat& orient, MWWorld::Ptr& bow, float speed, float attackStrength) = 0;
+            virtual void updateProjectilesCasters() = 0;
 
             virtual void applyLoopingParticles(const MWWorld::Ptr& ptr) = 0;
 
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 382b348b93..b2decde2f0 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -604,7 +604,9 @@ namespace MWPhysics
                 return object->getCollisionObject();
             return nullptr;
         }();
-        assert(caster);
+
+        if (caster == nullptr)
+            Log(Debug::Warning) << "No caster for projectile " << projectileId;
 
         ProjectileConvexCallback resultCallback(caster, btFrom, btTo, projectile);
         resultCallback.m_collisionFilterMask = 0xff;
@@ -695,6 +697,15 @@ namespace MWPhysics
         return mProjectileId;
     }
 
+    void PhysicsSystem::setCaster(int projectileId, const MWWorld::Ptr& caster)
+    {
+        const auto foundProjectile = mProjectiles.find(projectileId);
+        assert(foundProjectile != mProjectiles.end());
+        auto* projectile = foundProjectile->second.get();
+
+        projectile->setCaster(caster);
+    }
+
     bool PhysicsSystem::toggleCollisionMode()
     {
         ActorMap::iterator found = mActors.find(MWMechanics::getPlayer());
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 57ebbadbb3..80b2d98bcf 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -125,6 +125,7 @@ namespace MWPhysics
             void addActor (const MWWorld::Ptr& ptr, const std::string& mesh);
 
             int addProjectile(const MWWorld::Ptr& caster, const osg::Vec3f& position, const std::string& mesh, bool computeRadius, bool canTraverseWater);
+            void setCaster(int projectileId, const MWWorld::Ptr& caster);
             void updateProjectile(const int projectileId, const osg::Vec3f &position) const;
             void removeProjectile(const int projectileId);
 
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index 72e4b1ae02..f605344bf7 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -539,6 +539,8 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
             MWBase::Environment::get().getWorld()->changeToCell(cell->getCell()->getCellId(), pos, true, false);
         }
 
+        MWBase::Environment::get().getWorld()->updateProjectilesCasters();
+
         // Vanilla MW will restart startup scripts when a save game is loaded. This is unintuitive,
         // but some mods may be using it as a reload detector.
         MWBase::Environment::get().getScriptManager()->getGlobalScripts().addStartup();
diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index 3ffc7bb953..f483905ddf 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -352,6 +352,29 @@ namespace MWWorld
         mProjectiles.push_back(state);
     }
 
+    void ProjectileManager::updateCasters()
+    {
+        for (auto& state : mProjectiles)
+            mPhysics->setCaster(state.mProjectileId, state.getCaster());
+
+        for (auto& state : mMagicBolts)
+        {
+            // casters are identified by actor id in the savegame. objects doesn't have one so they can't be identified back.
+            // TODO: should object-type caster be restored from savegame?
+            if (state.mActorId == -1)
+                continue;
+
+            auto caster = state.getCaster();
+            if (caster.isEmpty())
+            {
+                Log(Debug::Error) << "Couldn't find caster with ID " << state.mActorId;
+                cleanupMagicBolt(state);
+                continue;
+            }
+            mPhysics->setCaster(state.mProjectileId, caster);
+        }
+    }
+
     void ProjectileManager::update(float dt)
     {
         periodicCleanup(dt);
diff --git a/apps/openmw/mwworld/projectilemanager.hpp b/apps/openmw/mwworld/projectilemanager.hpp
index c047d90ddf..e4bcae1ae4 100644
--- a/apps/openmw/mwworld/projectilemanager.hpp
+++ b/apps/openmw/mwworld/projectilemanager.hpp
@@ -54,6 +54,8 @@ namespace MWWorld
         void launchProjectile (MWWorld::Ptr actor, MWWorld::ConstPtr projectile,
                                        const osg::Vec3f& pos, const osg::Quat& orient, MWWorld::Ptr bow, float speed, float attackStrength);
 
+        void updateCasters();
+
         void update(float dt);
 
         void processHits();
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index b609f325c9..01b90e9078 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -3186,6 +3186,11 @@ namespace MWWorld
         mProjectileManager->launchMagicBolt(spellId, caster, fallbackDirection);
     }
 
+    void World::updateProjectilesCasters()
+    {
+        mProjectileManager->updateCasters();
+    }
+
     class ApplyLoopingParticlesVisitor : public MWMechanics::EffectSourceVisitor
     {
     private:
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index bc2baafd8a..23153a31c4 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -644,6 +644,7 @@ namespace MWWorld
             void launchMagicBolt (const std::string& spellId, const MWWorld::Ptr& caster, const osg::Vec3f& fallbackDirection) override;
             void launchProjectile (MWWorld::Ptr& actor, MWWorld::Ptr& projectile,
                                            const osg::Vec3f& worldPos, const osg::Quat& orient, MWWorld::Ptr& bow, float speed, float attackStrength) override;
+            void updateProjectilesCasters() override;
 
             void applyLoopingParticles(const MWWorld::Ptr& ptr) override;
 

From 31d8ce266b3f8f726b49f484e7fd1a8f5bec63f1 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sat, 6 Mar 2021 09:46:37 +0100
Subject: [PATCH 0408/2859] Close a race between main and physics threads when
 actor is positioned by scripts.

When a position is forced, the actor position in physics subsystem is
overriden. The background physics thread is not made aware of this,
its result are simply discarded.

There is a short window where this doesn't work (in this
example, actor is at A and script moves it to B)
1) actor position is set to B. (among others, Actor::mPosition is set to B)
2) physics thread reset Actor::mPosition with stale value (around A)
3) main thread read simulation result, reset Actor::mSkipSimulation flag => actor is at B
4) physics thread fetch latest Actor::mPosition value, which is around A
5) main thread read simulation result, actor is around A

To avoid this situation, do not perform 2) until after 3) occurs. This
way, at 4) starts the simulation with up-to-date Actor::mPosition
---
 apps/openmw/mwphysics/actor.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index 3b52ee934f..bbec4d4456 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -174,6 +174,9 @@ osg::Vec3f Actor::getCollisionObjectPosition() const
 bool Actor::setPosition(const osg::Vec3f& position)
 {
     std::scoped_lock lock(mPositionMutex);
+    // position is being forced, ignore simulation results until we sync up
+    if (mSkipSimulation)
+        return false;
     bool hasChanged = mPosition != position || mPositionOffset.length() != 0 || mWorldPositionChanged;
     mPreviousPosition = mPosition + mPositionOffset;
     mPosition = position + mPositionOffset;

From 455be9dbbbeccfcbb9a222aa94777d1c79bcf687 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Sat, 6 Mar 2021 19:21:23 +0000
Subject: [PATCH 0409/2859] Fix linking with `-DOPENMW_USE_SYSTEM_OSG=ON
 -DOSG_STATIC=ON`

1. CMake's built-in OSG finder does not use pkgconfig, so we have to
   manually ensure the order is correct for inter-library dependencies.

   https://gitlab.kitware.com/cmake/cmake/-/issues/21701

2. OSG plugin pkgconfig files are missing dependencies on the underlying
   libraries (e.g. freetype, png, jpeg), so we have to link them manually.

   https://github.com/openscenegraph/OpenSceneGraph/issues/1052
---
 apps/opencs/CMakeLists.txt | 23 +++++++++++++++++------
 apps/openmw/CMakeLists.txt | 22 +++++++++++++++++-----
 components/CMakeLists.txt  | 26 ++++++++++++++++----------
 3 files changed, 50 insertions(+), 21 deletions(-)

diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 8be1fa4d30..65575580ad 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -215,12 +215,16 @@ if(APPLE)
 endif(APPLE)
 
 target_link_libraries(openmw-cs
-    ${OSG_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}
@@ -233,17 +237,24 @@ if(OSG_STATIC)
     add_library(openmw_cs_osg_plugins INTERFACE)
     foreach(_plugin ${USED_OSG_PLUGINS})
         string(TOUPPER ${_plugin} _plugin_uc)
-        if (${_plugin_uc}_LIBRARY MATCHES "[/.]")
+        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()
-        target_link_libraries(openmw_cs_osg_plugins INTERFACE ${${_plugin_uc}_LIBRARY})
     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()
 endif(OSG_STATIC)
 
 target_link_libraries(openmw-cs Qt5::Widgets Qt5::Core Qt5::Network Qt5::OpenGL)
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index dda517c44b..5e5bb8a9f6 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -122,13 +122,18 @@ include_directories(
 )
 
 target_link_libraries(openmw
-    ${OSG_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
     ${OSGPARTICLE_LIBRARIES}
-    ${OSGUTIL_LIBRARIES}
-    ${OSGDB_LIBRARIES}
     ${OSGVIEWER_LIBRARIES}
     ${OSGGA_LIBRARIES}
     ${OSGSHADOW_LIBRARIES}
+    ${OSGDB_LIBRARIES}
+    ${OSGUTIL_LIBRARIES}
+    ${OSG_LIBRARIES}
+
     ${Boost_SYSTEM_LIBRARY}
     ${Boost_THREAD_LIBRARY}
     ${Boost_FILESYSTEM_LIBRARY}
@@ -148,17 +153,24 @@ if(OSG_STATIC)
     add_library(openmw_osg_plugins INTERFACE)
     foreach(_plugin ${USED_OSG_PLUGINS})
         string(TOUPPER ${_plugin} _plugin_uc)
-        if (${_plugin_uc}_LIBRARY MATCHES "[/.]")
+        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_osg_plugins INTERFACE $<TARGET_PROPERTY:${${_plugin_uc}_LIBRARY},LINK_LIBRARIES>)
+            add_dependencies(openmw_osg_plugins ${${_plugin_uc}_LIBRARY})
         endif()
-        target_link_libraries(openmw_osg_plugins INTERFACE ${${_plugin_uc}_LIBRARY})
     endforeach()
     # We use --whole-archive because OSG plugins use registration.
     get_whole_archive_options(_opts ${_osg_plugins_static_files})
     target_link_options(openmw_osg_plugins INTERFACE ${_opts})
     target_link_libraries(openmw openmw_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()
 endif(OSG_STATIC)
 
 if (ANDROID)
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 2120afc1a4..4da75c97ca 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -223,20 +223,26 @@ include_directories(${BULLET_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR})
 add_library(components STATIC ${COMPONENT_FILES} ${MOC_SRCS} ${ESM_UI_HDR})
 
 target_link_libraries(components
-    ${Boost_SYSTEM_LIBRARY}
-    ${Boost_FILESYSTEM_LIBRARY}
-    ${Boost_PROGRAM_OPTIONS_LIBRARY}
-    ${Boost_IOSTREAMS_LIBRARY}
-    ${OSG_LIBRARIES}
-    ${OPENTHREADS_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
     ${OSGPARTICLE_LIBRARIES}
-    ${OSGUTIL_LIBRARIES}
-    ${OSGDB_LIBRARIES}
     ${OSGVIEWER_LIBRARIES}
-    ${OSGTEXT_LIBRARIES}
-    ${OSGGA_LIBRARIES}
     ${OSGSHADOW_LIBRARIES}
     ${OSGANIMATION_LIBRARIES}
+    ${OSGGA_LIBRARIES}
+    ${OSGTEXT_LIBRARIES}
+    ${OSGDB_LIBRARIES}
+    ${OSGUTIL_LIBRARIES}
+    ${OSG_LIBRARIES}
+    ${OPENTHREADS_LIBRARIES}
+
+    ${Boost_SYSTEM_LIBRARY}
+    ${Boost_FILESYSTEM_LIBRARY}
+    ${Boost_PROGRAM_OPTIONS_LIBRARY}
+    ${Boost_IOSTREAMS_LIBRARY}
+
     ${SDL2_LIBRARIES}
     ${OPENGL_gl_LIBRARY}
     ${MyGUI_LIBRARIES}

From b7076549a393f3e1e87dfc750b40246fd21e08d7 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Sun, 24 Jan 2021 06:11:44 +0000
Subject: [PATCH 0410/2859] osg-ffmpeg-videoplayer: Fix crash on ARM

osg-ffmpeg-videoplayer handled frame allocation incorrectly.

It used a `vector<uint8_t>` as its buffer, meaning the addresses could
did not respect alignment.

Instead, changes it to use `AVFrame` as buffers, allocated via `av_image_alloc`.

We also now only allocate the buffer once, instead of on every frame,
which should improve the framerate of videos.

Fixes the following crash on startup on ARM:

> Invalid address alignment (signal 7)

Fixes #5807
---
 extern/osg-ffmpeg-videoplayer/videostate.cpp | 45 ++++++++++++++------
 extern/osg-ffmpeg-videoplayer/videostate.hpp |  3 +-
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/extern/osg-ffmpeg-videoplayer/videostate.cpp b/extern/osg-ffmpeg-videoplayer/videostate.cpp
index 5858d985a8..cdfdc8ad52 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.cpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.cpp
@@ -2,6 +2,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <cstddef>
 #include <iostream>
 #include <thread>
 #include <chrono>
@@ -49,7 +50,7 @@ VideoState::VideoState()
     , av_sync_type(AV_SYNC_DEFAULT)
     , audio_st(nullptr)
     , video_st(nullptr), frame_last_pts(0.0)
-    , video_clock(0.0), sws_context(nullptr), rgbaFrame(nullptr), pictq_size(0)
+    , video_clock(0.0), sws_context(nullptr), pictq_size(0)
     , pictq_rindex(0), pictq_windex(0)
     , mSeekRequested(false)
     , mSeekPos(0)
@@ -220,7 +221,7 @@ void VideoState::video_display(VideoPicture *vp)
         osg::ref_ptr<osg::Image> image = new osg::Image;
 
         image->setImage(this->video_ctx->width, this->video_ctx->height,
-                        1, GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, &vp->data[0], osg::Image::NO_DELETE);
+                        1, GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, vp->rgbaFrame->data[0], osg::Image::NO_DELETE);
 
         mTexture->setImage(image);
     }
@@ -308,11 +309,8 @@ int VideoState::queue_picture(AVFrame *pFrame, double pts)
     }
 
     vp->pts = pts;
-    vp->data.resize(this->video_ctx->width * this->video_ctx->height * 4);
-
-    uint8_t *dst[4] = { &vp->data[0], nullptr, nullptr, nullptr };
     sws_scale(this->sws_context, pFrame->data, pFrame->linesize,
-              0, this->video_ctx->height, dst, this->rgbaFrame->linesize);
+              0, this->video_ctx->height, vp->rgbaFrame->data, vp->rgbaFrame->linesize);
 
     // now we inform our display thread that we have a pic ready
     this->pictq_windex = (this->pictq_windex+1) % VIDEO_PICTURE_ARRAY_SIZE;
@@ -364,9 +362,6 @@ public:
 
         pFrame = av_frame_alloc();
 
-        self->rgbaFrame = av_frame_alloc();
-        av_image_alloc(self->rgbaFrame->data, self->rgbaFrame->linesize, self->video_ctx->width, self->video_ctx->height, AV_PIX_FMT_RGBA, 1);
-
         while(self->videoq.get(packet, self) >= 0)
         {
             if(packet->data == flush_pkt.data)
@@ -407,10 +402,7 @@ public:
 
         av_packet_unref(packet);
 
-        av_free(pFrame);
-
-        av_freep(&self->rgbaFrame->data[0]);
-        av_free(self->rgbaFrame);
+        av_frame_free(&pFrame);
     }
 
 private:
@@ -630,6 +622,25 @@ int VideoState::stream_open(int stream_index, AVFormatContext *pFormatCtx)
             return -1;
         }
 
+        // Allocate RGBA frame queue.
+        for (std::size_t i = 0; i < VIDEO_PICTURE_ARRAY_SIZE; ++i) {
+            AVFrame *frame = av_frame_alloc();
+            if (frame == nullptr) {
+                std::cerr << "av_frame_alloc failed" << std::endl;
+                return -1;
+            }
+
+            constexpr AVPixelFormat kPixFmt = AV_PIX_FMT_RGBA;
+            frame->format = kPixFmt;
+            frame->width = this->video_ctx->width;
+            frame->height = this->video_ctx->height;
+            if (av_image_alloc(frame->data, frame->linesize, frame->width, frame->height, kPixFmt, 1) < 0) {
+                std::cerr << "av_image_alloc failed" << std::endl;
+                return -1;
+            }
+            this->pictq[i].rgbaFrame = frame;
+        }
+
         this->video_thread.reset(new VideoThread(this));
         break;
 
@@ -771,6 +782,14 @@ void VideoState::deinit()
         mTexture->setImage(nullptr);
         mTexture = nullptr;
     }
+
+    // Dellocate RGBA frame queue.
+    for (std::size_t i = 0; i < VIDEO_PICTURE_ARRAY_SIZE; ++i) {
+        if (this->pictq[i].rgbaFrame == nullptr) continue;
+        av_freep(&this->pictq[i].rgbaFrame->data[0]);
+        av_frame_free(&this->pictq[i].rgbaFrame);
+    }
+
 }
 
 double VideoState::get_external_clock()
diff --git a/extern/osg-ffmpeg-videoplayer/videostate.hpp b/extern/osg-ffmpeg-videoplayer/videostate.hpp
index 641fce04be..ed226bcf2e 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.hpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.hpp
@@ -95,7 +95,7 @@ struct VideoPicture {
     VideoPicture() : pts(0.0)
     { }
 
-    std::vector<uint8_t> data;
+    AVFrame* rgbaFrame = nullptr;
     double pts;
 };
 
@@ -160,7 +160,6 @@ struct VideoState {
     PacketQueue videoq;
     SwsContext*  sws_context;
     VideoPicture pictq[VIDEO_PICTURE_ARRAY_SIZE];
-    AVFrame*     rgbaFrame; // used as buffer for the frame converted from its native format to RGBA
     int          pictq_size, pictq_rindex, pictq_windex;
     std::mutex pictq_mutex;
     std::condition_variable pictq_cond;

From 482f04c83678515927ce7368f0dd8a10afc1b76e Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sun, 7 Mar 2021 12:08:43 +0400
Subject: [PATCH 0411/2859] Use correct mCursorActive flag initial value

---
 apps/openmw/mwgui/windowmanagerimp.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 7da8cb7bd8..e82ba8c1d6 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -172,7 +172,7 @@ namespace MWGui
       , mWerewolfOverlayEnabled(Settings::Manager::getBool ("werewolf overlay", "GUI"))
       , mHudEnabled(true)
       , mCursorVisible(true)
-      , mCursorActive(false)
+      , mCursorActive(true)
       , mPlayerBounty(-1)
       , mGui(nullptr)
       , mGuiModes()

From eb93fdfbea6fc1c7a96c7b734a02fe2b7fb51464 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Sun, 7 Mar 2021 03:57:54 +0000
Subject: [PATCH 0412/2859] Use unique_ptr with custom deleter for
 VideoPicture::rgbaFrame

---
 extern/osg-ffmpeg-videoplayer/videostate.cpp | 20 ++++++++++++--------
 extern/osg-ffmpeg-videoplayer/videostate.hpp |  6 +++++-
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/extern/osg-ffmpeg-videoplayer/videostate.cpp b/extern/osg-ffmpeg-videoplayer/videostate.cpp
index cdfdc8ad52..0380c82b0d 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.cpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.cpp
@@ -156,6 +156,12 @@ void PacketQueue::clear()
     this->mutex.unlock ();
 }
 
+void VideoPicture::AVFrameDeleter::operator()(AVFrame* frame) const
+{
+    av_freep(frame->data);
+    av_frame_free(&frame);
+}
+
 int VideoState::istream_read(void *user_data, uint8_t *buf, int buf_size)
 {
     try
@@ -623,8 +629,9 @@ int VideoState::stream_open(int stream_index, AVFormatContext *pFormatCtx)
         }
 
         // Allocate RGBA frame queue.
-        for (std::size_t i = 0; i < VIDEO_PICTURE_ARRAY_SIZE; ++i) {
-            AVFrame *frame = av_frame_alloc();
+        for (std::size_t i = 0; i < VIDEO_PICTURE_ARRAY_SIZE; ++i)
+        {
+            std::unique_ptr<AVFrame, VideoPicture::AVFrameDeleter> frame{av_frame_alloc()};
             if (frame == nullptr) {
                 std::cerr << "av_frame_alloc failed" << std::endl;
                 return -1;
@@ -638,7 +645,7 @@ int VideoState::stream_open(int stream_index, AVFormatContext *pFormatCtx)
                 std::cerr << "av_image_alloc failed" << std::endl;
                 return -1;
             }
-            this->pictq[i].rgbaFrame = frame;
+            this->pictq[i].rgbaFrame = std::move(frame);
         }
 
         this->video_thread.reset(new VideoThread(this));
@@ -784,11 +791,8 @@ void VideoState::deinit()
     }
 
     // Dellocate RGBA frame queue.
-    for (std::size_t i = 0; i < VIDEO_PICTURE_ARRAY_SIZE; ++i) {
-        if (this->pictq[i].rgbaFrame == nullptr) continue;
-        av_freep(&this->pictq[i].rgbaFrame->data[0]);
-        av_frame_free(&this->pictq[i].rgbaFrame);
-    }
+    for (std::size_t i = 0; i < VIDEO_PICTURE_ARRAY_SIZE; ++i)
+        this->pictq[i].rgbaFrame = nullptr;
 
 }
 
diff --git a/extern/osg-ffmpeg-videoplayer/videostate.hpp b/extern/osg-ffmpeg-videoplayer/videostate.hpp
index ed226bcf2e..b54c03cb93 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.hpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.hpp
@@ -95,7 +95,11 @@ struct VideoPicture {
     VideoPicture() : pts(0.0)
     { }
 
-    AVFrame* rgbaFrame = nullptr;
+    struct AVFrameDeleter {
+        void operator()(AVFrame* frame) const;
+    };
+
+    std::unique_ptr<AVFrame, AVFrameDeleter> rgbaFrame;
     double pts;
 };
 

From eb07818f130ec0e6b0b29d9928d9d0cd2dafabbd Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 7 Mar 2021 20:58:09 +0100
Subject: [PATCH 0413/2859] Ignore agents without bounding boxes

---
 components/detournavigator/navigatorimpl.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/detournavigator/navigatorimpl.cpp b/components/detournavigator/navigatorimpl.cpp
index c47cf97662..142ba590d2 100644
--- a/components/detournavigator/navigatorimpl.cpp
+++ b/components/detournavigator/navigatorimpl.cpp
@@ -18,6 +18,8 @@ namespace DetourNavigator
 
     void NavigatorImpl::addAgent(const osg::Vec3f& agentHalfExtents)
     {
+        if(agentHalfExtents.length2() <= 0)
+            return;
         ++mAgents[agentHalfExtents];
         mNavMeshManager.addAgent(agentHalfExtents);
     }

From 58d33aa95b729d81c236a587b59352c6a7c7f017 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Mon, 8 Mar 2021 03:16:55 +0000
Subject: [PATCH 0414/2859] AV: Fix all memory leaks

The most substantial memory leak came from `PacketQueue::get`
not unreferencing its argument packet.

Other leaks came from using `av_free` instead of type-specific free
functions.

Also modifies `PacketQueue::put` for readability.
---
 apps/openmw/mwsound/ffmpeg_decoder.cpp        | 10 +++----
 .../osg-ffmpeg-videoplayer/audiodecoder.cpp   |  4 +--
 extern/osg-ffmpeg-videoplayer/videostate.cpp  | 28 +++++++++----------
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/apps/openmw/mwsound/ffmpeg_decoder.cpp b/apps/openmw/mwsound/ffmpeg_decoder.cpp
index 95ed9eeed8..84ea30b3c5 100644
--- a/apps/openmw/mwsound/ffmpeg_decoder.cpp
+++ b/apps/openmw/mwsound/ffmpeg_decoder.cpp
@@ -287,9 +287,9 @@ void FFmpeg_Decoder::close()
     mStream = nullptr;
 
     av_packet_unref(&mPacket);
-    av_freep(&mFrame);
-    swr_free(&mSwr);
     av_freep(&mDataBuf);
+    av_frame_free(&mFrame);
+    swr_free(&mSwr);
 
     if(mFormatCtx)
     {
@@ -302,11 +302,9 @@ void FFmpeg_Decoder::close()
             //
             if (mFormatCtx->pb->buffer != nullptr)
             {
-                av_free(mFormatCtx->pb->buffer);
-                mFormatCtx->pb->buffer = nullptr;
+                av_freep(&mFormatCtx->pb->buffer);
             }
-            av_free(mFormatCtx->pb);
-            mFormatCtx->pb = nullptr;
+            avio_context_free(&mFormatCtx->pb);
         }
         avformat_close_input(&mFormatCtx);
     }
diff --git a/extern/osg-ffmpeg-videoplayer/audiodecoder.cpp b/extern/osg-ffmpeg-videoplayer/audiodecoder.cpp
index 3373826793..c32794d2aa 100644
--- a/extern/osg-ffmpeg-videoplayer/audiodecoder.cpp
+++ b/extern/osg-ffmpeg-videoplayer/audiodecoder.cpp
@@ -91,7 +91,7 @@ MovieAudioDecoder::~MovieAudioDecoder()
     if(mAudioContext)
         avcodec_free_context(&mAudioContext);
 
-    av_freep(&mFrame);
+    av_frame_free(&mFrame);
     av_freep(&mDataBuf);
 }
 
@@ -222,7 +222,7 @@ int MovieAudioDecoder::audio_decode_frame(AVFrame *frame, int &sample_skip)
             return result;
         }
 
-        av_packet_unref(&mPacket);
+        av_packet_unref(pkt);
         mGetNextPacket = true;
 
         /* next packet */
diff --git a/extern/osg-ffmpeg-videoplayer/videostate.cpp b/extern/osg-ffmpeg-videoplayer/videostate.cpp
index 0380c82b0d..7e523e0543 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.cpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.cpp
@@ -83,10 +83,11 @@ void PacketQueue::put(AVPacket *pkt)
     pkt1 = (AVPacketList*)av_malloc(sizeof(AVPacketList));
     if(!pkt1) throw std::bad_alloc();
 
-    if(pkt != &flush_pkt && !pkt->buf && av_packet_ref(&pkt1->pkt, pkt) < 0)
-        throw std::runtime_error("Failed to duplicate packet");
+    if(pkt == &flush_pkt)
+        pkt1->pkt = *pkt;
+    else
+        av_packet_move_ref(&pkt1->pkt, pkt);
 
-    pkt1->pkt = *pkt;
     pkt1->next = nullptr;
 
     this->mutex.lock ();
@@ -117,7 +118,8 @@ int PacketQueue::get(AVPacket *pkt, VideoState *is)
             this->nb_packets--;
             this->size -= pkt1->pkt.size;
 
-            *pkt = pkt1->pkt;
+            av_packet_unref(pkt);
+            av_packet_move_ref(pkt, &pkt1->pkt);
             av_free(pkt1);
 
             return 1;
@@ -364,6 +366,7 @@ public:
     {
         VideoState* self = mVideoState;
         AVPacket pkt1, *packet = &pkt1;
+        av_init_packet(packet);
         AVFrame *pFrame;
 
         pFrame = av_frame_alloc();
@@ -436,6 +439,7 @@ public:
 
         AVFormatContext *pFormatCtx = self->format_ctx;
         AVPacket pkt1, *packet = &pkt1;
+        av_init_packet(packet);
 
         try
         {
@@ -691,16 +695,13 @@ void VideoState::init(std::shared_ptr<std::istream> inputstream, const std::stri
         {
           if (this->format_ctx->pb != nullptr)
           {
-              av_free(this->format_ctx->pb->buffer);
-              this->format_ctx->pb->buffer = nullptr;
-
-              av_free(this->format_ctx->pb);
-              this->format_ctx->pb = nullptr;
+              av_freep(&this->format_ctx->pb->buffer);
+              avio_context_free(&this->format_ctx->pb);
           }
         }
         // "Note that a user-supplied AVFormatContext will be freed on failure."
         this->format_ctx = nullptr;
-        av_free(ioCtx);
+        avio_context_free(&ioCtx);
         throw std::runtime_error("Failed to open video input");
     }
 
@@ -774,11 +775,8 @@ void VideoState::deinit()
         ///
         if (this->format_ctx->pb != nullptr)
         {
-            av_free(this->format_ctx->pb->buffer);
-            this->format_ctx->pb->buffer = nullptr;
-
-            av_free(this->format_ctx->pb);
-            this->format_ctx->pb = nullptr;
+            av_freep(&this->format_ctx->pb->buffer);
+            avio_context_free(&this->format_ctx->pb);
         }
         avformat_close_input(&this->format_ctx);
     }

From 36bac353df3ccf0b6d21d591a994ac4922b367e6 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Mon, 8 Mar 2021 04:00:11 +0000
Subject: [PATCH 0415/2859] AV: Handle varying video frame dimensions

---
 extern/osg-ffmpeg-videoplayer/videostate.cpp | 60 ++++++++++++--------
 extern/osg-ffmpeg-videoplayer/videostate.hpp |  6 ++
 2 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/extern/osg-ffmpeg-videoplayer/videostate.cpp b/extern/osg-ffmpeg-videoplayer/videostate.cpp
index 7e523e0543..a3a1e43185 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.cpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.cpp
@@ -158,6 +158,33 @@ void PacketQueue::clear()
     this->mutex.unlock ();
 }
 
+int VideoPicture::set_dimensions(int w, int h) {
+  if (this->rgbaFrame != nullptr && this->rgbaFrame->width == w &&
+      this->rgbaFrame->height == h) {
+    return 0;
+  }
+
+  std::unique_ptr<AVFrame, VideoPicture::AVFrameDeleter> frame{
+      av_frame_alloc()};
+  if (frame == nullptr) {
+    std::cerr << "av_frame_alloc failed" << std::endl;
+    return -1;
+  }
+
+  constexpr AVPixelFormat kPixFmt = AV_PIX_FMT_RGBA;
+  frame->format = kPixFmt;
+  frame->width = w;
+  frame->height = h;
+  if (av_image_alloc(frame->data, frame->linesize, frame->width, frame->height,
+                     kPixFmt, 1) < 0) {
+    std::cerr << "av_image_alloc failed" << std::endl;
+    return -1;
+  }
+
+  this->rgbaFrame = std::move(frame);
+  return 0;
+}
+
 void VideoPicture::AVFrameDeleter::operator()(AVFrame* frame) const
 {
     av_freep(frame->data);
@@ -305,18 +332,25 @@ int VideoState::queue_picture(AVFrame *pFrame, double pts)
     // Convert the image into RGBA format
     // TODO: we could do this in a pixel shader instead, if the source format
     // matches a commonly used format (ie YUV420P)
-    if(this->sws_context == nullptr)
+    const int w = pFrame->width;
+    const int h = pFrame->height;
+    if(this->sws_context == nullptr || this->sws_context_w != w || this->sws_context_h != h)
     {
-        int w = this->video_ctx->width;
-        int h = this->video_ctx->height;
+        if (this->sws_context != nullptr)
+            sws_freeContext(this->sws_context);
         this->sws_context = sws_getContext(w, h, this->video_ctx->pix_fmt,
                                            w, h, AV_PIX_FMT_RGBA, SWS_BICUBIC,
                                            nullptr, nullptr, nullptr);
         if(this->sws_context == nullptr)
             throw std::runtime_error("Cannot initialize the conversion context!\n");
+        this->sws_context_w = w;
+        this->sws_context_h = h;
     }
 
     vp->pts = pts;
+    if (vp->set_dimensions(w, h) < 0)
+        return -1;
+
     sws_scale(this->sws_context, pFrame->data, pFrame->linesize,
               0, this->video_ctx->height, vp->rgbaFrame->data, vp->rgbaFrame->linesize);
 
@@ -632,26 +666,6 @@ int VideoState::stream_open(int stream_index, AVFormatContext *pFormatCtx)
             return -1;
         }
 
-        // Allocate RGBA frame queue.
-        for (std::size_t i = 0; i < VIDEO_PICTURE_ARRAY_SIZE; ++i)
-        {
-            std::unique_ptr<AVFrame, VideoPicture::AVFrameDeleter> frame{av_frame_alloc()};
-            if (frame == nullptr) {
-                std::cerr << "av_frame_alloc failed" << std::endl;
-                return -1;
-            }
-
-            constexpr AVPixelFormat kPixFmt = AV_PIX_FMT_RGBA;
-            frame->format = kPixFmt;
-            frame->width = this->video_ctx->width;
-            frame->height = this->video_ctx->height;
-            if (av_image_alloc(frame->data, frame->linesize, frame->width, frame->height, kPixFmt, 1) < 0) {
-                std::cerr << "av_image_alloc failed" << std::endl;
-                return -1;
-            }
-            this->pictq[i].rgbaFrame = std::move(frame);
-        }
-
         this->video_thread.reset(new VideoThread(this));
         break;
 
diff --git a/extern/osg-ffmpeg-videoplayer/videostate.hpp b/extern/osg-ffmpeg-videoplayer/videostate.hpp
index b54c03cb93..015656084f 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.hpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.hpp
@@ -99,6 +99,11 @@ struct VideoPicture {
         void operator()(AVFrame* frame) const;
     };
 
+    // Sets frame dimensions.
+    // Must be called before writing to `rgbaFrame`.
+    // Return -1 on error.
+    int set_dimensions(int w, int h);
+
     std::unique_ptr<AVFrame, AVFrameDeleter> rgbaFrame;
     double pts;
 };
@@ -163,6 +168,7 @@ struct VideoState {
     double      video_clock; ///<pts of last decoded frame / predicted pts of next decoded frame
     PacketQueue videoq;
     SwsContext*  sws_context;
+    int sws_context_w, sws_context_h;
     VideoPicture pictq[VIDEO_PICTURE_ARRAY_SIZE];
     int          pictq_size, pictq_rindex, pictq_windex;
     std::mutex pictq_mutex;

From 7f6339c61f2f4c82c8b127a626486465d9738856 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Mon, 8 Mar 2021 04:16:33 +0000
Subject: [PATCH 0416/2859] AV: Add changelog entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e4b707806..97634cedf2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -97,6 +97,7 @@
     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 #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

From d805886de70eec037db6cd49a9433caa3070bd8a Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 8 Mar 2021 10:58:51 +0400
Subject: [PATCH 0417/2859] Double-buffer shader water stateset (bug #5026)

---
 CHANGELOG.md                              |  1 +
 apps/openmw/mwrender/renderingmanager.cpp |  4 +-
 apps/openmw/mwrender/sky.cpp              | 31 ++++---------
 apps/openmw/mwrender/sky.hpp              |  8 ++--
 apps/openmw/mwrender/water.cpp            | 55 ++++++++++++++++++-----
 apps/openmw/mwrender/water.hpp            |  7 ++-
 6 files changed, 62 insertions(+), 44 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e4b707806..58a09429be 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@
     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
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index a3aee5c0fa..4521046422 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -370,7 +370,6 @@ namespace MWRender
 
         mSky.reset(new SkyManager(sceneRoot, resourceSystem->getSceneManager()));
         mSky->setCamera(mViewer->getCamera());
-        mSky->setRainIntensityUniform(mWater->getRainIntensityUniform());
 
         source->setStateSetModes(*mRootNode->getOrCreateStateSet(), osg::StateAttribute::ON);
 
@@ -658,6 +657,9 @@ namespace MWRender
 
         mUnrefQueue->flush(mWorkQueue.get());
 
+        float rainIntensity = mSky->getEffectFade();
+        mWater->setRainIntensity(rainIntensity);
+
         if (!paused)
         {
             mEffectManager->update(dt);
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index 389944000c..d6b1f90669 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -1113,7 +1113,6 @@ private:
 SkyManager::SkyManager(osg::Group* parentNode, Resource::SceneManager* sceneManager)
     : mSceneManager(sceneManager)
     , mCamera(nullptr)
-    , mRainIntensityUniform(nullptr)
     , mAtmosphereNightRoll(0.f)
     , mCreated(false)
     , mIsStorm(false)
@@ -1163,11 +1162,6 @@ SkyManager::SkyManager(osg::Group* parentNode, Resource::SceneManager* sceneMana
     mUnderwaterSwitch = new UnderwaterSwitchCallback(skyroot);
 }
 
-void SkyManager::setRainIntensityUniform(osg::Uniform *uniform)
-{
-    mRainIntensityUniform = uniform;
-}
-
 void SkyManager::create()
 {
     assert(!mCreated);
@@ -1576,30 +1570,21 @@ bool SkyManager::isEnabled()
     return mEnabled;
 }
 
-bool SkyManager::hasRain()
+bool SkyManager::hasRain() const
 {
     return mRainNode != nullptr;
 }
 
-void SkyManager::update(float duration)
+float SkyManager::getEffectFade() const
 {
-    if (!mEnabled)
-    {
-        if (mRainIntensityUniform)
-            mRainIntensityUniform->set(0.f);
-
-        return;
-    }
-
-    if (mRainIntensityUniform)
-    {
-        float rainIntensity = 0.f;
-        if (!mIsStorm && (hasRain() || mParticleNode))
-            rainIntensity = mEffectFade;
+    if (mEnabled && !mIsStorm && (hasRain() || mParticleNode))
+        return mEffectFade;
 
-        mRainIntensityUniform->set(rainIntensity);
-    }
+    return 0.f;
+}
 
+void SkyManager::update(float duration)
+{
     switchUnderwaterRain();
 
     if (mIsStorm)
diff --git a/apps/openmw/mwrender/sky.hpp b/apps/openmw/mwrender/sky.hpp
index f32c40192d..0812213983 100644
--- a/apps/openmw/mwrender/sky.hpp
+++ b/apps/openmw/mwrender/sky.hpp
@@ -7,7 +7,6 @@
 
 #include <osg/ref_ptr>
 #include <osg/Vec4f>
-#include <osg/Uniform>
 
 namespace osg
 {
@@ -157,7 +156,9 @@ namespace MWRender
 
         bool isEnabled();
 
-        bool hasRain();
+        bool hasRain() const;
+
+        float getEffectFade() const;
 
         void setRainSpeed(float speed);
 
@@ -180,8 +181,6 @@ namespace MWRender
 
         void setCamera(osg::Camera *camera);
 
-        void setRainIntensityUniform(osg::Uniform *uniform);
-
         float getBaseWindSpeed() const;
 
     private:
@@ -196,7 +195,6 @@ namespace MWRender
         Resource::SceneManager* mSceneManager;
 
         osg::Camera *mCamera;
-        osg::Uniform *mRainIntensityUniform;
 
         osg::ref_ptr<osg::Group> mRootNode;
         osg::ref_ptr<osg::Group> mEarlyRenderBinRoot;
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index 1cc5a3cb7c..af24a8648b 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -208,6 +208,37 @@ public:
     }
 };
 
+class RainIntensityUpdater : public SceneUtil::StateSetUpdater
+{
+public:
+    RainIntensityUpdater()
+        : mRainIntensity(0.f)
+    {
+    }
+
+    void setRainIntensity(float rainIntensity)
+    {
+        mRainIntensity = rainIntensity;
+    }
+
+protected:
+    void setDefaults(osg::StateSet* stateset) override
+    {
+        osg::ref_ptr<osg::Uniform> rainIntensityUniform = new osg::Uniform("rainIntensity", 0.0f);
+        stateset->addUniform(rainIntensityUniform.get());
+    }
+
+    void apply(osg::StateSet* stateset, osg::NodeVisitor* /*nv*/) override
+    {
+        osg::ref_ptr<osg::Uniform> rainIntensityUniform = stateset->getUniform("rainIntensity");
+        if (rainIntensityUniform != nullptr)
+            rainIntensityUniform->set(mRainIntensity);
+    }
+
+private:
+    float mRainIntensity;
+};
+
 osg::ref_ptr<osg::Image> readPngImage (const std::string& file)
 {
     // use boost in favor of osgDB::readImage, to handle utf-8 path issues on Windows
@@ -431,7 +462,8 @@ public:
 
 Water::Water(osg::Group *parent, osg::Group* sceneRoot, Resource::ResourceSystem *resourceSystem,
              osgUtil::IncrementalCompileOperation *ico, const std::string& resourcePath)
-    : mParent(parent)
+    : mRainIntensityUpdater(nullptr)
+    , mParent(parent)
     , mSceneRoot(sceneRoot)
     , mResourceSystem(resourceSystem)
     , mResourcePath(resourcePath)
@@ -463,8 +495,6 @@ Water::Water(osg::Group *parent, osg::Group* sceneRoot, Resource::ResourceSystem
 
     setHeight(mTop);
 
-    mRainIntensityUniform = new osg::Uniform("rainIntensity",(float) 0.0);
-
     updateWaterMaterial();
 
     if (ico)
@@ -494,11 +524,6 @@ void Water::setCullCallback(osg::Callback* callback)
     }
 }
 
-osg::Uniform *Water::getRainIntensityUniform()
-{
-    return mRainIntensityUniform.get();
-}
-
 void Water::updateWaterMaterial()
 {
     if (mReflection)
@@ -556,6 +581,8 @@ void Water::createSimpleWaterStateSet(osg::Node* node, float alpha)
     osg::ref_ptr<osg::StateSet> stateset = SceneUtil::createSimpleWaterStateSet(alpha, MWRender::RenderBin_Water);
 
     node->setStateSet(stateset);
+    node->setUpdateCallback(nullptr);
+    mRainIntensityUpdater = nullptr;
 
     // Add animated textures
     std::vector<osg::ref_ptr<osg::Texture2D> > textures;
@@ -639,15 +666,15 @@ void Water::createShaderWaterStateSet(osg::Node* node, Reflection* reflection, R
 
     shaderStateset->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
 
-    shaderStateset->addUniform(mRainIntensityUniform.get());
-
     osg::ref_ptr<osg::Program> program (new osg::Program);
     program->addShader(vertexShader);
     program->addShader(fragmentShader);
     shaderStateset->setAttributeAndModes(program, osg::StateAttribute::ON);
 
     node->setStateSet(shaderStateset);
-    node->setUpdateCallback(nullptr);
+
+    mRainIntensityUpdater = new RainIntensityUpdater();
+    node->setUpdateCallback(mRainIntensityUpdater);
 }
 
 void Water::processChangedSettings(const Settings::CategorySettingVector& settings)
@@ -730,6 +757,12 @@ void Water::setHeight(const float height)
         mRefraction->setWaterLevel(mTop);
 }
 
+void Water::setRainIntensity(float rainIntensity)
+{
+    if (mRainIntensityUpdater)
+        mRainIntensityUpdater->setRainIntensity(rainIntensity);
+}
+
 void Water::update(float dt)
 {
     mSimulation->update(dt);
diff --git a/apps/openmw/mwrender/water.hpp b/apps/openmw/mwrender/water.hpp
index 3787ef4268..ec7dc95db8 100644
--- a/apps/openmw/mwrender/water.hpp
+++ b/apps/openmw/mwrender/water.hpp
@@ -6,7 +6,6 @@
 
 #include <osg/ref_ptr>
 #include <osg/Vec3f>
-#include <osg/Uniform>
 #include <osg/Camera>
 
 #include <components/settings/settings.hpp>
@@ -46,11 +45,12 @@ namespace MWRender
     class Refraction;
     class Reflection;
     class RippleSimulation;
+    class RainIntensityUpdater;
 
     /// Water rendering
     class Water
     {
-        osg::ref_ptr<osg::Uniform> mRainIntensityUniform;
+        osg::ref_ptr<RainIntensityUpdater> mRainIntensityUpdater;
 
         osg::ref_ptr<osg::Group> mParent;
         osg::ref_ptr<osg::Group> mSceneRoot;
@@ -112,6 +112,7 @@ namespace MWRender
 
         void changeCell(const MWWorld::CellStore* store);
         void setHeight(const float height);
+        void setRainIntensity(const float rainIntensity);
 
         void update(float dt);
 
@@ -119,8 +120,6 @@ namespace MWRender
         osg::Camera *getRefractionCamera();
 
         void processChangedSettings(const Settings::CategorySettingVector& settings);
-
-        osg::Uniform *getRainIntensityUniform();
     };
 
 }

From 1db7d2ec4e78582f47a2187b5371f10018b28698 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Mon, 8 Mar 2021 19:29:34 +0000
Subject: [PATCH 0418/2859] Restore compatibility with FFMpeg < 57.80.100

This should fix macOS Travis build broken by 58d33aa95b729d81c236a587b59352c6a7c7f017
---
 apps/openmw/mwsound/ffmpeg_decoder.cpp       |  4 ++++
 extern/osg-ffmpeg-videoplayer/videostate.cpp | 12 ++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/apps/openmw/mwsound/ffmpeg_decoder.cpp b/apps/openmw/mwsound/ffmpeg_decoder.cpp
index 84ea30b3c5..ec36a5cdf8 100644
--- a/apps/openmw/mwsound/ffmpeg_decoder.cpp
+++ b/apps/openmw/mwsound/ffmpeg_decoder.cpp
@@ -304,7 +304,11 @@ void FFmpeg_Decoder::close()
             {
                 av_freep(&mFormatCtx->pb->buffer);
             }
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 80, 100)
             avio_context_free(&mFormatCtx->pb);
+#else
+            av_freep(&mFormatCtx->pb);
+#endif
         }
         avformat_close_input(&mFormatCtx);
     }
diff --git a/extern/osg-ffmpeg-videoplayer/videostate.cpp b/extern/osg-ffmpeg-videoplayer/videostate.cpp
index a3a1e43185..7c4bddb01e 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.cpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.cpp
@@ -710,12 +710,20 @@ void VideoState::init(std::shared_ptr<std::istream> inputstream, const std::stri
           if (this->format_ctx->pb != nullptr)
           {
               av_freep(&this->format_ctx->pb->buffer);
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 80, 100)
               avio_context_free(&this->format_ctx->pb);
+#else
+              av_freep(&this->format_ctx->pb);
+#endif
           }
         }
         // "Note that a user-supplied AVFormatContext will be freed on failure."
         this->format_ctx = nullptr;
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 80, 100)
         avio_context_free(&ioCtx);
+#else
+        av_freep(&ioCtx);
+#endif
         throw std::runtime_error("Failed to open video input");
     }
 
@@ -790,7 +798,11 @@ void VideoState::deinit()
         if (this->format_ctx->pb != nullptr)
         {
             av_freep(&this->format_ctx->pb->buffer);
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 80, 100)
             avio_context_free(&this->format_ctx->pb);
+#else
+            av_freep(&this->format_ctx->pb);
+#endif
         }
         avformat_close_input(&this->format_ctx);
     }

From 38679013fe6e426e3609ff833c1b55b02e0e644a Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Wed, 10 Mar 2021 19:10:17 +0400
Subject: [PATCH 0419/2859] Give meaningful name to the mEffectFade

---
 apps/openmw/mwrender/renderingmanager.cpp |  2 +-
 apps/openmw/mwrender/sky.cpp              | 14 +++++++-------
 apps/openmw/mwrender/sky.hpp              |  6 +++---
 apps/openmw/mwworld/weather.cpp           |  6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 4521046422..a6062f444c 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -657,7 +657,7 @@ namespace MWRender
 
         mUnrefQueue->flush(mWorkQueue.get());
 
-        float rainIntensity = mSky->getEffectFade();
+        float rainIntensity = mSky->getPrecipitationAlpha();
         mWater->setRainIntensity(rainIntensity);
 
         if (!paused)
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index d6b1f90669..ddd4a0660d 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -1138,7 +1138,7 @@ SkyManager::SkyManager(osg::Group* parentNode, Resource::SceneManager* sceneMana
     , mBaseWindSpeed(0.f)
     , mEnabled(true)
     , mSunEnabled(true)
-    , mEffectFade(0.f)
+    , mPrecipitationAlpha(0.f)
 {
     osg::ref_ptr<CameraRelativeTransform> skyroot (new CameraRelativeTransform);
     skyroot->setName("Sky Root");
@@ -1516,7 +1516,7 @@ void SkyManager::createRain()
 
     osg::ref_ptr<osgParticle::ModularProgram> program (new osgParticle::ModularProgram);
     program->addOperator(new WrapAroundOperator(mCamera,rainRange));
-    program->addOperator(new WeatherAlphaOperator(mEffectFade, true));
+    program->addOperator(new WeatherAlphaOperator(mPrecipitationAlpha, true));
     program->setParticleSystem(mRainParticleSystem);
     mRainNode->addChild(program);
 
@@ -1575,10 +1575,10 @@ bool SkyManager::hasRain() const
     return mRainNode != nullptr;
 }
 
-float SkyManager::getEffectFade() const
+float SkyManager::getPrecipitationAlpha() const
 {
     if (mEnabled && !mIsStorm && (hasRain() || mParticleNode))
-        return mEffectFade;
+        return mPrecipitationAlpha;
 
     return 0.f;
 }
@@ -1722,7 +1722,7 @@ void SkyManager::setWeather(const WeatherResult& weather)
             SceneUtil::AssignControllerSourcesVisitor assignVisitor(std::shared_ptr<SceneUtil::ControllerSource>(new SceneUtil::FrameTimeSource));
             mParticleEffect->accept(assignVisitor);
 
-            AlphaFader::SetupVisitor alphaFaderSetupVisitor(mEffectFade);
+            AlphaFader::SetupVisitor alphaFaderSetupVisitor(mPrecipitationAlpha);
 
             mParticleEffect->accept(alphaFaderSetupVisitor);
 
@@ -1739,7 +1739,7 @@ void SkyManager::setWeather(const WeatherResult& weather)
                 osg::ref_ptr<osgParticle::ModularProgram> program (new osgParticle::ModularProgram);
                 if (!mIsStorm)
                     program->addOperator(new WrapAroundOperator(mCamera,osg::Vec3(1024,1024,800)));
-                program->addOperator(new WeatherAlphaOperator(mEffectFade, false));
+                program->addOperator(new WeatherAlphaOperator(mPrecipitationAlpha, false));
                 program->setParticleSystem(ps);
                 mParticleNode->addChild(program);
             }
@@ -1828,7 +1828,7 @@ void SkyManager::setWeather(const WeatherResult& weather)
 
     mAtmosphereNightNode->setNodeMask(weather.mNight ? ~0 : 0);
 
-    mEffectFade = weather.mEffectFade;
+    mPrecipitationAlpha = weather.mPrecipitationAlpha;
 }
 
 float SkyManager::getBaseWindSpeed() const
diff --git a/apps/openmw/mwrender/sky.hpp b/apps/openmw/mwrender/sky.hpp
index 0812213983..f8c501dda6 100644
--- a/apps/openmw/mwrender/sky.hpp
+++ b/apps/openmw/mwrender/sky.hpp
@@ -87,7 +87,7 @@ namespace MWRender
 
         std::string mParticleEffect;
         std::string mRainEffect;
-        float mEffectFade;
+        float mPrecipitationAlpha;
 
         float mRainDiameter;
         float mRainMinHeight;
@@ -158,7 +158,7 @@ namespace MWRender
 
         bool hasRain() const;
 
-        float getEffectFade() const;
+        float getPrecipitationAlpha() const;
 
         void setRainSpeed(float speed);
 
@@ -269,7 +269,7 @@ namespace MWRender
         bool mEnabled;
         bool mSunEnabled;
 
-        float mEffectFade;
+        float mPrecipitationAlpha;
 
         osg::Vec4f mMoonScriptColor;
     };
diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index 415e69d20b..4bdd784db1 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -1129,7 +1129,7 @@ inline void WeatherManager::calculateResult(const int weatherID, const float gam
     mResult.mGlareView = current.mGlareView;
     mResult.mAmbientLoopSoundID = current.mAmbientLoopSoundID;
     mResult.mAmbientSoundVolume = 1.f;
-    mResult.mEffectFade = 1.f;
+    mResult.mPrecipitationAlpha = 1.f;
 
     mResult.mIsStorm = current.mIsStorm;
 
@@ -1236,7 +1236,7 @@ inline void WeatherManager::calculateTransitionResult(const float factor, const
         mResult.mRainSpeed = current.mRainSpeed;
         mResult.mRainEntranceSpeed = current.mRainEntranceSpeed;
         mResult.mAmbientSoundVolume = 1 - factor / threshold;
-        mResult.mEffectFade = mResult.mAmbientSoundVolume;
+        mResult.mPrecipitationAlpha = mResult.mAmbientSoundVolume;
         mResult.mAmbientLoopSoundID = current.mAmbientLoopSoundID;
         mResult.mRainDiameter = current.mRainDiameter;
         mResult.mRainMinHeight = current.mRainMinHeight;
@@ -1251,7 +1251,7 @@ inline void WeatherManager::calculateTransitionResult(const float factor, const
         mResult.mRainSpeed = other.mRainSpeed;
         mResult.mRainEntranceSpeed = other.mRainEntranceSpeed;
         mResult.mAmbientSoundVolume = (factor - threshold) / (1 - threshold);
-        mResult.mEffectFade = mResult.mAmbientSoundVolume;
+        mResult.mPrecipitationAlpha = mResult.mAmbientSoundVolume;
         mResult.mAmbientLoopSoundID = other.mAmbientLoopSoundID;
 
         mResult.mRainDiameter = other.mRainDiameter;

From cb2cbb4181c47261a3611e10ed259111f15880c6 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Wed, 10 Mar 2021 22:07:14 +0000
Subject: [PATCH 0420/2859] Convert blending factors properly for the character
 preview

---
 apps/openmw/mwrender/characterpreview.cpp     | 38 ++++++++++++++-----
 .../myguiplatform/myguirendermanager.cpp      | 11 ++++++
 2 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index 633c8fcb72..59dfd944ea 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -84,7 +84,8 @@ namespace MWRender
     };
 
 
-    // Set up alpha blending to Additive mode to avoid issues caused by transparent objects writing onto the alpha value of the FBO
+    // Set up alpha blending mode to avoid issues caused by transparent objects writing onto the alpha value of the FBO
+    // This makes the RTT have premultiplied alpha, though, so the source blend factor must be GL_ONE when it's applied
     class SetUpBlendVisitor : public osg::NodeVisitor
     {
     public:
@@ -94,22 +95,40 @@ namespace MWRender
 
         void apply(osg::Node& node) override
         {
-            if (osg::StateSet* stateset = node.getStateSet())
+            if (osg::ref_ptr<osg::StateSet> stateset = node.getStateSet())
             {
+                osg::ref_ptr<osg::StateSet> newStateSet;
                 if (stateset->getAttribute(osg::StateAttribute::BLENDFUNC) || stateset->getBinNumber() == osg::StateSet::TRANSPARENT_BIN)
                 {
-                    osg::ref_ptr<osg::StateSet> newStateSet = new osg::StateSet(*stateset, osg::CopyOp::SHALLOW_COPY);
                     osg::BlendFunc* blendFunc = static_cast<osg::BlendFunc*>(stateset->getAttribute(osg::StateAttribute::BLENDFUNC));
-                    osg::ref_ptr<osg::BlendFunc> newBlendFunc = blendFunc ? new osg::BlendFunc(*blendFunc) : new osg::BlendFunc;
-                    newBlendFunc->setDestinationAlpha(osg::BlendFunc::ONE);
-                    newStateSet->setAttribute(newBlendFunc, osg::StateAttribute::ON);
-                    node.setStateSet(newStateSet);
+
+                    if (blendFunc)
+                    {
+                        newStateSet = new osg::StateSet(*stateset, osg::CopyOp::SHALLOW_COPY);
+                        node.setStateSet(newStateSet);
+                        osg::ref_ptr<osg::BlendFunc> newBlendFunc = new osg::BlendFunc(*blendFunc);
+                        newStateSet->setAttribute(newBlendFunc, osg::StateAttribute::ON);
+                        // I *think* (based on some by-hand maths) that the RGB and dest alpha factors are unchanged, and only dest determines source alpha factor
+                        // This has the benefit of being idempotent if we assume nothing used glBlendFuncSeparate before we touched it
+                        if (blendFunc->getDestination() == osg::BlendFunc::ONE_MINUS_SRC_ALPHA)
+                            newBlendFunc->setSourceAlpha(osg::BlendFunc::ONE);
+                        else if (blendFunc->getDestination() == osg::BlendFunc::ONE)
+                            newBlendFunc->setSourceAlpha(osg::BlendFunc::ZERO);
+                        // Other setups barely exist in the wild and aren't worth supporting as they're not equippable gear
+                        else
+                            Log(Debug::Info) << "Unable to adjust blend mode for character preview. Source factor 0x" << std::hex << blendFunc->getSource() << ", destination factor 0x" << blendFunc->getDestination() << std::dec;
+                    }
                 }
                 if (stateset->getMode(GL_BLEND) & osg::StateAttribute::ON)
                 {
+                    if (!newStateSet)
+                    {
+                        newStateSet = new osg::StateSet(*stateset, osg::CopyOp::SHALLOW_COPY);
+                        node.setStateSet(newStateSet);
+                    }
                     // Disable noBlendAlphaEnv
-                    stateset->setTextureMode(7, GL_TEXTURE_2D, osg::StateAttribute::OFF);
-                    stateset->addUniform(mNoAlphaUniform);
+                    newStateSet->setTextureMode(7, GL_TEXTURE_2D, osg::StateAttribute::OFF);
+                    newStateSet->addUniform(mNoAlphaUniform);
                 }
             }
             traverse(node);
@@ -134,6 +153,7 @@ namespace MWRender
         mTexture->setInternalFormat(GL_RGBA);
         mTexture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
         mTexture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
+        mTexture->setUserValue("premultiplied alpha", true);
 
         mCamera = new osg::Camera;
         // hints that the camera is not relative to the master camera
diff --git a/components/myguiplatform/myguirendermanager.cpp b/components/myguiplatform/myguirendermanager.cpp
index 1813c9e014..6f9ee81955 100644
--- a/components/myguiplatform/myguirendermanager.cpp
+++ b/components/myguiplatform/myguirendermanager.cpp
@@ -14,6 +14,8 @@
 
 #include <components/resource/imagemanager.hpp>
 
+#include <components/debug/debuglog.hpp>
+
 #include "myguicompat.h"
 #include "myguitexture.hpp"
 
@@ -439,14 +441,23 @@ void RenderManager::doRender(MyGUI::IVertexBuffer *buffer, MyGUI::ITexture *text
     batch.mVertexBuffer = static_cast<OSGVertexBuffer*>(buffer)->getVertexBuffer();
     batch.mArray = static_cast<OSGVertexBuffer*>(buffer)->getVertexArray();
     static_cast<OSGVertexBuffer*>(buffer)->markUsed();
+    bool premultipliedAlpha = false;
     if (texture)
     {
         batch.mTexture = static_cast<OSGTexture*>(texture)->getTexture();
         if (batch.mTexture->getDataVariance() == osg::Object::DYNAMIC)
             mDrawable->setDataVariance(osg::Object::DYNAMIC); // only for this frame, reset in begin()
+        batch.mTexture->getUserValue("premultiplied alpha", premultipliedAlpha);
     }
     if (mInjectState)
         batch.mStateSet = mInjectState;
+    else if (premultipliedAlpha)
+    {
+        // This is hacky, but MyGUI made it impossible to use a custom layer for a nested node, so state couldn't be injected 'properly'
+        osg::ref_ptr<osg::StateSet> stateSet = new osg::StateSet();
+        stateSet->setAttribute(new osg::BlendFunc(osg::BlendFunc::ONE, osg::BlendFunc::ONE_MINUS_SRC_ALPHA));
+        batch.mStateSet = stateSet;
+    }
 
     mDrawable->addBatch(batch);
 }

From d52ae28b7a35eae90f63e96e0f24452608483c7f Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Thu, 11 Mar 2021 00:28:14 +0000
Subject: [PATCH 0421/2859] Fix linking on MacOS

---
 components/myguiplatform/myguirendermanager.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/myguiplatform/myguirendermanager.cpp b/components/myguiplatform/myguirendermanager.cpp
index 6f9ee81955..77a5ee533b 100644
--- a/components/myguiplatform/myguirendermanager.cpp
+++ b/components/myguiplatform/myguirendermanager.cpp
@@ -7,6 +7,7 @@
 #include <osg/BlendFunc>
 #include <osg/Texture2D>
 #include <osg/TexMat>
+#include <osg/ValueObject>
 
 #include <osgViewer/Viewer>
 

From 64ddb4c1b0180e9cf37ba376a928404aca3ec185 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Thu, 11 Mar 2021 01:01:55 +0000
Subject: [PATCH 0422/2859] Fix linking on MacOS

---
 apps/openmw/mwrender/characterpreview.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index 59dfd944ea..7ebc964fe3 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -11,6 +11,7 @@
 #include <osg/PositionAttitudeTransform>
 #include <osg/LightModel>
 #include <osg/LightSource>
+#include <osg/ValueObject>
 #include <osgUtil/IntersectionVisitor>
 #include <osgUtil/LineSegmentIntersector>
 

From 63958c6d612c7f6c14a36f56d69ce239d5c66d65 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Thu, 11 Mar 2021 10:00:11 +0400
Subject: [PATCH 0423/2859] Changelog fixes

---
 CHANGELOG.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae03245317..53cce8dc46 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,6 @@
 0.47.0
 ------
 
-    Bug #832: OpenMW-CS: Handle deleted references
     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
@@ -9,7 +8,7 @@
     Bug #2311: Targeted scripts are not properly supported on non-unique RefIDs
     Bug #2473: Unable to overstock merchants
     Bug #2798: Mutable ESM records
-    Bug #2976 [reopened]: Issues combining settings from the command line and both config files
+    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
@@ -24,7 +23,7 @@
     Bug #4201: Projectile-projectile collision
     Bug #4247: Cannot walk up stairs in Ebonheart docks
     Bug #4357: OpenMW-CS: TopicInfos index sorting and rearranging isn't fully functional
-    Bug #4363: Editor: Defect in Clone Function for Dialogue Info records
+    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
@@ -45,11 +44,11 @@
     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 #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: Editor: Verifier checks race of non-skin bodyparts
+    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
@@ -71,6 +70,7 @@
     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
@@ -94,7 +94,7 @@
     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: Editor: skirts are invisible on characters
+    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
@@ -109,6 +109,7 @@
     Bug #5871: The console appears if you type the Russian letter "Ё" in the name of the enchantment
     Bug #5877: Effects appearing with empty icon
     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 #2386: Distant Statics in the form of Object Paging
     Feature #2404: Levelled List can not be placed into a container
@@ -117,7 +118,7 @@
     Feature #4894: Consider actors as obstacles for pathfinding
     Feature #4977: Use the "default icon.tga" when an item's icon is not found
     Feature #5043: Head Bobbing
-    Feature #5199: Improve Scene Colors
+    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
@@ -126,7 +127,6 @@
     Feature #5486: Fixes trainers to choose their training skills based on their base skill points
     Feature #5519: Code Patch tab in launcher
     Feature #5524: Resume failed script execution after reload
-    Feature #5525: Search fields tweaks (utf-8)
     Feature #5545: Option to allow stealing from an unconscious NPC during combat
     Feature #5563: Run physics update in background thread
     Feature #5579: MCP SetAngle enhancement

From 39b7260ab469528e815e041979222821da6ce28d Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Thu, 11 Mar 2021 11:46:44 +0400
Subject: [PATCH 0424/2859] Fix a crash during new game

---
 apps/openmw/mwrender/sky.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index ddd4a0660d..f826416769 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -1585,6 +1585,9 @@ float SkyManager::getPrecipitationAlpha() const
 
 void SkyManager::update(float duration)
 {
+    if (!mEnabled)
+        return;
+
     switchUnderwaterRain();
 
     if (mIsStorm)

From 351d11449b8d0fba2940a0a2c237312527eac50d Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Thu, 11 Mar 2021 23:27:42 +0000
Subject: [PATCH 0425/2859] Avoid heightfield conversion in newer Bullet

Takes advantage of the direct `float` support implemented in
https://github.com/bulletphysics/bullet3/pull/3293
---
 apps/openmw/mwphysics/heightfield.cpp | 14 ++++++++++++++
 apps/openmw/mwphysics/heightfield.hpp |  2 ++
 2 files changed, 16 insertions(+)

diff --git a/apps/openmw/mwphysics/heightfield.cpp b/apps/openmw/mwphysics/heightfield.cpp
index 34127fe3ae..e210bc3903 100644
--- a/apps/openmw/mwphysics/heightfield.cpp
+++ b/apps/openmw/mwphysics/heightfield.cpp
@@ -10,6 +10,12 @@
 
 #include <type_traits>
 
+#if BT_BULLET_VERSION < 310
+// Older Bullet versions only support `btScalar` heightfields.
+// Our heightfield data is `float`.
+//
+// These functions handle conversion from `float` to `double` when
+// `btScalar` is `double` (`BT_USE_DOUBLE_PRECISION`).
 namespace
 {
     template <class T>
@@ -40,14 +46,18 @@ namespace
         return btScalarHeights.data();
     }
 }
+#endif
 
 namespace MWPhysics
 {
     HeightField::HeightField(const float* heights, int x, int y, float triSize, float sqrtVerts, float minH, float maxH, const osg::Object* holdObject, PhysicsTaskScheduler* scheduler)
         : mHoldObject(holdObject)
+#if BT_BULLET_VERSION < 310
         , mHeights(makeHeights(heights, sqrtVerts))
+#endif
         , mTaskScheduler(scheduler)
     {
+#if BT_BULLET_VERSION < 310
         mShape = std::make_unique<btHeightfieldTerrainShape>(
             sqrtVerts, sqrtVerts,
             getHeights(heights, mHeights),
@@ -55,6 +65,10 @@ namespace MWPhysics
             minH, maxH, 2,
             PHY_FLOAT, false
         );
+#else
+        mShape = std::make_unique<btHeightfieldTerrainShape>(
+            sqrtVerts, sqrtVerts, heights, minH, maxH, 2, false);
+#endif
         mShape->setUseDiamondSubdivision(true);
         mShape->setLocalScaling(btVector3(triSize, triSize, 1));
 
diff --git a/apps/openmw/mwphysics/heightfield.hpp b/apps/openmw/mwphysics/heightfield.hpp
index c76f8b9437..93b2733f31 100644
--- a/apps/openmw/mwphysics/heightfield.hpp
+++ b/apps/openmw/mwphysics/heightfield.hpp
@@ -34,7 +34,9 @@ namespace MWPhysics
         std::unique_ptr<btHeightfieldTerrainShape> mShape;
         std::unique_ptr<btCollisionObject> mCollisionObject;
         osg::ref_ptr<const osg::Object> mHoldObject;
+#if BT_BULLET_VERSION < 310
         std::vector<btScalar> mHeights;
+#endif
 
         PhysicsTaskScheduler* mTaskScheduler;
 

From fe6b990f2e255897f47c719d5dbdf5dd9dda08f2 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Sun, 28 Feb 2021 17:03:11 +0000
Subject: [PATCH 0426/2859] Update Bullet to improve performance

Updates Bullet to include https://github.com/bulletphysics/bullet3/pull/3287

This massively improves heightfield collision detection performance in
some areas.

E.g. with single-threaded bullet in the `--skip-menu` starting area
on my test desktop: 30 FPS -> 60 FPS
---
 extern/CMakeLists.txt | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index d746183b0b..bf18e4136f 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -31,15 +31,11 @@ if(NOT OPENMW_USE_SYSTEM_BULLET)
     set(USE_DOUBLE_PRECISION ${BULLET_USE_DOUBLES} CACHE BOOL "")
     set(BULLET2_MULTITHREADING ON CACHE BOOL "")
 
-    # Version 3.08 with the following changes:
-    # 1. Fixes the linking of Threads:
-    #    https://github.com/bulletphysics/bullet3/pull/3237
-    # 2. Removes ~300 MiB of files not used here:
-    #    rm -rf build3 data docs examples test Doxyfile
+    # master on 12 Mar 2021
     include(FetchContent)
     FetchContent_Declare(bullet
-        URL https://github.com/glebm/bullet3/archive/ed5256454f4f84bd2c1728c88ddb0405d614e7d2.zip
-        URL_HASH MD5=e3c94fac35a7be885ad8843f828a0f96
+        URL https://github.com/bulletphysics/bullet3/archive/87e668f6b2a883b4ef63db8a07c8e9283916e9d9.zip
+        URL_HASH MD5=9f13246439968494c2b595cf412d83c8
         SOURCE_DIR fetched/bullet
     )
     FetchContent_MakeAvailableExcludeFromAll(bullet)

From f09b0fc1bd63aed88020ccf1ea575307848deed0 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Fri, 12 Mar 2021 17:21:36 +0000
Subject: [PATCH 0427/2859] Put groundcover alphafunc where shader visitor can
 see it

I'd already made this change so don't know why it disappeared instead of
being included in b8ee32e3
---
 apps/openmw/mwrender/groundcover.cpp      | 4 ++++
 apps/openmw/mwrender/renderingmanager.cpp | 5 -----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwrender/groundcover.cpp b/apps/openmw/mwrender/groundcover.cpp
index 4390dae22c..0baa85c52a 100644
--- a/apps/openmw/mwrender/groundcover.cpp
+++ b/apps/openmw/mwrender/groundcover.cpp
@@ -1,5 +1,6 @@
 #include "groundcover.hpp"
 
+#include <osg/AlphaFunc>
 #include <osg/Geometry>
 #include <osg/VertexAttribDivisor>
 
@@ -265,6 +266,9 @@ namespace MWRender
             group->addChild(node);
         }
 
+        // Force a unified alpha handling instead of data from meshes
+        osg::ref_ptr<osg::AlphaFunc> alpha = new osg::AlphaFunc(osg::AlphaFunc::GEQUAL, 128.f / 255.f);
+        group->getOrCreateStateSet()->setAttributeAndModes(alpha.get(), osg::StateAttribute::ON);
         group->getBound();
         group->setNodeMask(Mask_Groundcover);
         mSceneManager->recreateShaders(group, "groundcover", false, true);
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 9f89d1bff2..fd912aa2d3 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -3,7 +3,6 @@
 #include <limits>
 #include <cstdlib>
 
-#include <osg/AlphaFunc>
 #include <osg/Light>
 #include <osg/LightModel>
 #include <osg/Fog>
@@ -312,10 +311,6 @@ namespace MWRender
             groundcoverRoot->setName("Groundcover Root");
             sceneRoot->addChild(groundcoverRoot);
 
-            // Force a unified alpha handling instead of data from meshes
-            osg::ref_ptr<osg::AlphaFunc> alpha = new osg::AlphaFunc(osg::AlphaFunc::GEQUAL, 128.f/255.f);
-            groundcoverRoot->getOrCreateStateSet()->setAttributeAndModes(alpha.get(), osg::StateAttribute::ON);
-
             mGroundcoverUpdater = new GroundcoverUpdater;
             groundcoverRoot->addUpdateCallback(mGroundcoverUpdater);
 

From 31032664064b36709db603bd055316d5fc780edd Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Sat, 13 Mar 2021 01:31:35 +0000
Subject: [PATCH 0428/2859] Add correct preprocessor check when enabling
 extension

---
 files/shaders/groundcover_fragment.glsl   | 4 ++++
 files/shaders/shadowcasting_fragment.glsl | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/files/shaders/groundcover_fragment.glsl b/files/shaders/groundcover_fragment.glsl
index c3339ba763..bc84ded619 100644
--- a/files/shaders/groundcover_fragment.glsl
+++ b/files/shaders/groundcover_fragment.glsl
@@ -1,5 +1,9 @@
 #version 120
 
+#if @useGPUShader4
+    #extension EXT_gpu_shader4: require
+#endif
+
 #define GROUNDCOVER
 
 #if @diffuseMap
diff --git a/files/shaders/shadowcasting_fragment.glsl b/files/shaders/shadowcasting_fragment.glsl
index ea8a63313e..a83e155ca3 100644
--- a/files/shaders/shadowcasting_fragment.glsl
+++ b/files/shaders/shadowcasting_fragment.glsl
@@ -1,6 +1,8 @@
 #version 120
 
-#extension EXT_gpu_shader4: enable
+#if @useGPUShader4
+    #extension EXT_gpu_shader4: require
+#endif
 
 uniform sampler2D diffuseMap;
 varying vec2 diffuseMapUV;

From 03b86c232be6788443f687cd58acf98794e43db1 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sat, 13 Mar 2021 09:52:05 +0100
Subject: [PATCH 0429/2859] Apply the position offset even if the simulation is
 not performed because we're too fast.

---
 apps/openmw/mwphysics/actor.cpp         | 11 +++++++++++
 apps/openmw/mwphysics/actor.hpp         |  7 +++++++
 apps/openmw/mwphysics/mtphysics.cpp     |  1 +
 apps/openmw/mwphysics/physicssystem.cpp |  4 ++++
 4 files changed, 23 insertions(+)

diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index bbec4d4456..06abe72403 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -190,6 +190,17 @@ void Actor::adjustPosition(const osg::Vec3f& offset)
     mPositionOffset += offset;
 }
 
+void Actor::applyOffsetChange()
+{
+    if (mPositionOffset.length() == 0)
+        return;
+    mWorldPosition += mPositionOffset;
+    mPosition += mPositionOffset;
+    mPreviousPosition += mPositionOffset;
+    mPositionOffset = osg::Vec3f();
+    mWorldPositionChanged = true;
+}
+
 osg::Vec3f Actor::getPosition() const
 {
     return mPosition;
diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index 9d129f2ba6..031125f40d 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -96,9 +96,16 @@ namespace MWPhysics
           * Returns true if the new position is different.
           */
         bool setPosition(const osg::Vec3f& position);
+
+        // force set actor position to be as in Ptr::RefData
         void updatePosition();
+
+        // register a position offset that will be applied during simulation.
         void adjustPosition(const osg::Vec3f& offset);
 
+        // apply position offset. Can't be called during simulation
+        void applyOffsetChange();
+
         osg::Vec3f getPosition() const;
 
         osg::Vec3f getPreviousPosition() const;
diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 754bb60afe..2b0db5b82c 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -492,6 +492,7 @@ namespace MWPhysics
                 if (actor->setPosition(actorData.mPosition))
                 {
                     std::scoped_lock lock(mCollisionWorldMutex);
+                    actorData.mPosition = actor->getPosition(); // account for potential position change made by script
                     actor->updateCollisionObjectPosition();
                     mCollisionWorld->updateSingleAabb(actor->getCollisionObject());
                 }
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index b2decde2f0..dc9ab629a1 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -961,6 +961,10 @@ namespace MWPhysics
     void ActorFrameData::updatePosition()
     {
         mActorRaw->updateWorldPosition();
+        // If physics runs "fast enough", position are interpolated without simulation
+        // By calling this here, we are sure that offsets are applied at least once per frame,
+        // regardless of simulation speed.
+        mActorRaw->applyOffsetChange();
         mPosition = mActorRaw->getPosition();
         if (mMoveToWaterSurface)
         {

From cb39f8fb0123b08dbdaafd0baa915cdf2ffbd405 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sat, 13 Mar 2021 09:53:21 +0100
Subject: [PATCH 0430/2859] Use moveObjectBy in SetPos

---
 .../mwscript/transformationextensions.cpp      | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index 103c6629d2..e8b4069775 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -270,20 +270,17 @@ namespace MWScript
                     Interpreter::Type_Float pos = runtime[0].mFloat;
                     runtime.pop();
 
-                    float ax = ptr.getRefData().getPosition().pos[0];
-                    float ay = ptr.getRefData().getPosition().pos[1];
-                    float az = ptr.getRefData().getPosition().pos[2];
-
                     // Note: SetPos does not skip weather transitions in vanilla engine, so we do not call setTeleported(true) here.
 
-                    MWWorld::Ptr updated = ptr;
+                    const auto curPos = ptr.getRefData().getPosition().asVec3();
+                    auto newPos = curPos;
                     if(axis == "x")
                     {
-                        updated = MWBase::Environment::get().getWorld()->moveObject(ptr,pos,ay,az,true);
+                        newPos[0] = pos;
                     }
                     else if(axis == "y")
                     {
-                        updated = MWBase::Environment::get().getWorld()->moveObject(ptr,ax,pos,az,true);
+                        newPos[1] = pos;
                     }
                     else if(axis == "z")
                     {
@@ -292,20 +289,21 @@ namespace MWScript
                         {
                             float terrainHeight = -std::numeric_limits<float>::max();
                             if (ptr.getCell()->isExterior())
-                                terrainHeight = MWBase::Environment::get().getWorld()->getTerrainHeightAt(osg::Vec3f(ax, ay, az));
+                                terrainHeight = MWBase::Environment::get().getWorld()->getTerrainHeightAt(curPos);
 
                             if (pos < terrainHeight)
                                 pos = terrainHeight;
                         }
 
-                        updated = MWBase::Environment::get().getWorld()->moveObject(ptr,ax,ay,pos,true);
+                        newPos[2] = pos;
                     }
                     else
                     {
                         return;
                     }
 
-                    dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(ptr,updated);
+                    dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(ptr,
+                        MWBase::Environment::get().getWorld()->moveObjectBy(ptr, newPos - curPos));
                 }
         };
 

From 36cea2073f598cc9768f88419a9e4d14b68c0682 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Sat, 13 Mar 2021 12:10:14 +0000
Subject: [PATCH 0431/2859] Update MyGUI

Includes https://github.com/MyGUI/mygui/commit/f01cba4bb392ae990893442f5bcdf05bfc7a1656
Fixes https://gitlab.com/OpenMW/openmw/-/issues/5897
---
 extern/CMakeLists.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index bf18e4136f..7e9f189fea 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -63,10 +63,11 @@ if(NOT OPENMW_USE_SYSTEM_MYGUI)
         set(BUILD_SHARED_LIBS ON)
     endif()
 
+    # master on 13 Mar 2021
     include(FetchContent)
     FetchContent_Declare(mygui
-        URL https://github.com/MyGUI/mygui/archive/MyGUI3.4.1.zip
-        URL_HASH MD5=952d4033854612c99a5d9bf4b8550c26
+        URL https://github.com/MyGUI/mygui/archive/59c1388b942721887d18743ada15f1906ff11a1f.zip
+        URL_HASH MD5=0a64c9cccc8f96dc8c08172175e68e1c
         SOURCE_DIR fetched/mygui
     )
     FetchContent_MakeAvailableExcludeFromAll(mygui)

From e30a59772c6d18f1953b0e4b6afc55be439e7c04 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 8 Jan 2021 22:18:37 +0100
Subject: [PATCH 0432/2859] Remove DEFAULT_DECODER macros

---
 apps/openmw/mwsound/ffmpeg_decoder.hpp  | 6 ++----
 apps/openmw/mwsound/soundmanagerimp.cpp | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwsound/ffmpeg_decoder.hpp b/apps/openmw/mwsound/ffmpeg_decoder.hpp
index 92d046d85f..f099c831ca 100644
--- a/apps/openmw/mwsound/ffmpeg_decoder.hpp
+++ b/apps/openmw/mwsound/ffmpeg_decoder.hpp
@@ -69,15 +69,13 @@ namespace MWSound
         FFmpeg_Decoder& operator=(const FFmpeg_Decoder &rhs);
         FFmpeg_Decoder(const FFmpeg_Decoder &rhs);
 
-        FFmpeg_Decoder(const VFS::Manager* vfs);
     public:
+        explicit FFmpeg_Decoder(const VFS::Manager* vfs);
+
         virtual ~FFmpeg_Decoder();
 
         friend class SoundManager;
     };
-#ifndef DEFAULT_DECODER
-#define DEFAULT_DECODER (::MWSound::FFmpeg_Decoder)
-#endif
 }
 
 #endif
diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index 44465e5a76..740167b0ac 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -117,7 +117,7 @@ namespace MWSound
     // Return a new decoder instance, used as needed by the output implementations
     DecoderPtr SoundManager::getDecoder()
     {
-        return DecoderPtr(new DEFAULT_DECODER (mVFS));
+        return std::make_shared<FFmpeg_Decoder>(mVFS);
     }
 
     DecoderPtr SoundManager::loadVoice(const std::string &voicefile)

From b0311ce9f1ed2c562fac6f8b99127dfbf8a79cf8 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 26 Jan 2021 00:48:45 +0100
Subject: [PATCH 0433/2859] Remove DEFAULT_OUTPUT macros

---
 apps/openmw/mwsound/openal_output.hpp   | 3 ---
 apps/openmw/mwsound/soundmanagerimp.cpp | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/apps/openmw/mwsound/openal_output.hpp b/apps/openmw/mwsound/openal_output.hpp
index d9ca924a78..2a19e6768a 100644
--- a/apps/openmw/mwsound/openal_output.hpp
+++ b/apps/openmw/mwsound/openal_output.hpp
@@ -98,9 +98,6 @@ namespace MWSound
         OpenAL_Output(SoundManager &mgr);
         virtual ~OpenAL_Output();
     };
-#ifndef DEFAULT_OUTPUT
-#define DEFAULT_OUTPUT(x) ::MWSound::OpenAL_Output((x))
-#endif
 }
 
 #endif
diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index 740167b0ac..6f029d0f6d 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -54,7 +54,7 @@ namespace MWSound
 
     SoundManager::SoundManager(const VFS::Manager* vfs, bool useSound)
         : mVFS(vfs)
-        , mOutput(new DEFAULT_OUTPUT(*this))
+        , mOutput(new OpenAL_Output(*this))
         , mWaterSoundUpdater(makeWaterSoundUpdaterSettings())
         , mSoundBuffers(*vfs, *mOutput)
         , mListenerUnderwater(false)

From 9275dd2dcb6499ee23aba7f6ec056552352034aa Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 24 Jan 2021 21:53:23 +0100
Subject: [PATCH 0434/2859] Avoid virtual dispatch in SoundManager dtor

---
 apps/openmw/mwsound/soundmanagerimp.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index 6f029d0f6d..fc9735d576 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -109,7 +109,7 @@ namespace MWSound
 
     SoundManager::~SoundManager()
     {
-        clear();
+        SoundManager::clear();
         mSoundBuffers.clear();
         mOutput.reset();
     }

From 4d48c81998978f58e4386ea1e7c907ad95850694 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 13 Mar 2021 22:28:13 +0400
Subject: [PATCH 0435/2859] Add move assignment operator and move constructor
 for the ESM::Variant

---
 components/esm/variant.cpp | 21 +++++++++++++++++++++
 components/esm/variant.hpp |  2 ++
 2 files changed, 23 insertions(+)

diff --git a/components/esm/variant.cpp b/components/esm/variant.cpp
index 6ff31dc442..cbcb6e0024 100644
--- a/components/esm/variant.cpp
+++ b/components/esm/variant.cpp
@@ -62,10 +62,31 @@ ESM::Variant& ESM::Variant::operator= (const Variant& variant)
     return *this;
 }
 
+ESM::Variant& ESM::Variant::operator= (Variant&& variant)
+{
+    if (&variant!=this)
+    {
+        delete mData;
+
+        mType = variant.mType;
+        mData = variant.mData;
+
+        variant.mData = nullptr;
+    }
+
+    return *this;
+}
+
 ESM::Variant::Variant (const Variant& variant)
 : mType (variant.mType), mData (variant.mData ? variant.mData->clone() : nullptr)
 {}
 
+ESM::Variant::Variant(Variant&& variant)
+: mType (variant.mType), mData (variant.mData)
+{
+    variant.mData = nullptr;
+}
+
 ESM::VarType ESM::Variant::getType() const
 {
     return mType;
diff --git a/components/esm/variant.hpp b/components/esm/variant.hpp
index 5f179a7bdc..20b3aa76ed 100644
--- a/components/esm/variant.hpp
+++ b/components/esm/variant.hpp
@@ -46,8 +46,10 @@ namespace ESM
             ~Variant();
 
             Variant& operator= (const Variant& variant);
+            Variant& operator= (Variant && variant);
 
             Variant (const Variant& variant);
+            Variant (Variant&& variant);
 
             VarType getType() const;
 

From 447c3b94898178e04e4b73af5d79838c72cf7ddf Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sat, 13 Mar 2021 21:51:48 +0100
Subject: [PATCH 0436/2859] Fix 5846

---
 apps/openmw/mwmechanics/character.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 172ddb25cf..99f8632f3a 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -2920,8 +2920,8 @@ void CharacterController::updateHeadTracking(float duration)
     if (!head)
         return;
 
-    float zAngleRadians = 0.f;
-    float xAngleRadians = 0.f;
+    double zAngleRadians = 0.f;
+    double xAngleRadians = 0.f;
 
     if (!mHeadTrackTarget.isEmpty())
     {
@@ -2954,15 +2954,16 @@ void CharacterController::updateHeadTracking(float duration)
         const osg::Vec3f actorDirection = mPtr.getRefData().getBaseNode()->getAttitude() * osg::Vec3f(0,1,0);
 
         zAngleRadians = std::atan2(actorDirection.x(), actorDirection.y()) - std::atan2(direction.x(), direction.y());
+        zAngleRadians = Misc::normalizeAngle(zAngleRadians - mAnimation->getHeadYaw()) + mAnimation->getHeadYaw();
+        zAngleRadians *= (1 - direction.z() * direction.z());
         xAngleRadians = std::asin(direction.z());
     }
 
     const double xLimit = osg::DegreesToRadians(40.0);
     const double zLimit = osg::DegreesToRadians(30.0);
     double zLimitOffset = mAnimation->getUpperBodyYawRadians();
-    xAngleRadians = osg::clampBetween(Misc::normalizeAngle(xAngleRadians), -xLimit, xLimit);
-    zAngleRadians = osg::clampBetween(Misc::normalizeAngle(zAngleRadians),
-                                      -zLimit + zLimitOffset, zLimit + zLimitOffset);
+    xAngleRadians = osg::clampBetween(xAngleRadians, -xLimit, xLimit);
+    zAngleRadians = osg::clampBetween(zAngleRadians, -zLimit + zLimitOffset, zLimit + zLimitOffset);
 
     float factor = duration*5;
     factor = std::min(factor, 1.f);

From 34af58f53fcea6e5dc402c0c9da4286a81ed333b Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Sat, 13 Mar 2021 23:02:48 +0000
Subject: [PATCH 0437/2859] Use correct extension name.

Like 0068c7bb252428571c1f6ae4ca57220873d0c701, but for other shaders, too
---
 files/shaders/groundcover_fragment.glsl   | 2 +-
 files/shaders/shadowcasting_fragment.glsl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/shaders/groundcover_fragment.glsl b/files/shaders/groundcover_fragment.glsl
index bc84ded619..f25b7d487d 100644
--- a/files/shaders/groundcover_fragment.glsl
+++ b/files/shaders/groundcover_fragment.glsl
@@ -1,7 +1,7 @@
 #version 120
 
 #if @useGPUShader4
-    #extension EXT_gpu_shader4: require
+    #extension GL_EXT_gpu_shader4: require
 #endif
 
 #define GROUNDCOVER
diff --git a/files/shaders/shadowcasting_fragment.glsl b/files/shaders/shadowcasting_fragment.glsl
index a83e155ca3..07fad047e1 100644
--- a/files/shaders/shadowcasting_fragment.glsl
+++ b/files/shaders/shadowcasting_fragment.glsl
@@ -1,7 +1,7 @@
 #version 120
 
 #if @useGPUShader4
-    #extension EXT_gpu_shader4: require
+    #extension GL_EXT_gpu_shader4: require
 #endif
 
 uniform sampler2D diffuseMap;

From 6255b0492b7397f4075eac4fc3aee0feda0d29c1 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Sat, 13 Mar 2021 15:43:46 -0800
Subject: [PATCH 0438/2859] Resolve crashes on exit with visible MyGUI widgets

---
 CHANGELOG.md                           | 1 +
 apps/openmw/mwgui/layout.cpp           | 1 +
 apps/openmw/mwgui/windowmanagerimp.cpp | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3563007cb1..face13d193 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -108,6 +108,7 @@
     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
     Feature #390: 3rd person look "over the shoulder"
     Feature #832: OpenMW-CS: Handle deleted references
     Feature #1536: Show more information about level on menu
diff --git a/apps/openmw/mwgui/layout.cpp b/apps/openmw/mwgui/layout.cpp
index ae1c096599..9b9b9537f9 100644
--- a/apps/openmw/mwgui/layout.cpp
+++ b/apps/openmw/mwgui/layout.cpp
@@ -35,6 +35,7 @@ namespace MWGui
 
     void Layout::shutdown()
     {
+        setVisible(false);
         MyGUI::Gui::getInstance().destroyWidget(mMainWidget);
         mListWindowRoot.clear();
     }
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index e82ba8c1d6..62b3d32d04 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -503,8 +503,6 @@ namespace MWGui
         {
             mStatsWatcher.reset();
 
-            mKeyboardNavigation.reset();
-
             MyGUI::LanguageManager::getInstance().eventRequestTag.clear();
             MyGUI::PointerManager::getInstance().eventChangeMousePointer.clear();
             MyGUI::InputManager::getInstance().eventChangeKeyFocus.clear();
@@ -523,6 +521,8 @@ namespace MWGui
             delete mCursorManager;
             delete mToolTips;
 
+            mKeyboardNavigation.reset();
+
             cleanupGarbage();
 
             mFontLoader.reset();

From 9466d6a409d3ca8318ae70462d8e01fbc79a3ba4 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Sun, 14 Mar 2021 03:42:23 +0000
Subject: [PATCH 0439/2859] Hide macro usage from Macs where it isn't defined

---
 components/debug/gldebug.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/components/debug/gldebug.cpp b/components/debug/gldebug.cpp
index ee7dd608e4..37829a8c1e 100644
--- a/components/debug/gldebug.cpp
+++ b/components/debug/gldebug.cpp
@@ -183,7 +183,11 @@ namespace Debug
     }
 
     DebugGroup::DebugGroup(const std::string & message, GLuint id)
+    #ifdef GL_DEBUG_OUTPUT
         : mSource(GL_DEBUG_SOURCE_APPLICATION)
+    #else
+        : mSource(0x824A)
+    #endif
         , mId(id)
         , mMessage(message)
     {

From 918fd174f33ce2024a238e94ccfd790e828cc39b Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Sun, 14 Mar 2021 12:39:55 +0000
Subject: [PATCH 0440/2859] Set `MYGUI_DONT_USE_OBSOLETE=OFF`

Fixes https://gitlab.com/OpenMW/openmw/-/issues/5896
---
 extern/CMakeLists.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index bf18e4136f..613de8fa80 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -55,7 +55,10 @@ if(NOT OPENMW_USE_SYSTEM_MYGUI)
     set(MYGUI_BUILD_DEMOS OFF CACHE BOOL "")
     set(MYGUI_BUILD_PLUGINS OFF CACHE BOOL "")
     set(MYGUI_BUILD_TOOLS OFF CACHE BOOL "")
-    set(MYGUI_DONT_USE_OBSOLETE ON CACHE BOOL "")
+
+    # We appear to be using some obsolete properties in the XML.
+    # See https://gitlab.com/OpenMW/openmw/-/issues/5896
+    set(MYGUI_DONT_USE_OBSOLETE OFF CACHE BOOL "")
 
     if(MYGUI_STATIC)
         set(BUILD_SHARED_LIBS OFF)

From 19ad7d7f0cd77984ed4628ac539cce9a0c502039 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Sat, 13 Mar 2021 15:24:45 +0100
Subject: [PATCH 0441/2859] Resolve #5895 by setting the initial mOnGround
 state to false; we do this because the movement solver runs one frame behind
 so when we run through the loop the first time we assume we are on the ground
 even though we may be 400 units in the air.

---
 apps/openmw/mwphysics/actor.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index 06abe72403..87698ef37c 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -72,6 +72,7 @@ Actor::Actor(const MWWorld::Ptr& ptr, const Resource::BulletShape* shape, Physic
     updatePosition();
     addCollisionMask(getCollisionMask());
     updateCollisionObjectPosition();
+    mOnGround.store(false, std::memory_order_release);
 }
 
 Actor::~Actor()

From 1479f987934240075ba76ddf0836857c3d209edf Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Sun, 14 Mar 2021 01:02:44 +0100
Subject: [PATCH 0442/2859] hacky solution with debug; seems that player is
 added before cell so tracing down will not find anything

---
 apps/openmw/mwphysics/actor.cpp         |  1 -
 apps/openmw/mwphysics/physicssystem.cpp | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index 87698ef37c..06abe72403 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -72,7 +72,6 @@ Actor::Actor(const MWWorld::Ptr& ptr, const Resource::BulletShape* shape, Physic
     updatePosition();
     addCollisionMask(getCollisionMask());
     updateCollisionObjectPosition();
-    mOnGround.store(false, std::memory_order_release);
 }
 
 Actor::~Actor()
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index dc9ab629a1..e24aa3500c 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -2,6 +2,7 @@
 
 #include <LinearMath/btIDebugDraw.h>
 #include <LinearMath/btVector3.h>
+#include <algorithm>
 #include <memory>
 #include <osg/Group>
 #include <osg/Stats>
@@ -680,7 +681,24 @@ namespace MWPhysics
             return;
 
         auto actor = std::make_shared<Actor>(ptr, shape, mTaskScheduler.get());
+
+        if (ptr == MWMechanics::getPlayer())
+        {
+            osg::Vec3f offset = actor->getCollisionObjectPosition() - ptr.getRefData().getPosition().asVec3();
+            std::cout << "DEBUG Player position: " << actor->getPosition() << std::endl;
+            auto terrainHeight = std::max(0.f, MWBase::Environment::get().getWorld()->getTerrainHeightAt(actor->getPosition()));
+            std::cout << "DEBUG terrain height " << terrainHeight << std::endl;
+            ActorTracer tracer;
+            tracer.findGround(actor.get(), actor->getPosition() + offset, actor->getPosition() + offset - osg::Vec3f(0, 0, 100.f), mCollisionWorld.get());
+            std::cout << "DEBUG mFraction " << tracer.mFraction << std::endl; // it seems that player is loaded before the cell so we can't find the ground.
+
+            std::cout << "DEBUG calculation ::  " << actor->getPosition().z() - terrainHeight << std::endl;
+            if (actor->getPosition().z() - terrainHeight > 300.f)
+                actor->setOnGround(false);
+        }
+
         mActors.emplace(ptr, std::move(actor));
+
     }
 
     int PhysicsSystem::addProjectile (const MWWorld::Ptr& caster, const osg::Vec3f& position, const std::string& mesh, bool computeRadius, bool canTraverseWater)

From c067782814d39f274c9f25451ebb7b9769dbac6d Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Sun, 14 Mar 2021 02:39:18 +0100
Subject: [PATCH 0443/2859] proper fix that traces down the player when a cell
 is loaded; we also only run once if the current cell being loaded is the one
 that the player is in.

---
 apps/openmw/mwphysics/physicssystem.cpp | 16 ----------------
 apps/openmw/mwworld/scene.cpp           |  5 ++++-
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index e24aa3500c..fcb85900b3 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -2,7 +2,6 @@
 
 #include <LinearMath/btIDebugDraw.h>
 #include <LinearMath/btVector3.h>
-#include <algorithm>
 #include <memory>
 #include <osg/Group>
 #include <osg/Stats>
@@ -682,21 +681,6 @@ namespace MWPhysics
 
         auto actor = std::make_shared<Actor>(ptr, shape, mTaskScheduler.get());
 
-        if (ptr == MWMechanics::getPlayer())
-        {
-            osg::Vec3f offset = actor->getCollisionObjectPosition() - ptr.getRefData().getPosition().asVec3();
-            std::cout << "DEBUG Player position: " << actor->getPosition() << std::endl;
-            auto terrainHeight = std::max(0.f, MWBase::Environment::get().getWorld()->getTerrainHeightAt(actor->getPosition()));
-            std::cout << "DEBUG terrain height " << terrainHeight << std::endl;
-            ActorTracer tracer;
-            tracer.findGround(actor.get(), actor->getPosition() + offset, actor->getPosition() + offset - osg::Vec3f(0, 0, 100.f), mCollisionWorld.get());
-            std::cout << "DEBUG mFraction " << tracer.mFraction << std::endl; // it seems that player is loaded before the cell so we can't find the ground.
-
-            std::cout << "DEBUG calculation ::  " << actor->getPosition().z() - terrainHeight << std::endl;
-            if (actor->getPosition().z() - terrainHeight > 300.f)
-                actor->setOnGround(false);
-        }
-
         mActors.emplace(ptr, std::move(actor));
 
     }
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 427ee3aa8b..ac01c8893b 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -447,11 +447,14 @@ namespace MWWorld
                     mPhysics->disableWater();
 
                 const auto player = MWBase::Environment::get().getWorld()->getPlayerPtr();
+                if (player.getCell() == cell) {
+                    mPhysics->traceDown(player, player.getRefData().getPosition().asVec3(), 10.f);
+                }
+
                 navigator->update(player.getRefData().getPosition().asVec3());
 
                 if (!cell->isExterior() && !(cell->getCell()->mData.mFlags & ESM::Cell::QuasiEx))
                 {
-
                     mRendering.configureAmbient(cell->getCell());
                 }
             }

From fff1df9ee46bce05cc1a68e163e137d6fdc19c88 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Sun, 14 Mar 2021 02:40:32 +0100
Subject: [PATCH 0444/2859] revert some blank lines

---
 apps/openmw/mwphysics/physicssystem.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index fcb85900b3..dc9ab629a1 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -680,9 +680,7 @@ namespace MWPhysics
             return;
 
         auto actor = std::make_shared<Actor>(ptr, shape, mTaskScheduler.get());
-
         mActors.emplace(ptr, std::move(actor));
-
     }
 
     int PhysicsSystem::addProjectile (const MWWorld::Ptr& caster, const osg::Vec3f& position, const std::string& mesh, bool computeRadius, bool canTraverseWater)

From 49545e6d299a706e6adcce6246b40441aa433c6a Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Sun, 14 Mar 2021 13:40:48 +0100
Subject: [PATCH 0445/2859] add comments as to why we need to check that the
 player is grounded or not; only run once during initial cell loading

---
 apps/openmw/mwworld/scene.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index ac01c8893b..31d83dce3d 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -447,7 +447,9 @@ namespace MWWorld
                     mPhysics->disableWater();
 
                 const auto player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-                if (player.getCell() == cell) {
+
+                // By default the player is grounded, with the scene fully loaded, we validate and correct this.
+                if (player.getCell() == cell) { // Only run once, during initial cell load.
                     mPhysics->traceDown(player, player.getRefData().getPosition().asVec3(), 10.f);
                 }
 

From 9fc0649fb6a03aec0f3b725373046cb8f325434b Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Sun, 14 Mar 2021 18:08:52 +0100
Subject: [PATCH 0446/2859] a better check to avoid the mCell assertion, so
 compariing nullptr to current cell will refurn false anyway

---
 apps/openmw/mwworld/scene.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 31d83dce3d..140d69e6b4 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -449,7 +449,7 @@ namespace MWWorld
                 const auto player = MWBase::Environment::get().getWorld()->getPlayerPtr();
 
                 // By default the player is grounded, with the scene fully loaded, we validate and correct this.
-                if (player.getCell() == cell) { // Only run once, during initial cell load.
+                if (player.mCell == cell) { // Only run once, during initial cell load.
                     mPhysics->traceDown(player, player.getRefData().getPosition().asVec3(), 10.f);
                 }
 

From c2580d60e9cc398b4b7a8290e6830a7531c17a57 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 14 Mar 2021 19:32:03 +0100
Subject: [PATCH 0447/2859] Register copied Spells with SpellList

---
 apps/openmw/mwmechanics/spells.cpp | 8 ++++++++
 apps/openmw/mwmechanics/spells.hpp | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/apps/openmw/mwmechanics/spells.cpp b/apps/openmw/mwmechanics/spells.cpp
index d292c015d6..0af74e01bd 100644
--- a/apps/openmw/mwmechanics/spells.cpp
+++ b/apps/openmw/mwmechanics/spells.cpp
@@ -24,6 +24,14 @@ namespace MWMechanics
     {
     }
 
+    Spells::Spells(const Spells& spells) : mSpellList(spells.mSpellList), mSpells(spells.mSpells),
+        mSelectedSpell(spells.mSelectedSpell), mUsedPowers(spells.mUsedPowers),
+        mSpellsChanged(spells.mSpellsChanged), mEffects(spells.mEffects), mSourcedEffects(spells.mSourcedEffects)
+    {
+        if(mSpellList)
+            mSpellList->addListener(this);
+    }
+
     std::map<const ESM::Spell*, SpellParams>::const_iterator Spells::begin() const
     {
         return mSpells.begin();
diff --git a/apps/openmw/mwmechanics/spells.hpp b/apps/openmw/mwmechanics/spells.hpp
index 2f4049d2e0..3df89a5372 100644
--- a/apps/openmw/mwmechanics/spells.hpp
+++ b/apps/openmw/mwmechanics/spells.hpp
@@ -57,6 +57,10 @@ namespace MWMechanics
 
             Spells();
 
+            Spells(const Spells&);
+
+            Spells(const Spells&&) = delete;
+
             ~Spells();
 
             static bool hasCorprusEffect(const ESM::Spell *spell);

From 40c989d732635633406de1b6d13d16156cb2052d Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Sun, 14 Mar 2021 22:11:18 +0100
Subject: [PATCH 0448/2859] allman style

---
 apps/openmw/mwworld/scene.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 140d69e6b4..3f050ba366 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -449,7 +449,8 @@ namespace MWWorld
                 const auto player = MWBase::Environment::get().getWorld()->getPlayerPtr();
 
                 // By default the player is grounded, with the scene fully loaded, we validate and correct this.
-                if (player.mCell == cell) { // Only run once, during initial cell load.
+                if (player.mCell == cell) // Only run once, during initial cell load.
+                {
                     mPhysics->traceDown(player, player.getRefData().getPosition().asVec3(), 10.f);
                 }
 

From 952b31ac5c60c576dcbe3a17e44aaa21364dcdee Mon Sep 17 00:00:00 2001
From: Dobrohotov Alexei <alexdobrohotov@yandex.ru>
Date: Mon, 15 Mar 2021 00:43:47 +0300
Subject: [PATCH 0449/2859] NiZBufferProperty: handle depth test flag (bug
 #5902)

---
 CHANGELOG.md                    | 1 +
 components/nifosg/nifloader.cpp | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index face13d193..02dc9dc968 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -109,6 +109,7 @@
     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
     Feature #390: 3rd person look "over the shoulder"
     Feature #832: OpenMW-CS: Handle deleted references
     Feature #1536: Show more information about level on menu
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 902f15fb35..3e34969f4a 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -1725,11 +1725,16 @@ namespace NifOsg
             case Nif::RC_NiZBufferProperty:
             {
                 const Nif::NiZBufferProperty* zprop = static_cast<const Nif::NiZBufferProperty*>(property);
-                // VER_MW doesn't support a DepthFunction according to NifSkope
+                osg::StateSet* stateset = node->getOrCreateStateSet();
+                // Depth test flag
+                stateset->setMode(GL_DEPTH_TEST, zprop->flags&1 ? osg::StateAttribute::ON
+                                                                : osg::StateAttribute::OFF);
                 osg::ref_ptr<osg::Depth> depth = new osg::Depth;
+                // Depth write flag
                 depth->setWriteMask((zprop->flags>>1)&1);
+                // Morrowind ignores depth test function
                 depth = shareAttribute(depth);
-                node->getOrCreateStateSet()->setAttributeAndModes(depth, osg::StateAttribute::ON);
+                stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
                 break;
             }
             // OSG groups the material properties that NIFs have separate, so we have to parse them all again when one changed

From ba74fbf30ed8709f973c05511adc1b4234af71db Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Mon, 15 Mar 2021 22:35:13 +0000
Subject: [PATCH 0450/2859] Fix MyGUI log

Also actually print an error to the regular log when the MyGUI log can't
be opened so we notice if we kill it again in under five years.
---
 apps/openmw/mwgui/windowmanagerimp.cpp        | 2 +-
 components/myguiplatform/myguiloglistener.cpp | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 62b3d32d04..8e4ea4e54f 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -189,7 +189,7 @@ namespace MWGui
     {
         float uiScale = Settings::Manager::getFloat("scaling factor", "GUI");
         mGuiPlatform = new osgMyGUI::Platform(viewer, guiRoot, resourceSystem->getImageManager(), uiScale);
-        mGuiPlatform->initialise(resourcePath, logpath);
+        mGuiPlatform->initialise(resourcePath, (boost::filesystem::path(logpath) / "MyGUI.log").generic_string());
 
         mGui = new MyGUI::Gui;
         mGui->initialise("");
diff --git a/components/myguiplatform/myguiloglistener.cpp b/components/myguiplatform/myguiloglistener.cpp
index a22ac8fc5d..74b4b30813 100644
--- a/components/myguiplatform/myguiloglistener.cpp
+++ b/components/myguiplatform/myguiloglistener.cpp
@@ -2,11 +2,15 @@
 
 #include <iomanip>
 
+#include <components/debug/debuglog.hpp>
+
 namespace osgMyGUI
 {
     void CustomLogListener::open()
     {
         mStream.open(boost::filesystem::path(mFileName), std::ios_base::out);
+        if (!mStream.is_open())
+            Log(Debug::Error) << "Unable to create MyGUI log with path " << mFileName;
     }
 
     void CustomLogListener::close()

From f460ab215298d611e7d9438df6b01175f58eb072 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Tue, 16 Mar 2021 01:34:27 +0000
Subject: [PATCH 0451/2859] MSVC: Fix build with vcpkg's boost

boost-zlib is not present (nor needed) in vcpkg version of boost
There, it is part of boost-iostreams instead.

This was previously reported in:
https://gitlab.com/OpenMW/openmw/-/merge_requests/213#note_348625016
---
 CMakeLists.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fa11942050..ad35d1b0e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -344,7 +344,9 @@ set(BOOST_COMPONENTS system filesystem program_options iostreams)
 if(WIN32)
     set(BOOST_COMPONENTS ${BOOST_COMPONENTS} locale)
     if(MSVC)
-        set(BOOST_COMPONENTS ${BOOST_COMPONENTS} zlib)
+        # boost-zlib is not present (nor needed) in vcpkg version of boost.
+        # there, it is part of boost-iostreams instead.
+        set(BOOST_OPTIONAL_COMPONENTS zlib)
     endif(MSVC)
 endif(WIN32)
 
@@ -354,7 +356,7 @@ endif()
 
 set(Boost_NO_BOOST_CMAKE ON)
 
-find_package(Boost 1.6.2 REQUIRED COMPONENTS ${BOOST_COMPONENTS})
+find_package(Boost 1.6.2 REQUIRED COMPONENTS ${BOOST_COMPONENTS} OPTIONAL_COMPONENTS ${BOOST_OPTIONAL_COMPONENTS})
 if(OPENMW_USE_SYSTEM_MYGUI)
     find_package(MyGUI 3.2.2 REQUIRED)
 endif()

From c68e047f19b4f9f5973af5f9b1c3db80b932eead Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Tue, 16 Mar 2021 13:21:35 +0400
Subject: [PATCH 0452/2859] Remove invalid MyGUI properties from layout files

---
 files/mygui/openmw_settings_window.layout | 1 -
 files/mygui/openmw_tooltips.layout        | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index b57d362ed0..babb5c28f9 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -302,7 +302,6 @@
                         </Widget>
 
                         <Widget type="TextBox" skin="SandText" position="182 94 300 32" align="Left Top">
-                            <Property key="MultiLine" value="true"/>
                             <Property key="Caption" value="Hint: press F3 to show \nthe current frame rate."/>
                         </Widget>
 
diff --git a/files/mygui/openmw_tooltips.layout b/files/mygui/openmw_tooltips.layout
index bb505d2539..ce927038c2 100644
--- a/files/mygui/openmw_tooltips.layout
+++ b/files/mygui/openmw_tooltips.layout
@@ -193,7 +193,6 @@
                 <Property key="Shrink" value="true"/>
                 <Property key="WordWrap" value="true"/>
                 <Property key="TextAlign" value="Left Top"/>
-                <Property key="Spacing" value="28"/>
                 <UserString key="HStretch" value="true"/>
             </Widget>
 
@@ -248,7 +247,6 @@
                 <Property key="MultiLine" value="true"/>
                 <Property key="WordWrap" value="true"/>
                 <Property key="TextAlign" value="Left Top"/>
-                <Property key="Spacing" value="28"/>
             </Widget>
         </Widget>
 
@@ -269,9 +267,6 @@
             </Widget>
 
             <Widget type="AutoSizedTextBox" skin="SandText" position="0 0 0 0" align="Left Top" name="LevelDetailText">
-                <Property key="AutoResize" value="true"/>
-                <Property key="MultiLine" value="true"/>
-                <Property key="Shrink" value="true"/>
                 <Property key="TextAlign" value="HCenter Top"/>
             </Widget>
         </Widget>

From 493659d4f93f8490be66918fdbc8154d96902810 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Tue, 16 Mar 2021 02:56:33 +0000
Subject: [PATCH 0453/2859] MSVC: extern/ tweaks to make it build

Not everything is supported but it does build with the following CMakeSettings.json
variables and dependencies from vcpkg:

      "variables": [
        { "name": "OPENMW_USE_SYSTEM_BULLET", "value": "False", "type": "BOOL" },
        { "name": "OPENMW_USE_SYSTEM_MYGUI", "value": "False", "type": "BOOL" },
        { "name": "OPENMW_USE_SYSTEM_OSG", "value": "False", "type": "BOOL" },
        { "name": "BULLET_STATIC", "value": "True", "type": "BOOL" },
        { "name": "OSG_STATIC", "value": "False", "type": "BOOL" },
        { "name": "MYGUI_STATIC", "value": "False", "type": "BOOL" }
      ],

What works: it builds

What does not work: Not all DLLs are copied into the output directory with this set up
(SDL2, MyGUI, Bullet, OSG, are not copied).
---
 CMakeLists.txt        |  6 ++++++
 extern/CMakeLists.txt | 43 +++++++++++++++++++++++++++++++++++++------
 2 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad35d1b0e0..08bdbce8ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -115,6 +115,12 @@ option(SDL2_STATIC "Link static build of SDL into the binaries" FALSE)
 option(QT_STATIC "Link static build of QT into the binaries" FALSE)
 
 option(OPENMW_USE_SYSTEM_BULLET "Use system provided bullet physics library" ON)
+if(OPENMW_USE_SYSTEM_BULLET)
+    set(_bullet_static_default OFF)
+else()
+    set(_bullet_static_default ON)
+endif()
+option(BULLET_STATIC "Link static build of Bullet into the binaries" ${_bullet_static_default})
 
 option(OPENMW_USE_SYSTEM_OSG "Use system provided OpenSceneGraph libraries" ON)
 if(OPENMW_USE_SYSTEM_OSG)
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 613de8fa80..8766e51ccc 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -31,6 +31,15 @@ if(NOT OPENMW_USE_SYSTEM_BULLET)
     set(USE_DOUBLE_PRECISION ${BULLET_USE_DOUBLES} CACHE BOOL "")
     set(BULLET2_MULTITHREADING ON CACHE BOOL "")
 
+    if(BULLET_STATIC)
+        set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
+    else()
+        set(BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE)
+        if(MSVC)
+            set(USE_MSVC_RUNTIME_LIBRARY_DLL ON CACHE BOOL "" FORCE)
+        endif()
+    endif()
+
     # master on 12 Mar 2021
     include(FetchContent)
     FetchContent_Declare(bullet
@@ -61,9 +70,9 @@ if(NOT OPENMW_USE_SYSTEM_MYGUI)
     set(MYGUI_DONT_USE_OBSOLETE OFF CACHE BOOL "")
 
     if(MYGUI_STATIC)
-        set(BUILD_SHARED_LIBS OFF)
+        set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
     else()
-        set(BUILD_SHARED_LIBS ON)
+        set(BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE)
     endif()
 
     include(FetchContent)
@@ -81,8 +90,6 @@ endif()
 if(NOT OPENMW_USE_SYSTEM_OSG)
     cmake_minimum_required(VERSION 3.11) # for FetchContent
 
-    set(DYNAMIC_OPENTHREADS OFF CACHE BOOL "")
-    set(DYNAMIC_OPENSCENEGRAPH OFF CACHE BOOL "")
     set(BUILD_OSG_APPLICATIONS OFF CACHE BOOL "")
     set(BUILD_OSG_DEPRECATED_SERIALIZERS OFF CACHE BOOL "")
     set(OSG_FIND_3RD_PARTY_DEPS OFF CACHE BOOL "")
@@ -104,9 +111,33 @@ if(NOT OPENMW_USE_SYSTEM_OSG)
     set(OPENGL_PROFILE "GL2" CACHE STRING "")
 
     if(OSG_STATIC)
-        set(BUILD_SHARED_LIBS OFF)
+        set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
+        set(DYNAMIC_OPENTHREADS OFF CACHE BOOL "" FORCE)
+        set(DYNAMIC_OPENSCENEGRAPH OFF CACHE BOOL "" FORCE)
     else()
-        set(BUILD_SHARED_LIBS ON)
+        set(BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE)
+        set(DYNAMIC_OPENTHREADS ON CACHE BOOL "" FORCE)
+        set(DYNAMIC_OPENSCENEGRAPH ON CACHE BOOL "" FORCE)
+    endif()
+    mark_as_advanced(DYNAMIC_OPENTHREADS DYNAMIC_OPENSCENEGRAPH)
+
+    if(WIN32)
+        # OSG here inherits C++17 language level because it doesn't specify its own.
+        #
+        # OSG's `using namespace std` interferes with Windows header files.
+        #
+        # See https://developercommunity.visualstudio.com/t/error-c2872-byte-ambiguous-symbol/93889
+        #
+        # An alternative way to work around this without changing the language level is:
+        #
+        # add_compile_definitions(_HAS_STD_BYTE=0)
+        #
+        # TODO: Put OSG into its own scope so that this does not leak into Recast below.
+        set(CMAKE_CXX_STANDARD 11)
+
+        if(MSVC)
+            set(OSG_MSVC_VERSIONED_DLL OFF CACHE BOOL "")
+        endif()
     endif()
 
     # branch OpenSceneGraph-3.6 on 23 Jan 2021.

From b9c2f6ea1a1a07015bdee3df57d47b02af09a53f Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Tue, 16 Mar 2021 19:55:15 +0000
Subject: [PATCH 0454/2859] Minor cleanup: Remove `using namespace std`

I came across these while trying to figure why MSVC build triggers
https://developercommunity.visualstudio.com/t/error-c2872-byte-ambiguous-symbol/93889

In the end, the issue was not in openmw but in OSG, but it's good to
clean up here anyway.
---
 components/bsa/bsa_file.cpp      |  7 +++---
 components/esm/esmreader.cpp     |  6 ++---
 components/to_utf8/gen_iconv.cpp | 41 ++++++++++++++++----------------
 3 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/components/bsa/bsa_file.cpp b/components/bsa/bsa_file.cpp
index 3fd74dd838..f6220b7ce7 100644
--- a/components/bsa/bsa_file.cpp
+++ b/components/bsa/bsa_file.cpp
@@ -28,12 +28,11 @@
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/fstream.hpp>
 
-using namespace std;
 using namespace Bsa;
 
 
 /// Error handling
-void BSAFile::fail(const string &msg)
+void BSAFile::fail(const std::string &msg)
 {
     throw std::runtime_error("BSA Error: " + msg + "\nArchive: " + mFilename);
 }
@@ -160,7 +159,7 @@ int BSAFile::getIndex(const char *str) const
 }
 
 /// Open an archive file.
-void BSAFile::open(const string &file)
+void BSAFile::open(const std::string &file)
 {
     mFilename = file;
     readHeader();
@@ -171,7 +170,7 @@ Files::IStreamPtr BSAFile::getFile(const char *file)
     assert(file);
     int i = getIndex(file);
     if(i == -1)
-        fail("File not found: " + string(file));
+        fail("File not found: " + std::string(file));
 
     const FileStruct &fs = mFiles[i];
 
diff --git a/components/esm/esmreader.cpp b/components/esm/esmreader.cpp
index 1b6eca7346..4e7dce876b 100644
--- a/components/esm/esmreader.cpp
+++ b/components/esm/esmreader.cpp
@@ -357,16 +357,14 @@ std::string ESMReader::getString(int size)
 
 void ESMReader::fail(const std::string &msg)
 {
-    using namespace std;
-
-    stringstream ss;
+    std::stringstream ss;
 
     ss << "ESM Error: " << msg;
     ss << "\n  File: " << mCtx.filename;
     ss << "\n  Record: " << mCtx.recName.toString();
     ss << "\n  Subrecord: " << mCtx.subName.toString();
     if (mEsm.get())
-        ss << "\n  Offset: 0x" << hex << mEsm->tellg();
+        ss << "\n  Offset: 0x" << std::hex << mEsm->tellg();
     throw std::runtime_error(ss.str());
 }
 
diff --git a/components/to_utf8/gen_iconv.cpp b/components/to_utf8/gen_iconv.cpp
index 8198b305dd..f2d9a42f18 100644
--- a/components/to_utf8/gen_iconv.cpp
+++ b/components/to_utf8/gen_iconv.cpp
@@ -1,20 +1,19 @@
 // This program generates the file tables_gen.hpp
 
 #include <iostream>
-using namespace std;
 
 #include <iconv.h>
 #include <cassert>
 
-void tab() { cout << "   "; }
+void tab() { std::cout << "   "; }
 
 // write one number with a space in front of it and a comma after it
 void num(char i, bool last)
 {
   // Convert i to its integer value, i.e. -128 to 127. Printing it directly
   // would result in non-printable characters in the source code, which is bad.
-  cout << " " << static_cast<int>(i);
-  if(!last) cout << ",";
+  std::cout << " " << static_cast<int>(i);
+  if(!last) std::cout << ",";
 }
 
 // Write one table entry (UTF8 value), 1-5 bytes
@@ -27,9 +26,9 @@ void writeChar(char *value, int length, bool last, const std::string &comment=""
     num(value[i], last && i==4);
 
   if(comment != "")
-    cout << " // " << comment;
+    std::cout << " // " << comment;
 
-  cout << endl;
+  std::cout << std::endl;
 }
 
 // What to write on missing characters
@@ -46,7 +45,7 @@ void writeMissing(bool last)
 int write_table(const std::string &charset, const std::string &tableName)
 {
   // Write table header
-  cout << "static signed char " << tableName << "[] =\n{\n";
+  std::cout << "static signed char " << tableName << "[] =\n{\n";
 
   // Open conversion system
   iconv_t cd = iconv_open ("UTF-8", charset.c_str());
@@ -74,7 +73,7 @@ int write_table(const std::string &charset, const std::string &tableName)
   iconv_close (cd);
 
   // Finish table
-  cout << "};\n";
+  std::cout << "};\n";
 
   return 0;
 }
@@ -82,37 +81,37 @@ int write_table(const std::string &charset, const std::string &tableName)
 int main()
 {
   // Write header guard
-  cout << "#ifndef COMPONENTS_TOUTF8_TABLE_GEN_H\n#define COMPONENTS_TOUTF8_TABLE_GEN_H\n\n";
+  std::cout << "#ifndef COMPONENTS_TOUTF8_TABLE_GEN_H\n#define COMPONENTS_TOUTF8_TABLE_GEN_H\n\n";
 
   // Write namespace
-  cout << "namespace ToUTF8\n{\n\n";
+  std::cout << "namespace ToUTF8\n{\n\n";
 
   // Central European and Eastern European languages that use Latin script, such as
   // Polish, Czech, Slovak, Hungarian, Slovene, Bosnian, Croatian, Serbian (Latin script), Romanian and Albanian.
-  cout << "\n/// Central European and Eastern European languages that use Latin script,"
-          "\n/// such as Polish, Czech, Slovak, Hungarian, Slovene, Bosnian, Croatian,"
-          "\n/// Serbian (Latin script), Romanian and Albanian."
-          "\n";
+  std::cout << "\n/// Central European and Eastern European languages that use Latin script,"
+               "\n/// such as Polish, Czech, Slovak, Hungarian, Slovene, Bosnian, Croatian,"
+               "\n/// Serbian (Latin script), Romanian and Albanian."
+               "\n";
   write_table("WINDOWS-1250", "windows_1250");
 
   // Cyrillic alphabet such as Russian, Bulgarian, Serbian Cyrillic and other languages
-  cout << "\n/// Cyrillic alphabet such as Russian, Bulgarian, Serbian Cyrillic"
-          "\n/// and other languages"
-          "\n";
+  std::cout << "\n/// Cyrillic alphabet such as Russian, Bulgarian, Serbian Cyrillic"
+               "\n/// and other languages"
+               "\n";
   write_table("WINDOWS-1251", "windows_1251");
 
   // English
-  cout << "\n/// Latin alphabet used by English and some other Western languages"
-          "\n";
+  std::cout << "\n/// Latin alphabet used by English and some other Western languages"
+               "\n";
   write_table("WINDOWS-1252", "windows_1252");
 
   write_table("CP437", "cp437");
 
   // Close namespace
-  cout << "\n}\n\n";
+  std::cout << "\n}\n\n";
 
   // Close header guard
-  cout << "#endif\n\n";
+  std::cout << "#endif\n\n";
 
   return 0;
 }

From 162b25c1808b61103be37f406e77e637e90ab15d Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Wed, 17 Mar 2021 01:46:04 +0000
Subject: [PATCH 0455/2859] Fix sunglare on Mesa

The sunglare works by comparing an occlusion query with depth testing on
against one with depth testing off to determine if there's anything
closer to the camera than the maximum depth buffer value. For the depth-
tested query, the depth range is set from 1 to 1 so it's always drawn at
the maximum distance. Originally, we had the depth function set to LESS,
meaning that the query would always fail as 1 is not less than 1, but
also glPolygonOffset was used to move the query by "the smallest value
that is guaranteed to produce a resolvable offset for a given
implementation" closer to the camera. While other driver and hardware
combinations do that, Mesa seems to be clamping to the depth range, so
still failing.

Instead, it's simpler to just get rid of the polygon offset and change
the depth test to LEQUAL as 1 *is* less than or equal to 1, but not than
any other possible depth buffer value.
---
 apps/openmw/mwrender/sky.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index f826416769..5a6ec06e56 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -497,8 +497,6 @@ public:
         // Disable writing to the color buffer. We are using this geometry for visibility tests only.
         osg::ref_ptr<osg::ColorMask> colormask (new osg::ColorMask(0, 0, 0, 0));
         stateset->setAttributeAndModes(colormask, osg::StateAttribute::ON);
-        osg::ref_ptr<osg::PolygonOffset> po (new osg::PolygonOffset( -1., -1. ));
-        stateset->setAttributeAndModes(po, osg::StateAttribute::ON);
 
         mTransform->addChild(queryNode);
 
@@ -595,7 +593,7 @@ private:
         if (queryVisible)
         {
             osg::ref_ptr<osg::Depth> depth (new osg::Depth);
-            depth->setFunction(osg::Depth::LESS);
+            depth->setFunction(osg::Depth::LEQUAL);
             // This is a trick to make fragments written by the query always use the maximum depth value,
             // without having to retrieve the current far clipping distance.
             // We want the sun glare to be "infinitely" far away.

From 3ad1040271094aecb07e8447a3f107fa8bc0db72 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Wed, 17 Mar 2021 02:00:21 +0000
Subject: [PATCH 0456/2859] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02dc9dc968..0891ecba99 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -110,6 +110,7 @@
     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
     Feature #390: 3rd person look "over the shoulder"
     Feature #832: OpenMW-CS: Handle deleted references
     Feature #1536: Show more information about level on menu

From 1c296a1a78c4147835273aa6a4f7c08df8ef61cb Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Wed, 17 Mar 2021 18:11:36 +0000
Subject: [PATCH 0457/2859] Deploy Qt style DLL

---
 CI/before_script.msvc.sh | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 0c26801cc4..4eda627ac4 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -325,6 +325,16 @@ add_qt_platform_dlls() {
 	QT_PLATFORMS[$CONFIG]="${QT_PLATFORMS[$CONFIG]} $@"
 }
 
+declare -A QT_STYLES
+QT_STYLES["Release"]=""
+QT_STYLES["Debug"]=""
+QT_STYLES["RelWithDebInfo"]=""
+add_qt_style_dlls() {
+	local CONFIG=$1
+	shift
+	QT_STYLES[$CONFIG]="${QT_STYLES[$CONFIG]} $@"
+}
+
 if [ -z $PLATFORM ]; then
 	PLATFORM="$(uname -m)"
 fi
@@ -868,6 +878,7 @@ fi
 			fi
 			add_runtime_dlls $CONFIGURATION "$(pwd)/bin/Qt5"{Core,Gui,Network,OpenGL,Widgets}${DLLSUFFIX}.dll
 			add_qt_platform_dlls $CONFIGURATION "$(pwd)/plugins/platforms/qwindows${DLLSUFFIX}.dll"
+			add_qt_style_dlls $CONFIGURATION "$(pwd)/plugins/styles/qwindowsvistastyle${DLLSUFFIX}.dll"
 		done
 		echo Done.
 	else
@@ -883,6 +894,7 @@ fi
 			DIR=$(windowsPathAsUnix "${QT_SDK}")
 			add_runtime_dlls $CONFIGURATION "${DIR}/bin/Qt5"{Core,Gui,Network,OpenGL,Widgets}${DLLSUFFIX}.dll
 			add_qt_platform_dlls $CONFIGURATION "${DIR}/plugins/platforms/qwindows${DLLSUFFIX}.dll"
+			add_qt_style_dlls $CONFIGURATION "${DIR}/plugins/styles/qwindowsvistastyle${DLLSUFFIX}.dll"
 		done
 		echo Done.
 	fi
@@ -1060,6 +1072,13 @@ fi
 			cp "$DLL" "${DLL_PREFIX}platforms"
 		done
 		echo
+		echo "- Qt Style DLLs..."
+		mkdir -p ${DLL_PREFIX}styles
+		for DLL in ${QT_STYLES[$CONFIGURATION]}; do
+			echo "    $(basename $DLL)"
+			cp "$DLL" "${DLL_PREFIX}styles"
+		done
+		echo
 	done
 #fi
 

From b38a81760069f9218411fb7657ce981a24356716 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Wed, 17 Mar 2021 23:29:48 +0000
Subject: [PATCH 0458/2859] Ensure vswhere finds us a single suitable MSVC
 installation

Also document the numerous arguments to achieve this.
---
 CI/before_script.msvc.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 0c26801cc4..71a6b79c4e 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -1067,7 +1067,13 @@ if [ -n "$ACTIVATE_MSVC" ]; then
 	echo -n "- Activating MSVC in the current shell... "
 	command -v vswhere >/dev/null 2>&1 || { echo "Error: vswhere is not on the path."; wrappedExit 1; }
 
-	MSVC_INSTALLATION_PATH=$(vswhere -products '*' -version "[$MSVC_REAL_VER,$(awk "BEGIN { print $MSVC_REAL_VER + 1; exit }"))" -property installationPath)
+	# There are so many arguments now that I'm going to document them:
+	# * products: allow Visual Studio or standalone build tools
+	# * version: obvious. Awk helps make a version range by adding one.
+	# * property installationPath: only give the installation path.
+	# * latest: return only one result if several candidates exist. Prefer the last installed/updated
+	# * requires: make sure it's got the MSVC compiler instead of, for example, just the .NET compiler. The .x86.x64 suffix means it's for either, not that it's the x64 on x86 cross compiler as you always get both
+	MSVC_INSTALLATION_PATH=$(vswhere -products '*' -version "[$MSVC_REAL_VER,$(awk "BEGIN { print $MSVC_REAL_VER + 1; exit }"))" -property installationPath -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64)
 	if [ -z "$MSVC_INSTALLATION_PATH" ]; then
 		echo "vswhere was unable to find MSVC $MSVC_DISPLAY_YEAR"
 		wrappedExit 1

From a22f6b24d539c0ae773dbc9f1966eb122d79194b Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Thu, 18 Mar 2021 11:47:06 +0400
Subject: [PATCH 0459/2859] Init animation key struct before usage

---
 components/nif/nifkey.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/nif/nifkey.hpp b/components/nif/nifkey.hpp
index de2fa31c89..91869ff849 100644
--- a/components/nif/nifkey.hpp
+++ b/components/nif/nifkey.hpp
@@ -77,7 +77,7 @@ struct KeyMapT {
 
         mInterpolationType = nif->getUInt();
 
-        KeyT<T> key;
+        KeyType key = {};
         NIFStream &nifReference = *nif;
 
         if (mInterpolationType == InterpolationType_Linear

From 1471ef003a6110c21fb1f76e057aea11c4664821 Mon Sep 17 00:00:00 2001
From: wareya <wareya@gmail.com>
Date: Thu, 18 Mar 2021 13:53:00 -0400
Subject: [PATCH 0460/2859] fix async physics interpolation

---
 apps/openmw/mwphysics/mtphysics.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 2b0db5b82c..1fa6251f83 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -186,9 +186,11 @@ namespace MWPhysics
         mPostStepBarrier = std::make_unique<Misc::Barrier>(mNumThreads, [&]()
             {
                 if (mRemainingSteps)
+                {
                     --mRemainingSteps;
+                    updateActorsPositions();
+                }
                 mNextJob.store(0, std::memory_order_release);
-                updateActorsPositions();
             });
 
         mPostSimBarrier = std::make_unique<Misc::Barrier>(mNumThreads, [&]()

From 54daa234bd9124cd187eae6576b044eb849f377d Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Fri, 19 Mar 2021 11:56:14 +0400
Subject: [PATCH 0461/2859] Reset watched stats upon reload or new game start

---
 apps/openmw/mwgui/statswatcher.hpp     | 2 ++
 apps/openmw/mwgui/windowmanagerimp.cpp | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/apps/openmw/mwgui/statswatcher.hpp b/apps/openmw/mwgui/statswatcher.hpp
index 41ab4fd252..353779d877 100644
--- a/apps/openmw/mwgui/statswatcher.hpp
+++ b/apps/openmw/mwgui/statswatcher.hpp
@@ -63,6 +63,8 @@ namespace MWGui
 
         void watchActor(const MWWorld::Ptr& ptr);
         MWWorld::Ptr getWatchedActor() const { return mWatched; }
+
+        void forceUpdate() { mWatchedStatsEmpty = true; }
     };
 }
 
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 8e4ea4e54f..54c09e00f1 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -495,6 +495,8 @@ namespace MWGui
         }
         else
             allow(GW_ALL);
+
+        mStatsWatcher->forceUpdate();
     }
 
     WindowManager::~WindowManager()

From 845e3944d6d61488f024d73923dae975a3d12387 Mon Sep 17 00:00:00 2001
From: wareya <wareya@gmail.com>
Date: Fri, 19 Mar 2021 17:54:08 -0400
Subject: [PATCH 0462/2859] make refraction more visible even at a distance

---
 files/shaders/water_fragment.glsl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/files/shaders/water_fragment.glsl b/files/shaders/water_fragment.glsl
index d9b9463ad9..5f6d8c6ac3 100644
--- a/files/shaders/water_fragment.glsl
+++ b/files/shaders/water_fragment.glsl
@@ -236,7 +236,11 @@ void main(void)
     if (cameraPos.z < 0.0)
         refraction = clamp(refraction * 1.5, 0.0, 1.0);
     else
-        refraction = mix(refraction, waterColor, clamp(depthSampleDistorted/VISIBILITY, 0.0, 1.0));
+    {
+        vec3 refractionA = mix(refraction, waterColor, clamp(depthSampleDistorted/VISIBILITY, 0.0, 1.0));
+        vec3 refractionB = mix(refraction, waterColor, clamp(realWaterDepth/VISIBILITY, 0.0, 1.0));
+        refraction = mix(refractionA, refractionB, 0.8);
+    }
 
     // sunlight scattering
     // normal for sunlight scattering

From bf336e4cb45575b67903e611675d0b356d79d8cd Mon Sep 17 00:00:00 2001
From: wareya <wareya@gmail.com>
Date: Fri, 19 Mar 2021 18:51:52 -0400
Subject: [PATCH 0463/2859] make sun scattering color stop being an ugly
 radioactive green

---
 files/shaders/water_fragment.glsl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/files/shaders/water_fragment.glsl b/files/shaders/water_fragment.glsl
index 5f6d8c6ac3..b7c7487518 100644
--- a/files/shaders/water_fragment.glsl
+++ b/files/shaders/water_fragment.glsl
@@ -29,9 +29,6 @@ const float BUMP_RAIN = 2.5;
 const float REFL_BUMP = 0.10;                      // reflection distortion amount
 const float REFR_BUMP = 0.07;                      // refraction distortion amount
 
-const float SCATTER_AMOUNT = 0.3;                  // amount of sunlight scattering
-const vec3 SCATTER_COLOUR = vec3(0.0,1.0,0.95);    // colour of sunlight scattering
-
 const vec3 SUN_EXT = vec3(0.45, 0.55, 0.68);       //sunlight extinction
 
 const float SPEC_HARDNESS = 256.0;                 // specular highlights hardness
@@ -43,6 +40,9 @@ const float WIND_SPEED = 0.2f;
 
 const vec3 WATER_COLOR = vec3(0.090195, 0.115685, 0.12745);
 
+const float SCATTER_AMOUNT = 0.5;                  // amount of sunlight scattering
+const vec3 SCATTER_COLOUR = WATER_COLOR * 8.0;     // colour of sunlight scattering
+
 // ---------------- rain ripples related stuff ---------------------
 
 const float RAIN_RIPPLE_GAPS = 5.0;

From 1a4e9df707a4efe2cf092a252ccb66781906e466 Mon Sep 17 00:00:00 2001
From: wareya <wareya@gmail.com>
Date: Fri, 19 Mar 2021 20:12:40 -0400
Subject: [PATCH 0464/2859] add bit to suppress coastline artifacts at more of
 a distance

---
 files/shaders/water_fragment.glsl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/files/shaders/water_fragment.glsl b/files/shaders/water_fragment.glsl
index b7c7487518..db208ea424 100644
--- a/files/shaders/water_fragment.glsl
+++ b/files/shaders/water_fragment.glsl
@@ -34,6 +34,7 @@ const vec3 SUN_EXT = vec3(0.45, 0.55, 0.68);       //sunlight extinction
 const float SPEC_HARDNESS = 256.0;                 // specular highlights hardness
 
 const float BUMP_SUPPRESS_DEPTH = 300.0;           // at what water depth bumpmap will be suppressed for reflections and refractions (prevents artifacts at shores)
+const float BUMP_SUPPRESS_DEPTH_SS = 1000.0;      // modifier using screenspace depth (helps prevent same artifacts but at higher distances)
 
 const vec2 WIND_DIR = vec2(0.5f, -0.8f);
 const float WIND_SPEED = 0.2f;
@@ -218,7 +219,10 @@ void main(void)
     float depthSampleDistorted = linearizeDepth(texture2D(refractionDepthMap,screenCoords-screenCoordsOffset).x) * radialise;
     float surfaceDepth = linearizeDepth(gl_FragCoord.z) * radialise;
     float realWaterDepth = depthSample - surfaceDepth;  // undistorted water depth in view direction, independent of frustum
-    screenCoordsOffset *= clamp(realWaterDepth / BUMP_SUPPRESS_DEPTH,0,1);
+    screenCoordsOffset *= clamp(
+            realWaterDepth / (BUMP_SUPPRESS_DEPTH
+                * max(1, depthSample / BUMP_SUPPRESS_DEPTH_SS)) // suppress more at distance
+        ,0 ,1);
 #endif
     // reflection
     vec3 reflection = texture2D(reflectionMap, screenCoords + screenCoordsOffset).rgb;

From 56fe1a8c12f49065fb9c339da996b9a403b4f84c Mon Sep 17 00:00:00 2001
From: wareya <wareya@gmail.com>
Date: Fri, 19 Mar 2021 21:49:17 -0400
Subject: [PATCH 0465/2859] wobbly water

---
 files/shaders/water_fragment.glsl | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/files/shaders/water_fragment.glsl b/files/shaders/water_fragment.glsl
index d9b9463ad9..fc0167d84e 100644
--- a/files/shaders/water_fragment.glsl
+++ b/files/shaders/water_fragment.glsl
@@ -231,6 +231,7 @@ void main(void)
 #if REFRACTION
     // refraction
     vec3 refraction = texture2D(refractionMap, screenCoords - screenCoordsOffset).rgb;
+    vec3 rawRefraction = refraction;
 
     // brighten up the refraction underwater
     if (cameraPos.z < 0.0)
@@ -249,6 +250,12 @@ void main(void)
     float lightScatter = clamp(dot(lVec,lNormal)*0.7+0.3, 0.0, 1.0) * clamp(dot(lR, vVec)*2.0-1.2, 0.0, 1.0) * SCATTER_AMOUNT * sunFade * clamp(1.0-exp(-sunHeight), 0.0, 1.0);
     gl_FragData[0].xyz = mix( mix(refraction,  scatterColour,  lightScatter),  reflection,  fresnel) + specular * gl_LightSource[0].specular.xyz + vec3(rainRipple.w) * 0.2;
     gl_FragData[0].w = 1.0;
+
+    // wobbly water: hard-fade into refraction texture at extremely low depth, with a wobble based on normal mapping
+    vec3 normalShoreRippleRain = texture2D(normalMap,normalCoords(UV, 2.0, 2.7, -1.0*waterTimer,  0.05,  0.1,  normal3)).rgb - 0.5
+                               + texture2D(normalMap,normalCoords(UV, 2.0, 2.7,      waterTimer,  0.04, -0.13, normal4)).rgb - 0.5;
+    float shoreOffset = clamp((realWaterDepth - (normal2.r + mix(0, normalShoreRippleRain.r, rainIntensity) + 0.35)*8), 0, 1);
+    gl_FragData[0].xyz = mix(rawRefraction, gl_FragData[0].xyz, shoreOffset);
 #else
     gl_FragData[0].xyz = mix(reflection,  waterColor,  (1.0-fresnel)*0.5) + specular * gl_LightSource[0].specular.xyz + vec3(rainRipple.w) * 0.7;
     gl_FragData[0].w = clamp(fresnel*6.0 + specular * gl_LightSource[0].specular.w, 0.0, 1.0);     //clamp(fresnel*2.0 + specular * gl_LightSource[0].specular.w, 0.0, 1.0);

From 675c0ab72fd365c3699a68081636db7d64dd175e Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 19 Mar 2021 23:23:26 +0100
Subject: [PATCH 0466/2859] Apply uniform random deviation to AI reaction timer

This allows to distribute AI reaction calls over time.

Before this change actors appearing at the same frame will react in the same
frame over and over because AI reaction period is constant. It creates a
non-uniform CPU usage over frames. If a single frame has too many AI reactions
it may cause stuttering when there are too many actors on a scene for current
system.

Another concern is a synchronization of actions between creatures and NPC.
They start to go or hit at the same frame that is unnatural.
---
 apps/openmw/mwmechanics/aicombat.cpp  | 15 ++--------
 apps/openmw/mwmechanics/aicombat.hpp  |  4 +--
 apps/openmw/mwmechanics/aipackage.cpp |  9 ++----
 apps/openmw/mwmechanics/aipackage.hpp |  5 ++--
 apps/openmw/mwmechanics/aitimer.hpp   | 26 +++++++++++++++++
 apps/openmw/mwmechanics/aiwander.cpp  | 11 ++-----
 apps/openmw/mwmechanics/aiwander.hpp  |  4 +--
 components/misc/rng.cpp               |  5 ++++
 components/misc/rng.hpp               |  2 ++
 components/misc/timer.hpp             | 42 +++++++++++++++++++++++++++
 10 files changed, 90 insertions(+), 33 deletions(-)
 create mode 100644 apps/openmw/mwmechanics/aitimer.hpp
 create mode 100644 components/misc/timer.hpp

diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index 58a9086720..51fcb92c10 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -146,19 +146,10 @@ namespace MWMechanics
         }
         storage.mActionCooldown -= duration;
 
-        float& timerReact = storage.mTimerReact;
-        if (timerReact < AI_REACTION_TIME)
-        {
-            timerReact += duration;
-        }
-        else
-        {
-            timerReact = 0;
-            if (attack(actor, target, storage, characterController))
-                return true;
-        }
+        if (storage.mReaction.update(duration) == Misc::TimerStatus::Waiting)
+            return false;
 
-        return false;
+        return attack(actor, target, storage, characterController);
     }
 
     bool AiCombat::attack(const MWWorld::Ptr& actor, const MWWorld::Ptr& target, AiCombatStorage& storage, CharacterController& characterController)
diff --git a/apps/openmw/mwmechanics/aicombat.hpp b/apps/openmw/mwmechanics/aicombat.hpp
index 3a77aa8e8e..0f42c6e2d1 100644
--- a/apps/openmw/mwmechanics/aicombat.hpp
+++ b/apps/openmw/mwmechanics/aicombat.hpp
@@ -10,6 +10,7 @@
 #include "pathfinding.hpp"
 #include "movement.hpp"
 #include "obstacle.hpp"
+#include "aitimer.hpp"
 
 namespace ESM
 {
@@ -27,7 +28,7 @@ namespace MWMechanics
     struct AiCombatStorage : AiTemporaryBase
     {
         float mAttackCooldown;
-        float mTimerReact;
+        AiReactionTimer mReaction;
         float mTimerCombatMove;
         bool mReadyToAttack;
         bool mAttack;
@@ -60,7 +61,6 @@ namespace MWMechanics
 
         AiCombatStorage():
         mAttackCooldown(0.0f),
-        mTimerReact(AI_REACTION_TIME),
         mTimerCombatMove(0.0f),
         mReadyToAttack(false),
         mAttack(false),
diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index 99132b711a..00e1c9c3a8 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -28,7 +28,6 @@
 MWMechanics::AiPackage::AiPackage(AiPackageTypeId typeId, const Options& options) :
     mTypeId(typeId),
     mOptions(options),
-    mTimer(AI_REACTION_TIME + 1.0f), // to force initial pathbuild
     mTargetActorRefId(""),
     mTargetActorId(-1),
     mRotateOnTheRunChecks(0),
@@ -64,7 +63,7 @@ MWWorld::Ptr MWMechanics::AiPackage::getTarget() const
 void MWMechanics::AiPackage::reset()
 {
     // reset all members
-    mTimer = AI_REACTION_TIME + 1.0f;
+    mReaction.reset();
     mIsShortcutting = false;
     mShortcutProhibited = false;
     mShortcutFailPos = osg::Vec3f();
@@ -75,7 +74,7 @@ void MWMechanics::AiPackage::reset()
 
 bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f& dest, float duration, float destTolerance)
 {
-    mTimer += duration; //Update timer
+    const Misc::TimerStatus timerStatus = mReaction.update(duration);
 
     const osg::Vec3f position = actor.getRefData().getPosition().asVec3(); //position of the actor
     MWBase::World* world = MWBase::Environment::get().getWorld();
@@ -98,7 +97,7 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
     const bool isDestReached = (distToTarget <= destTolerance);
     const bool actorCanMoveByZ = canActorMoveByZAxis(actor);
 
-    if (!isDestReached && mTimer > AI_REACTION_TIME)
+    if (!isDestReached && timerStatus == Misc::TimerStatus::Elapsed)
     {
         if (actor.getClass().isBipedal(actor))
             openDoors(actor);
@@ -142,8 +141,6 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
                     mPathFinder.addPointToPath(dest); //Adds the final destination to the path, to try to get to where you want to go
             }
         }
-
-        mTimer = 0;
     }
 
     const float actorTolerance = 2 * actor.getClass().getMaxSpeed(actor) * duration
diff --git a/apps/openmw/mwmechanics/aipackage.hpp b/apps/openmw/mwmechanics/aipackage.hpp
index 4201de5c84..81b09c8b9c 100644
--- a/apps/openmw/mwmechanics/aipackage.hpp
+++ b/apps/openmw/mwmechanics/aipackage.hpp
@@ -10,6 +10,7 @@
 #include "obstacle.hpp"
 #include "aistate.hpp"
 #include "aipackagetypeid.hpp"
+#include "aitimer.hpp"
 
 namespace MWWorld
 {
@@ -28,8 +29,6 @@ namespace ESM
 
 namespace MWMechanics
 {
-    const float AI_REACTION_TIME = 0.25f;
-
     class CharacterController;
     class PathgridGraph;
 
@@ -158,7 +157,7 @@ namespace MWMechanics
             PathFinder mPathFinder;
             ObstacleCheck mObstacleCheck;
 
-            float mTimer;
+            AiReactionTimer mReaction;
 
             std::string mTargetActorRefId;
             mutable int mTargetActorId;
diff --git a/apps/openmw/mwmechanics/aitimer.hpp b/apps/openmw/mwmechanics/aitimer.hpp
new file mode 100644
index 0000000000..804cda1bd2
--- /dev/null
+++ b/apps/openmw/mwmechanics/aitimer.hpp
@@ -0,0 +1,26 @@
+#ifndef OPENMW_MECHANICS_AITIMER_H
+#define OPENMW_MECHANICS_AITIMER_H
+
+#include <components/misc/rng.hpp>
+#include <components/misc/timer.hpp>
+
+namespace MWMechanics
+{
+    constexpr float AI_REACTION_TIME = 0.25f;
+
+    class AiReactionTimer
+    {
+        public:
+            static constexpr float sDeviation = 0.1f;
+
+            Misc::TimerStatus update(float duration) { return mImpl.update(duration); }
+
+            void reset() { mImpl.reset(Misc::Rng::deviate(0, sDeviation)); }
+
+        private:
+            Misc::DeviatingPeriodicTimer mImpl {AI_REACTION_TIME, sDeviation,
+                                                Misc::Rng::deviate(0, sDeviation)};
+    };
+}
+
+#endif
diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 375209a250..72b8757bff 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -223,15 +223,10 @@ namespace MWMechanics
 
         doPerFrameActionsForState(actor, duration, storage);
 
-        float& lastReaction = storage.mReaction;
-        lastReaction += duration;
-        if (AI_REACTION_TIME <= lastReaction)
-        {
-            lastReaction = 0;
-            return reactionTimeActions(actor, storage, pos);
-        }
-        else
+        if (storage.mReaction.update(duration) == Misc::TimerStatus::Waiting)
             return false;
+
+        return reactionTimeActions(actor, storage, pos);
     }
 
     bool AiWander::reactionTimeActions(const MWWorld::Ptr& actor, AiWanderStorage& storage, ESM::Position& pos)
diff --git a/apps/openmw/mwmechanics/aiwander.hpp b/apps/openmw/mwmechanics/aiwander.hpp
index 8e718061e2..52a926d143 100644
--- a/apps/openmw/mwmechanics/aiwander.hpp
+++ b/apps/openmw/mwmechanics/aiwander.hpp
@@ -10,6 +10,7 @@
 #include "pathfinding.hpp"
 #include "obstacle.hpp"
 #include "aistate.hpp"
+#include "aitimer.hpp"
 
 namespace ESM
 {
@@ -25,7 +26,7 @@ namespace MWMechanics
     /// \brief This class holds the variables AiWander needs which are deleted if the package becomes inactive.
     struct AiWanderStorage : AiTemporaryBase
     {
-        float mReaction; // update some actions infrequently
+        AiReactionTimer mReaction;
 
         // AiWander states
         enum WanderState
@@ -57,7 +58,6 @@ namespace MWMechanics
         int mStuckCount;
 
         AiWanderStorage():
-            mReaction(0),
             mState(Wander_ChooseAction),
             mIsWanderingManually(false),
             mCanWanderAlongPathGrid(true),
diff --git a/components/misc/rng.cpp b/components/misc/rng.cpp
index 23d8204482..4805f0d91c 100644
--- a/components/misc/rng.cpp
+++ b/components/misc/rng.cpp
@@ -47,4 +47,9 @@ namespace Misc
     {
         return static_cast<unsigned int>(std::chrono::high_resolution_clock::now().time_since_epoch().count());
     }
+
+    float Rng::deviate(float mean, float deviation, Seed& seed)
+    {
+        return std::uniform_real_distribution<float>(mean - deviation, mean + deviation)(seed.mGenerator);
+    }
 }
diff --git a/components/misc/rng.hpp b/components/misc/rng.hpp
index 8efca438d1..998ac0d535 100644
--- a/components/misc/rng.hpp
+++ b/components/misc/rng.hpp
@@ -42,6 +42,8 @@ public:
 
     /// returns default seed for RNG
     static unsigned int generateDefaultSeed();
+
+    static float deviate(float mean, float deviation, Seed& seed = getSeed());
 };
 
 }
diff --git a/components/misc/timer.hpp b/components/misc/timer.hpp
new file mode 100644
index 0000000000..81a2ca073c
--- /dev/null
+++ b/components/misc/timer.hpp
@@ -0,0 +1,42 @@
+#ifndef OPENMW_COMPONENTS_MISC_TIMER_H
+#define OPENMW_COMPONENTS_MISC_TIMER_H
+
+#include "rng.hpp"
+
+namespace Misc
+{
+    enum class TimerStatus
+    {
+        Waiting,
+        Elapsed,
+    };
+
+    class DeviatingPeriodicTimer
+    {
+        public:
+            explicit DeviatingPeriodicTimer(float period, float deviation, float timeLeft)
+                : mPeriod(period), mDeviation(deviation), mTimeLeft(timeLeft)
+            {}
+
+            TimerStatus update(float duration)
+            {
+                if (mTimeLeft > 0)
+                {
+                    mTimeLeft -= duration;
+                    return TimerStatus::Waiting;
+                }
+
+                mTimeLeft = Rng::deviate(mPeriod, mDeviation);
+                return TimerStatus::Elapsed;
+            }
+
+            void reset(float timeLeft) { mTimeLeft = timeLeft; }
+
+        private:
+            const float mPeriod;
+            const float mDeviation;
+            float mTimeLeft;
+    };
+}
+
+#endif

From 62c0ecbbd0556b16db5a01798f41b4e94921565e Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 20 Mar 2021 01:50:51 +0100
Subject: [PATCH 0467/2859] Separate engage combat timer for each actor

Use DeviatingPeriodicTimer to distribute calls over time. This reduces
stuttering and make AI more natural.
---
 apps/openmw/mwmechanics/actor.hpp  | 8 ++++++++
 apps/openmw/mwmechanics/actors.cpp | 8 +++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwmechanics/actor.hpp b/apps/openmw/mwmechanics/actor.hpp
index 287ca420f4..be4f425378 100644
--- a/apps/openmw/mwmechanics/actor.hpp
+++ b/apps/openmw/mwmechanics/actor.hpp
@@ -5,6 +5,8 @@
 
 #include "../mwmechanics/actorutil.hpp"
 
+#include <components/misc/timer.hpp>
+
 namespace MWRender
 {
     class Animation;
@@ -41,12 +43,18 @@ namespace MWMechanics
         bool isTurningToPlayer() const;
         void setTurningToPlayer(bool turning);
 
+        Misc::TimerStatus updateEngageCombatTimer(float duration)
+        {
+            return mEngageCombat.update(duration);
+        }
+
     private:
         std::unique_ptr<CharacterController> mCharacterController;
         int mGreetingTimer{0};
         float mTargetAngleRadians{0.f};
         GreetingState mGreetingState{Greet_None};
         bool mIsTurningToPlayer{false};
+        Misc::DeviatingPeriodicTimer mEngageCombat{1.0f, 0.25f, Misc::Rng::deviate(0, 0.25f)};
     };
 
 }
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index c0a1371585..4379521a4c 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1901,14 +1901,11 @@ namespace MWMechanics
     {
         if(!paused)
         {
-            static float timerUpdateAITargets = 0;
             static float timerUpdateHeadTrack = 0;
             static float timerUpdateEquippedLight = 0;
             static float timerUpdateHello = 0;
             const float updateEquippedLightInterval = 1.0f;
 
-            // target lists get updated once every 1.0 sec
-            if (timerUpdateAITargets >= 1.0f) timerUpdateAITargets = 0;
             if (timerUpdateHeadTrack >= 0.3f) timerUpdateHeadTrack = 0;
             if (timerUpdateHello >= 0.25f) timerUpdateHello = 0;
             if (mTimerDisposeSummonsCorpses >= 0.2f) mTimerDisposeSummonsCorpses = 0;
@@ -1961,6 +1958,8 @@ namespace MWMechanics
 
                 iter->first.getClass().getCreatureStats(iter->first).getActiveSpells().update(duration);
 
+                const Misc::TimerStatus engageCombatTimerStatus = iter->second->updateEngageCombatTimer(duration);
+
                 // For dead actors we need to update looping spell particles
                 if (iter->first.getClass().getCreatureStats(iter->first).isDead())
                 {
@@ -1989,7 +1988,7 @@ namespace MWMechanics
                     }
                     if (aiActive && inProcessingRange)
                     {
-                        if (timerUpdateAITargets == 0)
+                        if (engageCombatTimerStatus == Misc::TimerStatus::Elapsed)
                         {
                             if (!isPlayer)
                                 adjustCommandedActor(iter->first);
@@ -2076,7 +2075,6 @@ namespace MWMechanics
             if (avoidCollisions)
                 predictAndAvoidCollisions();
 
-            timerUpdateAITargets += duration;
             timerUpdateHeadTrack += duration;
             timerUpdateEquippedLight += duration;
             timerUpdateHello += duration;

From 2ea0bf91e684b17aa1f63bc24224aa1d2db83da6 Mon Sep 17 00:00:00 2001
From: wareya <wareya@gmail.com>
Date: Sat, 20 Mar 2021 13:11:19 -0400
Subject: [PATCH 0468/2859] try to estimate vertical water depth, not
 screen-direction water depth

---
 files/shaders/water_fragment.glsl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/files/shaders/water_fragment.glsl b/files/shaders/water_fragment.glsl
index fc0167d84e..e829e1a869 100644
--- a/files/shaders/water_fragment.glsl
+++ b/files/shaders/water_fragment.glsl
@@ -254,7 +254,11 @@ void main(void)
     // wobbly water: hard-fade into refraction texture at extremely low depth, with a wobble based on normal mapping
     vec3 normalShoreRippleRain = texture2D(normalMap,normalCoords(UV, 2.0, 2.7, -1.0*waterTimer,  0.05,  0.1,  normal3)).rgb - 0.5
                                + texture2D(normalMap,normalCoords(UV, 2.0, 2.7,      waterTimer,  0.04, -0.13, normal4)).rgb - 0.5;
-    float shoreOffset = clamp((realWaterDepth - (normal2.r + mix(0, normalShoreRippleRain.r, rainIntensity) + 0.35)*8), 0, 1);
+    float verticalWaterDepth = realWaterDepth * mix(abs(vVec.z), 1.0, 0.2); // an estimate
+    float shoreOffset = verticalWaterDepth - (normal2.r + mix(0, normalShoreRippleRain.r, rainIntensity) + 0.15)*8;
+    float fuzzFactor = min(1.0, 1000.0/surfaceDepth) * mix(abs(vVec.z), 1, 0.2);
+    shoreOffset *= fuzzFactor;
+    shoreOffset = clamp(shoreOffset, 0, 1);
     gl_FragData[0].xyz = mix(rawRefraction, gl_FragData[0].xyz, shoreOffset);
 #else
     gl_FragData[0].xyz = mix(reflection,  waterColor,  (1.0-fresnel)*0.5) + specular * gl_LightSource[0].specular.xyz + vec3(rainRipple.w) * 0.7;

From 40265bf1181167d927f3870b9d5127e310ce49f7 Mon Sep 17 00:00:00 2001
From: wareya <wareya@gmail.com>
Date: Sat, 20 Mar 2021 21:14:56 -0400
Subject: [PATCH 0469/2859] make unstucking slightly smarter (can turn itself
 off, also acts like flat ground)

---
 apps/openmw/mwphysics/actor.hpp          | 21 +++++++++++++++++++
 apps/openmw/mwphysics/movementsolver.cpp | 26 +++++++++++++++++++++++-
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index 031125f40d..472a79bff5 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -159,6 +159,24 @@ namespace MWPhysics
         MWWorld::Ptr getStandingOnPtr() const;
         void setStandingOnPtr(const MWWorld::Ptr& ptr);
 
+        unsigned int getStuckFrames() const
+        {
+            return mStuckFrames;
+        }
+        void setStuckFrames(unsigned int frames)
+        {
+            mStuckFrames = frames;
+        }
+
+        const osg::Vec3f &getLastStuckPosition() const
+        {
+            return mLastStuckPosition;
+        }
+        void setLastStuckPosition(osg::Vec3f position)
+        {
+            mLastStuckPosition = position;
+        }
+
     private:
         MWWorld::Ptr mStandingOnPtr;
         /// Removes then re-adds the collision object to the dynamics world
@@ -192,6 +210,9 @@ namespace MWPhysics
         btTransform mLocalTransform;
         mutable std::mutex mPositionMutex;
 
+        unsigned int mStuckFrames;
+        osg::Vec3f mLastStuckPosition;
+
         osg::Vec3f mForce;
         std::atomic<bool> mOnGround;
         std::atomic<bool> mOnSlope;
diff --git a/apps/openmw/mwphysics/movementsolver.cpp b/apps/openmw/mwphysics/movementsolver.cpp
index 5f0322a1f2..a393ec5784 100644
--- a/apps/openmw/mwphysics/movementsolver.cpp
+++ b/apps/openmw/mwphysics/movementsolver.cpp
@@ -204,7 +204,7 @@ namespace MWPhysics
         osg::Vec3f lastSlideNormalFallback(0,0,1);
         bool forceGroundTest = false;
 
-        for (int iterations = 0; iterations < sMaxIterations && remainingTime > 0.01f; ++iterations)
+        for (int iterations = 0; iterations < sMaxIterations && remainingTime > 0.0001f; ++iterations)
         {
             osg::Vec3f nextpos = newPosition + velocity * remainingTime;
 
@@ -394,6 +394,12 @@ namespace MWPhysics
                     isOnGround = false;
                 }
             }
+            // forcibly treat stuck actors as if they're on flat ground because buggy collisions when inside of things can/will break ground detection
+            if(physicActor->getStuckFrames() > 0)
+            {
+                isOnGround = true;
+                isOnSlope = false;
+            }
         }
 
         if((isOnGround && !isOnSlope) || newPosition.z() < swimlevel || actor.mFlying)
@@ -437,6 +443,17 @@ namespace MWPhysics
         auto* collisionObject = physicActor->getCollisionObject();
         auto tempPosition = actor.mPosition;
 
+        if(physicActor->getStuckFrames() >= 10)
+        {
+            if((physicActor->getLastStuckPosition() - actor.mPosition).length2() < 100)
+                return;
+            else
+            {
+                physicActor->setStuckFrames(0);
+                physicActor->setLastStuckPosition({0, 0, 0});
+            }
+        }
+
         // use vanilla-accurate collision hull position hack (do same hitbox offset hack as movement solver)
         // if vanilla compatibility didn't matter, the "correct" collision hull position would be physicActor->getScaledMeshTranslation()
         const auto verticalHalfExtent = osg::Vec3f(0.0, 0.0, physicActor->getHalfExtents().z());
@@ -470,6 +487,8 @@ namespace MWPhysics
         auto contactCallback = gatherContacts({0.0, 0.0, 0.0});
         if(contactCallback.mDistance < -sAllowedPenetration)
         {
+            physicActor->setStuckFrames(physicActor->getStuckFrames() + 1);
+            physicActor->setLastStuckPosition(actor.mPosition);
             // we are; try moving it out of the world
             auto positionDelta = contactCallback.mContactSum;
             // limit rejection delta to the largest known individual rejections
@@ -502,6 +521,11 @@ namespace MWPhysics
                 }
             }
         }
+        else
+        {
+            physicActor->setStuckFrames(0);
+            physicActor->setLastStuckPosition({0, 0, 0});
+        }
 
         collisionObject->setWorldTransform(oldTransform);
         actor.mPosition = tempPosition;

From e722c99e6284d5f3611b746e5e6cc562c28b8fa4 Mon Sep 17 00:00:00 2001
From: wareya <wareya@gmail.com>
Date: Sun, 21 Mar 2021 08:57:15 -0400
Subject: [PATCH 0470/2859] forgot to initialize these variables

---
 apps/openmw/mwphysics/actor.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index 06abe72403..905034cde5 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -22,6 +22,7 @@ namespace MWPhysics
 Actor::Actor(const MWWorld::Ptr& ptr, const Resource::BulletShape* shape, PhysicsTaskScheduler* scheduler)
   : mStandingOnPtr(nullptr), mCanWaterWalk(false), mWalkingOnWater(false)
   , mCollisionObject(nullptr), mMeshTranslation(shape->mCollisionBox.center), mHalfExtents(shape->mCollisionBox.extents)
+  , mStuckFrames(0), mLastStuckPosition{0, 0, 0}
   , mForce(0.f, 0.f, 0.f), mOnGround(true), mOnSlope(false)
   , mInternalCollisionMode(true)
   , mExternalCollisionMode(true)

From 7bbbe40abe042c1931823d68f0d769f40a5f8695 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 21 Mar 2021 13:56:56 +0100
Subject: [PATCH 0471/2859] "static const" -> "static constexpr" in headers

---
 apps/opencs/model/prefs/shortcutsetting.hpp |  2 +-
 apps/openmw/mwgui/sortfilteritemmodel.hpp   | 28 ++++++-------
 apps/openmw/mwgui/widgets.hpp               |  2 +-
 apps/openmw/mwmechanics/creaturestats.hpp   |  2 +-
 apps/openmw/mwmechanics/obstacle.hpp        |  2 +-
 apps/openmw/mwphysics/constants.hpp         | 20 ++++-----
 apps/openmw/mwrender/animation.hpp          |  2 +-
 apps/openmw/mwscript/ref.hpp                |  4 +-
 apps/openmw/mwworld/containerstore.hpp      | 36 ++++++++--------
 apps/openmw/mwworld/inventorystore.hpp      | 46 ++++++++++-----------
 10 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/apps/opencs/model/prefs/shortcutsetting.hpp b/apps/opencs/model/prefs/shortcutsetting.hpp
index a0c588b42e..52298232e7 100644
--- a/apps/opencs/model/prefs/shortcutsetting.hpp
+++ b/apps/opencs/model/prefs/shortcutsetting.hpp
@@ -34,7 +34,7 @@ namespace CSMPrefs
             void storeValue(const QKeySequence& sequence);
             void resetState();
 
-            static const int MaxKeys = 4;
+            static constexpr int MaxKeys = 4;
 
             QPushButton* mButton;
 
diff --git a/apps/openmw/mwgui/sortfilteritemmodel.hpp b/apps/openmw/mwgui/sortfilteritemmodel.hpp
index fa70a0edd7..64a01f71bd 100644
--- a/apps/openmw/mwgui/sortfilteritemmodel.hpp
+++ b/apps/openmw/mwgui/sortfilteritemmodel.hpp
@@ -35,20 +35,20 @@ namespace MWGui
         bool onDropItem(const MWWorld::Ptr &item, int count) override;
         bool onTakeItem(const MWWorld::Ptr &item, int count) override;
 
-        static const int Category_Weapon = (1<<1);
-        static const int Category_Apparel = (1<<2);
-        static const int Category_Misc = (1<<3);
-        static const int Category_Magic = (1<<4);
-        static const int Category_All = 255;
-
-        static const int Filter_OnlyIngredients = (1<<0);
-        static const int Filter_OnlyEnchanted = (1<<1);
-        static const int Filter_OnlyEnchantable = (1<<2);
-        static const int Filter_OnlyChargedSoulstones = (1<<3);
-        static const int Filter_OnlyUsableItems = (1<<4); // Only items with a Use action
-        static const int Filter_OnlyRepairable = (1<<5);
-        static const int Filter_OnlyRechargable = (1<<6);
-        static const int Filter_OnlyRepairTools = (1<<7);
+        static constexpr int Category_Weapon = (1<<1);
+        static constexpr int Category_Apparel = (1<<2);
+        static constexpr int Category_Misc = (1<<3);
+        static constexpr int Category_Magic = (1<<4);
+        static constexpr int Category_All = 255;
+
+        static constexpr int Filter_OnlyIngredients = (1<<0);
+        static constexpr int Filter_OnlyEnchanted = (1<<1);
+        static constexpr int Filter_OnlyEnchantable = (1<<2);
+        static constexpr int Filter_OnlyChargedSoulstones = (1<<3);
+        static constexpr int Filter_OnlyUsableItems = (1<<4); // Only items with a Use action
+        static constexpr int Filter_OnlyRepairable = (1<<5);
+        static constexpr int Filter_OnlyRechargable = (1<<6);
+        static constexpr int Filter_OnlyRepairTools = (1<<7);
 
 
     private:
diff --git a/apps/openmw/mwgui/widgets.hpp b/apps/openmw/mwgui/widgets.hpp
index 731a41a354..3c55287159 100644
--- a/apps/openmw/mwgui/widgets.hpp
+++ b/apps/openmw/mwgui/widgets.hpp
@@ -268,7 +268,7 @@ namespace MWGui
             void initialiseOverride() override;
 
         private:
-            static const int sIconOffset = 24;
+            static constexpr int sIconOffset = 24;
             
             void updateWidgets();
 
diff --git a/apps/openmw/mwmechanics/creaturestats.hpp b/apps/openmw/mwmechanics/creaturestats.hpp
index b2c0aec98e..e09f5197e1 100644
--- a/apps/openmw/mwmechanics/creaturestats.hpp
+++ b/apps/openmw/mwmechanics/creaturestats.hpp
@@ -24,7 +24,7 @@ namespace MWMechanics
 {
     struct CorprusStats
     {
-        static const int sWorseningPeriod = 24;
+        static constexpr int sWorseningPeriod = 24;
 
         int mWorsenings[ESM::Attribute::Length];
         MWWorld::TimeStamp mNextWorsening;
diff --git a/apps/openmw/mwmechanics/obstacle.hpp b/apps/openmw/mwmechanics/obstacle.hpp
index 6c2197d811..b574bab67f 100644
--- a/apps/openmw/mwmechanics/obstacle.hpp
+++ b/apps/openmw/mwmechanics/obstacle.hpp
@@ -12,7 +12,7 @@ namespace MWMechanics
 {
     struct Movement;
 
-    static const int NUM_EVADE_DIRECTIONS = 4;
+    static constexpr int NUM_EVADE_DIRECTIONS = 4;
 
     /// tests actor's proximity to a closed door by default
     bool proximityToDoor(const MWWorld::Ptr& actor, float minDist);
diff --git a/apps/openmw/mwphysics/constants.hpp b/apps/openmw/mwphysics/constants.hpp
index c6f2f3b530..d552ed49e6 100644
--- a/apps/openmw/mwphysics/constants.hpp
+++ b/apps/openmw/mwphysics/constants.hpp
@@ -3,24 +3,24 @@
 
 namespace MWPhysics
 {
-    static const float sStepSizeUp = 34.0f;
-    static const float sStepSizeDown = 62.0f;
+    static constexpr float sStepSizeUp = 34.0f;
+    static constexpr float sStepSizeDown = 62.0f;
 
-    static const float sMinStep = 10.0f; // hack to skip over tiny unwalkable slopes
-    static const float sMinStep2 = 20.0f; // hack to skip over shorter but longer/wider/further unwalkable slopes
+    static constexpr float sMinStep = 10.0f; // hack to skip over tiny unwalkable slopes
+    static constexpr float sMinStep2 = 20.0f; // hack to skip over shorter but longer/wider/further unwalkable slopes
     // whether to do the above stairstepping logic hacks to work around bad morrowind assets - disabling causes problems but improves performance
-    static const bool sDoExtraStairHacks = true;
+    static constexpr bool sDoExtraStairHacks = true;
 
-    static const float sGroundOffset = 1.0f;
-    static const float sMaxSlope = 49.0f;
+    static constexpr float sGroundOffset = 1.0f;
+    static constexpr float sMaxSlope = 49.0f;
 
     // Arbitrary number. To prevent infinite loops. They shouldn't happen but it's good to be prepared.
-    static const int sMaxIterations = 8;
+    static constexpr int sMaxIterations = 8;
     // Allows for more precise movement solving without getting stuck or snagging too easily.
-    static const float sCollisionMargin = 0.1;
+    static constexpr float sCollisionMargin = 0.1;
     // Allow for a small amount of penetration to prevent numerical precision issues from causing the "unstuck"ing code to run unnecessarily
     // Currently set to 0 because having the "unstuck"ing code run whenever possible prevents some glitchy snagging issues
-    static const float sAllowedPenetration = 0.0;
+    static constexpr float sAllowedPenetration = 0.0;
 }
 
 #endif
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index ebfe8a2e59..04c5825c94 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -102,7 +102,7 @@ public:
         BlendMask_All = BlendMask_LowerBody | BlendMask_UpperBody
     };
     /* This is the number of *discrete* blend masks. */
-    static const size_t sNumBlendMasks = 4;
+    static constexpr size_t sNumBlendMasks = 4;
 
     /// Holds an animation priority value for each BoneGroup.
     struct AnimPriority
diff --git a/apps/openmw/mwscript/ref.hpp b/apps/openmw/mwscript/ref.hpp
index e572f51471..c52b419c1d 100644
--- a/apps/openmw/mwscript/ref.hpp
+++ b/apps/openmw/mwscript/ref.hpp
@@ -14,7 +14,7 @@ namespace MWScript
 {
     struct ExplicitRef
     {
-        static const bool implicit = false;
+        static constexpr bool implicit = false;
 
         MWWorld::Ptr operator() (Interpreter::Runtime& runtime, bool required = true,
             bool activeOnly = false) const;
@@ -22,7 +22,7 @@ namespace MWScript
 
     struct ImplicitRef
     {
-        static const bool implicit = true;
+        static constexpr bool implicit = true;
 
         MWWorld::Ptr operator() (Interpreter::Runtime& runtime, bool required = true,
             bool activeOnly = false) const;
diff --git a/apps/openmw/mwworld/containerstore.hpp b/apps/openmw/mwworld/containerstore.hpp
index e0843efbac..882f5efc44 100644
--- a/apps/openmw/mwworld/containerstore.hpp
+++ b/apps/openmw/mwworld/containerstore.hpp
@@ -73,22 +73,22 @@ namespace MWWorld
     {
         public:
 
-            static const int Type_Potion = 0x0001;
-            static const int Type_Apparatus = 0x0002;
-            static const int Type_Armor = 0x0004;
-            static const int Type_Book = 0x0008;
-            static const int Type_Clothing = 0x0010;
-            static const int Type_Ingredient = 0x0020;
-            static const int Type_Light = 0x0040;
-            static const int Type_Lockpick = 0x0080;
-            static const int Type_Miscellaneous = 0x0100;
-            static const int Type_Probe = 0x0200;
-            static const int Type_Repair = 0x0400;
-            static const int Type_Weapon = 0x0800;
-
-            static const int Type_Last = Type_Weapon;
-
-            static const int Type_All = 0xffff;
+            static constexpr int Type_Potion = 0x0001;
+            static constexpr int Type_Apparatus = 0x0002;
+            static constexpr int Type_Armor = 0x0004;
+            static constexpr int Type_Book = 0x0008;
+            static constexpr int Type_Clothing = 0x0010;
+            static constexpr int Type_Ingredient = 0x0020;
+            static constexpr int Type_Light = 0x0040;
+            static constexpr int Type_Lockpick = 0x0080;
+            static constexpr int Type_Miscellaneous = 0x0100;
+            static constexpr int Type_Probe = 0x0200;
+            static constexpr int Type_Repair = 0x0400;
+            static constexpr int Type_Weapon = 0x0800;
+
+            static constexpr int Type_Last = Type_Weapon;
+
+            static constexpr int Type_All = 0xffff;
 
             static const std::string sGoldId;
 
@@ -265,13 +265,13 @@ namespace MWWorld
         template<class From, class To, class Dummy>
         struct IsConvertible
         {
-            static const bool value = true;
+            static constexpr bool value = true;
         };
 
         template<class Dummy>
         struct IsConvertible<ConstPtr, Ptr, Dummy>
         {
-            static const bool value = false;
+            static constexpr bool value = false;
         };
 
         template<class T, class U>
diff --git a/apps/openmw/mwworld/inventorystore.hpp b/apps/openmw/mwworld/inventorystore.hpp
index bfe0a99922..6809e63b29 100644
--- a/apps/openmw/mwworld/inventorystore.hpp
+++ b/apps/openmw/mwworld/inventorystore.hpp
@@ -42,29 +42,29 @@ namespace MWWorld
     {
         public:
 
-            static const int Slot_Helmet = 0;
-            static const int Slot_Cuirass = 1;
-            static const int Slot_Greaves = 2;
-            static const int Slot_LeftPauldron = 3;
-            static const int Slot_RightPauldron = 4;
-            static const int Slot_LeftGauntlet = 5;
-            static const int Slot_RightGauntlet = 6;
-            static const int Slot_Boots = 7;
-            static const int Slot_Shirt = 8;
-            static const int Slot_Pants = 9;
-            static const int Slot_Skirt = 10;
-            static const int Slot_Robe = 11;
-            static const int Slot_LeftRing = 12;
-            static const int Slot_RightRing = 13;
-            static const int Slot_Amulet = 14;
-            static const int Slot_Belt = 15;
-            static const int Slot_CarriedRight = 16;
-            static const int Slot_CarriedLeft = 17;
-            static const int Slot_Ammunition = 18;
-
-            static const int Slots = 19;
-
-            static const int Slot_NoSlot = -1;
+            static constexpr int Slot_Helmet = 0;
+            static constexpr int Slot_Cuirass = 1;
+            static constexpr int Slot_Greaves = 2;
+            static constexpr int Slot_LeftPauldron = 3;
+            static constexpr int Slot_RightPauldron = 4;
+            static constexpr int Slot_LeftGauntlet = 5;
+            static constexpr int Slot_RightGauntlet = 6;
+            static constexpr int Slot_Boots = 7;
+            static constexpr int Slot_Shirt = 8;
+            static constexpr int Slot_Pants = 9;
+            static constexpr int Slot_Skirt = 10;
+            static constexpr int Slot_Robe = 11;
+            static constexpr int Slot_LeftRing = 12;
+            static constexpr int Slot_RightRing = 13;
+            static constexpr int Slot_Amulet = 14;
+            static constexpr int Slot_Belt = 15;
+            static constexpr int Slot_CarriedRight = 16;
+            static constexpr int Slot_CarriedLeft = 17;
+            static constexpr int Slot_Ammunition = 18;
+
+            static constexpr int Slots = 19;
+
+            static constexpr int Slot_NoSlot = -1;
 
         private:
 

From 209e7718a8e246a07e3afb8ffe40859f21df4594 Mon Sep 17 00:00:00 2001
From: "Hristos N. Triantafillou" <me@hristos.triantafillou.us>
Date: Sun, 21 Mar 2021 15:37:48 -0500
Subject: [PATCH 0472/2859] Clarify the requirements of a data folder

The current text could be interpreted to mean that a data folder
_must_ have a plugin, but this isn't the case.

This added text clarifies that a plugin or resources are needed.
---
 docs/source/reference/modding/mod-install.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/source/reference/modding/mod-install.rst b/docs/source/reference/modding/mod-install.rst
index 2c883aa599..c15d1b268a 100644
--- a/docs/source/reference/modding/mod-install.rst
+++ b/docs/source/reference/modding/mod-install.rst
@@ -11,6 +11,7 @@ Install
 
 	#.	Locate the plugin files, ``.esp`` or ``.omwaddon``, or possibly ``.esm``. The folder containing the plugin files we will call your *data folder*
 	#.	Check that all resource folders (``Meshes``, ``Textures``, etc.) containing additional resource files (the actual meshes, textures, etc.) are in the *data folder*.
+	#.	Note that not all mods have a plugin, and not all mods have resources, but they must at minimum have one or the other.
 	
 	.. note::
 		There may be multiple levels of folders, but the location of the plugins must be the same as the resource folders.

From 63f01d8c5f3dcc86826acd36ca244a17e845201c Mon Sep 17 00:00:00 2001
From: wareya <wareya@gmail.com>
Date: Sun, 21 Mar 2021 20:45:46 +0000
Subject: [PATCH 0473/2859] Prevent physics death spiral by falling back to
 true delta time when needed

---
 CHANGELOG.md                            |  2 +
 apps/openmw/mwphysics/mtphysics.cpp     | 77 ++++++++++++++++++++++++-
 apps/openmw/mwphysics/mtphysics.hpp     | 13 ++++-
 apps/openmw/mwphysics/physicssystem.cpp | 13 ++---
 apps/openmw/mwphysics/physicssystem.hpp |  2 +-
 components/misc/budgetmeasurement.hpp   | 42 ++++++++++++++
 6 files changed, 134 insertions(+), 15 deletions(-)
 create mode 100644 components/misc/budgetmeasurement.hpp

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0891ecba99..4ac01c00ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,6 +57,7 @@
     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
@@ -143,6 +144,7 @@
     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 #5910: Fall back to delta time when physics can't keep up
     Task #5480: Drop Qt4 support
     Task #5520: Improve cell name autocompleter implementation
     Task #5844: Update 'toggle sneak' documentation
diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 1fa6251f83..11eb7f909c 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -101,7 +101,7 @@ namespace
 
     osg::Vec3f interpolateMovements(MWPhysics::ActorFrameData& actorData, float timeAccum, float physicsDt)
     {
-        const float interpolationFactor = timeAccum / physicsDt;
+        const float interpolationFactor = std::clamp(timeAccum / physicsDt, 0.0f, 1.0f);
         return actorData.mPosition * interpolationFactor + actorData.mActorRaw->getPreviousPosition() * (1.f - interpolationFactor);
     }
 
@@ -138,7 +138,8 @@ namespace
 namespace MWPhysics
 {
     PhysicsTaskScheduler::PhysicsTaskScheduler(float physicsDt, std::shared_ptr<btCollisionWorld> collisionWorld)
-          : mPhysicsDt(physicsDt)
+          : mDefaultPhysicsDt(physicsDt)
+          , mPhysicsDt(physicsDt)
           , mTimeAccum(0.f)
           , mCollisionWorld(std::move(collisionWorld))
           , mNumJobs(0)
@@ -152,6 +153,11 @@ namespace MWPhysics
           , mNextLOS(0)
           , mFrameNumber(0)
           , mTimer(osg::Timer::instance())
+          , mPrevStepCount(1)
+          , mBudget(physicsDt)
+          , mAsyncBudget(0.0f)
+          , mBudgetCursor(0)
+          , mAsyncStartTime(0)
           , mTimeBegin(0)
           , mTimeEnd(0)
           , mFrameStart(0)
@@ -220,13 +226,61 @@ namespace MWPhysics
             thread.join();
     }
 
-    const std::vector<MWWorld::Ptr>& PhysicsTaskScheduler::moveActors(int numSteps, float timeAccum, std::vector<ActorFrameData>&& actorsData, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
+    std::tuple<int, float> PhysicsTaskScheduler::calculateStepConfig(float timeAccum) const
+    {
+        int maxAllowedSteps = 2;
+        int numSteps = timeAccum / mDefaultPhysicsDt;
+
+        // adjust maximum step count based on whether we're likely physics bottlenecked or not
+        // if maxAllowedSteps ends up higher than numSteps, we will not invoke delta time
+        // if it ends up lower than numSteps, but greater than 1, we will run a number of true delta time physics steps that we expect to be within budget
+        // if it ends up lower than numSteps and also 1, we will run a single delta time physics step
+        // if we did not do this, and had a fixed step count limit,
+        // we would have an unnecessarily low render framerate if we were only physics bottlenecked,
+        // and we would be unnecessarily invoking true delta time if we were only render bottlenecked
+
+        // get physics timing stats
+        float budgetMeasurement = std::max(mBudget.get(), mAsyncBudget.get());
+        // time spent per step in terms of the intended physics framerate
+        budgetMeasurement /= mDefaultPhysicsDt;
+        // ensure sane minimum value
+        budgetMeasurement = std::max(0.00001f, budgetMeasurement);
+        // we're spending almost or more than realtime per physics frame; limit to a single step
+        if (budgetMeasurement > 0.95)
+            maxAllowedSteps = 1;
+        // physics is fairly cheap; limit based on expense
+        if (budgetMeasurement < 0.5)
+            maxAllowedSteps = std::ceil(1.0/budgetMeasurement);
+        // limit to a reasonable amount
+        maxAllowedSteps = std::min(10, maxAllowedSteps);
+
+        // fall back to delta time for this frame if fixed timestep physics would fall behind
+        float actualDelta = mDefaultPhysicsDt;
+        if (numSteps > maxAllowedSteps)
+        {
+            numSteps = maxAllowedSteps;
+            // ensure that we do not simulate a frame ahead when doing delta time; this reduces stutter and latency
+            // this causes interpolation to 100% use the most recent physics result when true delta time is happening
+            // and we deliberately simulate up to exactly the timestamp that we want to render
+            actualDelta = timeAccum/float(numSteps+1);
+            // actually: if this results in a per-step delta less than the target physics steptime, clamp it
+            // this might reintroduce some stutter, but only comes into play in obscure cases
+            // (because numSteps is originally based on mDefaultPhysicsDt, this won't cause us to overrun)
+            actualDelta = std::max(actualDelta, mDefaultPhysicsDt);
+        }
+
+        return std::make_tuple(numSteps, actualDelta);
+    }
+
+    const std::vector<MWWorld::Ptr>& PhysicsTaskScheduler::moveActors(float & timeAccum, std::vector<ActorFrameData>&& actorsData, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
     {
         // This function run in the main thread.
         // While the mSimulationMutex is held, background physics threads can't run.
 
         std::unique_lock lock(mSimulationMutex);
 
+        double timeStart = mTimer->tick();
+
         mMovedActors.clear();
 
         // start by finishing previous background computation
@@ -251,14 +305,21 @@ namespace MWPhysics
                     mMovedActors.emplace_back(data.mActorRaw->getPtr());
                 }
             }
+            if(mAdvanceSimulation)
+                mAsyncBudget.update(mTimer->delta_s(mAsyncStartTime, mTimeEnd), mPrevStepCount, mBudgetCursor);
             updateStats(frameStart, frameNumber, stats);
         }
 
+        auto [numSteps, newDelta] = calculateStepConfig(timeAccum);
+        timeAccum -= numSteps*newDelta;
+
         // init
         for (auto& data : actorsData)
             data.updatePosition();
+        mPrevStepCount = numSteps;
         mRemainingSteps = numSteps;
         mTimeAccum = timeAccum;
+        mPhysicsDt = newDelta;
         mActorsFrameData = std::move(actorsData);
         mAdvanceSimulation = (mRemainingSteps != 0);
         mNewFrame = true;
@@ -269,20 +330,30 @@ namespace MWPhysics
         if (mAdvanceSimulation)
             mWorldFrameData = std::make_unique<WorldFrameData>();
 
+        if (mAdvanceSimulation)
+            mBudgetCursor += 1;
+
         if (mNumThreads == 0)
         {
             syncComputation();
+            if(mAdvanceSimulation)
+                mBudget.update(mTimer->delta_s(timeStart, mTimer->tick()), numSteps, mBudgetCursor);
             return mMovedActors;
         }
 
+        mAsyncStartTime = mTimer->tick();
         lock.unlock();
         mHasJob.notify_all();
+        if (mAdvanceSimulation)
+            mBudget.update(mTimer->delta_s(timeStart, mTimer->tick()), 1, mBudgetCursor);
         return mMovedActors;
     }
 
     const std::vector<MWWorld::Ptr>& PhysicsTaskScheduler::resetSimulation(const ActorMap& actors)
     {
         std::unique_lock lock(mSimulationMutex);
+        mBudget.reset(mDefaultPhysicsDt);
+        mAsyncBudget.reset(0.0f);
         mMovedActors.clear();
         mActorsFrameData.clear();
         for (const auto& [_, actor] : actors)
diff --git a/apps/openmw/mwphysics/mtphysics.hpp b/apps/openmw/mwphysics/mtphysics.hpp
index b35ebd5ee9..137755c21e 100644
--- a/apps/openmw/mwphysics/mtphysics.hpp
+++ b/apps/openmw/mwphysics/mtphysics.hpp
@@ -13,6 +13,7 @@
 
 #include "physicssystem.hpp"
 #include "ptrholder.hpp"
+#include "components/misc/budgetmeasurement.hpp"
 
 namespace Misc
 {
@@ -32,7 +33,7 @@ namespace MWPhysics
             /// @param timeAccum accumulated time from previous run to interpolate movements
             /// @param actorsData per actor data needed to compute new positions
             /// @return new position of each actor
-            const std::vector<MWWorld::Ptr>& moveActors(int numSteps, float timeAccum, std::vector<ActorFrameData>&& actorsData, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
+            const std::vector<MWWorld::Ptr>& moveActors(float & timeAccum, std::vector<ActorFrameData>&& actorsData, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
 
             const std::vector<MWWorld::Ptr>& resetSimulation(const ActorMap& actors);
 
@@ -58,11 +59,13 @@ namespace MWPhysics
             void updateAabbs();
             void updatePtrAabb(const std::weak_ptr<PtrHolder>& ptr);
             void updateStats(osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
+            std::tuple<int, float> calculateStepConfig(float timeAccum) const;
 
             std::unique_ptr<WorldFrameData> mWorldFrameData;
             std::vector<ActorFrameData> mActorsFrameData;
             std::vector<MWWorld::Ptr> mMovedActors;
-            const float mPhysicsDt;
+            float mDefaultPhysicsDt;
+            float mPhysicsDt;
             float mTimeAccum;
             std::shared_ptr<btCollisionWorld> mCollisionWorld;
             std::vector<LOSRequest> mLOSCache;
@@ -94,6 +97,12 @@ namespace MWPhysics
 
             unsigned int mFrameNumber;
             const osg::Timer* mTimer;
+
+            int mPrevStepCount;
+            Misc::BudgetMeasurement mBudget;
+            Misc::BudgetMeasurement mAsyncBudget;
+            unsigned int mBudgetCursor;
+            osg::Timer_t mAsyncStartTime;
             osg::Timer_t mTimeBegin;
             osg::Timer_t mTimeEnd;
             osg::Timer_t mFrameStart;
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index dc9ab629a1..65ed13f802 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -744,19 +744,14 @@ namespace MWPhysics
     {
         mTimeAccum += dt;
 
-        const int maxAllowedSteps = 20;
-        int numSteps = mTimeAccum / mPhysicsDt;
-        numSteps = std::min(numSteps, maxAllowedSteps);
-
-        mTimeAccum -= numSteps * mPhysicsDt;
-
         if (skipSimulation)
             return mTaskScheduler->resetSimulation(mActors);
 
-        return mTaskScheduler->moveActors(numSteps, mTimeAccum, prepareFrameData(numSteps), frameStart, frameNumber, stats);
+        // modifies mTimeAccum
+        return mTaskScheduler->moveActors(mTimeAccum, prepareFrameData(mTimeAccum >= mPhysicsDt), frameStart, frameNumber, stats);
     }
 
-    std::vector<ActorFrameData> PhysicsSystem::prepareFrameData(int numSteps)
+    std::vector<ActorFrameData> PhysicsSystem::prepareFrameData(bool willSimulate)
     {
         std::vector<ActorFrameData> actorsFrameData;
         actorsFrameData.reserve(mMovementQueue.size());
@@ -796,7 +791,7 @@ namespace MWPhysics
 
             // Ue current value only if we don't advance the simulation. Otherwise we might get a stale value.
             MWWorld::Ptr standingOn;
-            if (numSteps == 0)
+            if (!willSimulate)
                 standingOn = physicActor->getStandingOnPtr();
 
             actorsFrameData.emplace_back(std::move(physicActor), standingOn, moveToWaterSurface, movement, slowFall, waterlevel);
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 80b2d98bcf..3548239867 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -252,7 +252,7 @@ namespace MWPhysics
 
             void updateWater();
 
-            std::vector<ActorFrameData> prepareFrameData(int numSteps);
+            std::vector<ActorFrameData> prepareFrameData(bool willSimulate);
 
             osg::ref_ptr<SceneUtil::UnrefQueue> mUnrefQueue;
 
diff --git a/components/misc/budgetmeasurement.hpp b/components/misc/budgetmeasurement.hpp
new file mode 100644
index 0000000000..3d56477af1
--- /dev/null
+++ b/components/misc/budgetmeasurement.hpp
@@ -0,0 +1,42 @@
+#ifndef OPENMW_COMPONENTS_MISC_BUDGETMEASUREMENT_H
+#define OPENMW_COMPONENTS_MISC_BUDGETMEASUREMENT_H
+
+
+namespace Misc
+{
+
+class BudgetMeasurement
+{
+    std::array<float, 4> mBudgetHistory;
+    std::array<unsigned int, 4> mBudgetStepCount;
+
+public:
+    BudgetMeasurement(const float default_expense)
+    {
+        mBudgetHistory = {default_expense, default_expense, default_expense, default_expense};
+        mBudgetStepCount = {1, 1, 1, 1};
+    }
+
+    void reset(const float default_expense)
+    {
+        mBudgetHistory = {default_expense, default_expense, default_expense, default_expense};
+        mBudgetStepCount = {1, 1, 1, 1};
+    }
+
+    void update(double delta, unsigned int stepCount, size_t cursor)
+    {
+        mBudgetHistory[cursor%4] = delta;
+        mBudgetStepCount[cursor%4] = stepCount;
+    }
+
+    double get() const
+    {
+        float sum = (mBudgetHistory[0] + mBudgetHistory[1] + mBudgetHistory[2] + mBudgetHistory[3]);
+        unsigned int stepCountSum = (mBudgetStepCount[0] + mBudgetStepCount[1] + mBudgetStepCount[2] + mBudgetStepCount[3]);
+        return sum/float(stepCountSum);
+    }
+};
+
+}
+
+#endif

From 4862e8c8f492548f9e8b3c4e0d1aa962179b0f2e Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Sun, 21 Mar 2021 21:30:17 +0000
Subject: [PATCH 0474/2859] Bump aqt version

---
 CI/before_script.msvc.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index dba87128a3..b2b6483ec7 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -848,9 +848,11 @@ fi
 				wrappedExit 1
 			fi
 
-			if ! [ -e "aqt-venv/${VENV_BIN_DIR}/aqt" ]; then
+			# check version
+			pip list | grep 'aqtinstall\s*1.1.3'
+			if [ $? -ne 0 ]; then
 				echo "  Installing aqt wheel into virtualenv..."
-				run_cmd "aqt-venv/${VENV_BIN_DIR}/pip" install aqtinstall==0.9.2
+				run_cmd "aqt-venv/${VENV_BIN_DIR}/pip" install aqtinstall==1.1.3
 			fi
 			popd > /dev/null
 

From 2fdbe9b3f6a5b47ae692148dd0a8651c2836d5f6 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Thu, 17 Dec 2020 00:46:09 +0300
Subject: [PATCH 0475/2859] Handle BSShader[PP/No]LightingProperty

---
 components/nif/niffile.cpp                |   2 +
 components/nif/property.cpp               |  32 ++++-
 components/nif/property.hpp               |  42 ++++++-
 components/nif/record.hpp                 |   4 +-
 components/nifosg/nifloader.cpp           | 139 ++++++++++++++++++++++
 components/resource/scenemanager.cpp      |   2 +-
 components/shader/shadervisitor.cpp       |  17 ++-
 components/shader/shadervisitor.hpp       |   5 +-
 files/shaders/CMakeLists.txt              |   4 +
 files/shaders/nv_default_fragment.glsl    | 106 +++++++++++++++++
 files/shaders/nv_default_vertex.glsl      |  58 +++++++++
 files/shaders/nv_nolighting_fragment.glsl |  55 +++++++++
 files/shaders/nv_nolighting_vertex.glsl   |  49 ++++++++
 files/shaders/objects_fragment.glsl       |   5 +-
 files/shaders/objects_vertex.glsl         |   4 +-
 15 files changed, 509 insertions(+), 15 deletions(-)
 create mode 100644 files/shaders/nv_default_fragment.glsl
 create mode 100644 files/shaders/nv_default_vertex.glsl
 create mode 100644 files/shaders/nv_nolighting_fragment.glsl
 create mode 100644 files/shaders/nv_nolighting_vertex.glsl

diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index 665533c91b..3e226b35e1 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -133,6 +133,8 @@ static std::map<std::string,RecordFactoryEntry> makeFactory()
     factory["BSShaderTextureSet"]           = {&construct <BSShaderTextureSet>          , RC_BSShaderTextureSet         };
     factory["BSLODTriShape"]                = {&construct <BSLODTriShape>               , RC_BSLODTriShape              };
     factory["BSShaderProperty"]             = {&construct <BSShaderProperty>            , RC_BSShaderProperty           };
+    factory["BSShaderPPLightingProperty"]   = {&construct <BSShaderPPLightingProperty>  , RC_BSShaderPPLightingProperty };
+    factory["BSShaderNoLightingProperty"]   = {&construct <BSShaderNoLightingProperty>  , RC_BSShaderNoLightingProperty };
     return factory;
 }
 
diff --git a/components/nif/property.cpp b/components/nif/property.cpp
index d5357e1230..1d2dd885d4 100644
--- a/components/nif/property.cpp
+++ b/components/nif/property.cpp
@@ -118,6 +118,34 @@ void BSShaderLightingProperty::read(NIFStream *nif)
         clamp = nif->getUInt();
 }
 
+void BSShaderPPLightingProperty::read(NIFStream *nif)
+{
+    BSShaderLightingProperty::read(nif);
+    textureSet.read(nif);
+    if (nif->getBethVersion() <= 14)
+        return;
+    refraction.strength = nif->getFloat();
+    refraction.period = nif->getInt();
+    if (nif->getBethVersion() <= 24)
+        return;
+    parallax.passes = nif->getFloat();
+    parallax.scale = nif->getFloat();
+}
+
+void BSShaderPPLightingProperty::post(NIFFile *nif)
+{
+    BSShaderLightingProperty::post(nif);
+    textureSet.post(nif);
+}
+
+void BSShaderNoLightingProperty::read(NIFStream *nif)
+{
+    BSShaderLightingProperty::read(nif);
+    filename = nif->getSizedString();
+    if (nif->getBethVersion() >= 27)
+        falloffParams = nif->getVector4();
+}
+
 void NiFogProperty::read(NIFStream *nif)
 {
     Property::read(nif);
@@ -137,8 +165,8 @@ void S_MaterialProperty::read(NIFStream *nif)
     emissive = nif->getVector3();
     glossiness = nif->getFloat();
     alpha = nif->getFloat();
-    if (nif->getBethVersion() > 21)
-        emissive *= nif->getFloat();
+    if (nif->getBethVersion() >= 22)
+        emissiveMult = nif->getFloat();
 }
 
 void S_VertexColorProperty::read(NIFStream *nif)
diff --git a/components/nif/property.hpp b/components/nif/property.hpp
index 008e84515c..9c76f6d6ec 100644
--- a/components/nif/property.hpp
+++ b/components/nif/property.hpp
@@ -118,6 +118,18 @@ struct NiShadeProperty : public Property
 
 struct BSShaderProperty : public NiShadeProperty
 {
+    enum BSShaderType
+    {
+        SHADER_TALL_GRASS = 0,
+        SHADER_DEFAULT = 1,
+        SHADER_SKY = 10,
+        SHADER_SKIN = 14,
+        SHADER_WATER = 17,
+        SHADER_LIGHTING30 = 29,
+        SHADER_TILE = 32,
+        SHADER_NOLIGHTING = 33
+    };
+
     unsigned int type{0u}, flags1{0u}, flags2{0u};
     float envMapIntensity{0.f};
     void read(NIFStream *nif) override;
@@ -129,6 +141,34 @@ struct BSShaderLightingProperty : public BSShaderProperty
     void read(NIFStream *nif) override;
 };
 
+struct BSShaderPPLightingProperty : public BSShaderLightingProperty
+{
+    BSShaderTextureSetPtr textureSet;
+    struct RefractionSettings
+    {
+        float strength{0.f};
+        int period{0};
+    };
+    struct ParallaxSettings
+    {
+        float passes{0.f};
+        float scale{0.f};
+    };
+    RefractionSettings refraction;
+    ParallaxSettings parallax;
+
+    void read(NIFStream *nif) override;
+    void post(NIFFile *nif) override;
+};
+
+struct BSShaderNoLightingProperty : public BSShaderLightingProperty
+{
+    std::string filename;
+    osg::Vec4f falloffParams;
+
+    void read(NIFStream *nif) override;
+};
+
 struct NiDitherProperty : public Property
 {
     unsigned short flags;
@@ -193,7 +233,7 @@ struct S_MaterialProperty
     // The vector components are R,G,B
     osg::Vec3f ambient{1.f,1.f,1.f}, diffuse{1.f,1.f,1.f};
     osg::Vec3f specular, emissive;
-    float glossiness{0.f}, alpha{0.f};
+    float glossiness{0.f}, alpha{0.f}, emissiveMult{1.f};
 
     void read(NIFStream *nif);
 };
diff --git a/components/nif/record.hpp b/components/nif/record.hpp
index efacd82462..ed97acabc6 100644
--- a/components/nif/record.hpp
+++ b/components/nif/record.hpp
@@ -122,7 +122,9 @@ enum RecordType
   RC_NiColorInterpolator,
   RC_BSShaderTextureSet,
   RC_BSLODTriShape,
-  RC_BSShaderProperty
+  RC_BSShaderProperty,
+  RC_BSShaderPPLightingProperty,
+  RC_BSShaderNoLightingProperty
 };
 
 /// Base class for all records
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 3e34969f4a..ae1726f065 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -1672,6 +1672,85 @@ namespace NifOsg
             handleTextureControllers(texprop, composite, imageManager, stateset, animflags);
         }
 
+        void handleTextureSet(const Nif::BSShaderTextureSet* textureSet, unsigned int clamp, const std::string& nodeName, osg::StateSet* stateset, Resource::ImageManager* imageManager, std::vector<unsigned int>& boundTextures)
+        {
+            if (!boundTextures.empty())
+            {
+                for (unsigned int i = 0; i < boundTextures.size(); ++i)
+                    stateset->setTextureMode(i, GL_TEXTURE_2D, osg::StateAttribute::OFF);
+                boundTextures.clear();
+            }
+
+            const unsigned int uvSet = 0;
+
+            for (size_t i = 0; i < textureSet->textures.size(); ++i)
+            {
+                if (textureSet->textures[i].empty())
+                    continue;
+                switch(i)
+                {
+                    case Nif::BSShaderTextureSet::TextureType_Base:
+                    case Nif::BSShaderTextureSet::TextureType_Normal:
+                    case Nif::BSShaderTextureSet::TextureType_Glow:
+                        break;
+                    default:
+                    {
+                        Log(Debug::Info) << "Unhandled texture stage " << i << " on shape \"" << nodeName << "\" in " << mFilename;
+                        continue;
+                    }
+                }
+                std::string filename = Misc::ResourceHelpers::correctTexturePath(textureSet->textures[i], imageManager->getVFS());
+                osg::ref_ptr<osg::Image> image = imageManager->getImage(filename);
+                osg::ref_ptr<osg::Texture2D> texture2d = new osg::Texture2D(image);
+                if (image)
+                    texture2d->setTextureSize(image->s(), image->t());
+                bool wrapT = clamp & 0x1;
+                bool wrapS = (clamp >> 1) & 0x1;
+                texture2d->setWrap(osg::Texture::WRAP_S, wrapS ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
+                texture2d->setWrap(osg::Texture::WRAP_T, wrapT ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
+                unsigned int texUnit = boundTextures.size();
+                stateset->setTextureAttributeAndModes(texUnit, texture2d, osg::StateAttribute::ON);
+                // BSShaderTextureSet presence means there's no need for FFP support for the affected node
+                switch (i)
+                {
+                    case Nif::BSShaderTextureSet::TextureType_Base:
+                        texture2d->setName("diffuseMap");
+                        break;
+                    case Nif::BSShaderTextureSet::TextureType_Normal:
+                        texture2d->setName("normalMap");
+                        break;
+                    case Nif::BSShaderTextureSet::TextureType_Glow:
+                        texture2d->setName("emissiveMap");
+                        break;
+                }
+                boundTextures.emplace_back(uvSet);
+            }
+        }
+
+        const std::string& getNVShaderPrefix(unsigned int type) const
+        {
+            static const std::map<unsigned int, std::string> mapping =
+            {
+                {Nif::BSShaderProperty::SHADER_TALL_GRASS, std::string()},
+                {Nif::BSShaderProperty::SHADER_DEFAULT,    "nv_default"},
+                {Nif::BSShaderProperty::SHADER_SKY,        std::string()},
+                {Nif::BSShaderProperty::SHADER_SKIN,       std::string()},
+                {Nif::BSShaderProperty::SHADER_WATER,      std::string()},
+                {Nif::BSShaderProperty::SHADER_LIGHTING30, std::string()},
+                {Nif::BSShaderProperty::SHADER_TILE,       std::string()},
+                {Nif::BSShaderProperty::SHADER_NOLIGHTING, "nv_nolighting"},
+            };
+            auto prefix = mapping.find(type);
+            if (prefix == mapping.end())
+                Log(Debug::Warning) << "Unknown shader type " << type << " in " << mFilename;
+            else if (prefix->second.empty())
+                Log(Debug::Warning) << "Unhandled shader type " << type << " in " << mFilename;
+            else
+                return prefix->second;
+
+            return mapping.at(Nif::BSShaderProperty::SHADER_DEFAULT);
+        }
+
         void handleProperty(const Nif::Property *property,
                             osg::Node *node, SceneUtil::CompositeStateSetUpdater* composite, Resource::ImageManager* imageManager, std::vector<unsigned int>& boundTextures, int animflags)
         {
@@ -1757,6 +1836,63 @@ namespace NifOsg
                 handleTextureProperty(texprop, node->getName(), stateset, composite, imageManager, boundTextures, animflags);
                 break;
             }
+            case Nif::RC_BSShaderPPLightingProperty:
+            {
+                auto texprop = static_cast<const Nif::BSShaderPPLightingProperty*>(property);
+                bool shaderRequired = true;
+                node->setUserValue("shaderPrefix", getNVShaderPrefix(texprop->type));
+                node->setUserValue("shaderRequired", shaderRequired);
+                osg::StateSet* stateset = node->getOrCreateStateSet();
+                if (!texprop->textureSet.empty())
+                {
+                    auto textureSet = texprop->textureSet.getPtr();
+                    handleTextureSet(textureSet, texprop->clamp, node->getName(), stateset, imageManager, boundTextures);
+                }
+                handleTextureControllers(texprop, composite, imageManager, stateset, animflags);
+                break;
+            }
+            case Nif::RC_BSShaderNoLightingProperty:
+            {
+                auto texprop = static_cast<const Nif::BSShaderNoLightingProperty*>(property);
+                bool shaderRequired = true;
+                node->setUserValue("shaderPrefix", getNVShaderPrefix(texprop->type));
+                node->setUserValue("shaderRequired", shaderRequired);
+                osg::StateSet* stateset = node->getOrCreateStateSet();
+                if (!texprop->filename.empty())
+                {
+                    if (!boundTextures.empty())
+                    {
+                        for (unsigned int i = 0; i < boundTextures.size(); ++i)
+                            stateset->setTextureMode(i, GL_TEXTURE_2D, osg::StateAttribute::OFF);
+                        boundTextures.clear();
+                    }
+                    std::string filename = Misc::ResourceHelpers::correctTexturePath(texprop->filename, imageManager->getVFS());
+                    osg::ref_ptr<osg::Image> image = imageManager->getImage(filename);
+                    osg::ref_ptr<osg::Texture2D> texture2d = new osg::Texture2D(image);
+                    texture2d->setName("diffuseMap");
+                    if (image)
+                        texture2d->setTextureSize(image->s(), image->t());
+                    bool wrapT = texprop->clamp & 0x1;
+                    bool wrapS = (texprop->clamp >> 1) & 0x1;
+                    texture2d->setWrap(osg::Texture::WRAP_S, wrapS ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
+                    texture2d->setWrap(osg::Texture::WRAP_T, wrapT ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
+                    const unsigned int texUnit = 0;
+                    const unsigned int uvSet = 0;
+                    stateset->setTextureAttributeAndModes(texUnit, texture2d, osg::StateAttribute::ON);
+                    boundTextures.push_back(uvSet);
+                }
+                if (mBethVersion >= 27)
+                {
+                    stateset->addUniform(new osg::Uniform("useFalloff", true));
+                    stateset->addUniform(new osg::Uniform("falloffParams", texprop->falloffParams));
+                }
+                else
+                {
+                    stateset->addUniform(new osg::Uniform("useFalloff", false));
+                }
+                handleTextureControllers(texprop, composite, imageManager, stateset, animflags);
+                break;
+            }
             // unused by mw
             case Nif::RC_NiShadeProperty:
             case Nif::RC_NiDitherProperty:
@@ -1809,6 +1945,7 @@ namespace NifOsg
             bool hasMatCtrl = false;
 
             int lightmode = 1;
+            float emissiveMult = 1.f;
 
             for (const Nif::Property* property : properties)
             {
@@ -1828,6 +1965,7 @@ namespace NifOsg
                     mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(matprop->data.diffuse, matprop->data.alpha));
                     mat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(matprop->data.ambient, 1.f));
                     mat->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(matprop->data.emissive, 1.f));
+                    emissiveMult = matprop->data.emissiveMult;
 
                     mat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(matprop->data.specular, 1.f));
                     mat->setShininess(osg::Material::FRONT_AND_BACK, matprop->data.glossiness);
@@ -1948,6 +2086,7 @@ namespace NifOsg
             mat = shareAttribute(mat);
 
             stateset->setAttributeAndModes(mat, osg::StateAttribute::ON);
+            stateset->addUniform(new osg::Uniform("emissiveMult", emissiveMult));
         }
 
     };
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index e46ce20168..66d48f9715 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -774,7 +774,7 @@ namespace Resource
 
     Shader::ShaderVisitor *SceneManager::createShaderVisitor(const std::string& shaderPrefix, bool translucentFramebuffer)
     {
-        Shader::ShaderVisitor* shaderVisitor = new Shader::ShaderVisitor(*mShaderManager.get(), *mImageManager, shaderPrefix+"_vertex.glsl", shaderPrefix+"_fragment.glsl");
+        Shader::ShaderVisitor* shaderVisitor = new Shader::ShaderVisitor(*mShaderManager.get(), *mImageManager, shaderPrefix);
         shaderVisitor->setForceShaders(mForceShaders);
         shaderVisitor->setAutoUseNormalMaps(mAutoUseNormalMaps);
         shaderVisitor->setNormalMapPattern(mNormalMapPattern);
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index eae9ad2dbb..1af9f94c57 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -42,7 +42,7 @@ namespace Shader
 
     }
 
-    ShaderVisitor::ShaderVisitor(ShaderManager& shaderManager, Resource::ImageManager& imageManager, const std::string &defaultVsTemplate, const std::string &defaultFsTemplate)
+    ShaderVisitor::ShaderVisitor(ShaderManager& shaderManager, Resource::ImageManager& imageManager, const std::string &defaultShaderPrefix)
         : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
         , mForceShaders(false)
         , mAllowedToModifyStateSets(true)
@@ -52,8 +52,7 @@ namespace Shader
         , mTranslucentFramebuffer(false)
         , mShaderManager(shaderManager)
         , mImageManager(imageManager)
-        , mDefaultVsTemplate(defaultVsTemplate)
-        , mDefaultFsTemplate(defaultFsTemplate)
+        , mDefaultShaderPrefix(defaultShaderPrefix)
     {
         mRequirements.emplace_back();
     }
@@ -129,6 +128,10 @@ namespace Shader
         if (mAllowedToModifyStateSets)
             writableStateSet = node.getStateSet();
         const osg::StateSet::TextureAttributeList& texAttributes = stateset->getTextureAttributeList();
+        bool shaderRequired = false;
+        if (node.getUserValue("shaderRequired", shaderRequired) && shaderRequired)
+            mRequirements.back().mShaderRequired = true;
+
         if (!texAttributes.empty())
         {
             const osg::Texture* diffuseMap = nullptr;
@@ -440,8 +443,12 @@ namespace Shader
 
         defineMap["translucentFramebuffer"] = mTranslucentFramebuffer ? "1" : "0";
 
-        osg::ref_ptr<osg::Shader> vertexShader (mShaderManager.getShader(mDefaultVsTemplate, defineMap, osg::Shader::VERTEX));
-        osg::ref_ptr<osg::Shader> fragmentShader (mShaderManager.getShader(mDefaultFsTemplate, defineMap, osg::Shader::FRAGMENT));
+        std::string shaderPrefix;
+        if (!node.getUserValue("shaderPrefix", shaderPrefix))
+            shaderPrefix = mDefaultShaderPrefix;
+
+        osg::ref_ptr<osg::Shader> vertexShader (mShaderManager.getShader(shaderPrefix + "_vertex.glsl", defineMap, osg::Shader::VERTEX));
+        osg::ref_ptr<osg::Shader> fragmentShader (mShaderManager.getShader(shaderPrefix + "_fragment.glsl", defineMap, osg::Shader::FRAGMENT));
 
         if (vertexShader && fragmentShader)
         {
diff --git a/components/shader/shadervisitor.hpp b/components/shader/shadervisitor.hpp
index f7c6f83127..30ff41a33c 100644
--- a/components/shader/shadervisitor.hpp
+++ b/components/shader/shadervisitor.hpp
@@ -17,7 +17,7 @@ namespace Shader
     class ShaderVisitor : public osg::NodeVisitor
     {
     public:
-        ShaderVisitor(ShaderManager& shaderManager, Resource::ImageManager& imageManager, const std::string& defaultVsTemplate, const std::string& defaultFsTemplate);
+        ShaderVisitor(ShaderManager& shaderManager, Resource::ImageManager& imageManager, const std::string& defaultShaderPrefix);
 
         /// By default, only bump mapped objects will have a shader added to them.
         /// Setting force = true will cause all objects to render using shaders, regardless of having a bump map.
@@ -104,8 +104,7 @@ namespace Shader
         };
         std::vector<ShaderRequirements> mRequirements;
 
-        std::string mDefaultVsTemplate;
-        std::string mDefaultFsTemplate;
+        std::string mDefaultShaderPrefix;
 
         void createProgram(const ShaderRequirements& reqs);
         void ensureFFP(osg::Node& node);
diff --git a/files/shaders/CMakeLists.txt b/files/shaders/CMakeLists.txt
index 7250aa3726..e06dfe56a2 100644
--- a/files/shaders/CMakeLists.txt
+++ b/files/shaders/CMakeLists.txt
@@ -26,6 +26,10 @@ set(SHADER_FILES
     shadowcasting_vertex.glsl
     shadowcasting_fragment.glsl
     vertexcolors.glsl
+    nv_default_vertex.glsl
+    nv_default_fragment.glsl
+    nv_nolighting_vertex.glsl
+    nv_nolighting_fragment.glsl
 )
 
 copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_SHADERS_ROOT} ${DDIRRELATIVE} "${SHADER_FILES}")
diff --git a/files/shaders/nv_default_fragment.glsl b/files/shaders/nv_default_fragment.glsl
new file mode 100644
index 0000000000..03fa378a6d
--- /dev/null
+++ b/files/shaders/nv_default_fragment.glsl
@@ -0,0 +1,106 @@
+#version 120
+
+#if @useGPUShader4
+    #extension GL_EXT_gpu_shader4: require
+#endif
+
+#if @diffuseMap
+uniform sampler2D diffuseMap;
+varying vec2 diffuseMapUV;
+#endif
+
+#if @emissiveMap
+uniform sampler2D emissiveMap;
+varying vec2 emissiveMapUV;
+#endif
+
+#if @normalMap
+uniform sampler2D normalMap;
+varying vec2 normalMapUV;
+varying vec4 passTangent;
+#endif
+
+uniform bool noAlpha;
+
+varying float euclideanDepth;
+varying float linearDepth;
+
+#define PER_PIXEL_LIGHTING 1
+
+varying vec3 passViewPos;
+varying vec3 passNormal;
+
+#include "vertexcolors.glsl"
+#include "shadows_fragment.glsl"
+#include "lighting.glsl"
+#include "alpha.glsl"
+
+uniform float emissiveMult;
+
+void main()
+{
+#if @diffuseMap
+    gl_FragData[0] = texture2D(diffuseMap, diffuseMapUV);
+    gl_FragData[0].a *= coveragePreservingAlphaScale(diffuseMap, adjustedDiffuseUV);
+#else
+    gl_FragData[0] = vec4(1.0);
+#endif
+
+    vec4 diffuseColor = getDiffuseColor();
+    gl_FragData[0].a *= diffuseColor.a;
+    alphaTest();
+
+#if @normalMap
+    vec4 normalTex = texture2D(normalMap, normalMapUV);
+    // Must flip Y for DirectX format normal maps
+    normalTex.y = 1.0 - normalTex.y;
+
+    vec3 normalizedNormal = normalize(passNormal);
+    vec3 normalizedTangent = normalize(passTangent.xyz);
+    vec3 binormal = cross(normalizedTangent, normalizedNormal) * passTangent.w;
+    mat3 tbnTranspose = mat3(normalizedTangent, binormal, normalizedNormal);
+
+    vec3 viewNormal = gl_NormalMatrix * normalize(tbnTranspose * (normalTex.xyz * 2.0 - 1.0));
+#else
+    vec3 viewNormal = gl_NormalMatrix * normalize(passNormal);
+#endif
+
+    float shadowing = unshadowedLightRatio(linearDepth);
+    vec3 diffuseLight, ambientLight;
+    doLighting(passViewPos, normalize(viewNormal), shadowing, diffuseLight, ambientLight);
+    vec3 emission = getEmissionColor().xyz * emissiveMult;
+#if @emissiveMap
+    emission *= texture2D(emissiveMap, emissiveMapUV).xyz;
+#endif
+    vec3 lighting = diffuseColor.xyz * diffuseLight + getAmbientColor().xyz * ambientLight + emission;
+
+#if @clamp
+    lighting = clamp(lighting, vec3(0.0), vec3(1.0));
+#else
+    lighting = max(lighting, 0.0);
+#endif
+
+    gl_FragData[0].xyz *= lighting;
+
+    float shininess = gl_FrontMaterial.shininess;
+    vec3 matSpec = getSpecularColor().xyz;
+#if @normalMap
+    matSpec *= normalTex.a;
+#endif
+
+    if (matSpec != vec3(0.0))
+        gl_FragData[0].xyz += getSpecular(normalize(viewNormal), normalize(passViewPos.xyz), shininess, matSpec) * shadowing;
+#if @radialFog
+    float fogValue = clamp((euclideanDepth - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);
+#else
+    float fogValue = clamp((linearDepth - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);
+#endif
+    gl_FragData[0].xyz = mix(gl_FragData[0].xyz, gl_Fog.color.xyz, fogValue);
+
+#if @translucentFramebuffer
+    if (noAlpha)
+        gl_FragData[0].a = 1.0;
+#endif
+
+    applyShadowDebugOverlay();
+}
diff --git a/files/shaders/nv_default_vertex.glsl b/files/shaders/nv_default_vertex.glsl
new file mode 100644
index 0000000000..7c9d434f18
--- /dev/null
+++ b/files/shaders/nv_default_vertex.glsl
@@ -0,0 +1,58 @@
+#version 120
+
+#if @diffuseMap
+varying vec2 diffuseMapUV;
+#endif
+
+#if @emissiveMap
+varying vec2 emissiveMapUV;
+#endif
+
+#if @normalMap
+varying vec2 normalMapUV;
+varying vec4 passTangent;
+#endif
+
+varying float euclideanDepth;
+varying float linearDepth;
+
+varying vec3 passViewPos;
+varying vec3 passNormal;
+
+#define PER_PIXEL_LIGHTING 1
+
+#include "vertexcolors.glsl"
+#include "shadows_vertex.glsl"
+#include "lighting.glsl"
+
+void main(void)
+{
+    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+
+    vec4 viewPos = (gl_ModelViewMatrix * gl_Vertex);
+    gl_ClipVertex = viewPos;
+    euclideanDepth = length(viewPos.xyz);
+    linearDepth = gl_Position.z;
+
+#if @diffuseMap
+    diffuseMapUV = (gl_TextureMatrix[@diffuseMapUV] * gl_MultiTexCoord@diffuseMapUV).xy;
+#endif
+
+#if @emissiveMap
+    emissiveMapUV = (gl_TextureMatrix[@emissiveMapUV] * gl_MultiTexCoord@emissiveMapUV).xy;
+#endif
+
+#if @normalMap
+    normalMapUV = (gl_TextureMatrix[@normalMapUV] * gl_MultiTexCoord@normalMapUV).xy;
+    passTangent = gl_MultiTexCoord7.xyzw;
+#endif
+
+    passColor = gl_Color;
+    passViewPos = viewPos.xyz;
+    passNormal = gl_Normal.xyz;
+
+#if @shadows_enabled
+    vec3 viewNormal = normalize((gl_NormalMatrix * gl_Normal).xyz);
+    setupShadowCoords(viewPos, viewNormal);
+#endif
+}
diff --git a/files/shaders/nv_nolighting_fragment.glsl b/files/shaders/nv_nolighting_fragment.glsl
new file mode 100644
index 0000000000..27679a069f
--- /dev/null
+++ b/files/shaders/nv_nolighting_fragment.glsl
@@ -0,0 +1,55 @@
+#version 120
+
+#if @useGPUShader4
+    #extension GL_EXT_gpu_shader4: require
+#endif
+
+#if @diffuseMap
+uniform sampler2D diffuseMap;
+varying vec2 diffuseMapUV;
+#endif
+
+uniform bool noAlpha;
+
+#if @radialFog
+varying float euclideanDepth;
+#else
+varying float linearDepth;
+#endif
+
+uniform bool useFalloff;
+
+varying float passFalloff;
+
+#include "vertexcolors.glsl"
+#include "alpha.glsl"
+
+void main()
+{
+#if @diffuseMap
+    gl_FragData[0] = texture2D(diffuseMap, diffuseMapUV);
+    gl_FragData[0].a *= coveragePreservingAlphaScale(diffuseMap, diffuseMapUV);
+#else
+    gl_FragData[0] = vec4(1.0);
+#endif
+
+    gl_FragData[0] *= getDiffuseColor();
+
+    if (useFalloff)
+        gl_FragData[0].a *= passFalloff;
+
+    alphaTest();
+
+#if @radialFog
+    float fogValue = clamp((euclideanDepth - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);
+#else
+    float fogValue = clamp((linearDepth - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);
+#endif
+
+#if @translucentFramebuffer
+    if (noAlpha)
+        gl_FragData[0].a = 1.0;
+#endif
+
+    gl_FragData[0].xyz = mix(gl_FragData[0].xyz, gl_Fog.color.xyz, fogValue);
+}
diff --git a/files/shaders/nv_nolighting_vertex.glsl b/files/shaders/nv_nolighting_vertex.glsl
new file mode 100644
index 0000000000..275f1e5730
--- /dev/null
+++ b/files/shaders/nv_nolighting_vertex.glsl
@@ -0,0 +1,49 @@
+#version 120
+
+#if @diffuseMap
+varying vec2 diffuseMapUV;
+#endif
+
+#if @radialFog
+varying float euclideanDepth;
+#else
+varying float linearDepth;
+#endif
+
+uniform bool useFalloff;
+uniform vec4 falloffParams;
+
+varying vec3 passViewPos;
+varying float passFalloff;
+
+#include "vertexcolors.glsl"
+
+void main(void)
+{
+    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+
+    vec4 viewPos = (gl_ModelViewMatrix * gl_Vertex);
+    gl_ClipVertex = viewPos;
+#if @radialFog
+    euclideanDepth = length(viewPos.xyz);
+#else
+    linearDepth = gl_Position.z;
+#endif
+
+#if @diffuseMap
+    diffuseMapUV = (gl_TextureMatrix[@diffuseMapUV] * gl_MultiTexCoord@diffuseMapUV).xy;
+#endif
+
+    passColor = gl_Color;
+    if (useFalloff)
+    {
+        vec3 viewNormal = gl_NormalMatrix * normalize(gl_Normal.xyz);
+        vec3 viewDir = normalize(viewPos.xyz);
+        float viewAngle = abs(dot(viewNormal, viewDir));
+        passFalloff = smoothstep(falloffParams.y, falloffParams.x, viewAngle);
+    }
+    else
+    {
+        passFalloff = 1.0;
+    }
+}
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index e0d7833c9e..6b67be937a 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -64,6 +64,8 @@ varying float linearDepth;
 #if !PER_PIXEL_LIGHTING
 centroid varying vec3 passLighting;
 centroid varying vec3 shadowDiffuseLighting;
+#else
+uniform float emissiveMult;
 #endif
 varying vec3 passViewPos;
 varying vec3 passNormal;
@@ -168,7 +170,8 @@ void main()
 #else
     vec3 diffuseLight, ambientLight;
     doLighting(passViewPos, normalize(viewNormal), shadowing, diffuseLight, ambientLight);
-    lighting = diffuseColor.xyz * diffuseLight + getAmbientColor().xyz * ambientLight + getEmissionColor().xyz;
+    vec3 emission = getEmissionColor().xyz * emissiveMult;
+    lighting = diffuseColor.xyz * diffuseLight + getAmbientColor().xyz * ambientLight + emission;
 #endif
 
 #if @clamp
diff --git a/files/shaders/objects_vertex.glsl b/files/shaders/objects_vertex.glsl
index 15467933b7..bf5bdb40c2 100644
--- a/files/shaders/objects_vertex.glsl
+++ b/files/shaders/objects_vertex.glsl
@@ -45,6 +45,7 @@ varying float linearDepth;
 #if !PER_PIXEL_LIGHTING
 centroid varying vec3 passLighting;
 centroid varying vec3 shadowDiffuseLighting;
+uniform float emissiveMult;
 #endif
 varying vec3 passViewPos;
 varying vec3 passNormal;
@@ -114,7 +115,8 @@ void main(void)
 #if !PER_PIXEL_LIGHTING
     vec3 diffuseLight, ambientLight;
     doLighting(viewPos.xyz, viewNormal, diffuseLight, ambientLight, shadowDiffuseLighting);
-    passLighting = getDiffuseColor().xyz * diffuseLight + getAmbientColor().xyz * ambientLight + getEmissionColor().xyz;
+    vec3 emission = getEmissionColor().xyz * emissiveMult;
+    passLighting = getDiffuseColor().xyz * diffuseLight + getAmbientColor().xyz * ambientLight + emission;
     shadowDiffuseLighting *= getDiffuseColor().xyz;
 #endif
 

From 580fa78034faaa6b51ca0ae6fdd631ef2e0ef69f Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 22 Mar 2021 20:43:34 +0100
Subject: [PATCH 0476/2859] Don't purge summon effects with invalid creature
 ids

---
 apps/openmw/mwmechanics/summoning.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/openmw/mwmechanics/summoning.cpp b/apps/openmw/mwmechanics/summoning.cpp
index 0f699ccade..9f65f3d6c9 100644
--- a/apps/openmw/mwmechanics/summoning.cpp
+++ b/apps/openmw/mwmechanics/summoning.cpp
@@ -145,6 +145,12 @@ namespace MWMechanics
 
         for (std::map<ESM::SummonKey, int>::iterator it = creatureMap.begin(); it != creatureMap.end(); )
         {
+            if(it->second == -1)
+            {
+                // Keep the spell effect active if we failed to spawn anything
+                it++;
+                continue;
+            }
             MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->searchPtrViaActorId(it->second);
             if (ptr.isEmpty() || (ptr.getClass().getCreatureStats(ptr).isDead() && ptr.getClass().getCreatureStats(ptr).isDeathAnimationFinished()))
             {

From 8e9bd5c0bd78da03ed9ae8c4fb1145c306afc2c5 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 22 Mar 2021 20:44:13 +0100
Subject: [PATCH 0477/2859] Don't throw an exception when equipping a bound
 item fails

---
 CHANGELOG.md                       | 1 +
 apps/openmw/mwmechanics/actors.cpp | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ac01c00ff..6c36ce3eba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -112,6 +112,7 @@
     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
     Feature #390: 3rd person look "over the shoulder"
     Feature #832: OpenMW-CS: Handle deleted references
     Feature #1536: Show more information about level on menu
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index c0a1371585..a1e2d2a726 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -346,7 +346,11 @@ namespace MWMechanics
         if (actor != MWMechanics::getPlayer())
             return;
 
-        MWWorld::Ptr newItem = *store.getSlot(slot);
+        MWWorld::Ptr newItem;
+        auto it = store.getSlot(slot);
+        // Equip can fail because beast races cannot equip boots/helmets
+        if(it != store.end())
+            newItem = *it;
 
         if (newItem.isEmpty() || boundPtr != newItem)
             return;

From 5e1960a76a3e8dcf63a1f12e654020364a8d3236 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 22 Mar 2021 22:29:10 +0100
Subject: [PATCH 0478/2859] Disallow inserting containers, creatures, and npcs
 from the save game not present in content files

---
 apps/openmw/mwworld/esmstore.cpp |  6 ++++--
 apps/openmw/mwworld/store.cpp    | 12 +++++++++---
 apps/openmw/mwworld/store.hpp    |  6 +++---
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index 90bc80b484..5fa4684283 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -384,12 +384,14 @@ void ESMStore::validate()
             case ESM::REC_ENCH:
             case ESM::REC_SPEL:
             case ESM::REC_WEAP:
-            case ESM::REC_NPC_:
             case ESM::REC_LEVI:
             case ESM::REC_LEVC:
+                mStores[type]->read (reader);
+                return true;
+            case ESM::REC_NPC_:
             case ESM::REC_CREA:
             case ESM::REC_CONT:
-                mStores[type]->read (reader);
+                mStores[type]->read (reader, true);
                 return true;
 
             case ESM::REC_DYNA:
diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index 69ca1f8c27..9d6552106b 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -250,9 +250,15 @@ namespace MWWorld
         }
     }
     template<typename T>
-    T *Store<T>::insert(const T &item)
+    T *Store<T>::insert(const T &item, bool overrideOnly)
     {
         std::string id = Misc::StringUtils::lowerCase(item.mId);
+        if(overrideOnly)
+        {
+            auto it = mStatic.find(id);
+            if(it == mStatic.end())
+                return nullptr;
+        }
         std::pair<typename Dynamic::iterator, bool> result =
             mDynamic.insert(std::pair<std::string, T>(id, item));
         T *ptr = &result.first->second;
@@ -337,13 +343,13 @@ namespace MWWorld
         }
     }
     template<typename T>
-    RecordId Store<T>::read(ESM::ESMReader& reader)
+    RecordId Store<T>::read(ESM::ESMReader& reader, bool overrideOnly)
     {
         T record;
         bool isDeleted = false;
 
         record.load (reader, isDeleted);
-        insert (record);
+        insert (record, overrideOnly);
 
         return RecordId(record.mId, isDeleted);
     }
diff --git a/apps/openmw/mwworld/store.hpp b/apps/openmw/mwworld/store.hpp
index cb9f4f1e02..9cb1c7473b 100644
--- a/apps/openmw/mwworld/store.hpp
+++ b/apps/openmw/mwworld/store.hpp
@@ -46,7 +46,7 @@ namespace MWWorld
 
         virtual void write (ESM::ESMWriter& writer, Loading::Listener& progress) const {}
 
-        virtual RecordId read (ESM::ESMReader& reader) { return RecordId(); }
+        virtual RecordId read (ESM::ESMReader& reader, bool overrideOnly = false) { return RecordId(); }
         ///< Read into dynamic storage
     };
 
@@ -192,7 +192,7 @@ namespace MWWorld
         /// @note The record identifiers are listed in the order that the records were defined by the content files.
         void listIdentifier(std::vector<std::string> &list) const override;
 
-        T *insert(const T &item);
+        T *insert(const T &item, bool overrideOnly = false);
         T *insertStatic(const T &item);
 
         bool eraseStatic(const std::string &id) override;
@@ -201,7 +201,7 @@ namespace MWWorld
 
         RecordId load(ESM::ESMReader &esm) override;
         void write(ESM::ESMWriter& writer, Loading::Listener& progress) const override;
-        RecordId read(ESM::ESMReader& reader) override;
+        RecordId read(ESM::ESMReader& reader, bool overrideOnly = false) override;
     };
 
     template <>

From e79036f4e008b17c1b6c78ff0055951ede736e22 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Tue, 23 Mar 2021 20:43:52 +0100
Subject: [PATCH 0479/2859] Don't erase the player

---
 apps/openmw/mwworld/esmstore.hpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwworld/esmstore.hpp b/apps/openmw/mwworld/esmstore.hpp
index d69c56d8c0..4d962b28c3 100644
--- a/apps/openmw/mwworld/esmstore.hpp
+++ b/apps/openmw/mwworld/esmstore.hpp
@@ -80,8 +80,6 @@ namespace MWWorld
 
         std::map<int, StoreBase *> mStores;
 
-        ESM::NPC mPlayerTemplate;
-
         unsigned int mDynamicCount;
 
         mutable std::map<std::string, std::weak_ptr<MWMechanics::SpellList> > mSpellListCache;
@@ -172,14 +170,13 @@ namespace MWWorld
             for (std::map<int, StoreBase *>::iterator it = mStores.begin(); it != mStores.end(); ++it)
                 it->second->clearDynamic();
 
-            mNpcs.insert(mPlayerTemplate);
+            movePlayerRecord();
         }
 
         void movePlayerRecord ()
         {
-            mPlayerTemplate = *mNpcs.find("player");
-            mNpcs.eraseStatic(mPlayerTemplate.mId);
-            mNpcs.insert(mPlayerTemplate);
+            auto player = mNpcs.find("player");
+            mNpcs.insert(*player);
         }
 
         void load(ESM::ESMReader &esm, Loading::Listener* listener);

From cf5a93d7121412d6487f011451c873d07b83036b Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Tue, 23 Mar 2021 21:07:57 +0100
Subject: [PATCH 0480/2859] Also run NPC validation for modified base records

---
 apps/openmw/mwbase/world.hpp            |   2 +
 apps/openmw/mwstate/statemanagerimp.cpp |   1 +
 apps/openmw/mwworld/esmstore.cpp        | 103 ++++++++++++++----------
 apps/openmw/mwworld/esmstore.hpp        |   3 +
 apps/openmw/mwworld/worldimp.cpp        |   5 ++
 apps/openmw/mwworld/worldimp.hpp        |   2 +
 6 files changed, 73 insertions(+), 43 deletions(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 27980f0705..5e844ffae7 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -443,6 +443,8 @@ namespace MWBase
             virtual void applyDeferredPreviewRotationToPlayer(float dt) = 0;
             virtual void disableDeferredPreviewRotation() = 0;
 
+            virtual void saveLoaded() = 0;
+
             virtual void setupPlayer() = 0;
             virtual void renderPlayer() = 0;
 
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index f605344bf7..93f75c6f10 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -505,6 +505,7 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
                                       character->getPath().filename().string());
 
         MWBase::Environment::get().getWindowManager()->setNewGame(false);
+        MWBase::Environment::get().getWorld()->saveLoaded();
         MWBase::Environment::get().getWorld()->setupPlayer();
         MWBase::Environment::get().getWorld()->renderPlayer();
         MWBase::Environment::get().getWindowManager()->updatePlayer();
diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index 5fa4684283..986c4f8580 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -48,6 +48,57 @@ namespace
             }
         }
     }
+
+    std::vector<ESM::NPC> getNPCsToReplace(const MWWorld::Store<ESM::Faction>& factions, const MWWorld::Store<ESM::Class>& classes, const std::map<std::string, ESM::NPC>& npcs)
+    {
+        // Cache first class from store - we will use it if current class is not found
+        std::string defaultCls;
+        auto it = classes.begin();
+        if (it != classes.end())
+            defaultCls = it->mId;
+        else
+            throw std::runtime_error("List of NPC classes is empty!");
+
+        // Validate NPCs for non-existing class and faction.
+        // We will replace invalid entries by fixed ones
+        std::vector<ESM::NPC> npcsToReplace;
+
+        for (auto it : npcs)
+        {
+            ESM::NPC npc = it.second;
+            bool changed = false;
+
+            const std::string npcFaction = npc.mFaction;
+            if (!npcFaction.empty())
+            {
+                const ESM::Faction *fact = factions.search(npcFaction);
+                if (!fact)
+                {
+                    Log(Debug::Verbose) << "NPC '" << npc.mId << "' (" << npc.mName << ") has nonexistent faction '" << npc.mFaction << "', ignoring it.";
+                    npc.mFaction.clear();
+                    npc.mNpdt.mRank = 0;
+                    changed = true;
+                }
+            }
+
+            std::string npcClass = npc.mClass;
+            if (!npcClass.empty())
+            {
+                const ESM::Class *cls = classes.search(npcClass);
+                if (!cls)
+                {
+                    Log(Debug::Verbose) << "NPC '" << npc.mId << "' (" << npc.mName << ") has nonexistent class '" << npc.mClass << "', using '" << defaultCls << "' class as replacement.";
+                    npc.mClass = defaultCls;
+                    changed = true;
+                }
+            }
+
+            if (changed)
+                npcsToReplace.push_back(npc);
+        }
+
+        return npcsToReplace;
+    }
 }
 
 namespace MWWorld
@@ -218,49 +269,7 @@ int ESMStore::getRefCount(const std::string& id) const
 
 void ESMStore::validate()
 {
-    // Cache first class from store - we will use it if current class is not found
-    std::string defaultCls = "";
-    Store<ESM::Class>::iterator it = mClasses.begin();
-    if (it != mClasses.end())
-        defaultCls = it->mId;
-    else
-        throw std::runtime_error("List of NPC classes is empty!");
-
-    // Validate NPCs for non-existing class and faction.
-    // We will replace invalid entries by fixed ones
-    std::vector<ESM::NPC> npcsToReplace;
-    for (ESM::NPC npc : mNpcs)
-    {
-        bool changed = false;
-
-        const std::string npcFaction = npc.mFaction;
-        if (!npcFaction.empty())
-        {
-            const ESM::Faction *fact = mFactions.search(npcFaction);
-            if (!fact)
-            {
-                Log(Debug::Verbose) << "NPC '" << npc.mId << "' (" << npc.mName << ") has nonexistent faction '" << npc.mFaction << "', ignoring it.";
-                npc.mFaction.clear();
-                npc.mNpdt.mRank = 0;
-                changed = true;
-            }
-        }
-
-        std::string npcClass = npc.mClass;
-        if (!npcClass.empty())
-        {
-            const ESM::Class *cls = mClasses.search(npcClass);
-            if (!cls)
-            {
-                Log(Debug::Verbose) << "NPC '" << npc.mId << "' (" << npc.mName << ") has nonexistent class '" << npc.mClass << "', using '" << defaultCls << "' class as replacement.";
-                npc.mClass = defaultCls;
-                changed = true;
-            }
-        }
-
-        if (changed)
-            npcsToReplace.push_back(npc);
-    }
+    std::vector<ESM::NPC> npcsToReplace = getNPCsToReplace(mFactions, mClasses, mNpcs.mStatic);
 
     for (const ESM::NPC &npc : npcsToReplace)
     {
@@ -331,6 +340,14 @@ void ESMStore::validate()
     }
 }
 
+void ESMStore::validateDynamic()
+{
+    std::vector<ESM::NPC> npcsToReplace = getNPCsToReplace(mFactions, mClasses, mNpcs.mDynamic);
+
+    for (const ESM::NPC &npc : npcsToReplace)
+        mNpcs.insert(npc);
+}
+
     int ESMStore::countSavedGameRecords() const
     {
         return 1 // DYNA (dynamic name counter)
diff --git a/apps/openmw/mwworld/esmstore.hpp b/apps/openmw/mwworld/esmstore.hpp
index 4d962b28c3..26f497a527 100644
--- a/apps/openmw/mwworld/esmstore.hpp
+++ b/apps/openmw/mwworld/esmstore.hpp
@@ -179,6 +179,9 @@ namespace MWWorld
             mNpcs.insert(*player);
         }
 
+        /// Validate entries in store after loading a save
+        void validateDynamic();
+
         void load(ESM::ESMReader &esm, Loading::Listener* listener);
 
         template <class T>
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 01b90e9078..ce09cf1122 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -2473,6 +2473,11 @@ namespace MWWorld
         mRendering->getCamera()->adjustCameraDistance(dist);
     }
 
+    void World::saveLoaded()
+    {
+        mStore.validateDynamic();
+    }
+
     void World::setupPlayer()
     {
         const ESM::NPC *player = mStore.get<ESM::NPC>().find("player");
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 23153a31c4..e2d3449304 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -549,6 +549,8 @@ namespace MWWorld
             void applyDeferredPreviewRotationToPlayer(float dt) override;
             void disableDeferredPreviewRotation() override;
 
+            void saveLoaded() override;
+
             void setupPlayer() override;
             void renderPlayer() override;
 

From 313355cb3d72ba2ddd4b1557d801a0852151bf2f Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 23 Mar 2021 21:40:32 +0100
Subject: [PATCH 0481/2859] Fix default max tile size in navigator doc

---
 docs/source/reference/modding/settings/navigator.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/reference/modding/settings/navigator.rst b/docs/source/reference/modding/settings/navigator.rst
index af40ac750f..fcef549d0e 100644
--- a/docs/source/reference/modding/settings/navigator.rst
+++ b/docs/source/reference/modding/settings/navigator.rst
@@ -305,7 +305,7 @@ tile size
 
 :Type:		integer
 :Range:		> 0
-:Default:	64
+:Default:	128
 
 The width and height of each tile.
 

From 39c0ce9ddf5d1c85c2e4cac4eb6b1f6ad980f2d0 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 23 Mar 2021 23:15:13 +0100
Subject: [PATCH 0482/2859] Build limited path for far destinations

When distance between start and end point is greater than max radius of area
possibly covered by navmesh there is no way to find path via navmesh. Also if
distance is greater than cell size navmesh might not exists withing mentioned
area because cell is not loaded therefore navmesh is not generated. So minumum
of these values is used to limit max path distance. Assuming that path
actually exists it's possible to build path to the edge of a circle. When
actor reaches initial edge path is built further. However it will not be
optimal.
---
 apps/openmw/mwmechanics/aipackage.cpp        |  2 +-
 apps/openmw/mwmechanics/pathfinding.cpp      | 17 +++++++++++++++++
 apps/openmw/mwmechanics/pathfinding.hpp      |  4 ++++
 components/detournavigator/navigator.hpp     |  2 ++
 components/detournavigator/navigatorimpl.cpp |  6 ++++++
 components/detournavigator/navigatorimpl.hpp |  2 ++
 components/detournavigator/navigatorstub.hpp |  5 +++++
 components/detournavigator/settingsutils.hpp | 12 +++++++++++-
 8 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index 00e1c9c3a8..214aad320b 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -114,7 +114,7 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
             if (wasShortcutting || doesPathNeedRecalc(dest, actor)) // if need to rebuild path
             {
                 const auto pathfindingHalfExtents = world->getPathfindingHalfExtents(actor);
-                mPathFinder.buildPath(actor, position, dest, actor.getCell(), getPathGridGraph(actor.getCell()),
+                mPathFinder.buildLimitedPath(actor, position, dest, actor.getCell(), getPathGridGraph(actor.getCell()),
                     pathfindingHalfExtents, getNavigatorFlags(actor), getAreaCosts(actor));
                 mRotateOnTheRunChecks = 3;
 
diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp
index 93ae90547c..781b897a73 100644
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@@ -442,4 +442,21 @@ namespace MWMechanics
 
         std::copy(prePath.rbegin(), prePath.rend(), std::front_inserter(mPath));
     }
+
+    void PathFinder::buildLimitedPath(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint, const osg::Vec3f& endPoint,
+        const MWWorld::CellStore* cell, const PathgridGraph& pathgridGraph, const osg::Vec3f& halfExtents,
+        const DetourNavigator::Flags flags, const DetourNavigator::AreaCosts& areaCosts)
+    {
+        const auto navigator = MWBase::Environment::get().getWorld()->getNavigator();
+        const auto maxDistance = std::min(
+            navigator->getMaxNavmeshAreaRealRadius(),
+            static_cast<float>(Constants::CellSizeInUnits)
+        );
+        const auto startToEnd = endPoint - startPoint;
+        const auto distance = startToEnd.length();
+        if (distance <= maxDistance)
+            return buildPath(actor, startPoint, endPoint, cell, pathgridGraph, halfExtents, flags, areaCosts);
+        const auto end = startPoint + startToEnd * maxDistance / distance;
+        buildPath(actor, startPoint, end, cell, pathgridGraph, halfExtents, flags, areaCosts);
+    }
 }
diff --git a/apps/openmw/mwmechanics/pathfinding.hpp b/apps/openmw/mwmechanics/pathfinding.hpp
index b5c376b8ca..ed88a57ca0 100644
--- a/apps/openmw/mwmechanics/pathfinding.hpp
+++ b/apps/openmw/mwmechanics/pathfinding.hpp
@@ -101,6 +101,10 @@ namespace MWMechanics
             void buildPathByNavMeshToNextPoint(const MWWorld::ConstPtr& actor, const osg::Vec3f& halfExtents,
                 const DetourNavigator::Flags flags, const DetourNavigator::AreaCosts& areaCosts);
 
+            void buildLimitedPath(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint, const osg::Vec3f& endPoint,
+                const MWWorld::CellStore* cell, const PathgridGraph& pathgridGraph, const osg::Vec3f& halfExtents,
+                const DetourNavigator::Flags flags, const DetourNavigator::AreaCosts& areaCosts);
+
             /// Remove front point if exist and within tolerance
             void update(const osg::Vec3f& position, float pointTolerance, float destinationTolerance,
                         bool shortenIfAlmostStraight, bool canMoveByZ);
diff --git a/components/detournavigator/navigator.hpp b/components/detournavigator/navigator.hpp
index ef61f78c68..d08bfa640f 100644
--- a/components/detournavigator/navigator.hpp
+++ b/components/detournavigator/navigator.hpp
@@ -235,6 +235,8 @@ namespace DetourNavigator
             const osg::Vec3f& end, const Flags includeFlags) const;
 
         virtual RecastMeshTiles getRecastMeshTiles() = 0;
+
+        virtual float getMaxNavmeshAreaRealRadius() const = 0;
     };
 }
 
diff --git a/components/detournavigator/navigatorimpl.cpp b/components/detournavigator/navigatorimpl.cpp
index 142ba590d2..abfb20ba80 100644
--- a/components/detournavigator/navigatorimpl.cpp
+++ b/components/detournavigator/navigatorimpl.cpp
@@ -213,4 +213,10 @@ namespace DetourNavigator
                 ++it;
         }
     }
+
+    float NavigatorImpl::getMaxNavmeshAreaRealRadius() const
+    {
+        const auto& settings = getSettings();
+        return getRealTileSize(settings) * getMaxNavmeshAreaRadius(settings);
+    }
 }
diff --git a/components/detournavigator/navigatorimpl.hpp b/components/detournavigator/navigatorimpl.hpp
index e197c71b78..74fff0dea4 100644
--- a/components/detournavigator/navigatorimpl.hpp
+++ b/components/detournavigator/navigatorimpl.hpp
@@ -60,6 +60,8 @@ namespace DetourNavigator
 
         RecastMeshTiles getRecastMeshTiles() override;
 
+        float getMaxNavmeshAreaRealRadius() const override;
+
     private:
         Settings mSettings;
         NavMeshManager mNavMeshManager;
diff --git a/components/detournavigator/navigatorstub.hpp b/components/detournavigator/navigatorstub.hpp
index f1f9e06ef3..f6892bf1b5 100644
--- a/components/detournavigator/navigatorstub.hpp
+++ b/components/detournavigator/navigatorstub.hpp
@@ -92,6 +92,11 @@ namespace DetourNavigator
             return {};
         }
 
+        float getMaxNavmeshAreaRealRadius() const override
+        {
+            return std::numeric_limits<float>::max();
+        }
+
     private:
         Settings mDefaultSettings {};
         SharedNavMeshCacheItem mEmptyNavMeshCacheItem;
diff --git a/components/detournavigator/settingsutils.hpp b/components/detournavigator/settingsutils.hpp
index 39ffc03d19..8f1c96e286 100644
--- a/components/detournavigator/settingsutils.hpp
+++ b/components/detournavigator/settingsutils.hpp
@@ -1,4 +1,4 @@
-#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_SETTINGSUTILS_H
+#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_SETTINGSUTILS_H
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_SETTINGSUTILS_H
 
 #include "settings.hpp"
@@ -89,6 +89,16 @@ namespace DetourNavigator
             transform.getOrigin() + btVector3(0, 0, getSwimLevel(settings, agentHalfExtentsZ) - agentHalfExtentsZ)
         );
     }
+
+    inline float getRealTileSize(const Settings& settings)
+    {
+        return settings.mTileSize * settings.mCellSize / settings.mRecastScaleFactor;
+    }
+
+    inline float getMaxNavmeshAreaRadius(const Settings& settings)
+    {
+        return std::floor(std::sqrt(settings.mMaxTilesNumber / osg::PI)) - 1;
+    }
 }
 
 #endif

From f32e1790bcdf1b85e655d0a8ae34a45aa463ed4d Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 23 Mar 2021 23:48:11 +0100
Subject: [PATCH 0483/2859] Add half extents to AiEscord max distance

For actors with big bounding box given constants may not work properly like
it's not possible to get close enough to actor from a given angle to make it
move.
---
 apps/openmw/mwmechanics/aiescort.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwmechanics/aiescort.cpp b/apps/openmw/mwmechanics/aiescort.cpp
index 5dc1e44db0..8c5230221c 100644
--- a/apps/openmw/mwmechanics/aiescort.cpp
+++ b/apps/openmw/mwmechanics/aiescort.cpp
@@ -82,14 +82,16 @@ namespace MWMechanics
                 mRemainingDuration = mDuration;
                 return true;
             }
-            mMaxDist = 450;
+            const osg::Vec3f halfExtents = MWBase::Environment::get().getWorld()->getHalfExtents(actor);
+            mMaxDist = std::max(halfExtents.x(), std::max(halfExtents.y(), halfExtents.z())) + 450.0f;
         }
         else
         {
             // Stop moving if the player is too far away
             MWBase::Environment::get().getMechanicsManager()->playAnimationGroup(actor, "idle3", 0, 1);
             actor.getClass().getMovementSettings(actor).mPosition[1] = 0;
-            mMaxDist = 250;
+            const osg::Vec3f halfExtents = MWBase::Environment::get().getWorld()->getHalfExtents(actor);
+            mMaxDist = std::max(halfExtents.x(), std::max(halfExtents.y(), halfExtents.z())) + 250.0f;
         }
 
         return false;

From 453e94ea9fa31a0949b89b52edba4516586fc2ba Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 23 Mar 2021 23:59:45 +0100
Subject: [PATCH 0484/2859] Use half extents for destination distance tolerance
 in AiEscort

For actors moving in water destination may be located at such z coordinate
that they can't reach.
---
 apps/openmw/mwmechanics/aiescort.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwmechanics/aiescort.cpp b/apps/openmw/mwmechanics/aiescort.cpp
index 8c5230221c..75c0461105 100644
--- a/apps/openmw/mwmechanics/aiescort.cpp
+++ b/apps/openmw/mwmechanics/aiescort.cpp
@@ -73,25 +73,25 @@ namespace MWMechanics
         const MWWorld::Ptr follower = MWBase::Environment::get().getWorld()->getPtr(mTargetActorRefId, false);
         const osg::Vec3f leaderPos = actor.getRefData().getPosition().asVec3();
         const osg::Vec3f followerPos = follower.getRefData().getPosition().asVec3();
+        const osg::Vec3f halfExtents = MWBase::Environment::get().getWorld()->getHalfExtents(actor);
+        const float maxHalfExtent = std::max(halfExtents.x(), std::max(halfExtents.y(), halfExtents.z()));
 
         if ((leaderPos - followerPos).length2() <= mMaxDist * mMaxDist)
         {
             const osg::Vec3f dest(mX, mY, mZ);
-            if (pathTo(actor, dest, duration)) //Returns true on path complete
+            if (pathTo(actor, dest, duration, maxHalfExtent)) //Returns true on path complete
             {
                 mRemainingDuration = mDuration;
                 return true;
             }
-            const osg::Vec3f halfExtents = MWBase::Environment::get().getWorld()->getHalfExtents(actor);
-            mMaxDist = std::max(halfExtents.x(), std::max(halfExtents.y(), halfExtents.z())) + 450.0f;
+            mMaxDist = maxHalfExtent + 450.0f;
         }
         else
         {
             // Stop moving if the player is too far away
             MWBase::Environment::get().getMechanicsManager()->playAnimationGroup(actor, "idle3", 0, 1);
             actor.getClass().getMovementSettings(actor).mPosition[1] = 0;
-            const osg::Vec3f halfExtents = MWBase::Environment::get().getWorld()->getHalfExtents(actor);
-            mMaxDist = std::max(halfExtents.x(), std::max(halfExtents.y(), halfExtents.z())) + 250.0f;
+            mMaxDist = maxHalfExtent + 250.0f;
         }
 
         return false;

From e8c2cd15f09bc23bfa6d639bfd59e90ca5302d18 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 24 Mar 2021 00:03:22 +0100
Subject: [PATCH 0485/2859] Add #5914 to the changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c36ce3eba..f8d3a65f68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -113,6 +113,7 @@
     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
     Feature #390: 3rd person look "over the shoulder"
     Feature #832: OpenMW-CS: Handle deleted references
     Feature #1536: Show more information about level on menu

From cf52bee188b1d16e524a17b80dd870a8b94d6d56 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Wed, 24 Mar 2021 16:32:15 +0400
Subject: [PATCH 0486/2859] Fix build with OSG 3.4

---
 components/shader/shadervisitor.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 1af9f94c57..612c9011d2 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -6,6 +6,7 @@
 #include <osg/Material>
 #include <osg/Multisample>
 #include <osg/Texture>
+#include <osg/ValueObject>
 
 #include <osgUtil/TangentSpaceGenerator>
 

From 91bca0cb1fbcf4ed08acb9dfdfedde63a7bdcf06 Mon Sep 17 00:00:00 2001
From: Max <maxhenzerling@gmail.com>
Date: Wed, 24 Mar 2021 13:28:34 -0700
Subject: [PATCH 0487/2859] attempt to fix build issue

---
 CI/before_script.msvc.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index b2b6483ec7..93d995c995 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -849,8 +849,8 @@ fi
 			fi
 
 			# check version
-			pip list | grep 'aqtinstall\s*1.1.3'
-			if [ $? -ne 0 ]; then
+			aqt-venv/${VENV_BIN_DIR}/pip list | grep 'aqtinstall\s*1.1.3' || [[ $? -ne 0 ]]
+			if [[ $? -eq 0 ]]; then
 				echo "  Installing aqt wheel into virtualenv..."
 				run_cmd "aqt-venv/${VENV_BIN_DIR}/pip" install aqtinstall==1.1.3
 			fi

From 72a2e3722ef0d9c273679df8ee4e5d85afa0245b Mon Sep 17 00:00:00 2001
From: Max <maxhenzerling@gmail.com>
Date: Wed, 24 Mar 2021 14:01:40 -0700
Subject: [PATCH 0488/2859] update syntax

---
 CI/before_script.msvc.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 93d995c995..e1afdb059e 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -849,8 +849,8 @@ fi
 			fi
 
 			# check version
-			aqt-venv/${VENV_BIN_DIR}/pip list | grep 'aqtinstall\s*1.1.3' || [[ $? -ne 0 ]]
-			if [[ $? -eq 0 ]]; then
+			aqt-venv/${VENV_BIN_DIR}/pip list | grep 'aqtinstall\s*1.1.3' || [ $? -ne 0 ]
+			if [ $? -eq 0 ]; then
 				echo "  Installing aqt wheel into virtualenv..."
 				run_cmd "aqt-venv/${VENV_BIN_DIR}/pip" install aqtinstall==1.1.3
 			fi

From e56efdd562eb9eefcce5ab536373f219ceb55b64 Mon Sep 17 00:00:00 2001
From: Max <maxhenzerling@gmail.com>
Date: Tue, 23 Mar 2021 15:52:37 -0700
Subject: [PATCH 0489/2859] change aim calculation

---
 apps/openmw/mwworld/worldimp.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 01b90e9078..e5fa7322ce 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -3867,11 +3867,14 @@ namespace MWWorld
         return false;
     }
 
-    osg::Vec3f World::aimToTarget(const ConstPtr &actor, const MWWorld::ConstPtr& target)
+    osg::Vec3f World::aimToTarget(const ConstPtr &actor, const ConstPtr &target)
     {
         osg::Vec3f weaponPos = actor.getRefData().getPosition().asVec3();
-        weaponPos.z() += mPhysics->getHalfExtents(actor).z();
-        osg::Vec3f targetPos = mPhysics->getCollisionObjectPosition(target);
+        osg::Vec3f weaponHalfExtents = mPhysics->getHalfExtents(actor);
+        osg::Vec3f targetPos = target.getRefData().getPosition().asVec3();
+        osg::Vec3f targetHalfExtents = mPhysics->getHalfExtents(target);
+        weaponPos.z() += weaponHalfExtents.z() * 2 * 0.75; // projectilemanager.cpp spawns bolts at 0.75 actor height
+        targetPos.z() += targetHalfExtents.z();
         return (targetPos - weaponPos);
     }
 

From 2cd96e56d5c6f5359f4f2e45d0b5e37572c7fc3e Mon Sep 17 00:00:00 2001
From: Max <maxhenzerling@gmail.com>
Date: Wed, 24 Mar 2021 10:21:37 -0700
Subject: [PATCH 0490/2859] create constant and use constant in other parts of
 the code base

---
 AUTHORS.md                                | 1 +
 CHANGELOG.md                              | 1 +
 apps/openmw/mwmechanics/aicast.cpp        | 6 ++++--
 apps/openmw/mwworld/projectilemanager.cpp | 3 +--
 apps/openmw/mwworld/worldimp.cpp          | 2 +-
 components/misc/constants.hpp             | 3 +++
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index 53efdd286f..b30168fd8f 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -131,6 +131,7 @@ Programmers
     Martin Otto (MAtahualpa)
     Mateusz Kołaczek (PL_kolek)
     Mateusz Malisz (malice)
+    Max Henzerling (SaintMercury)
     megaton
     Michael Hogan (Xethik)
     Michael Mc Donnell
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c36ce3eba..fe53643129 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -88,6 +88,7 @@
     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: Enemy AI incorrectly aims projectiles
     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
diff --git a/apps/openmw/mwmechanics/aicast.cpp b/apps/openmw/mwmechanics/aicast.cpp
index af3aac340e..630c04a6a7 100644
--- a/apps/openmw/mwmechanics/aicast.cpp
+++ b/apps/openmw/mwmechanics/aicast.cpp
@@ -1,5 +1,7 @@
 #include "aicast.hpp"
 
+#include <components/misc/constants.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/world.hpp"
@@ -54,12 +56,12 @@ bool MWMechanics::AiCast::execute(const MWWorld::Ptr& actor, MWMechanics::Charac
     if (target != actor && target.getClass().isActor())
     {
         osg::Vec3f halfExtents = MWBase::Environment::get().getWorld()->getHalfExtents(target);
-        targetPos.z() += halfExtents.z() * 2 * 0.75f;
+        targetPos.z() += halfExtents.z() * 2 * Constants::TorsoHeight;
     }
 
     osg::Vec3f actorPos = actor.getRefData().getPosition().asVec3();
     osg::Vec3f halfExtents = MWBase::Environment::get().getWorld()->getHalfExtents(actor);
-    actorPos.z() += halfExtents.z() * 2 * 0.75f;
+    actorPos.z() += halfExtents.z() * 2 * Constants::TorsoHeight;
 
     osg::Vec3f dir = targetPos - actorPos;
 
diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index f483905ddf..b463fc09ed 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -265,9 +265,8 @@ namespace MWWorld
         osg::Vec3f pos = caster.getRefData().getPosition().asVec3();
         if (caster.getClass().isActor())
         {
-            // Spawn at 0.75 * ActorHeight
             // Note: we ignore the collision box offset, this is required to make some flying creatures work as intended.
-            pos.z() += mPhysics->getRenderingHalfExtents(caster).z() * 2 * 0.75;
+            pos.z() += mPhysics->getRenderingHalfExtents(caster).z() * 2 * Constants::TorsoHeight;
         }
 
         if (MWBase::Environment::get().getWorld()->isUnderwater(caster.getCell(), pos)) // Underwater casting not possible
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index e5fa7322ce..b37d326f07 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -3873,7 +3873,7 @@ namespace MWWorld
         osg::Vec3f weaponHalfExtents = mPhysics->getHalfExtents(actor);
         osg::Vec3f targetPos = target.getRefData().getPosition().asVec3();
         osg::Vec3f targetHalfExtents = mPhysics->getHalfExtents(target);
-        weaponPos.z() += weaponHalfExtents.z() * 2 * 0.75; // projectilemanager.cpp spawns bolts at 0.75 actor height
+        weaponPos.z() += weaponHalfExtents.z() * 2 * Constants::TorsoHeight;
         targetPos.z() += targetHalfExtents.z();
         return (targetPos - weaponPos);
     }
diff --git a/components/misc/constants.hpp b/components/misc/constants.hpp
index 1053b1c560..bfd3933fc7 100644
--- a/components/misc/constants.hpp
+++ b/components/misc/constants.hpp
@@ -33,6 +33,9 @@ const std::string NightDayLabel = "NightDaySwitch";
 // A label to mark visual switches for herbalism feature
 const std::string HerbalismLabel = "HerbalismSwitch";
 
+// Percentage height at which projectiles are spawned from an actor
+const float TorsoHeight = 0.75f;
+
 }
 
 #endif

From dc09616e59a2b81f6fa9d44708f47cbf09757def Mon Sep 17 00:00:00 2001
From: Max <maxhenzerling@gmail.com>
Date: Wed, 24 Mar 2021 11:15:09 -0700
Subject: [PATCH 0491/2859] change bugfix name to be same as ticket name

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe53643129..d0217d835e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -88,7 +88,7 @@
     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: Enemy AI incorrectly aims projectiles
+    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

From b9a40bc5fced081d08e9ffcec4ffaa3e8e553957 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 25 Mar 2021 00:59:44 +0100
Subject: [PATCH 0492/2859] Add NavMeshTilesCache benchmarks

---
 CMakeLists.txt                                |   5 +
 apps/benchmarks/CMakeLists.txt                |  34 +++
 .../detournavigator/navmeshtilescache.cpp     | 215 ++++++++++++++++++
 components/detournavigator/chunkytrimesh.hpp  |   3 +
 .../detournavigator/navmeshtilescache.cpp     |  32 +--
 .../detournavigator/navmeshtilescache.hpp     |  11 +
 6 files changed, 284 insertions(+), 16 deletions(-)
 create mode 100644 apps/benchmarks/CMakeLists.txt
 create mode 100644 apps/benchmarks/detournavigator/navmeshtilescache.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 08bdbce8ae..7e138b1f29 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,6 +34,7 @@ option(BUILD_NIFTEST            "Build nif file tester" ON)
 option(BUILD_DOCS               "Build documentation." OFF )
 option(BUILD_WITH_CODE_COVERAGE "Enable code coverage with gconv" OFF)
 option(BUILD_UNITTESTS          "Enable Unittests with Google C++ Unittest" OFF)
+option(BUILD_BENCHMARKS         "Build benchmarks with Google Benchmark" OFF)
 option(BULLET_USE_DOUBLES       "Use double precision for Bullet" ON)
 
 set(OpenGL_GL_PREFERENCE LEGACY)  # Use LEGACY as we use GL2; GLNVD is for GL3 and up.
@@ -549,6 +550,10 @@ if (BUILD_UNITTESTS)
   add_subdirectory( apps/openmw_test_suite )
 endif()
 
+if (BUILD_BENCHMARKS)
+  add_subdirectory(apps/benchmarks)
+endif()
+
 if (WIN32)
   if (MSVC)
     if (OPENMW_MP_BUILD)
diff --git a/apps/benchmarks/CMakeLists.txt b/apps/benchmarks/CMakeLists.txt
new file mode 100644
index 0000000000..b7170003ee
--- /dev/null
+++ b/apps/benchmarks/CMakeLists.txt
@@ -0,0 +1,34 @@
+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_options(openmw_detournavigator_navmeshtilescache_benchmark PRIVATE -Wall)
+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()
+
+if (MSVC)
+    if (CMAKE_CL_64)
+        set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /bigobj")
+    endif (CMAKE_CL_64)
+endif (MSVC)
diff --git a/apps/benchmarks/detournavigator/navmeshtilescache.cpp b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
new file mode 100644
index 0000000000..10aa0672a7
--- /dev/null
+++ b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
@@ -0,0 +1,215 @@
+#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);
+        const std::size_t trianglesPerChunk = 256;
+        RecastMesh recastMesh(generation, revision, std::move(indices), std::move(vertices),
+                              std::move(areaTypes), std::move(water), trianglesPerChunk);
+        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();
diff --git a/components/detournavigator/chunkytrimesh.hpp b/components/detournavigator/chunkytrimesh.hpp
index 9f6275ec87..7f98f5d22a 100644
--- a/components/detournavigator/chunkytrimesh.hpp
+++ b/components/detournavigator/chunkytrimesh.hpp
@@ -46,6 +46,9 @@ namespace DetourNavigator
         ChunkyTriMesh(const std::vector<float>& verts, const std::vector<int>& tris,
                       const std::vector<AreaType>& flags, const std::size_t trisPerChunk);
 
+        ChunkyTriMesh(ChunkyTriMesh&&) = default;
+        ChunkyTriMesh& operator=(ChunkyTriMesh&&) = default;
+
         ChunkyTriMesh(const ChunkyTriMesh&) = delete;
         ChunkyTriMesh& operator=(const ChunkyTriMesh&) = delete;
 
diff --git a/components/detournavigator/navmeshtilescache.cpp b/components/detournavigator/navmeshtilescache.cpp
index b6048da589..608ade4ab7 100644
--- a/components/detournavigator/navmeshtilescache.cpp
+++ b/components/detournavigator/navmeshtilescache.cpp
@@ -88,27 +88,27 @@ namespace DetourNavigator
         return Value(*this, iterator);
     }
 
-    void NavMeshTilesCache::reportStats(unsigned int frameNumber, osg::Stats& stats) const
+    NavMeshTilesCache::Stats NavMeshTilesCache::getStats() const
     {
-        std::size_t navMeshCacheSize = 0;
-        std::size_t usedNavMeshTiles = 0;
-        std::size_t cachedNavMeshTiles = 0;
-        std::size_t hitCount = 0;
-        std::size_t getCount = 0;
-
+        Stats result;
         {
             const std::lock_guard<std::mutex> lock(mMutex);
-            navMeshCacheSize = mUsedNavMeshDataSize;
-            usedNavMeshTiles = mBusyItems.size();
-            cachedNavMeshTiles = mFreeItems.size();
-            hitCount = mHitCount;
-            getCount = mGetCount;
+            result.mNavMeshCacheSize = mUsedNavMeshDataSize;
+            result.mUsedNavMeshTiles = mBusyItems.size();
+            result.mCachedNavMeshTiles = mFreeItems.size();
+            result.mHitCount = mHitCount;
+            result.mGetCount = mGetCount;
         }
+        return result;
+    }
 
-        stats.setAttribute(frameNumber, "NavMesh CacheSize", navMeshCacheSize);
-        stats.setAttribute(frameNumber, "NavMesh UsedTiles", usedNavMeshTiles);
-        stats.setAttribute(frameNumber, "NavMesh CachedTiles", cachedNavMeshTiles);
-        stats.setAttribute(frameNumber, "NavMesh CacheHitRate", static_cast<double>(hitCount) / getCount * 100.0);
+    void NavMeshTilesCache::reportStats(unsigned int frameNumber, osg::Stats& out) const
+    {
+        const Stats stats = getStats();
+        out.setAttribute(frameNumber, "NavMesh CacheSize", stats.mNavMeshCacheSize);
+        out.setAttribute(frameNumber, "NavMesh UsedTiles", stats.mUsedNavMeshTiles);
+        out.setAttribute(frameNumber, "NavMesh CachedTiles", stats.mCachedNavMeshTiles);
+        out.setAttribute(frameNumber, "NavMesh CacheHitRate", static_cast<double>(stats.mHitCount) / stats.mGetCount * 100.0);
     }
 
     void NavMeshTilesCache::removeLeastRecentlyUsed()
diff --git a/components/detournavigator/navmeshtilescache.hpp b/components/detournavigator/navmeshtilescache.hpp
index 25f4dc1878..d994bbab43 100644
--- a/components/detournavigator/navmeshtilescache.hpp
+++ b/components/detournavigator/navmeshtilescache.hpp
@@ -188,6 +188,15 @@ namespace DetourNavigator
             ItemIterator mIterator;
         };
 
+        struct Stats
+        {
+            std::size_t mNavMeshCacheSize;
+            std::size_t mUsedNavMeshTiles;
+            std::size_t mCachedNavMeshTiles;
+            std::size_t mHitCount;
+            std::size_t mGetCount;
+        };
+
         NavMeshTilesCache(const std::size_t maxNavMeshDataSize);
 
         Value get(const osg::Vec3f& agentHalfExtents, const TilePosition& changedTile,
@@ -197,6 +206,8 @@ namespace DetourNavigator
             const RecastMesh& recastMesh, const std::vector<OffMeshConnection>& offMeshConnections,
             NavMeshData&& value);
 
+        Stats getStats() const;
+
         void reportStats(unsigned int frameNumber, osg::Stats& stats) const;
 
     private:

From 05d6f6ac25e69e622f91aaa6bedb934aba8d0591 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 5 Mar 2021 01:56:44 +0100
Subject: [PATCH 0493/2859] Use single map for navmesh cache

---
 .../detournavigator/navmeshtilescache.cpp     | 37 +++----------------
 .../detournavigator/navmeshtilescache.hpp     | 15 +++++---
 2 files changed, 15 insertions(+), 37 deletions(-)

diff --git a/components/detournavigator/navmeshtilescache.cpp b/components/detournavigator/navmeshtilescache.cpp
index 608ade4ab7..6434fb2637 100644
--- a/components/detournavigator/navmeshtilescache.cpp
+++ b/components/detournavigator/navmeshtilescache.cpp
@@ -32,16 +32,8 @@ namespace DetourNavigator
 
         ++mGetCount;
 
-        const auto agentValues = mValues.find(agentHalfExtents);
-        if (agentValues == mValues.end())
-            return Value();
-
-        const auto tileValues = agentValues->second.find(changedTile);
-        if (tileValues == agentValues->second.end())
-            return Value();
-
-        const auto tile = tileValues->second.mMap.find(NavMeshKeyView(recastMesh, offMeshConnections));
-        if (tile == tileValues->second.mMap.end())
+        const auto tile = mValues.find(std::make_tuple(agentHalfExtents, changedTile, NavMeshKeyView(recastMesh, offMeshConnections)));
+        if (tile == mValues.end())
             return Value();
 
         acquireItemUnsafe(tile->second);
@@ -71,7 +63,7 @@ namespace DetourNavigator
         };
 
         const auto iterator = mFreeItems.emplace(mFreeItems.end(), agentHalfExtents, changedTile, std::move(navMeshKey), itemSize);
-        const auto emplaced = mValues[agentHalfExtents][changedTile].mMap.emplace(iterator->mNavMeshKey, iterator);
+        const auto emplaced = mValues.emplace(std::make_tuple(agentHalfExtents, changedTile, NavMeshKeyRef(iterator->mNavMeshKey)), iterator);
 
         if (!emplaced.second)
         {
@@ -115,32 +107,15 @@ namespace DetourNavigator
     {
         const auto& item = mFreeItems.back();
 
-        const auto agentValues = mValues.find(item.mAgentHalfExtents);
-        if (agentValues == mValues.end())
-            return;
-
-        const auto tileValues = agentValues->second.find(item.mChangedTile);
-        if (tileValues == agentValues->second.end())
-            return;
-
-        const auto value = tileValues->second.mMap.find(item.mNavMeshKey);
-        if (value == tileValues->second.mMap.end())
+        const auto value = mValues.find(std::make_tuple(item.mAgentHalfExtents, item.mChangedTile, NavMeshKeyRef(item.mNavMeshKey)));
+        if (value == mValues.end())
             return;
 
         mUsedNavMeshDataSize -= item.mSize;
         mFreeNavMeshDataSize -= item.mSize;
 
-        tileValues->second.mMap.erase(value);
+        mValues.erase(value);
         mFreeItems.pop_back();
-
-        if (!tileValues->second.mMap.empty())
-            return;
-
-        agentValues->second.erase(tileValues);
-        if (!agentValues->second.empty())
-            return;
-
-        mValues.erase(agentValues);
     }
 
     void NavMeshTilesCache::acquireItemUnsafe(ItemIterator iterator)
diff --git a/components/detournavigator/navmeshtilescache.hpp b/components/detournavigator/navmeshtilescache.hpp
index d994bbab43..afa53beba0 100644
--- a/components/detournavigator/navmeshtilescache.hpp
+++ b/components/detournavigator/navmeshtilescache.hpp
@@ -110,6 +110,14 @@ namespace DetourNavigator
         return lhs < rhs.mRef.get();
     }
 
+    template <class L, class R>
+    inline bool operator <(const std::tuple<osg::Vec3f, TilePosition, L>& lhs, const std::tuple<osg::Vec3f, TilePosition, R>& rhs)
+    {
+        const auto left = std::tie(std::get<0>(lhs), std::get<1>(lhs));
+        const auto right = std::tie(std::get<0>(rhs), std::get<1>(rhs));
+        return std::tie(left, std::get<2>(lhs)) < std::tie(right, std::get<2>(rhs));
+    }
+
     class NavMeshTilesCache
     {
     public:
@@ -211,11 +219,6 @@ namespace DetourNavigator
         void reportStats(unsigned int frameNumber, osg::Stats& stats) const;
 
     private:
-        struct TileMap
-        {
-            std::map<NavMeshKeyRef, ItemIterator, std::less<>> mMap;
-        };
-
         mutable std::mutex mMutex;
         std::size_t mMaxNavMeshDataSize;
         std::size_t mUsedNavMeshDataSize;
@@ -224,7 +227,7 @@ namespace DetourNavigator
         std::size_t mGetCount;
         std::list<Item> mBusyItems;
         std::list<Item> mFreeItems;
-        std::map<osg::Vec3f, std::map<TilePosition, TileMap>> mValues;
+        std::map<std::tuple<osg::Vec3f, TilePosition, NavMeshKeyRef>, ItemIterator, std::less<>> mValues;
 
         void removeLeastRecentlyUsed();
 

From f2ebad511585acc3709bf78bf218b2451461fa2b Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 6 Mar 2021 01:49:15 +0100
Subject: [PATCH 0494/2859] Return cached element when set existing

---
 .../detournavigator/navmeshtilescache.cpp           |  9 ++++-----
 components/detournavigator/makenavmesh.cpp          | 13 ++-----------
 components/detournavigator/navmeshtilescache.cpp    |  6 ++++--
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
index 5bc7af6467..5d4b1602f8 100644
--- a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
+++ b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
@@ -77,7 +77,7 @@ namespace
         EXPECT_EQ(result.get(), (NavMeshDataRef {mData, 1}));
     }
 
-    TEST_F(DetourNavigatorNavMeshTilesCacheTest, set_existing_element_should_throw_exception)
+    TEST_F(DetourNavigatorNavMeshTilesCacheTest, set_existing_element_should_return_cached_element)
     {
         const std::size_t navMeshDataSize = 1;
         const std::size_t navMeshKeySize = cRecastMeshKeySize;
@@ -87,10 +87,9 @@ namespace
         NavMeshData anotherNavMeshData {anotherData, 1};
 
         cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections, std::move(mNavMeshData));
-        EXPECT_THROW(
-            cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections, std::move(anotherNavMeshData)),
-            InvalidArgument
-        );
+        const auto result = cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections, std::move(anotherNavMeshData));
+        ASSERT_TRUE(result);
+        EXPECT_EQ(result.get(), (NavMeshDataRef {mData, 1}));
     }
 
     TEST_F(DetourNavigatorNavMeshTilesCacheTest, get_should_return_cached_value)
diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index 7c7dcf1864..9701b49506 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -576,17 +576,8 @@ namespace DetourNavigator
                 return navMeshCacheItem->lock()->removeTile(changedTile);
             }
 
-            try
-            {
-                cachedNavMeshData = navMeshTilesCache.set(agentHalfExtents, changedTile, *recastMesh,
-                                                          offMeshConnections, std::move(navMeshData));
-            }
-            catch (const InvalidArgument&)
-            {
-                cachedNavMeshData = navMeshTilesCache.get(agentHalfExtents, changedTile, *recastMesh,
-                                                          offMeshConnections);
-                cached = static_cast<bool>(cachedNavMeshData);
-            }
+            cachedNavMeshData = navMeshTilesCache.set(agentHalfExtents, changedTile, *recastMesh,
+                                                      offMeshConnections, std::move(navMeshData));
 
             if (!cachedNavMeshData)
             {
diff --git a/components/detournavigator/navmeshtilescache.cpp b/components/detournavigator/navmeshtilescache.cpp
index 6434fb2637..8dc554d796 100644
--- a/components/detournavigator/navmeshtilescache.cpp
+++ b/components/detournavigator/navmeshtilescache.cpp
@@ -1,5 +1,4 @@
 #include "navmeshtilescache.hpp"
-#include "exceptions.hpp"
 
 #include <osg/Stats>
 
@@ -68,7 +67,10 @@ namespace DetourNavigator
         if (!emplaced.second)
         {
             mFreeItems.erase(iterator);
-            throw InvalidArgument("Set existing cache value");
+            acquireItemUnsafe(emplaced.first->second);
+            ++mGetCount;
+            ++mHitCount;
+            return Value(*this, emplaced.first->second);
         }
 
         iterator->mNavMeshData = std::move(value);

From 0c6d72b2d186650d19b09159b10b78cdcdf89431 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 6 Mar 2021 01:50:58 +0100
Subject: [PATCH 0495/2859] Consider first set element as first acquired

---
 components/detournavigator/navmeshtilescache.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/components/detournavigator/navmeshtilescache.cpp b/components/detournavigator/navmeshtilescache.cpp
index 8dc554d796..ccc41a666d 100644
--- a/components/detournavigator/navmeshtilescache.cpp
+++ b/components/detournavigator/navmeshtilescache.cpp
@@ -74,10 +74,9 @@ namespace DetourNavigator
         }
 
         iterator->mNavMeshData = std::move(value);
+        ++iterator->mUseCount;
         mUsedNavMeshDataSize += itemSize;
-        mFreeNavMeshDataSize += itemSize;
-
-        acquireItemUnsafe(iterator);
+        mBusyItems.splice(mBusyItems.end(), mFreeItems, iterator);
 
         return Value(*this, iterator);
     }

From ccd3cbc69abf40ab4ddfac4ae9a7e6fa79666fe0 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Fri, 26 Mar 2021 23:36:12 +0100
Subject: [PATCH 0496/2859] Use saved actor position instead of reading again
 RefData in unstuck. It is a race condition to do so.

---
 apps/openmw/mwphysics/movementsolver.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/openmw/mwphysics/movementsolver.cpp b/apps/openmw/mwphysics/movementsolver.cpp
index a393ec5784..1c04ee65a5 100644
--- a/apps/openmw/mwphysics/movementsolver.cpp
+++ b/apps/openmw/mwphysics/movementsolver.cpp
@@ -459,8 +459,7 @@ namespace MWPhysics
         const auto verticalHalfExtent = osg::Vec3f(0.0, 0.0, physicActor->getHalfExtents().z());
 
         // use a 3d approximation of the movement vector to better judge player intent
-        const ESM::Position& refpos = ptr.getRefData().getPosition();
-        auto velocity = (osg::Quat(refpos.rot[0], osg::Vec3f(-1, 0, 0)) * osg::Quat(refpos.rot[2], osg::Vec3f(0, 0, -1))) * actor.mMovement;
+        auto velocity = (osg::Quat(actor.mRefpos.rot[0], osg::Vec3f(-1, 0, 0)) * osg::Quat(actor.mRefpos.rot[2], osg::Vec3f(0, 0, -1))) * actor.mMovement;
         // try to pop outside of the world before doing anything else if we're inside of it
         if (!physicActor->getOnGround() || physicActor->getOnSlope())
                 velocity += physicActor->getInertialForce();

From dbd6e3bfee7b58d5d527a87c4b31d3ecf0a52658 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Fri, 26 Mar 2021 23:43:49 +0100
Subject: [PATCH 0497/2859] Replace pointless usage of shared_ptr by unique_ptr
 / non-owning raw pointer for btCollisionWorld.

---
 apps/openmw/mwphysics/mtphysics.cpp     | 14 +++++++-------
 apps/openmw/mwphysics/mtphysics.hpp     |  4 ++--
 apps/openmw/mwphysics/physicssystem.cpp |  4 ++--
 apps/openmw/mwphysics/physicssystem.hpp |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 11eb7f909c..209c5aa653 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -137,11 +137,11 @@ namespace
 
 namespace MWPhysics
 {
-    PhysicsTaskScheduler::PhysicsTaskScheduler(float physicsDt, std::shared_ptr<btCollisionWorld> collisionWorld)
+    PhysicsTaskScheduler::PhysicsTaskScheduler(float physicsDt, btCollisionWorld *collisionWorld)
           : mDefaultPhysicsDt(physicsDt)
           , mPhysicsDt(physicsDt)
           , mTimeAccum(0.f)
-          , mCollisionWorld(std::move(collisionWorld))
+          , mCollisionWorld(collisionWorld)
           , mNumJobs(0)
           , mRemainingSteps(0)
           , mLOSCacheExpiry(Settings::Manager::getInt("lineofsight keep inactive cache", "Physics"))
@@ -185,7 +185,7 @@ namespace MWPhysics
                 if (data.mActor.lock())
                 {
                     std::unique_lock lock(mCollisionWorldMutex);
-                    MovementSolver::unstuck(data, mCollisionWorld.get());
+                    MovementSolver::unstuck(data, mCollisionWorld);
                 }
             });
 
@@ -381,7 +381,7 @@ namespace MWPhysics
     void PhysicsTaskScheduler::contactTest(btCollisionObject* colObj, btCollisionWorld::ContactResultCallback& resultCallback)
     {
         std::shared_lock lock(mCollisionWorldMutex);
-        ContactTestWrapper::contactTest(mCollisionWorld.get(), colObj, resultCallback);
+        ContactTestWrapper::contactTest(mCollisionWorld, colObj, resultCallback);
     }
 
     std::optional<btVector3> PhysicsTaskScheduler::getHitPoint(const btTransform& from, btCollisionObject* target)
@@ -532,7 +532,7 @@ namespace MWPhysics
                 if(const auto actor = mActorsFrameData[job].mActor.lock())
                 {
                     MaybeSharedLock lockColWorld(mCollisionWorldMutex, mThreadSafeBullet);
-                    MovementSolver::move(mActorsFrameData[job], mPhysicsDt, mCollisionWorld.get(), *mWorldFrameData);
+                    MovementSolver::move(mActorsFrameData[job], mPhysicsDt, mCollisionWorld, *mWorldFrameData);
                 }
             }
 
@@ -594,8 +594,8 @@ namespace MWPhysics
         {
             for (auto& actorData : mActorsFrameData)
             {
-                MovementSolver::unstuck(actorData, mCollisionWorld.get());
-                MovementSolver::move(actorData, mPhysicsDt, mCollisionWorld.get(), *mWorldFrameData);
+                MovementSolver::unstuck(actorData, mCollisionWorld);
+                MovementSolver::move(actorData, mPhysicsDt, mCollisionWorld, *mWorldFrameData);
             }
 
             updateActorsPositions();
diff --git a/apps/openmw/mwphysics/mtphysics.hpp b/apps/openmw/mwphysics/mtphysics.hpp
index 137755c21e..22cab3241d 100644
--- a/apps/openmw/mwphysics/mtphysics.hpp
+++ b/apps/openmw/mwphysics/mtphysics.hpp
@@ -25,7 +25,7 @@ namespace MWPhysics
     class PhysicsTaskScheduler
     {
         public:
-            PhysicsTaskScheduler(float physicsDt, std::shared_ptr<btCollisionWorld> collisionWorld);
+            PhysicsTaskScheduler(float physicsDt, btCollisionWorld* collisionWorld);
             ~PhysicsTaskScheduler();
 
             /// @brief move actors taking into account desired movements and collisions
@@ -67,7 +67,7 @@ namespace MWPhysics
             float mDefaultPhysicsDt;
             float mPhysicsDt;
             float mTimeAccum;
-            std::shared_ptr<btCollisionWorld> mCollisionWorld;
+            btCollisionWorld* mCollisionWorld;
             std::vector<LOSRequest> mLOSCache;
             std::set<std::weak_ptr<PtrHolder>, std::owner_less<std::weak_ptr<PtrHolder>>> mUpdateAabb;
 
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 65ed13f802..f93ffe76d8 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -79,7 +79,7 @@ namespace MWPhysics
         mDispatcher = std::make_unique<btCollisionDispatcher>(mCollisionConfiguration.get());
         mBroadphase = std::make_unique<btDbvtBroadphase>();
 
-        mCollisionWorld = std::make_shared<btCollisionWorld>(mDispatcher.get(), mBroadphase.get(), mCollisionConfiguration.get());
+        mCollisionWorld = std::make_unique<btCollisionWorld>(mDispatcher.get(), mBroadphase.get(), mCollisionConfiguration.get());
 
         // Don't update AABBs of all objects every frame. Most objects in MW are static, so we don't need this.
         // Should a "static" object ever be moved, we have to update its AABB manually using DynamicsWorld::updateSingleAabb.
@@ -97,7 +97,7 @@ namespace MWPhysics
             }
         }
 
-        mTaskScheduler = std::make_unique<PhysicsTaskScheduler>(mPhysicsDt, mCollisionWorld);
+        mTaskScheduler = std::make_unique<PhysicsTaskScheduler>(mPhysicsDt, mCollisionWorld.get());
         mDebugDrawer = std::make_unique<MWRender::DebugDrawer>(mParentNode, mCollisionWorld.get(), mDebugDrawEnabled);
     }
 
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 3548239867..5ccbf1a380 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -259,7 +259,7 @@ namespace MWPhysics
             std::unique_ptr<btBroadphaseInterface> mBroadphase;
             std::unique_ptr<btDefaultCollisionConfiguration> mCollisionConfiguration;
             std::unique_ptr<btCollisionDispatcher> mDispatcher;
-            std::shared_ptr<btCollisionWorld> mCollisionWorld;
+            std::unique_ptr<btCollisionWorld> mCollisionWorld;
             std::unique_ptr<PhysicsTaskScheduler> mTaskScheduler;
 
             std::unique_ptr<Resource::BulletShapeManager> mShapeManager;

From b58244ac26f3fa970863c2fc713de3368cba3e7f Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Fri, 26 Mar 2021 23:45:56 +0100
Subject: [PATCH 0498/2859] Guard the Bullet drawing method with a read lock on
 the btCollisionWorld. It closes a race on the collision shapes coordinates.

---
 apps/openmw/mwphysics/mtphysics.cpp     | 10 +++++++++-
 apps/openmw/mwphysics/mtphysics.hpp     |  9 ++++++++-
 apps/openmw/mwphysics/physicssystem.cpp |  4 ++--
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 209c5aa653..4be8b2396f 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -9,6 +9,7 @@
 #include "components/settings/settings.hpp"
 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/movement.hpp"
+#include "../mwrender/bulletdebugdraw.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/player.hpp"
 
@@ -137,11 +138,12 @@ namespace
 
 namespace MWPhysics
 {
-    PhysicsTaskScheduler::PhysicsTaskScheduler(float physicsDt, btCollisionWorld *collisionWorld)
+    PhysicsTaskScheduler::PhysicsTaskScheduler(float physicsDt, btCollisionWorld *collisionWorld, MWRender::DebugDrawer* debugDrawer)
           : mDefaultPhysicsDt(physicsDt)
           , mPhysicsDt(physicsDt)
           , mTimeAccum(0.f)
           , mCollisionWorld(collisionWorld)
+          , mDebugDrawer(debugDrawer)
           , mNumJobs(0)
           , mRemainingSteps(0)
           , mLOSCacheExpiry(Settings::Manager::getInt("lineofsight keep inactive cache", "Physics"))
@@ -626,4 +628,10 @@ namespace MWPhysics
         mTimeBegin = mTimer->tick();
         mFrameNumber = frameNumber;
     }
+
+    void PhysicsTaskScheduler::debugDraw()
+    {
+        std::shared_lock lock(mCollisionWorldMutex);
+        mDebugDrawer->step();
+    }
 }
diff --git a/apps/openmw/mwphysics/mtphysics.hpp b/apps/openmw/mwphysics/mtphysics.hpp
index 22cab3241d..6d2c392c09 100644
--- a/apps/openmw/mwphysics/mtphysics.hpp
+++ b/apps/openmw/mwphysics/mtphysics.hpp
@@ -20,12 +20,17 @@ namespace Misc
     class Barrier;
 }
 
+namespace MWRender
+{
+    class DebugDrawer;
+}
+
 namespace MWPhysics
 {
     class PhysicsTaskScheduler
     {
         public:
-            PhysicsTaskScheduler(float physicsDt, btCollisionWorld* collisionWorld);
+            PhysicsTaskScheduler(float physicsDt, btCollisionWorld* collisionWorld, MWRender::DebugDrawer* debugDrawer);
             ~PhysicsTaskScheduler();
 
             /// @brief move actors taking into account desired movements and collisions
@@ -49,6 +54,7 @@ namespace MWPhysics
             void removeCollisionObject(btCollisionObject* collisionObject);
             void updateSingleAabb(std::weak_ptr<PtrHolder> ptr, bool immediate=false);
             bool getLineOfSight(const std::weak_ptr<Actor>& actor1, const std::weak_ptr<Actor>& actor2);
+            void debugDraw();
 
         private:
             void syncComputation();
@@ -68,6 +74,7 @@ namespace MWPhysics
             float mPhysicsDt;
             float mTimeAccum;
             btCollisionWorld* mCollisionWorld;
+            MWRender::DebugDrawer* mDebugDrawer;
             std::vector<LOSRequest> mLOSCache;
             std::set<std::weak_ptr<PtrHolder>, std::owner_less<std::weak_ptr<PtrHolder>>> mUpdateAabb;
 
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index f93ffe76d8..ac8dd92f86 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -97,8 +97,8 @@ namespace MWPhysics
             }
         }
 
-        mTaskScheduler = std::make_unique<PhysicsTaskScheduler>(mPhysicsDt, mCollisionWorld.get());
         mDebugDrawer = std::make_unique<MWRender::DebugDrawer>(mParentNode, mCollisionWorld.get(), mDebugDrawEnabled);
+        mTaskScheduler = std::make_unique<PhysicsTaskScheduler>(mPhysicsDt, mCollisionWorld.get(), mDebugDrawer.get());
     }
 
     PhysicsSystem::~PhysicsSystem()
@@ -827,7 +827,7 @@ namespace MWPhysics
     void PhysicsSystem::debugDraw()
     {
         if (mDebugDrawEnabled)
-            mDebugDrawer->step();
+            mTaskScheduler->debugDraw();
     }
 
     bool PhysicsSystem::isActorStandingOn(const MWWorld::Ptr &actor, const MWWorld::ConstPtr &object) const

From 7a67492d81858e53224703d4267dd612e43ae2c8 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sun, 28 Mar 2021 21:19:14 +0200
Subject: [PATCH 0499/2859] Unbreak SetPos and the mods using it.

To make SetPos works with async physics, it was modified to register a
position offset that would be applied to the real position during the
simulation.

A common pattern to teleport NPC in scripts is a sequence of SetPos/Disable/Enable in the same frame.
Since Disable/Enable creates a new physics actor using last known
RefData::Position, the registered offset never get a chance to be applied.

Modify disable() to call moveObject with the offset applied, so that the newly created physics actor will have up-to-date position
---
 apps/openmw/mwphysics/actor.cpp  |  8 +++++---
 apps/openmw/mwworld/worldimp.cpp | 13 +++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index 905034cde5..bf7503e72f 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -123,6 +123,7 @@ void Actor::updatePosition()
     mSimulationPosition = mWorldPosition;
     mStandingOnPtr = nullptr;
     mSkipSimulation = true;
+    mPositionOffset = osg::Vec3f();
 }
 
 void Actor::updateWorldPosition()
@@ -179,9 +180,9 @@ bool Actor::setPosition(const osg::Vec3f& position)
     if (mSkipSimulation)
         return false;
     bool hasChanged = mPosition != position || mPositionOffset.length() != 0 || mWorldPositionChanged;
-    mPreviousPosition = mPosition + mPositionOffset;
-    mPosition = position + mPositionOffset;
-    mPositionOffset = osg::Vec3f();
+    applyOffsetChange();
+    mPreviousPosition = mPosition;
+    mPosition = position;
     return hasChanged;
 }
 
@@ -198,6 +199,7 @@ void Actor::applyOffsetChange()
     mWorldPosition += mPositionOffset;
     mPosition += mPositionOffset;
     mPreviousPosition += mPositionOffset;
+    mSimulationPosition += mPositionOffset;
     mPositionOffset = osg::Vec3f();
     mWorldPositionChanged = true;
 }
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index d6a4de71bd..5e0cdbb2b6 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -862,6 +862,19 @@ namespace MWWorld
         if (reference == getPlayerPtr())
             throw std::runtime_error("can not disable player object");
 
+        // A common pattern to teleport NPC in scripts is a sequence of SetPos/Disable/Enable
+        // Disable/Enable create a new physics actor, and so the SetPos call is lost
+        // Call moveObject so that the newly created physics actor will have up-to-date position
+        if (reference.getClass().isActor())
+        {
+            auto* physactor = mPhysics->getActor(reference);
+            if (physactor)
+            {
+                physactor->applyOffsetChange();
+                const auto position = physactor->getSimulationPosition();
+                moveObject(reference, position.x(), position.y(), position.z(), true);
+            }
+        }
         reference.getRefData().disable();
 
         if (reference.getCellRef().getRefNum().hasContentFile())

From 50352daf90ab5ba44bf6aab3368403604ddb4329 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 29 Mar 2021 14:45:07 +0400
Subject: [PATCH 0500/2859] Rework knockdown and knockout animations fallbacks

---
 apps/openmw/mwmechanics/character.cpp | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 99f8632f3a..8c58fd943f 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -211,38 +211,48 @@ void CharacterController::refreshHitRecoilAnims(CharacterState& idle)
     if(mHitState == CharState_None)
     {
         if ((mPtr.getClass().getCreatureStats(mPtr).getFatigue().getCurrent() < 0
-                || mPtr.getClass().getCreatureStats(mPtr).getFatigue().getBase() == 0)
-                && mAnimation->hasAnimation("knockout"))
+                || mPtr.getClass().getCreatureStats(mPtr).getFatigue().getBase() == 0))
         {
             mTimeUntilWake = Misc::Rng::rollClosedProbability() * 2 + 1; // Wake up after 1 to 3 seconds
             if (isSwimming && mAnimation->hasAnimation("swimknockout"))
             {
                 mHitState = CharState_SwimKnockOut;
                 mCurrentHit = "swimknockout";
+                mAnimation->play(mCurrentHit, Priority_Knockdown, MWRender::Animation::BlendMask_All, false, 1, "start", "stop", 0.0f, ~0ul);
             }
-            else
+            else if (!isSwimming && mAnimation->hasAnimation("knockout"))
             {
                 mHitState = CharState_KnockOut;
                 mCurrentHit = "knockout";
+                mAnimation->play(mCurrentHit, Priority_Knockdown, MWRender::Animation::BlendMask_All, false, 1, "start", "stop", 0.0f, ~0ul);
+            }
+            else
+            {
+                // Knockout animations are missing. Fall back to idle animation, so target actor still can be killed via HtH.
+                mCurrentHit.erase();
             }
 
-            mAnimation->play(mCurrentHit, Priority_Knockdown, MWRender::Animation::BlendMask_All, false, 1, "start", "stop", 0.0f, ~0ul);
             mPtr.getClass().getCreatureStats(mPtr).setKnockedDown(true);
         }
-        else if(knockdown && mAnimation->hasAnimation("knockdown"))
+        else if (knockdown)
         {
             if (isSwimming && mAnimation->hasAnimation("swimknockdown"))
             {
                 mHitState = CharState_SwimKnockDown;
                 mCurrentHit = "swimknockdown";
+                mAnimation->play(mCurrentHit, Priority_Knockdown, MWRender::Animation::BlendMask_All, true, 1, "start", "stop", 0.0f, 0);
             }
-            else
+            else if (!isSwimming && mAnimation->hasAnimation("knockdown"))
             {
                 mHitState = CharState_KnockDown;
                 mCurrentHit = "knockdown";
+                mAnimation->play(mCurrentHit, Priority_Knockdown, MWRender::Animation::BlendMask_All, true, 1, "start", "stop", 0.0f, 0);
+            }
+            else
+            {
+                // Knockdown animation is missing. Cancel knockdown state.
+                mPtr.getClass().getCreatureStats(mPtr).setKnockedDown(false);
             }
-
-            mAnimation->play(mCurrentHit, Priority_Knockdown, MWRender::Animation::BlendMask_All, true, 1, "start", "stop", 0.0f, 0);
         }
         else if (recovery)
         {

From 0fac172413df82f8e2613d3b9bb9e4b8450dc9da Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Mon, 29 Mar 2021 21:46:08 +0200
Subject: [PATCH 0501/2859] Remove wrong line that slipped in yesterday.

---
 apps/openmw/mwphysics/actor.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index bf7503e72f..a2454345bf 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -123,7 +123,6 @@ void Actor::updatePosition()
     mSimulationPosition = mWorldPosition;
     mStandingOnPtr = nullptr;
     mSkipSimulation = true;
-    mPositionOffset = osg::Vec3f();
 }
 
 void Actor::updateWorldPosition()

From c6033b4de6653ac597e3604ac8d73b3fbee27d4c Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Mon, 29 Mar 2021 21:00:28 +0000
Subject: [PATCH 0502/2859] Fix #5904

---
 components/sceneutil/util.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/components/sceneutil/util.cpp b/components/sceneutil/util.cpp
index fa3c7d26da..cc8a2f44b4 100644
--- a/components/sceneutil/util.cpp
+++ b/components/sceneutil/util.cpp
@@ -8,6 +8,7 @@
 #include <osg/NodeVisitor>
 #include <osg/TexGen>
 #include <osg/TexEnvCombine>
+#include <osg/Version>
 
 #include <components/resource/imagemanager.hpp>
 #include <components/resource/scenemanager.hpp>
@@ -263,6 +264,10 @@ osg::ref_ptr<GlowUpdater> addEnchantedGlow(osg::ref_ptr<osg::Node> node, Resourc
 
 bool attachAlphaToCoverageFriendlyFramebufferToCamera(osg::Camera* camera, osg::Camera::BufferComponent buffer, osg::Texture * texture, unsigned int level, unsigned int face, bool mipMapGeneration)
 {
+#if OSG_VERSION_LESS_THAN(3, 6, 6)
+    // hack fix for https://github.com/openscenegraph/OpenSceneGraph/issues/1028
+    osg::GLExtensions::Get(0, false)->glRenderbufferStorageMultisampleCoverageNV = nullptr;
+#endif
     unsigned int samples = 0;
     unsigned int colourSamples = 0;
     bool addMSAAIntermediateTarget = Settings::Manager::getBool("antialias alpha test", "Shaders") && Settings::Manager::getInt("antialiasing", "Video") > 1;

From 44829046a0fe55507632ac5e9e26ec72a7d38b77 Mon Sep 17 00:00:00 2001
From: Alexey Sokolov <alexey+github@asokolov.org>
Date: Tue, 30 Mar 2021 08:00:00 +0000
Subject: [PATCH 0503/2859] Update Gentoo maintainers (me)

---
 AUTHORS.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index b30168fd8f..fa3a4fba29 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -4,7 +4,7 @@ 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
@@ -236,6 +236,7 @@ Packagers
 ---------
 
     Alexander Olofsson (Ace) - Windows
+    Alexey Sokolov (DarthGandalf) - Gentoo Linux
     Bret Curtis (psi29a) - Debian and Ubuntu Linux
     Edmondo Tommasina (edmondo) - Gentoo Linux
     Julian Ospald (hasufell) - Gentoo Linux

From ad0fe2ee2951aa3fbf605639ed358500e0f82d25 Mon Sep 17 00:00:00 2001
From: Alexander Olofsson <ace@haxalot.com>
Date: Tue, 30 Mar 2021 11:31:36 +0200
Subject: [PATCH 0504/2859] Update Flatpak maintainer

---
 AUTHORS.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index fa3a4fba29..d2de857477 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -24,7 +24,7 @@ Programmers
     Alex McKibben
     alexanderkjall
     Alexander Nadeau (wareya)
-    Alexander Olofsson (Ace)
+    Alexander Olofsson (Ananace)
     Alex Rice
     Alex S (docwest)
     Allofich
@@ -235,7 +235,7 @@ Documentation
 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

From 1ab5a9f5308fe2e6fe389bfb218586aa57b311d1 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Tue, 30 Mar 2021 15:32:01 +0400
Subject: [PATCH 0505/2859] Revert "Merge branch 'refractiontest' into
 'master'"

This reverts commit b31459cc009105d211cb8b186e6223894727eece, reversing
changes made to 369adf158381c1e25d64491c04e50b9020d80782.
---
 files/shaders/water_fragment.glsl | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/files/shaders/water_fragment.glsl b/files/shaders/water_fragment.glsl
index db208ea424..d9b9463ad9 100644
--- a/files/shaders/water_fragment.glsl
+++ b/files/shaders/water_fragment.glsl
@@ -29,21 +29,20 @@ const float BUMP_RAIN = 2.5;
 const float REFL_BUMP = 0.10;                      // reflection distortion amount
 const float REFR_BUMP = 0.07;                      // refraction distortion amount
 
+const float SCATTER_AMOUNT = 0.3;                  // amount of sunlight scattering
+const vec3 SCATTER_COLOUR = vec3(0.0,1.0,0.95);    // colour of sunlight scattering
+
 const vec3 SUN_EXT = vec3(0.45, 0.55, 0.68);       //sunlight extinction
 
 const float SPEC_HARDNESS = 256.0;                 // specular highlights hardness
 
 const float BUMP_SUPPRESS_DEPTH = 300.0;           // at what water depth bumpmap will be suppressed for reflections and refractions (prevents artifacts at shores)
-const float BUMP_SUPPRESS_DEPTH_SS = 1000.0;      // modifier using screenspace depth (helps prevent same artifacts but at higher distances)
 
 const vec2 WIND_DIR = vec2(0.5f, -0.8f);
 const float WIND_SPEED = 0.2f;
 
 const vec3 WATER_COLOR = vec3(0.090195, 0.115685, 0.12745);
 
-const float SCATTER_AMOUNT = 0.5;                  // amount of sunlight scattering
-const vec3 SCATTER_COLOUR = WATER_COLOR * 8.0;     // colour of sunlight scattering
-
 // ---------------- rain ripples related stuff ---------------------
 
 const float RAIN_RIPPLE_GAPS = 5.0;
@@ -219,10 +218,7 @@ void main(void)
     float depthSampleDistorted = linearizeDepth(texture2D(refractionDepthMap,screenCoords-screenCoordsOffset).x) * radialise;
     float surfaceDepth = linearizeDepth(gl_FragCoord.z) * radialise;
     float realWaterDepth = depthSample - surfaceDepth;  // undistorted water depth in view direction, independent of frustum
-    screenCoordsOffset *= clamp(
-            realWaterDepth / (BUMP_SUPPRESS_DEPTH
-                * max(1, depthSample / BUMP_SUPPRESS_DEPTH_SS)) // suppress more at distance
-        ,0 ,1);
+    screenCoordsOffset *= clamp(realWaterDepth / BUMP_SUPPRESS_DEPTH,0,1);
 #endif
     // reflection
     vec3 reflection = texture2D(reflectionMap, screenCoords + screenCoordsOffset).rgb;
@@ -240,11 +236,7 @@ void main(void)
     if (cameraPos.z < 0.0)
         refraction = clamp(refraction * 1.5, 0.0, 1.0);
     else
-    {
-        vec3 refractionA = mix(refraction, waterColor, clamp(depthSampleDistorted/VISIBILITY, 0.0, 1.0));
-        vec3 refractionB = mix(refraction, waterColor, clamp(realWaterDepth/VISIBILITY, 0.0, 1.0));
-        refraction = mix(refractionA, refractionB, 0.8);
-    }
+        refraction = mix(refraction, waterColor, clamp(depthSampleDistorted/VISIBILITY, 0.0, 1.0));
 
     // sunlight scattering
     // normal for sunlight scattering

From 44bd81e8f003f51ef5b6dfc6260245f8fedbc587 Mon Sep 17 00:00:00 2001
From: Alexander Olofsson <ace@haxalot.com>
Date: Wed, 31 Mar 2021 18:15:22 +0200
Subject: [PATCH 0506/2859] Use the SPDX license identifier in appdata XML

---
 files/openmw.appdata.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/openmw.appdata.xml b/files/openmw.appdata.xml
index f4bdb5c919..a9906aae66 100644
--- a/files/openmw.appdata.xml
+++ b/files/openmw.appdata.xml
@@ -5,8 +5,8 @@ Copyright 2020 Bret Curtis <psi29a@gmail.com>
 -->
 <component type="desktop">
  <id>org.openmw.launcher.desktop</id>
- <metadata_license>GPL-3+</metadata_license>
- <project_license>GPL-3+</project_license>
+ <metadata_license>GPL-3.0-or-later</metadata_license>
+ <project_license>GPL-3.0-or-later</project_license>
  <name>OpenMW</name>
  <summary>Unofficial open source engine re-implementation of the game Morrowind</summary>
  <description>

From 9cae7882dd53480bc75fa00de0954d00eeef20ce Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Wed, 31 Mar 2021 19:34:06 +0200
Subject: [PATCH 0507/2859] Fix a bug that was triggered with multi mark mod.

When a script calls SetPos for x,y,z in sequence on an actor, we need to make sure
that the actor will not spawn under ground at x,y coordinates.
Now that change of coordinates are cumulated and applied all at once, we
need to account for the whole offset.
To this end move the terrain height check inside of Actor class.
---
 apps/openmw/mwphysics/actor.cpp                   | 11 +++++++++++
 apps/openmw/mwscript/transformationextensions.cpp | 11 -----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index a2454345bf..776212ede9 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -3,6 +3,8 @@
 #include <BulletCollision/CollisionShapes/btBoxShape.h>
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 
+#include <apps/openmw/mwmechanics/actorutil.hpp>
+#include <apps/openmw/mwworld/cellstore.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/resource/bulletshape.hpp>
 #include <components/debug/debuglog.hpp>
@@ -195,6 +197,15 @@ void Actor::applyOffsetChange()
 {
     if (mPositionOffset.length() == 0)
         return;
+    if (mPositionOffset.z() != 0)
+    {
+        // Often, offset are set in sequence x, y, z
+        // We don't want actors to be moved under the ground
+        // Check terrain height at new coordinate and update z offset if necessary
+        const auto pos = mWorldPosition + mPositionOffset;
+        const auto terrainHeight = mPtr.getCell()->isExterior() ? MWBase::Environment::get().getWorld()->getTerrainHeightAt(pos) : -std::numeric_limits<float>::max();
+        mPositionOffset.z() = std::max(pos.z(), terrainHeight) - mWorldPosition.z();
+    }
     mWorldPosition += mPositionOffset;
     mPosition += mPositionOffset;
     mPreviousPosition += mPositionOffset;
diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index e8b4069775..6b92378c70 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -284,17 +284,6 @@ namespace MWScript
                     }
                     else if(axis == "z")
                     {
-                        // We should not place actors under ground
-                        if (ptr.getClass().isActor())
-                        {
-                            float terrainHeight = -std::numeric_limits<float>::max();
-                            if (ptr.getCell()->isExterior())
-                                terrainHeight = MWBase::Environment::get().getWorld()->getTerrainHeightAt(curPos);
-
-                            if (pos < terrainHeight)
-                                pos = terrainHeight;
-                        }
-
                         newPos[2] = pos;
                     }
                     else

From b8089680705c0008d5a4a08dcf5c185dea4950b2 Mon Sep 17 00:00:00 2001
From: "Hristos N. Triantafillou" <me@hristos.triantafillou.us>
Date: Wed, 24 Mar 2021 18:19:05 -0500
Subject: [PATCH 0508/2859] Use the new macOS image for the CI runner open beta

Also add a second build for wider version coverage.
---
 .gitlab-ci.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 36c8a6ab76..713cc26019 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -94,6 +94,7 @@ Debian_Clang_tests:
     BUILD_TESTS_ONLY: 1
 
 MacOS:
+  image: macos-11-xcode-12
   tags:
     - macos
   stage: build
@@ -111,6 +112,10 @@ MacOS:
       - build/OpenMW-*.dmg
       - "build/**/*.log"
 
+macOS10.15_Xcode11:
+  extends: MacOS
+  image: macos-10.15-xcode-11
+
 variables: &engine-targets
   targets: "openmw,openmw-essimporter,openmw-iniimporter,openmw-launcher,openmw-wizard"
   package: "Engine"

From 6c1844930432831e52c1d4aab7e362c81d213cb8 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 3 Apr 2021 02:15:00 +0200
Subject: [PATCH 0509/2859] Remove GTest and ExternalProject from
 FindGMock.cmake

---
 cmake/FindGMock.cmake | 320 +-----------------------------------------
 1 file changed, 1 insertion(+), 319 deletions(-)

diff --git a/cmake/FindGMock.cmake b/cmake/FindGMock.cmake
index 8d73242423..502910a9df 100644
--- a/cmake/FindGMock.cmake
+++ b/cmake/FindGMock.cmake
@@ -1,15 +1,11 @@
 # Get the Google C++ Mocking Framework.
-# (This file is almost an copy of the original FindGTest.cmake file,
-#  altered to download and compile GMock and GTest if not found
-#  in GMOCK_ROOT or GTEST_ROOT respectively,
+# (This file is almost an copy of the original FindGTest.cmake file for GMock,
 #  feel free to use it as it is or modify it for your own needs.)
 #
 # Defines the following variables:
 #
 #   GMOCK_FOUND - Found or got the Google Mocking framework
-#   GTEST_FOUND - Found or got the Google Testing framework
 #   GMOCK_INCLUDE_DIRS - GMock include directory
-#   GTEST_INCLUDE_DIRS - GTest include direcotry
 #
 # Also defines the library variables below as normal variables
 #
@@ -17,14 +13,8 @@
 #   GMOCK_LIBRARIES - libgmock
 #   GMOCK_MAIN_LIBRARIES - libgmock-main
 #
-#   GTEST_BOTH_LIBRARIES - Both libgtest & libgtest_main
-#   GTEST_LIBRARIES - libgtest
-#   GTEST_MAIN_LIBRARIES - libgtest_main
-#
 # Accepts the following variables as input:
 #
-#   GMOCK_ROOT - The root directory of the gmock install prefix
-#   GTEST_ROOT - The root directory of the gtest install prefix
 #   GMOCK_SRC_DIR -The directory of the gmock sources
 #   GMOCK_VER - The version of the gmock sources to be downloaded
 #
@@ -101,48 +91,6 @@
 #
 #  * Kitware, Inc.
 #=============================================================================
-# Thanks to Daniel Blezek <blezek@gmail.com> for the GTEST_ADD_TESTS code
-
-function(gtest_add_tests executable extra_args)
-    if(NOT ARGN)
-        message(FATAL_ERROR "Missing ARGN: Read the documentation for GTEST_ADD_TESTS")
-    endif()
-    if(ARGN STREQUAL "AUTO")
-        # obtain sources used for building that executable
-        get_property(ARGN TARGET ${executable} PROPERTY SOURCES)
-    endif()
-    set(gtest_case_name_regex ".*\\( *([A-Za-z_0-9]+) *, *([A-Za-z_0-9]+) *\\).*")
-    set(gtest_test_type_regex "(TYPED_TEST|TEST_?[FP]?)")
-    foreach(source ${ARGN})
-        file(READ "${source}" contents)
-        string(REGEX MATCHALL "${gtest_test_type_regex} *\\(([A-Za-z_0-9 ,]+)\\)" found_tests ${contents})
-        foreach(hit ${found_tests})
-            string(REGEX MATCH "${gtest_test_type_regex}" test_type ${hit})
-
-            # Parameterized tests have a different signature for the filter
-            if("x${test_type}" STREQUAL "xTEST_P")
-                string(REGEX REPLACE ${gtest_case_name_regex} "*/\\1.\\2/*" test_name ${hit})
-            elseif("x${test_type}" STREQUAL "xTEST_F" OR "x${test_type}" STREQUAL "xTEST")
-                string(REGEX REPLACE ${gtest_case_name_regex} "\\1.\\2" test_name ${hit})
-            elseif("x${test_type}" STREQUAL "xTYPED_TEST")
-                string(REGEX REPLACE ${gtest_case_name_regex} "\\1/*.\\2" test_name ${hit})
-            else()
-                message(WARNING "Could not parse GTest ${hit} for adding to CTest.")
-                continue()
-            endif()
-            add_test(NAME ${test_name} COMMAND ${executable} --gtest_filter=${test_name} ${extra_args})
-        endforeach()
-    endforeach()
-endfunction()
-
-function(_append_debugs _endvar _library)
-    if(${_library} AND ${_library}_DEBUG)
-        set(_output optimized ${${_library}} debug ${${_library}_DEBUG})
-    else()
-        set(_output ${${_library}})
-    endif()
-    set(${_endvar} ${_output} PARENT_SCOPE)
-endfunction()
 
 function(_gmock_find_library _name)
     find_library(${_name}
@@ -155,38 +103,20 @@ function(_gmock_find_library _name)
     mark_as_advanced(${_name})
 endfunction()
 
-function(_gtest_find_library _name)
-    find_library(${_name}
-        NAMES ${ARGN}
-        HINTS
-        ENV GTEST_ROOT
-        ${GTEST_ROOT}
-        PATH_SUFFIXES ${_gtest_libpath_suffixes}
-        )
-    mark_as_advanced(${_name})
-endfunction()
-
 if(NOT DEFINED GMOCK_MSVC_SEARCH)
     set(GMOCK_MSVC_SEARCH MD)
 endif()
 
 set(_gmock_libpath_suffixes lib)
-set(_gtest_libpath_suffixes lib)
 if(MSVC)
     if(GMOCK_MSVC_SEARCH STREQUAL "MD")
         list(APPEND _gmock_libpath_suffixes
             msvc/gmock-md/Debug
             msvc/gmock-md/Release)
-        list(APPEND _gtest_libpath_suffixes
-            msvc/gtest-md/Debug
-            msvc/gtest-md/Release)
     elseif(GMOCK_MSVC_SEARCH STREQUAL "MT")
         list(APPEND _gmock_libpath_suffixes
             msvc/gmock/Debug
             msvc/gmock/Release)
-        list(APPEND _gtest_libpath_suffixes
-            msvc/gtest/Debug
-            msvc/gtest/Release)
     endif()
 endif()
 
@@ -197,13 +127,6 @@ find_path(GMOCK_INCLUDE_DIR gmock/gmock.h
     )
 mark_as_advanced(GMOCK_INCLUDE_DIR)
 
-find_path(GTEST_INCLUDE_DIR gtest/gtest.h
-    HINTS
-    $ENV{GTEST_ROOT}/include
-    ${GTEST_ROOT}/include
-    )
-mark_as_advanced(GTEST_INCLUDE_DIR)
-
 if(MSVC AND GMOCK_MSVC_SEARCH STREQUAL "MD")
     # The provided /MD project files for Google Mock add -md suffixes to the
     # library names.
@@ -211,28 +134,12 @@ if(MSVC AND GMOCK_MSVC_SEARCH STREQUAL "MD")
     _gmock_find_library(GMOCK_LIBRARY_DEBUG gmock-mdd gmockd)
     _gmock_find_library(GMOCK_MAIN_LIBRARY gmock_main-md gmock_main)
     _gmock_find_library(GMOCK_MAIN_LIBRARY_DEBUG gmock_main-mdd gmock_maind)
-
-    _gtest_find_library(GTEST_LIBRARY gtest-md gtest)
-    _gtest_find_library(GTEST_LIBRARY_DEBUG gtest-mdd gtestd)
-    _gtest_find_library(GTEST_MAIN_LIBRARY gtest_main-md gtest_main)
-    _gtest_find_library(GTEST_MAIN_LIBRARY_DEBUG gtest_main-mdd gtest_maind)
 else()
     _gmock_find_library(GMOCK_LIBRARY gmock)
     _gmock_find_library(GMOCK_LIBRARY_DEBUG gmockd)
     _gmock_find_library(GMOCK_MAIN_LIBRARY gmock_main)
     _gmock_find_library(GMOCK_MAIN_LIBRARY_DEBUG gmock_maind)
 
-    _gtest_find_library(GTEST_LIBRARY gtest)
-    _gtest_find_library(GTEST_LIBRARY_DEBUG gtestd)
-    _gtest_find_library(GTEST_MAIN_LIBRARY gtest_main)
-    _gtest_find_library(GTEST_MAIN_LIBRARY_DEBUG gtest_maind)
-endif()
-
-if(NOT TARGET GTest::GTest)
-    add_library(GTest::GTest UNKNOWN IMPORTED)
-endif()
-if(NOT TARGET GTest::Main)
-    add_library(GTest::Main UNKNOWN IMPORTED)
 endif()
 
 if(NOT TARGET GMock::GMock)
@@ -244,224 +151,17 @@ if(NOT TARGET GMock::Main)
 endif()
 
 set(GMOCK_LIBRARY_EXISTS OFF)
-set(GTEST_LIBRARY_EXISTS OFF)
 
 if(EXISTS "${GMOCK_LIBRARY}" OR EXISTS "${GMOCK_LIBRARY_DEBUG}" AND GMOCK_INCLUDE_DIR)
     set(GMOCK_LIBRARY_EXISTS ON)
 endif()
 
-if(EXISTS "${GTEST_LIBRARY}" OR EXISTS "${GTEST_LIBRARY_DEBUG}" AND GTEST_INCLUDE_DIR)
-    set(GTEST_LIBRARY_EXISTS ON)
-endif()
-
-if(NOT (${GMOCK_LIBRARY_EXISTS} AND ${GTEST_LIBRARY_EXISTS}))
-
-    include(ExternalProject)
-
-    if(GTEST_USE_STATIC_LIBS)
-        set(GTEST_CMAKE_ARGS -Dgtest_force_shared_crt:BOOL=ON -DBUILD_SHARED_LIBS=OFF)
-        if(BUILD_SHARED_LIBS)
-            list(APPEND GTEST_CMAKE_ARGS
-                -DCMAKE_POSITION_INDEPENDENT_CODE=ON
-                -Dgtest_hide_internal_symbols=ON
-                -DCMAKE_CXX_VISIBILITY_PRESET=hidden
-                -DCMAKE_VISIBILITY_INLINES_HIDDEN=ON
-                -DCMAKE_POLICY_DEFAULT_CMP0063=NEW
-            )
-        endif()
-        set(GTEST_LIBRARY_PREFIX ${CMAKE_STATIC_LIBRARY_PREFIX})
-    else()
-        set(GTEST_CMAKE_ARGS -DBUILD_SHARED_LIBS=ON)
-        set(GTEST_LIBRARY_PREFIX ${CMAKE_SHARED_LIBRARY_PREFIX})
-    endif()
-    if(WIN32)
-        list(APPEND GTEST_CMAKE_ARGS -Dgtest_disable_pthreads=ON)
-    endif()
-
-    if("${GMOCK_SRC_DIR}" STREQUAL "")
-        message(STATUS "Downloading GMock / GTest version ${GMOCK_VER} from git")
-        if("${GMOCK_VER}" STREQUAL "1.6.0" OR "${GMOCK_VER}" STREQUAL "1.7.0")
-            set(GTEST_BIN_DIR "${GMOCK_ROOT}/src/gtest-build")
-            set(GTEST_LIBRARY "${GTEST_BIN_DIR}/${CMAKE_CFG_INTDIR}/${GTEST_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}")
-            set(GTEST_MAIN_LIBRARY "${GTEST_BIN_DIR}/${CMAKE_CFG_INTDIR}/${GTEST_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}")
-            mark_as_advanced(GTEST_LIBRARY)
-            mark_as_advanced(GTEST_MAIN_LIBRARY)
-
-            externalproject_add(
-                gtest
-                GIT_REPOSITORY "https://github.com/google/googletest.git"
-                GIT_TAG "release-${GMOCK_VER}"
-                PREFIX ${GMOCK_ROOT}
-                INSTALL_COMMAND ""
-                LOG_DOWNLOAD ON
-                LOG_CONFIGURE ON
-                LOG_BUILD ON
-                CMAKE_ARGS
-                    ${GTEST_CMAKE_ARGS}
-                BINARY_DIR ${GTEST_BIN_DIR}
-                BUILD_BYPRODUCTS
-                    "${GTEST_LIBRARY}"
-                    "${GTEST_MAIN_LIBRARY}"
-            )
-
-            set(GMOCK_BIN_DIR "${GMOCK_ROOT}/src/gmock-build")
-            set(GMOCK_LIBRARY "${GMOCK_BIN_DIR}/${CMAKE_CFG_INTDIR}/${GTEST_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX}")
-            set(GMOCK_MAIN_LIBRARY "${GMOCK_BIN_DIR}/${CMAKE_CFG_INTDIR}/${GTEST_LIBRARY_PREFIX}gmock_main${CMAKE_STATIC_LIBRARY_SUFFIX}")
-            mark_as_advanced(GMOCK_LIBRARY)
-            mark_as_advanced(GMOCK_MAIN_LIBRARY)
-
-            externalproject_add(
-                gmock
-                GIT_REPOSITORY "https://github.com/google/googlemock.git"
-                GIT_TAG "release-${GMOCK_VER}"
-                PREFIX ${GMOCK_ROOT}
-                INSTALL_COMMAND ""
-                LOG_DOWNLOAD ON
-                LOG_CONFIGURE ON
-                LOG_BUILD ON
-                CMAKE_ARGS
-                    ${GTEST_CMAKE_ARGS}
-                BINARY_DIR ${GMOCK_BIN_DIR}
-                BUILD_BYPRODUCTS
-                    "${GMOCK_LIBRARY}"
-                    "${GMOCK_MAIN_LIBRARY}"
-            )
-
-            add_dependencies(gmock gtest)
-
-            add_dependencies(GTest::GTest gtest)
-            add_dependencies(GTest::Main gtest)
-            add_dependencies(GMock::GMock gmock)
-            add_dependencies(GMock::Main gmock)
-
-            externalproject_get_property(gtest source_dir)
-            set(GTEST_INCLUDE_DIR "${source_dir}/include")
-            mark_as_advanced(GTEST_INCLUDE_DIR)
-            externalproject_get_property(gmock source_dir)
-            set(GMOCK_INCLUDE_DIR "${source_dir}/include")
-            mark_as_advanced(GMOCK_INCLUDE_DIR)
-        else() #1.8.0
-            set(GMOCK_BIN_DIR "${GMOCK_ROOT}/src/gmock-build")
-            set(GTEST_LIBRARY "${GMOCK_BIN_DIR}/googlemock/gtest/${CMAKE_CFG_INTDIR}/${GTEST_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}")
-            set(GTEST_MAIN_LIBRARY "${GMOCK_BIN_DIR}/googlemock/gtest/${CMAKE_CFG_INTDIR}/${GTEST_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}")
-            set(GMOCK_LIBRARY "${GMOCK_BIN_DIR}/googlemock/${CMAKE_CFG_INTDIR}/${GTEST_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX}")
-            set(GMOCK_MAIN_LIBRARY "${GMOCK_BIN_DIR}/googlemock/${CMAKE_CFG_INTDIR}/${GTEST_LIBRARY_PREFIX}gmock_main${CMAKE_STATIC_LIBRARY_SUFFIX}")
-            mark_as_advanced(GTEST_LIBRARY)
-            mark_as_advanced(GTEST_MAIN_LIBRARY)
-            mark_as_advanced(GMOCK_LIBRARY)
-            mark_as_advanced(GMOCK_MAIN_LIBRARY)
-
-            externalproject_add(
-                gmock
-                GIT_REPOSITORY "https://github.com/google/googletest.git"
-                GIT_TAG "release-${GMOCK_VER}"
-                PREFIX ${GMOCK_ROOT}
-                INSTALL_COMMAND ""
-                LOG_DOWNLOAD ON
-                LOG_CONFIGURE ON
-                LOG_BUILD ON
-                CMAKE_ARGS
-                    ${GTEST_CMAKE_ARGS}
-                BINARY_DIR "${GMOCK_BIN_DIR}"
-                BUILD_BYPRODUCTS
-                    "${GTEST_LIBRARY}"
-                    "${GTEST_MAIN_LIBRARY}"
-                    "${GMOCK_LIBRARY}"
-                    "${GMOCK_MAIN_LIBRARY}"
-            )
-
-            add_dependencies(GTest::GTest gmock)
-            add_dependencies(GTest::Main gmock)
-            add_dependencies(GMock::GMock gmock)
-            add_dependencies(GMock::Main gmock)
-
-            externalproject_get_property(gmock source_dir)
-            set(GTEST_INCLUDE_DIR "${source_dir}/googletest/include")
-            set(GMOCK_INCLUDE_DIR "${source_dir}/googlemock/include")
-            mark_as_advanced(GMOCK_INCLUDE_DIR)
-            mark_as_advanced(GTEST_INCLUDE_DIR)
-        endif()
-
-        # Prevent CMake from complaining about these directories missing when the libgtest/libgmock targets get used as dependencies
-        file(MAKE_DIRECTORY ${GTEST_INCLUDE_DIR} ${GMOCK_INCLUDE_DIR})
-    else()
-        message(STATUS "Building Gmock / Gtest from dir ${GMOCK_SRC_DIR}")
-
-        set(GMOCK_BIN_DIR "${GMOCK_ROOT}/src/gmock-build")
-        set(GTEST_LIBRARY "${GMOCK_BIN_DIR}/gtest/${CMAKE_CFG_INTDIR}/${GTEST_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}")
-        set(GTEST_MAIN_LIBRARY "${GMOCK_BIN_DIR}/gtest/${CMAKE_CFG_INTDIR}/${GTEST_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}")
-        set(GMOCK_LIBRARY "${GMOCK_BIN_DIR}/${CMAKE_CFG_INTDIR}/${GTEST_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX}")
-        set(GMOCK_MAIN_LIBRARY "${GMOCK_BIN_DIR}/${CMAKE_CFG_INTDIR}/${GTEST_LIBRARY_PREFIX}gmock_main${CMAKE_STATIC_LIBRARY_SUFFIX}")
-        mark_as_advanced(GTEST_LIBRARY)
-        mark_as_advanced(GTEST_MAIN_LIBRARY)
-        mark_as_advanced(GMOCK_LIBRARY)
-        mark_as_advanced(GMOCK_MAIN_LIBRARY)
-
-        if(EXISTS "${GMOCK_SRC_DIR}/gtest/include/gtest/gtest.h")
-            set(GTEST_INCLUDE_DIR "${GMOCK_SRC_DIR}/gtest/include")
-            mark_as_advanced(GTEST_INCLUDE_DIR)
-        endif()
-        if(EXISTS "${GMOCK_SRC_DIR}/include/gmock/gmock.h")
-            set(GMOCK_INCLUDE_DIR "${GMOCK_SRC_DIR}/include")
-            mark_as_advanced(GMOCK_INCLUDE_DIR)
-        elseif(EXISTS "${GMOCK_SRC_DIR}/../../include/gmock/gmock.h")
-            set(GMOCK_INCLUDE_DIR "${GMOCK_SRC_DIR}/../../include")
-            if(IS_ABSOLUTE "${GMOCK_INCLUDE_DIR}")
-                get_filename_component(GMOCK_INCLUDE_DIR "${GMOCK_INCLUDE_DIR}" ABSOLUTE)
-            endif()
-            mark_as_advanced(GMOCK_INCLUDE_DIR)
-        endif()
-
-        externalproject_add(
-            gmock
-            SOURCE_DIR ${GMOCK_SRC_DIR}
-            PREFIX ${GMOCK_ROOT}
-            INSTALL_COMMAND ""
-            LOG_DOWNLOAD ON
-            LOG_CONFIGURE ON
-            LOG_BUILD ON
-            CMAKE_ARGS
-                ${GTEST_CMAKE_ARGS}
-            BINARY_DIR "${GMOCK_BIN_DIR}"
-            BUILD_BYPRODUCTS
-                "${GTEST_LIBRARY}"
-                "${GTEST_MAIN_LIBRARY}"
-                "${GMOCK_LIBRARY}"
-                "${GMOCK_MAIN_LIBRARY}"
-        )
-
-        add_dependencies(GTest::GTest gmock)
-        add_dependencies(GTest::Main gmock)
-        add_dependencies(GMock::GMock gmock)
-        add_dependencies(GMock::Main gmock)
-    endif()
-endif()
-
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(GTest DEFAULT_MSG GTEST_LIBRARY GTEST_INCLUDE_DIR GTEST_MAIN_LIBRARY)
 find_package_handle_standard_args(GMock DEFAULT_MSG GMOCK_LIBRARY GMOCK_INCLUDE_DIR GMOCK_MAIN_LIBRARY)
 
 include(CMakeFindDependencyMacro)
 find_dependency(Threads)
 
-set_target_properties(GTest::GTest PROPERTIES
-    INTERFACE_LINK_LIBRARIES "Threads::Threads"
-    IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
-    IMPORTED_LOCATION "${GTEST_LIBRARY}"
-    )
-
-if(GTEST_INCLUDE_DIR)
-    set_target_properties(GTest::GTest PROPERTIES
-        INTERFACE_INCLUDE_DIRECTORIES "${GTEST_INCLUDE_DIR}"
-        INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${GTEST_INCLUDE_DIR}"
-    )
-endif()
-
-set_target_properties(GTest::Main PROPERTIES
-    INTERFACE_LINK_LIBRARIES "GTest::GTest"
-    IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
-    IMPORTED_LOCATION "${GTEST_MAIN_LIBRARY}")
-
 set_target_properties(GMock::GMock PROPERTIES
     INTERFACE_LINK_LIBRARIES "Threads::Threads"
     IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
@@ -477,13 +177,6 @@ if(GMOCK_INCLUDE_DIR)
         # so just specify it on the link interface.
         set_property(TARGET GMock::GMock APPEND PROPERTY
             INTERFACE_LINK_LIBRARIES GTest::GTest)
-    elseif(GTEST_INCLUDE_DIR)
-        # GMock 1.7 and beyond doesn't have it as a link-time dependency anymore,
-        # so merge it's compile-time interface (include dirs) with ours.
-        set_property(TARGET GMock::GMock APPEND PROPERTY
-            INTERFACE_INCLUDE_DIRECTORIES "${GTEST_INCLUDE_DIR}")
-        set_property(TARGET GMock::GMock APPEND PROPERTY
-            INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${GTEST_INCLUDE_DIR}")
     endif()
 endif()
 
@@ -492,17 +185,6 @@ set_target_properties(GMock::Main PROPERTIES
     IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
     IMPORTED_LOCATION "${GMOCK_MAIN_LIBRARY}")
 
-if(GTEST_FOUND)
-    set(GTEST_INCLUDE_DIRS ${GTEST_INCLUDE_DIR})
-    set(GTEST_LIBRARIES GTest::GTest)
-    set(GTEST_MAIN_LIBRARIES GTest::Main)
-    set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES})
-    if(VERBOSE)
-        message(STATUS "GTest includes: ${GTEST_INCLUDE_DIRS}")
-        message(STATUS "GTest libs: ${GTEST_BOTH_LIBRARIES}")
-    endif()
-endif()
-
 if(GMOCK_FOUND)
     set(GMOCK_INCLUDE_DIRS ${GMOCK_INCLUDE_DIR})
     set(GMOCK_LIBRARIES GMock::GMock)

From db32b8de917b2290c679d8ded4b0057ffdd8b61e Mon Sep 17 00:00:00 2001
From: Alexander Olofsson <ace@haxalot.com>
Date: Sat, 3 Apr 2021 13:41:41 +0200
Subject: [PATCH 0510/2859] Return to CC0-licensed appdata metadata

---
 files/openmw.appdata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/openmw.appdata.xml b/files/openmw.appdata.xml
index a9906aae66..8f3865f096 100644
--- a/files/openmw.appdata.xml
+++ b/files/openmw.appdata.xml
@@ -5,7 +5,7 @@ Copyright 2020 Bret Curtis <psi29a@gmail.com>
 -->
 <component type="desktop">
  <id>org.openmw.launcher.desktop</id>
- <metadata_license>GPL-3.0-or-later</metadata_license>
+ <metadata_license>CC0-1.0</metadata_license>
  <project_license>GPL-3.0-or-later</project_license>
  <name>OpenMW</name>
  <summary>Unofficial open source engine re-implementation of the game Morrowind</summary>

From 168f26fc80ed72f53a73d2997776358a1a4a3b80 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Sun, 4 Apr 2021 15:29:08 +0000
Subject: [PATCH 0511/2859] Fix crash on startup

---
 components/sceneutil/util.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/components/sceneutil/util.cpp b/components/sceneutil/util.cpp
index cc8a2f44b4..1fe3685726 100644
--- a/components/sceneutil/util.cpp
+++ b/components/sceneutil/util.cpp
@@ -266,7 +266,9 @@ bool attachAlphaToCoverageFriendlyFramebufferToCamera(osg::Camera* camera, osg::
 {
 #if OSG_VERSION_LESS_THAN(3, 6, 6)
     // hack fix for https://github.com/openscenegraph/OpenSceneGraph/issues/1028
-    osg::GLExtensions::Get(0, false)->glRenderbufferStorageMultisampleCoverageNV = nullptr;
+    osg::ref_ptr<osg::GLExtensions> extensions = osg::GLExtensions::Get(0, false);
+    if (extensions)
+        extensions->glRenderbufferStorageMultisampleCoverageNV = nullptr;
 #endif
     unsigned int samples = 0;
     unsigned int colourSamples = 0;

From 03fc3ec80351c4edef43fb2a34ce96e2a3d1562e Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 4 Apr 2021 22:51:21 +0200
Subject: [PATCH 0512/2859] Do not allow write variant of string as local
 variable

To be consitent with read where it's not allowed.
---
 components/esm/variantimp.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/components/esm/variantimp.cpp b/components/esm/variantimp.cpp
index aeea5017e1..2b69923d1d 100644
--- a/components/esm/variantimp.cpp
+++ b/components/esm/variantimp.cpp
@@ -98,6 +98,9 @@ void ESM::VariantStringData::write (ESMWriter& esm, Variant::Format format, VarT
     if (format==Variant::Format_Info)
         throw std::runtime_error ("info variables of type string not supported");
 
+    if (format==Variant::Format_Local)
+        throw std::runtime_error ("local variables of type string not supported");
+
     // GMST
     esm.writeHNString ("STRV", mValue);
 }

From dae3f022baf4f33372176a2b784213d1750ddbd6 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 4 Apr 2021 20:15:58 +0200
Subject: [PATCH 0513/2859] Add tests for ESM::Variant

---
 apps/openmw_test_suite/CMakeLists.txt  |   1 +
 apps/openmw_test_suite/esm/variant.cpp | 515 +++++++++++++++++++++++++
 2 files changed, 516 insertions(+)
 create mode 100644 apps/openmw_test_suite/esm/variant.cpp

diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index a3bb0c6f87..d78cb69553 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -13,6 +13,7 @@ if (GTEST_FOUND AND GMOCK_FOUND)
         mwdialogue/test_keywordsearch.cpp
 
         esm/test_fixed_string.cpp
+        esm/variant.cpp
 
         misc/test_stringops.cpp
         misc/test_endianness.cpp
diff --git a/apps/openmw_test_suite/esm/variant.cpp b/apps/openmw_test_suite/esm/variant.cpp
new file mode 100644
index 0000000000..c00f73d730
--- /dev/null
+++ b/apps/openmw_test_suite/esm/variant.cpp
@@ -0,0 +1,515 @@
+#include <components/esm/variant.hpp>
+#include <components/esm/esmwriter.hpp>
+#include <components/esm/esmreader.hpp>
+#include <components/esm/loadglob.hpp>
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+#include <functional>
+
+namespace
+{
+    using namespace testing;
+    using namespace ESM;
+
+    Variant makeVariant(VarType type)
+    {
+        Variant v;
+        v.setType(type);
+        return v;
+    }
+
+    Variant makeVariant(VarType type, int value)
+    {
+        Variant v;
+        v.setType(type);
+        v.setInteger(value);
+        return v;
+    }
+
+    TEST(ESMVariantTest, move_constructed_should_have_data)
+    {
+        Variant a(int{42});
+        const Variant b(std::move(a));
+        ASSERT_EQ(b.getInteger(), 42);
+    }
+
+    TEST(ESMVariantTest, copy_constructed_is_equal_to_source)
+    {
+        const Variant a(int{42});
+        const Variant b(a);
+        ASSERT_EQ(a, b);
+    }
+
+    TEST(ESMVariantTest, copy_constructed_does_not_share_data_with_source)
+    {
+        const Variant a(int{42});
+        Variant b(a);
+        b.setInteger(13);
+        ASSERT_EQ(a.getInteger(), 42);
+        ASSERT_EQ(b.getInteger(), 13);
+    }
+
+    TEST(ESMVariantTest, move_assigned_should_have_data)
+    {
+        Variant b;
+        {
+            Variant a(int{42});
+            b = std::move(a);
+        }
+        ASSERT_EQ(b.getInteger(), 42);
+    }
+
+    TEST(ESMVariantTest, copy_assigned_is_equal_to_source)
+    {
+        const Variant a(int{42});
+        Variant b;
+        b = a;
+        ASSERT_EQ(a, b);
+    }
+
+    TEST(ESMVariantTest, not_equal_is_negation_of_equal)
+    {
+        const Variant a(int{42});
+        Variant b;
+        b = a;
+        ASSERT_TRUE(!(a != b));
+    }
+
+    TEST(ESMVariantTest, different_types_are_not_equal)
+    {
+        ASSERT_NE(Variant(int{42}), Variant(float{2.7f}));
+    }
+
+    struct ESMVariantWriteToOStreamTest : TestWithParam<std::tuple<Variant, std::string>> {};
+
+    TEST_P(ESMVariantWriteToOStreamTest, should_write)
+    {
+        const auto [variant, result] = GetParam();
+        std::ostringstream s;
+        s << variant;
+        ASSERT_EQ(s.str(), result);
+    }
+
+    INSTANTIATE_TEST_SUITE_P(VariantAsString, ESMVariantWriteToOStreamTest, Values(
+        std::make_tuple(Variant(), "variant none"),
+        std::make_tuple(Variant(int{42}), "variant long: 42"),
+        std::make_tuple(Variant(float{2.7f}), "variant float: 2.7"),
+        std::make_tuple(Variant(std::string("foo")), "variant string: \"foo\""),
+        std::make_tuple(makeVariant(VT_Unknown), "variant unknown"),
+        std::make_tuple(makeVariant(VT_Short, 42), "variant short: 42"),
+        std::make_tuple(makeVariant(VT_Int, 42), "variant int: 42")
+    ));
+
+    struct ESMVariantGetTypeTest : Test {};
+
+    TEST(ESMVariantGetTypeTest, default_constructed_should_return_none)
+    {
+        ASSERT_EQ(Variant().getType(), VT_None);
+    }
+
+    TEST(ESMVariantGetTypeTest, for_constructed_from_int_should_return_long)
+    {
+        ASSERT_EQ(Variant(int{}).getType(), VT_Long);
+    }
+
+    TEST(ESMVariantGetTypeTest, for_constructed_from_float_should_return_float)
+    {
+        ASSERT_EQ(Variant(float{}).getType(), VT_Float);
+    }
+
+    TEST(ESMVariantGetTypeTest, for_constructed_from_lvalue_string_should_return_string)
+    {
+        const std::string string;
+        ASSERT_EQ(Variant(string).getType(), VT_String);
+    }
+
+    TEST(ESMVariantGetTypeTest, for_constructed_from_rvalue_string_should_return_string)
+    {
+        ASSERT_EQ(Variant(std::string{}).getType(), VT_String);
+    }
+
+    struct ESMVariantGetIntegerTest : Test {};
+
+    TEST(ESMVariantGetIntegerTest, for_default_constructed_should_throw_exception)
+    {
+        ASSERT_THROW(Variant().getInteger(), std::runtime_error);
+    }
+
+    TEST(ESMVariantGetIntegerTest, for_constructed_from_int_should_return_same_value)
+    {
+        const Variant variant(int{42});
+        ASSERT_EQ(variant.getInteger(), 42);
+    }
+
+    TEST(ESMVariantGetIntegerTest, for_constructed_from_float_should_return_casted_to_int)
+    {
+        const Variant variant(float{2.7});
+        ASSERT_EQ(variant.getInteger(), 2);
+    }
+
+    TEST(ESMVariantGetIntegerTest, for_constructed_from_string_should_throw_exception)
+    {
+        const Variant variant(std::string("foo"));
+        ASSERT_THROW(variant.getInteger(), std::runtime_error);
+    }
+
+    TEST(ESMVariantGetFloatTest, for_default_constructed_should_throw_exception)
+    {
+        ASSERT_THROW(Variant().getFloat(), std::runtime_error);
+    }
+
+    TEST(ESMVariantGetFloatTest, for_constructed_from_int_should_return_casted_to_float)
+    {
+        const Variant variant(int{42});
+        ASSERT_EQ(variant.getFloat(), 42);
+    }
+
+    TEST(ESMVariantGetFloatTest, for_constructed_from_float_should_return_same_value)
+    {
+        const Variant variant(float{2.7f});
+        ASSERT_EQ(variant.getFloat(), 2.7f);
+    }
+
+    TEST(ESMVariantGetFloatTest, for_constructed_from_string_should_throw_exception)
+    {
+        const Variant variant(std::string("foo"));
+        ASSERT_THROW(variant.getFloat(), std::runtime_error);
+    }
+
+    TEST(ESMVariantGetStringTest, for_default_constructed_should_throw_exception)
+    {
+        ASSERT_THROW(Variant().getString(), std::runtime_error);
+    }
+
+    TEST(ESMVariantGetStringTest, for_constructed_from_int_should_throw_exception)
+    {
+        const Variant variant(int{42});
+        ASSERT_THROW(variant.getString(), std::runtime_error);
+    }
+
+    TEST(ESMVariantGetStringTest, for_constructed_from_float_should_throw_exception)
+    {
+        const Variant variant(float{2.7});
+        ASSERT_THROW(variant.getString(), std::runtime_error);
+    }
+
+    TEST(ESMVariantGetStringTest, for_constructed_from_string_should_return_same_value)
+    {
+        const Variant variant(std::string("foo"));
+        ASSERT_EQ(variant.getString(), "foo");
+    }
+
+    TEST(ESMVariantSetTypeTest, for_unknown_should_reset_data)
+    {
+        Variant variant(int{42});
+        variant.setType(VT_Unknown);
+        ASSERT_THROW(variant.getInteger(), std::runtime_error);
+    }
+
+    TEST(ESMVariantSetTypeTest, for_none_should_reset_data)
+    {
+        Variant variant(int{42});
+        variant.setType(VT_None);
+        ASSERT_THROW(variant.getInteger(), std::runtime_error);
+    }
+
+    TEST(ESMVariantSetTypeTest, for_same_type_should_not_change_value)
+    {
+        Variant variant(int{42});
+        variant.setType(VT_Long);
+        ASSERT_EQ(variant.getInteger(), 42);
+    }
+
+    TEST(ESMVariantSetTypeTest, for_float_replaced_by_int_should_cast_float_to_int)
+    {
+        Variant variant(float{2.7f});
+        variant.setType(VT_Int);
+        ASSERT_EQ(variant.getInteger(), 2);
+    }
+
+    TEST(ESMVariantSetTypeTest, for_string_replaced_by_int_should_set_default_initialized_data)
+    {
+        Variant variant(std::string("foo"));
+        variant.setType(VT_Int);
+        ASSERT_EQ(variant.getInteger(), 0);
+    }
+
+    TEST(ESMVariantSetTypeTest, for_default_constructed_replaced_by_float_should_set_default_initialized_value)
+    {
+        Variant variant;
+        variant.setType(VT_Float);
+        ASSERT_EQ(variant.getInteger(), 0.0f);
+    }
+
+    TEST(ESMVariantSetTypeTest, for_float_replaced_by_short_should_cast_data_to_int)
+    {
+        Variant variant(float{2.7f});
+        variant.setType(VT_Short);
+        ASSERT_EQ(variant.getInteger(), 2);
+    }
+
+    TEST(ESMVariantSetTypeTest, for_float_replaced_by_long_should_cast_data_to_int)
+    {
+        Variant variant(float{2.7f});
+        variant.setType(VT_Long);
+        ASSERT_EQ(variant.getInteger(), 2);
+    }
+
+    TEST(ESMVariantSetTypeTest, for_int_replaced_by_float_should_cast_data_to_float)
+    {
+        Variant variant(int{42});
+        variant.setType(VT_Float);
+        ASSERT_EQ(variant.getFloat(), 42.0f);
+    }
+
+    TEST(ESMVariantSetTypeTest, for_int_replaced_by_string_should_set_default_initialized_data)
+    {
+        Variant variant(int{42});
+        variant.setType(VT_String);
+        ASSERT_EQ(variant.getString(), "");
+    }
+
+    TEST(ESMVariantSetIntegerTest, for_default_constructed_should_throw_exception)
+    {
+        Variant variant;
+        ASSERT_THROW(variant.setInteger(42), std::runtime_error);
+    }
+
+    TEST(ESMVariantSetIntegerTest, for_unknown_should_throw_exception)
+    {
+        Variant variant;
+        variant.setType(VT_Unknown);
+        ASSERT_THROW(variant.setInteger(42), std::runtime_error);
+    }
+
+    TEST(ESMVariantSetIntegerTest, for_default_int_should_change_value)
+    {
+        Variant variant(int{13});
+        variant.setInteger(42);
+        ASSERT_EQ(variant.getInteger(), 42);
+    }
+
+    TEST(ESMVariantSetIntegerTest, for_int_should_change_value)
+    {
+        Variant variant;
+        variant.setType(VT_Int);
+        variant.setInteger(42);
+        ASSERT_EQ(variant.getInteger(), 42);
+    }
+
+    TEST(ESMVariantSetIntegerTest, for_short_should_change_value)
+    {
+        Variant variant;
+        variant.setType(VT_Short);
+        variant.setInteger(42);
+        ASSERT_EQ(variant.getInteger(), 42);
+    }
+
+    TEST(ESMVariantSetIntegerTest, for_float_should_change_value)
+    {
+        Variant variant(float{2.7f});
+        variant.setInteger(42);
+        ASSERT_EQ(variant.getFloat(), 42.0f);
+    }
+
+    TEST(ESMVariantSetIntegerTest, for_string_should_throw_exception)
+    {
+        Variant variant(std::string{});
+        ASSERT_THROW(variant.setInteger(42), std::runtime_error);
+    }
+
+    TEST(ESMVariantSetFloatTest, for_default_constructed_should_throw_exception)
+    {
+        Variant variant;
+        ASSERT_THROW(variant.setFloat(2.7f), std::runtime_error);
+    }
+
+    TEST(ESMVariantSetFloatTest, for_unknown_should_throw_exception)
+    {
+        Variant variant;
+        variant.setType(VT_Unknown);
+        ASSERT_THROW(variant.setFloat(2.7f), std::runtime_error);
+    }
+
+    TEST(ESMVariantSetFloatTest, for_default_int_should_change_value)
+    {
+        Variant variant(int{13});
+        variant.setFloat(2.7f);
+        ASSERT_EQ(variant.getInteger(), 2);
+    }
+
+    TEST(ESMVariantSetFloatTest, for_int_should_change_value)
+    {
+        Variant variant;
+        variant.setType(VT_Int);
+        variant.setFloat(2.7f);
+        ASSERT_EQ(variant.getInteger(), 2);
+    }
+
+    TEST(ESMVariantSetFloatTest, for_short_should_change_value)
+    {
+        Variant variant;
+        variant.setType(VT_Short);
+        variant.setFloat(2.7f);
+        ASSERT_EQ(variant.getInteger(), 2);
+    }
+
+    TEST(ESMVariantSetFloatTest, for_float_should_change_value)
+    {
+        Variant variant(float{2.7f});
+        variant.setFloat(3.14f);
+        ASSERT_EQ(variant.getFloat(), 3.14f);
+    }
+
+    TEST(ESMVariantSetFloatTest, for_string_should_throw_exception)
+    {
+        Variant variant(std::string{});
+        ASSERT_THROW(variant.setFloat(2.7f), std::runtime_error);
+    }
+
+    TEST(ESMVariantSetStringTest, for_default_constructed_should_throw_exception)
+    {
+        Variant variant;
+        ASSERT_THROW(variant.setString("foo"), std::runtime_error);
+    }
+
+    TEST(ESMVariantSetStringTest, for_unknown_should_throw_exception)
+    {
+        Variant variant;
+        variant.setType(VT_Unknown);
+        ASSERT_THROW(variant.setString("foo"), std::runtime_error);
+    }
+
+    TEST(ESMVariantSetStringTest, for_default_int_should_throw_exception)
+    {
+        Variant variant(int{13});
+        ASSERT_THROW(variant.setString("foo"), std::runtime_error);
+    }
+
+    TEST(ESMVariantSetStringTest, for_int_should_throw_exception)
+    {
+        Variant variant;
+        variant.setType(VT_Int);
+        ASSERT_THROW(variant.setString("foo"), std::runtime_error);
+    }
+
+    TEST(ESMVariantSetStringTest, for_short_should_throw_exception)
+    {
+        Variant variant;
+        variant.setType(VT_Short);
+        ASSERT_THROW(variant.setString("foo"), std::runtime_error);
+    }
+
+    TEST(ESMVariantSetStringTest, for_float_should_throw_exception)
+    {
+        Variant variant(float{2.7f});
+        ASSERT_THROW(variant.setString("foo"), std::runtime_error);
+    }
+
+    TEST(ESMVariantSetStringTest, for_string_should_change_value)
+    {
+        Variant variant(std::string("foo"));
+        variant.setString("bar");
+        ASSERT_EQ(variant.getString(), "bar");
+    }
+
+    struct WriteToESMTestCase
+    {
+        Variant mVariant;
+        Variant::Format mFormat;
+        std::size_t mDataSize {};
+        std::size_t mDataHash {};
+    };
+
+    std::string write(const Variant& variant, const Variant::Format format)
+    {
+        std::ostringstream out;
+        ESM::ESMWriter writer;
+        writer.save(out);
+        variant.write(writer, format);
+        writer.close();
+        return out.str();
+    }
+
+    Variant read(const Variant::Format format, const std::string& data)
+    {
+        Variant result;
+        ESM::ESMReader reader;
+        reader.open(std::make_shared<std::istringstream>(data), "");
+        result.read(reader, format);
+        return result;
+    }
+
+    Variant writeAndRead(const Variant& variant, const Variant::Format format, std::size_t dataSize, std::size_t dataHash)
+    {
+        const std::string data = write(variant, format);
+        EXPECT_EQ(data.size(), dataSize);
+        EXPECT_EQ(std::hash<std::string>{}(data), dataHash);
+        return read(format, data);
+    }
+
+    struct ESMVariantToESMTest : TestWithParam<WriteToESMTestCase> {};
+
+    TEST_P(ESMVariantToESMTest, deserialized_is_equal_to_serialized)
+    {
+        const auto param = GetParam();
+        const auto result = writeAndRead(param.mVariant, param.mFormat, param.mDataSize, param.mDataHash);
+        ASSERT_EQ(param.mVariant, result);
+    }
+
+    INSTANTIATE_TEST_SUITE_P(VariantAndData, ESMVariantToESMTest, Values(
+        WriteToESMTestCase {Variant(), Variant::Format_Gmst, 324, 10398667754238537314ul},
+        WriteToESMTestCase {Variant(int{42}), Variant::Format_Global, 345, 2440845426097842853ul},
+        WriteToESMTestCase {Variant(float{2.7f}), Variant::Format_Global, 345, 8428720798053904009ul},
+        WriteToESMTestCase {Variant(float{2.7f}), Variant::Format_Info, 336, 11930997575130354755ul},
+        WriteToESMTestCase {Variant(float{2.7f}), Variant::Format_Local, 336, 11930997575130354755ul},
+        WriteToESMTestCase {makeVariant(VT_Short, 42), Variant::Format_Global, 345, 7812065815960720679ul},
+        WriteToESMTestCase {makeVariant(VT_Short, 42), Variant::Format_Local, 334, 5017869102981712080ul},
+        WriteToESMTestCase {makeVariant(VT_Int, 42), Variant::Format_Info, 336, 12560431547347287906ul},
+        WriteToESMTestCase {makeVariant(VT_Int, 42), Variant::Format_Local, 336, 12560431547347287906ul}
+    ));
+
+    struct ESMVariantToESMNoneTest : TestWithParam<WriteToESMTestCase> {};
+
+    TEST_P(ESMVariantToESMNoneTest, deserialized_is_none)
+    {
+        const auto param = GetParam();
+        const auto result = writeAndRead(param.mVariant, param.mFormat, param.mDataSize, param.mDataHash);
+        ASSERT_EQ(Variant(), result);
+    }
+
+    INSTANTIATE_TEST_SUITE_P(VariantAndData, ESMVariantToESMNoneTest, Values(
+        WriteToESMTestCase {Variant(float{2.7f}), Variant::Format_Gmst, 336, 11930997575130354755ul},
+        WriteToESMTestCase {Variant(std::string("foo")), Variant::Format_Gmst, 335, 7604528240659685057ul},
+        WriteToESMTestCase {makeVariant(VT_Int, 42), Variant::Format_Gmst, 336, 12560431547347287906ul}
+    ));
+
+    struct ESMVariantWriteToESMFailTest : TestWithParam<WriteToESMTestCase> {};
+
+    TEST_P(ESMVariantWriteToESMFailTest, write_is_not_supported)
+    {
+        const auto param = GetParam();
+        std::ostringstream out;
+        ESM::ESMWriter writer;
+        writer.save(out);
+        ASSERT_THROW(param.mVariant.write(writer, param.mFormat), std::runtime_error);
+    }
+
+    INSTANTIATE_TEST_SUITE_P(VariantAndFormat, ESMVariantWriteToESMFailTest, Values(
+        WriteToESMTestCase {Variant(), Variant::Format_Global},
+        WriteToESMTestCase {Variant(), Variant::Format_Info},
+        WriteToESMTestCase {Variant(), Variant::Format_Local},
+        WriteToESMTestCase {Variant(int{42}), Variant::Format_Gmst},
+        WriteToESMTestCase {Variant(int{42}), Variant::Format_Info},
+        WriteToESMTestCase {Variant(int{42}), Variant::Format_Local},
+        WriteToESMTestCase {Variant(std::string("foo")), Variant::Format_Global},
+        WriteToESMTestCase {Variant(std::string("foo")), Variant::Format_Info},
+        WriteToESMTestCase {Variant(std::string("foo")), Variant::Format_Local},
+        WriteToESMTestCase {makeVariant(VT_Unknown), Variant::Format_Global},
+        WriteToESMTestCase {makeVariant(VT_Int, 42), Variant::Format_Global},
+        WriteToESMTestCase {makeVariant(VT_Short, 42), Variant::Format_Gmst},
+        WriteToESMTestCase {makeVariant(VT_Short, 42), Variant::Format_Info}
+    ));
+}

From ecde3932e273f34fb6f07ff7396a3072245540db Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 5 Apr 2021 09:43:37 +0200
Subject: [PATCH 0514/2859] Make AddItem's quantity overflow on negative
 numbers

---
 CHANGELOG.md                                 | 1 +
 apps/openmw/mwscript/containerextensions.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1fea773e9..f8cb55d36e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -115,6 +115,7 @@
     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 #5934: AddItem command doesn't accept negative values
     Feature #390: 3rd person look "over the shoulder"
     Feature #832: OpenMW-CS: Handle deleted references
     Feature #1536: Show more information about level on menu
diff --git a/apps/openmw/mwscript/containerextensions.cpp b/apps/openmw/mwscript/containerextensions.cpp
index 186940dd99..375242f17c 100644
--- a/apps/openmw/mwscript/containerextensions.cpp
+++ b/apps/openmw/mwscript/containerextensions.cpp
@@ -93,7 +93,7 @@ namespace MWScript
                     runtime.pop();
 
                     if (count<0)
-                        throw std::runtime_error ("second argument for AddItem must be non-negative");
+                        count = static_cast<uint16_t>(count);
 
                     // no-op
                     if (count == 0)

From 045bb7cbd7d206f9de9e4b624aa6dd6dc0d4d55a Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 3 Apr 2021 00:48:35 +0200
Subject: [PATCH 0515/2859] Store CustomData and ContainerStore as unique_ptr

---
 apps/openmw/mwclass/container.cpp       |  8 +++---
 apps/openmw/mwclass/container.hpp       |  2 +-
 apps/openmw/mwclass/creature.cpp        | 36 ++++++++++++++-----------
 apps/openmw/mwclass/creaturelevlist.cpp | 10 +++----
 apps/openmw/mwclass/door.cpp            |  9 +++----
 apps/openmw/mwclass/npc.cpp             | 11 ++++----
 apps/openmw/mwworld/containerstore.hpp  |  2 +-
 apps/openmw/mwworld/customdata.hpp      |  4 ++-
 apps/openmw/mwworld/inventorystore.hpp  |  2 +-
 apps/openmw/mwworld/refdata.cpp         | 11 +++-----
 apps/openmw/mwworld/refdata.hpp         |  5 ++--
 11 files changed, 52 insertions(+), 48 deletions(-)

diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index 28305c394e..2d7f300473 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -46,9 +46,9 @@ namespace MWClass
         mStore.readState(inventory);
     }
 
-    MWWorld::CustomData *ContainerCustomData::clone() const
+    std::unique_ptr<MWWorld::CustomData> ContainerCustomData::clone() const
     {
-        return new ContainerCustomData (*this);
+        return std::make_unique<ContainerCustomData>(*this);
     }
 
     ContainerCustomData& ContainerCustomData::asContainerCustomData()
@@ -72,7 +72,7 @@ namespace MWClass
             MWWorld::LiveCellRef<ESM::Container> *ref = ptr.get<ESM::Container>();
 
             // store
-            ptr.getRefData().setCustomData (std::make_unique<ContainerCustomData>(*ref->mBase, ptr.getCell()).release());
+            ptr.getRefData().setCustomData (std::make_unique<ContainerCustomData>(*ref->mBase, ptr.getCell()));
 
             MWBase::Environment::get().getWorld()->addContainerScripts(ptr, ptr.getCell());
         }
@@ -317,7 +317,7 @@ namespace MWClass
             return;
 
         const ESM::ContainerState& containerState = state.asContainerState();
-        ptr.getRefData().setCustomData(std::make_unique<ContainerCustomData>(containerState.mInventory).release());
+        ptr.getRefData().setCustomData(std::make_unique<ContainerCustomData>(containerState.mInventory));
     }
 
     void Container::writeAdditionalState (const MWWorld::ConstPtr& ptr, ESM::ObjectState& state) const
diff --git a/apps/openmw/mwclass/container.hpp b/apps/openmw/mwclass/container.hpp
index 2dc0c06cae..fc3e046f11 100644
--- a/apps/openmw/mwclass/container.hpp
+++ b/apps/openmw/mwclass/container.hpp
@@ -20,7 +20,7 @@ namespace MWClass
         ContainerCustomData(const ESM::Container& container, MWWorld::CellStore* cell);
         ContainerCustomData(const ESM::InventoryState& inventory);
 
-        MWWorld::CustomData *clone() const override;
+        std::unique_ptr<MWWorld::CustomData> clone() const override;
 
         ContainerCustomData& asContainerCustomData() override;
         const ContainerCustomData& asContainerCustomData() const override;
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 31341db730..2a55fb9fd9 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -55,10 +55,14 @@ namespace MWClass
     {
     public:
         MWMechanics::CreatureStats mCreatureStats;
-        MWWorld::ContainerStore* mContainerStore; // may be InventoryStore for some creatures
+        std::unique_ptr<MWWorld::ContainerStore> mContainerStore; // may be InventoryStore for some creatures
         MWMechanics::Movement mMovement;
 
-        MWWorld::CustomData *clone() const override;
+        CreatureCustomData() = default;
+        CreatureCustomData(const CreatureCustomData& other);
+        CreatureCustomData(CreatureCustomData&& other) noexcept = default;
+
+        std::unique_ptr<MWWorld::CustomData> clone() const override;
 
         CreatureCustomData& asCreatureCustomData() override
         {
@@ -68,16 +72,18 @@ namespace MWClass
         {
             return *this;
         }
-
-        CreatureCustomData() : mContainerStore(nullptr) {}
-        virtual ~CreatureCustomData() { delete mContainerStore; }
     };
 
-    MWWorld::CustomData *CreatureCustomData::clone() const
+    CreatureCustomData::CreatureCustomData(const CreatureCustomData& other)
+        : mCreatureStats(other.mCreatureStats),
+          mContainerStore(other.mContainerStore->clone()),
+          mMovement(other.mMovement)
+    {
+    }
+
+    std::unique_ptr<MWWorld::CustomData> CreatureCustomData::clone() const
     {
-        CreatureCustomData* cloned = new CreatureCustomData (*this);
-        cloned->mContainerStore = mContainerStore->clone();
-        return cloned;
+        return std::make_unique<CreatureCustomData>(*this);
     }
 
     const Creature::GMST& Creature::getGmst()
@@ -148,16 +154,16 @@ namespace MWClass
             // inventory
             bool hasInventory = hasInventoryStore(ptr);
             if (hasInventory)
-                data->mContainerStore = new MWWorld::InventoryStore();
+                data->mContainerStore = std::make_unique<MWWorld::InventoryStore>();
             else
-                data->mContainerStore = new MWWorld::ContainerStore();
+                data->mContainerStore = std::make_unique<MWWorld::ContainerStore>();
 
             data->mCreatureStats.setGoldPool(ref->mBase->mData.mGold);
 
             data->mCreatureStats.setNeedRecalcDynamicStats(false);
 
             // store
-            ptr.getRefData().setCustomData(data.release());
+            ptr.getRefData().setCustomData(std::move(data));
 
             getContainerStore(ptr).fill(ref->mBase->mInventory, ptr.getCellRef().getRefId());
 
@@ -758,11 +764,11 @@ namespace MWClass
                 std::unique_ptr<CreatureCustomData> data (new CreatureCustomData);
 
                 if (hasInventoryStore(ptr))
-                    data->mContainerStore = new MWWorld::InventoryStore();
+                    data->mContainerStore = std::make_unique<MWWorld::InventoryStore>();
                 else
-                    data->mContainerStore = new MWWorld::ContainerStore();
+                    data->mContainerStore = std::make_unique<MWWorld::ContainerStore>();
 
-                ptr.getRefData().setCustomData (data.release());
+                ptr.getRefData().setCustomData (std::move(data));
             }
         }
         else
diff --git a/apps/openmw/mwclass/creaturelevlist.cpp b/apps/openmw/mwclass/creaturelevlist.cpp
index e3e52901e0..3b401f1a3e 100644
--- a/apps/openmw/mwclass/creaturelevlist.cpp
+++ b/apps/openmw/mwclass/creaturelevlist.cpp
@@ -17,7 +17,7 @@ namespace MWClass
         int mSpawnActorId;
         bool mSpawn; // Should a new creature be spawned?
 
-        MWWorld::CustomData *clone() const override;
+        std::unique_ptr<MWWorld::CustomData> clone() const override;
 
         CreatureLevListCustomData& asCreatureLevListCustomData() override
         {
@@ -29,9 +29,9 @@ namespace MWClass
         }
     };
 
-    MWWorld::CustomData *CreatureLevListCustomData::clone() const
+    std::unique_ptr<MWWorld::CustomData> CreatureLevListCustomData::clone() const
     {
-        return new CreatureLevListCustomData (*this);
+        return std::make_unique<CreatureLevListCustomData>(*this);
     }
 
     std::string CreatureLevList::getName (const MWWorld::ConstPtr& ptr) const
@@ -138,11 +138,11 @@ namespace MWClass
     {
         if (!ptr.getRefData().getCustomData())
         {
-            std::unique_ptr<CreatureLevListCustomData> data (new CreatureLevListCustomData);
+            std::unique_ptr<CreatureLevListCustomData> data = std::make_unique<CreatureLevListCustomData>();
             data->mSpawnActorId = -1;
             data->mSpawn = true;
 
-            ptr.getRefData().setCustomData(data.release());
+            ptr.getRefData().setCustomData(std::move(data));
         }
     }
 
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index 25f7fc4568..ae80855862 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -36,7 +36,7 @@ namespace MWClass
     public:
         MWWorld::DoorState mDoorState = MWWorld::DoorState::Idle;
 
-        MWWorld::CustomData *clone() const override;
+        std::unique_ptr<MWWorld::CustomData> clone() const override;
 
         DoorCustomData& asDoorCustomData() override
         {
@@ -48,9 +48,9 @@ namespace MWClass
         }
     };
 
-    MWWorld::CustomData *DoorCustomData::clone() const
+    std::unique_ptr<MWWorld::CustomData> DoorCustomData::clone() const
     {
-        return new DoorCustomData (*this);
+        return std::make_unique<DoorCustomData>(*this);
     }
 
     void Door::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
@@ -327,8 +327,7 @@ namespace MWClass
     {
         if (!ptr.getRefData().getCustomData())
         {
-            std::unique_ptr<DoorCustomData> data(new DoorCustomData);
-            ptr.getRefData().setCustomData(data.release());
+            ptr.getRefData().setCustomData(std::make_unique<DoorCustomData>());
         }
     }
 
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 5de4c197e6..248ef5d01e 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -253,7 +253,7 @@ namespace MWClass
         MWMechanics::Movement mMovement;
         MWWorld::InventoryStore mInventoryStore;
 
-        MWWorld::CustomData *clone() const override;
+        std::unique_ptr<MWWorld::CustomData> clone() const override;
 
         NpcCustomData& asNpcCustomData() override
         {
@@ -265,9 +265,9 @@ namespace MWClass
         }
     };
 
-    MWWorld::CustomData *NpcCustomData::clone() const
+    std::unique_ptr<MWWorld::CustomData> NpcCustomData::clone() const
     {
-        return new NpcCustomData (*this);
+        return std::make_unique<NpcCustomData>(*this);
     }
 
     const Npc::GMST& Npc::getGmst()
@@ -397,7 +397,7 @@ namespace MWClass
             data->mNpcStats.setGoldPool(gold);
 
             // store
-            ptr.getRefData().setCustomData (data.release());
+            ptr.getRefData().setCustomData(std::move(data));
 
             getInventoryStore(ptr).autoEquip(ptr);
         }
@@ -1302,8 +1302,7 @@ namespace MWClass
             if (!ptr.getRefData().getCustomData())
             {
                 // Create a CustomData, but don't fill it from ESM records (not needed)
-                std::unique_ptr<NpcCustomData> data (new NpcCustomData);
-                ptr.getRefData().setCustomData (data.release());
+                ptr.getRefData().setCustomData(std::make_unique<NpcCustomData>());
             }
         }
         else
diff --git a/apps/openmw/mwworld/containerstore.hpp b/apps/openmw/mwworld/containerstore.hpp
index 882f5efc44..bb8ca52737 100644
--- a/apps/openmw/mwworld/containerstore.hpp
+++ b/apps/openmw/mwworld/containerstore.hpp
@@ -153,7 +153,7 @@ namespace MWWorld
 
             virtual ~ContainerStore();
 
-            virtual ContainerStore* clone() { return new ContainerStore(*this); }
+            virtual std::unique_ptr<ContainerStore> clone() { return std::make_unique<ContainerStore>(*this); }
 
             ConstContainerStoreIterator cbegin (int mask = Type_All) const;
             ConstContainerStoreIterator cend() const;
diff --git a/apps/openmw/mwworld/customdata.hpp b/apps/openmw/mwworld/customdata.hpp
index 8af45e36ad..ee89dd2a8f 100644
--- a/apps/openmw/mwworld/customdata.hpp
+++ b/apps/openmw/mwworld/customdata.hpp
@@ -1,6 +1,8 @@
 #ifndef GAME_MWWORLD_CUSTOMDATA_H
 #define GAME_MWWORLD_CUSTOMDATA_H
 
+#include <memory>
+
 namespace MWClass
 {
     class CreatureCustomData;
@@ -19,7 +21,7 @@ namespace MWWorld
 
             virtual ~CustomData() {}
 
-            virtual CustomData *clone() const = 0;
+            virtual std::unique_ptr<CustomData> clone() const = 0;
 
             // Fast version of dynamic_cast<X&>. Needs to be overridden in the respective class.
 
diff --git a/apps/openmw/mwworld/inventorystore.hpp b/apps/openmw/mwworld/inventorystore.hpp
index 6809e63b29..32dc0d2e91 100644
--- a/apps/openmw/mwworld/inventorystore.hpp
+++ b/apps/openmw/mwworld/inventorystore.hpp
@@ -123,7 +123,7 @@ namespace MWWorld
 
             InventoryStore& operator= (const InventoryStore& store);
 
-            InventoryStore* clone() override { return new InventoryStore(*this); }
+            std::unique_ptr<ContainerStore> clone() override { return std::make_unique<InventoryStore>(*this); }
 
             ContainerStoreIterator add (const Ptr& itemPtr, int count, const Ptr& actorPtr, bool allowAutoEquip = true, bool resolve = true) override;
             ///< Add the item pointed to by \a ptr to this container. (Stacks automatically if needed)
diff --git a/apps/openmw/mwworld/refdata.cpp b/apps/openmw/mwworld/refdata.cpp
index 71ff6d040d..f6a445d619 100644
--- a/apps/openmw/mwworld/refdata.cpp
+++ b/apps/openmw/mwworld/refdata.cpp
@@ -40,8 +40,6 @@ namespace MWWorld
     void RefData::cleanup()
     {
         mBaseNode = nullptr;
-
-        delete mCustomData;
         mCustomData = nullptr;
     }
 
@@ -223,21 +221,20 @@ namespace MWWorld
         return mPosition;
     }
 
-    void RefData::setCustomData (CustomData *data)
+    void RefData::setCustomData(std::unique_ptr<CustomData>&& value) noexcept
     {
         mChanged = true; // We do not currently track CustomData, so assume anything with a CustomData is changed
-        delete mCustomData;
-        mCustomData = data;
+        mCustomData = std::move(value);
     }
 
     CustomData *RefData::getCustomData()
     {
-        return mCustomData;
+        return mCustomData.get();
     }
 
     const CustomData *RefData::getCustomData() const
     {
-        return mCustomData;
+        return mCustomData.get();
     }
 
     bool RefData::hasChanged() const
diff --git a/apps/openmw/mwworld/refdata.hpp b/apps/openmw/mwworld/refdata.hpp
index 738a6d53a8..5419a261b7 100644
--- a/apps/openmw/mwworld/refdata.hpp
+++ b/apps/openmw/mwworld/refdata.hpp
@@ -7,6 +7,7 @@
 #include "../mwscript/locals.hpp"
 
 #include <string>
+#include <memory>
 
 namespace SceneUtil
 {
@@ -44,7 +45,7 @@ namespace MWWorld
 
             ESM::AnimationState mAnimationState;
 
-            CustomData *mCustomData;
+            std::unique_ptr<CustomData> mCustomData;
 
             void copy (const RefData& refData);
 
@@ -117,7 +118,7 @@ namespace MWWorld
             void setPosition (const ESM::Position& pos);
             const ESM::Position& getPosition() const;
 
-            void setCustomData (CustomData *data);
+            void setCustomData(std::unique_ptr<CustomData>&& value) noexcept;
             ///< Set custom data (potentially replacing old custom data). The ownership of \a data is
             /// transferred to this.
 

From e380470558a1d810d7e5cd51c09a31ace376c1e6 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 3 Apr 2021 00:49:14 +0200
Subject: [PATCH 0516/2859] Add move ctor and assignment operator to RefData

---
 apps/openmw/mwworld/refdata.hpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/openmw/mwworld/refdata.hpp b/apps/openmw/mwworld/refdata.hpp
index 5419a261b7..8979c8505d 100644
--- a/apps/openmw/mwworld/refdata.hpp
+++ b/apps/openmw/mwworld/refdata.hpp
@@ -5,6 +5,7 @@
 #include <components/esm/animationstate.hpp>
 
 #include "../mwscript/locals.hpp"
+#include "../mwworld/customdata.hpp"
 
 #include <string>
 #include <memory>
@@ -69,6 +70,7 @@ namespace MWWorld
             /// perform these operations).
 
             RefData (const RefData& refData);
+            RefData (RefData&& other) noexcept = default;
 
             ~RefData();
 
@@ -77,6 +79,7 @@ namespace MWWorld
             /// perform this operations).
 
             RefData& operator= (const RefData& refData);
+            RefData& operator= (RefData&& other) noexcept = default;
 
             /// Return base node (can be a null pointer).
             SceneUtil::PositionAttitudeTransform* getBaseNode();

From bd33fa76b63536398e00ba416d3289a44beaf461 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 3 Apr 2021 12:59:44 +0200
Subject: [PATCH 0517/2859] Use CRTP to define CustomData clone function

---
 apps/openmw/mwclass/container.cpp       | 5 -----
 apps/openmw/mwclass/container.hpp       | 4 +---
 apps/openmw/mwclass/creature.cpp        | 9 +--------
 apps/openmw/mwclass/creaturelevlist.cpp | 9 +--------
 apps/openmw/mwclass/door.cpp            | 9 +--------
 apps/openmw/mwclass/npc.cpp             | 9 +--------
 apps/openmw/mwworld/customdata.hpp      | 9 +++++++++
 7 files changed, 14 insertions(+), 40 deletions(-)

diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index 2d7f300473..de560608c0 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -46,11 +46,6 @@ namespace MWClass
         mStore.readState(inventory);
     }
 
-    std::unique_ptr<MWWorld::CustomData> ContainerCustomData::clone() const
-    {
-        return std::make_unique<ContainerCustomData>(*this);
-    }
-
     ContainerCustomData& ContainerCustomData::asContainerCustomData()
     {
         return *this;
diff --git a/apps/openmw/mwclass/container.hpp b/apps/openmw/mwclass/container.hpp
index fc3e046f11..1c89370068 100644
--- a/apps/openmw/mwclass/container.hpp
+++ b/apps/openmw/mwclass/container.hpp
@@ -13,15 +13,13 @@ namespace ESM
 
 namespace MWClass
 {
-    class ContainerCustomData : public MWWorld::CustomData
+    class ContainerCustomData : public MWWorld::TypedCustomData<ContainerCustomData>
     {
         MWWorld::ContainerStore mStore;
     public:
         ContainerCustomData(const ESM::Container& container, MWWorld::CellStore* cell);
         ContainerCustomData(const ESM::InventoryState& inventory);
 
-        std::unique_ptr<MWWorld::CustomData> clone() const override;
-
         ContainerCustomData& asContainerCustomData() override;
         const ContainerCustomData& asContainerCustomData() const override;
 
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 2a55fb9fd9..6b8d2f3f25 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -51,7 +51,7 @@ namespace
 namespace MWClass
 {
 
-    class CreatureCustomData : public MWWorld::CustomData
+    class CreatureCustomData : public MWWorld::TypedCustomData<CreatureCustomData>
     {
     public:
         MWMechanics::CreatureStats mCreatureStats;
@@ -62,8 +62,6 @@ namespace MWClass
         CreatureCustomData(const CreatureCustomData& other);
         CreatureCustomData(CreatureCustomData&& other) noexcept = default;
 
-        std::unique_ptr<MWWorld::CustomData> clone() const override;
-
         CreatureCustomData& asCreatureCustomData() override
         {
             return *this;
@@ -81,11 +79,6 @@ namespace MWClass
     {
     }
 
-    std::unique_ptr<MWWorld::CustomData> CreatureCustomData::clone() const
-    {
-        return std::make_unique<CreatureCustomData>(*this);
-    }
-
     const Creature::GMST& Creature::getGmst()
     {
         static GMST gmst;
diff --git a/apps/openmw/mwclass/creaturelevlist.cpp b/apps/openmw/mwclass/creaturelevlist.cpp
index 3b401f1a3e..f86004c619 100644
--- a/apps/openmw/mwclass/creaturelevlist.cpp
+++ b/apps/openmw/mwclass/creaturelevlist.cpp
@@ -10,15 +10,13 @@
 
 namespace MWClass
 {
-    class CreatureLevListCustomData : public MWWorld::CustomData
+    class CreatureLevListCustomData : public MWWorld::TypedCustomData<CreatureLevListCustomData>
     {
     public:
         // actorId of the creature we spawned
         int mSpawnActorId;
         bool mSpawn; // Should a new creature be spawned?
 
-        std::unique_ptr<MWWorld::CustomData> clone() const override;
-
         CreatureLevListCustomData& asCreatureLevListCustomData() override
         {
             return *this;
@@ -29,11 +27,6 @@ namespace MWClass
         }
     };
 
-    std::unique_ptr<MWWorld::CustomData> CreatureLevListCustomData::clone() const
-    {
-        return std::make_unique<CreatureLevListCustomData>(*this);
-    }
-
     std::string CreatureLevList::getName (const MWWorld::ConstPtr& ptr) const
     {
         return "";
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index ae80855862..3a5ff0d9ae 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -31,13 +31,11 @@
 
 namespace MWClass
 {
-    class DoorCustomData : public MWWorld::CustomData
+    class DoorCustomData : public MWWorld::TypedCustomData<DoorCustomData>
     {
     public:
         MWWorld::DoorState mDoorState = MWWorld::DoorState::Idle;
 
-        std::unique_ptr<MWWorld::CustomData> clone() const override;
-
         DoorCustomData& asDoorCustomData() override
         {
             return *this;
@@ -48,11 +46,6 @@ namespace MWClass
         }
     };
 
-    std::unique_ptr<MWWorld::CustomData> DoorCustomData::clone() const
-    {
-        return std::make_unique<DoorCustomData>(*this);
-    }
-
     void Door::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
         if (!model.empty())
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 248ef5d01e..c5b352cb42 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -246,15 +246,13 @@ namespace
 namespace MWClass
 {
 
-    class NpcCustomData : public MWWorld::CustomData
+    class NpcCustomData : public MWWorld::TypedCustomData<NpcCustomData>
     {
     public:
         MWMechanics::NpcStats mNpcStats;
         MWMechanics::Movement mMovement;
         MWWorld::InventoryStore mInventoryStore;
 
-        std::unique_ptr<MWWorld::CustomData> clone() const override;
-
         NpcCustomData& asNpcCustomData() override
         {
             return *this;
@@ -265,11 +263,6 @@ namespace MWClass
         }
     };
 
-    std::unique_ptr<MWWorld::CustomData> NpcCustomData::clone() const
-    {
-        return std::make_unique<NpcCustomData>(*this);
-    }
-
     const Npc::GMST& Npc::getGmst()
     {
         static GMST gmst;
diff --git a/apps/openmw/mwworld/customdata.hpp b/apps/openmw/mwworld/customdata.hpp
index ee89dd2a8f..7200e7684c 100644
--- a/apps/openmw/mwworld/customdata.hpp
+++ b/apps/openmw/mwworld/customdata.hpp
@@ -40,6 +40,15 @@ namespace MWWorld
             virtual MWClass::CreatureLevListCustomData& asCreatureLevListCustomData();
             virtual const MWClass::CreatureLevListCustomData& asCreatureLevListCustomData() const;
     };
+
+    template <class T>
+    struct TypedCustomData : CustomData
+    {
+        std::unique_ptr<CustomData> clone() const final
+        {
+            return std::make_unique<T>(*static_cast<const T*>(this));
+        }
+    };
 }
 
 #endif

From bc8db8b8f5efe06ffccbc8b7f9fb05fee0642de8 Mon Sep 17 00:00:00 2001
From: Jacob Turnbull <jacob@turnbulltech.com>
Date: Tue, 6 Apr 2021 20:12:51 -0500
Subject: [PATCH 0518/2859] Fix for enchanted items being removed on item equip
 cycling when they are re-equipped

---
 apps/openmw/mwworld/actionequip.cpp | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwworld/actionequip.cpp b/apps/openmw/mwworld/actionequip.cpp
index 4cb0dbe511..23599b528e 100644
--- a/apps/openmw/mwworld/actionequip.cpp
+++ b/apps/openmw/mwworld/actionequip.cpp
@@ -91,13 +91,30 @@ namespace MWWorld
         // move all slots one towards begin(), then equip the item in the slot that is now free
         if (slot == slots_.first.end())
         {
-            for (slot=slots_.first.begin();slot!=slots_.first.end(); ++slot)
+            ContainerStoreIterator enchItem = invStore.getSelectedEnchantItem();
+            bool bReEquipEnchItem = false;
+            for (slot = slots_.first.begin(); slot != slots_.first.end(); ++slot)
             {
                 invStore.unequipSlot(*slot, actor, false);
-                if (slot+1 != slots_.first.end())
-                    invStore.equip(*slot, invStore.getSlot(*(slot+1)), actor);
+                if (slot + 1 != slots_.first.end())
+                {
+                    invStore.equip(*slot, invStore.getSlot(*(slot + 1)), actor);
+                }
                 else
+                {
                     invStore.equip(*slot, it, actor);
+                }
+
+                //if an enchanted item was re-equipped, set reEquipEnchItem = true
+                if (invStore.getSlot(*slot) == enchItem)
+                {
+                    bReEquipEnchItem = true;
+                }
+            }
+            //if re-equip flag is true, select the enchanted item again
+            if (bReEquipEnchItem)
+            {
+                invStore.setSelectedEnchantItem(enchItem);
             }
         }
     }

From 59720aea9a2eeed93e47974016a11012fd01643b Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Wed, 7 Apr 2021 12:07:03 +0400
Subject: [PATCH 0519/2859] Restore old aiming for melee combat

---
 apps/openmw/mwbase/world.hpp          |  2 +-
 apps/openmw/mwmechanics/aicombat.cpp  |  6 +++---
 apps/openmw/mwmechanics/character.cpp |  2 +-
 apps/openmw/mwworld/worldimp.cpp      | 10 ++++------
 apps/openmw/mwworld/worldimp.hpp      |  2 +-
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 5e844ffae7..3d55ad987b 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -607,7 +607,7 @@ namespace MWBase
 
             /// Return a vector aiming the actor's weapon towards a target.
             /// @note The length of the vector is the distance between actor and target.
-            virtual osg::Vec3f aimToTarget(const MWWorld::ConstPtr& actor, const MWWorld::ConstPtr& target) = 0;
+            virtual osg::Vec3f aimToTarget(const MWWorld::ConstPtr& actor, const MWWorld::ConstPtr& target, bool isRangedCombat) = 0;
 
             /// Return the distance between actor's weapon and target's collision box.
             virtual float getHitDistance(const MWWorld::ConstPtr& actor, const MWWorld::ConstPtr& target) = 0;
diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index 51fcb92c10..5edd59ded5 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -228,7 +228,6 @@ namespace MWMechanics
         const osg::Vec3f vActorPos(pos.asVec3());
         const osg::Vec3f vTargetPos(target.getRefData().getPosition().asVec3());
 
-        osg::Vec3f vAimDir = MWBase::Environment::get().getWorld()->aimToTarget(actor, target);
         float distToTarget = MWBase::Environment::get().getWorld()->getHitDistance(actor, target);
 
         storage.mReadyToAttack = (currentAction->isAttackingOrSpell() && distToTarget <= rangeAttack && storage.mLOS);
@@ -236,13 +235,14 @@ namespace MWMechanics
         if (isRangedCombat)
         {
             // rotate actor taking into account target movement direction and projectile speed
-            vAimDir = AimDirToMovingTarget(actor, target, storage.mLastTargetPos, AI_REACTION_TIME, (weapon ? weapon->mData.mType : 0), storage.mStrength);
+            osg::Vec3f vAimDir = AimDirToMovingTarget(actor, target, storage.mLastTargetPos, AI_REACTION_TIME, (weapon ? weapon->mData.mType : 0), storage.mStrength);
 
             storage.mMovement.mRotation[0] = getXAngleToDir(vAimDir);
             storage.mMovement.mRotation[2] = getZAngleToDir(vAimDir);
         }
         else
         {
+            osg::Vec3f vAimDir = MWBase::Environment::get().getWorld()->aimToTarget(actor, target, false);
             storage.mMovement.mRotation[0] = getXAngleToDir(vAimDir);
             storage.mMovement.mRotation[2] = getZAngleToDir((vTargetPos-vActorPos)); // using vAimDir results in spastic movements since the head is animated
         }
@@ -698,7 +698,7 @@ osg::Vec3f AimDirToMovingTarget(const MWWorld::Ptr& actor, const MWWorld::Ptr& t
     // idea: perpendicular to dir to target speed components of target move vector and projectile vector should be the same
 
     osg::Vec3f vTargetPos = target.getRefData().getPosition().asVec3();
-    osg::Vec3f vDirToTarget = MWBase::Environment::get().getWorld()->aimToTarget(actor, target);
+    osg::Vec3f vDirToTarget = MWBase::Environment::get().getWorld()->aimToTarget(actor, target, true);
     float distToTarget = vDirToTarget.length();
 
     osg::Vec3f vTargetMoveDir = vTargetPos - vLastTargetPos;
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 8c58fd943f..b83d313ce8 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -2955,7 +2955,7 @@ void CharacterController::updateHeadTracking(float duration)
             }
             else
                 // no head node to look at, fall back to look at center of collision box
-                direction = MWBase::Environment::get().getWorld()->aimToTarget(mPtr, mHeadTrackTarget);
+                direction = MWBase::Environment::get().getWorld()->aimToTarget(mPtr, mHeadTrackTarget, false);
         }
         direction.normalize();
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 5e0cdbb2b6..3b50dd6aac 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -3885,14 +3885,12 @@ namespace MWWorld
         return false;
     }
 
-    osg::Vec3f World::aimToTarget(const ConstPtr &actor, const ConstPtr &target)
+    osg::Vec3f World::aimToTarget(const ConstPtr &actor, const ConstPtr &target, bool isRangedCombat)
     {
         osg::Vec3f weaponPos = actor.getRefData().getPosition().asVec3();
-        osg::Vec3f weaponHalfExtents = mPhysics->getHalfExtents(actor);
-        osg::Vec3f targetPos = target.getRefData().getPosition().asVec3();
-        osg::Vec3f targetHalfExtents = mPhysics->getHalfExtents(target);
-        weaponPos.z() += weaponHalfExtents.z() * 2 * Constants::TorsoHeight;
-        targetPos.z() += targetHalfExtents.z();
+        float heightRatio = isRangedCombat ? 2.f * Constants::TorsoHeight : 1.f;
+        weaponPos.z() += mPhysics->getHalfExtents(actor).z() * heightRatio;
+        osg::Vec3f targetPos = mPhysics->getCollisionObjectPosition(target);
         return (targetPos - weaponPos);
     }
 
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index e2d3449304..929e035e9e 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -705,7 +705,7 @@ namespace MWWorld
 
             /// Return a vector aiming the actor's weapon towards a target.
             /// @note The length of the vector is the distance between actor and target.
-            osg::Vec3f aimToTarget(const MWWorld::ConstPtr& actor, const MWWorld::ConstPtr& target) override;
+            osg::Vec3f aimToTarget(const MWWorld::ConstPtr& actor, const MWWorld::ConstPtr& target, bool isRangedCombat) override;
 
             /// Return the distance between actor's weapon and target's collision box.
             float getHitDistance(const MWWorld::ConstPtr& actor, const MWWorld::ConstPtr& target) override;

From 44f2cb092346e9588e4e9d943548afaa65c90ee4 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 7 Apr 2021 17:30:21 +0200
Subject: [PATCH 0520/2859] Fix targeted scripts losing their targets when
 rearranging your load order

---
 apps/openmw/mwscript/globalscripts.cpp  | 9 ++++++++-
 apps/openmw/mwscript/globalscripts.hpp  | 2 +-
 apps/openmw/mwstate/statemanagerimp.cpp | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwscript/globalscripts.cpp b/apps/openmw/mwscript/globalscripts.cpp
index 1a7e3ebbc8..0d579abdc6 100644
--- a/apps/openmw/mwscript/globalscripts.cpp
+++ b/apps/openmw/mwscript/globalscripts.cpp
@@ -235,13 +235,20 @@ namespace MWScript
         }
     }
 
-    bool GlobalScripts::readRecord (ESM::ESMReader& reader, uint32_t type)
+    bool GlobalScripts::readRecord (ESM::ESMReader& reader, uint32_t type, const std::map<int, int>& contentFileMap)
     {
         if (type==ESM::REC_GSCR)
         {
             ESM::GlobalScript script;
             script.load (reader);
 
+            if (script.mTargetRef.hasContentFile())
+            {
+                auto iter = contentFileMap.find(script.mTargetRef.mContentFile);
+                if (iter != contentFileMap.end())
+                    script.mTargetRef.mContentFile = iter->second;
+            }
+
             auto iter = mScripts.find (script.mId);
 
             if (iter==mScripts.end())
diff --git a/apps/openmw/mwscript/globalscripts.hpp b/apps/openmw/mwscript/globalscripts.hpp
index c5c5a9a452..049e78804a 100644
--- a/apps/openmw/mwscript/globalscripts.hpp
+++ b/apps/openmw/mwscript/globalscripts.hpp
@@ -73,7 +73,7 @@ namespace MWScript
 
             void write (ESM::ESMWriter& writer, Loading::Listener& progress) const;
 
-            bool readRecord (ESM::ESMReader& reader, uint32_t type);
+            bool readRecord (ESM::ESMReader& reader, uint32_t type, const std::map<int, int>& contentFileMap);
             ///< Records for variables that do not exist are dropped silently.
             ///
             /// \return Known type?
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index 93f75c6f10..fb418b94ad 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -461,7 +461,7 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
 
                 case ESM::REC_GSCR:
 
-                    MWBase::Environment::get().getScriptManager()->getGlobalScripts().readRecord (reader, n.intval);
+                    MWBase::Environment::get().getScriptManager()->getGlobalScripts().readRecord (reader, n.intval, contentFileMap);
                     break;
 
                 case ESM::REC_GMAP:

From 3ad2335d115c7a4baa2290554ed998651c072cb9 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Wed, 7 Apr 2021 20:23:39 +0000
Subject: [PATCH 0521/2859] Fix FetchContent Bullet with MSVC

---
 extern/CMakeLists.txt | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index fc00ae2545..3842b8357b 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -35,9 +35,13 @@ if(NOT OPENMW_USE_SYSTEM_BULLET)
         set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
     else()
         set(BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE)
-        if(MSVC)
-            set(USE_MSVC_RUNTIME_LIBRARY_DLL ON CACHE BOOL "" FORCE)
-        endif()
+    endif()
+
+    if(MSVC)
+        # this setting is badly named - having it off forces the static runtime library,
+        # but having it on does nothing, letting the defaults get used.
+        # OpenMW uses the defaults, and you can't mix and match.
+        set(USE_MSVC_RUNTIME_LIBRARY_DLL ON CACHE BOOL "" FORCE)
     endif()
 
     # master on 12 Mar 2021

From d9376ee08e758d144491b47d799bcc0a415a05b2 Mon Sep 17 00:00:00 2001
From: Jacob Turnbull <jacob@turnbulltech.com>
Date: Wed, 7 Apr 2021 16:57:06 -0500
Subject: [PATCH 0522/2859] Trim down comment and change flag name

---
 apps/openmw/mwworld/actionequip.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwworld/actionequip.cpp b/apps/openmw/mwworld/actionequip.cpp
index 23599b528e..92cd044386 100644
--- a/apps/openmw/mwworld/actionequip.cpp
+++ b/apps/openmw/mwworld/actionequip.cpp
@@ -92,7 +92,7 @@ namespace MWWorld
         if (slot == slots_.first.end())
         {
             ContainerStoreIterator enchItem = invStore.getSelectedEnchantItem();
-            bool bReEquipEnchItem = false;
+            bool reEquip = false;
             for (slot = slots_.first.begin(); slot != slots_.first.end(); ++slot)
             {
                 invStore.unequipSlot(*slot, actor, false);
@@ -105,14 +105,13 @@ namespace MWWorld
                     invStore.equip(*slot, it, actor);
                 }
 
-                //if an enchanted item was re-equipped, set reEquipEnchItem = true
+                //Fix for issue of selected enchated item getting remmoved on cycle
                 if (invStore.getSlot(*slot) == enchItem)
                 {
-                    bReEquipEnchItem = true;
+                    reEquip = true;
                 }
             }
-            //if re-equip flag is true, select the enchanted item again
-            if (bReEquipEnchItem)
+            if (reEquip)
             {
                 invStore.setSelectedEnchantItem(enchItem);
             }

From d617d66a87fb58524f6a330b2c9e73559af192a0 Mon Sep 17 00:00:00 2001
From: CedricMocquillon <cedric.mocquillon@sage.com>
Date: Wed, 7 Apr 2021 18:58:46 +0200
Subject: [PATCH 0523/2859] Add file to BSA

---
 apps/bsatool/bsatool.cpp             |  43 +++++++-
 components/bsa/bsa_file.cpp          | 156 ++++++++++++++++++++++++++-
 components/bsa/bsa_file.hpp          |  41 +++++--
 components/bsa/compressedbsafile.cpp |  19 ++--
 components/bsa/compressedbsafile.hpp |   2 +-
 components/vfs/bsaarchive.cpp        |   4 +-
 6 files changed, 238 insertions(+), 27 deletions(-)

diff --git a/apps/bsatool/bsatool.cpp b/apps/bsatool/bsatool.cpp
index 3afbd777f8..8e8cf89186 100644
--- a/apps/bsatool/bsatool.cpp
+++ b/apps/bsatool/bsatool.cpp
@@ -20,6 +20,7 @@ struct Arguments
     std::string mode;
     std::string filename;
     std::string extractfile;
+    std::string addfile;
     std::string outdir;
 
     bool longformat;
@@ -36,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()
@@ -95,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;
@@ -126,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];
 
@@ -138,6 +154,7 @@ bool parseOptions (int argc, char** argv, 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,6 +174,12 @@ int main(int argc, char** argv)
         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")
@@ -165,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;
@@ -188,13 +213,13 @@ int list(std::unique_ptr<Bsa::BSAFile>& bsa, Arguments& info)
         {
             // Long format
             std::ios::fmtflags f(std::cout.flags());
-            std::cout << std::setw(50) << std::left << file.name;
+            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 << file.name << std::endl;
+            std::cout << file.name() << std::endl;
     }
 
     return 0;
@@ -253,7 +278,7 @@ int extractAll(std::unique_ptr<Bsa::BSAFile>& bsa, Arguments& info)
 {
     for (const auto &file : bsa->getList())
     {
-        std::string extractPath(file.name);
+        std::string extractPath(file.name());
         Misc::StringUtils::replaceAll(extractPath, "\\", "/");
 
         // Get the target path (the path the file will be extracted to)
@@ -272,7 +297,7 @@ int extractAll(std::unique_ptr<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(file.name);
+        Files::IStreamPtr data = bsa->getFile(file.name());
         bfs::ofstream out(target, std::ios::binary);
 
         // Write the file to disk
@@ -283,3 +308,11 @@ int extractAll(std::unique_ptr<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;
+}
diff --git a/components/bsa/bsa_file.cpp b/components/bsa/bsa_file.cpp
index f6220b7ce7..ef49a60d2b 100644
--- a/components/bsa/bsa_file.cpp
+++ b/components/bsa/bsa_file.cpp
@@ -27,6 +27,7 @@
 
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/fstream.hpp>
+#include <boost/filesystem/operations.hpp>
 
 using namespace Bsa;
 
@@ -37,6 +38,31 @@ void BSAFile::fail(const std::string &msg)
     throw std::runtime_error("BSA Error: " + msg + "\nArchive: " + mFilename);
 }
 
+//the getHash code is from bsapack from ghostwheel
+//the code is also the same as in https://github.com/arviceblot/bsatool_rs/commit/67cb59ec3aaeedc0849222ea387f031c33e48c81
+BSAFile::Hash getHash(const std::string& name)
+{
+    BSAFile::Hash hash;
+    unsigned l = (name.size() >> 1);
+    unsigned sum, off, temp, i, n;
+
+    for (sum = off = i = 0; i < l; i++) {
+        sum ^= (((unsigned)(name[i])) << (off & 0x1F));
+        off += 8;
+    }
+    hash.low = sum;
+
+    for (sum = off = 0; i < name.size(); i++) {
+        temp = (((unsigned)(name[i])) << (off & 0x1F));
+        sum ^= temp;
+        n = temp & 0x1F;
+        sum = (sum << (32 - n)) | (sum >> n);  // binary "rotate right"
+        off += 8;
+    }
+    hash.high = sum;
+    return hash;
+}
+
 /// Read header information from the input source
 void BSAFile::readHeader()
 {
@@ -113,14 +139,17 @@ void BSAFile::readHeader()
 
     // Read the offset info into a temporary buffer
     std::vector<uint32_t> offsets(3*filenum);
-    input.read(reinterpret_cast<char*>(&offsets[0]), 12*filenum);
+    input.read(reinterpret_cast<char*>(offsets.data()), 12*filenum);
 
     // Read the string table
     mStringBuf.resize(dirsize-12*filenum);
-    input.read(&mStringBuf[0], mStringBuf.size());
+    input.read(mStringBuf.data(), mStringBuf.size());
 
     // Check our position
     assert(input.tellg() == std::streampos(12+dirsize));
+    std::vector<Hash> hashes(filenum);
+    static_assert(sizeof(Hash) == 8);
+    input.read(reinterpret_cast<char*>(hashes.data()), 8*filenum);
 
     // Calculate the offset of the data buffer. All file offsets are
     // relative to this. 12 header bytes + directory + hash table
@@ -129,23 +158,72 @@ void BSAFile::readHeader()
 
     // Set up the the FileStruct table
     mFiles.resize(filenum);
+    size_t endOfNameBuffer = 0;
     for(size_t i=0;i<filenum;i++)
     {
         FileStruct &fs = mFiles[i];
         fs.fileSize = offsets[i*2];
         fs.offset = offsets[i*2+1] + fileDataOffset;
-        fs.name = &mStringBuf[offsets[2*filenum+i]];
+        auto namesOffset = offsets[2*filenum+i];
+        fs.setNameInfos(namesOffset, &mStringBuf);
+        fs.hash = hashes[i];
+
+        endOfNameBuffer = std::max(endOfNameBuffer, namesOffset + std::strlen(fs.name())+1);
+        assert(endOfNameBuffer <= mStringBuf.size());
 
         if(fs.offset + fs.fileSize > fsize)
             fail("Archive contains offsets outside itself");
 
         // Add the file name to the lookup
-        mLookup[fs.name] = i;
+        mLookup[fs.name()] = i;
     }
+    mStringBuf.resize(endOfNameBuffer);
+
+    std::sort(mFiles.begin(), mFiles.end(), [](const FileStruct& left, const FileStruct& right) {
+        return left.offset < right.offset;
+    });
 
     mIsLoaded = true;
 }
 
+/// Write header information to the output sink
+void Bsa::BSAFile::writeHeader()
+{
+    namespace bfs = boost::filesystem;
+    bfs::fstream output(mFilename, std::ios::binary | std::ios::in | std::ios::out);
+
+    uint32_t head[3];
+    head[0] = 0x100;
+    auto fileDataOffset = mFiles.empty() ? 12 : mFiles.front().offset;
+    head[1] = fileDataOffset - 12 - 8*mFiles.size();
+
+    output.seekp(0, std::ios_base::end);
+
+    head[2] = mFiles.size();
+    output.seekp(0);
+    output.write(reinterpret_cast<char*>(head), 12);
+
+    std::sort(mFiles.begin(), mFiles.end(), [](const FileStruct& left, const FileStruct& right) {
+        return std::make_pair(left.hash.low, left.hash.high) < std::make_pair(right.hash.low, right.hash.high);
+    });
+
+    size_t filenum = mFiles.size();
+    std::vector<uint32_t> offsets(3* filenum);
+    std::vector<Hash> hashes(filenum);
+    for(size_t i=0;i<filenum;i++)
+    {
+        auto& f = mFiles[i];
+        offsets[i*2] = f.fileSize;
+        offsets[i*2+1] = f.offset - fileDataOffset;
+        offsets[2*filenum+i] = f.namesOffset;
+        hashes[i] = f.hash;
+    }
+    output.write(reinterpret_cast<char*>(offsets.data()), sizeof(uint32_t)*offsets.size());
+    output.write(reinterpret_cast<char*>(mStringBuf.data()), mStringBuf.size());
+    output.seekp(fileDataOffset - 8*mFiles.size(), std::ios_base::beg);
+    output.write(reinterpret_cast<char*>(hashes.data()), sizeof(Hash)*hashes.size());
+}
+
 /// Get the index of a given file name, or -1 if not found
 int BSAFile::getIndex(const char *str) const
 {
@@ -162,7 +240,22 @@ int BSAFile::getIndex(const char *str) const
 void BSAFile::open(const std::string &file)
 {
     mFilename = file;
-    readHeader();
+    if(boost::filesystem::exists(file))
+        readHeader();
+    else
+    {
+        { boost::filesystem::fstream(mFilename, std::ios::binary | std::ios::out); }
+        writeHeader();
+    }
+}
+
+/// Close the archive, write the updated headers to the file
+void Bsa::BSAFile::close()
+{
+    if (!mHasChanged)
+        return;
+
+    writeHeader();
 }
 
 Files::IStreamPtr BSAFile::getFile(const char *file)
@@ -181,3 +274,56 @@ Files::IStreamPtr BSAFile::getFile(const FileStruct *file)
 {
     return Files::openConstrainedFileStream (mFilename.c_str (), file->offset, file->fileSize);
 }
+
+void Bsa::BSAFile::addFile(const std::string& filename, std::istream& file)
+{
+    namespace bfs = boost::filesystem;
+
+    auto newStartOfDataBuffer = 12 + (12 + 8) * (mFiles.size() + 1) + mStringBuf.size() + filename.size() + 1;
+    if (mFiles.empty())
+        bfs::resize_file(mFilename, newStartOfDataBuffer);
+
+    bfs::fstream stream(mFilename, std::ios::binary | std::ios::in | std::ios::out);
+
+    FileStruct newFile;
+    file.seekg(0, std::ios::end);
+    newFile.fileSize = file.tellg();
+    newFile.setNameInfos(mStringBuf.size(), &mStringBuf);
+    newFile.hash = getHash(filename);
+
+    if(mFiles.empty())
+        newFile.offset = newStartOfDataBuffer;
+    else
+    {
+        std::vector<char> buffer;
+        while (mFiles.front().offset < newStartOfDataBuffer) {
+            FileStruct& firstFile = mFiles.front();
+            buffer.resize(firstFile.fileSize);
+
+            stream.seekg(firstFile.offset, std::ios::beg);
+            stream.read(buffer.data(), firstFile.fileSize);
+
+            stream.seekp(0, std::ios::end);
+            firstFile.offset = stream.tellp();
+
+            stream.write(buffer.data(), firstFile.fileSize);
+
+            //ensure sort order is preserved
+            std::rotate(mFiles.begin(), mFiles.begin() + 1, mFiles.end());
+        }
+        stream.seekp(0, std::ios::end);
+        newFile.offset = stream.tellp();
+    }
+
+    mStringBuf.insert(mStringBuf.end(), filename.begin(), filename.end());
+    mStringBuf.push_back('\0');
+    mFiles.push_back(newFile);
+
+    mHasChanged = true;
+
+    mLookup[filename.c_str()] = mFiles.size() - 1;
+
+    stream.seekp(0, std::ios::end);
+    file.seekg(0, std::ios::beg);
+    stream << file.rdbuf();
+}
diff --git a/components/bsa/bsa_file.hpp b/components/bsa/bsa_file.hpp
index 3e7538401d..fa6e5fc1ce 100644
--- a/components/bsa/bsa_file.hpp
+++ b/components/bsa/bsa_file.hpp
@@ -43,20 +43,42 @@ namespace Bsa
 class BSAFile
 {
 public:
+
+    #pragma pack(push)
+    #pragma pack(1)
+    struct Hash
+    {
+        uint32_t low, high;
+    };
+    #pragma pack(pop)
+
     /// Represents one file entry in the archive
     struct FileStruct
     {
+        void setNameInfos(size_t index,
+            std::vector<char>* stringBuf
+        ) {
+            namesOffset = index;
+            namesBuffer = stringBuf;
+        }
+
         // File size and offset in file. We store the offset from the
         // beginning of the file, not the offset into the data buffer
         // (which is what is stored in the archive.)
         uint32_t fileSize, offset;
+        Hash hash;
 
         // Zero-terminated file name
-        const char *name;
+        const char* name() const { return &(*namesBuffer)[namesOffset]; };
+
+        uint32_t namesOffset = 0;
+        std::vector<char>* namesBuffer = nullptr;
     };
     typedef std::vector<FileStruct> FileList;
 
 protected:
+    bool mHasChanged = false;
+
     /// Table of files in this archive
     FileList mFiles;
 
@@ -72,7 +94,7 @@ protected:
     /// Case insensitive string comparison
     struct iltstr
     {
-        bool operator()(const char *s1, const char *s2) const
+        bool operator()(const std::string& s1, const std::string& s2) const
         { return Misc::StringUtils::ciLess(s1, s2); }
     };
 
@@ -80,7 +102,7 @@ protected:
         the files[] vector above. The iltstr ensures that file name
         checks are case insensitive.
     */
-    typedef std::map<const char*, int, iltstr> Lookup;
+    typedef std::map<std::string, int, iltstr> Lookup;
     Lookup mLookup;
 
     /// Error handling
@@ -88,9 +110,7 @@ protected:
 
     /// Read header information from the input source
     virtual void readHeader();
-
-    /// Read header information from the input source
-
+    virtual void writeHeader();
 
     /// Get the index of a given file name, or -1 if not found
     /// @note Thread safe.
@@ -106,11 +126,16 @@ public:
       : mIsLoaded(false)
     { }
 
-    virtual ~BSAFile() = default;
+    virtual ~BSAFile()
+    {
+        close();
+    }
 
     /// Open an archive file.
     void open(const std::string &file);
 
+    void close();
+
     /* -----------------------------------
      * Archive file routines
      * -----------------------------------
@@ -131,6 +156,8 @@ public:
     */
     virtual Files::IStreamPtr getFile(const FileStruct* file);
 
+    virtual void addFile(const std::string& filename, std::istream& file);
+
     /// Get a list of all files
     /// @note Thread safe.
     const FileList &getList() const
diff --git a/components/bsa/compressedbsafile.cpp b/components/bsa/compressedbsafile.cpp
index 77e477ac58..aaeb5bffa3 100644
--- a/components/bsa/compressedbsafile.cpp
+++ b/components/bsa/compressedbsafile.cpp
@@ -226,7 +226,6 @@ void CompressedBSAFile::readHeader()
             FileStruct fileStruct{};
             fileStruct.fileSize = file.getSizeWithoutCompressionFlag();
             fileStruct.offset = file.offset;
-            fileStruct.name = nullptr;
             mFiles.push_back(fileStruct);
 
             fullPaths.push_back(folder);
@@ -249,7 +248,7 @@ void CompressedBSAFile::readHeader()
         }
 
         //The vector guarantees that its elements occupy contiguous memory
-        mFiles[fileIndex].name = reinterpret_cast<char*>(mStringBuf.data() + mStringBuffOffset);
+        mFiles[fileIndex].setNameInfos(mStringBuffOffset, &mStringBuf);
 
         fullPaths.at(fileIndex) += "\\" + std::string(mStringBuf.data() + mStringBuffOffset);
 
@@ -276,7 +275,7 @@ void CompressedBSAFile::readHeader()
             fullPaths.at(fileIndex).c_str() + stringLength + 1u,
             mStringBuf.data() + mStringBuffOffset);
 
-        mFiles[fileIndex].name = reinterpret_cast<char*>(mStringBuf.data() + mStringBuffOffset);
+        mFiles[fileIndex].setNameInfos(mStringBuffOffset, &mStringBuf);
 
         mLookup[reinterpret_cast<char*>(mStringBuf.data() + mStringBuffOffset)] = fileIndex;
         mStringBuffOffset += stringLength + 1u;
@@ -320,13 +319,19 @@ CompressedBSAFile::FileRecord CompressedBSAFile::getFileRecord(const std::string
 
 Files::IStreamPtr CompressedBSAFile::getFile(const FileStruct* file) 
 {
-    FileRecord fileRec = getFileRecord(file->name);
+    FileRecord fileRec = getFileRecord(file->name());
     if (!fileRec.isValid()) {
-        fail("File not found: " + std::string(file->name));
+        fail("File not found: " + std::string(file->name()));
     }
     return getFile(fileRec);
 }
 
+void CompressedBSAFile::addFile(const std::string& filename, std::istream& file)
+{
+    assert(false); //not implemented yet
+    fail("Add file is not implemented for compressed BSA: " + filename);
+}
+
 Files::IStreamPtr CompressedBSAFile::getFile(const char* file)
 {
     FileRecord fileRec = getFileRecord(file);
@@ -430,10 +435,10 @@ void CompressedBSAFile::convertCompressedSizesToUncompressed()
 {
     for (auto & mFile : mFiles)
     {
-        const FileRecord& fileRecord = getFileRecord(mFile.name);
+        const FileRecord& fileRecord = getFileRecord(mFile.name());
         if (!fileRecord.isValid())
         {
-            fail("Could not find file " + std::string(mFile.name) + " in BSA");
+            fail("Could not find file " + std::string(mFile.name()) + " in BSA");
         }
 
         if (!fileRecord.isCompressed(mCompressedByDefault))
diff --git a/components/bsa/compressedbsafile.hpp b/components/bsa/compressedbsafile.hpp
index deddfae38b..215a1fc494 100644
--- a/components/bsa/compressedbsafile.hpp
+++ b/components/bsa/compressedbsafile.hpp
@@ -94,7 +94,7 @@ namespace Bsa
        
         Files::IStreamPtr getFile(const char* filePath) override;
         Files::IStreamPtr getFile(const FileStruct* fileStruct) override;
-        
+        void addFile(const std::string& filename, std::istream& file) override;
     };
 }
 
diff --git a/components/vfs/bsaarchive.cpp b/components/vfs/bsaarchive.cpp
index e6d779aabc..90899ac612 100644
--- a/components/vfs/bsaarchive.cpp
+++ b/components/vfs/bsaarchive.cpp
@@ -32,7 +32,7 @@ void BsaArchive::listResources(std::map<std::string, File *> &out, char (*normal
 {
     for (std::vector<BsaArchiveFile>::iterator it = mResources.begin(); it != mResources.end(); ++it)
     {
-        std::string ent = it->mInfo->name;
+        std::string ent = it->mInfo->name();
         std::transform(ent.begin(), ent.end(), ent.begin(), normalize_function);
 
         out[ent] = &*it;
@@ -43,7 +43,7 @@ bool BsaArchive::contains(const std::string& file, char (*normalize_function)(ch
 {
     for (const auto& it : mResources)
     {
-        std::string ent = it.mInfo->name;
+        std::string ent = it.mInfo->name();
         std::transform(ent.begin(), ent.end(), ent.begin(), normalize_function);
         if(file == ent)
             return true;

From 2cb4b62b837353addec6bd48b220b9ccd1d4e232 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matja=C5=BE=20Lamut?= <matjaz.lamut@gmail.com>
Date: Thu, 8 Apr 2021 16:32:38 +0000
Subject: [PATCH 0524/2859] De-hardcode references to mesh files used by the
 sky.

---
 apps/openmw/mwrender/sky.cpp | 37 +++++++++++++++++++-----------------
 files/settings-default.cfg   | 24 +++++++++++++++++++++++
 2 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index 5a6ec06e56..2f2882368f 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -45,6 +45,9 @@
 #include <components/sceneutil/visitor.hpp>
 #include <components/sceneutil/shadow.hpp>
 
+#include <components/settings/settings.hpp>
+#include <components/misc/stringops.hpp>
+
 #include <components/nifosg/particle.hpp>
 
 #include "../mwbase/environment.hpp"
@@ -1164,7 +1167,7 @@ void SkyManager::create()
 {
     assert(!mCreated);
 
-    mAtmosphereDay = mSceneManager->getInstance("meshes/sky_atmosphere.nif", mEarlyRenderBinRoot);
+    mAtmosphereDay = mSceneManager->getInstance(Settings::Manager::getString("skyatmosphere", "Models"), mEarlyRenderBinRoot);
     ModVertexAlphaVisitor modAtmosphere(0);
     mAtmosphereDay->accept(modAtmosphere);
 
@@ -1176,10 +1179,10 @@ void SkyManager::create()
     mEarlyRenderBinRoot->addChild(mAtmosphereNightNode);
 
     osg::ref_ptr<osg::Node> atmosphereNight;
-    if (mSceneManager->getVFS()->exists("meshes/sky_night_02.nif"))
-        atmosphereNight = mSceneManager->getInstance("meshes/sky_night_02.nif", mAtmosphereNightNode);
+    if (mSceneManager->getVFS()->exists(Settings::Manager::getString("skynight02", "Models")))
+        atmosphereNight = mSceneManager->getInstance(Settings::Manager::getString("skynight02", "Models"), mAtmosphereNightNode);
     else
-        atmosphereNight = mSceneManager->getInstance("meshes/sky_night_01.nif", mAtmosphereNightNode);
+        atmosphereNight = mSceneManager->getInstance(Settings::Manager::getString("skynight01", "Models"), mAtmosphereNightNode);
     atmosphereNight->getOrCreateStateSet()->setAttributeAndModes(createAlphaTrackingUnlitMaterial(), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
     ModVertexAlphaVisitor modStars(2);
     atmosphereNight->accept(modStars);
@@ -1193,14 +1196,14 @@ void SkyManager::create()
 
     mCloudNode = new osg::PositionAttitudeTransform;
     mEarlyRenderBinRoot->addChild(mCloudNode);
-    mCloudMesh = mSceneManager->getInstance("meshes/sky_clouds_01.nif", mCloudNode);
+    mCloudMesh = mSceneManager->getInstance(Settings::Manager::getString("skyclouds", "Models"), mCloudNode);
     ModVertexAlphaVisitor modClouds(1);
     mCloudMesh->accept(modClouds);
     mCloudUpdater = new CloudUpdater;
     mCloudUpdater->setOpacity(1.f);
     mCloudMesh->addUpdateCallback(mCloudUpdater);
 
-    mCloudMesh2 = mSceneManager->getInstance("meshes/sky_clouds_01.nif", mCloudNode);
+    mCloudMesh2 = mSceneManager->getInstance(Settings::Manager::getString("skyclouds", "Models"), mCloudNode);
     mCloudMesh2->accept(modClouds);
     mCloudUpdater2 = new CloudUpdater;
     mCloudUpdater2->setOpacity(0.f);
@@ -1597,7 +1600,7 @@ void SkyManager::update(float duration)
         if (mParticleNode)
         {
             // Morrowind deliberately rotates the blizzard mesh, so so should we.
-            if (mCurrentParticleEffect == "meshes\\blizzard.nif")
+            if (mCurrentParticleEffect == Settings::Manager::getString("weatherblizzard", "Models"))
                 quat.makeRotate(osg::Vec3f(-1,0,0), mStormDirection);
             mParticleNode->setAttitude(quat);
         }
@@ -1897,16 +1900,16 @@ void SkyManager::setWaterHeight(float height)
 
 void SkyManager::listAssetsToPreload(std::vector<std::string>& models, std::vector<std::string>& textures)
 {
-    models.emplace_back("meshes/sky_atmosphere.nif");
-    if (mSceneManager->getVFS()->exists("meshes/sky_night_02.nif"))
-        models.emplace_back("meshes/sky_night_02.nif");
-    models.emplace_back("meshes/sky_night_01.nif");
-    models.emplace_back("meshes/sky_clouds_01.nif");
-
-    models.emplace_back("meshes\\ashcloud.nif");
-    models.emplace_back("meshes\\blightcloud.nif");
-    models.emplace_back("meshes\\snow.nif");
-    models.emplace_back("meshes\\blizzard.nif");
+    models.emplace_back(Settings::Manager::getString("skyatmosphere", "Models"));
+    if (mSceneManager->getVFS()->exists(Settings::Manager::getString("skynight02", "Models")))
+        models.emplace_back(Settings::Manager::getString("skynight02", "Models"));
+    models.emplace_back(Settings::Manager::getString("skynight01", "Models"));
+    models.emplace_back(Settings::Manager::getString("skyclouds", "Models"));
+
+    models.emplace_back(Settings::Manager::getString("weatherashcloud", "Models"));
+    models.emplace_back(Settings::Manager::getString("weatherblightcloud", "Models"));
+    models.emplace_back(Settings::Manager::getString("weathersnow", "Models"));
+    models.emplace_back(Settings::Manager::getString("weatherblizzard", "Models"));
 
     textures.emplace_back("textures/tx_mooncircle_full_s.dds");
     textures.emplace_back("textures/tx_mooncircle_full_m.dds");
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index d439c46351..78487b1735 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -1005,6 +1005,30 @@ xbaseanimfemalekf = meshes/xbase_anim_female.kf
 # File to load xargonianswimkna animations from
 xargonianswimknakf = meshes/xargonian_swimkna.kf
 
+# Sky atmosphere mesh
+skyatmosphere = meshes/sky_atmosphere.nif
+
+# Sky clouds mesh 
+skyclouds = meshes/sky_clouds_01.nif
+
+# Sky stars mesh 01
+skynight01 = meshes/sky_night_01.nif
+
+# Sky stars mesh 02
+skynight02 = meshes/sky_night_02.nif
+
+# Ash clouds weather effect
+weatherashcloud = meshes/ashcloud.nif
+
+# Blight clouds weather effect
+weatherblightcloud = meshes/blightcloud.nif
+
+# Snow falling weather effect
+weathersnow = meshes/snow.nif
+
+# Blizzard weather effect
+weatherblizzard = meshes/blizzard.nif
+
 [Groundcover]
 
 # enable separate groundcover handling

From 7f577f5f08306058a434aa1fc90a54b0260b5391 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 8 Apr 2021 19:38:42 +0200
Subject: [PATCH 0525/2859] Do not compare hash in tests

Different std libraries have different implementation that produce different
results for the same values.
---
 apps/openmw_test_suite/esm/variant.cpp | 32 ++++++++++++--------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/apps/openmw_test_suite/esm/variant.cpp b/apps/openmw_test_suite/esm/variant.cpp
index c00f73d730..9615222fea 100644
--- a/apps/openmw_test_suite/esm/variant.cpp
+++ b/apps/openmw_test_suite/esm/variant.cpp
@@ -420,7 +420,6 @@ namespace
         Variant mVariant;
         Variant::Format mFormat;
         std::size_t mDataSize {};
-        std::size_t mDataHash {};
     };
 
     std::string write(const Variant& variant, const Variant::Format format)
@@ -442,11 +441,10 @@ namespace
         return result;
     }
 
-    Variant writeAndRead(const Variant& variant, const Variant::Format format, std::size_t dataSize, std::size_t dataHash)
+    Variant writeAndRead(const Variant& variant, const Variant::Format format, std::size_t dataSize)
     {
         const std::string data = write(variant, format);
         EXPECT_EQ(data.size(), dataSize);
-        EXPECT_EQ(std::hash<std::string>{}(data), dataHash);
         return read(format, data);
     }
 
@@ -455,20 +453,20 @@ namespace
     TEST_P(ESMVariantToESMTest, deserialized_is_equal_to_serialized)
     {
         const auto param = GetParam();
-        const auto result = writeAndRead(param.mVariant, param.mFormat, param.mDataSize, param.mDataHash);
+        const auto result = writeAndRead(param.mVariant, param.mFormat, param.mDataSize);
         ASSERT_EQ(param.mVariant, result);
     }
 
     INSTANTIATE_TEST_SUITE_P(VariantAndData, ESMVariantToESMTest, Values(
-        WriteToESMTestCase {Variant(), Variant::Format_Gmst, 324, 10398667754238537314ul},
-        WriteToESMTestCase {Variant(int{42}), Variant::Format_Global, 345, 2440845426097842853ul},
-        WriteToESMTestCase {Variant(float{2.7f}), Variant::Format_Global, 345, 8428720798053904009ul},
-        WriteToESMTestCase {Variant(float{2.7f}), Variant::Format_Info, 336, 11930997575130354755ul},
-        WriteToESMTestCase {Variant(float{2.7f}), Variant::Format_Local, 336, 11930997575130354755ul},
-        WriteToESMTestCase {makeVariant(VT_Short, 42), Variant::Format_Global, 345, 7812065815960720679ul},
-        WriteToESMTestCase {makeVariant(VT_Short, 42), Variant::Format_Local, 334, 5017869102981712080ul},
-        WriteToESMTestCase {makeVariant(VT_Int, 42), Variant::Format_Info, 336, 12560431547347287906ul},
-        WriteToESMTestCase {makeVariant(VT_Int, 42), Variant::Format_Local, 336, 12560431547347287906ul}
+        WriteToESMTestCase {Variant(), Variant::Format_Gmst, 324},
+        WriteToESMTestCase {Variant(int{42}), Variant::Format_Global, 345},
+        WriteToESMTestCase {Variant(float{2.7f}), Variant::Format_Global, 345},
+        WriteToESMTestCase {Variant(float{2.7f}), Variant::Format_Info, 336},
+        WriteToESMTestCase {Variant(float{2.7f}), Variant::Format_Local, 336},
+        WriteToESMTestCase {makeVariant(VT_Short, 42), Variant::Format_Global, 345},
+        WriteToESMTestCase {makeVariant(VT_Short, 42), Variant::Format_Local, 334},
+        WriteToESMTestCase {makeVariant(VT_Int, 42), Variant::Format_Info, 336},
+        WriteToESMTestCase {makeVariant(VT_Int, 42), Variant::Format_Local, 336}
     ));
 
     struct ESMVariantToESMNoneTest : TestWithParam<WriteToESMTestCase> {};
@@ -476,14 +474,14 @@ namespace
     TEST_P(ESMVariantToESMNoneTest, deserialized_is_none)
     {
         const auto param = GetParam();
-        const auto result = writeAndRead(param.mVariant, param.mFormat, param.mDataSize, param.mDataHash);
+        const auto result = writeAndRead(param.mVariant, param.mFormat, param.mDataSize);
         ASSERT_EQ(Variant(), result);
     }
 
     INSTANTIATE_TEST_SUITE_P(VariantAndData, ESMVariantToESMNoneTest, Values(
-        WriteToESMTestCase {Variant(float{2.7f}), Variant::Format_Gmst, 336, 11930997575130354755ul},
-        WriteToESMTestCase {Variant(std::string("foo")), Variant::Format_Gmst, 335, 7604528240659685057ul},
-        WriteToESMTestCase {makeVariant(VT_Int, 42), Variant::Format_Gmst, 336, 12560431547347287906ul}
+        WriteToESMTestCase {Variant(float{2.7f}), Variant::Format_Gmst, 336},
+        WriteToESMTestCase {Variant(std::string("foo")), Variant::Format_Gmst, 335},
+        WriteToESMTestCase {makeVariant(VT_Int, 42), Variant::Format_Gmst, 336}
     ));
 
     struct ESMVariantWriteToESMFailTest : TestWithParam<WriteToESMTestCase> {};

From 8e1c92d9afa951e1dd4195e81a6161266fbef6e0 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 4 Apr 2021 19:17:10 +0200
Subject: [PATCH 0526/2859] Use std::variant for ESM::Variant implementation

---
 apps/openmw_test_suite/esm/variant.cpp |  18 +--
 components/esm/variant.cpp             | 177 ++++++-----------------
 components/esm/variant.hpp             |  38 ++---
 components/esm/variantimp.cpp          | 188 +++----------------------
 components/esm/variantimp.hpp          | 181 ++++--------------------
 5 files changed, 127 insertions(+), 475 deletions(-)

diff --git a/apps/openmw_test_suite/esm/variant.cpp b/apps/openmw_test_suite/esm/variant.cpp
index 9615222fea..10d35e486c 100644
--- a/apps/openmw_test_suite/esm/variant.cpp
+++ b/apps/openmw_test_suite/esm/variant.cpp
@@ -180,19 +180,19 @@ namespace
 
     TEST(ESMVariantGetStringTest, for_default_constructed_should_throw_exception)
     {
-        ASSERT_THROW(Variant().getString(), std::runtime_error);
+        ASSERT_THROW(Variant().getString(), std::bad_variant_access);
     }
 
     TEST(ESMVariantGetStringTest, for_constructed_from_int_should_throw_exception)
     {
         const Variant variant(int{42});
-        ASSERT_THROW(variant.getString(), std::runtime_error);
+        ASSERT_THROW(variant.getString(), std::bad_variant_access);
     }
 
     TEST(ESMVariantGetStringTest, for_constructed_from_float_should_throw_exception)
     {
         const Variant variant(float{2.7});
-        ASSERT_THROW(variant.getString(), std::runtime_error);
+        ASSERT_THROW(variant.getString(), std::bad_variant_access);
     }
 
     TEST(ESMVariantGetStringTest, for_constructed_from_string_should_return_same_value)
@@ -372,40 +372,40 @@ namespace
     TEST(ESMVariantSetStringTest, for_default_constructed_should_throw_exception)
     {
         Variant variant;
-        ASSERT_THROW(variant.setString("foo"), std::runtime_error);
+        ASSERT_THROW(variant.setString("foo"), std::bad_variant_access);
     }
 
     TEST(ESMVariantSetStringTest, for_unknown_should_throw_exception)
     {
         Variant variant;
         variant.setType(VT_Unknown);
-        ASSERT_THROW(variant.setString("foo"), std::runtime_error);
+        ASSERT_THROW(variant.setString("foo"), std::bad_variant_access);
     }
 
     TEST(ESMVariantSetStringTest, for_default_int_should_throw_exception)
     {
         Variant variant(int{13});
-        ASSERT_THROW(variant.setString("foo"), std::runtime_error);
+        ASSERT_THROW(variant.setString("foo"), std::bad_variant_access);
     }
 
     TEST(ESMVariantSetStringTest, for_int_should_throw_exception)
     {
         Variant variant;
         variant.setType(VT_Int);
-        ASSERT_THROW(variant.setString("foo"), std::runtime_error);
+        ASSERT_THROW(variant.setString("foo"), std::bad_variant_access);
     }
 
     TEST(ESMVariantSetStringTest, for_short_should_throw_exception)
     {
         Variant variant;
         variant.setType(VT_Short);
-        ASSERT_THROW(variant.setString("foo"), std::runtime_error);
+        ASSERT_THROW(variant.setString("foo"), std::bad_variant_access);
     }
 
     TEST(ESMVariantSetStringTest, for_float_should_throw_exception)
     {
         Variant variant(float{2.7f});
-        ASSERT_THROW(variant.setString("foo"), std::runtime_error);
+        ASSERT_THROW(variant.setString("foo"), std::bad_variant_access);
     }
 
     TEST(ESMVariantSetStringTest, for_string_should_change_value)
diff --git a/components/esm/variant.cpp b/components/esm/variant.cpp
index cbcb6e0024..3e0417ef72 100644
--- a/components/esm/variant.cpp
+++ b/components/esm/variant.cpp
@@ -14,106 +14,53 @@ namespace
     const uint32_t INTV = ESM::FourCC<'I','N','T','V'>::value;
     const uint32_t FLTV = ESM::FourCC<'F','L','T','V'>::value;
     const uint32_t STTV = ESM::FourCC<'S','T','T','V'>::value;
-}
-
-ESM::Variant::Variant() : mType (VT_None), mData (nullptr) {}
-
-ESM::Variant::Variant(const std::string &value)
-{
-    mData = nullptr;
-    mType = VT_None;
-    setType(VT_String);
-    setString(value);
-}
-
-ESM::Variant::Variant(int value)
-{
-    mData = nullptr;
-    mType = VT_None;
-    setType(VT_Long);
-    setInteger(value);
-}
-
-ESM::Variant::Variant(float value)
-{
-    mData = nullptr;
-    mType = VT_None;
-    setType(VT_Float);
-    setFloat(value);
-}
-
-ESM::Variant::~Variant()
-{
-    delete mData;
-}
 
-ESM::Variant& ESM::Variant::operator= (const Variant& variant)
-{
-    if (&variant!=this)
+    template <typename T, bool orDefault = false>
+    struct GetValue
     {
-        VariantDataBase *newData = variant.mData ? variant.mData->clone() : nullptr;
-
-        delete mData;
+        T operator()(int value) const { return static_cast<T>(value); }
 
-        mType = variant.mType;
-        mData = newData;
-    }
+        T operator()(float value) const { return static_cast<T>(value); }
 
-    return *this;
-}
+        template <typename V>
+        T operator()(const V&) const
+        {
+            if constexpr (orDefault)
+                return T {};
+            else
+                throw std::runtime_error("cannot convert variant");
+        }
+    };
 
-ESM::Variant& ESM::Variant::operator= (Variant&& variant)
-{
-    if (&variant!=this)
+    template <typename T>
+    struct SetValue
     {
-        delete mData;
-
-        mType = variant.mType;
-        mData = variant.mData;
-
-        variant.mData = nullptr;
-    }
+        T mValue;
 
-    return *this;
-}
+        explicit SetValue(T value) : mValue(value) {}
 
-ESM::Variant::Variant (const Variant& variant)
-: mType (variant.mType), mData (variant.mData ? variant.mData->clone() : nullptr)
-{}
+        void operator()(int& value) const { value = static_cast<int>(mValue); }
 
-ESM::Variant::Variant(Variant&& variant)
-: mType (variant.mType), mData (variant.mData)
-{
-    variant.mData = nullptr;
-}
+        void operator()(float& value) const { value = static_cast<float>(mValue); }
 
-ESM::VarType ESM::Variant::getType() const
-{
-    return mType;
+        template <typename V>
+        void operator()(V&) const { throw std::runtime_error("cannot convert variant"); }
+    };
 }
 
 std::string ESM::Variant::getString() const
 {
-    if (!mData)
-        throw std::runtime_error ("can not convert empty variant to string");
-
-    return mData->getString();
+    return std::get<std::string>(mData);
 }
 
 int ESM::Variant::getInteger() const
 {
-    if (!mData)
-        throw std::runtime_error ("can not convert empty variant to integer");
-
-    return mData->getInteger();
+    return std::visit(GetValue<int>{}, mData);
 }
 
 float ESM::Variant::getFloat() const
 {
-    if (!mData)
-        throw std::runtime_error ("can not convert empty variant to float");
-
-    return mData->getFloat();
+    return std::visit(GetValue<float>{}, mData);
 }
 
 void ESM::Variant::read (ESMReader& esm, Format format)
@@ -202,9 +149,7 @@ void ESM::Variant::read (ESMReader& esm, Format format)
 
     setType (type);
 
-    // data
-    if (mData)
-        mData->read (esm, format, mType);
+    std::visit(ReadESMVariantValue {esm, format, mType}, mData);
 }
 
 void ESM::Variant::write (ESMWriter& esm, Format format) const
@@ -227,7 +172,7 @@ void ESM::Variant::write (ESMWriter& esm, Format format) const
         // nothing to do here for GMST format
     }
     else
-        mData->write (esm, format, mType);
+        std::visit(WriteESMVariantValue {esm, format, mType}, mData);
 }
 
 void ESM::Variant::write (std::ostream& stream) const
@@ -246,27 +191,27 @@ void ESM::Variant::write (std::ostream& stream) const
 
         case VT_Short:
 
-            stream << "variant short: " << mData->getInteger();
+            stream << "variant short: " << std::get<int>(mData);
             break;
 
         case VT_Int:
 
-            stream << "variant int: " << mData->getInteger();
+            stream << "variant int: " << std::get<int>(mData);
             break;
 
         case VT_Long:
 
-            stream << "variant long: " << mData->getInteger();
+            stream << "variant long: " << std::get<int>(mData);
             break;
 
         case VT_Float:
 
-            stream << "variant float: " << mData->getFloat();
+            stream << "variant float: " << std::get<float>(mData);
             break;
 
         case VT_String:
 
-            stream << "variant string: \"" << mData->getString() << "\"";
+            stream << "variant string: \"" << std::get<std::string>(mData) << "\"";
             break;
     }
 }
@@ -275,74 +220,50 @@ void ESM::Variant::setType (VarType type)
 {
     if (type!=mType)
     {
-        VariantDataBase *newData = nullptr;
-
         switch (type)
         {
             case VT_Unknown:
             case VT_None:
-
-                break; // no data
+                mData = std::monostate {};
+                break;
 
             case VT_Short:
             case VT_Int:
             case VT_Long:
-
-                newData = new VariantIntegerData (mData);
+                mData = std::visit(GetValue<int, true>{}, mData);
                 break;
 
             case VT_Float:
-
-                newData = new VariantFloatData (mData);
+                mData = std::visit(GetValue<float, true>{}, mData);
                 break;
 
             case VT_String:
-
-                newData = new VariantStringData (mData);
+                mData = std::string {};
                 break;
         }
 
-        delete mData;
-        mData = newData;
         mType = type;
     }
 }
 
 void ESM::Variant::setString (const std::string& value)
 {
-    if (!mData)
-        throw std::runtime_error ("can not assign string to empty variant");
-
-    mData->setString (value);
+    std::get<std::string>(mData) = value;
 }
 
-void ESM::Variant::setInteger (int value)
+void ESM::Variant::setString (std::string&& value)
 {
-    if (!mData)
-        throw std::runtime_error ("can not assign integer to empty variant");
-
-    mData->setInteger (value);
+    std::get<std::string>(mData) = std::move(value);
 }
 
-void ESM::Variant::setFloat (float value)
+void ESM::Variant::setInteger (int value)
 {
-    if (!mData)
-        throw std::runtime_error ("can not assign float to empty variant");
-
-    mData->setFloat (value);
+    std::visit(SetValue(value), mData);
 }
 
-bool ESM::Variant::isEqual (const Variant& value) const
+void ESM::Variant::setFloat (float value)
 {
-    if (mType!=value.mType)
-        return false;
-
-    if (!mData)
-        return true;
-
-    assert (value.mData);
-
-    return mData->isEqual (*value.mData);
+    std::visit(SetValue(value), mData);
 }
 
 std::ostream& ESM::operator<< (std::ostream& stream, const Variant& value)
@@ -350,13 +271,3 @@ std::ostream& ESM::operator<< (std::ostream& stream, const Variant& value)
     value.write (stream);
     return stream;
 }
-
-bool ESM::operator== (const Variant& left, const Variant& right)
-{
-    return left.isEqual (right);
-}
-
-bool ESM::operator!= (const Variant& left, const Variant& right)
-{
-    return !(left==right);
-}
diff --git a/components/esm/variant.hpp b/components/esm/variant.hpp
index 20b3aa76ed..f0a16d4d53 100644
--- a/components/esm/variant.hpp
+++ b/components/esm/variant.hpp
@@ -3,6 +3,8 @@
 
 #include <string>
 #include <iosfwd>
+#include <variant>
+#include <tuple>
 
 namespace ESM
 {
@@ -20,12 +22,10 @@ namespace ESM
         VT_String
     };
 
-    class VariantDataBase;
-
     class Variant
     {
             VarType mType;
-            VariantDataBase *mData;
+            std::variant<std::monostate, int, float, std::string> mData;
 
         public:
 
@@ -37,21 +37,17 @@ namespace ESM
                 Format_Local // local script variables in save game files
             };
 
-            Variant();
+            Variant() : mType (VT_None), mData (std::monostate{}) {}
 
-            Variant (const std::string& value);
-            Variant (int value);
-            Variant (float value);
+            explicit Variant(const std::string& value) : mType(VT_String), mData(value) {}
 
-            ~Variant();
+            explicit Variant(std::string&& value) : mType(VT_String), mData(std::move(value)) {}
 
-            Variant& operator= (const Variant& variant);
-            Variant& operator= (Variant && variant);
+            explicit Variant(int value) : mType(VT_Long), mData(value) {}
 
-            Variant (const Variant& variant);
-            Variant (Variant&& variant);
+            explicit Variant(float value) : mType(VT_Float), mData(value) {}
 
-            VarType getType() const;
+            VarType getType() const { return mType; }
 
             std::string getString() const;
             ///< Will throw an exception, if value can not be represented as a string.
@@ -75,19 +71,27 @@ namespace ESM
             void setString (const std::string& value);
             ///< Will throw an exception, if type is not compatible with string.
 
+            void setString (std::string&& value);
+            ///< Will throw an exception, if type is not compatible with string.
+
             void setInteger (int value);
             ///< Will throw an exception, if type is not compatible with integer.
 
             void setFloat (float value);
             ///< Will throw an exception, if type is not compatible with float.
 
-            bool isEqual (const Variant& value) const;
+            friend bool operator==(const Variant& left, const Variant& right)
+            {
+                return std::tie(left.mType, left.mData) == std::tie(right.mType, right.mData);
+            }
+
+            friend bool operator!=(const Variant& left, const Variant& right)
+            {
+                return !(left == right);
+            }
     };
 
     std::ostream& operator<<(std::ostream& stream, const Variant& value);
-
-    bool operator== (const Variant& left, const Variant& right);
-    bool operator!= (const Variant& left, const Variant& right);
 }
 
 #endif
diff --git a/components/esm/variantimp.cpp b/components/esm/variantimp.cpp
index 2b69923d1d..74d1351ec5 100644
--- a/components/esm/variantimp.cpp
+++ b/components/esm/variantimp.cpp
@@ -5,71 +5,7 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
-ESM::VariantDataBase::~VariantDataBase() {}
-
-std::string ESM::VariantDataBase::getString (bool default_) const
-{
-    if (default_)
-        return "";
-
-    throw std::runtime_error ("can not convert variant to string");
-}
-
-int ESM::VariantDataBase::getInteger (bool default_) const
-{
-    if (default_)
-        return 0;
-
-    throw std::runtime_error ("can not convert variant to integer");
-}
-
-float ESM::VariantDataBase::getFloat (bool default_) const
-{
-    if (default_)
-        return 0;
-
-    throw std::runtime_error ("can not convert variant to float");
-}
-
-void ESM::VariantDataBase::setString (const std::string& value)
-{
-    throw std::runtime_error ("conversion of string to variant not possible");
-}
-
-void ESM::VariantDataBase::setInteger (int value)
-{
-    throw std::runtime_error ("conversion of integer to variant not possible");
-}
-
-void ESM::VariantDataBase::setFloat (float value)
-{
-    throw std::runtime_error ("conversion of float to variant not possible");
-}
-
-
-
-ESM::VariantStringData::VariantStringData (const VariantDataBase *data)
-{
-    if (data)
-        mValue = data->getString (true);
-}
-
-ESM::VariantDataBase *ESM::VariantStringData::clone() const
-{
-    return new VariantStringData (*this);
-}
-
-std::string ESM::VariantStringData::getString (bool default_) const
-{
-    return mValue;
-}
-
-void ESM::VariantStringData::setString (const std::string& value)
-{
-    mValue = value;
-}
-
-void ESM::VariantStringData::read (ESMReader& esm, Variant::Format format, VarType type)
+void ESM::readESMVariantValue(ESMReader& esm, Variant::Format format, VarType type, std::string& out)
 {
     if (type!=VT_String)
         throw std::logic_error ("not a string type");
@@ -84,10 +20,10 @@ void ESM::VariantStringData::read (ESMReader& esm, Variant::Format format, VarTy
         esm.fail ("local variables of type string not supported");
 
     // GMST
-    mValue = esm.getHString();
+    out = esm.getHString();
 }
 
-void ESM::VariantStringData::write (ESMWriter& esm, Variant::Format format, VarType type) const
+void ESM::writeESMVariantValue(ESMWriter& esm, Variant::Format format, VarType type, const std::string& in)
 {
     if (type!=VT_String)
         throw std::logic_error ("not a string type");
@@ -102,48 +38,10 @@ void ESM::VariantStringData::write (ESMWriter& esm, Variant::Format format, VarT
         throw std::runtime_error ("local variables of type string not supported");
 
     // GMST
-    esm.writeHNString ("STRV", mValue);
-}
-
-bool ESM::VariantStringData::isEqual (const VariantDataBase& value) const
-{
-    return dynamic_cast<const VariantStringData&> (value).mValue==mValue;
-}
-
-
-
-ESM::VariantIntegerData::VariantIntegerData (const VariantDataBase *data) : mValue (0)
-{
-    if (data)
-        mValue = data->getInteger (true);
-}
-
-ESM::VariantDataBase *ESM::VariantIntegerData::clone() const
-{
-    return new VariantIntegerData (*this);
-}
-
-int ESM::VariantIntegerData::getInteger (bool default_) const
-{
-    return mValue;
-}
-
-float ESM::VariantIntegerData::getFloat (bool default_) const
-{
-    return static_cast<float>(mValue);
+    esm.writeHNString("STRV", in);
 }
 
-void ESM::VariantIntegerData::setInteger (int value)
-{
-    mValue = value;
-}
-
-void ESM::VariantIntegerData::setFloat (float value)
-{
-    mValue = static_cast<int> (value);
-}
-
-void ESM::VariantIntegerData::read (ESMReader& esm, Variant::Format format, VarType type)
+void ESM::readESMVariantValue(ESMReader& esm, Variant::Format format, VarType type, int& out)
 {
     if (type!=VT_Short && type!=VT_Long && type!=VT_Int)
         throw std::logic_error ("not an integer type");
@@ -156,12 +54,12 @@ void ESM::VariantIntegerData::read (ESMReader& esm, Variant::Format format, VarT
         if (type==VT_Short)
         {
             if (value!=value)
-                mValue = 0; // nan
+                out = 0; // nan
             else
-                mValue = static_cast<short> (value);
+                out = static_cast<short> (value);
         }
         else if (type==VT_Long)
-            mValue = static_cast<int> (value);
+            out = static_cast<int> (value);
         else
             esm.fail ("unsupported global variable integer type");
     }
@@ -176,7 +74,7 @@ void ESM::VariantIntegerData::read (ESMReader& esm, Variant::Format format, VarT
             esm.fail (stream.str());
         }
 
-        esm.getHT (mValue);
+        esm.getHT(out);
     }
     else if (format==Variant::Format_Local)
     {
@@ -184,18 +82,18 @@ void ESM::VariantIntegerData::read (ESMReader& esm, Variant::Format format, VarT
         {
             short value;
             esm.getHT(value);
-            mValue = value;
+            out = value;
         }
         else if (type==VT_Int)
         {
-            esm.getHT(mValue);
+            esm.getHT(out);
         }
         else
             esm.fail("unsupported local variable integer type");
     }
 }
 
-void ESM::VariantIntegerData::write (ESMWriter& esm, Variant::Format format, VarType type) const
+void ESM::writeESMVariantValue(ESMWriter& esm, Variant::Format format, VarType type, int in)
 {
     if (type!=VT_Short && type!=VT_Long && type!=VT_Int)
         throw std::logic_error ("not an integer type");
@@ -204,7 +102,7 @@ void ESM::VariantIntegerData::write (ESMWriter& esm, Variant::Format format, Var
     {
         if (type==VT_Short || type==VT_Long)
         {
-            float value = static_cast<float>(mValue);
+            float value = static_cast<float>(in);
             esm.writeHNString ("FNAM", type==VT_Short ? "s" : "l");
             esm.writeHNT ("FLTV", value);
         }
@@ -222,72 +120,35 @@ void ESM::VariantIntegerData::write (ESMWriter& esm, Variant::Format format, Var
             throw std::runtime_error (stream.str());
         }
 
-        esm.writeHNT ("INTV", mValue);
+        esm.writeHNT("INTV", in);
     }
     else if (format==Variant::Format_Local)
     {
         if (type==VT_Short)
-            esm.writeHNT ("STTV", (short)mValue);
+            esm.writeHNT("STTV", static_cast<short>(in));
         else if (type == VT_Int)
-            esm.writeHNT ("INTV", mValue);
+            esm.writeHNT("INTV", in);
         else
             throw std::runtime_error("unsupported local variable integer type");
     }
 }
 
-bool ESM::VariantIntegerData::isEqual (const VariantDataBase& value) const
-{
-    return dynamic_cast<const VariantIntegerData&> (value).mValue==mValue;
-}
-
-
-ESM::VariantFloatData::VariantFloatData (const VariantDataBase *data) : mValue (0)
-{
-    if (data)
-        mValue = data->getFloat (true);
-}
-
-ESM::VariantDataBase *ESM::VariantFloatData::clone() const
-{
-    return new VariantFloatData (*this);
-}
-
-int ESM::VariantFloatData::getInteger (bool default_) const
-{
-    return static_cast<int> (mValue);
-}
-
-float ESM::VariantFloatData::getFloat (bool default_) const
-{
-    return mValue;
-}
-
-void ESM::VariantFloatData::setInteger (int value)
-{
-    mValue = static_cast<float>(value);
-}
-
-void ESM::VariantFloatData::setFloat (float value)
-{
-    mValue = value;
-}
-
-void ESM::VariantFloatData::read (ESMReader& esm, Variant::Format format, VarType type)
+void ESM::readESMVariantValue(ESMReader& esm, Variant::Format format, VarType type, float& out)
 {
     if (type!=VT_Float)
         throw std::logic_error ("not a float type");
 
     if (format==Variant::Format_Global)
     {
-        esm.getHNT (mValue, "FLTV");
+        esm.getHNT(out, "FLTV");
     }
     else if (format==Variant::Format_Gmst || format==Variant::Format_Info || format==Variant::Format_Local)
     {
-        esm.getHT (mValue);
+        esm.getHT(out);
     }
 }
 
-void ESM::VariantFloatData::write (ESMWriter& esm, Variant::Format format, VarType type) const
+void ESM::writeESMVariantValue(ESMWriter& esm, Variant::Format format, VarType type, float in)
 {
     if (type!=VT_Float)
         throw std::logic_error ("not a float type");
@@ -295,15 +156,10 @@ void ESM::VariantFloatData::write (ESMWriter& esm, Variant::Format format, VarTy
     if (format==Variant::Format_Global)
     {
         esm.writeHNString ("FNAM", "f");
-        esm.writeHNT ("FLTV", mValue);
+        esm.writeHNT("FLTV", in);
     }
     else if (format==Variant::Format_Gmst || format==Variant::Format_Info || format==Variant::Format_Local)
     {
-        esm.writeHNT ("FLTV", mValue);
+        esm.writeHNT("FLTV", in);
     }
 }
-
-bool ESM::VariantFloatData::isEqual (const VariantDataBase& value) const
-{
-    return dynamic_cast<const VariantFloatData&> (value).mValue==mValue;
-}
diff --git a/components/esm/variantimp.hpp b/components/esm/variantimp.hpp
index c1203ddf86..9458728115 100644
--- a/components/esm/variantimp.hpp
+++ b/components/esm/variantimp.hpp
@@ -2,177 +2,58 @@
 #define OPENMW_ESM_VARIANTIMP_H
 
 #include <string>
+#include <functional>
 
 #include "variant.hpp"
 
 namespace ESM
 {
-    class VariantDataBase
-    {
-        public:
-
-            virtual ~VariantDataBase();
-
-            virtual VariantDataBase *clone() const = 0;
-
-            virtual std::string getString (bool default_ = false) const;
-            ///< Will throw an exception, if value can not be represented as a string.
-            ///
-            /// \note Numeric values are not converted to strings.
-            ///
-            /// \param default_ Return a default value instead of throwing an exception.
-            ///
-            /// Default-implementation: throw an exception.
-
-            virtual int getInteger (bool default_ = false) const;
-            ///< Will throw an exception, if value can not be represented as an integer (implicit
-            /// casting of float values is permitted).
-            ///
-            /// \param default_ Return a default value instead of throwing an exception.
-            ///
-            /// Default-implementation: throw an exception.
-
-            virtual float getFloat (bool default_ = false) const;
-            ///< Will throw an exception, if value can not be represented as a float value.
-            ///
-            /// \param default_ Return a default value instead of throwing an exception.
-            ///
-            /// Default-implementation: throw an exception.
-
-            virtual void setString (const std::string& value);
-            ///< Will throw an exception, if type is not compatible with string.
-            ///
-            /// Default-implementation: throw an exception.
-
-            virtual void setInteger (int value);
-            ///< Will throw an exception, if type is not compatible with integer.
-            ///
-            /// Default-implementation: throw an exception.
-
-            virtual void setFloat (float value);
-            ///< Will throw an exception, if type is not compatible with float.
-            ///
-            /// Default-implementation: throw an exception.
-
-            virtual void read (ESMReader& esm, Variant::Format format, VarType type) = 0;
-            ///< If \a type is not supported by \a format, an exception is thrown via ESMReader::fail
-
-            virtual void write (ESMWriter& esm, Variant::Format format, VarType type) const = 0;
-            ///< If \a type is not supported by \a format, an exception is thrown.
-
-            virtual bool isEqual (const VariantDataBase& value) const = 0;
-            ///< If the (C++) type of \a value does not match the type of *this, an exception is thrown.
-
-    };
-
-    class VariantStringData : public VariantDataBase
-    {
-            std::string mValue;
-
-        public:
+    void readESMVariantValue(ESMReader& reader, Variant::Format format, VarType type, std::string& value);
 
-            VariantStringData (const VariantDataBase *data = nullptr);
-            ///< Calling the constructor with an incompatible data type will result in a silent
-            /// default initialisation.
+    void readESMVariantValue(ESMReader& reader, Variant::Format format, VarType type, float& value);
 
-            VariantDataBase *clone() const override;
+    void readESMVariantValue(ESMReader& reader, Variant::Format format, VarType type, int& value);
 
-            std::string getString (bool default_ = false) const override;
-            ///< Will throw an exception, if value can not be represented as a string.
-            ///
-            /// \note Numeric values are not converted to strings.
-            ///
-            /// \param default_ Return a default value instead of throwing an exception.
+    void writeESMVariantValue(ESMWriter& writer, Variant::Format format, VarType type, const std::string& value);
 
-            void setString (const std::string& value) override;
-            ///< Will throw an exception, if type is not compatible with string.
+    void writeESMVariantValue(ESMWriter& writer, Variant::Format format, VarType type, float value);
 
-            void read (ESMReader& esm, Variant::Format format, VarType type) override;
-            ///< If \a type is not supported by \a format, an exception is thrown via ESMReader::fail
+    void writeESMVariantValue(ESMWriter& writer, Variant::Format format, VarType type, int value);
 
-            void write (ESMWriter& esm, Variant::Format format, VarType type) const override;
-            ///< If \a type is not supported by \a format, an exception is thrown.
-
-            bool isEqual (const VariantDataBase& value) const override;
-            ///< If the (C++) type of \a value does not match the type of *this, an exception is thrown.
-    };
-
-    class VariantIntegerData : public VariantDataBase
+    struct ReadESMVariantValue
     {
-            int mValue;
-
-        public:
-
-            VariantIntegerData (const VariantDataBase *data = nullptr);
-            ///< Calling the constructor with an incompatible data type will result in a silent
-            /// default initialisation.
-
-            VariantDataBase *clone() const override;
+        std::reference_wrapper<ESMReader> mReader;
+        Variant::Format mFormat;
+        VarType mType;
 
-            int getInteger (bool default_ = false) const override;
-            ///< Will throw an exception, if value can not be represented as an integer (implicit
-            /// casting of float values is permitted).
-            ///
-            /// \param default_ Return a default value instead of throwing an exception.
+        ReadESMVariantValue(ESMReader& reader, Variant::Format format, VarType type)
+            : mReader(reader), mFormat(format), mType(type) {}
 
-            float getFloat (bool default_ = false) const override;
-            ///< Will throw an exception, if value can not be represented as a float value.
-            ///
-            /// \param default_ Return a default value instead of throwing an exception.
+        void operator()(std::monostate) const {}
 
-            void setInteger (int value) override;
-            ///< Will throw an exception, if type is not compatible with integer.
-
-            void setFloat (float value) override;
-            ///< Will throw an exception, if type is not compatible with float.
-
-            void read (ESMReader& esm, Variant::Format format, VarType type) override;
-            ///< If \a type is not supported by \a format, an exception is thrown via ESMReader::fail
-
-            void write (ESMWriter& esm, Variant::Format format, VarType type) const override;
-            ///< If \a type is not supported by \a format, an exception is thrown.
-
-            bool isEqual (const VariantDataBase& value) const override;
-            ///< If the (C++) type of \a value does not match the type of *this, an exception is thrown.
+        template <typename T>
+        void operator()(T& value) const
+        {
+            readESMVariantValue(mReader.get(), mFormat, mType, value);
+        }
     };
 
-    class VariantFloatData : public VariantDataBase
+    struct WriteESMVariantValue
     {
-            float mValue;
-
-        public:
-
-            VariantFloatData (const VariantDataBase *data = nullptr);
-            ///< Calling the constructor with an incompatible data type will result in a silent
-            /// default initialisation.
-
-            VariantDataBase *clone() const override;
-
-            int getInteger (bool default_ = false) const override;
-            ///< Will throw an exception, if value can not be represented as an integer (implicit
-            /// casting of float values is permitted).
-            ///
-            /// \param default_ Return a default value instead of throwing an exception.
-
-            float getFloat (bool default_ = false) const override;
-            ///< Will throw an exception, if value can not be represented as a float value.
-            ///
-            /// \param default_ Return a default value instead of throwing an exception.
-
-            void setInteger (int value) override;
-            ///< Will throw an exception, if type is not compatible with integer.
-
-            void setFloat (float value) override;
-            ///< Will throw an exception, if type is not compatible with float.
+        std::reference_wrapper<ESMWriter> mWriter;
+        Variant::Format mFormat;
+        VarType mType;
 
-            void read (ESMReader& esm, Variant::Format format, VarType type) override;
-            ///< If \a type is not supported by \a format, an exception is thrown via ESMReader::fail
+        WriteESMVariantValue(ESMWriter& writer, Variant::Format format, VarType type)
+            : mWriter(writer), mFormat(format), mType(type) {}
 
-            void write (ESMWriter& esm, Variant::Format format, VarType type) const override;
-            ///< If \a type is not supported by \a format, an exception is thrown.
+        void operator()(std::monostate) const {}
 
-            bool isEqual (const VariantDataBase& value) const override;
-            ///< If the (C++) type of \a value does not match the type of *this, an exception is thrown.
+        template <typename T>
+        void operator()(const T& value) const
+        {
+            writeESMVariantValue(mWriter.get(), mFormat, mType, value);
+        }
     };
 }
 

From 9a6f0691b6fec2ca575b9f1f4629e9d890d358c8 Mon Sep 17 00:00:00 2001
From: CedricMocquillon <cedric.mocquillon@sage.com>
Date: Thu, 8 Apr 2021 20:13:50 +0200
Subject: [PATCH 0527/2859] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f8cb55d36e..81ee0d9b34 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -148,6 +148,7 @@
     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 #5910: Fall back to delta time when physics can't keep up
     Task #5480: Drop Qt4 support
     Task #5520: Improve cell name autocompleter implementation

From 6f7e8d9f5905cccd550ad7c40195a192c3b9848c Mon Sep 17 00:00:00 2001
From: tess <2687892-TescoShoppah@users.noreply.gitlab.com>
Date: Thu, 8 Apr 2021 20:57:50 +0000
Subject: [PATCH 0528/2859] Implement #3983 - Add page to the wizard with links
 to buy morrowind

---
 AUTHORS.md                                |   1 +
 CHANGELOG.md                              |   1 +
 apps/wizard/methodselectionpage.cpp       |  13 +++-
 apps/wizard/methodselectionpage.hpp       |   3 +
 files/ui/wizard/methodselectionpage.ui    |  77 ++++++++++++++++++++++
 files/wizard/icons/tango/48x48/dollar.png | Bin 0 -> 7395 bytes
 files/wizard/wizard.qrc                   |   1 +
 7 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 files/wizard/icons/tango/48x48/dollar.png

diff --git a/AUTHORS.md b/AUTHORS.md
index d2de857477..611d6b9f68 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -197,6 +197,7 @@ Programmers
     Sylvain Thesnieres (Garvek)
     t6
     terrorfisch
+    Tess (tescoShoppah)
     thegriglat
     Thomas Luppi (Digmaster)
     tlmullis
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f8cb55d36e..25bcc18e00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -123,6 +123,7 @@
     Feature #2404: Levelled List can not be placed into a container
     Feature #2686: Timestamps in openmw.log
     Feature #3171: OpenMW-CS: Instance drag selection
+    Feature #3983: Wizard: Add link to buy Morrowind
     Feature #4894: Consider actors as obstacles for pathfinding
     Feature #4899: Alpha-To-Coverage Anti-Aliasing for alpha testing
     Feature #4977: Use the "default icon.tga" when an item's icon is not found
diff --git a/apps/wizard/methodselectionpage.cpp b/apps/wizard/methodselectionpage.cpp
index e00344af93..37234468b9 100644
--- a/apps/wizard/methodselectionpage.cpp
+++ b/apps/wizard/methodselectionpage.cpp
@@ -1,6 +1,9 @@
 #include "methodselectionpage.hpp"
 #include "mainwizard.hpp"
 
+#include <QUrl>
+#include <QDesktopServices>
+
 Wizard::MethodSelectionPage::MethodSelectionPage(QWidget *parent) :
     QWizardPage(parent)
 {
@@ -11,9 +14,12 @@ Wizard::MethodSelectionPage::MethodSelectionPage(QWidget *parent) :
 #ifndef OPENMW_USE_UNSHIELD
     retailDiscRadioButton->setEnabled(false);
     existingLocationRadioButton->setChecked(true);
+    buyLinkButton->released();
 #endif
-
+    
     registerField(QLatin1String("installation.retailDisc"), retailDiscRadioButton);
+    
+    connect(buyLinkButton, SIGNAL(released()), this, SLOT(handleBuyButton()));
 }
 
 int Wizard::MethodSelectionPage::nextId() const
@@ -24,3 +30,8 @@ int Wizard::MethodSelectionPage::nextId() const
         return MainWizard::Page_ExistingInstallation;
     }
 }
+
+void Wizard::MethodSelectionPage::handleBuyButton()
+{
+    QDesktopServices::openUrl(QUrl("https://openmw.org/faq/#do_i_need_morrowind"));
+}
diff --git a/apps/wizard/methodselectionpage.hpp b/apps/wizard/methodselectionpage.hpp
index c189ea171f..57d551d27e 100644
--- a/apps/wizard/methodselectionpage.hpp
+++ b/apps/wizard/methodselectionpage.hpp
@@ -17,6 +17,9 @@ namespace Wizard
 
         int nextId() const override;
 
+    private slots:
+        void handleBuyButton();
+        
     private:
         MainWizard *mWizard;
 
diff --git a/files/ui/wizard/methodselectionpage.ui b/files/ui/wizard/methodselectionpage.ui
index 4d4d66badc..c2dd260527 100644
--- a/files/ui/wizard/methodselectionpage.ui
+++ b/files/ui/wizard/methodselectionpage.ui
@@ -147,6 +147,83 @@
      </item>
     </layout>
    </item>
+   <item>
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Don't have a copy?</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="buyGameLayout">
+     <item>
+      <spacer name="horizontalSpacer_3">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Maximum</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="buyIconLabel">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/dollar.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QCommandLinkButton" name="buyLinkButton">
+       <property name="text">
+        <string>Buy the game</string>
+       </property>
+       <property name="checkable">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_4">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Expanding</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
   </layout>
  </widget>
  <resources/>
diff --git a/files/wizard/icons/tango/48x48/dollar.png b/files/wizard/icons/tango/48x48/dollar.png
new file mode 100644
index 0000000000000000000000000000000000000000..a14ba2505d1d09b17fc3572af93b15ad7de7abd4
GIT binary patch
literal 7395
zcmeHKc|4SB`yXWq$<mP!#-t*RSq!s8_GM(5klkTc#xgTzh9NCdc4do@q9VJBN}?o^
zb|n%*mQs!_ROcY?GwPIn@A;kgcRrur`(HDkXXd%@`+I$_>;B%?bwBqLN3gY!5K|BX
zfj|;?OH+H`AI`s42?M{*D}IjwfmZ#o$I*prPvn7FY$lB!Km~KdSX3}IluiSILc7LX
z+%q;7ubKCetrAp|iXEQRdo$jzb-<X?MXjA5c{l!8qgwUE13?Yr*yNY<i;Ed^A_t73
zJdc$X=MPQE?cC-Obo%qB(%MZbyxPTEVd9JRioEBFiKi!L^UqEHejnqx1#>N4vnI=O
zF6`{fKJ}>_FO|(WIWd~_ASq{UI_J#II}*4pMKSI>WFJ;*T?(5S9Eel)^0CPcXV|^*
zOIl2lACYMA_C6)h=!=~s8eV|a5Q3yz*;0Czs)KHiQn+p_3{SlpVwSO!$~?}G-2Svu
z!zCbT`|6%USrrRyL8)*0YbB-vb7n^G@dmH&e-$oXx$n8cyN>J_p3Y{&Y}-Puir+N#
zIzeHb=Qr&|-iREnGZ0b<j_qA@FJ|J#tF~gPLm6f%!n@s2yuRYbrj|7AJ+IfC39vSK
zeM=u)sbM<TI<UcNy-|ac$aR6UdoM?QxJHFN$6uTT>)kzkx5c=@bsD_`w#Dtf@u`+k
zS<TMd>kh*kGpp9w9h7oAj!Bi69G?E<Qzr~pSENN9YOf~8Z{{{<+}_n`Dx#-8l62iX
zEN3kUQU--buUJ1B7fFERW@$^a948$RDeTxDLxH%-i1ZC6mSBq)9nIUbK2&YnyLzL~
z!BwK7-FPE{kh650#8lc@NOXx{93)jO!73%&I390rg>`*jiXF<_RG3rsI<-{z$kuFB
zDGur;emr7GeN(!}rDOJ*>&i202FBt=`~rK76Kvf4YUrBfA&2dfJomh-DIG0%-mr1?
zP+W?+GVWec+Gb;VvxfFVz2FR2Ipe@6+2duG-ap;#biLAiJa4x9&2!hY;{J76l_JyW
zI(6C8RIy4fq*;FbpryB-;>uONx{vDY6Msv@4L*=-u8@jOCk?GeHsAElX{sE#_fn3-
ztE*YR7>m9Ef0KBvz9C2Z-LLSEC#$!VNo)_iCdtsIbhjGL3Uo_KT9=o#uet0s{?g9t
z6Z4GZ!Uha?RnW8dZstcEJrdie+5X5;x2?#n%A@}IB*}x`UDy3QpKi79Fa^K&D{f7k
zllM}LyjO9L9V}Q@xw(sq#l3E?d6WXr_DKk@j4rx(!z7~}p<aQ!bYxv{(1q<=$KisA
z;LOO<!1$NX6n@2$_FqbIj~v!<8TE4&h2=-LSx?u>^{wn*eGrREEVf7p6Fqg?WB$s_
z%vwv8Qv-hCejm@Y3Tg5LMx`~gZr*&OJL3B$miTN9VWgNko^V3Z(Dpod@`~4m*V3u+
zt~zLhFuG?v<5sTrRr|skh+E8>wR01`231y)CAo;P3dj1!`Et)_n?S}~@SdpM)n1|f
zE4%u}*!3!rA46+{jpnj;qkZdR&uaFLkDMA@NE-<`zOYdEWI^}newml!JErGDxC!Cb
zg!=Sc(`zS`CLQw{ROHX_60WUH*btRsm69nOzO&VX?2N*(j-Ef7BNUW!<*I=8q(weu
z93lJmNWa33ng@b($S0quzKPlKc8OQU$@1M9U26TSpG3fmWt~2yXc~FV7)ezqyozj`
z0u8GfWnsYEc1;xcMX*v@6R-$U)I9=cg{o-kB{-J=6`KWJzGZ{m{>vt8VZPZ6=6bvV
z{3%*LKPgJ0$@VZv<{7q^i1%V$JyzV4Dt7upTttdU{6M0MqD**>KFVvSSg0iWtVr=i
zW66e~gY5H(LrG_o9CdXgUYprT`D`8#Ms4iL-WeGsDZ8q|X<rHBOsLb^18F<cP-fzk
z-bBR?d6|2^<D4I6RwV1c8uV+_wQSSdqME5jYI&Jdkk?r)KM*|lMC@KwQY<}nK<Vs-
z`$X^zTr|-}eGysiaxrO-I@k<~8r@8)kkVQ^3F129E{zK|*xuADro}dPk)rCx3v9h&
za;47o=h$OtM)P%XR@JZ-$GD{etHm1olrISP|Dmf3j+ak|zCi@~994Gu(6UkXkC7nj
zS|tYqqqv%xw=Izcq@B0UZk}Xy+^|T_Ab7v&@Lt*383b;;<DdU5zC=klPf*YqbCiIw
z3T#mZDIDdhVX`>h4iDt-m<vQ%{BgnmW#7#^(LK2XCgqv1hOyn6Rzi-}-GXik6tJoE
z*_BkQ?0F@Xrb)T=v3ZdgtF|=rowM4!8EkMIwrYb@@%~HkV&`8GoXO6zoVEe^4dqjC
zU4hgEk}<I&(Lp#stJ{(GIk@E{8S!Gmxy2<$QE5|W;bFLpj?Ls#``l~S&$~%WUc1Oq
z?|fwRbX!7rxBIW3=60-|6+IXU#kr)YaE*WGsi_@1z1})JEh_7%&AKG1gXQ%RsdLdS
z+m9Xf9#_)SMB?PFTU-tg^?N@ra=H)cNZu6`0G|Hcw|-7X^E}in^Z{g2Vb<SYwF$E&
z-ls9uK*d6uc=tNmjAmxLLdvpR47HIkm9bJp09@R(3U$%Tf7P_}6TGMernLmKpOBs%
z4Z0qRaW){lsJF8kXMjMTA_wL_J!Bk?-kYO$OF8U<PT$qRp(KoFa#4zvB76Ilz13d#
zJ&q^4ouCR@AAh=j!9_vwmNsj4?VKo1L-j6rU4$a#wxxWxxUc=gxHp~h_Ox^F49xoO
z^y=3W+q&(JWDF?0qL>be3(8mW6fx&S-;h;&uB?;|`2af_!-#gl1anRno~nM@Hhvj8
z%<4HQ6MV(w%oXUaEmzf?-}wnn(Zt?5x*uAzPxrl9Zh=YeU3j_BB}pt)4y)gFT2&Ng
zNV;^oH4E9?^S+}iq-eP9SeukX`j}(71FZKddOYun>3*wQ0zQUL4!O10*GX4<U(G!&
zAf!wW@wHX|d|7jwKh<3B*FF0%3qslWXA<2RMQ@XfA|#$Dm<JVIRrU93c>myB@YLI;
zMz!Y~#*^Po`u<WBuKU@1)P2l7917`mzwBBYO1tN}W;ozfmPd@wkp<1ViESLYwu+2>
zXXb>u#*0$=+-FrS(OngF7IT48z0G;yiD%H6^_TBIDa7nK^r75y{7v`*w)fGkIi_iK
z)#PWzCu8HJ5%IV0+kP85bv4ofzsotq@kQ;Uy7@C7bUS)tbP&{Dho>5XtWJG>fgTkl
zrA3>WQvEZa;tyUL$)knWV^ByCNFa)CVnV>1nEZJP0?s};`%?5R8x1$y_HrnI$ciKs
zVJJnm>+<7c)0|GPk~J=GEje_zz^gT16(1Dzi--7{{o9<BJaU4AS+ar+l2T~&7Be}G
zsRQ`aW@RFG7D9OwK_Ayh`E5Gqsx%mJuA7EbUfY(n8!;(nAp9grokpR_b5f5Pc25OM
zs(4L6^hy_M3@nneFR$-k8|RZn>}pbMayW6NAuJcuBvxs)*H(}AR47iRrXqB{89PyV
zQ`>~L6>GNvvThn$b_uSTsW7D$<kHT)C-+pjG^ZNlUm)h+lU5JUY<JG6vE{4}+C~zU
zF;y?hi<Jp5^=-#rOwM0$QCv(OJ>F7~T)N8qsL-*~Mj;FR2PSLXHPO<usga1h>Dxg&
z%p-1U5zgZteY`mM%nr1u%_=}I3@gAF@Ov&7M<qq{2KEnJE7l0VIlKlwNohIvo7Mho
zV=a-o+$U&i#0~en@Q0)27n9mVz-FGC7!ij|yis;9Mgx0aws&>c`zS0dfIjN7dlIDV
zwt+yB33T9C>SAM!BQpcFh!iG?sudc@0*<X9ke)#(i%9mTa=|3351pY8nW(LYfaw%{
zh_j9j+=gXB^`%?xVN)IU*gBH;_>-{|h`|mqy-*xL5J=?`!J&Zx3=S?-AF{-Y1Md0V
zFbH@F!u8jOxY!WDCQLRJjM74B!GR5g9)g7I5CiM6DKwnDsrgq5prsG-<#Jg#7>vi`
zY4NnRm~0;y0*l4M;7Aw}2?Y>PP8fqr423c{8~GGpI83P=GMmog(wPh}pOZ*p26Ocx
z5MUhql^hr)n}q_MUmft<OY|Hr1%?M2C}2JS0EUFaF;F-Xip0W}+XJIEHs7onoUbYZ
zdcs19EEqxy4hszY!Ggmz3;FKvFD*EZz}o@Lp2}ecv&mGm5GsSaak*1gKrm;y&tMLf
z-?bEX0EGqvf?D#t+{OZLL-=OHm(hnF$Xc@Cqn9Ho<Zn1uFgsugLm|Vc0n|Vs5DvhM
z_yNzQ)4ngz5A)%V{97P^yKnqIp#RisDV8N&ai&aiFyATOR3E~R7e`@|=@i`3tqxin
zgC%NfL$NwEDinpmQlLZ%4FT0gU{NG8g+kFG>n@|hGdNr#gG}X90pwbAfCoW^lXS>r
zG!#oipr9xn9U_#70(dBBB%Fpu=xCGC%PH*Gbf6N50n4M}Q&9jaB8sSsM4&KGw6=~m
z6ou6#K}lrb4vr*K;W|X%poP>~iiW=qI3ogHAA;0^fA1j#5V<raJ5V2DO=kp$ejjk8
z2T~olM80SUU4$+gfyBUdQ5dAQHs(9XiOS{xNzUg)z_pObr4b4lXAUqDfn=ix5`CyJ
z7Q<(0fWIs_U^0NPM1E}m%uD^iTyQ3ADv`@%J2II8`VfAsU_RwiNrCmg77NarNnSEs
z0#hmcdiz>&#zY_3Qd1B1ci?|xa`0vH82>k(@6c~7Mr<yR$@aHn+mZaJWbWVd{1x~c
zlRdE4ak%U-{C}9#|G?>eNmon2mdOrV=HG!D^riJ>LkgfTNd*QkZ2~wV`HTD<VhEM8
zv;=^TUxvuOM1~I)*loX-+MoUOzer;;5rG7<f(%7qP(T`!wJA_6nL>opkVG^UiPR;N
z$mk#0IZPUtM`Tlte1IGP))^?RrF90YFJ+&`k7%AR703}NTn7h-L%u98SP#bEQ2(5s
z9)HWRvB51DK##vA;qd&-a|mX!0_arskHY+!DE|v?nf=$K{7>e~VPC9Gn5;0MXnnbM
zJjUO;{|n$325UN*%HS~nF7)M)FS0Cq?f@}==>wi;z~d42?fLjME%=r5U;KPcxBsFC
zfcmGCf28kExqiy^j}-Vv;Gfy`Q?7rcz&`^2%&z}8xx~J|VN)5vL5~N#KdT<N`x$um
z7AEbqFa<60zj@aS(|{gPmZd8P1X|O`zXa|uizq;+2p4Z-CNjKIew~g&;V<XhK%f=I
zcvB-s-`=sz7mRMWl-XlK?Iw5pd@FOze=)yaPA&SFODWV=B`5S?y3mDqnWFKt)-9Z(
zSHqi#9c8Xnw1?TV6KVzr7T*a>{FV~A)oR$OppwuKTau%^YtE2`wU^#?>%wEtlKQ?V
zR>=aPIQ94E`BG8(qwQ4=D&Es<ySCdgD;`rS%(to$2R+Vj*%iKfUeqv2->iQO50Mj4
zSaIM$ly`5p@Xgp^;$<V#liZwHze9+Xw~BWx60TOpYF2U+wuGb_D3)0~w*XuH!VP`>
z;p3j(Q!0{4bsalPHs3DU07@-Vef;a@6U8NXjgs~!I)a-XTRqJ`b<-w&_aBifx^arG
zP3V%hr1-$2Ij*N5$GUUQ?cB^P#S1t_kxt~!-4Zgr=y`gh?Z9fo?%OV-`##lPR<=>B
z6>puHDxB6_5jX+A$xzA5z0yfctO9lHU%-_%dqzx@b7MSP_L8fR&DX@Ggll2vT>6?Z
zVp2kbaZ`GwcZj1}hBDPEKFR`*U8)6owI9#=?KVx<)7)%#Ev=RyqtgSupI|Ek_R3(!
zq|%31KJ$!>t@Nm~9gv}WNXI~5YVCDbY-@V^ao^D8M@1)Q1oO5!jzyl^>C&e!9Xi)t
zRV(jey|+?PIQI_eh#O~h)SZn5CEo29G@ciURp57rYE4}9(~=pxonkNh;gH3G9DD8|
zzB=iJL_>RfynI#d6`o|?+tepY%_{e|daAs4tT?%1g!gJhc|zPxy%IMkSP~!NIW*sX
nX6yLN#Ru6s{y+*Wrhf*#?j9b?dCi;y5)6blvo)<S_Ky4)xk9=k

literal 0
HcmV?d00001

diff --git a/files/wizard/wizard.qrc b/files/wizard/wizard.qrc
index 99623e9856..7dbb8fe080 100644
--- a/files/wizard/wizard.qrc
+++ b/files/wizard/wizard.qrc
@@ -4,6 +4,7 @@
     <file alias="index.theme">icons/tango/index.theme</file>
     <file alias="48x48/folder.png">icons/tango/48x48/folder.png</file>
     <file alias="48x48/system-installer.png">icons/tango/48x48/system-installer.png</file>
+    <file alias="48x48/dollar.png">icons/tango/48x48/dollar.png</file>
   </qresource>
   <qresource prefix="images">
     <file alias="intropage-background.png">images/intropage-background.png</file>    

From 3e200007784285e57c64fd5c1a86baf5df732572 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Fri, 9 Apr 2021 16:51:44 +0200
Subject: [PATCH 0529/2859] Add a coverity scan

---
 .gitlab-ci.yml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 713cc26019..8504079385 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,6 +30,29 @@ stages:
     paths:
       - build/install/
 
+Coverity:
+  extends: .Debian
+  only:
+    - schedules
+  before_script:
+    - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic
+    - 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
+    - cd build
+    - cov-analysis-linux64-*/bin/cov-build --dir cov-int cmake --build . -- -j $(nproc)
+  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: 2h
+
 Debian_GCC:
   extends: .Debian
   cache:

From 799cf16f3161fe7bfa39c20d17d9c780010de3da Mon Sep 17 00:00:00 2001
From: Jonas Tobias Hopusch <git@jotoho.de>
Date: Fri, 9 Apr 2021 18:16:05 +0200
Subject: [PATCH 0530/2859] Attempt to fix #5942

Closes OpenMW/openmw#5942
This is an attempt to apply the fix suggested by @Capostrophic
---
 apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index fb67218532..f1e40ef7fb 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -681,7 +681,7 @@ namespace MWMechanics
                     // Deviating from Morrowind here: it doesn't increase disposition on marginal wins,
                     // which seems to be a bug (MCP fixes it too).
                     // Original logic: x = 0, y = -iPerMinChange
-                    x = -iPerMinChange;
+                    x = iPerMinChange;
                     y = x; // This goes unused.
                 }
                 else

From d661a3103e446a22dd79160ec6813ea88b0a05f7 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 8 Apr 2021 00:05:02 +0200
Subject: [PATCH 0531/2859] Use clang 9 for linux builds on travis

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e84a9ad712..debb2e3dd7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ addons:
       - sourceline: 'ppa:openmw/openmw'
     packages: [
       # Dev
-      build-essential, cmake, clang-tools, ccache,
+      build-essential, cmake, clang-tools-9, ccache,
       # Boost
       libboost-filesystem-dev, libboost-iostreams-dev, libboost-program-options-dev, libboost-system-dev,
       # FFmpeg
@@ -37,8 +37,8 @@ matrix:
       os: linux
       dist: focal
       env:
-        - MATRIX_EVAL="CC=clang && CXX=clang++"
-        - ANALYZE="scan-build --force-analyze-debug-code --use-cc clang --use-c++ clang++"
+        - MATRIX_EVAL="CC=clang-9 && CXX=clang++-9"
+        - ANALYZE="scan-build-9 --force-analyze-debug-code --use-cc clang-9 --use-c++ clang++-9"
       compiler: clang
 
 before_install:

From aaf975ea351157450164fca18657002435961be9 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 8 Apr 2021 00:24:15 +0200
Subject: [PATCH 0532/2859] Send travis notifications only for main repo master

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index debb2e3dd7..d019b55268 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -66,11 +66,13 @@ deploy:
   repo: OpenMW/openmw
 notifications:
   email:
+    if: repository_slug = OpenMW/openmw AND branch = master
     recipients:
       - corrmage+travis-ci@gmail.com
     on_success: change
     on_failure: always
   irc:
+    if: repository_slug = OpenMW/openmw AND branch = master
     channels:
       - "chat.freenode.net#openmw"
     on_success: change

From 75b4871bab239b9f3c92ff9441ae93b488e49574 Mon Sep 17 00:00:00 2001
From: Simon Meulenbeek <simonmeulenbeek@gmail.com>
Date: Fri, 9 Apr 2021 19:28:08 +0000
Subject: [PATCH 0533/2859] Add Audio settings to openmw-launcher

---
 AUTHORS.md                                    |   1 +
 CHANGELOG.md                                  |   1 +
 apps/launcher/CMakeLists.txt                  |   4 +
 apps/launcher/advancedpage.cpp                |  68 +++++++++
 apps/launcher/utils/openalutil.cpp            |  55 +++++++
 apps/launcher/utils/openalutil.hpp            |   7 +
 .../reference/modding/settings/sound.rst      |  10 +-
 files/ui/advancedpage.ui                      | 144 ++++++++++++++++++
 8 files changed, 285 insertions(+), 5 deletions(-)
 create mode 100644 apps/launcher/utils/openalutil.cpp
 create mode 100644 apps/launcher/utils/openalutil.hpp

diff --git a/AUTHORS.md b/AUTHORS.md
index d2de857477..41313b8aa7 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -184,6 +184,7 @@ Programmers
     sergoz
     ShadowRadiance
     Siimacore
+    Simon Meulenbeek (simonmb)
     sir_herrbatka
     smbas
     Sophie Kirschner (pineapplemachine)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f8cb55d36e..69a467b8e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -134,6 +134,7 @@
     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 #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
diff --git a/apps/launcher/CMakeLists.txt b/apps/launcher/CMakeLists.txt
index 329d06a570..3018237705 100644
--- a/apps/launcher/CMakeLists.txt
+++ b/apps/launcher/CMakeLists.txt
@@ -13,6 +13,7 @@ set(LAUNCHER
     utils/profilescombobox.cpp
     utils/textinputdialog.cpp
     utils/lineedit.cpp
+    utils/openalutil.cpp
 
     ${CMAKE_SOURCE_DIR}/files/windows/launcher.rc
 )
@@ -31,6 +32,7 @@ set(LAUNCHER_HEADER
     utils/profilescombobox.hpp
     utils/textinputdialog.hpp
     utils/lineedit.hpp
+    utils/openalutil.hpp
 )
 
 # Headers that must be pre-processed
@@ -47,6 +49,7 @@ set(LAUNCHER_HEADER_MOC
     utils/textinputdialog.hpp
     utils/profilescombobox.hpp
     utils/lineedit.hpp
+    utils/openalutil.hpp
 
 )
 
@@ -95,6 +98,7 @@ endif (WIN32)
 
 target_link_libraries(openmw-launcher
     ${SDL2_LIBRARY_ONLY}
+    ${OPENAL_LIBRARY}
     components
 )
 
diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index d82dd1be2e..b7bf1a2494 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -5,11 +5,14 @@
 #include <QFileDialog>
 #include <QCompleter>
 #include <QProxyStyle>
+#include <QString>
 #include <components/contentselector/view/contentselector.hpp>
 #include <components/contentselector/model/esmfile.hpp>
 
 #include <cmath>
 
+#include "utils/openalutil.hpp"
+
 Launcher::AdvancedPage::AdvancedPage(Config::GameSettings &gameSettings,
                                      Settings::Manager &engineSettings, QWidget *parent)
         : QWidget(parent)
@@ -19,7 +22,17 @@ Launcher::AdvancedPage::AdvancedPage(Config::GameSettings &gameSettings,
     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);
 }
@@ -126,6 +139,34 @@ bool Launcher::AdvancedPage::loadSettings()
         viewingDistanceComboBox->setValue(convertToCells(mEngineSettings.getInt("viewing distance", "Camera")));
     }
 
+    // Audio
+    {
+        std::string selectedAudioDevice = mEngineSettings.getString("device", "Sound");
+        if (selectedAudioDevice.empty() == false)
+        {
+            int audioDeviceIndex = audioDeviceSelectorComboBox->findData(QString::fromStdString(selectedAudioDevice));
+            if (audioDeviceIndex != -1)
+            {
+                audioDeviceSelectorComboBox->setCurrentIndex(audioDeviceIndex);
+            }
+        }
+        int hrtfEnabledIndex = mEngineSettings.getInt("hrtf enable", "Sound");
+        if (hrtfEnabledIndex >= -1 && hrtfEnabledIndex <= 1)
+        {
+            enableHRTFComboBox->setCurrentIndex(hrtfEnabledIndex + 1);
+        }
+        std::string selectedHRTFProfile = mEngineSettings.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");
@@ -247,6 +288,33 @@ void Launcher::AdvancedPage::saveSettings()
             mEngineSettings.setInt("viewing distance", "Camera", convertToUnits(viewingDistance));
         }
     }
+    
+    // Audio
+    {
+        int audioDeviceIndex = audioDeviceSelectorComboBox->currentIndex();
+        if (audioDeviceIndex != 0)
+        {
+            mEngineSettings.setString("device", "Sound", audioDeviceSelectorComboBox->currentText().toUtf8().constData());
+        } 
+        else 
+        {
+            mEngineSettings.setString("device", "Sound", "");
+        }
+        int hrtfEnabledIndex = enableHRTFComboBox->currentIndex() - 1;
+        if (hrtfEnabledIndex != mEngineSettings.getInt("hrtf enable", "Sound"))
+        {
+            mEngineSettings.setInt("hrtf enable", "Sound", hrtfEnabledIndex);
+        }
+        int selectedHRTFProfileIndex = hrtfProfileSelectorComboBox->currentIndex();
+        if (selectedHRTFProfileIndex != 0)
+        {
+            mEngineSettings.setString("hrtf", "Sound", hrtfProfileSelectorComboBox->currentText().toUtf8().constData());
+        }
+        else 
+        {
+            mEngineSettings.setString("hrtf", "Sound", "");
+        }
+    }
 
     // Camera
     {
diff --git a/apps/launcher/utils/openalutil.cpp b/apps/launcher/utils/openalutil.cpp
new file mode 100644
index 0000000000..6f76b71306
--- /dev/null
+++ b/apps/launcher/utils/openalutil.cpp
@@ -0,0 +1,55 @@
+#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 && 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 < 20;++i)
+        {
+            const ALCchar *entry = alcGetStringiSOFT(device, ALC_HRTF_SPECIFIER_SOFT, i);
+            ret.emplace_back(entry);
+        }
+    }
+    return ret;
+}
\ No newline at end of file
diff --git a/apps/launcher/utils/openalutil.hpp b/apps/launcher/utils/openalutil.hpp
new file mode 100644
index 0000000000..4a84fbae7d
--- /dev/null
+++ b/apps/launcher/utils/openalutil.hpp
@@ -0,0 +1,7 @@
+#include <vector>
+
+namespace Launcher
+{
+    std::vector<const char *> enumerateOpenALDevices();
+    std::vector<const char *> enumerateOpenALDevicesHrtf();
+}
\ No newline at end of file
diff --git a/docs/source/reference/modding/settings/sound.rst b/docs/source/reference/modding/settings/sound.rst
index 895b919fb1..4cc665582b 100644
--- a/docs/source/reference/modding/settings/sound.rst
+++ b/docs/source/reference/modding/settings/sound.rst
@@ -5,7 +5,7 @@ device
 ------
 
 :Type:		string
-:Range:		
+:Range:
 :Default:	""
 
 This setting determines which audio device to use. A blank or missing setting means to use the default device,
@@ -13,7 +13,7 @@ which should usually be sufficient, but if you need to explicitly specify a devi
 
 The names of detected devices can be found in the openmw.log file in your configuration directory.
 
-This setting can only be configured by editing the settings configuration file.
+This setting can be configured by editing the settings configuration file, or in the Audio tab of the OpenMW Launcher.
 
 master volume
 -------------
@@ -111,13 +111,13 @@ Enabling HRTF may also require an OpenAL Soft version greater than 1.17.0,
 and possibly some operating system configuration.
 A value of 0 disables HRTF processing, while a value of 1 explicitly enables HRTF processing.
 The default value is -1, which should enable the feature automatically for most users when possible.
-This setting can only be configured by editing the settings configuration file.
+This setting can be configured by editing the settings configuration file, or in the Audio tab of the OpenMW Launcher.
 
 hrtf
 ----
 
 :Type:		string
-:Range:		
+:Range:
 :Default:	""
 
 This setting specifies which HRTF profile to use when HRTF is enabled. Blank means use the default.
@@ -125,4 +125,4 @@ This setting has no effect if HRTF is not enabled based on the hrtf enable setti
 Allowed values for this field are enumerated in openmw.log file is an HRTF enabled audio system is installed.
 
 The default value is empty, which uses the default profile.
-This setting can only be configured by editing the settings configuration file.
+This setting can be configured by editing the settings configuration file, or in the Audio tab of the OpenMW Launcher.
diff --git a/files/ui/advancedpage.ui b/files/ui/advancedpage.ui
index a3601ce94d..a990e9172f 100644
--- a/files/ui/advancedpage.ui
+++ b/files/ui/advancedpage.ui
@@ -467,6 +467,150 @@ This setting makes the fog use the actual eye point distance (or so called Eucli
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="Audio">
+      <attribute name="title">
+       <string>Audio</string>
+      </attribute>
+      <layout class="QVBoxLayout">
+       <item>
+        <layout class="QHBoxLayout">
+         <item>
+          <widget class="QLabel" name="audioDeviceSelectorLabel">
+           <property name="text">
+            <string>Audio Device</string>
+           </property>
+           <property name="toolTip">
+            <string>Select your preferred audio device.</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="audioDeviceSelectorComboBox">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>283</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="currentIndex">
+            <number>0</number>
+           </property>
+           <item>
+            <property name="text">
+             <string>Default</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout">
+         <item>
+          <widget class="QLabel" name="enableHRTFLabel">
+           <property name="text">
+            <string>HRTF</string>
+           </property>
+           <property name="toolTip">
+            <string>This setting controls HRTF, which simulates 3D sound on stereo systems.</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="enableHRTFComboBox">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>283</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="currentIndex">
+            <number>0</number>
+           </property>
+           <item>
+            <property name="text">
+             <string>Automatic</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Off</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>On</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout">
+         <item>
+          <widget class="QLabel" name="hrtfProfileSelectorLabel">
+           <property name="text">
+            <string>HRTF Profile</string>
+           </property>
+           <property name="toolTip">
+            <string>Select your preferred HRTF profile.</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="hrtfProfileSelectorComboBox">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>283</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="currentIndex">
+            <number>0</number>
+           </property>
+           <item>
+            <property name="text">
+             <string>Default</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer>
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
      <widget class="QWidget" name="cameraSettings">
       <attribute name="title">
        <string>Camera</string>

From 6e1c67a9aea864df8dff68ecb0fa3eb5c73c8ed0 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Fri, 9 Apr 2021 19:11:26 +0200
Subject: [PATCH 0534/2859] Account for waterwalking when updating position.
 Otherwise we might trace down the actor at waterlevel at the wrong
 coordinate.

Triggered by multimark mod with waterwalking effect.
---
 apps/openmw/mwphysics/mtphysics.cpp     |  2 +-
 apps/openmw/mwphysics/physicssystem.cpp | 47 +++++++++++++------------
 apps/openmw/mwphysics/physicssystem.hpp |  4 +--
 3 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 4be8b2396f..4957ef422a 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -317,7 +317,7 @@ namespace MWPhysics
 
         // init
         for (auto& data : actorsData)
-            data.updatePosition();
+            data.updatePosition(mCollisionWorld);
         mPrevStepCount = numSteps;
         mRemainingSteps = numSteps;
         mTimeAccum = timeAccum;
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index ac8dd92f86..4087ba7e16 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -60,6 +60,22 @@
 #include "movementsolver.hpp"
 #include "mtphysics.hpp"
 
+namespace
+{
+    bool canMoveToWaterSurface(const MWPhysics::Actor* physicActor, const float waterlevel, btCollisionWorld* world)
+    {
+        if (!physicActor)
+            return false;
+        const float halfZ = physicActor->getHalfExtents().z();
+        const osg::Vec3f actorPosition = physicActor->getPosition();
+        const osg::Vec3f startingPosition(actorPosition.x(), actorPosition.y(), actorPosition.z() + halfZ);
+        const osg::Vec3f destinationPosition(actorPosition.x(), actorPosition.y(), waterlevel + halfZ);
+        MWPhysics::ActorTracer tracer;
+        tracer.doTrace(physicActor->getCollisionObject(), startingPosition, destinationPosition, world);
+        return (tracer.mFraction >= 1.0f);
+    }
+}
+
 namespace MWPhysics
 {
     PhysicsSystem::PhysicsSystem(Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Group> parentNode)
@@ -347,16 +363,7 @@ namespace MWPhysics
 
     bool PhysicsSystem::canMoveToWaterSurface(const MWWorld::ConstPtr &actor, const float waterlevel)
     {
-        const Actor* physicActor = getActor(actor);
-        if (!physicActor)
-            return false;
-        const float halfZ = physicActor->getHalfExtents().z();
-        const osg::Vec3f actorPosition = physicActor->getPosition();
-        const osg::Vec3f startingPosition(actorPosition.x(), actorPosition.y(), actorPosition.z() + halfZ);
-        const osg::Vec3f destinationPosition(actorPosition.x(), actorPosition.y(), waterlevel + halfZ);
-        ActorTracer tracer;
-        tracer.doTrace(physicActor->getCollisionObject(), startingPosition, destinationPosition, mCollisionWorld.get());
-        return (tracer.mFraction >= 1.0f);
+        return ::canMoveToWaterSurface(getActor(actor), waterlevel, mCollisionWorld.get());
     }
 
     osg::Vec3f PhysicsSystem::getHalfExtents(const MWWorld::ConstPtr &actor) const
@@ -772,16 +779,10 @@ namespace MWPhysics
             const MWMechanics::MagicEffects& effects = character.getClass().getCreatureStats(character).getMagicEffects();
 
             bool waterCollision = false;
-            bool moveToWaterSurface = false;
             if (cell->getCell()->hasWater() && effects.get(ESM::MagicEffect::WaterWalking).getMagnitude())
             {
-                if (!world->isUnderwater(character.getCell(), osg::Vec3f(character.getRefData().getPosition().asVec3())))
-                    waterCollision = true;
-                else if (physicActor->getCollisionMode() && canMoveToWaterSurface(character, waterlevel))
-                {
-                    moveToWaterSurface = true;
+                if (physicActor->getCollisionMode() || !world->isUnderwater(character.getCell(), osg::Vec3f(character.getRefData().getPosition().asVec3())))
                     waterCollision = true;
-                }
             }
 
             physicActor->setCanWaterWalk(waterCollision);
@@ -794,7 +795,7 @@ namespace MWPhysics
             if (!willSimulate)
                 standingOn = physicActor->getStandingOnPtr();
 
-            actorsFrameData.emplace_back(std::move(physicActor), standingOn, moveToWaterSurface, movement, slowFall, waterlevel);
+            actorsFrameData.emplace_back(std::move(physicActor), standingOn, waterCollision, movement, slowFall, waterlevel);
         }
         mMovementQueue.clear();
         return actorsFrameData;
@@ -937,9 +938,9 @@ namespace MWPhysics
     }
 
     ActorFrameData::ActorFrameData(const std::shared_ptr<Actor>& actor, const MWWorld::Ptr standingOn,
-            bool moveToWaterSurface, osg::Vec3f movement, float slowFall, float waterlevel)
+            bool waterCollision, osg::Vec3f movement, float slowFall, float waterlevel)
         : mActor(actor), mActorRaw(actor.get()), mStandingOn(standingOn),
-        mDidJump(false), mNeedLand(false), mMoveToWaterSurface(moveToWaterSurface),
+        mDidJump(false), mNeedLand(false), mWaterCollision(waterCollision),
         mWaterlevel(waterlevel), mSlowFall(slowFall), mOldHeight(0), mFallHeight(0), mMovement(movement), mPosition(), mRefpos()
     {
         const MWBase::World *world = MWBase::Environment::get().getWorld();
@@ -953,7 +954,7 @@ namespace MWPhysics
         mWasOnGround = actor->getOnGround();
     }
 
-    void ActorFrameData::updatePosition()
+    void ActorFrameData::updatePosition(btCollisionWorld* world)
     {
         mActorRaw->updateWorldPosition();
         // If physics runs "fast enough", position are interpolated without simulation
@@ -961,10 +962,10 @@ namespace MWPhysics
         // regardless of simulation speed.
         mActorRaw->applyOffsetChange();
         mPosition = mActorRaw->getPosition();
-        if (mMoveToWaterSurface)
+        if (mWaterCollision && mPosition.z() < mWaterlevel && canMoveToWaterSurface(mActorRaw, mWaterlevel, world))
         {
             mPosition.z() = mWaterlevel;
-            MWBase::Environment::get().getWorld()->moveObject(mActorRaw->getPtr(), mPosition.x(), mPosition.y(), mPosition.z());
+            MWBase::Environment::get().getWorld()->moveObject(mActorRaw->getPtr(), mPosition.x(), mPosition.y(), mPosition.z(), false);
         }
         mOldHeight = mPosition.z();
         mRefpos = mActorRaw->getPtr().getRefData().getPosition();
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 5ccbf1a380..ce10b4246c 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -79,7 +79,7 @@ namespace MWPhysics
     struct ActorFrameData
     {
         ActorFrameData(const std::shared_ptr<Actor>& actor, const MWWorld::Ptr standingOn, bool moveToWaterSurface, osg::Vec3f movement, float slowFall, float waterlevel);
-        void  updatePosition();
+        void  updatePosition(btCollisionWorld* world);
         std::weak_ptr<Actor> mActor;
         Actor* mActorRaw;
         MWWorld::Ptr mStandingOn;
@@ -90,7 +90,7 @@ namespace MWPhysics
         bool mDidJump;
         bool mFloatToSurface;
         bool mNeedLand;
-        bool mMoveToWaterSurface;
+        bool mWaterCollision;
         float mWaterlevel;
         float mSlowFall;
         float mOldHeight;

From 8874a5be22710c06b26f25c83051dddf373d6f67 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Fri, 9 Apr 2021 23:06:36 +0200
Subject: [PATCH 0535/2859] Change (again) the way SetPos behave.

Instead of registering the desired change of position and rely on
physics simulation to apply it to the world, immediately change the
position in the world without reset the simulation.
---
 apps/openmw/mwbase/world.hpp                  |  4 +--
 apps/openmw/mwphysics/actor.cpp               | 12 +------
 .../mwscript/transformationextensions.cpp     | 21 +++++++++---
 apps/openmw/mwworld/worldimp.cpp              | 32 ++++---------------
 apps/openmw/mwworld/worldimp.hpp              |  7 ++--
 5 files changed, 27 insertions(+), 49 deletions(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 3d55ad987b..6cee36b402 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -281,13 +281,13 @@ namespace MWBase
             virtual void deleteObject (const MWWorld::Ptr& ptr) = 0;
             virtual void undeleteObject (const MWWorld::Ptr& ptr) = 0;
 
-            virtual MWWorld::Ptr moveObject (const MWWorld::Ptr& ptr, float x, float y, float z, bool moveToActive=false) = 0;
+            virtual MWWorld::Ptr moveObject (const MWWorld::Ptr& ptr, float x, float y, float z, bool movePhysics=true, bool moveToActive=false) = 0;
             ///< @return an updated Ptr in case the Ptr's cell changes
 
             virtual MWWorld::Ptr moveObject(const MWWorld::Ptr &ptr, MWWorld::CellStore* newCell, float x, float y, float z, bool movePhysics=true) = 0;
             ///< @return an updated Ptr
 
-            virtual MWWorld::Ptr moveObjectBy(const MWWorld::Ptr &ptr, osg::Vec3f vec) = 0;
+            virtual MWWorld::Ptr moveObjectBy(const MWWorld::Ptr &ptr, osg::Vec3f vec, bool moveToActive) = 0;
             ///< @return an updated Ptr
 
             virtual void scaleObject (const MWWorld::Ptr& ptr, float scale) = 0;
diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index 776212ede9..f9adc9bc69 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -3,8 +3,6 @@
 #include <BulletCollision/CollisionShapes/btBoxShape.h>
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 
-#include <apps/openmw/mwmechanics/actorutil.hpp>
-#include <apps/openmw/mwworld/cellstore.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/resource/bulletshape.hpp>
 #include <components/debug/debuglog.hpp>
@@ -181,6 +179,7 @@ bool Actor::setPosition(const osg::Vec3f& position)
     if (mSkipSimulation)
         return false;
     bool hasChanged = mPosition != position || mPositionOffset.length() != 0 || mWorldPositionChanged;
+    updateWorldPosition();
     applyOffsetChange();
     mPreviousPosition = mPosition;
     mPosition = position;
@@ -197,15 +196,6 @@ void Actor::applyOffsetChange()
 {
     if (mPositionOffset.length() == 0)
         return;
-    if (mPositionOffset.z() != 0)
-    {
-        // Often, offset are set in sequence x, y, z
-        // We don't want actors to be moved under the ground
-        // Check terrain height at new coordinate and update z offset if necessary
-        const auto pos = mWorldPosition + mPositionOffset;
-        const auto terrainHeight = mPtr.getCell()->isExterior() ? MWBase::Environment::get().getWorld()->getTerrainHeightAt(pos) : -std::numeric_limits<float>::max();
-        mPositionOffset.z() = std::max(pos.z(), terrainHeight) - mWorldPosition.z();
-    }
     mWorldPosition += mPositionOffset;
     mPosition += mPositionOffset;
     mPreviousPosition += mPositionOffset;
diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index 6b92378c70..ba211503e1 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -32,7 +32,7 @@ namespace MWScript
             std::vector<MWWorld::Ptr> actors;
             MWBase::Environment::get().getWorld()->getActorsStandingOn (ptr, actors);
             for (auto& actor : actors)
-                MWBase::Environment::get().getWorld()->moveObjectBy(actor, diff);
+                MWBase::Environment::get().getWorld()->moveObjectBy(actor, diff, false);
         }
 
         template<class R>
@@ -284,6 +284,17 @@ namespace MWScript
                     }
                     else if(axis == "z")
                     {
+                        // We should not place actors under ground
+                        if (ptr.getClass().isActor())
+                        {
+                            float terrainHeight = -std::numeric_limits<float>::max();
+                            if (ptr.getCell()->isExterior())
+                                terrainHeight = MWBase::Environment::get().getWorld()->getTerrainHeightAt(curPos);
+ 
+                            if (pos < terrainHeight)
+                                pos = terrainHeight;
+                        }
+ 
                         newPos[2] = pos;
                     }
                     else
@@ -292,7 +303,7 @@ namespace MWScript
                     }
 
                     dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(ptr,
-                        MWBase::Environment::get().getWorld()->moveObjectBy(ptr, newPos - curPos));
+                        MWBase::Environment::get().getWorld()->moveObjectBy(ptr, newPos - curPos, true));
                 }
         };
 
@@ -428,7 +439,7 @@ namespace MWScript
                     }
                     else
                     {
-                        ptr = MWBase::Environment::get().getWorld()->moveObject(ptr, x, y, z, true);
+                        ptr = MWBase::Environment::get().getWorld()->moveObject(ptr, x, y, z, true, true);
                     }
                     dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(base,ptr);
 
@@ -715,7 +726,7 @@ namespace MWScript
                     // This approach can be used to create elevators.
                     moveStandingActors(ptr, diff);
                     dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(ptr,
-                        MWBase::Environment::get().getWorld()->moveObjectBy(ptr, diff));
+                        MWBase::Environment::get().getWorld()->moveObjectBy(ptr, diff, false));
                 }
         };
 
@@ -751,7 +762,7 @@ namespace MWScript
                     // This approach can be used to create elevators.
                     moveStandingActors(ptr, diff);
                     dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(ptr,
-                        MWBase::Environment::get().getWorld()->moveObjectBy(ptr, diff));
+                        MWBase::Environment::get().getWorld()->moveObjectBy(ptr, diff, false));
                 }
         };
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 3b50dd6aac..5b9afa4fe2 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -862,19 +862,6 @@ namespace MWWorld
         if (reference == getPlayerPtr())
             throw std::runtime_error("can not disable player object");
 
-        // A common pattern to teleport NPC in scripts is a sequence of SetPos/Disable/Enable
-        // Disable/Enable create a new physics actor, and so the SetPos call is lost
-        // Call moveObject so that the newly created physics actor will have up-to-date position
-        if (reference.getClass().isActor())
-        {
-            auto* physactor = mPhysics->getActor(reference);
-            if (physactor)
-            {
-                physactor->applyOffsetChange();
-                const auto position = physactor->getSimulationPosition();
-                moveObject(reference, position.x(), position.y(), position.z(), true);
-            }
-        }
         reference.getRefData().disable();
 
         if (reference.getCellRef().getRefNum().hasContentFile())
@@ -1251,7 +1238,7 @@ namespace MWWorld
         return newPtr;
     }
 
-    MWWorld::Ptr World::moveObjectImp(const Ptr& ptr, float x, float y, float z, bool movePhysics, bool moveToActive)
+    MWWorld::Ptr World::moveObject (const Ptr& ptr, float x, float y, float z, bool movePhysics, bool moveToActive)
     {
         int cellX, cellY;
         positionToIndex(x, y, cellX, cellY);
@@ -1266,21 +1253,14 @@ namespace MWWorld
         return moveObject(ptr, cell, x, y, z, movePhysics);
     }
 
-    MWWorld::Ptr World::moveObject (const Ptr& ptr, float x, float y, float z, bool moveToActive)
-    {
-        return moveObjectImp(ptr, x, y, z, true, moveToActive);
-    }
-
-    MWWorld::Ptr World::moveObjectBy(const Ptr& ptr, osg::Vec3f vec)
+    MWWorld::Ptr World::moveObjectBy(const Ptr& ptr, osg::Vec3f vec, bool moveToActive)
     {
         auto* actor = mPhysics->getActor(ptr);
         if (actor)
-        {
             actor->adjustPosition(vec);
-            return ptr;
-        }
+
         osg::Vec3f newpos = ptr.getRefData().getPosition().asVec3() + vec;
-        return moveObject(ptr, newpos.x(), newpos.y(), newpos.z());
+        return moveObject(ptr, newpos.x(), newpos.y(), newpos.z(), false, moveToActive && ptr != getPlayerPtr());
     }
 
     void World::scaleObject (const Ptr& ptr, float scale)
@@ -1546,7 +1526,7 @@ namespace MWWorld
                 auto* physactor = mPhysics->getActor(actor);
                 assert(physactor);
                 const auto position = physactor->getSimulationPosition();
-                moveObjectImp(actor, position.x(), position.y(), position.z(), false);
+                moveObject(actor, position.x(), position.y(), position.z(), false, false);
             }
         }
 
@@ -1556,7 +1536,7 @@ namespace MWWorld
             auto* physactor = mPhysics->getActor(*player);
             assert(physactor);
             const auto position = physactor->getSimulationPosition();
-            moveObjectImp(*player, position.x(), position.y(), position.z(), false);
+            moveObject(*player, position.x(), position.y(), position.z(), false, false);
         }
     }
 
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 929e035e9e..33b23e0653 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -138,9 +138,6 @@ namespace MWWorld
 
             void rotateObjectImp (const Ptr& ptr, const osg::Vec3f& rot, MWBase::RotationFlags flags);
 
-            Ptr moveObjectImp (const Ptr& ptr, float x, float y, float z, bool movePhysics=true, bool moveToActive=false);
-            ///< @return an updated Ptr in case the Ptr's cell changes
-
             Ptr copyObjectToCell(const ConstPtr &ptr, CellStore* cell, ESM::Position pos, int count, bool adjustPos);
 
             void updateSoundListener();
@@ -376,13 +373,13 @@ namespace MWWorld
 
             void undeleteObject (const Ptr& ptr) override;
 
-            MWWorld::Ptr moveObject (const Ptr& ptr, float x, float y, float z, bool moveToActive=false) override;
+            MWWorld::Ptr moveObject (const Ptr& ptr, float x, float y, float z, bool movePhysics=true, bool moveToActive=false) override;
             ///< @return an updated Ptr in case the Ptr's cell changes
 
             MWWorld::Ptr moveObject (const Ptr& ptr, CellStore* newCell, float x, float y, float z, bool movePhysics=true) override;
             ///< @return an updated Ptr
 
-            MWWorld::Ptr moveObjectBy(const Ptr& ptr, osg::Vec3f vec) override;
+            MWWorld::Ptr moveObjectBy(const Ptr& ptr, osg::Vec3f vec, bool moveToActive) override;
             ///< @return an updated Ptr
 
             void scaleObject (const Ptr& ptr, float scale) override;

From 8ff4f731fb6bcba2fa85ef0c742a4d2ad2bd74c1 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Fri, 9 Apr 2021 23:08:51 +0000
Subject: [PATCH 0536/2859] Make Coverity happy about A2C

Initialise member variable
---
 components/shader/shadervisitor.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 612c9011d2..b0013538f0 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -50,6 +50,7 @@ namespace Shader
         , mAutoUseNormalMaps(false)
         , mAutoUseSpecularMaps(false)
         , mApplyLightingToEnvMaps(false)
+        , mConvertAlphaTestToAlphaToCoverage(false)
         , mTranslucentFramebuffer(false)
         , mShaderManager(shaderManager)
         , mImageManager(imageManager)

From 93954a961c7511946e4b25b46c597eaeaa18cdc7 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 10 Apr 2021 09:30:58 +0400
Subject: [PATCH 0537/2859] Unlock mutex on return to avoid hang

---
 extern/osg-ffmpeg-videoplayer/videostate.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/extern/osg-ffmpeg-videoplayer/videostate.cpp b/extern/osg-ffmpeg-videoplayer/videostate.cpp
index 7c4bddb01e..a35c845dbd 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.cpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.cpp
@@ -349,7 +349,10 @@ int VideoState::queue_picture(AVFrame *pFrame, double pts)
 
     vp->pts = pts;
     if (vp->set_dimensions(w, h) < 0)
+    {
+        this->pictq_mutex.unlock();
         return -1;
+    }
 
     sws_scale(this->sws_context, pFrame->data, pFrame->linesize,
               0, this->video_ctx->height, vp->rgbaFrame->data, vp->rgbaFrame->linesize);

From 41c78a889a54ff0e13efba637f151fdf3c992857 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 10 Apr 2021 09:35:31 +0400
Subject: [PATCH 0538/2859] Check for decompression error code

---
 components/bsa/compressedbsafile.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/components/bsa/compressedbsafile.cpp b/components/bsa/compressedbsafile.cpp
index aaeb5bffa3..0f3a26e159 100644
--- a/components/bsa/compressedbsafile.cpp
+++ b/components/bsa/compressedbsafile.cpp
@@ -381,8 +381,10 @@ Files::IStreamPtr CompressedBSAFile::getFile(const FileRecord& fileRecord)
             LZ4F_decompressionContext_t context = nullptr;
             LZ4F_createDecompressionContext(&context, LZ4F_VERSION);
             LZ4F_decompressOptions_t options = {};
-            LZ4F_decompress(context, memoryStreamPtr->getRawData(), &uncompressedSize, buffer.get(), &size, &options);
-            LZ4F_errorCode_t errorCode = LZ4F_freeDecompressionContext(context);
+            LZ4F_errorCode_t errorCode = LZ4F_decompress(context, memoryStreamPtr->getRawData(), &uncompressedSize, buffer.get(), &size, &options);
+            if (LZ4F_isError(errorCode))
+                fail("LZ4 decompression error (file " + mFilename + "): " + LZ4F_getErrorName(errorCode));
+            errorCode = LZ4F_freeDecompressionContext(context);
             if (LZ4F_isError(errorCode))
                 fail("LZ4 decompression error (file " + mFilename + "): " + LZ4F_getErrorName(errorCode));
         }

From b96929f3fc94ad0a0ae54438cd4cf1541e606967 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 10 Apr 2021 09:52:46 +0400
Subject: [PATCH 0539/2859] Avoid division by zero

---
 apps/launcher/graphicspage.cpp       | 5 ++++-
 apps/openmw/mwgui/settingswindow.cpp | 9 +++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/apps/launcher/graphicspage.cpp b/apps/launcher/graphicspage.cpp
index 01205043ec..c6e74573c4 100644
--- a/apps/launcher/graphicspage.cpp
+++ b/apps/launcher/graphicspage.cpp
@@ -20,6 +20,9 @@
 QString getAspect(int x, int 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
@@ -298,9 +301,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 + ")");
 
diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index 538b3db5ed..6342433c47 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -61,6 +61,9 @@ namespace
     std::string getAspect (int x, int y)
     {
         int gcd = std::gcd (x, y);
+        if (gcd == 0)
+            return std::string();
+
         int xaspect = x / gcd;
         int yaspect = y / gcd;
         // special case: 8 : 5 is usually referred to as 16:10
@@ -249,8 +252,10 @@ namespace MWGui
         std::sort(resolutions.begin(), resolutions.end(), sortResolutions);
         for (std::pair<int, int>& resolution : resolutions)
         {
-            std::string str = MyGUI::utility::toString(resolution.first) + " x " + MyGUI::utility::toString(resolution.second)
-                    + " (" + getAspect(resolution.first, resolution.second) + ")";
+            std::string str = MyGUI::utility::toString(resolution.first) + " x " + MyGUI::utility::toString(resolution.second);
+            std::string aspect = getAspect(resolution.first, resolution.second);
+            if (!aspect.empty())
+                 str = str + " (" + aspect + ")";
 
             if (mResolutionList->findItemIndexWith(str) == MyGUI::ITEM_NONE)
                 mResolutionList->addItem(str);

From 124a33d8a314924c6df5095622ca1a597dfdf889 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 10 Apr 2021 10:58:00 +0400
Subject: [PATCH 0540/2859] Fix uninitialized variables

---
 apps/opencs/model/world/refidadapterimp.cpp  | 22 ++++++++--
 apps/opencs/model/world/refidadapterimp.hpp  | 43 +++++++++++++++++---
 apps/openmw/mwrender/renderingmanager.cpp    |  1 +
 components/esm/loadtes3.cpp                  |  1 +
 components/misc/frameratelimiter.hpp         |  1 +
 components/resource/scenemanager.cpp         |  1 +
 components/sdlutil/sdlinputwrapper.cpp       |  2 +
 components/shader/shadervisitor.cpp          |  1 +
 extern/osg-ffmpeg-videoplayer/videostate.cpp |  5 ++-
 9 files changed, 66 insertions(+), 11 deletions(-)

diff --git a/apps/opencs/model/world/refidadapterimp.cpp b/apps/opencs/model/world/refidadapterimp.cpp
index d944adc23e..644092f164 100644
--- a/apps/opencs/model/world/refidadapterimp.cpp
+++ b/apps/opencs/model/world/refidadapterimp.cpp
@@ -56,7 +56,9 @@ void CSMWorld::PotionRefIdAdapter::setData (const RefIdColumn *column, RefIdData
 
 
 CSMWorld::IngredientColumns::IngredientColumns (const InventoryColumns& columns)
-: InventoryColumns (columns) {}
+: InventoryColumns (columns)
+, mEffects(nullptr)
+{}
 
 CSMWorld::IngredientRefIdAdapter::IngredientRefIdAdapter (const IngredientColumns& columns)
 : InventoryRefIdAdapter<ESM::Ingredient> (UniversalId::Type_Ingredient, columns),
@@ -585,7 +587,13 @@ void CSMWorld::DoorRefIdAdapter::setData (const RefIdColumn *column, RefIdData&
 }
 
 CSMWorld::LightColumns::LightColumns (const InventoryColumns& columns)
-: InventoryColumns (columns) {}
+: InventoryColumns (columns)
+, mTime(nullptr)
+, mRadius(nullptr)
+, mColor(nullptr)
+, mSound(nullptr)
+, mEmitterType(nullptr)
+{}
 
 CSMWorld::LightRefIdAdapter::LightRefIdAdapter (const LightColumns& columns)
 : InventoryRefIdAdapter<ESM::Light> (UniversalId::Type_Light, columns), mColumns (columns)
@@ -1454,7 +1462,15 @@ int CSMWorld::CreatureMiscRefIdAdapter::getNestedRowsCount(const RefIdColumn *co
 }
 
 CSMWorld::WeaponColumns::WeaponColumns (const EnchantableColumns& columns)
-: EnchantableColumns (columns) {}
+: EnchantableColumns (columns)
+, mType(nullptr)
+, mHealth(nullptr)
+, mSpeed(nullptr)
+, mReach(nullptr)
+, mChop{nullptr}
+, mSlash{nullptr}
+, mThrust{nullptr}
+{}
 
 CSMWorld::WeaponRefIdAdapter::WeaponRefIdAdapter (const WeaponColumns& columns)
 : EnchantableRefIdAdapter<ESM::Weapon> (UniversalId::Type_Weapon, columns), mColumns (columns)
diff --git a/apps/opencs/model/world/refidadapterimp.hpp b/apps/opencs/model/world/refidadapterimp.hpp
index 0a29afcad7..95d1a09a26 100644
--- a/apps/opencs/model/world/refidadapterimp.hpp
+++ b/apps/opencs/model/world/refidadapterimp.hpp
@@ -178,7 +178,11 @@ namespace CSMWorld
         const RefIdColumn *mName;
         const RefIdColumn *mScript;
 
-        NameColumns (const ModelColumns& base) : ModelColumns (base) {}
+        NameColumns (const ModelColumns& base)
+        : ModelColumns (base)
+        , mName(nullptr)
+        , mScript(nullptr)
+        {}
     };
 
     /// \brief Adapter for IDs with names (all but levelled lists and statics)
@@ -247,7 +251,12 @@ namespace CSMWorld
         const RefIdColumn *mWeight;
         const RefIdColumn *mValue;
 
-        InventoryColumns (const NameColumns& base) : NameColumns (base) {}
+        InventoryColumns (const NameColumns& base)
+        : NameColumns (base)
+        , mIcon(nullptr)
+        , mWeight(nullptr)
+        , mValue(nullptr)
+        {}
     };
 
     /// \brief Adapter for IDs that can go into an inventory
@@ -405,7 +414,11 @@ namespace CSMWorld
         const RefIdColumn *mEnchantment;
         const RefIdColumn *mEnchantmentPoints;
 
-        EnchantableColumns (const InventoryColumns& base) : InventoryColumns (base) {}
+        EnchantableColumns (const InventoryColumns& base)
+        : InventoryColumns (base)
+        , mEnchantment(nullptr)
+        , mEnchantmentPoints(nullptr)
+        {}
     };
 
     /// \brief Adapter for enchantable IDs
@@ -474,7 +487,11 @@ namespace CSMWorld
         const RefIdColumn *mQuality;
         const RefIdColumn *mUses;
 
-        ToolColumns (const InventoryColumns& base) : InventoryColumns (base) {}
+        ToolColumns (const InventoryColumns& base)
+        : InventoryColumns (base)
+        , mQuality(nullptr)
+        , mUses(nullptr)
+        {}
     };
 
     /// \brief Adapter for tools with limited uses IDs (lockpick, repair, probes)
@@ -549,7 +566,17 @@ namespace CSMWorld
         const RefIdColumn *mAiPackages;
         std::map<const RefIdColumn *, unsigned int> mServices;
 
-        ActorColumns (const NameColumns& base) : NameColumns (base) {}
+        ActorColumns (const NameColumns& base)
+            : NameColumns (base)
+            , mHello(nullptr)
+            , mFlee(nullptr)
+            , mFight(nullptr)
+            , mAlarm(nullptr)
+            , mInventory(nullptr)
+            , mSpells(nullptr)
+            , mDestinations(nullptr)
+            , mAiPackages(nullptr)
+            {}
     };
 
     /// \brief Adapter for actor IDs (handles common AI functionality)
@@ -2054,7 +2081,11 @@ namespace CSMWorld
         const RefIdColumn *mLevList;
         const RefIdColumn *mNestedListLevList;
 
-        LevListColumns (const BaseColumns& base) : BaseColumns (base) {}
+        LevListColumns (const BaseColumns& base)
+        : BaseColumns (base)
+        , mLevList(nullptr)
+        , mNestedListLevList(nullptr)
+        {}
     };
 
     template<typename RecordT>
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 331927155b..b6fe05d0f8 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -815,6 +815,7 @@ namespace MWRender
         RenderingManager::RayResult result;
         result.mHit = false;
         result.mHitRefnum.mContentFile = -1;
+        result.mHitRefnum.mIndex = -1;
         result.mRatio = 0;
         if (intersector->containsIntersections())
         {
diff --git a/components/esm/loadtes3.cpp b/components/esm/loadtes3.cpp
index d953f1dc23..84a31b3bd0 100644
--- a/components/esm/loadtes3.cpp
+++ b/components/esm/loadtes3.cpp
@@ -42,6 +42,7 @@ void ESM::Header::load (ESMReader &esm)
         MasterData m;
         m.name = esm.getHString();
         m.size = esm.getHNLong ("DATA");
+        m.index = -1;
         mMaster.push_back (m);
     }
 
diff --git a/components/misc/frameratelimiter.hpp b/components/misc/frameratelimiter.hpp
index b8e2101651..b727074d26 100644
--- a/components/misc/frameratelimiter.hpp
+++ b/components/misc/frameratelimiter.hpp
@@ -13,6 +13,7 @@ namespace Misc
             explicit FrameRateLimiter(std::chrono::duration<Rep, Ratio> maxFrameDuration,
                                       std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now())
                 : mMaxFrameDuration(std::chrono::duration_cast<std::chrono::steady_clock::duration>(maxFrameDuration))
+                , mLastFrameDuration(0)
                 , mLastMeasurement(now)
             {}
 
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 66d48f9715..287365a830 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -226,6 +226,7 @@ namespace Resource
         , mAutoUseNormalMaps(false)
         , mAutoUseSpecularMaps(false)
         , mApplyLightingToEnvMaps(false)
+        , mConvertAlphaTestToAlphaToCoverage(false)
         , mInstanceCache(new MultiObjectCache)
         , mSharedStateManager(new SharedStateManager)
         , mImageManager(imageManager)
diff --git a/components/sdlutil/sdlinputwrapper.cpp b/components/sdlutil/sdlinputwrapper.cpp
index 8d6a124e2c..ca223ae3b8 100644
--- a/components/sdlutil/sdlinputwrapper.cpp
+++ b/components/sdlutil/sdlinputwrapper.cpp
@@ -375,6 +375,7 @@ InputWrapper::InputWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> v
             pack_evt.y = mMouseY = evt.motion.y;
             pack_evt.xrel = evt.motion.xrel;
             pack_evt.yrel = evt.motion.yrel;
+            pack_evt.type = SDL_MOUSEMOTION;
             if (mFirstMouseMove)
             {
                 // first event should be treated as non-relative, since there's no point of reference
@@ -387,6 +388,7 @@ InputWrapper::InputWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> v
         {
             mMouseZ += pack_evt.zrel = (evt.wheel.y * 120);
             pack_evt.z = mMouseZ;
+            pack_evt.type = SDL_MOUSEWHEEL;
         }
         else
         {
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 612c9011d2..b0013538f0 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -50,6 +50,7 @@ namespace Shader
         , mAutoUseNormalMaps(false)
         , mAutoUseSpecularMaps(false)
         , mApplyLightingToEnvMaps(false)
+        , mConvertAlphaTestToAlphaToCoverage(false)
         , mTranslucentFramebuffer(false)
         , mShaderManager(shaderManager)
         , mImageManager(imageManager)
diff --git a/extern/osg-ffmpeg-videoplayer/videostate.cpp b/extern/osg-ffmpeg-videoplayer/videostate.cpp
index a35c845dbd..c153aa14c7 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.cpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.cpp
@@ -50,8 +50,9 @@ VideoState::VideoState()
     , av_sync_type(AV_SYNC_DEFAULT)
     , audio_st(nullptr)
     , video_st(nullptr), frame_last_pts(0.0)
-    , video_clock(0.0), sws_context(nullptr), pictq_size(0)
-    , pictq_rindex(0), pictq_windex(0)
+    , video_clock(0.0), sws_context(nullptr)
+    , sws_context_w(0), sws_context_h(0)
+    , pictq_size(0), pictq_rindex(0), pictq_windex(0)
     , mSeekRequested(false)
     , mSeekPos(0)
     , mVideoEnded(false)

From c989fac67b6de8e6df9676fbf34a6f06d1b053e6 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 10 Apr 2021 11:20:12 +0400
Subject: [PATCH 0541/2859] Add bound for pointers cache size, as it specified
 in docs

---
 apps/openmw/mwworld/cells.cpp | 9 +++++----
 apps/openmw/mwworld/cells.hpp | 3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwworld/cells.cpp b/apps/openmw/mwworld/cells.cpp
index 15c1b46bab..40ad62a403 100644
--- a/apps/openmw/mwworld/cells.cpp
+++ b/apps/openmw/mwworld/cells.cpp
@@ -132,9 +132,11 @@ void MWWorld::Cells::writeCell (ESM::ESMWriter& writer, CellStore& cell) const
 
 MWWorld::Cells::Cells (const MWWorld::ESMStore& store, std::vector<ESM::ESMReader>& reader)
 : mStore (store), mReader (reader),
-  mIdCache (Settings::Manager::getInt("pointers cache size", "Cells"), std::pair<std::string, CellStore *> ("", (CellStore*)nullptr)),
   mIdCacheIndex (0)
-{}
+{
+    int cacheSize = std::max(Settings::Manager::getInt("pointers cache size", "Cells"), 0);
+    mIdCache = IdCache(cacheSize, std::pair<std::string, CellStore *> ("", (CellStore*)nullptr));
+}
 
 MWWorld::CellStore *MWWorld::Cells::getExterior (int x, int y)
 {
@@ -259,8 +261,7 @@ MWWorld::Ptr MWWorld::Cells::getPtr (const std::string& name, CellStore& cell,
 MWWorld::Ptr MWWorld::Cells::getPtr (const std::string& name)
 {
     // First check the cache
-    for (std::vector<std::pair<std::string, CellStore *> >::iterator iter (mIdCache.begin());
-        iter!=mIdCache.end(); ++iter)
+    for (IdCache::iterator iter (mIdCache.begin()); iter!=mIdCache.end(); ++iter)
         if (iter->first==name && iter->second)
         {
             Ptr ptr = getPtr (name, *iter->second);
diff --git a/apps/openmw/mwworld/cells.hpp b/apps/openmw/mwworld/cells.hpp
index 90ede409b2..654d9a14b5 100644
--- a/apps/openmw/mwworld/cells.hpp
+++ b/apps/openmw/mwworld/cells.hpp
@@ -28,11 +28,12 @@ namespace MWWorld
     /// \brief Cell container
     class Cells
     {
+            typedef std::vector<std::pair<std::string, CellStore *> > IdCache;
             const MWWorld::ESMStore& mStore;
             std::vector<ESM::ESMReader>& mReader;
             mutable std::map<std::string, CellStore> mInteriors;
             mutable std::map<std::pair<int, int>, CellStore> mExteriors;
-            std::vector<std::pair<std::string, CellStore *> > mIdCache;
+            IdCache mIdCache;
             std::size_t mIdCacheIndex;
 
             Cells (const Cells&);

From 903b89a0ffafed6f92bfc0c6265d37aeedcdc70e Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 10 Apr 2021 11:21:53 +0400
Subject: [PATCH 0542/2859] Add bound for UI scale factor, as it specified in
 docs

---
 apps/openmw/mwgui/inventorywindow.cpp     | 2 +-
 apps/openmw/mwinput/controllermanager.cpp | 2 +-
 apps/openmw/mwinput/mousemanager.cpp      | 2 +-
 apps/openmw/mwrender/localmap.cpp         | 2 +-
 components/fontloader/fontloader.cpp      | 3 ++-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index b0749d4bdf..6152efaa98 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -71,7 +71,7 @@ namespace MWGui
         , mUpdateTimer(0.f)
     {
         float uiScale = Settings::Manager::getFloat("scaling factor", "GUI");
-        if (uiScale > 1.0)
+        if (uiScale > 0.f)
             mScaleFactor = uiScale;
 
         mPreviewTexture.reset(new osgMyGUI::OSGTexture(mPreview->getTexture()));
diff --git a/apps/openmw/mwinput/controllermanager.cpp b/apps/openmw/mwinput/controllermanager.cpp
index 48091541ca..d17a4bd95d 100644
--- a/apps/openmw/mwinput/controllermanager.cpp
+++ b/apps/openmw/mwinput/controllermanager.cpp
@@ -70,7 +70,7 @@ namespace MWInput
         }
 
         float uiScale = Settings::Manager::getFloat("scaling factor", "GUI");
-        if (uiScale != 0.f)
+        if (uiScale > 0.f)
             mInvUiScalingFactor = 1.f / uiScale;
 
         float deadZoneRadius = Settings::Manager::getFloat("joystick dead zone", "Input");
diff --git a/apps/openmw/mwinput/mousemanager.cpp b/apps/openmw/mwinput/mousemanager.cpp
index 4816470ffb..8df116baa6 100644
--- a/apps/openmw/mwinput/mousemanager.cpp
+++ b/apps/openmw/mwinput/mousemanager.cpp
@@ -37,7 +37,7 @@ namespace MWInput
         , mGuiCursorEnabled(true)
     {
         float uiScale = Settings::Manager::getFloat("scaling factor", "GUI");
-        if (uiScale != 0.f)
+        if (uiScale > 0.f)
             mInvUiScalingFactor = 1.f / uiScale;
 
         int w,h;
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index 64931aa880..25d859e547 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -90,7 +90,7 @@ LocalMap::LocalMap(osg::Group* root)
 {
     // Increase map resolution, if use UI scaling
     float uiScale = Settings::Manager::getFloat("scaling factor", "GUI");
-    if (uiScale > 1.0)
+    if (uiScale > 0.f)
         mMapResolution *= uiScale;
 
     SceneUtil::FindByNameVisitor find("Scene Root");
diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index 2bed079e17..98fce32d2a 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -569,7 +569,8 @@ namespace Gui
                 resolution = std::min(960, std::max(48, resolution));
 
                 float uiScale = Settings::Manager::getFloat("scaling factor", "GUI");
-                resolution *= uiScale;
+                if (uiScale > 0.f)
+                    resolution *= uiScale;
 
                 MyGUI::xml::ElementPtr resolutionNode = resourceNode->createChild("Property");
                 resolutionNode->addAttribute("key", "Resolution");

From 1db369f4184a083ed6c57be8f3d4341ebc3da1d6 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 10 Apr 2021 11:26:54 +0400
Subject: [PATCH 0543/2859] Do not use unchecked value in calculations

---
 apps/openmw/mwgui/spellcreationdialog.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwgui/spellcreationdialog.cpp b/apps/openmw/mwgui/spellcreationdialog.cpp
index f9de469e20..5a5dec60f7 100644
--- a/apps/openmw/mwgui/spellcreationdialog.cpp
+++ b/apps/openmw/mwgui/spellcreationdialog.cpp
@@ -393,7 +393,8 @@ namespace MWGui
         MWWorld::Ptr player = MWMechanics::getPlayer();
         int playerGold = player.getClass().getContainerStore(player).count(MWWorld::ContainerStore::sGoldId);
 
-        if (MyGUI::utility::parseInt(mPriceLabel->getCaption()) > playerGold)
+        int price = MyGUI::utility::parseInt(mPriceLabel->getCaption());
+        if (price > playerGold)
         {
             MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage18}");
             return;
@@ -401,8 +402,6 @@ namespace MWGui
 
         mSpell.mName = mNameEdit->getCaption();
 
-        int price = MyGUI::utility::parseInt(mPriceLabel->getCaption());
-
         player.getClass().getContainerStore(player).remove(MWWorld::ContainerStore::sGoldId, price, player);
 
         // add gold to NPC trading gold pool

From f984e96b347730469da4d49f22a489bfef316522 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 10 Apr 2021 12:23:03 +0400
Subject: [PATCH 0544/2859] Use conventional names for atan2 arguments

---
 apps/openmw/mwmechanics/aiavoiddoor.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwmechanics/aiavoiddoor.cpp b/apps/openmw/mwmechanics/aiavoiddoor.cpp
index 73a6385638..6a59ae2bfb 100644
--- a/apps/openmw/mwmechanics/aiavoiddoor.cpp
+++ b/apps/openmw/mwmechanics/aiavoiddoor.cpp
@@ -45,13 +45,13 @@ bool MWMechanics::AiAvoidDoor::execute (const MWWorld::Ptr& actor, CharacterCont
         return true; //Door is no longer opening
 
     ESM::Position tPos = mDoorPtr.getRefData().getPosition(); //Position of the door
-    float x = pos.pos[0] - tPos.pos[0];
-    float y = pos.pos[1] - tPos.pos[1];
+    float x = pos.pos[1] - tPos.pos[1];
+    float y = pos.pos[0] - tPos.pos[0];
 
     actor.getClass().getCreatureStats(actor).setMovementFlag(CreatureStats::Flag_Run, true);
 
     // Turn away from the door and move when turn completed
-    if (zTurn(actor, std::atan2(x,y) + getAdjustedAngle(), osg::DegreesToRadians(5.f)))
+    if (zTurn(actor, std::atan2(y,x) + getAdjustedAngle(), osg::DegreesToRadians(5.f)))
         actor.getClass().getMovementSettings(actor).mPosition[1] = 1;
     else
         actor.getClass().getMovementSettings(actor).mPosition[1] = 0;

From 45b1c68af437ea26b193fd823ffea84f79eb2864 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 10 Apr 2021 12:32:12 +0400
Subject: [PATCH 0545/2859] Remove annotation which does not work

---
 components/crashcatcher/crashcatcher.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/components/crashcatcher/crashcatcher.cpp b/components/crashcatcher/crashcatcher.cpp
index 4ad8565483..b4b2a4a0c6 100644
--- a/components/crashcatcher/crashcatcher.cpp
+++ b/components/crashcatcher/crashcatcher.cpp
@@ -146,11 +146,10 @@ static void gdb_info(pid_t pid)
     /*
      * Create a temp file to put gdb commands into.
      * Note: POSIX.1-2008 declares that the file should be already created with mode 0600 by default.
-     * Modern systems implement it and and suggest to do not touch masks in multithreaded applications.
+     * Modern systems implement it and suggest to do not touch masks in multithreaded applications.
      * So CoverityScan warning is valid only for ancient versions of stdlib.
     */
     strcpy(respfile, "/tmp/gdb-respfile-XXXXXX");
-    // coverity[secure_temp]
     if((fd=mkstemp(respfile)) >= 0 && (f=fdopen(fd, "w")) != nullptr)
     {
         fprintf(f, "attach %d\n"

From 400cae58e56a17df3ec8d4a35e5615618ba8d064 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matja=C5=BE=20Lamut?= <matjaz.lamut@gmail.com>
Date: Sat, 10 Apr 2021 12:52:42 +0000
Subject: [PATCH 0546/2859] Collada user documentation

---
 .../reference/modding/custom-models/index.rst | 19 +++++
 .../pipeline-blender-collada.rst              | 84 +++++++++++++++++++
 .../custom-models/pipeline-blender-nif.rst    | 17 ++++
 .../pipeline-blender-osgnative.rst}           | 27 ++----
 docs/source/reference/modding/index.rst       |  1 +
 .../modding/texture-modding/index.rst         |  1 -
 6 files changed, 127 insertions(+), 22 deletions(-)
 create mode 100644 docs/source/reference/modding/custom-models/index.rst
 create mode 100644 docs/source/reference/modding/custom-models/pipeline-blender-collada.rst
 create mode 100644 docs/source/reference/modding/custom-models/pipeline-blender-nif.rst
 rename docs/source/reference/modding/{texture-modding/native-mesh-format.rst => custom-models/pipeline-blender-osgnative.rst} (77%)

diff --git a/docs/source/reference/modding/custom-models/index.rst b/docs/source/reference/modding/custom-models/index.rst
new file mode 100644
index 0000000000..8f575bf3c8
--- /dev/null
+++ b/docs/source/reference/modding/custom-models/index.rst
@@ -0,0 +1,19 @@
+#############
+Custom Models
+#############
+
+Custom models can be imported into OpenMW using a variety of formats. Below is a quick overview of supported formats, followed by separate articles with further look at the pipelines.
+
+* **COLLADA** has no license restrictions and is suitable for modding as well as standalone games based on the OpenMW engine. It supports static and animated models. While it doesn't yet work in all parts of the engine, work is being done to resolve the remaining limitations.
+
+* **OSG native** has no license restrictions, but currently supports only static, non-animated models.
+
+* **NIF** is the proprietary format used in the original Morrowind game. It supports static and animated models and everything else the format included in the original game.
+
+.. toctree::
+	:caption: Table of Contents
+	:maxdepth: 1
+
+	pipeline-blender-collada
+	pipeline-blender-osgnative
+	pipeline-blender-nif
diff --git a/docs/source/reference/modding/custom-models/pipeline-blender-collada.rst b/docs/source/reference/modding/custom-models/pipeline-blender-collada.rst
new file mode 100644
index 0000000000..48a19cb7c7
--- /dev/null
+++ b/docs/source/reference/modding/custom-models/pipeline-blender-collada.rst
@@ -0,0 +1,84 @@
+##############################
+Blender to OpenMW with Collada
+##############################
+
+First, let's take a look at the pipeline requirements and how the fundamental properties of a scene translate from Blender to OpenMW.
+
+Requirements
+------------
+* `OpenMW 0.47 <https://openmw.org/downloads/>`_ or later
+* `Blender 2.81 <https://www.blender.org/download/>`_ or later. Latest confirmed, working version is Blender 2.91
+* `Better COLLADA Exporter <https://github.com/unelsson/collada-exporter>`_ tuned for OpenMW
+* A model you would like to export
+
+In addition, OpenMW needs to be configured to read COLLADA (dae) files instead of the default format (nif). In settings.cfg under [Models] section... TODO
+
+Location
+--------
+
+Objects keep their visual location and origin they had in the original scene.
+
+
+Rotation
+--------
+
+* Blender’s +Z axis is up axis in OpenMW
+* Blender’s +Y axis is front axis in OpenMW
+* Blender’s X axis is left-right axis in OpenMW
+
+
+Scale
+-----
+
+Scale ratio between Blender and OpenMW is 70 to 1. This means 70 blender units translate to 1 m in OpenMW.
+
+However, a scale factor like this is impractical to work with. A better approach is to work with a scale of 1 Blender unit = 1m and apply the 70 scale factor in the Better COLLADA Exporter. The exporter will automatically scale all object, mesh, armature and animation data.
+
+
+Exporter settings - static models
+---------------------------------
+
+Better COLLADA Exporter offers various options which are rather straightforward for static models. The important one is last in the list, to apply a scaling factor of 70 to the whole scene, so 1 blender unit equals 1 m in OpenMW. The following settings should be good for general use.
+It's also very important to have "export selected" box checked, as otherwise the exporter may just fail with an error message. It's also important to have the correct window open, and the models selected before exporting.
+
+
+Animated models to OpenMW
+-------------------------
+
+Animated models are those where a hierarchy of bones, known as armature, deforms the mesh and makes things move. Besides the topics covered above, the following requirements apply.
+
+Armature
+--------
+
+* For animated models, a single armature per COLLADA file is advised to avoid any potential problems.
+* There needs to be a single top-most bone in the armature’s hierarchy, where both the deformation and control bones fall under it.
+* Not all bones need to be exported. By disabing the bone’s “Deform” property and using the corresponding option in the exporter, it is possible to export only the bones needed for animation.
+
+
+Animations
+----------
+
+Every action in Blender is exported as its own animation clip in COLLADA. Actions you don't wish to export need to have "-noexp" added to their name, with the corresponding option enabled in the exporter.
+
+Due to current limitations of the format / exporter, the keyframes of any action must not overlap the keyframes of any other action. Thus in practice, the keyframes for each action need to be manually offset to their unique range on the timeline.
+
+An animated .dae file needs a corresponding animation definition file, or textkeys, for OpenMW to understand. Textkeys are set in .txt file with the same name as the model. E.g. OpenMWDude.dae -> OpenMWDude.txt , each line having a textkey and a double number for timesignature. E.g. idle: start 0.03333333333333333.
+
+Root Motion
+-----------
+
+OpenMW can read the movement of the root (top-most) bone and use it to move objects in the game world. For this to work, the root bone must be animated to move through space. The root bone must, in its default pose, be alligned with the world.
+
+
+Exporter Settings
+-----------------
+
+For animated models, use the following exporter settings. Before export, select all objects you wish to include in the exported file. TODO
+
+
+
+
+
+ 
+ 
+
diff --git a/docs/source/reference/modding/custom-models/pipeline-blender-nif.rst b/docs/source/reference/modding/custom-models/pipeline-blender-nif.rst
new file mode 100644
index 0000000000..a1b7b0f705
--- /dev/null
+++ b/docs/source/reference/modding/custom-models/pipeline-blender-nif.rst
@@ -0,0 +1,17 @@
+##########################
+Blender to OpenMW with NIF
+##########################
+
+There is a lot of information available around the Internet on how to work with NIF files. We recommend you refer to https://www.niftools.org/ for more information.
+
+For Blender specifically, you will need the following requirements.
+
+Requirements
+------------
+* `OpenMW <https://openmw.org/downloads/>`_
+* `Blender 2.8+ <https://www.blender.org/download/>`_
+* Either `Niftools addon <https://github.com/niftools/blender_niftools_addonr>`_
+* Or `Morrowind Blender Plugin <https://blender-morrowind.readthedocs.io/en/latest/index.html>`_
+* A model you would like to export
+
+
diff --git a/docs/source/reference/modding/texture-modding/native-mesh-format.rst b/docs/source/reference/modding/custom-models/pipeline-blender-osgnative.rst
similarity index 77%
rename from docs/source/reference/modding/texture-modding/native-mesh-format.rst
rename to docs/source/reference/modding/custom-models/pipeline-blender-osgnative.rst
index c2ddd26ba7..95bc7e5acb 100644
--- a/docs/source/reference/modding/texture-modding/native-mesh-format.rst
+++ b/docs/source/reference/modding/custom-models/pipeline-blender-osgnative.rst
@@ -1,17 +1,9 @@
-##################
-Native Mesh Format
-##################
+#################################
+Blender to OpenMW with OSG native
+#################################
 
-This article explains how to export a model from Blender to OpenMW using the OSG model format.
-Starting with OpenMW version 0.38 we can utilize the OSG native model format.
-The OSG model format doesn't yet support all the features that NIF's support,
-but works for basic models. For more details on the format, refer to
-`this forum post <https://forum.openmw.org/viewtopic.php?f=20&t=2949&p=35514#p35514>`_.
-
-Previously, NIF files were the only way to get models into the game.
-Unfortunately, the NIF format is proprietary, bloated,
-and the available exporters are not in great shape.
-For example, the Blender NIF exporter currently only works with the very old Blender 2.49.
+This article explains how to export a model from Blender to OpenMW using the OSG model format. It supports only basic, static models.
+For more details on the format, refer to `this forum post <https://forum.openmw.org/viewtopic.php?f=20&t=2949&p=35514#p35514>`_.
 
 Prerequisites
 #############
@@ -103,12 +95,5 @@ Using shaders/normal maps
 #########################
 
 See :ref:`OSG Native Files`
+ 
 
-Conclusion
-##########
-
-These are the basics of getting a textured, static model from Blender into the game.
-In the future, we will want a way to add texture animations,
-skeletal animations, separate collision shapes,
-and some other features that are currently only available via NIF files.
-We will likely add these features to the native OSG format after OpenMW 1.0.
\ No newline at end of file
diff --git a/docs/source/reference/modding/index.rst b/docs/source/reference/modding/index.rst
index 69ec0a56a0..df98137d85 100644
--- a/docs/source/reference/modding/index.rst
+++ b/docs/source/reference/modding/index.rst
@@ -22,6 +22,7 @@ about creating new content for OpenMW, please refer to
 	mod-install
 	settings/index
 	texture-modding/index
+	custom-models/index
 	font
 	extended
 	paths
diff --git a/docs/source/reference/modding/texture-modding/index.rst b/docs/source/reference/modding/texture-modding/index.rst
index 3e0b359ee2..aa2802af5d 100644
--- a/docs/source/reference/modding/texture-modding/index.rst
+++ b/docs/source/reference/modding/texture-modding/index.rst
@@ -13,4 +13,3 @@ to texture modding in OpenMW.
 
 	texture-basics
 	convert-bump-mapped-mods
-	native-mesh-format

From 010f290fd525f4b71eacb63a9d2a590b9f34dc11 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 11 Apr 2021 14:07:12 +0200
Subject: [PATCH 0547/2859] Update OSX deployment target to 10.14

To support std::variant
---
 CI/before_script.osx.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh
index 36fa792991..f9191eb890 100755
--- a/CI/before_script.osx.sh
+++ b/CI/before_script.osx.sh
@@ -16,7 +16,7 @@ cmake \
 -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.12" \
+-D CMAKE_OSX_DEPLOYMENT_TARGET="10.14" \
 -D CMAKE_BUILD_TYPE=RELEASE \
 -D OPENMW_OSX_DEPLOYMENT=TRUE \
 -D BUILD_OPENMW=TRUE \

From b91be1e8035f36fdfd5cee44b706bafd82a2a047 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 11 Apr 2021 14:12:31 +0200
Subject: [PATCH 0548/2859] Catch exceptions in ResolutionListener

---
 apps/openmw/mwworld/containerstore.cpp | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index 635485dde8..86c5ec331d 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -77,10 +77,24 @@ MWWorld::ResolutionListener::~ResolutionListener()
 {
     if(!mStore.mModified && mStore.mResolved && !mStore.mPtr.isEmpty())
     {
-        for(const auto&& ptr : mStore)
-            ptr.getRefData().setCount(0);
+        try
+        {
+            for(const auto&& ptr : mStore)
+                ptr.getRefData().setCount(0);
+        }
+        catch(const std::exception& e)
+        {
+            Log(Debug::Warning) << "Failed to clear temporary container contents of " << mStore.mPtr.get<ESM::Container>()->mBase->mId << ": " << e.what();
+        }
         mStore.fillNonRandom(mStore.mPtr.get<ESM::Container>()->mBase->mInventory, "", mStore.mSeed);
-        addScripts(mStore, mStore.mPtr.mCell);
+        try
+        {
+            addScripts(mStore, mStore.mPtr.mCell);
+        }
+        catch(const std::exception& e)
+        {
+            Log(Debug::Warning) << "Failed to restart item scripts inside " << mStore.mPtr.get<ESM::Container>()->mBase->mId << ": " << e.what();
+        }
         mStore.mResolved = false;
     }
 }

From fda639eb57f3180a4a87b8d2879ffbb381f7eb32 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sun, 14 Mar 2021 16:21:33 +0100
Subject: [PATCH 0549/2859] Remove unused forward declarations

---
 apps/openmw/engine.hpp                      | 20 --------------------
 apps/openmw/mwbase/windowmanager.hpp        |  1 -
 apps/openmw/mwgui/container.hpp             |  6 ------
 apps/openmw/mwgui/dialogue.hpp              |  5 -----
 apps/openmw/mwgui/race.hpp                  |  5 -----
 apps/openmw/mwgui/review.hpp                |  5 -----
 apps/openmw/mwgui/settingswindow.hpp        |  5 -----
 apps/openmw/mwgui/spellbuyingwindow.hpp     |  5 -----
 apps/openmw/mwgui/statswindow.hpp           |  2 --
 apps/openmw/mwgui/textinput.hpp             |  5 -----
 apps/openmw/mwgui/travelwindow.hpp          |  6 ------
 apps/openmw/mwgui/windowbase.hpp            |  6 ------
 apps/openmw/mwgui/windowmanagerimp.hpp      |  1 -
 apps/openmw/mwgui/windowpinnablebase.hpp    |  2 --
 apps/openmw/mwscript/interpretercontext.hpp | 10 ----------
 apps/openmw/mwworld/scene.hpp               |  1 -
 apps/openmw/mwworld/worldimp.hpp            |  2 --
 components/nifosg/controller.hpp            |  5 -----
 18 files changed, 92 deletions(-)

diff --git a/apps/openmw/engine.hpp b/apps/openmw/engine.hpp
index ff362f4b69..1aef62df53 100644
--- a/apps/openmw/engine.hpp
+++ b/apps/openmw/engine.hpp
@@ -33,26 +33,6 @@ namespace Compiler
     class Context;
 }
 
-namespace MWScript
-{
-    class ScriptManager;
-}
-
-namespace MWSound
-{
-    class SoundManager;
-}
-
-namespace MWWorld
-{
-    class World;
-}
-
-namespace MWGui
-{
-    class WindowManager;
-}
-
 namespace Files
 {
     struct ConfigurationManager;
diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index 29d404777c..9bbea9c519 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -32,7 +32,6 @@ namespace MyGUI
 
 namespace ESM
 {
-    struct Class;
     class ESMReader;
     class ESMWriter;
     struct CellId;
diff --git a/apps/openmw/mwgui/container.hpp b/apps/openmw/mwgui/container.hpp
index feda123fb7..85c0dddc67 100644
--- a/apps/openmw/mwgui/container.hpp
+++ b/apps/openmw/mwgui/container.hpp
@@ -6,11 +6,6 @@
 
 #include "itemmodel.hpp"
 
-namespace MWWorld
-{
-    class Environment;
-}
-
 namespace MyGUI
 {
     class Gui;
@@ -19,7 +14,6 @@ namespace MyGUI
 
 namespace MWGui
 {
-    class WindowManager;
     class ContainerWindow;
     class ItemView;
     class SortFilterItemModel;
diff --git a/apps/openmw/mwgui/dialogue.hpp b/apps/openmw/mwgui/dialogue.hpp
index 02401f2e14..ac6303e20a 100644
--- a/apps/openmw/mwgui/dialogue.hpp
+++ b/apps/openmw/mwgui/dialogue.hpp
@@ -15,11 +15,6 @@ namespace Gui
     class MWList;
 }
 
-namespace MWGui
-{
-    class WindowManager;
-}
-
 namespace MWGui
 {
     class ResponseCallback;
diff --git a/apps/openmw/mwgui/race.hpp b/apps/openmw/mwgui/race.hpp
index 0299c2a1ac..170c1dbce3 100644
--- a/apps/openmw/mwgui/race.hpp
+++ b/apps/openmw/mwgui/race.hpp
@@ -7,11 +7,6 @@
 #include <MyGUI_RenderManager.h>
 
 
-namespace MWGui
-{
-    class WindowManager;
-}
-
 namespace MWRender
 {
     class RaceSelectionPreview;
diff --git a/apps/openmw/mwgui/review.hpp b/apps/openmw/mwgui/review.hpp
index bd17c7afb3..cb847536d3 100644
--- a/apps/openmw/mwgui/review.hpp
+++ b/apps/openmw/mwgui/review.hpp
@@ -11,11 +11,6 @@ namespace ESM
     struct Spell;
 }
 
-namespace MWGui
-{
-    class WindowManager;
-}
-
 namespace MWGui
 {
     class ReviewDialog : public WindowModal
diff --git a/apps/openmw/mwgui/settingswindow.hpp b/apps/openmw/mwgui/settingswindow.hpp
index 6f25dd1143..c268514dc6 100644
--- a/apps/openmw/mwgui/settingswindow.hpp
+++ b/apps/openmw/mwgui/settingswindow.hpp
@@ -3,11 +3,6 @@
 
 #include "windowbase.hpp"
 
-namespace MWGui
-{
-    class WindowManager;
-}
-
 namespace MWGui
 {
     class SettingsWindow : public WindowBase
diff --git a/apps/openmw/mwgui/spellbuyingwindow.hpp b/apps/openmw/mwgui/spellbuyingwindow.hpp
index 622548c959..f46c437963 100644
--- a/apps/openmw/mwgui/spellbuyingwindow.hpp
+++ b/apps/openmw/mwgui/spellbuyingwindow.hpp
@@ -15,11 +15,6 @@ namespace MyGUI
   class Widget;
 }
 
-namespace MWGui
-{
-    class WindowManager;
-}
-
 namespace MWGui
 {
     class SpellBuyingWindow : public ReferenceInterface, public WindowBase
diff --git a/apps/openmw/mwgui/statswindow.hpp b/apps/openmw/mwgui/statswindow.hpp
index 24f302580e..bf78cde34a 100644
--- a/apps/openmw/mwgui/statswindow.hpp
+++ b/apps/openmw/mwgui/statswindow.hpp
@@ -6,8 +6,6 @@
 
 namespace MWGui
 {
-    class WindowManager;
-
     class StatsWindow : public WindowPinnableBase, public NoDrop, public StatsListener
     {
         public:
diff --git a/apps/openmw/mwgui/textinput.hpp b/apps/openmw/mwgui/textinput.hpp
index 84d9d032da..4d365eb44c 100644
--- a/apps/openmw/mwgui/textinput.hpp
+++ b/apps/openmw/mwgui/textinput.hpp
@@ -3,11 +3,6 @@
 
 #include "windowbase.hpp"
 
-namespace MWGui
-{
-    class WindowManager;
-}
-
 namespace MWGui
 {
     class TextInputDialog : public WindowModal
diff --git a/apps/openmw/mwgui/travelwindow.hpp b/apps/openmw/mwgui/travelwindow.hpp
index 962d17161d..00b7db7305 100644
--- a/apps/openmw/mwgui/travelwindow.hpp
+++ b/apps/openmw/mwgui/travelwindow.hpp
@@ -11,12 +11,6 @@ namespace MyGUI
   class Widget;
 }
 
-namespace MWGui
-{
-    class WindowManager;
-}
-
-
 namespace MWGui
 {
     class TravelWindow : public ReferenceInterface, public WindowBase
diff --git a/apps/openmw/mwgui/windowbase.hpp b/apps/openmw/mwgui/windowbase.hpp
index 8afb2321e8..90ef2118de 100644
--- a/apps/openmw/mwgui/windowbase.hpp
+++ b/apps/openmw/mwgui/windowbase.hpp
@@ -3,11 +3,6 @@
 
 #include "layout.hpp"
 
-namespace MWBase
-{
-    class WindowManager;
-}
-
 namespace MWWorld
 {
     class Ptr;
@@ -15,7 +10,6 @@ namespace MWWorld
 
 namespace MWGui
 {
-    class WindowManager;
     class DragAndDrop;
 
     class WindowBase: public Layout
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index cc1a1b6944..3fd8b132f6 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -114,7 +114,6 @@ namespace MWGui
   class TrainingWindow;
   class SpellIcons;
   class MerchantRepair;
-  class Repair;
   class SoulgemDialog;
   class Recharge;
   class CompanionWindow;
diff --git a/apps/openmw/mwgui/windowpinnablebase.hpp b/apps/openmw/mwgui/windowpinnablebase.hpp
index a942128195..c91f0a1489 100644
--- a/apps/openmw/mwgui/windowpinnablebase.hpp
+++ b/apps/openmw/mwgui/windowpinnablebase.hpp
@@ -5,8 +5,6 @@
 
 namespace MWGui
 {
-    class WindowManager;
-
     class WindowPinnableBase: public WindowBase
     {
     public:
diff --git a/apps/openmw/mwscript/interpretercontext.hpp b/apps/openmw/mwscript/interpretercontext.hpp
index c1481d6d0a..298454bcd2 100644
--- a/apps/openmw/mwscript/interpretercontext.hpp
+++ b/apps/openmw/mwscript/interpretercontext.hpp
@@ -10,16 +10,6 @@
 
 #include "../mwworld/ptr.hpp"
 
-namespace MWSound
-{
-    class SoundManager;
-}
-
-namespace MWInput
-{
-    struct MWInputManager;
-}
-
 namespace MWScript
 {
     class Locals;
diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp
index a70d3ccdd5..f87a0ca733 100644
--- a/apps/openmw/mwworld/scene.hpp
+++ b/apps/openmw/mwworld/scene.hpp
@@ -36,7 +36,6 @@ namespace Loading
 namespace DetourNavigator
 {
     struct Navigator;
-    class Water;
 }
 
 namespace MWRender
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 33b23e0653..5447e20c33 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -60,8 +60,6 @@ namespace ToUTF8
     class Utf8Encoder;
 }
 
-struct ContentLoader;
-
 namespace MWPhysics
 {
     class Object;
diff --git a/components/nifosg/controller.hpp b/components/nifosg/controller.hpp
index 96beafcbb8..b459166931 100644
--- a/components/nifosg/controller.hpp
+++ b/components/nifosg/controller.hpp
@@ -24,11 +24,6 @@ namespace osg
     class Material;
 }
 
-namespace osgParticle
-{
-    class Emitter;
-}
-
 namespace NifOsg
 {
 

From efb241f1de280987a79526c1d817c1f9ebe5feaa Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Mon, 29 Mar 2021 19:44:10 +0200
Subject: [PATCH 0550/2859] Use override instead of virtual

---
 apps/openmw/mwsound/soundmanagerimp.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwsound/soundmanagerimp.hpp b/apps/openmw/mwsound/soundmanagerimp.hpp
index 6b9de800f0..934402cd4c 100644
--- a/apps/openmw/mwsound/soundmanagerimp.hpp
+++ b/apps/openmw/mwsound/soundmanagerimp.hpp
@@ -141,7 +141,7 @@ namespace MWSound
 
     public:
         SoundManager(const VFS::Manager* vfs, bool useSound);
-        virtual ~SoundManager();
+        ~SoundManager() override;
 
         void processChangedSettings(const Settings::CategorySettingVector& settings) override;
 

From 32981bcd88d411090d324e410e0084297b8c3f97 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Mon, 29 Mar 2021 19:44:23 +0200
Subject: [PATCH 0551/2859] Constify a few things

---
 apps/openmw/mwgui/timeadvancer.cpp       | 4 ++--
 apps/openmw/mwgui/timeadvancer.hpp       | 4 ++--
 apps/openmw/mwrender/objectpaging.hpp    | 2 +-
 apps/openmw/mwstate/quicksavemanager.cpp | 4 ++--
 apps/openmw/mwstate/quicksavemanager.hpp | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwgui/timeadvancer.cpp b/apps/openmw/mwgui/timeadvancer.cpp
index a07da16825..c38094ae45 100644
--- a/apps/openmw/mwgui/timeadvancer.cpp
+++ b/apps/openmw/mwgui/timeadvancer.cpp
@@ -58,12 +58,12 @@ namespace MWGui
         }
     }
 
-    int TimeAdvancer::getHours()
+    int TimeAdvancer::getHours() const
     {
         return mHours;
     }
 
-    bool TimeAdvancer::isRunning()
+    bool TimeAdvancer::isRunning() const
     {
         return mRunning;
     }
diff --git a/apps/openmw/mwgui/timeadvancer.hpp b/apps/openmw/mwgui/timeadvancer.hpp
index 8367b5a8b2..b8456f3761 100644
--- a/apps/openmw/mwgui/timeadvancer.hpp
+++ b/apps/openmw/mwgui/timeadvancer.hpp
@@ -14,8 +14,8 @@ namespace MWGui
             void stop();
             void onFrame(float dt);
 
-            int getHours();
-            bool isRunning();
+            int getHours() const;
+            bool isRunning() const;
 
             // signals
             typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void;
diff --git a/apps/openmw/mwrender/objectpaging.hpp b/apps/openmw/mwrender/objectpaging.hpp
index 65f53d530c..c24cdf4f8d 100644
--- a/apps/openmw/mwrender/objectpaging.hpp
+++ b/apps/openmw/mwrender/objectpaging.hpp
@@ -63,7 +63,7 @@ namespace MWRender
         {
             std::set<ESM::RefNum> mDisabled;
             std::set<ESM::RefNum> mBlacklist;
-            bool operator==(const RefTracker&other) { return mDisabled == other.mDisabled && mBlacklist == other.mBlacklist; }
+            bool operator==(const RefTracker&other) const { return mDisabled == other.mDisabled && mBlacklist == other.mBlacklist; }
         };
         RefTracker mRefTracker;
         RefTracker mRefTrackerNew;
diff --git a/apps/openmw/mwstate/quicksavemanager.cpp b/apps/openmw/mwstate/quicksavemanager.cpp
index df078e026c..bf17815207 100644
--- a/apps/openmw/mwstate/quicksavemanager.cpp
+++ b/apps/openmw/mwstate/quicksavemanager.cpp
@@ -18,14 +18,14 @@ void MWState::QuickSaveManager::visitSave(const Slot *saveSlot)
     }
 }
 
-bool MWState::QuickSaveManager::isOldestSave(const Slot *compare)
+bool MWState::QuickSaveManager::isOldestSave(const Slot *compare) const
 {
     if(mOldestSlotVisited == nullptr)
         return true;
     return (compare->mTimeStamp <= mOldestSlotVisited->mTimeStamp);
 }
 
-bool MWState::QuickSaveManager::shouldCreateNewSlot()
+bool MWState::QuickSaveManager::shouldCreateNewSlot() const
 {
     return (mSlotsVisited < mMaxSaves);
 }
diff --git a/apps/openmw/mwstate/quicksavemanager.hpp b/apps/openmw/mwstate/quicksavemanager.hpp
index a5237d7c30..cdeff42c26 100644
--- a/apps/openmw/mwstate/quicksavemanager.hpp
+++ b/apps/openmw/mwstate/quicksavemanager.hpp
@@ -13,8 +13,8 @@ namespace MWState{
         unsigned int mSlotsVisited;
         const Slot *mOldestSlotVisited;
     private:
-        bool shouldCreateNewSlot();
-        bool isOldestSave(const Slot *compare);
+        bool shouldCreateNewSlot() const;
+        bool isOldestSave(const Slot *compare) const;
     public:
         QuickSaveManager(std::string &saveName, unsigned int maxSaves);
         ///< A utility class to manage multiple quicksave slots

From 95042a2a688e674fae259df8a23616d97780cdee Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sun, 11 Apr 2021 20:31:24 +0200
Subject: [PATCH 0552/2859] Use the number of logical cores on the CI on OSX

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 713cc26019..c26235d0a4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -105,7 +105,7 @@ MacOS:
     - rm -fr build/*  # remove anything in the build directory
     - CI/before_install.osx.sh
     - 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
   artifacts:
     paths:

From 634556be9de94456d4019aeb331df97d4184bb83 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 11 Apr 2021 17:57:36 +0200
Subject: [PATCH 0553/2859] Add setting to allow following creatures to find
 path over water surface

---
 apps/launcher/advancedpage.cpp                  |  1 +
 apps/openmw/mwmechanics/aipackage.cpp           |  7 ++++++-
 docs/source/reference/modding/settings/game.rst | 16 ++++++++++++++++
 files/settings-default.cfg                      |  4 ++++
 files/ui/advancedpage.ui                        | 10 ++++++++++
 5 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index b7bf1a2494..683d441193 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -108,6 +108,7 @@ bool Launcher::AdvancedPage::loadSettings()
         int numPhysicsThreads = mEngineSettings.getInt("async num threads", "Physics");
         if (numPhysicsThreads >= 0)
             physicsThreadsSpinBox->setValue(numPhysicsThreads);
+        loadSettingBool(allowNPCToFollowOverWaterSurfaceCheckBox, "allow actors to follow over water surface", "Game");
     }
 
     // Visuals
diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index 214aad320b..87ee562c67 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -411,10 +411,15 @@ bool MWMechanics::AiPackage::isReachableRotatingOnTheRun(const MWWorld::Ptr& act
 
 DetourNavigator::Flags MWMechanics::AiPackage::getNavigatorFlags(const MWWorld::Ptr& actor) const
 {
+    static const bool allowToFollowOverWaterSurface = Settings::Manager::getBool("allow actors to follow over water surface", "Game");
+
     const MWWorld::Class& actorClass = actor.getClass();
     DetourNavigator::Flags result = DetourNavigator::Flag_none;
 
-    if (actorClass.isPureWaterCreature(actor) || (getTypeId() != AiPackageTypeId::Wander && actorClass.canSwim(actor)))
+    if (actorClass.isPureWaterCreature(actor)
+        || (getTypeId() != AiPackageTypeId::Wander
+            && ((allowToFollowOverWaterSurface && getTypeId() == AiPackageTypeId::Follow)
+                || actorClass.canSwim(actor))))
         result |= DetourNavigator::Flag_swim;
 
     if (actorClass.canWalk(actor))
diff --git a/docs/source/reference/modding/settings/game.rst b/docs/source/reference/modding/settings/game.rst
index 4e1fe13183..878485b3b3 100644
--- a/docs/source/reference/modding/settings/game.rst
+++ b/docs/source/reference/modding/settings/game.rst
@@ -439,3 +439,19 @@ graphic herbalism
 Some mods add harvestable container models. When this setting is enabled, activating a container using a harvestable model will visually harvest from it instead of opening the menu.
 
 When this setting is turned off or when activating a regular container, the menu will open as usual.
+
+allow actors to follow over water surface
+---------------------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	True
+
+If enabled actors will always find path over the water surface when following other actors. This makes OpenMW behaviour closer to the vanilla engine.
+
+If disabled actors without the ability to swim will not follow other actors to the water.
+
+.. note::
+    Has effect only when Navigator is enabled.
+
+This setting can be controlled in Advanced tab of the launcher.
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 78487b1735..68c27abe5a 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -364,6 +364,10 @@ always allow stealing from knocked out actors = false
 # Enables visually harvesting plants for models that support it.
 graphic herbalism = true
 
+# Give actors an ability to swim over water surface when they follow other actor independently from their ability to swim
+# (true, false)
+allow actors to follow over water surface = true
+
 [General]
 
 # Anisotropy reduces distortion in textures at low angles (e.g. 0 to 16).
diff --git a/files/ui/advancedpage.ui b/files/ui/advancedpage.ui
index a990e9172f..594372aab7 100644
--- a/files/ui/advancedpage.ui
+++ b/files/ui/advancedpage.ui
@@ -153,6 +153,16 @@
            </property>
           </widget>
          </item>
+         <item row="6" column="1">
+          <widget class="QCheckBox" name="allowNPCToFollowOverWaterSurfaceCheckBox">
+           <property name="toolTip">
+            <string>Give NPC an ability to swim over the water surface when they follow other actor independently from their ability to swim. Has effect only when nav mesh building is enabled.</string>
+           </property>
+           <property name="text">
+            <string>Always allow NPC to follow over water surface</string>
+           </property>
+          </widget>
+         </item>
         </layout>
        </item>
        <item>

From 28fc21792e7e4078029139b8f06828354ffde78d Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 11 Apr 2021 19:17:23 +0200
Subject: [PATCH 0554/2859] Allow water walking actors to find path over water
 surface

---
 apps/openmw/mwmechanics/actorutil.cpp | 6 ++++++
 apps/openmw/mwmechanics/actorutil.hpp | 1 +
 apps/openmw/mwmechanics/aipackage.cpp | 3 ++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/actorutil.cpp b/apps/openmw/mwmechanics/actorutil.cpp
index e27c9de495..04cbb8e9f5 100644
--- a/apps/openmw/mwmechanics/actorutil.cpp
+++ b/apps/openmw/mwmechanics/actorutil.cpp
@@ -23,4 +23,10 @@ namespace MWMechanics
         MWBase::World* world = MWBase::Environment::get().getWorld();
         return (actor.getClass().canSwim(actor) && world->isSwimming(actor)) || world->isFlying(actor);
     }
+
+    bool hasWaterWalking(const MWWorld::Ptr& actor)
+    {
+        const MWMechanics::MagicEffects& effects = actor.getClass().getCreatureStats(actor).getMagicEffects();
+        return effects.get(ESM::MagicEffect::WaterWalking).getMagnitude() > 0;
+    }
 }
diff --git a/apps/openmw/mwmechanics/actorutil.hpp b/apps/openmw/mwmechanics/actorutil.hpp
index 1e993f5606..a226fc9cb6 100644
--- a/apps/openmw/mwmechanics/actorutil.hpp
+++ b/apps/openmw/mwmechanics/actorutil.hpp
@@ -31,6 +31,7 @@ namespace MWMechanics
     MWWorld::Ptr getPlayer();
     bool isPlayerInCombat();
     bool canActorMoveByZAxis(const MWWorld::Ptr& actor);
+    bool hasWaterWalking(const MWWorld::Ptr& actor);
 
     template<class T>
     void setBaseAISetting(const std::string& id, MWMechanics::CreatureStats::AiSetting setting, int value)
diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index 87ee562c67..8dcf37355c 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -419,7 +419,8 @@ DetourNavigator::Flags MWMechanics::AiPackage::getNavigatorFlags(const MWWorld::
     if (actorClass.isPureWaterCreature(actor)
         || (getTypeId() != AiPackageTypeId::Wander
             && ((allowToFollowOverWaterSurface && getTypeId() == AiPackageTypeId::Follow)
-                || actorClass.canSwim(actor))))
+                || actorClass.canSwim(actor)
+                || hasWaterWalking(actor))))
         result |= DetourNavigator::Flag_swim;
 
     if (actorClass.canWalk(actor))

From 56ede535b5e2f8bf818c4ade2c9456fb399190cf Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 12 Apr 2021 08:31:45 +0200
Subject: [PATCH 0555/2859] Don't perform a hit test outside the page's bounds

---
 CHANGELOG.md                   |  1 +
 apps/openmw/mwgui/bookpage.cpp | 76 +++++++++++++++-------------------
 2 files changed, 34 insertions(+), 43 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c78345660..a506079e8b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -115,6 +115,7 @@
     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
     Feature #390: 3rd person look "over the shoulder"
     Feature #832: OpenMW-CS: Handle deleted references
diff --git a/apps/openmw/mwgui/bookpage.cpp b/apps/openmw/mwgui/bookpage.cpp
index c70783f39c..fba136f88f 100644
--- a/apps/openmw/mwgui/bookpage.cpp
+++ b/apps/openmw/mwgui/bookpage.cpp
@@ -1,5 +1,7 @@
 #include "bookpage.hpp"
 
+#include <optional>
+
 #include "MyGUI_RenderItem.h"
 #include "MyGUI_RenderManager.h"
 #include "MyGUI_TextureUtility.h"
@@ -894,6 +896,27 @@ protected:
        return mIsPageReset || (mPage != page);
     }
 
+    std::optional<MyGUI::IntPoint> getAdjustedPos(int left, int top, bool move = false)
+    {
+        if (!mBook)
+            return {};
+
+        if (mPage >= mBook->mPages.size())
+            return {};
+
+        MyGUI::IntPoint pos (left, top);
+#if MYGUI_VERSION < MYGUI_DEFINE_VERSION(3,2,3)
+        // work around inconsistency in MyGUI where the mouse press coordinates aren't
+        // transformed by the current Layer (even though mouse *move* events are).
+        if(!move)
+            pos = mNode->getLayer()->getPosition(left, top);
+#endif
+        pos.left -= mCroppedParent->getAbsoluteLeft ();
+        pos.top  -= mCroppedParent->getAbsoluteTop  ();
+        pos.top += mViewTop;
+        return pos;
+    }
+
 public:
 
     typedef TypesetBookImpl::StyleImpl Style;
@@ -952,16 +975,10 @@ public:
 
     void onMouseMove (int left, int top)
     {
-        if (!mBook)
-            return;
-
-        if (mPage >= mBook->mPages.size())
-            return;
-
-        left -= mCroppedParent->getAbsoluteLeft ();
-        top  -= mCroppedParent->getAbsoluteTop  ();
-
-        Style * hit = mBook->hitTestWithMargin (left, mViewTop + top);
+        Style * hit = nullptr;
+        if(auto pos = getAdjustedPos(left, top, true))
+            if(pos->top <= mViewBottom)
+                hit = mBook->hitTestWithMargin (pos->left, pos->top);
 
         if (mLastDown == MyGUI::MouseButton::None)
         {
@@ -991,24 +1008,11 @@ public:
 
     void onMouseButtonPressed (int left, int top, MyGUI::MouseButton id)
     {
-        if (!mBook)
-            return;
+        auto pos = getAdjustedPos(left, top);
 
-        if (mPage >= mBook->mPages.size())
-            return;
-
-        // work around inconsistency in MyGUI where the mouse press coordinates aren't
-        // transformed by the current Layer (even though mouse *move* events are).
-        MyGUI::IntPoint pos (left, top);
-#if MYGUI_VERSION < MYGUI_DEFINE_VERSION(3,2,3)
-        pos = mNode->getLayer()->getPosition(left, top);
-#endif
-        pos.left -= mCroppedParent->getAbsoluteLeft ();
-        pos.top  -= mCroppedParent->getAbsoluteTop  ();
-
-        if (mLastDown == MyGUI::MouseButton::None)
+        if (pos && mLastDown == MyGUI::MouseButton::None)
         {
-            mFocusItem = mBook->hitTestWithMargin (pos.left, mViewTop + pos.top);
+            mFocusItem = pos->top <= mViewBottom ? mBook->hitTestWithMargin (pos->left, pos->top) : nullptr;
             mItemActive = true;
 
             dirtyFocusItem ();
@@ -1019,25 +1023,11 @@ public:
 
     void onMouseButtonReleased(int left, int top, MyGUI::MouseButton id)
     {
-        if (!mBook)
-            return;
-
-        if (mPage >= mBook->mPages.size())
-            return;
-
-        // work around inconsistency in MyGUI where the mouse release coordinates aren't
-        // transformed by the current Layer (even though mouse *move* events are).
-        MyGUI::IntPoint pos (left, top);
-#if MYGUI_VERSION < MYGUI_DEFINE_VERSION(3,2,3)
-        pos = mNode->getLayer()->getPosition(left, top);
-#endif
-
-        pos.left -= mCroppedParent->getAbsoluteLeft ();
-        pos.top  -= mCroppedParent->getAbsoluteTop  ();
+        auto pos = getAdjustedPos(left, top);
 
-        if (mLastDown == id)
+        if (pos && mLastDown == id)
         {
-            Style * item = mBook->hitTestWithMargin (pos.left, mViewTop + pos.top);
+            Style * item = pos->top <= mViewBottom ? mBook->hitTestWithMargin (pos->left, pos->top) : nullptr;
 
             bool clicked = mFocusItem == item;
 

From 9a87940fc6319fc855af5c6f4281425e370b5af8 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Mon, 12 Apr 2021 11:12:15 +0200
Subject: [PATCH 0556/2859] Use `rule` instead of `only`

only/except will likely be deprecated: https://docs.gitlab.com/ee/ci/yaml/README.html#onlyexcept-basic
---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2faeb820a3..da712a2dc5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,8 +32,8 @@ stages:
 
 Coverity:
   extends: .Debian
-  only:
-    - schedules
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
   before_script:
     - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic
     - curl -o /tmp/cov-analysis-linux64.tgz https://scan.coverity.com/download/linux64 --form project=$COVERITY_SCAN_PROJECT_NAME --form token=$COVERITY_SCAN_TOKEN

From dc10ab7bad235184872c9b74564ca63f23d66a4f Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Mon, 12 Apr 2021 11:26:33 +0200
Subject: [PATCH 0557/2859] Install curl in the coverity job

---
 .gitlab-ci.yml            | 2 +-
 CI/install_debian_deps.sh | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2faeb820a3..6ec4a327e2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,7 +35,7 @@ Coverity:
   only:
     - schedules
   before_script:
-    - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic
+    - 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:
diff --git a/CI/install_debian_deps.sh b/CI/install_debian_deps.sh
index 3e7ab7fca3..490fad0dae 100755
--- a/CI/install_debian_deps.sh
+++ b/CI/install_debian_deps.sh
@@ -27,6 +27,8 @@ declare -rA GROUPED_DEPS=(
 
   # 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.
   #

From 54adb9cbedb3a5e2c117c1cfc34059ae103f81eb Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sun, 11 Apr 2021 18:57:47 +0200
Subject: [PATCH 0558/2859] Fix an off-by-one in loadscpt

---
 components/esm/loadscpt.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/esm/loadscpt.cpp b/components/esm/loadscpt.cpp
index a7f348cb17..53b6aedd38 100644
--- a/components/esm/loadscpt.cpp
+++ b/components/esm/loadscpt.cpp
@@ -30,7 +30,7 @@ namespace ESM
         // The tmp buffer is a null-byte separated string list, we
         // just have to pick out one string at a time.
         char* str = tmp.data();
-        if (!str)
+        if (tmp.empty())
         {
             if (mVarNames.size() > 0)
                 Log(Debug::Warning) << "SCVR with no variable names";
@@ -51,6 +51,7 @@ namespace ESM
             ss << "\n  Subrecord: " << "SCVR";
             ss << "\n  Offset: 0x" << std::hex << esm.getFileOffset();
             Log(Debug::Verbose) << ss.str();
+            str = tmp.data();
         }
 
         for (size_t i = 0; i < mVarNames.size(); i++)

From 1e955fb2e7df23fc193ef5b0a146e2965b9bc215 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Mon, 12 Apr 2021 14:01:22 +0200
Subject: [PATCH 0559/2859] Fix the path for the coverity build

---
 .gitlab-ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2faeb820a3..c7b8898334 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,8 +40,7 @@ Coverity:
     - tar xfz /tmp/cov-analysis-linux64.tgz
   script:
     - CI/before_script.linux.sh
-    - cd build
-    - cov-analysis-linux64-*/bin/cov-build --dir cov-int cmake --build . -- -j $(nproc)
+    - cov-analysis-linux64-*/bin/cov-build --dir cov-int cmake --build build -- -j $(nproc)
   after_script:
     - tar cfz cov-int.tar.gz cov-int
     - curl https://scan.coverity.com/builds?project=$COVERITY_SCAN_PROJECT_NAME \

From 539b46aaf0e3dfb34b86ff7933d40d0035b12dea Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 12 Apr 2021 16:01:09 +0200
Subject: [PATCH 0560/2859] Use different cache keys for different macOS builds

---
 .gitlab-ci.yml | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 715a888741..f8cd181066 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -115,7 +115,7 @@ Debian_Clang_tests:
     CCACHE_SIZE: 1G
     BUILD_TESTS_ONLY: 1
 
-MacOS:
+.MacOS:
   image: macos-11-xcode-12
   tags:
     - macos
@@ -123,8 +123,14 @@ MacOS:
   only:
     variables:
       - $CI_PROJECT_ID == "7107382"
+  cache:
+    paths:
+    - ccache/
   script:
     - rm -fr build/*  # remove anything in the build directory
+    - export CCACHE_BASEDIR="$(pwd)"
+    - export CCACHE_DIR="$(pwd)/ccache"
+    - mkdir -pv "${CCACHE_DIR}"
     - CI/before_install.osx.sh
     - CI/before_script.osx.sh
     - cd build; make -j $(sysctl -n hw.logicalcpu) package
@@ -134,9 +140,17 @@ MacOS:
       - build/OpenMW-*.dmg
       - "build/**/*.log"
 
+macOS11_Xcode12:
+  extends: .MacOS
+  image: macos-11-xcode-12
+  cache:
+    key: macOS11_Xcode12.v1
+
 macOS10.15_Xcode11:
-  extends: MacOS
+  extends: .MacOS
   image: macos-10.15-xcode-11
+  cache:
+    key: macOS10.15_Xcode11.v1
 
 variables: &engine-targets
   targets: "openmw,openmw-essimporter,openmw-iniimporter,openmw-launcher,openmw-wizard"

From 663ad5e19207c83ee75dc151a80a83ed5695fcbe Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 12 Apr 2021 16:02:57 +0200
Subject: [PATCH 0561/2859] Print ccache stats for macOS builds

---
 .gitlab-ci.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f8cd181066..10d443dd15 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -131,10 +131,12 @@ Debian_Clang_tests:
     - export CCACHE_BASEDIR="$(pwd)"
     - export CCACHE_DIR="$(pwd)/ccache"
     - mkdir -pv "${CCACHE_DIR}"
+    - ccache -z -M "${CCACHE_SIZE}"
     - CI/before_install.osx.sh
     - CI/before_script.osx.sh
     - 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
@@ -145,12 +147,16 @@ macOS11_Xcode12:
   image: macos-11-xcode-12
   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"

From c10273675effb8e7c00ba5bfcd1d4e4f7a096a6f Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Mon, 12 Apr 2021 17:13:38 +0200
Subject: [PATCH 0562/2859] Massively increase coverity's timeout

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 10d443dd15..6ccf02d1e8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,7 +50,7 @@ Coverity:
   variables:
     CC: gcc
     CXX: g++
-  timeout: 2h
+  timeout: 8h
 
 Debian_GCC:
   extends: .Debian

From ccb62ad8b0fdddd2b108df5666f35465bc877adc Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Mon, 12 Apr 2021 20:23:23 +0200
Subject: [PATCH 0563/2859] Only build openmw in coverity

---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6ccf02d1e8..a04b6a1cd2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,7 +40,8 @@ Coverity:
     - tar xfz /tmp/cov-analysis-linux64.tgz
   script:
     - CI/before_script.linux.sh
-    - cov-analysis-linux64-*/bin/cov-build --dir cov-int cmake --build build -- -j $(nproc)
+    # 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 \

From dda735c54a0e4676c4d0c99b4b0fe14ebeab79d8 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Sun, 21 Feb 2021 10:38:15 -0800
Subject: [PATCH 0564/2859] initial commit

---
 apps/opencs/view/render/scenewidget.cpp   |   1 -
 apps/openmw/engine.cpp                    |   1 +
 apps/openmw/mwrender/characterpreview.cpp |   3 +-
 apps/openmw/mwrender/localmap.cpp         |  11 +
 apps/openmw/mwrender/renderingmanager.cpp |  13 +-
 apps/openmw/mwrender/water.cpp            |   3 +
 components/resource/scenemanager.cpp      |  13 +-
 components/resource/scenemanager.hpp      |   4 +
 components/sceneutil/lightmanager.cpp     | 573 +++++++++++++++++-----
 components/sceneutil/lightmanager.hpp     |  88 +++-
 components/shader/shadermanager.cpp       |  13 +
 components/shader/shadermanager.hpp       |  10 +
 files/settings-default.cfg                |   5 +
 files/shaders/CMakeLists.txt              |   1 +
 files/shaders/groundcover_fragment.glsl   |   1 +
 files/shaders/groundcover_vertex.glsl     |   2 +
 files/shaders/lighting.glsl               |  83 +++-
 files/shaders/objects_fragment.glsl       |   4 +-
 files/shaders/objects_vertex.glsl         |   3 +-
 files/shaders/sun.glsl                    |  14 +
 files/shaders/terrain_fragment.glsl       |   4 +-
 files/shaders/terrain_vertex.glsl         |   3 +-
 files/shaders/water_fragment.glsl         |  11 +-
 23 files changed, 698 insertions(+), 166 deletions(-)
 create mode 100644 files/shaders/sun.glsl

diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index 4d73cde153..61707967b9 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -72,7 +72,6 @@ RenderWidget::RenderWidget(QWidget *parent, Qt::WindowFlags f)
     mView->getCamera()->setViewport( new osg::Viewport(0, 0, traits->width, traits->height) );
 
     SceneUtil::LightManager* lightMgr = new SceneUtil::LightManager;
-    lightMgr->setStartLight(1);
     lightMgr->setLightingMask(Mask_Lighting);
     mRootNode = lightMgr;
 
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index d7c315323d..019e9f67a9 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -31,6 +31,7 @@
 #include <components/compiler/extensions0.hpp>
 
 #include <components/sceneutil/workqueue.hpp>
+#include <components/sceneutil/lightmanager.hpp>
 
 #include <components/files/configurationmanager.hpp>
 
diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index 262b03229f..a44b51db83 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -152,7 +152,7 @@ namespace MWRender
 
         mCamera->setNodeMask(Mask_RenderToTexture);
 
-        osg::ref_ptr<SceneUtil::LightManager> lightManager = new SceneUtil::LightManager;
+        osg::ref_ptr<SceneUtil::LightManager> lightManager = new SceneUtil::LightManager(mResourceSystem->getSceneManager()->getFFPLighting());
         lightManager->setStartLight(1);
         osg::ref_ptr<osg::StateSet> stateset = lightManager->getOrCreateStateSet();
         stateset->setMode(GL_LIGHTING, osg::StateAttribute::ON);
@@ -215,6 +215,7 @@ namespace MWRender
         light->setConstantAttenuation(1.f);
         light->setLinearAttenuation(0.f);
         light->setQuadraticAttenuation(0.f);
+        lightManager->setSunlight(light);
 
         osg::ref_ptr<osg::LightSource> lightSource = new osg::LightSource;
         lightSource->setLight(light);
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index 5fa1a0e299..8b1dda841a 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -18,7 +18,10 @@
 #include <components/settings/settings.hpp>
 #include <components/sceneutil/visitor.hpp>
 #include <components/sceneutil/shadow.hpp>
+#include <components/sceneutil/lightmanager.hpp>
 #include <components/files/memorystream.hpp>
+#include <components/resource/scenemanager.hpp>
+#include <components/resource/resourcesystem.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
@@ -219,6 +222,14 @@ osg::ref_ptr<osg::Camera> LocalMap::createOrthographicCamera(float x, float y, f
 
     SceneUtil::ShadowManager::disableShadowsForStateSet(stateset);
 
+    // override sun for local map 
+    if (!MWBase::Environment::get().getResourceSystem()->getSceneManager()->getFFPLighting())
+    {
+        osg::ref_ptr<SceneUtil::SunlightStateAttribute> sun = new SceneUtil::SunlightStateAttribute;
+        sun->setFromLight(light);
+        sun->setStateSet(stateset, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+    }
+
     camera->addChild(lightSource);
     camera->setStateSet(stateset);
     camera->setViewport(0, 0, mMapResolution, mMapResolution);
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index a3aee5c0fa..733e1d287a 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -203,17 +203,19 @@ namespace MWRender
         resourceSystem->getSceneManager()->setShaderPath(resourcePath + "/shaders");
         // Shadows and radial fog have problems with fixed-function mode
         bool forceShaders = Settings::Manager::getBool("radial fog", "Shaders") || Settings::Manager::getBool("force shaders", "Shaders") || Settings::Manager::getBool("enable shadows", "Shadows");
+        bool clampLighting = Settings::Manager::getBool("clamp lighting", "Shaders");
         resourceSystem->getSceneManager()->setForceShaders(forceShaders);
         // FIXME: calling dummy method because terrain needs to know whether lighting is clamped
-        resourceSystem->getSceneManager()->setClampLighting(Settings::Manager::getBool("clamp lighting", "Shaders"));
+        resourceSystem->getSceneManager()->setClampLighting(clampLighting);
         resourceSystem->getSceneManager()->setAutoUseNormalMaps(Settings::Manager::getBool("auto use object normal maps", "Shaders"));
         resourceSystem->getSceneManager()->setNormalMapPattern(Settings::Manager::getString("normal map pattern", "Shaders"));
         resourceSystem->getSceneManager()->setNormalHeightMapPattern(Settings::Manager::getString("normal height map pattern", "Shaders"));
         resourceSystem->getSceneManager()->setAutoUseSpecularMaps(Settings::Manager::getBool("auto use object specular maps", "Shaders"));
         resourceSystem->getSceneManager()->setSpecularMapPattern(Settings::Manager::getString("specular map pattern", "Shaders"));
         resourceSystem->getSceneManager()->setApplyLightingToEnvMaps(Settings::Manager::getBool("apply lighting to environment maps", "Shaders"));
+        resourceSystem->getSceneManager()->setFFPLighting(clampLighting || !forceShaders || !SceneUtil::LightManager::queryNonFFPLightingSupport());
 
-        osg::ref_ptr<SceneUtil::LightManager> sceneRoot = new SceneUtil::LightManager;
+        osg::ref_ptr<SceneUtil::LightManager> sceneRoot = new SceneUtil::LightManager(mResourceSystem->getSceneManager()->getFFPLighting());
         sceneRoot->setLightingMask(Mask_Lighting);
         mSceneRoot = sceneRoot;
         sceneRoot->setStartLight(1);
@@ -235,8 +237,12 @@ namespace MWRender
         mShadowManager.reset(new SceneUtil::ShadowManager(sceneRoot, mRootNode, shadowCastingTraversalMask, indoorShadowCastingTraversalMask, mResourceSystem->getSceneManager()->getShaderManager()));
 
         Shader::ShaderManager::DefineMap shadowDefines = mShadowManager->getShadowDefines();
+        Shader::ShaderManager::DefineMap lightDefines = sceneRoot->getLightDefines();
         Shader::ShaderManager::DefineMap globalDefines = mResourceSystem->getSceneManager()->getShaderManager().getGlobalDefines();
 
+        for (auto itr = lightDefines.begin(); itr != lightDefines.end(); itr++)
+            globalDefines[itr->first] = itr->second;
+
         for (auto itr = shadowDefines.begin(); itr != shadowDefines.end(); itr++)
             globalDefines[itr->first] = itr->second;
 
@@ -248,7 +254,7 @@ namespace MWRender
         float groundcoverDistance = (Constants::CellSizeInUnits * std::max(1, Settings::Manager::getInt("distance", "Groundcover")) - 1024) * 0.93;
         globalDefines["groundcoverFadeStart"] = std::to_string(groundcoverDistance * 0.9f);
         globalDefines["groundcoverFadeEnd"] = std::to_string(groundcoverDistance);
-
+        
         // It is unnecessary to stop/start the viewer as no frames are being rendered yet.
         mResourceSystem->getSceneManager()->getShaderManager().setGlobalDefines(globalDefines);
 
@@ -354,6 +360,7 @@ namespace MWRender
         mSunLight->setAmbient(osg::Vec4f(0,0,0,1));
         mSunLight->setSpecular(osg::Vec4f(0,0,0,0));
         mSunLight->setConstantAttenuation(1.f);
+        sceneRoot->setSunlight(mSunLight);
         sceneRoot->addChild(source);
 
         sceneRoot->getOrCreateStateSet()->setMode(GL_CULL_FACE, osg::StateAttribute::ON);
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index 1cc5a3cb7c..4eac2fe4cd 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -27,6 +27,7 @@
 
 #include <components/sceneutil/shadow.hpp>
 #include <components/sceneutil/waterutil.hpp>
+#include <components/sceneutil/lightmanager.hpp>
 
 #include <components/misc/constants.hpp>
 
@@ -644,6 +645,8 @@ void Water::createShaderWaterStateSet(osg::Node* node, Reflection* reflection, R
     osg::ref_ptr<osg::Program> program (new osg::Program);
     program->addShader(vertexShader);
     program->addShader(fragmentShader);
+    if (!mResourceSystem->getSceneManager()->getFFPLighting())
+        program->addBindUniformBlock("SunlightBuffer", 9);
     shaderStateset->setAttributeAndModes(program, osg::StateAttribute::ON);
 
     node->setStateSet(shaderStateset);
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 19cc96433b..6755db2557 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -220,12 +220,13 @@ namespace Resource
 
     SceneManager::SceneManager(const VFS::Manager *vfs, Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager)
         : ResourceManager(vfs)
-        , mShaderManager(new Shader::ShaderManager)
+        , mShaderManager(new Shader::ShaderManager(this))
         , mForceShaders(false)
         , mClampLighting(true)
         , mAutoUseNormalMaps(false)
         , mAutoUseSpecularMaps(false)
         , mApplyLightingToEnvMaps(false)
+        , mFFPLighting(true)
         , mInstanceCache(new MultiObjectCache)
         , mSharedStateManager(new SharedStateManager)
         , mImageManager(imageManager)
@@ -297,6 +298,16 @@ namespace Resource
         mApplyLightingToEnvMaps = apply;
     }
 
+    void SceneManager::setFFPLighting(bool apply)
+    {
+        mFFPLighting = apply;
+    }
+
+    bool SceneManager::getFFPLighting() const
+    {
+        return mFFPLighting;
+    }
+
     SceneManager::~SceneManager()
     {
         // this has to be defined in the .cpp file as we can't delete incomplete types
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index 9da6bc500d..92800df9fb 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -100,6 +100,9 @@ namespace Resource
 
         void setApplyLightingToEnvMaps(bool apply);
 
+        void setFFPLighting(bool apply);
+        bool getFFPLighting() const;
+
         void setShaderPath(const std::string& path);
 
         /// Check if a given scene is loaded and if so, update its usage timestamp to prevent it from being unloaded
@@ -184,6 +187,7 @@ namespace Resource
         bool mAutoUseSpecularMaps;
         std::string mSpecularMapPattern;
         bool mApplyLightingToEnvMaps;
+        bool mFFPLighting;
 
         osg::ref_ptr<MultiObjectCache> mInstanceCache;
 
diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 2ebce241d5..fa9dc4fda8 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -1,11 +1,145 @@
 #include "lightmanager.hpp"
 
+#include <osg/BufferObject>
+
 #include <osgUtil/CullVisitor>
 
 #include <components/sceneutil/util.hpp>
 
+#include <components/misc/stringops.hpp>
+
+#include <components/settings/settings.hpp>
+
+#include <components/debug/debuglog.hpp>
+
+namespace 
+{
+    /* similar to the boost::hash_combine */
+    template <class T>
+    inline void hash_combine(std::size_t& seed, const T& v)
+    {
+        std::hash<T> hasher;
+        seed ^= hasher(v) + 0x9e3779b9 + (seed<<6) + (seed>>2);
+    }
+
+    bool sortLights(const SceneUtil::LightManager::LightSourceViewBound* left, const SceneUtil::LightManager::LightSourceViewBound* right)
+    {
+        return left->mViewBound.center().length2() - left->mViewBound.radius2()*81 < right->mViewBound.center().length2() - right->mViewBound.radius2()*81;
+    }
+}
+
 namespace SceneUtil
 {
+    static int sLightId = 0;
+
+    class LightBuffer : public osg::Referenced
+    {
+    public:
+        LightBuffer(int elements, int count=1)
+            : mNumElements(elements)
+            , mData(new osg::Vec4Array(elements * count))
+            , mDirty(false)
+        {}
+
+        virtual ~LightBuffer() {}
+
+        osg::ref_ptr<osg::Vec4Array> getData() 
+        {
+            return mData;
+        }
+
+        bool isDirty() const
+        {
+            return mDirty;
+        }
+
+        void dirty()
+        {
+            mData->dirty();
+            mDirty = false;
+        }
+
+        int blockSize() const 
+        {
+            return mData->getNumElements() * sizeof(GL_FLOAT) * osg::Vec4::num_components;
+        }
+
+    protected:
+        size_t mNumElements;
+        osg::ref_ptr<osg::Vec4Array> mData;
+        bool mDirty;
+    };
+
+    /*
+     *  struct:
+     *      vec4 diffuse
+     *      vec4 ambient
+     *      vec4 specular
+     *      vec4 direction
+     */
+    class SunlightBuffer : public LightBuffer
+    {
+    public:
+
+        enum Type {Diffuse, Ambient, Specular, Direction};
+
+        SunlightBuffer()
+            : LightBuffer(4)
+        {}
+
+        void setValue(Type type, const osg::Vec4& value)
+        {
+            if (getValue(type) == value)
+                return;
+
+            (*mData)[type] = value;
+
+            mDirty = true;
+        }   
+
+        osg::Vec4 getValue(Type type)
+        {
+            return (*mData)[type];
+        }
+    };
+
+    /*
+     *  struct:
+     *      vec4 diffuse
+     *      vec4 ambient
+     *      vec4 position
+     *      vec4 illumination (constant, linear, quadratic)
+     */
+    class PointLightBuffer : public LightBuffer
+    {
+    public:
+
+        enum Type {Diffuse, Ambient, Position, Attenuation};
+
+        PointLightBuffer(int count)
+            : LightBuffer(4, count)
+        {}
+
+        void setValue(int index, Type type, const osg::Vec4& value)
+        {
+            if (getValue(index, type) == value)
+                return;
+
+            (*mData)[mNumElements * index + type] = value;
+
+            mDirty = true;
+        }
+
+        osg::Vec4 getValue(int index, Type type)
+        {
+            return (*mData)[mNumElements * index + type];
+        }
+
+        static constexpr int queryBlockSize(int sz)
+        {
+            return 4 * osg::Vec4::num_components * sizeof(GL_FLOAT) * sz;
+        }
+    };
 
     class LightStateCache
     {
@@ -13,7 +147,7 @@ namespace SceneUtil
         osg::Light* lastAppliedLight[8];
     };
 
-    LightStateCache* getLightStateCache(unsigned int contextid)
+    LightStateCache* getLightStateCache(size_t contextid)
     {
         static std::vector<LightStateCache> cacheVector;
         if (cacheVector.size() < contextid+1)
@@ -21,14 +155,143 @@ namespace SceneUtil
         return &cacheVector[contextid];
     }
 
-    // Resets the modelview matrix to just the view matrix before applying lights.
+    SunlightStateAttribute::SunlightStateAttribute()
+        : mBuffer(new SunlightBuffer)
+    {
+        osg::ref_ptr<osg::UniformBufferObject> ubo = new osg::UniformBufferObject;
+        mBuffer->getData()->setBufferObject(ubo);
+        mUbb = new osg::UniformBufferBinding(9 , mBuffer->getData().get(), 0, mBuffer->blockSize());
+    }
+
+    SunlightStateAttribute::SunlightStateAttribute(const SunlightStateAttribute &copy, const osg::CopyOp &copyop)
+        : osg::StateAttribute(copy, copyop), mBuffer(copy.mBuffer) 
+    {}
+
+    int SunlightStateAttribute::compare(const StateAttribute &sa) const
+    {
+        throw std::runtime_error("LightStateAttribute::compare: unimplemented");
+    }
+
+    void SunlightStateAttribute::setFromLight(const osg::Light* light)
+    {
+        mBuffer->setValue(SunlightBuffer::Diffuse, light->getDiffuse());
+        mBuffer->setValue(SunlightBuffer::Ambient, light->getAmbient());
+        mBuffer->setValue(SunlightBuffer::Specular, light->getSpecular());
+        mBuffer->setValue(SunlightBuffer::Direction, light->getPosition());
+    }
+
+    void SunlightStateAttribute::setStateSet(osg::StateSet* stateset, int mode)
+    {
+        stateset->setAttributeAndModes(mUbb, mode);
+        stateset->setAssociatedModes(this, mode);
+        mBuffer->dirty();
+    }
+
+    class DisableLight : public osg::StateAttribute
+    {
+    public:
+        DisableLight() : mIndex(0) {}
+        DisableLight(int index) : mIndex(index) {}
+
+        DisableLight(const DisableLight& copy,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY)
+            : osg::StateAttribute(copy,copyop), mIndex(copy.mIndex) {}
+
+        osg::Object* cloneType() const override { return new DisableLight(mIndex); }
+        osg::Object* clone(const osg::CopyOp& copyop) const override { return new DisableLight(*this,copyop); }
+        bool isSameKindAs(const osg::Object* obj) const override { return dynamic_cast<const DisableLight *>(obj)!=nullptr; }
+        const char* libraryName() const override { return "SceneUtil"; }
+        const char* className() const override { return "DisableLight"; }
+        Type getType() const override { return LIGHT; }
+
+        unsigned int getMember() const override
+        {
+            return mIndex;
+        }
+
+        bool getModeUsage(ModeUsage & usage) const override
+        {
+            usage.usesMode(GL_LIGHT0 + mIndex);
+            return true;
+        }
+
+        int compare(const StateAttribute &sa) const override
+        {
+            throw std::runtime_error("DisableLight::compare: unimplemented");
+        }
+
+        void apply(osg::State& state) const override
+        {
+            int lightNum = GL_LIGHT0 + mIndex;
+            glLightfv( lightNum, GL_AMBIENT,               mnullptr.ptr() );
+            glLightfv( lightNum, GL_DIFFUSE,               mnullptr.ptr() );
+            glLightfv( lightNum, GL_SPECULAR,              mnullptr.ptr() );
+
+            LightStateCache* cache = getLightStateCache(state.getContextID());
+            cache->lastAppliedLight[mIndex] = nullptr;
+        }
+
+    private:
+        size_t mIndex;
+        osg::Vec4f mnullptr;
+    };
+
     class LightStateAttribute : public osg::StateAttribute
     {
     public:
-        LightStateAttribute() : mIndex(0) {}
-        LightStateAttribute(unsigned int index, const std::vector<osg::ref_ptr<osg::Light> >& lights) : mIndex(index), mLights(lights) {}
+        LightStateAttribute() : mBuffer(nullptr) {}
+        LightStateAttribute(const std::vector<osg::ref_ptr<osg::Light> >& lights, const osg::ref_ptr<PointLightBuffer>& buffer) : mLights(lights), mBuffer(buffer) {} 
 
         LightStateAttribute(const LightStateAttribute& copy,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY)
+            : osg::StateAttribute(copy,copyop), mLights(copy.mLights), mBuffer(copy.mBuffer) {}
+
+        int compare(const StateAttribute &sa) const override
+        {
+            throw std::runtime_error("LightStateAttribute::compare: unimplemented");
+        }
+
+        META_StateAttribute(NifOsg, LightStateAttribute, osg::StateAttribute::LIGHT)
+
+        void apply(osg::State& state) const override
+        {
+            if (mLights.empty())
+                return;
+            osg::Matrix modelViewMatrix = state.getModelViewMatrix();
+
+            state.applyModelViewMatrix(state.getInitialViewMatrix());
+
+            if (mBuffer)
+            {
+                for (size_t i = 0; i < mLights.size(); ++i)
+                {
+
+                    mBuffer->setValue(i, PointLightBuffer::Diffuse, mLights[i]->getDiffuse());
+                    mBuffer->setValue(i, PointLightBuffer::Ambient, mLights[i]->getAmbient());
+                    mBuffer->setValue(i, PointLightBuffer::Position, mLights[i]->getPosition() * state.getModelViewMatrix());
+                    mBuffer->setValue(i, PointLightBuffer::Attenuation,
+                                        osg::Vec4(mLights[i]->getConstantAttenuation(), 
+                                                  mLights[i]->getLinearAttenuation(), 
+                                                  mLights[i]->getQuadraticAttenuation(), 0.0));
+                }
+
+                if (mBuffer && mBuffer->isDirty())
+                    mBuffer->dirty();
+            }
+
+            state.applyModelViewMatrix(modelViewMatrix);
+        }
+
+    private:
+        std::vector<osg::ref_ptr<osg::Light>> mLights;
+        osg::ref_ptr<PointLightBuffer> mBuffer;
+    };
+
+    class FFPLightStateAttribute : public osg::StateAttribute
+    {
+    public:
+        FFPLightStateAttribute() : mIndex(0) {}
+        FFPLightStateAttribute(size_t index, const std::vector<osg::ref_ptr<osg::Light> >& lights) : mIndex(index), mLights(lights) {}
+
+        FFPLightStateAttribute(const FFPLightStateAttribute& copy,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY)
             : osg::StateAttribute(copy,copyop), mIndex(copy.mIndex), mLights(copy.mLights) {}
 
         unsigned int getMember() const override
@@ -38,17 +301,17 @@ namespace SceneUtil
 
         bool getModeUsage(ModeUsage & usage) const override
         {
-            for (unsigned int i=0; i<mLights.size(); ++i)
+            for (size_t i=0; i<mLights.size(); ++i)
                 usage.usesMode(GL_LIGHT0 + mIndex + i);
             return true;
         }
 
         int compare(const StateAttribute &sa) const override
         {
-            throw std::runtime_error("LightStateAttribute::compare: unimplemented");
+            throw std::runtime_error("FFPLightStateAttribute::compare: unimplemented");
         }
 
-        META_StateAttribute(NifOsg, LightStateAttribute, osg::StateAttribute::LIGHT)
+        META_StateAttribute(NifOsg, FFPLightStateAttribute, osg::StateAttribute::LIGHT)
 
         void apply(osg::State& state) const override
         {
@@ -60,7 +323,7 @@ namespace SceneUtil
 
             LightStateCache* cache = getLightStateCache(state.getContextID());
 
-            for (unsigned int i=0; i<mLights.size(); ++i)
+            for (size_t i=0; i<mLights.size(); ++i)
             {
                 osg::Light* current = cache->lastAppliedLight[i+mIndex];
                 if (current != mLights[i].get())
@@ -90,14 +353,14 @@ namespace SceneUtil
         }
 
     private:
-        unsigned int mIndex;
+        size_t mIndex;
 
-        std::vector<osg::ref_ptr<osg::Light> > mLights;
+        std::vector<osg::ref_ptr<osg::Light>> mLights;
     };
 
     LightManager* findLightManager(const osg::NodePath& path)
     {
-        for (unsigned int i=0;i<path.size(); ++i)
+        for (size_t i=0;i<path.size(); ++i)
         {
             if (LightManager* lightManager = dynamic_cast<LightManager*>(path[i]))
                 return lightManager;
@@ -160,33 +423,161 @@ namespace SceneUtil
         }
     };
 
-    LightManager::LightManager()
+    class SunlightCallback : public osg::NodeCallback
+    {
+    public:
+        SunlightCallback(LightManager* lightManager) : mLightManager(lightManager) {}
+
+        void operator()(osg::Node* node, osg::NodeVisitor* nv) override
+        {
+            osgUtil::CullVisitor* cv = static_cast<osgUtil::CullVisitor*>(nv);
+
+            if (mLastFrameNumber != cv->getTraversalNumber())
+            {
+                mLastFrameNumber = cv->getTraversalNumber();
+
+                auto sun = mLightManager->getSunlight();
+
+                if (!sun)
+                    return;
+
+                auto buf = mLightManager->getSunBuffer();
+
+                buf->setValue(SunlightBuffer::Diffuse, sun->getDiffuse());
+                buf->setValue(SunlightBuffer::Ambient, sun->getAmbient());
+                buf->setValue(SunlightBuffer::Specular, sun->getSpecular());
+                buf->setValue(SunlightBuffer::Direction, sun->getPosition() * *cv->getCurrentRenderStage()->getInitialViewMatrix());                           
+
+                if (buf->isDirty())
+                    buf->dirty();
+            }
+
+            traverse(node, nv);
+        }
+
+    private:
+        LightManager* mLightManager;
+        size_t mLastFrameNumber;
+    };
+
+    LightManager::LightManager(bool ffp)
         : mStartLight(0)
         , mLightingMask(~0u)
+        , mSun(nullptr)
+        , mSunBuffer(nullptr)
+        , mFFP(ffp)
     {
         setUpdateCallback(new LightManagerUpdateCallback);
-        for (unsigned int i=0; i<8; ++i)
-            mDummies.push_back(new LightStateAttribute(i, std::vector<osg::ref_ptr<osg::Light> >()));
+
+        if (usingFFP())
+        {
+            for (int i=0; i<getMaxLights(); ++i)
+                mDummies.push_back(new FFPLightStateAttribute(i, std::vector<osg::ref_ptr<osg::Light> >()));
+            return;
+        }
+
+        auto* stateset = getOrCreateStateSet();
+
+        mSunBuffer = new SunlightBuffer();
+        osg::ref_ptr<osg::UniformBufferObject> ubo = new osg::UniformBufferObject;
+        mSunBuffer->getData()->setBufferObject(ubo);
+        osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(9 , mSunBuffer->getData().get(), 0, mSunBuffer->blockSize());
+        stateset->setAttributeAndModes(ubb.get(), osg::StateAttribute::ON);
+
+        stateset->addUniform(new osg::Uniform("PointLightCount", 0));
+
+        addCullCallback(new SunlightCallback(this));
     }
 
     LightManager::LightManager(const LightManager &copy, const osg::CopyOp &copyop)
         : osg::Group(copy, copyop)
         , mStartLight(copy.mStartLight)
         , mLightingMask(copy.mLightingMask)
+        , mSun(copy.mSun)
+        , mSunBuffer(copy.mSunBuffer)
+        , mFFP(copy.mFFP)
+    {
+    }
+
+    bool LightManager::usingFFP() const
+    {
+        return mFFP;
+    }
+
+    int LightManager::getMaxLights() const
+    {
+        if (usingFFP()) return LightManager::mFFPMaxLights;
+        return std::clamp(Settings::Manager::getInt("max lights", "Shaders"), 0, getMaxLightsInScene());
+    }
+
+    int LightManager::getMaxLightsInScene() const
     {
+        static constexpr int max = 16384 / PointLightBuffer::queryBlockSize(1);        
+        return  max;          
+    }
+
+    Shader::ShaderManager::DefineMap LightManager::getLightDefines() const
+    {
+        Shader::ShaderManager::DefineMap defines;
+
+        bool ffp = usingFFP();
+        
+        defines["ffpLighting"] = ffp ? "1" : "0";
+        defines["sunDirection"] = ffp ? "gl_LightSource[0].position" : "Sun.direction";
+        defines["sunAmbient"] = ffp ? "gl_LightSource[0].ambient" : "Sun.ambient";
+        defines["sunDiffuse"] = ffp ? "gl_LightSource[0].diffuse" : "Sun.diffuse";
+        defines["sunSpecular"] = ffp ? "gl_LightSource[0].specular" : "Sun.specular";
+        defines["maxLights"] = std::to_string(getMaxLights());
+        defines["maxLightsInScene"] = std::to_string(getMaxLightsInScene());
+
+        return defines;
+    }
 
+    bool LightManager::queryNonFFPLightingSupport()
+    {
+        osg::GLExtensions* exts = osg::GLExtensions::Get(0, false);
+        if (!exts || !exts->isUniformBufferObjectSupported)
+        {
+            auto ffpWarning = Misc::StringUtils::format("GL_ARB_uniform_buffer_object not supported:  Falling back to FFP %zu light limit. Can not set lights to %i."
+                                                    , LightManager::mFFPMaxLights
+                                                    , Settings::Manager::getInt("max lights", "Shaders"));
+            Log(Debug::Warning) << ffpWarning;
+            return false;
+        }
+        return true;
     }
 
-    void LightManager::setLightingMask(unsigned int mask)
+    void LightManager::setLightingMask(size_t mask)
     {
         mLightingMask = mask;
     }
 
-    unsigned int LightManager::getLightingMask() const
+    size_t LightManager::getLightingMask() const
     {
         return mLightingMask;
     }
 
+    void LightManager::setStartLight(int start)
+    {
+        if (!usingFFP()) return;
+
+        mStartLight = start;
+
+        // Set default light state to zero
+        // This is necessary because shaders don't respect glDisable(GL_LIGHTX) so in addition to disabling
+        // we'll have to set a light state that has no visible effect
+        for (int i=start; i<getMaxLights(); ++i)
+        {
+            osg::ref_ptr<DisableLight> defaultLight (new DisableLight(i));
+            getOrCreateStateSet()->setAttributeAndModes(defaultLight, osg::StateAttribute::OFF);
+        }
+    }
+
+    int LightManager::getStartLight() const
+    {
+        return mStartLight;
+    }
+
     void LightManager::update()
     {
         mLights.clear();
@@ -200,7 +591,7 @@ namespace SceneUtil
         }
     }
 
-    void LightManager::addLight(LightSource* lightSource, const osg::Matrixf& worldMat, unsigned int frameNum)
+    void LightManager::addLight(LightSource* lightSource, const osg::Matrixf& worldMat, size_t frameNum)
     {
         LightSourceTransform l;
         l.mLightSource = lightSource;
@@ -211,19 +602,28 @@ namespace SceneUtil
         mLights.push_back(l);
     }
 
-    /* similar to the boost::hash_combine */
-    template <class T>
-    inline void hash_combine(std::size_t& seed, const T& v)
+    void LightManager::setSunlight(osg::ref_ptr<osg::Light> sun)
     {
-        std::hash<T> hasher;
-        seed ^= hasher(v) + 0x9e3779b9 + (seed<<6) + (seed>>2);
+        if (usingFFP()) return;
+
+        mSun = sun;
+    }
+
+    osg::ref_ptr<osg::Light> LightManager::getSunlight()
+    {
+        return mSun;
+    }
+
+    osg::ref_ptr<SunlightBuffer> LightManager::getSunBuffer()
+    {
+        return mSunBuffer;
     }
 
-    osg::ref_ptr<osg::StateSet> LightManager::getLightListStateSet(const LightList &lightList, unsigned int frameNum)
+    osg::ref_ptr<osg::StateSet> LightManager::getLightListStateSet(const LightList &lightList, size_t frameNum)
     {
         // possible optimization: return a StateSet containing all requested lights plus some extra lights (if a suitable one exists)
         size_t hash = 0;
-        for (unsigned int i=0; i<lightList.size();++i)
+        for (size_t i=0; i<lightList.size();++i)
             hash_combine(hash, lightList[i]->mLightSource->getId());
 
         LightStateSetMap& stateSetCache = mStateSetCache[frameNum%2];
@@ -236,21 +636,35 @@ namespace SceneUtil
             osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
             std::vector<osg::ref_ptr<osg::Light> > lights;
             lights.reserve(lightList.size());
-            for (unsigned int i=0; i<lightList.size();++i)
+            for (size_t i=0; i<lightList.size();++i)
                 lights.emplace_back(lightList[i]->mLightSource->getLight(frameNum));
 
-            // the first light state attribute handles the actual state setting for all lights
-            // it's best to batch these up so that we don't need to touch the modelView matrix more than necessary
-            // don't use setAttributeAndModes, that does not support light indices!
-            stateset->setAttribute(new LightStateAttribute(mStartLight, std::move(lights)), osg::StateAttribute::ON);
-
-            for (unsigned int i=0; i<lightList.size(); ++i)
-                stateset->setMode(GL_LIGHT0 + mStartLight + i, osg::StateAttribute::ON);
-
-            // need to push some dummy attributes to ensure proper state tracking
-            // lights need to reset to their default when the StateSet is popped
-            for (unsigned int i=1; i<lightList.size(); ++i)
-                stateset->setAttribute(mDummies[i+mStartLight].get(), osg::StateAttribute::ON);
+            if (usingFFP())
+            {
+                // the first light state attribute handles the actual state setting for all lights
+                // it's best to batch these up so that we don't need to touch the modelView matrix more than necessary
+                // don't use setAttributeAndModes, that does not support light indices!
+                stateset->setAttribute(new FFPLightStateAttribute(mStartLight, std::move(lights)), osg::StateAttribute::ON);
+
+                for (size_t i=0; i<lightList.size(); ++i)
+                    stateset->setMode(GL_LIGHT0 + mStartLight + i, osg::StateAttribute::ON);
+
+                // need to push some dummy attributes to ensure proper state tracking
+                // lights need to reset to their default when the StateSet is popped
+                for (size_t i=1; i<lightList.size(); ++i)
+                    stateset->setAttribute(mDummies[i+mStartLight].get(), osg::StateAttribute::ON);
+            }
+            else
+            {
+                osg::ref_ptr<PointLightBuffer> buffer = new PointLightBuffer(lights.size());
+                osg::ref_ptr<osg::UniformBufferObject> ubo = new osg::UniformBufferObject;
+                buffer->getData()->setBufferObject(ubo);
+                osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(8 ,buffer->getData().get(), 0, buffer->blockSize());
+                stateset->addUniform(new osg::Uniform("PointLightCount", (int)lights.size()));
+                stateset->setAttributeAndModes(ubb.get(), osg::StateAttribute::ON);
+
+                stateset->setAttribute(new LightStateAttribute(std::move(lights), buffer), osg::StateAttribute::ON);
+            }
 
             stateSetCache.emplace(hash, stateset);
             return stateset;
@@ -262,7 +676,7 @@ namespace SceneUtil
         return mLights;
     }
 
-    const std::vector<LightManager::LightSourceViewBound>& LightManager::getLightsInViewSpace(osg::Camera *camera, const osg::RefMatrix* viewMatrix)
+    const std::vector<LightManager::LightSourceViewBound>& LightManager::getLightsInViewSpace(osg::Camera *camera, const osg::RefMatrix* viewMatrix, size_t frameNum)
     {
         osg::observer_ptr<osg::Camera> camPtr (camera);
         std::map<osg::observer_ptr<osg::Camera>, LightSourceViewBoundCollection>::iterator it = mLightsInViewSpace.find(camPtr);
@@ -286,75 +700,6 @@ namespace SceneUtil
         return it->second;
     }
 
-    class DisableLight : public osg::StateAttribute
-    {
-    public:
-        DisableLight() : mIndex(0) {}
-        DisableLight(int index) : mIndex(index) {}
-
-        DisableLight(const DisableLight& copy,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY)
-            : osg::StateAttribute(copy,copyop), mIndex(copy.mIndex) {}
-
-        osg::Object* cloneType() const override { return new DisableLight(mIndex); }
-        osg::Object* clone(const osg::CopyOp& copyop) const override { return new DisableLight(*this,copyop); }
-        bool isSameKindAs(const osg::Object* obj) const override { return dynamic_cast<const DisableLight *>(obj)!=nullptr; }
-        const char* libraryName() const override { return "SceneUtil"; }
-        const char* className() const override { return "DisableLight"; }
-        Type getType() const override { return LIGHT; }
-
-        unsigned int getMember() const override
-        {
-            return mIndex;
-        }
-
-        bool getModeUsage(ModeUsage & usage) const override
-        {
-            usage.usesMode(GL_LIGHT0 + mIndex);
-            return true;
-        }
-
-        int compare(const StateAttribute &sa) const override
-        {
-            throw std::runtime_error("DisableLight::compare: unimplemented");
-        }
-
-        void apply(osg::State& state) const override
-        {
-            int lightNum = GL_LIGHT0 + mIndex;
-            glLightfv( lightNum, GL_AMBIENT,               mnullptr.ptr() );
-            glLightfv( lightNum, GL_DIFFUSE,               mnullptr.ptr() );
-            glLightfv( lightNum, GL_SPECULAR,              mnullptr.ptr() );
-
-            LightStateCache* cache = getLightStateCache(state.getContextID());
-            cache->lastAppliedLight[mIndex] = nullptr;
-        }
-
-    private:
-        unsigned int mIndex;
-        osg::Vec4f mnullptr;
-    };
-
-    void LightManager::setStartLight(int start)
-    {
-        mStartLight = start;
-
-        // Set default light state to zero
-        // This is necessary because shaders don't respect glDisable(GL_LIGHTX) so in addition to disabling
-        // we'll have to set a light state that has no visible effect
-        for (int i=start; i<8; ++i)
-        {
-            osg::ref_ptr<DisableLight> defaultLight (new DisableLight(i));
-            getOrCreateStateSet()->setAttributeAndModes(defaultLight, osg::StateAttribute::OFF);
-        }
-    }
-
-    int LightManager::getStartLight() const
-    {
-        return mStartLight;
-    }
-
-    static int sLightId = 0;
-
     LightSource::LightSource()
         : mRadius(0.f)
     {
@@ -372,12 +717,6 @@ namespace SceneUtil
             mLight[i] = new osg::Light(*copy.mLight[i].get(), copyop);
     }
 
-
-    bool sortLights (const LightManager::LightSourceViewBound* left, const LightManager::LightSourceViewBound* right)
-    {
-        return left->mViewBound.center().length2() - left->mViewBound.radius2()*81 < right->mViewBound.center().length2() - right->mViewBound.radius2()*81;
-    }
-
     void LightListCallback::operator()(osg::Node *node, osg::NodeVisitor *nv)
     {
         osgUtil::CullVisitor* cv = static_cast<osgUtil::CullVisitor*>(nv);
@@ -413,7 +752,7 @@ namespace SceneUtil
 
             // Don't use Camera::getViewMatrix, that one might be relative to another camera!
             const osg::RefMatrix* viewMatrix = cv->getCurrentRenderStage()->getInitialViewMatrix();
-            const std::vector<LightManager::LightSourceViewBound>& lights = mLightManager->getLightsInViewSpace(cv->getCurrentCamera(), viewMatrix);
+            const std::vector<LightManager::LightSourceViewBound>& lights = mLightManager->getLightsInViewSpace(cv->getCurrentCamera(), viewMatrix, mLastFrameNumber);
 
             // get the node bounds in view space
             // NB do not node->getBound() * modelView, that would apply the node's transformation twice
@@ -421,7 +760,7 @@ namespace SceneUtil
             osg::Transform* transform = node->asTransform();
             if (transform)
             {
-                for (unsigned int i=0; i<transform->getNumChildren(); ++i)
+                for (size_t i=0; i<transform->getNumChildren(); ++i)
                     nodeBound.expandBy(transform->getChild(i)->getBound());
             }
             else
@@ -430,7 +769,7 @@ namespace SceneUtil
             transformBoundingSphere(mat, nodeBound);
 
             mLightList.clear();
-            for (unsigned int i=0; i<lights.size(); ++i)
+            for (size_t i=0; i<lights.size(); ++i)
             {
                 const LightManager::LightSourceViewBound& l = lights[i];
 
@@ -443,7 +782,7 @@ namespace SceneUtil
         }
         if (!mLightList.empty())
         {
-            unsigned int maxLights = static_cast<unsigned int> (8 - mLightManager->getStartLight());
+            size_t maxLights = mLightManager->getMaxLights() - mLightManager->getStartLight();
 
             osg::StateSet* stateset = nullptr;
 
diff --git a/components/sceneutil/lightmanager.hpp b/components/sceneutil/lightmanager.hpp
index c370f1b7f0..7ceb725aef 100644
--- a/components/sceneutil/lightmanager.hpp
+++ b/components/sceneutil/lightmanager.hpp
@@ -8,6 +8,9 @@
 #include <osg/Group>
 #include <osg/NodeVisitor>
 #include <osg/observer_ptr>
+#include <osg/BufferIndexBinding>
+
+#include <components/shader/shadermanager.hpp>
 
 namespace osgUtil
 {
@@ -16,6 +19,27 @@ namespace osgUtil
 
 namespace SceneUtil
 {
+    class SunlightBuffer;
+
+    // Used to override sun. Rarely useful but necassary for local map. 
+    class SunlightStateAttribute : public osg::StateAttribute
+    {
+    public:
+        SunlightStateAttribute();
+        SunlightStateAttribute(const SunlightStateAttribute& copy,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
+        
+        int compare(const StateAttribute &sa) const override;
+
+        META_StateAttribute(NifOsg, SunlightStateAttribute, osg::StateAttribute::LIGHT)
+
+        void setFromLight(const osg::Light* light);
+
+        void setStateSet(osg::StateSet* stateset, int mode=osg::StateAttribute::ON);
+
+    private:
+        osg::ref_ptr<SunlightBuffer> mBuffer;
+        osg::ref_ptr<osg::UniformBufferBinding> mUbb;
+    };
 
     /// LightSource managed by a LightManager.
     /// @par Typically used for point lights. Spot lights are not supported yet. Directional lights affect the whole scene
@@ -57,7 +81,7 @@ namespace SceneUtil
         /// Get the osg::Light safe for modification in the given frame.
         /// @par May be used externally to animate the light's color/attenuation properties,
         /// and is used internally to synchronize the light's position with the position of the LightSource.
-        osg::Light* getLight(unsigned int frame)
+        osg::Light* getLight(size_t frame)
         {
             return mLight[frame % 2];
         }
@@ -83,10 +107,25 @@ namespace SceneUtil
     class LightManager : public osg::Group
     {
     public:
+        struct LightSourceTransform
+        {
+            LightSource* mLightSource;
+            osg::Matrixf mWorldMatrix;
+        };
+
+        struct LightSourceViewBound
+        {
+            LightSource* mLightSource;
+            osg::BoundingSphere mViewBound;
+        };
+
+        typedef std::vector<const LightSourceViewBound*> LightList;
+
+        static bool queryNonFFPLightingSupport();
 
         META_Node(SceneUtil, LightManager)
 
-        LightManager();
+        LightManager(bool ffp = true);
 
         LightManager(const LightManager& copy, const osg::CopyOp& copyop);
 
@@ -94,40 +133,36 @@ namespace SceneUtil
         /// By default, it's ~0u i.e. always on.
         /// If you have some views that do not require lighting, then set the Camera's cull mask to not include
         /// the lightingMask for a much faster cull and rendering.
-        void setLightingMask (unsigned int mask);
-
-        unsigned int getLightingMask() const;
+        void setLightingMask (size_t mask);
+        size_t getLightingMask() const;
 
         /// Set the first light index that should be used by this manager, typically the number of directional lights in the scene.
         void setStartLight(int start);
-
         int getStartLight() const;
 
         /// Internal use only, called automatically by the LightManager's UpdateCallback
         void update();
 
         /// Internal use only, called automatically by the LightSource's UpdateCallback
-        void addLight(LightSource* lightSource, const osg::Matrixf& worldMat, unsigned int frameNum);
-
-        struct LightSourceTransform
-        {
-            LightSource* mLightSource;
-            osg::Matrixf mWorldMatrix;
-        };
+        void addLight(LightSource* lightSource, const osg::Matrixf& worldMat, size_t frameNum);
 
         const std::vector<LightSourceTransform>& getLights() const;
 
-        struct LightSourceViewBound
-        {
-            LightSource* mLightSource;
-            osg::BoundingSphere mViewBound;
-        };
+        const std::vector<LightSourceViewBound>& getLightsInViewSpace(osg::Camera* camera, const osg::RefMatrix* viewMatrix, size_t frameNum);
 
-        const std::vector<LightSourceViewBound>& getLightsInViewSpace(osg::Camera* camera, const osg::RefMatrix* viewMatrix);
+        osg::ref_ptr<osg::StateSet> getLightListStateSet(const LightList& lightList, size_t frameNum);
 
-        typedef std::vector<const LightSourceViewBound*> LightList;
+        void setSunlight(osg::ref_ptr<osg::Light> sun);
+        osg::ref_ptr<osg::Light> getSunlight();
+
+        osg::ref_ptr<SunlightBuffer> getSunBuffer();
 
-        osg::ref_ptr<osg::StateSet> getLightListStateSet(const LightList& lightList, unsigned int frameNum);
+        bool usingFFP() const;
+
+        int getMaxLights() const;
+        int getMaxLightsInScene() const;
+
+        Shader::ShaderManager::DefineMap getLightDefines() const;
 
     private:
         // Lights collected from the scene graph. Only valid during the cull traversal.
@@ -144,7 +179,14 @@ namespace SceneUtil
 
         int mStartLight;
 
-        unsigned int mLightingMask;
+        size_t mLightingMask;
+
+        osg::ref_ptr<osg::Light> mSun;
+        osg::ref_ptr<SunlightBuffer> mSunBuffer;
+
+        bool mFFP;
+
+        static constexpr int mFFPMaxLights = 8;
     };
 
     /// To receive lighting, objects must be decorated by a LightListCallback. Light list callbacks must be added via
@@ -180,7 +222,7 @@ namespace SceneUtil
 
     private:
         LightManager* mLightManager;
-        unsigned int mLastFrameNumber;
+        size_t mLastFrameNumber;
         LightManager::LightList mLightList;
         std::set<SceneUtil::LightSource*> mIgnoredLightSources;
     };
diff --git a/components/shader/shadermanager.cpp b/components/shader/shadermanager.cpp
index 4f887e659b..96671bf8b4 100644
--- a/components/shader/shadermanager.cpp
+++ b/components/shader/shadermanager.cpp
@@ -9,12 +9,20 @@
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/fstream.hpp>
 
+#include <components/sceneutil/lightmanager.hpp>
+#include <components/resource/scenemanager.hpp>
 #include <components/debug/debuglog.hpp>
 #include <components/misc/stringops.hpp>
 
 namespace Shader
 {
 
+    ShaderManager::ShaderManager(Resource::SceneManager* sceneManager)
+        : mSceneManager(sceneManager)
+    {
+
+    }
+
     void ShaderManager::setShaderPath(const std::string &path)
     {
         mPath = path;
@@ -344,6 +352,11 @@ namespace Shader
             program->addShader(fragmentShader);
             program->addBindAttribLocation("aOffset", 6);
             program->addBindAttribLocation("aRotation", 7);
+            if (!mSceneManager->getFFPLighting())
+            {
+                program->addBindUniformBlock("PointLightBuffer", 8);
+                program->addBindUniformBlock("SunlightBuffer", 9);
+            }
             found = mPrograms.insert(std::make_pair(std::make_pair(vertexShader, fragmentShader), program)).first;
         }
         return found->second;
diff --git a/components/shader/shadermanager.hpp b/components/shader/shadermanager.hpp
index 13db30b019..b9bb005b11 100644
--- a/components/shader/shadermanager.hpp
+++ b/components/shader/shadermanager.hpp
@@ -11,6 +11,11 @@
 
 #include <osgViewer/Viewer>
 
+namespace Resource
+{
+    class SceneManager;
+}
+
 namespace Shader
 {
 
@@ -19,6 +24,9 @@ namespace Shader
     class ShaderManager
     {
     public:
+
+        ShaderManager(Resource::SceneManager* sceneManager);
+
         void setShaderPath(const std::string& path);
 
         typedef std::map<std::string, std::string> DefineMap;
@@ -59,6 +67,8 @@ namespace Shader
         typedef std::map<std::pair<osg::ref_ptr<osg::Shader>, osg::ref_ptr<osg::Shader> >, osg::ref_ptr<osg::Program> > ProgramMap;
         ProgramMap mPrograms;
 
+        Resource::SceneManager* mSceneManager;
+
         std::mutex mMutex;
     };
 
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 67d944d195..368d74f6bd 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -442,6 +442,11 @@ apply lighting to environment maps = false
 # This makes fogging independent from the viewing angle. Shaders will be used to render all objects.
 radial fog = false
 
+# Set maximum number of lights per object, does not include the sun. 
+# This feature may not work on your device, in which case it will fall back to the previous OpenGL limit of 8 lights. 
+# "[Shaders]/clamp lighting" must be set to 'false' and "[Shaders]/force shaders" must be set to 'true' for this to take effect. 
+max lights = 16
+
 [Input]
 
 # Capture control of the cursor prevent movement outside the window.
diff --git a/files/shaders/CMakeLists.txt b/files/shaders/CMakeLists.txt
index a4e898e4b0..1a0c5f1a54 100644
--- a/files/shaders/CMakeLists.txt
+++ b/files/shaders/CMakeLists.txt
@@ -25,6 +25,7 @@ set(SHADER_FILES
     shadowcasting_vertex.glsl
     shadowcasting_fragment.glsl
     vertexcolors.glsl
+    sun.glsl
 )
 
 copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_SHADERS_ROOT} ${DDIRRELATIVE} "${SHADER_FILES}")
diff --git a/files/shaders/groundcover_fragment.glsl b/files/shaders/groundcover_fragment.glsl
index 77fd32e58b..392419d92b 100644
--- a/files/shaders/groundcover_fragment.glsl
+++ b/files/shaders/groundcover_fragment.glsl
@@ -1,4 +1,5 @@
 #version 120
+#extension GL_ARB_uniform_buffer_object : enable
 
 #define GROUNDCOVER
 
diff --git a/files/shaders/groundcover_vertex.glsl b/files/shaders/groundcover_vertex.glsl
index 407599effd..3238bc864f 100644
--- a/files/shaders/groundcover_vertex.glsl
+++ b/files/shaders/groundcover_vertex.glsl
@@ -1,5 +1,7 @@
 #version 120
 
+#extension GL_ARB_uniform_buffer_object : enable
+
 #define GROUNDCOVER
 
 attribute vec4 aOffset;
diff --git a/files/shaders/lighting.glsl b/files/shaders/lighting.glsl
index a2dcc758a8..b9f426fc9d 100644
--- a/files/shaders/lighting.glsl
+++ b/files/shaders/lighting.glsl
@@ -1,13 +1,62 @@
-#define MAX_LIGHTS 8
+#if !@ffpLighting
 
-void perLight(out vec3 ambientOut, out vec3 diffuseOut, int lightIndex, vec3 viewPos, vec3 viewNormal)
+#include "sun.glsl"
+
+#define getLight PointLights
+
+struct PointLight
+{
+    vec4 diffuse;
+    vec4 ambient;
+    vec4 position;
+    vec4 attenuation;
+};
+
+uniform mat4 osg_ViewMatrix;
+uniform int PointLightCount;
+uniform int PointLightIndex[@maxLights];
+
+layout(std140) uniform PointLightBuffer
+{
+    PointLight PointLights[@maxLights];
+};
+
+#else
+#define getLight gl_LightSource
+#endif
+
+void perLightSun(out vec3 ambientOut, out vec3 diffuseOut, vec3 viewPos, vec3 viewNormal)
+{
+    vec3 lightDir = @sunDirection.xyz;
+    lightDir = normalize(lightDir);
+
+    ambientOut = @sunAmbient.xyz;
+
+    float lambert = dot(viewNormal.xyz, lightDir);
+#ifndef GROUNDCOVER
+    lambert = max(lambert, 0.0);
+#else
+    float eyeCosine = dot(normalize(viewPos), viewNormal.xyz);
+    if (lambert < 0.0)
+    {
+        lambert = -lambert;
+        eyeCosine = -eyeCosine;
+    }
+    lambert *= clamp(-8.0 * (1.0 - 0.3) * eyeCosine + 1.0, 0.3, 1.0);
+#endif
+    diffuseOut = @sunDiffuse.xyz * lambert;
+}
+
+void perLightPoint(out vec3 ambientOut, out vec3 diffuseOut, int lightIndex, vec3 viewPos, vec3 viewNormal)
 {
-    vec3 lightDir = gl_LightSource[lightIndex].position.xyz - viewPos * gl_LightSource[lightIndex].position.w;
+    vec3 lightDir = getLight[lightIndex].position.xyz - viewPos;
+    //vec3 lightDir = (osg_ViewMatrix * vec4(getLight[lightIndex].position, 1.0)).xyz - viewPos;
+
     float lightDistance = length(lightDir);
     lightDir = normalize(lightDir);
-    float illumination = clamp(1.0 / (gl_LightSource[lightIndex].constantAttenuation + gl_LightSource[lightIndex].linearAttenuation * lightDistance + gl_LightSource[lightIndex].quadraticAttenuation * lightDistance * lightDistance), 0.0, 1.0);
 
-    ambientOut = gl_LightSource[lightIndex].ambient.xyz * illumination;
+    float illumination = clamp(1.0 / (getLight[lightIndex].attenuation.x + getLight[lightIndex].attenuation.y * lightDistance + getLight[lightIndex].attenuation.z * lightDistance * lightDistance), 0.0, 1.0);
+    ambientOut = getLight[lightIndex].ambient.xyz * illumination;
 
     float lambert = dot(viewNormal.xyz, lightDir) * illumination;
 #ifndef GROUNDCOVER
@@ -21,7 +70,7 @@ void perLight(out vec3 ambientOut, out vec3 diffuseOut, int lightIndex, vec3 vie
     }
     lambert *= clamp(-8.0 * (1.0 - 0.3) * eyeCosine + 1.0, 0.3, 1.0);
 #endif
-    diffuseOut = gl_LightSource[lightIndex].diffuse.xyz * lambert;
+    diffuseOut = getLight[lightIndex].diffuse.xyz * lambert;
 }
 
 #if PER_PIXEL_LIGHTING
@@ -32,7 +81,8 @@ void doLighting(vec3 viewPos, vec3 viewNormal, out vec3 diffuseLight, out vec3 a
 {
     vec3 ambientOut, diffuseOut;
     // This light gets added a second time in the loop to fix Mesa users' slowdown, so we need to negate its contribution here.
-    perLight(ambientOut, diffuseOut, 0, viewPos, viewNormal);
+    perLightSun(ambientOut, diffuseOut, viewPos, viewNormal);
+
 #if PER_PIXEL_LIGHTING
     diffuseLight = diffuseOut * shadowing - diffuseOut;
 #else
@@ -40,22 +90,31 @@ void doLighting(vec3 viewPos, vec3 viewNormal, out vec3 diffuseLight, out vec3 a
     diffuseLight = -diffuseOut;
 #endif
     ambientLight = gl_LightModel.ambient.xyz;
-    for (int i=0; i<MAX_LIGHTS; ++i)
+
+#if !@ffpLighting
+    perLightSun(ambientOut, diffuseOut, viewPos, viewNormal);
+    ambientLight += ambientOut;
+    diffuseLight += diffuseOut;
+    for (int i=0; i<PointLightCount; ++i)
     {
-        perLight(ambientOut, diffuseOut, i, viewPos, viewNormal);
+        perLightPoint(ambientOut, diffuseOut, i, viewPos, viewNormal);
+#else
+    for (int i=0; i<@maxLights; ++i)
+    {
+        perLightPoint(ambientOut, diffuseOut, i, viewPos, viewNormal);
+#endif
         ambientLight += ambientOut;
         diffuseLight += diffuseOut;
     }
 }
 
-
 vec3 getSpecular(vec3 viewNormal, vec3 viewDirection, float shininess, vec3 matSpec)
 {
-    vec3 lightDir = normalize(gl_LightSource[0].position.xyz);
+    vec3 lightDir = normalize(@sunDirection.xyz);
     float NdotL = dot(viewNormal, lightDir);
     if (NdotL <= 0.0)
         return vec3(0.0);
     vec3 halfVec = normalize(lightDir - viewDirection);
     float NdotH = dot(viewNormal, halfVec);
-    return pow(max(NdotH, 0.0), max(1e-4, shininess)) * gl_LightSource[0].specular.xyz * matSpec;
+    return pow(max(NdotH, 0.0), max(1e-4, shininess)) * @sunSpecular.xyz * matSpec;
 }
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index 50bb77145a..459405b59b 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -1,5 +1,7 @@
 #version 120
 
+#extension GL_ARB_uniform_buffer_object : enable
+
 #if @diffuseMap
 uniform sampler2D diffuseMap;
 varying vec2 diffuseMapUV;
@@ -66,8 +68,8 @@ varying vec3 passNormal;
 
 #include "vertexcolors.glsl"
 #include "shadows_fragment.glsl"
-#include "lighting.glsl"
 #include "parallax.glsl"
+#include "lighting.glsl"
 
 void main()
 {
diff --git a/files/shaders/objects_vertex.glsl b/files/shaders/objects_vertex.glsl
index 15467933b7..63a831008d 100644
--- a/files/shaders/objects_vertex.glsl
+++ b/files/shaders/objects_vertex.glsl
@@ -1,5 +1,7 @@
 #version 120
 
+#extension GL_ARB_uniform_buffer_object : enable
+
 #if @diffuseMap
 varying vec2 diffuseMapUV;
 #endif
@@ -51,7 +53,6 @@ varying vec3 passNormal;
 
 #include "vertexcolors.glsl"
 #include "shadows_vertex.glsl"
-
 #include "lighting.glsl"
 
 void main(void)
diff --git a/files/shaders/sun.glsl b/files/shaders/sun.glsl
new file mode 100644
index 0000000000..f9f97af771
--- /dev/null
+++ b/files/shaders/sun.glsl
@@ -0,0 +1,14 @@
+#if !@ffpLighting
+struct Sunlight
+{
+    vec4 diffuse;
+    vec4 ambient;
+    vec4 specular;
+    vec4 direction;
+};
+
+layout(std140) uniform SunlightBuffer
+{
+    Sunlight Sun;
+};
+#endif
\ No newline at end of file
diff --git a/files/shaders/terrain_fragment.glsl b/files/shaders/terrain_fragment.glsl
index 4736bb9b78..e567dccc36 100644
--- a/files/shaders/terrain_fragment.glsl
+++ b/files/shaders/terrain_fragment.glsl
@@ -1,5 +1,7 @@
 #version 120
 
+#extension GL_ARB_uniform_buffer_object : enable
+
 varying vec2 uv;
 
 uniform sampler2D diffuseMap;
@@ -26,8 +28,8 @@ varying vec3 passNormal;
 
 #include "vertexcolors.glsl"
 #include "shadows_fragment.glsl"
-#include "lighting.glsl"
 #include "parallax.glsl"
+#include "lighting.glsl"
 
 void main()
 {
diff --git a/files/shaders/terrain_vertex.glsl b/files/shaders/terrain_vertex.glsl
index 4b00ea525b..e5f2892aca 100644
--- a/files/shaders/terrain_vertex.glsl
+++ b/files/shaders/terrain_vertex.glsl
@@ -1,5 +1,7 @@
 #version 120
 
+#extension GL_ARB_uniform_buffer_object : enable
+
 varying vec2 uv;
 varying float euclideanDepth;
 varying float linearDepth;
@@ -15,7 +17,6 @@ varying vec3 passNormal;
 
 #include "vertexcolors.glsl"
 #include "shadows_vertex.glsl"
-
 #include "lighting.glsl"
 
 void main(void)
diff --git a/files/shaders/water_fragment.glsl b/files/shaders/water_fragment.glsl
index d9b9463ad9..ba15a8669b 100644
--- a/files/shaders/water_fragment.glsl
+++ b/files/shaders/water_fragment.glsl
@@ -1,5 +1,7 @@
 #version 120
 
+#extension GL_ARB_uniform_buffer_object : enable
+
 #define REFRACTION @refraction_enabled
 
 // Inspired by Blender GLSL Water by martinsh ( https://devlog-martinsh.blogspot.de/2012/07/waterundewater-shader-wip.html )
@@ -143,6 +145,7 @@ uniform vec3 nodePosition;
 uniform float rainIntensity;
 
 #include "shadows_fragment.glsl"
+#include "sun.glsl"
 
 float frustumDepth;
 
@@ -192,7 +195,7 @@ void main(void)
                    normal3 * midWaves.y + normal4 * smallWaves.x + normal5 * smallWaves.y + rippleAdd);
     normal = normalize(vec3(-normal.x * bump, -normal.y * bump, normal.z));
 
-    vec3 lVec = normalize((gl_ModelViewMatrixInverse * vec4(gl_LightSource[0].position.xyz, 0.0)).xyz);
+    vec3 lVec = normalize((gl_ModelViewMatrixInverse * vec4(@sunDirection.xyz, 0.0)).xyz);
 
     vec3 cameraPos = (gl_ModelViewMatrixInverse * vec4(0,0,0,1)).xyz;
     vec3 vVec = normalize(position.xyz - cameraPos.xyz);
@@ -247,11 +250,11 @@ void main(void)
     vec3 scatterColour = mix(SCATTER_COLOUR*vec3(1.0,0.4,0.0), SCATTER_COLOUR, clamp(1.0-exp(-sunHeight*SUN_EXT), 0.0, 1.0));
     vec3 lR = reflect(lVec, lNormal);
     float lightScatter = clamp(dot(lVec,lNormal)*0.7+0.3, 0.0, 1.0) * clamp(dot(lR, vVec)*2.0-1.2, 0.0, 1.0) * SCATTER_AMOUNT * sunFade * clamp(1.0-exp(-sunHeight), 0.0, 1.0);
-    gl_FragData[0].xyz = mix( mix(refraction,  scatterColour,  lightScatter),  reflection,  fresnel) + specular * gl_LightSource[0].specular.xyz + vec3(rainRipple.w) * 0.2;
+    gl_FragData[0].xyz = mix( mix(refraction,  scatterColour,  lightScatter),  reflection,  fresnel) + specular * @sunSpecular.xyz + vec3(rainRipple.w) * 0.2;
     gl_FragData[0].w = 1.0;
 #else
-    gl_FragData[0].xyz = mix(reflection,  waterColor,  (1.0-fresnel)*0.5) + specular * gl_LightSource[0].specular.xyz + vec3(rainRipple.w) * 0.7;
-    gl_FragData[0].w = clamp(fresnel*6.0 + specular * gl_LightSource[0].specular.w, 0.0, 1.0);     //clamp(fresnel*2.0 + specular * gl_LightSource[0].specular.w, 0.0, 1.0);
+    gl_FragData[0].xyz = mix(reflection,  waterColor,  (1.0-fresnel)*0.5) + specular * @sunSpecular.xyz + vec3(rainRipple.w) * 0.7;
+    gl_FragData[0].w = clamp(fresnel*6.0 + specular * @sunSpecular.w, 0.0, 1.0);     //clamp(fresnel*2.0 + specular * gl_LightSource[0].specular.w, 0.0, 1.0);
 #endif
 
     // fog

From 9d9074c244ef868dbe013f33f554bbb070796f52 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Mon, 1 Mar 2021 23:30:54 -0800
Subject: [PATCH 0565/2859] Add shared UBO

---
 apps/opencs/model/world/data.cpp          |   1 +
 apps/opencs/view/render/scenewidget.cpp   |   1 +
 apps/openmw/mwrender/animation.cpp        |   2 +-
 apps/openmw/mwrender/renderingmanager.cpp |   8 +-
 apps/openmw/mwrender/water.cpp            |   2 +-
 components/resource/scenemanager.cpp      |   2 +-
 components/sceneutil/lightcontroller.cpp  |   9 +-
 components/sceneutil/lightcontroller.hpp  |   3 +-
 components/sceneutil/lightmanager.cpp     | 233 +++++++++++++---------
 components/sceneutil/lightmanager.hpp     |  47 ++++-
 components/sceneutil/lightutil.cpp        |  12 +-
 components/sceneutil/lightutil.hpp        |   4 +-
 components/shader/shadermanager.cpp       |  16 +-
 components/shader/shadermanager.hpp       |   6 +-
 files/shaders/lighting.glsl               |  34 +++-
 15 files changed, 253 insertions(+), 127 deletions(-)

diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 70c496e3f2..25ac051f41 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -83,6 +83,7 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding, bool fsStrict, const Files::Pat
     defines["clamp"] = "1"; // Clamp lighting
     defines["preLightEnv"] = "0"; // Apply environment maps after lighting like Morrowind
     defines["radialFog"] = "0";
+    defines["ffpLighting"] = "0";
     for (const auto& define : shadowDefines)
         defines[define.first] = define.second;
     mResourceSystem->getSceneManager()->getShaderManager().setGlobalDefines(defines);
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index 61707967b9..4d73cde153 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -72,6 +72,7 @@ RenderWidget::RenderWidget(QWidget *parent, Qt::WindowFlags f)
     mView->getCamera()->setViewport( new osg::Viewport(0, 0, traits->width, traits->height) );
 
     SceneUtil::LightManager* lightMgr = new SceneUtil::LightManager;
+    lightMgr->setStartLight(1);
     lightMgr->setLightingMask(Mask_Lighting);
     mRootNode = lightMgr;
 
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index d8c7599358..7ccf653ea1 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -1613,7 +1613,7 @@ namespace MWRender
     {
         bool exterior = mPtr.isInCell() && mPtr.getCell()->getCell()->isExterior();
 
-        SceneUtil::addLight(parent, esmLight, Mask_ParticleSystem, Mask_Lighting, exterior);
+        SceneUtil::addLight(parent, esmLight, Mask_ParticleSystem, Mask_Lighting, exterior, mResourceSystem->getSceneManager()->getFFPLighting());
     }
 
     void Animation::addEffect (const std::string& model, int effectId, bool loop, const std::string& bonename, const std::string& texture)
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 733e1d287a..bbd7d06925 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -213,9 +213,11 @@ namespace MWRender
         resourceSystem->getSceneManager()->setAutoUseSpecularMaps(Settings::Manager::getBool("auto use object specular maps", "Shaders"));
         resourceSystem->getSceneManager()->setSpecularMapPattern(Settings::Manager::getString("specular map pattern", "Shaders"));
         resourceSystem->getSceneManager()->setApplyLightingToEnvMaps(Settings::Manager::getBool("apply lighting to environment maps", "Shaders"));
-        resourceSystem->getSceneManager()->setFFPLighting(clampLighting || !forceShaders || !SceneUtil::LightManager::queryNonFFPLightingSupport());
-
-        osg::ref_ptr<SceneUtil::LightManager> sceneRoot = new SceneUtil::LightManager(mResourceSystem->getSceneManager()->getFFPLighting());
+        bool useFFP = clampLighting || !forceShaders || !SceneUtil::LightManager::queryNonFFPLightingSupport();
+        resourceSystem->getSceneManager()->setFFPLighting(useFFP);
+        resourceSystem->getSceneManager()->getShaderManager().setFFPLighting(useFFP);
+        
+        osg::ref_ptr<SceneUtil::LightManager> sceneRoot = new SceneUtil::LightManager(useFFP);
         sceneRoot->setLightingMask(Mask_Lighting);
         mSceneRoot = sceneRoot;
         sceneRoot->setStartLight(1);
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index 4eac2fe4cd..51792d1baa 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -646,7 +646,7 @@ void Water::createShaderWaterStateSet(osg::Node* node, Reflection* reflection, R
     program->addShader(vertexShader);
     program->addShader(fragmentShader);
     if (!mResourceSystem->getSceneManager()->getFFPLighting())
-        program->addBindUniformBlock("SunlightBuffer", 9);
+        program->addBindUniformBlock("SunlightBuffer", 0);
     shaderStateset->setAttributeAndModes(program, osg::StateAttribute::ON);
 
     node->setStateSet(shaderStateset);
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 6755db2557..ef53bea0d4 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -220,7 +220,7 @@ namespace Resource
 
     SceneManager::SceneManager(const VFS::Manager *vfs, Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager)
         : ResourceManager(vfs)
-        , mShaderManager(new Shader::ShaderManager(this))
+        , mShaderManager(new Shader::ShaderManager)
         , mForceShaders(false)
         , mClampLighting(true)
         , mAutoUseNormalMaps(false)
diff --git a/components/sceneutil/lightcontroller.cpp b/components/sceneutil/lightcontroller.cpp
index c759fabc79..cc95fe2e4f 100644
--- a/components/sceneutil/lightcontroller.cpp
+++ b/components/sceneutil/lightcontroller.cpp
@@ -11,13 +11,14 @@
 namespace SceneUtil
 {
 
-    LightController::LightController()
+    LightController::LightController(bool useFFPLighting)
         : mType(LT_Normal)
         , mPhase(0.25f + Misc::Rng::rollClosedProbability() * 0.75f)
         , mBrightness(0.675f)
         , mStartTime(0.0)
         , mLastTime(0.0)
         , mTicksToAdvance(0.f)
+        , mFFPLighting(useFFPLighting)
     {
     }
 
@@ -62,7 +63,11 @@ namespace SceneUtil
                 mPhase = mPhase <= 0.5f ? 1.f : 0.25f;
         }
 
-        static_cast<SceneUtil::LightSource*>(node)->getLight(nv->getTraversalNumber())->setDiffuse(mDiffuseColor * mBrightness);
+        auto* lightSource = static_cast<SceneUtil::LightSource*>(node);
+        if (mFFPLighting)
+            lightSource->getLight(nv->getTraversalNumber())->setDiffuse(mDiffuseColor * mBrightness);
+        else
+            lightSource->setBrightness(nv->getTraversalNumber(), mBrightness);
 
         traverse(node, nv);
     }
diff --git a/components/sceneutil/lightcontroller.hpp b/components/sceneutil/lightcontroller.hpp
index 36b2e868e5..f416be7240 100644
--- a/components/sceneutil/lightcontroller.hpp
+++ b/components/sceneutil/lightcontroller.hpp
@@ -20,7 +20,7 @@ namespace SceneUtil
             LT_PulseSlow
         };
 
-        LightController();
+        LightController(bool useFFPLighting=true);
 
         void setType(LightType type);
 
@@ -36,6 +36,7 @@ namespace SceneUtil
         double mStartTime;
         double mLastTime;
         float mTicksToAdvance;
+        bool mFFPLighting;
     };
 
 }
diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index fa9dc4fda8..987a95e20e 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -1,6 +1,7 @@
 #include "lightmanager.hpp"
 
 #include <osg/BufferObject>
+#include <osg/BufferIndexBinding>
 
 #include <osgUtil/CullVisitor>
 
@@ -12,6 +13,8 @@
 
 #include <components/debug/debuglog.hpp>
 
+#include "apps/openmw/mwrender/vismask.hpp"
+
 namespace 
 {
     /* similar to the boost::hash_combine */
@@ -32,6 +35,10 @@ namespace SceneUtil
 {
     static int sLightId = 0;
 
+////////////////////////////////////////////////////////////////////////////////
+// Internal Data Structures
+////////////////////////////////////////////////////////////////////////////////
+
     class LightBuffer : public osg::Referenced
     {
     public:
@@ -59,11 +66,6 @@ namespace SceneUtil
             mDirty = false;
         }
 
-        int blockSize() const 
-        {
-            return mData->getNumElements() * sizeof(GL_FLOAT) * osg::Vec4::num_components;
-        }
-
     protected:
         size_t mNumElements;
         osg::ref_ptr<osg::Vec4Array> mData;
@@ -114,7 +116,7 @@ namespace SceneUtil
     {
     public:
 
-        enum Type {Diffuse, Ambient, Position, Attenuation};
+        enum Type {Position, Diffuse, Ambient, Attenuation};
 
         PointLightBuffer(int count)
             : LightBuffer(4, count)
@@ -124,9 +126,10 @@ namespace SceneUtil
         {
             if (getValue(index, type) == value)
                 return;
-
-            (*mData)[mNumElements * index + type] = value;
-
+            
+            int indexOffset = mNumElements * index + type;
+            (*mData)[indexOffset] = value;
+            
             mDirty = true;
         }
 
@@ -155,12 +158,16 @@ namespace SceneUtil
         return &cacheVector[contextid];
     }
 
+////////////////////////////////////////////////////////////////////////////////
+// State Attributes
+////////////////////////////////////////////////////////////////////////////////
+
     SunlightStateAttribute::SunlightStateAttribute()
         : mBuffer(new SunlightBuffer)
     {
         osg::ref_ptr<osg::UniformBufferObject> ubo = new osg::UniformBufferObject;
         mBuffer->getData()->setBufferObject(ubo);
-        mUbb = new osg::UniformBufferBinding(9 , mBuffer->getData().get(), 0, mBuffer->blockSize());
+        mUbb = new osg::UniformBufferBinding(0, mBuffer->getData().get(), 0, mBuffer->getData()->getTotalDataSize());
     }
 
     SunlightStateAttribute::SunlightStateAttribute(const SunlightStateAttribute &copy, const osg::CopyOp &copyop)
@@ -235,56 +242,6 @@ namespace SceneUtil
         osg::Vec4f mnullptr;
     };
 
-    class LightStateAttribute : public osg::StateAttribute
-    {
-    public:
-        LightStateAttribute() : mBuffer(nullptr) {}
-        LightStateAttribute(const std::vector<osg::ref_ptr<osg::Light> >& lights, const osg::ref_ptr<PointLightBuffer>& buffer) : mLights(lights), mBuffer(buffer) {} 
-
-        LightStateAttribute(const LightStateAttribute& copy,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY)
-            : osg::StateAttribute(copy,copyop), mLights(copy.mLights), mBuffer(copy.mBuffer) {}
-
-        int compare(const StateAttribute &sa) const override
-        {
-            throw std::runtime_error("LightStateAttribute::compare: unimplemented");
-        }
-
-        META_StateAttribute(NifOsg, LightStateAttribute, osg::StateAttribute::LIGHT)
-
-        void apply(osg::State& state) const override
-        {
-            if (mLights.empty())
-                return;
-            osg::Matrix modelViewMatrix = state.getModelViewMatrix();
-
-            state.applyModelViewMatrix(state.getInitialViewMatrix());
-
-            if (mBuffer)
-            {
-                for (size_t i = 0; i < mLights.size(); ++i)
-                {
-
-                    mBuffer->setValue(i, PointLightBuffer::Diffuse, mLights[i]->getDiffuse());
-                    mBuffer->setValue(i, PointLightBuffer::Ambient, mLights[i]->getAmbient());
-                    mBuffer->setValue(i, PointLightBuffer::Position, mLights[i]->getPosition() * state.getModelViewMatrix());
-                    mBuffer->setValue(i, PointLightBuffer::Attenuation,
-                                        osg::Vec4(mLights[i]->getConstantAttenuation(), 
-                                                  mLights[i]->getLinearAttenuation(), 
-                                                  mLights[i]->getQuadraticAttenuation(), 0.0));
-                }
-
-                if (mBuffer && mBuffer->isDirty())
-                    mBuffer->dirty();
-            }
-
-            state.applyModelViewMatrix(modelViewMatrix);
-        }
-
-    private:
-        std::vector<osg::ref_ptr<osg::Light>> mLights;
-        osg::ref_ptr<PointLightBuffer> mBuffer;
-    };
-
     class FFPLightStateAttribute : public osg::StateAttribute
     {
     public:
@@ -368,6 +325,10 @@ namespace SceneUtil
         return nullptr;
     }
 
+////////////////////////////////////////////////////////////////////////////////
+// Node Callbacks
+////////////////////////////////////////////////////////////////////////////////
+
     // Set on a LightSource. Adds the light source to its light manager for the current frame.
     // This allows us to keep track of the current lights in the scene graph without tying creation & destruction to the manager.
     class CollectLightCallback : public osg::NodeCallback
@@ -460,6 +421,42 @@ namespace SceneUtil
         size_t mLastFrameNumber;
     };
 
+    class LightManagerStateAttribute : public osg::StateAttribute
+    {
+    public:
+        LightManagerStateAttribute() : mLightManager(nullptr) {}
+        LightManagerStateAttribute(LightManager* lightManager) : mLightManager(lightManager) {} 
+
+        LightManagerStateAttribute(const LightManagerStateAttribute& copy,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY)
+            : osg::StateAttribute(copy,copyop),mLightManager(copy.mLightManager) {}
+
+        int compare(const StateAttribute &sa) const override
+        {
+            throw std::runtime_error("LightManagerStateAttribute::compare: unimplemented");
+        }
+
+        META_StateAttribute(NifOsg, LightManagerStateAttribute, osg::StateAttribute::LIGHT)
+
+        void apply(osg::State& state) const override
+        {
+            osg::Matrix modelViewMatrix = state.getModelViewMatrix();
+            
+            state.applyModelViewMatrix(state.getInitialViewMatrix());
+                                    
+            for (size_t i = 0; i < mLightManager->mPointLightProxyData.size(); i++)
+            {
+                auto& data = mLightManager->mPointLightProxyData[i];
+                auto pos = data.mPosition * state.getInitialViewMatrix();
+                pos[3] = data.mBrightness;
+                mLightManager->mPointBuffer->setValue(i, PointLightBuffer::Position, pos);
+            }
+            state.applyModelViewMatrix(modelViewMatrix);
+            mLightManager->mPointBuffer->dirty();
+        }
+
+        LightManager* mLightManager;
+    };
+
     LightManager::LightManager(bool ffp)
         : mStartLight(0)
         , mLightingMask(~0u)
@@ -467,28 +464,44 @@ namespace SceneUtil
         , mSunBuffer(nullptr)
         , mFFP(ffp)
     {
-        setUpdateCallback(new LightManagerUpdateCallback);
-
         if (usingFFP())
         {
             for (int i=0; i<getMaxLights(); ++i)
                 mDummies.push_back(new FFPLightStateAttribute(i, std::vector<osg::ref_ptr<osg::Light> >()));
+            setUpdateCallback(new LightManagerUpdateCallback);
             return;
         }
 
         auto* stateset = getOrCreateStateSet();
 
-        mSunBuffer = new SunlightBuffer();
-        osg::ref_ptr<osg::UniformBufferObject> ubo = new osg::UniformBufferObject;
-        mSunBuffer->getData()->setBufferObject(ubo);
-        osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(9 , mSunBuffer->getData().get(), 0, mSunBuffer->blockSize());
-        stateset->setAttributeAndModes(ubb.get(), osg::StateAttribute::ON);
+        { // sunlight UBO data
+            mSunBuffer = new SunlightBuffer();
+            osg::ref_ptr<osg::UniformBufferObject> ubo = new osg::UniformBufferObject;
+            mSunBuffer->getData()->setBufferObject(ubo);
+            osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(0, mSunBuffer->getData().get(), 0, mSunBuffer->getData()->getTotalDataSize());
+            stateset->setAttributeAndModes(ubb.get(), osg::StateAttribute::ON);
+        }
+
+        { // point lights UBO data
+            mPointBuffer = new PointLightBuffer(getMaxLightsInScene());
+            osg::ref_ptr<osg::UniformBufferObject> ubo = new osg::UniformBufferObject;
+            mPointBuffer->getData()->setBufferObject(ubo);
+            osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(1, mPointBuffer->getData().get(), 0, mPointBuffer->getData()->getTotalDataSize());
+            stateset->setAttributeAndModes(ubb.get(), osg::StateAttribute::ON);
+        }
+
+        mPointLightProxyData.resize(getMaxLightsInScene());
 
+        stateset->setMode(GL_LIGHTING, osg::StateAttribute::OFF|osg::StateAttribute::OVERRIDE);
+        stateset->setAttribute(new LightManagerStateAttribute(this), osg::StateAttribute::ON);
         stateset->addUniform(new osg::Uniform("PointLightCount", 0));
 
+        setUpdateCallback(new LightManagerUpdateCallback);
         addCullCallback(new SunlightCallback(this));
     }
 
+////////////////////////////////////////////////////////////////////////////////
+
     LightManager::LightManager(const LightManager &copy, const osg::CopyOp &copyop)
         : osg::Group(copy, copyop)
         , mStartLight(copy.mStartLight)
@@ -507,7 +520,7 @@ namespace SceneUtil
     int LightManager::getMaxLights() const
     {
         if (usingFFP()) return LightManager::mFFPMaxLights;
-        return std::clamp(Settings::Manager::getInt("max lights", "Shaders"), 0, getMaxLightsInScene());
+        return std::clamp(Settings::Manager::getInt("max lights", "Shaders"),LightManager::mFFPMaxLights , getMaxLightsInScene());
     }
 
     int LightManager::getMaxLightsInScene() const
@@ -579,16 +592,18 @@ namespace SceneUtil
     }
 
     void LightManager::update()
-    {
+    {   
         mLights.clear();
         mLightsInViewSpace.clear();
 
-        // do an occasional cleanup for orphaned lights
+        // Do an occasional cleanup for orphaned lights.
         for (int i=0; i<2; ++i)
         {
-            if (mStateSetCache[i].size() > 5000)
+            if (mStateSetCache[i].size() > 5000 || mIndexNeedsRecompiling)
                 mStateSetCache[i].clear();
         }
+
+        mIndexNeedsRecompiling = false;
     }
 
     void LightManager::addLight(LightSource* lightSource, const osg::Matrixf& worldMat, size_t frameNum)
@@ -599,7 +614,8 @@ namespace SceneUtil
         lightSource->getLight(frameNum)->setPosition(osg::Vec4f(worldMat.getTrans().x(),
                                                         worldMat.getTrans().y(),
                                                         worldMat.getTrans().z(), 1.f));
-        mLights.push_back(l);
+        if (mLights.size() < static_cast<size_t>(getMaxLightsInScene()))
+            mLights.emplace_back(l);
     }
 
     void LightManager::setSunlight(osg::ref_ptr<osg::Light> sun)
@@ -627,20 +643,21 @@ namespace SceneUtil
             hash_combine(hash, lightList[i]->mLightSource->getId());
 
         LightStateSetMap& stateSetCache = mStateSetCache[frameNum%2];
-
+        
         LightStateSetMap::iterator found = stateSetCache.find(hash);
         if (found != stateSetCache.end())
             return found->second;
         else
         {
             osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
-            std::vector<osg::ref_ptr<osg::Light> > lights;
-            lights.reserve(lightList.size());
-            for (size_t i=0; i<lightList.size();++i)
-                lights.emplace_back(lightList[i]->mLightSource->getLight(frameNum));
 
             if (usingFFP())
             {
+                std::vector<osg::ref_ptr<osg::Light> > lights;
+                lights.reserve(lightList.size());
+                for (size_t i=0; i<lightList.size();++i)
+                    lights.emplace_back(lightList[i]->mLightSource->getLight(frameNum));
+
                 // the first light state attribute handles the actual state setting for all lights
                 // it's best to batch these up so that we don't need to touch the modelView matrix more than necessary
                 // don't use setAttributeAndModes, that does not support light indices!
@@ -656,14 +673,18 @@ namespace SceneUtil
             }
             else
             {
-                osg::ref_ptr<PointLightBuffer> buffer = new PointLightBuffer(lights.size());
-                osg::ref_ptr<osg::UniformBufferObject> ubo = new osg::UniformBufferObject;
-                buffer->getData()->setBufferObject(ubo);
-                osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(8 ,buffer->getData().get(), 0, buffer->blockSize());
-                stateset->addUniform(new osg::Uniform("PointLightCount", (int)lights.size()));
-                stateset->setAttributeAndModes(ubb.get(), osg::StateAttribute::ON);
-
-                stateset->setAttribute(new LightStateAttribute(std::move(lights), buffer), osg::StateAttribute::ON);
+                osg::ref_ptr<osg::IntArray> indices = new osg::IntArray(getMaxLights());
+                osg::ref_ptr<osg::Uniform> indicesUni = new osg::Uniform(osg::Uniform::Type::INT, "PointLightIndex", indices->size());
+                int validCount = 0;
+                for (size_t i = 0; i < lightList.size(); ++i)
+                {
+                    auto it = mLightData.find(lightList[i]->mLightSource->getId());
+                    if (it != mLightData.end())
+                        indices->at(validCount++) = it->second;
+                }
+                indicesUni->setArray(indices);
+                stateset->addUniform(indicesUni);
+                stateset->addUniform(new osg::Uniform("PointLightCount", validCount));
             }
 
             stateSetCache.emplace(hash, stateset);
@@ -671,11 +692,6 @@ namespace SceneUtil
         }
     }
 
-    const std::vector<LightManager::LightSourceTransform>& LightManager::getLights() const
-    {
-        return mLights;
-    }
-
     const std::vector<LightManager::LightSourceViewBound>& LightManager::getLightsInViewSpace(osg::Camera *camera, const osg::RefMatrix* viewMatrix, size_t frameNum)
     {
         osg::observer_ptr<osg::Camera> camPtr (camera);
@@ -695,13 +711,47 @@ namespace SceneUtil
                 l.mLightSource = lightIt->mLightSource;
                 l.mViewBound = viewBound;
                 it->second.push_back(l);
+
+                if (usingFFP()) continue;
+
+                auto* light = l.mLightSource->getLight(frameNum);
+
+                auto dataIt = mLightData.find(l.mLightSource->getId());
+                if (dataIt != mLightData.end())
+                {
+                    mPointLightProxyData[dataIt->second].mPosition = light->getPosition();
+                    mPointLightProxyData[dataIt->second].mBrightness = l.mLightSource->getBrightness(frameNum);
+                    mPointBuffer->setValue(dataIt->second, PointLightBuffer::Diffuse, light->getDiffuse());
+                    continue;
+                }
+
+                if (mLightData.size() >= static_cast<size_t>(getMaxLightsInScene()))
+                {
+                    mIndexNeedsRecompiling = true;
+                    mLightData.clear();
+                }
+
+                int index = mLightData.size();
+                updateGPUPointLight(index, l.mLightSource, frameNum);
+                mLightData.emplace(l.mLightSource->getId(), index);
             }
         }
         return it->second;
     }
 
+    void LightManager::updateGPUPointLight(int index, LightSource* lightSource, size_t frameNum)
+    {
+        auto* light = lightSource->getLight(frameNum);
+        mPointLightProxyData[index].mPosition = light->getPosition();
+        mPointLightProxyData[index].mBrightness = lightSource->getBrightness(frameNum);
+        mPointBuffer->setValue(index, PointLightBuffer::Diffuse, light->getDiffuse());
+        mPointBuffer->setValue(index, PointLightBuffer::Ambient, light->getAmbient());
+        mPointBuffer->setValue(index, PointLightBuffer::Attenuation, osg::Vec4(light->getConstantAttenuation(), light->getLinearAttenuation(), light->getQuadraticAttenuation(), lightSource->getRadius()));
+    }
+
     LightSource::LightSource()
         : mRadius(0.f)
+        , mBrightness{1.0,1.0}
     {
         setUpdateCallback(new CollectLightCallback);
         mId = sLightId++;
@@ -753,7 +803,7 @@ namespace SceneUtil
             // Don't use Camera::getViewMatrix, that one might be relative to another camera!
             const osg::RefMatrix* viewMatrix = cv->getCurrentRenderStage()->getInitialViewMatrix();
             const std::vector<LightManager::LightSourceViewBound>& lights = mLightManager->getLightsInViewSpace(cv->getCurrentCamera(), viewMatrix, mLastFrameNumber);
-
+            
             // get the node bounds in view space
             // NB do not node->getBound() * modelView, that would apply the node's transformation twice
             osg::BoundingSphere nodeBound;
@@ -818,7 +868,6 @@ namespace SceneUtil
             else
                 stateset = mLightManager->getLightListStateSet(mLightList, cv->getTraversalNumber());
 
-
             cv->pushStateSet(stateset);
             return true;
         }
diff --git a/components/sceneutil/lightmanager.hpp b/components/sceneutil/lightmanager.hpp
index 7ceb725aef..9c478b294b 100644
--- a/components/sceneutil/lightmanager.hpp
+++ b/components/sceneutil/lightmanager.hpp
@@ -2,13 +2,15 @@
 #define OPENMW_COMPONENTS_SCENEUTIL_LIGHTMANAGER_H
 
 #include <set>
+#include <cassert>
+#include <unordered_map>
+#include <unordered_set>
 
 #include <osg/Light>
 
 #include <osg/Group>
 #include <osg/NodeVisitor>
 #include <osg/observer_ptr>
-#include <osg/BufferIndexBinding>
 
 #include <components/shader/shadermanager.hpp>
 
@@ -17,9 +19,16 @@ namespace osgUtil
     class CullVisitor;
 }
 
+namespace osg
+{
+    class UniformBufferBinding;
+    class UniformBufferObject;
+}
+
 namespace SceneUtil
 {
     class SunlightBuffer;
+    class PointLightBuffer;
 
     // Used to override sun. Rarely useful but necassary for local map. 
     class SunlightStateAttribute : public osg::StateAttribute
@@ -59,6 +68,8 @@ namespace SceneUtil
 
         int mId;
 
+        float mBrightness[2];
+
     public:
 
         META_Node(SceneUtil, LightSource)
@@ -78,6 +89,16 @@ namespace SceneUtil
             mRadius = radius;
         }
 
+        float getBrightness(size_t frame)
+        {
+            return mBrightness[frame % 2];
+        }
+
+        void setBrightness(size_t frame, float brightness)
+        {
+            mBrightness[frame % 2] = brightness;
+        }
+
         /// Get the osg::Light safe for modification in the given frame.
         /// @par May be used externally to animate the light's color/attenuation properties,
         /// and is used internally to synchronize the light's position with the position of the LightSource.
@@ -119,7 +140,7 @@ namespace SceneUtil
             osg::BoundingSphere mViewBound;
         };
 
-        typedef std::vector<const LightSourceViewBound*> LightList;
+        using LightList = std::vector<const LightSourceViewBound*>;
 
         static bool queryNonFFPLightingSupport();
 
@@ -146,8 +167,6 @@ namespace SceneUtil
         /// Internal use only, called automatically by the LightSource's UpdateCallback
         void addLight(LightSource* lightSource, const osg::Matrixf& worldMat, size_t frameNum);
 
-        const std::vector<LightSourceTransform>& getLights() const;
-
         const std::vector<LightSourceViewBound>& getLightsInViewSpace(osg::Camera* camera, const osg::RefMatrix* viewMatrix, size_t frameNum);
 
         osg::ref_ptr<osg::StateSet> getLightListStateSet(const LightList& lightList, size_t frameNum);
@@ -165,6 +184,11 @@ namespace SceneUtil
         Shader::ShaderManager::DefineMap getLightDefines() const;
 
     private:
+
+        friend class LightManagerStateAttribute;
+
+        void updateGPUPointLight(int index, LightSource* lightSource, size_t frameNum);
+
         // Lights collected from the scene graph. Only valid during the cull traversal.
         std::vector<LightSourceTransform> mLights;
 
@@ -184,6 +208,21 @@ namespace SceneUtil
         osg::ref_ptr<osg::Light> mSun;
         osg::ref_ptr<SunlightBuffer> mSunBuffer;
 
+        struct PointLightProxyData
+        {
+            osg::Vec4 mPosition;
+            float mBrightness;
+        };
+
+        std::vector<PointLightProxyData> mPointLightProxyData;
+        osg::ref_ptr<PointLightBuffer> mPointBuffer;
+
+        // < Light ID , Buffer Index >
+        using LightDataMap = std::unordered_map<int, int>;
+        LightDataMap mLightData;
+
+        bool mIndexNeedsRecompiling;
+        
         bool mFFP;
 
         static constexpr int mFFPMaxLights = 8;
diff --git a/components/sceneutil/lightutil.cpp b/components/sceneutil/lightutil.cpp
index e9be05908e..6c17117d01 100644
--- a/components/sceneutil/lightutil.cpp
+++ b/components/sceneutil/lightutil.cpp
@@ -58,7 +58,7 @@ namespace SceneUtil
         light->setQuadraticAttenuation(quadraticAttenuation);
     }
 
-    void addLight (osg::Group* node, const ESM::Light* esmLight, unsigned int partsysMask, unsigned int lightMask, bool isExterior)
+    void addLight (osg::Group* node, const ESM::Light* esmLight, unsigned int partsysMask, unsigned int lightMask, bool isExterior, bool useFFPLighting)
     {
         SceneUtil::FindByNameVisitor visitor("AttachLight");
         node->accept(visitor);
@@ -85,17 +85,21 @@ namespace SceneUtil
             attachTo = trans;
         }
 
-        osg::ref_ptr<LightSource> lightSource = createLightSource(esmLight, lightMask, isExterior);
+        osg::ref_ptr<LightSource> lightSource = createLightSource(esmLight, lightMask, isExterior, osg::Vec4f(0,0,0,1), useFFPLighting);
         attachTo->addChild(lightSource);
     }
 
-    osg::ref_ptr<LightSource> createLightSource(const ESM::Light* esmLight, unsigned int lightMask, bool isExterior, const osg::Vec4f& ambient)
+    osg::ref_ptr<LightSource> createLightSource(const ESM::Light* esmLight, unsigned int lightMask, bool isExterior, const osg::Vec4f& ambient, bool useFFPLighting)
     {
         osg::ref_ptr<SceneUtil::LightSource> lightSource (new SceneUtil::LightSource);
         osg::ref_ptr<osg::Light> light (new osg::Light);
         lightSource->setNodeMask(lightMask);
 
         float radius = esmLight->mData.mRadius;
+        // arbitrary multipler to reduce light popping, this is hard to avoid with per-object lighting
+        // we offset this multipler in shaders
+        if (!useFFPLighting)
+            radius *= 2.0;
         lightSource->setRadius(radius);
 
         configureLight(light, radius, isExterior);
@@ -112,7 +116,7 @@ namespace SceneUtil
 
         lightSource->setLight(light);
 
-        osg::ref_ptr<SceneUtil::LightController> ctrl (new SceneUtil::LightController);
+        osg::ref_ptr<SceneUtil::LightController> ctrl (new SceneUtil::LightController(useFFPLighting));
         ctrl->setDiffuse(light->getDiffuse());
         if (esmLight->mData.mFlags & ESM::Light::Flicker)
             ctrl->setType(SceneUtil::LightController::LT_Flicker);
diff --git a/components/sceneutil/lightutil.hpp b/components/sceneutil/lightutil.hpp
index 7096c38b20..bb28276e9b 100644
--- a/components/sceneutil/lightutil.hpp
+++ b/components/sceneutil/lightutil.hpp
@@ -32,14 +32,14 @@ namespace SceneUtil
     /// @param partsysMask Node mask to ignore when computing the sub graph's bounding box.
     /// @param lightMask Mask to assign to the newly created LightSource.
     /// @param isExterior Is the light outside? May be used for deciding which attenuation settings to use.
-    void addLight (osg::Group* node, const ESM::Light* esmLight, unsigned int partsysMask, unsigned int lightMask, bool isExterior);
+    void addLight (osg::Group* node, const ESM::Light* esmLight, unsigned int partsysMask, unsigned int lightMask, bool isExterior, bool useFFPLighting=true);
 
     /// @brief Convert an ESM::Light to a SceneUtil::LightSource, and return it.
     /// @param esmLight The light definition coming from the game files containing radius, color, flicker, etc.
     /// @param lightMask Mask to assign to the newly created LightSource.
     /// @param isExterior Is the light outside? May be used for deciding which attenuation settings to use.
     /// @param ambient Ambient component of the light.
-    osg::ref_ptr<LightSource> createLightSource (const ESM::Light* esmLight, unsigned int lightMask, bool isExterior, const osg::Vec4f& ambient=osg::Vec4f(0,0,0,1));
+    osg::ref_ptr<LightSource> createLightSource (const ESM::Light* esmLight, unsigned int lightMask, bool isExterior, const osg::Vec4f& ambient=osg::Vec4f(0,0,0,1), bool useFFPLighting=true);
 
 }
 
diff --git a/components/shader/shadermanager.cpp b/components/shader/shadermanager.cpp
index 96671bf8b4..b1dc145f78 100644
--- a/components/shader/shadermanager.cpp
+++ b/components/shader/shadermanager.cpp
@@ -17,10 +17,9 @@
 namespace Shader
 {
 
-    ShaderManager::ShaderManager(Resource::SceneManager* sceneManager)
-        : mSceneManager(sceneManager)
+    ShaderManager::ShaderManager()
+        : mFFPLighting(false)
     {
-
     }
 
     void ShaderManager::setShaderPath(const std::string &path)
@@ -28,6 +27,11 @@ namespace Shader
         mPath = path;
     }
 
+    void ShaderManager::setFFPLighting(bool useFFP)
+    {
+        mFFPLighting = useFFP;
+    }
+
     bool addLineDirectivesAfterConditionalBlocks(std::string& source)
     {
         for (size_t position = 0; position < source.length(); )
@@ -352,10 +356,10 @@ namespace Shader
             program->addShader(fragmentShader);
             program->addBindAttribLocation("aOffset", 6);
             program->addBindAttribLocation("aRotation", 7);
-            if (!mSceneManager->getFFPLighting())
+            if (!mFFPLighting)
             {
-                program->addBindUniformBlock("PointLightBuffer", 8);
-                program->addBindUniformBlock("SunlightBuffer", 9);
+                program->addBindUniformBlock("SunlightBuffer", 0);
+                program->addBindUniformBlock("PointLightBuffer", 1);
             }
             found = mPrograms.insert(std::make_pair(std::make_pair(vertexShader, fragmentShader), program)).first;
         }
diff --git a/components/shader/shadermanager.hpp b/components/shader/shadermanager.hpp
index b9bb005b11..c70085485d 100644
--- a/components/shader/shadermanager.hpp
+++ b/components/shader/shadermanager.hpp
@@ -25,10 +25,12 @@ namespace Shader
     {
     public:
 
-        ShaderManager(Resource::SceneManager* sceneManager);
+        ShaderManager();
 
         void setShaderPath(const std::string& path);
 
+        void setFFPLighting(bool useFFP);
+
         typedef std::map<std::string, std::string> DefineMap;
 
         /// Create or retrieve a shader instance.
@@ -67,7 +69,7 @@ namespace Shader
         typedef std::map<std::pair<osg::ref_ptr<osg::Shader>, osg::ref_ptr<osg::Shader> >, osg::ref_ptr<osg::Program> > ProgramMap;
         ProgramMap mPrograms;
 
-        Resource::SceneManager* mSceneManager;
+        bool mFFPLighting;
 
         std::mutex mMutex;
     };
diff --git a/files/shaders/lighting.glsl b/files/shaders/lighting.glsl
index b9f426fc9d..b243a90c4e 100644
--- a/files/shaders/lighting.glsl
+++ b/files/shaders/lighting.glsl
@@ -6,19 +6,21 @@
 
 struct PointLight
 {
+    vec4 position;
     vec4 diffuse;
     vec4 ambient;
-    vec4 position;
-    vec4 attenuation;
+    float constantAttenuation;
+    float linearAttenuation;
+    float quadraticAttenuation;
+    float radius;
 };
 
-uniform mat4 osg_ViewMatrix;
 uniform int PointLightCount;
 uniform int PointLightIndex[@maxLights];
 
 layout(std140) uniform PointLightBuffer
 {
-    PointLight PointLights[@maxLights];
+    PointLight PointLights[@maxLightsInScene];
 };
 
 #else
@@ -47,15 +49,26 @@ void perLightSun(out vec3 ambientOut, out vec3 diffuseOut, vec3 viewPos, vec3 vi
     diffuseOut = @sunDiffuse.xyz * lambert;
 }
 
+
+uniform float osg_SimulationTime;
 void perLightPoint(out vec3 ambientOut, out vec3 diffuseOut, int lightIndex, vec3 viewPos, vec3 viewNormal)
 {
-    vec3 lightDir = getLight[lightIndex].position.xyz - viewPos;
-    //vec3 lightDir = (osg_ViewMatrix * vec4(getLight[lightIndex].position, 1.0)).xyz - viewPos;
+    vec4 pos = getLight[lightIndex].position;
+    vec3 lightDir = pos.xyz - viewPos;
 
     float lightDistance = length(lightDir);
     lightDir = normalize(lightDir);
 
-    float illumination = clamp(1.0 / (getLight[lightIndex].attenuation.x + getLight[lightIndex].attenuation.y * lightDistance + getLight[lightIndex].attenuation.z * lightDistance * lightDistance), 0.0, 1.0);
+    float illumination = clamp(1.0 / (getLight[lightIndex].constantAttenuation + getLight[lightIndex].linearAttenuation * lightDistance + getLight[lightIndex].quadraticAttenuation * lightDistance * lightDistance), 0.0, 1.0);
+
+// Add an artificial cutoff, otherwise effected objects will be brightly lit and adjacent objects not effected by this light will be dark by contrast
+// This causes nasty artifacts, especially with active grid so it is necassary for now. 
+#if !@ffpLighting
+    float cutoff = getLight[lightIndex].radius * 0.5;
+    illumination *= 1.0 - smoothstep(0.0, 1.0, ((lightDistance / cutoff) - 1.0) * 0.887);
+    illumination = max(0.0, illumination);
+#endif
+
     ambientOut = getLight[lightIndex].ambient.xyz * illumination;
 
     float lambert = dot(viewNormal.xyz, lightDir) * illumination;
@@ -70,7 +83,12 @@ void perLightPoint(out vec3 ambientOut, out vec3 diffuseOut, int lightIndex, vec
     }
     lambert *= clamp(-8.0 * (1.0 - 0.3) * eyeCosine + 1.0, 0.3, 1.0);
 #endif
+
+#if @ffpLighting
     diffuseOut = getLight[lightIndex].diffuse.xyz * lambert;
+#else
+    diffuseOut = (getLight[lightIndex].diffuse.xyz * pos.w) * lambert;
+#endif
 }
 
 #if PER_PIXEL_LIGHTING
@@ -97,7 +115,7 @@ void doLighting(vec3 viewPos, vec3 viewNormal, out vec3 diffuseLight, out vec3 a
     diffuseLight += diffuseOut;
     for (int i=0; i<PointLightCount; ++i)
     {
-        perLightPoint(ambientOut, diffuseOut, i, viewPos, viewNormal);
+        perLightPoint(ambientOut, diffuseOut, PointLightIndex[i], viewPos, viewNormal);
 #else
     for (int i=0; i<@maxLights; ++i)
     {

From 05a5cee132790ef41b8049602a61ec95792736dd Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Sat, 27 Mar 2021 12:47:41 -0700
Subject: [PATCH 0566/2859] Brighter point lights and light fade

---
 components/sceneutil/lightmanager.cpp | 35 ++++++++++++++++++++++++---
 components/sceneutil/lightmanager.hpp |  2 ++
 files/settings-default.cfg            |  8 +++++-
 files/shaders/lighting.glsl           | 29 +++++++++++-----------
 4 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 7215459202..d4275e5d28 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -56,7 +56,15 @@ namespace SceneUtil
 
         void setDiffuse(int index, const osg::Vec4& value)
         {
-            *(unsigned int*)(&(*mData)[3*index][0]) = asRGBA(value);
+            auto signedValue = value;
+            float signBit = 1.0;
+            if (value[0] < 0)
+            {
+                signedValue *= -1.0;
+                signBit = -1.0;
+            }
+            *(unsigned int*)(&(*mData)[3*index][0]) = asRGBA(signedValue);
+            *(int*)(&(*mData)[3*index][3]) = signBit;
         }
 
         void setAmbient(int index, const osg::Vec4& value)
@@ -587,8 +595,16 @@ namespace SceneUtil
         : mStartLight(0)
         , mLightingMask(~0u)
         , mSun(nullptr)
-        , mPointLightRadiusMultiplier(std::max(0.0f, Settings::Manager::getFloat("light bounds multiplier", "Shaders")))
+        , mPointLightRadiusMultiplier(std::max(0.f, Settings::Manager::getFloat("light bounds multiplier", "Shaders")))
+        , mPointLightFadeStart(0.f)
     {
+        mPointLightFadeEnd = std::max(0.f, Settings::Manager::getFloat("maximum light distance", "Shaders"));
+        if (mPointLightFadeEnd > 0)
+        {
+            mPointLightFadeStart = std::clamp(Settings::Manager::getFloat("light fade start", "Shaders"), 0.f, 1.f);
+            mPointLightFadeStart = mPointLightFadeEnd * mPointLightFadeStart;
+        }
+
         auto lightingModelString = Settings::Manager::getString("lighting method", "Shaders");
         bool validLightingModel = isValidLightingModelString(lightingModelString);
         if (!validLightingModel)
@@ -869,6 +885,19 @@ namespace SceneUtil
                 osg::BoundingSphere viewBound = osg::BoundingSphere(osg::Vec3f(0,0,0), radius * mPointLightRadiusMultiplier);
                 transformBoundingSphere(worldViewMat, viewBound);
 
+                static const float fadeDelta = mPointLightFadeEnd - mPointLightFadeStart;
+
+                if (mPointLightFadeEnd != 0.f)
+                {
+                    float fade = 1 - std::clamp((viewBound.center().length() - mPointLightFadeStart) / fadeDelta, 0.f, 1.f);
+
+                    if (fade == 0.f)
+                        continue;
+
+                    auto* light = transform.mLightSource->getLight(frameNum);
+                    light->setDiffuse(light->getDiffuse() * fade);
+                }
+
                 LightSourceViewBound l;
                 l.mLightSource = transform.mLightSource;
                 l.mViewBound = viewBound;
@@ -896,7 +925,7 @@ namespace SceneUtil
         auto* light = lightSource->getLight(frameNum);
         auto& buf = getLightBuffer(frameNum);
         buf->setDiffuse(index, light->getDiffuse());
-        buf->setAmbient(index, light->getSpecular());
+        buf->setAmbient(index, light->getAmbient());
         buf->setAttenuation(index, light->getConstantAttenuation(), light->getLinearAttenuation(), light->getQuadraticAttenuation());
         buf->setRadius(index, lightSource->getRadius());
         buf->setPosition(index, light->getPosition() * (*viewMatrix));
diff --git a/components/sceneutil/lightmanager.hpp b/components/sceneutil/lightmanager.hpp
index b430153b27..214ffa1385 100644
--- a/components/sceneutil/lightmanager.hpp
+++ b/components/sceneutil/lightmanager.hpp
@@ -215,6 +215,8 @@ namespace SceneUtil
         LightingMethod mLightingMethod;
 
         float mPointLightRadiusMultiplier;
+        float mPointLightFadeEnd;
+        float mPointLightFadeStart;
 
         int mMaxLights;
 
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index cb23f7df73..b74d3ce02d 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -448,7 +448,13 @@ lighting method = experimental
 # Sets the bounding sphere multiplier of light sources, which are used to determine if an object should
 # receive lighting. Higher values will allow for smoother transitions of light sources, but may have a performance cost and
 # requires a higher number of 'max lights' set. It is recommended to keep this at 1.0 with 'legacy' lighting enabled.
-light bounds multiplier =  1.9
+light bounds multiplier =  2.0
+
+# The distance from the camera at which lights fade away completely. Set to 0 to disable fading.
+maximum light distance = 8192
+
+# Fraction of the maximum distance at which lights begin to gradually fade away.
+light fade start = 0.85
 
 # Set maximum number of lights per object. 
 # Only used when 'lighting method' is not set to 'legacy'
diff --git a/files/shaders/lighting.glsl b/files/shaders/lighting.glsl
index 36be081efc..257c0513af 100644
--- a/files/shaders/lighting.glsl
+++ b/files/shaders/lighting.glsl
@@ -16,22 +16,21 @@ float quickstep(float x)
 #if @useUBO
 
 const uint mask = uint(0xff);
+const uvec4 shift = uvec4(uint(0), uint(8), uint(16), uint(24));
 
-vec3 unpackRGB(float data)
+vec3 unpackRGB(uint data)
 {
-    uint colors = uint(data);
-    return vec3( (((colors >>  0) & mask) / 255.0)
-                ,(((colors >>  8) & mask) / 255.0)
-                ,(((colors >> 16) & mask) / 255.0));
+    return vec3( (float(((data >> shift.x) & mask)) / 255.0)
+                ,(float(((data >> shift.y) & mask)) / 255.0)
+                ,(float(((data >> shift.z) & mask)) / 255.0));
 }
 
-vec4 unpackRGBA(float data)
+vec4 unpackRGBA(uint data)
 {
-    uint colors = uint(data);
-    return vec4( (((colors >>  0) & mask) / 255.0)
-                ,(((colors >>  8) & mask) / 255.0)
-                ,(((colors >> 16) & mask) / 255.0)
-                ,(((colors >> 24) & mask) / 255.0));
+    return vec4( (float(((data >> shift.x) & mask)) / 255.0)
+                ,(float(((data >> shift.y) & mask)) / 255.0)
+                ,(float(((data >> shift.z) & mask)) / 255.0)
+                ,(float(((data >> shift.w) & mask)) / 255.0));
 }
 
 struct LightData
@@ -74,7 +73,7 @@ void perLightSun(out vec3 ambientOut, out vec3 diffuseOut, vec3 viewPos, vec3 vi
     vec3 lightDir = normalize(getLight[0].position.xyz);
 
 #if @lightingModel == LIGHTING_MODEL_SINGLE_UBO
-    vec4 data = getLight[0].packedColors;
+    uvec4 data = getLight[0].packedColors;
     ambientOut = unpackRGB(data.y);
     vec3 sunDiffuse = unpackRGB(data.x);
 #else
@@ -108,11 +107,11 @@ void perLightPoint(out vec3 ambientOut, out vec3 diffuseOut, int lightIndex, vec
     float illumination = clamp(1.0 / (getLight[lightIndex].constantAttenuation + getLight[lightIndex].linearAttenuation * lightDistance + getLight[lightIndex].quadraticAttenuation * lightDistance * lightDistance), 0.0, 1.0);
 #else
     float illumination = clamp(1.0 / (getLight[lightIndex].attenuation.x + getLight[lightIndex].attenuation.y * lightDistance + getLight[lightIndex].attenuation.z * lightDistance * lightDistance), 0.0, 1.0);
-    illumination *= 1.0 - quickstep((lightDistance * 0.887 / getLight[lightIndex].attenuation.w) - 0.887);
+    illumination *= 1.0 - quickstep((lightDistance / (getLight[lightIndex].attenuation.w)) - 1.0);
 #endif
 
 #if @useUBO
-    vec4 data = getLight[lightIndex].packedColors;
+    uvec4 data = getLight[lightIndex].packedColors;
     ambientOut = unpackRGB(data.y) * illumination;
 #else
     ambientOut = getLight[lightIndex].ambient.xyz * illumination;
@@ -133,7 +132,7 @@ void perLightPoint(out vec3 ambientOut, out vec3 diffuseOut, int lightIndex, vec
 #endif
 
 #if @useUBO
-    diffuseOut = unpackRGB(data.x) * lambert;
+    diffuseOut =  unpackRGB(data.x) * lambert * float(int(data.w));
 #else
     diffuseOut = getLight[lightIndex].diffuse.xyz * lambert;
 #endif

From ec27e60284511a11ce9f775f2b4d27f5548cfd7e Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Sat, 27 Mar 2021 23:41:22 -0700
Subject: [PATCH 0567/2859] Cutoff conditional in light shader

---
 files/settings-default.cfg  |  2 +-
 files/shaders/lighting.glsl | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index b74d3ce02d..102c1aa66c 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -448,7 +448,7 @@ lighting method = experimental
 # Sets the bounding sphere multiplier of light sources, which are used to determine if an object should
 # receive lighting. Higher values will allow for smoother transitions of light sources, but may have a performance cost and
 # requires a higher number of 'max lights' set. It is recommended to keep this at 1.0 with 'legacy' lighting enabled.
-light bounds multiplier =  2.0
+light bounds multiplier =  1.0
 
 # The distance from the camera at which lights fade away completely. Set to 0 to disable fading.
 maximum light distance = 8192
diff --git a/files/shaders/lighting.glsl b/files/shaders/lighting.glsl
index 257c0513af..4b7e233146 100644
--- a/files/shaders/lighting.glsl
+++ b/files/shaders/lighting.glsl
@@ -101,6 +101,17 @@ void perLightPoint(out vec3 ambientOut, out vec3 diffuseOut, int lightIndex, vec
     vec3 lightDir = getLight[lightIndex].position.xyz - viewPos;
 
     float lightDistance = length(lightDir);
+
+#if !@ffpLighting
+    // This has a *considerable* performance uplift where GPU is a bottleneck
+    if (lightDistance > getLight[lightIndex].attenuation.w * 2.0)
+    {
+        ambientOut = vec3(0.0);
+        diffuseOut = vec3(0.0);
+        return;
+    }
+#endif
+
     lightDir = normalize(lightDir);
 
 #if @ffpLighting

From 24454a1698d8331f8b822b6f0f004f432f7964bb Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Sat, 27 Mar 2021 23:52:05 -0700
Subject: [PATCH 0568/2859] Switch to integer, uint not reliable in GLSL 120

---
 files/shaders/lighting.glsl | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/files/shaders/lighting.glsl b/files/shaders/lighting.glsl
index 4b7e233146..c6c03f2232 100644
--- a/files/shaders/lighting.glsl
+++ b/files/shaders/lighting.glsl
@@ -15,17 +15,17 @@ float quickstep(float x)
 
 #if @useUBO
 
-const uint mask = uint(0xff);
-const uvec4 shift = uvec4(uint(0), uint(8), uint(16), uint(24));
+const int mask = int(0xff);
+const ivec4 shift = ivec4(int(0), int(8), int(16), int(24));
 
-vec3 unpackRGB(uint data)
+vec3 unpackRGB(int data)
 {
     return vec3( (float(((data >> shift.x) & mask)) / 255.0)
                 ,(float(((data >> shift.y) & mask)) / 255.0)
                 ,(float(((data >> shift.z) & mask)) / 255.0));
 }
 
-vec4 unpackRGBA(uint data)
+vec4 unpackRGBA(int data)
 {
     return vec4( (float(((data >> shift.x) & mask)) / 255.0)
                 ,(float(((data >> shift.y) & mask)) / 255.0)
@@ -35,7 +35,7 @@ vec4 unpackRGBA(uint data)
 
 struct LightData
 {
-    uvec4 packedColors;  // diffuse, ambient, specular
+    ivec4 packedColors;  // diffuse, ambient, specular
     vec4 position;
     vec4 attenuation;   // constant, linear, quadratic, radius
 };
@@ -73,7 +73,7 @@ void perLightSun(out vec3 ambientOut, out vec3 diffuseOut, vec3 viewPos, vec3 vi
     vec3 lightDir = normalize(getLight[0].position.xyz);
 
 #if @lightingModel == LIGHTING_MODEL_SINGLE_UBO
-    uvec4 data = getLight[0].packedColors;
+    ivec4 data = getLight[0].packedColors;
     ambientOut = unpackRGB(data.y);
     vec3 sunDiffuse = unpackRGB(data.x);
 #else
@@ -122,7 +122,7 @@ void perLightPoint(out vec3 ambientOut, out vec3 diffuseOut, int lightIndex, vec
 #endif
 
 #if @useUBO
-    uvec4 data = getLight[lightIndex].packedColors;
+    ivec4 data = getLight[lightIndex].packedColors;
     ambientOut = unpackRGB(data.y) * illumination;
 #else
     ambientOut = getLight[lightIndex].ambient.xyz * illumination;

From 328ec85757b4dae0ca7b9466148781989c2bdfd6 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Sun, 28 Mar 2021 11:00:52 -0700
Subject: [PATCH 0569/2859] Code review cleanup, add setting documentation

---
 apps/openmw/engine.cpp                        |   1 -
 components/sceneutil/lightmanager.cpp         | 102 +++++++++---------
 .../reference/modding/settings/shaders.rst    |  63 +++++++++++
 files/shaders/objects_fragment.glsl           |   2 +-
 files/shaders/terrain_fragment.glsl           |   2 +-
 5 files changed, 117 insertions(+), 53 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 019e9f67a9..d7c315323d 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -31,7 +31,6 @@
 #include <components/compiler/extensions0.hpp>
 
 #include <components/sceneutil/workqueue.hpp>
-#include <components/sceneutil/lightmanager.hpp>
 
 #include <components/files/configurationmanager.hpp>
 
diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index d4275e5d28..3c1f31364f 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -16,7 +16,7 @@
 
 #include "apps/openmw/mwrender/vismask.hpp"
 
-namespace 
+namespace
 {
     /* similar to the boost::hash_combine */
     template <class T>
@@ -136,33 +136,35 @@ namespace SceneUtil
         switch (method)
         {
         case LightingMethod::FFP:
-            break;
+            {
+                break;
+            }
         case LightingMethod::PerObjectUniform:
-        {
-            stateset->addUniform(new osg::Uniform("LightBuffer[0].diffuse", light->getDiffuse()), mode);
-            stateset->addUniform(new osg::Uniform("LightBuffer[0].ambient", light->getAmbient()), mode);
-            stateset->addUniform(new osg::Uniform("LightBuffer[0].specular", light->getSpecular()), mode);
-            stateset->addUniform(new osg::Uniform("LightBuffer[0].position", light->getPosition()), mode);
+            {
+                stateset->addUniform(new osg::Uniform("LightBuffer[0].diffuse", light->getDiffuse()), mode);
+                stateset->addUniform(new osg::Uniform("LightBuffer[0].ambient", light->getAmbient()), mode);
+                stateset->addUniform(new osg::Uniform("LightBuffer[0].specular", light->getSpecular()), mode);
+                stateset->addUniform(new osg::Uniform("LightBuffer[0].position", light->getPosition()), mode);
 
-            break;
-        }
+                break;
+            }
         case LightingMethod::SingleUBO:
-        {
-            osg::ref_ptr<LightBuffer> buffer = new LightBuffer(1);
+            {
+                osg::ref_ptr<LightBuffer> buffer = new LightBuffer(1);
 
-            buffer->setDiffuse(0, light->getDiffuse());
-            buffer->setAmbient(0, light->getAmbient());
-            buffer->setSpecular(0, light->getSpecular());
-            buffer->setPosition(0, light->getPosition());
+                buffer->setDiffuse(0, light->getDiffuse());
+                buffer->setAmbient(0, light->getAmbient());
+                buffer->setSpecular(0, light->getSpecular());
+                buffer->setPosition(0, light->getPosition());
 
-            osg::ref_ptr<osg::UniformBufferObject> ubo = new osg::UniformBufferObject;
-            buffer->mData->setBufferObject(ubo);
-            osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(static_cast<int>(Shader::UBOBinding::LightBuffer), buffer->mData.get(), 0, buffer->mData->getTotalDataSize());
+                osg::ref_ptr<osg::UniformBufferObject> ubo = new osg::UniformBufferObject;
+                buffer->mData->setBufferObject(ubo);
+                osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(static_cast<int>(Shader::UBOBinding::LightBuffer), buffer->mData.get(), 0, buffer->mData->getTotalDataSize());
 
-            stateset->setAttributeAndModes(ubb, mode);
+                stateset->setAttributeAndModes(ubb, mode);
 
-            break;
-        }
+                break;
+            }
         }
     }
 
@@ -201,9 +203,9 @@ namespace SceneUtil
         void apply(osg::State& state) const override
         {
             int lightNum = GL_LIGHT0 + mIndex;
-            glLightfv( lightNum, GL_AMBIENT,               mnullptr.ptr() );
-            glLightfv( lightNum, GL_DIFFUSE,               mnullptr.ptr() );
-            glLightfv( lightNum, GL_SPECULAR,              mnullptr.ptr() );
+            glLightfv(lightNum, GL_AMBIENT, mnullptr.ptr());
+            glLightfv(lightNum, GL_DIFFUSE, mnullptr.ptr());
+            glLightfv(lightNum, GL_SPECULAR, mnullptr.ptr());
 
             LightStateCache* cache = getLightStateCache(state.getContextID());
             cache->lastAppliedLight[mIndex] = nullptr;
@@ -334,7 +336,7 @@ namespace SceneUtil
                     cache->lastAppliedLight[i] = mLights[i];
                 }
             }
-            
+
             state.applyModelViewMatrix(modelViewMatrix);
         }
 
@@ -344,7 +346,7 @@ namespace SceneUtil
     };
 
     struct StateSetGenerator
-    {  
+    {
         LightManager* mLightManager;
 
         virtual ~StateSetGenerator() {}
@@ -475,9 +477,9 @@ namespace SceneUtil
                 mLightManager = findLightManager(nv->getNodePath());
 
                 if (!mLightManager)
-                    throw std::runtime_error("can't find parent LightManager");                
+                    throw std::runtime_error("can't find parent LightManager");
             }
-            
+
             mLightManager->addLight(static_cast<LightSource*>(node), osg::computeLocalToWorld(nv->getNodePath()), nv->getTraversalNumber());
 
             traverse(node, nv);
@@ -523,7 +525,7 @@ namespace SceneUtil
                 mLastFrameNumber = cv->getTraversalNumber();
 
                 if (mLightManager->getLightingMethod() == LightingMethod::SingleUBO)
-                {   
+                {
                     auto stateset = mLightManager->getStateSet();
                     auto bo = mLightManager->getLightBuffer(mLastFrameNumber);
                     osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(static_cast<int>(Shader::UBOBinding::LightBuffer), bo->getData().get(), 0, bo->getData()->getTotalDataSize());
@@ -548,7 +550,7 @@ namespace SceneUtil
                         buf->setDiffuse(0, sun->getDiffuse());
                         buf->setAmbient(0, sun->getAmbient());
                         buf->setSpecular(0, sun->getSpecular());
-                        buf->setPosition(0, sun->getPosition() * (*cv->getCurrentRenderStage()->getInitialViewMatrix()));                           
+                        buf->setPosition(0, sun->getPosition() * (*cv->getCurrentRenderStage()->getInitialViewMatrix()));
                     }
                 }
             }
@@ -560,12 +562,12 @@ namespace SceneUtil
         LightManager* mLightManager;
         size_t mLastFrameNumber;
     };
-    
+
     class LightManagerStateAttribute : public osg::StateAttribute
     {
     public:
         LightManagerStateAttribute() : mLightManager(nullptr) {}
-        LightManagerStateAttribute(LightManager* lightManager) : mLightManager(lightManager) {} 
+        LightManagerStateAttribute(LightManager* lightManager) : mLightManager(lightManager) {}
 
         LightManagerStateAttribute(const LightManagerStateAttribute& copy,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY)
             : osg::StateAttribute(copy,copyop),mLightManager(copy.mLightManager) {}
@@ -595,7 +597,7 @@ namespace SceneUtil
         : mStartLight(0)
         , mLightingMask(~0u)
         , mSun(nullptr)
-        , mPointLightRadiusMultiplier(std::max(0.f, Settings::Manager::getFloat("light bounds multiplier", "Shaders")))
+        , mPointLightRadiusMultiplier(std::clamp(Settings::Manager::getFloat("light bounds multiplier", "Shaders"), 0.f, 10.f))
         , mPointLightFadeStart(0.f)
     {
         mPointLightFadeEnd = std::max(0.f, Settings::Manager::getFloat("maximum light distance", "Shaders"));
@@ -608,7 +610,7 @@ namespace SceneUtil
         auto lightingModelString = Settings::Manager::getString("lighting method", "Shaders");
         bool validLightingModel = isValidLightingModelString(lightingModelString);
         if (!validLightingModel)
-            Log(Debug::Error)   << "Invalid option for 'lighting model':  got '" << lightingModelString 
+            Log(Debug::Error)   << "Invalid option for 'lighting model':  got '" << lightingModelString
                                 << "',  expected legacy, default, or experimental.";
 
         if (ffp || !validLightingModel)
@@ -625,10 +627,10 @@ namespace SceneUtil
 
         osg::GLExtensions* exts = osg::GLExtensions::Get(0, false);
         bool supportsUBO = exts && exts->isUniformBufferObjectSupported;
-        bool supportsGPU4 = exts && exts->isGpuShader4Supported;    
+        bool supportsGPU4 = exts && exts->isGpuShader4Supported;
 
         if (!supportsUBO)
-            Log(Debug::Info) << "GL_ARB_uniform_buffer_object not supported: using fallback uniforms"; 
+            Log(Debug::Info) << "GL_ARB_uniform_buffer_object not supported: using fallback uniforms";
         else if (!supportsGPU4)
             Log(Debug::Info) << "GL_EXT_gpu_shader4 not supported: using fallback uniforms";
 
@@ -648,7 +650,7 @@ namespace SceneUtil
                 osg::ref_ptr<osg::Uniform> uambient = new osg::Uniform(osg::Uniform::FLOAT_VEC4, ("LightBuffer[" + std::to_string(i) + "].ambient").c_str());
                 osg::ref_ptr<osg::Uniform> uposition = new osg::Uniform(osg::Uniform::FLOAT_VEC4, ("LightBuffer[" + std::to_string(i) + "].position").c_str());
                 osg::ref_ptr<osg::Uniform> uattenuation = new osg::Uniform(osg::Uniform::FLOAT_VEC4, ("LightBuffer[" + std::to_string(i) + "].attenuation").c_str());
-                
+
                 mLightUniforms[i].emplace(UniformKey::Diffuse, udiffuse);
                 mLightUniforms[i].emplace(UniformKey::Ambient, uambient);
                 mLightUniforms[i].emplace(UniformKey::Specular, uspecular);
@@ -681,7 +683,7 @@ namespace SceneUtil
 
             stateset->setAttribute(new LightManagerStateAttribute(this), osg::StateAttribute::ON);
         }
-        
+
         stateset->addUniform(new osg::Uniform("PointLightCount", 0));
 
         setUpdateCallback(new LightManagerUpdateCallback);
@@ -720,10 +722,10 @@ namespace SceneUtil
     {
         mMaxLights = value;
     }
-    
+
     int LightManager::getMaxLightsInScene() const
     {
-        static constexpr int max = 16384 / LightBuffer::queryBlockSize(1);        
+        static constexpr int max = 16384 / LightBuffer::queryBlockSize(1);
         return  max;
     }
 
@@ -732,7 +734,7 @@ namespace SceneUtil
         Shader::ShaderManager::DefineMap defines;
 
         bool ffp = usingFFP();
-        
+
         defines["ffpLighting"] = ffp ? "1" : "0";
         defines["maxLights"] = std::to_string(getMaxLights());
         defines["maxLightsInScene"] = std::to_string(getMaxLightsInScene());
@@ -794,7 +796,7 @@ namespace SceneUtil
     }
 
     void LightManager::update(size_t frameNum)
-    {   
+    {
         getLightIndexMap(frameNum).clear();
         mLights.clear();
         mLightsInViewSpace.clear();
@@ -802,7 +804,7 @@ namespace SceneUtil
         // Do an occasional cleanup for orphaned lights.
         for (int i=0; i<2; ++i)
         {
-            if (mStateSetCache[i].size() > 5000) 
+            if (mStateSetCache[i].size() > 5000)
                 mStateSetCache[i].clear();
         }
     }
@@ -839,9 +841,9 @@ namespace SceneUtil
             auto id = lightList[i]->mLightSource->getId();
             hash_combine(hash, id);
 
-            if (getLightingMethod() != LightingMethod::SingleUBO) 
+            if (getLightingMethod() != LightingMethod::SingleUBO)
                 continue;
-            
+
             if (getLightIndexMap(frameNum).find(id) != getLightIndexMap(frameNum).end())
                 continue;
 
@@ -875,11 +877,11 @@ namespace SceneUtil
         if (it == mLightsInViewSpace.end())
         {
             it = mLightsInViewSpace.insert(std::make_pair(camPtr, LightSourceViewBoundCollection())).first;
-            
+
             for (const auto& transform : mLights)
             {
                 osg::Matrixf worldViewMat = transform.mWorldMatrix * (*viewMatrix);
-                
+
                 float radius = transform.mLightSource->getRadius();
 
                 osg::BoundingSphere viewBound = osg::BoundingSphere(osg::Vec3f(0,0,0), radius * mPointLightRadiusMultiplier);
@@ -901,7 +903,7 @@ namespace SceneUtil
                 LightSourceViewBound l;
                 l.mLightSource = transform.mLightSource;
                 l.mViewBound = viewBound;
-                it->second.push_back(l);  
+                it->second.push_back(l);
             }
         }
 
@@ -985,7 +987,7 @@ namespace SceneUtil
             // Don't use Camera::getViewMatrix, that one might be relative to another camera!
             const osg::RefMatrix* viewMatrix = cv->getCurrentRenderStage()->getInitialViewMatrix();
             const std::vector<LightManager::LightSourceViewBound>& lights = mLightManager->getLightsInViewSpace(cv->getCurrentCamera(), viewMatrix, mLastFrameNumber);
-            
+
             // get the node bounds in view space
             // NB do not node->getBound() * modelView, that would apply the node's transformation twice
             osg::BoundingSphere nodeBound;
@@ -1026,7 +1028,7 @@ namespace SceneUtil
                 for (auto it = lightList.begin(); it != lightList.end() && lightList.size() > maxLights; )
                 {
                     osg::CullStack::CullingStack& stack = cv->getModelViewCullingStack();
-                    
+
                     osg::BoundingSphere bs = (*it)->mViewBound;
                     bs._radius = bs._radius * 2.0;
                     osg::CullingSet& cullingSet = stack.front();
diff --git a/docs/source/reference/modding/settings/shaders.rst b/docs/source/reference/modding/settings/shaders.rst
index acc8482991..e1acd9411b 100644
--- a/docs/source/reference/modding/settings/shaders.rst
+++ b/docs/source/reference/modding/settings/shaders.rst
@@ -148,6 +148,69 @@ By default, the fog becomes thicker proportionally to your distance from the cli
 This setting makes the fog use the actual eye point distance (or so called Euclidean distance) to calculate the fog, which makes the fog look less artificial, especially if you have a wide FOV.
 Note that the rendering will act as if you have 'force shaders' option enabled with this on, which means that shaders will be used to render all objects and the terrain.
 
+lighting method
+---------------
+
+:Type:		string
+:Range:		legacy|default|experimental
+:Default:	default
+
+Sets the internal handling of light sources. 
+
+'legacy' is restricted to a maximum of 8 lights per object and guarantees fixed function pipeline compatible lighting.
+
+'default' removes the light limit via :ref:`max lights` and follows a new attenuation formula which can drastically reduce light popping and seams.
+It is recommended to use this mode with older hardware, as the technique ensures a range of compatibility equal to that of 'legacy'.
+
+'experimental' carries all of the benefits that 'legacy' has, but uses a modern approach that allows for a higher 'max lights' count with little to no performance penalties on modern hardware.
+
+light bounds multiplier
+-----------------------
+
+:Type:		float
+:Range:		0.0-10.0
+:Default:	2.0
+
+Controls the bounding sphere radius of point lights, which is used to determine if an object should receive lighting from a particular light source.
+Note, this has no direct effect on the overall illumination of lights.
+Larger multipliers will allow for smoother transitions of light sources, but may require an increase in :ref:`max lights` and thus carries a performance penalty.
+This especially helps with abrupt light popping with handheld light sources such as torches and lanterns.
+
+It is recommended to keep this at 1.0 if :ref:`lighting method` is set to 'legacy', as the number of lights is fixed in that mode.
+
+maximum light distance
+----------------------
+
+:Type:		float
+:Range:		The whole range of 32-bit floating point
+:Default:	8192
+
+The maximum distance from the camera that lights will be illuminated, applies to both interiors and exteriors.
+A lower distance will improve performance.
+Set this to a non-positive value to disable fading.
+
+light fade start
+----------------
+
+:Type:		float
+:Range:		0.0-1.0
+:Default:	0.85
+
+The fraction of the maximum distance at which lights will begin to fade away.
+Tweaking it will make the transition proportionally more or less smooth.
+This setting has no effect if the maximum light distance is non-positive.
+
+max lights
+----------
+
+:Type:		integer
+:Range:		>=2
+:Default:	16
+
+Sets the maximum number of lights that each object can receive lighting from.
+Has no effect if :ref:`force shaders` option is off or :ref:`lighting method` is 'legacy'. In this case the maximum number of lights is fixed at 8.
+Increasing this too much can cause significant performance loss, especially if :ref:`lighting method` is not set to 'experimental' or :ref:`force per pixel lighting` is on. 
+
 antialias alpha test
 ---------------------------------------
 
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index e26d0f44cd..615b57a8a2 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -76,8 +76,8 @@ varying vec3 passNormal;
 
 #include "vertexcolors.glsl"
 #include "shadows_fragment.glsl"
-#include "parallax.glsl"
 #include "lighting.glsl"
+#include "parallax.glsl"
 #include "alpha.glsl"
 
 void main()
diff --git a/files/shaders/terrain_fragment.glsl b/files/shaders/terrain_fragment.glsl
index a8bf735528..6a7ac0bcc4 100644
--- a/files/shaders/terrain_fragment.glsl
+++ b/files/shaders/terrain_fragment.glsl
@@ -34,8 +34,8 @@ varying vec3 passNormal;
 
 #include "vertexcolors.glsl"
 #include "shadows_fragment.glsl"
-#include "parallax.glsl"
 #include "lighting.glsl"
+#include "parallax.glsl"
 
 void main()
 {

From 08b568128416d7e16211993f555a1ac79ee557a9 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Sun, 28 Mar 2021 11:06:00 -0700
Subject: [PATCH 0570/2859] Missed redundant formatting changes

---
 files/shaders/objects_vertex.glsl | 1 +
 files/shaders/terrain_vertex.glsl | 1 +
 2 files changed, 2 insertions(+)

diff --git a/files/shaders/objects_vertex.glsl b/files/shaders/objects_vertex.glsl
index 104f42c09c..7baaa4176a 100644
--- a/files/shaders/objects_vertex.glsl
+++ b/files/shaders/objects_vertex.glsl
@@ -60,6 +60,7 @@ varying vec3 passNormal;
 
 #include "vertexcolors.glsl"
 #include "shadows_vertex.glsl"
+
 #include "lighting.glsl"
 
 void main(void)
diff --git a/files/shaders/terrain_vertex.glsl b/files/shaders/terrain_vertex.glsl
index 2bf74a0e12..ad1201b932 100644
--- a/files/shaders/terrain_vertex.glsl
+++ b/files/shaders/terrain_vertex.glsl
@@ -23,6 +23,7 @@ varying vec3 passNormal;
 
 #include "vertexcolors.glsl"
 #include "shadows_vertex.glsl"
+
 #include "lighting.glsl"
 
 void main(void)

From 142c6d2993141a65d3d1cb37b312beddac638590 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Sun, 28 Mar 2021 16:46:51 -0700
Subject: [PATCH 0571/2859] Enable groundcover lighting for non FFP

---
 apps/openmw/mwrender/groundcover.cpp               | 3 +++
 docs/source/reference/modding/settings/shaders.rst | 1 +
 2 files changed, 4 insertions(+)

diff --git a/apps/openmw/mwrender/groundcover.cpp b/apps/openmw/mwrender/groundcover.cpp
index 0baa85c52a..fd22462539 100644
--- a/apps/openmw/mwrender/groundcover.cpp
+++ b/apps/openmw/mwrender/groundcover.cpp
@@ -5,6 +5,7 @@
 #include <osg/VertexAttribDivisor>
 
 #include <components/esm/esmreader.hpp>
+#include <components/sceneutil/lightmanager.hpp>
 
 #include "apps/openmw/mwworld/esmstore.hpp"
 #include "apps/openmw/mwbase/environment.hpp"
@@ -271,6 +272,8 @@ namespace MWRender
         group->getOrCreateStateSet()->setAttributeAndModes(alpha.get(), osg::StateAttribute::ON);
         group->getBound();
         group->setNodeMask(Mask_Groundcover);
+        if (mSceneManager->getLightingMethod() != SceneUtil::LightingMethod::FFP)
+            group->setCullCallback(new SceneUtil::LightListCallback);
         mSceneManager->recreateShaders(group, "groundcover", false, true);
 
         return group;
diff --git a/docs/source/reference/modding/settings/shaders.rst b/docs/source/reference/modding/settings/shaders.rst
index e1acd9411b..6af5e9ba02 100644
--- a/docs/source/reference/modding/settings/shaders.rst
+++ b/docs/source/reference/modding/settings/shaders.rst
@@ -160,6 +160,7 @@ Sets the internal handling of light sources.
 'legacy' is restricted to a maximum of 8 lights per object and guarantees fixed function pipeline compatible lighting.
 
 'default' removes the light limit via :ref:`max lights` and follows a new attenuation formula which can drastically reduce light popping and seams.
+This mode also enables vertex lighting on groundcover, which is otherwise completely disabled with 'legacy'.
 It is recommended to use this mode with older hardware, as the technique ensures a range of compatibility equal to that of 'legacy'.
 
 'experimental' carries all of the benefits that 'legacy' has, but uses a modern approach that allows for a higher 'max lights' count with little to no performance penalties on modern hardware.

From 690995988bd4f0251ebb2de0a71aa6813566139e Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Mon, 29 Mar 2021 00:13:35 -0700
Subject: [PATCH 0572/2859] More formatting, OpenCS cells are unbroken

---
 apps/opencs/model/world/data.cpp              |   2 +-
 apps/openmw/mwrender/renderingmanager.cpp     |  10 +-
 components/sceneutil/lightmanager.cpp         | 257 +++++++++++-------
 components/sceneutil/lightmanager.hpp         |  26 +-
 components/shader/shadermanager.cpp           |   1 -
 .../reference/modding/settings/shaders.rst    |  68 +++--
 files/settings-default.cfg                    |  31 ++-
 files/shaders/lighting.glsl                   |  14 +-
 files/shaders/water_fragment.glsl             |   2 +
 9 files changed, 252 insertions(+), 159 deletions(-)

diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 25ac051f41..31778b9047 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -83,7 +83,7 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding, bool fsStrict, const Files::Pat
     defines["clamp"] = "1"; // Clamp lighting
     defines["preLightEnv"] = "0"; // Apply environment maps after lighting like Morrowind
     defines["radialFog"] = "0";
-    defines["ffpLighting"] = "0";
+    defines["ffpLighting"] = "1";
     for (const auto& define : shadowDefines)
         defines[define.first] = define.second;
     mResourceSystem->getSceneManager()->getShaderManager().setGlobalDefines(defines);
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 79f34c42ed..229c34f452 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -199,8 +199,8 @@ namespace MWRender
         , mFieldOfViewOverridden(false)
         , mFieldOfViewOverride(0.f)
     {
-        auto lightingModelString = Settings::Manager::getString("lighting method", "Shaders");
-        bool usingFFPLighting = lightingModelString == "legacy" && SceneUtil::LightManager::isValidLightingModelString(lightingModelString);
+        auto lightingMethod = SceneUtil::LightManager::getLightingMethodFromString(Settings::Manager::getString("lighting method", "Shaders"));
+        bool usingFFPLighting = lightingMethod == SceneUtil::LightingMethod::FFP;
 
         resourceSystem->getSceneManager()->setParticleSystemMask(MWRender::Mask_ParticleSystem);
         resourceSystem->getSceneManager()->setShaderPath(resourcePath + "/shaders");
@@ -217,9 +217,9 @@ namespace MWRender
         resourceSystem->getSceneManager()->setSpecularMapPattern(Settings::Manager::getString("specular map pattern", "Shaders"));
         resourceSystem->getSceneManager()->setApplyLightingToEnvMaps(Settings::Manager::getBool("apply lighting to environment maps", "Shaders"));
         resourceSystem->getSceneManager()->setConvertAlphaTestToAlphaToCoverage(Settings::Manager::getBool("antialias alpha test", "Shaders") && Settings::Manager::getInt("antialiasing", "Video") > 1);
-        
+
         osg::ref_ptr<SceneUtil::LightManager> sceneRoot = new SceneUtil::LightManager(!forceShaders || usingFFPLighting);
-        // Let LightManager choose which backend to use based, mostly depends on support for UBOs 
+        // Let LightManager choose which backend to use based on our hint, mostly depends on support for UBOs
         resourceSystem->getSceneManager()->getShaderManager().setLightingMethod(sceneRoot->getLightingMethod());
         resourceSystem->getSceneManager()->setLightingMethod(sceneRoot->getLightingMethod());
 
@@ -262,7 +262,7 @@ namespace MWRender
         float groundcoverDistance = (Constants::CellSizeInUnits * std::max(1, Settings::Manager::getInt("distance", "Groundcover")) - 1024) * 0.93;
         globalDefines["groundcoverFadeStart"] = std::to_string(groundcoverDistance * 0.9f);
         globalDefines["groundcoverFadeEnd"] = std::to_string(groundcoverDistance);
-        
+
         // It is unnecessary to stop/start the viewer as no frames are being rendered yet.
         mResourceSystem->getSceneManager()->getShaderManager().setGlobalDefines(globalDefines);
 
diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 3c1f31364f..72470b8c2c 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -14,8 +14,6 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include "apps/openmw/mwrender/vismask.hpp"
-
 namespace
 {
     /* similar to the boost::hash_combine */
@@ -28,7 +26,8 @@ namespace
 
     bool sortLights(const SceneUtil::LightManager::LightSourceViewBound* left, const SceneUtil::LightManager::LightSourceViewBound* right)
     {
-        return left->mViewBound.center().length2() - left->mViewBound.radius2()*81 < right->mViewBound.center().length2() - right->mViewBound.radius2()*81;
+        static auto constexpr illuminationBias = 81.f;
+        return left->mViewBound.center().length2() - left->mViewBound.radius2()*illuminationBias < right->mViewBound.center().length2() - right->mViewBound.radius2()*illuminationBias;
     }
 
     float getLightRadius(const osg::Light* light)
@@ -99,8 +98,15 @@ namespace SceneUtil
             return (*mData)[3*index+1];
         }
 
-        auto& getData() { return mData; }
-        void dirty() { mData->dirty(); }
+        auto& getData()
+        {
+            return mData;
+        }
+
+        void dirty()
+        {
+            mData->dirty();
+        }
 
         static constexpr int queryBlockSize(int sz)
         {
@@ -135,6 +141,7 @@ namespace SceneUtil
     {
         switch (method)
         {
+        case LightingMethod::Undefined:
         case LightingMethod::FFP:
             {
                 break;
@@ -232,7 +239,7 @@ namespace SceneUtil
 
         bool getModeUsage(ModeUsage & usage) const override
         {
-            for (size_t i=0; i<mLights.size(); ++i)
+            for (size_t i = 0; i < mLights.size(); ++i)
                 usage.usesMode(GL_LIGHT0 + mIndex + i);
             return true;
         }
@@ -254,7 +261,7 @@ namespace SceneUtil
 
             LightStateCache* cache = getLightStateCache(state.getContextID());
 
-            for (size_t i=0; i<mLights.size(); ++i)
+            for (size_t i = 0; i < mLights.size(); ++i)
             {
                 osg::Light* current = cache->lastAppliedLight[i+mIndex];
                 if (current != mLights[i].get())
@@ -269,29 +276,28 @@ namespace SceneUtil
 
         void applyLight(GLenum lightNum, const osg::Light* light) const
         {
-            glLightfv( lightNum, GL_AMBIENT,               light->getAmbient().ptr() );
-            glLightfv( lightNum, GL_DIFFUSE,               light->getDiffuse().ptr() );
-            glLightfv( lightNum, GL_SPECULAR,              light->getSpecular().ptr() );
-            glLightfv( lightNum, GL_POSITION,              light->getPosition().ptr() );
+            glLightfv(lightNum, GL_AMBIENT, light->getAmbient().ptr());
+            glLightfv(lightNum, GL_DIFFUSE, light->getDiffuse().ptr());
+            glLightfv(lightNum, GL_SPECULAR, light->getSpecular().ptr());
+            glLightfv(lightNum, GL_POSITION, light->getPosition().ptr());
             // TODO: enable this once spot lights are supported
             // need to transform SPOT_DIRECTION by the world matrix?
-            //glLightfv( lightNum, GL_SPOT_DIRECTION,        light->getDirection().ptr() );
-            //glLightf ( lightNum, GL_SPOT_EXPONENT,         light->getSpotExponent() );
-            //glLightf ( lightNum, GL_SPOT_CUTOFF,           light->getSpotCutoff() );
-            glLightf ( lightNum, GL_CONSTANT_ATTENUATION,  light->getConstantAttenuation() );
-            glLightf ( lightNum, GL_LINEAR_ATTENUATION,    light->getLinearAttenuation() );
-            glLightf ( lightNum, GL_QUADRATIC_ATTENUATION, light->getQuadraticAttenuation() );
+            //glLightfv(lightNum, GL_SPOT_DIRECTION, light->getDirection().ptr());
+            //glLightf(lightNum, GL_SPOT_EXPONENT, light->getSpotExponent());
+            //glLightf(lightNum, GL_SPOT_CUTOFF, light->getSpotCutoff());
+            glLightf(lightNum, GL_CONSTANT_ATTENUATION, light->getConstantAttenuation());
+            glLightf(lightNum, GL_LINEAR_ATTENUATION, light->getLinearAttenuation());
+            glLightf(lightNum, GL_QUADRATIC_ATTENUATION, light->getQuadraticAttenuation());
         }
 
     private:
         size_t mIndex;
-
         std::vector<osg::ref_ptr<osg::Light>> mLights;
     };
 
     LightManager* findLightManager(const osg::NodePath& path)
     {
-        for (size_t i=0;i<path.size(); ++i)
+        for (size_t i = 0; i < path.size(); ++i)
         {
             if (LightManager* lightManager = dynamic_cast<LightManager*>(path[i]))
                 return lightManager;
@@ -406,8 +412,8 @@ namespace SceneUtil
             return stateset;
         }
 
-        // Cached statesets must be re-validated in case the light indicies change. There is no actual link between
-        // a lights ID and the buffer index it will eventually be assigned (or reassigned) to.
+        // Cached statesets must be revalidated in case the light indices change. There is no actual link between
+        // a light's ID and the buffer index it will eventually be assigned (or reassigned) to.
         void update(osg::StateSet* stateset, const LightManager::LightList& lightList, size_t frameNum) override
         {
             int newCount = 0;
@@ -587,104 +593,88 @@ namespace SceneUtil
         LightManager* mLightManager;
     };
 
+    const std::unordered_map<std::string, LightingMethod> LightManager::mLightingMethodSettingMap = {
+         {"legacy", LightingMethod::FFP}
+        ,{"shaders compatibility", LightingMethod::PerObjectUniform}
+        ,{"shaders", LightingMethod::SingleUBO}
+    };
+
     bool LightManager::isValidLightingModelString(const std::string& value)
     {
-        static const std::unordered_set<std::string> validLightingModels = {"legacy", "default", "experimental"};
-        return validLightingModels.count(value) != 0;
+        return LightManager::mLightingMethodSettingMap.find(value) != LightManager::mLightingMethodSettingMap.end();
+    }
+
+    LightingMethod LightManager::getLightingMethodFromString(const std::string& value)
+    {
+        auto it = LightManager::mLightingMethodSettingMap.find(value);
+        if (it != LightManager::mLightingMethodSettingMap.end())
+            return it->second;
+        else
+            return LightingMethod::Undefined;
     }
 
     LightManager::LightManager(bool ffp)
         : mStartLight(0)
         , mLightingMask(~0u)
         , mSun(nullptr)
-        , mPointLightRadiusMultiplier(std::clamp(Settings::Manager::getFloat("light bounds multiplier", "Shaders"), 0.f, 10.f))
+        , mPointLightRadiusMultiplier(1.f)
+        , mPointLightFadeEnd(0.f)
         , mPointLightFadeStart(0.f)
     {
-        mPointLightFadeEnd = std::max(0.f, Settings::Manager::getFloat("maximum light distance", "Shaders"));
-        if (mPointLightFadeEnd > 0)
+        if (ffp)
         {
-            mPointLightFadeStart = std::clamp(Settings::Manager::getFloat("light fade start", "Shaders"), 0.f, 1.f);
-            mPointLightFadeStart = mPointLightFadeEnd * mPointLightFadeStart;
+            setLightingMethod(LightingMethod::FFP);
+            initFFP(LightManager::mFFPMaxLights);
+            return;
         }
 
-        auto lightingModelString = Settings::Manager::getString("lighting method", "Shaders");
-        bool validLightingModel = isValidLightingModelString(lightingModelString);
-        if (!validLightingModel)
-            Log(Debug::Error)   << "Invalid option for 'lighting model':  got '" << lightingModelString
-                                << "',  expected legacy, default, or experimental.";
-
-        if (ffp || !validLightingModel)
+        std::string lightingMethodString = Settings::Manager::getString("lighting method", "Shaders");
+        auto lightingMethod = LightManager::getLightingMethodFromString(lightingMethodString);
+        if (lightingMethod == LightingMethod::Undefined)
         {
-            setMaxLights(LightManager::mFFPMaxLights);
-            setLightingMethod(LightingMethod::FFP);
+            Log(Debug::Error) << "Invalid option for 'lighting method': got '" << lightingMethodString
+                              << "', expected legacy, shaders compatible, or shaders. Falling back to 'shaders compatible'.";
+            setLightingMethod(LightingMethod::PerObjectUniform);
+        }
+        else
+        {
+            setLightingMethod(lightingMethod);
+        }
 
-            for (int i=0; i<getMaxLights(); ++i)
-                mDummies.push_back(new FFPLightStateAttribute(i, std::vector<osg::ref_ptr<osg::Light> >()));
+        mPointLightRadiusMultiplier = std::clamp(Settings::Manager::getFloat("light bounds multiplier", "Shaders"), 0.f, 10.f);
 
-            setUpdateCallback(new LightManagerUpdateCallback);
-            return;
+        mPointLightFadeEnd = std::max(0.f, Settings::Manager::getFloat("maximum light distance", "Shaders"));
+        if (mPointLightFadeEnd > 0)
+        {
+            mPointLightFadeStart = std::clamp(Settings::Manager::getFloat("light fade start", "Shaders"), 0.f, 1.f);
+            mPointLightFadeStart = mPointLightFadeEnd * mPointLightFadeStart;
         }
 
         osg::GLExtensions* exts = osg::GLExtensions::Get(0, false);
         bool supportsUBO = exts && exts->isUniformBufferObjectSupported;
         bool supportsGPU4 = exts && exts->isGpuShader4Supported;
 
-        if (!supportsUBO)
-            Log(Debug::Info) << "GL_ARB_uniform_buffer_object not supported: using fallback uniforms";
-        else if (!supportsGPU4)
-            Log(Debug::Info) << "GL_EXT_gpu_shader4 not supported: using fallback uniforms";
+        if (getLightingMethod() == LightingMethod::SingleUBO)
+        {
+            if (!supportsUBO)
+                Log(Debug::Info) << "GL_ARB_uniform_buffer_object not supported: using fallback uniforms";
+            else if (!supportsGPU4)
+                Log(Debug::Info) << "GL_EXT_gpu_shader4 not supported: using fallback uniforms";
+        }
 
         int targetLights = Settings::Manager::getInt("max lights", "Shaders");
-        auto* stateset = getOrCreateStateSet();
 
-        if (!supportsUBO || !supportsGPU4 || lightingModelString == "default")
+        if (!supportsUBO || !supportsGPU4 || getLightingMethod() == LightingMethod::PerObjectUniform)
         {
             setLightingMethod(LightingMethod::PerObjectUniform);
-            setMaxLights(std::max(2, targetLights));
-
-            mLightUniforms.resize(getMaxLights()+1);
-            for (size_t i = 0; i < mLightUniforms.size(); ++i)
-            {
-                osg::ref_ptr<osg::Uniform> udiffuse = new osg::Uniform(osg::Uniform::FLOAT_VEC4, ("LightBuffer[" + std::to_string(i) + "].diffuse").c_str());
-                osg::ref_ptr<osg::Uniform> uspecular = new osg::Uniform(osg::Uniform::FLOAT_VEC4, ("LightBuffer[" + std::to_string(i) + "].specular").c_str());
-                osg::ref_ptr<osg::Uniform> uambient = new osg::Uniform(osg::Uniform::FLOAT_VEC4, ("LightBuffer[" + std::to_string(i) + "].ambient").c_str());
-                osg::ref_ptr<osg::Uniform> uposition = new osg::Uniform(osg::Uniform::FLOAT_VEC4, ("LightBuffer[" + std::to_string(i) + "].position").c_str());
-                osg::ref_ptr<osg::Uniform> uattenuation = new osg::Uniform(osg::Uniform::FLOAT_VEC4, ("LightBuffer[" + std::to_string(i) + "].attenuation").c_str());
-
-                mLightUniforms[i].emplace(UniformKey::Diffuse, udiffuse);
-                mLightUniforms[i].emplace(UniformKey::Ambient, uambient);
-                mLightUniforms[i].emplace(UniformKey::Specular, uspecular);
-                mLightUniforms[i].emplace(UniformKey::Position, uposition);
-                mLightUniforms[i].emplace(UniformKey::Attenuation, uattenuation);
-
-                stateset->addUniform(udiffuse);
-                stateset->addUniform(uambient);
-                stateset->addUniform(uposition);
-                stateset->addUniform(uattenuation);
-
-                // specular isn't used besides sun, complete waste to upload it
-                if (i == 0)
-                    stateset->addUniform(uspecular);
-            }
+            initPerObjectUniform(targetLights);
         }
         else
         {
-            setLightingMethod(LightingMethod::SingleUBO);
-            setMaxLights(std::clamp(targetLights, 2, getMaxLightsInScene() / 2));
-
-            for (int i = 0; i < 2; ++i)
-            {
-                mLightBuffers[i] = new LightBuffer(getMaxLightsInScene());
-                osg::ref_ptr<osg::UniformBufferObject> ubo = new osg::UniformBufferObject;
-                ubo->setUsage(GL_STREAM_DRAW);
-
-                mLightBuffers[i]->getData()->setBufferObject(ubo);
-            }
-
-            stateset->setAttribute(new LightManagerStateAttribute(this), osg::StateAttribute::ON);
+            initSingleUBO(targetLights);
         }
 
-        stateset->addUniform(new osg::Uniform("PointLightCount", 0));
+        getOrCreateStateSet()->addUniform(new osg::Uniform("PointLightCount", 0));
 
         setUpdateCallback(new LightManagerUpdateCallback);
         addCullCallback(new LightManagerCullCallback(this));
@@ -726,7 +716,7 @@ namespace SceneUtil
     int LightManager::getMaxLightsInScene() const
     {
         static constexpr int max = 16384 / LightBuffer::queryBlockSize(1);
-        return  max;
+        return max;
     }
 
     Shader::ShaderManager::DefineMap LightManager::getLightDefines() const
@@ -746,6 +736,66 @@ namespace SceneUtil
         return defines;
     }
 
+    void LightManager::initFFP(int targetLights)
+    {
+        setMaxLights(targetLights);
+
+        for (int i = 0; i < getMaxLights(); ++i)
+            mDummies.push_back(new FFPLightStateAttribute(i, std::vector<osg::ref_ptr<osg::Light>>()));
+
+        setUpdateCallback(new LightManagerUpdateCallback);
+    }
+
+    void LightManager::initPerObjectUniform(int targetLights)
+    {
+        auto* stateset = getOrCreateStateSet();
+
+        setMaxLights(std::max(2, targetLights));
+
+        mLightUniforms.resize(getMaxLights()+1);
+        for (size_t i = 0; i < mLightUniforms.size(); ++i)
+        {
+            osg::ref_ptr<osg::Uniform> udiffuse = new osg::Uniform(osg::Uniform::FLOAT_VEC4, ("LightBuffer[" + std::to_string(i) + "].diffuse").c_str());
+            osg::ref_ptr<osg::Uniform> uspecular = new osg::Uniform(osg::Uniform::FLOAT_VEC4, ("LightBuffer[" + std::to_string(i) + "].specular").c_str());
+            osg::ref_ptr<osg::Uniform> uambient = new osg::Uniform(osg::Uniform::FLOAT_VEC4, ("LightBuffer[" + std::to_string(i) + "].ambient").c_str());
+            osg::ref_ptr<osg::Uniform> uposition = new osg::Uniform(osg::Uniform::FLOAT_VEC4, ("LightBuffer[" + std::to_string(i) + "].position").c_str());
+            osg::ref_ptr<osg::Uniform> uattenuation = new osg::Uniform(osg::Uniform::FLOAT_VEC4, ("LightBuffer[" + std::to_string(i) + "].attenuation").c_str());
+
+            mLightUniforms[i].emplace(UniformKey::Diffuse, udiffuse);
+            mLightUniforms[i].emplace(UniformKey::Ambient, uambient);
+            mLightUniforms[i].emplace(UniformKey::Specular, uspecular);
+            mLightUniforms[i].emplace(UniformKey::Position, uposition);
+            mLightUniforms[i].emplace(UniformKey::Attenuation, uattenuation);
+
+            stateset->addUniform(udiffuse);
+            stateset->addUniform(uambient);
+            stateset->addUniform(uposition);
+            stateset->addUniform(uattenuation);
+
+            // specular isn't used besides sun, complete waste to upload it
+            if (i == 0)
+                stateset->addUniform(uspecular);
+        }
+    }
+
+    void LightManager::initSingleUBO(int targetLights)
+    {
+        setMaxLights(std::clamp(targetLights, 2, getMaxLightsInScene() / 2));
+
+        for (int i = 0; i < 2; ++i)
+        {
+            mLightBuffers[i] = new LightBuffer(getMaxLightsInScene());
+
+            osg::ref_ptr<osg::UniformBufferObject> ubo = new osg::UniformBufferObject;
+            ubo->setUsage(GL_STREAM_DRAW);
+
+            mLightBuffers[i]->getData()->setBufferObject(ubo);
+        }
+
+        getOrCreateStateSet()->setAttribute(new LightManagerStateAttribute(this), osg::StateAttribute::ON);
+    }
+
+
     void LightManager::setLightingMethod(LightingMethod method)
     {
         mLightingMethod = method;
@@ -760,6 +810,9 @@ namespace SceneUtil
         case LightingMethod::PerObjectUniform:
             mStateSetGenerator = std::make_unique<StateSetGeneratorPerObjectUniform>();
             break;
+        case LightingMethod::Undefined:
+            mStateSetGenerator = nullptr;
+            break;
         }
         mStateSetGenerator->mLightManager = this;
     }
@@ -783,7 +836,7 @@ namespace SceneUtil
         // Set default light state to zero
         // This is necessary because shaders don't respect glDisable(GL_LIGHTX) so in addition to disabling
         // we'll have to set a light state that has no visible effect
-        for (int i=start; i<getMaxLights(); ++i)
+        for (int i = start; i <  getMaxLights(); ++i)
         {
             osg::ref_ptr<DisableLight> defaultLight (new DisableLight(i));
             getOrCreateStateSet()->setAttributeAndModes(defaultLight, osg::StateAttribute::OFF);
@@ -802,7 +855,7 @@ namespace SceneUtil
         mLightsInViewSpace.clear();
 
         // Do an occasional cleanup for orphaned lights.
-        for (int i=0; i<2; ++i)
+        for (int i = 0; i < 2; ++i)
         {
             if (mStateSetCache[i].size() > 5000)
                 mStateSetCache[i].clear();
@@ -836,7 +889,7 @@ namespace SceneUtil
     {
         // possible optimization: return a StateSet containing all requested lights plus some extra lights (if a suitable one exists)
         size_t hash = 0;
-        for (size_t i=0; i<lightList.size();++i)
+        for (size_t i = 0; i < lightList.size(); ++i)
         {
             auto id = lightList[i]->mLightSource->getId();
             hash_combine(hash, id);
@@ -860,13 +913,10 @@ namespace SceneUtil
             mStateSetGenerator->update(found->second, lightList, frameNum);
             return found->second;
         }
-        else
-        {
-            auto stateset = mStateSetGenerator->generate(lightList, frameNum);
-            stateSetCache.emplace(hash, stateset);
-            return stateset;
-        }
-        return new osg::StateSet;
+
+        auto stateset = mStateSetGenerator->generate(lightList, frameNum);
+        stateSetCache.emplace(hash, stateset);
+        return stateset;
     }
 
     const std::vector<LightManager::LightSourceViewBound>& LightManager::getLightsInViewSpace(osg::Camera *camera, const osg::RefMatrix* viewMatrix, size_t frameNum)
@@ -946,7 +996,7 @@ namespace SceneUtil
     {
         mId = sLightId++;
 
-        for (int i=0; i<2; ++i)
+        for (int i = 0; i < 2; ++i)
             mLight[i] = new osg::Light(*copy.mLight[i].get(), copyop);
     }
 
@@ -981,7 +1031,6 @@ namespace SceneUtil
         // makes sure we don't update it more than once per frame when rendering with multiple cameras
         if (mLastFrameNumber != cv->getTraversalNumber())
         {
-
             mLastFrameNumber = cv->getTraversalNumber();
 
             // Don't use Camera::getViewMatrix, that one might be relative to another camera!
@@ -994,7 +1043,7 @@ namespace SceneUtil
             osg::Transform* transform = node->asTransform();
             if (transform)
             {
-                for (size_t i=0; i<transform->getNumChildren(); ++i)
+                for (size_t i = 0; i < transform->getNumChildren(); ++i)
                     nodeBound.expandBy(transform->getChild(i)->getBound());
             }
             else
@@ -1003,7 +1052,7 @@ namespace SceneUtil
             transformBoundingSphere(mat, nodeBound);
 
             mLightList.clear();
-            for (size_t i=0; i<lights.size(); ++i)
+            for (size_t i = 0; i < lights.size(); ++i)
             {
                 const LightManager::LightSourceViewBound& l = lights[i];
 
@@ -1014,7 +1063,6 @@ namespace SceneUtil
                     mLightList.push_back(&l);
             }
         }
-
         if (!mLightList.empty())
         {
             size_t maxLights = mLightManager->getMaxLights() - mLightManager->getStartLight();
@@ -1025,7 +1073,7 @@ namespace SceneUtil
             {
                 // remove lights culled by this camera
                 LightManager::LightList lightList = mLightList;
-                for (auto it = lightList.begin(); it != lightList.end() && lightList.size() > maxLights; )
+                for (auto it = lightList.begin(); it != lightList.end() && lightList.size() > maxLights;)
                 {
                     osg::CullStack::CullingStack& stack = cv->getModelViewCullingStack();
 
@@ -1053,6 +1101,7 @@ namespace SceneUtil
             else
                 stateset = mLightManager->getLightListStateSet(mLightList, cv->getTraversalNumber(), cv->getCurrentRenderStage()->getInitialViewMatrix());
 
+
             cv->pushStateSet(stateset);
             return true;
         }
diff --git a/components/sceneutil/lightmanager.hpp b/components/sceneutil/lightmanager.hpp
index 214ffa1385..cd8f2d3127 100644
--- a/components/sceneutil/lightmanager.hpp
+++ b/components/sceneutil/lightmanager.hpp
@@ -2,12 +2,12 @@
 #define OPENMW_COMPONENTS_SCENEUTIL_LIGHTMANAGER_H
 
 #include <set>
-#include <cassert>
-#include <unordered_map>
 #include <unordered_set>
+#include <unordered_map>
 #include <memory>
 
 #include <osg/Light>
+
 #include <osg/Group>
 #include <osg/NodeVisitor>
 #include <osg/observer_ptr>
@@ -18,6 +18,7 @@ namespace osgUtil
 {
     class CullVisitor;
 }
+
 namespace SceneUtil
 {
     class LightBuffer;
@@ -27,7 +28,8 @@ namespace SceneUtil
     {
         FFP,
         SingleUBO,
-        PerObjectUniform
+        PerObjectUniform,
+        Undefined
     };
 
     void configureStateSetSunOverride(LightingMethod method, const osg::Light* light, osg::StateSet* stateset, int mode = osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
@@ -98,8 +100,8 @@ namespace SceneUtil
     class LightManager : public osg::Group
     {
     public:
-
         static bool isValidLightingModelString(const std::string& value);
+        static LightingMethod getLightingMethodFromString(const std::string& value);
 
         enum class UniformKey
         {
@@ -136,7 +138,7 @@ namespace SceneUtil
         /// By default, it's ~0u i.e. always on.
         /// If you have some views that do not require lighting, then set the Camera's cull mask to not include
         /// the lightingMask for a much faster cull and rendering.
-        void setLightingMask (size_t mask);
+        void setLightingMask(size_t mask);
         size_t getLightingMask() const;
 
         /// Set the first light index that should be used by this manager, typically the number of directional lights in the scene.
@@ -167,7 +169,7 @@ namespace SceneUtil
         auto& getDummies() { return mDummies; }
 
         auto& getLightIndexMap(size_t frameNum) { return mLightIndexMaps[frameNum%2]; }
-        
+
         auto& getLightBuffer(size_t frameNum) { return mLightBuffers[frameNum%2]; }
 
         auto& getLightUniform(int index, UniformKey key) { return mLightUniforms[index][key]; }
@@ -175,10 +177,13 @@ namespace SceneUtil
         std::map<std::string, std::string> getLightDefines() const;
 
     private:
-
         friend class LightManagerStateAttribute;
         friend class LightManagerCullCallback;
 
+        void initFFP(int targetLights);
+        void initPerObjectUniform(int targetLights);
+        void initSingleUBO(int targetLights);
+
         void setLightingMethod(LightingMethod method);
         void setMaxLights(int value);
 
@@ -188,7 +193,7 @@ namespace SceneUtil
 
         using LightSourceViewBoundCollection = std::vector<LightSourceViewBound>;
         std::map<osg::observer_ptr<osg::Camera>, LightSourceViewBoundCollection> mLightsInViewSpace;
-        
+
         // < Light list hash , StateSet >
         using LightStateSetMap = std::map<size_t, osg::ref_ptr<osg::StateSet>>;
         LightStateSetMap mStateSetCache[2];
@@ -221,6 +226,8 @@ namespace SceneUtil
         int mMaxLights;
 
         static constexpr auto mFFPMaxLights = 8;
+
+        static const std::unordered_map<std::string, LightingMethod> mLightingMethodSettingMap;
     };
 
     /// To receive lighting, objects must be decorated by a LightListCallback. Light list callbacks must be added via
@@ -259,7 +266,8 @@ namespace SceneUtil
         size_t mLastFrameNumber;
         LightManager::LightList mLightList;
         std::set<SceneUtil::LightSource*> mIgnoredLightSources;
-    }; 
+    };
+
 }
 
 #endif
diff --git a/components/shader/shadermanager.cpp b/components/shader/shadermanager.cpp
index 12980dffcc..3a5b464405 100644
--- a/components/shader/shadermanager.cpp
+++ b/components/shader/shadermanager.cpp
@@ -10,7 +10,6 @@
 #include <boost/filesystem/fstream.hpp>
 
 #include <components/sceneutil/lightmanager.hpp>
-#include <components/resource/scenemanager.hpp>
 #include <components/debug/debuglog.hpp>
 #include <components/misc/stringops.hpp>
 
diff --git a/docs/source/reference/modding/settings/shaders.rst b/docs/source/reference/modding/settings/shaders.rst
index 6af5e9ba02..ddffbfefb2 100644
--- a/docs/source/reference/modding/settings/shaders.rst
+++ b/docs/source/reference/modding/settings/shaders.rst
@@ -40,7 +40,7 @@ Only affects objects that render with shaders (see 'force shaders' option).
 Always affects terrain.
 
 Leaving this option at its default makes the lighting compatible with Morrowind's fixed-function method,
-but the lighting may appear dull and there might be colour shifts. 
+but the lighting may appear dull and there might be colour shifts.
 Setting this option to 'false' results in more dynamic lighting.
 
 auto use object normal maps
@@ -152,32 +152,51 @@ lighting method
 ---------------
 
 :Type:		string
-:Range:		legacy|default|experimental
+:Range:		legacy|shaders compatibility|shaders
 :Default:	default
 
-Sets the internal handling of light sources. 
+Sets the internal handling of light sources.
 
-'legacy' is restricted to a maximum of 8 lights per object and guarantees fixed function pipeline compatible lighting.
+'legacy' is restricted to 8 lights per object and emulates fixed function
+pipeline compatible lighting.
 
-'default' removes the light limit via :ref:`max lights` and follows a new attenuation formula which can drastically reduce light popping and seams.
-This mode also enables vertex lighting on groundcover, which is otherwise completely disabled with 'legacy'.
-It is recommended to use this mode with older hardware, as the technique ensures a range of compatibility equal to that of 'legacy'.
+'shaders compatibility' removes the light limit via :ref:`max lights` and
+follows a modifed attenuation formula which can drastically reduce light popping
+and seams. This mode also enables lighting on groundcover and a configurable
+light fade. It is recommended to use this with older hardware and a light limit
+closer to 8. Because of its wide range of compatibility it is set as the
+default.
 
-'experimental' carries all of the benefits that 'legacy' has, but uses a modern approach that allows for a higher 'max lights' count with little to no performance penalties on modern hardware.
+'shaders' carries all of the benefits that 'shaders compatibility' does, but
+uses a modern approach that allows for a higher :ref:`max lights` count with
+little to no performance penalties on modern hardware. It is recommended to use
+this mode when supported and where the GPU is not a bottleneck. On some weaker
+devices, using this mode along with :ref:`force per pixel lighting` can carry
+performance penalties.
+
+Note that when enabled, groundcover lighting is forced to be vertex lighting,
+unless normal maps are provided. This is due to some groundcover mods using the
+Z-Up Normals technique to avoid some common issues with shading. As a
+consequence, per pixel lighting would give undesirable results.
+
+This setting has no effect if :ref:`force shaders` is 'false'.
 
 light bounds multiplier
 -----------------------
 
 :Type:		float
 :Range:		0.0-10.0
-:Default:	2.0
+:Default:	1.75
 
-Controls the bounding sphere radius of point lights, which is used to determine if an object should receive lighting from a particular light source.
-Note, this has no direct effect on the overall illumination of lights.
-Larger multipliers will allow for smoother transitions of light sources, but may require an increase in :ref:`max lights` and thus carries a performance penalty.
-This especially helps with abrupt light popping with handheld light sources such as torches and lanterns.
+Controls the bounding sphere radius of point lights, which is used to determine
+if an object should receive lighting from a particular light source. Note, this
+has no direct effect on the overall illumination of lights. Larger multipliers
+will allow for smoother transitions of light sources, but may require an
+increase in :ref:`max lights` and thus carries a performance penalty. This
+especially helps with abrupt light popping with handheld light sources such as
+torches and lanterns.
 
-It is recommended to keep this at 1.0 if :ref:`lighting method` is set to 'legacy', as the number of lights is fixed in that mode.
+This setting has no effect if :ref:`lighting method` is 'legacy'.
 
 maximum light distance
 ----------------------
@@ -186,9 +205,11 @@ maximum light distance
 :Range:		The whole range of 32-bit floating point
 :Default:	8192
 
-The maximum distance from the camera that lights will be illuminated, applies to both interiors and exteriors.
-A lower distance will improve performance.
-Set this to a non-positive value to disable fading.
+The maximum distance from the camera that lights will be illuminated, applies to
+both interiors and exteriors. A lower distance will improve performance. Set
+this to a non-positive value to disable fading.
+
+This setting has no effect if :ref:`lighting method` is 'legacy'.
 
 light fade start
 ----------------
@@ -199,18 +220,23 @@ light fade start
 
 The fraction of the maximum distance at which lights will begin to fade away.
 Tweaking it will make the transition proportionally more or less smooth.
-This setting has no effect if the maximum light distance is non-positive.
+
+This setting has no effect if the :ref:`maximum light distance` is non-positive
+or :ref:`lighting method` is 'legacy'.
 
 max lights
 ----------
 
 :Type:		integer
 :Range:		>=2
-:Default:	16
+:Default:	8
 
 Sets the maximum number of lights that each object can receive lighting from.
-Has no effect if :ref:`force shaders` option is off or :ref:`lighting method` is 'legacy'. In this case the maximum number of lights is fixed at 8.
-Increasing this too much can cause significant performance loss, especially if :ref:`lighting method` is not set to 'experimental' or :ref:`force per pixel lighting` is on. 
+Increasing this too much can cause significant performance loss, especially if
+:ref:`lighting method` is not set to 'shaders' or :ref:`force per pixel
+lighting` is on.
+
+This setting has no effect if :ref:`lighting method` is 'legacy'.
 
 antialias alpha test
 ---------------------------------------
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 102c1aa66c..9525595883 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -442,23 +442,32 @@ apply lighting to environment maps = false
 # This makes fogging independent from the viewing angle. Shaders will be used to render all objects.
 radial fog = false
 
-# Internal handling of lights, values are 'legacy', 'default', 'experimental'
-lighting method = experimental
-
-# Sets the bounding sphere multiplier of light sources, which are used to determine if an object should
-# receive lighting. Higher values will allow for smoother transitions of light sources, but may have a performance cost and
-# requires a higher number of 'max lights' set. It is recommended to keep this at 1.0 with 'legacy' lighting enabled.
-light bounds multiplier =  1.0
-
-# The distance from the camera at which lights fade away completely. Set to 0 to disable fading.
+# Internal handling of lights, ignored if 'force shaders' is off. "legacy"
+# provides fixed function pipeline emulation."shaders compatibility" (default)
+# uncaps the light limit, enables groundcover lighting, and uses a modified
+# attenuation formula to reduce popping and light seams. "shaders" comes with
+# all these benefits and is meant for larger light limits, but may not be
+# supported on older hardware and may be less performant on weaker hardware when
+# 'force per pixel lighting' is enabled.
+lighting method = shaders compatibility
+
+# Sets the bounding sphere multiplier of light sources, which are used to
+# determine if an object should receive lighting. Higher values will allow for
+# smoother transitions of light sources, but may have a performance cost and
+# requires a higher number of 'max lights' set. It is recommended to keep this
+# at 1.0 with 'legacy' lighting enabled.
+light bounds multiplier =  1.75
+
+# The distance from the camera at which lights fade away completely.
+# Set to 0 to disable fading.
 maximum light distance = 8192
 
 # Fraction of the maximum distance at which lights begin to gradually fade away.
 light fade start = 0.85
 
 # Set maximum number of lights per object. 
-# Only used when 'lighting method' is not set to 'legacy'
-max lights = 16
+# When 'lighting method' is set to 'legacy', this setting will have no effect.
+max lights = 8
 
 # Convert the alpha test (cutout/punchthrough alpha) to alpha-to-coverage.
 # This allows MSAA to work with alpha-tested meshes, producing better-looking edges without pixelation.
diff --git a/files/shaders/lighting.glsl b/files/shaders/lighting.glsl
index c6c03f2232..3678a35704 100644
--- a/files/shaders/lighting.glsl
+++ b/files/shaders/lighting.glsl
@@ -69,7 +69,7 @@ uniform int PointLightCount;
 #endif
 
 void perLightSun(out vec3 ambientOut, out vec3 diffuseOut, vec3 viewPos, vec3 viewNormal)
-{    
+{
     vec3 lightDir = normalize(getLight[0].position.xyz);
 
 #if @lightingModel == LIGHTING_MODEL_SINGLE_UBO
@@ -98,9 +98,9 @@ void perLightSun(out vec3 ambientOut, out vec3 diffuseOut, vec3 viewPos, vec3 vi
 
 void perLightPoint(out vec3 ambientOut, out vec3 diffuseOut, int lightIndex, vec3 viewPos, vec3 viewNormal)
 {
-    vec3 lightDir = getLight[lightIndex].position.xyz - viewPos;
+    vec3 lightPos = getLight[lightIndex].position.xyz - viewPos;
 
-    float lightDistance = length(lightDir);
+    float lightDistance = length(lightPos);
 
 #if !@ffpLighting
     // This has a *considerable* performance uplift where GPU is a bottleneck
@@ -112,7 +112,7 @@ void perLightPoint(out vec3 ambientOut, out vec3 diffuseOut, int lightIndex, vec
     }
 #endif
 
-    lightDir = normalize(lightDir);
+    lightPos = normalize(lightPos);
 
 #if @ffpLighting
     float illumination = clamp(1.0 / (getLight[lightIndex].constantAttenuation + getLight[lightIndex].linearAttenuation * lightDistance + getLight[lightIndex].quadraticAttenuation * lightDistance * lightDistance), 0.0, 1.0);
@@ -128,8 +128,8 @@ void perLightPoint(out vec3 ambientOut, out vec3 diffuseOut, int lightIndex, vec
     ambientOut = getLight[lightIndex].ambient.xyz * illumination;
 #endif
 
-    float lambert = dot(viewNormal.xyz, lightDir) * illumination;
-    
+    float lambert = dot(viewNormal.xyz, lightPos) * illumination;
+
 #ifndef GROUNDCOVER
     lambert = max(lambert, 0.0);
 #else
@@ -179,7 +179,7 @@ void doLighting(vec3 viewPos, vec3 viewNormal, out vec3 diffuseLight, out vec3 a
     for (int i=1; i <= PointLightCount; ++i)
     {
         perLightPoint(ambientOut, diffuseOut, i, viewPos, viewNormal);
-#else 
+#else
     for (int i=0; i < PointLightCount; ++i)
     {
         perLightPoint(ambientOut, diffuseOut, PointLightIndex[i], viewPos, viewNormal);
diff --git a/files/shaders/water_fragment.glsl b/files/shaders/water_fragment.glsl
index 1397f65e7e..06a3213011 100644
--- a/files/shaders/water_fragment.glsl
+++ b/files/shaders/water_fragment.glsl
@@ -151,6 +151,8 @@ uniform vec3 nodePosition;
 
 uniform float rainIntensity;
 
+#define PER_PIXEL_LIGHTING 0
+
 #include "shadows_fragment.glsl"
 #include "lighting.glsl"
 

From cc31e1eea1c066ccca40031a3150847f98f9c75e Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Tue, 30 Mar 2021 18:12:57 -0700
Subject: [PATCH 0573/2859] Ambient luminance threshold setting

---
 apps/openmw/mwrender/renderingmanager.cpp     | 22 +++++++++++++++++++
 apps/openmw/mwrender/renderingmanager.hpp     |  1 +
 .../reference/modding/settings/shaders.rst    | 19 ++++++++++++++++
 files/settings-default.cfg                    |  7 +++++-
 4 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 229c34f452..865bae2f10 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -195,6 +195,7 @@ namespace MWRender
         , mWorkQueue(workQueue)
         , mUnrefQueue(new SceneUtil::UnrefQueue)
         , mNavigator(navigator)
+        , mMinimumAmbientLuminance(0.f)
         , mNightEyeFactor(0.f)
         , mFieldOfViewOverridden(false)
         , mFieldOfViewOverride(0.f)
@@ -223,6 +224,9 @@ namespace MWRender
         resourceSystem->getSceneManager()->getShaderManager().setLightingMethod(sceneRoot->getLightingMethod());
         resourceSystem->getSceneManager()->setLightingMethod(sceneRoot->getLightingMethod());
 
+        if (sceneRoot->getLightingMethod() != SceneUtil::LightingMethod::FFP)
+            mMinimumAmbientLuminance = std::clamp(Settings::Manager::getFloat("minimum interior brightness", "Shaders"), 0.f, 1.f);
+
         sceneRoot->setLightingMask(Mask_Lighting);
         mSceneRoot = sceneRoot;
         sceneRoot->setStartLight(1);
@@ -1072,7 +1076,25 @@ namespace MWRender
         osg::Vec4f color = mAmbientColor;
 
         if (mNightEyeFactor > 0.f)
+        {
             color += osg::Vec4f(0.7, 0.7, 0.7, 0.0) * mNightEyeFactor;
+        }
+        // optionally brighten up ambient interiors when using a non-FFP emulated lighting method
+        else if (mResourceSystem->getSceneManager()->getLightingMethod() != SceneUtil::LightingMethod::FFP)
+        {
+            static constexpr float pR = 0.2126;
+            static constexpr float pG = 0.7152;
+            static constexpr float pB = 0.0722;
+
+            // we already work in linear RGB so no conversions are needed for the luminosity function
+            float relativeLuminance = pR*color.r() + pG*color.g() + pB*color.b();
+            if (relativeLuminance < mMinimumAmbientLuminance)
+            {
+                // brighten ambient so it reaches the minimum threshold but no more, we want to mess with content data as least we can
+                float targetBrightnessIncreaseFactor = mMinimumAmbientLuminance / relativeLuminance;
+                color *= targetBrightnessIncreaseFactor;
+            }
+        }
 
         mStateUpdater->setAmbientColor(color);
     }
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index a7afa2fa0d..a0a74bd5c4 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -296,6 +296,7 @@ namespace MWRender
         osg::ref_ptr<StateUpdater> mStateUpdater;
 
         osg::Vec4f mAmbientColor;
+        float mMinimumAmbientLuminance;
         float mNightEyeFactor;
 
         float mNearClip;
diff --git a/docs/source/reference/modding/settings/shaders.rst b/docs/source/reference/modding/settings/shaders.rst
index ddffbfefb2..3b0f6df5a6 100644
--- a/docs/source/reference/modding/settings/shaders.rst
+++ b/docs/source/reference/modding/settings/shaders.rst
@@ -238,6 +238,25 @@ lighting` is on.
 
 This setting has no effect if :ref:`lighting method` is 'legacy'.
 
+minimum interior brightness
+------------------------
+
+:Type:		float
+:Range:		0.0-1.0
+:Default:	0.1
+
+Sets the minimum interior ambient brightness for interior cells when
+:ref:`lighting method` is not 'legacy'. A consequence of the new lighting system
+is that interiors will sometimes be darker since light sources now have sensible
+fall-offs. A couple solutions are to either add more lights or increase their
+radii to compensate, but these require content changes. For best results it is
+recommended to set this to 0.0 to retain the colors that level designers
+intended. If brighter interiors are wanted, however, this setting should be
+increased. Note, it is advised to keep this number small (< 0.1) to avoid the
+aforementioned changes in visuals.
+
+This setting has no effect if :ref:`lighting method` is 'legacy'.
+
 antialias alpha test
 ---------------------------------------
 
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 9525595883..2d543303e9 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -465,10 +465,15 @@ maximum light distance = 8192
 # Fraction of the maximum distance at which lights begin to gradually fade away.
 light fade start = 0.85
 
-# Set maximum number of lights per object. 
+# Set maximum number of lights per object.
 # When 'lighting method' is set to 'legacy', this setting will have no effect.
 max lights = 8
 
+# Sets minimum ambient brightness of interior cells. Levels below this threshold will have their
+# ambient values adjusted to balance the darker interiors. 
+# When 'lighting method' is set to 'legacy', this setting will have no effect.
+minimum interior brightness = 0.1
+
 # Convert the alpha test (cutout/punchthrough alpha) to alpha-to-coverage.
 # This allows MSAA to work with alpha-tested meshes, producing better-looking edges without pixelation.
 # When MSAA is off, this setting will have no visible effect, but might have a performance cost.

From d195602a9dcdc199b48a85ad5be8fdd860dcb110 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Wed, 31 Mar 2021 21:22:16 -0700
Subject: [PATCH 0574/2859] Switch to shared layout, some rewording

---
 components/sceneutil/lightmanager.cpp | 201 ++++++++++++++++++++++----
 files/settings-default.cfg            |   2 +-
 files/shaders/lighting.glsl           |  10 +-
 3 files changed, 175 insertions(+), 38 deletions(-)

diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 72470b8c2c..c7a4834299 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -47,55 +47,81 @@ namespace SceneUtil
 {
     static int sLightId = 0;
 
+    // Handles a GLSL shared layout by using configured offsets and strides to fill a continuous buffer, making the data upload to GPU simpler.
     class LightBuffer : public osg::Referenced
     {
     public:
 
-        LightBuffer(int count) : mData(new osg::Vec4Array(3*count)), mEndian(osg::getCpuByteOrder()) {}
+        enum LayoutOffset
+        {
+            Diffuse,
+            DiffuseSign,
+            Ambient,
+            Specular,
+            Position,
+            AttenuationRadius
+        };
+
+        LightBuffer(int count)
+            : mData(new osg::FloatArray(3*4*count))
+            , mEndian(osg::getCpuByteOrder())
+            , mCount(count)
+            , mStride(12)
+        {
+            mOffsets[Diffuse] = 0;
+            mOffsets[Ambient] = 1;
+            mOffsets[Specular] = 2;
+            mOffsets[DiffuseSign] = 3;
+            mOffsets[Position] = 4;
+            mOffsets[AttenuationRadius] = 8;
+        }
+
+        LightBuffer(const LightBuffer& copy)
+            : osg::Referenced()
+            , mData(copy.mData)
+            , mEndian(copy.mEndian)
+            , mCount(copy.mCount)
+            , mStride(copy.mStride)
+            , mOffsets(copy.mOffsets)
+        {}
 
         void setDiffuse(int index, const osg::Vec4& value)
         {
-            auto signedValue = value;
+            // Deal with negative lights (negative diffuse) by passing a sign bit in the unused alpha component
+            auto positiveColor = value;
             float signBit = 1.0;
             if (value[0] < 0)
             {
-                signedValue *= -1.0;
+                positiveColor *= -1.0;
                 signBit = -1.0;
             }
-            *(unsigned int*)(&(*mData)[3*index][0]) = asRGBA(signedValue);
-            *(int*)(&(*mData)[3*index][3]) = signBit;
+            *(unsigned int*)(&(*mData)[getOffset(index, Diffuse)]) = asRGBA(positiveColor);
+            *(int*)(&(*mData)[getOffset(index, DiffuseSign)]) = signBit;
         }
 
         void setAmbient(int index, const osg::Vec4& value)
         {
-            *(unsigned int*)(&(*mData)[3*index][1]) = asRGBA(value);
+            *(unsigned int*)(&(*mData)[getOffset(index, Ambient)]) = asRGBA(value);
         }
 
         void setSpecular(int index, const osg::Vec4& value)
         {
-            *(unsigned int*)(&(*mData)[3*index][2]) = asRGBA(value);
+            *(unsigned int*)(&(*mData)[getOffset(index, Specular)]) = asRGBA(value);
         }
 
         void setPosition(int index, const osg::Vec4& value)
         {
-            (*mData)[3*index+1] = value;
-        }
-
-        void setAttenuation(int index, float c, float l, float q)
-        {
-            (*mData)[3*index+2][0] = c;
-            (*mData)[3*index+2][1] = l;
-            (*mData)[3*index+2][2] = q;
+            *(osg::Vec4*)(&(*mData)[getOffset(index, Position)]) = value;
         }
 
-        void setRadius(int index, float value)
+        void setAttenuationRadius(int index, const osg::Vec4& value)
         {
-            (*mData)[3*index+2][3] = value;
+            *(osg::Vec4*)(&(*mData)[getOffset(index, AttenuationRadius)]) = value;
         }
 
         auto getPosition(int index)
         {
-            return (*mData)[3*index+1];
+            return *(osg::Vec4*)(&(*mData)[getOffset(index, Position)]);
         }
 
         auto& getData()
@@ -118,8 +144,40 @@ namespace SceneUtil
             return mEndian == osg::BigEndian ? value.asABGR() : value.asRGBA();
         }
 
-        osg::ref_ptr<osg::Vec4Array> mData;
+        int getOffset(int index, LayoutOffset slot)
+        {
+            return mStride * index + mOffsets[slot];
+        }
+
+        void configureLayout(int offsetColors, int offsetPosition, int offsetAttenuationRadius, int size, int stride)
+        {
+            static constexpr auto sizeofVec4 = sizeof(GL_FLOAT) * osg::Vec4::num_components;
+            static constexpr auto sizeofFloat = sizeof(GL_FLOAT);
+
+            mOffsets[Diffuse] = offsetColors / sizeofFloat;
+            mOffsets[Ambient] = mOffsets[Diffuse] + 1;
+            mOffsets[Specular] = mOffsets[Diffuse] + 2;
+            mOffsets[DiffuseSign] = mOffsets[Diffuse] + 3;
+            mOffsets[Position] = offsetPosition / sizeofFloat;
+            mOffsets[AttenuationRadius] = offsetAttenuationRadius / sizeofFloat;
+            mStride = (offsetAttenuationRadius + sizeofVec4 + stride) / 4;
+
+            // Copy over previous buffers light data. Buffers populate before we know the layout.
+            LightBuffer oldBuffer = LightBuffer(*this);
+            for (int i = 0; i < oldBuffer.mCount; ++i)
+            {
+                *(osg::Vec4*)(&(*mData)[getOffset(i, Diffuse)]) = *(osg::Vec4*)(&(*mData)[oldBuffer.getOffset(i, Diffuse)]);
+                *(osg::Vec4*)(&(*mData)[getOffset(i, Position)]) = *(osg::Vec4*)(&(*mData)[oldBuffer.getOffset(i, Position)]);
+                *(osg::Vec4*)(&(*mData)[getOffset(i, AttenuationRadius)]) = *(osg::Vec4*)(&(*mData)[oldBuffer.getOffset(i, AttenuationRadius)]);
+            }
+        }
+
+    private:
+        osg::ref_ptr<osg::FloatArray> mData;
         osg::Endian mEndian;
+        int mCount;
+        int mStride;
+        std::unordered_map<LayoutOffset, int> mOffsets;
     };
 
     class LightStateCache
@@ -165,8 +223,8 @@ namespace SceneUtil
                 buffer->setPosition(0, light->getPosition());
 
                 osg::ref_ptr<osg::UniformBufferObject> ubo = new osg::UniformBufferObject;
-                buffer->mData->setBufferObject(ubo);
-                osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(static_cast<int>(Shader::UBOBinding::LightBuffer), buffer->mData.get(), 0, buffer->mData->getTotalDataSize());
+                buffer->getData()->setBufferObject(ubo);
+                osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(static_cast<int>(Shader::UBOBinding::LightBuffer), buffer->getData().get(), 0, buffer->getData()->getTotalDataSize());
 
                 stateset->setAttributeAndModes(ubb, mode);
 
@@ -572,11 +630,24 @@ namespace SceneUtil
     class LightManagerStateAttribute : public osg::StateAttribute
     {
     public:
-        LightManagerStateAttribute() : mLightManager(nullptr) {}
-        LightManagerStateAttribute(LightManager* lightManager) : mLightManager(lightManager) {}
+        LightManagerStateAttribute()
+            : mLightManager(nullptr) {}
 
-        LightManagerStateAttribute(const LightManagerStateAttribute& copy,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY)
-            : osg::StateAttribute(copy,copyop),mLightManager(copy.mLightManager) {}
+        LightManagerStateAttribute(LightManager* lightManager)
+        : mLightManager(lightManager)
+        , mDummyProgram(new osg::Program)
+        {
+            static const std::string dummyVertSource = generateDummyShader(mLightManager->getMaxLightsInScene());
+
+            mDummyProgram->addShader(new osg::Shader(osg::Shader::VERTEX, dummyVertSource));
+            mDummyProgram->addBindUniformBlock("LightBufferBinding", static_cast<int>(Shader::UBOBinding::LightBuffer));
+            // Needed to query the layout of the buffer object. The layout specifier needed to use the std140 layout is not reliably
+            // available, regardless of extensions, until GLSL 140.
+            mLightManager->getOrCreateStateSet()->setAttributeAndModes(mDummyProgram, osg::StateAttribute::ON|osg::StateAttribute::PROTECTED);
+        }
+
+        LightManagerStateAttribute(const LightManagerStateAttribute& copy, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY)
+            : osg::StateAttribute(copy,copyop), mLightManager(copy.mLightManager) {}
 
         int compare(const StateAttribute &sa) const override
         {
@@ -585,12 +656,76 @@ namespace SceneUtil
 
         META_StateAttribute(NifOsg, LightManagerStateAttribute, osg::StateAttribute::LIGHT)
 
+        void initSharedLayout(osg::GLExtensions* ext, int handle) const
+        {
+            std::vector<unsigned int> index = { static_cast<int>(Shader::UBOBinding::LightBuffer) };
+            int totalBlockSize = -1;
+            int stride = -1;
+
+            ext->glGetActiveUniformBlockiv(handle, 0, GL_UNIFORM_BLOCK_DATA_SIZE, &totalBlockSize);
+            ext->glGetActiveUniformsiv(handle, index.size(), index.data(), GL_UNIFORM_ARRAY_STRIDE, &stride);
+
+            std::vector<const char*> names = {
+                 "LightBuffer[0].packedColors"
+                ,"LightBuffer[0].position"
+                ,"LightBuffer[0].attenuation"
+            };
+            std::vector<unsigned int> indices(names.size());
+            std::vector<int> offsets(names.size());
+
+            ext->glGetUniformIndices(handle, names.size(), names.data(), indices.data());
+            ext->glGetActiveUniformsiv(handle, indices.size(), indices.data(), GL_UNIFORM_OFFSET, offsets.data());
+
+            for (int i = 0; i < 2; ++i)
+            {
+                auto& buf = mLightManager->getLightBuffer(i);
+                buf->configureLayout(offsets[0], offsets[1], offsets[2], totalBlockSize, stride);
+            }
+        }
+
         void apply(osg::State& state) const override
         {
-            mLightManager->getLightBuffer(state.getFrameStamp()->getFrameNumber())->dirty();
+            static bool init = false;
+            if (!init)
+            {
+                auto handle = mDummyProgram->getPCP(state)->getHandle();
+                auto* ext = state.get<osg::GLExtensions>();
+
+                int activeUniformBlocks = 0;
+                ext->glGetProgramiv(handle, GL_ACTIVE_UNIFORM_BLOCKS, &activeUniformBlocks);
+
+                // wait until the UBO binding is created
+                if (activeUniformBlocks > 0)
+                {
+                    initSharedLayout(ext, handle);
+                    init = true;
+                }
+            }
+            else
+            {
+                mLightManager->getLightBuffer(state.getFrameStamp()->getFrameNumber())->dirty();
+            }
+        }
+
+    private:
+
+        std::string generateDummyShader(int maxLightsInScene)
+        {
+            return "#version 120\n"
+            "#extension GL_ARB_uniform_buffer_object : require\n"
+            "struct LightData {\n"
+            "   ivec4 packedColors;\n"
+            "   vec4 position;\n"
+            "   vec4 attenuation;\n"
+            "};\n"
+            "uniform LightBufferBinding {\n"
+            "   LightData LightBuffer[" + std::to_string(mLightManager->getMaxLightsInScene()) + "];\n"
+            "};\n"
+            "void main() { gl_Position = vec4(0.0); }\n";
         }
 
         LightManager* mLightManager;
+        osg::ref_ptr<osg::Program> mDummyProgram;
     };
 
     const std::unordered_map<std::string, LightingMethod> LightManager::mLightingMethodSettingMap = {
@@ -654,12 +789,15 @@ namespace SceneUtil
         bool supportsUBO = exts && exts->isUniformBufferObjectSupported;
         bool supportsGPU4 = exts && exts->isGpuShader4Supported;
 
-        if (getLightingMethod() == LightingMethod::SingleUBO)
+        static bool hasLoggedWarnings = false;
+
+        if (getLightingMethod() == LightingMethod::SingleUBO && !hasLoggedWarnings)
         {
             if (!supportsUBO)
-                Log(Debug::Info) << "GL_ARB_uniform_buffer_object not supported: using fallback uniforms";
-            else if (!supportsGPU4)
-                Log(Debug::Info) << "GL_EXT_gpu_shader4 not supported: using fallback uniforms";
+                Log(Debug::Warning) << "GL_ARB_uniform_buffer_object not supported: switching to shader compatibility lighting mode";
+            if (!supportsGPU4)
+                Log(Debug::Warning) << "GL_EXT_gpu_shader4 not supported: switching to shader compatibility lighting mode";
+            hasLoggedWarnings = true;
         }
 
         int targetLights = Settings::Manager::getInt("max lights", "Shaders");
@@ -978,8 +1116,7 @@ namespace SceneUtil
         auto& buf = getLightBuffer(frameNum);
         buf->setDiffuse(index, light->getDiffuse());
         buf->setAmbient(index, light->getAmbient());
-        buf->setAttenuation(index, light->getConstantAttenuation(), light->getLinearAttenuation(), light->getQuadraticAttenuation());
-        buf->setRadius(index, lightSource->getRadius());
+        buf->setAttenuationRadius(index, osg::Vec4(light->getConstantAttenuation(), light->getLinearAttenuation(), light->getQuadraticAttenuation(), lightSource->getRadius()));
         buf->setPosition(index, light->getPosition() * (*viewMatrix));
     }
 
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 2d543303e9..c931789068 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -453,7 +453,7 @@ lighting method = shaders compatibility
 
 # Sets the bounding sphere multiplier of light sources, which are used to
 # determine if an object should receive lighting. Higher values will allow for
-# smoother transitions of light sources, but may have a performance cost and
+# smoother transitions of light sources, but may carry a performance cost and
 # requires a higher number of 'max lights' set. It is recommended to keep this
 # at 1.0 with 'legacy' lighting enabled.
 light bounds multiplier =  1.75
diff --git a/files/shaders/lighting.glsl b/files/shaders/lighting.glsl
index 3678a35704..a3df6666fa 100644
--- a/files/shaders/lighting.glsl
+++ b/files/shaders/lighting.glsl
@@ -35,15 +35,16 @@ vec4 unpackRGBA(int data)
 
 struct LightData
 {
-    ivec4 packedColors;  // diffuse, ambient, specular
+    ivec4 packedColors; // diffuse, ambient, specular
     vec4 position;
-    vec4 attenuation;   // constant, linear, quadratic, radius
+    vec4 attenuation; // constant, linear, quadratic, radius
 };
 
 uniform int PointLightIndex[@maxLights];
 uniform int PointLightCount;
 
-layout(std140) uniform LightBufferBinding
+// Defaults to shared layout. If we ever move to GLSL 140, std140 layout should be considered
+uniform LightBufferBinding
 {
     LightData LightBuffer[@maxLightsInScene];
 };
@@ -56,7 +57,7 @@ struct LightData
     vec4 diffuse;
     vec4 ambient;
     vec4 specular;
-    vec4 attenuation;   // constant, linear, quadratic, radius
+    vec4 attenuation; // constant, linear, quadratic, radius
 };
 
 uniform LightData LightBuffer[@maxLights];
@@ -92,7 +93,6 @@ void perLightSun(out vec3 ambientOut, out vec3 diffuseOut, vec3 viewPos, vec3 vi
     }
     lambert *= clamp(-8.0 * (1.0 - 0.3) * eyeCosine + 1.0, 0.3, 1.0);
 #endif
-
     diffuseOut = sunDiffuse * lambert;
 }
 

From 157717693a0ab59b041c1998425b24b33edd807b Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Wed, 31 Mar 2021 22:03:06 -0700
Subject: [PATCH 0575/2859] Changelog entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1fea773e9..8ced951e10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -147,6 +147,7 @@
     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 #5828: Support more than 8 lights
     Feature #5910: Fall back to delta time when physics can't keep up
     Task #5480: Drop Qt4 support
     Task #5520: Improve cell name autocompleter implementation

From 71f7f30c0b3018b9451ea8ad39ebccffca9c7ef1 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Wed, 31 Mar 2021 22:05:47 -0700
Subject: [PATCH 0576/2859] Don't break NV shaders

---
 files/shaders/nv_default_fragment.glsl | 4 ++++
 files/shaders/nv_default_vertex.glsl   | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/files/shaders/nv_default_fragment.glsl b/files/shaders/nv_default_fragment.glsl
index 03fa378a6d..1245069f60 100644
--- a/files/shaders/nv_default_fragment.glsl
+++ b/files/shaders/nv_default_fragment.glsl
@@ -1,5 +1,9 @@
 #version 120
 
+#if @useUBO
+    #extension GL_ARB_uniform_buffer_object : require
+#endif
+
 #if @useGPUShader4
     #extension GL_EXT_gpu_shader4: require
 #endif
diff --git a/files/shaders/nv_default_vertex.glsl b/files/shaders/nv_default_vertex.glsl
index 7c9d434f18..50f5daf25e 100644
--- a/files/shaders/nv_default_vertex.glsl
+++ b/files/shaders/nv_default_vertex.glsl
@@ -1,5 +1,13 @@
 #version 120
 
+#if @useUBO
+    #extension GL_ARB_uniform_buffer_object : require
+#endif
+
+#if @useGPUShader4
+    #extension GL_EXT_gpu_shader4: require
+#endif
+
 #if @diffuseMap
 varying vec2 diffuseMapUV;
 #endif

From 3d713e8602b71711db609ddc6746e3f3331dd74a Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Wed, 31 Mar 2021 22:35:02 -0700
Subject: [PATCH 0577/2859] Fix incorrect minimum ambient

---
 AUTHORS.md                                    |  1 +
 apps/openmw/mwrender/renderingmanager.cpp     | 45 +++++++------
 components/sceneutil/lightmanager.cpp         | 67 +++++++------------
 .../reference/modding/settings/shaders.rst    | 16 ++---
 files/settings-default.cfg                    | 12 ++--
 5 files changed, 65 insertions(+), 76 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index d2de857477..07aef455c0 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -49,6 +49,7 @@ Programmers
     Cédric Mocquillon
     Chris Boyce (slothlife)
     Chris Robinson (KittyCat)
+    Cody Glassman (Wazabear)
     Coleman Smith (olcoal)
     Cory F. Cohen (cfcohen)
     Cris Mihalache (Mirceam)
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 865bae2f10..c14431518d 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -537,7 +537,32 @@ namespace MWRender
 
     void RenderingManager::configureAmbient(const ESM::Cell *cell)
     {
-        setAmbientColour(SceneUtil::colourFromRGB(cell->mAmbi.mAmbient));
+        bool needsAdjusting = false;
+        if (mResourceSystem->getSceneManager()->getLightingMethod() != SceneUtil::LightingMethod::FFP)
+            needsAdjusting = !cell->isExterior() && !(cell->mData.mFlags & ESM::Cell::QuasiEx);
+
+        auto ambient = SceneUtil::colourFromRGB(cell->mAmbi.mAmbient);
+
+        if (needsAdjusting)
+        {
+            static constexpr float pR = 0.2126;
+            static constexpr float pG = 0.7152;
+            static constexpr float pB = 0.0722;
+
+            // we already work in linear RGB so no conversions are needed for the luminosity function
+            float relativeLuminance = pR*ambient.r() + pG*ambient.g() + pB*ambient.b();
+            if (relativeLuminance < mMinimumAmbientLuminance)
+            {
+                // brighten ambient so it reaches the minimum threshold but no more, we want to mess with content data as least we can
+                float targetBrightnessIncreaseFactor = mMinimumAmbientLuminance / relativeLuminance;
+                if (ambient.r() == 0.f && ambient.g() == 0.f && ambient.b() == 0.f)
+                    ambient = osg::Vec4(targetBrightnessIncreaseFactor, targetBrightnessIncreaseFactor, targetBrightnessIncreaseFactor, ambient.a());
+                else
+                    ambient *= targetBrightnessIncreaseFactor;
+            }
+        }
+
+        setAmbientColour(ambient);
 
         osg::Vec4f diffuse = SceneUtil::colourFromRGB(cell->mAmbi.mSunlight);
         mSunLight->setDiffuse(diffuse);
@@ -1076,25 +1101,7 @@ namespace MWRender
         osg::Vec4f color = mAmbientColor;
 
         if (mNightEyeFactor > 0.f)
-        {
             color += osg::Vec4f(0.7, 0.7, 0.7, 0.0) * mNightEyeFactor;
-        }
-        // optionally brighten up ambient interiors when using a non-FFP emulated lighting method
-        else if (mResourceSystem->getSceneManager()->getLightingMethod() != SceneUtil::LightingMethod::FFP)
-        {
-            static constexpr float pR = 0.2126;
-            static constexpr float pG = 0.7152;
-            static constexpr float pB = 0.0722;
-
-            // we already work in linear RGB so no conversions are needed for the luminosity function
-            float relativeLuminance = pR*color.r() + pG*color.g() + pB*color.b();
-            if (relativeLuminance < mMinimumAmbientLuminance)
-            {
-                // brighten ambient so it reaches the minimum threshold but no more, we want to mess with content data as least we can
-                float targetBrightnessIncreaseFactor = mMinimumAmbientLuminance / relativeLuminance;
-                color *= targetBrightnessIncreaseFactor;
-            }
-        }
 
         mStateUpdater->setAmbientColor(color);
     }
diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index c7a4834299..f20e28a7e3 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -381,27 +381,14 @@ namespace SceneUtil
 
         void apply(osg::State &state) const override
         {
-            osg::Matrix modelViewMatrix = state.getModelViewMatrix();
-
-            state.applyModelViewMatrix(state.getInitialViewMatrix());
-
-            LightStateCache* cache = getLightStateCache(state.getContextID(), mLightManager->getMaxLights());
             for (size_t i = 0; i < mLights.size(); ++i)
             {
-                osg::Light* current = cache->lastAppliedLight[i];
                 auto light = mLights[i];
-                if (current != light.get())
-                {
-                    mLightManager->getLightUniform(i+1, LightManager::UniformKey::Diffuse)->set(light->getDiffuse());
-                    mLightManager->getLightUniform(i+1, LightManager::UniformKey::Ambient)->set(light->getAmbient());
-                    mLightManager->getLightUniform(i+1, LightManager::UniformKey::Attenuation)->set(osg::Vec4(light->getConstantAttenuation(), light->getLinearAttenuation(), light->getQuadraticAttenuation(), getLightRadius(light)));
-                    mLightManager->getLightUniform(i+1, LightManager::UniformKey::Position)->set(light->getPosition() * state.getModelViewMatrix());
-
-                    cache->lastAppliedLight[i] = mLights[i];
-                }
+                mLightManager->getLightUniform(i+1, LightManager::UniformKey::Diffuse)->set(light->getDiffuse());
+                mLightManager->getLightUniform(i+1, LightManager::UniformKey::Ambient)->set(light->getAmbient());
+                mLightManager->getLightUniform(i+1, LightManager::UniformKey::Attenuation)->set(osg::Vec4(light->getConstantAttenuation(), light->getLinearAttenuation(), light->getQuadraticAttenuation(), getLightRadius(light)));
+                mLightManager->getLightUniform(i+1, LightManager::UniformKey::Position)->set(light->getPosition() * state.getInitialViewMatrix());
             }
-
-            state.applyModelViewMatrix(modelViewMatrix);
         }
 
     private:
@@ -643,7 +630,7 @@ namespace SceneUtil
             mDummyProgram->addBindUniformBlock("LightBufferBinding", static_cast<int>(Shader::UBOBinding::LightBuffer));
             // Needed to query the layout of the buffer object. The layout specifier needed to use the std140 layout is not reliably
             // available, regardless of extensions, until GLSL 140.
-            mLightManager->getOrCreateStateSet()->setAttributeAndModes(mDummyProgram, osg::StateAttribute::ON|osg::StateAttribute::PROTECTED);
+            mLightManager->getOrCreateStateSet()->setAttributeAndModes(mDummyProgram, osg::StateAttribute::ON);
         }
 
         LightManagerStateAttribute(const LightManagerStateAttribute& copy, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY)
@@ -756,9 +743,10 @@ namespace SceneUtil
         , mPointLightFadeEnd(0.f)
         , mPointLightFadeStart(0.f)
     {
+        setUpdateCallback(new LightManagerUpdateCallback);
+
         if (ffp)
         {
-            setLightingMethod(LightingMethod::FFP);
             initFFP(LightManager::mFFPMaxLights);
             return;
         }
@@ -769,11 +757,7 @@ namespace SceneUtil
         {
             Log(Debug::Error) << "Invalid option for 'lighting method': got '" << lightingMethodString
                               << "', expected legacy, shaders compatible, or shaders. Falling back to 'shaders compatible'.";
-            setLightingMethod(LightingMethod::PerObjectUniform);
-        }
-        else
-        {
-            setLightingMethod(lightingMethod);
+            lightingMethod = LightingMethod::PerObjectUniform;
         }
 
         mPointLightRadiusMultiplier = std::clamp(Settings::Manager::getFloat("light bounds multiplier", "Shaders"), 0.f, 10.f);
@@ -791,7 +775,7 @@ namespace SceneUtil
 
         static bool hasLoggedWarnings = false;
 
-        if (getLightingMethod() == LightingMethod::SingleUBO && !hasLoggedWarnings)
+        if (lightingMethod == LightingMethod::SingleUBO && !hasLoggedWarnings)
         {
             if (!supportsUBO)
                 Log(Debug::Warning) << "GL_ARB_uniform_buffer_object not supported: switching to shader compatibility lighting mode";
@@ -802,19 +786,13 @@ namespace SceneUtil
 
         int targetLights = Settings::Manager::getInt("max lights", "Shaders");
 
-        if (!supportsUBO || !supportsGPU4 || getLightingMethod() == LightingMethod::PerObjectUniform)
-        {
-            setLightingMethod(LightingMethod::PerObjectUniform);
+        if (!supportsUBO || !supportsGPU4 || lightingMethod == LightingMethod::PerObjectUniform)
             initPerObjectUniform(targetLights);
-        }
         else
-        {
             initSingleUBO(targetLights);
-        }
 
         getOrCreateStateSet()->addUniform(new osg::Uniform("PointLightCount", 0));
 
-        setUpdateCallback(new LightManagerUpdateCallback);
         addCullCallback(new LightManagerCullCallback(this));
     }
 
@@ -876,18 +854,18 @@ namespace SceneUtil
 
     void LightManager::initFFP(int targetLights)
     {
+        setLightingMethod(LightingMethod::FFP);
         setMaxLights(targetLights);
 
         for (int i = 0; i < getMaxLights(); ++i)
             mDummies.push_back(new FFPLightStateAttribute(i, std::vector<osg::ref_ptr<osg::Light>>()));
-
-        setUpdateCallback(new LightManagerUpdateCallback);
     }
 
     void LightManager::initPerObjectUniform(int targetLights)
     {
         auto* stateset = getOrCreateStateSet();
 
+        setLightingMethod(LightingMethod::PerObjectUniform);
         setMaxLights(std::max(2, targetLights));
 
         mLightUniforms.resize(getMaxLights()+1);
@@ -918,6 +896,7 @@ namespace SceneUtil
 
     void LightManager::initSingleUBO(int targetLights)
     {
+        setLightingMethod(LightingMethod::SingleUBO);
         setMaxLights(std::clamp(targetLights, 2, getMaxLightsInScene() / 2));
 
         for (int i = 0; i < 2; ++i)
@@ -1059,6 +1038,7 @@ namespace SceneUtil
 
     const std::vector<LightManager::LightSourceViewBound>& LightManager::getLightsInViewSpace(osg::Camera *camera, const osg::RefMatrix* viewMatrix, size_t frameNum)
     {
+        bool isReflectionCamera = camera->getName() == "ReflectionCamera";
         osg::observer_ptr<osg::Camera> camPtr (camera);
         auto it = mLightsInViewSpace.find(camPtr);
 
@@ -1075,17 +1055,18 @@ namespace SceneUtil
                 osg::BoundingSphere viewBound = osg::BoundingSphere(osg::Vec3f(0,0,0), radius * mPointLightRadiusMultiplier);
                 transformBoundingSphere(worldViewMat, viewBound);
 
-                static const float fadeDelta = mPointLightFadeEnd - mPointLightFadeStart;
-
-                if (mPointLightFadeEnd != 0.f)
+                if (!isReflectionCamera)
                 {
-                    float fade = 1 - std::clamp((viewBound.center().length() - mPointLightFadeStart) / fadeDelta, 0.f, 1.f);
-
-                    if (fade == 0.f)
-                        continue;
+                    static const float fadeDelta = mPointLightFadeEnd - mPointLightFadeStart;
+                    if (mPointLightFadeEnd != 0.f)
+                    {
+                        float fade = 1 - std::clamp((viewBound.center().length() - mPointLightFadeStart) / fadeDelta, 0.f, 1.f);
+                        if (fade == 0.f)
+                            continue;
 
-                    auto* light = transform.mLightSource->getLight(frameNum);
-                    light->setDiffuse(light->getDiffuse() * fade);
+                        auto* light = transform.mLightSource->getLight(frameNum);
+                        light->setDiffuse(light->getDiffuse() * fade);
+                    }
                 }
 
                 LightSourceViewBound l;
diff --git a/docs/source/reference/modding/settings/shaders.rst b/docs/source/reference/modding/settings/shaders.rst
index 3b0f6df5a6..be38bd3ec4 100644
--- a/docs/source/reference/modding/settings/shaders.rst
+++ b/docs/source/reference/modding/settings/shaders.rst
@@ -160,12 +160,12 @@ Sets the internal handling of light sources.
 'legacy' is restricted to 8 lights per object and emulates fixed function
 pipeline compatible lighting.
 
-'shaders compatibility' removes the light limit via :ref:`max lights` and
-follows a modifed attenuation formula which can drastically reduce light popping
-and seams. This mode also enables lighting on groundcover and a configurable
-light fade. It is recommended to use this with older hardware and a light limit
-closer to 8. Because of its wide range of compatibility it is set as the
-default.
+'shaders compatibility' removes the light limit controllable through :ref:`max
+lights` and follows a modifed attenuation formula which can drastically reduce
+light popping and seams. This mode also enables lighting on groundcover and a
+configurable light fade. It is recommended to use this with older hardware and a
+light limit closer to 8. Because of its wide range of compatibility it is set as
+the default.
 
 'shaders' carries all of the benefits that 'shaders compatibility' does, but
 uses a modern approach that allows for a higher :ref:`max lights` count with
@@ -174,9 +174,9 @@ this mode when supported and where the GPU is not a bottleneck. On some weaker
 devices, using this mode along with :ref:`force per pixel lighting` can carry
 performance penalties.
 
-Note that when enabled, groundcover lighting is forced to be vertex lighting,
+Note that when enabled groundcover lighting is forced to be vertex lighting,
 unless normal maps are provided. This is due to some groundcover mods using the
-Z-Up Normals technique to avoid some common issues with shading. As a
+Z-Up normals technique to avoid some common issues with shading. As a
 consequence, per pixel lighting would give undesirable results.
 
 This setting has no effect if :ref:`force shaders` is 'false'.
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index c931789068..de2c237e8e 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -451,11 +451,11 @@ radial fog = false
 # 'force per pixel lighting' is enabled.
 lighting method = shaders compatibility
 
-# Sets the bounding sphere multiplier of light sources, which are used to
-# determine if an object should receive lighting. Higher values will allow for
-# smoother transitions of light sources, but may carry a performance cost and
-# requires a higher number of 'max lights' set. It is recommended to keep this
-# at 1.0 with 'legacy' lighting enabled.
+# Sets the bounding sphere multiplier of light sources if 'lighting method' is
+# not 'legacy'. These are used to determine if an object should receive
+# lighting. Higher values will allow for smoother transitions of light sources,
+# but may carry a performance cost and requires a higher number of 'max lights'
+# set.
 light bounds multiplier =  1.75
 
 # The distance from the camera at which lights fade away completely.
@@ -470,7 +470,7 @@ light fade start = 0.85
 max lights = 8
 
 # Sets minimum ambient brightness of interior cells. Levels below this threshold will have their
-# ambient values adjusted to balance the darker interiors. 
+# ambient values adjusted to balance the darker interiors.
 # When 'lighting method' is set to 'legacy', this setting will have no effect.
 minimum interior brightness = 0.1
 

From 71c30a31df20242a1554c3c632172a96336a081d Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Sat, 3 Apr 2021 22:25:13 -0700
Subject: [PATCH 0578/2859] in-game settings, some require restart

---
 apps/openmw/mwgui/settingswindow.cpp          |  90 +++++++++++-
 apps/openmw/mwgui/settingswindow.hpp          |   9 +-
 apps/openmw/mwrender/renderingmanager.cpp     |  20 ++-
 components/sceneutil/lightmanager.cpp         | 136 +++++++++++-------
 components/sceneutil/lightmanager.hpp         |  11 +-
 .../reference/modding/settings/shaders.rst    |   4 +-
 files/mygui/openmw_settings_window.layout     |  89 ++++++++++++
 files/shaders/lighting.glsl                   |  81 +++++++----
 files/shaders/water_fragment.glsl             |   7 +-
 9 files changed, 352 insertions(+), 95 deletions(-)

diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index 538b3db5ed..a93400490c 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -6,6 +6,7 @@
 #include <MyGUI_ScrollView.h>
 #include <MyGUI_Gui.h>
 #include <MyGUI_TabControl.h>
+#include <MyGUI_TabItem.h>
 
 #include <SDL_video.h>
 
@@ -17,6 +18,7 @@
 #include <components/misc/constants.hpp>
 #include <components/widgets/sharedstatebutton.hpp>
 #include <components/settings/settings.hpp>
+#include <components/sceneutil/lightmanager.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
@@ -107,7 +109,7 @@ namespace
 
 namespace MWGui
 {
-    void SettingsWindow::configureWidgets(MyGUI::Widget* widget)
+    void SettingsWindow::configureWidgets(MyGUI::Widget* widget, bool init)
     {
         MyGUI::EnumeratorWidgetPtr widgets = widget->getEnumerator();
         while (widgets.next())
@@ -121,7 +123,8 @@ namespace MWGui
                                                                       getSettingCategory(current))
                         ? "#{sOn}" : "#{sOff}";
                 current->castType<MyGUI::Button>()->setCaptionWithReplacing(initialValue);
-                current->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onButtonToggled);
+                if (init)
+                    current->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onButtonToggled);
             }
             if (type == sliderType)
             {
@@ -141,6 +144,12 @@ namespace MWGui
                         ss << std::fixed << std::setprecision(2) << value/Constants::CellSizeInUnits;
                         valueStr = ss.str();
                     }
+                    else if (valueType == "Float")
+                    {
+                        std::stringstream ss;
+                        ss << std::fixed << std::setprecision(2) << value;
+                        valueStr = ss.str();
+                    }
                     else
                         valueStr = MyGUI::utility::toString(int(value));
 
@@ -155,12 +164,13 @@ namespace MWGui
                     valueStr = MyGUI::utility::toString(value);
                     scroll->setScrollPosition(value);
                 }
-                scroll->eventScrollChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onSliderChangePosition);
+                if (init)
+                    scroll->eventScrollChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onSliderChangePosition);
                 if (scroll->getVisible())
                     updateSliderLabel(scroll, valueStr);
             }
 
-            configureWidgets(current);
+            configureWidgets(current, init);
         }
     }
 
@@ -187,7 +197,7 @@ namespace MWGui
         getWidget(unusedSlider, widgetName);
         unusedSlider->setVisible(false);
 
-        configureWidgets(mMainWidget);
+        configureWidgets(mMainWidget, true);
 
         setTitle("#{sOptions}");
 
@@ -204,6 +214,9 @@ namespace MWGui
         getWidget(mControllerSwitch, "ControllerButton");
         getWidget(mWaterTextureSize, "WaterTextureSize");
         getWidget(mWaterReflectionDetail, "WaterReflectionDetail");
+        getWidget(mLightingMethodButton, "LightingMethodButton");
+        getWidget(mMaxLightsSlider, "MaxLightsSlider");
+        getWidget(mLightsResetButton, "LightsResetButton");
 
 #ifndef WIN32
         // hide gamma controls since it currently does not work under Linux
@@ -229,6 +242,9 @@ namespace MWGui
         mWaterTextureSize->eventComboChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onWaterTextureSizeChanged);
         mWaterReflectionDetail->eventComboChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onWaterReflectionDetailChanged);
 
+        mLightingMethodButton->eventComboChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onLightingMethodChanged);
+        mLightsResetButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onLightsResetButtonClicked);
+
         mKeyboardSwitch->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onKeyboardSwitchClicked);
         mControllerSwitch->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onControllerSwitchClicked);
 
@@ -272,6 +288,21 @@ namespace MWGui
         waterReflectionDetail = std::min(5, std::max(0, waterReflectionDetail));
         mWaterReflectionDetail->setIndexSelected(waterReflectionDetail);
 
+        auto lightingMethod = SceneUtil::LightManager::getLightingMethodFromString(Settings::Manager::getString("lighting method", "Shaders"));
+        switch (lightingMethod)
+        {
+        case SceneUtil::LightingMethod::Undefined:
+        case SceneUtil::LightingMethod::FFP:
+            mLightingMethodButton->setIndexSelected(0);
+            break;
+        case SceneUtil::LightingMethod::PerObjectUniform:
+            mLightingMethodButton->setIndexSelected(1);
+            break;
+        case SceneUtil::LightingMethod::SingleUBO:
+            mLightingMethodButton->setIndexSelected(2);
+            break;
+        }
+
         mWindowBorderButton->setEnabled(!Settings::Manager::getBool("fullscreen", "Video"));
 
         mKeyboardSwitch->setStateSelected(true);
@@ -358,6 +389,49 @@ namespace MWGui
         apply();
     }
 
+    void SettingsWindow::onLightsResetButtonClicked(MyGUI::Widget* _sender)
+    {
+        std::vector<std::string> buttons = {"#{sYes}", "#{sNo}"};
+        std::string message = "This will reset all lighting settings to default, some changes will require a restart. Would you like to continue?";
+        MWBase::Environment::get().getWindowManager()->interactiveMessageBox(message, buttons, true);
+        int selectedButton = MWBase::Environment::get().getWindowManager()->readPressedButton();
+        if (selectedButton == 1 || selectedButton == -1)
+            return;
+
+        Settings::Manager::setString("lighting method", "Shaders", "shaders compatibility");
+        Settings::Manager::setFloat("light bounds multiplier", "Shaders", 1.75);
+        Settings::Manager::setInt("maximum light distance", "Shaders", 8192);
+        Settings::Manager::setFloat("light fade start", "Shaders", 0.85);
+        Settings::Manager::setFloat("minimum interior brightness", "Shaders", 0.1);
+        Settings::Manager::setInt("max lights", "Shaders", 8);
+
+        mLightingMethodButton->setIndexSelected(1);
+
+        apply();
+        configureWidgets(mMainWidget, false);
+    }
+
+    void SettingsWindow::onLightingMethodChanged(MyGUI::ComboBox* _sender, size_t pos)
+    {
+        std::string setting;
+        auto lightingMethod = SceneUtil::LightManager::getLightingMethodFromString(_sender->getItemNameAt(pos));
+        switch (lightingMethod)
+        {
+        case SceneUtil::LightingMethod::FFP:
+            setting = "legacy";
+            break;
+        case SceneUtil::LightingMethod::Undefined:
+        case SceneUtil::LightingMethod::PerObjectUniform:
+            setting = "shaders compatibility";
+            break;
+        case SceneUtil::LightingMethod::SingleUBO:
+            setting = "shaders";
+            break;
+        }
+        Settings::Manager::setString("lighting method", "Shaders", setting);
+        apply();
+    }
+
     void SettingsWindow::onButtonToggled(MyGUI::Widget* _sender)
     {
         std::string on = MWBase::Environment::get().getWindowManager()->getGameSettingString("sOn", "On");
@@ -460,6 +534,12 @@ namespace MWGui
                     ss << std::fixed << std::setprecision(2) << value/Constants::CellSizeInUnits;
                     valueStr = ss.str();
                 }
+                else if (valueType == "Float")
+                {
+                    std::stringstream ss;
+                    ss << std::fixed << std::setprecision(2) << value;
+                    valueStr = ss.str();
+                }
                 else
                     valueStr = MyGUI::utility::toString(int(value));
             }
diff --git a/apps/openmw/mwgui/settingswindow.hpp b/apps/openmw/mwgui/settingswindow.hpp
index 6f25dd1143..3ec142731e 100644
--- a/apps/openmw/mwgui/settingswindow.hpp
+++ b/apps/openmw/mwgui/settingswindow.hpp
@@ -35,6 +35,10 @@ namespace MWGui
             MyGUI::ComboBox* mWaterTextureSize;
             MyGUI::ComboBox* mWaterReflectionDetail;
 
+            MyGUI::ComboBox* mLightingMethodButton;
+            MyGUI::ScrollBar* mMaxLightsSlider;
+            MyGUI::Button* mLightsResetButton;
+
             // controls
             MyGUI::ScrollView* mControlsBox;
             MyGUI::Button* mResetControlsButton;
@@ -55,6 +59,9 @@ namespace MWGui
             void onWaterTextureSizeChanged(MyGUI::ComboBox* _sender, size_t pos);
             void onWaterReflectionDetailChanged(MyGUI::ComboBox* _sender, size_t pos);
 
+            void onLightsResetButtonClicked(MyGUI::Widget* _sender);
+            void onLightingMethodChanged(MyGUI::ComboBox* _sender, size_t pos);
+
             void onRebindAction(MyGUI::Widget* _sender);
             void onInputTabMouseWheel(MyGUI::Widget* _sender, int _rel);
             void onResetDefaultBindings(MyGUI::Widget* _sender);
@@ -66,7 +73,7 @@ namespace MWGui
 
             void apply();
 
-            void configureWidgets(MyGUI::Widget* widget);
+            void configureWidgets(MyGUI::Widget* widget, bool init);
             void updateSliderLabel(MyGUI::ScrollBar* scroller, const std::string& value);
 
             void layoutControlsBox();
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index c14431518d..e5c5ace9d5 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -52,6 +52,7 @@
 #include "../mwgui/loadingscreen.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwmechanics/actorutil.hpp"
 
 #include "sky.hpp"
 #include "effectmanager.hpp"
@@ -224,8 +225,7 @@ namespace MWRender
         resourceSystem->getSceneManager()->getShaderManager().setLightingMethod(sceneRoot->getLightingMethod());
         resourceSystem->getSceneManager()->setLightingMethod(sceneRoot->getLightingMethod());
 
-        if (sceneRoot->getLightingMethod() != SceneUtil::LightingMethod::FFP)
-            mMinimumAmbientLuminance = std::clamp(Settings::Manager::getFloat("minimum interior brightness", "Shaders"), 0.f, 1.f);
+        mMinimumAmbientLuminance = std::clamp(Settings::Manager::getFloat("minimum interior brightness", "Shaders"), 0.f, 1.f);
 
         sceneRoot->setLightingMask(Mask_Lighting);
         mSceneRoot = sceneRoot;
@@ -1144,9 +1144,25 @@ namespace MWRender
             else if (it->first == "General" && (it->second == "texture filter" ||
                                                 it->second == "texture mipmap" ||
                                                 it->second == "anisotropy"))
+            {
                 updateTextureFiltering();
+            }
             else if (it->first == "Water")
+            {
                 mWater->processChangedSettings(changed);
+            }
+            else if (it->first == "Shaders" && it->second == "minimum interior brightness")
+            {
+                mMinimumAmbientLuminance = std::clamp(Settings::Manager::getFloat("minimum interior brightness", "Shaders"), 0.f, 1.f);
+                if (MWMechanics::getPlayer().getCell())
+                    configureAmbient(MWMechanics::getPlayer().getCell()->getCell());
+            }
+            else if (it->first == "Shaders" && (it->second == "light bounds multiplier" ||
+                                                it->second == "maximum light distance" ||
+                                                it->second == "light fade start"))
+            {
+                static_cast<SceneUtil::LightManager*>(getLightRoot())->processChangedSettings(changed);
+            }
         }
     }
 
diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index f20e28a7e3..8e4c9910f8 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -10,8 +10,6 @@
 
 #include <components/misc/stringops.hpp>
 
-#include <components/settings/settings.hpp>
-
 #include <components/debug/debuglog.hpp>
 
 namespace
@@ -41,6 +39,43 @@ namespace
     {
         light->setUserValue("radius", value);
     }
+
+    void configurePosition(osg::Matrixf& mat, const osg::Vec4& pos)
+    {
+        mat(0, 0) = pos.x();
+        mat(0, 1) = pos.y();
+        mat(0, 2) = pos.z();
+    }
+
+    void configureAmbient(osg::Matrixf& mat, const osg::Vec4& color)
+    {
+        mat(1, 0) = color.r();
+        mat(1, 1) = color.g();
+        mat(1, 2) = color.b();
+    }
+
+    void configureDiffuse(osg::Matrixf& mat, const osg::Vec4& color)
+    {
+        mat(2, 0) = color.r();
+        mat(2, 1) = color.g();
+        mat(2, 2) = color.b();
+    }
+
+    void configureSpecular(osg::Matrixf& mat, const osg::Vec4& color)
+    {
+        mat(3, 0) = color.r();
+        mat(3, 1) = color.g();
+        mat(3, 2) = color.b();
+        mat(3, 3) = color.a();
+    }
+
+    void configureAttenuation(osg::Matrixf& mat, float c, float l, float q, float r)
+    {
+        mat(0, 3) = c;
+        mat(1, 3) = l;
+        mat(2, 3) = q;
+        mat(3, 3) = r;
+    }
 }
 
 namespace SceneUtil
@@ -206,11 +241,12 @@ namespace SceneUtil
             }
         case LightingMethod::PerObjectUniform:
             {
-                stateset->addUniform(new osg::Uniform("LightBuffer[0].diffuse", light->getDiffuse()), mode);
-                stateset->addUniform(new osg::Uniform("LightBuffer[0].ambient", light->getAmbient()), mode);
-                stateset->addUniform(new osg::Uniform("LightBuffer[0].specular", light->getSpecular()), mode);
-                stateset->addUniform(new osg::Uniform("LightBuffer[0].position", light->getPosition()), mode);
-
+                osg::Matrixf lightMat;
+                configurePosition(lightMat, light->getPosition());
+                configureAmbient(lightMat, light->getAmbient());
+                configureDiffuse(lightMat, light->getDiffuse());
+                configureSpecular(lightMat, light->getSpecular());
+                stateset->addUniform(new osg::Uniform("LightBuffer", lightMat), mode);
                 break;
             }
         case LightingMethod::SingleUBO:
@@ -381,14 +417,20 @@ namespace SceneUtil
 
         void apply(osg::State &state) const override
         {
+            auto* lightUniform = mLightManager->getStateSet()->getUniform("LightBuffer");
             for (size_t i = 0; i < mLights.size(); ++i)
             {
                 auto light = mLights[i];
-                mLightManager->getLightUniform(i+1, LightManager::UniformKey::Diffuse)->set(light->getDiffuse());
-                mLightManager->getLightUniform(i+1, LightManager::UniformKey::Ambient)->set(light->getAmbient());
-                mLightManager->getLightUniform(i+1, LightManager::UniformKey::Attenuation)->set(osg::Vec4(light->getConstantAttenuation(), light->getLinearAttenuation(), light->getQuadraticAttenuation(), getLightRadius(light)));
-                mLightManager->getLightUniform(i+1, LightManager::UniformKey::Position)->set(light->getPosition() * state.getInitialViewMatrix());
+                osg::Matrixf lightMat;
+
+                configurePosition(lightMat, light->getPosition() * state.getInitialViewMatrix());
+                configureAmbient(lightMat, light->getAmbient());
+                configureDiffuse(lightMat, light->getDiffuse());
+                configureAttenuation(lightMat, light->getConstantAttenuation(), light->getLinearAttenuation(), light->getQuadraticAttenuation(), getLightRadius(light));
+
+                lightUniform->setElement(i+1, lightMat);
             }
+            lightUniform->dirty();
         }
 
     private:
@@ -589,10 +631,12 @@ namespace SceneUtil
                 {
                     if (mLightManager->getLightingMethod() == LightingMethod::PerObjectUniform)
                     {
-                        mLightManager->getLightUniform(0, LightManager::UniformKey::Diffuse)->set(sun->getDiffuse());
-                        mLightManager->getLightUniform(0, LightManager::UniformKey::Ambient)->set(sun->getAmbient());
-                        mLightManager->getLightUniform(0, LightManager::UniformKey::Specular)->set(sun->getSpecular());
-                        mLightManager->getLightUniform(0, LightManager::UniformKey::Position)->set(sun->getPosition() * (*cv->getCurrentRenderStage()->getInitialViewMatrix()));
+                        osg::Matrixf lightMat;
+                        configurePosition(lightMat, sun->getPosition() * (*cv->getCurrentRenderStage()->getInitialViewMatrix()));
+                        configureAmbient(lightMat, sun->getAmbient());
+                        configureDiffuse(lightMat, sun->getDiffuse());
+                        configureSpecular(lightMat, sun->getSpecular());
+                        mLightManager->getStateSet()->getUniform("LightBuffer")->setElement(0, lightMat);
                     }
                     else
                     {
@@ -760,14 +804,7 @@ namespace SceneUtil
             lightingMethod = LightingMethod::PerObjectUniform;
         }
 
-        mPointLightRadiusMultiplier = std::clamp(Settings::Manager::getFloat("light bounds multiplier", "Shaders"), 0.f, 10.f);
-
-        mPointLightFadeEnd = std::max(0.f, Settings::Manager::getFloat("maximum light distance", "Shaders"));
-        if (mPointLightFadeEnd > 0)
-        {
-            mPointLightFadeStart = std::clamp(Settings::Manager::getFloat("light fade start", "Shaders"), 0.f, 1.f);
-            mPointLightFadeStart = mPointLightFadeEnd * mPointLightFadeStart;
-        }
+        updateSettings();
 
         osg::GLExtensions* exts = osg::GLExtensions::Get(0, false);
         bool supportsUBO = exts && exts->isUniformBufferObjectSupported;
@@ -839,9 +876,6 @@ namespace SceneUtil
     {
         Shader::ShaderManager::DefineMap defines;
 
-        bool ffp = usingFFP();
-
-        defines["ffpLighting"] = ffp ? "1" : "0";
         defines["maxLights"] = std::to_string(getMaxLights());
         defines["maxLightsInScene"] = std::to_string(getMaxLightsInScene());
         defines["lightingModel"] = std::to_string(static_cast<int>(mLightingMethod));
@@ -852,6 +886,26 @@ namespace SceneUtil
         return defines;
     }
 
+    void LightManager::processChangedSettings(const Settings::CategorySettingVector& changed)
+    {
+        updateSettings();
+    }
+
+    void LightManager::updateSettings()
+    {
+        if (getLightingMethod() == LightingMethod::FFP)
+            return;
+
+        mPointLightRadiusMultiplier = std::clamp(Settings::Manager::getFloat("light bounds multiplier", "Shaders"), 0.f, 5.f);
+
+        mPointLightFadeEnd = std::max(0.f, Settings::Manager::getFloat("maximum light distance", "Shaders"));
+        if (mPointLightFadeEnd > 0)
+        {
+            mPointLightFadeStart = std::clamp(Settings::Manager::getFloat("light fade start", "Shaders"), 0.f, 1.f);
+            mPointLightFadeStart = mPointLightFadeEnd * mPointLightFadeStart;
+        }
+    }
+
     void LightManager::initFFP(int targetLights)
     {
         setLightingMethod(LightingMethod::FFP);
@@ -866,38 +920,15 @@ namespace SceneUtil
         auto* stateset = getOrCreateStateSet();
 
         setLightingMethod(LightingMethod::PerObjectUniform);
-        setMaxLights(std::max(2, targetLights));
+        setMaxLights(std::clamp(targetLights, 2, 64));
 
-        mLightUniforms.resize(getMaxLights()+1);
-        for (size_t i = 0; i < mLightUniforms.size(); ++i)
-        {
-            osg::ref_ptr<osg::Uniform> udiffuse = new osg::Uniform(osg::Uniform::FLOAT_VEC4, ("LightBuffer[" + std::to_string(i) + "].diffuse").c_str());
-            osg::ref_ptr<osg::Uniform> uspecular = new osg::Uniform(osg::Uniform::FLOAT_VEC4, ("LightBuffer[" + std::to_string(i) + "].specular").c_str());
-            osg::ref_ptr<osg::Uniform> uambient = new osg::Uniform(osg::Uniform::FLOAT_VEC4, ("LightBuffer[" + std::to_string(i) + "].ambient").c_str());
-            osg::ref_ptr<osg::Uniform> uposition = new osg::Uniform(osg::Uniform::FLOAT_VEC4, ("LightBuffer[" + std::to_string(i) + "].position").c_str());
-            osg::ref_ptr<osg::Uniform> uattenuation = new osg::Uniform(osg::Uniform::FLOAT_VEC4, ("LightBuffer[" + std::to_string(i) + "].attenuation").c_str());
-
-            mLightUniforms[i].emplace(UniformKey::Diffuse, udiffuse);
-            mLightUniforms[i].emplace(UniformKey::Ambient, uambient);
-            mLightUniforms[i].emplace(UniformKey::Specular, uspecular);
-            mLightUniforms[i].emplace(UniformKey::Position, uposition);
-            mLightUniforms[i].emplace(UniformKey::Attenuation, uattenuation);
-
-            stateset->addUniform(udiffuse);
-            stateset->addUniform(uambient);
-            stateset->addUniform(uposition);
-            stateset->addUniform(uattenuation);
-
-            // specular isn't used besides sun, complete waste to upload it
-            if (i == 0)
-                stateset->addUniform(uspecular);
-        }
+        stateset->addUniform(new osg::Uniform(osg::Uniform::FLOAT_MAT4, "LightBuffer", getMaxLights() + 1));
     }
 
     void LightManager::initSingleUBO(int targetLights)
     {
         setLightingMethod(LightingMethod::SingleUBO);
-        setMaxLights(std::clamp(targetLights, 2, getMaxLightsInScene() / 2));
+        setMaxLights(std::clamp(targetLights, 2, 64));
 
         for (int i = 0; i < 2; ++i)
         {
@@ -912,7 +943,6 @@ namespace SceneUtil
         getOrCreateStateSet()->setAttribute(new LightManagerStateAttribute(this), osg::StateAttribute::ON);
     }
 
-
     void LightManager::setLightingMethod(LightingMethod method)
     {
         mLightingMethod = method;
diff --git a/components/sceneutil/lightmanager.hpp b/components/sceneutil/lightmanager.hpp
index cd8f2d3127..2fdc14a8da 100644
--- a/components/sceneutil/lightmanager.hpp
+++ b/components/sceneutil/lightmanager.hpp
@@ -14,6 +14,8 @@
 
 #include <components/shader/shadermanager.hpp>
 
+#include <components/settings/settings.hpp>
+
 namespace osgUtil
 {
     class CullVisitor;
@@ -172,10 +174,10 @@ namespace SceneUtil
 
         auto& getLightBuffer(size_t frameNum) { return mLightBuffers[frameNum%2]; }
 
-        auto& getLightUniform(int index, UniformKey key) { return mLightUniforms[index][key]; }
-
         std::map<std::string, std::string> getLightDefines() const;
 
+        void processChangedSettings(const Settings::CategorySettingVector& changed);
+
     private:
         friend class LightManagerStateAttribute;
         friend class LightManagerCullCallback;
@@ -184,6 +186,8 @@ namespace SceneUtil
         void initPerObjectUniform(int targetLights);
         void initSingleUBO(int targetLights);
 
+        void updateSettings();
+
         void setLightingMethod(LightingMethod method);
         void setMaxLights(int value);
 
@@ -212,9 +216,6 @@ namespace SceneUtil
         using LightIndexMap = std::unordered_map<int, int>;
         LightIndexMap mLightIndexMaps[2];
 
-        using UniformMap = std::vector<std::unordered_map<UniformKey, osg::ref_ptr<osg::Uniform>>>;
-        UniformMap mLightUniforms;
-
         std::unique_ptr<StateSetGenerator> mStateSetGenerator;
 
         LightingMethod mLightingMethod;
diff --git a/docs/source/reference/modding/settings/shaders.rst b/docs/source/reference/modding/settings/shaders.rst
index be38bd3ec4..0537332a81 100644
--- a/docs/source/reference/modding/settings/shaders.rst
+++ b/docs/source/reference/modding/settings/shaders.rst
@@ -185,7 +185,7 @@ light bounds multiplier
 -----------------------
 
 :Type:		float
-:Range:		0.0-10.0
+:Range:		0.0-5.0
 :Default:	1.75
 
 Controls the bounding sphere radius of point lights, which is used to determine
@@ -228,7 +228,7 @@ max lights
 ----------
 
 :Type:		integer
-:Range:		>=2
+:Range:		2-64
 :Default:	8
 
 Sets the maximum number of lights that each object can receive lighting from.
diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index babb5c28f9..ef5d4a6cb4 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -456,6 +456,95 @@
                             </Widget>
                         </Widget>
 
+                    </Widget>
+
+                    <Widget type="TabItem" skin="" position="4 32 360 308">
+                        <Property key="Caption" value="  Lights  "/>
+                        <!-- Lighting Method -->
+                        <Widget type="TextBox" skin="NormalText" position="0 4 160 18" align="Left Top">
+                            <Property key="Caption" value="*Lighting Method"/>
+                        </Widget>
+                        <Widget type="ComboBox" skin="MW_ComboBox" position="0 28 170 24" align="Left Top" name="LightingMethodButton">
+                            <Property key="AddItem" value="legacy"/>
+                            <Property key="AddItem" value="shaders compatibility"/>
+                            <Property key="AddItem" value="shaders"/>
+                        </Widget>
+                        <!-- Max Lights -->
+                        <Widget type="TextBox" skin="NormalText" position="178 4 160 18" align="Left Top" name="MaxLightsText"/>
+                        <Widget type="ScrollBar" skin="MW_HScroll" position="178 30 160 18" align="Right Top HStretch" name="MaxLightsSlider">
+                            <Property key="Range" value="24"/>
+                            <Property key="Page" value="1"/>
+                            <UserString key="SettingType" value="Slider"/>
+                            <UserString key="SettingMin" value="8"/>
+                            <UserString key="SettingMax" value="32"/>
+                            <UserString key="SettingCategory" value="Shaders"/>
+                            <UserString key="SettingName" value="max lights"/>
+                            <UserString key="SettingValueType" value="Integer"/>
+                            <UserString key="SettingLabelWidget" value="MaxLightsText"/>
+                            <UserString key="SettingLabelCaption" value="*Max Lights (%s)"/>
+                        </Widget>
+                        <Widget type="ImageBox" skin="MW_HLine" position="0 54 360 18" align="Top HStretch"/>
+                        <!-- Light Fade Start -->
+                        <Widget type="TextBox" skin="NormalText" position="0 78 352 18" align="Left Top" name="MaxLightDistanceText"/>
+                        <Widget type="ScrollBar" skin="MW_HScroll" position="0 104 352 18" align="HStretch Top">
+                            <Property key="Range" value="8192"/>
+                            <Property key="Page" value="1"/>
+                            <UserString key="SettingType" value="Slider"/>
+                            <UserString key="SettingMin" value="0"/>
+                            <UserString key="SettingMax" value="8192"/>
+                            <UserString key="SettingCategory" value="Shaders"/>
+                            <UserString key="SettingName" value="maximum light distance"/>
+                            <UserString key="SettingValueType" value="Integer"/>
+                            <UserString key="SettingLabelWidget" value="MaxLightDistanceText"/>
+                            <UserString key="SettingLabelCaption" value="Maximum Light Distance (%s)"/>
+                        </Widget>
+                        <!-- Light Fade Multiplier -->
+                        <Widget type="TextBox" skin="NormalText" position="0 128 352 18" align="Left Top" name="LightFadeMultiplierText"/>
+                        <Widget type="ScrollBar" skin="MW_HScroll" position="0 152 352 18" align="HStretch Top">
+                            <Property key="Range" value="10000"/>
+                            <Property key="Page" value="300"/>
+                            <UserString key="SettingType" value="Slider"/>
+                            <UserString key="SettingCategory" value="Shaders"/>
+                            <UserString key="SettingName" value="light fade start"/>
+                            <UserString key="SettingValueType" value="Float"/>
+                            <UserString key="SettingLabelWidget" value="LightFadeMultiplierText"/>
+                            <UserString key="SettingLabelCaption" value="Fade Start Multiplier (%s)"/>
+                        </Widget>
+                        <!-- Bounding Sphere Multiplier -->
+                        <Widget type="TextBox" skin="NormalText" position="0 176 352 18" align="Left Top" name="BoundingSphereMultText"/>
+                        <Widget type="ScrollBar" skin="MW_HScroll" position="0 200 352 18" align="HStretch Top">
+                            <Property key="Range" value="10000"/>
+                            <Property key="Page" value="300"/>
+                            <UserString key="SettingType" value="Slider"/>
+                            <UserString key="SettingMin" value="0.1"/>
+                            <UserString key="SettingMax" value="5.0"/>
+                            <UserString key="SettingCategory" value="Shaders"/>
+                            <UserString key="SettingName" value="light bounds multiplier"/>
+                            <UserString key="SettingValueType" value="Float"/>
+                            <UserString key="SettingLabelWidget" value="BoundingSphereMultText"/>
+                            <UserString key="SettingLabelCaption" value="Bounding Sphere Multiplier (%s)"/>
+                        </Widget>
+                        <!-- Minimum Ambient Brightness -->
+                        <Widget type="TextBox" skin="NormalText" position="0 224 352 18" align="Left Top" name="MinimumBrightnessText"/>
+                        <Widget type="ScrollBar" skin="MW_HScroll" position="0 248 352 18" align="HStretch Top">
+                            <Property key="Range" value="10000"/>
+                            <Property key="Page" value="300"/>
+                            <UserString key="SettingType" value="Slider"/>
+                            <UserString key="SettingCategory" value="Shaders"/>
+                            <UserString key="SettingName" value="minimum interior brightness"/>
+                            <UserString key="SettingValueType" value="Float"/>
+                            <UserString key="SettingLabelWidget" value="MinimumBrightnessText"/>
+                            <UserString key="SettingLabelCaption" value="Minimum Interior Brightness (%s)"/>
+                        </Widget>
+
+                        <Widget type="AutoSizedButton" skin="MW_Button" position="0 308 0 0" align="Bottom Left" name="LightsResetButton">
+                            <Property key="Caption" value="Reset To Defaults"/>
+                        </Widget>
+                        <Widget type="AutoSizedTextBox" skin="NormalText" position="210 308 0 0" align="Bottom Right HStretch">
+                            <Property key="Caption" value="(*) Requires Restart"/>
+                            <Property key="TextAlign" value="Right"/>
+                        </Widget>
+
                     </Widget>
                     <!--
                     <Widget type="TabItem" skin="" position="0 28 352 268">
diff --git a/files/shaders/lighting.glsl b/files/shaders/lighting.glsl
index a3df6666fa..d6ed9dc0ed 100644
--- a/files/shaders/lighting.glsl
+++ b/files/shaders/lighting.glsl
@@ -2,7 +2,7 @@
 #define LIGHTING_MODEL_SINGLE_UBO 1
 #define LIGHTING_MODEL_PER_OBJECT_UNIFORM 2
 
-#if !@ffpLighting
+#if @lightingModel != LIGHTING_MODEL_FFP
 #define getLight LightBuffer
 
 float quickstep(float x)
@@ -13,7 +13,7 @@ float quickstep(float x)
     return x;
 }
 
-#if @useUBO
+#if @lightingModel == LIGHTING_MODEL_SINGLE_UBO
 
 const int mask = int(0xff);
 const ivec4 shift = ivec4(int(0), int(8), int(16), int(24));
@@ -33,11 +33,16 @@ vec4 unpackRGBA(int data)
                 ,(float(((data >> shift.w) & mask)) / 255.0));
 }
 
+/* Layout:
+packedColors: 8-bit unsigned RGB packed as (diffuse, ambient, specular).
+              sign bit is stored in diffuse alpha component
+attenuation: constant, linear, quadratic, light radius (as defined in content)
+*/
 struct LightData
 {
-    ivec4 packedColors; // diffuse, ambient, specular
+    ivec4 packedColors;
     vec4 position;
-    vec4 attenuation; // constant, linear, quadratic, radius
+    vec4 attenuation;
 };
 
 uniform int PointLightIndex[@maxLights];
@@ -51,16 +56,15 @@ uniform LightBufferBinding
 
 #else
 
-struct LightData
-{
-    vec4 position;
-    vec4 diffuse;
-    vec4 ambient;
-    vec4 specular;
-    vec4 attenuation; // constant, linear, quadratic, radius
-};
-
-uniform LightData LightBuffer[@maxLights];
+/* Layout:
+--------------------------------------- -----------
+|  pos_x  |  ambi_r  |  diff_r  |  spec_r         |
+|  pos_y  |  ambi_g  |  diff_g  |  spec_g         |
+|  pos_z  |  ambi_b  |  diff_b  |  spec_b         |
+|  att_c  |  att_l   |  att_q   |  radius/spec_a  |
+ --------------------------------------------------
+*/
+uniform mat4 LightBuffer[@maxLights];
 uniform int PointLightCount;
 
 #endif
@@ -71,9 +75,16 @@ uniform int PointLightCount;
 
 void perLightSun(out vec3 ambientOut, out vec3 diffuseOut, vec3 viewPos, vec3 viewNormal)
 {
+#if @lightingModel == LIGHTING_MODEL_PER_OBJECT_UNIFORM
+    vec3 lightDir = normalize(getLight[0][0].xyz);
+#else
     vec3 lightDir = normalize(getLight[0].position.xyz);
+#endif
 
-#if @lightingModel == LIGHTING_MODEL_SINGLE_UBO
+#if @lightingModel == LIGHTING_MODEL_PER_OBJECT_UNIFORM
+    ambientOut = getLight[0][1].xyz;
+    vec3 sunDiffuse = getLight[0][2].xyz;
+#elif @lightingModel == LIGHTING_MODEL_SINGLE_UBO
     ivec4 data = getLight[0].packedColors;
     ambientOut = unpackRGB(data.y);
     vec3 sunDiffuse = unpackRGB(data.x);
@@ -81,6 +92,7 @@ void perLightSun(out vec3 ambientOut, out vec3 diffuseOut, vec3 viewPos, vec3 vi
     ambientOut = getLight[0].ambient.xyz;
     vec3 sunDiffuse = getLight[0].diffuse.xyz;
 #endif
+
     float lambert = dot(viewNormal.xyz, lightDir);
 #ifndef GROUNDCOVER
     lambert = max(lambert, 0.0);
@@ -98,13 +110,22 @@ void perLightSun(out vec3 ambientOut, out vec3 diffuseOut, vec3 viewPos, vec3 vi
 
 void perLightPoint(out vec3 ambientOut, out vec3 diffuseOut, int lightIndex, vec3 viewPos, vec3 viewNormal)
 {
+#if @lightingModel == LIGHTING_MODEL_PER_OBJECT_UNIFORM
+    vec3 lightPos = getLight[lightIndex][0].xyz - viewPos;
+#else
     vec3 lightPos = getLight[lightIndex].position.xyz - viewPos;
+#endif
 
     float lightDistance = length(lightPos);
 
-#if !@ffpLighting
-    // This has a *considerable* performance uplift where GPU is a bottleneck
-    if (lightDistance > getLight[lightIndex].attenuation.w * 2.0)
+#if @lightingModel != LIGHTING_MODEL_FFP
+#if @lightingModel == LIGHTING_MODEL_PER_OBJECT_UNIFORM
+    float radius = getLight[lightIndex][3][3];
+#else
+    float radius = getLight[lightIndex].attenuation.w;
+#endif
+
+    if (lightDistance > radius * 2.0)
     {
         ambientOut = vec3(0.0);
         diffuseOut = vec3(0.0);
@@ -114,17 +135,17 @@ void perLightPoint(out vec3 ambientOut, out vec3 diffuseOut, int lightIndex, vec
 
     lightPos = normalize(lightPos);
 
-#if @ffpLighting
-    float illumination = clamp(1.0 / (getLight[lightIndex].constantAttenuation + getLight[lightIndex].linearAttenuation * lightDistance + getLight[lightIndex].quadraticAttenuation * lightDistance * lightDistance), 0.0, 1.0);
-#else
+#if @lightingModel == LIGHTING_MODEL_PER_OBJECT_UNIFORM
+    float illumination = clamp(1.0 / (getLight[lightIndex][0].w + getLight[lightIndex][1].w * lightDistance + getLight[lightIndex][2].w * lightDistance * lightDistance), 0.0, 1.0);
+    illumination *= 1.0 - quickstep((lightDistance / radius) - 1.0);
+    ambientOut = getLight[lightIndex][1].xyz * illumination;
+#elif @lightingModel == LIGHTING_MODEL_SINGLE_UBO
     float illumination = clamp(1.0 / (getLight[lightIndex].attenuation.x + getLight[lightIndex].attenuation.y * lightDistance + getLight[lightIndex].attenuation.z * lightDistance * lightDistance), 0.0, 1.0);
-    illumination *= 1.0 - quickstep((lightDistance / (getLight[lightIndex].attenuation.w)) - 1.0);
-#endif
-
-#if @useUBO
+    illumination *= 1.0 - quickstep((lightDistance / radius) - 1.0);
     ivec4 data = getLight[lightIndex].packedColors;
     ambientOut = unpackRGB(data.y) * illumination;
 #else
+    float illumination = clamp(1.0 / (getLight[lightIndex].constantAttenuation + getLight[lightIndex].linearAttenuation * lightDistance + getLight[lightIndex].quadraticAttenuation * lightDistance * lightDistance), 0.0, 1.0);
     ambientOut = getLight[lightIndex].ambient.xyz * illumination;
 #endif
 
@@ -142,8 +163,10 @@ void perLightPoint(out vec3 ambientOut, out vec3 diffuseOut, int lightIndex, vec
     lambert *= clamp(-8.0 * (1.0 - 0.3) * eyeCosine + 1.0, 0.3, 1.0);
 #endif
 
-#if @useUBO
+#if @lightingModel == LIGHTING_MODEL_SINGLE_UBO
     diffuseOut =  unpackRGB(data.x) * lambert * float(int(data.w));
+#elif @lightingModel == LIGHTING_MODEL_PER_OBJECT_UNIFORM
+    diffuseOut = getLight[lightIndex][2].xyz * lambert;
 #else
     diffuseOut = getLight[lightIndex].diffuse.xyz * lambert;
 #endif
@@ -191,10 +214,16 @@ void doLighting(vec3 viewPos, vec3 viewNormal, out vec3 diffuseLight, out vec3 a
 
 vec3 getSpecular(vec3 viewNormal, vec3 viewDirection, float shininess, vec3 matSpec)
 {
+#if @lightingModel == LIGHTING_MODEL_PER_OBJECT_UNIFORM
+    vec3 sunDir = getLight[0][0].xyz;
+#else
     vec3 sunDir = getLight[0].position.xyz;
+#endif
 
 #if @lightingModel == LIGHTING_MODEL_SINGLE_UBO
     vec3 sunSpec = unpackRGB(getLight[0].packedColors.z);
+#elif @lightingModel == LIGHTING_MODEL_PER_OBJECT_UNIFORM
+    vec3 sunSpec = getLight[0][3].xyz;
 #else
     vec3 sunSpec = getLight[0].specular.xyz;
 #endif
diff --git a/files/shaders/water_fragment.glsl b/files/shaders/water_fragment.glsl
index 651aff6a1a..9bc1567052 100644
--- a/files/shaders/water_fragment.glsl
+++ b/files/shaders/water_fragment.glsl
@@ -203,8 +203,11 @@ void main(void)
                    normal3 * midWaves.y + normal4 * smallWaves.x + normal5 * smallWaves.y + rippleAdd);
     normal = normalize(vec3(-normal.x * bump, -normal.y * bump, normal.z));
 
+#if @lightingModel == LIGHTING_MODEL_PER_OBJECT_UNIFORM
+    vec3 lVec = normalize((gl_ModelViewMatrixInverse * vec4(getLight[0][0].xyz, 0.0)).xyz);
+#else
     vec3 lVec = normalize((gl_ModelViewMatrixInverse * vec4(getLight[0].position.xyz, 0.0)).xyz);
-
+#endif
     vec3 cameraPos = (gl_ModelViewMatrixInverse * vec4(0,0,0,1)).xyz;
     vec3 vVec = normalize(position.xyz - cameraPos.xyz);
 
@@ -241,6 +244,8 @@ void main(void)
 
 #if @lightingModel == LIGHTING_MODEL_SINGLE_UBO
   vec4 sunSpec = unpackRGBA(getLight[0].packedColors.z);
+#elif @lightingModel == LIGHTING_MODEL_PER_OBJECT_UNIFORM
+  vec4 sunSpec = getLight[0][3];
 #else
   vec4 sunSpec = getLight[0].specular;
 #endif

From 4ba473b6840aa3b9b4fc2ecb9a8b3580837ed86d Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Mon, 5 Apr 2021 10:43:17 -0700
Subject: [PATCH 0579/2859] Finalize settings, torch fix

---
 apps/launcher/advancedpage.cpp            |   9 ++
 apps/opencs/model/world/data.cpp          |   2 +-
 apps/openmw/mwgui/settingswindow.cpp      |  69 ++++----
 apps/openmw/mwgui/settingswindow.hpp      |   5 +-
 apps/openmw/mwrender/animation.cpp        |  13 +-
 apps/openmw/mwrender/animation.hpp        |   1 +
 apps/openmw/mwrender/renderingmanager.cpp |  28 +++-
 components/sceneutil/lightcontroller.cpp  |   3 +-
 components/sceneutil/lightmanager.cpp     |  79 ++++++++-
 components/sceneutil/lightmanager.hpp     |  33 ++--
 components/sceneutil/lightutil.cpp        |   3 +-
 components/sceneutil/lightutil.hpp        |   2 +-
 files/mygui/openmw_settings_window.layout | 185 ++++++++++++----------
 files/shaders/lighting.glsl               |   8 +-
 files/ui/advancedpage.ui                  |  30 ++++
 15 files changed, 318 insertions(+), 152 deletions(-)

diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index d82dd1be2e..0aa3788052 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -7,6 +7,7 @@
 #include <QProxyStyle>
 #include <components/contentselector/view/contentselector.hpp>
 #include <components/contentselector/model/esmfile.hpp>
+#include <components/sceneutil/lightmanager.hpp>
 
 #include <cmath>
 
@@ -124,6 +125,11 @@ bool Launcher::AdvancedPage::loadSettings()
 
         loadSettingBool(activeGridObjectPagingCheckBox, "object paging active grid", "Terrain");
         viewingDistanceComboBox->setValue(convertToCells(mEngineSettings.getInt("viewing distance", "Camera")));
+
+        auto lightingMethod = SceneUtil::LightManager::getLightingMethodFromString(mEngineSettings.getString("lighting method", "Shaders"));
+        if (lightingMethod == SceneUtil::LightingMethod::Undefined)
+            lightingMethod = SceneUtil::LightingMethod::PerObjectUniform;
+        lightingMethodComboBox->setCurrentIndex(static_cast<int>(lightingMethod));
     }
 
     // Camera
@@ -246,6 +252,9 @@ void Launcher::AdvancedPage::saveSettings()
         {
             mEngineSettings.setInt("viewing distance", "Camera", convertToUnits(viewingDistance));
         }
+
+        auto lightingMethodStr = SceneUtil::LightManager::getLightingMethodString(static_cast<SceneUtil::LightingMethod>(lightingMethodComboBox->currentIndex()));
+        mEngineSettings.setString("lighting method", "Shaders", lightingMethodStr);
     }
 
     // Camera
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 31778b9047..319334c9bf 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -83,7 +83,7 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding, bool fsStrict, const Files::Pat
     defines["clamp"] = "1"; // Clamp lighting
     defines["preLightEnv"] = "0"; // Apply environment maps after lighting like Morrowind
     defines["radialFog"] = "0";
-    defines["ffpLighting"] = "1";
+    defines["lightingModel"] = "0";
     for (const auto& define : shadowDefines)
         defines[define.first] = define.second;
     mResourceSystem->getSceneManager()->getShaderManager().setGlobalDefines(defines);
diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index a93400490c..4d3b141524 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -6,7 +6,6 @@
 #include <MyGUI_ScrollView.h>
 #include <MyGUI_Gui.h>
 #include <MyGUI_TabControl.h>
-#include <MyGUI_TabItem.h>
 
 #include <SDL_video.h>
 
@@ -214,9 +213,9 @@ namespace MWGui
         getWidget(mControllerSwitch, "ControllerButton");
         getWidget(mWaterTextureSize, "WaterTextureSize");
         getWidget(mWaterReflectionDetail, "WaterReflectionDetail");
-        getWidget(mLightingMethodButton, "LightingMethodButton");
-        getWidget(mMaxLightsSlider, "MaxLightsSlider");
+        getWidget(mLightingMethodText, "LightingMethodText");
         getWidget(mLightsResetButton, "LightsResetButton");
+        getWidget(mLightSettingOverlay, "LightSettingOverlay");
 
 #ifndef WIN32
         // hide gamma controls since it currently does not work under Linux
@@ -242,7 +241,6 @@ namespace MWGui
         mWaterTextureSize->eventComboChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onWaterTextureSizeChanged);
         mWaterReflectionDetail->eventComboChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onWaterReflectionDetailChanged);
 
-        mLightingMethodButton->eventComboChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onLightingMethodChanged);
         mLightsResetButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onLightsResetButtonClicked);
 
         mKeyboardSwitch->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onKeyboardSwitchClicked);
@@ -289,18 +287,36 @@ namespace MWGui
         mWaterReflectionDetail->setIndexSelected(waterReflectionDetail);
 
         auto lightingMethod = SceneUtil::LightManager::getLightingMethodFromString(Settings::Manager::getString("lighting method", "Shaders"));
-        switch (lightingMethod)
+        mLightingMethodText->setCaption(SceneUtil::LightManager::getLightingMethodString(lightingMethod));
+
+        if (lightingMethod == SceneUtil::LightingMethod::FFP || !Settings::Manager::getBool("force shaders", "Shaders"))
+        {
+            std::string warningText =
+                "Unavailable with current settings."
+                "\n\nEnable \"force shaders\" and use either the \"shaders\" or \"shaders compatibility\" lighting method.";
+            MyGUI::Widget* parent = mLightSettingOverlay->getParent();
+            mLightSettingOverlay->setEnabled(false);
+            mLightSettingOverlay->setAlpha(0.8);
+            parent->setUserString("ToolTipType", "Layout");
+            parent->setUserString("ToolTipLayout", "TextToolTip");
+            parent->setUserString("Caption_Text", warningText);
+            parent->setEnabled(true);
+        }
+        else
         {
-        case SceneUtil::LightingMethod::Undefined:
-        case SceneUtil::LightingMethod::FFP:
-            mLightingMethodButton->setIndexSelected(0);
-            break;
-        case SceneUtil::LightingMethod::PerObjectUniform:
-            mLightingMethodButton->setIndexSelected(1);
-            break;
-        case SceneUtil::LightingMethod::SingleUBO:
-            mLightingMethodButton->setIndexSelected(2);
-            break;
+            std::string captionText;
+            if (lightingMethod == SceneUtil::LightingMethod::FFP)
+                captionText =
+                    "Emulates fixed function pipeline lighting, advanced light settings are disabled when this mode is active";
+            else if (lightingMethod == SceneUtil::LightingMethod::PerObjectUniform)
+                captionText =
+                    "Removes limit of 8 lights per object, fixes lighting attenuation, and enables groundcover lighting and light fade."
+                    "\n\nDesigned for compatibility across hardware, and is not meant for large max light counts.";
+            else if (lightingMethod == SceneUtil::LightingMethod::SingleUBO)
+                captionText =
+                    "Removes limit of 8 lights per object, fixes lighting attenuation, and enables groundcover lighting and light fade."
+                    "\n\nDesigned for more modern hardware and large max light counts.";
+            mLightingMethodText->setUserString("Caption_Text", captionText);
         }
 
         mWindowBorderButton->setEnabled(!Settings::Manager::getBool("fullscreen", "Video"));
@@ -405,33 +421,10 @@ namespace MWGui
         Settings::Manager::setFloat("minimum interior brightness", "Shaders", 0.1);
         Settings::Manager::setInt("max lights", "Shaders", 8);
 
-        mLightingMethodButton->setIndexSelected(1);
-
         apply();
         configureWidgets(mMainWidget, false);
     }
 
-    void SettingsWindow::onLightingMethodChanged(MyGUI::ComboBox* _sender, size_t pos)
-    {
-        std::string setting;
-        auto lightingMethod = SceneUtil::LightManager::getLightingMethodFromString(_sender->getItemNameAt(pos));
-        switch (lightingMethod)
-        {
-        case SceneUtil::LightingMethod::FFP:
-            setting = "legacy";
-            break;
-        case SceneUtil::LightingMethod::Undefined:
-        case SceneUtil::LightingMethod::PerObjectUniform:
-            setting = "shaders compatibility";
-            break;
-        case SceneUtil::LightingMethod::SingleUBO:
-            setting = "shaders";
-            break;
-        }
-        Settings::Manager::setString("lighting method", "Shaders", setting);
-        apply();
-    }
-
     void SettingsWindow::onButtonToggled(MyGUI::Widget* _sender)
     {
         std::string on = MWBase::Environment::get().getWindowManager()->getGameSettingString("sOn", "On");
diff --git a/apps/openmw/mwgui/settingswindow.hpp b/apps/openmw/mwgui/settingswindow.hpp
index 3ec142731e..219c55c96d 100644
--- a/apps/openmw/mwgui/settingswindow.hpp
+++ b/apps/openmw/mwgui/settingswindow.hpp
@@ -35,8 +35,8 @@ namespace MWGui
             MyGUI::ComboBox* mWaterTextureSize;
             MyGUI::ComboBox* mWaterReflectionDetail;
 
-            MyGUI::ComboBox* mLightingMethodButton;
-            MyGUI::ScrollBar* mMaxLightsSlider;
+            MyGUI::Widget* mLightSettingOverlay;
+            MyGUI::TextBox* mLightingMethodText;
             MyGUI::Button* mLightsResetButton;
 
             // controls
@@ -60,7 +60,6 @@ namespace MWGui
             void onWaterReflectionDetailChanged(MyGUI::ComboBox* _sender, size_t pos);
 
             void onLightsResetButtonClicked(MyGUI::Widget* _sender);
-            void onLightingMethodChanged(MyGUI::ComboBox* _sender, size_t pos);
 
             void onRebindAction(MyGUI::Widget* _sender);
             void onInputTabMouseWheel(MyGUI::Widget* _sender, int _rel);
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index d8c7599358..79447676e8 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -499,6 +499,11 @@ namespace MWRender
             mAlpha = alpha;
         }
 
+        void setLightSource(const osg::ref_ptr<SceneUtil::LightSource>& lightSource)
+        {
+            mLightSource = lightSource;
+        }
+
     protected:
         void setDefaults(osg::StateSet* stateset) override
         {
@@ -517,14 +522,17 @@ namespace MWRender
             stateset->addUniform(new osg::Uniform("colorMode", 0), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
         }
 
-        void apply(osg::StateSet* stateset, osg::NodeVisitor* /*nv*/) override
+        void apply(osg::StateSet* stateset, osg::NodeVisitor* nv) override
         {
             osg::Material* material = static_cast<osg::Material*>(stateset->getAttribute(osg::StateAttribute::MATERIAL));
             material->setAlpha(osg::Material::FRONT_AND_BACK, mAlpha);
+            if (mLightSource)
+                mLightSource->setActorFade(mAlpha);
         }
 
     private:
         float mAlpha;
+        osg::ref_ptr<SceneUtil::LightSource> mLightSource;
     };
 
     struct Animation::AnimSource
@@ -1613,7 +1621,7 @@ namespace MWRender
     {
         bool exterior = mPtr.isInCell() && mPtr.getCell()->getCell()->isExterior();
 
-        SceneUtil::addLight(parent, esmLight, Mask_ParticleSystem, Mask_Lighting, exterior);
+        mExtraLightSource = SceneUtil::addLight(parent, esmLight, Mask_ParticleSystem, Mask_Lighting, exterior);
     }
 
     void Animation::addEffect (const std::string& model, int effectId, bool loop, const std::string& bonename, const std::string& texture)
@@ -1763,6 +1771,7 @@ namespace MWRender
             if (mTransparencyUpdater == nullptr)
             {
                 mTransparencyUpdater = new TransparencyUpdater(alpha);
+                mTransparencyUpdater->setLightSource(mExtraLightSource);
                 mObjectRoot->addCullCallback(mTransparencyUpdater);
             }
             else
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index 04c5825c94..213a4f7049 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -278,6 +278,7 @@ protected:
     osg::ref_ptr<SceneUtil::LightSource> mGlowLight;
     osg::ref_ptr<SceneUtil::GlowUpdater> mGlowUpdater;
     osg::ref_ptr<TransparencyUpdater> mTransparencyUpdater;
+    osg::ref_ptr<SceneUtil::LightSource> mExtraLightSource;
 
     float mAlpha;
 
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index e5c5ace9d5..1ee7b2132d 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -1154,14 +1154,36 @@ namespace MWRender
             else if (it->first == "Shaders" && it->second == "minimum interior brightness")
             {
                 mMinimumAmbientLuminance = std::clamp(Settings::Manager::getFloat("minimum interior brightness", "Shaders"), 0.f, 1.f);
-                if (MWMechanics::getPlayer().getCell())
+                if (MWMechanics::getPlayer().isInCell())
                     configureAmbient(MWMechanics::getPlayer().getCell()->getCell());
             }
             else if (it->first == "Shaders" && (it->second == "light bounds multiplier" ||
                                                 it->second == "maximum light distance" ||
-                                                it->second == "light fade start"))
+                                                it->second == "light fade start" ||
+                                                it->second == "max lights"))
             {
-                static_cast<SceneUtil::LightManager*>(getLightRoot())->processChangedSettings(changed);
+                auto* lightManager = static_cast<SceneUtil::LightManager*>(getLightRoot());
+                lightManager->processChangedSettings(changed);
+
+                if (it->second == "max lights" && !lightManager->usingFFP())
+                {
+                    mViewer->stopThreading();
+
+                    lightManager->updateMaxLights();
+
+                    auto defines = mResourceSystem->getSceneManager()->getShaderManager().getGlobalDefines();
+                    for (auto& define : lightManager->getLightDefines())
+                        defines[define.first] = define.second;
+                    mResourceSystem->getSceneManager()->getShaderManager().setGlobalDefines(defines);
+
+                    mSceneRoot->removeUpdateCallback(mStateUpdater);
+                    mStateUpdater = new StateUpdater;
+                    mSceneRoot->addUpdateCallback(mStateUpdater);
+                    mStateUpdater->setFogEnd(mViewDistance);
+                    updateAmbient();
+
+                    mViewer->startThreading();
+                }
             }
         }
     }
diff --git a/components/sceneutil/lightcontroller.cpp b/components/sceneutil/lightcontroller.cpp
index c759fabc79..cc320aecf8 100644
--- a/components/sceneutil/lightcontroller.cpp
+++ b/components/sceneutil/lightcontroller.cpp
@@ -62,7 +62,8 @@ namespace SceneUtil
                 mPhase = mPhase <= 0.5f ? 1.f : 0.25f;
         }
 
-        static_cast<SceneUtil::LightSource*>(node)->getLight(nv->getTraversalNumber())->setDiffuse(mDiffuseColor * mBrightness);
+        auto* lightSource = static_cast<SceneUtil::LightSource*>(node);
+        lightSource->getLight(nv->getTraversalNumber())->setDiffuse(mDiffuseColor * mBrightness * lightSource->getActorFade());
 
         traverse(node, nv);
     }
diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 8e4c9910f8..30d2e2415b 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -415,6 +415,11 @@ namespace SceneUtil
 
         META_StateAttribute(NifOsg, LightStateAttributePerObjectUniform, osg::StateAttribute::LIGHT)
 
+        void resize(int numLights)
+        {
+            mLights.resize(std::min(static_cast<size_t>(numLights), mLights.size()));
+        }
+
         void apply(osg::State &state) const override
         {
             auto* lightUniform = mLightManager->getStateSet()->getUniform("LightBuffer");
@@ -511,6 +516,9 @@ namespace SceneUtil
 
             uOldCount->get(oldCount);
 
+            // max lights count can change during runtime
+            oldCount = std::min(mLightManager->getMaxLights(), oldCount);
+
             auto& lightData = mLightManager->getLightIndexMap(frameNum);
 
             for (int i = 0; i < oldCount; ++i)
@@ -779,6 +787,14 @@ namespace SceneUtil
             return LightingMethod::Undefined;
     }
 
+    std::string LightManager::getLightingMethodString(LightingMethod method)
+    {
+        for (const auto& p : LightManager::mLightingMethodSettingMap)
+            if (p.second == method)
+                return p.first;
+        return "";
+    }
+
     LightManager::LightManager(bool ffp)
         : mStartLight(0)
         , mLightingMask(~0u)
@@ -891,6 +907,61 @@ namespace SceneUtil
         updateSettings();
     }
 
+    void LightManager::updateMaxLights()
+    {
+        if (usingFFP())
+            return;
+
+        setMaxLights(std::clamp(Settings::Manager::getInt("max lights", "Shaders"), mMaxLightsLowerLimit, mMaxLightsUpperLimit));
+
+        if (getLightingMethod() == LightingMethod::PerObjectUniform)
+        {
+            auto* prevUniform = getStateSet()->getUniform("LightBuffer");
+            osg::ref_ptr<osg::Uniform> newUniform = new osg::Uniform(osg::Uniform::FLOAT_MAT4, "LightBuffer", getMaxLights() + 1);
+
+            for (int i = 0; i < getMaxLights() + 1; ++i)
+            {
+                osg::Matrixf prevLightData;
+                prevUniform->getElement(i, prevLightData);
+                newUniform->setElement(i, prevLightData);
+            }
+
+            getStateSet()->removeUniform(prevUniform);
+            getStateSet()->addUniform(newUniform);
+
+            for (int i = 0; i < 2; ++i)
+            {
+                for (auto& pair : mStateSetCache[i])
+                    static_cast<LightStateAttributePerObjectUniform*>(pair.second->getAttribute(osg::StateAttribute::LIGHT))->resize(getMaxLights());
+                mStateSetCache[i].clear();
+            }
+        }
+        else
+        {
+            for (int i = 0; i < 2; ++i)
+            {
+                for (auto& pair : mStateSetCache[i])
+                {
+                    auto& stateset = pair.second;
+                    osg::Uniform* uOldArray = stateset->getUniform("PointLightIndex");
+                    osg::Uniform* uOldCount = stateset->getUniform("PointLightCount");
+
+                    int prevCount;
+                    uOldCount->get(prevCount);
+                    int newCount = std::min(getMaxLights(), prevCount);
+                    uOldCount->set(newCount);
+
+                    osg::ref_ptr<osg::IntArray> newArray = uOldArray->getIntArray();
+                    newArray->resize(newCount);
+
+                    stateset->removeUniform(uOldArray);
+                    stateset->addUniform(new osg::Uniform("PointLightIndex", newArray));
+                }
+                mStateSetCache[i].clear();
+            }
+        }
+    }
+
     void LightManager::updateSettings()
     {
         if (getLightingMethod() == LightingMethod::FFP)
@@ -920,7 +991,7 @@ namespace SceneUtil
         auto* stateset = getOrCreateStateSet();
 
         setLightingMethod(LightingMethod::PerObjectUniform);
-        setMaxLights(std::clamp(targetLights, 2, 64));
+        setMaxLights(std::clamp(targetLights, mMaxLightsLowerLimit, LightManager::mMaxLightsUpperLimit));
 
         stateset->addUniform(new osg::Uniform(osg::Uniform::FLOAT_MAT4, "LightBuffer", getMaxLights() + 1));
     }
@@ -928,7 +999,7 @@ namespace SceneUtil
     void LightManager::initSingleUBO(int targetLights)
     {
         setLightingMethod(LightingMethod::SingleUBO);
-        setMaxLights(std::clamp(targetLights, 2, 64));
+        setMaxLights(std::clamp(targetLights, mMaxLightsLowerLimit, LightManager::mMaxLightsUpperLimit));
 
         for (int i = 0; i < 2; ++i)
         {
@@ -1000,7 +1071,7 @@ namespace SceneUtil
         getLightIndexMap(frameNum).clear();
         mLights.clear();
         mLightsInViewSpace.clear();
-
+        return;
         // Do an occasional cleanup for orphaned lights.
         for (int i = 0; i < 2; ++i)
         {
@@ -1133,6 +1204,7 @@ namespace SceneUtil
 
     LightSource::LightSource()
         : mRadius(0.f)
+        , mActorFade(1.f)
     {
         setUpdateCallback(new CollectLightCallback);
         mId = sLightId++;
@@ -1141,6 +1213,7 @@ namespace SceneUtil
     LightSource::LightSource(const LightSource &copy, const osg::CopyOp &copyop)
         : osg::Node(copy, copyop)
         , mRadius(copy.mRadius)
+        , mActorFade(copy.mActorFade)
     {
         mId = sLightId++;
 
diff --git a/components/sceneutil/lightmanager.hpp b/components/sceneutil/lightmanager.hpp
index 2fdc14a8da..27716861f3 100644
--- a/components/sceneutil/lightmanager.hpp
+++ b/components/sceneutil/lightmanager.hpp
@@ -29,8 +29,8 @@ namespace SceneUtil
     enum class LightingMethod
     {
         FFP,
-        SingleUBO,
         PerObjectUniform,
+        SingleUBO,
         Undefined
     };
 
@@ -54,6 +54,8 @@ namespace SceneUtil
 
         int mId;
 
+        float mActorFade;
+
     public:
 
         META_Node(SceneUtil, LightSource)
@@ -73,6 +75,16 @@ namespace SceneUtil
             mRadius = radius;
         }
 
+        void setActorFade(float alpha)
+        {
+            mActorFade = alpha;
+        }
+
+        float getActorFade() const
+        {
+            return mActorFade;
+        }
+
         /// Get the osg::Light safe for modification in the given frame.
         /// @par May be used externally to animate the light's color/attenuation properties,
         /// and is used internally to synchronize the light's position with the position of the LightSource.
@@ -104,15 +116,8 @@ namespace SceneUtil
     public:
         static bool isValidLightingModelString(const std::string& value);
         static LightingMethod getLightingMethodFromString(const std::string& value);
-
-        enum class UniformKey
-        {
-            Diffuse,
-            Ambient,
-            Specular,
-            Position,
-            Attenuation
-        };
+        /// Returns string as used in settings file, or the empty string if the method is undefined
+        static std::string getLightingMethodString(LightingMethod method);
 
         struct LightSourceTransform
         {
@@ -178,10 +183,10 @@ namespace SceneUtil
 
         void processChangedSettings(const Settings::CategorySettingVector& changed);
 
-    private:
-        friend class LightManagerStateAttribute;
-        friend class LightManagerCullCallback;
+        /// Not thread safe, it is the responsibility of the caller to stop/start threading on the viewer
+        void updateMaxLights();
 
+    private:
         void initFFP(int targetLights);
         void initPerObjectUniform(int targetLights);
         void initSingleUBO(int targetLights);
@@ -226,6 +231,8 @@ namespace SceneUtil
 
         int mMaxLights;
 
+        static constexpr auto mMaxLightsLowerLimit = 2;
+        static constexpr auto mMaxLightsUpperLimit = 64;
         static constexpr auto mFFPMaxLights = 8;
 
         static const std::unordered_map<std::string, LightingMethod> mLightingMethodSettingMap;
diff --git a/components/sceneutil/lightutil.cpp b/components/sceneutil/lightutil.cpp
index 07ab446409..6a1a1376ec 100644
--- a/components/sceneutil/lightutil.cpp
+++ b/components/sceneutil/lightutil.cpp
@@ -58,7 +58,7 @@ namespace SceneUtil
         light->setQuadraticAttenuation(quadraticAttenuation);
     }
 
-    void addLight(osg::Group* node, const ESM::Light* esmLight, unsigned int partsysMask, unsigned int lightMask, bool isExterior)
+    osg::ref_ptr<LightSource> addLight(osg::Group* node, const ESM::Light* esmLight, unsigned int partsysMask, unsigned int lightMask, bool isExterior)
     {
         SceneUtil::FindByNameVisitor visitor("AttachLight");
         node->accept(visitor);
@@ -87,6 +87,7 @@ namespace SceneUtil
 
         osg::ref_ptr<LightSource> lightSource = createLightSource(esmLight, lightMask, isExterior, osg::Vec4f(0,0,0,1));
         attachTo->addChild(lightSource);
+        return lightSource;
     }
 
     osg::ref_ptr<LightSource> createLightSource(const ESM::Light* esmLight, unsigned int lightMask, bool isExterior, const osg::Vec4f& ambient)
diff --git a/components/sceneutil/lightutil.hpp b/components/sceneutil/lightutil.hpp
index 7096c38b20..1ddfa3d45f 100644
--- a/components/sceneutil/lightutil.hpp
+++ b/components/sceneutil/lightutil.hpp
@@ -32,7 +32,7 @@ namespace SceneUtil
     /// @param partsysMask Node mask to ignore when computing the sub graph's bounding box.
     /// @param lightMask Mask to assign to the newly created LightSource.
     /// @param isExterior Is the light outside? May be used for deciding which attenuation settings to use.
-    void addLight (osg::Group* node, const ESM::Light* esmLight, unsigned int partsysMask, unsigned int lightMask, bool isExterior);
+    osg::ref_ptr<LightSource> addLight (osg::Group* node, const ESM::Light* esmLight, unsigned int partsysMask, unsigned int lightMask, bool isExterior);
 
     /// @brief Convert an ESM::Light to a SceneUtil::LightSource, and return it.
     /// @param esmLight The light definition coming from the game files containing radius, color, flicker, etc.
diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index ef5d4a6cb4..400cba07f3 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -460,91 +460,110 @@
 
                     <Widget type="TabItem" skin="" position="4 32 360 308">
                         <Property key="Caption" value="  Lights  "/>
-                        <!-- Lighting Method -->
-                        <Widget type="TextBox" skin="NormalText" position="0 4 160 18" align="Left Top">
-                            <Property key="Caption" value="*Lighting Method"/>
-                        </Widget>
-                        <Widget type="ComboBox" skin="MW_ComboBox" position="0 28 170 24" align="Left Top" name="LightingMethodButton">
-                            <Property key="AddItem" value="legacy"/>
-                            <Property key="AddItem" value="shaders compatibility"/>
-                            <Property key="AddItem" value="shaders"/>
-                        </Widget>
-                        <!-- Max Lights -->
-                        <Widget type="TextBox" skin="NormalText" position="178 4 160 18" align="Left Top" name="MaxLightsText"/>
-                        <Widget type="ScrollBar" skin="MW_HScroll" position="178 30 160 18" align="Right Top HStretch" name="MaxLightsSlider">
-                            <Property key="Range" value="24"/>
-                            <Property key="Page" value="1"/>
-                            <UserString key="SettingType" value="Slider"/>
-                            <UserString key="SettingMin" value="8"/>
-                            <UserString key="SettingMax" value="32"/>
-                            <UserString key="SettingCategory" value="Shaders"/>
-                            <UserString key="SettingName" value="max lights"/>
-                            <UserString key="SettingValueType" value="Integer"/>
-                            <UserString key="SettingLabelWidget" value="MaxLightsText"/>
-                            <UserString key="SettingLabelCaption" value="*Max Lights (%s)"/>
-                        </Widget>
-                        <Widget type="ImageBox" skin="MW_HLine" position="0 54 360 18" align="Top HStretch"/>
-                        <!-- Light Fade Start -->
-                        <Widget type="TextBox" skin="NormalText" position="0 78 352 18" align="Left Top" name="MaxLightDistanceText"/>
-                        <Widget type="ScrollBar" skin="MW_HScroll" position="0 104 352 18" align="HStretch Top">
-                            <Property key="Range" value="8192"/>
-                            <Property key="Page" value="1"/>
-                            <UserString key="SettingType" value="Slider"/>
-                            <UserString key="SettingMin" value="0"/>
-                            <UserString key="SettingMax" value="8192"/>
-                            <UserString key="SettingCategory" value="Shaders"/>
-                            <UserString key="SettingName" value="maximum light distance"/>
-                            <UserString key="SettingValueType" value="Integer"/>
-                            <UserString key="SettingLabelWidget" value="MaxLightDistanceText"/>
-                            <UserString key="SettingLabelCaption" value="Maximum Light Distance (%s)"/>
-                        </Widget>
-                        <!-- Light Fade Multiplier -->
-                        <Widget type="TextBox" skin="NormalText" position="0 128 352 18" align="Left Top" name="LightFadeMultiplierText"/>
-                        <Widget type="ScrollBar" skin="MW_HScroll" position="0 152 352 18" align="HStretch Top">
-                            <Property key="Range" value="10000"/>
-                            <Property key="Page" value="300"/>
-                            <UserString key="SettingType" value="Slider"/>
-                            <UserString key="SettingCategory" value="Shaders"/>
-                            <UserString key="SettingName" value="light fade start"/>
-                            <UserString key="SettingValueType" value="Float"/>
-                            <UserString key="SettingLabelWidget" value="LightFadeMultiplierText"/>
-                            <UserString key="SettingLabelCaption" value="Fade Start Multiplier (%s)"/>
-                        </Widget>
-                        <!-- Bounding Sphere Multiplier -->
-                        <Widget type="TextBox" skin="NormalText" position="0 176 352 18" align="Left Top" name="BoundingSphereMultText"/>
-                        <Widget type="ScrollBar" skin="MW_HScroll" position="0 200 352 18" align="HStretch Top">
-                            <Property key="Range" value="10000"/>
-                            <Property key="Page" value="300"/>
-                            <UserString key="SettingType" value="Slider"/>
-                            <UserString key="SettingMin" value="0.1"/>
-                            <UserString key="SettingMax" value="5.0"/>
-                            <UserString key="SettingCategory" value="Shaders"/>
-                            <UserString key="SettingName" value="light bounds multiplier"/>
-                            <UserString key="SettingValueType" value="Float"/>
-                            <UserString key="SettingLabelWidget" value="BoundingSphereMultText"/>
-                            <UserString key="SettingLabelCaption" value="Bounding Sphere Multiplier (%s)"/>
-                        </Widget>
-                        <!-- Minimum Ambient Brightness -->
-                        <Widget type="TextBox" skin="NormalText" position="0 224 352 18" align="Left Top" name="MinimumBrightnessText"/>
-                        <Widget type="ScrollBar" skin="MW_HScroll" position="0 248 352 18" align="HStretch Top">
-                            <Property key="Range" value="10000"/>
-                            <Property key="Page" value="300"/>
-                            <UserString key="SettingType" value="Slider"/>
-                            <UserString key="SettingCategory" value="Shaders"/>
-                            <UserString key="SettingName" value="minimum interior brightness"/>
-                            <UserString key="SettingValueType" value="Float"/>
-                            <UserString key="SettingLabelWidget" value="MinimumBrightnessText"/>
-                            <UserString key="SettingLabelCaption" value="Minimum Interior Brightness (%s)"/>
-                        </Widget>
-
-                        <Widget type="AutoSizedButton" skin="MW_Button" position="0 308 0 0" align="Bottom Left" name="LightsResetButton">
-                            <Property key="Caption" value="Reset To Defaults"/>
+                        <Widget type="Widget" skin="" position="0 0 360 315" align="Stretch">
+                        <Widget type="Widget" skin="" position="0 0 360 315" align="Stretch" name="LightSettingOverlay">
+                            <!-- Lighting Method -->
+                            <Widget type="TextBox" skin="NormalText" position="0 4 170 18" align="Left Top">
+                                <Property key="Caption" value="Lighting Method:"/>
+                            </Widget>
+                            <Widget type="TextBox" skin="SandText" position="0 28 170 18" align="Left Top" name="LightingMethodText">
+                                <UserString key="ToolTipType" value="Layout"/>
+                                <UserString key="ToolTipLayout" value="TextToolTip"/>
+                            </Widget>
+                            <!-- Max Lights -->
+                            <Widget type="TextBox" skin="NormalText" position="178 4 160 18" align="Left Top" name="MaxLightsText">
+                                <UserString key="ToolTipType" value="Layout"/>
+                                <UserString key="ToolTipLayout" value="TextToolTip"/>
+                                <UserString key="Caption_Text" value="Default: 8\nMaximum number of lights per object.\n\nA low number near default will cause light popping similar to what you would see with legacy lighting."/>
+                            </Widget>
+                            <Widget type="ScrollBar" skin="MW_HScroll" position="178 30 160 18" align="Right Top HStretch" name="MaxLightsSlider">
+                                <Property key="Range" value="24"/>
+                                <Property key="Page" value="1"/>
+                                <UserString key="SettingType" value="Slider"/>
+                                <UserString key="SettingMin" value="4"/>
+                                <UserString key="SettingMax" value="32"/>
+                                <UserString key="SettingCategory" value="Shaders"/>
+                                <UserString key="SettingName" value="max lights"/>
+                                <UserString key="SettingValueType" value="Integer"/>
+                                <UserString key="SettingLabelWidget" value="MaxLightsText"/>
+                                <UserString key="SettingLabelCaption" value="Max Lights (%s)"/>
+                            </Widget>
+                            <Widget type="ImageBox" skin="MW_HLine" position="0 54 360 18" align="Top HStretch"/>
+                            <!-- Light Fade Start -->
+                            <Widget type="TextBox" skin="NormalText" position="0 78 352 18" align="Left Top" name="MaxLightDistanceText">
+                                <UserString key="ToolTipType" value="Layout"/>
+                                <UserString key="ToolTipLayout" value="TextToolTip"/>
+                                <UserString key="Caption_Text" value="Default: 8192 (units)\nMaximum distance at which lights will appear.\n\nSet this to 0.0 to disable it."/>
+                            </Widget>
+                            <Widget type="ScrollBar" skin="MW_HScroll" position="0 104 352 18" align="HStretch Top">
+                                <Property key="Range" value="8192"/>
+                                <Property key="Page" value="1"/>
+                                <UserString key="SettingType" value="Slider"/>
+                                <UserString key="SettingMin" value="0"/>
+                                <UserString key="SettingMax" value="8192"/>
+                                <UserString key="SettingCategory" value="Shaders"/>
+                                <UserString key="SettingName" value="maximum light distance"/>
+                                <UserString key="SettingValueType" value="Integer"/>
+                                <UserString key="SettingLabelWidget" value="MaxLightDistanceText"/>
+                                <UserString key="SettingLabelCaption" value="Maximum Light Distance (%s)"/>
+                            </Widget>
+                            <!-- Light Fade Multiplier -->
+                            <Widget type="TextBox" skin="NormalText" position="0 128 352 18" align="Left Top" name="LightFadeMultiplierText">
+                                <UserString key="ToolTipType" value="Layout"/>
+                                <UserString key="ToolTipLayout" value="TextToolTip"/>
+                                <UserString key="Caption_Text" value="Default: 0.85\nFraction of maximum distance at which lights will start to fade.\n\nSet this to a low value for slower transitions or a high value of quicker transitions."/>
+                            </Widget>
+                            <Widget type="ScrollBar" skin="MW_HScroll" position="0 152 352 18" align="HStretch Top">
+                                <Property key="Range" value="10000"/>
+                                <Property key="Page" value="100"/>
+                                <UserString key="SettingType" value="Slider"/>
+                                <UserString key="SettingCategory" value="Shaders"/>
+                                <UserString key="SettingName" value="light fade start"/>
+                                <UserString key="SettingValueType" value="Float"/>
+                                <UserString key="SettingMin" value="0.0"/>
+                                <UserString key="SettingMax" value="1.0"/>
+                                <UserString key="SettingLabelWidget" value="LightFadeMultiplierText"/>
+                                <UserString key="SettingLabelCaption" value="Fade Start Multiplier (%s)"/>
+                            </Widget>
+                            <!-- Bounding Sphere Multiplier -->
+                            <Widget type="TextBox" skin="NormalText" position="0 176 352 18" align="Left Top" name="BoundingSphereMultText">
+                                <UserString key="ToolTipType" value="Layout"/>
+                                <UserString key="ToolTipLayout" value="TextToolTip"/>
+                                <UserString key="Caption_Text" value="Default: 1.75\nMultipler for bounding sphere of lights.\nHigher numbers allows for smooth falloff but require an increase in number of max lights.\n\nDoes not effect the illumination or strength of lights."/>
+                            </Widget>
+                            <Widget type="ScrollBar" skin="MW_HScroll" position="0 200 352 18" align="HStretch Top">
+                                <Property key="Range" value="500000"/>
+                                <Property key="Page" value="1000"/>
+                                <UserString key="SettingType" value="Slider"/>
+                                <UserString key="SettingMin" value="0.0"/>
+                                <UserString key="SettingMax" value="5.0"/>
+                                <UserString key="SettingCategory" value="Shaders"/>
+                                <UserString key="SettingName" value="light bounds multiplier"/>
+                                <UserString key="SettingValueType" value="Float"/>
+                                <UserString key="SettingLabelWidget" value="BoundingSphereMultText"/>
+                                <UserString key="SettingLabelCaption" value="Bounding Sphere Multiplier (%s)"/>
+                            </Widget>
+                            <!-- Minimum Ambient Brightness -->
+                            <Widget type="TextBox" skin="NormalText" position="0 224 352 18" align="Left Top" name="MinimumBrightnessText">
+                                <UserString key="ToolTipType" value="Layout"/>
+                                <UserString key="ToolTipLayout" value="TextToolTip"/>
+                                <UserString key="Caption_Text" value="Default: 0.1\nMinimum ambient interior brightness.\n\nIncrease this if you feel interiors are too dark."/>
+                            </Widget>
+                            <Widget type="ScrollBar" skin="MW_HScroll" position="0 248 352 18" align="HStretch Top">
+                                <Property key="Range" value="10000"/>
+                                <Property key="Page" value="100"/>
+                                <UserString key="SettingType" value="Slider"/>
+                                <UserString key="SettingCategory" value="Shaders"/>
+                                <UserString key="SettingName" value="minimum interior brightness"/>
+                                <UserString key="SettingValueType" value="Float"/>
+                                <UserString key="SettingLabelWidget" value="MinimumBrightnessText"/>
+                                <UserString key="SettingLabelCaption" value="Minimum Interior Brightness (%s)"/>
+                            </Widget>
+                            <Widget type="AutoSizedButton" skin="MW_Button" position="0 290 0 0" align="Top Left" name="LightsResetButton">
+                                <Property key="Caption" value="Reset To Defaults"/>
+                            </Widget>
                         </Widget>
-                        <Widget type="AutoSizedTextBox" skin="NormalText" position="210 308 0 0" align="Bottom Right HStretch">
-                            <Property key="Caption" value="(*) Requires Restart"/>
-                            <Property key="TextAlign" value="Right"/>
                         </Widget>
-
                     </Widget>
                     <!--
                     <Widget type="TabItem" skin="" position="0 28 352 268">
diff --git a/files/shaders/lighting.glsl b/files/shaders/lighting.glsl
index d6ed9dc0ed..5863c24ec5 100644
--- a/files/shaders/lighting.glsl
+++ b/files/shaders/lighting.glsl
@@ -1,6 +1,6 @@
 #define LIGHTING_MODEL_FFP 0
-#define LIGHTING_MODEL_SINGLE_UBO 1
-#define LIGHTING_MODEL_PER_OBJECT_UNIFORM 2
+#define LIGHTING_MODEL_PER_OBJECT_UNIFORM 1
+#define LIGHTING_MODEL_SINGLE_UBO 2
 
 #if @lightingModel != LIGHTING_MODEL_FFP
 #define getLight LightBuffer
@@ -35,7 +35,7 @@ vec4 unpackRGBA(int data)
 
 /* Layout:
 packedColors: 8-bit unsigned RGB packed as (diffuse, ambient, specular).
-              sign bit is stored in diffuse alpha component
+              sign bit is stored in unused alpha component
 attenuation: constant, linear, quadratic, light radius (as defined in content)
 */
 struct LightData
@@ -138,10 +138,12 @@ void perLightPoint(out vec3 ambientOut, out vec3 diffuseOut, int lightIndex, vec
 #if @lightingModel == LIGHTING_MODEL_PER_OBJECT_UNIFORM
     float illumination = clamp(1.0 / (getLight[lightIndex][0].w + getLight[lightIndex][1].w * lightDistance + getLight[lightIndex][2].w * lightDistance * lightDistance), 0.0, 1.0);
     illumination *= 1.0 - quickstep((lightDistance / radius) - 1.0);
+
     ambientOut = getLight[lightIndex][1].xyz * illumination;
 #elif @lightingModel == LIGHTING_MODEL_SINGLE_UBO
     float illumination = clamp(1.0 / (getLight[lightIndex].attenuation.x + getLight[lightIndex].attenuation.y * lightDistance + getLight[lightIndex].attenuation.z * lightDistance * lightDistance), 0.0, 1.0);
     illumination *= 1.0 - quickstep((lightDistance / radius) - 1.0);
+
     ivec4 data = getLight[lightIndex].packedColors;
     ambientOut = unpackRGB(data.y) * illumination;
 #else
diff --git a/files/ui/advancedpage.ui b/files/ui/advancedpage.ui
index a3601ce94d..bfb0fa1ce2 100644
--- a/files/ui/advancedpage.ui
+++ b/files/ui/advancedpage.ui
@@ -273,6 +273,36 @@
            </property>
           </widget>
          </item>
+         <item row="6" column="1">
+          <layout class="QHBoxLayout" name="lightingMethodLayout">
+           <item>
+            <widget class="QLabel" name="lightingMethodLabel">
+             <property name="text">
+              <string>Lighting Method:</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QComboBox" name="lightingMethodComboBox">
+             <item>
+              <property name="text">
+               <string>legacy</string>
+                </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>shaders compatibility</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>shaders</string>
+              </property>
+             </item>
+            </widget>
+           </item>
+          </layout>
+         </item>
          <item row="5" column="0">
           <widget class="QCheckBox" name="smoothMovementCheckBox">
            <property name="toolTip">

From 16f80ec6f385ebbbf8dfdd00f1f182cf148f0aec Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Mon, 5 Apr 2021 12:54:26 -0700
Subject: [PATCH 0580/2859] Update settings when using fallback

---
 apps/openmw/mwrender/renderingmanager.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 1ee7b2132d..ba1dca80e4 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -224,6 +224,7 @@ namespace MWRender
         // Let LightManager choose which backend to use based on our hint, mostly depends on support for UBOs
         resourceSystem->getSceneManager()->getShaderManager().setLightingMethod(sceneRoot->getLightingMethod());
         resourceSystem->getSceneManager()->setLightingMethod(sceneRoot->getLightingMethod());
+        Settings::Manager::setString("lighting method", "Shaders", SceneUtil::LightManager::getLightingMethodString(sceneRoot->getLightingMethod()));
 
         mMinimumAmbientLuminance = std::clamp(Settings::Manager::getFloat("minimum interior brightness", "Shaders"), 0.f, 1.f);
 

From eecb9886a9eb8310ce269c8393b3e465136414e7 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Wed, 7 Apr 2021 18:39:19 -0700
Subject: [PATCH 0581/2859] Shader cleanup, fix indicies

---
 components/sceneutil/lightmanager.cpp | 47 ++++++++++++-------------
 components/sceneutil/lightmanager.hpp |  1 +
 files/shaders/lighting.glsl           | 50 +++++++++++++++------------
 3 files changed, 50 insertions(+), 48 deletions(-)

diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 30d2e2415b..994e1a0b98 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -751,16 +751,16 @@ namespace SceneUtil
         std::string generateDummyShader(int maxLightsInScene)
         {
             return "#version 120\n"
-            "#extension GL_ARB_uniform_buffer_object : require\n"
-            "struct LightData {\n"
-            "   ivec4 packedColors;\n"
-            "   vec4 position;\n"
-            "   vec4 attenuation;\n"
-            "};\n"
-            "uniform LightBufferBinding {\n"
+            "#extension GL_ARB_uniform_buffer_object : require                                      \n"
+            "struct LightData {                                                                     \n"
+            "   ivec4 packedColors;                                                                 \n"
+            "   vec4 position;                                                                      \n"
+            "   vec4 attenuation;                                                                   \n"
+            "};                                                                                     \n"
+            "uniform LightBufferBinding {                                                           \n"
             "   LightData LightBuffer[" + std::to_string(mLightManager->getMaxLightsInScene()) + "];\n"
-            "};\n"
-            "void main() { gl_Position = vec4(0.0); }\n";
+            "};                                                                                     \n"
+            "void main() { gl_Position = vec4(0.0); }                                               \n";
         }
 
         LightManager* mLightManager;
@@ -917,9 +917,9 @@ namespace SceneUtil
         if (getLightingMethod() == LightingMethod::PerObjectUniform)
         {
             auto* prevUniform = getStateSet()->getUniform("LightBuffer");
-            osg::ref_ptr<osg::Uniform> newUniform = new osg::Uniform(osg::Uniform::FLOAT_MAT4, "LightBuffer", getMaxLights() + 1);
+            osg::ref_ptr<osg::Uniform> newUniform = new osg::Uniform(osg::Uniform::FLOAT_MAT4, "LightBuffer", getMaxLights());
 
-            for (int i = 0; i < getMaxLights() + 1; ++i)
+            for (int i = 0; i < getMaxLights(); ++i)
             {
                 osg::Matrixf prevLightData;
                 prevUniform->getElement(i, prevLightData);
@@ -993,7 +993,7 @@ namespace SceneUtil
         setLightingMethod(LightingMethod::PerObjectUniform);
         setMaxLights(std::clamp(targetLights, mMaxLightsLowerLimit, LightManager::mMaxLightsUpperLimit));
 
-        stateset->addUniform(new osg::Uniform(osg::Uniform::FLOAT_MAT4, "LightBuffer", getMaxLights() + 1));
+        stateset->addUniform(new osg::Uniform(osg::Uniform::FLOAT_MAT4, "LightBuffer", getMaxLights()));
     }
 
     void LightManager::initSingleUBO(int targetLights)
@@ -1047,14 +1047,14 @@ namespace SceneUtil
 
     void LightManager::setStartLight(int start)
     {
-        if (!usingFFP()) return;
-
         mStartLight = start;
 
+        if (!usingFFP()) return;
+
         // Set default light state to zero
         // This is necessary because shaders don't respect glDisable(GL_LIGHTX) so in addition to disabling
         // we'll have to set a light state that has no visible effect
-        for (int i = start; i <  getMaxLights(); ++i)
+        for (int i = start; i < getMaxLights(); ++i)
         {
             osg::ref_ptr<DisableLight> defaultLight (new DisableLight(i));
             getOrCreateStateSet()->setAttributeAndModes(defaultLight, osg::StateAttribute::OFF);
@@ -1156,18 +1156,15 @@ namespace SceneUtil
                 osg::BoundingSphere viewBound = osg::BoundingSphere(osg::Vec3f(0,0,0), radius * mPointLightRadiusMultiplier);
                 transformBoundingSphere(worldViewMat, viewBound);
 
-                if (!isReflectionCamera)
+                if (!isReflectionCamera && mPointLightFadeEnd != 0.f)
                 {
-                    static const float fadeDelta = mPointLightFadeEnd - mPointLightFadeStart;
-                    if (mPointLightFadeEnd != 0.f)
-                    {
-                        float fade = 1 - std::clamp((viewBound.center().length() - mPointLightFadeStart) / fadeDelta, 0.f, 1.f);
-                        if (fade == 0.f)
-                            continue;
+                    const float fadeDelta = mPointLightFadeEnd - mPointLightFadeStart;
+                    float fade = 1 - std::clamp((viewBound.center().length() - mPointLightFadeStart) / fadeDelta, 0.f, 1.f);
+                    if (fade == 0.f)
+                        continue;
 
-                        auto* light = transform.mLightSource->getLight(frameNum);
-                        light->setDiffuse(light->getDiffuse() * fade);
-                    }
+                    auto* light = transform.mLightSource->getLight(frameNum);
+                    light->setDiffuse(light->getDiffuse() * fade);
                 }
 
                 LightSourceViewBound l;
diff --git a/components/sceneutil/lightmanager.hpp b/components/sceneutil/lightmanager.hpp
index 27716861f3..1ed87ad7c2 100644
--- a/components/sceneutil/lightmanager.hpp
+++ b/components/sceneutil/lightmanager.hpp
@@ -228,6 +228,7 @@ namespace SceneUtil
         float mPointLightRadiusMultiplier;
         float mPointLightFadeEnd;
         float mPointLightFadeStart;
+        float mPointLightFadeDelta;
 
         int mMaxLights;
 
diff --git a/files/shaders/lighting.glsl b/files/shaders/lighting.glsl
index 5863c24ec5..23b3f94fff 100644
--- a/files/shaders/lighting.glsl
+++ b/files/shaders/lighting.glsl
@@ -75,25 +75,26 @@ uniform int PointLightCount;
 
 void perLightSun(out vec3 ambientOut, out vec3 diffuseOut, vec3 viewPos, vec3 viewNormal)
 {
-#if @lightingModel == LIGHTING_MODEL_PER_OBJECT_UNIFORM
-    vec3 lightDir = normalize(getLight[0][0].xyz);
-#else
-    vec3 lightDir = normalize(getLight[0].position.xyz);
-#endif
-
 #if @lightingModel == LIGHTING_MODEL_PER_OBJECT_UNIFORM
     ambientOut = getLight[0][1].xyz;
+
     vec3 sunDiffuse = getLight[0][2].xyz;
+    vec3 lightDir = normalize(getLight[0][0].xyz);
 #elif @lightingModel == LIGHTING_MODEL_SINGLE_UBO
     ivec4 data = getLight[0].packedColors;
     ambientOut = unpackRGB(data.y);
+
     vec3 sunDiffuse = unpackRGB(data.x);
-#else
+    vec3 lightDir = normalize(getLight[0].position.xyz);
+#else // LIGHTING_MODEL_SINGLE_UBO
     ambientOut = getLight[0].ambient.xyz;
+
     vec3 sunDiffuse = getLight[0].diffuse.xyz;
+    vec3 lightDir = normalize(getLight[0].position.xyz);
 #endif
 
     float lambert = dot(viewNormal.xyz, lightDir);
+
 #ifndef GROUNDCOVER
     lambert = max(lambert, 0.0);
 #else
@@ -105,6 +106,7 @@ void perLightSun(out vec3 ambientOut, out vec3 diffuseOut, vec3 viewPos, vec3 vi
     }
     lambert *= clamp(-8.0 * (1.0 - 0.3) * eyeCosine + 1.0, 0.3, 1.0);
 #endif
+
     diffuseOut = sunDiffuse * lambert;
 }
 
@@ -118,6 +120,7 @@ void perLightPoint(out vec3 ambientOut, out vec3 diffuseOut, int lightIndex, vec
 
     float lightDistance = length(lightPos);
 
+// cull non-FFP point lighting by radius, light is guaranteed to not fall outside this bound with our cutoff
 #if @lightingModel != LIGHTING_MODEL_FFP
 #if @lightingModel == LIGHTING_MODEL_PER_OBJECT_UNIFORM
     float radius = getLight[lightIndex][3][3];
@@ -181,53 +184,54 @@ void doLighting(vec3 viewPos, vec3 viewNormal, out vec3 diffuseLight, out vec3 a
 #endif
 {
     vec3 ambientOut, diffuseOut;
-    // This light gets added a second time in the loop to fix Mesa users' slowdown, so we need to negate its contribution here.
-    perLightSun(ambientOut, diffuseOut, viewPos, viewNormal);
+    ambientLight = gl_LightModel.ambient.xyz;
 
+// sun light
+    perLightSun(ambientOut, diffuseOut, viewPos, viewNormal);
+    ambientLight += ambientOut;
 #if PER_PIXEL_LIGHTING
-    diffuseLight = diffuseOut * shadowing - diffuseOut;
+    diffuseLight = diffuseOut * shadowing;
 #else
     shadowDiffuse = diffuseOut;
-    diffuseLight = -diffuseOut;
+    diffuseLight = diffuseOut;
 #endif
-    ambientLight = gl_LightModel.ambient.xyz;
-
-    perLightSun(ambientOut, diffuseOut, viewPos, viewNormal);
-    ambientLight += ambientOut;
-    diffuseLight += diffuseOut;
 
+// point lights
 #if @lightingModel == LIGHTING_MODEL_FFP
     for (int i=1; i < @maxLights; ++i)
     {
         perLightPoint(ambientOut, diffuseOut, i, viewPos, viewNormal);
+        ambientLight += ambientOut;
+        diffuseLight += diffuseOut;
+    }
 #elif @lightingModel == LIGHTING_MODEL_PER_OBJECT_UNIFORM
     for (int i=1; i <= PointLightCount; ++i)
     {
         perLightPoint(ambientOut, diffuseOut, i, viewPos, viewNormal);
+        ambientLight += ambientOut;
+        diffuseLight += diffuseOut;
+    }
 #else
     for (int i=0; i < PointLightCount; ++i)
     {
         perLightPoint(ambientOut, diffuseOut, PointLightIndex[i], viewPos, viewNormal);
-#endif
         ambientLight += ambientOut;
         diffuseLight += diffuseOut;
     }
+#endif
 }
 
 vec3 getSpecular(vec3 viewNormal, vec3 viewDirection, float shininess, vec3 matSpec)
 {
-#if @lightingModel == LIGHTING_MODEL_PER_OBJECT_UNIFORM
-    vec3 sunDir = getLight[0][0].xyz;
-#else
-    vec3 sunDir = getLight[0].position.xyz;
-#endif
-
 #if @lightingModel == LIGHTING_MODEL_SINGLE_UBO
+    vec3 sunDir = getLight[0].position.xyz;
     vec3 sunSpec = unpackRGB(getLight[0].packedColors.z);
 #elif @lightingModel == LIGHTING_MODEL_PER_OBJECT_UNIFORM
+    vec3 sunDir = getLight[0][0].xyz;
     vec3 sunSpec = getLight[0][3].xyz;
 #else
     vec3 sunSpec = getLight[0].specular.xyz;
+    vec3 sunDir = getLight[0].position.xyz;
 #endif
 
     vec3 lightDir = normalize(sunDir);

From d4e7d25d1467b0b031c71e8c015fee42f7387914 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Thu, 8 Apr 2021 12:42:11 -0700
Subject: [PATCH 0582/2859] Make life not suck for whoever wants to edit
 lighting shaders

---
 apps/launcher/advancedpage.cpp        |  17 ++-
 components/sceneutil/lightmanager.cpp |  13 +-
 files/shaders/CMakeLists.txt          |   1 +
 files/shaders/lighting.glsl           | 177 +++-----------------------
 files/shaders/lighting_util.glsl      | 131 +++++++++++++++++++
 files/shaders/water_fragment.glsl     |  14 +-
 6 files changed, 171 insertions(+), 182 deletions(-)
 create mode 100644 files/shaders/lighting_util.glsl

diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index 0aa3788052..20cd38cbb8 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -1,5 +1,7 @@
 #include "advancedpage.hpp"
 
+#include <unordered_map>
+
 #include <components/config/gamesettings.hpp>
 #include <components/config/launchersettings.hpp>
 #include <QFileDialog>
@@ -7,7 +9,6 @@
 #include <QProxyStyle>
 #include <components/contentselector/view/contentselector.hpp>
 #include <components/contentselector/model/esmfile.hpp>
-#include <components/sceneutil/lightmanager.hpp>
 
 #include <cmath>
 
@@ -126,10 +127,12 @@ bool Launcher::AdvancedPage::loadSettings()
         loadSettingBool(activeGridObjectPagingCheckBox, "object paging active grid", "Terrain");
         viewingDistanceComboBox->setValue(convertToCells(mEngineSettings.getInt("viewing distance", "Camera")));
 
-        auto lightingMethod = SceneUtil::LightManager::getLightingMethodFromString(mEngineSettings.getString("lighting method", "Shaders"));
-        if (lightingMethod == SceneUtil::LightingMethod::Undefined)
-            lightingMethod = SceneUtil::LightingMethod::PerObjectUniform;
-        lightingMethodComboBox->setCurrentIndex(static_cast<int>(lightingMethod));
+        int lightingMethod = 1;
+        if (mEngineSettings.getString("lighting method", "Shaders") == "legacy")
+            lightingMethod = 0;
+        else if (mEngineSettings.getString("lighting method", "Shaders") == "shaders")
+            lightingMethod = 2;
+        lightingMethodComboBox->setCurrentIndex(lightingMethod);
     }
 
     // Camera
@@ -253,8 +256,8 @@ void Launcher::AdvancedPage::saveSettings()
             mEngineSettings.setInt("viewing distance", "Camera", convertToUnits(viewingDistance));
         }
 
-        auto lightingMethodStr = SceneUtil::LightManager::getLightingMethodString(static_cast<SceneUtil::LightingMethod>(lightingMethodComboBox->currentIndex()));
-        mEngineSettings.setString("lighting method", "Shaders", lightingMethodStr);
+        static std::unordered_map<int, std::string> lightingMethodMap = {{0, "legacy"}, {1, "shaders compatibility"}, {2, "shaders"}};
+        mEngineSettings.setString("lighting method", "Shaders", lightingMethodMap[lightingMethodComboBox->currentIndex()]);
     }
 
     // Camera
diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 994e1a0b98..8e330ac1ca 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -551,7 +551,7 @@ namespace SceneUtil
 
             stateset->setAttributeAndModes(new LightStateAttributePerObjectUniform(std::move(lights), mLightManager), osg::StateAttribute::ON);
 
-            stateset->addUniform(new osg::Uniform("PointLightCount", static_cast<int>(lightList.size())));
+            stateset->addUniform(new osg::Uniform("PointLightCount", static_cast<int>(lightList.size() + 1)));
 
             return stateset;
         }
@@ -894,10 +894,15 @@ namespace SceneUtil
 
         defines["maxLights"] = std::to_string(getMaxLights());
         defines["maxLightsInScene"] = std::to_string(getMaxLightsInScene());
-        defines["lightingModel"] = std::to_string(static_cast<int>(mLightingMethod));
-        defines["useUBO"] = std::to_string(mLightingMethod == LightingMethod::SingleUBO);
+        defines["lightingMethodFFP"] = getLightingMethod() == LightingMethod::FFP ? "1" : "0";
+        defines["lightingMethodPerObjectUniform"] = getLightingMethod() == LightingMethod::PerObjectUniform ? "1" : "0";
+        defines["lightingMethodUBO"] = getLightingMethod() == LightingMethod::SingleUBO ? "1" : "0";
+        defines["useUBO"] = std::to_string(getLightingMethod() == LightingMethod::SingleUBO);
         // exposes bitwise operators
-        defines["useGPUShader4"] = std::to_string(mLightingMethod == LightingMethod::SingleUBO);
+        defines["useGPUShader4"] = std::to_string(getLightingMethod() == LightingMethod::SingleUBO);
+        defines["getLight"] = getLightingMethod() == LightingMethod::FFP ? "gl_LightSource" : "LightBuffer";
+        defines["startLight"] =  getLightingMethod() == LightingMethod::SingleUBO ? "0" : "1";
+        defines["endLight"] = getLightingMethod() == LightingMethod::FFP ? defines["maxLights"] : "PointLightCount";
 
         return defines;
     }
diff --git a/files/shaders/CMakeLists.txt b/files/shaders/CMakeLists.txt
index e06dfe56a2..c4a8637767 100644
--- a/files/shaders/CMakeLists.txt
+++ b/files/shaders/CMakeLists.txt
@@ -18,6 +18,7 @@ set(SHADER_FILES
     terrain_vertex.glsl
     terrain_fragment.glsl
     lighting.glsl
+    lighting_util.glsl
     parallax.glsl
     s360_fragment.glsl
     s360_vertex.glsl
diff --git a/files/shaders/lighting.glsl b/files/shaders/lighting.glsl
index 23b3f94fff..ff8fa8969c 100644
--- a/files/shaders/lighting.glsl
+++ b/files/shaders/lighting.glsl
@@ -1,98 +1,9 @@
-#define LIGHTING_MODEL_FFP 0
-#define LIGHTING_MODEL_PER_OBJECT_UNIFORM 1
-#define LIGHTING_MODEL_SINGLE_UBO 2
+#include "lighting_util.glsl"
 
-#if @lightingModel != LIGHTING_MODEL_FFP
-#define getLight LightBuffer
-
-float quickstep(float x)
-{
-    x = clamp(x, 0.0, 1.0);
-    x = 1.0 - x*x;
-    x = 1.0 - x*x;
-    return x;
-}
-
-#if @lightingModel == LIGHTING_MODEL_SINGLE_UBO
-
-const int mask = int(0xff);
-const ivec4 shift = ivec4(int(0), int(8), int(16), int(24));
-
-vec3 unpackRGB(int data)
-{
-    return vec3( (float(((data >> shift.x) & mask)) / 255.0)
-                ,(float(((data >> shift.y) & mask)) / 255.0)
-                ,(float(((data >> shift.z) & mask)) / 255.0));
-}
-
-vec4 unpackRGBA(int data)
-{
-    return vec4( (float(((data >> shift.x) & mask)) / 255.0)
-                ,(float(((data >> shift.y) & mask)) / 255.0)
-                ,(float(((data >> shift.z) & mask)) / 255.0)
-                ,(float(((data >> shift.w) & mask)) / 255.0));
-}
-
-/* Layout:
-packedColors: 8-bit unsigned RGB packed as (diffuse, ambient, specular).
-              sign bit is stored in unused alpha component
-attenuation: constant, linear, quadratic, light radius (as defined in content)
-*/
-struct LightData
-{
-    ivec4 packedColors;
-    vec4 position;
-    vec4 attenuation;
-};
-
-uniform int PointLightIndex[@maxLights];
-uniform int PointLightCount;
-
-// Defaults to shared layout. If we ever move to GLSL 140, std140 layout should be considered
-uniform LightBufferBinding
+void perLightSun(out vec3 diffuseOut, vec3 viewPos, vec3 viewNormal)
 {
-    LightData LightBuffer[@maxLightsInScene];
-};
-
-#else
-
-/* Layout:
---------------------------------------- -----------
-|  pos_x  |  ambi_r  |  diff_r  |  spec_r         |
-|  pos_y  |  ambi_g  |  diff_g  |  spec_g         |
-|  pos_z  |  ambi_b  |  diff_b  |  spec_b         |
-|  att_c  |  att_l   |  att_q   |  radius/spec_a  |
- --------------------------------------------------
-*/
-uniform mat4 LightBuffer[@maxLights];
-uniform int PointLightCount;
-
-#endif
-
-#else
-#define getLight gl_LightSource
-#endif
-
-void perLightSun(out vec3 ambientOut, out vec3 diffuseOut, vec3 viewPos, vec3 viewNormal)
-{
-#if @lightingModel == LIGHTING_MODEL_PER_OBJECT_UNIFORM
-    ambientOut = getLight[0][1].xyz;
-
-    vec3 sunDiffuse = getLight[0][2].xyz;
-    vec3 lightDir = normalize(getLight[0][0].xyz);
-#elif @lightingModel == LIGHTING_MODEL_SINGLE_UBO
-    ivec4 data = getLight[0].packedColors;
-    ambientOut = unpackRGB(data.y);
-
-    vec3 sunDiffuse = unpackRGB(data.x);
-    vec3 lightDir = normalize(getLight[0].position.xyz);
-#else // LIGHTING_MODEL_SINGLE_UBO
-    ambientOut = getLight[0].ambient.xyz;
-
-    vec3 sunDiffuse = getLight[0].diffuse.xyz;
-    vec3 lightDir = normalize(getLight[0].position.xyz);
-#endif
-
+    vec3 sunDiffuse = lcalcDiffuse(0).xyz;
+    vec3 lightDir = normalize(lcalcPosition(0).xyz);
     float lambert = dot(viewNormal.xyz, lightDir);
 
 #ifndef GROUNDCOVER
@@ -112,21 +23,12 @@ void perLightSun(out vec3 ambientOut, out vec3 diffuseOut, vec3 viewPos, vec3 vi
 
 void perLightPoint(out vec3 ambientOut, out vec3 diffuseOut, int lightIndex, vec3 viewPos, vec3 viewNormal)
 {
-#if @lightingModel == LIGHTING_MODEL_PER_OBJECT_UNIFORM
-    vec3 lightPos = getLight[lightIndex][0].xyz - viewPos;
-#else
-    vec3 lightPos = getLight[lightIndex].position.xyz - viewPos;
-#endif
-
+    vec3 lightPos = lcalcPosition(lightIndex) - viewPos;
     float lightDistance = length(lightPos);
 
 // cull non-FFP point lighting by radius, light is guaranteed to not fall outside this bound with our cutoff
-#if @lightingModel != LIGHTING_MODEL_FFP
-#if @lightingModel == LIGHTING_MODEL_PER_OBJECT_UNIFORM
-    float radius = getLight[lightIndex][3][3];
-#else
-    float radius = getLight[lightIndex].attenuation.w;
-#endif
+#if !@lightingMethodFFP
+    float radius = lcalcRadius(lightIndex);
 
     if (lightDistance > radius * 2.0)
     {
@@ -138,22 +40,8 @@ void perLightPoint(out vec3 ambientOut, out vec3 diffuseOut, int lightIndex, vec
 
     lightPos = normalize(lightPos);
 
-#if @lightingModel == LIGHTING_MODEL_PER_OBJECT_UNIFORM
-    float illumination = clamp(1.0 / (getLight[lightIndex][0].w + getLight[lightIndex][1].w * lightDistance + getLight[lightIndex][2].w * lightDistance * lightDistance), 0.0, 1.0);
-    illumination *= 1.0 - quickstep((lightDistance / radius) - 1.0);
-
-    ambientOut = getLight[lightIndex][1].xyz * illumination;
-#elif @lightingModel == LIGHTING_MODEL_SINGLE_UBO
-    float illumination = clamp(1.0 / (getLight[lightIndex].attenuation.x + getLight[lightIndex].attenuation.y * lightDistance + getLight[lightIndex].attenuation.z * lightDistance * lightDistance), 0.0, 1.0);
-    illumination *= 1.0 - quickstep((lightDistance / radius) - 1.0);
-
-    ivec4 data = getLight[lightIndex].packedColors;
-    ambientOut = unpackRGB(data.y) * illumination;
-#else
-    float illumination = clamp(1.0 / (getLight[lightIndex].constantAttenuation + getLight[lightIndex].linearAttenuation * lightDistance + getLight[lightIndex].quadraticAttenuation * lightDistance * lightDistance), 0.0, 1.0);
-    ambientOut = getLight[lightIndex].ambient.xyz * illumination;
-#endif
-
+    float illumination = lcalcIllumination(lightIndex, lightDistance);
+    ambientOut = lcalcAmbient(lightIndex) * illumination;
     float lambert = dot(viewNormal.xyz, lightPos) * illumination;
 
 #ifndef GROUNDCOVER
@@ -168,13 +56,7 @@ void perLightPoint(out vec3 ambientOut, out vec3 diffuseOut, int lightIndex, vec
     lambert *= clamp(-8.0 * (1.0 - 0.3) * eyeCosine + 1.0, 0.3, 1.0);
 #endif
 
-#if @lightingModel == LIGHTING_MODEL_SINGLE_UBO
-    diffuseOut =  unpackRGB(data.x) * lambert * float(int(data.w));
-#elif @lightingModel == LIGHTING_MODEL_PER_OBJECT_UNIFORM
-    diffuseOut = getLight[lightIndex][2].xyz * lambert;
-#else
-    diffuseOut = getLight[lightIndex].diffuse.xyz * lambert;
-#endif
+    diffuseOut =  lcalcDiffuse(lightIndex) * lambert;
 }
 
 #if PER_PIXEL_LIGHTING
@@ -186,9 +68,7 @@ void doLighting(vec3 viewPos, vec3 viewNormal, out vec3 diffuseLight, out vec3 a
     vec3 ambientOut, diffuseOut;
     ambientLight = gl_LightModel.ambient.xyz;
 
-// sun light
-    perLightSun(ambientOut, diffuseOut, viewPos, viewNormal);
-    ambientLight += ambientOut;
+    perLightSun(diffuseOut, viewPos, viewNormal);
 #if PER_PIXEL_LIGHTING
     diffuseLight = diffuseOut * shadowing;
 #else
@@ -196,43 +76,22 @@ void doLighting(vec3 viewPos, vec3 viewNormal, out vec3 diffuseLight, out vec3 a
     diffuseLight = diffuseOut;
 #endif
 
-// point lights
-#if @lightingModel == LIGHTING_MODEL_FFP
-    for (int i=1; i < @maxLights; ++i)
-    {
-        perLightPoint(ambientOut, diffuseOut, i, viewPos, viewNormal);
-        ambientLight += ambientOut;
-        diffuseLight += diffuseOut;
-    }
-#elif @lightingModel == LIGHTING_MODEL_PER_OBJECT_UNIFORM
-    for (int i=1; i <= PointLightCount; ++i)
-    {
-        perLightPoint(ambientOut, diffuseOut, i, viewPos, viewNormal);
-        ambientLight += ambientOut;
-        diffuseLight += diffuseOut;
-    }
-#else
-    for (int i=0; i < PointLightCount; ++i)
+    for (int i = @startLight; i < @endLight; ++i)
     {
+#if @lightingMethodUBO
         perLightPoint(ambientOut, diffuseOut, PointLightIndex[i], viewPos, viewNormal);
+#else
+        perLightPoint(ambientOut, diffuseOut, i, viewPos, viewNormal);
+#endif
         ambientLight += ambientOut;
         diffuseLight += diffuseOut;
     }
-#endif
 }
 
 vec3 getSpecular(vec3 viewNormal, vec3 viewDirection, float shininess, vec3 matSpec)
 {
-#if @lightingModel == LIGHTING_MODEL_SINGLE_UBO
-    vec3 sunDir = getLight[0].position.xyz;
-    vec3 sunSpec = unpackRGB(getLight[0].packedColors.z);
-#elif @lightingModel == LIGHTING_MODEL_PER_OBJECT_UNIFORM
-    vec3 sunDir = getLight[0][0].xyz;
-    vec3 sunSpec = getLight[0][3].xyz;
-#else
-    vec3 sunSpec = getLight[0].specular.xyz;
-    vec3 sunDir = getLight[0].position.xyz;
-#endif
+    vec3 sunDir = lcalcPosition(0);
+    vec3 sunSpec = lcalcSpecular(0).xyz;
 
     vec3 lightDir = normalize(sunDir);
     float NdotL = dot(viewNormal, lightDir);
diff --git a/files/shaders/lighting_util.glsl b/files/shaders/lighting_util.glsl
new file mode 100644
index 0000000000..6277d9d0ba
--- /dev/null
+++ b/files/shaders/lighting_util.glsl
@@ -0,0 +1,131 @@
+#if !@lightingMethodFFP
+float quickstep(float x)
+{
+    x = clamp(x, 0.0, 1.0);
+    x = 1.0 - x*x;
+    x = 1.0 - x*x;
+    return x;
+}
+#endif
+
+#if @lightingMethodUBO
+
+const int mask = int(0xff);
+const ivec4 shift = ivec4(int(0), int(8), int(16), int(24));
+
+vec3 unpackRGB(int data)
+{
+    return vec3( (float(((data >> shift.x) & mask)) / 255.0)
+                ,(float(((data >> shift.y) & mask)) / 255.0)
+                ,(float(((data >> shift.z) & mask)) / 255.0));
+}
+
+vec4 unpackRGBA(int data)
+{
+    return vec4( (float(((data >> shift.x) & mask)) / 255.0)
+                ,(float(((data >> shift.y) & mask)) / 255.0)
+                ,(float(((data >> shift.z) & mask)) / 255.0)
+                ,(float(((data >> shift.w) & mask)) / 255.0));
+}
+
+/* Layout:
+packedColors: 8-bit unsigned RGB packed as (diffuse, ambient, specular).
+              sign bit is stored in unused alpha component
+attenuation: constant, linear, quadratic, light radius (as defined in content)
+*/
+struct LightData
+{
+    ivec4 packedColors;
+    vec4 position;
+    vec4 attenuation;
+};
+
+uniform int PointLightIndex[@maxLights];
+uniform int PointLightCount;
+
+// Defaults to shared layout. If we ever move to GLSL 140, std140 layout should be considered
+uniform LightBufferBinding
+{
+    LightData LightBuffer[@maxLightsInScene];
+};
+
+#elif @lightingMethodPerObjectUniform
+
+/* Layout:
+--------------------------------------- -----------
+|  pos_x  |  ambi_r  |  diff_r  |  spec_r         |
+|  pos_y  |  ambi_g  |  diff_g  |  spec_g         |
+|  pos_z  |  ambi_b  |  diff_b  |  spec_b         |
+|  att_c  |  att_l   |  att_q   |  radius/spec_a  |
+ --------------------------------------------------
+*/
+uniform mat4 LightBuffer[@maxLights];
+uniform int PointLightCount;
+
+#endif
+
+#if !@lightingMethodFFP
+float lcalcRadius(int lightIndex)
+{
+#if @lightingMethodPerObjectUniform
+    return @getLight[lightIndex][3].w;
+#else
+    return @getLight[lightIndex].attenuation.w;
+#endif
+}
+#endif
+
+float lcalcIllumination(int lightIndex, float lightDistance)
+{
+#if @lightingMethodPerObjectUniform
+    float illumination = clamp(1.0 / (@getLight[lightIndex][0].w + @getLight[lightIndex][1].w * lightDistance + @getLight[lightIndex][2].w * lightDistance * lightDistance), 0.0, 1.0);
+    return (illumination * (1.0 - quickstep((lightDistance / lcalcRadius(lightIndex)) - 1.0)));
+#elif @lightingMethodUBO
+    float illumination = clamp(1.0 / (@getLight[lightIndex].attenuation.x + @getLight[lightIndex].attenuation.y * lightDistance + @getLight[lightIndex].attenuation.z * lightDistance * lightDistance), 0.0, 1.0);
+    return (illumination * (1.0 - quickstep((lightDistance / lcalcRadius(lightIndex)) - 1.0)));
+#else
+    return clamp(1.0 / (@getLight[lightIndex].constantAttenuation + @getLight[lightIndex].linearAttenuation * lightDistance + @getLight[lightIndex].quadraticAttenuation * lightDistance * lightDistance), 0.0, 1.0);
+#endif
+}
+
+vec3 lcalcPosition(int lightIndex)
+{
+#if @lightingMethodPerObjectUniform
+    return @getLight[lightIndex][0].xyz;
+#else
+    return @getLight[lightIndex].position.xyz;
+#endif
+}
+
+vec3 lcalcDiffuse(int lightIndex)
+{
+#if @lightingMethodPerObjectUniform
+    return @getLight[lightIndex][2].xyz;
+#elif @lightingMethodUBO
+    return unpackRGB(@getLight[lightIndex].packedColors.x) * float(int(@getLight[lightIndex].packedColors.w));
+#else
+    return @getLight[lightIndex].diffuse.xyz;
+#endif
+}
+
+vec3 lcalcAmbient(int lightIndex)
+{
+#if @lightingMethodPerObjectUniform
+    return @getLight[lightIndex][1].xyz;
+#elif @lightingMethodUBO
+    return unpackRGB(@getLight[lightIndex].packedColors.y);
+#else
+    return @getLight[lightIndex].ambient.xyz;
+#endif
+}
+
+vec4 lcalcSpecular(int lightIndex)
+{
+#if @lightingMethodPerObjectUniform
+    return @getLight[lightIndex][3];
+#elif @lightingMethodUBO
+    return unpackRGBA(@getLight[lightIndex].packedColors.z);
+#else
+    return @getLight[lightIndex].specular;
+#endif
+}
diff --git a/files/shaders/water_fragment.glsl b/files/shaders/water_fragment.glsl
index 9bc1567052..24c93d11a8 100644
--- a/files/shaders/water_fragment.glsl
+++ b/files/shaders/water_fragment.glsl
@@ -203,11 +203,7 @@ void main(void)
                    normal3 * midWaves.y + normal4 * smallWaves.x + normal5 * smallWaves.y + rippleAdd);
     normal = normalize(vec3(-normal.x * bump, -normal.y * bump, normal.z));
 
-#if @lightingModel == LIGHTING_MODEL_PER_OBJECT_UNIFORM
-    vec3 lVec = normalize((gl_ModelViewMatrixInverse * vec4(getLight[0][0].xyz, 0.0)).xyz);
-#else
-    vec3 lVec = normalize((gl_ModelViewMatrixInverse * vec4(getLight[0].position.xyz, 0.0)).xyz);
-#endif
+    vec3 lVec = normalize((gl_ModelViewMatrixInverse * vec4(lcalcPosition(0).xyz, 0.0)).xyz);
     vec3 cameraPos = (gl_ModelViewMatrixInverse * vec4(0,0,0,1)).xyz;
     vec3 vVec = normalize(position.xyz - cameraPos.xyz);
 
@@ -242,13 +238,7 @@ void main(void)
 
     vec3 waterColor = WATER_COLOR * sunFade;
 
-#if @lightingModel == LIGHTING_MODEL_SINGLE_UBO
-  vec4 sunSpec = unpackRGBA(getLight[0].packedColors.z);
-#elif @lightingModel == LIGHTING_MODEL_PER_OBJECT_UNIFORM
-  vec4 sunSpec = getLight[0][3];
-#else
-  vec4 sunSpec = getLight[0].specular;
-#endif
+    vec4 sunSpec = lcalcSpecular(0);
 
 #if REFRACTION
     // refraction

From b7adb9d0880bdb7424aff4b1e37a072976b534ec Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Thu, 8 Apr 2021 18:58:53 -0700
Subject: [PATCH 0583/2859] use true default settings

---
 apps/openmw/mwgui/settingswindow.cpp | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index 4d3b141524..b5d8c1089b 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -291,15 +291,12 @@ namespace MWGui
 
         if (lightingMethod == SceneUtil::LightingMethod::FFP || !Settings::Manager::getBool("force shaders", "Shaders"))
         {
-            std::string warningText =
-                "Unavailable with current settings."
-                "\n\nEnable \"force shaders\" and use either the \"shaders\" or \"shaders compatibility\" lighting method.";
             MyGUI::Widget* parent = mLightSettingOverlay->getParent();
             mLightSettingOverlay->setEnabled(false);
             mLightSettingOverlay->setAlpha(0.8);
             parent->setUserString("ToolTipType", "Layout");
             parent->setUserString("ToolTipLayout", "TextToolTip");
-            parent->setUserString("Caption_Text", warningText);
+            parent->setUserString("Caption_Text", "Unavailable with current settings.");
             parent->setEnabled(true);
         }
         else
@@ -408,18 +405,15 @@ namespace MWGui
     void SettingsWindow::onLightsResetButtonClicked(MyGUI::Widget* _sender)
     {
         std::vector<std::string> buttons = {"#{sYes}", "#{sNo}"};
-        std::string message = "This will reset all lighting settings to default, some changes will require a restart. Would you like to continue?";
+        std::string message = "Resets to default values, would you like to continue?";
         MWBase::Environment::get().getWindowManager()->interactiveMessageBox(message, buttons, true);
         int selectedButton = MWBase::Environment::get().getWindowManager()->readPressedButton();
         if (selectedButton == 1 || selectedButton == -1)
             return;
 
-        Settings::Manager::setString("lighting method", "Shaders", "shaders compatibility");
-        Settings::Manager::setFloat("light bounds multiplier", "Shaders", 1.75);
-        Settings::Manager::setInt("maximum light distance", "Shaders", 8192);
-        Settings::Manager::setFloat("light fade start", "Shaders", 0.85);
-        Settings::Manager::setFloat("minimum interior brightness", "Shaders", 0.1);
-        Settings::Manager::setInt("max lights", "Shaders", 8);
+        const std::vector<std::string> settings = {"light bounds multiplier", "maximum light distance", "light fade start", "minimum interior brightness", "max lights"};
+        for (const auto& setting : settings)
+            Settings::Manager::setString(setting, "Shaders", Settings::Manager::mDefaultSettings[{"Shaders", setting}]);
 
         apply();
         configureWidgets(mMainWidget, false);

From 8ce65232ff09814f1b86393a84c2c6937155e059 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Fri, 9 Apr 2021 14:14:35 -0700
Subject: [PATCH 0584/2859] fix race condition with sun uniform

---
 components/sceneutil/lightmanager.cpp | 33 ++++++++++++++++++++++++++-
 components/sceneutil/lightmanager.hpp |  5 ++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 8e330ac1ca..4b9549c100 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -644,7 +644,7 @@ namespace SceneUtil
                         configureAmbient(lightMat, sun->getAmbient());
                         configureDiffuse(lightMat, sun->getDiffuse());
                         configureSpecular(lightMat, sun->getSpecular());
-                        mLightManager->getStateSet()->getUniform("LightBuffer")->setElement(0, lightMat);
+                        mLightManager->setSunlightBuffer(lightMat, mLastFrameNumber);
                     }
                     else
                     {
@@ -767,6 +767,36 @@ namespace SceneUtil
         osg::ref_ptr<osg::Program> mDummyProgram;
     };
 
+    class LightManagerStateAttributePerObjectUniform : public osg::StateAttribute
+    {
+    public:
+        LightManagerStateAttributePerObjectUniform()
+            : mLightManager(nullptr) {}
+
+        LightManagerStateAttributePerObjectUniform(LightManager* lightManager)
+        : mLightManager(lightManager)
+        {
+        }
+
+        LightManagerStateAttributePerObjectUniform(const LightManagerStateAttributePerObjectUniform& copy, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY)
+            : osg::StateAttribute(copy,copyop), mLightManager(copy.mLightManager) {}
+
+        int compare(const StateAttribute &sa) const override
+        {
+            throw std::runtime_error("LightManagerStateAttributePerObjectUniform::compare: unimplemented");
+        }
+
+        META_StateAttribute(NifOsg, LightManagerStateAttributePerObjectUniform, osg::StateAttribute::LIGHT)
+
+        void apply(osg::State& state) const override
+        {
+            mLightManager->getStateSet()->getUniform("LightBuffer")->setElement(0, mLightManager->getSunlightBuffer(state.getFrameStamp()->getFrameNumber()));
+        }
+
+    private:
+        LightManager* mLightManager;
+    };
+
     const std::unordered_map<std::string, LightingMethod> LightManager::mLightingMethodSettingMap = {
          {"legacy", LightingMethod::FFP}
         ,{"shaders compatibility", LightingMethod::PerObjectUniform}
@@ -845,6 +875,7 @@ namespace SceneUtil
             initSingleUBO(targetLights);
 
         getOrCreateStateSet()->addUniform(new osg::Uniform("PointLightCount", 0));
+        getOrCreateStateSet()->setAttributeAndModes(new LightManagerStateAttributePerObjectUniform(this), osg::StateAttribute::ON);
 
         addCullCallback(new LightManagerCullCallback(this));
     }
diff --git a/components/sceneutil/lightmanager.hpp b/components/sceneutil/lightmanager.hpp
index 1ed87ad7c2..62620c61f2 100644
--- a/components/sceneutil/lightmanager.hpp
+++ b/components/sceneutil/lightmanager.hpp
@@ -179,6 +179,9 @@ namespace SceneUtil
 
         auto& getLightBuffer(size_t frameNum) { return mLightBuffers[frameNum%2]; }
 
+        osg::Matrixf getSunlightBuffer(size_t frameNum) const { return mSunlightBuffers[frameNum%2]; }
+        void setSunlightBuffer(const osg::Matrixf& buffer, size_t frameNum) { mSunlightBuffers[frameNum%2] = buffer; }
+
         std::map<std::string, std::string> getLightDefines() const;
 
         void processChangedSettings(const Settings::CategorySettingVector& changed);
@@ -217,6 +220,8 @@ namespace SceneUtil
 
         osg::ref_ptr<LightBuffer> mLightBuffers[2];
 
+        osg::Matrixf mSunlightBuffers[2];
+
         // < Light ID , Buffer Index >
         using LightIndexMap = std::unordered_map<int, int>;
         LightIndexMap mLightIndexMaps[2];

From 9e80091affb9ff59fa9ab30c439bd359aa743792 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Fri, 9 Apr 2021 17:41:33 -0700
Subject: [PATCH 0585/2859] clear up force shaders and make it less convoluted

---
 apps/launcher/advancedpage.cpp                |  4 +-
 apps/openmw/mwgui/settingswindow.cpp          | 71 ++++++++------
 apps/openmw/mwgui/settingswindow.hpp          |  2 +
 apps/openmw/mwrender/animation.cpp            |  2 +-
 apps/openmw/mwrender/renderingmanager.cpp     | 21 ++--
 components/misc/hash.hpp                      | 15 +++
 components/sceneutil/lightmanager.cpp         | 96 +++++++------------
 components/sceneutil/lightmanager.hpp         |  5 -
 .../reference/modding/settings/shaders.rst    |  4 +-
 files/mygui/openmw_settings_window.layout     |  4 +-
 files/settings-default.cfg                    |  4 +-
 files/shaders/lighting.glsl                   |  2 +-
 files/shaders/lighting_util.glsl              |  2 +-
 13 files changed, 113 insertions(+), 119 deletions(-)
 create mode 100644 components/misc/hash.hpp

diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index 20cd38cbb8..c9ea69cc77 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -1,6 +1,6 @@
 #include "advancedpage.hpp"
 
-#include <unordered_map>
+#include <array>
 
 #include <components/config/gamesettings.hpp>
 #include <components/config/launchersettings.hpp>
@@ -256,7 +256,7 @@ void Launcher::AdvancedPage::saveSettings()
             mEngineSettings.setInt("viewing distance", "Camera", convertToUnits(viewingDistance));
         }
 
-        static std::unordered_map<int, std::string> lightingMethodMap = {{0, "legacy"}, {1, "shaders compatibility"}, {2, "shaders"}};
+        static std::array<std::string, 3> lightingMethodMap = {"legacy", "shaders compatibility", "shaders"};
         mEngineSettings.setString("lighting method", "Shaders", lightingMethodMap[lightingMethodComboBox->currentIndex()]);
     }
 
diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index b5d8c1089b..e703316daf 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -11,12 +11,15 @@
 
 #include <iomanip>
 #include <numeric>
+#include <array>
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/stringops.hpp>
 #include <components/misc/constants.hpp>
 #include <components/widgets/sharedstatebutton.hpp>
 #include <components/settings/settings.hpp>
+#include <components/resource/resourcesystem.hpp>
+#include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/lightmanager.hpp>
 
 #include "../mwbase/environment.hpp"
@@ -104,6 +107,22 @@ namespace
         if (!widget->getUserString(settingMax).empty())
             max = MyGUI::utility::parseFloat(widget->getUserString(settingMax));
     }
+
+    const char* getLightingMethodCaptionText(SceneUtil::LightingMethod lightingMethod)
+    {
+        switch (lightingMethod)
+        {
+            case SceneUtil::LightingMethod::FFP:
+                return "Emulates fixed function pipeline lighting, advanced light settings are disabled when this mode is active";
+            case SceneUtil::LightingMethod::PerObjectUniform:
+                return "Removes limit of 8 lights per object, fixes lighting attenuation, and enables groundcover lighting and light fade."
+                        "\n\nDesigned for compatibility across hardware, and is not meant for large max light counts.";
+            case SceneUtil::LightingMethod::SingleUBO:
+                return "Removes limit of 8 lights per object, fixes lighting attenuation, and enables groundcover lighting and light fade."
+                        "\n\nDesigned for more modern hardware and large max light counts.";
+        }
+        return "";
+    }
 }
 
 namespace MWGui
@@ -286,36 +305,6 @@ namespace MWGui
         waterReflectionDetail = std::min(5, std::max(0, waterReflectionDetail));
         mWaterReflectionDetail->setIndexSelected(waterReflectionDetail);
 
-        auto lightingMethod = SceneUtil::LightManager::getLightingMethodFromString(Settings::Manager::getString("lighting method", "Shaders"));
-        mLightingMethodText->setCaption(SceneUtil::LightManager::getLightingMethodString(lightingMethod));
-
-        if (lightingMethod == SceneUtil::LightingMethod::FFP || !Settings::Manager::getBool("force shaders", "Shaders"))
-        {
-            MyGUI::Widget* parent = mLightSettingOverlay->getParent();
-            mLightSettingOverlay->setEnabled(false);
-            mLightSettingOverlay->setAlpha(0.8);
-            parent->setUserString("ToolTipType", "Layout");
-            parent->setUserString("ToolTipLayout", "TextToolTip");
-            parent->setUserString("Caption_Text", "Unavailable with current settings.");
-            parent->setEnabled(true);
-        }
-        else
-        {
-            std::string captionText;
-            if (lightingMethod == SceneUtil::LightingMethod::FFP)
-                captionText =
-                    "Emulates fixed function pipeline lighting, advanced light settings are disabled when this mode is active";
-            else if (lightingMethod == SceneUtil::LightingMethod::PerObjectUniform)
-                captionText =
-                    "Removes limit of 8 lights per object, fixes lighting attenuation, and enables groundcover lighting and light fade."
-                    "\n\nDesigned for compatibility across hardware, and is not meant for large max light counts.";
-            else if (lightingMethod == SceneUtil::LightingMethod::SingleUBO)
-                captionText =
-                    "Removes limit of 8 lights per object, fixes lighting attenuation, and enables groundcover lighting and light fade."
-                    "\n\nDesigned for more modern hardware and large max light counts.";
-            mLightingMethodText->setUserString("Caption_Text", captionText);
-        }
-
         mWindowBorderButton->setEnabled(!Settings::Manager::getBool("fullscreen", "Video"));
 
         mKeyboardSwitch->setStateSelected(true);
@@ -411,7 +400,7 @@ namespace MWGui
         if (selectedButton == 1 || selectedButton == -1)
             return;
 
-        const std::vector<std::string> settings = {"light bounds multiplier", "maximum light distance", "light fade start", "minimum interior brightness", "max lights"};
+        constexpr std::array<const char*, 5> settings = {"light bounds multiplier", "maximum light distance", "light fade start", "minimum interior brightness", "max lights"};
         for (const auto& setting : settings)
             Settings::Manager::setString(setting, "Shaders", Settings::Manager::mDefaultSettings[{"Shaders", setting}]);
 
@@ -617,6 +606,25 @@ namespace MWGui
         layoutControlsBox();
     }
 
+    void SettingsWindow::updateLightSettings()
+    {
+        auto lightingMethod = MWBase::Environment::get().getResourceSystem()->getSceneManager()->getLightingMethod();
+        mLightingMethodText->setCaption(SceneUtil::LightManager::getLightingMethodString(lightingMethod));
+
+        if (lightingMethod == SceneUtil::LightingMethod::FFP || !Settings::Manager::getBool("force shaders", "Shaders"))
+        {
+            MyGUI::Widget* parent = mLightSettingOverlay->getParent();
+            mLightSettingOverlay->setEnabled(false);
+            mLightSettingOverlay->setAlpha(0.8);
+            parent->setUserString("ToolTipType", "Layout");
+            parent->setUserString("ToolTipLayout", "TextToolTip");
+            parent->setUserString("Caption_Text", "Unavailable with current settings.");
+            parent->setEnabled(true);
+        }
+
+        mLightingMethodText->setUserString("Caption_Text", getLightingMethodCaptionText(lightingMethod));
+    }
+
     void SettingsWindow::layoutControlsBox()
     {
         const int h = 18;
@@ -679,6 +687,7 @@ namespace MWGui
     {
         highlightCurrentResolution();
         updateControlsBox();
+        updateLightSettings();
         resetScrollbars();
         MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mOkButton);
     }
diff --git a/apps/openmw/mwgui/settingswindow.hpp b/apps/openmw/mwgui/settingswindow.hpp
index 219c55c96d..d3b864c438 100644
--- a/apps/openmw/mwgui/settingswindow.hpp
+++ b/apps/openmw/mwgui/settingswindow.hpp
@@ -19,6 +19,8 @@ namespace MWGui
 
             void updateControlsBox();
 
+            void updateLightSettings();
+
             void onResChange(int, int) override { center(); }
 
     protected:
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 79447676e8..b578ee25ba 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -522,7 +522,7 @@ namespace MWRender
             stateset->addUniform(new osg::Uniform("colorMode", 0), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
         }
 
-        void apply(osg::StateSet* stateset, osg::NodeVisitor* nv) override
+        void apply(osg::StateSet* stateset, osg::NodeVisitor* /*nv*/) override
         {
             osg::Material* material = static_cast<osg::Material*>(stateset->getAttribute(osg::StateAttribute::MATERIAL));
             material->setAlpha(osg::Material::FRONT_AND_BACK, mAlpha);
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index ba1dca80e4..ac32605a0f 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -201,17 +201,14 @@ namespace MWRender
         , mFieldOfViewOverridden(false)
         , mFieldOfViewOverride(0.f)
     {
-        auto lightingMethod = SceneUtil::LightManager::getLightingMethodFromString(Settings::Manager::getString("lighting method", "Shaders"));
-        bool usingFFPLighting = lightingMethod == SceneUtil::LightingMethod::FFP;
-
         resourceSystem->getSceneManager()->setParticleSystemMask(MWRender::Mask_ParticleSystem);
         resourceSystem->getSceneManager()->setShaderPath(resourcePath + "/shaders");
+        bool explicitlyForceShaders = Settings::Manager::getBool("force shaders", "Shaders");
         // Shadows and radial fog have problems with fixed-function mode
-        bool forceShaders = Settings::Manager::getBool("radial fog", "Shaders") || Settings::Manager::getBool("force shaders", "Shaders") || Settings::Manager::getBool("enable shadows", "Shadows") || usingFFPLighting;
-        bool clampLighting = Settings::Manager::getBool("clamp lighting", "Shaders");
+        bool forceShaders = Settings::Manager::getBool("radial fog", "Shaders") || explicitlyForceShaders || Settings::Manager::getBool("enable shadows", "Shadows");
         resourceSystem->getSceneManager()->setForceShaders(forceShaders);
         // FIXME: calling dummy method because terrain needs to know whether lighting is clamped
-        resourceSystem->getSceneManager()->setClampLighting(clampLighting);
+        resourceSystem->getSceneManager()->setClampLighting(Settings::Manager::getBool("clamp lighting", "Shaders"));
         resourceSystem->getSceneManager()->setAutoUseNormalMaps(Settings::Manager::getBool("auto use object normal maps", "Shaders"));
         resourceSystem->getSceneManager()->setNormalMapPattern(Settings::Manager::getString("normal map pattern", "Shaders"));
         resourceSystem->getSceneManager()->setNormalHeightMapPattern(Settings::Manager::getString("normal height map pattern", "Shaders"));
@@ -220,11 +217,11 @@ namespace MWRender
         resourceSystem->getSceneManager()->setApplyLightingToEnvMaps(Settings::Manager::getBool("apply lighting to environment maps", "Shaders"));
         resourceSystem->getSceneManager()->setConvertAlphaTestToAlphaToCoverage(Settings::Manager::getBool("antialias alpha test", "Shaders") && Settings::Manager::getInt("antialiasing", "Video") > 1);
 
-        osg::ref_ptr<SceneUtil::LightManager> sceneRoot = new SceneUtil::LightManager(!forceShaders || usingFFPLighting);
-        // Let LightManager choose which backend to use based on our hint, mostly depends on support for UBOs
+        auto lightingMethod = SceneUtil::LightManager::getLightingMethodFromString(Settings::Manager::getString("lighting method", "Shaders"));
+        // Let LightManager choose which backend to use based on our hint. For methods besides legacy lighting, this depends on support for various OpenGL extensions.
+        osg::ref_ptr<SceneUtil::LightManager> sceneRoot = new SceneUtil::LightManager(!explicitlyForceShaders || lightingMethod == SceneUtil::LightingMethod::FFP);
         resourceSystem->getSceneManager()->getShaderManager().setLightingMethod(sceneRoot->getLightingMethod());
         resourceSystem->getSceneManager()->setLightingMethod(sceneRoot->getLightingMethod());
-        Settings::Manager::setString("lighting method", "Shaders", SceneUtil::LightManager::getLightingMethodString(sceneRoot->getLightingMethod()));
 
         mMinimumAmbientLuminance = std::clamp(Settings::Manager::getFloat("minimum interior brightness", "Shaders"), 0.f, 1.f);
 
@@ -546,9 +543,9 @@ namespace MWRender
 
         if (needsAdjusting)
         {
-            static constexpr float pR = 0.2126;
-            static constexpr float pG = 0.7152;
-            static constexpr float pB = 0.0722;
+            constexpr float pR = 0.2126;
+            constexpr float pG = 0.7152;
+            constexpr float pB = 0.0722;
 
             // we already work in linear RGB so no conversions are needed for the luminosity function
             float relativeLuminance = pR*ambient.r() + pG*ambient.g() + pB*ambient.b();
diff --git a/components/misc/hash.hpp b/components/misc/hash.hpp
new file mode 100644
index 0000000000..30a9c41ee9
--- /dev/null
+++ b/components/misc/hash.hpp
@@ -0,0 +1,15 @@
+#ifndef MISC_HASH_H
+#define MISC_HASH_H
+
+namespace Misc
+{
+    /// Implemented similar to the boost::hash_combine
+    template <class T>
+    inline void hashCombine(std::size_t& seed, const T& v)
+    {
+        std::hash<T> hasher;
+        seed ^= hasher(v) + 0x9e3779b9 + (seed<<6) + (seed>>2);
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 4b9549c100..bc13559b10 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -1,5 +1,7 @@
 #include "lightmanager.hpp"
 
+#include <array>
+
 #include <osg/BufferObject>
 #include <osg/BufferIndexBinding>
 #include <osg/Endian>
@@ -8,20 +10,13 @@
 
 #include <components/sceneutil/util.hpp>
 
+#include <components/misc/hash.hpp>
 #include <components/misc/stringops.hpp>
 
 #include <components/debug/debuglog.hpp>
 
 namespace
 {
-    /* similar to the boost::hash_combine */
-    template <class T>
-    inline void hash_combine(std::size_t& seed, const T& v)
-    {
-        std::hash<T> hasher;
-        seed ^= hasher(v) + 0x9e3779b9 + (seed<<6) + (seed>>2);
-    }
-
     bool sortLights(const SceneUtil::LightManager::LightSourceViewBound* left, const SceneUtil::LightManager::LightSourceViewBound* right)
     {
         static auto constexpr illuminationBias = 81.f;
@@ -124,39 +119,37 @@ namespace SceneUtil
         {
             // Deal with negative lights (negative diffuse) by passing a sign bit in the unused alpha component
             auto positiveColor = value;
-            float signBit = 1.0;
+            unsigned int signBit = 1;
             if (value[0] < 0)
             {
                 positiveColor *= -1.0;
-                signBit = -1.0;
+                signBit = -1;
             }
-            *(unsigned int*)(&(*mData)[getOffset(index, Diffuse)]) = asRGBA(positiveColor);
-            *(int*)(&(*mData)[getOffset(index, DiffuseSign)]) = signBit;
+            unsigned int packedColor = asRGBA(positiveColor);
+            std::memcpy(&(*mData)[getOffset(index, Diffuse)], &packedColor, sizeof(unsigned int));
+            std::memcpy(&(*mData)[getOffset(index, DiffuseSign)], &signBit, sizeof(unsigned int));
         }
 
         void setAmbient(int index, const osg::Vec4& value)
         {
-            *(unsigned int*)(&(*mData)[getOffset(index, Ambient)]) = asRGBA(value);
+            unsigned int packed = asRGBA(value);
+            std::memcpy(&(*mData)[getOffset(index, Ambient)], &packed, sizeof(unsigned int));
         }
 
         void setSpecular(int index, const osg::Vec4& value)
         {
-            *(unsigned int*)(&(*mData)[getOffset(index, Specular)]) = asRGBA(value);
+            unsigned int packed = asRGBA(value);
+            std::memcpy(&(*mData)[getOffset(index, Specular)], &packed, sizeof(unsigned int));
         }
 
         void setPosition(int index, const osg::Vec4& value)
         {
-            *(osg::Vec4*)(&(*mData)[getOffset(index, Position)]) = value;
+            std::memcpy(&(*mData)[getOffset(index, Position)], value.ptr(), sizeof(osg::Vec4f));
         }
 
         void setAttenuationRadius(int index, const osg::Vec4& value)
         {
-            *(osg::Vec4*)(&(*mData)[getOffset(index, AttenuationRadius)]) = value;
-        }
-
-        auto getPosition(int index)
-        {
-            return *(osg::Vec4*)(&(*mData)[getOffset(index, Position)]);
+            std::memcpy(&(*mData)[getOffset(index, AttenuationRadius)], value.ptr(), sizeof(osg::Vec4f));
         }
 
         auto& getData()
@@ -186,8 +179,8 @@ namespace SceneUtil
 
         void configureLayout(int offsetColors, int offsetPosition, int offsetAttenuationRadius, int size, int stride)
         {
-            static constexpr auto sizeofVec4 = sizeof(GL_FLOAT) * osg::Vec4::num_components;
-            static constexpr auto sizeofFloat = sizeof(GL_FLOAT);
+            constexpr auto sizeofVec4 = sizeof(GL_FLOAT) * osg::Vec4::num_components;
+            constexpr auto sizeofFloat = sizeof(GL_FLOAT);
 
             mOffsets[Diffuse] = offsetColors / sizeofFloat;
             mOffsets[Ambient] = mOffsets[Diffuse] + 1;
@@ -201,9 +194,9 @@ namespace SceneUtil
             LightBuffer oldBuffer = LightBuffer(*this);
             for (int i = 0; i < oldBuffer.mCount; ++i)
             {
-                *(osg::Vec4*)(&(*mData)[getOffset(i, Diffuse)]) = *(osg::Vec4*)(&(*mData)[oldBuffer.getOffset(i, Diffuse)]);
-                *(osg::Vec4*)(&(*mData)[getOffset(i, Position)]) = *(osg::Vec4*)(&(*mData)[oldBuffer.getOffset(i, Position)]);
-                *(osg::Vec4*)(&(*mData)[getOffset(i, AttenuationRadius)]) = *(osg::Vec4*)(&(*mData)[oldBuffer.getOffset(i, AttenuationRadius)]);
+                std::memcpy(&(*mData)[getOffset(i, Diffuse)], &(*mData)[oldBuffer.getOffset(i, Diffuse)], sizeof(osg::Vec4f));
+                std::memcpy(&(*mData)[getOffset(i, Position)], &(*mData)[oldBuffer.getOffset(i, Position)], sizeof(osg::Vec4f));
+                std::memcpy(&(*mData)[getOffset(i, AttenuationRadius)], &(*mData)[oldBuffer.getOffset(i, AttenuationRadius)], sizeof(osg::Vec4f));
             }
         }
 
@@ -212,7 +205,7 @@ namespace SceneUtil
         osg::Endian mEndian;
         int mCount;
         int mStride;
-        std::unordered_map<LayoutOffset, int> mOffsets;
+        std::array<std::size_t, 6> mOffsets;
     };
 
     class LightStateCache
@@ -234,7 +227,6 @@ namespace SceneUtil
     {
         switch (method)
         {
-        case LightingMethod::Undefined:
         case LightingMethod::FFP:
             {
                 break;
@@ -304,9 +296,9 @@ namespace SceneUtil
         void apply(osg::State& state) const override
         {
             int lightNum = GL_LIGHT0 + mIndex;
-            glLightfv(lightNum, GL_AMBIENT, mnullptr.ptr());
-            glLightfv(lightNum, GL_DIFFUSE, mnullptr.ptr());
-            glLightfv(lightNum, GL_SPECULAR, mnullptr.ptr());
+            glLightfv(lightNum, GL_AMBIENT, mNullptr.ptr());
+            glLightfv(lightNum, GL_DIFFUSE, mNullptr.ptr());
+            glLightfv(lightNum, GL_SPECULAR, mNullptr.ptr());
 
             LightStateCache* cache = getLightStateCache(state.getContextID());
             cache->lastAppliedLight[mIndex] = nullptr;
@@ -314,7 +306,7 @@ namespace SceneUtil
 
     private:
         size_t mIndex;
-        osg::Vec4f mnullptr;
+        osg::Vec4f mNullptr;
     };
 
     class FFPLightStateAttribute : public osg::StateAttribute
@@ -697,17 +689,17 @@ namespace SceneUtil
 
         void initSharedLayout(osg::GLExtensions* ext, int handle) const
         {
-            std::vector<unsigned int> index = { static_cast<int>(Shader::UBOBinding::LightBuffer) };
+            constexpr std::array<unsigned int, 1> index = { static_cast<unsigned int>(Shader::UBOBinding::LightBuffer) };
             int totalBlockSize = -1;
             int stride = -1;
 
             ext->glGetActiveUniformBlockiv(handle, 0, GL_UNIFORM_BLOCK_DATA_SIZE, &totalBlockSize);
             ext->glGetActiveUniformsiv(handle, index.size(), index.data(), GL_UNIFORM_ARRAY_STRIDE, &stride);
 
-            std::vector<const char*> names = {
-                 "LightBuffer[0].packedColors"
-                ,"LightBuffer[0].position"
-                ,"LightBuffer[0].attenuation"
+            std::array<const char*, 3> names = {
+                "LightBuffer[0].packedColors",
+                "LightBuffer[0].position",
+                "LightBuffer[0].attenuation",
             };
             std::vector<unsigned int> indices(names.size());
             std::vector<int> offsets(names.size());
@@ -803,18 +795,15 @@ namespace SceneUtil
         ,{"shaders", LightingMethod::SingleUBO}
     };
 
-    bool LightManager::isValidLightingModelString(const std::string& value)
-    {
-        return LightManager::mLightingMethodSettingMap.find(value) != LightManager::mLightingMethodSettingMap.end();
-    }
-
     LightingMethod LightManager::getLightingMethodFromString(const std::string& value)
     {
         auto it = LightManager::mLightingMethodSettingMap.find(value);
         if (it != LightManager::mLightingMethodSettingMap.end())
             return it->second;
-        else
-            return LightingMethod::Undefined;
+
+        constexpr const char* fallback = "shaders compatibility";
+        Log(Debug::Warning) << "Unknown lighting method '" << value << "', returning fallback '" << fallback << "'";
+        return LightingMethod::PerObjectUniform;
     }
 
     std::string LightManager::getLightingMethodString(LightingMethod method)
@@ -843,12 +832,6 @@ namespace SceneUtil
 
         std::string lightingMethodString = Settings::Manager::getString("lighting method", "Shaders");
         auto lightingMethod = LightManager::getLightingMethodFromString(lightingMethodString);
-        if (lightingMethod == LightingMethod::Undefined)
-        {
-            Log(Debug::Error) << "Invalid option for 'lighting method': got '" << lightingMethodString
-                              << "', expected legacy, shaders compatible, or shaders. Falling back to 'shaders compatible'.";
-            lightingMethod = LightingMethod::PerObjectUniform;
-        }
 
         updateSettings();
 
@@ -875,7 +858,6 @@ namespace SceneUtil
             initSingleUBO(targetLights);
 
         getOrCreateStateSet()->addUniform(new osg::Uniform("PointLightCount", 0));
-        getOrCreateStateSet()->setAttributeAndModes(new LightManagerStateAttributePerObjectUniform(this), osg::StateAttribute::ON);
 
         addCullCallback(new LightManagerCullCallback(this));
     }
@@ -894,10 +876,6 @@ namespace SceneUtil
         return mLightingMethod;
     }
 
-    LightManager::~LightManager()
-    {
-    }
-
     bool LightManager::usingFFP() const
     {
         return mLightingMethod == LightingMethod::FFP;
@@ -1029,6 +1007,7 @@ namespace SceneUtil
         setLightingMethod(LightingMethod::PerObjectUniform);
         setMaxLights(std::clamp(targetLights, mMaxLightsLowerLimit, LightManager::mMaxLightsUpperLimit));
 
+        stateset->setAttributeAndModes(new LightManagerStateAttributePerObjectUniform(this), osg::StateAttribute::ON);
         stateset->addUniform(new osg::Uniform(osg::Uniform::FLOAT_MAT4, "LightBuffer", getMaxLights()));
     }
 
@@ -1064,9 +1043,6 @@ namespace SceneUtil
         case LightingMethod::PerObjectUniform:
             mStateSetGenerator = std::make_unique<StateSetGeneratorPerObjectUniform>();
             break;
-        case LightingMethod::Undefined:
-            mStateSetGenerator = nullptr;
-            break;
         }
         mStateSetGenerator->mLightManager = this;
     }
@@ -1107,7 +1083,7 @@ namespace SceneUtil
         getLightIndexMap(frameNum).clear();
         mLights.clear();
         mLightsInViewSpace.clear();
-        return;
+
         // Do an occasional cleanup for orphaned lights.
         for (int i = 0; i < 2; ++i)
         {
@@ -1146,7 +1122,7 @@ namespace SceneUtil
         for (size_t i = 0; i < lightList.size(); ++i)
         {
             auto id = lightList[i]->mLightSource->getId();
-            hash_combine(hash, id);
+            Misc::hashCombine(hash, id);
 
             if (getLightingMethod() != LightingMethod::SingleUBO)
                 continue;
diff --git a/components/sceneutil/lightmanager.hpp b/components/sceneutil/lightmanager.hpp
index 62620c61f2..9a1fd54700 100644
--- a/components/sceneutil/lightmanager.hpp
+++ b/components/sceneutil/lightmanager.hpp
@@ -31,7 +31,6 @@ namespace SceneUtil
         FFP,
         PerObjectUniform,
         SingleUBO,
-        Undefined
     };
 
     void configureStateSetSunOverride(LightingMethod method, const osg::Light* light, osg::StateSet* stateset, int mode = osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
@@ -114,7 +113,6 @@ namespace SceneUtil
     class LightManager : public osg::Group
     {
     public:
-        static bool isValidLightingModelString(const std::string& value);
         static LightingMethod getLightingMethodFromString(const std::string& value);
         /// Returns string as used in settings file, or the empty string if the method is undefined
         static std::string getLightingMethodString(LightingMethod method);
@@ -139,8 +137,6 @@ namespace SceneUtil
 
         LightManager(const LightManager& copy, const osg::CopyOp& copyop);
 
-        ~LightManager();
-
         /// @param mask This mask is compared with the current Camera's cull mask to determine if lighting is desired.
         /// By default, it's ~0u i.e. always on.
         /// If you have some views that do not require lighting, then set the Camera's cull mask to not include
@@ -233,7 +229,6 @@ namespace SceneUtil
         float mPointLightRadiusMultiplier;
         float mPointLightFadeEnd;
         float mPointLightFadeStart;
-        float mPointLightFadeDelta;
 
         int mMaxLights;
 
diff --git a/docs/source/reference/modding/settings/shaders.rst b/docs/source/reference/modding/settings/shaders.rst
index 0537332a81..fc3767f8e8 100644
--- a/docs/source/reference/modding/settings/shaders.rst
+++ b/docs/source/reference/modding/settings/shaders.rst
@@ -186,7 +186,7 @@ light bounds multiplier
 
 :Type:		float
 :Range:		0.0-5.0
-:Default:	1.75
+:Default:	1.65
 
 Controls the bounding sphere radius of point lights, which is used to determine
 if an object should receive lighting from a particular light source. Note, this
@@ -243,7 +243,7 @@ minimum interior brightness
 
 :Type:		float
 :Range:		0.0-1.0
-:Default:	0.1
+:Default:	0.08
 
 Sets the minimum interior ambient brightness for interior cells when
 :ref:`lighting method` is not 'legacy'. A consequence of the new lighting system
diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index 400cba07f3..11ad9fd396 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -529,7 +529,7 @@
                             <Widget type="TextBox" skin="NormalText" position="0 176 352 18" align="Left Top" name="BoundingSphereMultText">
                                 <UserString key="ToolTipType" value="Layout"/>
                                 <UserString key="ToolTipLayout" value="TextToolTip"/>
-                                <UserString key="Caption_Text" value="Default: 1.75\nMultipler for bounding sphere of lights.\nHigher numbers allows for smooth falloff but require an increase in number of max lights.\n\nDoes not effect the illumination or strength of lights."/>
+                                <UserString key="Caption_Text" value="Default: 1.65\nMultipler for bounding sphere of lights.\nHigher numbers allows for smooth falloff but require an increase in number of max lights.\n\nDoes not effect the illumination or strength of lights."/>
                             </Widget>
                             <Widget type="ScrollBar" skin="MW_HScroll" position="0 200 352 18" align="HStretch Top">
                                 <Property key="Range" value="500000"/>
@@ -547,7 +547,7 @@
                             <Widget type="TextBox" skin="NormalText" position="0 224 352 18" align="Left Top" name="MinimumBrightnessText">
                                 <UserString key="ToolTipType" value="Layout"/>
                                 <UserString key="ToolTipLayout" value="TextToolTip"/>
-                                <UserString key="Caption_Text" value="Default: 0.1\nMinimum ambient interior brightness.\n\nIncrease this if you feel interiors are too dark."/>
+                                <UserString key="Caption_Text" value="Default: 0.08\nMinimum ambient interior brightness.\n\nIncrease this if you feel interiors are too dark."/>
                             </Widget>
                             <Widget type="ScrollBar" skin="MW_HScroll" position="0 248 352 18" align="HStretch Top">
                                 <Property key="Range" value="10000"/>
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index de2c237e8e..72118459f3 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -456,7 +456,7 @@ lighting method = shaders compatibility
 # lighting. Higher values will allow for smoother transitions of light sources,
 # but may carry a performance cost and requires a higher number of 'max lights'
 # set.
-light bounds multiplier =  1.75
+light bounds multiplier = 1.65
 
 # The distance from the camera at which lights fade away completely.
 # Set to 0 to disable fading.
@@ -472,7 +472,7 @@ max lights = 8
 # Sets minimum ambient brightness of interior cells. Levels below this threshold will have their
 # ambient values adjusted to balance the darker interiors.
 # When 'lighting method' is set to 'legacy', this setting will have no effect.
-minimum interior brightness = 0.1
+minimum interior brightness = 0.08
 
 # Convert the alpha test (cutout/punchthrough alpha) to alpha-to-coverage.
 # This allows MSAA to work with alpha-tested meshes, producing better-looking edges without pixelation.
diff --git a/files/shaders/lighting.glsl b/files/shaders/lighting.glsl
index ff8fa8969c..49e2c3261e 100644
--- a/files/shaders/lighting.glsl
+++ b/files/shaders/lighting.glsl
@@ -56,7 +56,7 @@ void perLightPoint(out vec3 ambientOut, out vec3 diffuseOut, int lightIndex, vec
     lambert *= clamp(-8.0 * (1.0 - 0.3) * eyeCosine + 1.0, 0.3, 1.0);
 #endif
 
-    diffuseOut =  lcalcDiffuse(lightIndex) * lambert;
+    diffuseOut = lcalcDiffuse(lightIndex) * lambert;
 }
 
 #if PER_PIXEL_LIGHTING
diff --git a/files/shaders/lighting_util.glsl b/files/shaders/lighting_util.glsl
index 6277d9d0ba..be32259071 100644
--- a/files/shaders/lighting_util.glsl
+++ b/files/shaders/lighting_util.glsl
@@ -102,7 +102,7 @@ vec3 lcalcDiffuse(int lightIndex)
 #if @lightingMethodPerObjectUniform
     return @getLight[lightIndex][2].xyz;
 #elif @lightingMethodUBO
-    return unpackRGB(@getLight[lightIndex].packedColors.x) * float(int(@getLight[lightIndex].packedColors.w));
+    return unpackRGB(@getLight[lightIndex].packedColors.x) * float(@getLight[lightIndex].packedColors.w);
 #else
     return @getLight[lightIndex].diffuse.xyz;
 #endif

From 92033bca64c7bfca419efc37cacf4bfa8626adc2 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Mon, 12 Apr 2021 01:08:45 -0700
Subject: [PATCH 0586/2859] Fixed error in calculating viewspace sun dir, minor
 cleanup

---
 components/sceneutil/lightmanager.cpp | 32 +++++++++++++++++++++++----
 files/shaders/lighting.glsl           | 16 +++++---------
 2 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index bc13559b10..3e741ea7e4 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -71,6 +71,11 @@ namespace
         mat(2, 3) = q;
         mat(3, 3) = r;
     }
+
+    bool isReflectionCamera(osg::Camera* camera)
+    {
+        return (camera->getName() == "ReflectionCamera");
+    }
 }
 
 namespace SceneUtil
@@ -612,6 +617,7 @@ namespace SceneUtil
         void operator()(osg::Node* node, osg::NodeVisitor* nv) override
         {
             osgUtil::CullVisitor* cv = static_cast<osgUtil::CullVisitor*>(nv);
+            bool pop = false;
 
             if (mLastFrameNumber != cv->getTraversalNumber())
             {
@@ -642,15 +648,33 @@ namespace SceneUtil
                     {
                         auto buf = mLightManager->getLightBuffer(mLastFrameNumber);
 
-                        buf->setDiffuse(0, sun->getDiffuse());
+                        buf->setPosition(0, sun->getPosition() * (*cv->getCurrentRenderStage()->getInitialViewMatrix()));
                         buf->setAmbient(0, sun->getAmbient());
+                        buf->setDiffuse(0, sun->getDiffuse());
                         buf->setSpecular(0, sun->getSpecular());
-                        buf->setPosition(0, sun->getPosition() * (*cv->getCurrentRenderStage()->getInitialViewMatrix()));
                     }
                 }
             }
+            else if (isReflectionCamera(cv->getCurrentCamera()))
+            {
+                auto sun = mLightManager->getSunlight();
+                if (sun)
+                {
+                    osg::Vec4 originalPos = sun->getPosition();
+                    sun->setPosition(originalPos * (*cv->getCurrentRenderStage()->getInitialViewMatrix()));
+
+                    osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
+                    configureStateSetSunOverride(mLightManager->getLightingMethod(), sun, stateset);
+
+                    sun->setPosition(originalPos);
+                    cv->pushStateSet(stateset);
+                    pop = true;
+                }
+            }
 
             traverse(node, nv);
+            if (pop)
+                cv->popStateSet();
         }
 
     private:
@@ -1151,7 +1175,7 @@ namespace SceneUtil
 
     const std::vector<LightManager::LightSourceViewBound>& LightManager::getLightsInViewSpace(osg::Camera *camera, const osg::RefMatrix* viewMatrix, size_t frameNum)
     {
-        bool isReflectionCamera = camera->getName() == "ReflectionCamera";
+        bool isReflection = isReflectionCamera(camera);
         osg::observer_ptr<osg::Camera> camPtr (camera);
         auto it = mLightsInViewSpace.find(camPtr);
 
@@ -1168,7 +1192,7 @@ namespace SceneUtil
                 osg::BoundingSphere viewBound = osg::BoundingSphere(osg::Vec3f(0,0,0), radius * mPointLightRadiusMultiplier);
                 transformBoundingSphere(worldViewMat, viewBound);
 
-                if (!isReflectionCamera && mPointLightFadeEnd != 0.f)
+                if (!isReflection && mPointLightFadeEnd != 0.f)
                 {
                     const float fadeDelta = mPointLightFadeEnd - mPointLightFadeStart;
                     float fade = 1 - std::clamp((viewBound.center().length() - mPointLightFadeStart) / fadeDelta, 0.f, 1.f);
diff --git a/files/shaders/lighting.glsl b/files/shaders/lighting.glsl
index 49e2c3261e..0d383e194b 100644
--- a/files/shaders/lighting.glsl
+++ b/files/shaders/lighting.glsl
@@ -2,8 +2,7 @@
 
 void perLightSun(out vec3 diffuseOut, vec3 viewPos, vec3 viewNormal)
 {
-    vec3 sunDiffuse = lcalcDiffuse(0).xyz;
-    vec3 lightDir = normalize(lcalcPosition(0).xyz);
+    vec3 lightDir = normalize(lcalcPosition(0));
     float lambert = dot(viewNormal.xyz, lightDir);
 
 #ifndef GROUNDCOVER
@@ -18,7 +17,7 @@ void perLightSun(out vec3 diffuseOut, vec3 viewPos, vec3 viewNormal)
     lambert *= clamp(-8.0 * (1.0 - 0.3) * eyeCosine + 1.0, 0.3, 1.0);
 #endif
 
-    diffuseOut = sunDiffuse * lambert;
+    diffuseOut = lcalcDiffuse(0).xyz * lambert;
 }
 
 void perLightPoint(out vec3 ambientOut, out vec3 diffuseOut, int lightIndex, vec3 viewPos, vec3 viewNormal)
@@ -66,14 +65,14 @@ void doLighting(vec3 viewPos, vec3 viewNormal, out vec3 diffuseLight, out vec3 a
 #endif
 {
     vec3 ambientOut, diffuseOut;
-    ambientLight = gl_LightModel.ambient.xyz;
 
     perLightSun(diffuseOut, viewPos, viewNormal);
+    ambientLight = gl_LightModel.ambient.xyz;
 #if PER_PIXEL_LIGHTING
     diffuseLight = diffuseOut * shadowing;
 #else
     shadowDiffuse = diffuseOut;
-    diffuseLight = diffuseOut;
+    diffuseLight = vec3(0);
 #endif
 
     for (int i = @startLight; i < @endLight; ++i)
@@ -90,14 +89,11 @@ void doLighting(vec3 viewPos, vec3 viewNormal, out vec3 diffuseLight, out vec3 a
 
 vec3 getSpecular(vec3 viewNormal, vec3 viewDirection, float shininess, vec3 matSpec)
 {
-    vec3 sunDir = lcalcPosition(0);
-    vec3 sunSpec = lcalcSpecular(0).xyz;
-
-    vec3 lightDir = normalize(sunDir);
+    vec3 lightDir = normalize(lcalcPosition(0));
     float NdotL = dot(viewNormal, lightDir);
     if (NdotL <= 0.0)
         return vec3(0.0);
     vec3 halfVec = normalize(lightDir - viewDirection);
     float NdotH = dot(viewNormal, halfVec);
-    return pow(max(NdotH, 0.0), max(1e-4, shininess)) * sunSpec * matSpec;
+    return pow(max(NdotH, 0.0), max(1e-4, shininess)) * lcalcSpecular(0).xyz * matSpec;
 }

From 531a6e197942570fe4482508af5c3dbfb54b3277 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Tue, 13 Apr 2021 11:00:48 -0700
Subject: [PATCH 0587/2859] Code review fixes, remove implicit GLSL casts

---
 apps/openmw/mwrender/renderingmanager.cpp     |  4 +-
 components/sceneutil/lightmanager.cpp         | 41 ++++++++++++-------
 .../reference/modding/settings/shaders.rst    |  2 +-
 files/settings-default.cfg                    |  2 +-
 files/shaders/lighting.glsl                   |  2 +-
 5 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index e60d6b78ae..2e342ad3af 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -1171,8 +1171,8 @@ namespace MWRender
                     lightManager->updateMaxLights();
 
                     auto defines = mResourceSystem->getSceneManager()->getShaderManager().getGlobalDefines();
-                    for (auto& define : lightManager->getLightDefines())
-                        defines[define.first] = define.second;
+                    for (const auto& [name, key] : lightManager->getLightDefines())
+                        defines[name] = key;
                     mResourceSystem->getSceneManager()->getShaderManager().setGlobalDefines(defines);
 
                     mSceneRoot->removeUpdateCallback(mStateUpdater);
diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 3e741ea7e4..c03bbca597 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -184,8 +184,8 @@ namespace SceneUtil
 
         void configureLayout(int offsetColors, int offsetPosition, int offsetAttenuationRadius, int size, int stride)
         {
-            constexpr auto sizeofVec4 = sizeof(GL_FLOAT) * osg::Vec4::num_components;
             constexpr auto sizeofFloat = sizeof(GL_FLOAT);
+            constexpr auto sizeofVec4 = sizeofFloat * osg::Vec4::num_components;
 
             mOffsets[Diffuse] = offsetColors / sizeofFloat;
             mOffsets[Ambient] = mOffsets[Diffuse] + 1;
@@ -197,11 +197,12 @@ namespace SceneUtil
 
             // Copy over previous buffers light data. Buffers populate before we know the layout.
             LightBuffer oldBuffer = LightBuffer(*this);
+            mData->resize(size / sizeofFloat);
             for (int i = 0; i < oldBuffer.mCount; ++i)
             {
-                std::memcpy(&(*mData)[getOffset(i, Diffuse)], &(*mData)[oldBuffer.getOffset(i, Diffuse)], sizeof(osg::Vec4f));
-                std::memcpy(&(*mData)[getOffset(i, Position)], &(*mData)[oldBuffer.getOffset(i, Position)], sizeof(osg::Vec4f));
-                std::memcpy(&(*mData)[getOffset(i, AttenuationRadius)], &(*mData)[oldBuffer.getOffset(i, AttenuationRadius)], sizeof(osg::Vec4f));
+                std::memcpy(&(*mData)[getOffset(i, Diffuse)], &(*oldBuffer.mData)[oldBuffer.getOffset(i, Diffuse)], sizeof(osg::Vec4f));
+                std::memcpy(&(*mData)[getOffset(i, Position)], &(*oldBuffer.mData)[oldBuffer.getOffset(i, Position)], sizeof(osg::Vec4f));
+                std::memcpy(&(*mData)[getOffset(i, AttenuationRadius)], &(*oldBuffer.mData)[oldBuffer.getOffset(i, AttenuationRadius)], sizeof(osg::Vec4f));
             }
         }
 
@@ -766,17 +767,27 @@ namespace SceneUtil
 
         std::string generateDummyShader(int maxLightsInScene)
         {
-            return "#version 120\n"
-            "#extension GL_ARB_uniform_buffer_object : require                                      \n"
-            "struct LightData {                                                                     \n"
-            "   ivec4 packedColors;                                                                 \n"
-            "   vec4 position;                                                                      \n"
-            "   vec4 attenuation;                                                                   \n"
-            "};                                                                                     \n"
-            "uniform LightBufferBinding {                                                           \n"
-            "   LightData LightBuffer[" + std::to_string(mLightManager->getMaxLightsInScene()) + "];\n"
-            "};                                                                                     \n"
-            "void main() { gl_Position = vec4(0.0); }                                               \n";
+            const std::string define = "@maxLightsInScene";
+
+            std::string shader = R"GLSL(
+                #version 120
+                #extension GL_ARB_uniform_buffer_object : require
+                struct LightData {
+                   ivec4 packedColors;
+                   vec4 position;
+                   vec4 attenuation;
+                };
+                uniform LightBufferBinding {
+                   LightData LightBuffer[@maxLightsInScene];
+                };
+                void main()
+                {
+                    gl_Position = vec4(0.0);
+                }
+            )GLSL";
+
+            shader.replace(shader.find(define), define.length(), std::to_string(maxLightsInScene));
+            return shader;
         }
 
         LightManager* mLightManager;
diff --git a/docs/source/reference/modding/settings/shaders.rst b/docs/source/reference/modding/settings/shaders.rst
index fc3767f8e8..4814b206b9 100644
--- a/docs/source/reference/modding/settings/shaders.rst
+++ b/docs/source/reference/modding/settings/shaders.rst
@@ -174,7 +174,7 @@ this mode when supported and where the GPU is not a bottleneck. On some weaker
 devices, using this mode along with :ref:`force per pixel lighting` can carry
 performance penalties.
 
-Note that when enabled groundcover lighting is forced to be vertex lighting,
+Note that when enabled, groundcover lighting is forced to be vertex lighting,
 unless normal maps are provided. This is due to some groundcover mods using the
 Z-Up normals technique to avoid some common issues with shading. As a
 consequence, per pixel lighting would give undesirable results.
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 7b40a65a9a..20121d408a 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -447,7 +447,7 @@ radial fog = false
 # uncaps the light limit, enables groundcover lighting, and uses a modified
 # attenuation formula to reduce popping and light seams. "shaders" comes with
 # all these benefits and is meant for larger light limits, but may not be
-# supported on older hardware and may be less performant on weaker hardware when
+# supported on older hardware and may be slower on weaker hardware when
 # 'force per pixel lighting' is enabled.
 lighting method = shaders compatibility
 
diff --git a/files/shaders/lighting.glsl b/files/shaders/lighting.glsl
index 0d383e194b..177017f822 100644
--- a/files/shaders/lighting.glsl
+++ b/files/shaders/lighting.glsl
@@ -72,7 +72,7 @@ void doLighting(vec3 viewPos, vec3 viewNormal, out vec3 diffuseLight, out vec3 a
     diffuseLight = diffuseOut * shadowing;
 #else
     shadowDiffuse = diffuseOut;
-    diffuseLight = vec3(0);
+    diffuseLight = vec3(0.0);
 #endif
 
     for (int i = @startLight; i < @endLight; ++i)

From c6fa75c4acedb624ba6d566644e719f4185ee00a Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Tue, 13 Apr 2021 22:03:47 +0200
Subject: [PATCH 0588/2859] `cd` into the build directly to upload coverity
 logs

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a04b6a1cd2..74c50c8c4e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,6 +43,7 @@ Coverity:
     # 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:
+    - cd build/
     - 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 \

From 3c4a9069ae08e09fcfbd26ef1d84103212d1ad1f Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 13 Apr 2021 23:10:43 +0200
Subject: [PATCH 0589/2859] Do not use infinite area cost

Division by zero causes float value to be infinite. When infinite cost is
multiplied by zero distance the result is NaN. After this pathfinding algorithm
state is broken.
---
 apps/openmw/mwmechanics/aipackage.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index 8dcf37355c..e7ba9e2277 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -25,6 +25,14 @@
 
 #include <osg/Quat>
 
+namespace
+{
+    float divOrMax(float dividend, float divisor)
+    {
+        return divisor == 0 ? std::numeric_limits<float>::max() * std::numeric_limits<float>::epsilon() : dividend / divisor;
+    }
+}
+
 MWMechanics::AiPackage::AiPackage(AiPackageTypeId typeId, const Options& options) :
     mTypeId(typeId),
     mOptions(options),
@@ -439,15 +447,15 @@ DetourNavigator::AreaCosts MWMechanics::AiPackage::getAreaCosts(const MWWorld::P
     const MWWorld::Class& actorClass = actor.getClass();
 
     if (flags & DetourNavigator::Flag_swim)
-        costs.mWater = costs.mWater / actorClass.getSwimSpeed(actor);
+        costs.mWater = divOrMax(costs.mWater, actorClass.getSwimSpeed(actor));
 
     if (flags & DetourNavigator::Flag_walk)
     {
         float walkCost;
         if (getTypeId() == AiPackageTypeId::Wander)
-            walkCost = 1.0 / actorClass.getWalkSpeed(actor);
+            walkCost = divOrMax(1.0, actorClass.getWalkSpeed(actor));
         else
-            walkCost = 1.0 / actorClass.getRunSpeed(actor);
+            walkCost = divOrMax(1.0, actorClass.getRunSpeed(actor));
         costs.mDoor = costs.mDoor * walkCost;
         costs.mPathgrid = costs.mPathgrid * walkCost;
         costs.mGround = costs.mGround * walkCost;

From 0fae6d9a0aac22be46f0a32d8321086a8d77d3f0 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 13 Apr 2021 23:23:45 +0200
Subject: [PATCH 0590/2859] Add walk and swim flags when corresponding speed is
 positive

This allows to avoid finding path over area that will should have infinite
cost (area_cost = area_cost_factor / area_speed).
---
 apps/openmw/mwmechanics/aipackage.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index e7ba9e2277..204cf2f3f4 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -424,14 +424,15 @@ DetourNavigator::Flags MWMechanics::AiPackage::getNavigatorFlags(const MWWorld::
     const MWWorld::Class& actorClass = actor.getClass();
     DetourNavigator::Flags result = DetourNavigator::Flag_none;
 
-    if (actorClass.isPureWaterCreature(actor)
-        || (getTypeId() != AiPackageTypeId::Wander
-            && ((allowToFollowOverWaterSurface && getTypeId() == AiPackageTypeId::Follow)
-                || actorClass.canSwim(actor)
-                || hasWaterWalking(actor))))
+    if ((actorClass.isPureWaterCreature(actor)
+         || (getTypeId() != AiPackageTypeId::Wander
+             && ((allowToFollowOverWaterSurface && getTypeId() == AiPackageTypeId::Follow)
+                 || actorClass.canSwim(actor)
+                 || hasWaterWalking(actor)))
+        ) && actorClass.getSwimSpeed(actor) > 0)
         result |= DetourNavigator::Flag_swim;
 
-    if (actorClass.canWalk(actor))
+    if (actorClass.canWalk(actor) && actor.getClass().getWalkSpeed(actor) > 0)
         result |= DetourNavigator::Flag_walk;
 
     if (actorClass.isBipedal(actor) && getTypeId() != AiPackageTypeId::Wander)

From 696cf9ab05af25af0a305b34ed9feb8af788d545 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Wed, 14 Apr 2021 08:06:22 +0400
Subject: [PATCH 0591/2859] Extend variables range to avoid integer overflow

---
 components/nif/data.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/nif/data.cpp b/components/nif/data.cpp
index 415a013b3a..b6674611bc 100644
--- a/components/nif/data.cpp
+++ b/components/nif/data.cpp
@@ -363,11 +363,11 @@ void NiSkinPartition::read(NIFStream *nif)
 
 void NiSkinPartition::Partition::read(NIFStream *nif)
 {
-    unsigned short numVertices = nif->getUShort();
-    unsigned short numTriangles = nif->getUShort();
-    unsigned short numBones = nif->getUShort();
-    unsigned short numStrips = nif->getUShort();
-    unsigned short bonesPerVertex = nif->getUShort();
+    size_t numVertices = nif->getUShort();
+    size_t numTriangles = nif->getUShort();
+    size_t numBones = nif->getUShort();
+    size_t numStrips = nif->getUShort();
+    size_t bonesPerVertex = nif->getUShort();
     if (numBones)
         nif->getUShorts(bones, numBones);
 
@@ -395,7 +395,7 @@ void NiSkinPartition::Partition::read(NIFStream *nif)
         if (numStrips)
         {
             strips.resize(numStrips);
-            for (unsigned short i = 0; i < numStrips; i++)
+            for (size_t i = 0; i < numStrips; i++)
                 nif->getUShorts(strips[i], stripLengths[i]);
         }
         else if (numTriangles)

From 388573cf6030e5867f7567493b05541b2eb02598 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Wed, 14 Apr 2021 08:07:08 +0400
Subject: [PATCH 0592/2859] Fix uninitialized fields in the essimporter

---
 apps/essimporter/convertscpt.cpp     | 1 +
 apps/essimporter/importinventory.cpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/apps/essimporter/convertscpt.cpp b/apps/essimporter/convertscpt.cpp
index ca81ebbbf2..cb7947e400 100644
--- a/apps/essimporter/convertscpt.cpp
+++ b/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);
     }
 
diff --git a/apps/essimporter/importinventory.cpp b/apps/essimporter/importinventory.cpp
index dbf9ce0bd8..e91c39452c 100644
--- a/apps/essimporter/importinventory.cpp
+++ b/apps/essimporter/importinventory.cpp
@@ -19,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;

From 5f6f2c15b16f1b01e9d0969f4b10d23b867b266a Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Wed, 14 Apr 2021 08:07:43 +0400
Subject: [PATCH 0593/2859] An another attempt to suppress Coverity warning
 about mkstemp

---
 components/crashcatcher/crashcatcher.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/components/crashcatcher/crashcatcher.cpp b/components/crashcatcher/crashcatcher.cpp
index b4b2a4a0c6..e0a5c964fa 100644
--- a/components/crashcatcher/crashcatcher.cpp
+++ b/components/crashcatcher/crashcatcher.cpp
@@ -150,6 +150,9 @@ static void gdb_info(pid_t pid)
      * So CoverityScan warning is valid only for ancient versions of stdlib.
     */
     strcpy(respfile, "/tmp/gdb-respfile-XXXXXX");
+#ifdef __COVERITY__
+    umask(0600);
+#endif
     if((fd=mkstemp(respfile)) >= 0 && (f=fdopen(fd, "w")) != nullptr)
     {
         fprintf(f, "attach %d\n"

From e309f75938119d1ea96c6e180f9aad36fb8602e3 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Wed, 14 Apr 2021 08:07:56 +0400
Subject: [PATCH 0594/2859] Join variables declaration and usage

---
 components/shader/shadervisitor.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index b0013538f0..e8ac7d9c36 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -278,8 +278,7 @@ namespace Shader
 
         const osg::StateSet::AttributeList& attributes = stateset->getAttributeList();
         osg::StateSet::AttributeList removedAttributes;
-        osg::ref_ptr<osg::StateSet> removedState;
-        if (removedState = getRemovedState(*stateset))
+        if (osg::ref_ptr<osg::StateSet> removedState = getRemovedState(*stateset))
             removedAttributes = removedState->getAttributeList();
         for (const auto& attributeMap : { attributes, removedAttributes })
         {
@@ -475,8 +474,7 @@ namespace Shader
 
         writableStateSet->removeAttribute(osg::StateAttribute::PROGRAM);
 
-        osg::ref_ptr<osg::StateSet> removedState;
-        if (removedState = getRemovedState(*writableStateSet))
+        if (osg::ref_ptr<osg::StateSet> removedState = getRemovedState(*writableStateSet))
         {
             // user data is normally shallow copied so shared with the original stateset
             osg::ref_ptr<osg::UserDataContainer> writableUserData;

From bce6effe955ae116754753dd2fdd257627c8ac56 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Wed, 14 Apr 2021 08:20:23 +0400
Subject: [PATCH 0595/2859] Fix uninitialized variables in the LightManager

---
 components/sceneutil/lightmanager.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index c03bbca597..1735f6b8b3 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -400,7 +400,7 @@ namespace SceneUtil
     class LightStateAttributePerObjectUniform : public osg::StateAttribute
     {
     public:
-        LightStateAttributePerObjectUniform() {}
+        LightStateAttributePerObjectUniform() : mLightManager(nullptr) {}
         LightStateAttributePerObjectUniform(const std::vector<osg::ref_ptr<osg::Light>>& lights, LightManager* lightManager) :  mLights(lights), mLightManager(lightManager) {}
 
         LightStateAttributePerObjectUniform(const LightStateAttributePerObjectUniform& copy,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY)
@@ -613,7 +613,7 @@ namespace SceneUtil
     class LightManagerCullCallback : public osg::NodeCallback
     {
     public:
-        LightManagerCullCallback(LightManager* lightManager) : mLightManager(lightManager) {}
+        LightManagerCullCallback(LightManager* lightManager) : mLightManager(lightManager), mLastFrameNumber(0) {}
 
         void operator()(osg::Node* node, osg::NodeVisitor* nv) override
         {
@@ -903,6 +903,10 @@ namespace SceneUtil
         , mLightingMask(copy.mLightingMask)
         , mSun(copy.mSun)
         , mLightingMethod(copy.mLightingMethod)
+        , mPointLightRadiusMultiplier(copy.mPointLightRadiusMultiplier)
+        , mPointLightFadeEnd(copy.mPointLightFadeEnd)
+        , mPointLightFadeStart(copy.mPointLightFadeStart)
+        , mMaxLights(copy.mMaxLights)
     {
     }
 

From ac347810ca7a5fadc5d4f9729006e65350cc57c5 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Wed, 14 Apr 2021 08:36:17 +0400
Subject: [PATCH 0596/2859] Fix uninitialized field in the mouse event

---
 components/sdlutil/sdlinputwrapper.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/sdlutil/sdlinputwrapper.cpp b/components/sdlutil/sdlinputwrapper.cpp
index ca223ae3b8..57b211e97e 100644
--- a/components/sdlutil/sdlinputwrapper.cpp
+++ b/components/sdlutil/sdlinputwrapper.cpp
@@ -368,6 +368,7 @@ InputWrapper::InputWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> v
         pack_evt.yrel = 0;
         pack_evt.z = mMouseZ;
         pack_evt.zrel = 0;
+        pack_evt.timestamp = 0;
 
         if(evt.type == SDL_MOUSEMOTION)
         {

From 0c7ddd393801bb5f178e83632b20a3c7e14e6fb8 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Wed, 14 Apr 2021 08:47:55 +0400
Subject: [PATCH 0597/2859] Remove redundant qualifiers

---
 components/sceneutil/lightmanager.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 1735f6b8b3..c9826c0e8e 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -861,7 +861,7 @@ namespace SceneUtil
 
         if (ffp)
         {
-            initFFP(LightManager::mFFPMaxLights);
+            initFFP(mFFPMaxLights);
             return;
         }
 
@@ -1044,7 +1044,7 @@ namespace SceneUtil
         auto* stateset = getOrCreateStateSet();
 
         setLightingMethod(LightingMethod::PerObjectUniform);
-        setMaxLights(std::clamp(targetLights, mMaxLightsLowerLimit, LightManager::mMaxLightsUpperLimit));
+        setMaxLights(std::clamp(targetLights, mMaxLightsLowerLimit, mMaxLightsUpperLimit));
 
         stateset->setAttributeAndModes(new LightManagerStateAttributePerObjectUniform(this), osg::StateAttribute::ON);
         stateset->addUniform(new osg::Uniform(osg::Uniform::FLOAT_MAT4, "LightBuffer", getMaxLights()));
@@ -1053,7 +1053,7 @@ namespace SceneUtil
     void LightManager::initSingleUBO(int targetLights)
     {
         setLightingMethod(LightingMethod::SingleUBO);
-        setMaxLights(std::clamp(targetLights, mMaxLightsLowerLimit, LightManager::mMaxLightsUpperLimit));
+        setMaxLights(std::clamp(targetLights, mMaxLightsLowerLimit, mMaxLightsUpperLimit));
 
         for (int i = 0; i < 2; ++i)
         {

From 016a1d45dfde4b4d66f00ab3759669e810fc1fcf Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Wed, 14 Apr 2021 10:58:44 +0400
Subject: [PATCH 0598/2859] Remove outdated field - remnant from earlier
 implementation

---
 apps/opencs/model/world/data.cpp | 14 --------------
 components/esm/loadtes3.cpp      |  1 -
 components/esm/loadtes3.hpp      |  1 -
 3 files changed, 16 deletions(-)

diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 319334c9bf..4ccd2a06db 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -986,20 +986,6 @@ int CSMWorld::Data::startLoading (const boost::filesystem::path& path, bool base
         mMetaData.setRecord (0, Record<MetaData> (RecordBase::State_ModifiedOnly, nullptr, &metaData));
     }
 
-    // Fix uninitialized master data index
-    for (std::vector<ESM::Header::MasterData>::const_iterator masterData = mReader->getGameFiles().begin();
-        masterData != mReader->getGameFiles().end(); ++masterData)
-    {
-        std::map<std::string, int>::iterator nameResult = mContentFileNames.find(masterData->name);
-        if (nameResult != mContentFileNames.end())
-        {
-            ESM::Header::MasterData& hackedMasterData = const_cast<ESM::Header::MasterData&>(*masterData);
-
-
-            hackedMasterData.index = nameResult->second;
-        }
-    }
-
     return mReader->getRecordCount();
 }
 
diff --git a/components/esm/loadtes3.cpp b/components/esm/loadtes3.cpp
index 84a31b3bd0..d953f1dc23 100644
--- a/components/esm/loadtes3.cpp
+++ b/components/esm/loadtes3.cpp
@@ -42,7 +42,6 @@ void ESM::Header::load (ESMReader &esm)
         MasterData m;
         m.name = esm.getHString();
         m.size = esm.getHNLong ("DATA");
-        m.index = -1;
         mMaster.push_back (m);
     }
 
diff --git a/components/esm/loadtes3.hpp b/components/esm/loadtes3.hpp
index 5b26ac7d2d..014e2a1362 100644
--- a/components/esm/loadtes3.hpp
+++ b/components/esm/loadtes3.hpp
@@ -49,7 +49,6 @@ namespace ESM
         {
             std::string name;
             uint64_t size;
-            int index; // Position of the parent file in the global list of loaded files
         };
 
         GMDT mGameData; // Used in .ess savegames only

From 9d8fcec642e0660bd5a410b40b452066739812a0 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Wed, 14 Apr 2021 09:01:37 +0200
Subject: [PATCH 0599/2859] Remove bogus warning. It is a normal situation for
 projectiles to be in-flight after the caster is gone.

---
 apps/openmw/mwphysics/physicssystem.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 4087ba7e16..c5ba902fcd 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -612,9 +612,6 @@ namespace MWPhysics
             return nullptr;
         }();
 
-        if (caster == nullptr)
-            Log(Debug::Warning) << "No caster for projectile " << projectileId;
-
         ProjectileConvexCallback resultCallback(caster, btFrom, btTo, projectile);
         resultCallback.m_collisionFilterMask = 0xff;
         resultCallback.m_collisionFilterGroup = CollisionType_Projectile;

From db1428de18450600a08b7c6a05eba85a66f3cd64 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Wed, 14 Apr 2021 23:03:35 +0400
Subject: [PATCH 0600/2859] Move container unresolving to the separate method

---
 apps/openmw/mwworld/containerstore.cpp | 41 +++++++++++++-------------
 apps/openmw/mwworld/containerstore.hpp |  1 +
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index 86c5ec331d..d921c0a20a 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -75,27 +75,13 @@ namespace
 
 MWWorld::ResolutionListener::~ResolutionListener()
 {
-    if(!mStore.mModified && mStore.mResolved && !mStore.mPtr.isEmpty())
+    try
     {
-        try
-        {
-            for(const auto&& ptr : mStore)
-                ptr.getRefData().setCount(0);
-        }
-        catch(const std::exception& e)
-        {
-            Log(Debug::Warning) << "Failed to clear temporary container contents of " << mStore.mPtr.get<ESM::Container>()->mBase->mId << ": " << e.what();
-        }
-        mStore.fillNonRandom(mStore.mPtr.get<ESM::Container>()->mBase->mInventory, "", mStore.mSeed);
-        try
-        {
-            addScripts(mStore, mStore.mPtr.mCell);
-        }
-        catch(const std::exception& e)
-        {
-            Log(Debug::Warning) << "Failed to restart item scripts inside " << mStore.mPtr.get<ESM::Container>()->mBase->mId << ": " << e.what();
-        }
-        mStore.mResolved = false;
+        mStore.unresolve();
+    }
+    catch(const std::exception& e)
+    {
+        Log(Debug::Error) << "Failed to clear temporary container contents of " << mStore.mPtr.get<ESM::Container>()->mBase->mId << ": " << e.what();
     }
 }
 
@@ -662,6 +648,21 @@ MWWorld::ResolutionHandle MWWorld::ContainerStore::resolveTemporarily()
     return {listener};
 }
 
+void MWWorld::ContainerStore::unresolve()
+{
+    if (mModified)
+        return;
+
+    if (mResolved && !mPtr.isEmpty())
+    {
+        for(const auto&& ptr : *this)
+            ptr.getRefData().setCount(0);
+        fillNonRandom(mPtr.get<ESM::Container>()->mBase->mInventory, "", mSeed);
+        addScripts(*this, mPtr.mCell);
+        mResolved = false;
+    }
+}
+
 float MWWorld::ContainerStore::getWeight() const
 {
     if (!mWeightUpToDate)
diff --git a/apps/openmw/mwworld/containerstore.hpp b/apps/openmw/mwworld/containerstore.hpp
index bb8ca52737..5044b0f451 100644
--- a/apps/openmw/mwworld/containerstore.hpp
+++ b/apps/openmw/mwworld/containerstore.hpp
@@ -250,6 +250,7 @@ namespace MWWorld
 
             void resolve();
             ResolutionHandle resolveTemporarily();
+            void unresolve();
 
             friend class ContainerStoreIteratorBase<Ptr>;
             friend class ContainerStoreIteratorBase<ConstPtr>;

From ab8d1c02d47e4f20d170ebde6d02994566a1357b Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 1 Mar 2021 23:07:25 +0100
Subject: [PATCH 0601/2859] Set idle priority for navmesh generation thread

Support Linux, Windows, FreeBSD.
---
 components/CMakeLists.txt                     |  2 +-
 .../detournavigator/asyncnavmeshupdater.cpp   |  2 +
 components/misc/thread.cpp                    | 73 +++++++++++++++++++
 components/misc/thread.hpp                    | 11 +++
 4 files changed, 87 insertions(+), 1 deletion(-)
 create mode 100644 components/misc/thread.cpp
 create mode 100644 components/misc/thread.hpp

diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 822858c0bf..ad2783b57d 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -87,7 +87,7 @@ add_component_dir (esmterrain
     )
 
 add_component_dir (misc
-    constants utf8stream stringops resourcehelpers rng messageformatparser weakcache
+    constants utf8stream stringops resourcehelpers rng messageformatparser weakcache thread
     )
 
 add_component_dir (debug
diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index 1ac928f077..bb78df7643 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -4,6 +4,7 @@
 #include "settings.hpp"
 
 #include <components/debug/debuglog.hpp>
+#include <components/misc/thread.hpp>
 
 #include <osg/Stats>
 
@@ -135,6 +136,7 @@ namespace DetourNavigator
     void AsyncNavMeshUpdater::process() noexcept
     {
         Log(Debug::Debug) << "Start process navigator jobs by thread=" << std::this_thread::get_id();
+        Misc::setCurrentThreadIdlePriority();
         while (!mShouldStop)
         {
             try
diff --git a/components/misc/thread.cpp b/components/misc/thread.cpp
new file mode 100644
index 0000000000..8101779bcb
--- /dev/null
+++ b/components/misc/thread.cpp
@@ -0,0 +1,73 @@
+#include "thread.hpp"
+
+#include <components/debug/debuglog.hpp>
+
+#include <cstring>
+#include <thread>
+
+#ifdef __linux__
+
+#include <pthread.h>
+#include <sched.h>
+
+namespace Misc
+{
+    void setCurrentThreadIdlePriority()
+    {
+        sched_param param;
+        param.sched_priority = 0;
+        if (pthread_setschedparam(pthread_self(), SCHED_IDLE, &param) == 0)
+            Log(Debug::Verbose) << "Using idle priority for thread=" << std::this_thread::get_id();
+        else
+            Log(Debug::Warning) << "Failed to set idle priority for thread=" << std::this_thread::get_id() << ": " << std::strerror(errno);
+    }
+}
+
+#elif defined(WIN32)
+
+#undef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+
+#include <windows.h>
+
+namespace Misc
+{
+    void setCurrentThreadIdlePriority()
+    {
+        if (SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_LOWEST))
+            Log(Debug::Verbose) << "Using idle priority for thread=" << std::this_thread::get_id();
+        else
+            Log(Debug::Warning) << "Failed to set idle priority for thread=" << std::this_thread::get_id() << ": " << GetLastError();
+    }
+}
+
+#elif defined(__FreeBSD__)
+
+#include <sys/types.h>
+#include <sys/rtprio.h>
+
+namespace Misc
+{
+    void setCurrentThreadIdlePriority()
+    {
+        rtprio prio;
+        prio.type = RTP_PRIO_IDLE;
+        prio.prio = RTP_PRIO_MAX;
+        if (rtprio_thread(RTP_SET, 0, &prio) == 0)
+            Log(Debug::Verbose) << "Using idle priority for thread=" << std::this_thread::get_id();
+        else
+            Log(Debug::Warning) << "Failed to set idle priority for thread=" << std::this_thread::get_id() << ": " << std::strerror(errno);
+    }
+}
+
+#else
+
+namespace Misc
+{
+    void setCurrentThreadIdlePriority()
+    {
+        Log(Debug::Warning) << "Idle thread priority is not supported on this system";
+    }
+}
+
+#endif
diff --git a/components/misc/thread.hpp b/components/misc/thread.hpp
new file mode 100644
index 0000000000..191c43bba1
--- /dev/null
+++ b/components/misc/thread.hpp
@@ -0,0 +1,11 @@
+#ifndef OPENMW_COMPONENTS_MISC_THREAD_H
+#define OPENMW_COMPONENTS_MISC_THREAD_H
+
+#include <thread>
+
+namespace Misc
+{
+    void setCurrentThreadIdlePriority();
+}
+
+#endif

From 33b8233887e588cb18ee9b6767994cfaee72b585 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Thu, 15 Apr 2021 15:14:41 +0400
Subject: [PATCH 0602/2859] Validate GUI scaling and place it to the launcher

---
 apps/launcher/advancedpage.cpp                |  4 ++
 apps/openmw/mwbase/windowmanager.hpp          |  2 +
 apps/openmw/mwgui/inventorywindow.cpp         | 15 +++---
 apps/openmw/mwgui/inventorywindow.hpp         |  1 -
 apps/openmw/mwgui/windowmanagerimp.cpp        | 12 +++--
 apps/openmw/mwgui/windowmanagerimp.hpp        |  4 ++
 apps/openmw/mwinput/controllermanager.cpp     | 11 ++---
 apps/openmw/mwinput/controllermanager.hpp     |  1 -
 apps/openmw/mwinput/mousemanager.cpp          | 18 +++----
 apps/openmw/mwinput/mousemanager.hpp          |  1 -
 apps/openmw/mwrender/localmap.cpp             |  6 +--
 components/fontloader/fontloader.cpp          |  9 ++--
 components/fontloader/fontloader.hpp          |  3 +-
 .../source/reference/modding/settings/GUI.rst |  7 +--
 files/ui/advancedpage.ui                      | 49 +++++++++++++++++++
 15 files changed, 98 insertions(+), 45 deletions(-)

diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index d1ae6df94a..91e3842fa9 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -203,6 +203,7 @@ bool Launcher::AdvancedPage::loadSettings()
             showOwnedComboBox->setCurrentIndex(showOwnedIndex);
         loadSettingBool(stretchBackgroundCheckBox, "stretch menu background", "GUI");
         loadSettingBool(graphicHerbalismCheckBox, "graphic herbalism", "Game");
+        scalingSpinBox->setValue(mEngineSettings.getFloat("scaling factor", "GUI"));
     }
 
     // Bug fixes
@@ -360,6 +361,9 @@ void Launcher::AdvancedPage::saveSettings()
             mEngineSettings.setInt("show owned", "Game", showOwnedCurrentIndex);
         saveSettingBool(stretchBackgroundCheckBox, "stretch menu background", "GUI");
         saveSettingBool(graphicHerbalismCheckBox, "graphic herbalism", "Game");
+        float uiScalingFactor = scalingSpinBox->value();
+        if (uiScalingFactor != mEngineSettings.getFloat("scaling factor", "GUI"))
+            mEngineSettings.setFloat("scaling factor", "GUI", uiScalingFactor);
     }
 
     // Bug fixes
diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index 9bbea9c519..31d188879f 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -171,6 +171,8 @@ namespace MWBase
             virtual void setDragDrop(bool dragDrop) = 0;
             virtual bool getWorldMouseOver() = 0;
 
+            virtual float getScalingFactor() = 0;
+
             virtual bool toggleFogOfWar() = 0;
 
             virtual bool toggleFullHelp() = 0;
diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index 6152efaa98..402f7656cb 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -67,13 +67,8 @@ namespace MWGui
         , mLastYSize(0)
         , mPreview(new MWRender::InventoryPreview(parent, resourceSystem, MWMechanics::getPlayer()))
         , mTrading(false)
-        , mScaleFactor(1.0f)
         , mUpdateTimer(0.f)
     {
-        float uiScale = Settings::Manager::getFloat("scaling factor", "GUI");
-        if (uiScale > 0.f)
-            mScaleFactor = uiScale;
-
         mPreviewTexture.reset(new osgMyGUI::OSGTexture(mPreview->getTexture()));
         mPreview->rebuild();
 
@@ -469,10 +464,11 @@ namespace MWGui
         MyGUI::IntSize size = mAvatarImage->getSize();
         int width = std::min(mPreview->getTextureWidth(), size.width);
         int height = std::min(mPreview->getTextureHeight(), size.height);
-        mPreview->setViewport(int(width*mScaleFactor), int(height*mScaleFactor));
+        float scalingFactor = MWBase::Environment::get().getWindowManager()->getScalingFactor();
+        mPreview->setViewport(int(width*scalingFactor), int(height*scalingFactor));
 
         mAvatarImage->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 0.f,
-                                                                     width*mScaleFactor/float(mPreview->getTextureWidth()), height*mScaleFactor/float(mPreview->getTextureHeight())));
+                                                                     width*scalingFactor/float(mPreview->getTextureWidth()), height*scalingFactor/float(mPreview->getTextureHeight())));
     }
 
     void InventoryWindow::onNameFilterChanged(MyGUI::EditBox* _sender)
@@ -637,8 +633,9 @@ namespace MWGui
         y = (mAvatarImage->getHeight()-1) - y;
 
         // Scale coordinates
-        x = int(x*mScaleFactor);
-        y = int(y*mScaleFactor);
+        float scalingFactor = MWBase::Environment::get().getWindowManager()->getScalingFactor();
+        x = static_cast<int>(x*scalingFactor);
+        y = static_cast<int>(y*scalingFactor);
 
         int slot = mPreview->getSlotSelected (x, y);
 
diff --git a/apps/openmw/mwgui/inventorywindow.hpp b/apps/openmw/mwgui/inventorywindow.hpp
index dc3ee9e0cb..214245767b 100644
--- a/apps/openmw/mwgui/inventorywindow.hpp
+++ b/apps/openmw/mwgui/inventorywindow.hpp
@@ -104,7 +104,6 @@ namespace MWGui
             std::unique_ptr<MWRender::InventoryPreview> mPreview;
 
             bool mTrading;
-            float mScaleFactor;
             float mUpdateTimer;
 
             void toggleMaximized();
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 54c09e00f1..2f9d357bde 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -1,5 +1,6 @@
 #include "windowmanagerimp.hpp"
 
+#include <algorithm>
 #include <cassert>
 #include <chrono>
 #include <thread>
@@ -187,8 +188,8 @@ namespace MWGui
       , mVersionDescription(versionDescription)
       , mWindowVisible(true)
     {
-        float uiScale = Settings::Manager::getFloat("scaling factor", "GUI");
-        mGuiPlatform = new osgMyGUI::Platform(viewer, guiRoot, resourceSystem->getImageManager(), uiScale);
+        mScalingFactor = std::clamp(Settings::Manager::getFloat("scaling factor", "GUI"), 0.5f, 8.f);
+        mGuiPlatform = new osgMyGUI::Platform(viewer, guiRoot, resourceSystem->getImageManager(), mScalingFactor);
         mGuiPlatform->initialise(resourcePath, (boost::filesystem::path(logpath) / "MyGUI.log").generic_string());
 
         mGui = new MyGUI::Gui;
@@ -199,7 +200,7 @@ namespace MWGui
         MyGUI::LanguageManager::getInstance().eventRequestTag = MyGUI::newDelegate(this, &WindowManager::onRetrieveTag);
 
         // Load fonts
-        mFontLoader.reset(new Gui::FontLoader(encoding, resourceSystem->getVFS(), userDataPath));
+        mFontLoader.reset(new Gui::FontLoader(encoding, resourceSystem->getVFS(), userDataPath, mScalingFactor));
         mFontLoader->loadBitmapFonts(exportFonts);
 
         //Register own widgets with MyGUI
@@ -1326,6 +1327,11 @@ namespace MWGui
         return mHud->getWorldMouseOver();
     }
 
+    float WindowManager::getScalingFactor()
+    {
+        return mScalingFactor;
+    }
+
     void WindowManager::executeInConsole (const std::string& path)
     {
         mConsole->executeFile (path);
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index 3fd8b132f6..5a0d89ce10 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -208,6 +208,8 @@ namespace MWGui
     void setDragDrop(bool dragDrop) override;
     bool getWorldMouseOver() override;
 
+    float getScalingFactor() override;
+
     bool toggleFogOfWar() override;
     bool toggleFullHelp() override; ///< show extra info in item tooltips (owner, script)
     bool getFullHelp() const override;
@@ -518,6 +520,8 @@ namespace MWGui
 
     SDLUtil::VideoWrapper* mVideoWrapper;
 
+    float mScalingFactor;
+
     /**
      * Called when MyGUI tries to retrieve a tag's value. Tags must be denoted in #{tag} notation and will be replaced upon setting a user visible text/property.
      * Supported syntax:
diff --git a/apps/openmw/mwinput/controllermanager.cpp b/apps/openmw/mwinput/controllermanager.cpp
index d17a4bd95d..03d492c9cf 100644
--- a/apps/openmw/mwinput/controllermanager.cpp
+++ b/apps/openmw/mwinput/controllermanager.cpp
@@ -32,7 +32,6 @@ namespace MWInput
         , mMouseManager(mouseManager)
         , mJoystickEnabled (Settings::Manager::getBool("enable controller", "Input"))
         , mGamepadCursorSpeed(Settings::Manager::getFloat("gamepad cursor speed", "Input"))
-        , mInvUiScalingFactor(1.f)
         , mSneakToggleShortcutTimer(0.f)
         , mGamepadZoom(0)
         , mGamepadGuiCursorEnabled(true)
@@ -69,10 +68,6 @@ namespace MWInput
             }
         }
 
-        float uiScale = Settings::Manager::getFloat("scaling factor", "GUI");
-        if (uiScale > 0.f)
-            mInvUiScalingFactor = 1.f / uiScale;
-
         float deadZoneRadius = Settings::Manager::getFloat("joystick dead zone", "Input");
         deadZoneRadius = std::min(std::max(deadZoneRadius, 0.0f), 0.5f);
         mBindingsManager->setJoystickDeadZone(deadZoneRadius);
@@ -102,8 +97,10 @@ namespace MWInput
 
             // We keep track of our own mouse position, so that moving the mouse while in
             // game mode does not move the position of the GUI cursor
-            float xMove = xAxis * dt * 1500.0f * mInvUiScalingFactor * mGamepadCursorSpeed;
-            float yMove = yAxis * dt * 1500.0f * mInvUiScalingFactor * mGamepadCursorSpeed;
+            float uiScale = MWBase::Environment::get().getWindowManager()->getScalingFactor();
+            float xMove = xAxis * dt * 1500.0f / uiScale;
+            float yMove = yAxis * dt * 1500.0f / uiScale;
+
             float mouseWheelMove = -zAxis * dt * 1500.0f;
             if (xMove != 0 || yMove != 0 || mouseWheelMove != 0)
             {
diff --git a/apps/openmw/mwinput/controllermanager.hpp b/apps/openmw/mwinput/controllermanager.hpp
index 871f11102e..d8c62d57c4 100644
--- a/apps/openmw/mwinput/controllermanager.hpp
+++ b/apps/openmw/mwinput/controllermanager.hpp
@@ -52,7 +52,6 @@ namespace MWInput
 
         bool mJoystickEnabled;
         float mGamepadCursorSpeed;
-        float mInvUiScalingFactor;
         float mSneakToggleShortcutTimer;
         float mGamepadZoom;
         bool mGamepadGuiCursorEnabled;
diff --git a/apps/openmw/mwinput/mousemanager.cpp b/apps/openmw/mwinput/mousemanager.cpp
index 8df116baa6..a696332dff 100644
--- a/apps/openmw/mwinput/mousemanager.cpp
+++ b/apps/openmw/mwinput/mousemanager.cpp
@@ -29,22 +29,18 @@ namespace MWInput
         , mCameraYMultiplier(Settings::Manager::getFloat("camera y multiplier", "Input"))
         , mBindingsManager(bindingsManager)
         , mInputWrapper(inputWrapper)
-        , mInvUiScalingFactor(1.f)
         , mGuiCursorX(0)
         , mGuiCursorY(0)
         , mMouseWheel(0)
         , mMouseLookEnabled(false)
         , mGuiCursorEnabled(true)
     {
-        float uiScale = Settings::Manager::getFloat("scaling factor", "GUI");
-        if (uiScale > 0.f)
-            mInvUiScalingFactor = 1.f / uiScale;
-
         int w,h;
         SDL_GetWindowSize(window, &w, &h);
 
-        mGuiCursorX = mInvUiScalingFactor * w / 2.f;
-        mGuiCursorY = mInvUiScalingFactor * h / 2.f;
+        float uiScale = MWBase::Environment::get().getWindowManager()->getScalingFactor();
+        mGuiCursorX = w / (2.f * uiScale);
+        mGuiCursorY = h / (2.f * uiScale);
     }
 
     void MouseManager::processChangedSettings(const Settings::CategorySettingVector& changed)
@@ -79,8 +75,9 @@ namespace MWInput
 
             // We keep track of our own mouse position, so that moving the mouse while in
             // game mode does not move the position of the GUI cursor
-            mGuiCursorX = static_cast<float>(arg.x) * mInvUiScalingFactor;
-            mGuiCursorY = static_cast<float>(arg.y) * mInvUiScalingFactor;
+            float uiScale = MWBase::Environment::get().getWindowManager()->getScalingFactor();
+            mGuiCursorX = static_cast<float>(arg.x) / uiScale;
+            mGuiCursorY = static_cast<float>(arg.y) / uiScale;
 
             mMouseWheel = static_cast<int>(arg.z);
 
@@ -249,6 +246,7 @@ namespace MWInput
 
     void MouseManager::warpMouse()
     {
-        mInputWrapper->warpMouse(static_cast<int>(mGuiCursorX / mInvUiScalingFactor), static_cast<int>(mGuiCursorY / mInvUiScalingFactor));
+        float uiScale = MWBase::Environment::get().getWindowManager()->getScalingFactor();
+        mInputWrapper->warpMouse(static_cast<int>(mGuiCursorX*uiScale), static_cast<int>(mGuiCursorY*uiScale));
     }
 }
diff --git a/apps/openmw/mwinput/mousemanager.hpp b/apps/openmw/mwinput/mousemanager.hpp
index 3bf692bcf8..000e7cd0b6 100644
--- a/apps/openmw/mwinput/mousemanager.hpp
+++ b/apps/openmw/mwinput/mousemanager.hpp
@@ -47,7 +47,6 @@ namespace MWInput
 
         BindingsManager* mBindingsManager;
         SDLUtil::InputWrapper* mInputWrapper;
-        float mInvUiScalingFactor;
 
         float mGuiCursorX;
         float mGuiCursorY;
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index 9a16232467..e395503a30 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -25,6 +25,7 @@
 #include <components/resource/resourcesystem.hpp>
 
 #include "../mwbase/environment.hpp"
+#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
 
 #include "../mwworld/cellstore.hpp"
@@ -92,9 +93,8 @@ LocalMap::LocalMap(osg::Group* root)
     , mInterior(false)
 {
     // Increase map resolution, if use UI scaling
-    float uiScale = Settings::Manager::getFloat("scaling factor", "GUI");
-    if (uiScale > 0.f)
-        mMapResolution *= uiScale;
+    float uiScale = MWBase::Environment::get().getWindowManager()->getScalingFactor();
+    mMapResolution *= uiScale;
 
     SceneUtil::FindByNameVisitor find("Scene Root");
     mRoot->accept(find);
diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index 98fce32d2a..b4739110f7 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -146,10 +146,11 @@ namespace
 namespace Gui
 {
 
-    FontLoader::FontLoader(ToUTF8::FromType encoding, const VFS::Manager* vfs, const std::string& userDataPath)
+    FontLoader::FontLoader(ToUTF8::FromType encoding, const VFS::Manager* vfs, const std::string& userDataPath, float scalingFactor)
         : mVFS(vfs)
         , mUserDataPath(userDataPath)
         , mFontHeight(16)
+        , mScalingFactor(scalingFactor)
     {
         if (encoding == ToUTF8::WINDOWS_1252)
             mEncoding = ToUTF8::CP437;
@@ -566,11 +567,7 @@ namespace Gui
                 // to allow to configure font size via config file, without need to edit XML files.
                 // Also we should take UI scaling factor in account.
                 int resolution = Settings::Manager::getInt("ttf resolution", "GUI");
-                resolution = std::min(960, std::max(48, resolution));
-
-                float uiScale = Settings::Manager::getFloat("scaling factor", "GUI");
-                if (uiScale > 0.f)
-                    resolution *= uiScale;
+                resolution = std::min(960, std::max(48, resolution)) * mScalingFactor;
 
                 MyGUI::xml::ElementPtr resolutionNode = resourceNode->createChild("Property");
                 resolutionNode->addAttribute("key", "Resolution");
diff --git a/components/fontloader/fontloader.hpp b/components/fontloader/fontloader.hpp
index 94b0225016..8a46a0069e 100644
--- a/components/fontloader/fontloader.hpp
+++ b/components/fontloader/fontloader.hpp
@@ -27,7 +27,7 @@ namespace Gui
     class FontLoader
     {
     public:
-        FontLoader (ToUTF8::FromType encoding, const VFS::Manager* vfs, const std::string& userDataPath);
+        FontLoader (ToUTF8::FromType encoding, const VFS::Manager* vfs, const std::string& userDataPath, float scalingFactor);
         ~FontLoader();
 
         /// @param exportToFile export the converted fonts (Images and XML with glyph metrics) to files?
@@ -43,6 +43,7 @@ namespace Gui
         const VFS::Manager* mVFS;
         std::string mUserDataPath;
         int mFontHeight;
+        float mScalingFactor;
 
         std::vector<MyGUI::ITexture*> mTextures;
         std::vector<MyGUI::ResourceManualFont*> mFonts;
diff --git a/docs/source/reference/modding/settings/GUI.rst b/docs/source/reference/modding/settings/GUI.rst
index cad04ab5ce..00f99e47bc 100644
--- a/docs/source/reference/modding/settings/GUI.rst
+++ b/docs/source/reference/modding/settings/GUI.rst
@@ -5,12 +5,13 @@ scaling factor
 --------------
 
 :Type:		floating point
-:Range:		> 0.0
+:Range:		0.5 to 8.0
 :Default:	1.0
 
-This setting scales the GUI interface windows.
+This setting scales GUI windows.
 A value of 1.0 results in the normal scale. Larger values are useful to increase the scale of the GUI for high resolution displays.
-This setting can only be configured by editing the settings configuration file.
+
+This setting can be configured in the Interface section of Advanced tab of the launcher.
 
 font size
 ---------
diff --git a/files/ui/advancedpage.ui b/files/ui/advancedpage.ui
index 03f54b7597..b6ec20634a 100644
--- a/files/ui/advancedpage.ui
+++ b/files/ui/advancedpage.ui
@@ -846,6 +846,55 @@ True: In non-combat mode camera is positioned behind the character's shoulder. C
            </property>
           </spacer>
          </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_2"/>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
+         <item>
+          <widget class="QLabel" name="scalingLabel">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This setting scales GUI windows. A value of 1.0 results in the normal scale.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>GUI scaling factor</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QDoubleSpinBox" name="scalingSpinBox">
+           <property name="decimals">
+            <number>2</number>
+           </property>
+           <property name="minimum">
+            <double>0.500000000000000</double>
+           </property>
+           <property name="maximum">
+            <double>8.000000000000000</double>
+           </property>
+           <property name="singleStep">
+            <double>0.250000000000000</double>
+           </property>
+           <property name="value">
+            <double>1.000000000000000</double>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_5">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
         </layout>
        </item>
        <item>

From e31cf7e6ac691663bf093cdc92a3ff1dfa998693 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Thu, 15 Apr 2021 22:32:42 +0200
Subject: [PATCH 0603/2859] Follow up MR 722: do not apply mPositionOffset
 twice when we teleport.

Previous MR change the meaning of mPositionOffset: it is now just a log
of relative movement that were already applied to allow the physics
simulation to catch up, instead of changes that needs to be applied. As
such, after a teleport we need to reset it. Also, since mWorldPosition
is already with the offset we should not update its value in
applyPositionOffset().
---
 apps/openmw/mwphysics/actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index f9adc9bc69..f14805c6f1 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -121,6 +121,7 @@ void Actor::updatePosition()
     mPreviousPosition = mWorldPosition;
     mPosition = mWorldPosition;
     mSimulationPosition = mWorldPosition;
+    mPositionOffset = osg::Vec3f();
     mStandingOnPtr = nullptr;
     mSkipSimulation = true;
 }
@@ -196,7 +197,6 @@ void Actor::applyOffsetChange()
 {
     if (mPositionOffset.length() == 0)
         return;
-    mWorldPosition += mPositionOffset;
     mPosition += mPositionOffset;
     mPreviousPosition += mPositionOffset;
     mSimulationPosition += mPositionOffset;

From 6bbcee8f1fddf9ddf2b1efbb77fd44e8aba6307c Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Thu, 15 Apr 2021 22:50:37 +0000
Subject: [PATCH 0604/2859] Attempt to fix MacOS beta shared runners.

I think they changed the tag a week ago without notifying us.
---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 74c50c8c4e..721bc98d8f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -120,7 +120,7 @@ Debian_Clang_tests:
 .MacOS:
   image: macos-11-xcode-12
   tags:
-    - macos
+    - shared-macos-amd64
   stage: build
   only:
     variables:

From 65e7857606459e822402dfe3b80242fc8b509713 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Fri, 16 Apr 2021 00:19:53 +0000
Subject: [PATCH 0605/2859] Maybe make -f flag work

Why can't -f just do what the manual says? Why do we even have a pre-existing build directory sometimes? We don't cache it, and artifacts are only supposed to be accessible within the same pipeline.
---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 721bc98d8f..99f28b60dc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -129,7 +129,7 @@ Debian_Clang_tests:
     paths:
     - ccache/
   script:
-    - rm -fr build/*  # remove anything in the build directory
+    - rm -fr build  # remove the build directory
     - export CCACHE_BASEDIR="$(pwd)"
     - export CCACHE_DIR="$(pwd)/ccache"
     - mkdir -pv "${CCACHE_DIR}"

From 5de72c94ab4544b427d9ef7dedcd0c3fa8b0fb9b Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Fri, 16 Apr 2021 08:10:31 +0400
Subject: [PATCH 0606/2859] Limit pointers cache size to avoid possible
 bad_alloc errors

---
 apps/openmw/mwworld/cells.cpp                    | 2 +-
 docs/source/reference/modding/settings/cells.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwworld/cells.cpp b/apps/openmw/mwworld/cells.cpp
index 40ad62a403..ad4dfcfb90 100644
--- a/apps/openmw/mwworld/cells.cpp
+++ b/apps/openmw/mwworld/cells.cpp
@@ -134,7 +134,7 @@ MWWorld::Cells::Cells (const MWWorld::ESMStore& store, std::vector<ESM::ESMReade
 : mStore (store), mReader (reader),
   mIdCacheIndex (0)
 {
-    int cacheSize = std::max(Settings::Manager::getInt("pointers cache size", "Cells"), 0);
+    int cacheSize = std::clamp(Settings::Manager::getInt("pointers cache size", "Cells"), 40, 1000);
     mIdCache = IdCache(cacheSize, std::pair<std::string, CellStore *> ("", (CellStore*)nullptr));
 }
 
diff --git a/docs/source/reference/modding/settings/cells.rst b/docs/source/reference/modding/settings/cells.rst
index 620b545ac3..ab707faf8f 100644
--- a/docs/source/reference/modding/settings/cells.rst
+++ b/docs/source/reference/modding/settings/cells.rst
@@ -175,7 +175,7 @@ pointers cache size
 -------------------
 
 :Type:		integer
-:Range:		>0
+:Range:		40 to 1000
 :Default:	40
 
 The count of object pointers that will be saved for a faster search by object ID.

From 16b288f53c66d3ccb8d27ad848bbd8bc767c316b Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Fri, 16 Apr 2021 08:38:11 +0200
Subject: [PATCH 0607/2859] Re-add dropped struct keyword to fix build.

rtprio is both a struct and a function, so we need to be explicit.

../../../components/misc/thread.cpp:53:9: error: must use 'struct' tag
to refer to type 'rtprio' in this scope
rtprio prio;
^
struct
/usr/include/sys/rtprio.h:91:5: note: struct 'rtprio' is hidden by a
non-type declaration of 'rtprio' here
int     rtprio(int, pid_t, struct rtprio *);
^
1 error generated.
---
 components/misc/thread.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/misc/thread.cpp b/components/misc/thread.cpp
index 8101779bcb..c78bf17e5a 100644
--- a/components/misc/thread.cpp
+++ b/components/misc/thread.cpp
@@ -50,7 +50,7 @@ namespace Misc
 {
     void setCurrentThreadIdlePriority()
     {
-        rtprio prio;
+        struct rtprio prio;
         prio.type = RTP_PRIO_IDLE;
         prio.prio = RTP_PRIO_MAX;
         if (rtprio_thread(RTP_SET, 0, &prio) == 0)

From 9d321b7cdf829fc58e06fca6d99d7e8b441b1e25 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 16 Apr 2021 13:36:45 +0200
Subject: [PATCH 0608/2859] Install ccache before run on macOS

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 99f28b60dc..74b92b059b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -130,11 +130,11 @@ Debian_Clang_tests:
     - ccache/
   script:
     - 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_install.osx.sh
     - CI/before_script.osx.sh
     - 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

From d37b66d58f6a6598dd511fe4ad5347a37cfd40a6 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Fri, 16 Apr 2021 15:21:44 +0200
Subject: [PATCH 0609/2859] =?UTF-8?q?Fix=20once=20and=20for=20all=E2=84=A2?=
 =?UTF-8?q?=20coverity's=20schedule?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- According to https://gitlab.com/OpenMW/openmw/-/jobs/1176801332 there is no
  need to `cd` into build, since coverity will generate a `cov-int` folder
  in the current folder.
- Don't run other jobs by default during scheduled runs.
- Add a missing terminal quote to coverity's upload command.
---
 .gitlab-ci.yml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 99f28b60dc..959b14cefb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,6 +16,8 @@ stages:
     - apt-cache/
     - ccache/
   stage: build
+  rules:
+    - if: '$CI_PIPELINE_SOURCE != "schedule"'
   script:
     - export CCACHE_BASEDIR="`pwd`"
     - export CCACHE_DIR="`pwd`/ccache" && mkdir -pv "$CCACHE_DIR"
@@ -31,7 +33,8 @@ stages:
       - build/install/
 
 Coverity:
-  extends: .Debian
+  extends: .Debian_Image
+  stage: build
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule"'
   before_script:
@@ -43,12 +46,11 @@ Coverity:
     # 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:
-    - cd build/
     - 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  
+    - 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++
@@ -182,6 +184,8 @@ variables: &cs-targets
   - choco install python -y
   - refreshenv
   stage: build
+  rules:
+    - if: '$CI_PIPELINE_SOURCE != "schedule"'
   script:
     - $time = (Get-Date -Format "HH:mm:ss")
     - echo ${time}
@@ -274,6 +278,8 @@ Windows_Ninja_CS_RelWithDebInfo:
   - choco install python -y
   - refreshenv
   stage: build
+  rules:
+    - if: '$CI_PIPELINE_SOURCE != "schedule"'
   script:
     - $time = (Get-Date -Format "HH:mm:ss")
     - echo ${time}

From f137b7341f5115172ea045d02624bb43edadc330 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Fri, 16 Apr 2021 16:09:15 +0200
Subject: [PATCH 0610/2859] Another fallout from MR 722: objects were treated
 like actors by accident. Net effect was that calls to Move/MoveWorld didn't
 update position of collision object.

---
 apps/openmw/mwworld/worldimp.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 5b9afa4fe2..497fd653a8 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1256,11 +1256,13 @@ namespace MWWorld
     MWWorld::Ptr World::moveObjectBy(const Ptr& ptr, osg::Vec3f vec, bool moveToActive)
     {
         auto* actor = mPhysics->getActor(ptr);
+        osg::Vec3f newpos = ptr.getRefData().getPosition().asVec3() + vec;
         if (actor)
+        {
             actor->adjustPosition(vec);
-
-        osg::Vec3f newpos = ptr.getRefData().getPosition().asVec3() + vec;
-        return moveObject(ptr, newpos.x(), newpos.y(), newpos.z(), false, moveToActive && ptr != getPlayerPtr());
+            return moveObject(ptr, newpos.x(), newpos.y(), newpos.z(), false, moveToActive && ptr != getPlayerPtr());
+        }
+        return moveObject(ptr, newpos.x(), newpos.y(), newpos.z());
     }
 
     void World::scaleObject (const Ptr& ptr, float scale)

From 47ced7dec4fc99dbb98a0630f76952841a80ea67 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Fri, 16 Apr 2021 18:33:12 +0200
Subject: [PATCH 0611/2859] Add some validation for bsa parsing

This should fix #5955
---
 components/bsa/bsa_file.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/components/bsa/bsa_file.cpp b/components/bsa/bsa_file.cpp
index ef49a60d2b..ec455ea1fc 100644
--- a/components/bsa/bsa_file.cpp
+++ b/components/bsa/bsa_file.cpp
@@ -168,6 +168,14 @@ void BSAFile::readHeader()
         fs.setNameInfos(namesOffset, &mStringBuf);
         fs.hash = hashes[i];
 
+        if (namesOffset >= mStringBuf.size()) {
+            fail("Archive contains names offset outside itself");
+        }
+        const void* end = std::memchr(fs.name(), '\0', mStringBuf.size()-namesOffset);
+        if (!end) {
+            fail("Archive contains non-zero terminated string");
+        }
+
         endOfNameBuffer = std::max(endOfNameBuffer, namesOffset + std::strlen(fs.name())+1);
         assert(endOfNameBuffer <= mStringBuf.size());
 

From 16856d45c58ae75a363285ba79602002ecc72065 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Fri, 16 Apr 2021 11:55:40 -0700
Subject: [PATCH 0612/2859] Lighting Patch

Fixes build errors with older OSG builds and some issues with 'shared' layout.
Bring back ambient in inventory through lightmodel instead of sun ambient, mirrors scene ambient/sunlight relationship.
Forces shaders when certain lighting methods are enabled and finalize settings.
Correctly override sun for localmap.
---
 apps/openmw/mwgui/settingswindow.cpp          |  93 +++++---
 apps/openmw/mwgui/settingswindow.hpp          |   6 +-
 apps/openmw/mwrender/characterpreview.cpp     |  11 +-
 apps/openmw/mwrender/localmap.cpp             |   3 +-
 apps/openmw/mwrender/renderingmanager.cpp     |  15 +-
 components/resource/scenemanager.cpp          |  10 +
 components/resource/scenemanager.hpp          |   4 +
 components/sceneutil/lightmanager.cpp         | 132 ++++++------
 components/sceneutil/lightmanager.hpp         |  12 +-
 .../reference/modding/settings/shaders.rst    |  14 +-
 files/mygui/openmw_settings_window.layout     | 203 +++++++++---------
 11 files changed, 282 insertions(+), 221 deletions(-)

diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index 9a7c234e6c..3b4afc852f 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -111,20 +111,17 @@ namespace
             max = MyGUI::utility::parseFloat(widget->getUserString(settingMax));
     }
 
-    const char* getLightingMethodCaptionText(SceneUtil::LightingMethod lightingMethod)
-    {
-        switch (lightingMethod)
-        {
-            case SceneUtil::LightingMethod::FFP:
-                return "Emulates fixed function pipeline lighting, advanced light settings are disabled when this mode is active";
-            case SceneUtil::LightingMethod::PerObjectUniform:
-                return "Removes limit of 8 lights per object, fixes lighting attenuation, and enables groundcover lighting and light fade."
-                        "\n\nDesigned for compatibility across hardware, and is not meant for large max light counts.";
-            case SceneUtil::LightingMethod::SingleUBO:
-                return "Removes limit of 8 lights per object, fixes lighting attenuation, and enables groundcover lighting and light fade."
-                        "\n\nDesigned for more modern hardware and large max light counts.";
-        }
-        return "";
+    void updateMaxLightsComboBox(MyGUI::ComboBox* box)
+    {
+        constexpr int min = 8;
+        constexpr int max = 32;
+        constexpr int increment = 8;
+        int maxLights = Settings::Manager::getInt("max lights", "Shaders");
+        // show increments of 8 in dropdown
+        if (maxLights >= min && maxLights <= max && !(maxLights % increment))
+            box->setIndexSelected((maxLights / increment)-1);
+        else
+            box->setIndexSelected(MyGUI::ITEM_NONE);
     }
 }
 
@@ -235,9 +232,9 @@ namespace MWGui
         getWidget(mControllerSwitch, "ControllerButton");
         getWidget(mWaterTextureSize, "WaterTextureSize");
         getWidget(mWaterReflectionDetail, "WaterReflectionDetail");
-        getWidget(mLightingMethodText, "LightingMethodText");
+        getWidget(mLightingMethodButton, "LightingMethodButton");
         getWidget(mLightsResetButton, "LightsResetButton");
-        getWidget(mLightSettingOverlay, "LightSettingOverlay");
+        getWidget(mMaxLights, "MaxLights");
 
 #ifndef WIN32
         // hide gamma controls since it currently does not work under Linux
@@ -263,7 +260,9 @@ namespace MWGui
         mWaterTextureSize->eventComboChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onWaterTextureSizeChanged);
         mWaterReflectionDetail->eventComboChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onWaterReflectionDetailChanged);
 
+        mLightingMethodButton->eventComboChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onLightingMethodButtonChanged);
         mLightsResetButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onLightsResetButtonClicked);
+        mMaxLights->eventComboChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onMaxLightsChanged);
 
         mKeyboardSwitch->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onKeyboardSwitchClicked);
         mControllerSwitch->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onControllerSwitchClicked);
@@ -310,6 +309,8 @@ namespace MWGui
         waterReflectionDetail = std::min(5, std::max(0, waterReflectionDetail));
         mWaterReflectionDetail->setIndexSelected(waterReflectionDetail);
 
+        updateMaxLightsComboBox(mMaxLights);
+
         mWindowBorderButton->setEnabled(!Settings::Manager::getBool("fullscreen", "Video"));
 
         mKeyboardSwitch->setStateSelected(true);
@@ -396,19 +397,50 @@ namespace MWGui
         apply();
     }
 
+    void SettingsWindow::onLightingMethodButtonChanged(MyGUI::ComboBox* _sender, size_t pos)
+    {
+        if (pos == MyGUI::ITEM_NONE)
+            return;
+
+        std::string message = "This change requires a restart to take effect.";
+        MWBase::Environment::get().getWindowManager()->interactiveMessageBox(message, {"#{sOK}"}, true);
+
+        Settings::Manager::setString("lighting method", "Shaders", _sender->getItemNameAt(pos));
+        apply();
+    }
+
+    void SettingsWindow::onMaxLightsChanged(MyGUI::ComboBox* _sender, size_t pos)
+    {
+        int count = 8 * (pos + 1);
+
+        Settings::Manager::setInt("max lights", "Shaders", count);
+        apply();
+        configureWidgets(mMainWidget, false);
+    }
+
     void SettingsWindow::onLightsResetButtonClicked(MyGUI::Widget* _sender)
     {
         std::vector<std::string> buttons = {"#{sYes}", "#{sNo}"};
-        std::string message = "Resets to default values, would you like to continue?";
+        std::string message = "Resets to default values, would you like to continue? Changes to lighting method will require a restart.";
         MWBase::Environment::get().getWindowManager()->interactiveMessageBox(message, buttons, true);
         int selectedButton = MWBase::Environment::get().getWindowManager()->readPressedButton();
         if (selectedButton == 1 || selectedButton == -1)
             return;
 
-        constexpr std::array<const char*, 5> settings = {"light bounds multiplier", "maximum light distance", "light fade start", "minimum interior brightness", "max lights"};
+        constexpr std::array<const char*, 6> settings = {
+            "light bounds multiplier",
+            "maximum light distance",
+            "light fade start",
+            "minimum interior brightness",
+            "max lights",
+            "lighting method",
+        };
         for (const auto& setting : settings)
             Settings::Manager::setString(setting, "Shaders", Settings::Manager::mDefaultSettings[{"Shaders", setting}]);
 
+        mLightingMethodButton->setIndexSelected(mLightingMethodButton->findItemIndexWith(Settings::Manager::mDefaultSettings[{"Shaders", "lighting method"}]));
+        updateMaxLightsComboBox(mMaxLights);
+
         apply();
         configureWidgets(mMainWidget, false);
     }
@@ -614,20 +646,25 @@ namespace MWGui
     void SettingsWindow::updateLightSettings()
     {
         auto lightingMethod = MWBase::Environment::get().getResourceSystem()->getSceneManager()->getLightingMethod();
-        mLightingMethodText->setCaption(SceneUtil::LightManager::getLightingMethodString(lightingMethod));
+        std::string lightingMethodStr = SceneUtil::LightManager::getLightingMethodString(lightingMethod);
+
+        mLightingMethodButton->removeAllItems();
+
+        std::array<SceneUtil::LightingMethod, 3> methods = {
+            SceneUtil::LightingMethod::FFP,
+            SceneUtil::LightingMethod::PerObjectUniform,
+            SceneUtil::LightingMethod::SingleUBO,
+        };
 
-        if (lightingMethod == SceneUtil::LightingMethod::FFP || !Settings::Manager::getBool("force shaders", "Shaders"))
+        for (const auto& method : methods)
         {
-            MyGUI::Widget* parent = mLightSettingOverlay->getParent();
-            mLightSettingOverlay->setEnabled(false);
-            mLightSettingOverlay->setAlpha(0.8);
-            parent->setUserString("ToolTipType", "Layout");
-            parent->setUserString("ToolTipLayout", "TextToolTip");
-            parent->setUserString("Caption_Text", "Unavailable with current settings.");
-            parent->setEnabled(true);
+            if (!MWBase::Environment::get().getResourceSystem()->getSceneManager()->isSupportedLightingMethod(method))
+                continue;
+
+            mLightingMethodButton->addItem(SceneUtil::LightManager::getLightingMethodString(method));
         }
 
-        mLightingMethodText->setUserString("Caption_Text", getLightingMethodCaptionText(lightingMethod));
+        mLightingMethodButton->setIndexSelected(mLightingMethodButton->findItemIndexWith(lightingMethodStr));
     }
 
     void SettingsWindow::layoutControlsBox()
diff --git a/apps/openmw/mwgui/settingswindow.hpp b/apps/openmw/mwgui/settingswindow.hpp
index 0baf52c405..9c28733f9a 100644
--- a/apps/openmw/mwgui/settingswindow.hpp
+++ b/apps/openmw/mwgui/settingswindow.hpp
@@ -32,8 +32,8 @@ namespace MWGui
             MyGUI::ComboBox* mWaterTextureSize;
             MyGUI::ComboBox* mWaterReflectionDetail;
 
-            MyGUI::Widget* mLightSettingOverlay;
-            MyGUI::TextBox* mLightingMethodText;
+            MyGUI::ComboBox* mMaxLights;
+            MyGUI::ComboBox* mLightingMethodButton;
             MyGUI::Button* mLightsResetButton;
 
             // controls
@@ -56,7 +56,9 @@ namespace MWGui
             void onWaterTextureSizeChanged(MyGUI::ComboBox* _sender, size_t pos);
             void onWaterReflectionDetailChanged(MyGUI::ComboBox* _sender, size_t pos);
 
+            void onLightingMethodButtonChanged(MyGUI::ComboBox* _sender, size_t pos);
             void onLightsResetButtonClicked(MyGUI::Widget* _sender);
+            void onMaxLightsChanged(MyGUI::ComboBox* _sender, size_t pos);
 
             void onRebindAction(MyGUI::Widget* _sender);
             void onInputTabMouseWheel(MyGUI::Widget* _sender, int _rel);
diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index 63dd5ff70b..62011e8bdb 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -233,7 +233,16 @@ namespace MWRender
         float positionZ = std::cos(altitude);
         light->setPosition(osg::Vec4(positionX,positionY,positionZ, 0.0));
         light->setDiffuse(osg::Vec4(diffuseR,diffuseG,diffuseB,1));
-        light->setAmbient(osg::Vec4(ambientR,ambientG,ambientB,1));
+        osg::Vec4 ambientRGBA = osg::Vec4(ambientR,ambientG,ambientB,1);
+        if (mResourceSystem->getSceneManager()->getForceShaders())
+        {
+            // When using shaders, we now skip the ambient sun calculation as this is the only place it's used.
+            // Using the scene ambient will give identical results.
+            lightmodel->setAmbientIntensity(ambientRGBA);
+            light->setAmbient(osg::Vec4(0,0,0,1));
+        }
+        else
+            light->setAmbient(ambientRGBA);
         light->setSpecular(osg::Vec4(0,0,0,0));
         light->setLightNum(0);
         light->setConstantAttenuation(1.f);
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index 9a16232467..c2f0c9d2ba 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -224,8 +224,7 @@ osg::ref_ptr<osg::Camera> LocalMap::createOrthographicCamera(float x, float y, f
     SceneUtil::ShadowManager::disableShadowsForStateSet(stateset);
 
     // override sun for local map 
-    auto lightingMethod = MWBase::Environment::get().getResourceSystem()->getSceneManager()->getLightingMethod();    
-    SceneUtil::configureStateSetSunOverride(lightingMethod, light, stateset);
+    SceneUtil::configureStateSetSunOverride(static_cast<SceneUtil::LightManager*>(mSceneRoot.get()), light, stateset);
 
     camera->addChild(lightSource);
     camera->setStateSet(stateset);
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 2e342ad3af..16e0a351f2 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -201,11 +201,15 @@ namespace MWRender
         , mFieldOfViewOverridden(false)
         , mFieldOfViewOverride(0.f)
     {
+        auto lightingMethod = SceneUtil::LightManager::getLightingMethodFromString(Settings::Manager::getString("lighting method", "Shaders"));
+
         resourceSystem->getSceneManager()->setParticleSystemMask(MWRender::Mask_ParticleSystem);
         resourceSystem->getSceneManager()->setShaderPath(resourcePath + "/shaders");
-        bool explicitlyForceShaders = Settings::Manager::getBool("force shaders", "Shaders");
         // Shadows and radial fog have problems with fixed-function mode
-        bool forceShaders = Settings::Manager::getBool("radial fog", "Shaders") || explicitlyForceShaders || Settings::Manager::getBool("enable shadows", "Shadows");
+        bool forceShaders = Settings::Manager::getBool("radial fog", "Shaders")
+                            || Settings::Manager::getBool("force shaders", "Shaders")
+                            || Settings::Manager::getBool("enable shadows", "Shadows")
+                            || lightingMethod != SceneUtil::LightingMethod::FFP;
         resourceSystem->getSceneManager()->setForceShaders(forceShaders);
         // FIXME: calling dummy method because terrain needs to know whether lighting is clamped
         resourceSystem->getSceneManager()->setClampLighting(Settings::Manager::getBool("clamp lighting", "Shaders"));
@@ -217,12 +221,11 @@ namespace MWRender
         resourceSystem->getSceneManager()->setApplyLightingToEnvMaps(Settings::Manager::getBool("apply lighting to environment maps", "Shaders"));
         resourceSystem->getSceneManager()->setConvertAlphaTestToAlphaToCoverage(Settings::Manager::getBool("antialias alpha test", "Shaders") && Settings::Manager::getInt("antialiasing", "Video") > 1);
 
-        auto lightingMethod = SceneUtil::LightManager::getLightingMethodFromString(Settings::Manager::getString("lighting method", "Shaders"));
         // Let LightManager choose which backend to use based on our hint. For methods besides legacy lighting, this depends on support for various OpenGL extensions.
-        osg::ref_ptr<SceneUtil::LightManager> sceneRoot = new SceneUtil::LightManager(!explicitlyForceShaders || lightingMethod == SceneUtil::LightingMethod::FFP);
+        osg::ref_ptr<SceneUtil::LightManager> sceneRoot = new SceneUtil::LightManager(lightingMethod == SceneUtil::LightingMethod::FFP);
         resourceSystem->getSceneManager()->getShaderManager().setLightingMethod(sceneRoot->getLightingMethod());
         resourceSystem->getSceneManager()->setLightingMethod(sceneRoot->getLightingMethod());
-
+        resourceSystem->getSceneManager()->setSupportedLightingMethods(sceneRoot->getSupportedLightingMethods());
         mMinimumAmbientLuminance = std::clamp(Settings::Manager::getFloat("minimum interior brightness", "Shaders"), 0.f, 1.f);
 
         sceneRoot->setLightingMask(Mask_Lighting);
@@ -554,7 +557,7 @@ namespace MWRender
                 // brighten ambient so it reaches the minimum threshold but no more, we want to mess with content data as least we can
                 float targetBrightnessIncreaseFactor = mMinimumAmbientLuminance / relativeLuminance;
                 if (ambient.r() == 0.f && ambient.g() == 0.f && ambient.b() == 0.f)
-                    ambient = osg::Vec4(targetBrightnessIncreaseFactor, targetBrightnessIncreaseFactor, targetBrightnessIncreaseFactor, ambient.a());
+                    ambient = osg::Vec4(mMinimumAmbientLuminance, mMinimumAmbientLuminance, mMinimumAmbientLuminance, ambient.a());
                 else
                     ambient *= targetBrightnessIncreaseFactor;
             }
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 18fe3dae49..a3c751f7a2 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -305,6 +305,16 @@ namespace Resource
         mApplyLightingToEnvMaps = apply;
     }
 
+    void SceneManager::setSupportedLightingMethods(const SceneUtil::LightManager::SupportedMethods& supported)
+    {
+        mSupportedLightingMethods = supported;
+    }
+
+    bool SceneManager::isSupportedLightingMethod(SceneUtil::LightingMethod method) const
+    {
+        return mSupportedLightingMethods[static_cast<int>(method)];
+    }
+
     void SceneManager::setLightingMethod(SceneUtil::LightingMethod method)
     {
         mLightingMethod = method;
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index fdc7d334f8..7635cd20fc 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -107,6 +107,9 @@ namespace Resource
 
         void setApplyLightingToEnvMaps(bool apply);
 
+        void setSupportedLightingMethods(const SceneUtil::LightManager::SupportedMethods& supported);
+        bool isSupportedLightingMethod(SceneUtil::LightingMethod method) const;
+
         void setLightingMethod(SceneUtil::LightingMethod method);
         SceneUtil::LightingMethod getLightingMethod() const;
         
@@ -197,6 +200,7 @@ namespace Resource
         std::string mSpecularMapPattern;
         bool mApplyLightingToEnvMaps;
         SceneUtil::LightingMethod mLightingMethod;
+        SceneUtil::LightManager::SupportedMethods mSupportedLightingMethods;
         bool mConvertAlphaTestToAlphaToCoverage;
 
         osg::ref_ptr<MultiObjectCache> mInstanceCache;
diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index c03bbca597..4b80b6f98b 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -5,6 +5,8 @@
 #include <osg/BufferObject>
 #include <osg/BufferIndexBinding>
 #include <osg/Endian>
+#include <osg/Version>
+#include <osg/ValueObject>
 
 #include <osgUtil/CullVisitor>
 
@@ -102,6 +104,7 @@ namespace SceneUtil
             , mEndian(osg::getCpuByteOrder())
             , mCount(count)
             , mStride(12)
+            , mCachedSunPos(osg::Vec4())
         {
             mOffsets[Diffuse] = 0;
             mOffsets[Ambient] = 1;
@@ -118,6 +121,7 @@ namespace SceneUtil
             , mCount(copy.mCount)
             , mStride(copy.mStride)
             , mOffsets(copy.mOffsets)
+            , mCachedSunPos(copy.mCachedSunPos)
         {}
 
         void setDiffuse(int index, const osg::Vec4& value)
@@ -172,6 +176,17 @@ namespace SceneUtil
             return 3 * osg::Vec4::num_components * sizeof(GL_FLOAT) * sz;
         }
 
+        void setCachedSunPos(const osg::Vec4& pos)
+        {
+            mCachedSunPos = pos;
+        }
+
+        void uploadCachedSunPos(const osg::Matrix& viewMat)
+        {
+            osg::Vec4 viewPos = mCachedSunPos * viewMat;
+            std::memcpy(&(*mData)[getOffset(0, Position)], viewPos.ptr(), sizeof(osg::Vec4f));
+        }
+
         unsigned int asRGBA(const osg::Vec4& value) const
         {
             return mEndian == osg::BigEndian ? value.asABGR() : value.asRGBA();
@@ -187,6 +202,8 @@ namespace SceneUtil
             constexpr auto sizeofFloat = sizeof(GL_FLOAT);
             constexpr auto sizeofVec4 = sizeofFloat * osg::Vec4::num_components;
 
+            LightBuffer oldBuffer = LightBuffer(*this);
+
             mOffsets[Diffuse] = offsetColors / sizeofFloat;
             mOffsets[Ambient] = mOffsets[Diffuse] + 1;
             mOffsets[Specular] = mOffsets[Diffuse] + 2;
@@ -196,7 +213,6 @@ namespace SceneUtil
             mStride = (offsetAttenuationRadius + sizeofVec4 + stride) / 4;
 
             // Copy over previous buffers light data. Buffers populate before we know the layout.
-            LightBuffer oldBuffer = LightBuffer(*this);
             mData->resize(size / sizeofFloat);
             for (int i = 0; i < oldBuffer.mCount; ++i)
             {
@@ -212,6 +228,7 @@ namespace SceneUtil
         int mCount;
         int mStride;
         std::array<std::size_t, 6> mOffsets;
+        osg::Vec4 mCachedSunPos;
     };
 
     class LightStateCache
@@ -229,8 +246,9 @@ namespace SceneUtil
         return &cacheVector[contextid];
     }
 
-    void configureStateSetSunOverride(LightingMethod method, const osg::Light* light, osg::StateSet* stateset, int mode)
+    void configureStateSetSunOverride(LightManager* lightManager, const osg::Light* light, osg::StateSet* stateset, int mode)
     {
+        auto method = lightManager->getLightingMethod();
         switch (method)
         {
         case LightingMethod::FFP:
@@ -244,12 +262,15 @@ namespace SceneUtil
                 configureAmbient(lightMat, light->getAmbient());
                 configureDiffuse(lightMat, light->getDiffuse());
                 configureSpecular(lightMat, light->getSpecular());
-                stateset->addUniform(new osg::Uniform("LightBuffer", lightMat), mode);
+
+                osg::ref_ptr<osg::Uniform> uni = new osg::Uniform(osg::Uniform::FLOAT_MAT4, "LightBuffer", lightManager->getMaxLights());
+                uni->setElement(0, lightMat);
+                stateset->addUniform(uni, mode);
                 break;
             }
         case LightingMethod::SingleUBO:
             {
-                osg::ref_ptr<LightBuffer> buffer = new LightBuffer(1);
+                osg::ref_ptr<LightBuffer> buffer = new LightBuffer(lightManager->getMaxLightsInScene());
 
                 buffer->setDiffuse(0, light->getDiffuse());
                 buffer->setAmbient(0, light->getAmbient());
@@ -258,8 +279,11 @@ namespace SceneUtil
 
                 osg::ref_ptr<osg::UniformBufferObject> ubo = new osg::UniformBufferObject;
                 buffer->getData()->setBufferObject(ubo);
-                osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(static_cast<int>(Shader::UBOBinding::LightBuffer), buffer->getData().get(), 0, buffer->getData()->getTotalDataSize());
-
+#if OSG_VERSION_GREATER_OR_EQUAL(3,5,7)
+                osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(static_cast<int>(Shader::UBOBinding::LightBuffer), buffer->getData(), 0, buffer->getData()->getTotalDataSize());
+#else
+                osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(static_cast<int>(Shader::UBOBinding::LightBuffer), ubo, 0, buffer->getData()->getTotalDataSize());
+#endif
                 stateset->setAttributeAndModes(ubb, mode);
 
                 break;
@@ -433,6 +457,11 @@ namespace SceneUtil
 
                 lightUniform->setElement(i+1, lightMat);
             }
+
+            auto sun = mLightManager->getSunlightBuffer(state.getFrameStamp()->getFrameNumber());
+            configurePosition(sun, osg::Vec4(sun(0,0), sun(0,1), sun(0,2), 0.0) * state.getInitialViewMatrix());
+            lightUniform->setElement(0, sun);
+
             lightUniform->dirty();
         }
 
@@ -618,7 +647,6 @@ namespace SceneUtil
         void operator()(osg::Node* node, osg::NodeVisitor* nv) override
         {
             osgUtil::CullVisitor* cv = static_cast<osgUtil::CullVisitor*>(nv);
-            bool pop = false;
 
             if (mLastFrameNumber != cv->getTraversalNumber())
             {
@@ -628,18 +656,24 @@ namespace SceneUtil
                 {
                     auto stateset = mLightManager->getStateSet();
                     auto bo = mLightManager->getLightBuffer(mLastFrameNumber);
-                    osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(static_cast<int>(Shader::UBOBinding::LightBuffer), bo->getData().get(), 0, bo->getData()->getTotalDataSize());
-                    stateset->setAttributeAndModes(ubb.get(), osg::StateAttribute::ON);
+
+#if OSG_VERSION_GREATER_OR_EQUAL(3,5,7)
+                    osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(static_cast<int>(Shader::UBOBinding::LightBuffer), bo->getData(), 0, bo->getData()->getTotalDataSize());
+#else
+                    osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(static_cast<int>(Shader::UBOBinding::LightBuffer), bo->getData()->getBufferObject(), 0, bo->getData()->getTotalDataSize());
+#endif
+                    stateset->setAttributeAndModes(ubb, osg::StateAttribute::ON);
                 }
 
                 auto sun = mLightManager->getSunlight();
 
                 if (sun)
                 {
+                    // we must defer uploading the transformation to view-space position to deal with different cameras (e.g. reflection RTT).
                     if (mLightManager->getLightingMethod() == LightingMethod::PerObjectUniform)
                     {
                         osg::Matrixf lightMat;
-                        configurePosition(lightMat, sun->getPosition() * (*cv->getCurrentRenderStage()->getInitialViewMatrix()));
+                        configurePosition(lightMat, sun->getPosition());
                         configureAmbient(lightMat, sun->getAmbient());
                         configureDiffuse(lightMat, sun->getDiffuse());
                         configureSpecular(lightMat, sun->getSpecular());
@@ -649,33 +683,15 @@ namespace SceneUtil
                     {
                         auto buf = mLightManager->getLightBuffer(mLastFrameNumber);
 
-                        buf->setPosition(0, sun->getPosition() * (*cv->getCurrentRenderStage()->getInitialViewMatrix()));
+                        buf->setCachedSunPos(sun->getPosition());
                         buf->setAmbient(0, sun->getAmbient());
                         buf->setDiffuse(0, sun->getDiffuse());
                         buf->setSpecular(0, sun->getSpecular());
                     }
                 }
             }
-            else if (isReflectionCamera(cv->getCurrentCamera()))
-            {
-                auto sun = mLightManager->getSunlight();
-                if (sun)
-                {
-                    osg::Vec4 originalPos = sun->getPosition();
-                    sun->setPosition(originalPos * (*cv->getCurrentRenderStage()->getInitialViewMatrix()));
-
-                    osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
-                    configureStateSetSunOverride(mLightManager->getLightingMethod(), sun, stateset);
-
-                    sun->setPosition(originalPos);
-                    cv->pushStateSet(stateset);
-                    pop = true;
-                }
-            }
 
             traverse(node, nv);
-            if (pop)
-                cv->popStateSet();
         }
 
     private:
@@ -692,6 +708,7 @@ namespace SceneUtil
         LightManagerStateAttribute(LightManager* lightManager)
         : mLightManager(lightManager)
         , mDummyProgram(new osg::Program)
+        , mInitLayout(false)
         {
             static const std::string dummyVertSource = generateDummyShader(mLightManager->getMaxLightsInScene());
 
@@ -741,8 +758,7 @@ namespace SceneUtil
 
         void apply(osg::State& state) const override
         {
-            static bool init = false;
-            if (!init)
+            if (!mInitLayout)
             {
                 auto handle = mDummyProgram->getPCP(state)->getHandle();
                 auto* ext = state.get<osg::GLExtensions>();
@@ -754,13 +770,11 @@ namespace SceneUtil
                 if (activeUniformBlocks > 0)
                 {
                     initSharedLayout(ext, handle);
-                    init = true;
+                    mInitLayout = true;
                 }
             }
-            else
-            {
-                mLightManager->getLightBuffer(state.getFrameStamp()->getFrameNumber())->dirty();
-            }
+            mLightManager->getLightBuffer(state.getFrameStamp()->getFrameNumber())->uploadCachedSunPos(state.getInitialViewMatrix());
+            mLightManager->getLightBuffer(state.getFrameStamp()->getFrameNumber())->dirty();
         }
 
     private:
@@ -792,36 +806,7 @@ namespace SceneUtil
 
         LightManager* mLightManager;
         osg::ref_ptr<osg::Program> mDummyProgram;
-    };
-
-    class LightManagerStateAttributePerObjectUniform : public osg::StateAttribute
-    {
-    public:
-        LightManagerStateAttributePerObjectUniform()
-            : mLightManager(nullptr) {}
-
-        LightManagerStateAttributePerObjectUniform(LightManager* lightManager)
-        : mLightManager(lightManager)
-        {
-        }
-
-        LightManagerStateAttributePerObjectUniform(const LightManagerStateAttributePerObjectUniform& copy, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY)
-            : osg::StateAttribute(copy,copyop), mLightManager(copy.mLightManager) {}
-
-        int compare(const StateAttribute &sa) const override
-        {
-            throw std::runtime_error("LightManagerStateAttributePerObjectUniform::compare: unimplemented");
-        }
-
-        META_StateAttribute(NifOsg, LightManagerStateAttributePerObjectUniform, osg::StateAttribute::LIGHT)
-
-        void apply(osg::State& state) const override
-        {
-            mLightManager->getStateSet()->getUniform("LightBuffer")->setElement(0, mLightManager->getSunlightBuffer(state.getFrameStamp()->getFrameNumber()));
-        }
-
-    private:
-        LightManager* mLightManager;
+        mutable bool mInitLayout;
     };
 
     const std::unordered_map<std::string, LightingMethod> LightManager::mLightingMethodSettingMap = {
@@ -857,6 +842,14 @@ namespace SceneUtil
         , mPointLightFadeEnd(0.f)
         , mPointLightFadeStart(0.f)
     {
+        osg::GLExtensions* exts = osg::GLExtensions::Get(0, false);
+        bool supportsUBO = exts && exts->isUniformBufferObjectSupported;
+        bool supportsGPU4 = exts && exts->isGpuShader4Supported;
+
+        mSupported[static_cast<int>(LightingMethod::FFP)] = true;
+        mSupported[static_cast<int>(LightingMethod::PerObjectUniform)] = true;
+        mSupported[static_cast<int>(LightingMethod::SingleUBO)] = supportsUBO && supportsGPU4;
+
         setUpdateCallback(new LightManagerUpdateCallback);
 
         if (ffp)
@@ -870,10 +863,6 @@ namespace SceneUtil
 
         updateSettings();
 
-        osg::GLExtensions* exts = osg::GLExtensions::Get(0, false);
-        bool supportsUBO = exts && exts->isUniformBufferObjectSupported;
-        bool supportsGPU4 = exts && exts->isGpuShader4Supported;
-
         static bool hasLoggedWarnings = false;
 
         if (lightingMethod == LightingMethod::SingleUBO && !hasLoggedWarnings)
@@ -1042,7 +1031,8 @@ namespace SceneUtil
         setLightingMethod(LightingMethod::PerObjectUniform);
         setMaxLights(std::clamp(targetLights, mMaxLightsLowerLimit, LightManager::mMaxLightsUpperLimit));
 
-        stateset->setAttributeAndModes(new LightManagerStateAttributePerObjectUniform(this), osg::StateAttribute::ON);
+        // ensures sunlight element in our uniform array is updated when there are no point lights in scene
+        stateset->setAttributeAndModes(new LightStateAttributePerObjectUniform({}, this), osg::StateAttribute::ON);
         stateset->addUniform(new osg::Uniform(osg::Uniform::FLOAT_MAT4, "LightBuffer", getMaxLights()));
     }
 
diff --git a/components/sceneutil/lightmanager.hpp b/components/sceneutil/lightmanager.hpp
index 9a1fd54700..dc7f36e962 100644
--- a/components/sceneutil/lightmanager.hpp
+++ b/components/sceneutil/lightmanager.hpp
@@ -5,6 +5,7 @@
 #include <unordered_set>
 #include <unordered_map>
 #include <memory>
+#include <array>
 
 #include <osg/Light>
 
@@ -24,7 +25,7 @@ namespace osgUtil
 namespace SceneUtil
 {
     class LightBuffer;
-    class StateSetGenerator;
+    struct StateSetGenerator;
 
     enum class LightingMethod
     {
@@ -33,8 +34,6 @@ namespace SceneUtil
         SingleUBO,
     };
 
-    void configureStateSetSunOverride(LightingMethod method, const osg::Light* light, osg::StateSet* stateset, int mode = osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
-
     /// LightSource managed by a LightManager.
     /// @par Typically used for point lights. Spot lights are not supported yet. Directional lights affect the whole scene
     ///     so do not need to be managed by a LightManager - so for directional lights use a plain osg::LightSource instead.
@@ -130,6 +129,7 @@ namespace SceneUtil
         };
 
         using LightList = std::vector<const LightSourceViewBound*>;
+        using SupportedMethods = std::array<bool, 3>;
 
         META_Node(SceneUtil, LightManager)
 
@@ -178,6 +178,8 @@ namespace SceneUtil
         osg::Matrixf getSunlightBuffer(size_t frameNum) const { return mSunlightBuffers[frameNum%2]; }
         void setSunlightBuffer(const osg::Matrixf& buffer, size_t frameNum) { mSunlightBuffers[frameNum%2] = buffer; }
 
+        SupportedMethods getSupportedLightingMethods() { return mSupported; }
+
         std::map<std::string, std::string> getLightDefines() const;
 
         void processChangedSettings(const Settings::CategorySettingVector& changed);
@@ -232,6 +234,8 @@ namespace SceneUtil
 
         int mMaxLights;
 
+        SupportedMethods mSupported;
+
         static constexpr auto mMaxLightsLowerLimit = 2;
         static constexpr auto mMaxLightsUpperLimit = 64;
         static constexpr auto mFFPMaxLights = 8;
@@ -277,6 +281,8 @@ namespace SceneUtil
         std::set<SceneUtil::LightSource*> mIgnoredLightSources;
     };
 
+    void configureStateSetSunOverride(LightManager* lightManager, const osg::Light* light, osg::StateSet* stateset, int mode = osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+
 }
 
 #endif
diff --git a/docs/source/reference/modding/settings/shaders.rst b/docs/source/reference/modding/settings/shaders.rst
index 4814b206b9..03b7805de6 100644
--- a/docs/source/reference/modding/settings/shaders.rst
+++ b/docs/source/reference/modding/settings/shaders.rst
@@ -174,12 +174,14 @@ this mode when supported and where the GPU is not a bottleneck. On some weaker
 devices, using this mode along with :ref:`force per pixel lighting` can carry
 performance penalties.
 
-Note that when enabled, groundcover lighting is forced to be vertex lighting,
-unless normal maps are provided. This is due to some groundcover mods using the
-Z-Up normals technique to avoid some common issues with shading. As a
-consequence, per pixel lighting would give undesirable results.
-
-This setting has no effect if :ref:`force shaders` is 'false'.
+When enabled, groundcover lighting is forced to be vertex lighting, unless
+normal maps are provided. This is due to some groundcover mods using the Z-Up
+normals technique to avoid some common issues with shading. As a consequence,
+per pixel lighting would give undesirable results.
+
+Note that the rendering will act as if you have 'force shaders' option enabled
+when not set to 'legacy'. This means that shaders will be used to render all objects and
+the terrain.
 
 light bounds multiplier
 -----------------------
diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index 11ad9fd396..92c1854133 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -460,109 +460,108 @@
 
                     <Widget type="TabItem" skin="" position="4 32 360 308">
                         <Property key="Caption" value="  Lights  "/>
-                        <Widget type="Widget" skin="" position="0 0 360 315" align="Stretch">
-                        <Widget type="Widget" skin="" position="0 0 360 315" align="Stretch" name="LightSettingOverlay">
-                            <!-- Lighting Method -->
-                            <Widget type="TextBox" skin="NormalText" position="0 4 170 18" align="Left Top">
-                                <Property key="Caption" value="Lighting Method:"/>
-                            </Widget>
-                            <Widget type="TextBox" skin="SandText" position="0 28 170 18" align="Left Top" name="LightingMethodText">
-                                <UserString key="ToolTipType" value="Layout"/>
-                                <UserString key="ToolTipLayout" value="TextToolTip"/>
-                            </Widget>
-                            <!-- Max Lights -->
-                            <Widget type="TextBox" skin="NormalText" position="178 4 160 18" align="Left Top" name="MaxLightsText">
-                                <UserString key="ToolTipType" value="Layout"/>
-                                <UserString key="ToolTipLayout" value="TextToolTip"/>
-                                <UserString key="Caption_Text" value="Default: 8\nMaximum number of lights per object.\n\nA low number near default will cause light popping similar to what you would see with legacy lighting."/>
-                            </Widget>
-                            <Widget type="ScrollBar" skin="MW_HScroll" position="178 30 160 18" align="Right Top HStretch" name="MaxLightsSlider">
-                                <Property key="Range" value="24"/>
-                                <Property key="Page" value="1"/>
-                                <UserString key="SettingType" value="Slider"/>
-                                <UserString key="SettingMin" value="4"/>
-                                <UserString key="SettingMax" value="32"/>
-                                <UserString key="SettingCategory" value="Shaders"/>
-                                <UserString key="SettingName" value="max lights"/>
-                                <UserString key="SettingValueType" value="Integer"/>
-                                <UserString key="SettingLabelWidget" value="MaxLightsText"/>
-                                <UserString key="SettingLabelCaption" value="Max Lights (%s)"/>
-                            </Widget>
-                            <Widget type="ImageBox" skin="MW_HLine" position="0 54 360 18" align="Top HStretch"/>
-                            <!-- Light Fade Start -->
-                            <Widget type="TextBox" skin="NormalText" position="0 78 352 18" align="Left Top" name="MaxLightDistanceText">
-                                <UserString key="ToolTipType" value="Layout"/>
-                                <UserString key="ToolTipLayout" value="TextToolTip"/>
-                                <UserString key="Caption_Text" value="Default: 8192 (units)\nMaximum distance at which lights will appear.\n\nSet this to 0.0 to disable it."/>
-                            </Widget>
-                            <Widget type="ScrollBar" skin="MW_HScroll" position="0 104 352 18" align="HStretch Top">
-                                <Property key="Range" value="8192"/>
-                                <Property key="Page" value="1"/>
-                                <UserString key="SettingType" value="Slider"/>
-                                <UserString key="SettingMin" value="0"/>
-                                <UserString key="SettingMax" value="8192"/>
-                                <UserString key="SettingCategory" value="Shaders"/>
-                                <UserString key="SettingName" value="maximum light distance"/>
-                                <UserString key="SettingValueType" value="Integer"/>
-                                <UserString key="SettingLabelWidget" value="MaxLightDistanceText"/>
-                                <UserString key="SettingLabelCaption" value="Maximum Light Distance (%s)"/>
-                            </Widget>
-                            <!-- Light Fade Multiplier -->
-                            <Widget type="TextBox" skin="NormalText" position="0 128 352 18" align="Left Top" name="LightFadeMultiplierText">
-                                <UserString key="ToolTipType" value="Layout"/>
-                                <UserString key="ToolTipLayout" value="TextToolTip"/>
-                                <UserString key="Caption_Text" value="Default: 0.85\nFraction of maximum distance at which lights will start to fade.\n\nSet this to a low value for slower transitions or a high value of quicker transitions."/>
-                            </Widget>
-                            <Widget type="ScrollBar" skin="MW_HScroll" position="0 152 352 18" align="HStretch Top">
-                                <Property key="Range" value="10000"/>
-                                <Property key="Page" value="100"/>
-                                <UserString key="SettingType" value="Slider"/>
-                                <UserString key="SettingCategory" value="Shaders"/>
-                                <UserString key="SettingName" value="light fade start"/>
-                                <UserString key="SettingValueType" value="Float"/>
-                                <UserString key="SettingMin" value="0.0"/>
-                                <UserString key="SettingMax" value="1.0"/>
-                                <UserString key="SettingLabelWidget" value="LightFadeMultiplierText"/>
-                                <UserString key="SettingLabelCaption" value="Fade Start Multiplier (%s)"/>
-                            </Widget>
-                            <!-- Bounding Sphere Multiplier -->
-                            <Widget type="TextBox" skin="NormalText" position="0 176 352 18" align="Left Top" name="BoundingSphereMultText">
-                                <UserString key="ToolTipType" value="Layout"/>
-                                <UserString key="ToolTipLayout" value="TextToolTip"/>
-                                <UserString key="Caption_Text" value="Default: 1.65\nMultipler for bounding sphere of lights.\nHigher numbers allows for smooth falloff but require an increase in number of max lights.\n\nDoes not effect the illumination or strength of lights."/>
-                            </Widget>
-                            <Widget type="ScrollBar" skin="MW_HScroll" position="0 200 352 18" align="HStretch Top">
-                                <Property key="Range" value="500000"/>
-                                <Property key="Page" value="1000"/>
-                                <UserString key="SettingType" value="Slider"/>
-                                <UserString key="SettingMin" value="0.0"/>
-                                <UserString key="SettingMax" value="5.0"/>
-                                <UserString key="SettingCategory" value="Shaders"/>
-                                <UserString key="SettingName" value="light bounds multiplier"/>
-                                <UserString key="SettingValueType" value="Float"/>
-                                <UserString key="SettingLabelWidget" value="BoundingSphereMultText"/>
-                                <UserString key="SettingLabelCaption" value="Bounding Sphere Multiplier (%s)"/>
-                            </Widget>
-                            <!-- Minimum Ambient Brightness -->
-                            <Widget type="TextBox" skin="NormalText" position="0 224 352 18" align="Left Top" name="MinimumBrightnessText">
-                                <UserString key="ToolTipType" value="Layout"/>
-                                <UserString key="ToolTipLayout" value="TextToolTip"/>
-                                <UserString key="Caption_Text" value="Default: 0.08\nMinimum ambient interior brightness.\n\nIncrease this if you feel interiors are too dark."/>
-                            </Widget>
-                            <Widget type="ScrollBar" skin="MW_HScroll" position="0 248 352 18" align="HStretch Top">
-                                <Property key="Range" value="10000"/>
-                                <Property key="Page" value="100"/>
-                                <UserString key="SettingType" value="Slider"/>
-                                <UserString key="SettingCategory" value="Shaders"/>
-                                <UserString key="SettingName" value="minimum interior brightness"/>
-                                <UserString key="SettingValueType" value="Float"/>
-                                <UserString key="SettingLabelWidget" value="MinimumBrightnessText"/>
-                                <UserString key="SettingLabelCaption" value="Minimum Interior Brightness (%s)"/>
-                            </Widget>
-                            <Widget type="AutoSizedButton" skin="MW_Button" position="0 290 0 0" align="Top Left" name="LightsResetButton">
-                                <Property key="Caption" value="Reset To Defaults"/>
-                            </Widget>
+                        <!-- Lighting Method -->
+                        <Widget type="TextBox" skin="NormalText" position="0 4 170 18" align="Left Top">
+                            <Property key="Caption" value="Lighting Method:"/>
+                        </Widget>
+                        <Widget type="ComboBox" skin="MW_ComboBox" position="0 28 170 24" align="Left Top" name="LightingMethodButton">
+                            <Property key="AddItem" value="legacy"/>
+                            <Property key="AddItem" value="shaders compatibility"/>
+                            <Property key="AddItem" value="shaders"/>
+                        </Widget>
+                        <!-- Max Lights -->
+                        <Widget type="TextBox" skin="NormalText" position="178 4 160 18" align="Left Top" name="MaxLightsText">
+                            <UserString key="ToolTipType" value="Layout"/>
+                            <UserString key="ToolTipLayout" value="TextToolTip"/>
+                            <UserString key="Caption_Text" value="Default: 8\nMaximum number of lights per object.\n\nA low number near default will cause light popping similar to what you would see with legacy lighting."/>
+                        </Widget>
+                        <Widget type="ScrollBar" skin="" position="0 0 0 0">
+                            <UserString key="SettingType" value="Slider"/>
+                            <UserString key="SettingCategory" value="Shaders"/>
+                            <UserString key="SettingName" value="max lights"/>
+                            <UserString key="SettingValueType" value="Integer"/>
+                            <UserString key="SettingLabelWidget" value="MaxLightsText"/>
+                            <UserString key="SettingLabelCaption" value="Max Lights: (%s)"/>
+                        </Widget>
+                        <Widget type="ComboBox" skin="MW_ComboBox" position="178 28 170 24" align="Left Top" name="MaxLights">
+                            <Property key="AddItem" value="8"/>
+                            <Property key="AddItem" value="16"/>
+                            <Property key="AddItem" value="24"/>
+                            <Property key="AddItem" value="32"/>
+                        </Widget>
+                        <Widget type="ImageBox" skin="MW_HLine" position="0 54 360 18" align="Top HStretch"/>
+                        <!-- Light Fade Start -->
+                        <Widget type="TextBox" skin="NormalText" position="0 78 352 18" align="Left Top" name="MaxLightDistanceText">
+                            <UserString key="ToolTipType" value="Layout"/>
+                            <UserString key="ToolTipLayout" value="TextToolTip"/>
+                            <UserString key="Caption_Text" value="Default: 8192 (units)\nMaximum distance at which lights will appear.\n\nSet this to 0.0 to disable it."/>
+                        </Widget>
+                        <Widget type="ScrollBar" skin="MW_HScroll" position="0 104 352 18" align="HStretch Top">
+                            <Property key="Range" value="8192"/>
+                            <Property key="Page" value="1"/>
+                            <UserString key="SettingType" value="Slider"/>
+                            <UserString key="SettingMin" value="0"/>
+                            <UserString key="SettingMax" value="8192"/>
+                            <UserString key="SettingCategory" value="Shaders"/>
+                            <UserString key="SettingName" value="maximum light distance"/>
+                            <UserString key="SettingValueType" value="Integer"/>
+                            <UserString key="SettingLabelWidget" value="MaxLightDistanceText"/>
+                            <UserString key="SettingLabelCaption" value="Maximum Light Distance (%s)"/>
+                        </Widget>
+                        <!-- Light Fade Multiplier -->
+                        <Widget type="TextBox" skin="NormalText" position="0 128 352 18" align="Left Top" name="LightFadeMultiplierText">
+                            <UserString key="ToolTipType" value="Layout"/>
+                            <UserString key="ToolTipLayout" value="TextToolTip"/>
+                            <UserString key="Caption_Text" value="Default: 0.85\nFraction of maximum distance at which lights will start to fade.\n\nSet this to a low value for slower transitions or a high value for quicker transitions."/>
+                        </Widget>
+                        <Widget type="ScrollBar" skin="MW_HScroll" position="0 152 352 18" align="HStretch Top">
+                            <Property key="Range" value="10000"/>
+                            <Property key="Page" value="100"/>
+                            <UserString key="SettingType" value="Slider"/>
+                            <UserString key="SettingCategory" value="Shaders"/>
+                            <UserString key="SettingName" value="light fade start"/>
+                            <UserString key="SettingValueType" value="Float"/>
+                            <UserString key="SettingMin" value="0.0"/>
+                            <UserString key="SettingMax" value="1.0"/>
+                            <UserString key="SettingLabelWidget" value="LightFadeMultiplierText"/>
+                            <UserString key="SettingLabelCaption" value="Fade Start Multiplier (%s)"/>
+                        </Widget>
+                        <!-- Bounding Sphere Multiplier -->
+                        <Widget type="TextBox" skin="NormalText" position="0 176 352 18" align="Left Top" name="BoundingSphereMultText">
+                            <UserString key="ToolTipType" value="Layout"/>
+                            <UserString key="ToolTipLayout" value="TextToolTip"/>
+                            <UserString key="Caption_Text" value="Default: 1.65\nMultipler for bounding sphere of lights.\nHigher numbers allows for smooth falloff but require an increase in number of max lights.\n\nDoes not effect the illumination or strength of lights."/>
+                        </Widget>
+                        <Widget type="ScrollBar" skin="MW_HScroll" position="0 200 352 18" align="HStretch Top">
+                            <Property key="Range" value="500000"/>
+                            <Property key="Page" value="1000"/>
+                            <UserString key="SettingType" value="Slider"/>
+                            <UserString key="SettingMin" value="0.0"/>
+                            <UserString key="SettingMax" value="5.0"/>
+                            <UserString key="SettingCategory" value="Shaders"/>
+                            <UserString key="SettingName" value="light bounds multiplier"/>
+                            <UserString key="SettingValueType" value="Float"/>
+                            <UserString key="SettingLabelWidget" value="BoundingSphereMultText"/>
+                            <UserString key="SettingLabelCaption" value="Bounding Sphere Multiplier (%s)"/>
+                        </Widget>
+                        <!-- Minimum Ambient Brightness -->
+                        <Widget type="TextBox" skin="NormalText" position="0 224 352 18" align="Left Top" name="MinimumBrightnessText">
+                            <UserString key="ToolTipType" value="Layout"/>
+                            <UserString key="ToolTipLayout" value="TextToolTip"/>
+                            <UserString key="Caption_Text" value="Default: 0.08\nMinimum ambient interior brightness.\n\nIncrease this if you feel interiors are too dark."/>
+                        </Widget>
+                        <Widget type="ScrollBar" skin="MW_HScroll" position="0 248 352 18" align="HStretch Top">
+                            <Property key="Range" value="10000"/>
+                            <Property key="Page" value="100"/>
+                            <UserString key="SettingType" value="Slider"/>
+                            <UserString key="SettingCategory" value="Shaders"/>
+                            <UserString key="SettingName" value="minimum interior brightness"/>
+                            <UserString key="SettingValueType" value="Float"/>
+                            <UserString key="SettingLabelWidget" value="MinimumBrightnessText"/>
+                            <UserString key="SettingLabelCaption" value="Minimum Interior Brightness (%s)"/>
                         </Widget>
+                        <Widget type="AutoSizedButton" skin="MW_Button" position="0 290 0 0" align="Top Left" name="LightsResetButton">
+                            <Property key="Caption" value="Reset To Defaults"/>
                         </Widget>
                     </Widget>
                     <!--

From 4e3f3388264ea7c950d818b0d00cd490a587de2b Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Fri, 16 Apr 2021 19:59:40 +0000
Subject: [PATCH 0613/2859] Now that the lighting issue has been fixed, we can
 now enable active grid by default (which is guarded by distant land).

---
 files/settings-default.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index f31db15b6a..07343b39dc 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -139,7 +139,7 @@ max composite geometry size = 4.0
 object paging = true
 
 # Use object paging for active cells grid
-object paging active grid = false
+object paging active grid = true
 
 # Affects the likelyhood of objects being merged. A higher value means merging is more likely and may improve FPS at the cost of memory.
 object paging merge factor = 250

From 95272e0f147a9bb5d3c97acd242b7dee72af2fda Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Thu, 15 Apr 2021 00:37:00 +0300
Subject: [PATCH 0614/2859] String setting to CSMPrefs, part of dehardcoding
 animation files

---
 apps/opencs/CMakeLists.txt                |  2 +-
 apps/opencs/model/prefs/state.cpp         | 47 ++++++++++++++++++++
 apps/opencs/model/prefs/state.hpp         |  3 ++
 apps/opencs/model/prefs/stringsetting.cpp | 54 +++++++++++++++++++++++
 apps/opencs/model/prefs/stringsetting.hpp | 36 +++++++++++++++
 5 files changed, 141 insertions(+), 1 deletion(-)
 create mode 100644 apps/opencs/model/prefs/stringsetting.cpp
 create mode 100644 apps/opencs/model/prefs/stringsetting.hpp

diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 65575580ad..b73cd37b8e 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -116,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
diff --git a/apps/opencs/model/prefs/state.cpp b/apps/opencs/model/prefs/state.cpp
index 32b1ee33f8..8b9ad2b8a5 100644
--- a/apps/opencs/model/prefs/state.cpp
+++ b/apps/opencs/model/prefs/state.cpp
@@ -421,6 +421,35 @@ void CSMPrefs::State::declare()
     declareSubcategory ("Script Editor");
     declareShortcut ("script-editor-comment", "Comment Selection", QKeySequence());
     declareShortcut ("script-editor-uncomment", "Uncomment Selection", QKeySequence());
+
+    declareCategory ("Models");
+    declareString ("baseanim", "3rd person base model with textkeys-data", "meshes/openmwdude.dae").
+        setTooltip("3rd person base model with textkeys-data");
+
+/*# 3rd person base model with textkeys-data
+baseanim = meshes/base_anim.nif
+
+# 1st person base animation model that looks also for corresponding kf-file
+xbaseanim1st = meshes/xbase_anim.1st.nif
+
+# 3rd person beast race base model with textkeys-data
+baseanimkna = meshes/base_animkna.nif
+
+# 1st person beast race base animation model
+baseanimkna1st = meshes/base_animkna.1st.nif
+
+# 3rd person female base model with textkeys-data
+baseanimfemale = meshes/base_anim_female.nif
+
+# 1st person female base model with textkeys-data
+baseanimfemale1st = meshes/base_anim_female.1st.nif
+
+# 3rd person werewolf skin
+wolfskin = meshes/wolf/skin.nif
+
+# 1st person werewolf skin
+wolfskin1st = meshes/wolf/skin.1st.nif*/
+
 }
 
 void CSMPrefs::State::declareCategory (const std::string& key)
@@ -557,6 +586,24 @@ CSMPrefs::ShortcutSetting& CSMPrefs::State::declareShortcut (const std::string&
     return *setting;
 }
 
+CSMPrefs::StringSetting& CSMPrefs::State::declareString (const std::string& key, const std::string& label, std::string default_)
+{
+    if (mCurrentCategory==mCategories.end())
+        throw std::logic_error ("no category for setting");
+
+    setDefault (key, default_);
+
+    default_ = mSettings.getString (key, mCurrentCategory->second.getKey());
+
+    CSMPrefs::StringSetting *setting =
+        new CSMPrefs::StringSetting (&mCurrentCategory->second, &mSettings, &mMutex, key, label,
+        default_);
+
+    mCurrentCategory->second.addSetting (setting);
+
+    return *setting;
+}
+
 CSMPrefs::ModifierSetting& CSMPrefs::State::declareModifier(const std::string& key, const std::string& label,
     int default_)
 {
diff --git a/apps/opencs/model/prefs/state.hpp b/apps/opencs/model/prefs/state.hpp
index a32583dc51..aa63de595e 100644
--- a/apps/opencs/model/prefs/state.hpp
+++ b/apps/opencs/model/prefs/state.hpp
@@ -16,6 +16,7 @@
 #include "category.hpp"
 #include "setting.hpp"
 #include "enumsetting.hpp"
+#include "stringsetting.hpp"
 #include "shortcutmanager.hpp"
 
 class QColor;
@@ -78,6 +79,8 @@ namespace CSMPrefs
             ShortcutSetting& declareShortcut (const std::string& key, const std::string& label,
                 const QKeySequence& default_);
 
+            StringSetting& declareString (const std::string& key, const std::string& label, std::string default_);
+
             ModifierSetting& declareModifier(const std::string& key, const std::string& label, int modifier_);
 
             void declareSeparator();
diff --git a/apps/opencs/model/prefs/stringsetting.cpp b/apps/opencs/model/prefs/stringsetting.cpp
new file mode 100644
index 0000000000..06eeb6c4b1
--- /dev/null
+++ b/apps/opencs/model/prefs/stringsetting.cpp
@@ -0,0 +1,54 @@
+
+#include "stringsetting.hpp"
+
+#include <QTextEdit>
+#include <QMutexLocker>
+
+#include <components/settings/settings.hpp>
+
+#include "category.hpp"
+#include "state.hpp"
+
+CSMPrefs::StringSetting::StringSetting (Category *parent, Settings::Manager *values,
+  QMutex *mutex, const std::string& key, const std::string& label, std::string default_)
+: Setting (parent, values, mutex, key, label),  mDefault (default_), mWidget(nullptr)
+{}
+
+CSMPrefs::StringSetting& CSMPrefs::StringSetting::setTooltip (const std::string& tooltip)
+{
+    mTooltip = tooltip;
+    return *this;
+}
+
+std::pair<QWidget *, QWidget *> CSMPrefs::StringSetting::makeWidgets (QWidget *parent)
+{
+    mWidget = new QTextEdit (QString::fromUtf8 (mDefault.c_str()), parent);
+
+    if (!mTooltip.empty())
+    {
+        QString tooltip = QString::fromUtf8 (mTooltip.c_str());
+        mWidget->setToolTip (tooltip);
+    }
+
+    connect (mWidget, SIGNAL (textChanged (std::string)), this, SLOT (textChanged (std::string)));
+
+    return std::make_pair (static_cast<QWidget *> (nullptr), mWidget);
+}
+
+void CSMPrefs::StringSetting::updateWidget()
+{
+    if (mWidget)
+    {
+        //mWidget->setValue(getValues().getString(getKey(), getParent()->getKey()));
+    }
+}
+
+void CSMPrefs::StringSetting::textChanged (std::string text)
+{
+    {
+        QMutexLocker lock (getMutex());
+        getValues().setString (getKey(), getParent()->getKey(), text);
+    }
+
+    getParent()->getState()->update (*this);
+}
diff --git a/apps/opencs/model/prefs/stringsetting.hpp b/apps/opencs/model/prefs/stringsetting.hpp
new file mode 100644
index 0000000000..f0e66a2efc
--- /dev/null
+++ b/apps/opencs/model/prefs/stringsetting.hpp
@@ -0,0 +1,36 @@
+#ifndef CSM_PREFS_StringSetting_H
+#define CSM_PREFS_StringSetting_H
+
+#include "setting.hpp"
+
+class QTextEdit;
+
+namespace CSMPrefs
+{
+    class StringSetting : public Setting
+    {
+            Q_OBJECT
+
+            std::string mTooltip;
+            std::string mDefault;
+            QTextEdit* mWidget;
+
+        public:
+
+            StringSetting (Category *parent, Settings::Manager *values,
+                QMutex *mutex, const std::string& key, const std::string& label, std::string default_);
+
+            StringSetting& setTooltip (const std::string& tooltip);
+
+            /// Return label, input widget.
+            std::pair<QWidget *, QWidget *> makeWidgets (QWidget *parent) override;
+
+            void updateWidget() override;
+
+        private slots:
+
+            void textChanged (std::string text);
+    };
+}
+
+#endif

From 06fda4c5a1e6834c152628fdb4a8073242b0f281 Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Thu, 15 Apr 2021 22:34:25 +0300
Subject: [PATCH 0615/2859] QLineEdit for setting base animation files

---
 apps/opencs/model/prefs/state.cpp         | 33 +++++------------------
 apps/opencs/model/prefs/stringsetting.cpp | 12 ++++-----
 apps/opencs/model/prefs/stringsetting.hpp |  6 ++---
 3 files changed, 16 insertions(+), 35 deletions(-)

diff --git a/apps/opencs/model/prefs/state.cpp b/apps/opencs/model/prefs/state.cpp
index 8b9ad2b8a5..0958fa8d4d 100644
--- a/apps/opencs/model/prefs/state.cpp
+++ b/apps/opencs/model/prefs/state.cpp
@@ -423,33 +423,14 @@ void CSMPrefs::State::declare()
     declareShortcut ("script-editor-uncomment", "Uncomment Selection", QKeySequence());
 
     declareCategory ("Models");
-    declareString ("baseanim", "3rd person base model with textkeys-data", "meshes/openmwdude.dae").
+    declareString ("baseanim", "base animations", "meshes/base_anim.nif").
         setTooltip("3rd person base model with textkeys-data");
-
-/*# 3rd person base model with textkeys-data
-baseanim = meshes/base_anim.nif
-
-# 1st person base animation model that looks also for corresponding kf-file
-xbaseanim1st = meshes/xbase_anim.1st.nif
-
-# 3rd person beast race base model with textkeys-data
-baseanimkna = meshes/base_animkna.nif
-
-# 1st person beast race base animation model
-baseanimkna1st = meshes/base_animkna.1st.nif
-
-# 3rd person female base model with textkeys-data
-baseanimfemale = meshes/base_anim_female.nif
-
-# 1st person female base model with textkeys-data
-baseanimfemale1st = meshes/base_anim_female.1st.nif
-
-# 3rd person werewolf skin
-wolfskin = meshes/wolf/skin.nif
-
-# 1st person werewolf skin
-wolfskin1st = meshes/wolf/skin.1st.nif*/
-
+    declareString ("baseanimkna", "base animations, kna", "meshes/base_animkna.nif").
+        setTooltip("3rd person beast race base model with textkeys-data");
+    declareString ("baseanimfemale", "base animations, female", "meshes/base_anim_female.nif").
+        setTooltip("3rd person female base model with textkeys-data");
+    declareString ("wolfskin", "base animations, wolf", "meshes/wolf/skin.nif").
+        setTooltip("3rd person werewolf skin");
 }
 
 void CSMPrefs::State::declareCategory (const std::string& key)
diff --git a/apps/opencs/model/prefs/stringsetting.cpp b/apps/opencs/model/prefs/stringsetting.cpp
index 06eeb6c4b1..27290b6c72 100644
--- a/apps/opencs/model/prefs/stringsetting.cpp
+++ b/apps/opencs/model/prefs/stringsetting.cpp
@@ -1,7 +1,7 @@
 
 #include "stringsetting.hpp"
 
-#include <QTextEdit>
+#include <QLineEdit>
 #include <QMutexLocker>
 
 #include <components/settings/settings.hpp>
@@ -22,7 +22,7 @@ CSMPrefs::StringSetting& CSMPrefs::StringSetting::setTooltip (const std::string&
 
 std::pair<QWidget *, QWidget *> CSMPrefs::StringSetting::makeWidgets (QWidget *parent)
 {
-    mWidget = new QTextEdit (QString::fromUtf8 (mDefault.c_str()), parent);
+    mWidget = new QLineEdit (QString::fromUtf8 (mDefault.c_str()), parent);
 
     if (!mTooltip.empty())
     {
@@ -30,7 +30,7 @@ std::pair<QWidget *, QWidget *> CSMPrefs::StringSetting::makeWidgets (QWidget *p
         mWidget->setToolTip (tooltip);
     }
 
-    connect (mWidget, SIGNAL (textChanged (std::string)), this, SLOT (textChanged (std::string)));
+    connect (mWidget, SIGNAL (textChanged (QString)), this, SLOT (textChanged (QString)));
 
     return std::make_pair (static_cast<QWidget *> (nullptr), mWidget);
 }
@@ -39,15 +39,15 @@ void CSMPrefs::StringSetting::updateWidget()
 {
     if (mWidget)
     {
-        //mWidget->setValue(getValues().getString(getKey(), getParent()->getKey()));
+        mWidget->setText(QString::fromStdString(getValues().getString(getKey(), getParent()->getKey())));
     }
 }
 
-void CSMPrefs::StringSetting::textChanged (std::string text)
+void CSMPrefs::StringSetting::textChanged (const QString& text)
 {
     {
         QMutexLocker lock (getMutex());
-        getValues().setString (getKey(), getParent()->getKey(), text);
+        getValues().setString (getKey(), getParent()->getKey(), text.toStdString());
     }
 
     getParent()->getState()->update (*this);
diff --git a/apps/opencs/model/prefs/stringsetting.hpp b/apps/opencs/model/prefs/stringsetting.hpp
index f0e66a2efc..36d020f296 100644
--- a/apps/opencs/model/prefs/stringsetting.hpp
+++ b/apps/opencs/model/prefs/stringsetting.hpp
@@ -3,7 +3,7 @@
 
 #include "setting.hpp"
 
-class QTextEdit;
+class QLineEdit;
 
 namespace CSMPrefs
 {
@@ -13,7 +13,7 @@ namespace CSMPrefs
 
             std::string mTooltip;
             std::string mDefault;
-            QTextEdit* mWidget;
+            QLineEdit* mWidget;
 
         public:
 
@@ -29,7 +29,7 @@ namespace CSMPrefs
 
         private slots:
 
-            void textChanged (std::string text);
+            void textChanged (const QString& text);
     };
 }
 

From f308dde254d8a14586b80ace0956f9f297c10a54 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 17 Apr 2021 10:53:47 +0400
Subject: [PATCH 0616/2859] Clean up MSVC warnings

---
 CMakeLists.txt                              | 4 ++--
 apps/esmtool/esmtool.cpp                    | 2 +-
 apps/opencs/model/prefs/shortcutsetting.cpp | 2 --
 apps/openmw/mwmechanics/aicombat.cpp        | 7 ++-----
 apps/openmw/mwworld/esmstore.cpp            | 4 ++--
 components/misc/frameratelimiter.hpp        | 2 +-
 6 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 08bdbce8ae..efc405a45f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -585,8 +585,8 @@ if (WIN32)
         # Warnings that aren't enabled normally and don't need to be enabled
         # They're unneeded and sometimes completely retarded warnings that /Wall enables
         # Not going to bother commenting them as they tend to warn on every standard library file
-        4061 4263 4264 4266 4350 4371 4435 4514 4548 4571 4610 4619 4623 4625
-        4626 4628 4640 4668 4710 4711 4768 4820 4826 4917 4946 5032 5039 5045
+        4061 4263 4264 4266 4350 4371 4435 4514 4548 4571 4582 4583 4610 4619 4623 4625
+        4626 4628 4640 4668 4710 4711 4768 4820 4826 4917 4946 5032 5039 5045 5219 5220
 
         # Warnings that are thrown on standard libraries and not OpenMW
         4347 # Non-template function with same name and parameter count as template function
diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp
index 7cea574c83..579f5f67d5 100644
--- a/apps/esmtool/esmtool.cpp
+++ b/apps/esmtool/esmtool.cpp
@@ -322,7 +322,7 @@ int load(Arguments& info)
     std::string filename = info.filename;
     std::cout << "Loading file: " << filename << std::endl;
 
-    std::list<int> skipped;
+    std::list<uint32_t> skipped;
 
     try {
 
diff --git a/apps/opencs/model/prefs/shortcutsetting.cpp b/apps/opencs/model/prefs/shortcutsetting.cpp
index 1c065f7da7..e0cd5bb07b 100644
--- a/apps/opencs/model/prefs/shortcutsetting.cpp
+++ b/apps/opencs/model/prefs/shortcutsetting.cpp
@@ -13,8 +13,6 @@
 
 namespace CSMPrefs
 {
-    const int ShortcutSetting::MaxKeys;
-
     ShortcutSetting::ShortcutSetting(Category* parent, Settings::Manager* values, QMutex* mutex, const std::string& key,
         const std::string& label)
         : Setting(parent, values, mutex, key, label)
diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index 5edd59ded5..2e60965208 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -263,8 +263,9 @@ namespace MWMechanics
             && ((!storage.mReadyToAttack && !mPathFinder.isPathConstructed())
                 || (storage.mUseCustomDestination && (storage.mCustomDestination - vTargetPos).length() > rangeAttack)))
         {
+            const MWBase::World* world = MWBase::Environment::get().getWorld();
             // Try to build path to the target.
-            const auto halfExtents = MWBase::Environment::get().getWorld()->getPathfindingHalfExtents(actor);
+            const auto halfExtents = world->getPathfindingHalfExtents(actor);
             const auto navigatorFlags = getNavigatorFlags(actor);
             const auto areaCosts = getAreaCosts(actor);
             const auto pathGridGraph = getPathGridGraph(actor.getCell());
@@ -274,11 +275,7 @@ namespace MWMechanics
             {
                 // If there is no path, try to find a point on a line from the actor position to target projected
                 // on navmesh to attack the target from there.
-                const MWBase::World* world = MWBase::Environment::get().getWorld();
-                const auto halfExtents = world->getPathfindingHalfExtents(actor);
                 const auto navigator = world->getNavigator();
-                const auto navigatorFlags = getNavigatorFlags(actor);
-                const auto areaCosts = getAreaCosts(actor);
                 const auto hit = navigator->raycast(halfExtents, vActorPos, vTargetPos, navigatorFlags);
 
                 if (hit.has_value() && (*hit - vTargetPos).length() <= rangeAttack)
diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index 986c4f8580..a69d74b052 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -63,9 +63,9 @@ namespace
         // We will replace invalid entries by fixed ones
         std::vector<ESM::NPC> npcsToReplace;
 
-        for (auto it : npcs)
+        for (auto npcIter : npcs)
         {
-            ESM::NPC npc = it.second;
+            ESM::NPC npc = npcIter.second;
             bool changed = false;
 
             const std::string npcFaction = npc.mFaction;
diff --git a/components/misc/frameratelimiter.hpp b/components/misc/frameratelimiter.hpp
index b727074d26..e3689cbcf4 100644
--- a/components/misc/frameratelimiter.hpp
+++ b/components/misc/frameratelimiter.hpp
@@ -13,8 +13,8 @@ namespace Misc
             explicit FrameRateLimiter(std::chrono::duration<Rep, Ratio> maxFrameDuration,
                                       std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now())
                 : mMaxFrameDuration(std::chrono::duration_cast<std::chrono::steady_clock::duration>(maxFrameDuration))
-                , mLastFrameDuration(0)
                 , mLastMeasurement(now)
+                , mLastFrameDuration(0)
             {}
 
             std::chrono::steady_clock::duration getLastFrameDuration() const

From 4058e117ca775756f6e99c25c4f2e5bec8cf8175 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sat, 17 Apr 2021 09:12:03 +0200
Subject: [PATCH 0617/2859] Don't clobber game log file when we collect a stack
 trace.

When the crash catcher catch a signal it forks to collect data about its
parent. In the process the child reinitialize the log file, which ends
up empty.
---
 components/crashcatcher/crashcatcher.cpp | 2 +-
 components/crashcatcher/crashcatcher.hpp | 2 ++
 components/debug/debugging.cpp           | 7 ++++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/components/crashcatcher/crashcatcher.cpp b/components/crashcatcher/crashcatcher.cpp
index e0a5c964fa..86571e1e3a 100644
--- a/components/crashcatcher/crashcatcher.cpp
+++ b/components/crashcatcher/crashcatcher.cpp
@@ -43,7 +43,7 @@ namespace bfs = boost::filesystem;
 #include <sys/user.h>
 #endif
 
-static const char crash_switch[] = "--cc-handle-crash";
+#include "crashcatcher.hpp"
 
 static const char fatal_err[] = "\n\n*** Fatal Error ***\n";
 static const char pipe_err[] = "!!! Failed to create pipe\n";
diff --git a/components/crashcatcher/crashcatcher.hpp b/components/crashcatcher/crashcatcher.hpp
index fd8f0d1542..b693ccae43 100644
--- a/components/crashcatcher/crashcatcher.hpp
+++ b/components/crashcatcher/crashcatcher.hpp
@@ -9,6 +9,8 @@
     #define USE_CRASH_CATCHER 0
 #endif
 
+constexpr char crash_switch[] = "--cc-handle-crash";
+
 #if USE_CRASH_CATCHER
 extern void crashCatcherInstall(int argc, char **argv, const std::string &crashLogPath);
 #else
diff --git a/components/debug/debugging.cpp b/components/debug/debugging.cpp
index e9bcf8ad75..0e372942f2 100644
--- a/components/debug/debugging.cpp
+++ b/components/debug/debugging.cpp
@@ -179,7 +179,12 @@ int wrapApplication(int (*innerApplication)(int argc, char *argv[]), int argc, c
         std::cerr.rdbuf (&sb);
 #else
         // Redirect cout and cerr to the log file
-        logfile.open (boost::filesystem::path(cfgMgr.getLogPath() / logName));
+        // If we are collecting a stack trace, append to existing log file
+        std::ios_base::openmode mode = std::ios::out;
+        if(argc == 2 && strcmp(argv[1], crash_switch) == 0)
+            mode |= std::ios::app;
+
+        logfile.open (boost::filesystem::path(cfgMgr.getLogPath() / logName), mode);
 
         coutsb.open (Debug::Tee(logfile, oldcout));
         cerrsb.open (Debug::Tee(logfile, oldcerr));

From a35eae3dd1d140cb42eafc330b94c1c8f117e631 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Fri, 16 Apr 2021 21:03:58 +0200
Subject: [PATCH 0618/2859] Fix a read head-buffer-overflow in esm

The check forgot to account for the terminal zero.
---
 components/esm/loadscpt.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/esm/loadscpt.cpp b/components/esm/loadscpt.cpp
index 53b6aedd38..04738b64ea 100644
--- a/components/esm/loadscpt.cpp
+++ b/components/esm/loadscpt.cpp
@@ -41,7 +41,7 @@ namespace ESM
         // Support '\r' terminated strings like vanilla.  See Bug #1324.
         std::replace(tmp.begin(), tmp.end(), '\r', '\0');
         // Avoid heap corruption
-        if (!tmp.empty() && tmp[tmp.size()-1] != '\0')
+        if (tmp.back() != '\0')
         {
             tmp.emplace_back('\0');
             std::stringstream ss;
@@ -54,11 +54,12 @@ namespace ESM
             str = tmp.data();
         }
 
+        const auto tmpEnd = tmp.data() + tmp.size();
         for (size_t i = 0; i < mVarNames.size(); i++)
         {
             mVarNames[i] = std::string(str);
             str += mVarNames[i].size() + 1;
-            if (static_cast<size_t>(str - tmp.data()) > tmp.size())
+            if (str >= tmpEnd)
             {
                 // SCVR subrecord is unused and variable names are determined
                 // from the script source, so an overflow is not fatal.

From 38316cdaf8b5e8db1a7697a21f5a2ea9f2f6f755 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sat, 17 Apr 2021 19:06:33 +0200
Subject: [PATCH 0619/2859] Fix various warnings found by clang

- unused alias
- inefficient use of push_back
- exceptions not inheriting from std::exception
- weird use of a comma
- value compared against itself
---
 apps/essimporter/main.cpp            | 2 +-
 apps/opencs/model/world/commands.cpp | 1 +
 apps/opencs/model/world/idtree.cpp   | 4 ++--
 components/esm/loadregn.cpp          | 2 +-
 components/esm/variantimp.cpp        | 7 +------
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/apps/essimporter/main.cpp b/apps/essimporter/main.cpp
index d593669c33..9b969e35af 100644
--- a/apps/essimporter/main.cpp
+++ b/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?");
diff --git a/apps/opencs/model/world/commands.cpp b/apps/opencs/model/world/commands.cpp
index 34485a46d7..5ec7401dc9 100644
--- a/apps/opencs/model/world/commands.cpp
+++ b/apps/opencs/model/world/commands.cpp
@@ -76,6 +76,7 @@ void CSMWorld::ImportLandTexturesCommand::redo()
     }
 
     std::vector<std::string> oldTextures;
+    oldTextures.reserve(texIndices.size());
     for (int index : texIndices)
     {
         oldTextures.push_back(LandTexture::createUniqueRecordId(oldPlugin, index));
diff --git a/apps/opencs/model/world/idtree.cpp b/apps/opencs/model/world/idtree.cpp
index a8dfacb01d..1e3398bbb2 100644
--- a/apps/opencs/model/world/idtree.cpp
+++ b/apps/opencs/model/world/idtree.cpp
@@ -201,7 +201,7 @@ QModelIndex CSMWorld::IdTree::parent (const QModelIndex& index) const
     const std::pair<int, int>& address(unfoldIndexAddress(id));
 
     if (address.first >= this->rowCount() || address.second >= this->columnCount())
-        throw "Parent index is not present in the model";
+        throw std::logic_error("Parent index is not present in the model");
 
     return createIndex(address.first, address.second);
 }
@@ -216,7 +216,7 @@ unsigned int CSMWorld::IdTree::foldIndexAddress (const QModelIndex& index) const
 std::pair< int, int > CSMWorld::IdTree::unfoldIndexAddress (unsigned int id) const
 {
     if (id == 0)
-        throw "Attempt to unfold index id of the top level data cell";
+        throw std::runtime_error("Attempt to unfold index id of the top level data cell");
 
     --id;
     int row = id / this->columnCount();
diff --git a/components/esm/loadregn.cpp b/components/esm/loadregn.cpp
index 98edca48f0..a56b9f2474 100644
--- a/components/esm/loadregn.cpp
+++ b/components/esm/loadregn.cpp
@@ -115,7 +115,7 @@ namespace ESM
     void Region::blank()
     {
         mData.mClear = mData.mCloudy = mData.mFoggy = mData.mOvercast = mData.mRain =
-            mData.mThunder = mData.mAsh, mData.mBlight = mData.mA = mData.mB = 0;
+            mData.mThunder = mData.mAsh = mData.mBlight = mData.mA = mData.mB = 0;
 
         mMapColor = 0;
 
diff --git a/components/esm/variantimp.cpp b/components/esm/variantimp.cpp
index 74d1351ec5..64dc980b8c 100644
--- a/components/esm/variantimp.cpp
+++ b/components/esm/variantimp.cpp
@@ -52,12 +52,7 @@ void ESM::readESMVariantValue(ESMReader& esm, Variant::Format format, VarType ty
         esm.getHNT (value, "FLTV");
 
         if (type==VT_Short)
-        {
-            if (value!=value)
-                out = 0; // nan
-            else
-                out = static_cast<short> (value);
-        }
+            out = static_cast<short> (value);
         else if (type==VT_Long)
             out = static_cast<int> (value);
         else

From c0f7e0d5859ebff742630925b0dec15d73991826 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sat, 17 Apr 2021 20:58:09 +0200
Subject: [PATCH 0620/2859] Use isnan

---
 components/esm/variantimp.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/components/esm/variantimp.cpp b/components/esm/variantimp.cpp
index 64dc980b8c..129b6c6d0e 100644
--- a/components/esm/variantimp.cpp
+++ b/components/esm/variantimp.cpp
@@ -52,7 +52,10 @@ void ESM::readESMVariantValue(ESMReader& esm, Variant::Format format, VarType ty
         esm.getHNT (value, "FLTV");
 
         if (type==VT_Short)
-            out = static_cast<short> (value);
+            if (isnan(value))
+                out = 0;
+            else
+                out = static_cast<short> (value);
         else if (type==VT_Long)
             out = static_cast<int> (value);
         else

From 987b231fddf49db02e6fec8f4b08a3a52cd16b52 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 17 Apr 2021 22:11:51 +0400
Subject: [PATCH 0621/2859] Fix an another portion of Coverity warnings

---
 apps/openmw/mwphysics/stepper.cpp      |  2 +-
 apps/openmw/mwworld/containerstore.cpp |  2 +-
 components/sceneutil/lightmanager.cpp  | 16 ++++++++++------
 components/sdlutil/sdlinputwrapper.cpp |  6 +-----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/apps/openmw/mwphysics/stepper.cpp b/apps/openmw/mwphysics/stepper.cpp
index 2a28381bee..943f73a6e2 100644
--- a/apps/openmw/mwphysics/stepper.cpp
+++ b/apps/openmw/mwphysics/stepper.cpp
@@ -67,7 +67,7 @@ namespace MWPhysics
 
             if(attempt == 1)
                 tracerDest = tracerPos + toMove;
-            else if (!firstIteration || !sDoExtraStairHacks) // first attempt failed and not on first movement solver iteration, can't retry -- or we have extra hacks disabled
+            else if (!sDoExtraStairHacks) // early out if we have extra hacks disabled
             {
                 return false;
             }
diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index d921c0a20a..cced17688d 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -81,7 +81,7 @@ MWWorld::ResolutionListener::~ResolutionListener()
     }
     catch(const std::exception& e)
     {
-        Log(Debug::Error) << "Failed to clear temporary container contents of " << mStore.mPtr.get<ESM::Container>()->mBase->mId << ": " << e.what();
+        Log(Debug::Error) << "Failed to clear temporary container contents: " << e.what();
     }
 }
 
diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 8f242daeee..a66cd3f0bf 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -703,7 +703,10 @@ namespace SceneUtil
     {
     public:
         LightManagerStateAttribute()
-            : mLightManager(nullptr) {}
+            : mLightManager(nullptr)
+            , mInitLayout(false)
+        {
+        }
 
         LightManagerStateAttribute(LightManager* lightManager)
         : mLightManager(lightManager)
@@ -720,7 +723,7 @@ namespace SceneUtil
         }
 
         LightManagerStateAttribute(const LightManagerStateAttribute& copy, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY)
-            : osg::StateAttribute(copy,copyop), mLightManager(copy.mLightManager) {}
+            : osg::StateAttribute(copy,copyop), mLightManager(copy.mLightManager), mInitLayout(copy.mInitLayout) {}
 
         int compare(const StateAttribute &sa) const override
         {
@@ -874,7 +877,7 @@ namespace SceneUtil
             hasLoggedWarnings = true;
         }
 
-        int targetLights = Settings::Manager::getInt("max lights", "Shaders");
+        int targetLights = std::clamp(Settings::Manager::getInt("max lights", "Shaders"), mMaxLightsLowerLimit, mMaxLightsUpperLimit);
 
         if (!supportsUBO || !supportsGPU4 || lightingMethod == LightingMethod::PerObjectUniform)
             initPerObjectUniform(targetLights);
@@ -954,7 +957,8 @@ namespace SceneUtil
         if (usingFFP())
             return;
 
-        setMaxLights(std::clamp(Settings::Manager::getInt("max lights", "Shaders"), mMaxLightsLowerLimit, mMaxLightsUpperLimit));
+        int targetLights = std::clamp(Settings::Manager::getInt("max lights", "Shaders"), mMaxLightsLowerLimit, mMaxLightsUpperLimit);
+        setMaxLights(targetLights);
 
         if (getLightingMethod() == LightingMethod::PerObjectUniform)
         {
@@ -1033,7 +1037,7 @@ namespace SceneUtil
         auto* stateset = getOrCreateStateSet();
 
         setLightingMethod(LightingMethod::PerObjectUniform);
-        setMaxLights(std::clamp(targetLights, mMaxLightsLowerLimit, mMaxLightsUpperLimit));
+        setMaxLights(targetLights);
 
         // ensures sunlight element in our uniform array is updated when there are no point lights in scene
         stateset->setAttributeAndModes(new LightStateAttributePerObjectUniform({}, this), osg::StateAttribute::ON);
@@ -1043,7 +1047,7 @@ namespace SceneUtil
     void LightManager::initSingleUBO(int targetLights)
     {
         setLightingMethod(LightingMethod::SingleUBO);
-        setMaxLights(std::clamp(targetLights, mMaxLightsLowerLimit, mMaxLightsUpperLimit));
+        setMaxLights(targetLights);
 
         for (int i = 0; i < 2; ++i)
         {
diff --git a/components/sdlutil/sdlinputwrapper.cpp b/components/sdlutil/sdlinputwrapper.cpp
index 57b211e97e..7ebfd710f9 100644
--- a/components/sdlutil/sdlinputwrapper.cpp
+++ b/components/sdlutil/sdlinputwrapper.cpp
@@ -361,14 +361,10 @@ InputWrapper::InputWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> v
     /// \brief Package mouse and mousewheel motions into a single event
     MouseMotionEvent InputWrapper::_packageMouseMotion(const SDL_Event &evt)
     {
-        MouseMotionEvent pack_evt;
+        MouseMotionEvent pack_evt = {};
         pack_evt.x = mMouseX;
-        pack_evt.xrel = 0;
         pack_evt.y = mMouseY;
-        pack_evt.yrel = 0;
         pack_evt.z = mMouseZ;
-        pack_evt.zrel = 0;
-        pack_evt.timestamp = 0;
 
         if(evt.type == SDL_MOUSEMOTION)
         {

From 36bb2d5f1556b2a367671e6bdb45b0b25c1dcca3 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sun, 18 Apr 2021 08:45:43 +0200
Subject: [PATCH 0622/2859] An actor needs not be in active cell. As such we
 can't use PhysicsSystem::getActor() to determine that a ptr is not actor.

---
 apps/openmw/mwworld/worldimp.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 497fd653a8..b991c1a035 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1258,10 +1258,9 @@ namespace MWWorld
         auto* actor = mPhysics->getActor(ptr);
         osg::Vec3f newpos = ptr.getRefData().getPosition().asVec3() + vec;
         if (actor)
-        {
             actor->adjustPosition(vec);
+        if (ptr.getClass().isActor())
             return moveObject(ptr, newpos.x(), newpos.y(), newpos.z(), false, moveToActive && ptr != getPlayerPtr());
-        }
         return moveObject(ptr, newpos.x(), newpos.y(), newpos.z());
     }
 

From f49b9e3806a1bdf80726f3ad4635443b8f5e413f Mon Sep 17 00:00:00 2001
From: Jacob Turnbull <jacob@turnbulltech.com>
Date: Sun, 18 Apr 2021 10:54:56 +0000
Subject: [PATCH 0623/2859] Fix headtracking while invisible

---
 AUTHORS.md                         |  1 +
 apps/openmw/mwmechanics/actors.cpp | 32 ++++++++++++++----------------
 apps/openmw/mwmechanics/actors.hpp |  3 ++-
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index cfe88ca6b0..5591489b7c 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -90,6 +90,7 @@ Programmers
     Internecine
     Jackerty
     Jacob Essex (Yacoby)
+    Jacob Turnbull (Tankinfrank)
     Jake Westrip (16bitint)
     James Carty (MrTopCat)
     James Moore (moore.work)
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 72d5d96a22..e9467a6798 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -432,7 +432,8 @@ namespace MWMechanics
     }
 
     void Actors::updateHeadTracking(const MWWorld::Ptr& actor, const MWWorld::Ptr& targetActor,
-                                    MWWorld::Ptr& headTrackTarget, float& sqrHeadTrackDistance)
+                                    MWWorld::Ptr& headTrackTarget, float& sqrHeadTrackDistance,
+                                    bool inCombatOrPursue)
     {
         if (!actor.getRefData().getBaseNode())
             return;
@@ -453,7 +454,7 @@ namespace MWMechanics
         const osg::Vec3f actor2Pos(targetActor.getRefData().getPosition().asVec3());
         float sqrDist = (actor1Pos - actor2Pos).length2();
 
-        if (sqrDist > std::min(maxDistance * maxDistance, sqrHeadTrackDistance))
+        if (sqrDist > std::min(maxDistance * maxDistance, sqrHeadTrackDistance) && !inCombatOrPursue)
             return;
 
         // stop tracking when target is behind the actor
@@ -461,7 +462,7 @@ namespace MWMechanics
         osg::Vec3f targetDirection(actor2Pos - actor1Pos);
         actorDirection.z() = 0;
         targetDirection.z() = 0;
-        if (actorDirection * targetDirection > 0
+        if ((actorDirection * targetDirection > 0 || inCombatOrPursue)
             && MWBase::Environment::get().getWorld()->getLOS(actor, targetActor) // check LOS and awareness last as it's the most expensive function
             && MWBase::Environment::get().getMechanicsManager()->awarenessCheck(targetActor, actor))
         {
@@ -2012,28 +2013,25 @@ namespace MWMechanics
                             MWMechanics::CreatureStats& stats = iter->first.getClass().getCreatureStats(iter->first);
                             bool firstPersonPlayer = isPlayer && world->isFirstPerson();
                             bool inCombatOrPursue = stats.getAiSequence().isInCombat() || stats.getAiSequence().hasPackage(AiPackageTypeId::Pursue);
+                            MWWorld::Ptr activePackageTarget;
 
                             // 1. Unconsious actor can not track target
-                            // 2. Actors in combat and pursue mode do not bother to headtrack
+                            // 2. Actors in combat and pursue mode do not bother to headtrack anyone except their target
                             // 3. Player character does not use headtracking in the 1st-person view
-                            if (!stats.getKnockedDown() && !firstPersonPlayer && !inCombatOrPursue)
+                            if (!stats.getKnockedDown() && !firstPersonPlayer)
                             {
-                                for(PtrActorMap::iterator it(mActors.begin()); it != mActors.end(); ++it)
+                                if (inCombatOrPursue)
+                                    activePackageTarget = stats.getAiSequence().getActivePackage().getTarget();
+
+                                for (PtrActorMap::iterator it(mActors.begin()); it != mActors.end(); ++it)
                                 {
                                     if (it->first == iter->first)
                                         continue;
-                                    updateHeadTracking(iter->first, it->first, headTrackTarget, sqrHeadTrackDistance);
-                                }
-                            }
 
-                            if (!stats.getKnockedDown() && !isPlayer && inCombatOrPursue)
-                            {
-                                // Actors in combat and pursue mode always look at their target.
-                                for (const auto& package : stats.getAiSequence())
-                                {
-                                    headTrackTarget = package->getTarget();
-                                    if (!headTrackTarget.isEmpty())
-                                        break;
+                                    if (inCombatOrPursue && it->first != activePackageTarget)
+                                        continue;
+
+                                    updateHeadTracking(iter->first, it->first, headTrackTarget, sqrHeadTrackDistance, inCombatOrPursue);
                                 }
                             }
 
diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index 59814bcc22..2de0728d58 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -131,7 +131,8 @@ namespace MWMechanics
             void turnActorToFacePlayer(const MWWorld::Ptr& actor, Actor& actorState, const osg::Vec3f& dir);
 
             void updateHeadTracking(const MWWorld::Ptr& actor, const MWWorld::Ptr& targetActor,
-                                            MWWorld::Ptr& headTrackTarget, float& sqrHeadTrackDistance);
+                                          MWWorld::Ptr& headTrackTarget, float& sqrHeadTrackDistance,
+                                          bool inCombatOrPursue);
 
             void rest(double hours, bool sleep);
             ///< Update actors while the player is waiting or sleeping.

From 032ba1e9a09473078a010ac948a6d7f43deccfc0 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sun, 18 Apr 2021 13:26:26 +0200
Subject: [PATCH 0624/2859] Fix the compilation

---
 components/esm/variantimp.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/esm/variantimp.cpp b/components/esm/variantimp.cpp
index 129b6c6d0e..b9cd9a8536 100644
--- a/components/esm/variantimp.cpp
+++ b/components/esm/variantimp.cpp
@@ -1,6 +1,7 @@
 #include "variantimp.hpp"
 
 #include <stdexcept>
+#include <cmath>
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
@@ -52,7 +53,7 @@ void ESM::readESMVariantValue(ESMReader& esm, Variant::Format format, VarType ty
         esm.getHNT (value, "FLTV");
 
         if (type==VT_Short)
-            if (isnan(value))
+            if (std::isnan(value))
                 out = 0;
             else
                 out = static_cast<short> (value);

From ee2bcff6942ed64649ca7377b2713a1079d6cb19 Mon Sep 17 00:00:00 2001
From: Lamoot <matjaz.lamut@gmail.com>
Date: Sun, 18 Apr 2021 15:52:11 +0200
Subject: [PATCH 0625/2859] Various improvements to the COLLADA format asset
 pipeline page. Added images. Added more information on how to define
 textkeys. Always use all capitals for the COLLADA format name. Barebones
 subsections for materials and collisions.

---
 .../pipeline-blender-collada.rst              | 95 +++++++++++++------
 1 file changed, 68 insertions(+), 27 deletions(-)

diff --git a/docs/source/reference/modding/custom-models/pipeline-blender-collada.rst b/docs/source/reference/modding/custom-models/pipeline-blender-collada.rst
index 48a19cb7c7..ac60febae4 100644
--- a/docs/source/reference/modding/custom-models/pipeline-blender-collada.rst
+++ b/docs/source/reference/modding/custom-models/pipeline-blender-collada.rst
@@ -1,79 +1,120 @@
 ##############################
-Blender to OpenMW with Collada
+Blender to OpenMW with COLLADA
 ##############################
 
-First, let's take a look at the pipeline requirements and how the fundamental properties of a scene translate from Blender to OpenMW.
-
 Requirements
-------------
+************
+To use the Blender to OpenMW pipeline via COLLADA, you will need the following.
+
 * `OpenMW 0.47 <https://openmw.org/downloads/>`_ or later
 * `Blender 2.81 <https://www.blender.org/download/>`_ or later. Latest confirmed, working version is Blender 2.91
 * `Better COLLADA Exporter <https://github.com/unelsson/collada-exporter>`_ tuned for OpenMW
 * A model you would like to export
 
-In addition, OpenMW needs to be configured to read COLLADA (dae) files instead of the default format (nif). In settings.cfg under [Models] section... TODO
+
+Static Models
+*************
+Static models are those that don't have any animations included in the exported file. First, let's take a look at how the fundamental properties of a scene in Blender translate to a COLLADA model suitable for use in OpenMW. These apply the same to static and animated models.
 
 Location
---------
+========
 
 Objects keep their visual location and origin they had in the original scene.
 
-
 Rotation
---------
+========
 
 * Blender’s +Z axis is up axis in OpenMW
 * Blender’s +Y axis is front axis in OpenMW
 * Blender’s X axis is left-right axis in OpenMW
 
-
 Scale
------
+=====
+
+Scale ratio between Blender and OpenMW is 70 to 1. This means 70 units in Blender translate to 1 m in OpenMW.
+
+However, a scale factor like this is impractical to work with. A better approach is to work with a scale of 1 Blender unit = 1 m and apply the 70 scale factor at export. The exporter will automatically scale all object, mesh, armature and animation data.
+
+Materials
+=========
+
+In Blender, use the Principled BSDF node with textures plugged into the correct sockets. TODO...
 
-Scale ratio between Blender and OpenMW is 70 to 1. This means 70 blender units translate to 1 m in OpenMW.
+Collision Shapes
+================
 
-However, a scale factor like this is impractical to work with. A better approach is to work with a scale of 1 Blender unit = 1m and apply the 70 scale factor in the Better COLLADA Exporter. The exporter will automatically scale all object, mesh, armature and animation data.
+In Blender, have an empty object named ``Collision`` with child meshes. These meshes are regarded as collision shapes. TODO...
 
+Exporter Settings
+=================
+
+For static models, use the following exporter settings. Before export, select all objects you wish to include in the exported file and have the "Selected Objects" option enabled. Without this, the exporter could fail.
 
-Exporter settings - static models
----------------------------------
 
-Better COLLADA Exporter offers various options which are rather straightforward for static models. The important one is last in the list, to apply a scaling factor of 70 to the whole scene, so 1 blender unit equals 1 m in OpenMW. The following settings should be good for general use.
-It's also very important to have "export selected" box checked, as otherwise the exporter may just fail with an error message. It's also important to have the correct window open, and the models selected before exporting.
+.. image:: https://gitlab.com/OpenMW/openmw-docs/-/raw/master/docs/source/reference/modding/custom-models/_static/dae_exporter_static.jpg
+    :align: center
 
 
-Animated models to OpenMW
--------------------------
+Animated Models
+***************
 
 Animated models are those where a hierarchy of bones, known as armature, deforms the mesh and makes things move. Besides the topics covered above, the following requirements apply.
 
 Armature
---------
+========
 
-* For animated models, a single armature per COLLADA file is advised to avoid any potential problems.
+* A single armature per COLLADA file is advised to avoid any potential problems.
 * There needs to be a single top-most bone in the armature’s hierarchy, where both the deformation and control bones fall under it.
 * Not all bones need to be exported. By disabing the bone’s “Deform” property and using the corresponding option in the exporter, it is possible to export only the bones needed for animation.
 
 
 Animations
-----------
+==========
 
 Every action in Blender is exported as its own animation clip in COLLADA. Actions you don't wish to export need to have "-noexp" added to their name, with the corresponding option enabled in the exporter.
 
-Due to current limitations of the format / exporter, the keyframes of any action must not overlap the keyframes of any other action. Thus in practice, the keyframes for each action need to be manually offset to their unique range on the timeline.
+Due to current limitations of the format and exporter, the keyframes of individual actions must not overlap with other actions. The keyframes need to be manually offset to a unique range on the timeline as shown in this example.
+
+.. image:: https://gitlab.com/OpenMW/openmw-docs/-/raw/master/docs/source/reference/modding/custom-models/_static/dae_animations_on_timeline.jpg
+    :align: center
+
+Textkeys
+--------
 
-An animated .dae file needs a corresponding animation definition file, or textkeys, for OpenMW to understand. Textkeys are set in .txt file with the same name as the model. E.g. OpenMWDude.dae -> OpenMWDude.txt , each line having a textkey and a double number for timesignature. E.g. idle: start 0.03333333333333333.
+The exported COLLADA file requires a corresponding textkeys file for OpenMW to properly read the animations. Textkeys is a .txt file containing animation definitions. Textkeys file is placed in the same folder as the model and uses a name matching the model. 
+
+    - ``OpenMWDude.dae``
+    - ``OpenMWDude.txt``
+
+Textkeys use a simple format as shown in the example. Name, start and stop values can be taken from the corresponding COLLADA file for each ``<animation_clip>``.
+    
+.. code::
+
+    idle: start 0.03333333333333333
+    idle: stop 2.033333333333333
+    runforward: start 2.0666666666666664
+    runforward: stop 3.0666666666666664
+    runback: start 3.1
+    runback: stop 4.1
+    ...
+    
 
 Root Motion
------------
+===========
 
-OpenMW can read the movement of the root (top-most) bone and use it to move objects in the game world. For this to work, the root bone must be animated to move through space. The root bone must, in its default pose, be alligned with the world.
+OpenMW can read the movement of the root (top-most in hierarchy) bone and use it to move objects in the game world. For this to work, the root bone must be animated to move through space. The root bone must, in its default pose, be alligned with the world.
+
+.. image:: https://gitlab.com/OpenMW/openmw-docs/-/raw/master/docs/source/reference/modding/custom-models/_static/dae_rig_root.jpg
+    :align: center
 
 
 Exporter Settings
------------------
+=================
+
+For animated models, use the following exporter settings. Before export, select all objects you wish to include in the exported file and have the "Selected Objects" option enabled. Without this, the exporter could fail.
 
-For animated models, use the following exporter settings. Before export, select all objects you wish to include in the exported file. TODO
+.. image:: https://gitlab.com/OpenMW/openmw-docs/-/raw/master/docs/source/reference/modding/custom-models/_static/dae_exporter_animated.jpg
+    :align: center
 
 
 

From 8b40128559d1820bc053562bcb8108a30a9c3f3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matja=C5=BE=20Lamut?= <matjaz.lamut@gmail.com>
Date: Sun, 18 Apr 2021 15:14:36 +0000
Subject: [PATCH 0626/2859] Finish the section on how to set up collision
 shapes in Blender.

---
 .../modding/custom-models/pipeline-blender-collada.rst          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/reference/modding/custom-models/pipeline-blender-collada.rst b/docs/source/reference/modding/custom-models/pipeline-blender-collada.rst
index ac60febae4..5af136f74b 100644
--- a/docs/source/reference/modding/custom-models/pipeline-blender-collada.rst
+++ b/docs/source/reference/modding/custom-models/pipeline-blender-collada.rst
@@ -43,7 +43,7 @@ In Blender, use the Principled BSDF node with textures plugged into the correct
 Collision Shapes
 ================
 
-In Blender, have an empty object named ``Collision`` with child meshes. These meshes are regarded as collision shapes. TODO...
+In Blender, create an empty and name it ``collision``. Any mesh that is a child of this empty will be used for physics collision and will not be visible. There can be multiple child meshes under ``collision`` and they will all contribute to the collision shapes. The meshes themselves can have an arbitrary name, it's only the name of the empty that is important. The ``tcb`` command in OpenMW's in-game console will make the collision shapes visible and you will be able to inspect them.
 
 Exporter Settings
 =================

From 62f32f454378bc2ba5c608f578701db9fd4f62e9 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 17 Apr 2021 18:48:11 +0200
Subject: [PATCH 0627/2859] Do not replace equivalent navmesh tiles

---
 components/CMakeLists.txt                     |   1 +
 .../detournavigator/navmeshcacheitem.hpp      |  13 ++
 .../detournavigator/navmeshtileview.cpp       | 183 ++++++++++++++++++
 .../detournavigator/navmeshtileview.hpp       |  31 +++
 4 files changed, 228 insertions(+)
 create mode 100644 components/detournavigator/navmeshtileview.cpp
 create mode 100644 components/detournavigator/navmeshtileview.hpp

diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index ad2783b57d..970f029b4d 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -182,6 +182,7 @@ add_component_dir(detournavigator
     navigator
     findrandompointaroundcircle
     raycast
+    navmeshtileview
     )
 
 set (ESM_UI ${CMAKE_SOURCE_DIR}/files/ui/contentselector.ui
diff --git a/components/detournavigator/navmeshcacheitem.hpp b/components/detournavigator/navmeshcacheitem.hpp
index 76f74f2667..a9a4ebee62 100644
--- a/components/detournavigator/navmeshcacheitem.hpp
+++ b/components/detournavigator/navmeshcacheitem.hpp
@@ -5,6 +5,7 @@
 #include "tileposition.hpp"
 #include "navmeshtilescache.hpp"
 #include "dtstatus.hpp"
+#include "navmeshtileview.hpp"
 
 #include <components/misc/guarded.hpp>
 
@@ -141,6 +142,12 @@ namespace DetourNavigator
         template <class T>
         UpdateNavMeshStatus updateTile(const TilePosition& position, T&& navMeshData)
         {
+            const dtMeshTile* currentTile = getTile(position);
+            if (currentTile != nullptr
+                && asNavMeshTileConstView(*currentTile) == asNavMeshTileConstView(getRawData(navMeshData)))
+            {
+                return UpdateNavMeshStatus::ignored;
+            }
             const auto removed = removeTileImpl(position);
             const auto addStatus = addTileImpl(getRawData(navMeshData), getSize(navMeshData));
             if (dtStatusSucceed(addStatus))
@@ -206,6 +213,12 @@ namespace DetourNavigator
             int* const dataSize = nullptr;
             return dtStatusSucceed(mImpl->removeTile(tileRef, data, dataSize));
         }
+
+        const dtMeshTile* getTile(const TilePosition& position) const
+        {
+            const int layer = 0;
+            return mImpl->getTileAt(position.x(), position.y(), layer);
+        }
     };
 
     using GuardedNavMeshCacheItem = Misc::ScopeGuarded<NavMeshCacheItem>;
diff --git a/components/detournavigator/navmeshtileview.cpp b/components/detournavigator/navmeshtileview.cpp
new file mode 100644
index 0000000000..96f07c6b1c
--- /dev/null
+++ b/components/detournavigator/navmeshtileview.cpp
@@ -0,0 +1,183 @@
+#include "navmeshtileview.hpp"
+
+#include <DetourCommon.h>
+#include <DetourNavMesh.h>
+
+#include <algorithm>
+#include <cassert>
+#include <stdexcept>
+#include <tuple>
+
+namespace
+{
+    template <typename T>
+    struct Ref
+    {
+        T& mRef;
+
+        explicit Ref(T& ref) : mRef(ref) {}
+
+        friend bool operator==(const Ref& lhs, const Ref& rhs)
+        {
+            return lhs.mRef == rhs.mRef;
+        }
+    };
+
+    template <typename T, std::size_t size>
+    struct ArrayRef
+    {
+        T (&mRef)[size];
+
+        explicit ArrayRef(T (&ref)[size]) : mRef(ref) {}
+
+        friend bool operator==(const ArrayRef& lhs, const ArrayRef& rhs)
+        {
+            return std::equal(std::begin(lhs.mRef), std::end(lhs.mRef), std::begin(rhs.mRef));
+        }
+    };
+
+    template <typename T>
+    struct Span
+    {
+        T* mBegin;
+        T* mEnd;
+
+        explicit Span(T* data, int size) : mBegin(data), mEnd(data + static_cast<std::size_t>(size)) {}
+
+        friend bool operator==(const Span& lhs, const Span& rhs)
+        {
+            // size is already equal if headers are equal
+            assert((lhs.mEnd - lhs.mBegin) == (rhs.mEnd - rhs.mBegin));
+            return std::equal(lhs.mBegin, lhs.mEnd, rhs.mBegin);
+        }
+    };
+
+    auto makeTuple(const dtMeshHeader& v)
+    {
+        return std::tuple(
+            v.x,
+            v.y,
+            v.layer,
+            v.userId,
+            v.polyCount,
+            v.vertCount,
+            v.maxLinkCount,
+            v.detailMeshCount,
+            v.detailVertCount,
+            v.detailTriCount,
+            v.bvNodeCount,
+            v.offMeshConCount,
+            v.offMeshBase,
+            v.walkableHeight,
+            v.walkableRadius,
+            v.walkableClimb,
+            v.detailVertCount,
+            ArrayRef(v.bmin),
+            ArrayRef(v.bmax),
+            v.bvQuantFactor
+        );
+    }
+
+    auto makeTuple(const dtPoly& v)
+    {
+        return std::tuple(ArrayRef(v.verts), ArrayRef(v.neis), v.flags, v.vertCount, v.areaAndtype);
+    }
+
+    auto makeTuple(const dtPolyDetail& v)
+    {
+        return std::tuple(v.vertBase, v.triBase, v.vertCount, v.triCount);
+    }
+
+    auto makeTuple(const dtBVNode& v)
+    {
+        return std::tuple(ArrayRef(v.bmin), ArrayRef(v.bmax), v.i);
+    }
+
+    auto makeTuple(const dtOffMeshConnection& v)
+    {
+        return std::tuple(ArrayRef(v.pos), v.rad, v.poly, v.flags, v.side, v.userId);
+    }
+
+    auto makeTuple(const DetourNavigator::NavMeshTileConstView& v)
+    {
+        return std::tuple(
+            Ref(*v.mHeader),
+            Span(v.mPolys, v.mHeader->polyCount),
+            Span(v.mVerts, v.mHeader->vertCount),
+            Span(v.mDetailMeshes, v.mHeader->detailMeshCount),
+            Span(v.mDetailVerts, v.mHeader->detailVertCount),
+            Span(v.mDetailTris, v.mHeader->detailTriCount),
+            Span(v.mBvTree, v.mHeader->bvNodeCount),
+            Span(v.mOffMeshCons, v.mHeader->offMeshConCount)
+        );
+    }
+}
+
+template <class T>
+inline auto operator==(const T& lhs, const T& rhs)
+    -> std::enable_if_t<std::is_same_v<std::void_t<decltype(makeTuple(lhs))>, void>, bool>
+{
+    return makeTuple(lhs) == makeTuple(rhs);
+}
+
+namespace DetourNavigator
+{
+    NavMeshTileConstView asNavMeshTileConstView(const unsigned char* data)
+    {
+        const dtMeshHeader* header = reinterpret_cast<const dtMeshHeader*>(data);
+
+        if (header->magic != DT_NAVMESH_MAGIC)
+            throw std::logic_error("Invalid navmesh magic");
+
+        if (header->version != DT_NAVMESH_VERSION)
+            throw std::logic_error("Invalid navmesh version");
+
+        // Similar code to https://github.com/recastnavigation/recastnavigation/blob/c5cbd53024c8a9d8d097a4371215e3342d2fdc87/Detour/Source/DetourNavMesh.cpp#L978-L996
+        const int headerSize = dtAlign4(sizeof(dtMeshHeader));
+        const int vertsSize = dtAlign4(sizeof(float) * 3 * header->vertCount);
+        const int polysSize = dtAlign4(sizeof(dtPoly) * header->polyCount);
+        const int linksSize = dtAlign4(sizeof(dtLink) * (header->maxLinkCount));
+        const int detailMeshesSize = dtAlign4(sizeof(dtPolyDetail) * header->detailMeshCount);
+        const int detailVertsSize = dtAlign4(sizeof(float) * 3 * header->detailVertCount);
+        const int detailTrisSize = dtAlign4(sizeof(unsigned char) * 4 * header->detailTriCount);
+        const int bvtreeSize = dtAlign4(sizeof(dtBVNode) * header->bvNodeCount);
+        const int offMeshLinksSize = dtAlign4(sizeof(dtOffMeshConnection) * header->offMeshConCount);
+
+        const unsigned char* ptr = data + headerSize;
+
+        NavMeshTileConstView view;
+
+        view.mHeader = header;
+        view.mVerts = dtGetThenAdvanceBufferPointer<const float>(ptr, vertsSize);
+        view.mPolys = dtGetThenAdvanceBufferPointer<const dtPoly>(ptr, polysSize);
+        ptr += linksSize;
+        view.mDetailMeshes = dtGetThenAdvanceBufferPointer<const dtPolyDetail>(ptr, detailMeshesSize);
+        view.mDetailVerts = dtGetThenAdvanceBufferPointer<const float>(ptr, detailVertsSize);
+        view.mDetailTris = dtGetThenAdvanceBufferPointer<const unsigned char>(ptr, detailTrisSize);
+        view.mBvTree = dtGetThenAdvanceBufferPointer<const dtBVNode>(ptr, bvtreeSize);
+        view.mOffMeshCons = dtGetThenAdvanceBufferPointer<const dtOffMeshConnection>(ptr, offMeshLinksSize);
+
+        return view;
+    }
+
+    NavMeshTileConstView asNavMeshTileConstView(const dtMeshTile& tile)
+    {
+        NavMeshTileConstView view;
+
+        view.mHeader = tile.header;
+        view.mPolys = tile.polys;
+        view.mVerts = tile.verts;
+        view.mDetailMeshes = tile.detailMeshes;
+        view.mDetailVerts = tile.detailVerts;
+        view.mDetailTris = tile.detailTris;
+        view.mBvTree = tile.bvTree;
+        view.mOffMeshCons = tile.offMeshCons;
+
+        return view;
+    }
+
+    bool operator==(const NavMeshTileConstView& lhs, const NavMeshTileConstView& rhs)
+    {
+        return makeTuple(lhs) == makeTuple(rhs);
+    }
+}
diff --git a/components/detournavigator/navmeshtileview.hpp b/components/detournavigator/navmeshtileview.hpp
new file mode 100644
index 0000000000..92017360c3
--- /dev/null
+++ b/components/detournavigator/navmeshtileview.hpp
@@ -0,0 +1,31 @@
+#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_NAVMESHTILEVIEW_H
+#define OPENMW_COMPONENTS_DETOURNAVIGATOR_NAVMESHTILEVIEW_H
+
+struct dtMeshHeader;
+struct dtPoly;
+struct dtPolyDetail;
+struct dtBVNode;
+struct dtOffMeshConnection;
+struct dtMeshTile;
+
+namespace DetourNavigator
+{
+    struct NavMeshTileConstView
+    {
+        const dtMeshHeader* mHeader;
+        const dtPoly* mPolys;
+        const float* mVerts;
+        const dtPolyDetail* mDetailMeshes;
+        const float* mDetailVerts;
+        const unsigned char* mDetailTris;
+        const dtBVNode* mBvTree;
+        const dtOffMeshConnection* mOffMeshCons;
+
+        friend bool operator==(const NavMeshTileConstView& lhs, const NavMeshTileConstView& rhs);
+    };
+
+    NavMeshTileConstView asNavMeshTileConstView(const unsigned char* data);
+    NavMeshTileConstView asNavMeshTileConstView(const dtMeshTile& tile);
+}
+
+#endif

From 4d4fc5ed0be709eb506f893435005dd78084d341 Mon Sep 17 00:00:00 2001
From: Lamoot <matjaz.lamut@gmail.com>
Date: Sun, 18 Apr 2021 21:28:20 +0200
Subject: [PATCH 0628/2859] Finish the section on materials setup.

---
 .../modding/custom-models/pipeline-blender-collada.rst        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/source/reference/modding/custom-models/pipeline-blender-collada.rst b/docs/source/reference/modding/custom-models/pipeline-blender-collada.rst
index 5af136f74b..47096a83e7 100644
--- a/docs/source/reference/modding/custom-models/pipeline-blender-collada.rst
+++ b/docs/source/reference/modding/custom-models/pipeline-blender-collada.rst
@@ -38,7 +38,9 @@ However, a scale factor like this is impractical to work with. A better approach
 Materials
 =========
 
-In Blender, use the Principled BSDF node with textures plugged into the correct sockets. TODO...
+OpenMW uses the classic, specular material setup and currently doesn't use the more mainstream `PBR <https://en.wikipedia.org/wiki/Physically_based_rendering>`_ way. In Blender, the mesh needs a default material with a diffuse texture connected to the ``Base Color`` socket. This is enough for the material to be included in the exported COLLADA file.
+
+Additional texture types, such as specular or normal maps, will be automatically recognized and used by OpenMW. They need an identical base name as the diffuse texture, a suffix, and be in the same folder. How to enable this and what suffix is used for what texture type is covered in more detail in :doc:`../../modding/texture-modding/texture-basics`.
 
 Collision Shapes
 ================

From 1737f737dfca2d21be4a217e6a8c208daa5769d3 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Wed, 27 Jan 2021 23:33:55 +0000
Subject: [PATCH 0629/2859] Don't use a vec3 if only two components get read

---
 files/shaders/groundcover_vertex.glsl | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/files/shaders/groundcover_vertex.glsl b/files/shaders/groundcover_vertex.glsl
index 221f6528ba..97bfd61d34 100644
--- a/files/shaders/groundcover_vertex.glsl
+++ b/files/shaders/groundcover_vertex.glsl
@@ -62,13 +62,11 @@ vec2 groundcoverDisplacement(in vec3 worldpos, float h)
     harmonics += vec2((1.0 + 0.28*v) * sin(5.0*osg_SimulationTime + worldpos.xy / 200.0));
 
     float d = length(worldpos - footPos.xyz);
-    vec3 stomp = vec3(0.0);
+    vec2 stomp = vec2(0.0);
     if (d < 150.0 && d > 0.0)
-    {
-        stomp = (60.0 / d - 0.4) * (worldpos - footPos.xyz);
-    }
+        stomp = (60.0 / d - 0.4) * (worldpos.xy - footPos.xy);
 
-    return clamp(0.02 * h, 0.0, 1.0) * (harmonics * displace + stomp.xy);
+    return clamp(0.02 * h, 0.0, 1.0) * (harmonics * displace + stomp);
 }
 
 mat4 rotation(in vec3 angle)

From a81dfe9ccc0e2ad68b925a3e60019669486c4607 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Thu, 28 Jan 2021 23:24:37 +0000
Subject: [PATCH 0630/2859] MGE XE-like stomping

---
 files/shaders/groundcover_vertex.glsl | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/files/shaders/groundcover_vertex.glsl b/files/shaders/groundcover_vertex.glsl
index 97bfd61d34..9cba204d69 100644
--- a/files/shaders/groundcover_vertex.glsl
+++ b/files/shaders/groundcover_vertex.glsl
@@ -61,11 +61,20 @@ vec2 groundcoverDisplacement(in vec3 worldpos, float h)
     harmonics += vec2((1.0 + 0.14*v) * sin(3.0*osg_SimulationTime + worldpos.xy / 500.0));
     harmonics += vec2((1.0 + 0.28*v) * sin(5.0*osg_SimulationTime + worldpos.xy / 200.0));
 
+#if 0
+    // akortunov's height adjustment
     float d = length(worldpos - footPos.xyz);
+#else
+    float d = length(worldpos.xy - footPos.xy);
+#endif
     vec2 stomp = vec2(0.0);
     if (d < 150.0 && d > 0.0)
         stomp = (60.0 / d - 0.4) * (worldpos.xy - footPos.xy);
 
+#if 1
+    stomp *= clamp((worldpos.z - footPos.z) / h, 0.0, 1.0);
+#endif
+
     return clamp(0.02 * h, 0.0, 1.0) * (harmonics * displace + stomp);
 }
 

From 87ce1a7351da490571de518590998d4b803fe344 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Thu, 28 Jan 2021 23:30:24 +0000
Subject: [PATCH 0631/2859] Explain stomp constants

---
 files/shaders/groundcover_vertex.glsl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/files/shaders/groundcover_vertex.glsl b/files/shaders/groundcover_vertex.glsl
index 9cba204d69..d7d221e45f 100644
--- a/files/shaders/groundcover_vertex.glsl
+++ b/files/shaders/groundcover_vertex.glsl
@@ -68,8 +68,10 @@ vec2 groundcoverDisplacement(in vec3 worldpos, float h)
     float d = length(worldpos.xy - footPos.xy);
 #endif
     vec2 stomp = vec2(0.0);
-    if (d < 150.0 && d > 0.0)
-        stomp = (60.0 / d - 0.4) * (worldpos.xy - footPos.xy);
+    const float STOMP_RANGE = 150.0; // maximum distance from player that grass is affected by stomping
+    const float STOMP_DISTANCE = 60.0; // maximum distance stomping can move grass
+    if (d < STOMP_RANGE && d > 0.0)
+        stomp = (STOMP_DISTANCE / d - STOMP_DISTANCE / STOMP_RANGE) * (worldpos.xy - footPos.xy);
 
 #if 1
     stomp *= clamp((worldpos.z - footPos.z) / h, 0.0, 1.0);

From ce3ed28403b75d742ec1f239712ea0c63ae6fe87 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Sun, 18 Apr 2021 21:44:23 +0100
Subject: [PATCH 0632/2859] Control stomping via settings.

---
 apps/openmw/mwrender/renderingmanager.cpp     |  3 ++
 .../modding/settings/groundcover.rst          | 54 +++++++++++++++++++
 files/settings-default.cfg                    | 12 +++++
 files/shaders/groundcover_vertex.glsl         | 33 +++++++++---
 4 files changed, 94 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 16e0a351f2..dc5373b0b4 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -264,9 +264,12 @@ namespace MWRender
         for (auto itr = lightDefines.begin(); itr != lightDefines.end(); itr++)
             globalDefines[itr->first] = itr->second;
 
+        // Refactor this at some point - most shaders don't care about these defines
         float groundcoverDistance = (Constants::CellSizeInUnits * std::max(1, Settings::Manager::getInt("distance", "Groundcover")) - 1024) * 0.93;
         globalDefines["groundcoverFadeStart"] = std::to_string(groundcoverDistance * 0.9f);
         globalDefines["groundcoverFadeEnd"] = std::to_string(groundcoverDistance);
+        globalDefines["groundcoverStompMode"] = std::to_string(std::clamp(Settings::Manager::getInt("stomp mode", "Groundcover"), 0, 2));
+        globalDefines["groundcoverStompIntensity"] = std::to_string(std::clamp(Settings::Manager::getInt("stomp intensity", "Groundcover"), 0, 2));
 
         // It is unnecessary to stop/start the viewer as no frames are being rendered yet.
         mResourceSystem->getSceneManager()->getShaderManager().setGlobalDefines(globalDefines);
diff --git a/docs/source/reference/modding/settings/groundcover.rst b/docs/source/reference/modding/settings/groundcover.rst
index f0c37b7388..ef97caeecc 100644
--- a/docs/source/reference/modding/settings/groundcover.rst
+++ b/docs/source/reference/modding/settings/groundcover.rst
@@ -54,3 +54,57 @@ chunks near player will have size 4096x4096 game units. Larger chunks reduce CPU
 Smaller values do an opposite.
 
 This setting can only be configured by editing the settings configuration file.
+
+stomp mode
+----------
+
+:Type:		integer
+:Range:		0, 1, 2
+:Default:	2
+
+Determines whether grass should respond to the player treading on it.
+
+.. list-table:: Modes
+	:header-rows: 1
+	* - Mode number
+	  - Meaning
+	* - 0
+	  - Grass cannot be trampled.
+	* - 1
+	  - The player's XY position is taken into account.
+	* - 2
+	  - The player's height above the ground is taken into account, too.
+
+In MGE XE, which existing grass mods were made for, only the player's XY position was taken into account.
+However, presumably due to a bug, jumping straight up would change the XY position, so grass *does* respond to the player jumping.
+Levitating above grass in MGE XE still considers it stood-on, which can look bad.
+OpenMW's height-aware system ensures grass does not act as if it's being stood on when the player levitates above it, but that means grass rapidly snaps back to its original position when the player jumps out of it.
+Therefore, it is not recommended to use MGE XE's intensity constants if this setting is set to 2, i.e. :ref:`stomp intensity` should be 0 or 1 when :ref:`stomp mode` is 2.
+
+stomp intensity
+---------------
+
+:Type:		integer
+:Range:		0, 1, 2
+:Default:	1
+
+How far away from the player grass can be before it's unaffected by being trod on, and how far it moves when it is.
+
+.. list-table:: Presets
+	:header-rows: 1
+	* - Preset number
+	  - Range (Units)
+	  - Distance (Units)
+	  - Description
+	* - 2
+	  - 150
+	  - 60
+	  - MGE XE levels. Generally excessive/comical, but what existing mods were made with in mind.
+	* - 1
+	  - 80
+	  - 40
+	  - Reduced levels. Usually looks better.
+	* - 0
+	  - 50
+	  - 20
+	  - Gentle levels.
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 07343b39dc..c20820e684 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -1079,3 +1079,15 @@ distance = 1
 
 # A minimum size of groundcover chunk in cells (0.125, 0.25, 0.5, 1.0)
 min chunk size = 0.5
+
+# Whether grass should respond to the player treading on it.
+# 0 - Grass cannot be trampled.
+# 1 - The player's XY position is taken into account.
+# 2 - The player's height above the ground is taken into account, too.
+stomp mode = 2
+
+# How far away from the player grass can be before it's unaffected by being trod on, and how far it moves when it is.
+# 2 - MGE XE levels. Generally excessive, but what existing mods were made with in mind
+# 1 - Reduced levels.
+# 0 - Gentle levels.
+stomp intensity = 1
diff --git a/files/shaders/groundcover_vertex.glsl b/files/shaders/groundcover_vertex.glsl
index d7d221e45f..8060c2c3d3 100644
--- a/files/shaders/groundcover_vertex.glsl
+++ b/files/shaders/groundcover_vertex.glsl
@@ -46,6 +46,15 @@ uniform mat4 osg_ViewMatrix;
 uniform float windSpeed;
 uniform vec3 playerPos;
 
+#if @groundcoverStompMode == 0
+#else
+    #define STOMP 1
+    #if @groundcoverStompMode == 2
+        #define STOMP_HEIGHT_SENSITIVE 1
+    #endif
+    #define STOMP_INTENSITY_LEVEL @groundcoverStompIntensity
+#endif
+
 vec2 groundcoverDisplacement(in vec3 worldpos, float h)
 {
     vec2 windDirection = vec2(1.0);
@@ -61,20 +70,28 @@ vec2 groundcoverDisplacement(in vec3 worldpos, float h)
     harmonics += vec2((1.0 + 0.14*v) * sin(3.0*osg_SimulationTime + worldpos.xy / 500.0));
     harmonics += vec2((1.0 + 0.28*v) * sin(5.0*osg_SimulationTime + worldpos.xy / 200.0));
 
-#if 0
-    // akortunov's height adjustment
-    float d = length(worldpos - footPos.xyz);
-#else
+    vec2 stomp = vec2(0.0);
+#if STOMP
     float d = length(worldpos.xy - footPos.xy);
+#if STOMP_INTENSITY_LEVEL == 0
+    // Gentle intensity
+    const float STOMP_RANGE = 50.0; // maximum distance from player that grass is affected by stomping
+    const float STOMP_DISTANCE = 20.0; // maximum distance stomping can move grass
+#elif STOMP_INTENSITY_LEVEL == 1
+    // Reduced intensity
+    const float STOMP_RANGE = 80.0;
+    const float STOMP_DISTANCE = 40.0;
+#elif STOMP_INTENSITY_LEVEL == 2
+    // MGE XE intensity
+    const float STOMP_RANGE = 150.0;
+    const float STOMP_DISTANCE = 60.0;
 #endif
-    vec2 stomp = vec2(0.0);
-    const float STOMP_RANGE = 150.0; // maximum distance from player that grass is affected by stomping
-    const float STOMP_DISTANCE = 60.0; // maximum distance stomping can move grass
     if (d < STOMP_RANGE && d > 0.0)
         stomp = (STOMP_DISTANCE / d - STOMP_DISTANCE / STOMP_RANGE) * (worldpos.xy - footPos.xy);
 
-#if 1
+#ifdef STOMP_HEIGHT_SENSITIVE
     stomp *= clamp((worldpos.z - footPos.z) / h, 0.0, 1.0);
+#endif
 #endif
 
     return clamp(0.02 * h, 0.0, 1.0) * (harmonics * displace + stomp);

From 629cedb6d03a8cd317aa227915a4917f60cf8de2 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 18 Apr 2021 17:01:09 +0200
Subject: [PATCH 0633/2859] Do not track last build revision in
 RecastMeshManger

mLastBuildRevision == mRevision with current use cases does not happen. But
even if this will happen when another use case will be added it does not save
much computation. The most expensive operation is not adding objects to the
MeshBuilder but to optimize resulting navmesh that will happen anyway in
MeshBuilder::create call.
---
 components/detournavigator/recastmeshmanager.cpp | 5 +----
 components/detournavigator/recastmeshmanager.hpp | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/components/detournavigator/recastmeshmanager.cpp b/components/detournavigator/recastmeshmanager.cpp
index 3796c9816c..0b0298bc05 100644
--- a/components/detournavigator/recastmeshmanager.cpp
+++ b/components/detournavigator/recastmeshmanager.cpp
@@ -74,7 +74,7 @@ namespace DetourNavigator
     std::shared_ptr<RecastMesh> RecastMeshManager::getMesh()
     {
         rebuild();
-        return mMeshBuilder.create(mGeneration, mLastBuildRevision);
+        return mMeshBuilder.create(mGeneration, mRevision);
     }
 
     bool RecastMeshManager::isEmpty() const
@@ -84,13 +84,10 @@ namespace DetourNavigator
 
     void RecastMeshManager::rebuild()
     {
-        if (mLastBuildRevision == mRevision)
-            return;
         mMeshBuilder.reset();
         for (const auto& v : mWaterOrder)
             mMeshBuilder.addWater(v.mCellSize, v.mTransform);
         for (const auto& v : mObjectsOrder)
             mMeshBuilder.addObject(v.getShape(), v.getTransform(), v.getAreaType());
-        mLastBuildRevision = mRevision;
     }
 }
diff --git a/components/detournavigator/recastmeshmanager.hpp b/components/detournavigator/recastmeshmanager.hpp
index 5b568e004c..0ad111b5da 100644
--- a/components/detournavigator/recastmeshmanager.hpp
+++ b/components/detournavigator/recastmeshmanager.hpp
@@ -52,7 +52,6 @@ namespace DetourNavigator
 
     private:
         std::size_t mRevision = 0;
-        std::size_t mLastBuildRevision = 0;
         std::size_t mGeneration;
         RecastMeshBuilder mMeshBuilder;
         std::list<RecastMeshObject> mObjectsOrder;

From 64fb700ae91ec98ee39a47dca4ecf3d9235190a3 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 18 Apr 2021 17:31:21 +0200
Subject: [PATCH 0634/2859] Remove unnecessary relation between
 updateCompoundObject and RecastMeshObject

---
 .../detournavigator/recastmeshobject.cpp      | 29 ++++++++++---------
 .../detournavigator/recastmeshobject.hpp      |  3 --
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/components/detournavigator/recastmeshobject.cpp b/components/detournavigator/recastmeshobject.cpp
index aac0b4c3c8..3f35462781 100644
--- a/components/detournavigator/recastmeshobject.cpp
+++ b/components/detournavigator/recastmeshobject.cpp
@@ -8,6 +8,22 @@
 
 namespace DetourNavigator
 {
+    namespace
+    {
+        bool updateCompoundObject(const btCompoundShape& shape, const AreaType areaType,
+            std::vector<RecastMeshObject>& children)
+        {
+            assert(static_cast<std::size_t>(shape.getNumChildShapes()) == children.size());
+            bool result = false;
+            for (int i = 0, num = shape.getNumChildShapes(); i < num; ++i)
+            {
+                assert(shape.getChildShape(i) == std::addressof(children[static_cast<std::size_t>(i)].getShape()));
+                result = children[static_cast<std::size_t>(i)].update(shape.getChildTransform(i), areaType) || result;
+            }
+            return result;
+        }
+    }
+
     RecastMeshObject::RecastMeshObject(const btCollisionShape& shape, const btTransform& transform,
             const AreaType areaType)
         : mShape(shape)
@@ -42,19 +58,6 @@ namespace DetourNavigator
         return result;
     }
 
-    bool RecastMeshObject::updateCompoundObject(const btCompoundShape& shape,
-        const AreaType areaType, std::vector<RecastMeshObject>& children)
-    {
-        assert(static_cast<std::size_t>(shape.getNumChildShapes()) == children.size());
-        bool result = false;
-        for (int i = 0, num = shape.getNumChildShapes(); i < num; ++i)
-        {
-            assert(shape.getChildShape(i) == std::addressof(children[static_cast<std::size_t>(i)].mShape.get()));
-            result = children[static_cast<std::size_t>(i)].update(shape.getChildTransform(i), areaType) || result;
-        }
-        return result;
-    }
-
     std::vector<RecastMeshObject> makeChildrenObjects(const btCollisionShape& shape, const AreaType areaType)
     {
         if (shape.isCompound())
diff --git a/components/detournavigator/recastmeshobject.hpp b/components/detournavigator/recastmeshobject.hpp
index f25647ae50..e659300e68 100644
--- a/components/detournavigator/recastmeshobject.hpp
+++ b/components/detournavigator/recastmeshobject.hpp
@@ -41,9 +41,6 @@ namespace DetourNavigator
             AreaType mAreaType;
             btVector3 mLocalScaling;
             std::vector<RecastMeshObject> mChildren;
-
-            static bool updateCompoundObject(const btCompoundShape& shape, const AreaType areaType,
-                std::vector<RecastMeshObject>& children);
     };
 
     std::vector<RecastMeshObject> makeChildrenObjects(const btCollisionShape& shape, const AreaType areaType);

From 3e67f5ffa57eca6e42a480fec0ad2756414891c4 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 18 Apr 2021 16:51:52 +0200
Subject: [PATCH 0635/2859] Detect and ignore updates for oscillating objects

To avoid triggering NavMesh update when RecastMesh change should not change
NavMesh.

Based on the following assumption:
Given a set of transformations and a bounding shape for all these
tranformations, a new object transformation that does not change this
bounding shape also should not change navmesh if for all of this object
transformations resulting navmesh tiles are equivalent

The idea is to report back to RecastMeshManager all changes of NavMesh if there
are any assiciated with RecastMesh version. So we know the last time when
RecastMesh change resulted into the NavMesh change. When later report shows
that there was no NavMesh change for a new RecastMesh version we can assume
that any object transformation within the same bounding box should not change
NavMesh.
---
 CHANGELOG.md                                  |  1 +
 .../detournavigator/navigator.cpp             | 51 +++++++++++++++++++
 components/CMakeLists.txt                     |  1 +
 components/bullethelpers/aabb.hpp             | 29 +++++++++++
 .../detournavigator/asyncnavmeshupdater.cpp   | 14 +++++
 .../cachedrecastmeshmanager.cpp               |  5 ++
 .../cachedrecastmeshmanager.hpp               |  3 ++
 .../oscillatingrecastmeshobject.cpp           | 35 +++++++++++++
 .../oscillatingrecastmeshobject.hpp           | 28 ++++++++++
 .../detournavigator/recastmeshmanager.cpp     | 26 ++++++++--
 .../detournavigator/recastmeshmanager.hpp     | 17 +++++--
 .../tilecachedrecastmeshmanager.cpp           |  9 ++++
 .../tilecachedrecastmeshmanager.hpp           |  3 ++
 components/detournavigator/version.hpp        | 21 ++++++++
 14 files changed, 236 insertions(+), 7 deletions(-)
 create mode 100644 components/bullethelpers/aabb.hpp
 create mode 100644 components/detournavigator/oscillatingrecastmeshobject.cpp
 create mode 100644 components/detournavigator/oscillatingrecastmeshobject.hpp
 create mode 100644 components/detournavigator/version.hpp

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d440073854..5b89eea03f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -127,6 +127,7 @@
     Feature #3983: Wizard: Add link to buy Morrowind
     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
diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index d377aed1eb..3b7dc49151 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -835,4 +835,55 @@ namespace
 
         ASSERT_THAT(result, Optional(Vec3fEq(mEnd.x(), mEnd.y(), 1.87719)));
     }
+
+    TEST_F(DetourNavigatorNavigatorTest, update_for_oscillating_object_that_does_not_change_navmesh_should_not_trigger_navmesh_update)
+    {
+        const std::array<btScalar, 5 * 5> heightfieldData {{
+            0,   0,    0,    0,    0,
+            0, -25,  -25,  -25,  -25,
+            0, -25, -100, -100, -100,
+            0, -25, -100, -100, -100,
+            0, -25, -100, -100, -100,
+        }};
+        btHeightfieldTerrainShape heightfieldShape = makeSquareHeightfieldTerrainShape(heightfieldData);
+        heightfieldShape.setLocalScaling(btVector3(128, 128, 1));
+
+        const btBoxShape oscillatingBoxShape(btVector3(20, 20, 20));
+        const btVector3 oscillatingBoxShapePosition(32, 32, 400);
+        const btBoxShape boderBoxShape(btVector3(50, 50, 50));
+
+        mNavigator->addAgent(mAgentHalfExtents);
+        mNavigator->addObject(ObjectId(&heightfieldShape), heightfieldShape, btTransform::getIdentity());
+        mNavigator->addObject(ObjectId(&oscillatingBoxShape), oscillatingBoxShape,
+                              btTransform(btMatrix3x3::getIdentity(), oscillatingBoxShapePosition));
+        // add this box to make navmesh bound box independent from oscillatingBoxShape rotations
+        mNavigator->addObject(ObjectId(&boderBoxShape), boderBoxShape,
+                              btTransform(btMatrix3x3::getIdentity(), oscillatingBoxShapePosition + btVector3(0, 0, 200)));
+        mNavigator->update(mPlayerPosition);
+        mNavigator->wait();
+
+        const auto navMeshes = mNavigator->getNavMeshes();
+        ASSERT_EQ(navMeshes.size(), 1);
+        {
+            const auto navMesh = navMeshes.begin()->second->lockConst();
+            ASSERT_EQ(navMesh->getGeneration(), 1);
+            ASSERT_EQ(navMesh->getNavMeshRevision(), 4);
+        }
+
+        for (int n = 0; n < 10; ++n)
+        {
+            const btTransform transform(btQuaternion(btVector3(0, 0, 1), n * 2 * osg::PI / 10),
+                                        oscillatingBoxShapePosition);
+            mNavigator->updateObject(ObjectId(&oscillatingBoxShape), oscillatingBoxShape, transform);
+            mNavigator->update(mPlayerPosition);
+            mNavigator->wait();
+        }
+
+        ASSERT_EQ(navMeshes.size(), 1);
+        {
+            const auto navMesh = navMeshes.begin()->second->lockConst();
+            ASSERT_EQ(navMesh->getGeneration(), 1);
+            ASSERT_EQ(navMesh->getNavMeshRevision(), 4);
+        }
+    }
 }
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 970f029b4d..2fe09070ab 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -183,6 +183,7 @@ add_component_dir(detournavigator
     findrandompointaroundcircle
     raycast
     navmeshtileview
+    oscillatingrecastmeshobject
     )
 
 set (ESM_UI ${CMAKE_SOURCE_DIR}/files/ui/contentselector.ui
diff --git a/components/bullethelpers/aabb.hpp b/components/bullethelpers/aabb.hpp
new file mode 100644
index 0000000000..6509b946ca
--- /dev/null
+++ b/components/bullethelpers/aabb.hpp
@@ -0,0 +1,29 @@
+#ifndef OPENMW_COMPONENTS_BULLETHELPERS_AABB_H
+#define OPENMW_COMPONENTS_BULLETHELPERS_AABB_H
+
+#include <LinearMath/btVector3.h>
+#include <LinearMath/btTransform.h>
+#include <BulletCollision/CollisionShapes/btCollisionShape.h>
+#include <BulletCollision/Gimpact/btBoxCollision.h>
+
+inline bool operator==(const btAABB& lhs, const btAABB& rhs)
+{
+    return lhs.m_min == rhs.m_min && lhs.m_max == rhs.m_max;
+}
+
+inline bool operator!=(const btAABB& lhs, const btAABB& rhs)
+{
+    return !(lhs == rhs);
+}
+
+namespace BulletHelpers
+{
+    inline btAABB getAabb(const btCollisionShape& shape, const btTransform& transform)
+    {
+        btAABB result;
+        shape.getAabb(transform, result.m_min, result.m_max);
+        return result;
+    }
+}
+
+#endif
diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index bb78df7643..4855cf0adc 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -2,6 +2,7 @@
 #include "debug.hpp"
 #include "makenavmesh.hpp"
 #include "settings.hpp"
+#include "version.hpp"
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/thread.hpp>
@@ -180,6 +181,19 @@ namespace DetourNavigator
         const auto status = updateNavMesh(job.mAgentHalfExtents, recastMesh.get(), job.mChangedTile, playerTile,
             offMeshConnections, mSettings, navMeshCacheItem, mNavMeshTilesCache);
 
+        if (recastMesh != nullptr)
+        {
+            Version navMeshVersion;
+            {
+                const auto locked = navMeshCacheItem->lockConst();
+                navMeshVersion.mGeneration = locked->getGeneration();
+                navMeshVersion.mRevision = locked->getNavMeshRevision();
+            }
+            mRecastMeshManager.get().reportNavMeshChange(job.mChangedTile,
+                Version {recastMesh->getGeneration(), recastMesh->getRevision()},
+                navMeshVersion);
+        }
+
         const auto finish = std::chrono::steady_clock::now();
 
         writeDebugFiles(job, recastMesh.get());
diff --git a/components/detournavigator/cachedrecastmeshmanager.cpp b/components/detournavigator/cachedrecastmeshmanager.cpp
index 90b4266104..22b047fbd3 100644
--- a/components/detournavigator/cachedrecastmeshmanager.cpp
+++ b/components/detournavigator/cachedrecastmeshmanager.cpp
@@ -61,4 +61,9 @@ namespace DetourNavigator
     {
         return mImpl.isEmpty();
     }
+
+    void CachedRecastMeshManager::reportNavMeshChange(Version recastMeshVersion, Version navMeshVersion)
+    {
+        mImpl.reportNavMeshChange(recastMeshVersion, navMeshVersion);
+    }
 }
diff --git a/components/detournavigator/cachedrecastmeshmanager.hpp b/components/detournavigator/cachedrecastmeshmanager.hpp
index 54574aa99d..a19f017a4a 100644
--- a/components/detournavigator/cachedrecastmeshmanager.hpp
+++ b/components/detournavigator/cachedrecastmeshmanager.hpp
@@ -2,6 +2,7 @@
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_CACHEDRECASTMESHMANAGER_H
 
 #include "recastmeshmanager.hpp"
+#include "version.hpp"
 
 namespace DetourNavigator
 {
@@ -25,6 +26,8 @@ namespace DetourNavigator
 
         bool isEmpty() const;
 
+        void reportNavMeshChange(Version recastMeshVersion, Version navMeshVersion);
+
     private:
         RecastMeshManager mImpl;
         std::shared_ptr<RecastMesh> mCached;
diff --git a/components/detournavigator/oscillatingrecastmeshobject.cpp b/components/detournavigator/oscillatingrecastmeshobject.cpp
new file mode 100644
index 0000000000..dd0b956003
--- /dev/null
+++ b/components/detournavigator/oscillatingrecastmeshobject.cpp
@@ -0,0 +1,35 @@
+#include "oscillatingrecastmeshobject.hpp"
+
+#include <components/bullethelpers/aabb.hpp>
+
+namespace DetourNavigator
+{
+    OscillatingRecastMeshObject::OscillatingRecastMeshObject(RecastMeshObject impl, std::size_t lastChangeRevision)
+        : mImpl(std::move(impl))
+        , mLastChangeRevision(lastChangeRevision)
+        , mAabb(BulletHelpers::getAabb(mImpl.getShape(), mImpl.getTransform()))
+    {
+    }
+
+    bool OscillatingRecastMeshObject::update(const btTransform& transform, const AreaType areaType,
+                                             std::size_t lastChangeRevision)
+    {
+        const btTransform oldTransform = mImpl.getTransform();
+        if (!mImpl.update(transform, areaType))
+            return false;
+        if (transform == oldTransform)
+            return true;
+        if (mLastChangeRevision != lastChangeRevision)
+        {
+            mLastChangeRevision = lastChangeRevision;
+            // btAABB doesn't have copy-assignment operator
+            const btAABB aabb = BulletHelpers::getAabb(mImpl.getShape(), transform);
+            mAabb.m_min = aabb.m_min;
+            mAabb.m_max = aabb.m_max;
+            return true;
+        }
+        const btAABB currentAabb = mAabb;
+        mAabb.merge(BulletHelpers::getAabb(mImpl.getShape(), transform));
+        return currentAabb != mAabb;
+    }
+}
diff --git a/components/detournavigator/oscillatingrecastmeshobject.hpp b/components/detournavigator/oscillatingrecastmeshobject.hpp
new file mode 100644
index 0000000000..476fd4e0df
--- /dev/null
+++ b/components/detournavigator/oscillatingrecastmeshobject.hpp
@@ -0,0 +1,28 @@
+#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_OSCILLATINGRECASTMESHOBJECT_H
+#define OPENMW_COMPONENTS_DETOURNAVIGATOR_OSCILLATINGRECASTMESHOBJECT_H
+
+#include "areatype.hpp"
+#include "recastmeshobject.hpp"
+
+#include <LinearMath/btTransform.h>
+#include <BulletCollision/Gimpact/btBoxCollision.h>
+
+namespace DetourNavigator
+{
+    class OscillatingRecastMeshObject
+    {
+        public:
+            explicit OscillatingRecastMeshObject(RecastMeshObject impl, std::size_t lastChangeRevision);
+
+            bool update(const btTransform& transform, const AreaType areaType, std::size_t lastChangeRevision);
+
+            const RecastMeshObject& getImpl() const { return mImpl; }
+
+        private:
+            RecastMeshObject mImpl;
+            std::size_t mLastChangeRevision;
+            btAABB mAabb;
+    };
+}
+
+#endif
diff --git a/components/detournavigator/recastmeshmanager.cpp b/components/detournavigator/recastmeshmanager.cpp
index 0b0298bc05..146038ae68 100644
--- a/components/detournavigator/recastmeshmanager.cpp
+++ b/components/detournavigator/recastmeshmanager.cpp
@@ -13,7 +13,8 @@ namespace DetourNavigator
     bool RecastMeshManager::addObject(const ObjectId id, const btCollisionShape& shape, const btTransform& transform,
                                       const AreaType areaType)
     {
-        const auto iterator = mObjectsOrder.emplace(mObjectsOrder.end(), RecastMeshObject(shape, transform, areaType));
+        const auto iterator = mObjectsOrder.emplace(mObjectsOrder.end(),
+            OscillatingRecastMeshObject(RecastMeshObject(shape, transform, areaType), mRevision + 1));
         if (!mObjects.emplace(id, iterator).second)
         {
             mObjectsOrder.erase(iterator);
@@ -28,7 +29,9 @@ namespace DetourNavigator
         const auto object = mObjects.find(id);
         if (object == mObjects.end())
             return false;
-        if (!object->second->update(transform, areaType))
+        const std::size_t lastChangeRevision = mLastNavMeshReportedChange.has_value()
+                ? mLastNavMeshReportedChange->mRevision : mRevision;
+        if (!object->second->update(transform, areaType, lastChangeRevision))
             return false;
         ++mRevision;
         return true;
@@ -39,7 +42,7 @@ namespace DetourNavigator
         const auto object = mObjects.find(id);
         if (object == mObjects.end())
             return std::nullopt;
-        const RemovedRecastMeshObject result {object->second->getShape(), object->second->getTransform()};
+        const RemovedRecastMeshObject result {object->second->getImpl().getShape(), object->second->getImpl().getTransform()};
         mObjectsOrder.erase(object->second);
         mObjects.erase(object);
         ++mRevision;
@@ -82,12 +85,27 @@ namespace DetourNavigator
         return mObjects.empty();
     }
 
+    void RecastMeshManager::reportNavMeshChange(Version recastMeshVersion, Version navMeshVersion)
+    {
+        if (recastMeshVersion.mGeneration != mGeneration)
+            return;
+        if (mLastNavMeshReport.has_value() && navMeshVersion < mLastNavMeshReport->mNavMeshVersion)
+            return;
+        mLastNavMeshReport = {recastMeshVersion.mRevision, navMeshVersion};
+        if (!mLastNavMeshReportedChange.has_value()
+                || mLastNavMeshReportedChange->mNavMeshVersion < mLastNavMeshReport->mNavMeshVersion)
+            mLastNavMeshReportedChange = mLastNavMeshReport;
+    }
+
     void RecastMeshManager::rebuild()
     {
         mMeshBuilder.reset();
         for (const auto& v : mWaterOrder)
             mMeshBuilder.addWater(v.mCellSize, v.mTransform);
-        for (const auto& v : mObjectsOrder)
+        for (const auto& object : mObjectsOrder)
+        {
+            const RecastMeshObject& v = object.getImpl();
             mMeshBuilder.addObject(v.getShape(), v.getTransform(), v.getAreaType());
+        }
     }
 }
diff --git a/components/detournavigator/recastmeshmanager.hpp b/components/detournavigator/recastmeshmanager.hpp
index 0ad111b5da..daa123fcbc 100644
--- a/components/detournavigator/recastmeshmanager.hpp
+++ b/components/detournavigator/recastmeshmanager.hpp
@@ -2,8 +2,9 @@
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_RECASTMESHMANAGER_H
 
 #include "recastmeshbuilder.hpp"
-#include "recastmeshobject.hpp"
+#include "oscillatingrecastmeshobject.hpp"
 #include "objectid.hpp"
+#include "version.hpp"
 
 #include <LinearMath/btTransform.h>
 
@@ -50,14 +51,24 @@ namespace DetourNavigator
 
         bool isEmpty() const;
 
+        void reportNavMeshChange(Version recastMeshVersion, Version navMeshVersion);
+
     private:
+        struct Report
+        {
+            std::size_t mRevision;
+            Version mNavMeshVersion;
+        };
+
         std::size_t mRevision = 0;
         std::size_t mGeneration;
         RecastMeshBuilder mMeshBuilder;
-        std::list<RecastMeshObject> mObjectsOrder;
-        std::unordered_map<ObjectId, std::list<RecastMeshObject>::iterator> mObjects;
+        std::list<OscillatingRecastMeshObject> mObjectsOrder;
+        std::unordered_map<ObjectId, std::list<OscillatingRecastMeshObject>::iterator> mObjects;
         std::list<Water> mWaterOrder;
         std::map<osg::Vec2i, std::list<Water>::iterator> mWater;
+        std::optional<Report> mLastNavMeshReportedChange;
+        std::optional<Report> mLastNavMeshReport;
 
         void rebuild();
     };
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.cpp b/components/detournavigator/tilecachedrecastmeshmanager.cpp
index fddaa88f1d..20ebc8fea9 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -145,6 +145,15 @@ namespace DetourNavigator
         return mRevision;
     }
 
+    void TileCachedRecastMeshManager::reportNavMeshChange(const TilePosition& tilePosition, Version recastMeshVersion, Version navMeshVersion)
+    {
+        const auto tiles = mTiles.lock();
+        const auto it = tiles->find(tilePosition);
+        if (it == tiles->end())
+            return;
+        it->second.reportNavMeshChange(recastMeshVersion, navMeshVersion);
+    }
+
     bool TileCachedRecastMeshManager::addTile(const ObjectId id, const btCollisionShape& shape,
         const btTransform& transform, const AreaType areaType, const TilePosition& tilePosition, float border,
         std::map<TilePosition, CachedRecastMeshManager>& tiles)
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.hpp b/components/detournavigator/tilecachedrecastmeshmanager.hpp
index fa192bd732..68683f4100 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.hpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.hpp
@@ -5,6 +5,7 @@
 #include "tileposition.hpp"
 #include "settingsutils.hpp"
 #include "gettilespositions.hpp"
+#include "version.hpp"
 
 #include <components/misc/guarded.hpp>
 
@@ -88,6 +89,8 @@ namespace DetourNavigator
 
         std::size_t getRevision() const;
 
+        void reportNavMeshChange(const TilePosition& tilePosition, Version recastMeshVersion, Version navMeshVersion);
+
     private:
         const Settings& mSettings;
         Misc::ScopeGuarded<std::map<TilePosition, CachedRecastMeshManager>> mTiles;
diff --git a/components/detournavigator/version.hpp b/components/detournavigator/version.hpp
new file mode 100644
index 0000000000..c9de98459d
--- /dev/null
+++ b/components/detournavigator/version.hpp
@@ -0,0 +1,21 @@
+#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_VERSION_H
+#define OPENMW_COMPONENTS_DETOURNAVIGATOR_VERSION_H
+
+#include <cstddef>
+#include <tuple>
+
+namespace DetourNavigator
+{
+    struct Version
+    {
+        std::size_t mGeneration;
+        std::size_t mRevision;
+
+        friend inline bool operator<(const Version& lhs, const Version& rhs)
+        {
+            return std::tie(lhs.mGeneration, lhs.mRevision) < std::tie(rhs.mGeneration, rhs.mRevision);
+        }
+    };
+}
+
+#endif

From 1b1c786d0cf89d6c9d829afaa7ce4676cf36a064 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 19 Apr 2021 15:34:22 +0400
Subject: [PATCH 0636/2859] Do not suppress fixed MyGUI warnings

---
 CMakeLists.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index efc405a45f..dd063d4a92 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -608,7 +608,6 @@ if (WIN32)
         5204 # Class has virtual functions, but its trivial destructor is not virtual
 
         # caused by MyGUI
-        4275 # non dll-interface class 'std::exception' used as base for dll-interface class 'MyGUI::Exception'
         4297 # function assumed not to throw an exception but does
 
         # OpenMW specific warnings
@@ -644,6 +643,12 @@ if (WIN32)
         )
     endif()
 
+    if( "${MyGUI_VERSION}" VERSION_LESS_EQUAL "3.4.1" )
+        set(WARNINGS_DISABLE ${WARNINGS_DISABLE}
+        4275 # non dll-interface class 'MyGUI::delegates::IDelegateUnlink' used as base for dll-interface class 'MyGUI::Widget'
+        )
+    endif()
+
     foreach(d ${WARNINGS_DISABLE})
         set(WARNINGS "${WARNINGS} /wd${d}")
     endforeach(d)

From 0cadc97fb3acc348c95749d5d73f4789f8c65c5e Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 19 Apr 2021 15:36:58 +0400
Subject: [PATCH 0637/2859] Fix double -> float conversions

---
 apps/opencs/view/render/cellarrow.cpp | 2 +-
 apps/openmw/mwgui/statswindow.cpp     | 2 +-
 apps/openmw/mwmechanics/aicombat.cpp  | 2 +-
 apps/openmw/mwphysics/constants.hpp   | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/opencs/view/render/cellarrow.cpp b/apps/opencs/view/render/cellarrow.cpp
index ac260fe83a..4d61551236 100644
--- a/apps/opencs/view/render/cellarrow.cpp
+++ b/apps/opencs/view/render/cellarrow.cpp
@@ -151,7 +151,7 @@ void CSVRender::CellArrow::buildShape()
     osg::Vec4Array *colours = new osg::Vec4Array;
 
     for (int i=0; i<6; ++i)
-        colours->push_back (osg::Vec4f (0.11, 0.6f, 0.95f, 1.0f));
+        colours->push_back (osg::Vec4f (0.11f, 0.6f, 0.95f, 1.0f));
     for (int i=0; i<6; ++i)
         colours->push_back (osg::Vec4f (0.08f, 0.44f, 0.7f, 1.0f));
 
diff --git a/apps/openmw/mwgui/statswindow.cpp b/apps/openmw/mwgui/statswindow.cpp
index 4c4450ee00..8e6f951291 100644
--- a/apps/openmw/mwgui/statswindow.cpp
+++ b/apps/openmw/mwgui/statswindow.cpp
@@ -93,7 +93,7 @@ namespace MWGui
         int windowHeight = window->getSize().height;
 
         //initial values defined in openmw_stats_window.layout, if custom options are not present in .layout, a default is loaded
-        float leftPaneRatio = 0.44;
+        float leftPaneRatio = 0.44f;
         if (mLeftPane->isUserString("LeftPaneRatio"))
             leftPaneRatio = MyGUI::utility::parseFloat(mLeftPane->getUserString("LeftPaneRatio"));
 
diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index 2e60965208..b5e7594f32 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -531,7 +531,7 @@ namespace MWMechanics
             // Otherwise apply a random side step (kind of dodging) with some probability
             // if actor is within range of target's weapon.
             if (std::abs(angleToTarget) > osg::PI / 4)
-                moveDuration = 0.2;
+                moveDuration = 0.2f;
             else if (distToTarget <= rangeAttackOfTarget && Misc::Rng::rollClosedProbability() < 0.25)
                 moveDuration = 0.1f + 0.1f * Misc::Rng::rollClosedProbability();
             if (moveDuration > 0)
diff --git a/apps/openmw/mwphysics/constants.hpp b/apps/openmw/mwphysics/constants.hpp
index d552ed49e6..eaeb308d58 100644
--- a/apps/openmw/mwphysics/constants.hpp
+++ b/apps/openmw/mwphysics/constants.hpp
@@ -17,10 +17,10 @@ namespace MWPhysics
     // Arbitrary number. To prevent infinite loops. They shouldn't happen but it's good to be prepared.
     static constexpr int sMaxIterations = 8;
     // Allows for more precise movement solving without getting stuck or snagging too easily.
-    static constexpr float sCollisionMargin = 0.1;
+    static constexpr float sCollisionMargin = 0.1f;
     // Allow for a small amount of penetration to prevent numerical precision issues from causing the "unstuck"ing code to run unnecessarily
     // Currently set to 0 because having the "unstuck"ing code run whenever possible prevents some glitchy snagging issues
-    static constexpr float sAllowedPenetration = 0.0;
+    static constexpr float sAllowedPenetration = 0.0f;
 }
 
 #endif

From 2009916dd8507bb270522aa462771401229972f9 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 19 Apr 2021 15:38:02 +0400
Subject: [PATCH 0638/2859] Fix dead code

---
 components/crashcatcher/windows_crashcatcher.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/components/crashcatcher/windows_crashcatcher.cpp b/components/crashcatcher/windows_crashcatcher.cpp
index 4c3dfa8f63..33ec319aa2 100644
--- a/components/crashcatcher/windows_crashcatcher.cpp
+++ b/components/crashcatcher/windows_crashcatcher.cpp
@@ -178,8 +178,6 @@ namespace Crash
         sInstance->handleVectoredException(info);
 
         _Exit(1);
-
-        return EXCEPTION_CONTINUE_SEARCH;
     }
 
     void CrashCatcher::handleVectoredException(PEXCEPTION_POINTERS info)

From 9647b670e4ff99c4a197501a491b15b4486c9089 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 19 Apr 2021 15:43:00 +0400
Subject: [PATCH 0639/2859] Do not declare unused variables

---
 apps/opencs/view/render/terraintexturemode.cpp | 2 +-
 apps/openmw/mwrender/objectpaging.cpp          | 2 +-
 apps/openmw/mwworld/cellpreloader.cpp          | 4 ++--
 apps/openmw/mwworld/scene.cpp                  | 4 ++--
 apps/openmw/mwworld/worldimp.cpp               | 2 +-
 components/resource/keyframemanager.cpp        | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/opencs/view/render/terraintexturemode.cpp b/apps/opencs/view/render/terraintexturemode.cpp
index f4a3f461c9..fa46cf6730 100644
--- a/apps/opencs/view/render/terraintexturemode.cpp
+++ b/apps/opencs/view/render/terraintexturemode.cpp
@@ -606,7 +606,7 @@ void CSVRender::TerrainTextureMode::createTexture(std::string textureFileName)
             newId = CSMWorld::LandTexture::createUniqueRecordId(0, counter);
             if (ltexTable.getRecord(newId).isDeleted() == 0) counter = (counter + 1) % maxCounter;
         }
-        catch (const std::exception& e)
+        catch (const std::exception&)
         {
             newId = CSMWorld::LandTexture::createUniqueRecordId(0, counter);
             freeIndexFound = true;
diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index 7386c00690..064d3aa355 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -402,7 +402,7 @@ namespace MWRender
                             refs[ref.mRefNum] = ref;
                         }
                     }
-                    catch (std::exception& e)
+                    catch (std::exception&)
                     {
                         continue;
                     }
diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index 31af5b24bd..6bc60968cb 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -84,7 +84,7 @@ namespace MWWorld
                     mTerrain->cacheCell(mTerrainView.get(), mX, mY);
                     mPreloadedObjects.insert(mLandManager->getLand(mX, mY));
                 }
-                catch(std::exception& e)
+                catch(std::exception&)
                 {
                 }
             }
@@ -127,7 +127,7 @@ namespace MWWorld
                         mPreloadedObjects.insert(mBulletShapeManager->getShape(mesh));
 
                 }
-                catch (std::exception& e)
+                catch (std::exception&)
                 {
                     // ignore error for now, would spam the log too much
                     // error will be shown when visiting the cell
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 3f050ba366..dae703c8c4 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -965,7 +965,7 @@ namespace MWWorld
             {
                 mSceneManager->getTemplate(mMesh);
             }
-            catch (std::exception& e)
+            catch (std::exception&)
             {
             }
         }
@@ -1049,7 +1049,7 @@ namespace MWWorld
                         exteriorPositions.emplace_back(pos, gridCenterToBounds(getNewGridCenter(pos)));
                     }
                 }
-                catch (std::exception& e)
+                catch (std::exception&)
                 {
                     // ignore error for now, would spam the log too much
                 }
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index b991c1a035..8bb73c6899 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -3895,7 +3895,7 @@ namespace MWWorld
             if (!model.empty())
                 scene->preload(model, ref.getPtr().getClass().useAnim());
         }
-        catch(std::exception& e)
+        catch(std::exception&)
         {
         }
     }
diff --git a/components/resource/keyframemanager.cpp b/components/resource/keyframemanager.cpp
index f4ab79519e..d7eeeeb971 100644
--- a/components/resource/keyframemanager.cpp
+++ b/components/resource/keyframemanager.cpp
@@ -77,7 +77,7 @@ namespace Resource
                         mTarget.mTextKeys.emplace(parseTimeSignature(line), parseTextKey(line));
                     }
                 }
-                catch (std::exception& e)
+                catch (std::exception&)
                 {
                     Log(Debug::Warning) << "No textkey file found for " << mNormalized;
                 }

From 651ad11ad8c09960a28c733ee05c198bc4df5de9 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 19 Apr 2021 15:51:00 +0400
Subject: [PATCH 0640/2859] Do not leave variables without initialization, even
 in execution paths where they are unused

---
 apps/openmw/mwdialogue/hypertextparser.cpp | 2 +-
 apps/openmw/mwgui/dialogue.cpp             | 2 +-
 apps/openmw/mwgui/journalviewmodel.cpp     | 2 +-
 apps/openmw/mwphysics/stepper.cpp          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwdialogue/hypertextparser.cpp b/apps/openmw/mwdialogue/hypertextparser.cpp
index 28e450e2b2..fa7de97d2e 100644
--- a/apps/openmw/mwdialogue/hypertextparser.cpp
+++ b/apps/openmw/mwdialogue/hypertextparser.cpp
@@ -17,7 +17,7 @@ namespace MWDialogue
         std::vector<Token> parseHyperText(const std::string & text)
         {
             std::vector<Token> result;
-            size_t pos_end, iteration_pos = 0;
+            size_t pos_end = std::string::npos, iteration_pos = 0;
             for(;;)
             {
                 size_t pos_begin = text.find('@', iteration_pos);
diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp
index ace051a025..1f155bd474 100644
--- a/apps/openmw/mwgui/dialogue.cpp
+++ b/apps/openmw/mwgui/dialogue.cpp
@@ -148,7 +148,7 @@ namespace MWGui
         // We need this copy for when @# hyperlinks are replaced
         std::string text = mText;
 
-        size_t pos_end;
+        size_t pos_end = std::string::npos;
         for(;;)
         {
             size_t pos_begin = text.find('@');
diff --git a/apps/openmw/mwgui/journalviewmodel.cpp b/apps/openmw/mwgui/journalviewmodel.cpp
index 426c3b4378..6b38cd0d9d 100644
--- a/apps/openmw/mwgui/journalviewmodel.cpp
+++ b/apps/openmw/mwgui/journalviewmodel.cpp
@@ -129,7 +129,7 @@ struct JournalViewModelImpl : JournalViewModel
 
                         utf8text.replace(pos_begin, pos_end+1-pos_begin, displayName);
 
-                        intptr_t value;
+                        intptr_t value = 0;
                         if (mModel->mKeywordSearch.containsKeyword(topicName, value))
                             mHyperLinks[std::make_pair(pos_begin, pos_begin+displayName.size())] = value;
                     }
diff --git a/apps/openmw/mwphysics/stepper.cpp b/apps/openmw/mwphysics/stepper.cpp
index 2a28381bee..6c7e5223f3 100644
--- a/apps/openmw/mwphysics/stepper.cpp
+++ b/apps/openmw/mwphysics/stepper.cpp
@@ -60,7 +60,7 @@ namespace MWPhysics
         // attempt 3: further, less tall fixed distance movement, same as above
         // If you're making a full conversion you should purge the logic for attempts 2 and 3. Attempts 2 and 3 just try to work around problems with vanilla Morrowind assets.
         int attempt = 0;
-        float downStepSize;
+        float downStepSize = 0;
         while(attempt < 3)
         {
             attempt++;

From 7d5c5f8a249519a082a724f59c9ebab1636bcb8c Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 19 Apr 2021 16:01:41 +0400
Subject: [PATCH 0641/2859] Do not assign negative values to unsigned variables

---
 apps/openmw/mwrender/renderingmanager.cpp | 3 +--
 components/nifosg/nifloader.cpp           | 2 +-
 components/sceneutil/lightmanager.cpp     | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index dc5373b0b4..1d149ccbc9 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -860,8 +860,7 @@ namespace MWRender
     {
         RenderingManager::RayResult result;
         result.mHit = false;
-        result.mHitRefnum.mContentFile = -1;
-        result.mHitRefnum.mIndex = -1;
+        result.mHitRefnum.unset();
         result.mRatio = 0;
         if (intersector->containsIntersections())
         {
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index ae1726f065..a014045957 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -238,7 +238,7 @@ namespace NifOsg
         std::string mFilename;
         unsigned int mVersion, mUserVersion, mBethVersion;
 
-        size_t mFirstRootTextureIndex = -1;
+        size_t mFirstRootTextureIndex{~0u};
         bool mFoundFirstRootTexturingProperty = false;
 
         bool mHasNightDayLabel = false;
diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 8f242daeee..5c08b22c48 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -132,7 +132,7 @@ namespace SceneUtil
             if (value[0] < 0)
             {
                 positiveColor *= -1.0;
-                signBit = -1;
+                signBit = ~0u;
             }
             unsigned int packedColor = asRGBA(positiveColor);
             std::memcpy(&(*mData)[getOffset(index, Diffuse)], &packedColor, sizeof(unsigned int));

From d10399e0835fb10f410693dfb4f78d13aa4473a9 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 19 Apr 2021 17:08:03 +0400
Subject: [PATCH 0642/2859] Cast double constant to float explicitely

---
 apps/openmw/mwmechanics/aibreathe.cpp | 2 +-
 apps/openmw/mwrender/camera.cpp       | 2 +-
 components/sceneutil/pathgridutil.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwmechanics/aibreathe.cpp b/apps/openmw/mwmechanics/aibreathe.cpp
index 2740355b57..94e4ecd955 100644
--- a/apps/openmw/mwmechanics/aibreathe.cpp
+++ b/apps/openmw/mwmechanics/aibreathe.cpp
@@ -23,7 +23,7 @@ bool MWMechanics::AiBreathe::execute (const MWWorld::Ptr& actor, CharacterContro
             actorClass.getCreatureStats(actor).setMovementFlag(CreatureStats::Flag_Run, true);
 
             actorClass.getMovementSettings(actor).mPosition[1] = 1;
-            smoothTurn(actor, -osg::PI / 2, 0);
+            smoothTurn(actor, static_cast<float>(-osg::PI_2), 0);
 
             return false;
         }
diff --git a/apps/openmw/mwrender/camera.cpp b/apps/openmw/mwrender/camera.cpp
index 12e6ef3ce9..3e5d1d0b31 100644
--- a/apps/openmw/mwrender/camera.cpp
+++ b/apps/openmw/mwrender/camera.cpp
@@ -433,7 +433,7 @@ namespace MWRender
     void Camera::setPitch(float angle)
     {
         const float epsilon = 0.000001f;
-        float limit = osg::PI_2 - epsilon;
+        float limit = static_cast<float>(osg::PI_2) - epsilon;
         mPitch = osg::clampBetween(angle, -limit, limit);
     }
 
diff --git a/components/sceneutil/pathgridutil.cpp b/components/sceneutil/pathgridutil.cpp
index ed6894dfc9..f37a8ba597 100644
--- a/components/sceneutil/pathgridutil.cpp
+++ b/components/sceneutil/pathgridutil.cpp
@@ -142,7 +142,7 @@ namespace SceneUtil
                 osg::Vec3f dir = toPos - fromPos;
                 dir.normalize();
 
-                osg::Quat rot = osg::Quat(-osg::PI / 2, osg::Vec3(0, 0, 1));
+                osg::Quat rot(static_cast<float>(-osg::PI_2), osg::Vec3f(0, 0, 1));
                 dir = rot * dir;
 
                 unsigned short diamondIndex = 0;

From 21203fb8505f32f5b97928169b6fae328142b6b6 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Mon, 19 Apr 2021 16:00:11 +0200
Subject: [PATCH 0643/2859] Allow OSX to fail for now

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index beff58bcaa..f5c1fe2690 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -157,6 +157,7 @@ macOS11_Xcode12:
 macOS10.15_Xcode11:
   extends: .MacOS
   image: macos-10.15-xcode-11
+  allow_failure: true
   cache:
     key: macOS10.15_Xcode11.v1
   variables:

From 55416a57ef58aeaf39cf0cbde6b131d0fadc1668 Mon Sep 17 00:00:00 2001
From: Lamoot <matjaz.lamut@gmail.com>
Date: Mon, 19 Apr 2021 20:11:13 +0200
Subject: [PATCH 0644/2859] Document the newly added settings under [Models]
 section, used for dehardcoded mesh paths.

---
 .../reference/modding/settings/models.rst     | 210 ++++++++++++++++++
 1 file changed, 210 insertions(+)

diff --git a/docs/source/reference/modding/settings/models.rst b/docs/source/reference/modding/settings/models.rst
index b0da374d6c..c0192067a7 100644
--- a/docs/source/reference/modding/settings/models.rst
+++ b/docs/source/reference/modding/settings/models.rst
@@ -29,3 +29,213 @@ If enabled, this setting allows the NIF loader to make use of that functionality
 
 To help debug possible issues OpenMW will log its progress in loading
 every file that uses an unsupported NIF version.
+
+xbaseanim
+---------
+
+:Type:		string
+:Range:		
+:Default:	meshes/xbase_anim.nif
+
+Path to the file used for 3rd person base animation model that looks also for the corresponding kf-file.
+
+.. note::
+	If you are using the COLLADA format, you don't need to separate the files as they are separated between .nif and .kf files. It works if you plug the same COLLADA file into all animation-related entries, just make sure there is a corresponding textkeys file. You can read more about the textkeys in :doc:`../../modding/custom-models/pipeline-blender-collada`.
+
+baseanim
+--------
+
+:Type:		string
+:Range:		
+:Default:	meshes/base_anim.nif
+
+Path to the file used for 3rd person base model with textkeys-data.
+
+xbaseanim1st
+------------
+
+:Type:		string
+:Range:		
+:Default:	meshes/xbase_anim.1st.nif
+
+Path to the file used for 1st person base animation model that looks also for corresponding kf-file.
+
+baseanimkna
+-----------
+
+:Type:		string
+:Range:		
+:Default:	meshes/base_animkna.nif
+
+Path to the file used for 3rd person beast race base model with textkeys-data.
+
+baseanimkna1st
+--------------
+
+:Type:		string
+:Range:		
+:Default:	meshes/base_animkna.1st.nif
+
+Path to the file used for 1st person beast race base animation model.
+
+xbaseanimfemale
+---------------
+
+:Type:		string
+:Range:		
+:Default:	meshes/xbase_anim_female.nif
+
+Path to the file used for 3rd person female base animation model.
+
+baseanimfemale
+--------------
+
+:Type:		string
+:Range:		
+:Default:	meshes/base_anim_female.nif
+
+Path to the file used for 3rd person female base model with textkeys-data.
+
+baseanimfemale1st
+-----------------
+
+:Type:		string
+:Range:		
+:Default:	meshes/base_anim_female.1st.nif
+
+Path to the file used for 1st person female base model with textkeys-data.
+
+wolfskin
+--------
+
+:Type:		string
+:Range:		
+:Default:	meshes/wolf/skin.nif
+
+Path to the file used for 3rd person werewolf skin.
+
+wolfskin1st
+-----------
+
+:Type:		string
+:Range:		
+:Default:	meshes/wolf/skin.1st.nif
+
+Path to the file used for 1st person werewolf skin.
+
+xargonianswimkna
+----------------
+
+:Type:		string
+:Range:		
+:Default:	meshes/xargonian_swimkna.nif
+
+Path to the file used for Argonian swimkna.
+
+xbaseanimkf
+-----------
+
+:Type:		string
+:Range:		
+:Default:	meshes/xbase_anim.kf
+
+File to load xbaseanim 3rd person animations.
+
+xbaseanim1stkf
+--------------
+
+:Type:		string
+:Range:		
+:Default:	meshes/xbase_anim.1st.kf
+
+File to load xbaseanim 3rd person animations.
+
+xbaseanimfemalekf
+-----------------
+
+:Type:		string
+:Range:		
+:Default:	meshes/xbase_anim_female.kf
+
+File to load xbaseanim animations from.
+
+xargonianswimknakf
+------------------
+
+:Type:		string
+:Range:		
+:Default:	meshes/xargonian_swimkna.kf
+
+File to load xargonianswimkna animations from.
+
+skyatmosphere
+-------------
+
+:Type:		string
+:Range:		
+:Default:	meshes/sky_atmosphere.nif
+
+Path to the file used for the sky atmosphere mesh, which is one of the three meshes needed to render the sky. It's used to make the top half of the sky blue and renders in front of the background color.
+
+skyclouds
+---------
+
+:Type:		string
+:Range:		
+:Default:	meshes/sky_clouds_01.nif.
+
+Path to the file used for the sky clouds mesh, which is one of the three meshes needed to render the sky. It displays a scrolling texture of clouds in front of the atmosphere mesh and background color
+
+skynight01
+----------
+
+:Type:		string
+:Range:		
+:Default:	meshes/sky_night_01.nif
+
+Path to the file used for the sky stars mesh, which is one of the three meshes needed to render the sky. During night, it displays a texture with stars in front of the atmosphere and behind the clouds. If skynight02 is present, skynight01 will not be used.
+
+skynight02
+----------
+
+:Type:		string
+:Range:		
+:Default:	meshes/sky_night_02.nif
+
+Path to the file used for the sky stars mesh, which is one of the three meshes needed to render the sky. During night, it displays a texture with stars in front of the atmosphere and behind the clouds. If it's present it will be used instead of skynight01.
+
+weatherashcloud
+---------------
+
+:Type:		string
+:Range:		
+:Default:	meshes/ashcloud.nif
+
+Path to the file used for the ash clouds weather effect in Morrowind. OpenMW doesn't use this file, instead it renders a similar looking particle effect. Changing this won't have any effect.
+
+weatherblightcloud
+------------------
+
+:Type:		string
+:Range:		
+:Default:	meshes/blightcloud.nif
+
+Path to the file used for the blight clouds weather effect in Morrowind. OpenMW doesn't use this file, instead it renders a similar looking particle effect. Changing this won't have any effect.
+
+weathersnow
+-----------
+
+:Type:		string
+:Range:		
+:Default:	meshes/snow.nif
+
+Path to the file used for the snow falling weather effect in Morrowind. OpenMW doesn't use this file, instead it renders a similar looking particle effect. Changing this won't have any effect.
+
+weatherblizzard
+---------------
+
+:Type:		string
+:Range:		
+:Default:	meshes/blizzard.nif
+
+Path to the file used for the blizzard clouds weather effect in Morrowind. OpenMW doesn't use this file, instead it renders a similar looking particle effect. Changing this won't have any effect.

From cbfaab51e71feb763a89fa48cce7c187de763f72 Mon Sep 17 00:00:00 2001
From: Lamoot <matjaz.lamut@gmail.com>
Date: Mon, 19 Apr 2021 21:21:53 +0200
Subject: [PATCH 0645/2859] Mention and link settings for dehardcoded models in
 index page of custom models section.

---
 docs/source/reference/modding/custom-models/index.rst | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/source/reference/modding/custom-models/index.rst b/docs/source/reference/modding/custom-models/index.rst
index 8f575bf3c8..b204dffd99 100644
--- a/docs/source/reference/modding/custom-models/index.rst
+++ b/docs/source/reference/modding/custom-models/index.rst
@@ -2,7 +2,11 @@
 Custom Models
 #############
 
-Custom models can be imported into OpenMW using a variety of formats. Below is a quick overview of supported formats, followed by separate articles with further look at the pipelines.
+Custom models can be imported into OpenMW using a variety of formats. Models for the majority of in-game objects are assigned through openMW-CS :doc:`/manuals/openmw-cs/index`.
+
+Some models, however, are essential for OpenMW to even run. These include player and NPC animations, and meshes for the sky. They are assigned in the ``settings.cfg`` file, with more information available in :doc:`/reference/modding/settings/models` .
+
+Below is a quick overview of supported formats, followed by separate articles with further look at the pipelines.
 
 * **COLLADA** has no license restrictions and is suitable for modding as well as standalone games based on the OpenMW engine. It supports static and animated models. While it doesn't yet work in all parts of the engine, work is being done to resolve the remaining limitations.
 

From 2d869ca9ff9c6143db7c584890426e9cd7dc034d Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Tue, 20 Apr 2021 10:42:06 +0400
Subject: [PATCH 0646/2859] Fix node masks signed/unsigned mismatch

---
 apps/opencs/view/render/cameracontroller.cpp |  4 ++--
 apps/opencs/view/render/mask.hpp             |  2 +-
 apps/opencs/view/render/scenewidget.cpp      |  2 +-
 apps/opencs/view/render/scenewidget.hpp      |  2 +-
 apps/opencs/view/render/worldspacewidget.cpp |  2 +-
 apps/openmw/mwrender/characterpreview.cpp    |  2 +-
 apps/openmw/mwrender/renderingmanager.cpp    |  6 +++---
 apps/openmw/mwrender/sky.cpp                 | 12 ++++++------
 apps/openmw/mwrender/vismask.hpp             |  2 +-
 apps/openmw/mwrender/water.cpp               |  6 +++---
 components/nifosg/nifloader.cpp              |  2 +-
 components/terrain/quadtreeworld.cpp         |  4 ++--
 components/terrain/quadtreeworld.hpp         |  4 ++--
 components/terrain/terraingrid.cpp           |  4 ++--
 components/terrain/terraingrid.hpp           |  4 ++--
 components/terrain/world.cpp                 |  4 ++--
 components/terrain/world.hpp                 |  4 ++--
 17 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/apps/opencs/view/render/cameracontroller.cpp b/apps/opencs/view/render/cameracontroller.cpp
index 5dbb7a28c1..f21224d73d 100644
--- a/apps/opencs/view/render/cameracontroller.cpp
+++ b/apps/opencs/view/render/cameracontroller.cpp
@@ -126,7 +126,7 @@ namespace CSVRender
         {
             // Try again without any mask
             boundsVisitor.reset();
-            boundsVisitor.setTraversalMask(~0);
+            boundsVisitor.setTraversalMask(~0u);
             root->accept(boundsVisitor);
 
             // Last resort, set a default
@@ -458,7 +458,7 @@ namespace CSVRender
         , mDown(false)
         , mRollLeft(false)
         , mRollRight(false)
-        , mPickingMask(~0)
+        , mPickingMask(~0u)
         , mCenter(0,0,0)
         , mDistance(0)
         , mOrbitSpeed(osg::PI / 4)
diff --git a/apps/opencs/view/render/mask.hpp b/apps/opencs/view/render/mask.hpp
index deeab49963..818be8b228 100644
--- a/apps/opencs/view/render/mask.hpp
+++ b/apps/opencs/view/render/mask.hpp
@@ -8,7 +8,7 @@ namespace CSVRender
     /// @note See the respective file in OpenMW (apps/openmw/mwrender/vismask.hpp)
     /// for general usage hints about node masks.
     /// @copydoc MWRender::VisMask
-    enum Mask
+    enum Mask : unsigned int
     {
         // elements that are part of the actual scene
         Mask_Reference = 0x2,
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index 4d73cde153..5340939963 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -120,7 +120,7 @@ void RenderWidget::flagAsModified()
     mView->requestRedraw();
 }
 
-void RenderWidget::setVisibilityMask(int mask)
+void RenderWidget::setVisibilityMask(unsigned int mask)
 {
     mView->getCamera()->setCullMask(mask | Mask_ParticleSystem | Mask_Lighting);
 }
diff --git a/apps/opencs/view/render/scenewidget.hpp b/apps/opencs/view/render/scenewidget.hpp
index d7d9dba0c5..922776e9fb 100644
--- a/apps/opencs/view/render/scenewidget.hpp
+++ b/apps/opencs/view/render/scenewidget.hpp
@@ -55,7 +55,7 @@ namespace CSVRender
             /// Initiates a request to redraw the view
             void flagAsModified();
 
-            void setVisibilityMask(int mask);
+            void setVisibilityMask(unsigned int mask);
 
             osg::Camera *getCamera();
 
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index 82a1459f2d..6eb437daf3 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -163,7 +163,7 @@ void CSVRender::WorldspaceWidget::selectDefaultNavigationMode()
 
 void CSVRender::WorldspaceWidget::centerOrbitCameraOnSelection()
 {
-    std::vector<osg::ref_ptr<TagBase> > selection = getSelection(~0);
+    std::vector<osg::ref_ptr<TagBase> > selection = getSelection(~0u);
 
     for (std::vector<osg::ref_ptr<TagBase> >::iterator it = selection.begin(); it!=selection.end(); ++it)
     {
diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index 62011e8bdb..b75e45906b 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -426,7 +426,7 @@ namespace MWRender
         visitor.setTraversalNumber(mDrawOnceCallback->getLastRenderedFrame());
 
         osg::Node::NodeMask nodeMask = mCamera->getNodeMask();
-        mCamera->setNodeMask(~0);
+        mCamera->setNodeMask(~0u);
         mCamera->accept(visitor);
         mCamera->setNodeMask(nodeMask);
 
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 1d149ccbc9..5d5a349d44 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -660,7 +660,7 @@ namespace MWRender
         }
         else if (mode == Render_Scene)
         {
-            int mask = mViewer->getCamera()->getCullMask();
+            unsigned int mask = mViewer->getCamera()->getCullMask();
             bool enabled = mask&Mask_Scene;
             enabled = !enabled;
             if (enabled)
@@ -815,7 +815,7 @@ namespace MWRender
             return false;
         }
 
-        int maskBackup = mPlayerAnimation->getObjectRoot()->getNodeMask();
+        unsigned int maskBackup = mPlayerAnimation->getObjectRoot()->getNodeMask();
 
         if (mCamera->isFirstPerson())
             mPlayerAnimation->getObjectRoot()->setNodeMask(0);
@@ -916,7 +916,7 @@ namespace MWRender
         mIntersectionVisitor->setFrameStamp(mViewer->getFrameStamp());
         mIntersectionVisitor->setIntersector(intersector);
 
-        int mask = ~0;
+        unsigned int mask = ~0u;
         mask &= ~(Mask_RenderToTexture|Mask_Sky|Mask_Debug|Mask_Effect|Mask_Water|Mask_SimpleWater|Mask_Groundcover);
         if (ignorePlayer)
             mask &= ~(Mask_Player);
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index 2f2882368f..f0e8764709 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -317,8 +317,8 @@ public:
             if (cv->getCullingMode() & osg::CullSettings::FAR_PLANE_CULLING)
                 ++numPlanes;
 
-            int mask = 0x1;
-            int resultMask = cv->getProjectionCullingStack().back().getFrustum().getResultMask();
+            unsigned int mask = 0x1;
+            unsigned int resultMask = cv->getProjectionCullingStack().back().getFrustum().getResultMask();
             for (unsigned int i=0; i<cv->getProjectionCullingStack().back().getFrustum().getPlaneList().size(); ++i)
             {
                 if (i >= numPlanes)
@@ -441,7 +441,7 @@ private:
 class CelestialBody
 {
 public:
-    CelestialBody(osg::Group* parentNode, float scaleFactor, int numUvSets, unsigned int visibleMask=~0)
+    CelestialBody(osg::Group* parentNode, float scaleFactor, int numUvSets, unsigned int visibleMask=~0u)
         : mVisibleMask(visibleMask)
     {
         mGeom = createTexturedQuad(numUvSets);
@@ -1624,7 +1624,7 @@ void SkyManager::setEnabled(bool enabled)
     if (enabled && !mCreated)
         create();
 
-    mRootNode->setNodeMask(enabled ? Mask_Sky : 0);
+    mRootNode->setNodeMask(enabled ? Mask_Sky : 0u);
 
     mEnabled = enabled;
 }
@@ -1785,7 +1785,7 @@ void SkyManager::setWeather(const WeatherResult& weather)
 
         mCloudUpdater->setOpacity((1.f-mCloudBlendFactor));
         mCloudUpdater2->setOpacity(mCloudBlendFactor);
-        mCloudMesh2->setNodeMask(mCloudBlendFactor > 0.f ? ~0 : 0);
+        mCloudMesh2->setNodeMask(mCloudBlendFactor > 0.f ? ~0u : 0);
     }
 
     if (mCloudColour != weather.mFogColor)
@@ -1830,7 +1830,7 @@ void SkyManager::setWeather(const WeatherResult& weather)
         mAtmosphereNightUpdater->setFade(mStarsOpacity);
     }
 
-    mAtmosphereNightNode->setNodeMask(weather.mNight ? ~0 : 0);
+    mAtmosphereNightNode->setNodeMask(weather.mNight ? ~0u : 0);
 
     mPrecipitationAlpha = weather.mPrecipitationAlpha;
 }
diff --git a/apps/openmw/mwrender/vismask.hpp b/apps/openmw/mwrender/vismask.hpp
index bc3d3f1920..87ca9415fa 100644
--- a/apps/openmw/mwrender/vismask.hpp
+++ b/apps/openmw/mwrender/vismask.hpp
@@ -19,7 +19,7 @@ namespace MWRender
     /// another mask, or what type of node this mask is usually set on.
     /// @note The mask values are not serialized within models, nor used in any other way that would break backwards
     /// compatibility if the enumeration values were to be changed. Feel free to change them when it makes sense.
-    enum VisMask
+    enum VisMask : unsigned int
     {
         Mask_UpdateVisitor = 0x1, // reserved for separating UpdateVisitors from CullVisitors
 
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index a938db9bc0..c5fd1a3637 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -776,11 +776,11 @@ void Water::update(float dt)
 void Water::updateVisible()
 {
     bool visible = mEnabled && mToggled;
-    mWaterNode->setNodeMask(visible ? ~0 : 0);
+    mWaterNode->setNodeMask(visible ? ~0u : 0u);
     if (mRefraction)
-        mRefraction->setNodeMask(visible ? Mask_RenderToTexture : 0);
+        mRefraction->setNodeMask(visible ? Mask_RenderToTexture : 0u);
     if (mReflection)
-        mReflection->setNodeMask(visible ? Mask_RenderToTexture : 0);
+        mReflection->setNodeMask(visible ? Mask_RenderToTexture : 0u);
 }
 
 bool Water::toggle()
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index a014045957..5f083f9253 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -214,7 +214,7 @@ namespace NifOsg
         return sHiddenNodeMask;
     }
 
-    unsigned int Loader::sIntersectionDisabledNodeMask = ~0;
+    unsigned int Loader::sIntersectionDisabledNodeMask = ~0u;
 
     void Loader::setIntersectionDisabledNodeMask(unsigned int mask)
     {
diff --git a/components/terrain/quadtreeworld.cpp b/components/terrain/quadtreeworld.cpp
index 7f184c70eb..70b44935c2 100644
--- a/components/terrain/quadtreeworld.cpp
+++ b/components/terrain/quadtreeworld.cpp
@@ -241,7 +241,7 @@ private:
     osg::ref_ptr<RootNode> mRootNode;
 };
 
-QuadTreeWorld::QuadTreeWorld(osg::Group *parent, osg::Group *compileRoot, Resource::ResourceSystem *resourceSystem, Storage *storage, int nodeMask, int preCompileMask, int borderMask, int compMapResolution, float compMapLevel, float lodFactor, int vertexLodMod, float maxCompGeometrySize)
+QuadTreeWorld::QuadTreeWorld(osg::Group *parent, osg::Group *compileRoot, Resource::ResourceSystem *resourceSystem, Storage *storage, unsigned int nodeMask, unsigned int preCompileMask, unsigned int borderMask, int compMapResolution, float compMapLevel, float lodFactor, int vertexLodMod, float maxCompGeometrySize)
     : TerrainGrid(parent, compileRoot, resourceSystem, storage, nodeMask, preCompileMask, borderMask)
     , mViewDataMap(new ViewDataMap)
     , mQuadTreeBuilt(false)
@@ -256,7 +256,7 @@ QuadTreeWorld::QuadTreeWorld(osg::Group *parent, osg::Group *compileRoot, Resour
     mChunkManagers.push_back(mChunkManager.get());
 }
 
-QuadTreeWorld::QuadTreeWorld(osg::Group *parent, Storage *storage, int nodeMask, float lodFactor, float chunkSize)
+QuadTreeWorld::QuadTreeWorld(osg::Group *parent, Storage *storage, unsigned int nodeMask, float lodFactor, float chunkSize)
     : TerrainGrid(parent, storage, nodeMask)
     , mViewDataMap(new ViewDataMap)
     , mQuadTreeBuilt(false)
diff --git a/components/terrain/quadtreeworld.hpp b/components/terrain/quadtreeworld.hpp
index aba2dccf3b..2ddea42049 100644
--- a/components/terrain/quadtreeworld.hpp
+++ b/components/terrain/quadtreeworld.hpp
@@ -20,9 +20,9 @@ namespace Terrain
     class QuadTreeWorld : public TerrainGrid // note: derived from TerrainGrid is only to render default cells (see loadCell)
     {
     public:
-        QuadTreeWorld(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem, Storage* storage, int nodeMask, int preCompileMask, int borderMask, int compMapResolution, float comMapLevel, float lodFactor, int vertexLodMod, float maxCompGeometrySize);
+        QuadTreeWorld(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem, Storage* storage, unsigned int nodeMask, unsigned int preCompileMask, unsigned int borderMask, int compMapResolution, float comMapLevel, float lodFactor, int vertexLodMod, float maxCompGeometrySize);
 
-        QuadTreeWorld(osg::Group *parent, Storage *storage, int nodeMask, float lodFactor, float chunkSize);
+        QuadTreeWorld(osg::Group *parent, Storage *storage, unsigned int nodeMask, float lodFactor, float chunkSize);
 
         ~QuadTreeWorld();
 
diff --git a/components/terrain/terraingrid.cpp b/components/terrain/terraingrid.cpp
index cf8debc696..bbd0508ef1 100644
--- a/components/terrain/terraingrid.cpp
+++ b/components/terrain/terraingrid.cpp
@@ -20,13 +20,13 @@ public:
     void reset() override {}
 };
 
-TerrainGrid::TerrainGrid(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem, Storage* storage, int nodeMask, int preCompileMask, int borderMask)
+TerrainGrid::TerrainGrid(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem, Storage* storage, unsigned int nodeMask, unsigned int preCompileMask, unsigned int borderMask)
     : Terrain::World(parent, compileRoot, resourceSystem, storage, nodeMask, preCompileMask, borderMask)
     , mNumSplits(4)
 {
 }
 
-TerrainGrid::TerrainGrid(osg::Group* parent, Storage* storage, int nodeMask)
+TerrainGrid::TerrainGrid(osg::Group* parent, Storage* storage, unsigned int nodeMask)
     : Terrain::World(parent, storage, nodeMask)
     , mNumSplits(4)
 {
diff --git a/components/terrain/terraingrid.hpp b/components/terrain/terraingrid.hpp
index dc9203466d..3f44b18b08 100644
--- a/components/terrain/terraingrid.hpp
+++ b/components/terrain/terraingrid.hpp
@@ -14,8 +14,8 @@ namespace Terrain
     class TerrainGrid : public Terrain::World
     {
     public:
-        TerrainGrid(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem, Storage* storage, int nodeMask, int preCompileMask=~0, int borderMask=0);
-        TerrainGrid(osg::Group* parent, Storage* storage, int nodeMask=~0);
+        TerrainGrid(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem, Storage* storage, unsigned int nodeMask, unsigned int preCompileMask=~0u, unsigned int borderMask=0);
+        TerrainGrid(osg::Group* parent, Storage* storage, unsigned int nodeMask=~0u);
         ~TerrainGrid();
 
         void cacheCell(View* view, int x, int y) override;
diff --git a/components/terrain/world.cpp b/components/terrain/world.cpp
index 15ec72973d..d1581724e0 100644
--- a/components/terrain/world.cpp
+++ b/components/terrain/world.cpp
@@ -13,7 +13,7 @@
 namespace Terrain
 {
 
-World::World(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem, Storage* storage, int nodeMask, int preCompileMask, int borderMask)
+World::World(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem, Storage* storage, unsigned int nodeMask, unsigned int preCompileMask, unsigned int borderMask)
     : mStorage(storage)
     , mParent(parent)
     , mResourceSystem(resourceSystem)
@@ -49,7 +49,7 @@ World::World(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSyst
     mResourceSystem->addResourceManager(mTextureManager.get());
 }
 
-World::World(osg::Group* parent, Storage* storage, int nodeMask)
+World::World(osg::Group* parent, Storage* storage, unsigned int nodeMask)
     : mStorage(storage)
     , mParent(parent)
     , mCompositeMapCamera(nullptr)
diff --git a/components/terrain/world.hpp b/components/terrain/world.hpp
index a4be57e8ef..5797d894ef 100644
--- a/components/terrain/world.hpp
+++ b/components/terrain/world.hpp
@@ -105,8 +105,8 @@ namespace Terrain
         /// @param storage Storage instance to get terrain data from (heights, normals, colors, textures..)
         /// @param nodeMask mask for the terrain root
         /// @param preCompileMask mask for pre compiling textures
-        World(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem, Storage* storage, int nodeMask, int preCompileMask, int borderMask);
-        World(osg::Group* parent, Storage* storage, int nodeMask);
+        World(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem, Storage* storage, unsigned int nodeMask, unsigned int preCompileMask, unsigned int borderMask);
+        World(osg::Group* parent, Storage* storage, unsigned int nodeMask);
         virtual ~World();
 
         /// Set a WorkQueue to delete objects in the background thread.

From b7b85bb7130f0beab38172c9e722ac5c6953df98 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Tue, 20 Apr 2021 16:01:01 +0400
Subject: [PATCH 0647/2859] Disable controllers for found sheath meshes (bug
 #5975)

---
 CHANGELOG.md                            | 1 +
 apps/openmw/mwrender/actoranimation.cpp | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5b89eea03f..dec5e1e7f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -117,6 +117,7 @@
     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
     Feature #390: 3rd person look "over the shoulder"
     Feature #832: OpenMW-CS: Handle deleted references
     Feature #1536: Show more information about level on menu
diff --git a/apps/openmw/mwrender/actoranimation.cpp b/apps/openmw/mwrender/actoranimation.cpp
index fcffe220b9..845e917fb2 100644
--- a/apps/openmw/mwrender/actoranimation.cpp
+++ b/apps/openmw/mwrender/actoranimation.cpp
@@ -358,6 +358,8 @@ void ActorAnimation::updateHolsteredWeapon(bool showHolsteredWeapons)
     }
 
     mScabbard = attachMesh(scabbardName, boneName);
+    if (mScabbard)
+        resetControllers(mScabbard->getNode());
 
     osg::Group* weaponNode = getBoneByName("Bip01 Weapon");
     if (!weaponNode)

From f2f2c3d873d921bfe04ad82fe1ff089beb4029c4 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Tue, 20 Apr 2021 11:41:43 +0400
Subject: [PATCH 0648/2859] Disable -Wsuggest-override again since we have no
 control over code from FetchContent

---
 CMakeLists.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dd063d4a92..281077567a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -489,10 +489,6 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
     if (CMAKE_CXX_COMPILER_ID STREQUAL GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.6 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 4.6)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-but-set-parameter")
     endif()
-
-    if (CMAKE_CXX_COMPILER_ID STREQUAL GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 5.0 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 5.0)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsuggest-override")
-    endif()
 endif (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
 
 # Extern

From fb55207328fd3367db9e9207993699a8aa8face2 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Wed, 21 Apr 2021 19:08:06 +0200
Subject: [PATCH 0649/2859] Remove some useless includes from the wizzard

---
 apps/wizard/componentselectionpage.hpp    | 2 --
 apps/wizard/conclusionpage.hpp            | 2 --
 apps/wizard/existinginstallationpage.hpp  | 2 --
 apps/wizard/importpage.hpp                | 2 --
 apps/wizard/inisettings.cpp               | 2 --
 apps/wizard/installationtargetpage.hpp    | 2 --
 apps/wizard/intropage.hpp                 | 2 --
 apps/wizard/languageselectionpage.hpp     | 2 --
 apps/wizard/main.cpp                      | 2 --
 apps/wizard/mainwizard.hpp                | 2 --
 apps/wizard/methodselectionpage.hpp       | 2 --
 apps/wizard/utils/componentlistwidget.cpp | 1 -
 12 files changed, 23 deletions(-)

diff --git a/apps/wizard/componentselectionpage.hpp b/apps/wizard/componentselectionpage.hpp
index 2509b9f5ed..961669ab57 100644
--- a/apps/wizard/componentselectionpage.hpp
+++ b/apps/wizard/componentselectionpage.hpp
@@ -1,8 +1,6 @@
 #ifndef COMPONENTSELECTIONPAGE_HPP
 #define COMPONENTSELECTIONPAGE_HPP
 
-#include <QWizardPage>
-
 #include "ui_componentselectionpage.h"
 
 namespace Wizard
diff --git a/apps/wizard/conclusionpage.hpp b/apps/wizard/conclusionpage.hpp
index f5f27dfcab..72af2cceb1 100644
--- a/apps/wizard/conclusionpage.hpp
+++ b/apps/wizard/conclusionpage.hpp
@@ -1,8 +1,6 @@
 #ifndef CONCLUSIONPAGE_HPP
 #define CONCLUSIONPAGE_HPP
 
-#include <QWizardPage>
-
 #include "ui_conclusionpage.h"
 
 namespace Wizard
diff --git a/apps/wizard/existinginstallationpage.hpp b/apps/wizard/existinginstallationpage.hpp
index bb229e2498..fbbbe432ee 100644
--- a/apps/wizard/existinginstallationpage.hpp
+++ b/apps/wizard/existinginstallationpage.hpp
@@ -1,8 +1,6 @@
 #ifndef EXISTINGINSTALLATIONPAGE_HPP
 #define EXISTINGINSTALLATIONPAGE_HPP
 
-#include <QWizardPage>
-
 #include "ui_existinginstallationpage.h"
 
 namespace Wizard
diff --git a/apps/wizard/importpage.hpp b/apps/wizard/importpage.hpp
index 412d39ac18..b1f26409a3 100644
--- a/apps/wizard/importpage.hpp
+++ b/apps/wizard/importpage.hpp
@@ -1,8 +1,6 @@
 #ifndef IMPORTPAGE_HPP
 #define IMPORTPAGE_HPP
 
-#include <QWizardPage>
-
 #include "ui_importpage.h"
 
 namespace Wizard
diff --git a/apps/wizard/inisettings.cpp b/apps/wizard/inisettings.cpp
index d4a63c6761..e9cec12f5f 100644
--- a/apps/wizard/inisettings.cpp
+++ b/apps/wizard/inisettings.cpp
@@ -1,7 +1,5 @@
 #include "inisettings.hpp"
 
-#include <QDir>
-
 #include <QTextStream>
 #include <QFile>
 #include <QStringList>
diff --git a/apps/wizard/installationtargetpage.hpp b/apps/wizard/installationtargetpage.hpp
index 7cba295733..1f1e952280 100644
--- a/apps/wizard/installationtargetpage.hpp
+++ b/apps/wizard/installationtargetpage.hpp
@@ -1,8 +1,6 @@
 #ifndef INSTALLATIONTARGETPAGE_HPP
 #define INSTALLATIONTARGETPAGE_HPP
 
-#include <QWizardPage>
-
 #include "ui_installationtargetpage.h"
 
 namespace Files
diff --git a/apps/wizard/intropage.hpp b/apps/wizard/intropage.hpp
index c8cd690167..3fae6a747f 100644
--- a/apps/wizard/intropage.hpp
+++ b/apps/wizard/intropage.hpp
@@ -1,8 +1,6 @@
 #ifndef INTROPAGE_HPP
 #define INTROPAGE_HPP
 
-#include <QWizardPage>
-
 #include "ui_intropage.h"
 
 namespace Wizard
diff --git a/apps/wizard/languageselectionpage.hpp b/apps/wizard/languageselectionpage.hpp
index cc86ba9b37..81f8faa485 100644
--- a/apps/wizard/languageselectionpage.hpp
+++ b/apps/wizard/languageselectionpage.hpp
@@ -1,8 +1,6 @@
 #ifndef LANGUAGESELECTIONPAGE_HPP
 #define LANGUAGESELECTIONPAGE_HPP
 
-#include <QWizardPage>
-
 #include "ui_languageselectionpage.h"
 
 namespace Wizard
diff --git a/apps/wizard/main.cpp b/apps/wizard/main.cpp
index e3624742a0..67410df147 100644
--- a/apps/wizard/main.cpp
+++ b/apps/wizard/main.cpp
@@ -1,7 +1,5 @@
 #include <QApplication>
-#include <QTextCodec>
 #include <QDir>
-#include <QDebug>
 
 #include "mainwizard.hpp"
 
diff --git a/apps/wizard/mainwizard.hpp b/apps/wizard/mainwizard.hpp
index 4c221635ef..249ae1cf92 100644
--- a/apps/wizard/mainwizard.hpp
+++ b/apps/wizard/mainwizard.hpp
@@ -1,9 +1,7 @@
 #ifndef MAINWIZARD_HPP
 #define MAINWIZARD_HPP
 
-#include <QProcess>
 #include <QWizard>
-#include <QMap>
 
 #include <components/process/processinvoker.hpp>
 
diff --git a/apps/wizard/methodselectionpage.hpp b/apps/wizard/methodselectionpage.hpp
index 57d551d27e..e844024b48 100644
--- a/apps/wizard/methodselectionpage.hpp
+++ b/apps/wizard/methodselectionpage.hpp
@@ -1,8 +1,6 @@
 #ifndef METHODSELECTIONPAGE_HPP
 #define METHODSELECTIONPAGE_HPP
 
-#include <QWizardPage>
-
 #include "ui_methodselectionpage.h"
 
 namespace Wizard
diff --git a/apps/wizard/utils/componentlistwidget.cpp b/apps/wizard/utils/componentlistwidget.cpp
index 6a5d019b5e..ff37e5d8ca 100644
--- a/apps/wizard/utils/componentlistwidget.cpp
+++ b/apps/wizard/utils/componentlistwidget.cpp
@@ -1,7 +1,6 @@
 #include "componentlistwidget.hpp"
 
 #include <QDebug>
-#include <QStringList>
 
 ComponentListWidget::ComponentListWidget(QWidget *parent) :
     QListWidget(parent)

From 44ca708e12b923d056532e9a77f5350034011341 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Wed, 21 Apr 2021 20:29:16 +0200
Subject: [PATCH 0650/2859] Build windows in scheduled tasks

This should solve disappearing nigthlies
---
 .gitlab-ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f5c1fe2690..688184afba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -185,8 +185,6 @@ variables: &cs-targets
   - choco install python -y
   - refreshenv
   stage: build
-  rules:
-    - if: '$CI_PIPELINE_SOURCE != "schedule"'
   script:
     - $time = (Get-Date -Format "HH:mm:ss")
     - echo ${time}

From e3d3b97da04ca1622b29be555e77716182e79272 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Wed, 21 Apr 2021 20:31:02 +0200
Subject: [PATCH 0651/2859] Build even more windows

---
 .gitlab-ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 688184afba..efc29e9cc1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -277,8 +277,6 @@ Windows_Ninja_CS_RelWithDebInfo:
   - choco install python -y
   - refreshenv
   stage: build
-  rules:
-    - if: '$CI_PIPELINE_SOURCE != "schedule"'
   script:
     - $time = (Get-Date -Format "HH:mm:ss")
     - echo ${time}

From 03bb56999535f644bb027d0b606829af4965b375 Mon Sep 17 00:00:00 2001
From: nighthawk469 <nick.crawford1234@gmail.com>
Date: Thu, 22 Apr 2021 18:41:02 +0000
Subject: [PATCH 0652/2859] Revert Xcode sdk version from 11.6 to 10.2

---
 .travis.yml             | 4 ++--
 AUTHORS.md              | 1 +
 CI/before_script.osx.sh | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d019b55268..8d2ab43f32 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,9 +22,9 @@ addons:
     ]
 matrix:
   include:
-    - name: OpenMW (all) on MacOS 10.15 with Xcode 11.6
+    - name: OpenMW (all) on MacOS 10.15 with Xcode 10.2
       os: osx
-      osx_image: xcode11.6
+      osx_image: xcode10.2
     - name: OpenMW (all) on Ubuntu Focal with GCC
       os: linux
       dist: focal
diff --git a/AUTHORS.md b/AUTHORS.md
index 5591489b7c..75302908ea 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -152,6 +152,7 @@ Programmers
     Nathan Jeffords (blunted2night)
     NeveHanter
     Nialsy
+    Nick Crawford (nighthawk469)
     Nikolay Kasyanov (corristo)
     nobrakal
     Nolan Poe (nopoe)
diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh
index f9191eb890..1f2b2703f8 100755
--- a/CI/before_script.osx.sh
+++ b/CI/before_script.osx.sh
@@ -17,6 +17,7 @@ cmake \
 -D CMAKE_C_FLAGS_RELEASE="-g -O0" \
 -D CMAKE_CXX_FLAGS_RELEASE="-g -O0" \
 -D CMAKE_OSX_DEPLOYMENT_TARGET="10.14" \
+-D CMAKE_OSX_SYSROOT="macosx10.14" \
 -D CMAKE_BUILD_TYPE=RELEASE \
 -D OPENMW_OSX_DEPLOYMENT=TRUE \
 -D BUILD_OPENMW=TRUE \

From cd419256ad16170dd796701fa4aadf99902f7712 Mon Sep 17 00:00:00 2001
From: Simon Meulenbeek <simonmeulenbeek@gmail.com>
Date: Thu, 22 Apr 2021 18:42:56 +0000
Subject: [PATCH 0653/2859] don't forget to close the audio device after you're
 done with it.

---
 apps/launcher/utils/openalutil.cpp | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/apps/launcher/utils/openalutil.cpp b/apps/launcher/utils/openalutil.cpp
index 6f76b71306..52ad20894d 100644
--- a/apps/launcher/utils/openalutil.cpp
+++ b/apps/launcher/utils/openalutil.cpp
@@ -37,19 +37,25 @@ std::vector<const char *> Launcher::enumerateOpenALDevicesHrtf()
     std::vector<const char *> ret;
 
     ALCdevice *device = alcOpenDevice(nullptr);
-    if(device && alcIsExtensionPresent(device, "ALC_SOFT_HRTF"))
+    if(device)
     {
-        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 < 20;++i)
+        if(alcIsExtensionPresent(device, "ALC_SOFT_HRTF"))
         {
-            const ALCchar *entry = alcGetStringiSOFT(device, ALC_HRTF_SPECIFIER_SOFT, i);
-            ret.emplace_back(entry);
+            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;
-}
\ No newline at end of file
+}

From 511d3344fe4200b9afdf63f5467999b0816f489c Mon Sep 17 00:00:00 2001
From: nighthawk469 <nick.crawford1234@gmail.com>
Date: Thu, 22 Apr 2021 23:43:30 +0000
Subject: [PATCH 0654/2859] Revert CMAKE_OSX_SYSROOT as this interferes with
 the gitlab ci builds.

---
 CI/before_script.osx.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh
index 1f2b2703f8..f9191eb890 100755
--- a/CI/before_script.osx.sh
+++ b/CI/before_script.osx.sh
@@ -17,7 +17,6 @@ cmake \
 -D CMAKE_C_FLAGS_RELEASE="-g -O0" \
 -D CMAKE_CXX_FLAGS_RELEASE="-g -O0" \
 -D CMAKE_OSX_DEPLOYMENT_TARGET="10.14" \
--D CMAKE_OSX_SYSROOT="macosx10.14" \
 -D CMAKE_BUILD_TYPE=RELEASE \
 -D OPENMW_OSX_DEPLOYMENT=TRUE \
 -D BUILD_OPENMW=TRUE \

From c48eee4eeeb5d8a83d3f7d32d3a892c20ce3460f Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Thu, 22 Apr 2021 16:49:06 -0700
Subject: [PATCH 0655/2859] Clamp vertex lighting before interpolation

Fixes a regression in which pass lighting was clamped after being passed
to fragment shader. For correct FFP emulation, we need to clamp the result
in vertex shader. When clamping after interpolation, negative lights in
particular have a much more drastic effect.
---
 files/shaders/groundcover_fragment.glsl | 7 +------
 files/shaders/groundcover_vertex.glsl   | 1 +
 files/shaders/lighting_util.glsl        | 9 +++++++++
 files/shaders/nv_default_fragment.glsl  | 6 +-----
 files/shaders/objects_fragment.glsl     | 7 +------
 files/shaders/objects_vertex.glsl       | 1 +
 files/shaders/terrain_fragment.glsl     | 7 +------
 files/shaders/terrain_vertex.glsl       | 1 +
 8 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/files/shaders/groundcover_fragment.glsl b/files/shaders/groundcover_fragment.glsl
index 5464e3655b..d669634190 100644
--- a/files/shaders/groundcover_fragment.glsl
+++ b/files/shaders/groundcover_fragment.glsl
@@ -73,12 +73,7 @@ void main()
     vec3 diffuseLight, ambientLight;
     doLighting(passViewPos, normalize(viewNormal), shadowing, diffuseLight, ambientLight);
     lighting = diffuseLight + ambientLight;
-#endif
-
-#if @clamp
-    lighting = clamp(lighting, vec3(0.0), vec3(1.0));
-#else
-    lighting = max(lighting, 0.0);
+    clampLightingResult(lighting);
 #endif
 
     gl_FragData[0].xyz *= lighting;
diff --git a/files/shaders/groundcover_vertex.glsl b/files/shaders/groundcover_vertex.glsl
index 8060c2c3d3..a12fb3d9d9 100644
--- a/files/shaders/groundcover_vertex.glsl
+++ b/files/shaders/groundcover_vertex.glsl
@@ -165,6 +165,7 @@ void main(void)
     vec3 diffuseLight, ambientLight;
     doLighting(viewPos.xyz, viewNormal, diffuseLight, ambientLight, shadowDiffuseLighting);
     passLighting = diffuseLight + ambientLight;
+    clampLightingResult(passLighting);
 #endif
 
 #if (@shadows_enabled)
diff --git a/files/shaders/lighting_util.glsl b/files/shaders/lighting_util.glsl
index be32259071..30e3dbf63a 100644
--- a/files/shaders/lighting_util.glsl
+++ b/files/shaders/lighting_util.glsl
@@ -129,3 +129,12 @@ vec4 lcalcSpecular(int lightIndex)
     return @getLight[lightIndex].specular;
 #endif
 }
+
+void clampLightingResult(inout vec3 lighting)
+{
+#if @clamp
+    lighting = clamp(lighting, vec3(0.0), vec3(1.0));
+#else
+    lighting = max(lighting, 0.0);
+#endif
+}
diff --git a/files/shaders/nv_default_fragment.glsl b/files/shaders/nv_default_fragment.glsl
index 1245069f60..eadadba392 100644
--- a/files/shaders/nv_default_fragment.glsl
+++ b/files/shaders/nv_default_fragment.glsl
@@ -78,11 +78,7 @@ void main()
 #endif
     vec3 lighting = diffuseColor.xyz * diffuseLight + getAmbientColor().xyz * ambientLight + emission;
 
-#if @clamp
-    lighting = clamp(lighting, vec3(0.0), vec3(1.0));
-#else
-    lighting = max(lighting, 0.0);
-#endif
+    clampLightingResult(lighting);
 
     gl_FragData[0].xyz *= lighting;
 
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index 615b57a8a2..74929ec24c 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -176,12 +176,7 @@ void main()
     doLighting(passViewPos, normalize(viewNormal), shadowing, diffuseLight, ambientLight);
     vec3 emission = getEmissionColor().xyz * emissiveMult;
     lighting = diffuseColor.xyz * diffuseLight + getAmbientColor().xyz * ambientLight + emission;
-#endif
-
-#if @clamp
-    lighting = clamp(lighting, vec3(0.0), vec3(1.0));
-#else
-    lighting = max(lighting, 0.0);
+    clampLightingResult(lighting);
 #endif
 
     gl_FragData[0].xyz *= lighting;
diff --git a/files/shaders/objects_vertex.glsl b/files/shaders/objects_vertex.glsl
index 7baaa4176a..64c35a21cc 100644
--- a/files/shaders/objects_vertex.glsl
+++ b/files/shaders/objects_vertex.glsl
@@ -125,6 +125,7 @@ void main(void)
     doLighting(viewPos.xyz, viewNormal, diffuseLight, ambientLight, shadowDiffuseLighting);
     vec3 emission = getEmissionColor().xyz * emissiveMult;
     passLighting = getDiffuseColor().xyz * diffuseLight + getAmbientColor().xyz * ambientLight + emission;
+    clampLightingResult(passLighting);
     shadowDiffuseLighting *= getDiffuseColor().xyz;
 #endif
 
diff --git a/files/shaders/terrain_fragment.glsl b/files/shaders/terrain_fragment.glsl
index 6a7ac0bcc4..d9d4a6dc30 100644
--- a/files/shaders/terrain_fragment.glsl
+++ b/files/shaders/terrain_fragment.glsl
@@ -87,12 +87,7 @@ void main()
     vec3 diffuseLight, ambientLight;
     doLighting(passViewPos, normalize(viewNormal), shadowing, diffuseLight, ambientLight);
     lighting = diffuseColor.xyz * diffuseLight + getAmbientColor().xyz * ambientLight + getEmissionColor().xyz;
-#endif
-
-#if @clamp
-    lighting = clamp(lighting, vec3(0.0), vec3(1.0));
-#else
-    lighting = max(lighting, 0.0);
+    clampLightingResult(lighting);
 #endif
 
     gl_FragData[0].xyz *= lighting;
diff --git a/files/shaders/terrain_vertex.glsl b/files/shaders/terrain_vertex.glsl
index ad1201b932..638d6cca0b 100644
--- a/files/shaders/terrain_vertex.glsl
+++ b/files/shaders/terrain_vertex.glsl
@@ -47,6 +47,7 @@ void main(void)
     vec3 diffuseLight, ambientLight;
     doLighting(viewPos.xyz, viewNormal, diffuseLight, ambientLight, shadowDiffuseLighting);
     passLighting = getDiffuseColor().xyz * diffuseLight + getAmbientColor().xyz * ambientLight + getEmissionColor().xyz;
+    clampLightingResult(passLighting);
     shadowDiffuseLighting *= getDiffuseColor().xyz;
 #endif
 

From ce654b050494bca8100f5e2b643181ecc628e308 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Fri, 23 Apr 2021 19:21:33 +0200
Subject: [PATCH 0656/2859] Don't run `brew uninstall` outside of travis-ci

---
 CI/before_install.osx.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index 6dad0abc19..c03341b863 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -1,9 +1,9 @@
 #!/bin/sh -ex
 
 # workaround python issue on travis
-HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies python@3.8 || true
-HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies python@3.9 || true
-HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies qt@6 || true
+[-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
 
 # 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

From 6d351b2bddaea566066684157bbe285c712c8fac Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Wed, 21 Apr 2021 09:31:44 +0400
Subject: [PATCH 0657/2859] Fix MSVC 4706 warnings

---
 apps/openmw/mwrender/sky.cpp             |  3 ++-
 components/bsa/compressedbsafile.cpp     | 11 ++++++++++-
 components/interpreter/defines.cpp       |  3 ++-
 components/nifbullet/bulletnifloader.cpp |  3 +--
 components/nifosg/nifloader.cpp          |  6 +++---
 components/sceneutil/shadowsbin.cpp      |  3 ++-
 6 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index f0e8764709..67b24d60a4 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -1315,7 +1315,8 @@ public:
 
                     while (callback)
                     {
-                        if ((composite = dynamic_cast<SceneUtil::CompositeStateSetUpdater*>(callback)))
+                        composite = dynamic_cast<SceneUtil::CompositeStateSetUpdater*>(callback);
+                        if (composite)
                             break;
 
                         callback = callback->getNestedCallback();
diff --git a/components/bsa/compressedbsafile.cpp b/components/bsa/compressedbsafile.cpp
index 0f3a26e159..09a05d2f5f 100644
--- a/components/bsa/compressedbsafile.cpp
+++ b/components/bsa/compressedbsafile.cpp
@@ -35,7 +35,16 @@
 
 #include <boost/iostreams/filtering_streambuf.hpp>
 #include <boost/iostreams/copy.hpp>
-#include <boost/iostreams/filter/zlib.hpp>
+
+#if defined(_MSC_VER)
+    #pragma warning (push)
+    #pragma warning (disable : 4706)
+    #include <boost/iostreams/filter/zlib.hpp>
+    #pragma warning (pop)
+#else
+    #include <boost/iostreams/filter/zlib.hpp>
+#endif
+
 #include <boost/iostreams/device/array.hpp>
 #include <components/bsa/memorystream.hpp>
 
diff --git a/components/interpreter/defines.cpp b/components/interpreter/defines.cpp
index 0ceed80d53..d2e7067c6c 100644
--- a/components/interpreter/defines.cpp
+++ b/components/interpreter/defines.cpp
@@ -176,7 +176,8 @@ namespace Interpreter{
                                 transform(temp.begin(), temp.end(), temp.begin(), ::tolower);
                             }
 
-                            if((found = check(temp, globals[j], &i, &start))){
+                            found = check(temp, globals[j], &i, &start);
+                            if(found){
                                 char type = context.getGlobalType(globals[j]);
 
                                 switch(type){
diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index d72cef1940..72c740af38 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -126,8 +126,7 @@ osg::ref_ptr<Resource::BulletShape> BulletNifLoader::load(const Nif::File& nif)
     {
         Nif::Record* r = nif.getRoot(i);
         assert(r != nullptr);
-        Nif::Node* node = nullptr;
-        if ((node = dynamic_cast<Nif::Node*>(r)))
+        if (Nif::Node* node = dynamic_cast<Nif::Node*>(r))
             roots.emplace_back(node);
     }
     const std::string filename = nif.getFilename();
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 5f083f9253..49d52074a5 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -312,8 +312,7 @@ namespace NifOsg
             for (size_t i = 0; i < numRoots; ++i)
             {
                 const Nif::Record* r = nif->getRoot(i);
-                const Nif::Node* nifNode = nullptr;
-                if ((nifNode = dynamic_cast<const Nif::Node*>(r)))
+                if (const Nif::Node* nifNode = dynamic_cast<const Nif::Node*>(r))
                     roots.emplace_back(nifNode);
             }
             if (roots.empty())
@@ -609,7 +608,8 @@ namespace NifOsg
                 bool hasVisController = false;
                 for (Nif::ControllerPtr ctrl = nifNode->controller; !ctrl.empty(); ctrl = ctrl->next)
                 {
-                    if ((hasVisController |= (ctrl->recType == Nif::RC_NiVisController)))
+                    hasVisController |= (ctrl->recType == Nif::RC_NiVisController);
+                    if (hasVisController)
                         break;
                 }
 
diff --git a/components/sceneutil/shadowsbin.cpp b/components/sceneutil/shadowsbin.cpp
index 5a4096f5c3..abc1fa8b44 100644
--- a/components/sceneutil/shadowsbin.cpp
+++ b/components/sceneutil/shadowsbin.cpp
@@ -194,8 +194,9 @@ void ShadowsBin::sortImplementation()
     // noTestRoot is now a stategraph with useDiffuseMapForShadowAlpha disabled but minimal other state
 
     bool cullFaceOverridden = false;
-    while ((root = root->_parent))
+    while (root->_parent)
     {
+        root = root->_parent;
         if (!root->getStateSet())
             continue;
         unsigned int cullFaceFlags = root->getStateSet()->getMode(GL_CULL_FACE);

From 8aa76ff540c76d960e0b5238755c9af9cb2f7cef Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Wed, 21 Apr 2021 09:32:10 +0400
Subject: [PATCH 0658/2859] Use W4 instead of Wall for MSVC

---
 CMakeLists.txt | 51 ++------------------------------------------------
 1 file changed, 2 insertions(+), 49 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 281077567a..afd3894f13 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -575,63 +575,16 @@ if (WIN32)
 
     # Play a bit with the warning levels
 
-    set(WARNINGS "/Wall") # Since windows can only disable specific warnings, not enable them
+    set(WARNINGS "/W4")
 
     set(WARNINGS_DISABLE
-        # Warnings that aren't enabled normally and don't need to be enabled
-        # They're unneeded and sometimes completely retarded warnings that /Wall enables
-        # Not going to bother commenting them as they tend to warn on every standard library file
-        4061 4263 4264 4266 4350 4371 4435 4514 4548 4571 4582 4583 4610 4619 4623 4625
-        4626 4628 4640 4668 4710 4711 4768 4820 4826 4917 4946 5032 5039 5045 5219 5220
-
-        # Warnings that are thrown on standard libraries and not OpenMW
-        4347 # Non-template function with same name and parameter count as template function
-        4365 # Variable signed/unsigned mismatch
-        4510 4512 # Unable to generate copy constructor/assignment operator as it's not public in the base
-        4706 # Assignment in conditional expression
-        4738 # Storing 32-bit float result in memory, possible loss of performance
-        4774 # Format string expected in argument is not a string literal
-        4986 # Undocumented warning that occurs in the crtdbg.h file
-        4987 # nonstandard extension used (triggered by setjmp.h)
-        4996 # Function was declared deprecated
-
-        # caused by OSG
-        4589 # Constructor of abstract class 'osg::Operation' ignores initializer for virtual base class 'osg::Referenced' (False warning)
-
-        # caused by boost
-        4191 # 'type cast' : unsafe conversion (1.56, thread_primitives.hpp, normally off)
-        4643 # Forward declaring 'X' in namespace std is not permitted by the C++ Standard. (in *_std_fwd.h files)
-        5204 # Class has virtual functions, but its trivial destructor is not virtual
-
-        # caused by MyGUI
-        4297 # function assumed not to throw an exception but does
-
         # OpenMW specific warnings
-        4099 # Type mismatch, declared class or struct is defined with other type
         4100 # Unreferenced formal parameter (-Wunused-parameter)
-        4101 # Unreferenced local variable (-Wunused-variable)
         4127 # Conditional expression is constant
-        4242 # Storing value in a variable of a smaller type, possible loss of data
         4244 # Storing value of one type in variable of another (size_t in int, for example)
-        4245 # Signed/unsigned mismatch
         4267 # Conversion from 'size_t' to 'int', possible loss of data
-        4305 # Truncating value (double to float, for example)
-        4309 # Variable overflow, trying to store 128 in a signed char for example
-        4351 # New behavior: elements of array 'array' will be default initialized (desired behavior)
-        4355 # Using 'this' in member initialization list
-        4464 # relative include path contains '..'
-        4505 # Unreferenced local function has been removed
-        4701 # Potentially uninitialized local variable used
-        4702 # Unreachable code
-        4714 # function 'QString QString::trimmed(void) &&' marked as __forceinline not inlined
-        4800 # Boolean optimization warning, e.g. myBool = (myInt != 0) instead of myBool = myInt
-        )
-
-    if (MSVC_VERSION GREATER 1800)
-        set(WARNINGS_DISABLE ${WARNINGS_DISABLE} 5026 5027
-            5031 # #pragma warning(pop): likely mismatch, popping warning state pushed in different file (config_begin.hpp, config_end.hpp)
+        4996 # Function was declared deprecated
         )
-    endif()
     
     if( "${MyGUI_VERSION}" VERSION_LESS_EQUAL "3.4.0" )
         set(WARNINGS_DISABLE ${WARNINGS_DISABLE}

From 46e34c500c4b832a8fa740a93007cc9bdde4d50e Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 23 Apr 2021 23:57:58 +0200
Subject: [PATCH 0659/2859] Use algorithms to add/remove listener to SpellList

---
 apps/openmw/mwmechanics/spelllist.cpp | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/apps/openmw/mwmechanics/spelllist.cpp b/apps/openmw/mwmechanics/spelllist.cpp
index 891b286196..b87b985737 100644
--- a/apps/openmw/mwmechanics/spelllist.cpp
+++ b/apps/openmw/mwmechanics/spelllist.cpp
@@ -153,23 +153,15 @@ namespace MWMechanics
 
     void SpellList::addListener(Spells* spells)
     {
-        for(const auto ptr : mListeners)
-        {
-            if(ptr == spells)
-                return;
-        }
+        if (std::find(mListeners.begin(), mListeners.end(), spells) != mListeners.end())
+            return;
         mListeners.push_back(spells);
     }
 
     void SpellList::removeListener(Spells* spells)
     {
-        for(auto it = mListeners.begin(); it != mListeners.end(); it++)
-        {
-            if(*it == spells)
-            {
-                mListeners.erase(it);
-                break;
-            }
-        }
+        const auto it = std::find(mListeners.begin(), mListeners.end(), spells);
+        if (it != mListeners.end())
+            mListeners.erase(it);
     }
 }

From ca7add0624699736fd3d6c8b53b002e64a1bef1f Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 23 Apr 2021 23:48:55 +0200
Subject: [PATCH 0660/2859] Add move constructor to MWMechanics::Spells

---
 apps/openmw/mwmechanics/spelllist.cpp | 8 ++++++++
 apps/openmw/mwmechanics/spelllist.hpp | 2 ++
 apps/openmw/mwmechanics/spells.cpp    | 9 +++++++++
 apps/openmw/mwmechanics/spells.hpp    | 2 +-
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/spelllist.cpp b/apps/openmw/mwmechanics/spelllist.cpp
index b87b985737..d8fbcf25a4 100644
--- a/apps/openmw/mwmechanics/spelllist.cpp
+++ b/apps/openmw/mwmechanics/spelllist.cpp
@@ -164,4 +164,12 @@ namespace MWMechanics
         if (it != mListeners.end())
             mListeners.erase(it);
     }
+
+    void SpellList::updateListener(Spells* before, Spells* after)
+    {
+        const auto it = std::find(mListeners.begin(), mListeners.end(), before);
+        if (it == mListeners.end())
+            return mListeners.push_back(after);
+        *it = after;
+    }
 }
diff --git a/apps/openmw/mwmechanics/spelllist.hpp b/apps/openmw/mwmechanics/spelllist.hpp
index b01722fe81..c95ee812b6 100644
--- a/apps/openmw/mwmechanics/spelllist.hpp
+++ b/apps/openmw/mwmechanics/spelllist.hpp
@@ -61,6 +61,8 @@ namespace MWMechanics
 
             void removeListener(Spells* spells);
 
+            void updateListener(Spells* before, Spells* after);
+
             const std::vector<std::string> getSpells() const;
     };
 }
diff --git a/apps/openmw/mwmechanics/spells.cpp b/apps/openmw/mwmechanics/spells.cpp
index 0af74e01bd..b871376003 100644
--- a/apps/openmw/mwmechanics/spells.cpp
+++ b/apps/openmw/mwmechanics/spells.cpp
@@ -32,6 +32,15 @@ namespace MWMechanics
             mSpellList->addListener(this);
     }
 
+    Spells::Spells(Spells&& spells) : mSpellList(std::move(spells.mSpellList)), mSpells(std::move(spells.mSpells)),
+        mSelectedSpell(std::move(spells.mSelectedSpell)), mUsedPowers(std::move(spells.mUsedPowers)),
+        mSpellsChanged(std::move(spells.mSpellsChanged)), mEffects(std::move(spells.mEffects)),
+        mSourcedEffects(std::move(spells.mSourcedEffects))
+    {
+        if (mSpellList)
+            mSpellList->updateListener(&spells, this);
+    }
+
     std::map<const ESM::Spell*, SpellParams>::const_iterator Spells::begin() const
     {
         return mSpells.begin();
diff --git a/apps/openmw/mwmechanics/spells.hpp b/apps/openmw/mwmechanics/spells.hpp
index 3df89a5372..0553397952 100644
--- a/apps/openmw/mwmechanics/spells.hpp
+++ b/apps/openmw/mwmechanics/spells.hpp
@@ -59,7 +59,7 @@ namespace MWMechanics
 
             Spells(const Spells&);
 
-            Spells(const Spells&&) = delete;
+            Spells(Spells&& spells);
 
             ~Spells();
 

From e1d955d92b80dc26fd59f865467545aa1a7f2125 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 24 Apr 2021 00:16:57 +0200
Subject: [PATCH 0661/2859] Remove noexcept specifier from CreatureCustomData
 move ctor

C++17 doesn't allow to declare defaulted move ctor with not matching
exception specification to the calculated one:
/Users/eddie/Downloads/BUILD/openmw-master/apps/openmw/mwclass/creature.cpp:63:9: error:
      exception specification of explicitly defaulted move constructor does not
      match the calculated one
        CreatureCustomData(CreatureCustomData&& other) noexcept = default;
        ^

http://wg21.link/p1286r2 makes this possible in C++20 and newer compilers
already have it working even with -std=c++17 but older onces give an error.
---
 apps/openmw/mwclass/creature.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 6b8d2f3f25..5ce9a66ab7 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -60,7 +60,7 @@ namespace MWClass
 
         CreatureCustomData() = default;
         CreatureCustomData(const CreatureCustomData& other);
-        CreatureCustomData(CreatureCustomData&& other) noexcept = default;
+        CreatureCustomData(CreatureCustomData&& other) = default;
 
         CreatureCustomData& asCreatureCustomData() override
         {

From 2af40a1e13020173793d082b6783ae3638694387 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 24 Apr 2021 13:58:11 +0200
Subject: [PATCH 0662/2859] Revert "Build even more windows"

This reverts commit e3d3b97da04ca1622b29be555e77716182e79272.
---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index efc29e9cc1..688184afba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -277,6 +277,8 @@ Windows_Ninja_CS_RelWithDebInfo:
   - choco install python -y
   - refreshenv
   stage: build
+  rules:
+    - if: '$CI_PIPELINE_SOURCE != "schedule"'
   script:
     - $time = (Get-Date -Format "HH:mm:ss")
     - echo ${time}

From 0ac3f09fe02c03b2da8ec0f7ecf4935f0372bb8d Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 24 Apr 2021 13:58:32 +0200
Subject: [PATCH 0663/2859] Revert "Build windows in scheduled tasks"

This reverts commit 44ca708e12b923d056532e9a77f5350034011341.
---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 688184afba..f5c1fe2690 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -185,6 +185,8 @@ variables: &cs-targets
   - choco install python -y
   - refreshenv
   stage: build
+  rules:
+    - if: '$CI_PIPELINE_SOURCE != "schedule"'
   script:
     - $time = (Get-Date -Format "HH:mm:ss")
     - echo ${time}

From 9cadfbb6cd3d03a1a72526a1396fb5f1b079cc0d Mon Sep 17 00:00:00 2001
From: nighthawk469 <nick.crawford1234@gmail.com>
Date: Sun, 25 Apr 2021 13:26:50 +0000
Subject: [PATCH 0664/2859] Change travis script back to how it was. To avoid
 compiler error from old clang version.

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8d2ab43f32..d019b55268 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,9 +22,9 @@ addons:
     ]
 matrix:
   include:
-    - name: OpenMW (all) on MacOS 10.15 with Xcode 10.2
+    - name: OpenMW (all) on MacOS 10.15 with Xcode 11.6
       os: osx
-      osx_image: xcode10.2
+      osx_image: xcode11.6
     - name: OpenMW (all) on Ubuntu Focal with GCC
       os: linux
       dist: focal

From 4c96644f8db251ed4431b58b26008681dc78878a Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sun, 25 Apr 2021 19:57:09 +0200
Subject: [PATCH 0665/2859] Use a char instead of a string in find() where
 possible

This was done via PVS Studio ( https://pvs-studio.com ),
and should provide a super-duper-marginal performance boost \o/
---
 apps/openmw/mwgui/tooltips.cpp         | 2 +-
 apps/openmw/mwgui/windowmanagerimp.cpp | 5 +++--
 apps/openmw/mwmechanics/character.cpp  | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwgui/tooltips.cpp b/apps/openmw/mwgui/tooltips.cpp
index e0a8e4d3e0..c0694e403a 100644
--- a/apps/openmw/mwgui/tooltips.cpp
+++ b/apps/openmw/mwgui/tooltips.cpp
@@ -273,7 +273,7 @@ namespace MWGui
                         std::string widgetName = userStringPair.first.substr(underscorePos+1, userStringPair.first.size()-(underscorePos+1));
 
                         type = "Property";
-                        size_t caretPos = key.find("^");
+                        size_t caretPos = key.find('^');
                         if (caretPos != std::string::npos)
                         {
                             type = key.substr(0, caretPos);
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 2f9d357bde..68dd9faa3f 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -1017,8 +1017,9 @@ namespace MWGui
         if(tag.compare(0, MyGuiPrefixLength, MyGuiPrefix) == 0)
         {
             tag = tag.substr(MyGuiPrefixLength, tag.length());
-            std::string settingSection = tag.substr(0, tag.find(","));
-            std::string settingTag = tag.substr(tag.find(",")+1, tag.length());
+            size_t comma_pos = tag.find(',');
+            std::string settingSection = tag.substr(0, comma_pos);
+            std::string settingTag = tag.substr(comma_pos+1, tag.length());
             
             _result = Settings::Manager::getString(settingTag, settingSection);            
         }
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index b83d313ce8..6758df9c4a 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -966,7 +966,7 @@ void CharacterController::handleTextKey(const std::string &groupname, SceneUtil:
 
         // The event can optionally contain volume and pitch modifiers
         float volume=1.f, pitch=1.f;
-        if (soundgen.find(" ") != std::string::npos)
+        if (soundgen.find(' ') != std::string::npos)
         {
             std::vector<std::string> tokens;
             split(soundgen, ' ', tokens);

From e3bb45fd61f1d9f5c1015b7a015ad06ab889d1cc Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alex462002@gmail.com>
Date: Sun, 25 Apr 2021 21:58:48 +0000
Subject: [PATCH 0666/2859] Merge branch 'minor_aicombat' into 'master'

Minor optimization in aicombat.cpp

See merge request OpenMW/openmw!737

(cherry picked from commit f1d19035cccfff2523faad0d4e4d96cd3ddae2e6)

bbbfc520 Minor optimization in aicombat.cpp
237b34a6 Fix style
a14911cb Fix indentation
---
 apps/openmw/mwmechanics/aicombat.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index b5e7594f32..f6123c12c0 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -715,16 +715,18 @@ osg::Vec3f AimDirToMovingTarget(const MWWorld::Ptr& actor, const MWWorld::Ptr& t
     float t_collision;
 
     float projVelDirSquared = projSpeed * projSpeed - velPerp * velPerp;
+    if (projVelDirSquared > 0)
+    {
+        osg::Vec3f vTargetMoveDirNormalized = vTargetMoveDir;
+        vTargetMoveDirNormalized.normalize();
 
-    osg::Vec3f vTargetMoveDirNormalized = vTargetMoveDir;
-    vTargetMoveDirNormalized.normalize();
-
-    float projDistDiff = vDirToTarget * vTargetMoveDirNormalized; // dot product
-    projDistDiff = std::sqrt(distToTarget * distToTarget - projDistDiff * projDistDiff);
+        float projDistDiff = vDirToTarget * vTargetMoveDirNormalized; // dot product
+        projDistDiff = std::sqrt(distToTarget * distToTarget - projDistDiff * projDistDiff);
 
-    if (projVelDirSquared > 0)
         t_collision = projDistDiff / (std::sqrt(projVelDirSquared) - velDir);
-    else t_collision = 0; // speed of projectile is not enough to reach moving target
+    }
+    else
+        t_collision = 0; // speed of projectile is not enough to reach moving target
 
     return vDirToTarget + vTargetMoveDir * t_collision;
 }

From abb120b439925ea672f9f02e682d136ab0f93bc0 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Tue, 27 Apr 2021 14:57:07 +0200
Subject: [PATCH 0667/2859] Don't log a warning for reading to the end of the
 subrecord

---
 components/esm/loadscpt.cpp | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/components/esm/loadscpt.cpp b/components/esm/loadscpt.cpp
index 04738b64ea..1ad90dbc31 100644
--- a/components/esm/loadscpt.cpp
+++ b/components/esm/loadscpt.cpp
@@ -61,15 +61,18 @@ namespace ESM
             str += mVarNames[i].size() + 1;
             if (str >= tmpEnd)
             {
-                // SCVR subrecord is unused and variable names are determined
-                // from the script source, so an overflow is not fatal.
-                std::stringstream ss;
-                ss << "String table overflow";
-                ss << "\n  File: " << esm.getName();
-                ss << "\n  Record: " << esm.getContext().recName.toString();
-                ss << "\n  Subrecord: " << "SCVR";
-                ss << "\n  Offset: 0x" << std::hex << esm.getFileOffset();
-                Log(Debug::Verbose) << ss.str();
+                if(str > tmpEnd)
+                {
+                    // SCVR subrecord is unused and variable names are determined
+                    // from the script source, so an overflow is not fatal.
+                    std::stringstream ss;
+                    ss << "String table overflow";
+                    ss << "\n  File: " << esm.getName();
+                    ss << "\n  Record: " << esm.getContext().recName.toString();
+                    ss << "\n  Subrecord: " << "SCVR";
+                    ss << "\n  Offset: 0x" << std::hex << esm.getFileOffset();
+                    Log(Debug::Verbose) << ss.str();
+                }
                 // Get rid of empty strings in the list.
                 mVarNames.resize(i+1);
                 break;

From a8c5fc74d1cf431522d40758e7600b6465c6529f Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Wed, 28 Apr 2021 06:51:15 +0000
Subject: [PATCH 0668/2859] Massively simplify the worst Bash ever

---
 CI/activate_msvc.sh | 54 ++++-----------------------------------------
 1 file changed, 4 insertions(+), 50 deletions(-)

diff --git a/CI/activate_msvc.sh b/CI/activate_msvc.sh
index 47f2c246f0..233f017433 100644
--- a/CI/activate_msvc.sh
+++ b/CI/activate_msvc.sh
@@ -30,55 +30,11 @@ command -v unixPathAsWindows >/dev/null 2>&1 || function unixPathAsWindows {
 	fi
 }
 
-function windowsSystemPathAsUnix {
-	if command -v cygpath >/dev/null 2>&1; then
-		cygpath -u -p $1
-	else
-		IFS=';' read -r -a paths <<< "$1"
-		declare -a convertedPaths
-		for entry in paths; do
-			convertedPaths+=(windowsPathAsUnix $entry)
-		done
-		convertedPath=printf ":%s" ${convertedPaths[@]}
-		echo ${convertedPath:1}
-	fi
-}
-
-# capture CMD environment so we know what's been changed
-declare -A originalCmdEnv
-originalIFS="$IFS"
-IFS=$'\n\r'
-for pair in $(cmd //c "set"); do
-    IFS='=' read -r -a separatedPair <<< "${pair}"
-    if [ ${#separatedPair[@]} -ne 2 ]; then
-        echo "Parsed '$pair' as ${#separatedPair[@]} parts, expected 2."
-        continue
-    fi
-    originalCmdEnv["${separatedPair[0]}"]="${separatedPair[1]}"
-done
 
 # capture CMD environment in a shell with MSVC activated
-cmdEnv="$(cmd //c "$(unixPathAsWindows "$(dirname "${BASH_SOURCE[0]}")")\ActivateMSVC.bat" "&&" set)"
-
-declare -A cmdEnvChanges
-for pair in $cmdEnv; do
-    if [ -n "$pair" ]; then
-        IFS='=' read -r -a separatedPair <<< "${pair}"
-        if [ ${#separatedPair[@]} -ne 2 ]; then
-            echo "Parsed '$pair' as ${#separatedPair[@]} parts, expected 2."
-            continue
-        fi
-        key="${separatedPair[0]}"
-        value="${separatedPair[1]}"
-        if ! [ ${originalCmdEnv[$key]+_} ] || [ "${originalCmdEnv[$key]}" != "$value" ]; then
-            if [ $key != 'PATH' ] && [ $key != 'path' ] && [ $key != 'Path' ]; then
-                export "$key=$value"
-            else
-                export PATH=$(windowsSystemPathAsUnix $value)
-            fi
-        fi
-    fi
-done
+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
 
@@ -93,6 +49,4 @@ if [ $MISSINGTOOLS -ne 0 ]; then
     return 1
 fi
 
-IFS="$originalIFS"
-
-restoreOldSettings
\ No newline at end of file
+restoreOldSettings

From 0bc0cfce5f61ccd3aa3d39a23ec8cd14950d04e1 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Wed, 28 Apr 2021 11:38:27 +0400
Subject: [PATCH 0669/2859] Declare separate constructors with const reference
 and rvalue arguments for OscillatingRecastMeshObject

---
 .../detournavigator/oscillatingrecastmeshobject.cpp      | 9 ++++++++-
 .../detournavigator/oscillatingrecastmeshobject.hpp      | 3 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/components/detournavigator/oscillatingrecastmeshobject.cpp b/components/detournavigator/oscillatingrecastmeshobject.cpp
index dd0b956003..5b84231838 100644
--- a/components/detournavigator/oscillatingrecastmeshobject.cpp
+++ b/components/detournavigator/oscillatingrecastmeshobject.cpp
@@ -4,13 +4,20 @@
 
 namespace DetourNavigator
 {
-    OscillatingRecastMeshObject::OscillatingRecastMeshObject(RecastMeshObject impl, std::size_t lastChangeRevision)
+    OscillatingRecastMeshObject::OscillatingRecastMeshObject(RecastMeshObject&& impl, std::size_t lastChangeRevision)
         : mImpl(std::move(impl))
         , mLastChangeRevision(lastChangeRevision)
         , mAabb(BulletHelpers::getAabb(mImpl.getShape(), mImpl.getTransform()))
     {
     }
 
+    OscillatingRecastMeshObject::OscillatingRecastMeshObject(const RecastMeshObject& impl, std::size_t lastChangeRevision)
+        : mImpl(impl)
+        , mLastChangeRevision(lastChangeRevision)
+        , mAabb(BulletHelpers::getAabb(mImpl.getShape(), mImpl.getTransform()))
+    {
+    }
+
     bool OscillatingRecastMeshObject::update(const btTransform& transform, const AreaType areaType,
                                              std::size_t lastChangeRevision)
     {
diff --git a/components/detournavigator/oscillatingrecastmeshobject.hpp b/components/detournavigator/oscillatingrecastmeshobject.hpp
index 476fd4e0df..78a0c4b689 100644
--- a/components/detournavigator/oscillatingrecastmeshobject.hpp
+++ b/components/detournavigator/oscillatingrecastmeshobject.hpp
@@ -12,7 +12,8 @@ namespace DetourNavigator
     class OscillatingRecastMeshObject
     {
         public:
-            explicit OscillatingRecastMeshObject(RecastMeshObject impl, std::size_t lastChangeRevision);
+            explicit OscillatingRecastMeshObject(RecastMeshObject&& impl, std::size_t lastChangeRevision);
+            explicit OscillatingRecastMeshObject(const RecastMeshObject& impl, std::size_t lastChangeRevision);
 
             bool update(const btTransform& transform, const AreaType areaType, std::size_t lastChangeRevision);
 

From b5c132d56f0cc65b96f724b433833902b2c50479 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Thu, 29 Apr 2021 10:47:14 +0200
Subject: [PATCH 0670/2859] Build everything during the coverity scan

This should fix the 404 on the download page
---
 .gitlab-ci.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f5c1fe2690..c7a1a403fe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,8 +16,6 @@ stages:
     - apt-cache/
     - ccache/
   stage: build
-  rules:
-    - if: '$CI_PIPELINE_SOURCE != "schedule"'
   script:
     - export CCACHE_BASEDIR="`pwd`"
     - export CCACHE_DIR="`pwd`/ccache" && mkdir -pv "$CCACHE_DIR"
@@ -185,8 +183,6 @@ variables: &cs-targets
   - choco install python -y
   - refreshenv
   stage: build
-  rules:
-    - if: '$CI_PIPELINE_SOURCE != "schedule"'
   script:
     - $time = (Get-Date -Format "HH:mm:ss")
     - echo ${time}
@@ -279,8 +275,6 @@ Windows_Ninja_CS_RelWithDebInfo:
   - choco install python -y
   - refreshenv
   stage: build
-  rules:
-    - if: '$CI_PIPELINE_SOURCE != "schedule"'
   script:
     - $time = (Get-Date -Format "HH:mm:ss")
     - echo ${time}

From 9f314d1d6f44689b3f948cc0949df744f51fc257 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Thu, 29 Apr 2021 12:11:49 -0700
Subject: [PATCH 0671/2859] Fix ToggleBorders

---
 components/sceneutil/lightmanager.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index f68990aa01..b5c7af780c 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -715,11 +715,10 @@ namespace SceneUtil
         {
             static const std::string dummyVertSource = generateDummyShader(mLightManager->getMaxLightsInScene());
 
-            mDummyProgram->addShader(new osg::Shader(osg::Shader::VERTEX, dummyVertSource));
-            mDummyProgram->addBindUniformBlock("LightBufferBinding", static_cast<int>(Shader::UBOBinding::LightBuffer));
             // Needed to query the layout of the buffer object. The layout specifier needed to use the std140 layout is not reliably
             // available, regardless of extensions, until GLSL 140.
-            mLightManager->getOrCreateStateSet()->setAttributeAndModes(mDummyProgram, osg::StateAttribute::ON);
+            mDummyProgram->addShader(new osg::Shader(osg::Shader::VERTEX, dummyVertSource));
+            mDummyProgram->addBindUniformBlock("LightBufferBinding", static_cast<int>(Shader::UBOBinding::LightBuffer));
         }
 
         LightManagerStateAttribute(const LightManagerStateAttribute& copy, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY)
@@ -763,6 +762,7 @@ namespace SceneUtil
         {
             if (!mInitLayout)
             {
+                mDummyProgram->apply(state);
                 auto handle = mDummyProgram->getPCP(state)->getHandle();
                 auto* ext = state.get<osg::GLExtensions>();
 

From ceb6a280ff7d72a7408b577a0098851da166e7c0 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Thu, 29 Apr 2021 21:35:31 +0000
Subject: [PATCH 0672/2859] Fix typo

Hopefully this will actually let us make better use of shadow bounds,
but I wouldn't count on it.
---
 components/sceneutil/mwshadowtechnique.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
index 89e001a980..bf6581ae60 100644
--- a/components/sceneutil/mwshadowtechnique.cpp
+++ b/components/sceneutil/mwshadowtechnique.cpp
@@ -2113,7 +2113,7 @@ struct ConvexHull
                 if (edge.first == vertex)
                     otherEnd = edge.second;
                 else if (edge.second == vertex)
-                    otherEnd - edge.first;
+                    otherEnd = edge.first;
                 else
                     continue;
 

From 24f4bf9c28eec36ddb9c4adbd6af46d887674ded Mon Sep 17 00:00:00 2001
From: Dobrohotov Alexei <alexdobrohotov@yandex.ru>
Date: Fri, 30 Apr 2021 12:36:16 +0300
Subject: [PATCH 0673/2859] Fix NiUVController UV offset calculations (bug
 #5995)

---
 CHANGELOG.md                     |  1 +
 components/nifosg/controller.cpp | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dec5e1e7f0..87009f58d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -118,6 +118,7 @@
     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 #5995: NiUVController doesn't calculate the UV offset properly
     Feature #390: 3rd person look "over the shoulder"
     Feature #832: OpenMW-CS: Handle deleted references
     Feature #1536: Show more information about level on menu
diff --git a/components/nifosg/controller.cpp b/components/nifosg/controller.cpp
index 31fd92b43e..7f4bdcef21 100644
--- a/components/nifosg/controller.cpp
+++ b/components/nifosg/controller.cpp
@@ -282,14 +282,17 @@ void UVController::apply(osg::StateSet* stateset, osg::NodeVisitor* nv)
         float uScale = mUScale.interpKey(value);
         float vScale = mVScale.interpKey(value);
 
-        osg::Matrix flipMat;
-        flipMat.preMultTranslate(osg::Vec3f(0,1,0));
-        flipMat.preMultScale(osg::Vec3f(1,-1,1));
-
+        // First scale the UV relative to (0,0),
+        // then offset the UV to change the scaling origin to its center.
         osg::Matrixf mat = osg::Matrixf::scale(uScale, vScale, 1);
-        mat.setTrans(uTrans, vTrans, 0);
-
-        mat = flipMat * mat * flipMat;
+        float uOffset = 0.5f * (1.f - uScale);
+        float vOffset = 0.5f * (1.f - vScale);
+        // Apply the original offsets:
+        // U offset is supposed to be subtracted regardless of the graphics library,
+        // while V offset is made negative to account for OpenGL's Y axis convention.
+        uOffset -= uTrans;
+        vOffset -= vTrans;
+        mat.setTrans(uOffset, vOffset, 0);
 
         // setting once is enough because all other texture units share the same TexMat (see setDefaults).
         if (!mTextureUnits.empty())

From 5f65583a3a4e434c693f251585764a05162e3165 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Fri, 30 Apr 2021 12:04:41 +0000
Subject: [PATCH 0674/2859] Fix a heap overflow in loadpgrd.cpp

---
 components/esm/loadpgrd.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/esm/loadpgrd.cpp b/components/esm/loadpgrd.cpp
index 708685e727..9abeba2605 100644
--- a/components/esm/loadpgrd.cpp
+++ b/components/esm/loadpgrd.cpp
@@ -100,6 +100,8 @@ namespace ESM
                         for(PointList::const_iterator it = mPoints.begin(); it != mPoints.end(); ++it, ++pointIndex)
                         {
                             unsigned char connectionNum = (*it).mConnectionNum;
+                            if (rawConnections.end() - rawIt < connectionNum)
+                                esm.fail("Not enough connections");
                             for (int i = 0; i < connectionNum; ++i) {
                                 Edge edge;
                                 edge.mV0 = pointIndex;

From 971ba81ed279f97b2116540d3217a041d6cdb66a Mon Sep 17 00:00:00 2001
From: Dobrohotov Alexei <alexdobrohotov@yandex.ru>
Date: Fri, 30 Apr 2021 18:23:04 +0300
Subject: [PATCH 0675/2859] Use higher level transformations in UVController

---
 components/nifosg/controller.cpp | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/components/nifosg/controller.cpp b/components/nifosg/controller.cpp
index 7f4bdcef21..d48c55ad7d 100644
--- a/components/nifosg/controller.cpp
+++ b/components/nifosg/controller.cpp
@@ -277,22 +277,18 @@ void UVController::apply(osg::StateSet* stateset, osg::NodeVisitor* nv)
     if (hasInput())
     {
         float value = getInputValue(nv);
-        float uTrans = mUTrans.interpKey(value);
-        float vTrans = mVTrans.interpKey(value);
-        float uScale = mUScale.interpKey(value);
-        float vScale = mVScale.interpKey(value);
-
-        // First scale the UV relative to (0,0),
-        // then offset the UV to change the scaling origin to its center.
-        osg::Matrixf mat = osg::Matrixf::scale(uScale, vScale, 1);
-        float uOffset = 0.5f * (1.f - uScale);
-        float vOffset = 0.5f * (1.f - vScale);
-        // Apply the original offsets:
-        // U offset is supposed to be subtracted regardless of the graphics library,
-        // while V offset is made negative to account for OpenGL's Y axis convention.
-        uOffset -= uTrans;
-        vOffset -= vTrans;
-        mat.setTrans(uOffset, vOffset, 0);
+
+        // First scale the UV relative to its center, then apply the offset.
+        // U offset is flipped regardless of the graphics library,
+        // while V offset is flipped to account for OpenGL Y axis convention.
+        osg::Vec3f uvOrigin(0.5f, 0.5f, 0.f);
+        osg::Vec3f uvScale(mUScale.interpKey(value), mVScale.interpKey(value), 1.f);
+        osg::Vec3f uvTrans(-mUTrans.interpKey(value), -mVTrans.interpKey(value), 0.f);
+
+        osg::Matrixf mat = osg::Matrixf::translate(uvOrigin);
+        mat.preMultScale(uvScale);
+        mat.preMultTranslate(-uvOrigin);
+        mat.setTrans(mat.getTrans() + uvTrans);
 
         // setting once is enough because all other texture units share the same TexMat (see setDefaults).
         if (!mTextureUnits.empty())

From 04edb1c817d81c0a8559bcd88ea4e376f6df5832 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Fri, 30 Apr 2021 19:39:26 +0200
Subject: [PATCH 0676/2859] Trim down some internal includes

---
 apps/openmw/mwclass/creature.cpp          | 1 -
 apps/openmw/mwclass/npc.cpp               | 1 -
 apps/openmw/mwdialogue/journalimp.hpp     | 1 -
 apps/openmw/mwgui/itemmodel.cpp           | 1 -
 apps/openmw/mwgui/levelupdialog.cpp       | 1 -
 apps/openmw/mwgui/loadingscreen.cpp       | 2 --
 apps/openmw/mwgui/pickpocketitemmodel.cpp | 1 -
 apps/openmw/mwgui/quickkeysmenu.hpp       | 2 --
 apps/openmw/mwgui/recharge.cpp            | 1 -
 apps/openmw/mwgui/spellwindow.hpp         | 1 -
 apps/openmw/mwgui/tradewindow.cpp         | 1 -
 11 files changed, 13 deletions(-)

diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 5ce9a66ab7..acf969bd3a 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -25,7 +25,6 @@
 #include "../mwworld/failedaction.hpp"
 #include "../mwworld/customdata.hpp"
 #include "../mwworld/containerstore.hpp"
-#include "../mwphysics/physicssystem.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/localscripts.hpp"
 
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index c5b352cb42..933ba5cd38 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -35,7 +35,6 @@
 #include "../mwworld/failedaction.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/customdata.hpp"
-#include "../mwphysics/physicssystem.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/localscripts.hpp"
 
diff --git a/apps/openmw/mwdialogue/journalimp.hpp b/apps/openmw/mwdialogue/journalimp.hpp
index a6501e54e1..0c778d2ba2 100644
--- a/apps/openmw/mwdialogue/journalimp.hpp
+++ b/apps/openmw/mwdialogue/journalimp.hpp
@@ -3,7 +3,6 @@
 
 #include "../mwbase/journal.hpp"
 
-#include "journalentry.hpp"
 #include "quest.hpp"
 
 namespace MWDialogue
diff --git a/apps/openmw/mwgui/itemmodel.cpp b/apps/openmw/mwgui/itemmodel.cpp
index cf88efaaed..4e4d77da47 100644
--- a/apps/openmw/mwgui/itemmodel.cpp
+++ b/apps/openmw/mwgui/itemmodel.cpp
@@ -2,7 +2,6 @@
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
-#include "../mwworld/esmstore.hpp"
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
diff --git a/apps/openmw/mwgui/levelupdialog.cpp b/apps/openmw/mwgui/levelupdialog.cpp
index 86f92db6f6..14de3fd274 100644
--- a/apps/openmw/mwgui/levelupdialog.cpp
+++ b/apps/openmw/mwgui/levelupdialog.cpp
@@ -12,7 +12,6 @@
 #include "../mwbase/soundmanager.hpp"
 
 #include "../mwworld/class.hpp"
-#include "../mwworld/cellstore.hpp"
 
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/npcstats.hpp"
diff --git a/apps/openmw/mwgui/loadingscreen.cpp b/apps/openmw/mwgui/loadingscreen.cpp
index aeaacaa638..65d49ffc9c 100644
--- a/apps/openmw/mwgui/loadingscreen.cpp
+++ b/apps/openmw/mwgui/loadingscreen.cpp
@@ -25,8 +25,6 @@
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/inputmanager.hpp"
 
-#include "../mwrender/vismask.hpp"
-
 #include "backgroundimage.hpp"
 
 namespace MWGui
diff --git a/apps/openmw/mwgui/pickpocketitemmodel.cpp b/apps/openmw/mwgui/pickpocketitemmodel.cpp
index b4de5cb502..5daea8f3f8 100644
--- a/apps/openmw/mwgui/pickpocketitemmodel.cpp
+++ b/apps/openmw/mwgui/pickpocketitemmodel.cpp
@@ -7,7 +7,6 @@
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/pickpocket.hpp"
 
-#include "../mwworld/containerstore.hpp"
 #include "../mwworld/class.hpp"
 
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwgui/quickkeysmenu.hpp b/apps/openmw/mwgui/quickkeysmenu.hpp
index d0e9509798..b2742df796 100644
--- a/apps/openmw/mwgui/quickkeysmenu.hpp
+++ b/apps/openmw/mwgui/quickkeysmenu.hpp
@@ -1,8 +1,6 @@
 #ifndef MWGUI_QUICKKEYS_H
 #define MWGUI_QUICKKEYS_H
 
-#include "../mwworld/ptr.hpp"
-
 #include "windowbase.hpp"
 
 #include "spellmodel.hpp"
diff --git a/apps/openmw/mwgui/recharge.cpp b/apps/openmw/mwgui/recharge.cpp
index f8d89c0cb2..1bf3b24ee8 100644
--- a/apps/openmw/mwgui/recharge.cpp
+++ b/apps/openmw/mwgui/recharge.cpp
@@ -15,7 +15,6 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
 
-#include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/recharge.hpp"
 
diff --git a/apps/openmw/mwgui/spellwindow.hpp b/apps/openmw/mwgui/spellwindow.hpp
index cf5e88f8e0..786a7d877f 100644
--- a/apps/openmw/mwgui/spellwindow.hpp
+++ b/apps/openmw/mwgui/spellwindow.hpp
@@ -2,7 +2,6 @@
 #define MWGUI_SPELLWINDOW_H
 
 #include "windowpinnablebase.hpp"
-#include "../mwworld/ptr.hpp"
 
 #include "spellmodel.hpp"
 
diff --git a/apps/openmw/mwgui/tradewindow.cpp b/apps/openmw/mwgui/tradewindow.cpp
index 81d6a8ab30..19ea383483 100644
--- a/apps/openmw/mwgui/tradewindow.cpp
+++ b/apps/openmw/mwgui/tradewindow.cpp
@@ -26,7 +26,6 @@
 #include "containeritemmodel.hpp"
 #include "tradeitemmodel.hpp"
 #include "countdialog.hpp"
-#include "controllers.hpp"
 #include "tooltips.hpp"
 
 namespace

From ee2446d5c4c244864afc96c2a4a8fdc4d5444102 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Fri, 30 Apr 2021 20:11:41 +0200
Subject: [PATCH 0677/2859] Trim even more

---
 apps/openmw/mwinput/inputmanagerimp.cpp    | 1 -
 apps/openmw/mwinput/keyboardmanager.hpp    | 1 -
 apps/openmw/mwmechanics/activespells.hpp   | 1 -
 apps/openmw/mwmechanics/actors.cpp         | 1 -
 apps/openmw/mwmechanics/aicombat.hpp       | 1 -
 apps/openmw/mwmechanics/aicombataction.hpp | 2 --
 apps/openmw/mwmechanics/aifollow.hpp       | 2 --
 apps/openmw/mwmechanics/aipackage.cpp      | 3 ---
 apps/openmw/mwmechanics/aipursue.cpp       | 1 -
 apps/openmw/mwmechanics/aiwander.cpp       | 1 -
 apps/openmw/mwmechanics/aiwander.hpp       | 2 --
 apps/openmw/mwmechanics/alchemy.cpp        | 1 -
 apps/openmw/mwmechanics/character.hpp      | 2 --
 13 files changed, 19 deletions(-)

diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index 690183c576..436eab7ad3 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -5,7 +5,6 @@
 #include <components/sdlutil/sdlinputwrapper.hpp>
 #include <components/esm/esmwriter.hpp>
 #include <components/esm/esmreader.hpp>
-#include <components/esm/controlsstate.hpp>
 
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwinput/keyboardmanager.hpp b/apps/openmw/mwinput/keyboardmanager.hpp
index f97f6b9e60..ca58461a20 100644
--- a/apps/openmw/mwinput/keyboardmanager.hpp
+++ b/apps/openmw/mwinput/keyboardmanager.hpp
@@ -1,7 +1,6 @@
 #ifndef MWINPUT_MWKEYBOARDMANAGER_H
 #define MWINPUT_MWKEYBOARDMANAGER_H
 
-#include <components/settings/settings.hpp>
 #include <components/sdlutil/events.hpp>
 
 namespace MWInput
diff --git a/apps/openmw/mwmechanics/activespells.hpp b/apps/openmw/mwmechanics/activespells.hpp
index 4d36c717e4..54f662fc26 100644
--- a/apps/openmw/mwmechanics/activespells.hpp
+++ b/apps/openmw/mwmechanics/activespells.hpp
@@ -5,7 +5,6 @@
 #include <vector>
 #include <string>
 
-#include <components/esm/defs.hpp>
 #include <components/esm/activespells.hpp>
 
 #include "../mwworld/timestamp.hpp"
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index e9467a6798..95633bd00f 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -40,7 +40,6 @@
 #include "aiwander.hpp"
 #include "actor.hpp"
 #include "summoning.hpp"
-#include "combat.hpp"
 #include "actorutil.hpp"
 #include "tickableeffects.hpp"
 
diff --git a/apps/openmw/mwmechanics/aicombat.hpp b/apps/openmw/mwmechanics/aicombat.hpp
index 0f42c6e2d1..5425f1af0b 100644
--- a/apps/openmw/mwmechanics/aicombat.hpp
+++ b/apps/openmw/mwmechanics/aicombat.hpp
@@ -9,7 +9,6 @@
 
 #include "pathfinding.hpp"
 #include "movement.hpp"
-#include "obstacle.hpp"
 #include "aitimer.hpp"
 
 namespace ESM
diff --git a/apps/openmw/mwmechanics/aicombataction.hpp b/apps/openmw/mwmechanics/aicombataction.hpp
index 77a19f8044..d17d5a3137 100644
--- a/apps/openmw/mwmechanics/aicombataction.hpp
+++ b/apps/openmw/mwmechanics/aicombataction.hpp
@@ -3,8 +3,6 @@
 
 #include <memory>
 
-#include <components/esm/loadspel.hpp>
-
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/containerstore.hpp"
 
diff --git a/apps/openmw/mwmechanics/aifollow.hpp b/apps/openmw/mwmechanics/aifollow.hpp
index e6aeebb246..c4ac5eb3f2 100644
--- a/apps/openmw/mwmechanics/aifollow.hpp
+++ b/apps/openmw/mwmechanics/aifollow.hpp
@@ -9,8 +9,6 @@
 
 #include "../mwworld/ptr.hpp"
 
-#include "pathfinding.hpp"
-
 namespace ESM
 {
 namespace AiSequence
diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index 204cf2f3f4..a7e8e74b0d 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -2,7 +2,6 @@
 
 #include <components/esm/loadcell.hpp>
 #include <components/esm/loadland.hpp>
-#include <components/esm/loadmgef.hpp>
 #include <components/detournavigator/navigator.hpp>
 #include <components/misc/coordinateconverter.hpp>
 #include <components/settings/settings.hpp>
@@ -15,8 +14,6 @@
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/inventorystore.hpp"
 
-#include "../mwphysics/collisiontype.hpp"
-
 #include "pathgrid.hpp"
 #include "creaturestats.hpp"
 #include "movement.hpp"
diff --git a/apps/openmw/mwmechanics/aipursue.cpp b/apps/openmw/mwmechanics/aipursue.cpp
index 5af73887cb..05605529ad 100644
--- a/apps/openmw/mwmechanics/aipursue.cpp
+++ b/apps/openmw/mwmechanics/aipursue.cpp
@@ -8,7 +8,6 @@
 #include "../mwbase/world.hpp"
 
 #include "../mwworld/class.hpp"
-#include "../mwworld/action.hpp"
 
 #include "movement.hpp"
 #include "creaturestats.hpp"
diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 72b8757bff..01088d967b 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -11,7 +11,6 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
-#include "../mwbase/dialoguemanager.hpp"
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
diff --git a/apps/openmw/mwmechanics/aiwander.hpp b/apps/openmw/mwmechanics/aiwander.hpp
index 52a926d143..db8701c74a 100644
--- a/apps/openmw/mwmechanics/aiwander.hpp
+++ b/apps/openmw/mwmechanics/aiwander.hpp
@@ -5,8 +5,6 @@
 
 #include <vector>
 
-#include "../mwworld/timestamp.hpp"
-
 #include "pathfinding.hpp"
 #include "obstacle.hpp"
 #include "aistate.hpp"
diff --git a/apps/openmw/mwmechanics/alchemy.cpp b/apps/openmw/mwmechanics/alchemy.cpp
index 6d06724f00..61fec3b543 100644
--- a/apps/openmw/mwmechanics/alchemy.cpp
+++ b/apps/openmw/mwmechanics/alchemy.cpp
@@ -21,7 +21,6 @@
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
-#include "../mwworld/manualref.hpp"
 
 #include "magiceffects.hpp"
 #include "creaturestats.hpp"
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index 0821b32250..3f7fa4e1bd 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -3,8 +3,6 @@
 
 #include <deque>
 
-#include <components/esm/loadmgef.hpp>
-
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/containerstore.hpp"
 

From be371ccd9f8f6aeec7b9fc2e4bcead3929bca7a0 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Fri, 30 Apr 2021 20:27:33 +0200
Subject: [PATCH 0678/2859] An another pass

---
 apps/openmw/mwmechanics/creaturestats.cpp     | 1 -
 apps/openmw/mwmechanics/pathfinding.cpp       | 1 -
 apps/openmw/mwmechanics/spellcasting.hpp      | 1 -
 apps/openmw/mwmechanics/spelllist.cpp         | 1 -
 apps/openmw/mwmechanics/spellpriority.cpp     | 1 -
 apps/openmw/mwmechanics/weaponpriority.cpp    | 1 -
 apps/openmw/mwmechanics/weapontype.hpp        | 2 --
 apps/openmw/mwphysics/actorconvexcallback.cpp | 1 -
 apps/openmw/mwphysics/physicssystem.cpp       | 2 --
 apps/openmw/mwphysics/projectile.cpp          | 3 ---
 apps/openmw/mwphysics/projectile.hpp          | 2 --
 11 files changed, 16 deletions(-)

diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index 1d5fe8347e..4bc0b9a581 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -11,7 +11,6 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
-#include "../mwbase/mechanicsmanager.hpp"
 
 namespace MWMechanics
 {
diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp
index 781b897a73..3f113802f8 100644
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@@ -3,7 +3,6 @@
 #include <iterator>
 #include <limits>
 
-#include <components/detournavigator/exceptions.hpp>
 #include <components/detournavigator/debug.hpp>
 #include <components/detournavigator/navigator.hpp>
 #include <components/debug/debuglog.hpp>
diff --git a/apps/openmw/mwmechanics/spellcasting.hpp b/apps/openmw/mwmechanics/spellcasting.hpp
index 45431bbc6a..cc525d2db6 100644
--- a/apps/openmw/mwmechanics/spellcasting.hpp
+++ b/apps/openmw/mwmechanics/spellcasting.hpp
@@ -2,7 +2,6 @@
 #define MWMECHANICS_SPELLCASTING_H
 
 #include <components/esm/effectlist.hpp>
-#include <components/esm/loadmgef.hpp>
 
 #include "../mwworld/ptr.hpp"
 
diff --git a/apps/openmw/mwmechanics/spelllist.cpp b/apps/openmw/mwmechanics/spelllist.cpp
index d8fbcf25a4..24a04788e1 100644
--- a/apps/openmw/mwmechanics/spelllist.cpp
+++ b/apps/openmw/mwmechanics/spelllist.cpp
@@ -3,7 +3,6 @@
 #include <algorithm>
 
 #include <components/esm/loadspel.hpp>
-#include <components/misc/rng.hpp>
 
 #include "spells.hpp"
 
diff --git a/apps/openmw/mwmechanics/spellpriority.cpp b/apps/openmw/mwmechanics/spellpriority.cpp
index 81658193d6..bd9c5f7cb3 100644
--- a/apps/openmw/mwmechanics/spellpriority.cpp
+++ b/apps/openmw/mwmechanics/spellpriority.cpp
@@ -17,7 +17,6 @@
 #include "creaturestats.hpp"
 #include "spellresistance.hpp"
 #include "weapontype.hpp"
-#include "combat.hpp"
 #include "summoning.hpp"
 #include "spellutil.hpp"
 
diff --git a/apps/openmw/mwmechanics/weaponpriority.cpp b/apps/openmw/mwmechanics/weaponpriority.cpp
index 13ce309277..8480dc208e 100644
--- a/apps/openmw/mwmechanics/weaponpriority.cpp
+++ b/apps/openmw/mwmechanics/weaponpriority.cpp
@@ -9,7 +9,6 @@
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/inventorystore.hpp"
 
-#include "npcstats.hpp"
 #include "combat.hpp"
 #include "aicombataction.hpp"
 #include "spellpriority.hpp"
diff --git a/apps/openmw/mwmechanics/weapontype.hpp b/apps/openmw/mwmechanics/weapontype.hpp
index 056a1dbfd7..09fa73c065 100644
--- a/apps/openmw/mwmechanics/weapontype.hpp
+++ b/apps/openmw/mwmechanics/weapontype.hpp
@@ -3,8 +3,6 @@
 
 #include "../mwworld/inventorystore.hpp"
 
-#include "creaturestats.hpp"
-
 namespace MWMechanics
 {
     static std::map<int, ESM::WeaponType> sWeaponTypeList =
diff --git a/apps/openmw/mwphysics/actorconvexcallback.cpp b/apps/openmw/mwphysics/actorconvexcallback.cpp
index f99b706d74..cdd4322894 100644
--- a/apps/openmw/mwphysics/actorconvexcallback.cpp
+++ b/apps/openmw/mwphysics/actorconvexcallback.cpp
@@ -7,7 +7,6 @@
 #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
 #include <components/misc/convert.hpp>
 
-#include "collisiontype.hpp"
 #include "projectile.hpp"
 
 namespace MWPhysics
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index c5ba902fcd..7c9961f2a3 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -23,7 +23,6 @@
 #include <components/resource/bulletshapemanager.hpp>
 #include <components/debug/debuglog.hpp>
 #include <components/esm/loadgmst.hpp>
-#include <components/misc/constants.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/sceneutil/unrefqueue.hpp>
 #include <components/misc/convert.hpp>
@@ -56,7 +55,6 @@
 #include "closestnotmerayresultcallback.hpp"
 #include "contacttestresultcallback.hpp"
 #include "projectileconvexcallback.hpp"
-#include "constants.hpp"
 #include "movementsolver.hpp"
 #include "mtphysics.hpp"
 
diff --git a/apps/openmw/mwphysics/projectile.cpp b/apps/openmw/mwphysics/projectile.cpp
index a931219975..252da0a687 100644
--- a/apps/openmw/mwphysics/projectile.cpp
+++ b/apps/openmw/mwphysics/projectile.cpp
@@ -5,10 +5,7 @@
 
 #include <LinearMath/btVector3.h>
 
-#include <components/debug/debuglog.hpp>
 #include <components/misc/convert.hpp>
-#include <components/resource/bulletshape.hpp>
-#include <components/sceneutil/positionattitudetransform.hpp>
 
 #include "../mwworld/class.hpp"
 
diff --git a/apps/openmw/mwphysics/projectile.hpp b/apps/openmw/mwphysics/projectile.hpp
index fb50eebde8..81c33d2a5e 100644
--- a/apps/openmw/mwphysics/projectile.hpp
+++ b/apps/openmw/mwphysics/projectile.hpp
@@ -6,8 +6,6 @@
 #include <mutex>
 #include <optional>
 
-#include "components/misc/convert.hpp"
-
 #include "ptrholder.hpp"
 
 class btCollisionObject;

From 998cc97a4fddbd7f669790d49cc0dc0d14eed623 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Fri, 30 Apr 2021 20:49:22 +0200
Subject: [PATCH 0679/2859] And done!

---
 apps/openmw/mwrender/actoranimation.cpp     | 1 -
 apps/openmw/mwrender/actoranimation.hpp     | 1 -
 apps/openmw/mwrender/characterpreview.cpp   | 1 -
 apps/openmw/mwrender/globalmap.cpp          | 1 -
 apps/openmw/mwrender/landmanager.hpp        | 1 -
 apps/openmw/mwrender/localmap.cpp           | 1 -
 apps/openmw/mwrender/recastmesh.cpp         | 1 -
 apps/openmw/mwrender/renderingmanager.cpp   | 3 ---
 apps/openmw/mwrender/sky.cpp                | 1 -
 apps/openmw/mwscript/cellextensions.cpp     | 1 -
 apps/openmw/mwscript/controlextensions.cpp  | 3 ---
 apps/openmw/mwscript/globalscripts.cpp      | 2 --
 apps/openmw/mwscript/interpretercontext.cpp | 2 --
 apps/openmw/mwstate/quicksavemanager.hpp    | 1 -
 apps/openmw/mwworld/cellpreloader.cpp       | 4 ----
 apps/openmw/mwworld/failedaction.cpp        | 1 -
 apps/openmw/mwworld/globals.hpp             | 1 -
 apps/openmw/mwworld/projectilemanager.cpp   | 1 -
 apps/openmw/mwworld/scene.cpp               | 2 --
 apps/openmw/mwworld/worldimp.hpp            | 1 -
 20 files changed, 30 deletions(-)

diff --git a/apps/openmw/mwrender/actoranimation.cpp b/apps/openmw/mwrender/actoranimation.cpp
index 845e917fb2..59bc327656 100644
--- a/apps/openmw/mwrender/actoranimation.cpp
+++ b/apps/openmw/mwrender/actoranimation.cpp
@@ -11,7 +11,6 @@
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
 
-#include <components/sceneutil/attach.hpp>
 #include <components/sceneutil/lightmanager.hpp>
 #include <components/sceneutil/lightutil.hpp>
 #include <components/sceneutil/visitor.hpp>
diff --git a/apps/openmw/mwrender/actoranimation.hpp b/apps/openmw/mwrender/actoranimation.hpp
index 86929a18a7..e149e44148 100644
--- a/apps/openmw/mwrender/actoranimation.hpp
+++ b/apps/openmw/mwrender/actoranimation.hpp
@@ -6,7 +6,6 @@
 #include <osg/ref_ptr>
 
 #include "../mwworld/containerstore.hpp"
-#include "../mwworld/inventorystore.hpp"
 
 #include "animation.hpp"
 
diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index b75e45906b..e88c4cee32 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -23,7 +23,6 @@
 #include <components/sceneutil/shadow.hpp>
 #include <components/settings/settings.hpp>
 
-#include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/inventorystore.hpp"
diff --git a/apps/openmw/mwrender/globalmap.cpp b/apps/openmw/mwrender/globalmap.cpp
index 366da6439c..8784eb501a 100644
--- a/apps/openmw/mwrender/globalmap.cpp
+++ b/apps/openmw/mwrender/globalmap.cpp
@@ -9,7 +9,6 @@
 
 #include <osgDB/WriteFile>
 
-#include <components/loadinglistener/loadinglistener.hpp>
 #include <components/settings/settings.hpp>
 #include <components/files/memorystream.hpp>
 
diff --git a/apps/openmw/mwrender/landmanager.hpp b/apps/openmw/mwrender/landmanager.hpp
index 1694bd243b..f3cc860854 100644
--- a/apps/openmw/mwrender/landmanager.hpp
+++ b/apps/openmw/mwrender/landmanager.hpp
@@ -3,7 +3,6 @@
 
 #include <osg/Object>
 
-#include <components/resource/objectcache.hpp>
 #include <components/resource/resourcemanager.hpp>
 #include <components/esmterrain/storage.hpp>
 
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index ec2bf54a7f..686078879d 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -22,7 +22,6 @@
 #include <components/sceneutil/lightmanager.hpp>
 #include <components/files/memorystream.hpp>
 #include <components/resource/scenemanager.hpp>
-#include <components/resource/resourcesystem.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
diff --git a/apps/openmw/mwrender/recastmesh.cpp b/apps/openmw/mwrender/recastmesh.cpp
index d07e7d37bb..7c7c6b8eb1 100644
--- a/apps/openmw/mwrender/recastmesh.cpp
+++ b/apps/openmw/mwrender/recastmesh.cpp
@@ -1,7 +1,6 @@
 #include "recastmesh.hpp"
 
 #include <components/sceneutil/recastmesh.hpp>
-#include <components/debug/debuglog.hpp>
 
 #include <osg/PositionAttitudeTransform>
 
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 5d5a349d44..7093c2b984 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -43,14 +43,12 @@
 #include <components/terrain/quadtreeworld.hpp>
 
 #include <components/esm/loadcell.hpp>
-#include <components/fallback/fallback.hpp>
 
 #include <components/detournavigator/navigator.hpp>
 
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwgui/loadingscreen.hpp"
-#include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwmechanics/actorutil.hpp"
 
@@ -63,7 +61,6 @@
 #include "viewovershoulder.hpp"
 #include "water.hpp"
 #include "terrainstorage.hpp"
-#include "util.hpp"
 #include "navmesh.hpp"
 #include "actorspaths.hpp"
 #include "recastmesh.hpp"
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index f0e8764709..1bf6be0d93 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -46,7 +46,6 @@
 #include <components/sceneutil/shadow.hpp>
 
 #include <components/settings/settings.hpp>
-#include <components/misc/stringops.hpp>
 
 #include <components/nifosg/particle.hpp>
 
diff --git a/apps/openmw/mwscript/cellextensions.cpp b/apps/openmw/mwscript/cellextensions.cpp
index 3564281561..b0977984fb 100644
--- a/apps/openmw/mwscript/cellextensions.cpp
+++ b/apps/openmw/mwscript/cellextensions.cpp
@@ -13,7 +13,6 @@
 #include "../mwworld/actionteleport.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwbase/environment.hpp"
-#include "../mwworld/player.hpp"
 #include "../mwbase/statemanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwscript/controlextensions.cpp b/apps/openmw/mwscript/controlextensions.cpp
index 5362759e10..2716630d72 100644
--- a/apps/openmw/mwscript/controlextensions.cpp
+++ b/apps/openmw/mwscript/controlextensions.cpp
@@ -1,6 +1,5 @@
 #include "controlextensions.hpp"
 
-#include <components/compiler/extensions.hpp>
 #include <components/compiler/opcodes.hpp>
 
 #include <components/interpreter/interpreter.hpp>
@@ -15,8 +14,6 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/ptr.hpp"
 
-#include "../mwmechanics/npcstats.hpp"
-
 #include "interpretercontext.hpp"
 #include "ref.hpp"
 
diff --git a/apps/openmw/mwscript/globalscripts.cpp b/apps/openmw/mwscript/globalscripts.cpp
index 0d579abdc6..b287d33b3d 100644
--- a/apps/openmw/mwscript/globalscripts.cpp
+++ b/apps/openmw/mwscript/globalscripts.cpp
@@ -12,8 +12,6 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/scriptmanager.hpp"
 
-#include "../mwmechanics/creaturestats.hpp"
-
 #include "interpretercontext.hpp"
 
 namespace
diff --git a/apps/openmw/mwscript/interpretercontext.cpp b/apps/openmw/mwscript/interpretercontext.cpp
index f3895c8b6a..d8fd287d72 100644
--- a/apps/openmw/mwscript/interpretercontext.cpp
+++ b/apps/openmw/mwscript/interpretercontext.cpp
@@ -5,8 +5,6 @@
 
 #include <components/compiler/locals.hpp>
 
-#include <components/esm/cellid.hpp>
-
 #include "../mwworld/esmstore.hpp"
 
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwstate/quicksavemanager.hpp b/apps/openmw/mwstate/quicksavemanager.hpp
index cdeff42c26..3272b24b51 100644
--- a/apps/openmw/mwstate/quicksavemanager.hpp
+++ b/apps/openmw/mwstate/quicksavemanager.hpp
@@ -4,7 +4,6 @@
 #include <string>
 
 #include "character.hpp"
-#include "../mwbase/statemanager.hpp"
 
 namespace MWState{
     class QuickSaveManager{
diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index 6bc60968cb..d3322cefeb 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -15,13 +15,9 @@
 #include <components/sceneutil/unrefqueue.hpp>
 #include <components/esm/loadcell.hpp>
 
-#include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
-
 #include "../mwrender/landmanager.hpp"
 
 #include "cellstore.hpp"
-#include "manualref.hpp"
 #include "class.hpp"
 
 namespace MWWorld
diff --git a/apps/openmw/mwworld/failedaction.cpp b/apps/openmw/mwworld/failedaction.cpp
index 45df75a322..ec8314712e 100644
--- a/apps/openmw/mwworld/failedaction.cpp
+++ b/apps/openmw/mwworld/failedaction.cpp
@@ -1,5 +1,4 @@
 #include "failedaction.hpp"
-#include "../mwbase/world.hpp"
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
diff --git a/apps/openmw/mwworld/globals.hpp b/apps/openmw/mwworld/globals.hpp
index 3468c2e719..ae5e412c70 100644
--- a/apps/openmw/mwworld/globals.hpp
+++ b/apps/openmw/mwworld/globals.hpp
@@ -7,7 +7,6 @@
 
 #include <stdint.h>
 
-#include <components/interpreter/types.hpp>
 #include <components/esm/loadglob.hpp>
 
 namespace ESM
diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index b463fc09ed..53b1b364b6 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -44,7 +44,6 @@
 
 #include "../mwsound/sound.hpp"
 
-#include "../mwphysics/collisiontype.hpp"
 #include "../mwphysics/physicssystem.hpp"
 #include "../mwphysics/projectile.hpp"
 
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index dae703c8c4..3fdf4503af 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -26,8 +26,6 @@
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 
-#include "../mwmechanics/actorutil.hpp"
-
 #include "../mwrender/renderingmanager.hpp"
 #include "../mwrender/landmanager.hpp"
 
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 5447e20c33..314f386079 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -4,7 +4,6 @@
 #include <osg/ref_ptr>
 
 #include <components/settings/settings.hpp>
-#include <components/fallback/fallback.hpp>
 
 #include "../mwbase/world.hpp"
 

From 5a238f3c80fec68a141635df47936175801bd1b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matja=C5=BE=20Lamut?= <matjaz.lamut@gmail.com>
Date: Fri, 30 Apr 2021 23:01:11 +0000
Subject: [PATCH 0680/2859] Documentation on what the sky system in Morrowind /
 OpenMW is composed of

---
 docs/source/reference/modding/index.rst      |  1 +
 docs/source/reference/modding/sky-system.rst | 79 ++++++++++++++++++++
 2 files changed, 80 insertions(+)
 create mode 100644 docs/source/reference/modding/sky-system.rst

diff --git a/docs/source/reference/modding/index.rst b/docs/source/reference/modding/index.rst
index df98137d85..90491d34d1 100644
--- a/docs/source/reference/modding/index.rst
+++ b/docs/source/reference/modding/index.rst
@@ -24,5 +24,6 @@ about creating new content for OpenMW, please refer to
 	texture-modding/index
 	custom-models/index
 	font
+	sky-system
 	extended
 	paths
diff --git a/docs/source/reference/modding/sky-system.rst b/docs/source/reference/modding/sky-system.rst
new file mode 100644
index 0000000000..fa71295e38
--- /dev/null
+++ b/docs/source/reference/modding/sky-system.rst
@@ -0,0 +1,79 @@
+########################
+Sky System and Structure
+########################
+
+Overview
+********
+
+The sky system is made from multiple components that contribute to the final result.
+
+1. Background colour and fog
+2. Atmosphere
+3. Clouds
+4. Stars
+5. Sun
+6. Moons
+7. Weather effects
+
+.. image:: https://gitlab.com/OpenMW/openmw-docs/-/raw/master/docs/source/reference/modding/_static/sky-system-overview.png
+    :align: center
+
+Background Colour and Fog
+*************************
+
+Even when nothing else is being rendered, OpenMW will always show the basic background colour. The distant fog effect is based off this colour as well. Other elements of the sky are rendered on top of the background to compose the sky. The colour of the background changes depending on the time of day and current weather.
+
+Atmosphere
+**********
+
+A mesh that contributes the blue colour of the sky. It is a rough cylinder in shape without the bottom face and with the normals pointing inwards. During the day, it is light blue and transitions to a very dark blue, almost black, during the night. 
+
+Towards the bottom edge the mesh gradually becomes transparent and blends with the background colour. Transparency is done per vertex and OpenMW decides which vertices are transparent based on their index. This adds a requirement for a very strict vertex and face order on this mesh to blend properly.
+
+.. image:: https://gitlab.com/OpenMW/openmw-docs/-/raw/master/docs/source/reference/modding/_static/sky-system-mesh-atmosphere.jpg
+    :align: center
+
+Clouds
+******
+
+A mesh that renders a tiling, scrolling texture of the clouds. It is a flat dome in shape with the normals pointing inwards. Towards the boundary edge the mesh becomes transparent and blends with the background colour. As with the atmosphere, there is a very strict vertex order on this mesh to blend properly.
+
+.. image:: https://gitlab.com/OpenMW/openmw-docs/-/raw/master/docs/source/reference/modding/_static/sky-system-mesh-clouds.jpg
+    :align: center
+
+By default, the UVs of this mesh are scaled so the clouds texture repeats five times across the sky. The weather system blends between different cloud textures depending on the current weather. Speed of the clouds moving across the sky can be set per weather type.
+
+Stars
+*****
+
+A dome shaped mesh that shows the stars during the night. It starts to become visible during sunset and goes back to transparent during sunrise. At its bottom edge it blends to transparency which is defined with the vertex colour. White is full opacity while black is full transparency. The mesh ends above the horizon to prevent the stars being visible near the horizon when underwater.
+
+.. image:: https://gitlab.com/OpenMW/openmw-docs/-/raw/master/docs/source/reference/modding/_static/sky-system-mesh-stars.jpg
+    :align: center
+
+It can use multiple textures to show different star constellations. In addition, extra meshes can be used to blend nebulae across the sky.
+
+Sun
+***
+
+The sun is a billboard that moves across the sky. It is composed of two texures. One shows the regular sun sphere, the other is the sun glare that is added on top of the sun. Glare strength adjusts dynamically depending on how obstructed the view to the sun is.
+
+Moons
+*****
+
+The moons are two separate billboards moving across the sky and are both rendered the same way. First, a circle texture is used to mask the background. A moon texture is then added on top of the mask. Depending on the current moon phase, a variant of the moon texture is used. The texture on top is additively blended so any transparent area is achieved with black pixels. The following image shows all the separate textures needed for one moon.
+
+.. image:: https://gitlab.com/OpenMW/openmw-docs/-/raw/master/docs/source/reference/modding/_static/sky-system-moon-textures.jpg
+    :align: center
+
+
+Weather Effects
+***************
+
+These are particle emitters used to display weather phenomena such as rain, snow, or dust clouds. Originally, Morrowind used .nif files with a number of planes and baked animations. In OpenMW, these effects are done through code and are currently hardcoded. The particle emmitters emit particles around the player in a big enough area so it looks like the whole world is affected by the weather.
+
+Settings
+********
+
+Colour and other settings for each weather type can be edited in ``openmw.cfg`` configuration file.
+

From bd45449f9d0964445ef3d2ee5e1ea4f98ff57c7c Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 1 May 2021 14:07:29 +0200
Subject: [PATCH 0681/2859] Allow activation of inventory items

---
 CHANGELOG.md                            | 1 +
 apps/openmw/mwscript/miscextensions.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87009f58d4..c50054a74b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -118,6 +118,7 @@
     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
     Feature #390: 3rd person look "over the shoulder"
     Feature #832: OpenMW-CS: Handle deleted references
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index d78337a627..5538e8536f 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -278,7 +278,7 @@ namespace MWScript
 
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    if (ptr.getRefData().activateByScript())
+                    if (ptr.getRefData().activateByScript() || ptr.getContainerStore())
                         context.executeActivation(ptr, MWMechanics::getPlayer());
                 }
         };

From 4fa0972b2dc82dad05113f43a200db347e7d64ae Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sat, 1 May 2021 14:13:17 +0200
Subject: [PATCH 0682/2859] Tone down actor's skip simulation flag to an
 optional skip collision detection flag.

---
 apps/openmw/mwbase/world.hpp                  |  2 +-
 apps/openmw/mwphysics/actor.cpp               | 19 ++++++++++---------
 apps/openmw/mwphysics/actor.hpp               |  6 ++++--
 apps/openmw/mwphysics/movementsolver.cpp      |  4 ++--
 apps/openmw/mwphysics/mtphysics.cpp           |  1 -
 apps/openmw/mwphysics/physicssystem.cpp       |  4 +---
 apps/openmw/mwphysics/physicssystem.hpp       |  1 +
 .../mwscript/transformationextensions.cpp     |  8 ++++----
 apps/openmw/mwworld/worldimp.cpp              |  4 ++--
 apps/openmw/mwworld/worldimp.hpp              |  2 +-
 10 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 6cee36b402..7afd0697eb 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -287,7 +287,7 @@ namespace MWBase
             virtual MWWorld::Ptr moveObject(const MWWorld::Ptr &ptr, MWWorld::CellStore* newCell, float x, float y, float z, bool movePhysics=true) = 0;
             ///< @return an updated Ptr
 
-            virtual MWWorld::Ptr moveObjectBy(const MWWorld::Ptr &ptr, osg::Vec3f vec, bool moveToActive) = 0;
+            virtual MWWorld::Ptr moveObjectBy(const MWWorld::Ptr &ptr, osg::Vec3f vec, bool moveToActive, bool ignoreCollisions) = 0;
             ///< @return an updated Ptr
 
             virtual void scaleObject (const MWWorld::Ptr& ptr, float scale) = 0;
diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index f14805c6f1..4b97ecffb9 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -123,7 +123,7 @@ void Actor::updatePosition()
     mSimulationPosition = mWorldPosition;
     mPositionOffset = osg::Vec3f();
     mStandingOnPtr = nullptr;
-    mSkipSimulation = true;
+    mSkipCollisions = true;
 }
 
 void Actor::updateWorldPosition()
@@ -140,9 +140,7 @@ osg::Vec3f Actor::getWorldPosition() const
 
 void Actor::setSimulationPosition(const osg::Vec3f& position)
 {
-    if (!mSkipSimulation)
-        mSimulationPosition = position;
-    mSkipSimulation = false;
+    mSimulationPosition = position;
 }
 
 osg::Vec3f Actor::getSimulationPosition() const
@@ -176,21 +174,19 @@ osg::Vec3f Actor::getCollisionObjectPosition() const
 bool Actor::setPosition(const osg::Vec3f& position)
 {
     std::scoped_lock lock(mPositionMutex);
-    // position is being forced, ignore simulation results until we sync up
-    if (mSkipSimulation)
-        return false;
-    bool hasChanged = mPosition != position || mPositionOffset.length() != 0 || mWorldPositionChanged;
     updateWorldPosition();
     applyOffsetChange();
+    bool hasChanged = mPosition != position || mWorldPositionChanged;
     mPreviousPosition = mPosition;
     mPosition = position;
     return hasChanged;
 }
 
-void Actor::adjustPosition(const osg::Vec3f& offset)
+void Actor::adjustPosition(const osg::Vec3f& offset, bool ignoreCollisions)
 {
     std::scoped_lock lock(mPositionMutex);
     mPositionOffset += offset;
+    mSkipCollisions = mSkipCollisions || ignoreCollisions;
 }
 
 void Actor::applyOffsetChange()
@@ -302,4 +298,9 @@ void Actor::setStandingOnPtr(const MWWorld::Ptr& ptr)
     mStandingOnPtr = ptr;
 }
 
+bool Actor::skipCollisions()
+{
+    return std::exchange(mSkipCollisions, false);
+}
+
 }
diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index 472a79bff5..54f9009bf7 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -101,7 +101,7 @@ namespace MWPhysics
         void updatePosition();
 
         // register a position offset that will be applied during simulation.
-        void adjustPosition(const osg::Vec3f& offset);
+        void adjustPosition(const osg::Vec3f& offset, bool ignoreCollisions);
 
         // apply position offset. Can't be called during simulation
         void applyOffsetChange();
@@ -177,6 +177,8 @@ namespace MWPhysics
             mLastStuckPosition = position;
         }
 
+        bool skipCollisions();
+
     private:
         MWWorld::Ptr mStandingOnPtr;
         /// Removes then re-adds the collision object to the dynamics world
@@ -206,7 +208,7 @@ namespace MWPhysics
         osg::Vec3f mPreviousPosition;
         osg::Vec3f mPositionOffset;
         bool mWorldPositionChanged;
-        bool mSkipSimulation;
+        bool mSkipCollisions;
         btTransform mLocalTransform;
         mutable std::mutex mPositionMutex;
 
diff --git a/apps/openmw/mwphysics/movementsolver.cpp b/apps/openmw/mwphysics/movementsolver.cpp
index 1c04ee65a5..fd0e090fcb 100644
--- a/apps/openmw/mwphysics/movementsolver.cpp
+++ b/apps/openmw/mwphysics/movementsolver.cpp
@@ -131,7 +131,7 @@ namespace MWPhysics
         // Reset per-frame data
         physicActor->setWalkingOnWater(false);
         // Anything to collide with?
-        if(!physicActor->getCollisionMode())
+        if(!physicActor->getCollisionMode() || actor.mSkipCollisionDetection)
         {
             actor.mPosition += (osg::Quat(refpos.rot[0], osg::Vec3f(-1, 0, 0)) *
                                 osg::Quat(refpos.rot[2], osg::Vec3f(0, 0, -1))
@@ -437,7 +437,7 @@ namespace MWPhysics
             return;
 
         auto* physicActor = actor.mActorRaw;
-        if(!physicActor->getCollisionMode()) // noclipping/tcl
+        if(!physicActor->getCollisionMode() || actor.mSkipCollisionDetection) // noclipping/tcl
             return;
 
         auto* collisionObject = physicActor->getCollisionObject();
diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 4957ef422a..95a741825d 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -361,7 +361,6 @@ namespace MWPhysics
         for (const auto& [_, actor] : actors)
         {
             actor->updatePosition();
-            actor->setSimulationPosition(actor->getWorldPosition()); // updatePosition skip next simulation, now we need to "consume" it
             actor->updateCollisionObjectPosition();
             mMovedActors.emplace_back(actor->getPtr());
         }
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index c5ba902fcd..c52ecc68f8 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -954,9 +954,7 @@ namespace MWPhysics
     void ActorFrameData::updatePosition(btCollisionWorld* world)
     {
         mActorRaw->updateWorldPosition();
-        // If physics runs "fast enough", position are interpolated without simulation
-        // By calling this here, we are sure that offsets are applied at least once per frame,
-        // regardless of simulation speed.
+        mSkipCollisionDetection = mActorRaw->skipCollisions();
         mActorRaw->applyOffsetChange();
         mPosition = mActorRaw->getPosition();
         if (mWaterCollision && mPosition.z() < mWaterlevel && canMoveToWaterSurface(mActorRaw, mWaterlevel, world))
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index ce10b4246c..23b2786750 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -91,6 +91,7 @@ namespace MWPhysics
         bool mFloatToSurface;
         bool mNeedLand;
         bool mWaterCollision;
+        bool mSkipCollisionDetection;
         float mWaterlevel;
         float mSlowFall;
         float mOldHeight;
diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index ba211503e1..dbd8e905aa 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -32,7 +32,7 @@ namespace MWScript
             std::vector<MWWorld::Ptr> actors;
             MWBase::Environment::get().getWorld()->getActorsStandingOn (ptr, actors);
             for (auto& actor : actors)
-                MWBase::Environment::get().getWorld()->moveObjectBy(actor, diff, false);
+                MWBase::Environment::get().getWorld()->moveObjectBy(actor, diff, false, false);
         }
 
         template<class R>
@@ -303,7 +303,7 @@ namespace MWScript
                     }
 
                     dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(ptr,
-                        MWBase::Environment::get().getWorld()->moveObjectBy(ptr, newPos - curPos, true));
+                        MWBase::Environment::get().getWorld()->moveObjectBy(ptr, newPos - curPos, true, true));
                 }
         };
 
@@ -726,7 +726,7 @@ namespace MWScript
                     // This approach can be used to create elevators.
                     moveStandingActors(ptr, diff);
                     dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(ptr,
-                        MWBase::Environment::get().getWorld()->moveObjectBy(ptr, diff, false));
+                        MWBase::Environment::get().getWorld()->moveObjectBy(ptr, diff, false, true));
                 }
         };
 
@@ -762,7 +762,7 @@ namespace MWScript
                     // This approach can be used to create elevators.
                     moveStandingActors(ptr, diff);
                     dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(ptr,
-                        MWBase::Environment::get().getWorld()->moveObjectBy(ptr, diff, false));
+                        MWBase::Environment::get().getWorld()->moveObjectBy(ptr, diff, false, true));
                 }
         };
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 8bb73c6899..e406992e2c 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1253,12 +1253,12 @@ namespace MWWorld
         return moveObject(ptr, cell, x, y, z, movePhysics);
     }
 
-    MWWorld::Ptr World::moveObjectBy(const Ptr& ptr, osg::Vec3f vec, bool moveToActive)
+    MWWorld::Ptr World::moveObjectBy(const Ptr& ptr, osg::Vec3f vec, bool moveToActive, bool ignoreCollisions)
     {
         auto* actor = mPhysics->getActor(ptr);
         osg::Vec3f newpos = ptr.getRefData().getPosition().asVec3() + vec;
         if (actor)
-            actor->adjustPosition(vec);
+            actor->adjustPosition(vec, ignoreCollisions);
         if (ptr.getClass().isActor())
             return moveObject(ptr, newpos.x(), newpos.y(), newpos.z(), false, moveToActive && ptr != getPlayerPtr());
         return moveObject(ptr, newpos.x(), newpos.y(), newpos.z());
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 5447e20c33..2789e22c15 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -377,7 +377,7 @@ namespace MWWorld
             MWWorld::Ptr moveObject (const Ptr& ptr, CellStore* newCell, float x, float y, float z, bool movePhysics=true) override;
             ///< @return an updated Ptr
 
-            MWWorld::Ptr moveObjectBy(const Ptr& ptr, osg::Vec3f vec, bool moveToActive) override;
+            MWWorld::Ptr moveObjectBy(const Ptr& ptr, osg::Vec3f vec, bool moveToActive, bool ignoreCollisions) override;
             ///< @return an updated Ptr
 
             void scaleObject (const Ptr& ptr, float scale) override;

From 43b19c4a4652beaf4ba3b43e860bd1dc9d9c51ad Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 29 Apr 2021 19:11:34 +0200
Subject: [PATCH 0683/2859] Fix default object paging active grid value in the
 doc

---
 docs/source/reference/modding/settings/terrain.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/reference/modding/settings/terrain.rst b/docs/source/reference/modding/settings/terrain.rst
index 149ef979e0..e6018a8655 100644
--- a/docs/source/reference/modding/settings/terrain.rst
+++ b/docs/source/reference/modding/settings/terrain.rst
@@ -129,7 +129,7 @@ object paging active grid
 -------------------------
 :Type:		boolean
 :Range:		True/False
-:Default:	False
+:Default:	True
 
 Controls whether the objects in the active cells use the mentioned paging algorithms.
 Active grid paging significantly improves the framerate when your setup is CPU-limited.

From 1626762d5c7e113a34f2a864dec3ff3560a64d64 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Sat, 1 May 2021 22:20:51 +0000
Subject: [PATCH 0684/2859] Maybe fix #5551

If we were doing this properly, we'd migrate to
https://cmake.org/cmake/help/latest/module/InstallRequiredSystemLibraries.html
but this should hopefully remove a blocker for 0.47
---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f930772ae..7f9b4d5902 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -830,13 +830,13 @@ elseif(NOT APPLE)
         SET(VCREDIST32 "${OpenMW_BINARY_DIR}/vcredist_x86.exe")
         if(EXISTS ${VCREDIST32})
             INSTALL(FILES ${VCREDIST32} DESTINATION "redist")
-            SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "ExecWait '\\\"$INSTDIR\\\\redist\\\\vcredist_x86.exe\\\" /q'" )
+            SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "ExecWait '\\\"$INSTDIR\\\\redist\\\\vcredist_x86.exe\\\" /q /norestart'" )
         endif(EXISTS ${VCREDIST32})
 
         SET(VCREDIST64 "${OpenMW_BINARY_DIR}/vcredist_x64.exe")
         if(EXISTS ${VCREDIST64})
             INSTALL(FILES ${VCREDIST64} DESTINATION "redist")
-            SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "ExecWait '\\\"$INSTDIR\\\\redist\\\\vcredist_x64.exe\\\" /q'" )
+            SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "ExecWait '\\\"$INSTDIR\\\\redist\\\\vcredist_x64.exe\\\" /q /norestart'" )
         endif(EXISTS ${VCREDIST64})
 
         SET(OALREDIST "${OpenMW_BINARY_DIR}/oalinst.exe")

From 813969a46e6ed8962acf2da49994762cf6004d57 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sun, 2 May 2021 11:21:54 +0000
Subject: [PATCH 0685/2859] Fix an off-by-one in windows_crashcatcher.cpp

---
 components/crashcatcher/windows_crashcatcher.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/crashcatcher/windows_crashcatcher.cpp b/components/crashcatcher/windows_crashcatcher.cpp
index 33ec319aa2..185eee6aa6 100644
--- a/components/crashcatcher/windows_crashcatcher.cpp
+++ b/components/crashcatcher/windows_crashcatcher.cpp
@@ -136,7 +136,7 @@ namespace Crash
 
         memset(mShm->mStartup.mLogFilePath, 0, sizeof(mShm->mStartup.mLogFilePath));
         int length = crashLogPath.length();
-        if (length > MAX_LONG_PATH) length = MAX_LONG_PATH;
+        if (length >= MAX_LONG_PATH) length = MAX_LONG_PATH - 1;
         strncpy(mShm->mStartup.mLogFilePath, crashLogPath.c_str(), length);
         mShm->mStartup.mLogFilePath[length] = '\0';
 

From d45184a7305d2a1a7c518b7edd6aa399ee8da3d8 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sun, 2 May 2021 14:43:46 +0200
Subject: [PATCH 0686/2859] Sprinkle some const-ref to avoid unnecessary copies

---
 apps/openmw/mwworld/cellpreloader.cpp      |  6 +++---
 components/sceneutil/mwshadowtechnique.cpp | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index 6bc60968cb..dfd69b2e5c 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -448,7 +448,7 @@ namespace MWWorld
     void CellPreloader::abortTerrainPreloadExcept(const CellPreloader::PositionCellGrid *exceptPos)
     {
         const float resetThreshold = ESM::Land::REAL_SIZE;
-        for (auto pos : mTerrainPreloadPositions)
+        for (const auto& pos : mTerrainPreloadPositions)
             if (exceptPos && (pos.first-exceptPos->first).length2() < resetThreshold*resetThreshold && pos.second == exceptPos->second)
                 return;
         if (mTerrainPreloadItem && !mTerrainPreloadItem->isDone())
@@ -461,10 +461,10 @@ namespace MWWorld
 
     bool contains(const std::vector<CellPreloader::PositionCellGrid>& container, const std::vector<CellPreloader::PositionCellGrid>& contained)
     {
-        for (auto pos : contained)
+        for (const auto& pos : contained)
         {
             bool found = false;
-            for (auto pos2 : container)
+            for (const auto& pos2 : container)
             {
                 if ((pos.first-pos2.first).length2() < 1 && pos.second == pos2.second)
                 {
diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
index bf6581ae60..e9eb9b2b2f 100644
--- a/components/sceneutil/mwshadowtechnique.cpp
+++ b/components/sceneutil/mwshadowtechnique.cpp
@@ -1361,7 +1361,7 @@ void MWShadowTechnique::cull(osgUtil::CullVisitor& cv)
             if (settings->getMultipleShadowMapHint() == ShadowSettings::CASCADED)
             {
                 cropShadowCameraToMainFrustum(frustum, camera, cascaseNear, cascadeFar, extraPlanes);
-                for (auto plane : extraPlanes)
+                for (const auto& plane : extraPlanes)
                     local_polytope.getPlaneList().push_back(plane);
                 local_polytope.setupMask();
             }
@@ -1998,19 +1998,19 @@ struct ConvexHull
     Vertices findInternalEdges(osg::Vec3d mainVertex, Vertices connectedVertices)
     {
         Vertices internalEdgeVertices;
-        for (auto vertex : connectedVertices)
+        for (const auto& vertex : connectedVertices)
         {
             osg::Matrixd matrix;
             osg::Vec3d dir = vertex - mainVertex;
             matrix.makeLookAt(mainVertex, vertex, dir.z() == 0 ? osg::Vec3d(0, 0, 1) : osg::Vec3d(1, 0, 0));
             Vertices testVertices;
-            for (auto testVertex : connectedVertices)
+            for (const auto& testVertex : connectedVertices)
             {
                 if (vertex != testVertex)
                     testVertices.push_back(testVertex);
             }
             std::vector<double> bearings;
-            for (auto testVertex : testVertices)
+            for (const auto& testVertex : testVertices)
             {
                 osg::Vec3d transformedVertex = testVertex * matrix;
                 bearings.push_back(atan2(transformedVertex.y(), transformedVertex.x()));
@@ -2039,7 +2039,7 @@ struct ConvexHull
 
         // Collect the set of vertices
         VertexSet vertices;
-        for (Edge edge : _edges)
+        for (const Edge& edge : _edges)
         {
             vertices.insert(edge.first);
             vertices.insert(edge.second);
@@ -2069,7 +2069,7 @@ struct ConvexHull
         for (auto vertex : extremeVertices)
         {
             Vertices connectedVertices;
-            for (Edge edge : _edges)
+            for (const Edge& edge : _edges)
             {
                 if (edge.first == vertex)
                     connectedVertices.push_back(edge.second);
@@ -2107,7 +2107,7 @@ struct ConvexHull
             osg::Vec3d vertex = *unprocessedConnectedVertices.begin();
             unprocessedConnectedVertices.erase(unprocessedConnectedVertices.begin());
             connectedVertices.insert(vertex);
-            for (Edge edge : _edges)
+            for (const Edge& edge : _edges)
             {
                 osg::Vec3d otherEnd;
                 if (edge.first == vertex)
@@ -2124,7 +2124,7 @@ struct ConvexHull
             }
         }
 
-        for (Edge edge : _edges)
+        for (const Edge& edge : _edges)
         {
             if (connectedVertices.count(edge.first) || connectedVertices.count(edge.second))
                 finalEdges.push_back(edge);

From d4d111a709cf2b39da16fdfa9c7f5208d3ecbb16 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sun, 2 May 2021 15:50:44 +0200
Subject: [PATCH 0687/2859] Don't use std::move on const

---
 components/detournavigator/asyncnavmeshupdater.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index 4855cf0adc..7248850a6c 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -262,7 +262,7 @@ namespace DetourNavigator
         if (jobs.top().mProcessTime > now)
             return {};
 
-        Job job = std::move(jobs.top());
+        Job job = jobs.top();
         jobs.pop();
 
         if (changeLastUpdate && job.mChangeType == ChangeType::update)
@@ -273,7 +273,7 @@ namespace DetourNavigator
         if (it->second.empty())
             pushed.erase(it);
 
-        return {std::move(job)};
+        return job;
     }
 
     void AsyncNavMeshUpdater::writeDebugFiles(const Job& job, const RecastMesh* recastMesh) const

From aca5d2fc122a72ced609696127f2cc65f61fe5e6 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Sun, 2 May 2021 13:54:20 +0000
Subject: [PATCH 0688/2859] Merge branch 'bump-macos-dependencies' into
 'master'

Use prebuilt macOS dependencies with fixed SDL and OSG 3.6

Closes #5939

See merge request OpenMW/openmw!804

(cherry picked from commit 74612b1286330b1e34a9c37528502770496e5bba)

9aaca972 Use prebuilt macOS dependencies with fixed SDL and OSG 3.6
---
 CI/before_install.osx.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index c03341b863..51bcb9a59d 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -1,9 +1,9 @@
 #!/bin/sh -ex
 
 # 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
+[ -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
 
 # 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
@@ -15,5 +15,5 @@ ccache --version
 cmake --version
 qmake --version
 
-curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-f8918dd.zip -o ~/openmw-deps.zip
+curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-8f5ef6e.zip -o ~/openmw-deps.zip
 unzip -o ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null

From 6fd04cb8f644ecdc47490e9e73ed7c3751df4727 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sun, 2 May 2021 17:48:50 +0200
Subject: [PATCH 0689/2859] Remove support for single-precision Bullet, fail
 during configuration instead of during linking.

---
 CI/before_script.msvc.sh         | 29 +++++---------------
 CI/before_script.osx.sh          |  1 -
 CMakeLists.txt                   |  7 ++++-
 cmake/CheckBulletPrecision.cmake | 45 ++++++++++++++++++++++++++++++++
 components/CMakeLists.txt        |  6 ++---
 extern/CMakeLists.txt            |  2 +-
 6 files changed, 60 insertions(+), 30 deletions(-)
 create mode 100644 cmake/CheckBulletPrecision.cmake

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index e1afdb059e..d98c280380 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -73,9 +73,6 @@ CONFIGURATIONS=()
 TEST_FRAMEWORK=""
 GOOGLE_INSTALL_ROOT=""
 INSTALL_PREFIX="."
-BULLET_DOUBLE=true
-BULLET_DBL=""
-BULLET_DBL_DISPLAY="Single precision"
 
 ACTIVATE_MSVC=""
 SINGLE_CONFIG=""
@@ -99,9 +96,6 @@ while [ $# -gt 0 ]; do
 			d )
 				SKIP_DOWNLOAD=true ;;
 
-			D )
-				BULLET_DOUBLE=true ;;
-
 			e )
 				SKIP_EXTRACT=true ;;
 
@@ -149,8 +143,6 @@ Options:
 		For single-config generators, several configurations can be set up at once by specifying -c multiple times.
 	-d
 		Skip checking the downloads.
-	-D
-		Use double-precision Bullet
 	-e
 		Skip extracting dependencies.
 	-h
@@ -433,9 +425,6 @@ if [ -n "$SINGLE_CONFIG" ]; then
 		if [ -n "$SKIP_DOWNLOAD" ]; then
 			RECURSIVE_OPTIONS+=("-d")
 		fi
-		if [ -n "$BULLET_DOUBLE" ]; then
-			RECURSIVE_OPTIONS+=("-D")
-		fi
 		if [ -n "$SKIP_EXTRACT" ]; then
 			RECURSIVE_OPTIONS+=("-e")
 		fi
@@ -508,12 +497,6 @@ if ! [ -z $UNITY_BUILD ]; then
 	add_cmake_opts "-DOPENMW_UNITY_BUILD=True"
 fi
 
-if [ -n "$BULLET_DOUBLE" ]; then
-	BULLET_DBL="-double"
-	BULLET_DBL_DISPLAY="Double precision"
-	add_cmake_opts "-DBULLET_USE_DOUBLES=True"
-fi
-
 echo
 echo "==================================="
 echo "Starting prebuild on MSVC${MSVC_DISPLAY_YEAR} WIN${BITS}"
@@ -538,9 +521,9 @@ if [ -z $SKIP_DOWNLOAD ]; then
 	fi
 
 	# Bullet
-	download "Bullet 2.89 (${BULLET_DBL_DISPLAY})" \
-		"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/Bullet-2.89-msvc${MSVC_YEAR}-win${BITS}${BULLET_DBL}.7z" \
-		"Bullet-2.89-msvc${MSVC_YEAR}-win${BITS}${BULLET_DBL}.7z"
+	download "Bullet 2.89" \
+		"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/Bullet-2.89-msvc${MSVC_YEAR}-win${BITS}-double.7z" \
+		"Bullet-2.89-msvc${MSVC_YEAR}-win${BITS}-double.7z"
 
 	# FFmpeg
 	download "FFmpeg 4.2.2" \
@@ -680,15 +663,15 @@ fi
 cd $DEPS
 echo
 # Bullet
-printf "Bullet 2.89 (${BULLET_DBL_DISPLAY})... "
+printf "Bullet 2.89... "
 {
 	cd $DEPS_INSTALL
 	if [ -d Bullet ]; then
 		printf -- "Exists. (No version checking) "
 	elif [ -z $SKIP_EXTRACT ]; then
 		rm -rf Bullet
-		eval 7z x -y "${DEPS}/Bullet-2.89-msvc${MSVC_YEAR}-win${BITS}${BULLET_DBL}.7z" $STRIP
-		mv "Bullet-2.89-msvc${MSVC_YEAR}-win${BITS}${BULLET_DBL}" Bullet
+		eval 7z x -y "${DEPS}/Bullet-2.89-msvc${MSVC_YEAR}-win${BITS}-double.7z" $STRIP
+		mv "Bullet-2.89-msvc${MSVC_YEAR}-win${BITS}-double" Bullet
 	fi
 	add_cmake_opts -DBULLET_ROOT="$(real_pwd)/Bullet"
 	echo Done.
diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh
index f9191eb890..265e05b8ee 100755
--- a/CI/before_script.osx.sh
+++ b/CI/before_script.osx.sh
@@ -25,6 +25,5 @@ cmake \
 -D BUILD_BSATOOL=TRUE \
 -D BUILD_ESSIMPORTER=TRUE \
 -D BUILD_NIFTEST=TRUE \
--D BULLET_USE_DOUBLES=TRUE \
 -G"Unix Makefiles" \
 ..
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b7d6ad84a..693f7fc874 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,6 @@ option(BUILD_DOCS               "Build documentation." OFF )
 option(BUILD_WITH_CODE_COVERAGE "Enable code coverage with gconv" OFF)
 option(BUILD_UNITTESTS          "Enable Unittests with Google C++ Unittest" OFF)
 option(BUILD_BENCHMARKS         "Build benchmarks with Google Benchmark" OFF)
-option(BULLET_USE_DOUBLES       "Use double precision for Bullet" ON)
 
 set(OpenGL_GL_PREFERENCE LEGACY)  # Use LEGACY as we use GL2; GLNVD is for GL3 and up.
 
@@ -314,6 +313,12 @@ if(OPENMW_USE_SYSTEM_BULLET)
     endif()
 
     find_package(Bullet ${REQUIRED_BULLET_VERSION} REQUIRED COMPONENTS BulletCollision LinearMath)
+    include(cmake/CheckBulletPrecision.cmake)
+    if (HAS_DOUBLE_PRECISION_BULLET)
+        message(STATUS "Bullet uses double precision")
+    else()
+        message(FATAL_ERROR "Bullet does not uses double precision")
+    endif()
 endif()
 
 if (NOT WIN32 AND BUILD_WIZARD) # windows users can just run the morrowind installer
diff --git a/cmake/CheckBulletPrecision.cmake b/cmake/CheckBulletPrecision.cmake
new file mode 100644
index 0000000000..ec36240348
--- /dev/null
+++ b/cmake/CheckBulletPrecision.cmake
@@ -0,0 +1,45 @@
+set(TMP_ROOT ${CMAKE_BINARY_DIR}/try-compile)
+file(MAKE_DIRECTORY ${TMP_ROOT})
+
+file(WRITE ${TMP_ROOT}/checkbullet.cpp
+"
+#include <BulletCollision/CollisionShapes/btSphereShape.h>
+int main(int argc, char** argv)
+{
+    btSphereShape shape(1.0);
+    btScalar mass(1.0);
+    btVector3 inertia;
+    shape.calculateLocalInertia(mass, inertia);
+    return 0;
+}
+")
+
+file(WRITE ${TMP_ROOT}/CMakeLists.txt
+"
+cmake_minimum_required(VERSION 3.1.0)
+project(checkbullet)
+add_executable(checkbullet checkbullet.cpp)
+find_package(Bullet REQUIRED COMPONENTS BulletCollision LinearMath)
+target_compile_definitions(checkbullet PUBLIC BT_USE_DOUBLE_PRECISION)
+include_directories(\$\{BULLET_INCLUDE_DIRS\})
+include(${CMAKE_SOURCE_DIR}/cmake/OSIdentity.cmake)
+if (UBUNTU_FOUND OR DEBIAN_FOUND)
+    target_link_libraries(checkbullet BulletCollision-float64 LinearMath-float64)
+else()
+    target_link_libraries(checkbullet \$\{BULLET_LIBRARIES\})
+endif()
+")
+
+if (DEFINED BULLET_ROOT)
+    set(ROOT "-DBULLET_ROOT=${BULLET_ROOT}")
+endif()
+
+message(STATUS "Checking if Bullet uses double precision")
+
+try_compile(RESULT_VAR
+    ${CMAKE_BINARY_DIR}/temp
+    ${TMP_ROOT}
+    checkbullet
+    CMAKE_FLAGS  "${ROOT}"
+    )
+set(HAS_DOUBLE_PRECISION_BULLET ${RESULT_VAR})
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 2fe09070ab..9b65c3da09 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -254,7 +254,7 @@ target_link_libraries(components
     RecastNavigation::Recast
     )
 
-if (BULLET_USE_DOUBLES AND (UBUNTU_FOUND OR DEBIAN_FOUND) AND OPENMW_USE_SYSTEM_BULLET)
+if ((UBUNTU_FOUND OR DEBIAN_FOUND) AND OPENMW_USE_SYSTEM_BULLET)
     target_link_libraries(components BulletCollision-float64 LinearMath-float64)
 else()
     target_link_libraries(components ${BULLET_LIBRARIES})
@@ -292,6 +292,4 @@ endif()
 # Make the variable accessible for other subdirectories
 set(COMPONENT_FILES ${COMPONENT_FILES} PARENT_SCOPE)
 
-if (BULLET_USE_DOUBLES)
-    target_compile_definitions(components PUBLIC BT_USE_DOUBLE_PRECISION)
-endif()
+target_compile_definitions(components PUBLIC BT_USE_DOUBLE_PRECISION)
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 3842b8357b..8257b6b23d 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -28,7 +28,7 @@ if(NOT OPENMW_USE_SYSTEM_BULLET)
     set(BUILD_CPU_DEMOS OFF CACHE BOOL "")
     set(BUILD_EGL OFF CACHE BOOL "")
 
-    set(USE_DOUBLE_PRECISION ${BULLET_USE_DOUBLES} CACHE BOOL "")
+    set(USE_DOUBLE_PRECISION ON CACHE BOOL "")
     set(BULLET2_MULTITHREADING ON CACHE BOOL "")
 
     if(BULLET_STATIC)

From ad5ee1aa1c18b3a9ebaebcb4894c92a9a467026e Mon Sep 17 00:00:00 2001
From: Dobrohotov Alexei <alexdobrohotov@yandex.ru>
Date: Mon, 3 May 2021 01:34:54 +0300
Subject: [PATCH 0690/2859] Don't flip NV PPL shader Y axis erroneously

---
 files/shaders/nv_default_fragment.glsl | 2 --
 1 file changed, 2 deletions(-)

diff --git a/files/shaders/nv_default_fragment.glsl b/files/shaders/nv_default_fragment.glsl
index eadadba392..1bd0f4e310 100644
--- a/files/shaders/nv_default_fragment.glsl
+++ b/files/shaders/nv_default_fragment.glsl
@@ -56,8 +56,6 @@ void main()
 
 #if @normalMap
     vec4 normalTex = texture2D(normalMap, normalMapUV);
-    // Must flip Y for DirectX format normal maps
-    normalTex.y = 1.0 - normalTex.y;
 
     vec3 normalizedNormal = normalize(passNormal);
     vec3 normalizedTangent = normalize(passTangent.xyz);

From e3a6cb1695336c834c9664eabc40028f01e3b99f Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Sun, 2 May 2021 17:13:16 +0100
Subject: [PATCH 0691/2859] Remove OsIdentity.cmake

Removes the OsIdentity.cmake file and uses a cross-compilation friendly
and OS-independent method of detecting system double-precision bullet
instead.
---
 CMakeLists.txt                   | 23 +++++++++--
 cmake/CheckBulletPrecision.cmake | 21 ++++++----
 cmake/OSIdentity.cmake           | 67 --------------------------------
 components/CMakeLists.txt        |  6 +--
 4 files changed, 33 insertions(+), 84 deletions(-)
 delete mode 100644 cmake/OSIdentity.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5fc63152e4..c3c17ddcfc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,9 +13,6 @@ if(POLICY CMP0083)
   cmake_policy(SET CMP0083 NEW)
 endif()
 
-# Detect OS
-include(cmake/OSIdentity.cmake)
-
 option(OPENMW_GL4ES_MANUAL_INIT "Manually initialize gl4es. This is more reliable on platforms without a windowing system. Requires gl4es to be configured with -DNOEGL=ON -DNO_LOADER=ON -DNO_INIT_CONSTRUCTOR=ON." OFF)
 if(OPENMW_GL4ES_MANUAL_INIT)
     add_definitions(-DOPENMW_GL4ES_MANUAL_INIT)
@@ -312,7 +309,25 @@ if(OPENMW_USE_SYSTEM_BULLET)
         set(REQUIRED_BULLET_VERSION 283) # but for build testing, 283 is fine
     endif()
 
-    find_package(Bullet ${REQUIRED_BULLET_VERSION} REQUIRED COMPONENTS BulletCollision LinearMath)
+    # First, try BulletConfig-float64.cmake which comes with Debian derivatives.
+    # This file does not define the Bullet version in a CMake-friendly way.
+    find_package(Bullet CONFIGS BulletConfig-float64.cmake QUIET COMPONENTS BulletCollision LinearMath)
+    if (BULLET_FOUND)
+        string(REPLACE "." "" _bullet_version_num ${BULLET_VERSION_STRING})
+        if (_bullet_version_num VERSION_LESS REQUIRED_BULLET_VERSION)
+            message(FATAL_ERROR "System bullet version too old, OpenMW requires at least ${REQUIRED_BULLET_VERSION}, got ${_bullet_version_num}")
+        endif()
+        # Fix the relative include:
+        set(BULLET_INCLUDE_DIRS "${BULLET_ROOT_DIR}/${BULLET_INCLUDE_DIRS}")
+        include(FindPackageMessage)
+        find_package_message(Bullet "Found Bullet: ${BULLET_LIBRARIES} ${BULLET_VERSION_STRING}" "${BULLET_VERSION_STRING}-float64")
+    else()
+        find_package(Bullet ${REQUIRED_BULLET_VERSION} REQUIRED COMPONENTS BulletCollision LinearMath)
+    endif()
+
+    # Only link the Bullet libraries that we need:
+    string(REGEX MATCHALL "((optimized|debug);)?[^;]*(BulletCollision|LinearMath)[^;]*" BULLET_LIBRARIES "${BULLET_LIBRARIES}")
+
     include(cmake/CheckBulletPrecision.cmake)
     if (HAS_DOUBLE_PRECISION_BULLET)
         message(STATUS "Bullet uses double precision")
diff --git a/cmake/CheckBulletPrecision.cmake b/cmake/CheckBulletPrecision.cmake
index ec36240348..4700f1651d 100644
--- a/cmake/CheckBulletPrecision.cmake
+++ b/cmake/CheckBulletPrecision.cmake
@@ -18,16 +18,21 @@ file(WRITE ${TMP_ROOT}/CMakeLists.txt
 "
 cmake_minimum_required(VERSION 3.1.0)
 project(checkbullet)
-add_executable(checkbullet checkbullet.cpp)
-find_package(Bullet REQUIRED COMPONENTS BulletCollision LinearMath)
-target_compile_definitions(checkbullet PUBLIC BT_USE_DOUBLE_PRECISION)
-include_directories(\$\{BULLET_INCLUDE_DIRS\})
-include(${CMAKE_SOURCE_DIR}/cmake/OSIdentity.cmake)
-if (UBUNTU_FOUND OR DEBIAN_FOUND)
-    target_link_libraries(checkbullet BulletCollision-float64 LinearMath-float64)
+
+# First, try BulletConfig-float64.cmake which comes with Debian derivatives.
+find_package(Bullet CONFIGS BulletConfig-float64.cmake QUIET COMPONENTS BulletCollision LinearMath)
+if (BULLET_FOUND)
+    # Fix the relative include:
+    set(BULLET_INCLUDE_DIRS \"\$\{BULLET_ROOT_DIR\}/\$\{BULLET_INCLUDE_DIRS\}\")
 else()
-    target_link_libraries(checkbullet \$\{BULLET_LIBRARIES\})
+    find_package(Bullet REQUIRED COMPONENTS BulletCollision LinearMath)
 endif()
+string(REGEX MATCHALL \"((optimized|debug);)?[^;]*(BulletCollision|LinearMath)[^;]*\" BULLET_LIBRARIES \"$\{BULLET_LIBRARIES\}\")
+
+add_executable(checkbullet checkbullet.cpp)
+target_compile_definitions(checkbullet PUBLIC BT_USE_DOUBLE_PRECISION)
+target_include_directories(checkbullet PUBLIC \$\{BULLET_INCLUDE_DIRS\})
+target_link_libraries(checkbullet \$\{BULLET_LIBRARIES\})
 ")
 
 if (DEFINED BULLET_ROOT)
diff --git a/cmake/OSIdentity.cmake b/cmake/OSIdentity.cmake
deleted file mode 100644
index 40b7b20895..0000000000
--- a/cmake/OSIdentity.cmake
+++ /dev/null
@@ -1,67 +0,0 @@
-if (UNIX)
-
-    if (APPLE)
-
-        set(CMAKE_OS_NAME "OSX" CACHE STRING "Operating system name" FORCE)
-
-    else (APPLE)
-
-        ## Check for Debian GNU/Linux ________________
-
-        find_file(DEBIAN_FOUND debian_version debconf.conf
-                PATHS /etc
-                )
-        if (DEBIAN_FOUND)
-            set(CMAKE_OS_NAME "Debian" CACHE STRING "Operating system name" FORCE)
-        endif (DEBIAN_FOUND)
-
-        ##  Check for Fedora _________________________
-
-        find_file(FEDORA_FOUND fedora-release
-                PATHS /etc
-                )
-        if (FEDORA_FOUND)
-            set(CMAKE_OS_NAME "Fedora" CACHE STRING "Operating system name" FORCE)
-        endif (FEDORA_FOUND)
-
-        ##  Check for RedHat _________________________
-
-        find_file(REDHAT_FOUND redhat-release inittab.RH
-                PATHS /etc
-                )
-        if (REDHAT_FOUND)
-            set(CMAKE_OS_NAME "RedHat" CACHE STRING "Operating system name" FORCE)
-        endif (REDHAT_FOUND)
-
-        ## Extra check for Ubuntu ____________________
-
-        if (DEBIAN_FOUND)
-
-            ## At its core Ubuntu is a Debian system, with
-            ## a slightly altered configuration; hence from
-            ## a first superficial inspection a system will
-            ## be considered as Debian, which signifies an
-            ## extra check is required.
-
-            find_file(UBUNTU_EXTRA legal issue
-                    PATHS /etc
-                    )
-
-            if (UBUNTU_EXTRA)
-                ## Scan contents of file
-                file(STRINGS ${UBUNTU_EXTRA} UBUNTU_FOUND
-                        REGEX Ubuntu
-                        )
-                ## Check result of string search
-                if (UBUNTU_FOUND)
-                    set(CMAKE_OS_NAME "Ubuntu" CACHE STRING "Operating system name" FORCE)
-                    set(DEBIAN_FOUND FALSE)
-                endif (UBUNTU_FOUND)
-
-            endif (UBUNTU_EXTRA)
-
-        endif (DEBIAN_FOUND)
-
-    endif (APPLE)
-
-endif (UNIX)
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 9b65c3da09..b901b2e17f 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -254,11 +254,7 @@ target_link_libraries(components
     RecastNavigation::Recast
     )
 
-if ((UBUNTU_FOUND OR DEBIAN_FOUND) AND OPENMW_USE_SYSTEM_BULLET)
-    target_link_libraries(components BulletCollision-float64 LinearMath-float64)
-else()
-    target_link_libraries(components ${BULLET_LIBRARIES})
-endif()
+target_link_libraries(components ${BULLET_LIBRARIES})
 
 if (WIN32)
     target_link_libraries(components

From 22aebcea74e1690fcf09d71b998d4de941e5b203 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 4 May 2021 02:17:40 +0200
Subject: [PATCH 0692/2859] Remove useless rcMarkWalkableTriangles call

It fills areas.data with walkable triangles but right after it's overwritten
and rcClearUnwalkableTriangles is called instead that fills areas.data with
unwalkable triangles.
---
 components/detournavigator/makenavmesh.cpp | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index 9701b49506..c4abddf290 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -189,23 +189,6 @@ namespace
             {
                 const auto chunk = chunkyMesh.getChunk(cid);
 
-                std::fill(
-                    areas.begin(),
-                    std::min(areas.begin() + static_cast<std::ptrdiff_t>(chunk.mSize),
-                    areas.end()),
-                    AreaType_null
-                );
-
-                rcMarkWalkableTriangles(
-                    &context,
-                    config.walkableSlopeAngle,
-                    recastMesh.getVertices().data(),
-                    static_cast<int>(recastMesh.getVerticesCount()),
-                    chunk.mIndices,
-                    static_cast<int>(chunk.mSize),
-                    areas.data()
-                );
-
                 for (std::size_t i = 0; i < chunk.mSize; ++i)
                     areas[i] = chunk.mAreaTypes[i];
 

From bce06df254b3fbc2136a0472a256e3781e6d8f6b Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 4 May 2021 12:47:11 +0200
Subject: [PATCH 0693/2859] Add missing array header

---
 components/detournavigator/makenavmesh.cpp       | 1 +
 components/detournavigator/recastmeshbuilder.cpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index c4abddf290..5d3f63689d 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -22,6 +22,7 @@
 #include <algorithm>
 #include <iomanip>
 #include <limits>
+#include <array>
 
 namespace
 {
diff --git a/components/detournavigator/recastmeshbuilder.cpp b/components/detournavigator/recastmeshbuilder.cpp
index f8456acf0b..3c6364028c 100644
--- a/components/detournavigator/recastmeshbuilder.cpp
+++ b/components/detournavigator/recastmeshbuilder.cpp
@@ -19,6 +19,7 @@
 #include <algorithm>
 #include <cassert>
 #include <tuple>
+#include <array>
 
 namespace DetourNavigator
 {

From ec87b3f8f715761404deb32a8ff3154ac88c4d9e Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 4 May 2021 02:08:36 +0200
Subject: [PATCH 0694/2859] Remove redundant ChunkyTriMesh

This AABB tree required when need to filter out input mesh that has not
influence navmesh tile output. This filtering is already done before. Each
recast mesh corresponds to a single navmesh tile and has appropriate bounds.
---
 .../detournavigator/navmeshtilescache.cpp     |   3 +-
 .../detournavigator/navigator.cpp             |   1 -
 .../detournavigator/navmeshtilescache.cpp     |  31 ++-
 .../detournavigator/recastmeshbuilder.cpp     |   1 -
 .../tilecachedrecastmeshmanager.cpp           |   1 -
 components/CMakeLists.txt                     |   1 -
 components/detournavigator/chunkytrimesh.cpp  | 179 ------------------
 components/detournavigator/chunkytrimesh.hpp  | 102 ----------
 components/detournavigator/makenavmesh.cpp    |  63 +++---
 components/detournavigator/recastmesh.cpp     |   3 +-
 components/detournavigator/recastmesh.hpp     |   9 +-
 .../detournavigator/recastmeshbuilder.cpp     |   4 +-
 components/detournavigator/settings.cpp       |   1 -
 components/detournavigator/settings.hpp       |   1 -
 .../reference/modding/settings/navigator.rst  |   9 -
 files/settings-default.cfg                    |   3 -
 16 files changed, 39 insertions(+), 373 deletions(-)
 delete mode 100644 components/detournavigator/chunkytrimesh.cpp
 delete mode 100644 components/detournavigator/chunkytrimesh.hpp

diff --git a/apps/benchmarks/detournavigator/navmeshtilescache.cpp b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
index 10aa0672a7..2c7a981ad5 100644
--- a/apps/benchmarks/detournavigator/navmeshtilescache.cpp
+++ b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
@@ -114,9 +114,8 @@ namespace
         generateAreaTypes(std::back_inserter(areaTypes), indices.size() / 3, random);
         std::vector<RecastMesh::Water> water;
         generateWater(std::back_inserter(water), 2, random);
-        const std::size_t trianglesPerChunk = 256;
         RecastMesh recastMesh(generation, revision, std::move(indices), std::move(vertices),
-                              std::move(areaTypes), std::move(water), trianglesPerChunk);
+                              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)};
diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index 3b7dc49151..6192765888 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -68,7 +68,6 @@ namespace
             mSettings.mMaxNavMeshTilesCacheSize = 1024 * 1024;
             mSettings.mMaxPolygonPathSize = 1024;
             mSettings.mMaxSmoothPathSize = 1024;
-            mSettings.mTrianglesPerChunk = 256;
             mSettings.mMaxPolys = 4096;
             mSettings.mMaxTilesNumber = 512;
             mSettings.mMinUpdateInterval = std::chrono::milliseconds(50);
diff --git a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
index 5d4b1602f8..a16c3af1d3 100644
--- a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
+++ b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
@@ -31,9 +31,7 @@ namespace
         const std::vector<float> mVertices {{0, 0, 0, 1, 0, 0, 1, 1, 0}};
         const std::vector<AreaType> mAreaTypes {1, AreaType_ground};
         const std::vector<RecastMesh::Water> mWater {};
-        const std::size_t mTrianglesPerChunk {1};
-        const RecastMesh mRecastMesh {mGeneration, mRevision, mIndices, mVertices,
-                                      mAreaTypes, mWater, mTrianglesPerChunk};
+        const RecastMesh mRecastMesh {mGeneration, mRevision, mIndices, mVertices, mAreaTypes, mWater};
         const std::vector<OffMeshConnection> mOffMeshConnections {};
         unsigned char* const mData = reinterpret_cast<unsigned char*>(dtAlloc(1, DT_ALLOC_PERM));
         NavMeshData mNavMeshData {mData, 1};
@@ -130,8 +128,7 @@ namespace
         const std::size_t maxSize = 1;
         NavMeshTilesCache cache(maxSize);
         const std::vector<RecastMesh::Water> water {1, RecastMesh::Water {1, btTransform::getIdentity()}};
-        const RecastMesh unexistentRecastMesh {mGeneration, mRevision, mIndices, mVertices,
-            mAreaTypes, water, mTrianglesPerChunk};
+        const RecastMesh unexistentRecastMesh {mGeneration, mRevision, mIndices, mVertices, mAreaTypes, water};
 
         cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections, std::move(mNavMeshData));
         EXPECT_FALSE(cache.get(mAgentHalfExtents, mTilePosition, unexistentRecastMesh, mOffMeshConnections));
@@ -145,8 +142,7 @@ namespace
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<RecastMesh::Water> water {1, RecastMesh::Water {1, btTransform::getIdentity()}};
-        const RecastMesh anotherRecastMesh {mGeneration, mRevision, mIndices, mVertices,
-            mAreaTypes, water, mTrianglesPerChunk};
+        const RecastMesh anotherRecastMesh {mGeneration, mRevision, mIndices, mVertices, mAreaTypes, water};
         const auto anotherData = reinterpret_cast<unsigned char*>(dtAlloc(1, DT_ALLOC_PERM));
         NavMeshData anotherNavMeshData {anotherData, 1};
 
@@ -166,8 +162,7 @@ namespace
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<RecastMesh::Water> water {1, RecastMesh::Water {1, btTransform::getIdentity()}};
-        const RecastMesh anotherRecastMesh {mGeneration, mRevision, mIndices, mVertices,
-            mAreaTypes, water, mTrianglesPerChunk};
+        const RecastMesh anotherRecastMesh {mGeneration, mRevision, mIndices, mVertices, mAreaTypes, water};
         const auto anotherData = reinterpret_cast<unsigned char*>(dtAlloc(1, DT_ALLOC_PERM));
         NavMeshData anotherNavMeshData {anotherData, 1};
 
@@ -186,13 +181,13 @@ namespace
 
         const std::vector<RecastMesh::Water> leastRecentlySetWater {1, RecastMesh::Water {1, btTransform::getIdentity()}};
         const RecastMesh leastRecentlySetRecastMesh {mGeneration, mRevision, mIndices, mVertices,
-            mAreaTypes, leastRecentlySetWater, mTrianglesPerChunk};
+            mAreaTypes, leastRecentlySetWater};
         const auto leastRecentlySetData = reinterpret_cast<unsigned char*>(dtAlloc(1, DT_ALLOC_PERM));
         NavMeshData leastRecentlySetNavMeshData {leastRecentlySetData, 1};
 
         const std::vector<RecastMesh::Water> mostRecentlySetWater {1, RecastMesh::Water {2, btTransform::getIdentity()}};
         const RecastMesh mostRecentlySetRecastMesh {mGeneration, mRevision, mIndices, mVertices,
-            mAreaTypes, mostRecentlySetWater, mTrianglesPerChunk};
+            mAreaTypes, mostRecentlySetWater};
         const auto mostRecentlySetData = reinterpret_cast<unsigned char*>(dtAlloc(1, DT_ALLOC_PERM));
         NavMeshData mostRecentlySetNavMeshData {mostRecentlySetData, 1};
 
@@ -218,13 +213,13 @@ namespace
 
         const std::vector<RecastMesh::Water> leastRecentlyUsedWater {1, RecastMesh::Water {1, btTransform::getIdentity()}};
         const RecastMesh leastRecentlyUsedRecastMesh {mGeneration, mRevision, mIndices, mVertices,
-            mAreaTypes, leastRecentlyUsedWater, mTrianglesPerChunk};
+            mAreaTypes, leastRecentlyUsedWater};
         const auto leastRecentlyUsedData = reinterpret_cast<unsigned char*>(dtAlloc(1, DT_ALLOC_PERM));
         NavMeshData leastRecentlyUsedNavMeshData {leastRecentlyUsedData, 1};
 
         const std::vector<RecastMesh::Water> mostRecentlyUsedWater {1, RecastMesh::Water {2, btTransform::getIdentity()}};
         const RecastMesh mostRecentlyUsedRecastMesh {mGeneration, mRevision, mIndices, mVertices,
-            mAreaTypes, mostRecentlyUsedWater, mTrianglesPerChunk};
+            mAreaTypes, mostRecentlyUsedWater};
         const auto mostRecentlyUsedData = reinterpret_cast<unsigned char*>(dtAlloc(1, DT_ALLOC_PERM));
         NavMeshData mostRecentlyUsedNavMeshData {mostRecentlyUsedData, 1};
 
@@ -261,7 +256,7 @@ namespace
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<RecastMesh::Water> water {1, RecastMesh::Water {1, btTransform::getIdentity()}};
-        const RecastMesh tooLargeRecastMesh {mGeneration, mRevision, mIndices, mVertices, mAreaTypes, water, mTrianglesPerChunk};
+        const RecastMesh tooLargeRecastMesh {mGeneration, mRevision, mIndices, mVertices, mAreaTypes, water};
         const auto tooLargeData = reinterpret_cast<unsigned char*>(dtAlloc(2, DT_ALLOC_PERM));
         NavMeshData tooLargeNavMeshData {tooLargeData, 2};
 
@@ -280,13 +275,13 @@ namespace
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<RecastMesh::Water> anotherWater {1, RecastMesh::Water {1, btTransform::getIdentity()}};
-        const RecastMesh anotherRecastMesh {mGeneration, mRevision, mIndices, mVertices, mAreaTypes, anotherWater, mTrianglesPerChunk};
+        const RecastMesh anotherRecastMesh {mGeneration, mRevision, mIndices, mVertices, mAreaTypes, anotherWater};
         const auto anotherData = reinterpret_cast<unsigned char*>(dtAlloc(1, DT_ALLOC_PERM));
         NavMeshData anotherNavMeshData {anotherData, 1};
 
         const std::vector<RecastMesh::Water> tooLargeWater {1, RecastMesh::Water {2, btTransform::getIdentity()}};
         const RecastMesh tooLargeRecastMesh {mGeneration, mRevision, mIndices, mVertices,
-            mAreaTypes, tooLargeWater, mTrianglesPerChunk};
+            mAreaTypes, tooLargeWater};
         const auto tooLargeData = reinterpret_cast<unsigned char*>(dtAlloc(2, DT_ALLOC_PERM));
         NavMeshData tooLargeNavMeshData {tooLargeData, 2};
 
@@ -310,7 +305,7 @@ namespace
 
         const std::vector<RecastMesh::Water> water {1, RecastMesh::Water {1, btTransform::getIdentity()}};
         const RecastMesh anotherRecastMesh {mGeneration, mRevision, mIndices, mVertices,
-            mAreaTypes, water, mTrianglesPerChunk};
+            mAreaTypes, water};
         const auto anotherData = reinterpret_cast<unsigned char*>(dtAlloc(1, DT_ALLOC_PERM));
         NavMeshData anotherNavMeshData {anotherData, 1};
 
@@ -333,7 +328,7 @@ namespace
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<RecastMesh::Water> water {1, RecastMesh::Water {1, btTransform::getIdentity()}};
-        const RecastMesh anotherRecastMesh {mGeneration, mRevision, mIndices, mVertices, mAreaTypes, water, mTrianglesPerChunk};
+        const RecastMesh anotherRecastMesh {mGeneration, mRevision, mIndices, mVertices, mAreaTypes, water};
         const auto anotherData = reinterpret_cast<unsigned char*>(dtAlloc(1, DT_ALLOC_PERM));
         NavMeshData anotherNavMeshData {anotherData, 1};
 
diff --git a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
index bcbf448acd..5f43f48008 100644
--- a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
+++ b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
@@ -37,7 +37,6 @@ namespace
         DetourNavigatorRecastMeshBuilderTest()
         {
             mSettings.mRecastScaleFactor = 1.0f;
-            mSettings.mTrianglesPerChunk = 256;
             mBounds.mMin = osg::Vec2f(-std::numeric_limits<float>::max() * std::numeric_limits<float>::epsilon(),
                                       -std::numeric_limits<float>::max() * std::numeric_limits<float>::epsilon());
             mBounds.mMax = osg::Vec2f(std::numeric_limits<float>::max() * std::numeric_limits<float>::epsilon(),
diff --git a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
index be52090014..2d6d9f66bb 100644
--- a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -24,7 +24,6 @@ namespace
             mSettings.mCellSize = 0.2f;
             mSettings.mRecastScaleFactor = 0.017647058823529415f;
             mSettings.mTileSize = 64;
-            mSettings.mTrianglesPerChunk = 256;
         }
 
         void onChangedTile(const TilePosition& tilePosition)
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index b901b2e17f..9041ee5333 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -173,7 +173,6 @@ add_component_dir(detournavigator
     navmeshmanager
     navigatorimpl
     asyncnavmeshupdater
-    chunkytrimesh
     recastmesh
     tilecachedrecastmeshmanager
     recastmeshobject
diff --git a/components/detournavigator/chunkytrimesh.cpp b/components/detournavigator/chunkytrimesh.cpp
deleted file mode 100644
index ffd39d0a97..0000000000
--- a/components/detournavigator/chunkytrimesh.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-#include "chunkytrimesh.hpp"
-#include "exceptions.hpp"
-
-#include <osg/Vec2f>
-
-#include <algorithm>
-
-namespace DetourNavigator
-{
-    namespace
-    {
-        struct BoundsItem
-        {
-            Rect mBounds;
-            std::ptrdiff_t mOffset;
-            unsigned char mAreaTypes;
-        };
-
-        template <std::size_t axis>
-        struct LessBoundsItem
-        {
-            bool operator ()(const BoundsItem& lhs, const BoundsItem& rhs) const
-            {
-                return lhs.mBounds.mMinBound[axis] < rhs.mBounds.mMinBound[axis];
-            }
-        };
-
-        void calcExtends(const std::vector<BoundsItem>& items, const std::size_t imin, const std::size_t imax,
-                         Rect& bounds)
-        {
-            bounds = items[imin].mBounds;
-
-            std::for_each(
-                items.begin() + static_cast<std::ptrdiff_t>(imin) + 1,
-                items.begin() + static_cast<std::ptrdiff_t>(imax),
-                [&] (const BoundsItem& item)
-                {
-                    for (int i = 0; i < 2; ++i)
-                    {
-                        bounds.mMinBound[i] = std::min(bounds.mMinBound[i], item.mBounds.mMinBound[i]);
-                        bounds.mMaxBound[i] = std::max(bounds.mMaxBound[i], item.mBounds.mMaxBound[i]);
-                    }
-                });
-        }
-
-        void subdivide(std::vector<BoundsItem>& items, const std::size_t imin, const std::size_t imax,
-            const std::size_t trisPerChunk, const std::vector<int>& inIndices, const std::vector<AreaType>& inAreaTypes,
-            std::size_t& curNode, std::vector<ChunkyTriMeshNode>& nodes, std::size_t& curTri,
-            std::vector<int>& outIndices, std::vector<AreaType>& outAreaTypes)
-        {
-            const auto inum = imax - imin;
-            const auto icur = curNode;
-
-            if (curNode >= nodes.size())
-                return;
-
-            ChunkyTriMeshNode& node = nodes[curNode++];
-
-            if (inum <= trisPerChunk)
-            {
-                // Leaf
-                calcExtends(items, imin, imax, node.mBounds);
-
-                // Copy triangles.
-                node.mOffset = static_cast<std::ptrdiff_t>(curTri);
-                node.mSize = inum;
-
-                for (std::size_t i = imin; i < imax; ++i)
-                {
-                    std::copy(
-                        inIndices.begin() + items[i].mOffset * 3,
-                        inIndices.begin() + items[i].mOffset * 3 + 3,
-                        outIndices.begin() + static_cast<std::ptrdiff_t>(curTri) * 3
-                    );
-                    outAreaTypes[curTri] = inAreaTypes[static_cast<std::size_t>(items[i].mOffset)];
-                    curTri++;
-                }
-            }
-            else
-            {
-                // Split
-                calcExtends(items, imin, imax, node.mBounds);
-
-                if (node.mBounds.mMaxBound.x() - node.mBounds.mMinBound.x()
-                    >= node.mBounds.mMaxBound.y() - node.mBounds.mMinBound.y())
-                {
-                    // Sort along x-axis
-                    std::sort(
-                        items.begin() + static_cast<std::ptrdiff_t>(imin),
-                        items.begin() + static_cast<std::ptrdiff_t>(imax),
-                        LessBoundsItem<0> {}
-                    );
-                }
-                else
-                {
-                    // Sort along y-axis
-                    std::sort(
-                        items.begin() + static_cast<std::ptrdiff_t>(imin),
-                        items.begin() + static_cast<std::ptrdiff_t>(imax),
-                        LessBoundsItem<1> {}
-                    );
-                }
-
-                const auto isplit = imin + inum / 2;
-
-                // Left
-                subdivide(items, imin, isplit, trisPerChunk, inIndices, inAreaTypes, curNode, nodes, curTri, outIndices, outAreaTypes);
-                // Right
-                subdivide(items, isplit, imax, trisPerChunk, inIndices, inAreaTypes, curNode, nodes, curTri, outIndices, outAreaTypes);
-
-                const auto iescape = static_cast<std::ptrdiff_t>(curNode) - static_cast<std::ptrdiff_t>(icur);
-                // Negative index means escape.
-                node.mOffset = -iescape;
-            }
-        }
-    }
-
-    ChunkyTriMesh::ChunkyTriMesh(const std::vector<float>& verts, const std::vector<int>& indices,
-                                 const std::vector<AreaType>& flags, const std::size_t trisPerChunk)
-        : mMaxTrisPerChunk(0)
-    {
-        const auto trianglesCount = indices.size() / 3;
-
-        if (trianglesCount == 0)
-            return;
-
-        const auto nchunks = (trianglesCount + trisPerChunk - 1) / trisPerChunk;
-
-        mNodes.resize(nchunks * 4);
-        mIndices.resize(trianglesCount * 3);
-        mAreaTypes.resize(trianglesCount);
-
-        // Build tree
-        std::vector<BoundsItem> items(trianglesCount);
-
-        for (std::size_t i = 0; i < trianglesCount; i++)
-        {
-            auto& item = items[i];
-
-            item.mOffset = static_cast<std::ptrdiff_t>(i);
-            item.mAreaTypes = flags[i];
-
-            // Calc triangle XZ bounds.
-            const auto baseIndex = static_cast<std::size_t>(indices[i * 3]) * 3;
-
-            item.mBounds.mMinBound.x() = item.mBounds.mMaxBound.x() = verts[baseIndex + 0];
-            item.mBounds.mMinBound.y() = item.mBounds.mMaxBound.y() = verts[baseIndex + 2];
-
-            for (std::size_t j = 1; j < 3; ++j)
-            {
-                const auto index = static_cast<std::size_t>(indices[i * 3 + j]) * 3;
-
-                item.mBounds.mMinBound.x() = std::min(item.mBounds.mMinBound.x(), verts[index + 0]);
-                item.mBounds.mMinBound.y() = std::min(item.mBounds.mMinBound.y(), verts[index + 2]);
-
-                item.mBounds.mMaxBound.x() = std::max(item.mBounds.mMaxBound.x(), verts[index + 0]);
-                item.mBounds.mMaxBound.y() = std::max(item.mBounds.mMaxBound.y(), verts[index + 2]);
-            }
-        }
-
-        std::size_t curTri = 0;
-        std::size_t curNode = 0;
-        subdivide(items, 0, trianglesCount, trisPerChunk, indices, flags, curNode, mNodes, curTri, mIndices, mAreaTypes);
-
-        items.clear();
-
-        mNodes.resize(curNode);
-
-        // Calc max tris per node.
-        for (auto& node : mNodes)
-        {
-            const bool isLeaf = node.mOffset >= 0;
-            if (!isLeaf)
-                continue;
-            if (node.mSize > mMaxTrisPerChunk)
-                mMaxTrisPerChunk = node.mSize;
-        }
-    }
-}
diff --git a/components/detournavigator/chunkytrimesh.hpp b/components/detournavigator/chunkytrimesh.hpp
deleted file mode 100644
index 7f98f5d22a..0000000000
--- a/components/detournavigator/chunkytrimesh.hpp
+++ /dev/null
@@ -1,102 +0,0 @@
-#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_CHUNKYTRIMESH_H
-#define OPENMW_COMPONENTS_DETOURNAVIGATOR_CHUNKYTRIMESH_H
-
-#include "areatype.hpp"
-
-#include <osg/Vec2f>
-
-#include <array>
-#include <vector>
-
-namespace DetourNavigator
-{
-    struct Rect
-    {
-        osg::Vec2f mMinBound;
-        osg::Vec2f mMaxBound;
-    };
-
-    struct ChunkyTriMeshNode
-    {
-        Rect mBounds;
-        std::ptrdiff_t mOffset;
-        std::size_t mSize;
-    };
-
-    struct Chunk
-    {
-        const int* const mIndices;
-        const AreaType* const mAreaTypes;
-        const std::size_t mSize;
-    };
-
-    inline bool checkOverlapRect(const Rect& lhs, const Rect& rhs)
-    {
-        bool overlap = true;
-        overlap = (lhs.mMinBound.x() > rhs.mMaxBound.x() || lhs.mMaxBound.x() < rhs.mMinBound.x()) ? false : overlap;
-        overlap = (lhs.mMinBound.y() > rhs.mMaxBound.y() || lhs.mMaxBound.y() < rhs.mMinBound.y()) ? false : overlap;
-        return overlap;
-    }
-
-    class ChunkyTriMesh
-    {
-    public:
-        /// Creates partitioned triangle mesh (AABB tree),
-        /// where each node contains at max trisPerChunk triangles.
-        ChunkyTriMesh(const std::vector<float>& verts, const std::vector<int>& tris,
-                      const std::vector<AreaType>& flags, const std::size_t trisPerChunk);
-
-        ChunkyTriMesh(ChunkyTriMesh&&) = default;
-        ChunkyTriMesh& operator=(ChunkyTriMesh&&) = default;
-
-        ChunkyTriMesh(const ChunkyTriMesh&) = delete;
-        ChunkyTriMesh& operator=(const ChunkyTriMesh&) = delete;
-
-        /// Returns the chunk indices which overlap the input rectable.
-        template <class Function>
-        void forEachChunksOverlappingRect(const Rect& rect, Function&& function) const
-        {
-            // Traverse tree
-            for (std::size_t i = 0; i < mNodes.size(); )
-            {
-                const ChunkyTriMeshNode* node = &mNodes[i];
-                const bool overlap = checkOverlapRect(rect, node->mBounds);
-                const bool isLeafNode = node->mOffset >= 0;
-
-                if (isLeafNode && overlap)
-                    function(i);
-
-                if (overlap || isLeafNode)
-                    i++;
-                else
-                {
-                    const auto escapeIndex = -node->mOffset;
-                    i += static_cast<std::size_t>(escapeIndex);
-                }
-            }
-        }
-
-        Chunk getChunk(const std::size_t chunkId) const
-        {
-            const auto& node = mNodes[chunkId];
-            return Chunk {
-                mIndices.data() + node.mOffset * 3,
-                mAreaTypes.data() + node.mOffset,
-                node.mSize
-            };
-        }
-
-        std::size_t getMaxTrisPerChunk() const
-        {
-            return mMaxTrisPerChunk;
-        }
-
-    private:
-        std::vector<ChunkyTriMeshNode> mNodes;
-        std::vector<int> mIndices;
-        std::vector<AreaType> mAreaTypes;
-        std::size_t mMaxTrisPerChunk;
-    };
-}
-
-#endif
diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index 5d3f63689d..70fd44c6c0 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -1,5 +1,4 @@
 #include "makenavmesh.hpp"
-#include "chunkytrimesh.hpp"
 #include "debug.hpp"
 #include "dtstatus.hpp"
 #include "exceptions.hpp"
@@ -179,48 +178,30 @@ namespace
     bool rasterizeSolidObjectsTriangles(rcContext& context, const RecastMesh& recastMesh, const rcConfig& config,
         rcHeightfield& solid)
     {
-        const auto& chunkyMesh = recastMesh.getChunkyTriMesh();
-        std::vector<unsigned char> areas(chunkyMesh.getMaxTrisPerChunk(), AreaType_null);
         const osg::Vec2f tileBoundsMin(config.bmin[0], config.bmin[2]);
         const osg::Vec2f tileBoundsMax(config.bmax[0], config.bmax[2]);
-        bool result = false;
-
-        chunkyMesh.forEachChunksOverlappingRect(Rect {tileBoundsMin, tileBoundsMax},
-            [&] (const std::size_t cid)
-            {
-                const auto chunk = chunkyMesh.getChunk(cid);
-
-                for (std::size_t i = 0; i < chunk.mSize; ++i)
-                    areas[i] = chunk.mAreaTypes[i];
-
-                rcClearUnwalkableTriangles(
-                    &context,
-                    config.walkableSlopeAngle,
-                    recastMesh.getVertices().data(),
-                    static_cast<int>(recastMesh.getVerticesCount()),
-                    chunk.mIndices,
-                    static_cast<int>(chunk.mSize),
-                    areas.data()
-                );
-
-                const auto trianglesRasterized = rcRasterizeTriangles(
-                    &context,
-                    recastMesh.getVertices().data(),
-                    static_cast<int>(recastMesh.getVerticesCount()),
-                    chunk.mIndices,
-                    areas.data(),
-                    static_cast<int>(chunk.mSize),
-                    solid,
-                    config.walkableClimb
-                );
-
-                if (!trianglesRasterized)
-                    throw NavigatorException("Failed to create rasterize triangles from recast mesh for navmesh");
-
-                result = true;
-            });
-
-        return result;
+        std::vector<unsigned char> areas(recastMesh.getAreaTypes().begin(), recastMesh.getAreaTypes().end());
+
+        rcClearUnwalkableTriangles(
+            &context,
+            config.walkableSlopeAngle,
+            recastMesh.getVertices().data(),
+            static_cast<int>(recastMesh.getVerticesCount()),
+            recastMesh.getIndices().data(),
+            static_cast<int>(areas.size()),
+            areas.data()
+        );
+
+        return rcRasterizeTriangles(
+            &context,
+            recastMesh.getVertices().data(),
+            static_cast<int>(recastMesh.getVerticesCount()),
+            recastMesh.getIndices().data(),
+            areas.data(),
+            static_cast<int>(areas.size()),
+            solid,
+            config.walkableClimb
+        );
     }
 
     void rasterizeWaterTriangles(rcContext& context, const osg::Vec3f& agentHalfExtents, const RecastMesh& recastMesh,
diff --git a/components/detournavigator/recastmesh.cpp b/components/detournavigator/recastmesh.cpp
index dc56f7b931..1a9982402b 100644
--- a/components/detournavigator/recastmesh.cpp
+++ b/components/detournavigator/recastmesh.cpp
@@ -6,14 +6,13 @@
 namespace DetourNavigator
 {
     RecastMesh::RecastMesh(std::size_t generation, std::size_t revision, std::vector<int> indices, std::vector<float> vertices,
-            std::vector<AreaType> areaTypes, std::vector<Water> water, const std::size_t trianglesPerChunk)
+            std::vector<AreaType> areaTypes, std::vector<Water> water)
         : mGeneration(generation)
         , mRevision(revision)
         , mIndices(std::move(indices))
         , mVertices(std::move(vertices))
         , mAreaTypes(std::move(areaTypes))
         , mWater(std::move(water))
-        , mChunkyTriMesh(mVertices, mIndices, mAreaTypes, trianglesPerChunk)
     {
         if (getTrianglesCount() != mAreaTypes.size())
             throw InvalidArgument("Number of flags doesn't match number of triangles: triangles="
diff --git a/components/detournavigator/recastmesh.hpp b/components/detournavigator/recastmesh.hpp
index 746422ac82..1961d518d7 100644
--- a/components/detournavigator/recastmesh.hpp
+++ b/components/detournavigator/recastmesh.hpp
@@ -2,7 +2,6 @@
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_RECASTMESH_H
 
 #include "areatype.hpp"
-#include "chunkytrimesh.hpp"
 #include "bounds.hpp"
 
 #include <components/bullethelpers/operators.hpp>
@@ -28,7 +27,7 @@ namespace DetourNavigator
         };
 
         RecastMesh(std::size_t generation, std::size_t revision, std::vector<int> indices, std::vector<float> vertices,
-            std::vector<AreaType> areaTypes, std::vector<Water> water, const std::size_t trianglesPerChunk);
+            std::vector<AreaType> areaTypes, std::vector<Water> water);
 
         std::size_t getGeneration() const
         {
@@ -70,11 +69,6 @@ namespace DetourNavigator
             return mIndices.size() / 3;
         }
 
-        const ChunkyTriMesh& getChunkyTriMesh() const
-        {
-            return mChunkyTriMesh;
-        }
-
         const Bounds& getBounds() const
         {
             return mBounds;
@@ -87,7 +81,6 @@ namespace DetourNavigator
         std::vector<float> mVertices;
         std::vector<AreaType> mAreaTypes;
         std::vector<Water> mWater;
-        ChunkyTriMesh mChunkyTriMesh;
         Bounds mBounds;
     };
 
diff --git a/components/detournavigator/recastmeshbuilder.cpp b/components/detournavigator/recastmeshbuilder.cpp
index 3c6364028c..7e06c9229c 100644
--- a/components/detournavigator/recastmeshbuilder.cpp
+++ b/components/detournavigator/recastmeshbuilder.cpp
@@ -1,5 +1,4 @@
 #include "recastmeshbuilder.hpp"
-#include "chunkytrimesh.hpp"
 #include "debug.hpp"
 #include "settings.hpp"
 #include "settingsutils.hpp"
@@ -157,8 +156,7 @@ namespace DetourNavigator
     {
         optimizeRecastMesh(mIndices, mVertices);
         std::sort(mWater.begin(), mWater.end());
-        return std::make_shared<RecastMesh>(generation, revision, mIndices, mVertices, mAreaTypes,
-            mWater, mSettings.get().mTrianglesPerChunk);
+        return std::make_shared<RecastMesh>(generation, revision, mIndices, mVertices, mAreaTypes, mWater);
     }
 
     void RecastMeshBuilder::reset()
diff --git a/components/detournavigator/settings.cpp b/components/detournavigator/settings.cpp
index 977b80cf5f..0c4d0f838b 100644
--- a/components/detournavigator/settings.cpp
+++ b/components/detournavigator/settings.cpp
@@ -33,7 +33,6 @@ namespace DetourNavigator
         navigatorSettings.mMaxNavMeshTilesCacheSize = static_cast<std::size_t>(::Settings::Manager::getInt("max nav mesh tiles cache size", "Navigator"));
         navigatorSettings.mMaxPolygonPathSize = static_cast<std::size_t>(::Settings::Manager::getInt("max polygon path size", "Navigator"));
         navigatorSettings.mMaxSmoothPathSize = static_cast<std::size_t>(::Settings::Manager::getInt("max smooth path size", "Navigator"));
-        navigatorSettings.mTrianglesPerChunk = static_cast<std::size_t>(::Settings::Manager::getInt("triangles per chunk", "Navigator"));
         navigatorSettings.mEnableWriteRecastMeshToFile = ::Settings::Manager::getBool("enable write recast mesh to file", "Navigator");
         navigatorSettings.mEnableWriteNavMeshToFile = ::Settings::Manager::getBool("enable write nav mesh to file", "Navigator");
         navigatorSettings.mRecastMeshPathPrefix = ::Settings::Manager::getString("recast mesh path prefix", "Navigator");
diff --git a/components/detournavigator/settings.hpp b/components/detournavigator/settings.hpp
index d73087b217..ece16e35a9 100644
--- a/components/detournavigator/settings.hpp
+++ b/components/detournavigator/settings.hpp
@@ -35,7 +35,6 @@ namespace DetourNavigator
         std::size_t mMaxNavMeshTilesCacheSize = 0;
         std::size_t mMaxPolygonPathSize = 0;
         std::size_t mMaxSmoothPathSize = 0;
-        std::size_t mTrianglesPerChunk = 0;
         std::string mRecastMeshPathPrefix;
         std::string mNavMeshPathPrefix;
         std::chrono::milliseconds mMinUpdateInterval;
diff --git a/docs/source/reference/modding/settings/navigator.rst b/docs/source/reference/modding/settings/navigator.rst
index fcef549d0e..b9485c3e95 100644
--- a/docs/source/reference/modding/settings/navigator.rst
+++ b/docs/source/reference/modding/settings/navigator.rst
@@ -231,15 +231,6 @@ max smooth path size
 
 Maximum size of smoothed path.
 
-triangles per chunk
--------------------
-
-:Type:		integer
-:Range:		> 0
-:Default:	256
-
-Maximum number of triangles in each node of mesh AABB tree.
-
 Expert Recastnavigation related settings
 ****************************************
 
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index c20820e684..ea678c70f6 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -875,9 +875,6 @@ max polygon path size = 1024
 # Maximum size of smoothed path (value > 0)
 max smooth path size = 1024
 
-# Maximum number of triangles in each node of mesh AABB tree (value > 0)
-triangles per chunk = 256
-
 # Write recast mesh to file in .obj format for each use to update nav mesh (true, false)
 enable write recast mesh to file = false
 

From 865ef56a09aa739bdf42a7129ebd2c0d144f7bb8 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 4 May 2021 12:58:57 +0200
Subject: [PATCH 0695/2859] Replace include by RecastMesh forward declaration

To reduce dependency between navigator interface and implementation.
---
 components/detournavigator/navigator.hpp       | 1 -
 components/detournavigator/recastmeshtiles.hpp | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/detournavigator/navigator.hpp b/components/detournavigator/navigator.hpp
index d08bfa640f..edf597348f 100644
--- a/components/detournavigator/navigator.hpp
+++ b/components/detournavigator/navigator.hpp
@@ -6,7 +6,6 @@
 #include "settings.hpp"
 #include "objectid.hpp"
 #include "navmeshcacheitem.hpp"
-#include "recastmesh.hpp"
 #include "recastmeshtiles.hpp"
 
 namespace ESM
diff --git a/components/detournavigator/recastmeshtiles.hpp b/components/detournavigator/recastmeshtiles.hpp
index 68e30ba630..03059c7449 100644
--- a/components/detournavigator/recastmeshtiles.hpp
+++ b/components/detournavigator/recastmeshtiles.hpp
@@ -2,13 +2,14 @@
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_RECASTMESHTILE_H
 
 #include "tileposition.hpp"
-#include "recastmesh.hpp"
 
 #include <map>
 #include <memory>
 
 namespace DetourNavigator
 {
+    class RecastMesh;
+
     using RecastMeshTiles = std::map<TilePosition, std::shared_ptr<RecastMesh>>;
 }
 

From 231780a51d43d96a3a62f9c8b90565201a3c9b35 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Tue, 4 May 2021 22:18:30 +0200
Subject: [PATCH 0696/2859] Simplify the bullet detection. This way we don't
 need to explicitly pass all possible variables to the try_compile stuff

---
 cmake/CheckBulletPrecision.cmake | 34 +++++---------------------------
 1 file changed, 5 insertions(+), 29 deletions(-)

diff --git a/cmake/CheckBulletPrecision.cmake b/cmake/CheckBulletPrecision.cmake
index 4700f1651d..77409f9326 100644
--- a/cmake/CheckBulletPrecision.cmake
+++ b/cmake/CheckBulletPrecision.cmake
@@ -14,37 +14,13 @@ int main(int argc, char** argv)
 }
 ")
 
-file(WRITE ${TMP_ROOT}/CMakeLists.txt
-"
-cmake_minimum_required(VERSION 3.1.0)
-project(checkbullet)
-
-# First, try BulletConfig-float64.cmake which comes with Debian derivatives.
-find_package(Bullet CONFIGS BulletConfig-float64.cmake QUIET COMPONENTS BulletCollision LinearMath)
-if (BULLET_FOUND)
-    # Fix the relative include:
-    set(BULLET_INCLUDE_DIRS \"\$\{BULLET_ROOT_DIR\}/\$\{BULLET_INCLUDE_DIRS\}\")
-else()
-    find_package(Bullet REQUIRED COMPONENTS BulletCollision LinearMath)
-endif()
-string(REGEX MATCHALL \"((optimized|debug);)?[^;]*(BulletCollision|LinearMath)[^;]*\" BULLET_LIBRARIES \"$\{BULLET_LIBRARIES\}\")
-
-add_executable(checkbullet checkbullet.cpp)
-target_compile_definitions(checkbullet PUBLIC BT_USE_DOUBLE_PRECISION)
-target_include_directories(checkbullet PUBLIC \$\{BULLET_INCLUDE_DIRS\})
-target_link_libraries(checkbullet \$\{BULLET_LIBRARIES\})
-")
-
-if (DEFINED BULLET_ROOT)
-    set(ROOT "-DBULLET_ROOT=${BULLET_ROOT}")
-endif()
-
 message(STATUS "Checking if Bullet uses double precision")
 
 try_compile(RESULT_VAR
-    ${CMAKE_BINARY_DIR}/temp
-    ${TMP_ROOT}
-    checkbullet
-    CMAKE_FLAGS  "${ROOT}"
+    ${TMP_ROOT}/temp
+    ${TMP_ROOT}/checkbullet.cpp
+    COMPILE_DEFINITIONS "-DBT_USE_DOUBLE_PRECISION"
+    LINK_LIBRARIES ${BULLET_LIBRARIES}
+    CMAKE_FLAGS  "-DINCLUDE_DIRECTORIES=${BULLET_INCLUDE_DIRS}"
     )
 set(HAS_DOUBLE_PRECISION_BULLET ${RESULT_VAR})

From 87ada56edd9d5d5b0a9e6a8dcfd06eb09b161746 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 4 May 2021 20:58:01 +0000
Subject: [PATCH 0697/2859] Various fixes for niftest

---
 components/nif/niffile.cpp   | 12 +++++------
 components/nif/nifstream.cpp |  2 +-
 components/nif/nifstream.hpp | 41 ++++++++++++++++++++----------------
 3 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index 3e226b35e1..864a388e87 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -212,7 +212,7 @@ void NIFFile::parse(Files::IStreamPtr stream)
         userVer = nif.getUInt();
 
     // Number of records
-    unsigned int recNum = nif.getUInt();
+    const std::size_t recNum = nif.getUInt();
     records.resize(recNum);
 
     // Bethesda stream header
@@ -251,7 +251,7 @@ void NIFFile::parse(Files::IStreamPtr stream)
                     std::vector<unsigned int> recSizes; // Currently unused
                     nif.getUInts(recSizes, recNum);
                 }
-                unsigned int stringNum = nif.getUInt();
+                const std::size_t stringNum = nif.getUInt();
                 nif.getUInt(); // Max string length
                 if (stringNum)
                     nif.getSizedStrings(strings, stringNum);
@@ -264,7 +264,7 @@ void NIFFile::parse(Files::IStreamPtr stream)
     }
 
     const bool hasRecordSeparators = ver >= NIFStream::generateVersion(10,0,0,0) && ver < NIFStream::generateVersion(10,2,0,0);
-    for (unsigned int i = 0; i < recNum; i++)
+    for (std::size_t i = 0; i < recNum; i++)
     {
         Record *r = nullptr;
 
@@ -308,14 +308,14 @@ void NIFFile::parse(Files::IStreamPtr stream)
         r->read(&nif);
     }
 
-    unsigned int rootNum = nif.getUInt();
+    const std::size_t rootNum = nif.getUInt();
     roots.resize(rootNum);
 
     //Determine which records are roots
-    for (unsigned int i = 0; i < rootNum; i++)
+    for (std::size_t i = 0; i < rootNum; i++)
     {
         int idx = nif.getInt();
-        if (idx >= 0 && idx < int(records.size()))
+        if (idx >= 0 && static_cast<std::size_t>(idx) < records.size())
         {
             roots[i] = records[idx];
         }
diff --git a/components/nif/nifstream.cpp b/components/nif/nifstream.cpp
index 07c9c917ce..6129a17394 100644
--- a/components/nif/nifstream.cpp
+++ b/components/nif/nifstream.cpp
@@ -7,7 +7,7 @@ namespace Nif
     osg::Quat NIFStream::getQuaternion()
     {
         float f[4];
-        readLittleEndianBufferOfType<4, float>(inp, (float*)&f);
+        readLittleEndianBufferOfType<4, float>(inp, f);
         osg::Quat quat;
         quat.w() = f[0];
         quat.x() = f[1];
diff --git a/components/nif/nifstream.hpp b/components/nif/nifstream.hpp
index 4d221b8676..b6bf01ce58 100644
--- a/components/nif/nifstream.hpp
+++ b/components/nif/nifstream.hpp
@@ -7,6 +7,8 @@
 #include <stdint.h>
 #include <stdexcept>
 #include <vector>
+#include <typeinfo>
+#include <type_traits>
 
 #include <components/files/constrainedfilestream.hpp>
 #include <components/misc/endianness.hpp>
@@ -22,31 +24,32 @@ namespace Nif
 
 class NIFFile;
 
-/* 
-    readLittleEndianBufferOfType: This template should only be used with arithmetic types
-*/
-template <uint32_t numInstances, typename T> inline void readLittleEndianBufferOfType(Files::IStreamPtr &pIStream, T* dest)
+template <std::size_t numInstances, typename T> inline void readLittleEndianBufferOfType(Files::IStreamPtr &pIStream, T* dest)
 {
+    static_assert(std::is_arithmetic_v<T>, "Buffer element type is not arithmetic");
     pIStream->read((char*)dest, numInstances * sizeof(T));
+    if (pIStream->bad())
+        throw std::runtime_error("Failed to read little endian typed (" + std::string(typeid(T).name()) + ") buffer of "
+                                 + std::to_string(numInstances) + " instances");
     if constexpr (Misc::IS_BIG_ENDIAN)
-        for (uint32_t i = 0; i < numInstances; i++)
+        for (std::size_t i = 0; i < numInstances; i++)
             Misc::swapEndiannessInplace(dest[i]);
 }
 
-/*
-    readLittleEndianDynamicBufferOfType: This template should only be used with arithmetic types
-*/
-template <typename T> inline void readLittleEndianDynamicBufferOfType(Files::IStreamPtr &pIStream, T* dest, uint32_t numInstances)
+template <typename T> inline void readLittleEndianDynamicBufferOfType(Files::IStreamPtr &pIStream, T* dest, std::size_t numInstances)
 {
+    static_assert(std::is_arithmetic_v<T>, "Buffer element type is not arithmetic");
     pIStream->read((char*)dest, numInstances * sizeof(T));
+    if (pIStream->bad())
+        throw std::runtime_error("Failed to read little endian dynamic buffer of " + std::to_string(numInstances) + " instances");
     if constexpr (Misc::IS_BIG_ENDIAN)
-        for (uint32_t i = 0; i < numInstances; i++)
+        for (std::size_t i = 0; i < numInstances; i++)
             Misc::swapEndiannessInplace(dest[i]);
 }
 template<typename type> type inline readLittleEndianType(Files::IStreamPtr &pIStream)
 {
     type val;
-    readLittleEndianBufferOfType<1, type>(pIStream, (type*)&val);
+    readLittleEndianBufferOfType<1, type>(pIStream, &val);
     return val;
 }
 
@@ -96,21 +99,21 @@ public:
     osg::Vec2f getVector2()
     {
         osg::Vec2f vec;
-        readLittleEndianBufferOfType<2,float>(inp, (float*)&vec._v[0]);
+        readLittleEndianBufferOfType<2,float>(inp, vec._v);
         return vec;
     }
 
     osg::Vec3f getVector3()
     {
         osg::Vec3f vec;
-        readLittleEndianBufferOfType<3, float>(inp, (float*)&vec._v[0]);
+        readLittleEndianBufferOfType<3, float>(inp, vec._v);
         return vec;
     }
 
     osg::Vec4f getVector4()
     {
         osg::Vec4f vec;
-        readLittleEndianBufferOfType<4, float>(inp, (float*)&vec._v[0]);
+        readLittleEndianBufferOfType<4, float>(inp, vec._v);
         return vec;
     }
 
@@ -142,11 +145,11 @@ public:
     ///Read in a string of the given length
     std::string getSizedString(size_t length)
     {
-        std::vector<char> str(length + 1, 0);
-
+        std::string str(length, '\0');
         inp->read(str.data(), length);
-
-        return str.data();
+        if (inp->bad())
+            throw std::runtime_error("Failed to read sized string of " + std::to_string(length) + " chars");
+        return str;
     }
     ///Read in a string of the length specified in the file
     std::string getSizedString()
@@ -167,6 +170,8 @@ public:
     {
         std::string result;
         std::getline(*inp, result);
+        if (inp->bad())
+            throw std::runtime_error("Failed to read version string");
         return result;
     }
 

From e94181b2b26e15d27b8cb255db262ede3126f0bf Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Tue, 4 May 2021 21:03:14 +0000
Subject: [PATCH 0698/2859] Merge branch 'constexpr' into 'master'

Sprinkle a couple of constexpr found by VS

See merge request OpenMW/openmw!800

(cherry picked from commit 5e8ea624bc85acebf457592dd10b790124ecf6ef)

5704b2ac Sprinkle a couple of constexpr found by VS
---
 components/esm/loadland.cpp          | 6 +++---
 components/terrain/quadtreeworld.cpp | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/esm/loadland.cpp b/components/esm/loadland.cpp
index 2aa8f21dbe..38596628f2 100644
--- a/components/esm/loadland.cpp
+++ b/components/esm/loadland.cpp
@@ -161,9 +161,9 @@ namespace ESM
             {
                 // Generate WNAM record
                 signed char wnam[LAND_GLOBAL_MAP_LOD_SIZE];
-                float max = std::numeric_limits<signed char>::max();
-                float min = std::numeric_limits<signed char>::min();
-                float vertMult = static_cast<float>(ESM::Land::LAND_SIZE - 1) / LAND_GLOBAL_MAP_LOD_SIZE_SQRT;
+                constexpr float max = std::numeric_limits<signed char>::max();
+                constexpr float min = std::numeric_limits<signed char>::min();
+                constexpr float vertMult = static_cast<float>(ESM::Land::LAND_SIZE - 1) / LAND_GLOBAL_MAP_LOD_SIZE_SQRT;
                 for (int row = 0; row < LAND_GLOBAL_MAP_LOD_SIZE_SQRT; ++row)
                 {
                     for (int col = 0; col < LAND_GLOBAL_MAP_LOD_SIZE_SQRT; ++col)
diff --git a/components/terrain/quadtreeworld.cpp b/components/terrain/quadtreeworld.cpp
index 70b44935c2..e9f5805566 100644
--- a/components/terrain/quadtreeworld.cpp
+++ b/components/terrain/quadtreeworld.cpp
@@ -212,8 +212,8 @@ public:
         {
             // We arrived at a leaf.
             // Since the tree is used for LOD level selection instead of culling, we do not need to load the actual height data here.
-            float minZ = -std::numeric_limits<float>::max();
-            float maxZ = std::numeric_limits<float>::max();
+            constexpr float minZ = -std::numeric_limits<float>::max();
+            constexpr float maxZ = std::numeric_limits<float>::max();
             float cellWorldSize = mStorage->getCellWorldSize();
             osg::BoundingBox boundingBox(osg::Vec3f((center.x()-halfSize)*cellWorldSize, (center.y()-halfSize)*cellWorldSize, minZ),
                                     osg::Vec3f((center.x()+halfSize)*cellWorldSize, (center.y()+halfSize)*cellWorldSize, maxZ));

From b10a817f7ec3e8e50a600679b8a1f435f39eefb6 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Tue, 4 May 2021 21:07:59 +0000
Subject: [PATCH 0699/2859] Merge branch 'useuless_launcher' into 'master'

Remove some useless includes from the launcher

See merge request OpenMW/openmw!775

(cherry picked from commit a84bd643b334eb6ac715681c497184ac22212ced)

d3fff8cf Remove some useless includes from the launcher
---
 apps/launcher/advancedpage.cpp           | 2 --
 apps/launcher/advancedpage.hpp           | 1 -
 apps/launcher/datafilespage.cpp          | 2 --
 apps/launcher/datafilespage.hpp          | 1 -
 apps/launcher/graphicspage.hpp           | 2 --
 apps/launcher/main.cpp                   | 2 --
 apps/launcher/maindialog.cpp             | 3 ---
 apps/launcher/maindialog.hpp             | 2 --
 apps/launcher/playpage.hpp               | 2 --
 apps/launcher/sdlinit.cpp                | 1 -
 apps/launcher/settingspage.cpp           | 1 -
 apps/launcher/settingspage.hpp           | 3 ---
 apps/launcher/utils/cellnameloader.hpp   | 1 -
 apps/launcher/utils/lineedit.hpp         | 1 -
 apps/launcher/utils/profilescombobox.cpp | 1 -
 15 files changed, 25 deletions(-)

diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index 91e3842fa9..4ba7322345 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -3,10 +3,8 @@
 #include <array>
 
 #include <components/config/gamesettings.hpp>
-#include <components/config/launchersettings.hpp>
 #include <QFileDialog>
 #include <QCompleter>
-#include <QProxyStyle>
 #include <QString>
 #include <components/contentselector/view/contentselector.hpp>
 #include <components/contentselector/model/esmfile.hpp>
diff --git a/apps/launcher/advancedpage.hpp b/apps/launcher/advancedpage.hpp
index a373fae430..93b818dbb6 100644
--- a/apps/launcher/advancedpage.hpp
+++ b/apps/launcher/advancedpage.hpp
@@ -1,7 +1,6 @@
 #ifndef ADVANCEDPAGE_H
 #define ADVANCEDPAGE_H
 
-#include <QWidget>
 #include <QCompleter>
 #include <QStringListModel>
 
diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index 81544b0945..956483a3f2 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/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>
diff --git a/apps/launcher/datafilespage.hpp b/apps/launcher/datafilespage.hpp
index 3d200e6d2d..5a7a6dc6e6 100644
--- a/apps/launcher/datafilespage.hpp
+++ b/apps/launcher/datafilespage.hpp
@@ -6,7 +6,6 @@
 
 
 #include <QDir>
-#include <QFile>
 #include <QStringList>
 
 class QSortFilterProxyModel;
diff --git a/apps/launcher/graphicspage.hpp b/apps/launcher/graphicspage.hpp
index 35f7115003..7801e6475b 100644
--- a/apps/launcher/graphicspage.hpp
+++ b/apps/launcher/graphicspage.hpp
@@ -1,8 +1,6 @@
 #ifndef GRAPHICSPAGE_H
 #define GRAPHICSPAGE_H
 
-#include <QWidget>
-
 #include "ui_graphicspage.h"
 
 #include <components/settings/settings.hpp>
diff --git a/apps/launcher/main.cpp b/apps/launcher/main.cpp
index f15abafce0..9c9acb4a17 100644
--- a/apps/launcher/main.cpp
+++ b/apps/launcher/main.cpp
@@ -1,10 +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
diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp
index 215258bcd2..6924153090 100644
--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@@ -5,15 +5,12 @@
 
 #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"
diff --git a/apps/launcher/maindialog.hpp b/apps/launcher/maindialog.hpp
index de74233305..80e014e285 100644
--- a/apps/launcher/maindialog.hpp
+++ b/apps/launcher/maindialog.hpp
@@ -1,8 +1,6 @@
 #ifndef MAINDIALOG_H
 #define MAINDIALOG_H
 
-#include <QMainWindow>
-#include <QProcess>
 
 #ifndef Q_MOC_RUN
 #include <components/files/configurationmanager.hpp>
diff --git a/apps/launcher/playpage.hpp b/apps/launcher/playpage.hpp
index b0bd3ee277..8f414dc6aa 100644
--- a/apps/launcher/playpage.hpp
+++ b/apps/launcher/playpage.hpp
@@ -1,8 +1,6 @@
 #ifndef PLAYPAGE_H
 #define PLAYPAGE_H
 
-#include <QWidget>
-
 #include "ui_playpage.h"
 
 class QComboBox;
diff --git a/apps/launcher/sdlinit.cpp b/apps/launcher/sdlinit.cpp
index 1fe1fd4c2f..4717fb2818 100644
--- a/apps/launcher/sdlinit.cpp
+++ b/apps/launcher/sdlinit.cpp
@@ -1,7 +1,6 @@
 #include <signal.h>
 
 #include <SDL.h>
-#include <SDL_video.h>
 
 bool initSDL()
 {
diff --git a/apps/launcher/settingspage.cpp b/apps/launcher/settingspage.cpp
index 59d7cfd25b..ca7fd028a7 100644
--- a/apps/launcher/settingspage.cpp
+++ b/apps/launcher/settingspage.cpp
@@ -2,7 +2,6 @@
 
 #include <QFileDialog>
 #include <QMessageBox>
-#include <QDebug>
 #include <QDir>
 
 #include <components/files/configurationmanager.hpp>
diff --git a/apps/launcher/settingspage.hpp b/apps/launcher/settingspage.hpp
index 97b099dd62..df7c0e8eb5 100644
--- a/apps/launcher/settingspage.hpp
+++ b/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"
diff --git a/apps/launcher/utils/cellnameloader.hpp b/apps/launcher/utils/cellnameloader.hpp
index c58d09226a..899ff75adb 100644
--- a/apps/launcher/utils/cellnameloader.hpp
+++ b/apps/launcher/utils/cellnameloader.hpp
@@ -1,7 +1,6 @@
 #ifndef OPENMW_CELLNAMELOADER_H
 #define OPENMW_CELLNAMELOADER_H
 
-#include <QComboBox>
 #include <QSet>
 #include <QString>
 
diff --git a/apps/launcher/utils/lineedit.hpp b/apps/launcher/utils/lineedit.hpp
index da28e858ce..89de39588a 100644
--- a/apps/launcher/utils/lineedit.hpp
+++ b/apps/launcher/utils/lineedit.hpp
@@ -11,7 +11,6 @@
 #define LINEEDIT_H
 
 #include <QLineEdit>
-#include <QStyle>
 #include <QStylePainter>
 #include <QToolButton>
 
diff --git a/apps/launcher/utils/profilescombobox.cpp b/apps/launcher/utils/profilescombobox.cpp
index 462c2ebc27..af349ddfff 100644
--- a/apps/launcher/utils/profilescombobox.cpp
+++ b/apps/launcher/utils/profilescombobox.cpp
@@ -1,5 +1,4 @@
 #include <QRegExpValidator>
-#include <QLineEdit>
 #include <QString>
 #include <QApplication>
 #include <QKeyEvent>

From ad7aff4cee6ead291bc4612231bc30035947f479 Mon Sep 17 00:00:00 2001
From: tess <2687892-TescoShoppah@users.noreply.gitlab.com>
Date: Tue, 4 May 2021 22:22:13 +0000
Subject: [PATCH 0700/2859] Minor fix in launcher's advanced settings tab

---
 files/ui/advancedpage.ui | 222 +++++++++++++++++++--------------------
 1 file changed, 111 insertions(+), 111 deletions(-)

diff --git a/files/ui/advancedpage.ui b/files/ui/advancedpage.ui
index b6ec20634a..8c3dea4b39 100644
--- a/files/ui/advancedpage.ui
+++ b/files/ui/advancedpage.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>617</width>
+    <width>732</width>
     <height>487</height>
    </rect>
   </property>
@@ -273,6 +273,30 @@
       <layout class="QVBoxLayout">
        <item>
         <layout class="QGridLayout" name="gridLayout_2">
+         <item row="3" column="1">
+          <widget class="QCheckBox" name="radialFogCheckBox">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;By default, the fog becomes thicker proportionally to your distance from the clipping plane set at the clipping distance, which causes distortion at the edges of the screen.
+This setting makes the fog use the actual eye point distance (or so called Euclidean distance) to calculate the fog, which makes the fog look less artificial, especially if you have a wide FOV.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Radial fog</string>
+           </property>
+          </widget>
+         </item>
+         <item row="4" column="1">
+          <widget class="QCheckBox" name="bumpMapLocalLightingCheckBox">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Normally environment map reflections aren't affected by lighting, which makes environment-mapped (and thus bump-mapped objects) glow in the dark.
+Morrowind Code Patch includes an option to remedy that by doing environment-mapping before applying lighting, this is the equivalent of that option.
+Affected objects will use shaders.
+&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Bump/reflect map local lighting</string>
+           </property>
+          </widget>
+         </item>
          <item row="5" column="1">
           <widget class="QCheckBox" name="turnToMovementDirectionCheckBox">
            <property name="toolTip">
@@ -283,6 +307,16 @@
            </property>
           </widget>
          </item>
+         <item row="6" column="0">
+          <widget class="QCheckBox" name="animSourcesCheckBox">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Load per-group KF-files and skeleton files from Animations folder&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Use additional animation sources</string>
+           </property>
+          </widget>
+         </item>
          <item row="6" column="1">
           <layout class="QHBoxLayout" name="lightingMethodLayout">
            <item>
@@ -297,7 +331,7 @@
              <item>
               <property name="text">
                <string>legacy</string>
-                </property>
+              </property>
              </item>
              <item>
               <property name="text">
@@ -313,16 +347,6 @@
            </item>
           </layout>
          </item>
-         <item row="5" column="0">
-          <widget class="QCheckBox" name="smoothMovementCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Makes NPCs and player movement more smooth. Recommended to use with "turn to movement direction" enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Smooth movement</string>
-           </property>
-          </widget>
-         </item>
          <item row="0" column="1">
           <widget class="QCheckBox" name="distantLandCheckBox">
            <property name="toolTip">
@@ -333,26 +357,6 @@
            </property>
           </widget>
          </item>
-         <item row="3" column="0">
-          <widget class="QCheckBox" name="autoUseTerrainNormalMapsCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;See 'auto use object normal maps'. Affects terrain.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Auto use terrain normal maps</string>
-           </property>
-          </widget>
-         </item>
-         <item row="4" column="0">
-          <widget class="QCheckBox" name="autoUseTerrainSpecularMapsCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If a file with pattern 'terrain specular map pattern' exists, use that file as a 'diffuse specular' map. The texture must contain the layer colour in the RGB channel (as usual), and a specular multiplier in the alpha channel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Auto use terrain specular maps</string>
-           </property>
-          </widget>
-         </item>
          <item row="1" column="1">
           <widget class="QCheckBox" name="activeGridObjectPagingCheckBox">
            <property name="toolTip">
@@ -363,51 +367,6 @@
            </property>
           </widget>
          </item>
-         <item row="2" column="1">
-          <widget class="QCheckBox" name="magicItemAnimationsCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use casting animations for magic items, just as for spells.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Use magic item animation</string>
-           </property>
-          </widget>
-         </item>
-         <item row="6" column="0">
-          <widget class="QCheckBox" name="animSourcesCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Load per-group KF-files and skeleton files from Animations folder&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Use additional animation sources</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="0">
-          <widget class="QCheckBox" name="autoUseObjectNormalMapsCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this option is enabled, normal maps are automatically recognized and used if they are named appropriately
-(see 'normal map pattern', e.g. for a base texture foo.dds, the normal map texture would have to be named foo_n.dds).
-If this option is disabled, normal maps are only used if they are explicitly listed within the mesh file (.nif or .osg file). Affects objects.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Auto use object normal maps</string>
-           </property>
-          </widget>
-         </item>
-         <item row="4" column="1">
-          <widget class="QCheckBox" name="bumpMapLocalLightingCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Normally environment map reflections aren't affected by lighting, which makes environment-mapped (and thus bump-mapped objects) glow in the dark.
-Morrowind Code Patch includes an option to remedy that by doing environment-mapping before applying lighting, this is the equivalent of that option.
-Affected objects will use shaders.
-&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Bump/reflect map local lighting</string>
-           </property>
-          </widget>
-         </item>
          <item row="0" column="0">
           <layout class="QHBoxLayout" name="viewingDistanceLayout">
            <item>
@@ -432,6 +391,16 @@ Affected objects will use shaders.
            </item>
           </layout>
          </item>
+         <item row="3" column="0">
+          <widget class="QCheckBox" name="autoUseTerrainNormalMapsCheckBox">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;See 'auto use object normal maps'. Affects terrain.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Auto use terrain normal maps</string>
+           </property>
+          </widget>
+         </item>
          <item row="2" column="0">
           <widget class="QCheckBox" name="autoUseObjectSpecularMapsCheckBox">
            <property name="toolTip">
@@ -446,50 +415,81 @@ If this option is disabled, normal maps are only used if they are explicitly lis
            </property>
           </widget>
          </item>
-         <item row="3" column="1">
-          <widget class="QCheckBox" name="radialFogCheckBox">
+         <item row="4" column="0">
+          <widget class="QCheckBox" name="autoUseTerrainSpecularMapsCheckBox">
            <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;By default, the fog becomes thicker proportionally to your distance from the clipping plane set at the clipping distance, which causes distortion at the edges of the screen.
-This setting makes the fog use the actual eye point distance (or so called Euclidean distance) to calculate the fog, which makes the fog look less artificial, especially if you have a wide FOV.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If a file with pattern 'terrain specular map pattern' exists, use that file as a 'diffuse specular' map. The texture must contain the layer colour in the RGB channel (as usual), and a specular multiplier in the alpha channel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
            <property name="text">
-            <string>Radial fog</string>
+            <string>Auto use terrain specular maps</string>
            </property>
           </widget>
          </item>
-        </layout>
-       </item>
-       <item>
-        <layout class="QVBoxLayout" name="sheathingLayout">
-         <property name="leftMargin">
-          <number>20</number>
-         </property>
-         <item>
-          <widget class="QCheckBox" name="weaponSheathingCheckBox">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
+         <item row="5" column="0">
+          <widget class="QCheckBox" name="smoothMovementCheckBox">
            <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Render holstered weapons (with quivers and scabbards), requires modded assets.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Makes NPCs and player movement more smooth. Recommended to use with &quot;turn to movement direction&quot; enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
            <property name="text">
-            <string>Weapon sheathing</string>
+            <string>Smooth movement</string>
            </property>
           </widget>
          </item>
-         <item>
-          <widget class="QCheckBox" name="shieldSheathingCheckBox">
-           <property name="enabled">
-            <bool>false</bool>
+         <item row="2" column="1">
+          <widget class="QCheckBox" name="magicItemAnimationsCheckBox">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use casting animations for magic items, just as for spells.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
+           <property name="text">
+            <string>Use magic item animation</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QCheckBox" name="autoUseObjectNormalMapsCheckBox">
            <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Render holstered shield, requires modded assets.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this option is enabled, normal maps are automatically recognized and used if they are named appropriately
+(see 'normal map pattern', e.g. for a base texture foo.dds, the normal map texture would have to be named foo_n.dds).
+If this option is disabled, normal maps are only used if they are explicitly listed within the mesh file (.nif or .osg file). Affects objects.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
            <property name="text">
-            <string>Shield sheathing</string>
+            <string>Auto use object normal maps</string>
            </property>
           </widget>
          </item>
+         <item row="7" column="0">
+          <layout class="QVBoxLayout" name="sheathingLayout">
+           <property name="leftMargin">
+            <number>20</number>
+           </property>
+           <item>
+            <widget class="QCheckBox" name="weaponSheathingCheckBox">
+             <property name="enabled">
+              <bool>false</bool>
+             </property>
+             <property name="toolTip">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Render holstered weapons (with quivers and scabbards), requires modded assets.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="text">
+              <string>Weapon sheathing</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QCheckBox" name="shieldSheathingCheckBox">
+             <property name="enabled">
+              <bool>false</bool>
+             </property>
+             <property name="toolTip">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Render holstered shield, requires modded assets.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="text">
+              <string>Shield sheathing</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
         </layout>
        </item>
        <item>
@@ -516,12 +516,12 @@ This setting makes the fog use the actual eye point distance (or so called Eucli
         <layout class="QHBoxLayout">
          <item>
           <widget class="QLabel" name="audioDeviceSelectorLabel">
-           <property name="text">
-            <string>Audio Device</string>
-           </property>
            <property name="toolTip">
             <string>Select your preferred audio device.</string>
            </property>
+           <property name="text">
+            <string>Audio Device</string>
+           </property>
           </widget>
          </item>
          <item>
@@ -554,12 +554,12 @@ This setting makes the fog use the actual eye point distance (or so called Eucli
         <layout class="QHBoxLayout">
          <item>
           <widget class="QLabel" name="enableHRTFLabel">
-           <property name="text">
-            <string>HRTF</string>
-           </property>
            <property name="toolTip">
             <string>This setting controls HRTF, which simulates 3D sound on stereo systems.</string>
            </property>
+           <property name="text">
+            <string>HRTF</string>
+           </property>
           </widget>
          </item>
          <item>
@@ -602,12 +602,12 @@ This setting makes the fog use the actual eye point distance (or so called Eucli
         <layout class="QHBoxLayout">
          <item>
           <widget class="QLabel" name="hrtfProfileSelectorLabel">
-           <property name="text">
-            <string>HRTF Profile</string>
-           </property>
            <property name="toolTip">
             <string>Select your preferred HRTF profile.</string>
            </property>
+           <property name="text">
+            <string>HRTF Profile</string>
+           </property>
           </widget>
          </item>
          <item>

From 903ce446348061926329f144fc01fa178f1cc249 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 5 May 2021 01:20:18 +0200
Subject: [PATCH 0701/2859] Revert "Various fixes for niftest"

This reverts commit 87ada56edd9d5d5b0a9e6a8dcfd06eb09b161746.
---
 components/nif/niffile.cpp   | 12 +++++------
 components/nif/nifstream.cpp |  2 +-
 components/nif/nifstream.hpp | 41 ++++++++++++++++--------------------
 3 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index 864a388e87..3e226b35e1 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -212,7 +212,7 @@ void NIFFile::parse(Files::IStreamPtr stream)
         userVer = nif.getUInt();
 
     // Number of records
-    const std::size_t recNum = nif.getUInt();
+    unsigned int recNum = nif.getUInt();
     records.resize(recNum);
 
     // Bethesda stream header
@@ -251,7 +251,7 @@ void NIFFile::parse(Files::IStreamPtr stream)
                     std::vector<unsigned int> recSizes; // Currently unused
                     nif.getUInts(recSizes, recNum);
                 }
-                const std::size_t stringNum = nif.getUInt();
+                unsigned int stringNum = nif.getUInt();
                 nif.getUInt(); // Max string length
                 if (stringNum)
                     nif.getSizedStrings(strings, stringNum);
@@ -264,7 +264,7 @@ void NIFFile::parse(Files::IStreamPtr stream)
     }
 
     const bool hasRecordSeparators = ver >= NIFStream::generateVersion(10,0,0,0) && ver < NIFStream::generateVersion(10,2,0,0);
-    for (std::size_t i = 0; i < recNum; i++)
+    for (unsigned int i = 0; i < recNum; i++)
     {
         Record *r = nullptr;
 
@@ -308,14 +308,14 @@ void NIFFile::parse(Files::IStreamPtr stream)
         r->read(&nif);
     }
 
-    const std::size_t rootNum = nif.getUInt();
+    unsigned int rootNum = nif.getUInt();
     roots.resize(rootNum);
 
     //Determine which records are roots
-    for (std::size_t i = 0; i < rootNum; i++)
+    for (unsigned int i = 0; i < rootNum; i++)
     {
         int idx = nif.getInt();
-        if (idx >= 0 && static_cast<std::size_t>(idx) < records.size())
+        if (idx >= 0 && idx < int(records.size()))
         {
             roots[i] = records[idx];
         }
diff --git a/components/nif/nifstream.cpp b/components/nif/nifstream.cpp
index 6129a17394..07c9c917ce 100644
--- a/components/nif/nifstream.cpp
+++ b/components/nif/nifstream.cpp
@@ -7,7 +7,7 @@ namespace Nif
     osg::Quat NIFStream::getQuaternion()
     {
         float f[4];
-        readLittleEndianBufferOfType<4, float>(inp, f);
+        readLittleEndianBufferOfType<4, float>(inp, (float*)&f);
         osg::Quat quat;
         quat.w() = f[0];
         quat.x() = f[1];
diff --git a/components/nif/nifstream.hpp b/components/nif/nifstream.hpp
index b6bf01ce58..4d221b8676 100644
--- a/components/nif/nifstream.hpp
+++ b/components/nif/nifstream.hpp
@@ -7,8 +7,6 @@
 #include <stdint.h>
 #include <stdexcept>
 #include <vector>
-#include <typeinfo>
-#include <type_traits>
 
 #include <components/files/constrainedfilestream.hpp>
 #include <components/misc/endianness.hpp>
@@ -24,32 +22,31 @@ namespace Nif
 
 class NIFFile;
 
-template <std::size_t numInstances, typename T> inline void readLittleEndianBufferOfType(Files::IStreamPtr &pIStream, T* dest)
+/* 
+    readLittleEndianBufferOfType: This template should only be used with arithmetic types
+*/
+template <uint32_t numInstances, typename T> inline void readLittleEndianBufferOfType(Files::IStreamPtr &pIStream, T* dest)
 {
-    static_assert(std::is_arithmetic_v<T>, "Buffer element type is not arithmetic");
     pIStream->read((char*)dest, numInstances * sizeof(T));
-    if (pIStream->bad())
-        throw std::runtime_error("Failed to read little endian typed (" + std::string(typeid(T).name()) + ") buffer of "
-                                 + std::to_string(numInstances) + " instances");
     if constexpr (Misc::IS_BIG_ENDIAN)
-        for (std::size_t i = 0; i < numInstances; i++)
+        for (uint32_t i = 0; i < numInstances; i++)
             Misc::swapEndiannessInplace(dest[i]);
 }
 
-template <typename T> inline void readLittleEndianDynamicBufferOfType(Files::IStreamPtr &pIStream, T* dest, std::size_t numInstances)
+/*
+    readLittleEndianDynamicBufferOfType: This template should only be used with arithmetic types
+*/
+template <typename T> inline void readLittleEndianDynamicBufferOfType(Files::IStreamPtr &pIStream, T* dest, uint32_t numInstances)
 {
-    static_assert(std::is_arithmetic_v<T>, "Buffer element type is not arithmetic");
     pIStream->read((char*)dest, numInstances * sizeof(T));
-    if (pIStream->bad())
-        throw std::runtime_error("Failed to read little endian dynamic buffer of " + std::to_string(numInstances) + " instances");
     if constexpr (Misc::IS_BIG_ENDIAN)
-        for (std::size_t i = 0; i < numInstances; i++)
+        for (uint32_t i = 0; i < numInstances; i++)
             Misc::swapEndiannessInplace(dest[i]);
 }
 template<typename type> type inline readLittleEndianType(Files::IStreamPtr &pIStream)
 {
     type val;
-    readLittleEndianBufferOfType<1, type>(pIStream, &val);
+    readLittleEndianBufferOfType<1, type>(pIStream, (type*)&val);
     return val;
 }
 
@@ -99,21 +96,21 @@ public:
     osg::Vec2f getVector2()
     {
         osg::Vec2f vec;
-        readLittleEndianBufferOfType<2,float>(inp, vec._v);
+        readLittleEndianBufferOfType<2,float>(inp, (float*)&vec._v[0]);
         return vec;
     }
 
     osg::Vec3f getVector3()
     {
         osg::Vec3f vec;
-        readLittleEndianBufferOfType<3, float>(inp, vec._v);
+        readLittleEndianBufferOfType<3, float>(inp, (float*)&vec._v[0]);
         return vec;
     }
 
     osg::Vec4f getVector4()
     {
         osg::Vec4f vec;
-        readLittleEndianBufferOfType<4, float>(inp, vec._v);
+        readLittleEndianBufferOfType<4, float>(inp, (float*)&vec._v[0]);
         return vec;
     }
 
@@ -145,11 +142,11 @@ public:
     ///Read in a string of the given length
     std::string getSizedString(size_t length)
     {
-        std::string str(length, '\0');
+        std::vector<char> str(length + 1, 0);
+
         inp->read(str.data(), length);
-        if (inp->bad())
-            throw std::runtime_error("Failed to read sized string of " + std::to_string(length) + " chars");
-        return str;
+
+        return str.data();
     }
     ///Read in a string of the length specified in the file
     std::string getSizedString()
@@ -170,8 +167,6 @@ public:
     {
         std::string result;
         std::getline(*inp, result);
-        if (inp->bad())
-            throw std::runtime_error("Failed to read version string");
         return result;
     }
 

From f4cfade14b8830d516bf45eb20523aa17960faa1 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 3 May 2021 21:30:31 +0200
Subject: [PATCH 0702/2859] Use std::size_t to iterate

---
 components/nif/niffile.cpp   | 10 +++++-----
 components/nif/nifstream.hpp |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index 3e226b35e1..221f1d1f35 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -212,7 +212,7 @@ void NIFFile::parse(Files::IStreamPtr stream)
         userVer = nif.getUInt();
 
     // Number of records
-    unsigned int recNum = nif.getUInt();
+    const std::size_t recNum = nif.getUInt();
     records.resize(recNum);
 
     // Bethesda stream header
@@ -251,7 +251,7 @@ void NIFFile::parse(Files::IStreamPtr stream)
                     std::vector<unsigned int> recSizes; // Currently unused
                     nif.getUInts(recSizes, recNum);
                 }
-                unsigned int stringNum = nif.getUInt();
+                const std::size_t stringNum = nif.getUInt();
                 nif.getUInt(); // Max string length
                 if (stringNum)
                     nif.getSizedStrings(strings, stringNum);
@@ -264,7 +264,7 @@ void NIFFile::parse(Files::IStreamPtr stream)
     }
 
     const bool hasRecordSeparators = ver >= NIFStream::generateVersion(10,0,0,0) && ver < NIFStream::generateVersion(10,2,0,0);
-    for (unsigned int i = 0; i < recNum; i++)
+    for (std::size_t i = 0; i < recNum; i++)
     {
         Record *r = nullptr;
 
@@ -308,11 +308,11 @@ void NIFFile::parse(Files::IStreamPtr stream)
         r->read(&nif);
     }
 
-    unsigned int rootNum = nif.getUInt();
+    const std::size_t rootNum = nif.getUInt();
     roots.resize(rootNum);
 
     //Determine which records are roots
-    for (unsigned int i = 0; i < rootNum; i++)
+    for (std::size_t i = 0; i < rootNum; i++)
     {
         int idx = nif.getInt();
         if (idx >= 0 && idx < int(records.size()))
diff --git a/components/nif/nifstream.hpp b/components/nif/nifstream.hpp
index 4d221b8676..cee98dd831 100644
--- a/components/nif/nifstream.hpp
+++ b/components/nif/nifstream.hpp
@@ -25,22 +25,22 @@ class NIFFile;
 /* 
     readLittleEndianBufferOfType: This template should only be used with arithmetic types
 */
-template <uint32_t numInstances, typename T> inline void readLittleEndianBufferOfType(Files::IStreamPtr &pIStream, T* dest)
+template <std::size_t numInstances, typename T> inline void readLittleEndianBufferOfType(Files::IStreamPtr &pIStream, T* dest)
 {
     pIStream->read((char*)dest, numInstances * sizeof(T));
     if constexpr (Misc::IS_BIG_ENDIAN)
-        for (uint32_t i = 0; i < numInstances; i++)
+        for (std::size_t i = 0; i < numInstances; i++)
             Misc::swapEndiannessInplace(dest[i]);
 }
 
 /*
     readLittleEndianDynamicBufferOfType: This template should only be used with arithmetic types
 */
-template <typename T> inline void readLittleEndianDynamicBufferOfType(Files::IStreamPtr &pIStream, T* dest, uint32_t numInstances)
+template <typename T> inline void readLittleEndianDynamicBufferOfType(Files::IStreamPtr &pIStream, T* dest, std::size_t numInstances)
 {
     pIStream->read((char*)dest, numInstances * sizeof(T));
     if constexpr (Misc::IS_BIG_ENDIAN)
-        for (uint32_t i = 0; i < numInstances; i++)
+        for (std::size_t i = 0; i < numInstances; i++)
             Misc::swapEndiannessInplace(dest[i]);
 }
 template<typename type> type inline readLittleEndianType(Files::IStreamPtr &pIStream)

From 3e4abb9f049c66c08c23797190b5c2bc44f2862e Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 3 May 2021 21:32:38 +0200
Subject: [PATCH 0703/2859] Avoid copy from vector to string

Read directly into a string.
---
 components/nif/nifstream.hpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/components/nif/nifstream.hpp b/components/nif/nifstream.hpp
index cee98dd831..1c4407afd9 100644
--- a/components/nif/nifstream.hpp
+++ b/components/nif/nifstream.hpp
@@ -142,11 +142,9 @@ public:
     ///Read in a string of the given length
     std::string getSizedString(size_t length)
     {
-        std::vector<char> str(length + 1, 0);
-
+        std::string str(length, '\0');
         inp->read(str.data(), length);
-
-        return str.data();
+        return str;
     }
     ///Read in a string of the length specified in the file
     std::string getSizedString()

From 1c08bc0b15ffc713018dd7de5aaa90dcf8f7e92f Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 3 May 2021 21:41:47 +0200
Subject: [PATCH 0704/2859] Handle std::istream bad state after read

---
 components/nif/nifstream.hpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/components/nif/nifstream.hpp b/components/nif/nifstream.hpp
index 1c4407afd9..4d77b73262 100644
--- a/components/nif/nifstream.hpp
+++ b/components/nif/nifstream.hpp
@@ -7,6 +7,7 @@
 #include <stdint.h>
 #include <stdexcept>
 #include <vector>
+#include <typeinfo>
 
 #include <components/files/constrainedfilestream.hpp>
 #include <components/misc/endianness.hpp>
@@ -28,6 +29,9 @@ class NIFFile;
 template <std::size_t numInstances, typename T> inline void readLittleEndianBufferOfType(Files::IStreamPtr &pIStream, T* dest)
 {
     pIStream->read((char*)dest, numInstances * sizeof(T));
+    if (pIStream->bad())
+        throw std::runtime_error("Failed to read little endian typed (" + std::string(typeid(T).name()) + ") buffer of "
+                                 + std::to_string(numInstances) + " instances");
     if constexpr (Misc::IS_BIG_ENDIAN)
         for (std::size_t i = 0; i < numInstances; i++)
             Misc::swapEndiannessInplace(dest[i]);
@@ -39,6 +43,8 @@ template <std::size_t numInstances, typename T> inline void readLittleEndianBuff
 template <typename T> inline void readLittleEndianDynamicBufferOfType(Files::IStreamPtr &pIStream, T* dest, std::size_t numInstances)
 {
     pIStream->read((char*)dest, numInstances * sizeof(T));
+    if (pIStream->bad())
+        throw std::runtime_error("Failed to read little endian dynamic buffer of " + std::to_string(numInstances) + " instances");
     if constexpr (Misc::IS_BIG_ENDIAN)
         for (std::size_t i = 0; i < numInstances; i++)
             Misc::swapEndiannessInplace(dest[i]);
@@ -144,6 +150,8 @@ public:
     {
         std::string str(length, '\0');
         inp->read(str.data(), length);
+        if (inp->bad())
+            throw std::runtime_error("Failed to read sized string of " + std::to_string(length) + " chars");
         return str;
     }
     ///Read in a string of the length specified in the file
@@ -165,6 +173,8 @@ public:
     {
         std::string result;
         std::getline(*inp, result);
+        if (inp->bad())
+            throw std::runtime_error("Failed to read version string");
         return result;
     }
 

From bf2f15342bfee7e1bec19ff9abdb1999a4575f74 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 4 May 2021 01:09:29 +0200
Subject: [PATCH 0705/2859] Compare positive int as std::size_t

If records.size() is greater than max int comparison is invalid.
---
 components/nif/niffile.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index 221f1d1f35..864a388e87 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -315,7 +315,7 @@ void NIFFile::parse(Files::IStreamPtr stream)
     for (std::size_t i = 0; i < rootNum; i++)
     {
         int idx = nif.getInt();
-        if (idx >= 0 && idx < int(records.size()))
+        if (idx >= 0 && static_cast<std::size_t>(idx) < records.size())
         {
             roots[i] = records[idx];
         }

From d9e7c2fb42fb8e62323f609a1c4ac8f40b8a4a88 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 4 May 2021 13:21:47 +0200
Subject: [PATCH 0706/2859] Replace comment by static assert

---
 components/nif/nifstream.hpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/components/nif/nifstream.hpp b/components/nif/nifstream.hpp
index 4d77b73262..ad0ba5da8b 100644
--- a/components/nif/nifstream.hpp
+++ b/components/nif/nifstream.hpp
@@ -8,6 +8,7 @@
 #include <stdexcept>
 #include <vector>
 #include <typeinfo>
+#include <type_traits>
 
 #include <components/files/constrainedfilestream.hpp>
 #include <components/misc/endianness.hpp>
@@ -23,11 +24,9 @@ namespace Nif
 
 class NIFFile;
 
-/* 
-    readLittleEndianBufferOfType: This template should only be used with arithmetic types
-*/
 template <std::size_t numInstances, typename T> inline void readLittleEndianBufferOfType(Files::IStreamPtr &pIStream, T* dest)
 {
+    static_assert(std::is_arithmetic_v<T>, "Buffer element type is not arithmetic");
     pIStream->read((char*)dest, numInstances * sizeof(T));
     if (pIStream->bad())
         throw std::runtime_error("Failed to read little endian typed (" + std::string(typeid(T).name()) + ") buffer of "
@@ -37,11 +36,9 @@ template <std::size_t numInstances, typename T> inline void readLittleEndianBuff
             Misc::swapEndiannessInplace(dest[i]);
 }
 
-/*
-    readLittleEndianDynamicBufferOfType: This template should only be used with arithmetic types
-*/
 template <typename T> inline void readLittleEndianDynamicBufferOfType(Files::IStreamPtr &pIStream, T* dest, std::size_t numInstances)
 {
+    static_assert(std::is_arithmetic_v<T>, "Buffer element type is not arithmetic");
     pIStream->read((char*)dest, numInstances * sizeof(T));
     if (pIStream->bad())
         throw std::runtime_error("Failed to read little endian dynamic buffer of " + std::to_string(numInstances) + " instances");

From d5e28d7269e3ed33b43d56dbbc0b05eae6a00a79 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 4 May 2021 13:18:44 +0200
Subject: [PATCH 0707/2859] Remove redundant casts

---
 components/nif/nifstream.cpp | 2 +-
 components/nif/nifstream.hpp | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/nif/nifstream.cpp b/components/nif/nifstream.cpp
index 07c9c917ce..6129a17394 100644
--- a/components/nif/nifstream.cpp
+++ b/components/nif/nifstream.cpp
@@ -7,7 +7,7 @@ namespace Nif
     osg::Quat NIFStream::getQuaternion()
     {
         float f[4];
-        readLittleEndianBufferOfType<4, float>(inp, (float*)&f);
+        readLittleEndianBufferOfType<4, float>(inp, f);
         osg::Quat quat;
         quat.w() = f[0];
         quat.x() = f[1];
diff --git a/components/nif/nifstream.hpp b/components/nif/nifstream.hpp
index ad0ba5da8b..b6bf01ce58 100644
--- a/components/nif/nifstream.hpp
+++ b/components/nif/nifstream.hpp
@@ -49,7 +49,7 @@ template <typename T> inline void readLittleEndianDynamicBufferOfType(Files::ISt
 template<typename type> type inline readLittleEndianType(Files::IStreamPtr &pIStream)
 {
     type val;
-    readLittleEndianBufferOfType<1, type>(pIStream, (type*)&val);
+    readLittleEndianBufferOfType<1, type>(pIStream, &val);
     return val;
 }
 
@@ -99,21 +99,21 @@ public:
     osg::Vec2f getVector2()
     {
         osg::Vec2f vec;
-        readLittleEndianBufferOfType<2,float>(inp, (float*)&vec._v[0]);
+        readLittleEndianBufferOfType<2,float>(inp, vec._v);
         return vec;
     }
 
     osg::Vec3f getVector3()
     {
         osg::Vec3f vec;
-        readLittleEndianBufferOfType<3, float>(inp, (float*)&vec._v[0]);
+        readLittleEndianBufferOfType<3, float>(inp, vec._v);
         return vec;
     }
 
     osg::Vec4f getVector4()
     {
         osg::Vec4f vec;
-        readLittleEndianBufferOfType<4, float>(inp, (float*)&vec._v[0]);
+        readLittleEndianBufferOfType<4, float>(inp, vec._v);
         return vec;
     }
 

From 19f0b80983a46d08f0d84981b55d1f608b4fd606 Mon Sep 17 00:00:00 2001
From: Dobrohotov Alexei <alexdobrohotov@yandex.ru>
Date: Wed, 5 May 2021 02:26:32 +0300
Subject: [PATCH 0708/2859] Improve null root handling

---
 components/nif/niffile.cpp               |  2 +-
 components/nifbullet/bulletnifloader.cpp | 10 ++++++----
 components/nifosg/nifloader.cpp          |  8 +++++---
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index 864a388e87..08301ce47a 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -322,7 +322,7 @@ void NIFFile::parse(Files::IStreamPtr stream)
         else
         {
             roots[i] = nullptr;
-            warn("Null Root found");
+            warn("Root " + std::to_string(i + 1) + " does not point to a record: index " + std::to_string(idx));
         }
     }
 
diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index 72c740af38..6ae1759395 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -121,12 +121,14 @@ osg::ref_ptr<Resource::BulletShape> BulletNifLoader::load(const Nif::File& nif)
     mAvoidStaticMesh.reset();
 
     const size_t numRoots = nif.numRoots();
-    std::vector<Nif::Node*> roots;
+    std::vector<const Nif::Node*> roots;
     for (size_t i = 0; i < numRoots; ++i)
     {
-        Nif::Record* r = nif.getRoot(i);
-        assert(r != nullptr);
-        if (Nif::Node* node = dynamic_cast<Nif::Node*>(r))
+        const Nif::Record* r = nif.getRoot(i);
+        if (!r)
+            continue;
+        const Nif::Node* node = dynamic_cast<const Nif::Node*>(r);
+        if (node)
             roots.emplace_back(node);
     }
     const std::string filename = nif.getFilename();
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 49d52074a5..f7d6fd3ed5 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -254,8 +254,7 @@ namespace NifOsg
             for (size_t i = 0; i < numRoots; ++i)
             {
                 const Nif::Record *r = nif->getRoot(i);
-                assert(r != nullptr);
-                if (r->recType == Nif::RC_NiSequenceStreamHelper)
+                if (r && r->recType == Nif::RC_NiSequenceStreamHelper)
                 {
                     seq = static_cast<const Nif::NiSequenceStreamHelper*>(r);
                     break;
@@ -312,7 +311,10 @@ namespace NifOsg
             for (size_t i = 0; i < numRoots; ++i)
             {
                 const Nif::Record* r = nif->getRoot(i);
-                if (const Nif::Node* nifNode = dynamic_cast<const Nif::Node*>(r))
+                if (!r)
+                    continue;
+                const Nif::Node* nifNode = dynamic_cast<const Nif::Node*>(r);
+                if (nifNode)
                     roots.emplace_back(nifNode);
             }
             if (roots.empty())

From d547d0dc60981bc3d55138a613e94ee8983a5390 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Wed, 5 May 2021 07:32:08 +0000
Subject: [PATCH 0709/2859] Add #5800 to changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c50054a74b..ba8081dae9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -100,6 +100,7 @@
     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

From 4f5d697e2b04bd5f0eba792879a33d60a383d7ae Mon Sep 17 00:00:00 2001
From: Bret Curtis <bret.curtis@gmail.com>
Date: Wed, 5 May 2021 10:36:34 +0200
Subject: [PATCH 0710/2859] Do not fail when unable to detect the FFMPEG
 version, like windows.

---
 CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3c17ddcfc..1041401074 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -261,16 +261,16 @@ if(FFmpeg_FOUND)
             set(FFVER_OK FALSE)
         endif()
     endif()
+
+    if(NOT FFVER_OK AND NOT APPLE)  # unable to detect on version on MacOS < 11.0
+        message(FATAL_ERROR "FFmpeg version is too old, 3.2 is required" )
+    endif()
 endif()
 
 if(NOT FFmpeg_FOUND)
     message(FATAL_ERROR "FFmpeg was not found" )
 endif()
 
-if(NOT FFVER_OK)
-    message(FATAL_ERROR "FFmpeg version is too old, 3.2 is required" )
-endif()
-
 if(WIN32)
     message("Can not detect FFmpeg version, at least the 3.2 is required" )
 endif()

From a1bc10888c7f1d00227d07c87b10454409c842bb Mon Sep 17 00:00:00 2001
From: Bret Curtis <bret.curtis@gmail.com>
Date: Wed, 5 May 2021 11:46:59 +0200
Subject: [PATCH 0711/2859] add implicit dependancy fontconfig for macos

---
 CI/before_install.osx.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index 51bcb9a59d..15c5012b80 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -17,3 +17,6 @@ qmake --version
 
 curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-8f5ef6e.zip -o ~/openmw-deps.zip
 unzip -o ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null
+
+# additional libraries
+brew install fontconfig
\ No newline at end of file

From 4129cc244c8bafb2542b2b899f6c185e7c96c690 Mon Sep 17 00:00:00 2001
From: Bret Curtis <bret.curtis@gmail.com>
Date: Wed, 5 May 2021 13:35:39 +0200
Subject: [PATCH 0712/2859] allow macos11xcode12 to fail for now; but not
 macos10.15xcode11; add support for macos10.14_xcode10; make sure fontconfig
 does not update other stuff

---
 .gitlab-ci.yml           | 10 +++++++++-
 CI/before_install.osx.sh |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c7a1a403fe..ea3b40b908 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -147,6 +147,7 @@ Debian_Clang_tests:
 macOS11_Xcode12:
   extends: .MacOS
   image: macos-11-xcode-12
+  allow_failure: true
   cache:
     key: macOS11_Xcode12.v1
   variables:
@@ -155,12 +156,19 @@ macOS11_Xcode12:
 macOS10.15_Xcode11:
   extends: .MacOS
   image: macos-10.15-xcode-11
-  allow_failure: true
   cache:
     key: macOS10.15_Xcode11.v1
   variables:
     CCACHE_SIZE: 3G
 
+macOS10.14_Xcode10:
+  extends: .MacOS
+  image: macos-10.14-xcode-10
+  cache:
+    key: macOS10.14_Xcode10.v1
+  variables:
+    CCACHE_SIZE: 3G
+
 variables: &engine-targets
   targets: "openmw,openmw-essimporter,openmw-iniimporter,openmw-launcher,openmw-wizard"
   package: "Engine"
diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index 15c5012b80..ec19c73215 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -19,4 +19,4 @@ curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-8f5ef6
 unzip -o ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null
 
 # additional libraries
-brew install fontconfig
\ No newline at end of file
+[ -z "${TRAVIS}" ] && HOMEBREW_NO_AUTO_UPDATE=1 brew install fontconfig
\ No newline at end of file

From 885ff36b01e777f83baaf02c945762390704a242 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Wed, 5 May 2021 11:45:59 +0000
Subject: [PATCH 0713/2859] Don't install recommended packages in Debian's CI

---
 CI/install_debian_deps.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CI/install_debian_deps.sh b/CI/install_debian_deps.sh
index 490fad0dae..2f905314b5 100755
--- a/CI/install_debian_deps.sh
+++ b/CI/install_debian_deps.sh
@@ -22,12 +22,12 @@ declare -rA GROUPED_DEPS=(
     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.
@@ -64,4 +64,4 @@ 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 "${deps[@]}"
+apt-get -q -o dir::cache::archives="$APT_CACHE_DIR" install -y --no-install-recommends "${deps[@]}"

From 3618eabaf0ec7abb8082a5e740d56c6ad045515d Mon Sep 17 00:00:00 2001
From: Bret Curtis <bret.curtis@gmail.com>
Date: Wed, 5 May 2021 14:42:54 +0200
Subject: [PATCH 0714/2859] remove macos10.14 support from gitlab; brew is
 broken

---
 .gitlab-ci.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ea3b40b908..20b233c66e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -161,14 +161,6 @@ macOS10.15_Xcode11:
   variables:
     CCACHE_SIZE: 3G
 
-macOS10.14_Xcode10:
-  extends: .MacOS
-  image: macos-10.14-xcode-10
-  cache:
-    key: macOS10.14_Xcode10.v1
-  variables:
-    CCACHE_SIZE: 3G
-
 variables: &engine-targets
   targets: "openmw,openmw-essimporter,openmw-iniimporter,openmw-launcher,openmw-wizard"
   package: "Engine"

From f169f8e6f0325bfb1f9e2c1cb337cde53abd0ce6 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 5 May 2021 18:13:17 +0200
Subject: [PATCH 0715/2859] Wait until navmesh is generated for interior cells

Add special loading progress bar.

It should be fast enough to not keep loading screen for noticably long but
will provide better pathfinding for actors inside interior cells.
---
 apps/openmw/mwworld/scene.cpp                 |  2 +
 .../detournavigator/navigator.cpp             | 46 ++++++++++---------
 .../detournavigator/asyncnavmeshupdater.cpp   | 46 +++++++++++++++++--
 .../detournavigator/asyncnavmeshupdater.hpp   | 11 ++++-
 components/detournavigator/navigator.hpp      |  7 ++-
 components/detournavigator/navigatorimpl.cpp  |  4 +-
 components/detournavigator/navigatorimpl.hpp  |  2 +-
 components/detournavigator/navigatorstub.hpp  |  7 ++-
 components/detournavigator/navmeshmanager.cpp |  4 +-
 components/detournavigator/navmeshmanager.hpp |  2 +-
 components/misc/guarded.hpp                   |  4 +-
 11 files changed, 98 insertions(+), 37 deletions(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index dae703c8c4..0cfca3be20 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -847,6 +847,8 @@ namespace MWWorld
             MWBase::Environment::get().getWindowManager()->fadeScreenIn(0.5);
 
         MWBase::Environment::get().getWindowManager()->changeCell(mCurrentCell);
+
+        mNavigator.wait(*loadingListener);
     }
 
     void Scene::changeToExteriorCell (const ESM::Position& position, bool adjustPlayerPos, bool changeEvent)
diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index 6192765888..8d92b48e08 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -3,6 +3,7 @@
 #include <components/detournavigator/navigatorimpl.hpp>
 #include <components/detournavigator/exceptions.hpp>
 #include <components/misc/rng.hpp>
+#include <components/loadinglistener/loadinglistener.hpp>
 
 #include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
 #include <BulletCollision/CollisionShapes/btBoxShape.h>
@@ -35,6 +36,7 @@ namespace
         std::back_insert_iterator<std::deque<osg::Vec3f>> mOut;
         float mStepSize;
         AreaCosts mAreaCosts;
+        Loading::Listener mListener;
 
         DetourNavigatorNavigatorTest()
             : mPlayerPosition(0, 0, 0)
@@ -124,7 +126,7 @@ namespace
         mNavigator->addAgent(mAgentHalfExtents);
         mNavigator->addObject(ObjectId(&shape), shape, btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait();
+        mNavigator->wait(mListener);
 
         EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
 
@@ -174,7 +176,7 @@ namespace
         mNavigator->addAgent(mAgentHalfExtents);
         mNavigator->addObject(ObjectId(&heightfieldShape), heightfieldShape, btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait();
+        mNavigator->wait(mListener);
 
         EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
 
@@ -206,7 +208,7 @@ namespace
 
         mNavigator->addObject(ObjectId(&compoundShape), compoundShape, btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait();
+        mNavigator->wait(mListener);
 
         mPath.clear();
         mOut = std::back_inserter(mPath);
@@ -259,7 +261,7 @@ namespace
         mNavigator->addObject(ObjectId(&heightfieldShape), heightfieldShape, btTransform::getIdentity());
         mNavigator->addObject(ObjectId(&compoundShape), compoundShape, btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait();
+        mNavigator->wait(mListener);
 
         EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
 
@@ -293,7 +295,7 @@ namespace
 
         mNavigator->updateObject(ObjectId(&compoundShape), compoundShape, btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait();
+        mNavigator->wait(mListener);
 
         mPath.clear();
         mOut = std::back_inserter(mPath);
@@ -352,7 +354,7 @@ namespace
         mNavigator->addObject(ObjectId(&shape), shape, btTransform::getIdentity());
         mNavigator->addObject(ObjectId(&shape2), shape2, btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait();
+        mNavigator->wait(mListener);
 
         EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
 
@@ -408,7 +410,7 @@ namespace
         mNavigator->addAgent(mAgentHalfExtents);
         mNavigator->addObject(ObjectId(&shape), ObjectShapes {shape, &shapeAvoid}, btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait();
+        mNavigator->wait(mListener);
 
         EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
 
@@ -456,7 +458,7 @@ namespace
         mNavigator->addWater(osg::Vec2i(0, 0), 128 * 4, 300, btTransform::getIdentity());
         mNavigator->addObject(ObjectId(&shape), shape, btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait();
+        mNavigator->wait(mListener);
 
         mStart.x() = 0;
         mStart.z() = 300;
@@ -504,7 +506,7 @@ namespace
         mNavigator->addWater(osg::Vec2i(0, 0), 128 * 4, -25, btTransform::getIdentity());
         mNavigator->addObject(ObjectId(&shape), shape, btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait();
+        mNavigator->wait(mListener);
 
         mStart.x() = 0;
         mEnd.x() = 0;
@@ -551,7 +553,7 @@ namespace
         mNavigator->addObject(ObjectId(&shape), shape, btTransform::getIdentity());
         mNavigator->addWater(osg::Vec2i(0, 0), std::numeric_limits<int>::max(), -25, btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait();
+        mNavigator->wait(mListener);
 
         mStart.x() = 0;
         mEnd.x() = 0;
@@ -598,7 +600,7 @@ namespace
         mNavigator->addWater(osg::Vec2i(0, 0), 128 * 4, -25, btTransform::getIdentity());
         mNavigator->addObject(ObjectId(&shape), shape, btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait();
+        mNavigator->wait(mListener);
 
         mStart.x() = 0;
         mEnd.x() = 0;
@@ -642,15 +644,15 @@ namespace
         mNavigator->addAgent(mAgentHalfExtents);
         mNavigator->addObject(ObjectId(&shape), shape, btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait();
+        mNavigator->wait(mListener);
 
         mNavigator->removeObject(ObjectId(&shape));
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait();
+        mNavigator->wait(mListener);
 
         mNavigator->addObject(ObjectId(&shape), shape, btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait();
+        mNavigator->wait(mListener);
 
         EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
 
@@ -696,7 +698,7 @@ namespace
         mNavigator->addAgent(mAgentHalfExtents);
         mNavigator->addObject(ObjectId(&shape), shape, btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait();
+        mNavigator->wait(mListener);
 
         Misc::Rng::init(42);
 
@@ -745,7 +747,7 @@ namespace
         }
 
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait();
+        mNavigator->wait(mListener);
 
         EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
 
@@ -788,7 +790,7 @@ namespace
             mNavigator->addObject(ObjectId(&shapes[i]), shapes[i], transform);
         }
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait();
+        mNavigator->wait(mListener);
 
         const auto start = std::chrono::steady_clock::now();
         for (std::size_t i = 0; i < shapes.size(); ++i)
@@ -797,7 +799,7 @@ namespace
             mNavigator->updateObject(ObjectId(&shapes[i]), shapes[i], transform);
         }
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait();
+        mNavigator->wait(mListener);
 
         for (std::size_t i = 0; i < shapes.size(); ++i)
         {
@@ -805,7 +807,7 @@ namespace
             mNavigator->updateObject(ObjectId(&shapes[i]), shapes[i], transform);
         }
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait();
+        mNavigator->wait(mListener);
 
         const auto duration = std::chrono::steady_clock::now() - start;
 
@@ -828,7 +830,7 @@ namespace
         mNavigator->addAgent(mAgentHalfExtents);
         mNavigator->addObject(ObjectId(&shape), shape, btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait();
+        mNavigator->wait(mListener);
 
         const auto result = mNavigator->raycast(mAgentHalfExtents, mStart, mEnd, Flag_walk);
 
@@ -859,7 +861,7 @@ namespace
         mNavigator->addObject(ObjectId(&boderBoxShape), boderBoxShape,
                               btTransform(btMatrix3x3::getIdentity(), oscillatingBoxShapePosition + btVector3(0, 0, 200)));
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait();
+        mNavigator->wait(mListener);
 
         const auto navMeshes = mNavigator->getNavMeshes();
         ASSERT_EQ(navMeshes.size(), 1);
@@ -875,7 +877,7 @@ namespace
                                         oscillatingBoxShapePosition);
             mNavigator->updateObject(ObjectId(&oscillatingBoxShape), oscillatingBoxShape, transform);
             mNavigator->update(mPlayerPosition);
-            mNavigator->wait();
+            mNavigator->wait(mListener);
         }
 
         ASSERT_EQ(navMeshes.size(), 1);
diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index 7248850a6c..124d3c4e05 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -6,6 +6,7 @@
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/thread.hpp>
+#include <components/loadinglistener/loadinglistener.hpp>
 
 #include <osg/Stats>
 
@@ -111,13 +112,44 @@ namespace DetourNavigator
             mHasJob.notify_all();
     }
 
-    void AsyncNavMeshUpdater::wait()
+    void AsyncNavMeshUpdater::wait(Loading::Listener& listener)
     {
+        listener.setLabel("Building navigation mesh");
+        const std::size_t initialJobsLeft = getTotalJobs();
+        std::size_t maxProgress = initialJobsLeft + mThreads.size();
+        listener.setProgressRange(maxProgress);
+        waitUntilJobsDone(initialJobsLeft, maxProgress, listener);
+        mProcessingTiles.wait(mProcessed, [] (const auto& v) { return v.empty(); });
+        listener.setProgress(maxProgress);
+    }
+
+    void AsyncNavMeshUpdater::waitUntilJobsDone(const std::size_t initialJobsLeft, std::size_t& maxProgress, Loading::Listener& listener)
+    {
+        std::size_t prevJobsLeft = initialJobsLeft;
+        std::size_t jobsDone = 0;
+        std::size_t jobsLeft = 0;
+        const auto isDone = [&]
         {
-            std::unique_lock<std::mutex> lock(mMutex);
-            mDone.wait(lock, [&] { return mJobs.empty() && getTotalThreadJobsUnsafe() == 0; });
+            jobsLeft = mJobs.size() + getTotalThreadJobsUnsafe();
+            return jobsLeft == 0;
+        };
+        std::unique_lock<std::mutex> lock(mMutex);
+        while (!mDone.wait_for(lock, std::chrono::milliseconds(250), isDone))
+        {
+            if (maxProgress < jobsLeft)
+            {
+                maxProgress = jobsLeft + mThreads.size();
+                listener.setProgressRange(maxProgress);
+                listener.setProgress(jobsDone);
+            }
+            else if (jobsLeft < prevJobsLeft)
+            {
+                const std::size_t newJobsDone = prevJobsLeft - jobsLeft;
+                jobsDone += newJobsDone;
+                prevJobsLeft = jobsLeft;
+                listener.increaseProgress(newJobsDone);
+            }
         }
-        mProcessingTiles.wait(mProcessed, [] (const auto& v) { return v.empty(); });
     }
 
     void AsyncNavMeshUpdater::reportStats(unsigned int frameNumber, osg::Stats& stats) const
@@ -381,6 +413,12 @@ namespace DetourNavigator
             mProcessed.notify_all();
     }
 
+    std::size_t AsyncNavMeshUpdater::getTotalJobs() const
+    {
+        const std::scoped_lock lock(mMutex);
+        return mJobs.size() + getTotalThreadJobsUnsafe();
+    }
+
     std::size_t AsyncNavMeshUpdater::getTotalThreadJobsUnsafe() const
     {
         return std::accumulate(mThreadsQueues.begin(), mThreadsQueues.end(), std::size_t(0),
diff --git a/components/detournavigator/asyncnavmeshupdater.hpp b/components/detournavigator/asyncnavmeshupdater.hpp
index 53e7fd7c14..fcf57d683d 100644
--- a/components/detournavigator/asyncnavmeshupdater.hpp
+++ b/components/detournavigator/asyncnavmeshupdater.hpp
@@ -20,6 +20,11 @@
 
 class dtNavMesh;
 
+namespace Loading
+{
+    class Listener;
+}
+
 namespace DetourNavigator
 {
     enum class ChangeType
@@ -55,7 +60,7 @@ namespace DetourNavigator
         void post(const osg::Vec3f& agentHalfExtents, const SharedNavMeshCacheItem& mNavMeshCacheItem,
             const TilePosition& playerTile, const std::map<TilePosition, ChangeType>& changedTiles);
 
-        void wait();
+        void wait(Loading::Listener& listener);
 
         void reportStats(unsigned int frameNumber, osg::Stats& stats) const;
 
@@ -131,9 +136,13 @@ namespace DetourNavigator
 
         void unlockTile(const osg::Vec3f& agentHalfExtents, const TilePosition& changedTile);
 
+        inline std::size_t getTotalJobs() const;
+
         inline std::size_t getTotalThreadJobsUnsafe() const;
 
         void cleanupLastUpdates();
+
+        void waitUntilJobsDone(const std::size_t initialJobsLeft, std::size_t& maxJobsLeft, Loading::Listener& listener);
     };
 }
 
diff --git a/components/detournavigator/navigator.hpp b/components/detournavigator/navigator.hpp
index edf597348f..3ec5e5acc4 100644
--- a/components/detournavigator/navigator.hpp
+++ b/components/detournavigator/navigator.hpp
@@ -14,6 +14,11 @@ namespace ESM
     struct Pathgrid;
 }
 
+namespace Loading
+{
+    class Listener;
+}
+
 namespace DetourNavigator
 {
     struct ObjectShapes
@@ -162,7 +167,7 @@ namespace DetourNavigator
         /**
          * @brief wait locks thread until all tiles are updated from last update call.
          */
-        virtual void wait() = 0;
+        virtual void wait(Loading::Listener& listener) = 0;
 
         /**
          * @brief findPath fills output iterator with points of scene surfaces to be used for actor to walk through.
diff --git a/components/detournavigator/navigatorimpl.cpp b/components/detournavigator/navigatorimpl.cpp
index abfb20ba80..d1e75b864a 100644
--- a/components/detournavigator/navigatorimpl.cpp
+++ b/components/detournavigator/navigatorimpl.cpp
@@ -153,9 +153,9 @@ namespace DetourNavigator
         mUpdatesEnabled = enabled;
     }
 
-    void NavigatorImpl::wait()
+    void NavigatorImpl::wait(Loading::Listener& listener)
     {
-        mNavMeshManager.wait();
+        mNavMeshManager.wait(listener);
     }
 
     SharedNavMeshCacheItem NavigatorImpl::getNavMesh(const osg::Vec3f& agentHalfExtents) const
diff --git a/components/detournavigator/navigatorimpl.hpp b/components/detournavigator/navigatorimpl.hpp
index 74fff0dea4..a53c9608de 100644
--- a/components/detournavigator/navigatorimpl.hpp
+++ b/components/detournavigator/navigatorimpl.hpp
@@ -48,7 +48,7 @@ namespace DetourNavigator
 
         void setUpdatesEnabled(bool enabled) override;
 
-        void wait() override;
+        void wait(Loading::Listener& listener) override;
 
         SharedNavMeshCacheItem getNavMesh(const osg::Vec3f& agentHalfExtents) const override;
 
diff --git a/components/detournavigator/navigatorstub.hpp b/components/detournavigator/navigatorstub.hpp
index f6892bf1b5..c21db2bf8d 100644
--- a/components/detournavigator/navigatorstub.hpp
+++ b/components/detournavigator/navigatorstub.hpp
@@ -3,6 +3,11 @@
 
 #include "navigator.hpp"
 
+namespace Loading
+{
+    class Listener;
+}
+
 namespace DetourNavigator
 {
     class NavigatorStub final : public Navigator
@@ -68,7 +73,7 @@ namespace DetourNavigator
 
         void setUpdatesEnabled(bool /*enabled*/) override {}
 
-        void wait() override {}
+        void wait(Loading::Listener& /*listener*/) override {}
 
         SharedNavMeshCacheItem getNavMesh(const osg::Vec3f& /*agentHalfExtents*/) const override
         {
diff --git a/components/detournavigator/navmeshmanager.cpp b/components/detournavigator/navmeshmanager.cpp
index 43d3306481..21022d60ba 100644
--- a/components/detournavigator/navmeshmanager.cpp
+++ b/components/detournavigator/navmeshmanager.cpp
@@ -188,9 +188,9 @@ namespace DetourNavigator
             " recastMeshManagerRevision=" << lastRevision;
     }
 
-    void NavMeshManager::wait()
+    void NavMeshManager::wait(Loading::Listener& listener)
     {
-        mAsyncNavMeshUpdater.wait();
+        mAsyncNavMeshUpdater.wait(listener);
     }
 
     SharedNavMeshCacheItem NavMeshManager::getNavMesh(const osg::Vec3f& agentHalfExtents) const
diff --git a/components/detournavigator/navmeshmanager.hpp b/components/detournavigator/navmeshmanager.hpp
index f3861f8f27..ce90aafc5d 100644
--- a/components/detournavigator/navmeshmanager.hpp
+++ b/components/detournavigator/navmeshmanager.hpp
@@ -45,7 +45,7 @@ namespace DetourNavigator
 
         void update(osg::Vec3f playerPosition, const osg::Vec3f& agentHalfExtents);
 
-        void wait();
+        void wait(Loading::Listener& listener);
 
         SharedNavMeshCacheItem getNavMesh(const osg::Vec3f& agentHalfExtents) const;
 
diff --git a/components/misc/guarded.hpp b/components/misc/guarded.hpp
index 55a2c670cf..7f1005fc3a 100644
--- a/components/misc/guarded.hpp
+++ b/components/misc/guarded.hpp
@@ -75,7 +75,7 @@ namespace Misc
                 return Locked<T>(mMutex, mValue);
             }
 
-            Locked<const T> lockConst()
+            Locked<const T> lockConst() const
             {
                 return Locked<const T>(mMutex, mValue);
             }
@@ -88,7 +88,7 @@ namespace Misc
             }
 
         private:
-            std::mutex mMutex;
+            mutable std::mutex mMutex;
             T mValue;
     };
 }

From 7a51d0db1886d549e81e3ad8e2f21110e4ac881e Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 5 May 2021 19:23:07 +0200
Subject: [PATCH 0716/2859] Wait until navmesh is generated within given
 distance around player

Add a setting to change this distance.

To prevent situations when there is not enough navmesh generated and actors
can't find path correctly.
---
 CHANGELOG.md                                  |  1 +
 apps/openmw/mwworld/scene.cpp                 |  2 +
 .../detournavigator/navigator.cpp             |  1 +
 .../detournavigator/asyncnavmeshupdater.cpp   | 37 ++++++++++++++++---
 .../detournavigator/asyncnavmeshupdater.hpp   |  2 +-
 components/detournavigator/settings.cpp       |  1 +
 components/detournavigator/settings.hpp       |  1 +
 .../reference/modding/settings/navigator.rst  | 12 ++++++
 files/settings-default.cfg                    |  4 ++
 9 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba8081dae9..867ae04123 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -141,6 +141,7 @@
     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
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 0cfca3be20..c2d96788c3 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -620,6 +620,8 @@ namespace MWWorld
 
         if (changeEvent)
             mCellChanged = true;
+
+        mNavigator.wait(*loadingListener);
     }
 
     void Scene::testExteriorCells()
diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index 8d92b48e08..cb8ae41523 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -66,6 +66,7 @@ namespace
             mSettings.mRegionMergeSize = 20;
             mSettings.mRegionMinSize = 8;
             mSettings.mTileSize = 64;
+            mSettings.mWaitUntilMinDistanceToPlayer = std::numeric_limits<int>::max();
             mSettings.mAsyncNavMeshUpdaterThreads = 1;
             mSettings.mMaxNavMeshTilesCacheSize = 1024 * 1024;
             mSettings.mMaxPolygonPathSize = 1024;
diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index 124d3c4e05..ff51e39aad 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -21,6 +21,16 @@ namespace
     {
         return std::abs(lhs.x() - rhs.x()) + std::abs(lhs.y() - rhs.y());
     }
+
+    int getMinDistanceTo(const TilePosition& position, int maxDistance,
+                         const std::map<osg::Vec3f, std::set<TilePosition>>& tilesPerHalfExtents)
+    {
+        int result = maxDistance;
+        for (const auto& [halfExtents, tiles] : tilesPerHalfExtents)
+            for (const TilePosition& tile : tiles)
+                result = std::min(result, getManhattanDistance(position, tile));
+        return result;
+    }
 }
 
 namespace DetourNavigator
@@ -114,24 +124,40 @@ namespace DetourNavigator
 
     void AsyncNavMeshUpdater::wait(Loading::Listener& listener)
     {
+        if (mSettings.get().mWaitUntilMinDistanceToPlayer == 0)
+            return;
         listener.setLabel("Building navigation mesh");
         const std::size_t initialJobsLeft = getTotalJobs();
         std::size_t maxProgress = initialJobsLeft + mThreads.size();
         listener.setProgressRange(maxProgress);
-        waitUntilJobsDone(initialJobsLeft, maxProgress, listener);
-        mProcessingTiles.wait(mProcessed, [] (const auto& v) { return v.empty(); });
-        listener.setProgress(maxProgress);
+        const int minDistanceToPlayer = waitUntilJobsDone(initialJobsLeft, maxProgress, listener);
+        if (minDistanceToPlayer < mSettings.get().mWaitUntilMinDistanceToPlayer)
+        {
+            mProcessingTiles.wait(mProcessed, [] (const auto& v) { return v.empty(); });
+            listener.setProgress(maxProgress);
+        }
     }
 
-    void AsyncNavMeshUpdater::waitUntilJobsDone(const std::size_t initialJobsLeft, std::size_t& maxProgress, Loading::Listener& listener)
+    int AsyncNavMeshUpdater::waitUntilJobsDone(const std::size_t initialJobsLeft, std::size_t& maxProgress, Loading::Listener& listener)
     {
         std::size_t prevJobsLeft = initialJobsLeft;
         std::size_t jobsDone = 0;
         std::size_t jobsLeft = 0;
+        const int maxDistanceToPlayer = mSettings.get().mWaitUntilMinDistanceToPlayer;
+        const TilePosition playerPosition = *mPlayerTile.lockConst();
+        int minDistanceToPlayer = 0;
         const auto isDone = [&]
         {
             jobsLeft = mJobs.size() + getTotalThreadJobsUnsafe();
-            return jobsLeft == 0;
+            if (jobsLeft == 0)
+            {
+                minDistanceToPlayer = 0;
+                return true;
+            }
+            minDistanceToPlayer = getMinDistanceTo(playerPosition, maxDistanceToPlayer, mPushed);
+            for (const auto& [threadId, queue] : mThreadsQueues)
+                minDistanceToPlayer = getMinDistanceTo(playerPosition, minDistanceToPlayer, queue.mPushed);
+            return minDistanceToPlayer >= maxDistanceToPlayer;
         };
         std::unique_lock<std::mutex> lock(mMutex);
         while (!mDone.wait_for(lock, std::chrono::milliseconds(250), isDone))
@@ -150,6 +176,7 @@ namespace DetourNavigator
                 listener.increaseProgress(newJobsDone);
             }
         }
+        return minDistanceToPlayer;
     }
 
     void AsyncNavMeshUpdater::reportStats(unsigned int frameNumber, osg::Stats& stats) const
diff --git a/components/detournavigator/asyncnavmeshupdater.hpp b/components/detournavigator/asyncnavmeshupdater.hpp
index fcf57d683d..c28d8f21db 100644
--- a/components/detournavigator/asyncnavmeshupdater.hpp
+++ b/components/detournavigator/asyncnavmeshupdater.hpp
@@ -142,7 +142,7 @@ namespace DetourNavigator
 
         void cleanupLastUpdates();
 
-        void waitUntilJobsDone(const std::size_t initialJobsLeft, std::size_t& maxJobsLeft, Loading::Listener& listener);
+        int waitUntilJobsDone(const std::size_t initialJobsLeft, std::size_t& maxJobsLeft, Loading::Listener& listener);
     };
 }
 
diff --git a/components/detournavigator/settings.cpp b/components/detournavigator/settings.cpp
index 0c4d0f838b..ff99fae20c 100644
--- a/components/detournavigator/settings.cpp
+++ b/components/detournavigator/settings.cpp
@@ -29,6 +29,7 @@ namespace DetourNavigator
         navigatorSettings.mRegionMergeSize = ::Settings::Manager::getInt("region merge size", "Navigator");
         navigatorSettings.mRegionMinSize = ::Settings::Manager::getInt("region min size", "Navigator");
         navigatorSettings.mTileSize = ::Settings::Manager::getInt("tile size", "Navigator");
+        navigatorSettings.mWaitUntilMinDistanceToPlayer = ::Settings::Manager::getInt("wait until min distance to player", "Navigator");
         navigatorSettings.mAsyncNavMeshUpdaterThreads = static_cast<std::size_t>(::Settings::Manager::getInt("async nav mesh updater threads", "Navigator"));
         navigatorSettings.mMaxNavMeshTilesCacheSize = static_cast<std::size_t>(::Settings::Manager::getInt("max nav mesh tiles cache size", "Navigator"));
         navigatorSettings.mMaxPolygonPathSize = static_cast<std::size_t>(::Settings::Manager::getInt("max polygon path size", "Navigator"));
diff --git a/components/detournavigator/settings.hpp b/components/detournavigator/settings.hpp
index ece16e35a9..39f5815b8e 100644
--- a/components/detournavigator/settings.hpp
+++ b/components/detournavigator/settings.hpp
@@ -31,6 +31,7 @@ namespace DetourNavigator
         int mRegionMergeSize = 0;
         int mRegionMinSize = 0;
         int mTileSize = 0;
+        int mWaitUntilMinDistanceToPlayer = 0;
         std::size_t mAsyncNavMeshUpdaterThreads = 0;
         std::size_t mMaxNavMeshTilesCacheSize = 0;
         std::size_t mMaxPolygonPathSize = 0;
diff --git a/docs/source/reference/modding/settings/navigator.rst b/docs/source/reference/modding/settings/navigator.rst
index b9485c3e95..fee4b2626e 100644
--- a/docs/source/reference/modding/settings/navigator.rst
+++ b/docs/source/reference/modding/settings/navigator.rst
@@ -42,6 +42,18 @@ Increasing this value may decrease performance.
     This condition is always true: ``max tiles number * max polygons per tile <= 4194304``.
     It's a limitation of `Recastnavigation <https://github.com/recastnavigation/recastnavigation>`_ library.
 
+wait until min distance to player
+------------------------------
+
+:Type:		integer
+:Range:		>= 0
+:Default:	5
+
+Distance in navmesh tiles around the player to keep loading screen until navigation mesh is generated.
+Allows to complete cell loading only when minimal navigation mesh area is generated to correctly find path for actors
+nearby the player. Increasing this value will keep loading screen longer but will slightly increase nav mesh generation
+speed on systems bound by CPU. Zero means no waiting.
+
 Advanced settings
 *****************
 
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index ea678c70f6..584fe5951d 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -908,6 +908,10 @@ max tiles number = 512
 # Min time duration for the same tile update in milliseconds (value >= 0)
 min update interval ms = 250
 
+# Keep loading screen until navmesh is generated around the player for all tiles within manhattan distance (value >= 0).
+# Distance is measured in the number of tiles and can be only an integer value.
+wait until min distance to player = 5
+
 [Shadows]
 
 # Enable or disable shadows. Bear in mind that this will force OpenMW to use shaders as if "[Shaders]/force shaders" was set to true.

From 00de540a31f4bf64c0302b9b2b77c1666dc28612 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Wed, 5 May 2021 20:27:22 +0200
Subject: [PATCH 0717/2859] Remove unused function.

---
 apps/openmw/mwworld/store.cpp | 11 -----------
 apps/openmw/mwworld/store.hpp |  4 ----
 2 files changed, 15 deletions(-)

diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index 9d6552106b..94795b8417 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -186,17 +186,6 @@ namespace MWWorld
         return ptr;
     }
     template<typename T>
-    const T *Store<T>::findRandom(const std::string &id) const
-    {
-        const T *ptr = searchRandom(id);
-        if(ptr == nullptr)
-        {
-            const std::string msg = T::getRecordType() + " starting with '" + id + "' not found";
-            throw std::runtime_error(msg);
-        }
-        return ptr;
-    }
-    template<typename T>
     RecordId Store<T>::load(ESM::ESMReader &esm)
     {
         T record;
diff --git a/apps/openmw/mwworld/store.hpp b/apps/openmw/mwworld/store.hpp
index 9cb1c7473b..e37152431e 100644
--- a/apps/openmw/mwworld/store.hpp
+++ b/apps/openmw/mwworld/store.hpp
@@ -179,10 +179,6 @@ namespace MWWorld
 
         const T *find(const std::string &id) const;
 
-        /** Returns a random record that starts with the named ID. An exception is thrown if none
-         * are found. */
-        const T *findRandom(const std::string &id) const;
-
         iterator begin() const;
         iterator end() const;
 

From 57c372a50e481518e93aba40fc2f80f7ae2eab48 Mon Sep 17 00:00:00 2001
From: Dobrohotov Alexei <alexdobrohotov@yandex.ru>
Date: Wed, 5 May 2021 22:23:06 +0300
Subject: [PATCH 0718/2859] ESM code cleanup

---
 components/esm/esmreader.cpp    | 21 +--------------------
 components/esm/esmreader.hpp    |  5 -----
 components/esm/globalscript.cpp |  3 +--
 components/esm/loadtes3.cpp     | 13 ++++++-------
 components/esm/weatherstate.cpp |  8 ++++----
 5 files changed, 12 insertions(+), 38 deletions(-)

diff --git a/components/esm/esmreader.cpp b/components/esm/esmreader.cpp
index 4e7dce876b..7aa8add483 100644
--- a/components/esm/esmreader.cpp
+++ b/components/esm/esmreader.cpp
@@ -97,13 +97,6 @@ void ESMReader::open(const std::string &file)
     open (Files::openConstrainedFileStream (file.c_str ()), file);
 }
 
-int64_t ESMReader::getHNLong(const char *name)
-{
-    int64_t val;
-    getHNT(val, name);
-    return val;
-}
-
 std::string ESMReader::getHNOString(const char* name)
 {
     if (isNextSub(name))
@@ -215,18 +208,6 @@ void ESMReader::getSubName()
     mCtx.leftRec -= subNameSize;
 }
 
-bool ESMReader::isEmptyOrGetName()
-{
-    if (mCtx.leftRec)
-    {
-        const size_t subNameSize = mCtx.subName.data_size();
-        getExact(mCtx.subName.rw_data(), subNameSize);
-        mCtx.leftRec -= subNameSize;
-        return false;
-    }
-    return true;
-}
-
 void ESMReader::skipHSub()
 {
     getSubHeader();
@@ -343,7 +324,7 @@ std::string ESMReader::getString(int size)
     mBuffer[s] = 0;
 
     // read ESM data
-    char *ptr = &mBuffer[0];
+    char *ptr = mBuffer.data();
     getExact(ptr, size);
 
     size = strnlen(ptr, size);
diff --git a/components/esm/esmreader.hpp b/components/esm/esmreader.hpp
index 761756e8fb..ba24c79f88 100644
--- a/components/esm/esmreader.hpp
+++ b/components/esm/esmreader.hpp
@@ -128,8 +128,6 @@ public:
           getHT(x);
   }
 
-  int64_t getHNLong(const char *name);
-
   // Get data of a given type/size, including subrecord header
   template <typename X>
   void getHT(X &x)
@@ -193,9 +191,6 @@ public:
   // slightly.
   void getSubName();
 
-  // This is specially optimized for LoadINFO.
-  bool isEmptyOrGetName();
-
   // Skip current sub record, including header (but not including
   // name.)
   void skipHSub();
diff --git a/components/esm/globalscript.cpp b/components/esm/globalscript.cpp
index 239d162f29..016ea4f0cf 100644
--- a/components/esm/globalscript.cpp
+++ b/components/esm/globalscript.cpp
@@ -13,8 +13,7 @@ void ESM::GlobalScript::load (ESMReader &esm)
     esm.getHNOT (mRunning, "RUN_");
 
     mTargetRef.unset();
-    if (esm.peekNextSub("TARG"))
-        mTargetId = esm.getHNString ("TARG");
+    mTargetId = esm.getHNOString ("TARG");
     if (esm.peekNextSub("FRMR"))
         mTargetRef.load(esm, true, "FRMR");
 }
diff --git a/components/esm/loadtes3.cpp b/components/esm/loadtes3.cpp
index d953f1dc23..f5cbcd62f2 100644
--- a/components/esm/loadtes3.cpp
+++ b/components/esm/loadtes3.cpp
@@ -41,7 +41,7 @@ void ESM::Header::load (ESMReader &esm)
     {
         MasterData m;
         m.name = esm.getHString();
-        m.size = esm.getHNLong ("DATA");
+        esm.getHNT(m.size, "DATA");
         mMaster.push_back (m);
     }
 
@@ -54,14 +54,14 @@ void ESM::Header::load (ESMReader &esm)
         esm.getSubHeader();
         mSCRD.resize(esm.getSubSize());
         if (!mSCRD.empty())
-            esm.getExact(&mSCRD[0], mSCRD.size());
+            esm.getExact(mSCRD.data(), mSCRD.size());
     }
     if (esm.isNextSub("SCRS"))
     {
         esm.getSubHeader();
         mSCRS.resize(esm.getSubSize());
         if (!mSCRS.empty())
-            esm.getExact(&mSCRS[0], mSCRS.size());
+            esm.getExact(mSCRS.data(), mSCRS.size());
     }
 }
 
@@ -78,10 +78,9 @@ void ESM::Header::save (ESMWriter &esm)
     esm.writeT(mData.records);
     esm.endRecord("HEDR");
 
-    for (std::vector<Header::MasterData>::iterator iter = mMaster.begin();
-         iter != mMaster.end(); ++iter)
+    for (const Header::MasterData& data : mMaster)
     {
-        esm.writeHNCString ("MAST", iter->name);
-        esm.writeHNT ("DATA", iter->size);
+        esm.writeHNCString ("MAST", data.name);
+        esm.writeHNT ("DATA", data.size);
     }
 }
diff --git a/components/esm/weatherstate.cpp b/components/esm/weatherstate.cpp
index ff2528e58f..3d94a445be 100644
--- a/components/esm/weatherstate.cpp
+++ b/components/esm/weatherstate.cpp
@@ -31,15 +31,15 @@ namespace ESM
         esm.getHNT(mNextWeather, nextWeatherRecord);
         esm.getHNT(mQueuedWeather, queuedWeatherRecord);
 
-        while(esm.peekNextSub(regionNameRecord))
+        while (esm.isNextSub(regionNameRecord))
         {
-            std::string regionID = esm.getHNString(regionNameRecord);
+            std::string regionID = esm.getHString();
             RegionWeatherState region;
             esm.getHNT(region.mWeather, regionWeatherRecord);
-            while(esm.peekNextSub(regionChanceRecord))
+            while (esm.isNextSub(regionChanceRecord))
             {
                 char chance;
-                esm.getHNT(chance, regionChanceRecord);
+                esm.getHT(chance);
                 region.mChances.push_back(chance);
             }
 

From e378159ea862994d0f3381a1067631e4400f6bdb Mon Sep 17 00:00:00 2001
From: CedricMocquillon <cedric.mocquillon@sage.com>
Date: Sat, 1 May 2021 23:21:21 +0200
Subject: [PATCH 0719/2859] Use O(log(n)) search instead of O(n)

---
 components/vfs/filesystemarchive.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/components/vfs/filesystemarchive.cpp b/components/vfs/filesystemarchive.cpp
index 17f3891ec6..6eef4b93ae 100644
--- a/components/vfs/filesystemarchive.cpp
+++ b/components/vfs/filesystemarchive.cpp
@@ -55,12 +55,7 @@ namespace VFS
 
     bool FileSystemArchive::contains(const std::string& file, char (*normalize_function)(char)) const
     {
-        for (const auto& it : mIndex)
-        {
-            if(it.first == file)
-                return true;
-        }
-        return false;
+        return mIndex.find(file) != mIndex.end();
     }
 
     std::string FileSystemArchive::getDescription() const

From 813b8ee0d18e66bb5e029ff5aa687bdab1c6cf95 Mon Sep 17 00:00:00 2001
From: CedricMocquillon <cedric.mocquillon@sage.com>
Date: Wed, 5 May 2021 23:19:08 +0200
Subject: [PATCH 0720/2859] Search only in the niffilemanager for nif files

---
 components/resource/scenemanager.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index a3c751f7a2..64128ae302 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -378,7 +378,7 @@ namespace Resource
         Resource::ImageManager* mImageManager;
     };
 
-    osg::ref_ptr<osg::Node> load (Files::IStreamPtr file, const std::string& normalizedFilename, Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager)
+    osg::ref_ptr<osg::Node> load (const std::string& normalizedFilename, const VFS::Manager* vfs, Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager)
     {
         std::string ext = Resource::getFileExtension(normalizedFilename);
         if (ext == "nif")
@@ -400,7 +400,7 @@ namespace Resource
             options->setReadFileCallback(new ImageReadCallback(imageManager));
             if (ext == "dae") options->setOptionString("daeUseSequencedTextureUnits");
 
-            osgDB::ReaderWriter::ReadResult result = reader->readNode(*file, options);
+            osgDB::ReaderWriter::ReadResult result = reader->readNode(*vfs->get(normalizedFilename), options);
             if (!result.success())
             {
                 std::stringstream errormsg;
@@ -527,9 +527,7 @@ namespace Resource
             osg::ref_ptr<osg::Node> loaded;
             try
             {
-                Files::IStreamPtr file = mVFS->get(normalized);
-
-                loaded = load(file, normalized, mImageManager, mNifFileManager);
+                loaded = load(normalized, mVFS, mImageManager, mNifFileManager);
             }
             catch (std::exception& e)
             {
@@ -542,7 +540,7 @@ namespace Resource
                     {
                         Log(Debug::Error) << "Failed to load '" << name << "': " << e.what() << ", using marker_error." << sMeshTypes[i] << " instead";
                         Files::IStreamPtr file = mVFS->get(normalized);
-                        loaded = load(file, normalized, mImageManager, mNifFileManager);
+                        loaded = load(normalized, mVFS, mImageManager, mNifFileManager);
                         break;
                     }
                 }

From 626e0329315e6ec3037210dc0fa00cdd0755754c Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 5 May 2021 23:25:13 +0200
Subject: [PATCH 0721/2859] Do not store callback inside Misc::Barrier

The only wait method can be provided with it so pass it as a template
parameter there.
---
 apps/openmw/mwphysics/mtphysics.cpp | 82 ++++++++++++++++-------------
 apps/openmw/mwphysics/mtphysics.hpp |  3 ++
 components/misc/barrier.hpp         | 13 ++---
 3 files changed, 52 insertions(+), 46 deletions(-)

diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 95a741825d..82214b6287 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -177,43 +177,11 @@ namespace MWPhysics
             mDeferAabbUpdate = false;
         }
 
-        mPreStepBarrier = std::make_unique<Misc::Barrier>(mNumThreads, [&]()
-            {
-            if (mDeferAabbUpdate)
-                updateAabbs();
-            if (!mRemainingSteps)
-                return;
-            for (auto& data : mActorsFrameData)
-                if (data.mActor.lock())
-                {
-                    std::unique_lock lock(mCollisionWorldMutex);
-                    MovementSolver::unstuck(data, mCollisionWorld);
-                }
-            });
+        mPreStepBarrier = std::make_unique<Misc::Barrier>(mNumThreads);
 
-        mPostStepBarrier = std::make_unique<Misc::Barrier>(mNumThreads, [&]()
-            {
-                if (mRemainingSteps)
-                {
-                    --mRemainingSteps;
-                    updateActorsPositions();
-                }
-                mNextJob.store(0, std::memory_order_release);
-            });
+        mPostStepBarrier = std::make_unique<Misc::Barrier>(mNumThreads);
 
-        mPostSimBarrier = std::make_unique<Misc::Barrier>(mNumThreads, [&]()
-            {
-                mNewFrame = false;
-                if (mLOSCacheExpiry >= 0)
-                {
-                    std::unique_lock lock(mLOSCacheMutex);
-                    mLOSCache.erase(
-                            std::remove_if(mLOSCache.begin(), mLOSCache.end(),
-                                [](const LOSRequest& req) { return req.mStale; }),
-                            mLOSCache.end());
-                }
-                mTimeEnd = mTimer->tick();
-            });
+        mPostSimBarrier = std::make_unique<Misc::Barrier>(mNumThreads);
     }
 
     PhysicsTaskScheduler::~PhysicsTaskScheduler()
@@ -525,7 +493,7 @@ namespace MWPhysics
             if (!mNewFrame)
                 mHasJob.wait(lock, [&]() { return mQuit || mNewFrame; });
 
-            mPreStepBarrier->wait();
+            mPreStepBarrier->wait([this] { afterPreStep(); });
 
             int job = 0;
             while (mRemainingSteps && (job = mNextJob.fetch_add(1, std::memory_order_relaxed)) < mNumJobs)
@@ -537,7 +505,7 @@ namespace MWPhysics
                 }
             }
 
-            mPostStepBarrier->wait();
+            mPostStepBarrier->wait([this] { afterPostStep(); });
 
             if (!mRemainingSteps)
             {
@@ -552,7 +520,7 @@ namespace MWPhysics
 
                 if (mLOSCacheExpiry >= 0)
                     refreshLOSCache();
-                mPostSimBarrier->wait();
+                mPostSimBarrier->wait([this] { afterPostSim(); });
             }
         }
     }
@@ -633,4 +601,42 @@ namespace MWPhysics
         std::shared_lock lock(mCollisionWorldMutex);
         mDebugDrawer->step();
     }
+
+    void PhysicsTaskScheduler::afterPreStep()
+    {
+        if (mDeferAabbUpdate)
+            updateAabbs();
+        if (!mRemainingSteps)
+            return;
+        for (auto& data : mActorsFrameData)
+            if (data.mActor.lock())
+            {
+                std::unique_lock lock(mCollisionWorldMutex);
+                MovementSolver::unstuck(data, mCollisionWorld);
+            }
+    }
+
+    void PhysicsTaskScheduler::afterPostStep()
+    {
+        if (mRemainingSteps)
+        {
+            --mRemainingSteps;
+            updateActorsPositions();
+        }
+        mNextJob.store(0, std::memory_order_release);
+    }
+
+    void PhysicsTaskScheduler::afterPostSim()
+    {
+        mNewFrame = false;
+        if (mLOSCacheExpiry >= 0)
+        {
+            std::unique_lock lock(mLOSCacheMutex);
+            mLOSCache.erase(
+                    std::remove_if(mLOSCache.begin(), mLOSCache.end(),
+                        [](const LOSRequest& req) { return req.mStale; }),
+                    mLOSCache.end());
+        }
+        mTimeEnd = mTimer->tick();
+    }
 }
diff --git a/apps/openmw/mwphysics/mtphysics.hpp b/apps/openmw/mwphysics/mtphysics.hpp
index 6d2c392c09..3fd4d5a693 100644
--- a/apps/openmw/mwphysics/mtphysics.hpp
+++ b/apps/openmw/mwphysics/mtphysics.hpp
@@ -66,6 +66,9 @@ namespace MWPhysics
             void updatePtrAabb(const std::weak_ptr<PtrHolder>& ptr);
             void updateStats(osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
             std::tuple<int, float> calculateStepConfig(float timeAccum) const;
+            void afterPreStep();
+            void afterPostStep();
+            void afterPostSim();
 
             std::unique_ptr<WorldFrameData> mWorldFrameData;
             std::vector<ActorFrameData> mActorsFrameData;
diff --git a/components/misc/barrier.hpp b/components/misc/barrier.hpp
index a5af9f5650..b3fe944b04 100644
--- a/components/misc/barrier.hpp
+++ b/components/misc/barrier.hpp
@@ -2,7 +2,6 @@
 #define OPENMW_BARRIER_H
 
 #include <condition_variable>
-#include <functional>
 #include <mutex>
 
 namespace Misc
@@ -11,15 +10,14 @@ namespace Misc
     class Barrier
     {
         public:
-            using BarrierCallback = std::function<void(void)>;
             /// @param count number of threads to wait on
-            /// @param func callable to be executed once after all threads have met
-            Barrier(int count, BarrierCallback&& func) : mThreadCount(count), mRendezvousCount(0), mGeneration(0)
-                                                       , mFunc(std::forward<BarrierCallback>(func))
+            explicit Barrier(int count) : mThreadCount(count), mRendezvousCount(0), mGeneration(0)
             {}
 
             /// @brief stop execution of threads until count distinct threads reach this point
-            void wait()
+            /// @param func callable to be executed once after all threads have met
+            template <class Callback>
+            void wait(Callback&& func)
             {
                 std::unique_lock lock(mMutex);
 
@@ -29,7 +27,7 @@ namespace Misc
                 {
                     ++mGeneration;
                     mRendezvousCount = 0;
-                    mFunc();
+                    func();
                     mRendezvous.notify_all();
                 }
                 else
@@ -44,7 +42,6 @@ namespace Misc
             int mGeneration;
             mutable std::mutex mMutex;
             std::condition_variable mRendezvous;
-            BarrierCallback mFunc;
     };
 }
 

From b78bed90c5a437020ed3ec50c80408d9a41fa95d Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Wed, 5 May 2021 23:51:07 +0100
Subject: [PATCH 0722/2859] Add CMake-based base64 port

---
 cmake/base64.cmake | 74 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 cmake/base64.cmake

diff --git a/cmake/base64.cmake b/cmake/base64.cmake
new file mode 100644
index 0000000000..7931758bbb
--- /dev/null
+++ b/cmake/base64.cmake
@@ -0,0 +1,74 @@
+# math(EXPR "...") can't parse hex until 3.13
+cmake_minimum_required(VERSION 3.13)
+
+if (NOT DEFINED INPUT_FILE)
+    message(STATUS "Usage: cmake -DINPUT_FILE=\"infile.ext\" -DOUTPUT_FILE=\"out.txt\" -P base64.cmake")
+    message(FATAL_ERROR "INPUT_FILE not specified")
+endif()
+
+if (NOT DEFINED OUTPUT_FILE)
+    message(STATUS "Usage: cmake -DINPUT_FILE=\"infile.ext\" -DOUTPUT_FILE=\"out.txt\" -P base64.cmake")
+    message(FATAL_ERROR "OUTPUT_FILE not specified")
+endif()
+
+if (NOT EXISTS ${INPUT_FILE})
+    message(FATAL_ERROR "INPUT_FILE ${INPUT_FILE} does not exist")
+endif()
+
+set(lut "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/")
+
+file(READ "${INPUT_FILE}" hexContent HEX)
+
+set(base64Content "")
+while(TRUE)
+    string(LENGTH "${hexContent}" tailLength)
+    if (tailLength LESS 1)
+        break()
+    endif()
+
+    string(SUBSTRING "${hexContent}" 0 6 head)
+    # base64 works on three-byte chunks. Pad.
+    string(LENGTH "${head}" headLength)
+    if (headLength LESS 6)
+        set(hexContent "")
+        math(EXPR padSize "6 - ${headLength}")
+        set(pad "")
+        foreach(i RANGE 1 ${padSize})
+            string(APPEND pad "0")
+        endforeach()
+        string(APPEND head "${pad}")
+    else()
+        string(SUBSTRING "${hexContent}" 6 -1 hexContent)
+        set(padSize 0)   
+    endif()
+
+    # get six-bit slices
+    math(EXPR first "0x${head} >> 18")
+    math(EXPR second "(0x${head} & 0x3F000) >> 12")
+    math(EXPR third "(0x${head} & 0xFC0) >> 6")
+    math(EXPR fourth "0x${head} & 0x3F")
+
+    # first two characters are always needed to represent the first byte
+    string(SUBSTRING "${lut}" ${first} 1 char)
+    string(APPEND base64Content "${char}")
+    string(SUBSTRING "${lut}" ${second} 1 char)
+    string(APPEND base64Content "${char}")
+
+    # if there's no second byte, pad with =
+    if (NOT padSize EQUAL 4)
+        string(SUBSTRING "${lut}" ${third} 1 char)
+        string(APPEND base64Content "${char}")
+    else()
+        string(APPEND base64Content "=")
+    endif()
+
+    # if there's no third byte, pad with =
+    if (padSize EQUAL 0)
+        string(SUBSTRING "${lut}" ${fourth} 1 char)
+        string(APPEND base64Content "${char}")
+    else()
+        string(APPEND base64Content "=")
+    endif()
+endwhile()
+
+file(WRITE "${OUTPUT_FILE}" "${base64Content}")
\ No newline at end of file

From e99b61d362d6a9802c81a4427f7d10d6ef56f091 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Wed, 5 May 2021 20:28:46 +0200
Subject: [PATCH 0723/2859] Simplify the code

---
 apps/openmw/mwworld/store.cpp | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index 94795b8417..fb66b0a1d7 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -8,28 +8,11 @@
 #include <components/loadinglistener/loadinglistener.hpp>
 #include <components/misc/rng.hpp>
 
+#include <iterator>
 #include <stdexcept>
 
 namespace
 {
-    template<typename T>
-    class GetRecords
-    {
-        const std::string mFind;
-        std::vector<const T*> *mRecords;
-
-    public:
-        GetRecords(const std::string &str, std::vector<const T*> *records)
-          : mFind(Misc::StringUtils::lowerCase(str)), mRecords(records)
-        { }
-
-        void operator()(const T *item)
-        {
-            if(Misc::StringUtils::ciCompareLen(mFind, item->mId, mFind.size()) == 0)
-                mRecords->push_back(item);
-        }
-    };
-
     struct Compare
     {
         bool operator()(const ESM::Land *x, const ESM::Land *y) {
@@ -169,7 +152,11 @@ namespace MWWorld
     const T *Store<T>::searchRandom(const std::string &id) const
     {
         std::vector<const T*> results;
-        std::for_each(mShared.begin(), mShared.end(), GetRecords<T>(id, &results));
+        std::copy_if(mShared.begin(), mShared.end(), std::back_inserter(results),
+                [&id](const T* item)
+                {
+                    return Misc::StringUtils::ciCompareLen(id, item->mId, id.size()) == 0;
+                });
         if(!results.empty())
             return results[Misc::Rng::rollDice(results.size())];
         return nullptr;

From a88513486844fddf14f116e0c95668de2e39f9b3 Mon Sep 17 00:00:00 2001
From: CedricMocquillon <cedric.mocquillon@sage.com>
Date: Thu, 6 May 2021 13:28:06 +0200
Subject: [PATCH 0724/2859] Do not search if it is not used

---
 components/resource/scenemanager.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 64128ae302..8ca6c8214b 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -539,7 +539,6 @@ namespace Resource
                     if (mVFS->exists(normalized))
                     {
                         Log(Debug::Error) << "Failed to load '" << name << "': " << e.what() << ", using marker_error." << sMeshTypes[i] << " instead";
-                        Files::IStreamPtr file = mVFS->get(normalized);
                         loaded = load(normalized, mVFS, mImageManager, mNifFileManager);
                         break;
                     }

From e97e4d07ddd91bedf7ad10eea3dfd5eccc46ba38 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Thu, 6 May 2021 22:41:20 +0200
Subject: [PATCH 0725/2859] Teensy optimisation for esmtool

- Use an unordered_set instead of a list to
  keep track of skipped records.
- Reduce the number of conditions when parsing 4-letters
  records by using a switch-case instead of cascading conditions.
- Add a const
---
 apps/esmtool/esmtool.cpp     |  9 +++++----
 apps/esmtool/record.cpp      |  2 +-
 components/esm/esmcommon.hpp | 17 ++++++++---------
 components/esm/esmreader.cpp |  2 +-
 components/esm/esmreader.hpp |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp
index 579f5f67d5..60483f9813 100644
--- a/apps/esmtool/esmtool.cpp
+++ b/apps/esmtool/esmtool.cpp
@@ -2,6 +2,7 @@
 #include <vector>
 #include <deque>
 #include <list>
+#include <unordered_set>
 #include <map>
 #include <set>
 #include <fstream>
@@ -322,7 +323,7 @@ int load(Arguments& info)
     std::string filename = info.filename;
     std::cout << "Loading file: " << filename << std::endl;
 
-    std::list<uint32_t> skipped;
+    std::unordered_set<uint32_t> skipped;
 
     try {
 
@@ -364,17 +365,17 @@ int load(Arguments& info)
         // 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 == 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();
diff --git a/apps/esmtool/record.cpp b/apps/esmtool/record.cpp
index 3679184a6f..55170e232e 100644
--- a/apps/esmtool/record.cpp
+++ b/apps/esmtool/record.cpp
@@ -172,7 +172,7 @@ 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 = nullptr;
 
diff --git a/components/esm/esmcommon.hpp b/components/esm/esmcommon.hpp
index 232a24fcf3..6087de83d9 100644
--- a/components/esm/esmcommon.hpp
+++ b/components/esm/esmcommon.hpp
@@ -110,15 +110,14 @@ struct FIXED_STRING<4> : public FIXED_STRING_BASE<FIXED_STRING, 4>
     void assign(const std::string& value)
     {
         intval = 0;
-        size_t length = value.size();
-        if (length == 0) return;
-        data[0] = value[0];
-        if (length == 1) return;
-        data[1] = value[1];
-        if (length == 2) return;
-        data[2] = value[2];
-        if (length == 3) return;
-        data[3] = value[3];
+        switch(value.size()) {
+            case 4: data[3] = value[3];
+            case 3: data[2] = value[2];
+            case 2: data[1] = value[1];
+            case 1: data[0] = value[0];
+            default: break;
+        }
+
     }
 
     char const* ro_data() const { return data; }
diff --git a/components/esm/esmreader.cpp b/components/esm/esmreader.cpp
index 4e7dce876b..0ee47cab6f 100644
--- a/components/esm/esmreader.cpp
+++ b/components/esm/esmreader.cpp
@@ -373,7 +373,7 @@ void ESMReader::setEncoder(ToUTF8::Utf8Encoder* encoder)
     mEncoder = encoder;
 }
 
-size_t ESMReader::getFileOffset()
+size_t ESMReader::getFileOffset() const
 {
     return mEsm->tellg();
 }
diff --git a/components/esm/esmreader.hpp b/components/esm/esmreader.hpp
index 761756e8fb..721c91802e 100644
--- a/components/esm/esmreader.hpp
+++ b/components/esm/esmreader.hpp
@@ -73,7 +73,7 @@ public:
   void openRaw(const std::string &filename);
 
   /// Get the current position in the file. Make sure that the file has been opened!
-  size_t getFileOffset();
+  size_t getFileOffset() const;
 
   // This is a quick hack for multiple esm/esp files. Each plugin introduces its own
   //  terrain palette, but ESMReader does not pass a reference to the correct plugin

From a0582caa262b36b058ee8c4d2aadf92ffc1a3c9f Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Fri, 7 May 2021 10:41:14 +0400
Subject: [PATCH 0726/2859] Fix uninitialized variable

---
 apps/openmw/mwphysics/physicssystem.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index c52ecc68f8..f910a7fd96 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -937,7 +937,7 @@ namespace MWPhysics
     ActorFrameData::ActorFrameData(const std::shared_ptr<Actor>& actor, const MWWorld::Ptr standingOn,
             bool waterCollision, osg::Vec3f movement, float slowFall, float waterlevel)
         : mActor(actor), mActorRaw(actor.get()), mStandingOn(standingOn),
-        mDidJump(false), mNeedLand(false), mWaterCollision(waterCollision),
+        mDidJump(false), mNeedLand(false), mWaterCollision(waterCollision), mSkipCollisionDetection(actor->skipCollisions()),
         mWaterlevel(waterlevel), mSlowFall(slowFall), mOldHeight(0), mFallHeight(0), mMovement(movement), mPosition(), mRefpos()
     {
         const MWBase::World *world = MWBase::Environment::get().getWorld();
@@ -954,7 +954,6 @@ namespace MWPhysics
     void ActorFrameData::updatePosition(btCollisionWorld* world)
     {
         mActorRaw->updateWorldPosition();
-        mSkipCollisionDetection = mActorRaw->skipCollisions();
         mActorRaw->applyOffsetChange();
         mPosition = mActorRaw->getPosition();
         if (mWaterCollision && mPosition.z() < mWaterlevel && canMoveToWaterSurface(mActorRaw, mWaterlevel, world))

From e8ed66767b2935068d11652a56f02f3336a9edb1 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Fri, 7 May 2021 11:04:49 +0400
Subject: [PATCH 0727/2859] Fix AppVeyor CI

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index ed6f727be5..e2c13ed948 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -50,7 +50,7 @@ install:
 
 before_build:
     - cmd: git submodule update --init --recursive
-    - cmd: sh %APPVEYOR_BUILD_FOLDER%\CI\before_script.msvc.sh -c %configuration% -p %PLATFORM% -v %msvc% -V -i %APPVEYOR_BUILD_FOLDER%\install -D
+    - cmd: sh %APPVEYOR_BUILD_FOLDER%\CI\before_script.msvc.sh -c %configuration% -p %PLATFORM% -v %msvc% -V -i %APPVEYOR_BUILD_FOLDER%\install
 
 build_script:
     - cmd: if %PLATFORM%==Win32 set build=MSVC%msvc%_32

From 8d4a374516f6cfa0ad8350474c45a6749e6b4485 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Fri, 7 May 2021 11:30:10 +0400
Subject: [PATCH 0728/2859] Add missing include for std::inserter

---
 components/detournavigator/navmeshmanager.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/detournavigator/navmeshmanager.cpp b/components/detournavigator/navmeshmanager.cpp
index 43d3306481..2692f016ee 100644
--- a/components/detournavigator/navmeshmanager.cpp
+++ b/components/detournavigator/navmeshmanager.cpp
@@ -10,6 +10,8 @@
 
 #include <DetourNavMesh.h>
 
+#include <iterator>
+
 namespace
 {
     using DetourNavigator::ChangeType;

From fbeccc2908d82fb646fb0beb8ed31b5a4396b9aa Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 7 May 2021 09:28:47 +0000
Subject: [PATCH 0729/2859] Apply 1 suggestion(s) to 1 file(s)

---
 components/esm/esmcommon.hpp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/components/esm/esmcommon.hpp b/components/esm/esmcommon.hpp
index 6087de83d9..e4f3b636d1 100644
--- a/components/esm/esmcommon.hpp
+++ b/components/esm/esmcommon.hpp
@@ -110,13 +110,7 @@ struct FIXED_STRING<4> : public FIXED_STRING_BASE<FIXED_STRING, 4>
     void assign(const std::string& value)
     {
         intval = 0;
-        switch(value.size()) {
-            case 4: data[3] = value[3];
-            case 3: data[2] = value[2];
-            case 2: data[1] = value[1];
-            case 1: data[0] = value[0];
-            default: break;
-        }
+        std::memcpy(data, value.data(), std::min(value.size(), 4));
 
     }
 

From 8a56ba6aaaabfe6a553b37c1e6d518187c2e0ffb Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Fri, 7 May 2021 13:58:30 +0200
Subject: [PATCH 0730/2859] Fix compilation

---
 components/esm/esmcommon.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/esm/esmcommon.hpp b/components/esm/esmcommon.hpp
index e4f3b636d1..bb4069d262 100644
--- a/components/esm/esmcommon.hpp
+++ b/components/esm/esmcommon.hpp
@@ -110,7 +110,7 @@ struct FIXED_STRING<4> : public FIXED_STRING_BASE<FIXED_STRING, 4>
     void assign(const std::string& value)
     {
         intval = 0;
-        std::memcpy(data, value.data(), std::min(value.size(), 4));
+        std::memcpy(data, value.data(), (value.size() < 4)? value.size(): 4);
 
     }
 

From 60649792baa4c989267b157c0538a279028f6813 Mon Sep 17 00:00:00 2001
From: Joakim Berg <zapp90@gmail.com>
Date: Fri, 7 May 2021 12:29:06 +0000
Subject: [PATCH 0731/2859] Add information about DX format being used in
 normal maps

---
 .../reference/modding/texture-modding/texture-basics.rst    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/source/reference/modding/texture-modding/texture-basics.rst b/docs/source/reference/modding/texture-modding/texture-basics.rst
index 65e71834c9..78ae007704 100644
--- a/docs/source/reference/modding/texture-modding/texture-basics.rst
+++ b/docs/source/reference/modding/texture-modding/texture-basics.rst
@@ -19,8 +19,10 @@ OpenMW automatically uses shaders for objects with these mapping techniques.
 Normal Mapping
 ##############
 
-To plug in a normal map, you name the normal map as the diffuse texture but with a specified suffix after. 
-OpenMW will then recognise the file and load it as a normal map, provided you have set up your settings file correctly. 
+To plug in a normal map, you name the normal map as the diffuse texture but with a specified suffix after. OpenMW will then recognise the file and load it as a normal map, provided you have set up your settings file correctly. 
+
+Content creators need to know that OpenMW uses the DX format for normal maps, and not the OpenGL format as one otherwise might expect. See an example of the difference between the two formats `here <https://i.stack.imgur.com/kf9jo.png>`_. Make sure your normal maps are created according to the DX style.
+
 See the section `Automatic use`_ further down below for detailed information.
 
 Specular Mapping

From 2e8873af514fb93630e83626f8f733ad6ebd1108 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Fri, 7 May 2021 19:20:14 +0400
Subject: [PATCH 0732/2859] Add new scene nodes to scene graph serializer
 blacklist

---
 components/sceneutil/serialize.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/components/sceneutil/serialize.cpp b/components/sceneutil/serialize.cpp
index 7e176be3dd..1b5c1feed8 100644
--- a/components/sceneutil/serialize.cpp
+++ b/components/sceneutil/serialize.cpp
@@ -131,9 +131,11 @@ void registerSerializers()
             "SceneUtil::StateSetUpdater",
             "SceneUtil::DisableLight",
             "SceneUtil::MWShadowTechnique",
+            "SceneUtil::TextKeyMapHolder",
+            "Shader::RemovedAlphaFunc",
+            "NifOsg::LightManagerStateAttribute",
             "NifOsg::FlipController",
             "NifOsg::KeyframeController",
-            "NifOsg::TextKeyMapHolder",
             "NifOsg::Emitter",
             "NifOsg::ParticleColorAffector",
             "NifOsg::ParticleSystem",
@@ -147,6 +149,7 @@ void registerSerializers()
             "NifOsg::VisController",
             "osgMyGUI::Drawable",
             "osg::DrawCallback",
+            "osg::UniformBufferObject",
             "osgOQ::ClearQueriesCallback",
             "osgOQ::RetrieveQueriesCallback",
             "osg::DummyObject"

From b86356fe1386cf664bf771fd2d2192cf8468040e Mon Sep 17 00:00:00 2001
From: Thunderforge <wjherrmann@gmail.com>
Date: Sat, 8 May 2021 19:57:11 -0500
Subject: [PATCH 0733/2859] [Launcher] Removing extra box surrounding all main
 content

Previously, all main content was in a single box, separated from the bottom containing the version and Help/Close/Play buttons. For pages that already had boxes, that meant there were were boxes within boxes and this looked visually cluttered.

I've removed the box to reduce the amount of visual clutter and added a horizontal line so that the content is still separated from the bottom content.
---
 files/ui/mainwindow.ui | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/files/ui/mainwindow.ui b/files/ui/mainwindow.ui
index 13e8593e07..54a2d16a1f 100644
--- a/files/ui/mainwindow.ui
+++ b/files/ui/mainwindow.ui
@@ -52,27 +52,13 @@
      </widget>
     </item>
     <item>
-     <widget class="QGroupBox" name="groupBox">
-      <property name="title">
-       <string/>
+     <widget class="QStackedWidget" name="pagesWidget"/>
+    </item>
+    <item>
+     <widget class="Line" name="line">
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
       </property>
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <property name="leftMargin">
-        <number>0</number>
-       </property>
-       <property name="topMargin">
-        <number>0</number>
-       </property>
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <property name="bottomMargin">
-        <number>0</number>
-       </property>
-       <item>
-        <widget class="QStackedWidget" name="pagesWidget"/>
-       </item>
-      </layout>
      </widget>
     </item>
     <item>

From ead51784dc2cc19f6644166eb356c4c7ea199461 Mon Sep 17 00:00:00 2001
From: Thunderforge <wjherrmann@gmail.com>
Date: Sat, 8 May 2021 23:28:29 -0500
Subject: [PATCH 0734/2859] [Launcher] Replacing static method access through
 instances

This addresses the Clang Tidy check [readability-static-accessed-through-instance](https://clang.llvm.org/extra/clang-tidy/checks/readability-static-accessed-through-instance.html). It also simplifies the code by reducing the number of parameters we're passing around.
---
 apps/launcher/advancedpage.cpp |  94 ++++++++++++-----------
 apps/launcher/advancedpage.hpp |   4 +-
 apps/launcher/graphicspage.cpp | 133 ++++++++++++++++-----------------
 apps/launcher/graphicspage.hpp |   4 +-
 apps/launcher/maindialog.cpp   |   4 +-
 5 files changed, 116 insertions(+), 123 deletions(-)

diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index 4ba7322345..5199be07e6 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -13,11 +13,9 @@
 
 #include "utils/openalutil.hpp"
 
-Launcher::AdvancedPage::AdvancedPage(Config::GameSettings &gameSettings,
-                                     Settings::Manager &engineSettings, QWidget *parent)
+Launcher::AdvancedPage::AdvancedPage(Config::GameSettings &gameSettings, QWidget *parent)
         : QWidget(parent)
         , mGameSettings(gameSettings)
-        , mEngineSettings(engineSettings)
 {
     setObjectName ("AdvancedPage");
     setupUi(this);
@@ -100,12 +98,12 @@ bool Launcher::AdvancedPage::loadSettings()
         loadSettingBool(normaliseRaceSpeedCheckBox, "normalise race speed", "Game");
         loadSettingBool(swimUpwardCorrectionCheckBox, "swim upward correction", "Game");
         loadSettingBool(avoidCollisionsCheckBox, "NPCs avoid collisions", "Game");
-        int unarmedFactorsStrengthIndex = mEngineSettings.getInt("strength influences hand to hand", "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 = mEngineSettings.getInt("async num threads", "Physics");
+        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");
@@ -130,26 +128,26 @@ bool Launcher::AdvancedPage::loadSettings()
         loadSettingBool(turnToMovementDirectionCheckBox, "turn to movement direction", "Game");
         loadSettingBool(smoothMovementCheckBox, "smooth movement", "Game");
 
-        const bool distantTerrain = mEngineSettings.getBool("distant terrain", "Terrain");
-        const bool objectPaging = mEngineSettings.getBool("object paging", "Terrain");
+        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(mEngineSettings.getInt("viewing distance", "Camera")));
+        viewingDistanceComboBox->setValue(convertToCells(Settings::Manager::getInt("viewing distance", "Camera")));
 
         int lightingMethod = 1;
-        if (mEngineSettings.getString("lighting method", "Shaders") == "legacy")
+        if (Settings::Manager::getString("lighting method", "Shaders") == "legacy")
             lightingMethod = 0;
-        else if (mEngineSettings.getString("lighting method", "Shaders") == "shaders")
+        else if (Settings::Manager::getString("lighting method", "Shaders") == "shaders")
             lightingMethod = 2;
         lightingMethodComboBox->setCurrentIndex(lightingMethod);
     }
 
     // Audio
     {
-        std::string selectedAudioDevice = mEngineSettings.getString("device", "Sound");
+        std::string selectedAudioDevice = Settings::Manager::getString("device", "Sound");
         if (selectedAudioDevice.empty() == false)
         {
             int audioDeviceIndex = audioDeviceSelectorComboBox->findData(QString::fromStdString(selectedAudioDevice));
@@ -158,12 +156,12 @@ bool Launcher::AdvancedPage::loadSettings()
                 audioDeviceSelectorComboBox->setCurrentIndex(audioDeviceIndex);
             }
         }
-        int hrtfEnabledIndex = mEngineSettings.getInt("hrtf enable", "Sound");
+        int hrtfEnabledIndex = Settings::Manager::getInt("hrtf enable", "Sound");
         if (hrtfEnabledIndex >= -1 && hrtfEnabledIndex <= 1)
         {
             enableHRTFComboBox->setCurrentIndex(hrtfEnabledIndex + 1);
         }
-        std::string selectedHRTFProfile = mEngineSettings.getString("hrtf", "Sound");
+        std::string selectedHRTFProfile = Settings::Manager::getString("hrtf", "Sound");
         if (selectedHRTFProfile.empty() == false)
         {
             int hrtfProfileIndex = hrtfProfileSelectorComboBox->findData(QString::fromStdString(selectedHRTFProfile));
@@ -185,7 +183,7 @@ bool Launcher::AdvancedPage::loadSettings()
         loadSettingBool(deferredPreviewRotationCheckBox, "deferred preview rotation", "Camera");
         loadSettingBool(headBobbingCheckBox, "head bobbing", "Camera");
         defaultShoulderComboBox->setCurrentIndex(
-            mEngineSettings.getVector2("view over shoulder offset", "Camera").x() >= 0 ? 0 : 1);
+            Settings::Manager::getVector2("view over shoulder offset", "Camera").x() >= 0 ? 0 : 1);
     }
 
     // Interface Changes
@@ -195,13 +193,13 @@ bool Launcher::AdvancedPage::loadSettings()
         loadSettingBool(showMeleeInfoCheckBox, "show melee info", "Game");
         loadSettingBool(showProjectileDamageCheckBox, "show projectile damage", "Game");
         loadSettingBool(changeDialogTopicsCheckBox, "color topic enable", "GUI");
-        int showOwnedIndex = mEngineSettings.getInt("show owned", "Game");
+        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(mEngineSettings.getFloat("scaling factor", "GUI"));
+        scalingSpinBox->setValue(Settings::Manager::getFloat("scaling factor", "GUI"));
     }
 
     // Bug fixes
@@ -214,10 +212,10 @@ bool Launcher::AdvancedPage::loadSettings()
     {
         // Saves
         loadSettingBool(timePlayedCheckbox, "timeplayed", "Saves");
-        maximumQuicksavesComboBox->setValue(mEngineSettings.getInt("max quicksaves", "Saves"));
+        maximumQuicksavesComboBox->setValue(Settings::Manager::getInt("max quicksaves", "Saves"));
 
         // Other Settings
-        QString screenshotFormatString = QString::fromStdString(mEngineSettings.getString("screenshot format", "General")).toUpper();
+        QString screenshotFormatString = QString::fromStdString(Settings::Manager::getString("screenshot format", "General")).toUpper();
         if (screenshotFormatComboBox->findText(screenshotFormatString) == -1)
             screenshotFormatComboBox->addItem(screenshotFormatString);
         screenshotFormatComboBox->setCurrentIndex(screenshotFormatComboBox->findText(screenshotFormatString));
@@ -258,13 +256,13 @@ void Launcher::AdvancedPage::saveSettings()
         saveSettingBool(swimUpwardCorrectionCheckBox, "swim upward correction", "Game");
         saveSettingBool(avoidCollisionsCheckBox, "NPCs avoid collisions", "Game");
         int unarmedFactorsStrengthIndex = unarmedFactorsStrengthComboBox->currentIndex();
-        if (unarmedFactorsStrengthIndex != mEngineSettings.getInt("strength influences hand to hand", "Game"))
-            mEngineSettings.setInt("strength influences hand to hand", "Game", unarmedFactorsStrengthIndex);
+        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 != mEngineSettings.getInt("async num threads", "Physics"))
-            mEngineSettings.setInt("async num threads", "Physics", numPhysicsThreads);
+        if (numPhysicsThreads != Settings::Manager::getInt("async num threads", "Physics"))
+            Settings::Manager::setInt("async num threads", "Physics", numPhysicsThreads);
     }
 
     // Visuals
@@ -282,23 +280,23 @@ void Launcher::AdvancedPage::saveSettings()
         saveSettingBool(turnToMovementDirectionCheckBox, "turn to movement direction", "Game");
         saveSettingBool(smoothMovementCheckBox, "smooth movement", "Game");
 
-        const bool distantTerrain = mEngineSettings.getBool("distant terrain", "Terrain");
-        const bool objectPaging = mEngineSettings.getBool("object paging", "Terrain");
+        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)) {
-            mEngineSettings.setBool("distant terrain", "Terrain", wantDistantLand);
-            mEngineSettings.setBool("object paging", "Terrain", wantDistantLand);
+            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(mEngineSettings.getInt("viewing distance", "Camera")))
+        if (viewingDistance != convertToCells(Settings::Manager::getInt("viewing distance", "Camera")))
         {
-            mEngineSettings.setInt("viewing distance", "Camera", convertToUnits(viewingDistance));
+            Settings::Manager::setInt("viewing distance", "Camera", convertToUnits(viewingDistance));
         }
 
         static std::array<std::string, 3> lightingMethodMap = {"legacy", "shaders compatibility", "shaders"};
-        mEngineSettings.setString("lighting method", "Shaders", lightingMethodMap[lightingMethodComboBox->currentIndex()]);
+        Settings::Manager::setString("lighting method", "Shaders", lightingMethodMap[lightingMethodComboBox->currentIndex()]);
     }
     
     // Audio
@@ -306,25 +304,25 @@ void Launcher::AdvancedPage::saveSettings()
         int audioDeviceIndex = audioDeviceSelectorComboBox->currentIndex();
         if (audioDeviceIndex != 0)
         {
-            mEngineSettings.setString("device", "Sound", audioDeviceSelectorComboBox->currentText().toUtf8().constData());
+            Settings::Manager::setString("device", "Sound", audioDeviceSelectorComboBox->currentText().toUtf8().constData());
         } 
         else 
         {
-            mEngineSettings.setString("device", "Sound", "");
+            Settings::Manager::setString("device", "Sound", "");
         }
         int hrtfEnabledIndex = enableHRTFComboBox->currentIndex() - 1;
-        if (hrtfEnabledIndex != mEngineSettings.getInt("hrtf enable", "Sound"))
+        if (hrtfEnabledIndex != Settings::Manager::getInt("hrtf enable", "Sound"))
         {
-            mEngineSettings.setInt("hrtf enable", "Sound", hrtfEnabledIndex);
+            Settings::Manager::setInt("hrtf enable", "Sound", hrtfEnabledIndex);
         }
         int selectedHRTFProfileIndex = hrtfProfileSelectorComboBox->currentIndex();
         if (selectedHRTFProfileIndex != 0)
         {
-            mEngineSettings.setString("hrtf", "Sound", hrtfProfileSelectorComboBox->currentText().toUtf8().constData());
+            Settings::Manager::setString("hrtf", "Sound", hrtfProfileSelectorComboBox->currentText().toUtf8().constData());
         }
         else 
         {
-            mEngineSettings.setString("hrtf", "Sound", "");
+            Settings::Manager::setString("hrtf", "Sound", "");
         }
     }
 
@@ -336,14 +334,14 @@ void Launcher::AdvancedPage::saveSettings()
         saveSettingBool(deferredPreviewRotationCheckBox, "deferred preview rotation", "Camera");
         saveSettingBool(headBobbingCheckBox, "head bobbing", "Camera");
 
-        osg::Vec2f shoulderOffset = mEngineSettings.getVector2("view over shoulder offset", "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());
-            mEngineSettings.setVector2("view over shoulder offset", "Camera", shoulderOffset);
+            Settings::Manager::setVector2("view over shoulder offset", "Camera", shoulderOffset);
         }
     }
 
@@ -355,13 +353,13 @@ void Launcher::AdvancedPage::saveSettings()
         saveSettingBool(showProjectileDamageCheckBox, "show projectile damage", "Game");
         saveSettingBool(changeDialogTopicsCheckBox, "color topic enable", "GUI");
         int showOwnedCurrentIndex = showOwnedComboBox->currentIndex();
-        if (showOwnedCurrentIndex != mEngineSettings.getInt("show owned", "Game"))
-            mEngineSettings.setInt("show owned", "Game", showOwnedCurrentIndex);
+        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 != mEngineSettings.getFloat("scaling factor", "GUI"))
-            mEngineSettings.setFloat("scaling factor", "GUI", uiScalingFactor);
+        if (uiScalingFactor != Settings::Manager::getFloat("scaling factor", "GUI"))
+            Settings::Manager::setFloat("scaling factor", "GUI", uiScalingFactor);
     }
 
     // Bug fixes
@@ -375,15 +373,15 @@ void Launcher::AdvancedPage::saveSettings()
         // Saves Settings
         saveSettingBool(timePlayedCheckbox, "timeplayed", "Saves");
         int maximumQuicksaves = maximumQuicksavesComboBox->value();
-        if (maximumQuicksaves != mEngineSettings.getInt("max quicksaves", "Saves"))
+        if (maximumQuicksaves != Settings::Manager::getInt("max quicksaves", "Saves"))
         {
-            mEngineSettings.setInt("max quicksaves", "Saves", maximumQuicksaves);
+            Settings::Manager::setInt("max quicksaves", "Saves", maximumQuicksaves);
         }
 
         // Other Settings
         std::string screenshotFormatString = screenshotFormatComboBox->currentText().toLower().toStdString();
-        if (screenshotFormatString != mEngineSettings.getString("screenshot format", "General"))
-            mEngineSettings.setString("screenshot format", "General", screenshotFormatString);
+        if (screenshotFormatString != Settings::Manager::getString("screenshot format", "General"))
+            Settings::Manager::setString("screenshot format", "General", screenshotFormatString);
     }
 
     // Testing
@@ -407,15 +405,15 @@ void Launcher::AdvancedPage::saveSettings()
 
 void Launcher::AdvancedPage::loadSettingBool(QCheckBox *checkbox, const std::string &setting, const std::string &group)
 {
-    if (mEngineSettings.getBool(setting, 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)
 {
     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)
diff --git a/apps/launcher/advancedpage.hpp b/apps/launcher/advancedpage.hpp
index 93b818dbb6..9685dcefeb 100644
--- a/apps/launcher/advancedpage.hpp
+++ b/apps/launcher/advancedpage.hpp
@@ -17,8 +17,7 @@ namespace Launcher
         Q_OBJECT
 
     public:
-        AdvancedPage(Config::GameSettings &gameSettings,
-                     Settings::Manager &engineSettings, QWidget *parent = nullptr);
+        explicit AdvancedPage(Config::GameSettings &gameSettings, QWidget *parent = nullptr);
 
         bool loadSettings();
         void saveSettings();
@@ -34,7 +33,6 @@ namespace Launcher
 
     private:
         Config::GameSettings &mGameSettings;
-        Settings::Manager &mEngineSettings;
         QCompleter mCellNameCompleter;
         QStringListModel mCellNameCompleterModel;
 
diff --git a/apps/launcher/graphicspage.cpp b/apps/launcher/graphicspage.cpp
index c6e74573c4..3bfd90fdeb 100644
--- a/apps/launcher/graphicspage.cpp
+++ b/apps/launcher/graphicspage.cpp
@@ -32,9 +32,8 @@ QString getAspect(int x, int y)
     return QString(QString::number(xaspect) + ":" + QString::number(yaspect));
 }
 
-Launcher::GraphicsPage::GraphicsPage(Settings::Manager &engineSettings, QWidget *parent)
+Launcher::GraphicsPage::GraphicsPage(QWidget *parent)
     : QWidget(parent)
-    , mEngineSettings(engineSettings)
 {
     setObjectName ("GraphicsPage");
     setupUi(this);
@@ -93,26 +92,26 @@ bool Launcher::GraphicsPage::loadSettings()
     if (!setupSDL())
         return false;
 
-    if (mEngineSettings.getBool("vsync", "Video"))
+    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);
 
@@ -125,40 +124,40 @@ bool Launcher::GraphicsPage::loadSettings()
         customHeightSpinBox->setValue(height);
     }
 
-    float fpsLimit = mEngineSettings.getFloat("framerate limit", "Video");
+    float fpsLimit = Settings::Manager::getFloat("framerate limit", "Video");
     if (fpsLimit != 0)
     {
         framerateLimitCheckBox->setCheckState(Qt::Checked);
         framerateLimitSpinBox->setValue(fpsLimit);
     }
 
-    if (mEngineSettings.getBool("actor shadows", "Shadows"))
+    if (Settings::Manager::getBool("actor shadows", "Shadows"))
         actorShadowsCheckBox->setCheckState(Qt::Checked);
-    if (mEngineSettings.getBool("player shadows", "Shadows"))
+    if (Settings::Manager::getBool("player shadows", "Shadows"))
         playerShadowsCheckBox->setCheckState(Qt::Checked);
-    if (mEngineSettings.getBool("terrain shadows", "Shadows"))
+    if (Settings::Manager::getBool("terrain shadows", "Shadows"))
         terrainShadowsCheckBox->setCheckState(Qt::Checked);
-    if (mEngineSettings.getBool("object shadows", "Shadows"))
+    if (Settings::Manager::getBool("object shadows", "Shadows"))
         objectShadowsCheckBox->setCheckState(Qt::Checked);
-    if (mEngineSettings.getBool("enable indoor shadows", "Shadows"))
+    if (Settings::Manager::getBool("enable indoor shadows", "Shadows"))
         indoorShadowsCheckBox->setCheckState(Qt::Checked);
 
     shadowComputeSceneBoundsComboBox->setCurrentIndex(
         shadowComputeSceneBoundsComboBox->findText(
-            QString(tr(mEngineSettings.getString("compute scene bounds", "Shadows").c_str()))));
+            QString(tr(Settings::Manager::getString("compute scene bounds", "Shadows").c_str()))));
 
-    int shadowDistLimit = mEngineSettings.getInt("maximum shadow map distance", "Shadows");
+    int shadowDistLimit = Settings::Manager::getInt("maximum shadow map distance", "Shadows");
     if (shadowDistLimit > 0)
     {
         shadowDistanceCheckBox->setCheckState(Qt::Checked);
         shadowDistanceSpinBox->setValue(shadowDistLimit);
     }
 
-    float shadowFadeStart = mEngineSettings.getFloat("shadow fade start", "Shadows");
+    float shadowFadeStart = Settings::Manager::getFloat("shadow fade start", "Shadows");
     if (shadowFadeStart != 0)
         fadeStartSpinBox->setValue(shadowFadeStart);
 
-    int shadowRes = mEngineSettings.getInt("shadow map resolution", "Shadows");
+    int shadowRes = Settings::Manager::getInt("shadow map resolution", "Shadows");
     int shadowResIndex = shadowResolutionComboBox->findText(QString::number(shadowRes));
     if (shadowResIndex != -1)
         shadowResolutionComboBox->setCurrentIndex(shadowResIndex);
@@ -171,20 +170,20 @@ void Launcher::GraphicsPage::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)
     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;
@@ -199,33 +198,33 @@ 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 != mEngineSettings.getFloat("framerate limit", "Video"))
-            mEngineSettings.setFloat("framerate limit", "Video", cFpsLimit);
+        if (cFpsLimit != Settings::Manager::getFloat("framerate limit", "Video"))
+            Settings::Manager::setFloat("framerate limit", "Video", cFpsLimit);
     }
-    else if (mEngineSettings.getFloat("framerate limit", "Video") != 0)
+    else if (Settings::Manager::getFloat("framerate limit", "Video") != 0)
     {
-        mEngineSettings.setFloat("framerate limit", "Video", 0);
+        Settings::Manager::setFloat("framerate limit", "Video", 0);
     }
 
     int cShadowDist = shadowDistanceCheckBox->checkState() != Qt::Unchecked ? shadowDistanceSpinBox->value() : 0;
-    if (mEngineSettings.getInt("maximum shadow map distance", "Shadows") != cShadowDist)
-        mEngineSettings.setInt("maximum shadow map distance", "Shadows", cShadowDist);
+    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 && mEngineSettings.getFloat("shadow fade start", "Shadows") != cFadeStart)
-        mEngineSettings.setFloat("shadow fade start", "Shadows", cFadeStart);
+    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();
@@ -233,42 +232,42 @@ void Launcher::GraphicsPage::saveSettings()
     bool cPlayerShadows = playerShadowsCheckBox->checkState();
     if (cActorShadows || cObjectShadows || cTerrainShadows || cPlayerShadows)
     {
-        if (!mEngineSettings.getBool("enable shadows", "Shadows"))
-            mEngineSettings.setBool("enable shadows", "Shadows", true);
-        if (mEngineSettings.getBool("actor shadows", "Shadows") != cActorShadows)
-            mEngineSettings.setBool("actor shadows", "Shadows", cActorShadows);
-        if (mEngineSettings.getBool("player shadows", "Shadows") != cPlayerShadows)
-            mEngineSettings.setBool("player shadows", "Shadows", cPlayerShadows);
-        if (mEngineSettings.getBool("object shadows", "Shadows") != cObjectShadows)
-            mEngineSettings.setBool("object shadows", "Shadows", cObjectShadows);
-        if (mEngineSettings.getBool("terrain shadows", "Shadows") != cTerrainShadows)
-            mEngineSettings.setBool("terrain shadows", "Shadows", cTerrainShadows);
+        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 (mEngineSettings.getBool("enable shadows", "Shadows"))
-            mEngineSettings.setBool("enable shadows", "Shadows", false);
-        if (mEngineSettings.getBool("actor shadows", "Shadows"))
-            mEngineSettings.setBool("actor shadows", "Shadows", false);
-        if (mEngineSettings.getBool("player shadows", "Shadows"))
-            mEngineSettings.setBool("player shadows", "Shadows", false);
-        if (mEngineSettings.getBool("object shadows", "Shadows"))
-            mEngineSettings.setBool("object shadows", "Shadows", false);
-        if (mEngineSettings.getBool("terrain shadows", "Shadows"))
-            mEngineSettings.setBool("terrain shadows", "Shadows", false);
+        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 (mEngineSettings.getBool("enable indoor shadows", "Shadows") != cIndoorShadows)
-        mEngineSettings.setBool("enable indoor shadows", "Shadows", cIndoorShadows);
+    if (Settings::Manager::getBool("enable indoor shadows", "Shadows") != cIndoorShadows)
+        Settings::Manager::setBool("enable indoor shadows", "Shadows", cIndoorShadows);
 
     int cShadowRes = shadowResolutionComboBox->currentText().toInt();
-    if (cShadowRes != mEngineSettings.getInt("shadow map resolution", "Shadows"))
-        mEngineSettings.setInt("shadow map resolution", "Shadows", cShadowRes);
+    if (cShadowRes != Settings::Manager::getInt("shadow map resolution", "Shadows"))
+        Settings::Manager::setInt("shadow map resolution", "Shadows", cShadowRes);
 
     auto cComputeSceneBounds = shadowComputeSceneBoundsComboBox->currentText().toStdString();
-    if (cComputeSceneBounds != mEngineSettings.getString("compute scene bounds", "Shadows"))
-        mEngineSettings.setString("compute scene bounds", "Shadows", cComputeSceneBounds);
+    if (cComputeSceneBounds != Settings::Manager::getString("compute scene bounds", "Shadows"))
+        Settings::Manager::setString("compute scene bounds", "Shadows", cComputeSceneBounds);
 }
 
 QStringList Launcher::GraphicsPage::getAvailableResolutions(int screen)
diff --git a/apps/launcher/graphicspage.hpp b/apps/launcher/graphicspage.hpp
index 7801e6475b..a6754ccb04 100644
--- a/apps/launcher/graphicspage.hpp
+++ b/apps/launcher/graphicspage.hpp
@@ -18,7 +18,7 @@ namespace Launcher
         Q_OBJECT
 
     public:
-        GraphicsPage(Settings::Manager &engineSettings, QWidget *parent = nullptr);
+        explicit GraphicsPage(QWidget *parent = nullptr);
 
         void saveSettings();
         bool loadSettings();
@@ -33,8 +33,6 @@ namespace Launcher
         void slotShadowDistLimitToggled(bool checked);
 
     private:
-        Settings::Manager &mEngineSettings;
-
         QVector<QStringList> mResolutionsPerScreen;
 
         static QStringList getAvailableResolutions(int screen);
diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp
index 6924153090..fa61b5fa80 100644
--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@@ -123,9 +123,9 @@ void Launcher::MainDialog::createPages()
 
     mPlayPage = new PlayPage(this);
     mDataFilesPage = new DataFilesPage(mCfgMgr, mGameSettings, mLauncherSettings, this);
-    mGraphicsPage = new GraphicsPage(mEngineSettings, this);
+    mGraphicsPage = new GraphicsPage(this);
     mSettingsPage = new SettingsPage(mCfgMgr, mGameSettings, mLauncherSettings, this);
-    mAdvancedPage = new AdvancedPage(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());

From a939cb669256b49efb3381edfdc9494a283f0b53 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sun, 9 May 2021 14:10:35 +0400
Subject: [PATCH 0735/2859] Skip hidden nodes for ObjectPaging

---
 apps/openmw/mwrender/objectpaging.cpp | 29 ++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index 064d3aa355..c36ceefe2e 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -105,6 +105,7 @@ namespace MWRender
         bool mOptimizeBillboards = true;
         float mSqrDistance = 0.f;
         osg::Vec3f mViewVector;
+        osg::Node::NodeMask mCopyMask = ~0u;
         mutable std::vector<const osg::Node*> mNodePath;
 
         void copy(const osg::Node* toCopy, osg::Group* attachTo)
@@ -121,6 +122,9 @@ namespace MWRender
 
         osg::Node* operator() (const osg::Node* node) const override
         {
+            if (!(node->getNodeMask() & mCopyMask))
+                return nullptr;
+
             if (const osg::Drawable* d = node->asDrawable())
                 return operator()(d);
 
@@ -224,6 +228,9 @@ namespace MWRender
         }
         osg::Drawable* operator() (const osg::Drawable* drawable) const override
         {
+            if (!(drawable->getNodeMask() & mCopyMask))
+                return nullptr;
+
             if (dynamic_cast<const osgParticle::ParticleSystem*>(drawable))
                 return nullptr;
 
@@ -261,9 +268,10 @@ namespace MWRender
     class AnalyzeVisitor : public osg::NodeVisitor
     {
     public:
-        AnalyzeVisitor()
+        AnalyzeVisitor(osg::Node::NodeMask analyzeMask)
          : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
-         , mCurrentStateSet(nullptr) {}
+         , mCurrentStateSet(nullptr)
+         , mAnalyzeMask(analyzeMask) {}
 
         typedef std::unordered_map<osg::StateSet*, unsigned int> StateSetCounter;
         struct Result
@@ -274,12 +282,18 @@ namespace MWRender
 
         void apply(osg::Node& node) override
         {
+            if (!(node.getNodeMask() & mAnalyzeMask))
+                return;
+
             if (node.getStateSet())
                 mCurrentStateSet = node.getStateSet();
             traverse(node);
         }
         void apply(osg::Geometry& geom) override
         {
+            if (!(geom.getNodeMask() & mAnalyzeMask))
+                return;
+
             if (osg::Array* array = geom.getVertexArray())
                 mResult.mNumVerts += array->getNumElements();
 
@@ -313,6 +327,7 @@ namespace MWRender
         Result mResult;
         osg::StateSet* mCurrentStateSet;
         StateSetCounter mGlobalStateSetCounter;
+        osg::Node::NodeMask mAnalyzeMask;
     };
 
     class DebugVisitor : public osg::NodeVisitor
@@ -438,7 +453,14 @@ namespace MWRender
         typedef std::map<osg::ref_ptr<const osg::Node>, InstanceList> NodeMap;
         NodeMap nodes;
         osg::ref_ptr<RefnumSet> refnumSet = activeGrid ? new RefnumSet : nullptr;
-        AnalyzeVisitor analyzeVisitor;
+
+        // Mask_UpdateVisitor is used in such cases in NIF loader:
+        // 1. For collision nodes, which is not supposed to be rendered.
+        // 2. For nodes masked via Flag_Hidden (VisController can change this flag value at runtime).
+        // Since ObjectPaging does not handle VisController, we can just ignore both types of nodes.
+        constexpr auto copyMask = ~Mask_UpdateVisitor;
+
+        AnalyzeVisitor analyzeVisitor(copyMask);
         float minSize = mMinSize;
         if (mMinSizeMergeFactor)
             minSize *= mMinSizeMergeFactor;
@@ -525,6 +547,7 @@ namespace MWRender
         osg::ref_ptr<Resource::TemplateMultiRef> templateRefs = new Resource::TemplateMultiRef;
         osgUtil::StateToCompile stateToCompile(0, nullptr);
         CopyOp copyop;
+        copyop.mCopyMask = copyMask;
         for (const auto& pair : nodes)
         {
             const osg::Node* cnode = pair.first;

From 132fedf2909a209afc04281b1a328d279e1ea58b Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sun, 9 May 2021 15:43:13 +0400
Subject: [PATCH 0736/2859] Analyze only used LOD levels in ObjectPaging

---
 apps/openmw/mwrender/objectpaging.cpp | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index c36ceefe2e..4217c47141 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -271,6 +271,7 @@ namespace MWRender
         AnalyzeVisitor(osg::Node::NodeMask analyzeMask)
          : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
          , mCurrentStateSet(nullptr)
+         , mCurrentDistance(0.f)
          , mAnalyzeMask(analyzeMask) {}
 
         typedef std::unordered_map<osg::StateSet*, unsigned int> StateSetCounter;
@@ -287,6 +288,22 @@ namespace MWRender
 
             if (node.getStateSet())
                 mCurrentStateSet = node.getStateSet();
+
+            if (osg::Switch* sw = node.asSwitch())
+            {
+                for (unsigned int i=0; i<sw->getNumChildren(); ++i)
+                    if (sw->getValue(i))
+                        traverse(*sw->getChild(i));
+                return;
+            }
+            if (osg::LOD* lod = dynamic_cast<osg::LOD*>(&node))
+            {
+                for (unsigned int i=0; i<lod->getNumChildren(); ++i)
+                    if (lod->getMinRange(i) * lod->getMinRange(i) <= mCurrentDistance && mCurrentDistance < lod->getMaxRange(i) * lod->getMaxRange(i))
+                        traverse(*lod->getChild(i));
+                return;
+            }
+
             traverse(node);
         }
         void apply(osg::Geometry& geom) override
@@ -327,6 +344,7 @@ namespace MWRender
         Result mResult;
         osg::StateSet* mCurrentStateSet;
         StateSetCounter mGlobalStateSetCounter;
+        float mCurrentDistance;
         osg::Node::NodeMask mAnalyzeMask;
     };
 
@@ -530,6 +548,7 @@ namespace MWRender
                 continue;
             }
 
+            analyzeVisitor.mCurrentDistance = dSqr;
             auto emplaced = nodes.emplace(cnode, InstanceList());
             if (emplaced.second)
             {

From b806445a361214d604307baab4da2eea89515e3c Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 7 May 2021 18:14:44 +0200
Subject: [PATCH 0737/2859] Use existing min implementation

---
 components/esm/esmcommon.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/esm/esmcommon.hpp b/components/esm/esmcommon.hpp
index bb4069d262..749e9a85d6 100644
--- a/components/esm/esmcommon.hpp
+++ b/components/esm/esmcommon.hpp
@@ -1,6 +1,7 @@
 #ifndef OPENMW_ESM_COMMON_H
 #define OPENMW_ESM_COMMON_H
 
+#include <algorithm>
 #include <string>
 #include <cstring>
 #include <vector>
@@ -110,8 +111,7 @@ struct FIXED_STRING<4> : public FIXED_STRING_BASE<FIXED_STRING, 4>
     void assign(const std::string& value)
     {
         intval = 0;
-        std::memcpy(data, value.data(), (value.size() < 4)? value.size(): 4);
-
+        std::memcpy(data, value.data(), std::min(value.size(), sizeof(data)));
     }
 
     char const* ro_data() const { return data; }

From ffd84502f95fcd578c4415391fef8592ccec898c Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 9 May 2021 19:07:15 +0200
Subject: [PATCH 0738/2859] Remove unimplemented method declaration

---
 apps/openmw/mwmechanics/aiwander.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/aiwander.hpp b/apps/openmw/mwmechanics/aiwander.hpp
index db8701c74a..f8506ff594 100644
--- a/apps/openmw/mwmechanics/aiwander.hpp
+++ b/apps/openmw/mwmechanics/aiwander.hpp
@@ -126,7 +126,6 @@ namespace MWMechanics
             short unsigned getRandomIdle();
             void setPathToAnAllowedNode(const MWWorld::Ptr& actor, AiWanderStorage& storage, const ESM::Position& actorPos);
             void evadeObstacles(const MWWorld::Ptr& actor, AiWanderStorage& storage);
-            void turnActorToFacePlayer(const osg::Vec3f& actorPosition, const osg::Vec3f& playerPosition, AiWanderStorage& storage);
             void doPerFrameActionsForState(const MWWorld::Ptr& actor, float duration, AiWanderStorage& storage);
             void onIdleStatePerFrameActions(const MWWorld::Ptr& actor, float duration, AiWanderStorage& storage);
             void onWalkingStatePerFrameActions(const MWWorld::Ptr& actor, float duration, AiWanderStorage& storage);

From c5aa3d4f77f16c9c1954ecc2a36f32f281745b8c Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 9 May 2021 19:55:27 +0200
Subject: [PATCH 0739/2859] Don't stop and turn to the player while sneaking or
 jumping

---
 CHANGELOG.md                         |  1 +
 apps/openmw/mwmechanics/actors.cpp   |  3 ++-
 apps/openmw/mwmechanics/aitravel.cpp |  5 +++--
 apps/openmw/mwmechanics/aiwander.cpp | 15 +++++++++------
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba8081dae9..856e104389 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -121,6 +121,7 @@
     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 #6016: Greeting interrupts Fargoth's sneak-walk
     Feature #390: 3rd person look "over the shoulder"
     Feature #832: OpenMW-CS: Handle deleted references
     Feature #1536: Show more information about level on menu
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 95633bd00f..4629ad2d3e 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -589,7 +589,8 @@ namespace MWMechanics
         {
             greetingTimer++;
 
-            if (greetingTimer <= GREETING_SHOULD_END || MWBase::Environment::get().getSoundManager()->sayActive(actor))
+            if (!stats.getMovementFlag(CreatureStats::Flag_ForceJump) && !stats.getMovementFlag(CreatureStats::Flag_ForceSneak)
+                && (greetingTimer <= GREETING_SHOULD_END || MWBase::Environment::get().getSoundManager()->sayActive(actor)))
                 turnActorToFacePlayer(actor, actorState, dir);
 
             if (greetingTimer >= GREETING_COOLDOWN)
diff --git a/apps/openmw/mwmechanics/aitravel.cpp b/apps/openmw/mwmechanics/aitravel.cpp
index b2a506ca65..8e5372c46d 100644
--- a/apps/openmw/mwmechanics/aitravel.cpp
+++ b/apps/openmw/mwmechanics/aitravel.cpp
@@ -52,14 +52,15 @@ namespace MWMechanics
     bool AiTravel::execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
     {
         MWBase::MechanicsManager* mechMgr = MWBase::Environment::get().getMechanicsManager();
+        auto& stats = actor.getClass().getCreatureStats(actor);
 
-        if (mechMgr->isTurningToPlayer(actor) || mechMgr->getGreetingState(actor) == Greet_InProgress)
+        if (!stats.getMovementFlag(CreatureStats::Flag_ForceJump) && !stats.getMovementFlag(CreatureStats::Flag_ForceSneak)
+                && (mechMgr->isTurningToPlayer(actor) || mechMgr->getGreetingState(actor) == Greet_InProgress))
             return false;
 
         const osg::Vec3f actorPos(actor.getRefData().getPosition().asVec3());
         const osg::Vec3f targetPos(mX, mY, mZ);
 
-        auto& stats = actor.getClass().getCreatureStats(actor);
         stats.setMovementFlag(CreatureStats::Flag_Run, false);
         stats.setDrawState(DrawState_Nothing);
 
diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 01088d967b..0e424b2f8b 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -209,14 +209,17 @@ namespace MWMechanics
                 storage.setState(AiWanderStorage::Wander_Walking);
         }
 
-        GreetingState greetingState = MWBase::Environment::get().getMechanicsManager()->getGreetingState(actor);
-        if (greetingState == Greet_InProgress)
+        if(!cStats.getMovementFlag(CreatureStats::Flag_ForceJump) && !cStats.getMovementFlag(CreatureStats::Flag_ForceSneak))
         {
-            if (storage.mState == AiWanderStorage::Wander_Walking)
+            GreetingState greetingState = MWBase::Environment::get().getMechanicsManager()->getGreetingState(actor);
+            if (greetingState == Greet_InProgress)
             {
-                stopMovement(actor);
-                mObstacleCheck.clear();
-                storage.setState(AiWanderStorage::Wander_IdleNow);
+                if (storage.mState == AiWanderStorage::Wander_Walking)
+                {
+                    stopMovement(actor);
+                    mObstacleCheck.clear();
+                    storage.setState(AiWanderStorage::Wander_IdleNow);
+                }
             }
         }
 

From 0d737a3501f3f7e97be5ae906235597d69fbc982 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Sun, 9 May 2021 21:00:49 +0100
Subject: [PATCH 0740/2859] Create defaults.bin at configure time

---
 CMakeLists.txt             |  8 ++++----
 apps/openmw/CMakeLists.txt |  2 +-
 cmake/OpenMWMacros.cmake   | 12 ++++++++++++
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1041401074..b97657ffd0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -438,8 +438,8 @@ endif (APPLE)
 
 # Other files
 
-configure_resource_file(${OpenMW_SOURCE_DIR}/files/settings-default.cfg
-    "${OpenMW_BINARY_DIR}" "settings-default.cfg")
+pack_resource_file(${OpenMW_SOURCE_DIR}/files/settings-default.cfg
+    "${OpenMW_BINARY_DIR}" "defaults.bin")
 
 configure_resource_file(${OpenMW_SOURCE_DIR}/files/openmw.appdata.xml
     "${OpenMW_BINARY_DIR}" "openmw.appdata.xml")
@@ -808,7 +808,7 @@ elseif(NOT APPLE)
         INSTALL(FILES "${OpenMW_SOURCE_DIR}/README.md" DESTINATION "." RENAME "README.txt")
         INSTALL(FILES "${OpenMW_SOURCE_DIR}/LICENSE" DESTINATION "." RENAME "LICENSE.txt")
         INSTALL(FILES "${OpenMW_SOURCE_DIR}/files/mygui/DejaVuFontLicense.txt" DESTINATION ".")
-        INSTALL(FILES "${INSTALL_SOURCE}/settings-default.cfg" DESTINATION ".")
+        INSTALL(FILES "${INSTALL_SOURCE}/defaults.bin" DESTINATION ".")
         INSTALL(FILES "${INSTALL_SOURCE}/gamecontrollerdb.txt" DESTINATION ".")
 
         INSTALL(DIRECTORY "${INSTALL_SOURCE}/resources" DESTINATION ".")
@@ -916,7 +916,7 @@ elseif(NOT APPLE)
         ENDIF(BUILD_OPENCS)
 
         # Install global configuration files
-        INSTALL(FILES "${INSTALL_SOURCE}/settings-default.cfg" DESTINATION "${SYSCONFDIR}" COMPONENT "openmw")
+        INSTALL(FILES "${INSTALL_SOURCE}/defaults.bin" DESTINATION "${SYSCONFDIR}" COMPONENT "openmw")
         INSTALL(FILES "${INSTALL_SOURCE}/openmw.cfg.install" DESTINATION "${SYSCONFDIR}" RENAME "openmw.cfg" COMPONENT "openmw")
         INSTALL(FILES "${INSTALL_SOURCE}/resources/version" DESTINATION "${SYSCONFDIR}" COMPONENT "openmw")
         INSTALL(FILES "${INSTALL_SOURCE}/gamecontrollerdb.txt" DESTINATION "${SYSCONFDIR}" COMPONENT "openmw")
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 5e5bb8a9f6..3fb762d305 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -198,7 +198,7 @@ if(APPLE)
 
     add_subdirectory(../../files/ ${CMAKE_CURRENT_BINARY_DIR}/files)
 
-    configure_file("${OpenMW_BINARY_DIR}/settings-default.cfg" ${BUNDLE_RESOURCES_DIR} COPYONLY)
+    configure_file("${OpenMW_BINARY_DIR}/defaults.bin" ${BUNDLE_RESOURCES_DIR} COPYONLY)
     configure_file("${OpenMW_BINARY_DIR}/openmw.cfg" ${BUNDLE_RESOURCES_DIR} COPYONLY)
     configure_file("${OpenMW_BINARY_DIR}/gamecontrollerdb.txt" ${BUNDLE_RESOURCES_DIR} COPYONLY)
 
diff --git a/cmake/OpenMWMacros.cmake b/cmake/OpenMWMacros.cmake
index 2408cae2bd..1621a08cfd 100644
--- a/cmake/OpenMWMacros.cmake
+++ b/cmake/OpenMWMacros.cmake
@@ -199,6 +199,18 @@ macro (configure_resource_file source_path destination_dir_base dest_path_relati
 	endif (multi_config)
 endmacro (configure_resource_file)
 
+macro (pack_resource_file source_path destination_dir_base dest_path_relative)
+    get_generator_is_multi_config(multi_config)
+    if (multi_config)
+        foreach(cfgtype ${CMAKE_CONFIGURATION_TYPES})
+            execute_process(COMMAND ${CMAKE_COMMAND} "-DINPUT_FILE=${source_path}" "-DOUTPUT_FILE=${destination_dir_base}/${cfgtype}/${dest_path_relative}" -P "${CMAKE_SOURCE_DIR}/cmake/base64.cmake")
+        endforeach(cfgtype)
+    else (multi_config)
+        execute_process(COMMAND ${CMAKE_COMMAND} "-DINPUT_FILE=${source_path}" "-DOUTPUT_FILE=${destination_dir_base}/${dest_path_relative}" -P "${CMAKE_SOURCE_DIR}/cmake/base64.cmake")
+    endif (multi_config)
+    set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${source_path}")
+endmacro (pack_resource_file)
+
 macro (copy_all_resource_files source_dir destination_dir_base destination_dir_relative files)
 	foreach (f ${files})
 		get_filename_component(filename ${f} NAME)

From 92325976e94c0440181bbbe1b365404dfa8d1d3b Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Sun, 9 May 2021 21:13:34 +0100
Subject: [PATCH 0741/2859] Update documentation to refer to defaults.bin

---
 apps/launcher/maindialog.cpp                     |  4 ++--
 apps/openmw/engine.cpp                           |  2 +-
 components/settings/parser.cpp                   |  2 +-
 components/settings/settings.cpp                 |  2 +-
 docs/source/reference/modding/settings/index.rst | 14 ++++++++++++--
 files/settings-default.cfg                       |  7 ++++---
 6 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp
index 6924153090..9d497e8796 100644
--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@@ -436,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;
@@ -447,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;
     }
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index d7c315323d..b52bfc7ef9 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -487,7 +487,7 @@ std::string OMW::Engine::loadSettings (Settings::Manager & settings)
     else if (boost::filesystem::exists(globaldefault))
         settings.loadDefault(globaldefault);
     else
-        throw std::runtime_error ("No default settings file found! Make sure the file \"settings-default.cfg\" was properly installed.");
+        throw std::runtime_error ("No default settings file found! Make sure the file \"defaults.bin\" was properly installed.");
 
     // load user settings if they exist
     const std::string settingspath = (mCfgMgr.getUserConfigPath() / "settings.cfg").string();
diff --git a/components/settings/parser.cpp b/components/settings/parser.cpp
index 9693bf5117..72ff3aac47 100644
--- a/components/settings/parser.cpp
+++ b/components/settings/parser.cpp
@@ -255,7 +255,7 @@ void Settings::SettingsFileParser::saveSettingsFile(const std::string& file, con
         ostream << "# This is the OpenMW user 'settings.cfg' file.  This file only contains" << std::endl;
         ostream << "# explicitly changed settings.  If you would like to revert a setting" << std::endl;
         ostream << "# to its default, simply remove it from this file.  For available" << std::endl;
-        ostream << "# settings, see the file 'settings-default.cfg' or the documentation at:" << std::endl;
+        ostream << "# settings, see the file 'files/settings-default.cfg' in our source repo or the documentation at:" << std::endl;
         ostream << "#" << std::endl;
         ostream << "#   https://openmw.readthedocs.io/en/master/reference/modding/settings/index.html" << std::endl;
     }
diff --git a/components/settings/settings.cpp b/components/settings/settings.cpp
index b29dadcdc8..52dbb6e219 100644
--- a/components/settings/settings.cpp
+++ b/components/settings/settings.cpp
@@ -49,7 +49,7 @@ std::string Manager::getString(const std::string &setting, const std::string &ca
         return it->second;
 
     throw std::runtime_error(std::string("Trying to retrieve a non-existing setting: ") + setting
-                             + ".\nMake sure the settings-default.cfg file was properly installed.");
+                             + ".\nMake sure the defaults.bin file was properly installed.");
 }
 
 float Manager::getFloat (const std::string& setting, const std::string& category)
diff --git a/docs/source/reference/modding/settings/index.rst b/docs/source/reference/modding/settings/index.rst
index 220ee88c4b..e9607fd9d1 100644
--- a/docs/source/reference/modding/settings/index.rst
+++ b/docs/source/reference/modding/settings/index.rst
@@ -8,6 +8,14 @@ If you are familiar with ``.ini`` tweaks in Morrowind or the other games, this w
 All settings described in this section are changed in ``settings.cfg``, located in your OpenMW user directory.
 See :doc:`../paths` for this location.
 
+When creating a new game based on the OpenMW engine, it may be desirable to change the default settings - the defaults are chosen for compatibility with Morrowind.
+This can be done by editing ``defaults.bin`` in the OpenMW installation directory without rebuilding OpenMW itself.
+If you're using a custom fork of OpenMW, ``files/settings-default.cfg`` in the source repository should be edited instead.
+To edit ``defaults.bin``, base64 decode it, make any changes, and then base64 encode it again.
+
+If you feel a need to edit the default settings for any other reason than when creating a new OpenMW-based game, you should not.
+We may be able to accommodate your desired workflow some other way if you make a feature request.
+
 Changing Settings
 #################
 
@@ -25,8 +33,10 @@ Changing Settings
 	Then to the line above, type ``[GUI]``, as the tooltip delay setting comes from the "GUI Settings" section.
 
 Although this guide attempts to be comprehensive and up to date,
-you will always be able to find the full list of settings available and their default values in ``settings-default.cfg``
-in your main OpenMW installation directory.
+you will always be able to find the full list of settings available and their default values in ``settings-default.cfg``,
+available in the ``files`` directory of our source repo, or by base64 decoding ``defaults.bin`` in your main OpenMW installation directory.
+This has changed compared to previous versions of OpenMW as more users were confused by the existence of a file they weren't supposed to edit
+than were helped by the existence of a file listing settings they could edit in a different file.
 The ranges included with each setting are the physically possible ranges, not recommendations.
 
 .. warning::
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index ea678c70f6..d94c43b015 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -1,6 +1,7 @@
-# WARNING: If this file is named settings-default.cfg, then editing
-# this file might have no effect, as these settings may be overwritten
-# by your user settings.cfg file (see documentation for its location).
+# WARNING: If this file is named settings-default.cfg or was generated
+# from defaults.bin, then editing this file might have no effect, as
+# these settings may be overwritten by your user settings.cfg file
+# (see documentation for its location).
 #
 # This file provides minimal documentation for each setting, and
 # ranges of recommended values.  For detailed explanations of the

From 09f39b29f0019a90219549dfa2c0af4cc0a66e0f Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Sun, 9 May 2021 21:14:06 +0100
Subject: [PATCH 0742/2859] Load defaults.bin instead of settings-default.cfg.
 Do not decode yet.

---
 apps/launcher/maindialog.cpp     | 6 +++---
 apps/openmw/engine.cpp           | 4 ++--
 components/settings/parser.cpp   | 2 +-
 components/settings/parser.hpp   | 2 +-
 components/settings/settings.cpp | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp
index 9d497e8796..0a7d495aba 100644
--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@@ -424,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))
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index b52bfc7ef9..b227ae04e8 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -478,8 +478,8 @@ void OMW::Engine::setSkipMenu (bool skipMenu, bool newGame)
 std::string OMW::Engine::loadSettings (Settings::Manager & settings)
 {
     // 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();
 
     // prefer local
     if (boost::filesystem::exists(localdefault))
diff --git a/components/settings/parser.cpp b/components/settings/parser.cpp
index 72ff3aac47..ee14eb5de7 100644
--- a/components/settings/parser.cpp
+++ b/components/settings/parser.cpp
@@ -7,7 +7,7 @@
 
 #include <boost/filesystem/fstream.hpp>
 
-void Settings::SettingsFileParser::loadSettingsFile(const std::string& file, CategorySettingValueMap& settings)
+void Settings::SettingsFileParser::loadSettingsFile(const std::string& file, CategorySettingValueMap& settings, bool base64Encoded)
 {
     mFile = file;
     boost::filesystem::ifstream stream;
diff --git a/components/settings/parser.hpp b/components/settings/parser.hpp
index 449e542235..69e9cdaa41 100644
--- a/components/settings/parser.hpp
+++ b/components/settings/parser.hpp
@@ -10,7 +10,7 @@ namespace Settings
     class SettingsFileParser
     {
     public:
-        void loadSettingsFile(const std::string& file, CategorySettingValueMap& settings);
+        void loadSettingsFile(const std::string& file, CategorySettingValueMap& settings, bool base64encoded = false);
 
         void saveSettingsFile(const std::string& file, const CategorySettingValueMap& settings);
 
diff --git a/components/settings/settings.cpp b/components/settings/settings.cpp
index 52dbb6e219..13501ac8c9 100644
--- a/components/settings/settings.cpp
+++ b/components/settings/settings.cpp
@@ -22,7 +22,7 @@ void Manager::clear()
 void Manager::loadDefault(const std::string &file)
 {
     SettingsFileParser parser;
-    parser.loadSettingsFile(file, mDefaultSettings);
+    parser.loadSettingsFile(file, mDefaultSettings, true);
 }
 
 void Manager::loadUser(const std::string &file)

From 6492e9522a301d20e1dc1672ec3dd31b890bf75a Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 10 May 2021 00:16:24 +0200
Subject: [PATCH 0743/2859] Run benchmarks on gitlab CI

---
 .gitlab-ci.yml            | 1 +
 CI/before_script.linux.sh | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 20b233c66e..7be8fc997b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,6 +25,7 @@ stages:
     - 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:
diff --git a/CI/before_script.linux.sh b/CI/before_script.linux.sh
index 5f74b47147..17292e4e98 100755
--- a/CI/before_script.linux.sh
+++ b/CI/before_script.linux.sh
@@ -4,9 +4,14 @@ set -xeo pipefail
 
 free -m
 
+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=(
@@ -43,7 +48,8 @@ if [[ "${BUILD_TESTS_ONLY}" ]]; then
         -DBUILD_ESSIMPORTER=OFF \
         -DBUILD_OPENCS=OFF \
         -DBUILD_WIZARD=OFF \
-        -DBUILD_UNITTESTS=ON \
+        -DBUILD_UNITTESTS=${BUILD_UNITTESTS} \
+        -DBUILD_BENCHMARKS=${BUILD_BENCHMARKS} \
         -DGTEST_ROOT="${GOOGLETEST_DIR}" \
         -DGMOCK_ROOT="${GOOGLETEST_DIR}" \
         ..

From de37ca8e2c85703fb6b8b5763a73fd9b16a79dfb Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 9 May 2021 13:20:53 +0200
Subject: [PATCH 0744/2859] Catch exceptions in VideoThread

---
 CHANGELOG.md                                 |  1 +
 extern/osg-ffmpeg-videoplayer/videostate.cpp | 57 +++++++++++---------
 2 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 856e104389..154f8639ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -121,6 +121,7 @@
     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
     Feature #390: 3rd person look "over the shoulder"
     Feature #832: OpenMW-CS: Handle deleted references
diff --git a/extern/osg-ffmpeg-videoplayer/videostate.cpp b/extern/osg-ffmpeg-videoplayer/videostate.cpp
index c153aa14c7..d6c99051e5 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.cpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.cpp
@@ -409,43 +409,50 @@ public:
 
         pFrame = av_frame_alloc();
 
-        while(self->videoq.get(packet, self) >= 0)
+        try
         {
-            if(packet->data == flush_pkt.data)
+            while(self->videoq.get(packet, self) >= 0)
             {
-                avcodec_flush_buffers(self->video_ctx);
+                if(packet->data == flush_pkt.data)
+                {
+                    avcodec_flush_buffers(self->video_ctx);
 
-                self->pictq_mutex.lock();
-                self->pictq_size = 0;
-                self->pictq_rindex = 0;
-                self->pictq_windex = 0;
-                self->pictq_mutex.unlock();
+                    self->pictq_mutex.lock();
+                    self->pictq_size = 0;
+                    self->pictq_rindex = 0;
+                    self->pictq_windex = 0;
+                    self->pictq_mutex.unlock();
 
-                self->frame_last_pts = packet->pts * av_q2d((*self->video_st)->time_base);
-                continue;
-            }
+                    self->frame_last_pts = packet->pts * av_q2d((*self->video_st)->time_base);
+                    continue;
+                }
 
-            // Decode video frame
-            int ret = avcodec_send_packet(self->video_ctx, packet);
-            // EAGAIN is not expected
-            if (ret < 0)
-                throw std::runtime_error("Error decoding video frame");
+                // Decode video frame
+                int ret = avcodec_send_packet(self->video_ctx, packet);
+                // EAGAIN is not expected
+                if (ret < 0)
+                    throw std::runtime_error("Error decoding video frame");
 
-            while (!ret)
-            {
-                ret = avcodec_receive_frame(self->video_ctx, pFrame);
-                if (!ret)
+                while (!ret)
                 {
-                    double pts = pFrame->best_effort_timestamp;
-                    pts *= av_q2d((*self->video_st)->time_base);
+                    ret = avcodec_receive_frame(self->video_ctx, pFrame);
+                    if (!ret)
+                    {
+                        double pts = pFrame->best_effort_timestamp;
+                        pts *= av_q2d((*self->video_st)->time_base);
 
-                    pts = self->synchronize_video(pFrame, pts);
+                        pts = self->synchronize_video(pFrame, pts);
 
-                    if(self->queue_picture(pFrame, pts) < 0)
-                        break;
+                        if(self->queue_picture(pFrame, pts) < 0)
+                            break;
+                    }
                 }
             }
         }
+        catch(std::exception& e)
+        {
+            std::cerr << "An error occurred playing the video: " << e.what () << std::endl;
+        }
 
         av_packet_unref(packet);
 

From 339d347aea7fe71642d75582214cbbe5eb51614f Mon Sep 17 00:00:00 2001
From: Thunderforge <wjherrmann@gmail.com>
Date: Mon, 10 May 2021 22:44:07 -0500
Subject: [PATCH 0745/2859] Fixing performance-faster-string-find issues

This addresses the Clang Tidy check [performance-faster-string-find](https://clang.llvm.org/extra/clang-tidy/checks/performance-faster-string-find.html).
---
 apps/mwiniimporter/importer.cpp                | 8 ++++----
 apps/niftest/niftest.cpp                       | 2 +-
 apps/opencs/model/prefs/shortcutmanager.cpp    | 6 +++---
 apps/opencs/view/render/terraintexturemode.cpp | 2 +-
 apps/openmw/mwgui/tooltips.cpp                 | 2 +-
 components/debug/gldebug.cpp                   | 2 +-
 components/fallback/validate.cpp               | 2 +-
 components/resource/scenemanager.cpp           | 2 +-
 components/widgets/imagebutton.cpp             | 2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/apps/mwiniimporter/importer.cpp b/apps/mwiniimporter/importer.cpp
index 23aea2deb4..94b5cf7d05 100644
--- a/apps/mwiniimporter/importer.cpp
+++ b/apps/mwiniimporter/importer.cpp
@@ -686,12 +686,12 @@ MwIniImporter::multistrmap MwIniImporter::loadIniFile(const boost::filesystem::p
             continue;
         }
 
-        int comment_pos = line.find(";");
+        int comment_pos = line.find(';');
         if(comment_pos > 0) {
             line = line.substr(0,comment_pos);
         }
 
-        int pos = line.find("=");
+        int pos = line.find('=');
         if(pos < 1) {
             continue;
         }
@@ -722,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 = line.find('#');
         if(comment_pos > 0) {
             line = line.substr(0,comment_pos);
         }
@@ -731,7 +731,7 @@ MwIniImporter::multistrmap MwIniImporter::loadCfgFile(const boost::filesystem::p
             continue;
         }
 
-        int pos = line.find("=");
+        int pos = line.find('=');
         if(pos < 1) {
             continue;
         }
diff --git a/apps/niftest/niftest.cpp b/apps/niftest/niftest.cpp
index e9484d5f59..e403562d32 100644
--- a/apps/niftest/niftest.cpp
+++ b/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);
diff --git a/apps/opencs/model/prefs/shortcutmanager.cpp b/apps/opencs/model/prefs/shortcutmanager.cpp
index 781ad4de31..4c5f77900c 100644
--- a/apps/opencs/model/prefs/shortcutmanager.cpp
+++ b/apps/opencs/model/prefs/shortcutmanager.cpp
@@ -178,7 +178,7 @@ namespace CSMPrefs
     {
         const int MaxKeys = 4; // A limitation of QKeySequence
 
-        size_t end = data.find(";");
+        size_t end = data.find(';');
         size_t size = std::min(end, data.size());
 
         std::string value = data.substr(0, size);
@@ -191,7 +191,7 @@ namespace CSMPrefs
 
         while (start < value.size())
         {
-            end = data.find("+", start);
+            end = data.find('+', start);
             end = std::min(end, value.size());
 
             std::string name = value.substr(start, end - start);
@@ -243,7 +243,7 @@ namespace CSMPrefs
 
     void ShortcutManager::convertFromString(const std::string& data, int& modifier) const
     {
-        size_t start = data.find(";") + 1;
+        size_t start = data.find(';') + 1;
         start = std::min(start, data.size());
 
         std::string name = data.substr(start);
diff --git a/apps/opencs/view/render/terraintexturemode.cpp b/apps/opencs/view/render/terraintexturemode.cpp
index fa46cf6730..1519d3efd4 100644
--- a/apps/opencs/view/render/terraintexturemode.cpp
+++ b/apps/opencs/view/render/terraintexturemode.cpp
@@ -332,7 +332,7 @@ void CSVRender::TerrainTextureMode::editTerrainTextureGrid(const WorldspaceHitRe
 
     int textureColumn = landTable.findColumnIndex(CSMWorld::Columns::ColumnId_LandTexturesIndex);
 
-    std::size_t hashlocation = mBrushTexture.find("#");
+    std::size_t hashlocation = mBrushTexture.find('#');
     std::string mBrushTextureInt = mBrushTexture.substr (hashlocation+1);
     int brushInt = stoi(mBrushTexture.substr (hashlocation+1))+1; // All indices are offset by +1
 
diff --git a/apps/openmw/mwgui/tooltips.cpp b/apps/openmw/mwgui/tooltips.cpp
index c0694e403a..a821d0106b 100644
--- a/apps/openmw/mwgui/tooltips.cpp
+++ b/apps/openmw/mwgui/tooltips.cpp
@@ -266,7 +266,7 @@ namespace MWGui
                     std::map<std::string, std::string> userStrings = focus->getUserStrings();
                     for (auto& userStringPair : userStrings)
                     {
-                        size_t underscorePos = userStringPair.first.find("_");
+                        size_t underscorePos = userStringPair.first.find('_');
                         if (underscorePos == std::string::npos)
                             continue;
                         std::string key = userStringPair.first.substr(0, underscorePos);
diff --git a/components/debug/gldebug.cpp b/components/debug/gldebug.cpp
index 37829a8c1e..ccf49edd40 100644
--- a/components/debug/gldebug.cpp
+++ b/components/debug/gldebug.cpp
@@ -179,7 +179,7 @@ namespace Debug
         if (str.length() == 0)
             return true;
 
-        return str.find("OFF") == std::string::npos && str.find("0") == std::string::npos && str.find("NO") == std::string::npos;
+        return str.find("OFF") == std::string::npos && str.find('0') == std::string::npos && str.find("NO") == std::string::npos;
     }
 
     DebugGroup::DebugGroup(const std::string & message, GLuint id)
diff --git a/components/fallback/validate.cpp b/components/fallback/validate.cpp
index 982c709af1..a482d40faf 100644
--- a/components/fallback/validate.cpp
+++ b/components/fallback/validate.cpp
@@ -12,7 +12,7 @@ void Fallback::validate(boost::any& v, std::vector<std::string> const& tokens, F
     for (const auto& token : tokens)
     {
         std::string temp = Files::EscapeHashString::processString(token);
-        size_t sep = temp.find(",");
+        size_t sep = temp.find(',');
         if (sep < 1 || sep == temp.length() - 1 || sep == std::string::npos)
             throw boost::program_options::validation_error(boost::program_options::validation_error::invalid_option_value);
 
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index a3c751f7a2..2e2fb9aa1b 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -500,7 +500,7 @@ namespace Resource
         {
             std::string str(env);
 
-            if(str.find("OFF")!=std::string::npos || str.find("0")!= std::string::npos) options = 0;
+            if(str.find("OFF")!=std::string::npos || str.find('0')!= std::string::npos) options = 0;
 
             if(str.find("~FLATTEN_STATIC_TRANSFORMS")!=std::string::npos) options ^= Optimizer::FLATTEN_STATIC_TRANSFORMS;
             else if(str.find("FLATTEN_STATIC_TRANSFORMS")!=std::string::npos) options |= Optimizer::FLATTEN_STATIC_TRANSFORMS;
diff --git a/components/widgets/imagebutton.cpp b/components/widgets/imagebutton.cpp
index 0d1f798da5..bf2b1b24cb 100644
--- a/components/widgets/imagebutton.cpp
+++ b/components/widgets/imagebutton.cpp
@@ -118,7 +118,7 @@ namespace Gui
 
     void ImageButton::setImage(const std::string &image)
     {
-        size_t extpos = image.find_last_of(".");
+        size_t extpos = image.find_last_of('.');
         std::string imageNoExt = image.substr(0, extpos);
 
         std::string ext = image.substr(extpos);

From ad6cc6e775df684a555d2c99fd2109cdaaeb9135 Mon Sep 17 00:00:00 2001
From: Thunderforge <wjherrmann@gmail.com>
Date: Mon, 10 May 2021 23:04:37 -0500
Subject: [PATCH 0746/2859] Grouping settings on Advanced -> Visuals

Since we'll be adding additional settings in the near future and the list is already getting very long, I figured I would group these like we do on the "Miscellaneous" tab.
---
 files/ui/advancedpage.ui | 474 +++++++++++++++++++++------------------
 1 file changed, 255 insertions(+), 219 deletions(-)

diff --git a/files/ui/advancedpage.ui b/files/ui/advancedpage.ui
index 8c3dea4b39..645f8629f4 100644
--- a/files/ui/advancedpage.ui
+++ b/files/ui/advancedpage.ui
@@ -272,238 +272,274 @@
       </attribute>
       <layout class="QVBoxLayout">
        <item>
-        <layout class="QGridLayout" name="gridLayout_2">
-         <item row="3" column="1">
-          <widget class="QCheckBox" name="radialFogCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;By default, the fog becomes thicker proportionally to your distance from the clipping plane set at the clipping distance, which causes distortion at the edges of the screen.
-This setting makes the fog use the actual eye point distance (or so called Euclidean distance) to calculate the fog, which makes the fog look less artificial, especially if you have a wide FOV.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Radial fog</string>
-           </property>
-          </widget>
-         </item>
-         <item row="4" column="1">
-          <widget class="QCheckBox" name="bumpMapLocalLightingCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Normally environment map reflections aren't affected by lighting, which makes environment-mapped (and thus bump-mapped objects) glow in the dark.
-Morrowind Code Patch includes an option to remedy that by doing environment-mapping before applying lighting, this is the equivalent of that option.
-Affected objects will use shaders.
-&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Bump/reflect map local lighting</string>
-           </property>
-          </widget>
-         </item>
-         <item row="5" column="1">
-          <widget class="QCheckBox" name="turnToMovementDirectionCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Affects side and diagonal movement. Enabling this setting makes movement more realistic.&lt;/p&gt;&lt;p&gt;If disabled then the whole character's body is pointed to the direction of view. Diagonal movement has no special animation and causes sliding.&lt;/p&gt;&lt;p&gt;If enabled then the character turns lower body to the direction of movement. Upper body is turned partially. Head is always pointed to the direction of view. In combat mode it works only for diagonal movement. In non-combat mode it changes straight right and straight left movement as well. Also turns the whole body up or down when swimming according to the movement direction.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Turn to movement direction</string>
-           </property>
-          </widget>
-         </item>
-         <item row="6" column="0">
-          <widget class="QCheckBox" name="animSourcesCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Load per-group KF-files and skeleton files from Animations folder&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Use additional animation sources</string>
-           </property>
-          </widget>
-         </item>
-         <item row="6" column="1">
-          <layout class="QHBoxLayout" name="lightingMethodLayout">
-           <item>
-            <widget class="QLabel" name="lightingMethodLabel">
-             <property name="text">
-              <string>Lighting Method:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QComboBox" name="lightingMethodComboBox">
-             <item>
-              <property name="text">
-               <string>legacy</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>shaders compatibility</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>shaders</string>
-              </property>
-             </item>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item row="0" column="1">
-          <widget class="QCheckBox" name="distantLandCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If true, use paging and LOD algorithms to display the entire terrain. If false, only display terrain of the loaded cells.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Distant land</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1">
-          <widget class="QCheckBox" name="activeGridObjectPagingCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use object paging for active cells grid.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Active grid object paging</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="0">
-          <layout class="QHBoxLayout" name="viewingDistanceLayout">
-           <item>
-            <widget class="QLabel" name="viewingDistanceLabel">
-             <property name="text">
-              <string>Viewing distance</string>
-             </property>
-            </widget>
-           </item>
+        <widget class="QScrollArea" name="visualsScrollArea">
+         <property name="widgetResizable">
+          <bool>true</bool>
+         </property>
+         <widget class="QWidget" name="visualsScrollAreaWidgetContents">
+          <property name="geometry">
+           <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>645</width>
+            <height>413</height>
+           </rect>
+          </property>
+          <layout class="QVBoxLayout" name="verticalLayout">
            <item>
-            <widget class="QDoubleSpinBox" name="viewingDistanceComboBox">
-             <property name="suffix">
-              <string> Cells</string>
-             </property>
-             <property name="minimum">
-              <double>0.000000000000000</double>
-             </property>
-             <property name="singleStep">
-              <double>0.500000000000000</double>
+            <widget class="QGroupBox" name="animationsGroup">
+             <property name="title">
+              <string>Animations</string>
              </property>
+             <layout class="QGridLayout" name="animationsLayout">
+              <item row="0" column="0">
+               <widget class="QCheckBox" name="magicItemAnimationsCheckBox">
+                <property name="toolTip">
+                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use casting animations for magic items, just as for spells.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                </property>
+                <property name="text">
+                 <string>Use magic item animation</string>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="1">
+               <widget class="QCheckBox" name="smoothMovementCheckBox">
+                <property name="toolTip">
+                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Makes NPCs and player movement more smooth. Recommended to use with &quot;turn to movement direction&quot; enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                </property>
+                <property name="text">
+                 <string>Smooth movement</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="0">
+               <widget class="QCheckBox" name="animSourcesCheckBox">
+                <property name="toolTip">
+                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Load per-group KF-files and skeleton files from Animations folder&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                </property>
+                <property name="text">
+                 <string>Use additional animation sources</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="1">
+               <widget class="QCheckBox" name="turnToMovementDirectionCheckBox">
+                <property name="toolTip">
+                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Affects side and diagonal movement. Enabling this setting makes movement more realistic.&lt;/p&gt;&lt;p&gt;If disabled then the whole character's body is pointed to the direction of view. Diagonal movement has no special animation and causes sliding.&lt;/p&gt;&lt;p&gt;If enabled then the character turns lower body to the direction of movement. Upper body is turned partially. Head is always pointed to the direction of view. In combat mode it works only for diagonal movement. In non-combat mode it changes straight right and straight left movement as well. Also turns the whole body up or down when swimming according to the movement direction.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                </property>
+                <property name="text">
+                 <string>Turn to movement direction</string>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="0">
+               <layout class="QVBoxLayout" name="sheathingLayout">
+                <property name="leftMargin">
+                 <number>20</number>
+                </property>
+                <item>
+                 <widget class="QCheckBox" name="weaponSheathingCheckBox">
+                  <property name="enabled">
+                   <bool>false</bool>
+                  </property>
+                  <property name="toolTip">
+                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Render holstered weapons (with quivers and scabbards), requires modded assets.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                  </property>
+                  <property name="text">
+                   <string>Weapon sheathing</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QCheckBox" name="shieldSheathingCheckBox">
+                  <property name="enabled">
+                   <bool>false</bool>
+                  </property>
+                  <property name="toolTip">
+                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Render holstered shield, requires modded assets.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                  </property>
+                  <property name="text">
+                   <string>Shield sheathing</string>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+             </layout>
             </widget>
            </item>
-          </layout>
-         </item>
-         <item row="3" column="0">
-          <widget class="QCheckBox" name="autoUseTerrainNormalMapsCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;See 'auto use object normal maps'. Affects terrain.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Auto use terrain normal maps</string>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="0">
-          <widget class="QCheckBox" name="autoUseObjectSpecularMapsCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this option is enabled, specular maps are automatically recognized and used if they are named appropriately
-(see 'specular map pattern', e.g. for a base texture foo.dds,
-the specular map texture would have to be named foo_spec.dds).
-If this option is disabled, normal maps are only used if they are explicitly listed within the mesh file
-(.osg file, not supported in .nif files). Affects objects.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Auto use object specular maps</string>
-           </property>
-          </widget>
-         </item>
-         <item row="4" column="0">
-          <widget class="QCheckBox" name="autoUseTerrainSpecularMapsCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If a file with pattern 'terrain specular map pattern' exists, use that file as a 'diffuse specular' map. The texture must contain the layer colour in the RGB channel (as usual), and a specular multiplier in the alpha channel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Auto use terrain specular maps</string>
-           </property>
-          </widget>
-         </item>
-         <item row="5" column="0">
-          <widget class="QCheckBox" name="smoothMovementCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Makes NPCs and player movement more smooth. Recommended to use with &quot;turn to movement direction&quot; enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Smooth movement</string>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="1">
-          <widget class="QCheckBox" name="magicItemAnimationsCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use casting animations for magic items, just as for spells.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Use magic item animation</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="0">
-          <widget class="QCheckBox" name="autoUseObjectNormalMapsCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this option is enabled, normal maps are automatically recognized and used if they are named appropriately
-(see 'normal map pattern', e.g. for a base texture foo.dds, the normal map texture would have to be named foo_n.dds).
-If this option is disabled, normal maps are only used if they are explicitly listed within the mesh file (.nif or .osg file). Affects objects.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Auto use object normal maps</string>
-           </property>
-          </widget>
-         </item>
-         <item row="7" column="0">
-          <layout class="QVBoxLayout" name="sheathingLayout">
-           <property name="leftMargin">
-            <number>20</number>
-           </property>
            <item>
-            <widget class="QCheckBox" name="weaponSheathingCheckBox">
-             <property name="enabled">
-              <bool>false</bool>
-             </property>
-             <property name="toolTip">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Render holstered weapons (with quivers and scabbards), requires modded assets.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-             <property name="text">
-              <string>Weapon sheathing</string>
+            <widget class="QGroupBox" name="shadersGroup">
+             <property name="title">
+              <string>Shaders</string>
              </property>
+             <layout class="QGridLayout" name="shaderLayout">
+              <item row="0" column="0">
+               <widget class="QCheckBox" name="autoUseObjectNormalMapsCheckBox">
+                <property name="toolTip">
+                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this option is enabled, normal maps are automatically recognized and used if they are named appropriately
+                  (see 'normal map pattern', e.g. for a base texture foo.dds, the normal map texture would have to be named foo_n.dds).
+                  If this option is disabled, normal maps are only used if they are explicitly listed within the mesh file (.nif or .osg file). Affects objects.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                </property>
+                <property name="text">
+                 <string>Auto use object normal maps</string>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="1">
+               <widget class="QCheckBox" name="autoUseTerrainNormalMapsCheckBox">
+                <property name="toolTip">
+                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;See 'auto use object normal maps'. Affects terrain.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                </property>
+                <property name="text">
+                 <string>Auto use terrain normal maps</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="0">
+               <widget class="QCheckBox" name="autoUseObjectSpecularMapsCheckBox">
+                <property name="toolTip">
+                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this option is enabled, specular maps are automatically recognized and used if they are named appropriately
+                  (see 'specular map pattern', e.g. for a base texture foo.dds,
+                  the specular map texture would have to be named foo_spec.dds).
+                  If this option is disabled, normal maps are only used if they are explicitly listed within the mesh file
+                  (.osg file, not supported in .nif files). Affects objects.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                </property>
+                <property name="text">
+                 <string>Auto use object specular maps</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="1">
+               <widget class="QCheckBox" name="autoUseTerrainSpecularMapsCheckBox">
+                <property name="toolTip">
+                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If a file with pattern 'terrain specular map pattern' exists, use that file as a 'diffuse specular' map. The texture must contain the layer colour in the RGB channel (as usual), and a specular multiplier in the alpha channel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                </property>
+                <property name="text">
+                 <string>Auto use terrain specular maps</string>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="0">
+               <widget class="QCheckBox" name="bumpMapLocalLightingCheckBox">
+                <property name="toolTip">
+                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Normally environment map reflections aren't affected by lighting, which makes environment-mapped (and thus bump-mapped objects) glow in the dark.
+                  Morrowind Code Patch includes an option to remedy that by doing environment-mapping before applying lighting, this is the equivalent of that option.
+                  Affected objects will use shaders.
+                  &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                </property>
+                <property name="text">
+                 <string>Bump/reflect map local lighting</string>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="1">
+               <widget class="QCheckBox" name="radialFogCheckBox">
+                <property name="toolTip">
+                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;By default, the fog becomes thicker proportionally to your distance from the clipping plane set at the clipping distance, which causes distortion at the edges of the screen.
+                  This setting makes the fog use the actual eye point distance (or so called Euclidean distance) to calculate the fog, which makes the fog look less artificial, especially if you have a wide FOV.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                </property>
+                <property name="text">
+                 <string>Radial fog</string>
+                </property>
+               </widget>
+              </item>
+              <item row="3" column="0">
+               <layout class="QHBoxLayout" name="lightingMethodLayout">
+                <item>
+                 <widget class="QLabel" name="lightingMethodLabel">
+                  <property name="text">
+                   <string>Lighting Method:</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QComboBox" name="lightingMethodComboBox">
+                  <item>
+                   <property name="text">
+                    <string>legacy</string>
+                   </property>
+                  </item>
+                  <item>
+                   <property name="text">
+                    <string>shaders compatibility</string>
+                   </property>
+                  </item>
+                  <item>
+                   <property name="text">
+                    <string>shaders</string>
+                   </property>
+                  </item>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+             </layout>
             </widget>
            </item>
            <item>
-            <widget class="QCheckBox" name="shieldSheathingCheckBox">
-             <property name="enabled">
-              <bool>false</bool>
-             </property>
-             <property name="toolTip">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Render holstered shield, requires modded assets.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-             <property name="text">
-              <string>Shield sheathing</string>
+            <widget class="QGroupBox" name="terrainGroup">
+             <property name="title">
+              <string>Terrain</string>
              </property>
+             <layout class="QGridLayout" name="terrainLayout">
+              <item row="0" column="0">
+               <layout class="QHBoxLayout" name="viewingDistanceLayout">
+                <item>
+                 <widget class="QLabel" name="viewingDistanceLabel">
+                  <property name="text">
+                   <string>Viewing distance</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QDoubleSpinBox" name="viewingDistanceComboBox">
+                  <property name="suffix">
+                   <string> Cells</string>
+                  </property>
+                  <property name="minimum">
+                   <double>0.000000000000000</double>
+                  </property>
+                  <property name="singleStep">
+                   <double>0.500000000000000</double>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+              <item row="1" column="0">
+               <widget class="QCheckBox" name="distantLandCheckBox">
+                <property name="toolTip">
+                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If true, use paging and LOD algorithms to display the entire terrain. If false, only display terrain of the loaded cells.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                </property>
+                <property name="text">
+                 <string>Distant land</string>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="0">
+               <layout class="QVBoxLayout" name="distantLandLayout">
+                <property name="leftMargin">
+                 <number>20</number>
+                </property>
+                <item>
+                 <widget class="QCheckBox" name="activeGridObjectPagingCheckBox">
+                  <property name="toolTip">
+                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use object paging for active cells grid.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                  </property>
+                  <property name="text">
+                   <string>Active grid object paging</string>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+             </layout>
             </widget>
            </item>
           </layout>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <spacer name="verticalSpacer_4">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
+         </widget>
+        </widget>
        </item>
       </layout>
      </widget>

From 3e281f625debed685f97b789f7ea1035173b2468 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 10 May 2021 20:10:27 +0400
Subject: [PATCH 0747/2859] Return check for distance when we try to reuse data
 (bug #6026)

---
 components/terrain/viewdata.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/components/terrain/viewdata.cpp b/components/terrain/viewdata.cpp
index e4d043ffc4..48e882ea7b 100644
--- a/components/terrain/viewdata.cpp
+++ b/components/terrain/viewdata.cpp
@@ -141,9 +141,9 @@ ViewData *ViewDataMap::getViewData(osg::Object *viewer, const osg::Vec3f& viewPo
         vd = found->second;
     needsUpdate = false;
 
-    if (!(vd->suitableToUse(activeGrid) && (vd->getViewPoint()-viewPoint).length2() < mReuseDistance*mReuseDistance && vd->getWorldUpdateRevision() >= mWorldUpdateRevision))
+    if (!vd->suitableToUse(activeGrid) || (vd->getViewPoint()-viewPoint).length2() >= mReuseDistance*mReuseDistance || vd->getWorldUpdateRevision() < mWorldUpdateRevision)
     {
-        float shortestDist = std::numeric_limits<float>::max();
+        float shortestDist = mReuseDistance*mReuseDistance;
         const ViewData* mostSuitableView = nullptr;
         for (const ViewData* other : mUsedViews)
         {
@@ -157,11 +157,16 @@ ViewData *ViewDataMap::getViewData(osg::Object *viewer, const osg::Vec3f& viewPo
                 }
             }
         }
-        if (mostSuitableView && mostSuitableView != vd)
+        if (mostSuitableView)
         {
             vd->copyFrom(*mostSuitableView);
             return vd;
         }
+        else
+        {
+            vd->setViewPoint(viewPoint);
+            needsUpdate = true;
+        }
     }
     if (!vd->suitableToUse(activeGrid))
     {

From 4d7e5245a3f1d7a6691f96bd6c6d15621861f427 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 10 May 2021 00:17:11 +0200
Subject: [PATCH 0748/2859] Support benchmarks for windows

Don't run the binary because gitlab can't execute it successfully due to
unknown reason.
---
 .gitlab-ci.yml                 | 28 ++++++++++++++++++++++++++--
 CI/before_script.msvc.sh       | 10 ++++++++++
 CMakeLists.txt                 |  4 ++++
 apps/benchmarks/CMakeLists.txt |  7 -------
 4 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7be8fc997b..8d486ebf98 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -170,6 +170,10 @@ variables: &cs-targets
   targets: "openmw-cs,bsatool,esmtool,niftest"
   package: "CS"
 
+variables: &tests-targets
+  targets: "openmw_detournavigator_navmeshtilescache_benchmark"
+  package: "Tests"
+
 .Windows_Ninja_Base:
   tags:
     - windows
@@ -188,7 +192,7 @@ variables: &cs-targets
     - $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
+    - sh CI/before_script.msvc.sh -c $config -p Win64 -v 2019 -k -V -N -b
     - cd MSVC2019_64_Ninja
     - .\ActivateMSVC.ps1
     - cmake --build . --config $config --target ($targets.Split(','))
@@ -200,6 +204,7 @@ variables: &cs-targets
         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:
@@ -263,6 +268,15 @@ Windows_Ninja_CS_RelWithDebInfo:
     <<: *cs-targets
     config: "RelWithDebInfo"
 
+Windows_Ninja_Tests_RelWithDebInfo:
+  extends: .Windows_Ninja_Base
+  stage: build
+  variables:
+    <<: *tests-targets
+    config: "RelWithDebInfo"
+    # Gitlab can't successfully execute benchamark binary due to unknown reason
+    # executables: "openmw_detournavigator_navmeshtilescache_benchmark.exe"
+
 .Windows_MSBuild_Base:
   tags:
     - windows
@@ -280,7 +294,7 @@ Windows_Ninja_CS_RelWithDebInfo:
     - $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
+    - sh CI/before_script.msvc.sh -c $config -p Win64 -v 2019 -k -V -b
     - cd MSVC2019_64
     - cmake --build . --config $config --target ($targets.Split(','))
     - cd $config
@@ -291,6 +305,7 @@ Windows_Ninja_CS_RelWithDebInfo:
         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:
@@ -354,6 +369,15 @@ Windows_MSBuild_CS_RelWithDebInfo:
     <<: *cs-targets
     config: "RelWithDebInfo"
 
+Windows_MSBuild_Tests_RelWithDebInfo:
+  extends: .Windows_MSBuild_Base
+  stage: build
+  variables:
+    <<: *tests-targets
+    config: "RelWithDebInfo"
+    # Gitlab can't successfully execute benchamark binary due to unknown reason
+    # executables: "openmw_detournavigator_navmeshtilescache_benchmark.exe"
+
 Debian_AndroidNDK_arm64-v8a:
   tags:
     - linux
diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index d98c280380..bb662c9de1 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -73,6 +73,7 @@ CONFIGURATIONS=()
 TEST_FRAMEWORK=""
 GOOGLE_INSTALL_ROOT=""
 INSTALL_PREFIX="."
+BUILD_BENCHMARKS=""
 
 ACTIVATE_MSVC=""
 SINGLE_CONFIG=""
@@ -133,6 +134,9 @@ while [ $# -gt 0 ]; do
 				INSTALL_PREFIX=$(echo "$1" | sed 's;\\;/;g' | sed -E 's;/+;/;g')
 				shift ;;
 
+			b )
+				BUILD_BENCHMARKS=true ;;
+
 			h )
 				cat <<EOF
 Usage: $0 [-cdehkpuvVi]
@@ -167,6 +171,8 @@ Options:
 		Run verbosely
 	-i
 		CMake install prefix
+	-b
+		Build benchmarks
 EOF
 				wrappedExit 0
 				;;
@@ -1067,6 +1073,10 @@ fi
 	done
 #fi
 
+if [ "${BUILD_BENCHMARKS}" ]; then
+	add_cmake_opts -DBUILD_BENCHMARKS=ON
+fi
+
 if [ -n "$ACTIVATE_MSVC" ]; then
 	echo -n "- Activating MSVC in the current shell... "
 	command -v vswhere >/dev/null 2>&1 || { echo "Error: vswhere is not on the path."; wrappedExit 1; }
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1041401074..a9f33c743f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -669,6 +669,10 @@ if (WIN32)
     if (BUILD_WIZARD)
         set_target_properties(openmw-wizard PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}")
     endif()
+
+    if (BUILD_BENCHMARKS)
+        set_target_properties(openmw_detournavigator_navmeshtilescache_benchmark PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}")
+    endif()
   endif(MSVC)
 
   # TODO: At some point release builds should not use the console but rather write to a log file
diff --git a/apps/benchmarks/CMakeLists.txt b/apps/benchmarks/CMakeLists.txt
index b7170003ee..f9aa9aad49 100644
--- a/apps/benchmarks/CMakeLists.txt
+++ b/apps/benchmarks/CMakeLists.txt
@@ -19,16 +19,9 @@ FetchContent_MakeAvailableExcludeFromAll(benchmark)
 set(CMAKE_CXX_FLAGS "${SAVED_CMAKE_CXX_FLAGS}")
 
 openmw_add_executable(openmw_detournavigator_navmeshtilescache_benchmark detournavigator/navmeshtilescache.cpp)
-target_compile_options(openmw_detournavigator_navmeshtilescache_benchmark PRIVATE -Wall)
 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()
-
-if (MSVC)
-    if (CMAKE_CL_64)
-        set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /bigobj")
-    endif (CMAKE_CL_64)
-endif (MSVC)

From 54c8375672e52160e39df860b50ad02a45828806 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Tue, 11 May 2021 16:34:02 +0400
Subject: [PATCH 0749/2859] Recreate a special case for IntersectionVisitor on
 QuadTreeWorld

---
 components/terrain/viewdata.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/terrain/viewdata.cpp b/components/terrain/viewdata.cpp
index 48e882ea7b..996bf909c8 100644
--- a/components/terrain/viewdata.cpp
+++ b/components/terrain/viewdata.cpp
@@ -143,7 +143,7 @@ ViewData *ViewDataMap::getViewData(osg::Object *viewer, const osg::Vec3f& viewPo
 
     if (!vd->suitableToUse(activeGrid) || (vd->getViewPoint()-viewPoint).length2() >= mReuseDistance*mReuseDistance || vd->getWorldUpdateRevision() < mWorldUpdateRevision)
     {
-        float shortestDist = mReuseDistance*mReuseDistance;
+        float shortestDist = viewer ? mReuseDistance*mReuseDistance : std::numeric_limits<float>::max();
         const ViewData* mostSuitableView = nullptr;
         for (const ViewData* other : mUsedViews)
         {
@@ -157,12 +157,12 @@ ViewData *ViewDataMap::getViewData(osg::Object *viewer, const osg::Vec3f& viewPo
                 }
             }
         }
-        if (mostSuitableView)
+        if (mostSuitableView && mostSuitableView != vd)
         {
             vd->copyFrom(*mostSuitableView);
             return vd;
         }
-        else
+        else if (!mostSuitableView)
         {
             vd->setViewPoint(viewPoint);
             needsUpdate = true;

From 08f30e6f5040a037b12d022abc32204ffd3d18ea Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Tue, 11 May 2021 21:15:13 +0400
Subject: [PATCH 0750/2859] Temporary increase default near clip distance,
 until reverse-z depth buffer is implemented

---
 docs/source/reference/modding/settings/camera.rst | 2 +-
 files/settings-default.cfg                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/reference/modding/settings/camera.rst b/docs/source/reference/modding/settings/camera.rst
index e15b06e749..a880a2b62d 100644
--- a/docs/source/reference/modding/settings/camera.rst
+++ b/docs/source/reference/modding/settings/camera.rst
@@ -6,7 +6,7 @@ near clip
 
 :Type:		floating point
 :Range:		> 0
-:Default:	1.0
+:Default:	3.0
 
 This setting controls the distance to the near clipping plane. The value must be greater than zero.
 Values greater than approximately 18.0 will occasionally clip objects in the world in front of the character.
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index ea678c70f6..ecce453d42 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -14,7 +14,7 @@
 [Camera]
 
 # Near clipping plane (>0.0, e.g. 0.01 to 18.0).
-near clip = 1
+near clip = 3
 
 # Cull objects that occupy less than 'small feature culling pixel size' on the screen.
 small feature culling = true

From 49a744b65a6d5436608224f567e364ccd83587bf Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Wed, 12 May 2021 09:18:54 +0400
Subject: [PATCH 0751/2859] Make groundcover to use rendering distance in units
 instead of cells

---
 apps/openmw/mwrender/renderingmanager.cpp           | 10 ++++++----
 .../reference/modding/settings/groundcover.rst      | 13 ++++++-------
 files/settings-default.cfg                          |  4 ++--
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 7093c2b984..e497fdecd2 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -262,7 +262,7 @@ namespace MWRender
             globalDefines[itr->first] = itr->second;
 
         // Refactor this at some point - most shaders don't care about these defines
-        float groundcoverDistance = (Constants::CellSizeInUnits * std::max(1, Settings::Manager::getInt("distance", "Groundcover")) - 1024) * 0.93;
+        float groundcoverDistance = std::max(0.f, Settings::Manager::getFloat("rendering distance", "Groundcover"));
         globalDefines["groundcoverFadeStart"] = std::to_string(groundcoverDistance * 0.9f);
         globalDefines["groundcoverFadeEnd"] = std::to_string(groundcoverDistance);
         globalDefines["groundcoverStompMode"] = std::to_string(std::clamp(Settings::Manager::getInt("stomp mode", "Groundcover"), 0, 2));
@@ -349,6 +349,10 @@ namespace MWRender
             mGroundcover.reset(new Groundcover(mResourceSystem->getSceneManager(), density));
             static_cast<Terrain::QuadTreeWorld*>(mGroundcoverWorld.get())->addChunkManager(mGroundcover.get());
             mResourceSystem->addResourceManager(mGroundcover.get());
+
+            // Groundcover it is handled in the same way indifferently from if it is from active grid or from distant cell.
+            // Use a stub grid to avoid splitting between chunks for active grid and chunks for distant cells.
+            mGroundcoverWorld->setActiveGrid(osg::Vec4i(0, 0, 0, 0));
         }
         // water goes after terrain for correct waterculling order
         mWater.reset(new Water(sceneRoot->getParent(0), sceneRoot, mResourceSystem, mViewer->getIncrementalCompileOperation(), resourcePath));
@@ -1076,7 +1080,7 @@ namespace MWRender
 
         if (mGroundcoverWorld)
         {
-            int groundcoverDistance = Constants::CellSizeInUnits * std::max(1, Settings::Manager::getInt("distance", "Groundcover"));
+            float groundcoverDistance = std::max(0.f, Settings::Manager::getFloat("rendering distance", "Groundcover"));
             mGroundcoverWorld->setViewDistance(groundcoverDistance * (distanceMult ? 1.f/distanceMult : 1.f));
         }
     }
@@ -1311,8 +1315,6 @@ namespace MWRender
     void RenderingManager::setActiveGrid(const osg::Vec4i &grid)
     {
         mTerrain->setActiveGrid(grid);
-        if (mGroundcoverWorld)
-            mGroundcoverWorld->setActiveGrid(grid);
     }
     bool RenderingManager::pagingEnableObject(int type, const MWWorld::ConstPtr& ptr, bool enabled)
     {
diff --git a/docs/source/reference/modding/settings/groundcover.rst b/docs/source/reference/modding/settings/groundcover.rst
index ef97caeecc..7c5a965e01 100644
--- a/docs/source/reference/modding/settings/groundcover.rst
+++ b/docs/source/reference/modding/settings/groundcover.rst
@@ -28,15 +28,14 @@ are used in the game. Can affect performance a lot.
 
 This setting can only be configured by editing the settings configuration file.
 
-distance
---------
+rendering distance
+------------------
 
-:Type:		integer
-:Range:		> 0
-:Default:	1
+:Type:		floating point
+:Range:		>= 0.0
+:Default:	6144.0
 
-Determines on which distance in cells grass pages are rendered.
-Default 1 value means 3x3 cells area (active grid).
+Determines on which distance in game units grass pages are rendered.
 May affect performance a lot.
 
 This setting can only be configured by editing the settings configuration file.
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index ecce453d42..b4910c9b86 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -1071,8 +1071,8 @@ enabled = false
 # 1.0 means 100% density
 density = 1.0
 
-# A maximum distance in cells on which groundcover is rendered.
-distance = 1
+# A maximum distance in game units on which groundcover is rendered.
+rendering distance = 6144.0
 
 # A minimum size of groundcover chunk in cells (0.125, 0.25, 0.5, 1.0)
 min chunk size = 0.5

From f9d42ed3960430ab0d2c605caafb94a28ee77948 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sun, 2 May 2021 10:43:44 +0400
Subject: [PATCH 0752/2859] Fix MSVC's C4267 warnings

---
 CMakeLists.txt                                   |  1 -
 apps/mwiniimporter/importer.cpp                  | 10 +++++-----
 apps/opencs/model/doc/blacklist.cpp              |  2 +-
 apps/opencs/model/filter/narynode.cpp            |  2 +-
 apps/opencs/model/tools/mandatoryid.cpp          |  2 +-
 apps/opencs/model/tools/reportmodel.cpp          |  6 +++---
 apps/opencs/model/world/idtable.cpp              |  2 +-
 apps/opencs/model/world/resources.cpp            |  6 +++---
 apps/opencs/view/doc/operations.cpp              |  4 ++--
 apps/opencs/view/widget/scenetoolrun.cpp         |  2 +-
 apps/opencs/view/widget/scenetooltoggle.cpp      |  4 ++--
 apps/opencs/view/widget/scenetooltoggle2.cpp     |  2 +-
 apps/opencs/view/world/idvalidator.cpp           |  2 +-
 components/bsa/bsa_file.cpp                      | 16 ++++++++--------
 components/bsa/bsa_file.hpp                      |  4 ++--
 components/compiler/controlparser.cpp            |  6 +++---
 components/compiler/literals.cpp                 |  8 ++++----
 components/crashcatcher/windows_crashcatcher.cpp |  4 ++--
 components/esm/esmreader.cpp                     |  6 +++---
 components/esm/esmwriter.cpp                     |  2 +-
 components/files/lowlevelfile.cpp                |  4 ++--
 components/interpreter/runtime.cpp               |  2 +-
 components/widgets/list.cpp                      |  2 +-
 extern/osg-ffmpeg-videoplayer/audiodecoder.cpp   |  2 +-
 24 files changed, 50 insertions(+), 51 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1041401074..fe31951df2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -607,7 +607,6 @@ if (WIN32)
         4100 # Unreferenced formal parameter (-Wunused-parameter)
         4127 # Conditional expression is constant
         4244 # Storing value of one type in variable of another (size_t in int, for example)
-        4267 # Conversion from 'size_t' to 'int', possible loss of data
         4996 # Function was declared deprecated
         )
     
diff --git a/apps/mwiniimporter/importer.cpp b/apps/mwiniimporter/importer.cpp
index 94b5cf7d05..2763d8ad95 100644
--- a/apps/mwiniimporter/importer.cpp
+++ b/apps/mwiniimporter/importer.cpp
@@ -676,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;
@@ -686,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;
         }
@@ -722,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);
         }
@@ -731,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;
         }
diff --git a/apps/opencs/model/doc/blacklist.cpp b/apps/opencs/model/doc/blacklist.cpp
index b1d402c699..690d79983a 100644
--- a/apps/opencs/model/doc/blacklist.cpp
+++ b/apps/opencs/model/doc/blacklist.cpp
@@ -21,7 +21,7 @@ void CSMDoc::Blacklist::add (CSMWorld::UniversalId::Type type,
 {
     std::vector<std::string>& list = mIds[type];
 
-    int size = list.size();
+    size_t size = list.size();
 
     list.resize (size+ids.size());
 
diff --git a/apps/opencs/model/filter/narynode.cpp b/apps/opencs/model/filter/narynode.cpp
index 2fa9ac6ccb..9415f1daff 100644
--- a/apps/opencs/model/filter/narynode.cpp
+++ b/apps/opencs/model/filter/narynode.cpp
@@ -9,7 +9,7 @@ CSMFilter::NAryNode::NAryNode (const std::vector<std::shared_ptr<Node> >& nodes,
 
 int CSMFilter::NAryNode::getSize() const
 {
-    return mNodes.size();
+    return static_cast<int>(mNodes.size());
 }
 
 const CSMFilter::Node& CSMFilter::NAryNode::operator[] (int index) const
diff --git a/apps/opencs/model/tools/mandatoryid.cpp b/apps/opencs/model/tools/mandatoryid.cpp
index 23adb9d376..d0d9cc0b9d 100644
--- a/apps/opencs/model/tools/mandatoryid.cpp
+++ b/apps/opencs/model/tools/mandatoryid.cpp
@@ -11,7 +11,7 @@ CSMTools::MandatoryIdStage::MandatoryIdStage (const CSMWorld::CollectionBase& id
 
 int CSMTools::MandatoryIdStage::setup()
 {
-    return mIds.size();
+    return static_cast<int>(mIds.size());
 }
 
 void CSMTools::MandatoryIdStage::perform (int stage, CSMDoc::Messages& messages)
diff --git a/apps/opencs/model/tools/reportmodel.cpp b/apps/opencs/model/tools/reportmodel.cpp
index f9a1fdb0c7..a2901a6630 100644
--- a/apps/opencs/model/tools/reportmodel.cpp
+++ b/apps/opencs/model/tools/reportmodel.cpp
@@ -24,7 +24,7 @@ int CSMTools::ReportModel::rowCount (const QModelIndex & parent) const
     if (parent.isValid())
         return 0;
 
-    return mRows.size();
+    return static_cast<int>(mRows.size());
 }
 
 int CSMTools::ReportModel::columnCount (const QModelIndex & parent) const
@@ -140,7 +140,7 @@ bool CSMTools::ReportModel::removeRows (int row, int count, const QModelIndex& p
 
 void CSMTools::ReportModel::add (const CSMDoc::Message& message)
 {
-    beginInsertRows (QModelIndex(), mRows.size(), mRows.size());
+    beginInsertRows (QModelIndex(), static_cast<int>(mRows.size()), static_cast<int>(mRows.size()));
 
     mRows.push_back (message);
 
@@ -176,7 +176,7 @@ void CSMTools::ReportModel::clear()
 {
     if (!mRows.empty())
     {
-        beginRemoveRows (QModelIndex(), 0, mRows.size()-1);
+        beginRemoveRows (QModelIndex(), 0, static_cast<int>(mRows.size())-1);
         mRows.clear();
         endRemoveRows();
     }
diff --git a/apps/opencs/model/world/idtable.cpp b/apps/opencs/model/world/idtable.cpp
index 27d60ae98d..30fe6f639a 100644
--- a/apps/opencs/model/world/idtable.cpp
+++ b/apps/opencs/model/world/idtable.cpp
@@ -270,7 +270,7 @@ void CSMWorld::IdTable::reorderRows (int baseIndex, const std::vector<int>& newO
     if (!newOrder.empty())
         if (mIdCollection->reorderRows (baseIndex, newOrder))
             emit dataChanged (index (baseIndex, 0),
-                index (baseIndex+newOrder.size()-1, mIdCollection->getColumns()-1));
+                index (baseIndex+static_cast<int>(newOrder.size())-1, mIdCollection->getColumns()-1));
 }
 
 std::pair<CSMWorld::UniversalId, std::string> CSMWorld::IdTable::view (int row) const
diff --git a/apps/opencs/model/world/resources.cpp b/apps/opencs/model/world/resources.cpp
index b40ab13892..c3eb9762e7 100644
--- a/apps/opencs/model/world/resources.cpp
+++ b/apps/opencs/model/world/resources.cpp
@@ -20,13 +20,13 @@ void CSMWorld::Resources::recreate(const VFS::Manager* vfs, const char * const *
     mFiles.clear();
     mIndex.clear();
 
-    int baseSize = mBaseDirectory.size();
+    size_t baseSize = mBaseDirectory.size();
 
     const std::map<std::string, VFS::File*>& index = vfs->getIndex();
     for (std::map<std::string, VFS::File*>::const_iterator it = index.begin(); it != index.end(); ++it)
     {
         std::string filepath = it->first;
-        if (static_cast<int> (filepath.size())<baseSize+1 ||
+        if (filepath.size()<baseSize+1 ||
             filepath.substr (0, baseSize)!=mBaseDirectory ||
             (filepath[baseSize]!='/' && filepath[baseSize]!='\\'))
             continue;
@@ -60,7 +60,7 @@ void CSMWorld::Resources::recreate(const VFS::Manager* vfs, const char * const *
 
 int CSMWorld::Resources::getSize() const
 {
-    return mFiles.size();
+    return static_cast<int>(mFiles.size());
 }
 
 std::string CSMWorld::Resources::getId (int index) const
diff --git a/apps/opencs/view/doc/operations.cpp b/apps/opencs/view/doc/operations.cpp
index 7ee4b87260..9ed77ff9c5 100644
--- a/apps/opencs/view/doc/operations.cpp
+++ b/apps/opencs/view/doc/operations.cpp
@@ -30,7 +30,7 @@ void CSVDoc::Operations::setProgress (int current, int max, int type, int thread
             return;
         }
 
-    int oldCount = mOperations.size();
+    int oldCount = static_cast<int>(mOperations.size());
     int newCount = oldCount + 1;
 
     Operation *operation = new Operation (type, this);
@@ -51,7 +51,7 @@ void CSVDoc::Operations::quitOperation (int type)
     for (std::vector<Operation *>::iterator iter (mOperations.begin()); iter!=mOperations.end(); ++iter)
         if ((*iter)->getType()==type)
         {
-            int oldCount = mOperations.size();
+            int oldCount = static_cast<int>(mOperations.size());
             int newCount = oldCount - 1;
 
             mLayout->removeItem ((*iter)->getLayout());
diff --git a/apps/opencs/view/widget/scenetoolrun.cpp b/apps/opencs/view/widget/scenetoolrun.cpp
index b532820367..24bcf3f136 100644
--- a/apps/opencs/view/widget/scenetoolrun.cpp
+++ b/apps/opencs/view/widget/scenetoolrun.cpp
@@ -30,7 +30,7 @@ void CSVWidget::SceneToolRun::updateIcon()
 
 void CSVWidget::SceneToolRun::updatePanel()
 {
-    mTable->setRowCount (mProfiles.size());
+    mTable->setRowCount (static_cast<int>(mProfiles.size()));
 
     int i = 0;
 
diff --git a/apps/opencs/view/widget/scenetooltoggle.cpp b/apps/opencs/view/widget/scenetooltoggle.cpp
index fa0be31555..04ac3322bf 100644
--- a/apps/opencs/view/widget/scenetooltoggle.cpp
+++ b/apps/opencs/view/widget/scenetooltoggle.cpp
@@ -80,7 +80,7 @@ QRect CSVWidget::SceneToolToggle::getIconBox (int index) const
     int y = index / xMax;
     int x = index % xMax;
 
-    int total = mButtons.size();
+    int total = static_cast<int>(mButtons.size());
 
     int actualYIcons = total/xMax;
 
@@ -154,7 +154,7 @@ void CSVWidget::SceneToolToggle::addButton (const std::string& icon, unsigned in
     desc.mMask = mask;
     desc.mSmallIcon = smallIcon;
     desc.mName = name;
-    desc.mIndex = mButtons.size();
+    desc.mIndex = static_cast<int>(mButtons.size());
 
     mButtons.insert (std::make_pair (button, desc));
 
diff --git a/apps/opencs/view/widget/scenetooltoggle2.cpp b/apps/opencs/view/widget/scenetooltoggle2.cpp
index cf9bfe349b..363cae5709 100644
--- a/apps/opencs/view/widget/scenetooltoggle2.cpp
+++ b/apps/opencs/view/widget/scenetooltoggle2.cpp
@@ -99,7 +99,7 @@ void CSVWidget::SceneToolToggle2::addButton (unsigned int id, unsigned int mask,
     desc.mButtonId = id;
     desc.mMask = mask;
     desc.mName = name;
-    desc.mIndex = mButtons.size();
+    desc.mIndex = static_cast<int>(mButtons.size());
 
     mButtons.insert (std::make_pair (button, desc));
 
diff --git a/apps/opencs/view/world/idvalidator.cpp b/apps/opencs/view/world/idvalidator.cpp
index 1092d72171..442157ac5d 100644
--- a/apps/opencs/view/world/idvalidator.cpp
+++ b/apps/opencs/view/world/idvalidator.cpp
@@ -42,7 +42,7 @@ QValidator::State CSVWorld::IdValidator::validate (QString& input, int& pos) con
 
         if (!mNamespace.empty())
         {
-            std::string namespace_ = input.left (mNamespace.size()).toUtf8().constData();
+            std::string namespace_ = input.left (static_cast<int>(mNamespace.size())).toUtf8().constData();
 
             if (Misc::StringUtils::lowerCase (namespace_)!=mNamespace)
                 return QValidator::Invalid; // incorrect namespace
diff --git a/components/bsa/bsa_file.cpp b/components/bsa/bsa_file.cpp
index ec455ea1fc..4758d0a863 100644
--- a/components/bsa/bsa_file.cpp
+++ b/components/bsa/bsa_file.cpp
@@ -43,7 +43,7 @@ void BSAFile::fail(const std::string &msg)
 BSAFile::Hash getHash(const std::string& name)
 {
     BSAFile::Hash hash;
-    unsigned l = (name.size() >> 1);
+    unsigned l = (static_cast<unsigned>(name.size()) >> 1);
     unsigned sum, off, temp, i, n;
 
     for (sum = off = i = 0; i < l; i++) {
@@ -163,7 +163,7 @@ void BSAFile::readHeader()
     {
         FileStruct &fs = mFiles[i];
         fs.fileSize = offsets[i*2];
-        fs.offset = offsets[i*2+1] + fileDataOffset;
+        fs.offset = static_cast<uint32_t>(offsets[i*2+1] + fileDataOffset);
         auto namesOffset = offsets[2*filenum+i];
         fs.setNameInfos(namesOffset, &mStringBuf);
         fs.hash = hashes[i];
@@ -203,11 +203,11 @@ void Bsa::BSAFile::writeHeader()
     uint32_t head[3];
     head[0] = 0x100;
     auto fileDataOffset = mFiles.empty() ? 12 : mFiles.front().offset;
-    head[1] = fileDataOffset - 12 - 8*mFiles.size();
+    head[1] = static_cast<uint32_t>(fileDataOffset - 12 - 8*mFiles.size());
 
     output.seekp(0, std::ios_base::end);
 
-    head[2] = mFiles.size();
+    head[2] = static_cast<uint32_t>(mFiles.size());
     output.seekp(0);
     output.write(reinterpret_cast<char*>(head), 12);
 
@@ -239,9 +239,9 @@ int BSAFile::getIndex(const char *str) const
     if(it == mLookup.end())
         return -1;
 
-    int res = it->second;
-    assert(res >= 0 && (size_t)res < mFiles.size());
-    return res;
+    size_t res = it->second;
+    assert(res >= 0 && res < mFiles.size());
+    return static_cast<int>(res);
 }
 
 /// Open an archive file.
@@ -300,7 +300,7 @@ void Bsa::BSAFile::addFile(const std::string& filename, std::istream& file)
     newFile.hash = getHash(filename);
 
     if(mFiles.empty())
-        newFile.offset = newStartOfDataBuffer;
+        newFile.offset = static_cast<uint32_t>(newStartOfDataBuffer);
     else
     {
         std::vector<char> buffer;
diff --git a/components/bsa/bsa_file.hpp b/components/bsa/bsa_file.hpp
index fa6e5fc1ce..f9b4d4fa39 100644
--- a/components/bsa/bsa_file.hpp
+++ b/components/bsa/bsa_file.hpp
@@ -58,7 +58,7 @@ public:
         void setNameInfos(size_t index,
             std::vector<char>* stringBuf
         ) {
-            namesOffset = index;
+            namesOffset = static_cast<uint32_t>(index);
             namesBuffer = stringBuf;
         }
 
@@ -102,7 +102,7 @@ protected:
         the files[] vector above. The iltstr ensures that file name
         checks are case insensitive.
     */
-    typedef std::map<std::string, int, iltstr> Lookup;
+    typedef std::map<std::string, size_t, iltstr> Lookup;
     Lookup mLookup;
 
     /// Error handling
diff --git a/components/compiler/controlparser.cpp b/components/compiler/controlparser.cpp
index ec69fffa2c..a5a68edbd5 100644
--- a/components/compiler/controlparser.cpp
+++ b/components/compiler/controlparser.cpp
@@ -39,14 +39,14 @@ namespace Compiler
                     Codes block;
 
                     if (iter!=mIfCode.rbegin())
-                        Generator::jump (iter->second, codes.size()+1);
+                        Generator::jump (iter->second, static_cast<int>(codes.size()+1));
 
                     if (!iter->first.empty())
                     {
                         // if or elseif
                         std::copy (iter->first.begin(), iter->first.end(),
                             std::back_inserter (block));
-                        Generator::jumpOnZero (block, iter->second.size()+1);
+                        Generator::jumpOnZero (block, static_cast<int>(iter->second.size()+1));
                     }
 
                     std::copy (iter->second.begin(), iter->second.end(),
@@ -113,7 +113,7 @@ namespace Compiler
 
             Codes skip;
 
-            Generator::jumpOnZero (skip, mCodeBlock.size()+loop.size()+1);
+            Generator::jumpOnZero (skip, static_cast<int> (mCodeBlock.size()+loop.size()+1));
 
             std::copy (skip.begin(), skip.end(), std::back_inserter (mCode));
 
diff --git a/components/compiler/literals.cpp b/components/compiler/literals.cpp
index 774ca4ca7f..a40ff2a02a 100644
--- a/components/compiler/literals.cpp
+++ b/components/compiler/literals.cpp
@@ -6,12 +6,12 @@ namespace Compiler
 {
     int Literals::getIntegerSize() const
     {
-        return mIntegers.size() * sizeof (Interpreter::Type_Integer);
+        return static_cast<int>(mIntegers.size() * sizeof (Interpreter::Type_Integer));
     }
 
     int Literals::getFloatSize() const
     {
-        return mFloats.size() * sizeof (Interpreter::Type_Float);
+        return static_cast<int>(mFloats.size() * sizeof (Interpreter::Type_Float));
     }
 
     int Literals::getStringSize() const
@@ -41,11 +41,11 @@ namespace Compiler
         
         code.resize (size+stringBlockSize/4);
         
-        int offset = 0;
+        size_t offset = 0;
         
         for (const auto & mString : mStrings)
         {
-            int stringSize = mString.size()+1;
+            size_t stringSize = mString.size()+1;
             
             std::copy (mString.c_str(), mString.c_str()+stringSize,
                 reinterpret_cast<char *> (&code[size]) + offset);
diff --git a/components/crashcatcher/windows_crashcatcher.cpp b/components/crashcatcher/windows_crashcatcher.cpp
index 185eee6aa6..39ac86d7b8 100644
--- a/components/crashcatcher/windows_crashcatcher.cpp
+++ b/components/crashcatcher/windows_crashcatcher.cpp
@@ -130,12 +130,12 @@ namespace Crash
         DWORD copied = 0;
         do {
             executablePath.resize(executablePath.size() + MAX_PATH);
-            copied = GetModuleFileNameW(nullptr, executablePath.data(), executablePath.size());
+            copied = GetModuleFileNameW(nullptr, executablePath.data(), static_cast<DWORD>(executablePath.size()));
         } while (copied >= executablePath.size());
         executablePath.resize(copied);
 
         memset(mShm->mStartup.mLogFilePath, 0, sizeof(mShm->mStartup.mLogFilePath));
-        int length = crashLogPath.length();
+        size_t length = crashLogPath.length();
         if (length >= MAX_LONG_PATH) length = MAX_LONG_PATH - 1;
         strncpy(mShm->mStartup.mLogFilePath, crashLogPath.c_str(), length);
         mShm->mStartup.mLogFilePath[length] = '\0';
diff --git a/components/esm/esmreader.cpp b/components/esm/esmreader.cpp
index 30c38d739c..b779d7f7fd 100644
--- a/components/esm/esmreader.cpp
+++ b/components/esm/esmreader.cpp
@@ -203,9 +203,9 @@ void ESMReader::getSubName()
     }
 
     // reading the subrecord data anyway.
-    const size_t subNameSize = mCtx.subName.data_size();
+    const int subNameSize = static_cast<int>(mCtx.subName.data_size());
     getExact(mCtx.subName.rw_data(), subNameSize);
-    mCtx.leftRec -= subNameSize;
+    mCtx.leftRec -= static_cast<uint32_t>(subNameSize);
 }
 
 void ESMReader::skipHSub()
@@ -327,7 +327,7 @@ std::string ESMReader::getString(int size)
     char *ptr = mBuffer.data();
     getExact(ptr, size);
 
-    size = strnlen(ptr, size);
+    size = static_cast<int>(strnlen(ptr, size));
 
     // Convert to UTF8 and return
     if (mEncoder)
diff --git a/components/esm/esmwriter.cpp b/components/esm/esmwriter.cpp
index 09fca4b262..f65340f703 100644
--- a/components/esm/esmwriter.cpp
+++ b/components/esm/esmwriter.cpp
@@ -217,7 +217,7 @@ namespace ESM
         if (mCounting && !mRecords.empty())
         {
             for (std::list<RecordData>::iterator it = mRecords.begin(); it != mRecords.end(); ++it)
-                it->size += size;
+                it->size += static_cast<uint32_t>(size);
         }
 
         mStream->write(data, size);
diff --git a/components/files/lowlevelfile.cpp b/components/files/lowlevelfile.cpp
index 07915abba0..d89ae58383 100644
--- a/components/files/lowlevelfile.cpp
+++ b/components/files/lowlevelfile.cpp
@@ -326,7 +326,7 @@ void LowLevelFile::seek (size_t position)
 {
     assert (mHandle != INVALID_HANDLE_VALUE);
 
-    if (SetFilePointer (mHandle, position, nullptr, SEEK_SET) == INVALID_SET_FILE_POINTER)
+    if (SetFilePointer (mHandle, static_cast<LONG>(position), nullptr, SEEK_SET) == INVALID_SET_FILE_POINTER)
         if (GetLastError () != NO_ERROR)
             throw std::runtime_error ("A seek operation on a file failed.");
 }
@@ -349,7 +349,7 @@ size_t LowLevelFile::read (void * data, size_t size)
 
     DWORD read;
 
-    if (!ReadFile (mHandle, data, size, &read, nullptr))
+    if (!ReadFile (mHandle, data, static_cast<DWORD>(size), &read, nullptr))
         throw std::runtime_error ("A read operation on a file failed.");
 
     return read;
diff --git a/components/interpreter/runtime.cpp b/components/interpreter/runtime.cpp
index 35ad93a8a6..1cb8f558c9 100644
--- a/components/interpreter/runtime.cpp
+++ b/components/interpreter/runtime.cpp
@@ -45,7 +45,7 @@ namespace Interpreter
 
         for (; index; --index)
         {
-            offset += std::strlen (literalBlock+offset) + 1;
+            offset += static_cast<int>(std::strlen (literalBlock+offset)) + 1;
             if (offset / 4 >= static_cast<int> (mCode[3]))
                 throw std::out_of_range("out of range");
         }
diff --git a/components/widgets/list.cpp b/components/widgets/list.cpp
index 73ca94929f..e961b04cb0 100644
--- a/components/widgets/list.cpp
+++ b/components/widgets/list.cpp
@@ -115,7 +115,7 @@ namespace Gui
 
     unsigned int MWList::getItemCount()
     {
-        return mItems.size();
+        return static_cast<unsigned int>(mItems.size());
     }
 
     std::string MWList::getItemNameAt(unsigned int at)
diff --git a/extern/osg-ffmpeg-videoplayer/audiodecoder.cpp b/extern/osg-ffmpeg-videoplayer/audiodecoder.cpp
index c32794d2aa..c78328b2eb 100644
--- a/extern/osg-ffmpeg-videoplayer/audiodecoder.cpp
+++ b/extern/osg-ffmpeg-videoplayer/audiodecoder.cpp
@@ -255,7 +255,7 @@ size_t MovieAudioDecoder::read(char *stream, size_t len)
         size_t sampleSize = av_get_bytes_per_sample(mOutputSampleFormat);
         char* data[1];
         data[0] = stream;
-        av_samples_set_silence((uint8_t**)data, 0, len/sampleSize, 1, mOutputSampleFormat);
+        av_samples_set_silence((uint8_t**)data, 0, static_cast<int>(len/sampleSize), 1, mOutputSampleFormat);
         return len;
     }
 

From 963e1b8b3fdb46b85d813f7439129359d49a8316 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sun, 2 May 2021 12:59:22 +0400
Subject: [PATCH 0753/2859] Fix MSVC's C4244 warnings

---
 CMakeLists.txt                                 |  2 --
 apps/openmw/mwsound/ffmpeg_decoder.hpp         | 10 ++++++++++
 components/bsa/bsa_file.cpp                    |  6 +++---
 components/compiler/locals.cpp                 |  2 +-
 components/compiler/scanner.hpp                |  6 +++---
 components/esm/statstate.cpp                   |  7 +++----
 components/myguiplatform/scalinglayer.cpp      | 12 ++++++------
 extern/osg-ffmpeg-videoplayer/audiodecoder.cpp | 13 ++++++++++---
 extern/osg-ffmpeg-videoplayer/audiodecoder.hpp |  9 +++++++++
 extern/osg-ffmpeg-videoplayer/videostate.cpp   |  9 +++++++++
 extern/osg-ffmpeg-videoplayer/videostate.hpp   |  9 +++++++++
 11 files changed, 63 insertions(+), 22 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe31951df2..053f9def19 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -603,10 +603,8 @@ if (WIN32)
     set(WARNINGS "/W4")
 
     set(WARNINGS_DISABLE
-        # OpenMW specific warnings
         4100 # Unreferenced formal parameter (-Wunused-parameter)
         4127 # Conditional expression is constant
-        4244 # Storing value of one type in variable of another (size_t in int, for example)
         4996 # Function was declared deprecated
         )
     
diff --git a/apps/openmw/mwsound/ffmpeg_decoder.hpp b/apps/openmw/mwsound/ffmpeg_decoder.hpp
index f099c831ca..0a67a47580 100644
--- a/apps/openmw/mwsound/ffmpeg_decoder.hpp
+++ b/apps/openmw/mwsound/ffmpeg_decoder.hpp
@@ -2,6 +2,12 @@
 #define GAME_SOUND_FFMPEG_DECODER_H
 
 #include <stdint.h>
+
+#if defined(_MSC_VER)
+    #pragma warning (push)
+    #pragma warning (disable : 4244)
+#endif
+
 extern "C"
 {
 #include <libavcodec/avcodec.h>
@@ -14,6 +20,10 @@ extern "C"
 #include <libswresample/swresample.h>
 }
 
+#if defined(_MSC_VER)
+    #pragma warning (pop)
+#endif
+
 #include <components/files/constrainedfilestream.hpp>
 
 #include <string>
diff --git a/components/bsa/bsa_file.cpp b/components/bsa/bsa_file.cpp
index 4758d0a863..158080ea36 100644
--- a/components/bsa/bsa_file.cpp
+++ b/components/bsa/bsa_file.cpp
@@ -295,7 +295,7 @@ void Bsa::BSAFile::addFile(const std::string& filename, std::istream& file)
 
     FileStruct newFile;
     file.seekg(0, std::ios::end);
-    newFile.fileSize = file.tellg();
+    newFile.fileSize = static_cast<uint32_t>(file.tellg());
     newFile.setNameInfos(mStringBuf.size(), &mStringBuf);
     newFile.hash = getHash(filename);
 
@@ -312,7 +312,7 @@ void Bsa::BSAFile::addFile(const std::string& filename, std::istream& file)
             stream.read(buffer.data(), firstFile.fileSize);
 
             stream.seekp(0, std::ios::end);
-            firstFile.offset = stream.tellp();
+            firstFile.offset = static_cast<uint32_t>(stream.tellp());
 
             stream.write(buffer.data(), firstFile.fileSize);
 
@@ -320,7 +320,7 @@ void Bsa::BSAFile::addFile(const std::string& filename, std::istream& file)
             std::rotate(mFiles.begin(), mFiles.begin() + 1, mFiles.end());
         }
         stream.seekp(0, std::ios::end);
-        newFile.offset = stream.tellp();
+        newFile.offset = static_cast<uint32_t>(stream.tellp());
     }
 
     mStringBuf.insert(mStringBuf.end(), filename.begin(), filename.end());
diff --git a/components/compiler/locals.cpp b/components/compiler/locals.cpp
index 9b233b8f53..f31acb1a8b 100644
--- a/components/compiler/locals.cpp
+++ b/components/compiler/locals.cpp
@@ -30,7 +30,7 @@ namespace Compiler
         if (iter==collection.end())
             return -1;
 
-        return iter-collection.begin();
+        return static_cast<int>(iter-collection.begin());
     }
 
     bool Locals::search (char type, const std::string& name) const
diff --git a/components/compiler/scanner.hpp b/components/compiler/scanner.hpp
index 9c7bd656ed..fd7de5b6b6 100644
--- a/components/compiler/scanner.hpp
+++ b/components/compiler/scanner.hpp
@@ -103,7 +103,7 @@ namespace Compiler
         {
             blank();
 
-            char ch = in.peek();
+            char ch = static_cast<char>(in.peek());
 
             if (!in.good())
                 return false;
@@ -130,7 +130,7 @@ namespace Compiler
         {
             std::streampos p_orig = in.tellg();
 
-            char ch = in.peek();
+            char ch = static_cast<char>(in.peek());
 
             if (!in.good())
                 return false;
@@ -156,7 +156,7 @@ namespace Compiler
 
         void blank()
         {
-            std::fill(mData, mData + sizeof(mData), 0);
+            std::fill(std::begin(mData), std::end(mData), '\0');
             mLength = -1;
         }
 
diff --git a/components/esm/statstate.cpp b/components/esm/statstate.cpp
index b9ddc3efd7..30d39e3c67 100644
--- a/components/esm/statstate.cpp
+++ b/components/esm/statstate.cpp
@@ -16,17 +16,16 @@ namespace ESM
         {
             int base = 0;
             esm.getHNT(base, "STBA");
-            mBase = static_cast<float>(base);
+            mBase = static_cast<T>(base);
 
             int mod = 0;
             esm.getHNOT(mod, "STMO");
-            mMod = static_cast<float>(mod);
+            mMod = static_cast<T>(mod);
 
             int current = 0;
             esm.getHNOT(current, "STCU");
-            mCurrent = static_cast<float>(current);
+            mCurrent = static_cast<T>(current);
 
-            // mDamage was changed to a float; ensure backwards compatibility
             int oldDamage = 0;
             esm.getHNOT(oldDamage, "STDA");
             mDamage = static_cast<float>(oldDamage);
diff --git a/components/myguiplatform/scalinglayer.cpp b/components/myguiplatform/scalinglayer.cpp
index 99ed6d07a3..51c148253f 100644
--- a/components/myguiplatform/scalinglayer.cpp
+++ b/components/myguiplatform/scalinglayer.cpp
@@ -74,8 +74,8 @@ namespace osgMyGUI
         _left -= globalViewSize.width/2;
         _top -= globalViewSize.height/2;
 
-        _left /= scale;
-        _top /= scale;
+        _left = static_cast<int>(_left/scale);
+        _top = static_cast<int>(_top/scale);
 
         _left += mViewSize.width/2;
         _top += mViewSize.height/2;
@@ -84,8 +84,8 @@ namespace osgMyGUI
     float ScalingLayer::getScaleFactor() const
     {
         MyGUI::IntSize viewSize = MyGUI::RenderManager::getInstance().getViewSize();
-        float w = viewSize.width;
-        float h = viewSize.height;
+        float w = static_cast<float>(viewSize.width);
+        float h = static_cast<float>(viewSize.height);
 
         float heightScale = (h / mViewSize.height);
         float widthScale = (w / mViewSize.width);
@@ -103,8 +103,8 @@ namespace osgMyGUI
         MyGUI::IntSize globalViewSize = MyGUI::RenderManager::getInstance().getViewSize();
         MyGUI::IntSize viewSize = globalViewSize;
         float scale = getScaleFactor();
-        viewSize.width /= scale;
-        viewSize.height /= scale;
+        viewSize.width = static_cast<int>(viewSize.width / scale);
+        viewSize.height = static_cast<int>(viewSize.height / scale);
 
         float hoffset = (globalViewSize.width - mViewSize.width*getScaleFactor())/2.f / static_cast<float>(globalViewSize.width);
         float voffset = (globalViewSize.height - mViewSize.height*getScaleFactor())/2.f / static_cast<float>(globalViewSize.height);
diff --git a/extern/osg-ffmpeg-videoplayer/audiodecoder.cpp b/extern/osg-ffmpeg-videoplayer/audiodecoder.cpp
index c78328b2eb..b5b3b8a3e0 100644
--- a/extern/osg-ffmpeg-videoplayer/audiodecoder.cpp
+++ b/extern/osg-ffmpeg-videoplayer/audiodecoder.cpp
@@ -4,13 +4,20 @@
 #include <stdexcept>
 #include <string>
 
+#if defined(_MSC_VER)
+    #pragma warning (push)
+    #pragma warning (disable : 4244)
+#endif
+
 extern "C"
 {
-    #include <libavcodec/avcodec.h>
-
     #include <libswresample/swresample.h>
 }
 
+#if defined(_MSC_VER)
+    #pragma warning (pop)
+#endif
+
 #include "videostate.hpp"
 
 namespace
@@ -276,7 +283,7 @@ size_t MovieAudioDecoder::read(char *stream, size_t len)
 
             mFramePos = std::min<ssize_t>(mFrameSize, sample_skip);
             if(sample_skip > 0 || mFrameSize > -sample_skip)
-                sample_skip -= mFramePos;
+                sample_skip -= static_cast<int>(mFramePos);
             continue;
         }
 
diff --git a/extern/osg-ffmpeg-videoplayer/audiodecoder.hpp b/extern/osg-ffmpeg-videoplayer/audiodecoder.hpp
index afb0884315..bbb5a27838 100644
--- a/extern/osg-ffmpeg-videoplayer/audiodecoder.hpp
+++ b/extern/osg-ffmpeg-videoplayer/audiodecoder.hpp
@@ -6,6 +6,11 @@
 #include <new>
 #include <memory>
 
+#if defined(_MSC_VER)
+    #pragma warning (push)
+    #pragma warning (disable : 4244)
+#endif
+
 extern "C"
 {
     #include <libavutil/avutil.h>
@@ -14,6 +19,10 @@ extern "C"
     #include <libavutil/channel_layout.h>
 }
 
+#if defined(_MSC_VER)
+    #pragma warning (pop)
+#endif
+
 #if defined(_WIN32) && !defined(__MINGW32__)
 #include <basetsd.h>
 
diff --git a/extern/osg-ffmpeg-videoplayer/videostate.cpp b/extern/osg-ffmpeg-videoplayer/videostate.cpp
index c153aa14c7..a2ea71b192 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.cpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.cpp
@@ -9,6 +9,11 @@
 
 #include <osg/Texture2D>
 
+#if defined(_MSC_VER)
+    #pragma warning (push)
+    #pragma warning (disable : 4244)
+#endif
+
 extern "C"
 {
     #include <libavcodec/avcodec.h>
@@ -17,6 +22,10 @@ extern "C"
     #include <libavutil/time.h>
 }
 
+#if defined(_MSC_VER)
+    #pragma warning (pop)
+#endif
+
 static const char* flushString = "FLUSH";
 struct FlushPacket : AVPacket
 {
diff --git a/extern/osg-ffmpeg-videoplayer/videostate.hpp b/extern/osg-ffmpeg-videoplayer/videostate.hpp
index 015656084f..244637b873 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.hpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.hpp
@@ -15,6 +15,11 @@ namespace osg
     class Texture2D;
 }
 
+#if defined(_MSC_VER)
+    #pragma warning (push)
+    #pragma warning (disable : 4244)
+#endif
+
 extern "C"
 {
 #include <libavcodec/avcodec.h>
@@ -28,6 +33,10 @@ extern "C"
 #include <libswresample/swresample.h>
 }
 
+#if defined(_MSC_VER)
+    #pragma warning (pop)
+#endif
+
 #include "videodefs.hpp"
 
 #define VIDEO_PICTURE_QUEUE_SIZE 50

From 6e19e3a9bbde5090a1a4472646543056bc5ce1f0 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 12 May 2021 09:51:41 +0200
Subject: [PATCH 0754/2859] Add changelog entries for navigator features

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 856e104389..1b8c0c6355 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -160,6 +160,8 @@
     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 #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
     Task #5844: Update 'toggle sneak' documentation

From 89f721fad3aee343aae1af718984198d00e1e7fe Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Wed, 12 May 2021 22:35:00 +0200
Subject: [PATCH 0755/2859] Use a constexpr for esm cc

---
 components/esm/defs.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/esm/defs.hpp b/components/esm/defs.hpp
index 9bf9b01f3d..1b623f69f0 100644
--- a/components/esm/defs.hpp
+++ b/components/esm/defs.hpp
@@ -85,7 +85,7 @@ bool inline operator!= (const Position& left, const Position& right) noexcept
 template <int a, int b, int c, int d>
 struct FourCC
 {
-    static const unsigned int value = (((((d << 8) | c) << 8) | b) << 8) | a;
+    static constexpr unsigned int value = (((((d << 8) | c) << 8) | b) << 8) | a;
 };
 
 enum RecNameInts

From 1b61ec979ddc60c45faf95c43af7fbbc4030d477 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 13 May 2021 11:25:58 +0200
Subject: [PATCH 0756/2859] switch to lock_guards

---
 extern/osg-ffmpeg-videoplayer/videostate.cpp | 22 +++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/extern/osg-ffmpeg-videoplayer/videostate.cpp b/extern/osg-ffmpeg-videoplayer/videostate.cpp
index d6c99051e5..7a4e7ede4d 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.cpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.cpp
@@ -80,8 +80,7 @@ void VideoState::setAudioFactory(MovieAudioFactory *factory)
 
 void PacketQueue::put(AVPacket *pkt)
 {
-    AVPacketList *pkt1;
-    pkt1 = (AVPacketList*)av_malloc(sizeof(AVPacketList));
+    std::unique_ptr<AVPacketList> pkt1(static_cast<AVPacketList*>(av_malloc(sizeof(AVPacketList))));
     if(!pkt1) throw std::bad_alloc();
 
     if(pkt == &flush_pkt)
@@ -91,18 +90,16 @@ void PacketQueue::put(AVPacket *pkt)
 
     pkt1->next = nullptr;
 
-    this->mutex.lock ();
+    std::lock_guard<std::mutex> lock(this->mutex);
 
     if(!last_pkt)
-        this->first_pkt = pkt1;
+        this->first_pkt = pkt1.get();
     else
-        this->last_pkt->next = pkt1;
-    this->last_pkt = pkt1;
+        this->last_pkt->next = pkt1.get();
+    this->last_pkt = pkt1.release();
     this->nb_packets++;
     this->size += pkt1->pkt.size;
     this->cond.notify_one();
-
-    this->mutex.unlock();
 }
 
 int PacketQueue::get(AVPacket *pkt, VideoState *is)
@@ -144,7 +141,7 @@ void PacketQueue::clear()
 {
     AVPacketList *pkt, *pkt1;
 
-    this->mutex.lock();
+    std::lock_guard<std::mutex> lock(this->mutex);
     for(pkt = this->first_pkt; pkt != nullptr; pkt = pkt1)
     {
         pkt1 = pkt->next;
@@ -156,7 +153,6 @@ void PacketQueue::clear()
     this->first_pkt = nullptr;
     this->nb_packets = 0;
     this->size = 0;
-    this->mutex.unlock ();
 }
 
 int VideoPicture::set_dimensions(int w, int h) {
@@ -325,7 +321,7 @@ int VideoState::queue_picture(AVFrame *pFrame, double pts)
     if(this->mQuit)
         return -1;
 
-    this->pictq_mutex.lock();
+    std::lock_guard<std::mutex> lock(this->pictq_mutex);
 
     // windex is set to 0 initially
     vp = &this->pictq[this->pictq_windex];
@@ -350,10 +346,7 @@ int VideoState::queue_picture(AVFrame *pFrame, double pts)
 
     vp->pts = pts;
     if (vp->set_dimensions(w, h) < 0)
-    {
-        this->pictq_mutex.unlock();
         return -1;
-    }
 
     sws_scale(this->sws_context, pFrame->data, pFrame->linesize,
               0, this->video_ctx->height, vp->rgbaFrame->data, vp->rgbaFrame->linesize);
@@ -361,7 +354,6 @@ int VideoState::queue_picture(AVFrame *pFrame, double pts)
     // now we inform our display thread that we have a pic ready
     this->pictq_windex = (this->pictq_windex+1) % VIDEO_PICTURE_ARRAY_SIZE;
     this->pictq_size++;
-    this->pictq_mutex.unlock();
 
     return 0;
 }

From 3b7cef9e8859dfd94a2e8b29f5ea008f0a2cc398 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 13 May 2021 12:01:32 +0200
Subject: [PATCH 0757/2859] add PacketGuard and move try/catch up

---
 extern/osg-ffmpeg-videoplayer/videostate.cpp | 126 +++++++++++--------
 1 file changed, 76 insertions(+), 50 deletions(-)

diff --git a/extern/osg-ffmpeg-videoplayer/videostate.cpp b/extern/osg-ffmpeg-videoplayer/videostate.cpp
index 7a4e7ede4d..7d5097ade3 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.cpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.cpp
@@ -37,6 +37,39 @@ namespace
 {
     const int MAX_AUDIOQ_SIZE = (5 * 16 * 1024);
     const int MAX_VIDEOQ_SIZE = (5 * 256 * 1024);
+
+    class PacketGuard
+    {
+        AVPacket mPacket;
+        bool mReleased;
+    public:
+        PacketGuard() : mReleased(false)
+        {
+            av_init_packet(&mPacket);
+        }
+
+        AVPacket* operator->()
+        {
+            return &mPacket;
+        }
+
+        AVPacket* operator*()
+        {
+            return &mPacket;
+        }
+
+        AVPacket* release()
+        {
+            mReleased = true;
+            return &mPacket;
+        }
+
+        ~PacketGuard()
+        {
+            if(!mReleased)
+                av_packet_unref(&mPacket);
+        }
+    };
 }
 
 namespace Video
@@ -98,7 +131,7 @@ void PacketQueue::put(AVPacket *pkt)
         this->last_pkt->next = pkt1.get();
     this->last_pkt = pkt1.release();
     this->nb_packets++;
-    this->size += pkt1->pkt.size;
+    this->size += this->last_pkt->pkt.size;
     this->cond.notify_one();
 }
 
@@ -383,7 +416,17 @@ class VideoThread
 public:
     VideoThread(VideoState* self)
         : mVideoState(self)
-        , mThread([this] { run(); })
+        , mThread([this]
+        {
+            try
+            {
+                run();
+            }
+            catch(std::exception& e)
+            {
+                std::cerr << "An error occurred playing the video: " << e.what () << std::endl;
+            }
+        })
     {
     }
 
@@ -395,60 +438,46 @@ public:
     void run()
     {
         VideoState* self = mVideoState;
-        AVPacket pkt1, *packet = &pkt1;
-        av_init_packet(packet);
-        AVFrame *pFrame;
+        PacketGuard packet;
+        std::unique_ptr<AVFrame, VideoPicture::AVFrameDeleter> pFrame{av_frame_alloc()};
 
-        pFrame = av_frame_alloc();
-
-        try
+        while(self->videoq.get(*packet, self) >= 0)
         {
-            while(self->videoq.get(packet, self) >= 0)
+            if(packet->data == flush_pkt.data)
             {
-                if(packet->data == flush_pkt.data)
-                {
-                    avcodec_flush_buffers(self->video_ctx);
+                avcodec_flush_buffers(self->video_ctx);
 
-                    self->pictq_mutex.lock();
-                    self->pictq_size = 0;
-                    self->pictq_rindex = 0;
-                    self->pictq_windex = 0;
-                    self->pictq_mutex.unlock();
+                self->pictq_mutex.lock();
+                self->pictq_size = 0;
+                self->pictq_rindex = 0;
+                self->pictq_windex = 0;
+                self->pictq_mutex.unlock();
 
-                    self->frame_last_pts = packet->pts * av_q2d((*self->video_st)->time_base);
-                    continue;
-                }
+                self->frame_last_pts = packet->pts * av_q2d((*self->video_st)->time_base);
+                continue;
+            }
 
-                // Decode video frame
-                int ret = avcodec_send_packet(self->video_ctx, packet);
-                // EAGAIN is not expected
-                if (ret < 0)
-                    throw std::runtime_error("Error decoding video frame");
+            // Decode video frame
+            int ret = avcodec_send_packet(self->video_ctx, *packet);
+            // EAGAIN is not expected
+            if (ret < 0)
+                throw std::runtime_error("Error decoding video frame");
 
-                while (!ret)
+            while (!ret)
+            {
+                ret = avcodec_receive_frame(self->video_ctx, pFrame.get());
+                if (!ret)
                 {
-                    ret = avcodec_receive_frame(self->video_ctx, pFrame);
-                    if (!ret)
-                    {
-                        double pts = pFrame->best_effort_timestamp;
-                        pts *= av_q2d((*self->video_st)->time_base);
+                    double pts = pFrame->best_effort_timestamp;
+                    pts *= av_q2d((*self->video_st)->time_base);
 
-                        pts = self->synchronize_video(pFrame, pts);
+                    pts = self->synchronize_video(pFrame.get(), pts);
 
-                        if(self->queue_picture(pFrame, pts) < 0)
-                            break;
-                    }
+                    if(self->queue_picture(pFrame.get(), pts) < 0)
+                        break;
                 }
             }
         }
-        catch(std::exception& e)
-        {
-            std::cerr << "An error occurred playing the video: " << e.what () << std::endl;
-        }
-
-        av_packet_unref(packet);
-
-        av_frame_free(&pFrame);
     }
 
 private:
@@ -475,8 +504,7 @@ public:
         VideoState* self = mVideoState;
 
         AVFormatContext *pFormatCtx = self->format_ctx;
-        AVPacket pkt1, *packet = &pkt1;
-        av_init_packet(packet);
+        PacketGuard packet;
 
         try
         {
@@ -559,7 +587,7 @@ public:
                     continue;
                 }
 
-                if(av_read_frame(pFormatCtx, packet) < 0)
+                if(av_read_frame(pFormatCtx, *packet) < 0)
                 {
                     if (self->audioq.nb_packets == 0 && self->videoq.nb_packets == 0 && self->pictq_size == 0)
                         self->mVideoEnded = true;
@@ -570,11 +598,9 @@ public:
 
                 // Is this a packet from the video stream?
                 if(self->video_st && packet->stream_index == self->video_st-pFormatCtx->streams)
-                    self->videoq.put(packet);
+                    self->videoq.put(packet.release());
                 else if(self->audio_st && packet->stream_index == self->audio_st-pFormatCtx->streams)
-                    self->audioq.put(packet);
-                else
-                    av_packet_unref(packet);
+                    self->audioq.put(packet.release());
             }
         }
         catch(std::exception& e) {

From ed118537a8a46f651913305b38772e47311e3fe0 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 13 May 2021 14:02:36 +0200
Subject: [PATCH 0758/2859] use unique_ptr instead

---
 extern/osg-ffmpeg-videoplayer/videostate.cpp | 51 ++++++--------------
 1 file changed, 16 insertions(+), 35 deletions(-)

diff --git a/extern/osg-ffmpeg-videoplayer/videostate.cpp b/extern/osg-ffmpeg-videoplayer/videostate.cpp
index 7d5097ade3..cda965eddc 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.cpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.cpp
@@ -38,36 +38,11 @@ namespace
     const int MAX_AUDIOQ_SIZE = (5 * 16 * 1024);
     const int MAX_VIDEOQ_SIZE = (5 * 256 * 1024);
 
-    class PacketGuard
+    struct AVPacketUnref
     {
-        AVPacket mPacket;
-        bool mReleased;
-    public:
-        PacketGuard() : mReleased(false)
+        void operator()(AVPacket* packet) const
         {
-            av_init_packet(&mPacket);
-        }
-
-        AVPacket* operator->()
-        {
-            return &mPacket;
-        }
-
-        AVPacket* operator*()
-        {
-            return &mPacket;
-        }
-
-        AVPacket* release()
-        {
-            mReleased = true;
-            return &mPacket;
-        }
-
-        ~PacketGuard()
-        {
-            if(!mReleased)
-                av_packet_unref(&mPacket);
+            av_packet_unref(packet);
         }
     };
 }
@@ -438,10 +413,12 @@ public:
     void run()
     {
         VideoState* self = mVideoState;
-        PacketGuard packet;
+        AVPacket packetData;
+        av_init_packet(&packetData);
+        std::unique_ptr<AVPacket, AVPacketUnref> packet(&packetData, AVPacketUnref{});
         std::unique_ptr<AVFrame, VideoPicture::AVFrameDeleter> pFrame{av_frame_alloc()};
 
-        while(self->videoq.get(*packet, self) >= 0)
+        while(self->videoq.get(packet.get(), self) >= 0)
         {
             if(packet->data == flush_pkt.data)
             {
@@ -458,7 +435,7 @@ public:
             }
 
             // Decode video frame
-            int ret = avcodec_send_packet(self->video_ctx, *packet);
+            int ret = avcodec_send_packet(self->video_ctx, packet.get());
             // EAGAIN is not expected
             if (ret < 0)
                 throw std::runtime_error("Error decoding video frame");
@@ -504,7 +481,9 @@ public:
         VideoState* self = mVideoState;
 
         AVFormatContext *pFormatCtx = self->format_ctx;
-        PacketGuard packet;
+        AVPacket packetData;
+        av_init_packet(&packetData);
+        std::unique_ptr<AVPacket, AVPacketUnref> packet(&packetData, AVPacketUnref{});
 
         try
         {
@@ -587,7 +566,7 @@ public:
                     continue;
                 }
 
-                if(av_read_frame(pFormatCtx, *packet) < 0)
+                if(av_read_frame(pFormatCtx, packet.get()) < 0)
                 {
                     if (self->audioq.nb_packets == 0 && self->videoq.nb_packets == 0 && self->pictq_size == 0)
                         self->mVideoEnded = true;
@@ -598,9 +577,11 @@ public:
 
                 // Is this a packet from the video stream?
                 if(self->video_st && packet->stream_index == self->video_st-pFormatCtx->streams)
-                    self->videoq.put(packet.release());
+                    self->videoq.put(packet.get());
                 else if(self->audio_st && packet->stream_index == self->audio_st-pFormatCtx->streams)
-                    self->audioq.put(packet.release());
+                    self->audioq.put(packet.get());
+                else
+                    av_packet_unref(packet.get());
             }
         }
         catch(std::exception& e) {

From bcd8190516d3efb8bce0bfa49c25ce8f5d745379 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Thu, 13 May 2021 13:58:56 +0200
Subject: [PATCH 0759/2859] Fix a crash in aipackage.cpp

---
 components/esm/aipackage.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/components/esm/aipackage.cpp b/components/esm/aipackage.cpp
index abbd2c62cd..fa20d271c0 100644
--- a/components/esm/aipackage.cpp
+++ b/components/esm/aipackage.cpp
@@ -15,7 +15,12 @@ namespace ESM
     {
         AIPackage pack;
         if (esm.retSubName() == AI_CNDT) {
-            mList.back().mCellName = esm.getHString();
+            if (mList.empty()) 
+            {
+                esm.fail("AIPackge with an AI_CNDT applying to no cell.");
+            } else {
+                mList.back().mCellName = esm.getHString();
+            }
         } else if (esm.retSubName() == AI_Wander) {
             pack.mType = AI_Wander;
             esm.getHExact(&pack.mWander, 14);

From 69aaf6ab0491d99011c4f031641295bb5fa98195 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 13 May 2021 14:45:13 +0200
Subject: [PATCH 0760/2859] don't touch frame->data

---
 extern/osg-ffmpeg-videoplayer/videostate.cpp | 30 +++++++++++++-------
 extern/osg-ffmpeg-videoplayer/videostate.hpp |  4 +--
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/extern/osg-ffmpeg-videoplayer/videostate.cpp b/extern/osg-ffmpeg-videoplayer/videostate.cpp
index cda965eddc..99c1dc7ecc 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.cpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.cpp
@@ -45,6 +45,14 @@ namespace
             av_packet_unref(packet);
         }
     };
+
+    struct AVFrameFree
+    {
+        void operator()(AVFrame* frame) const
+        {
+            av_frame_free(&frame);
+        }
+    };
 }
 
 namespace Video
@@ -316,7 +324,7 @@ void VideoState::video_refresh()
 }
 
 
-int VideoState::queue_picture(AVFrame *pFrame, double pts)
+int VideoState::queue_picture(const AVFrame &pFrame, double pts)
 {
     VideoPicture *vp;
 
@@ -337,8 +345,8 @@ int VideoState::queue_picture(AVFrame *pFrame, double pts)
     // Convert the image into RGBA format
     // TODO: we could do this in a pixel shader instead, if the source format
     // matches a commonly used format (ie YUV420P)
-    const int w = pFrame->width;
-    const int h = pFrame->height;
+    const int w = pFrame.width;
+    const int h = pFrame.height;
     if(this->sws_context == nullptr || this->sws_context_w != w || this->sws_context_h != h)
     {
         if (this->sws_context != nullptr)
@@ -356,7 +364,7 @@ int VideoState::queue_picture(AVFrame *pFrame, double pts)
     if (vp->set_dimensions(w, h) < 0)
         return -1;
 
-    sws_scale(this->sws_context, pFrame->data, pFrame->linesize,
+    sws_scale(this->sws_context, pFrame.data, pFrame.linesize,
               0, this->video_ctx->height, vp->rgbaFrame->data, vp->rgbaFrame->linesize);
 
     // now we inform our display thread that we have a pic ready
@@ -366,7 +374,7 @@ int VideoState::queue_picture(AVFrame *pFrame, double pts)
     return 0;
 }
 
-double VideoState::synchronize_video(AVFrame *src_frame, double pts)
+double VideoState::synchronize_video(const AVFrame &src_frame, double pts)
 {
     double frame_delay;
 
@@ -380,7 +388,7 @@ double VideoState::synchronize_video(AVFrame *src_frame, double pts)
     frame_delay = av_q2d(this->video_ctx->pkt_timebase);
 
     /* if we are repeating a frame, adjust clock accordingly */
-    frame_delay += src_frame->repeat_pict * (frame_delay * 0.5);
+    frame_delay += src_frame.repeat_pict * (frame_delay * 0.5);
     this->video_clock += frame_delay;
 
     return pts;
@@ -415,8 +423,8 @@ public:
         VideoState* self = mVideoState;
         AVPacket packetData;
         av_init_packet(&packetData);
-        std::unique_ptr<AVPacket, AVPacketUnref> packet(&packetData, AVPacketUnref{});
-        std::unique_ptr<AVFrame, VideoPicture::AVFrameDeleter> pFrame{av_frame_alloc()};
+        std::unique_ptr<AVPacket, AVPacketUnref> packet(&packetData);
+        std::unique_ptr<AVFrame, AVFrameFree> pFrame{av_frame_alloc()};
 
         while(self->videoq.get(packet.get(), self) >= 0)
         {
@@ -448,9 +456,9 @@ public:
                     double pts = pFrame->best_effort_timestamp;
                     pts *= av_q2d((*self->video_st)->time_base);
 
-                    pts = self->synchronize_video(pFrame.get(), pts);
+                    pts = self->synchronize_video(*pFrame, pts);
 
-                    if(self->queue_picture(pFrame.get(), pts) < 0)
+                    if(self->queue_picture(*pFrame, pts) < 0)
                         break;
                 }
             }
@@ -483,7 +491,7 @@ public:
         AVFormatContext *pFormatCtx = self->format_ctx;
         AVPacket packetData;
         av_init_packet(&packetData);
-        std::unique_ptr<AVPacket, AVPacketUnref> packet(&packetData, AVPacketUnref{});
+        std::unique_ptr<AVPacket, AVPacketUnref> packet(&packetData);
 
         try
         {
diff --git a/extern/osg-ffmpeg-videoplayer/videostate.hpp b/extern/osg-ffmpeg-videoplayer/videostate.hpp
index 015656084f..8f7f1cadd3 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.hpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.hpp
@@ -132,8 +132,8 @@ struct VideoState {
     void video_display(VideoPicture* vp);
     void video_refresh();
 
-    int queue_picture(AVFrame *pFrame, double pts);
-    double synchronize_video(AVFrame *src_frame, double pts);
+    int queue_picture(const AVFrame &pFrame, double pts);
+    double synchronize_video(const AVFrame &src_frame, double pts);
 
     double get_audio_clock();
     double get_video_clock();

From f81be5b4639b6b17d7c8874addd8a7fdb9206663 Mon Sep 17 00:00:00 2001
From: CedricMocquillon <cedric.mocquillon@sage.com>
Date: Thu, 13 May 2021 19:59:28 +0200
Subject: [PATCH 0761/2859] Replace land static container from vector to
 flat_set

I use a ordered container to fix the "is there any other way to speed this up?".
The flat_set allow to have the same locality when searching an element.
I use the is_transparent C++14 feature to avoid to create a dummy Land when searching
I use a unique_ptr to avoid to manualy manage the memory
---
 apps/openmw/mwworld/store.cpp | 48 +++--------------------------------
 apps/openmw/mwworld/store.hpp | 34 ++++++++++++++++++++++---
 2 files changed, 34 insertions(+), 48 deletions(-)

diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index fb66b0a1d7..d2c4725117 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -11,25 +11,6 @@
 #include <iterator>
 #include <stdexcept>
 
-namespace
-{
-    struct Compare
-    {
-        bool operator()(const ESM::Land *x, const ESM::Land *y) {
-            if (x->mX == y->mX) {
-                return x->mY < y->mY;
-            }
-            return x->mX < y->mX;
-        }
-        bool operator()(const ESM::Land *x, const std::pair<int, int>& y) {
-            if (x->mX == y.first) {
-                return x->mY < y.second;
-            }
-            return x->mX < y.first;
-        }
-    };
-}
-
 namespace MWWorld
 {
     RecordId::RecordId(const std::string &id, bool isDeleted)
@@ -425,11 +406,6 @@ namespace MWWorld
     //=========================================================================
     Store<ESM::Land>::~Store()
     {
-        for (const ESM::Land* staticLand : mStatic)
-        {
-            delete staticLand;
-        }
-
     }
     size_t Store<ESM::Land>::getSize() const
     {
@@ -446,12 +422,8 @@ namespace MWWorld
     const ESM::Land *Store<ESM::Land>::search(int x, int y) const
     {
         std::pair<int, int> comp(x,y);
-
-        std::vector<ESM::Land *>::const_iterator it =
-            std::lower_bound(mStatic.begin(), mStatic.end(), comp, Compare());
-
-        if (it != mStatic.end() && (*it)->mX == x && (*it)->mY == y) {
-            return *it;
+        if (auto it = mStatic.find(comp); it != mStatic.end() && (*it)->mX == x && (*it)->mY == y) {
+            return it->get();
         }
         return nullptr;
     }
@@ -467,24 +439,13 @@ namespace MWWorld
     }
     RecordId Store<ESM::Land>::load(ESM::ESMReader &esm)
     {
-        ESM::Land *ptr = new ESM::Land();
+        auto ptr = std::make_unique<ESM::Land>();
         bool isDeleted = false;
 
         ptr->load(esm, isDeleted);
 
         // Same area defined in multiple plugins? -> last plugin wins
-        // Can't use search() because we aren't sorted yet - is there any other way to speed this up?
-        for (std::vector<ESM::Land*>::iterator it = mStatic.begin(); it != mStatic.end(); ++it)
-        {
-            if ((*it)->mX == ptr->mX && (*it)->mY == ptr->mY)
-            {
-                delete *it;
-                mStatic.erase(it);
-                break;
-            }
-        }
-
-        mStatic.push_back(ptr);
+        mStatic.insert(std::move(ptr));
 
         return RecordId("", isDeleted);
     }
@@ -494,7 +455,6 @@ namespace MWWorld
         if (mBuilt)
             return;
 
-        std::sort(mStatic.begin(), mStatic.end(), Compare());
         mBuilt = true;
     }
 
diff --git a/apps/openmw/mwworld/store.hpp b/apps/openmw/mwworld/store.hpp
index e37152431e..d65422516a 100644
--- a/apps/openmw/mwworld/store.hpp
+++ b/apps/openmw/mwworld/store.hpp
@@ -3,7 +3,9 @@
 
 #include <string>
 #include <vector>
+#include <memory>
 #include <map>
+#include <boost/container/flat_set.hpp>
 
 #include "recordcmp.hpp"
 
@@ -74,10 +76,10 @@ namespace MWWorld
         const T *find(int index) const;
     };
 
-    template <class T>
+    template <class T, class Container=std::vector<T*>>
     class SharedIterator
     {
-        typedef typename std::vector<T *>::const_iterator Iter;
+        typedef typename Container::const_iterator Iter;
 
         Iter mIter;
 
@@ -233,10 +235,34 @@ namespace MWWorld
     template <>
     class Store<ESM::Land> : public StoreBase
     {
-        std::vector<ESM::Land *> mStatic;
+        struct SpatialComparator
+        {
+            using is_transparent = void;
+
+            bool operator()(const std::unique_ptr<ESM::Land>& x, const std::unique_ptr<ESM::Land>& y) const {
+                if (x->mX == y->mX) {
+                    return x->mY < y->mY;
+                }
+                return x->mX < y->mX;
+            }
+            bool operator()(const std::unique_ptr<ESM::Land>& x, const std::pair<int, int>& y) const {
+                if (x->mX == y.first) {
+                    return x->mY < y.second;
+                }
+                return x->mX < y.first;
+            }
+            bool operator()(const std::pair<int, int>& x, const std::unique_ptr<ESM::Land>& y) const {
+                if (x.first == y->mX) {
+                    return x.second < y->mY;
+                }
+                return x.first < y->mX;
+            }
+        };
+        using Statics = boost::container::flat_set<std::unique_ptr<ESM::Land>, SpatialComparator>;
+        Statics mStatic;
 
     public:
-        typedef SharedIterator<ESM::Land> iterator;
+        typedef SharedIterator<ESM::Land, Statics> iterator;
 
         virtual ~Store();
 

From ccaa581f39ec0bc075198ce2b3b1311c255dda64 Mon Sep 17 00:00:00 2001
From: CedricMocquillon <cedric.mocquillon@sage.com>
Date: Thu, 13 May 2021 22:29:52 +0200
Subject: [PATCH 0762/2859] According to the comment, an interior cell must
 have (0,0) but as there is an exterior cell with these coordinates it is not
 sufficient but it is necessary so I added it

---
 apps/openmw/mwworld/store.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index fb66b0a1d7..edfc939b1b 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -913,7 +913,7 @@ namespace MWWorld
         // mX and mY will be (0,0) for interior cells, but there is also an exterior cell with the coordinates of (0,0), so that doesn't help.
         // Check whether mCell is an interior cell. This isn't perfect, will break if a Region with the same name as an interior cell is created.
         // A proper fix should be made for future versions of the file format.
-        bool interior = mCells->search(pathgrid.mCell) != nullptr;
+        bool interior = pathgrid.mData.mX == 0 && pathgrid.mData.mY == 0 && mCells->search(pathgrid.mCell) != nullptr;
 
         // Try to overwrite existing record
         if (interior)

From 1d362029ce43462a6b686a989979c39b08c94275 Mon Sep 17 00:00:00 2001
From: CedricMocquillon <cedric.mocquillon@sage.com>
Date: Thu, 13 May 2021 23:02:26 +0200
Subject: [PATCH 0763/2859] Do not copy full dialogue as we only want ot return
 its id

---
 apps/openmw/mwworld/store.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index fb66b0a1d7..4da683fc1b 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -1095,7 +1095,7 @@ namespace MWWorld
         else
         {
             found->second.loadData(esm, isDeleted);
-            dialogue = found->second;
+            dialogue.mId = found->second.mId;
         }
 
         return RecordId(dialogue.mId, isDeleted);

From bdfbf01772d424d971d4dcd37865615a048dda32 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Fri, 14 May 2021 00:05:00 +0100
Subject: [PATCH 0764/2859] Update extern Bullet to 3.17

Includes performance improvements that affect OpenMW:

* https://github.com/bulletphysics/bullet3/pull/3287
* https://github.com/bulletphysics/bullet3/pull/3293
---
 extern/CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 8257b6b23d..5dc9642d7c 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -44,11 +44,11 @@ if(NOT OPENMW_USE_SYSTEM_BULLET)
         set(USE_MSVC_RUNTIME_LIBRARY_DLL ON CACHE BOOL "" FORCE)
     endif()
 
-    # master on 12 Mar 2021
+    # May 7, 2021
     include(FetchContent)
     FetchContent_Declare(bullet
-        URL https://github.com/bulletphysics/bullet3/archive/87e668f6b2a883b4ef63db8a07c8e9283916e9d9.zip
-        URL_HASH MD5=9f13246439968494c2b595cf412d83c8
+        URL https://github.com/bulletphysics/bullet3/archive/refs/tags/3.17.tar.gz
+        URL_HASH MD5=7711bce9a49c289a08ecda34eaa0f32e
         SOURCE_DIR fetched/bullet
     )
     FetchContent_MakeAvailableExcludeFromAll(bullet)

From 06ae26037fd09edd7023f9035c8f4a34b8897af2 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Fri, 14 May 2021 10:57:31 +0200
Subject: [PATCH 0765/2859] Remove some superfluous includes in the opencs

---
 apps/opencs/model/doc/loader.cpp                    | 1 -
 apps/opencs/model/doc/operation.cpp                 | 1 -
 apps/opencs/model/world/refcollection.cpp           | 1 -
 apps/opencs/view/doc/viewmanager.cpp                | 1 -
 apps/opencs/view/render/orbitcameramode.cpp         | 1 -
 apps/opencs/view/render/pagedworldspacewidget.cpp   | 4 ----
 apps/opencs/view/render/pathgridmode.cpp            | 2 --
 apps/opencs/view/render/scenewidget.cpp             | 1 -
 apps/opencs/view/render/terrainshapemode.cpp        | 3 ---
 apps/opencs/view/render/terraintexturemode.cpp      | 6 ------
 apps/opencs/view/render/unpagedworldspacewidget.cpp | 1 -
 apps/opencs/view/render/worldspacewidget.cpp        | 1 -
 apps/opencs/view/widget/scenetoolshapebrush.cpp     | 5 -----
 apps/opencs/view/world/colordelegate.cpp            | 2 --
 apps/opencs/view/world/dialoguesubview.cpp          | 1 -
 apps/opencs/view/world/scenesubview.cpp             | 1 -
 apps/opencs/view/world/scriptsubview.cpp            | 1 -
 17 files changed, 33 deletions(-)

diff --git a/apps/opencs/model/doc/loader.cpp b/apps/opencs/model/doc/loader.cpp
index 69c78bd5e4..1c5a7348c8 100644
--- a/apps/opencs/model/doc/loader.cpp
+++ b/apps/opencs/model/doc/loader.cpp
@@ -5,7 +5,6 @@
 #include "../tools/reportmodel.hpp"
 
 #include "document.hpp"
-#include "state.hpp"
 
 CSMDoc::Loader::Stage::Stage() : mFile (0), mRecordsLoaded (0), mRecordsLeft (false) {}
 
diff --git a/apps/opencs/model/doc/operation.cpp b/apps/opencs/model/doc/operation.cpp
index 218e13e38e..369c6bb105 100644
--- a/apps/opencs/model/doc/operation.cpp
+++ b/apps/opencs/model/doc/operation.cpp
@@ -7,7 +7,6 @@
 
 #include "../world/universalid.hpp"
 
-#include "state.hpp"
 #include "stage.hpp"
 
 void CSMDoc::Operation::prepareStages()
diff --git a/apps/opencs/model/world/refcollection.cpp b/apps/opencs/model/world/refcollection.cpp
index 126a0ea789..51588cbc21 100644
--- a/apps/opencs/model/world/refcollection.cpp
+++ b/apps/opencs/model/world/refcollection.cpp
@@ -1,6 +1,5 @@
 #include "refcollection.hpp"
 
-#include <components/misc/stringops.hpp>
 #include <components/esm/loadcell.hpp>
 
 #include "ref.hpp"
diff --git a/apps/opencs/view/doc/viewmanager.cpp b/apps/opencs/view/doc/viewmanager.cpp
index 8cca3a849e..95f9f606da 100644
--- a/apps/opencs/view/doc/viewmanager.cpp
+++ b/apps/opencs/view/doc/viewmanager.cpp
@@ -11,7 +11,6 @@
 #include "../../model/doc/documentmanager.hpp"
 #include "../../model/doc/document.hpp"
 #include "../../model/world/columns.hpp"
-#include "../../model/world/universalid.hpp"
 #include "../../model/world/idcompletionmanager.hpp"
 
 #include "../../model/prefs/state.hpp"
diff --git a/apps/opencs/view/render/orbitcameramode.cpp b/apps/opencs/view/render/orbitcameramode.cpp
index 79ac0167ab..c81402ed1e 100644
--- a/apps/opencs/view/render/orbitcameramode.cpp
+++ b/apps/opencs/view/render/orbitcameramode.cpp
@@ -3,7 +3,6 @@
 #include <QMenu>
 
 #include "../../model/prefs/shortcut.hpp"
-#include "../../model/prefs/shortcuteventhandler.hpp"
 
 #include "worldspacewidget.hpp"
 
diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index ed35584226..a0b4de979d 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -7,18 +7,14 @@
 #include <QMouseEvent>
 #include <QApplication>
 
-#include <components/esm/loadland.hpp>
-
 #include <components/misc/constants.hpp>
 
 #include "../../model/prefs/shortcut.hpp"
 
-#include "../../model/world/tablemimedata.hpp"
 #include "../../model/world/idtable.hpp"
 
 #include "../widget/scenetooltoggle2.hpp"
 #include "../widget/scenetoolmode.hpp"
-#include "../widget/scenetooltoggle2.hpp"
 
 #include "editmode.hpp"
 #include "mask.hpp"
diff --git a/apps/opencs/view/render/pathgridmode.cpp b/apps/opencs/view/render/pathgridmode.cpp
index 7a3fc8ecf7..193cb664db 100644
--- a/apps/opencs/view/render/pathgridmode.cpp
+++ b/apps/opencs/view/render/pathgridmode.cpp
@@ -9,8 +9,6 @@
 
 #include "../../model/world/commands.hpp"
 #include "../../model/world/commandmacro.hpp"
-#include "../../model/world/idtable.hpp"
-#include "../../model/world/idtree.hpp"
 
 #include "../widget/scenetoolbar.hpp"
 
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index 5340939963..dbed1ba97c 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -25,7 +25,6 @@
 
 #include "../../model/prefs/state.hpp"
 #include "../../model/prefs/shortcut.hpp"
-#include "../../model/prefs/shortcuteventhandler.hpp"
 
 #include "lighting.hpp"
 #include "mask.hpp"
diff --git a/apps/opencs/view/render/terrainshapemode.cpp b/apps/opencs/view/render/terrainshapemode.cpp
index e495d23555..1739e143d0 100644
--- a/apps/opencs/view/render/terrainshapemode.cpp
+++ b/apps/opencs/view/render/terrainshapemode.cpp
@@ -25,14 +25,11 @@
 
 #include "../../model/doc/document.hpp"
 #include "../../model/prefs/state.hpp"
-#include "../../model/world/columnbase.hpp"
-#include "../../model/world/commandmacro.hpp"
 #include "../../model/world/commands.hpp"
 #include "../../model/world/data.hpp"
 #include "../../model/world/idtable.hpp"
 #include "../../model/world/idtree.hpp"
 #include "../../model/world/land.hpp"
-#include "../../model/world/resourcetable.hpp"
 #include "../../model/world/tablemimedata.hpp"
 #include "../../model/world/universalid.hpp"
 
diff --git a/apps/opencs/view/render/terraintexturemode.cpp b/apps/opencs/view/render/terraintexturemode.cpp
index fa46cf6730..2c7d3529fb 100644
--- a/apps/opencs/view/render/terraintexturemode.cpp
+++ b/apps/opencs/view/render/terraintexturemode.cpp
@@ -12,23 +12,17 @@
 
 #include <osg/Group>
 
-#include <components/esm/loadland.hpp>
-
 #include "../widget/modebutton.hpp"
 #include "../widget/scenetoolbar.hpp"
 #include "../widget/scenetooltexturebrush.hpp"
 
 #include "../../model/doc/document.hpp"
 #include "../../model/prefs/state.hpp"
-#include "../../model/world/columnbase.hpp"
-#include "../../model/world/commandmacro.hpp"
 #include "../../model/world/commands.hpp"
 #include "../../model/world/data.hpp"
 #include "../../model/world/idtable.hpp"
 #include "../../model/world/idtree.hpp"
-#include "../../model/world/land.hpp"
 #include "../../model/world/landtexture.hpp"
-#include "../../model/world/resourcetable.hpp"
 #include "../../model/world/tablemimedata.hpp"
 #include "../../model/world/universalid.hpp"
 #include "../widget/brushshapes.hpp"
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.cpp b/apps/opencs/view/render/unpagedworldspacewidget.cpp
index c4fef45dd7..20dc5b8d1e 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.cpp
@@ -12,7 +12,6 @@
 #include "../../model/world/idtable.hpp"
 #include "../../model/world/tablemimedata.hpp"
 
-#include "../widget/scenetooltoggle.hpp"
 #include "../widget/scenetooltoggle2.hpp"
 
 #include "cameracontroller.hpp"
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index 6eb437daf3..723ffcb6a2 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -17,7 +17,6 @@
 #include "../../model/world/idtable.hpp"
 
 #include "../../model/prefs/shortcut.hpp"
-#include "../../model/prefs/shortcuteventhandler.hpp"
 #include "../../model/prefs/state.hpp"
 
 #include "../render/orbitcameramode.hpp"
diff --git a/apps/opencs/view/widget/scenetoolshapebrush.cpp b/apps/opencs/view/widget/scenetoolshapebrush.cpp
index 4b2d20004b..d0419a13ad 100644
--- a/apps/opencs/view/widget/scenetoolshapebrush.cpp
+++ b/apps/opencs/view/widget/scenetoolshapebrush.cpp
@@ -27,11 +27,6 @@
 #include "../../model/doc/document.hpp"
 #include "../../model/prefs/state.hpp"
 #include "../../model/world/commands.hpp"
-#include "../../model/world/data.hpp"
-#include "../../model/world/idcollection.hpp"
-#include "../../model/world/idtable.hpp"
-#include "../../model/world/landtexture.hpp"
-#include "../../model/world/universalid.hpp"
 
 
 CSVWidget::ShapeBrushSizeControls::ShapeBrushSizeControls(const QString &title, QWidget *parent)
diff --git a/apps/opencs/view/world/colordelegate.cpp b/apps/opencs/view/world/colordelegate.cpp
index 15a07b42cf..3b5f692fe2 100644
--- a/apps/opencs/view/world/colordelegate.cpp
+++ b/apps/opencs/view/world/colordelegate.cpp
@@ -3,8 +3,6 @@
 #include <QPainter>
 #include <QPushButton>
 
-#include "../widget/coloreditor.hpp"
-
 CSVWorld::ColorDelegate::ColorDelegate(CSMWorld::CommandDispatcher *dispatcher,
                                        CSMDoc::Document& document,
                                        QObject *parent)
diff --git a/apps/opencs/view/world/dialoguesubview.cpp b/apps/opencs/view/world/dialoguesubview.cpp
index 3d3b3cdbe1..f2360b1378 100644
--- a/apps/opencs/view/world/dialoguesubview.cpp
+++ b/apps/opencs/view/world/dialoguesubview.cpp
@@ -28,7 +28,6 @@
 #include "../../model/world/columns.hpp"
 #include "../../model/world/record.hpp"
 #include "../../model/world/tablemimedata.hpp"
-#include "../../model/world/idtree.hpp"
 #include "../../model/world/commands.hpp"
 #include "../../model/doc/document.hpp"
 
diff --git a/apps/opencs/view/world/scenesubview.cpp b/apps/opencs/view/world/scenesubview.cpp
index 44542c5297..58d159a178 100644
--- a/apps/opencs/view/world/scenesubview.cpp
+++ b/apps/opencs/view/world/scenesubview.cpp
@@ -15,7 +15,6 @@
 
 #include "../render/pagedworldspacewidget.hpp"
 #include "../render/unpagedworldspacewidget.hpp"
-#include "../render/editmode.hpp"
 
 #include "../widget/scenetoolbar.hpp"
 #include "../widget/scenetoolmode.hpp"
diff --git a/apps/opencs/view/world/scriptsubview.cpp b/apps/opencs/view/world/scriptsubview.cpp
index 096fc8a9e7..6eab7aaa53 100644
--- a/apps/opencs/view/world/scriptsubview.cpp
+++ b/apps/opencs/view/world/scriptsubview.cpp
@@ -12,7 +12,6 @@
 #include "../../model/doc/document.hpp"
 #include "../../model/world/universalid.hpp"
 #include "../../model/world/data.hpp"
-#include "../../model/world/columnbase.hpp"
 #include "../../model/world/commands.hpp"
 #include "../../model/world/idtable.hpp"
 #include "../../model/prefs/state.hpp"

From 4bbbbb00f659d261fc7ebf58d4aea3437075335f Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Fri, 14 May 2021 10:52:19 -0700
Subject: [PATCH 0766/2859] use particle data for particle system quota

---
 CHANGELOG.md                    | 1 +
 components/nifosg/nifloader.cpp | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 647a8fa569..7f22c4aa20 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -123,6 +123,7 @@
     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 #6028: Particle system controller values are incorrectly used
     Feature #390: 3rd person look "over the shoulder"
     Feature #832: OpenMW-CS: Handle deleted references
     Feature #1536: Show more information about level on menu
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index f7d6fd3ed5..ab25fd744d 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -954,13 +954,17 @@ namespace NifOsg
         }
 
         // Load the initial state of the particle system, i.e. the initial particles and their positions, velocity and colors.
-        void handleParticleInitialState(const Nif::Node* nifNode, osgParticle::ParticleSystem* partsys, const Nif::NiParticleSystemController* partctrl)
+        void handleParticleInitialState(const Nif::Node* nifNode, ParticleSystem* partsys, const Nif::NiParticleSystemController* partctrl)
         {
             auto particleNode = static_cast<const Nif::NiParticles*>(nifNode);
             if (particleNode->data.empty() || particleNode->data->recType != Nif::RC_NiParticlesData)
+            {
+                partsys->setQuota(partctrl->numParticles);
                 return;
+            }
 
             auto particledata = static_cast<const Nif::NiParticlesData*>(particleNode->data.getPtr());
+            partsys->setQuota(particledata->numParticles);
 
             osg::BoundingBox box;
 
@@ -1095,8 +1099,6 @@ namespace NifOsg
 
             handleParticleInitialState(nifNode, partsys, partctrl);
 
-            partsys->setQuota(partctrl->numParticles);
-
             partsys->getDefaultParticleTemplate().setSizeRange(osgParticle::rangef(partctrl->size, partctrl->size));
             partsys->getDefaultParticleTemplate().setColorRange(osgParticle::rangev4(osg::Vec4f(1.f,1.f,1.f,1.f), osg::Vec4f(1.f,1.f,1.f,1.f)));
             partsys->getDefaultParticleTemplate().setAlphaRange(osgParticle::rangef(1.f, 1.f));

From 28d5e5e8bed861d0bb1b16c3e5b3c619551d9bc5 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Fri, 14 May 2021 20:45:59 +0200
Subject: [PATCH 0767/2859] Remove some superfluous includes in
 components/detournavigator

---
 components/detournavigator/findrandompointaroundcircle.cpp | 1 -
 components/detournavigator/findsmoothpath.hpp              | 2 --
 components/detournavigator/makenavmesh.cpp                 | 1 -
 components/detournavigator/makenavmesh.hpp                 | 2 --
 components/detournavigator/navigatorimpl.cpp               | 2 --
 components/detournavigator/navmeshmanager.hpp              | 1 -
 components/detournavigator/raycast.cpp                     | 1 -
 components/detournavigator/recastmesh.hpp                  | 2 --
 components/detournavigator/recastmeshmanager.cpp           | 2 --
 9 files changed, 14 deletions(-)

diff --git a/components/detournavigator/findrandompointaroundcircle.cpp b/components/detournavigator/findrandompointaroundcircle.cpp
index 29d4e9da44..ed73dca61a 100644
--- a/components/detournavigator/findrandompointaroundcircle.cpp
+++ b/components/detournavigator/findrandompointaroundcircle.cpp
@@ -4,7 +4,6 @@
 
 #include <components/misc/rng.hpp>
 
-#include <DetourCommon.h>
 #include <DetourNavMesh.h>
 #include <DetourNavMeshQuery.h>
 
diff --git a/components/detournavigator/findsmoothpath.hpp b/components/detournavigator/findsmoothpath.hpp
index 29a3ce8050..0a9b5bed86 100644
--- a/components/detournavigator/findsmoothpath.hpp
+++ b/components/detournavigator/findsmoothpath.hpp
@@ -14,8 +14,6 @@
 #include <DetourNavMesh.h>
 #include <DetourNavMeshQuery.h>
 
-#include <LinearMath/btVector3.h>
-
 #include <components/misc/convert.hpp>
 
 #include <osg/Vec3f>
diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index 70fd44c6c0..bcfd1b22fd 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -1,6 +1,5 @@
 #include "makenavmesh.hpp"
 #include "debug.hpp"
-#include "dtstatus.hpp"
 #include "exceptions.hpp"
 #include "recastmesh.hpp"
 #include "settings.hpp"
diff --git a/components/detournavigator/makenavmesh.hpp b/components/detournavigator/makenavmesh.hpp
index f9cf68a736..95720634cd 100644
--- a/components/detournavigator/makenavmesh.hpp
+++ b/components/detournavigator/makenavmesh.hpp
@@ -2,10 +2,8 @@
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_MAKENAVMESH_H
 
 #include "offmeshconnectionsmanager.hpp"
-#include "settings.hpp"
 #include "navmeshcacheitem.hpp"
 #include "tileposition.hpp"
-#include "tilebounds.hpp"
 #include "sharednavmesh.hpp"
 #include "navmeshtilescache.hpp"
 
diff --git a/components/detournavigator/navigatorimpl.cpp b/components/detournavigator/navigatorimpl.cpp
index d1e75b864a..9ae9171a74 100644
--- a/components/detournavigator/navigatorimpl.cpp
+++ b/components/detournavigator/navigatorimpl.cpp
@@ -5,8 +5,6 @@
 #include <components/esm/loadpgrd.hpp>
 #include <components/misc/coordinateconverter.hpp>
 
-#include <Recast.h>
-
 namespace DetourNavigator
 {
     NavigatorImpl::NavigatorImpl(const Settings& settings)
diff --git a/components/detournavigator/navmeshmanager.hpp b/components/detournavigator/navmeshmanager.hpp
index ce90aafc5d..25e0b763b2 100644
--- a/components/detournavigator/navmeshmanager.hpp
+++ b/components/detournavigator/navmeshmanager.hpp
@@ -4,7 +4,6 @@
 #include "asyncnavmeshupdater.hpp"
 #include "cachedrecastmeshmanager.hpp"
 #include "offmeshconnectionsmanager.hpp"
-#include "sharednavmesh.hpp"
 #include "recastmeshtiles.hpp"
 
 #include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
diff --git a/components/detournavigator/raycast.cpp b/components/detournavigator/raycast.cpp
index 86fabe9c1f..271da22496 100644
--- a/components/detournavigator/raycast.cpp
+++ b/components/detournavigator/raycast.cpp
@@ -2,7 +2,6 @@
 #include "settings.hpp"
 #include "findsmoothpath.hpp"
 
-#include <DetourCommon.h>
 #include <DetourNavMesh.h>
 #include <DetourNavMeshQuery.h>
 
diff --git a/components/detournavigator/recastmesh.hpp b/components/detournavigator/recastmesh.hpp
index 1961d518d7..0e6bc49204 100644
--- a/components/detournavigator/recastmesh.hpp
+++ b/components/detournavigator/recastmesh.hpp
@@ -11,8 +11,6 @@
 #include <vector>
 #include <tuple>
 
-#include <osg/Vec3f>
-
 #include <LinearMath/btTransform.h>
 
 namespace DetourNavigator
diff --git a/components/detournavigator/recastmeshmanager.cpp b/components/detournavigator/recastmeshmanager.cpp
index 146038ae68..cdb9169d9e 100644
--- a/components/detournavigator/recastmeshmanager.cpp
+++ b/components/detournavigator/recastmeshmanager.cpp
@@ -1,7 +1,5 @@
 #include "recastmeshmanager.hpp"
 
-#include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
-
 namespace DetourNavigator
 {
     RecastMeshManager::RecastMeshManager(const Settings& settings, const TileBounds& bounds, std::size_t generation)

From d0ea9c482a9a489ae9b0b4dd93a0c0d1d73db4f6 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 14 May 2021 19:57:11 +0200
Subject: [PATCH 0768/2859] Reorder async navmesh updater jobs when player tile
 changes

When player tile changes distance to player that is part of jobs priority is
invalidated. So jobs are no longer in the right order. This can lead to
processing of farests tiles first.

Sort queue each time player tile is changed.
---
 .../detournavigator/asyncnavmeshupdater.cpp   | 38 ++++++++++++++-----
 .../detournavigator/asyncnavmeshupdater.hpp   |  7 ++--
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index ff51e39aad..3f7114b85c 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -88,13 +88,22 @@ namespace DetourNavigator
         const SharedNavMeshCacheItem& navMeshCacheItem, const TilePosition& playerTile,
         const std::map<TilePosition, ChangeType>& changedTiles)
     {
-        *mPlayerTile.lock() = playerTile;
+        bool playerTileChanged = false;
+        {
+            auto locked = mPlayerTile.lock();
+            playerTileChanged = *locked != playerTile;
+            *locked = playerTile;
+        }
 
-        if (changedTiles.empty())
+        if (!playerTileChanged && changedTiles.empty())
             return;
 
         const std::lock_guard<std::mutex> lock(mMutex);
 
+        if (playerTileChanged)
+            for (auto& job : mJobs)
+                job.mDistanceToPlayer = getManhattanDistance(job.mChangedTile, playerTile);
+
         for (const auto& changedTile : changedTiles)
         {
             if (mPushed[agentHalfExtents].insert(changedTile.first).second)
@@ -112,10 +121,21 @@ namespace DetourNavigator
                     ? mLastUpdates[job.mAgentHalfExtents][job.mChangedTile] + mSettings.get().mMinUpdateInterval
                     : std::chrono::steady_clock::time_point();
 
-                mJobs.push(std::move(job));
+                if (playerTileChanged)
+                {
+                    mJobs.push_back(std::move(job));
+                }
+                else
+                {
+                    const auto it = std::upper_bound(mJobs.begin(), mJobs.end(), job);
+                    mJobs.insert(it, std::move(job));
+                }
             }
         }
 
+        if (playerTileChanged)
+            std::sort(mJobs.begin(), mJobs.end());
+
         Log(Debug::Debug) << "Posted " << mJobs.size() << " navigator jobs";
 
         if (!mJobs.empty())
@@ -283,7 +303,7 @@ namespace DetourNavigator
         while (true)
         {
             const auto hasJob = [&] {
-                return (!mJobs.empty() && mJobs.top().mProcessTime <= std::chrono::steady_clock::now())
+                return (!mJobs.empty() && mJobs.front().mProcessTime <= std::chrono::steady_clock::now())
                     || !threadQueue.mJobs.empty();
             };
 
@@ -318,11 +338,11 @@ namespace DetourNavigator
     {
         const auto now = std::chrono::steady_clock::now();
 
-        if (jobs.top().mProcessTime > now)
+        if (jobs.front().mProcessTime > now)
             return {};
 
-        Job job = jobs.top();
-        jobs.pop();
+        Job job = jobs.front();
+        jobs.pop_front();
 
         if (changeLastUpdate && job.mChangeType == ChangeType::update)
             mLastUpdates[job.mAgentHalfExtents][job.mChangedTile] = now;
@@ -376,7 +396,7 @@ namespace DetourNavigator
         if (mPushed[job.mAgentHalfExtents].insert(job.mChangedTile).second)
         {
             ++job.mTryNumber;
-            mJobs.push(std::move(job));
+            mJobs.push_back(std::move(job));
             mHasJob.notify_all();
         }
     }
@@ -385,7 +405,7 @@ namespace DetourNavigator
     {
         if (queue.mPushed[job.mAgentHalfExtents].insert(job.mChangedTile).second)
         {
-            queue.mJobs.push(std::move(job));
+            queue.mJobs.push_back(std::move(job));
             mHasJob.notify_all();
         }
     }
diff --git a/components/detournavigator/asyncnavmeshupdater.hpp b/components/detournavigator/asyncnavmeshupdater.hpp
index c28d8f21db..fb95325191 100644
--- a/components/detournavigator/asyncnavmeshupdater.hpp
+++ b/components/detournavigator/asyncnavmeshupdater.hpp
@@ -14,9 +14,10 @@
 #include <condition_variable>
 #include <memory>
 #include <mutex>
-#include <queue>
+#include <deque>
 #include <set>
 #include <thread>
+#include <tuple>
 
 class dtNavMesh;
 
@@ -83,11 +84,11 @@ namespace DetourNavigator
 
             friend inline bool operator <(const Job& lhs, const Job& rhs)
             {
-                return lhs.getPriority() > rhs.getPriority();
+                return lhs.getPriority() < rhs.getPriority();
             }
         };
 
-        using Jobs = std::priority_queue<Job, std::deque<Job>>;
+        using Jobs = std::deque<Job>;
         using Pushed = std::map<osg::Vec3f, std::set<TilePosition>>;
 
         struct Queue

From 59f89d22f8e586c63be961b5606041e22c506ea7 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 14 May 2021 21:06:29 +0200
Subject: [PATCH 0769/2859] Apply min distance only for not present tiles

To avoid waiting when navmesh update is triggered by transformed object for
already present tiles.
---
 apps/openmw/mwworld/scene.cpp                 |  4 +-
 .../detournavigator/navigator.cpp             | 44 ++++++++---------
 .../detournavigator/asyncnavmeshupdater.cpp   | 49 +++++++++++++++----
 .../detournavigator/asyncnavmeshupdater.hpp   |  8 ++-
 components/detournavigator/navigator.hpp      |  6 ++-
 components/detournavigator/navigatorimpl.cpp  |  4 +-
 components/detournavigator/navigatorimpl.hpp  |  2 +-
 components/detournavigator/navigatorstub.hpp  |  2 +-
 components/detournavigator/navmeshmanager.cpp |  5 +-
 components/detournavigator/navmeshmanager.hpp |  3 +-
 .../detournavigator/waitconditiontype.hpp     | 13 +++++
 11 files changed, 95 insertions(+), 45 deletions(-)
 create mode 100644 components/detournavigator/waitconditiontype.hpp

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 23525dea8d..83e9805f6e 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -619,7 +619,7 @@ namespace MWWorld
         if (changeEvent)
             mCellChanged = true;
 
-        mNavigator.wait(*loadingListener);
+        mNavigator.wait(*loadingListener, DetourNavigator::WaitConditionType::requiredTilesPresent);
     }
 
     void Scene::testExteriorCells()
@@ -848,7 +848,7 @@ namespace MWWorld
 
         MWBase::Environment::get().getWindowManager()->changeCell(mCurrentCell);
 
-        mNavigator.wait(*loadingListener);
+        mNavigator.wait(*loadingListener, DetourNavigator::WaitConditionType::requiredTilesPresent);
     }
 
     void Scene::changeToExteriorCell (const ESM::Position& position, bool adjustPlayerPos, bool changeEvent)
diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index cb8ae41523..41671993da 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -127,7 +127,7 @@ namespace
         mNavigator->addAgent(mAgentHalfExtents);
         mNavigator->addObject(ObjectId(&shape), shape, btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait(mListener);
+        mNavigator->wait(mListener, WaitConditionType::requiredTilesPresent);
 
         EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
 
@@ -177,7 +177,7 @@ namespace
         mNavigator->addAgent(mAgentHalfExtents);
         mNavigator->addObject(ObjectId(&heightfieldShape), heightfieldShape, btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait(mListener);
+        mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
         EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
 
@@ -209,7 +209,7 @@ namespace
 
         mNavigator->addObject(ObjectId(&compoundShape), compoundShape, btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait(mListener);
+        mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
         mPath.clear();
         mOut = std::back_inserter(mPath);
@@ -262,7 +262,7 @@ namespace
         mNavigator->addObject(ObjectId(&heightfieldShape), heightfieldShape, btTransform::getIdentity());
         mNavigator->addObject(ObjectId(&compoundShape), compoundShape, btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait(mListener);
+        mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
         EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
 
@@ -296,7 +296,7 @@ namespace
 
         mNavigator->updateObject(ObjectId(&compoundShape), compoundShape, btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait(mListener);
+        mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
         mPath.clear();
         mOut = std::back_inserter(mPath);
@@ -355,7 +355,7 @@ namespace
         mNavigator->addObject(ObjectId(&shape), shape, btTransform::getIdentity());
         mNavigator->addObject(ObjectId(&shape2), shape2, btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait(mListener);
+        mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
         EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
 
@@ -411,7 +411,7 @@ namespace
         mNavigator->addAgent(mAgentHalfExtents);
         mNavigator->addObject(ObjectId(&shape), ObjectShapes {shape, &shapeAvoid}, btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait(mListener);
+        mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
         EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
 
@@ -459,7 +459,7 @@ namespace
         mNavigator->addWater(osg::Vec2i(0, 0), 128 * 4, 300, btTransform::getIdentity());
         mNavigator->addObject(ObjectId(&shape), shape, btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait(mListener);
+        mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
         mStart.x() = 0;
         mStart.z() = 300;
@@ -507,7 +507,7 @@ namespace
         mNavigator->addWater(osg::Vec2i(0, 0), 128 * 4, -25, btTransform::getIdentity());
         mNavigator->addObject(ObjectId(&shape), shape, btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait(mListener);
+        mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
         mStart.x() = 0;
         mEnd.x() = 0;
@@ -554,7 +554,7 @@ namespace
         mNavigator->addObject(ObjectId(&shape), shape, btTransform::getIdentity());
         mNavigator->addWater(osg::Vec2i(0, 0), std::numeric_limits<int>::max(), -25, btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait(mListener);
+        mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
         mStart.x() = 0;
         mEnd.x() = 0;
@@ -601,7 +601,7 @@ namespace
         mNavigator->addWater(osg::Vec2i(0, 0), 128 * 4, -25, btTransform::getIdentity());
         mNavigator->addObject(ObjectId(&shape), shape, btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait(mListener);
+        mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
         mStart.x() = 0;
         mEnd.x() = 0;
@@ -645,15 +645,15 @@ namespace
         mNavigator->addAgent(mAgentHalfExtents);
         mNavigator->addObject(ObjectId(&shape), shape, btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait(mListener);
+        mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
         mNavigator->removeObject(ObjectId(&shape));
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait(mListener);
+        mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
         mNavigator->addObject(ObjectId(&shape), shape, btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait(mListener);
+        mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
         EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
 
@@ -699,7 +699,7 @@ namespace
         mNavigator->addAgent(mAgentHalfExtents);
         mNavigator->addObject(ObjectId(&shape), shape, btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait(mListener);
+        mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
         Misc::Rng::init(42);
 
@@ -748,7 +748,7 @@ namespace
         }
 
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait(mListener);
+        mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
         EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
 
@@ -791,7 +791,7 @@ namespace
             mNavigator->addObject(ObjectId(&shapes[i]), shapes[i], transform);
         }
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait(mListener);
+        mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
         const auto start = std::chrono::steady_clock::now();
         for (std::size_t i = 0; i < shapes.size(); ++i)
@@ -800,7 +800,7 @@ namespace
             mNavigator->updateObject(ObjectId(&shapes[i]), shapes[i], transform);
         }
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait(mListener);
+        mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
         for (std::size_t i = 0; i < shapes.size(); ++i)
         {
@@ -808,7 +808,7 @@ namespace
             mNavigator->updateObject(ObjectId(&shapes[i]), shapes[i], transform);
         }
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait(mListener);
+        mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
         const auto duration = std::chrono::steady_clock::now() - start;
 
@@ -831,7 +831,7 @@ namespace
         mNavigator->addAgent(mAgentHalfExtents);
         mNavigator->addObject(ObjectId(&shape), shape, btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait(mListener);
+        mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
         const auto result = mNavigator->raycast(mAgentHalfExtents, mStart, mEnd, Flag_walk);
 
@@ -862,7 +862,7 @@ namespace
         mNavigator->addObject(ObjectId(&boderBoxShape), boderBoxShape,
                               btTransform(btMatrix3x3::getIdentity(), oscillatingBoxShapePosition + btVector3(0, 0, 200)));
         mNavigator->update(mPlayerPosition);
-        mNavigator->wait(mListener);
+        mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
         const auto navMeshes = mNavigator->getNavMeshes();
         ASSERT_EQ(navMeshes.size(), 1);
@@ -878,7 +878,7 @@ namespace
                                         oscillatingBoxShapePosition);
             mNavigator->updateObject(ObjectId(&oscillatingBoxShape), oscillatingBoxShape, transform);
             mNavigator->update(mPlayerPosition);
-            mNavigator->wait(mListener);
+            mNavigator->wait(mListener, WaitConditionType::allJobsDone);
         }
 
         ASSERT_EQ(navMeshes.size(), 1);
diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index 3f7114b85c..bee4510b42 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -10,7 +10,9 @@
 
 #include <osg/Stats>
 
+#include <algorithm>
 #include <numeric>
+#include <set>
 
 namespace
 {
@@ -23,12 +25,14 @@ namespace
     }
 
     int getMinDistanceTo(const TilePosition& position, int maxDistance,
-                         const std::map<osg::Vec3f, std::set<TilePosition>>& tilesPerHalfExtents)
+                         const std::map<osg::Vec3f, std::set<TilePosition>>& tilesPerHalfExtents,
+                         const std::set<std::tuple<osg::Vec3f, TilePosition>>& presentTiles)
     {
         int result = maxDistance;
         for (const auto& [halfExtents, tiles] : tilesPerHalfExtents)
             for (const TilePosition& tile : tiles)
-                result = std::min(result, getManhattanDistance(position, tile));
+                if (presentTiles.find(std::make_tuple(halfExtents, tile)) == presentTiles.end())
+                    result = std::min(result, getManhattanDistance(position, tile));
         return result;
     }
 }
@@ -142,7 +146,7 @@ namespace DetourNavigator
             mHasJob.notify_all();
     }
 
-    void AsyncNavMeshUpdater::wait(Loading::Listener& listener)
+    void AsyncNavMeshUpdater::wait(Loading::Listener& listener, WaitConditionType waitConditionType)
     {
         if (mSettings.get().mWaitUntilMinDistanceToPlayer == 0)
             return;
@@ -150,15 +154,26 @@ namespace DetourNavigator
         const std::size_t initialJobsLeft = getTotalJobs();
         std::size_t maxProgress = initialJobsLeft + mThreads.size();
         listener.setProgressRange(maxProgress);
-        const int minDistanceToPlayer = waitUntilJobsDone(initialJobsLeft, maxProgress, listener);
-        if (minDistanceToPlayer < mSettings.get().mWaitUntilMinDistanceToPlayer)
+        switch (waitConditionType)
         {
-            mProcessingTiles.wait(mProcessed, [] (const auto& v) { return v.empty(); });
-            listener.setProgress(maxProgress);
+            case WaitConditionType::requiredTilesPresent:
+            {
+                const int minDistanceToPlayer = waitUntilJobsDoneForNotPresentTiles(initialJobsLeft, maxProgress, listener);
+                if (minDistanceToPlayer < mSettings.get().mWaitUntilMinDistanceToPlayer)
+                {
+                    mProcessingTiles.wait(mProcessed, [] (const auto& v) { return v.empty(); });
+                    listener.setProgress(maxProgress);
+                }
+                break;
+            }
+            case WaitConditionType::allJobsDone:
+                waitUntilAllJobsDone();
+                listener.setProgress(maxProgress);
+                break;
         }
     }
 
-    int AsyncNavMeshUpdater::waitUntilJobsDone(const std::size_t initialJobsLeft, std::size_t& maxProgress, Loading::Listener& listener)
+    int AsyncNavMeshUpdater::waitUntilJobsDoneForNotPresentTiles(const std::size_t initialJobsLeft, std::size_t& maxProgress, Loading::Listener& listener)
     {
         std::size_t prevJobsLeft = initialJobsLeft;
         std::size_t jobsDone = 0;
@@ -174,9 +189,9 @@ namespace DetourNavigator
                 minDistanceToPlayer = 0;
                 return true;
             }
-            minDistanceToPlayer = getMinDistanceTo(playerPosition, maxDistanceToPlayer, mPushed);
+            minDistanceToPlayer = getMinDistanceTo(playerPosition, maxDistanceToPlayer, mPushed, mPresentTiles);
             for (const auto& [threadId, queue] : mThreadsQueues)
-                minDistanceToPlayer = getMinDistanceTo(playerPosition, minDistanceToPlayer, queue.mPushed);
+                minDistanceToPlayer = getMinDistanceTo(playerPosition, minDistanceToPlayer, queue.mPushed, mPresentTiles);
             return minDistanceToPlayer >= maxDistanceToPlayer;
         };
         std::unique_lock<std::mutex> lock(mMutex);
@@ -199,6 +214,15 @@ namespace DetourNavigator
         return minDistanceToPlayer;
     }
 
+    void AsyncNavMeshUpdater::waitUntilAllJobsDone()
+    {
+        {
+            std::unique_lock<std::mutex> lock(mMutex);
+            mDone.wait(lock, [this] { return mJobs.size() + getTotalThreadJobsUnsafe() == 0; });
+        }
+        mProcessingTiles.wait(mProcessed, [] (const auto& v) { return v.empty(); });
+    }
+
     void AsyncNavMeshUpdater::reportStats(unsigned int frameNumber, osg::Stats& stats) const
     {
         std::size_t jobs = 0;
@@ -273,6 +297,11 @@ namespace DetourNavigator
                 navMeshVersion);
         }
 
+        if (status == UpdateNavMeshStatus::removed || status == UpdateNavMeshStatus::lost)
+            mPresentTiles.erase(std::make_tuple(job.mAgentHalfExtents, job.mChangedTile));
+        else if (isSuccess(status) && status != UpdateNavMeshStatus::ignored)
+            mPresentTiles.insert(std::make_tuple(job.mAgentHalfExtents, job.mChangedTile));
+
         const auto finish = std::chrono::steady_clock::now();
 
         writeDebugFiles(job, recastMesh.get());
diff --git a/components/detournavigator/asyncnavmeshupdater.hpp b/components/detournavigator/asyncnavmeshupdater.hpp
index fb95325191..e8b2611e97 100644
--- a/components/detournavigator/asyncnavmeshupdater.hpp
+++ b/components/detournavigator/asyncnavmeshupdater.hpp
@@ -6,6 +6,7 @@
 #include "tilecachedrecastmeshmanager.hpp"
 #include "tileposition.hpp"
 #include "navmeshtilescache.hpp"
+#include "waitconditiontype.hpp"
 
 #include <osg/Vec3f>
 
@@ -61,7 +62,7 @@ namespace DetourNavigator
         void post(const osg::Vec3f& agentHalfExtents, const SharedNavMeshCacheItem& mNavMeshCacheItem,
             const TilePosition& playerTile, const std::map<TilePosition, ChangeType>& changedTiles);
 
-        void wait(Loading::Listener& listener);
+        void wait(Loading::Listener& listener, WaitConditionType waitConditionType);
 
         void reportStats(unsigned int frameNumber, osg::Stats& stats) const;
 
@@ -114,6 +115,7 @@ namespace DetourNavigator
         NavMeshTilesCache mNavMeshTilesCache;
         Misc::ScopeGuarded<std::map<osg::Vec3f, std::map<TilePosition, std::thread::id>>> mProcessingTiles;
         std::map<osg::Vec3f, std::map<TilePosition, std::chrono::steady_clock::time_point>> mLastUpdates;
+        std::set<std::tuple<osg::Vec3f, TilePosition>> mPresentTiles;
         std::map<std::thread::id, Queue> mThreadsQueues;
         std::vector<std::thread> mThreads;
 
@@ -143,7 +145,9 @@ namespace DetourNavigator
 
         void cleanupLastUpdates();
 
-        int waitUntilJobsDone(const std::size_t initialJobsLeft, std::size_t& maxJobsLeft, Loading::Listener& listener);
+        int waitUntilJobsDoneForNotPresentTiles(const std::size_t initialJobsLeft, std::size_t& maxJobsLeft, Loading::Listener& listener);
+
+        void waitUntilAllJobsDone();
     };
 }
 
diff --git a/components/detournavigator/navigator.hpp b/components/detournavigator/navigator.hpp
index 3ec5e5acc4..8cf4cb80e8 100644
--- a/components/detournavigator/navigator.hpp
+++ b/components/detournavigator/navigator.hpp
@@ -7,6 +7,7 @@
 #include "objectid.hpp"
 #include "navmeshcacheitem.hpp"
 #include "recastmeshtiles.hpp"
+#include "waitconditiontype.hpp"
 
 namespace ESM
 {
@@ -165,9 +166,10 @@ namespace DetourNavigator
         virtual void setUpdatesEnabled(bool enabled) = 0;
 
         /**
-         * @brief wait locks thread until all tiles are updated from last update call.
+         * @brief wait locks thread until tiles are updated from last update call based on passed condition type.
+         * @param waitConditionType defines when waiting will stop
          */
-        virtual void wait(Loading::Listener& listener) = 0;
+        virtual void wait(Loading::Listener& listener, WaitConditionType waitConditionType) = 0;
 
         /**
          * @brief findPath fills output iterator with points of scene surfaces to be used for actor to walk through.
diff --git a/components/detournavigator/navigatorimpl.cpp b/components/detournavigator/navigatorimpl.cpp
index d1e75b864a..1d02ba2660 100644
--- a/components/detournavigator/navigatorimpl.cpp
+++ b/components/detournavigator/navigatorimpl.cpp
@@ -153,9 +153,9 @@ namespace DetourNavigator
         mUpdatesEnabled = enabled;
     }
 
-    void NavigatorImpl::wait(Loading::Listener& listener)
+    void NavigatorImpl::wait(Loading::Listener& listener, WaitConditionType waitConditionType)
     {
-        mNavMeshManager.wait(listener);
+        mNavMeshManager.wait(listener, waitConditionType);
     }
 
     SharedNavMeshCacheItem NavigatorImpl::getNavMesh(const osg::Vec3f& agentHalfExtents) const
diff --git a/components/detournavigator/navigatorimpl.hpp b/components/detournavigator/navigatorimpl.hpp
index a53c9608de..3249462616 100644
--- a/components/detournavigator/navigatorimpl.hpp
+++ b/components/detournavigator/navigatorimpl.hpp
@@ -48,7 +48,7 @@ namespace DetourNavigator
 
         void setUpdatesEnabled(bool enabled) override;
 
-        void wait(Loading::Listener& listener) override;
+        void wait(Loading::Listener& listener, WaitConditionType waitConditionType) override;
 
         SharedNavMeshCacheItem getNavMesh(const osg::Vec3f& agentHalfExtents) const override;
 
diff --git a/components/detournavigator/navigatorstub.hpp b/components/detournavigator/navigatorstub.hpp
index c21db2bf8d..2c12c45eb5 100644
--- a/components/detournavigator/navigatorstub.hpp
+++ b/components/detournavigator/navigatorstub.hpp
@@ -73,7 +73,7 @@ namespace DetourNavigator
 
         void setUpdatesEnabled(bool /*enabled*/) override {}
 
-        void wait(Loading::Listener& /*listener*/) override {}
+        void wait(Loading::Listener& /*listener*/, WaitConditionType /*waitConditionType*/) override {}
 
         SharedNavMeshCacheItem getNavMesh(const osg::Vec3f& /*agentHalfExtents*/) const override
         {
diff --git a/components/detournavigator/navmeshmanager.cpp b/components/detournavigator/navmeshmanager.cpp
index 71a4def4f7..8f1aa86d44 100644
--- a/components/detournavigator/navmeshmanager.cpp
+++ b/components/detournavigator/navmeshmanager.cpp
@@ -5,6 +5,7 @@
 #include "makenavmesh.hpp"
 #include "navmeshcacheitem.hpp"
 #include "settings.hpp"
+#include "waitconditiontype.hpp"
 
 #include <components/debug/debuglog.hpp>
 
@@ -190,9 +191,9 @@ namespace DetourNavigator
             " recastMeshManagerRevision=" << lastRevision;
     }
 
-    void NavMeshManager::wait(Loading::Listener& listener)
+    void NavMeshManager::wait(Loading::Listener& listener, WaitConditionType waitConditionType)
     {
-        mAsyncNavMeshUpdater.wait(listener);
+        mAsyncNavMeshUpdater.wait(listener, waitConditionType);
     }
 
     SharedNavMeshCacheItem NavMeshManager::getNavMesh(const osg::Vec3f& agentHalfExtents) const
diff --git a/components/detournavigator/navmeshmanager.hpp b/components/detournavigator/navmeshmanager.hpp
index ce90aafc5d..a38e221a70 100644
--- a/components/detournavigator/navmeshmanager.hpp
+++ b/components/detournavigator/navmeshmanager.hpp
@@ -6,6 +6,7 @@
 #include "offmeshconnectionsmanager.hpp"
 #include "sharednavmesh.hpp"
 #include "recastmeshtiles.hpp"
+#include "waitconditiontype.hpp"
 
 #include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
 
@@ -45,7 +46,7 @@ namespace DetourNavigator
 
         void update(osg::Vec3f playerPosition, const osg::Vec3f& agentHalfExtents);
 
-        void wait(Loading::Listener& listener);
+        void wait(Loading::Listener& listener, WaitConditionType waitConditionType);
 
         SharedNavMeshCacheItem getNavMesh(const osg::Vec3f& agentHalfExtents) const;
 
diff --git a/components/detournavigator/waitconditiontype.hpp b/components/detournavigator/waitconditiontype.hpp
new file mode 100644
index 0000000000..06a5901287
--- /dev/null
+++ b/components/detournavigator/waitconditiontype.hpp
@@ -0,0 +1,13 @@
+#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_WAITCONDITIONTYPE_H
+#define OPENMW_COMPONENTS_DETOURNAVIGATOR_WAITCONDITIONTYPE_H
+
+namespace DetourNavigator
+{
+    enum class WaitConditionType
+    {
+        requiredTilesPresent,
+        allJobsDone,
+    };
+}
+
+#endif

From fb344d27e033da9b095d677f2cf5ae4b6f44d05a Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Fri, 14 May 2021 23:38:39 +0200
Subject: [PATCH 0770/2859] Use insert_or_assign() instead of hand rolled
 version.

---
 apps/openmw/mwworld/store.cpp | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index fb66b0a1d7..53ba3cfc24 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -58,10 +58,7 @@ namespace MWWorld
 
         record.load(esm, isDeleted);
 
-        // Try to overwrite existing record
-        std::pair<typename Static::iterator, bool> ret = mStatic.insert(std::make_pair(record.mIndex, record));
-        if (!ret.second)
-            ret.first->second = record;
+        mStatic.insert_or_assign(record.mIndex, record);
     }
     template<typename T>
     int IndexedStore<T>::getSize() const
@@ -181,11 +178,9 @@ namespace MWWorld
         record.load(esm, isDeleted);
         Misc::StringUtils::lowerCaseInPlace(record.mId);
 
-        std::pair<typename Static::iterator, bool> inserted = mStatic.insert(std::make_pair(record.mId, record));
+        std::pair<typename Static::iterator, bool> inserted = mStatic.insert_or_assign(record.mId, record);
         if (inserted.second)
             mShared.push_back(&inserted.first->second);
-        else
-            inserted.first->second = record;
 
         return RecordId(record.mId, isDeleted);
     }
@@ -235,28 +230,20 @@ namespace MWWorld
             if(it == mStatic.end())
                 return nullptr;
         }
-        std::pair<typename Dynamic::iterator, bool> result =
-            mDynamic.insert(std::pair<std::string, T>(id, item));
+        std::pair<typename Dynamic::iterator, bool> result = mDynamic.insert_or_assign(id, item);
         T *ptr = &result.first->second;
-        if (result.second) {
+        if (result.second)
             mShared.push_back(ptr);
-        } else {
-            *ptr = item;
-        }
         return ptr;
     }
     template<typename T>
     T *Store<T>::insertStatic(const T &item)
     {
         std::string id = Misc::StringUtils::lowerCase(item.mId);
-        std::pair<typename Static::iterator, bool> result =
-            mStatic.insert(std::pair<std::string, T>(id, item));
+        std::pair<typename Static::iterator, bool> result = mStatic.insert_or_assign(id, item);
         T *ptr = &result.first->second;
-        if (result.second) {
+        if (result.second)
             mShared.push_back(ptr);
-        } else {
-            *ptr = item;
-        }
         return ptr;
     }
     template<typename T>

From b63f53f5bb0ccd5b6a97e5eb1d4f7cf13d2dffab Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 15 May 2021 11:31:08 +0400
Subject: [PATCH 0771/2859] Disable shield animation when we launch a torch one
 (bug #6043)

---
 CHANGELOG.md                          | 1 +
 apps/openmw/mwmechanics/character.cpp | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f22c4aa20..271711c767 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -124,6 +124,7 @@
     Bug #6007: Crash when ending cutscene is playing
     Bug #6016: Greeting interrupts Fargoth's sneak-walk
     Bug #6028: Particle system controller values are incorrectly used
+    Bug #6043: Actor can have torch missing when torch animation is played
     Feature #390: 3rd person look "over the shoulder"
     Feature #832: OpenMW-CS: Handle deleted references
     Feature #1536: Show more information about level on menu
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 6758df9c4a..cb13305356 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -1876,8 +1876,10 @@ bool CharacterController::updateWeaponState(CharacterState& idle)
         MWWorld::ConstContainerStoreIterator torch = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
         if(torch != inv.end() && torch->getTypeName() == typeid(ESM::Light).name()
                 && updateCarriedLeftVisible(mWeaponType))
-
         {
+            if (mAnimation->isPlaying("shield"))
+                mAnimation->disable("shield");
+
             mAnimation->play("torch", Priority_Torch, MWRender::Animation::BlendMask_LeftArm,
                 false, 1.0f, "start", "stop", 0.0f, (~(size_t)0), true);
         }

From 5373cf1cd5e2899c7d9fd7976ec39fbf4e5efc95 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 15 May 2021 12:36:37 +0200
Subject: [PATCH 0772/2859] Replace raw pointer by observer_ptr to avoid
 dangling pointer dereferencing

When game exit is requests when initial loading screen is active LightManager
can be destructed in the main thread before LightManagerStateAttribute::apply
is completed by different thread. Given that it uses raw pointer at some point
it becomes dangling because object is destructed this leads to UB and eventual
SIGSEGV.
---
 components/sceneutil/lightmanager.cpp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index b5c7af780c..00c19dd402 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -731,7 +731,7 @@ namespace SceneUtil
 
         META_StateAttribute(NifOsg, LightManagerStateAttribute, osg::StateAttribute::LIGHT)
 
-        void initSharedLayout(osg::GLExtensions* ext, int handle) const
+        void initSharedLayout(osg::GLExtensions* ext, int handle, LightManager& lightManager) const
         {
             constexpr std::array<unsigned int, 1> index = { static_cast<unsigned int>(Shader::UBOBinding::LightBuffer) };
             int totalBlockSize = -1;
@@ -753,13 +753,17 @@ namespace SceneUtil
 
             for (int i = 0; i < 2; ++i)
             {
-                auto& buf = mLightManager->getLightBuffer(i);
+                auto& buf = lightManager.getLightBuffer(i);
                 buf->configureLayout(offsets[0], offsets[1], offsets[2], totalBlockSize, stride);
             }
         }
 
         void apply(osg::State& state) const override
         {
+            osg::ref_ptr<LightManager> lightManager;
+            if (!mLightManager.lock(lightManager))
+                return;
+
             if (!mInitLayout)
             {
                 mDummyProgram->apply(state);
@@ -772,12 +776,12 @@ namespace SceneUtil
                 // wait until the UBO binding is created
                 if (activeUniformBlocks > 0)
                 {
-                    initSharedLayout(ext, handle);
+                    initSharedLayout(ext, handle, *lightManager);
                     mInitLayout = true;
                 }
             }
-            mLightManager->getLightBuffer(state.getFrameStamp()->getFrameNumber())->uploadCachedSunPos(state.getInitialViewMatrix());
-            mLightManager->getLightBuffer(state.getFrameStamp()->getFrameNumber())->dirty();
+            lightManager->getLightBuffer(state.getFrameStamp()->getFrameNumber())->uploadCachedSunPos(state.getInitialViewMatrix());
+            lightManager->getLightBuffer(state.getFrameStamp()->getFrameNumber())->dirty();
         }
 
     private:
@@ -807,7 +811,7 @@ namespace SceneUtil
             return shader;
         }
 
-        LightManager* mLightManager;
+        osg::observer_ptr<LightManager> mLightManager;
         osg::ref_ptr<osg::Program> mDummyProgram;
         mutable bool mInitLayout;
     };

From 690d85d0e9ddeb1b881f5c259b92885f144f94cb Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sat, 15 May 2021 15:38:17 +0200
Subject: [PATCH 0773/2859] Don't use at() instead [] when length is
 checked/known

---
 apps/openmw/mwrender/objectpaging.cpp | 2 +-
 apps/openmw/mwworld/cellstore.cpp     | 4 ++--
 apps/openmw/mwworld/store.cpp         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index 4217c47141..c6b5681839 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -417,7 +417,7 @@ namespace MWRender
                 {
                     try
                     {
-                        unsigned int index = cell->mContextList.at(i).index;
+                        unsigned int index = cell->mContextList[i].index;
                         if (esm.size()<=index)
                             esm.resize(index+1);
                         cell->restore(esm[index], i);
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 73f69e2206..efe575a1d2 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -547,7 +547,7 @@ namespace MWWorld
             try
             {
                 // Reopen the ESM reader and seek to the right position.
-                int index = mCell->mContextList.at(i).index;
+                int index = mCell->mContextList[i].index;
                 mCell->restore (esm[index], i);
 
                 ESM::CellRef ref;
@@ -605,7 +605,7 @@ namespace MWWorld
             try
             {
                 // Reopen the ESM reader and seek to the right position.
-                int index = mCell->mContextList.at(i).index;
+                int index = mCell->mContextList[i].index;
                 mCell->restore (esm[index], i);
 
                 ESM::CellRef ref;
diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index 53ba3cfc24..e99b05a296 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -1003,7 +1003,7 @@ namespace MWWorld
         if (index >= mStatic.size()) {
             return nullptr;
         }
-        return &mStatic.at(index);
+        return &mStatic[index];
     }
 
     const ESM::Attribute *Store<ESM::Attribute>::find(size_t index) const

From 13f060623f894d092be07de3582d595a9ae32340 Mon Sep 17 00:00:00 2001
From: Ilya Zhuravlev <whatever@xyz.is>
Date: Sat, 15 May 2021 10:45:39 -0400
Subject: [PATCH 0774/2859] Fix out-of-bounds access in
 JournalBooks::createCyrillicJournalIndex

---
 apps/openmw/mwgui/journalbooks.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/journalbooks.cpp b/apps/openmw/mwgui/journalbooks.cpp
index 065a503e69..40053b3c8a 100644
--- a/apps/openmw/mwgui/journalbooks.cpp
+++ b/apps/openmw/mwgui/journalbooks.cpp
@@ -278,7 +278,7 @@ BookTypesetter::Ptr JournalBooks::createCyrillicJournalIndex ()
         mIndexPagesCount = 2;
     }
 
-    unsigned char ch[2] = {0xd0, 0x90}; // CYRILLIC CAPITAL A is a 0xd090 in UTF-8
+    unsigned char ch[3] = {0xd0, 0x90, 0x00}; // CYRILLIC CAPITAL A is a 0xd090 in UTF-8
 
     for (int i = 0; i < 32; ++i)
     {

From b717103fe0ea8cbdce3b64504eb455cd6b65e02f Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 15 May 2021 19:56:14 +0400
Subject: [PATCH 0775/2859] Fix warning in assert - size_t can not be negative

---
 components/bsa/bsa_file.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/bsa/bsa_file.cpp b/components/bsa/bsa_file.cpp
index 158080ea36..3375882f52 100644
--- a/components/bsa/bsa_file.cpp
+++ b/components/bsa/bsa_file.cpp
@@ -240,7 +240,7 @@ int BSAFile::getIndex(const char *str) const
         return -1;
 
     size_t res = it->second;
-    assert(res >= 0 && res < mFiles.size());
+    assert(res < mFiles.size());
     return static_cast<int>(res);
 }
 

From f2188d25336a0721d874a9d1436dc2eb3ad60c6e Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 15 May 2021 02:29:50 +0200
Subject: [PATCH 0776/2859] Reduce temporary allocations on ESM loading

By moving objects instead of copying when possible.
---
 apps/opencs/model/world/refcollection.cpp |  8 +++++---
 apps/openmw/mwrender/groundcover.cpp      |  2 +-
 apps/openmw/mwrender/objectpaging.cpp     |  4 ++--
 apps/openmw/mwworld/cellstore.cpp         |  3 ++-
 apps/openmw/mwworld/esmstore.cpp          | 12 ++++++------
 apps/openmw/mwworld/store.cpp             |  4 ++--
 6 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/apps/opencs/model/world/refcollection.cpp b/apps/opencs/model/world/refcollection.cpp
index 51588cbc21..dfdb8e73bf 100644
--- a/apps/opencs/model/world/refcollection.cpp
+++ b/apps/opencs/model/world/refcollection.cpp
@@ -108,11 +108,13 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
 
             Record<CellRef> record;
             record.mState = base ? RecordBase::State_BaseOnly : RecordBase::State_ModifiedOnly;
-            (base ? record.mBase : record.mModified) = ref;
+            const ESM::RefNum refNum = ref.mRefNum;
+            std::string refId = ref.mId;
+            (base ? record.mBase : record.mModified) = std::move(ref);
 
             appendRecord (record);
 
-            cache.insert (std::make_pair (ref.mRefNum, ref.mId));
+            cache.emplace(refNum, std::move(refId));
         }
         else
         {
@@ -123,7 +125,7 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
 
             Record<CellRef> record = getRecord (index);
             record.mState = base ? RecordBase::State_BaseOnly : RecordBase::State_Modified;
-            (base ? record.mBase : record.mModified) = ref;
+            (base ? record.mBase : record.mModified) = std::move(ref);
 
             setRecord (index, record);
         }
diff --git a/apps/openmw/mwrender/groundcover.cpp b/apps/openmw/mwrender/groundcover.cpp
index fd22462539..63df3e2497 100644
--- a/apps/openmw/mwrender/groundcover.cpp
+++ b/apps/openmw/mwrender/groundcover.cpp
@@ -241,7 +241,7 @@ namespace MWRender
                         if (model.empty()) continue;
                         model = "meshes/" + model;
 
-                        instances[model].emplace_back(ref, model);
+                        instances[model].emplace_back(std::move(ref), std::move(model));
                     }
                 }
             }
diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index 4217c47141..05acb35d18 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -432,7 +432,7 @@ namespace MWRender
                             if (!typeFilter(type,size>=2)) continue;
                             if (deleted) { refs.erase(ref.mRefNum); continue; }
                             if (ref.mRefNum.fromGroundcoverFile()) continue;
-                            refs[ref.mRefNum] = ref;
+                            refs[ref.mRefNum] = std::move(ref);
                         }
                     }
                     catch (std::exception&)
@@ -448,7 +448,7 @@ namespace MWRender
                     if (deleted) { refs.erase(ref.mRefNum); continue; }
                     int type = store.findStatic(ref.mRefID);
                     if (!typeFilter(type,size>=2)) continue;
-                    refs[ref.mRefNum] = ref;
+                    refs[ref.mRefNum] = std::move(ref);
                 }
             }
         }
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 73f69e2206..813042f150 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -566,7 +566,8 @@ namespace MWWorld
                         continue;
                     }
 
-                    mIds.push_back (Misc::StringUtils::lowerCase (ref.mRefID));
+                    Misc::StringUtils::lowerCaseInPlace(ref.mRefID);
+                    mIds.push_back(std::move(ref.mRefID));
                 }
             }
             catch (std::exception& e)
diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index a69d74b052..8b2eeb2fc5 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -31,7 +31,7 @@ namespace
                 else if (std::find(cell.mMovedRefs.begin(), cell.mMovedRefs.end(), ref.mRefNum) == cell.mMovedRefs.end())
                 {
                     Misc::StringUtils::lowerCaseInPlace(ref.mRefID);
-                    refs[ref.mRefNum] = ref.mRefID;
+                    refs[ref.mRefNum] = std::move(ref.mRefID);
                 }
             }
         }
@@ -42,9 +42,9 @@ namespace
                 refs.erase(it.first.mRefNum);
             else
             {
-                ESM::CellRef ref = it.first;
-                Misc::StringUtils::lowerCaseInPlace(ref.mRefID);
-                refs[ref.mRefNum] = ref.mRefID;
+                std::string refId = it.first.mRefID;
+                Misc::StringUtils::lowerCaseInPlace(refId);
+                refs[it.first.mRefNum] = std::move(refId);
             }
         }
     }
@@ -254,8 +254,8 @@ void ESMStore::countRecords()
         readRefs(*it, refs, readers);
     for(auto it = mCells.extBegin(); it != mCells.extEnd(); it++)
         readRefs(*it, refs, readers);
-    for(const auto& pair : refs)
-        mRefCount[pair.second]++;
+    for(auto& pair : refs)
+        mRefCount[std::move(pair.second)]++;
 }
 
 int ESMStore::getRefCount(const std::string& id) const
diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index 53ba3cfc24..8e6596cd30 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -518,9 +518,9 @@ namespace MWWorld
             // But there may be duplicates here!
             ESM::CellRefTracker::iterator iter = std::find_if(cellAlt->mLeasedRefs.begin(), cellAlt->mLeasedRefs.end(), ESM::CellRefTrackerPredicate(ref.mRefNum));
             if (iter == cellAlt->mLeasedRefs.end())
-                cellAlt->mLeasedRefs.push_back(std::make_pair(ref, deleted));
+                cellAlt->mLeasedRefs.emplace_back(std::move(ref), deleted);
             else
-                *iter = std::make_pair(ref, deleted);
+                *iter = std::make_pair(std::move(ref), deleted);
         }
     }
     const ESM::Cell *Store<ESM::Cell>::search(const std::string &id) const

From 6248dc72cbaf079608619bf195783e42d3693b13 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 15 May 2021 03:43:26 +0200
Subject: [PATCH 0777/2859] Convert to lower case only when needed

---
 apps/openmw/mwrender/objectpaging.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index 05acb35d18..72ea70000c 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -426,8 +426,8 @@ namespace MWRender
                         bool deleted = false;
                         while(cell->getNextRef(esm[index], ref, deleted))
                         {
-                            Misc::StringUtils::lowerCaseInPlace(ref.mRefID);
                             if (std::find(cell->mMovedRefs.begin(), cell->mMovedRefs.end(), ref.mRefNum) != cell->mMovedRefs.end()) continue;
+                            Misc::StringUtils::lowerCaseInPlace(ref.mRefID);
                             int type = store.findStatic(ref.mRefID);
                             if (!typeFilter(type,size>=2)) continue;
                             if (deleted) { refs.erase(ref.mRefNum); continue; }
@@ -443,9 +443,9 @@ namespace MWRender
                 for (ESM::CellRefTracker::const_iterator it = cell->mLeasedRefs.begin(); it != cell->mLeasedRefs.end(); ++it)
                 {
                     ESM::CellRef ref = it->first;
-                    Misc::StringUtils::lowerCaseInPlace(ref.mRefID);
                     bool deleted = it->second;
                     if (deleted) { refs.erase(ref.mRefNum); continue; }
+                    Misc::StringUtils::lowerCaseInPlace(ref.mRefID);
                     int type = store.findStatic(ref.mRefID);
                     if (!typeFilter(type,size>=2)) continue;
                     refs[ref.mRefNum] = std::move(ref);

From 9938af2289d3cae5b4c476ea75c0c48a3b517b81 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 6 Apr 2021 23:58:57 +0200
Subject: [PATCH 0778/2859] Use unordered_map for ref count

Reduces ESMStore::countRecords time by 8%.
---
 apps/openmw/mwworld/esmstore.hpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/esmstore.hpp b/apps/openmw/mwworld/esmstore.hpp
index 26f497a527..608b5489ea 100644
--- a/apps/openmw/mwworld/esmstore.hpp
+++ b/apps/openmw/mwworld/esmstore.hpp
@@ -4,6 +4,7 @@
 #include <memory>
 #include <sstream>
 #include <stdexcept>
+#include <unordered_map>
 
 #include <components/esm/records.hpp>
 #include "store.hpp"
@@ -76,7 +77,7 @@ namespace MWWorld
         std::map<std::string, int> mIds;
         std::map<std::string, int> mStaticIds;
 
-        std::map<std::string, int> mRefCount;
+        std::unordered_map<std::string, int> mRefCount;
 
         std::map<int, StoreBase *> mStores;
 

From 1e2aae809516d7051c36f94863f51f603de38547 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 6 Apr 2021 23:59:58 +0200
Subject: [PATCH 0779/2859] Use stable sort+unique to collect RefIDs for
 ESMStore records counting

The idea is to avoid std::map lookup for each CellRef. Instead generate a
sequence of added and removed RefNums into a vector then order them by RefNum
using a stable sort that preserves relative order of elements with the same
RefNum. RefIDs are stored in a different vector to avoid std::string move ctor
calls when swapping elements while sorting. Reversed iteration over added and
removed RefNums for each unique RefNum is an equivalent to what map-based
algorithm produces. The main benefit from sorting a vector is a data locality
that means less cache misses for each access. Reduces ESMStore::countRecords
perf cycles by 25%.
---
 apps/openmw/mwworld/esmstore.cpp | 52 +++++++++++++++++++++++---------
 components/misc/algorithm.hpp    | 36 ++++++++++++++++++++++
 2 files changed, 73 insertions(+), 15 deletions(-)
 create mode 100644 components/misc/algorithm.hpp

diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index 8b2eeb2fc5..71ee2f5c3d 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -1,5 +1,6 @@
 #include "esmstore.hpp"
 
+#include <algorithm>
 #include <set>
 
 #include <boost/filesystem/operations.hpp>
@@ -8,12 +9,23 @@
 #include <components/loadinglistener/loadinglistener.hpp>
 #include <components/esm/esmreader.hpp>
 #include <components/esm/esmwriter.hpp>
+#include <components/misc/algorithm.hpp>
 
 #include "../mwmechanics/spelllist.hpp"
 
 namespace
 {
-    void readRefs(const ESM::Cell& cell, std::map<ESM::RefNum, std::string>& refs, std::vector<ESM::ESMReader>& readers)
+    struct Ref
+    {
+        ESM::RefNum mRefNum;
+        std::size_t mRefID;
+
+        Ref(ESM::RefNum refNum, std::size_t refID) : mRefNum(refNum), mRefID(refID) {}
+    };
+
+    constexpr std::size_t deletedRefID = std::numeric_limits<std::size_t>::max();
+
+    void readRefs(const ESM::Cell& cell, std::vector<Ref>& refs, std::vector<std::string>& refIDs, std::vector<ESM::ESMReader>& readers)
     {
         for (size_t i = 0; i < cell.mContextList.size(); i++)
         {
@@ -27,24 +39,22 @@ namespace
             while(cell.getNextRef(readers[index], ref, deleted))
             {
                 if(deleted)
-                    refs.erase(ref.mRefNum);
+                    refs.emplace_back(ref.mRefNum, deletedRefID);
                 else if (std::find(cell.mMovedRefs.begin(), cell.mMovedRefs.end(), ref.mRefNum) == cell.mMovedRefs.end())
                 {
-                    Misc::StringUtils::lowerCaseInPlace(ref.mRefID);
-                    refs[ref.mRefNum] = std::move(ref.mRefID);
+                    refs.emplace_back(ref.mRefNum, refIDs.size());
+                    refIDs.push_back(std::move(ref.mRefID));
                 }
             }
         }
-        for(const auto& it : cell.mLeasedRefs)
+        for(const auto& [value, deleted] : cell.mLeasedRefs)
         {
-            bool deleted = it.second;
             if(deleted)
-                refs.erase(it.first.mRefNum);
+                refs.emplace_back(value.mRefNum, deletedRefID);
             else
             {
-                std::string refId = it.first.mRefID;
-                Misc::StringUtils::lowerCaseInPlace(refId);
-                refs[it.first.mRefNum] = std::move(refId);
+                refs.emplace_back(value.mRefNum, refIDs.size());
+                refIDs.push_back(value.mRefID);
             }
         }
     }
@@ -248,14 +258,26 @@ void ESMStore::countRecords()
 {
     if(!mRefCount.empty())
         return;
-    std::map<ESM::RefNum, std::string> refs;
+    std::vector<Ref> refs;
+    std::vector<std::string> refIDs;
     std::vector<ESM::ESMReader> readers;
     for(auto it = mCells.intBegin(); it != mCells.intEnd(); it++)
-        readRefs(*it, refs, readers);
+        readRefs(*it, refs, refIDs, readers);
     for(auto it = mCells.extBegin(); it != mCells.extEnd(); it++)
-        readRefs(*it, refs, readers);
-    for(auto& pair : refs)
-        mRefCount[std::move(pair.second)]++;
+        readRefs(*it, refs, refIDs, readers);
+    const auto lessByRefNum = [] (const Ref& l, const Ref& r) { return l.mRefNum < r.mRefNum; };
+    std::stable_sort(refs.begin(), refs.end(), lessByRefNum);
+    const auto equalByRefNum = [] (const Ref& l, const Ref& r) { return l.mRefNum == r.mRefNum; };
+    const auto incrementRefCount = [&] (const Ref& value)
+    {
+        if (value.mRefID != deletedRefID)
+        {
+            std::string& refId = refIDs[value.mRefID];
+            Misc::StringUtils::lowerCaseInPlace(refId);
+            ++mRefCount[std::move(refId)];
+        }
+    };
+    Misc::forEachUnique(refs.rbegin(), refs.rend(), equalByRefNum, incrementRefCount);
 }
 
 int ESMStore::getRefCount(const std::string& id) const
diff --git a/components/misc/algorithm.hpp b/components/misc/algorithm.hpp
new file mode 100644
index 0000000000..4d70afa86c
--- /dev/null
+++ b/components/misc/algorithm.hpp
@@ -0,0 +1,36 @@
+#ifndef OPENMW_COMPONENTS_MISC_ALGORITHM_H
+#define OPENMW_COMPONENTS_MISC_ALGORITHM_H
+
+#include <iterator>
+#include <type_traits>
+
+namespace Misc
+{
+    template <typename Iterator, typename BinaryPredicate, typename Function>
+    inline Iterator forEachUnique(Iterator begin, Iterator end, BinaryPredicate predicate, Function function)
+    {
+        static_assert(
+            std::is_base_of_v<
+                std::forward_iterator_tag,
+                typename std::iterator_traits<Iterator>::iterator_category
+            >
+        );
+        if (begin == end)
+            return begin;
+        function(*begin);
+        auto last = begin;
+        ++begin;
+        while (begin != end)
+        {
+            if (!predicate(*begin, *last))
+            {
+                function(*begin);
+                last = begin;
+            }
+            ++begin;
+        }
+        return begin;
+    }
+}
+
+#endif

From c1e3869f25fa54d73f24a0973d27560c666ffd4d Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sat, 15 May 2021 19:49:15 +0200
Subject: [PATCH 0780/2859] Remove an unused struct

---
 apps/openmw/mwphysics/mtphysics.cpp | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 82214b6287..9b98e7e8f7 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -106,16 +106,6 @@ namespace
         return actorData.mPosition * interpolationFactor + actorData.mActorRaw->getPreviousPosition() * (1.f - interpolationFactor);
     }
 
-    struct WorldFrameData
-    {
-        WorldFrameData() : mIsInStorm(MWBase::Environment::get().getWorld()->isInStorm())
-                         , mStormDirection(MWBase::Environment::get().getWorld()->getStormDirection())
-        {}
-
-        bool mIsInStorm;
-        osg::Vec3f mStormDirection;
-    };
-
     namespace Config
     {
         /// @return either the number of thread as configured by the user, or 1 if Bullet doesn't support multithreading

From 7deb6a6ffd3e46a58441ac6fa94a538447e90ea5 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sat, 15 May 2021 19:50:01 +0200
Subject: [PATCH 0781/2859] Use const references when possible in for loops

No need for useless copies.
---
 apps/openmw/mwgui/dialogue.cpp        | 2 +-
 apps/openmw/mwmechanics/spelllist.cpp | 2 +-
 apps/openmw/mwrender/objectpaging.cpp | 4 ++--
 apps/openmw/mwworld/esmstore.cpp      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp
index 1f155bd474..0fda54ebab 100644
--- a/apps/openmw/mwgui/dialogue.cpp
+++ b/apps/openmw/mwgui/dialogue.cpp
@@ -306,7 +306,7 @@ namespace MWGui
         deleteLater();
         for (Link* link : mLinks)
             delete link;
-        for (auto link : mTopicLinks)
+        for (const auto& link : mTopicLinks)
             delete link.second;
         for (auto history : mHistoryContents)
             delete history;
diff --git a/apps/openmw/mwmechanics/spelllist.cpp b/apps/openmw/mwmechanics/spelllist.cpp
index 24a04788e1..9328d533e3 100644
--- a/apps/openmw/mwmechanics/spelllist.cpp
+++ b/apps/openmw/mwmechanics/spelllist.cpp
@@ -70,7 +70,7 @@ namespace MWMechanics
         auto& id = spell->mId;
         bool changed = withBaseRecord([&] (auto& spells)
         {
-            for(auto it : spells)
+            for(const auto& it : spells)
             {
                 if(Misc::StringUtils::ciEqual(id, it))
                     return false;
diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index 4217c47141..174c259596 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -743,7 +743,7 @@ namespace MWRender
         ccf.mCell = cell;
         mCache->call(ccf);
         if (ccf.mToClear.empty()) return false;
-        for (auto chunk : ccf.mToClear)
+        for (const auto& chunk : ccf.mToClear)
             mCache->removeFromObjectCache(chunk);
         return true;
     }
@@ -765,7 +765,7 @@ namespace MWRender
         ccf.mActiveGridOnly = true;
         mCache->call(ccf);
         if (ccf.mToClear.empty()) return false;
-        for (auto chunk : ccf.mToClear)
+        for (const auto& chunk : ccf.mToClear)
             mCache->removeFromObjectCache(chunk);
         return true;
     }
diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index a69d74b052..0ec6d8d73e 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -63,7 +63,7 @@ namespace
         // We will replace invalid entries by fixed ones
         std::vector<ESM::NPC> npcsToReplace;
 
-        for (auto npcIter : npcs)
+        for (const auto& npcIter : npcs)
         {
             ESM::NPC npc = npcIter.second;
             bool changed = false;

From 1cd15613a6af25bc629f91a32d8d92544833b937 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sat, 15 May 2021 22:14:08 +0200
Subject: [PATCH 0782/2859] Remove some useless headers in
 apps/openmw/mwmechanics

---
 apps/openmw/mwmechanics/aiavoiddoor.hpp    | 4 ----
 apps/openmw/mwmechanics/aipackage.hpp      | 1 -
 apps/openmw/mwmechanics/aisequence.cpp     | 2 --
 apps/openmw/mwmechanics/spelllist.hpp      | 2 --
 apps/openmw/mwmechanics/spells.hpp         | 1 -
 apps/openmw/mwmechanics/weaponpriority.hpp | 2 --
 6 files changed, 12 deletions(-)

diff --git a/apps/openmw/mwmechanics/aiavoiddoor.hpp b/apps/openmw/mwmechanics/aiavoiddoor.hpp
index 1781c5e4a8..183f429f3f 100644
--- a/apps/openmw/mwmechanics/aiavoiddoor.hpp
+++ b/apps/openmw/mwmechanics/aiavoiddoor.hpp
@@ -3,10 +3,6 @@
 
 #include "typedaipackage.hpp"
 
-#include <string>
-
-#include <components/esm/defs.hpp>
-
 #include "../mwworld/class.hpp"
 
 #include "pathfinding.hpp"
diff --git a/apps/openmw/mwmechanics/aipackage.hpp b/apps/openmw/mwmechanics/aipackage.hpp
index 81b09c8b9c..5ad73c2da6 100644
--- a/apps/openmw/mwmechanics/aipackage.hpp
+++ b/apps/openmw/mwmechanics/aipackage.hpp
@@ -3,7 +3,6 @@
 
 #include <memory>
 
-#include <components/esm/defs.hpp>
 #include <components/detournavigator/areatype.hpp>
 
 #include "pathfinding.hpp"
diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index 575a03434f..fada7761df 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -5,8 +5,6 @@
 #include <components/debug/debuglog.hpp>
 #include <components/esm/aisequence.hpp>
 
-#include "../mwbase/world.hpp"
-
 #include "aipackage.hpp"
 #include "aistate.hpp"
 #include "aiwander.hpp"
diff --git a/apps/openmw/mwmechanics/spelllist.hpp b/apps/openmw/mwmechanics/spelllist.hpp
index c95ee812b6..5920949d65 100644
--- a/apps/openmw/mwmechanics/spelllist.hpp
+++ b/apps/openmw/mwmechanics/spelllist.hpp
@@ -9,8 +9,6 @@
 
 #include <components/esm/loadspel.hpp>
 
-#include "magiceffects.hpp"
-
 namespace ESM
 {
     struct SpellState;
diff --git a/apps/openmw/mwmechanics/spells.hpp b/apps/openmw/mwmechanics/spells.hpp
index 0553397952..9737b72cd0 100644
--- a/apps/openmw/mwmechanics/spells.hpp
+++ b/apps/openmw/mwmechanics/spells.hpp
@@ -4,7 +4,6 @@
 #include <memory>
 #include <map>
 #include <string>
-#include <set>
 #include <vector>
 
 #include "../mwworld/timestamp.hpp"
diff --git a/apps/openmw/mwmechanics/weaponpriority.hpp b/apps/openmw/mwmechanics/weaponpriority.hpp
index 67de7b50fe..9dcef3e2e5 100644
--- a/apps/openmw/mwmechanics/weaponpriority.hpp
+++ b/apps/openmw/mwmechanics/weaponpriority.hpp
@@ -1,8 +1,6 @@
 #ifndef OPENMW_WEAPON_PRIORITY_H
 #define OPENMW_WEAPON_PRIORITY_H
 
-#include <components/esm/loadweap.hpp>
-
 #include "../mwworld/ptr.hpp"
 
 namespace MWMechanics

From 9522a64e7d674db5485d2adb846b85d55fce08ee Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sat, 15 May 2021 22:15:46 +0200
Subject: [PATCH 0783/2859] Remove some useless includes from apps/openmw/mwgui

---
 apps/openmw/mwgui/bookpage.hpp         | 1 -
 apps/openmw/mwgui/console.cpp          | 4 ++++
 apps/openmw/mwgui/console.hpp          | 4 ----
 apps/openmw/mwgui/itemview.cpp         | 2 --
 apps/openmw/mwgui/loadingscreen.hpp    | 1 -
 apps/openmw/mwgui/recharge.cpp         | 2 +-
 apps/openmw/mwgui/recharge.hpp         | 2 --
 apps/openmw/mwgui/repair.cpp           | 3 +--
 apps/openmw/mwgui/repair.hpp           | 2 --
 apps/openmw/mwgui/spellwindow.cpp      | 2 --
 apps/openmw/mwgui/waitdialog.cpp       | 2 --
 apps/openmw/mwgui/windowmanagerimp.cpp | 2 --
 12 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/apps/openmw/mwgui/bookpage.hpp b/apps/openmw/mwgui/bookpage.hpp
index f9fd930897..512a439929 100644
--- a/apps/openmw/mwgui/bookpage.hpp
+++ b/apps/openmw/mwgui/bookpage.hpp
@@ -10,7 +10,6 @@
 #include <stdint.h>
 
 #include <components/settings/settings.hpp>
-#include <components/widgets/widgets.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
diff --git a/apps/openmw/mwgui/console.cpp b/apps/openmw/mwgui/console.cpp
index d0d3b87a69..b9004fcdbb 100644
--- a/apps/openmw/mwgui/console.cpp
+++ b/apps/openmw/mwgui/console.cpp
@@ -9,6 +9,10 @@
 
 #include <components/compiler/exception.hpp>
 #include <components/compiler/extensions0.hpp>
+#include <components/compiler/lineparser.hpp>
+#include <components/compiler/scanner.hpp>
+#include <components/compiler/locals.hpp>
+#include <components/interpreter/interpreter.hpp>
 
 #include "../mwscript/extensions.hpp"
 
diff --git a/apps/openmw/mwgui/console.hpp b/apps/openmw/mwgui/console.hpp
index 52aa42f2af..2b8cecbc01 100644
--- a/apps/openmw/mwgui/console.hpp
+++ b/apps/openmw/mwgui/console.hpp
@@ -6,12 +6,8 @@
 #include <vector>
 
 #include <components/compiler/errorhandler.hpp>
-#include <components/compiler/lineparser.hpp>
-#include <components/compiler/scanner.hpp>
-#include <components/compiler/locals.hpp>
 #include <components/compiler/output.hpp>
 #include <components/compiler/extensions.hpp>
-#include <components/interpreter/interpreter.hpp>
 
 #include "../mwscript/compilercontext.hpp"
 #include "../mwscript/interpretercontext.hpp"
diff --git a/apps/openmw/mwgui/itemview.cpp b/apps/openmw/mwgui/itemview.cpp
index 94dcc77c5e..14f2c1dd9b 100644
--- a/apps/openmw/mwgui/itemview.cpp
+++ b/apps/openmw/mwgui/itemview.cpp
@@ -5,9 +5,7 @@
 #include <MyGUI_FactoryManager.h>
 #include <MyGUI_Gui.h>
 #include <MyGUI_ImageBox.h>
-#include <MyGUI_TextBox.h>
 #include <MyGUI_ScrollView.h>
-#include <MyGUI_Button.h>
 
 #include "../mwworld/class.hpp"
 
diff --git a/apps/openmw/mwgui/loadingscreen.hpp b/apps/openmw/mwgui/loadingscreen.hpp
index e1c652386d..ac911ab60b 100644
--- a/apps/openmw/mwgui/loadingscreen.hpp
+++ b/apps/openmw/mwgui/loadingscreen.hpp
@@ -3,7 +3,6 @@
 
 #include <memory>
 
-#include <osg/Camera>
 #include <osg/Timer>
 #include <osg/ref_ptr>
 
diff --git a/apps/openmw/mwgui/recharge.cpp b/apps/openmw/mwgui/recharge.cpp
index 1bf3b24ee8..df6962c78f 100644
--- a/apps/openmw/mwgui/recharge.cpp
+++ b/apps/openmw/mwgui/recharge.cpp
@@ -1,7 +1,6 @@
 #include "recharge.hpp"
 
 #include <MyGUI_ScrollView.h>
-#include <MyGUI_Gui.h>
 
 #include <components/widgets/box.hpp>
 
@@ -18,6 +17,7 @@
 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/recharge.hpp"
 
+#include "itemselection.hpp"
 #include "itemwidget.hpp"
 #include "itemchargeview.hpp"
 #include "sortfilteritemmodel.hpp"
diff --git a/apps/openmw/mwgui/recharge.hpp b/apps/openmw/mwgui/recharge.hpp
index 3d469bac56..c260b15547 100644
--- a/apps/openmw/mwgui/recharge.hpp
+++ b/apps/openmw/mwgui/recharge.hpp
@@ -3,8 +3,6 @@
 
 #include "windowbase.hpp"
 
-#include "itemselection.hpp"
-
 namespace MWWorld
 {
     class Ptr;
diff --git a/apps/openmw/mwgui/repair.cpp b/apps/openmw/mwgui/repair.cpp
index ea79e0326e..351b976033 100644
--- a/apps/openmw/mwgui/repair.cpp
+++ b/apps/openmw/mwgui/repair.cpp
@@ -3,8 +3,6 @@
 #include <iomanip>
 
 #include <MyGUI_ScrollView.h>
-#include <MyGUI_Gui.h>
-#include <MyGUI_ItemBox.h>
 
 #include <components/widgets/box.hpp>
 
@@ -17,6 +15,7 @@
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/class.hpp"
 
+#include "itemselection.hpp"
 #include "itemwidget.hpp"
 #include "itemchargeview.hpp"
 #include "sortfilteritemmodel.hpp"
diff --git a/apps/openmw/mwgui/repair.hpp b/apps/openmw/mwgui/repair.hpp
index 594ad28235..701009f541 100644
--- a/apps/openmw/mwgui/repair.hpp
+++ b/apps/openmw/mwgui/repair.hpp
@@ -3,8 +3,6 @@
 
 #include "windowbase.hpp"
 
-#include "itemselection.hpp"
-
 #include "../mwmechanics/repair.hpp"
 
 namespace MWGui
diff --git a/apps/openmw/mwgui/spellwindow.cpp b/apps/openmw/mwgui/spellwindow.cpp
index d76a59820e..873037db10 100644
--- a/apps/openmw/mwgui/spellwindow.cpp
+++ b/apps/openmw/mwgui/spellwindow.cpp
@@ -1,9 +1,7 @@
 #include "spellwindow.hpp"
 
-#include <MyGUI_Button.h>
 #include <MyGUI_EditBox.h>
 #include <MyGUI_InputManager.h>
-#include <MyGUI_Window.h>
 
 #include <components/misc/stringops.hpp>
 #include <components/settings/settings.hpp>
diff --git a/apps/openmw/mwgui/waitdialog.cpp b/apps/openmw/mwgui/waitdialog.cpp
index 18cc187c15..42a70dcfa7 100644
--- a/apps/openmw/mwgui/waitdialog.cpp
+++ b/apps/openmw/mwgui/waitdialog.cpp
@@ -23,8 +23,6 @@
 #include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/actorutil.hpp"
 
-#include "../mwstate/charactermanager.hpp"
-
 namespace MWGui
 {
 
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 68dd9faa3f..f45990f215 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -9,7 +9,6 @@
 
 #include <MyGUI_UString.h>
 #include <MyGUI_IPointer.h>
-#include <MyGUI_TextureUtility.h>
 #include <MyGUI_FactoryManager.h>
 #include <MyGUI_LanguageManager.h>
 #include <MyGUI_PointerManager.h>
@@ -65,7 +64,6 @@
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/esmstore.hpp"
 
-#include "../mwmechanics/stat.hpp"
 #include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/actorutil.hpp"
 

From 9373e4ada761648ad957a233f0675e5e18b8e031 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sat, 15 May 2021 23:13:46 +0200
Subject: [PATCH 0784/2859] Remove some useless includes in
 apps/openmw/mwphysics

---
 apps/openmw/mwphysics/actor.hpp                     | 1 -
 apps/openmw/mwphysics/actorconvexcallback.cpp       | 2 --
 apps/openmw/mwphysics/contacttestresultcallback.hpp | 2 --
 apps/openmw/mwphysics/movementsolver.hpp            | 2 --
 apps/openmw/mwphysics/projectileconvexcallback.hpp  | 2 --
 apps/openmw/mwphysics/stepper.cpp                   | 2 --
 6 files changed, 11 deletions(-)

diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index 54f9009bf7..45e2039ba5 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -10,7 +10,6 @@
 #include <LinearMath/btTransform.h>
 #include <osg/Vec3f>
 #include <osg/Quat>
-#include <osg/ref_ptr>
 
 class btCollisionShape;
 class btCollisionObject;
diff --git a/apps/openmw/mwphysics/actorconvexcallback.cpp b/apps/openmw/mwphysics/actorconvexcallback.cpp
index cdd4322894..ef52e07c21 100644
--- a/apps/openmw/mwphysics/actorconvexcallback.cpp
+++ b/apps/openmw/mwphysics/actorconvexcallback.cpp
@@ -1,5 +1,3 @@
-#include <mutex>
-
 #include "actorconvexcallback.hpp"
 #include "collisiontype.hpp"
 #include "contacttestwrapper.h"
diff --git a/apps/openmw/mwphysics/contacttestresultcallback.hpp b/apps/openmw/mwphysics/contacttestresultcallback.hpp
index fbe12d5dc2..3d1b3b8aab 100644
--- a/apps/openmw/mwphysics/contacttestresultcallback.hpp
+++ b/apps/openmw/mwphysics/contacttestresultcallback.hpp
@@ -5,8 +5,6 @@
 
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 
-#include "../mwworld/ptr.hpp"
-
 #include "physicssystem.hpp"
 
 class btCollisionObject;
diff --git a/apps/openmw/mwphysics/movementsolver.hpp b/apps/openmw/mwphysics/movementsolver.hpp
index 76141ec0e9..90b10c275e 100644
--- a/apps/openmw/mwphysics/movementsolver.hpp
+++ b/apps/openmw/mwphysics/movementsolver.hpp
@@ -1,8 +1,6 @@
 #ifndef OPENMW_MWPHYSICS_MOVEMENTSOLVER_H
 #define OPENMW_MWPHYSICS_MOVEMENTSOLVER_H
 
-#include <map>
-
 #include <osg/Vec3f>
 
 #include "constants.hpp"
diff --git a/apps/openmw/mwphysics/projectileconvexcallback.hpp b/apps/openmw/mwphysics/projectileconvexcallback.hpp
index c687de36c0..96c84b1fe2 100644
--- a/apps/openmw/mwphysics/projectileconvexcallback.hpp
+++ b/apps/openmw/mwphysics/projectileconvexcallback.hpp
@@ -1,8 +1,6 @@
 #ifndef OPENMW_MWPHYSICS_PROJECTILECONVEXCALLBACK_H
 #define OPENMW_MWPHYSICS_PROJECTILECONVEXCALLBACK_H
 
-#include <vector>
-
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 
 class btCollisionObject;
diff --git a/apps/openmw/mwphysics/stepper.cpp b/apps/openmw/mwphysics/stepper.cpp
index 4f5a27e538..1f53c1ac51 100644
--- a/apps/openmw/mwphysics/stepper.cpp
+++ b/apps/openmw/mwphysics/stepper.cpp
@@ -1,7 +1,5 @@
 #include "stepper.hpp"
 
-#include <limits>
-
 #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 

From c55db790f30eac1c501578cf2a1e1fd8f97d37a2 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sun, 16 May 2021 09:40:41 +0200
Subject: [PATCH 0785/2859] Make the code less verbose / more readable using
 for range loop and structured binding.

No functional changes.
---
 apps/openmw/mwphysics/object.cpp      |  5 +-
 apps/openmw/mwrender/objectpaging.cpp |  4 +-
 apps/openmw/mwworld/cellstore.cpp     | 70 ++++++++++-----------------
 apps/openmw/mwworld/store.cpp         | 24 +++------
 4 files changed, 34 insertions(+), 69 deletions(-)

diff --git a/apps/openmw/mwphysics/object.cpp b/apps/openmw/mwphysics/object.cpp
index e3615989dd..6363065323 100644
--- a/apps/openmw/mwphysics/object.cpp
+++ b/apps/openmw/mwphysics/object.cpp
@@ -119,11 +119,8 @@ namespace MWPhysics
         assert (mShapeInstance->getCollisionShape()->isCompound());
 
         btCompoundShape* compound = static_cast<btCompoundShape*>(mShapeInstance->getCollisionShape());
-        for (const auto& shape : mShapeInstance->mAnimatedShapes)
+        for (const auto& [recIndex, shapeIndex] : mShapeInstance->mAnimatedShapes)
         {
-            int recIndex = shape.first;
-            int shapeIndex = shape.second;
-
             auto nodePathFound = mRecIndexToNodePath.find(recIndex);
             if (nodePathFound == mRecIndexToNodePath.end())
             {
diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index 78e05675a7..8920cead9c 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -440,10 +440,8 @@ namespace MWRender
                         continue;
                     }
                 }
-                for (ESM::CellRefTracker::const_iterator it = cell->mLeasedRefs.begin(); it != cell->mLeasedRefs.end(); ++it)
+                for (auto [ref, deleted] : cell->mLeasedRefs)
                 {
-                    ESM::CellRef ref = it->first;
-                    bool deleted = it->second;
                     if (deleted) { refs.erase(ref.mRefNum); continue; }
                     Misc::StringUtils::lowerCaseInPlace(ref.mRefID);
                     int type = store.findStatic(ref.mRefID);
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 813042f150..3c0bf1a662 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -345,8 +345,8 @@ namespace MWWorld
 
         void merge()
         {
-            for (std::map<LiveCellRefBase*, MWWorld::CellStore*>::const_iterator it = mMovedHere.begin(); it != mMovedHere.end(); ++it)
-                mMergeTo.push_back(it->first);
+            for (const auto & [base, _] : mMovedHere)
+                mMergeTo.push_back(base);
         }
 
     private:
@@ -453,9 +453,9 @@ namespace MWWorld
         if (Ptr ptr = ::searchViaActorId (mCreatures, id, this, mMovedToAnotherCell))
             return ptr;
 
-        for (MovedRefTracker::const_iterator it = mMovedHere.begin(); it != mMovedHere.end(); ++it)
+        for (const auto& [base, _] : mMovedHere)
         {
-            MWWorld::Ptr actor (it->first, this);
+            MWWorld::Ptr actor (base, this);
             if (!actor.getClass().isActor())
                 continue;
             if (actor.getClass().getCreatureStats (actor).matchesActorId (id) && actor.getRefData().getCount() > 0)
@@ -577,11 +577,8 @@ namespace MWWorld
         }
 
         // List moved references, from separately tracked list.
-        for (ESM::CellRefTracker::const_iterator it = mCell->mLeasedRefs.begin(); it != mCell->mLeasedRefs.end(); ++it)
+        for (const auto& [ref, deleted]: mCell->mLeasedRefs)
         {
-            const ESM::CellRef &ref = it->first;
-            bool deleted = it->second;
-
             if (!deleted)
                 mIds.push_back(Misc::StringUtils::lowerCase(ref.mRefID));
         }
@@ -633,10 +630,10 @@ namespace MWWorld
         }
 
         // Load moved references, from separately tracked list.
-        for (ESM::CellRefTracker::const_iterator it = mCell->mLeasedRefs.begin(); it != mCell->mLeasedRefs.end(); ++it)
+        for (const auto& leasedRef : mCell->mLeasedRefs)
         {
-            ESM::CellRef &ref = const_cast<ESM::CellRef&>(it->first);
-            bool deleted = it->second;
+            ESM::CellRef &ref = const_cast<ESM::CellRef&>(leasedRef.first);
+            bool deleted = leasedRef.second;
 
             loadRef (ref, deleted, refNumToID);
         }
@@ -807,11 +804,10 @@ namespace MWWorld
         writeReferenceCollection<ESM::ObjectState> (writer, mWeapons);
         writeReferenceCollection<ESM::ObjectState> (writer, mBodyParts);
 
-        for (MovedRefTracker::const_iterator it = mMovedToAnotherCell.begin(); it != mMovedToAnotherCell.end(); ++it)
+        for (const auto& [base, store] : mMovedToAnotherCell)
         {
-            LiveCellRefBase* base = it->first;
             ESM::RefNum refNum = base->mRef.getRefNum();
-            ESM::CellId movedTo = it->second->getCell()->getCellId();
+            ESM::CellId movedTo = store->getCell()->getCellId();
 
             refNum.save(writer, true, "MVRF");
             movedTo.save(writer);
@@ -1138,9 +1134,9 @@ namespace MWWorld
             updateRechargingItems();
             mRechargingItemsUpToDate = true;
         }
-        for (TRechargingItems::iterator it = mRechargingItems.begin(); it != mRechargingItems.end(); ++it)
+        for (const auto& [item, charge] : mRechargingItems)
         {
-            MWMechanics::rechargeItem(it->first, it->second, duration);
+            MWMechanics::rechargeItem(item, charge, duration);
         }
     }
 
@@ -1148,38 +1144,22 @@ namespace MWWorld
     {
         mRechargingItems.clear();
 
-        for (CellRefList<ESM::Weapon>::List::iterator it (mWeapons.mList.begin()); it!=mWeapons.mList.end(); ++it)
-        {
-            Ptr ptr = getCurrentPtr(&*it);
-            if (!ptr.isEmpty() && ptr.getRefData().getCount() > 0)
-            {
-                checkItem(ptr);
-            }
-        }
-        for (CellRefList<ESM::Armor>::List::iterator it (mArmors.mList.begin()); it!=mArmors.mList.end(); ++it)
-        {
-            Ptr ptr = getCurrentPtr(&*it);
-            if (!ptr.isEmpty() && ptr.getRefData().getCount() > 0)
-            {
-                checkItem(ptr);
-            }
-        }
-        for (CellRefList<ESM::Clothing>::List::iterator it (mClothes.mList.begin()); it!=mClothes.mList.end(); ++it)
+        const auto update = [this](auto& list)
         {
-            Ptr ptr = getCurrentPtr(&*it);
-            if (!ptr.isEmpty() && ptr.getRefData().getCount() > 0)
+            for (auto & item : list)
             {
-                checkItem(ptr);
-            }
-        }
-        for (CellRefList<ESM::Book>::List::iterator it (mBooks.mList.begin()); it!=mBooks.mList.end(); ++it)
-        {
-            Ptr ptr = getCurrentPtr(&*it);
-            if (!ptr.isEmpty() && ptr.getRefData().getCount() > 0)
-            {
-                checkItem(ptr);
+                Ptr ptr = getCurrentPtr(&item);
+                if (!ptr.isEmpty() && ptr.getRefData().getCount() > 0)
+                {
+                    checkItem(ptr);
+                }
             }
-        }
+        };
+
+        update(mWeapons.mList);
+        update(mArmors.mList);
+        update(mClothes.mList);
+        update(mBooks.mList);
     }
 
     void MWWorld::CellStore::checkItem(Ptr ptr)
diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index 8e6596cd30..9b505f7cf7 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -621,20 +621,15 @@ namespace MWWorld
 
     void Store<ESM::Cell>::setUp()
     {
-        typedef DynamicExt::iterator ExtIterator;
-        typedef std::map<std::string, ESM::Cell>::iterator IntIterator;
-
         mSharedInt.clear();
         mSharedInt.reserve(mInt.size());
-        for (IntIterator it = mInt.begin(); it != mInt.end(); ++it) {
-            mSharedInt.push_back(&(it->second));
-        }
+        for (auto & [_, cell] : mInt)
+            mSharedInt.push_back(&cell);
 
         mSharedExt.clear();
         mSharedExt.reserve(mExt.size());
-        for (ExtIterator it = mExt.begin(); it != mExt.end(); ++it) {
-            mSharedExt.push_back(&(it->second));
-        }
+        for (auto & [_, cell] : mExt)
+            mSharedExt.push_back(&cell);
     }
     RecordId Store<ESM::Cell>::load(ESM::ESMReader &esm)
     {
@@ -1050,18 +1045,13 @@ namespace MWWorld
     {
         // DialInfos marked as deleted are kept during the loading phase, so that the linked list
         // structure is kept intact for inserting further INFOs. Delete them now that loading is done.
-        for (Static::iterator it = mStatic.begin(); it != mStatic.end(); ++it)
-        {
-            ESM::Dialogue& dial = it->second;
+        for (auto & [_, dial] : mStatic)
             dial.clearDeletedInfos();
-        }
 
         mShared.clear();
         mShared.reserve(mStatic.size());
-        std::map<std::string, ESM::Dialogue>::iterator it = mStatic.begin();
-        for (; it != mStatic.end(); ++it) {
-            mShared.push_back(&(it->second));
-        }
+        for (auto & [_, dial] : mStatic)
+            mShared.push_back(&dial);
     }
 
     template <>

From 5b63019719855394a731be77fc186b81770ebf0a Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sat, 1 May 2021 20:28:17 +0200
Subject: [PATCH 0786/2859] Embed actor velocity inside its class. It makes the
 code simpler.

---
 apps/openmw/mwmechanics/character.cpp   |  5 ----
 apps/openmw/mwphysics/actor.cpp         | 12 +++++++-
 apps/openmw/mwphysics/actor.hpp         |  4 +++
 apps/openmw/mwphysics/physicssystem.cpp | 39 +++++++++----------------
 apps/openmw/mwphysics/physicssystem.hpp |  5 +---
 5 files changed, 29 insertions(+), 36 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index cb13305356..f7c50c5b6b 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -2405,9 +2405,6 @@ void CharacterController::update(float duration)
             if (!mMovementAnimationControlled)
                 world->queueMovement(mPtr, vec);
         }
-        else
-            // We must always queue movement, even if there is none, to apply gravity.
-            world->queueMovement(mPtr, osg::Vec3f(0.f, 0.f, 0.f));
 
         movement = vec;
         movementSettings.mPosition[0] = movementSettings.mPosition[1] = 0;
@@ -2429,8 +2426,6 @@ void CharacterController::update(float duration)
             if (cls.isPersistent(mPtr) || cls.getCreatureStats(mPtr).isDeathAnimationFinished())
                 playDeath(1.f, mDeathState);
         }
-        // We must always queue movement, even if there is none, to apply gravity.
-        world->queueMovement(mPtr, osg::Vec3f(0.f, 0.f, 0.f));
     }
 
     bool isPersist = isPersistentAnimPlaying();
diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index 4b97ecffb9..9793906098 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -22,7 +22,7 @@ namespace MWPhysics
 Actor::Actor(const MWWorld::Ptr& ptr, const Resource::BulletShape* shape, PhysicsTaskScheduler* scheduler)
   : mStandingOnPtr(nullptr), mCanWaterWalk(false), mWalkingOnWater(false)
   , mCollisionObject(nullptr), mMeshTranslation(shape->mCollisionBox.center), mHalfExtents(shape->mCollisionBox.extents)
-  , mStuckFrames(0), mLastStuckPosition{0, 0, 0}
+  , mVelocity(0,0,0), mStuckFrames(0), mLastStuckPosition{0, 0, 0}
   , mForce(0.f, 0.f, 0.f), mOnGround(true), mOnSlope(false)
   , mInternalCollisionMode(true)
   , mExternalCollisionMode(true)
@@ -303,4 +303,14 @@ bool Actor::skipCollisions()
     return std::exchange(mSkipCollisions, false);
 }
 
+void Actor::setVelocity(osg::Vec3f velocity)
+{
+    mVelocity = velocity;
+}
+
+osg::Vec3f Actor::velocity()
+{
+    return std::exchange(mVelocity, osg::Vec3f());
+}
+
 }
diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index 45e2039ba5..acbf33ca75 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -178,6 +178,9 @@ namespace MWPhysics
 
         bool skipCollisions();
 
+        void setVelocity(osg::Vec3f velocity);
+        osg::Vec3f velocity();
+
     private:
         MWWorld::Ptr mStandingOnPtr;
         /// Removes then re-adds the collision object to the dynamics world
@@ -206,6 +209,7 @@ namespace MWPhysics
         osg::Vec3f mPosition;
         osg::Vec3f mPreviousPosition;
         osg::Vec3f mPositionOffset;
+        osg::Vec3f mVelocity;
         bool mWorldPositionChanged;
         bool mSkipCollisions;
         btTransform mLocalTransform;
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 382c951209..a5d6018f46 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -725,21 +725,15 @@ namespace MWPhysics
 
     void PhysicsSystem::queueObjectMovement(const MWWorld::Ptr &ptr, const osg::Vec3f &velocity)
     {
-        for(auto& movementItem : mMovementQueue)
-        {
-            if (movementItem.first == ptr)
-            {
-                movementItem.second = velocity;
-                return;
-            }
-        }
-
-        mMovementQueue.emplace_back(ptr, velocity);
+        ActorMap::iterator found = mActors.find(ptr);
+        if (found != mActors.end())
+            found->second->setVelocity(velocity);
     }
 
     void PhysicsSystem::clearQueuedMovement()
     {
-        mMovementQueue.clear();
+        for (const auto& [_, actor] : mActors)
+            actor->setVelocity(osg::Vec3f());
     }
 
     const std::vector<MWWorld::Ptr>& PhysicsSystem::applyQueuedMovement(float dt, bool skipSimulation, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
@@ -756,27 +750,21 @@ namespace MWPhysics
     std::vector<ActorFrameData> PhysicsSystem::prepareFrameData(bool willSimulate)
     {
         std::vector<ActorFrameData> actorsFrameData;
-        actorsFrameData.reserve(mMovementQueue.size());
+        actorsFrameData.reserve(mActors.size());
         const MWBase::World *world = MWBase::Environment::get().getWorld();
-        for (const auto& [character, movement] : mMovementQueue)
+        for (const auto& [ptr, physicActor] : mActors)
         {
-            const auto foundActor = mActors.find(character);
-            if (foundActor == mActors.end()) // actor was already removed from the scene
-                continue;
-
-            auto physicActor = foundActor->second;
-
             float waterlevel = -std::numeric_limits<float>::max();
-            const MWWorld::CellStore *cell = character.getCell();
+            const MWWorld::CellStore *cell = ptr.getCell();
             if(cell->getCell()->hasWater())
                 waterlevel = cell->getWaterLevel();
 
-            const MWMechanics::MagicEffects& effects = character.getClass().getCreatureStats(character).getMagicEffects();
+            const MWMechanics::MagicEffects& effects = ptr.getClass().getCreatureStats(physicActor->getPtr()).getMagicEffects();
 
             bool waterCollision = false;
             if (cell->getCell()->hasWater() && effects.get(ESM::MagicEffect::WaterWalking).getMagnitude())
             {
-                if (physicActor->getCollisionMode() || !world->isUnderwater(character.getCell(), osg::Vec3f(character.getRefData().getPosition().asVec3())))
+                if (physicActor->getCollisionMode() || !world->isUnderwater(ptr.getCell(), osg::Vec3f(ptr.getRefData().getPosition().asVec3())))
                     waterCollision = true;
             }
 
@@ -790,9 +778,8 @@ namespace MWPhysics
             if (!willSimulate)
                 standingOn = physicActor->getStandingOnPtr();
 
-            actorsFrameData.emplace_back(std::move(physicActor), standingOn, waterCollision, movement, slowFall, waterlevel);
+            actorsFrameData.emplace_back(physicActor, standingOn, waterCollision, slowFall, waterlevel);
         }
-        mMovementQueue.clear();
         return actorsFrameData;
     }
 
@@ -933,10 +920,10 @@ namespace MWPhysics
     }
 
     ActorFrameData::ActorFrameData(const std::shared_ptr<Actor>& actor, const MWWorld::Ptr standingOn,
-            bool waterCollision, osg::Vec3f movement, float slowFall, float waterlevel)
+            bool waterCollision, float slowFall, float waterlevel)
         : mActor(actor), mActorRaw(actor.get()), mStandingOn(standingOn),
         mDidJump(false), mNeedLand(false), mWaterCollision(waterCollision), mSkipCollisionDetection(actor->skipCollisions()),
-        mWaterlevel(waterlevel), mSlowFall(slowFall), mOldHeight(0), mFallHeight(0), mMovement(movement), mPosition(), mRefpos()
+        mWaterlevel(waterlevel), mSlowFall(slowFall), mOldHeight(0), mFallHeight(0), mMovement(actor->velocity()), mPosition(), mRefpos()
     {
         const MWBase::World *world = MWBase::Environment::get().getWorld();
         const auto ptr = actor->getPtr();
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 23b2786750..3d2a3c580d 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -78,7 +78,7 @@ namespace MWPhysics
 
     struct ActorFrameData
     {
-        ActorFrameData(const std::shared_ptr<Actor>& actor, const MWWorld::Ptr standingOn, bool moveToWaterSurface, osg::Vec3f movement, float slowFall, float waterlevel);
+        ActorFrameData(const std::shared_ptr<Actor>& actor, const MWWorld::Ptr standingOn, bool moveToWaterSurface, float slowFall, float waterlevel);
         void  updatePosition(btCollisionWorld* world);
         std::weak_ptr<Actor> mActor;
         Actor* mActorRaw;
@@ -281,9 +281,6 @@ namespace MWPhysics
 
             bool mDebugDrawEnabled;
 
-            using PtrVelocityList = std::vector<std::pair<MWWorld::Ptr, osg::Vec3f>>;
-            PtrVelocityList mMovementQueue;
-
             float mTimeAccum;
 
             unsigned int mProjectileId;

From 5b9a2b73b0f47728c12759f7918da50dd9ef6f2a Mon Sep 17 00:00:00 2001
From: madsbuvi <madssandvei@zoho.com>
Date: Sun, 16 May 2021 13:04:30 +0200
Subject: [PATCH 0787/2859] Retain final draw callback as a member variable in
 ScreenshotManager, and do not call setFinalDrawCallback after init.

---
 apps/openmw/mwrender/screenshotmanager.cpp | 47 ++++++++++++++--------
 apps/openmw/mwrender/screenshotmanager.hpp |  4 ++
 2 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/apps/openmw/mwrender/screenshotmanager.cpp b/apps/openmw/mwrender/screenshotmanager.cpp
index 89b225da42..60ac1eedd3 100644
--- a/apps/openmw/mwrender/screenshotmanager.cpp
+++ b/apps/openmw/mwrender/screenshotmanager.cpp
@@ -36,8 +36,8 @@ namespace MWRender
     class NotifyDrawCompletedCallback : public osg::Camera::DrawCallback
     {
     public:
-        NotifyDrawCompletedCallback(unsigned int frame)
-            : mDone(false), mFrame(frame)
+        NotifyDrawCompletedCallback()
+            : mDone(false), mFrame(0)
         {
         }
 
@@ -59,6 +59,12 @@ namespace MWRender
             mCondition.wait(lock);
         }
 
+        void reset(unsigned int frame)
+        {
+            mDone = false;
+            mFrame = frame;
+        }
+
         mutable std::condition_variable mCondition;
         mutable std::mutex mMutex;
         mutable bool mDone;
@@ -94,8 +100,18 @@ namespace MWRender
         : mViewer(viewer)
         , mRootNode(rootNode)
         , mSceneRoot(sceneRoot)
+        , mDrawCompleteCallback(new NotifyDrawCompletedCallback)
         , mResourceSystem(resourceSystem)
         , mWater(water)
+    {
+        // Note: This assumes no other final draw callbacks are set anywhere and that this callback will remain set until the application exits.
+        // This works around *DrawCallback manipulation being unsafe in OSG >= 3.5.10 for release 0.47
+        // If you need to set other final draw callbacks, read the comments of issue 6013 for a suggestion
+        // Ref https://gitlab.com/OpenMW/openmw/-/issues/6013
+        mViewer->getCamera()->setFinalDrawCallback(mDrawCompleteCallback);
+    }
+
+    ScreenshotManager::~ScreenshotManager()
     {
     }
 
@@ -107,16 +123,10 @@ namespace MWRender
         tempDrw->setCullingActive(false);
         tempDrw->getOrCreateStateSet()->setRenderBinDetails(100, "RenderBin", osg::StateSet::USE_RENDERBIN_DETAILS); // so its after all scene bins but before POST_RENDER gui camera
         camera->addChild(tempDrw);
-        osg::ref_ptr<NotifyDrawCompletedCallback> callback (new NotifyDrawCompletedCallback(mViewer->getFrameStamp()->getFrameNumber()));
-        camera->setFinalDrawCallback(callback);
-        mViewer->eventTraversal();
-        mViewer->updateTraversal();
-        mViewer->renderingTraversals();
-        callback->waitTillDone();
+        traversalsAndWait(mViewer->getFrameStamp()->getFrameNumber());
         // now that we've "used up" the current frame, get a fresh frame number for the next frame() following after the screenshot is completed
         mViewer->advance(mViewer->getFrameStamp()->getSimulationTime());
         camera->removeChild(tempDrw);
-        camera->setFinalDrawCallback(nullptr);
     }
 
     bool ScreenshotManager::screenshot360(osg::Image* image)
@@ -257,6 +267,15 @@ namespace MWRender
         return true;
     }
 
+    void ScreenshotManager::traversalsAndWait(unsigned int frame)
+    {
+        mDrawCompleteCallback->reset(frame);
+        mViewer->eventTraversal();
+        mViewer->updateTraversal();
+        mViewer->renderingTraversals();
+        mDrawCompleteCallback->waitTillDone();
+    }
+
     void ScreenshotManager::renderCameraToImage(osg::Camera *camera, osg::Image *image, int w, int h)
     {
         camera->setNodeMask(Mask_RenderToTexture);
@@ -280,16 +299,10 @@ namespace MWRender
 
         mRootNode->addChild(camera);
 
-        // The draw needs to complete before we can copy back our image.
-        osg::ref_ptr<NotifyDrawCompletedCallback> callback (new NotifyDrawCompletedCallback(0));
-        camera->setFinalDrawCallback(callback);
-
         MWBase::Environment::get().getWindowManager()->getLoadingScreen()->loadingOn(false);
 
-        mViewer->eventTraversal();
-        mViewer->updateTraversal();
-        mViewer->renderingTraversals();
-        callback->waitTillDone();
+        // The draw needs to complete before we can copy back our image.
+        traversalsAndWait(0);
 
         MWBase::Environment::get().getWindowManager()->getLoadingScreen()->loadingOff();
 
diff --git a/apps/openmw/mwrender/screenshotmanager.hpp b/apps/openmw/mwrender/screenshotmanager.hpp
index 2ac50bdf0c..373fe3be84 100644
--- a/apps/openmw/mwrender/screenshotmanager.hpp
+++ b/apps/openmw/mwrender/screenshotmanager.hpp
@@ -16,11 +16,13 @@ namespace Resource
 namespace MWRender
 {
     class Water;
+    class NotifyDrawCompletedCallback;
 
     class ScreenshotManager
     {
     public:
         ScreenshotManager(osgViewer::Viewer* viewer, osg::ref_ptr<osg::Group> rootNode, osg::ref_ptr<osg::Group> sceneRoot, Resource::ResourceSystem* resourceSystem, Water* water);
+        ~ScreenshotManager();
 
         void screenshot(osg::Image* image, int w, int h);
         bool screenshot360(osg::Image* image);
@@ -29,9 +31,11 @@ namespace MWRender
         osg::ref_ptr<osgViewer::Viewer> mViewer;
         osg::ref_ptr<osg::Group> mRootNode;
         osg::ref_ptr<osg::Group> mSceneRoot;
+        osg::ref_ptr<NotifyDrawCompletedCallback> mDrawCompleteCallback;
         Resource::ResourceSystem* mResourceSystem;
         Water* mWater;
 
+        void traversalsAndWait(unsigned int frame);
         void renderCameraToImage(osg::Camera *camera, osg::Image *image, int w, int h);
         void makeCubemapScreenshot(osg::Image* image, int w, int h, osg::Matrixd cameraTransform=osg::Matrixd());
     };

From e38063dcdb5dbfdf45a83032e84c115715804b33 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sun, 16 May 2021 16:04:28 +0400
Subject: [PATCH 0788/2859] Discard button press events during save loading
 (bug #5619)

---
 CHANGELOG.md                           | 1 +
 components/sdlutil/sdlinputwrapper.cpp | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 271711c767..328b83852b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -80,6 +80,7 @@
     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
diff --git a/components/sdlutil/sdlinputwrapper.cpp b/components/sdlutil/sdlinputwrapper.cpp
index 7ebfd710f9..42276cc2a1 100644
--- a/components/sdlutil/sdlinputwrapper.cpp
+++ b/components/sdlutil/sdlinputwrapper.cpp
@@ -52,9 +52,14 @@ InputWrapper::InputWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> v
 
         if (windowEventsOnly)
         {
-            // During loading, just handle window events, and keep others for later
+            // During loading, handle window events, discard button presses and keep others for later
             while (SDL_PeepEvents(&evt, 1, SDL_GETEVENT, SDL_WINDOWEVENT, SDL_WINDOWEVENT))
                 handleWindowEvent(evt);
+
+            SDL_FlushEvent(SDL_KEYDOWN);
+            SDL_FlushEvent(SDL_CONTROLLERBUTTONDOWN);
+            SDL_FlushEvent(SDL_MOUSEBUTTONDOWN);
+
             return;
         }
 

From f3e17e7c52f3ac940e53f71f3aa6e5ac3700b4a8 Mon Sep 17 00:00:00 2001
From: madsbuvi <madssandvei@zoho.com>
Date: Sun, 16 May 2021 18:09:48 +0200
Subject: [PATCH 0789/2859] Don't redundantly call notify on every frame.

---
 apps/openmw/mwrender/screenshotmanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/screenshotmanager.cpp b/apps/openmw/mwrender/screenshotmanager.cpp
index 60ac1eedd3..af2970fd80 100644
--- a/apps/openmw/mwrender/screenshotmanager.cpp
+++ b/apps/openmw/mwrender/screenshotmanager.cpp
@@ -44,7 +44,7 @@ namespace MWRender
         void operator () (osg::RenderInfo& renderInfo) const override
         {
             std::lock_guard<std::mutex> lock(mMutex);
-            if (renderInfo.getState()->getFrameStamp()->getFrameNumber() >= mFrame)
+            if (renderInfo.getState()->getFrameStamp()->getFrameNumber() >= mFrame && !mDone)
             {
                 mDone = true;
                 mCondition.notify_one();

From d520b440aa2df4478358ea3adfa32fa44071a7c2 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 15 May 2021 13:01:02 +0200
Subject: [PATCH 0790/2859] Copy LightBuffer data into a new object when
 changing layout

Before this change LightBuffer copy constructor copied only mData pointer into
a new object. Then memcpy was applied to an overlapping source and destination
that is UB.

Replace configureLayout function by a special constructor. That copies all
mData values and a pointer to a buffer object into a newly allocated object.
---
 components/sceneutil/lightmanager.cpp | 67 +++++++++++++--------------
 1 file changed, 31 insertions(+), 36 deletions(-)

diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 00c19dd402..16af3880f8 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -114,15 +114,35 @@ namespace SceneUtil
             mOffsets[AttenuationRadius] = 8;
         }
 
-        LightBuffer(const LightBuffer& copy)
-            : osg::Referenced()
-            , mData(copy.mData)
-            , mEndian(copy.mEndian)
-            , mCount(copy.mCount)
-            , mStride(copy.mStride)
-            , mOffsets(copy.mOffsets)
-            , mCachedSunPos(copy.mCachedSunPos)
-        {}
+        LightBuffer(const LightBuffer&) = delete;
+
+        LightBuffer(const LightBuffer& other, int offsetColors, int offsetPosition, int offsetAttenuationRadius, int size, int stride)
+            : mData(new osg::FloatArray(size / sizeof(GL_FLOAT)))
+            , mEndian(other.mEndian)
+            , mCount(other.mCount)
+            , mStride((offsetAttenuationRadius + sizeof(GL_FLOAT) * osg::Vec4::num_components + stride) / 4)
+            , mCachedSunPos(other.mCachedSunPos)
+        {
+            mData->setBufferObject(other.mData->getBufferObject());
+
+            constexpr auto sizeofFloat = sizeof(GL_FLOAT);
+            const auto diffuseOffset = offsetColors / sizeofFloat;
+
+            mOffsets[Diffuse] = diffuseOffset;
+            mOffsets[Ambient] = diffuseOffset + 1;
+            mOffsets[Specular] = diffuseOffset + 2;
+            mOffsets[DiffuseSign] = diffuseOffset + 3;
+            mOffsets[Position] = offsetPosition / sizeofFloat;
+            mOffsets[AttenuationRadius] = offsetAttenuationRadius / sizeofFloat;
+
+            // Copy over previous buffers light data. Buffers populate before we know the layout.
+            for (int i = 0; i < other.mCount; ++i)
+            {
+                std::memcpy(&(*mData)[getOffset(i, Diffuse)], &(*other.mData)[other.getOffset(i, Diffuse)], sizeof(osg::Vec4f));
+                std::memcpy(&(*mData)[getOffset(i, Position)], &(*other.mData)[other.getOffset(i, Position)], sizeof(osg::Vec4f));
+                std::memcpy(&(*mData)[getOffset(i, AttenuationRadius)], &(*other.mData)[other.getOffset(i, AttenuationRadius)], sizeof(osg::Vec4f));
+            }
+        }
 
         void setDiffuse(int index, const osg::Vec4& value)
         {
@@ -192,36 +212,11 @@ namespace SceneUtil
             return mEndian == osg::BigEndian ? value.asABGR() : value.asRGBA();
         }
 
-        int getOffset(int index, LayoutOffset slot)
+        int getOffset(int index, LayoutOffset slot) const
         {
             return mStride * index + mOffsets[slot];
         }
 
-        void configureLayout(int offsetColors, int offsetPosition, int offsetAttenuationRadius, int size, int stride)
-        {
-            constexpr auto sizeofFloat = sizeof(GL_FLOAT);
-            constexpr auto sizeofVec4 = sizeofFloat * osg::Vec4::num_components;
-
-            LightBuffer oldBuffer = LightBuffer(*this);
-
-            mOffsets[Diffuse] = offsetColors / sizeofFloat;
-            mOffsets[Ambient] = mOffsets[Diffuse] + 1;
-            mOffsets[Specular] = mOffsets[Diffuse] + 2;
-            mOffsets[DiffuseSign] = mOffsets[Diffuse] + 3;
-            mOffsets[Position] = offsetPosition / sizeofFloat;
-            mOffsets[AttenuationRadius] = offsetAttenuationRadius / sizeofFloat;
-            mStride = (offsetAttenuationRadius + sizeofVec4 + stride) / 4;
-
-            // Copy over previous buffers light data. Buffers populate before we know the layout.
-            mData->resize(size / sizeofFloat);
-            for (int i = 0; i < oldBuffer.mCount; ++i)
-            {
-                std::memcpy(&(*mData)[getOffset(i, Diffuse)], &(*oldBuffer.mData)[oldBuffer.getOffset(i, Diffuse)], sizeof(osg::Vec4f));
-                std::memcpy(&(*mData)[getOffset(i, Position)], &(*oldBuffer.mData)[oldBuffer.getOffset(i, Position)], sizeof(osg::Vec4f));
-                std::memcpy(&(*mData)[getOffset(i, AttenuationRadius)], &(*oldBuffer.mData)[oldBuffer.getOffset(i, AttenuationRadius)], sizeof(osg::Vec4f));
-            }
-        }
-
     private:
         osg::ref_ptr<osg::FloatArray> mData;
         osg::Endian mEndian;
@@ -754,7 +749,7 @@ namespace SceneUtil
             for (int i = 0; i < 2; ++i)
             {
                 auto& buf = lightManager.getLightBuffer(i);
-                buf->configureLayout(offsets[0], offsets[1], offsets[2], totalBlockSize, stride);
+                buf = new LightBuffer(*buf, offsets[0], offsets[1], offsets[2], totalBlockSize, stride);
             }
         }
 

From c11774f2789f256229e26549e5759c3b107a3623 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 17 May 2021 12:23:56 +0400
Subject: [PATCH 0791/2859] Do not trigger in-game bindings via mouse buttons
 when controls are disabled (bug #6047)

---
 CHANGELOG.md                         | 1 +
 apps/openmw/mwinput/mousemanager.cpp | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 328b83852b..9d5c973525 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -126,6 +126,7 @@
     Bug #6016: Greeting interrupts Fargoth's sneak-walk
     Bug #6028: Particle system controller values are incorrectly used
     Bug #6043: Actor can have torch missing when torch animation is played
+    Bug #6047: Mouse bindings can be triggered during save loading
     Feature #390: 3rd person look "over the shoulder"
     Feature #832: OpenMW-CS: Handle deleted references
     Feature #1536: Show more information about level on menu
diff --git a/apps/openmw/mwinput/mousemanager.cpp b/apps/openmw/mwinput/mousemanager.cpp
index a696332dff..cf151dfac7 100644
--- a/apps/openmw/mwinput/mousemanager.cpp
+++ b/apps/openmw/mwinput/mousemanager.cpp
@@ -144,7 +144,8 @@ namespace MWInput
 
     void MouseManager::mousePressed(const SDL_MouseButtonEvent &arg, Uint8 id)
     {
-        MWBase::Environment::get().getInputManager()->setJoystickLastUsed(false);
+        MWBase::InputManager* input = MWBase::Environment::get().getInputManager();
+        input->setJoystickLastUsed(false);
         bool guiMode = false;
 
         if (id == SDL_BUTTON_LEFT || id == SDL_BUTTON_RIGHT) // MyGUI only uses these mouse events
@@ -165,7 +166,8 @@ namespace MWInput
         mBindingsManager->setPlayerControlsEnabled(!guiMode);
 
         // Don't trigger any mouse bindings while in settings menu, otherwise rebinding controls becomes impossible
-        if (MWBase::Environment::get().getWindowManager()->getMode() != MWGui::GM_Settings)
+        // Also do not trigger bindings when input controls are disabled, e.g. during save loading
+        if (MWBase::Environment::get().getWindowManager()->getMode() != MWGui::GM_Settings && !input->controlsDisabled())
             mBindingsManager->mousePressed(arg, id);
     }
 

From c54ef55ebb982bd453a8d51b8c1094c711ec295c Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 17 May 2021 12:40:55 +0400
Subject: [PATCH 0792/2859] Revert "Replace raw pointer by observer_ptr to
 avoid dangling pointer dereferencing"

This reverts commit 5373cf1cd5e2899c7d9fd7976ec39fbf4e5efc95.
---
 components/sceneutil/lightmanager.cpp | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 16af3880f8..e8cfad5220 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -726,7 +726,7 @@ namespace SceneUtil
 
         META_StateAttribute(NifOsg, LightManagerStateAttribute, osg::StateAttribute::LIGHT)
 
-        void initSharedLayout(osg::GLExtensions* ext, int handle, LightManager& lightManager) const
+        void initSharedLayout(osg::GLExtensions* ext, int handle) const
         {
             constexpr std::array<unsigned int, 1> index = { static_cast<unsigned int>(Shader::UBOBinding::LightBuffer) };
             int totalBlockSize = -1;
@@ -748,17 +748,13 @@ namespace SceneUtil
 
             for (int i = 0; i < 2; ++i)
             {
-                auto& buf = lightManager.getLightBuffer(i);
+                auto& buf = mLightManager->getLightBuffer(i);
                 buf = new LightBuffer(*buf, offsets[0], offsets[1], offsets[2], totalBlockSize, stride);
             }
         }
 
         void apply(osg::State& state) const override
         {
-            osg::ref_ptr<LightManager> lightManager;
-            if (!mLightManager.lock(lightManager))
-                return;
-
             if (!mInitLayout)
             {
                 mDummyProgram->apply(state);
@@ -771,12 +767,12 @@ namespace SceneUtil
                 // wait until the UBO binding is created
                 if (activeUniformBlocks > 0)
                 {
-                    initSharedLayout(ext, handle, *lightManager);
+                    initSharedLayout(ext, handle);
                     mInitLayout = true;
                 }
             }
-            lightManager->getLightBuffer(state.getFrameStamp()->getFrameNumber())->uploadCachedSunPos(state.getInitialViewMatrix());
-            lightManager->getLightBuffer(state.getFrameStamp()->getFrameNumber())->dirty();
+            mLightManager->getLightBuffer(state.getFrameStamp()->getFrameNumber())->uploadCachedSunPos(state.getInitialViewMatrix());
+            mLightManager->getLightBuffer(state.getFrameStamp()->getFrameNumber())->dirty();
         }
 
     private:
@@ -806,7 +802,7 @@ namespace SceneUtil
             return shader;
         }
 
-        osg::observer_ptr<LightManager> mLightManager;
+        LightManager* mLightManager;
         osg::ref_ptr<osg::Program> mDummyProgram;
         mutable bool mInitLayout;
     };

From 11c57978b69174eb87b6d8ec572a57696fd0bc73 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 17 May 2021 13:01:15 +0400
Subject: [PATCH 0793/2859] Fix crashes on exit in the LightManager (bug #6044)

---
 components/sceneutil/lightmanager.cpp | 11 ++++++++++-
 components/sceneutil/lightmanager.hpp |  2 ++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index e8cfad5220..a69a64ba37 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -439,7 +439,11 @@ namespace SceneUtil
 
         void apply(osg::State &state) const override
         {
-            auto* lightUniform = mLightManager->getStateSet()->getUniform("LightBuffer");
+            osg::StateSet* stateSet = mLightManager->getStateSet();
+            if (!stateSet)
+                return;
+
+            auto* lightUniform = stateSet->getUniform("LightBuffer");
             for (size_t i = 0; i < mLights.size(); ++i)
             {
                 auto light = mLights[i];
@@ -832,6 +836,11 @@ namespace SceneUtil
         return "";
     }
 
+    LightManager::~LightManager()
+    {
+        getOrCreateStateSet()->removeAttribute(osg::StateAttribute::LIGHT);
+    }
+
     LightManager::LightManager(bool ffp)
         : mStartLight(0)
         , mLightingMask(~0u)
diff --git a/components/sceneutil/lightmanager.hpp b/components/sceneutil/lightmanager.hpp
index dc7f36e962..6dbe7a3f75 100644
--- a/components/sceneutil/lightmanager.hpp
+++ b/components/sceneutil/lightmanager.hpp
@@ -137,6 +137,8 @@ namespace SceneUtil
 
         LightManager(const LightManager& copy, const osg::CopyOp& copyop);
 
+        ~LightManager();
+
         /// @param mask This mask is compared with the current Camera's cull mask to determine if lighting is desired.
         /// By default, it's ~0u i.e. always on.
         /// If you have some views that do not require lighting, then set the Camera's cull mask to not include

From a73ffc25c3c3f331f6daa43dfd4086d63566c5cc Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 17 May 2021 17:44:26 +0200
Subject: [PATCH 0794/2859] Add missing synchronization for present tiles
 modification

insert/erase can be done from multiple threads simultaneously. mMutex is
already used to synchronize reads so use it for writes too.
---
 components/detournavigator/asyncnavmeshupdater.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index bee4510b42..11de607456 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -298,9 +298,15 @@ namespace DetourNavigator
         }
 
         if (status == UpdateNavMeshStatus::removed || status == UpdateNavMeshStatus::lost)
+        {
+            const std::scoped_lock lock(mMutex);
             mPresentTiles.erase(std::make_tuple(job.mAgentHalfExtents, job.mChangedTile));
+        }
         else if (isSuccess(status) && status != UpdateNavMeshStatus::ignored)
+        {
+            const std::scoped_lock lock(mMutex);
             mPresentTiles.insert(std::make_tuple(job.mAgentHalfExtents, job.mChangedTile));
+        }
 
         const auto finish = std::chrono::steady_clock::now();
 

From aba735e6158f5b0bae9ca9f12ff0092ab2df1476 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Mon, 17 May 2021 22:45:10 +0100
Subject: [PATCH 0795/2859] Check in external Base64 implementation

Taken from https://gist.github.com/tomykaira/f0fd86b6c73063283afe550bc5d77594

MIT licenced
---
 extern/Base64/Base64.h | 124 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 124 insertions(+)
 create mode 100644 extern/Base64/Base64.h

diff --git a/extern/Base64/Base64.h b/extern/Base64/Base64.h
new file mode 100644
index 0000000000..cdfdc04d0b
--- /dev/null
+++ b/extern/Base64/Base64.h
@@ -0,0 +1,124 @@
+#ifndef _MACARON_BASE64_H_
+#define _MACARON_BASE64_H_
+
+/**
+ * The MIT License (MIT)
+ * Copyright (c) 2016 tomykaira
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <string>
+
+namespace macaron {
+
+class Base64 {
+ public:
+
+  static std::string Encode(const std::string data) {
+    static constexpr char sEncodingTable[] = {
+      'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
+      'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
+      'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
+      'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
+      'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+      'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
+      'w', 'x', 'y', 'z', '0', '1', '2', '3',
+      '4', '5', '6', '7', '8', '9', '+', '/'
+    };
+
+    size_t in_len = data.size();
+    size_t out_len = 4 * ((in_len + 2) / 3);
+    std::string ret(out_len, '\0');
+    size_t i;
+    char *p = const_cast<char*>(ret.c_str());
+
+    for (i = 0; i < in_len - 2; i += 3) {
+      *p++ = sEncodingTable[(data[i] >> 2) & 0x3F];
+      *p++ = sEncodingTable[((data[i] & 0x3) << 4) | ((int) (data[i + 1] & 0xF0) >> 4)];
+      *p++ = sEncodingTable[((data[i + 1] & 0xF) << 2) | ((int) (data[i + 2] & 0xC0) >> 6)];
+      *p++ = sEncodingTable[data[i + 2] & 0x3F];
+    }
+    if (i < in_len) {
+      *p++ = sEncodingTable[(data[i] >> 2) & 0x3F];
+      if (i == (in_len - 1)) {
+        *p++ = sEncodingTable[((data[i] & 0x3) << 4)];
+        *p++ = '=';
+      }
+      else {
+        *p++ = sEncodingTable[((data[i] & 0x3) << 4) | ((int) (data[i + 1] & 0xF0) >> 4)];
+        *p++ = sEncodingTable[((data[i + 1] & 0xF) << 2)];
+      }
+      *p++ = '=';
+    }
+
+    return ret;
+  }
+
+  static std::string Decode(const std::string& input, std::string& out) {
+    static constexpr unsigned char kDecodingTable[] = {
+      64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+      64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+      64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 62, 64, 64, 64, 63,
+      52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 64, 64, 64, 64, 64, 64,
+      64,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
+      15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 64, 64, 64, 64, 64,
+      64, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+      41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 64, 64, 64, 64,
+      64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+      64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+      64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+      64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+      64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+      64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+      64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+      64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64
+    };
+
+    size_t in_len = input.size();
+    if (in_len % 4 != 0) return "Input data size is not a multiple of 4";
+
+    size_t out_len = in_len / 4 * 3;
+    if (input[in_len - 1] == '=') out_len--;
+    if (input[in_len - 2] == '=') out_len--;
+
+    out.resize(out_len);
+
+    for (size_t i = 0, j = 0; i < in_len;) {
+      uint32_t a = input[i] == '=' ? 0 & i++ : kDecodingTable[static_cast<int>(input[i++])];
+      uint32_t b = input[i] == '=' ? 0 & i++ : kDecodingTable[static_cast<int>(input[i++])];
+      uint32_t c = input[i] == '=' ? 0 & i++ : kDecodingTable[static_cast<int>(input[i++])];
+      uint32_t d = input[i] == '=' ? 0 & i++ : kDecodingTable[static_cast<int>(input[i++])];
+
+      uint32_t triple = (a << 3 * 6) + (b << 2 * 6) + (c << 1 * 6) + (d << 0 * 6);
+
+      if (j < out_len) out[j++] = (triple >> 2 * 8) & 0xFF;
+      if (j < out_len) out[j++] = (triple >> 1 * 8) & 0xFF;
+      if (j < out_len) out[j++] = (triple >> 0 * 8) & 0xFF;
+    }
+
+    return "";
+  }
+
+};
+
+}
+
+#endif /* _MACARON_BASE64_H_ */

From d66cc3b7aeaf2ca5c0a5bff1cffe9e464907bea6 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Mon, 17 May 2021 22:47:08 +0100
Subject: [PATCH 0796/2859] Fix undefined behaviour

---
 extern/Base64/Base64.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extern/Base64/Base64.h b/extern/Base64/Base64.h
index cdfdc04d0b..498d2be128 100644
--- a/extern/Base64/Base64.h
+++ b/extern/Base64/Base64.h
@@ -48,7 +48,7 @@ class Base64 {
     size_t out_len = 4 * ((in_len + 2) / 3);
     std::string ret(out_len, '\0');
     size_t i;
-    char *p = const_cast<char*>(ret.c_str());
+    char *p = ret.data();
 
     for (i = 0; i < in_len - 2; i += 3) {
       *p++ = sEncodingTable[(data[i] >> 2) & 0x3F];

From 2b1326cb745406215c17f574ee844a70505d14e0 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Mon, 17 May 2021 22:50:32 +0100
Subject: [PATCH 0797/2859] Change namespace to Base64

The functions do Base64 encoding and decoding and do not feed me
delicious almond and meringue based confectionary.
---
 extern/Base64/Base64.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extern/Base64/Base64.h b/extern/Base64/Base64.h
index 498d2be128..4e9f517479 100644
--- a/extern/Base64/Base64.h
+++ b/extern/Base64/Base64.h
@@ -27,7 +27,7 @@
 
 #include <string>
 
-namespace macaron {
+namespace Base64 {
 
 class Base64 {
  public:

From 081650a2e536c1a6a79cedadd3e0f10bf166d8ab Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Mon, 17 May 2021 23:00:23 +0100
Subject: [PATCH 0798/2859] Integrate Base64 library with build

---
 CMakeLists.txt                 | 1 +
 components/CMakeLists.txt      | 2 ++
 components/settings/parser.cpp | 2 ++
 extern/Base64/CMakeLists.txt   | 2 ++
 4 files changed, 7 insertions(+)
 create mode 100644 extern/Base64/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b97657ffd0..2ed4eafd7d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -516,6 +516,7 @@ endif (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clan
 
 add_subdirectory (extern/osg-ffmpeg-videoplayer)
 add_subdirectory (extern/oics)
+add_subdirectory (extern/Base64)
 if (BUILD_OPENCS)
     add_subdirectory (extern/osgQt)
 endif()
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 9041ee5333..06ae0791d7 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -251,6 +251,8 @@ target_link_libraries(components
     RecastNavigation::DebugUtils
     RecastNavigation::Detour
     RecastNavigation::Recast
+
+    Base64
     )
 
 target_link_libraries(components ${BULLET_LIBRARIES})
diff --git a/components/settings/parser.cpp b/components/settings/parser.cpp
index ee14eb5de7..f375bf85ba 100644
--- a/components/settings/parser.cpp
+++ b/components/settings/parser.cpp
@@ -7,6 +7,8 @@
 
 #include <boost/filesystem/fstream.hpp>
 
+#include <Base64.h>
+
 void Settings::SettingsFileParser::loadSettingsFile(const std::string& file, CategorySettingValueMap& settings, bool base64Encoded)
 {
     mFile = file;
diff --git a/extern/Base64/CMakeLists.txt b/extern/Base64/CMakeLists.txt
new file mode 100644
index 0000000000..d1adf91bcb
--- /dev/null
+++ b/extern/Base64/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_library(Base64 INTERFACE)
+target_include_directories(Base64 INTERFACE .)
\ No newline at end of file

From 41cfcfdc0fc270b1eab1b9cc400ae88498c099a2 Mon Sep 17 00:00:00 2001
From: Benjamin Winger <bmw@disroot.org>
Date: Mon, 17 May 2021 18:33:02 -0400
Subject: [PATCH 0799/2859] Display Race record height/weight as a float

---
 components/esm/loadrace.cpp | 4 ++--
 components/esm/loadrace.hpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/esm/loadrace.cpp b/components/esm/loadrace.cpp
index 88ce08c913..fbdf22fb6d 100644
--- a/components/esm/loadrace.cpp
+++ b/components/esm/loadrace.cpp
@@ -13,9 +13,9 @@ namespace ESM
         return male ? mMale : mFemale;
     }
 
-    int Race::MaleFemaleF::getValue (bool male) const
+    float Race::MaleFemaleF::getValue (bool male) const
     {
-        return static_cast<int>(male ? mMale : mFemale);
+        return male ? mMale : mFemale;
     }
 
     void Race::load(ESMReader &esm, bool &isDeleted)
diff --git a/components/esm/loadrace.hpp b/components/esm/loadrace.hpp
index bf0573075c..d014744472 100644
--- a/components/esm/loadrace.hpp
+++ b/components/esm/loadrace.hpp
@@ -38,7 +38,7 @@ struct Race
     {
         float mMale, mFemale;
 
-        int getValue (bool male) const;
+        float getValue (bool male) const;
     };
 
     enum Flags

From 21f04f0d0f785fc59e302ba8865c1e257f7ba969 Mon Sep 17 00:00:00 2001
From: Benjamin Winger <bmw@disroot.org>
Date: Mon, 17 May 2021 18:36:59 -0400
Subject: [PATCH 0800/2859] Fixed data subrecord name for Armour record used in
 error

---
 components/esm/loadarmo.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/esm/loadarmo.cpp b/components/esm/loadarmo.cpp
index 929c111a98..6743702539 100644
--- a/components/esm/loadarmo.cpp
+++ b/components/esm/loadarmo.cpp
@@ -90,7 +90,7 @@ namespace ESM
         if (!hasName)
             esm.fail("Missing NAME subrecord");
         if (!hasData && !isDeleted)
-            esm.fail("Missing CTDT subrecord");
+            esm.fail("Missing AODT subrecord");
     }
 
     void Armor::save(ESMWriter &esm, bool isDeleted) const

From 4cedb3549b53c54b31d581ce6538846aede2e136 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Mon, 17 May 2021 23:39:56 +0100
Subject: [PATCH 0801/2859] Decode base64-packed settings files

---
 components/settings/parser.cpp | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/components/settings/parser.cpp b/components/settings/parser.cpp
index f375bf85ba..24f359b315 100644
--- a/components/settings/parser.cpp
+++ b/components/settings/parser.cpp
@@ -12,16 +12,31 @@
 void Settings::SettingsFileParser::loadSettingsFile(const std::string& file, CategorySettingValueMap& settings, bool base64Encoded)
 {
     mFile = file;
-    boost::filesystem::ifstream stream;
-    stream.open(boost::filesystem::path(file));
+    boost::filesystem::ifstream fstream;
+    fstream.open(boost::filesystem::path(file));
+    auto stream = std::ref<std::istream>(fstream);
+
+    std::istringstream decodedStream;
+    if (base64Encoded)
+    {
+        std::string base64String(std::istreambuf_iterator<char>(fstream), {});
+        std::string decodedString;
+        auto result = Base64::Base64::Decode(base64String, decodedString);
+        if (!result.empty())
+            fail("Could not decode Base64 file: " + result);
+        // Move won't do anything until C++20, but won't hurt to do it anyway.
+        decodedStream.str(std::move(decodedString));
+        stream = std::ref<std::istream>(decodedStream);
+    }
+
     Log(Debug::Info) << "Loading settings file: " << file;
     std::string currentCategory;
     mLine = 0;
-    while (!stream.eof() && !stream.fail())
+    while (!stream.get().eof() && !stream.get().fail())
     {
         ++mLine;
         std::string line;
-        std::getline( stream, line );
+        std::getline( stream.get(), line );
 
         size_t i = 0;
         if (!skipWhiteSpace(i, line))

From 3ef1b270993a9b09e3a3613a142206e6ea9a9a27 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 18 May 2021 01:21:42 +0200
Subject: [PATCH 0802/2859] Add missing includes

---
 apps/openmw_test_suite/detournavigator/navigator.cpp         | 1 +
 apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index 6192765888..333613e77a 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -11,6 +11,7 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
+#include <array>
 #include <deque>
 
 MATCHER_P3(Vec3fEq, x, y, z, "")
diff --git a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
index 5f43f48008..b4b6645693 100644
--- a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
+++ b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
@@ -14,6 +14,8 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
+#include <array>
+
 namespace DetourNavigator
 {
     static inline bool operator ==(const RecastMesh::Water& lhs, const RecastMesh::Water& rhs)

From 959165bcb99140d38afbf7dc420f5ce647a321ea Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 18 May 2021 01:33:11 +0200
Subject: [PATCH 0803/2859] Support running unit tests on gitlab CI for windows

But not actually run them because gitlab fails to do this.
---
 .gitlab-ci.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8d486ebf98..ceba2841fe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -171,7 +171,7 @@ variables: &cs-targets
   package: "CS"
 
 variables: &tests-targets
-  targets: "openmw_detournavigator_navmeshtilescache_benchmark"
+  targets: "openmw_test_suite,openmw_detournavigator_navmeshtilescache_benchmark"
   package: "Tests"
 
 .Windows_Ninja_Base:
@@ -192,7 +192,7 @@ variables: &tests-targets
     - $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
+    - 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(','))
@@ -274,8 +274,8 @@ Windows_Ninja_Tests_RelWithDebInfo:
   variables:
     <<: *tests-targets
     config: "RelWithDebInfo"
-    # Gitlab can't successfully execute benchamark binary due to unknown reason
-    # executables: "openmw_detournavigator_navmeshtilescache_benchmark.exe"
+    # 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:
@@ -294,7 +294,7 @@ Windows_Ninja_Tests_RelWithDebInfo:
     - $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
+    - 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
@@ -375,8 +375,8 @@ Windows_MSBuild_Tests_RelWithDebInfo:
   variables:
     <<: *tests-targets
     config: "RelWithDebInfo"
-    # Gitlab can't successfully execute benchamark binary due to unknown reason
-    # executables: "openmw_detournavigator_navmeshtilescache_benchmark.exe"
+    # 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:

From 18ea4d8eb232821987c47a862f23057e797a4fde Mon Sep 17 00:00:00 2001
From: Atahualpa <m_otto@hotmail.de>
Date: Sun, 9 May 2021 22:19:57 +0200
Subject: [PATCH 0804/2859] First step toward fixing terrain selection issues.

---
 apps/opencs/view/render/terrainselection.cpp | 79 +++++++++++++++++++-
 apps/opencs/view/render/terrainselection.hpp |  3 +-
 apps/opencs/view/render/terrainshapemode.cpp | 18 ++++-
 3 files changed, 92 insertions(+), 8 deletions(-)

diff --git a/apps/opencs/view/render/terrainselection.cpp b/apps/opencs/view/render/terrainselection.cpp
index 4e209af57b..be7fefe308 100644
--- a/apps/opencs/view/render/terrainselection.cpp
+++ b/apps/opencs/view/render/terrainselection.cpp
@@ -42,13 +42,84 @@ void CSVRender::TerrainSelection::onlySelect(const std::vector<std::pair<int, in
     update();
 }
 
-void CSVRender::TerrainSelection::addSelect(const std::pair<int, int> &localPos)
+void CSVRender::TerrainSelection::addSelect(const std::vector<std::pair<int, int>>& localPositions, bool toggleInProgress)
 {
-    if (std::find(mSelection.begin(), mSelection.end(), localPos) == mSelection.end())
+    if (toggleInProgress)
+    {
+        for (auto const& localPos : localPositions)
+        {
+            auto iterTemp = std::find(mTemporarySelection.begin(), mTemporarySelection.end(), localPos);
+            mDraggedOperationFlag = true;
+
+            if (iterTemp == mTemporarySelection.end())
+            {
+                auto iter = std::find(mSelection.begin(), mSelection.end(), localPos);
+                if (iter == mSelection.end())
+                {
+                    mSelection.emplace_back(localPos);
+                }
+            }
+
+            mTemporarySelection.push_back(localPos);
+        }
+    }
+    else if (mDraggedOperationFlag == false)
     {
-        mSelection.emplace_back(localPos);
-        update();
+        for (auto const& localPos : localPositions)
+        {
+            const auto iter = std::find(mSelection.begin(), mSelection.end(), localPos);
+            if (iter == mSelection.end())
+            {
+                mSelection.emplace_back(localPos);
+            }
+        }
     }
+    else
+    {
+        mDraggedOperationFlag = false;
+        mTemporarySelection.clear();
+    }
+    update();
+}
+
+void CSVRender::TerrainSelection::removeSelect(const std::vector<std::pair<int, int>>& localPositions, bool toggleInProgress)
+{
+    if (toggleInProgress)
+    {
+        for (auto const& localPos : localPositions)
+        {
+            auto iterTemp = std::find(mTemporarySelection.begin(), mTemporarySelection.end(), localPos);
+            mDraggedOperationFlag = true;
+
+            if (iterTemp == mTemporarySelection.end())
+            {
+                auto iter = std::find(mSelection.begin(), mSelection.end(), localPos);
+                if (iter != mSelection.end())
+                {
+                    mSelection.erase(iter);
+                }
+            }
+
+            mTemporarySelection.push_back(localPos);
+        }
+    }
+    else if (mDraggedOperationFlag == false)
+    {
+        for (auto const& localPos : localPositions)
+        {
+            const auto iter = std::find(mSelection.begin(), mSelection.end(), localPos);
+            if (iter != mSelection.end())
+            {
+                mSelection.erase(iter);
+            }
+        }
+    }
+    else
+    {
+        mDraggedOperationFlag = false;
+        mTemporarySelection.clear();
+    }
+    update();
 }
 
 void CSVRender::TerrainSelection::toggleSelect(const std::vector<std::pair<int, int>> &localPositions, bool toggleInProgress)
diff --git a/apps/opencs/view/render/terrainselection.hpp b/apps/opencs/view/render/terrainselection.hpp
index 84ee6f25ac..9c1eb55b17 100644
--- a/apps/opencs/view/render/terrainselection.hpp
+++ b/apps/opencs/view/render/terrainselection.hpp
@@ -36,7 +36,8 @@ namespace CSVRender
             ~TerrainSelection();
 
             void onlySelect(const std::vector<std::pair<int, int>> &localPositions);
-            void addSelect(const std::pair<int, int> &localPos);
+            void addSelect(const std::vector<std::pair<int, int>>& localPositions, bool toggleInProgress);
+            void removeSelect(const std::vector<std::pair<int, int>>& localPositions, bool toggleInProgress);
             void toggleSelect(const std::vector<std::pair<int, int>> &localPositions, bool toggleInProgress);
 
             void activate();
diff --git a/apps/opencs/view/render/terrainshapemode.cpp b/apps/opencs/view/render/terrainshapemode.cpp
index 1739e143d0..6209e161e9 100644
--- a/apps/opencs/view/render/terrainshapemode.cpp
+++ b/apps/opencs/view/render/terrainshapemode.cpp
@@ -42,7 +42,7 @@
 #include "worldspacewidget.hpp"
 
 CSVRender::TerrainShapeMode::TerrainShapeMode (WorldspaceWidget *worldspaceWidget, osg::Group* parentNode, QWidget *parent)
-: EditMode (worldspaceWidget, QIcon {":scenetoolbar/editing-terrain-shape"}, Mask_Terrain | Mask_Reference, "Terrain land editing", parent),
+: EditMode (worldspaceWidget, QIcon {":scenetoolbar/editing-terrain-shape"}, Mask_Terrain, "Terrain land editing", parent),
     mParentNode(parentNode)
 {
 }
@@ -1089,9 +1089,21 @@ void CSVRender::TerrainShapeMode::selectTerrainShapes(const std::pair<int, int>&
         }
     }
 
-    if(selectMode == 0) mTerrainShapeSelection->onlySelect(selections);
-    if(selectMode == 1) mTerrainShapeSelection->toggleSelect(selections, dragOperation);
+    std::string selectAction;
 
+    if (selectMode == 0)
+        selectAction = CSMPrefs::get()["3D Scene Editing"]["primary-select-action"].toString();
+    else
+        selectAction = CSMPrefs::get()["3D Scene Editing"]["secondary-select-action"].toString();
+        
+    if (selectAction == "Select only")
+        mTerrainShapeSelection->onlySelect(selections);
+    else if (selectAction == "Add to selection")
+        mTerrainShapeSelection->addSelect(selections, dragOperation);
+    else if (selectAction == "Remove from selection")
+        mTerrainShapeSelection->removeSelect(selections, dragOperation);
+    else if (selectAction == "Invert selection")
+        mTerrainShapeSelection->toggleSelect(selections, dragOperation);
 }
 
 void CSVRender::TerrainShapeMode::pushEditToCommand(const CSMWorld::LandHeightsColumn::DataType& newLandGrid, CSMDoc::Document& document,

From 008bf64dd916a926156c0e19ffe215c8bf32db9e Mon Sep 17 00:00:00 2001
From: Atahualpa <m_otto@hotmail.de>
Date: Mon, 10 May 2021 14:20:53 +0200
Subject: [PATCH 0805/2859] Second step toward fixing terrain selection issues.

---
 apps/opencs/view/render/cellborder.cpp       |  9 +++---
 apps/opencs/view/render/cellborder.hpp       |  3 +-
 apps/opencs/view/render/commands.cpp         | 20 +++++++++++++
 apps/opencs/view/render/commands.hpp         | 30 ++++++++++++++++++++
 apps/opencs/view/render/terrainshapemode.cpp |  3 ++
 5 files changed, 60 insertions(+), 5 deletions(-)
 create mode 100644 apps/opencs/view/render/commands.cpp
 create mode 100644 apps/opencs/view/render/commands.hpp

diff --git a/apps/opencs/view/render/cellborder.cpp b/apps/opencs/view/render/cellborder.cpp
index 6073807ce0..88de12ca5a 100644
--- a/apps/opencs/view/render/cellborder.cpp
+++ b/apps/opencs/view/render/cellborder.cpp
@@ -19,9 +19,12 @@ const int CSVRender::CellBorder::VertexCount = (ESM::Land::LAND_SIZE * 4) - 3;
 CSVRender::CellBorder::CellBorder(osg::Group* cellNode, const CSMWorld::CellCoordinates& coords)
     : mParentNode(cellNode)
 {
+    mBorderGeode = new osg::Geode();
+    
     mBaseNode = new osg::PositionAttitudeTransform();
     mBaseNode->setNodeMask(Mask_CellBorder);
     mBaseNode->setPosition(osg::Vec3f(coords.getX() * CellSize, coords.getY() * CellSize, 10));
+    mBaseNode->addChild(mBorderGeode);
 
     mParentNode->addChild(mBaseNode);
 }
@@ -79,10 +82,8 @@ void CSVRender::CellBorder::buildShape(const ESM::Land& esmLand)
     geometry->addPrimitiveSet(primitives);
     geometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
 
-
-    osg::ref_ptr<osg::Geode> geode = new osg::Geode();
-    geode->addDrawable(geometry);
-    mBaseNode->addChild(geode);
+    mBorderGeode->removeDrawables(0);
+    mBorderGeode->addDrawable(geometry);
 }
 
 size_t CSVRender::CellBorder::landIndex(int x, int y)
diff --git a/apps/opencs/view/render/cellborder.hpp b/apps/opencs/view/render/cellborder.hpp
index c91aa46c69..c7e47a00f4 100644
--- a/apps/opencs/view/render/cellborder.hpp
+++ b/apps/opencs/view/render/cellborder.hpp
@@ -7,6 +7,7 @@
 
 namespace osg
 {
+    class Geode;
     class Group;
     class PositionAttitudeTransform;
 }
@@ -47,7 +48,7 @@ namespace CSVRender
 
         osg::Group* mParentNode;
         osg::ref_ptr<osg::PositionAttitudeTransform> mBaseNode;
-
+        osg::ref_ptr<osg::Geode> mBorderGeode;
     };
 }
 
diff --git a/apps/opencs/view/render/commands.cpp b/apps/opencs/view/render/commands.cpp
new file mode 100644
index 0000000000..40634acec3
--- /dev/null
+++ b/apps/opencs/view/render/commands.cpp
@@ -0,0 +1,20 @@
+#include "commands.hpp"
+
+#include <components/esm/loadland.hpp>
+
+#include "cell.hpp"
+#include "terrainselection.hpp"
+
+CSVRender::DrawTerrainSelectionCommand::DrawTerrainSelectionCommand(TerrainSelection& terrainSelection, QUndoCommand* parent)
+    : mTerrainSelection(terrainSelection)
+{ }
+
+void CSVRender::DrawTerrainSelectionCommand::redo()
+{
+    mTerrainSelection.update();
+}
+
+void CSVRender::DrawTerrainSelectionCommand::undo()
+{
+    mTerrainSelection.update();
+}
diff --git a/apps/opencs/view/render/commands.hpp b/apps/opencs/view/render/commands.hpp
new file mode 100644
index 0000000000..f11a764612
--- /dev/null
+++ b/apps/opencs/view/render/commands.hpp
@@ -0,0 +1,30 @@
+#ifndef CSV_RENDER_COMMANDS_HPP
+#define CSV_RENDER_COMMANDS_HPP
+
+#include <QUndoCommand>
+
+namespace ESM
+{
+    struct Land;
+}
+
+namespace CSVRender
+{
+    class Cell;
+    class TerrainSelection;
+    
+
+    class DrawTerrainSelectionCommand : public QUndoCommand
+    {
+    private:
+        TerrainSelection& mTerrainSelection;
+
+    public:
+        DrawTerrainSelectionCommand(TerrainSelection& terrainSelection, QUndoCommand* parent = nullptr);
+
+        void redo() override;
+        void undo() override;
+    };
+}
+
+#endif
diff --git a/apps/opencs/view/render/terrainshapemode.cpp b/apps/opencs/view/render/terrainshapemode.cpp
index 6209e161e9..418655f2f2 100644
--- a/apps/opencs/view/render/terrainshapemode.cpp
+++ b/apps/opencs/view/render/terrainshapemode.cpp
@@ -34,6 +34,7 @@
 #include "../../model/world/universalid.hpp"
 
 #include "brushdraw.hpp"
+#include "commands.hpp"
 #include "editmode.hpp"
 #include "pagedworldspacewidget.hpp"
 #include "mask.hpp"
@@ -284,6 +285,7 @@ void CSVRender::TerrainShapeMode::applyTerrainEditChanges()
     sortAndLimitAlteredCells();
 
     undoStack.beginMacro ("Edit shape and normal records");
+    undoStack.push(new DrawTerrainSelectionCommand(*mTerrainShapeSelection));
 
     for(CSMWorld::CellCoordinates cellCoordinates: mAlteredCells)
     {
@@ -353,6 +355,7 @@ void CSVRender::TerrainShapeMode::applyTerrainEditChanges()
         }
         pushNormalsEditToCommand(landNormalsNew, document, landTable, cellId);
     }
+    undoStack.push(new DrawTerrainSelectionCommand(*mTerrainShapeSelection));
     undoStack.endMacro();
     clearTransientEdits();
 }

From 6c49074765240064e5fab9b403cb4afb1d0358f2 Mon Sep 17 00:00:00 2001
From: Atahualpa <m_otto@hotmail.de>
Date: Mon, 10 May 2021 15:19:24 +0200
Subject: [PATCH 0806/2859] Remove old references to Cell class.

---
 apps/opencs/view/render/commands.cpp | 1 -
 apps/opencs/view/render/commands.hpp | 1 -
 2 files changed, 2 deletions(-)

diff --git a/apps/opencs/view/render/commands.cpp b/apps/opencs/view/render/commands.cpp
index 40634acec3..7b37602961 100644
--- a/apps/opencs/view/render/commands.cpp
+++ b/apps/opencs/view/render/commands.cpp
@@ -2,7 +2,6 @@
 
 #include <components/esm/loadland.hpp>
 
-#include "cell.hpp"
 #include "terrainselection.hpp"
 
 CSVRender::DrawTerrainSelectionCommand::DrawTerrainSelectionCommand(TerrainSelection& terrainSelection, QUndoCommand* parent)
diff --git a/apps/opencs/view/render/commands.hpp b/apps/opencs/view/render/commands.hpp
index f11a764612..545d8071f3 100644
--- a/apps/opencs/view/render/commands.hpp
+++ b/apps/opencs/view/render/commands.hpp
@@ -10,7 +10,6 @@ namespace ESM
 
 namespace CSVRender
 {
-    class Cell;
     class TerrainSelection;
     
 

From 73949d5bd063f5b1e9c227e5a55b658c617f90ae Mon Sep 17 00:00:00 2001
From: Atahualpa <m_otto@hotmail.de>
Date: Mon, 10 May 2021 16:07:46 +0200
Subject: [PATCH 0807/2859] Updating the CMake file isn't a bad idea either...

---
 apps/opencs/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index b73cd37b8e..19c32df609 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -89,7 +89,7 @@ opencs_units (view/render
     scenewidget worldspacewidget pagedworldspacewidget unpagedworldspacewidget
     previewwidget editmode instancemode instanceselectionmode instancemovemode
     orbitcameramode pathgridmode selectionmode pathgridselectionmode cameracontroller
-    cellwater terraintexturemode actor terrainselection terrainshapemode brushdraw
+    cellwater terraintexturemode actor terrainselection terrainshapemode brushdraw commands
     )
 
 opencs_units_noqt (view/render

From 7be891b4409178c9001d6690112a2b441e858ff9 Mon Sep 17 00:00:00 2001
From: Atahualpa <m_otto@hotmail.de>
Date: Mon, 10 May 2021 23:05:34 +0200
Subject: [PATCH 0808/2859] Directly use Geometry instead of Geode; fix for
 loop; add size_t type-cast.

---
 apps/opencs/view/render/cellborder.cpp | 35 +++++++++++++-------------
 apps/opencs/view/render/cellborder.hpp |  4 +--
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/apps/opencs/view/render/cellborder.cpp b/apps/opencs/view/render/cellborder.cpp
index 88de12ca5a..a1ae4f4527 100644
--- a/apps/opencs/view/render/cellborder.cpp
+++ b/apps/opencs/view/render/cellborder.cpp
@@ -2,7 +2,6 @@
 
 #include <osg/Group>
 #include <osg/PositionAttitudeTransform>
-#include <osg/Geode>
 #include <osg/Geometry>
 #include <osg/PrimitiveSet>
 
@@ -19,12 +18,12 @@ const int CSVRender::CellBorder::VertexCount = (ESM::Land::LAND_SIZE * 4) - 3;
 CSVRender::CellBorder::CellBorder(osg::Group* cellNode, const CSMWorld::CellCoordinates& coords)
     : mParentNode(cellNode)
 {
-    mBorderGeode = new osg::Geode();
+    mBorderGeometry = new osg::Geometry();
     
     mBaseNode = new osg::PositionAttitudeTransform();
     mBaseNode->setNodeMask(Mask_CellBorder);
     mBaseNode->setPosition(osg::Vec3f(coords.getX() * CellSize, coords.getY() * CellSize, 10));
-    mBaseNode->addChild(mBorderGeode);
+    mBaseNode->addChild(mBorderGeometry);
 
     mParentNode->addChild(mBaseNode);
 }
@@ -41,54 +40,56 @@ void CSVRender::CellBorder::buildShape(const ESM::Land& esmLand)
     if (!landData)
         return;
 
-    osg::ref_ptr<osg::Geometry> geometry = new osg::Geometry();
+    mBaseNode->removeChild(mBorderGeometry);
+    mBorderGeometry = new osg::Geometry();
 
     // Vertices
     osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array();
 
-    int x = 0, y = 0;
-    for (; x < ESM::Land::LAND_SIZE; ++x)
+    int x = 0;
+    int y = 0;
+
+    for (/* */; x < ESM::Land::LAND_SIZE - 1; ++x)
         vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), landData->mHeights[landIndex(x, y)]));
 
     x = ESM::Land::LAND_SIZE - 1;
-    for (; y < ESM::Land::LAND_SIZE; ++y)
+    for (/* */; y < ESM::Land::LAND_SIZE - 1; ++y)
         vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), landData->mHeights[landIndex(x, y)]));
 
     y = ESM::Land::LAND_SIZE - 1;
-    for (; x >= 0; --x)
+    for (/* */; x > 0; --x)
         vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), landData->mHeights[landIndex(x, y)]));
 
     x = 0;
-    for (; y >= 0; --y)
+    for (/* */; y >= 0; --y)
         vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), landData->mHeights[landIndex(x, y)]));
 
-    geometry->setVertexArray(vertices);
+    mBorderGeometry->setVertexArray(vertices);
 
     // Color
     osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array();
     colors->push_back(osg::Vec4f(0.f, 0.5f, 0.f, 1.f));
 
-    geometry->setColorArray(colors, osg::Array::BIND_PER_PRIMITIVE_SET);
+    mBorderGeometry->setColorArray(colors, osg::Array::BIND_PER_PRIMITIVE_SET);
 
     // Primitive
     osg::ref_ptr<osg::DrawElementsUShort> primitives =
-        new osg::DrawElementsUShort(osg::PrimitiveSet::LINE_STRIP, VertexCount+1);
+        new osg::DrawElementsUShort(osg::PrimitiveSet::LINE_STRIP, VertexCount);
 
     for (size_t i = 0; i < VertexCount; ++i)
         primitives->setElement(i, i);
 
     primitives->setElement(VertexCount, 0);
 
-    geometry->addPrimitiveSet(primitives);
-    geometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+    mBorderGeometry->addPrimitiveSet(primitives);
+    mBorderGeometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
 
-    mBorderGeode->removeDrawables(0);
-    mBorderGeode->addDrawable(geometry);
+    mBaseNode->addChild(mBorderGeometry);
 }
 
 size_t CSVRender::CellBorder::landIndex(int x, int y)
 {
-    return y * ESM::Land::LAND_SIZE + x;
+    return static_cast<size_t>(y) * ESM::Land::LAND_SIZE + x;
 }
 
 float CSVRender::CellBorder::scaleToWorld(int value)
diff --git a/apps/opencs/view/render/cellborder.hpp b/apps/opencs/view/render/cellborder.hpp
index c7e47a00f4..be2e18eeee 100644
--- a/apps/opencs/view/render/cellborder.hpp
+++ b/apps/opencs/view/render/cellborder.hpp
@@ -7,7 +7,7 @@
 
 namespace osg
 {
-    class Geode;
+    class Geometry;
     class Group;
     class PositionAttitudeTransform;
 }
@@ -48,7 +48,7 @@ namespace CSVRender
 
         osg::Group* mParentNode;
         osg::ref_ptr<osg::PositionAttitudeTransform> mBaseNode;
-        osg::ref_ptr<osg::Geode> mBorderGeode;
+        osg::ref_ptr<osg::Geometry> mBorderGeometry;
     };
 }
 

From 425f745d53ae6858de353564f0d1ee3c12d0984b Mon Sep 17 00:00:00 2001
From: Atahualpa <m_otto@hotmail.de>
Date: Tue, 18 May 2021 15:03:56 +0200
Subject: [PATCH 0809/2859] Resolved merge conflicts with changelog.

---
 CHANGELOG.md    | 4 ++++
 CHANGELOG_PR.md | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d5c973525..632e023093 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -64,6 +64,7 @@
     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
@@ -124,6 +125,8 @@
     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 #6043: Actor can have torch missing when torch animation is played
     Bug #6047: Mouse bindings can be triggered during save loading
@@ -166,6 +169,7 @@
     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 #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
diff --git a/CHANGELOG_PR.md b/CHANGELOG_PR.md
index cfe709e97c..25528f21d0 100644
--- a/CHANGELOG_PR.md
+++ b/CHANGELOG_PR.md
@@ -38,9 +38,13 @@ Editor Bug Fixes:
 - 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)
 
 Miscellaneous:
 - Prevent save-game bloating by using an appropriate fog texture format (#5108)

From 356efa15a2bcfc2d57f002ba8f424acb4a111846 Mon Sep 17 00:00:00 2001
From: Atahualpa <m_otto@hotmail.de>
Date: Wed, 12 May 2021 13:33:36 +0200
Subject: [PATCH 0810/2859] Fixes #6035 (circle brush selects outside of
 circle) and #6036 (some corner vertices not selected).

---
 apps/opencs/view/render/terrainshapemode.cpp | 30 ++++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/apps/opencs/view/render/terrainshapemode.cpp b/apps/opencs/view/render/terrainshapemode.cpp
index 418655f2f2..c1b20da4cc 100644
--- a/apps/opencs/view/render/terrainshapemode.cpp
+++ b/apps/opencs/view/render/terrainshapemode.cpp
@@ -433,7 +433,9 @@ void CSVRender::TerrainShapeMode::editTerrainShapeGrid(const std::pair<int, int>
                 float smoothedByDistance = 0.0f;
                 if (mShapeEditTool == ShapeEditTool_Drag) smoothedByDistance = calculateBumpShape(distance, r, mTotalDiffY);
                 if (mShapeEditTool == ShapeEditTool_PaintToRaise || mShapeEditTool == ShapeEditTool_PaintToLower) smoothedByDistance = calculateBumpShape(distance, r, r + mShapeEditToolStrength);
-                if (distance <= r)
+
+                // Using floating-point radius here to prevent selecting too few vertices.
+                if (distance <= mBrushSize / 2.0f)
                 {
                     if (mShapeEditTool == ShapeEditTool_Drag) alterHeight(cellCoords, x, y, smoothedByDistance);
                     if (mShapeEditTool == ShapeEditTool_PaintToRaise || mShapeEditTool == ShapeEditTool_PaintToLower)
@@ -1036,10 +1038,25 @@ void CSVRender::TerrainShapeMode::handleSelection(int globalSelectionX, int glob
             return;
         int selectionX = globalSelectionX;
         int selectionY = globalSelectionY;
-        if (xIsAtCellBorder)
+
+        if (xIsAtCellBorder && yIsAtCellBorder)
+        {
+            if (isInCellSelection(globalSelectionX - 1, globalSelectionY - 1)
+                || isInCellSelection(globalSelectionX + 1, globalSelectionY - 1)
+                || isInCellSelection(globalSelectionX - 1, globalSelectionY + 1))
+            {
+                selections->emplace_back(globalSelectionX, globalSelectionY);
+            }
+        }
+        else if (xIsAtCellBorder)
+        {
             selectionX--;
-        if (yIsAtCellBorder)
+        }
+        else if (yIsAtCellBorder)
+        {
             selectionY--;
+        }
+
         if (isInCellSelection(selectionX, selectionY))
             selections->emplace_back(globalSelectionX, globalSelectionY);
     }
@@ -1074,8 +1091,11 @@ void CSVRender::TerrainShapeMode::selectTerrainShapes(const std::pair<int, int>&
             {
                 int distanceX = abs(i - vertexCoords.first);
                 int distanceY = abs(j - vertexCoords.second);
-                int distance = std::round(sqrt(pow(distanceX, 2)+pow(distanceY, 2)));
-                if (distance <= r) handleSelection(i, j, &selections);
+                float distance = sqrt(pow(distanceX, 2)+pow(distanceY, 2));
+
+                // Using floating-point radius here to prevent selecting too few vertices.
+                if (distance <= mBrushSize / 2.0f)
+                    handleSelection(i, j, &selections);
             }
         }
     }

From d500507dec6db05e0f458c3b2527f4c74363232d Mon Sep 17 00:00:00 2001
From: Atahualpa <m_otto@hotmail.de>
Date: Tue, 18 May 2021 15:05:19 +0200
Subject: [PATCH 0811/2859] Resolved merge conflicts with changelog (cont.)

---
 CHANGELOG.md    | 2 ++
 CHANGELOG_PR.md | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 632e023093..e11d05d3d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -128,6 +128,8 @@
     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
     Feature #390: 3rd person look "over the shoulder"
diff --git a/CHANGELOG_PR.md b/CHANGELOG_PR.md
index 25528f21d0..100bc376ff 100644
--- a/CHANGELOG_PR.md
+++ b/CHANGELOG_PR.md
@@ -45,6 +45,8 @@ Editor Bug Fixes:
 - 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)

From ca80aeaaeac1b90736c107eb8d1dda320f18f4d1 Mon Sep 17 00:00:00 2001
From: Atahualpa <m_otto@hotmail.de>
Date: Thu, 13 May 2021 01:21:24 +0200
Subject: [PATCH 0812/2859] Fix vertex calculation for cell-border drawing.

---
 apps/opencs/view/render/cellborder.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/opencs/view/render/cellborder.cpp b/apps/opencs/view/render/cellborder.cpp
index a1ae4f4527..674572232d 100644
--- a/apps/opencs/view/render/cellborder.cpp
+++ b/apps/opencs/view/render/cellborder.cpp
@@ -12,7 +12,7 @@
 #include "../../model/world/cellcoordinates.hpp"
 
 const int CSVRender::CellBorder::CellSize = ESM::Land::REAL_SIZE;
-const int CSVRender::CellBorder::VertexCount = (ESM::Land::LAND_SIZE * 4) - 3;
+const int CSVRender::CellBorder::VertexCount = (ESM::Land::LAND_SIZE * 4) - 4;
 
 
 CSVRender::CellBorder::CellBorder(osg::Group* cellNode, const CSMWorld::CellCoordinates& coords)
@@ -61,7 +61,7 @@ void CSVRender::CellBorder::buildShape(const ESM::Land& esmLand)
         vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), landData->mHeights[landIndex(x, y)]));
 
     x = 0;
-    for (/* */; y >= 0; --y)
+    for (/* */; y > 0; --y)
         vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), landData->mHeights[landIndex(x, y)]));
 
     mBorderGeometry->setVertexArray(vertices);
@@ -74,7 +74,7 @@ void CSVRender::CellBorder::buildShape(const ESM::Land& esmLand)
 
     // Primitive
     osg::ref_ptr<osg::DrawElementsUShort> primitives =
-        new osg::DrawElementsUShort(osg::PrimitiveSet::LINE_STRIP, VertexCount);
+        new osg::DrawElementsUShort(osg::PrimitiveSet::LINE_STRIP, VertexCount + 1);
 
     for (size_t i = 0; i < VertexCount; ++i)
         primitives->setElement(i, i);

From 3a1243a5d074cf5861886a6bad94103c276a619c Mon Sep 17 00:00:00 2001
From: Atahualpa <m_otto@hotmail.de>
Date: Tue, 18 May 2021 17:53:00 +0200
Subject: [PATCH 0813/2859] Rebased branch, reduced code duplication, added
 comments, adjusted formatting.

---
 apps/opencs/view/render/cellborder.cpp       |  22 +-
 apps/opencs/view/render/commands.hpp         |  18 +-
 apps/opencs/view/render/terrainselection.cpp | 216 +++++++++----------
 apps/opencs/view/render/terrainselection.hpp |  10 +
 apps/opencs/view/render/terrainshapemode.cpp |  14 ++
 5 files changed, 150 insertions(+), 130 deletions(-)

diff --git a/apps/opencs/view/render/cellborder.cpp b/apps/opencs/view/render/cellborder.cpp
index 674572232d..d8ff638010 100644
--- a/apps/opencs/view/render/cellborder.cpp
+++ b/apps/opencs/view/render/cellborder.cpp
@@ -12,6 +12,11 @@
 #include "../../model/world/cellcoordinates.hpp"
 
 const int CSVRender::CellBorder::CellSize = ESM::Land::REAL_SIZE;
+
+/*
+    The number of vertices per cell border is equal to the number of vertices per edge
+    minus the duplicated corner vertices. An additional vertex to close the loop is NOT needed.
+*/
 const int CSVRender::CellBorder::VertexCount = (ESM::Land::LAND_SIZE * 4) - 4;
 
 
@@ -43,42 +48,45 @@ void CSVRender::CellBorder::buildShape(const ESM::Land& esmLand)
     mBaseNode->removeChild(mBorderGeometry);
     mBorderGeometry = new osg::Geometry();
 
-    // Vertices
     osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array();
 
     int x = 0;
     int y = 0;
 
-    for (/* */; x < ESM::Land::LAND_SIZE - 1; ++x)
+    /*
+        Traverse the cell border counter-clockwise starting at the SW corner vertex (0, 0).
+        Each loop starts at a corner vertex and ends right before the next corner vertex.
+    */
+    for (; x < ESM::Land::LAND_SIZE - 1; ++x)
         vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), landData->mHeights[landIndex(x, y)]));
 
     x = ESM::Land::LAND_SIZE - 1;
-    for (/* */; y < ESM::Land::LAND_SIZE - 1; ++y)
+    for (; y < ESM::Land::LAND_SIZE - 1; ++y)
         vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), landData->mHeights[landIndex(x, y)]));
 
     y = ESM::Land::LAND_SIZE - 1;
-    for (/* */; x > 0; --x)
+    for (; x > 0; --x)
         vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), landData->mHeights[landIndex(x, y)]));
 
     x = 0;
-    for (/* */; y > 0; --y)
+    for (; y > 0; --y)
         vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), landData->mHeights[landIndex(x, y)]));
 
     mBorderGeometry->setVertexArray(vertices);
 
-    // Color
     osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array();
     colors->push_back(osg::Vec4f(0.f, 0.5f, 0.f, 1.f));
 
     mBorderGeometry->setColorArray(colors, osg::Array::BIND_PER_PRIMITIVE_SET);
 
-    // Primitive
     osg::ref_ptr<osg::DrawElementsUShort> primitives =
         new osg::DrawElementsUShort(osg::PrimitiveSet::LINE_STRIP, VertexCount + 1);
 
+    // Assign one primitive to each vertex.
     for (size_t i = 0; i < VertexCount; ++i)
         primitives->setElement(i, i);
 
+    // Assign the last primitive to the first vertex to close the loop.
     primitives->setElement(VertexCount, 0);
 
     mBorderGeometry->addPrimitiveSet(primitives);
diff --git a/apps/opencs/view/render/commands.hpp b/apps/opencs/view/render/commands.hpp
index 545d8071f3..cdc389e33a 100644
--- a/apps/opencs/view/render/commands.hpp
+++ b/apps/opencs/view/render/commands.hpp
@@ -3,16 +3,22 @@
 
 #include <QUndoCommand>
 
-namespace ESM
-{
-    struct Land;
-}
-
 namespace CSVRender
 {
     class TerrainSelection;
-    
 
+    /*
+        Current solution to force a redrawing of the terrain-selection grid
+        when undoing/redoing changes in the editor.
+        This only triggers a simple redraw of the grid, so only use it in
+        conjunction with actual data changes which deform the grid.
+
+        Please note that this command needs to be put onto the QUndoStack twice:
+        at the start and at the end of the related terrain manipulation.
+        This makes sure that the grid is always updated after all changes have
+        been undone or redone -- but it also means that the selection is redrawn
+        once at the beginning of either action. Future refinement may solve that.
+    */
     class DrawTerrainSelectionCommand : public QUndoCommand
     {
     private:
diff --git a/apps/opencs/view/render/terrainselection.cpp b/apps/opencs/view/render/terrainselection.cpp
index be7fefe308..0593917e0a 100644
--- a/apps/opencs/view/render/terrainselection.cpp
+++ b/apps/opencs/view/render/terrainselection.cpp
@@ -39,135 +39,23 @@ std::vector<std::pair<int, int>> CSVRender::TerrainSelection::getTerrainSelectio
 void CSVRender::TerrainSelection::onlySelect(const std::vector<std::pair<int, int>> &localPositions)
 {
     mSelection = localPositions;
+
     update();
 }
 
 void CSVRender::TerrainSelection::addSelect(const std::vector<std::pair<int, int>>& localPositions, bool toggleInProgress)
 {
-    if (toggleInProgress)
-    {
-        for (auto const& localPos : localPositions)
-        {
-            auto iterTemp = std::find(mTemporarySelection.begin(), mTemporarySelection.end(), localPos);
-            mDraggedOperationFlag = true;
-
-            if (iterTemp == mTemporarySelection.end())
-            {
-                auto iter = std::find(mSelection.begin(), mSelection.end(), localPos);
-                if (iter == mSelection.end())
-                {
-                    mSelection.emplace_back(localPos);
-                }
-            }
-
-            mTemporarySelection.push_back(localPos);
-        }
-    }
-    else if (mDraggedOperationFlag == false)
-    {
-        for (auto const& localPos : localPositions)
-        {
-            const auto iter = std::find(mSelection.begin(), mSelection.end(), localPos);
-            if (iter == mSelection.end())
-            {
-                mSelection.emplace_back(localPos);
-            }
-        }
-    }
-    else
-    {
-        mDraggedOperationFlag = false;
-        mTemporarySelection.clear();
-    }
-    update();
+    handleSelection(localPositions, toggleInProgress, SelectionMethod::AddSelect);
 }
 
 void CSVRender::TerrainSelection::removeSelect(const std::vector<std::pair<int, int>>& localPositions, bool toggleInProgress)
 {
-    if (toggleInProgress)
-    {
-        for (auto const& localPos : localPositions)
-        {
-            auto iterTemp = std::find(mTemporarySelection.begin(), mTemporarySelection.end(), localPos);
-            mDraggedOperationFlag = true;
-
-            if (iterTemp == mTemporarySelection.end())
-            {
-                auto iter = std::find(mSelection.begin(), mSelection.end(), localPos);
-                if (iter != mSelection.end())
-                {
-                    mSelection.erase(iter);
-                }
-            }
-
-            mTemporarySelection.push_back(localPos);
-        }
-    }
-    else if (mDraggedOperationFlag == false)
-    {
-        for (auto const& localPos : localPositions)
-        {
-            const auto iter = std::find(mSelection.begin(), mSelection.end(), localPos);
-            if (iter != mSelection.end())
-            {
-                mSelection.erase(iter);
-            }
-        }
-    }
-    else
-    {
-        mDraggedOperationFlag = false;
-        mTemporarySelection.clear();
-    }
-    update();
+    handleSelection(localPositions, toggleInProgress, SelectionMethod::RemoveSelect);
 }
 
-void CSVRender::TerrainSelection::toggleSelect(const std::vector<std::pair<int, int>> &localPositions, bool toggleInProgress)
+void CSVRender::TerrainSelection::toggleSelect(const std::vector<std::pair<int, int>>& localPositions, bool toggleInProgress)
 {
-    if (toggleInProgress)
-    {
-        for(auto const& localPos: localPositions)
-        {
-            auto iterTemp = std::find(mTemporarySelection.begin(), mTemporarySelection.end(), localPos);
-            mDraggedOperationFlag = true;
-
-            if (iterTemp == mTemporarySelection.end())
-            {
-                auto iter = std::find(mSelection.begin(), mSelection.end(), localPos);
-                if (iter != mSelection.end())
-                {
-                    mSelection.erase(iter);
-                }
-                else
-                {
-                    mSelection.emplace_back(localPos);
-                }
-            }
-
-            mTemporarySelection.push_back(localPos);
-        }
-    }
-    else if (mDraggedOperationFlag == false)
-    {
-        for(auto const& localPos: localPositions)
-        {
-            const auto iter = std::find(mSelection.begin(), mSelection.end(), localPos);
-            if (iter != mSelection.end())
-            {
-                mSelection.erase(iter);
-            }
-            else
-            {
-                mSelection.emplace_back(localPos);
-            }
-        }
-    }
-    else
-    {
-        mDraggedOperationFlag = false;
-        mTemporarySelection.clear();
-    }
-    update();
+    handleSelection(localPositions, toggleInProgress, SelectionMethod::ToggleSelect);
 }
 
 void CSVRender::TerrainSelection::activate()
@@ -310,6 +198,100 @@ void CSVRender::TerrainSelection::drawTextureSelection(const osg::ref_ptr<osg::V
     }
 }
 
+void CSVRender::TerrainSelection::handleSelection(const std::vector<std::pair<int, int>>& localPositions, bool toggleInProgress, SelectionMethod selectionMethod)
+{
+    if (toggleInProgress)
+    {
+        for (auto const& localPos : localPositions)
+        {
+            auto iterTemp = std::find(mTemporarySelection.begin(), mTemporarySelection.end(), localPos);
+            mDraggedOperationFlag = true;
+
+            if (iterTemp == mTemporarySelection.end())
+            {
+                auto iter = std::find(mSelection.begin(), mSelection.end(), localPos);
+
+                switch (selectionMethod)
+                {
+                case SelectionMethod::AddSelect:
+                    if (iter == mSelection.end())
+                    {
+                        mSelection.emplace_back(localPos);
+                    }
+
+                    break;
+                case SelectionMethod::RemoveSelect:
+                    if (iter != mSelection.end())
+                    {
+                        mSelection.erase(iter);
+                    }
+
+                    break;
+                case SelectionMethod::ToggleSelect:
+                    if (iter == mSelection.end())
+                    {
+                        mSelection.emplace_back(localPos);
+                    }
+                    else
+                    {
+                        mSelection.erase(iter);
+                    }
+
+                    break;
+                default: break;
+                }
+            }
+
+            mTemporarySelection.push_back(localPos);
+        }
+    }
+    else if (mDraggedOperationFlag == false)
+    {
+        for (auto const& localPos : localPositions)
+        {
+            const auto iter = std::find(mSelection.begin(), mSelection.end(), localPos);
+
+            switch (selectionMethod)
+            {
+            case SelectionMethod::AddSelect:
+                if (iter == mSelection.end())
+                {
+                    mSelection.emplace_back(localPos);
+                }
+
+                break;
+            case SelectionMethod::RemoveSelect:
+                if (iter != mSelection.end())
+                {
+                    mSelection.erase(iter);
+                }
+
+                break;
+            case SelectionMethod::ToggleSelect:
+                if (iter == mSelection.end())
+                {
+                    mSelection.emplace_back(localPos);
+                }
+                else
+                {
+                    mSelection.erase(iter);
+                }
+
+                break;
+            default: break;
+            }
+        }
+    }
+    else
+    {
+        mDraggedOperationFlag = false;
+
+        mTemporarySelection.clear();
+    }
+
+    update();
+}
+
 bool CSVRender::TerrainSelection::noCell(const std::string& cellId)
 {
     CSMDoc::Document& document = mWorldspaceWidget->getDocument();
diff --git a/apps/opencs/view/render/terrainselection.hpp b/apps/opencs/view/render/terrainselection.hpp
index 9c1eb55b17..18622ad13a 100644
--- a/apps/opencs/view/render/terrainselection.hpp
+++ b/apps/opencs/view/render/terrainselection.hpp
@@ -27,6 +27,14 @@ namespace CSVRender
         Shape
     };
 
+    enum class SelectionMethod
+    {
+        OnlySelect,
+        AddSelect,
+        RemoveSelect,
+        ToggleSelect
+    };
+
     /// \brief Class handling the terrain selection data and rendering
     class TerrainSelection
     {
@@ -56,6 +64,8 @@ namespace CSVRender
 
         private:
 
+            void handleSelection(const std::vector<std::pair<int, int>>& localPositions, bool toggleInProgress, SelectionMethod selectionMethod);
+
             bool noCell(const std::string& cellId);
 
             bool noLand(const std::string& cellId);
diff --git a/apps/opencs/view/render/terrainshapemode.cpp b/apps/opencs/view/render/terrainshapemode.cpp
index c1b20da4cc..866ff69cde 100644
--- a/apps/opencs/view/render/terrainshapemode.cpp
+++ b/apps/opencs/view/render/terrainshapemode.cpp
@@ -285,6 +285,8 @@ void CSVRender::TerrainShapeMode::applyTerrainEditChanges()
     sortAndLimitAlteredCells();
 
     undoStack.beginMacro ("Edit shape and normal records");
+
+    // One command at the beginning of the macro for redrawing the terrain-selection grid when undoing the changes.
     undoStack.push(new DrawTerrainSelectionCommand(*mTerrainShapeSelection));
 
     for(CSMWorld::CellCoordinates cellCoordinates: mAlteredCells)
@@ -355,7 +357,9 @@ void CSVRender::TerrainShapeMode::applyTerrainEditChanges()
         }
         pushNormalsEditToCommand(landNormalsNew, document, landTable, cellId);
     }
+    // One command at the end of the macro for redrawing the terrain-selection grid when redoing the changes.
     undoStack.push(new DrawTerrainSelectionCommand(*mTerrainShapeSelection));
+
     undoStack.endMacro();
     clearTransientEdits();
 }
@@ -1039,8 +1043,18 @@ void CSVRender::TerrainShapeMode::handleSelection(int globalSelectionX, int glob
         int selectionX = globalSelectionX;
         int selectionY = globalSelectionY;
 
+        /*
+            The northern and eastern edges don't belong to the current cell.
+            If the corresponding adjacent cell is not loaded, some special handling is necessary to select border vertices.
+        */
         if (xIsAtCellBorder && yIsAtCellBorder)
         {
+            /* 
+                Handle the NW, NE, and SE corner vertices.
+                NW corner: (+1, -1) offset to reach current cell.
+                NE corner: (-1, -1) offset to reach current cell.
+                SE corner: (-1, +1) offset to reach current cell.
+            */
             if (isInCellSelection(globalSelectionX - 1, globalSelectionY - 1)
                 || isInCellSelection(globalSelectionX + 1, globalSelectionY - 1)
                 || isInCellSelection(globalSelectionX - 1, globalSelectionY + 1))

From d11a6bd92c54ba229936d65f9d4353a1ec8f0eae Mon Sep 17 00:00:00 2001
From: CedricMocquillon <cedric.mocquillon@sage.com>
Date: Tue, 18 May 2021 14:03:16 +0200
Subject: [PATCH 0814/2859] Share state

---
 apps/openmw/mwrender/objectpaging.cpp | 1 +
 components/resource/scenemanager.cpp  | 6 ++++++
 components/resource/scenemanager.hpp  | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index d8f0215c0d..b6bae8cbb5 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -651,6 +651,7 @@ namespace MWRender
             }
             optimizer.setIsOperationPermissibleForObjectCallback(new CanOptimizeCallback);
             unsigned int options = SceneUtil::Optimizer::FLATTEN_STATIC_TRANSFORMS|SceneUtil::Optimizer::REMOVE_REDUNDANT_NODES|SceneUtil::Optimizer::MERGE_GEOMETRY;
+            mSceneManager->shareState(mergeGroup);
             optimizer.optimize(mergeGroup, options);
 
             group->addChild(mergeGroup);
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 201767ab38..f6035a47dd 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -514,6 +514,12 @@ namespace Resource
         return options;
     }
 
+    void SceneManager::shareState(osg::ref_ptr<osg::Node> node) {
+        mSharedStateMutex.lock();
+        mSharedStateManager->share(node.get());
+        mSharedStateMutex.unlock();
+    }
+
     osg::ref_ptr<const osg::Node> SceneManager::getTemplate(const std::string &name, bool compile)
     {
         std::string normalized = name;
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index 7635cd20fc..de014165bf 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -135,7 +135,7 @@ namespace Resource
         osg::ref_ptr<osg::Node> createInstance(const std::string& name);
 
         osg::ref_ptr<osg::Node> createInstance(const osg::Node* base);
-
+        void shareState(osg::ref_ptr<osg::Node> node);
         /// Get an instance of the given scene template
         /// @see getTemplate
         /// @note Thread safe.

From 4a15868c0e12a45d9178a9779d388b59a942dfab Mon Sep 17 00:00:00 2001
From: Thunderforge <wjherrmann@gmail.com>
Date: Tue, 18 May 2021 18:05:54 -0500
Subject: [PATCH 0815/2859] Moving Lighting Method from Advanced -> Visuals to
 Graphics -> Lighting

The plan is to add additional options to this new tab, and since it's of similar status as the Shaders settings, it makes sense to put them next to them on the Graphics page.
---
 apps/launcher/advancedpage.cpp | 10 -------
 apps/launcher/graphicspage.cpp | 17 ++++++++++++
 files/ui/advancedpage.ui       | 30 --------------------
 files/ui/graphicspage.ui       | 50 ++++++++++++++++++++++++++++++++++
 4 files changed, 67 insertions(+), 40 deletions(-)

diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index 5199be07e6..ed36634b62 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -136,13 +136,6 @@ bool Launcher::AdvancedPage::loadSettings()
 
         loadSettingBool(activeGridObjectPagingCheckBox, "object paging active grid", "Terrain");
         viewingDistanceComboBox->setValue(convertToCells(Settings::Manager::getInt("viewing distance", "Camera")));
-
-        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);
     }
 
     // Audio
@@ -294,9 +287,6 @@ void Launcher::AdvancedPage::saveSettings()
         {
             Settings::Manager::setInt("viewing distance", "Camera", convertToUnits(viewingDistance));
         }
-
-        static std::array<std::string, 3> lightingMethodMap = {"legacy", "shaders compatibility", "shaders"};
-        Settings::Manager::setString("lighting method", "Shaders", lightingMethodMap[lightingMethodComboBox->currentIndex()]);
     }
     
     // Audio
diff --git a/apps/launcher/graphicspage.cpp b/apps/launcher/graphicspage.cpp
index 3bfd90fdeb..ebb031e9ef 100644
--- a/apps/launcher/graphicspage.cpp
+++ b/apps/launcher/graphicspage.cpp
@@ -92,6 +92,7 @@ bool Launcher::GraphicsPage::loadSettings()
     if (!setupSDL())
         return false;
 
+    // Visuals
     if (Settings::Manager::getBool("vsync", "Video"))
         vSyncCheckBox->setCheckState(Qt::Checked);
 
@@ -131,6 +132,15 @@ bool Launcher::GraphicsPage::loadSettings()
         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"))
@@ -167,6 +177,8 @@ bool Launcher::GraphicsPage::loadSettings()
 
 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();
@@ -219,6 +231,11 @@ void Launcher::GraphicsPage::saveSettings()
         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);
diff --git a/files/ui/advancedpage.ui b/files/ui/advancedpage.ui
index 645f8629f4..5859f1f382 100644
--- a/files/ui/advancedpage.ui
+++ b/files/ui/advancedpage.ui
@@ -444,36 +444,6 @@
                 </property>
                </widget>
               </item>
-              <item row="3" column="0">
-               <layout class="QHBoxLayout" name="lightingMethodLayout">
-                <item>
-                 <widget class="QLabel" name="lightingMethodLabel">
-                  <property name="text">
-                   <string>Lighting Method:</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QComboBox" name="lightingMethodComboBox">
-                  <item>
-                   <property name="text">
-                    <string>legacy</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>shaders compatibility</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>shaders</string>
-                   </property>
-                  </item>
-                 </widget>
-                </item>
-               </layout>
-              </item>
              </layout>
             </widget>
            </item>
diff --git a/files/ui/graphicspage.ui b/files/ui/graphicspage.ui
index 5ec72611f8..508a955d7b 100644
--- a/files/ui/graphicspage.ui
+++ b/files/ui/graphicspage.ui
@@ -187,6 +187,56 @@
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="LightingWrapper">
+      <attribute name="title">
+       <string>Lighting</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="lightingLayout">
+       <item>
+        <layout class="QHBoxLayout" name="lightingMethodLayout">
+         <item>
+          <widget class="QLabel" name="lightingMethodLabel">
+           <property name="text">
+            <string>Lighting Method:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="lightingMethodComboBox">
+           <item>
+            <property name="text">
+             <string>legacy</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>shaders compatibility</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>shaders</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
      <widget class="QWidget" name="ShadowWrapper">
       <attribute name="title">
        <string>Shadows</string>

From 6ba23a028c6e7b6652c5c73af3aacc73bbf70dfb Mon Sep 17 00:00:00 2001
From: Thunderforge <wjherrmann@gmail.com>
Date: Tue, 18 May 2021 18:23:16 -0500
Subject: [PATCH 0816/2859] Removing unused imports in the Launcher

---
 apps/launcher/datafilespage.cpp    | 1 -
 apps/launcher/graphicspage.cpp     | 2 --
 apps/launcher/maindialog.cpp       | 1 -
 apps/launcher/settingspage.cpp     | 5 -----
 apps/launcher/utils/openalutil.cpp | 1 -
 5 files changed, 10 deletions(-)

diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index 956483a3f2..24729d5096 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -17,7 +17,6 @@
 
 #include <components/config/gamesettings.hpp>
 #include <components/config/launchersettings.hpp>
-#include <iostream>
 
 #include "utils/textinputdialog.hpp"
 #include "utils/profilescombobox.hpp"
diff --git a/apps/launcher/graphicspage.cpp b/apps/launcher/graphicspage.cpp
index 3bfd90fdeb..bb906085be 100644
--- a/apps/launcher/graphicspage.cpp
+++ b/apps/launcher/graphicspage.cpp
@@ -15,8 +15,6 @@
 
 #include <numeric>
 
-#include <components/files/configurationmanager.hpp>
-
 QString getAspect(int x, int y)
 {
     int gcd = std::gcd (x, y);
diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp
index d41cd529d3..de3070f463 100644
--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@@ -6,7 +6,6 @@
 #include <QDate>
 #include <QMessageBox>
 #include <QFontDatabase>
-#include <QInputDialog>
 #include <QFileDialog>
 #include <QCloseEvent>
 #include <QTextCodec>
diff --git a/apps/launcher/settingspage.cpp b/apps/launcher/settingspage.cpp
index ca7fd028a7..9c750a7c25 100644
--- a/apps/launcher/settingspage.cpp
+++ b/apps/launcher/settingspage.cpp
@@ -4,11 +4,6 @@
 #include <QMessageBox>
 #include <QDir>
 
-#include <components/files/configurationmanager.hpp>
-
-#include <components/config/gamesettings.hpp>
-#include <components/config/launchersettings.hpp>
-
 #include "utils/textinputdialog.hpp"
 #include "datafilespage.hpp"
 
diff --git a/apps/launcher/utils/openalutil.cpp b/apps/launcher/utils/openalutil.cpp
index 52ad20894d..53fd704203 100644
--- a/apps/launcher/utils/openalutil.cpp
+++ b/apps/launcher/utils/openalutil.cpp
@@ -1,6 +1,5 @@
 #include <cstring>
 #include <vector>
-#include <memory>
 
 #include <apps/openmw/mwsound/alext.h>
 

From ded7bd92e64028902a0c1ffa23f157577cebf468 Mon Sep 17 00:00:00 2001
From: Thunderforge <wjherrmann@gmail.com>
Date: Tue, 18 May 2021 19:20:59 -0500
Subject: [PATCH 0817/2859] Using auto keyword in most apps

Detected by clang-tidy's modernize-use-auto
---
 apps/essimporter/converter.cpp           |  6 +++---
 apps/essimporter/converter.hpp           |  8 ++++----
 apps/essimporter/importer.cpp            |  6 +++---
 apps/launcher/maindialog.cpp             | 14 +++++++-------
 apps/launcher/utils/profilescombobox.cpp |  2 +-
 apps/launcher/utils/textinputdialog.cpp  |  4 ++--
 apps/mwiniimporter/importer.cpp          | 10 +++++-----
 apps/niftest/niftest.cpp                 |  4 ++--
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/apps/essimporter/converter.cpp b/apps/essimporter/converter.cpp
index e0756602dd..320f7224bc 100644
--- a/apps/essimporter/converter.cpp
+++ b/apps/essimporter/converter.cpp
@@ -357,7 +357,7 @@ namespace ESSImport
 
                 std::string idLower = Misc::StringUtils::lowerCase(out.mRefID);
 
-                std::map<std::pair<int, std::string>, NPCC>::const_iterator npccIt = mContext->mNpcChanges.find(
+                auto npccIt = mContext->mNpcChanges.find(
                             std::make_pair(refIndex, out.mRefID));
                 if (npccIt != mContext->mNpcChanges.end())
                 {
@@ -383,7 +383,7 @@ namespace ESSImport
                     continue;
                 }
 
-                std::map<std::pair<int, std::string>, CNTC>::const_iterator cntcIt = mContext->mContainerChanges.find(
+                auto cntcIt = mContext->mContainerChanges.find(
                             std::make_pair(refIndex, out.mRefID));
                 if (cntcIt != mContext->mContainerChanges.end())
                 {
@@ -398,7 +398,7 @@ namespace ESSImport
                     continue;
                 }
 
-                std::map<std::pair<int, std::string>, CREC>::const_iterator crecIt = mContext->mCreatureChanges.find(
+                auto crecIt = mContext->mCreatureChanges.find(
                             std::make_pair(refIndex, out.mRefID));
                 if (crecIt != mContext->mCreatureChanges.end())
                 {
diff --git a/apps/essimporter/converter.hpp b/apps/essimporter/converter.hpp
index 9a1923c2b6..46e4426dc5 100644
--- a/apps/essimporter/converter.hpp
+++ b/apps/essimporter/converter.hpp
@@ -374,7 +374,7 @@ public:
     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)
+        for (auto it = mKillCounter.begin(); it != mKillCounter.end(); ++it)
         {
             esm.writeHNString("ID__", it->first);
             esm.writeHNT ("COUN", it->second);
@@ -397,7 +397,7 @@ public:
         faction.load(esm, isDeleted);
         std::string id = Misc::StringUtils::lowerCase(faction.mId);
 
-        for (std::map<std::string, int>::const_iterator it = faction.mReactions.begin(); it != faction.mReactions.end(); ++it)
+        for (auto it = faction.mReactions.begin(); it != faction.mReactions.end(); ++it)
         {
             std::string faction2 = Misc::StringUtils::lowerCase(it->first);
             mContext->mDialogueState.mChangedFactionReaction[id].insert(std::make_pair(faction2, it->second));
@@ -431,7 +431,7 @@ public:
     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)
+        for (auto it = mStolenItems.begin(); it != mStolenItems.end(); ++it)
         {
             std::map<std::pair<std::string, bool>, int> owners;
             for (const auto & ownerIt : it->second)
@@ -487,7 +487,7 @@ public:
     }
     void write(ESM::ESMWriter &esm) override
     {
-        for (std::map<std::string, DIAL>::const_iterator it = mDials.begin(); it != mDials.end(); ++it)
+        for (auto it = mDials.begin(); it != mDials.end(); ++it)
         {
             esm.startRecord(ESM::REC_QUES);
             ESM::QuestState state;
diff --git a/apps/essimporter/importer.cpp b/apps/essimporter/importer.cpp
index 706512263e..27f77e40d1 100644
--- a/apps/essimporter/importer.cpp
+++ b/apps/essimporter/importer.cpp
@@ -385,7 +385,7 @@ namespace ESSImport
 
         // Writing order should be Dynamic Store -> Cells -> Player,
         // so that references to dynamic records can be recognized when loading
-        for (std::map<unsigned int, std::shared_ptr<Converter> >::const_iterator it = converters.begin();
+        for (auto it = converters.begin();
              it != converters.end(); ++it)
         {
             if (it->second->getStage() != 0)
@@ -398,7 +398,7 @@ namespace ESSImport
         context.mPlayerBase.save(writer);
         writer.endRecord(ESM::REC_NPC_);
 
-        for (std::map<unsigned int, std::shared_ptr<Converter> >::const_iterator it = converters.begin();
+        for (auto it = converters.begin();
              it != converters.end(); ++it)
         {
             if (it->second->getStage() != 1)
@@ -423,7 +423,7 @@ namespace ESSImport
         writer.endRecord(ESM::REC_ACTC);
 
         // Stage 2 requires cell references to be written / actors IDs assigned
-        for (std::map<unsigned int, std::shared_ptr<Converter> >::const_iterator it = converters.begin();
+        for (auto it = converters.begin();
              it != converters.end(); ++it)
         {
             if (it->second->getStage() != 2)
diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp
index d41cd529d3..d77d765227 100644
--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@@ -52,8 +52,8 @@ Launcher::MainDialog::MainDialog(QWidget *parent)
     iconWidget->setCurrentRow(0);
     iconWidget->setFlow(QListView::LeftToRight);
 
-    QPushButton *helpButton = new QPushButton(tr("Help"));
-    QPushButton *playButton = new QPushButton(tr("Play"));
+    auto *helpButton = new QPushButton(tr("Help"));
+    auto *playButton = new QPushButton(tr("Play"));
     buttonBox->button(QDialogButtonBox::Close)->setText(tr("Close"));
     buttonBox->addButton(helpButton, QDialogButtonBox::HelpRole);
     buttonBox->addButton(playButton, QDialogButtonBox::AcceptRole);
@@ -79,31 +79,31 @@ void Launcher::MainDialog::createIcons()
     if (!QIcon::hasThemeIcon("document-new"))
         QIcon::setThemeName("tango");
 
-    QListWidgetItem *playButton = new QListWidgetItem(iconWidget);
+    auto *playButton = new QListWidgetItem(iconWidget);
     playButton->setIcon(QIcon(":/images/openmw.png"));
     playButton->setText(tr("Play"));
     playButton->setTextAlignment(Qt::AlignCenter);
     playButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
 
-    QListWidgetItem *dataFilesButton = new QListWidgetItem(iconWidget);
+    auto *dataFilesButton = new QListWidgetItem(iconWidget);
     dataFilesButton->setIcon(QIcon(":/images/openmw-plugin.png"));
     dataFilesButton->setText(tr("Data Files"));
     dataFilesButton->setTextAlignment(Qt::AlignHCenter | Qt::AlignBottom);
     dataFilesButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
 
-    QListWidgetItem *graphicsButton = new QListWidgetItem(iconWidget);
+    auto *graphicsButton = new QListWidgetItem(iconWidget);
     graphicsButton->setIcon(QIcon(":/images/preferences-video.png"));
     graphicsButton->setText(tr("Graphics"));
     graphicsButton->setTextAlignment(Qt::AlignHCenter | Qt::AlignBottom | Qt::AlignAbsolute);
     graphicsButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
 
-    QListWidgetItem *settingsButton = new QListWidgetItem(iconWidget);
+    auto *settingsButton = new QListWidgetItem(iconWidget);
     settingsButton->setIcon(QIcon(":/images/preferences.png"));
     settingsButton->setText(tr("Settings"));
     settingsButton->setTextAlignment(Qt::AlignHCenter | Qt::AlignBottom);
     settingsButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
 
-    QListWidgetItem *advancedButton = new QListWidgetItem(iconWidget);
+    auto *advancedButton = new QListWidgetItem(iconWidget);
     advancedButton->setIcon(QIcon(":/images/preferences-advanced.png"));
     advancedButton->setText(tr("Advanced"));
     advancedButton->setTextAlignment(Qt::AlignHCenter | Qt::AlignBottom);
diff --git a/apps/launcher/utils/profilescombobox.cpp b/apps/launcher/utils/profilescombobox.cpp
index af349ddfff..d06cfacff6 100644
--- a/apps/launcher/utils/profilescombobox.cpp
+++ b/apps/launcher/utils/profilescombobox.cpp
@@ -29,7 +29,7 @@ void ProfilesComboBox::setEditEnabled(bool editable)
     setEditable(true);
     setValidator(mValidator);
 
-    ComboBoxLineEdit *edit = new ComboBoxLineEdit(this);
+    auto *edit = new ComboBoxLineEdit(this);
 
     setLineEdit(edit);
     setCompleter(nullptr);
diff --git a/apps/launcher/utils/textinputdialog.cpp b/apps/launcher/utils/textinputdialog.cpp
index 70b827596e..5bbcf4c198 100644
--- a/apps/launcher/utils/textinputdialog.cpp
+++ b/apps/launcher/utils/textinputdialog.cpp
@@ -16,7 +16,7 @@ Launcher::TextInputDialog::TextInputDialog(const QString& title, const QString &
     mButtonBox->addButton(QDialogButtonBox::Cancel);
     mButtonBox->button(QDialogButtonBox::Ok)->setEnabled (false);
 
-    QLabel *label = new QLabel(this);
+    auto *label = new QLabel(this);
     label->setText(text);
 
     // Line edit
@@ -25,7 +25,7 @@ Launcher::TextInputDialog::TextInputDialog(const QString& title, const QString &
     mLineEdit->setValidator(validator);
     mLineEdit->setCompleter(nullptr);
 
-    QVBoxLayout *dialogLayout = new QVBoxLayout(this);
+    auto *dialogLayout = new QVBoxLayout(this);
     dialogLayout->addWidget(label);
     dialogLayout->addWidget(mLineEdit);
     dialogLayout->addWidget(mButtonBox);
diff --git a/apps/mwiniimporter/importer.cpp b/apps/mwiniimporter/importer.cpp
index 2763d8ad95..35a1c4ec8b 100644
--- a/apps/mwiniimporter/importer.cpp
+++ b/apps/mwiniimporter/importer.cpp
@@ -778,7 +778,7 @@ void MwIniImporter::mergeFallback(multistrmap &cfg, const multistrmap &ini) cons
 }
 
 void MwIniImporter::insertMultistrmap(multistrmap &cfg, const std::string& key, const std::string& value) {
-    const multistrmap::const_iterator it = cfg.find(key);
+    const auto it = cfg.find(key);
     if(it == cfg.end()) {
         cfg.insert(std::make_pair (key, std::vector<std::string>() ));
     }
@@ -791,7 +791,7 @@ void MwIniImporter::importArchives(multistrmap &cfg, const multistrmap &ini) con
     std::string archive;
 
     // Search archives listed in ini file
-    multistrmap::const_iterator it = ini.begin();
+    auto it = ini.begin();
     for(int i=0; it != ini.end(); i++) {
         archive = baseArchive;
         archive.append(std::to_string(i));
@@ -813,7 +813,7 @@ void MwIniImporter::importArchives(multistrmap &cfg, const multistrmap &ini) con
     // does not appears in the ini file
     cfg["fallback-archive"].push_back("Morrowind.bsa");
 
-    for(std::vector<std::string>::const_iterator iter=archives.begin(); iter!=archives.end(); ++iter) {
+    for(auto iter=archives.begin(); iter!=archives.end(); ++iter) {
         cfg["fallback-archive"].push_back(*iter);
     }
 }
@@ -886,7 +886,7 @@ void MwIniImporter::importGameFiles(multistrmap &cfg, const multistrmap &ini, co
 
     dataPaths.push_back(iniFilename.parent_path() /= "Data Files");
 
-    multistrmap::const_iterator it = ini.begin();
+    auto it = ini.begin();
     for (int i=0; it != ini.end(); i++)
     {
         std::string gameFile = baseGameFile;
@@ -969,7 +969,7 @@ void MwIniImporter::importGameFiles(multistrmap &cfg, const multistrmap &ini, co
 void MwIniImporter::writeToFile(std::ostream &out, const multistrmap &cfg) {
 
     for(multistrmap::const_iterator it=cfg.begin(); it != cfg.end(); ++it) {
-        for(std::vector<std::string>::const_iterator entry=it->second.begin(); entry != it->second.end(); ++entry) {
+        for(auto entry=it->second.begin(); entry != it->second.end(); ++entry) {
             out << (it->first) << "=" << (*entry) << std::endl;
         }
     }
diff --git a/apps/niftest/niftest.cpp b/apps/niftest/niftest.cpp
index e403562d32..2e81885c75 100644
--- a/apps/niftest/niftest.cpp
+++ b/apps/niftest/niftest.cpp
@@ -53,7 +53,7 @@ void readVFS(VFS::Archive* anArchive,std::string archivePath = "")
     myManager.buildIndex();
 
     std::map<std::string, VFS::File*> files=myManager.getIndex();
-    for(std::map<std::string, VFS::File*>::const_iterator it=files.begin(); it!=files.end(); ++it)
+    for(auto it=files.begin(); it!=files.end(); ++it)
     {
         std::string name = it->first;
 
@@ -134,7 +134,7 @@ int main(int argc, char **argv)
 
     Nif::NIFFile::setLoadUnsupportedFiles(true);
 //     std::cout << "Reading Files" << std::endl;
-    for(std::vector<std::string>::const_iterator it=files.begin(); it!=files.end(); ++it)
+    for(auto it=files.begin(); it!=files.end(); ++it)
     {
         std::string name = *it;
 

From efcdb2dfdd79f88027def1264a3b8d6c361fc095 Mon Sep 17 00:00:00 2001
From: Thunderforge <wjherrmann@gmail.com>
Date: Tue, 18 May 2021 19:42:24 -0500
Subject: [PATCH 0818/2859] Using override keyword in most apps

Detected by clang-tidy's modernize-use-override

Future MRs can be created to run this on OpenMW and OpenMW CS
---
 apps/essimporter/importcellref.hpp      | 2 +-
 apps/launcher/maindialog.hpp            | 2 +-
 apps/launcher/settingspage.hpp          | 2 +-
 apps/launcher/utils/textinputdialog.hpp | 2 +-
 apps/wizard/installationpage.hpp        | 2 +-
 apps/wizard/mainwizard.hpp              | 2 +-
 apps/wizard/unshield/unshieldworker.hpp | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/essimporter/importcellref.hpp b/apps/essimporter/importcellref.hpp
index b115628d5e..4d7f07a6cc 100644
--- a/apps/essimporter/importcellref.hpp
+++ b/apps/essimporter/importcellref.hpp
@@ -27,7 +27,7 @@ namespace ESSImport
 
         void load(ESM::ESMReader& esm) override;
 
-        virtual ~CellRef() = default;
+        ~CellRef() override = default;
     };
 
 }
diff --git a/apps/launcher/maindialog.hpp b/apps/launcher/maindialog.hpp
index 80e014e285..398ba882c4 100644
--- a/apps/launcher/maindialog.hpp
+++ b/apps/launcher/maindialog.hpp
@@ -47,7 +47,7 @@ namespace Launcher
 
     public:
         explicit MainDialog(QWidget *parent = nullptr);
-        ~MainDialog();
+        ~MainDialog() override;
 
         FirstRunDialogResult showFirstRunDialog();
 
diff --git a/apps/launcher/settingspage.hpp b/apps/launcher/settingspage.hpp
index df7c0e8eb5..fa31eb4033 100644
--- a/apps/launcher/settingspage.hpp
+++ b/apps/launcher/settingspage.hpp
@@ -22,7 +22,7 @@ namespace Launcher
     public:
         SettingsPage(Files::ConfigurationManager &cfg, Config::GameSettings &gameSettings,
                       Config::LauncherSettings &launcherSettings, MainDialog *parent = nullptr);
-        ~SettingsPage();
+        ~SettingsPage() override;
 
         void saveSettings();
         bool loadSettings();
diff --git a/apps/launcher/utils/textinputdialog.hpp b/apps/launcher/utils/textinputdialog.hpp
index de06599639..ad64cb3e2a 100644
--- a/apps/launcher/utils/textinputdialog.hpp
+++ b/apps/launcher/utils/textinputdialog.hpp
@@ -16,7 +16,7 @@ namespace Launcher
     public:
 
         explicit TextInputDialog(const QString& title, const QString &text, QWidget *parent = nullptr);
-        ~TextInputDialog ();
+        ~TextInputDialog () override;
 
         inline LineEdit *lineEdit() { return mLineEdit; }
         void setOkButtonEnabled(bool enabled);
diff --git a/apps/wizard/installationpage.hpp b/apps/wizard/installationpage.hpp
index cc1ccf5599..97b1fa8bf7 100644
--- a/apps/wizard/installationpage.hpp
+++ b/apps/wizard/installationpage.hpp
@@ -20,7 +20,7 @@ namespace Wizard
         Q_OBJECT
     public:
         InstallationPage(QWidget *parent);
-        ~InstallationPage();
+        ~InstallationPage() override;
 
         int nextId() const override;
          bool isComplete() const override;
diff --git a/apps/wizard/mainwizard.hpp b/apps/wizard/mainwizard.hpp
index 249ae1cf92..a8dec32da7 100644
--- a/apps/wizard/mainwizard.hpp
+++ b/apps/wizard/mainwizard.hpp
@@ -40,7 +40,7 @@ namespace Wizard
         };
 
         MainWizard(QWidget *parent = nullptr);
-        ~MainWizard();
+        ~MainWizard() override;
 
         bool findFiles(const QString &name, const QString &path);
         void addInstallation(const QString &path);
diff --git a/apps/wizard/unshield/unshieldworker.hpp b/apps/wizard/unshield/unshieldworker.hpp
index 2553d1bef8..13f4a1168c 100644
--- a/apps/wizard/unshield/unshieldworker.hpp
+++ b/apps/wizard/unshield/unshieldworker.hpp
@@ -27,7 +27,7 @@ namespace Wizard
 
     public:
         UnshieldWorker(QObject *parent = nullptr);
-        ~UnshieldWorker();
+        ~UnshieldWorker() override;
 
         void stopWorker();
 

From 945f1aad20a4b1cd8120cdc10517ddb3bec9b8c6 Mon Sep 17 00:00:00 2001
From: Thunderforge <wjherrmann@gmail.com>
Date: Tue, 18 May 2021 19:53:55 -0500
Subject: [PATCH 0819/2859] Using override keyword in OpenMW CS

Detected by clang-tidy's modernize-use-override
---
 apps/opencs/model/world/data.hpp                 | 2 +-
 apps/opencs/model/world/idtree.hpp               | 2 +-
 apps/opencs/model/world/nestedidcollection.hpp   | 2 +-
 apps/opencs/model/world/nestedinfocollection.hpp | 2 +-
 apps/opencs/model/world/nestedtablewrapper.hpp   | 2 +-
 apps/opencs/model/world/refidadapterimp.hpp      | 6 +++---
 apps/opencs/model/world/refidcollection.hpp      | 2 +-
 apps/opencs/model/world/resourcetable.hpp        | 2 +-
 apps/opencs/view/doc/loader.hpp                  | 2 +-
 apps/opencs/view/doc/operation.hpp               | 2 +-
 apps/opencs/view/doc/sizehint.hpp                | 2 +-
 apps/opencs/view/doc/view.hpp                    | 2 +-
 apps/opencs/view/doc/viewmanager.hpp             | 2 +-
 apps/opencs/view/prefs/dialogue.hpp              | 2 +-
 apps/opencs/view/world/tablebottombox.hpp        | 2 +-
 15 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/apps/opencs/model/world/data.hpp b/apps/opencs/model/world/data.hpp
index 51f9211625..5e2054b712 100644
--- a/apps/opencs/model/world/data.hpp
+++ b/apps/opencs/model/world/data.hpp
@@ -152,7 +152,7 @@ namespace CSMWorld
             Data (ToUTF8::FromType encoding, bool fsStrict, const Files::PathContainer& dataPaths,
                 const std::vector<std::string>& archives, const boost::filesystem::path& resDir);
 
-            virtual ~Data();
+            ~Data() override;
 
             const VFS::Manager* getVFS() const;
 
diff --git a/apps/opencs/model/world/idtree.hpp b/apps/opencs/model/world/idtree.hpp
index c525a60b88..294645a151 100644
--- a/apps/opencs/model/world/idtree.hpp
+++ b/apps/opencs/model/world/idtree.hpp
@@ -42,7 +42,7 @@ namespace CSMWorld
             IdTree (NestedCollection *nestedCollection, CollectionBase *idCollection, unsigned int features = 0);
             ///< The ownerships of \a nestedCollecton and \a idCollection are not transferred.
 
-            virtual ~IdTree();
+            ~IdTree() override;
 
             int rowCount (const QModelIndex & parent = QModelIndex()) const override;
 
diff --git a/apps/opencs/model/world/nestedidcollection.hpp b/apps/opencs/model/world/nestedidcollection.hpp
index a699d4bd66..1bd20aeebf 100644
--- a/apps/opencs/model/world/nestedidcollection.hpp
+++ b/apps/opencs/model/world/nestedidcollection.hpp
@@ -30,7 +30,7 @@ namespace CSMWorld
         public:
 
             NestedIdCollection ();
-            ~NestedIdCollection();
+            ~NestedIdCollection() override;
 
             void addNestedRow(int row, int column, int position) override;
 
diff --git a/apps/opencs/model/world/nestedinfocollection.hpp b/apps/opencs/model/world/nestedinfocollection.hpp
index fe2cd43faa..bb747efadf 100644
--- a/apps/opencs/model/world/nestedinfocollection.hpp
+++ b/apps/opencs/model/world/nestedinfocollection.hpp
@@ -22,7 +22,7 @@ namespace CSMWorld
         public:
 
             NestedInfoCollection ();
-            ~NestedInfoCollection();
+            ~NestedInfoCollection() override;
 
             void addNestedRow(int row, int column, int position) override;
 
diff --git a/apps/opencs/model/world/nestedtablewrapper.hpp b/apps/opencs/model/world/nestedtablewrapper.hpp
index 7d46dff8bf..1b652683a4 100644
--- a/apps/opencs/model/world/nestedtablewrapper.hpp
+++ b/apps/opencs/model/world/nestedtablewrapper.hpp
@@ -20,7 +20,7 @@ namespace CSMWorld
         NestedTableWrapper(const NestedTable& nestedTable)
             : mNestedTable(nestedTable) {}
 
-        virtual ~NestedTableWrapper() {}
+        ~NestedTableWrapper() override {}
 
         int size() const override
         {
diff --git a/apps/opencs/model/world/refidadapterimp.hpp b/apps/opencs/model/world/refidadapterimp.hpp
index 95d1a09a26..3d784f1b2b 100644
--- a/apps/opencs/model/world/refidadapterimp.hpp
+++ b/apps/opencs/model/world/refidadapterimp.hpp
@@ -384,7 +384,7 @@ namespace CSMWorld
 
         IngredEffectRefIdAdapter();
 
-        virtual ~IngredEffectRefIdAdapter();
+        ~IngredEffectRefIdAdapter() override;
 
         void addNestedRow (const RefIdColumn *column,
                 RefIdData& data, int index, int position) const override;
@@ -998,7 +998,7 @@ namespace CSMWorld
     public:
 
         NpcMiscRefIdAdapter ();
-        virtual ~NpcMiscRefIdAdapter();
+        ~NpcMiscRefIdAdapter() override;
 
         void addNestedRow (const RefIdColumn *column,
                 RefIdData& data, int index, int position) const override;
@@ -1089,7 +1089,7 @@ namespace CSMWorld
     public:
 
         CreatureMiscRefIdAdapter ();
-        virtual ~CreatureMiscRefIdAdapter();
+        ~CreatureMiscRefIdAdapter() override;
 
         void addNestedRow (const RefIdColumn *column,
                 RefIdData& data, int index, int position) const override;
diff --git a/apps/opencs/model/world/refidcollection.hpp b/apps/opencs/model/world/refidcollection.hpp
index e85263ac13..5b38e80da5 100644
--- a/apps/opencs/model/world/refidcollection.hpp
+++ b/apps/opencs/model/world/refidcollection.hpp
@@ -58,7 +58,7 @@ namespace CSMWorld
 
             RefIdCollection();
 
-            virtual ~RefIdCollection();
+            ~RefIdCollection() override;
 
             int getSize() const override;
 
diff --git a/apps/opencs/model/world/resourcetable.hpp b/apps/opencs/model/world/resourcetable.hpp
index 8a3fab8a21..34d8298d9a 100644
--- a/apps/opencs/model/world/resourcetable.hpp
+++ b/apps/opencs/model/world/resourcetable.hpp
@@ -16,7 +16,7 @@ namespace CSMWorld
             /// \note The feature Feature_Constant will be added implicitly.
             ResourceTable (const Resources *resources, unsigned int features = 0);
 
-            virtual ~ResourceTable();
+            ~ResourceTable() override;
 
             int rowCount (const QModelIndex & parent = QModelIndex()) const override;
 
diff --git a/apps/opencs/view/doc/loader.hpp b/apps/opencs/view/doc/loader.hpp
index 24cbee7884..63b03ec8d2 100644
--- a/apps/opencs/view/doc/loader.hpp
+++ b/apps/opencs/view/doc/loader.hpp
@@ -75,7 +75,7 @@ namespace CSVDoc
 
             Loader();
 
-            virtual ~Loader();
+            ~Loader() override;
 
         signals:
 
diff --git a/apps/opencs/view/doc/operation.hpp b/apps/opencs/view/doc/operation.hpp
index 48839fada4..1d07464604 100644
--- a/apps/opencs/view/doc/operation.hpp
+++ b/apps/opencs/view/doc/operation.hpp
@@ -28,7 +28,7 @@ namespace CSVDoc
         public:
 
             Operation (int type, QWidget *parent);
-            ~Operation();
+            ~Operation() override;
 
             void setProgress (int current, int max, int threads);
 
diff --git a/apps/opencs/view/doc/sizehint.hpp b/apps/opencs/view/doc/sizehint.hpp
index 14ec7b1865..949265e31a 100644
--- a/apps/opencs/view/doc/sizehint.hpp
+++ b/apps/opencs/view/doc/sizehint.hpp
@@ -12,7 +12,7 @@ namespace CSVDoc
 
         public:
             SizeHintWidget(QWidget *parent = nullptr);
-            ~SizeHintWidget();
+            ~SizeHintWidget() override;
 
             QSize sizeHint() const override;
             void setSizeHint(const QSize &size);
diff --git a/apps/opencs/view/doc/view.hpp b/apps/opencs/view/doc/view.hpp
index 322bcdfb7f..c0d036daae 100644
--- a/apps/opencs/view/doc/view.hpp
+++ b/apps/opencs/view/doc/view.hpp
@@ -110,7 +110,7 @@ namespace CSVDoc
 
             ///< The ownership of \a document is not transferred to *this.
 
-            virtual ~View();
+            ~View() override;
 
             const CSMDoc::Document *getDocument() const;
 
diff --git a/apps/opencs/view/doc/viewmanager.hpp b/apps/opencs/view/doc/viewmanager.hpp
index 8424be6f89..fe136027ca 100644
--- a/apps/opencs/view/doc/viewmanager.hpp
+++ b/apps/opencs/view/doc/viewmanager.hpp
@@ -52,7 +52,7 @@ namespace CSVDoc
 
             ViewManager (CSMDoc::DocumentManager& documentManager);
 
-            virtual ~ViewManager();
+            ~ViewManager() override;
 
             View *addView (CSMDoc::Document *document);
             ///< The ownership of the returned view is not transferred.
diff --git a/apps/opencs/view/prefs/dialogue.hpp b/apps/opencs/view/prefs/dialogue.hpp
index 2e09756496..00b2e10ec9 100644
--- a/apps/opencs/view/prefs/dialogue.hpp
+++ b/apps/opencs/view/prefs/dialogue.hpp
@@ -30,7 +30,7 @@ namespace CSVPrefs
 
             Dialogue();
 
-            virtual ~Dialogue();
+            ~Dialogue() override;
 
         protected:
 
diff --git a/apps/opencs/view/world/tablebottombox.hpp b/apps/opencs/view/world/tablebottombox.hpp
index 6ad2dbd821..ac5ad2fda6 100644
--- a/apps/opencs/view/world/tablebottombox.hpp
+++ b/apps/opencs/view/world/tablebottombox.hpp
@@ -61,7 +61,7 @@ namespace CSVWorld
                             const CSMWorld::UniversalId& id,
                             QWidget *parent = nullptr);
 
-            virtual ~TableBottomBox();
+            ~TableBottomBox() override;
 
             bool eventFilter(QObject *object, QEvent *event) override;
 

From 54d32817d5dd49effb2ce71e0ca76f939729e128 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 19 May 2021 17:12:41 +0200
Subject: [PATCH 0820/2859] Use av_free and maybe get Coverity to understand

---
 extern/osg-ffmpeg-videoplayer/videostate.cpp | 21 ++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/extern/osg-ffmpeg-videoplayer/videostate.cpp b/extern/osg-ffmpeg-videoplayer/videostate.cpp
index 1c2fcee4e2..c3cb412e9a 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.cpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.cpp
@@ -62,6 +62,15 @@ namespace
             av_frame_free(&frame);
         }
     };
+
+    template<class T>
+    struct AVFree
+    {
+        void operator()(T* frame) const
+        {
+            av_free(&frame);
+        }
+    };
 }
 
 namespace Video
@@ -105,7 +114,7 @@ void VideoState::setAudioFactory(MovieAudioFactory *factory)
 
 void PacketQueue::put(AVPacket *pkt)
 {
-    std::unique_ptr<AVPacketList> pkt1(static_cast<AVPacketList*>(av_malloc(sizeof(AVPacketList))));
+    std::unique_ptr<AVPacketList, AVFree<AVPacketList>> pkt1(static_cast<AVPacketList*>(av_malloc(sizeof(AVPacketList))));
     if(!pkt1) throw std::bad_alloc();
 
     if(pkt == &flush_pkt)
@@ -116,14 +125,14 @@ void PacketQueue::put(AVPacket *pkt)
     pkt1->next = nullptr;
 
     std::lock_guard<std::mutex> lock(this->mutex);
-
+    AVPacketList* ptr = pkt1.release();
     if(!last_pkt)
-        this->first_pkt = pkt1.get();
+        this->first_pkt = ptr;
     else
-        this->last_pkt->next = pkt1.get();
-    this->last_pkt = pkt1.release();
+        this->last_pkt->next = ptr;
+    this->last_pkt = ptr;
     this->nb_packets++;
-    this->size += this->last_pkt->pkt.size;
+    this->size += ptr->pkt.size;
     this->cond.notify_one();
 }
 

From b61249841eaaaa2f193c598ad9b59116fb9e056d Mon Sep 17 00:00:00 2001
From: CedricMocquillon <cedric.mocquillon@sage.com>
Date: Wed, 19 May 2021 18:38:42 +0200
Subject: [PATCH 0821/2859] Update lookup only after sorting files

---
 components/bsa/bsa_file.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/components/bsa/bsa_file.cpp b/components/bsa/bsa_file.cpp
index 3375882f52..4dfaa8658d 100644
--- a/components/bsa/bsa_file.cpp
+++ b/components/bsa/bsa_file.cpp
@@ -182,8 +182,6 @@ void BSAFile::readHeader()
         if(fs.offset + fs.fileSize > fsize)
             fail("Archive contains offsets outside itself");
 
-        // Add the file name to the lookup
-        mLookup[fs.name()] = i;
     }
     mStringBuf.resize(endOfNameBuffer);
 
@@ -191,6 +189,13 @@ void BSAFile::readHeader()
         return left.offset < right.offset;
     });
 
+    for (size_t i = 0; i < filenum; i++)
+    {
+        FileStruct& fs = mFiles[i];
+        // Add the file name to the lookup
+        mLookup[fs.name()] = i;
+    }
+
     mIsLoaded = true;
 }
 

From b13afd758c9da47414df8d3cd8c60c2625ce3be3 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Thu, 20 May 2021 05:53:26 +0200
Subject: [PATCH 0822/2859] Remove both racy and useless code.

Actor's position can be determined in 3 ways:
1/ as a result of physics simulation
2/ after a script require a relative position change (SetPos, Move)
3/ absolutely set from games mechanics event (teleport) or script
(PositionCell)

In case 1/, RefData::mPosition is updated with the physics simulation result
In case 2/, when RefData::mPosition is updated, physics simulation is informed of the change and update accordingly
In case 3/, when RefData::mPosition is updated, the physics simulation state is reset

In all 3 cases, we don't need to check the RefData::mPosition to get a
correct behaviour.

TSAN reported the following data race:
  Read of size 4 at 0x7b50005b75b0 by thread T12 (mutexes: write M656173, write M84859534346343880):
    #0 ESM::Position::asVec3() const /build/openmw/openmw/master2/.build/freebsd/TSAN/../../.././components/esm/defs.hpp:55:27 (openmw+0xb809d5)
    #1 MWPhysics::Actor::updateWorldPosition() /build/openmw/openmw/master2/.build/freebsd/TSAN/../../../apps/openmw/mwphysics/actor.cpp:131:59 (openmw+0xb809d5)
    #2 MWPhysics::Actor::setPosition(osg::Vec3f const&) /build/openmw/openmw/master2/.build/freebsd/TSAN/../../../apps/openmw/mwphysics/actor.cpp:177:5 (openmw+0xb809d5)
    #3 MWPhysics::PhysicsTaskScheduler::updateActorsPositions() /build/openmw/openmw/master2/.build/freebsd/TSAN/../../../apps/openmw/mwphysics/mtphysics.cpp:524:28 (openmw+0xb91ac0)
    #4 MWPhysics::PhysicsTaskScheduler::afterPostStep() /build/openmw/openmw/master2/.build/freebsd/TSAN/../../../apps/openmw/mwphysics/mtphysics.cpp:614:13 (openmw+0xb915e7)
    #5 MWPhysics::PhysicsTaskScheduler::worker()::$_5::operator()() const /build/openmw/openmw/master2/.build/freebsd/TSAN/../../../apps/openmw/mwphysics/mtphysics.cpp:498:45 (openmw+0xb915e7)
    #6 void Misc::Barrier::wait<MWPhysics::PhysicsTaskScheduler::worker()::$_5>(MWPhysics::PhysicsTaskScheduler::worker()::$_5&&) /build/openmw/openmw/master2/.build/freebsd/TSAN/../../.././components/misc/barrier.hpp:30:21 (openmw+0xb915e7)
    #7 MWPhysics::PhysicsTaskScheduler::worker() /build/openmw/openmw/master2/.build/freebsd/TSAN/../../../apps/openmw/mwphysics/mtphysics.cpp:498:31 (openmw+0xb915e7)
    #8 MWPhysics::PhysicsTaskScheduler::PhysicsTaskScheduler(float, btCollisionWorld*, MWRender::DebugDrawer*)::$_0::operator()() const /build/openmw/openmw/master2/.build/freebsd/TSAN/../../../apps/openmw/mwphysics/mtphysics.cpp:162:45 (openmw+0xb92630)
    #9 decltype(std::__1::forward<MWPhysics::PhysicsTaskScheduler::PhysicsTaskScheduler(float, btCollisionWorld*, MWRender::DebugDrawer*)::$_0>(fp)()) std::__1::__invoke<MWPhysics::PhysicsTaskScheduler::PhysicsTaskScheduler(float, btCollisionWorld*, MWRender::DebugDrawer*)::$_0>(MWPhysics::PhysicsTaskScheduler::PhysicsTaskScheduler(float, btCollisionWorld*, MWRender::DebugDrawer*)::$_0&&) /usr/include/c++/v1/type_traits:3899:1 (openmw+0xb92630)
    #10 void std::__1::__thread_execute<std::__1::unique_ptr<std::__1::__thread_struct, std::__1::default_delete<std::__1::__thread_struct> >, MWPhysics::PhysicsTaskScheduler::PhysicsTaskScheduler(float, btCollisionWorld*, MWRender::DebugDrawer*)::$_0>(std::__1::tuple<std::__1::unique_ptr<std::__1::__thread_struct, std::__1::default_delete<std::__1::__thread_struct> >, MWPhysics::PhysicsTaskScheduler::PhysicsTaskScheduler(float, btCollisionWorld*, MWRender::DebugDrawer*)::$_0>&, std::__1::__tuple_indices<>) /usr/include/c++/v1/thread:280:5 (openmw+0xb92630)
    #11 void* std::__1::__thread_proxy<std::__1::tuple<std::__1::unique_ptr<std::__1::__thread_struct, std::__1::default_delete<std::__1::__thread_struct> >, MWPhysics::PhysicsTaskScheduler::PhysicsTaskScheduler(float, btCollisionWorld*, MWRender::DebugDrawer*)::$_0> >(void*) /usr/include/c++/v1/thread:291:5 (openmw+0xb92630)

  Previous write of size 8 at 0x7b50005b75b0 by main thread:
    #0 memcpy /wrkdirs/usr/ports/devel/llvm-devel/work-default/llvm-project-3f6753efe1990a928ed120bd907940a9fb3e2fc3/compiler-rt/lib/tsan/../sanitizer_common/sanitizer_common_interceptors.inc:827:5 (openmw+0x55a057)
    #1 MWWorld::RefData::setPosition(ESM::Position const&) /build/openmw/openmw/master2/.build/freebsd/TSAN/../../../apps/openmw/mwworld/refdata.cpp:216:19 (openmw+0xa3de1c)
    #2 MWWorld::World::moveObject(MWWorld::Ptr const&, MWWorld::CellStore*, float, float, float, bool) /build/openmw/openmw/master2/.build/freebsd/TSAN/../../../apps/openmw/mwworld/worldimp.cpp:1130:26 (openmw+0xa57300)
    #3 MWWorld::World::moveObject(MWWorld::Ptr const&, float, float, float, bool, bool) /build/openmw/openmw/master2/.build/freebsd/TSAN/../../../apps/openmw/mwworld/worldimp.cpp:1253:16 (openmw+0xa580c8)
    #4 MWWorld::World::doPhysics(float, unsigned long long, unsigned int, osg::Stats&) /build/openmw/openmw/master2/.build/freebsd/TSAN/../../../apps/openmw/mwworld/worldimp.cpp:1530:17 (openmw+0xa5af8f)
    #5 MWWorld::World::updatePhysics(float, bool, unsigned long long, unsigned int, osg::Stats&) /build/openmw/openmw/master2/.build/freebsd/TSAN/../../../apps/openmw/mwworld/worldimp.cpp:1862:13 (openmw+0xa61a7c)
    #6 OMW::Engine::frame(float) /build/openmw/openmw/master2/.build/freebsd/TSAN/../../../apps/openmw/engine.cpp:333:42 (openmw+0xcce9e7)
    #7 OMW::Engine::go() /build/openmw/openmw/master2/.build/freebsd/TSAN/../../../apps/openmw/engine.cpp:935:14 (openmw+0xcd86ed)
    #8 runApplication(int, char**) /build/openmw/openmw/master2/.build/freebsd/TSAN/../../../apps/openmw/main.cpp:296:17 (openmw+0xcbffac)
    #9 wrapApplication(int (*)(int, char**), int, char**, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&) /build/openmw/openmw/master2/.build/freebsd/TSAN/../../../components/debug/debugging.cpp:205:15 (openmw+0x1335442)
    #10 main /build/openmw/openmw/master2/.build/freebsd/TSAN/../../../apps/openmw/main.cpp:308:12 (openmw+0xcc008a)
:wqa
---
 apps/openmw/mwphysics/actor.cpp         | 21 ++++-----------------
 apps/openmw/mwphysics/actor.hpp         |  8 --------
 apps/openmw/mwphysics/physicssystem.cpp |  1 -
 3 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index 9793906098..f0bc234138 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -117,27 +117,15 @@ int Actor::getCollisionMask() const
 void Actor::updatePosition()
 {
     std::scoped_lock lock(mPositionMutex);
-    updateWorldPosition();
-    mPreviousPosition = mWorldPosition;
-    mPosition = mWorldPosition;
-    mSimulationPosition = mWorldPosition;
+    const auto worldPosition = mPtr.getRefData().getPosition().asVec3();
+    mPreviousPosition = worldPosition;
+    mPosition = worldPosition;
+    mSimulationPosition = worldPosition;
     mPositionOffset = osg::Vec3f();
     mStandingOnPtr = nullptr;
     mSkipCollisions = true;
 }
 
-void Actor::updateWorldPosition()
-{
-    if (mWorldPosition != mPtr.getRefData().getPosition().asVec3())
-        mWorldPositionChanged = true;
-    mWorldPosition = mPtr.getRefData().getPosition().asVec3();
-}
-
-osg::Vec3f Actor::getWorldPosition() const
-{
-    return mWorldPosition;
-}
-
 void Actor::setSimulationPosition(const osg::Vec3f& position)
 {
     mSimulationPosition = position;
@@ -174,7 +162,6 @@ osg::Vec3f Actor::getCollisionObjectPosition() const
 bool Actor::setPosition(const osg::Vec3f& position)
 {
     std::scoped_lock lock(mPositionMutex);
-    updateWorldPosition();
     applyOffsetChange();
     bool hasChanged = mPosition != position || mWorldPositionChanged;
     mPreviousPosition = mPosition;
diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index acbf33ca75..7b53e8812a 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -55,13 +55,6 @@ namespace MWPhysics
          */
         bool isRotationallyInvariant() const;
 
-        /**
-         * Set mWorldPosition to the position in the Ptr's RefData. This is used by the physics simulation to account for 
-         * when an object is "instantly" moved/teleported as opposed to being moved by the physics simulation.
-         */
-        void updateWorldPosition();
-        osg::Vec3f getWorldPosition() const;
-
         /**
         * Used by the physics simulation to store the simulation result. Used in conjunction with mWorldPosition
         * to account for e.g. scripted movements
@@ -204,7 +197,6 @@ namespace MWPhysics
 
         osg::Vec3f mScale;
         osg::Vec3f mRenderingScale;
-        osg::Vec3f mWorldPosition;
         osg::Vec3f mSimulationPosition;
         osg::Vec3f mPosition;
         osg::Vec3f mPreviousPosition;
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index a5d6018f46..705e15187d 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -938,7 +938,6 @@ namespace MWPhysics
 
     void ActorFrameData::updatePosition(btCollisionWorld* world)
     {
-        mActorRaw->updateWorldPosition();
         mActorRaw->applyOffsetChange();
         mPosition = mActorRaw->getPosition();
         if (mWaterCollision && mPosition.z() < mWaterlevel && canMoveToWaterSurface(mActorRaw, mWaterlevel, world))

From 86d137363e86a087287305bfc3f8a281ee2645ef Mon Sep 17 00:00:00 2001
From: CedricMocquillon <cedric.mocquillon@sage.com>
Date: Thu, 20 May 2021 21:28:52 +0200
Subject: [PATCH 0823/2859] Check if the archive is opened before adding a file
 to it and clear state on close

---
 components/bsa/bsa_file.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/components/bsa/bsa_file.cpp b/components/bsa/bsa_file.cpp
index 4dfaa8658d..129c2bf454 100644
--- a/components/bsa/bsa_file.cpp
+++ b/components/bsa/bsa_file.cpp
@@ -252,6 +252,9 @@ int BSAFile::getIndex(const char *str) const
 /// Open an archive file.
 void BSAFile::open(const std::string &file)
 {
+    if (mIsLoaded)
+        close();
+
     mFilename = file;
     if(boost::filesystem::exists(file))
         readHeader();
@@ -259,16 +262,20 @@ void BSAFile::open(const std::string &file)
     {
         { boost::filesystem::fstream(mFilename, std::ios::binary | std::ios::out); }
         writeHeader();
+        mIsLoaded = true;
     }
 }
 
 /// Close the archive, write the updated headers to the file
 void Bsa::BSAFile::close()
 {
-    if (!mHasChanged)
-        return;
+    if (mHasChanged)
+        writeHeader();
 
-    writeHeader();
+    mFiles.clear();
+    mStringBuf.clear();
+    mLookup.clear();
+    mIsLoaded = false;
 }
 
 Files::IStreamPtr BSAFile::getFile(const char *file)
@@ -290,6 +297,8 @@ Files::IStreamPtr BSAFile::getFile(const FileStruct *file)
 
 void Bsa::BSAFile::addFile(const std::string& filename, std::istream& file)
 {
+    if (!mIsLoaded)
+        fail("Unable to add file " + filename + " the archive is not opened");
     namespace bfs = boost::filesystem;
 
     auto newStartOfDataBuffer = 12 + (12 + 8) * (mFiles.size() + 1) + mStringBuf.size() + filename.size() + 1;

From e51669c05daff9fce3c6af91d314efbdc6cec6eb Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Fri, 21 May 2021 18:15:31 +0200
Subject: [PATCH 0824/2859] Don't assign a variable passed by value

---
 components/misc/stringops.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/misc/stringops.hpp b/components/misc/stringops.hpp
index aa2ae105e1..48deaa9991 100644
--- a/components/misc/stringops.hpp
+++ b/components/misc/stringops.hpp
@@ -45,19 +45,19 @@ public:
     {
         // Russian alphabet
         if (ch >= 0x0410 && ch < 0x0430)
-            return ch += 0x20;
+            return ch + 0x20;
 
         // Cyrillic IO character
         if (ch == 0x0401)
-            return ch += 0x50;
+            return ch + 0x50;
 
         // Latin alphabet
         if (ch >= 0x41 && ch < 0x60)
-            return ch += 0x20;
+            return ch + 0x20;
 
         // Deutch characters
         if (ch == 0xc4 || ch == 0xd6 || ch == 0xdc)
-            return ch += 0x20;
+            return ch + 0x20;
         if (ch == 0x1e9e)
             return 0xdf;
 

From 105cd5b06fe92160b4e59e63f8e88c59adf016b2 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 21 May 2021 19:30:29 +0200
Subject: [PATCH 0825/2859] Add more checks to NavMeshTilesCache tests

---
 apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
index a16c3af1d3..447a5b44e4 100644
--- a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
+++ b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
@@ -60,6 +60,7 @@ namespace
 
         EXPECT_FALSE(cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections,
                                std::move(mNavMeshData)));
+        EXPECT_NE(mNavMeshData.mValue, nullptr);
     }
 
     TEST_F(DetourNavigatorNavMeshTilesCacheTest, set_should_return_cached_value)
@@ -85,6 +86,7 @@ namespace
         NavMeshData anotherNavMeshData {anotherData, 1};
 
         cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections, std::move(mNavMeshData));
+        EXPECT_EQ(mNavMeshData.mValue, nullptr);
         const auto result = cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections, std::move(anotherNavMeshData));
         ASSERT_TRUE(result);
         EXPECT_EQ(result.get(), (NavMeshDataRef {mData, 1}));

From 375372981cbc5ee4c82217ec0bc84b35dba344bf Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 21 May 2021 23:15:14 +0200
Subject: [PATCH 0826/2859] Stop osg viewer threading before destructing engine

To avoid rendering while engine parts are destructing.
---
 apps/openmw/engine.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index b227ae04e8..a06faa4d71 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -970,6 +970,8 @@ void OMW::Engine::go()
     // Save user settings
     settings.saveUser(settingspath);
 
+    mViewer->stopThreading();
+
     Log(Debug::Info) << "Quitting peacefully.";
 }
 

From e68a454fd85ef33f821ee1b2142f1f2f3ea6246e Mon Sep 17 00:00:00 2001
From: Dobrohotov Alexei <alexdobrohotov@yandex.ru>
Date: Sun, 23 May 2021 16:02:05 +0300
Subject: [PATCH 0827/2859] More ESM cleanup

---
 components/esm/esmreader.cpp | 32 +++++++++++++-------------------
 components/esm/esmreader.hpp |  4 ----
 components/esm/loadland.cpp  |  4 +++-
 components/esm/loadregn.cpp  |  2 +-
 4 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/components/esm/esmreader.cpp b/components/esm/esmreader.cpp
index 30c38d739c..899dc745fb 100644
--- a/components/esm/esmreader.cpp
+++ b/components/esm/esmreader.cpp
@@ -119,13 +119,13 @@ std::string ESMReader::getHString()
     // them. For some reason, they break the rules, and contain a byte
     // (value 0) even if the header says there is no data. If
     // Morrowind accepts it, so should we.
-    if (mCtx.leftSub == 0 && !mEsm->peek())
+    if (mCtx.leftSub == 0 && hasMoreSubs() && !mEsm->peek())
     {
         // Skip the following zero byte
         mCtx.leftRec--;
         char c;
-        getExact(&c, 1);
-        return "";
+        getT(c);
+        return std::string();
     }
 
     return getString(mCtx.leftSub);
@@ -155,14 +155,12 @@ void ESMReader::getSubNameIs(const char* name)
 {
     getSubName();
     if (mCtx.subName != name)
-        fail(
-                "Expected subrecord " + std::string(name) + " but got "
-                        + mCtx.subName.toString());
+        fail("Expected subrecord " + std::string(name) + " but got " + mCtx.subName.toString());
 }
 
 bool ESMReader::isNextSub(const char* name)
 {
-    if (!mCtx.leftRec)
+    if (!hasMoreSubs())
         return false;
 
     getSubName();
@@ -177,7 +175,7 @@ bool ESMReader::isNextSub(const char* name)
 
 bool ESMReader::peekNextSub(const char *name)
 {
-    if (!mCtx.leftRec)
+    if (!hasMoreSubs())
         return false;
 
     getSubName();
@@ -234,21 +232,17 @@ void ESMReader::skipHSubUntil(const char *name)
 
 void ESMReader::getSubHeader()
 {
-    if (mCtx.leftRec < 4)
+    if (mCtx.leftRec < sizeof(mCtx.leftSub))
         fail("End of record while reading sub-record header");
 
     // Get subrecord size
     getT(mCtx.leftSub);
+    mCtx.leftRec -= sizeof(mCtx.leftSub);
 
     // Adjust number of record bytes left
-    mCtx.leftRec -= mCtx.leftSub + 4;
-}
-
-void ESMReader::getSubHeaderIs(int size)
-{
-    getSubHeader();
-    if (size != static_cast<int> (mCtx.leftSub))
-        fail("getSubHeaderIs(): Sub header mismatch");
+    if (mCtx.leftRec < mCtx.leftSub)
+        fail("Record size is larger than rest of file");
+    mCtx.leftRec -= mCtx.leftSub;
 }
 
 NAME ESMReader::getRecName()
@@ -276,7 +270,7 @@ void ESMReader::skipRecord()
 void ESMReader::getRecHeader(uint32_t &flags)
 {
     // General error checking
-    if (mCtx.leftFile < 12)
+    if (mCtx.leftFile < 3 * sizeof(uint32_t))
         fail("End of file while reading record header");
     if (mCtx.leftRec)
         fail("Previous record contains unread bytes");
@@ -284,7 +278,7 @@ void ESMReader::getRecHeader(uint32_t &flags)
     getUint(mCtx.leftRec);
     getUint(flags);// This header entry is always zero
     getUint(flags);
-    mCtx.leftFile -= 12;
+    mCtx.leftFile -= 3 * sizeof(uint32_t);
 
     // Check that sizes add up
     if (mCtx.leftFile < mCtx.leftRec)
diff --git a/components/esm/esmreader.hpp b/components/esm/esmreader.hpp
index 503bb637d7..32adf8561e 100644
--- a/components/esm/esmreader.hpp
+++ b/components/esm/esmreader.hpp
@@ -206,10 +206,6 @@ public:
   */
   void getSubHeader();
 
-  /** Get sub header and check the size
-   */
-  void getSubHeaderIs(int size);
-
   /*************************************************************************
    *
    *  Low level record methods
diff --git a/components/esm/loadland.cpp b/components/esm/loadland.cpp
index 38596628f2..d23452d76e 100644
--- a/components/esm/loadland.cpp
+++ b/components/esm/loadland.cpp
@@ -50,7 +50,9 @@ namespace ESM
             switch (esm.retSubName().intval)
             {
                 case ESM::FourCC<'I','N','T','V'>::value:
-                    esm.getSubHeaderIs(8);
+                    esm.getSubHeader();
+                    if (esm.getSubSize() != 8)
+                        esm.fail("Subrecord size is not equal to 8");
                     esm.getT<int>(mX);
                     esm.getT<int>(mY);
                     hasLocation = true;
diff --git a/components/esm/loadregn.cpp b/components/esm/loadregn.cpp
index a56b9f2474..ada33dc3f8 100644
--- a/components/esm/loadregn.cpp
+++ b/components/esm/loadregn.cpp
@@ -39,7 +39,7 @@ namespace ESM
                         // May include the additional two bytes (but not necessarily)
                         if (esm.getSubSize() == sizeof(mData))
                         {
-                            esm.getExact(&mData, sizeof(mData));
+                            esm.getT(mData);
                         }
                         else
                         {

From f12a52c603438e9cef6673b973e09bb38e34b691 Mon Sep 17 00:00:00 2001
From: Dobrohotov Alexei <alexdobrohotov@yandex.ru>
Date: Mon, 24 May 2021 01:57:08 +0300
Subject: [PATCH 0828/2859] Make the light distance slider de/increment by 128

---
 files/mygui/openmw_settings_window.layout | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index 92c1854133..b602f35260 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -498,7 +498,7 @@
                         </Widget>
                         <Widget type="ScrollBar" skin="MW_HScroll" position="0 104 352 18" align="HStretch Top">
                             <Property key="Range" value="8192"/>
-                            <Property key="Page" value="1"/>
+                            <Property key="Page" value="128"/>
                             <UserString key="SettingType" value="Slider"/>
                             <UserString key="SettingMin" value="0"/>
                             <UserString key="SettingMax" value="8192"/>

From d906ec773a5e8cfe57a0f9771fb42149deab5c1a Mon Sep 17 00:00:00 2001
From: Mads Buvik Sandvei <madssandvei@protonmail.com>
Date: Mon, 24 May 2021 17:57:39 +0000
Subject: [PATCH 0829/2859] Fix hangup on savegame after manual screenshots.

---
 apps/openmw/mwrender/screenshotmanager.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwrender/screenshotmanager.cpp b/apps/openmw/mwrender/screenshotmanager.cpp
index af2970fd80..f474a5a9f6 100644
--- a/apps/openmw/mwrender/screenshotmanager.cpp
+++ b/apps/openmw/mwrender/screenshotmanager.cpp
@@ -61,6 +61,7 @@ namespace MWRender
 
         void reset(unsigned int frame)
         {
+            std::lock_guard<std::mutex> lock(mMutex);
             mDone = false;
             mFrame = frame;
         }
@@ -104,11 +105,6 @@ namespace MWRender
         , mResourceSystem(resourceSystem)
         , mWater(water)
     {
-        // Note: This assumes no other final draw callbacks are set anywhere and that this callback will remain set until the application exits.
-        // This works around *DrawCallback manipulation being unsafe in OSG >= 3.5.10 for release 0.47
-        // If you need to set other final draw callbacks, read the comments of issue 6013 for a suggestion
-        // Ref https://gitlab.com/OpenMW/openmw/-/issues/6013
-        mViewer->getCamera()->setFinalDrawCallback(mDrawCompleteCallback);
     }
 
     ScreenshotManager::~ScreenshotManager()
@@ -269,7 +265,10 @@ namespace MWRender
 
     void ScreenshotManager::traversalsAndWait(unsigned int frame)
     {
+        // Ref https://gitlab.com/OpenMW/openmw/-/issues/6013
         mDrawCompleteCallback->reset(frame);
+        mViewer->getCamera()->setFinalDrawCallback(mDrawCompleteCallback);
+
         mViewer->eventTraversal();
         mViewer->updateTraversal();
         mViewer->renderingTraversals();

From 3915e5d2cca844a2362e6df5efed2c5da71f9ead Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 26 May 2021 23:19:22 +0200
Subject: [PATCH 0830/2859] Always center loading screen progress bar by height
 when there is active message box

To fix all possible situations when active message box overlaps with loading
screen progress.

The only used condition to center loading screen progress by height is
number of message boxes > 0. No need to pass it through interface.
LoadingScreen can check it inside setLabel function.
---
 apps/openmw/mwgui/loadingscreen.cpp            | 4 ++--
 apps/openmw/mwgui/loadingscreen.hpp            | 2 +-
 apps/openmw/mwstate/statemanagerimp.cpp        | 6 ++----
 apps/openmw/mwworld/scene.cpp                  | 6 ++----
 components/loadinglistener/loadinglistener.hpp | 2 +-
 5 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/apps/openmw/mwgui/loadingscreen.cpp b/apps/openmw/mwgui/loadingscreen.cpp
index 65d49ffc9c..61fcacca46 100644
--- a/apps/openmw/mwgui/loadingscreen.cpp
+++ b/apps/openmw/mwgui/loadingscreen.cpp
@@ -100,7 +100,7 @@ namespace MWGui
             Log(Debug::Warning) << "Warning: no splash screens found!";
     }
 
-    void LoadingScreen::setLabel(const std::string &label, bool important, bool center)
+    void LoadingScreen::setLabel(const std::string &label, bool important)
     {
         mImportantLabel = important;
 
@@ -110,7 +110,7 @@ namespace MWGui
         size.width = std::max(300, size.width);
         mLoadingBox->setSize(size);
 
-        if (center)
+        if (MWBase::Environment::get().getWindowManager()->getMessagesCount() > 0)
             mLoadingBox->setPosition(mMainWidget->getWidth()/2 - mLoadingBox->getWidth()/2, mMainWidget->getHeight()/2 - mLoadingBox->getHeight()/2);
         else
             mLoadingBox->setPosition(mMainWidget->getWidth()/2 - mLoadingBox->getWidth()/2, mMainWidget->getHeight() - mLoadingBox->getHeight() - 8);
diff --git a/apps/openmw/mwgui/loadingscreen.hpp b/apps/openmw/mwgui/loadingscreen.hpp
index ac911ab60b..c643965342 100644
--- a/apps/openmw/mwgui/loadingscreen.hpp
+++ b/apps/openmw/mwgui/loadingscreen.hpp
@@ -37,7 +37,7 @@ namespace MWGui
         virtual ~LoadingScreen();
 
         /// Overridden from Loading::Listener, see the Loading::Listener documentation for usage details
-        void setLabel (const std::string& label, bool important, bool center) override;
+        void setLabel (const std::string& label, bool important) override;
         void loadingOn(bool visible=true) override;
         void loadingOff() override;
         void setProgressRange (size_t range) override;
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index fb418b94ad..ffef9d74a9 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -260,10 +260,9 @@ void MWState::StateManager::saveGame (const std::string& description, const Slot
         writer.save (stream);
 
         Loading::Listener& listener = *MWBase::Environment::get().getWindowManager()->getLoadingScreen();
-        int messagesCount = MWBase::Environment::get().getWindowManager()->getMessagesCount();
         // Using only Cells for progress information, since they typically have the largest records by far
         listener.setProgressRange(MWBase::Environment::get().getWorld()->countSavedGameCells());
-        listener.setLabel("#{sNotifyMessage4}", true, messagesCount > 0);
+        listener.setLabel("#{sNotifyMessage4}", true);
 
         Loading::ScopedLoad load(&listener);
 
@@ -385,10 +384,9 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
         std::map<int, int> contentFileMap = buildContentFileIndexMap (reader);
 
         Loading::Listener& listener = *MWBase::Environment::get().getWindowManager()->getLoadingScreen();
-        int messagesCount = MWBase::Environment::get().getWindowManager()->getMessagesCount();
 
         listener.setProgressRange(100);
-        listener.setLabel("#{sLoadingMessage14}", false, messagesCount > 0);
+        listener.setLabel("#{sLoadingMessage14}");
 
         Loading::ScopedLoad load(&listener);
 
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 83e9805f6e..1614e07057 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -566,9 +566,8 @@ namespace MWWorld
 
         Loading::Listener* loadingListener = MWBase::Environment::get().getWindowManager()->getLoadingScreen();
         Loading::ScopedLoad load(loadingListener);
-        int messagesCount = MWBase::Environment::get().getWindowManager()->getMessagesCount();
         std::string loadingExteriorText = "#{sLoadingMessage3}";
-        loadingListener->setLabel(loadingExteriorText, false, messagesCount > 0);
+        loadingListener->setLabel(loadingExteriorText);
         loadingListener->setProgressRange(refsToLoad);
 
         const auto getDistanceToPlayerCell = [&] (const std::pair<int, int>& cellPosition)
@@ -798,9 +797,8 @@ namespace MWWorld
             MWBase::Environment::get().getWindowManager()->fadeScreenOut(0.5);
 
         Loading::Listener* loadingListener = MWBase::Environment::get().getWindowManager()->getLoadingScreen();
-        int messagesCount = MWBase::Environment::get().getWindowManager()->getMessagesCount();
         std::string loadingInteriorText = "#{sLoadingMessage2}";
-        loadingListener->setLabel(loadingInteriorText, false, messagesCount > 0);
+        loadingListener->setLabel(loadingInteriorText);
         Loading::ScopedLoad load(loadingListener);
 
         if(mCurrentCell != nullptr && *mCurrentCell == *cell)
diff --git a/components/loadinglistener/loadinglistener.hpp b/components/loadinglistener/loadinglistener.hpp
index 93467c1414..14a1b96f9a 100644
--- a/components/loadinglistener/loadinglistener.hpp
+++ b/components/loadinglistener/loadinglistener.hpp
@@ -14,7 +14,7 @@ namespace Loading
         /// @note "non-important" labels may not show on screen if the loading process went so fast
         /// that the implementation decided not to show a loading screen at all. "important" labels
         /// will show in a separate message-box if the loading screen was not shown.
-        virtual void setLabel (const std::string& label, bool important=false, bool center=false) {}
+        virtual void setLabel (const std::string& label, bool important=false) {}
 
         /// Start a loading sequence. Must call loadingOff() when done.
         /// @note To get the loading screen to actually update, you must call setProgress / increaseProgress periodically.

From d122e184ccd6008069a5f544a9d2dfde7b9639a7 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 27 May 2021 01:09:58 +0200
Subject: [PATCH 0831/2859] Report navmesh change for not posted tiles

Corresponding recast mesh tiles can be updated but navmesh tiles may never
appear for them. Report back zero navmesh version to allow oscillating recast
objects detection to work. This version is always less than any generated
navmesh tile version so any report for generated navmesh will override it.
If zero navmesh version is reported after recast mesh tile got report about
generated navmesh tile it is a no-op since generated version is always greater
than zero.
---
 .../detournavigator/tilecachedrecastmeshmanager.cpp       | 2 +-
 components/detournavigator/cachedrecastmeshmanager.cpp    | 5 +++++
 components/detournavigator/cachedrecastmeshmanager.hpp    | 2 ++
 components/detournavigator/navmeshmanager.cpp             | 8 +++++---
 components/detournavigator/recastmeshmanager.cpp          | 5 +++++
 components/detournavigator/recastmeshmanager.hpp          | 2 ++
 .../detournavigator/tilecachedrecastmeshmanager.hpp       | 6 +++---
 7 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
index 2d6d9f66bb..83622c0b7b 100644
--- a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -54,7 +54,7 @@ namespace
     {
         TileCachedRecastMeshManager manager(mSettings);
         std::size_t calls = 0;
-        manager.forEachTilePosition([&] (const TilePosition&) { ++calls; });
+        manager.forEachTile([&] (const TilePosition&, const CachedRecastMeshManager&) { ++calls; });
         EXPECT_EQ(calls, 0);
     }
 
diff --git a/components/detournavigator/cachedrecastmeshmanager.cpp b/components/detournavigator/cachedrecastmeshmanager.cpp
index 22b047fbd3..2788b80461 100644
--- a/components/detournavigator/cachedrecastmeshmanager.cpp
+++ b/components/detournavigator/cachedrecastmeshmanager.cpp
@@ -66,4 +66,9 @@ namespace DetourNavigator
     {
         mImpl.reportNavMeshChange(recastMeshVersion, navMeshVersion);
     }
+
+    Version CachedRecastMeshManager::getVersion() const
+    {
+        return mImpl.getVersion();
+    }
 }
diff --git a/components/detournavigator/cachedrecastmeshmanager.hpp b/components/detournavigator/cachedrecastmeshmanager.hpp
index a19f017a4a..ea55348f70 100644
--- a/components/detournavigator/cachedrecastmeshmanager.hpp
+++ b/components/detournavigator/cachedrecastmeshmanager.hpp
@@ -28,6 +28,8 @@ namespace DetourNavigator
 
         void reportNavMeshChange(Version recastMeshVersion, Version navMeshVersion);
 
+        Version getVersion() const;
+
     private:
         RecastMeshManager mImpl;
         std::shared_ptr<RecastMesh> mCached;
diff --git a/components/detournavigator/navmeshmanager.cpp b/components/detournavigator/navmeshmanager.cpp
index 8f1aa86d44..de4c21c68a 100644
--- a/components/detournavigator/navmeshmanager.cpp
+++ b/components/detournavigator/navmeshmanager.cpp
@@ -171,7 +171,7 @@ namespace DetourNavigator
                     }
             }
             const auto maxTiles = std::min(mSettings.mMaxTilesNumber, navMesh.getParams()->maxTiles);
-            mRecastMeshManager.forEachTilePosition([&] (const TilePosition& tile)
+            mRecastMeshManager.forEachTile([&] (const TilePosition& tile, CachedRecastMeshManager& recastMeshManager)
             {
                 if (tilesToPost.count(tile))
                     return;
@@ -181,6 +181,8 @@ namespace DetourNavigator
                     tilesToPost.insert(std::make_pair(tile, ChangeType::add));
                 else if (!shouldAdd && presentInNavMesh)
                     tilesToPost.insert(std::make_pair(tile, ChangeType::mixed));
+                else
+                    recastMeshManager.reportNavMeshChange(recastMeshManager.getVersion(), Version {0, 0});
             });
         }
         mAsyncNavMeshUpdater.post(agentHalfExtents, cached, playerTile, tilesToPost);
@@ -214,8 +216,8 @@ namespace DetourNavigator
     RecastMeshTiles NavMeshManager::getRecastMeshTiles()
     {
         std::vector<TilePosition> tiles;
-        mRecastMeshManager.forEachTilePosition(
-            [&tiles] (const TilePosition& tile) { tiles.push_back(tile); });
+        mRecastMeshManager.forEachTile(
+            [&tiles] (const TilePosition& tile, const CachedRecastMeshManager&) { tiles.push_back(tile); });
         RecastMeshTiles result;
         std::transform(tiles.begin(), tiles.end(), std::inserter(result, result.end()),
             [this] (const TilePosition& tile) { return std::make_pair(tile, mRecastMeshManager.getMesh(tile)); });
diff --git a/components/detournavigator/recastmeshmanager.cpp b/components/detournavigator/recastmeshmanager.cpp
index cdb9169d9e..5fbcedff6b 100644
--- a/components/detournavigator/recastmeshmanager.cpp
+++ b/components/detournavigator/recastmeshmanager.cpp
@@ -95,6 +95,11 @@ namespace DetourNavigator
             mLastNavMeshReportedChange = mLastNavMeshReport;
     }
 
+    Version RecastMeshManager::getVersion() const
+    {
+        return Version {mGeneration, mRevision};
+    }
+
     void RecastMeshManager::rebuild()
     {
         mMeshBuilder.reset();
diff --git a/components/detournavigator/recastmeshmanager.hpp b/components/detournavigator/recastmeshmanager.hpp
index daa123fcbc..ac17a347b6 100644
--- a/components/detournavigator/recastmeshmanager.hpp
+++ b/components/detournavigator/recastmeshmanager.hpp
@@ -53,6 +53,8 @@ namespace DetourNavigator
 
         void reportNavMeshChange(Version recastMeshVersion, Version navMeshVersion);
 
+        Version getVersion() const;
+
     private:
         struct Report
         {
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.hpp b/components/detournavigator/tilecachedrecastmeshmanager.hpp
index 68683f4100..4c6f21c428 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.hpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.hpp
@@ -81,10 +81,10 @@ namespace DetourNavigator
         bool hasTile(const TilePosition& tilePosition);
 
         template <class Function>
-        void forEachTilePosition(Function&& function)
+        void forEachTile(Function&& function)
         {
-            for (const auto& tile : *mTiles.lock())
-                function(tile.first);
+            for (auto& [tilePosition, recastMeshManager] : *mTiles.lock())
+                function(tilePosition, recastMeshManager);
         }
 
         std::size_t getRevision() const;

From f4f9fa4701c8a41a13289c2b7a8f421f6a21be81 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 27 May 2021 01:59:07 +0200
Subject: [PATCH 0832/2859] Limit oscillating recast mesh object AABB by tile
 bounds

AABB change outside recast mesh tile should not affect navmesh for this tile.
---
 .../oscillatingrecastmeshobject.cpp             | 17 ++++++++++++++++-
 .../oscillatingrecastmeshobject.hpp             |  4 +++-
 .../detournavigator/recastmeshmanager.cpp       |  3 ++-
 .../detournavigator/recastmeshmanager.hpp       |  1 +
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/components/detournavigator/oscillatingrecastmeshobject.cpp b/components/detournavigator/oscillatingrecastmeshobject.cpp
index 5b84231838..fbe4b77ffd 100644
--- a/components/detournavigator/oscillatingrecastmeshobject.cpp
+++ b/components/detournavigator/oscillatingrecastmeshobject.cpp
@@ -1,9 +1,23 @@
 #include "oscillatingrecastmeshobject.hpp"
+#include "tilebounds.hpp"
 
 #include <components/bullethelpers/aabb.hpp>
 
+#include <algorithm>
+
 namespace DetourNavigator
 {
+    namespace
+    {
+        void limitBy(btAABB& aabb, const TileBounds& bounds)
+        {
+            aabb.m_min.setX(std::max(aabb.m_min.x(), static_cast<btScalar>(bounds.mMin.x())));
+            aabb.m_min.setY(std::max(aabb.m_min.y(), static_cast<btScalar>(bounds.mMin.y())));
+            aabb.m_max.setX(std::min(aabb.m_max.x(), static_cast<btScalar>(bounds.mMax.x())));
+            aabb.m_max.setY(std::min(aabb.m_max.y(), static_cast<btScalar>(bounds.mMax.y())));
+        }
+    }
+
     OscillatingRecastMeshObject::OscillatingRecastMeshObject(RecastMeshObject&& impl, std::size_t lastChangeRevision)
         : mImpl(std::move(impl))
         , mLastChangeRevision(lastChangeRevision)
@@ -19,7 +33,7 @@ namespace DetourNavigator
     }
 
     bool OscillatingRecastMeshObject::update(const btTransform& transform, const AreaType areaType,
-                                             std::size_t lastChangeRevision)
+                                             std::size_t lastChangeRevision, const TileBounds& bounds)
     {
         const btTransform oldTransform = mImpl.getTransform();
         if (!mImpl.update(transform, areaType))
@@ -37,6 +51,7 @@ namespace DetourNavigator
         }
         const btAABB currentAabb = mAabb;
         mAabb.merge(BulletHelpers::getAabb(mImpl.getShape(), transform));
+        limitBy(mAabb, bounds);
         return currentAabb != mAabb;
     }
 }
diff --git a/components/detournavigator/oscillatingrecastmeshobject.hpp b/components/detournavigator/oscillatingrecastmeshobject.hpp
index 78a0c4b689..f8aabce628 100644
--- a/components/detournavigator/oscillatingrecastmeshobject.hpp
+++ b/components/detournavigator/oscillatingrecastmeshobject.hpp
@@ -3,6 +3,7 @@
 
 #include "areatype.hpp"
 #include "recastmeshobject.hpp"
+#include "tilebounds.hpp"
 
 #include <LinearMath/btTransform.h>
 #include <BulletCollision/Gimpact/btBoxCollision.h>
@@ -15,7 +16,8 @@ namespace DetourNavigator
             explicit OscillatingRecastMeshObject(RecastMeshObject&& impl, std::size_t lastChangeRevision);
             explicit OscillatingRecastMeshObject(const RecastMeshObject& impl, std::size_t lastChangeRevision);
 
-            bool update(const btTransform& transform, const AreaType areaType, std::size_t lastChangeRevision);
+            bool update(const btTransform& transform, const AreaType areaType, std::size_t lastChangeRevision,
+                        const TileBounds& bounds);
 
             const RecastMeshObject& getImpl() const { return mImpl; }
 
diff --git a/components/detournavigator/recastmeshmanager.cpp b/components/detournavigator/recastmeshmanager.cpp
index 5fbcedff6b..e168a33040 100644
--- a/components/detournavigator/recastmeshmanager.cpp
+++ b/components/detournavigator/recastmeshmanager.cpp
@@ -5,6 +5,7 @@ namespace DetourNavigator
     RecastMeshManager::RecastMeshManager(const Settings& settings, const TileBounds& bounds, std::size_t generation)
         : mGeneration(generation)
         , mMeshBuilder(settings, bounds)
+        , mTileBounds(bounds)
     {
     }
 
@@ -29,7 +30,7 @@ namespace DetourNavigator
             return false;
         const std::size_t lastChangeRevision = mLastNavMeshReportedChange.has_value()
                 ? mLastNavMeshReportedChange->mRevision : mRevision;
-        if (!object->second->update(transform, areaType, lastChangeRevision))
+        if (!object->second->update(transform, areaType, lastChangeRevision, mTileBounds))
             return false;
         ++mRevision;
         return true;
diff --git a/components/detournavigator/recastmeshmanager.hpp b/components/detournavigator/recastmeshmanager.hpp
index ac17a347b6..e1606f0a95 100644
--- a/components/detournavigator/recastmeshmanager.hpp
+++ b/components/detournavigator/recastmeshmanager.hpp
@@ -65,6 +65,7 @@ namespace DetourNavigator
         std::size_t mRevision = 0;
         std::size_t mGeneration;
         RecastMeshBuilder mMeshBuilder;
+        TileBounds mTileBounds;
         std::list<OscillatingRecastMeshObject> mObjectsOrder;
         std::unordered_map<ObjectId, std::list<OscillatingRecastMeshObject>::iterator> mObjects;
         std::list<Water> mWaterOrder;

From 22c2f106b755365ee0d85074a784a6c19fe5f0da Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 27 May 2021 15:25:21 +0200
Subject: [PATCH 0833/2859] Store object tiles position as sorted vector
 instead of set

---
 .../tilecachedrecastmeshmanager.cpp           | 20 ++++++++++---------
 .../tilecachedrecastmeshmanager.hpp           | 20 +++++++++++--------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/components/detournavigator/tilecachedrecastmeshmanager.cpp b/components/detournavigator/tilecachedrecastmeshmanager.cpp
index 20ebc8fea9..42ae93e806 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -3,6 +3,9 @@
 #include "gettilespositions.hpp"
 #include "settingsutils.hpp"
 
+#include <algorithm>
+#include <vector>
+
 namespace DetourNavigator
 {
     TileCachedRecastMeshManager::TileCachedRecastMeshManager(const Settings& settings)
@@ -12,23 +15,22 @@ namespace DetourNavigator
     bool TileCachedRecastMeshManager::addObject(const ObjectId id, const btCollisionShape& shape,
                                                 const btTransform& transform, const AreaType areaType)
     {
-        bool result = false;
-        auto& tilesPositions = mObjectsTilesPositions[id];
+        std::vector<TilePosition> tilesPositions;
         const auto border = getBorderSize(mSettings);
         {
             auto tiles = mTiles.lock();
             getTilesPositions(shape, transform, mSettings, [&] (const TilePosition& tilePosition)
                 {
                     if (addTile(id, shape, transform, areaType, tilePosition, border, tiles.get()))
-                    {
-                        tilesPositions.insert(tilePosition);
-                        result = true;
-                    }
+                        tilesPositions.push_back(tilePosition);
                 });
         }
-        if (result)
-            ++mRevision;
-        return result;
+        if (tilesPositions.empty())
+            return false;
+        std::sort(tilesPositions.begin(), tilesPositions.end());
+        mObjectsTilesPositions.insert_or_assign(id, std::move(tilesPositions));
+        ++mRevision;
+        return true;
     }
 
     std::optional<RemovedRecastMeshObject> TileCachedRecastMeshManager::removeObject(const ObjectId id)
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.hpp b/components/detournavigator/tilecachedrecastmeshmanager.hpp
index 4c6f21c428..23ecc77634 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.hpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.hpp
@@ -9,9 +9,10 @@
 
 #include <components/misc/guarded.hpp>
 
+#include <algorithm>
 #include <map>
 #include <mutex>
-#include <set>
+#include <vector>
 
 namespace DetourNavigator
 {
@@ -33,14 +34,14 @@ namespace DetourNavigator
             auto& currentTiles = object->second;
             const auto border = getBorderSize(mSettings);
             bool changed = false;
-            std::set<TilePosition> newTiles;
+            std::vector<TilePosition> newTiles;
             {
                 auto tiles = mTiles.lock();
                 const auto onTilePosition = [&] (const TilePosition& tilePosition)
                 {
-                    if (currentTiles.count(tilePosition))
+                    if (std::binary_search(currentTiles.begin(), currentTiles.end(), tilePosition))
                     {
-                        newTiles.insert(tilePosition);
+                        newTiles.push_back(tilePosition);
                         if (updateTile(id, transform, areaType, tilePosition, tiles.get()))
                         {
                             onChangedTile(tilePosition);
@@ -49,24 +50,27 @@ namespace DetourNavigator
                     }
                     else if (addTile(id, shape, transform, areaType, tilePosition, border, tiles.get()))
                     {
-                        newTiles.insert(tilePosition);
+                        newTiles.push_back(tilePosition);
                         onChangedTile(tilePosition);
                         changed = true;
                     }
                 };
                 getTilesPositions(shape, transform, mSettings, onTilePosition);
+                std::sort(newTiles.begin(), newTiles.end());
                 for (const auto& tile : currentTiles)
                 {
-                    if (!newTiles.count(tile) && removeTile(id, tile, tiles.get()))
+                    if (!std::binary_search(newTiles.begin(), newTiles.end(), tile) && removeTile(id, tile, tiles.get()))
                     {
                         onChangedTile(tile);
                         changed = true;
                     }
                 }
             }
-            std::swap(currentTiles, newTiles);
             if (changed)
+            {
+                currentTiles = std::move(newTiles);
                 ++mRevision;
+            }
             return changed;
         }
 
@@ -94,7 +98,7 @@ namespace DetourNavigator
     private:
         const Settings& mSettings;
         Misc::ScopeGuarded<std::map<TilePosition, CachedRecastMeshManager>> mTiles;
-        std::unordered_map<ObjectId, std::set<TilePosition>> mObjectsTilesPositions;
+        std::unordered_map<ObjectId, std::vector<TilePosition>> mObjectsTilesPositions;
         std::map<osg::Vec2i, std::vector<TilePosition>> mWaterTilesPositions;
         std::size_t mRevision = 0;
         std::size_t mTilesGeneration = 0;

From ed91cf9397cdf8d14c5a5823ee5155eca6cb5cd9 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 27 May 2021 16:38:04 +0200
Subject: [PATCH 0834/2859] Replace unordered_map by map for storing objects

For small amount of items it gives better performance for find by key
for update.
---
 components/detournavigator/recastmeshmanager.cpp | 9 ++++-----
 components/detournavigator/recastmeshmanager.hpp | 3 +--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/components/detournavigator/recastmeshmanager.cpp b/components/detournavigator/recastmeshmanager.cpp
index e168a33040..bfc0409a51 100644
--- a/components/detournavigator/recastmeshmanager.cpp
+++ b/components/detournavigator/recastmeshmanager.cpp
@@ -12,13 +12,12 @@ namespace DetourNavigator
     bool RecastMeshManager::addObject(const ObjectId id, const btCollisionShape& shape, const btTransform& transform,
                                       const AreaType areaType)
     {
+        const auto object = mObjects.lower_bound(id);
+        if (object != mObjects.end() && object->first == id)
+            return false;
         const auto iterator = mObjectsOrder.emplace(mObjectsOrder.end(),
             OscillatingRecastMeshObject(RecastMeshObject(shape, transform, areaType), mRevision + 1));
-        if (!mObjects.emplace(id, iterator).second)
-        {
-            mObjectsOrder.erase(iterator);
-            return false;
-        }
+        mObjects.emplace_hint(object, id, iterator);
         ++mRevision;
         return true;
     }
diff --git a/components/detournavigator/recastmeshmanager.hpp b/components/detournavigator/recastmeshmanager.hpp
index e1606f0a95..5922821f26 100644
--- a/components/detournavigator/recastmeshmanager.hpp
+++ b/components/detournavigator/recastmeshmanager.hpp
@@ -13,7 +13,6 @@
 #include <list>
 #include <map>
 #include <optional>
-#include <unordered_map>
 
 class btCollisionShape;
 
@@ -67,7 +66,7 @@ namespace DetourNavigator
         RecastMeshBuilder mMeshBuilder;
         TileBounds mTileBounds;
         std::list<OscillatingRecastMeshObject> mObjectsOrder;
-        std::unordered_map<ObjectId, std::list<OscillatingRecastMeshObject>::iterator> mObjects;
+        std::map<ObjectId, std::list<OscillatingRecastMeshObject>::iterator> mObjects;
         std::list<Water> mWaterOrder;
         std::map<osg::Vec2i, std::list<Water>::iterator> mWater;
         std::optional<Report> mLastNavMeshReportedChange;

From 4a6961b365e5621e6d39524c2b94c5084cd21b06 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 27 May 2021 16:52:01 +0200
Subject: [PATCH 0835/2859] Trigger navmesh update on moved player only when
 player tile has been changed

---
 apps/openmw/mwworld/scene.cpp                | 2 +-
 components/detournavigator/navigator.hpp     | 8 +++++++-
 components/detournavigator/navigatorimpl.cpp | 9 +++++++++
 components/detournavigator/navigatorimpl.hpp | 3 +++
 components/detournavigator/navigatorstub.hpp | 2 ++
 5 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 83e9805f6e..ac62aab19d 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -500,7 +500,7 @@ namespace MWWorld
     {
         const auto navigator = MWBase::Environment::get().getWorld()->getNavigator();
         const auto player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-        navigator->update(player.getRefData().getPosition().asVec3());
+        navigator->updatePlayerPosition(player.getRefData().getPosition().asVec3());
 
         if (!mCurrentCell || !mCurrentCell->isExterior())
             return;
diff --git a/components/detournavigator/navigator.hpp b/components/detournavigator/navigator.hpp
index 8cf4cb80e8..0dab7ba6b3 100644
--- a/components/detournavigator/navigator.hpp
+++ b/components/detournavigator/navigator.hpp
@@ -155,11 +155,17 @@ namespace DetourNavigator
         virtual void removePathgrid(const ESM::Pathgrid& pathgrid) = 0;
 
         /**
-         * @brief update start background navmesh update using current scene state.
+         * @brief update starts background navmesh update using current scene state.
          * @param playerPosition setup initial point to order build tiles of navmesh.
          */
         virtual void update(const osg::Vec3f& playerPosition) = 0;
 
+        /**
+         * @brief updatePlayerPosition starts background navmesh update using current scene state only when player position has been changed.
+         * @param playerPosition setup initial point to order build tiles of navmesh.
+         */
+        virtual void updatePlayerPosition(const osg::Vec3f& playerPosition) = 0;
+
         /**
          * @brief disable navigator updates
          */
diff --git a/components/detournavigator/navigatorimpl.cpp b/components/detournavigator/navigatorimpl.cpp
index 7522fe6227..b7b3bbd586 100644
--- a/components/detournavigator/navigatorimpl.cpp
+++ b/components/detournavigator/navigatorimpl.cpp
@@ -146,6 +146,15 @@ namespace DetourNavigator
             mNavMeshManager.update(playerPosition, v.first);
     }
 
+    void NavigatorImpl::updatePlayerPosition(const osg::Vec3f& playerPosition)
+    {
+        const TilePosition tilePosition = getTilePosition(mSettings, toNavMeshCoordinates(mSettings, playerPosition));
+        if (mLastPlayerPosition.has_value() && *mLastPlayerPosition == tilePosition)
+            return;
+        update(playerPosition);
+        mLastPlayerPosition = tilePosition;
+    }
+
     void NavigatorImpl::setUpdatesEnabled(bool enabled)
     {
         mUpdatesEnabled = enabled;
diff --git a/components/detournavigator/navigatorimpl.hpp b/components/detournavigator/navigatorimpl.hpp
index 3249462616..80c6957d79 100644
--- a/components/detournavigator/navigatorimpl.hpp
+++ b/components/detournavigator/navigatorimpl.hpp
@@ -46,6 +46,8 @@ namespace DetourNavigator
 
         void update(const osg::Vec3f& playerPosition) override;
 
+        void updatePlayerPosition(const osg::Vec3f& playerPosition) override;
+
         void setUpdatesEnabled(bool enabled) override;
 
         void wait(Loading::Listener& listener, WaitConditionType waitConditionType) override;
@@ -66,6 +68,7 @@ namespace DetourNavigator
         Settings mSettings;
         NavMeshManager mNavMeshManager;
         bool mUpdatesEnabled;
+        std::optional<TilePosition> mLastPlayerPosition;
         std::map<osg::Vec3f, std::size_t> mAgents;
         std::unordered_map<ObjectId, ObjectId> mAvoidIds;
         std::unordered_map<ObjectId, ObjectId> mWaterIds;
diff --git a/components/detournavigator/navigatorstub.hpp b/components/detournavigator/navigatorstub.hpp
index 2c12c45eb5..0a08813938 100644
--- a/components/detournavigator/navigatorstub.hpp
+++ b/components/detournavigator/navigatorstub.hpp
@@ -71,6 +71,8 @@ namespace DetourNavigator
 
         void update(const osg::Vec3f& /*playerPosition*/) override {}
 
+        void updatePlayerPosition(const osg::Vec3f& /*playerPosition*/) override {};
+
         void setUpdatesEnabled(bool /*enabled*/) override {}
 
         void wait(Loading::Listener& /*listener*/, WaitConditionType /*waitConditionType*/) override {}

From 1a1085272a89ff813c7938b6c3008c1927d70a03 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 27 May 2021 17:13:04 +0200
Subject: [PATCH 0836/2859] Use ciEqual to determine actor-specific answers

---
 apps/openmw/mwdialogue/dialoguemanagerimp.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index 34fd5828fd..3c6349ad85 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -343,7 +343,7 @@ namespace MWDialogue
                     if(!inJournal(topicId, answer->mId))
                     {
                         // Does this dialogue contains some actor-specific answer?
-                        if (answer->mActor == mActor.getCellRef().getRefId())
+                        if (Misc::StringUtils::ciEqual(answer->mActor, mActor.getCellRef().getRefId()))
                             flag |= MWBase::DialogueManager::TopicType::Specific;
                     }
                     else

From e9433a91fbd6f2816d8ec2a170cb922ace2d4631 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 27 May 2021 20:18:52 +0200
Subject: [PATCH 0837/2859] Add more tests for TileCachedRecastMeshManager

---
 .../tilecachedrecastmeshmanager.cpp           | 85 +++++++++++++++++++
 1 file changed, 85 insertions(+)

diff --git a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
index 83622c0b7b..fb0f97831a 100644
--- a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -73,6 +73,16 @@ namespace
         EXPECT_FALSE(manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground));
     }
 
+    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, add_object_should_add_tiles)
+    {
+        TileCachedRecastMeshManager manager(mSettings);
+        const btBoxShape boxShape(btVector3(20, 20, 100));
+        ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground));
+        for (int x = -1; x < 1; ++x)
+            for (int y = -1; y < 1; ++y)
+                ASSERT_TRUE(manager.hasTile(TilePosition(x, y)));
+    }
+
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, update_object_for_changed_object_should_return_changed_tiles)
     {
         TileCachedRecastMeshManager manager(mSettings);
@@ -238,4 +248,79 @@ namespace
         manager.removeObject(ObjectId(&manager));
         EXPECT_EQ(manager.getRevision(), beforeRemoveRevision);
     }
+
+    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, add_water_for_new_water_should_return_true)
+    {
+        TileCachedRecastMeshManager manager(mSettings);
+        const osg::Vec2i cellPosition(0, 0);
+        const int cellSize = 8192;
+        EXPECT_TRUE(manager.addWater(cellPosition, cellSize, btTransform::getIdentity()));
+    }
+
+    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, add_water_for_not_max_int_should_add_new_tiles)
+    {
+        TileCachedRecastMeshManager manager(mSettings);
+        const osg::Vec2i cellPosition(0, 0);
+        const int cellSize = 8192;
+        ASSERT_TRUE(manager.addWater(cellPosition, cellSize, btTransform::getIdentity()));
+        for (int x = -6; x < 6; ++x)
+            for (int y = -6; y < 6; ++y)
+                ASSERT_TRUE(manager.hasTile(TilePosition(x, y)));
+    }
+
+    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, add_water_for_max_int_should_not_add_new_tiles)
+    {
+        TileCachedRecastMeshManager manager(mSettings);
+        const btBoxShape boxShape(btVector3(20, 20, 100));
+        ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground));
+        const osg::Vec2i cellPosition(0, 0);
+        const int cellSize = std::numeric_limits<int>::max();
+        ASSERT_TRUE(manager.addWater(cellPosition, cellSize, btTransform::getIdentity()));
+        for (int x = -6; x < 6; ++x)
+            for (int y = -6; y < 6; ++y)
+                ASSERT_EQ(manager.hasTile(TilePosition(x, y)), -1 <= x && x <= 0 && -1 <= y && y <= 0);
+    }
+
+    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, remove_water_for_absent_cell_should_return_nullopt)
+    {
+        TileCachedRecastMeshManager manager(mSettings);
+        EXPECT_EQ(manager.removeWater(osg::Vec2i(0, 0)), std::nullopt);
+    }
+
+    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, remove_water_for_existing_cell_should_return_removed_water)
+    {
+        TileCachedRecastMeshManager manager(mSettings);
+        const osg::Vec2i cellPosition(0, 0);
+        const int cellSize = 8192;
+        ASSERT_TRUE(manager.addWater(cellPosition, cellSize, btTransform::getIdentity()));
+        const auto result = manager.removeWater(cellPosition);
+        ASSERT_TRUE(result.has_value());
+        EXPECT_EQ(result->mCellSize, cellSize);
+    }
+
+    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, remove_water_for_existing_cell_should_remove_empty_tiles)
+    {
+        TileCachedRecastMeshManager manager(mSettings);
+        const osg::Vec2i cellPosition(0, 0);
+        const int cellSize = 8192;
+        ASSERT_TRUE(manager.addWater(cellPosition, cellSize, btTransform::getIdentity()));
+        ASSERT_TRUE(manager.removeWater(cellPosition));
+        for (int x = -6; x < 6; ++x)
+            for (int y = -6; y < 6; ++y)
+                ASSERT_FALSE(manager.hasTile(TilePosition(x, y)));
+    }
+
+    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, remove_water_for_existing_cell_should_leave_not_empty_tiles)
+    {
+        TileCachedRecastMeshManager manager(mSettings);
+        const btBoxShape boxShape(btVector3(20, 20, 100));
+        ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground));
+        const osg::Vec2i cellPosition(0, 0);
+        const int cellSize = 8192;
+        ASSERT_TRUE(manager.addWater(cellPosition, cellSize, btTransform::getIdentity()));
+        ASSERT_TRUE(manager.removeWater(cellPosition));
+        for (int x = -6; x < 6; ++x)
+            for (int y = -6; y < 6; ++y)
+                ASSERT_EQ(manager.hasTile(TilePosition(x, y)), -1 <= x && x <= 0 && -1 <= y && y <= 0);
+    }
 }

From d4f28ac97967911dcd56f8a462a892d2918dccd1 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 28 May 2021 10:41:03 +0200
Subject: [PATCH 0838/2859] Avoid resetting buffer object when configuring
 light buffer layout

Otherwise this casues RaceSelectionPreview to have no light until first change.
---
 components/sceneutil/lightmanager.cpp | 100 +++++++++++++++-----------
 1 file changed, 58 insertions(+), 42 deletions(-)

diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index a69a64ba37..c4233059ca 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -103,47 +103,12 @@ namespace SceneUtil
             : mData(new osg::FloatArray(3*4*count))
             , mEndian(osg::getCpuByteOrder())
             , mCount(count)
-            , mStride(12)
             , mCachedSunPos(osg::Vec4())
         {
-            mOffsets[Diffuse] = 0;
-            mOffsets[Ambient] = 1;
-            mOffsets[Specular] = 2;
-            mOffsets[DiffuseSign] = 3;
-            mOffsets[Position] = 4;
-            mOffsets[AttenuationRadius] = 8;
         }
 
         LightBuffer(const LightBuffer&) = delete;
 
-        LightBuffer(const LightBuffer& other, int offsetColors, int offsetPosition, int offsetAttenuationRadius, int size, int stride)
-            : mData(new osg::FloatArray(size / sizeof(GL_FLOAT)))
-            , mEndian(other.mEndian)
-            , mCount(other.mCount)
-            , mStride((offsetAttenuationRadius + sizeof(GL_FLOAT) * osg::Vec4::num_components + stride) / 4)
-            , mCachedSunPos(other.mCachedSunPos)
-        {
-            mData->setBufferObject(other.mData->getBufferObject());
-
-            constexpr auto sizeofFloat = sizeof(GL_FLOAT);
-            const auto diffuseOffset = offsetColors / sizeofFloat;
-
-            mOffsets[Diffuse] = diffuseOffset;
-            mOffsets[Ambient] = diffuseOffset + 1;
-            mOffsets[Specular] = diffuseOffset + 2;
-            mOffsets[DiffuseSign] = diffuseOffset + 3;
-            mOffsets[Position] = offsetPosition / sizeofFloat;
-            mOffsets[AttenuationRadius] = offsetAttenuationRadius / sizeofFloat;
-
-            // Copy over previous buffers light data. Buffers populate before we know the layout.
-            for (int i = 0; i < other.mCount; ++i)
-            {
-                std::memcpy(&(*mData)[getOffset(i, Diffuse)], &(*other.mData)[other.getOffset(i, Diffuse)], sizeof(osg::Vec4f));
-                std::memcpy(&(*mData)[getOffset(i, Position)], &(*other.mData)[other.getOffset(i, Position)], sizeof(osg::Vec4f));
-                std::memcpy(&(*mData)[getOffset(i, AttenuationRadius)], &(*other.mData)[other.getOffset(i, AttenuationRadius)], sizeof(osg::Vec4f));
-            }
-        }
-
         void setDiffuse(int index, const osg::Vec4& value)
         {
             // Deal with negative lights (negative diffuse) by passing a sign bit in the unused alpha component
@@ -214,15 +179,69 @@ namespace SceneUtil
 
         int getOffset(int index, LayoutOffset slot) const
         {
-            return mStride * index + mOffsets[slot];
+            return mOffsets.get(index, slot);
+        }
+
+        void configureLayout(int offsetColors, int offsetPosition, int offsetAttenuationRadius, int size, int stride)
+        {
+            const Offsets offsets(offsetColors, offsetPosition, offsetAttenuationRadius, stride);
+
+            // Copy cloned data using current layout into current data using new layout.
+            // This allows to preserve osg::FloatArray buffer object in mData.
+            const auto data = mData->asVector();
+            mData->resizeArray(static_cast<unsigned>(size));
+            for (int i = 0; i < mCount; ++i)
+            {
+                std::memcpy(&(*mData)[offsets.get(i, Diffuse)], data.data() + getOffset(i, Diffuse), sizeof(osg::Vec4f));
+                std::memcpy(&(*mData)[offsets.get(i, Position)], data.data() + getOffset(i, Position), sizeof(osg::Vec4f));
+                std::memcpy(&(*mData)[offsets.get(i, AttenuationRadius)], data.data() + getOffset(i, AttenuationRadius), sizeof(osg::Vec4f));
+            }
+            mOffsets = offsets;
         }
 
     private:
+        class Offsets
+        {
+            public:
+                Offsets()
+                    : mStride(12)
+                {
+                    mValues[Diffuse] = 0;
+                    mValues[Ambient] = 1;
+                    mValues[Specular] = 2;
+                    mValues[DiffuseSign] = 3;
+                    mValues[Position] = 4;
+                    mValues[AttenuationRadius] = 8;
+                }
+
+                Offsets(int offsetColors, int offsetPosition, int offsetAttenuationRadius, int stride)
+                    : mStride((offsetAttenuationRadius + sizeof(GL_FLOAT) * osg::Vec4::num_components + stride) / 4)
+                {
+                    constexpr auto sizeofFloat = sizeof(GL_FLOAT);
+                    const auto diffuseOffset = offsetColors / sizeofFloat;
+
+                    mValues[Diffuse] = diffuseOffset;
+                    mValues[Ambient] = diffuseOffset + 1;
+                    mValues[Specular] = diffuseOffset + 2;
+                    mValues[DiffuseSign] = diffuseOffset + 3;
+                    mValues[Position] = offsetPosition / sizeofFloat;
+                    mValues[AttenuationRadius] = offsetAttenuationRadius / sizeofFloat;
+                }
+
+                int get(int index, LayoutOffset slot) const
+                {
+                    return mStride * index + mValues[slot];
+                }
+
+            private:
+                int mStride;
+                std::array<int, 6> mValues;
+        };
+
         osg::ref_ptr<osg::FloatArray> mData;
         osg::Endian mEndian;
         int mCount;
-        int mStride;
-        std::array<std::size_t, 6> mOffsets;
+        Offsets mOffsets;
         osg::Vec4 mCachedSunPos;
     };
 
@@ -751,10 +770,7 @@ namespace SceneUtil
             ext->glGetActiveUniformsiv(handle, indices.size(), indices.data(), GL_UNIFORM_OFFSET, offsets.data());
 
             for (int i = 0; i < 2; ++i)
-            {
-                auto& buf = mLightManager->getLightBuffer(i);
-                buf = new LightBuffer(*buf, offsets[0], offsets[1], offsets[2], totalBlockSize, stride);
-            }
+                mLightManager->getLightBuffer(i)->configureLayout(offsets[0], offsets[1], offsets[2], totalBlockSize, stride);
         }
 
         void apply(osg::State& state) const override

From b8472e13032108b75980b65877380cb214edd772 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Fri, 28 May 2021 16:55:54 +0200
Subject: [PATCH 0839/2859] Use modified paralyze magnitude to fall and float

---
 apps/openmw/mwmechanics/character.cpp   | 2 +-
 apps/openmw/mwphysics/physicssystem.cpp | 2 +-
 apps/openmw/mwworld/worldimp.cpp        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index f7c50c5b6b..54c951187f 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -2458,7 +2458,7 @@ void CharacterController::update(float duration)
     if (mFloatToSurface && cls.isActor())
     {
         if (cls.getCreatureStats(mPtr).isDead()
-            || (!godmode && cls.getCreatureStats(mPtr).isParalyzed()))
+            || (!godmode && cls.getCreatureStats(mPtr).getMagicEffects().get(ESM::MagicEffect::Paralyze).getModifier() > 0))
         {
             moved.z() = 1.0;
         }
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 705e15187d..833bb9a161 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -932,7 +932,7 @@ namespace MWPhysics
         mWantJump = ptr.getClass().getMovementSettings(ptr).mPosition[2] != 0;
         auto& stats = ptr.getClass().getCreatureStats(ptr);
         const bool godmode = ptr == world->getPlayerConstPtr() && world->getGodModeState();
-        mFloatToSurface = stats.isDead() || (!godmode && stats.isParalyzed());
+        mFloatToSurface = stats.isDead() || (!godmode && stats.getMagicEffects().get(ESM::MagicEffect::Paralyze).getModifier() > 0);
         mWasOnGround = actor->getOnGround();
     }
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index e406992e2c..45a7dd8a74 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -2323,7 +2323,7 @@ namespace MWWorld
             return false;
 
         const bool isPlayer = ptr == getPlayerConstPtr();
-        if (!(isPlayer && mGodMode) && stats.isParalyzed())
+        if (!(isPlayer && mGodMode) && stats.getMagicEffects().get(ESM::MagicEffect::Paralyze).getModifier() > 0)
             return false;
 
         if (ptr.getClass().canFly(ptr))

From 8695b6fbc5f288acd74d9e9809fbe218209786c3 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sat, 29 May 2021 15:31:32 +0200
Subject: [PATCH 0840/2859] Use operator[] instead of at() when the idx is
 checked

---
 apps/openmw/mwrender/groundcover.cpp      | 2 +-
 apps/openmw/mwworld/projectilemanager.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwrender/groundcover.cpp b/apps/openmw/mwrender/groundcover.cpp
index 63df3e2497..9416a48ec8 100644
--- a/apps/openmw/mwrender/groundcover.cpp
+++ b/apps/openmw/mwrender/groundcover.cpp
@@ -220,7 +220,7 @@ namespace MWRender
                 calculator.reset();
                 for (size_t i=0; i<cell->mContextList.size(); ++i)
                 {
-                    unsigned int index = cell->mContextList.at(i).index;
+                    unsigned int index = cell->mContextList[i].index;
                     if (esm.size() <= index)
                         esm.resize(index+1);
                     cell->restore(esm[index], i);
diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index 53b1b364b6..4f0a2098f0 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -319,7 +319,7 @@ namespace MWWorld
 
         // in case there are multiple effects, the model is a dummy without geometry. Use the second effect for physics shape
         if (state.mIdMagic.size() > 1)
-            model = "meshes\\" + MWBase::Environment::get().getWorld()->getStore().get<ESM::Weapon>().find(state.mIdMagic.at(1))->mModel;
+            model = "meshes\\" + MWBase::Environment::get().getWorld()->getStore().get<ESM::Weapon>().find(state.mIdMagic[1])->mModel;
         state.mProjectileId = mPhysics->addProjectile(caster, pos, model, true, false);
         state.mToDelete = false;
         mMagicBolts.push_back(state);

From 9f2f5174d4c66d355c23f5395202949565558854 Mon Sep 17 00:00:00 2001
From: Thunderforge <wjherrmann@gmail.com>
Date: Sat, 29 May 2021 16:17:30 -0500
Subject: [PATCH 0841/2859] Adding Object Paging Min Size combo box to Advanced
 -> Visuals

Requested in Discord by CMAugust and hammered out with a few other users.
---
 apps/launcher/advancedpage.cpp |  4 ++++
 files/ui/advancedpage.ui       | 32 +++++++++++++++++++++++++++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index ed36634b62..9af1db504f 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -136,6 +136,7 @@ bool Launcher::AdvancedPage::loadSettings()
 
         loadSettingBool(activeGridObjectPagingCheckBox, "object paging active grid", "Terrain");
         viewingDistanceComboBox->setValue(convertToCells(Settings::Manager::getInt("viewing distance", "Camera")));
+        objectPagingMinSizeComboBox->setValue(Settings::Manager::getFloat("object paging min size", "Terrain"));
     }
 
     // Audio
@@ -287,6 +288,9 @@ void Launcher::AdvancedPage::saveSettings()
         {
             Settings::Manager::setInt("viewing distance", "Camera", convertToUnits(viewingDistance));
         }
+        double objectPagingMinSize = objectPagingMinSizeComboBox->value();
+        if (objectPagingMinSize != Settings::Manager::getFloat("object paging min size", "Terrain"))
+            Settings::Manager::setFloat("object paging min size", "Terrain", objectPagingMinSize);
     }
     
     // Audio
diff --git a/files/ui/advancedpage.ui b/files/ui/advancedpage.ui
index 5859f1f382..4462ae356a 100644
--- a/files/ui/advancedpage.ui
+++ b/files/ui/advancedpage.ui
@@ -478,6 +478,36 @@
                </layout>
               </item>
               <item row="1" column="0">
+               <layout class="QHBoxLayout" name="objectPagingMinSizeLayout">
+                <item>
+                 <widget class="QLabel" name="objectPagingMinSizeLabel">
+                  <property name="toolTip">
+                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Controls how large an object must be to be visible in the scene. The object’s size is divided by its distance to the camera and the result of the division is compared with this value. The smaller this value is, the more objects you will see in the scene.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                  </property>
+                  <property name="text">
+                   <string>Object paging min size</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QDoubleSpinBox" name="objectPagingMinSizeComboBox">
+                  <property name="decimals">
+                   <number>3</number>
+                  </property>
+                  <property name="minimum">
+                   <double>0.000000000000000</double>
+                  </property>
+                  <property name="maximum">
+                   <double>0.250000000000000</double>
+                  </property>
+                  <property name="singleStep">
+                   <double>0.005000000000000</double>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+              <item row="2" column="0">
                <widget class="QCheckBox" name="distantLandCheckBox">
                 <property name="toolTip">
                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If true, use paging and LOD algorithms to display the entire terrain. If false, only display terrain of the loaded cells.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -487,7 +517,7 @@
                 </property>
                </widget>
               </item>
-              <item row="2" column="0">
+              <item row="3" column="0">
                <layout class="QVBoxLayout" name="distantLandLayout">
                 <property name="leftMargin">
                  <number>20</number>

From 89950e55288ac92e9ea5217da861ec61d8cdda26 Mon Sep 17 00:00:00 2001
From: Thunderforge <wjherrmann@gmail.com>
Date: Sat, 29 May 2021 16:27:23 -0500
Subject: [PATCH 0842/2859] Preventing type conversion of double to float for
 objectPagingMinSize

---
 apps/launcher/advancedpage.cpp   |  6 +++---
 components/settings/settings.cpp | 16 ++++++++++++++++
 components/settings/settings.hpp |  2 ++
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index 9af1db504f..bddb70aa02 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -136,7 +136,7 @@ bool Launcher::AdvancedPage::loadSettings()
 
         loadSettingBool(activeGridObjectPagingCheckBox, "object paging active grid", "Terrain");
         viewingDistanceComboBox->setValue(convertToCells(Settings::Manager::getInt("viewing distance", "Camera")));
-        objectPagingMinSizeComboBox->setValue(Settings::Manager::getFloat("object paging min size", "Terrain"));
+        objectPagingMinSizeComboBox->setValue(Settings::Manager::getDouble("object paging min size", "Terrain"));
     }
 
     // Audio
@@ -289,8 +289,8 @@ void Launcher::AdvancedPage::saveSettings()
             Settings::Manager::setInt("viewing distance", "Camera", convertToUnits(viewingDistance));
         }
         double objectPagingMinSize = objectPagingMinSizeComboBox->value();
-        if (objectPagingMinSize != Settings::Manager::getFloat("object paging min size", "Terrain"))
-            Settings::Manager::setFloat("object paging min size", "Terrain", objectPagingMinSize);
+        if (objectPagingMinSize != Settings::Manager::getDouble("object paging min size", "Terrain"))
+            Settings::Manager::setDouble("object paging min size", "Terrain", objectPagingMinSize);
     }
     
     // Audio
diff --git a/components/settings/settings.cpp b/components/settings/settings.cpp
index 13501ac8c9..09a3d1f516 100644
--- a/components/settings/settings.cpp
+++ b/components/settings/settings.cpp
@@ -61,6 +61,15 @@ float Manager::getFloat (const std::string& setting, const std::string& category
     return number;
 }
 
+double Manager::getDouble (const std::string& setting, const std::string& category)
+{
+    const std::string& value = getString(setting, category);
+    std::stringstream stream(value);
+    double number = 0.0;
+    stream >> number;
+    return number;
+}
+
 int Manager::getInt (const std::string& setting, const std::string& category)
 {
     const std::string& value = getString(setting, category);
@@ -128,6 +137,13 @@ void Manager::setFloat (const std::string &setting, const std::string &category,
     setString(setting, category, stream.str());
 }
 
+void Manager::setDouble (const std::string &setting, const std::string &category, const double value)
+{
+    std::ostringstream stream;
+    stream << value;
+    setString(setting, category, stream.str());
+}
+
 void Manager::setBool(const std::string &setting, const std::string &category, const bool value)
 {
     setString(setting, category, value ? "true" : "false");
diff --git a/components/settings/settings.hpp b/components/settings/settings.hpp
index ecc5aa5fd3..e3a29d4c34 100644
--- a/components/settings/settings.hpp
+++ b/components/settings/settings.hpp
@@ -44,6 +44,7 @@ namespace Settings
 
         static int getInt (const std::string& setting, const std::string& category);
         static float getFloat (const std::string& setting, const std::string& category);
+        static double getDouble (const std::string& setting, const std::string& category);
         static std::string getString (const std::string& setting, const std::string& category);
         static bool getBool (const std::string& setting, const std::string& category);
         static osg::Vec2f getVector2 (const std::string& setting, const std::string& category);
@@ -51,6 +52,7 @@ namespace Settings
 
         static void setInt (const std::string& setting, const std::string& category, const int value);
         static void setFloat (const std::string& setting, const std::string& category, const float value);
+        static void setDouble (const std::string& setting, const std::string& category, const double value);
         static void setString (const std::string& setting, const std::string& category, const std::string& value);
         static void setBool (const std::string& setting, const std::string& category, const bool value);
         static void setVector2 (const std::string& setting, const std::string& category, const osg::Vec2f value);

From a487295d39544455d754d107675792cf2074c613 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Sat, 29 May 2021 20:29:53 +0000
Subject: [PATCH 0843/2859] Merge branch 'fix_new_game_guard' into 'master'

Consider time to destination when try to avoid collision

See merge request OpenMW/openmw!914
---
 apps/openmw/mwmechanics/actors.cpp    | 24 ++++++++++++++++++++----
 apps/openmw/mwmechanics/actors.hpp    |  2 +-
 apps/openmw/mwmechanics/aipackage.cpp | 26 ++++++++++++++++++++++----
 apps/openmw/mwmechanics/aipackage.hpp |  5 +++++
 4 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 4629ad2d3e..0ffcef2f8b 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1,5 +1,7 @@
 #include "actors.hpp"
 
+#include <optional>
+
 #include <components/esm/esmreader.hpp>
 #include <components/esm/esmwriter.hpp>
 
@@ -173,6 +175,15 @@ namespace MWMechanics
     static const int GREETING_COOLDOWN = 40;    // how many updates should pass before NPC can continue movement
     static const float DECELERATE_DISTANCE = 512.f;
 
+    namespace
+    {
+        float getTimeToDestination(const AiPackage& package, const osg::Vec3f& position, float speed, float duration, const osg::Vec3f& halfExtents)
+        {
+            const auto distanceToNextPathPoint = (package.getNextPathPoint(package.getDestination()) - position).length();
+            return (distanceToNextPathPoint - package.getNextPathPointTolerance(speed, duration, halfExtents)) / speed;
+        }
+    }
+
     class GetStuntedMagickaDuration : public MWMechanics::EffectSourceVisitor
     {
     public:
@@ -1764,7 +1775,7 @@ namespace MWMechanics
 
     }
 
-    void Actors::predictAndAvoidCollisions()
+    void Actors::predictAndAvoidCollisions(float duration)
     {
         if (!MWBase::Environment::get().getMechanicsManager()->isAIActive())
             return;
@@ -1799,7 +1810,8 @@ namespace MWMechanics
             bool shouldAvoidCollision = isMoving;
             bool shouldTurnToApproachingActor = !isMoving;
             MWWorld::Ptr currentTarget; // Combat or pursue target (NPCs should not avoid collision with their targets).
-            for (const auto& package : ptr.getClass().getCreatureStats(ptr).getAiSequence())
+            const auto& aiSequence = ptr.getClass().getCreatureStats(ptr).getAiSequence();
+            for (const auto& package : aiSequence)
             {
                 if (package->getTypeId() == AiPackageTypeId::Follow)
                     shouldAvoidCollision = true;
@@ -1829,6 +1841,10 @@ namespace MWMechanics
             osg::Vec2f movementCorrection(0, 0);
             float angleToApproachingActor = 0;
 
+            const float timeToDestination = aiSequence.isEmpty()
+                    ? std::numeric_limits<float>::max()
+                    : getTimeToDestination(**aiSequence.begin(), basePos, maxSpeed, duration, halfExtents);
+
             // Iterate through all other actors and predict collisions.
             for(PtrActorMap::iterator otherIter(mActors.begin()); otherIter != mActors.end(); ++otherIter)
             {
@@ -1865,7 +1881,7 @@ namespace MWMechanics
                     continue; // No solution; distance is always >= collisionDist.
                 float t = (-vr - std::sqrt(Dh)) / v2;
 
-                if (t < 0 || t > timeToCollision)
+                if (t < 0 || t > timeToCollision || t > timeToDestination)
                     continue;
 
                 // Check visibility and awareness last as it's expensive.
@@ -2075,7 +2091,7 @@ namespace MWMechanics
 
             static const bool avoidCollisions = Settings::Manager::getBool("NPCs avoid collisions", "Game");
             if (avoidCollisions)
-                predictAndAvoidCollisions();
+                predictAndAvoidCollisions(duration);
 
             timerUpdateHeadTrack += duration;
             timerUpdateEquippedLight += duration;
diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index 2de0728d58..0ae9687578 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -63,7 +63,7 @@ namespace MWMechanics
 
             void purgeSpellEffects (int casterActorId);
 
-            void predictAndAvoidCollisions();
+            void predictAndAvoidCollisions(float duration);
 
         public:
 
diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index a7e8e74b0d..0701f42cf3 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -28,6 +28,12 @@ namespace
     {
         return divisor == 0 ? std::numeric_limits<float>::max() * std::numeric_limits<float>::epsilon() : dividend / divisor;
     }
+
+    float getPointTolerance(float speed, float duration, const osg::Vec3f& halfExtents)
+    {
+        const float actorTolerance = 2 * speed * duration + 1.2 * std::max(halfExtents.x(), halfExtents.y());
+        return std::max(MWMechanics::MIN_TOLERANCE, actorTolerance);
+    }
 }
 
 MWMechanics::AiPackage::AiPackage(AiPackageTypeId typeId, const Options& options) :
@@ -98,6 +104,8 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
         return false;
     }
 
+    mLastDestinationTolerance = destTolerance;
+
     const float distToTarget = distance(position, dest);
     const bool isDestReached = (distToTarget <= destTolerance);
     const bool actorCanMoveByZ = canActorMoveByZAxis(actor);
@@ -148,9 +156,7 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
         }
     }
 
-    const float actorTolerance = 2 * actor.getClass().getMaxSpeed(actor) * duration
-            + 1.2 * std::max(halfExtents.x(), halfExtents.y());
-    const float pointTolerance = std::max(MIN_TOLERANCE, actorTolerance);
+    const float pointTolerance = getPointTolerance(actor.getClass().getMaxSpeed(actor), duration, halfExtents);
 
     static const bool smoothMovement = Settings::Manager::getBool("smooth movement", "Game");
     mPathFinder.update(position, pointTolerance, DEFAULT_TOLERANCE,
@@ -181,7 +187,7 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
     zTurn(actor, zAngleToNext);
     smoothTurn(actor, mPathFinder.getXAngleToNext(position.x(), position.y(), position.z()), 0);
 
-    const auto destination = mPathFinder.getPath().empty() ? dest : mPathFinder.getPath().front();
+    const auto destination = getNextPathPoint(dest);
     mObstacleCheck.update(actor, destination, duration);
 
     if (smoothMovement)
@@ -461,3 +467,15 @@ DetourNavigator::AreaCosts MWMechanics::AiPackage::getAreaCosts(const MWWorld::P
 
     return costs;
 }
+
+osg::Vec3f MWMechanics::AiPackage::getNextPathPoint(const osg::Vec3f& destination) const
+{
+    return mPathFinder.getPath().empty() ? destination : mPathFinder.getPath().front();
+}
+
+float MWMechanics::AiPackage::getNextPathPointTolerance(float speed, float duration, const osg::Vec3f& halfExtents) const
+{
+    if (mPathFinder.getPathSize() <= 1)
+        return mLastDestinationTolerance;
+    return getPointTolerance(speed, duration, halfExtents);
+}
diff --git a/apps/openmw/mwmechanics/aipackage.hpp b/apps/openmw/mwmechanics/aipackage.hpp
index 5ad73c2da6..6d8af0d92b 100644
--- a/apps/openmw/mwmechanics/aipackage.hpp
+++ b/apps/openmw/mwmechanics/aipackage.hpp
@@ -122,6 +122,10 @@ namespace MWMechanics
             /// Return if actor's rotation speed is sufficient to rotate to the destination pathpoint on the run. Otherwise actor should rotate while standing.
             static bool isReachableRotatingOnTheRun(const MWWorld::Ptr& actor, const osg::Vec3f& dest);
 
+            osg::Vec3f getNextPathPoint(const osg::Vec3f& destination) const;
+
+            float getNextPathPointTolerance(float speed, float duration, const osg::Vec3f& halfExtents) const;
+
         protected:
             /// Handles path building and shortcutting with obstacles avoiding
             /** \return If the actor has arrived at his destination **/
@@ -166,6 +170,7 @@ namespace MWMechanics
             bool mIsShortcutting;   // if shortcutting at the moment
             bool mShortcutProhibited; // shortcutting may be prohibited after unsuccessful attempt
             osg::Vec3f mShortcutFailPos; // position of last shortcut fail
+            float mLastDestinationTolerance = 0;
 
         private:
             bool isNearInactiveCell(osg::Vec3f position);

From 9058fa9f60bdd81f15768d3264f0ff1996291e5e Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Sat, 29 May 2021 20:32:00 +0000
Subject: [PATCH 0844/2859] Merge branch 'fix_launcher_ui' into 'master'

Make launcher Advanced/Visuals tab look more like other

See merge request OpenMW/openmw!908
---
 files/ui/advancedpage.ui | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/files/ui/advancedpage.ui b/files/ui/advancedpage.ui
index 5859f1f382..b9d5c7ef57 100644
--- a/files/ui/advancedpage.ui
+++ b/files/ui/advancedpage.ui
@@ -507,6 +507,19 @@
              </layout>
             </widget>
            </item>
+           <item>
+            <spacer name="verticalSpacer">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>40</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
           </layout>
          </widget>
         </widget>

From 3e4340338f0fd3a994cc4dcf69b2fe0e919367a3 Mon Sep 17 00:00:00 2001
From: Alexey Sokolov <sokolov@google.com>
Date: Mon, 31 May 2021 21:11:43 +0100
Subject: [PATCH 0845/2859] Update IRC links to libera

In README, in OpenCS about dialog, in Travis notification
---
 .travis.yml                   | 2 +-
 README.md                     | 2 +-
 apps/opencs/view/doc/view.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d019b55268..1322dfca1b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -74,7 +74,7 @@ notifications:
   irc:
     if: repository_slug = OpenMW/openmw AND branch = master
     channels:
-      - "chat.freenode.net#openmw"
+      - "irc.libera.chat#openmw"
     on_success: change
     on_failure: always
     use_notice: true
diff --git a/README.md b/README.md
index 6aa0a85156..54fd59f004 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ OpenMW also comes with OpenMW-CS, a replacement for Bethesda's Construction Set.
 * Version: 0.47.0
 * License: GPLv3 (see [LICENSE](https://github.com/OpenMW/openmw/blob/master/LICENSE) for more information)
 * Website: https://www.openmw.org
-* IRC: #openmw on irc.freenode.net
+* IRC: #openmw on irc.libera.chat
 
 Font Licenses:
 * DejaVuLGCSansMono.ttf: custom (see [files/mygui/DejaVuFontLicense.txt](https://github.com/OpenMW/openmw/blob/master/files/mygui/DejaVuFontLicense.txt) for more information)
diff --git a/apps/opencs/view/doc/view.cpp b/apps/opencs/view/doc/view.cpp
index 6fe01dc27d..4514cfb585 100644
--- a/apps/opencs/view/doc/view.cpp
+++ b/apps/opencs/view/doc/view.cpp
@@ -749,7 +749,7 @@ void CSVDoc::View::infoAbout()
     "<tr><td>%4</td><td><a href=\"https://openmw.org\">https://openmw.org</a></td></tr>"
     "<tr><td>%5</td><td><a href=\"https://forum.openmw.org\">https://forum.openmw.org</a></td></tr>"
     "<tr><td>%6</td><td><a href=\"https://gitlab.com/OpenMW/openmw/issues\">https://gitlab.com/OpenMW/openmw/issues</a></td></tr>"
-    "<tr><td>%7</td><td><a href=\"https://webchat.freenode.net/?channels=openmw&uio=OT10cnVlde\">irc://irc.freenode.net/#openmw</a></td></tr>"
+    "<tr><td>%7</td><td><a href=\"https://web.libera.chat/#openmw\">ircs://irc.libera.chat/#openmw</a></td></tr>"
     "</table>"
     "</p>")
     .arg(versionInfo

From 70a02290108cfead0e40c84078819d9c40cc4830 Mon Sep 17 00:00:00 2001
From: Dan Church <amphetamachine@gmail.com>
Date: Tue, 1 Jun 2021 10:56:48 -0500
Subject: [PATCH 0846/2859] Fix future FFMpeg API changes

avcodec_find_decoder now returns const AVCodec*.
---
 apps/openmw/mwsound/ffmpeg_decoder.cpp         | 2 +-
 extern/osg-ffmpeg-videoplayer/audiodecoder.cpp | 2 +-
 extern/osg-ffmpeg-videoplayer/videostate.cpp   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwsound/ffmpeg_decoder.cpp b/apps/openmw/mwsound/ffmpeg_decoder.cpp
index ec36a5cdf8..0a9641635f 100644
--- a/apps/openmw/mwsound/ffmpeg_decoder.cpp
+++ b/apps/openmw/mwsound/ffmpeg_decoder.cpp
@@ -221,7 +221,7 @@ void FFmpeg_Decoder::open(const std::string &fname)
         if(!mStream)
             throw std::runtime_error("No audio streams in "+fname);
 
-        AVCodec *codec = avcodec_find_decoder((*mStream)->codecpar->codec_id);
+        const AVCodec *codec = avcodec_find_decoder((*mStream)->codecpar->codec_id);
         if(!codec)
         {
             std::string ss = "No codec found for id " +
diff --git a/extern/osg-ffmpeg-videoplayer/audiodecoder.cpp b/extern/osg-ffmpeg-videoplayer/audiodecoder.cpp
index b5b3b8a3e0..decf57e4df 100644
--- a/extern/osg-ffmpeg-videoplayer/audiodecoder.cpp
+++ b/extern/osg-ffmpeg-videoplayer/audiodecoder.cpp
@@ -71,7 +71,7 @@ MovieAudioDecoder::MovieAudioDecoder(VideoState* videoState)
 {
     mAudioResampler.reset(new AudioResampler());
 
-    AVCodec *codec = avcodec_find_decoder(mAVStream->codecpar->codec_id);
+    const AVCodec *codec = avcodec_find_decoder(mAVStream->codecpar->codec_id);
     if(!codec)
     {
         std::string ss = "No codec found for id " +
diff --git a/extern/osg-ffmpeg-videoplayer/videostate.cpp b/extern/osg-ffmpeg-videoplayer/videostate.cpp
index c3cb412e9a..7b4060753e 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.cpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.cpp
@@ -632,7 +632,7 @@ bool VideoState::update()
 
 int VideoState::stream_open(int stream_index, AVFormatContext *pFormatCtx)
 {
-    AVCodec *codec;
+    const AVCodec *codec;
 
     if(stream_index < 0 || stream_index >= static_cast<int>(pFormatCtx->nb_streams))
         return -1;

From d651f9e60c934d160f44fcc59d7b3fb2675f0aea Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Wed, 2 Jun 2021 19:04:46 +0200
Subject: [PATCH 0847/2859] Remove some useless variables from esmtool

---
 apps/esmtool/esmtool.cpp | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp
index 60483f9813..2d3e7d5310 100644
--- a/apps/esmtool/esmtool.cpp
+++ b/apps/esmtool/esmtool.cpp
@@ -33,22 +33,8 @@ struct ESMData
     std::map<ESM::Cell *, std::deque<std::pair<ESM::CellRef, bool> > > mCellRefs;
     std::map<int, int> mRecordStats;
 
-    static const std::set<int> sLabeledRec;
 };
 
-static const int sLabeledRecIds[] = {
-    ESM::REC_GLOB, ESM::REC_CLAS, ESM::REC_FACT, ESM::REC_RACE, ESM::REC_SOUN,
-    ESM::REC_REGN, ESM::REC_BSGN, ESM::REC_LTEX, ESM::REC_STAT, ESM::REC_DOOR,
-    ESM::REC_MISC, ESM::REC_WEAP, ESM::REC_CONT, ESM::REC_SPEL, ESM::REC_CREA,
-    ESM::REC_BODY, ESM::REC_LIGH, ESM::REC_ENCH, ESM::REC_NPC_, ESM::REC_ARMO,
-    ESM::REC_CLOT, ESM::REC_REPA, ESM::REC_ACTI, ESM::REC_APPA, ESM::REC_LOCK,
-    ESM::REC_PROB, ESM::REC_INGR, ESM::REC_BOOK, ESM::REC_ALCH, ESM::REC_LEVI,
-    ESM::REC_LEVC, ESM::REC_SNDG, ESM::REC_CELL, ESM::REC_DIAL
-};
-
-const std::set<int> ESMData::sLabeledRec =
-    std::set<int>(sLabeledRecIds, sLabeledRecIds + 34);
-
 // Based on the legacy struct
 struct Arguments
 {

From 004660be3db5f42b5ff109f23c4c7833259bfb4a Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 2 Jun 2021 20:33:29 +0200
Subject: [PATCH 0848/2859] Don't unsummon creatures not found within the
 active cells

---
 apps/openmw/mwmechanics/summoning.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/summoning.cpp b/apps/openmw/mwmechanics/summoning.cpp
index 9f65f3d6c9..facadcb1af 100644
--- a/apps/openmw/mwmechanics/summoning.cpp
+++ b/apps/openmw/mwmechanics/summoning.cpp
@@ -152,7 +152,7 @@ namespace MWMechanics
                 continue;
             }
             MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->searchPtrViaActorId(it->second);
-            if (ptr.isEmpty() || (ptr.getClass().getCreatureStats(ptr).isDead() && ptr.getClass().getCreatureStats(ptr).isDeathAnimationFinished()))
+            if (!ptr.isEmpty() && ptr.getClass().getCreatureStats(ptr).isDead() && ptr.getClass().getCreatureStats(ptr).isDeathAnimationFinished())
             {
                 // Purge the magic effect so a new creature can be summoned if desired
                 const ESM::SummonKey& key = it->first;

From 7f4f2c042e6f6947e16db2eab35e600889319497 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Fri, 4 Jun 2021 23:15:50 +0200
Subject: [PATCH 0849/2859] Use sizeof(GLfloat) instead of sizeof(GL_FLOAT)

GL_FLOAT is an enum, with the value 0x1406, while GLFloat is the actual type.
Source: https://www.khronos.org/opengl/wiki/OpenGL_Type
---
 components/sceneutil/lightmanager.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index c4233059ca..2c83c43fef 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -158,7 +158,7 @@ namespace SceneUtil
 
         static constexpr int queryBlockSize(int sz)
         {
-            return 3 * osg::Vec4::num_components * sizeof(GL_FLOAT) * sz;
+            return 3 * osg::Vec4::num_components * sizeof(GLfloat) * sz;
         }
 
         void setCachedSunPos(const osg::Vec4& pos)
@@ -215,9 +215,9 @@ namespace SceneUtil
                 }
 
                 Offsets(int offsetColors, int offsetPosition, int offsetAttenuationRadius, int stride)
-                    : mStride((offsetAttenuationRadius + sizeof(GL_FLOAT) * osg::Vec4::num_components + stride) / 4)
+                    : mStride((offsetAttenuationRadius + sizeof(GLfloat) * osg::Vec4::num_components + stride) / 4)
                 {
-                    constexpr auto sizeofFloat = sizeof(GL_FLOAT);
+                    constexpr auto sizeofFloat = sizeof(GLfloat);
                     const auto diffuseOffset = offsetColors / sizeofFloat;
 
                     mValues[Diffuse] = diffuseOffset;

From bb834fb44e3a9a21947365d50681ec43fd76575c Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Sat, 5 Jun 2021 18:21:03 -0700
Subject: [PATCH 0850/2859] append filename to shader names

---
 components/shader/shadermanager.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/shader/shadermanager.cpp b/components/shader/shadermanager.cpp
index 3a5b464405..1635d13db7 100644
--- a/components/shader/shadermanager.cpp
+++ b/components/shader/shadermanager.cpp
@@ -335,9 +335,10 @@ namespace Shader
 
             osg::ref_ptr<osg::Shader> shader (new osg::Shader(shaderType));
             shader->setShaderSource(shaderSource);
-            // Assign a unique name to allow the SharedStateManager to compare shaders efficiently
+            // Assign a unique prefix to allow the SharedStateManager to compare shaders efficiently.
+            // Append shader source filename for debugging.
             static unsigned int counter = 0;
-            shader->setName(std::to_string(counter++));
+            shader->setName(Misc::StringUtils::format("%u %s", counter++, templateName));
 
             shaderIt = mShaders.insert(std::make_pair(std::make_pair(templateName, defines), shader)).first;
         }

From 89e0bfd1a41cff29fcb75abb2ce90166e1246059 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 6 Jun 2021 12:45:42 +0200
Subject: [PATCH 0851/2859] Purge summon effects on dispose

---
 apps/openmw/mwgui/container.cpp       | 19 +++++++++++++++++++
 apps/openmw/mwmechanics/summoning.cpp | 18 +++++++++++-------
 apps/openmw/mwmechanics/summoning.hpp |  2 ++
 3 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwgui/container.cpp b/apps/openmw/mwgui/container.cpp
index 16b38eaf93..4cdd8b137f 100644
--- a/apps/openmw/mwgui/container.cpp
+++ b/apps/openmw/mwgui/container.cpp
@@ -12,7 +12,9 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/inventorystore.hpp"
 
+#include "../mwmechanics/aipackage.hpp"
 #include "../mwmechanics/creaturestats.hpp"
+#include "../mwmechanics/summoning.hpp"
 
 #include "../mwscript/interpretercontext.hpp"
 
@@ -264,6 +266,23 @@ namespace MWGui
                     for (const auto& creature : creatureMap)
                         MWBase::Environment::get().getMechanicsManager()->cleanupSummonedCreature(ptr, creature.second);
                     creatureMap.clear();
+
+                    // Check if we are a summon and inform our master we've bit the dust
+                    for(const auto& package : creatureStats.getAiSequence())
+                    {
+                        if(package->followTargetThroughDoors() && !package->getTarget().isEmpty())
+                        {
+                            const auto& summoner = package->getTarget();
+                            auto& summons = summoner.getClass().getCreatureStats(summoner).getSummonedCreatureMap();
+                            auto it = std::find_if(summons.begin(), summons.end(), [&] (const auto& entry) { return entry.second == creatureStats.getActorId(); });
+                            if(it != summons.end())
+                            {
+                                MWMechanics::purgeSummonEffect(summoner, *it);
+                                summons.erase(it);
+                                break;
+                            }
+                        }
+                    }
                 }
 
                 MWBase::Environment::get().getWorld()->deleteObject(ptr);
diff --git a/apps/openmw/mwmechanics/summoning.cpp b/apps/openmw/mwmechanics/summoning.cpp
index facadcb1af..d90545fc60 100644
--- a/apps/openmw/mwmechanics/summoning.cpp
+++ b/apps/openmw/mwmechanics/summoning.cpp
@@ -155,13 +155,7 @@ namespace MWMechanics
             if (!ptr.isEmpty() && ptr.getClass().getCreatureStats(ptr).isDead() && ptr.getClass().getCreatureStats(ptr).isDeathAnimationFinished())
             {
                 // Purge the magic effect so a new creature can be summoned if desired
-                const ESM::SummonKey& key = it->first;
-                creatureStats.getActiveSpells().purgeEffect(key.mEffectId, key.mSourceId, key.mEffectIndex);
-                creatureStats.getSpells().purgeEffect(key.mEffectId, key.mSourceId);
-                if (mActor.getClass().hasInventoryStore(mActor))
-                    mActor.getClass().getInventoryStore(mActor).purgeEffect(key.mEffectId, key.mSourceId, false, key.mEffectIndex);
-
-                MWBase::Environment::get().getMechanicsManager()->cleanupSummonedCreature(mActor, it->second);
+                purgeSummonEffect(mActor, *it);
                 creatureMap.erase(it++);
             }
             else
@@ -169,4 +163,14 @@ namespace MWMechanics
         }
     }
 
+    void purgeSummonEffect(const MWWorld::Ptr& summoner, const std::pair<const ESM::SummonKey, int>& summon)
+    {
+        auto& creatureStats = summoner.getClass().getCreatureStats(summoner);
+        creatureStats.getActiveSpells().purgeEffect(summon.first.mEffectId, summon.first.mSourceId, summon.first.mEffectIndex);
+        creatureStats.getSpells().purgeEffect(summon.first.mEffectId, summon.first.mSourceId);
+        if (summoner.getClass().hasInventoryStore(summoner))
+            summoner.getClass().getInventoryStore(summoner).purgeEffect(summon.first.mEffectId, summon.first.mSourceId, false, summon.first.mEffectIndex);
+
+        MWBase::Environment::get().getMechanicsManager()->cleanupSummonedCreature(summoner, summon.second);
+    }
 }
diff --git a/apps/openmw/mwmechanics/summoning.hpp b/apps/openmw/mwmechanics/summoning.hpp
index 7e787499e4..3c3e18a96b 100644
--- a/apps/openmw/mwmechanics/summoning.hpp
+++ b/apps/openmw/mwmechanics/summoning.hpp
@@ -17,6 +17,8 @@ namespace MWMechanics
 
     std::string getSummonedCreature(int effectId);
 
+    void purgeSummonEffect(const MWWorld::Ptr& summoner, const std::pair<const ESM::SummonKey, int>& summon);
+
     struct UpdateSummonedCreatures : public EffectSourceVisitor
     {
         UpdateSummonedCreatures(const MWWorld::Ptr& actor);

From 90fa8dca3535a4312794e951d6e93335f16ec2c1 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 6 Jun 2021 18:10:55 +0200
Subject: [PATCH 0852/2859] Do not assume the bound item cache is valid after
 loading a save

---
 apps/openmw/mwmechanics/actors.cpp | 42 +++++++++++++++++-------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 0ffcef2f8b..218d4b4201 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1239,7 +1239,7 @@ namespace MWMechanics
         // Update bound effects
         // Note: in vanilla MW multiple bound items of the same type can be created by different spells.
         // As these extra copies are kinda useless this may or may not be important.
-        static std::map<int, std::string> boundItemsMap;
+        static std::map<ESM::MagicEffect::Effects, std::string> boundItemsMap;
         if (boundItemsMap.empty())
         {
             boundItemsMap[ESM::MagicEffect::BoundBattleAxe] = "sMagicBoundBattleAxeID";
@@ -1255,30 +1255,36 @@ namespace MWMechanics
             boundItemsMap[ESM::MagicEffect::BoundSpear] = "sMagicBoundSpearID";
         }
 
-        for (std::map<int, std::string>::iterator it = boundItemsMap.begin(); it != boundItemsMap.end(); ++it)
+        if(ptr.getClass().hasInventoryStore(ptr))
         {
-            bool found = creatureStats.mBoundItems.find(it->first) != creatureStats.mBoundItems.end();
-            float magnitude = effects.get(it->first).getMagnitude();
-            if (found != (magnitude > 0))
+            for (const auto& [effect, itemGmst] : boundItemsMap)
             {
-                if (magnitude > 0)
-                    creatureStats.mBoundItems.insert(it->first);
-                else
-                    creatureStats.mBoundItems.erase(it->first);
-
-                std::string itemGmst = it->second;
-                std::string item = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(
-                            itemGmst)->mValue.getString();
+                bool found = creatureStats.mBoundItems.find(effect) != creatureStats.mBoundItems.end();
+                float magnitude = effects.get(effect).getMagnitude();
+                if (found != (magnitude > 0) || creatureStats.mBoundItems.empty())
+                {
+                    if (magnitude > 0)
+                        creatureStats.mBoundItems.insert(effect);
+                    else
+                        creatureStats.mBoundItems.erase(effect);
 
-                magnitude > 0 ? addBoundItem(item, ptr) : removeBoundItem(item, ptr);
+                    std::string item = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(
+                                itemGmst)->mValue.getString();
 
-                if (it->first == ESM::MagicEffect::BoundGloves)
-                {
-                    item = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(
-                                "sMagicBoundRightGauntletID")->mValue.getString();
                     magnitude > 0 ? addBoundItem(item, ptr) : removeBoundItem(item, ptr);
+
+                    if (effect == ESM::MagicEffect::BoundGloves)
+                    {
+                        item = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(
+                                    "sMagicBoundRightGauntletID")->mValue.getString();
+                        magnitude > 0 ? addBoundItem(item, ptr) : removeBoundItem(item, ptr);
+                    }
                 }
             }
+            // mBoundItems does not get saved so the cache is out of date after loading a save.
+            // Use Length as a sentinel value to force an update.
+            if(creatureStats.mBoundItems.empty())
+                creatureStats.mBoundItems.insert(ESM::MagicEffect::Length);
         }
 
         // Summoned creature update visitor assumes the actor belongs to a cell.

From 7d0483d7ad24a72847c11330af2e9cd0ce200b21 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Fri, 11 Jun 2021 05:53:40 +0200
Subject: [PATCH 0853/2859] Cast spell even if target Ptr is empty. It happens
 when enchanted arrows hit water or ground.

---
 apps/openmw/mwmechanics/spellcasting.cpp | 37 ++++++++++++------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index 142914c358..5a367b5020 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -60,10 +60,8 @@ namespace MWMechanics
     void CastSpell::inflict(const MWWorld::Ptr &target, const MWWorld::Ptr &caster,
                             const ESM::EffectList &effects, ESM::RangeType range, bool reflected, bool exploded)
     {
-        if (target.isEmpty())
-            return;
-
-        if (target.getClass().isActor())
+        const bool targetIsActor = !target.isEmpty() && target.getClass().isActor();
+        if (targetIsActor)
         {
             // Early-out for characters that have departed.
             const auto& stats = target.getClass().getCreatureStats(target);
@@ -85,7 +83,7 @@ namespace MWMechanics
             return;
 
         const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search (mId);
-        if (spell && target.getClass().isActor() && (spell->mData.mType == ESM::Spell::ST_Disease || spell->mData.mType == ESM::Spell::ST_Blight))
+        if (spell && targetIsActor && (spell->mData.mType == ESM::Spell::ST_Disease || spell->mData.mType == ESM::Spell::ST_Blight))
         {
             int requiredResistance = (spell->mData.mType == ESM::Spell::ST_Disease) ?
                 ESM::MagicEffect::ResistCommonDisease
@@ -108,13 +106,13 @@ namespace MWMechanics
         // This is required for Weakness effects in a spell to apply to any subsequent effects in the spell.
         // Otherwise, they'd only apply after the whole spell was added.
         MagicEffects targetEffects;
-        if (target.getClass().isActor())
+        if (targetIsActor)
             targetEffects += target.getClass().getCreatureStats(target).getMagicEffects();
 
         bool castByPlayer = (!caster.isEmpty() && caster == getPlayer());
 
         ActiveSpells targetSpells;
-        if (target.getClass().isActor())
+        if (targetIsActor)
             targetSpells = target.getClass().getCreatureStats(target).getActiveSpells();
 
         bool canCastAnEffect = false;    // For bound equipment.If this remains false
@@ -126,7 +124,7 @@ namespace MWMechanics
 
         int currentEffectIndex = 0;
         for (std::vector<ESM::ENAMstruct>::const_iterator effectIt (effects.mList.begin());
-             effectIt != effects.mList.end(); ++effectIt, ++currentEffectIndex)
+             !target.isEmpty() && effectIt != effects.mList.end(); ++effectIt, ++currentEffectIndex)
         {
             if (effectIt->mRange != range)
                 continue;
@@ -270,7 +268,7 @@ namespace MWMechanics
                 }
 
                 // Re-casting a summon effect will remove the creature from previous castings of that effect.
-                if (isSummoningEffect(effectIt->mEffectID) && target.getClass().isActor())
+                if (isSummoningEffect(effectIt->mEffectID) && targetIsActor)
                 {
                     CreatureStats& targetStats = target.getClass().getCreatureStats(target);
                     ESM::SummonKey key(effectIt->mEffectID, mId, currentEffectIndex);
@@ -313,16 +311,19 @@ namespace MWMechanics
         if (!exploded)
             MWBase::Environment::get().getWorld()->explodeSpell(mHitPosition, effects, caster, target, range, mId, mSourceName, mFromProjectile);
 
-        if (!reflectedEffects.mList.empty())
-            inflict(caster, target, reflectedEffects, range, true, exploded);
-
-        if (!appliedLastingEffects.empty())
+        if (!target.isEmpty())
         {
-            int casterActorId = -1;
-            if (!caster.isEmpty() && caster.getClass().isActor())
-                casterActorId = caster.getClass().getCreatureStats(caster).getActorId();
-            target.getClass().getCreatureStats(target).getActiveSpells().addSpell(mId, mStack, appliedLastingEffects,
-                    mSourceName, casterActorId);
+            if (!reflectedEffects.mList.empty())
+                inflict(caster, target, reflectedEffects, range, true, exploded);
+
+            if (!appliedLastingEffects.empty())
+            {
+                int casterActorId = -1;
+                if (!caster.isEmpty() && caster.getClass().isActor())
+                    casterActorId = caster.getClass().getCreatureStats(caster).getActorId();
+                target.getClass().getCreatureStats(target).getActiveSpells().addSpell(mId, mStack, appliedLastingEffects,
+                        mSourceName, casterActorId);
+            }
         }
     }
 

From 49ce26361efac9bb0557e62a184f8b0f9f655dd1 Mon Sep 17 00:00:00 2001
From: Bret Curtis <bret.curtis@gmail.com>
Date: Fri, 11 Jun 2021 16:44:15 +0200
Subject: [PATCH 0854/2859] update mac deps to include latest OSGoS 3.6, mygui
 3.4.1 and multi-threaded bullet

---
 CI/before_install.osx.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index ec19c73215..1936076cc2 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -15,7 +15,7 @@ ccache --version
 cmake --version
 qmake --version
 
-curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-8f5ef6e.zip -o ~/openmw-deps.zip
+curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-20210611.zip -o ~/openmw-deps.zip
 unzip -o ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null
 
 # additional libraries

From 91e1898aa209d87a66a11787035491cc528d8a3a Mon Sep 17 00:00:00 2001
From: Bret Curtis <bret.curtis@gmail.com>
Date: Fri, 11 Jun 2021 20:27:17 +0200
Subject: [PATCH 0855/2859] make use of gitlab openmw-deps

---
 CI/before_install.osx.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index 1936076cc2..a6fdbd8c86 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -15,7 +15,7 @@ ccache --version
 cmake --version
 qmake --version
 
-curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-20210611.zip -o ~/openmw-deps.zip
+curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/macos/openmw-deps-20210611.zip -o ~/openmw-deps.zip
 unzip -o ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null
 
 # additional libraries

From 868a5b35e3912245dd28669dbb96800879664991 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Sat, 12 Jun 2021 00:10:55 +0200
Subject: [PATCH 0856/2859] workaround shadow issue on macOS,
 https://gitlab.com/OpenMW/openmw/-/issues/6057

---
 components/sceneutil/mwshadowtechnique.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
index e9eb9b2b2f..88d44d2f69 100644
--- a/components/sceneutil/mwshadowtechnique.cpp
+++ b/components/sceneutil/mwshadowtechnique.cpp
@@ -566,8 +566,9 @@ MWShadowTechnique::ShadowData::ShadowData(MWShadowTechnique::ViewDependentData*
     _camera = new osg::Camera;
     _camera->setName("ShadowCamera");
     _camera->setReferenceFrame(osg::Camera::ABSOLUTE_RF_INHERIT_VIEWPOINT);
+#ifndef __APPLE__ // workaround shadow issue on macOS, https://gitlab.com/OpenMW/openmw/-/issues/6057
     _camera->setImplicitBufferAttachmentMask(0, 0);
-
+#endif
     //_camera->setClearColor(osg::Vec4(1.0f,1.0f,1.0f,1.0f));
     _camera->setClearColor(osg::Vec4(0.0f,0.0f,0.0f,0.0f));
 

From f92fbc2acd1c8508c8941b173345e6c3c0c6c3a7 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Sat, 12 Jun 2021 00:10:55 +0200
Subject: [PATCH 0857/2859] workaround shadow issue on macOS,
 https://gitlab.com/OpenMW/openmw/-/issues/6057

---
 components/sceneutil/mwshadowtechnique.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
index e9eb9b2b2f..88d44d2f69 100644
--- a/components/sceneutil/mwshadowtechnique.cpp
+++ b/components/sceneutil/mwshadowtechnique.cpp
@@ -566,8 +566,9 @@ MWShadowTechnique::ShadowData::ShadowData(MWShadowTechnique::ViewDependentData*
     _camera = new osg::Camera;
     _camera->setName("ShadowCamera");
     _camera->setReferenceFrame(osg::Camera::ABSOLUTE_RF_INHERIT_VIEWPOINT);
+#ifndef __APPLE__ // workaround shadow issue on macOS, https://gitlab.com/OpenMW/openmw/-/issues/6057
     _camera->setImplicitBufferAttachmentMask(0, 0);
-
+#endif
     //_camera->setClearColor(osg::Vec4(1.0f,1.0f,1.0f,1.0f));
     _camera->setClearColor(osg::Vec4(0.0f,0.0f,0.0f,0.0f));
 

From 7fa67ff675e944e80dde261a62e6b8fccf8ba79e Mon Sep 17 00:00:00 2001
From: CedricMocquillon <cedric.mocquillon@sage.com>
Date: Sat, 12 Jun 2021 15:33:53 +0200
Subject: [PATCH 0858/2859] Use same distance for all lod instances of a chunk

---
 apps/openmw/mwrender/objectpaging.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index b6bae8cbb5..8e29f0af4f 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -477,6 +477,8 @@ namespace MWRender
         constexpr auto copyMask = ~Mask_UpdateVisitor;
 
         AnalyzeVisitor analyzeVisitor(copyMask);
+        osg::Vec3f center3 = { center.x(), center.y(), 0.f };
+        analyzeVisitor.mCurrentDistance = (viewPoint - center3).length2();
         float minSize = mMinSize;
         if (mMinSizeMergeFactor)
             minSize *= mMinSizeMergeFactor;
@@ -546,7 +548,6 @@ namespace MWRender
                 continue;
             }
 
-            analyzeVisitor.mCurrentDistance = dSqr;
             auto emplaced = nodes.emplace(cnode, InstanceList());
             if (emplaced.second)
             {

From fced78b66af59430f198582342a82001a9b6188e Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Sat, 12 Jun 2021 15:35:40 +0200
Subject: [PATCH 0859/2859] bump windows build deps to OSGoS 3.6 and MyGUI
 3.4.1

---
 CI/before_script.msvc.sh | 44 ++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index bb662c9de1..40fd20c92c 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -539,14 +539,14 @@ if [ -z $SKIP_DOWNLOAD ]; then
 		"ffmpeg-4.2.2-dev-win${BITS}.zip"
 
 	# MyGUI
-	download "MyGUI 3.4.0" \
-		"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/MyGUI-3.4.0-msvc${MSVC_REAL_YEAR}-win${BITS}.7z" \
-		"MyGUI-3.4.0-msvc${MSVC_REAL_YEAR}-win${BITS}.7z"
+	download "MyGUI 3.4.1" \
+		"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/MyGUI-3.4.1-msvc${MSVC_REAL_YEAR}-win${BITS}.7z" \
+		"MyGUI-3.4.1-msvc${MSVC_REAL_YEAR}-win${BITS}.7z"
 
 	if [ -n "$PDBS" ]; then
 		download "MyGUI symbols" \
-			"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/MyGUI-3.4.0-msvc${MSVC_REAL_YEAR}-win${BITS}-sym.7z" \
-			"MyGUI-3.4.0-msvc${MSVC_REAL_YEAR}-win${BITS}-sym.7z"
+			"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/MyGUI-3.4.1-msvc${MSVC_REAL_YEAR}-win${BITS}-sym.7z" \
+			"MyGUI-3.4.1-msvc${MSVC_REAL_YEAR}-win${BITS}-sym.7z"
 	fi
 
 	# OpenAL
@@ -554,15 +554,15 @@ if [ -z $SKIP_DOWNLOAD ]; then
 	  "https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/OpenAL-Soft-1.20.1.zip" \
 		"OpenAL-Soft-1.20.1.zip"
 
-	# OSG
-	download "OpenSceneGraph 3.6.5" \
-		"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/OSG-3.6.5-msvc${MSVC_REAL_YEAR}-win${BITS}.7z" \
-		"OSG-3.6.5-msvc${MSVC_REAL_YEAR}-win${BITS}.7z"
+	# OSGoS
+	download "OSGoS 3.6.5" \
+		"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/OSGos-3.6.5-msvc${MSVC_REAL_YEAR}-win${BITS}.7z" \
+		"OSGoS-3.6.5-msvc${MSVC_REAL_YEAR}-win${BITS}.7z"
 
 	if [ -n "$PDBS" ]; then
-		download "OpenSceneGraph symbols" \
-			"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/OSG-3.6.5-msvc${MSVC_REAL_YEAR}-win${BITS}-sym.7z" \
-			"OSG-3.6.5-msvc${MSVC_REAL_YEAR}-win${BITS}-sym.7z"
+		download "OSGoS symbols" \
+			"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/OSGoS-3.6.5-msvc${MSVC_REAL_YEAR}-win${BITS}-sym.7z" \
+			"OSGoS-3.6.5-msvc${MSVC_REAL_YEAR}-win${BITS}-sym.7z"
 	fi
 
 	# SDL2
@@ -710,20 +710,20 @@ printf "FFmpeg 4.2.2... "
 cd $DEPS
 echo
 # MyGUI
-printf "MyGUI 3.4.0... "
+printf "MyGUI 3.4.1... "
 {
 	cd $DEPS_INSTALL
 	if [ -d MyGUI ] && \
 		grep "MYGUI_VERSION_MAJOR 3" MyGUI/include/MYGUI/MyGUI_Prerequest.h > /dev/null && \
 		grep "MYGUI_VERSION_MINOR 4" MyGUI/include/MYGUI/MyGUI_Prerequest.h > /dev/null && \
-		grep "MYGUI_VERSION_PATCH 0" MyGUI/include/MYGUI/MyGUI_Prerequest.h > /dev/null
+		grep "MYGUI_VERSION_PATCH 1" MyGUI/include/MYGUI/MyGUI_Prerequest.h > /dev/null
 	then
 		printf "Exists. "
 	elif [ -z $SKIP_EXTRACT ]; then
 		rm -rf MyGUI
-		eval 7z x -y "${DEPS}/MyGUI-3.4.0-msvc${MSVC_REAL_YEAR}-win${BITS}.7z" $STRIP
-		[ -n "$PDBS" ] && eval 7z x -y "${DEPS}/MyGUI-3.4.0-msvc${MSVC_REAL_YEAR}-win${BITS}-sym.7z" $STRIP
-		mv "MyGUI-3.4.0-msvc${MSVC_REAL_YEAR}-win${BITS}" MyGUI
+		eval 7z x -y "${DEPS}/MyGUI-3.4.1-msvc${MSVC_REAL_YEAR}-win${BITS}.7z" $STRIP
+		[ -n "$PDBS" ] && eval 7z x -y "${DEPS}/MyGUI-3.4.1-msvc${MSVC_REAL_YEAR}-win${BITS}-sym.7z" $STRIP
+		mv "MyGUI-3.4.1-msvc${MSVC_REAL_YEAR}-win${BITS}" MyGUI
 	fi
 	export MYGUI_HOME="$(real_pwd)/MyGUI"
 	for CONFIGURATION in ${CONFIGURATIONS[@]}; do
@@ -759,8 +759,8 @@ printf "OpenAL-Soft 1.20.1... "
 }
 cd $DEPS
 echo
-# OSG
-printf "OSG 3.6.5... "
+# OSGoS
+printf "OSGoS 3.6.5... "
 {
 	cd $DEPS_INSTALL
 	if [ -d OSG ] && \
@@ -771,9 +771,9 @@ printf "OSG 3.6.5... "
 		printf "Exists. "
 	elif [ -z $SKIP_EXTRACT ]; then
 		rm -rf OSG
-		eval 7z x -y "${DEPS}/OSG-3.6.5-msvc${MSVC_REAL_YEAR}-win${BITS}.7z" $STRIP
-		[ -n "$PDBS" ] && eval 7z x -y "${DEPS}/OSG-3.6.5-msvc${MSVC_REAL_YEAR}-win${BITS}-sym.7z" $STRIP
-		mv "OSG-3.6.5-msvc${MSVC_REAL_YEAR}-win${BITS}" OSG
+		eval 7z x -y "${DEPS}/OSGoS-3.6.5-msvc${MSVC_REAL_YEAR}-win${BITS}.7z" $STRIP
+		[ -n "$PDBS" ] && eval 7z x -y "${DEPS}/OSGoS-3.6.5-msvc${MSVC_REAL_YEAR}-win${BITS}-sym.7z" $STRIP
+		mv "OSGoS-3.6.5-msvc${MSVC_REAL_YEAR}-win${BITS}" OSG
 	fi
 	OSG_SDK="$(real_pwd)/OSG"
 	add_cmake_opts -DOSG_DIR="$OSG_SDK"

From 4ffc30f502ea8611163f1bc5e74824b2150b9527 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Sat, 12 Jun 2021 16:06:22 +0200
Subject: [PATCH 0860/2859] add OSGoS hash

---
 CI/before_script.msvc.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 40fd20c92c..2a4924a5f5 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -556,13 +556,13 @@ if [ -z $SKIP_DOWNLOAD ]; then
 
 	# OSGoS
 	download "OSGoS 3.6.5" \
-		"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/OSGos-3.6.5-msvc${MSVC_REAL_YEAR}-win${BITS}.7z" \
-		"OSGoS-3.6.5-msvc${MSVC_REAL_YEAR}-win${BITS}.7z"
+		"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/OSGoS-3.6.5-b02abe2-msvc${MSVC_REAL_YEAR}-win${BITS}.7z" \
+		"OSGoS-3.6.5-b02abe2-msvc${MSVC_REAL_YEAR}-win${BITS}.7z"
 
 	if [ -n "$PDBS" ]; then
 		download "OSGoS symbols" \
-			"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/OSGoS-3.6.5-msvc${MSVC_REAL_YEAR}-win${BITS}-sym.7z" \
-			"OSGoS-3.6.5-msvc${MSVC_REAL_YEAR}-win${BITS}-sym.7z"
+			"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/OSGoS-3.6.5-b02abe2-msvc${MSVC_REAL_YEAR}-win${BITS}-sym.7z" \
+			"OSGoS-3.6.5-b02abe2-msvc${MSVC_REAL_YEAR}-win${BITS}-sym.7z"
 	fi
 
 	# SDL2
@@ -771,9 +771,9 @@ printf "OSGoS 3.6.5... "
 		printf "Exists. "
 	elif [ -z $SKIP_EXTRACT ]; then
 		rm -rf OSG
-		eval 7z x -y "${DEPS}/OSGoS-3.6.5-msvc${MSVC_REAL_YEAR}-win${BITS}.7z" $STRIP
-		[ -n "$PDBS" ] && eval 7z x -y "${DEPS}/OSGoS-3.6.5-msvc${MSVC_REAL_YEAR}-win${BITS}-sym.7z" $STRIP
-		mv "OSGoS-3.6.5-msvc${MSVC_REAL_YEAR}-win${BITS}" OSG
+		eval 7z x -y "${DEPS}/OSGoS-3.6.5-b02abe2-msvc${MSVC_REAL_YEAR}-win${BITS}.7z" $STRIP
+		[ -n "$PDBS" ] && eval 7z x -y "${DEPS}/OSGoS-3.6.5-b02abe2-msvc${MSVC_REAL_YEAR}-win${BITS}-sym.7z" $STRIP
+		mv "OSGoS-3.6.5-b02abe2-msvc${MSVC_REAL_YEAR}-win${BITS}" OSG
 	fi
 	OSG_SDK="$(real_pwd)/OSG"
 	add_cmake_opts -DOSG_DIR="$OSG_SDK"

From 7d756d997e94a86f10442e35eae8e88d9bff34ed Mon Sep 17 00:00:00 2001
From: unknown <malusluminis@hotmail.com>
Date: Sat, 12 Jun 2021 18:18:52 +0200
Subject: [PATCH 0861/2859] Rebuild the cache in readState

---
 apps/openmw/mwmechanics/actors.cpp        |  6 +-----
 apps/openmw/mwmechanics/creaturestats.cpp | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 218d4b4201..87f462d6ff 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1261,7 +1261,7 @@ namespace MWMechanics
             {
                 bool found = creatureStats.mBoundItems.find(effect) != creatureStats.mBoundItems.end();
                 float magnitude = effects.get(effect).getMagnitude();
-                if (found != (magnitude > 0) || creatureStats.mBoundItems.empty())
+                if (found != (magnitude > 0))
                 {
                     if (magnitude > 0)
                         creatureStats.mBoundItems.insert(effect);
@@ -1281,10 +1281,6 @@ namespace MWMechanics
                     }
                 }
             }
-            // mBoundItems does not get saved so the cache is out of date after loading a save.
-            // Use Length as a sentinel value to force an update.
-            if(creatureStats.mBoundItems.empty())
-                creatureStats.mBoundItems.insert(ESM::MagicEffect::Length);
         }
 
         // Summoned creature update visitor assumes the actor belongs to a cell.
diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index 4bc0b9a581..c6561af961 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -601,6 +601,28 @@ namespace MWMechanics
         mAiSequence.readState(state.mAiSequence);
         mMagicEffects.readState(state.mMagicEffects);
 
+        // Rebuild the bound item cache
+        for(int effectId = ESM::MagicEffect::BoundDagger; effectId <= ESM::MagicEffect::BoundGloves; effectId++)
+        {
+            if(mMagicEffects.get(effectId).getMagnitude() > 0)
+                mBoundItems.insert(effectId);
+            else
+            {
+                // Check active spell effects
+                // We can't use mActiveSpells::getMagicEffects here because it doesn't include expired effects
+                auto spell = std::find_if(mActiveSpells.begin(), mActiveSpells.end(), [&] (const auto& spell)
+                {
+                    const auto& effects = spell.second.mEffects;
+                    return std::find_if(effects.begin(), effects.end(), [&] (const auto& effect)
+                    {
+                        return effect.mEffectId == effectId;
+                    }) != effects.end();
+                });
+                if(spell != mActiveSpells.end())
+                    mBoundItems.insert(effectId);
+            }
+        }
+
         mSummonedCreatures = state.mSummonedCreatureMap;
         mSummonGraveyard = state.mSummonGraveyard;
 

From 22153cca7b2cab8f2e886cc75ad0e88d218380d4 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Thu, 10 Jun 2021 12:55:18 +0200
Subject: [PATCH 0862/2859] Reduce a bit the code bloat in hot paths/small
 functions

There is no need to bloat hot/small functions with
a ton of function calls and involving locales
for simple error messages.
---
 apps/openmw/mwworld/esmstore.cpp  |  4 +--
 components/esm/esmreader.cpp      |  7 ++---
 components/esm/esmreader.hpp      |  6 ++---
 components/files/lowlevelfile.cpp | 44 ++++++++-----------------------
 4 files changed, 17 insertions(+), 44 deletions(-)

diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index b1885edafc..864cb0d9d1 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -199,9 +199,7 @@ void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener)
                 esm.skipRecord();
             }
             else {
-                std::stringstream error;
-                error << "Unknown record: " << n.toString();
-                throw std::runtime_error(error.str());
+                throw std::runtime_error("Unknown record: " + n.toString());
             }
         } else {
             RecordId id = it->second->load(esm);
diff --git a/components/esm/esmreader.cpp b/components/esm/esmreader.cpp
index b779d7f7fd..d1bca5eb11 100644
--- a/components/esm/esmreader.cpp
+++ b/components/esm/esmreader.cpp
@@ -135,11 +135,8 @@ void ESMReader::getHExact(void*p, int size)
 {
     getSubHeader();
     if (size != static_cast<int> (mCtx.leftSub))
-    {
-        std::stringstream error;
-        error << "getHExact(): size mismatch (requested " << size << ", got " << mCtx.leftSub << ")";
-        fail(error.str());
-    }
+        fail("Size mismatch, requested " + std::to_string(size) + " but got "
+                + std::to_string(mCtx.leftSub));
     getExact(p, size);
 }
 
diff --git a/components/esm/esmreader.hpp b/components/esm/esmreader.hpp
index 503bb637d7..4214253cc7 100644
--- a/components/esm/esmreader.hpp
+++ b/components/esm/esmreader.hpp
@@ -135,9 +135,9 @@ public:
       getSubHeader();
       if (mCtx.leftSub != sizeof(X))
       {
-          std::stringstream error;
-          error << "getHT(): subrecord size mismatch (requested " << sizeof(X) << ", got " << mCtx.leftSub << ")";
-          fail(error.str());
+          fail("getHT(): subrecord size mismatch,requested "
+                  + std::to_string(sizeof(X)) + ", got"
+                      + std::to_string(mCtx.leftSub));
       }
       getT(x);
   }
diff --git a/components/files/lowlevelfile.cpp b/components/files/lowlevelfile.cpp
index d89ae58383..9192630236 100644
--- a/components/files/lowlevelfile.cpp
+++ b/components/files/lowlevelfile.cpp
@@ -65,31 +65,23 @@ size_t LowLevelFile::size ()
     long oldPosition = ftell (mHandle);
     if (oldPosition == -1)
     {
-        std::ostringstream os;
-        os << "An ftell() call failed: " << strerror(errno);
-        throw std::runtime_error (os.str ());
+        throw std::runtime_error ("An ftell() call failed: " + std::string(strerror(errno)));
     }
 
     if (fseek (mHandle, 0, SEEK_END) != 0)
     {
-        std::ostringstream os;
-        os << "An fseek() call failed: " << strerror(errno);
-        throw std::runtime_error (os.str ());
+        throw std::runtime_error ("An fseek() call failed: " + std::string(strerror(errno)));
     }
 
     long size = ftell (mHandle);
     if (size == -1)
     {
-        std::ostringstream os;
-        os << "An ftell() call failed: " << strerror(errno);
-        throw std::runtime_error (os.str ());
+        throw std::runtime_error ("An ftell() call failed: " + std::string(strerror(errno)));
     }
 
     if (fseek (mHandle, oldPosition, SEEK_SET) != 0)
     {
-        std::ostringstream os;
-        os << "An fseek() call failed: " << strerror(errno);
-        throw std::runtime_error (os.str ());
+        throw std::runtime_error ("An fseek() call failed: " + std::string(strerror(errno)));
     }
 
     return size_t (size);
@@ -101,9 +93,7 @@ void LowLevelFile::seek (size_t position)
 
     if (fseek (mHandle, position, SEEK_SET) != 0)
     {
-        std::ostringstream os;
-        os << "An fseek() call failed: " << strerror(errno);
-        throw std::runtime_error (os.str ());
+        throw std::runtime_error ("An fseek() call failed: " + std::string(strerror(errno)));
     }
 }
 
@@ -114,9 +104,7 @@ size_t LowLevelFile::tell ()
     long position = ftell (mHandle);
     if (position == -1)
     {
-        std::ostringstream os;
-        os << "An ftell() call failed: " << strerror(errno);
-        throw std::runtime_error (os.str ());
+        throw std::runtime_error ("An ftell() call failed: " + std::string(strerror(errno)));
     }
 
     return size_t (position);
@@ -193,25 +181,19 @@ size_t LowLevelFile::size ()
 
     if (oldPosition == size_t (-1))
     {
-        std::ostringstream os;
-        os << "An lseek() call failed: " << strerror(errno);
-        throw std::runtime_error (os.str ());
+        throw std::runtime_error ("An lseek() call failed: " + std::string(strerror(errno)));
     }
 
     size_t size = ::lseek (mHandle, 0, SEEK_END);
 
     if (size == size_t (-1))
     {
-        std::ostringstream os;
-        os << "An lseek() call failed: " << strerror(errno);
-        throw std::runtime_error (os.str ());
+        throw std::runtime_error ("An lseek() call failed: " + std::string(strerror(errno)));
     }
 
     if (lseek (mHandle, oldPosition, SEEK_SET) == -1)
     {
-        std::ostringstream os;
-        os << "An lseek() call failed: " << strerror(errno);
-        throw std::runtime_error (os.str ());
+        throw std::runtime_error ("An lseek() call failed: " + std::string(strerror(errno)));
     }
 
     return size;
@@ -223,9 +205,7 @@ void LowLevelFile::seek (size_t position)
 
     if (::lseek (mHandle, position, SEEK_SET) == -1)
     {
-        std::ostringstream os;
-        os << "An lseek() call failed: " << strerror(errno);
-        throw std::runtime_error (os.str ());
+        throw std::runtime_error ("An lseek() call failed: " + std::string(strerror(errno)));
     }
 }
 
@@ -237,9 +217,7 @@ size_t LowLevelFile::tell ()
 
     if (position == size_t (-1))
     {
-        std::ostringstream os;
-        os << "An lseek() call failed: " << strerror(errno);
-        throw std::runtime_error (os.str ());
+        throw std::runtime_error("An lseek() call failed: " + std::string(strerror(errno)));
     }
 
     return position;

From dd197765c8349c5ba6cfafd24cc0196473bc5ab1 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Wed, 16 Jun 2021 08:28:48 +0000
Subject: [PATCH 0863/2859] cmake check to enforce that if someone uses OSG
 3.6, that it is at least 3.6.5

---
 CMakeLists.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e1f0a01ca..ee7e29bd7a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -355,7 +355,11 @@ if(NOT HAVE_STDINT_H)
 endif()
 
 if(OPENMW_USE_SYSTEM_OSG)
-    find_package(OpenSceneGraph 3.3.4 REQUIRED ${USED_OSG_COMPONENTS})
+    find_package(OpenSceneGraph 3.4.0 REQUIRED ${USED_OSG_COMPONENTS})
+    if (${OPENSCENEGRAPH_VERSION} VERSION_GREATER 3.6.2 AND ${OPENSCENEGRAPH_VERSION} VERSION_LESS 3.6.5)
+        message(FATAL_ERROR "OpenSceneGraph version ${OPENSCENEGRAPH_VERSION} has critical regressions which cause crashes. Please upgrade to 3.6.5 or later. We strongly recommend using the tip of the official 'OpenSceneGraph-3.6' branch or the tip of '3.6' OpenMW/osg (OSGoS).")
+    endif()
+
     if(OSG_STATIC)
         find_package(OSGPlugins REQUIRED COMPONENTS ${USED_OSG_PLUGINS})
     endif()

From 7be09078b4342dffd4bba47f3ef9cad413eafba3 Mon Sep 17 00:00:00 2001
From: Bret Curtis <bret.curtis@gmail.com>
Date: Thu, 17 Jun 2021 01:12:31 +0200
Subject: [PATCH 0864/2859] bump mac deps to include collada

---
 CI/before_install.osx.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index a6fdbd8c86..1ca0fc6119 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -15,7 +15,7 @@ ccache --version
 cmake --version
 qmake --version
 
-curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/macos/openmw-deps-20210611.zip -o ~/openmw-deps.zip
+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

From 36bb966ca171e401551172220ecc6f178f860a2b Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 18 Jun 2021 23:16:03 +0200
Subject: [PATCH 0865/2859] Getting the ball rolling for 0.48

---
 CHANGELOG.md   |  5 +++++
 CMakeLists.txt |  2 +-
 README.md      | 20 ++++++++++----------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e11d05d3d4..76191effd4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+0.48.0
+------
+
+    
+
 0.47.0
 ------
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee7e29bd7a..7a07cee69f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,7 +65,7 @@ endif()
 message(STATUS "Configuring OpenMW...")
 
 set(OPENMW_VERSION_MAJOR 0)
-set(OPENMW_VERSION_MINOR 47)
+set(OPENMW_VERSION_MINOR 48)
 set(OPENMW_VERSION_RELEASE 0)
 
 set(OPENMW_VERSION_COMMITHASH "")
diff --git a/README.md b/README.md
index 54fd59f004..638801b129 100644
--- a/README.md
+++ b/README.md
@@ -1,35 +1,35 @@
 OpenMW
 ======
 
-[![Build Status](https://api.travis-ci.org/OpenMW/openmw.svg)](https://travis-ci.org/OpenMW/openmw) [![Build status](https://ci.appveyor.com/api/projects/status/github/openmw/openmw?svg=true)](https://ci.appveyor.com/project/psi29a/openmw)  [![Coverity Scan Build Status](https://scan.coverity.com/projects/3740/badge.svg)](https://scan.coverity.com/projects/3740) [![pipeline status](https://gitlab.com/OpenMW/openmw/badges/master/pipeline.svg)](https://gitlab.com/OpenMW/openmw/commits/master)
+[![Coverity Scan Build Status](https://scan.coverity.com/projects/3740/badge.svg)](https://scan.coverity.com/projects/3740) [![pipeline status](https://gitlab.com/OpenMW/openmw/badges/master/pipeline.svg)](https://gitlab.com/OpenMW/openmw/commits/master)
 
 OpenMW is an open-source game engine that supports playing Morrowind by Bethesda Softworks. You need to own the game for OpenMW to play Morrowind.
 
 OpenMW also comes with OpenMW-CS, a replacement for Bethesda's Construction Set.
 
-* Version: 0.47.0
-* License: GPLv3 (see [LICENSE](https://github.com/OpenMW/openmw/blob/master/LICENSE) for more information)
+* Version: 0.48.0
+* License: GPLv3 (see [LICENSE](https://gitlab.com/OpenMW/openmw/-/raw/master/LICENSE) for more information)
 * Website: https://www.openmw.org
 * IRC: #openmw on irc.libera.chat
 
 Font Licenses:
-* DejaVuLGCSansMono.ttf: custom (see [files/mygui/DejaVuFontLicense.txt](https://github.com/OpenMW/openmw/blob/master/files/mygui/DejaVuFontLicense.txt) for more information)
+* DejaVuLGCSansMono.ttf: custom (see [files/mygui/DejaVuFontLicense.txt](https://gitlab.com/OpenMW/openmw/-/raw/master/files/mygui/DejaVuFontLicense.txt) for more information)
 
 Current Status
 --------------
 
-The main quests in Morrowind, Tribunal and Bloodmoon are all completable. Some issues with side quests are to be expected (but rare). Check the [bug tracker](https://gitlab.com/OpenMW/openmw/issues?label_name%5B%5D=1.0) for a list of issues we need to resolve before the "1.0" release. Even before the "1.0" release however, OpenMW boasts some new [features](https://wiki.openmw.org/index.php?title=Features), such as improved graphics and user interfaces. 
+The main quests in Morrowind, Tribunal and Bloodmoon are all completable. Some issues with side quests are to be expected (but rare). Check the [bug tracker](https://gitlab.com/OpenMW/openmw/issues?label_name%5B%5D=1.0) for a list of issues we need to resolve before the "1.0" release. Even before the "1.0" release however, OpenMW boasts some new [features](https://gitlab.com/OpenMW/openmw/-/wikis/features), such as improved graphics and user interfaces.
 
-Pre-existing modifications created for the original Morrowind engine can be hit-and-miss. The OpenMW script compiler performs more thorough error-checking than Morrowind does, meaning that a mod created for Morrowind may not necessarily run in OpenMW. Some mods also rely on quirky behaviour or engine bugs in order to work. We are considering such compatibility issues on a case-by-case basis - in some cases adding a workaround to OpenMW may be feasible, in other cases fixing the mod will be the only option. If you know of any mods that work or don't work, feel free to add them to the [Mod status](https://wiki.openmw.org/index.php?title=Mod_status) wiki page.
+Pre-existing modifications created for the original Morrowind engine can be hit-and-miss. The OpenMW script compiler performs more thorough error-checking than Morrowind does, meaning that a mod created for Morrowind may not necessarily run in OpenMW. Some mods also rely on quirky behaviour or engine bugs in order to work. We are considering such compatibility issues on a case-by-case basis - in some cases adding a workaround to OpenMW may be feasible, in other cases fixing the mod will be the only option. If you know of any mods that work or don't work, feel free to add them to the [Mod status](https://old-wiki.openmw.org/index.php?title=Mod_status) wiki page.
 
 Getting Started
 ---------------
 
 * [Official forums](https://forum.openmw.org/)
-* [Installation instructions](https://wiki.openmw.org/index.php?title=Installation_Instructions)
-* [Build from source](https://wiki.openmw.org/index.php?title=Development_Environment_Setup)
-* [Testing the game](https://wiki.openmw.org/index.php?title=Testing)
-* [How to contribute](https://wiki.openmw.org/index.php?title=Contribution_Wanted)
+* [Installation instructions](https://openmw.readthedocs.io/en/latest/manuals/installation/index.html)
+* [Build from source](https://gitlab.com/OpenMW/openmw/-/wikis/development/development_environment_setup)
+* [Testing the game](https://old-wiki.openmw.org/index.php?title=Testing)
+* [How to contribute](https://old-wiki.openmw.org/index.php?title=Contribution_Wanted)
 * [Report a bug](https://gitlab.com/OpenMW/openmw/issues) - read the [guidelines](https://wiki.openmw.org/index.php?title=Bug_Reporting_Guidelines) before submitting your first bug!
 * [Known issues](https://gitlab.com/OpenMW/openmw/issues?label_name%5B%5D=Bug)
 

From c1177d7ffe7f916cc5f65b35219d4bfab14aeb55 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 19 Jun 2021 11:21:37 +0200
Subject: [PATCH 0866/2859] Allow unquoted string arguments to start with . and
 -

---
 CHANGELOG.md                       |  2 +-
 components/compiler/exprparser.cpp |  1 +
 components/compiler/scanner.cpp    | 32 +++++++++++++++++++++++-------
 components/compiler/scanner.hpp    |  6 ++++++
 4 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76191effd4..110eaf21d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 0.48.0
 ------
 
-    
+    Bug #3846: Strings starting with "-" fail to compile if not enclosed in quotes
 
 0.47.0
 ------
diff --git a/components/compiler/exprparser.cpp b/components/compiler/exprparser.cpp
index 0afe3de6d0..fb7ca7aac4 100644
--- a/components/compiler/exprparser.cpp
+++ b/components/compiler/exprparser.cpp
@@ -669,6 +669,7 @@ namespace Compiler
 
                 if (argument=='c') stringParser.smashCase();
                 if (argument=='x') stringParser.discard();
+                scanner.enableExpectName();
                 scanner.scan (stringParser);
 
                 if ((optional || argument=='x') && stringParser.isEmpty())
diff --git a/components/compiler/scanner.cpp b/components/compiler/scanner.cpp
index 573c8cc93a..829df35be5 100644
--- a/components/compiler/scanner.cpp
+++ b/components/compiler/scanner.cpp
@@ -22,6 +22,7 @@ namespace Compiler
         {
             mStrictKeywords = false;
             mTolerantNames = false;
+            mExpectName = false;
             mLoc.mColumn = 0;
             ++mLoc.mLine;
             mLoc.mLiteral.clear();
@@ -416,12 +417,13 @@ namespace Compiler
             special = S_close;
         else if (c=='.')
         {
+            MultiChar next;
             // check, if this starts a float literal
-            if (get (c))
+            if (get (next))
             {
-                putback (c);
+                putback (next);
 
-                if (c.isDigit())
+                if (next.isDigit())
                     return scanFloat ("", parser, cont);
             }
 
@@ -476,13 +478,14 @@ namespace Compiler
         }
         else if (c.isMinusSign())
         {
-            if (get (c))
+            MultiChar next;
+            if (get (next))
             {
-                if (c=='>')
+                if (next=='>')
                     special = S_ref;
                 else
                 {
-                    putback (c);
+                    putback (next);
                     special = S_minus;
                 }
             }
@@ -558,6 +561,15 @@ namespace Compiler
 
         if (special==S_newline)
             mLoc.mLiteral = "<newline>";
+        else if (mExpectName && (special == S_member || special == S_minus))
+        {
+            mExpectName = false;
+            bool tolerant = mTolerantNames;
+            mTolerantNames = true;
+            bool out = scanName(c, parser, cont);
+            mTolerantNames = tolerant;
+            return out;
+        }
 
         TokenLoc loc (mLoc);
         mLoc.mLiteral.clear();
@@ -590,13 +602,14 @@ namespace Compiler
         const Extensions *extensions)
     : mErrorHandler (errorHandler), mStream (inputStream), mExtensions (extensions),
       mPutback (Putback_None), mPutbackCode(0), mPutbackInteger(0), mPutbackFloat(0),
-      mStrictKeywords (false), mTolerantNames (false), mIgnoreNewline(false)
+      mStrictKeywords (false), mTolerantNames (false), mIgnoreNewline(false), mExpectName(false)
     {
     }
 
     void Scanner::scan (Parser& parser)
     {
         while (scanToken (parser));
+        mExpectName = false;
     }
 
     void Scanner::putbackSpecial (int code, const TokenLoc& loc)
@@ -657,4 +670,9 @@ namespace Compiler
     {
         mTolerantNames = true;
     }
+
+    void Scanner::enableExpectName()
+    {
+        mExpectName = true;
+    }
 }
diff --git a/components/compiler/scanner.hpp b/components/compiler/scanner.hpp
index fd7de5b6b6..15781f9240 100644
--- a/components/compiler/scanner.hpp
+++ b/components/compiler/scanner.hpp
@@ -193,6 +193,7 @@ namespace Compiler
             bool mStrictKeywords;
             bool mTolerantNames;
             bool mIgnoreNewline;
+            bool mExpectName;
 
         public:
 
@@ -286,6 +287,11 @@ namespace Compiler
             ///
             /// \attention This mode lasts only until the next newline is reached.
             void enableTolerantNames();
+
+            /// Treat '.' and '-' as the start of a name.
+            ///
+            /// \attention This mode lasts only until the next newline is reached or the call to scan ends.
+            void enableExpectName();
     };
 }
 

From 56e6305345a689bd2a37e883967f68845b84b492 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 19 Jun 2021 14:06:46 +0200
Subject: [PATCH 0867/2859] Revert "Merge branch 'fix_new_game_guard' into
 'master'"

This reverts commit a487295d39544455d754d107675792cf2074c613.
---
 apps/openmw/mwmechanics/actors.cpp    | 24 ++++--------------------
 apps/openmw/mwmechanics/actors.hpp    |  2 +-
 apps/openmw/mwmechanics/aipackage.cpp | 26 ++++----------------------
 apps/openmw/mwmechanics/aipackage.hpp |  5 -----
 4 files changed, 9 insertions(+), 48 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 87f462d6ff..dae5654fb6 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1,7 +1,5 @@
 #include "actors.hpp"
 
-#include <optional>
-
 #include <components/esm/esmreader.hpp>
 #include <components/esm/esmwriter.hpp>
 
@@ -175,15 +173,6 @@ namespace MWMechanics
     static const int GREETING_COOLDOWN = 40;    // how many updates should pass before NPC can continue movement
     static const float DECELERATE_DISTANCE = 512.f;
 
-    namespace
-    {
-        float getTimeToDestination(const AiPackage& package, const osg::Vec3f& position, float speed, float duration, const osg::Vec3f& halfExtents)
-        {
-            const auto distanceToNextPathPoint = (package.getNextPathPoint(package.getDestination()) - position).length();
-            return (distanceToNextPathPoint - package.getNextPathPointTolerance(speed, duration, halfExtents)) / speed;
-        }
-    }
-
     class GetStuntedMagickaDuration : public MWMechanics::EffectSourceVisitor
     {
     public:
@@ -1777,7 +1766,7 @@ namespace MWMechanics
 
     }
 
-    void Actors::predictAndAvoidCollisions(float duration)
+    void Actors::predictAndAvoidCollisions()
     {
         if (!MWBase::Environment::get().getMechanicsManager()->isAIActive())
             return;
@@ -1812,8 +1801,7 @@ namespace MWMechanics
             bool shouldAvoidCollision = isMoving;
             bool shouldTurnToApproachingActor = !isMoving;
             MWWorld::Ptr currentTarget; // Combat or pursue target (NPCs should not avoid collision with their targets).
-            const auto& aiSequence = ptr.getClass().getCreatureStats(ptr).getAiSequence();
-            for (const auto& package : aiSequence)
+            for (const auto& package : ptr.getClass().getCreatureStats(ptr).getAiSequence())
             {
                 if (package->getTypeId() == AiPackageTypeId::Follow)
                     shouldAvoidCollision = true;
@@ -1843,10 +1831,6 @@ namespace MWMechanics
             osg::Vec2f movementCorrection(0, 0);
             float angleToApproachingActor = 0;
 
-            const float timeToDestination = aiSequence.isEmpty()
-                    ? std::numeric_limits<float>::max()
-                    : getTimeToDestination(**aiSequence.begin(), basePos, maxSpeed, duration, halfExtents);
-
             // Iterate through all other actors and predict collisions.
             for(PtrActorMap::iterator otherIter(mActors.begin()); otherIter != mActors.end(); ++otherIter)
             {
@@ -1883,7 +1867,7 @@ namespace MWMechanics
                     continue; // No solution; distance is always >= collisionDist.
                 float t = (-vr - std::sqrt(Dh)) / v2;
 
-                if (t < 0 || t > timeToCollision || t > timeToDestination)
+                if (t < 0 || t > timeToCollision)
                     continue;
 
                 // Check visibility and awareness last as it's expensive.
@@ -2093,7 +2077,7 @@ namespace MWMechanics
 
             static const bool avoidCollisions = Settings::Manager::getBool("NPCs avoid collisions", "Game");
             if (avoidCollisions)
-                predictAndAvoidCollisions(duration);
+                predictAndAvoidCollisions();
 
             timerUpdateHeadTrack += duration;
             timerUpdateEquippedLight += duration;
diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index 0ae9687578..2de0728d58 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -63,7 +63,7 @@ namespace MWMechanics
 
             void purgeSpellEffects (int casterActorId);
 
-            void predictAndAvoidCollisions(float duration);
+            void predictAndAvoidCollisions();
 
         public:
 
diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index 0701f42cf3..a7e8e74b0d 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -28,12 +28,6 @@ namespace
     {
         return divisor == 0 ? std::numeric_limits<float>::max() * std::numeric_limits<float>::epsilon() : dividend / divisor;
     }
-
-    float getPointTolerance(float speed, float duration, const osg::Vec3f& halfExtents)
-    {
-        const float actorTolerance = 2 * speed * duration + 1.2 * std::max(halfExtents.x(), halfExtents.y());
-        return std::max(MWMechanics::MIN_TOLERANCE, actorTolerance);
-    }
 }
 
 MWMechanics::AiPackage::AiPackage(AiPackageTypeId typeId, const Options& options) :
@@ -104,8 +98,6 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
         return false;
     }
 
-    mLastDestinationTolerance = destTolerance;
-
     const float distToTarget = distance(position, dest);
     const bool isDestReached = (distToTarget <= destTolerance);
     const bool actorCanMoveByZ = canActorMoveByZAxis(actor);
@@ -156,7 +148,9 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
         }
     }
 
-    const float pointTolerance = getPointTolerance(actor.getClass().getMaxSpeed(actor), duration, halfExtents);
+    const float actorTolerance = 2 * actor.getClass().getMaxSpeed(actor) * duration
+            + 1.2 * std::max(halfExtents.x(), halfExtents.y());
+    const float pointTolerance = std::max(MIN_TOLERANCE, actorTolerance);
 
     static const bool smoothMovement = Settings::Manager::getBool("smooth movement", "Game");
     mPathFinder.update(position, pointTolerance, DEFAULT_TOLERANCE,
@@ -187,7 +181,7 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
     zTurn(actor, zAngleToNext);
     smoothTurn(actor, mPathFinder.getXAngleToNext(position.x(), position.y(), position.z()), 0);
 
-    const auto destination = getNextPathPoint(dest);
+    const auto destination = mPathFinder.getPath().empty() ? dest : mPathFinder.getPath().front();
     mObstacleCheck.update(actor, destination, duration);
 
     if (smoothMovement)
@@ -467,15 +461,3 @@ DetourNavigator::AreaCosts MWMechanics::AiPackage::getAreaCosts(const MWWorld::P
 
     return costs;
 }
-
-osg::Vec3f MWMechanics::AiPackage::getNextPathPoint(const osg::Vec3f& destination) const
-{
-    return mPathFinder.getPath().empty() ? destination : mPathFinder.getPath().front();
-}
-
-float MWMechanics::AiPackage::getNextPathPointTolerance(float speed, float duration, const osg::Vec3f& halfExtents) const
-{
-    if (mPathFinder.getPathSize() <= 1)
-        return mLastDestinationTolerance;
-    return getPointTolerance(speed, duration, halfExtents);
-}
diff --git a/apps/openmw/mwmechanics/aipackage.hpp b/apps/openmw/mwmechanics/aipackage.hpp
index 6d8af0d92b..5ad73c2da6 100644
--- a/apps/openmw/mwmechanics/aipackage.hpp
+++ b/apps/openmw/mwmechanics/aipackage.hpp
@@ -122,10 +122,6 @@ namespace MWMechanics
             /// Return if actor's rotation speed is sufficient to rotate to the destination pathpoint on the run. Otherwise actor should rotate while standing.
             static bool isReachableRotatingOnTheRun(const MWWorld::Ptr& actor, const osg::Vec3f& dest);
 
-            osg::Vec3f getNextPathPoint(const osg::Vec3f& destination) const;
-
-            float getNextPathPointTolerance(float speed, float duration, const osg::Vec3f& halfExtents) const;
-
         protected:
             /// Handles path building and shortcutting with obstacles avoiding
             /** \return If the actor has arrived at his destination **/
@@ -170,7 +166,6 @@ namespace MWMechanics
             bool mIsShortcutting;   // if shortcutting at the moment
             bool mShortcutProhibited; // shortcutting may be prohibited after unsuccessful attempt
             osg::Vec3f mShortcutFailPos; // position of last shortcut fail
-            float mLastDestinationTolerance = 0;
 
         private:
             bool isNearInactiveCell(osg::Vec3f position);

From a582013e95678f9d2ca2be12d5f13935c488dfaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matja=C5=BE=20Lamut?= <matjaz.lamut@gmail.com>
Date: Sat, 19 Jun 2021 12:08:57 +0000
Subject: [PATCH 0868/2859] Initial page to document the Template. Mainly deals
 with how to install it....

---
 docs/source/reference/modding/index.rst       |   1 +
 .../modding/openmw-game-template.rst          | 122 ++++++++++++++++++
 2 files changed, 123 insertions(+)
 create mode 100644 docs/source/reference/modding/openmw-game-template.rst

diff --git a/docs/source/reference/modding/index.rst b/docs/source/reference/modding/index.rst
index 90491d34d1..440db96d8c 100644
--- a/docs/source/reference/modding/index.rst
+++ b/docs/source/reference/modding/index.rst
@@ -20,6 +20,7 @@ about creating new content for OpenMW, please refer to
 	foreword
 	differences
 	mod-install
+	openmw-game-template
 	settings/index
 	texture-modding/index
 	custom-models/index
diff --git a/docs/source/reference/modding/openmw-game-template.rst b/docs/source/reference/modding/openmw-game-template.rst
new file mode 100644
index 0000000000..68fa667911
--- /dev/null
+++ b/docs/source/reference/modding/openmw-game-template.rst
@@ -0,0 +1,122 @@
+####################
+OpenMW Game Template
+####################
+
+OpenMW Game Template, or simply, the Template, is a set of base assets required
+for OpenMW to run. These include ``template.omwgame`` along with models, textures,
+fonts, and UI content. The Template can be used as a foundation for a standalone
+game in OpenMW, without requiring any of the original, copyrighted Morrowind assets.
+With the exception of ``Pelagiad.ttf`` font file, the Template is released as
+`public domain <https://creativecommons.org/publicdomain/zero/1.0/>`_.
+
+
+Installation
+************
+
+The Template is installed the same way you would install a mod, with general
+instructions available at :doc:`mod-install`. It can be downloaded from
+`its repository <https://gitlab.com/OpenMW/example-suite>`_ and requires
+OpenMW 0.47 or later.
+
+After getting the Template, extract its ``/data`` folder to somewhere on your disk.
+
+.. note::
+
+    It's adviseable to not put the Template files in the same folder as your
+    Morrowind files. This is especially valid when you don't wish to mix the two games
+    and use the Template as a foundation for a standalone game.
+
+
+Define paths to .omwgame and data files
+=======================================
+
+OpenMW needs to be told where to look for the Template files. This is done in
+``openmw.cfg`` file where ``content=`` tells OpenMW which .omwgame file to use
+and ``data=`` tells OpenMW what folders to look for meshes, textures, audio,
+and other assets. The required lines would look like this, but with the paths
+of course different on your system.
+
+.. code::
+
+    content=template.omwgame
+    data="/home/someuser/example-suite/data"
+    data="/home/someuser/example-suite"
+
+
+Remove references to Morrowind files
+====================================
+
+In case you have Morrowind installed and have run OpenMW's installation wizard,
+you need to remove or comment out the following lines from ``openmw.cfg``.
+Not doing so will either produce errors or load Morrowind content, which you
+probably do not want when you are making your own game.
+
+.. code::
+
+    fallback-archive=Morrowind.bsa
+    fallback-archive=Tribunal.bsa
+    fallback-archive=Bloodmoon.bsa
+    content=Morrowind.esm
+    content=Tribunal.esm
+    content=Bloodmoon.esm
+    data="/home/someuser/.wine/dosdevices/c:/Morrowind/Data Files"
+
+
+Define paths to essential models
+================================
+
+Certain models, essential to OpenMW, cannot be assigned through OpenMW-CS but
+are instead assigned through ``settings.cfg``. These models are player and NPC
+animations, and meshes for the sky. In ``settings.cfg`` used by your OpenMW
+install, add the following lines under the ``[Models]`` section.
+
+.. code::
+
+    xbaseanim = meshes/BasicPlayer.dae
+    baseanim = meshes/BasicPlayer.dae
+    xbaseanim1st = meshes/BasicPlayer.dae
+    baseanimkna = meshes/BasicPlayer.dae
+    baseanimkna1st = meshes/BasicPlayer.dae
+    xbaseanimfemale = meshes/BasicPlayer.dae
+    baseanimfemale = meshes/BasicPlayer.dae
+    baseanimfemale1st = meshes/BasicPlayer.dae
+    xargonianswimkna = meshes/BasicPlayer.dae
+    xbaseanimkf = meshes/BasicPlayer.dae
+    xbaseanim1stkf = meshes/BasicPlayer.dae
+    xbaseanimfemalekf = meshes/BasicPlayer.dae
+    xargonianswimknakf = meshes/BasicPlayer.dae
+    skyatmosphere = meshes/sky_atmosphere.dae
+    skyclouds = meshes/sky_clouds_01.osgt
+    skynight01 = meshes/sky_night_01.osgt
+
+
+As a convenience the Template repository includes a ``settings.cfg`` containing
+these same lines which can be copied and pasted. However, do not use the file
+to simply overwrite the ``settings.cfg`` used by your OpenMW installation.
+
+
+Copying the UI files
+====================
+
+The Template includes a ``resources/mygui`` folder. The contents of this folder
+need to be copied to ``resources/mygui`` folder found in your OpenMW installation
+folder. Overwrite any files aready in this folder. These files provide the
+UI font, its definition, and some minor UI tweaks.
+
+.. code::
+
+    openmw_box.skin.xml
+    openmw_button.skin.xml
+    openmw_font.xml
+    openmw_windows.skin.xml
+    Pelagiad.ttf
+
+
+Run OpenMW Launcher
+*******************
+
+After completing all the steps, run OpenMW Launcher and make sure ``template.omwgame``
+is selected in *Data Files* tab. Then, run the game and enjoy an empty island. It is not
+empty though! It is full of potential to start making your very own game on the
+OpenMW engine. Good luck! 
+

From e5e04b85c17653e4766d2745b10b1cc9ebefcb0f Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 19 Jun 2021 14:07:04 +0200
Subject: [PATCH 0869/2859] Consider time to destination when try to avoid
 collision

Actor may reach destination before collision. Get next path point from active
packet pathfinder and use point tolerance to reduce distance.

Use maximum of last destination tolerance and DEFAULT_TOLERANCE because
there are 2 checks made for path completion. First checks whether actor is
close enough to the destination and second drop last path point when actor is
closer than DEFAULT_TOLERANCE.
---
 apps/openmw/mwmechanics/actors.cpp    | 24 ++++++++++++++++++++----
 apps/openmw/mwmechanics/actors.hpp    |  2 +-
 apps/openmw/mwmechanics/aipackage.cpp | 26 ++++++++++++++++++++++----
 apps/openmw/mwmechanics/aipackage.hpp |  5 +++++
 4 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index dae5654fb6..87f462d6ff 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1,5 +1,7 @@
 #include "actors.hpp"
 
+#include <optional>
+
 #include <components/esm/esmreader.hpp>
 #include <components/esm/esmwriter.hpp>
 
@@ -173,6 +175,15 @@ namespace MWMechanics
     static const int GREETING_COOLDOWN = 40;    // how many updates should pass before NPC can continue movement
     static const float DECELERATE_DISTANCE = 512.f;
 
+    namespace
+    {
+        float getTimeToDestination(const AiPackage& package, const osg::Vec3f& position, float speed, float duration, const osg::Vec3f& halfExtents)
+        {
+            const auto distanceToNextPathPoint = (package.getNextPathPoint(package.getDestination()) - position).length();
+            return (distanceToNextPathPoint - package.getNextPathPointTolerance(speed, duration, halfExtents)) / speed;
+        }
+    }
+
     class GetStuntedMagickaDuration : public MWMechanics::EffectSourceVisitor
     {
     public:
@@ -1766,7 +1777,7 @@ namespace MWMechanics
 
     }
 
-    void Actors::predictAndAvoidCollisions()
+    void Actors::predictAndAvoidCollisions(float duration)
     {
         if (!MWBase::Environment::get().getMechanicsManager()->isAIActive())
             return;
@@ -1801,7 +1812,8 @@ namespace MWMechanics
             bool shouldAvoidCollision = isMoving;
             bool shouldTurnToApproachingActor = !isMoving;
             MWWorld::Ptr currentTarget; // Combat or pursue target (NPCs should not avoid collision with their targets).
-            for (const auto& package : ptr.getClass().getCreatureStats(ptr).getAiSequence())
+            const auto& aiSequence = ptr.getClass().getCreatureStats(ptr).getAiSequence();
+            for (const auto& package : aiSequence)
             {
                 if (package->getTypeId() == AiPackageTypeId::Follow)
                     shouldAvoidCollision = true;
@@ -1831,6 +1843,10 @@ namespace MWMechanics
             osg::Vec2f movementCorrection(0, 0);
             float angleToApproachingActor = 0;
 
+            const float timeToDestination = aiSequence.isEmpty()
+                    ? std::numeric_limits<float>::max()
+                    : getTimeToDestination(**aiSequence.begin(), basePos, maxSpeed, duration, halfExtents);
+
             // Iterate through all other actors and predict collisions.
             for(PtrActorMap::iterator otherIter(mActors.begin()); otherIter != mActors.end(); ++otherIter)
             {
@@ -1867,7 +1883,7 @@ namespace MWMechanics
                     continue; // No solution; distance is always >= collisionDist.
                 float t = (-vr - std::sqrt(Dh)) / v2;
 
-                if (t < 0 || t > timeToCollision)
+                if (t < 0 || t > timeToCollision || t > timeToDestination)
                     continue;
 
                 // Check visibility and awareness last as it's expensive.
@@ -2077,7 +2093,7 @@ namespace MWMechanics
 
             static const bool avoidCollisions = Settings::Manager::getBool("NPCs avoid collisions", "Game");
             if (avoidCollisions)
-                predictAndAvoidCollisions();
+                predictAndAvoidCollisions(duration);
 
             timerUpdateHeadTrack += duration;
             timerUpdateEquippedLight += duration;
diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index 2de0728d58..0ae9687578 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -63,7 +63,7 @@ namespace MWMechanics
 
             void purgeSpellEffects (int casterActorId);
 
-            void predictAndAvoidCollisions();
+            void predictAndAvoidCollisions(float duration);
 
         public:
 
diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index a7e8e74b0d..bfcea2d31b 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -28,6 +28,12 @@ namespace
     {
         return divisor == 0 ? std::numeric_limits<float>::max() * std::numeric_limits<float>::epsilon() : dividend / divisor;
     }
+
+    float getPointTolerance(float speed, float duration, const osg::Vec3f& halfExtents)
+    {
+        const float actorTolerance = 2 * speed * duration + 1.2 * std::max(halfExtents.x(), halfExtents.y());
+        return std::max(MWMechanics::MIN_TOLERANCE, actorTolerance);
+    }
 }
 
 MWMechanics::AiPackage::AiPackage(AiPackageTypeId typeId, const Options& options) :
@@ -98,6 +104,8 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
         return false;
     }
 
+    mLastDestinationTolerance = destTolerance;
+
     const float distToTarget = distance(position, dest);
     const bool isDestReached = (distToTarget <= destTolerance);
     const bool actorCanMoveByZ = canActorMoveByZAxis(actor);
@@ -148,9 +156,7 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
         }
     }
 
-    const float actorTolerance = 2 * actor.getClass().getMaxSpeed(actor) * duration
-            + 1.2 * std::max(halfExtents.x(), halfExtents.y());
-    const float pointTolerance = std::max(MIN_TOLERANCE, actorTolerance);
+    const float pointTolerance = getPointTolerance(actor.getClass().getMaxSpeed(actor), duration, halfExtents);
 
     static const bool smoothMovement = Settings::Manager::getBool("smooth movement", "Game");
     mPathFinder.update(position, pointTolerance, DEFAULT_TOLERANCE,
@@ -181,7 +187,7 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
     zTurn(actor, zAngleToNext);
     smoothTurn(actor, mPathFinder.getXAngleToNext(position.x(), position.y(), position.z()), 0);
 
-    const auto destination = mPathFinder.getPath().empty() ? dest : mPathFinder.getPath().front();
+    const auto destination = getNextPathPoint(dest);
     mObstacleCheck.update(actor, destination, duration);
 
     if (smoothMovement)
@@ -461,3 +467,15 @@ DetourNavigator::AreaCosts MWMechanics::AiPackage::getAreaCosts(const MWWorld::P
 
     return costs;
 }
+
+osg::Vec3f MWMechanics::AiPackage::getNextPathPoint(const osg::Vec3f& destination) const
+{
+    return mPathFinder.getPath().empty() ? destination : mPathFinder.getPath().front();
+}
+
+float MWMechanics::AiPackage::getNextPathPointTolerance(float speed, float duration, const osg::Vec3f& halfExtents) const
+{
+    if (mPathFinder.getPathSize() <= 1)
+        return std::max(DEFAULT_TOLERANCE, mLastDestinationTolerance);
+    return getPointTolerance(speed, duration, halfExtents);
+}
diff --git a/apps/openmw/mwmechanics/aipackage.hpp b/apps/openmw/mwmechanics/aipackage.hpp
index 5ad73c2da6..6d8af0d92b 100644
--- a/apps/openmw/mwmechanics/aipackage.hpp
+++ b/apps/openmw/mwmechanics/aipackage.hpp
@@ -122,6 +122,10 @@ namespace MWMechanics
             /// Return if actor's rotation speed is sufficient to rotate to the destination pathpoint on the run. Otherwise actor should rotate while standing.
             static bool isReachableRotatingOnTheRun(const MWWorld::Ptr& actor, const osg::Vec3f& dest);
 
+            osg::Vec3f getNextPathPoint(const osg::Vec3f& destination) const;
+
+            float getNextPathPointTolerance(float speed, float duration, const osg::Vec3f& halfExtents) const;
+
         protected:
             /// Handles path building and shortcutting with obstacles avoiding
             /** \return If the actor has arrived at his destination **/
@@ -166,6 +170,7 @@ namespace MWMechanics
             bool mIsShortcutting;   // if shortcutting at the moment
             bool mShortcutProhibited; // shortcutting may be prohibited after unsuccessful attempt
             osg::Vec3f mShortcutFailPos; // position of last shortcut fail
+            float mLastDestinationTolerance = 0;
 
         private:
             bool isNearInactiveCell(osg::Vec3f position);

From 382d458f9ce395e3f5f0358ad3a0caea5db4ca2f Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 13 Feb 2021 20:54:31 +0100
Subject: [PATCH 0870/2859] Ignore wrong reference class for SetHello

---
 apps/openmw/mwscript/aiextensions.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwscript/aiextensions.cpp b/apps/openmw/mwscript/aiextensions.cpp
index 223ae3a152..d4de8ded5d 100644
--- a/apps/openmw/mwscript/aiextensions.cpp
+++ b/apps/openmw/mwscript/aiextensions.cpp
@@ -275,9 +275,11 @@ namespace MWScript
                     MWWorld::Ptr ptr = R()(runtime);
                     Interpreter::Type_Integer value = runtime[0].mInteger;
                     runtime.pop();
-
-                    ptr.getClass().getCreatureStats(ptr).setAiSetting(mIndex, value);
-                    ptr.getClass().setBaseAISetting(ptr.getCellRef().getRefId(), mIndex, value);
+                    if(ptr.getClass().isActor())
+                    {
+                        ptr.getClass().getCreatureStats(ptr).setAiSetting(mIndex, value);
+                        ptr.getClass().setBaseAISetting(ptr.getCellRef().getRefId(), mIndex, value);
+                    }
                 }
         };
 

From 879e66a0439aa27a4d2af4341028334d4792bdfc Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 13 Feb 2021 20:55:24 +0100
Subject: [PATCH 0871/2859] Don't autoequip items when implicitely adding an
 item using equip

---
 apps/openmw/mwscript/containerextensions.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwscript/containerextensions.cpp b/apps/openmw/mwscript/containerextensions.cpp
index 375242f17c..7eeb3bfaba 100644
--- a/apps/openmw/mwscript/containerextensions.cpp
+++ b/apps/openmw/mwscript/containerextensions.cpp
@@ -308,7 +308,8 @@ namespace MWScript
                     }
                     if (it == invStore.end())
                     {
-                        it = ptr.getClass().getContainerStore (ptr).add (item, 1, ptr);
+                        MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), item, 1);
+                        it = ptr.getClass().getContainerStore (ptr).add (ref.getPtr(), 1, ptr, false);
                         Log(Debug::Warning) << "Implicitly adding one " << item << 
                             " to the inventory store of " << ptr.getCellRef().getRefId() <<
                             " to fulfill the requirements of Equip instruction";

From 67c8d73fe01a31932adb437054805440857f0d71 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 14 Feb 2021 16:25:38 +0100
Subject: [PATCH 0872/2859] Allow scripts to fail per target

---
 apps/openmw/mwscript/interpretercontext.cpp | 10 +++++++++-
 apps/openmw/mwscript/interpretercontext.hpp |  4 +++-
 apps/openmw/mwscript/scriptmanagerimp.cpp   |  7 ++++---
 apps/openmw/mwscript/scriptmanagerimp.hpp   |  4 ++--
 components/interpreter/context.hpp          |  2 ++
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwscript/interpretercontext.cpp b/apps/openmw/mwscript/interpretercontext.cpp
index d8fd287d72..270b0ea549 100644
--- a/apps/openmw/mwscript/interpretercontext.cpp
+++ b/apps/openmw/mwscript/interpretercontext.cpp
@@ -129,6 +129,14 @@ namespace MWScript
             mGlobalScriptDesc = globalScriptDesc;
     }
 
+    std::string InterpreterContext::getTarget() const
+    {
+        auto ptr = getReference(false);
+        if(!ptr.isEmpty())
+            return ptr.mRef->mRef.getRefId();
+        return {};
+    }
+
     int InterpreterContext::getLocalShort (int index) const
     {
         if (!mLocals)
@@ -474,7 +482,7 @@ namespace MWScript
         locals.mFloats[findLocalVariableIndex (scriptId, name, 'f')] = value;
     }
 
-    MWWorld::Ptr InterpreterContext::getReference(bool required)
+    MWWorld::Ptr InterpreterContext::getReference(bool required) const
     {
         return getReferenceImp ("", true, required);
     }
diff --git a/apps/openmw/mwscript/interpretercontext.hpp b/apps/openmw/mwscript/interpretercontext.hpp
index 298454bcd2..84982f6356 100644
--- a/apps/openmw/mwscript/interpretercontext.hpp
+++ b/apps/openmw/mwscript/interpretercontext.hpp
@@ -47,6 +47,8 @@ namespace MWScript
             InterpreterContext (MWScript::Locals *locals, const MWWorld::Ptr& reference);
             ///< The ownership of \a locals is not transferred. 0-pointer allowed.
 
+            std::string getTarget() const override;
+
             int getLocalShort (int index) const override;
 
             int getLocalLong (int index) const override;
@@ -124,7 +126,7 @@ namespace MWScript
 
             void setMemberFloat (const std::string& id, const std::string& name, float value, bool global) override;
 
-            MWWorld::Ptr getReference(bool required=true);
+            MWWorld::Ptr getReference(bool required=true) const;
             ///< Reference, that the script is running from (can be empty)
 
             void updatePtr(const MWWorld::Ptr& base, const MWWorld::Ptr& updated);
diff --git a/apps/openmw/mwscript/scriptmanagerimp.cpp b/apps/openmw/mwscript/scriptmanagerimp.cpp
index e1652b311c..15b416fd04 100644
--- a/apps/openmw/mwscript/scriptmanagerimp.cpp
+++ b/apps/openmw/mwscript/scriptmanagerimp.cpp
@@ -109,7 +109,8 @@ namespace MWScript
         }
 
         // execute script
-        if (!iter->second.mByteCode.empty() && iter->second.mActive)
+        std::string target = Misc::StringUtils::lowerCase(interpreterContext.getTarget());
+        if (!iter->second.mByteCode.empty() && iter->second.mInactive.find(target) == iter->second.mInactive.end())
             try
             {
                 if (!mOpcodesInstalled)
@@ -129,7 +130,7 @@ namespace MWScript
             {
                 Log(Debug::Error) << "Execution of script " << name << " failed: "  << e.what();
 
-                iter->second.mActive = false; // don't execute again.
+                iter->second.mInactive.insert(target); // don't execute again.
             }
         return false;
     }
@@ -138,7 +139,7 @@ namespace MWScript
     {
         for (auto& script : mScripts)
         {
-            script.second.mActive = true;
+            script.second.mInactive.clear();
         }
 
         mGlobalScripts.clear();
diff --git a/apps/openmw/mwscript/scriptmanagerimp.hpp b/apps/openmw/mwscript/scriptmanagerimp.hpp
index 7ddcd2489d..04693eea6a 100644
--- a/apps/openmw/mwscript/scriptmanagerimp.hpp
+++ b/apps/openmw/mwscript/scriptmanagerimp.hpp
@@ -2,6 +2,7 @@
 #define GAME_SCRIPT_SCRIPTMANAGER_H
 
 #include <map>
+#include <set>
 #include <string>
 
 #include <components/compiler/streamerrorhandler.hpp>
@@ -45,13 +46,12 @@ namespace MWScript
             {
                 std::vector<Interpreter::Type_Code> mByteCode;
                 Compiler::Locals mLocals;
-                bool mActive;
+                std::set<std::string> mInactive;
 
                 CompiledScript(const std::vector<Interpreter::Type_Code>& code, const Compiler::Locals& locals)
                 {
                     mByteCode = code;
                     mLocals = locals;
-                    mActive = true;
                 }
             };
 
diff --git a/components/interpreter/context.hpp b/components/interpreter/context.hpp
index 862018bdc0..18d36ffee9 100644
--- a/components/interpreter/context.hpp
+++ b/components/interpreter/context.hpp
@@ -12,6 +12,8 @@ namespace Interpreter
 
             virtual ~Context() {}
 
+            virtual std::string getTarget() const = 0;
+
             virtual int getLocalShort (int index) const = 0;
 
             virtual int getLocalLong (int index) const = 0;

From 690e5ef7574f6eb0e8038ab9f1c6b4b61b724fd5 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 11 Mar 2021 20:47:26 +0100
Subject: [PATCH 0873/2859] Don't resolve a script's target just to get the ID

---
 apps/openmw/mwscript/globalscripts.cpp      | 20 ++++++++++++++++++++
 apps/openmw/mwscript/globalscripts.hpp      |  2 ++
 apps/openmw/mwscript/interpretercontext.cpp |  7 ++++---
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwscript/globalscripts.cpp b/apps/openmw/mwscript/globalscripts.cpp
index b287d33b3d..9de08fbce3 100644
--- a/apps/openmw/mwscript/globalscripts.cpp
+++ b/apps/openmw/mwscript/globalscripts.cpp
@@ -92,6 +92,21 @@ namespace
             return false;
         }
     };
+
+    struct IdGettingVisitor : public boost::static_visitor<std::string>
+    {
+        std::string operator()(const MWWorld::Ptr& ptr) const
+        {
+            if(ptr.isEmpty())
+                return {};
+            return ptr.mRef->mRef.getRefId();
+        }
+
+        std::string operator()(const std::pair<ESM::RefNum, std::string>& pair) const
+        {
+            return pair.second;
+        }
+    };
 }
 
 namespace MWScript
@@ -110,6 +125,11 @@ namespace MWScript
         return ptr;
     }
 
+    std::string GlobalScriptDesc::getId() const
+    {
+        return boost::apply_visitor(IdGettingVisitor(), mTarget);
+    }
+
 
     GlobalScripts::GlobalScripts (const MWWorld::ESMStore& store)
     : mStore (store)
diff --git a/apps/openmw/mwscript/globalscripts.hpp b/apps/openmw/mwscript/globalscripts.hpp
index 049e78804a..cd70f4e667 100644
--- a/apps/openmw/mwscript/globalscripts.hpp
+++ b/apps/openmw/mwscript/globalscripts.hpp
@@ -44,6 +44,8 @@ namespace MWScript
         const MWWorld::Ptr* getPtrIfPresent() const; // Returns a Ptr if one has been resolved
 
         MWWorld::Ptr getPtr(); // Resolves mTarget to a Ptr and caches the (potentially empty) result
+
+        std::string getId() const; // Returns the target's ID -- if any
     };
 
     class GlobalScripts
diff --git a/apps/openmw/mwscript/interpretercontext.cpp b/apps/openmw/mwscript/interpretercontext.cpp
index 270b0ea549..2e8f72e629 100644
--- a/apps/openmw/mwscript/interpretercontext.cpp
+++ b/apps/openmw/mwscript/interpretercontext.cpp
@@ -131,9 +131,10 @@ namespace MWScript
 
     std::string InterpreterContext::getTarget() const
     {
-        auto ptr = getReference(false);
-        if(!ptr.isEmpty())
-            return ptr.mRef->mRef.getRefId();
+        if(!mReference.isEmpty())
+            return mReference.mRef->mRef.getRefId();
+        else if(mGlobalScriptDesc)
+            return mGlobalScriptDesc->getId();
         return {};
     }
 

From 2db7495d438b2321dece049b6e52b2b921e069d5 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 19 Jun 2021 19:27:32 +0200
Subject: [PATCH 0874/2859] add changelog entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 110eaf21d4..0e4a5e9024 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 0.48.0
 ------
 
+    Bug #3737: Scripts from The Underground 2 .esp do not play (all patched versions)
     Bug #3846: Strings starting with "-" fail to compile if not enclosed in quotes
 
 0.47.0

From 5c4e1252e9ac0d18fdb13a614f4de34aea5c5193 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Peltier?= <contact@leo-peltier.fr>
Date: Fri, 2 Apr 2021 19:47:21 +0200
Subject: [PATCH 0875/2859] Handle AutoCalc flag when getting spell cost

Fixes #5483

This only applies to "base game" spells.
When adding an AutoCalc spell with TES:CS its cost is computed and
stored inside game files. This stored cost was being used by OpenMW and
the actual cost was never recomputed at runtime whereas Morrowind.exe
discards the stored cost.
While this worked fine in vanilla, mods can update AutoCalc spell
effects without ever updating the stored cost.

The formula was mostly there already but there was a few differences,
namely a 1 second offset in duration.
---
 AUTHORS.md                                  |  1 +
 CHANGELOG.md                                |  1 +
 apps/openmw/mwgui/spellcreationdialog.cpp   |  2 +-
 apps/openmw/mwgui/spellmodel.cpp            |  2 +-
 apps/openmw/mwgui/tooltips.cpp              |  2 +-
 apps/openmw/mwmechanics/autocalcspell.cpp   | 33 ++++++++++-------
 apps/openmw/mwmechanics/spellabsorption.cpp |  2 +-
 apps/openmw/mwmechanics/spellcasting.cpp    |  2 +-
 apps/openmw/mwmechanics/spellutil.cpp       | 39 ++++++++++++++++++---
 apps/openmw/mwmechanics/spellutil.hpp       |  8 ++++-
 apps/openmw/mwworld/worldimp.cpp            |  6 ++--
 11 files changed, 72 insertions(+), 26 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index 75302908ea..22a18506e8 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -118,6 +118,7 @@ Programmers
     Kurnevsky Evgeny (kurnevsky)
     Lars Söderberg (Lazaroth)
     lazydev
+    Léo Peltier
     Leon Krieg (lkrieg)
     Leon Saunders (emoose)
     logzero
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e4a5e9024..d4ffe9a630 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 
     Bug #3737: Scripts from The Underground 2 .esp do not play (all patched versions)
     Bug #3846: Strings starting with "-" fail to compile if not enclosed in quotes
+    Bug #5483: AutoCalc flag is not used to calculate spells cost
 
 0.47.0
 ------
diff --git a/apps/openmw/mwgui/spellcreationdialog.cpp b/apps/openmw/mwgui/spellcreationdialog.cpp
index 5a5dec60f7..01653d9e6f 100644
--- a/apps/openmw/mwgui/spellcreationdialog.cpp
+++ b/apps/openmw/mwgui/spellcreationdialog.cpp
@@ -456,7 +456,7 @@ namespace MWGui
 
         for (const ESM::ENAMstruct& effect : mEffects)
         {
-            y += std::max(1.f, MWMechanics::calcEffectCost(effect));
+            y += std::max(1.f, MWMechanics::calcEffectCost(effect, nullptr, MWMechanics::EffectCostMethod::PlayerSpell));
 
             if (effect.mRange == ESM::RT_Target)
                 y *= 1.5;
diff --git a/apps/openmw/mwgui/spellmodel.cpp b/apps/openmw/mwgui/spellmodel.cpp
index 78b9171e59..fe18b0f082 100644
--- a/apps/openmw/mwgui/spellmodel.cpp
+++ b/apps/openmw/mwgui/spellmodel.cpp
@@ -109,7 +109,7 @@ namespace MWGui
             if (spell->mData.mType == ESM::Spell::ST_Spell)
             {
                 newSpell.mType = Spell::Type_Spell;
-                std::string cost = std::to_string(spell->mData.mCost);
+                std::string cost = std::to_string(MWMechanics::calcSpellCost(*spell));
                 std::string chance = std::to_string(int(MWMechanics::getSpellSuccessChance(spell, mActor)));
                 newSpell.mCostColumn = cost + "/" + chance;
             }
diff --git a/apps/openmw/mwgui/tooltips.cpp b/apps/openmw/mwgui/tooltips.cpp
index a821d0106b..84d8b65592 100644
--- a/apps/openmw/mwgui/tooltips.cpp
+++ b/apps/openmw/mwgui/tooltips.cpp
@@ -251,7 +251,7 @@ namespace MWGui
                     }
                     std::string cost = focus->getUserString("SpellCost");
                     if (cost != "" && cost != "0")
-                        info.text += MWGui::ToolTips::getValueString(spell->mData.mCost, "#{sCastCost}");
+                        info.text += MWGui::ToolTips::getValueString(MWMechanics::calcSpellCost(*spell), "#{sCastCost}");
                     info.effects = effects;
                     tooltipSize = createToolTip(info);
                 }
diff --git a/apps/openmw/mwmechanics/autocalcspell.cpp b/apps/openmw/mwmechanics/autocalcspell.cpp
index 662cfe473b..d82b8505f1 100644
--- a/apps/openmw/mwmechanics/autocalcspell.cpp
+++ b/apps/openmw/mwmechanics/autocalcspell.cpp
@@ -68,7 +68,8 @@ namespace MWMechanics
             if (!(spell.mData.mFlags & ESM::Spell::F_Autocalc))
                 continue;
             static const int iAutoSpellTimesCanCast = gmst.find("iAutoSpellTimesCanCast")->mValue.getInteger();
-            if (baseMagicka < iAutoSpellTimesCanCast * spell.mData.mCost)
+            int spellCost = MWMechanics::calcSpellCost(spell);
+            if (baseMagicka < iAutoSpellTimesCanCast * spellCost)
                 continue;
 
             if (race && race->mPowers.exists(spell.mId))
@@ -83,7 +84,7 @@ namespace MWMechanics
             assert(school >= 0 && school < 6);
             SchoolCaps& cap = schoolCaps[school];
 
-            if (cap.mReachedLimit && spell.mData.mCost <= cap.mMinCost)
+            if (cap.mReachedLimit && spellCost <= cap.mMinCost)
                 continue;
 
             static const float fAutoSpellChance = gmst.find("fAutoSpellChance")->mValue.getFloat();
@@ -102,6 +103,7 @@ namespace MWMechanics
                 for (const std::string& testSpellName : selectedSpells)
                 {
                     const ESM::Spell* testSpell = spells.find(testSpellName);
+                    int testSpellCost = MWMechanics::calcSpellCost(*testSpell);
 
                     //int testSchool;
                     //float dummySkillTerm;
@@ -115,9 +117,9 @@ namespace MWMechanics
                             // already erased it, and so the number of spells would often exceed the sum of limits.
                             // This bug cannot be fixed without significantly changing the results of the spell autocalc, which will not have been playtested.
                             //testSchool == school &&
-                            testSpell->mData.mCost < cap.mMinCost)
+                            testSpellCost < cap.mMinCost)
                     {
-                        cap.mMinCost = testSpell->mData.mCost;
+                        cap.mMinCost = testSpellCost;
                         cap.mWeakestSpell = testSpell->mId;
                     }
                 }
@@ -128,10 +130,10 @@ namespace MWMechanics
                 if (cap.mCount == cap.mLimit)
                     cap.mReachedLimit = true;
 
-                if (spell.mData.mCost < cap.mMinCost)
+                if (spellCost < cap.mMinCost)
                 {
                     cap.mWeakestSpell = spell.mId;
-                    cap.mMinCost = spell.mData.mCost;
+                    cap.mMinCost = spellCost;
                 }
             }
         }
@@ -159,11 +161,13 @@ namespace MWMechanics
                 continue;
             if (!(spell.mData.mFlags & ESM::Spell::F_PCStart))
                 continue;
-            if (reachedLimit && spell.mData.mCost <= minCost)
+
+            int spellCost = MWMechanics::calcSpellCost(spell);
+            if (reachedLimit && spellCost <= minCost)
                 continue;
             if (race && std::find(race->mPowers.mList.begin(), race->mPowers.mList.end(), spell.mId) != race->mPowers.mList.end())
                 continue;
-            if (baseMagicka < spell.mData.mCost)
+            if (baseMagicka < spellCost)
                 continue;
 
             static const float fAutoPCSpellChance = esmStore.get<ESM::GameSetting>().find("fAutoPCSpellChance")->mValue.getFloat();
@@ -185,19 +189,20 @@ namespace MWMechanics
                 for (const std::string& testSpellName : selectedSpells)
                 {
                     const ESM::Spell* testSpell = esmStore.get<ESM::Spell>().find(testSpellName);
-                    if (testSpell->mData.mCost < minCost)
+                    int testSpellCost = MWMechanics::calcSpellCost(*testSpell);
+                    if (testSpellCost < minCost)
                     {
-                        minCost = testSpell->mData.mCost;
+                        minCost = testSpellCost;
                         weakestSpell = testSpell;
                     }
                 }
             }
             else
             {
-                if (spell.mData.mCost < minCost)
+                if (spellCost < minCost)
                 {
                     weakestSpell = &spell;
-                    minCost = weakestSpell->mData.mCost;
+                    minCost = MWMechanics::calcSpellCost(*weakestSpell);
                 }
                 static const unsigned int iAutoPCSpellMax = esmStore.get<ESM::GameSetting>().find("iAutoPCSpellMax")->mValue.getInteger();
                 if (selectedSpells.size() == iAutoPCSpellMax)
@@ -291,7 +296,9 @@ namespace MWMechanics
         else
             calcWeakestSchool(spell, actorSkills, effectiveSchool, skillTerm); // Note effectiveSchool is unused after this
 
-        float castChance = skillTerm - spell->mData.mCost + 0.2f * actorAttributes[ESM::Attribute::Willpower] + 0.1f * actorAttributes[ESM::Attribute::Luck];
+        float castChance = skillTerm - MWMechanics::calcSpellCost(*spell)
+            + 0.2f * actorAttributes[ESM::Attribute::Willpower]
+            + 0.1f * actorAttributes[ESM::Attribute::Luck];
         return castChance;
     }
 }
diff --git a/apps/openmw/mwmechanics/spellabsorption.cpp b/apps/openmw/mwmechanics/spellabsorption.cpp
index bab290fdab..cb80921b33 100644
--- a/apps/openmw/mwmechanics/spellabsorption.cpp
+++ b/apps/openmw/mwmechanics/spellabsorption.cpp
@@ -72,7 +72,7 @@ namespace MWMechanics
         int spellCost = 0;
         if (spell)
         {
-            spellCost = spell->mData.mCost;
+            spellCost = MWMechanics::calcSpellCost(*spell);
         }
         else
         {
diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index 5a367b5020..47225bc6f7 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -584,7 +584,7 @@ namespace MWMechanics
                 DynamicStat<float> fatigue = stats.getFatigue();
                 const float normalizedEncumbrance = mCaster.getClass().getNormalizedEncumbrance(mCaster);
 
-                float fatigueLoss = spell->mData.mCost * (fFatigueSpellBase + normalizedEncumbrance * fFatigueSpellMult);
+                float fatigueLoss = MWMechanics::calcSpellCost(*spell) * (fFatigueSpellBase + normalizedEncumbrance * fFatigueSpellMult);
                 fatigue.setCurrent(fatigue.getCurrent() - fatigueLoss); 
                 stats.setFatigue(fatigue);
 
diff --git a/apps/openmw/mwmechanics/spellutil.cpp b/apps/openmw/mwmechanics/spellutil.cpp
index 0c667e680a..18a1c0004e 100644
--- a/apps/openmw/mwmechanics/spellutil.cpp
+++ b/apps/openmw/mwmechanics/spellutil.cpp
@@ -24,7 +24,7 @@ namespace MWMechanics
         return schoolSkillArray.at(school);
     }
 
-    float calcEffectCost(const ESM::ENAMstruct& effect, const ESM::MagicEffect* magicEffect)
+    float calcEffectCost(const ESM::ENAMstruct& effect, const ESM::MagicEffect* magicEffect, const EffectCostMethod method)
     {
         const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
         if (!magicEffect)
@@ -39,14 +39,43 @@ namespace MWMechanics
             duration = std::max(1, duration);
         static const float fEffectCostMult = store.get<ESM::GameSetting>().find("fEffectCostMult")->mValue.getFloat();
 
+        int durationOffset = 0;
+        int minArea = 0;
+        if (method == EffectCostMethod::PlayerSpell) {
+            durationOffset = 1;
+            minArea = 1;
+        }
+
         float x = 0.5 * (std::max(1, minMagn) + std::max(1, maxMagn));
         x *= 0.1 * magicEffect->mData.mBaseCost;
-        x *= 1 + duration;
-        x += 0.05 * std::max(1, effect.mArea) * magicEffect->mData.mBaseCost;
+        x *= durationOffset + duration;
+        x += 0.05 * std::max(minArea, effect.mArea) * magicEffect->mData.mBaseCost;
 
         return x * fEffectCostMult;
     }
 
+    int calcSpellCost (const ESM::Spell& spell)
+    {
+        if (!(spell.mData.mFlags & ESM::Spell::F_Autocalc))
+            return spell.mData.mCost;
+
+        float cost = 0;
+
+        for (const ESM::ENAMstruct& effect : spell.mEffects.mList)
+        {
+            float effectCost = std::max(0.f, MWMechanics::calcEffectCost(effect));
+
+            // This is applied to the whole spell cost for each effect when
+            // creating spells, but is only applied on the effect itself in TES:CS.
+            if (effect.mRange == ESM::RT_Target)
+                effectCost *= 1.5;
+
+            cost += effectCost;
+        }
+
+        return std::round(cost);
+    }
+
     int getEffectiveEnchantmentCastCost(float castCost, const MWWorld::Ptr &actor)
     {
         /*
@@ -97,7 +126,7 @@ namespace MWMechanics
         float actorWillpower = stats.getAttribute(ESM::Attribute::Willpower).getModified();
         float actorLuck = stats.getAttribute(ESM::Attribute::Luck).getModified();
 
-        float castChance = (lowestSkill - spell->mData.mCost + 0.2f * actorWillpower + 0.1f * actorLuck);
+        float castChance = (lowestSkill - calcSpellCost(*spell) + 0.2f * actorWillpower + 0.1f * actorLuck);
 
         return castChance;
     }
@@ -123,7 +152,7 @@ namespace MWMechanics
         if (spell->mData.mType != ESM::Spell::ST_Spell)
             return 100;
 
-        if (checkMagicka && spell->mData.mCost > 0 && stats.getMagicka().getCurrent() < spell->mData.mCost)
+        if (checkMagicka && calcSpellCost(*spell) > 0 && stats.getMagicka().getCurrent() < calcSpellCost(*spell))
             return 0;
 
         if (spell->mData.mFlags & ESM::Spell::F_Always)
diff --git a/apps/openmw/mwmechanics/spellutil.hpp b/apps/openmw/mwmechanics/spellutil.hpp
index 865a9126e7..81f39b6dda 100644
--- a/apps/openmw/mwmechanics/spellutil.hpp
+++ b/apps/openmw/mwmechanics/spellutil.hpp
@@ -19,7 +19,13 @@ namespace MWMechanics
 {
     ESM::Skill::SkillEnum spellSchoolToSkill(int school);
 
-    float calcEffectCost(const ESM::ENAMstruct& effect, const ESM::MagicEffect* magicEffect = nullptr);
+    enum class EffectCostMethod {
+        GameSpell,
+        PlayerSpell,
+    };
+
+    float calcEffectCost(const ESM::ENAMstruct& effect, const ESM::MagicEffect* magicEffect = nullptr, const EffectCostMethod method = EffectCostMethod::GameSpell);
+    int calcSpellCost (const ESM::Spell& spell);
 
     int getEffectiveEnchantmentCastCost (float castCost, const MWWorld::Ptr& actor);
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 45a7dd8a74..611e535c88 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -40,6 +40,7 @@
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/spellcasting.hpp"
+#include "../mwmechanics/spellutil.hpp"
 #include "../mwmechanics/levelledlist.hpp"
 #include "../mwmechanics/combat.hpp"
 #include "../mwmechanics/aiavoiddoor.hpp" //Used to tell actors to avoid doors
@@ -3017,11 +3018,12 @@ namespace MWWorld
         if (!selectedSpell.empty())
         {
             const ESM::Spell* spell = mStore.get<ESM::Spell>().find(selectedSpell);
+            int spellCost = MWMechanics::calcSpellCost(*spell);
 
             // Check mana
             bool godmode = (isPlayer && mGodMode);
             MWMechanics::DynamicStat<float> magicka = stats.getMagicka();
-            if (spell->mData.mCost > 0 && magicka.getCurrent() < spell->mData.mCost && !godmode)
+            if (spellCost > 0 && magicka.getCurrent() < spellCost && !godmode)
             {
                 message = "#{sMagicInsufficientSP}";
                 fail = true;
@@ -3037,7 +3039,7 @@ namespace MWWorld
             // Reduce mana
             if (!fail && !godmode)
             {
-                magicka.setCurrent(magicka.getCurrent() - spell->mData.mCost);
+                magicka.setCurrent(magicka.getCurrent() - spellCost);
                 stats.setMagicka(magicka);
             }
         }

From cff11fbca9bfdfcb50ea4290f5057e219bb649ec Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Mon, 21 Jun 2021 14:22:26 +0200
Subject: [PATCH 0876/2859] Inline a couple of methods in esmreader.cpp

---
 components/esm/esmreader.cpp | 30 ------------------------------
 components/esm/esmreader.hpp | 12 ++++++------
 2 files changed, 6 insertions(+), 36 deletions(-)

diff --git a/components/esm/esmreader.cpp b/components/esm/esmreader.cpp
index e5d239570e..ebcba7062b 100644
--- a/components/esm/esmreader.cpp
+++ b/components/esm/esmreader.cpp
@@ -7,11 +7,6 @@ namespace ESM
 
 using namespace Misc;
 
-    std::string ESMReader::getName() const
-    {
-        return mCtx.filename;
-    }
-
 ESM_Context ESMReader::getContext()
 {
     // Update the file position before returning
@@ -29,11 +24,6 @@ ESMReader::ESMReader()
     clearCtx();
 }
 
-int ESMReader::getFormat() const
-{
-    return mHeader.mFormat;
-}
-
 void ESMReader::restoreContext(const ESM_Context &rc)
 {
     // Reopen the file if necessary
@@ -181,11 +171,6 @@ bool ESMReader::peekNextSub(const char *name)
     return mCtx.subName == name;
 }
 
-void ESMReader::cacheSubName()
-{
-    mCtx.subCached = true;
-}
-
 // Read subrecord name. This gets called a LOT, so I've optimized it
 // slightly.
 void ESMReader::getSubName()
@@ -340,19 +325,4 @@ void ESMReader::fail(const std::string &msg)
     throw std::runtime_error(ss.str());
 }
 
-void ESMReader::setEncoder(ToUTF8::Utf8Encoder* encoder)
-{
-    mEncoder = encoder;
-}
-
-size_t ESMReader::getFileOffset() const
-{
-    return mEsm->tellg();
-}
-
-void ESMReader::skip(int bytes)
-{
-    mEsm->seekg(getFileOffset()+bytes);
-}
-
 }
diff --git a/components/esm/esmreader.hpp b/components/esm/esmreader.hpp
index d3dd94516f..8c0aa580cf 100644
--- a/components/esm/esmreader.hpp
+++ b/components/esm/esmreader.hpp
@@ -36,10 +36,10 @@ public:
   const std::string getDesc() const { return mHeader.mData.desc; }
   const std::vector<Header::MasterData> &getGameFiles() const { return mHeader.mMaster; }
   const Header& getHeader() const { return mHeader; }
-  int getFormat() const;
+  int getFormat() const { return mHeader.mFormat; };
   const NAME &retSubName() const { return mCtx.subName; }
   uint32_t getSubSize() const { return mCtx.leftSub; }
-  std::string getName() const;
+  std::string getName() const {return mCtx.filename; };
 
   /*************************************************************************
    *
@@ -73,7 +73,7 @@ public:
   void openRaw(const std::string &filename);
 
   /// Get the current position in the file. Make sure that the file has been opened!
-  size_t getFileOffset() const;
+  size_t getFileOffset() const { return mEsm->tellg(); };
 
   // This is a quick hack for multiple esm/esp files. Each plugin introduces its own
   //  terrain palette, but ESMReader does not pass a reference to the correct plugin
@@ -185,7 +185,7 @@ public:
   bool peekNextSub(const char* name);
 
   // Store the current subrecord name for the next call of getSubName()
-  void cacheSubName();
+  void cacheSubName() {mCtx.subCached = true; };
 
   // Read subrecord name. This gets called a LOT, so I've optimized it
   // slightly.
@@ -247,13 +247,13 @@ public:
   // them from native encoding to UTF8 in the process.
   std::string getString(int size);
 
-  void skip(int bytes);
+  void skip(int bytes) { mEsm->seekg(getFileOffset()+bytes); };
 
   /// Used for error handling
   void fail(const std::string &msg);
 
   /// Sets font encoder for ESM strings
-  void setEncoder(ToUTF8::Utf8Encoder* encoder);
+  void setEncoder(ToUTF8::Utf8Encoder* encoder) { mEncoder = encoder; };
 
   /// Get record flags of last record
   unsigned int getRecordFlags() { return mRecordFlags; }

From e7d68d3d1b7e76b1c9793ba292e952dc3ee3713e Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 21 Jun 2021 18:09:48 +0200
Subject: [PATCH 0877/2859] Validate almost straight shortcuts by navmesh
 raycast

Check whether it's possible to actually move over navmesh by such shortcut.
---
 apps/openmw/mwmechanics/aipackage.cpp   |  3 ++-
 apps/openmw/mwmechanics/pathfinding.cpp | 26 ++++++++++++++++++++++---
 apps/openmw/mwmechanics/pathfinding.hpp |  3 ++-
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index bfcea2d31b..5239491795 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -160,7 +160,8 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
 
     static const bool smoothMovement = Settings::Manager::getBool("smooth movement", "Game");
     mPathFinder.update(position, pointTolerance, DEFAULT_TOLERANCE,
-                       /*shortenIfAlmostStraight=*/smoothMovement, actorCanMoveByZ);
+                       /*shortenIfAlmostStraight=*/smoothMovement, actorCanMoveByZ,
+                       halfExtents, getNavigatorFlags(actor));
 
     if (isDestReached || mPathFinder.checkPathCompleted()) // if path is finished
     {
diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp
index 3f113802f8..f6283831d5 100644
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@@ -105,6 +105,19 @@ namespace
 
         return checkAngle && checkDist;
     }
+
+    struct IsValidShortcut
+    {
+        const DetourNavigator::Navigator* mNavigator;
+        const osg::Vec3f mHalfExtents;
+        const DetourNavigator::Flags mFlags;
+
+        bool operator()(const osg::Vec3f& start, const osg::Vec3f& end) const
+        {
+            const auto position = mNavigator->raycast(mHalfExtents, start, end, mFlags);
+            return position.has_value() && std::abs((position.value() - start).length2() - (end - start).length2()) <= 1;
+        }
+    };
 }
 
 namespace MWMechanics
@@ -296,7 +309,8 @@ namespace MWMechanics
     }
 
     void PathFinder::update(const osg::Vec3f& position, float pointTolerance, float destinationTolerance,
-                            bool shortenIfAlmostStraight, bool canMoveByZ)
+                            bool shortenIfAlmostStraight, bool canMoveByZ, const osg::Vec3f& halfExtents,
+                            const DetourNavigator::Flags flags)
     {
         if (mPath.empty())
             return;
@@ -306,9 +320,15 @@ namespace MWMechanics
 
         if (shortenIfAlmostStraight)
         {
-            while (mPath.size() > 2 && isAlmostStraight(mPath[0], mPath[1], mPath[2], pointTolerance))
+            const IsValidShortcut isValidShortcut {
+                MWBase::Environment::get().getWorld()->getNavigator(),
+                halfExtents, flags
+            };
+            while (mPath.size() > 2 && isAlmostStraight(mPath[0], mPath[1], mPath[2], pointTolerance)
+                   && isValidShortcut(mPath[0], mPath[2]))
                 mPath.erase(mPath.begin() + 1);
-            if (mPath.size() > 1 && isAlmostStraight(position, mPath[0], mPath[1], pointTolerance))
+            if (mPath.size() > 1 && isAlmostStraight(position, mPath[0], mPath[1], pointTolerance)
+                    && isValidShortcut(position, mPath[1]))
                 mPath.pop_front();
         }
 
diff --git a/apps/openmw/mwmechanics/pathfinding.hpp b/apps/openmw/mwmechanics/pathfinding.hpp
index ed88a57ca0..987f2c6603 100644
--- a/apps/openmw/mwmechanics/pathfinding.hpp
+++ b/apps/openmw/mwmechanics/pathfinding.hpp
@@ -107,7 +107,8 @@ namespace MWMechanics
 
             /// Remove front point if exist and within tolerance
             void update(const osg::Vec3f& position, float pointTolerance, float destinationTolerance,
-                        bool shortenIfAlmostStraight, bool canMoveByZ);
+                        bool shortenIfAlmostStraight, bool canMoveByZ, const osg::Vec3f& halfExtents,
+                        const DetourNavigator::Flags flags);
 
             bool checkPathCompleted() const
             {

From 6140c9c3fda5d18cb5b99a0fb4cb8052974a4cb0 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Mon, 21 Jun 2021 20:06:45 +0000
Subject: [PATCH 0878/2859] Don't catch exceptions in EsmReader::getExact

---
 components/esm/esmreader.cpp | 12 ------------
 components/esm/esmreader.hpp |  2 +-
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/components/esm/esmreader.cpp b/components/esm/esmreader.cpp
index e5d239570e..e3e6a4f335 100644
--- a/components/esm/esmreader.cpp
+++ b/components/esm/esmreader.cpp
@@ -291,18 +291,6 @@ void ESMReader::getRecHeader(uint32_t &flags)
  *
  *************************************************************************/
 
-void ESMReader::getExact(void*x, int size)
-{
-    try
-    {
-        mEsm->read((char*)x, size);
-    }
-    catch (std::exception& e)
-    {
-        fail(std::string("Read error: ") + e.what());
-    }
-}
-
 std::string ESMReader::getString(int size)
 {
     size_t s = size;
diff --git a/components/esm/esmreader.hpp b/components/esm/esmreader.hpp
index d3dd94516f..ea18014b77 100644
--- a/components/esm/esmreader.hpp
+++ b/components/esm/esmreader.hpp
@@ -239,7 +239,7 @@ public:
   template <typename X>
   void getT(X &x) { getExact(&x, sizeof(X)); }
 
-  void getExact(void*x, int size);
+  void getExact(void* x, int size) { mEsm->read((char*)x, size); }
   void getName(NAME &name) { getT(name); }
   void getUint(uint32_t &u) { getT(u); }
 

From 870cdd013025abf7d81f0666701bf20e0f083269 Mon Sep 17 00:00:00 2001
From: Dobrohotov Alexei <alexdobrohotov@yandex.ru>
Date: Mon, 24 May 2021 14:26:16 +0300
Subject: [PATCH 0879/2859] Calculate magic VFX vertical offset (bug #5453)

---
 CHANGELOG.md                             |  1 +
 apps/openmw/mwmechanics/spellcasting.cpp | 29 ++++++++++++++++++++----
 apps/openmw/mwrender/animation.cpp       | 18 +++++++++++----
 3 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4ffe9a630..19bbabca7d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 
     Bug #3737: Scripts from The Underground 2 .esp do not play (all patched versions)
     Bug #3846: Strings starting with "-" fail to compile if not enclosed in quotes
+    Bug #5453: Magic effect VFX are offset for creatures
     Bug #5483: AutoCalc flag is not used to calculate spells cost
 
 0.47.0
diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index 47225bc6f7..6b07fdbb86 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -737,12 +737,31 @@ namespace MWMechanics
             else
             {
                 // If the caster has no animation, add the effect directly to the effectManager
-                // We should scale it manually
-                osg::Vec3f bounds (MWBase::Environment::get().getWorld()->getHalfExtents(mCaster) * 2.f / Constants::UnitsPerFoot);
-                float scale = std::max({ bounds.x()/3.f, bounds.y()/3.f, bounds.z()/6.f });
-                float meshScale = !mCaster.getClass().isActor() ? mCaster.getCellRef().getScale() : 1.0f;
+                // We must scale and position it manually
+                float scale = mCaster.getCellRef().getScale();
                 osg::Vec3f pos (mCaster.getRefData().getPosition().asVec3());
-                MWBase::Environment::get().getWorld()->spawnEffect("meshes\\" + castStatic->mModel, effect->mParticle, pos, scale * meshScale);
+                if (!mCaster.getClass().isNpc())
+                {
+                    osg::Vec3f bounds (MWBase::Environment::get().getWorld()->getHalfExtents(mCaster) * 2.f);
+                    scale *= std::max({bounds.x(), bounds.y(), bounds.z() / 2.f}) / 64.f;
+                    float offset = 0.f;
+                    if (bounds.z() < 128.f)
+                        offset = bounds.z() - 128.f;
+                    else if (bounds.z() < bounds.x() + bounds.y())
+                        offset = 128.f - bounds.z();
+                    if (MWBase::Environment::get().getWorld()->isFlying(mCaster))
+                        offset /= 20.f;
+                    pos.z() += offset * scale;
+                }
+                else
+                {
+                    // Additionally use the NPC's height
+                    osg::Vec3f npcScaleVec (1.f, 1.f, 1.f);
+                    mCaster.getClass().adjustScale(mCaster, npcScaleVec, true);
+                    scale *= npcScaleVec.z();
+                }
+                scale = std::max(scale, 1.f);
+                MWBase::Environment::get().getWorld()->spawnEffect("meshes\\" + castStatic->mModel, effect->mParticle, pos, scale);
             }
 
             if (animation && !mCaster.getClass().isActor())
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index b578ee25ba..a11d97779c 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -6,7 +6,6 @@
 #include <osg/MatrixTransform>
 #include <osg/BlendFunc>
 #include <osg/Material>
-#include <osg/PositionAttitudeTransform>
 #include <osg/Switch>
 
 #include <osgParticle/ParticleSystem>
@@ -1655,12 +1654,21 @@ namespace MWRender
             parentNode = found->second;
         }
 
-        osg::ref_ptr<osg::PositionAttitudeTransform> trans = new osg::PositionAttitudeTransform;
+        osg::ref_ptr<SceneUtil::PositionAttitudeTransform> trans = new SceneUtil::PositionAttitudeTransform;
         if (!mPtr.getClass().isNpc())
         {
-            osg::Vec3f bounds (MWBase::Environment::get().getWorld()->getHalfExtents(mPtr) * 2.f / Constants::UnitsPerFoot);
-            float scale = std::max({ bounds.x()/3.f, bounds.y()/3.f, bounds.z()/6.f });
-            trans->setScale(osg::Vec3f(scale, scale, scale));
+            osg::Vec3f bounds (MWBase::Environment::get().getWorld()->getHalfExtents(mPtr) * 2.f);
+            float scale = std::max({bounds.x(), bounds.y(), bounds.z() / 2.f}) / 64.f;
+            if (scale > 1.f)
+                trans->setScale(osg::Vec3f(scale, scale, scale));
+            float offset = 0.f;
+            if (bounds.z() < 128.f)
+                offset = bounds.z() - 128.f;
+            else if (bounds.z() < bounds.x() + bounds.y())
+                offset = 128.f - bounds.z();
+            if (MWBase::Environment::get().getWorld()->isFlying(mPtr))
+                offset /= 20.f;
+            trans->setPosition(osg::Vec3f(0.f, 0.f, offset * scale));
         }
         parentNode->addChild(trans);
 

From f3b8bc98115db56982bb2f2ec327ecddfd51df34 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Tue, 22 Jun 2021 10:02:49 +0400
Subject: [PATCH 0880/2859] Fix 0.46 and 0.47 changelogs

---
 CHANGELOG.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4ffe9a630..087853db96 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,6 @@
     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 #2798: Mutable ESM records
     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
@@ -27,7 +26,6 @@
     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 #4201: Projectile-projectile collision
     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
@@ -96,7 +94,7 @@
     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 #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
@@ -109,7 +107,7 @@
     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 #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
@@ -142,11 +140,15 @@
     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
@@ -183,7 +185,6 @@
     Feature #6034: Find path based on area cost depending on NPC stats
     Task #5480: Drop Qt4 support
     Task #5520: Improve cell name autocompleter implementation
-    Task #5844: Update 'toggle sneak' documentation
 
 0.46.0
 ------
@@ -193,7 +194,7 @@
     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: Data lines in global openmw.cfg take priority over user openmw.cfg
+    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
@@ -211,7 +212,6 @@
     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 #4202: Open .omwaddon files without needing toopen openmw-cs first
     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
@@ -301,7 +301,6 @@
     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 #4971: OpenMW-CS: Make rotations display as degrees instead of radians
     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
@@ -399,7 +398,6 @@
     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 #2159: "Graying out" exhausted dialogue topics
     Feature #2229: Improve pathfinding AI
     Feature #3025: Analogue gamepad movement controls
     Feature #3442: Default values for fallbacks from ini file
@@ -412,6 +410,7 @@
     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
@@ -434,6 +433,7 @@
     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

From 17e0c75d30cc402a4623758faa820652ed8ca764 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Thu, 13 May 2021 16:18:28 +0200
Subject: [PATCH 0881/2859] Some more constexpr in esm/variant.cpp

---
 components/esm/variant.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/components/esm/variant.cpp b/components/esm/variant.cpp
index 3e0417ef72..830e13f3e4 100644
--- a/components/esm/variant.cpp
+++ b/components/esm/variant.cpp
@@ -10,20 +10,20 @@
 
 namespace
 {
-    const uint32_t STRV = ESM::FourCC<'S','T','R','V'>::value;
-    const uint32_t INTV = ESM::FourCC<'I','N','T','V'>::value;
-    const uint32_t FLTV = ESM::FourCC<'F','L','T','V'>::value;
-    const uint32_t STTV = ESM::FourCC<'S','T','T','V'>::value;
+    constexpr uint32_t STRV = ESM::FourCC<'S','T','R','V'>::value;
+    constexpr uint32_t INTV = ESM::FourCC<'I','N','T','V'>::value;
+    constexpr uint32_t FLTV = ESM::FourCC<'F','L','T','V'>::value;
+    constexpr uint32_t STTV = ESM::FourCC<'S','T','T','V'>::value;
 
     template <typename T, bool orDefault = false>
     struct GetValue
     {
-        T operator()(int value) const { return static_cast<T>(value); }
+        constexpr T operator()(int value) const { return static_cast<T>(value); }
 
-        T operator()(float value) const { return static_cast<T>(value); }
+        constexpr T operator()(float value) const { return static_cast<T>(value); }
 
         template <typename V>
-        T operator()(const V&) const
+        constexpr T operator()(const V&) const
         {
             if constexpr (orDefault)
                 return T {};

From aec3c74fa53e52d238c4dfa8808d293e01d4bec5 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Thu, 29 Apr 2021 21:30:25 +0200
Subject: [PATCH 0882/2859] Sprinkle some [[noreturn]] where possible

---
 components/bsa/bsa_file.cpp              | 2 +-
 components/bsa/bsa_file.hpp              | 2 +-
 components/compiler/parser.cpp           | 4 ++--
 components/compiler/parser.hpp           | 4 ++--
 components/esm/esmreader.cpp             | 2 +-
 components/esm/esmreader.hpp             | 2 +-
 components/fontloader/fontloader.cpp     | 2 +-
 components/interpreter/interpreter.cpp   | 4 ++--
 components/interpreter/interpreter.hpp   | 4 ++--
 components/nif/niffile.hpp               | 6 ++----
 components/nifbullet/bulletnifloader.hpp | 2 +-
 components/settings/parser.cpp           | 2 +-
 components/settings/parser.hpp           | 2 +-
 13 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/components/bsa/bsa_file.cpp b/components/bsa/bsa_file.cpp
index 129c2bf454..ecbea5e7d9 100644
--- a/components/bsa/bsa_file.cpp
+++ b/components/bsa/bsa_file.cpp
@@ -33,7 +33,7 @@ using namespace Bsa;
 
 
 /// Error handling
-void BSAFile::fail(const std::string &msg)
+[[noreturn]] void BSAFile::fail(const std::string &msg)
 {
     throw std::runtime_error("BSA Error: " + msg + "\nArchive: " + mFilename);
 }
diff --git a/components/bsa/bsa_file.hpp b/components/bsa/bsa_file.hpp
index f9b4d4fa39..d30fc2feb0 100644
--- a/components/bsa/bsa_file.hpp
+++ b/components/bsa/bsa_file.hpp
@@ -106,7 +106,7 @@ protected:
     Lookup mLookup;
 
     /// Error handling
-    void fail(const std::string &msg);
+    [[noreturn]] void fail(const std::string &msg);
 
     /// Read header information from the input source
     virtual void readHeader();
diff --git a/components/compiler/parser.cpp b/components/compiler/parser.cpp
index ffa393a29e..dc924b1bab 100644
--- a/components/compiler/parser.cpp
+++ b/components/compiler/parser.cpp
@@ -10,7 +10,7 @@ namespace Compiler
 {
     // Report the error and throw an exception.
 
-    void Parser::reportSeriousError (const std::string& message, const TokenLoc& loc)
+    [[noreturn]] void Parser::reportSeriousError (const std::string& message, const TokenLoc& loc)
     {
         mErrorHandler.error (message, loc);
         throw SourceException();
@@ -25,7 +25,7 @@ namespace Compiler
 
     // Report an unexpected EOF condition.
 
-    void Parser::reportEOF()
+    [[noreturn]] void Parser::reportEOF()
     {
         mErrorHandler.endOfFile();
         throw EOFException();
diff --git a/components/compiler/parser.hpp b/components/compiler/parser.hpp
index 2ef6e85b98..1f2a57a489 100644
--- a/components/compiler/parser.hpp
+++ b/components/compiler/parser.hpp
@@ -23,13 +23,13 @@ namespace Compiler
 
         protected:
 
-            void reportSeriousError (const std::string& message, const TokenLoc& loc);
+            [[noreturn]] void reportSeriousError (const std::string& message, const TokenLoc& loc);
             ///< Report the error and throw a exception.
 
             void reportWarning (const std::string& message, const TokenLoc& loc);
             ///< Report the warning without throwing an exception.
 
-            void reportEOF();
+            [[noreturn]] void reportEOF();
             ///< Report an unexpected EOF condition.
 
             ErrorHandler& getErrorHandler();
diff --git a/components/esm/esmreader.cpp b/components/esm/esmreader.cpp
index e3e6a4f335..c9b93100e6 100644
--- a/components/esm/esmreader.cpp
+++ b/components/esm/esmreader.cpp
@@ -315,7 +315,7 @@ std::string ESMReader::getString(int size)
     return std::string (ptr, size);
 }
 
-void ESMReader::fail(const std::string &msg)
+[[noreturn]] void ESMReader::fail(const std::string &msg)
 {
     std::stringstream ss;
 
diff --git a/components/esm/esmreader.hpp b/components/esm/esmreader.hpp
index ea18014b77..3a9734c1b0 100644
--- a/components/esm/esmreader.hpp
+++ b/components/esm/esmreader.hpp
@@ -250,7 +250,7 @@ public:
   void skip(int bytes);
 
   /// Used for error handling
-  void fail(const std::string &msg);
+  [[noreturn]] void fail(const std::string &msg);
 
   /// Sets font encoder for ESM strings
   void setEncoder(ToUTF8::Utf8Encoder* encoder);
diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index b4739110f7..e068fd781b 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -132,7 +132,7 @@ namespace
             return encoder.getUtf8(std::string(1, c));
     }
 
-    void fail (Files::IStreamPtr file, const std::string& fileName, const std::string& message)
+    [[noreturn]] void fail (Files::IStreamPtr file, const std::string& fileName, const std::string& message)
     {
         std::stringstream error;
         error << "Font loading error: " << message;
diff --git a/components/interpreter/interpreter.cpp b/components/interpreter/interpreter.cpp
index 0b636092c3..c04352a90f 100644
--- a/components/interpreter/interpreter.cpp
+++ b/components/interpreter/interpreter.cpp
@@ -81,13 +81,13 @@ namespace Interpreter
         abortUnknownSegment (code);
     }
 
-    void Interpreter::abortUnknownCode (int segment, int opcode)
+    [[noreturn]] void Interpreter::abortUnknownCode (int segment, int opcode)
     {
         const std::string error = "unknown opcode " + std::to_string(opcode) + " in segment " + std::to_string(segment);
         throw std::runtime_error (error);
     }
 
-    void Interpreter::abortUnknownSegment (Type_Code code)
+    [[noreturn]] void Interpreter::abortUnknownSegment (Type_Code code)
     {
         const std::string error = "opcode outside of the allocated segment range: " + std::to_string(code);
         throw std::runtime_error (error);
diff --git a/components/interpreter/interpreter.hpp b/components/interpreter/interpreter.hpp
index ff3bcf7b7c..3aa5e36d58 100644
--- a/components/interpreter/interpreter.hpp
+++ b/components/interpreter/interpreter.hpp
@@ -28,9 +28,9 @@ namespace Interpreter
 
             void execute (Type_Code code);
 
-            void abortUnknownCode (int segment, int opcode);
+            [[noreturn]] void abortUnknownCode (int segment, int opcode);
 
-            void abortUnknownSegment (Type_Code code);
+            [[noreturn]] void abortUnknownSegment (Type_Code code);
 
             void begin();
 
diff --git a/components/nif/niffile.hpp b/components/nif/niffile.hpp
index c6dd8af756..1ed7cbd5d8 100644
--- a/components/nif/niffile.hpp
+++ b/components/nif/niffile.hpp
@@ -92,11 +92,9 @@ public:
     };
 
     /// Used if file parsing fails
-    void fail(const std::string &msg) const
+    [[noreturn]] void fail(const std::string &msg) const
     {
-        std::string err = " NIFFile Error: " + msg;
-        err += "\nFile: " + filename;
-        throw std::runtime_error(err);
+        throw std::runtime_error(" NIFFile Error: " + msg + "\nFile: " + filename);
     }
     /// Used when something goes wrong, but not catastrophically so
     void warn(const std::string &msg) const
diff --git a/components/nifbullet/bulletnifloader.hpp b/components/nifbullet/bulletnifloader.hpp
index 17a0d3e8b9..71c84566a0 100644
--- a/components/nifbullet/bulletnifloader.hpp
+++ b/components/nifbullet/bulletnifloader.hpp
@@ -43,7 +43,7 @@ public:
         Log(Debug::Warning) << "NIFLoader: Warn: " << msg;
     }
 
-    void fail(const std::string &msg)
+    [[noreturn]] void fail(const std::string &msg)
     {
         Log(Debug::Error) << "NIFLoader: Fail: "<< msg;
         abort();
diff --git a/components/settings/parser.cpp b/components/settings/parser.cpp
index 24f359b315..f2419dfdd6 100644
--- a/components/settings/parser.cpp
+++ b/components/settings/parser.cpp
@@ -318,7 +318,7 @@ bool Settings::SettingsFileParser::skipWhiteSpace(size_t& i, std::string& str)
     return i < str.size();
 }
 
-void Settings::SettingsFileParser::fail(const std::string& message)
+[[noreturn]] void Settings::SettingsFileParser::fail(const std::string& message)
 {
     std::stringstream error;
     error << "Error on line " << mLine << " in " << mFile << ":\n" << message;
diff --git a/components/settings/parser.hpp b/components/settings/parser.hpp
index 69e9cdaa41..45b1a18f72 100644
--- a/components/settings/parser.hpp
+++ b/components/settings/parser.hpp
@@ -20,7 +20,7 @@ namespace Settings
         /// @return false if we have reached the end of the string
         bool skipWhiteSpace(size_t& i, std::string& str);
 
-        void fail(const std::string& message);
+        [[noreturn]] void fail(const std::string& message);
 
         std::string mFile;
         int mLine = 0;

From 2c3c603be294d83038cd5731d6aea503ae9e9095 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Thu, 20 May 2021 14:16:44 +0200
Subject: [PATCH 0883/2859] Sprinkle some const in components/to_utf8

---
 components/to_utf8/gen_iconv.cpp  |  2 +-
 components/to_utf8/tables_gen.hpp |  8 ++++----
 components/to_utf8/to_utf8.cpp    |  8 ++++----
 components/to_utf8/to_utf8.hpp    | 10 +++++-----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/components/to_utf8/gen_iconv.cpp b/components/to_utf8/gen_iconv.cpp
index f2d9a42f18..75d83fb1a7 100644
--- a/components/to_utf8/gen_iconv.cpp
+++ b/components/to_utf8/gen_iconv.cpp
@@ -45,7 +45,7 @@ void writeMissing(bool last)
 int write_table(const std::string &charset, const std::string &tableName)
 {
   // Write table header
-  std::cout << "static signed char " << tableName << "[] =\n{\n";
+  std::cout << "const static signed char " << tableName << "[] =\n{\n";
 
   // Open conversion system
   iconv_t cd = iconv_open ("UTF-8", charset.c_str());
diff --git a/components/to_utf8/tables_gen.hpp b/components/to_utf8/tables_gen.hpp
index 14e66eac17..b7659979eb 100644
--- a/components/to_utf8/tables_gen.hpp
+++ b/components/to_utf8/tables_gen.hpp
@@ -8,7 +8,7 @@ namespace ToUTF8
 /// Central European and Eastern European languages that use Latin script,
 /// such as Polish, Czech, Slovak, Hungarian, Slovene, Bosnian, Croatian,
 /// Serbian (Latin script), Romanian and Albanian.
-static signed char windows_1250[] =
+const static signed char windows_1250[] =
 {
     1, 0, 0, 0, 0, 0,
     1, 1, 0, 0, 0, 0,
@@ -270,7 +270,7 @@ static signed char windows_1250[] =
 
 /// Cyrillic alphabet such as Russian, Bulgarian, Serbian Cyrillic
 /// and other languages
-static signed char windows_1251[] =
+const static signed char windows_1251[] =
 {
     1, 0, 0, 0, 0, 0,
     1, 1, 0, 0, 0, 0,
@@ -531,7 +531,7 @@ static signed char windows_1251[] =
 };
 
 /// Latin alphabet used by English and some other Western languages
-static signed char windows_1252[] =
+const static signed char windows_1252[] =
 {
     1, 0, 0, 0, 0, 0,
     1, 1, 0, 0, 0, 0,
@@ -790,7 +790,7 @@ static signed char windows_1252[] =
     2, -61, -66, 0, 0, 0,
     2, -61, -65, 0, 0, 0
 };
-static signed char cp437[] =
+const static signed char cp437[] =
 {
     1, 0, 0, 0, 0, 0,
     1, 1, 0, 0, 0, 0,
diff --git a/components/to_utf8/to_utf8.cpp b/components/to_utf8/to_utf8.cpp
index bcb174b7be..708f4b41aa 100644
--- a/components/to_utf8/to_utf8.cpp
+++ b/components/to_utf8/to_utf8.cpp
@@ -182,7 +182,7 @@ void Utf8Encoder::resize(size_t size)
   is the case, then the ascii parameter is set to true, and the
   caller can optimize for this case.
  */
-size_t Utf8Encoder::getLength(const char* input, bool &ascii)
+size_t Utf8Encoder::getLength(const char* input, bool &ascii) const
 {
     ascii = true;
     size_t len = 0;
@@ -214,7 +214,7 @@ size_t Utf8Encoder::getLength(const char* input, bool &ascii)
 
 // Translate one character 'ch' using the translation array 'arr', and
 // advance the output pointer accordingly.
-void Utf8Encoder::copyFromArray(unsigned char ch, char* &out)
+void Utf8Encoder::copyFromArray(unsigned char ch, char* &out) const
 {
     // Optimize for ASCII values
     if (ch < 128)
@@ -229,7 +229,7 @@ void Utf8Encoder::copyFromArray(unsigned char ch, char* &out)
         *(out++) = *(in++);
 }
 
-size_t Utf8Encoder::getLength2(const char* input, bool &ascii)
+size_t Utf8Encoder::getLength2(const char* input, bool &ascii) const
 {
     ascii = true;
     size_t len = 0;
@@ -273,7 +273,7 @@ size_t Utf8Encoder::getLength2(const char* input, bool &ascii)
     return len;
 }
 
-void Utf8Encoder::copyFromArray2(const char*& chp, char* &out)
+void Utf8Encoder::copyFromArray2(const char*& chp, char* &out) const
 {
     unsigned char ch = *(chp++);
     // Optimize for ASCII values
diff --git a/components/to_utf8/to_utf8.hpp b/components/to_utf8/to_utf8.hpp
index 3f20a51f86..d8c9f09d5d 100644
--- a/components/to_utf8/to_utf8.hpp
+++ b/components/to_utf8/to_utf8.hpp
@@ -42,13 +42,13 @@ namespace ToUTF8
 
         private:
             void resize(size_t size);
-            size_t getLength(const char* input, bool &ascii);
-            void copyFromArray(unsigned char chp, char* &out);
-            size_t getLength2(const char* input, bool &ascii);
-            void copyFromArray2(const char*& chp, char* &out);
+            size_t getLength(const char* input, bool &ascii) const;
+            void copyFromArray(unsigned char chp, char* &out) const;
+            size_t getLength2(const char* input, bool &ascii) const;
+            void copyFromArray2(const char*& chp, char* &out) const;
 
             std::vector<char> mOutput;
-            signed char* translationArray;
+            const signed char* translationArray;
     };
 }
 

From 4dca2c04665679d64fe65d7c3e557389f45bff52 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Thu, 20 May 2021 14:16:58 +0200
Subject: [PATCH 0884/2859] Replace a handrolled memcpy with an actual call to
 memcpy

---
 components/to_utf8/to_utf8.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/to_utf8/to_utf8.cpp b/components/to_utf8/to_utf8.cpp
index 708f4b41aa..f7dc33fcbf 100644
--- a/components/to_utf8/to_utf8.cpp
+++ b/components/to_utf8/to_utf8.cpp
@@ -225,8 +225,8 @@ void Utf8Encoder::copyFromArray(unsigned char ch, char* &out) const
 
     const signed char *in = translationArray + ch*6;
     int len = *(in++);
-    for (int i=0; i<len; i++)
-        *(out++) = *(in++);
+    memcpy(out, in, len);
+    out += len;
 }
 
 size_t Utf8Encoder::getLength2(const char* input, bool &ascii) const

From 2577047b5958ae52b92bf5ee064cde6a04d7a494 Mon Sep 17 00:00:00 2001
From: Alexey Yaryshev <iceknight48@gmail.com>
Date: Tue, 22 Jun 2021 14:51:49 +0000
Subject: [PATCH 0885/2859] Fixed an issue #6101
 (https://gitlab.com/OpenMW/openmw/-/issues/6101)

---
 AUTHORS.md                                      | 1 +
 CHANGELOG.md                                    | 1 +
 apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index 22a18506e8..6a613b1c69 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -27,6 +27,7 @@ Programmers
     Alexander Olofsson (Ananace)
     Alex Rice
     Alex S (docwest)
+    Alexey Yaryshev (skeevert)
     Allofich
     Andrei Kortunov (akortunov)
     AnyOldName3
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 087853db96..285933ad4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
     Bug #3737: Scripts from The Underground 2 .esp do not play (all patched versions)
     Bug #3846: Strings starting with "-" fail to compile if not enclosed in quotes
     Bug #5483: AutoCalc flag is not used to calculate spells cost
+    Bug #6101: Disarming trapped unlocked owned objects isn't considered a crime
 
 0.47.0
 ------
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index f1e40ef7fb..7101139821 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -869,7 +869,7 @@ namespace MWMechanics
         int lockLevel = cellref.getLockLevel();
         if (target.getClass().isDoor() &&
             (lockLevel <= 0 || lockLevel == ESM::UnbreakableLock) &&
-            ptr.getCellRef().getTrap().empty())
+            cellref.getTrap().empty())
         {
             return true;
         }

From 22f7d4eee2d95c32856cc3c352bc709235ba1ee5 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 20 Jun 2021 18:02:11 +0200
Subject: [PATCH 0886/2859] Strip quotes when treating keywords as strings

---
 CHANGELOG.md                         | 1 +
 components/compiler/stringparser.cpp | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 285933ad4f..1229785394 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
     Bug #3737: Scripts from The Underground 2 .esp do not play (all patched versions)
     Bug #3846: Strings starting with "-" fail to compile if not enclosed in quotes
     Bug #5483: AutoCalc flag is not used to calculate spells cost
+    Bug #6066: addtopic "return" does not work from within script. No errors thrown
     Bug #6101: Disarming trapped unlocked owned objects isn't considered a crime
 
 0.47.0
diff --git a/components/compiler/stringparser.cpp b/components/compiler/stringparser.cpp
index 1bacf79410..8b20377e1f 100644
--- a/components/compiler/stringparser.cpp
+++ b/components/compiler/stringparser.cpp
@@ -65,7 +65,11 @@ namespace Compiler
             keyword==Scanner::K_messagebox || keyword==Scanner::K_set ||
             keyword==Scanner::K_to || keyword==Scanner::K_getsquareroot)
         {
-            return parseName (loc.mLiteral, loc, scanner);
+            // pretend this is not a keyword
+            std::string name = loc.mLiteral;
+            if (name.size()>=2 && name[0]=='"' && name[name.size()-1]=='"')
+                name = name.substr (1, name.size()-2);
+            return parseName (name, loc, scanner);
         }
 
         return Parser::parseKeyword (keyword, loc, scanner);

From 5375b8e71b53aef2967bfc26372fe653720538d9 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Wed, 9 Jun 2021 22:25:46 +0200
Subject: [PATCH 0887/2859] Minor optimisation in
 VFS::FileSystemArchive::listResources

When there is no cache, we can fill the `out`
variable as we create it, instead of creating the
cache, and then iterating it to fill `out`.

Thanks to @cemoc for the help!
---
 components/vfs/filesystemarchive.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/components/vfs/filesystemarchive.cpp b/components/vfs/filesystemarchive.cpp
index 6eef4b93ae..35f44f46cd 100644
--- a/components/vfs/filesystemarchive.cpp
+++ b/components/vfs/filesystemarchive.cpp
@@ -40,16 +40,20 @@ namespace VFS
 
                 std::transform(proper.begin() + prefix, proper.end(), std::back_inserter(searchable), normalize_function);
 
-                if (!mIndex.insert (std::make_pair (searchable, file)).second)
+                const auto inserted = mIndex.insert(std::make_pair(searchable, file));
+                if (!inserted.second)
                     Log(Debug::Warning) << "Warning: found duplicate file for '" << proper << "', please check your file system for two files with the same name in different cases.";
+                else
+                    out[inserted.first->first] = &inserted.first->second;
             }
-
             mBuiltIndex = true;
         }
-
-        for (index::iterator it = mIndex.begin(); it != mIndex.end(); ++it)
+        else
         {
-            out[it->first] = &it->second;
+            for (index::iterator it = mIndex.begin(); it != mIndex.end(); ++it)
+            {
+                out[it->first] = &it->second;
+            }
         }
     }
 

From 692615fd3c5eb5f6c66515d1b0c3b2f01e4ae935 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 23 Jun 2021 18:08:49 +0200
Subject: [PATCH 0888/2859] Detach objects from the active grid when attempting
 to get their animation

---
 apps/openmw/mwclass/door.cpp     | 12 +++++++-----
 apps/openmw/mwworld/worldimp.cpp |  9 ++++++++-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index 3a5ff0d9ae..849960a093 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -132,12 +132,14 @@ namespace MWClass
             MWBase::Environment::get().getWorld()->getMaxActivationDistance())
         {
             MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(ptr);
+            if(animation)
+            {
+                const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
+                int index = ESM::MagicEffect::effectStringToId("sEffectTelekinesis");
+                const ESM::MagicEffect *effect = store.get<ESM::MagicEffect>().find(index);
 
-            const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
-            int index = ESM::MagicEffect::effectStringToId("sEffectTelekinesis");
-            const ESM::MagicEffect *effect = store.get<ESM::MagicEffect>().find(index);
-
-            animation->addSpellCastGlow(effect, 1); // 1 second glow to match the time taken for a door opening or closing
+                animation->addSpellCastGlow(effect, 1); // 1 second glow to match the time taken for a door opening or closing
+            }
         }
 
         const std::string keyId = ptr.getCellRef().getKey();
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 611e535c88..8fecee853f 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -2552,7 +2552,14 @@ namespace MWWorld
 
     MWRender::Animation* World::getAnimation(const MWWorld::Ptr &ptr)
     {
-        return mRendering->getAnimation(ptr);
+        auto* animation = mRendering->getAnimation(ptr);
+        if(!animation) {
+            mWorldScene->removeFromPagedRefs(ptr);
+            animation = mRendering->getAnimation(ptr);
+            if(animation)
+                mRendering->pagingBlacklistObject(mStore.find(ptr.getCellRef().getRefId()), ptr);
+        }
+        return animation;
     }
 
     const MWRender::Animation* World::getAnimation(const MWWorld::ConstPtr &ptr) const

From 33e035cc95e08d46fd67674a3cefd0846606feea Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Wed, 23 Jun 2021 22:19:08 +0200
Subject: [PATCH 0889/2859] Fix two excessive type casting instances

No need to to a string -> char* -> string dance.
---
 components/esm/weatherstate.cpp      | 2 +-
 components/resource/imagemanager.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/esm/weatherstate.cpp b/components/esm/weatherstate.cpp
index 3d94a445be..cd1a82b0b7 100644
--- a/components/esm/weatherstate.cpp
+++ b/components/esm/weatherstate.cpp
@@ -49,7 +49,7 @@ namespace ESM
 
     void WeatherState::save(ESMWriter& esm) const
     {
-        esm.writeHNCString(currentRegionRecord, mCurrentRegion.c_str());
+        esm.writeHNCString(currentRegionRecord, mCurrentRegion);
         esm.writeHNT(timePassedRecord, mTimePassed);
         esm.writeHNT(fastForwardRecord, mFastForward);
         esm.writeHNT(weatherUpdateTimeRecord, mWeatherUpdateTime);
diff --git a/components/resource/imagemanager.cpp b/components/resource/imagemanager.cpp
index dd34ed1a1f..37e76359ff 100644
--- a/components/resource/imagemanager.cpp
+++ b/components/resource/imagemanager.cpp
@@ -94,7 +94,7 @@ namespace Resource
             Files::IStreamPtr stream;
             try
             {
-                stream = mVFS->get(normalized.c_str());
+                stream = mVFS->get(normalized);
             }
             catch (std::exception& e)
             {

From 1123dc46ee69e6bee7f2c6d96c4d4c0d58cc7608 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Wed, 23 Jun 2021 23:13:59 +0200
Subject: [PATCH 0890/2859] Add a ton of const refs

---
 apps/openmw/mwbase/mechanicsmanager.hpp         | 2 +-
 apps/openmw/mwgui/dialogue.cpp                  | 2 +-
 apps/openmw/mwgui/dialogue.hpp                  | 2 +-
 apps/openmw/mwmechanics/activespells.cpp        | 2 +-
 apps/openmw/mwmechanics/activespells.hpp        | 2 +-
 apps/openmw/mwmechanics/disease.hpp             | 2 +-
 apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 2 +-
 apps/openmw/mwmechanics/mechanicsmanagerimp.hpp | 2 +-
 apps/openmw/mwmechanics/pathfinding.hpp         | 2 +-
 apps/openmw/mwmechanics/pickpocket.cpp          | 2 +-
 apps/openmw/mwmechanics/pickpocket.hpp          | 2 +-
 apps/openmw/mwmechanics/weapontype.cpp          | 2 +-
 apps/openmw/mwmechanics/weapontype.hpp          | 2 +-
 apps/openmw/mwphysics/physicssystem.cpp         | 4 ++--
 apps/openmw/mwphysics/physicssystem.hpp         | 2 +-
 apps/openmw/mwphysics/projectile.cpp            | 4 ++--
 apps/openmw/mwphysics/projectile.hpp            | 4 ++--
 apps/openmw/mwphysics/raycasting.hpp            | 2 +-
 apps/openmw/mwscript/interpretercontext.cpp     | 2 +-
 apps/openmw/mwscript/interpretercontext.hpp     | 2 +-
 apps/openmw/mwscript/statsextensions.cpp        | 2 +-
 apps/openmw/mwworld/cellstore.cpp               | 2 +-
 apps/openmw/mwworld/cellstore.hpp               | 2 +-
 apps/openmw/mwworld/cellvisitors.hpp            | 2 +-
 apps/openmw/mwworld/projectilemanager.cpp       | 2 +-
 apps/openmw/mwworld/projectilemanager.hpp       | 4 ++--
 apps/openmw/mwworld/worldimp.cpp                | 4 ++--
 components/bsa/compressedbsafile.cpp            | 2 +-
 components/bsa/compressedbsafile.hpp            | 2 +-
 components/detournavigator/navmeshmanager.cpp   | 2 +-
 components/detournavigator/navmeshmanager.hpp   | 2 +-
 components/misc/stringops.hpp                   | 2 +-
 components/sceneutil/mwshadowtechnique.cpp      | 2 +-
 components/sceneutil/osgacontroller.cpp         | 4 ++--
 components/sceneutil/osgacontroller.hpp         | 4 ++--
 components/sceneutil/util.cpp                   | 2 +-
 components/sceneutil/util.hpp                   | 2 +-
 components/shader/shadermanager.cpp             | 2 +-
 38 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/apps/openmw/mwbase/mechanicsmanager.hpp b/apps/openmw/mwbase/mechanicsmanager.hpp
index 967504552d..3b0803e9be 100644
--- a/apps/openmw/mwbase/mechanicsmanager.hpp
+++ b/apps/openmw/mwbase/mechanicsmanager.hpp
@@ -88,7 +88,7 @@ namespace MWBase
             virtual void setPlayerClass (const ESM::Class& class_) = 0;
             ///< Set player class to custom class.
 
-            virtual void restoreDynamicStats(MWWorld::Ptr actor, double hours, bool sleep) = 0;
+            virtual void restoreDynamicStats(const MWWorld::Ptr& actor, double hours, bool sleep) = 0;
 
             virtual void rest(double hours, bool sleep) = 0;
             ///< If the player is sleeping or waiting, this should be called every hour.
diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp
index 0fda54ebab..93180adad2 100644
--- a/apps/openmw/mwgui/dialogue.cpp
+++ b/apps/openmw/mwgui/dialogue.cpp
@@ -488,7 +488,7 @@ namespace MWGui
         mHistoryContents.clear();
     }
 
-    bool DialogueWindow::setKeywords(std::list<std::string> keyWords)
+    bool DialogueWindow::setKeywords(const std::list<std::string>& keyWords)
     {
         if (mKeywords == keyWords && isCompanion() == mIsCompanion)
             return false;
diff --git a/apps/openmw/mwgui/dialogue.hpp b/apps/openmw/mwgui/dialogue.hpp
index ac6303e20a..aff09c0211 100644
--- a/apps/openmw/mwgui/dialogue.hpp
+++ b/apps/openmw/mwgui/dialogue.hpp
@@ -118,7 +118,7 @@ namespace MWGui
         void setPtr(const MWWorld::Ptr& actor) override;
 
         /// @return true if stale keywords were updated successfully
-        bool setKeywords(std::list<std::string> keyWord);
+        bool setKeywords(const std::list<std::string>& keyWord);
 
         void addResponse (const std::string& title, const std::string& text, bool needMargin = true);
 
diff --git a/apps/openmw/mwmechanics/activespells.cpp b/apps/openmw/mwmechanics/activespells.cpp
index 928293e649..319d797257 100644
--- a/apps/openmw/mwmechanics/activespells.cpp
+++ b/apps/openmw/mwmechanics/activespells.cpp
@@ -140,7 +140,7 @@ namespace MWMechanics
         return mSpells;
     }
 
-    void ActiveSpells::addSpell(const std::string &id, bool stack, std::vector<ActiveEffect> effects,
+    void ActiveSpells::addSpell(const std::string &id, bool stack, const std::vector<ActiveEffect>& effects,
                                 const std::string &displayName, int casterActorId)
     {
         TContainer::iterator it(mSpells.find(id));
diff --git a/apps/openmw/mwmechanics/activespells.hpp b/apps/openmw/mwmechanics/activespells.hpp
index 54f662fc26..8bc29aa444 100644
--- a/apps/openmw/mwmechanics/activespells.hpp
+++ b/apps/openmw/mwmechanics/activespells.hpp
@@ -74,7 +74,7 @@ namespace MWMechanics
             /// \param effects
             /// \param displayName Name for display in magic menu.
             ///
-            void addSpell (const std::string& id, bool stack, std::vector<ActiveEffect> effects,
+            void addSpell (const std::string& id, bool stack, const std::vector<ActiveEffect>& effects,
                            const std::string& displayName, int casterActorId);
 
             /// Removes the active effects from this spell/potion/.. with \a id
diff --git a/apps/openmw/mwmechanics/disease.hpp b/apps/openmw/mwmechanics/disease.hpp
index 7933c927e5..5d4bfb682f 100644
--- a/apps/openmw/mwmechanics/disease.hpp
+++ b/apps/openmw/mwmechanics/disease.hpp
@@ -21,7 +21,7 @@ namespace MWMechanics
     /// Call when \a actor has got in contact with \a carrier (e.g. hit by him, or loots him)
     /// @param actor The actor that will potentially catch diseases. Currently only the player can catch diseases.
     /// @param carrier The disease carrier.
-    inline void diseaseContact (MWWorld::Ptr actor, MWWorld::Ptr carrier)
+    inline void diseaseContact (const MWWorld::Ptr& actor, const MWWorld::Ptr& carrier)
     {
         if (!carrier.getClass().isActor() || actor != getPlayer())
             return;
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 7101139821..0d7dd187f7 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -402,7 +402,7 @@ namespace MWMechanics
         mActors.rest(hours, sleep);
     }
 
-    void MechanicsManager::restoreDynamicStats(MWWorld::Ptr actor, double hours, bool sleep)
+    void MechanicsManager::restoreDynamicStats(const MWWorld::Ptr& actor, double hours, bool sleep)
     {
         mActors.restoreDynamicStats(actor, hours, sleep);
     }
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
index 3f2c3f5e98..72eb044fa0 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
@@ -75,7 +75,7 @@ namespace MWMechanics
             void setPlayerClass (const ESM::Class& class_) override;
             ///< Set player class to custom class.
 
-            void restoreDynamicStats(MWWorld::Ptr actor, double hours, bool sleep) override;
+            void restoreDynamicStats(const MWWorld::Ptr& actor, double hours, bool sleep) override;
 
             void rest(double hours, bool sleep) override;
             ///< If the player is sleeping or waiting, this should be called every hour.
diff --git a/apps/openmw/mwmechanics/pathfinding.hpp b/apps/openmw/mwmechanics/pathfinding.hpp
index 987f2c6603..aa6a79c4eb 100644
--- a/apps/openmw/mwmechanics/pathfinding.hpp
+++ b/apps/openmw/mwmechanics/pathfinding.hpp
@@ -167,7 +167,7 @@ namespace MWMechanics
             // Caller needs to be careful for very short distances (i.e. less than 1)
             // or when accumuating the results i.e. (a + b)^2 != a^2 + b^2
             //
-            static float distanceSquared(ESM::Pathgrid::Point point, const osg::Vec3f& pos)
+            static float distanceSquared(const ESM::Pathgrid::Point& point, const osg::Vec3f& pos)
             {
                 return (MWMechanics::PathFinder::makeOsgVec3(point) - pos).length2();
             }
diff --git a/apps/openmw/mwmechanics/pickpocket.cpp b/apps/openmw/mwmechanics/pickpocket.cpp
index 05e8a03930..038753f7d1 100644
--- a/apps/openmw/mwmechanics/pickpocket.cpp
+++ b/apps/openmw/mwmechanics/pickpocket.cpp
@@ -53,7 +53,7 @@ namespace MWMechanics
         }
     }
 
-    bool Pickpocket::pick(MWWorld::Ptr item, int count)
+    bool Pickpocket::pick(const MWWorld::Ptr& item, int count)
     {
         float stackValue = static_cast<float>(item.getClass().getValue(item) * count);
         float fPickPocketMod = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>()
diff --git a/apps/openmw/mwmechanics/pickpocket.hpp b/apps/openmw/mwmechanics/pickpocket.hpp
index 4de1e37f84..0957b7a680 100644
--- a/apps/openmw/mwmechanics/pickpocket.hpp
+++ b/apps/openmw/mwmechanics/pickpocket.hpp
@@ -13,7 +13,7 @@ namespace MWMechanics
 
         /// Steal some items
         /// @return Was the thief detected?
-        bool pick (MWWorld::Ptr item, int count);
+        bool pick (const MWWorld::Ptr& item, int count);
         /// End the pickpocketing process
         /// @return Was the thief detected?
         bool finish ();
diff --git a/apps/openmw/mwmechanics/weapontype.cpp b/apps/openmw/mwmechanics/weapontype.cpp
index 2f8e45f7ff..feecd468ad 100644
--- a/apps/openmw/mwmechanics/weapontype.cpp
+++ b/apps/openmw/mwmechanics/weapontype.cpp
@@ -4,7 +4,7 @@
 
 namespace MWMechanics
 {
-    MWWorld::ContainerStoreIterator getActiveWeapon(MWWorld::Ptr actor, int *weaptype)
+    MWWorld::ContainerStoreIterator getActiveWeapon(const MWWorld::Ptr& actor, int *weaptype)
     {
         MWWorld::InventoryStore &inv = actor.getClass().getInventoryStore(actor);
         CreatureStats &stats = actor.getClass().getCreatureStats(actor);
diff --git a/apps/openmw/mwmechanics/weapontype.hpp b/apps/openmw/mwmechanics/weapontype.hpp
index 09fa73c065..4d10e9b1c5 100644
--- a/apps/openmw/mwmechanics/weapontype.hpp
+++ b/apps/openmw/mwmechanics/weapontype.hpp
@@ -261,7 +261,7 @@ namespace MWMechanics
         }
     };
 
-    MWWorld::ContainerStoreIterator getActiveWeapon(MWWorld::Ptr actor, int *weaptype);
+    MWWorld::ContainerStoreIterator getActiveWeapon(const MWWorld::Ptr& actor, int *weaptype);
 
     const ESM::WeaponType* getWeaponType(const int weaponType);
 }
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 833bb9a161..091d8b1612 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -261,7 +261,7 @@ namespace MWPhysics
         return 0.f;
     }
 
-    RayCastingResult PhysicsSystem::castRay(const osg::Vec3f &from, const osg::Vec3f &to, const MWWorld::ConstPtr& ignore, std::vector<MWWorld::Ptr> targets, int mask, int group) const
+    RayCastingResult PhysicsSystem::castRay(const osg::Vec3f &from, const osg::Vec3f &to, const MWWorld::ConstPtr& ignore, const std::vector<MWWorld::Ptr>& targets, int mask, int group) const
     {
         if (from == to)
         {
@@ -290,7 +290,7 @@ namespace MWPhysics
 
         if (!targets.empty())
         {
-            for (MWWorld::Ptr& target : targets)
+            for (const MWWorld::Ptr& target : targets)
             {
                 const Actor* actor = getActor(target);
                 if (actor)
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 3d2a3c580d..bd50bd915a 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -175,7 +175,7 @@ namespace MWPhysics
 
             /// @param me Optional, a Ptr to ignore in the list of results. targets are actors to filter for, ignoring all other actors.
             RayCastingResult castRay(const osg::Vec3f &from, const osg::Vec3f &to, const MWWorld::ConstPtr& ignore = MWWorld::ConstPtr(),
-                    std::vector<MWWorld::Ptr> targets = std::vector<MWWorld::Ptr>(),
+                    const std::vector<MWWorld::Ptr>& targets = std::vector<MWWorld::Ptr>(),
                     int mask = CollisionType_World|CollisionType_HeightMap|CollisionType_Actor|CollisionType_Door, int group=0xff) const override;
 
             RayCastingResult castSphere(const osg::Vec3f& from, const osg::Vec3f& to, float radius) const override;
diff --git a/apps/openmw/mwphysics/projectile.cpp b/apps/openmw/mwphysics/projectile.cpp
index 252da0a687..0a6e9ac123 100644
--- a/apps/openmw/mwphysics/projectile.cpp
+++ b/apps/openmw/mwphysics/projectile.cpp
@@ -78,7 +78,7 @@ bool Projectile::canTraverseWater() const
     return mCanCrossWaterSurface;
 }
 
-void Projectile::hit(MWWorld::Ptr target, btVector3 pos, btVector3 normal)
+void Projectile::hit(const MWWorld::Ptr& target, btVector3 pos, btVector3 normal)
 {
     if (!mActive.load(std::memory_order_acquire))
         return;
@@ -95,7 +95,7 @@ MWWorld::Ptr Projectile::getCaster() const
     return mCaster;
 }
 
-void Projectile::setCaster(MWWorld::Ptr caster)
+void Projectile::setCaster(const MWWorld::Ptr& caster)
 {
     std::scoped_lock lock(mMutex);
     mCaster = caster;
diff --git a/apps/openmw/mwphysics/projectile.hpp b/apps/openmw/mwphysics/projectile.hpp
index 81c33d2a5e..7bcf33b38d 100644
--- a/apps/openmw/mwphysics/projectile.hpp
+++ b/apps/openmw/mwphysics/projectile.hpp
@@ -58,11 +58,11 @@ namespace MWPhysics
         }
 
         MWWorld::Ptr getCaster() const;
-        void setCaster(MWWorld::Ptr caster);
+        void setCaster(const MWWorld::Ptr& caster);
 
         bool canTraverseWater() const;
 
-        void hit(MWWorld::Ptr target, btVector3 pos, btVector3 normal);
+        void hit(const MWWorld::Ptr& target, btVector3 pos, btVector3 normal);
 
         void setValidTargets(const std::vector<MWWorld::Ptr>& targets);
         bool isValidTarget(const MWWorld::Ptr& target) const;
diff --git a/apps/openmw/mwphysics/raycasting.hpp b/apps/openmw/mwphysics/raycasting.hpp
index 7c8375cb5a..e13e745fec 100644
--- a/apps/openmw/mwphysics/raycasting.hpp
+++ b/apps/openmw/mwphysics/raycasting.hpp
@@ -28,7 +28,7 @@ namespace MWPhysics
 
             /// @param me Optional, a Ptr to ignore in the list of results. targets are actors to filter for, ignoring all other actors.
             virtual RayCastingResult castRay(const osg::Vec3f &from, const osg::Vec3f &to, const MWWorld::ConstPtr& ignore = MWWorld::ConstPtr(),
-                    std::vector<MWWorld::Ptr> targets = std::vector<MWWorld::Ptr>(),
+                    const std::vector<MWWorld::Ptr>& targets = std::vector<MWWorld::Ptr>(),
                     int mask = CollisionType_World|CollisionType_HeightMap|CollisionType_Actor|CollisionType_Door, int group=0xff) const = 0;
 
             virtual RayCastingResult castSphere(const osg::Vec3f& from, const osg::Vec3f& to, float radius) const = 0;
diff --git a/apps/openmw/mwscript/interpretercontext.cpp b/apps/openmw/mwscript/interpretercontext.cpp
index 2e8f72e629..6d7dcdda1d 100644
--- a/apps/openmw/mwscript/interpretercontext.cpp
+++ b/apps/openmw/mwscript/interpretercontext.cpp
@@ -415,7 +415,7 @@ namespace MWScript
         return  MWBase::Environment::get().getWorld()->getCellName();
     }
 
-    void InterpreterContext::executeActivation(MWWorld::Ptr ptr, MWWorld::Ptr actor)
+    void InterpreterContext::executeActivation(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor)
     {
         std::shared_ptr<MWWorld::Action> action = (ptr.getClass().activate(ptr, actor));
         action->execute (actor);
diff --git a/apps/openmw/mwscript/interpretercontext.hpp b/apps/openmw/mwscript/interpretercontext.hpp
index 84982f6356..ee40883eac 100644
--- a/apps/openmw/mwscript/interpretercontext.hpp
+++ b/apps/openmw/mwscript/interpretercontext.hpp
@@ -111,7 +111,7 @@ namespace MWScript
 
             std::string getCurrentCellName() const override;
 
-            void executeActivation(MWWorld::Ptr ptr, MWWorld::Ptr actor);
+            void executeActivation(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor);
             ///< Execute the activation action for this ptr. If ptr is mActivated, mark activation as handled.
 
             int getMemberShort (const std::string& id, const std::string& name, bool global) const override;
diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp
index ab3287c9a4..073312f538 100644
--- a/apps/openmw/mwscript/statsextensions.cpp
+++ b/apps/openmw/mwscript/statsextensions.cpp
@@ -31,7 +31,7 @@
 
 namespace
 {
-    std::string getDialogueActorFaction(MWWorld::ConstPtr actor)
+    std::string getDialogueActorFaction(const MWWorld::ConstPtr& actor)
     {
         std::string factionId = actor.getClass().getPrimaryFaction(actor);
         if (factionId.empty())
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 2e2735e11a..051273f21d 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -1162,7 +1162,7 @@ namespace MWWorld
         update(mBooks.mList);
     }
 
-    void MWWorld::CellStore::checkItem(Ptr ptr)
+    void MWWorld::CellStore::checkItem(const Ptr& ptr)
     {
         if (ptr.getClass().getEnchantment(ptr).empty())
             return;
diff --git a/apps/openmw/mwworld/cellstore.hpp b/apps/openmw/mwworld/cellstore.hpp
index edd8577ae0..6e927fbea6 100644
--- a/apps/openmw/mwworld/cellstore.hpp
+++ b/apps/openmw/mwworld/cellstore.hpp
@@ -127,7 +127,7 @@ namespace MWWorld
 
             void updateRechargingItems();
             void rechargeItems(float duration);
-            void checkItem(Ptr ptr);
+            void checkItem(const Ptr& ptr);
 
             // helper function for forEachInternal
             template<class Visitor, class List>
diff --git a/apps/openmw/mwworld/cellvisitors.hpp b/apps/openmw/mwworld/cellvisitors.hpp
index e68b383b77..99bbebc126 100644
--- a/apps/openmw/mwworld/cellvisitors.hpp
+++ b/apps/openmw/mwworld/cellvisitors.hpp
@@ -13,7 +13,7 @@ namespace MWWorld
     {
         std::vector<MWWorld::Ptr> mObjects;
 
-        bool operator() (MWWorld::Ptr ptr)
+        bool operator() (const MWWorld::Ptr& ptr)
         {
             if (ptr.getRefData().getBaseNode())
             {
diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index 4f0a2098f0..439f5a4605 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -325,7 +325,7 @@ namespace MWWorld
         mMagicBolts.push_back(state);
     }
 
-    void ProjectileManager::launchProjectile(Ptr actor, ConstPtr projectile, const osg::Vec3f &pos, const osg::Quat &orient, Ptr bow, float speed, float attackStrength)
+    void ProjectileManager::launchProjectile(const Ptr& actor, const ConstPtr& projectile, const osg::Vec3f &pos, const osg::Quat &orient, const Ptr& bow, float speed, float attackStrength)
     {
         ProjectileState state;
         state.mActorId = actor.getClass().getCreatureStats(actor).getActorId();
diff --git a/apps/openmw/mwworld/projectilemanager.hpp b/apps/openmw/mwworld/projectilemanager.hpp
index e4bcae1ae4..4dc250dc5f 100644
--- a/apps/openmw/mwworld/projectilemanager.hpp
+++ b/apps/openmw/mwworld/projectilemanager.hpp
@@ -51,8 +51,8 @@ namespace MWWorld
         /// If caster is an actor, the actor's facing orientation is used. Otherwise fallbackDirection is used.
         void launchMagicBolt (const std::string &spellId, const MWWorld::Ptr& caster, const osg::Vec3f& fallbackDirection);
 
-        void launchProjectile (MWWorld::Ptr actor, MWWorld::ConstPtr projectile,
-                                       const osg::Vec3f& pos, const osg::Quat& orient, MWWorld::Ptr bow, float speed, float attackStrength);
+        void launchProjectile (const MWWorld::Ptr& actor, const MWWorld::ConstPtr& projectile,
+                                       const osg::Vec3f& pos, const osg::Quat& orient, const MWWorld::Ptr& bow, float speed, float attackStrength);
 
         void updateCasters();
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 611e535c88..8a0bd46f27 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -753,7 +753,7 @@ namespace MWWorld
 
         FindContainerVisitor(const ConstPtr& containedPtr) : mContainedPtr(containedPtr) {}
 
-        bool operator() (Ptr ptr)
+        bool operator() (const Ptr& ptr)
         {
             if (mContainedPtr.getContainerStore() == &ptr.getClass().getContainerStore(ptr))
             {
@@ -3836,7 +3836,7 @@ namespace MWWorld
 
     struct ResetActorsVisitor
     {
-        bool operator() (Ptr ptr)
+        bool operator() (const Ptr& ptr)
         {
             if (ptr.getClass().isActor() && ptr.getCellRef().hasContentFile())
             {
diff --git a/components/bsa/compressedbsafile.cpp b/components/bsa/compressedbsafile.cpp
index 09a05d2f5f..f066489184 100644
--- a/components/bsa/compressedbsafile.cpp
+++ b/components/bsa/compressedbsafile.cpp
@@ -406,7 +406,7 @@ Files::IStreamPtr CompressedBSAFile::getFile(const FileRecord& fileRecord)
     return std::shared_ptr<std::istream>(memoryStreamPtr, (std::istream*)memoryStreamPtr.get());
 }
 
-BsaVersion CompressedBSAFile::detectVersion(std::string filePath)
+BsaVersion CompressedBSAFile::detectVersion(const std::string& filePath)
 {
     namespace bfs = boost::filesystem;
     bfs::ifstream input(bfs::path(filePath), std::ios_base::binary);
diff --git a/components/bsa/compressedbsafile.hpp b/components/bsa/compressedbsafile.hpp
index 215a1fc494..ac6e6fdf78 100644
--- a/components/bsa/compressedbsafile.hpp
+++ b/components/bsa/compressedbsafile.hpp
@@ -87,7 +87,7 @@ namespace Bsa
         virtual ~CompressedBSAFile();
 
         //checks version of BSA from file header
-        static BsaVersion detectVersion(std::string filePath);
+        static BsaVersion detectVersion(const std::string& filePath);
 
         /// Read header information from the input source
         void readHeader() override;
diff --git a/components/detournavigator/navmeshmanager.cpp b/components/detournavigator/navmeshmanager.cpp
index de4c21c68a..c42fb5c4be 100644
--- a/components/detournavigator/navmeshmanager.cpp
+++ b/components/detournavigator/navmeshmanager.cpp
@@ -133,7 +133,7 @@ namespace DetourNavigator
             addChangedTile(tile, ChangeType::update);
     }
 
-    void NavMeshManager::update(osg::Vec3f playerPosition, const osg::Vec3f& agentHalfExtents)
+    void NavMeshManager::update(const osg::Vec3f& playerPosition, const osg::Vec3f& agentHalfExtents)
     {
         const auto playerTile = getTilePosition(mSettings, toNavMeshCoordinates(mSettings, playerPosition));
         auto& lastRevision = mLastRecastMeshManagerRevision[agentHalfExtents];
diff --git a/components/detournavigator/navmeshmanager.hpp b/components/detournavigator/navmeshmanager.hpp
index 760ddb6b30..b176515e3b 100644
--- a/components/detournavigator/navmeshmanager.hpp
+++ b/components/detournavigator/navmeshmanager.hpp
@@ -43,7 +43,7 @@ namespace DetourNavigator
 
         void removeOffMeshConnections(const ObjectId id);
 
-        void update(osg::Vec3f playerPosition, const osg::Vec3f& agentHalfExtents);
+        void update(const osg::Vec3f& playerPosition, const osg::Vec3f& agentHalfExtents);
 
         void wait(Loading::Listener& listener, WaitConditionType waitConditionType);
 
diff --git a/components/misc/stringops.hpp b/components/misc/stringops.hpp
index 48deaa9991..41effafa88 100644
--- a/components/misc/stringops.hpp
+++ b/components/misc/stringops.hpp
@@ -279,7 +279,7 @@ public:
     // TODO: use the std::string_view once we will use the C++17.
     // It should allow us to avoid data copying while we still will support both string and literal arguments.
 
-    static inline void replaceAll(std::string& data, std::string toSearch, std::string replaceStr)
+    static inline void replaceAll(std::string& data, const std::string& toSearch, const std::string& replaceStr)
     {
         size_t pos = data.find(toSearch);
 
diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
index 88d44d2f69..9209532f7e 100644
--- a/components/sceneutil/mwshadowtechnique.cpp
+++ b/components/sceneutil/mwshadowtechnique.cpp
@@ -1996,7 +1996,7 @@ struct ConvexHull
         }
     };
 
-    Vertices findInternalEdges(osg::Vec3d mainVertex, Vertices connectedVertices)
+    Vertices findInternalEdges(const osg::Vec3d& mainVertex, const Vertices& connectedVertices)
     {
         Vertices internalEdgeVertices;
         for (const auto& vertex : connectedVertices)
diff --git a/components/sceneutil/osgacontroller.cpp b/components/sceneutil/osgacontroller.cpp
index b2d819117f..02c9558ab3 100644
--- a/components/sceneutil/osgacontroller.cpp
+++ b/components/sceneutil/osgacontroller.cpp
@@ -153,7 +153,7 @@ namespace SceneUtil
         return osg::Vec3f();
     }
 
-    void OsgAnimationController::update(float time, std::string animationName)
+    void OsgAnimationController::update(float time, const std::string& animationName)
     {
         for (const auto& mergedAnimationTrack : mMergedAnimationTracks)
         {
@@ -190,7 +190,7 @@ namespace SceneUtil
         traverse(node, nv);
     }
 
-    void OsgAnimationController::setEmulatedAnimations(std::vector<EmulatedAnimation> emulatedAnimations)
+    void OsgAnimationController::setEmulatedAnimations(const std::vector<EmulatedAnimation>& emulatedAnimations)
     {
         mEmulatedAnimations = emulatedAnimations;
     }
diff --git a/components/sceneutil/osgacontroller.hpp b/components/sceneutil/osgacontroller.hpp
index f1c1584c2a..46538fa813 100644
--- a/components/sceneutil/osgacontroller.hpp
+++ b/components/sceneutil/osgacontroller.hpp
@@ -58,13 +58,13 @@ namespace SceneUtil
         osg::Vec3f getTranslation(float time) const override;
 
         /// @brief Calls animation track update()
-        void update(float time, std::string animationName);
+        void update(float time, const std::string& animationName);
 
         /// @brief Called every frame for osgAnimation
         void operator() (osg::Node*, osg::NodeVisitor*) override;
 
         /// @brief Sets details of the animations
-        void setEmulatedAnimations(std::vector<EmulatedAnimation> emulatedAnimations);
+        void setEmulatedAnimations(const std::vector<EmulatedAnimation>& emulatedAnimations);
 
         /// @brief Adds an animation track to a model
         void addMergedAnimationTrack(osg::ref_ptr<Resource::Animation> animationTrack);
diff --git a/components/sceneutil/util.cpp b/components/sceneutil/util.cpp
index 1fe3685726..fb5264e224 100644
--- a/components/sceneutil/util.cpp
+++ b/components/sceneutil/util.cpp
@@ -218,7 +218,7 @@ bool hasUserDescription(const osg::Node* node, const std::string pattern)
     return false;
 }
 
-osg::ref_ptr<GlowUpdater> addEnchantedGlow(osg::ref_ptr<osg::Node> node, Resource::ResourceSystem* resourceSystem, osg::Vec4f glowColor, float glowDuration)
+osg::ref_ptr<GlowUpdater> addEnchantedGlow(osg::ref_ptr<osg::Node> node, Resource::ResourceSystem* resourceSystem, const osg::Vec4f& glowColor, float glowDuration)
 {
     std::vector<osg::ref_ptr<osg::Texture2D> > textures;
     for (int i=0; i<32; ++i)
diff --git a/components/sceneutil/util.hpp b/components/sceneutil/util.hpp
index 8103ed87a8..72a368b06a 100644
--- a/components/sceneutil/util.hpp
+++ b/components/sceneutil/util.hpp
@@ -60,7 +60,7 @@ namespace SceneUtil
 
     bool hasUserDescription(const osg::Node* node, const std::string pattern);
 
-    osg::ref_ptr<GlowUpdater> addEnchantedGlow(osg::ref_ptr<osg::Node> node, Resource::ResourceSystem* resourceSystem, osg::Vec4f glowColor, float glowDuration=-1);
+    osg::ref_ptr<GlowUpdater> addEnchantedGlow(osg::ref_ptr<osg::Node> node, Resource::ResourceSystem* resourceSystem, const osg::Vec4f& glowColor, float glowDuration=-1);
 
     // Alpha-to-coverage requires a multisampled framebuffer, so we need to set that up for RTTs
     bool attachAlphaToCoverageFriendlyFramebufferToCamera(osg::Camera* camera, osg::Camera::BufferComponent buffer, osg::Texture* texture, unsigned int level = 0, unsigned int face = 0, bool mipMapGeneration = false);
diff --git a/components/shader/shadermanager.cpp b/components/shader/shadermanager.cpp
index 1635d13db7..9b057cdfc6 100644
--- a/components/shader/shadermanager.cpp
+++ b/components/shader/shadermanager.cpp
@@ -75,7 +75,7 @@ namespace Shader
     // Recursively replaces include statements with the actual source of the included files.
     // Adjusts #line statements accordingly and detects cyclic includes.
     // includingFiles is the set of files that include this file directly or indirectly, and is intentionally not a reference to allow automatic cleanup.
-    static bool parseIncludes(boost::filesystem::path shaderPath, std::string& source, const std::string& fileName, int& fileNumber, std::set<boost::filesystem::path> includingFiles)
+    static bool parseIncludes(const boost::filesystem::path& shaderPath, std::string& source, const std::string& fileName, int& fileNumber, std::set<boost::filesystem::path> includingFiles)
     {
         // An include is cyclic if it is being included by itself
         if (includingFiles.insert(shaderPath/fileName).second == false)

From 895864099cee6c3175fa7edd6c10460da332636d Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Wed, 23 Jun 2021 23:29:14 +0200
Subject: [PATCH 0891/2859] Simplify NodeMapVisitor::apply

No need to run a find() before a std::replace
---
 components/sceneutil/visitor.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/components/sceneutil/visitor.cpp b/components/sceneutil/visitor.cpp
index 60f99b2fef..1f5a0ea4cf 100644
--- a/components/sceneutil/visitor.cpp
+++ b/components/sceneutil/visitor.cpp
@@ -65,11 +65,7 @@ namespace SceneUtil
         if (trans.libraryName() == std::string("osgAnimation"))
         {
             // Convert underscores to whitespaces as a workaround for Collada (OpenMW's animation system uses whitespace-separated names)
-            std::string underscore = "_";
-            std::size_t foundUnderscore = originalNodeName.find(underscore);
-
-            if (foundUnderscore != std::string::npos)
-                std::replace(originalNodeName.begin(), originalNodeName.end(), '_', ' ');
+            std::replace(originalNodeName.begin(), originalNodeName.end(), '_', ' ');
         }
 
         const std::string nodeName = originalNodeName;

From b2c170efa056cabc6c46043395106333d8a0c460 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Wed, 23 Jun 2021 23:36:43 +0200
Subject: [PATCH 0892/2859] Use initialization lists where possible

---
 apps/openmw/mwrender/groundcover.hpp      | 9 +++------
 apps/openmw/mwscript/scriptmanagerimp.hpp | 8 +++-----
 components/esm/magiceffects.hpp           | 9 +++------
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/apps/openmw/mwrender/groundcover.hpp b/apps/openmw/mwrender/groundcover.hpp
index cd80978bef..b92ab97c95 100644
--- a/apps/openmw/mwrender/groundcover.hpp
+++ b/apps/openmw/mwrender/groundcover.hpp
@@ -48,12 +48,9 @@ namespace MWRender
             float mScale;
             std::string mModel;
 
-            GroundcoverEntry(const ESM::CellRef& ref, const std::string& model)
-            {
-                mPos = ref.mPos;
-                mScale = ref.mScale;
-                mModel = model;
-            }
+            GroundcoverEntry(const ESM::CellRef& ref, const std::string& model):
+                mPos(ref.mPos), mScale(ref.mScale), mModel(model)
+            {}
         };
 
     private:
diff --git a/apps/openmw/mwscript/scriptmanagerimp.hpp b/apps/openmw/mwscript/scriptmanagerimp.hpp
index 04693eea6a..aff8318f72 100644
--- a/apps/openmw/mwscript/scriptmanagerimp.hpp
+++ b/apps/openmw/mwscript/scriptmanagerimp.hpp
@@ -48,11 +48,9 @@ namespace MWScript
                 Compiler::Locals mLocals;
                 std::set<std::string> mInactive;
 
-                CompiledScript(const std::vector<Interpreter::Type_Code>& code, const Compiler::Locals& locals)
-                {
-                    mByteCode = code;
-                    mLocals = locals;
-                }
+                CompiledScript(const std::vector<Interpreter::Type_Code>& code, const Compiler::Locals& locals):
+                    mByteCode(code), mLocals(locals)
+                {}
             };
 
             typedef std::map<std::string, CompiledScript> ScriptCollection;
diff --git a/components/esm/magiceffects.hpp b/components/esm/magiceffects.hpp
index a931c68fa5..5b8b0c924a 100644
--- a/components/esm/magiceffects.hpp
+++ b/components/esm/magiceffects.hpp
@@ -21,12 +21,9 @@ namespace ESM
 
     struct SummonKey
     {
-        SummonKey(int effectId, const std::string& sourceId, int index)
-        {
-            mEffectId = effectId;
-            mSourceId = sourceId;
-            mEffectIndex = index;
-        }
+        SummonKey(int effectId, const std::string& sourceId, int index):
+            mEffectId(effectId), mSourceId(sourceId), mEffectIndex(index)
+        {}
 
         bool operator==(const SummonKey &other) const
         {

From 5840279f166f48b5dd372118c346d35d34b4585b Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Thu, 24 Jun 2021 00:26:15 +0200
Subject: [PATCH 0893/2859] Use `default` instead of empty
 constructors/destructors

See https://pvs-studio.com/en/docs/warnings/v832/ for details
---
 apps/openmw/mwdialogue/journalentry.cpp | 4 ----
 apps/openmw/mwdialogue/journalentry.hpp | 4 ++--
 apps/openmw/mwgui/bookpage.cpp          | 4 +---
 apps/openmw/mwmechanics/objects.cpp     | 4 ----
 apps/openmw/mwmechanics/objects.hpp     | 2 +-
 apps/openmw/mwrender/animation.cpp      | 5 -----
 apps/openmw/mwrender/animation.hpp      | 2 +-
 apps/openmw/mwrender/localmap.cpp       | 5 -----
 apps/openmw/mwrender/localmap.hpp       | 2 +-
 apps/openmw/mwsound/sound.hpp           | 4 ++--
 apps/openmw/mwworld/containerstore.hpp  | 2 +-
 components/esm/util.hpp                 | 4 ++--
 components/misc/rng.cpp                 | 3 ---
 components/misc/rng.hpp                 | 2 +-
 components/shader/shadervisitor.cpp     | 5 -----
 components/shader/shadervisitor.hpp     | 2 +-
 16 files changed, 13 insertions(+), 41 deletions(-)

diff --git a/apps/openmw/mwdialogue/journalentry.cpp b/apps/openmw/mwdialogue/journalentry.cpp
index 5eab6d5cae..32b2b101d9 100644
--- a/apps/openmw/mwdialogue/journalentry.cpp
+++ b/apps/openmw/mwdialogue/journalentry.cpp
@@ -16,8 +16,6 @@
 
 namespace MWDialogue
 {
-    Entry::Entry() {}
-
     Entry::Entry (const std::string& topic, const std::string& infoId, const MWWorld::Ptr& actor)
     : mInfoId (infoId)
     {
@@ -60,8 +58,6 @@ namespace MWDialogue
     }
 
 
-    JournalEntry::JournalEntry() {}
-
     JournalEntry::JournalEntry (const std::string& topic, const std::string& infoId, const MWWorld::Ptr& actor)
         : Entry (topic, infoId, actor), mTopic (topic)
     {}
diff --git a/apps/openmw/mwdialogue/journalentry.hpp b/apps/openmw/mwdialogue/journalentry.hpp
index 8711ab53a7..af09908891 100644
--- a/apps/openmw/mwdialogue/journalentry.hpp
+++ b/apps/openmw/mwdialogue/journalentry.hpp
@@ -22,7 +22,7 @@ namespace MWDialogue
         std::string mText;
         std::string mActorName; // optional
 
-        Entry();
+        Entry() = default;
 
         /// actor is optional
         Entry (const std::string& topic, const std::string& infoId, const MWWorld::Ptr& actor);
@@ -41,7 +41,7 @@ namespace MWDialogue
     {
         std::string mTopic;
 
-        JournalEntry();
+        JournalEntry() = default;
 
         JournalEntry (const std::string& topic, const std::string& infoId, const MWWorld::Ptr& actor);
 
diff --git a/apps/openmw/mwgui/bookpage.cpp b/apps/openmw/mwgui/bookpage.cpp
index fba136f88f..49fae04619 100644
--- a/apps/openmw/mwgui/bookpage.cpp
+++ b/apps/openmw/mwgui/bookpage.cpp
@@ -746,9 +746,7 @@ namespace
             mVertexColourType = MyGUI::RenderManager::getInstance().getVertexFormat();
         }
 
-        ~GlyphStream ()
-        {
-        }
+        ~GlyphStream () = default;
 
         MyGUI::Vertex* end () const { return mVertices; }
 
diff --git a/apps/openmw/mwmechanics/objects.cpp b/apps/openmw/mwmechanics/objects.cpp
index 5b18fc2c30..eea0655dd8 100644
--- a/apps/openmw/mwmechanics/objects.cpp
+++ b/apps/openmw/mwmechanics/objects.cpp
@@ -13,10 +13,6 @@
 namespace MWMechanics
 {
 
-Objects::Objects()
-{
-}
-
 Objects::~Objects()
 {
   for(auto& object : mObjects)
diff --git a/apps/openmw/mwmechanics/objects.hpp b/apps/openmw/mwmechanics/objects.hpp
index 5160114a3f..ba39fdbd4f 100644
--- a/apps/openmw/mwmechanics/objects.hpp
+++ b/apps/openmw/mwmechanics/objects.hpp
@@ -26,7 +26,7 @@ namespace MWMechanics
         PtrControllerMap mObjects;
 
     public:
-        Objects();
+        Objects() = default;
         ~Objects();
 
         void addObject (const MWWorld::Ptr& ptr);
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index a11d97779c..53673d8a22 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -1973,11 +1973,6 @@ namespace MWRender
         return SceneUtil::hasUserDescription(mObjectRoot, Constants::HerbalismLabel);
     }
 
-    Animation::AnimState::~AnimState()
-    {
-
-    }
-
     // ------------------------------
 
     PartHolder::PartHolder(osg::ref_ptr<osg::Node> node)
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index 213a4f7049..24478439c1 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -207,7 +207,7 @@ protected:
                       mLoopCount(0), mPriority(0), mBlendMask(0), mAutoDisable(true)
         {
         }
-        ~AnimState();
+        ~AnimState() = default;
 
         float getTime() const
         {
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index 686078879d..24c00048d9 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -673,11 +673,6 @@ LocalMap::MapSegment::MapSegment()
 {
 }
 
-LocalMap::MapSegment::~MapSegment()
-{
-
-}
-
 void LocalMap::MapSegment::createFogOfWarTexture()
 {
     if (mFogOfWarTexture)
diff --git a/apps/openmw/mwrender/localmap.hpp b/apps/openmw/mwrender/localmap.hpp
index 83a975aeda..e586f8fb02 100644
--- a/apps/openmw/mwrender/localmap.hpp
+++ b/apps/openmw/mwrender/localmap.hpp
@@ -115,7 +115,7 @@ namespace MWRender
         struct MapSegment
         {
             MapSegment();
-            ~MapSegment();
+            ~MapSegment() = default;
 
             void initFogOfWar();
             void loadFogOfWar(const ESM::FogTexture& fog);
diff --git a/apps/openmw/mwsound/sound.hpp b/apps/openmw/mwsound/sound.hpp
index d2e65c9895..17f052aec0 100644
--- a/apps/openmw/mwsound/sound.hpp
+++ b/apps/openmw/mwsound/sound.hpp
@@ -85,7 +85,7 @@ namespace MWSound
         Sound(Sound&&) = delete;
 
     public:
-        Sound() { }
+        Sound() = default;
     };
 
     class Stream : public SoundBase {
@@ -94,7 +94,7 @@ namespace MWSound
         Stream(Stream&&) = delete;
 
     public:
-        Stream() { }
+        Stream() = default;
     };
 }
 
diff --git a/apps/openmw/mwworld/containerstore.hpp b/apps/openmw/mwworld/containerstore.hpp
index 5044b0f451..f18a595466 100644
--- a/apps/openmw/mwworld/containerstore.hpp
+++ b/apps/openmw/mwworld/containerstore.hpp
@@ -58,7 +58,7 @@ namespace MWWorld
             std::shared_ptr<ResolutionListener> mListener;
         public:
             ResolutionHandle(std::shared_ptr<ResolutionListener> listener) : mListener(listener) {}
-            ResolutionHandle() {}
+            ResolutionHandle() = default;
     };
     
     class ContainerStoreListener
diff --git a/components/esm/util.hpp b/components/esm/util.hpp
index a80df2456f..204de371fb 100644
--- a/components/esm/util.hpp
+++ b/components/esm/util.hpp
@@ -13,7 +13,7 @@ struct Quaternion
 {
     float mValues[4];
 
-    Quaternion() {}
+    Quaternion() = default;
 
     Quaternion(const osg::Quat& q)
     {
@@ -33,7 +33,7 @@ struct Vector3
 {
     float mValues[3];
 
-    Vector3() {}
+    Vector3() = default;
 
     Vector3(const osg::Vec3f& v)
     {
diff --git a/components/misc/rng.cpp b/components/misc/rng.cpp
index 4805f0d91c..113e7b1d5b 100644
--- a/components/misc/rng.cpp
+++ b/components/misc/rng.cpp
@@ -10,9 +10,6 @@ namespace
 
 namespace Misc
 {
-
-    Rng::Seed::Seed() {}
-
     Rng::Seed::Seed(unsigned int seed)
     {
         mGenerator.seed(seed);
diff --git a/components/misc/rng.hpp b/components/misc/rng.hpp
index 998ac0d535..06e94897be 100644
--- a/components/misc/rng.hpp
+++ b/components/misc/rng.hpp
@@ -17,7 +17,7 @@ public:
     {
         std::mt19937 mGenerator;
     public:
-        Seed();
+        Seed() = default;
         Seed(const Seed&) = delete;
         Seed(unsigned int seed);
         friend class Rng;
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index e8ac7d9c36..3c5898b873 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -38,11 +38,6 @@ namespace Shader
     {
     }
 
-    ShaderVisitor::ShaderRequirements::~ShaderRequirements()
-    {
-
-    }
-
     ShaderVisitor::ShaderVisitor(ShaderManager& shaderManager, Resource::ImageManager& imageManager, const std::string &defaultShaderPrefix)
         : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
         , mForceShaders(false)
diff --git a/components/shader/shadervisitor.hpp b/components/shader/shadervisitor.hpp
index 30ff41a33c..a5add473a6 100644
--- a/components/shader/shadervisitor.hpp
+++ b/components/shader/shadervisitor.hpp
@@ -77,7 +77,7 @@ namespace Shader
         struct ShaderRequirements
         {
             ShaderRequirements();
-            ~ShaderRequirements();
+            ~ShaderRequirements() = default;
 
             // <texture stage, texture name>
             std::map<int, std::string> mTextures;

From cf11870b1c9042c47d58cd01c8e9cc518118600c Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Wed, 23 Jun 2021 21:56:08 +0200
Subject: [PATCH 0894/2859] Sprinkle some references where it makes sense

---
 apps/openmw/mwbase/mechanicsmanager.hpp         | 2 +-
 apps/openmw/mwmechanics/actors.cpp              | 2 +-
 apps/openmw/mwmechanics/actors.hpp              | 2 +-
 apps/openmw/mwmechanics/character.cpp           | 2 +-
 apps/openmw/mwmechanics/character.hpp           | 2 +-
 apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 2 +-
 apps/openmw/mwmechanics/mechanicsmanagerimp.hpp | 2 +-
 components/misc/stringops.hpp                   | 2 +-
 components/resource/bulletshapemanager.cpp      | 4 ++--
 components/resource/keyframemanager.cpp         | 2 +-
 components/resource/keyframemanager.hpp         | 2 +-
 components/sceneutil/util.cpp                   | 2 +-
 components/sceneutil/util.hpp                   | 2 +-
 13 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/apps/openmw/mwbase/mechanicsmanager.hpp b/apps/openmw/mwbase/mechanicsmanager.hpp
index 967504552d..1fe922a47b 100644
--- a/apps/openmw/mwbase/mechanicsmanager.hpp
+++ b/apps/openmw/mwbase/mechanicsmanager.hpp
@@ -230,7 +230,7 @@ namespace MWBase
             virtual bool isReadyToBlock (const MWWorld::Ptr& ptr) const = 0;
             virtual bool isAttackingOrSpell(const MWWorld::Ptr &ptr) const = 0;
 
-            virtual void castSpell(const MWWorld::Ptr& ptr, const std::string spellId, bool manualSpell) = 0;
+            virtual void castSpell(const MWWorld::Ptr& ptr, const std::string& spellId, bool manualSpell) = 0;
 
             virtual void processChangedSettings (const std::set< std::pair<std::string, std::string> >& settings) = 0;
 
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 87f462d6ff..e62d686ee2 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1667,7 +1667,7 @@ namespace MWMechanics
         }
     }
 
-    void Actors::castSpell(const MWWorld::Ptr& ptr, const std::string spellId, bool manualSpell)
+    void Actors::castSpell(const MWWorld::Ptr& ptr, const std::string& spellId, bool manualSpell)
     {
         PtrActorMap::iterator iter = mActors.find(ptr);
         if(iter != mActors.end())
diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index 0ae9687578..171b45e270 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -101,7 +101,7 @@ namespace MWMechanics
 
             void resurrect (const MWWorld::Ptr& ptr);
 
-            void castSpell(const MWWorld::Ptr& ptr, const std::string spellId, bool manualSpell=false);
+            void castSpell(const MWWorld::Ptr& ptr, const std::string& spellId, bool manualSpell=false);
 
             void updateActor(const MWWorld::Ptr &old, const MWWorld::Ptr& ptr);
             ///< Updates an actor with a new Ptr
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 54c951187f..d5a1d46a88 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -2852,7 +2852,7 @@ void CharacterController::setAttackingOrSpell(bool attackingOrSpell)
     mAttackingOrSpell = attackingOrSpell;
 }
 
-void CharacterController::castSpell(const std::string spellId, bool manualSpell)
+void CharacterController::castSpell(const std::string& spellId, bool manualSpell)
 {
     mAttackingOrSpell = true;
     mCastingManualSpell = manualSpell;
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index 3f7fa4e1bd..adeaa739af 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -286,7 +286,7 @@ public:
 
     void setVisibility(float visibility);
     void setAttackingOrSpell(bool attackingOrSpell);
-    void castSpell(const std::string spellId, bool manualSpell=false);
+    void castSpell(const std::string& spellId, bool manualSpell=false);
     void setAIAttackType(const std::string& attackType);
     static void setAttackTypeRandomly(std::string& attackType);
 
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 7101139821..352a6cca43 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -251,7 +251,7 @@ namespace MWMechanics
             mObjects.addObject(ptr);
     }
 
-    void MechanicsManager::castSpell(const MWWorld::Ptr& ptr, const std::string spellId, bool manualSpell)
+    void MechanicsManager::castSpell(const MWWorld::Ptr& ptr, const std::string& spellId, bool manualSpell)
     {
         if(ptr.getClass().isActor())
             mActors.castSpell(ptr, spellId, manualSpell);
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
index 3f2c3f5e98..0b1d7377b2 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
@@ -186,7 +186,7 @@ namespace MWMechanics
             /// Is \a ptr casting spell or using weapon now?
             bool isAttackingOrSpell(const MWWorld::Ptr &ptr) const override;
 
-            void castSpell(const MWWorld::Ptr& ptr, const std::string spellId, bool manualSpell=false) override;
+            void castSpell(const MWWorld::Ptr& ptr, const std::string& spellId, bool manualSpell=false) override;
 
             void processChangedSettings(const Settings::CategorySettingVector& settings) override;
 
diff --git a/components/misc/stringops.hpp b/components/misc/stringops.hpp
index 48deaa9991..59768b92ac 100644
--- a/components/misc/stringops.hpp
+++ b/components/misc/stringops.hpp
@@ -66,7 +66,7 @@ public:
         return ch;
     }
 
-    static std::string lowerCaseUtf8(const std::string str)
+    static std::string lowerCaseUtf8(const std::string& str)
     {
         if (str.empty())
             return str;
diff --git a/components/resource/bulletshapemanager.cpp b/components/resource/bulletshapemanager.cpp
index ad37eda0dd..b1b0f74176 100644
--- a/components/resource/bulletshapemanager.cpp
+++ b/components/resource/bulletshapemanager.cpp
@@ -45,9 +45,9 @@ struct GetTriangleFunctor
     }
 
 #if OSG_MIN_VERSION_REQUIRED(3,5,6)
-    void inline operator()( const osg::Vec3 v1, const osg::Vec3 v2, const osg::Vec3 v3 )
+    void inline operator()( const osg::Vec3& v1, const osg::Vec3& v2, const osg::Vec3& v3 )
 #else
-    void inline operator()( const osg::Vec3 v1, const osg::Vec3 v2, const osg::Vec3 v3, bool _temp )
+    void inline operator()( const osg::Vec3& v1, const osg::Vec3& v2, const osg::Vec3& v3, bool _temp )
 #endif
     {
         if (mTriMesh)
diff --git a/components/resource/keyframemanager.cpp b/components/resource/keyframemanager.cpp
index d7eeeeb971..69986fbcd9 100644
--- a/components/resource/keyframemanager.cpp
+++ b/components/resource/keyframemanager.cpp
@@ -106,7 +106,7 @@ namespace Resource
         return time;
     }
 
-    std::string RetrieveAnimationsVisitor::changeFileExtension(const std::string file, const std::string ext)
+    std::string RetrieveAnimationsVisitor::changeFileExtension(const std::string& file, const std::string& ext)
     {
         size_t extPos = file.find_last_of('.');
         if (extPos != std::string::npos && extPos+1 < file.size())
diff --git a/components/resource/keyframemanager.hpp b/components/resource/keyframemanager.hpp
index 87a20b97a5..75c9cc6ff4 100644
--- a/components/resource/keyframemanager.hpp
+++ b/components/resource/keyframemanager.hpp
@@ -22,7 +22,7 @@ namespace Resource
 
         private:
 
-            std::string changeFileExtension(const std::string file, const std::string ext);
+            std::string changeFileExtension(const std::string& file, const std::string& ext);
             std::string parseTextKey(const std::string& line);
             double parseTimeSignature(const std::string& line);
 
diff --git a/components/sceneutil/util.cpp b/components/sceneutil/util.cpp
index 1fe3685726..ad5daa6e02 100644
--- a/components/sceneutil/util.cpp
+++ b/components/sceneutil/util.cpp
@@ -200,7 +200,7 @@ float makeOsgColorComponent(unsigned int value, unsigned int shift)
     return float((value >> shift) & 0xFFu) / 255.0f;
 }
 
-bool hasUserDescription(const osg::Node* node, const std::string pattern)
+bool hasUserDescription(const osg::Node* node, const std::string& pattern)
 {
     if (node == nullptr)
         return false;
diff --git a/components/sceneutil/util.hpp b/components/sceneutil/util.hpp
index 8103ed87a8..151f65db79 100644
--- a/components/sceneutil/util.hpp
+++ b/components/sceneutil/util.hpp
@@ -58,7 +58,7 @@ namespace SceneUtil
 
     float makeOsgColorComponent (unsigned int value, unsigned int shift);
 
-    bool hasUserDescription(const osg::Node* node, const std::string pattern);
+    bool hasUserDescription(const osg::Node* node, const std::string& pattern);
 
     osg::ref_ptr<GlowUpdater> addEnchantedGlow(osg::ref_ptr<osg::Node> node, Resource::ResourceSystem* resourceSystem, osg::Vec4f glowColor, float glowDuration=-1);
 

From ec576b36f133cec6fd7e523d9c99fb90dc658d19 Mon Sep 17 00:00:00 2001
From: Alexey Sokolov <sokolov@google.com>
Date: Fri, 25 Jun 2021 11:45:43 +0100
Subject: [PATCH 0895/2859] Add a default filter to CS tables

This fixes the single most annoying issue of OpenMW-CS: inability for
users to filter records in the table if they don't happen to know by
heart the syntax of the very powerful filter engine. Because simply
typing the text into the search field did not work. Now, existence of .*
suggests that regex is used, and users still can replace the text with a
custom filter if they wish.
---
 apps/opencs/view/filter/editwidget.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/opencs/view/filter/editwidget.cpp b/apps/opencs/view/filter/editwidget.cpp
index 6b585591fa..2c2f4443df 100644
--- a/apps/opencs/view/filter/editwidget.cpp
+++ b/apps/opencs/view/filter/editwidget.cpp
@@ -42,6 +42,8 @@ CSVFilter::EditWidget::EditWidget (CSMWorld::Data& data, QWidget *parent)
     addAction (mHelpAction);
     auto* openHelpShortcut = new CSMPrefs::Shortcut("help", this);
     openHelpShortcut->associateAction(mHelpAction);
+
+    setText("!string(\"ID\", \".*\")");
 }
 
 void CSVFilter::EditWidget::textChanged (const QString& text)

From 2c8f328ac216e2548b1462e0b11ea1f865d1e355 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Fri, 25 Jun 2021 20:55:38 +0200
Subject: [PATCH 0896/2859] Use make_unique instead of unique_ptr+new

---
 components/esm/aisequence.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/components/esm/aisequence.cpp b/components/esm/aisequence.cpp
index df3c1ca9d0..ca4c21802c 100644
--- a/components/esm/aisequence.cpp
+++ b/components/esm/aisequence.cpp
@@ -178,49 +178,49 @@ namespace AiSequence
             {
             case Ai_Wander:
             {
-                std::unique_ptr<AiWander> ptr (new AiWander());
+                std::unique_ptr<AiWander> ptr = std::make_unique<AiWander>();
                 ptr->load(esm);
                 mPackages.back().mPackage = ptr.release();
                 break;
             }
             case Ai_Travel:
             {
-                std::unique_ptr<AiTravel> ptr (new AiTravel());
+                std::unique_ptr<AiTravel> ptr = std::make_unique<AiTravel>();
                 ptr->load(esm);
                 mPackages.back().mPackage = ptr.release();
                 break;
             }
             case Ai_Escort:
             {
-                std::unique_ptr<AiEscort> ptr (new AiEscort());
+                std::unique_ptr<AiEscort> ptr = std::make_unique<AiEscort>();
                 ptr->load(esm);
                 mPackages.back().mPackage = ptr.release();
                 break;
             }
             case Ai_Follow:
             {
-                std::unique_ptr<AiFollow> ptr (new AiFollow());
+                std::unique_ptr<AiFollow> ptr = std::make_unique<AiFollow>();
                 ptr->load(esm);
                 mPackages.back().mPackage = ptr.release();
                 break;
             }
             case Ai_Activate:
             {
-                std::unique_ptr<AiActivate> ptr (new AiActivate());
+                std::unique_ptr<AiActivate> ptr = std::make_unique<AiActivate>();
                 ptr->load(esm);
                 mPackages.back().mPackage = ptr.release();
                 break;
             }
             case Ai_Combat:
             {
-                std::unique_ptr<AiCombat> ptr (new AiCombat());
+                std::unique_ptr<AiCombat> ptr = std::make_unique<AiCombat>();
                 ptr->load(esm);
                 mPackages.back().mPackage = ptr.release();
                 break;
             }
             case Ai_Pursue:
             {
-                std::unique_ptr<AiPursue> ptr (new AiPursue());
+                std::unique_ptr<AiPursue> ptr = std::make_unique<AiPursue>();
                 ptr->load(esm);
                 mPackages.back().mPackage = ptr.release();
                 break;

From 9db7d0278a35c6f9a0ef6ccaa14ab6bd11009bd5 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Fri, 25 Jun 2021 21:52:02 +0200
Subject: [PATCH 0897/2859] Sprinkle some const ref

---
 components/contentselector/model/contentmodel.cpp      | 2 +-
 components/contentselector/model/contentmodel.hpp      | 2 +-
 components/detournavigator/cachedrecastmeshmanager.cpp | 2 +-
 components/detournavigator/cachedrecastmeshmanager.hpp | 2 +-
 components/detournavigator/recastmeshmanager.cpp       | 2 +-
 components/detournavigator/recastmeshmanager.hpp       | 2 +-
 components/interpreter/defines.cpp                     | 2 +-
 components/misc/stringops.hpp                          | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/components/contentselector/model/contentmodel.cpp b/components/contentselector/model/contentmodel.cpp
index e51c1809a9..141ad13517 100644
--- a/components/contentselector/model/contentmodel.cpp
+++ b/components/contentselector/model/contentmodel.cpp
@@ -543,7 +543,7 @@ bool ContentSelectorModel::ContentModel::isChecked(const QString& filepath) cons
     return false;
 }
 
-bool ContentSelectorModel::ContentModel::isEnabled (QModelIndex index) const
+bool ContentSelectorModel::ContentModel::isEnabled (const QModelIndex& index) const
 {
     return (flags(index) & Qt::ItemIsEnabled);
 }
diff --git a/components/contentselector/model/contentmodel.hpp b/components/contentselector/model/contentmodel.hpp
index 030865b35a..d245a0dcbf 100644
--- a/components/contentselector/model/contentmodel.hpp
+++ b/components/contentselector/model/contentmodel.hpp
@@ -52,7 +52,7 @@ namespace ContentSelectorModel
         EsmFile *item(int row);
         QStringList gameFiles() const;
 
-        bool isEnabled (QModelIndex index) const;
+        bool isEnabled (const QModelIndex& index) const;
         bool isChecked(const QString &filepath) const;
         bool setCheckState(const QString &filepath, bool isChecked);
         void setContentList(const QStringList &fileList);
diff --git a/components/detournavigator/cachedrecastmeshmanager.cpp b/components/detournavigator/cachedrecastmeshmanager.cpp
index 2788b80461..4666b66a83 100644
--- a/components/detournavigator/cachedrecastmeshmanager.cpp
+++ b/components/detournavigator/cachedrecastmeshmanager.cpp
@@ -62,7 +62,7 @@ namespace DetourNavigator
         return mImpl.isEmpty();
     }
 
-    void CachedRecastMeshManager::reportNavMeshChange(Version recastMeshVersion, Version navMeshVersion)
+    void CachedRecastMeshManager::reportNavMeshChange(const Version& recastMeshVersion, const Version& navMeshVersion)
     {
         mImpl.reportNavMeshChange(recastMeshVersion, navMeshVersion);
     }
diff --git a/components/detournavigator/cachedrecastmeshmanager.hpp b/components/detournavigator/cachedrecastmeshmanager.hpp
index ea55348f70..96604c3628 100644
--- a/components/detournavigator/cachedrecastmeshmanager.hpp
+++ b/components/detournavigator/cachedrecastmeshmanager.hpp
@@ -26,7 +26,7 @@ namespace DetourNavigator
 
         bool isEmpty() const;
 
-        void reportNavMeshChange(Version recastMeshVersion, Version navMeshVersion);
+        void reportNavMeshChange(const Version& recastMeshVersion, const Version& navMeshVersion);
 
         Version getVersion() const;
 
diff --git a/components/detournavigator/recastmeshmanager.cpp b/components/detournavigator/recastmeshmanager.cpp
index bfc0409a51..e79d58de9d 100644
--- a/components/detournavigator/recastmeshmanager.cpp
+++ b/components/detournavigator/recastmeshmanager.cpp
@@ -83,7 +83,7 @@ namespace DetourNavigator
         return mObjects.empty();
     }
 
-    void RecastMeshManager::reportNavMeshChange(Version recastMeshVersion, Version navMeshVersion)
+    void RecastMeshManager::reportNavMeshChange(const Version& recastMeshVersion, const Version& navMeshVersion)
     {
         if (recastMeshVersion.mGeneration != mGeneration)
             return;
diff --git a/components/detournavigator/recastmeshmanager.hpp b/components/detournavigator/recastmeshmanager.hpp
index 5922821f26..850865b95e 100644
--- a/components/detournavigator/recastmeshmanager.hpp
+++ b/components/detournavigator/recastmeshmanager.hpp
@@ -50,7 +50,7 @@ namespace DetourNavigator
 
         bool isEmpty() const;
 
-        void reportNavMeshChange(Version recastMeshVersion, Version navMeshVersion);
+        void reportNavMeshChange(const Version& recastMeshVersion, const Version& navMeshVersion);
 
         Version getVersion() const;
 
diff --git a/components/interpreter/defines.cpp b/components/interpreter/defines.cpp
index d2e7067c6c..48d2ceaa45 100644
--- a/components/interpreter/defines.cpp
+++ b/components/interpreter/defines.cpp
@@ -26,7 +26,7 @@ namespace Interpreter{
         return a.length() > b.length();
     }
 
-    std::string fixDefinesReal(std::string text, bool dialogue, Context& context)
+    static std::string fixDefinesReal(const std::string& text, bool dialogue, Context& context)
     {
         unsigned int start = 0;
         std::ostringstream retval;
diff --git a/components/misc/stringops.hpp b/components/misc/stringops.hpp
index 9f3dfe7c5f..2a865606fd 100644
--- a/components/misc/stringops.hpp
+++ b/components/misc/stringops.hpp
@@ -290,7 +290,7 @@ public:
         }
     }
 
-     static inline void replaceLast(std::string& str, std::string substr, std::string with)
+     static inline void replaceLast(std::string& str, const std::string& substr, const std::string& with)
      {
          size_t pos = str.rfind(substr);
          if (pos == std::string::npos)

From 873b3b480055e00006837789cee83e525db5f646 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Sat, 26 Jun 2021 19:46:34 +0100
Subject: [PATCH 0898/2859] Handle empty strings.

---
 extern/Base64/Base64.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/extern/Base64/Base64.h b/extern/Base64/Base64.h
index 4e9f517479..49b2d29e35 100644
--- a/extern/Base64/Base64.h
+++ b/extern/Base64/Base64.h
@@ -95,6 +95,12 @@ class Base64 {
     size_t in_len = input.size();
     if (in_len % 4 != 0) return "Input data size is not a multiple of 4";
 
+    if (in_len == 0)
+    {
+        out = "";
+        return "";
+    }
+
     size_t out_len = in_len / 4 * 3;
     if (input[in_len - 1] == '=') out_len--;
     if (input[in_len - 2] == '=') out_len--;

From d38126ef1cf09cdc84a95a478b770c8a486fed3c Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Sat, 26 Jun 2021 20:00:25 +0100
Subject: [PATCH 0899/2859] Pack default CS config

*Technically* it was already being loaded as if it were packed, but it
made no difference because it's supposed to be empty.
---
 CMakeLists.txt                    | 6 +++---
 apps/opencs/CMakeLists.txt        | 4 ++--
 apps/opencs/model/prefs/state.cpp | 8 ++++----
 apps/opencs/model/prefs/state.hpp | 1 +
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7a07cee69f..4661f673f1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -458,8 +458,8 @@ else ()
         "${OpenMW_BINARY_DIR}/openmw.cfg")
 endif ()
 
-configure_resource_file(${OpenMW_SOURCE_DIR}/files/openmw-cs.cfg
-    "${OpenMW_BINARY_DIR}" "openmw-cs.cfg")
+pack_resource_file(${OpenMW_SOURCE_DIR}/files/openmw-cs.cfg
+    "${OpenMW_BINARY_DIR}" "defaults-cs.bin")
 
 # Needs the copy version because the configure version assumes the end of the file has been reached when a null character is reached and there are no CMake expressions to evaluate.
 copy_resource_file(${OpenMW_SOURCE_DIR}/files/opencs/defaultfilters
@@ -928,7 +928,7 @@ elseif(NOT APPLE)
         INSTALL(FILES "${INSTALL_SOURCE}/gamecontrollerdb.txt" DESTINATION "${SYSCONFDIR}" COMPONENT "openmw")
 
         IF(BUILD_OPENCS)
-            INSTALL(FILES "${INSTALL_SOURCE}/openmw-cs.cfg" DESTINATION "${SYSCONFDIR}" COMPONENT "opencs")
+            INSTALL(FILES "${INSTALL_SOURCE}/defaults-cs.bin" DESTINATION "${SYSCONFDIR}" COMPONENT "opencs")
         ENDIF(BUILD_OPENCS)
 
         # Install resources
diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 19c32df609..88c4233c9c 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -158,7 +158,7 @@ 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()
@@ -270,7 +270,7 @@ if (WIN32)
         SET(INSTALL_SOURCE "${OpenMW_BINARY_DIR}")
     endif ()
 
-    INSTALL(FILES "${INSTALL_SOURCE}/openmw-cs.cfg" DESTINATION ".")
+    INSTALL(FILES "${INSTALL_SOURCE}/defaults-cs.bin" DESTINATION ".")
 endif()
 
 if (MSVC)
diff --git a/apps/opencs/model/prefs/state.cpp b/apps/opencs/model/prefs/state.cpp
index 0958fa8d4d..58a0f296e2 100644
--- a/apps/opencs/model/prefs/state.cpp
+++ b/apps/opencs/model/prefs/state.cpp
@@ -17,15 +17,15 @@ CSMPrefs::State *CSMPrefs::State::sThis = nullptr;
 void CSMPrefs::State::load()
 {
     // default settings file
-    boost::filesystem::path local = mConfigurationManager.getLocalPath() / mConfigFile;
-    boost::filesystem::path global = mConfigurationManager.getGlobalPath() / mConfigFile;
+    boost::filesystem::path local = mConfigurationManager.getLocalPath() / mDefaultConfigFile;
+    boost::filesystem::path global = mConfigurationManager.getGlobalPath() / mDefaultConfigFile;
 
     if (boost::filesystem::exists (local))
         mSettings.loadDefault (local.string());
     else if (boost::filesystem::exists (global))
         mSettings.loadDefault (global.string());
     else
-        throw std::runtime_error ("No default settings file found! Make sure the file \"openmw-cs.cfg\" was properly installed.");
+        throw std::runtime_error ("No default settings file found! Make sure the file \"" + mDefaultConfigFile + "\" was properly installed.");
 
     // user settings file
     boost::filesystem::path user = mConfigurationManager.getUserConfigPath() / mConfigFile;
@@ -641,7 +641,7 @@ void CSMPrefs::State::setDefault (const std::string& key, const std::string& def
 }
 
 CSMPrefs::State::State (const Files::ConfigurationManager& configurationManager)
-: mConfigFile ("openmw-cs.cfg"), mConfigurationManager (configurationManager),
+: mConfigFile ("openmw-cs.cfg"), mDefaultConfigFile("defaults-cs.bin"), mConfigurationManager (configurationManager),
   mCurrentCategory (mCategories.end())
 {
     if (sThis)
diff --git a/apps/opencs/model/prefs/state.hpp b/apps/opencs/model/prefs/state.hpp
index aa63de595e..7c9fcbecda 100644
--- a/apps/opencs/model/prefs/state.hpp
+++ b/apps/opencs/model/prefs/state.hpp
@@ -48,6 +48,7 @@ namespace CSMPrefs
         private:
 
             const std::string mConfigFile;
+            const std::string mDefaultConfigFile;
             const Files::ConfigurationManager& mConfigurationManager;
             ShortcutManager mShortcutManager;
             Settings::Manager mSettings;

From 8a1b4bde8ab8b918e4ac570c54e1afbdef9499a5 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Sun, 27 Jun 2021 00:12:07 +0100
Subject: [PATCH 0900/2859] Ensure original (removed) state overrides
 replacement state when recreating shaders

When the shader visitor replaces state (e.g. changes the deprecated
alpha test to a shader-based one) it backs up the original state. If
shaders are recreated, we need to know what the canonical state was and
create shaders to implement that instead of creating shaders to
implement dummy replacement state.

This was actually usually working as the removed state got checked after
the active state, so overwrote anything derived from it. However, if the
active state had the override bit set, that would make it override the
removed state.

Skipping any active state that duplicates removed state fixes this case.

Resolves #6108
---
 components/shader/shadervisitor.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 3c5898b873..d51dbfa6b9 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -279,6 +279,8 @@ namespace Shader
         {
             for (osg::StateSet::AttributeList::const_iterator it = attributeMap.begin(); it != attributeMap.end(); ++it)
             {
+                if (attributeMap != removedAttributes && removedAttributes.count(it->first))
+                    continue;
                 if (it->first.first == osg::StateAttribute::MATERIAL)
                 {
                     // This should probably be moved out of ShaderRequirements and be applied directly now it's a uniform instead of a define

From 0e122b1e3d04691b8a9b9f3f1b359c947cd94bf8 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Sun, 27 Jun 2021 01:48:06 +0100
Subject: [PATCH 0901/2859] Avoid copy and deep equality check

---
 components/shader/shadervisitor.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index d51dbfa6b9..b4455c4096 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -275,11 +275,11 @@ namespace Shader
         osg::StateSet::AttributeList removedAttributes;
         if (osg::ref_ptr<osg::StateSet> removedState = getRemovedState(*stateset))
             removedAttributes = removedState->getAttributeList();
-        for (const auto& attributeMap : { attributes, removedAttributes })
+        for (const auto* attributeMap : std::initializer_list<const osg::StateSet::AttributeList*>{ &attributes, &removedAttributes })
         {
-            for (osg::StateSet::AttributeList::const_iterator it = attributeMap.begin(); it != attributeMap.end(); ++it)
+            for (osg::StateSet::AttributeList::const_iterator it = attributeMap->begin(); it != attributeMap->end(); ++it)
             {
-                if (attributeMap != removedAttributes && removedAttributes.count(it->first))
+                if (attributeMap != &removedAttributes && removedAttributes.count(it->first))
                     continue;
                 if (it->first.first == osg::StateAttribute::MATERIAL)
                 {

From 84d6dea277451ccebc2cd1bf965993a26a334775 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 27 Jun 2021 02:15:45 +0200
Subject: [PATCH 0902/2859] Inscribe physical bounding box into navmesh agent
 cylinder

To disallow too narrow navmesh for a bounding box.
---
 .../detournavigator/navigator.cpp             | 586 +++++++++---------
 components/detournavigator/settingsutils.hpp  |   5 +-
 2 files changed, 292 insertions(+), 299 deletions(-)

diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index bf8b4a002e..b0fec1a1a3 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -42,8 +42,8 @@ namespace
         DetourNavigatorNavigatorTest()
             : mPlayerPosition(0, 0, 0)
             , mAgentHalfExtents(29, 29, 66)
-            , mStart(-215, 215, 1)
-            , mEnd(215, -215, 1)
+            , mStart(-204, 204, 1)
+            , mEnd(204, -204, 1)
             , mOut(mPath)
             , mStepSize(28.333332061767578125f)
         {
@@ -133,30 +133,29 @@ namespace
         EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(-215, 215, 1.85963428020477294921875),
-            Vec3fEq(-194.9653167724609375, 194.9653167724609375, -6.57602214813232421875),
-            Vec3fEq(-174.930633544921875, 174.930633544921875, -15.01167774200439453125),
-            Vec3fEq(-154.8959503173828125, 154.8959503173828125, -23.4473361968994140625),
-            Vec3fEq(-134.86126708984375, 134.86126708984375, -31.8829936981201171875),
-            Vec3fEq(-114.82657623291015625, 114.82657623291015625, -40.3186492919921875),
-            Vec3fEq(-94.7918853759765625, 94.7918853759765625, -47.3990631103515625),
-            Vec3fEq(-74.75719451904296875, 74.75719451904296875, -53.7258148193359375),
-            Vec3fEq(-54.722499847412109375, 54.722499847412109375, -60.052555084228515625),
-            Vec3fEq(-34.68780517578125, 34.68780517578125, -66.37931060791015625),
-            Vec3fEq(-14.6531162261962890625, 14.6531162261962890625, -72.70604705810546875),
-            Vec3fEq(5.3815765380859375, -5.3815765380859375, -75.35065460205078125),
-            Vec3fEq(25.41626739501953125, -25.41626739501953125, -67.9694671630859375),
-            Vec3fEq(45.450958251953125, -45.450958251953125, -60.5882568359375),
-            Vec3fEq(65.48564910888671875, -65.48564910888671875, -53.20705413818359375),
-            Vec3fEq(85.5203399658203125, -85.5203399658203125, -45.8258514404296875),
-            Vec3fEq(105.55503082275390625, -105.55503082275390625, -38.44464874267578125),
-            Vec3fEq(125.5897216796875, -125.5897216796875, -31.063449859619140625),
-            Vec3fEq(145.6244049072265625, -145.6244049072265625, -23.6822509765625),
-            Vec3fEq(165.659088134765625, -165.659088134765625, -16.3010501861572265625),
-            Vec3fEq(185.6937713623046875, -185.6937713623046875, -8.91985416412353515625),
-            Vec3fEq(205.7284698486328125, -205.7284698486328125, -1.5386505126953125),
-            Vec3fEq(215, -215, 1.87718021869659423828125)
-        ));
+            Vec3fEq(-204.0000152587890625, 204, 1.99998295307159423828125),
+            Vec3fEq(-183.96533203125, 183.9653167724609375, 1.99998819828033447265625),
+            Vec3fEq(-163.930633544921875, 163.9306182861328125, 1.99999344348907470703125),
+            Vec3fEq(-143.8959503173828125, 143.89593505859375, -2.720611572265625),
+            Vec3fEq(-123.86126708984375, 123.86124420166015625, -13.1089687347412109375),
+            Vec3fEq(-103.82657623291015625, 103.8265533447265625, -23.497333526611328125),
+            Vec3fEq(-83.7918853759765625, 83.7918548583984375, -33.885692596435546875),
+            Vec3fEq(-63.757190704345703125, 63.757171630859375, -44.274051666259765625),
+            Vec3fEq(-43.722503662109375, 43.72248077392578125, -54.66241455078125),
+            Vec3fEq(-23.687808990478515625, 23.6877918243408203125, -65.05077362060546875),
+            Vec3fEq(-3.6531188488006591796875, 3.6531002521514892578125, -75.43914031982421875),
+            Vec3fEq(16.3815746307373046875, -16.381591796875, -69.74927520751953125),
+            Vec3fEq(36.416263580322265625, -36.416286468505859375, -60.4739532470703125),
+            Vec3fEq(56.450958251953125, -56.450977325439453125, -51.1986236572265625),
+            Vec3fEq(76.48564910888671875, -76.4856719970703125, -41.92330169677734375),
+            Vec3fEq(96.5203399658203125, -96.52036285400390625, -31.46941375732421875),
+            Vec3fEq(116.55503082275390625, -116.5550537109375, -19.597003936767578125),
+            Vec3fEq(136.5897216796875, -136.5897369384765625, -7.724592685699462890625),
+            Vec3fEq(156.624420166015625, -156.624420166015625, 1.99999535083770751953125),
+            Vec3fEq(176.6591033935546875, -176.65911865234375, 1.99999010562896728515625),
+            Vec3fEq(196.69378662109375, -196.6938018798828125, 1.99998486042022705078125),
+            Vec3fEq(204, -204.0000152587890625, 1.99998295307159423828125)
+        )) << mPath;
     }
 
     TEST_F(DetourNavigatorNavigatorTest, add_object_should_change_navmesh)
@@ -183,30 +182,29 @@ namespace
         EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(-215, 215, 1.85963428020477294921875),
-            Vec3fEq(-194.9653167724609375, 194.9653167724609375, -6.57602214813232421875),
-            Vec3fEq(-174.930633544921875, 174.930633544921875, -15.01167774200439453125),
-            Vec3fEq(-154.8959503173828125, 154.8959503173828125, -23.4473361968994140625),
-            Vec3fEq(-134.86126708984375, 134.86126708984375, -31.8829936981201171875),
-            Vec3fEq(-114.82657623291015625, 114.82657623291015625, -40.3186492919921875),
-            Vec3fEq(-94.7918853759765625, 94.7918853759765625, -47.3990631103515625),
-            Vec3fEq(-74.75719451904296875, 74.75719451904296875, -53.7258148193359375),
-            Vec3fEq(-54.722499847412109375, 54.722499847412109375, -60.052555084228515625),
-            Vec3fEq(-34.68780517578125, 34.68780517578125, -66.37931060791015625),
-            Vec3fEq(-14.6531162261962890625, 14.6531162261962890625, -72.70604705810546875),
-            Vec3fEq(5.3815765380859375, -5.3815765380859375, -75.35065460205078125),
-            Vec3fEq(25.41626739501953125, -25.41626739501953125, -67.9694671630859375),
-            Vec3fEq(45.450958251953125, -45.450958251953125, -60.5882568359375),
-            Vec3fEq(65.48564910888671875, -65.48564910888671875, -53.20705413818359375),
-            Vec3fEq(85.5203399658203125, -85.5203399658203125, -45.8258514404296875),
-            Vec3fEq(105.55503082275390625, -105.55503082275390625, -38.44464874267578125),
-            Vec3fEq(125.5897216796875, -125.5897216796875, -31.063449859619140625),
-            Vec3fEq(145.6244049072265625, -145.6244049072265625, -23.6822509765625),
-            Vec3fEq(165.659088134765625, -165.659088134765625, -16.3010501861572265625),
-            Vec3fEq(185.6937713623046875, -185.6937713623046875, -8.91985416412353515625),
-            Vec3fEq(205.7284698486328125, -205.7284698486328125, -1.5386505126953125),
-            Vec3fEq(215, -215, 1.87718021869659423828125)
-        ));
+            Vec3fEq(-204, 204, 1.99998295307159423828125),
+            Vec3fEq(-183.965301513671875, 183.965301513671875, 1.99998819828033447265625),
+            Vec3fEq(-163.9306182861328125, 163.9306182861328125, 1.99999344348907470703125),
+            Vec3fEq(-143.89593505859375, 143.89593505859375, -2.7206256389617919921875),
+            Vec3fEq(-123.86124420166015625, 123.86124420166015625, -13.1089839935302734375),
+            Vec3fEq(-103.8265533447265625, 103.8265533447265625, -23.4973468780517578125),
+            Vec3fEq(-83.7918548583984375, 83.7918548583984375, -33.885707855224609375),
+            Vec3fEq(-63.75716400146484375, 63.75716400146484375, -44.27407073974609375),
+            Vec3fEq(-43.72247314453125, 43.72247314453125, -54.662433624267578125),
+            Vec3fEq(-23.6877803802490234375, 23.6877803802490234375, -65.0507965087890625),
+            Vec3fEq(-3.653090000152587890625, 3.653090000152587890625, -75.43915557861328125),
+            Vec3fEq(16.3816013336181640625, -16.3816013336181640625, -69.749267578125),
+            Vec3fEq(36.416290283203125, -36.416290283203125, -60.4739532470703125),
+            Vec3fEq(56.450984954833984375, -56.450984954833984375, -51.1986236572265625),
+            Vec3fEq(76.4856719970703125, -76.4856719970703125, -41.92330169677734375),
+            Vec3fEq(96.52036285400390625, -96.52036285400390625, -31.46941375732421875),
+            Vec3fEq(116.5550537109375, -116.5550537109375, -19.597003936767578125),
+            Vec3fEq(136.5897369384765625, -136.5897369384765625, -7.724592685699462890625),
+            Vec3fEq(156.6244354248046875, -156.6244354248046875, 1.99999535083770751953125),
+            Vec3fEq(176.6591339111328125, -176.6591339111328125, 1.99999010562896728515625),
+            Vec3fEq(196.693817138671875, -196.693817138671875, 1.99998486042022705078125),
+            Vec3fEq(204, -204, 1.99998295307159423828125)
+        )) << mPath;
 
         mNavigator->addObject(ObjectId(&compoundShape), compoundShape, btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
@@ -217,30 +215,30 @@ namespace
         EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(-215, 215, 1.87826788425445556640625),
-            Vec3fEq(-199.7968292236328125, 191.09100341796875, -3.54876613616943359375),
-            Vec3fEq(-184.5936431884765625, 167.1819915771484375, -8.97847843170166015625),
-            Vec3fEq(-169.3904571533203125, 143.2729949951171875, -14.408184051513671875),
-            Vec3fEq(-154.1872711181640625, 119.36397552490234375, -19.837890625),
-            Vec3fEq(-138.9840850830078125, 95.45496368408203125, -25.2675991058349609375),
-            Vec3fEq(-123.78090667724609375, 71.54595184326171875, -30.6973056793212890625),
-            Vec3fEq(-108.57772064208984375, 47.636936187744140625, -36.12701416015625),
-            Vec3fEq(-93.3745269775390625, 23.7279262542724609375, -40.754688262939453125),
-            Vec3fEq(-78.17134857177734375, -0.18108306825160980224609375, -37.128787994384765625),
-            Vec3fEq(-62.968158721923828125, -24.0900936126708984375, -33.50289154052734375),
-            Vec3fEq(-47.764972686767578125, -47.999103546142578125, -30.797946929931640625),
-            Vec3fEq(-23.852447509765625, -63.196765899658203125, -33.97112274169921875),
-            Vec3fEq(0.0600789971649646759033203125, -78.39443206787109375, -37.14543914794921875),
-            Vec3fEq(23.97260284423828125, -93.5920867919921875, -40.774089813232421875),
-            Vec3fEq(47.885128021240234375, -108.78974151611328125, -36.05129241943359375),
-            Vec3fEq(71.7976531982421875, -123.98740386962890625, -30.6235561370849609375),
-            Vec3fEq(95.71018218994140625, -139.18505859375, -25.1958255767822265625),
-            Vec3fEq(119.6226959228515625, -154.382720947265625, -19.7680912017822265625),
-            Vec3fEq(143.53521728515625, -169.58038330078125, -14.34035205841064453125),
-            Vec3fEq(167.4477386474609375, -184.778045654296875, -8.9126186370849609375),
-            Vec3fEq(191.360260009765625, -199.9757080078125, -3.4848802089691162109375),
-            Vec3fEq(215, -215, 1.87826788425445556640625)
-        ));
+            Vec3fEq(-204, 204, 1.99998295307159423828125),
+            Vec3fEq(-189.9427337646484375, 179.3997802734375, -3.622931003570556640625),
+            Vec3fEq(-175.8854522705078125, 154.7995452880859375, -9.24583911895751953125),
+            Vec3fEq(-161.82818603515625, 130.1993255615234375, -14.86874866485595703125),
+            Vec3fEq(-147.770904541015625, 105.5991058349609375, -20.4916591644287109375),
+            Vec3fEq(-133.7136383056640625, 80.99887847900390625, -26.1145648956298828125),
+            Vec3fEq(-119.65636444091796875, 56.39865875244140625, -31.7374725341796875),
+            Vec3fEq(-105.59909820556640625, 31.798435211181640625, -26.133396148681640625),
+            Vec3fEq(-91.54183197021484375, 7.1982135772705078125, -31.5624217987060546875),
+            Vec3fEq(-77.48455810546875, -17.402008056640625, -26.98972320556640625),
+            Vec3fEq(-63.427295684814453125, -42.00223541259765625, -19.9045581817626953125),
+            Vec3fEq(-42.193531036376953125, -60.761363983154296875, -20.4544773101806640625),
+            Vec3fEq(-20.9597682952880859375, -79.5204925537109375, -23.599918365478515625),
+            Vec3fEq(3.8312885761260986328125, -93.2384033203125, -30.7141361236572265625),
+            Vec3fEq(28.6223468780517578125, -106.95632171630859375, -24.8243885040283203125),
+            Vec3fEq(53.413402557373046875, -120.6742401123046875, -31.3303241729736328125),
+            Vec3fEq(78.20446014404296875, -134.39215087890625, -25.8431549072265625),
+            Vec3fEq(102.99552154541015625, -148.110076904296875, -20.3559894561767578125),
+            Vec3fEq(127.7865753173828125, -161.827972412109375, -14.868824005126953125),
+            Vec3fEq(152.57763671875, -175.5458984375, -9.3816623687744140625),
+            Vec3fEq(177.3686981201171875, -189.2638092041015625, -3.894496917724609375),
+            Vec3fEq(202.1597442626953125, -202.9817047119140625, 1.59266507625579833984375),
+            Vec3fEq(204, -204, 1.99998295307159423828125)
+        )) << mPath;
     }
 
     TEST_F(DetourNavigatorNavigatorTest, update_changed_object_should_change_navmesh)
@@ -268,30 +266,30 @@ namespace
         EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(-215, 215, 1.87826788425445556640625),
-            Vec3fEq(-199.7968292236328125, 191.09100341796875, -3.54876613616943359375),
-            Vec3fEq(-184.5936431884765625, 167.1819915771484375, -8.97847843170166015625),
-            Vec3fEq(-169.3904571533203125, 143.2729949951171875, -14.408184051513671875),
-            Vec3fEq(-154.1872711181640625, 119.36397552490234375, -19.837890625),
-            Vec3fEq(-138.9840850830078125, 95.45496368408203125, -25.2675991058349609375),
-            Vec3fEq(-123.78090667724609375, 71.54595184326171875, -30.6973056793212890625),
-            Vec3fEq(-108.57772064208984375, 47.636936187744140625, -36.12701416015625),
-            Vec3fEq(-93.3745269775390625, 23.7279262542724609375, -40.754688262939453125),
-            Vec3fEq(-78.17134857177734375, -0.18108306825160980224609375, -37.128787994384765625),
-            Vec3fEq(-62.968158721923828125, -24.0900936126708984375, -33.50289154052734375),
-            Vec3fEq(-47.764972686767578125, -47.999103546142578125, -30.797946929931640625),
-            Vec3fEq(-23.852447509765625, -63.196765899658203125, -33.97112274169921875),
-            Vec3fEq(0.0600789971649646759033203125, -78.39443206787109375, -37.14543914794921875),
-            Vec3fEq(23.97260284423828125, -93.5920867919921875, -40.774089813232421875),
-            Vec3fEq(47.885128021240234375, -108.78974151611328125, -36.05129241943359375),
-            Vec3fEq(71.7976531982421875, -123.98740386962890625, -30.6235561370849609375),
-            Vec3fEq(95.71018218994140625, -139.18505859375, -25.1958255767822265625),
-            Vec3fEq(119.6226959228515625, -154.382720947265625, -19.7680912017822265625),
-            Vec3fEq(143.53521728515625, -169.58038330078125, -14.34035205841064453125),
-            Vec3fEq(167.4477386474609375, -184.778045654296875, -8.9126186370849609375),
-            Vec3fEq(191.360260009765625, -199.9757080078125, -3.4848802089691162109375),
-            Vec3fEq(215, -215, 1.87826788425445556640625)
-        ));
+            Vec3fEq(-204, 204, 1.99998295307159423828125),
+            Vec3fEq(-189.9427337646484375, 179.3997802734375, -3.622931003570556640625),
+            Vec3fEq(-175.8854522705078125, 154.7995452880859375, -9.24583911895751953125),
+            Vec3fEq(-161.82818603515625, 130.1993255615234375, -14.86874866485595703125),
+            Vec3fEq(-147.770904541015625, 105.5991058349609375, -20.4916591644287109375),
+            Vec3fEq(-133.7136383056640625, 80.99887847900390625, -26.1145648956298828125),
+            Vec3fEq(-119.65636444091796875, 56.39865875244140625, -31.7374725341796875),
+            Vec3fEq(-105.59909820556640625, 31.798435211181640625, -26.133396148681640625),
+            Vec3fEq(-91.54183197021484375, 7.1982135772705078125, -31.5624217987060546875),
+            Vec3fEq(-77.48455810546875, -17.402008056640625, -26.98972320556640625),
+            Vec3fEq(-63.427295684814453125, -42.00223541259765625, -19.9045581817626953125),
+            Vec3fEq(-42.193531036376953125, -60.761363983154296875, -20.4544773101806640625),
+            Vec3fEq(-20.9597682952880859375, -79.5204925537109375, -23.599918365478515625),
+            Vec3fEq(3.8312885761260986328125, -93.2384033203125, -30.7141361236572265625),
+            Vec3fEq(28.6223468780517578125, -106.95632171630859375, -24.8243885040283203125),
+            Vec3fEq(53.413402557373046875, -120.6742401123046875, -31.3303241729736328125),
+            Vec3fEq(78.20446014404296875, -134.39215087890625, -25.8431549072265625),
+            Vec3fEq(102.99552154541015625, -148.110076904296875, -20.3559894561767578125),
+            Vec3fEq(127.7865753173828125, -161.827972412109375, -14.868824005126953125),
+            Vec3fEq(152.57763671875, -175.5458984375, -9.3816623687744140625),
+            Vec3fEq(177.3686981201171875, -189.2638092041015625, -3.894496917724609375),
+            Vec3fEq(202.1597442626953125, -202.9817047119140625, 1.59266507625579833984375),
+            Vec3fEq(204, -204, 1.99998295307159423828125)
+        )) << mPath;
 
         compoundShape.updateChildTransform(0, btTransform(btMatrix3x3::getIdentity(), btVector3(1000, 0, 0)));
 
@@ -304,30 +302,29 @@ namespace
         EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(-215, 215, 1.85963428020477294921875),
-            Vec3fEq(-194.9653167724609375, 194.9653167724609375, -6.57602214813232421875),
-            Vec3fEq(-174.930633544921875, 174.930633544921875, -15.01167774200439453125),
-            Vec3fEq(-154.8959503173828125, 154.8959503173828125, -23.4473361968994140625),
-            Vec3fEq(-134.86126708984375, 134.86126708984375, -31.8829936981201171875),
-            Vec3fEq(-114.82657623291015625, 114.82657623291015625, -40.3186492919921875),
-            Vec3fEq(-94.7918853759765625, 94.7918853759765625, -47.3990631103515625),
-            Vec3fEq(-74.75719451904296875, 74.75719451904296875, -53.7258148193359375),
-            Vec3fEq(-54.722499847412109375, 54.722499847412109375, -60.052555084228515625),
-            Vec3fEq(-34.68780517578125, 34.68780517578125, -66.37931060791015625),
-            Vec3fEq(-14.6531162261962890625, 14.6531162261962890625, -72.70604705810546875),
-            Vec3fEq(5.3815765380859375, -5.3815765380859375, -75.35065460205078125),
-            Vec3fEq(25.41626739501953125, -25.41626739501953125, -67.9694671630859375),
-            Vec3fEq(45.450958251953125, -45.450958251953125, -60.5882568359375),
-            Vec3fEq(65.48564910888671875, -65.48564910888671875, -53.20705413818359375),
-            Vec3fEq(85.5203399658203125, -85.5203399658203125, -45.8258514404296875),
-            Vec3fEq(105.55503082275390625, -105.55503082275390625, -38.44464874267578125),
-            Vec3fEq(125.5897216796875, -125.5897216796875, -31.063449859619140625),
-            Vec3fEq(145.6244049072265625, -145.6244049072265625, -23.6822509765625),
-            Vec3fEq(165.659088134765625, -165.659088134765625, -16.3010501861572265625),
-            Vec3fEq(185.6937713623046875, -185.6937713623046875, -8.91985416412353515625),
-            Vec3fEq(205.7284698486328125, -205.7284698486328125, -1.5386505126953125),
-            Vec3fEq(215, -215, 1.87718021869659423828125)
-        ));
+            Vec3fEq(-204, 204, 1.99998295307159423828125),
+            Vec3fEq(-183.965301513671875, 183.965301513671875, 1.99998819828033447265625),
+            Vec3fEq(-163.9306182861328125, 163.9306182861328125, 1.99999344348907470703125),
+            Vec3fEq(-143.89593505859375, 143.89593505859375, -2.7206256389617919921875),
+            Vec3fEq(-123.86124420166015625, 123.86124420166015625, -13.1089839935302734375),
+            Vec3fEq(-103.8265533447265625, 103.8265533447265625, -23.4973468780517578125),
+            Vec3fEq(-83.7918548583984375, 83.7918548583984375, -33.885707855224609375),
+            Vec3fEq(-63.75716400146484375, 63.75716400146484375, -44.27407073974609375),
+            Vec3fEq(-43.72247314453125, 43.72247314453125, -54.662433624267578125),
+            Vec3fEq(-23.6877803802490234375, 23.6877803802490234375, -65.0507965087890625),
+            Vec3fEq(-3.653090000152587890625, 3.653090000152587890625, -75.43915557861328125),
+            Vec3fEq(16.3816013336181640625, -16.3816013336181640625, -69.749267578125),
+            Vec3fEq(36.416290283203125, -36.416290283203125, -60.4739532470703125),
+            Vec3fEq(56.450984954833984375, -56.450984954833984375, -51.1986236572265625),
+            Vec3fEq(76.4856719970703125, -76.4856719970703125, -41.92330169677734375),
+            Vec3fEq(96.52036285400390625, -96.52036285400390625, -31.46941375732421875),
+            Vec3fEq(116.5550537109375, -116.5550537109375, -19.597003936767578125),
+            Vec3fEq(136.5897369384765625, -136.5897369384765625, -7.724592685699462890625),
+            Vec3fEq(156.6244354248046875, -156.6244354248046875, 1.99999535083770751953125),
+            Vec3fEq(176.6591339111328125, -176.6591339111328125, 1.99999010562896728515625),
+            Vec3fEq(196.693817138671875, -196.693817138671875, 1.99998486042022705078125),
+            Vec3fEq(204, -204, 1.99998295307159423828125)
+        )) << mPath;
     }
 
     TEST_F(DetourNavigatorNavigatorTest, for_overlapping_heightfields_should_use_higher)
@@ -361,30 +358,29 @@ namespace
         EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(-215, 215, 1.96328866481781005859375),
-            Vec3fEq(-194.9653167724609375, 194.9653167724609375, -0.242215454578399658203125),
-            Vec3fEq(-174.930633544921875, 174.930633544921875, -2.447719097137451171875),
-            Vec3fEq(-154.8959503173828125, 154.8959503173828125, -4.65322399139404296875),
-            Vec3fEq(-134.86126708984375, 134.86126708984375, -6.858726978302001953125),
-            Vec3fEq(-114.82657623291015625, 114.82657623291015625, -9.06423282623291015625),
-            Vec3fEq(-94.7918853759765625, 94.7918853759765625, -11.26973628997802734375),
-            Vec3fEq(-74.75719451904296875, 74.75719451904296875, -13.26497173309326171875),
-            Vec3fEq(-54.722499847412109375, 54.722499847412109375, -15.24860477447509765625),
-            Vec3fEq(-34.68780517578125, 34.68780517578125, -17.23223876953125),
-            Vec3fEq(-14.6531162261962890625, 14.6531162261962890625, -19.215869903564453125),
-            Vec3fEq(5.3815765380859375, -5.3815765380859375, -20.1338443756103515625),
-            Vec3fEq(25.41626739501953125, -25.41626739501953125, -18.1502132415771484375),
-            Vec3fEq(45.450958251953125, -45.450958251953125, -16.1665802001953125),
-            Vec3fEq(65.48564910888671875, -65.48564910888671875, -14.18294620513916015625),
-            Vec3fEq(85.5203399658203125, -85.5203399658203125, -12.199314117431640625),
-            Vec3fEq(105.55503082275390625, -105.55503082275390625, -10.08488368988037109375),
-            Vec3fEq(125.5897216796875, -125.5897216796875, -7.87938022613525390625),
-            Vec3fEq(145.6244049072265625, -145.6244049072265625, -5.673875331878662109375),
-            Vec3fEq(165.659088134765625, -165.659088134765625, -3.468370914459228515625),
-            Vec3fEq(185.6937713623046875, -185.6937713623046875, -1.26286637783050537109375),
-            Vec3fEq(205.7284698486328125, -205.7284698486328125, 0.942641556262969970703125),
-            Vec3fEq(215, -215, 1.96328866481781005859375)
-        ));
+            Vec3fEq(-204, 204, 1.999981403350830078125),
+            Vec3fEq(-183.965301513671875, 183.965301513671875, -0.428465187549591064453125),
+            Vec3fEq(-163.9306182861328125, 163.9306182861328125, -2.8569104671478271484375),
+            Vec3fEq(-143.89593505859375, 143.89593505859375, -5.28535556793212890625),
+            Vec3fEq(-123.86124420166015625, 123.86124420166015625, -7.7138004302978515625),
+            Vec3fEq(-103.8265533447265625, 103.8265533447265625, -10.142246246337890625),
+            Vec3fEq(-83.7918548583984375, 83.7918548583984375, -12.3704509735107421875),
+            Vec3fEq(-63.75716400146484375, 63.75716400146484375, -14.354084014892578125),
+            Vec3fEq(-43.72247314453125, 43.72247314453125, -16.3377170562744140625),
+            Vec3fEq(-23.6877803802490234375, 23.6877803802490234375, -18.32135009765625),
+            Vec3fEq(-3.653090000152587890625, 3.653090000152587890625, -20.3049831390380859375),
+            Vec3fEq(16.3816013336181640625, -16.3816013336181640625, -19.044734954833984375),
+            Vec3fEq(36.416290283203125, -36.416290283203125, -17.061100006103515625),
+            Vec3fEq(56.450984954833984375, -56.450984954833984375, -15.0774688720703125),
+            Vec3fEq(76.4856719970703125, -76.4856719970703125, -13.0938358306884765625),
+            Vec3fEq(96.52036285400390625, -96.52036285400390625, -11.02784252166748046875),
+            Vec3fEq(116.5550537109375, -116.5550537109375, -8.5993976593017578125),
+            Vec3fEq(136.5897369384765625, -136.5897369384765625, -6.170953273773193359375),
+            Vec3fEq(156.6244354248046875, -156.6244354248046875, -3.74250507354736328125),
+            Vec3fEq(176.6591339111328125, -176.6591339111328125, -1.314060688018798828125),
+            Vec3fEq(196.693817138671875, -196.693817138671875, 1.1143856048583984375),
+            Vec3fEq(204, -204, 1.9999811649322509765625)
+        )) << mPath;
     }
 
     TEST_F(DetourNavigatorNavigatorTest, path_should_be_around_avoid_shape)
@@ -417,31 +413,30 @@ namespace
         EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(-215, 215, 1.9393787384033203125),
-            Vec3fEq(-200.8159637451171875, 190.47265625, -0.639537751674652099609375),
-            Vec3fEq(-186.6319427490234375, 165.9453125, -3.2184507846832275390625),
-            Vec3fEq(-172.447906494140625, 141.41796875, -5.797363758087158203125),
-            Vec3fEq(-158.263885498046875, 116.8906097412109375, -8.37627696990966796875),
-            Vec3fEq(-144.079864501953125, 92.3632659912109375, -10.9551906585693359375),
-            Vec3fEq(-129.89581298828125, 67.83591461181640625, -13.53410625457763671875),
-            Vec3fEq(-115.7117919921875, 43.308563232421875, -16.1130199432373046875),
-            Vec3fEq(-101.5277557373046875, 18.7812137603759765625, -18.6919345855712890625),
-            Vec3fEq(-87.34372711181640625, -5.7461376190185546875, -20.4680538177490234375),
-            Vec3fEq(-67.02922821044921875, -25.4970550537109375, -20.514247894287109375),
-            Vec3fEq(-46.714717864990234375, -45.2479705810546875, -20.560443878173828125),
-            Vec3fEq(-26.40021514892578125, -64.99889373779296875, -20.6066417694091796875),
-            Vec3fEq(-6.085712432861328125, -84.74980926513671875, -20.652835845947265625),
-            Vec3fEq(14.22879505157470703125, -104.50072479248046875, -18.151397705078125),
-            Vec3fEq(39.05098724365234375, -118.16222381591796875, -15.66748714447021484375),
-            Vec3fEq(63.87317657470703125, -131.82373046875, -13.18358135223388671875),
-            Vec3fEq(88.69537353515625, -145.4852142333984375, -10.699672698974609375),
-            Vec3fEq(113.51757049560546875, -159.146697998046875, -8.21576786041259765625),
-            Vec3fEq(138.3397674560546875, -172.808197021484375, -5.731859683990478515625),
-            Vec3fEq(163.1619720458984375, -186.469696044921875, -3.2479507923126220703125),
-            Vec3fEq(187.984161376953125, -200.1311798095703125, -0.764044821262359619140625),
-            Vec3fEq(212.8063507080078125, -213.7926788330078125, 1.719865322113037109375),
-            Vec3fEq(215, -215, 1.9393787384033203125)
-        ));
+            Vec3fEq(-204, 204, 1.99997997283935546875),
+            Vec3fEq(-191.328948974609375, 178.65789794921875, -0.815807759761810302734375),
+            Vec3fEq(-178.65789794921875, 153.3157806396484375, -3.6315968036651611328125),
+            Vec3fEq(-165.986846923828125, 127.9736785888671875, -6.4473857879638671875),
+            Vec3fEq(-153.3157806396484375, 102.6315765380859375, -9.26317310333251953125),
+            Vec3fEq(-140.6447296142578125, 77.28946685791015625, -12.07896137237548828125),
+            Vec3fEq(-127.9736785888671875, 51.947368621826171875, -14.894748687744140625),
+            Vec3fEq(-115.3026275634765625, 26.6052646636962890625, -17.7105388641357421875),
+            Vec3fEq(-102.63158416748046875, 1.2631585597991943359375, -20.5263233184814453125),
+            Vec3fEq(-89.9605712890625, -24.0789661407470703125, -19.591716766357421875),
+            Vec3fEq(-68.54410552978515625, -42.629238128662109375, -19.847625732421875),
+            Vec3fEq(-47.127635955810546875, -61.17951202392578125, -20.1035366058349609375),
+            Vec3fEq(-25.711170196533203125, -79.72978973388671875, -20.359447479248046875),
+            Vec3fEq(-4.294706821441650390625, -98.280059814453125, -20.6153545379638671875),
+            Vec3fEq(17.121753692626953125, -116.83034515380859375, -17.3710460662841796875),
+            Vec3fEq(42.7990570068359375, -128.80755615234375, -14.7094440460205078125),
+            Vec3fEq(68.4763641357421875, -140.7847747802734375, -12.0478420257568359375),
+            Vec3fEq(94.15366363525390625, -152.761993408203125, -9.3862361907958984375),
+            Vec3fEq(119.83097076416015625, -164.7392120361328125, -6.724635601043701171875),
+            Vec3fEq(145.508270263671875, -176.7164306640625, -4.06303119659423828125),
+            Vec3fEq(171.185577392578125, -188.69366455078125, -1.40142619609832763671875),
+            Vec3fEq(196.862884521484375, -200.6708831787109375, 1.2601754665374755859375),
+            Vec3fEq(204, -204, 1.999979496002197265625)
+        )) << mPath;
     }
 
     TEST_F(DetourNavigatorNavigatorTest, path_should_be_over_water_ground_lower_than_water_with_only_swim_flag)
@@ -469,25 +464,24 @@ namespace
 
         EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_swim, mAreaCosts, mOut), Status::Success);
 
-        EXPECT_EQ(mPath, std::deque<osg::Vec3f>({
-            osg::Vec3f(0, 215, 185.33331298828125),
-            osg::Vec3f(0, 186.6666717529296875, 185.33331298828125),
-            osg::Vec3f(0, 158.333343505859375, 185.33331298828125),
-            osg::Vec3f(0, 130.0000152587890625, 185.33331298828125),
-            osg::Vec3f(0, 101.66667938232421875, 185.33331298828125),
-            osg::Vec3f(0, 73.333343505859375, 185.33331298828125),
-            osg::Vec3f(0, 45.0000152587890625, 185.33331298828125),
-            osg::Vec3f(0, 16.6666812896728515625, 185.33331298828125),
-            osg::Vec3f(0, -11.66664981842041015625, 185.33331298828125),
-            osg::Vec3f(0, -39.999980926513671875, 185.33331298828125),
-            osg::Vec3f(0, -68.33331298828125, 185.33331298828125),
-            osg::Vec3f(0, -96.66664886474609375, 185.33331298828125),
-            osg::Vec3f(0, -124.99997711181640625, 185.33331298828125),
-            osg::Vec3f(0, -153.33331298828125, 185.33331298828125),
-            osg::Vec3f(0, -181.6666412353515625, 185.33331298828125),
-            osg::Vec3f(0, -209.999969482421875, 185.33331298828125),
-            osg::Vec3f(0, -215, 185.33331298828125),
-        })) << mPath;
+        EXPECT_THAT(mPath, ElementsAre(
+            Vec3fEq(0, 204, 185.33331298828125),
+            Vec3fEq(0, 175.6666717529296875, 185.33331298828125),
+            Vec3fEq(0, 147.3333282470703125, 185.33331298828125),
+            Vec3fEq(0, 119, 185.33331298828125),
+            Vec3fEq(0, 90.6666717529296875, 185.33331298828125),
+            Vec3fEq(0, 62.333339691162109375, 185.33331298828125),
+            Vec3fEq(0, 34.00000762939453125, 185.33331298828125),
+            Vec3fEq(0, 5.66667461395263671875, 185.33331298828125),
+            Vec3fEq(0, -22.6666584014892578125, 185.33331298828125),
+            Vec3fEq(0, -50.999988555908203125, 185.33331298828125),
+            Vec3fEq(0, -79.33332061767578125, 185.33331298828125),
+            Vec3fEq(0, -107.666656494140625, 185.33331298828125),
+            Vec3fEq(0, -135.9999847412109375, 185.33331298828125),
+            Vec3fEq(0, -164.33331298828125, 185.33331298828125),
+            Vec3fEq(0, -192.666656494140625, 185.33331298828125),
+            Vec3fEq(0, -204, 185.33331298828125)
+        )) << mPath;
     }
 
     TEST_F(DetourNavigatorNavigatorTest, path_should_be_over_water_when_ground_cross_water_with_swim_and_walk_flags)
@@ -516,25 +510,24 @@ namespace
         EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_swim | Flag_walk, mAreaCosts, mOut),
                   Status::Success);
 
-        EXPECT_EQ(mPath, std::deque<osg::Vec3f>({
-            osg::Vec3f(0, 215, -94.75363922119140625),
-            osg::Vec3f(0, 186.6666717529296875, -106.0000152587890625),
-            osg::Vec3f(0, 158.333343505859375, -115.85507965087890625),
-            osg::Vec3f(0, 130.0000152587890625, -125.71016693115234375),
-            osg::Vec3f(0, 101.66667938232421875, -135.5652313232421875),
-            osg::Vec3f(0, 73.333343505859375, -143.3333587646484375),
-            osg::Vec3f(0, 45.0000152587890625, -143.3333587646484375),
-            osg::Vec3f(0, 16.6666812896728515625, -143.3333587646484375),
-            osg::Vec3f(0, -11.66664981842041015625, -143.3333587646484375),
-            osg::Vec3f(0, -39.999980926513671875, -143.3333587646484375),
-            osg::Vec3f(0, -68.33331298828125, -143.3333587646484375),
-            osg::Vec3f(0, -96.66664886474609375, -137.3043670654296875),
-            osg::Vec3f(0, -124.99997711181640625, -127.44930267333984375),
-            osg::Vec3f(0, -153.33331298828125, -117.59423065185546875),
-            osg::Vec3f(0, -181.6666412353515625, -107.73915863037109375),
-            osg::Vec3f(0, -209.999969482421875, -97.7971343994140625),
-            osg::Vec3f(0, -215, -94.75363922119140625),
-        })) << mPath;
+        EXPECT_THAT(mPath, ElementsAre(
+            Vec3fEq(0, 204, -98.000030517578125),
+            Vec3fEq(0, 175.6666717529296875, -108.30306243896484375),
+            Vec3fEq(0, 147.3333282470703125, -118.6060791015625),
+            Vec3fEq(0, 119, -128.90911865234375),
+            Vec3fEq(0, 90.6666717529296875, -139.2121429443359375),
+            Vec3fEq(0, 62.333339691162109375, -143.3333587646484375),
+            Vec3fEq(0, 34.00000762939453125, -143.3333587646484375),
+            Vec3fEq(0, 5.66667461395263671875, -143.3333587646484375),
+            Vec3fEq(0, -22.6666584014892578125, -143.3333587646484375),
+            Vec3fEq(0, -50.999988555908203125, -143.3333587646484375),
+            Vec3fEq(0, -79.33332061767578125, -143.3333587646484375),
+            Vec3fEq(0, -107.666656494140625, -133.0303192138671875),
+            Vec3fEq(0, -135.9999847412109375, -122.72728729248046875),
+            Vec3fEq(0, -164.33331298828125, -112.4242706298828125),
+            Vec3fEq(0, -192.666656494140625, -102.12123870849609375),
+            Vec3fEq(0, -204, -98.00002288818359375)
+        )) << mPath;
     }
 
     TEST_F(DetourNavigatorNavigatorTest, path_should_be_over_water_when_ground_cross_water_with_max_int_cells_size_and_swim_and_walk_flags)
@@ -563,25 +556,24 @@ namespace
         EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_swim | Flag_walk, mAreaCosts, mOut),
                   Status::Success);
 
-        EXPECT_EQ(mPath, std::deque<osg::Vec3f>({
-            osg::Vec3f(0, 215, -94.75363922119140625),
-            osg::Vec3f(0, 186.6666717529296875, -106.0000152587890625),
-            osg::Vec3f(0, 158.333343505859375, -115.85507965087890625),
-            osg::Vec3f(0, 130.0000152587890625, -125.71016693115234375),
-            osg::Vec3f(0, 101.66667938232421875, -135.5652313232421875),
-            osg::Vec3f(0, 73.333343505859375, -143.3333587646484375),
-            osg::Vec3f(0, 45.0000152587890625, -143.3333587646484375),
-            osg::Vec3f(0, 16.6666812896728515625, -143.3333587646484375),
-            osg::Vec3f(0, -11.66664981842041015625, -143.3333587646484375),
-            osg::Vec3f(0, -39.999980926513671875, -143.3333587646484375),
-            osg::Vec3f(0, -68.33331298828125, -143.3333587646484375),
-            osg::Vec3f(0, -96.66664886474609375, -137.3043670654296875),
-            osg::Vec3f(0, -124.99997711181640625, -127.44930267333984375),
-            osg::Vec3f(0, -153.33331298828125, -117.59423065185546875),
-            osg::Vec3f(0, -181.6666412353515625, -107.73915863037109375),
-            osg::Vec3f(0, -209.999969482421875, -97.7971343994140625),
-            osg::Vec3f(0, -215, -94.75363922119140625),
-        })) << mPath;
+        EXPECT_THAT(mPath, ElementsAre(
+            Vec3fEq(0, 204, -98.000030517578125),
+            Vec3fEq(0, 175.6666717529296875, -108.30306243896484375),
+            Vec3fEq(0, 147.3333282470703125, -118.6060791015625),
+            Vec3fEq(0, 119, -128.90911865234375),
+            Vec3fEq(0, 90.6666717529296875, -139.2121429443359375),
+            Vec3fEq(0, 62.333339691162109375, -143.3333587646484375),
+            Vec3fEq(0, 34.00000762939453125, -143.3333587646484375),
+            Vec3fEq(0, 5.66667461395263671875, -143.3333587646484375),
+            Vec3fEq(0, -22.6666584014892578125, -143.3333587646484375),
+            Vec3fEq(0, -50.999988555908203125, -143.3333587646484375),
+            Vec3fEq(0, -79.33332061767578125, -143.3333587646484375),
+            Vec3fEq(0, -107.666656494140625, -133.0303192138671875),
+            Vec3fEq(0, -135.9999847412109375, -122.72728729248046875),
+            Vec3fEq(0, -164.33331298828125, -112.4242706298828125),
+            Vec3fEq(0, -192.666656494140625, -102.12123870849609375),
+            Vec3fEq(0, -204, -98.00002288818359375)
+        )) << mPath;
     }
 
     TEST_F(DetourNavigatorNavigatorTest, path_should_be_over_ground_when_ground_cross_water_with_only_walk_flag)
@@ -610,25 +602,24 @@ namespace
         EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(0, 215, -94.75363922119140625),
-            Vec3fEq(9.8083515167236328125, 188.4185333251953125, -105.199951171875),
-            Vec3fEq(19.6167049407958984375, 161.837066650390625, -114.25495147705078125),
-            Vec3fEq(29.42505645751953125, 135.255615234375, -123.309967041015625),
-            Vec3fEq(39.23340606689453125, 108.674163818359375, -132.3649749755859375),
-            Vec3fEq(49.04175567626953125, 82.09270477294921875, -137.2874755859375),
-            Vec3fEq(58.8501129150390625, 55.5112457275390625, -139.2451171875),
-            Vec3fEq(68.6584625244140625, 28.9297885894775390625, -141.2027740478515625),
-            Vec3fEq(78.4668121337890625, 2.3483295440673828125, -143.1604156494140625),
-            Vec3fEq(88.27516937255859375, -24.233127593994140625, -141.3894805908203125),
-            Vec3fEq(83.73651885986328125, -52.2005767822265625, -142.3761444091796875),
-            Vec3fEq(79.19786834716796875, -80.16802978515625, -143.114837646484375),
-            Vec3fEq(64.8477935791015625, -104.598602294921875, -137.840911865234375),
-            Vec3fEq(50.497714996337890625, -129.0291748046875, -131.45831298828125),
-            Vec3fEq(36.147632598876953125, -153.459747314453125, -121.42321014404296875),
-            Vec3fEq(21.7975559234619140625, -177.8903350830078125, -111.38811492919921875),
-            Vec3fEq(7.44747829437255859375, -202.3209075927734375, -101.19382476806640625),
-            Vec3fEq(0, -215, -94.75363922119140625)
-        ));
+            Vec3fEq(0, 204, -98.000030517578125),
+            Vec3fEq(10.26930999755859375, 177.59320068359375, -107.4711456298828125),
+            Vec3fEq(20.5386199951171875, 151.1864166259765625, -116.9422607421875),
+            Vec3fEq(30.8079280853271484375, 124.77960968017578125, -126.41339111328125),
+            Vec3fEq(41.077239990234375, 98.37281036376953125, -135.8845062255859375),
+            Vec3fEq(51.346546173095703125, 71.96601104736328125, -138.2003936767578125),
+            Vec3fEq(61.615856170654296875, 45.559215545654296875, -140.0838470458984375),
+            Vec3fEq(71.88516998291015625, 19.1524181365966796875, -141.9673004150390625),
+            Vec3fEq(82.15447235107421875, -7.254379749298095703125, -142.3074798583984375),
+            Vec3fEq(81.04636383056640625, -35.56603240966796875, -142.7104339599609375),
+            Vec3fEq(79.93825531005859375, -63.877685546875, -143.1133880615234375),
+            Vec3fEq(78.83014678955078125, -92.18933868408203125, -138.7660675048828125),
+            Vec3fEq(62.50392913818359375, -115.3460235595703125, -130.237823486328125),
+            Vec3fEq(46.17771148681640625, -138.502716064453125, -121.8172149658203125),
+            Vec3fEq(29.85149383544921875, -161.6594085693359375, -113.39659881591796875),
+            Vec3fEq(13.52527523040771484375, -184.81610107421875, -104.97599029541015625),
+            Vec3fEq(0, -204, -98.00002288818359375)
+        )) << mPath;
     }
 
     TEST_F(DetourNavigatorNavigatorTest, update_remove_and_update_then_find_path_should_return_path)
@@ -659,30 +650,29 @@ namespace
         EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(-215, 215, 1.85963428020477294921875),
-            Vec3fEq(-194.9653167724609375, 194.9653167724609375, -6.57602214813232421875),
-            Vec3fEq(-174.930633544921875, 174.930633544921875, -15.01167774200439453125),
-            Vec3fEq(-154.8959503173828125, 154.8959503173828125, -23.4473361968994140625),
-            Vec3fEq(-134.86126708984375, 134.86126708984375, -31.8829936981201171875),
-            Vec3fEq(-114.82657623291015625, 114.82657623291015625, -40.3186492919921875),
-            Vec3fEq(-94.7918853759765625, 94.7918853759765625, -47.3990631103515625),
-            Vec3fEq(-74.75719451904296875, 74.75719451904296875, -53.7258148193359375),
-            Vec3fEq(-54.722499847412109375, 54.722499847412109375, -60.052555084228515625),
-            Vec3fEq(-34.68780517578125, 34.68780517578125, -66.37931060791015625),
-            Vec3fEq(-14.6531162261962890625, 14.6531162261962890625, -72.70604705810546875),
-            Vec3fEq(5.3815765380859375, -5.3815765380859375, -75.35065460205078125),
-            Vec3fEq(25.41626739501953125, -25.41626739501953125, -67.9694671630859375),
-            Vec3fEq(45.450958251953125, -45.450958251953125, -60.5882568359375),
-            Vec3fEq(65.48564910888671875, -65.48564910888671875, -53.20705413818359375),
-            Vec3fEq(85.5203399658203125, -85.5203399658203125, -45.8258514404296875),
-            Vec3fEq(105.55503082275390625, -105.55503082275390625, -38.44464874267578125),
-            Vec3fEq(125.5897216796875, -125.5897216796875, -31.063449859619140625),
-            Vec3fEq(145.6244049072265625, -145.6244049072265625, -23.6822509765625),
-            Vec3fEq(165.659088134765625, -165.659088134765625, -16.3010501861572265625),
-            Vec3fEq(185.6937713623046875, -185.6937713623046875, -8.91985416412353515625),
-            Vec3fEq(205.7284698486328125, -205.7284698486328125, -1.5386505126953125),
-            Vec3fEq(215, -215, 1.87718021869659423828125)
-        ));
+            Vec3fEq(-204, 204, 1.99998295307159423828125),
+            Vec3fEq(-183.965301513671875, 183.965301513671875, 1.99998819828033447265625),
+            Vec3fEq(-163.9306182861328125, 163.9306182861328125, 1.99999344348907470703125),
+            Vec3fEq(-143.89593505859375, 143.89593505859375, -2.7206256389617919921875),
+            Vec3fEq(-123.86124420166015625, 123.86124420166015625, -13.1089839935302734375),
+            Vec3fEq(-103.8265533447265625, 103.8265533447265625, -23.4973468780517578125),
+            Vec3fEq(-83.7918548583984375, 83.7918548583984375, -33.885707855224609375),
+            Vec3fEq(-63.75716400146484375, 63.75716400146484375, -44.27407073974609375),
+            Vec3fEq(-43.72247314453125, 43.72247314453125, -54.662433624267578125),
+            Vec3fEq(-23.6877803802490234375, 23.6877803802490234375, -65.0507965087890625),
+            Vec3fEq(-3.653090000152587890625, 3.653090000152587890625, -75.43915557861328125),
+            Vec3fEq(16.3816013336181640625, -16.3816013336181640625, -69.749267578125),
+            Vec3fEq(36.416290283203125, -36.416290283203125, -60.4739532470703125),
+            Vec3fEq(56.450984954833984375, -56.450984954833984375, -51.1986236572265625),
+            Vec3fEq(76.4856719970703125, -76.4856719970703125, -41.92330169677734375),
+            Vec3fEq(96.52036285400390625, -96.52036285400390625, -31.46941375732421875),
+            Vec3fEq(116.5550537109375, -116.5550537109375, -19.597003936767578125),
+            Vec3fEq(136.5897369384765625, -136.5897369384765625, -7.724592685699462890625),
+            Vec3fEq(156.6244354248046875, -156.6244354248046875, 1.99999535083770751953125),
+            Vec3fEq(176.6591339111328125, -176.6591339111328125, 1.99999010562896728515625),
+            Vec3fEq(196.693817138671875, -196.693817138671875, 1.99998486042022705078125),
+            Vec3fEq(204, -204, 1.99998295307159423828125)
+        )) << mPath;
     }
 
     TEST_F(DetourNavigatorNavigatorTest, update_then_find_random_point_around_circle_should_return_position)
@@ -706,11 +696,12 @@ namespace
 
         const auto result = mNavigator->findRandomPointAroundCircle(mAgentHalfExtents, mStart, 100.0, Flag_walk);
 
-        ASSERT_THAT(result, Optional(Vec3fEq(-209.95985412597656, 129.89768981933594, -0.26253718137741089)));
+        ASSERT_THAT(result, Optional(Vec3fEq(-198.909332275390625, 123.06096649169921875, 1.99998414516448974609375)))
+            << (result ? *result : osg::Vec3f());
 
         const auto distance = (*result - mStart).length();
 
-        EXPECT_FLOAT_EQ(distance, 85.260780334472656);
+        EXPECT_FLOAT_EQ(distance, 81.105133056640625) << distance;
     }
 
     TEST_F(DetourNavigatorNavigatorTest, multiple_threads_should_lock_tiles)
@@ -754,29 +745,29 @@ namespace
         EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(-215, 215, 1.8782780170440673828125),
-            Vec3fEq(-199.7968292236328125, 191.09100341796875, -3.54875946044921875),
-            Vec3fEq(-184.5936431884765625, 167.1819915771484375, -8.97846889495849609375),
-            Vec3fEq(-169.3904571533203125, 143.2729949951171875, -14.40818119049072265625),
-            Vec3fEq(-154.1872711181640625, 119.363983154296875, -19.837886810302734375),
-            Vec3fEq(-138.9840850830078125, 95.4549713134765625, -25.2675952911376953125),
-            Vec3fEq(-123.78090667724609375, 71.54595947265625, -30.6973056793212890625),
-            Vec3fEq(-108.57772064208984375, 47.63695526123046875, -36.12701416015625),
-            Vec3fEq(-93.3745269775390625, 23.72794342041015625, -40.754695892333984375),
-            Vec3fEq(-78.17134857177734375, -0.18106450140476226806640625, -37.128795623779296875),
-            Vec3fEq(-62.968158721923828125, -24.0900726318359375, -33.50289154052734375),
-            Vec3fEq(-47.764972686767578125, -47.99908447265625, -30.797946929931640625),
-            Vec3fEq(-23.8524494171142578125, -63.196746826171875, -33.97112274169921875),
-            Vec3fEq(0.0600722394883632659912109375, -78.3944091796875, -37.14543914794921875),
-            Vec3fEq(23.97259521484375, -93.592071533203125, -40.774089813232421875),
-            Vec3fEq(47.885120391845703125, -108.78974151611328125, -36.051296234130859375),
-            Vec3fEq(71.797637939453125, -123.98740386962890625, -30.62355804443359375),
-            Vec3fEq(95.71016693115234375, -139.18505859375, -25.195819854736328125),
-            Vec3fEq(119.6226806640625, -154.382720947265625, -19.768085479736328125),
-            Vec3fEq(143.5352020263671875, -169.5803680419921875, -14.34035015106201171875),
-            Vec3fEq(167.447723388671875, -184.7780303955078125, -8.912616729736328125),
-            Vec3fEq(191.3602294921875, -199.9756927490234375, -3.48488140106201171875),
-            Vec3fEq(215, -215, 1.8782813549041748046875)
+            Vec3fEq(-204, 204, 1.99998295307159423828125),
+            Vec3fEq(-189.9427337646484375, 179.3997802734375, 1.9999866485595703125),
+            Vec3fEq(-175.8854522705078125, 154.7995452880859375, 1.99999034404754638671875),
+            Vec3fEq(-161.82818603515625, 130.1993255615234375, -3.701923847198486328125),
+            Vec3fEq(-147.770904541015625, 105.5991058349609375, -15.67664432525634765625),
+            Vec3fEq(-133.7136383056640625, 80.99887847900390625, -27.6513614654541015625),
+            Vec3fEq(-119.65636444091796875, 56.39865875244140625, -20.1209163665771484375),
+            Vec3fEq(-105.59909820556640625, 31.798435211181640625, -25.0669879913330078125),
+            Vec3fEq(-91.54183197021484375, 7.1982135772705078125, -31.5624217987060546875),
+            Vec3fEq(-77.48455810546875, -17.402008056640625, -26.98972320556640625),
+            Vec3fEq(-63.427295684814453125, -42.00223541259765625, -19.9045581817626953125),
+            Vec3fEq(-42.193531036376953125, -60.761363983154296875, -20.4544773101806640625),
+            Vec3fEq(-20.9597682952880859375, -79.5204925537109375, -23.599918365478515625),
+            Vec3fEq(3.8312885761260986328125, -93.2384033203125, -30.7141361236572265625),
+            Vec3fEq(28.6223468780517578125, -106.95632171630859375, -24.1782474517822265625),
+            Vec3fEq(53.413402557373046875, -120.6742401123046875, -19.4096889495849609375),
+            Vec3fEq(78.20446014404296875, -134.39215087890625, -27.6632633209228515625),
+            Vec3fEq(102.99552154541015625, -148.110076904296875, -15.8613681793212890625),
+            Vec3fEq(127.7865753173828125, -161.827972412109375, -4.059485912322998046875),
+            Vec3fEq(152.57763671875, -175.5458984375, 1.9999904632568359375),
+            Vec3fEq(177.3686981201171875, -189.2638092041015625, 1.9999866485595703125),
+            Vec3fEq(202.1597442626953125, -202.9817047119140625, 1.9999830722808837890625),
+            Vec3fEq(204, -204, 1.99998295307159423828125)
         )) << mPath;
     }
 
@@ -836,7 +827,8 @@ namespace
 
         const auto result = mNavigator->raycast(mAgentHalfExtents, mStart, mEnd, Flag_walk);
 
-        ASSERT_THAT(result, Optional(Vec3fEq(mEnd.x(), mEnd.y(), 1.87719)));
+        ASSERT_THAT(result, Optional(Vec3fEq(mEnd.x(), mEnd.y(), 1.99998295307159423828125)))
+            << (result ? *result : osg::Vec3f());
     }
 
     TEST_F(DetourNavigatorNavigatorTest, update_for_oscillating_object_that_does_not_change_navmesh_should_not_trigger_navmesh_update)
diff --git a/components/detournavigator/settingsutils.hpp b/components/detournavigator/settingsutils.hpp
index 8f1c96e286..245e4a7e56 100644
--- a/components/detournavigator/settingsutils.hpp
+++ b/components/detournavigator/settingsutils.hpp
@@ -12,7 +12,8 @@
 #include <osg/Vec2i>
 #include <osg/Vec3f>
 
-#include <utility>
+#include <algorithm>
+#include <cmath>
 
 namespace DetourNavigator
 {
@@ -28,7 +29,7 @@ namespace DetourNavigator
 
     inline float getRadius(const Settings& settings, const osg::Vec3f& agentHalfExtents)
     {
-        return agentHalfExtents.x() * settings.mRecastScaleFactor;
+        return std::max(agentHalfExtents.x(), agentHalfExtents.y()) * std::sqrt(2) * settings.mRecastScaleFactor;
     }
 
     inline float toNavMeshCoordinates(const Settings& settings, float value)

From 3e98db8d60174b1fb8ed5ac61dfefc6e50f89223 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 27 Jun 2021 15:23:15 +0200
Subject: [PATCH 0903/2859] Fix styleguide

---
 components/detournavigator/offmeshconnectionsmanager.hpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/components/detournavigator/offmeshconnectionsmanager.hpp b/components/detournavigator/offmeshconnectionsmanager.hpp
index 1ad96e3b97..2755adc8ba 100644
--- a/components/detournavigator/offmeshconnectionsmanager.hpp
+++ b/components/detournavigator/offmeshconnectionsmanager.hpp
@@ -47,9 +47,8 @@ namespace DetourNavigator
 
             const auto byId = values->mById.equal_range(id);
 
-            if (byId.first == byId.second) {
+            if (byId.first == byId.second)
                 return {};
-            }
 
             std::set<TilePosition> removed;
 

From 7f65a2c4c24865d93e70a5e7d738db64a2831bee Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 27 Jun 2021 16:38:43 +0200
Subject: [PATCH 0904/2859] Remove unused code

---
 components/detournavigator/offmeshconnectionsmanager.hpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/components/detournavigator/offmeshconnectionsmanager.hpp b/components/detournavigator/offmeshconnectionsmanager.hpp
index 2755adc8ba..6050da8a01 100644
--- a/components/detournavigator/offmeshconnectionsmanager.hpp
+++ b/components/detournavigator/offmeshconnectionsmanager.hpp
@@ -98,14 +98,6 @@ namespace DetourNavigator
 
         const Settings& mSettings;
         Misc::ScopeGuarded<Values> mValues;
-
-        void removeByTilePosition(std::map<TilePosition, std::unordered_set<ObjectId>>& valuesByTilePosition,
-            const TilePosition& tilePosition, const ObjectId id)
-        {
-            const auto it = valuesByTilePosition.find(tilePosition);
-            if (it != valuesByTilePosition.end())
-                it->second.erase(id);
-        }
     };
 }
 

From 81e569c3d985d2d22549472642564c5e43aee6ac Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 27 Jun 2021 16:22:30 +0200
Subject: [PATCH 0905/2859] Move OffMeshConnectionsManager implementation into
 cpp

---
 components/CMakeLists.txt                     |  1 +
 .../offmeshconnectionsmanager.cpp             | 80 +++++++++++++++++++
 .../offmeshconnectionsmanager.hpp             | 71 +---------------
 3 files changed, 85 insertions(+), 67 deletions(-)
 create mode 100644 components/detournavigator/offmeshconnectionsmanager.cpp

diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 06ae0791d7..7860f492ce 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -183,6 +183,7 @@ add_component_dir(detournavigator
     raycast
     navmeshtileview
     oscillatingrecastmeshobject
+    offmeshconnectionsmanager
     )
 
 set (ESM_UI ${CMAKE_SOURCE_DIR}/files/ui/contentselector.ui
diff --git a/components/detournavigator/offmeshconnectionsmanager.cpp b/components/detournavigator/offmeshconnectionsmanager.cpp
new file mode 100644
index 0000000000..bb2ed773a5
--- /dev/null
+++ b/components/detournavigator/offmeshconnectionsmanager.cpp
@@ -0,0 +1,80 @@
+#include "offmeshconnectionsmanager.hpp"
+#include "settings.hpp"
+#include "settingsutils.hpp"
+#include "tileposition.hpp"
+#include "objectid.hpp"
+#include "offmeshconnection.hpp"
+
+#include <algorithm>
+#include <vector>
+#include <set>
+
+namespace DetourNavigator
+{
+    OffMeshConnectionsManager::OffMeshConnectionsManager(const Settings& settings)
+        : mSettings(settings)
+    {}
+
+    void OffMeshConnectionsManager::add(const ObjectId id, const OffMeshConnection& value)
+    {
+        const auto values = mValues.lock();
+
+        values->mById.insert(std::make_pair(id, value));
+
+        const auto startTilePosition = getTilePosition(mSettings, value.mStart);
+        const auto endTilePosition = getTilePosition(mSettings, value.mEnd);
+
+        values->mByTilePosition[startTilePosition].insert(id);
+
+        if (startTilePosition != endTilePosition)
+            values->mByTilePosition[endTilePosition].insert(id);
+    }
+
+    std::set<TilePosition> OffMeshConnectionsManager::remove(const ObjectId id)
+    {
+        const auto values = mValues.lock();
+
+        const auto byId = values->mById.equal_range(id);
+
+        if (byId.first == byId.second)
+            return {};
+
+        std::set<TilePosition> removed;
+
+        std::for_each(byId.first, byId.second, [&] (const auto& v) {
+            const auto startTilePosition = getTilePosition(mSettings, v.second.mStart);
+            const auto endTilePosition = getTilePosition(mSettings, v.second.mEnd);
+
+            removed.emplace(startTilePosition);
+            if (startTilePosition != endTilePosition)
+                removed.emplace(endTilePosition);
+        });
+
+        values->mById.erase(byId.first, byId.second);
+
+        return removed;
+    }
+
+    std::vector<OffMeshConnection> OffMeshConnectionsManager::get(const TilePosition& tilePosition)
+    {
+        std::vector<OffMeshConnection> result;
+
+        const auto values = mValues.lock();
+
+        const auto itByTilePosition = values->mByTilePosition.find(tilePosition);
+
+        if (itByTilePosition == values->mByTilePosition.end())
+            return result;
+
+        std::for_each(itByTilePosition->second.begin(), itByTilePosition->second.end(),
+            [&] (const ObjectId v)
+            {
+                const auto byId = values->mById.equal_range(v);
+                std::for_each(byId.first, byId.second, [&] (const auto& v) { result.push_back(v.second); });
+            });
+
+        std::sort(result.begin(), result.end());
+
+        return result;
+    }
+}
diff --git a/components/detournavigator/offmeshconnectionsmanager.hpp b/components/detournavigator/offmeshconnectionsmanager.hpp
index 6050da8a01..20a6427cd5 100644
--- a/components/detournavigator/offmeshconnectionsmanager.hpp
+++ b/components/detournavigator/offmeshconnectionsmanager.hpp
@@ -2,16 +2,12 @@
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_OFFMESHCONNECTIONSMANAGER_H
 
 #include "settings.hpp"
-#include "settingsutils.hpp"
 #include "tileposition.hpp"
 #include "objectid.hpp"
 #include "offmeshconnection.hpp"
 
 #include <components/misc/guarded.hpp>
 
-#include <osg/Vec3f>
-
-#include <algorithm>
 #include <map>
 #include <unordered_set>
 #include <vector>
@@ -22,72 +18,13 @@ namespace DetourNavigator
     class OffMeshConnectionsManager
     {
     public:
-        OffMeshConnectionsManager(const Settings& settings)
-            : mSettings(settings)
-        {}
-
-        void add(const ObjectId id, const OffMeshConnection& value)
-        {
-            const auto values = mValues.lock();
-
-            values->mById.insert(std::make_pair(id, value));
-
-            const auto startTilePosition = getTilePosition(mSettings, value.mStart);
-            const auto endTilePosition = getTilePosition(mSettings, value.mEnd);
-
-            values->mByTilePosition[startTilePosition].insert(id);
-
-            if (startTilePosition != endTilePosition)
-                values->mByTilePosition[endTilePosition].insert(id);
-        }
-
-        std::set<TilePosition> remove(const ObjectId id)
-        {
-            const auto values = mValues.lock();
-
-            const auto byId = values->mById.equal_range(id);
-
-            if (byId.first == byId.second)
-                return {};
-
-            std::set<TilePosition> removed;
-
-            std::for_each(byId.first, byId.second, [&] (const auto& v) {
-                const auto startTilePosition = getTilePosition(mSettings, v.second.mStart);
-                const auto endTilePosition = getTilePosition(mSettings, v.second.mEnd);
-
-                removed.emplace(startTilePosition);
-                if (startTilePosition != endTilePosition)
-                    removed.emplace(endTilePosition);
-            });
-
-            values->mById.erase(byId.first, byId.second);
-
-            return removed;
-        }
-
-        std::vector<OffMeshConnection> get(const TilePosition& tilePosition)
-        {
-            std::vector<OffMeshConnection> result;
-
-            const auto values = mValues.lock();
-
-            const auto itByTilePosition = values->mByTilePosition.find(tilePosition);
-
-            if (itByTilePosition == values->mByTilePosition.end())
-                return result;
+        OffMeshConnectionsManager(const Settings& settings);
 
-            std::for_each(itByTilePosition->second.begin(), itByTilePosition->second.end(),
-                [&] (const ObjectId v)
-                {
-                    const auto byId = values->mById.equal_range(v);
-                    std::for_each(byId.first, byId.second, [&] (const auto& v) { result.push_back(v.second); });
-                });
+        void add(const ObjectId id, const OffMeshConnection& value);
 
-            std::sort(result.begin(), result.end());
+        std::set<TilePosition> remove(const ObjectId id);
 
-            return result;
-        }
+        std::vector<OffMeshConnection> get(const TilePosition& tilePosition);
 
     private:
         struct Values

From a8ba9a0e2a778ffb36bb308b613923ffdad60f5b Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 27 Jun 2021 16:25:56 +0200
Subject: [PATCH 0906/2859] Cleanup unused tile positions from
 OffMeshConnectionsManager

---
 .../detournavigator/offmeshconnectionsmanager.cpp      | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/components/detournavigator/offmeshconnectionsmanager.cpp b/components/detournavigator/offmeshconnectionsmanager.cpp
index bb2ed773a5..c483934fb4 100644
--- a/components/detournavigator/offmeshconnectionsmanager.cpp
+++ b/components/detournavigator/offmeshconnectionsmanager.cpp
@@ -50,6 +50,16 @@ namespace DetourNavigator
                 removed.emplace(endTilePosition);
         });
 
+        for (const TilePosition& tilePosition : removed)
+        {
+            const auto it = values->mByTilePosition.find(tilePosition);
+            if (it == values->mByTilePosition.end())
+                continue;
+            it->second.erase(id);
+            if (it->second.empty())
+                values->mByTilePosition.erase(it);
+        }
+
         values->mById.erase(byId.first, byId.second);
 
         return removed;

From ff1af5e8ec5a2a8a52e7ef8ad90181b4f25d79aa Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 27 Jun 2021 16:36:28 +0200
Subject: [PATCH 0907/2859] Use only off mesh connections starting or ending in
 a given tile

---
 components/detournavigator/offmeshconnectionsmanager.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/components/detournavigator/offmeshconnectionsmanager.cpp b/components/detournavigator/offmeshconnectionsmanager.cpp
index c483934fb4..a673ae3e68 100644
--- a/components/detournavigator/offmeshconnectionsmanager.cpp
+++ b/components/detournavigator/offmeshconnectionsmanager.cpp
@@ -80,7 +80,12 @@ namespace DetourNavigator
             [&] (const ObjectId v)
             {
                 const auto byId = values->mById.equal_range(v);
-                std::for_each(byId.first, byId.second, [&] (const auto& v) { result.push_back(v.second); });
+                std::for_each(byId.first, byId.second, [&] (const auto& v)
+                {
+                    if (getTilePosition(mSettings, v.second.mStart) == tilePosition
+                            || getTilePosition(mSettings, v.second.mEnd) == tilePosition)
+                        result.push_back(v.second);
+                });
             });
 
         std::sort(result.begin(), result.end());

From 1552e7e3e32fcc2ba686f04a45968df917dca7a1 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 27 Jun 2021 17:45:40 +0200
Subject: [PATCH 0908/2859] Add pathgrid edges as one direction off mesh
 connection

---
 components/detournavigator/makenavmesh.cpp   |  2 +-
 components/detournavigator/navigatorimpl.cpp | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index bcfd1b22fd..422fdffb1d 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -389,7 +389,7 @@ namespace
 
         const auto offMeshConVerts = getOffMeshVerts(offMeshConnections);
         const std::vector<float> offMeshConRad(offMeshConnections.size(), getRadius(settings, agentHalfExtents));
-        const std::vector<unsigned char> offMeshConDir(offMeshConnections.size(), DT_OFFMESH_CON_BIDIR);
+        const std::vector<unsigned char> offMeshConDir(offMeshConnections.size(), 0);
         const std::vector<unsigned char> offMeshConAreas = getOffMeshConAreas(offMeshConnections);
         const std::vector<unsigned short> offMeshConFlags = getOffMeshFlags(offMeshConnections);
 
diff --git a/components/detournavigator/navigatorimpl.cpp b/components/detournavigator/navigatorimpl.cpp
index b7b3bbd586..1aa4768de5 100644
--- a/components/detournavigator/navigatorimpl.cpp
+++ b/components/detournavigator/navigatorimpl.cpp
@@ -55,12 +55,10 @@ namespace DetourNavigator
     {
         if (addObject(id, static_cast<const ObjectShapes&>(shapes), transform))
         {
-            mNavMeshManager.addOffMeshConnection(
-                id,
-                toNavMeshCoordinates(mSettings, shapes.mConnectionStart),
-                toNavMeshCoordinates(mSettings, shapes.mConnectionEnd),
-                AreaType_door
-            );
+            const osg::Vec3f start = toNavMeshCoordinates(mSettings, shapes.mConnectionStart);
+            const osg::Vec3f end = toNavMeshCoordinates(mSettings, shapes.mConnectionEnd);
+            mNavMeshManager.addOffMeshConnection(id, start, end, AreaType_door);
+            mNavMeshManager.addOffMeshConnection(id, end, start, AreaType_door);
             return true;
         }
         return false;

From 8d2cdedc87243f23f75e69edd60b9f9bb51009c8 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 28 Jun 2021 00:18:41 +0200
Subject: [PATCH 0909/2859] Show number of pathgrid node in a tooltip

To allow users faster understand what node it is.
---
 apps/opencs/view/render/cellarrow.cpp        | 2 +-
 apps/opencs/view/render/cellarrow.hpp        | 2 +-
 apps/opencs/view/render/object.cpp           | 2 +-
 apps/opencs/view/render/object.hpp           | 2 +-
 apps/opencs/view/render/pathgrid.cpp         | 6 +++++-
 apps/opencs/view/render/pathgrid.hpp         | 2 +-
 apps/opencs/view/render/tagbase.cpp          | 2 +-
 apps/opencs/view/render/tagbase.hpp          | 4 +++-
 apps/opencs/view/render/worldspacewidget.cpp | 2 +-
 9 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/apps/opencs/view/render/cellarrow.cpp b/apps/opencs/view/render/cellarrow.cpp
index 4d61551236..a654171fce 100644
--- a/apps/opencs/view/render/cellarrow.cpp
+++ b/apps/opencs/view/render/cellarrow.cpp
@@ -23,7 +23,7 @@ CSVRender::CellArrow *CSVRender::CellArrowTag::getCellArrow() const
     return mArrow;
 }
 
-QString CSVRender::CellArrowTag::getToolTip (bool hideBasics) const
+QString CSVRender::CellArrowTag::getToolTip(bool hideBasics, const WorldspaceHitResult& /*hit*/) const
 {
     QString text ("Direction: ");
 
diff --git a/apps/opencs/view/render/cellarrow.hpp b/apps/opencs/view/render/cellarrow.hpp
index 9a49b80db0..ed71410610 100644
--- a/apps/opencs/view/render/cellarrow.hpp
+++ b/apps/opencs/view/render/cellarrow.hpp
@@ -27,7 +27,7 @@ namespace CSVRender
 
             CellArrow *getCellArrow() const;
 
-            QString getToolTip (bool hideBasics) const override;
+            QString getToolTip(bool hideBasics, const WorldspaceHitResult& hit) const override;
     };
 
 
diff --git a/apps/opencs/view/render/object.cpp b/apps/opencs/view/render/object.cpp
index 2bb537d74a..d0e4dbe04a 100644
--- a/apps/opencs/view/render/object.cpp
+++ b/apps/opencs/view/render/object.cpp
@@ -61,7 +61,7 @@ CSVRender::ObjectTag::ObjectTag (Object* object)
 : TagBase (Mask_Reference), mObject (object)
 {}
 
-QString CSVRender::ObjectTag::getToolTip (bool hideBasics) const
+QString CSVRender::ObjectTag::getToolTip(bool /*hideBasics*/, const WorldspaceHitResult& /*hit*/) const
 {
     return QString::fromUtf8 (mObject->getReferenceableId().c_str());
 }
diff --git a/apps/opencs/view/render/object.hpp b/apps/opencs/view/render/object.hpp
index a19d642234..56337cf037 100644
--- a/apps/opencs/view/render/object.hpp
+++ b/apps/opencs/view/render/object.hpp
@@ -54,7 +54,7 @@ namespace CSVRender
 
             Object* mObject;
 
-            QString getToolTip (bool hideBasics) const override;
+            QString getToolTip (bool hideBasics, const WorldspaceHitResult& hit) const override;
     };
 
     class ObjectMarkerTag : public ObjectTag
diff --git a/apps/opencs/view/render/pathgrid.cpp b/apps/opencs/view/render/pathgrid.cpp
index 470a3d0928..6a52c3f8ac 100644
--- a/apps/opencs/view/render/pathgrid.cpp
+++ b/apps/opencs/view/render/pathgrid.cpp
@@ -16,6 +16,7 @@
 #include "../../model/world/commandmacro.hpp"
 #include "../../model/world/data.hpp"
 #include "../../model/world/idtree.hpp"
+#include "worldspacewidget.hpp"
 
 namespace CSVRender
 {
@@ -40,10 +41,13 @@ namespace CSVRender
         return mPathgrid;
     }
 
-    QString PathgridTag::getToolTip(bool hideBasics) const
+    QString PathgridTag::getToolTip(bool /*hideBasics*/, const WorldspaceHitResult& hit) const
     {
         QString text("Pathgrid: ");
         text += mPathgrid->getId().c_str();
+        text += " (";
+        text += QString::number(SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.index0)));
+        text += ")";
 
         return text;
     }
diff --git a/apps/opencs/view/render/pathgrid.hpp b/apps/opencs/view/render/pathgrid.hpp
index 8f5d45a487..fa1b360e78 100644
--- a/apps/opencs/view/render/pathgrid.hpp
+++ b/apps/opencs/view/render/pathgrid.hpp
@@ -40,7 +40,7 @@ namespace CSVRender
 
             Pathgrid* getPathgrid () const;
 
-            QString getToolTip (bool hideBasics) const override;
+            QString getToolTip (bool hideBasics, const WorldspaceHitResult& hit) const override;
 
         private:
 
diff --git a/apps/opencs/view/render/tagbase.cpp b/apps/opencs/view/render/tagbase.cpp
index 3ddd68690f..61a94215dd 100644
--- a/apps/opencs/view/render/tagbase.cpp
+++ b/apps/opencs/view/render/tagbase.cpp
@@ -8,7 +8,7 @@ CSVRender::Mask CSVRender::TagBase::getMask() const
     return mMask;
 }
 
-QString CSVRender::TagBase::getToolTip (bool hideBasics) const
+QString CSVRender::TagBase::getToolTip (bool hideBasics, const WorldspaceHitResult& /*hit*/) const
 {
     return "";
 }
diff --git a/apps/opencs/view/render/tagbase.hpp b/apps/opencs/view/render/tagbase.hpp
index d1ecd2cfd9..50295d508d 100644
--- a/apps/opencs/view/render/tagbase.hpp
+++ b/apps/opencs/view/render/tagbase.hpp
@@ -9,6 +9,8 @@
 
 namespace CSVRender
 {
+    struct WorldspaceHitResult;
+
     class TagBase : public osg::Referenced
     {
             Mask mMask;
@@ -19,7 +21,7 @@ namespace CSVRender
 
             Mask getMask() const;
 
-            virtual QString getToolTip (bool hideBasics) const;
+            virtual QString getToolTip (bool hideBasics, const WorldspaceHitResult& hit) const;
 
     };
 }
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index 723ffcb6a2..b14b7953ab 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -592,7 +592,7 @@ void CSVRender::WorldspaceWidget::showToolTip()
         if (hit.tag)
         {
             bool hideBasics = CSMPrefs::get()["Tooltips"]["scene-hide-basic"].isTrue();
-            QToolTip::showText (pos, hit.tag->getToolTip (hideBasics), this);
+            QToolTip::showText(pos, hit.tag->getToolTip(hideBasics, hit), this);
         }
     }
 }

From 2147c18cf57d40c7f0978a0f2450e71732e364db Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Mon, 28 Jun 2021 00:11:31 +0100
Subject: [PATCH 0910/2859] Do not overwrite old removed state with old dummy
 state

---
 components/shader/shadervisitor.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index b4455c4096..8a84dfc68b 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -402,9 +402,12 @@ namespace Shader
         {
             writableStateSet->addUniform(new osg::Uniform("alphaRef", reqs.mAlphaRef));
 
-            const auto* alphaFunc = writableStateSet->getAttributePair(osg::StateAttribute::ALPHAFUNC);
-            if (alphaFunc)
-                removedState->setAttribute(alphaFunc->first, alphaFunc->second);
+            if (!removedState->getAttributePair(osg::StateAttribute::ALPHAFUNC))
+            {
+                const auto* alphaFunc = writableStateSet->getAttributePair(osg::StateAttribute::ALPHAFUNC);
+                if (alphaFunc)
+                    removedState->setAttribute(alphaFunc->first, alphaFunc->second);
+            }
             // This prevents redundant glAlphaFunc calls while letting the shadows bin still see the test
             writableStateSet->setAttribute(RemovedAlphaFunc::getInstance(reqs.mAlphaFunc), osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
 

From c795e0bce636eb3605adc516022524b244f9a231 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Fri, 5 Feb 2021 14:55:42 +0100
Subject: [PATCH 0911/2859] Some actors are supposed to spawn on an object that
 belongs to an adjacent cell. Since actors can be active in 3x3 grid around
 the player, we need to first load all objects in a 5x5 grid around the
 player.

Split load and unloading in 2 phases. Add an mInactiveCells set into the
scene, which contains all cells inside the aforementioned 5x5 grid.
These cells contains only heightfields and non-animated physics objects.

Animated objects are tied to the scene graph, which doesn't exists yet
in these cells, so we skip them.
---
 CHANGELOG.md                            |   1 +
 apps/openmw/mwclass/activator.cpp       |   4 +-
 apps/openmw/mwclass/activator.hpp       |   2 +-
 apps/openmw/mwclass/actor.cpp           |   6 +-
 apps/openmw/mwclass/actor.hpp           |  10 +-
 apps/openmw/mwclass/apparatus.cpp       |   5 -
 apps/openmw/mwclass/apparatus.hpp       |   2 -
 apps/openmw/mwclass/armor.cpp           |   5 -
 apps/openmw/mwclass/armor.hpp           |   2 -
 apps/openmw/mwclass/bodypart.cpp        |   4 -
 apps/openmw/mwclass/bodypart.hpp        |   2 -
 apps/openmw/mwclass/book.cpp            |   5 -
 apps/openmw/mwclass/book.hpp            |   2 -
 apps/openmw/mwclass/clothing.cpp        |   5 -
 apps/openmw/mwclass/clothing.hpp        |   2 -
 apps/openmw/mwclass/container.cpp       |   4 +-
 apps/openmw/mwclass/container.hpp       |   2 +-
 apps/openmw/mwclass/door.cpp            |   4 +-
 apps/openmw/mwclass/door.hpp            |   2 +-
 apps/openmw/mwclass/ingredient.cpp      |   5 -
 apps/openmw/mwclass/ingredient.hpp      |   2 -
 apps/openmw/mwclass/light.cpp           |   4 +-
 apps/openmw/mwclass/light.hpp           |   2 +-
 apps/openmw/mwclass/lockpick.cpp        |   5 -
 apps/openmw/mwclass/lockpick.hpp        |   2 -
 apps/openmw/mwclass/misc.cpp            |   5 -
 apps/openmw/mwclass/misc.hpp            |   2 -
 apps/openmw/mwclass/potion.cpp          |   5 -
 apps/openmw/mwclass/potion.hpp          |   2 -
 apps/openmw/mwclass/probe.cpp           |   5 -
 apps/openmw/mwclass/probe.hpp           |   2 -
 apps/openmw/mwclass/repair.cpp          |   5 -
 apps/openmw/mwclass/repair.hpp          |   2 -
 apps/openmw/mwclass/static.cpp          |   4 +-
 apps/openmw/mwclass/static.hpp          |   2 +-
 apps/openmw/mwclass/weapon.cpp          |   5 -
 apps/openmw/mwclass/weapon.hpp          |   2 -
 apps/openmw/mwphysics/actor.cpp         |   6 +-
 apps/openmw/mwphysics/actor.hpp         |   2 +-
 apps/openmw/mwphysics/object.cpp        |  10 +-
 apps/openmw/mwphysics/object.hpp        |   4 +-
 apps/openmw/mwphysics/physicssystem.cpp |  15 +-
 apps/openmw/mwphysics/physicssystem.hpp |   4 +-
 apps/openmw/mwworld/cellvisitors.hpp    |  13 +-
 apps/openmw/mwworld/class.cpp           |   6 +-
 apps/openmw/mwworld/class.hpp           |  13 +-
 apps/openmw/mwworld/scene.cpp           | 434 ++++++++++++++----------
 apps/openmw/mwworld/scene.hpp           |  15 +-
 apps/openmw/mwworld/worldimp.cpp        |   2 +-
 components/resource/bulletshape.cpp     |   5 +
 components/resource/bulletshape.hpp     |   2 +
 51 files changed, 334 insertions(+), 327 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23814425a8..10ef6513c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 
     Bug #3737: Scripts from The Underground 2 .esp do not play (all patched versions)
     Bug #3846: Strings starting with "-" fail to compile if not enclosed in quotes
+    Bug #5379: Wandering NPCs falling through cantons
     Bug #5453: Magic effect VFX are offset for creatures
     Bug #5483: AutoCalc flag is not used to calculate spells cost
     Bug #6101: Disarming trapped unlocked owned objects isn't considered a crime
diff --git a/apps/openmw/mwclass/activator.cpp b/apps/openmw/mwclass/activator.cpp
index c54b1c3691..0b4d9ef836 100644
--- a/apps/openmw/mwclass/activator.cpp
+++ b/apps/openmw/mwclass/activator.cpp
@@ -38,10 +38,10 @@ namespace MWClass
         }
     }
 
-    void Activator::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
+    void Activator::insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
     {
         if(!model.empty())
-            physics.addObject(ptr, model);
+            physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World, skipAnimated);
     }
 
     std::string Activator::getModel(const MWWorld::ConstPtr &ptr) const
diff --git a/apps/openmw/mwclass/activator.hpp b/apps/openmw/mwclass/activator.hpp
index 10ace6f74d..7af47680b3 100644
--- a/apps/openmw/mwclass/activator.hpp
+++ b/apps/openmw/mwclass/activator.hpp
@@ -17,7 +17,7 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
 
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
diff --git a/apps/openmw/mwclass/actor.cpp b/apps/openmw/mwclass/actor.cpp
index 33aeb26bb0..6621df1ec8 100644
--- a/apps/openmw/mwclass/actor.cpp
+++ b/apps/openmw/mwclass/actor.cpp
@@ -17,16 +17,12 @@
 
 namespace MWClass
 {
-    Actor::Actor() {}
-
-    Actor::~Actor() {}
-
     void Actor::adjustPosition(const MWWorld::Ptr& ptr, bool force) const
     {
         MWBase::Environment::get().getWorld()->adjustPosition(ptr, force);
     }
 
-    void Actor::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
+    void Actor::insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
     {
         if (!model.empty())
         {
diff --git a/apps/openmw/mwclass/actor.hpp b/apps/openmw/mwclass/actor.hpp
index 3d509b2768..cc1d0c9089 100644
--- a/apps/openmw/mwclass/actor.hpp
+++ b/apps/openmw/mwclass/actor.hpp
@@ -15,16 +15,16 @@ namespace MWClass
     {
     protected:
 
-        Actor();
+        Actor() = default;
 
     public:
-        virtual ~Actor();
+         ~Actor() override = default;
 
         void adjustPosition(const MWWorld::Ptr& ptr, bool force) const override;
         ///< Adjust position to stand on ground. Must be called post model load
         /// @param force do this even if the ptr is flying
 
-        void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
+        void insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
 
         bool useAnim() const override;
 
@@ -46,8 +46,8 @@ namespace MWClass
         float getCurrentSpeed(const MWWorld::Ptr& ptr) const override;
         
         // not implemented
-        Actor(const Actor&);
-        Actor& operator= (const Actor&);
+        Actor(const Actor&) = delete;
+        Actor& operator= (const Actor&) = delete;
     };
 }
 
diff --git a/apps/openmw/mwclass/apparatus.cpp b/apps/openmw/mwclass/apparatus.cpp
index 518695fabf..e09e4804ce 100644
--- a/apps/openmw/mwclass/apparatus.cpp
+++ b/apps/openmw/mwclass/apparatus.cpp
@@ -26,11 +26,6 @@ namespace MWClass
         }
     }
 
-    void Apparatus::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
-    {
-        // TODO: add option somewhere to enable collision for placeable objects
-    }
-
     std::string Apparatus::getModel(const MWWorld::ConstPtr &ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Apparatus> *ref = ptr.get<ESM::Apparatus>();
diff --git a/apps/openmw/mwclass/apparatus.hpp b/apps/openmw/mwclass/apparatus.hpp
index 8087c57ba3..828abef25e 100644
--- a/apps/openmw/mwclass/apparatus.hpp
+++ b/apps/openmw/mwclass/apparatus.hpp
@@ -17,8 +17,6 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
-
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index 3f9bfb859f..817adbc1f5 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -34,11 +34,6 @@ namespace MWClass
         }
     }
 
-    void Armor::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
-    {
-        // TODO: add option somewhere to enable collision for placeable objects
-    }
-
     std::string Armor::getModel(const MWWorld::ConstPtr &ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Armor> *ref = ptr.get<ESM::Armor>();
diff --git a/apps/openmw/mwclass/armor.hpp b/apps/openmw/mwclass/armor.hpp
index 4f04e0824b..f64f138a29 100644
--- a/apps/openmw/mwclass/armor.hpp
+++ b/apps/openmw/mwclass/armor.hpp
@@ -16,8 +16,6 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
-
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwclass/bodypart.cpp b/apps/openmw/mwclass/bodypart.cpp
index 0315d3ddb0..7fe798e27d 100644
--- a/apps/openmw/mwclass/bodypart.cpp
+++ b/apps/openmw/mwclass/bodypart.cpp
@@ -22,10 +22,6 @@ namespace MWClass
         }
     }
 
-    void BodyPart::insertObject(const MWWorld::Ptr &ptr, const std::string &model, MWPhysics::PhysicsSystem &physics) const
-    {
-    }
-
     std::string BodyPart::getName(const MWWorld::ConstPtr &ptr) const
     {
         return std::string();
diff --git a/apps/openmw/mwclass/bodypart.hpp b/apps/openmw/mwclass/bodypart.hpp
index 13d9141386..0e372b884a 100644
--- a/apps/openmw/mwclass/bodypart.hpp
+++ b/apps/openmw/mwclass/bodypart.hpp
@@ -15,8 +15,6 @@ namespace MWClass
         void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
         ///< Add reference into a cell for rendering
 
-        void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
-
         std::string getName (const MWWorld::ConstPtr& ptr) const override;
         ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwclass/book.cpp b/apps/openmw/mwclass/book.cpp
index 4ea71e3ac2..51b9e39d7a 100644
--- a/apps/openmw/mwclass/book.cpp
+++ b/apps/openmw/mwclass/book.cpp
@@ -31,11 +31,6 @@ namespace MWClass
         }
     }
 
-    void Book::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
-    {
-        // TODO: add option somewhere to enable collision for placeable objects
-    }
-
     std::string Book::getModel(const MWWorld::ConstPtr &ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Book> *ref = ptr.get<ESM::Book>();
diff --git a/apps/openmw/mwclass/book.hpp b/apps/openmw/mwclass/book.hpp
index c58e68ad87..f3d34c5168 100644
--- a/apps/openmw/mwclass/book.hpp
+++ b/apps/openmw/mwclass/book.hpp
@@ -14,8 +14,6 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
-
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index 6d7960aac2..400cd97e41 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -29,11 +29,6 @@ namespace MWClass
         }
     }
 
-    void Clothing::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
-    {
-        // TODO: add option somewhere to enable collision for placeable objects
-    }
-
     std::string Clothing::getModel(const MWWorld::ConstPtr &ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Clothing> *ref = ptr.get<ESM::Clothing>();
diff --git a/apps/openmw/mwclass/clothing.hpp b/apps/openmw/mwclass/clothing.hpp
index a87e0cbe00..3d5c162aa4 100644
--- a/apps/openmw/mwclass/clothing.hpp
+++ b/apps/openmw/mwclass/clothing.hpp
@@ -14,8 +14,6 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
-
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index de560608c0..b88d756cbc 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -106,10 +106,10 @@ namespace MWClass
         }
     }
 
-    void Container::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
+    void Container::insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
     {
         if(!model.empty())
-            physics.addObject(ptr, model);
+            physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World, skipAnimated);
     }
 
     std::string Container::getModel(const MWWorld::ConstPtr &ptr) const
diff --git a/apps/openmw/mwclass/container.hpp b/apps/openmw/mwclass/container.hpp
index 1c89370068..02ec9b1012 100644
--- a/apps/openmw/mwclass/container.hpp
+++ b/apps/openmw/mwclass/container.hpp
@@ -42,7 +42,7 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
 
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index 3a5ff0d9ae..ca0d647f9c 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -55,10 +55,10 @@ namespace MWClass
         }
     }
 
-    void Door::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
+    void Door::insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
     {
         if(!model.empty())
-            physics.addObject(ptr, model, MWPhysics::CollisionType_Door);
+            physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_Door, skipAnimated);
 
         // Resume the door's opening/closing animation if it wasn't finished
         if (ptr.getRefData().getCustomData())
diff --git a/apps/openmw/mwclass/door.hpp b/apps/openmw/mwclass/door.hpp
index 6c2fa26b80..f80c9bb416 100644
--- a/apps/openmw/mwclass/door.hpp
+++ b/apps/openmw/mwclass/door.hpp
@@ -18,7 +18,7 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
 
             bool isDoor() const override;
 
diff --git a/apps/openmw/mwclass/ingredient.cpp b/apps/openmw/mwclass/ingredient.cpp
index a007ad115f..20f9576dff 100644
--- a/apps/openmw/mwclass/ingredient.cpp
+++ b/apps/openmw/mwclass/ingredient.cpp
@@ -28,11 +28,6 @@ namespace MWClass
         }
     }
 
-    void Ingredient::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
-    {
-        // TODO: add option somewhere to enable collision for placeable objects
-    }
-
     std::string Ingredient::getModel(const MWWorld::ConstPtr &ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Ingredient> *ref = ptr.get<ESM::Ingredient>();
diff --git a/apps/openmw/mwclass/ingredient.hpp b/apps/openmw/mwclass/ingredient.hpp
index 5219cf39ce..2aa831f868 100644
--- a/apps/openmw/mwclass/ingredient.hpp
+++ b/apps/openmw/mwclass/ingredient.hpp
@@ -14,8 +14,6 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
-
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index 3bdf10f475..ca744be7bc 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -33,7 +33,7 @@ namespace MWClass
         renderingInterface.getObjects().insertModel(ptr, model, true, !(ref->mBase->mData.mFlags & ESM::Light::OffDefault));
     }
 
-    void Light::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
+    void Light::insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
     {
         MWWorld::LiveCellRef<ESM::Light> *ref =
             ptr.get<ESM::Light>();
@@ -41,7 +41,7 @@ namespace MWClass
 
         // TODO: add option somewhere to enable collision for placeable objects
         if (!model.empty() && (ref->mBase->mData.mFlags & ESM::Light::Carry) == 0)
-            physics.addObject(ptr, model);
+            physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World, skipAnimated);
 
         if (!ref->mBase->mSound.empty() && !(ref->mBase->mData.mFlags & ESM::Light::OffDefault))
             MWBase::Environment::get().getSoundManager()->playSound3D(ptr, ref->mBase->mSound, 1.0, 1.0,
diff --git a/apps/openmw/mwclass/light.hpp b/apps/openmw/mwclass/light.hpp
index e37dddc250..7641722788 100644
--- a/apps/openmw/mwclass/light.hpp
+++ b/apps/openmw/mwclass/light.hpp
@@ -14,7 +14,7 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
 
             bool useAnim() const override;
 
diff --git a/apps/openmw/mwclass/lockpick.cpp b/apps/openmw/mwclass/lockpick.cpp
index 9b8abc8f23..985b087711 100644
--- a/apps/openmw/mwclass/lockpick.cpp
+++ b/apps/openmw/mwclass/lockpick.cpp
@@ -28,11 +28,6 @@ namespace MWClass
         }
     }
 
-    void Lockpick::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
-    {
-        // TODO: add option somewhere to enable collision for placeable objects
-    }
-
     std::string Lockpick::getModel(const MWWorld::ConstPtr &ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Lockpick> *ref = ptr.get<ESM::Lockpick>();
diff --git a/apps/openmw/mwclass/lockpick.hpp b/apps/openmw/mwclass/lockpick.hpp
index fabae33435..d4b265e397 100644
--- a/apps/openmw/mwclass/lockpick.hpp
+++ b/apps/openmw/mwclass/lockpick.hpp
@@ -14,8 +14,6 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
-
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwclass/misc.cpp b/apps/openmw/mwclass/misc.cpp
index 8d3cda6fe5..facab9d51c 100644
--- a/apps/openmw/mwclass/misc.cpp
+++ b/apps/openmw/mwclass/misc.cpp
@@ -37,11 +37,6 @@ namespace MWClass
         }
     }
 
-    void Miscellaneous::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
-    {
-        // TODO: add option somewhere to enable collision for placeable objects
-    }
-
     std::string Miscellaneous::getModel(const MWWorld::ConstPtr &ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Miscellaneous> *ref = ptr.get<ESM::Miscellaneous>();
diff --git a/apps/openmw/mwclass/misc.hpp b/apps/openmw/mwclass/misc.hpp
index 9bff85ca56..18788c7ed8 100644
--- a/apps/openmw/mwclass/misc.hpp
+++ b/apps/openmw/mwclass/misc.hpp
@@ -14,8 +14,6 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
-
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwclass/potion.cpp b/apps/openmw/mwclass/potion.cpp
index 4af97e6345..56d9dff279 100644
--- a/apps/openmw/mwclass/potion.cpp
+++ b/apps/openmw/mwclass/potion.cpp
@@ -30,11 +30,6 @@ namespace MWClass
         }
     }
 
-    void Potion::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
-    {
-        // TODO: add option somewhere to enable collision for placeable objects
-    }
-
     std::string Potion::getModel(const MWWorld::ConstPtr &ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Potion> *ref = ptr.get<ESM::Potion>();
diff --git a/apps/openmw/mwclass/potion.hpp b/apps/openmw/mwclass/potion.hpp
index 75d923f0ba..75b962164b 100644
--- a/apps/openmw/mwclass/potion.hpp
+++ b/apps/openmw/mwclass/potion.hpp
@@ -14,8 +14,6 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
-
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwclass/probe.cpp b/apps/openmw/mwclass/probe.cpp
index dba4e8c063..51273337a6 100644
--- a/apps/openmw/mwclass/probe.cpp
+++ b/apps/openmw/mwclass/probe.cpp
@@ -28,11 +28,6 @@ namespace MWClass
         }
     }
 
-    void Probe::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
-    {
-        // TODO: add option somewhere to enable collision for placeable objects
-    }
-
     std::string Probe::getModel(const MWWorld::ConstPtr &ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Probe> *ref = ptr.get<ESM::Probe>();
diff --git a/apps/openmw/mwclass/probe.hpp b/apps/openmw/mwclass/probe.hpp
index a0a41dcfb6..ef9273a379 100644
--- a/apps/openmw/mwclass/probe.hpp
+++ b/apps/openmw/mwclass/probe.hpp
@@ -14,8 +14,6 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
-
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwclass/repair.cpp b/apps/openmw/mwclass/repair.cpp
index 8907c8212e..f1b88e422b 100644
--- a/apps/openmw/mwclass/repair.cpp
+++ b/apps/openmw/mwclass/repair.cpp
@@ -25,11 +25,6 @@ namespace MWClass
         }
     }
 
-    void Repair::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
-    {
-        // TODO: add option somewhere to enable collision for placeable objects
-    }
-
     std::string Repair::getModel(const MWWorld::ConstPtr &ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Repair> *ref = ptr.get<ESM::Repair>();
diff --git a/apps/openmw/mwclass/repair.hpp b/apps/openmw/mwclass/repair.hpp
index b9791e9cf4..c403449e18 100644
--- a/apps/openmw/mwclass/repair.hpp
+++ b/apps/openmw/mwclass/repair.hpp
@@ -14,8 +14,6 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
-
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwclass/static.cpp b/apps/openmw/mwclass/static.cpp
index 5551b3d731..323e482bf0 100644
--- a/apps/openmw/mwclass/static.cpp
+++ b/apps/openmw/mwclass/static.cpp
@@ -23,10 +23,10 @@ namespace MWClass
         }
     }
 
-    void Static::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
+    void Static::insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
     {
         if(!model.empty())
-            physics.addObject(ptr, model);
+            physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World, skipAnimated);
     }
 
     std::string Static::getModel(const MWWorld::ConstPtr &ptr) const
diff --git a/apps/openmw/mwclass/static.hpp b/apps/openmw/mwclass/static.hpp
index 6bc783dad0..211b93de2a 100644
--- a/apps/openmw/mwclass/static.hpp
+++ b/apps/openmw/mwclass/static.hpp
@@ -14,7 +14,7 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
 
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index 0d6a27cf60..6246c8fb09 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -34,11 +34,6 @@ namespace MWClass
         }
     }
 
-    void Weapon::insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const
-    {
-        // TODO: add option somewhere to enable collision for placeable objects
-    }
-
     std::string Weapon::getModel(const MWWorld::ConstPtr &ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Weapon> *ref = ptr.get<ESM::Weapon>();
diff --git a/apps/openmw/mwclass/weapon.hpp b/apps/openmw/mwclass/weapon.hpp
index f1824b7d14..db17e6b70f 100644
--- a/apps/openmw/mwclass/weapon.hpp
+++ b/apps/openmw/mwclass/weapon.hpp
@@ -15,8 +15,6 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const override;
-
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index f0bc234138..21736543ab 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -68,7 +68,7 @@ Actor::Actor(const MWWorld::Ptr& ptr, const Resource::BulletShape* shape, Physic
     updateScale();
 
     if(!mRotationallyInvariant)
-        updateRotation();
+        setRotation(mPtr.getRefData().getBaseNode()->getAttitude());
 
     updatePosition();
     addCollisionMask(getCollisionMask());
@@ -197,10 +197,10 @@ osg::Vec3f Actor::getPreviousPosition() const
     return mPreviousPosition;
 }
 
-void Actor::updateRotation ()
+void Actor::setRotation(osg::Quat quat)
 {
     std::scoped_lock lock(mPositionMutex);
-    mRotation = mPtr.getRefData().getBaseNode()->getAttitude();
+    mRotation = quat;
 }
 
 bool Actor::isRotationallyInvariant() const
diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index 7b53e8812a..dd4ea45714 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -48,7 +48,7 @@ namespace MWPhysics
         void enableCollisionBody(bool collision);
 
         void updateScale();
-        void updateRotation();
+        void setRotation(osg::Quat quat);
 
         /**
          * Return true if the collision shape looks the same no matter how its Z rotated.
diff --git a/apps/openmw/mwphysics/object.cpp b/apps/openmw/mwphysics/object.cpp
index 6363065323..2a94d28f12 100644
--- a/apps/openmw/mwphysics/object.cpp
+++ b/apps/openmw/mwphysics/object.cpp
@@ -14,7 +14,7 @@
 
 namespace MWPhysics
 {
-    Object::Object(const MWWorld::Ptr& ptr, osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance, int collisionType, PhysicsTaskScheduler* scheduler)
+    Object::Object(const MWWorld::Ptr& ptr, osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance, osg::Quat rotation, int collisionType, PhysicsTaskScheduler* scheduler)
         : mShapeInstance(shapeInstance)
         , mSolid(true)
         , mTaskScheduler(scheduler)
@@ -27,7 +27,7 @@ namespace MWPhysics
         mCollisionObject->setUserPointer(this);
 
         setScale(ptr.getCellRef().getScale());
-        setRotation(Misc::Convert::toBullet(ptr.getRefData().getBaseNode()->getAttitude()));
+        setRotation(rotation);
         setOrigin(Misc::Convert::toBullet(ptr.getRefData().getPosition().asVec3()));
         commitPositionChange();
 
@@ -51,10 +51,10 @@ namespace MWPhysics
         mScaleUpdatePending = true;
     }
 
-    void Object::setRotation(const btQuaternion& quat)
+    void Object::setRotation(osg::Quat quat)
     {
         std::unique_lock<std::mutex> lock(mPositionMutex);
-        mLocalTransform.setRotation(quat);
+        mLocalTransform.setRotation(Misc::Convert::toBullet(quat));
         mTransformUpdatePending = true;
     }
 
@@ -108,7 +108,7 @@ namespace MWPhysics
 
     bool Object::isAnimated() const
     {
-        return !mShapeInstance->mAnimatedShapes.empty();
+        return mShapeInstance->isAnimated();
     }
 
     bool Object::animateCollisionShapes()
diff --git a/apps/openmw/mwphysics/object.hpp b/apps/openmw/mwphysics/object.hpp
index cae8771809..c2273831e5 100644
--- a/apps/openmw/mwphysics/object.hpp
+++ b/apps/openmw/mwphysics/object.hpp
@@ -26,12 +26,12 @@ namespace MWPhysics
     class Object final : public PtrHolder
     {
     public:
-        Object(const MWWorld::Ptr& ptr, osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance, int collisionType, PhysicsTaskScheduler* scheduler);
+        Object(const MWWorld::Ptr& ptr, osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance, osg::Quat rotation, int collisionType, PhysicsTaskScheduler* scheduler);
         ~Object() override;
 
         const Resource::BulletShapeInstance* getShapeInstance() const;
         void setScale(float scale);
-        void setRotation(const btQuaternion& quat);
+        void setRotation(osg::Quat quat);
         void setOrigin(const btVector3& vec);
         void commitPositionChange();
         btCollisionObject* getCollisionObject();
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 833bb9a161..460347795a 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -461,13 +461,18 @@ namespace MWPhysics
         return heightField->second.get();
     }
 
-    void PhysicsSystem::addObject (const MWWorld::Ptr& ptr, const std::string& mesh, int collisionType)
+    void PhysicsSystem::addObject (const MWWorld::Ptr& ptr, const std::string& mesh, osg::Quat rotation, int collisionType, bool skipAnimated)
     {
         osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance = mShapeManager->getInstance(mesh);
         if (!shapeInstance || !shapeInstance->getCollisionShape())
             return;
 
-        auto obj = std::make_shared<Object>(ptr, shapeInstance, collisionType, mTaskScheduler.get());
+        if (skipAnimated && shapeInstance->isAnimated())
+            return;
+
+        assert(!getObject(ptr));
+
+        auto obj = std::make_shared<Object>(ptr, shapeInstance, rotation, collisionType, mTaskScheduler.get());
         mObjects.emplace(ptr, obj);
 
         if (obj->isAnimated())
@@ -625,12 +630,12 @@ namespace MWPhysics
         mTaskScheduler->updateSingleAabb(foundProjectile->second);
     }
 
-    void PhysicsSystem::updateRotation(const MWWorld::Ptr &ptr)
+    void PhysicsSystem::updateRotation(const MWWorld::Ptr &ptr, osg::Quat rotate)
     {
         ObjectMap::iterator found = mObjects.find(ptr);
         if (found != mObjects.end())
         {
-            found->second->setRotation(Misc::Convert::toBullet(ptr.getRefData().getBaseNode()->getAttitude()));
+            found->second->setRotation(rotate);
             mTaskScheduler->updateSingleAabb(found->second);
             return;
         }
@@ -639,7 +644,7 @@ namespace MWPhysics
         {
             if (!foundActor->second->isRotationallyInvariant())
             {
-                foundActor->second->updateRotation();
+                foundActor->second->setRotation(rotate);
                 mTaskScheduler->updateSingleAabb(foundActor->second);
             }
             return;
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 3d2a3c580d..b3a2266e65 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -122,7 +122,7 @@ namespace MWPhysics
             void setWaterHeight(float height);
             void disableWater();
 
-            void addObject (const MWWorld::Ptr& ptr, const std::string& mesh, int collisionType = CollisionType_World);
+            void addObject (const MWWorld::Ptr& ptr, const std::string& mesh, osg::Quat rotation, int collisionType = CollisionType_World, bool skipAnimated = false);
             void addActor (const MWWorld::Ptr& ptr, const std::string& mesh);
 
             int addProjectile(const MWWorld::Ptr& caster, const osg::Vec3f& position, const std::string& mesh, bool computeRadius, bool canTraverseWater);
@@ -143,7 +143,7 @@ namespace MWPhysics
             void remove (const MWWorld::Ptr& ptr);
 
             void updateScale (const MWWorld::Ptr& ptr);
-            void updateRotation (const MWWorld::Ptr& ptr);
+            void updateRotation (const MWWorld::Ptr& ptr, osg::Quat rotate);
             void updatePosition (const MWWorld::Ptr& ptr);
 
             void addHeightField (const float* heights, int x, int y, float triSize, float sqrtVerts, float minH, float maxH, const osg::Object* holdObject);
diff --git a/apps/openmw/mwworld/cellvisitors.hpp b/apps/openmw/mwworld/cellvisitors.hpp
index e68b383b77..5985d06fb6 100644
--- a/apps/openmw/mwworld/cellvisitors.hpp
+++ b/apps/openmw/mwworld/cellvisitors.hpp
@@ -18,12 +18,23 @@ namespace MWWorld
             if (ptr.getRefData().getBaseNode())
             {
                 ptr.getRefData().setBaseNode(nullptr);
-                mObjects.push_back (ptr);
             }
+            mObjects.push_back (ptr);
 
             return true;
         }
     };
+
+    struct ListObjectsVisitor
+    {
+        std::vector<MWWorld::Ptr> mObjects;
+
+        bool operator() (MWWorld::Ptr ptr)
+        {
+            mObjects.push_back (ptr);
+            return true;
+        }
+    };
 }
 
 #endif
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index 950c8a6d49..04dfba6b97 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -25,16 +25,12 @@ namespace MWWorld
 {
     std::map<std::string, std::shared_ptr<Class> > Class::sClasses;
 
-    Class::Class() {}
-
-    Class::~Class() {}
-
     void Class::insertObjectRendering (const Ptr& ptr, const std::string& mesh, MWRender::RenderingInterface& renderingInterface) const
     {
 
     }
 
-    void Class::insertObject(const Ptr& ptr, const std::string& mesh, MWPhysics::PhysicsSystem& physics) const
+    void Class::insertObject(const Ptr& ptr, const std::string& mesh, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
     {
 
     }
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index 1b3d4029e4..e225e0187c 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -6,6 +6,7 @@
 #include <string>
 #include <vector>
 
+#include <osg/Quat>
 #include <osg/Vec4f>
 
 #include "ptr.hpp"
@@ -57,13 +58,9 @@ namespace MWWorld
 
             std::string mTypeName;
 
-            // not implemented
-            Class (const Class&);
-            Class& operator= (const Class&);
-
         protected:
 
-            Class();
+            Class() = default;
 
             std::shared_ptr<Action> defaultItemActivate(const Ptr &ptr, const Ptr &actor) const;
             ///< Generate default action for activating inventory items
@@ -72,14 +69,16 @@ namespace MWWorld
 
         public:
 
-            virtual ~Class();
+            virtual ~Class() = default;
+            Class (const Class&) = delete;
+            Class& operator= (const Class&) = delete;
 
             const std::string& getTypeName() const {
                 return mTypeName;
             }
 
             virtual void insertObjectRendering (const Ptr& ptr, const std::string& mesh, MWRender::RenderingInterface& renderingInterface) const;
-            virtual void insertObject(const Ptr& ptr, const std::string& mesh, MWPhysics::PhysicsSystem& physics) const;
+            virtual void insertObject(const Ptr& ptr, const std::string& mesh, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const;
             ///< Add reference into a cell for rendering (default implementation: don't render anything).
 
             virtual std::string getName (const ConstPtr& ptr) const = 0;
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 85b312dd57..45b0c5d9f8 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -73,18 +73,20 @@ namespace
             * osg::Quat(xr, osg::Vec3(-1, 0, 0));
     }
 
-    void setNodeRotation(const MWWorld::Ptr& ptr, MWRender::RenderingManager& rendering, RotationOrder order)
+    osg::Quat makeNodeRotation(const MWWorld::Ptr& ptr, RotationOrder order)
     {
-        if (!ptr.getRefData().getBaseNode())
-            return;
+        const auto pos = ptr.getRefData().getPosition();
+
+        const auto rot = ptr.getClass().isActor() ? makeActorOsgQuat(pos)
+            : (order == RotationOrder::inverse ? makeInversedOrderObjectOsgQuat(pos) : makeObjectOsgQuat(pos));
 
-        rendering.rotateObject(ptr,
-            ptr.getClass().isActor()
-            ? makeActorOsgQuat(ptr.getRefData().getPosition())
-            : (order == RotationOrder::inverse
-                ? makeInversedOrderObjectOsgQuat(ptr.getRefData().getPosition())
-                : makeObjectOsgQuat(ptr.getRefData().getPosition()))
-        );
+        return rot;
+    }
+
+    void setNodeRotation(const MWWorld::Ptr& ptr, MWRender::RenderingManager& rendering, osg::Quat rotation)
+    {
+        if (ptr.getRefData().getBaseNode())
+            rendering.rotateObject(ptr, rotation);
     }
 
     std::string getModel(const MWWorld::Ptr &ptr, const VFS::Manager *vfs)
@@ -101,7 +103,7 @@ namespace
     }
 
     void addObject(const MWWorld::Ptr& ptr, MWPhysics::PhysicsSystem& physics,
-                   MWRender::RenderingManager& rendering, std::set<ESM::RefNum>& pagedRefs)
+                   MWRender::RenderingManager& rendering, std::set<ESM::RefNum>& pagedRefs, bool onlyPhysics)
     {
         if (ptr.getRefData().getBaseNode() || physics.getActor(ptr))
         {
@@ -109,19 +111,23 @@ namespace
             return;
         }
 
-        bool useAnim = ptr.getClass().useAnim();
         std::string model = getModel(ptr, rendering.getResourceSystem()->getVFS());
+        const auto rotation = makeNodeRotation(ptr, RotationOrder::direct);
+        if (onlyPhysics && !physics.getObject(ptr) && !ptr.getClass().isActor())
+        {
+            // When we preload physics object we need to skip animated objects. They are dependant on the scene graph which doesn't yet exist.
+            ptr.getClass().insertObject (ptr, model, rotation, physics, true);
+            return;
+        }
 
         const ESM::RefNum& refnum = ptr.getCellRef().getRefNum();
         if (!refnum.hasContentFile() || pagedRefs.find(refnum) == pagedRefs.end())
             ptr.getClass().insertObjectRendering(ptr, model, rendering);
         else
             ptr.getRefData().setBaseNode(new SceneUtil::PositionAttitudeTransform); // FIXME remove this when physics code is fixed not to depend on basenode
-        setNodeRotation(ptr, rendering, RotationOrder::direct);
+        setNodeRotation(ptr, rendering, rotation);
 
-        ptr.getClass().insertObject (ptr, model, physics);
-
-        if (useAnim)
+        if (ptr.getClass().useAnim())
             MWBase::Environment::get().getMechanicsManager()->add(ptr);
 
         if (ptr.getClass().isActor())
@@ -129,6 +135,9 @@ namespace
 
         // Restore effect particles
         MWBase::Environment::get().getWorld()->applyLoopingParticles(ptr);
+
+        if (!physics.getObject(ptr))
+            ptr.getClass().insertObject (ptr, model, rotation, physics);
     }
 
     void addObject(const MWWorld::Ptr& ptr, const MWPhysics::PhysicsSystem& physics, DetourNavigator::Navigator& navigator)
@@ -199,11 +208,12 @@ namespace
     {
         MWWorld::CellStore& mCell;
         Loading::Listener& mLoadingListener;
+        bool mOnlyObjects;
         bool mTest;
 
         std::vector<MWWorld::Ptr> mToInsert;
 
-        InsertVisitor (MWWorld::CellStore& cell, Loading::Listener& loadingListener, bool test);
+        InsertVisitor (MWWorld::CellStore& cell, Loading::Listener& loadingListener, bool onlyObjects, bool test);
 
         bool operator() (const MWWorld::Ptr& ptr);
 
@@ -211,8 +221,8 @@ namespace
         void insert(AddObject&& addObject);
     };
 
-    InsertVisitor::InsertVisitor (MWWorld::CellStore& cell, Loading::Listener& loadingListener, bool test)
-    : mCell (cell), mLoadingListener (loadingListener), mTest(test)
+    InsertVisitor::InsertVisitor (MWWorld::CellStore& cell, Loading::Listener& loadingListener, bool onlyObjects, bool test)
+    : mCell (cell), mLoadingListener (loadingListener), mOnlyObjects(onlyObjects), mTest(test)
     {}
 
     bool InsertVisitor::operator() (const MWWorld::Ptr& ptr)
@@ -228,7 +238,7 @@ namespace
     {
         for (MWWorld::Ptr& ptr : mToInsert)
         {
-            if (!ptr.getRefData().isDeleted() && ptr.getRefData().isEnabled())
+            if (!ptr.getRefData().isDeleted() && ptr.getRefData().isEnabled() && (!mOnlyObjects || !ptr.getClass().isActor()))
             {
                 try
                 {
@@ -261,6 +271,16 @@ namespace
         return std::abs(cellPosition.first) + std::abs(cellPosition.second);
     }
 
+    bool isCellInCollection(int x, int y, MWWorld::Scene::CellStoreCollection& collection)
+    {
+        for (auto *cell : collection)
+        {
+            assert(cell->getCell()->isExterior());
+            if (x == cell->getCell()->getGridX() && y == cell->getCell()->getGridY())
+                return true;
+        }
+        return false;
+    }
 }
 
 
@@ -274,7 +294,7 @@ namespace MWWorld
         {
             if (!ptr.getRefData().getBaseNode()) return;
             ptr.getClass().insertObjectRendering(ptr, getModel(ptr, mRendering.getResourceSystem()->getVFS()), mRendering);
-            setNodeRotation(ptr, mRendering, RotationOrder::direct);
+            setNodeRotation(ptr, mRendering, makeNodeRotation(ptr, RotationOrder::direct));
             reloadTerrain();
         }
     }
@@ -290,8 +310,9 @@ namespace MWWorld
 
     void Scene::updateObjectRotation(const Ptr &ptr, RotationOrder order)
     {
-        setNodeRotation(ptr, mRendering, order);
-        mPhysics->updateRotation(ptr);
+        const auto rot = makeNodeRotation(ptr, order);
+        setNodeRotation(ptr, mRendering, rot);
+        mPhysics->updateRotation(ptr, rot);
     }
 
     void Scene::updateObjectScale(const Ptr &ptr)
@@ -311,165 +332,213 @@ namespace MWWorld
         mRendering.update (duration, paused);
     }
 
-    void Scene::unloadCell (CellStoreCollection::iterator iter, bool test)
+    void Scene::unloadInactiveCell (CellStore* cell, bool test)
     {
+        assert(mActiveCells.find(cell) == mActiveCells.end());
+        assert(mInactiveCells.find(cell) != mInactiveCells.end());
         if (!test)
-            Log(Debug::Info) << "Unloading cell " << (*iter)->getCell()->getDescription();
+            Log(Debug::Info) << "Unloading cell " << cell->getCell()->getDescription();
+
+        ListObjectsVisitor visitor;
+
+        cell->forEach(visitor);
+        for (const auto& ptr : visitor.mObjects)
+            mPhysics->remove(ptr);
+
+        if (cell->getCell()->isExterior())
+        {
+            const auto cellX = cell->getCell()->getGridX();
+            const auto cellY = cell->getCell()->getGridY();
+            mPhysics->removeHeightField(cellX, cellY);
+        }
+
+        mInactiveCells.erase(cell);
+    }
+
+    void Scene::deactivateCell(CellStore* cell, bool test)
+    {
+        assert(mInactiveCells.find(cell) != mInactiveCells.end());
+        if (mActiveCells.find(cell) == mActiveCells.end())
+            return;
+        if (!test)
+            Log(Debug::Info) << "Deactivate cell " << cell->getCell()->getDescription();
 
         const auto navigator = MWBase::Environment::get().getWorld()->getNavigator();
         ListAndResetObjectsVisitor visitor;
 
-        (*iter)->forEach(visitor);
+        cell->forEach(visitor);
         const auto world = MWBase::Environment::get().getWorld();
         for (const auto& ptr : visitor.mObjects)
         {
             if (const auto object = mPhysics->getObject(ptr))
+            {
                 navigator->removeObject(DetourNavigator::ObjectId(object));
+                if (object->isAnimated())
+                    mPhysics->remove(ptr);
+            }
             else if (mPhysics->getActor(ptr))
             {
                 navigator->removeAgent(world->getPathfindingHalfExtents(ptr));
                 mRendering.removeActorPath(ptr);
+                mPhysics->remove(ptr);
             }
-            mPhysics->remove(ptr);
         }
 
-        const auto cellX = (*iter)->getCell()->getGridX();
-        const auto cellY = (*iter)->getCell()->getGridY();
+        const auto cellX = cell->getCell()->getGridX();
+        const auto cellY = cell->getCell()->getGridY();
 
-        if ((*iter)->getCell()->isExterior())
+        if (cell->getCell()->isExterior())
         {
             if (const auto heightField = mPhysics->getHeightField(cellX, cellY))
                 navigator->removeObject(DetourNavigator::ObjectId(heightField));
-            mPhysics->removeHeightField(cellX, cellY);
         }
 
-        if ((*iter)->getCell()->hasWater())
+        if (cell->getCell()->hasWater())
             navigator->removeWater(osg::Vec2i(cellX, cellY));
 
-        if (const auto pathgrid = world->getStore().get<ESM::Pathgrid>().search(*(*iter)->getCell()))
+        if (const auto pathgrid = world->getStore().get<ESM::Pathgrid>().search(*cell->getCell()))
             navigator->removePathgrid(*pathgrid);
 
         const auto player = world->getPlayerPtr();
         navigator->update(player.getRefData().getPosition().asVec3());
 
-        MWBase::Environment::get().getMechanicsManager()->drop (*iter);
+        MWBase::Environment::get().getMechanicsManager()->drop (cell);
 
-        mRendering.removeCell(*iter);
-        MWBase::Environment::get().getWindowManager()->removeCell(*iter);
+        mRendering.removeCell(cell);
+        MWBase::Environment::get().getWindowManager()->removeCell(cell);
 
-        MWBase::Environment::get().getWorld()->getLocalScripts().clearCell (*iter);
+        MWBase::Environment::get().getWorld()->getLocalScripts().clearCell (cell);
 
-        MWBase::Environment::get().getSoundManager()->stopSound (*iter);
-        mActiveCells.erase(*iter);
+        MWBase::Environment::get().getSoundManager()->stopSound (cell);
+        mActiveCells.erase(cell);
     }
 
-    void Scene::loadCell (CellStore *cell, Loading::Listener* loadingListener, bool respawn, bool test)
+    void Scene::activateCell (CellStore *cell, Loading::Listener* loadingListener, bool respawn, bool test)
     {
-        std::pair<CellStoreCollection::iterator, bool> result = mActiveCells.insert(cell);
+        assert(mActiveCells.find(cell) == mActiveCells.end());
+        assert(mInactiveCells.find(cell) != mInactiveCells.end());
+        mActiveCells.insert(cell);
+
+        if (test)
+            Log(Debug::Info) << "Testing cell " << cell->getCell()->getDescription();
+        else
+            Log(Debug::Info) << "Loading cell " << cell->getCell()->getDescription();
 
-        if(result.second)
+        const auto world = MWBase::Environment::get().getWorld();
+        const auto navigator = world->getNavigator();
+
+        const int cellX = cell->getCell()->getGridX();
+        const int cellY = cell->getCell()->getGridY();
+
+        if (!test && cell->getCell()->isExterior())
         {
-            if (test)
-                Log(Debug::Info) << "Testing cell " << cell->getCell()->getDescription();
-            else
-                Log(Debug::Info) << "Loading cell " << cell->getCell()->getDescription();
+            if (const auto heightField = mPhysics->getHeightField(cellX, cellY))
+                navigator->addObject(DetourNavigator::ObjectId(heightField), *heightField->getShape(),
+                        heightField->getCollisionObject()->getWorldTransform());
+        }
 
-            float verts = ESM::Land::LAND_SIZE;
-            float worldsize = ESM::Land::REAL_SIZE;
+        if (const auto pathgrid = world->getStore().get<ESM::Pathgrid>().search(*cell->getCell()))
+            navigator->addPathgrid(*cell->getCell(), *pathgrid);
 
-            const auto world = MWBase::Environment::get().getWorld();
-            const auto navigator = world->getNavigator();
+        // register local scripts
+        // do this before insertCell, to make sure we don't add scripts from levelled creature spawning twice
+        MWBase::Environment::get().getWorld()->getLocalScripts().addCell (cell);
 
-            const int cellX = cell->getCell()->getGridX();
-            const int cellY = cell->getCell()->getGridY();
+        if (respawn)
+            cell->respawn();
 
-            // Load terrain physics first...
-            if (!test && cell->getCell()->isExterior())
+        insertCell (*cell, loadingListener, false, test);
+
+        mRendering.addCell(cell);
+        if (!test)
+        {
+            MWBase::Environment::get().getWindowManager()->addCell(cell);
+            bool waterEnabled = cell->getCell()->hasWater() || cell->isExterior();
+            float waterLevel = cell->getWaterLevel();
+            mRendering.setWaterEnabled(waterEnabled);
+            if (waterEnabled)
             {
-                osg::ref_ptr<const ESMTerrain::LandObject> land = mRendering.getLandManager()->getLand(cellX, cellY);
-                const ESM::Land::LandData* data = land ? land->getData(ESM::Land::DATA_VHGT) : nullptr;
-                if (data)
+                mPhysics->enableWater(waterLevel);
+                mRendering.setWaterHeight(waterLevel);
+
+                if (cell->getCell()->isExterior())
                 {
-                    mPhysics->addHeightField (data->mHeights, cellX, cellY, worldsize / (verts-1), verts, data->mMinHeight, data->mMaxHeight, land.get());
+                    if (const auto heightField = mPhysics->getHeightField(cellX, cellY))
+                        navigator->addWater(osg::Vec2i(cellX, cellY), ESM::Land::REAL_SIZE,
+                                cell->getWaterLevel(), heightField->getCollisionObject()->getWorldTransform());
                 }
                 else
                 {
-                    static std::vector<float> defaultHeight;
-                    defaultHeight.resize(verts*verts, ESM::Land::DEFAULT_HEIGHT);
-                    mPhysics->addHeightField (&defaultHeight[0], cell->getCell()->getGridX(), cell->getCell()->getGridY(), worldsize / (verts-1), verts, ESM::Land::DEFAULT_HEIGHT, ESM::Land::DEFAULT_HEIGHT, land.get());
+                    navigator->addWater(osg::Vec2i(cellX, cellY), std::numeric_limits<int>::max(),
+                            cell->getWaterLevel(), btTransform::getIdentity());
                 }
-
-                if (const auto heightField = mPhysics->getHeightField(cellX, cellY))
-                    navigator->addObject(DetourNavigator::ObjectId(heightField), *heightField->getShape(),
-                            heightField->getCollisionObject()->getWorldTransform());
             }
+            else
+                mPhysics->disableWater();
 
-            if (const auto pathgrid = world->getStore().get<ESM::Pathgrid>().search(*cell->getCell()))
-                navigator->addPathgrid(*cell->getCell(), *pathgrid);
+            const auto player = MWBase::Environment::get().getWorld()->getPlayerPtr();
 
-            // register local scripts
-            // do this before insertCell, to make sure we don't add scripts from levelled creature spawning twice
-            MWBase::Environment::get().getWorld()->getLocalScripts().addCell (cell);
+            // By default the player is grounded, with the scene fully loaded, we validate and correct this.
+            if (player.mCell == cell) // Only run once, during initial cell load.
+            {
+                mPhysics->traceDown(player, player.getRefData().getPosition().asVec3(), 10.f);
+            }
 
-            if (respawn)
-                cell->respawn();
+            navigator->update(player.getRefData().getPosition().asVec3());
 
-            // ... then references. This is important for adjustPosition to work correctly.
-            insertCell (*cell, loadingListener, test);
+            if (!cell->isExterior() && !(cell->getCell()->mData.mFlags & ESM::Cell::QuasiEx))
+                mRendering.configureAmbient(cell->getCell());
+        }
 
-            mRendering.addCell(cell);
-            if (!test)
-            {
-                MWBase::Environment::get().getWindowManager()->addCell(cell);
-                bool waterEnabled = cell->getCell()->hasWater() || cell->isExterior();
-                float waterLevel = cell->getWaterLevel();
-                mRendering.setWaterEnabled(waterEnabled);
-                if (waterEnabled)
-                {
-                    mPhysics->enableWater(waterLevel);
-                    mRendering.setWaterHeight(waterLevel);
+        mPreloader->notifyLoaded(cell);
+    }
 
-                    if (cell->getCell()->isExterior())
-                    {
-                        if (const auto heightField = mPhysics->getHeightField(cellX, cellY))
-                            navigator->addWater(osg::Vec2i(cellX, cellY), ESM::Land::REAL_SIZE,
-                                cell->getWaterLevel(), heightField->getCollisionObject()->getWorldTransform());
-                    }
-                    else
-                    {
-                        navigator->addWater(osg::Vec2i(cellX, cellY), std::numeric_limits<int>::max(),
-                            cell->getWaterLevel(), btTransform::getIdentity());
-                    }
-                }
-                else
-                    mPhysics->disableWater();
+    void Scene::loadInactiveCell (CellStore *cell, Loading::Listener* loadingListener, bool test)
+    {
+        assert(mActiveCells.find(cell) == mActiveCells.end());
+        assert(mInactiveCells.find(cell) == mInactiveCells.end());
+        mInactiveCells.insert(cell);
 
-                const auto player = MWBase::Environment::get().getWorld()->getPlayerPtr();
+        if (test)
+            Log(Debug::Info) << "Testing inactive cell " << cell->getCell()->getDescription();
+        else
+            Log(Debug::Info) << "Loading inactive cell " << cell->getCell()->getDescription();
 
-                // By default the player is grounded, with the scene fully loaded, we validate and correct this.
-                if (player.mCell == cell) // Only run once, during initial cell load.
-                {
-                    mPhysics->traceDown(player, player.getRefData().getPosition().asVec3(), 10.f);
-                }
+        if (!test && cell->getCell()->isExterior())
+        {
+            float verts = ESM::Land::LAND_SIZE;
+            float worldsize = ESM::Land::REAL_SIZE;
 
-                navigator->update(player.getRefData().getPosition().asVec3());
+            const int cellX = cell->getCell()->getGridX();
+            const int cellY = cell->getCell()->getGridY();
 
-                if (!cell->isExterior() && !(cell->getCell()->mData.mFlags & ESM::Cell::QuasiEx))
-                {
-                    mRendering.configureAmbient(cell->getCell());
-                }
+            osg::ref_ptr<const ESMTerrain::LandObject> land = mRendering.getLandManager()->getLand(cellX, cellY);
+            const ESM::Land::LandData* data = land ? land->getData(ESM::Land::DATA_VHGT) : nullptr;
+            if (data)
+            {
+                mPhysics->addHeightField (data->mHeights, cellX, cellY, worldsize / (verts-1), verts, data->mMinHeight, data->mMaxHeight, land.get());
+            }
+            else
+            {
+                static std::vector<float> defaultHeight;
+                defaultHeight.resize(verts*verts, ESM::Land::DEFAULT_HEIGHT);
+                mPhysics->addHeightField (&defaultHeight[0], cellX, cellY, worldsize / (verts-1), verts, ESM::Land::DEFAULT_HEIGHT, ESM::Land::DEFAULT_HEIGHT, land.get());
             }
         }
 
-        mPreloader->notifyLoaded(cell);
+        insertCell (*cell, loadingListener, true, test);
     }
 
     void Scene::clear()
     {
-        CellStoreCollection::iterator active = mActiveCells.begin();
-        while (active!=mActiveCells.end())
-            unloadCell (active++);
+        for (auto iter = mInactiveCells.begin(); iter!=mInactiveCells.end(); )
+        {
+            auto* cell = *iter++;
+            deactivateCell(cell);
+            unloadInactiveCell (cell);
+        }
         assert(mActiveCells.empty());
+        assert(mInactiveCells.empty());
         mCurrentCell = nullptr;
 
         mPreloader->clear();
@@ -512,20 +581,24 @@ namespace MWWorld
 
     void Scene::changeCellGrid (const osg::Vec3f &pos, int playerCellX, int playerCellY, bool changeEvent)
     {
-        CellStoreCollection::iterator active = mActiveCells.begin();
-        while (active!=mActiveCells.end())
+        for (auto iter = mInactiveCells.begin(); iter != mInactiveCells.end(); )
         {
-            if ((*active)->getCell()->isExterior())
+            auto* cell = *iter++;
+            if (cell->getCell()->isExterior())
             {
-                if (std::abs (playerCellX-(*active)->getCell()->getGridX())<=mHalfGridSize &&
-                    std::abs (playerCellY-(*active)->getCell()->getGridY())<=mHalfGridSize)
-                {
-                    // keep cells within the new grid
-                    ++active;
-                    continue;
-                }
+                const auto dx = std::abs(playerCellX - cell->getCell()->getGridX());
+                const auto dy = std::abs(playerCellY - cell->getCell()->getGridY());
+                if (dx > mHalfGridSize || dy > mHalfGridSize)
+                    deactivateCell(cell);
+
+                if (dx > mHalfGridSize+1 || dy > mHalfGridSize+1)
+                    unloadInactiveCell(cell);
+            }
+            else
+            {
+                deactivateCell(cell);
+                unloadInactiveCell(cell);
             }
-            unloadCell (active++);
         }
 
         mCurrentGridCenter = osg::Vec2i(playerCellX, playerCellY);
@@ -537,32 +610,24 @@ namespace MWWorld
         mRendering.getPagedRefnums(newGrid, mPagedRefs);
 
         std::size_t refsToLoad = 0;
-        std::vector<std::pair<int, int>> cellsPositionsToLoad;
-        // get the number of refs to load
-        for (int x = playerCellX - mHalfGridSize; x <= playerCellX + mHalfGridSize; ++x)
+        const auto cellsToLoad = [&playerCellX,&playerCellY,&refsToLoad](CellStoreCollection& collection, int range) -> std::vector<std::pair<int,int>>
         {
-            for (int y = playerCellY - mHalfGridSize; y <= playerCellY + mHalfGridSize; ++y)
+            std::vector<std::pair<int, int>> cellsPositionsToLoad;
+            for (int x = playerCellX - range; x <= playerCellX + range; ++x)
             {
-                CellStoreCollection::iterator iter = mActiveCells.begin();
-
-                while (iter!=mActiveCells.end())
+                for (int y = playerCellY - range; y <= playerCellY + range; ++y)
                 {
-                    assert ((*iter)->getCell()->isExterior());
-
-                    if (x==(*iter)->getCell()->getGridX() &&
-                        y==(*iter)->getCell()->getGridY())
-                        break;
-
-                    ++iter;
-                }
-
-                if (iter==mActiveCells.end())
-                {
-                    refsToLoad += MWBase::Environment::get().getWorld()->getExterior(x, y)->count();
-                    cellsPositionsToLoad.emplace_back(x, y);
+                    if (!isCellInCollection(x, y, collection))
+                    {
+                        refsToLoad += MWBase::Environment::get().getWorld()->getExterior(x, y)->count();
+                        cellsPositionsToLoad.emplace_back(x, y);
+                    }
                 }
             }
-        }
+            return cellsPositionsToLoad;
+        };
+        auto cellsPositionsToLoad = cellsToLoad(mActiveCells,mHalfGridSize);
+        auto cellsPositionsToLoadInactive = cellsToLoad(mInactiveCells,mHalfGridSize+1);
 
         Loading::Listener* loadingListener = MWBase::Environment::get().getWindowManager()->getLoadingScreen();
         Loading::ScopedLoad load(loadingListener);
@@ -585,30 +650,26 @@ namespace MWWorld
                 return getCellPositionPriority(lhs) < getCellPositionPriority(rhs);
             });
 
+        std::sort(cellsPositionsToLoadInactive.begin(), cellsPositionsToLoadInactive.end(),
+            [&] (const std::pair<int, int>& lhs, const std::pair<int, int>& rhs) {
+                return getCellPositionPriority(lhs) < getCellPositionPriority(rhs);
+            });
+
         // Load cells
-        for (const auto& cellPosition : cellsPositionsToLoad)
+        for (const auto& [x,y] : cellsPositionsToLoadInactive)
         {
-            const auto x = cellPosition.first;
-            const auto y = cellPosition.second;
-
-            CellStoreCollection::iterator iter = mActiveCells.begin();
-
-            while (iter != mActiveCells.end())
+            if (!isCellInCollection(x, y, mInactiveCells))
             {
-                assert ((*iter)->getCell()->isExterior());
-
-                if (x == (*iter)->getCell()->getGridX() &&
-                    y == (*iter)->getCell()->getGridY())
-                    break;
-
-                ++iter;
+                CellStore *cell = MWBase::Environment::get().getWorld()->getExterior(x, y);
+                loadInactiveCell (cell, loadingListener);
             }
-
-            if (iter == mActiveCells.end())
+        }
+        for (const auto& [x,y] : cellsPositionsToLoad)
+        {
+            if (!isCellInCollection(x, y, mActiveCells))
             {
                 CellStore *cell = MWBase::Environment::get().getWorld()->getExterior(x, y);
-
-                loadCell (cell, loadingListener, changeEvent);
+                activateCell (cell, loadingListener, changeEvent);
             }
         }
 
@@ -643,7 +704,8 @@ namespace MWWorld
             CellStoreCollection::iterator iter = mActiveCells.begin();
 
             CellStore *cell = MWBase::Environment::get().getWorld()->getExterior(it->mData.mX, it->mData.mY);
-            loadCell (cell, loadingListener, false, true);
+            loadInactiveCell (cell, loadingListener, true);
+            activateCell (cell, loadingListener, false, true);
 
             iter = mActiveCells.begin();
             while (iter != mActiveCells.end())
@@ -651,7 +713,8 @@ namespace MWWorld
                 if (it->isExterior() && it->mData.mX == (*iter)->getCell()->getGridX() &&
                     it->mData.mY == (*iter)->getCell()->getGridY())
                 {
-                    unloadCell(iter, true);
+                    deactivateCell(*iter, true);
+                    unloadInactiveCell (*iter, true);
                     break;
                 }
 
@@ -689,7 +752,8 @@ namespace MWWorld
             loadingListener->setLabel("Testing interior cells ("+std::to_string(i)+"/"+std::to_string(cells.getIntSize())+")...");
 
             CellStore *cell = MWBase::Environment::get().getWorld()->getInterior(it->mName);
-            loadCell (cell, loadingListener, false, true);
+            loadInactiveCell (cell, loadingListener, true);
+            activateCell (cell, loadingListener, false, true);
 
             CellStoreCollection::iterator iter = mActiveCells.begin();
             while (iter != mActiveCells.end())
@@ -698,7 +762,8 @@ namespace MWWorld
 
                 if (it->mName == (*iter)->getCell()->mName)
                 {
-                    unloadCell(iter, true);
+                    deactivateCell(*iter, true);
+                    unloadInactiveCell (*iter, true);
                     break;
                 }
 
@@ -820,15 +885,21 @@ namespace MWWorld
         Log(Debug::Info) << "Changing to interior";
 
         // unload
-        CellStoreCollection::iterator active = mActiveCells.begin();
-        while (active!=mActiveCells.end())
-            unloadCell (active++);
+        for (auto iter = mInactiveCells.begin(); iter!=mInactiveCells.end(); )
+        {
+            auto* cell = *iter++;
+            deactivateCell(cell);
+            unloadInactiveCell(cell);
+        }
+        assert(mActiveCells.empty());
+        assert(mInactiveCells.empty());
 
         loadingListener->setProgressRange(cell->count());
 
         // Load cell.
         mPagedRefs.clear();
-        loadCell (cell, loadingListener, changeEvent);
+        loadInactiveCell (cell, loadingListener);
+        activateCell (cell, loadingListener, changeEvent);
 
         changePlayerCell(cell, position, adjustPlayerPos);
 
@@ -878,23 +949,26 @@ namespace MWWorld
         mCellChanged = false;
     }
 
-    void Scene::insertCell (CellStore &cell, Loading::Listener* loadingListener, bool test)
+    void Scene::insertCell (CellStore &cell, Loading::Listener* loadingListener, bool onlyObjects, bool test)
     {
-        InsertVisitor insertVisitor (cell, *loadingListener, test);
+        InsertVisitor insertVisitor (cell, *loadingListener, onlyObjects, test);
         cell.forEach (insertVisitor);
-        insertVisitor.insert([&] (const MWWorld::Ptr& ptr) { addObject(ptr, *mPhysics, mRendering, mPagedRefs); });
-        insertVisitor.insert([&] (const MWWorld::Ptr& ptr) { addObject(ptr, *mPhysics, mNavigator); });
+        insertVisitor.insert([&] (const MWWorld::Ptr& ptr) { addObject(ptr, *mPhysics, mRendering, mPagedRefs, onlyObjects); });
+        if (!onlyObjects)
+        {
+            insertVisitor.insert([&] (const MWWorld::Ptr& ptr) { addObject(ptr, *mPhysics, mNavigator); });
 
-        // do adjustPosition (snapping actors to ground) after objects are loaded, so we don't depend on the loading order
-        PositionVisitor posVisitor;
-        cell.forEach (posVisitor);
+            // do adjustPosition (snapping actors to ground) after objects are loaded, so we don't depend on the loading order
+            PositionVisitor posVisitor;
+            cell.forEach (posVisitor);
+        }
     }
 
     void Scene::addObjectToScene (const Ptr& ptr)
     {
         try
         {
-            addObject(ptr, *mPhysics, mRendering, mPagedRefs);
+            addObject(ptr, *mPhysics, mRendering, mPagedRefs, false);
             addObject(ptr, *mPhysics, mNavigator);
             MWBase::Environment::get().getWorld()->scaleObject(ptr, ptr.getCellRef().getScale());
             const auto navigator = MWBase::Environment::get().getWorld()->getNavigator();
diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp
index f87a0ca733..bc9c2386bb 100644
--- a/apps/openmw/mwworld/scene.hpp
+++ b/apps/openmw/mwworld/scene.hpp
@@ -64,13 +64,13 @@ namespace MWWorld
     class Scene
     {
         public:
-
-            typedef std::set<CellStore *> CellStoreCollection;
+            using CellStoreCollection = std::set<CellStore *>;
 
         private:
 
             CellStore* mCurrentCell; // the cell the player is in
             CellStoreCollection mActiveCells;
+            CellStoreCollection mInactiveCells;
             bool mCellChanged;
             MWPhysics::PhysicsSystem *mPhysics;
             MWRender::RenderingManager& mRendering;
@@ -91,7 +91,7 @@ namespace MWWorld
 
             std::set<ESM::RefNum> mPagedRefs;
 
-            void insertCell (CellStore &cell, Loading::Listener* loadingListener, bool test = false);
+            void insertCell (CellStore &cell, Loading::Listener* loadingListener, bool onlyObjects, bool test = false);
             osg::Vec2i mCurrentGridCenter;
 
             // Load and unload cells as necessary to create a cell grid with "X" and "Y" in the center
@@ -107,6 +107,11 @@ namespace MWWorld
             osg::Vec4i gridCenterToBounds(const osg::Vec2i &centerCell) const;
             osg::Vec2i getNewGridCenter(const osg::Vec3f &pos, const osg::Vec2i *currentGridCenter = nullptr) const;
 
+            void unloadInactiveCell (CellStore* cell, bool test = false);
+            void deactivateCell (CellStore* cell, bool test = false);
+            void activateCell (CellStore *cell, Loading::Listener* loadingListener, bool respawn, bool test = false);
+            void loadInactiveCell (CellStore *cell, Loading::Listener* loadingListener, bool test = false);
+
         public:
 
             Scene (MWRender::RenderingManager& rendering, MWPhysics::PhysicsSystem *physics,
@@ -118,10 +123,6 @@ namespace MWWorld
             void preloadTerrain(const osg::Vec3f& pos, bool sync=false);
             void reloadTerrain();
 
-            void unloadCell (CellStoreCollection::iterator iter, bool test = false);
-
-            void loadCell (CellStore *cell, Loading::Listener* loadingListener, bool respawn, bool test = false);
-
             void playerMoved (const osg::Vec3f& pos);
 
             void changePlayerCell (CellStore* newCell, const ESM::Position& position, bool adjustPlayerPos);
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 611e535c88..89b24a8651 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1421,7 +1421,7 @@ namespace MWWorld
             mWorldScene->removeFromPagedRefs(ptr);
 
             mRendering->rotateObject(ptr, rotate);
-            mPhysics->updateRotation(ptr);
+            mPhysics->updateRotation(ptr, rotate);
 
             if (const auto object = mPhysics->getObject(ptr))
                 updateNavigatorObject(object);
diff --git a/components/resource/bulletshape.cpp b/components/resource/bulletshape.cpp
index fc68c55458..c6f6369dba 100644
--- a/components/resource/bulletshape.cpp
+++ b/components/resource/bulletshape.cpp
@@ -95,6 +95,11 @@ void BulletShape::setLocalScaling(const btVector3& scale)
         mAvoidCollisionShape->setLocalScaling(scale);
 }
 
+bool BulletShape::isAnimated() const
+{
+    return !mAnimatedShapes.empty();
+}
+
 osg::ref_ptr<BulletShapeInstance> BulletShape::makeInstance() const
 {
     osg::ref_ptr<BulletShapeInstance> instance (new BulletShapeInstance(this));
diff --git a/components/resource/bulletshape.hpp b/components/resource/bulletshape.hpp
index 8ad13fae14..6ac8064cb3 100644
--- a/components/resource/bulletshape.hpp
+++ b/components/resource/bulletshape.hpp
@@ -52,6 +52,8 @@ namespace Resource
 
         void setLocalScaling(const btVector3& scale);
 
+        bool isAnimated() const;
+
     private:
 
         void deleteShape(btCollisionShape* shape);

From 024ad3276b472e0fc58b681d10566917e4d8d44d Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Tue, 29 Jun 2021 19:20:01 +1000
Subject: [PATCH 0912/2859] Partial fix for #6017.  The persistence flag of the
 references are saved but it is not yet possible to modify it via OpenCS.

---
 apps/opencs/model/doc/savingstages.cpp    | 119 ++++++++++++----------
 apps/opencs/model/doc/savingstages.hpp    |   2 +
 apps/opencs/model/world/refcollection.cpp |   5 +-
 components/esm/cellref.cpp                |  21 +++-
 components/esm/cellref.hpp                |   6 +-
 components/esm/loadcell.cpp               |  17 ++--
 components/esm/loadcell.hpp               |   4 +-
 7 files changed, 109 insertions(+), 65 deletions(-)

diff --git a/apps/opencs/model/doc/savingstages.cpp b/apps/opencs/model/doc/savingstages.cpp
index 44698cd2e3..5e94f40b0f 100644
--- a/apps/opencs/model/doc/savingstages.cpp
+++ b/apps/opencs/model/doc/savingstages.cpp
@@ -253,6 +253,70 @@ int CSMDoc::WriteCellCollectionStage::setup()
     return mDocument.getData().getCells().getSize();
 }
 
+int CSMDoc::WriteCellCollectionStage::writeReferences (const std::deque<int>& references, bool interior, unsigned int& newRefNum, bool temp)
+{
+    ESM::ESMWriter& writer = mState.getWriter();
+    size_t refCount = 0;
+
+    for (std::deque<int>::const_iterator iter (references.begin());
+        iter!=references.end(); ++iter)
+    {
+        const CSMWorld::Record<CSMWorld::CellRef>& ref =
+            mDocument.getData().getReferences().getRecord (*iter);
+
+        if (temp && ref.get().mIsPersistent || !temp && !ref.get().mIsPersistent)
+            continue;
+
+        refCount++;
+
+        if (ref.isModified() || ref.mState == CSMWorld::RecordBase::State_Deleted)
+        {
+            CSMWorld::CellRef refRecord = ref.get();
+
+            // Check for uninitialized content file
+            if (!refRecord.mRefNum.hasContentFile())
+                refRecord.mRefNum.mContentFile = 0;
+
+            // recalculate the ref's cell location
+            std::ostringstream stream;
+            if (!interior)
+            {
+                std::pair<int, int> index = refRecord.getCellIndex();
+                stream << "#" << index.first << " " << index.second;
+            }
+
+            if (refRecord.mNew || refRecord.mRefNum.mIndex == 0 ||
+                (!interior && ref.mState==CSMWorld::RecordBase::State_ModifiedOnly &&
+                refRecord.mCell!=stream.str()))
+            {
+                refRecord.mRefNum.mIndex = newRefNum++;
+            }
+            else if ((refRecord.mOriginalCell.empty() ? refRecord.mCell : refRecord.mOriginalCell)
+                    != stream.str() && !interior)
+            {
+                // An empty mOriginalCell is meant to indicate that it is the same as
+                // the current cell.  It is possible that a moved ref is moved again.
+
+                ESM::MovedCellRef moved;
+                moved.mRefNum = refRecord.mRefNum;
+
+                // Need to fill mTarget with the ref's new position.
+                std::istringstream istream (stream.str().c_str());
+
+                char ignore;
+                istream >> ignore >> moved.mTarget[0] >> moved.mTarget[1];
+
+                refRecord.mRefNum.save (writer, false, "MVRF");
+                writer.writeHNT ("CNDT", moved.mTarget);
+            }
+
+            refRecord.save (writer, false, false, ref.mState == CSMWorld::RecordBase::State_Deleted);
+        }
+    }
+
+    return refCount;
+}
+
 void CSMDoc::WriteCellCollectionStage::perform (int stage, Messages& messages)
 {
     ESM::ESMWriter& writer = mState.getWriter();
@@ -289,7 +353,6 @@ void CSMDoc::WriteCellCollectionStage::perform (int stage, Messages& messages)
 
                 if (refRecord.mRefNum.mIndex >= newRefNum)
                     newRefNum = refRecord.mRefNum.mIndex + 1;
-
             }
         }
 
@@ -312,56 +375,10 @@ void CSMDoc::WriteCellCollectionStage::perform (int stage, Messages& messages)
         // write references
         if (references!=mState.getSubRecords().end())
         {
-            for (std::deque<int>::const_iterator iter (references->second.begin());
-                iter!=references->second.end(); ++iter)
-            {
-                const CSMWorld::Record<CSMWorld::CellRef>& ref =
-                    mDocument.getData().getReferences().getRecord (*iter);
-
-                if (ref.isModified() || ref.mState == CSMWorld::RecordBase::State_Deleted)
-                {
-                    CSMWorld::CellRef refRecord = ref.get();
-
-                    // Check for uninitialized content file
-                    if (!refRecord.mRefNum.hasContentFile())
-                        refRecord.mRefNum.mContentFile = 0;
-
-                    // recalculate the ref's cell location
-                    std::ostringstream stream;
-                    if (!interior)
-                    {
-                        std::pair<int, int> index = refRecord.getCellIndex();
-                        stream << "#" << index.first << " " << index.second;
-                    }
-
-                    if (refRecord.mNew || refRecord.mRefNum.mIndex == 0 ||
-                        (!interior && ref.mState==CSMWorld::RecordBase::State_ModifiedOnly &&
-                        refRecord.mCell!=stream.str()))
-                    {
-                        refRecord.mRefNum.mIndex = newRefNum++;
-                    }
-                    else if ((refRecord.mOriginalCell.empty() ? refRecord.mCell : refRecord.mOriginalCell)
-                            != stream.str() && !interior)
-                    {
-                        // An empty mOriginalCell is meant to indicate that it is the same as
-                        // the current cell.  It is possible that a moved ref is moved again.
-
-                        ESM::MovedCellRef moved;
-                        moved.mRefNum = refRecord.mRefNum;
-
-                        // Need to fill mTarget with the ref's new position.
-                        std::istringstream istream (stream.str().c_str());
-
-                        char ignore;
-                        istream >> ignore >> moved.mTarget[0] >> moved.mTarget[1];
-
-                        refRecord.mRefNum.save (writer, false, "MVRF");
-                        writer.writeHNT ("CNDT", moved.mTarget);
-                    }
-
-                    refRecord.save (writer, false, false, ref.mState == CSMWorld::RecordBase::State_Deleted);
-                }
-            }
+            int persistentRefCount = writeReferences(references->second, interior, newRefNum, false/*temp*/);
+            cellRecord.saveTempMarker(writer, int(references->second.size()) - persistentRefCount);
+            // FIXME: loops twice, inefficient
+            writeReferences(references->second, interior, newRefNum, true/*temp*/);
         }
 
         writer.endRecord (cellRecord.sRecordId);
diff --git a/apps/opencs/model/doc/savingstages.hpp b/apps/opencs/model/doc/savingstages.hpp
index d3a0cc9b31..e9497a6064 100644
--- a/apps/opencs/model/doc/savingstages.hpp
+++ b/apps/opencs/model/doc/savingstages.hpp
@@ -171,6 +171,8 @@ namespace CSMDoc
             Document& mDocument;
             SavingState& mState;
 
+            int writeReferences (const std::deque<int>& references, bool interior, unsigned int& newRefNum, bool temp);
+
         public:
 
             WriteCellCollectionStage (Document& document, SavingState& state);
diff --git a/apps/opencs/model/world/refcollection.cpp b/apps/opencs/model/world/refcollection.cpp
index dfdb8e73bf..2f5db65636 100644
--- a/apps/opencs/model/world/refcollection.cpp
+++ b/apps/opencs/model/world/refcollection.cpp
@@ -19,8 +19,9 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
     ESM::MovedCellRef mref;
     mref.mRefNum.mIndex = 0;
     bool isDeleted = false;
+    int tempRefCount = cell.get().mRefNumCounter; // if initially non-zero, all refs in cell are temp
 
-    while (ESM::Cell::getNextRef(reader, ref, isDeleted, true, &mref))
+    while (ESM::Cell::getNextRef(reader, ref, isDeleted, &tempRefCount, true, &mref))
     {
         // Keep mOriginalCell empty when in modified (as an indicator that the
         // original cell will always be equal the current cell).
@@ -59,6 +60,8 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
         else
             ref.mCell = cell2.mId;
 
+        // TODO: update cell.get().mRefNumCounter with tempRefCount?
+
         mref.mRefNum.mIndex = 0;
 
         // ignore content file number
diff --git a/components/esm/cellref.cpp b/components/esm/cellref.cpp
index b4d6ac7a72..42bc3d648f 100644
--- a/components/esm/cellref.cpp
+++ b/components/esm/cellref.cpp
@@ -31,10 +31,10 @@ void ESM::RefNum::save (ESMWriter &esm, bool wide, const std::string& tag) const
 }
 
 
-void ESM::CellRef::load (ESMReader& esm, bool &isDeleted, bool wideRefNum)
+void ESM::CellRef::load (ESMReader& esm, bool &isDeleted, int *tempRefCount, bool wideRefNum)
 {
     loadId(esm, wideRefNum);
-    loadData(esm, isDeleted);
+    loadData(esm, isDeleted, tempRefCount);
 }
 
 void ESM::CellRef::loadId (ESMReader& esm, bool wideRefNum)
@@ -57,9 +57,11 @@ void ESM::CellRef::loadId (ESMReader& esm, bool wideRefNum)
     }
 }
 
-void ESM::CellRef::loadData(ESMReader &esm, bool &isDeleted)
+void ESM::CellRef::loadData(ESMReader &esm, bool &isDeleted, int *tempRefCount)
 {
     isDeleted = false;
+    mIsPersistent = !tempRefCount // default to persistent
+                    || (tempRefCount && *tempRefCount == -1);
 
     bool isLoaded = false;
     while (!isLoaded && esm.hasMoreSubs())
@@ -121,8 +123,17 @@ void ESM::CellRef::loadData(ESMReader &esm, bool &isDeleted)
                 esm.getHT(mPos, 24);
                 break;
             case ESM::FourCC<'N','A','M','0'>::value:
-                esm.skipHSub();
+            {
+                if (tempRefCount && *tempRefCount == -1)
+                {
+                    esm.getHT(*tempRefCount);
+                    // TODO: check that there are no more subs following this sub
+                }
+                else
+                    esm.skipHSub();
+
                 break;
+            }
             case ESM::SREC_DELE:
                 esm.skipHSub();
                 isDeleted = true;
@@ -236,4 +247,6 @@ void ESM::CellRef::blank()
         mPos.pos[i] = 0;
         mPos.rot[i] = 0;
     }
+
+    mIsPersistent = false;
 }
diff --git a/components/esm/cellref.hpp b/components/esm/cellref.hpp
index c2f7ff6de5..97cfea89d0 100644
--- a/components/esm/cellref.hpp
+++ b/components/esm/cellref.hpp
@@ -106,13 +106,15 @@ namespace ESM
             // Position and rotation of this object within the cell
             Position mPos;
 
+            bool mIsPersistent;
+
             /// Calls loadId and loadData
-            void load (ESMReader& esm, bool &isDeleted, bool wideRefNum = false);
+            void load (ESMReader& esm, bool &isDeleted, int *tempRefCount, bool wideRefNum = false);
 
             void loadId (ESMReader& esm, bool wideRefNum = false);
 
             /// Implicitly called by load
-            void loadData (ESMReader& esm, bool &isDeleted);
+            void loadData (ESMReader& esm, bool &isDeleted, int *tempRefCount = nullptr);
 
             void save (ESMWriter &esm, bool wideRefNum = false, bool inInventory = false, bool isDeleted = false) const;
 
diff --git a/components/esm/loadcell.cpp b/components/esm/loadcell.cpp
index bf70aad96f..8aeacd5116 100644
--- a/components/esm/loadcell.cpp
+++ b/components/esm/loadcell.cpp
@@ -146,7 +146,7 @@ namespace ESM
             }
         }
 
-        if (saveContext) 
+        if (saveContext)
         {
             mContextList.push_back(esm.getContext());
             esm.skipRecord();
@@ -197,9 +197,12 @@ namespace ESM
             if (mMapColor != 0)
                 esm.writeHNT("NAM5", mMapColor);
         }
+    }
 
-        if (mRefNumCounter != 0)
-            esm.writeHNT("NAM0", mRefNumCounter);
+    void Cell::saveTempMarker(ESMWriter &esm, int tempCount) const
+    {
+        if (tempCount != 0)
+            esm.writeHNT("NAM0", tempCount);
     }
 
     void Cell::restore(ESMReader &esm, int iCtx) const
@@ -221,7 +224,7 @@ namespace ESM
         return region + ' ' + cellGrid;
     }
 
-    bool Cell::getNextRef(ESMReader &esm, CellRef &ref, bool &isDeleted, bool ignoreMoves, MovedCellRef *mref)
+    bool Cell::getNextRef(ESMReader &esm, CellRef &ref, bool &isDeleted, int *tempRefCount, bool ignoreMoves, MovedCellRef *mref)
     {
         isDeleted = false;
 
@@ -249,7 +252,9 @@ namespace ESM
 
         if (esm.peekNextSub("FRMR"))
         {
-            ref.load (esm, isDeleted);
+            ref.load (esm, isDeleted, tempRefCount);
+
+            // TODO: should count the number of temp refs and validate the number
 
             // Identify references belonging to a parent file and adapt the ID accordingly.
             adjustRefNum (ref.mRefNum, esm);
@@ -275,7 +280,7 @@ namespace ESM
         mWater = 0;
         mWaterInt = false;
         mMapColor = 0;
-        mRefNumCounter = 0;
+        mRefNumCounter = -1;
 
         mData.mFlags = 0;
         mData.mX = 0;
diff --git a/components/esm/loadcell.hpp b/components/esm/loadcell.hpp
index d06b509c5a..ca4ca6e577 100644
--- a/components/esm/loadcell.hpp
+++ b/components/esm/loadcell.hpp
@@ -94,7 +94,7 @@ struct Cell
            mWater(0),
            mWaterInt(false),
            mMapColor(0),
-           mRefNumCounter(0)
+           mRefNumCounter(-1)
   {}
 
   // Interior cells are indexed by this (it's the 'id'), for exterior
@@ -133,6 +133,7 @@ struct Cell
   void loadCell(ESMReader &esm, bool saveContext = true); // Load everything, except NAME, DATAstruct and references
 
   void save(ESMWriter &esm, bool isDeleted = false) const;
+  void saveTempMarker(ESMWriter &esm, int tempCount) const;
 
   bool isExterior() const
   {
@@ -184,6 +185,7 @@ struct Cell
   static bool getNextRef(ESMReader &esm, 
                          CellRef &ref, 
                          bool &isDeleted, 
+                         int *tempRefCount = nullptr, 
                          bool ignoreMoves = false, 
                          MovedCellRef *mref = nullptr);
 

From f6eab52a1b8fd005d1d55ed9b164f76e225f8735 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Tue, 29 Jun 2021 19:45:02 +1000
Subject: [PATCH 0913/2859] Added "Persistent" column to references table.

---
 apps/opencs/model/world/columnimp.hpp | 27 +++++++++++++++++++++++++++
 apps/opencs/model/world/columns.cpp   |  2 ++
 apps/opencs/model/world/columns.hpp   |  2 ++
 apps/opencs/model/world/data.cpp      |  1 +
 4 files changed, 32 insertions(+)

diff --git a/apps/opencs/model/world/columnimp.hpp b/apps/opencs/model/world/columnimp.hpp
index 17518937c2..11b47e1a08 100644
--- a/apps/opencs/model/world/columnimp.hpp
+++ b/apps/opencs/model/world/columnimp.hpp
@@ -1429,6 +1429,33 @@ namespace CSMWorld
         }
     };
 
+    template<typename ESXRecordT>
+    struct PersistentColumn : public Column<ESXRecordT>
+    {
+        PersistentColumn()
+        : Column<ESXRecordT> (Columns::ColumnId_Persistent, ColumnBase::Display_Boolean)
+        {}
+
+        QVariant get (const Record<ESXRecordT>& record) const override
+        {
+            return record.get().mIsPersistent;
+        }
+
+        void set (Record<ESXRecordT>& record, const QVariant& data) override
+        {
+            ESXRecordT record2 = record.get();
+
+            record2.mIsPersistent = data.toInt();
+
+            record.setModified (record2);
+        }
+
+        bool isEditable() const override
+        {
+            return true;
+        }
+    };
+
     template<typename ESXRecordT>
     struct QuestStatusTypeColumn : public Column<ESXRecordT>
     {
diff --git a/apps/opencs/model/world/columns.cpp b/apps/opencs/model/world/columns.cpp
index eaea66c2f9..1b91997a5f 100644
--- a/apps/opencs/model/world/columns.cpp
+++ b/apps/opencs/model/world/columns.cpp
@@ -371,6 +371,8 @@ namespace CSMWorld
             { ColumnId_Skill6, "Skill 6" },
             { ColumnId_Skill7, "Skill 7" },
 
+            { ColumnId_Persistent, "Persistent" },
+
             { -1, 0 } // end marker
         };
     }
diff --git a/apps/opencs/model/world/columns.hpp b/apps/opencs/model/world/columns.hpp
index c85eaac5f1..b50fb71e04 100644
--- a/apps/opencs/model/world/columns.hpp
+++ b/apps/opencs/model/world/columns.hpp
@@ -343,6 +343,8 @@ namespace CSMWorld
             ColumnId_FactionAttrib1 = 311,
             ColumnId_FactionAttrib2 = 312,
 
+            ColumnId_Persistent = 313,
+
             // Allocated to a separate value range, so we don't get a collision should we ever need
             // to extend the number of use values.
             ColumnId_UseValue1 = 0x10000,
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 4ccd2a06db..0132584762 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -528,6 +528,7 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding, bool fsStrict, const Files::Pat
     mRefs.addColumn (new TrapColumn<CellRef>);
     mRefs.addColumn (new OwnerGlobalColumn<CellRef>);
     mRefs.addColumn (new RefNumColumn<CellRef>);
+    mRefs.addColumn (new PersistentColumn<CellRef>);
 
     mFilters.addColumn (new StringIdColumn<ESM::Filter>);
     mFilters.addColumn (new RecordStateColumn<ESM::Filter>);

From 2a76634f5f1891792e5f60d16482a08403314253 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Tue, 29 Jun 2021 23:25:26 +1000
Subject: [PATCH 0914/2859] Moved persistence flag from references to the
 header flags of referenceables (e.g. Static, Weapon, etc).  Editing widget is
 not fully working.

---
 apps/opencs/model/doc/savingstages.cpp      |   7 +-
 apps/opencs/model/world/columnimp.hpp       |  27 ----
 apps/opencs/model/world/data.cpp            |   1 -
 apps/opencs/model/world/refidadapterimp.hpp |  20 ++-
 apps/opencs/model/world/refidcollection.cpp |   2 +
 apps/opencs/model/world/refiddata.cpp       | 133 ++++++++++++++++++++
 apps/opencs/model/world/refiddata.hpp       |   4 +-
 components/esm/cellref.cpp                  |   4 -
 components/esm/cellref.hpp                  |   2 -
 components/esm/loadacti.cpp                 |   1 +
 components/esm/loadacti.hpp                 |   1 +
 components/esm/loadalch.cpp                 |   1 +
 components/esm/loadalch.hpp                 |   1 +
 components/esm/loadappa.cpp                 |   1 +
 components/esm/loadappa.hpp                 |   1 +
 components/esm/loadarmo.cpp                 |   1 +
 components/esm/loadarmo.hpp                 |   1 +
 components/esm/loadbook.cpp                 |   1 +
 components/esm/loadbook.hpp                 |   1 +
 components/esm/loadclot.cpp                 |   1 +
 components/esm/loadclot.hpp                 |   1 +
 components/esm/loadcont.cpp                 |   1 +
 components/esm/loadcont.hpp                 |   1 +
 components/esm/loadcrea.cpp                 |   3 +-
 components/esm/loadcrea.hpp                 |   1 +
 components/esm/loaddoor.cpp                 |   1 +
 components/esm/loaddoor.hpp                 |   1 +
 components/esm/loadingr.cpp                 |   1 +
 components/esm/loadingr.hpp                 |   1 +
 components/esm/loadlevlist.cpp              |   1 +
 components/esm/loadlevlist.hpp              |   1 +
 components/esm/loadligh.cpp                 |   1 +
 components/esm/loadligh.hpp                 |   1 +
 components/esm/loadlock.cpp                 |   1 +
 components/esm/loadlock.hpp                 |   1 +
 components/esm/loadmisc.cpp                 |   1 +
 components/esm/loadmisc.hpp                 |   1 +
 components/esm/loadnpc.cpp                  |   3 +-
 components/esm/loadnpc.hpp                  |   1 +
 components/esm/loadprob.cpp                 |   1 +
 components/esm/loadprob.hpp                 |   1 +
 components/esm/loadrepa.cpp                 |   1 +
 components/esm/loadrepa.hpp                 |   1 +
 components/esm/loadstat.cpp                 |   3 +
 components/esm/loadstat.hpp                 |   1 +
 components/esm/loadweap.cpp                 |   1 +
 components/esm/loadweap.hpp                 |   1 +
 47 files changed, 205 insertions(+), 39 deletions(-)

diff --git a/apps/opencs/model/doc/savingstages.cpp b/apps/opencs/model/doc/savingstages.cpp
index 5e94f40b0f..7d6e8fef88 100644
--- a/apps/opencs/model/doc/savingstages.cpp
+++ b/apps/opencs/model/doc/savingstages.cpp
@@ -257,6 +257,8 @@ int CSMDoc::WriteCellCollectionStage::writeReferences (const std::deque<int>& re
 {
     ESM::ESMWriter& writer = mState.getWriter();
     size_t refCount = 0;
+    const CSMWorld::RefIdCollection& referenceables = mDocument.getData().getReferenceables();
+    const CSMWorld::RefIdData& refIdData = referenceables.getDataSet();
 
     for (std::deque<int>::const_iterator iter (references.begin());
         iter!=references.end(); ++iter)
@@ -264,7 +266,10 @@ int CSMDoc::WriteCellCollectionStage::writeReferences (const std::deque<int>& re
         const CSMWorld::Record<CSMWorld::CellRef>& ref =
             mDocument.getData().getReferences().getRecord (*iter);
 
-        if (temp && ref.get().mIsPersistent || !temp && !ref.get().mIsPersistent)
+        unsigned int recordFlags = refIdData.getRecordFlags(ref.get().mId);
+        bool isPersistent = (recordFlags & 0x00000400) != 0;
+
+        if (temp && isPersistent || !temp && !isPersistent)
             continue;
 
         refCount++;
diff --git a/apps/opencs/model/world/columnimp.hpp b/apps/opencs/model/world/columnimp.hpp
index 11b47e1a08..17518937c2 100644
--- a/apps/opencs/model/world/columnimp.hpp
+++ b/apps/opencs/model/world/columnimp.hpp
@@ -1429,33 +1429,6 @@ namespace CSMWorld
         }
     };
 
-    template<typename ESXRecordT>
-    struct PersistentColumn : public Column<ESXRecordT>
-    {
-        PersistentColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_Persistent, ColumnBase::Display_Boolean)
-        {}
-
-        QVariant get (const Record<ESXRecordT>& record) const override
-        {
-            return record.get().mIsPersistent;
-        }
-
-        void set (Record<ESXRecordT>& record, const QVariant& data) override
-        {
-            ESXRecordT record2 = record.get();
-
-            record2.mIsPersistent = data.toInt();
-
-            record.setModified (record2);
-        }
-
-        bool isEditable() const override
-        {
-            return true;
-        }
-    };
-
     template<typename ESXRecordT>
     struct QuestStatusTypeColumn : public Column<ESXRecordT>
     {
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 0132584762..4ccd2a06db 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -528,7 +528,6 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding, bool fsStrict, const Files::Pat
     mRefs.addColumn (new TrapColumn<CellRef>);
     mRefs.addColumn (new OwnerGlobalColumn<CellRef>);
     mRefs.addColumn (new RefNumColumn<CellRef>);
-    mRefs.addColumn (new PersistentColumn<CellRef>);
 
     mFilters.addColumn (new StringIdColumn<ESM::Filter>);
     mFilters.addColumn (new RecordStateColumn<ESM::Filter>);
diff --git a/apps/opencs/model/world/refidadapterimp.hpp b/apps/opencs/model/world/refidadapterimp.hpp
index 3d784f1b2b..f8ca93fec7 100644
--- a/apps/opencs/model/world/refidadapterimp.hpp
+++ b/apps/opencs/model/world/refidadapterimp.hpp
@@ -114,8 +114,9 @@ namespace CSMWorld
     struct ModelColumns : public BaseColumns
     {
         const RefIdColumn *mModel;
+        const RefIdColumn *mPersistence;
 
-        ModelColumns (const BaseColumns& base) : BaseColumns (base), mModel(nullptr) {}
+        ModelColumns (const BaseColumns& base) : BaseColumns (base), mModel(nullptr), mPersistence(nullptr) {}
     };
 
     /// \brief Adapter for IDs with models (all but levelled lists)
@@ -151,6 +152,12 @@ namespace CSMWorld
         if (column==mModel.mModel)
             return QString::fromUtf8 (record.get().mModel.c_str());
 
+        if (column==mModel.mPersistence)
+        {
+            bool isPersistent = (record.get().mRecordFlags & 0x00000400) != 0;
+            return QString::fromUtf8 (isPersistent ? "Yes" : "No");
+        }
+
         return BaseRefIdAdapter<RecordT>::getData (column, data, index);
     }
 
@@ -164,6 +171,17 @@ namespace CSMWorld
         RecordT record2 = record.get();
         if (column==mModel.mModel)
             record2.mModel = value.toString().toUtf8().constData();
+        else if (column==mModel.mPersistence)
+        {
+            unsigned int flag = record2.mRecordFlags;
+            std::string val = value.toString().toUtf8().constData();
+            if (val == "Yes")
+                flag |= 0x00000400;
+            else if (val == "No")
+                flag &= ~0x00000400;
+
+            record2.mRecordFlags = flag;
+        }
         else
         {
             BaseRefIdAdapter<RecordT>::setData (column, data, index, value);
diff --git a/apps/opencs/model/world/refidcollection.cpp b/apps/opencs/model/world/refidcollection.cpp
index cd2dd89dff..b7370c20da 100644
--- a/apps/opencs/model/world/refidcollection.cpp
+++ b/apps/opencs/model/world/refidcollection.cpp
@@ -54,6 +54,8 @@ CSMWorld::RefIdCollection::RefIdCollection()
 
     mColumns.emplace_back(Columns::ColumnId_Model, ColumnBase::Display_Mesh);
     modelColumns.mModel = &mColumns.back();
+    mColumns.emplace_back(Columns::ColumnId_Persistent, ColumnBase::Display_Boolean);
+    modelColumns.mPersistence = &mColumns.back();
 
     NameColumns nameColumns (modelColumns);
 
diff --git a/apps/opencs/model/world/refiddata.cpp b/apps/opencs/model/world/refiddata.cpp
index e2ffbcca6b..4f72bae92e 100644
--- a/apps/opencs/model/world/refiddata.cpp
+++ b/apps/opencs/model/world/refiddata.cpp
@@ -87,6 +87,139 @@ CSMWorld::RefIdData::LocalIndex CSMWorld::RefIdData::searchId (
     return iter->second;
 }
 
+unsigned int CSMWorld::RefIdData::getRecordFlags (const std::string& id) const
+{
+    LocalIndex localIndex = searchId (id);
+
+    switch (localIndex.second)
+    {
+        case UniversalId::Type_Activator:
+        {
+            const RefIdDataContainer<ESM::Activator>& records = getActivators();
+            const ESM::Activator& record = dynamic_cast<const ESM::Activator&>(records.getRecord(localIndex.first));
+            return record.mRecordFlags;
+        }
+        case UniversalId::Type_Potion:
+        {
+            const RefIdDataContainer<ESM::Potion>& records = getPotions();
+            const ESM::Potion& record = dynamic_cast<const ESM::Potion&>(records.getRecord(localIndex.first));
+            return record.mRecordFlags;
+        }
+        case UniversalId::Type_Apparatus:
+        {
+            const RefIdDataContainer<ESM::Apparatus>& records = getApparati();
+            const ESM::Apparatus& record = dynamic_cast<const ESM::Apparatus&>(records.getRecord(localIndex.first));
+            return record.mRecordFlags;
+        }
+        case UniversalId::Type_Armor:
+        {
+            const RefIdDataContainer<ESM::Armor>& records = getArmors();
+            const ESM::Armor& record = dynamic_cast<const ESM::Armor&>(records.getRecord(localIndex.first));
+            return record.mRecordFlags;
+        }
+        case UniversalId::Type_Book:
+        {
+            const RefIdDataContainer<ESM::Book>& records = getBooks();
+            const ESM::Book& record = dynamic_cast<const ESM::Book&>(records.getRecord(localIndex.first));
+            return record.mRecordFlags;
+        }
+        case UniversalId::Type_Clothing:
+        {
+            const RefIdDataContainer<ESM::Clothing>& records = getClothing();
+            const ESM::Clothing& record = dynamic_cast<const ESM::Clothing&>(records.getRecord(localIndex.first));
+            return record.mRecordFlags;
+        }
+        case UniversalId::Type_Container:
+        {
+            const RefIdDataContainer<ESM::Container>& records = getContainers();
+            const ESM::Container& record = dynamic_cast<const ESM::Container&>(records.getRecord(localIndex.first));
+            return record.mRecordFlags;
+        }
+        case UniversalId::Type_Creature:
+        {
+            const RefIdDataContainer<ESM::Creature>& records = getCreatures();
+            const ESM::Creature& record = dynamic_cast<const ESM::Creature&>(records.getRecord(localIndex.first));
+            return record.mRecordFlags;
+        }
+        case UniversalId::Type_Door:
+        {
+            const RefIdDataContainer<ESM::Door>& records = getDoors();
+            const ESM::Door& record = dynamic_cast<const ESM::Door&>(records.getRecord(localIndex.first));
+            return record.mRecordFlags;
+        }
+        case UniversalId::Type_Ingredient:
+        {
+            const RefIdDataContainer<ESM::Ingredient>& records = getIngredients();
+            const ESM::Ingredient& record = dynamic_cast<const ESM::Ingredient&>(records.getRecord(localIndex.first));
+            return record.mRecordFlags;
+        }
+        case UniversalId::Type_CreatureLevelledList:
+        {
+            const RefIdDataContainer<ESM::CreatureLevList>& records = getCreatureLevelledLists();
+            const ESM::CreatureLevList& record = dynamic_cast<const ESM::CreatureLevList&>(records.getRecord(localIndex.first));
+            return record.mRecordFlags;
+        }
+        case UniversalId::Type_ItemLevelledList:
+        {
+            const RefIdDataContainer<ESM::ItemLevList>& records = getItemLevelledList();
+            const ESM::ItemLevList& record = dynamic_cast<const ESM::ItemLevList&>(records.getRecord(localIndex.first));
+            return record.mRecordFlags;
+        }
+        case UniversalId::Type_Light:
+        {
+            const RefIdDataContainer<ESM::Light>& records = getLights();
+            const ESM::Light& record = dynamic_cast<const ESM::Light&>(records.getRecord(localIndex.first));
+            return record.mRecordFlags;
+        }
+        case UniversalId::Type_Lockpick:
+        {
+            const RefIdDataContainer<ESM::Lockpick>& records = getLocpicks();
+            const ESM::Lockpick& record = dynamic_cast<const ESM::Lockpick&>(records.getRecord(localIndex.first));
+            return record.mRecordFlags;
+        }
+        case UniversalId::Type_Miscellaneous:
+        {
+            const RefIdDataContainer<ESM::Miscellaneous>& records = getMiscellaneous();
+            const ESM::Miscellaneous& record = dynamic_cast<const ESM::Miscellaneous&>(records.getRecord(localIndex.first));
+            return record.mRecordFlags;
+        }
+        case UniversalId::Type_Npc:
+        {
+            const RefIdDataContainer<ESM::NPC>& records = getNPCs();
+            const ESM::NPC& record = dynamic_cast<const ESM::NPC&>(records.getRecord(localIndex.first));
+            return record.mRecordFlags;
+        }
+        case UniversalId::Type_Probe:
+        {
+            const RefIdDataContainer<ESM::Probe>& records = getProbes();
+            const ESM::Probe& record = dynamic_cast<const ESM::Probe&>(records.getRecord(localIndex.first));
+            return record.mRecordFlags;
+        }
+        case UniversalId::Type_Repair:
+        {
+            const RefIdDataContainer<ESM::Repair>& records = getRepairs();
+            const ESM::Repair& record = dynamic_cast<const ESM::Repair&>(records.getRecord(localIndex.first));
+            return record.mRecordFlags;
+        }
+        case UniversalId::Type_Static:
+        {
+            const RefIdDataContainer<ESM::Static>& records = getStatics();
+            const ESM::Static& record = dynamic_cast<const ESM::Static&>(records.getRecord(localIndex.first));
+            return record.mRecordFlags;
+        }
+        case UniversalId::Type_Weapon:
+        {
+            const RefIdDataContainer<ESM::Weapon>& records = getWeapons();
+            const ESM::Weapon& record = dynamic_cast<const ESM::Weapon&>(records.getRecord(localIndex.first));
+            return record.mRecordFlags;
+        }
+        default:
+            break;
+    }
+
+    return 0;
+}
+
 void CSMWorld::RefIdData::erase (int index, int count)
 {
     LocalIndex localIndex = globalToLocalIndex (index);
diff --git a/apps/opencs/model/world/refiddata.hpp b/apps/opencs/model/world/refiddata.hpp
index 1480bb71d9..da6ac7b154 100644
--- a/apps/opencs/model/world/refiddata.hpp
+++ b/apps/opencs/model/world/refiddata.hpp
@@ -209,7 +209,7 @@ namespace CSMWorld
         if (record.isModified() || record.mState == RecordBase::State_Deleted)
         {
             RecordT esmRecord = record.get();
-            writer.startRecord(esmRecord.sRecordId);
+            writer.startRecord(esmRecord.sRecordId, esmRecord.mRecordFlags);
             esmRecord.save(writer, record.mState == RecordBase::State_Deleted);
             writer.endRecord(esmRecord.sRecordId);
         }
@@ -273,6 +273,8 @@ namespace CSMWorld
 
             RecordBase& getRecord (const LocalIndex& index);
 
+            unsigned int getRecordFlags(const std::string& id) const;
+
             void appendRecord (UniversalId::Type type, const std::string& id, bool base);
 
             int getAppendIndex (UniversalId::Type type) const;
diff --git a/components/esm/cellref.cpp b/components/esm/cellref.cpp
index 42bc3d648f..7d924d9c90 100644
--- a/components/esm/cellref.cpp
+++ b/components/esm/cellref.cpp
@@ -60,8 +60,6 @@ void ESM::CellRef::loadId (ESMReader& esm, bool wideRefNum)
 void ESM::CellRef::loadData(ESMReader &esm, bool &isDeleted, int *tempRefCount)
 {
     isDeleted = false;
-    mIsPersistent = !tempRefCount // default to persistent
-                    || (tempRefCount && *tempRefCount == -1);
 
     bool isLoaded = false;
     while (!isLoaded && esm.hasMoreSubs())
@@ -247,6 +245,4 @@ void ESM::CellRef::blank()
         mPos.pos[i] = 0;
         mPos.rot[i] = 0;
     }
-
-    mIsPersistent = false;
 }
diff --git a/components/esm/cellref.hpp b/components/esm/cellref.hpp
index 97cfea89d0..3e7a3a2f28 100644
--- a/components/esm/cellref.hpp
+++ b/components/esm/cellref.hpp
@@ -106,8 +106,6 @@ namespace ESM
             // Position and rotation of this object within the cell
             Position mPos;
 
-            bool mIsPersistent;
-
             /// Calls loadId and loadData
             void load (ESMReader& esm, bool &isDeleted, int *tempRefCount, bool wideRefNum = false);
 
diff --git a/components/esm/loadacti.cpp b/components/esm/loadacti.cpp
index ba35535b8f..34592296ef 100644
--- a/components/esm/loadacti.cpp
+++ b/components/esm/loadacti.cpp
@@ -11,6 +11,7 @@ namespace ESM
     void Activator::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
+        mRecordFlags = esm.getRecordFlags();
 
         bool hasName = false;
         while (esm.hasMoreSubs())
diff --git a/components/esm/loadacti.hpp b/components/esm/loadacti.hpp
index 4cc72d5283..5b88ad379f 100644
--- a/components/esm/loadacti.hpp
+++ b/components/esm/loadacti.hpp
@@ -15,6 +15,7 @@ struct Activator
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string getRecordType() { return "Activator"; }
 
+    unsigned int mRecordFlags;
     std::string mId, mName, mScript, mModel;
 
     void load(ESMReader &esm, bool &isDeleted);
diff --git a/components/esm/loadalch.cpp b/components/esm/loadalch.cpp
index 85c24dc2d1..e1dd3a358b 100644
--- a/components/esm/loadalch.cpp
+++ b/components/esm/loadalch.cpp
@@ -11,6 +11,7 @@ namespace ESM
     void Potion::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
+        mRecordFlags = esm.getRecordFlags();
 
         mEffects.mList.clear();
 
diff --git a/components/esm/loadalch.hpp b/components/esm/loadalch.hpp
index 9ef390ebd9..d573531134 100644
--- a/components/esm/loadalch.hpp
+++ b/components/esm/loadalch.hpp
@@ -30,6 +30,7 @@ struct Potion
     };
     ALDTstruct mData;
 
+    unsigned int mRecordFlags;
     std::string mId, mName, mModel, mIcon, mScript;
     EffectList mEffects;
 
diff --git a/components/esm/loadappa.cpp b/components/esm/loadappa.cpp
index 1bd1f93798..5d8bd61189 100644
--- a/components/esm/loadappa.cpp
+++ b/components/esm/loadappa.cpp
@@ -11,6 +11,7 @@ namespace ESM
     void Apparatus::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
+        mRecordFlags = esm.getRecordFlags();
 
         bool hasName = false;
         bool hasData = false;
diff --git a/components/esm/loadappa.hpp b/components/esm/loadappa.hpp
index 74f8dd6aea..fcd9100be4 100644
--- a/components/esm/loadappa.hpp
+++ b/components/esm/loadappa.hpp
@@ -36,6 +36,7 @@ struct Apparatus
     };
 
     AADTstruct mData;
+    unsigned int mRecordFlags;
     std::string mId, mModel, mIcon, mScript, mName;
 
     void load(ESMReader &esm, bool &isDeleted);
diff --git a/components/esm/loadarmo.cpp b/components/esm/loadarmo.cpp
index 6743702539..2253285c06 100644
--- a/components/esm/loadarmo.cpp
+++ b/components/esm/loadarmo.cpp
@@ -41,6 +41,7 @@ namespace ESM
     void Armor::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
+        mRecordFlags = esm.getRecordFlags();
 
         mParts.mParts.clear();
 
diff --git a/components/esm/loadarmo.hpp b/components/esm/loadarmo.hpp
index ef3bb734c0..195230fbf2 100644
--- a/components/esm/loadarmo.hpp
+++ b/components/esm/loadarmo.hpp
@@ -94,6 +94,7 @@ struct Armor
     AODTstruct mData;
     PartReferenceList mParts;
 
+    unsigned int mRecordFlags;
     std::string mId, mName, mModel, mIcon, mScript, mEnchant;
 
     void load(ESMReader &esm, bool &isDeleted);
diff --git a/components/esm/loadbook.cpp b/components/esm/loadbook.cpp
index ee3c0c4af5..3535608272 100644
--- a/components/esm/loadbook.cpp
+++ b/components/esm/loadbook.cpp
@@ -11,6 +11,7 @@ namespace ESM
     void Book::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
+        mRecordFlags = esm.getRecordFlags();
 
         bool hasName = false;
         bool hasData = false;
diff --git a/components/esm/loadbook.hpp b/components/esm/loadbook.hpp
index bb2d7912f7..60b03f7a36 100644
--- a/components/esm/loadbook.hpp
+++ b/components/esm/loadbook.hpp
@@ -26,6 +26,7 @@ struct Book
 
     BKDTstruct mData;
     std::string mName, mModel, mIcon, mScript, mEnchant, mText;
+    unsigned int mRecordFlags;
     std::string mId;
 
     void load(ESMReader &esm, bool &isDeleted);
diff --git a/components/esm/loadclot.cpp b/components/esm/loadclot.cpp
index 12f0d495d5..cf0b40d699 100644
--- a/components/esm/loadclot.cpp
+++ b/components/esm/loadclot.cpp
@@ -11,6 +11,7 @@ namespace ESM
     void Clothing::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
+        mRecordFlags = esm.getRecordFlags();
 
         mParts.mParts.clear();
 
diff --git a/components/esm/loadclot.hpp b/components/esm/loadclot.hpp
index 4db791c0c1..bbc8449a95 100644
--- a/components/esm/loadclot.hpp
+++ b/components/esm/loadclot.hpp
@@ -46,6 +46,7 @@ struct Clothing
 
     PartReferenceList mParts;
 
+    unsigned int mRecordFlags;
     std::string mId, mName, mModel, mIcon, mEnchant, mScript;
 
     void load(ESMReader &esm, bool &isDeleted);
diff --git a/components/esm/loadcont.cpp b/components/esm/loadcont.cpp
index 107aea7cf6..3bb603dbef 100644
--- a/components/esm/loadcont.cpp
+++ b/components/esm/loadcont.cpp
@@ -32,6 +32,7 @@ namespace ESM
     void Container::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
+        mRecordFlags = esm.getRecordFlags();
 
         mInventory.mList.clear();
 
diff --git a/components/esm/loadcont.hpp b/components/esm/loadcont.hpp
index 0cac580748..ade9004214 100644
--- a/components/esm/loadcont.hpp
+++ b/components/esm/loadcont.hpp
@@ -46,6 +46,7 @@ struct Container
         Unknown = 8
     };
 
+    unsigned int mRecordFlags;
     std::string mId, mName, mModel, mScript;
 
     float mWeight; // Not sure, might be max total weight allowed?
diff --git a/components/esm/loadcrea.cpp b/components/esm/loadcrea.cpp
index 52138e2232..fd358987e0 100644
--- a/components/esm/loadcrea.cpp
+++ b/components/esm/loadcrea.cpp
@@ -13,8 +13,9 @@ namespace ESM {
     void Creature::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
+        mRecordFlags = esm.getRecordFlags();
 
-        mPersistent = (esm.getRecordFlags() & 0x0400) != 0;
+        mPersistent = (mRecordFlags & 0x0400) != 0;
 
         mAiPackage.mList.clear();
         mInventory.mList.clear();
diff --git a/components/esm/loadcrea.hpp b/components/esm/loadcrea.hpp
index 0ab09ee122..aeebeeb217 100644
--- a/components/esm/loadcrea.hpp
+++ b/components/esm/loadcrea.hpp
@@ -80,6 +80,7 @@ struct Creature
 
     float mScale;
 
+    unsigned int mRecordFlags;
     std::string mId, mModel, mName, mScript;
     std::string mOriginal; // Base creature that this is a modification of
 
diff --git a/components/esm/loaddoor.cpp b/components/esm/loaddoor.cpp
index 523d8a1efc..3e3e134112 100644
--- a/components/esm/loaddoor.cpp
+++ b/components/esm/loaddoor.cpp
@@ -11,6 +11,7 @@ namespace ESM
     void Door::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
+        mRecordFlags = esm.getRecordFlags();
 
         bool hasName = false;
         while (esm.hasMoreSubs())
diff --git a/components/esm/loaddoor.hpp b/components/esm/loaddoor.hpp
index 3afe5d5e4b..167eda20f5 100644
--- a/components/esm/loaddoor.hpp
+++ b/components/esm/loaddoor.hpp
@@ -15,6 +15,7 @@ struct Door
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string getRecordType() { return "Door"; }
 
+    unsigned int mRecordFlags;
     std::string mId, mName, mModel, mScript, mOpenSound, mCloseSound;
 
     void load(ESMReader &esm, bool &isDeleted);
diff --git a/components/esm/loadingr.cpp b/components/esm/loadingr.cpp
index a18e321ff7..6784d7ceac 100644
--- a/components/esm/loadingr.cpp
+++ b/components/esm/loadingr.cpp
@@ -11,6 +11,7 @@ namespace ESM
     void Ingredient::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
+        mRecordFlags = esm.getRecordFlags();
 
         bool hasName = false;
         bool hasData = false;
diff --git a/components/esm/loadingr.hpp b/components/esm/loadingr.hpp
index c0f4450238..34e05da2c1 100644
--- a/components/esm/loadingr.hpp
+++ b/components/esm/loadingr.hpp
@@ -29,6 +29,7 @@ struct Ingredient
     };
 
     IRDTstruct mData;
+    unsigned int mRecordFlags;
     std::string mId, mName, mModel, mIcon, mScript;
 
     void load(ESMReader &esm, bool &isDeleted);
diff --git a/components/esm/loadlevlist.cpp b/components/esm/loadlevlist.cpp
index 0aed15aa94..c876e3b080 100644
--- a/components/esm/loadlevlist.cpp
+++ b/components/esm/loadlevlist.cpp
@@ -9,6 +9,7 @@ namespace ESM
     void LevelledListBase::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
+        mRecordFlags = esm.getRecordFlags();
 
         bool hasName = false;
         bool hasList = false;
diff --git a/components/esm/loadlevlist.hpp b/components/esm/loadlevlist.hpp
index ed4131c165..d3451b70ae 100644
--- a/components/esm/loadlevlist.hpp
+++ b/components/esm/loadlevlist.hpp
@@ -22,6 +22,7 @@ struct LevelledListBase
 {
     int mFlags;
     unsigned char mChanceNone; // Chance that none are selected (0-100)
+    unsigned int mRecordFlags;
     std::string mId;
 
     // Record name used to read references. Must be set before load() is
diff --git a/components/esm/loadligh.cpp b/components/esm/loadligh.cpp
index 2a6dac14b0..b7c3d64cab 100644
--- a/components/esm/loadligh.cpp
+++ b/components/esm/loadligh.cpp
@@ -11,6 +11,7 @@ namespace ESM
     void Light::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
+        mRecordFlags = esm.getRecordFlags();
 
         bool hasName = false;
         bool hasData = false;
diff --git a/components/esm/loadligh.hpp b/components/esm/loadligh.hpp
index 8509c64b6d..901fe6ec85 100644
--- a/components/esm/loadligh.hpp
+++ b/components/esm/loadligh.hpp
@@ -45,6 +45,7 @@ struct Light
 
     LHDTstruct mData;
 
+    unsigned int mRecordFlags;
     std::string mSound, mScript, mModel, mIcon, mName, mId;
 
     void load(ESMReader &esm, bool &isDeleted);
diff --git a/components/esm/loadlock.cpp b/components/esm/loadlock.cpp
index b14353ec5a..a80760cf45 100644
--- a/components/esm/loadlock.cpp
+++ b/components/esm/loadlock.cpp
@@ -11,6 +11,7 @@ namespace ESM
     void Lockpick::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
+        mRecordFlags = esm.getRecordFlags();
 
         bool hasName = false;
         bool hasData = false;
diff --git a/components/esm/loadlock.hpp b/components/esm/loadlock.hpp
index 9db41af978..9cd40c0d4f 100644
--- a/components/esm/loadlock.hpp
+++ b/components/esm/loadlock.hpp
@@ -25,6 +25,7 @@ struct Lockpick
     }; // Size = 16
 
     Data mData;
+    unsigned int mRecordFlags;
     std::string mId, mName, mModel, mIcon, mScript;
 
     void load(ESMReader &esm, bool &isDeleted);
diff --git a/components/esm/loadmisc.cpp b/components/esm/loadmisc.cpp
index 3ba6626505..f0ad49c1dc 100644
--- a/components/esm/loadmisc.cpp
+++ b/components/esm/loadmisc.cpp
@@ -11,6 +11,7 @@ namespace ESM
     void Miscellaneous::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
+        mRecordFlags = esm.getRecordFlags();
 
         bool hasName = false;
         bool hasData = false;
diff --git a/components/esm/loadmisc.hpp b/components/esm/loadmisc.hpp
index e7a3239042..72aaa5de3b 100644
--- a/components/esm/loadmisc.hpp
+++ b/components/esm/loadmisc.hpp
@@ -30,6 +30,7 @@ struct Miscellaneous
     };
     MCDTstruct mData;
 
+    unsigned int mRecordFlags;
     std::string mId, mName, mModel, mIcon, mScript;
 
     void load(ESMReader &esm, bool &isDeleted);
diff --git a/components/esm/loadnpc.cpp b/components/esm/loadnpc.cpp
index 2bb0811ac9..678678b5d3 100644
--- a/components/esm/loadnpc.cpp
+++ b/components/esm/loadnpc.cpp
@@ -11,8 +11,9 @@ namespace ESM
     void NPC::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
+        mRecordFlags = esm.getRecordFlags();
 
-        mPersistent = (esm.getRecordFlags() & 0x0400) != 0;
+        mPersistent = (mRecordFlags & 0x0400) != 0;
 
         mSpells.mList.clear();
         mInventory.mList.clear();
diff --git a/components/esm/loadnpc.hpp b/components/esm/loadnpc.hpp
index 687afeaf64..859f9d19e8 100644
--- a/components/esm/loadnpc.hpp
+++ b/components/esm/loadnpc.hpp
@@ -129,6 +129,7 @@ struct NPC
 
     AIPackageList     mAiPackage;
 
+    unsigned int mRecordFlags;
     std::string mId, mName, mModel, mRace, mClass, mFaction, mScript;
 
     // body parts
diff --git a/components/esm/loadprob.cpp b/components/esm/loadprob.cpp
index 6307df3298..6460b793a0 100644
--- a/components/esm/loadprob.cpp
+++ b/components/esm/loadprob.cpp
@@ -11,6 +11,7 @@ namespace ESM
     void Probe::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
+        mRecordFlags = esm.getRecordFlags();
 
         bool hasName = false;
         bool hasData = false;
diff --git a/components/esm/loadprob.hpp b/components/esm/loadprob.hpp
index da203b456b..930e31a971 100644
--- a/components/esm/loadprob.hpp
+++ b/components/esm/loadprob.hpp
@@ -25,6 +25,7 @@ struct Probe
     }; // Size = 16
 
     Data mData;
+    unsigned int mRecordFlags;
     std::string mId, mName, mModel, mIcon, mScript;
 
     void load(ESMReader &esm, bool &isDeleted);
diff --git a/components/esm/loadrepa.cpp b/components/esm/loadrepa.cpp
index c04691c12f..7bd98329ce 100644
--- a/components/esm/loadrepa.cpp
+++ b/components/esm/loadrepa.cpp
@@ -11,6 +11,7 @@ namespace ESM
     void Repair::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
+        mRecordFlags = esm.getRecordFlags();
 
         bool hasName = false;
         bool hasData = false;
diff --git a/components/esm/loadrepa.hpp b/components/esm/loadrepa.hpp
index 2537c53cb6..312c87b7b4 100644
--- a/components/esm/loadrepa.hpp
+++ b/components/esm/loadrepa.hpp
@@ -25,6 +25,7 @@ struct Repair
     }; // Size = 16
 
     Data mData;
+    unsigned int mRecordFlags;
     std::string mId, mName, mModel, mIcon, mScript;
 
     void load(ESMReader &esm, bool &isDeleted);
diff --git a/components/esm/loadstat.cpp b/components/esm/loadstat.cpp
index 6c9de22bd1..0c97662d7e 100644
--- a/components/esm/loadstat.cpp
+++ b/components/esm/loadstat.cpp
@@ -11,6 +11,9 @@ namespace ESM
     void Static::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
+        mRecordFlags = esm.getRecordFlags();
+        //bool isBlocked = (mRecordFlags & 0x00002000) != 0;
+        //bool isPersistent = (mRecordFlags & 0x00000400) != 0;
 
         bool hasName = false;
         while (esm.hasMoreSubs())
diff --git a/components/esm/loadstat.hpp b/components/esm/loadstat.hpp
index 3d91440402..038fb9f52b 100644
--- a/components/esm/loadstat.hpp
+++ b/components/esm/loadstat.hpp
@@ -26,6 +26,7 @@ struct Static
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string getRecordType() { return "Static"; }
 
+    unsigned int mRecordFlags;
     std::string mId, mModel;
 
     void load(ESMReader &esm, bool &isDeleted);
diff --git a/components/esm/loadweap.cpp b/components/esm/loadweap.cpp
index 4a77ff6a00..79d1a8c5e5 100644
--- a/components/esm/loadweap.cpp
+++ b/components/esm/loadweap.cpp
@@ -11,6 +11,7 @@ namespace ESM
     void Weapon::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
+        mRecordFlags = esm.getRecordFlags();
 
         bool hasName = false;
         bool hasData = false;
diff --git a/components/esm/loadweap.hpp b/components/esm/loadweap.hpp
index 90431756d7..8d1591854b 100644
--- a/components/esm/loadweap.hpp
+++ b/components/esm/loadweap.hpp
@@ -73,6 +73,7 @@ struct Weapon
 
     WPDTstruct mData;
 
+    unsigned int mRecordFlags;
     std::string mId, mName, mModel, mIcon, mEnchant, mScript;
 
     void load(ESMReader &esm, bool &isDeleted);

From 770f91de776c4cc84ee57691a92e19e720d935cf Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Thu, 20 May 2021 18:53:55 +0200
Subject: [PATCH 0915/2859] Clean the fontloader's hack for polish font up

- The map can be static and const
- The map can be initialized inline
- No need to do a `find` + `[]` instead of `at`
---
 components/fontloader/fontloader.cpp | 84 +++++++++++++++-------------
 1 file changed, 44 insertions(+), 40 deletions(-)

diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index e068fd781b..4c9cc11bd6 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -85,47 +85,51 @@ namespace
         {
             // Hacks for polish font
             unsigned char win1250;
-            std::map<unsigned char, unsigned char> conv;
-            conv[0x80] = 0xc6;
-            conv[0x81] = 0x9c;
-            conv[0x82] = 0xe6;
-            conv[0x83] = 0xb3;
-            conv[0x84] = 0xf1;
-            conv[0x85] = 0xb9;
-            conv[0x86] = 0xbf;
-            conv[0x87] = 0x9f;
-            conv[0x88] = 0xea;
-            conv[0x89] = 0xea;
-            conv[0x8a] = 0x0; // not contained in win1250
-            conv[0x8b] = 0x0; // not contained in win1250
-            conv[0x8c] = 0x8f;
-            conv[0x8d] = 0xaf;
-            conv[0x8e] = 0xa5;
-            conv[0x8f] = 0x8c;
-            conv[0x90] = 0xca;
-            conv[0x93] = 0xa3;
-            conv[0x94] = 0xf6;
-            conv[0x95] = 0xf3;
-            conv[0x96] = 0xaf;
-            conv[0x97] = 0x8f;
-            conv[0x99] = 0xd3;
-            conv[0x9a] = 0xd1;
-            conv[0x9c] = 0x0; // not contained in win1250
-            conv[0xa0] = 0xb9;
-            conv[0xa1] = 0xaf;
-            conv[0xa2] = 0xf3;
-            conv[0xa3] = 0xbf;
-            conv[0xa4] = 0x0; // not contained in win1250
-            conv[0xe1] = 0x8c;
-            // Can't remember if this was supposed to read 0xe2, or is it just an extraneous copypaste?
-            //conv[0xe1] = 0x8c;
-            conv[0xe3] = 0x0; // not contained in win1250
-            conv[0xf5] = 0x0; // not contained in win1250
-
-            if (conv.find(c) != conv.end())
-                win1250 = conv[c];
-            else
+            static const std::map<unsigned char, unsigned char> conv {
+                {0x80, 0xc6},
+                {0x81, 0x9c},
+                {0x82, 0xe6},
+                {0x83, 0xb3},
+                {0x84, 0xf1},
+                {0x85, 0xb9},
+                {0x86, 0xbf},
+                {0x87, 0x9f},
+                {0x88, 0xea},
+                {0x89, 0xea},
+                {0x8a, 0x00}, // not contained in win1250
+                {0x8b, 0x00}, // not contained in win1250
+                {0x8c, 0x8f},
+                {0x8d, 0xaf},
+                {0x8e, 0xa5},
+                {0x8f, 0x8c},
+                {0x90, 0xca},
+                {0x93, 0xa3},
+                {0x94, 0xf6},
+                {0x95, 0xf3},
+                {0x96, 0xaf},
+                {0x97, 0x8f},
+                {0x99, 0xd3},
+                {0x9a, 0xd1},
+                {0x9c, 0x00}, // not contained in win1250
+                {0xa0, 0xb9},
+                {0xa1, 0xaf},
+                {0xa2, 0xf3},
+                {0xa3, 0xbf},
+                {0xa4, 0x00}, // not contained in win1250
+                {0xe1, 0x8c},
+                // Can't remember if this was supposed to read 0xe2, or is it just an extraneous copypaste?
+                //{0xe1, 0x8c},
+                {0xe3, 0x0}, // not contained in win1250
+                {0xf5, 0x0} // not contained in win1250
+            };
+            try
+            {
+                win1250 = conv.at(c);
+            }
+            catch (std::out_of_range)
+            {
                 win1250 = c;
+            }
             return encoder.getUtf8(std::string(1, win1250));
         }
         else

From 5470b3168bb343b33098add052d26ccaac01f405 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Fri, 21 May 2021 12:56:46 +0200
Subject: [PATCH 0916/2859] Use a switch-case instead of a map, on elsid@'
 advice

elsid@ said:

> From my measurements static map + exceptions is slower than original code
when loading polish morrowind localization by 25% with GCC 10.2.0. Switch-based
solution is about 25x times faster than the original and static map with find
only is ~20x faster.
---
 components/fontloader/fontloader.cpp | 94 +++++++++++++---------------
 1 file changed, 43 insertions(+), 51 deletions(-)

diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index 4c9cc11bd6..ef71d8edbb 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -75,63 +75,55 @@ namespace
         return unicode;
     }
 
+    /// This is a hack for Polish font
+    unsigned char mapUtf8Char(unsigned char c) {
+        switch(c){
+            case 0x80: return 0xc6;
+            case 0x81: return 0x9c;
+            case 0x82: return 0xe6;
+            case 0x83: return 0xb3;
+            case 0x84: return 0xf1;
+            case 0x85: return 0xb9;
+            case 0x86: return 0xbf;
+            case 0x87: return 0x9f;
+            case 0x88: return 0xea;
+            case 0x89: return 0xea;
+            case 0x8a: return 0x00; // not contained in win1250
+            case 0x8b: return 0x00; // not contained in win1250
+            case 0x8c: return 0x8f;
+            case 0x8d: return 0xaf;
+            case 0x8e: return 0xa5;
+            case 0x8f: return 0x8c;
+            case 0x90: return 0xca;
+            case 0x93: return 0xa3;
+            case 0x94: return 0xf6;
+            case 0x95: return 0xf3;
+            case 0x96: return 0xaf;
+            case 0x97: return 0x8f;
+            case 0x99: return 0xd3;
+            case 0x9a: return 0xd1;
+            case 0x9c: return 0x00; // not contained in win1250
+            case 0xa0: return 0xb9;
+            case 0xa1: return 0xaf;
+            case 0xa2: return 0xf3;
+            case 0xa3: return 0xbf;
+            case 0xa4: return 0x00; // not contained in win1250
+            case 0xe1: return 0x8c;
+            // case 0xe1: return 0x8c; // Can't remember if this was supposed to read 0xe2, or is it just an extraneous copypaste?
+            case 0xe3: return 0x00; // not contained in win1250
+            case 0xf5: return 0x00; // not contained in win1250
+            default: return c;
+        }
+    }
+
     // getUtf8, aka the worst function ever written.
     // This includes various hacks for dealing with Morrowind's .fnt files that are *mostly*
     // in the expected win12XX encoding, but also have randomly swapped characters sometimes.
     // Looks like the Morrowind developers found standard encodings too boring and threw in some twists for fun.
     std::string getUtf8 (unsigned char c, ToUTF8::Utf8Encoder& encoder, ToUTF8::FromType encoding)
     {
-        if (encoding == ToUTF8::WINDOWS_1250)
-        {
-            // Hacks for polish font
-            unsigned char win1250;
-            static const std::map<unsigned char, unsigned char> conv {
-                {0x80, 0xc6},
-                {0x81, 0x9c},
-                {0x82, 0xe6},
-                {0x83, 0xb3},
-                {0x84, 0xf1},
-                {0x85, 0xb9},
-                {0x86, 0xbf},
-                {0x87, 0x9f},
-                {0x88, 0xea},
-                {0x89, 0xea},
-                {0x8a, 0x00}, // not contained in win1250
-                {0x8b, 0x00}, // not contained in win1250
-                {0x8c, 0x8f},
-                {0x8d, 0xaf},
-                {0x8e, 0xa5},
-                {0x8f, 0x8c},
-                {0x90, 0xca},
-                {0x93, 0xa3},
-                {0x94, 0xf6},
-                {0x95, 0xf3},
-                {0x96, 0xaf},
-                {0x97, 0x8f},
-                {0x99, 0xd3},
-                {0x9a, 0xd1},
-                {0x9c, 0x00}, // not contained in win1250
-                {0xa0, 0xb9},
-                {0xa1, 0xaf},
-                {0xa2, 0xf3},
-                {0xa3, 0xbf},
-                {0xa4, 0x00}, // not contained in win1250
-                {0xe1, 0x8c},
-                // Can't remember if this was supposed to read 0xe2, or is it just an extraneous copypaste?
-                //{0xe1, 0x8c},
-                {0xe3, 0x0}, // not contained in win1250
-                {0xf5, 0x0} // not contained in win1250
-            };
-            try
-            {
-                win1250 = conv.at(c);
-            }
-            catch (std::out_of_range)
-            {
-                win1250 = c;
-            }
-            return encoder.getUtf8(std::string(1, win1250));
-        }
+        if (encoding == ToUTF8::WINDOWS_1250) // Hack for polish font
+            return encoder.getUtf8(std::string(1, mapUtf8Char(c)));
         else
             return encoder.getUtf8(std::string(1, c));
     }

From 8561245fda48448160ecc493d40e9f568abae3e9 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Tue, 29 Jun 2021 18:43:47 +0200
Subject: [PATCH 0917/2859] Minor refactor making use of std::clamp

---
 components/esm/cellref.cpp | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/components/esm/cellref.cpp b/components/esm/cellref.cpp
index b4d6ac7a72..20edf00a8b 100644
--- a/components/esm/cellref.cpp
+++ b/components/esm/cellref.cpp
@@ -72,10 +72,7 @@ void ESM::CellRef::loadData(ESMReader &esm, bool &isDeleted)
                 break;
             case ESM::FourCC<'X','S','C','L'>::value:
                 esm.getHT(mScale);
-                if (mScale < 0.5)
-                    mScale = 0.5;
-                else if (mScale > 2)
-                    mScale = 2;
+                mScale = std::clamp(mScale, 0.5f, 2.0f);
                 break;
             case ESM::FourCC<'A','N','A','M'>::value:
                 mOwner = esm.getHString();
@@ -153,12 +150,7 @@ void ESM::CellRef::save (ESMWriter &esm, bool wideRefNum, bool inInventory, bool
     }
 
     if (mScale != 1.0) {
-        float scale = mScale;
-        if (scale < 0.5)
-            scale = 0.5;
-        else if (scale > 2)
-            scale = 2;
-        esm.writeHNT("XSCL", scale);
+        esm.writeHNT("XSCL", std::clamp(mScale, 0.5f, 2.0f));
     }
 
     if (!inInventory)

From 5c02e4dddc41311a122b93a1a40f53b2a694d275 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Tue, 29 Jun 2021 22:52:40 +0200
Subject: [PATCH 0918/2859] Delete an outdated/irrelevant comment

---
 components/fontloader/fontloader.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index ef71d8edbb..487b7bd70b 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -109,7 +109,6 @@ namespace
             case 0xa3: return 0xbf;
             case 0xa4: return 0x00; // not contained in win1250
             case 0xe1: return 0x8c;
-            // case 0xe1: return 0x8c; // Can't remember if this was supposed to read 0xe2, or is it just an extraneous copypaste?
             case 0xe3: return 0x00; // not contained in win1250
             case 0xf5: return 0x00; // not contained in win1250
             default: return c;

From f2a301653ce6ec92378ada0abbf88b0dc6f83be6 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Wed, 30 Jun 2021 08:20:29 +1000
Subject: [PATCH 0919/2859] Remove redundant mPersistent member from ESM::NPC
 and ESM::Creature, replaced by mRecordFlags.  Fixed the editing of the
 persistence flag value.

---
 apps/opencs/model/world/columns.cpp         |  1 -
 apps/opencs/model/world/columns.hpp         |  2 +-
 apps/opencs/model/world/refidadapterimp.cpp |  4 ----
 apps/opencs/model/world/refidadapterimp.hpp | 17 +++++------------
 apps/opencs/model/world/refidcollection.cpp |  2 --
 apps/openmw/mwclass/creature.cpp            |  2 +-
 apps/openmw/mwclass/npc.cpp                 |  2 +-
 components/esm/loadcrea.cpp                 |  2 --
 components/esm/loadcrea.hpp                 |  2 --
 components/esm/loadnpc.cpp                  |  2 --
 components/esm/loadnpc.hpp                  |  2 --
 11 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/apps/opencs/model/world/columns.cpp b/apps/opencs/model/world/columns.cpp
index 1b91997a5f..cf04d96753 100644
--- a/apps/opencs/model/world/columns.cpp
+++ b/apps/opencs/model/world/columns.cpp
@@ -294,7 +294,6 @@ namespace CSMWorld
             { ColumnId_NpcReputation, "Reputation" },
             { ColumnId_NpcRank, "NPC Rank" },
             { ColumnId_Gold, "Gold" },
-            { ColumnId_NpcPersistence, "Persistent" },
 
             { ColumnId_RaceAttributes, "Race Attributes" },
             { ColumnId_Male, "Male" },
diff --git a/apps/opencs/model/world/columns.hpp b/apps/opencs/model/world/columns.hpp
index b50fb71e04..16482d4898 100644
--- a/apps/opencs/model/world/columns.hpp
+++ b/apps/opencs/model/world/columns.hpp
@@ -280,7 +280,7 @@ namespace CSMWorld
             ColumnId_NpcReputation = 258,
             ColumnId_NpcRank = 259,
             ColumnId_Gold = 260,
-            ColumnId_NpcPersistence = 261,
+            // unused
 
             ColumnId_RaceAttributes = 262,
             ColumnId_Male = 263,
diff --git a/apps/opencs/model/world/refidadapterimp.cpp b/apps/opencs/model/world/refidadapterimp.cpp
index 644092f164..4013b3d00c 100644
--- a/apps/opencs/model/world/refidadapterimp.cpp
+++ b/apps/opencs/model/world/refidadapterimp.cpp
@@ -1108,7 +1108,6 @@ QVariant CSMWorld::NpcMiscRefIdAdapter::getNestedData (const RefIdColumn *column
             case 5: return static_cast<int>(record.get().mNpdt.mReputation);
             case 6: return static_cast<int>(record.get().mNpdt.mRank);
             case 7: return record.get().mNpdt.mGold;
-            case 8: return record.get().mPersistent == true;
             default: return QVariant(); // throw an exception here?
         }
     else
@@ -1122,7 +1121,6 @@ QVariant CSMWorld::NpcMiscRefIdAdapter::getNestedData (const RefIdColumn *column
             case 5: return static_cast<int>(record.get().mNpdt.mReputation);
             case 6: return static_cast<int>(record.get().mNpdt.mRank);
             case 7: return record.get().mNpdt.mGold;
-            case 8: return record.get().mPersistent == true;
             default: return QVariant(); // throw an exception here?
         }
 }
@@ -1147,7 +1145,6 @@ void CSMWorld::NpcMiscRefIdAdapter::setNestedData (const RefIdColumn *column,
             case 5: npc.mNpdt.mReputation = static_cast<signed char>(value.toInt()); break;
             case 6: npc.mNpdt.mRank = static_cast<signed char>(value.toInt()); break;
             case 7: npc.mNpdt.mGold = value.toInt(); break;
-            case 8: npc.mPersistent = value.toBool(); break;
             default: return; // throw an exception here?
         }
     else
@@ -1161,7 +1158,6 @@ void CSMWorld::NpcMiscRefIdAdapter::setNestedData (const RefIdColumn *column,
             case 5: npc.mNpdt.mReputation = static_cast<signed char>(value.toInt()); break;
             case 6: npc.mNpdt.mRank = static_cast<signed char>(value.toInt()); break;
             case 7: npc.mNpdt.mGold = value.toInt(); break;
-            case 8: npc.mPersistent = value.toBool(); break;
             default: return; // throw an exception here?
         }
 
diff --git a/apps/opencs/model/world/refidadapterimp.hpp b/apps/opencs/model/world/refidadapterimp.hpp
index f8ca93fec7..210deca69b 100644
--- a/apps/opencs/model/world/refidadapterimp.hpp
+++ b/apps/opencs/model/world/refidadapterimp.hpp
@@ -153,10 +153,7 @@ namespace CSMWorld
             return QString::fromUtf8 (record.get().mModel.c_str());
 
         if (column==mModel.mPersistence)
-        {
-            bool isPersistent = (record.get().mRecordFlags & 0x00000400) != 0;
-            return QString::fromUtf8 (isPersistent ? "Yes" : "No");
-        }
+            return (record.get().mRecordFlags & 0x00000400) != 0;
 
         return BaseRefIdAdapter<RecordT>::getData (column, data, index);
     }
@@ -173,14 +170,10 @@ namespace CSMWorld
             record2.mModel = value.toString().toUtf8().constData();
         else if (column==mModel.mPersistence)
         {
-            unsigned int flag = record2.mRecordFlags;
-            std::string val = value.toString().toUtf8().constData();
-            if (val == "Yes")
-                flag |= 0x00000400;
-            else if (val == "No")
-                flag &= ~0x00000400;
-
-            record2.mRecordFlags = flag;
+            if (value.toInt() != 0)
+                record2.mRecordFlags |= 0x00000400;
+            else
+                record2.mRecordFlags &= ~0x00000400;
         }
         else
         {
diff --git a/apps/opencs/model/world/refidcollection.cpp b/apps/opencs/model/world/refidcollection.cpp
index b7370c20da..0cf9a4e6dc 100644
--- a/apps/opencs/model/world/refidcollection.cpp
+++ b/apps/opencs/model/world/refidcollection.cpp
@@ -551,8 +551,6 @@ CSMWorld::RefIdCollection::RefIdCollection()
             new RefIdColumn (Columns::ColumnId_NpcRank, CSMWorld::ColumnBase::Display_UnsignedInteger8));
     mColumns.back().addColumn(
             new RefIdColumn (Columns::ColumnId_Gold, CSMWorld::ColumnBase::Display_Integer));
-    mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_NpcPersistence, CSMWorld::ColumnBase::Display_Boolean));
 
     WeaponColumns weaponColumns (enchantableColumns);
 
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index acf969bd3a..0a40139d36 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -588,7 +588,7 @@ namespace MWClass
     bool Creature::isPersistent(const MWWorld::ConstPtr &actor) const
     {
         const MWWorld::LiveCellRef<ESM::Creature>* ref = actor.get<ESM::Creature>();
-        return ref->mBase->mPersistent;
+        return (ref->mBase->mRecordFlags & 0x0400) != 0;
     }
 
     std::string Creature::getSoundIdFromSndGen(const MWWorld::Ptr &ptr, const std::string &name) const
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 933ba5cd38..1951f964bc 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -403,7 +403,7 @@ namespace MWClass
     bool Npc::isPersistent(const MWWorld::ConstPtr &actor) const
     {
         const MWWorld::LiveCellRef<ESM::NPC>* ref = actor.get<ESM::NPC>();
-        return ref->mBase->mPersistent;
+        return (ref->mBase->mRecordFlags & 0x0400) != 0;
     }
 
     std::string Npc::getModel(const MWWorld::ConstPtr &ptr) const
diff --git a/components/esm/loadcrea.cpp b/components/esm/loadcrea.cpp
index fd358987e0..2c1cc69a7b 100644
--- a/components/esm/loadcrea.cpp
+++ b/components/esm/loadcrea.cpp
@@ -15,8 +15,6 @@ namespace ESM {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
 
-        mPersistent = (mRecordFlags & 0x0400) != 0;
-
         mAiPackage.mList.clear();
         mInventory.mList.clear();
         mSpells.mList.clear();
diff --git a/components/esm/loadcrea.hpp b/components/esm/loadcrea.hpp
index aeebeeb217..f6b188d96e 100644
--- a/components/esm/loadcrea.hpp
+++ b/components/esm/loadcrea.hpp
@@ -76,8 +76,6 @@ struct Creature
     int mBloodType;
     unsigned char mFlags;
 
-    bool mPersistent;
-
     float mScale;
 
     unsigned int mRecordFlags;
diff --git a/components/esm/loadnpc.cpp b/components/esm/loadnpc.cpp
index 678678b5d3..80cd2e9623 100644
--- a/components/esm/loadnpc.cpp
+++ b/components/esm/loadnpc.cpp
@@ -13,8 +13,6 @@ namespace ESM
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
 
-        mPersistent = (mRecordFlags & 0x0400) != 0;
-
         mSpells.mList.clear();
         mInventory.mList.clear();
         mTransport.mList.clear();
diff --git a/components/esm/loadnpc.hpp b/components/esm/loadnpc.hpp
index 859f9d19e8..ba9f415760 100644
--- a/components/esm/loadnpc.hpp
+++ b/components/esm/loadnpc.hpp
@@ -116,8 +116,6 @@ struct NPC
     int mBloodType;
     unsigned char mFlags;
 
-    bool mPersistent;
-
     InventoryList mInventory;
     SpellList mSpells;
 

From 47ef98ca1b2d622dd9b8b2dc8b27c4b8616b256b Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Wed, 30 Jun 2021 10:09:56 +1000
Subject: [PATCH 0920/2859] Clean up RefIdData code for better legibility.

---
 apps/opencs/model/world/refiddata.cpp | 140 ++++----------------------
 apps/opencs/model/world/refiddata.hpp |  10 ++
 2 files changed, 30 insertions(+), 120 deletions(-)

diff --git a/apps/opencs/model/world/refiddata.cpp b/apps/opencs/model/world/refiddata.cpp
index 4f72bae92e..79a2efdcc8 100644
--- a/apps/opencs/model/world/refiddata.cpp
+++ b/apps/opencs/model/world/refiddata.cpp
@@ -93,126 +93,26 @@ unsigned int CSMWorld::RefIdData::getRecordFlags (const std::string& id) const
 
     switch (localIndex.second)
     {
-        case UniversalId::Type_Activator:
-        {
-            const RefIdDataContainer<ESM::Activator>& records = getActivators();
-            const ESM::Activator& record = dynamic_cast<const ESM::Activator&>(records.getRecord(localIndex.first));
-            return record.mRecordFlags;
-        }
-        case UniversalId::Type_Potion:
-        {
-            const RefIdDataContainer<ESM::Potion>& records = getPotions();
-            const ESM::Potion& record = dynamic_cast<const ESM::Potion&>(records.getRecord(localIndex.first));
-            return record.mRecordFlags;
-        }
-        case UniversalId::Type_Apparatus:
-        {
-            const RefIdDataContainer<ESM::Apparatus>& records = getApparati();
-            const ESM::Apparatus& record = dynamic_cast<const ESM::Apparatus&>(records.getRecord(localIndex.first));
-            return record.mRecordFlags;
-        }
-        case UniversalId::Type_Armor:
-        {
-            const RefIdDataContainer<ESM::Armor>& records = getArmors();
-            const ESM::Armor& record = dynamic_cast<const ESM::Armor&>(records.getRecord(localIndex.first));
-            return record.mRecordFlags;
-        }
-        case UniversalId::Type_Book:
-        {
-            const RefIdDataContainer<ESM::Book>& records = getBooks();
-            const ESM::Book& record = dynamic_cast<const ESM::Book&>(records.getRecord(localIndex.first));
-            return record.mRecordFlags;
-        }
-        case UniversalId::Type_Clothing:
-        {
-            const RefIdDataContainer<ESM::Clothing>& records = getClothing();
-            const ESM::Clothing& record = dynamic_cast<const ESM::Clothing&>(records.getRecord(localIndex.first));
-            return record.mRecordFlags;
-        }
-        case UniversalId::Type_Container:
-        {
-            const RefIdDataContainer<ESM::Container>& records = getContainers();
-            const ESM::Container& record = dynamic_cast<const ESM::Container&>(records.getRecord(localIndex.first));
-            return record.mRecordFlags;
-        }
-        case UniversalId::Type_Creature:
-        {
-            const RefIdDataContainer<ESM::Creature>& records = getCreatures();
-            const ESM::Creature& record = dynamic_cast<const ESM::Creature&>(records.getRecord(localIndex.first));
-            return record.mRecordFlags;
-        }
-        case UniversalId::Type_Door:
-        {
-            const RefIdDataContainer<ESM::Door>& records = getDoors();
-            const ESM::Door& record = dynamic_cast<const ESM::Door&>(records.getRecord(localIndex.first));
-            return record.mRecordFlags;
-        }
-        case UniversalId::Type_Ingredient:
-        {
-            const RefIdDataContainer<ESM::Ingredient>& records = getIngredients();
-            const ESM::Ingredient& record = dynamic_cast<const ESM::Ingredient&>(records.getRecord(localIndex.first));
-            return record.mRecordFlags;
-        }
-        case UniversalId::Type_CreatureLevelledList:
-        {
-            const RefIdDataContainer<ESM::CreatureLevList>& records = getCreatureLevelledLists();
-            const ESM::CreatureLevList& record = dynamic_cast<const ESM::CreatureLevList&>(records.getRecord(localIndex.first));
-            return record.mRecordFlags;
-        }
-        case UniversalId::Type_ItemLevelledList:
-        {
-            const RefIdDataContainer<ESM::ItemLevList>& records = getItemLevelledList();
-            const ESM::ItemLevList& record = dynamic_cast<const ESM::ItemLevList&>(records.getRecord(localIndex.first));
-            return record.mRecordFlags;
-        }
-        case UniversalId::Type_Light:
-        {
-            const RefIdDataContainer<ESM::Light>& records = getLights();
-            const ESM::Light& record = dynamic_cast<const ESM::Light&>(records.getRecord(localIndex.first));
-            return record.mRecordFlags;
-        }
-        case UniversalId::Type_Lockpick:
-        {
-            const RefIdDataContainer<ESM::Lockpick>& records = getLocpicks();
-            const ESM::Lockpick& record = dynamic_cast<const ESM::Lockpick&>(records.getRecord(localIndex.first));
-            return record.mRecordFlags;
-        }
-        case UniversalId::Type_Miscellaneous:
-        {
-            const RefIdDataContainer<ESM::Miscellaneous>& records = getMiscellaneous();
-            const ESM::Miscellaneous& record = dynamic_cast<const ESM::Miscellaneous&>(records.getRecord(localIndex.first));
-            return record.mRecordFlags;
-        }
-        case UniversalId::Type_Npc:
-        {
-            const RefIdDataContainer<ESM::NPC>& records = getNPCs();
-            const ESM::NPC& record = dynamic_cast<const ESM::NPC&>(records.getRecord(localIndex.first));
-            return record.mRecordFlags;
-        }
-        case UniversalId::Type_Probe:
-        {
-            const RefIdDataContainer<ESM::Probe>& records = getProbes();
-            const ESM::Probe& record = dynamic_cast<const ESM::Probe&>(records.getRecord(localIndex.first));
-            return record.mRecordFlags;
-        }
-        case UniversalId::Type_Repair:
-        {
-            const RefIdDataContainer<ESM::Repair>& records = getRepairs();
-            const ESM::Repair& record = dynamic_cast<const ESM::Repair&>(records.getRecord(localIndex.first));
-            return record.mRecordFlags;
-        }
-        case UniversalId::Type_Static:
-        {
-            const RefIdDataContainer<ESM::Static>& records = getStatics();
-            const ESM::Static& record = dynamic_cast<const ESM::Static&>(records.getRecord(localIndex.first));
-            return record.mRecordFlags;
-        }
-        case UniversalId::Type_Weapon:
-        {
-            const RefIdDataContainer<ESM::Weapon>& records = getWeapons();
-            const ESM::Weapon& record = dynamic_cast<const ESM::Weapon&>(records.getRecord(localIndex.first));
-            return record.mRecordFlags;
-        }
+        case UniversalId::Type_Activator: return mActivators.getRecordFlags(localIndex.first);
+        case UniversalId::Type_Potion:    return mPotions.getRecordFlags(localIndex.first);
+        case UniversalId::Type_Apparatus: return mApparati.getRecordFlags(localIndex.first);
+        case UniversalId::Type_Armor:     return mArmors.getRecordFlags(localIndex.first);
+        case UniversalId::Type_Book:      return mBooks.getRecordFlags(localIndex.first);
+        case UniversalId::Type_Clothing:  return mClothing.getRecordFlags(localIndex.first);
+        case UniversalId::Type_Container: return mContainers.getRecordFlags(localIndex.first);
+        case UniversalId::Type_Creature:  return mCreatures.getRecordFlags(localIndex.first);
+        case UniversalId::Type_Door:      return mDoors.getRecordFlags(localIndex.first);
+        case UniversalId::Type_Ingredient: return mIngredients.getRecordFlags(localIndex.first);
+        case UniversalId::Type_CreatureLevelledList: return mCreatureLevelledLists.getRecordFlags(localIndex.first);
+        case UniversalId::Type_ItemLevelledList: return mItemLevelledLists.getRecordFlags(localIndex.first);
+        case UniversalId::Type_Light:     return mLights.getRecordFlags(localIndex.first);
+        case UniversalId::Type_Lockpick:  return mLockpicks.getRecordFlags(localIndex.first);
+        case UniversalId::Type_Miscellaneous: return mMiscellaneous.getRecordFlags(localIndex.first);
+        case UniversalId::Type_Npc:       return mNpcs.getRecordFlags(localIndex.first);
+        case UniversalId::Type_Probe:     return mProbes.getRecordFlags(localIndex.first);
+        case UniversalId::Type_Repair:    return mRepairs.getRecordFlags(localIndex.first);
+        case UniversalId::Type_Static:    return mStatics.getRecordFlags(localIndex.first);
+        case UniversalId::Type_Weapon:    return mWeapons.getRecordFlags(localIndex.first);
         default:
             break;
     }
diff --git a/apps/opencs/model/world/refiddata.hpp b/apps/opencs/model/world/refiddata.hpp
index da6ac7b154..ab5269b390 100644
--- a/apps/opencs/model/world/refiddata.hpp
+++ b/apps/opencs/model/world/refiddata.hpp
@@ -47,6 +47,8 @@ namespace CSMWorld
 
         virtual RecordBase& getRecord (int index)= 0;
 
+        virtual unsigned int getRecordFlags (int index) const = 0;
+
         virtual void appendRecord (const std::string& id, bool base) = 0;
 
         virtual void insertRecord (RecordBase& record) = 0;
@@ -72,6 +74,8 @@ namespace CSMWorld
 
         RecordBase& getRecord (int index) override;
 
+        unsigned int getRecordFlags (int index) const override;
+
         void appendRecord (const std::string& id, bool base) override;
 
         void insertRecord (RecordBase& record) override;
@@ -111,6 +115,12 @@ namespace CSMWorld
         return mContainer.at (index);
     }
 
+    template<typename RecordT>
+    unsigned int RefIdDataContainer<RecordT>::getRecordFlags (int index) const
+    {
+        return mContainer.at (index).get().mRecordFlags;
+    }
+
     template<typename RecordT>
     void RefIdDataContainer<RecordT>::appendRecord (const std::string& id, bool base)
     {

From 2d8dd9be329fb796c6f81c6d498fa7ca28046c73 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Wed, 30 Jun 2021 10:46:51 +1000
Subject: [PATCH 0921/2859] Fix using incorrect id to search for record flags. 
 Eliminate inefficient double-loop in saving cell references.

---
 apps/opencs/model/doc/savingstages.cpp | 35 +++++++++++++-------------
 apps/opencs/model/doc/savingstages.hpp |  2 +-
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/apps/opencs/model/doc/savingstages.cpp b/apps/opencs/model/doc/savingstages.cpp
index 7d6e8fef88..edf319db6c 100644
--- a/apps/opencs/model/doc/savingstages.cpp
+++ b/apps/opencs/model/doc/savingstages.cpp
@@ -253,12 +253,9 @@ int CSMDoc::WriteCellCollectionStage::setup()
     return mDocument.getData().getCells().getSize();
 }
 
-int CSMDoc::WriteCellCollectionStage::writeReferences (const std::deque<int>& references, bool interior, unsigned int& newRefNum, bool temp)
+void CSMDoc::WriteCellCollectionStage::writeReferences (const std::deque<int>& references, bool interior, unsigned int& newRefNum)
 {
     ESM::ESMWriter& writer = mState.getWriter();
-    size_t refCount = 0;
-    const CSMWorld::RefIdCollection& referenceables = mDocument.getData().getReferenceables();
-    const CSMWorld::RefIdData& refIdData = referenceables.getDataSet();
 
     for (std::deque<int>::const_iterator iter (references.begin());
         iter!=references.end(); ++iter)
@@ -266,14 +263,6 @@ int CSMDoc::WriteCellCollectionStage::writeReferences (const std::deque<int>& re
         const CSMWorld::Record<CSMWorld::CellRef>& ref =
             mDocument.getData().getReferences().getRecord (*iter);
 
-        unsigned int recordFlags = refIdData.getRecordFlags(ref.get().mId);
-        bool isPersistent = (recordFlags & 0x00000400) != 0;
-
-        if (temp && isPersistent || !temp && !isPersistent)
-            continue;
-
-        refCount++;
-
         if (ref.isModified() || ref.mState == CSMWorld::RecordBase::State_Deleted)
         {
             CSMWorld::CellRef refRecord = ref.get();
@@ -318,14 +307,17 @@ int CSMDoc::WriteCellCollectionStage::writeReferences (const std::deque<int>& re
             refRecord.save (writer, false, false, ref.mState == CSMWorld::RecordBase::State_Deleted);
         }
     }
-
-    return refCount;
 }
 
 void CSMDoc::WriteCellCollectionStage::perform (int stage, Messages& messages)
 {
     ESM::ESMWriter& writer = mState.getWriter();
     const CSMWorld::Record<CSMWorld::Cell>& cell = mDocument.getData().getCells().getRecord (stage);
+    const CSMWorld::RefIdCollection& referenceables = mDocument.getData().getReferenceables();
+    const CSMWorld::RefIdData& refIdData = referenceables.getDataSet();
+
+    std::deque<int> tempRefs;
+    std::deque<int> persistentRefs;
 
     std::map<std::string, std::deque<int> >::const_iterator references =
         mState.getSubRecords().find (Misc::StringUtils::lowerCase (cell.get().mId));
@@ -350,6 +342,14 @@ void CSMDoc::WriteCellCollectionStage::perform (int stage, Messages& messages)
 
                 CSMWorld::CellRef refRecord = ref.get();
 
+                unsigned int recordFlags = refIdData.getRecordFlags(refRecord.mRefID);
+                bool isPersistent = (recordFlags & 0x00000400) != 0;
+
+                if (isPersistent)
+                    persistentRefs.push_back(*iter);
+                else
+                    tempRefs.push_back(*iter);
+
                 if (refRecord.mNew ||
                     (!interior && ref.mState==CSMWorld::RecordBase::State_ModifiedOnly &&
                     /// \todo consider worldspace
@@ -380,10 +380,9 @@ void CSMDoc::WriteCellCollectionStage::perform (int stage, Messages& messages)
         // write references
         if (references!=mState.getSubRecords().end())
         {
-            int persistentRefCount = writeReferences(references->second, interior, newRefNum, false/*temp*/);
-            cellRecord.saveTempMarker(writer, int(references->second.size()) - persistentRefCount);
-            // FIXME: loops twice, inefficient
-            writeReferences(references->second, interior, newRefNum, true/*temp*/);
+            writeReferences(persistentRefs, interior, newRefNum);
+            cellRecord.saveTempMarker(writer, int(references->second.size()) - persistentRefs.size());
+            writeReferences(tempRefs, interior, newRefNum);
         }
 
         writer.endRecord (cellRecord.sRecordId);
diff --git a/apps/opencs/model/doc/savingstages.hpp b/apps/opencs/model/doc/savingstages.hpp
index e9497a6064..d59a1efe5e 100644
--- a/apps/opencs/model/doc/savingstages.hpp
+++ b/apps/opencs/model/doc/savingstages.hpp
@@ -171,7 +171,7 @@ namespace CSMDoc
             Document& mDocument;
             SavingState& mState;
 
-            int writeReferences (const std::deque<int>& references, bool interior, unsigned int& newRefNum, bool temp);
+            void writeReferences (const std::deque<int>& references, bool interior, unsigned int& newRefNum);
 
         public:
 

From 6575b95448c2daf22bff0ba11d7657562570882d Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Wed, 30 Jun 2021 15:34:40 +1000
Subject: [PATCH 0922/2859] Support moved references (i.e. with MVRF
 sub-records) that do not occur at the beginning of the cell references block.

---
 apps/openmw/mwworld/store.cpp | 52 +++++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 20 deletions(-)

diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index 944d311229..26b63d59a9 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -36,16 +36,16 @@ namespace MWWorld
         : mId(id), mIsDeleted(isDeleted)
     {}
 
-    template<typename T> 
+    template<typename T>
     IndexedStore<T>::IndexedStore()
     {
     }
-    template<typename T>        
+    template<typename T>
     typename IndexedStore<T>::iterator IndexedStore<T>::begin() const
     {
         return mStatic.begin();
     }
-    template<typename T>    
+    template<typename T>
     typename IndexedStore<T>::iterator IndexedStore<T>::end() const
     {
         return mStatic.end();
@@ -192,7 +192,7 @@ namespace MWWorld
     template<typename T>
     typename Store<T>::iterator Store<T>::begin() const
     {
-        return mShared.begin(); 
+        return mShared.begin();
     }
     template<typename T>
     typename Store<T>::iterator Store<T>::end() const
@@ -407,7 +407,7 @@ namespace MWWorld
         if (mStatic.size() < num)
             mStatic.resize(num);
     }
-    
+
     // Land
     //=========================================================================
     Store<ESM::Land>::~Store()
@@ -496,20 +496,28 @@ namespace MWWorld
         }
         return search(cell.mName);
     }
+
+    // this method *must* be called right after esm.loadCell()
     void Store<ESM::Cell>::handleMovedCellRefs(ESM::ESMReader& esm, ESM::Cell* cell)
     {
-        //Handling MovedCellRefs, there is no way to do it inside loadcell
-        while (esm.isNextSub("MVRF")) {
-            ESM::CellRef ref;
-            ESM::MovedCellRef cMRef;
-            cell->getNextMVRF(esm, cMRef);
+        ESM::CellRef ref;
+        ESM::MovedCellRef cMRef;
+        cMRef.mRefNum.mIndex = 0;
+        bool deleted = false;
 
-            ESM::Cell *cellAlt = const_cast<ESM::Cell*>(searchOrCreate(cMRef.mTarget[0], cMRef.mTarget[1]));
+        ESM::ESM_Context ctx = esm.getContext();
+
+        // Handling MovedCellRefs, there is no way to do it inside loadcell
+        // TODO: verify above comment
+        //
+        // Get regular moved reference data. Adapted from CellStore::loadRefs. Maybe we can optimize the following
+        //  implementation when the oher implementation works as well.
+        while (cell->getNextRef(esm, ref, deleted, /*ignoreMoves*/true, &cMRef))
+        {
+            if (!cMRef.mRefNum.mIndex)
+                continue; // ignore refs that are not moved
 
-            // Get regular moved reference data. Adapted from CellStore::loadRefs. Maybe we can optimize the following
-            //  implementation when the oher implementation works as well.
-            bool deleted = false;
-            cell->getNextRef(esm, ref, deleted);
+            ESM::Cell *cellAlt = const_cast<ESM::Cell*>(searchOrCreate(cMRef.mTarget[0], cMRef.mTarget[1]));
 
             // Add data required to make reference appear in the correct cell.
             // We should not need to test for duplicates, as this part of the code is pre-cell merge.
@@ -521,7 +529,11 @@ namespace MWWorld
                 cellAlt->mLeasedRefs.emplace_back(std::move(ref), deleted);
             else
                 *iter = std::make_pair(std::move(ref), deleted);
+
+            cMRef.mRefNum.mIndex = 0;
         }
+
+        esm.restoreContext(ctx);
     }
     const ESM::Cell *Store<ESM::Cell>::search(const std::string &id) const
     {
@@ -642,7 +654,7 @@ namespace MWWorld
         ESM::Cell cell;
         bool isDeleted = false;
 
-        // Load the (x,y) coordinates of the cell, if it is an exterior cell, 
+        // Load the (x,y) coordinates of the cell, if it is an exterior cell,
         // so we can find the cell we need to merge with
         cell.loadNameAndData(esm, isDeleted);
         std::string idLower = Misc::StringUtils::lowerCase(cell.mName);
@@ -870,7 +882,7 @@ namespace MWWorld
         return true;
     }
 
-    
+
     // Pathgrid
     //=========================================================================
 
@@ -972,7 +984,7 @@ namespace MWWorld
 
     // Skill
     //=========================================================================
-    
+
     Store<ESM::Skill>::Store()
     {
     }
@@ -1013,7 +1025,7 @@ namespace MWWorld
     }
     void Store<ESM::Attribute>::setUp()
     {
-        for (int i = 0; i < ESM::Attribute::Length; ++i) 
+        for (int i = 0; i < ESM::Attribute::Length; ++i)
         {
             ESM::Attribute newAttribute;
             newAttribute.mId = ESM::Attribute::sAttributeIds[i];
@@ -1035,7 +1047,7 @@ namespace MWWorld
         return mStatic.end();
     }
 
-    
+
     // Dialogue
     //=========================================================================
 

From a3942a1e0ab27b42493ef31255bc9f98a4dc2cdd Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 30 Jun 2021 19:58:11 +0200
Subject: [PATCH 0923/2859] Remove redundant check for y coordinate in inRange
 function

---
 components/detournavigator/findsmoothpath.cpp |  2 +-
 components/detournavigator/findsmoothpath.hpp | 19 ++++++++-----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/components/detournavigator/findsmoothpath.cpp b/components/detournavigator/findsmoothpath.cpp
index 8974be5321..ae4ab497ef 100644
--- a/components/detournavigator/findsmoothpath.cpp
+++ b/components/detournavigator/findsmoothpath.cpp
@@ -125,7 +125,7 @@ namespace DetourNavigator
         {
             // Stop at Off-Mesh link or when point is further than slop away.
             if ((steerPathFlags[ns] & DT_STRAIGHTPATH_OFFMESH_CONNECTION) ||
-                    !inRange(Misc::Convert::makeOsgVec3f(&steerPath[ns * 3]), startPos, minTargetDist, 1000.0f))
+                    !inRange(Misc::Convert::makeOsgVec3f(&steerPath[ns * 3]), startPos, minTargetDist))
                 break;
             ns++;
         }
diff --git a/components/detournavigator/findsmoothpath.hpp b/components/detournavigator/findsmoothpath.hpp
index 0a9b5bed86..3a5a1f57fc 100644
--- a/components/detournavigator/findsmoothpath.hpp
+++ b/components/detournavigator/findsmoothpath.hpp
@@ -26,10 +26,10 @@ namespace DetourNavigator
 {
     struct Settings;
 
-    inline bool inRange(const osg::Vec3f& v1, const osg::Vec3f& v2, const float r, const float h)
+    inline bool inRange(const osg::Vec3f& v1, const osg::Vec3f& v2, const float r)
     {
         const auto d = v2 - v1;
-        return (d.x() * d.x() + d.z() * d.z()) < r * r && std::abs(d.y()) < h;
+        return (d.x() * d.x() + d.z() * d.z()) < r * r;
     }
 
     std::vector<dtPolyRef> fixupCorridor(const std::vector<dtPolyRef>& path, const std::vector<dtPolyRef>& visited);
@@ -201,13 +201,8 @@ namespace DetourNavigator
             polygonPath = fixupCorridor(polygonPath, result->mVisited);
             polygonPath = fixupShortcuts(polygonPath, navMeshQuery);
 
-            float h = 0;
-            navMeshQuery.getPolyHeight(polygonPath.front(), result->mResultPos.ptr(), &h);
-            iterPos = result->mResultPos;
-            iterPos.y() = h;
-
             // Handle end of path and off-mesh links when close enough.
-            if (endOfPath && inRange(iterPos, steerTarget->steerPos, slop, 1.0f))
+            if (endOfPath && inRange(result->mResultPos, steerTarget->steerPos, slop))
             {
                 // Reached end of path.
                 iterPos = targetPos;
@@ -215,7 +210,7 @@ namespace DetourNavigator
                 ++smoothPathSize;
                 break;
             }
-            else if (offMeshConnection && inRange(iterPos, steerTarget->steerPos, slop, 1.0f))
+            else if (offMeshConnection && inRange(result->mResultPos, steerTarget->steerPos, slop))
             {
                 // Advance the path up to and over the off-mesh connection.
                 dtPolyRef prevRef = 0;
@@ -251,14 +246,16 @@ namespace DetourNavigator
                     // Move position at the other side of the off-mesh link.
                     iterPos = endPos;
                     const auto height = getPolyHeight(navMeshQuery, polygonPath.front(), iterPos);
-
                     if (!height)
                         return Status::GetPolyHeightFailed;
-
                     iterPos.y() = *height;
                 }
             }
 
+            navMeshQuery.getPolyHeight(polygonPath.front(), result->mResultPos.ptr(), &iterPos.y());
+            iterPos.x() = result->mResultPos.x();
+            iterPos.z() = result->mResultPos.z();
+
             // Store results.
             *out++ = iterPos;
             ++smoothPathSize;

From cc08a45c310f5b24cc465a5200be006848327084 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 30 Jun 2021 20:02:08 +0200
Subject: [PATCH 0924/2859] Move include where it is needed

---
 components/detournavigator/findsmoothpath.cpp | 2 ++
 components/detournavigator/findsmoothpath.hpp | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/detournavigator/findsmoothpath.cpp b/components/detournavigator/findsmoothpath.cpp
index ae4ab497ef..5871d05fa3 100644
--- a/components/detournavigator/findsmoothpath.cpp
+++ b/components/detournavigator/findsmoothpath.cpp
@@ -1,5 +1,7 @@
 #include "findsmoothpath.hpp"
 
+#include <components/misc/convert.hpp>
+
 #include <algorithm>
 #include <array>
 
diff --git a/components/detournavigator/findsmoothpath.hpp b/components/detournavigator/findsmoothpath.hpp
index 3a5a1f57fc..5b1ec32fa1 100644
--- a/components/detournavigator/findsmoothpath.hpp
+++ b/components/detournavigator/findsmoothpath.hpp
@@ -14,9 +14,8 @@
 #include <DetourNavMesh.h>
 #include <DetourNavMeshQuery.h>
 
-#include <components/misc/convert.hpp>
-
 #include <osg/Vec3f>
+
 #include <cassert>
 #include <vector>
 

From 7e1630a7ad3f57df6fd3a899928e6c8a0c0f7824 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 30 Jun 2021 20:04:16 +0200
Subject: [PATCH 0925/2859] Remove redundant getPolyHeight wrapper

---
 components/detournavigator/findsmoothpath.hpp | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/components/detournavigator/findsmoothpath.hpp b/components/detournavigator/findsmoothpath.hpp
index 5b1ec32fa1..8baa8206c6 100644
--- a/components/detournavigator/findsmoothpath.hpp
+++ b/components/detournavigator/findsmoothpath.hpp
@@ -142,15 +142,6 @@ namespace DetourNavigator
         return {std::move(result)};
     }
 
-    inline std::optional<float> getPolyHeight(const dtNavMeshQuery& navMeshQuery, const dtPolyRef ref, const osg::Vec3f& pos)
-    {
-        float result = 0.0f;
-        const auto status = navMeshQuery.getPolyHeight(ref, pos.ptr(), &result);
-        if (!dtStatusSucceed(status))
-            return {};
-        return result;
-    }
-
     template <class OutputIterator>
     Status makeSmoothPath(const dtNavMesh& navMesh, const dtNavMeshQuery& navMeshQuery,
             const dtQueryFilter& filter, const osg::Vec3f& start, const osg::Vec3f& end, const float stepSize,
@@ -243,11 +234,10 @@ namespace DetourNavigator
                     }
 
                     // Move position at the other side of the off-mesh link.
-                    iterPos = endPos;
-                    const auto height = getPolyHeight(navMeshQuery, polygonPath.front(), iterPos);
-                    if (!height)
+                    if (dtStatusFailed(navMeshQuery.getPolyHeight(polygonPath.front(), endPos.ptr(), &iterPos.y())))
                         return Status::GetPolyHeightFailed;
-                    iterPos.y() = *height;
+                    iterPos.x() = endPos.x();
+                    iterPos.z() = endPos.z();
                 }
             }
 

From 793c30ab8daa80658c55c54a42fd9b5cd57b704a Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 30 Jun 2021 20:06:45 +0200
Subject: [PATCH 0926/2859] Check dtNavMeshQuery::getPolyHeight status

Otherwise when it fails a node with zero height will be added to a path.
---
 components/detournavigator/findsmoothpath.hpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/detournavigator/findsmoothpath.hpp b/components/detournavigator/findsmoothpath.hpp
index 8baa8206c6..4e656e6270 100644
--- a/components/detournavigator/findsmoothpath.hpp
+++ b/components/detournavigator/findsmoothpath.hpp
@@ -241,7 +241,8 @@ namespace DetourNavigator
                 }
             }
 
-            navMeshQuery.getPolyHeight(polygonPath.front(), result->mResultPos.ptr(), &iterPos.y());
+            if (dtStatusFailed(navMeshQuery.getPolyHeight(polygonPath.front(), result->mResultPos.ptr(), &iterPos.y())))
+                return Status::GetPolyHeightFailed;
             iterPos.x() = result->mResultPos.x();
             iterPos.z() = result->mResultPos.z();
 

From a54c4bc2e9588974c710f373262c7eb9ca8c749d Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 30 Jun 2021 20:10:34 +0200
Subject: [PATCH 0927/2859] Check dtNavMeshQuery::findStraightPath status

---
 components/detournavigator/findsmoothpath.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/components/detournavigator/findsmoothpath.cpp b/components/detournavigator/findsmoothpath.cpp
index 5871d05fa3..6598263398 100644
--- a/components/detournavigator/findsmoothpath.cpp
+++ b/components/detournavigator/findsmoothpath.cpp
@@ -105,7 +105,7 @@ namespace DetourNavigator
         return result;
     }
 
-    std::optional<SteerTarget> getSteerTarget(const dtNavMeshQuery& navQuery, const osg::Vec3f& startPos,
+    std::optional<SteerTarget> getSteerTarget(const dtNavMeshQuery& navMeshQuery, const osg::Vec3f& startPos,
             const osg::Vec3f& endPos, const float minTargetDist, const std::vector<dtPolyRef>& path)
     {
         // Find steer target.
@@ -115,8 +115,11 @@ namespace DetourNavigator
         std::array<unsigned char, maxSteerPoints> steerPathFlags;
         std::array<dtPolyRef, maxSteerPoints> steerPathPolys;
         int nsteerPath = 0;
-        navQuery.findStraightPath(startPos.ptr(), endPos.ptr(), path.data(), int(path.size()), steerPath.data(),
-            steerPathFlags.data(), steerPathPolys.data(), &nsteerPath, maxSteerPoints);
+        const dtStatus status = navMeshQuery.findStraightPath(startPos.ptr(), endPos.ptr(), path.data(),
+            static_cast<int>(path.size()), steerPath.data(), steerPathFlags.data(), steerPathPolys.data(),
+            &nsteerPath, maxSteerPoints);
+        if (dtStatusFailed(status))
+            return std::nullopt;
         assert(nsteerPath >= 0);
         if (!nsteerPath)
             return std::nullopt;

From 94e460ba1e675fd9482834a8ebc007cc09bf92ff Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 30 Jun 2021 20:11:38 +0200
Subject: [PATCH 0928/2859] Use proper check for distance

To avoid invalid results for r < 1.
---
 components/detournavigator/findsmoothpath.hpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/components/detournavigator/findsmoothpath.hpp b/components/detournavigator/findsmoothpath.hpp
index 4e656e6270..db2219b2cd 100644
--- a/components/detournavigator/findsmoothpath.hpp
+++ b/components/detournavigator/findsmoothpath.hpp
@@ -27,8 +27,7 @@ namespace DetourNavigator
 
     inline bool inRange(const osg::Vec3f& v1, const osg::Vec3f& v2, const float r)
     {
-        const auto d = v2 - v1;
-        return (d.x() * d.x() + d.z() * d.z()) < r * r;
+        return (osg::Vec2f(v1.x(), v1.z()) - osg::Vec2f(v2.x(), v2.z())).length() < r;
     }
 
     std::vector<dtPolyRef> fixupCorridor(const std::vector<dtPolyRef>& path, const std::vector<dtPolyRef>& visited);

From 5624fe19112f2ba0f29239fa2914fba094ed842b Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 30 Jun 2021 19:50:39 +0200
Subject: [PATCH 0929/2859] Consider path not found when there is navmesh query
 error

Fix a specific case when the guard at the start of the game fails to find path
due to failed getPolyHeight call that results into a partial path to the
target.
---
 apps/openmw/mwmechanics/pathfinding.cpp | 33 ++++++++++++++++---------
 apps/openmw/mwmechanics/pathfinding.hpp |  8 +++---
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp
index f6283831d5..2f8e830434 100644
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@@ -369,7 +369,13 @@ namespace MWMechanics
         mPath.clear();
 
         // If it's not possible to build path over navmesh due to disabled navmesh generation fallback to straight path
-        if (!buildPathByNavigatorImpl(actor, startPoint, endPoint, halfExtents, flags, areaCosts, std::back_inserter(mPath)))
+        DetourNavigator::Status status = buildPathByNavigatorImpl(actor, startPoint, endPoint, halfExtents, flags,
+                                                                  areaCosts, std::back_inserter(mPath));
+
+        if (status != DetourNavigator::Status::Success)
+            mPath.clear();
+
+        if (status == DetourNavigator::Status::NavMeshNotFound)
             mPath.push_back(endPoint);
 
         mConstructed = !mPath.empty();
@@ -382,25 +388,33 @@ namespace MWMechanics
         mPath.clear();
         mCell = cell;
 
-        bool hasNavMesh = false;
+        DetourNavigator::Status status = DetourNavigator::Status::NavMeshNotFound;
 
         if (!actor.getClass().isPureWaterCreature(actor) && !actor.getClass().isPureFlyingCreature(actor))
-            hasNavMesh = buildPathByNavigatorImpl(actor, startPoint, endPoint, halfExtents, flags, areaCosts, std::back_inserter(mPath));
+        {
+            status = buildPathByNavigatorImpl(actor, startPoint, endPoint, halfExtents, flags, areaCosts, std::back_inserter(mPath));
+            if (status != DetourNavigator::Status::Success)
+                mPath.clear();
+        }
 
-        if (hasNavMesh && mPath.empty())
-            buildPathByNavigatorImpl(actor, startPoint, endPoint, halfExtents,
+        if (status != DetourNavigator::Status::NavMeshNotFound && mPath.empty())
+        {
+            status = buildPathByNavigatorImpl(actor, startPoint, endPoint, halfExtents,
                                      flags | DetourNavigator::Flag_usePathgrid, areaCosts, std::back_inserter(mPath));
+            if (status != DetourNavigator::Status::Success)
+                mPath.clear();
+        }
 
         if (mPath.empty())
             buildPathByPathgridImpl(startPoint, endPoint, pathgridGraph, std::back_inserter(mPath));
 
-        if (!hasNavMesh && mPath.empty())
+        if (status == DetourNavigator::Status::NavMeshNotFound && mPath.empty())
             mPath.push_back(endPoint);
 
         mConstructed = !mPath.empty();
     }
 
-    bool PathFinder::buildPathByNavigatorImpl(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint,
+    DetourNavigator::Status PathFinder::buildPathByNavigatorImpl(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint,
         const osg::Vec3f& endPoint, const osg::Vec3f& halfExtents, const DetourNavigator::Flags flags,
         const DetourNavigator::AreaCosts& areaCosts, std::back_insert_iterator<std::deque<osg::Vec3f>> out)
     {
@@ -409,9 +423,6 @@ namespace MWMechanics
         const auto navigator = world->getNavigator();
         const auto status = navigator->findPath(halfExtents, stepSize, startPoint, endPoint, flags, areaCosts, out);
 
-        if (status == DetourNavigator::Status::NavMeshNotFound)
-            return false;
-
         if (status != DetourNavigator::Status::Success)
         {
             Log(Debug::Debug) << "Build path by navigator error: \"" << DetourNavigator::getMessage(status)
@@ -420,7 +431,7 @@ namespace MWMechanics
                 << DetourNavigator::WriteFlags {flags} << ")";
         }
 
-        return true;
+        return status;
     }
 
     void PathFinder::buildPathByNavMeshToNextPoint(const MWWorld::ConstPtr& actor, const osg::Vec3f& halfExtents,
diff --git a/apps/openmw/mwmechanics/pathfinding.hpp b/apps/openmw/mwmechanics/pathfinding.hpp
index aa6a79c4eb..0ada08d3fb 100644
--- a/apps/openmw/mwmechanics/pathfinding.hpp
+++ b/apps/openmw/mwmechanics/pathfinding.hpp
@@ -7,6 +7,7 @@
 
 #include <components/detournavigator/flags.hpp>
 #include <components/detournavigator/areatype.hpp>
+#include <components/detournavigator/status.hpp>
 #include <components/esm/defs.hpp>
 #include <components/esm/loadpgrd.hpp>
 
@@ -209,9 +210,10 @@ namespace MWMechanics
             void buildPathByPathgridImpl(const osg::Vec3f& startPoint, const osg::Vec3f& endPoint,
                 const PathgridGraph& pathgridGraph, std::back_insert_iterator<std::deque<osg::Vec3f>> out);
 
-            bool buildPathByNavigatorImpl(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint,
-                const osg::Vec3f& endPoint, const osg::Vec3f& halfExtents, const DetourNavigator::Flags flags,
-                const DetourNavigator::AreaCosts& areaCosts, std::back_insert_iterator<std::deque<osg::Vec3f>> out);
+            [[nodiscard]] DetourNavigator::Status buildPathByNavigatorImpl(const MWWorld::ConstPtr& actor,
+                const osg::Vec3f& startPoint, const osg::Vec3f& endPoint, const osg::Vec3f& halfExtents,
+                const DetourNavigator::Flags flags, const DetourNavigator::AreaCosts& areaCosts,
+                std::back_insert_iterator<std::deque<osg::Vec3f>> out);
     };
 }
 

From 2cb948289322afb6945b899c875b10e458c13f00 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Thu, 1 Jul 2021 23:09:08 +0000
Subject: [PATCH 0930/2859] Use a std::vector instead of a std::list in
 hypertextparser.cpp

---
 apps/openmw/mwdialogue/hypertextparser.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwdialogue/hypertextparser.cpp b/apps/openmw/mwdialogue/hypertextparser.cpp
index fa7de97d2e..caafa5f324 100644
--- a/apps/openmw/mwdialogue/hypertextparser.cpp
+++ b/apps/openmw/mwdialogue/hypertextparser.cpp
@@ -50,15 +50,16 @@ namespace MWDialogue
             const MWWorld::Store<ESM::Dialogue> & dialogs =
                 MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>();
 
-            std::list<std::string> keywordList;
-            for (MWWorld::Store<ESM::Dialogue>::iterator it = dialogs.begin(); it != dialogs.end(); ++it)
-                keywordList.push_back(Misc::StringUtils::lowerCase(it->mId));
-            keywordList.sort(Misc::StringUtils::ciLess);
+            std::vector<std::string> keywordList;
+            keywordList.reserve(dialogs.getSize());
+            for (const auto& it : dialogs)
+                keywordList.push_back(Misc::StringUtils::lowerCase(it.mId));
+            sort(keywordList.begin(), keywordList.end());
 
             KeywordSearch<std::string, int /*unused*/> keywordSearch;
 
-            for (std::list<std::string>::const_iterator it = keywordList.begin(); it != keywordList.end(); ++it)
-                keywordSearch.seed(*it, 0 /*unused*/);
+            for (const auto& it : keywordList)
+                keywordSearch.seed(it, 0 /*unused*/);
 
             std::vector<KeywordSearch<std::string, int /*unused*/>::Match> matches;
             keywordSearch.highlightKeywords(text.begin(), text.end(), matches);

From 3cab69c389d5759a5ae3f29079f386c97626fca0 Mon Sep 17 00:00:00 2001
From: Dobrohotov Alexei <alexdobrohotov@yandex.ru>
Date: Sat, 3 Jul 2021 01:03:57 +0300
Subject: [PATCH 0931/2859] Fix ShowMap partial match filtering (bug #6115)

---
 CHANGELOG.md                           |  1 +
 apps/openmw/mwscript/guiextensions.cpp | 13 +++++--------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 828bc1d9ff..5bcf27301a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
     Bug #5483: AutoCalc flag is not used to calculate spells cost
     Bug #6066: addtopic "return" does not work from within script. No errors thrown
     Bug #6101: Disarming trapped unlocked owned objects isn't considered a crime
+    Bug #6115: Showmap overzealous matching
 
 0.47.0
 ------
diff --git a/apps/openmw/mwscript/guiextensions.cpp b/apps/openmw/mwscript/guiextensions.cpp
index cb1e5cd91d..f0bc90e044 100644
--- a/apps/openmw/mwscript/guiextensions.cpp
+++ b/apps/openmw/mwscript/guiextensions.cpp
@@ -124,17 +124,14 @@ namespace MWScript
                 const MWWorld::Store<ESM::Cell> &cells =
                     MWBase::Environment::get().getWorld()->getStore().get<ESM::Cell>();
 
-                MWWorld::Store<ESM::Cell>::iterator it = cells.extBegin();
-                for (; it != cells.extEnd(); ++it)
+                MWBase::WindowManager *winMgr = MWBase::Environment::get().getWindowManager();
+
+                for (auto it = cells.extBegin(); it != cells.extEnd(); ++it)
                 {
                     std::string name = it->mName;
                     ::Misc::StringUtils::lowerCaseInPlace(name);
-                    if (name.find(cell) != std::string::npos)
-                        MWBase::Environment::get().getWindowManager()->addVisitedLocation (
-                            it->mName,
-                            it->getGridX(),
-                            it->getGridY()
-                        );
+                    if (name.length() >= cell.length() && name.substr(0, cell.length()) == cell)
+                        winMgr->addVisitedLocation(it->mName, it->getGridX(), it->getGridY());
                 }
             }
         };

From 5e4beb217ae4208d211a712e2016380dbb0776a5 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 27 Jun 2021 13:14:23 +0200
Subject: [PATCH 0932/2859] Make fatigue and magicka recalculation behave the
 same way

---
 CHANGELOG.md                              | 1 +
 apps/openmw/mwmechanics/actors.cpp        | 2 +-
 apps/openmw/mwmechanics/creaturestats.cpp | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5bcf27301a..789871c4a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
     Bug #5483: AutoCalc flag is not used to calculate spells cost
     Bug #6066: addtopic "return" does not work from within script. No errors thrown
     Bug #6101: Disarming trapped unlocked owned objects isn't considered a crime
+    Bug #6107: Fatigue is incorrectly recalculated when fortify effect is applied or removed
     Bug #6115: Showmap overzealous matching
 
 0.47.0
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index e62d686ee2..e9eab2991b 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -826,7 +826,7 @@ namespace MWMechanics
 
         DynamicStat<float> magicka = creatureStats.getMagicka();
         float diff = (static_cast<int>(magickaFactor*intelligence)) - magicka.getBase();
-        float currentToBaseRatio = (magicka.getCurrent() / magicka.getBase());
+        float currentToBaseRatio = magicka.getBase() > 0 ? magicka.getCurrent() / magicka.getBase() : 0;
         magicka.setModified(magicka.getModified() + diff, 0);
         magicka.setCurrent(magicka.getBase() * currentToBaseRatio, false, true);
         creatureStats.setMagicka(magicka);
diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index c6561af961..1ff44fcbb0 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -159,7 +159,7 @@ namespace MWMechanics
                 float diff = (strength+willpower+agility+endurance) - fatigue.getBase();
                 float currentToBaseRatio = fatigue.getBase() > 0 ? (fatigue.getCurrent() / fatigue.getBase()) : 0;
                 fatigue.setModified(fatigue.getModified() + diff, 0);
-                fatigue.setCurrent(fatigue.getBase() * currentToBaseRatio);
+                fatigue.setCurrent(fatigue.getBase() * currentToBaseRatio, false, true);
                 setFatigue(fatigue);
             }
         }

From 6bb030aa55fd5df9bbc73e1d1c3516346a56bcf8 Mon Sep 17 00:00:00 2001
From: NeveHanter <nevehanter@gmail.com>
Date: Sat, 3 Jul 2021 13:40:36 +0200
Subject: [PATCH 0933/2859] Ignore actors siding with player in awarness check
 to allow training the sneaking or knowing whether player is detected by other
 actors in the siding actor line of sight

---
 CHANGELOG.md                       | 1 +
 apps/openmw/mwmechanics/actors.cpp | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5bcf27301a..b508d518d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
     Bug #6066: addtopic "return" does not work from within script. No errors thrown
     Bug #6101: Disarming trapped unlocked owned objects isn't considered a crime
     Bug #6115: Showmap overzealous matching
+    Bug #6133: Cannot reliably sneak or steal in the sight of the NPCs siding with player
 
 0.47.0
 ------
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index e62d686ee2..43d0264764 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -2396,11 +2396,17 @@ namespace MWMechanics
             float radius = std::min(fSneakUseDist, mActorsProcessingRange);
             getObjectsInRange(position, radius, observers);
 
+            std::set<MWWorld::Ptr> sidingActors;
+            getActorsSidingWith(player, sidingActors);
+
             for (const MWWorld::Ptr &observer : observers)
             {
                 if (observer == player || observer.getClass().getCreatureStats(observer).isDead())
                     continue;
 
+                if (sidingActors.find(observer) != sidingActors.cend())
+                    continue;
+
                 if (world->getLOS(player, observer))
                 {
                     if (MWBase::Environment::get().getMechanicsManager()->awarenessCheck(player, observer))

From 0e57622bbeeb63fd50c5afa77bcd0658c7a0f352 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Sat, 3 Jul 2021 21:04:17 +0100
Subject: [PATCH 0934/2859] Correctly track added and removed state

---
 components/shader/shadervisitor.cpp | 174 +++++++++++++++++++++++++---
 1 file changed, 155 insertions(+), 19 deletions(-)

diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 8a84dfc68b..9747d61acc 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -22,6 +22,68 @@
 
 namespace Shader
 {
+    class AddedState : public osg::Object
+    {
+    public:
+        AddedState() = default;
+        AddedState(const AddedState& rhs, const osg::CopyOp& copyOp)
+            : osg::Object(rhs, copyOp)
+            , mUniforms(rhs.mUniforms)
+            , mModes(rhs.mModes)
+            , mAttributes(rhs.mAttributes)
+        {
+        }
+
+        void addUniform(const std::string& name) { mUniforms.emplace(name); }
+        void setMode(osg::StateAttribute::GLMode mode) { mModes.emplace(mode); }
+        void setAttribute(osg::StateAttribute::TypeMemberPair typeMemberPair) { mAttributes.emplace(typeMemberPair); }
+
+        void setAttribute(const osg::StateAttribute* attribute)
+        {
+            mAttributes.emplace(attribute->getTypeMemberPair());
+        }
+        template<typename T>
+        void setAttribute(osg::ref_ptr<T> attribute) { setAttribute(attribute.get()); }
+
+        void setAttributeAndModes(const osg::StateAttribute* attribute)
+        {
+            setAttribute(attribute);
+            InterrogateModesHelper helper(this);
+            attribute->getModeUsage(helper);
+        }
+        template<typename T>
+        void setAttributeAndModes(osg::ref_ptr<T> attribute) { setAttributeAndModes(attribute.get()); }
+
+        bool hasUniform(const std::string& name) { return mUniforms.count(name); }
+        bool hasMode(osg::StateAttribute::GLMode mode) { return mModes.count(mode); }
+        bool hasAttribute(osg::StateAttribute::TypeMemberPair typeMemberPair) { return mAttributes.count(typeMemberPair); }
+        bool hasAttribute(osg::StateAttribute::Type type, unsigned int member) { return hasAttribute(osg::StateAttribute::TypeMemberPair(type, member)); }
+
+        const std::set<osg::StateAttribute::TypeMemberPair>& getAttributes() { return mAttributes; }
+
+        bool empty()
+        {
+            return mUniforms.empty() && mModes.empty() && mAttributes.empty();
+        }
+
+        META_Object(Shader, AddedState)
+
+    private:
+        class InterrogateModesHelper : public osg::StateAttribute::ModeUsage
+        {
+        public:
+            InterrogateModesHelper(AddedState* tracker) : mTracker(tracker) {}
+            void usesMode(osg::StateAttribute::GLMode mode) override { mTracker->setMode(mode); }
+            void usesTextureMode(osg::StateAttribute::GLMode mode) override {}
+
+        private:
+            AddedState* mTracker;
+        };
+
+        std::unordered_set<std::string> mUniforms;
+        std::unordered_set<osg::StateAttribute::GLMode> mModes;
+        std::set<osg::StateAttribute::TypeMemberPair> mAttributes;
+    };
 
     ShaderVisitor::ShaderRequirements::ShaderRequirements()
         : mShaderRequired(false)
@@ -100,14 +162,32 @@ namespace Shader
         return static_cast<osg::StateSet *>(stateSet.getUserDataContainer()->getUserObject("removedState"));
     }
 
-    void updateRemovedState(osg::UserDataContainer& userData, osg::StateSet* stateSet)
+    void updateRemovedState(osg::UserDataContainer& userData, osg::StateSet* removedState)
     {
         unsigned int index = userData.getUserObjectIndex("removedState");
         if (index < userData.getNumUserObjects())
-            userData.setUserObject(index, stateSet);
+            userData.setUserObject(index, removedState);
         else
-            userData.addUserObject(stateSet);
-        stateSet->setName("removedState");
+            userData.addUserObject(removedState);
+        removedState->setName("removedState");
+    }
+
+    AddedState* getAddedState(osg::StateSet& stateSet)
+    {
+        if (!stateSet.getUserDataContainer())
+            return nullptr;
+
+        return static_cast<AddedState*>(stateSet.getUserDataContainer()->getUserObject("addedState"));
+    }
+
+    void updateAddedState(osg::UserDataContainer& userData, AddedState* addedState)
+    {
+        unsigned int index = userData.getUserObjectIndex("addedState");
+        if (index < userData.getNumUserObjects())
+            userData.setUserObject(index, addedState);
+        else
+            userData.addUserObject(addedState);
+        addedState->setName("addedState");
     }
 
     const char* defaultTextures[] = { "diffuseMap", "normalMap", "emissiveMap", "darkMap", "detailMap", "envMap", "specularMap", "decalMap", "bumpMap" };
@@ -275,11 +355,13 @@ namespace Shader
         osg::StateSet::AttributeList removedAttributes;
         if (osg::ref_ptr<osg::StateSet> removedState = getRemovedState(*stateset))
             removedAttributes = removedState->getAttributeList();
+        osg::ref_ptr<AddedState> addedState = getAddedState(*stateset);
+
         for (const auto* attributeMap : std::initializer_list<const osg::StateSet::AttributeList*>{ &attributes, &removedAttributes })
         {
             for (osg::StateSet::AttributeList::const_iterator it = attributeMap->begin(); it != attributeMap->end(); ++it)
             {
-                if (attributeMap != &removedAttributes && removedAttributes.count(it->first))
+                if (addedState && attributeMap != &removedAttributes && addedState->hasAttribute(it->first))
                     continue;
                 if (it->first.first == osg::StateAttribute::MATERIAL)
                 {
@@ -291,9 +373,6 @@ namespace Shader
 
                         const osg::Material* mat = static_cast<const osg::Material*>(it->second.first.get());
 
-                        if (!writableStateSet)
-                            writableStateSet = getWritableStateSet(node);
-
                         int colorMode;
                         switch (mat->getColorMode())
                         {
@@ -371,6 +450,10 @@ namespace Shader
             writableStateSet = node.getOrCreateStateSet();
         else
             writableStateSet = getWritableStateSet(node);
+        osg::ref_ptr<AddedState> addedState = new AddedState;
+        osg::ref_ptr<AddedState> previousAddedState = getAddedState(*writableStateSet);
+        if (!previousAddedState)
+            previousAddedState = new AddedState;
 
         ShaderManager::DefineMap defineMap;
         for (unsigned int i=0; i<sizeof(defaultTextures)/sizeof(defaultTextures[0]); ++i)
@@ -387,6 +470,7 @@ namespace Shader
         defineMap["parallax"] = reqs.mNormalHeight ? "1" : "0";
 
         writableStateSet->addUniform(new osg::Uniform("colorMode", reqs.mColorMode));
+        addedState->addUniform("colorMode");
 
         defineMap["alphaFunc"] = std::to_string(reqs.mAlphaFunc);
 
@@ -401,20 +485,23 @@ namespace Shader
         if (reqs.mAlphaFunc != osg::AlphaFunc::ALWAYS)
         {
             writableStateSet->addUniform(new osg::Uniform("alphaRef", reqs.mAlphaRef));
+            addedState->addUniform("alphaRef");
 
             if (!removedState->getAttributePair(osg::StateAttribute::ALPHAFUNC))
             {
                 const auto* alphaFunc = writableStateSet->getAttributePair(osg::StateAttribute::ALPHAFUNC);
-                if (alphaFunc)
+                if (alphaFunc && !previousAddedState->hasAttribute(osg::StateAttribute::ALPHAFUNC, 0))
                     removedState->setAttribute(alphaFunc->first, alphaFunc->second);
             }
             // This prevents redundant glAlphaFunc calls while letting the shadows bin still see the test
             writableStateSet->setAttribute(RemovedAlphaFunc::getInstance(reqs.mAlphaFunc), osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+            addedState->setAttribute(RemovedAlphaFunc::getInstance(reqs.mAlphaFunc));
 
             // Blending won't work with A2C as we use the alpha channel for coverage. gl_SampleCoverage from ARB_sample_shading would save the day, but requires GLSL 130
             if (mConvertAlphaTestToAlphaToCoverage && !reqs.mAlphaBlend)
             {
                 writableStateSet->setMode(GL_SAMPLE_ALPHA_TO_COVERAGE_ARB, osg::StateAttribute::ON);
+                addedState->setMode(GL_SAMPLE_ALPHA_TO_COVERAGE_ARB);
                 defineMap["alphaToCoverage"] = "1";
             }
 
@@ -425,10 +512,11 @@ namespace Shader
             // We could fall back to a texture size uniform if EXT_gpu_shader4 is missing
         }
 
-        if (writableStateSet->getMode(GL_ALPHA_TEST) != osg::StateAttribute::INHERIT)
+        if (writableStateSet->getMode(GL_ALPHA_TEST) != osg::StateAttribute::INHERIT && !previousAddedState->hasMode(GL_ALPHA_TEST))
             removedState->setMode(GL_ALPHA_TEST, writableStateSet->getMode(GL_ALPHA_TEST));
         // This disables the deprecated fixed-function alpha test
         writableStateSet->setMode(GL_ALPHA_TEST, osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED);
+        addedState->setMode(GL_ALPHA_TEST);
 
         if (!removedState->getModeList().empty() || !removedState->getAttributeList().empty())
         {
@@ -442,6 +530,18 @@ namespace Shader
             updateRemovedState(*writableUserData, removedState);
         }
 
+        if (!addedState->empty())
+        {
+            // user data is normally shallow copied so shared with the original stateset
+            osg::ref_ptr<osg::UserDataContainer> writableUserData;
+            if (mAllowedToModifyStateSets)
+                writableUserData = writableStateSet->getOrCreateUserDataContainer();
+            else
+                writableUserData = getWritableUserDataContainer(*writableStateSet);
+
+            updateAddedState(*writableUserData, addedState);
+        }
+
         defineMap["translucentFramebuffer"] = mTranslucentFramebuffer ? "1" : "0";
 
         std::string shaderPrefix;
@@ -453,11 +553,14 @@ namespace Shader
 
         if (vertexShader && fragmentShader)
         {
-            writableStateSet->setAttributeAndModes(mShaderManager.getProgram(vertexShader, fragmentShader), osg::StateAttribute::ON);
+            auto program = mShaderManager.getProgram(vertexShader, fragmentShader);
+            writableStateSet->setAttributeAndModes(program, osg::StateAttribute::ON);
+            addedState->setAttributeAndModes(program);
 
             for (std::map<int, std::string>::const_iterator texIt = reqs.mTextures.begin(); texIt != reqs.mTextures.end(); ++texIt)
             {
                 writableStateSet->addUniform(new osg::Uniform(texIt->second.c_str(), texIt->first), osg::StateAttribute::ON);
+                addedState->addUniform(texIt->second);
             }
         }
     }
@@ -472,24 +575,57 @@ namespace Shader
         else
             writableStateSet = getWritableStateSet(node);
 
-        writableStateSet->removeAttribute(osg::StateAttribute::PROGRAM);
+        // user data is normally shallow copied so shared with the original stateset - we'll need to copy before edits
+        osg::ref_ptr<osg::UserDataContainer> writableUserData;
+
+        if (osg::ref_ptr<AddedState> addedState = getAddedState(*writableStateSet))
+        {
+            if (mAllowedToModifyStateSets)
+                writableUserData = writableStateSet->getUserDataContainer();
+            else
+                writableUserData = getWritableUserDataContainer(*writableStateSet);
+
+            unsigned int index = writableUserData->getUserObjectIndex("addedState");
+            writableUserData->removeUserObject(index);
+
+            // O(n log n) to use StateSet::removeX, but this is O(n)
+            for (auto itr = writableStateSet->getUniformList().begin(); itr != writableStateSet->getUniformList().end();)
+            {
+                if (addedState->hasUniform(itr->first))
+                    writableStateSet->getUniformList().erase(itr);
+                else
+                    ++itr;
+            }
+
+            for (auto itr = writableStateSet->getModeList().begin(); itr != writableStateSet->getModeList().end();)
+            {
+                if (addedState->hasMode(itr->first))
+                    writableStateSet->getModeList().erase(itr);
+                else
+                    ++itr;
+            }
+
+            // StateAttributes track the StateSets they're attached to
+            // We don't have access to the function to do that, and can't call removeAttribute with an iterator
+            for (const auto& [type, member] : addedState->getAttributes())
+                writableStateSet->removeAttribute(type, member);
+        }
+
 
         if (osg::ref_ptr<osg::StateSet> removedState = getRemovedState(*writableStateSet))
         {
-            // user data is normally shallow copied so shared with the original stateset
-            osg::ref_ptr<osg::UserDataContainer> writableUserData;
+            if (!writableUserData)
+            {
             if (mAllowedToModifyStateSets)
                 writableUserData = writableStateSet->getUserDataContainer();
             else
                 writableUserData = getWritableUserDataContainer(*writableStateSet);
+            }
+            
             unsigned int index = writableUserData->getUserObjectIndex("removedState");
             writableUserData->removeUserObject(index);
 
-            for (const auto& [mode, value] : removedState->getModeList())
-                writableStateSet->setMode(mode, value);
-
-            for (const auto& attribute : removedState->getAttributeList())
-                writableStateSet->setAttribute(attribute.second.first, attribute.second.second);
+            writableStateSet->merge(*removedState);
         }
     }
 

From 42bcbe34de75b2e631020ff5b7496daafdaa2a98 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Sun, 4 Jul 2021 16:18:47 +1000
Subject: [PATCH 0935/2859] Cell references that teleport (Doors) should be
 placed in the "persistent" group when saving.

---
 apps/opencs/model/doc/savingstages.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/opencs/model/doc/savingstages.cpp b/apps/opencs/model/doc/savingstages.cpp
index edf319db6c..27b31251e5 100644
--- a/apps/opencs/model/doc/savingstages.cpp
+++ b/apps/opencs/model/doc/savingstages.cpp
@@ -343,7 +343,7 @@ void CSMDoc::WriteCellCollectionStage::perform (int stage, Messages& messages)
                 CSMWorld::CellRef refRecord = ref.get();
 
                 unsigned int recordFlags = refIdData.getRecordFlags(refRecord.mRefID);
-                bool isPersistent = (recordFlags & 0x00000400) != 0;
+                bool isPersistent = ((recordFlags & 0x00000400) != 0) || refRecord.mTeleport;
 
                 if (isPersistent)
                     persistentRefs.push_back(*iter);

From b1fa0e9560c837292ffdb61caff6b577a55c7507 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20St=C3=B6ckel?= <andreas.stoeckel@googlemail.com>
Date: Sun, 4 Jul 2021 08:36:59 +0000
Subject: [PATCH 0936/2859] Fix Avatar Preview Coordinate Transformations in
 the Inventory (Issues #6129, #6131)

---
 AUTHORS.md                             |  1 +
 CHANGELOG.md                           |  2 ++
 apps/openmw/mwbase/windowmanager.hpp   |  2 +-
 apps/openmw/mwgui/inventorywindow.cpp  | 43 ++++++++++++++++----------
 apps/openmw/mwgui/inventorywindow.hpp  |  3 ++
 apps/openmw/mwgui/windowmanagerimp.cpp |  2 +-
 apps/openmw/mwgui/windowmanagerimp.hpp |  2 +-
 7 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index 6a613b1c69..aa492f6c1e 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -29,6 +29,7 @@ Programmers
     Alex S (docwest)
     Alexey Yaryshev (skeevert)
     Allofich
+    Andreas Stöckel
     Andrei Kortunov (akortunov)
     AnyOldName3
     Ardekantur
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b508d518d7..76e0323071 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@
     Bug #6066: addtopic "return" does not work from within script. No errors thrown
     Bug #6101: Disarming trapped unlocked owned objects isn't considered a crime
     Bug #6115: Showmap overzealous matching
+    Bug #6129: Player avatar not displayed correctly for large window sizes when GUI scaling active
+    Bug #6131: Item selection in the avatar window not working correctly for large window sizes
     Bug #6133: Cannot reliably sneak or steal in the sight of the NPCs siding with player
 
 0.47.0
diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index 31d188879f..dde470b119 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -171,7 +171,7 @@ namespace MWBase
             virtual void setDragDrop(bool dragDrop) = 0;
             virtual bool getWorldMouseOver() = 0;
 
-            virtual float getScalingFactor() = 0;
+            virtual float getScalingFactor() const = 0;
 
             virtual bool toggleFogOfWar() = 0;
 
diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index 402f7656cb..5f18fba91f 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -461,14 +461,10 @@ namespace MWGui
 
     void InventoryWindow::updatePreviewSize()
     {
-        MyGUI::IntSize size = mAvatarImage->getSize();
-        int width = std::min(mPreview->getTextureWidth(), size.width);
-        int height = std::min(mPreview->getTextureHeight(), size.height);
-        float scalingFactor = MWBase::Environment::get().getWindowManager()->getScalingFactor();
-        mPreview->setViewport(int(width*scalingFactor), int(height*scalingFactor));
-
+        const MyGUI::IntSize viewport = getPreviewViewportSize();
+        mPreview->setViewport(viewport.width, viewport.height);
         mAvatarImage->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 0.f,
-                                                                     width*scalingFactor/float(mPreview->getTextureWidth()), height*scalingFactor/float(mPreview->getTextureHeight())));
+                                                                     viewport.width / float(mPreview->getTextureWidth()), viewport.height / float(mPreview->getTextureHeight())));
     }
 
     void InventoryWindow::onNameFilterChanged(MyGUI::EditBox* _sender)
@@ -629,15 +625,8 @@ namespace MWGui
 
     MWWorld::Ptr InventoryWindow::getAvatarSelectedItem(int x, int y)
     {
-        // convert to OpenGL lower-left origin
-        y = (mAvatarImage->getHeight()-1) - y;
-
-        // Scale coordinates
-        float scalingFactor = MWBase::Environment::get().getWindowManager()->getScalingFactor();
-        x = static_cast<int>(x*scalingFactor);
-        y = static_cast<int>(y*scalingFactor);
-
-        int slot = mPreview->getSlotSelected (x, y);
+        const osg::Vec2f viewport_coords = mapPreviewWindowToViewport(x, y);
+        int slot = mPreview->getSlotSelected(viewport_coords.x(), viewport_coords.y());
 
         if (slot == -1)
             return MWWorld::Ptr();
@@ -832,4 +821,26 @@ namespace MWGui
     {
         mPreview->rebuild();
     }
+
+    MyGUI::IntSize InventoryWindow::getPreviewViewportSize() const
+    {
+        const MyGUI::IntSize previewWindowSize = mAvatarImage->getSize();
+        const float scale = MWBase::Environment::get().getWindowManager()->getScalingFactor();
+
+        return MyGUI::IntSize(std::min<int>(mPreview->getTextureWidth(), previewWindowSize.width * scale),
+                              std::min<int>(mPreview->getTextureHeight(), previewWindowSize.height * scale));
+    }
+
+    osg::Vec2f InventoryWindow::mapPreviewWindowToViewport(int x, int y) const
+    {
+        const MyGUI::IntSize previewWindowSize = mAvatarImage->getSize();
+        const float normalisedX = x / std::max<float>(1.0f, previewWindowSize.width);
+        const float normalisedY = y / std::max<float>(1.0f, previewWindowSize.height);
+
+        const MyGUI::IntSize viewport = getPreviewViewportSize();
+        return osg::Vec2f(
+            normalisedX * float(viewport.width - 1),
+            (1.0 - normalisedY) * float(viewport.height - 1)
+        );
+    }
 }
diff --git a/apps/openmw/mwgui/inventorywindow.hpp b/apps/openmw/mwgui/inventorywindow.hpp
index 214245767b..a89e9a945f 100644
--- a/apps/openmw/mwgui/inventorywindow.hpp
+++ b/apps/openmw/mwgui/inventorywindow.hpp
@@ -130,6 +130,9 @@ namespace MWGui
             void updatePreviewSize();
             void updateArmorRating();
 
+            MyGUI::IntSize getPreviewViewportSize() const;
+            osg::Vec2f mapPreviewWindowToViewport(int x, int y) const;
+
             void adjustPanes();
 
             /// Unequips count items from mSelectedItem, if it is equipped, and then updates mSelectedItem in case the items were re-stacked
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index f45990f215..521d247cff 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -1326,7 +1326,7 @@ namespace MWGui
         return mHud->getWorldMouseOver();
     }
 
-    float WindowManager::getScalingFactor()
+    float WindowManager::getScalingFactor() const
     {
         return mScalingFactor;
     }
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index 5a0d89ce10..c5b2b93826 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -208,7 +208,7 @@ namespace MWGui
     void setDragDrop(bool dragDrop) override;
     bool getWorldMouseOver() override;
 
-    float getScalingFactor() override;
+    float getScalingFactor() const override;
 
     bool toggleFogOfWar() override;
     bool toggleFullHelp() override; ///< show extra info in item tooltips (owner, script)

From 9a7c07173d33048ef8bc390f6018b77779960d87 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 3 Jul 2021 13:02:17 +0200
Subject: [PATCH 0937/2859] Cache failed compilation when getting locals

---
 CHANGELOG.md                              |   1 +
 apps/openmw/mwscript/locals.cpp           | 166 ++++++++++------------
 apps/openmw/mwscript/scriptmanagerimp.cpp |  22 ++-
 3 files changed, 91 insertions(+), 98 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76e0323071..ab0edbb679 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
     Bug #6066: addtopic "return" does not work from within script. No errors thrown
     Bug #6101: Disarming trapped unlocked owned objects isn't considered a crime
     Bug #6115: Showmap overzealous matching
+    Bug #6123: NPC with broken script freezes the game on hello
     Bug #6129: Player avatar not displayed correctly for large window sizes when GUI scaling active
     Bug #6131: Item selection in the avatar window not working correctly for large window sizes
     Bug #6133: Cannot reliably sneak or steal in the sight of the NPCs siding with player
diff --git a/apps/openmw/mwscript/locals.cpp b/apps/openmw/mwscript/locals.cpp
index 352dc67b3a..b4c8d102c5 100644
--- a/apps/openmw/mwscript/locals.cpp
+++ b/apps/openmw/mwscript/locals.cpp
@@ -6,7 +6,6 @@
 #include <components/esm/locals.hpp>
 #include <components/debug/debuglog.hpp>
 #include <components/compiler/locals.hpp>
-#include <components/compiler/exception.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/scriptmanager.hpp"
@@ -65,19 +64,12 @@ namespace MWScript
 
     bool Locals::hasVar(const std::string &script, const std::string &var)
     {
-        try
-        {
-            ensure (script);
+        ensure (script);
 
-            const Compiler::Locals& locals =
-                MWBase::Environment::get().getScriptManager()->getLocals(script);
-            int index = locals.getIndex(var);
-            return (index != -1);
-        }
-        catch (const Compiler::SourceException&)
-        {
-            return false;
-        }
+        const Compiler::Locals& locals =
+            MWBase::Environment::get().getScriptManager()->getLocals(script);
+        int index = locals.getIndex(var);
+        return (index != -1);
     }
 
     int Locals::getIntVar(const std::string &script, const std::string &var)
@@ -162,42 +154,36 @@ namespace MWScript
         if (!mInitialised)
             return false;
 
-        try
+        const Compiler::Locals& declarations =
+            MWBase::Environment::get().getScriptManager()->getLocals(script);
+
+        for (int i=0; i<3; ++i)
         {
-            const Compiler::Locals& declarations =
-                MWBase::Environment::get().getScriptManager()->getLocals(script);
+            char type = 0;
 
-            for (int i=0; i<3; ++i)
+            switch (i)
             {
-                char type = 0;
+                case 0: type = 's'; break;
+                case 1: type = 'l'; break;
+                case 2: type = 'f'; break;
+            }
 
-                switch (i)
-                {
-                    case 0: type = 's'; break;
-                    case 1: type = 'l'; break;
-                    case 2: type = 'f'; break;
-                }
+            const std::vector<std::string>& names = declarations.get (type);
 
-                const std::vector<std::string>& names = declarations.get (type);
+            for (int i2=0; i2<static_cast<int> (names.size()); ++i2)
+            {
+                ESM::Variant value;
 
-                for (int i2=0; i2<static_cast<int> (names.size()); ++i2)
+                switch (i)
                 {
-                    ESM::Variant value;
-
-                    switch (i)
-                    {
-                        case 0: value.setType (ESM::VT_Int); value.setInteger (mShorts.at (i2)); break;
-                        case 1: value.setType (ESM::VT_Int); value.setInteger (mLongs.at (i2)); break;
-                        case 2: value.setType (ESM::VT_Float); value.setFloat (mFloats.at (i2)); break;
-                    }
-
-                    locals.mVariables.emplace_back (names[i2], value);
+                    case 0: value.setType (ESM::VT_Int); value.setInteger (mShorts.at (i2)); break;
+                    case 1: value.setType (ESM::VT_Int); value.setInteger (mLongs.at (i2)); break;
+                    case 2: value.setType (ESM::VT_Float); value.setFloat (mFloats.at (i2)); break;
                 }
+
+                locals.mVariables.emplace_back (names[i2], value);
             }
         }
-        catch (const Compiler::SourceException&)
-        {
-        }
 
         return true;
     }
@@ -206,72 +192,66 @@ namespace MWScript
     {
         ensure (script);
 
-        try
-        {
-            const Compiler::Locals& declarations =
-                MWBase::Environment::get().getScriptManager()->getLocals(script);
+        const Compiler::Locals& declarations =
+            MWBase::Environment::get().getScriptManager()->getLocals(script);
 
-            int index = 0, numshorts = 0, numlongs = 0;
-            for (unsigned int v=0; v<locals.mVariables.size();++v)
-            {
-                ESM::VarType type = locals.mVariables[v].second.getType();
-                if (type == ESM::VT_Short)
-                    ++numshorts;
-                else if (type == ESM::VT_Int)
-                    ++numlongs;
-            }
+        int index = 0, numshorts = 0, numlongs = 0;
+        for (unsigned int v=0; v<locals.mVariables.size();++v)
+        {
+            ESM::VarType type = locals.mVariables[v].second.getType();
+            if (type == ESM::VT_Short)
+                ++numshorts;
+            else if (type == ESM::VT_Int)
+                ++numlongs;
+        }
 
-            for (std::vector<std::pair<std::string, ESM::Variant> >::const_iterator iter
-                = locals.mVariables.begin(); iter!=locals.mVariables.end(); ++iter,++index)
+        for (std::vector<std::pair<std::string, ESM::Variant> >::const_iterator iter
+            = locals.mVariables.begin(); iter!=locals.mVariables.end(); ++iter,++index)
+        {
+            if (iter->first.empty())
             {
-                if (iter->first.empty())
+                // no variable names available (this will happen for legacy, i.e. ESS-imported savegames only)
+                try
                 {
-                    // no variable names available (this will happen for legacy, i.e. ESS-imported savegames only)
-                    try
-                    {
-                        if (index >= numshorts+numlongs)
-                            mFloats.at(index - (numshorts+numlongs)) = iter->second.getFloat();
-                        else if (index >= numshorts)
-                            mLongs.at(index - numshorts) = iter->second.getInteger();
-                        else
-                            mShorts.at(index) = iter->second.getInteger();
-                    }
-                    catch (std::exception& e)
-                    {
-                        Log(Debug::Error) << "Failed to read local variable state for script '"
-                                          << script << "' (legacy format): " << e.what()
-                                          << "\nNum shorts: " << numshorts << " / " << mShorts.size()
-                                          << " Num longs: " << numlongs << " / " << mLongs.size();
-                    }
+                    if (index >= numshorts+numlongs)
+                        mFloats.at(index - (numshorts+numlongs)) = iter->second.getFloat();
+                    else if (index >= numshorts)
+                        mLongs.at(index - numshorts) = iter->second.getInteger();
+                    else
+                        mShorts.at(index) = iter->second.getInteger();
                 }
-                else
+                catch (std::exception& e)
                 {
-                    char type =  declarations.getType (iter->first);
-                    int index2 = declarations.getIndex (iter->first);
+                    Log(Debug::Error) << "Failed to read local variable state for script '"
+                                        << script << "' (legacy format): " << e.what()
+                                        << "\nNum shorts: " << numshorts << " / " << mShorts.size()
+                                        << " Num longs: " << numlongs << " / " << mLongs.size();
+                }
+            }
+            else
+            {
+                char type =  declarations.getType (iter->first);
+                int index2 = declarations.getIndex (iter->first);
 
-                    // silently ignore locals that don't exist anymore
-                    if (type == ' ' || index2 == -1)
-                        continue;
+                // silently ignore locals that don't exist anymore
+                if (type == ' ' || index2 == -1)
+                    continue;
 
-                    try
-                    {
-                        switch (type)
-                        {
-                            case 's': mShorts.at (index2) = iter->second.getInteger(); break;
-                            case 'l': mLongs.at (index2) = iter->second.getInteger(); break;
-                            case 'f': mFloats.at (index2) = iter->second.getFloat(); break;
-                        }
-                    }
-                    catch (...)
+                try
+                {
+                    switch (type)
                     {
-                        // ignore type changes
-                        /// \todo write to log
+                        case 's': mShorts.at (index2) = iter->second.getInteger(); break;
+                        case 'l': mLongs.at (index2) = iter->second.getInteger(); break;
+                        case 'f': mFloats.at (index2) = iter->second.getFloat(); break;
                     }
                 }
+                catch (...)
+                {
+                    // ignore type changes
+                    /// \todo write to log
+                }
             }
         }
-        catch (const Compiler::SourceException&)
-        {
-        }
     }
 }
diff --git a/apps/openmw/mwscript/scriptmanagerimp.cpp b/apps/openmw/mwscript/scriptmanagerimp.cpp
index 15b416fd04..970520ff9d 100644
--- a/apps/openmw/mwscript/scriptmanagerimp.cpp
+++ b/apps/openmw/mwscript/scriptmanagerimp.cpp
@@ -170,14 +170,14 @@ namespace MWScript
         std::string name2 = Misc::StringUtils::lowerCase (name);
 
         {
-            ScriptCollection::iterator iter = mScripts.find (name2);
+            auto iter = mScripts.find (name2);
 
             if (iter!=mScripts.end())
                 return iter->second.mLocals;
         }
 
         {
-            std::map<std::string, Compiler::Locals>::iterator iter = mOtherLocals.find (name2);
+            auto iter = mOtherLocals.find (name2);
 
             if (iter!=mOtherLocals.end())
                 return iter->second;
@@ -192,10 +192,22 @@ namespace MWScript
             std::istringstream stream (script->mScriptText);
             Compiler::QuickFileParser parser (mErrorHandler, mCompilerContext, locals);
             Compiler::Scanner scanner (mErrorHandler, stream, mCompilerContext.getExtensions());
-            scanner.scan (parser);
+            try
+            {
+                scanner.scan (parser);
+            }
+            catch (const Compiler::SourceException&)
+            {
+                // error has already been reported via error handler
+                locals.clear();
+            }
+            catch (const std::exception& error)
+            {
+                Log(Debug::Error) << "Error: An exception has been thrown: " << error.what();
+                locals.clear();
+            }
 
-            std::map<std::string, Compiler::Locals>::iterator iter =
-                mOtherLocals.emplace(name2, locals).first;
+            auto iter = mOtherLocals.emplace(name2, locals).first;
 
             return iter->second;
         }

From 8d1eb7e2e6a72f04c2e15e4816009121366d885c Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 4 Jul 2021 03:15:40 +0200
Subject: [PATCH 0938/2859] Fix slow AiPackage::getTarget calls

Assume there are no cell refs with empty ref id.
---
 CHANGELOG.md                          | 1 +
 apps/openmw/mwmechanics/aipackage.cpp | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b508d518d7..60de6d6d57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -143,6 +143,7 @@
     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
     Feature #390: 3rd person look "over the shoulder"
     Feature #832: OpenMW-CS: Handle deleted references
     Feature #1536: Show more information about level on menu
diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index 5239491795..8ad9447514 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -55,6 +55,11 @@ MWWorld::Ptr MWMechanics::AiPackage::getTarget() const
 
     if (mTargetActorId == -1)
     {
+        if (mTargetActorRefId.empty())
+        {
+            mTargetActorId = -2;
+            return MWWorld::Ptr();
+        }
         MWWorld::Ptr target = MWBase::Environment::get().getWorld()->searchPtr(mTargetActorRefId, false);
         if (target.isEmpty())
         {

From 3014963145f1c42ee86d784f7a26869bfbeae0a3 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Sun, 4 Jul 2021 15:20:27 +0000
Subject: [PATCH 0939/2859] Fail on bad download instead of downloading HTML
 404 page

---
 CI/before_script.msvc.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 2a4924a5f5..8d0b8647b4 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -258,10 +258,10 @@ download() {
 
 			if [ -z $VERBOSE ]; then
 				RET=0
-				curl --silent --retry 10 -Ly 5 -o $FILE $URL || RET=$?
+				curl --silent --fail --retry 10 -Ly 5 -o $FILE $URL || RET=$?
 			else
 				RET=0
-				curl --retry 10 -Ly 5 -o $FILE $URL || RET=$?
+				curl --fail --retry 10 -Ly 5 -o $FILE $URL || RET=$?
 			fi
 
 			if [ $RET -ne 0 ]; then

From 91cece5cc4133a27dd90495f9a8b0cc6f0142509 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 1 Jul 2021 19:00:05 +0200
Subject: [PATCH 0940/2859] Define ESM::Land static constants as constexpr

To avoid linking issues.
---
 components/esm/loadland.hpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/components/esm/loadland.hpp b/components/esm/loadland.hpp
index 2a1140ad2e..9cba41b160 100644
--- a/components/esm/loadland.hpp
+++ b/components/esm/loadland.hpp
@@ -49,28 +49,28 @@ struct Land
     };
 
     // default height to use in case there is no Land record
-    static const int DEFAULT_HEIGHT = -2048;
+    static constexpr int DEFAULT_HEIGHT = -2048;
 
     // number of vertices per side
-    static const int LAND_SIZE = 65;
+    static constexpr int LAND_SIZE = 65;
 
     // cell terrain size in world coords
-    static const int REAL_SIZE = Constants::CellSizeInUnits;
+    static constexpr int REAL_SIZE = Constants::CellSizeInUnits;
 
     // total number of vertices
-    static const int LAND_NUM_VERTS = LAND_SIZE * LAND_SIZE;
+    static constexpr int LAND_NUM_VERTS = LAND_SIZE * LAND_SIZE;
 
-    static const int HEIGHT_SCALE = 8;
+    static constexpr int HEIGHT_SCALE = 8;
 
     //number of textures per side of land
-    static const int LAND_TEXTURE_SIZE = 16;
+    static constexpr int LAND_TEXTURE_SIZE = 16;
 
     //total number of textures per land
-    static const int LAND_NUM_TEXTURES = LAND_TEXTURE_SIZE * LAND_TEXTURE_SIZE;
+    static constexpr int LAND_NUM_TEXTURES = LAND_TEXTURE_SIZE * LAND_TEXTURE_SIZE;
 
-    static const int LAND_GLOBAL_MAP_LOD_SIZE = 81;
+    static constexpr int LAND_GLOBAL_MAP_LOD_SIZE = 81;
 
-    static const int LAND_GLOBAL_MAP_LOD_SIZE_SQRT = 9;
+    static constexpr int LAND_GLOBAL_MAP_LOD_SIZE_SQRT = 9;
 
 #pragma pack(push,1)
     struct VHGT

From 0193c95b269249711e6930b0536ecc6bbbbf056e Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 3 Jul 2021 17:39:34 +0200
Subject: [PATCH 0941/2859] Shrink to fit recast mesh data

---
 components/detournavigator/recastmesh.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/components/detournavigator/recastmesh.cpp b/components/detournavigator/recastmesh.cpp
index 1a9982402b..00d6ae556a 100644
--- a/components/detournavigator/recastmesh.cpp
+++ b/components/detournavigator/recastmesh.cpp
@@ -19,5 +19,9 @@ namespace DetourNavigator
                 + std::to_string(getTrianglesCount()) + ", areaTypes=" + std::to_string(mAreaTypes.size()));
         if (getVerticesCount())
             rcCalcBounds(mVertices.data(), static_cast<int>(getVerticesCount()), mBounds.mMin.ptr(), mBounds.mMax.ptr());
+        mIndices.shrink_to_fit();
+        mVertices.shrink_to_fit();
+        mAreaTypes.shrink_to_fit();
+        mWater.shrink_to_fit();
     }
 }

From 09f9075842da3b92afc00e7471996a4042368b10 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 3 Jul 2021 02:59:07 +0200
Subject: [PATCH 0942/2859] Use RecastMeshBuilder once to create RecastMesh

This allows to move all data out of the object instead of copying.
---
 .../detournavigator/recastmeshbuilder.cpp     | 32 +++++++++----------
 .../detournavigator/recastmeshbuilder.cpp     | 12 ++-----
 .../detournavigator/recastmeshbuilder.hpp     |  4 +--
 .../detournavigator/recastmeshmanager.cpp     | 28 +++++++---------
 .../detournavigator/recastmeshmanager.hpp     |  9 +++---
 5 files changed, 36 insertions(+), 49 deletions(-)

diff --git a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
index b4b6645693..2624389b70 100644
--- a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
+++ b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
@@ -49,7 +49,7 @@ namespace
     TEST_F(DetourNavigatorRecastMeshBuilderTest, create_for_empty_should_return_empty)
     {
         RecastMeshBuilder builder(mSettings, mBounds);
-        const auto recastMesh = builder.create(mGeneration, mRevision);
+        const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getVertices(), std::vector<float>());
         EXPECT_EQ(recastMesh->getIndices(), std::vector<int>());
         EXPECT_EQ(recastMesh->getAreaTypes(), std::vector<AreaType>());
@@ -63,7 +63,7 @@ namespace
 
         RecastMeshBuilder builder(mSettings, mBounds);
         builder.addObject(static_cast<const btCollisionShape&>(shape), btTransform::getIdentity(), AreaType_ground);
-        const auto recastMesh = builder.create(mGeneration, mRevision);
+        const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getVertices(), std::vector<float>({
             1, 0, -1,
             -1, 0, 1,
@@ -84,7 +84,7 @@ namespace
             btTransform(btMatrix3x3::getIdentity().scaled(btVector3(1, 2, 3)), btVector3(1, 2, 3)),
             AreaType_ground
         );
-        const auto recastMesh = builder.create(mGeneration, mRevision);
+        const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getVertices(), std::vector<float>({
             2, 3, 0,
             0, 3, 4,
@@ -100,7 +100,7 @@ namespace
         btHeightfieldTerrainShape shape(2, 2, heightfieldData.data(), 1, 0, 0, 2, PHY_FLOAT, false);
         RecastMeshBuilder builder(mSettings, mBounds);
         builder.addObject(static_cast<const btCollisionShape&>(shape), btTransform::getIdentity(), AreaType_ground);
-        const auto recastMesh = builder.create(mGeneration, mRevision);
+        const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getVertices(), std::vector<float>({
             -0.5, 0, -0.5,
             -0.5, 0, 0.5,
@@ -116,7 +116,7 @@ namespace
         btBoxShape shape(btVector3(1, 1, 2));
         RecastMeshBuilder builder(mSettings, mBounds);
         builder.addObject(static_cast<const btCollisionShape&>(shape), btTransform::getIdentity(), AreaType_ground);
-        const auto recastMesh = builder.create(mGeneration, mRevision);
+        const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getVertices(), std::vector<float>({
             1, 2, 1,
             -1, 2, 1,
@@ -163,7 +163,7 @@ namespace
             btTransform::getIdentity(),
             AreaType_ground
         );
-        const auto recastMesh = builder.create(mGeneration, mRevision);
+        const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getVertices(), std::vector<float>({
             -1, -2, -1,
             -1, -2, 1,
@@ -210,7 +210,7 @@ namespace
             btTransform(btMatrix3x3::getIdentity().scaled(btVector3(1, 2, 3)), btVector3(1, 2, 3)),
             AreaType_ground
         );
-        const auto recastMesh = builder.create(mGeneration, mRevision);
+        const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getVertices(), std::vector<float>({
             2, 3, 0,
             0, 3, 4,
@@ -234,7 +234,7 @@ namespace
             btTransform(btMatrix3x3::getIdentity().scaled(btVector3(1, 2, 3)), btVector3(1, 2, 3)),
             AreaType_ground
         );
-        const auto recastMesh = builder.create(mGeneration, mRevision);
+        const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getVertices(), std::vector<float>({
             3, 12, 2,
             1, 12, 10,
@@ -256,7 +256,7 @@ namespace
             btTransform::getIdentity(),
             AreaType_ground
         );
-        const auto recastMesh = builder.create(mGeneration, mRevision);
+        const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getVertices(), std::vector<float>({
             1, 0, -1,
             -1, 0, 1,
@@ -284,7 +284,7 @@ namespace
             btTransform::getIdentity(),
             AreaType_ground
         );
-        const auto recastMesh = builder.create(mGeneration, mRevision);
+        const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getVertices(), std::vector<float>({
             -0.2f, 0, -0.3f,
             -0.3f, 0, -0.2f,
@@ -309,7 +309,7 @@ namespace
             static_cast<btScalar>(-osg::PI_4))),
             AreaType_ground
         );
-        const auto recastMesh = builder.create(mGeneration, mRevision);
+        const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_THAT(recastMesh->getVertices(), Pointwise(FloatNear(1e-5), std::vector<float>({
             0, -0.70710659027099609375, -3.535533905029296875,
             0, 0.707107067108154296875, -3.535533905029296875,
@@ -334,7 +334,7 @@ namespace
             static_cast<btScalar>(osg::PI_4))),
             AreaType_ground
         );
-        const auto recastMesh = builder.create(mGeneration, mRevision);
+        const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_THAT(recastMesh->getVertices(), Pointwise(FloatNear(1e-5), std::vector<float>({
             -3.535533905029296875, -0.70710659027099609375, 0,
             -3.535533905029296875, 0.707107067108154296875, 0,
@@ -359,7 +359,7 @@ namespace
             static_cast<btScalar>(osg::PI_4))),
             AreaType_ground
         );
-        const auto recastMesh = builder.create(mGeneration, mRevision);
+        const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_THAT(recastMesh->getVertices(), Pointwise(FloatNear(1e-5), std::vector<float>({
             1.41421353816986083984375, 0, 1.1920928955078125e-07,
             -1.41421353816986083984375, 0, -1.1920928955078125e-07,
@@ -388,7 +388,7 @@ namespace
             btTransform::getIdentity(),
             AreaType_null
         );
-        const auto recastMesh = builder.create(mGeneration, mRevision);
+        const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getVertices(), std::vector<float>({
             1, 0, -1,
             -1, 0, 1,
@@ -405,7 +405,7 @@ namespace
     {
         RecastMeshBuilder builder(mSettings, mBounds);
         builder.addWater(1000, btTransform(btMatrix3x3::getIdentity(), btVector3(100, 200, 300)));
-        const auto recastMesh = builder.create(mGeneration, mRevision);
+        const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getWater(), std::vector<RecastMesh::Water>({
             RecastMesh::Water {1000, btTransform(btMatrix3x3::getIdentity(), btVector3(100, 200, 300))}
         }));
@@ -420,7 +420,7 @@ namespace
 
         RecastMeshBuilder builder(mSettings, mBounds);
         builder.addObject(static_cast<const btCollisionShape&>(shape), btTransform::getIdentity(), AreaType_ground);
-        const auto recastMesh = builder.create(mGeneration, mRevision);
+        const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getVertices(), std::vector<float>({
             -1, 0, -1,
             -1, 0, 1,
diff --git a/components/detournavigator/recastmeshbuilder.cpp b/components/detournavigator/recastmeshbuilder.cpp
index 7e06c9229c..8ecbf1ec8e 100644
--- a/components/detournavigator/recastmeshbuilder.cpp
+++ b/components/detournavigator/recastmeshbuilder.cpp
@@ -152,19 +152,11 @@ namespace DetourNavigator
         mWater.push_back(RecastMesh::Water {cellSize, transform});
     }
 
-    std::shared_ptr<RecastMesh> RecastMeshBuilder::create(std::size_t generation, std::size_t revision)
+    std::shared_ptr<RecastMesh> RecastMeshBuilder::create(std::size_t generation, std::size_t revision) &&
     {
         optimizeRecastMesh(mIndices, mVertices);
         std::sort(mWater.begin(), mWater.end());
-        return std::make_shared<RecastMesh>(generation, revision, mIndices, mVertices, mAreaTypes, mWater);
-    }
-
-    void RecastMeshBuilder::reset()
-    {
-        mIndices.clear();
-        mVertices.clear();
-        mAreaTypes.clear();
-        mWater.clear();
+        return std::make_shared<RecastMesh>(generation, revision, std::move(mIndices), std::move(mVertices), std::move(mAreaTypes), std::move(mWater));
     }
 
     void RecastMeshBuilder::addObject(const btConcaveShape& shape, const btTransform& transform,
diff --git a/components/detournavigator/recastmeshbuilder.hpp b/components/detournavigator/recastmeshbuilder.hpp
index fc2bbbc02a..cb1b79377a 100644
--- a/components/detournavigator/recastmeshbuilder.hpp
+++ b/components/detournavigator/recastmeshbuilder.hpp
@@ -34,9 +34,7 @@ namespace DetourNavigator
 
         void addWater(const int mCellSize, const btTransform& transform);
 
-        std::shared_ptr<RecastMesh> create(std::size_t generation, std::size_t revision);
-
-        void reset();
+        std::shared_ptr<RecastMesh> create(std::size_t generation, std::size_t revision) &&;
 
     private:
         std::reference_wrapper<const Settings> mSettings;
diff --git a/components/detournavigator/recastmeshmanager.cpp b/components/detournavigator/recastmeshmanager.cpp
index e79d58de9d..e7afeb2848 100644
--- a/components/detournavigator/recastmeshmanager.cpp
+++ b/components/detournavigator/recastmeshmanager.cpp
@@ -1,10 +1,11 @@
 #include "recastmeshmanager.hpp"
+#include "recastmeshbuilder.hpp"
 
 namespace DetourNavigator
 {
     RecastMeshManager::RecastMeshManager(const Settings& settings, const TileBounds& bounds, std::size_t generation)
-        : mGeneration(generation)
-        , mMeshBuilder(settings, bounds)
+        : mSettings(settings)
+        , mGeneration(generation)
         , mTileBounds(bounds)
     {
     }
@@ -74,8 +75,15 @@ namespace DetourNavigator
 
     std::shared_ptr<RecastMesh> RecastMeshManager::getMesh()
     {
-        rebuild();
-        return mMeshBuilder.create(mGeneration, mRevision);
+        RecastMeshBuilder builder(mSettings, mTileBounds);
+        for (const auto& v : mWaterOrder)
+            builder.addWater(v.mCellSize, v.mTransform);
+        for (const auto& object : mObjectsOrder)
+        {
+            const RecastMeshObject& v = object.getImpl();
+            builder.addObject(v.getShape(), v.getTransform(), v.getAreaType());
+        }
+        return std::move(builder).create(mGeneration, mRevision);
     }
 
     bool RecastMeshManager::isEmpty() const
@@ -99,16 +107,4 @@ namespace DetourNavigator
     {
         return Version {mGeneration, mRevision};
     }
-
-    void RecastMeshManager::rebuild()
-    {
-        mMeshBuilder.reset();
-        for (const auto& v : mWaterOrder)
-            mMeshBuilder.addWater(v.mCellSize, v.mTransform);
-        for (const auto& object : mObjectsOrder)
-        {
-            const RecastMeshObject& v = object.getImpl();
-            mMeshBuilder.addObject(v.getShape(), v.getTransform(), v.getAreaType());
-        }
-    }
 }
diff --git a/components/detournavigator/recastmeshmanager.hpp b/components/detournavigator/recastmeshmanager.hpp
index 850865b95e..956170d3b4 100644
--- a/components/detournavigator/recastmeshmanager.hpp
+++ b/components/detournavigator/recastmeshmanager.hpp
@@ -1,7 +1,6 @@
 #ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_RECASTMESHMANAGER_H
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_RECASTMESHMANAGER_H
 
-#include "recastmeshbuilder.hpp"
 #include "oscillatingrecastmeshobject.hpp"
 #include "objectid.hpp"
 #include "version.hpp"
@@ -13,11 +12,15 @@
 #include <list>
 #include <map>
 #include <optional>
+#include <memory>
 
 class btCollisionShape;
 
 namespace DetourNavigator
 {
+    struct Settings;
+    class RecastMesh;
+
     struct RemovedRecastMeshObject
     {
         std::reference_wrapper<const btCollisionShape> mShape;
@@ -61,9 +64,9 @@ namespace DetourNavigator
             Version mNavMeshVersion;
         };
 
+        const Settings& mSettings;
         std::size_t mRevision = 0;
         std::size_t mGeneration;
-        RecastMeshBuilder mMeshBuilder;
         TileBounds mTileBounds;
         std::list<OscillatingRecastMeshObject> mObjectsOrder;
         std::map<ObjectId, std::list<OscillatingRecastMeshObject>::iterator> mObjects;
@@ -71,8 +74,6 @@ namespace DetourNavigator
         std::map<osg::Vec2i, std::list<Water>::iterator> mWater;
         std::optional<Report> mLastNavMeshReportedChange;
         std::optional<Report> mLastNavMeshReport;
-
-        void rebuild();
     };
 }
 

From e42b3bf960b4685ae29f220a7f7b5a1b8de188bd Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Sun, 4 Jul 2021 23:00:33 +0100
Subject: [PATCH 0943/2859] Adapt destination alpha factor for AMD

As discussed in the comment, it's unclear to me whether this is a driver
bug or mandatory behaviour only AMD implement.

Some more context is here:
https://gitlab.com/OpenMW/openmw/-/issues/6119#note_618245903
---
 components/nifosg/nifloader.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index ab25fd744d..702ab33669 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -2011,6 +2011,11 @@ namespace NifOsg
                     {
                         osg::ref_ptr<osg::BlendFunc> blendFunc (new osg::BlendFunc(getBlendMode((alphaprop->flags>>1)&0xf),
                                                                                    getBlendMode((alphaprop->flags>>5)&0xf)));
+                        // on AMD hardware, alpha still seems to be stored with an RGBA framebuffer with OpenGL.
+                        // This might be mandated by the OpenGL 2.1 specification section 2.14.9, or might be a bug.
+                        // Either way, D3D8.1 doesn't do that, so adapt the destination factor.
+                        if (blendFunc->getDestination() == GL_DST_ALPHA)
+                            blendFunc->setDestination(GL_ONE);
                         blendFunc = shareAttribute(blendFunc);
                         stateset->setAttributeAndModes(blendFunc, osg::StateAttribute::ON);
 

From c7c0d11cab9a27171659017bb3947442d31c9edc Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 5 Jul 2021 00:20:44 +0200
Subject: [PATCH 0944/2859] Trigger navmesh update when any navigator object
 has been updated

Set World::mShouldUpdateNavigator to true when this happens. Previously
assignment to true was missing for object rotation and moving.
---
 apps/openmw/mwworld/worldimp.cpp | 24 +++++++++++-------------
 apps/openmw/mwworld/worldimp.hpp |  2 +-
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 22520cecc0..14c7716f2e 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1224,7 +1224,7 @@ namespace MWWorld
             if (movePhysics)
             {
                 if (const auto object = mPhysics->getObject(ptr))
-                    updateNavigatorObject(object);
+                    updateNavigatorObject(*object);
             }
         }
 
@@ -1283,7 +1283,7 @@ namespace MWWorld
         if (mPhysics->getActor(ptr))
             mNavigator->addAgent(getPathfindingHalfExtents(ptr));
         else if (const auto object = mPhysics->getObject(ptr))
-            mShouldUpdateNavigator = updateNavigatorObject(object) || mShouldUpdateNavigator;
+            updateNavigatorObject(*object);
     }
 
     void World::rotateObjectImp(const Ptr& ptr, const osg::Vec3f& rot, MWBase::RotationFlags flags)
@@ -1332,7 +1332,7 @@ namespace MWWorld
             mWorldScene->updateObjectRotation(ptr, order);
 
             if (const auto object = mPhysics->getObject(ptr))
-                updateNavigatorObject(object);
+                updateNavigatorObject(*object);
         }
     }
 
@@ -1424,7 +1424,7 @@ namespace MWWorld
             mPhysics->updateRotation(ptr, rotate);
 
             if (const auto object = mPhysics->getObject(ptr))
-                updateNavigatorObject(object);
+                updateNavigatorObject(*object);
         }
     }
 
@@ -1544,14 +1544,11 @@ namespace MWWorld
 
     void World::updateNavigator()
     {
-        mPhysics->forEachAnimatedObject([&] (const MWPhysics::Object* object)
-        {
-            mShouldUpdateNavigator = updateNavigatorObject(object) || mShouldUpdateNavigator;
-        });
+        mPhysics->forEachAnimatedObject([&] (const MWPhysics::Object* object) { updateNavigatorObject(*object); });
 
         for (const auto& door : mDoorStates)
             if (const auto object = mPhysics->getObject(door.first))
-                mShouldUpdateNavigator = updateNavigatorObject(object) || mShouldUpdateNavigator;
+                updateNavigatorObject(*object);
 
         if (mShouldUpdateNavigator)
         {
@@ -1560,13 +1557,14 @@ namespace MWWorld
         }
     }
 
-    bool World::updateNavigatorObject(const MWPhysics::Object* object)
+    void World::updateNavigatorObject(const MWPhysics::Object& object)
     {
         const DetourNavigator::ObjectShapes shapes {
-            *object->getShapeInstance()->getCollisionShape(),
-            object->getShapeInstance()->getAvoidCollisionShape()
+            *object.getShapeInstance()->getCollisionShape(),
+            object.getShapeInstance()->getAvoidCollisionShape()
         };
-        return mNavigator->updateObject(DetourNavigator::ObjectId(object), shapes, object->getTransform());
+        mShouldUpdateNavigator = mNavigator->updateObject(DetourNavigator::ObjectId(&object), shapes, object.getTransform())
+            || mShouldUpdateNavigator;
     }
 
     const MWPhysics::RayCastingInterface* World::getRayCasting() const
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index c8f17109ec..2ed69aabdf 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -156,7 +156,7 @@ namespace MWWorld
 
             void updateNavigator();
 
-            bool updateNavigatorObject(const MWPhysics::Object* object);
+            void updateNavigatorObject(const MWPhysics::Object& object);
 
             void ensureNeededRecords();
 

From 84a9facedf0bb6e49a78b85f73c89225bde4d994 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Sun, 4 Jul 2021 23:29:22 +0100
Subject: [PATCH 0945/2859] Disable coverage adjustment for blended objects

---
 components/sceneutil/mwshadowtechnique.cpp | 1 +
 components/shader/shadervisitor.cpp        | 6 ++++++
 files/shaders/alpha.glsl                   | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
index 9209532f7e..ad3fc5fd65 100644
--- a/components/sceneutil/mwshadowtechnique.cpp
+++ b/components/sceneutil/mwshadowtechnique.cpp
@@ -904,6 +904,7 @@ void SceneUtil::MWShadowTechnique::setupCastingShader(Shader::ShaderManager & sh
         program->addShader(castingVertexShader);
         program->addShader(shaderManager.getShader("shadowcasting_fragment.glsl", { {"alphaFunc", std::to_string(alphaFunc)},
                                                                                     {"alphaToCoverage", "0"},
+                                                                                    {"adjustCoverage", "1"},
                                                                                     {"useGPUShader4", useGPUShader4}
                                                                                   }, osg::Shader::FRAGMENT));
     }
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 9747d61acc..25dfa4af1e 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -482,6 +482,7 @@ namespace Shader
             removedState = new osg::StateSet();
 
         defineMap["alphaToCoverage"] = "0";
+        defineMap["adjustCoverage"] = "0";
         if (reqs.mAlphaFunc != osg::AlphaFunc::ALWAYS)
         {
             writableStateSet->addUniform(new osg::Uniform("alphaRef", reqs.mAlphaRef));
@@ -505,6 +506,11 @@ namespace Shader
                 defineMap["alphaToCoverage"] = "1";
             }
 
+            // Adjusting coverage isn't safe with blending on as blending requires the alpha to be intact.
+            // Maybe we could also somehow (e.g. userdata) detect when the diffuse map has coverage-preserving mip maps in the future
+            if (!reqs.mAlphaBlend)
+                defineMap["adjustCoverage"] = "1";
+
             // Preventing alpha tested stuff shrinking as lower mip levels are used requires knowing the texture size
             osg::ref_ptr<osg::GLExtensions> exts = osg::GLExtensions::Get(0, false);
             if (exts && exts->isGpuShader4Supported)
diff --git a/files/shaders/alpha.glsl b/files/shaders/alpha.glsl
index 05be801e93..46b748236c 100644
--- a/files/shaders/alpha.glsl
+++ b/files/shaders/alpha.glsl
@@ -22,7 +22,7 @@ float mipmapLevel(vec2 scaleduv)
 
 float coveragePreservingAlphaScale(sampler2D diffuseMap, vec2 uv)
 {
-    #if @alphaFunc != FUNC_ALWAYS && @alphaFunc != FUNC_NEVER
+    #if @adjustCoverage
         vec2 textureSize;
         #if @useGPUShader4
             textureSize = textureSize2D(diffuseMap, 0);

From e5e3f52e3eadac5e2189ea62530c8b1bd0c7c8d1 Mon Sep 17 00:00:00 2001
From: Bret Curtis <bret.curtis@gmail.com>
Date: Mon, 5 Jul 2021 10:23:01 +0200
Subject: [PATCH 0946/2859] Added changelog entry for #6067

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aef5a2be3b..268024e2ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
     Bug #5453: Magic effect VFX are offset for creatures
     Bug #5483: AutoCalc flag is not used to calculate spells cost
     Bug #6066: addtopic "return" does not work from within script. No errors thrown
+    Bug #6067: esp loader fails in for certain subrecord orders
     Bug #6101: Disarming trapped unlocked owned objects isn't considered a crime
     Bug #6115: Showmap overzealous matching
     Bug #6129: Player avatar not displayed correctly for large window sizes when GUI scaling active

From 7498a86abebf0eb9a039765833c06d424b93262a Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 5 Jul 2021 13:11:54 +0200
Subject: [PATCH 0947/2859] Remove redundant semicolons

---
 apps/benchmarks/detournavigator/navmeshtilescache.cpp | 2 +-
 apps/opencs/model/doc/runner.cpp                      | 2 +-
 apps/opencs/view/world/scriptsubview.cpp              | 2 +-
 apps/openmw/mwstate/statemanagerimp.cpp               | 2 +-
 extern/osg-ffmpeg-videoplayer/videostate.cpp          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/benchmarks/detournavigator/navmeshtilescache.cpp b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
index 2c7a981ad5..d39161fda2 100644
--- a/apps/benchmarks/detournavigator/navmeshtilescache.cpp
+++ b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
@@ -69,7 +69,7 @@ namespace
     AreaType generateAreaType(Random& random)
     {
         std::uniform_int_distribution<int> distribution(0, 4);
-        return toAreaType(distribution(random));;
+        return toAreaType(distribution(random));
     }
 
     template <typename OutputIterator, typename Random>
diff --git a/apps/opencs/model/doc/runner.cpp b/apps/opencs/model/doc/runner.cpp
index ccdff1444f..8dafbaf5ae 100644
--- a/apps/opencs/model/doc/runner.cpp
+++ b/apps/opencs/model/doc/runner.cpp
@@ -78,7 +78,7 @@ void CSMDoc::Runner::start (bool delayed)
         else
             arguments << "--new-game=1";
 
-        arguments << ("--script-run="+mStartup->fileName());;
+        arguments << ("--script-run="+mStartup->fileName());
 
         arguments <<
             QString::fromUtf8 (("--data=\""+mProjectPath.parent_path().string()+"\"").c_str());
diff --git a/apps/opencs/view/world/scriptsubview.cpp b/apps/opencs/view/world/scriptsubview.cpp
index 6eab7aaa53..6b07f2ea71 100644
--- a/apps/opencs/view/world/scriptsubview.cpp
+++ b/apps/opencs/view/world/scriptsubview.cpp
@@ -109,7 +109,7 @@ CSVWorld::ScriptSubView::ScriptSubView (const CSMWorld::UniversalId& id, CSMDoc:
     sizes << 1 << 0;
     mMain->setSizes (sizes);
 
-    QWidget *widget = new QWidget (this);;
+    QWidget *widget = new QWidget (this);
     widget->setLayout (&mLayout);
     setWidget (widget);
 
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index ffef9d74a9..b242862772 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -217,7 +217,7 @@ void MWState::StateManager::saveGame (const std::string& description, const Slot
         profile.mTimePlayed = mTimePlayed;
         profile.mDescription = description;
 
-        Log(Debug::Info) << "Making a screenshot for saved game '" << description << "'";;
+        Log(Debug::Info) << "Making a screenshot for saved game '" << description << "'";
         writeScreenshot(profile.mScreenshot);
 
         if (!slot)
diff --git a/extern/osg-ffmpeg-videoplayer/videostate.cpp b/extern/osg-ffmpeg-videoplayer/videostate.cpp
index 7b4060753e..7fcad33697 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.cpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.cpp
@@ -524,7 +524,7 @@ public:
                     uint64_t seek_target = self->mSeekPos;
                     int streamIndex = -1;
 
-                    int videoStreamIndex = -1;;
+                    int videoStreamIndex = -1;
                     int audioStreamIndex = -1;
                     if (self->video_st)
                         videoStreamIndex = self->video_st - self->format_ctx->streams;

From 625744298bafe02571b70b5f59729bb97f17914a Mon Sep 17 00:00:00 2001
From: Simon Meulenbeek <simonmeulenbeek@gmail.com>
Date: Mon, 5 Jul 2021 13:22:46 +0000
Subject: [PATCH 0948/2859] change setValue to replace value instead of insert

---
 CHANGELOG.md                       | 1 +
 components/config/settingsbase.hpp | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 268024e2ea..d671795004 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
     Bug #5379: Wandering NPCs falling through cantons
     Bug #5453: Magic effect VFX are offset for creatures
     Bug #5483: AutoCalc flag is not used to calculate spells cost
+    Bug #6037: Morrowind Content Language Cannot be Set to English in OpenMW Launcher
     Bug #6066: addtopic "return" does not work from within script. No errors thrown
     Bug #6067: esp loader fails in for certain subrecord orders
     Bug #6101: Disarming trapped unlocked owned objects isn't considered a crime
diff --git a/components/config/settingsbase.hpp b/components/config/settingsbase.hpp
index 86fa962ae0..03ce9d3551 100644
--- a/components/config/settingsbase.hpp
+++ b/components/config/settingsbase.hpp
@@ -24,9 +24,7 @@ namespace Config
 
         inline void setValue(const QString &key, const QString &value)
         {
-            QStringList values = mSettings.values(key);
-            if (!values.contains(value))
-                mSettings.insert(key, value);
+            mSettings.replace(key, value);
         }
 
         inline void setMultiValue(const QString &key, const QString &value)

From 3925c0fecf0ae6cadbc72f63ef50e4e7d8f4f55c Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Wed, 30 Jun 2021 21:59:47 +0200
Subject: [PATCH 0949/2859] Remplace a ton of std::endl with \n

endl is calling flush, which is really nuking performances,
and I care about esmtool's performances because I'm
using it for fuzzing.
---
 apps/esmtool/esmtool.cpp | 70 ++++++++++++++++++++--------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp
index 2d3e7d5310..6b6e428e62 100644
--- a/apps/esmtool/esmtool.cpp
+++ b/apps/esmtool/esmtool.cpp
@@ -130,7 +130,7 @@ bool parseOptions (int argc, char** argv, Arguments &info)
     }
     if (!variables.count("mode"))
     {
-        std::cout << "No mode specified!" << std::endl << std::endl
+        std::cout << "No mode specified!\n\n"
                   << desc << finalText << std::endl;
         return false;
     }
@@ -143,7 +143,7 @@ bool parseOptions (int argc, char** argv, Arguments &info)
     info.mode = variables["mode"].as<std::string>();
     if (!(info.mode == "dump" || info.mode == "clone" || info.mode == "comp"))
     {
-        std::cout << std::endl << "ERROR: invalid mode \"" << info.mode << "\"" << std::endl << std::endl
+        std::cout << "\nERROR: invalid mode \"" << info.mode << "\"\n\n"
                   << desc << finalText << std::endl;
         return false;
     }
@@ -176,7 +176,7 @@ bool parseOptions (int argc, char** argv, Arguments &info)
     info.encoding = variables["encoding"].as<std::string>();
     if(info.encoding != "win1250" && info.encoding != "win1251" && info.encoding != "win1252")
     {
-        std::cout << info.encoding << " is not a valid encoding option." << std::endl;
+        std::cout << info.encoding << " is not a valid encoding option.\n";
         info.encoding = "win1252";
     }
     std::cout << ToUTF8::encodingUsingMessage(info.encoding) << std::endl;
@@ -244,37 +244,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 << std::endl;
-        std::cout << "    Position: (" << ref.mPos.pos[0] << ", " << ref.mPos.pos[1] << ", " << ref.mPos.pos[2] << ")" << std::endl;
+        std::cout << "    Refnum: " << ref.mRefNum.mIndex << '\n';
+        std::cout << "    ID: " << ref.mRefID << '\n';
+        std::cout << "    Position: (" << ref.mPos.pos[0] << ", " << ref.mPos.pos[1] << ", " << ref.mPos.pos[2] << ")\n";
         if (ref.mScale != 1.f)
-            std::cout << "    Scale: " << ref.mScale << std::endl;
+            std::cout << "    Scale: " << ref.mScale << '\n';
         if (!ref.mOwner.empty())
-            std::cout << "    Owner: " << ref.mOwner << std::endl;
+            std::cout << "    Owner: " << ref.mOwner << '\n';
         if (!ref.mGlobalVariable.empty())
-            std::cout << "    Global: " << ref.mGlobalVariable << std::endl;
+            std::cout << "    Global: " << ref.mGlobalVariable << '\n';
         if (!ref.mFaction.empty())
-            std::cout << "    Faction: " << ref.mFaction << std::endl;
+            std::cout << "    Faction: " << ref.mFaction << '\n';
         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;
+            std::cout << "    Faction rank: " << ref.mFactionRank << '\n';
+        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) << '\n';
+        std::cout << "    Deleted: " << deleted << '\n';
         if (!ref.mKey.empty())
-            std::cout << "    Key: " << ref.mKey << std::endl;
-        std::cout << "    Lock level: " << ref.mLockLevel << std::endl;
+            std::cout << "    Key: " << ref.mKey << '\n';
+        std::cout << "    Lock level: " << ref.mLockLevel << '\n';
         if (!ref.mTrap.empty())
-            std::cout << "    Trap: " << ref.mTrap << std::endl;
+            std::cout << "    Trap: " << ref.mTrap << '\n';
         if (!ref.mSoul.empty())
-            std::cout << "    Soul: " << ref.mSoul << std::endl;
+            std::cout << "    Soul: " << ref.mSoul << '\n';
         if (ref.mTeleport)
         {
             std::cout << "    Destination position: (" << ref.mDoorDest.pos[0] << ", "
-                      << ref.mDoorDest.pos[1] << ", " << ref.mDoorDest.pos[2] << ")" << std::endl;
+                      << ref.mDoorDest.pos[1] << ", " << ref.mDoorDest.pos[2] << ")\n";
             if (!ref.mDestCell.empty())
-                std::cout << "    Destination cell: " << ref.mDestCell << std::endl;
+                std::cout << "    Destination cell: " << ref.mDestCell << '\n';
         }
     }
 }
@@ -284,7 +284,7 @@ void printRaw(ESM::ESMReader &esm)
     while(esm.hasMoreRecs())
     {
         ESM::NAME n = esm.getRecName();
-        std::cout << "Record: " << n.toString() << std::endl;
+        std::cout << "Record: " << n.toString() << '\n';
         esm.getRecHeader();
         while(esm.hasMoreSubs())
         {
@@ -294,7 +294,7 @@ void printRaw(ESM::ESMReader &esm)
             n = esm.retSubName();
             std::ios::fmtflags f(std::cout.flags());
             std::cout << "    " << n.toString() << " - " << esm.getSubSize()
-                 << " bytes @ 0x" << std::hex << offs << "\n";
+                 << " bytes @ 0x" << std::hex << offs << '\n';
             std::cout.flags(f);
         }
     }
@@ -307,7 +307,7 @@ int load(Arguments& info)
     esm.setEncoder(&encoder);
 
     std::string filename = info.filename;
-    std::cout << "Loading file: " << filename << std::endl;
+    std::cout << "Loading file: " << filename << '\n';
 
     std::unordered_set<uint32_t> skipped;
 
@@ -336,15 +336,15 @@ int load(Arguments& info)
 
         if (!quiet)
         {
-            std::cout << "Author: " << esm.getAuthor() << std::endl
-                 << "Description: " << esm.getDesc() << std::endl
-                 << "File format version: " << esm.getFVer() << std::endl;
+            std::cout << "Author: " << esm.getAuthor() << '\n'
+                 << "Description: " << esm.getDesc() << '\n'
+                 << "File format version: " << esm.getFVer() << '\n';
             std::vector<ESM::Header::MasterData> masterData = esm.getGameFiles();
             if (!masterData.empty())
             {
-                std::cout << "Masters:" << std::endl;
+                std::cout << "Masters:" << '\n';
                 for(const auto& master : masterData)
-                    std::cout << "  " << master.name << ", " << master.size << " bytes" << std::endl;
+                    std::cout << "  " << master.name << ", " << master.size << " bytes\n";
             }
         }
 
@@ -360,7 +360,7 @@ int load(Arguments& info)
             {
                 if (skipped.count(n.intval) == 0)
                 {
-                    std::cout << "Skipping " << n.toString() << " records." << std::endl;
+                    std::cout << "Skipping " << n.toString() << " records.\n";
                     skipped.emplace(n.intval);
                 }
 
@@ -444,7 +444,7 @@ int clone(Arguments& info)
     if (recordCount > 0)
         digitCount = (int)std::log10(recordCount) + 1;
 
-    std::cout << "Loaded " << recordCount << " records:" << std::endl << std::endl;
+    std::cout << "Loaded " << recordCount << " records:\n\n";
 
     int i = 0;
     for (std::pair<int, int> stat : info.data.mRecordStats)
@@ -454,13 +454,13 @@ int clone(Arguments& info)
         int amount = stat.second;
         std::cout << std::setw(digitCount) << amount << " " << name.toString() << "  ";
         if (++i % 3 == 0)
-            std::cout << std::endl;
+            std::cout << '\n';
     }
 
     if (i % 3 != 0)
-        std::cout << std::endl;
+        std::cout << '\n';
 
-    std::cout << std::endl << "Saving records to: " << info.outname << "..." << std::endl;
+    std::cout << "\nSaving records to: " << info.outname << "...\n";
 
     ESM::ESMWriter& esm = info.writer;
     ToUTF8::Utf8Encoder encoder (ToUTF8::calculateEncoding(info.encoding));

From 0a15d7740a66d1a920c6cf86dbd37b0614c6a9de Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Fri, 5 Mar 2021 22:21:53 +0100
Subject: [PATCH 0950/2859] Delay physics for objects created by scripts

---
 apps/openmw/mwclass/activator.cpp             |  5 +++++
 apps/openmw/mwclass/activator.hpp             |  2 ++
 apps/openmw/mwclass/container.cpp             |  5 +++++
 apps/openmw/mwclass/container.hpp             |  1 +
 apps/openmw/mwclass/door.cpp                  |  9 ++++++--
 apps/openmw/mwclass/door.hpp                  |  1 +
 apps/openmw/mwclass/light.cpp                 | 11 +++++++---
 apps/openmw/mwclass/light.hpp                 |  1 +
 apps/openmw/mwclass/static.cpp                |  5 +++++
 apps/openmw/mwclass/static.hpp                |  1 +
 apps/openmw/mwphysics/physicssystem.cpp       |  2 ++
 apps/openmw/mwscript/miscextensions.cpp       |  2 ++
 .../mwscript/transformationextensions.cpp     |  3 +++
 apps/openmw/mwworld/class.cpp                 |  3 +++
 apps/openmw/mwworld/class.hpp                 |  1 +
 apps/openmw/mwworld/refdata.cpp               |  7 ++++---
 apps/openmw/mwworld/refdata.hpp               |  2 ++
 apps/openmw/mwworld/scene.cpp                 | 21 +++++++++++++++++++
 18 files changed, 74 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwclass/activator.cpp b/apps/openmw/mwclass/activator.cpp
index 0b4d9ef836..2e8553920f 100644
--- a/apps/openmw/mwclass/activator.cpp
+++ b/apps/openmw/mwclass/activator.cpp
@@ -39,6 +39,11 @@ namespace MWClass
     }
 
     void Activator::insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
+    {
+        insertObjectPhysics(ptr, model, rotation, physics, skipAnimated);
+    }
+
+    void Activator::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
     {
         if(!model.empty())
             physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World, skipAnimated);
diff --git a/apps/openmw/mwclass/activator.hpp b/apps/openmw/mwclass/activator.hpp
index 7af47680b3..4dc85bd507 100644
--- a/apps/openmw/mwclass/activator.hpp
+++ b/apps/openmw/mwclass/activator.hpp
@@ -19,6 +19,8 @@ namespace MWClass
 
             void insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
 
+            void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const override;
+
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index b88d756cbc..5c1ddd8bd1 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -107,6 +107,11 @@ namespace MWClass
     }
 
     void Container::insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
+    {
+        insertObjectPhysics(ptr, model, rotation, physics, skipAnimated);
+    }
+
+    void Container::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
     {
         if(!model.empty())
             physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World, skipAnimated);
diff --git a/apps/openmw/mwclass/container.hpp b/apps/openmw/mwclass/container.hpp
index 02ec9b1012..1cbc5a6142 100644
--- a/apps/openmw/mwclass/container.hpp
+++ b/apps/openmw/mwclass/container.hpp
@@ -43,6 +43,7 @@ namespace MWClass
             ///< Add reference into a cell for rendering
 
             void insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
+            void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
 
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index 1407d6a0d5..e608c27000 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -57,8 +57,7 @@ namespace MWClass
 
     void Door::insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
     {
-        if(!model.empty())
-            physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_Door, skipAnimated);
+        insertObjectPhysics(ptr, model, rotation, physics, skipAnimated);
 
         // Resume the door's opening/closing animation if it wasn't finished
         if (ptr.getRefData().getCustomData())
@@ -71,6 +70,12 @@ namespace MWClass
         }
     }
 
+    void Door::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
+    {
+        if(!model.empty())
+            physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_Door, skipAnimated);
+    }
+
     bool Door::isDoor() const
     {
         return true;
diff --git a/apps/openmw/mwclass/door.hpp b/apps/openmw/mwclass/door.hpp
index f80c9bb416..5882842e91 100644
--- a/apps/openmw/mwclass/door.hpp
+++ b/apps/openmw/mwclass/door.hpp
@@ -19,6 +19,7 @@ namespace MWClass
             ///< Add reference into a cell for rendering
 
             void insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
+            void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
 
             bool isDoor() const override;
 
diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index ca744be7bc..ad5eb4e737 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -39,9 +39,7 @@ namespace MWClass
             ptr.get<ESM::Light>();
         assert (ref->mBase != nullptr);
 
-        // TODO: add option somewhere to enable collision for placeable objects
-        if (!model.empty() && (ref->mBase->mData.mFlags & ESM::Light::Carry) == 0)
-            physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World, skipAnimated);
+        insertObjectPhysics(ptr, model, rotation, physics, skipAnimated);
 
         if (!ref->mBase->mSound.empty() && !(ref->mBase->mData.mFlags & ESM::Light::OffDefault))
             MWBase::Environment::get().getSoundManager()->playSound3D(ptr, ref->mBase->mSound, 1.0, 1.0,
@@ -49,6 +47,13 @@ namespace MWClass
                                                                       MWSound::PlayMode::Loop);
     }
 
+    void Light::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
+    {
+        // TODO: add option somewhere to enable collision for placeable objects
+        if (!model.empty() && (ptr.get<ESM::Light>()->mBase->mData.mFlags & ESM::Light::Carry) == 0)
+            physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World, skipAnimated);
+    }
+
     bool Light::useAnim() const
     {
         return true;
diff --git a/apps/openmw/mwclass/light.hpp b/apps/openmw/mwclass/light.hpp
index 7641722788..55fef759aa 100644
--- a/apps/openmw/mwclass/light.hpp
+++ b/apps/openmw/mwclass/light.hpp
@@ -15,6 +15,7 @@ namespace MWClass
             ///< Add reference into a cell for rendering
 
             void insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
+            void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
 
             bool useAnim() const override;
 
diff --git a/apps/openmw/mwclass/static.cpp b/apps/openmw/mwclass/static.cpp
index 323e482bf0..25029528ea 100644
--- a/apps/openmw/mwclass/static.cpp
+++ b/apps/openmw/mwclass/static.cpp
@@ -24,6 +24,11 @@ namespace MWClass
     }
 
     void Static::insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
+    {
+        insertObjectPhysics(ptr, model, rotation, physics, skipAnimated);
+    }
+
+    void Static::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
     {
         if(!model.empty())
             physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World, skipAnimated);
diff --git a/apps/openmw/mwclass/static.hpp b/apps/openmw/mwclass/static.hpp
index 211b93de2a..d1991d0550 100644
--- a/apps/openmw/mwclass/static.hpp
+++ b/apps/openmw/mwclass/static.hpp
@@ -15,6 +15,7 @@ namespace MWClass
             ///< Add reference into a cell for rendering
 
             void insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
+            void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
 
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 034a35f38e..e5bd936abb 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -463,6 +463,8 @@ namespace MWPhysics
 
     void PhysicsSystem::addObject (const MWWorld::Ptr& ptr, const std::string& mesh, osg::Quat rotation, int collisionType, bool skipAnimated)
     {
+        if (ptr.mRef->mData.mPhysicsPostponed)
+            return;
         osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance = mShapeManager->getInstance(mesh);
         if (!shapeInstance || !shapeInstance->getCollisionShape())
             return;
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index 5538e8536f..c28f2b8951 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -168,6 +168,8 @@ namespace MWScript
                 void execute (Interpreter::Runtime& runtime) override
                 {
                     MWWorld::Ptr ptr = R()(runtime);
+                    if(!ptr.isEmpty() && !ptr.mRef->mData.isEnabled())
+                        ptr.mRef->mData.mPhysicsPostponed = false;
                     MWBase::Environment::get().getWorld()->enable (ptr);
                 }
         };
diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index dbd8e905aa..825306d650 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -501,6 +501,7 @@ namespace MWScript
                         pos.rot[0] = pos.rot[1] = 0;
                         pos.rot[2] = osg::DegreesToRadians(zRotDegrees);
                         MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(),itemID);
+                        ref.getPtr().mRef->mData.mPhysicsPostponed = !ref.getPtr().getClass().isActor();
                         ref.getPtr().getCellRef().setPosition(pos);
                         MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->placeObject(ref.getPtr(),store,pos);
                         placed.getClass().adjustPosition(placed, true);
@@ -548,6 +549,7 @@ namespace MWScript
                     pos.rot[0] = pos.rot[1] = 0;
                     pos.rot[2] = osg::DegreesToRadians(zRotDegrees);
                     MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(),itemID);
+                    ref.getPtr().mRef->mData.mPhysicsPostponed = !ref.getPtr().getClass().isActor();
                     ref.getPtr().getCellRef().setPosition(pos);
                     MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->placeObject(ref.getPtr(),store,pos);
                     placed.getClass().adjustPosition(placed, true);
@@ -588,6 +590,7 @@ namespace MWScript
                     {
                         // create item
                         MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), itemID, 1);
+                        ref.getPtr().mRef->mData.mPhysicsPostponed = !ref.getPtr().getClass().isActor();
 
                         MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->safePlaceObject(ref.getPtr(), actor, actor.getCell(), direction, distance);
                         MWBase::Environment::get().getWorld()->scaleObject(ptr, actor.getCellRef().getScale());
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index 04dfba6b97..96f03af6c3 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -35,6 +35,9 @@ namespace MWWorld
 
     }
 
+    void Class::insertObjectPhysics(const Ptr& ptr, const std::string& mesh, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
+    {}
+
     bool Class::apply (const MWWorld::Ptr& ptr, const std::string& id,  const MWWorld::Ptr& actor) const
     {
         return false;
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index e225e0187c..7937209c6e 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -80,6 +80,7 @@ namespace MWWorld
             virtual void insertObjectRendering (const Ptr& ptr, const std::string& mesh, MWRender::RenderingInterface& renderingInterface) const;
             virtual void insertObject(const Ptr& ptr, const std::string& mesh, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const;
             ///< Add reference into a cell for rendering (default implementation: don't render anything).
+            virtual void insertObjectPhysics(const Ptr& ptr, const std::string& mesh, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const;
 
             virtual std::string getName (const ConstPtr& ptr) const = 0;
             ///< \return name or ID; can return an empty string.
diff --git a/apps/openmw/mwworld/refdata.cpp b/apps/openmw/mwworld/refdata.cpp
index f6a445d619..29c669caf9 100644
--- a/apps/openmw/mwworld/refdata.cpp
+++ b/apps/openmw/mwworld/refdata.cpp
@@ -31,6 +31,7 @@ namespace MWWorld
         mChanged = refData.mChanged;
         mDeletedByContentFile = refData.mDeletedByContentFile;
         mFlags = refData.mFlags;
+        mPhysicsPostponed = refData.mPhysicsPostponed;
 
         mAnimationState = refData.mAnimationState;
 
@@ -44,7 +45,7 @@ namespace MWWorld
     }
 
     RefData::RefData()
-    : mBaseNode(nullptr), mDeletedByContentFile(false), mEnabled (true), mCount (1), mCustomData (nullptr), mChanged(false), mFlags(0)
+    : mBaseNode(nullptr), mDeletedByContentFile(false), mEnabled (true), mCount (1), mCustomData (nullptr), mChanged(false), mFlags(0), mPhysicsPostponed(false)
     {
         for (int i=0; i<3; ++i)
         {
@@ -57,7 +58,7 @@ namespace MWWorld
     : mBaseNode(nullptr), mDeletedByContentFile(false), mEnabled (true),
       mCount (1), mPosition (cellRef.mPos),
       mCustomData (nullptr),
-      mChanged(false), mFlags(0) // Loading from ESM/ESP files -> assume unchanged
+      mChanged(false), mFlags(0), mPhysicsPostponed(false) // Loading from ESM/ESP files -> assume unchanged
     {
     }
 
@@ -68,7 +69,7 @@ namespace MWWorld
       mPosition (objectState.mPosition),
       mAnimationState(objectState.mAnimationState),
       mCustomData (nullptr),
-      mChanged(true), mFlags(objectState.mFlags) // Loading from a savegame -> assume changed
+      mChanged(true), mFlags(objectState.mFlags), mPhysicsPostponed(false) // Loading from a savegame -> assume changed
     {
         // "Note that the ActivationFlag_UseEnabled is saved to the reference,
         // which will result in permanently suppressed activation if the reference script is removed.
diff --git a/apps/openmw/mwworld/refdata.hpp b/apps/openmw/mwworld/refdata.hpp
index 8979c8505d..e2f77d09e0 100644
--- a/apps/openmw/mwworld/refdata.hpp
+++ b/apps/openmw/mwworld/refdata.hpp
@@ -58,6 +58,8 @@ namespace MWWorld
 
         public:
 
+            bool mPhysicsPostponed;
+
             RefData();
 
             /// @param cellRef Used to copy constant data such as position into this class where it can
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 45b0c5d9f8..d3b381d2af 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -343,7 +343,10 @@ namespace MWWorld
 
         cell->forEach(visitor);
         for (const auto& ptr : visitor.mObjects)
+        {
             mPhysics->remove(ptr);
+            ptr.mRef->mData.mPhysicsPostponed = false;
+        }
 
         if (cell->getCell()->isExterior())
         {
@@ -626,6 +629,24 @@ namespace MWWorld
             }
             return cellsPositionsToLoad;
         };
+
+        for(const auto& cell : mActiveCells)
+        {
+            cell->forEach([&](const MWWorld::Ptr& ptr)
+            {
+                if(ptr.mRef->mData.mPhysicsPostponed)
+                {
+                    ptr.mRef->mData.mPhysicsPostponed = false;
+                    if(ptr.mRef->mData.isEnabled() && ptr.mRef->mData.getCount() > 0) {
+                        std::string model = getModel(ptr, MWBase::Environment::get().getResourceSystem()->getVFS());
+                        const auto rotation = makeNodeRotation(ptr, RotationOrder::direct);
+                        ptr.getClass().insertObjectPhysics(ptr, model, rotation, *mPhysics);
+                    }
+                }
+                return true;
+            });
+        }
+
         auto cellsPositionsToLoad = cellsToLoad(mActiveCells,mHalfGridSize);
         auto cellsPositionsToLoadInactive = cellsToLoad(mInactiveCells,mHalfGridSize+1);
 

From 18f297a4e052b51d914e0158462021cda9602815 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 11 Mar 2021 20:37:38 +0100
Subject: [PATCH 0951/2859] Allow a missing implicit argument for GetDistance

---
 apps/openmw/mwscript/transformationextensions.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index 825306d650..096e78d34b 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -42,10 +42,19 @@ namespace MWScript
 
                 void execute (Interpreter::Runtime& runtime) override
                 {
-                    MWWorld::Ptr from = R()(runtime);
+                    MWWorld::Ptr from = R()(runtime, !R::implicit);
                     std::string name = runtime.getStringLiteral (runtime[0].mInteger);
                     runtime.pop();
 
+                    if (from.isEmpty())
+                    {
+                        std::string error = "Missing implicit ref";
+                        runtime.getContext().report(error);
+                        Log(Debug::Error) << error;
+                        runtime.push(0.f);
+                        return;
+                    }
+
                     if (from.getContainerStore()) // is the object contained?
                     {
                         MWWorld::Ptr container = MWBase::Environment::get().getWorld()->findContainer(from);

From d138602bd390c7c0d704cdeef7406dd2b62222cd Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 5 Jul 2021 18:41:43 +0200
Subject: [PATCH 0952/2859] Add changelog entry

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 705cc21bf0..cf7caabdc0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@
 
     Bug #3737: Scripts from The Underground 2 .esp do not play (all patched versions)
     Bug #3846: Strings starting with "-" fail to compile if not enclosed in quotes
+    Bug #3905: Great House Dagoth issues
+    Bug #5120: Scripted object spawning updates physics system
     Bug #5379: Wandering NPCs falling through cantons
     Bug #5453: Magic effect VFX are offset for creatures
     Bug #5483: AutoCalc flag is not used to calculate spells cost

From 796617fa0cff4cf2355c99aea57049147cb61d1a Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 5 Jul 2021 22:00:43 +0200
Subject: [PATCH 0953/2859] Allow activators to be activated using telekinesis

---
 CHANGELOG.md                      | 1 +
 apps/openmw/mwclass/activator.cpp | 4 ----
 apps/openmw/mwclass/activator.hpp | 3 ---
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 705cc21bf0..1cc72e4a09 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
     Bug #6129: Player avatar not displayed correctly for large window sizes when GUI scaling active
     Bug #6131: Item selection in the avatar window not working correctly for large window sizes
     Bug #6133: Cannot reliably sneak or steal in the sight of the NPCs siding with player
+    Feature #5489: MCP: Telekinesis fix for activators
 
 0.47.0
 ------
diff --git a/apps/openmw/mwclass/activator.cpp b/apps/openmw/mwclass/activator.cpp
index 0b4d9ef836..364eb6ca5c 100644
--- a/apps/openmw/mwclass/activator.cpp
+++ b/apps/openmw/mwclass/activator.cpp
@@ -92,10 +92,6 @@ namespace MWClass
         return !getName(ptr).empty();
     }
 
-    bool Activator::allowTelekinesis(const MWWorld::ConstPtr &ptr) const {
-        return false;
-    }
-
     MWGui::ToolTipInfo Activator::getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const
     {
         const MWWorld::LiveCellRef<ESM::Activator> *ref = ptr.get<ESM::Activator>();
diff --git a/apps/openmw/mwclass/activator.hpp b/apps/openmw/mwclass/activator.hpp
index 7af47680b3..a0aefd075a 100644
--- a/apps/openmw/mwclass/activator.hpp
+++ b/apps/openmw/mwclass/activator.hpp
@@ -25,9 +25,6 @@ namespace MWClass
             bool hasToolTip (const MWWorld::ConstPtr& ptr) const override;
             ///< @return true if this object has a tooltip when focused (default implementation: true)
 
-            bool allowTelekinesis(const MWWorld::ConstPtr& ptr) const override;
-            ///< Return whether this class of object can be activated with telekinesis
-
             MWGui::ToolTipInfo getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const override;
             ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
 

From f8aefc7f0b591619c17a7f4b56575d4936dcf192 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Tue, 6 Jul 2021 07:02:41 +1000
Subject: [PATCH 0954/2859] Update the changelog.

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23814425a8..3b389dd7d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
     Bug #5453: Magic effect VFX are offset for creatures
     Bug #5483: AutoCalc flag is not used to calculate spells cost
     Bug #6101: Disarming trapped unlocked owned objects isn't considered a crime
+    Task #6017: Separate persistent and temporary cell references when saving
 
 0.47.0
 ------

From 1f5b20ef7de8880a3eb9a32a2b7ca1fb3649b0c0 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Tue, 6 Jul 2021 11:43:30 +1000
Subject: [PATCH 0955/2859] test fix for missing refs

---
 apps/openmw/mwworld/cellstore.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 051273f21d..e8d46b1574 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -610,9 +610,17 @@ namespace MWWorld
                 ref.mRefNum.mContentFile = ESM::RefNum::RefNum_NoContentFile;
 
                 // Get each reference in turn
+                ESM::MovedCellRef cMRef;
+                cMRef.mRefNum.mIndex = 0;
                 bool deleted = false;
-                while(mCell->getNextRef(esm[index], ref, deleted))
+                while(mCell->getNextRef(esm[index], ref, deleted, /*ignoreMoves*/true, &cMRef))
                 {
+                    if (cMRef.mRefNum.mIndex)
+                    {
+                        cMRef.mRefNum.mIndex = 0;
+                        continue; // ignore refs that are moved
+                    }
+
                     // Don't load reference if it was moved to a different cell.
                     ESM::MovedCellRefTracker::const_iterator iter =
                         std::find(mCell->mMovedRefs.begin(), mCell->mMovedRefs.end(), ref.mRefNum);

From 4b3de46bfa23c3f9bc9ecdf4798b33d5d6af8828 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Tue, 6 Jul 2021 12:37:02 +1000
Subject: [PATCH 0956/2859] Use enums in place of magic numbers.  Ensure
 Creature and NPC cell references are always saved as persistent.

---
 apps/opencs/model/doc/savingstages.cpp      | 6 +++++-
 apps/opencs/model/world/refidadapterimp.hpp | 6 +++---
 apps/openmw/mwclass/creature.cpp            | 2 +-
 apps/openmw/mwclass/npc.cpp                 | 2 +-
 components/esm/esmcommon.hpp                | 5 +++++
 components/esm/loadstat.cpp                 | 4 ++--
 6 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/apps/opencs/model/doc/savingstages.cpp b/apps/opencs/model/doc/savingstages.cpp
index 27b31251e5..8c17a3b8c1 100644
--- a/apps/opencs/model/doc/savingstages.cpp
+++ b/apps/opencs/model/doc/savingstages.cpp
@@ -342,8 +342,12 @@ void CSMDoc::WriteCellCollectionStage::perform (int stage, Messages& messages)
 
                 CSMWorld::CellRef refRecord = ref.get();
 
+                CSMWorld::RefIdData::LocalIndex localIndex = refIdData.searchId(refRecord.mRefID);
                 unsigned int recordFlags = refIdData.getRecordFlags(refRecord.mRefID);
-                bool isPersistent = ((recordFlags & 0x00000400) != 0) || refRecord.mTeleport;
+                bool isPersistent = ((recordFlags & ESM::FLAG_Persistent) != 0)
+                    || refRecord.mTeleport
+                    || localIndex.second == CSMWorld::UniversalId::Type_Creature
+                    || localIndex.second == CSMWorld::UniversalId::Type_Npc;
 
                 if (isPersistent)
                     persistentRefs.push_back(*iter);
diff --git a/apps/opencs/model/world/refidadapterimp.hpp b/apps/opencs/model/world/refidadapterimp.hpp
index 210deca69b..1d1b5a94a6 100644
--- a/apps/opencs/model/world/refidadapterimp.hpp
+++ b/apps/opencs/model/world/refidadapterimp.hpp
@@ -153,7 +153,7 @@ namespace CSMWorld
             return QString::fromUtf8 (record.get().mModel.c_str());
 
         if (column==mModel.mPersistence)
-            return (record.get().mRecordFlags & 0x00000400) != 0;
+            return (record.get().mRecordFlags & ESM::FLAG_Persistent) != 0;
 
         return BaseRefIdAdapter<RecordT>::getData (column, data, index);
     }
@@ -171,9 +171,9 @@ namespace CSMWorld
         else if (column==mModel.mPersistence)
         {
             if (value.toInt() != 0)
-                record2.mRecordFlags |= 0x00000400;
+                record2.mRecordFlags |= ESM::FLAG_Persistent;
             else
-                record2.mRecordFlags &= ~0x00000400;
+                record2.mRecordFlags &= ~ESM::FLAG_Persistent;
         }
         else
         {
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 0a40139d36..141bf99e92 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -588,7 +588,7 @@ namespace MWClass
     bool Creature::isPersistent(const MWWorld::ConstPtr &actor) const
     {
         const MWWorld::LiveCellRef<ESM::Creature>* ref = actor.get<ESM::Creature>();
-        return (ref->mBase->mRecordFlags & 0x0400) != 0;
+        return (ref->mBase->mRecordFlags & ESM::FLAG_Persistent) != 0;
     }
 
     std::string Creature::getSoundIdFromSndGen(const MWWorld::Ptr &ptr, const std::string &name) const
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 1951f964bc..6131f86269 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -403,7 +403,7 @@ namespace MWClass
     bool Npc::isPersistent(const MWWorld::ConstPtr &actor) const
     {
         const MWWorld::LiveCellRef<ESM::NPC>* ref = actor.get<ESM::NPC>();
-        return (ref->mBase->mRecordFlags & 0x0400) != 0;
+        return (ref->mBase->mRecordFlags & ESM::FLAG_Persistent) != 0;
     }
 
     std::string Npc::getModel(const MWWorld::ConstPtr &ptr) const
diff --git a/components/esm/esmcommon.hpp b/components/esm/esmcommon.hpp
index 749e9a85d6..10e05de905 100644
--- a/components/esm/esmcommon.hpp
+++ b/components/esm/esmcommon.hpp
@@ -16,6 +16,11 @@ enum Version
     VER_13 = 0x3fa66666
   };
 
+enum RecordFlag
+  {
+    FLAG_Persistent = 0x00000400,
+    FLAG_Blocked    = 0x00002000
+  };
 
 // CRTP for FIXED_STRING class, a structure used for holding fixed-length strings
 template< template<size_t> class DERIVED, size_t SIZE>
diff --git a/components/esm/loadstat.cpp b/components/esm/loadstat.cpp
index 0c97662d7e..543e76bc85 100644
--- a/components/esm/loadstat.cpp
+++ b/components/esm/loadstat.cpp
@@ -12,8 +12,8 @@ namespace ESM
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
-        //bool isBlocked = (mRecordFlags & 0x00002000) != 0;
-        //bool isPersistent = (mRecordFlags & 0x00000400) != 0;
+        //bool isBlocked = (mRecordFlags & ESM::FLAG_Blocked) != 0;
+        //bool isPersistent = (mRecordFlags & ESM::FLAG_Persistent) != 0;
 
         bool hasName = false;
         while (esm.hasMoreSubs())

From ec457a09c3263c09d632b2719960d149b7434f86 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Tue, 6 Jul 2021 13:45:58 +1000
Subject: [PATCH 0957/2859] Fix Npc edit widget index out of bounds due to a
 removed column.

---
 apps/opencs/model/world/refidadapterimp.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/opencs/model/world/refidadapterimp.cpp b/apps/opencs/model/world/refidadapterimp.cpp
index 4013b3d00c..0dfc9945f7 100644
--- a/apps/opencs/model/world/refidadapterimp.cpp
+++ b/apps/opencs/model/world/refidadapterimp.cpp
@@ -1166,7 +1166,7 @@ void CSMWorld::NpcMiscRefIdAdapter::setNestedData (const RefIdColumn *column,
 
 int CSMWorld::NpcMiscRefIdAdapter::getNestedColumnsCount(const RefIdColumn *column, const RefIdData& data) const
 {
-    return 9; // Level, Health, Mana, Fatigue, Disposition, Reputation, Rank, Gold, Persist
+    return 8; // Level, Health, Mana, Fatigue, Disposition, Reputation, Rank, Gold
 }
 
 int CSMWorld::NpcMiscRefIdAdapter::getNestedRowsCount(const RefIdColumn *column, const RefIdData& data, int index) const

From fea1ac2c0ff10f357ff54c6bb8a8176540fff8db Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Tue, 6 Jul 2021 14:21:17 +1000
Subject: [PATCH 0958/2859] Remove dead code from commit
 024ad3276b472e0fc58b681d10566917e4d8d44d.

---
 components/esm/cellref.cpp  | 15 ++++-----------
 components/esm/cellref.hpp  |  4 ++--
 components/esm/loadcell.cpp |  4 ++--
 components/esm/loadcell.hpp |  3 +--
 4 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/components/esm/cellref.cpp b/components/esm/cellref.cpp
index dbe5828289..3628bac1b7 100644
--- a/components/esm/cellref.cpp
+++ b/components/esm/cellref.cpp
@@ -31,10 +31,10 @@ void ESM::RefNum::save (ESMWriter &esm, bool wide, const std::string& tag) const
 }
 
 
-void ESM::CellRef::load (ESMReader& esm, bool &isDeleted, int *tempRefCount, bool wideRefNum)
+void ESM::CellRef::load (ESMReader& esm, bool &isDeleted, bool wideRefNum)
 {
     loadId(esm, wideRefNum);
-    loadData(esm, isDeleted, tempRefCount);
+    loadData(esm, isDeleted);
 }
 
 void ESM::CellRef::loadId (ESMReader& esm, bool wideRefNum)
@@ -57,7 +57,7 @@ void ESM::CellRef::loadId (ESMReader& esm, bool wideRefNum)
     }
 }
 
-void ESM::CellRef::loadData(ESMReader &esm, bool &isDeleted, int *tempRefCount)
+void ESM::CellRef::loadData(ESMReader &esm, bool &isDeleted)
 {
     isDeleted = false;
 
@@ -119,14 +119,7 @@ void ESM::CellRef::loadData(ESMReader &esm, bool &isDeleted, int *tempRefCount)
                 break;
             case ESM::FourCC<'N','A','M','0'>::value:
             {
-                if (tempRefCount && *tempRefCount == -1)
-                {
-                    esm.getHT(*tempRefCount);
-                    // TODO: check that there are no more subs following this sub
-                }
-                else
-                    esm.skipHSub();
-
+                esm.skipHSub();
                 break;
             }
             case ESM::SREC_DELE:
diff --git a/components/esm/cellref.hpp b/components/esm/cellref.hpp
index 3e7a3a2f28..c2f7ff6de5 100644
--- a/components/esm/cellref.hpp
+++ b/components/esm/cellref.hpp
@@ -107,12 +107,12 @@ namespace ESM
             Position mPos;
 
             /// Calls loadId and loadData
-            void load (ESMReader& esm, bool &isDeleted, int *tempRefCount, bool wideRefNum = false);
+            void load (ESMReader& esm, bool &isDeleted, bool wideRefNum = false);
 
             void loadId (ESMReader& esm, bool wideRefNum = false);
 
             /// Implicitly called by load
-            void loadData (ESMReader& esm, bool &isDeleted, int *tempRefCount = nullptr);
+            void loadData (ESMReader& esm, bool &isDeleted);
 
             void save (ESMWriter &esm, bool wideRefNum = false, bool inInventory = false, bool isDeleted = false) const;
 
diff --git a/components/esm/loadcell.cpp b/components/esm/loadcell.cpp
index 8aeacd5116..2cb8761938 100644
--- a/components/esm/loadcell.cpp
+++ b/components/esm/loadcell.cpp
@@ -224,7 +224,7 @@ namespace ESM
         return region + ' ' + cellGrid;
     }
 
-    bool Cell::getNextRef(ESMReader &esm, CellRef &ref, bool &isDeleted, int *tempRefCount, bool ignoreMoves, MovedCellRef *mref)
+    bool Cell::getNextRef(ESMReader &esm, CellRef &ref, bool &isDeleted, bool ignoreMoves, MovedCellRef *mref)
     {
         isDeleted = false;
 
@@ -252,7 +252,7 @@ namespace ESM
 
         if (esm.peekNextSub("FRMR"))
         {
-            ref.load (esm, isDeleted, tempRefCount);
+            ref.load (esm, isDeleted);
 
             // TODO: should count the number of temp refs and validate the number
 
diff --git a/components/esm/loadcell.hpp b/components/esm/loadcell.hpp
index ca4ca6e577..c49dc20c59 100644
--- a/components/esm/loadcell.hpp
+++ b/components/esm/loadcell.hpp
@@ -184,8 +184,7 @@ struct Cell
   /// \param ignoreMoves ignore MVRF record and read reference like a regular CellRef.
   static bool getNextRef(ESMReader &esm, 
                          CellRef &ref, 
-                         bool &isDeleted, 
-                         int *tempRefCount = nullptr, 
+                         bool &isDeleted,
                          bool ignoreMoves = false, 
                          MovedCellRef *mref = nullptr);
 

From ae4ddd810fac1d19d077bf8ae0b90dcb93432024 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Tue, 6 Jul 2021 14:45:45 +1000
Subject: [PATCH 0959/2859] More dead code removal.

---
 apps/opencs/model/world/refcollection.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/apps/opencs/model/world/refcollection.cpp b/apps/opencs/model/world/refcollection.cpp
index 2f5db65636..dfdb8e73bf 100644
--- a/apps/opencs/model/world/refcollection.cpp
+++ b/apps/opencs/model/world/refcollection.cpp
@@ -19,9 +19,8 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
     ESM::MovedCellRef mref;
     mref.mRefNum.mIndex = 0;
     bool isDeleted = false;
-    int tempRefCount = cell.get().mRefNumCounter; // if initially non-zero, all refs in cell are temp
 
-    while (ESM::Cell::getNextRef(reader, ref, isDeleted, &tempRefCount, true, &mref))
+    while (ESM::Cell::getNextRef(reader, ref, isDeleted, true, &mref))
     {
         // Keep mOriginalCell empty when in modified (as an indicator that the
         // original cell will always be equal the current cell).
@@ -60,8 +59,6 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
         else
             ref.mCell = cell2.mId;
 
-        // TODO: update cell.get().mRefNumCounter with tempRefCount?
-
         mref.mRefNum.mIndex = 0;
 
         // ignore content file number

From a47ebf5c9eb517453ec1fa6b436c0ec328dfc245 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Tue, 6 Jul 2021 14:57:58 +1000
Subject: [PATCH 0960/2859] For consistency with TES CS, force DELE record
 writes to be 4 bytes (currently writes 1 byte).

---
 CHANGELOG.md                    | 1 +
 components/esm/cellref.cpp      | 2 +-
 components/esm/debugprofile.cpp | 2 +-
 components/esm/filter.cpp       | 2 +-
 components/esm/loadacti.cpp     | 2 +-
 components/esm/loadalch.cpp     | 2 +-
 components/esm/loadappa.cpp     | 2 +-
 components/esm/loadarmo.cpp     | 2 +-
 components/esm/loadbody.cpp     | 2 +-
 components/esm/loadbook.cpp     | 2 +-
 components/esm/loadbsgn.cpp     | 2 +-
 components/esm/loadcell.cpp     | 2 +-
 components/esm/loadclas.cpp     | 2 +-
 components/esm/loadclot.cpp     | 2 +-
 components/esm/loadcont.cpp     | 2 +-
 components/esm/loadcrea.cpp     | 2 +-
 components/esm/loaddial.cpp     | 2 +-
 components/esm/loaddoor.cpp     | 2 +-
 components/esm/loadench.cpp     | 2 +-
 components/esm/loadfact.cpp     | 2 +-
 components/esm/loadinfo.cpp     | 2 +-
 components/esm/loadingr.cpp     | 2 +-
 components/esm/loadland.cpp     | 2 +-
 components/esm/loadlevlist.cpp  | 2 +-
 components/esm/loadligh.cpp     | 2 +-
 components/esm/loadlock.cpp     | 2 +-
 components/esm/loadltex.cpp     | 2 +-
 components/esm/loadmisc.cpp     | 2 +-
 components/esm/loadnpc.cpp      | 2 +-
 components/esm/loadpgrd.cpp     | 2 +-
 components/esm/loadprob.cpp     | 2 +-
 components/esm/loadrace.cpp     | 2 +-
 components/esm/loadregn.cpp     | 2 +-
 components/esm/loadrepa.cpp     | 2 +-
 components/esm/loadscpt.cpp     | 2 +-
 components/esm/loadsndg.cpp     | 2 +-
 components/esm/loadsoun.cpp     | 2 +-
 components/esm/loadspel.cpp     | 2 +-
 components/esm/loadsscr.cpp     | 2 +-
 components/esm/loadstat.cpp     | 2 +-
 components/esm/loadweap.cpp     | 2 +-
 41 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 705cc21bf0..b711a20b68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
     Bug #6129: Player avatar not displayed correctly for large window sizes when GUI scaling active
     Bug #6131: Item selection in the avatar window not working correctly for large window sizes
     Bug #6133: Cannot reliably sneak or steal in the sight of the NPCs siding with player
+    Editor: For consistency with TES CS make DELE records 4 bytes long
 
 0.47.0
 ------
diff --git a/components/esm/cellref.cpp b/components/esm/cellref.cpp
index 20edf00a8b..733547216b 100644
--- a/components/esm/cellref.cpp
+++ b/components/esm/cellref.cpp
@@ -145,7 +145,7 @@ void ESM::CellRef::save (ESMWriter &esm, bool wideRefNum, bool inInventory, bool
     esm.writeHNCString("NAME", mRefID);
 
     if (isDeleted) {
-        esm.writeHNCString("DELE", "");
+        esm.writeHNString("DELE", "", 3);
         return;
     }
 
diff --git a/components/esm/debugprofile.cpp b/components/esm/debugprofile.cpp
index 17249d8a3b..1dcf661fc9 100644
--- a/components/esm/debugprofile.cpp
+++ b/components/esm/debugprofile.cpp
@@ -44,7 +44,7 @@ void ESM::DebugProfile::save (ESMWriter& esm, bool isDeleted) const
 
     if (isDeleted)
     {
-        esm.writeHNCString("DELE", "");
+        esm.writeHNString("DELE", "", 3);
         return;
     }
 
diff --git a/components/esm/filter.cpp b/components/esm/filter.cpp
index 4f0519f80b..5bae1ed03e 100644
--- a/components/esm/filter.cpp
+++ b/components/esm/filter.cpp
@@ -42,7 +42,7 @@ void ESM::Filter::save (ESMWriter& esm, bool isDeleted) const
 
     if (isDeleted)
     {
-        esm.writeHNCString("DELE", "");
+        esm.writeHNString("DELE", "", 3);
         return;
     }
 
diff --git a/components/esm/loadacti.cpp b/components/esm/loadacti.cpp
index ba35535b8f..57c55d6760 100644
--- a/components/esm/loadacti.cpp
+++ b/components/esm/loadacti.cpp
@@ -50,7 +50,7 @@ namespace ESM
 
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
             return;
         }
 
diff --git a/components/esm/loadalch.cpp b/components/esm/loadalch.cpp
index 85c24dc2d1..ba904f5037 100644
--- a/components/esm/loadalch.cpp
+++ b/components/esm/loadalch.cpp
@@ -65,7 +65,7 @@ namespace ESM
 
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
             return;
         }
 
diff --git a/components/esm/loadappa.cpp b/components/esm/loadappa.cpp
index 1bd1f93798..b448e778cf 100644
--- a/components/esm/loadappa.cpp
+++ b/components/esm/loadappa.cpp
@@ -61,7 +61,7 @@ namespace ESM
 
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
             return;
         }
 
diff --git a/components/esm/loadarmo.cpp b/components/esm/loadarmo.cpp
index 6743702539..9e2eca9a2c 100644
--- a/components/esm/loadarmo.cpp
+++ b/components/esm/loadarmo.cpp
@@ -99,7 +99,7 @@ namespace ESM
 
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
             return;
         }
 
diff --git a/components/esm/loadbody.cpp b/components/esm/loadbody.cpp
index 3e5895c2c6..4ddefc92c7 100644
--- a/components/esm/loadbody.cpp
+++ b/components/esm/loadbody.cpp
@@ -55,7 +55,7 @@ namespace ESM
 
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
             return;
         }
 
diff --git a/components/esm/loadbook.cpp b/components/esm/loadbook.cpp
index ee3c0c4af5..c6d1d618de 100644
--- a/components/esm/loadbook.cpp
+++ b/components/esm/loadbook.cpp
@@ -66,7 +66,7 @@ namespace ESM
 
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
             return;
         }
 
diff --git a/components/esm/loadbsgn.cpp b/components/esm/loadbsgn.cpp
index e3b2f76a3a..1f679af39a 100644
--- a/components/esm/loadbsgn.cpp
+++ b/components/esm/loadbsgn.cpp
@@ -56,7 +56,7 @@ namespace ESM
 
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
             return;
         }
         esm.writeHNOCString("FNAM", mName);
diff --git a/components/esm/loadcell.cpp b/components/esm/loadcell.cpp
index bf70aad96f..0356cc646b 100644
--- a/components/esm/loadcell.cpp
+++ b/components/esm/loadcell.cpp
@@ -167,7 +167,7 @@ namespace ESM
 
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
             return;
         }
 
diff --git a/components/esm/loadclas.cpp b/components/esm/loadclas.cpp
index 1e18bc0540..b76fc57067 100644
--- a/components/esm/loadclas.cpp
+++ b/components/esm/loadclas.cpp
@@ -86,7 +86,7 @@ namespace ESM
 
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
             return;
         }
 
diff --git a/components/esm/loadclot.cpp b/components/esm/loadclot.cpp
index 12f0d495d5..9546eec2dd 100644
--- a/components/esm/loadclot.cpp
+++ b/components/esm/loadclot.cpp
@@ -69,7 +69,7 @@ namespace ESM
 
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
             return;
         }
 
diff --git a/components/esm/loadcont.cpp b/components/esm/loadcont.cpp
index 107aea7cf6..077fc2145a 100644
--- a/components/esm/loadcont.cpp
+++ b/components/esm/loadcont.cpp
@@ -95,7 +95,7 @@ namespace ESM
 
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
             return;
         }
 
diff --git a/components/esm/loadcrea.cpp b/components/esm/loadcrea.cpp
index 52138e2232..ecb080f75e 100644
--- a/components/esm/loadcrea.cpp
+++ b/components/esm/loadcrea.cpp
@@ -115,7 +115,7 @@ namespace ESM {
 
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
             return;
         }
 
diff --git a/components/esm/loaddial.cpp b/components/esm/loaddial.cpp
index d7e0a6ee17..59fb13484b 100644
--- a/components/esm/loaddial.cpp
+++ b/components/esm/loaddial.cpp
@@ -61,7 +61,7 @@ namespace ESM
         esm.writeHNCString("NAME", mId);
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
         }
         else
         {
diff --git a/components/esm/loaddoor.cpp b/components/esm/loaddoor.cpp
index 523d8a1efc..d99418add2 100644
--- a/components/esm/loaddoor.cpp
+++ b/components/esm/loaddoor.cpp
@@ -57,7 +57,7 @@ namespace ESM
 
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
             return;
         }
 
diff --git a/components/esm/loadench.cpp b/components/esm/loadench.cpp
index 8c4dd8c644..3c1a2f1eda 100644
--- a/components/esm/loadench.cpp
+++ b/components/esm/loadench.cpp
@@ -53,7 +53,7 @@ namespace ESM
 
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
             return;
         }
 
diff --git a/components/esm/loadfact.cpp b/components/esm/loadfact.cpp
index ff2fbf66d1..bd0962721b 100644
--- a/components/esm/loadfact.cpp
+++ b/components/esm/loadfact.cpp
@@ -90,7 +90,7 @@ namespace ESM
 
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
             return;
         }
 
diff --git a/components/esm/loadinfo.cpp b/components/esm/loadinfo.cpp
index 38bb163e61..15921249f4 100644
--- a/components/esm/loadinfo.cpp
+++ b/components/esm/loadinfo.cpp
@@ -100,7 +100,7 @@ namespace ESM
 
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
             return;
         }
 
diff --git a/components/esm/loadingr.cpp b/components/esm/loadingr.cpp
index a18e321ff7..a19a9d5dd9 100644
--- a/components/esm/loadingr.cpp
+++ b/components/esm/loadingr.cpp
@@ -84,7 +84,7 @@ namespace ESM
 
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
             return;
         }
 
diff --git a/components/esm/loadland.cpp b/components/esm/loadland.cpp
index d23452d76e..1fac79082d 100644
--- a/components/esm/loadland.cpp
+++ b/components/esm/loadland.cpp
@@ -123,7 +123,7 @@ namespace ESM
 
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
             return;
         }
 
diff --git a/components/esm/loadlevlist.cpp b/components/esm/loadlevlist.cpp
index 0aed15aa94..26751b8925 100644
--- a/components/esm/loadlevlist.cpp
+++ b/components/esm/loadlevlist.cpp
@@ -80,7 +80,7 @@ namespace ESM
 
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
             return;
         }
 
diff --git a/components/esm/loadligh.cpp b/components/esm/loadligh.cpp
index 2a6dac14b0..2e3f711eb7 100644
--- a/components/esm/loadligh.cpp
+++ b/components/esm/loadligh.cpp
@@ -63,7 +63,7 @@ namespace ESM
 
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
             return;
         }
 
diff --git a/components/esm/loadlock.cpp b/components/esm/loadlock.cpp
index b14353ec5a..6f02909b98 100644
--- a/components/esm/loadlock.cpp
+++ b/components/esm/loadlock.cpp
@@ -61,7 +61,7 @@ namespace ESM
 
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
             return;
         }
 
diff --git a/components/esm/loadltex.cpp b/components/esm/loadltex.cpp
index 3e150f9c0c..6bdc40e5fc 100644
--- a/components/esm/loadltex.cpp
+++ b/components/esm/loadltex.cpp
@@ -53,7 +53,7 @@ namespace ESM
 
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
         }
     }
 
diff --git a/components/esm/loadmisc.cpp b/components/esm/loadmisc.cpp
index 3ba6626505..90fcd618e8 100644
--- a/components/esm/loadmisc.cpp
+++ b/components/esm/loadmisc.cpp
@@ -61,7 +61,7 @@ namespace ESM
 
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
             return;
         }
 
diff --git a/components/esm/loadnpc.cpp b/components/esm/loadnpc.cpp
index 2bb0811ac9..34d806072d 100644
--- a/components/esm/loadnpc.cpp
+++ b/components/esm/loadnpc.cpp
@@ -135,7 +135,7 @@ namespace ESM
 
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
             return;
         }
 
diff --git a/components/esm/loadpgrd.cpp b/components/esm/loadpgrd.cpp
index 9abeba2605..7bf60ca5fc 100644
--- a/components/esm/loadpgrd.cpp
+++ b/components/esm/loadpgrd.cpp
@@ -156,7 +156,7 @@ namespace ESM
 
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
             return;
         }
 
diff --git a/components/esm/loadprob.cpp b/components/esm/loadprob.cpp
index 6307df3298..ceb19a77b6 100644
--- a/components/esm/loadprob.cpp
+++ b/components/esm/loadprob.cpp
@@ -61,7 +61,7 @@ namespace ESM
 
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
             return;
         }
 
diff --git a/components/esm/loadrace.cpp b/components/esm/loadrace.cpp
index fbdf22fb6d..ce3cc95bf8 100644
--- a/components/esm/loadrace.cpp
+++ b/components/esm/loadrace.cpp
@@ -68,7 +68,7 @@ namespace ESM
 
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
             return;
         }
 
diff --git a/components/esm/loadregn.cpp b/components/esm/loadregn.cpp
index ada33dc3f8..91ea92e305 100644
--- a/components/esm/loadregn.cpp
+++ b/components/esm/loadregn.cpp
@@ -89,7 +89,7 @@ namespace ESM
 
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
             return;
         }
 
diff --git a/components/esm/loadrepa.cpp b/components/esm/loadrepa.cpp
index c04691c12f..c86227a045 100644
--- a/components/esm/loadrepa.cpp
+++ b/components/esm/loadrepa.cpp
@@ -61,7 +61,7 @@ namespace ESM
 
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
             return;
         }
 
diff --git a/components/esm/loadscpt.cpp b/components/esm/loadscpt.cpp
index 1ad90dbc31..19602fef62 100644
--- a/components/esm/loadscpt.cpp
+++ b/components/esm/loadscpt.cpp
@@ -155,7 +155,7 @@ namespace ESM
 
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
             return;
         }
 
diff --git a/components/esm/loadsndg.cpp b/components/esm/loadsndg.cpp
index 9bd806641b..c6ea930a20 100644
--- a/components/esm/loadsndg.cpp
+++ b/components/esm/loadsndg.cpp
@@ -54,7 +54,7 @@ namespace ESM
 
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
             return;
         }
 
diff --git a/components/esm/loadsoun.cpp b/components/esm/loadsoun.cpp
index 3b3dc1eacd..ccb5f6fdce 100644
--- a/components/esm/loadsoun.cpp
+++ b/components/esm/loadsoun.cpp
@@ -52,7 +52,7 @@ namespace ESM
 
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
             return;
         }
 
diff --git a/components/esm/loadspel.cpp b/components/esm/loadspel.cpp
index 947e6c9ec8..34e146501c 100644
--- a/components/esm/loadspel.cpp
+++ b/components/esm/loadspel.cpp
@@ -59,7 +59,7 @@ namespace ESM
 
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
             return;
         }
 
diff --git a/components/esm/loadsscr.cpp b/components/esm/loadsscr.cpp
index f8854493b9..f436c32a1c 100644
--- a/components/esm/loadsscr.cpp
+++ b/components/esm/loadsscr.cpp
@@ -47,7 +47,7 @@ namespace ESM
         esm.writeHNCString("NAME", mId);
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
         }
         else
         {
diff --git a/components/esm/loadstat.cpp b/components/esm/loadstat.cpp
index 6c9de22bd1..14bac10f95 100644
--- a/components/esm/loadstat.cpp
+++ b/components/esm/loadstat.cpp
@@ -43,7 +43,7 @@ namespace ESM
         esm.writeHNCString("NAME", mId);
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
         }
         else
         {
diff --git a/components/esm/loadweap.cpp b/components/esm/loadweap.cpp
index 4a77ff6a00..b57359e29d 100644
--- a/components/esm/loadweap.cpp
+++ b/components/esm/loadweap.cpp
@@ -62,7 +62,7 @@ namespace ESM
 
         if (isDeleted)
         {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
             return;
         }
 

From 1196e0cfe6c073869b27ea190f3718d2e5892199 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 24 Jun 2021 22:02:52 +0200
Subject: [PATCH 0961/2859] Change disposition to work like vanilla

---
 CHANGELOG.md                                  |  2 +
 apps/openmw/mwbase/dialoguemanager.hpp        |  1 -
 apps/openmw/mwbase/mechanicsmanager.hpp       |  4 +-
 apps/openmw/mwdialogue/dialoguemanagerimp.cpp | 76 +++++++++++--------
 apps/openmw/mwdialogue/dialoguemanagerimp.hpp |  8 +-
 .../mwmechanics/mechanicsmanagerimp.cpp       | 31 ++++----
 .../mwmechanics/mechanicsmanagerimp.hpp       |  4 +-
 7 files changed, 72 insertions(+), 54 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d00d576eec..32dd61c190 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,10 +4,12 @@
     Bug #3737: Scripts from The Underground 2 .esp do not play (all patched versions)
     Bug #3846: Strings starting with "-" fail to compile if not enclosed in quotes
     Bug #3905: Great House Dagoth issues
+    Bug #5100: Persuasion doesn't always clamp the resulting disposition
     Bug #5120: Scripted object spawning updates physics system
     Bug #5379: Wandering NPCs falling through cantons
     Bug #5453: Magic effect VFX are offset for creatures
     Bug #5483: AutoCalc flag is not used to calculate spells cost
+    Bug #5842: GetDisposition adds temporary disposition change from different actors
     Bug #6037: Morrowind Content Language Cannot be Set to English in OpenMW Launcher
     Bug #6066: addtopic "return" does not work from within script. No errors thrown
     Bug #6067: esp loader fails in for certain subrecord orders
diff --git a/apps/openmw/mwbase/dialoguemanager.hpp b/apps/openmw/mwbase/dialoguemanager.hpp
index 6103921e02..dc1f6f9667 100644
--- a/apps/openmw/mwbase/dialoguemanager.hpp
+++ b/apps/openmw/mwbase/dialoguemanager.hpp
@@ -94,7 +94,6 @@ namespace MWBase
             virtual bool checkServiceRefused (ResponseCallback* callback, ServiceType service = ServiceType::Any) = 0;
 
             virtual void persuade (int type, ResponseCallback* callback) = 0;
-            virtual int getTemporaryDispositionChange () const = 0;
 
             /// @note Controlled by an option, gets discarded when dialogue ends by default
             virtual void applyBarterDispositionChange (int delta) = 0;
diff --git a/apps/openmw/mwbase/mechanicsmanager.hpp b/apps/openmw/mwbase/mechanicsmanager.hpp
index d6e948d685..b638ecade9 100644
--- a/apps/openmw/mwbase/mechanicsmanager.hpp
+++ b/apps/openmw/mwbase/mechanicsmanager.hpp
@@ -100,7 +100,7 @@ namespace MWBase
             virtual int getBarterOffer(const MWWorld::Ptr& ptr,int basePrice, bool buying) = 0;
             ///< This is used by every service to determine the price of objects given the trading skills of the player and NPC.
 
-            virtual int getDerivedDisposition(const MWWorld::Ptr& ptr, bool addTemporaryDispositionChange = true) = 0;
+            virtual int getDerivedDisposition(const MWWorld::Ptr& ptr, bool clamp = true) = 0;
             ///< Calculate the diposition of an NPC toward the player.
 
             virtual int countDeaths (const std::string& id) const = 0;
@@ -156,7 +156,7 @@ namespace MWBase
                 PT_Bribe100,
                 PT_Bribe1000
             };
-            virtual void getPersuasionDispositionChange (const MWWorld::Ptr& npc, PersuasionType type, bool& success, float& tempChange, float& permChange) = 0;
+            virtual void getPersuasionDispositionChange (const MWWorld::Ptr& npc, PersuasionType type, bool& success, int& tempChange, int& permChange) = 0;
             ///< Perform a persuasion action on NPC
 
             virtual void forceStateUpdate(const MWWorld::Ptr &ptr) = 0;
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index 3c6349ad85..8aa6acd8ed 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -52,8 +52,9 @@ namespace MWDialogue
       , mCompilerContext (MWScript::CompilerContext::Type_Dialogue)
       , mErrorHandler()
       , mTalkedTo(false)
-      , mTemporaryDispositionChange(0.f)
-      , mPermanentDispositionChange(0.f)
+      , mOriginalDisposition(0)
+      , mCurrentDisposition(0)
+      , mPermanentDispositionChange(0)
     {
         mChoice = -1;
         mIsInChoice = false;
@@ -65,7 +66,8 @@ namespace MWDialogue
     {
         mKnownTopics.clear();
         mTalkedTo = false;
-        mTemporaryDispositionChange = 0;
+        mOriginalDisposition = 0;
+        mCurrentDisposition = 0;
         mPermanentDispositionChange = 0;
     }
 
@@ -98,6 +100,20 @@ namespace MWDialogue
         }
     }
 
+    void DialogueManager::updateOriginalDisposition()
+    {
+        if(mActor.getClass().isNpc())
+        {
+            const auto& stats = mActor.getClass().getNpcStats(mActor);
+            // Disposition changed by script; discard our preconceived notions
+            if(stats.getBaseDisposition() != mCurrentDisposition)
+            {
+                mCurrentDisposition = stats.getBaseDisposition();
+                mOriginalDisposition = mCurrentDisposition;
+            }
+        }
+    }
+
     bool DialogueManager::startDialogue (const MWWorld::Ptr& actor, ResponseCallback* callback)
     {
         updateGlobals();
@@ -107,8 +123,7 @@ namespace MWDialogue
             return false;
 
         mLastTopic = "";
-        mPermanentDispositionChange = 0;
-        mTemporaryDispositionChange = 0;
+        // Note that we intentionally don't reset mPermanentDispositionChange
 
         mChoice = -1;
         mIsInChoice = false;
@@ -398,19 +413,21 @@ namespace MWDialogue
 
     void DialogueManager::goodbyeSelected()
     {
-        // Apply disposition change to NPC's base disposition
-        if (mActor.getClass().isNpc())
+        // Apply disposition change to NPC's base disposition if we **think** we need to change something
+        if ((mPermanentDispositionChange || mOriginalDisposition != mCurrentDisposition) && mActor.getClass().isNpc())
         {
-            // Clamp permanent disposition change so that final disposition doesn't go below 0 (could happen with intimidate)       
-            float curDisp = static_cast<float>(MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mActor, false));
-            if (curDisp + mPermanentDispositionChange < 0)
-                mPermanentDispositionChange = -curDisp;
-
+            updateOriginalDisposition();
             MWMechanics::NpcStats& npcStats = mActor.getClass().getNpcStats(mActor);
-            npcStats.setBaseDisposition(static_cast<int>(npcStats.getBaseDisposition() + mPermanentDispositionChange));
+            // Clamp permanent disposition change so that final disposition doesn't go below 0 (could happen with intimidate)
+            npcStats.setBaseDisposition(0);
+            int zero = MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mActor, false);
+            int disposition = std::min(100 - zero, std::max(mOriginalDisposition + mPermanentDispositionChange, -zero));
+
+            npcStats.setBaseDisposition(disposition);
         }
         mPermanentDispositionChange = 0;
-        mTemporaryDispositionChange = 0;
+        mOriginalDisposition = 0;
+        mCurrentDisposition = 0;
     }
 
     void DialogueManager::questionAnswered (int answer, ResponseCallback* callback)
@@ -490,20 +507,17 @@ namespace MWDialogue
     void DialogueManager::persuade(int type, ResponseCallback* callback)
     {
         bool success;
-        float temp, perm;
+        int temp, perm;
         MWBase::Environment::get().getMechanicsManager()->getPersuasionDispositionChange(
                     mActor, MWBase::MechanicsManager::PersuasionType(type),
                     success, temp, perm);
-        mTemporaryDispositionChange += temp;
+        updateOriginalDisposition();
+        if(temp > 0 && perm > 0 && mOriginalDisposition + perm + mPermanentDispositionChange < 0)
+            perm = -(mOriginalDisposition + mPermanentDispositionChange);
+        mCurrentDisposition += temp;
+        mActor.getClass().getNpcStats(mActor).setBaseDisposition(mCurrentDisposition);
         mPermanentDispositionChange += perm;
 
-        // change temp disposition so that final disposition is between 0...100
-        float curDisp = static_cast<float>(MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mActor, false));
-        if (curDisp + mTemporaryDispositionChange < 0)
-            mTemporaryDispositionChange = -curDisp;
-        else if (curDisp + mTemporaryDispositionChange > 100)
-            mTemporaryDispositionChange = 100 - curDisp;
-
         MWWorld::Ptr player = MWMechanics::getPlayer();
         player.getClass().skillUsageSucceeded(player, ESM::Skill::Speechcraft, success ? 0 : 1);
 
@@ -539,16 +553,16 @@ namespace MWDialogue
         executeTopic (text + (success ? " Success" : " Fail"), callback);
     }
 
-    int DialogueManager::getTemporaryDispositionChange() const
-    {
-        return static_cast<int>(mTemporaryDispositionChange);
-    }
-
     void DialogueManager::applyBarterDispositionChange(int delta)
     {
-        mTemporaryDispositionChange += delta;
-        if (Settings::Manager::getBool("barter disposition change is permanent", "Game"))
-            mPermanentDispositionChange += delta;
+        if(mActor.getClass().isNpc())
+        {
+            updateOriginalDisposition();
+            mCurrentDisposition += delta;
+            mActor.getClass().getNpcStats(mActor).setBaseDisposition(mCurrentDisposition);
+            if (Settings::Manager::getBool("barter disposition change is permanent", "Game"))
+                mPermanentDispositionChange += delta;
+        }
     }
 
     bool DialogueManager::checkServiceRefused(ResponseCallback* callback, ServiceType service)
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.hpp b/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
index b35bee6d43..ab2625ff5a 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
@@ -47,8 +47,9 @@ namespace MWDialogue
 
             std::vector<std::pair<std::string, int> > mChoices;
 
-            float mTemporaryDispositionChange;
-            float mPermanentDispositionChange;
+            int mOriginalDisposition;
+            int mCurrentDisposition;
+            int mPermanentDispositionChange;
 
             void parseText (const std::string& text);
 
@@ -62,6 +63,8 @@ namespace MWDialogue
 
             const ESM::Dialogue* searchDialogue(const std::string& id);
 
+            void updateOriginalDisposition();
+
         public:
 
             DialogueManager (const Compiler::Extensions& extensions, Translation::Storage& translationDataStorage);
@@ -96,7 +99,6 @@ namespace MWDialogue
             void questionAnswered (int answer, ResponseCallback* callback) override;
 
             void persuade (int type, ResponseCallback* callback) override;
-            int getTemporaryDispositionChange () const override;
 
             /// @note Controlled by an option, gets discarded when dialogue ends by default
             void applyBarterDispositionChange (int delta) override;
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index e790f21413..24601d79c8 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -483,7 +483,7 @@ namespace MWMechanics
         mUpdatePlayer = true;
     }
 
-    int MechanicsManager::getDerivedDisposition(const MWWorld::Ptr& ptr, bool addTemporaryDispositionChange)
+    int MechanicsManager::getDerivedDisposition(const MWWorld::Ptr& ptr, bool clamp)
     {
         const MWMechanics::NpcStats& npcSkill = ptr.getClass().getNpcStats(ptr);
         float x = static_cast<float>(npcSkill.getBaseDisposition());
@@ -562,11 +562,9 @@ namespace MWMechanics
 
         x += ptr.getClass().getCreatureStats(ptr).getMagicEffects().get(ESM::MagicEffect::Charm).getMagnitude();
 
-        if(addTemporaryDispositionChange)
-          x += MWBase::Environment::get().getDialogueManager()->getTemporaryDispositionChange();
-
-        int effective_disposition = std::max(0,std::min(int(x),100));//, normally clamped to [0..100] when used
-        return effective_disposition;
+        if(clamp)
+            return std::max(0,std::min(int(x),100));//, normally clamped to [0..100] when used
+        return int(x);
     }
 
     int MechanicsManager::getBarterOffer(const MWWorld::Ptr& ptr,int basePrice, bool buying)
@@ -603,7 +601,7 @@ namespace MWMechanics
         return mActors.countDeaths (id);
     }
 
-    void MechanicsManager::getPersuasionDispositionChange (const MWWorld::Ptr& npc, PersuasionType type, bool& success, float& tempChange, float& permChange)
+    void MechanicsManager::getPersuasionDispositionChange (const MWWorld::Ptr& npc, PersuasionType type, bool& success, int& tempChange, int& permChange)
     {
         const MWWorld::Store<ESM::GameSetting> &gmst =
             MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
@@ -727,19 +725,22 @@ namespace MWMechanics
             x = success ? std::max(iPerMinChange, c) : c;
         }
 
-        tempChange = type == PT_Intimidate ? x : int(x * fPerTempMult);
+        tempChange = type == PT_Intimidate ? int(x) : int(x * fPerTempMult);
 
 
-        float cappedDispositionChange = tempChange;
-        if (currentDisposition + tempChange > 100.f)
-            cappedDispositionChange = static_cast<float>(100 - currentDisposition);
-        if (currentDisposition + tempChange < 0.f)
-            cappedDispositionChange = static_cast<float>(-currentDisposition);
+        int cappedDispositionChange = tempChange;
+        if (currentDisposition + tempChange > 100)
+            cappedDispositionChange = 100 - currentDisposition;
+        if (currentDisposition + tempChange < 0)
+        {
+            cappedDispositionChange = -currentDisposition;
+            tempChange = 0;
+        }
 
         permChange = floor(cappedDispositionChange / fPerTempMult);
         if (type == PT_Intimidate)
         {
-            permChange = success ? -int(cappedDispositionChange/ fPerTempMult) : y;
+            permChange = success ? -int(cappedDispositionChange/ fPerTempMult) : int(y);
         }
     }
 
@@ -1722,7 +1723,7 @@ namespace MWMechanics
 
         int disposition = 50;
         if (ptr.getClass().isNpc())
-            disposition = getDerivedDisposition(ptr, true);
+            disposition = getDerivedDisposition(ptr);
 
         int fight = ptr.getClass().getCreatureStats(ptr).getAiSetting(CreatureStats::AI_Fight).getModified()
                 + static_cast<int>(getFightDistanceBias(ptr, target) + getFightDispositionBias(static_cast<float>(disposition)));
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
index ed28c0a463..0aaeb23435 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
@@ -87,13 +87,13 @@ namespace MWMechanics
             int getBarterOffer(const MWWorld::Ptr& ptr,int basePrice, bool buying) override;
             ///< This is used by every service to determine the price of objects given the trading skills of the player and NPC.
 
-            int getDerivedDisposition(const MWWorld::Ptr& ptr, bool addTemporaryDispositionChange = true) override;
+            int getDerivedDisposition(const MWWorld::Ptr& ptr, bool clamp = true) override;
             ///< Calculate the diposition of an NPC toward the player.
 
             int countDeaths (const std::string& id) const override;
             ///< Return the number of deaths for actors with the given ID.
 
-            void getPersuasionDispositionChange (const MWWorld::Ptr& npc, PersuasionType type, bool& success, float& tempChange, float& permChange) override;
+            void getPersuasionDispositionChange (const MWWorld::Ptr& npc, PersuasionType type, bool& success, int& tempChange, int& permChange) override;
             ///< Perform a persuasion action on NPC
 
             /// Check if \a observer is potentially aware of \a ptr. Does not do a line of sight check!

From d85cbe4069e819cceedbe8a0269f982a6e010f87 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 22 May 2021 14:56:14 +0200
Subject: [PATCH 0962/2859] Support system Google Benchmark

---
 apps/benchmarks/CMakeLists.txt | 36 ++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/apps/benchmarks/CMakeLists.txt b/apps/benchmarks/CMakeLists.txt
index f9aa9aad49..ad4a21d5e4 100644
--- a/apps/benchmarks/CMakeLists.txt
+++ b/apps/benchmarks/CMakeLists.txt
@@ -1,22 +1,28 @@
-cmake_minimum_required(VERSION 3.11)
+option(OPENMW_USE_SYSTEM_BENCHMARK "Use system Google Benchmark library." OFF)
 
-set(BENCHMARK_ENABLE_TESTING OFF)
-set(BENCHMARK_ENABLE_INSTALL OFF)
-set(BENCHMARK_ENABLE_GTEST_TESTS OFF)
+if(OPENMW_USE_SYSTEM_BENCHMARK)
+    find_package(benchmark REQUIRED)
+else()
+    cmake_minimum_required(VERSION 3.11)
 
-set(SAVED_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+    set(BENCHMARK_ENABLE_TESTING OFF)
+    set(BENCHMARK_ENABLE_INSTALL OFF)
+    set(BENCHMARK_ENABLE_GTEST_TESTS OFF)
 
-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(SAVED_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 
-set(CMAKE_CXX_FLAGS "${SAVED_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}")
+endif()
 
 openmw_add_executable(openmw_detournavigator_navmeshtilescache_benchmark detournavigator/navmeshtilescache.cpp)
 target_compile_features(openmw_detournavigator_navmeshtilescache_benchmark PRIVATE cxx_std_17)

From 16e1398819ac544f5706e54fdf01c05d20d1f778 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Wed, 7 Jul 2021 08:18:38 +1000
Subject: [PATCH 0963/2859] Quick solution to add logic to getNextRef() calls
 so that moved references are ignored.  Currently it is assumed that MVRF
 records have been all read before the ESM reader context was saved, which is
 false assumption.  Should resolve Issue #6139.

---
 apps/openmw/mwrender/objectpaging.cpp | 10 +++++++++-
 apps/openmw/mwworld/cellstore.cpp     | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index 8e29f0af4f..a5792d56b9 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -423,9 +423,17 @@ namespace MWRender
                         cell->restore(esm[index], i);
                         ESM::CellRef ref;
                         ref.mRefNum.mContentFile = ESM::RefNum::RefNum_NoContentFile;
+                        ESM::MovedCellRef cMRef;
+                        cMRef.mRefNum.mIndex = 0;
                         bool deleted = false;
-                        while(cell->getNextRef(esm[index], ref, deleted))
+                        while(cell->getNextRef(esm[index], ref, deleted, /*ignoreMoves*/true, &cMRef))
                         {
+                            if (cMRef.mRefNum.mIndex)
+                            {
+                                cMRef.mRefNum.mIndex = 0;
+                                continue; // ignore refs that are moved
+                            }
+
                             if (std::find(cell->mMovedRefs.begin(), cell->mMovedRefs.end(), ref.mRefNum) != cell->mMovedRefs.end()) continue;
                             Misc::StringUtils::lowerCaseInPlace(ref.mRefID);
                             int type = store.findStatic(ref.mRefID);
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index e8d46b1574..3aaf6061e3 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -553,12 +553,20 @@ namespace MWWorld
                 ESM::CellRef ref;
 
                 // Get each reference in turn
+                ESM::MovedCellRef cMRef;
+                cMRef.mRefNum.mIndex = 0;
                 bool deleted = false;
-                while (mCell->getNextRef (esm[index], ref, deleted))
+                while(mCell->getNextRef(esm[index], ref, deleted, /*ignoreMoves*/true, &cMRef))
                 {
                     if (deleted)
                         continue;
 
+                    if (cMRef.mRefNum.mIndex)
+                    {
+                        cMRef.mRefNum.mIndex = 0;
+                        continue; // ignore refs that are moved
+                    }
+
                     // Don't list reference if it was moved to a different cell.
                     ESM::MovedCellRefTracker::const_iterator iter =
                         std::find(mCell->mMovedRefs.begin(), mCell->mMovedRefs.end(), ref.mRefNum);

From eced6f2126d30e1987149a12d7eeb666896bed7f Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 7 Jul 2021 18:48:25 +0200
Subject: [PATCH 0964/2859] Implement the help command

---
 CHANGELOG.md                              |  1 +
 apps/openmw/mwbase/scriptmanager.hpp      |  3 +++
 apps/openmw/mwbase/windowmanager.hpp      |  2 ++
 apps/openmw/mwgui/windowmanagerimp.cpp    |  5 +++++
 apps/openmw/mwgui/windowmanagerimp.hpp    |  2 ++
 apps/openmw/mwscript/docs/vmformat.txt    |  3 ++-
 apps/openmw/mwscript/miscextensions.cpp   | 18 ++++++++++++++++++
 apps/openmw/mwscript/scriptmanagerimp.cpp |  5 +++++
 apps/openmw/mwscript/scriptmanagerimp.hpp |  2 ++
 components/compiler/extensions0.cpp       |  1 +
 components/compiler/opcodes.hpp           |  1 +
 files/mygui/openmw_console.layout         |  1 +
 12 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d00d576eec..5c3b4e3354 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
     Bug #6129: Player avatar not displayed correctly for large window sizes when GUI scaling active
     Bug #6131: Item selection in the avatar window not working correctly for large window sizes
     Bug #6133: Cannot reliably sneak or steal in the sight of the NPCs siding with player
+    Feature #2780: A way to see current OpenMW version in the console
     Feature #5489: MCP: Telekinesis fix for activators
     Feature #6017: Separate persistent and temporary cell references when saving
 
diff --git a/apps/openmw/mwbase/scriptmanager.hpp b/apps/openmw/mwbase/scriptmanager.hpp
index ac8333ed10..c7717cfb05 100644
--- a/apps/openmw/mwbase/scriptmanager.hpp
+++ b/apps/openmw/mwbase/scriptmanager.hpp
@@ -10,6 +10,7 @@ namespace Interpreter
 
 namespace Compiler
 {
+    class Extensions;
     class Locals;
 }
 
@@ -52,6 +53,8 @@ namespace MWBase
             ///< Return locals for script \a name.
 
             virtual MWScript::GlobalScripts& getGlobalScripts() = 0;
+
+            virtual const Compiler::Extensions& getExtensions() const = 0;
    };
 }
 
diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index dde470b119..6e3c615de3 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -349,6 +349,8 @@ namespace MWBase
 
             virtual void watchActor(const MWWorld::Ptr& ptr) = 0;
             virtual MWWorld::Ptr getWatchedActor() const = 0;
+
+            virtual const std::string& getVersionDescription() const = 0;
     };
 }
 
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 521d247cff..1694206504 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -2199,4 +2199,9 @@ namespace MWGui
     {
         return mStatsWatcher->getWatchedActor();
     }
+
+    const std::string& WindowManager::getVersionDescription() const
+    {
+        return mVersionDescription;
+    }
 }
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index c5b2b93826..ef411a39df 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -383,6 +383,8 @@ namespace MWGui
     bool injectKeyPress(MyGUI::KeyCode key, unsigned int text, bool repeat=false) override;
     bool injectKeyRelease(MyGUI::KeyCode key) override;
 
+    const std::string& getVersionDescription() const override;
+
   private:
     unsigned int mOldUpdateMask; unsigned int mOldCullMask;
 
diff --git a/apps/openmw/mwscript/docs/vmformat.txt b/apps/openmw/mwscript/docs/vmformat.txt
index ccc579b30d..7c470fe413 100644
--- a/apps/openmw/mwscript/docs/vmformat.txt
+++ b/apps/openmw/mwscript/docs/vmformat.txt
@@ -479,5 +479,6 @@ op 0x200031c: GetDisabled, explicit
 op 0x200031d: StartScript, explicit
 op 0x200031e: GetDistance
 op 0x200031f: GetDistance, explicit
+op 0x2000320: Help
 
-opcodes 0x2000320-0x3ffffff unused
+opcodes 0x2000321-0x3ffffff unused
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index c28f2b8951..ca9bcbe002 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -3,6 +3,7 @@
 #include <cstdlib>
 #include <iomanip>
 
+#include <components/compiler/extensions.hpp>
 #include <components/compiler/opcodes.hpp>
 #include <components/compiler/locals.hpp>
 
@@ -1582,6 +1583,22 @@ namespace MWScript
                 }
         };
 
+        class OpHelp : public Interpreter::Opcode0
+        {
+            public:
+
+                void execute(Interpreter::Runtime& runtime) override
+                {
+                    std::stringstream message;
+                    message << MWBase::Environment::get().getWindowManager()->getVersionDescription() << "\n\n";
+                    std::vector<std::string> commands;
+                    MWBase::Environment::get().getScriptManager()->getExtensions().listKeywords(commands);
+                    for(const auto& command : commands)
+                        message << command << "\n";
+                    runtime.getContext().report(message.str());
+                }
+        };
+
         void installOpcodes (Interpreter::Interpreter& interpreter)
         {
             interpreter.installSegment5 (Compiler::Misc::opcodeMenuMode, new OpMenuMode);
@@ -1701,6 +1718,7 @@ namespace MWScript
             interpreter.installSegment5 (Compiler::Misc::opcodeRepairedOnMe, new OpRepairedOnMe<ImplicitRef>);
             interpreter.installSegment5 (Compiler::Misc::opcodeRepairedOnMeExplicit, new OpRepairedOnMe<ExplicitRef>);
             interpreter.installSegment5 (Compiler::Misc::opcodeToggleRecastMesh, new OpToggleRecastMesh);
+            interpreter.installSegment5 (Compiler::Misc::opcodeHelp, new OpHelp);
         }
     }
 }
diff --git a/apps/openmw/mwscript/scriptmanagerimp.cpp b/apps/openmw/mwscript/scriptmanagerimp.cpp
index 15b416fd04..51e4762613 100644
--- a/apps/openmw/mwscript/scriptmanagerimp.cpp
+++ b/apps/openmw/mwscript/scriptmanagerimp.cpp
@@ -207,4 +207,9 @@ namespace MWScript
     {
         return mGlobalScripts;
     }
+
+    const Compiler::Extensions& ScriptManager::getExtensions() const
+    {
+        return *mCompilerContext.getExtensions();
+    }
 }
diff --git a/apps/openmw/mwscript/scriptmanagerimp.hpp b/apps/openmw/mwscript/scriptmanagerimp.hpp
index aff8318f72..a82e3f92e8 100644
--- a/apps/openmw/mwscript/scriptmanagerimp.hpp
+++ b/apps/openmw/mwscript/scriptmanagerimp.hpp
@@ -83,6 +83,8 @@ namespace MWScript
             ///< Return locals for script \a name.
 
             GlobalScripts& getGlobalScripts() override;
+
+            const Compiler::Extensions& getExtensions() const override;
     };
 }
 
diff --git a/components/compiler/extensions0.cpp b/components/compiler/extensions0.cpp
index 3989ef0f4f..6de35d7137 100644
--- a/components/compiler/extensions0.cpp
+++ b/components/compiler/extensions0.cpp
@@ -337,6 +337,7 @@ namespace Compiler
             extensions.registerInstruction ("setnavmeshnumber", "l", opcodeSetNavMeshNumberToRender);
             extensions.registerFunction ("repairedonme", 'l', "S", opcodeRepairedOnMe, opcodeRepairedOnMeExplicit);
             extensions.registerInstruction ("togglerecastmesh", "", opcodeToggleRecastMesh);
+            extensions.registerInstruction ("help", "", opcodeHelp);
         }
     }
 
diff --git a/components/compiler/opcodes.hpp b/components/compiler/opcodes.hpp
index fdc3e0eabd..46ee31133c 100644
--- a/components/compiler/opcodes.hpp
+++ b/components/compiler/opcodes.hpp
@@ -318,6 +318,7 @@ namespace Compiler
         const int opcodeDisableExplicit = 0x200031b;
         const int opcodeGetDisabledExplicit = 0x200031c;
         const int opcodeStartScriptExplicit = 0x200031d;
+        const int opcodeHelp = 0x2000320;
     }
 
     namespace Sky
diff --git a/files/mygui/openmw_console.layout b/files/mygui/openmw_console.layout
index 6ab65d21da..7dba079eed 100644
--- a/files/mygui/openmw_console.layout
+++ b/files/mygui/openmw_console.layout
@@ -14,6 +14,7 @@
         <Property key="TextColour" value="1 1 1"/>
         <Property key="InvertSelected" value="false"/>
         <Property key="WordWrap" value="true"/>
+        <Property key="MaxTextLength" value="10000"/>
     </Widget>
 
     <!-- Command line -->

From 8d2d24ce65761d0a8e3de309c51f2f08a5df90d8 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 24 May 2021 18:46:45 +0200
Subject: [PATCH 0965/2859] Store screen capture operation as osg::ref_ptr

---
 apps/openmw/engine.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/engine.hpp b/apps/openmw/engine.hpp
index 1aef62df53..49ae92abc1 100644
--- a/apps/openmw/engine.hpp
+++ b/apps/openmw/engine.hpp
@@ -62,7 +62,7 @@ namespace OMW
             boost::filesystem::path mResDir;
             osg::ref_ptr<osgViewer::Viewer> mViewer;
             osg::ref_ptr<osgViewer::ScreenCaptureHandler> mScreenCaptureHandler;
-            osgViewer::ScreenCaptureHandler::CaptureOperation *mScreenCaptureOperation;
+            osg::ref_ptr<osgViewer::ScreenCaptureHandler::CaptureOperation> mScreenCaptureOperation;
             std::string mCellName;
             std::vector<std::string> mContentFiles;
             std::vector<std::string> mGroundcoverFiles;

From 33aa4d08224e1ddf6b9a7c02f5a643545ae38e75 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 24 May 2021 18:47:23 +0200
Subject: [PATCH 0966/2859] Move WriteScreenshotToFileOperation to components

---
 apps/openmw/engine.cpp                 | 52 ++----------------
 components/CMakeLists.txt              |  1 +
 components/sceneutil/screencapture.cpp | 73 ++++++++++++++++++++++++++
 components/sceneutil/screencapture.hpp | 31 +++++++++++
 4 files changed, 108 insertions(+), 49 deletions(-)
 create mode 100644 components/sceneutil/screencapture.cpp
 create mode 100644 components/sceneutil/screencapture.hpp

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index a06faa4d71..d03891fdc6 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -40,6 +40,8 @@
 
 #include <components/misc/frameratelimiter.hpp>
 
+#include <components/sceneutil/screencapture.hpp>
+
 #include "mwinput/inputmanagerimp.hpp"
 
 #include "mwgui/windowmanagerimp.hpp"
@@ -781,54 +783,6 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     }
 }
 
-class WriteScreenshotToFileOperation : public osgViewer::ScreenCaptureHandler::CaptureOperation
-{
-public:
-    WriteScreenshotToFileOperation(const std::string& screenshotPath, const std::string& screenshotFormat)
-        : mScreenshotPath(screenshotPath)
-        , mScreenshotFormat(screenshotFormat)
-    {
-    }
-
-    void operator()(const osg::Image& image, const unsigned int context_id) override
-    {
-        // Count screenshots.
-        int shotCount = 0;
-
-        // Find the first unused filename with a do-while
-        std::ostringstream stream;
-        do
-        {
-            // Reset the stream
-            stream.str("");
-            stream.clear();
-
-            stream << mScreenshotPath << "/screenshot" << std::setw(3) << std::setfill('0') << shotCount++ << "." << mScreenshotFormat;
-
-        } while (boost::filesystem::exists(stream.str()));
-
-        boost::filesystem::ofstream outStream;
-        outStream.open(boost::filesystem::path(stream.str()), std::ios::binary);
-
-        osgDB::ReaderWriter* readerwriter = osgDB::Registry::instance()->getReaderWriterForExtension(mScreenshotFormat);
-        if (!readerwriter)
-        {
-            Log(Debug::Error) << "Error: Can't write screenshot, no '" << mScreenshotFormat << "' readerwriter found";
-            return;
-        }
-
-        osgDB::ReaderWriter::WriteResult result = readerwriter->writeImage(image, outStream);
-        if (!result.success())
-        {
-            Log(Debug::Error) << "Error: Can't write screenshot: " << result.message() << " code " << result.status();
-        }
-    }
-
-private:
-    std::string mScreenshotPath;
-    std::string mScreenshotFormat;
-};
-
 // Initialise and enter main loop.
 void OMW::Engine::go()
 {
@@ -860,7 +814,7 @@ void OMW::Engine::go()
     mViewer->setUseConfigureAffinity(false);
 #endif
 
-    mScreenCaptureOperation = new WriteScreenshotToFileOperation(
+    mScreenCaptureOperation = new SceneUtil::WriteScreenshotToFileOperation(
         mCfgMgr.getScreenshotPath().string(),
         Settings::Manager::getString("screenshot format", "General"));
 
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 7860f492ce..43987d6c7b 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -53,6 +53,7 @@ add_component_dir (sceneutil
     clone attach visitor util statesetupdater controller skeleton riggeometry morphgeometry lightcontroller
     lightmanager lightutil positionattitudetransform workqueue unrefqueue pathgridutil waterutil writescene serialize optimizer
     actorutil detourdebugdraw navmesh agentpath shadow mwshadowtechnique recastmesh shadowsbin osgacontroller
+    screencapture
     )
 
 add_component_dir (nif
diff --git a/components/sceneutil/screencapture.cpp b/components/sceneutil/screencapture.cpp
new file mode 100644
index 0000000000..660f296b63
--- /dev/null
+++ b/components/sceneutil/screencapture.cpp
@@ -0,0 +1,73 @@
+#include "screencapture.hpp"
+
+#include <components/debug/debuglog.hpp>
+#include <components/sceneutil/workqueue.hpp>
+
+#include <osg/Image>
+#include <osgDB/ReaderWriter>
+#include <osgDB/Registry>
+
+#include <boost/filesystem/fstream.hpp>
+#include <boost/filesystem/operations.hpp>
+
+#include <string>
+#include <sstream>
+#include <iomanip>
+
+namespace SceneUtil
+{
+    void writeScreenshotToFile(const std::string& screenshotPath, const std::string& screenshotFormat,
+                               const osg::Image& image)
+    {
+        // Count screenshots.
+        int shotCount = 0;
+
+        // Find the first unused filename with a do-while
+        std::ostringstream stream;
+        do
+        {
+            // Reset the stream
+            stream.str("");
+            stream.clear();
+
+            stream << screenshotPath << "/screenshot" << std::setw(3) << std::setfill('0') << shotCount++ << "." << screenshotFormat;
+
+        } while (boost::filesystem::exists(stream.str()));
+
+        boost::filesystem::ofstream outStream;
+        outStream.open(boost::filesystem::path(stream.str()), std::ios::binary);
+
+        osgDB::ReaderWriter* readerwriter = osgDB::Registry::instance()->getReaderWriterForExtension(screenshotFormat);
+        if (!readerwriter)
+        {
+            Log(Debug::Error) << "Error: Can't write screenshot, no '" << screenshotFormat << "' readerwriter found";
+            return;
+        }
+
+        osgDB::ReaderWriter::WriteResult result = readerwriter->writeImage(image, outStream);
+        if (!result.success())
+        {
+            Log(Debug::Error) << "Error: Can't write screenshot: " << result.message() << " code " << result.status();
+        }
+    }
+
+    WriteScreenshotToFileOperation::WriteScreenshotToFileOperation(const std::string& screenshotPath,
+                                                                   const std::string& screenshotFormat)
+        : mScreenshotPath(screenshotPath)
+        , mScreenshotFormat(screenshotFormat)
+    {
+    }
+
+    void WriteScreenshotToFileOperation::operator()(const osg::Image& image, const unsigned int /*context_id*/)
+    {
+        try
+        {
+            writeScreenshotToFile(mScreenshotPath, mScreenshotFormat, image);
+        }
+        catch (const std::exception& e)
+        {
+            Log(Debug::Error) << "Failed to write screenshot to file with path=\"" << mScreenshotPath
+                              << "\", format=\"" << mScreenshotFormat << "\": " << e.what();
+        }
+    }
+}
diff --git a/components/sceneutil/screencapture.hpp b/components/sceneutil/screencapture.hpp
new file mode 100644
index 0000000000..37ff5e39cc
--- /dev/null
+++ b/components/sceneutil/screencapture.hpp
@@ -0,0 +1,31 @@
+#ifndef OPENMW_COMPONENTS_SCENEUTIL_SCREENCAPTURE_H
+#define OPENMW_COMPONENTS_SCENEUTIL_SCREENCAPTURE_H
+
+#include <osgViewer/ViewerEventHandlers>
+
+#include <string>
+
+namespace osg
+{
+    class Image;
+}
+
+namespace SceneUtil
+{
+    void writeScreenshotToFile(const std::string& screenshotPath, const std::string& screenshotFormat,
+                               const osg::Image& image);
+
+    class WriteScreenshotToFileOperation : public osgViewer::ScreenCaptureHandler::CaptureOperation
+    {
+        public:
+            WriteScreenshotToFileOperation(const std::string& screenshotPath, const std::string& screenshotFormat);
+
+            void operator()(const osg::Image& image, const unsigned int /*context_id*/) override;
+
+        private:
+            const std::string mScreenshotPath;
+            const std::string mScreenshotFormat;
+    };
+}
+
+#endif

From f8e02000ece0459f501cbebf5c335707058d50d3 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 24 May 2021 19:27:09 +0200
Subject: [PATCH 0967/2859] Write screenshots to file asynchronously

---
 CHANGELOG.md                           |  1 +
 apps/openmw/engine.cpp                 | 20 ++++++----
 components/sceneutil/screencapture.cpp | 53 +++++++++++++++++++++++++-
 components/sceneutil/screencapture.hpp | 18 ++++++++-
 4 files changed, 81 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c3b4e3354..a676b70b9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
     Bug #6129: Player avatar not displayed correctly for large window sizes when GUI scaling active
     Bug #6131: Item selection in the avatar window not working correctly for large window sizes
     Bug #6133: Cannot reliably sneak or steal in the sight of the NPCs siding with player
+    Bug #6143: Capturing a screenshot makes engine to be a temporary unresponsive
     Feature #2780: A way to see current OpenMW version in the console
     Feature #5489: MCP: Telekinesis fix for activators
     Feature #6017: Separate persistent and temporary cell references when saving
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index d03891fdc6..76f02fb683 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -670,6 +670,18 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
         throw std::runtime_error("Invalid setting: 'preload num threads' must be >0");
     mWorkQueue = new SceneUtil::WorkQueue(numThreads);
 
+    mScreenCaptureOperation = new SceneUtil::AsyncScreenCaptureOperation(
+        mWorkQueue,
+        new SceneUtil::WriteScreenshotToFileOperation(
+            mCfgMgr.getScreenshotPath().string(),
+            Settings::Manager::getString("screenshot format", "General")
+        )
+    );
+
+    mScreenCaptureHandler = new osgViewer::ScreenCaptureHandler(mScreenCaptureOperation);
+
+    mViewer->addEventHandler(mScreenCaptureHandler);
+
     // Create input and UI first to set up a bootstrapping environment for
     // showing a loading screen and keeping the window responsive while doing so
 
@@ -814,14 +826,6 @@ void OMW::Engine::go()
     mViewer->setUseConfigureAffinity(false);
 #endif
 
-    mScreenCaptureOperation = new SceneUtil::WriteScreenshotToFileOperation(
-        mCfgMgr.getScreenshotPath().string(),
-        Settings::Manager::getString("screenshot format", "General"));
-
-    mScreenCaptureHandler = new osgViewer::ScreenCaptureHandler(mScreenCaptureOperation);
-
-    mViewer->addEventHandler(mScreenCaptureHandler);
-
     mEnvironment.setFrameRateLimit(Settings::Manager::getFloat("framerate limit", "Video"));
 
     prepareEngine (settings);
diff --git a/components/sceneutil/screencapture.cpp b/components/sceneutil/screencapture.cpp
index 660f296b63..c010b390aa 100644
--- a/components/sceneutil/screencapture.cpp
+++ b/components/sceneutil/screencapture.cpp
@@ -3,6 +3,7 @@
 #include <components/debug/debuglog.hpp>
 #include <components/sceneutil/workqueue.hpp>
 
+#include <osg/ref_ptr>
 #include <osg/Image>
 #include <osgDB/ReaderWriter>
 #include <osgDB/Registry>
@@ -10,9 +11,43 @@
 #include <boost/filesystem/fstream.hpp>
 #include <boost/filesystem/operations.hpp>
 
-#include <string>
-#include <sstream>
+#include <cassert>
 #include <iomanip>
+#include <sstream>
+#include <string>
+
+namespace
+{
+    class ScreenCaptureWorkItem : public SceneUtil::WorkItem
+    {
+        public:
+            ScreenCaptureWorkItem(const osg::ref_ptr<osgViewer::ScreenCaptureHandler::CaptureOperation>& impl,
+                                  const osg::Image& image, unsigned int contextId)
+                : mImpl(impl),
+                  mImage(new osg::Image(image)),
+                  mContextId(contextId)
+            {
+                assert(mImpl != nullptr);
+            }
+
+            void doWork() override
+            {
+                try
+                {
+                    (*mImpl)(*mImage, mContextId);
+                }
+                catch (const std::exception& e)
+                {
+                    Log(Debug::Error) << "ScreenCaptureWorkItem exception: " << e.what();
+                }
+            }
+
+        private:
+            const osg::ref_ptr<osgViewer::ScreenCaptureHandler::CaptureOperation> mImpl;
+            const osg::ref_ptr<const osg::Image> mImage;
+            const unsigned int mContextId;
+    };
+}
 
 namespace SceneUtil
 {
@@ -70,4 +105,18 @@ namespace SceneUtil
                               << "\", format=\"" << mScreenshotFormat << "\": " << e.what();
         }
     }
+
+    AsyncScreenCaptureOperation::AsyncScreenCaptureOperation(osg::ref_ptr<WorkQueue> queue,
+                                                             osg::ref_ptr<CaptureOperation> impl)
+        : mQueue(std::move(queue)),
+          mImpl(std::move(impl))
+    {
+        assert(mQueue != nullptr);
+        assert(mImpl != nullptr);
+    }
+
+    void AsyncScreenCaptureOperation::operator()(const osg::Image& image, const unsigned int context_id)
+    {
+        mQueue->addWorkItem(new ScreenCaptureWorkItem(mImpl, image, context_id));
+    }
 }
diff --git a/components/sceneutil/screencapture.hpp b/components/sceneutil/screencapture.hpp
index 37ff5e39cc..8087095e4e 100644
--- a/components/sceneutil/screencapture.hpp
+++ b/components/sceneutil/screencapture.hpp
@@ -1,6 +1,7 @@
 #ifndef OPENMW_COMPONENTS_SCENEUTIL_SCREENCAPTURE_H
 #define OPENMW_COMPONENTS_SCENEUTIL_SCREENCAPTURE_H
 
+#include <osg/ref_ptr>
 #include <osgViewer/ViewerEventHandlers>
 
 #include <string>
@@ -12,6 +13,8 @@ namespace osg
 
 namespace SceneUtil
 {
+    class WorkQueue;
+
     void writeScreenshotToFile(const std::string& screenshotPath, const std::string& screenshotFormat,
                                const osg::Image& image);
 
@@ -20,12 +23,25 @@ namespace SceneUtil
         public:
             WriteScreenshotToFileOperation(const std::string& screenshotPath, const std::string& screenshotFormat);
 
-            void operator()(const osg::Image& image, const unsigned int /*context_id*/) override;
+            void operator()(const osg::Image& image, const unsigned int context_id) override;
 
         private:
             const std::string mScreenshotPath;
             const std::string mScreenshotFormat;
     };
+
+    class AsyncScreenCaptureOperation : public osgViewer::ScreenCaptureHandler::CaptureOperation
+    {
+        public:
+            AsyncScreenCaptureOperation(osg::ref_ptr<SceneUtil::WorkQueue> queue,
+                                        osg::ref_ptr<osgViewer::ScreenCaptureHandler::CaptureOperation> impl);
+
+            void operator()(const osg::Image& image, const unsigned int context_id) override;
+
+        private:
+            const osg::ref_ptr<SceneUtil::WorkQueue> mQueue;
+            const osg::ref_ptr<osgViewer::ScreenCaptureHandler::CaptureOperation> mImpl;
+    };
 }
 
 #endif

From f7a6be053d55af0776bee13c91faa201bce48327 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 25 May 2021 13:44:40 +0200
Subject: [PATCH 0968/2859] Stop engine work queue before destructing
 environment

To avoid access to null and dangling pointers from active work items on
quitting.
---
 apps/openmw/engine.cpp             |  2 ++
 components/sceneutil/workqueue.cpp | 17 ++++++++++++++---
 components/sceneutil/workqueue.hpp |  6 +++++-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 76f02fb683..9651aaafbd 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -407,6 +407,8 @@ OMW::Engine::Engine(Files::ConfigurationManager& configurationManager)
 
 OMW::Engine::~Engine()
 {
+    mWorkQueue->stop();
+
     mEnvironment.cleanup();
 
     delete mScriptContext;
diff --git a/components/sceneutil/workqueue.cpp b/components/sceneutil/workqueue.cpp
index 3f8ed8aaf2..3c1df80ac4 100644
--- a/components/sceneutil/workqueue.cpp
+++ b/components/sceneutil/workqueue.cpp
@@ -33,14 +33,25 @@ bool WorkItem::isDone() const
     return mDone;
 }
 
-WorkQueue::WorkQueue(int workerThreads)
+WorkQueue::WorkQueue(std::size_t workerThreads)
     : mIsReleased(false)
 {
-    for (int i=0; i<workerThreads; ++i)
-        mThreads.emplace_back(std::make_unique<WorkThread>(*this));
+    start(workerThreads);
 }
 
 WorkQueue::~WorkQueue()
+{
+    stop();
+}
+
+void WorkQueue::start(std::size_t workerThreads)
+{
+    while (mThreads.size() < workerThreads)
+        mThreads.emplace_back(std::make_unique<WorkThread>(*this));
+    mIsReleased = false;
+}
+
+void WorkQueue::stop()
 {
     {
         std::unique_lock<std::mutex> lock(mMutex);
diff --git a/components/sceneutil/workqueue.hpp b/components/sceneutil/workqueue.hpp
index 5b51c59e59..6eb6a36a3e 100644
--- a/components/sceneutil/workqueue.hpp
+++ b/components/sceneutil/workqueue.hpp
@@ -44,9 +44,13 @@ namespace SceneUtil
     class WorkQueue : public osg::Referenced
     {
     public:
-        WorkQueue(int numWorkerThreads=1);
+        WorkQueue(std::size_t workerThreads);
         ~WorkQueue();
 
+        void start(std::size_t workerThreads);
+
+        void stop();
+
         /// Add a new work item to the back of the queue.
         /// @par The work item's waitTillDone() method may be used by the caller to wait until the work is complete.
         /// @param front If true, add item to the front of the queue. If false (default), add to the back.

From 5103120eefac41e7b53ca8dfafd91b0e072235b6 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 25 May 2021 01:49:27 +0200
Subject: [PATCH 0969/2859] Notify about saved screenshot

Show message about saved screenshot via schedule message box. Since screenshot
saving happens not in the main thread calling messageBox directly is unsafe.
WindowManager::scheduleMessageBox delays message box showing until next update
in the main thread.
---
 apps/openmw/engine.cpp                 | 11 ++++++++-
 apps/openmw/mwbase/windowmanager.hpp   |  2 ++
 apps/openmw/mwgui/windowmanagerimp.cpp | 15 +++++++++++++
 apps/openmw/mwgui/windowmanagerimp.hpp | 16 +++++++++++++
 components/sceneutil/screencapture.cpp | 31 +++++++++++++++++++-------
 components/sceneutil/screencapture.hpp |  8 ++++---
 6 files changed, 71 insertions(+), 12 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 9651aaafbd..278c97f029 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -218,6 +218,14 @@ namespace
         if (Settings::Manager::getInt("async num threads", "Physics") == 0)
             profiler.removeUserStatsLine(" -Async");
     }
+
+    struct ScheduleNonDialogMessageBox
+    {
+        void operator()(std::string message) const
+        {
+            MWBase::Environment::get().getWindowManager()->scheduleMessageBox(std::move(message), MWGui::ShowInDialogueMode_Never);
+        }
+    };
 }
 
 void OMW::Engine::executeLocalScripts()
@@ -676,7 +684,8 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
         mWorkQueue,
         new SceneUtil::WriteScreenshotToFileOperation(
             mCfgMgr.getScreenshotPath().string(),
-            Settings::Manager::getString("screenshot format", "General")
+            Settings::Manager::getString("screenshot format", "General"),
+            ScheduleNonDialogMessageBox {}
         )
     );
 
diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index 6e3c615de3..f256cc387e 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -228,6 +228,8 @@ namespace MWBase
             virtual void exitCurrentGuiMode() = 0;
 
             virtual void messageBox (const std::string& message, enum MWGui::ShowInDialogueMode showInDialogueMode = MWGui::ShowInDialogueMode_IfPossible) = 0;
+            /// Puts message into a queue to show on the next update. Thread safe alternative for messageBox.
+            virtual void scheduleMessageBox(std::string message, enum MWGui::ShowInDialogueMode showInDialogueMode = MWGui::ShowInDialogueMode_IfPossible) = 0;
             virtual void staticMessageBox(const std::string& message) = 0;
             virtual void removeStaticMessageBox() = 0;
             virtual void interactiveMessageBox (const std::string& message,
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 1694206504..eebcf4b094 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -749,6 +749,11 @@ namespace MWGui
         }
     }
 
+    void WindowManager::scheduleMessageBox(std::string message, enum MWGui::ShowInDialogueMode showInDialogueMode)
+    {
+        mScheduledMessageBoxes.lock()->emplace_back(std::move(message), showInDialogueMode);
+    }
+
     void WindowManager::staticMessageBox(const std::string& message)
     {
         mMessageBoxManager->createMessageBox(message, true);
@@ -803,6 +808,8 @@ namespace MWGui
 
     void WindowManager::update (float frameDuration)
     {
+        handleScheduledMessageBoxes();
+
         bool gameRunning = MWBase::Environment::get().getStateManager()->getState()!=
             MWBase::StateManager::State_NoGame;
 
@@ -2204,4 +2211,12 @@ namespace MWGui
     {
         return mVersionDescription;
     }
+
+    void WindowManager::handleScheduledMessageBoxes()
+    {
+        const auto scheduledMessageBoxes = mScheduledMessageBoxes.lock();
+        for (const ScheduledMessageBox& v : *scheduledMessageBoxes)
+            messageBox(v.mMessage, v.mShowInDialogueMode);
+        scheduledMessageBoxes->clear();
+    }
 }
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index ef411a39df..8c7e365ec7 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -8,6 +8,7 @@
 **/
 
 #include <stack>
+#include <vector>
 
 #include <osg/ref_ptr>
 
@@ -16,6 +17,7 @@
 #include <components/sdlutil/events.hpp>
 #include <components/settings/settings.hpp>
 #include <components/to_utf8/to_utf8.hpp>
+#include <components/misc/guarded.hpp>
 
 #include "mapwindow.hpp"
 #include "statswatcher.hpp"
@@ -264,6 +266,7 @@ namespace MWGui
     void exitCurrentGuiMode() override;
 
     void messageBox (const std::string& message, enum MWGui::ShowInDialogueMode showInDialogueMode = MWGui::ShowInDialogueMode_IfPossible) override;
+    void scheduleMessageBox (std::string message, enum MWGui::ShowInDialogueMode showInDialogueMode = MWGui::ShowInDialogueMode_IfPossible) override;
     void staticMessageBox(const std::string& message) override;
     void removeStaticMessageBox() override;
     void interactiveMessageBox (const std::string& message,
@@ -524,6 +527,17 @@ namespace MWGui
 
     float mScalingFactor;
 
+    struct ScheduledMessageBox
+    {
+        std::string mMessage;
+        MWGui::ShowInDialogueMode mShowInDialogueMode;
+
+        ScheduledMessageBox(std::string&& message, MWGui::ShowInDialogueMode showInDialogueMode)
+            : mMessage(std::move(message)), mShowInDialogueMode(showInDialogueMode) {}
+    };
+
+    Misc::ScopeGuarded<std::vector<ScheduledMessageBox>> mScheduledMessageBoxes;
+
     /**
      * Called when MyGUI tries to retrieve a tag's value. Tags must be denoted in #{tag} notation and will be replaced upon setting a user visible text/property.
      * Supported syntax:
@@ -555,6 +569,8 @@ namespace MWGui
     void updatePinnedWindows();
 
     void enableScene(bool enable);
+
+    void handleScheduledMessageBoxes();
   };
 }
 
diff --git a/components/sceneutil/screencapture.cpp b/components/sceneutil/screencapture.cpp
index c010b390aa..47119f3644 100644
--- a/components/sceneutil/screencapture.cpp
+++ b/components/sceneutil/screencapture.cpp
@@ -51,59 +51,74 @@ namespace
 
 namespace SceneUtil
 {
-    void writeScreenshotToFile(const std::string& screenshotPath, const std::string& screenshotFormat,
-                               const osg::Image& image)
+    std::string writeScreenshotToFile(const std::string& screenshotPath, const std::string& screenshotFormat,
+                                      const osg::Image& image)
     {
         // Count screenshots.
         int shotCount = 0;
 
         // Find the first unused filename with a do-while
         std::ostringstream stream;
+        std::string lastFileName;
+        std::string lastFilePath;
         do
         {
             // Reset the stream
             stream.str("");
             stream.clear();
 
-            stream << screenshotPath << "/screenshot" << std::setw(3) << std::setfill('0') << shotCount++ << "." << screenshotFormat;
+            stream << "screenshot" << std::setw(3) << std::setfill('0') << shotCount++ << "." << screenshotFormat;
 
-        } while (boost::filesystem::exists(stream.str()));
+            lastFileName = stream.str();
+            lastFilePath = screenshotPath + "/" + lastFileName;
+
+        } while (boost::filesystem::exists(lastFilePath));
 
         boost::filesystem::ofstream outStream;
-        outStream.open(boost::filesystem::path(stream.str()), std::ios::binary);
+        outStream.open(boost::filesystem::path(std::move(lastFilePath)), std::ios::binary);
 
         osgDB::ReaderWriter* readerwriter = osgDB::Registry::instance()->getReaderWriterForExtension(screenshotFormat);
         if (!readerwriter)
         {
             Log(Debug::Error) << "Error: Can't write screenshot, no '" << screenshotFormat << "' readerwriter found";
-            return;
+            return std::string();
         }
 
         osgDB::ReaderWriter::WriteResult result = readerwriter->writeImage(image, outStream);
         if (!result.success())
         {
             Log(Debug::Error) << "Error: Can't write screenshot: " << result.message() << " code " << result.status();
+            return std::string();
         }
+
+        return lastFileName;
     }
 
     WriteScreenshotToFileOperation::WriteScreenshotToFileOperation(const std::string& screenshotPath,
-                                                                   const std::string& screenshotFormat)
+                                                                   const std::string& screenshotFormat,
+                                                                   std::function<void (std::string)> callback)
         : mScreenshotPath(screenshotPath)
         , mScreenshotFormat(screenshotFormat)
+        , mCallback(callback)
     {
     }
 
     void WriteScreenshotToFileOperation::operator()(const osg::Image& image, const unsigned int /*context_id*/)
     {
+        std::string fileName;
         try
         {
-            writeScreenshotToFile(mScreenshotPath, mScreenshotFormat, image);
+            fileName = writeScreenshotToFile(mScreenshotPath, mScreenshotFormat, image);
         }
         catch (const std::exception& e)
         {
             Log(Debug::Error) << "Failed to write screenshot to file with path=\"" << mScreenshotPath
                               << "\", format=\"" << mScreenshotFormat << "\": " << e.what();
         }
+        if (fileName.empty())
+            mCallback("Failed to save screenshot");
+        else
+            mCallback(fileName + " has been saved");
     }
 
     AsyncScreenCaptureOperation::AsyncScreenCaptureOperation(osg::ref_ptr<WorkQueue> queue,
diff --git a/components/sceneutil/screencapture.hpp b/components/sceneutil/screencapture.hpp
index 8087095e4e..6395d989d8 100644
--- a/components/sceneutil/screencapture.hpp
+++ b/components/sceneutil/screencapture.hpp
@@ -15,19 +15,21 @@ namespace SceneUtil
 {
     class WorkQueue;
 
-    void writeScreenshotToFile(const std::string& screenshotPath, const std::string& screenshotFormat,
-                               const osg::Image& image);
+    std::string writeScreenshotToFile(const std::string& screenshotPath, const std::string& screenshotFormat,
+                                      const osg::Image& image);
 
     class WriteScreenshotToFileOperation : public osgViewer::ScreenCaptureHandler::CaptureOperation
     {
         public:
-            WriteScreenshotToFileOperation(const std::string& screenshotPath, const std::string& screenshotFormat);
+            WriteScreenshotToFileOperation(const std::string& screenshotPath, const std::string& screenshotFormat,
+                                           std::function<void (std::string)> callback);
 
             void operator()(const osg::Image& image, const unsigned int context_id) override;
 
         private:
             const std::string mScreenshotPath;
             const std::string mScreenshotFormat;
+            const std::function<void (std::string)> mCallback;
     };
 
     class AsyncScreenCaptureOperation : public osgViewer::ScreenCaptureHandler::CaptureOperation

From 4259f7f230a502462a53fd88e0ef28ff7487ebf1 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 25 May 2021 13:58:16 +0200
Subject: [PATCH 0970/2859] Add setting to enable/disabled notification for
 saved screenshots

---
 apps/launcher/advancedpage.cpp                     | 4 ++++
 apps/openmw/engine.cpp                             | 9 ++++++++-
 docs/source/reference/modding/settings/general.rst | 9 +++++++++
 files/settings-default.cfg                         | 3 +++
 files/ui/advancedpage.ui                           | 9 ++++++++-
 5 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index bddb70aa02..00021268e3 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -213,6 +213,8 @@ bool Launcher::AdvancedPage::loadSettings()
         if (screenshotFormatComboBox->findText(screenshotFormatString) == -1)
             screenshotFormatComboBox->addItem(screenshotFormatString);
         screenshotFormatComboBox->setCurrentIndex(screenshotFormatComboBox->findText(screenshotFormatString));
+
+        loadSettingBool(notifyOnSavedScreenshotCheckBox, "notify on saved screenshot", "General");
     }
 
     // Testing
@@ -376,6 +378,8 @@ void Launcher::AdvancedPage::saveSettings()
         std::string screenshotFormatString = screenshotFormatComboBox->currentText().toLower().toStdString();
         if (screenshotFormatString != Settings::Manager::getString("screenshot format", "General"))
             Settings::Manager::setString("screenshot format", "General", screenshotFormatString);
+
+        saveSettingBool(notifyOnSavedScreenshotCheckBox, "notify on saved screenshot", "General");
     }
 
     // Testing
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 278c97f029..93d3530c0a 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -226,6 +226,11 @@ namespace
             MWBase::Environment::get().getWindowManager()->scheduleMessageBox(std::move(message), MWGui::ShowInDialogueMode_Never);
         }
     };
+
+    struct IgnoreString
+    {
+        void operator()(std::string) const {}
+    };
 }
 
 void OMW::Engine::executeLocalScripts()
@@ -685,7 +690,9 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
         new SceneUtil::WriteScreenshotToFileOperation(
             mCfgMgr.getScreenshotPath().string(),
             Settings::Manager::getString("screenshot format", "General"),
-            ScheduleNonDialogMessageBox {}
+            Settings::Manager::getBool("notify on saved screenshot", "General")
+                    ? std::function(ScheduleNonDialogMessageBox {})
+                    : std::function(IgnoreString {})
         )
     );
 
diff --git a/docs/source/reference/modding/settings/general.rst b/docs/source/reference/modding/settings/general.rst
index c885f77aa1..f0ebe4f972 100644
--- a/docs/source/reference/modding/settings/general.rst
+++ b/docs/source/reference/modding/settings/general.rst
@@ -59,3 +59,12 @@ texture mipmap
 Set the texture mipmap type to control the method mipmaps are created.
 Mipmapping is a way of reducing the processing power needed during minification
 by pregenerating a series of smaller textures.
+
+notify on saved screenshot
+--------------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	False
+
+Show message box when screenshot is saved to a file.
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 88a6b48126..522762555d 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -386,6 +386,9 @@ texture min filter = linear
 # Texture mipmap type.  (none, nearest, or linear).
 texture mipmap = nearest
 
+# Show message box when screenshot is saved to a file.
+notify on saved screenshot = false
+
 [Shaders]
 
 # Force rendering with shaders. By default, only bump-mapped objects will use shaders.
diff --git a/files/ui/advancedpage.ui b/files/ui/advancedpage.ui
index 8abe8f59a4..f72150df22 100644
--- a/files/ui/advancedpage.ui
+++ b/files/ui/advancedpage.ui
@@ -1121,7 +1121,7 @@ True: In non-combat mode camera is positioned behind the character's shoulder. C
          <layout class="QVBoxLayout" name="otherGroupVerticalLayout">
           <item>
            <layout class="QHBoxLayout" name="screenshotFormatLayout">
-            <item alignment="Qt::AlignRight">
+            <item>
              <widget class="QLabel" name="screenshotFormatLabel">
               <property name="text">
                <string>Screenshot Format</string>
@@ -1149,6 +1149,13 @@ True: In non-combat mode camera is positioned behind the character's shoulder. C
             </item>
            </layout>
           </item>
+          <item>
+           <widget class="QCheckBox" name="notifyOnSavedScreenshotCheckBox">
+            <property name="text">
+             <string>Notify on saved screenshot</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>

From d8cd5b361a88862a7f9a828af6fddc66db719561 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 25 May 2021 21:04:05 +0200
Subject: [PATCH 0971/2859] Hide message boxes when HUD is hidden

---
 apps/openmw/mwgui/messagebox.cpp       | 15 ++++++++++++---
 apps/openmw/mwgui/messagebox.hpp       |  4 ++++
 apps/openmw/mwgui/windowmanagerimp.cpp |  1 +
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwgui/messagebox.cpp b/apps/openmw/mwgui/messagebox.cpp
index 5bd8ceb5ae..4907a247ff 100644
--- a/apps/openmw/mwgui/messagebox.cpp
+++ b/apps/openmw/mwgui/messagebox.cpp
@@ -101,6 +101,8 @@ namespace MWGui
         if(stat)
             mStaticMessageBox = box;
 
+        box->setVisible(mVisible);
+
         mMessageBoxes.push_back(box);
 
         if(mMessageBoxes.size() > 3) {
@@ -167,8 +169,12 @@ namespace MWGui
         return pressed;
     }
 
-
-
+    void MessageBoxManager::setVisible(bool value)
+    {
+        mVisible = value;
+        for (MessageBox* messageBox : mMessageBoxes)
+            messageBox->setVisible(value);
+    }
 
     MessageBox::MessageBox(MessageBoxManager& parMessageBoxManager, const std::string& message)
       : Layout("openmw_messagebox.layout")
@@ -201,7 +207,10 @@ namespace MWGui
         return mMainWidget->getHeight()+mNextBoxPadding;
     }
 
-
+    void MessageBox::setVisible(bool value)
+    {
+        mMainWidget->setVisible(value);
+    }
 
     InteractiveMessageBox::InteractiveMessageBox(MessageBoxManager& parMessageBoxManager, const std::string& message, const std::vector<std::string>& buttons)
         : WindowModal(MWBase::Environment::get().getWindowManager()->isGuiMode() ? "openmw_interactive_messagebox_notransp.layout" : "openmw_interactive_messagebox.layout")
diff --git a/apps/openmw/mwgui/messagebox.hpp b/apps/openmw/mwgui/messagebox.hpp
index aeb1b83002..26d26bac56 100644
--- a/apps/openmw/mwgui/messagebox.hpp
+++ b/apps/openmw/mwgui/messagebox.hpp
@@ -47,12 +47,15 @@ namespace MWGui
 
             void onButtonPressed(int button) { eventButtonPressed(button); eventButtonPressed.clear(); }
 
+            void setVisible(bool value);
+
         private:
             std::vector<MessageBox*> mMessageBoxes;
             InteractiveMessageBox* mInterMessageBoxe;
             MessageBox* mStaticMessageBox;
             float mMessageBoxSpeed;
             int mLastButtonPressed;
+            bool mVisible = true;
     };
 
     class MessageBox : public Layout
@@ -62,6 +65,7 @@ namespace MWGui
             void setMessage (const std::string& message);
             int getHeight ();
             void update (int height);
+            void setVisible(bool value);
 
             float mCurrentTime;
             float mMaxTime;
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index eebcf4b094..544a0927e7 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -1499,6 +1499,7 @@ namespace MWGui
     {
         mHudEnabled = !mHudEnabled;
         updateVisible();
+        mMessageBoxManager->setVisible(mHudEnabled);
         return mHudEnabled;
     }
 

From 9e168fd9ccc4912893ea886dd6e39d4db393c364 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Wed, 25 Nov 2020 05:55:20 +0100
Subject: [PATCH 0972/2859] Add Lua/LuaJit and sol3 to openmw

---
 CI/before_install.android.sh     |  2 +-
 CI/before_script.msvc.sh         | 24 ++++++++++++++++++++++++
 CI/install_debian_deps.sh        |  4 ++--
 CMakeLists.txt                   | 32 +++++++++++++++++++++++++++-----
 apps/openmw/CMakeLists.txt       |  1 +
 cmake/FindLuaJit.cmake           | 14 ++++++++++++++
 extern/sol_config/sol/config.hpp | 15 +++++++++++++++
 7 files changed, 84 insertions(+), 8 deletions(-)
 create mode 100644 cmake/FindLuaJit.cmake
 create mode 100644 extern/sol_config/sol/config.hpp

diff --git a/CI/before_install.android.sh b/CI/before_install.android.sh
index 0243a96092..59d98f48c4 100755
--- a/CI/before_install.android.sh
+++ b/CI/before_install.android.sh
@@ -1,4 +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
+curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/android/openmw-android-deps-20201230.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
diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 8d0b8647b4..0a6123505e 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -575,6 +575,11 @@ if [ -z $SKIP_DOWNLOAD ]; then
 		"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/lz4_win${BITS}_v1_9_2.7z" \
 		"lz4_win${BITS}_v1_9_2.7z"
 
+	# LuaJIT
+	download "LuaJIT 2.1.0-beta3" \
+		"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/LuaJIT-2.1.0-beta3-msvc${MSVC_REAL_YEAR}-win${BITS}.7z" \
+		"LuaJIT-2.1.0-beta3-msvc${MSVC_REAL_YEAR}-win${BITS}.7z"
+
 	# Google test and mock
 	if [ ! -z $TEST_FRAMEWORK ]; then
 		echo "Google test 1.10.0..."
@@ -934,6 +939,25 @@ printf "LZ4 1.9.2... "
 }
 cd $DEPS
 echo
+# LuaJIT 2.1.0-beta3
+printf "LuaJIT 2.1.0-beta3... "
+{
+	if [ -d LuaJIT ]; then
+		printf "Exists. "
+	elif [ -z $SKIP_EXTRACT ]; then
+		rm -rf LuaJIT
+		eval 7z x -y LuaJIT-2.1.0-beta3-msvc${MSVC_REAL_YEAR}-win${BITS}.7z -o$(real_pwd)/LuaJIT $STRIP
+	fi
+	export LUAJIT_DIR="$(real_pwd)/LuaJIT"
+	add_cmake_opts -DLuaJit_INCLUDE_DIR="${LUAJIT_DIR}/include" \
+		-DLuaJit_LIBRARY="${LUAJIT_DIR}/lib/lua51.lib"
+	for CONFIGURATION in ${CONFIGURATIONS[@]}; do
+		add_runtime_dlls $CONFIGURATION "$(pwd)/LuaJIT/bin/lua51.dll"
+	done
+	echo Done.
+}
+cd $DEPS
+echo
 # Google Test and Google Mock
 if [ ! -z $TEST_FRAMEWORK ]; then
 	printf "Google test 1.10.0 ..."
diff --git a/CI/install_debian_deps.sh b/CI/install_debian_deps.sh
index 2f905314b5..6a7f4a84a7 100755
--- a/CI/install_debian_deps.sh
+++ b/CI/install_debian_deps.sh
@@ -18,10 +18,10 @@ declare -rA GROUPED_DEPS=(
 
     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
+    libbullet-dev liblz4-dev libpng-dev libjpeg-dev libluajit-5.1-dev
     ca-certificates
   "
   # TODO: add librecastnavigation-dev when debian is ready
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4661f673f1..d20e451676 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -394,6 +394,22 @@ endif()
 find_package(SDL2 2.0.9 REQUIRED)
 find_package(OpenAL REQUIRED)
 
+option(USE_LUAJIT "Switch Lua/LuaJit (TRUE is highly recommended)" TRUE)
+if(USE_LUAJIT)
+   find_package(LuaJit REQUIRED)
+   set(LUA_INCLUDE_DIR ${LuaJit_INCLUDE_DIR})
+   set(LUA_LIBRARIES ${LuaJit_LIBRARIES})
+else(USE_LUAJIT)
+   find_package(Lua REQUIRED)
+   add_compile_definitions(NO_LUAJIT)
+endif(USE_LUAJIT)
+
+# Download sol - C++ library binding to Lua
+file(DOWNLOAD
+     "https://github.com/ThePhD/sol2/releases/download/v3.2.2/sol.hpp" "${OpenMW_BINARY_DIR}/extern/sol3.2.2/sol/sol.hpp"
+     EXPECTED_MD5 ba113cf458f60672917108e69bb4d958)
+set(SOL_INCLUDE_DIRS ${OpenMW_BINARY_DIR}/extern/sol3.2.2 ${OpenMW_SOURCE_DIR}/extern/sol_config)
+
 include_directories(
     BEFORE SYSTEM
     "."
@@ -403,6 +419,8 @@ include_directories(
     ${OPENAL_INCLUDE_DIR}
     ${OPENGL_INCLUDE_DIR}
     ${BULLET_INCLUDE_DIRS}
+    ${LUA_INCLUDE_DIR}
+    ${SOL_INCLUDE_DIRS}
 )
 
 link_directories(${SDL2_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS})
@@ -661,11 +679,10 @@ if (WIN32)
     endif()
 
     if (BUILD_OPENMW)
-        if (OPENMW_UNITY_BUILD)
-            set_target_properties(openmw PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD} /bigobj")
-        else()
-            set_target_properties(openmw PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}")
-        endif()
+        # \bigobj is required:
+        #  1) for OPENMW_UNITY_BUILD;
+        #  2) to compile lua binginds, because sol3 is heavily templated.
+        set_target_properties(openmw PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD} /bigobj")
     endif()
 
     if (BUILD_WIZARD)
@@ -682,6 +699,11 @@ if (WIN32)
   #set_target_properties(openmw PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:WINDOWS")
 endif()
 
+if (BUILD_OPENMW AND APPLE)
+    # Without these flags LuaJit crashes on startup on OSX
+    set_target_properties(openmw PROPERTIES LINK_FLAGS "-pagezero_size 10000 -image_base 100000000")
+endif()
+
 # Apple bundling
 if (OPENMW_OSX_DEPLOYMENT AND APPLE)
     if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.13 AND CMAKE_VERSION VERSION_LESS 3.13.4)
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 3fb762d305..c5c85dae86 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -146,6 +146,7 @@ target_link_libraries(openmw
     "osg-ffmpeg-videoplayer"
     "oics"
     components
+    ${LUA_LIBRARIES}
 )
 
 if(OSG_STATIC)
diff --git a/cmake/FindLuaJit.cmake b/cmake/FindLuaJit.cmake
new file mode 100644
index 0000000000..0f38da9b4b
--- /dev/null
+++ b/cmake/FindLuaJit.cmake
@@ -0,0 +1,14 @@
+# Once found, defines:
+#  LuaJit_FOUND
+#  LuaJit_INCLUDE_DIR
+#  LuaJit_LIBRARIES
+
+include(LibFindMacros)
+
+libfind_pkg_detect(LuaJit luajit
+        FIND_PATH luajit.h PATH_SUFFIXES luajit luajit-2.1
+        FIND_LIBRARY luajit-5.1 luajit
+        )
+
+libfind_process(LuaJit)
+
diff --git a/extern/sol_config/sol/config.hpp b/extern/sol_config/sol/config.hpp
new file mode 100644
index 0000000000..fc8c93e64c
--- /dev/null
+++ b/extern/sol_config/sol/config.hpp
@@ -0,0 +1,15 @@
+#ifndef SOL_SINGLE_CONFIG_HPP
+#define SOL_SINGLE_CONFIG_HPP
+
+#define SOL_SAFE_USERTYPE 1
+#define SOL_SAFE_REFERENCES 1
+#define SOL_SAFE_FUNCTION_CALLS 1
+#define SOL_SAFE_FUNCTION 1
+#define SOL_NO_NIL 0
+
+#ifndef NO_LUAJIT
+#define SOL_LUAJIT 1
+#define SOL_EXCEPTIONS_SAFE_PROPAGATION 0
+#endif
+
+#endif // SOL_SINGLE_CONFIG_HPP

From 9a5229a8217c8bb15b253ec6f63709914f514d41 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Mon, 26 Apr 2021 23:58:49 +0200
Subject: [PATCH 0973/2859] Temporary fix for MacOS build. Remove this commit
 after resolving #5990.

---
 CI/before_install.osx.sh | 4 +++-
 CI/before_script.osx.sh  | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index 1ca0fc6119..d962e76086 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -15,8 +15,10 @@ ccache --version
 cmake --version
 qmake --version
 
+brew install lua
+
 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
\ No newline at end of file
+[ -z "${TRAVIS}" ] && HOMEBREW_NO_AUTO_UPDATE=1 brew install fontconfig
diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh
index 265e05b8ee..27667c1c82 100755
--- a/CI/before_script.osx.sh
+++ b/CI/before_script.osx.sh
@@ -25,5 +25,6 @@ cmake \
 -D BUILD_BSATOOL=TRUE \
 -D BUILD_ESSIMPORTER=TRUE \
 -D BUILD_NIFTEST=TRUE \
+-D USE_LUAJIT=FALSE \
 -G"Unix Makefiles" \
 ..

From b432a1a1c1528e25f334e19fb3e464c8fa9b8e73 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Fri, 12 Mar 2021 02:05:35 +0100
Subject: [PATCH 0974/2859] Add a directory for builtin lua scripts.
 Dehardcoded game mechanics are supposed to live there.

---
 files/CMakeLists.txt                 | 1 +
 files/builtin_scripts/CMakeLists.txt | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 files/builtin_scripts/CMakeLists.txt

diff --git a/files/CMakeLists.txt b/files/CMakeLists.txt
index 98123acb97..7e1e9059bd 100644
--- a/files/CMakeLists.txt
+++ b/files/CMakeLists.txt
@@ -1,3 +1,4 @@
 add_subdirectory(mygui)
 add_subdirectory(shaders)
 add_subdirectory(vfs)
+add_subdirectory(builtin_scripts)
diff --git a/files/builtin_scripts/CMakeLists.txt b/files/builtin_scripts/CMakeLists.txt
new file mode 100644
index 0000000000..5906680e1b
--- /dev/null
+++ b/files/builtin_scripts/CMakeLists.txt
@@ -0,0 +1,8 @@
+file(GLOB_RECURSE BUILTIN_SCRIPTS LIST_DIRECTORIES false RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} CONFIGURE_DEPENDS "*")
+
+foreach (f ${BUILTIN_SCRIPTS})
+    if (NOT ("CMakeLists.txt" STREQUAL "${f}"))
+        copy_resource_file("${CMAKE_CURRENT_SOURCE_DIR}/${f}" "${OpenMW_BINARY_DIR}" "resources/vfs/${f}")
+    endif()
+endforeach (f)
+

From 4b068b27ca854ce90beefb1b57ef2380edd1b8ff Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Tue, 12 Jan 2021 23:17:48 +0100
Subject: [PATCH 0975/2859] Add components/lua/luastate and
 components/lua/utilpackage

---
 apps/openmw_test_suite/CMakeLists.txt         |   5 +-
 apps/openmw_test_suite/lua/test_lua.cpp       | 167 +++++++++++++++++
 .../lua/test_utilpackage.cpp                  |  80 +++++++++
 apps/openmw_test_suite/lua/testing_util.hpp   |  59 ++++++
 components/CMakeLists.txt                     |   4 +
 components/lua/luastate.cpp                   | 169 ++++++++++++++++++
 components/lua/luastate.hpp                   | 107 +++++++++++
 components/lua/utilpackage.cpp                |  98 ++++++++++
 components/lua/utilpackage.hpp                |  13 ++
 9 files changed, 701 insertions(+), 1 deletion(-)
 create mode 100644 apps/openmw_test_suite/lua/test_lua.cpp
 create mode 100644 apps/openmw_test_suite/lua/test_utilpackage.cpp
 create mode 100644 apps/openmw_test_suite/lua/testing_util.hpp
 create mode 100644 components/lua/luastate.cpp
 create mode 100644 components/lua/luastate.hpp
 create mode 100644 components/lua/utilpackage.cpp
 create mode 100644 components/lua/utilpackage.hpp

diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index d78cb69553..3f82df1a52 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -15,6 +15,9 @@ if (GTEST_FOUND AND GMOCK_FOUND)
         esm/test_fixed_string.cpp
         esm/variant.cpp
 
+        lua/test_lua.cpp
+        lua/test_utilpackage.cpp
+
         misc/test_stringops.cpp
         misc/test_endianness.cpp
 
@@ -39,7 +42,7 @@ if (GTEST_FOUND AND GMOCK_FOUND)
 
     openmw_add_executable(openmw_test_suite openmw_test_suite.cpp ${UNITTEST_SRC_FILES})
 
-    target_link_libraries(openmw_test_suite ${GMOCK_LIBRARIES} components)
+    target_link_libraries(openmw_test_suite ${GMOCK_LIBRARIES} components ${LUA_LIBRARIES})
     # Fix for not visible pthreads functions for linker with glibc 2.15
     if (UNIX AND NOT APPLE)
         target_link_libraries(openmw_test_suite ${CMAKE_THREAD_LIBS_INIT})
diff --git a/apps/openmw_test_suite/lua/test_lua.cpp b/apps/openmw_test_suite/lua/test_lua.cpp
new file mode 100644
index 0000000000..69a326060c
--- /dev/null
+++ b/apps/openmw_test_suite/lua/test_lua.cpp
@@ -0,0 +1,167 @@
+#include "gmock/gmock.h"
+#include <gtest/gtest.h>
+
+#include <components/lua/luastate.hpp>
+
+#include "testing_util.hpp"
+
+namespace
+{
+    using namespace testing;
+
+    TestFile counterFile(R"X(
+x = 42
+return {
+    get = function() return x end,
+    inc = function(v) x = x + v end
+}
+)X");
+
+    TestFile invalidScriptFile("Invalid script");
+
+    TestFile testsFile(R"X(
+return {
+    -- should work
+    sin = function(x) return math.sin(x) end,
+    requireMathSin = function(x) return require('math').sin(x) end,
+    useCounter = function()
+        local counter = require('aaa.counter')
+        counter.inc(1)
+        return counter.get()
+    end,
+    callRawset = function()
+        t = {a = 1, b = 2}
+        rawset(t, 'b', 3)
+        return t.b
+    end,
+    print = print,
+
+    -- should throw an error
+    incorrectRequire = function() require('counter') end,
+    modifySystemLib = function() math.sin = 5 end,
+    rawsetSystemLib = function() rawset(math, 'sin', 5) end,
+    callLoadstring = function() loadstring('print(1)') end,
+    setSqr = function() require('sqrlib').sqr = math.sin end,
+    setOmwName = function() require('openmw').name = 'abc' end,
+
+    -- should work if API is registered
+    sqr = function(x) return require('sqrlib').sqr(x) end,
+    apiName = function() return require('test.api').name end
+}
+)X");
+
+    struct LuaStateTest : Test
+    {
+        std::unique_ptr<VFS::Manager> mVFS = createTestVFS({
+            {"aaa/counter.lua", &counterFile},
+            {"bbb/tests.lua", &testsFile},
+            {"invalid.lua", &invalidScriptFile}
+        });
+
+        LuaUtil::LuaState mLua{mVFS.get()};
+    };
+
+    TEST_F(LuaStateTest, Sandbox)
+    {
+        sol::table script1 = mLua.runInNewSandbox("aaa/counter.lua");
+
+        EXPECT_EQ(LuaUtil::call(script1["get"]).get<int>(), 42);
+        LuaUtil::call(script1["inc"], 3);
+        EXPECT_EQ(LuaUtil::call(script1["get"]).get<int>(), 45);
+
+        sol::table script2 = mLua.runInNewSandbox("aaa/counter.lua");
+        EXPECT_EQ(LuaUtil::call(script2["get"]).get<int>(), 42);
+        LuaUtil::call(script2["inc"], 1);
+        EXPECT_EQ(LuaUtil::call(script2["get"]).get<int>(), 43);
+
+        EXPECT_EQ(LuaUtil::call(script1["get"]).get<int>(), 45);
+    }
+
+    TEST_F(LuaStateTest, ErrorHandling)
+    {
+        EXPECT_ERROR(mLua.runInNewSandbox("invalid.lua"), "[string \"invalid.lua\"]:1:");
+    }
+
+    TEST_F(LuaStateTest, CustomRequire)
+    {
+        sol::table script = mLua.runInNewSandbox("bbb/tests.lua");
+
+        EXPECT_FLOAT_EQ(LuaUtil::call(script["sin"], 1).get<float>(),
+                        -LuaUtil::call(script["requireMathSin"], -1).get<float>());
+
+        EXPECT_EQ(LuaUtil::call(script["useCounter"]).get<int>(), 43);
+        EXPECT_EQ(LuaUtil::call(script["useCounter"]).get<int>(), 44);
+        {
+            sol::table script2 = mLua.runInNewSandbox("bbb/tests.lua");
+            EXPECT_EQ(LuaUtil::call(script2["useCounter"]).get<int>(), 43);
+        }
+        EXPECT_EQ(LuaUtil::call(script["useCounter"]).get<int>(), 45);
+
+        EXPECT_ERROR(LuaUtil::call(script["incorrectRequire"]), "Resource 'counter.lua' not found");
+    }
+
+    TEST_F(LuaStateTest, ReadOnly)
+    {
+        sol::table script = mLua.runInNewSandbox("bbb/tests.lua");
+
+        // rawset itself is allowed
+        EXPECT_EQ(LuaUtil::call(script["callRawset"]).get<int>(), 3);
+
+        // but read-only object can not be modified even with rawset
+        EXPECT_ERROR(LuaUtil::call(script["rawsetSystemLib"]), "bad argument #1 to 'rawset' (table expected, got userdata)");
+        EXPECT_ERROR(LuaUtil::call(script["modifySystemLib"]), "a userdata value");
+
+        EXPECT_EQ(mLua.getMutableFromReadOnly(mLua.makeReadOnly(script)), script);
+    }
+
+    TEST_F(LuaStateTest, Print)
+    {
+        {
+            sol::table script = mLua.runInNewSandbox("bbb/tests.lua");
+            testing::internal::CaptureStdout();
+            LuaUtil::call(script["print"], 1, 2, 3);
+            std::string output = testing::internal::GetCapturedStdout();
+            EXPECT_EQ(output, "[bbb/tests.lua]:\t1\t2\t3\n");
+        }
+        {
+            sol::table script = mLua.runInNewSandbox("bbb/tests.lua", "prefix");
+            testing::internal::CaptureStdout();
+            LuaUtil::call(script["print"]);  // print with no arguments
+            std::string output = testing::internal::GetCapturedStdout();
+            EXPECT_EQ(output, "prefix[bbb/tests.lua]:\n");
+        }
+    }
+
+    TEST_F(LuaStateTest, UnsafeFunction)
+    {
+        sol::table script = mLua.runInNewSandbox("bbb/tests.lua");
+        EXPECT_ERROR(LuaUtil::call(script["callLoadstring"]), "a nil value");
+    }
+
+    TEST_F(LuaStateTest, ProvideAPI)
+    {
+        LuaUtil::LuaState lua(mVFS.get());
+
+        sol::table api1 = lua.makeReadOnly(lua.sol().create_table_with("name", "api1"));
+        sol::table api2 = lua.makeReadOnly(lua.sol().create_table_with("name", "api2"));
+
+        sol::table script1 = lua.runInNewSandbox("bbb/tests.lua", "", {{"test.api", api1}});
+
+        lua.addCommonPackage(
+            "sqrlib", lua.sol().create_table_with("sqr", [](int x) { return x * x; }));
+
+        sol::table script2 = lua.runInNewSandbox("bbb/tests.lua", "", {{"test.api", api2}});
+
+        EXPECT_ERROR(LuaUtil::call(script1["sqr"], 3), "Resource 'sqrlib.lua' not found");
+        EXPECT_EQ(LuaUtil::call(script2["sqr"], 3).get<int>(), 9);
+
+        EXPECT_EQ(LuaUtil::call(script1["apiName"]).get<std::string>(), "api1");
+        EXPECT_EQ(LuaUtil::call(script2["apiName"]).get<std::string>(), "api2");
+    }
+
+    TEST_F(LuaStateTest, GetLuaVersion)
+    {
+        EXPECT_THAT(LuaUtil::getLuaVersion(), HasSubstr("Lua"));
+    }
+
+}
diff --git a/apps/openmw_test_suite/lua/test_utilpackage.cpp b/apps/openmw_test_suite/lua/test_utilpackage.cpp
new file mode 100644
index 0000000000..afd9fa2d3c
--- /dev/null
+++ b/apps/openmw_test_suite/lua/test_utilpackage.cpp
@@ -0,0 +1,80 @@
+#include "gmock/gmock.h"
+#include <gtest/gtest.h>
+
+#include <components/lua/utilpackage.hpp>
+
+#include "testing_util.hpp"
+
+namespace
+{
+    using namespace testing;
+
+    TEST(LuaUtilPackageTest, Vector2)
+    {
+        sol::state lua;
+        lua.open_libraries(sol::lib::base, sol::lib::math, sol::lib::string);
+        lua["util"] = LuaUtil::initUtilPackage(lua);
+        lua.safe_script("v = util.vector2(3, 4)");
+        EXPECT_FLOAT_EQ(lua.safe_script("return v.x").get<float>(), 3);
+        EXPECT_FLOAT_EQ(lua.safe_script("return v.y").get<float>(), 4);
+        EXPECT_EQ(lua.safe_script("return tostring(v)").get<std::string>(), "(3, 4)");
+        EXPECT_FLOAT_EQ(lua.safe_script("return v:length()").get<float>(), 5);
+        EXPECT_FLOAT_EQ(lua.safe_script("return v:length2()").get<float>(), 25);
+        EXPECT_FALSE(lua.safe_script("return util.vector2(1, 2) == util.vector2(1, 3)").get<bool>());
+        EXPECT_TRUE(lua.safe_script("return util.vector2(1, 2) + util.vector2(2, 5) == util.vector2(3, 7)").get<bool>());
+        EXPECT_TRUE(lua.safe_script("return util.vector2(1, 2) - util.vector2(2, 5) == -util.vector2(1, 3)").get<bool>());
+        EXPECT_TRUE(lua.safe_script("return util.vector2(1, 2) == util.vector2(2, 4) / 2").get<bool>());
+        EXPECT_TRUE(lua.safe_script("return util.vector2(1, 2) * 2 == util.vector2(2, 4)").get<bool>());
+        EXPECT_FLOAT_EQ(lua.safe_script("return util.vector2(3, 2) * v").get<float>(), 17);
+        EXPECT_FLOAT_EQ(lua.safe_script("return util.vector2(3, 2):dot(v)").get<float>(), 17);
+        EXPECT_ERROR(lua.safe_script("v2, len = v.normalize()"), "value is not a valid userdata");  // checks that it doesn't segfault
+        lua.safe_script("v2, len = v:normalize()");
+        EXPECT_FLOAT_EQ(lua.safe_script("return len").get<float>(), 5);
+        EXPECT_TRUE(lua.safe_script("return v2 == util.vector2(3/5, 4/5)").get<bool>());
+        lua.safe_script("_, len = util.vector2(0, 0):normalize()");
+        EXPECT_FLOAT_EQ(lua.safe_script("return len").get<float>(), 0);
+    }
+
+    TEST(LuaUtilPackageTest, Vector3)
+    {
+        sol::state lua;
+        lua.open_libraries(sol::lib::base, sol::lib::math, sol::lib::string);
+        lua["util"] = LuaUtil::initUtilPackage(lua);
+        lua.safe_script("v = util.vector3(5, 12, 13)");
+        EXPECT_FLOAT_EQ(lua.safe_script("return v.x").get<float>(), 5);
+        EXPECT_FLOAT_EQ(lua.safe_script("return v.y").get<float>(), 12);
+        EXPECT_FLOAT_EQ(lua.safe_script("return v.z").get<float>(), 13);
+        EXPECT_EQ(lua.safe_script("return tostring(v)").get<std::string>(), "(5, 12, 13)");
+        EXPECT_FLOAT_EQ(lua.safe_script("return util.vector3(4, 0, 3):length()").get<float>(), 5);
+        EXPECT_FLOAT_EQ(lua.safe_script("return util.vector3(4, 0, 3):length2()").get<float>(), 25);
+        EXPECT_FALSE(lua.safe_script("return util.vector3(1, 2, 3) == util.vector3(1, 3, 2)").get<bool>());
+        EXPECT_TRUE(lua.safe_script("return util.vector3(1, 2, 3) + util.vector3(2, 5, 1) == util.vector3(3, 7, 4)").get<bool>());
+        EXPECT_TRUE(lua.safe_script("return util.vector3(1, 2, 3) - util.vector3(2, 5, 1) == -util.vector3(1, 3, -2)").get<bool>());
+        EXPECT_TRUE(lua.safe_script("return util.vector3(1, 2, 3) == util.vector3(2, 4, 6) / 2").get<bool>());
+        EXPECT_TRUE(lua.safe_script("return util.vector3(1, 2, 3) * 2 == util.vector3(2, 4, 6)").get<bool>());
+        EXPECT_FLOAT_EQ(lua.safe_script("return util.vector3(3, 2, 1) * v").get<float>(), 5*3 + 12*2 + 13*1);
+        EXPECT_FLOAT_EQ(lua.safe_script("return util.vector3(3, 2, 1):dot(v)").get<float>(), 5*3 + 12*2 + 13*1);
+        EXPECT_TRUE(lua.safe_script("return util.vector3(1, 0, 0) ^ util.vector3(0, 1, 0) == util.vector3(0, 0, 1)").get<bool>());
+        EXPECT_ERROR(lua.safe_script("v2, len = util.vector3(3, 4, 0).normalize()"), "value is not a valid userdata");
+        lua.safe_script("v2, len = util.vector3(3, 4, 0):normalize()");
+        EXPECT_FLOAT_EQ(lua.safe_script("return len").get<float>(), 5);
+        EXPECT_TRUE(lua.safe_script("return v2 == util.vector3(3/5, 4/5, 0)").get<bool>());
+        lua.safe_script("_, len = util.vector3(0, 0, 0):normalize()");
+        EXPECT_FLOAT_EQ(lua.safe_script("return len").get<float>(), 0);
+    }
+
+    TEST(LuaUtilPackageTest, UtilityFunctions)
+    {
+        sol::state lua;
+        lua.open_libraries(sol::lib::base, sol::lib::math, sol::lib::string);
+        lua["util"] = LuaUtil::initUtilPackage(lua);
+        lua.safe_script("v = util.vector2(1, 0):rotate(math.rad(120))");
+        EXPECT_FLOAT_EQ(lua.safe_script("return v.x").get<float>(), -0.5);
+        EXPECT_FLOAT_EQ(lua.safe_script("return v.y").get<float>(), 0.86602539);
+        EXPECT_FLOAT_EQ(lua.safe_script("return util.normalizeAngle(math.pi * 10 + 0.1)").get<float>(), 0.1);
+        EXPECT_FLOAT_EQ(lua.safe_script("return util.clamp(0.1, 0, 1.5)").get<float>(), 0.1);
+        EXPECT_FLOAT_EQ(lua.safe_script("return util.clamp(-0.1, 0, 1.5)").get<float>(), 0);
+        EXPECT_FLOAT_EQ(lua.safe_script("return util.clamp(2.1, 0, 1.5)").get<float>(), 1.5);
+    }
+
+}
diff --git a/apps/openmw_test_suite/lua/testing_util.hpp b/apps/openmw_test_suite/lua/testing_util.hpp
new file mode 100644
index 0000000000..28c4d59930
--- /dev/null
+++ b/apps/openmw_test_suite/lua/testing_util.hpp
@@ -0,0 +1,59 @@
+#ifndef LUA_TESTING_UTIL_H
+#define LUA_TESTING_UTIL_H
+
+#include <sstream>
+
+#include <components/vfs/archive.hpp>
+#include <components/vfs/manager.hpp>
+
+namespace
+{
+
+    class TestFile : public VFS::File
+    {
+    public:
+        explicit TestFile(std::string content) : mContent(std::move(content)) {}
+
+        Files::IStreamPtr open() override
+        {
+            return std::make_shared<std::stringstream>(mContent, std::ios_base::in);
+        }
+
+    private:
+        const std::string mContent;
+    };
+
+    struct TestData : public VFS::Archive
+    {
+        std::map<std::string, VFS::File*> mFiles;
+
+        TestData(std::map<std::string, VFS::File*> files) : mFiles(std::move(files)) {}
+
+        void listResources(std::map<std::string, VFS::File*>& out, char (*normalize_function) (char)) override
+        {
+            out = mFiles;
+        }
+
+        bool contains(const std::string& file, char (*normalize_function) (char)) const override
+        {
+            return mFiles.count(file) != 0;
+        }
+
+        std::string getDescription() const override { return "TestData"; }
+
+    };
+
+    inline std::unique_ptr<VFS::Manager> createTestVFS(std::map<std::string, VFS::File*> files)
+    {
+        auto vfs = std::make_unique<VFS::Manager>(true);
+        vfs->addArchive(new TestData(std::move(files)));
+        vfs->buildIndex();
+        return vfs;
+    }
+
+    #define EXPECT_ERROR(X, ERR_SUBSTR) try { X; FAIL() << "Expected error"; } \
+        catch (std::exception& e) { EXPECT_THAT(e.what(), HasSubstr(ERR_SUBSTR)); }
+
+}
+
+#endif // LUA_TESTING_UTIL_H
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 43987d6c7b..c09e118cbe 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -28,6 +28,10 @@ endif (GIT_CHECKOUT)
 
 # source files
 
+add_component_dir (lua
+    luastate utilpackage
+    )
+
 add_component_dir (settings
     settings parser
     )
diff --git a/components/lua/luastate.cpp b/components/lua/luastate.cpp
new file mode 100644
index 0000000000..4020c815d0
--- /dev/null
+++ b/components/lua/luastate.cpp
@@ -0,0 +1,169 @@
+#include "luastate.hpp"
+
+#ifndef NO_LUAJIT
+#include <luajit.h>
+#endif // NO_LUAJIT
+
+#include <components/debug/debuglog.hpp>
+
+namespace LuaUtil
+{
+
+    static std::string packageNameToPath(std::string_view packageName)
+    {
+        std::string res(packageName);
+        for (size_t i = 0; i < res.size(); ++i)
+            if (res[i] == '.')
+                res[i] = '/';
+        res.append(".lua");
+        return res;
+    }
+
+    static const std::string safeFunctions[] = {
+        "assert", "error", "ipairs", "next", "pairs", "pcall", "select", "tonumber", "tostring",
+        "type", "unpack", "xpcall", "rawequal", "rawget", "rawset", "getmetatable", "setmetatable"};
+    static const std::string safePackages[] = {"coroutine", "math", "string", "table"};
+
+    LuaState::LuaState(const VFS::Manager* vfs) : mVFS(vfs)
+    {
+        mLua.open_libraries(sol::lib::base, sol::lib::coroutine, sol::lib::math, sol::lib::string, sol::lib::table);
+
+        mLua["math"]["randomseed"](static_cast<unsigned>(time(NULL)));
+        mLua["math"]["randomseed"] = sol::nil;
+
+        mLua["writeToLog"] = [](std::string_view s) { Log(Debug::Level::Info) << s; };
+        mLua.script(R"(printToLog = function(name, ...)
+            local msg = name
+            for _, v in ipairs({...}) do
+                msg = msg .. '\t' .. tostring(v)
+            end
+            return writeToLog(msg)
+        end)");
+        mLua.script("printGen = function(name) return function(...) return printToLog(name, ...) end end");
+
+        // Some fixes for compatibility between different Lua versions
+        if (mLua["unpack"] == sol::nil)
+            mLua["unpack"] = mLua["table"]["unpack"];
+        else if (mLua["table"]["unpack"] == sol::nil)
+            mLua["table"]["unpack"] = mLua["unpack"];
+
+        mSandboxEnv = sol::table(mLua, sol::create);
+        mSandboxEnv["_VERSION"] = mLua["_VERSION"];
+        for (const std::string& s : safeFunctions)
+        {
+            if (mLua[s] == sol::nil) throw std::logic_error("Lua function not found: " + s);
+            mSandboxEnv[s] = mLua[s];
+        }
+        for (const std::string& s : safePackages)
+        {
+            if (mLua[s] == sol::nil) throw std::logic_error("Lua package not found: " + s);
+            mCommonPackages[s] = mSandboxEnv[s] = makeReadOnly(mLua[s]);
+        }
+    }
+
+    LuaState::~LuaState()
+    {
+        // Should be cleaned before destructing mLua.
+        mCommonPackages.clear();
+        mSandboxEnv = sol::nil;
+    }
+
+    sol::table LuaState::makeReadOnly(sol::table table)
+    {
+        if (table.is<sol::userdata>())
+            return table;  // it is already userdata, no sense to wrap it again
+
+        table[sol::meta_function::index] = table;
+        sol::stack::push(mLua, std::move(table));
+        lua_newuserdata(mLua, 0);
+        lua_pushvalue(mLua, -2);
+        lua_setmetatable(mLua, -2);
+        return sol::stack::pop<sol::table>(mLua);
+    }
+
+    sol::table LuaState::getMutableFromReadOnly(const sol::userdata& ro)
+    {
+        sol::stack::push(mLua, ro);
+        lua_getmetatable(mLua, -1);
+        sol::table res = sol::stack::pop<sol::table>(mLua);
+        lua_pop(mLua, 1);
+        return res;
+    }
+
+    void LuaState::addCommonPackage(const std::string& packageName, const sol::object& package)
+    {
+        if (package.is<sol::function>())
+            mCommonPackages[packageName] = package;
+        else
+            mCommonPackages[packageName] = makeReadOnly(package);
+    }
+
+    sol::protected_function_result LuaState::runInNewSandbox(
+        const std::string& path, const std::string& namePrefix,
+        const std::map<std::string, sol::object>& packages, const sol::object& hiddenData)
+    {
+        sol::protected_function script = loadScript(path);
+
+        sol::environment env(mLua, sol::create, mSandboxEnv);
+        std::string envName = namePrefix + "[" + path + "]:";
+        env["print"] = mLua["printGen"](envName);
+
+        sol::table loaded(mLua, sol::create);
+        for (const auto& [key, value] : mCommonPackages)
+            loaded[key] = value;
+        for (const auto& [key, value] : packages)
+            loaded[key] = value;
+        env["require"] = [this, env, loaded, hiddenData](std::string_view packageName)
+        {
+            sol::table packages = loaded;
+            sol::object package = packages[packageName];
+            if (package == sol::nil)
+            {
+                sol::protected_function packageLoader = loadScript(packageNameToPath(packageName));
+                sol::set_environment(env, packageLoader);
+                package = throwIfError(packageLoader());
+                if (!package.is<sol::table>())
+                    throw std::runtime_error("Lua package must return a table.");
+                packages[packageName] = package;
+            }
+            else if (package.is<sol::function>())
+                package = packages[packageName] = call(package.as<sol::protected_function>(), hiddenData);
+            return package;
+        };
+
+        sol::set_environment(env, script);
+        return call(script);
+    }
+
+    sol::protected_function_result LuaState::throwIfError(sol::protected_function_result&& res)
+    {
+        if (!res.valid() && static_cast<int>(res.get_type()) == LUA_TSTRING)
+            throw std::runtime_error("Lua error: " + res.get<std::string>());
+        else
+            return std::move(res);
+    }
+
+    sol::protected_function LuaState::loadScript(const std::string& path)
+    {
+        auto iter = mCompiledScripts.find(path);
+        if (iter != mCompiledScripts.end())
+            return mLua.load(iter->second.as_string_view(), path, sol::load_mode::binary);
+
+        std::string fileContent(std::istreambuf_iterator<char>(*mVFS->get(path)), {});
+        sol::load_result res = mLua.load(fileContent, path, sol::load_mode::text);
+        if (!res.valid())
+            throw std::runtime_error("Lua error: " + res.get<std::string>());
+        mCompiledScripts[path] = res.get<sol::function>().dump();
+        return res;
+    }
+
+    std::string getLuaVersion()
+    {
+        #ifdef NO_LUAJIT
+        return LUA_RELEASE;
+        #else
+        return LUA_RELEASE " (" LUAJIT_VERSION ")";
+        #endif
+    }
+
+}
diff --git a/components/lua/luastate.hpp b/components/lua/luastate.hpp
new file mode 100644
index 0000000000..9cb27fb114
--- /dev/null
+++ b/components/lua/luastate.hpp
@@ -0,0 +1,107 @@
+#ifndef COMPONENTS_LUA_LUASTATE_H
+#define COMPONENTS_LUA_LUASTATE_H
+
+#include <map>
+
+#include <sol/sol.hpp>
+
+#include <components/vfs/manager.hpp>
+
+namespace LuaUtil
+{
+
+    std::string getLuaVersion();
+
+    // Holds Lua state.
+    // Provides additional features:
+    //   - Load scripts from the virtual filesystem;
+    //   - Caching of loaded scripts;
+    //   - Disable unsafe Lua functions;
+    //   - Run every instance of every script in a separate sandbox;
+    //   - Forbid any interactions between sandboxes except than via provided API;
+    //   - Access to common read-only resources from different sandboxes;
+    //   - Replace standard `require` with a safe version that allows to search
+    //         Lua libraries (only source, no dll's) in the virtual filesystem;
+    //   - Make `print` to add the script name to the every message and
+    //         write to Log rather than directly to stdout;
+    class LuaState
+    {
+    public:
+        explicit LuaState(const VFS::Manager* vfs);
+        ~LuaState();
+
+        // Returns underlying sol::state.
+        sol::state& sol() { return mLua; }
+
+        // A shortcut to create a new Lua table.
+        sol::table newTable() { return sol::table(mLua, sol::create); }
+
+        // Makes a table read only (when accessed from Lua) by wrapping it with an empty userdata.
+        // Needed to forbid any changes in common resources that can accessed from different sandboxes.
+        sol::table makeReadOnly(sol::table);
+        sol::table getMutableFromReadOnly(const sol::userdata&);
+
+        // Registers a package that will be available from every sandbox via `require(name)`.
+        // The package can be either a sol::table with an API or a sol::function. If it is a function,
+        // it will be evaluated (once per sandbox) the first time when requested. If the package
+        // is a table, then `makeReadOnly` is applied to it automatically (but not to other tables it contains).
+        void addCommonPackage(const std::string& packageName, const sol::object& package);
+
+        // Creates a new sandbox, runs a script, and returns the result
+        // (the result is expected to be an interface of the script).
+        // Args:
+        //     path: path to the script in the virtual filesystem;
+        //     namePrefix: sandbox name will be "<namePrefix>[<filePath>]". Sandbox name
+        //         will be added to every `print` output.
+        //     packages: additional packages that should be available from the sandbox via `require`. Each package
+        //         should be either a sol::table or a sol::function. If it is a function, it will be evaluated
+        //         (once per sandbox) with the argument 'hiddenData' the first time when requested.
+        sol::protected_function_result runInNewSandbox(const std::string& path,
+                                                       const std::string& namePrefix = "",
+                                                       const std::map<std::string, sol::object>& packages = {},
+                                                       const sol::object& hiddenData = sol::nil);
+
+        void dropScriptCache() { mCompiledScripts.clear(); }
+
+    private:
+        static sol::protected_function_result throwIfError(sol::protected_function_result&&);
+        template <typename... Args>
+        friend sol::protected_function_result call(sol::protected_function fn, Args&&... args);
+
+        sol::protected_function loadScript(const std::string& path);
+
+        sol::state mLua;
+        sol::table mSandboxEnv;
+        std::map<std::string, sol::bytecode> mCompiledScripts;
+        std::map<std::string, sol::object> mCommonPackages;
+        const VFS::Manager* mVFS;
+    };
+
+    // Should be used for every call of every Lua function.
+    // It is a workaround for a bug in `sol`. See https://github.com/ThePhD/sol2/issues/1078
+    template <typename... Args>
+    sol::protected_function_result call(sol::protected_function fn, Args&&... args)
+    {
+        try
+        {
+            return LuaState::throwIfError(fn(std::forward<Args>(args)...));
+        }
+        catch (std::exception&) { throw; }
+        catch (...) { throw std::runtime_error("Unknown error"); }
+    }
+
+    // getFieldOrNil(table, "a", "b", "c") returns table["a"]["b"]["c"] or nil if some of the fields doesn't exist.
+    template <class... Str>
+    sol::object getFieldOrNil(const sol::object& table, std::string_view first, const Str&... str)
+    {
+        if (!table.is<sol::table>())
+            return sol::nil;
+        if constexpr (sizeof...(str) == 0)
+            return table.as<sol::table>()[first];
+        else
+            return getFieldOrNil(table.as<sol::table>()[first], str...);
+    }
+
+}
+
+#endif // COMPONENTS_LUA_LUASTATE_H
diff --git a/components/lua/utilpackage.cpp b/components/lua/utilpackage.cpp
new file mode 100644
index 0000000000..abcc6d424e
--- /dev/null
+++ b/components/lua/utilpackage.cpp
@@ -0,0 +1,98 @@
+#include "utilpackage.hpp"
+
+#include <algorithm>
+#include <sstream>
+
+#include <osg/Vec3f>
+
+#include <components/misc/mathutil.hpp>
+
+namespace sol
+{
+    template <>
+    struct is_automagical<osg::Vec2f> : std::false_type {};
+
+    template <>
+    struct is_automagical<osg::Vec3f> : std::false_type {};
+}
+
+namespace LuaUtil
+{
+
+    sol::table initUtilPackage(sol::state& lua)
+    {
+        sol::table util(lua, sol::create);
+
+        // TODO: Add bindings for osg::Matrix
+
+        // Lua bindings for osg::Vec2f
+        util["vector2"] = [](float x, float y) { return osg::Vec2f(x, y); };
+        sol::usertype<osg::Vec2f> vec2Type = lua.new_usertype<osg::Vec2f>("Vec2");
+        vec2Type["x"] = sol::readonly_property([](const osg::Vec2f& v) -> float { return v.x(); } );
+        vec2Type["y"] = sol::readonly_property([](const osg::Vec2f& v) -> float { return v.y(); } );
+        vec2Type[sol::meta_function::to_string] = [](const osg::Vec2f& v) {
+            std::stringstream ss;
+            ss << "(" << v.x() << ", " << v.y() << ")";
+            return ss.str();
+        };
+        vec2Type[sol::meta_function::unary_minus] = [](const osg::Vec2f& a) { return -a; };
+        vec2Type[sol::meta_function::addition] = [](const osg::Vec2f& a, const osg::Vec2f& b) { return a + b; };
+        vec2Type[sol::meta_function::subtraction] = [](const osg::Vec2f& a, const osg::Vec2f& b) { return a - b; };
+        vec2Type[sol::meta_function::equal_to] = [](const osg::Vec2f& a, const osg::Vec2f& b) { return a == b; };
+        vec2Type[sol::meta_function::multiplication] = sol::overload(
+            [](const osg::Vec2f& a, float c) { return a * c; },
+            [](const osg::Vec2f& a, const osg::Vec2f& b) { return a * b; });
+        vec2Type[sol::meta_function::division] = [](const osg::Vec2f& a, float c) { return a / c; };
+        vec2Type["dot"] = [](const osg::Vec2f& a, const osg::Vec2f& b) { return a * b; };
+        vec2Type["length"] = &osg::Vec2f::length;
+        vec2Type["length2"] = &osg::Vec2f::length2;
+        vec2Type["normalize"] = [](const osg::Vec2f& v) {
+            float len = v.length();
+            if (len == 0)
+                return std::make_tuple(osg::Vec2f(), 0.f);
+            else
+                return std::make_tuple(v * (1.f / len), len);
+        };
+        vec2Type["rotate"] = &Misc::rotateVec2f;
+
+        // Lua bindings for osg::Vec3f
+        util["vector3"] = [](float x, float y, float z) { return osg::Vec3f(x, y, z); };
+        sol::usertype<osg::Vec3f> vec3Type = lua.new_usertype<osg::Vec3f>("Vec3");
+        vec3Type["x"] = sol::readonly_property([](const osg::Vec3f& v) -> float { return v.x(); } );
+        vec3Type["y"] = sol::readonly_property([](const osg::Vec3f& v) -> float { return v.y(); } );
+        vec3Type["z"] = sol::readonly_property([](const osg::Vec3f& v) -> float { return v.z(); } );
+        vec3Type[sol::meta_function::to_string] = [](const osg::Vec3f& v) {
+            std::stringstream ss;
+            ss << "(" << v.x() << ", " << v.y() << ", " << v.z() << ")";
+            return ss.str();
+        };
+        vec3Type[sol::meta_function::unary_minus] = [](const osg::Vec3f& a) { return -a; };
+        vec3Type[sol::meta_function::addition] = [](const osg::Vec3f& a, const osg::Vec3f& b) { return a + b; };
+        vec3Type[sol::meta_function::subtraction] = [](const osg::Vec3f& a, const osg::Vec3f& b) { return a - b; };
+        vec3Type[sol::meta_function::equal_to] = [](const osg::Vec3f& a, const osg::Vec3f& b) { return a == b; };
+        vec3Type[sol::meta_function::multiplication] = sol::overload(
+            [](const osg::Vec3f& a, float c) { return a * c; },
+            [](const osg::Vec3f& a, const osg::Vec3f& b) { return a * b; });
+        vec3Type[sol::meta_function::division] = [](const osg::Vec3f& a, float c) { return a / c; };
+        vec3Type[sol::meta_function::involution] = [](const osg::Vec3f& a, const osg::Vec3f& b) { return a ^ b; };
+        vec3Type["dot"] = [](const osg::Vec3f& a, const osg::Vec3f& b) { return a * b; };
+        vec3Type["cross"] = [](const osg::Vec3f& a, const osg::Vec3f& b) { return a ^ b; };
+        vec3Type["length"] = &osg::Vec3f::length;
+        vec3Type["length2"] = &osg::Vec3f::length2;
+        vec3Type["normalize"] = [](const osg::Vec3f& v) {
+            float len = v.length();
+            if (len == 0)
+                return std::make_tuple(osg::Vec3f(), 0.f);
+            else
+                return std::make_tuple(v * (1.f / len), len);
+        };
+
+        // Utility functions
+        util["clamp"] = [](float value, float from, float to) { return std::clamp(value, from, to); };
+        // NOTE: `util["clamp"] = std::clamp<float>` causes error 'AddressSanitizer: stack-use-after-scope'
+        util["normalizeAngle"] = &Misc::normalizeAngle;
+
+        return util;
+    }
+    
+}
diff --git a/components/lua/utilpackage.hpp b/components/lua/utilpackage.hpp
new file mode 100644
index 0000000000..06996fb96a
--- /dev/null
+++ b/components/lua/utilpackage.hpp
@@ -0,0 +1,13 @@
+#ifndef COMPONENTS_LUA_UTILPACKAGE_H
+#define COMPONENTS_LUA_UTILPACKAGE_H
+
+#include <sol/sol.hpp>
+
+namespace LuaUtil
+{
+
+    sol::table initUtilPackage(sol::state&);
+
+}
+
+#endif // COMPONENTS_LUA_UTILPACKAGE_H

From 8dbaf6022cdf88d7ab44c7cfa34326344d02d9c2 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 10 Jan 2021 14:41:50 +0100
Subject: [PATCH 0976/2859] Add components/lua/serilalization

---
 apps/openmw_test_suite/CMakeLists.txt         |   1 +
 .../lua/test_serialization.cpp                | 207 ++++++++++++++
 components/CMakeLists.txt                     |   2 +-
 components/lua/serialization.cpp              | 255 ++++++++++++++++++
 components/lua/serialization.hpp              |  34 +++
 5 files changed, 498 insertions(+), 1 deletion(-)
 create mode 100644 apps/openmw_test_suite/lua/test_serialization.cpp
 create mode 100644 components/lua/serialization.cpp
 create mode 100644 components/lua/serialization.hpp

diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index 3f82df1a52..8c54af0e00 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -17,6 +17,7 @@ if (GTEST_FOUND AND GMOCK_FOUND)
 
         lua/test_lua.cpp
         lua/test_utilpackage.cpp
+        lua/test_serialization.cpp
 
         misc/test_stringops.cpp
         misc/test_endianness.cpp
diff --git a/apps/openmw_test_suite/lua/test_serialization.cpp b/apps/openmw_test_suite/lua/test_serialization.cpp
new file mode 100644
index 0000000000..d3c01f6298
--- /dev/null
+++ b/apps/openmw_test_suite/lua/test_serialization.cpp
@@ -0,0 +1,207 @@
+#include "gmock/gmock.h"
+#include <gtest/gtest.h>
+
+#include <osg/Vec2f>
+#include <osg/Vec3f>
+
+#include <components/lua/serialization.hpp>
+
+#include <components/misc/endianness.hpp>
+
+#include "testing_util.hpp"
+
+namespace
+{
+    using namespace testing;
+
+    TEST(LuaSerializationTest, Nil)
+    {
+        sol::state lua;
+        EXPECT_EQ(LuaUtil::serialize(sol::nil), "");
+        EXPECT_EQ(LuaUtil::deserialize(lua, ""), sol::nil);
+    }
+
+    TEST(LuaSerializationTest, Number)
+    {
+        sol::state lua;
+        std::string serialized = LuaUtil::serialize(sol::make_object<double>(lua, 3.14));
+        EXPECT_EQ(serialized.size(), 10);  // version, type, 8 bytes value
+        sol::object value = LuaUtil::deserialize(lua, serialized);
+        ASSERT_TRUE(value.is<double>());
+        EXPECT_FLOAT_EQ(value.as<double>(), 3.14);
+    }
+
+    TEST(LuaSerializationTest, Boolean)
+    {
+        sol::state lua;
+        {
+            std::string serialized = LuaUtil::serialize(sol::make_object<bool>(lua, true));
+            EXPECT_EQ(serialized.size(), 3);  // version, type, 1 byte value
+            sol::object value = LuaUtil::deserialize(lua, serialized);
+            EXPECT_FALSE(value.is<double>());
+            ASSERT_TRUE(value.is<bool>());
+            EXPECT_TRUE(value.as<bool>());
+        }
+        {
+            std::string serialized = LuaUtil::serialize(sol::make_object<bool>(lua, false));
+            EXPECT_EQ(serialized.size(), 3);  // version, type, 1 byte value
+            sol::object value = LuaUtil::deserialize(lua, serialized);
+            EXPECT_FALSE(value.is<double>());
+            ASSERT_TRUE(value.is<bool>());
+            EXPECT_FALSE(value.as<bool>());
+        }
+    }
+
+    TEST(LuaSerializationTest, String)
+    {
+        sol::state lua;
+        std::string_view emptyString = "";
+        std::string_view shortString = "abc";
+        std::string_view longString = "It is a string with more than 32 characters...........................";
+        
+        {
+            std::string serialized = LuaUtil::serialize(sol::make_object<std::string_view>(lua, emptyString));
+            EXPECT_EQ(serialized.size(), 2);  // version, type
+            sol::object value = LuaUtil::deserialize(lua, serialized);
+            ASSERT_TRUE(value.is<std::string>());
+            EXPECT_EQ(value.as<std::string>(), emptyString);
+        }
+        {
+            std::string serialized = LuaUtil::serialize(sol::make_object<std::string_view>(lua, shortString));
+            EXPECT_EQ(serialized.size(), 2 + shortString.size());  // version, type, str data
+            sol::object value = LuaUtil::deserialize(lua, serialized);
+            ASSERT_TRUE(value.is<std::string>());
+            EXPECT_EQ(value.as<std::string>(), shortString);
+        }
+        {
+            std::string serialized = LuaUtil::serialize(sol::make_object<std::string_view>(lua, longString));
+            EXPECT_EQ(serialized.size(), 6 + longString.size());  // version, type, size, str data
+            sol::object value = LuaUtil::deserialize(lua, serialized);
+            ASSERT_TRUE(value.is<std::string>());
+            EXPECT_EQ(value.as<std::string>(), longString);
+        }
+    }
+
+    TEST(LuaSerializationTest, Vector)
+    {
+        sol::state lua;
+        osg::Vec2f vec2(1, 2);
+        osg::Vec3f vec3(1, 2, 3);
+
+        {
+            std::string serialized = LuaUtil::serialize(sol::make_object(lua, vec2));
+            EXPECT_EQ(serialized.size(), 10);  // version, type, 2x float
+            sol::object value = LuaUtil::deserialize(lua, serialized);
+            ASSERT_TRUE(value.is<osg::Vec2f>());
+            EXPECT_EQ(value.as<osg::Vec2f>(), vec2);
+        }
+        {
+            std::string serialized = LuaUtil::serialize(sol::make_object(lua, vec3));
+            EXPECT_EQ(serialized.size(), 14);  // version, type, 3x float
+            sol::object value = LuaUtil::deserialize(lua, serialized);
+            ASSERT_TRUE(value.is<osg::Vec3f>());
+            EXPECT_EQ(value.as<osg::Vec3f>(), vec3);
+        }
+    }
+
+    TEST(LuaSerializationTest, Table)
+    {
+        sol::state lua;
+        sol::table table(lua, sol::create);
+        table["aa"] = 1;
+        table["ab"] = true;
+        table["nested"] = sol::table(lua, sol::create);
+        table["nested"]["aa"] = 2;
+        table["nested"]["bb"] = "something";
+        table["nested"][5] = -0.5;
+        table["nested_empty"] = sol::table(lua, sol::create);
+        table[1] = osg::Vec2f(1, 2);
+        table[2] = osg::Vec2f(2, 1);
+
+        std::string serialized = LuaUtil::serialize(table);
+        EXPECT_EQ(serialized.size(), 123);
+        sol::table res_table = LuaUtil::deserialize(lua, serialized);
+
+        EXPECT_EQ(res_table.get<int>("aa"), 1);
+        EXPECT_EQ(res_table.get<bool>("ab"), true);
+        EXPECT_EQ(res_table.get<sol::table>("nested").get<int>("aa"), 2);
+        EXPECT_EQ(res_table.get<sol::table>("nested").get<std::string>("bb"), "something");
+        EXPECT_FLOAT_EQ(res_table.get<sol::table>("nested").get<double>(5), -0.5);
+        EXPECT_EQ(res_table.get<osg::Vec2f>(1), osg::Vec2f(1, 2));
+        EXPECT_EQ(res_table.get<osg::Vec2f>(2), osg::Vec2f(2, 1));
+    }
+
+    struct TestStruct1 { double a, b; };
+    struct TestStruct2 { int a, b; };
+
+    class TestSerializer final : public LuaUtil::UserdataSerializer
+    {
+        bool serialize(LuaUtil::BinaryData& out, const sol::userdata& data) const override
+        {
+            if (data.is<TestStruct1>())
+            {
+                TestStruct1 t = data.as<TestStruct1>();
+                t.a = Misc::toLittleEndian(t.a);
+                t.b = Misc::toLittleEndian(t.b);
+                append(out, "ts1", &t, sizeof(t));
+                return true;
+            }
+            if (data.is<TestStruct2>())
+            {
+                TestStruct2 t = data.as<TestStruct2>();
+                t.a = Misc::toLittleEndian(t.a);
+                t.b = Misc::toLittleEndian(t.b);
+                append(out, "test_struct2", &t, sizeof(t));
+                return true;
+            }
+            return false;
+        }
+
+        bool deserialize(std::string_view typeName, std::string_view binaryData, sol::state& lua) const override
+        {
+            if (typeName == "ts1")
+            {
+                if (sizeof(TestStruct1) != binaryData.size())
+                    throw std::runtime_error("Incorrect binaryData.size() for TestStruct1: " + std::to_string(binaryData.size()));
+                TestStruct1 t = *reinterpret_cast<const TestStruct1*>(binaryData.data());
+                t.a = Misc::fromLittleEndian(t.a);
+                t.b = Misc::fromLittleEndian(t.b);
+                sol::stack::push<TestStruct1>(lua, t);
+                return true;
+            }
+            if (typeName == "test_struct2")
+            {
+                if (sizeof(TestStruct2) != binaryData.size())
+                    throw std::runtime_error("Incorrect binaryData.size() for TestStruct2: " + std::to_string(binaryData.size()));
+                TestStruct2 t = *reinterpret_cast<const TestStruct2*>(binaryData.data());
+                t.a = Misc::fromLittleEndian(t.a);
+                t.b = Misc::fromLittleEndian(t.b);
+                sol::stack::push<TestStruct2>(lua, t);
+                return true;
+            }
+            return false;
+        }
+    };
+
+    TEST(LuaSerializationTest, UserdataSerializer)
+    {
+        sol::state lua;
+        sol::table table(lua, sol::create);
+        table["x"] = TestStruct1{1.5, 2.5};
+        table["y"] = TestStruct2{4, 3};
+        TestSerializer serializer;
+
+        EXPECT_ERROR(LuaUtil::serialize(table), "Unknown userdata");
+        std::string serialized = LuaUtil::serialize(table, &serializer);
+        EXPECT_ERROR(LuaUtil::deserialize(lua, serialized), "Unknown type:");
+        sol::table res = LuaUtil::deserialize(lua, serialized, &serializer);
+
+        TestStruct1 rx = res.get<TestStruct1>("x");
+        TestStruct2 ry = res.get<TestStruct2>("y");
+        EXPECT_EQ(rx.a, 1.5);
+        EXPECT_EQ(rx.b, 2.5);
+        EXPECT_EQ(ry.a, 4);
+        EXPECT_EQ(ry.b, 3);
+    }
+
+}
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index c09e118cbe..6724a9fa29 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -29,7 +29,7 @@ endif (GIT_CHECKOUT)
 # source files
 
 add_component_dir (lua
-    luastate utilpackage
+    luastate utilpackage serialization
     )
 
 add_component_dir (settings
diff --git a/components/lua/serialization.cpp b/components/lua/serialization.cpp
new file mode 100644
index 0000000000..acbe3c23c7
--- /dev/null
+++ b/components/lua/serialization.cpp
@@ -0,0 +1,255 @@
+#include "serialization.hpp"
+
+#include <osg/Vec2f>
+#include <osg/Vec3f>
+
+#include <components/misc/endianness.hpp>
+
+namespace LuaUtil
+{
+
+    constexpr unsigned char FORMAT_VERSION = 0;
+
+    enum class SerializedType
+    {
+        NUMBER =       0x0,
+        LONG_STRING =  0x1,
+        BOOLEAN =      0x2,
+        TABLE_START =  0x3,
+        TABLE_END =    0x4,
+
+        VEC2 =         0x10,
+        VEC3 =         0x11,
+    };
+    constexpr unsigned char SHORT_STRING_FLAG = 0x20;    // 0x001SSSSS. SSSSS = string length
+    constexpr unsigned char CUSTOM_FULL_FLAG = 0x40;     // 0b01TTTTTT + 32bit dataSize
+    constexpr unsigned char CUSTOM_COMPACT_FLAG = 0x80;  // 0b1SSSSTTT. SSSS = dataSize, TTT = (typeName size - 1)
+
+    static void appendType(BinaryData& out, SerializedType type)
+    {
+        out.push_back(static_cast<char>(type));
+    }
+
+    template <typename T>
+    static void appendValue(BinaryData& out, T v)
+    {
+        v = Misc::toLittleEndian(v);
+        out.append(reinterpret_cast<const char*>(&v), sizeof(v));
+    }
+
+    template <typename T>
+    static T getValue(std::string_view& binaryData)
+    {
+        if (binaryData.size() < sizeof(T))
+            throw std::runtime_error("Unexpected end");
+        T v;
+        std::memcpy(&v, binaryData.data(), sizeof(T));
+        binaryData = binaryData.substr(sizeof(T));
+        return Misc::fromLittleEndian(v);
+    }
+
+    static void appendString(BinaryData& out, std::string_view str)
+    {
+        if (str.size() < 32)
+            out.push_back(SHORT_STRING_FLAG | char(str.size()));
+        else
+        {
+            appendType(out, SerializedType::LONG_STRING);
+            appendValue<uint32_t>(out, str.size());
+        }
+        out.append(str.data(), str.size());
+    }
+
+    static void appendData(BinaryData& out, const void* data, size_t dataSize)
+    {
+        out.append(reinterpret_cast<const char*>(data), dataSize);
+    }
+
+    void UserdataSerializer::append(BinaryData& out, std::string_view typeName, const void* data, size_t dataSize)
+    {
+        assert(!typeName.empty() && typeName.size() <= 64);
+        if (typeName.size() <= 8 && dataSize < 16)
+        {  // Compact form: 0b1SSSSTTT. SSSS = dataSize, TTT = (typeName size - 1).
+            unsigned char t = CUSTOM_COMPACT_FLAG | (dataSize << 3) | (typeName.size() - 1);
+            out.push_back(t);
+        }
+        else
+        {  // Full form: 0b01TTTTTT + 32bit dataSize.
+            unsigned char t = CUSTOM_FULL_FLAG | (typeName.size() - 1);
+            out.push_back(t);
+            appendValue<uint32_t>(out, dataSize);
+        }
+        out.append(typeName.data(), typeName.size());
+        appendData(out, data, dataSize);
+    }
+
+    static void serializeUserdata(BinaryData& out, const sol::userdata& data, const UserdataSerializer* customSerializer)
+    {
+        if (data.is<osg::Vec2f>())
+        {
+            appendType(out, SerializedType::VEC2);
+            osg::Vec2f v = data.as<osg::Vec2f>();
+            appendValue<float>(out, v.x());
+            appendValue<float>(out, v.y());
+            return;
+        }
+        if (data.is<osg::Vec3f>())
+        {
+            appendType(out, SerializedType::VEC3);
+            osg::Vec3f v = data.as<osg::Vec3f>();
+            appendValue<float>(out, v.x());
+            appendValue<float>(out, v.y());
+            appendValue<float>(out, v.z());
+            return;
+        }
+        if (customSerializer && customSerializer->serialize(out, data))
+            return;
+        else
+            throw std::runtime_error("Unknown userdata");
+    }
+
+    static void serialize(BinaryData& out, const sol::object& obj, const UserdataSerializer* customSerializer, int recursionCounter)
+    {
+        if (obj.get_type() == sol::type::lightuserdata)
+            throw std::runtime_error("light userdata is not allowed to be serialized");
+        if (obj.is<sol::function>())
+            throw std::runtime_error("functions are not allowed to be serialized");
+        else if (obj.is<sol::userdata>())
+            serializeUserdata(out, obj, customSerializer);
+        else if (obj.is<sol::lua_table>())
+        {
+            if (recursionCounter >= 32)
+                throw std::runtime_error("Can not serialize more than 32 nested tables. Likely the table contains itself.");
+            sol::table table = obj;
+            appendType(out, SerializedType::TABLE_START);
+            for (auto& [key, value] : table)
+            {
+                serialize(out, key, customSerializer, recursionCounter + 1);
+                serialize(out, value, customSerializer, recursionCounter + 1);
+            }
+            appendType(out, SerializedType::TABLE_END);
+        }
+        else if (obj.is<double>())
+        {
+            appendType(out, SerializedType::NUMBER);
+            appendValue<double>(out, obj.as<double>());
+        }
+        else if (obj.is<std::string_view>())
+            appendString(out, obj.as<std::string_view>());
+        else if (obj.is<bool>())
+        {
+            char v = obj.as<bool>() ? 1 : 0;
+            appendType(out, SerializedType::BOOLEAN);
+            out.push_back(v);
+        } else
+            throw std::runtime_error("Unknown lua type");
+    }
+
+    static void deserializeImpl(sol::state& lua, std::string_view& binaryData, const UserdataSerializer* customSerializer)
+    {
+        if (binaryData.empty())
+            throw std::runtime_error("Unexpected end");
+        unsigned char type = binaryData[0];
+        binaryData = binaryData.substr(1);
+        if (type & (CUSTOM_COMPACT_FLAG | CUSTOM_FULL_FLAG))
+        {
+            size_t typeNameSize, dataSize;
+            if (type & CUSTOM_COMPACT_FLAG)
+            {  // Compact form: 0b1SSSSTTT. SSSS = dataSize, TTT = (typeName size - 1).
+                typeNameSize = (type & 7) + 1;
+                dataSize = (type >> 3) & 15;
+            }
+            else
+            {  // Full form: 0b01TTTTTT + 32bit dataSize.
+                typeNameSize = (type & 63) + 1;
+                dataSize = getValue<uint32_t>(binaryData);
+            }
+            std::string_view typeName = binaryData.substr(0, typeNameSize);
+            std::string_view data = binaryData.substr(typeNameSize, dataSize);
+            binaryData = binaryData.substr(typeNameSize + dataSize);
+            if (!customSerializer || !customSerializer->deserialize(typeName, data, lua))
+                throw std::runtime_error("Unknown type: " + std::string(typeName));
+            return;
+        }
+        if (type & SHORT_STRING_FLAG)
+        {
+            size_t size = type & 0x1f;
+            sol::stack::push<std::string_view>(lua.lua_state(), binaryData.substr(0, size));
+            binaryData = binaryData.substr(size);
+            return;
+        }
+        switch (static_cast<SerializedType>(type))
+        {
+            case SerializedType::NUMBER:
+                sol::stack::push<double>(lua.lua_state(), getValue<double>(binaryData));
+                return;
+            case SerializedType::BOOLEAN:
+                sol::stack::push<bool>(lua.lua_state(), getValue<char>(binaryData) != 0);
+                return;
+            case SerializedType::LONG_STRING:
+            {
+                uint32_t size = getValue<uint32_t>(binaryData);
+                sol::stack::push<std::string_view>(lua.lua_state(), binaryData.substr(0, size));
+                binaryData = binaryData.substr(size);
+                return;
+            }
+            case SerializedType::TABLE_START:
+            {
+                lua_createtable(lua, 0, 0);
+                while (!binaryData.empty() && binaryData[0] != char(SerializedType::TABLE_END))
+                {
+                    deserializeImpl(lua, binaryData, customSerializer);
+                    deserializeImpl(lua, binaryData, customSerializer);
+                    lua_settable(lua, -3);
+                }
+                if (binaryData.empty())
+                    throw std::runtime_error("Unexpected end");
+                binaryData = binaryData.substr(1);
+                return;
+            }
+            case SerializedType::TABLE_END:
+                throw std::runtime_error("Unexpected table end");
+            case SerializedType::VEC2:
+            {
+                float x = getValue<float>(binaryData);
+                float y = getValue<float>(binaryData);
+                sol::stack::push<osg::Vec2f>(lua.lua_state(), osg::Vec2f(x, y));
+                return;
+            }
+            case SerializedType::VEC3:
+            {
+                float x = getValue<float>(binaryData);
+                float y = getValue<float>(binaryData);
+                float z = getValue<float>(binaryData);
+                sol::stack::push<osg::Vec3f>(lua.lua_state(), osg::Vec3f(x, y, z));
+                return;
+            }
+            default: throw std::runtime_error("Unknown type: " + std::to_string(type));
+        }
+    }
+
+    BinaryData serialize(const sol::object& obj, const UserdataSerializer* customSerializer)
+    {
+        if (obj == sol::nil)
+            return "";
+        BinaryData res;
+        res.push_back(FORMAT_VERSION);
+        serialize(res, obj, customSerializer, 0);
+        return res;
+    }
+
+    sol::object deserialize(sol::state& lua, std::string_view binaryData, const UserdataSerializer* customSerializer)
+    {
+        if (binaryData.empty())
+            return sol::nil;
+        if (binaryData[0] != FORMAT_VERSION)
+            throw std::runtime_error("Incorrect version of Lua serialization format: " +
+                                     std::to_string(static_cast<unsigned>(binaryData[0])));
+        binaryData = binaryData.substr(1);
+        deserializeImpl(lua, binaryData, customSerializer);
+        if (!binaryData.empty())
+            throw std::runtime_error("Unexpected data after serialized object");
+        return sol::stack::pop<sol::object>(lua.lua_state());
+    }
+
+}
diff --git a/components/lua/serialization.hpp b/components/lua/serialization.hpp
new file mode 100644
index 0000000000..63f93baac8
--- /dev/null
+++ b/components/lua/serialization.hpp
@@ -0,0 +1,34 @@
+#ifndef COMPONENTS_LUA_SERIALIZATION_H
+#define COMPONENTS_LUA_SERIALIZATION_H
+
+#include <sol/sol.hpp>
+
+namespace LuaUtil
+{
+
+    // Note: it can contain \0
+    using BinaryData = std::string;
+
+    class UserdataSerializer
+    {
+    public:
+        virtual ~UserdataSerializer() {}
+
+        // Appends serialized sol::userdata to the end of BinaryData.
+        // Returns false if this type of userdata is not supported by this serializer.
+        virtual bool serialize(BinaryData&, const sol::userdata&) const = 0;
+
+        // Deserializes userdata of type "typeName" from binaryData. Should push the result on stack using sol::stack::push.
+        // Returns false if this type is not supported by this serializer.
+        virtual bool deserialize(std::string_view typeName, std::string_view binaryData, sol::state&) const = 0;
+
+    protected:
+        static void append(BinaryData&, std::string_view typeName, const void* data, size_t dataSize);
+    };
+
+    BinaryData serialize(const sol::object&, const UserdataSerializer* customSerializer = nullptr);
+    sol::object deserialize(sol::state& lua, std::string_view binaryData, const UserdataSerializer* customSerializer = nullptr);
+
+}
+
+#endif // COMPONENTS_LUA_SERIALIZATION_H

From 479856f8123cbcfe80e3f768bf8d4069070409ec Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Tue, 12 Jan 2021 23:18:49 +0100
Subject: [PATCH 0977/2859] Add components/lua/scriptscontainer and
 components/esm/luascripts

---
 apps/openmw_test_suite/CMakeLists.txt         |   1 +
 .../lua/test_scriptscontainer.cpp             | 375 +++++++++++++++
 components/CMakeLists.txt                     |   4 +-
 components/esm/luascripts.cpp                 |  80 ++++
 components/esm/luascripts.hpp                 |  47 ++
 components/lua/scriptscontainer.cpp           | 428 ++++++++++++++++++
 components/lua/scriptscontainer.hpp           | 212 +++++++++
 7 files changed, 1145 insertions(+), 2 deletions(-)
 create mode 100644 apps/openmw_test_suite/lua/test_scriptscontainer.cpp
 create mode 100644 components/esm/luascripts.cpp
 create mode 100644 components/esm/luascripts.hpp
 create mode 100644 components/lua/scriptscontainer.cpp
 create mode 100644 components/lua/scriptscontainer.hpp

diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index 8c54af0e00..f9d0e8140f 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -16,6 +16,7 @@ if (GTEST_FOUND AND GMOCK_FOUND)
         esm/variant.cpp
 
         lua/test_lua.cpp
+        lua/test_scriptscontainer.cpp
         lua/test_utilpackage.cpp
         lua/test_serialization.cpp
 
diff --git a/apps/openmw_test_suite/lua/test_scriptscontainer.cpp b/apps/openmw_test_suite/lua/test_scriptscontainer.cpp
new file mode 100644
index 0000000000..072ad334e8
--- /dev/null
+++ b/apps/openmw_test_suite/lua/test_scriptscontainer.cpp
@@ -0,0 +1,375 @@
+#include "gmock/gmock.h"
+#include <gtest/gtest.h>
+
+#include <components/esm/luascripts.hpp>
+
+#include <components/lua/luastate.hpp>
+#include <components/lua/scriptscontainer.hpp>
+
+#include "testing_util.hpp"
+
+namespace
+{
+    using namespace testing;
+
+    TestFile invalidScript("not a script");
+    TestFile incorrectScript("return { incorrectSection = {}, engineHandlers = { incorrectHandler = function() end } }");
+    TestFile emptyScript("");
+    
+    TestFile testScript(R"X(
+return {
+    engineHandlers = { onUpdate = function(dt) print(' update ' .. tostring(dt)) end },
+    eventHandlers = {
+        Event1 = function(eventData) print(' event1 ' .. tostring(eventData.x)) end,
+        Event2 = function(eventData) print(' event2 ' .. tostring(eventData.x)) end,
+        Print = function() print('print') end
+    }
+}
+)X");
+
+    TestFile stopEventScript(R"X(
+return {
+    eventHandlers = {
+        Event1 = function(eventData)
+            print(' event1 ' .. tostring(eventData.x))
+            return eventData.x >= 1
+        end
+    }
+}
+)X");
+
+    TestFile loadSaveScript(R"X(
+x = 0
+y = 0
+return {
+    engineHandlers = {
+        onSave = function(state)
+            return {x = x, y = y}
+        end,
+        onLoad = function(state)
+            x, y = state.x, state.y
+        end
+    },
+    eventHandlers = {
+        Set = function(eventData)
+            eventData.n = eventData.n - 1
+            if eventData.n == 0 then
+                x, y = eventData.x, eventData.y
+            end
+        end,
+        Print = function()
+            print(x, y)
+        end
+    }
+}
+)X");
+
+    TestFile interfaceScript(R"X(
+return {
+    interfaceName = "TestInterface",
+    interface = {
+        fn = function(x) print('FN', x) end,
+        value = 3.5
+    },
+}
+)X");
+
+    TestFile overrideInterfaceScript(R"X(
+local old = require('openmw.interfaces').TestInterface
+return {
+    interfaceName = "TestInterface",
+    interface = {
+        fn = function(x)
+            print('NEW FN', x)
+            old.fn(x)
+        end,
+        value = old.value + 1
+    },
+}
+)X");
+
+    TestFile useInterfaceScript(R"X(
+local interfaces = require('openmw.interfaces')
+return {
+    engineHandlers = {
+        onUpdate = function()
+            interfaces.TestInterface.fn(interfaces.TestInterface.value)
+        end,
+    },
+}
+)X");
+
+    struct LuaScriptsContainerTest : Test
+    {
+        std::unique_ptr<VFS::Manager> mVFS = createTestVFS({
+            {"invalid.lua", &invalidScript},
+            {"incorrect.lua", &incorrectScript},
+            {"empty.lua", &emptyScript},
+            {"test1.lua", &testScript},
+            {"test2.lua", &testScript},
+            {"stopEvent.lua", &stopEventScript},
+            {"loadSave1.lua", &loadSaveScript},
+            {"loadSave2.lua", &loadSaveScript},
+            {"testInterface.lua", &interfaceScript},
+            {"overrideInterface.lua", &overrideInterfaceScript},
+            {"useInterface.lua", &useInterfaceScript},
+        });
+
+        LuaUtil::LuaState mLua{mVFS.get()};
+    };
+
+    TEST_F(LuaScriptsContainerTest, VerifyStructure)
+    {
+        LuaUtil::ScriptsContainer scripts(&mLua, "Test");
+        {
+            testing::internal::CaptureStdout();
+            EXPECT_FALSE(scripts.addNewScript("invalid.lua"));
+            std::string output = testing::internal::GetCapturedStdout();
+            EXPECT_THAT(output, HasSubstr("Can't start Test[invalid.lua]"));
+        }
+        {
+            testing::internal::CaptureStdout();
+            EXPECT_TRUE(scripts.addNewScript("incorrect.lua"));
+            std::string output = testing::internal::GetCapturedStdout();
+            EXPECT_THAT(output, HasSubstr("Not supported handler 'incorrectHandler' in Test[incorrect.lua]"));
+            EXPECT_THAT(output, HasSubstr("Not supported section 'incorrectSection' in Test[incorrect.lua]"));
+        }
+        {
+            testing::internal::CaptureStdout();
+            EXPECT_TRUE(scripts.addNewScript("empty.lua"));
+            EXPECT_FALSE(scripts.addNewScript("empty.lua"));  // already present
+            EXPECT_EQ(internal::GetCapturedStdout(), "");
+        }
+    }
+
+    TEST_F(LuaScriptsContainerTest, CallHandler)
+    {
+        LuaUtil::ScriptsContainer scripts(&mLua, "Test");
+        testing::internal::CaptureStdout();
+        EXPECT_TRUE(scripts.addNewScript("test1.lua"));
+        EXPECT_TRUE(scripts.addNewScript("stopEvent.lua"));
+        EXPECT_TRUE(scripts.addNewScript("test2.lua"));
+        scripts.update(1.5f);
+        EXPECT_EQ(internal::GetCapturedStdout(), "Test[test1.lua]:\t update 1.5\n"
+                                                 "Test[test2.lua]:\t update 1.5\n");
+    }
+
+    TEST_F(LuaScriptsContainerTest, CallEvent)
+    {
+        LuaUtil::ScriptsContainer scripts(&mLua, "Test");
+        EXPECT_TRUE(scripts.addNewScript("test1.lua"));
+        EXPECT_TRUE(scripts.addNewScript("stopEvent.lua"));
+        EXPECT_TRUE(scripts.addNewScript("test2.lua"));
+
+        std::string X0 = LuaUtil::serialize(mLua.sol().create_table_with("x", 0.5));
+        std::string X1 = LuaUtil::serialize(mLua.sol().create_table_with("x", 1.5));
+
+        {
+            testing::internal::CaptureStdout();
+            scripts.receiveEvent("SomeEvent", X1);
+            EXPECT_EQ(internal::GetCapturedStdout(),
+                      "Test has received event 'SomeEvent', but there are no handlers for this event\n");
+        }
+        {
+            testing::internal::CaptureStdout();
+            scripts.receiveEvent("Event1", X1);
+            EXPECT_EQ(internal::GetCapturedStdout(),
+                      "Test[test2.lua]:\t event1 1.5\n"
+                      "Test[stopEvent.lua]:\t event1 1.5\n"
+                      "Test[test1.lua]:\t event1 1.5\n");
+        }
+        {
+            testing::internal::CaptureStdout();
+            scripts.receiveEvent("Event2", X1);
+            EXPECT_EQ(internal::GetCapturedStdout(),
+                      "Test[test2.lua]:\t event2 1.5\n"
+                      "Test[test1.lua]:\t event2 1.5\n");
+        }
+        {
+            testing::internal::CaptureStdout();
+            scripts.receiveEvent("Event1", X0);
+            EXPECT_EQ(internal::GetCapturedStdout(),
+                      "Test[test2.lua]:\t event1 0.5\n"
+                      "Test[stopEvent.lua]:\t event1 0.5\n");
+        }
+        {
+            testing::internal::CaptureStdout();
+            scripts.receiveEvent("Event2", X0);
+            EXPECT_EQ(internal::GetCapturedStdout(),
+                      "Test[test2.lua]:\t event2 0.5\n"
+                      "Test[test1.lua]:\t event2 0.5\n");
+        }
+    }
+
+    TEST_F(LuaScriptsContainerTest, RemoveScript)
+    {
+        LuaUtil::ScriptsContainer scripts(&mLua, "Test");
+        EXPECT_TRUE(scripts.addNewScript("test1.lua"));
+        EXPECT_TRUE(scripts.addNewScript("stopEvent.lua"));
+        EXPECT_TRUE(scripts.addNewScript("test2.lua"));
+        std::string X = LuaUtil::serialize(mLua.sol().create_table_with("x", 0.5));
+
+        {
+            testing::internal::CaptureStdout();
+            scripts.update(1.5f);
+            scripts.receiveEvent("Event1", X);
+            EXPECT_EQ(internal::GetCapturedStdout(),
+                      "Test[test1.lua]:\t update 1.5\n"
+                      "Test[test2.lua]:\t update 1.5\n"
+                      "Test[test2.lua]:\t event1 0.5\n"
+                      "Test[stopEvent.lua]:\t event1 0.5\n");
+        }
+        {
+            testing::internal::CaptureStdout();
+            EXPECT_TRUE(scripts.removeScript("stopEvent.lua"));
+            EXPECT_FALSE(scripts.removeScript("stopEvent.lua"));  // already removed
+            scripts.update(1.5f);
+            scripts.receiveEvent("Event1", X);
+            EXPECT_EQ(internal::GetCapturedStdout(),
+                      "Test[test1.lua]:\t update 1.5\n"
+                      "Test[test2.lua]:\t update 1.5\n"
+                      "Test[test2.lua]:\t event1 0.5\n"
+                      "Test[test1.lua]:\t event1 0.5\n");
+        }
+        {
+            testing::internal::CaptureStdout();
+            EXPECT_TRUE(scripts.removeScript("test1.lua"));
+            scripts.update(1.5f);
+            scripts.receiveEvent("Event1", X);
+            EXPECT_EQ(internal::GetCapturedStdout(),
+                      "Test[test2.lua]:\t update 1.5\n"
+                      "Test[test2.lua]:\t event1 0.5\n");
+        }
+    }
+
+    TEST_F(LuaScriptsContainerTest, Interface)
+    {
+        LuaUtil::ScriptsContainer scripts(&mLua, "Test");
+        testing::internal::CaptureStdout();
+        EXPECT_TRUE(scripts.addNewScript("testInterface.lua"));
+        EXPECT_TRUE(scripts.addNewScript("overrideInterface.lua"));
+        EXPECT_TRUE(scripts.addNewScript("useInterface.lua"));
+        scripts.update(1.5f);
+        EXPECT_TRUE(scripts.removeScript("overrideInterface.lua"));
+        scripts.update(1.5f);
+        EXPECT_EQ(internal::GetCapturedStdout(),
+            "Test[overrideInterface.lua]:\tNEW FN\t4.5\n"
+            "Test[testInterface.lua]:\tFN\t4.5\n"
+            "Test[testInterface.lua]:\tFN\t3.5\n");
+    }
+
+    TEST_F(LuaScriptsContainerTest, LoadSave)
+    {
+        LuaUtil::ScriptsContainer scripts1(&mLua, "Test");
+        LuaUtil::ScriptsContainer scripts2(&mLua, "Test");
+        LuaUtil::ScriptsContainer scripts3(&mLua, "Test");
+
+        EXPECT_TRUE(scripts1.addNewScript("loadSave1.lua"));
+        EXPECT_TRUE(scripts1.addNewScript("test1.lua"));
+        EXPECT_TRUE(scripts1.addNewScript("loadSave2.lua"));
+
+        EXPECT_TRUE(scripts3.addNewScript("test2.lua"));
+        EXPECT_TRUE(scripts3.addNewScript("loadSave2.lua"));
+
+        scripts1.receiveEvent("Set", LuaUtil::serialize(mLua.sol().create_table_with(
+            "n", 1,
+            "x", 0.5,
+            "y", 3.5)));
+        scripts1.receiveEvent("Set", LuaUtil::serialize(mLua.sol().create_table_with(
+            "n", 2,
+            "x", 2.5,
+            "y", 1.5)));
+
+        ESM::LuaScripts data;
+        scripts1.save(data);
+        scripts2.load(data, true);
+        scripts3.load(data, false);
+
+        {
+            testing::internal::CaptureStdout();
+            scripts2.receiveEvent("Print", "");
+            EXPECT_EQ(internal::GetCapturedStdout(),
+                "Test[loadSave2.lua]:\t0.5\t3.5\n"
+                "Test[test1.lua]:\tprint\n"
+                "Test[loadSave1.lua]:\t2.5\t1.5\n");
+        }
+        {
+            testing::internal::CaptureStdout();
+            scripts3.receiveEvent("Print", "");
+            EXPECT_EQ(internal::GetCapturedStdout(),
+                "Test[loadSave2.lua]:\t0.5\t3.5\n"
+                "Test[test2.lua]:\tprint\n");
+        }
+    }
+
+    TEST_F(LuaScriptsContainerTest, Timers)
+    {
+        LuaUtil::ScriptsContainer scripts(&mLua, "Test");
+        EXPECT_TRUE(scripts.addNewScript("test1.lua"));
+        EXPECT_TRUE(scripts.addNewScript("test2.lua"));
+
+        int counter1 = 0, counter2 = 0, counter3 = 0, counter4 = 0;
+        sol::function fn1 = sol::make_object(mLua.sol(), [&]() { counter1++; });
+        sol::function fn2 = sol::make_object(mLua.sol(), [&]() { counter2++; });
+        sol::function fn3 = sol::make_object(mLua.sol(), [&](int d) { counter3 += d; });
+        sol::function fn4 = sol::make_object(mLua.sol(), [&](int d) { counter4 += d; });
+
+        scripts.registerTimerCallback("test1.lua", "A", fn3);
+        scripts.registerTimerCallback("test1.lua", "B", fn4);
+        scripts.registerTimerCallback("test2.lua", "B", fn3);
+        scripts.registerTimerCallback("test2.lua", "A", fn4);
+
+        scripts.processTimers(1, 2);
+
+        scripts.setupSerializableTimer(false, 10, "test1.lua", "B", sol::make_object(mLua.sol(), 3));
+        scripts.setupSerializableTimer(true, 10, "test2.lua", "B", sol::make_object(mLua.sol(), 4));
+        scripts.setupSerializableTimer(false, 5, "test1.lua", "A", sol::make_object(mLua.sol(), 1));
+        scripts.setupSerializableTimer(true, 5, "test2.lua", "A", sol::make_object(mLua.sol(), 2));
+        scripts.setupSerializableTimer(false, 15, "test1.lua", "A", sol::make_object(mLua.sol(), 10));
+        scripts.setupSerializableTimer(false, 15, "test1.lua", "B", sol::make_object(mLua.sol(), 20));
+
+        scripts.setupUnsavableTimer(false, 10, "test2.lua", fn2);
+        scripts.setupUnsavableTimer(true, 10, "test1.lua", fn2);
+        scripts.setupUnsavableTimer(false, 5, "test2.lua", fn1);
+        scripts.setupUnsavableTimer(true, 5, "test1.lua", fn1);
+        scripts.setupUnsavableTimer(false, 15, "test2.lua", fn1);
+
+        EXPECT_EQ(counter1, 0);
+        EXPECT_EQ(counter3, 0);
+
+        scripts.processTimers(6, 4);
+
+        EXPECT_EQ(counter1, 1);
+        EXPECT_EQ(counter3, 1);
+        EXPECT_EQ(counter4, 0);
+
+        scripts.processTimers(6, 8);
+
+        EXPECT_EQ(counter1, 2);
+        EXPECT_EQ(counter2, 0);
+        EXPECT_EQ(counter3, 1);
+        EXPECT_EQ(counter4, 2);
+
+        scripts.processTimers(11, 12);
+
+        EXPECT_EQ(counter1, 2);
+        EXPECT_EQ(counter2, 2);
+        EXPECT_EQ(counter3, 5);
+        EXPECT_EQ(counter4, 5);
+
+        ESM::LuaScripts data;
+        scripts.save(data);
+        scripts.load(data, true);
+        scripts.registerTimerCallback("test1.lua", "B", fn4);
+
+        testing::internal::CaptureStdout();
+        scripts.processTimers(20, 20);
+        EXPECT_EQ(internal::GetCapturedStdout(), "Test[test1.lua] callTimer failed: Callback 'A' doesn't exist\n");
+
+        EXPECT_EQ(counter1, 2);
+        EXPECT_EQ(counter2, 2);
+        EXPECT_EQ(counter3, 5);
+        EXPECT_EQ(counter4, 25);
+    }
+
+}
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 6724a9fa29..8b66baab28 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -29,7 +29,7 @@ endif (GIT_CHECKOUT)
 # source files
 
 add_component_dir (lua
-    luastate utilpackage serialization
+    luastate scriptscontainer utilpackage serialization
     )
 
 add_component_dir (settings
@@ -84,7 +84,7 @@ add_component_dir (esm
     loadweap records aipackage effectlist spelllist variant variantimp loadtes3 cellref filter
     savedgame journalentry queststate locals globalscript player objectstate cellid cellstate globalmap inventorystate containerstate npcstate creaturestate dialoguestate statstate
     npcstats creaturestats weatherstate quickkeys fogstate spellstate activespells creaturelevliststate doorstate projectilestate debugprofile
-    aisequence magiceffects util custommarkerstate stolenitems transport animationstate controlsstate mappings
+    aisequence magiceffects util custommarkerstate stolenitems transport animationstate controlsstate mappings luascripts
     )
 
 add_component_dir (esmterrain
diff --git a/components/esm/luascripts.cpp b/components/esm/luascripts.cpp
new file mode 100644
index 0000000000..41d25ee8be
--- /dev/null
+++ b/components/esm/luascripts.cpp
@@ -0,0 +1,80 @@
+#include "luascripts.hpp"
+
+#include "esmreader.hpp"
+#include "esmwriter.hpp"
+
+// List of all records, that are related to Lua.
+//
+// Record:
+// LUAM - MWLua::LuaManager
+//
+// Subrecords:
+// LUAW - Start of MWLua::WorldView data
+// LUAE - Start of MWLua::LocalEvent or MWLua::GlobalEvent (eventName)
+// LUAS - Start LuaUtil::ScriptsContainer data (scriptName)
+// LUAD - Serialized Lua variable
+// LUAT - MWLua::ScriptsContainer::Timer
+// LUAC - Name of a timer callback (string)
+
+void ESM::saveLuaBinaryData(ESMWriter& esm, const std::string& data)
+{
+    if (data.empty())
+        return;
+    esm.startSubRecord("LUAD");
+    esm.write(data.data(), data.size());
+    esm.endRecord("LUAD");
+}
+
+std::string ESM::loadLuaBinaryData(ESMReader& esm)
+{
+    std::string data;
+    if (esm.isNextSub("LUAD"))
+    {
+        esm.getSubHeader();
+        data.resize(esm.getSubSize());
+        esm.getExact(data.data(), data.size());
+    }
+    return data;
+}
+
+void ESM::LuaScripts::load(ESMReader& esm)
+{
+    while (esm.isNextSub("LUAS"))
+    {
+        std::string name = esm.getHString();
+        std::string data = loadLuaBinaryData(esm);
+        std::vector<LuaTimer> timers;
+        while (esm.isNextSub("LUAT"))
+        {
+            esm.getSubHeader();
+            LuaTimer timer;
+            esm.getT(timer.mHours);
+            esm.getT(timer.mTime);
+            timer.mCallbackName = esm.getHNString("LUAC");
+            timer.mCallbackArgument = loadLuaBinaryData(esm);
+            timers.push_back(std::move(timer));
+        }
+        mScripts.push_back({std::move(name), std::move(data), std::move(timers)});
+    }
+}
+
+void ESM::LuaScripts::save(ESMWriter& esm) const
+{
+    for (const LuaScript& script : mScripts)
+    {
+        esm.writeHNString("LUAS", script.mScriptPath);
+        if (!script.mData.empty())
+            saveLuaBinaryData(esm, script.mData);
+        for (const LuaTimer& timer : script.mTimers)
+        {
+            esm.startSubRecord("LUAT");
+            esm.writeT(timer.mHours);
+            esm.writeT(timer.mTime);
+            esm.endRecord("LUAT");
+            esm.writeHNString("LUAC", timer.mCallbackName);
+            if (!timer.mCallbackArgument.empty())
+                saveLuaBinaryData(esm, timer.mCallbackArgument);
+            
+        }
+    }
+}
diff --git a/components/esm/luascripts.hpp b/components/esm/luascripts.hpp
new file mode 100644
index 0000000000..ef3553e2fb
--- /dev/null
+++ b/components/esm/luascripts.hpp
@@ -0,0 +1,47 @@
+#ifndef OPENMW_ESM_LUASCRIPTS_H
+#define OPENMW_ESM_LUASCRIPTS_H
+
+#include <vector>
+#include <string>
+
+namespace ESM
+{
+    class ESMReader;
+    class ESMWriter;
+
+    // Storage structure for LuaUtil::ScriptsContainer. This is not a top-level record.
+    // Used either for global scripts or for local scripts on a specific object.
+
+    struct LuaTimer
+    {
+        double mTime;
+        bool mHours;  // false - game seconds, true - game hours
+        std::string mCallbackName;
+        std::string mCallbackArgument;  // Serialized Lua table. It is a binary data. Can contain '\0'.
+    };
+
+    struct LuaScript
+    {
+        std::string mScriptPath;
+        std::string mData;  // Serialized Lua table. It is a binary data. Can contain '\0'.
+        std::vector<LuaTimer> mTimers;
+    };
+
+    struct LuaScripts
+    {
+        std::vector<LuaScript> mScripts;
+
+        void load (ESMReader &esm);
+        void save (ESMWriter &esm) const;
+    };
+
+    // Saves binary string `data` (can contain '\0') as record LUAD.
+    void saveLuaBinaryData(ESM::ESMWriter& esm, const std::string& data);
+
+    // Loads LUAD as binary string. If next subrecord is not LUAD, then returns an empty string.
+    std::string loadLuaBinaryData(ESM::ESMReader& esm);
+
+}
+
+#endif
+
diff --git a/components/lua/scriptscontainer.cpp b/components/lua/scriptscontainer.cpp
new file mode 100644
index 0000000000..cb2ab0a97e
--- /dev/null
+++ b/components/lua/scriptscontainer.cpp
@@ -0,0 +1,428 @@
+#include "scriptscontainer.hpp"
+
+#include <components/esm/luascripts.hpp>
+
+namespace LuaUtil
+{
+    static constexpr std::string_view ENGINE_HANDLERS = "engineHandlers";
+    static constexpr std::string_view EVENT_HANDLERS = "eventHandlers";
+
+    static constexpr std::string_view INTERFACE_NAME = "interfaceName";
+    static constexpr std::string_view INTERFACE = "interface";
+
+    static constexpr std::string_view HANDLER_SAVE = "onSave";
+    static constexpr std::string_view HANDLER_LOAD = "onLoad";
+
+    static constexpr std::string_view REGISTERED_TIMER_CALLBACKS = "_timers";
+    static constexpr std::string_view TEMPORARY_TIMER_CALLBACKS = "_temp_timers";
+
+    ScriptsContainer::ScriptsContainer(LuaUtil::LuaState* lua, std::string_view namePrefix) : mNamePrefix(namePrefix), mLua(*lua)
+    {
+        registerEngineHandlers({&mUpdateHandlers});
+        mPublicInterfaces = sol::table(lua->sol(), sol::create);
+        addPackage("openmw.interfaces", mPublicInterfaces);
+    }
+
+    void ScriptsContainer::addPackage(const std::string& packageName, sol::object package)
+    {
+        API[packageName] = mLua.makeReadOnly(std::move(package));
+    }
+
+    bool ScriptsContainer::addNewScript(const std::string& path)
+    {
+        if (mScripts.count(path) != 0)
+            return false;  // already present
+
+        try
+        {
+            sol::table hiddenData(mLua.sol(), sol::create);
+            hiddenData[ScriptId::KEY] = ScriptId{this, path};
+            hiddenData[REGISTERED_TIMER_CALLBACKS] = mLua.newTable();
+            hiddenData[TEMPORARY_TIMER_CALLBACKS] = mLua.newTable();
+            mScripts[path].mHiddenData = hiddenData;
+            sol::object script = mLua.runInNewSandbox(path, mNamePrefix, API, hiddenData);
+            std::string interfaceName = "";
+            sol::object publicInterface = sol::nil;
+            if (script != sol::nil)
+            {
+                for (auto& [key, value] : sol::table(script))
+                {
+                    std::string_view sectionName = key.as<std::string_view>();
+                    if (sectionName == ENGINE_HANDLERS)
+                        parseEngineHandlers(value, path);
+                    else if (sectionName == EVENT_HANDLERS)
+                        parseEventHandlers(value, path);
+                    else if (sectionName == INTERFACE_NAME)
+                        interfaceName = value.as<std::string>();
+                    else if (sectionName == INTERFACE)
+                        publicInterface = value.as<sol::table>();
+                    else
+                        Log(Debug::Error) << "Not supported section '" << sectionName << "' in " << mNamePrefix << "[" << path << "]";
+                }
+            }
+            if (interfaceName.empty() != (publicInterface == sol::nil))
+                Log(Debug::Error) << mNamePrefix << "[" << path << "]: 'interfaceName' should always be used together with 'interface'";
+            else if (!interfaceName.empty())
+                script.as<sol::table>()[INTERFACE] = mPublicInterfaces[interfaceName] = mLua.makeReadOnly(publicInterface);
+            mScriptOrder.push_back(path);
+            mScripts[path].mInterface = std::move(script);
+            return true;
+        }
+        catch (std::exception& e)
+        {
+            mScripts.erase(path);
+            Log(Debug::Error) << "Can't start " << mNamePrefix << "[" << path << "]; " << e.what();
+            return false;
+        }
+    }
+
+    bool ScriptsContainer::removeScript(const std::string& path)
+    {
+        auto it = mScripts.find(path);
+        if (it == mScripts.end())
+            return false;  // no such script
+        sol::object& script = it->second.mInterface;
+        if (getFieldOrNil(script, INTERFACE_NAME) != sol::nil)
+        {
+            std::string_view interfaceName = getFieldOrNil(script, INTERFACE_NAME).as<std::string_view>();
+            if (mPublicInterfaces[interfaceName] == getFieldOrNil(script, INTERFACE))
+            {
+                mPublicInterfaces[interfaceName] = sol::nil;
+                auto prevIt = mScriptOrder.rbegin();
+                while (*prevIt != path)
+                    prevIt++;
+                prevIt++;
+                while (prevIt != mScriptOrder.rend())
+                {
+                    sol::object& prevScript = mScripts[*(prevIt++)].mInterface;
+                    sol::object prevInterfaceName = getFieldOrNil(prevScript, INTERFACE_NAME);
+                    if (prevInterfaceName != sol::nil && prevInterfaceName.as<std::string_view>() == interfaceName)
+                    {
+                        mPublicInterfaces[interfaceName] = getFieldOrNil(prevScript, INTERFACE);
+                        break;
+                    }
+                }
+            }
+        }
+        sol::object engineHandlers = getFieldOrNil(script, ENGINE_HANDLERS);
+        if (engineHandlers != sol::nil)
+        {
+            for (auto& [key, value] : sol::table(engineHandlers))
+            {
+                std::string_view handlerName = key.as<std::string_view>();
+                auto it = mEngineHandlers.find(handlerName);
+                if (it == mEngineHandlers.end())
+                    continue;
+                std::vector<sol::protected_function>& list = it->second->mList;
+                list.erase(std::find(list.begin(), list.end(), value.as<sol::protected_function>()));
+            }
+        }
+        sol::object eventHandlers = getFieldOrNil(script, EVENT_HANDLERS);
+        if (eventHandlers != sol::nil)
+        {
+            for (auto& [key, value] : sol::table(eventHandlers))
+            {
+                EventHandlerList& list = mEventHandlers.find(key.as<std::string_view>())->second;
+                list.erase(std::find(list.begin(), list.end(), value.as<sol::protected_function>()));
+            }
+        }
+        mScripts.erase(it);
+        mScriptOrder.erase(std::find(mScriptOrder.begin(), mScriptOrder.end(), path));
+        return true;
+    }
+
+    void ScriptsContainer::parseEventHandlers(sol::table handlers, std::string_view scriptPath)
+    {
+        for (auto& [key, value] : handlers)
+        {
+            std::string_view eventName = key.as<std::string_view>();
+            auto it = mEventHandlers.find(eventName);
+            if (it == mEventHandlers.end())
+                it = mEventHandlers.insert({std::string(eventName), EventHandlerList()}).first;
+            it->second.push_back(value);
+        }
+    }
+
+    void ScriptsContainer::parseEngineHandlers(sol::table handlers, std::string_view scriptPath)
+    {
+        for (auto& [key, value] : handlers)
+        {
+            std::string_view handlerName = key.as<std::string_view>();
+            if (handlerName == HANDLER_LOAD || handlerName == HANDLER_SAVE)
+                continue;  // save and load are handled separately
+            auto it = mEngineHandlers.find(handlerName);
+            if (it == mEngineHandlers.end())
+                Log(Debug::Error) << "Not supported handler '" << handlerName << "' in " << mNamePrefix << "[" << scriptPath << "]";
+            else
+                it->second->mList.push_back(value);
+        }
+    }
+
+    void ScriptsContainer::receiveEvent(std::string_view eventName, std::string_view eventData)
+    {
+        auto it = mEventHandlers.find(eventName);
+        if (it == mEventHandlers.end())
+        {
+            Log(Debug::Warning) << mNamePrefix << " has received event '" << eventName << "', but there are no handlers for this event";
+            return;
+        }
+        sol::object data;
+        try
+        {
+            data = LuaUtil::deserialize(mLua.sol(), eventData, mSerializer);
+        }
+        catch (std::exception& e)
+        {
+            Log(Debug::Error) << mNamePrefix << " can not parse eventData for '" << eventName << "': " << e.what();
+            return;
+        }
+        EventHandlerList& list = it->second;
+        for (int i = list.size() - 1; i >= 0; --i)
+        {
+            try
+            {
+                sol::object res = LuaUtil::call(list[i], data);
+                if (res != sol::nil && !res.as<bool>())
+                    break;  // Skip other handlers if 'false' was returned.
+            }
+            catch (std::exception& e)
+            {
+                Log(Debug::Error) << mNamePrefix << " eventHandler[" << eventName << "] failed. " << e.what();
+            }
+        }
+    }
+
+    void ScriptsContainer::registerEngineHandlers(std::initializer_list<EngineHandlerList*> handlers)
+    {
+        for (EngineHandlerList* h : handlers)
+            mEngineHandlers[h->mName] = h;
+    }
+
+    void ScriptsContainer::save(ESM::LuaScripts& data)
+    {
+        std::map<std::string, std::vector<ESM::LuaTimer>> timers;
+        auto saveTimerFn = [&](const Timer& timer, bool inHours)
+        {
+            if (!timer.mSerializable)
+                return;
+            ESM::LuaTimer savedTimer;
+            savedTimer.mTime = timer.mTime;
+            savedTimer.mHours = inHours;
+            savedTimer.mCallbackName = std::get<std::string>(timer.mCallback);
+            savedTimer.mCallbackArgument = timer.mSerializedArg;
+            if (timers.count(timer.mScript) == 0)
+                timers[timer.mScript] = {};
+            timers[timer.mScript].push_back(std::move(savedTimer));
+        };
+        for (const Timer& timer : mSecondsTimersQueue)
+            saveTimerFn(timer, false);
+        for (const Timer& timer : mHoursTimersQueue)
+            saveTimerFn(timer, true);
+        data.mScripts.clear();
+        for (const std::string& path : mScriptOrder)
+        {
+            ESM::LuaScript savedScript;
+            savedScript.mScriptPath = path;
+            sol::object handler = getFieldOrNil(mScripts[path].mInterface, ENGINE_HANDLERS, HANDLER_SAVE);
+            if (handler != sol::nil)
+            {
+                try
+                {
+                    sol::object state = LuaUtil::call(handler);
+                    savedScript.mData = serialize(state, mSerializer);
+                }
+                catch (std::exception& e)
+                {
+                    Log(Debug::Error) << mNamePrefix << "[" << path << "] onSave failed: " << e.what();
+                }
+            }
+            auto timersIt = timers.find(path);
+            if (timersIt != timers.end())
+                savedScript.mTimers = std::move(timersIt->second);
+            data.mScripts.push_back(std::move(savedScript));
+        }
+    }
+
+    void ScriptsContainer::load(const ESM::LuaScripts& data, bool resetScriptList)
+    {
+        std::map<std::string, Script> scriptsWithoutSavedData;
+        if (resetScriptList)
+        {
+            removeAllScripts();
+            for (const ESM::LuaScript& script : data.mScripts)
+                addNewScript(script.mScriptPath);
+        }
+        else
+            scriptsWithoutSavedData = mScripts;
+        mSecondsTimersQueue.clear();
+        mHoursTimersQueue.clear();
+        for (const ESM::LuaScript& script : data.mScripts)
+        {
+            auto iter = mScripts.find(script.mScriptPath);
+            if (iter == mScripts.end())
+                continue;
+            scriptsWithoutSavedData.erase(iter->first);
+            iter->second.mHiddenData.get<sol::table>(TEMPORARY_TIMER_CALLBACKS).clear();
+            try
+            {
+                sol::object handler = getFieldOrNil(iter->second.mInterface, ENGINE_HANDLERS, HANDLER_LOAD);
+                if (handler != sol::nil)
+                {
+                    sol::object state = deserialize(mLua.sol(), script.mData, mSerializer);
+                    LuaUtil::call(handler, state);
+                }
+            }
+            catch (std::exception& e)
+            {
+                Log(Debug::Error) << mNamePrefix << "[" << script.mScriptPath << "] onLoad failed: " << e.what();
+            }
+            for (const ESM::LuaTimer& savedTimer : script.mTimers)
+            {
+                Timer timer;
+                timer.mCallback = savedTimer.mCallbackName;
+                timer.mSerializable = true;
+                timer.mScript = script.mScriptPath;
+                timer.mTime = savedTimer.mTime;
+
+                try
+                {
+                    timer.mArg = deserialize(mLua.sol(), savedTimer.mCallbackArgument, mSerializer);
+                    // It is important if the order of content files was changed. The deserialize-serialize procedure
+                    // updates refnums, so timer.mSerializedArg may be not equal to savedTimer.mCallbackArgument.
+                    timer.mSerializedArg = serialize(timer.mArg, mSerializer);
+
+                    if (savedTimer.mHours)
+                        mHoursTimersQueue.push_back(std::move(timer));
+                    else
+                        mSecondsTimersQueue.push_back(std::move(timer));
+                }
+                catch (std::exception& e)
+                {
+                    Log(Debug::Error) << mNamePrefix << "[" << script.mScriptPath << "] can not load timer: " << e.what();
+                }
+            }
+        }
+        for (auto& [path, script] : scriptsWithoutSavedData)
+        {
+            script.mHiddenData.get<sol::table>(TEMPORARY_TIMER_CALLBACKS).clear();
+            sol::object handler = getFieldOrNil(script.mInterface, ENGINE_HANDLERS, HANDLER_LOAD);
+            if (handler == sol::nil)
+                continue;
+            try { LuaUtil::call(handler); }
+            catch (std::exception& e)
+            {
+                Log(Debug::Error) << mNamePrefix << "[" << path << "] onLoad failed: " << e.what();
+            }
+        }
+        std::make_heap(mSecondsTimersQueue.begin(), mSecondsTimersQueue.end());
+        std::make_heap(mHoursTimersQueue.begin(), mHoursTimersQueue.end());
+    }
+
+    void ScriptsContainer::removeAllScripts()
+    {
+        mScripts.clear();
+        mScriptOrder.clear();
+        for (auto& [_, handlers] : mEngineHandlers)
+            handlers->mList.clear();
+        mEventHandlers.clear();
+        mSecondsTimersQueue.clear();
+        mHoursTimersQueue.clear();
+
+        mPublicInterfaces.clear();
+        // Assigned by mLua.makeReadOnly, but `clear` removes it, so we need to assign it again.
+        mPublicInterfaces[sol::meta_function::index] = mPublicInterfaces;
+    }
+
+    sol::table ScriptsContainer::getHiddenData(const std::string& scriptPath)
+    {
+        auto it = mScripts.find(scriptPath);
+        if (it == mScripts.end())
+            throw std::logic_error("ScriptsContainer::getHiddenData: script doesn't exist");
+        return it->second.mHiddenData;
+    }
+
+    void ScriptsContainer::registerTimerCallback(const std::string& scriptPath, std::string_view callbackName, sol::function callback)
+    {
+        getHiddenData(scriptPath)[REGISTERED_TIMER_CALLBACKS][callbackName] = std::move(callback);
+    }
+
+    void ScriptsContainer::insertTimer(std::vector<Timer>& timerQueue, Timer&& t)
+    {
+        timerQueue.push_back(std::move(t));
+        std::push_heap(timerQueue.begin(), timerQueue.end());
+    }
+
+    void ScriptsContainer::setupSerializableTimer(bool inHours, double time, const std::string& scriptPath,
+                                                  std::string_view callbackName, sol::object callbackArg)
+    {
+        Timer t;
+        t.mCallback = std::string(callbackName);
+        t.mScript = scriptPath;
+        t.mSerializable = true;
+        t.mTime = time;
+        t.mArg = callbackArg;
+        t.mSerializedArg = serialize(t.mArg, mSerializer);
+        insertTimer(inHours ? mHoursTimersQueue : mSecondsTimersQueue, std::move(t));
+    }
+
+    void ScriptsContainer::setupUnsavableTimer(bool inHours, double time, const std::string& scriptPath, sol::function callback)
+    {
+        Timer t;
+        t.mScript = scriptPath;
+        t.mSerializable = false;
+        t.mTime = time;
+
+        t.mCallback = mTemporaryCallbackCounter;
+        getHiddenData(scriptPath)[TEMPORARY_TIMER_CALLBACKS][mTemporaryCallbackCounter] = std::move(callback);
+        mTemporaryCallbackCounter++;
+
+        insertTimer(inHours ? mHoursTimersQueue : mSecondsTimersQueue, std::move(t));
+    }
+
+    void ScriptsContainer::callTimer(const Timer& t)
+    {
+        try
+        {
+            sol::table data = getHiddenData(t.mScript);
+            if (t.mSerializable)
+            {
+                const std::string& callbackName = std::get<std::string>(t.mCallback);
+                sol::object callback = data[REGISTERED_TIMER_CALLBACKS][callbackName];
+                if (!callback.is<sol::function>())
+                    throw std::logic_error("Callback '" + callbackName + "' doesn't exist");
+                LuaUtil::call(callback, t.mArg);
+            }
+            else
+            {
+                int64_t id = std::get<int64_t>(t.mCallback);
+                sol::table callbacks = data[TEMPORARY_TIMER_CALLBACKS];
+                sol::object callback = callbacks[id];
+                if (!callback.is<sol::function>())
+                    throw std::logic_error("Temporary timer callback doesn't exist");
+                LuaUtil::call(callback);
+                callbacks[id] = sol::nil;
+            }
+        }
+        catch (std::exception& e)
+        {
+            Log(Debug::Error) << mNamePrefix << "[" << t.mScript << "] callTimer failed: " << e.what();
+        }
+    }
+
+    void ScriptsContainer::updateTimerQueue(std::vector<Timer>& timerQueue, double time)
+    {
+        while (!timerQueue.empty() && timerQueue.front().mTime <= time)
+        {
+            callTimer(timerQueue.front());
+            std::pop_heap(timerQueue.begin(), timerQueue.end());
+            timerQueue.pop_back();
+        }
+    }
+
+    void ScriptsContainer::processTimers(double gameSeconds, double gameHours)
+    {
+        updateTimerQueue(mSecondsTimersQueue, gameSeconds);
+        updateTimerQueue(mHoursTimersQueue, gameHours);
+    }
+
+}
diff --git a/components/lua/scriptscontainer.hpp b/components/lua/scriptscontainer.hpp
new file mode 100644
index 0000000000..a5cb7d3e58
--- /dev/null
+++ b/components/lua/scriptscontainer.hpp
@@ -0,0 +1,212 @@
+#ifndef COMPONENTS_LUA_SCRIPTSCONTAINER_H
+#define COMPONENTS_LUA_SCRIPTSCONTAINER_H
+
+#include <map>
+#include <set>
+#include <string>
+
+#include <components/debug/debuglog.hpp>
+#include <components/esm/luascripts.hpp>
+
+#include "luastate.hpp"
+#include "serialization.hpp"
+
+namespace LuaUtil
+{
+
+// ScriptsContainer is a base class for all scripts containers (LocalScripts,
+// GlobalScripts, PlayerScripts, etc). Each script runs in a separate sandbox.
+// Scripts from different containers can interact to each other only via events.
+// Scripts within one container can interact via interfaces (not implemented yet).
+// All scripts from one container have the same set of API packages available.
+//
+// Each script should return a table in a specific format that describes its
+// handlers and interfaces. Every section of the table is optional. Basic structure:
+//
+//     local function update(dt)
+//         print("Update")
+//     end
+//
+//     local function someEventHandler(eventData)
+//         print("'SomeEvent' received")
+//     end
+//
+//     return {
+//         -- Provides interface for other scripts in the same container
+//         interfaceName = "InterfaceName",
+//         interface = {
+//             someFunction = function() print("someFunction was called from another script") end,
+//         },
+//
+//         -- Script interface for the engine. Not available for other script.
+//         -- An error is printed if unknown handler is specified.
+//         engineHandlers = {
+//             onUpdate = update,
+//             onSave = function() return ... end,
+//             onLoad = function(state) ... end,  -- "state" is the data that was earlier returned by onSave
+//
+//             -- Works only if ScriptsContainer::registerEngineHandler is overloaded in a child class
+//             -- and explicitly supports 'onSomethingElse'
+//             onSomethingElse = function() print("something else") end
+//         },
+//
+//         -- Handlers for events, sent from other scripts. Engine itself never sent events. Any name can be used for an event.
+//         eventHandlers = {
+//             SomeEvent = someEventHandler
+//         }
+//     }
+
+    class ScriptsContainer
+    {
+    public:
+        struct ScriptId
+        {
+            // ScriptId is stored in hidden data (see getHiddenData) with this key.
+            constexpr static std::string_view KEY = "_id";
+
+            ScriptsContainer* mContainer;
+            std::string mPath;
+        };
+
+        // `namePrefix` is a common prefix for all scripts in the container. Used in logs for error messages and `print` output.
+        ScriptsContainer(LuaUtil::LuaState* lua, std::string_view namePrefix);
+        ScriptsContainer(const ScriptsContainer&) = delete;
+        ScriptsContainer(ScriptsContainer&&) = delete;
+        virtual ~ScriptsContainer() {}
+
+        // Adds package that will be available (via `require`) for all scripts in the container.
+        // Automatically applies LuaState::makeReadOnly to the package.
+        void addPackage(const std::string& packageName, sol::object package);
+
+        // Finds a file with given path in the virtual file system, starts as a new script, and adds it to the container.
+        // Returns `true` if the script was successfully added. Otherwise prints an error message and returns `false`.
+        // `false` can be returned if either file not found or has syntax errors or such script already exists in the container.
+        bool addNewScript(const std::string& path);
+
+        // Removes script. Returns `true` if it was successfully removed.
+        bool removeScript(const std::string& path);
+        void removeAllScripts();
+
+        // Processes timers. gameSeconds and gameHours are time (in seconds and in game hours) passed from the game start.
+        void processTimers(double gameSeconds, double gameHours);
+
+        // Calls `onUpdate` (if present) for every script in the container.
+        // Handlers are called in the same order as scripts were added.
+        void update(float dt) { callEngineHandlers(mUpdateHandlers, dt); }
+
+        // Calls event handlers `eventName` (if present) for every script.
+        // If several scripts register handlers for `eventName`, they are called in reverse order.
+        // If some handler returns `false`, all remaining handlers are ignored. Any other return value
+        // (including `nil`) has no effect.
+        void receiveEvent(std::string_view eventName, std::string_view eventData);
+
+        // Serializer defines how to serialize/deserialize userdata. If serializer is not provided,
+        // only built-in types and types from util package can be serialized.
+        void setSerializer(const UserdataSerializer* serializer) { mSerializer = serializer; }
+
+        // Calls engineHandler "onSave" for every script and saves the list of the scripts with serialized data to ESM::LuaScripts.
+        void save(ESM::LuaScripts&);
+
+        // Calls engineHandler "onLoad" for every script with given data.
+        // If resetScriptList=true, then removes all currently active scripts and runs the scripts that were saved in ESM::LuaScripts.
+        // If resetScriptList=false, then list of running scripts is not changed, only engineHandlers "onLoad" are called.
+        void load(const ESM::LuaScripts&, bool resetScriptList);
+
+        // Returns the hidden data of a script.
+        // Each script has a corresponding "hidden data" - a lua table that is not accessible from the script itself,
+        // but can be used by built-in packages. It contains ScriptId and can contain any arbitrary data.
+        sol::table getHiddenData(const std::string& scriptPath);
+
+        // Callbacks for serializable timers should be registered in advance.
+        // The script with the given path should already present in the container.
+        void registerTimerCallback(const std::string& scriptPath, std::string_view callbackName, sol::function callback);
+
+        // Sets up a timer, that can be automatically saved and loaded.
+        //   inHours - false if time unit is game seconds and true if time unit if game hours.
+        //   time - the absolute game time (in seconds or in hours) when the timer should be executed.
+        //   scriptPath - script path in VFS is used as script id. The script with the given path should already present in the container.
+        //   callbackName - callback (should be registered in advance) for this timer.
+        //   callbackArg - parameter for the callback (should be serializable).
+        void setupSerializableTimer(bool inHours, double time, const std::string& scriptPath,
+                                    std::string_view callbackName, sol::object callbackArg);
+
+        // Creates a timer. `callback` is an arbitrary Lua function. This type of timers is called "unsavable"
+        // because it can not be stored in saves. I.e. loading a saved game will not fully restore the state.
+        void setupUnsavableTimer(bool inHours, double time, const std::string& scriptPath, sol::function callback);
+
+    protected:
+        struct EngineHandlerList
+        {
+            std::string_view mName;
+            std::vector<sol::protected_function> mList;
+
+            // "name" must be string literal
+            explicit EngineHandlerList(std::string_view name) : mName(name) {}
+        };
+
+        // Calls given handlers in direct order.
+        template <typename... Args>
+        void callEngineHandlers(EngineHandlerList& handlers, const Args&... args)
+        {
+            for (sol::protected_function& handler : handlers.mList)
+            {
+                try { LuaUtil::call(handler, args...); }
+                catch (std::exception& e)
+                {
+                    Log(Debug::Error) << mNamePrefix << " " << handlers.mName << " failed. " << e.what();
+                }
+            }
+        }
+
+        // To add a new engine handler a derived class should register the corresponding EngineHandlerList and define
+        // a public function (see how ScriptsContainer::update is implemented) that calls `callEngineHandlers`.
+        void registerEngineHandlers(std::initializer_list<EngineHandlerList*> handlers);
+
+        const std::string mNamePrefix;
+
+    private:
+        struct Script
+        {
+            sol::object mInterface;  // returned value of the script (sol::table or nil)
+            sol::table mHiddenData;
+        };
+        struct Timer
+        {
+            double mTime;
+            bool mSerializable;
+            std::string mScript;
+            std::variant<std::string, int64_t> mCallback;  // string if serializable, integer otherwise
+            sol::object mArg;
+            std::string mSerializedArg;
+
+            bool operator<(const Timer& t) const { return mTime > t.mTime; }
+        };
+        using EventHandlerList = std::vector<sol::protected_function>;
+
+        void parseEngineHandlers(sol::table handlers, std::string_view scriptPath);
+        void parseEventHandlers(sol::table handlers, std::string_view scriptPath);
+
+        void callTimer(const Timer& t);
+        void updateTimerQueue(std::vector<Timer>& timerQueue, double time);
+        static void insertTimer(std::vector<Timer>& timerQueue, Timer&& t);
+
+        LuaUtil::LuaState& mLua;
+        const UserdataSerializer* mSerializer = nullptr;
+        std::map<std::string, sol::object> API;
+
+        std::vector<std::string> mScriptOrder;
+        std::map<std::string, Script> mScripts;
+        sol::table mPublicInterfaces;
+
+        EngineHandlerList mUpdateHandlers{"onUpdate"};
+        std::map<std::string_view, EngineHandlerList*> mEngineHandlers;
+        std::map<std::string, EventHandlerList, std::less<>> mEventHandlers;
+
+        std::vector<Timer> mSecondsTimersQueue;
+        std::vector<Timer> mHoursTimersQueue;
+        int64_t mTemporaryCallbackCounter = 0;
+    };
+
+}
+
+#endif // COMPONENTS_LUA_SCRIPTSCONTAINER_H

From b53667d5551e53e8bde4d17d9e6b2cf0e4e52c18 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Mon, 26 Apr 2021 23:20:16 +0200
Subject: [PATCH 0978/2859] Queries. Data structures and lua bindings.

---
 apps/openmw_test_suite/CMakeLists.txt         |   1 +
 .../lua/test_querypackage.cpp                 |  29 +++
 components/CMakeLists.txt                     |   4 +
 components/queries/luabindings.cpp            | 118 +++++++++++
 components/queries/luabindings.hpp            |   8 +
 components/queries/query.cpp                  | 185 ++++++++++++++++++
 components/queries/query.hpp                  |  99 ++++++++++
 7 files changed, 444 insertions(+)
 create mode 100644 apps/openmw_test_suite/lua/test_querypackage.cpp
 create mode 100644 components/queries/luabindings.cpp
 create mode 100644 components/queries/luabindings.hpp
 create mode 100644 components/queries/query.cpp
 create mode 100644 components/queries/query.hpp

diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index f9d0e8140f..bd8b032378 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -19,6 +19,7 @@ if (GTEST_FOUND AND GMOCK_FOUND)
         lua/test_scriptscontainer.cpp
         lua/test_utilpackage.cpp
         lua/test_serialization.cpp
+        lua/test_querypackage.cpp
 
         misc/test_stringops.cpp
         misc/test_endianness.cpp
diff --git a/apps/openmw_test_suite/lua/test_querypackage.cpp b/apps/openmw_test_suite/lua/test_querypackage.cpp
new file mode 100644
index 0000000000..aeaf992db0
--- /dev/null
+++ b/apps/openmw_test_suite/lua/test_querypackage.cpp
@@ -0,0 +1,29 @@
+#include "gmock/gmock.h"
+#include <gtest/gtest.h>
+
+#include <components/queries/luabindings.hpp>
+
+namespace
+{
+    using namespace testing;
+
+    TEST(LuaQueryPackageTest, basic)
+    {
+        sol::state lua;
+        lua.open_libraries(sol::lib::base, sol::lib::string);
+        Queries::registerQueryBindings(lua);
+        lua["query"] = Queries::Query("test");
+        lua["fieldX"] = Queries::Field({ "x" }, typeid(std::string));
+        lua["fieldY"] = Queries::Field({ "y" }, typeid(int));
+        lua.safe_script("t = query:where(fieldX:eq('abc') + fieldX:like('%abcd%'))");
+        lua.safe_script("t = t:where(fieldY:gt(5))");
+        lua.safe_script("t = t:orderBy(fieldX)");
+        lua.safe_script("t = t:orderByDesc(fieldY)");
+        lua.safe_script("t = t:groupBy(fieldY)");
+        lua.safe_script("t = t:limit(10):offset(5)");
+        EXPECT_EQ(
+            lua.safe_script("return tostring(t)").get<std::string>(),
+            "SELECT test WHERE ((x == \"abc\") OR (x LIKE \"%abcd%\")) AND (y > 5) ORDER BY x, y DESC GROUP BY y LIMIT 10 OFFSET 5");
+    }
+}
+
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 8b66baab28..7629c9798f 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -156,6 +156,10 @@ add_component_dir (fallback
     fallback validate
     )
 
+add_component_dir (queries
+    query luabindings
+    )
+
 if(WIN32)
     add_component_dir (crashcatcher
         windows_crashcatcher
diff --git a/components/queries/luabindings.cpp b/components/queries/luabindings.cpp
new file mode 100644
index 0000000000..c830a140f7
--- /dev/null
+++ b/components/queries/luabindings.cpp
@@ -0,0 +1,118 @@
+#include "luabindings.hpp"
+
+namespace sol
+{
+    template <>
+    struct is_automagical<Queries::Field> : std::false_type {};
+
+    template <>
+    struct is_automagical<Queries::Filter> : std::false_type {};
+
+    template <>
+    struct is_automagical<Queries::Query> : std::false_type {};
+}
+
+namespace Queries
+{
+    template <Condition::Type type>
+    struct CondBuilder
+    {
+        Filter operator()(const Field& field, const sol::object& o)
+        {
+            FieldValue value;
+            if (field.type() == typeid(bool) && o.is<bool>())
+                value = o.as<bool>();
+            else if (field.type() == typeid(int32_t) && o.is<int32_t>())
+                value = o.as<int32_t>();
+            else if (field.type() == typeid(int64_t) && o.is<int64_t>())
+                value = o.as<int64_t>();
+            else if (field.type() == typeid(float) && o.is<float>())
+                value = o.as<float>();
+            else if (field.type() == typeid(double) && o.is<double>())
+                value = o.as<double>();
+            else if (field.type() == typeid(std::string) && o.is<std::string>())
+                value = o.as<std::string>();
+            else
+                throw std::logic_error("Invalid value for field " + field.toString());
+            Filter filter;
+            filter.add({&field, type, value});
+            return filter;
+        }
+    };
+
+    void registerQueryBindings(sol::state& lua)
+    {
+        sol::usertype<Field> field = lua.new_usertype<Field>("QueryField");
+        sol::usertype<Filter> filter = lua.new_usertype<Filter>("QueryFilter");
+        sol::usertype<Query> query = lua.new_usertype<Query>("Query");
+
+        field[sol::meta_function::to_string] = [](const Field& f) { return f.toString(); };
+        field["eq"] = CondBuilder<Condition::EQUAL>();
+        field["neq"] = CondBuilder<Condition::NOT_EQUAL>();
+        field["lt"] = CondBuilder<Condition::LESSER>();
+        field["lte"] = CondBuilder<Condition::LESSER_OR_EQUAL>();
+        field["gt"] = CondBuilder<Condition::GREATER>();
+        field["gte"] = CondBuilder<Condition::GREATER_OR_EQUAL>();
+        field["like"] = CondBuilder<Condition::LIKE>();
+
+        filter[sol::meta_function::to_string] = [](const Filter& filter) { return filter.toString(); };
+        filter[sol::meta_function::multiplication] = [](const Filter& a, const Filter& b)
+        {
+            Filter res = a;
+            res.add(b, Operation::AND);
+            return res;
+        };
+        filter[sol::meta_function::addition] = [](const Filter& a, const Filter& b)
+        {
+            Filter res = a;
+            res.add(b, Operation::OR);
+            return res;
+        };
+        filter[sol::meta_function::unary_minus] = [](const Filter& a)
+        {
+            Filter res = a;
+            if (!a.mConditions.empty())
+                res.mOperations.push_back({Operation::NOT, 0});
+            return res;
+        };
+
+        query[sol::meta_function::to_string] = [](const Query& q) { return q.toString(); };
+        query["where"] = [](const Query& q, const Filter& filter)
+        {
+            Query res = q;
+            res.mFilter.add(filter, Operation::AND);
+            return res;
+        };
+        query["orderBy"] = [](const Query& q, const Field& field)
+        {
+            Query res = q;
+            res.mOrderBy.push_back({&field, false});
+            return res;
+        };
+        query["orderByDesc"] = [](const Query& q, const Field& field)
+        {
+            Query res = q;
+            res.mOrderBy.push_back({&field, true});
+            return res;
+        };
+        query["groupBy"] = [](const Query& q, const Field& field)
+        {
+            Query res = q;
+            res.mGroupBy.push_back(&field);
+            return res;
+        };
+        query["offset"] = [](const Query& q, int64_t offset)
+        {
+            Query res = q;
+            res.mOffset = offset;
+            return res;
+        };
+        query["limit"] = [](const Query& q, int64_t limit)
+        {
+            Query res = q;
+            res.mLimit = limit;
+            return res;
+        };
+    }
+}
+
diff --git a/components/queries/luabindings.hpp b/components/queries/luabindings.hpp
new file mode 100644
index 0000000000..a23dfa932b
--- /dev/null
+++ b/components/queries/luabindings.hpp
@@ -0,0 +1,8 @@
+#include <sol/sol.hpp>
+
+#include "query.hpp"
+
+namespace Queries
+{
+    void registerQueryBindings(sol::state& lua);
+}
diff --git a/components/queries/query.cpp b/components/queries/query.cpp
new file mode 100644
index 0000000000..3c7f1517ee
--- /dev/null
+++ b/components/queries/query.cpp
@@ -0,0 +1,185 @@
+#include "query.hpp"
+
+#include <sstream>
+#include <iomanip>
+
+namespace Queries
+{
+    Field::Field(std::vector<std::string> path, std::type_index type)
+        : mPath(std::move(path))
+        , mType(type) {}
+
+    std::string Field::toString() const
+    {
+        std::string result;
+        for (const std::string& segment : mPath)
+        {
+            if (!result.empty())
+                result += ".";
+            result += segment;
+        }
+        return result;
+    }
+
+    std::string toString(const FieldValue& value)
+    {
+        return std::visit([](auto&& arg) -> std::string
+        {
+            using T = std::decay_t<decltype(arg)>;
+            if constexpr (std::is_same_v<T, std::string>)
+            {
+                std::ostringstream oss;
+                oss << std::quoted(arg);
+                return oss.str();
+            }
+            else if constexpr (std::is_same_v<T, bool>)
+                return arg ? "true" : "false";
+            else
+                return std::to_string(arg);
+        }, value);
+    }
+
+    std::string Condition::toString() const
+    {
+        std::string res;
+        res += mField->toString();
+        switch (mType)
+        {
+            case Condition::EQUAL: res += " == "; break;
+            case Condition::NOT_EQUAL: res += " != "; break;
+            case Condition::LESSER: res += " < "; break;
+            case Condition::LESSER_OR_EQUAL: res += " <= "; break;
+            case Condition::GREATER: res += " > "; break;
+            case Condition::GREATER_OR_EQUAL: res += " >= "; break;
+            case Condition::LIKE: res += " LIKE "; break;
+        }
+        res += Queries::toString(mValue);
+        return res;
+    }
+
+    void Filter::add(const Condition& c, Operation::Type op)
+    {
+        mOperations.push_back({Operation::PUSH, mConditions.size()});
+        mConditions.push_back(c);
+        if (mConditions.size() > 1)
+            mOperations.push_back({op, 0});
+    }
+
+    void Filter::add(const Filter& f, Operation::Type op)
+    {
+        size_t conditionOffset = mConditions.size();
+        size_t operationsBefore = mOperations.size();
+        mConditions.insert(mConditions.end(), f.mConditions.begin(), f.mConditions.end());
+        mOperations.insert(mOperations.end(), f.mOperations.begin(), f.mOperations.end());
+        for (size_t i = operationsBefore; i < mOperations.size(); ++i)
+            mOperations[i].mConditionIndex += conditionOffset;
+        if (conditionOffset > 0 && !f.mConditions.empty())
+            mOperations.push_back({op, 0});
+    }
+
+    std::string Filter::toString() const
+    {
+        if(mOperations.empty())
+            return "";
+        std::vector<std::string> stack;
+        auto pop = [&stack](){ auto v = stack.back(); stack.pop_back(); return v; };
+        auto push = [&stack](const std::string& s) { stack.push_back(s); };
+        for (const Operation& op : mOperations)
+        {
+            if(op.mType == Operation::PUSH)
+                push(mConditions[op.mConditionIndex].toString());
+            else if(op.mType == Operation::AND)
+            {
+                auto rhs = pop();
+                auto lhs = pop();
+                std::string res;
+                res += "(";
+                res += lhs;
+                res += ") AND (";
+                res += rhs;
+                res += ")";
+                push(res);
+            }
+            else if (op.mType == Operation::OR)
+            {
+                auto rhs = pop();
+                auto lhs = pop();
+                std::string res;
+                res += "(";
+                res += lhs;
+                res += ") OR (";
+                res += rhs;
+                res += ")";
+                push(res);
+            }
+            else if (op.mType == Operation::NOT)
+            {
+                std::string res;
+                res += "NOT (";
+                res += pop();
+                res += ")";
+                push(res);
+            }
+            else
+                throw std::logic_error("Unknown operation type!");
+        }
+        return pop();
+    }
+
+    std::string Query::toString() const
+    {
+        std::string res;
+        res += "SELECT ";
+        res += mQueryType;
+
+        std::string filter = mFilter.toString();
+        if(!filter.empty())
+        {
+            res += " WHERE ";
+            res += filter;
+        }
+
+        std::string order;
+        for(const OrderBy& ord : mOrderBy)
+        {
+            if(!order.empty())
+                order += ", ";
+            order += ord.mField->toString();
+            if(ord.mDescending)
+                order += " DESC";
+        }
+        if (!order.empty())
+        {
+            res += " ORDER BY ";
+            res += order;
+        }
+
+        std::string group;
+        for (const Field* f: mGroupBy)
+        {
+            if (!group.empty())
+                group += " ,";
+            group += f->toString();
+        }
+        if (!group.empty())
+        {
+            res += " GROUP BY ";
+            res += group;
+        }
+
+        if (mLimit != sNoLimit)
+        {
+            res += " LIMIT ";
+            res += std::to_string(mLimit);
+        }
+
+        if (mOffset != 0)
+        {
+            res += " OFFSET ";
+            res += std::to_string(mOffset);
+        }
+
+        return res;
+    }
+}
+
diff --git a/components/queries/query.hpp b/components/queries/query.hpp
new file mode 100644
index 0000000000..45144fed62
--- /dev/null
+++ b/components/queries/query.hpp
@@ -0,0 +1,99 @@
+#ifndef COMPONENTS_QUERIES_QUERY
+#define COMPONENTS_QUERIES_QUERY
+
+#include <string>
+#include <vector>
+#include <typeindex>
+#include <variant>
+#include <stdexcept>
+
+namespace Queries
+{
+    class Field
+    {
+        public:
+            Field(std::vector<std::string> path, std::type_index type);
+
+            const std::vector<std::string>& path() const { return mPath; }
+            const std::type_index type() const { return mType; }
+
+            std::string toString() const;
+
+        private:
+            std::vector<std::string> mPath;
+            std::type_index mType;
+    };
+
+    struct OrderBy
+    {
+        const Field* mField;
+        bool mDescending;
+    };
+
+    using FieldValue = std::variant<bool, int32_t, int64_t, float, double, std::string>;
+    std::string toString(const FieldValue& value);
+
+    struct Condition
+    {
+        enum Type
+        {
+            EQUAL = 0,
+            NOT_EQUAL = 1,
+            GREATER = 2,
+            GREATER_OR_EQUAL = 3,
+            LESSER = 4,
+            LESSER_OR_EQUAL = 5,
+            LIKE = 6,
+        };
+
+        std::string toString() const;
+
+        const Field* mField;
+        Type mType;
+        FieldValue mValue;
+    };
+
+    struct Operation
+    {
+        enum Type
+        {
+            PUSH = 0, // push condition on stack
+            NOT = 1, // invert top condition on stack
+            AND = 2, // logic AND for two top conditions
+            OR = 3, // logic OR for two top conditions
+        };
+
+        Type mType;
+        size_t mConditionIndex; // used only if mType == PUSH
+    };
+
+    struct Filter
+    {
+        std::string toString() const;
+
+        // combines with given condition or filter using operation `AND` or `OR`.
+        void add(const Condition& c, Operation::Type op = Operation::AND);
+        void add(const Filter& f, Operation::Type op = Operation::AND);
+
+        std::vector<Condition> mConditions;
+        std::vector<Operation> mOperations; // operations on conditions in reverse polish notation
+    };
+
+    struct Query
+    {
+        static constexpr int64_t sNoLimit = -1;
+
+        Query(std::string type) : mQueryType(std::move(type)) {}
+        std::string toString() const;
+
+        std::string mQueryType;
+        Filter mFilter;
+        std::vector<OrderBy> mOrderBy;
+        std::vector<const Field*> mGroupBy;
+        int64_t mOffset = 0;
+        int64_t mLimit = sNoLimit;
+    };
+}
+
+#endif // !COMPONENTS_QUERIES_QUERY
+

From 6db2450c90c7de74004c1d89b771080a1eaae99f Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Fri, 22 Jan 2021 15:48:37 +0100
Subject: [PATCH 0979/2859] Initial support of generated RefNums with negative
 mContentFile.

---
 apps/openmw/mwrender/groundcover.cpp  |  2 +-
 apps/openmw/mwrender/objectpaging.cpp |  2 +-
 apps/openmw/mwworld/cellref.cpp       | 22 ++++++++++++++++++++++
 apps/openmw/mwworld/cellref.hpp       |  4 ++++
 apps/openmw/mwworld/cellstore.cpp     |  2 +-
 apps/openmw/mwworld/esmstore.cpp      |  2 +-
 apps/openmw/mwworld/worldimp.cpp      |  2 +-
 components/esm/cellref.cpp            |  3 ++-
 components/esm/cellref.hpp            |  7 ++++---
 components/esm/globalscript.cpp       |  2 +-
 10 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwrender/groundcover.cpp b/apps/openmw/mwrender/groundcover.cpp
index 9416a48ec8..dd64c851f1 100644
--- a/apps/openmw/mwrender/groundcover.cpp
+++ b/apps/openmw/mwrender/groundcover.cpp
@@ -225,7 +225,7 @@ namespace MWRender
                         esm.resize(index+1);
                     cell->restore(esm[index], i);
                     ESM::CellRef ref;
-                    ref.mRefNum.mContentFile = ESM::RefNum::RefNum_NoContentFile;
+                    ref.mRefNum.unset();
                     bool deleted = false;
                     while(cell->getNextRef(esm[index], ref, deleted))
                     {
diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index a5792d56b9..6b5f9a6e34 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -422,7 +422,7 @@ namespace MWRender
                             esm.resize(index+1);
                         cell->restore(esm[index], i);
                         ESM::CellRef ref;
-                        ref.mRefNum.mContentFile = ESM::RefNum::RefNum_NoContentFile;
+                        ref.mRefNum.unset();
                         ESM::MovedCellRef cMRef;
                         cMRef.mRefNum.mIndex = 0;
                         bool deleted = false;
diff --git a/apps/openmw/mwworld/cellref.cpp b/apps/openmw/mwworld/cellref.cpp
index 188a80ae14..88c38736e8 100644
--- a/apps/openmw/mwworld/cellref.cpp
+++ b/apps/openmw/mwworld/cellref.cpp
@@ -1,5 +1,8 @@
 #include "cellref.hpp"
 
+#include <assert.h>
+
+#include <components/debug/debuglog.hpp>
 #include <components/esm/objectstate.hpp>
 
 namespace MWWorld
@@ -10,6 +13,25 @@ namespace MWWorld
         return mCellRef.mRefNum;
     }
 
+    const ESM::RefNum& CellRef::getOrAssignRefNum(ESM::RefNum& lastAssignedRefNum)
+    {
+        if (!mCellRef.mRefNum.isSet())
+        {
+            // Generated RefNums have negative mContentFile
+            assert(lastAssignedRefNum.mContentFile < 0);
+            lastAssignedRefNum.mIndex++;
+            if (lastAssignedRefNum.mIndex == 0)  // mIndex overflow, so mContentFile should be changed
+            {
+                lastAssignedRefNum.mContentFile--;
+                if (lastAssignedRefNum.mContentFile > 0)
+                    Log(Debug::Error) << "RefNum counter overflow in CellRef::getOrAssignRefNum";
+            }
+            mCellRef.mRefNum = lastAssignedRefNum;
+            mChanged = true;
+        }
+        return mCellRef.mRefNum;
+    }
+
     bool CellRef::hasContentFile() const
     {
         return mCellRef.mRefNum.hasContentFile();
diff --git a/apps/openmw/mwworld/cellref.hpp b/apps/openmw/mwworld/cellref.hpp
index f9f6dbdda2..6a6ac69c57 100644
--- a/apps/openmw/mwworld/cellref.hpp
+++ b/apps/openmw/mwworld/cellref.hpp
@@ -25,6 +25,10 @@ namespace MWWorld
         // Note: Currently unused for items in containers
         const ESM::RefNum& getRefNum() const;
 
+        // Returns RefNum.
+        // If RefNum is not set, assigns a generated one and changes the "lastAssignedRefNum" counter.
+        const ESM::RefNum& getOrAssignRefNum(ESM::RefNum& lastAssignedRefNum);
+
         // Set RefNum to its default state.
         void unsetRefNum();
 
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 3aaf6061e3..0d2ee85deb 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -615,7 +615,7 @@ namespace MWWorld
                 mCell->restore (esm[index], i);
 
                 ESM::CellRef ref;
-                ref.mRefNum.mContentFile = ESM::RefNum::RefNum_NoContentFile;
+                ref.mRefNum.unset();
 
                 // Get each reference in turn
                 ESM::MovedCellRef cMRef;
diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index 864cb0d9d1..4b9bdf7426 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -34,7 +34,7 @@ namespace
                 readers.resize(index + 1);
             cell.restore(readers[index], i);
             ESM::CellRef ref;
-            ref.mRefNum.mContentFile = ESM::RefNum::RefNum_NoContentFile;
+            ref.mRefNum.unset();
             bool deleted = false;
             while(cell.getNextRef(readers[index], ref, deleted))
             {
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 14c7716f2e..69167e5ccb 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -2020,7 +2020,7 @@ namespace MWWorld
             rayToObject = mRendering->castCameraToViewportRay(0.5f, 0.5f, maxDistance, ignorePlayer);
 
         facedObject = rayToObject.mHitObject;
-        if (facedObject.isEmpty() && rayToObject.mHitRefnum.hasContentFile())
+        if (facedObject.isEmpty() && rayToObject.mHitRefnum.isSet())
         {
             for (CellStore* cellstore : mWorldScene->getActiveCells())
             {
diff --git a/components/esm/cellref.cpp b/components/esm/cellref.cpp
index 7ec7e00f1a..81e0b9f557 100644
--- a/components/esm/cellref.cpp
+++ b/components/esm/cellref.cpp
@@ -24,8 +24,9 @@ void ESM::RefNum::save (ESMWriter &esm, bool wide, const std::string& tag) const
         esm.writeHNT (tag, *this, 8);
     else
     {
+        if (isSet() && !hasContentFile())
+            Log(Debug::Error) << "Generated RefNum can not be saved in 32bit format";
         int refNum = (mIndex & 0xffffff) | ((hasContentFile() ? mContentFile : 0xff)<<24);
-
         esm.writeHNT (tag, refNum, 4);
     }
 }
diff --git a/components/esm/cellref.hpp b/components/esm/cellref.hpp
index c2f7ff6de5..f6eff24cbf 100644
--- a/components/esm/cellref.hpp
+++ b/components/esm/cellref.hpp
@@ -23,9 +23,10 @@ namespace ESM
 
         void save (ESMWriter &esm, bool wide = false, const std::string& tag = "FRMR") const;
 
-        enum { RefNum_NoContentFile = -1 };
-        inline bool hasContentFile() const { return mContentFile != RefNum_NoContentFile; }
-        inline void unset() { mIndex = 0; mContentFile = RefNum_NoContentFile; }
+        inline bool hasContentFile() const { return mContentFile >= 0; }
+
+        inline bool isSet() const { return mIndex != 0 || mContentFile != -1; }
+        inline void unset() { *this = {0, -1}; }
 
         // Note: this method should not be used for objects with invalid RefNum
         // (for example, for objects from disabled plugins in savegames).
diff --git a/components/esm/globalscript.cpp b/components/esm/globalscript.cpp
index 016ea4f0cf..a8a8e79cf5 100644
--- a/components/esm/globalscript.cpp
+++ b/components/esm/globalscript.cpp
@@ -30,7 +30,7 @@ void ESM::GlobalScript::save (ESMWriter &esm) const
     if (!mTargetId.empty())
     {
         esm.writeHNOString ("TARG", mTargetId);
-        if (mTargetRef.hasContentFile())
+        if (mTargetRef.isSet())
             mTargetRef.save (esm, true, "FRMR");
     }
 }

From 7df500c385e352196b896e8e6fa7ee60c66fe87b Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Mon, 5 Apr 2021 23:25:51 +0200
Subject: [PATCH 0980/2859] Put RefData move constructor to cpp file

---
 apps/openmw/mwworld/refdata.cpp | 3 +++
 apps/openmw/mwworld/refdata.hpp | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwworld/refdata.cpp b/apps/openmw/mwworld/refdata.cpp
index 29c669caf9..9aa40ed4b1 100644
--- a/apps/openmw/mwworld/refdata.cpp
+++ b/apps/openmw/mwworld/refdata.cpp
@@ -130,6 +130,9 @@ namespace MWWorld
         {}
     }
 
+    RefData::RefData(RefData&& other) noexcept = default;
+    RefData& RefData::operator=(RefData&& other) noexcept = default;
+
     void RefData::setBaseNode(SceneUtil::PositionAttitudeTransform *base)
     {
         mBaseNode = base;
diff --git a/apps/openmw/mwworld/refdata.hpp b/apps/openmw/mwworld/refdata.hpp
index e2f77d09e0..640670d8e9 100644
--- a/apps/openmw/mwworld/refdata.hpp
+++ b/apps/openmw/mwworld/refdata.hpp
@@ -72,7 +72,7 @@ namespace MWWorld
             /// perform these operations).
 
             RefData (const RefData& refData);
-            RefData (RefData&& other) noexcept = default;
+            RefData (RefData&& other) noexcept;
 
             ~RefData();
 
@@ -81,7 +81,7 @@ namespace MWWorld
             /// perform this operations).
 
             RefData& operator= (const RefData& refData);
-            RefData& operator= (RefData&& other) noexcept = default;
+            RefData& operator= (RefData&& other) noexcept;
 
             /// Return base node (can be a null pointer).
             SceneUtil::PositionAttitudeTransform* getBaseNode();

From 3d7e3060646e678d29741632e9ad449375c8b14f Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Fri, 18 Dec 2020 23:21:10 +0100
Subject: [PATCH 0981/2859] Add apps/openmw/mwlua

---
 apps/openmw/CMakeLists.txt               |   5 +
 apps/openmw/engine.cpp                   |  45 +++++
 apps/openmw/engine.hpp                   |   7 +
 apps/openmw/mwbase/environment.cpp       |  17 +-
 apps/openmw/mwbase/environment.hpp       |   6 +
 apps/openmw/mwbase/luamanager.hpp        |  42 +++++
 apps/openmw/mwlua/eventqueue.hpp         |  23 +++
 apps/openmw/mwlua/globalscripts.hpp      |  36 ++++
 apps/openmw/mwlua/localscripts.cpp       |  44 +++++
 apps/openmw/mwlua/localscripts.hpp       |  39 +++++
 apps/openmw/mwlua/luabindings.cpp        |  39 +++++
 apps/openmw/mwlua/luabindings.hpp        |  36 ++++
 apps/openmw/mwlua/luamanagerimp.cpp      | 202 +++++++++++++++++++++++
 apps/openmw/mwlua/luamanagerimp.hpp      |  78 +++++++++
 apps/openmw/mwlua/object.cpp             | 111 +++++++++++++
 apps/openmw/mwlua/object.hpp             | 103 ++++++++++++
 apps/openmw/mwlua/objectbindings.cpp     | 106 ++++++++++++
 apps/openmw/mwlua/playerscripts.hpp      |  25 +++
 apps/openmw/mwlua/userdataserializer.cpp |  64 +++++++
 apps/openmw/mwlua/userdataserializer.hpp |  19 +++
 apps/openmw/mwlua/worldview.cpp          |  68 ++++++++
 apps/openmw/mwlua/worldview.hpp          |  47 ++++++
 apps/openmw/mwworld/refdata.cpp          |  10 ++
 apps/openmw/mwworld/refdata.hpp          |   9 +
 24 files changed, 1180 insertions(+), 1 deletion(-)
 create mode 100644 apps/openmw/mwbase/luamanager.hpp
 create mode 100644 apps/openmw/mwlua/eventqueue.hpp
 create mode 100644 apps/openmw/mwlua/globalscripts.hpp
 create mode 100644 apps/openmw/mwlua/localscripts.cpp
 create mode 100644 apps/openmw/mwlua/localscripts.hpp
 create mode 100644 apps/openmw/mwlua/luabindings.cpp
 create mode 100644 apps/openmw/mwlua/luabindings.hpp
 create mode 100644 apps/openmw/mwlua/luamanagerimp.cpp
 create mode 100644 apps/openmw/mwlua/luamanagerimp.hpp
 create mode 100644 apps/openmw/mwlua/object.cpp
 create mode 100644 apps/openmw/mwlua/object.hpp
 create mode 100644 apps/openmw/mwlua/objectbindings.cpp
 create mode 100644 apps/openmw/mwlua/playerscripts.hpp
 create mode 100644 apps/openmw/mwlua/userdataserializer.cpp
 create mode 100644 apps/openmw/mwlua/userdataserializer.hpp
 create mode 100644 apps/openmw/mwlua/worldview.cpp
 create mode 100644 apps/openmw/mwlua/worldview.hpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index c5c85dae86..1cf87388a6 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -55,6 +55,11 @@ add_openmw_dir (mwscript
     animationextensions transformationextensions consoleextensions userextensions
     )
 
+add_openmw_dir (mwlua
+    luamanagerimp localscripts object worldview luabindings userdataserializer
+    objectbindings
+    )
+
 add_openmw_dir (mwsound
     soundmanagerimp openal_output ffmpeg_decoder sound sound_buffer sound_decoder sound_output
     loudness movieaudiofactory alext efx efx-presets regionsoundselector watersoundupdater volumesettings
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 93d3530c0a..3b7d17e69b 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -1,5 +1,6 @@
 #include "engine.hpp"
 
+#include <atomic>
 #include <iomanip>
 #include <fstream>
 #include <chrono>
@@ -46,6 +47,8 @@
 
 #include "mwgui/windowmanagerimp.hpp"
 
+#include "mwlua/luamanagerimp.hpp"
+
 #include "mwscript/scriptmanagerimp.hpp"
 #include "mwscript/interpretercontext.hpp"
 
@@ -101,6 +104,7 @@ namespace
         PhysicsWorker,
         World,
         Gui,
+        Lua,
 
         Number,
     };
@@ -138,6 +142,9 @@ namespace
     template <>
     const UserStats UserStatsValue<UserStatsType::Gui>::sValue {"Gui", "gui"};
 
+    template <>
+    const UserStats UserStatsValue<UserStatsType::Lua>::sValue {"Lua", "lua"};
+
     template <UserStatsType type>
     struct ForEachUserStatsValue
     {
@@ -700,6 +707,9 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
 
     mViewer->addEventHandler(mScreenCaptureHandler);
 
+    mLuaManager = new MWLua::LuaManager(mVFS.get());
+    mEnvironment.setLuaManager(mLuaManager);
+
     // Create input and UI first to set up a bootstrapping environment for
     // showing a loading screen and keeping the window responsive while doing so
 
@@ -811,6 +821,8 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
                 << 100*static_cast<double> (result.second)/result.first
                 << "%)";
     }
+
+    mLuaManager->init();
 }
 
 // Initialise and enter main loop.
@@ -895,6 +907,28 @@ void OMW::Engine::go()
         mEnvironment.getWindowManager()->executeInConsole(mStartupScript);
     }
 
+    // Start Lua scripting thread
+    std::atomic_bool luaUpdateRequest;
+    double luaDt = 0;
+    std::thread scriptingThread([&]() {
+        const osg::Timer* const timer = osg::Timer::instance();
+        osg::Stats* const stats = mViewer->getViewerStats();
+        while (!mViewer->done() && !mEnvironment.getStateManager()->hasQuitRequest())
+        {
+            while (!luaUpdateRequest)
+                std::this_thread::yield();
+
+            {
+                const osg::Timer_t frameStart = mViewer->getStartTick();
+                const unsigned int frameNumber = mViewer->getFrameStamp()->getFrameNumber();
+                ScopedProfile<UserStatsType::Lua> profile(frameStart, frameNumber, *timer, *stats);
+
+                mLuaManager->update(mEnvironment.getWindowManager()->isGuiMode(), luaDt);
+            }
+            luaUpdateRequest = false;
+        }
+    });
+
     // Start the main rendering loop
     double simulationTime = 0.0;
     Misc::FrameRateLimiter frameRateLimiter = Misc::makeFrameRateLimiter(mEnvironment.getFrameRateLimit());
@@ -920,8 +954,17 @@ void OMW::Engine::go()
 
             mEnvironment.getWorld()->updateWindowManager();
 
+            // scriptingThread starts processing Lua scripts
+            luaDt = dt;
+            luaUpdateRequest = true;
+
             mViewer->renderingTraversals();
 
+            // wait for scriptingThread to finish
+            while (luaUpdateRequest)
+                std::this_thread::yield();
+            mLuaManager->applyQueuedChanges();
+
             bool guiActive = mEnvironment.getWindowManager()->isGuiMode();
             if (!guiActive)
                 simulationTime += dt;
@@ -943,6 +986,8 @@ void OMW::Engine::go()
         frameRateLimiter.limit();
     }
 
+    scriptingThread.join();
+
     // Save user settings
     settings.saveUser(settingspath);
 
diff --git a/apps/openmw/engine.hpp b/apps/openmw/engine.hpp
index 49ae92abc1..efa8c688dd 100644
--- a/apps/openmw/engine.hpp
+++ b/apps/openmw/engine.hpp
@@ -33,6 +33,11 @@ namespace Compiler
     class Context;
 }
 
+namespace MWLua
+{
+    class LuaManager;
+}
+
 namespace Files
 {
     struct ConfigurationManager;
@@ -85,6 +90,8 @@ namespace OMW
             Compiler::Extensions mExtensions;
             Compiler::Context *mScriptContext;
 
+            MWLua::LuaManager* mLuaManager;
+
             Files::Collections mFileCollections;
             bool mFSStrict;
             Translation::Storage mTranslationDataStorage;
diff --git a/apps/openmw/mwbase/environment.cpp b/apps/openmw/mwbase/environment.cpp
index b7235edd4b..71940f67d2 100644
--- a/apps/openmw/mwbase/environment.cpp
+++ b/apps/openmw/mwbase/environment.cpp
@@ -13,13 +13,14 @@
 #include "inputmanager.hpp"
 #include "windowmanager.hpp"
 #include "statemanager.hpp"
+#include "luamanager.hpp"
 
 MWBase::Environment *MWBase::Environment::sThis = nullptr;
 
 MWBase::Environment::Environment()
 : mWorld (nullptr), mSoundManager (nullptr), mScriptManager (nullptr), mWindowManager (nullptr),
   mMechanicsManager (nullptr),  mDialogueManager (nullptr), mJournal (nullptr), mInputManager (nullptr),
-    mStateManager (nullptr), mResourceSystem (nullptr),  mFrameDuration (0), mFrameRateLimit(0.f)
+    mStateManager (nullptr), mLuaManager (nullptr), mResourceSystem (nullptr),  mFrameDuration (0), mFrameRateLimit(0.f)
 {
     assert (!sThis);
     sThis = this;
@@ -76,6 +77,11 @@ void MWBase::Environment::setStateManager (StateManager *stateManager)
     mStateManager = stateManager;
 }
 
+void MWBase::Environment::setLuaManager (LuaManager *luaManager)
+{
+    mLuaManager = luaManager;
+}
+
 void MWBase::Environment::setResourceSystem (Resource::ResourceSystem *resourceSystem)
 {
     mResourceSystem = resourceSystem;
@@ -150,6 +156,12 @@ MWBase::StateManager *MWBase::Environment::getStateManager() const
     return mStateManager;
 }
 
+MWBase::LuaManager *MWBase::Environment::getLuaManager() const
+{
+    assert (mLuaManager);
+    return mLuaManager;
+}
+
 Resource::ResourceSystem *MWBase::Environment::getResourceSystem() const
 {
     return mResourceSystem;
@@ -188,6 +200,9 @@ void MWBase::Environment::cleanup()
 
     delete mStateManager;
     mStateManager = nullptr;
+
+    delete mLuaManager;
+    mLuaManager = nullptr;
 }
 
 const MWBase::Environment& MWBase::Environment::get()
diff --git a/apps/openmw/mwbase/environment.hpp b/apps/openmw/mwbase/environment.hpp
index 3b57e4e7c1..b2600e7dd5 100644
--- a/apps/openmw/mwbase/environment.hpp
+++ b/apps/openmw/mwbase/environment.hpp
@@ -22,6 +22,7 @@ namespace MWBase
     class InputManager;
     class WindowManager;
     class StateManager;
+    class LuaManager;
 
     /// \brief Central hub for mw-subsystems
     ///
@@ -42,6 +43,7 @@ namespace MWBase
             Journal *mJournal;
             InputManager *mInputManager;
             StateManager *mStateManager;
+            LuaManager *mLuaManager;
             Resource::ResourceSystem *mResourceSystem;
             float mFrameDuration;
             float mFrameRateLimit;
@@ -76,6 +78,8 @@ namespace MWBase
 
             void setStateManager (StateManager *stateManager);
 
+            void setLuaManager (LuaManager *luaManager);
+
             void setResourceSystem (Resource::ResourceSystem *resourceSystem);
 
             void setFrameDuration (float duration);
@@ -102,6 +106,8 @@ namespace MWBase
 
             StateManager *getStateManager() const;
 
+            LuaManager *getLuaManager() const;
+
             Resource::ResourceSystem *getResourceSystem() const;
 
             float getFrameDuration() const;
diff --git a/apps/openmw/mwbase/luamanager.hpp b/apps/openmw/mwbase/luamanager.hpp
new file mode 100644
index 0000000000..ad374c9dba
--- /dev/null
+++ b/apps/openmw/mwbase/luamanager.hpp
@@ -0,0 +1,42 @@
+#ifndef GAME_MWBASE_LUAMANAGER_H
+#define GAME_MWBASE_LUAMANAGER_H
+
+#include <SDL_events.h>
+
+namespace MWWorld
+{
+    class Ptr;
+}
+
+namespace MWBase
+{
+
+    class LuaManager
+    {
+    public:
+        virtual ~LuaManager() = default;
+
+        virtual void newGameStarted() = 0;
+        virtual void objectAddedToScene(const MWWorld::Ptr& ptr) = 0;
+        virtual void objectRemovedFromScene(const MWWorld::Ptr& ptr) = 0;
+        virtual void keyPressed(const SDL_KeyboardEvent &arg) = 0;
+
+        struct ActorControls {
+            bool controlledFromLua;
+
+            bool jump;
+            bool run;
+            float movement;
+            float sideMovement;
+            float turn;
+        };
+
+        virtual const ActorControls* getActorControls(const MWWorld::Ptr&) const = 0;
+
+        virtual void clear() = 0;
+        virtual void setupPlayer(const MWWorld::Ptr&) = 0;
+    };
+
+}
+
+#endif  // GAME_MWBASE_LUAMANAGER_H
diff --git a/apps/openmw/mwlua/eventqueue.hpp b/apps/openmw/mwlua/eventqueue.hpp
new file mode 100644
index 0000000000..cd79e05dc0
--- /dev/null
+++ b/apps/openmw/mwlua/eventqueue.hpp
@@ -0,0 +1,23 @@
+#ifndef MWLUA_EVENTQUEUE_H
+#define MWLUA_EVENTQUEUE_H
+
+#include "object.hpp"
+
+namespace MWLua
+{
+    struct GlobalEvent
+    {
+        std::string eventName;
+        std::string eventData;
+    };
+    struct LocalEvent
+    {
+        ObjectId dest;
+        std::string eventName;
+        std::string eventData;
+    };
+    using GlobalEventQueue = std::vector<GlobalEvent>;
+    using LocalEventQueue = std::vector<LocalEvent>;
+}
+
+#endif // MWLUA_EVENTQUEUE_H
diff --git a/apps/openmw/mwlua/globalscripts.hpp b/apps/openmw/mwlua/globalscripts.hpp
new file mode 100644
index 0000000000..9a371809ac
--- /dev/null
+++ b/apps/openmw/mwlua/globalscripts.hpp
@@ -0,0 +1,36 @@
+#ifndef MWLUA_GLOBALSCRIPTS_H
+#define MWLUA_GLOBALSCRIPTS_H
+
+#include <memory>
+#include <set>
+#include <string>
+
+#include <components/lua/luastate.hpp>
+#include <components/lua/scriptscontainer.hpp>
+
+#include "object.hpp"
+
+namespace MWLua
+{
+
+    class GlobalScripts : public LuaUtil::ScriptsContainer
+    {
+    public:
+        GlobalScripts(LuaUtil::LuaState* lua) : LuaUtil::ScriptsContainer(lua, "Global")
+        {
+            registerEngineHandlers({&mActorActiveHandlers, &mNewGameHandlers, &mPlayerAddedHandlers});
+        }
+
+        void newGameStarted() { callEngineHandlers(mNewGameHandlers); }
+        void actorActive(const GObject& obj) { callEngineHandlers(mActorActiveHandlers, obj); }
+        void playerAdded(const GObject& obj) { callEngineHandlers(mPlayerAddedHandlers, obj); }
+
+    private:
+        EngineHandlerList mActorActiveHandlers{"onActorActive"};
+        EngineHandlerList mNewGameHandlers{"onNewGame"};
+        EngineHandlerList mPlayerAddedHandlers{"onPlayerAdded"};
+    };
+
+}
+
+#endif // MWLUA_GLOBALSCRIPTS_H
diff --git a/apps/openmw/mwlua/localscripts.cpp b/apps/openmw/mwlua/localscripts.cpp
new file mode 100644
index 0000000000..1c35b60131
--- /dev/null
+++ b/apps/openmw/mwlua/localscripts.cpp
@@ -0,0 +1,44 @@
+#include "localscripts.hpp"
+
+namespace sol
+{
+    template <>
+    struct is_automagical<MWBase::LuaManager::ActorControls> : std::false_type {};
+    template <>
+    struct is_automagical<MWLua::LocalScripts::SelfObject> : std::false_type {};
+}
+
+namespace MWLua
+{
+
+    void LocalScripts::initializeSelfPackage(const Context& context)
+    {
+        using ActorControls = MWBase::LuaManager::ActorControls;
+        sol::usertype<ActorControls> controls = context.mLua->sol().new_usertype<ActorControls>("ActorControls");
+        controls["movement"] = &ActorControls::movement;
+        controls["sideMovement"] = &ActorControls::sideMovement;
+        controls["turn"] = &ActorControls::turn;
+        controls["run"] = &ActorControls::run;
+        controls["jump"] = &ActorControls::jump;
+
+        sol::usertype<SelfObject> selfAPI =
+            context.mLua->sol().new_usertype<SelfObject>("SelfObject", sol::base_classes, sol::bases<LObject>());
+        selfAPI[sol::meta_function::to_string] = [](SelfObject& self) { return "openmw.self[" + self.toString() + "]"; };
+        selfAPI["object"] = sol::readonly_property([](SelfObject& self) -> LObject { return LObject(self); });
+        selfAPI["controls"] = sol::readonly_property([](SelfObject& self) { return &self.mControls; });
+        selfAPI["setDirectControl"] = [](SelfObject& self, bool v) { self.mControls.controlledFromLua = v; };
+    }
+
+    std::unique_ptr<LocalScripts> LocalScripts::create(LuaUtil::LuaState* lua, const LObject& obj)
+    {
+        return std::unique_ptr<LocalScripts>(new LocalScripts(lua, obj));
+    }
+
+    LocalScripts::LocalScripts(LuaUtil::LuaState* lua, const LObject& obj)
+        : LuaUtil::ScriptsContainer(lua, "L" + idToString(obj.id())), mData(obj)
+    {
+        mData.mControls.controlledFromLua = false;
+        this->addPackage("openmw.self", sol::make_object(lua->sol(), &mData));
+    }
+
+}
diff --git a/apps/openmw/mwlua/localscripts.hpp b/apps/openmw/mwlua/localscripts.hpp
new file mode 100644
index 0000000000..c8d85aad58
--- /dev/null
+++ b/apps/openmw/mwlua/localscripts.hpp
@@ -0,0 +1,39 @@
+#ifndef MWLUA_LOCALSCRIPTS_H
+#define MWLUA_LOCALSCRIPTS_H
+
+#include <memory>
+#include <set>
+#include <string>
+
+#include <components/lua/luastate.hpp>
+#include <components/lua/scriptscontainer.hpp>
+
+#include "../mwbase/luamanager.hpp"
+
+#include "object.hpp"
+#include "luabindings.hpp"
+
+namespace MWLua
+{
+
+    class LocalScripts : public LuaUtil::ScriptsContainer
+    {
+    public:
+        static std::unique_ptr<LocalScripts> create(LuaUtil::LuaState* lua, const LObject& obj);
+        static void initializeSelfPackage(const Context&);
+
+        const MWBase::LuaManager::ActorControls* getActorControls() const { return &mData.mControls; }
+
+        struct SelfObject : public LObject
+        {
+            SelfObject(const LObject& obj) : LObject(obj) {}
+            MWBase::LuaManager::ActorControls mControls;
+        };
+    protected:
+        LocalScripts(LuaUtil::LuaState* lua, const LObject& obj);
+        SelfObject mData;
+    };
+
+}
+
+#endif // MWLUA_LOCALSCRIPTS_H
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
new file mode 100644
index 0000000000..4f6519397e
--- /dev/null
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -0,0 +1,39 @@
+#include "luabindings.hpp"
+
+#include <components/lua/luastate.hpp>
+
+#include "eventqueue.hpp"
+#include "worldview.hpp"
+
+namespace MWLua
+{
+
+    sol::table initCorePackage(const Context& context)
+    {
+        sol::table api(context.mLua->sol(), sol::create);
+        api["sendGlobalEvent"] = [context](std::string eventName, const sol::object& eventData)
+        {
+            context.mGlobalEventQueue->push_back({std::move(eventName), LuaUtil::serialize(eventData, context.mSerializer)});
+        };
+        return context.mLua->makeReadOnly(api);
+    }
+
+    sol::table initWorldPackage(const Context& context)
+    {
+        sol::table api(context.mLua->sol(), sol::create);
+        WorldView* worldView = context.mWorldView;
+        api["activeActors"] = GObjectList{worldView->getActorsInScene()};
+        return context.mLua->makeReadOnly(api);
+    }
+
+    sol::table initNearbyPackage(const Context& context)
+    {
+        sol::table api(context.mLua->sol(), sol::create);
+        WorldView* worldView = context.mWorldView;
+        api["actors"] = LObjectList{worldView->getActorsInScene()};
+        api["items"] = LObjectList{worldView->getItemsInScene()};
+        return context.mLua->makeReadOnly(api);
+    }
+
+}
+
diff --git a/apps/openmw/mwlua/luabindings.hpp b/apps/openmw/mwlua/luabindings.hpp
new file mode 100644
index 0000000000..7e544b7eb4
--- /dev/null
+++ b/apps/openmw/mwlua/luabindings.hpp
@@ -0,0 +1,36 @@
+#ifndef MWLUA_LUABINDINGS_H
+#define MWLUA_LUABINDINGS_H
+
+#include <components/lua/luastate.hpp>
+#include <components/lua/serialization.hpp>
+
+#include "eventqueue.hpp"
+#include "object.hpp"
+#include "worldview.hpp"
+
+namespace MWLua
+{
+    class LuaManager;
+
+    struct Context
+    {
+        LuaManager* mLuaManager;
+        LuaUtil::LuaState* mLua;
+        LuaUtil::UserdataSerializer* mSerializer;
+        WorldView* mWorldView;
+        LocalEventQueue* mLocalEventQueue;
+        GlobalEventQueue* mGlobalEventQueue;
+    };
+
+    sol::table initCorePackage(const Context&);
+    sol::table initWorldPackage(const Context&);
+    sol::table initNearbyPackage(const Context&);
+
+    // Implemented in objectbindings.cpp
+    void initObjectBindingsForLocalScripts(const Context&);
+    void initObjectBindingsForGlobalScripts(const Context&);
+
+    // openmw.self package is implemented in localscripts.cpp
+}
+
+#endif // MWLUA_LUABINDINGS_H
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
new file mode 100644
index 0000000000..023e95e7b4
--- /dev/null
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -0,0 +1,202 @@
+#include "luamanagerimp.hpp"
+
+#include <components/debug/debuglog.hpp>
+#include <components/lua/utilpackage.hpp>
+
+#include "../mwworld/class.hpp"
+#include "../mwworld/ptr.hpp"
+
+#include "luabindings.hpp"
+#include "userdataserializer.hpp"
+
+namespace MWLua
+{
+
+    LuaManager::LuaManager(const VFS::Manager* vfs) : mLua(vfs)
+    {
+        Log(Debug::Info) << "Lua version: " << LuaUtil::getLuaVersion();
+        mGlobalSerializer = createUserdataSerializer(false, mWorldView.getObjectRegistry());
+        mLocalSerializer = createUserdataSerializer(true, mWorldView.getObjectRegistry());
+        mGlobalScripts.setSerializer(mGlobalSerializer.get());
+
+        Context context;
+        context.mLuaManager = this;
+        context.mLua = &mLua;
+        context.mWorldView = &mWorldView;
+        context.mLocalEventQueue = &mLocalEvents;
+        context.mGlobalEventQueue = &mGlobalEvents;
+        context.mSerializer = mGlobalSerializer.get();
+
+        Context localContext = context;
+        localContext.mSerializer = mLocalSerializer.get();
+
+        initObjectBindingsForGlobalScripts(context);
+        initObjectBindingsForLocalScripts(localContext);
+        LocalScripts::initializeSelfPackage(localContext);
+
+        mLua.addCommonPackage("openmw.util", LuaUtil::initUtilPackage(mLua.sol()));
+        mLua.addCommonPackage("openmw.core", initCorePackage(context));
+        mGlobalScripts.addPackage("openmw.world", initWorldPackage(context));
+        mNearbyPackage = initNearbyPackage(localContext);
+    }
+
+    void LuaManager::init()
+    {
+        mKeyPressEvents.clear();
+        if (mGlobalScripts.addNewScript("test.lua"))
+            Log(Debug::Info) << "Global script started: test.lua";
+    }
+
+    void LuaManager::update(bool paused, float dt)
+    {
+        mWorldView.update();
+
+        if (paused)
+        {
+            mKeyPressEvents.clear();
+            return;
+        }
+
+        std::vector<GlobalEvent> globalEvents = std::move(mGlobalEvents);
+        std::vector<LocalEvent> localEvents = std::move(mLocalEvents);
+        mGlobalEvents = std::vector<GlobalEvent>();
+        mLocalEvents = std::vector<LocalEvent>();
+
+        for (GlobalEvent& e : globalEvents)
+            mGlobalScripts.receiveEvent(e.eventName, e.eventData);
+        for (LocalEvent& e : localEvents)
+        {
+            LObject obj(e.dest, mWorldView.getObjectRegistry());
+            LocalScripts* scripts = obj.isValid() ? obj.ptr().getRefData().getLuaScripts() : nullptr;
+            if (scripts)
+                scripts->receiveEvent(e.eventName, e.eventData);
+            else
+                Log(Debug::Debug) << "Ignored event " << e.eventName << " to L" << idToString(e.dest)
+                                  << ". Object not found or has no attached scripts";
+        }
+
+        if (mPlayerChanged)
+        {
+            mPlayerChanged = false;
+            mGlobalScripts.playerAdded(GObject(getId(mPlayer), mWorldView.getObjectRegistry()));
+        }
+
+        if (mPlayerScripts)
+        {
+            for (const SDL_Keysym key : mKeyPressEvents)
+                mPlayerScripts->keyPress(key.sym, key.mod);
+        }
+        mKeyPressEvents.clear();
+
+        for (ObjectId id : mActorAddedEvents)
+            mGlobalScripts.actorActive(GObject(id, mWorldView.getObjectRegistry()));
+        mActorAddedEvents.clear();
+
+        mGlobalScripts.update(dt);
+        for (LocalScripts* scripts : mActiveLocalScripts)
+            scripts->update(dt);
+    }
+
+    void LuaManager::applyQueuedChanges()
+    {
+    }
+
+    void LuaManager::clear()
+    {
+        mActiveLocalScripts.clear();
+        mLocalEvents.clear();
+        mGlobalEvents.clear();
+        mKeyPressEvents.clear();
+        mActorAddedEvents.clear();
+        mPlayerChanged = false;
+        mPlayerScripts = nullptr;
+        mWorldView.clear();
+        if (!mPlayer.isEmpty())
+        {
+            mPlayer.getCellRef().unsetRefNum();
+            mPlayer.getRefData().setLuaScripts(nullptr);
+            mPlayer = MWWorld::Ptr();
+        }
+    }
+
+    void LuaManager::objectAddedToScene(const MWWorld::Ptr& ptr)
+    {
+        mWorldView.objectAddedToScene(ptr);  // assigns generated RefNum if it is not set yet.
+
+        LocalScripts* localScripts = ptr.getRefData().getLuaScripts();
+        if (localScripts)
+            mActiveLocalScripts.insert(localScripts);
+
+        if (ptr.getClass().isActor() && ptr != mPlayer)
+            mActorAddedEvents.push_back(getId(ptr));
+    }
+
+    void LuaManager::setupPlayer(const MWWorld::Ptr& ptr)
+    {
+        if (!mPlayer.isEmpty())
+            throw std::logic_error("Player is initialized twice");
+        mWorldView.objectAddedToScene(ptr);
+        mPlayer = ptr;
+        MWWorld::RefData& refData = ptr.getRefData();
+        if (!refData.getLuaScripts())
+            createLocalScripts(ptr);
+        if (!mPlayerScripts)
+            throw std::logic_error("mPlayerScripts not initialized");
+        mActiveLocalScripts.insert(mPlayerScripts);
+        mPlayerChanged = true;
+    }
+
+    void LuaManager::objectRemovedFromScene(const MWWorld::Ptr& ptr)
+    {
+        mWorldView.objectRemovedFromScene(ptr);
+        LocalScripts* localScripts = ptr.getRefData().getLuaScripts();
+        if (localScripts)
+            mActiveLocalScripts.erase(localScripts);
+
+        // TODO: call mWorldView.objectUnloaded if object is unloaded from memory (does it ever happen?) and ptr becomes invalid.
+    }
+
+    void LuaManager::keyPressed(const SDL_KeyboardEvent& arg)
+    {
+        mKeyPressEvents.push_back(arg.keysym);
+    }
+    
+    const MWBase::LuaManager::ActorControls* LuaManager::getActorControls(const MWWorld::Ptr& ptr) const
+    {
+        LocalScripts* localScripts = ptr.getRefData().getLuaScripts();
+        if (!localScripts)
+            return nullptr;
+        return localScripts->getActorControls();
+    }
+
+    void LuaManager::addLocalScript(const MWWorld::Ptr& ptr, const std::string& scriptPath)
+    {
+        MWWorld::RefData& refData = ptr.getRefData();
+        if (!refData.getLuaScripts())
+            mActiveLocalScripts.insert(createLocalScripts(ptr));
+        refData.getLuaScripts()->addNewScript(scriptPath);
+    }
+
+    LocalScripts* LuaManager::createLocalScripts(const MWWorld::Ptr& ptr)
+    {
+        std::unique_ptr<LocalScripts> scripts;
+        // When loading a game, it can be called before LuaManager::setPlayer,
+        // so we can't just check ptr == mPlayer here.
+        if (*ptr.getCellRef().getRefIdPtr() == "player")
+        {
+            mPlayerScripts = new PlayerScripts(&mLua, LObject(getId(ptr), mWorldView.getObjectRegistry()));
+            scripts = std::unique_ptr<LocalScripts>(mPlayerScripts);
+            // TODO: scripts->addPackage("openmw.ui", ...);
+            // TODO: scripts->addPackage("openmw.camera", ...);
+        }
+        else
+            scripts = LocalScripts::create(&mLua, LObject(getId(ptr), mWorldView.getObjectRegistry()));
+        scripts->addPackage("openmw.nearby", mNearbyPackage);
+        scripts->setSerializer(mLocalSerializer.get());
+
+        MWWorld::RefData& refData = ptr.getRefData();
+        refData.setLuaScripts(std::move(scripts));
+        return refData.getLuaScripts();
+    }
+
+}
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
new file mode 100644
index 0000000000..3420ac5dbb
--- /dev/null
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -0,0 +1,78 @@
+#ifndef MWLUA_LUAMANAGERIMP_H
+#define MWLUA_LUAMANAGERIMP_H
+
+#include <map>
+#include <set>
+
+#include <components/lua/luastate.hpp>
+
+#include "../mwbase/luamanager.hpp"
+
+#include "object.hpp"
+#include "eventqueue.hpp"
+#include "globalscripts.hpp"
+#include "localscripts.hpp"
+#include "playerscripts.hpp"
+#include "worldview.hpp"
+
+namespace MWLua
+{
+
+    class LuaManager : public MWBase::LuaManager
+    {
+    public:
+        LuaManager(const VFS::Manager* vfs);
+        ~LuaManager() {}
+
+        // Called by engine.cpp when environment is fully initialized.
+        void init();
+
+        // Called by engine.cpp every frame. For performance reasons it works in a separate
+        // thread (in parallel with osg Cull). Can not use scene graph.
+        void update(bool paused, float dt);
+
+        // Called by engine.cpp from the main thread. Can use scene graph.
+        void applyQueuedChanges();
+
+        // Available everywhere through the MWBase::LuaManager interface.
+        // LuaManager queues these events and propagates to scripts on the next `update` call.
+        void newGameStarted() override { mGlobalScripts.newGameStarted(); }
+        void objectAddedToScene(const MWWorld::Ptr& ptr) override;
+        void objectRemovedFromScene(const MWWorld::Ptr& ptr) override;
+        void keyPressed(const SDL_KeyboardEvent &arg) override;
+
+        const MWBase::LuaManager::ActorControls* getActorControls(const MWWorld::Ptr&) const override;
+
+        void clear() override;  // should be called before loading game or starting a new game to reset internal state.
+        void setupPlayer(const MWWorld::Ptr& ptr) override;  // Should be called once after each "clear".
+
+        // Used only in luabindings.cpp
+        void addLocalScript(const MWWorld::Ptr&, const std::string& scriptPath);
+
+    private:
+        LocalScripts* createLocalScripts(const MWWorld::Ptr& ptr);
+
+        LuaUtil::LuaState mLua;
+        sol::table mNearbyPackage;
+
+        GlobalScripts mGlobalScripts{&mLua};
+        std::set<LocalScripts*> mActiveLocalScripts;
+        WorldView mWorldView;
+
+        bool mPlayerChanged = false;
+        MWWorld::Ptr mPlayer;
+        PlayerScripts* mPlayerScripts = nullptr;
+
+        GlobalEventQueue mGlobalEvents;
+        LocalEventQueue mLocalEvents;
+
+        std::unique_ptr<LuaUtil::UserdataSerializer> mGlobalSerializer;
+        std::unique_ptr<LuaUtil::UserdataSerializer> mLocalSerializer;
+
+        std::vector<SDL_Keysym> mKeyPressEvents;
+        std::vector<ObjectId> mActorAddedEvents;
+    };
+
+}
+
+#endif  // MWLUA_LUAMANAGERIMP_H
diff --git a/apps/openmw/mwlua/object.cpp b/apps/openmw/mwlua/object.cpp
new file mode 100644
index 0000000000..fa0f9daffc
--- /dev/null
+++ b/apps/openmw/mwlua/object.cpp
@@ -0,0 +1,111 @@
+#include "object.hpp"
+
+#include <components/esm/loadnpc.hpp>
+#include <components/esm/loadcrea.hpp>
+
+namespace MWLua
+{
+
+    std::string idToString(const ObjectId& id)
+    {
+        return std::to_string(id.mIndex) + "_" + std::to_string(id.mContentFile);
+    }
+
+    std::string Object::toString() const
+    {
+        std::string res = idToString(mId);
+        if (isValid())
+        {
+            res.append(" (");
+            res.append(type());
+            res.append(", ");
+            res.append(*ptr().getCellRef().getRefIdPtr());
+            res.append(")");
+        }
+        else
+            res.append(" (not found)");
+        return res;
+    }
+
+    std::string_view Object::type() const
+    {
+        if (*ptr().getCellRef().getRefIdPtr() == "player")
+            return "Player";
+        const std::string& typeName = ptr().getTypeName();
+        if (typeName == typeid(ESM::NPC).name())
+            return "NPC";
+        else if (typeName == typeid(ESM::Creature).name())
+            return "Creature";
+        else
+            return typeName;
+    }
+
+    bool Object::isValid() const
+    {
+        if (mLastUpdate < mObjectRegistry->mUpdateCounter)
+        {
+            updatePtr();
+            mLastUpdate = mObjectRegistry->mUpdateCounter;
+        }
+        return !mPtr.isEmpty();
+    }
+
+    const MWWorld::Ptr& Object::ptr() const
+    {
+        if (!isValid())
+            throw std::runtime_error("Object is not available: " + idToString(mId));
+        return mPtr;
+    }
+
+    void ObjectRegistry::update()
+    {
+        if (mChanged)
+        {
+            mUpdateCounter++;
+            mChanged = false;
+        }
+    }
+
+    void ObjectRegistry::clear()
+    {
+        mObjectMapping.clear();
+        mChanged = false;
+        mUpdateCounter = 0;
+        mLastAssignedId.unset();
+    }
+
+    MWWorld::Ptr ObjectRegistry::getPtr(ObjectId id, bool onlyActive)
+    {
+        MWWorld::Ptr ptr;
+        auto it = mObjectMapping.find(id);
+        if (it != mObjectMapping.end())
+            ptr = it->second;
+        if (onlyActive)
+        {
+            // TODO: add flag `isActive` to LiveCellRefBase. Return empty Ptr if the flag is not set.
+            //     Needed because in multiplayer mode inactive objects will not be synchronized, so will likely be out of date.
+        }
+        else
+        {
+            // TODO: If Ptr is empty then try to load the object from esp/esm.
+        }
+        return ptr;
+    }
+
+    ObjectId ObjectRegistry::registerPtr(const MWWorld::Ptr& ptr)
+    {
+        ObjectId id = ptr.getCellRef().getOrAssignRefNum(mLastAssignedId);
+        mChanged = true;
+        mObjectMapping[id] = ptr;
+        return id;
+    }
+
+    ObjectId ObjectRegistry::deregisterPtr(const MWWorld::Ptr& ptr)
+    {
+        ObjectId id = getId(ptr);
+        mChanged = true;
+        mObjectMapping.erase(id);
+        return id;
+    }
+
+}
diff --git a/apps/openmw/mwlua/object.hpp b/apps/openmw/mwlua/object.hpp
new file mode 100644
index 0000000000..59e6534166
--- /dev/null
+++ b/apps/openmw/mwlua/object.hpp
@@ -0,0 +1,103 @@
+#ifndef MWLUA_OBJECT_H
+#define MWLUA_OBJECT_H
+
+#include <components/esm/cellref.hpp>
+
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+
+#include "../mwworld/ptr.hpp"
+
+namespace MWLua
+{
+    // ObjectId is a unique identifier of a game object.
+    // It can change only if the order of content files was change.
+    using ObjectId = ESM::RefNum;
+    inline const ObjectId& getId(const MWWorld::Ptr& ptr) { return ptr.getCellRef().getRefNum(); }
+    std::string idToString(const ObjectId& id);
+
+    // Holds a mapping ObjectId -> MWWord::Ptr.
+    class ObjectRegistry
+    {
+    public:
+        ObjectRegistry() { mLastAssignedId.unset(); }
+
+        void update();  // Should be called every frame.
+        void clear();  // Should be called before starting or loading a new game.
+
+        ObjectId registerPtr(const MWWorld::Ptr& ptr);
+        ObjectId deregisterPtr(const MWWorld::Ptr& ptr);
+
+        // Returns Ptr by id. If object is not found, returns empty Ptr.
+        // If onlyActive = true, returns non-empty ptr only if it is registered and is in an active cell.
+        // If onlyActive = false, tries to load and register the object if it is not loaded yet.
+        // NOTE: `onlyActive` logic is not yet implemented.
+        MWWorld::Ptr getPtr(ObjectId id, bool onlyActive);
+
+        // Needed only for saving/loading.
+        const ObjectId& getLastAssignedId() const { return mLastAssignedId; }
+        void setLastAssignedId(ObjectId id) { mLastAssignedId = id; }
+
+    private:
+        friend class Object;
+        friend class GObject;
+        friend class LObject;
+
+        bool mChanged = false;
+        int64_t mUpdateCounter = 0;
+        std::map<ObjectId, MWWorld::Ptr> mObjectMapping;
+        ObjectId mLastAssignedId;
+    };
+
+    // Lua scripts can't use MWWorld::Ptr directly, because lifetime of a script can be longer than lifetime of Ptr.
+    // `GObject` and `LObject` are intended to be passed to Lua as a userdata.
+    // It automatically updates the underlying Ptr when needed.
+    class Object
+    {
+    public:
+        Object(ObjectId id, ObjectRegistry* reg) : mId(id), mObjectRegistry(reg) {}
+        virtual ~Object() {}
+        ObjectId id() const { return mId; }
+
+        std::string toString() const;
+        std::string_view type() const;
+
+        // Updates and returns the underlying Ptr. Throws an exception if object is not available.
+        const MWWorld::Ptr& ptr() const;
+
+        // Returns `true` if calling `ptr()` is safe.
+        bool isValid() const;
+
+    protected:
+        virtual void updatePtr() const = 0;
+
+        const ObjectId mId;
+        ObjectRegistry* mObjectRegistry;
+
+        mutable MWWorld::Ptr mPtr;
+        mutable int64_t mLastUpdate = -1;
+    };
+
+    // Used only in local scripts
+    class LObject : public Object
+    {
+        using Object::Object;
+        void updatePtr() const final { mPtr = mObjectRegistry->getPtr(mId, true); }
+    };
+
+    // Used only in global scripts
+    class GObject : public Object
+    {
+        using Object::Object;
+        void updatePtr() const final { mPtr = mObjectRegistry->getPtr(mId, false); }
+    };
+
+    using ObjectIdList = std::shared_ptr<std::vector<ObjectId>>;
+    template <typename Obj>
+    struct ObjectList { ObjectIdList mIds; };
+    using GObjectList = ObjectList<GObject>;
+    using LObjectList = ObjectList<LObject>;
+
+}
+
+#endif  // MWLUA_OBJECT_H
diff --git a/apps/openmw/mwlua/objectbindings.cpp b/apps/openmw/mwlua/objectbindings.cpp
new file mode 100644
index 0000000000..806907ef35
--- /dev/null
+++ b/apps/openmw/mwlua/objectbindings.cpp
@@ -0,0 +1,106 @@
+#include "luabindings.hpp"
+
+#include <components/lua/luastate.hpp>
+
+#include "eventqueue.hpp"
+#include "luamanagerimp.hpp"
+
+namespace sol
+{
+    template <>
+    struct is_automagical<MWLua::LObject> : std::false_type {};
+    template <>
+    struct is_automagical<MWLua::GObject> : std::false_type {};
+    template <>
+    struct is_automagical<MWLua::LObjectList> : std::false_type {};
+    template <>
+    struct is_automagical<MWLua::GObjectList> : std::false_type {};
+}
+
+namespace MWLua
+{
+
+    template <class ObjectT>
+    static void registerObjectList(const std::string& prefix, const Context& context)
+    {
+        using ListT = ObjectList<ObjectT>;
+        sol::state& lua = context.mLua->sol();
+        ObjectRegistry* registry = context.mWorldView->getObjectRegistry();
+        sol::usertype<ListT> listT = lua.new_usertype<ListT>(prefix + "ObjectList");
+        listT[sol::meta_function::to_string] =
+            [](const ListT& list) { return "{" + std::to_string(list.mIds->size()) + " objects}"; };
+        listT[sol::meta_function::length] = [](const ListT& list) { return list.mIds->size(); };
+        listT[sol::meta_function::index] = [registry](const ListT& list, size_t index)
+        {
+            if (index > 0 && index <= list.mIds->size())
+                return ObjectT((*list.mIds)[index - 1], registry);
+            else
+                throw std::runtime_error("Index out of range");
+        };
+        listT["ipairs"] = [registry](const ListT& list)
+        {
+            auto iter = [registry](const ListT& l, int64_t i) -> sol::optional<std::tuple<int64_t, ObjectT>>
+            {
+                if (i >= 0 && i < static_cast<int64_t>(l.mIds->size()))
+                    return std::make_tuple(i + 1, ObjectT((*l.mIds)[i], registry));
+                else
+                    return sol::nullopt;
+            };
+            return std::make_tuple(iter, list, 0);
+        };
+    }
+
+    template <class ObjectT>
+    static void addBasicBindings(sol::usertype<ObjectT>& objectT, const Context& context)
+    {
+        objectT["isValid"] = [](const ObjectT& o) { return o.isValid(); };
+        objectT["recordId"] = sol::readonly_property([](const ObjectT& o) -> std::string
+        {
+            return o.ptr().getCellRef().getRefId();
+        });
+        objectT["position"] = sol::readonly_property([](const ObjectT& o) -> osg::Vec3f
+        {
+            return o.ptr().getRefData().getPosition().asVec3();
+        });
+        objectT["rotation"] = sol::readonly_property([](const ObjectT& o) -> osg::Vec3f
+        {
+            return o.ptr().getRefData().getPosition().asRotationVec3();
+        });
+        objectT["type"] = sol::readonly_property(&ObjectT::type);
+        objectT[sol::meta_function::equal_to] = [](const ObjectT& a, const ObjectT& b) { return a.id() == b.id(); };
+        objectT[sol::meta_function::to_string] = &ObjectT::toString;
+        objectT["sendEvent"] = [context](const ObjectT& dest, std::string eventName, const sol::object& eventData)
+        {
+            context.mLocalEventQueue->push_back({dest.id(), std::move(eventName), LuaUtil::serialize(eventData, context.mSerializer)});
+        };
+
+        if constexpr (std::is_same_v<ObjectT, GObject>)
+        {  // Only for global scripts
+            objectT["addScript"] = [luaManager=context.mLuaManager](const GObject& object, const std::string& path)
+            {
+                luaManager->addLocalScript(object.ptr(), path);
+            };
+        }
+    }
+
+    template <class ObjectT>
+    static void initObjectBindings(const std::string& prefix, const Context& context)
+    {
+        sol::usertype<ObjectT> objectT = context.mLua->sol().new_usertype<ObjectT>(prefix + "Object");
+        addBasicBindings<ObjectT>(objectT, context);
+
+        registerObjectList<ObjectT>(prefix, context);
+    }
+
+    void initObjectBindingsForLocalScripts(const Context& context)
+    {
+        initObjectBindings<LObject>("L", context);
+    }
+
+    void initObjectBindingsForGlobalScripts(const Context& context)
+    {
+        initObjectBindings<GObject>("G", context);
+    }
+
+}
+
diff --git a/apps/openmw/mwlua/playerscripts.hpp b/apps/openmw/mwlua/playerscripts.hpp
new file mode 100644
index 0000000000..9a08f917e7
--- /dev/null
+++ b/apps/openmw/mwlua/playerscripts.hpp
@@ -0,0 +1,25 @@
+#ifndef MWLUA_PLAYERSCRIPTS_H
+#define MWLUA_PLAYERSCRIPTS_H
+
+#include "localscripts.hpp"
+
+namespace MWLua
+{
+
+    class PlayerScripts : public LocalScripts
+    {
+    public:
+        PlayerScripts(LuaUtil::LuaState* lua, const LObject& obj) : LocalScripts(lua, obj)
+        {
+            registerEngineHandlers({&mKeyPressHandlers});
+        }
+
+        void keyPress(int sym, int mod) { callEngineHandlers(mKeyPressHandlers, sym, mod); }
+
+    private:
+        EngineHandlerList mKeyPressHandlers{"onKeyPress"};
+    };
+
+}
+
+#endif // MWLUA_PLAYERSCRIPTS_H
diff --git a/apps/openmw/mwlua/userdataserializer.cpp b/apps/openmw/mwlua/userdataserializer.cpp
new file mode 100644
index 0000000000..a0315d4777
--- /dev/null
+++ b/apps/openmw/mwlua/userdataserializer.cpp
@@ -0,0 +1,64 @@
+#include "userdataserializer.hpp"
+
+#include <components/lua/serialization.hpp>
+#include <components/misc/endianness.hpp>
+
+#include "object.hpp"
+
+namespace MWLua
+{
+
+    class Serializer final : public LuaUtil::UserdataSerializer
+    {
+    public:
+        explicit Serializer(bool localSerializer, ObjectRegistry* registry)
+            : mLocalSerializer(localSerializer), mObjectRegistry(registry) {}
+
+    private:
+        // Appends serialized sol::userdata to the end of BinaryData.
+        // Returns false if this type of userdata is not supported by this serializer.
+        bool serialize(LuaUtil::BinaryData& out, const sol::userdata& data) const override
+        {
+            if (data.is<GObject>() || data.is<LObject>())
+            {
+                ObjectId id = data.as<Object>().id();
+                static_assert(sizeof(ObjectId) == 8);
+                id.mIndex = Misc::toLittleEndian(id.mIndex);
+                id.mContentFile = Misc::toLittleEndian(id.mContentFile);
+                append(out, "o", &id, sizeof(ObjectId));
+                return true;
+            }
+            return false;
+        }
+
+        // Deserializes userdata of type "typeName" from binaryData. Should push the result on stack using sol::stack::push.
+        // Returns false if this type is not supported by this serializer.
+        bool deserialize(std::string_view typeName, std::string_view binaryData, sol::state& lua) const override
+        {
+            if (typeName == "o")
+            {
+                if (binaryData.size() != sizeof(ObjectId))
+                    throw std::runtime_error("Incorrect serialization format. Size of ObjectId doesn't match.");
+                ObjectId id;
+                std::memcpy(&id, binaryData.data(), sizeof(ObjectId));
+                id.mIndex = Misc::fromLittleEndian(id.mIndex);
+                id.mContentFile = Misc::fromLittleEndian(id.mContentFile);
+                if (mLocalSerializer)
+                    sol::stack::push<LObject>(lua, LObject(id, mObjectRegistry));
+                else
+                    sol::stack::push<GObject>(lua, GObject(id, mObjectRegistry));
+                return true;
+            }
+            return false;
+        }
+
+        bool mLocalSerializer;
+        ObjectRegistry* mObjectRegistry;
+    };
+
+    std::unique_ptr<LuaUtil::UserdataSerializer> createUserdataSerializer(bool local, ObjectRegistry* registry)
+    {
+        return std::make_unique<Serializer>(local, registry);
+    }
+
+}
diff --git a/apps/openmw/mwlua/userdataserializer.hpp b/apps/openmw/mwlua/userdataserializer.hpp
new file mode 100644
index 0000000000..72fab0f53b
--- /dev/null
+++ b/apps/openmw/mwlua/userdataserializer.hpp
@@ -0,0 +1,19 @@
+#ifndef MWLUA_USERDATASERIALIZER_H
+#define MWLUA_USERDATASERIALIZER_H
+
+#include "object.hpp"
+
+namespace LuaUtil
+{
+    class UserdataSerializer;
+}
+
+namespace MWLua
+{
+    // UserdataSerializer is an extension for components/lua/serialization.hpp
+    // Needed to serialize references to objects.
+    // If local=true, then during deserialization creates LObject, otherwise creates GObject.
+    std::unique_ptr<LuaUtil::UserdataSerializer> createUserdataSerializer(bool local, ObjectRegistry* registry);
+}
+
+#endif // MWLUA_USERDATASERIALIZER_H
diff --git a/apps/openmw/mwlua/worldview.cpp b/apps/openmw/mwlua/worldview.cpp
new file mode 100644
index 0000000000..e088dda252
--- /dev/null
+++ b/apps/openmw/mwlua/worldview.cpp
@@ -0,0 +1,68 @@
+#include "worldview.hpp"
+
+#include "../mwworld/class.hpp"
+
+namespace MWLua
+{
+
+    void WorldView::update()
+    {
+        mObjectRegistry.update();
+        mActorsInScene.updateList();
+        mItemsInScene.updateList();
+    }
+
+    void WorldView::clear()
+    {
+        mObjectRegistry.clear();
+        mActorsInScene.clear();
+        mItemsInScene.clear();
+    }
+
+    void WorldView::objectAddedToScene(const MWWorld::Ptr& ptr)
+    {
+        if (ptr.getClass().isActor())
+            addToGroup(mActorsInScene, ptr);
+        else
+            addToGroup(mItemsInScene, ptr);
+    }
+
+    void WorldView::objectRemovedFromScene(const MWWorld::Ptr& ptr)
+    {
+        if (ptr.getClass().isActor())
+            removeFromGroup(mActorsInScene, ptr);
+        else
+            removeFromGroup(mItemsInScene, ptr);
+    }
+
+    void WorldView::ObjectGroup::updateList()
+    {
+        if (mChanged)
+        {
+            mList->clear();
+            for (const ObjectId& id : mSet)
+                mList->push_back(id);
+            mChanged = false;
+        }
+    }
+
+    void WorldView::ObjectGroup::clear()
+    {
+        mChanged = false;
+        mList->clear();
+        mSet.clear();
+    }
+
+    void WorldView::addToGroup(ObjectGroup& group, const MWWorld::Ptr& ptr)
+    {
+        group.mSet.insert(getId(ptr));
+        group.mChanged = true;
+    }
+
+    void WorldView::removeFromGroup(ObjectGroup& group, const MWWorld::Ptr& ptr)
+    {
+        group.mSet.erase(getId(ptr));
+        group.mChanged = true;
+    }
+
+}
diff --git a/apps/openmw/mwlua/worldview.hpp b/apps/openmw/mwlua/worldview.hpp
new file mode 100644
index 0000000000..fbfefccdc6
--- /dev/null
+++ b/apps/openmw/mwlua/worldview.hpp
@@ -0,0 +1,47 @@
+#ifndef MWLUA_WORLDVIEW_H
+#define MWLUA_WORLDVIEW_H
+
+#include "object.hpp"
+
+namespace MWLua
+{
+
+    // Tracks all used game objects.
+    class WorldView
+    {
+    public:
+        void update();  // Should be called every frame.
+        void clear();  // Should be called every time before starting or loading a new game.
+
+        ObjectIdList getActorsInScene() const { return mActorsInScene.mList; }
+        ObjectIdList getItemsInScene() const { return mItemsInScene.mList; }
+
+        ObjectRegistry* getObjectRegistry() { return &mObjectRegistry; }
+
+        void objectUnloaded(const MWWorld::Ptr& ptr) { mObjectRegistry.deregisterPtr(ptr); }
+
+        void objectAddedToScene(const MWWorld::Ptr& ptr);
+        void objectRemovedFromScene(const MWWorld::Ptr& ptr);
+
+    private:
+        struct ObjectGroup
+        {
+            void updateList();
+            void clear();
+
+            bool mChanged = false;
+            ObjectIdList mList = std::make_shared<std::vector<ObjectId>>();
+            std::set<ObjectId> mSet;
+        };
+
+        void addToGroup(ObjectGroup& group, const MWWorld::Ptr& ptr);
+        void removeFromGroup(ObjectGroup& group, const MWWorld::Ptr& ptr);
+
+        ObjectRegistry mObjectRegistry;
+        ObjectGroup mActorsInScene;
+        ObjectGroup mItemsInScene;
+    };
+
+}
+
+#endif // MWLUA_WORLDVIEW_H
diff --git a/apps/openmw/mwworld/refdata.cpp b/apps/openmw/mwworld/refdata.cpp
index 9aa40ed4b1..b506671086 100644
--- a/apps/openmw/mwworld/refdata.cpp
+++ b/apps/openmw/mwworld/refdata.cpp
@@ -8,6 +8,8 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
+#include "../mwlua/localscripts.hpp"
+
 namespace
 {
 enum RefDataFlags
@@ -21,6 +23,12 @@ enum RefDataFlags
 namespace MWWorld
 {
 
+    void RefData::setLuaScripts(std::unique_ptr<MWLua::LocalScripts>&& scripts)
+    {
+        mChanged = true;
+        mLuaScripts = std::move(scripts);
+    }
+
     void RefData::copy (const RefData& refData)
     {
         mBaseNode = refData.mBaseNode;
@@ -36,12 +44,14 @@ namespace MWWorld
         mAnimationState = refData.mAnimationState;
 
         mCustomData = refData.mCustomData ? refData.mCustomData->clone() : nullptr;
+        mLuaScripts = refData.mLuaScripts;
     }
 
     void RefData::cleanup()
     {
         mBaseNode = nullptr;
         mCustomData = nullptr;
+        mLuaScripts = nullptr;
     }
 
     RefData::RefData()
diff --git a/apps/openmw/mwworld/refdata.hpp b/apps/openmw/mwworld/refdata.hpp
index 640670d8e9..3ae6a03293 100644
--- a/apps/openmw/mwworld/refdata.hpp
+++ b/apps/openmw/mwworld/refdata.hpp
@@ -22,6 +22,11 @@ namespace ESM
     struct ObjectState;
 }
 
+namespace MWLua
+{
+    class LocalScripts;
+}
+
 namespace MWWorld
 {
 
@@ -32,6 +37,7 @@ namespace MWWorld
             SceneUtil::PositionAttitudeTransform* mBaseNode;
 
             MWScript::Locals mLocals;
+            std::shared_ptr<MWLua::LocalScripts> mLuaScripts;
 
             /// separate delete flag used for deletion by a content file
             /// @note not stored in the save game file.
@@ -96,6 +102,9 @@ namespace MWWorld
 
             void setLocals (const ESM::Script& script);
 
+            MWLua::LocalScripts* getLuaScripts() { return mLuaScripts.get(); }
+            void setLuaScripts(std::unique_ptr<MWLua::LocalScripts>&&);
+
             void setCount (int count);
             ///< Set object count (an object pile is a simple object with a count >1).
             ///

From f2d0a702e9d08f1b1c13b74c19df01cc84009d28 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Fri, 12 Mar 2021 18:29:51 +0100
Subject: [PATCH 0982/2859] Add Lua timers

---
 apps/openmw/CMakeLists.txt          |  2 +-
 apps/openmw/mwlua/asyncbindings.cpp | 55 +++++++++++++++++++++++++++++
 apps/openmw/mwlua/luabindings.cpp   |  2 ++
 apps/openmw/mwlua/luabindings.hpp   | 10 ++++++
 apps/openmw/mwlua/luamanagerimp.cpp | 11 ++++++
 apps/openmw/mwlua/worldview.cpp     |  8 +++++
 apps/openmw/mwlua/worldview.hpp     | 10 ++++++
 7 files changed, 97 insertions(+), 1 deletion(-)
 create mode 100644 apps/openmw/mwlua/asyncbindings.cpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 1cf87388a6..555aa443c9 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -57,7 +57,7 @@ add_openmw_dir (mwscript
 
 add_openmw_dir (mwlua
     luamanagerimp localscripts object worldview luabindings userdataserializer
-    objectbindings
+    objectbindings asyncbindings
     )
 
 add_openmw_dir (mwsound
diff --git a/apps/openmw/mwlua/asyncbindings.cpp b/apps/openmw/mwlua/asyncbindings.cpp
new file mode 100644
index 0000000000..83c1dbd81b
--- /dev/null
+++ b/apps/openmw/mwlua/asyncbindings.cpp
@@ -0,0 +1,55 @@
+#include "luabindings.hpp"
+
+namespace sol
+{
+    template <>
+    struct is_automagical<MWLua::AsyncPackageId> : std::false_type {};
+}
+
+namespace MWLua
+{
+
+    struct TimerCallback
+    {
+        AsyncPackageId mAsyncId;
+        std::string mName;
+    };
+
+    sol::function getAsyncPackageInitializer(const Context& context)
+    {
+        sol::usertype<AsyncPackageId> api = context.mLua->sol().new_usertype<AsyncPackageId>("AsyncPackage");
+        api["registerTimerCallback"] = [](const AsyncPackageId& asyncId, std::string_view name, sol::function callback)
+        {
+            asyncId.mContainer->registerTimerCallback(asyncId.mScript, name, std::move(callback));
+            return TimerCallback{asyncId, std::string(name)};
+        };
+        api["newTimerInSeconds"] = [world=context.mWorldView](const AsyncPackageId&, double delay,
+                                                              const TimerCallback& callback, sol::object callbackArg)
+        {
+            callback.mAsyncId.mContainer->setupSerializableTimer(
+                false, world->getGameTimeInSeconds() + delay, callback.mAsyncId.mScript, callback.mName, std::move(callbackArg));
+        };
+        api["newTimerInHours"] = [world=context.mWorldView](const AsyncPackageId&, double delay,
+                                                            const TimerCallback& callback, sol::object callbackArg)
+        {
+            callback.mAsyncId.mContainer->setupSerializableTimer(
+                true, world->getGameTimeInHours() + delay, callback.mAsyncId.mScript, callback.mName, std::move(callbackArg));
+        };
+        api["newUnsavableTimerInSeconds"] = [world=context.mWorldView](const AsyncPackageId& asyncId, double delay, sol::function callback)
+        {
+            asyncId.mContainer->setupUnsavableTimer(false, world->getGameTimeInSeconds() + delay, asyncId.mScript, std::move(callback));
+        };
+        api["newUnsavableTimerInHours"] = [world=context.mWorldView](const AsyncPackageId& asyncId, double delay, sol::function callback)
+        {
+            asyncId.mContainer->setupUnsavableTimer(true, world->getGameTimeInHours() + delay, asyncId.mScript, std::move(callback));
+        };
+
+        auto initializer = [](sol::table hiddenData)
+        {
+            LuaUtil::ScriptsContainer::ScriptId id = hiddenData[LuaUtil::ScriptsContainer::ScriptId::KEY];
+            return AsyncPackageId{id.mContainer, id.mPath};
+        };
+        return sol::make_object(context.mLua->sol(), initializer);
+    }
+
+}
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index 4f6519397e..5ebb6670f8 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -15,6 +15,8 @@ namespace MWLua
         {
             context.mGlobalEventQueue->push_back({std::move(eventName), LuaUtil::serialize(eventData, context.mSerializer)});
         };
+        api["getGameTimeInSeconds"] = [world=context.mWorldView]() { return world->getGameTimeInSeconds(); };
+        api["getGameTimeInHours"] = [world=context.mWorldView]() { return world->getGameTimeInHours(); };
         return context.mLua->makeReadOnly(api);
     }
 
diff --git a/apps/openmw/mwlua/luabindings.hpp b/apps/openmw/mwlua/luabindings.hpp
index 7e544b7eb4..2eae569ef0 100644
--- a/apps/openmw/mwlua/luabindings.hpp
+++ b/apps/openmw/mwlua/luabindings.hpp
@@ -3,6 +3,7 @@
 
 #include <components/lua/luastate.hpp>
 #include <components/lua/serialization.hpp>
+#include <components/lua/scriptscontainer.hpp>
 
 #include "eventqueue.hpp"
 #include "object.hpp"
@@ -30,6 +31,15 @@ namespace MWLua
     void initObjectBindingsForLocalScripts(const Context&);
     void initObjectBindingsForGlobalScripts(const Context&);
 
+    // Implemented in asyncbindings.cpp
+    struct AsyncPackageId
+    {
+        // TODO: add ObjectId mLocalObject;
+        LuaUtil::ScriptsContainer* mContainer;
+        std::string mScript;
+    };
+    sol::function getAsyncPackageInitializer(const Context&);
+
     // openmw.self package is implemented in localscripts.cpp
 }
 
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 023e95e7b4..92e4a257e7 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -34,6 +34,7 @@ namespace MWLua
         initObjectBindingsForLocalScripts(localContext);
         LocalScripts::initializeSelfPackage(localContext);
 
+        mLua.addCommonPackage("openmw.async", getAsyncPackageInitializer(context));
         mLua.addCommonPackage("openmw.util", LuaUtil::initUtilPackage(mLua.sol()));
         mLua.addCommonPackage("openmw.core", initCorePackage(context));
         mGlobalScripts.addPackage("openmw.world", initWorldPackage(context));
@@ -62,6 +63,16 @@ namespace MWLua
         mGlobalEvents = std::vector<GlobalEvent>();
         mLocalEvents = std::vector<LocalEvent>();
 
+        {  // Update time and process timers
+            double seconds = mWorldView.getGameTimeInSeconds() + dt;
+            mWorldView.setGameTimeInSeconds(seconds);
+            double hours = mWorldView.getGameTimeInHours();
+
+            mGlobalScripts.processTimers(seconds, hours);
+            for (LocalScripts* scripts : mActiveLocalScripts)
+                scripts->processTimers(seconds, hours);
+        }
+
         for (GlobalEvent& e : globalEvents)
             mGlobalScripts.receiveEvent(e.eventName, e.eventData);
         for (LocalEvent& e : localEvents)
diff --git a/apps/openmw/mwlua/worldview.cpp b/apps/openmw/mwlua/worldview.cpp
index e088dda252..a5b427a011 100644
--- a/apps/openmw/mwlua/worldview.cpp
+++ b/apps/openmw/mwlua/worldview.cpp
@@ -1,6 +1,7 @@
 #include "worldview.hpp"
 
 #include "../mwworld/class.hpp"
+#include "../mwworld/timestamp.hpp"
 
 namespace MWLua
 {
@@ -35,6 +36,13 @@ namespace MWLua
             removeFromGroup(mItemsInScene, ptr);
     }
 
+    double WorldView::getGameTimeInHours() const
+    {
+        MWBase::World* world = MWBase::Environment::get().getWorld();
+        MWWorld::TimeStamp timeStamp = world->getTimeStamp();
+        return static_cast<double>(timeStamp.getDay()) * 24 + timeStamp.getHour();
+    }
+
     void WorldView::ObjectGroup::updateList()
     {
         if (mChanged)
diff --git a/apps/openmw/mwlua/worldview.hpp b/apps/openmw/mwlua/worldview.hpp
index fbfefccdc6..ba6c8cccec 100644
--- a/apps/openmw/mwlua/worldview.hpp
+++ b/apps/openmw/mwlua/worldview.hpp
@@ -13,6 +13,14 @@ namespace MWLua
         void update();  // Should be called every frame.
         void clear();  // Should be called every time before starting or loading a new game.
 
+        // Returns the number of seconds passed from the beginning of the game.
+        double getGameTimeInSeconds() const { return mGameSeconds; }
+        void setGameTimeInSeconds(double t) { mGameSeconds = t; }
+
+        // Returns the number of game hours passed from the beginning of the game.
+        // Note that the number of seconds in a game hour is not fixed.
+        double getGameTimeInHours() const;
+
         ObjectIdList getActorsInScene() const { return mActorsInScene.mList; }
         ObjectIdList getItemsInScene() const { return mItemsInScene.mList; }
 
@@ -40,6 +48,8 @@ namespace MWLua
         ObjectRegistry mObjectRegistry;
         ObjectGroup mActorsInScene;
         ObjectGroup mItemsInScene;
+
+        double mGameSeconds = 0;
     };
 
 }

From 914e604e068a8ba691fe0822c0fa737099b2e573 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sat, 19 Dec 2020 00:02:31 +0100
Subject: [PATCH 0983/2859] Interactions between LuaManager and other parts of
 OpenMW

---
 apps/openmw/mwinput/keyboardmanager.cpp |  4 ++++
 apps/openmw/mwmechanics/actors.cpp      | 24 ++++++++++++++++++++++--
 apps/openmw/mwstate/statemanagerimp.cpp |  4 +++-
 apps/openmw/mwworld/scene.cpp           |  5 +++++
 apps/openmw/mwworld/worldimp.cpp        |  3 +++
 5 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwinput/keyboardmanager.cpp b/apps/openmw/mwinput/keyboardmanager.cpp
index 8540858461..03db584192 100644
--- a/apps/openmw/mwinput/keyboardmanager.cpp
+++ b/apps/openmw/mwinput/keyboardmanager.cpp
@@ -6,6 +6,7 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/inputmanager.hpp"
+#include "../mwbase/luamanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/player.hpp"
@@ -58,6 +59,9 @@ namespace MWInput
         if (!input->controlsDisabled() && !consumed)
             mBindingsManager->keyPressed(arg);
 
+        if (!consumed)
+            MWBase::Environment::get().getLuaManager()->keyPressed(arg);
+
         input->setJoystickLastUsed(false);
     }
 
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 160cac0dc9..9d3f16c31c 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -24,6 +24,7 @@
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/statemanager.hpp"
+#include "../mwbase/luamanager.hpp"
 
 #include "../mwmechanics/aibreathe.hpp"
 
@@ -2009,6 +2010,25 @@ namespace MWMechanics
                         return; // for now abort update of the old cell when cell changes by teleportation magic effect
                                 // a better solution might be to apply cell changes at the end of the frame
                     }
+                    bool controlledFromLua;
+                    {
+                        const MWBase::LuaManager::ActorControls* luaControls =
+                            MWBase::Environment::get().getLuaManager()->getActorControls(iter->first);
+                        controlledFromLua = luaControls && luaControls->controlledFromLua;
+                        if (controlledFromLua && isConscious(iter->first))
+                        {
+                            Movement& mov = iter->first.getClass().getMovementSettings(iter->first);
+                            mov.mPosition[0] = luaControls->sideMovement;
+                            mov.mPosition[1] = luaControls->movement;
+                            mov.mPosition[2] = luaControls->jump ? 1 : 0;
+                            mov.mRotation[0] = mov.mRotation[1] = 0;
+                            mov.mRotation[2] = luaControls->turn;
+                            mov.mSpeedFactor = osg::Vec2(luaControls->movement, luaControls->sideMovement).length();
+
+                            CreatureStats& stats = iter->first.getClass().getCreatureStats(iter->first);
+                            stats.setMovementFlag(MWMechanics::CreatureStats::Flag_Run, luaControls->run);
+                        }
+                    }
                     if (aiActive && inProcessingRange)
                     {
                         if (engageCombatTimerStatus == Misc::TimerStatus::Elapsed)
@@ -2062,7 +2082,7 @@ namespace MWMechanics
                         if (iter->first != player)
                         {
                             CreatureStats &stats = iter->first.getClass().getCreatureStats(iter->first);
-                            if (isConscious(iter->first))
+                            if (isConscious(iter->first) && !controlledFromLua)
                             {
                                 stats.getAiSequence().execute(iter->first, *ctrl, duration);
                                 updateGreetingState(iter->first, *iter->second, timerUpdateHello > 0);
@@ -2071,7 +2091,7 @@ namespace MWMechanics
                             }
                         }
                     }
-                    else if (aiActive && iter->first != player && isConscious(iter->first))
+                    else if (aiActive && iter->first != player && isConscious(iter->first) && !controlledFromLua)
                     {
                         CreatureStats &stats = iter->first.getClass().getCreatureStats(iter->first);
                         stats.getAiSequence().execute(iter->first, *ctrl, duration, /*outOfRange*/true);
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index b242862772..c1563719f0 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -27,6 +27,7 @@
 #include "../mwbase/scriptmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/inputmanager.hpp"
+#include "../mwbase/luamanager.hpp"
 
 #include "../mwworld/player.hpp"
 #include "../mwworld/class.hpp"
@@ -59,6 +60,7 @@ void MWState::StateManager::cleanup (bool force)
 
         MWMechanics::CreatureStats::cleanup();
     }
+    MWBase::Environment::get().getLuaManager()->clear();
 }
 
 std::map<int, int> MWState::StateManager::buildContentFileIndexMap (const ESM::ESMReader& reader)
@@ -146,7 +148,7 @@ void MWState::StateManager::newGame (bool bypass)
     {
         Log(Debug::Info) << "Starting a new game";
         MWBase::Environment::get().getScriptManager()->getGlobalScripts().addStartup();
-
+        MWBase::Environment::get().getLuaManager()->newGameStarted();
         MWBase::Environment::get().getWorld()->startNewGame (bypass);
 
         mState = State_Running;
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index d3b381d2af..7d3a6c7893 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -25,6 +25,7 @@
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/luamanager.hpp"
 
 #include "../mwrender/renderingmanager.hpp"
 #include "../mwrender/landmanager.hpp"
@@ -138,6 +139,8 @@ namespace
 
         if (!physics.getObject(ptr))
             ptr.getClass().insertObject (ptr, model, rotation, physics);
+
+        MWBase::Environment::get().getLuaManager()->objectAddedToScene(ptr);
     }
 
     void addObject(const MWWorld::Ptr& ptr, const MWPhysics::PhysicsSystem& physics, DetourNavigator::Navigator& navigator)
@@ -385,6 +388,7 @@ namespace MWWorld
                 mRendering.removeActorPath(ptr);
                 mPhysics->remove(ptr);
             }
+            MWBase::Environment::get().getLuaManager()->objectRemovedFromScene(ptr);
         }
 
         const auto cellX = cell->getCell()->getGridX();
@@ -1006,6 +1010,7 @@ namespace MWWorld
     {
         MWBase::Environment::get().getMechanicsManager()->remove (ptr);
         MWBase::Environment::get().getSoundManager()->stopSound3D (ptr);
+        MWBase::Environment::get().getLuaManager()->objectRemovedFromScene(ptr);
         const auto navigator = MWBase::Environment::get().getWorld()->getNavigator();
         if (const auto object = mPhysics->getObject(ptr))
         {
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 69167e5ccb..a7915dd30d 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -36,6 +36,7 @@
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/scriptmanager.hpp"
+#include "../mwbase/luamanager.hpp"
 
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/npcstats.hpp"
@@ -2483,12 +2484,14 @@ namespace MWWorld
             mNavigator->removeAgent(getPathfindingHalfExtents(getPlayerConstPtr()));
             mPhysics->remove(getPlayerPtr());
             mRendering->removePlayer(getPlayerPtr());
+            MWBase::Environment::get().getLuaManager()->objectRemovedFromScene(getPlayerPtr());
 
             mPlayer->set(player);
         }
 
         Ptr ptr = mPlayer->getPlayer();
         mRendering->setupPlayer(ptr);
+        MWBase::Environment::get().getLuaManager()->setupPlayer(ptr);
     }
 
     void World::renderPlayer()

From 8c6d303730d4c3dc8832eb5015e6bbf4cd393412 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Fri, 29 Jan 2021 02:38:09 +0100
Subject: [PATCH 0984/2859] Saving/loading for Lua scripts (saves format is
 changed)

---
 apps/openmw/CMakeLists.txt               |  2 +-
 apps/openmw/mwbase/luamanager.hpp        | 24 +++++++++
 apps/openmw/mwlua/eventqueue.cpp         | 63 ++++++++++++++++++++++++
 apps/openmw/mwlua/eventqueue.hpp         | 20 ++++++++
 apps/openmw/mwlua/luamanagerimp.cpp      | 61 +++++++++++++++++++++++
 apps/openmw/mwlua/luamanagerimp.hpp      | 13 +++++
 apps/openmw/mwlua/userdataserializer.cpp | 16 ++++--
 apps/openmw/mwlua/userdataserializer.hpp |  5 +-
 apps/openmw/mwlua/worldview.cpp          | 17 +++++++
 apps/openmw/mwlua/worldview.hpp          |  9 ++++
 apps/openmw/mwstate/statemanagerimp.cpp  |  9 ++++
 apps/openmw/mwworld/livecellref.cpp      |  4 ++
 components/esm/defs.hpp                  |  5 +-
 components/esm/objectstate.cpp           |  4 ++
 components/esm/objectstate.hpp           |  2 +
 components/esm/savedgame.cpp             |  2 +-
 16 files changed, 248 insertions(+), 8 deletions(-)
 create mode 100644 apps/openmw/mwlua/eventqueue.cpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 555aa443c9..240d4a8e42 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -56,7 +56,7 @@ add_openmw_dir (mwscript
     )
 
 add_openmw_dir (mwlua
-    luamanagerimp localscripts object worldview luabindings userdataserializer
+    luamanagerimp localscripts object worldview luabindings userdataserializer eventqueue
     objectbindings asyncbindings
     )
 
diff --git a/apps/openmw/mwbase/luamanager.hpp b/apps/openmw/mwbase/luamanager.hpp
index ad374c9dba..5b4594728e 100644
--- a/apps/openmw/mwbase/luamanager.hpp
+++ b/apps/openmw/mwbase/luamanager.hpp
@@ -8,6 +8,18 @@ namespace MWWorld
     class Ptr;
 }
 
+namespace Loading
+{
+    class Listener;
+}
+
+namespace ESM
+{
+    class ESMReader;
+    class ESMWriter;
+    class LuaScripts;
+}
+
 namespace MWBase
 {
 
@@ -35,6 +47,18 @@ namespace MWBase
 
         virtual void clear() = 0;
         virtual void setupPlayer(const MWWorld::Ptr&) = 0;
+
+        // Saving
+        int countSavedGameRecords() const { return 1; };
+        virtual void write(ESM::ESMWriter& writer, Loading::Listener& progress) = 0;
+        virtual void saveLocalScripts(const MWWorld::Ptr& ptr, ESM::LuaScripts& data) = 0;
+
+        // Loading from a save
+        virtual void readRecord(ESM::ESMReader& reader, uint32_t type) = 0;
+        virtual void loadLocalScripts(const MWWorld::Ptr& ptr, const ESM::LuaScripts& data) = 0;
+
+        // Should be called before loading. The map is used to fix refnums if the order of content files was changed.
+        virtual void setContentFileMapping(const std::map<int, int>&) = 0;
     };
 
 }
diff --git a/apps/openmw/mwlua/eventqueue.cpp b/apps/openmw/mwlua/eventqueue.cpp
new file mode 100644
index 0000000000..5e63fee57a
--- /dev/null
+++ b/apps/openmw/mwlua/eventqueue.cpp
@@ -0,0 +1,63 @@
+#include "eventqueue.hpp"
+
+#include <components/debug/debuglog.hpp>
+
+#include <components/esm/esmreader.hpp>
+#include <components/esm/esmwriter.hpp>
+#include <components/esm/luascripts.hpp>
+
+#include <components/lua/serialization.hpp>
+
+namespace MWLua
+{
+
+    template <typename Event>
+    void saveEvent(ESM::ESMWriter& esm, const ObjectId& dest, const Event& event)
+    {
+        esm.writeHNString("LUAE", event.eventName);
+        dest.save(esm, true);
+        if (!event.eventData.empty())
+            saveLuaBinaryData(esm, event.eventData);
+    }
+
+    void loadEvents(sol::state& lua, ESM::ESMReader& esm, GlobalEventQueue& globalEvents, LocalEventQueue& localEvents,
+                    const std::map<int, int>& contentFileMapping, const LuaUtil::UserdataSerializer* serializer)
+    {
+        while (esm.isNextSub("LUAE"))
+        {
+            std::string name = esm.getHString();
+            ObjectId dest;
+            dest.load(esm, true);
+            std::string data = loadLuaBinaryData(esm);
+            try
+            {
+                data = LuaUtil::serialize(LuaUtil::deserialize(lua, data, serializer), serializer);
+            }
+            catch (std::exception& e)
+            {
+                Log(Debug::Error) << "loadEvent: invalid event data: " << e.what();
+            }
+            if (dest.isSet())
+            {
+                auto it = contentFileMapping.find(dest.mContentFile);
+                if (it != contentFileMapping.end())
+                    dest.mContentFile = it->second;
+                localEvents.push_back({dest, std::move(name), std::move(data)});
+            }
+            else
+                globalEvents.push_back({std::move(name), std::move(data)});
+        }
+    }
+
+    void saveEvents(ESM::ESMWriter& esm, const GlobalEventQueue& globalEvents, const LocalEventQueue& localEvents)
+    {
+        ObjectId globalId;
+        globalId.unset();  // Used as a marker of a global event.
+
+        for (const GlobalEvent& e : globalEvents)
+            saveEvent(esm, globalId, e);
+        for (const LocalEvent& e : localEvents)
+            saveEvent(esm, e.dest, e);
+    }
+
+}
diff --git a/apps/openmw/mwlua/eventqueue.hpp b/apps/openmw/mwlua/eventqueue.hpp
index cd79e05dc0..b692d7162d 100644
--- a/apps/openmw/mwlua/eventqueue.hpp
+++ b/apps/openmw/mwlua/eventqueue.hpp
@@ -3,6 +3,22 @@
 
 #include "object.hpp"
 
+namespace ESM
+{
+    class ESMReader;
+    class ESMWriter;
+}
+
+namespace LuaUtil
+{
+    class UserdataSerializer;
+}
+
+namespace sol
+{
+    class state;
+}
+
 namespace MWLua
 {
     struct GlobalEvent
@@ -18,6 +34,10 @@ namespace MWLua
     };
     using GlobalEventQueue = std::vector<GlobalEvent>;
     using LocalEventQueue = std::vector<LocalEvent>;
+
+    void loadEvents(sol::state& lua, ESM::ESMReader& esm, GlobalEventQueue&, LocalEventQueue&,
+                    const std::map<int, int>& contentFileMapping, const LuaUtil::UserdataSerializer* serializer);
+    void saveEvents(ESM::ESMWriter& esm, const GlobalEventQueue&, const LocalEventQueue&);
 }
 
 #endif // MWLUA_EVENTQUEUE_H
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 92e4a257e7..00b8c10cfe 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -1,6 +1,11 @@
 #include "luamanagerimp.hpp"
 
 #include <components/debug/debuglog.hpp>
+
+#include <components/esm/esmreader.hpp>
+#include <components/esm/esmwriter.hpp>
+#include <components/esm/luascripts.hpp>
+
 #include <components/lua/utilpackage.hpp>
 
 #include "../mwworld/class.hpp"
@@ -15,8 +20,12 @@ namespace MWLua
     LuaManager::LuaManager(const VFS::Manager* vfs) : mLua(vfs)
     {
         Log(Debug::Info) << "Lua version: " << LuaUtil::getLuaVersion();
+
         mGlobalSerializer = createUserdataSerializer(false, mWorldView.getObjectRegistry());
         mLocalSerializer = createUserdataSerializer(true, mWorldView.getObjectRegistry());
+        mGlobalLoader = createUserdataSerializer(false, mWorldView.getObjectRegistry(), &mContentFileMapping);
+        mLocalLoader = createUserdataSerializer(true, mWorldView.getObjectRegistry(), &mContentFileMapping);
+
         mGlobalScripts.setSerializer(mGlobalSerializer.get());
 
         Context context;
@@ -210,4 +219,56 @@ namespace MWLua
         return refData.getLuaScripts();
     }
 
+    void LuaManager::write(ESM::ESMWriter& writer, Loading::Listener& progress)
+    {
+        writer.startRecord(ESM::REC_LUAM);
+
+        mWorldView.save(writer);
+        ESM::LuaScripts globalScripts;
+        mGlobalScripts.save(globalScripts);
+        globalScripts.save(writer);
+        saveEvents(writer, mGlobalEvents, mLocalEvents);
+
+        writer.endRecord(ESM::REC_LUAM);
+    }
+
+    void LuaManager::readRecord(ESM::ESMReader& reader, uint32_t type)
+    {
+        if (type != ESM::REC_LUAM)
+            throw std::runtime_error("ESM::REC_LUAM is expected");
+
+        mWorldView.load(reader);
+        ESM::LuaScripts globalScripts;
+        globalScripts.load(reader);
+        loadEvents(mLua.sol(), reader, mGlobalEvents, mLocalEvents, mContentFileMapping, mGlobalLoader.get());
+
+        mGlobalScripts.setSerializer(mGlobalLoader.get());
+        mGlobalScripts.load(globalScripts, false);
+        mGlobalScripts.setSerializer(mGlobalSerializer.get());
+    }
+
+    void LuaManager::saveLocalScripts(const MWWorld::Ptr& ptr, ESM::LuaScripts& data)
+    {
+        if (ptr.getRefData().getLuaScripts())
+            ptr.getRefData().getLuaScripts()->save(data);
+        else
+            data.mScripts.clear();
+    }
+
+    void LuaManager::loadLocalScripts(const MWWorld::Ptr& ptr, const ESM::LuaScripts& data)
+    {
+        if (data.mScripts.empty())
+        {
+            if (ptr.getRefData().getLuaScripts())
+                ptr.getRefData().setLuaScripts(nullptr);
+            return;
+        }
+
+        mWorldView.getObjectRegistry()->registerPtr(ptr);
+        LocalScripts* scripts = createLocalScripts(ptr);
+
+        scripts->setSerializer(mLocalLoader.get());
+        scripts->load(data, true);
+        scripts->setSerializer(mLocalSerializer.get());
+    }
 }
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index 3420ac5dbb..fcde053009 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -49,6 +49,15 @@ namespace MWLua
         // Used only in luabindings.cpp
         void addLocalScript(const MWWorld::Ptr&, const std::string& scriptPath);
 
+        // Saving
+        void write(ESM::ESMWriter& writer, Loading::Listener& progress) override;
+        void saveLocalScripts(const MWWorld::Ptr& ptr, ESM::LuaScripts& data) override;
+
+        // Loading from a save
+        void readRecord(ESM::ESMReader& reader, uint32_t type) override;
+        void loadLocalScripts(const MWWorld::Ptr& ptr, const ESM::LuaScripts& data) override;
+        void setContentFileMapping(const std::map<int, int>& mapping) override { mContentFileMapping = mapping; }
+
     private:
         LocalScripts* createLocalScripts(const MWWorld::Ptr& ptr);
 
@@ -69,6 +78,10 @@ namespace MWLua
         std::unique_ptr<LuaUtil::UserdataSerializer> mGlobalSerializer;
         std::unique_ptr<LuaUtil::UserdataSerializer> mLocalSerializer;
 
+        std::map<int, int> mContentFileMapping;
+        std::unique_ptr<LuaUtil::UserdataSerializer> mGlobalLoader;
+        std::unique_ptr<LuaUtil::UserdataSerializer> mLocalLoader;
+
         std::vector<SDL_Keysym> mKeyPressEvents;
         std::vector<ObjectId> mActorAddedEvents;
     };
diff --git a/apps/openmw/mwlua/userdataserializer.cpp b/apps/openmw/mwlua/userdataserializer.cpp
index a0315d4777..6946cd5532 100644
--- a/apps/openmw/mwlua/userdataserializer.cpp
+++ b/apps/openmw/mwlua/userdataserializer.cpp
@@ -11,8 +11,8 @@ namespace MWLua
     class Serializer final : public LuaUtil::UserdataSerializer
     {
     public:
-        explicit Serializer(bool localSerializer, ObjectRegistry* registry)
-            : mLocalSerializer(localSerializer), mObjectRegistry(registry) {}
+        explicit Serializer(bool localSerializer, ObjectRegistry* registry, std::map<int, int>* contentFileMapping)
+            : mLocalSerializer(localSerializer), mObjectRegistry(registry), mContentFileMapping(contentFileMapping) {}
 
     private:
         // Appends serialized sol::userdata to the end of BinaryData.
@@ -43,6 +43,12 @@ namespace MWLua
                 std::memcpy(&id, binaryData.data(), sizeof(ObjectId));
                 id.mIndex = Misc::fromLittleEndian(id.mIndex);
                 id.mContentFile = Misc::fromLittleEndian(id.mContentFile);
+                if (id.hasContentFile() && mContentFileMapping)
+                {
+                    auto iter = mContentFileMapping->find(id.mContentFile);
+                    if (iter != mContentFileMapping->end())
+                        id.mContentFile = iter->second;
+                }
                 if (mLocalSerializer)
                     sol::stack::push<LObject>(lua, LObject(id, mObjectRegistry));
                 else
@@ -54,11 +60,13 @@ namespace MWLua
 
         bool mLocalSerializer;
         ObjectRegistry* mObjectRegistry;
+        std::map<int, int>* mContentFileMapping;
     };
 
-    std::unique_ptr<LuaUtil::UserdataSerializer> createUserdataSerializer(bool local, ObjectRegistry* registry)
+    std::unique_ptr<LuaUtil::UserdataSerializer> createUserdataSerializer(
+        bool local, ObjectRegistry* registry, std::map<int, int>* contentFileMapping)
     {
-        return std::make_unique<Serializer>(local, registry);
+        return std::make_unique<Serializer>(local, registry, contentFileMapping);
     }
 
 }
diff --git a/apps/openmw/mwlua/userdataserializer.hpp b/apps/openmw/mwlua/userdataserializer.hpp
index 72fab0f53b..70af7ebd06 100644
--- a/apps/openmw/mwlua/userdataserializer.hpp
+++ b/apps/openmw/mwlua/userdataserializer.hpp
@@ -13,7 +13,10 @@ namespace MWLua
     // UserdataSerializer is an extension for components/lua/serialization.hpp
     // Needed to serialize references to objects.
     // If local=true, then during deserialization creates LObject, otherwise creates GObject.
-    std::unique_ptr<LuaUtil::UserdataSerializer> createUserdataSerializer(bool local, ObjectRegistry* registry);
+    // contentFileMapping is used only for deserialization. Needed to fix references if the order
+    // of content files was changed.
+    std::unique_ptr<LuaUtil::UserdataSerializer> createUserdataSerializer(
+        bool local, ObjectRegistry* registry, std::map<int, int>* contentFileMapping = nullptr);
 }
 
 #endif // MWLUA_USERDATASERIALIZER_H
diff --git a/apps/openmw/mwlua/worldview.cpp b/apps/openmw/mwlua/worldview.cpp
index a5b427a011..fc08b60037 100644
--- a/apps/openmw/mwlua/worldview.cpp
+++ b/apps/openmw/mwlua/worldview.cpp
@@ -1,5 +1,8 @@
 #include "worldview.hpp"
 
+#include <components/esm/esmreader.hpp>
+#include <components/esm/esmwriter.hpp>
+
 #include "../mwworld/class.hpp"
 #include "../mwworld/timestamp.hpp"
 
@@ -43,6 +46,20 @@ namespace MWLua
         return static_cast<double>(timeStamp.getDay()) * 24 + timeStamp.getHour();
     }
 
+    void WorldView::load(ESM::ESMReader& esm)
+    {
+        esm.getHNT(mGameSeconds, "LUAW");
+        ObjectId lastAssignedId;
+        lastAssignedId.load(esm, true);
+        mObjectRegistry.setLastAssignedId(lastAssignedId);
+    }
+
+    void WorldView::save(ESM::ESMWriter& esm) const
+    {
+        esm.writeHNT("LUAW", mGameSeconds);
+        mObjectRegistry.getLastAssignedId().save(esm, true);
+    }
+
     void WorldView::ObjectGroup::updateList()
     {
         if (mChanged)
diff --git a/apps/openmw/mwlua/worldview.hpp b/apps/openmw/mwlua/worldview.hpp
index ba6c8cccec..45046c0b73 100644
--- a/apps/openmw/mwlua/worldview.hpp
+++ b/apps/openmw/mwlua/worldview.hpp
@@ -3,6 +3,12 @@
 
 #include "object.hpp"
 
+namespace ESM
+{
+    class ESMWriter;
+    class ESMReader;
+}
+
 namespace MWLua
 {
 
@@ -31,6 +37,9 @@ namespace MWLua
         void objectAddedToScene(const MWWorld::Ptr& ptr);
         void objectRemovedFromScene(const MWWorld::Ptr& ptr);
 
+        void load(ESM::ESMReader& esm);
+        void save(ESM::ESMWriter& esm) const;
+
     private:
         struct ObjectGroup
         {
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index c1563719f0..4e4a8e95d6 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -251,6 +251,7 @@ void MWState::StateManager::saveGame (const std::string& description, const Slot
 
         int recordCount =         1 // saved game header
                 +MWBase::Environment::get().getJournal()->countSavedGameRecords()
+                +MWBase::Environment::get().getLuaManager()->countSavedGameRecords()
                 +MWBase::Environment::get().getWorld()->countSavedGameRecords()
                 +MWBase::Environment::get().getScriptManager()->getGlobalScripts().countSavedGameRecords()
                 +MWBase::Environment::get().getDialogueManager()->countSavedGameRecords()
@@ -274,6 +275,9 @@ void MWState::StateManager::saveGame (const std::string& description, const Slot
 
         MWBase::Environment::get().getJournal()->write (writer, listener);
         MWBase::Environment::get().getDialogueManager()->write (writer, listener);
+        // LuaManager::write should be called before World::write because world also saves
+        // local scripts that depend on LuaManager.
+        MWBase::Environment::get().getLuaManager()->write(writer, listener);
         MWBase::Environment::get().getWorld()->write (writer, listener);
         MWBase::Environment::get().getScriptManager()->getGlobalScripts().write (writer, listener);
         MWBase::Environment::get().getWindowManager()->write(writer, listener);
@@ -384,6 +388,7 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
             throw std::runtime_error("This save file was created using a newer version of OpenMW and is thus not supported. Please upgrade to the newest OpenMW version to load this file.");
 
         std::map<int, int> contentFileMap = buildContentFileIndexMap (reader);
+        MWBase::Environment::get().getLuaManager()->setContentFileMapping(contentFileMap);
 
         Loading::Listener& listener = *MWBase::Environment::get().getWindowManager()->getLoadingScreen();
 
@@ -482,6 +487,10 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
                     MWBase::Environment::get().getInputManager()->readRecord(reader, n.intval);
                     break;
 
+                case ESM::REC_LUAM:
+                    MWBase::Environment::get().getLuaManager()->readRecord(reader, n.intval);
+                    break;
+
                 default:
 
                     // ignore invalid records
diff --git a/apps/openmw/mwworld/livecellref.cpp b/apps/openmw/mwworld/livecellref.cpp
index 9cf8a0fe04..4203e1ac55 100644
--- a/apps/openmw/mwworld/livecellref.cpp
+++ b/apps/openmw/mwworld/livecellref.cpp
@@ -5,6 +5,7 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
+#include "../mwbase/luamanager.hpp"
 
 #include "ptr.hpp"
 #include "class.hpp"
@@ -52,6 +53,8 @@ void MWWorld::LiveCellRefBase::loadImp (const ESM::ObjectState& state)
         Log(Debug::Warning) << "Soul '" << mRef.getSoul() << "' not found, removing the soul from soul gem";
         mRef.setSoul(std::string());
     }
+
+    MWBase::Environment::get().getLuaManager()->loadLocalScripts(ptr, state.mLuaScripts);
 }
 
 void MWWorld::LiveCellRefBase::saveImp (ESM::ObjectState& state) const
@@ -61,6 +64,7 @@ void MWWorld::LiveCellRefBase::saveImp (ESM::ObjectState& state) const
     ConstPtr ptr (this);
 
     mData.write (state, mClass->getScript (ptr));
+    MWBase::Environment::get().getLuaManager()->saveLocalScripts(Ptr(const_cast<LiveCellRefBase*>(this)), state.mLuaScripts);
 
     mClass->writeAdditionalState (ptr, state);
 }
diff --git a/components/esm/defs.hpp b/components/esm/defs.hpp
index 1b623f69f0..7f2fe19cc5 100644
--- a/components/esm/defs.hpp
+++ b/components/esm/defs.hpp
@@ -164,7 +164,10 @@ enum RecNameInts
 
     // format 1
     REC_FILT = FourCC<'F','I','L','T'>::value,
-    REC_DBGP = FourCC<'D','B','G','P'>::value ///< only used in project files
+    REC_DBGP = FourCC<'D','B','G','P'>::value, ///< only used in project files
+
+    // format 16 - Lua scripts in saved games
+    REC_LUAM = FourCC<'L','U','A','M'>::value,  // LuaManager data
 };
 
 /// Common subrecords
diff --git a/components/esm/objectstate.cpp b/components/esm/objectstate.cpp
index 9709bf4ff6..76967e497c 100644
--- a/components/esm/objectstate.cpp
+++ b/components/esm/objectstate.cpp
@@ -20,6 +20,8 @@ void ESM::ObjectState::load (ESMReader &esm)
     if (mHasLocals)
         mLocals.load (esm);
 
+    mLuaScripts.load(esm);
+
     mEnabled = 1;
     esm.getHNOT (mEnabled, "ENAB");
 
@@ -56,6 +58,8 @@ void ESM::ObjectState::save (ESMWriter &esm, bool inInventory) const
         mLocals.save (esm);
     }
 
+    mLuaScripts.save(esm);
+
     if (!mEnabled && !inInventory)
         esm.writeHNT ("ENAB", mEnabled);
 
diff --git a/components/esm/objectstate.hpp b/components/esm/objectstate.hpp
index 6b0fca5ea6..b30f44b5e1 100644
--- a/components/esm/objectstate.hpp
+++ b/components/esm/objectstate.hpp
@@ -6,6 +6,7 @@
 
 #include "cellref.hpp"
 #include "locals.hpp"
+#include "luascripts.hpp"
 #include "animationstate.hpp"
 
 namespace ESM
@@ -27,6 +28,7 @@ namespace ESM
 
         unsigned char mHasLocals;
         Locals mLocals;
+        LuaScripts mLuaScripts;
         unsigned char mEnabled;
         int mCount;
         ESM::Position mPosition;
diff --git a/components/esm/savedgame.cpp b/components/esm/savedgame.cpp
index 7cb30f2dd2..3f8bf10c56 100644
--- a/components/esm/savedgame.cpp
+++ b/components/esm/savedgame.cpp
@@ -4,7 +4,7 @@
 #include "esmwriter.hpp"
 
 unsigned int ESM::SavedGame::sRecordId = ESM::REC_SAVE;
-int ESM::SavedGame::sCurrentFormat = 15;
+int ESM::SavedGame::sCurrentFormat = 16;
 
 void ESM::SavedGame::load (ESMReader &esm)
 {

From 87b5afb9bf34c5d163abed014ef72692be10c42b Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 7 Feb 2021 12:44:03 +0100
Subject: [PATCH 0985/2859] Control active Lua scripts from openmw.cfg

---
 apps/openmw/engine.cpp              |  7 +++++-
 apps/openmw/engine.hpp              |  2 ++
 apps/openmw/main.cpp                |  7 ++++++
 apps/openmw/mwlua/luamanagerimp.cpp | 38 ++++++++++++++++++++++++++---
 apps/openmw/mwlua/luamanagerimp.hpp |  3 ++-
 5 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 3b7d17e69b..b9f499ffb4 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -493,6 +493,11 @@ void OMW::Engine::addGroundcoverFile(const std::string& file)
     mGroundcoverFiles.emplace_back(file);
 }
 
+void OMW::Engine::addLuaScriptListFile(const std::string& file)
+{
+    mLuaScriptListFiles.push_back(file);
+}
+
 void OMW::Engine::setSkipMenu (bool skipMenu, bool newGame)
 {
     mSkipMenu = skipMenu;
@@ -707,7 +712,7 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
 
     mViewer->addEventHandler(mScreenCaptureHandler);
 
-    mLuaManager = new MWLua::LuaManager(mVFS.get());
+    mLuaManager = new MWLua::LuaManager(mVFS.get(), mLuaScriptListFiles);
     mEnvironment.setLuaManager(mLuaManager);
 
     // Create input and UI first to set up a bootstrapping environment for
diff --git a/apps/openmw/engine.hpp b/apps/openmw/engine.hpp
index efa8c688dd..0645939694 100644
--- a/apps/openmw/engine.hpp
+++ b/apps/openmw/engine.hpp
@@ -71,6 +71,7 @@ namespace OMW
             std::string mCellName;
             std::vector<std::string> mContentFiles;
             std::vector<std::string> mGroundcoverFiles;
+            std::vector<std::string> mLuaScriptListFiles;
             bool mSkipMenu;
             bool mUseSound;
             bool mCompileAll;
@@ -144,6 +145,7 @@ namespace OMW
              */
             void addContentFile(const std::string& file);
             void addGroundcoverFile(const std::string& file);
+            void addLuaScriptListFile(const std::string& file);
 
             /// Disable or enable all sounds
             void setSoundUsage(bool soundUsage);
diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index 709ffda2cb..324a18bdee 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -65,6 +65,9 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
         ("groundcover", bpo::value<Files::EscapeStringVector>()->default_value(Files::EscapeStringVector(), "")
             ->multitoken()->composing(), "groundcover content file(s): esm/esp, or omwgame/omwaddon")
 
+        ("lua-scripts", bpo::value<Files::EscapeStringVector>()->default_value(Files::EscapeStringVector(), "")
+            ->multitoken()->composing(), "file(s) with a list of global Lua scripts: omwscripts")
+
         ("no-sound", bpo::value<bool>()->implicit_value(true)
             ->default_value(false), "disable all sounds")
 
@@ -204,6 +207,10 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
         engine.addGroundcoverFile(file);
     }
 
+    StringsVector luaScriptLists = variables["lua-scripts"].as<Files::EscapeStringVector>().toStdStringVector();
+    for (const auto& file : luaScriptLists)
+        engine.addLuaScriptListFile(file);
+
     // startup-settings
     engine.setCell(variables["start"].as<Files::EscapeHashString>().toStdString());
     engine.setSkipMenu (variables["skip-menu"].as<bool>(), variables["new-game"].as<bool>());
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 00b8c10cfe..c725c0f936 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -17,7 +17,7 @@
 namespace MWLua
 {
 
-    LuaManager::LuaManager(const VFS::Manager* vfs) : mLua(vfs)
+    LuaManager::LuaManager(const VFS::Manager* vfs, const std::vector<std::string>& globalScriptLists) : mLua(vfs)
     {
         Log(Debug::Info) << "Lua version: " << LuaUtil::getLuaVersion();
 
@@ -48,13 +48,45 @@ namespace MWLua
         mLua.addCommonPackage("openmw.core", initCorePackage(context));
         mGlobalScripts.addPackage("openmw.world", initWorldPackage(context));
         mNearbyPackage = initNearbyPackage(localContext);
+
+        auto endsWith = [](std::string_view s, std::string_view suffix)
+        {
+            return s.size() >= suffix.size() && std::equal(suffix.rbegin(), suffix.rend(), s.rbegin());
+        };
+        for (const std::string& scriptListFile : globalScriptLists)
+        {
+            if (!endsWith(scriptListFile, ".omwscripts"))
+            {
+                Log(Debug::Error) << "Script list should have suffix '.omwscripts', got: '" << scriptListFile << "'";
+                continue;
+            }
+            std::string content(std::istreambuf_iterator<char>(*vfs->get(scriptListFile)), {});
+            std::string_view view(content);
+            while (!view.empty())
+            {
+                size_t pos = 0;
+                while (pos < view.size() && view[pos] != '\n')
+                    pos++;
+                std::string_view line = view.substr(0, pos);
+                view = view.substr(pos + 1);
+                if (line.empty() || line[0] == '#')
+                    continue;
+                if (line.back() == '\r')
+                    line = line.substr(0, pos - 1);
+                if (endsWith(line, ".lua"))
+                    mGlobalScriptList.push_back(std::string(line));
+                else
+                    Log(Debug::Error) << "Lua script should have suffix '.lua', got: '" << line.substr(0, 300) << "'";
+            }
+        }
     }
 
     void LuaManager::init()
     {
         mKeyPressEvents.clear();
-        if (mGlobalScripts.addNewScript("test.lua"))
-            Log(Debug::Info) << "Global script started: test.lua";
+        for (const std::string& path : mGlobalScriptList)
+            if (mGlobalScripts.addNewScript(path))
+                Log(Debug::Info) << "Global script started: " << path;
     }
 
     void LuaManager::update(bool paused, float dt)
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index fcde053009..833b22cf0f 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -21,7 +21,7 @@ namespace MWLua
     class LuaManager : public MWBase::LuaManager
     {
     public:
-        LuaManager(const VFS::Manager* vfs);
+        LuaManager(const VFS::Manager* vfs, const std::vector<std::string>& globalScriptLists);
         ~LuaManager() {}
 
         // Called by engine.cpp when environment is fully initialized.
@@ -64,6 +64,7 @@ namespace MWLua
         LuaUtil::LuaState mLua;
         sol::table mNearbyPackage;
 
+        std::vector<std::string> mGlobalScriptList;
         GlobalScripts mGlobalScripts{&mLua};
         std::set<LocalScripts*> mActiveLocalScripts;
         WorldView mWorldView;

From 32218f6dd5d90e0c957b051b77bf9af94e18d091 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Fri, 29 Jan 2021 01:54:54 +0100
Subject: [PATCH 0986/2859] More Lua bindings

---
 apps/openmw/CMakeLists.txt           |  2 +-
 apps/openmw/mwlua/camerabindings.cpp | 13 +++++
 apps/openmw/mwlua/localscripts.cpp   | 27 ++++++++++
 apps/openmw/mwlua/luabindings.cpp    | 16 ++++++
 apps/openmw/mwlua/luabindings.hpp    |  6 +++
 apps/openmw/mwlua/luamanagerimp.cpp  | 12 ++++-
 apps/openmw/mwlua/luamanagerimp.hpp  |  6 +++
 apps/openmw/mwlua/object.cpp         | 81 ++++++++++++++++++++--------
 apps/openmw/mwlua/object.hpp         |  7 ++-
 apps/openmw/mwlua/objectbindings.cpp | 40 ++++++++++++++
 apps/openmw/mwlua/uibindings.cpp     | 18 +++++++
 apps/openmw/mwlua/worldview.cpp      | 39 +++++++++++---
 apps/openmw/mwlua/worldview.hpp      |  7 +++
 13 files changed, 240 insertions(+), 34 deletions(-)
 create mode 100644 apps/openmw/mwlua/camerabindings.cpp
 create mode 100644 apps/openmw/mwlua/uibindings.cpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 240d4a8e42..be80584882 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -57,7 +57,7 @@ add_openmw_dir (mwscript
 
 add_openmw_dir (mwlua
     luamanagerimp localscripts object worldview luabindings userdataserializer eventqueue
-    objectbindings asyncbindings
+    objectbindings asyncbindings camerabindings uibindings
     )
 
 add_openmw_dir (mwsound
diff --git a/apps/openmw/mwlua/camerabindings.cpp b/apps/openmw/mwlua/camerabindings.cpp
new file mode 100644
index 0000000000..68f2331b9e
--- /dev/null
+++ b/apps/openmw/mwlua/camerabindings.cpp
@@ -0,0 +1,13 @@
+#include "luabindings.hpp"
+
+namespace MWLua
+{
+
+    sol::table initCameraPackage(const Context& context)
+    {
+        sol::table api(context.mLua->sol(), sol::create);
+        // TODO
+        return context.mLua->makeReadOnly(api);
+    }
+
+}
diff --git a/apps/openmw/mwlua/localscripts.cpp b/apps/openmw/mwlua/localscripts.cpp
index 1c35b60131..573188c004 100644
--- a/apps/openmw/mwlua/localscripts.cpp
+++ b/apps/openmw/mwlua/localscripts.cpp
@@ -1,5 +1,10 @@
 #include "localscripts.hpp"
 
+#include "../mwworld/ptr.hpp"
+#include "../mwworld/class.hpp"
+#include "../mwmechanics/aisequence.hpp"
+#include "../mwmechanics/aicombat.hpp"
+
 namespace sol
 {
     template <>
@@ -27,6 +32,28 @@ namespace MWLua
         selfAPI["object"] = sol::readonly_property([](SelfObject& self) -> LObject { return LObject(self); });
         selfAPI["controls"] = sol::readonly_property([](SelfObject& self) { return &self.mControls; });
         selfAPI["setDirectControl"] = [](SelfObject& self, bool v) { self.mControls.controlledFromLua = v; };
+        selfAPI["getCombatTarget"] = [worldView=context.mWorldView](SelfObject& self) -> sol::optional<LObject>
+        {
+            const MWWorld::Ptr& ptr = self.ptr();
+            MWMechanics::AiSequence& ai = ptr.getClass().getCreatureStats(ptr).getAiSequence();
+            MWWorld::Ptr target;
+            if (ai.getCombatTarget(target))
+                return LObject(getId(target), worldView->getObjectRegistry());
+            else
+                return {};
+        };
+        selfAPI["stopCombat"] = [](SelfObject& self)
+        {
+            const MWWorld::Ptr& ptr = self.ptr();
+            MWMechanics::AiSequence& ai = ptr.getClass().getCreatureStats(ptr).getAiSequence();
+            ai.stopCombat();
+        };
+        selfAPI["startCombat"] = [](SelfObject& self, const LObject& target)
+        {
+            const MWWorld::Ptr& ptr = self.ptr();
+            MWMechanics::AiSequence& ai = ptr.getClass().getCreatureStats(ptr).getAiSequence();
+            ai.stack(MWMechanics::AiCombat(target.ptr()), ptr);
+        };
     }
 
     std::unique_ptr<LocalScripts> LocalScripts::create(LuaUtil::LuaState* lua, const LObject& obj)
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index 5ebb6670f8..f8d7812c61 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -8,6 +8,14 @@
 namespace MWLua
 {
 
+    static sol::table definitionList(LuaUtil::LuaState& lua, std::initializer_list<std::string> values)
+    {
+        sol::table res(lua.sol(), sol::create);
+        for (const std::string& v : values)
+            res[v] = v;
+        return lua.makeReadOnly(res);
+    }
+
     sol::table initCorePackage(const Context& context)
     {
         sol::table api(context.mLua->sol(), sol::create);
@@ -17,6 +25,11 @@ namespace MWLua
         };
         api["getGameTimeInSeconds"] = [world=context.mWorldView]() { return world->getGameTimeInSeconds(); };
         api["getGameTimeInHours"] = [world=context.mWorldView]() { return world->getGameTimeInHours(); };
+        api["OBJECT_TYPE"] = definitionList(*context.mLua,
+        {
+            "Activator", "Armor", "Book", "Clothing", "Creature", "Door", "Ingredient",
+            "Light", "Miscellaneous", "NPC", "Player", "Potion", "Static", "Weapon"
+        });
         return context.mLua->makeReadOnly(api);
     }
 
@@ -32,7 +45,10 @@ namespace MWLua
     {
         sol::table api(context.mLua->sol(), sol::create);
         WorldView* worldView = context.mWorldView;
+        api["activators"] = LObjectList{worldView->getActivatorsInScene()};
         api["actors"] = LObjectList{worldView->getActorsInScene()};
+        api["containers"] = LObjectList{worldView->getContainersInScene()};
+        api["doors"] = LObjectList{worldView->getDoorsInScene()};
         api["items"] = LObjectList{worldView->getItemsInScene()};
         return context.mLua->makeReadOnly(api);
     }
diff --git a/apps/openmw/mwlua/luabindings.hpp b/apps/openmw/mwlua/luabindings.hpp
index 2eae569ef0..251ed3998b 100644
--- a/apps/openmw/mwlua/luabindings.hpp
+++ b/apps/openmw/mwlua/luabindings.hpp
@@ -40,6 +40,12 @@ namespace MWLua
     };
     sol::function getAsyncPackageInitializer(const Context&);
 
+    // Implemented in camerabindings.cpp
+    sol::table initCameraPackage(const Context&);
+
+    // Implemented in uibindings.cpp
+    sol::table initUserInterfacePackage(const Context&);
+
     // openmw.self package is implemented in localscripts.cpp
 }
 
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index c725c0f936..b629e22ab2 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -8,6 +8,8 @@
 
 #include <components/lua/utilpackage.hpp>
 
+#include "../mwbase/windowmanager.hpp"
+
 #include "../mwworld/class.hpp"
 #include "../mwworld/ptr.hpp"
 
@@ -47,6 +49,8 @@ namespace MWLua
         mLua.addCommonPackage("openmw.util", LuaUtil::initUtilPackage(mLua.sol()));
         mLua.addCommonPackage("openmw.core", initCorePackage(context));
         mGlobalScripts.addPackage("openmw.world", initWorldPackage(context));
+        mCameraPackage = initCameraPackage(localContext);
+        mUserInterfacePackage = initUserInterfacePackage(localContext);
         mNearbyPackage = initNearbyPackage(localContext);
 
         auto endsWith = [](std::string_view s, std::string_view suffix)
@@ -151,6 +155,10 @@ namespace MWLua
 
     void LuaManager::applyQueuedChanges()
     {
+        MWBase::WindowManager* windowManager = MWBase::Environment::get().getWindowManager();
+        for (const std::string& message : mUIMessages)
+            windowManager->messageBox(message);
+        mUIMessages.clear();
     }
 
     void LuaManager::clear()
@@ -238,8 +246,8 @@ namespace MWLua
         {
             mPlayerScripts = new PlayerScripts(&mLua, LObject(getId(ptr), mWorldView.getObjectRegistry()));
             scripts = std::unique_ptr<LocalScripts>(mPlayerScripts);
-            // TODO: scripts->addPackage("openmw.ui", ...);
-            // TODO: scripts->addPackage("openmw.camera", ...);
+            scripts->addPackage("openmw.ui", mUserInterfacePackage);
+            scripts->addPackage("openmw.camera", mCameraPackage);
         }
         else
             scripts = LocalScripts::create(&mLua, LObject(getId(ptr), mWorldView.getObjectRegistry()));
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index 833b22cf0f..e8babc9695 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -48,6 +48,7 @@ namespace MWLua
 
         // Used only in luabindings.cpp
         void addLocalScript(const MWWorld::Ptr&, const std::string& scriptPath);
+        void addUIMessage(std::string_view message) { mUIMessages.emplace_back(message); }
 
         // Saving
         void write(ESM::ESMWriter& writer, Loading::Listener& progress) override;
@@ -63,6 +64,8 @@ namespace MWLua
 
         LuaUtil::LuaState mLua;
         sol::table mNearbyPackage;
+        sol::table mUserInterfacePackage;
+        sol::table mCameraPackage;
 
         std::vector<std::string> mGlobalScriptList;
         GlobalScripts mGlobalScripts{&mLua};
@@ -85,6 +88,9 @@ namespace MWLua
 
         std::vector<SDL_Keysym> mKeyPressEvents;
         std::vector<ObjectId> mActorAddedEvents;
+
+        // Queued actions that should be done in main thread. Processed by applyQueuedChanges().
+        std::vector<std::string> mUIMessages;
     };
 
 }
diff --git a/apps/openmw/mwlua/object.cpp b/apps/openmw/mwlua/object.cpp
index fa0f9daffc..2eb8d16f3c 100644
--- a/apps/openmw/mwlua/object.cpp
+++ b/apps/openmw/mwlua/object.cpp
@@ -1,7 +1,19 @@
 #include "object.hpp"
 
-#include <components/esm/loadnpc.hpp>
-#include <components/esm/loadcrea.hpp>
+#include "../mwclass/activator.hpp"
+#include "../mwclass/armor.hpp"
+#include "../mwclass/book.hpp"
+#include "../mwclass/clothing.hpp"
+#include "../mwclass/container.hpp"
+#include "../mwclass/creature.hpp"
+#include "../mwclass/door.hpp"
+#include "../mwclass/ingredient.hpp"
+#include "../mwclass/light.hpp"
+#include "../mwclass/misc.hpp"
+#include "../mwclass/npc.hpp"
+#include "../mwclass/potion.hpp"
+#include "../mwclass/static.hpp"
+#include "../mwclass/weapon.hpp"
 
 namespace MWLua
 {
@@ -11,33 +23,58 @@ namespace MWLua
         return std::to_string(id.mIndex) + "_" + std::to_string(id.mContentFile);
     }
 
-    std::string Object::toString() const
+    const static std::map<std::type_index, std::string_view> classNames = {
+        {typeid(MWClass::Activator), "Activator"},
+        {typeid(MWClass::Armor), "Armor"},
+        {typeid(MWClass::Book), "Book"},
+        {typeid(MWClass::Clothing), "Clothing"},
+        {typeid(MWClass::Container), "Container"},
+        {typeid(MWClass::Creature), "Creature"},
+        {typeid(MWClass::Door), "Door"},
+        {typeid(MWClass::Ingredient), "Ingredient"},
+        {typeid(MWClass::Light), "Light"},
+        {typeid(MWClass::Miscellaneous), "Miscellaneous"},
+        {typeid(MWClass::Npc), "NPC"},
+        {typeid(MWClass::Potion), "Potion"},
+        {typeid(MWClass::Static), "Static"},
+        {typeid(MWClass::Weapon), "Weapon"},
+    };
+
+    std::string_view getMWClassName(const std::type_index& cls_type, std::string_view fallback)
     {
-        std::string res = idToString(mId);
-        if (isValid())
-        {
-            res.append(" (");
-            res.append(type());
-            res.append(", ");
-            res.append(*ptr().getCellRef().getRefIdPtr());
-            res.append(")");
-        }
+        auto it = classNames.find(cls_type);
+        if (it != classNames.end())
+            return it->second;
         else
-            res.append(" (not found)");
-        return res;
+            return fallback;
     }
 
-    std::string_view Object::type() const
+    std::string_view getMWClassName(const MWWorld::Ptr& ptr)
     {
-        if (*ptr().getCellRef().getRefIdPtr() == "player")
+        if (*ptr.getCellRef().getRefIdPtr() == "player")
             return "Player";
-        const std::string& typeName = ptr().getTypeName();
-        if (typeName == typeid(ESM::NPC).name())
-            return "NPC";
-        else if (typeName == typeid(ESM::Creature).name())
-            return "Creature";
         else
-            return typeName;
+            return getMWClassName(typeid(ptr.getClass()), ptr.getTypeName());
+    }
+
+    std::string ptrToString(const MWWorld::Ptr& ptr)
+    {
+        std::string res = "object";
+        res.append(idToString(getId(ptr)));
+        res.append(" (");
+        res.append(getMWClassName(ptr));
+        res.append(", ");
+        res.append(*ptr.getCellRef().getRefIdPtr());
+        res.append(")");
+        return res;
+    }
+
+    std::string Object::toString() const
+    {
+        if (isValid())
+            return ptrToString(ptr());
+        else
+            return "object" + idToString(mId) + " (not found)";
     }
 
     bool Object::isValid() const
diff --git a/apps/openmw/mwlua/object.hpp b/apps/openmw/mwlua/object.hpp
index 59e6534166..ac079fb38f 100644
--- a/apps/openmw/mwlua/object.hpp
+++ b/apps/openmw/mwlua/object.hpp
@@ -1,6 +1,8 @@
 #ifndef MWLUA_OBJECT_H
 #define MWLUA_OBJECT_H
 
+#include <typeindex>
+
 #include <components/esm/cellref.hpp>
 
 #include "../mwbase/environment.hpp"
@@ -15,6 +17,9 @@ namespace MWLua
     using ObjectId = ESM::RefNum;
     inline const ObjectId& getId(const MWWorld::Ptr& ptr) { return ptr.getCellRef().getRefNum(); }
     std::string idToString(const ObjectId& id);
+    std::string ptrToString(const MWWorld::Ptr& ptr);
+    std::string_view getMWClassName(const std::type_index& cls_type, std::string_view fallback = "Unknown");
+    std::string_view getMWClassName(const MWWorld::Ptr& ptr);
 
     // Holds a mapping ObjectId -> MWWord::Ptr.
     class ObjectRegistry
@@ -60,7 +65,7 @@ namespace MWLua
         ObjectId id() const { return mId; }
 
         std::string toString() const;
-        std::string_view type() const;
+        std::string_view type() const { return getMWClassName(ptr()); }
 
         // Updates and returns the underlying Ptr. Throws an exception if object is not available.
         const MWWorld::Ptr& ptr() const;
diff --git a/apps/openmw/mwlua/objectbindings.cpp b/apps/openmw/mwlua/objectbindings.cpp
index 806907ef35..dbe0a54480 100644
--- a/apps/openmw/mwlua/objectbindings.cpp
+++ b/apps/openmw/mwlua/objectbindings.cpp
@@ -2,6 +2,8 @@
 
 #include <components/lua/luastate.hpp>
 
+#include "../mwclass/door.hpp"
+
 #include "eventqueue.hpp"
 #include "luamanagerimp.hpp"
 
@@ -20,6 +22,20 @@ namespace sol
 namespace MWLua
 {
 
+    template <class Class>
+    static const MWWorld::Ptr& requireClass(const MWWorld::Ptr& ptr)
+    {
+        if (typeid(Class) != typeid(ptr.getClass()))
+        {
+            std::string msg = "Requires type '";
+            msg.append(getMWClassName(typeid(Class)));
+            msg.append("', but applied to ");
+            msg.append(ptrToString(ptr));
+            throw std::runtime_error(msg);
+        }
+        return ptr;
+    }
+
     template <class ObjectT>
     static void registerObjectList(const std::string& prefix, const Context& context)
     {
@@ -83,11 +99,35 @@ namespace MWLua
         }
     }
 
+    template <class ObjectT>
+    static void addDoorBindings(sol::usertype<ObjectT>& objectT, const Context& context)
+    {
+        auto ptr = [](const ObjectT& o) -> const MWWorld::Ptr& { return requireClass<MWClass::Door>(o.ptr()); };
+
+        objectT["isTeleport"] = sol::readonly_property([ptr](const ObjectT& o)
+        {
+            return ptr(o).getCellRef().getTeleport();
+        });
+        objectT["destPosition"] = sol::readonly_property([ptr](const ObjectT& o) -> osg::Vec3f
+        {
+            return ptr(o).getCellRef().getDoorDest().asVec3();
+        });
+        objectT["destRotation"] = sol::readonly_property([ptr](const ObjectT& o) -> osg::Vec3f
+        {
+            return ptr(o).getCellRef().getDoorDest().asRotationVec3();
+        });
+        objectT["destCell"] = sol::readonly_property([ptr](const ObjectT& o) -> std::string_view
+        {
+            return ptr(o).getCellRef().getDestCell();
+        });
+    }
+
     template <class ObjectT>
     static void initObjectBindings(const std::string& prefix, const Context& context)
     {
         sol::usertype<ObjectT> objectT = context.mLua->sol().new_usertype<ObjectT>(prefix + "Object");
         addBasicBindings<ObjectT>(objectT, context);
+        addDoorBindings<ObjectT>(objectT, context);
 
         registerObjectList<ObjectT>(prefix, context);
     }
diff --git a/apps/openmw/mwlua/uibindings.cpp b/apps/openmw/mwlua/uibindings.cpp
new file mode 100644
index 0000000000..cb14c41621
--- /dev/null
+++ b/apps/openmw/mwlua/uibindings.cpp
@@ -0,0 +1,18 @@
+#include "luabindings.hpp"
+
+#include "luamanagerimp.hpp"
+
+namespace MWLua
+{
+
+    sol::table initUserInterfacePackage(const Context& context)
+    {
+        sol::table api(context.mLua->sol(), sol::create);
+        api["showMessage"] = [luaManager=context.mLuaManager](std::string_view message)
+        {
+            luaManager->addUIMessage(message);
+        };
+        return context.mLua->makeReadOnly(api);
+    }
+    
+}
diff --git a/apps/openmw/mwlua/worldview.cpp b/apps/openmw/mwlua/worldview.cpp
index fc08b60037..6e54efac39 100644
--- a/apps/openmw/mwlua/worldview.cpp
+++ b/apps/openmw/mwlua/worldview.cpp
@@ -3,6 +3,8 @@
 #include <components/esm/esmreader.hpp>
 #include <components/esm/esmwriter.hpp>
 
+#include "../mwclass/container.hpp"
+
 #include "../mwworld/class.hpp"
 #include "../mwworld/timestamp.hpp"
 
@@ -12,31 +14,52 @@ namespace MWLua
     void WorldView::update()
     {
         mObjectRegistry.update();
+        mActivatorsInScene.updateList();
         mActorsInScene.updateList();
+        mContainersInScene.updateList();
+        mDoorsInScene.updateList();
         mItemsInScene.updateList();
     }
 
     void WorldView::clear()
     {
         mObjectRegistry.clear();
+        mActivatorsInScene.clear();
         mActorsInScene.clear();
+        mContainersInScene.clear();
+        mDoorsInScene.clear();
         mItemsInScene.clear();
     }
 
+    WorldView::ObjectGroup* WorldView::chooseGroup(const MWWorld::Ptr& ptr)
+    {
+        const MWWorld::Class& cls = ptr.getClass();
+        if (cls.isActivator())
+            return &mActivatorsInScene;
+        if (cls.isActor())
+            return &mActorsInScene;
+        if (cls.isDoor())
+            return &mDoorsInScene;
+        if (typeid(cls) == typeid(MWClass::Container))
+            return &mContainersInScene;
+        if (cls.hasToolTip(ptr))
+            return &mItemsInScene;
+        return nullptr;
+    }
+
     void WorldView::objectAddedToScene(const MWWorld::Ptr& ptr)
     {
-        if (ptr.getClass().isActor())
-            addToGroup(mActorsInScene, ptr);
-        else
-            addToGroup(mItemsInScene, ptr);
+        mObjectRegistry.registerPtr(ptr);
+        ObjectGroup* group = chooseGroup(ptr);
+        if (group)
+            addToGroup(*group, ptr);
     }
 
     void WorldView::objectRemovedFromScene(const MWWorld::Ptr& ptr)
     {
-        if (ptr.getClass().isActor())
-            removeFromGroup(mActorsInScene, ptr);
-        else
-            removeFromGroup(mItemsInScene, ptr);
+        ObjectGroup* group = chooseGroup(ptr);
+        if (group)
+            removeFromGroup(*group, ptr);
     }
 
     double WorldView::getGameTimeInHours() const
diff --git a/apps/openmw/mwlua/worldview.hpp b/apps/openmw/mwlua/worldview.hpp
index 45046c0b73..89f5afa0c3 100644
--- a/apps/openmw/mwlua/worldview.hpp
+++ b/apps/openmw/mwlua/worldview.hpp
@@ -27,7 +27,10 @@ namespace MWLua
         // Note that the number of seconds in a game hour is not fixed.
         double getGameTimeInHours() const;
 
+        ObjectIdList getActivatorsInScene() const { return mActivatorsInScene.mList; }
         ObjectIdList getActorsInScene() const { return mActorsInScene.mList; }
+        ObjectIdList getContainersInScene() const { return mContainersInScene.mList; }
+        ObjectIdList getDoorsInScene() const { return mDoorsInScene.mList; }
         ObjectIdList getItemsInScene() const { return mItemsInScene.mList; }
 
         ObjectRegistry* getObjectRegistry() { return &mObjectRegistry; }
@@ -51,11 +54,15 @@ namespace MWLua
             std::set<ObjectId> mSet;
         };
 
+        ObjectGroup* chooseGroup(const MWWorld::Ptr& ptr);
         void addToGroup(ObjectGroup& group, const MWWorld::Ptr& ptr);
         void removeFromGroup(ObjectGroup& group, const MWWorld::Ptr& ptr);
 
         ObjectRegistry mObjectRegistry;
+        ObjectGroup mActivatorsInScene;
         ObjectGroup mActorsInScene;
+        ObjectGroup mContainersInScene;
+        ObjectGroup mDoorsInScene;
         ObjectGroup mItemsInScene;
 
         double mGameSeconds = 0;

From bdccf161c473070aa6efcceb9ec72414ad803427 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Wed, 17 Feb 2021 22:56:14 +0100
Subject: [PATCH 0987/2859] Add lua package 'openmw.query'

---
 apps/openmw/CMakeLists.txt           |   4 +-
 apps/openmw/mwlua/context.hpp        |  30 ++++++
 apps/openmw/mwlua/luabindings.cpp    |  66 ++++++++++++
 apps/openmw/mwlua/luabindings.hpp    |  16 +--
 apps/openmw/mwlua/luamanagerimp.cpp  |   3 +
 apps/openmw/mwlua/objectbindings.cpp |   5 +
 apps/openmw/mwlua/query.cpp          | 150 +++++++++++++++++++++++++++
 apps/openmw/mwlua/query.hpp          |  38 +++++++
 apps/openmw/mwlua/worldview.hpp      |   4 +
 9 files changed, 303 insertions(+), 13 deletions(-)
 create mode 100644 apps/openmw/mwlua/context.hpp
 create mode 100644 apps/openmw/mwlua/query.cpp
 create mode 100644 apps/openmw/mwlua/query.hpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index be80584882..de55c36475 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -56,8 +56,8 @@ add_openmw_dir (mwscript
     )
 
 add_openmw_dir (mwlua
-    luamanagerimp localscripts object worldview luabindings userdataserializer eventqueue
-    objectbindings asyncbindings camerabindings uibindings
+    luamanagerimp localscripts object worldview userdataserializer eventqueue query
+    luabindings objectbindings asyncbindings camerabindings uibindings
     )
 
 add_openmw_dir (mwsound
diff --git a/apps/openmw/mwlua/context.hpp b/apps/openmw/mwlua/context.hpp
new file mode 100644
index 0000000000..b3e3703a46
--- /dev/null
+++ b/apps/openmw/mwlua/context.hpp
@@ -0,0 +1,30 @@
+#ifndef MWLUA_CONTEXT_H
+#define MWLUA_CONTEXT_H
+
+#include "eventqueue.hpp"
+
+namespace LuaUtil
+{
+    class LuaState;
+    class UserdataSerializer;
+}
+
+namespace MWLua
+{
+    class LuaManager;
+    class WorldView;
+
+    struct Context
+    {
+        bool mIsGlobal;
+        LuaManager* mLuaManager;
+        LuaUtil::LuaState* mLua;
+        LuaUtil::UserdataSerializer* mSerializer;
+        WorldView* mWorldView;
+        LocalEventQueue* mLocalEventQueue;
+        GlobalEventQueue* mGlobalEventQueue;
+    };
+
+}
+
+#endif // MWLUA_CONTEXT_H
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index f8d7812c61..8d9cbb8bee 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -1,6 +1,7 @@
 #include "luabindings.hpp"
 
 #include <components/lua/luastate.hpp>
+#include <components/queries/luabindings.hpp>
 
 #include "eventqueue.hpp"
 #include "worldview.hpp"
@@ -38,6 +39,24 @@ namespace MWLua
         sol::table api(context.mLua->sol(), sol::create);
         WorldView* worldView = context.mWorldView;
         api["activeActors"] = GObjectList{worldView->getActorsInScene()};
+        api["selectObjects"] = [context](const Queries::Query& query)
+        {
+            ObjectIdList list;
+            WorldView* worldView = context.mWorldView;
+            if (query.mQueryType == "activators")
+                list = worldView->getActivatorsInScene();
+            else if (query.mQueryType == "actors")
+                list = worldView->getActorsInScene();
+            else if (query.mQueryType == "containers")
+                list = worldView->getContainersInScene();
+            else if (query.mQueryType == "doors")
+                list = worldView->getDoorsInScene();
+            else if (query.mQueryType == "items")
+                list = worldView->getItemsInScene();
+            return GObjectList{selectObjectsFromList(query, list, context)};
+            // TODO: Use sqlite to search objects that are not in the scene
+            // return GObjectList{worldView->selectObjects(query, false)};
+        };
         return context.mLua->makeReadOnly(api);
     }
 
@@ -50,8 +69,55 @@ namespace MWLua
         api["containers"] = LObjectList{worldView->getContainersInScene()};
         api["doors"] = LObjectList{worldView->getDoorsInScene()};
         api["items"] = LObjectList{worldView->getItemsInScene()};
+        api["selectObjects"] = [context](const Queries::Query& query)
+        {
+            ObjectIdList list;
+            WorldView* worldView = context.mWorldView;
+            if (query.mQueryType == "activators")
+                list = worldView->getActivatorsInScene();
+            else if (query.mQueryType == "actors")
+                list = worldView->getActorsInScene();
+            else if (query.mQueryType == "containers")
+                list = worldView->getContainersInScene();
+            else if (query.mQueryType == "doors")
+                list = worldView->getDoorsInScene();
+            else if (query.mQueryType == "items")
+                list = worldView->getItemsInScene();
+            return LObjectList{selectObjectsFromList(query, list, context)};
+            // TODO: Maybe use sqlite
+            // return LObjectList{worldView->selectObjects(query, true)};
+        };
         return context.mLua->makeReadOnly(api);
     }
 
+    sol::table initQueryPackage(const Context& context)
+    {
+        Queries::registerQueryBindings(context.mLua->sol());
+        sol::table query(context.mLua->sol(), sol::create);
+        for (std::string_view t : ObjectQueryTypes::types)
+            query[t] = Queries::Query(std::string(t));
+        for (const QueryFieldGroup& group : getBasicQueryFieldGroups())
+            query[group.mName] = initFieldGroup(context, group);
+        return query;  // makeReadonly is applied by LuaState::addCommonPackage
+    }
+
+    sol::table initFieldGroup(const Context& context, const QueryFieldGroup& group)
+    {
+        sol::table res(context.mLua->sol(), sol::create);
+        for (const Queries::Field* field : group.mFields)
+        {
+            sol::table subgroup = res;
+            for (int i = 0; i < static_cast<int>(field->path().size()) - 1; ++i)
+            {
+                const std::string& name = field->path()[i];
+                if (subgroup[name] == sol::nil)
+                    subgroup[name] = context.mLua->makeReadOnly(context.mLua->newTable());
+                subgroup = context.mLua->getMutableFromReadOnly(subgroup[name]);
+            }
+            subgroup[field->path().back()] = field;
+        }
+        return context.mLua->makeReadOnly(res);
+    }
+
 }
 
diff --git a/apps/openmw/mwlua/luabindings.hpp b/apps/openmw/mwlua/luabindings.hpp
index 251ed3998b..cb38e63fb7 100644
--- a/apps/openmw/mwlua/luabindings.hpp
+++ b/apps/openmw/mwlua/luabindings.hpp
@@ -5,27 +5,21 @@
 #include <components/lua/serialization.hpp>
 #include <components/lua/scriptscontainer.hpp>
 
+#include "context.hpp"
 #include "eventqueue.hpp"
 #include "object.hpp"
+#include "query.hpp"
 #include "worldview.hpp"
 
 namespace MWLua
 {
-    class LuaManager;
-
-    struct Context
-    {
-        LuaManager* mLuaManager;
-        LuaUtil::LuaState* mLua;
-        LuaUtil::UserdataSerializer* mSerializer;
-        WorldView* mWorldView;
-        LocalEventQueue* mLocalEventQueue;
-        GlobalEventQueue* mGlobalEventQueue;
-    };
 
     sol::table initCorePackage(const Context&);
     sol::table initWorldPackage(const Context&);
     sol::table initNearbyPackage(const Context&);
+    sol::table initQueryPackage(const Context&);
+
+    sol::table initFieldGroup(const Context&, const QueryFieldGroup&);
 
     // Implemented in objectbindings.cpp
     void initObjectBindingsForLocalScripts(const Context&);
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index b629e22ab2..4e7dcf2b24 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -31,6 +31,7 @@ namespace MWLua
         mGlobalScripts.setSerializer(mGlobalSerializer.get());
 
         Context context;
+        context.mIsGlobal = true;
         context.mLuaManager = this;
         context.mLua = &mLua;
         context.mWorldView = &mWorldView;
@@ -39,6 +40,7 @@ namespace MWLua
         context.mSerializer = mGlobalSerializer.get();
 
         Context localContext = context;
+        localContext.mIsGlobal = false;
         localContext.mSerializer = mLocalSerializer.get();
 
         initObjectBindingsForGlobalScripts(context);
@@ -48,6 +50,7 @@ namespace MWLua
         mLua.addCommonPackage("openmw.async", getAsyncPackageInitializer(context));
         mLua.addCommonPackage("openmw.util", LuaUtil::initUtilPackage(mLua.sol()));
         mLua.addCommonPackage("openmw.core", initCorePackage(context));
+        mLua.addCommonPackage("openmw.query", initQueryPackage(context));
         mGlobalScripts.addPackage("openmw.world", initWorldPackage(context));
         mCameraPackage = initCameraPackage(localContext);
         mUserInterfacePackage = initUserInterfacePackage(localContext);
diff --git a/apps/openmw/mwlua/objectbindings.cpp b/apps/openmw/mwlua/objectbindings.cpp
index dbe0a54480..8b4f9d52d3 100644
--- a/apps/openmw/mwlua/objectbindings.cpp
+++ b/apps/openmw/mwlua/objectbindings.cpp
@@ -1,6 +1,7 @@
 #include "luabindings.hpp"
 
 #include <components/lua/luastate.hpp>
+#include <components/queries/query.hpp>
 
 #include "../mwclass/door.hpp"
 
@@ -64,6 +65,10 @@ namespace MWLua
             };
             return std::make_tuple(iter, list, 0);
         };
+        listT["select"] = [context](const ListT& list, const Queries::Query& query)
+        {
+            return ListT{selectObjectsFromList(query, list.mIds, context)};
+        };
     }
 
     template <class ObjectT>
diff --git a/apps/openmw/mwlua/query.cpp b/apps/openmw/mwlua/query.cpp
new file mode 100644
index 0000000000..f51b99d8d5
--- /dev/null
+++ b/apps/openmw/mwlua/query.cpp
@@ -0,0 +1,150 @@
+#include "query.hpp"
+
+#include <sol/sol.hpp>
+
+#include <components/lua/luastate.hpp>
+
+#include "../mwclass/container.hpp"
+
+#include "worldview.hpp"
+
+namespace MWLua
+{
+
+    static std::vector<QueryFieldGroup> initBasicFieldGroups()
+    {
+        auto createGroup = [](std::string name, const auto& arr) -> QueryFieldGroup
+        {
+            std::vector<const Queries::Field*> fieldPtrs;
+            fieldPtrs.reserve(arr.size());
+            for (const Queries::Field& field : arr)
+                fieldPtrs.push_back(&field);
+            return {std::move(name), std::move(fieldPtrs)};
+        };
+        static std::array objectFields = {
+            Queries::Field({"type"}, typeid(std::string)),
+            Queries::Field({"recordId"}, typeid(std::string)),
+            Queries::Field({"count"}, typeid(int32_t)),
+        };
+        static std::array doorFields = {
+            Queries::Field({"isTeleport"}, typeid(bool)),
+            Queries::Field({"destCell"}, typeid(std::string)),
+        };
+        return std::vector<QueryFieldGroup>{
+            createGroup("OBJECT", objectFields),
+            createGroup("DOOR", doorFields),
+        };
+    }
+
+    const std::vector<QueryFieldGroup>& getBasicQueryFieldGroups()
+    {
+        static std::vector<QueryFieldGroup> fieldGroups = initBasicFieldGroups();
+        return fieldGroups;
+    }
+
+    ObjectIdList selectObjectsFromList(const Queries::Query& query, const ObjectIdList& list, const Context& context)
+    {
+        if (!query.mOrderBy.empty() || !query.mGroupBy.empty() || query.mOffset > 0)
+            throw std::runtime_error("OrderBy, GroupBy, and Offset are not supported");
+
+        ObjectIdList res = std::make_shared<std::vector<ObjectId>>();
+        std::vector<char> condStack;
+        auto compareFn = [](auto&& a, auto&& b, Queries::Condition::Type t)
+        {
+            switch (t)
+            {
+                case Queries::Condition::EQUAL: return a == b;
+                case Queries::Condition::NOT_EQUAL: return a != b;
+                case Queries::Condition::GREATER: return a > b;
+                case Queries::Condition::GREATER_OR_EQUAL: return a >= b;
+                case Queries::Condition::LESSER: return a < b;
+                case Queries::Condition::LESSER_OR_EQUAL: return a <= b;
+                default:
+                    throw std::runtime_error("Unsupported condition type");
+            }
+        };
+        for (const ObjectId& id : *list)
+        {
+            if (static_cast<int64_t>(res->size()) == query.mLimit)
+                break;
+            sol::object obj;
+            MWWorld::Ptr ptr;
+            if (context.mIsGlobal)
+            {
+                GObject g(id, context.mWorldView->getObjectRegistry());
+                if (!g.isValid()) continue;
+                ptr = g.ptr();
+                obj = sol::make_object(context.mLua->sol(), g);
+            }
+            else
+            {
+                LObject l(id, context.mWorldView->getObjectRegistry());
+                if (!l.isValid()) continue;
+                ptr = l.ptr();
+                obj = sol::make_object(context.mLua->sol(), l);
+            }
+            const MWWorld::Class& cls = ptr.getClass();
+            if (cls.isActivator() && query.mQueryType != ObjectQueryTypes::ACTIVATORS)
+                continue;
+            if (cls.isActor() && query.mQueryType != ObjectQueryTypes::ACTORS)
+                continue;
+            if (cls.isDoor() && query.mQueryType != ObjectQueryTypes::DOORS)
+                continue;
+            if (typeid(cls) == typeid(MWClass::Container) && query.mQueryType != ObjectQueryTypes::CONTAINERS)
+                continue;
+
+            condStack.clear();
+            for (const Queries::Operation& op : query.mFilter.mOperations)
+            {
+                switch(op.mType)
+                {
+                    case Queries::Operation::PUSH:
+                    {
+                        const Queries::Condition& cond = query.mFilter.mConditions[op.mConditionIndex];
+                        sol::object fieldObj = obj;
+                        for (const std::string& field : cond.mField->path())
+                            fieldObj = sol::table(fieldObj)[field];
+                        bool c;
+                        if (cond.mField->type() == typeid(std::string))
+                            c = compareFn(fieldObj.as<std::string_view>(), std::get<std::string>(cond.mValue), cond.mType);
+                        else if (cond.mField->type() == typeid(float))
+                            c = compareFn(fieldObj.as<float>(), std::get<float>(cond.mValue), cond.mType);
+                        else if (cond.mField->type() == typeid(double))
+                            c = compareFn(fieldObj.as<double>(), std::get<double>(cond.mValue), cond.mType);
+                        else if (cond.mField->type() == typeid(bool))
+                            c = compareFn(fieldObj.as<bool>(), std::get<bool>(cond.mValue), cond.mType);
+                        else if (cond.mField->type() == typeid(int32_t))
+                            c = compareFn(fieldObj.as<int32_t>(), std::get<int32_t>(cond.mValue), cond.mType);
+                        else if (cond.mField->type() == typeid(int64_t))
+                            c = compareFn(fieldObj.as<int64_t>(), std::get<int64_t>(cond.mValue), cond.mType);
+                        else
+                            throw std::runtime_error("Unknown field type");
+                        condStack.push_back(c);
+                        break;
+                    }
+                    case Queries::Operation::NOT:
+                        condStack.back() = !condStack.back();
+                        break;
+                    case Queries::Operation::AND:
+                    {
+                        bool v = condStack.back();
+                        condStack.pop_back();
+                        condStack.back() = condStack.back() && v;
+                        break;
+                    }
+                    case Queries::Operation::OR:
+                    {
+                        bool v = condStack.back();
+                        condStack.pop_back();
+                        condStack.back() = condStack.back() || v;
+                        break;
+                    }
+                }
+            }
+            if (condStack.empty() || condStack.back() != 0)
+                res->push_back(id);
+        }
+        return res;
+    }
+
+}
diff --git a/apps/openmw/mwlua/query.hpp b/apps/openmw/mwlua/query.hpp
new file mode 100644
index 0000000000..6bb3fe09fa
--- /dev/null
+++ b/apps/openmw/mwlua/query.hpp
@@ -0,0 +1,38 @@
+#ifndef MWLUA_QUERY_H
+#define MWLUA_QUERY_H
+
+#include <string>
+
+#include <components/queries/query.hpp>
+
+#include "context.hpp"
+#include "object.hpp"
+
+namespace MWLua
+{
+
+    struct ObjectQueryTypes
+    {
+        static constexpr std::string_view ACTIVATORS = "activators";
+        static constexpr std::string_view ACTORS = "actors";
+        static constexpr std::string_view CONTAINERS = "containers";
+        static constexpr std::string_view DOORS = "doors";
+        static constexpr std::string_view ITEMS = "items";
+
+        static constexpr std::string_view types[] = {ACTIVATORS, ACTORS, CONTAINERS, DOORS, ITEMS};
+    };
+
+    struct QueryFieldGroup
+    {
+        std::string mName;
+        std::vector<const Queries::Field*> mFields;
+    };
+    const std::vector<QueryFieldGroup>& getBasicQueryFieldGroups();
+
+    // TODO: Implement custom fields. QueryFieldGroup registerCustomFields(...);
+
+    ObjectIdList selectObjectsFromList(const Queries::Query& query, const ObjectIdList& list, const Context&);
+
+}
+
+#endif // MWLUA_QUERY_H
diff --git a/apps/openmw/mwlua/worldview.hpp b/apps/openmw/mwlua/worldview.hpp
index 89f5afa0c3..bf2b458792 100644
--- a/apps/openmw/mwlua/worldview.hpp
+++ b/apps/openmw/mwlua/worldview.hpp
@@ -40,6 +40,10 @@ namespace MWLua
         void objectAddedToScene(const MWWorld::Ptr& ptr);
         void objectRemovedFromScene(const MWWorld::Ptr& ptr);
 
+        // Returns list of objects that meets the `query` criteria.
+        // If onlyActive = true, then search only among the objects that are currently in the scene.
+        // TODO: ObjectIdList selectObjects(const Queries::Query& query, bool onlyActive);
+
         void load(ESM::ESMReader& esm);
         void save(ESM::ESMWriter& esm) const;
 

From f5722f9ba0c12096a238bece9a3664e9015b58e9 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sat, 23 Jan 2021 21:08:50 +0100
Subject: [PATCH 0988/2859] Inventory bindings

---
 apps/openmw/mwlua/localscripts.cpp   |   4 +
 apps/openmw/mwlua/luabindings.cpp    |  31 ++++++-
 apps/openmw/mwlua/objectbindings.cpp | 123 ++++++++++++++++++++++++++-
 3 files changed, 154 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwlua/localscripts.cpp b/apps/openmw/mwlua/localscripts.cpp
index 573188c004..5b65c3f984 100644
--- a/apps/openmw/mwlua/localscripts.cpp
+++ b/apps/openmw/mwlua/localscripts.cpp
@@ -32,6 +32,10 @@ namespace MWLua
         selfAPI["object"] = sol::readonly_property([](SelfObject& self) -> LObject { return LObject(self); });
         selfAPI["controls"] = sol::readonly_property([](SelfObject& self) { return &self.mControls; });
         selfAPI["setDirectControl"] = [](SelfObject& self, bool v) { self.mControls.controlledFromLua = v; };
+        selfAPI["setEquipment"] = [](const GObject& obj, const sol::table& equipment)
+        {
+            throw std::logic_error("Not implemented");
+        };
         selfAPI["getCombatTarget"] = [worldView=context.mWorldView](SelfObject& self) -> sol::optional<LObject>
         {
             const MWWorld::Ptr& ptr = self.ptr();
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index 8d9cbb8bee..76a01ee416 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -3,6 +3,8 @@
 #include <components/lua/luastate.hpp>
 #include <components/queries/luabindings.hpp>
 
+#include "../mwworld/inventorystore.hpp"
+
 #include "eventqueue.hpp"
 #include "worldview.hpp"
 
@@ -19,19 +21,41 @@ namespace MWLua
 
     sol::table initCorePackage(const Context& context)
     {
-        sol::table api(context.mLua->sol(), sol::create);
+        auto* lua = context.mLua;
+        sol::table api(lua->sol(), sol::create);
         api["sendGlobalEvent"] = [context](std::string eventName, const sol::object& eventData)
         {
             context.mGlobalEventQueue->push_back({std::move(eventName), LuaUtil::serialize(eventData, context.mSerializer)});
         };
         api["getGameTimeInSeconds"] = [world=context.mWorldView]() { return world->getGameTimeInSeconds(); };
         api["getGameTimeInHours"] = [world=context.mWorldView]() { return world->getGameTimeInHours(); };
-        api["OBJECT_TYPE"] = definitionList(*context.mLua,
+        api["OBJECT_TYPE"] = definitionList(*lua,
         {
             "Activator", "Armor", "Book", "Clothing", "Creature", "Door", "Ingredient",
             "Light", "Miscellaneous", "NPC", "Player", "Potion", "Static", "Weapon"
         });
-        return context.mLua->makeReadOnly(api);
+        api["EQUIPMENT_SLOT"] = lua->makeReadOnly(lua->sol().create_table_with(
+            "Helmet", MWWorld::InventoryStore::Slot_Helmet,
+            "Cuirass", MWWorld::InventoryStore::Slot_Cuirass,
+            "Greaves", MWWorld::InventoryStore::Slot_Greaves,
+            "LeftPauldron", MWWorld::InventoryStore::Slot_LeftPauldron,
+            "RightPauldron", MWWorld::InventoryStore::Slot_RightPauldron,
+            "LeftGauntlet", MWWorld::InventoryStore::Slot_LeftGauntlet,
+            "RightGauntlet", MWWorld::InventoryStore::Slot_RightGauntlet,
+            "Boots", MWWorld::InventoryStore::Slot_Boots,
+            "Shirt", MWWorld::InventoryStore::Slot_Shirt,
+            "Pants", MWWorld::InventoryStore::Slot_Pants,
+            "Skirt", MWWorld::InventoryStore::Slot_Skirt,
+            "Robe", MWWorld::InventoryStore::Slot_Robe,
+            "LeftRing", MWWorld::InventoryStore::Slot_LeftRing,
+            "RightRing", MWWorld::InventoryStore::Slot_RightRing,
+            "Amulet", MWWorld::InventoryStore::Slot_Amulet,
+            "Belt", MWWorld::InventoryStore::Slot_Belt,
+            "CarriedRight", MWWorld::InventoryStore::Slot_CarriedRight,
+            "CarriedLeft", MWWorld::InventoryStore::Slot_CarriedLeft,
+            "Ammunition", MWWorld::InventoryStore::Slot_Ammunition
+        ));
+        return lua->makeReadOnly(api);
     }
 
     sol::table initWorldPackage(const Context& context)
@@ -57,6 +81,7 @@ namespace MWLua
             // TODO: Use sqlite to search objects that are not in the scene
             // return GObjectList{worldView->selectObjects(query, false)};
         };
+        // TODO: add world.placeNewObject(recordId, cell, pos, [rot])
         return context.mLua->makeReadOnly(api);
     }
 
diff --git a/apps/openmw/mwlua/objectbindings.cpp b/apps/openmw/mwlua/objectbindings.cpp
index 8b4f9d52d3..3684521ceb 100644
--- a/apps/openmw/mwlua/objectbindings.cpp
+++ b/apps/openmw/mwlua/objectbindings.cpp
@@ -5,9 +5,21 @@
 
 #include "../mwclass/door.hpp"
 
+#include "../mwworld/containerstore.hpp"
+#include "../mwworld/inventorystore.hpp"
+
 #include "eventqueue.hpp"
 #include "luamanagerimp.hpp"
 
+namespace MWLua
+{
+    template <typename ObjectT>
+    struct Inventory
+    {
+        ObjectT mObj;
+    };
+}
+
 namespace sol
 {
     template <>
@@ -18,6 +30,10 @@ namespace sol
     struct is_automagical<MWLua::LObjectList> : std::false_type {};
     template <>
     struct is_automagical<MWLua::GObjectList> : std::false_type {};
+    template <>
+    struct is_automagical<MWLua::Inventory<MWLua::LObject>> : std::false_type {};
+    template <>
+    struct is_automagical<MWLua::Inventory<MWLua::GObject>> : std::false_type {};
 }
 
 namespace MWLua
@@ -88,6 +104,7 @@ namespace MWLua
             return o.ptr().getRefData().getPosition().asRotationVec3();
         });
         objectT["type"] = sol::readonly_property(&ObjectT::type);
+        objectT["count"] = sol::readonly_property([](const ObjectT& o) { return o.ptr().getRefData().getCount(); });
         objectT[sol::meta_function::equal_to] = [](const ObjectT& a, const ObjectT& b) { return a.id() == b.id(); };
         objectT[sol::meta_function::to_string] = &ObjectT::toString;
         objectT["sendEvent"] = [context](const ObjectT& dest, std::string eventName, const sol::object& eventData)
@@ -101,6 +118,13 @@ namespace MWLua
             {
                 luaManager->addLocalScript(object.ptr(), path);
             };
+
+            objectT["teleport"] = [luaManager=context.mLuaManager](const GObject& object, std::string_view cell,
+                                                                   const osg::Vec3f& pos, const sol::optional<osg::Vec3f>& rot)
+            {
+                // TODO
+                throw std::logic_error("Not implemented");
+            };
         }
     }
 
@@ -127,12 +151,110 @@ namespace MWLua
         });
     }
 
+    template <class ObjectT>
+    static void addInventoryBindings(sol::usertype<ObjectT>& objectT, const std::string& prefix, const Context& context)
+    {
+        using InventoryT = Inventory<ObjectT>;
+        sol::usertype<InventoryT> inventoryT = context.mLua->sol().new_usertype<InventoryT>(prefix + "Inventory");
+
+        objectT["getEquipment"] = [context](const ObjectT& o)
+        {
+            const MWWorld::Ptr& ptr = o.ptr();
+            MWWorld::InventoryStore& store = ptr.getClass().getInventoryStore(ptr);
+            sol::table equipment(context.mLua->sol(), sol::create);
+            for (int slot = 0; slot < MWWorld::InventoryStore::Slots; ++slot)
+            {
+                auto it = store.getSlot(slot);
+                if (it == store.end())
+                    continue;
+                context.mWorldView->getObjectRegistry()->registerPtr(*it);
+                equipment[slot] = ObjectT(getId(*it), context.mWorldView->getObjectRegistry());
+            }
+            return equipment;
+        };
+        objectT["isEquipped"] = [](const ObjectT& actor, const ObjectT& item)
+        {
+            const MWWorld::Ptr& ptr = actor.ptr();
+            MWWorld::InventoryStore& store = ptr.getClass().getInventoryStore(ptr);
+            return store.isEquipped(item.ptr());
+        };
+
+        objectT["inventory"] = sol::readonly_property([](const ObjectT& o) { return InventoryT{o}; });
+        inventoryT[sol::meta_function::to_string] =
+            [](const InventoryT& inv) { return "Inventory[" + inv.mObj.toString() + "]"; };
+
+        auto getWithMask = [context](const InventoryT& inventory, int mask)
+        {
+            const MWWorld::Ptr& ptr = inventory.mObj.ptr();
+            MWWorld::ContainerStore& store = ptr.getClass().getContainerStore(ptr);
+            ObjectIdList list = std::make_shared<std::vector<ObjectId>>();
+            auto it = store.begin(mask);
+            while (it.getType() != -1)
+            {
+                const MWWorld::Ptr& item = *(it++);
+                context.mWorldView->getObjectRegistry()->registerPtr(item);
+                list->push_back(getId(item));
+            }
+            return ObjectList<ObjectT>{list};
+        };
+
+        inventoryT["getAll"] =
+            [getWithMask](const InventoryT& inventory) { return getWithMask(inventory, MWWorld::ContainerStore::Type_All); };
+        inventoryT["getPotions"] =
+            [getWithMask](const InventoryT& inventory) { return getWithMask(inventory, MWWorld::ContainerStore::Type_Potion); };
+        inventoryT["getApparatuses"] =
+            [getWithMask](const InventoryT& inventory) { return getWithMask(inventory, MWWorld::ContainerStore::Type_Apparatus); };
+        inventoryT["getArmor"] =
+            [getWithMask](const InventoryT& inventory) { return getWithMask(inventory, MWWorld::ContainerStore::Type_Armor); };
+        inventoryT["getBooks"] =
+            [getWithMask](const InventoryT& inventory) { return getWithMask(inventory, MWWorld::ContainerStore::Type_Book); };
+        inventoryT["getClothing"] =
+            [getWithMask](const InventoryT& inventory) { return getWithMask(inventory, MWWorld::ContainerStore::Type_Clothing); };
+        inventoryT["getIngredients"] =
+            [getWithMask](const InventoryT& inventory) { return getWithMask(inventory, MWWorld::ContainerStore::Type_Ingredient); };
+        inventoryT["getLights"] =
+            [getWithMask](const InventoryT& inventory) { return getWithMask(inventory, MWWorld::ContainerStore::Type_Light); };
+        inventoryT["getLockpicks"] =
+            [getWithMask](const InventoryT& inventory) { return getWithMask(inventory, MWWorld::ContainerStore::Type_Lockpick); };
+        inventoryT["getMiscellaneous"] =
+            [getWithMask](const InventoryT& inventory) { return getWithMask(inventory, MWWorld::ContainerStore::Type_Miscellaneous); };
+        inventoryT["getProbes"] =
+            [getWithMask](const InventoryT& inventory) { return getWithMask(inventory, MWWorld::ContainerStore::Type_Probe); };
+        inventoryT["getRepairKits"] =
+            [getWithMask](const InventoryT& inventory) { return getWithMask(inventory, MWWorld::ContainerStore::Type_Repair); };
+        inventoryT["getWeapons"] =
+            [getWithMask](const InventoryT& inventory) { return getWithMask(inventory, MWWorld::ContainerStore::Type_Weapon); };
+            
+        inventoryT["countOf"] = [](const InventoryT& inventory, const std::string& recordId)
+        {
+            const MWWorld::Ptr& ptr = inventory.mObj.ptr();
+            MWWorld::ContainerStore& store = ptr.getClass().getContainerStore(ptr);
+            return store.count(recordId);
+        };
+
+        if constexpr (std::is_same_v<ObjectT, GObject>)
+        {  // Only for global scripts
+            // TODO
+            objectT["moveInto"] = [](const GObject& obj, const InventoryT& inventory) {};
+            objectT["setEquipment"] = [](const GObject& obj, const sol::table& equipment) {};
+
+            // obj.inventory:drop(obj2, [count])
+            // obj.inventory:drop(recordId, [count])
+            // obj.inventory:addNew(recordId, [count])
+            // obj.inventory:remove(obj/recordId, [count])
+            inventoryT["drop"] = [](const InventoryT& inventory) {};
+            inventoryT["addNew"] = [](const InventoryT& inventory) {};
+            inventoryT["remove"] = [](const InventoryT& inventory) {};
+        }
+    }
+
     template <class ObjectT>
     static void initObjectBindings(const std::string& prefix, const Context& context)
     {
         sol::usertype<ObjectT> objectT = context.mLua->sol().new_usertype<ObjectT>(prefix + "Object");
         addBasicBindings<ObjectT>(objectT, context);
         addDoorBindings<ObjectT>(objectT, context);
+        addInventoryBindings<ObjectT>(objectT, prefix, context);
 
         registerObjectList<ObjectT>(prefix, context);
     }
@@ -148,4 +270,3 @@ namespace MWLua
     }
 
 }
-

From 9746800eedfd25611049ea8d3719228c14a9eab7 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Tue, 23 Feb 2021 21:45:03 +0100
Subject: [PATCH 0989/2859] Documentation for Lua scripting

---
 docs/source/reference/index.rst               |   3 +-
 docs/source/reference/lua-scripting/api.rst   | 442 ++++++++++++++++++
 docs/source/reference/lua-scripting/index.rst |  14 +
 .../reference/lua-scripting/overview.rst      | 317 +++++++++++++
 docs/source/reference/modding/extended.rst    |  18 +
 5 files changed, 793 insertions(+), 1 deletion(-)
 create mode 100644 docs/source/reference/lua-scripting/api.rst
 create mode 100644 docs/source/reference/lua-scripting/index.rst
 create mode 100644 docs/source/reference/lua-scripting/overview.rst

diff --git a/docs/source/reference/index.rst b/docs/source/reference/index.rst
index cd947745e1..aa6ff1d96f 100644
--- a/docs/source/reference/index.rst
+++ b/docs/source/reference/index.rst
@@ -6,4 +6,5 @@ Reference Material
 	:maxdepth: 2
 
 	modding/index
-	documentationHowTo
\ No newline at end of file
+	lua-scripting/index
+	documentationHowTo
diff --git a/docs/source/reference/lua-scripting/api.rst b/docs/source/reference/lua-scripting/api.rst
new file mode 100644
index 0000000000..a7b153c039
--- /dev/null
+++ b/docs/source/reference/lua-scripting/api.rst
@@ -0,0 +1,442 @@
+#################
+Lua API reference
+#################
+
+.. toctree::
+    :caption: Table of Contents
+    :maxdepth: 2
+
+Engine handlers reference
+=========================
+
+Engine handler is a function defined by a script, that can be called by the engine.
+
++------------------------------------------------------------------------------------------------+
+| **Can be defined by any script**                                                               |
++----------------------------------+-------------------------------------------------------------+
+| onUpdate(dt)                     | | Called every frame if game not paused. `dt` is the time   |
+|                                  | | from the last update in seconds.                          |
++----------------------------------+-------------------------------------------------------------+
+| onSave() -> data                 | Called when the game is saving.                             |
++----------------------------------+-------------------------------------------------------------+
+| onLoad(data)                     | Called on loading with the data previosly returned by onSave|
++----------------------------------+-------------------------------------------------------------+
+| **Only for global scripts**                                                                    |
++----------------------------------+-------------------------------------------------------------+
+| onNewGame()                      | New game is started                                         |
++----------------------------------+-------------------------------------------------------------+
+| onPlayerAdded(player)            |Player added to game world. The argument is a `Game object`_.|
++----------------------------------+-------------------------------------------------------------+
+| onActorActive(actor)             | Actor (NPC or Creature) becomes active.                     |
++----------------------------------+-------------------------------------------------------------+
+| **Only for local scripts attached to a player**                                                |
++----------------------------------+-------------------------------------------------------------+
+| onKeyPress(symbol, modifiers)    | | Key pressed. `Symbol` is an ASCII code, `modifiers` is    |
+|                                  | | a binary OR of flags of special keys (ctrl, shift, alt).  |
++----------------------------------+-------------------------------------------------------------+
+
+.. _Game object:
+
+Game object reference
+=====================
+
+Game object is a universal reference to an object in the game world. Anything that has a reference number.
+
+**Can be used on any object:**
+
++---------------------------------------------+--------------------------------------------------+
+| Function                                    | Description                                      |
++=============================================+==================================================+
+| object:isValid()                            | | Returns true if the object exists and loaded,  |
+|                                             | | and false otherwise. If false, then every      |
+|                                             | | access to the object will raise an error.      |
++---------------------------------------------+--------------------------------------------------+
+| object:sendEvent(eventName, eventData)      | Sends local event to the object.                 |
++---------------------------------------------+--------------------------------------------------+
+| object:isEquipped(item)                     | Returns true if `item` is equipped on `object`.  |
++---------------------------------------------+--------------------------------------------------+
+| object:getEquipment() -> table              | | Returns a table `slot` -> `object` of currently|
+|                                             | | equipped items. See `core.EQUIPMENT_SLOT`.     |
+|                                             | | Returns empty table if `object` doesn't have   |
+|                                             | | equipment slots.                               |
++---------------------------------------------+--------------------------------------------------+
+| object:setEquipment(table)                  | | Sets equipment. Keys in the table are equipment|
+|                                             | | slots (see `core.EQUIPMENT_SLOT`). Each value  |
+|                                             | | can be either an object or `recordId`. Raises  |
+|                                             | | an error if `object` doesn't have equipment    |
+|                                             | | slots and `table` is not empty. Can be called  |
+|                                             | | only on `self` or from a global script.        |
++---------------------------------------------+--------------------------------------------------+
+| object:addScript(scriptPath)                | | Adds new script to the object.                 |
+|                                             | | Can be called only from a global script.       |
++---------------------------------------------+--------------------------------------------------+
+| object:teleport(cell, pos, [rot])           | | Moves object to given cell and position.       |
+|                                             | | The effect is not immediate: the position will |
+|                                             | | be updated only in the next frame.             |
+|                                             | | Can be called only from a global script.       |
++---------------------------------------------+--------------------------------------------------+
+
++-----------------------+---------------------+--------------------------------------------------+
+| Field                 | Type                | Description                                      |
++=======================+=====================+==================================================+
+| object.position       | vector3_            | Position                                         |
++-----------------------+---------------------+--------------------------------------------------+
+| object.rotation       | vector3_            | Rotation                                         |
++-----------------------+---------------------+--------------------------------------------------+
+| object.cell           | string              | Cell                                             |
++-----------------------+---------------------+--------------------------------------------------+
+| object.type           | string              | :ref:`Type <Object type>` of the object          |
++-----------------------+---------------------+--------------------------------------------------+
+| object.count          | integer             | Count (makes sense if holded in a container)     |
++-----------------------+---------------------+--------------------------------------------------+
+| object.recordId       | string              | Record ID                                        |
++-----------------------+---------------------+--------------------------------------------------+
+| object.inventory      | Inventory           | Inventory of an actor or content of a container  |
++-----------------------+---------------------+--------------------------------------------------+
+
+**Can be used if object.type == 'Door':**
+
++-----------------------+---------------------+--------------------------------------------------+
+| Field                 | Type                | Description                                      |
++=======================+=====================+==================================================+
+| object.isTeleport     | boolean             | True if it is a teleport door                    |
++-----------------------+---------------------+--------------------------------------------------+
+| object.destPosition   | vector3_            | Destination (only if a teleport door)            |
++-----------------------+---------------------+--------------------------------------------------+
+| object.destRotation   | vector3_            | Destination rotation (only if a teleport door)   |
++-----------------------+---------------------+--------------------------------------------------+
+| object.destCell       | string              | Destination cell (only if a teleport door)       |
++-----------------------+---------------------+--------------------------------------------------+
+
+Object type
+-----------
+
+Type is represented as a string. Can be one of:
+
+- "Activator"
+- "Armor"
+- "Book"
+- "Clothing"
+- "Container"
+- "Creature"
+- "Door"
+- "Ingredient"
+- "Light"
+- "Miscellaneous"
+- "NPC"
+- "Player"
+- "Potion"
+- "Static"
+- "Weapon"
+
+ObjectList
+----------
+
+List of game objects. Can't be created or modified by a script.
+
+.. code-block:: Lua
+
+    -- Iteration by index
+    for i = 1, #someList do
+        doSomething(someList[i])
+    end
+
+    -- Generic for (equivalent to iteration by index)
+    for i, item in someList:ipairs() do
+        doSomething(item)
+    end
+
+    -- WRONG: for i, item in ipairs(someList) do
+    -- It doesn't work because Lua 5.1 doesn't allow to overload ipairs for userdata.
+
++---------------------------------------------+--------------------------------------------------+
+| Function                                    | Description                                      |
++=============================================+==================================================+
+| list:ipairs()                               | Returns an iterator                              |
++---------------------------------------------+--------------------------------------------------+
+| list:select(query) -> ObjectList            | Returns a filtered list                          |
++---------------------------------------------+--------------------------------------------------+
+
+Object inventory
+----------------
+
++---------------------------------------------+--------------------------------------------------+
+| Function                                    | Description                                      |
++=============================================+==================================================+
+| inv:countOf(recordId) -> int                | The number of items with given recordId          |
++---------------------------------------------+--------------------------------------------------+
+| inv:getAll(recordId) -> ObjectList_         | All contained items                              |
++---------------------------------------------+--------------------------------------------------+
+| inv:getPotions() -> ObjectList_             | All potions from the inventory                   |
++---------------------------------------------+--------------------------------------------------+
+| inv:getApparatuses() -> ObjectList_         | All apparatuses from the inventory               |
++---------------------------------------------+--------------------------------------------------+
+| inv:getArmors() -> ObjectList_              | All armors from the inventory                    |
++---------------------------------------------+--------------------------------------------------+
+| inv:getBooks() -> ObjectList_               | All books from the inventory                     |
++---------------------------------------------+--------------------------------------------------+
+| inv:getClothing() -> ObjectList_            | All clothing from the inventory                  |
++---------------------------------------------+--------------------------------------------------+
+| inv:getIngredients() -> ObjectList_         | All ingredients from the inventory               |
++---------------------------------------------+--------------------------------------------------+
+| inv:getLights() -> ObjectList_              | All lights from the inventory                    |
++---------------------------------------------+--------------------------------------------------+
+| inv:getLockpicks() -> ObjectList_           | All lockpicks from the inventory                 |
++---------------------------------------------+--------------------------------------------------+
+| inv:getMiscellaneous() -> ObjectList_       | All miscellaneous items from the inventory       |
++---------------------------------------------+--------------------------------------------------+
+| inv:getProbes() -> ObjectList_              | All probes from the inventory                    |
++---------------------------------------------+--------------------------------------------------+
+| inv:getRepairKits() -> ObjectList_          | All repair kits from the inventory               |
++---------------------------------------------+--------------------------------------------------+
+| inv:getWeapons() -> ObjectList_             | All weapon from the inventory                    |
++---------------------------------------------+--------------------------------------------------+
+
+openmw.util
+===========
+
++---------------------------------------------+--------------------------------------------------+
+| Function                                    | Description                                      |
++=============================================+==================================================+
+| vector2(x, y) -> vector2_                   | Creates 2D vector                                |
++---------------------------------------------+--------------------------------------------------+
+| vector3(x, y, z) -> vector3_                | Creates 3D vector                                |
++---------------------------------------------+--------------------------------------------------+
+| clamp(value, from, to) -> number            | Limits given value to the interval [from, to]    |
++---------------------------------------------+--------------------------------------------------+
+| normalizeAngle(radians) -> number           | Adds 2pi*k and puts the angle in range [-pi, pi] |
++---------------------------------------------+--------------------------------------------------+
+
+vector2
+-------
+
+Immutable 2D vector.
+
+.. code-block:: Lua
+
+    v = vector2(3, 4)
+    v.x, v.y       -- 3.0, 4.0
+    str(v)         -- "(3.0, 4.0)"
+    v:length()     -- 5.0    length
+    v:length2()    -- 25.0   square of the length
+    v:normalize()  -- vector2(3/5, 4/5)
+    v:rotate(radians)    -- rotate clockwise (returns rotated vector)
+    v1:dot(v2)     -- dot product (returns a number)
+    v1 * v2        -- dot product
+    v1 + v2        -- vector addition
+    v1 - v2        -- vector subtraction
+    v1 * x         -- multiplication by a number
+    v1 / x         -- division by a number
+
+vector3
+-------
+
+.. code-block:: Lua
+
+    v = vector3(3, 4, 5)
+    v.x, v.y, v.z  -- 3.0, 4.0, 5.0
+    str(v)         -- "(3.0, 4.0, 4.5)"
+    v:length()     -- length
+    v:length2()    -- square of the length
+    v:normalize()  -- normalized vector
+    v1:dot(v2)     -- dot product (returns a number)
+    v1 * v2        -- dot product (returns a number)
+    v1:cross(v2)   -- cross product (returns a vector)
+    v1 ^ v2        -- cross product (returns a vector)
+    v1 + v2        -- vector addition
+    v1 - v2        -- vector subtraction
+    v1 * x         -- multiplication by a number
+    v1 / x         -- division by a number
+
+openmw.core
+===========
+
++-----------------------+---------------------+---------------------------------------------------+
+| Field                 | Type                | Description                                       |
++=======================+=====================+===================================================+
+| OBJECT_TYPE           | Readonly table      | Possible :ref:`object type <Object type>` values  |
++-----------------------+---------------------+---------------------------------------------------+
+| EQUIPMENT_SLOTS       | Readonly table      | | Contains keys that can be used in               |
+|                       |                     | | `object:getEquipment` and `object:setEquipment`.|
++-----------------------+---------------------+---------------------------------------------------+
+
+``EQUIPMENT_SLOTS`` contains fields: "Helmet", "Cuirass", "Greaves", "LeftPauldron", "RightPauldron",
+"LeftGauntlet", "RightGauntlet", "Boots", "Shirt", "Pants", "Skirt", "Robe", "LeftRing", "RightRing",
+"Amulet", "Belt", "CarriedRight", "CarriedLeft", "Ammunition".
+
++---------------------------------------------+--------------------------------------------------+
+| Function                                    | Description                                      |
++=============================================+==================================================+
+| sendGlobalEvent(eventName, eventData)       | Sends an event to global scripts                 |
++---------------------------------------------+--------------------------------------------------+
+| getRealTime()                               | | The number of seconds (with floating point)    |
+|                                             | | passed from 00:00 UTC 1 Januar 1970 (unix time)|
++---------------------------------------------+--------------------------------------------------+
+| getGameTimeInSeconds()                      | | The number of seconds in the game world, passed|
+|                                             | | from starting a new game.                      |
++---------------------------------------------+--------------------------------------------------+
+| getGameTimeInHours()                        | | Current time of the game world in hours.       |
+|                                             | | Note that the number of game seconds in a game |
+|                                             | | hour is not guaranteed to be fixed.            |
++---------------------------------------------+--------------------------------------------------+
+
+openmw.async
+============
+
+Timers and coroutine utils.
+All functions require the package itself as a first argument.
+I.e. functions should be called with ``:`` rather than with ``.``.
+
++-----------------------------------------------------+--------------------------------------------------+
+| Function                                            | Description                                      |
++=====================================================+==================================================+
+| async:registerTimerCallback(name, func) -> Callback | Registers a function as a timer callback         |
++-----------------------------------------------------+--------------------------------------------------+
+| async:newTimerInSeconds(delay, Callback, arg)       | | Calls `Callback(arg)` in `delay` seconds.      |
+|                                                     | | `Callback` must be registered in advance.      |
++-----------------------------------------------------+--------------------------------------------------+
+| async:newTimerInHours(delay, Callback, arg)         | | Calls `Callback(arg)` in `delay` game hours.   |
+|                                                     | | `Callback` must be registered in advance.      |
++-----------------------------------------------------+--------------------------------------------------+
+| async:newUnsavableTimerInSeconds(delay, func)       | | Call `func()` in `delay` seconds. The timer    |
+|                                                     | | will be lost if the game is saved and loaded.  |
++-----------------------------------------------------+--------------------------------------------------+
+| async:newUnsavableTimerInHours(delay, func)         | | Call `func()` in `delay` game hours. The timer |
+|                                                     | | will be lost if the game is saved and loaded.  |
++-----------------------------------------------------+--------------------------------------------------+
+
+openmw.query
+============
+
+**TODO**
+
+openmw.world
+============
+
+Interface to the game world. Can be used only by global scripts.
+
++-----------------------+---------------------+--------------------------------------------------+
+| Field                 | Type                | Description                                      |
++=======================+=====================+==================================================+
+| activeActors          | ObjectList_         | List of currently active actors                  |
++-----------------------+---------------------+--------------------------------------------------+
+
++---------------------------------------------+--------------------------------------------------+
+| Function                                    | Description                                      |
++=============================================+==================================================+
+| selectObjects(query) -> ObjectList_         | Evaluates a query                                |
++---------------------------------------------+--------------------------------------------------+
+
+openmw.nearby
+=============
+
+Can be used only by local scripts.
+Read-only access to the nearest area of the game world.
+
++-----------------------+---------------------+--------------------------------------------------+
+| Field                 | Type                | Description                                      |
++=======================+=====================+==================================================+
+| activators            | ObjectList_         | List of nearby activators                        |
++-----------------------+---------------------+--------------------------------------------------+
+| actors                | ObjectList_         | List of nearby actors                            |
++-----------------------+---------------------+--------------------------------------------------+
+| containers            | ObjectList_         | List of nearby containers                        |
++-----------------------+---------------------+--------------------------------------------------+
+| doors                 | ObjectList_         | List of nearby doors                             |
++-----------------------+---------------------+--------------------------------------------------+
+| items                 | ObjectList_         | Everything that can be picked up in the nearby   |
++-----------------------+---------------------+--------------------------------------------------+
+
++---------------------------------------------+--------------------------------------------------+
+| Function                                    | Description                                      |
++=============================================+==================================================+
+| selectObjects(query) -> ObjectList_         | Evaluates a query                                |
++---------------------------------------------+--------------------------------------------------+
+
+openmw.self
+===========
+
+Can be used only by local scripts. Full access to the object the script is attached to.
+All fields and function of `Game object`_ are also available for `openmw.self`. For example:
+
+.. code-block:: Lua
+
+    local self = require('openmw.self')
+    if self.type == 'Player' then
+        self:sendEvent("something", self.position)
+    end
+
+Note that `self` is not a Game Object. If you need an actual object, use `self.object`:
+
+.. code-block:: Lua
+
+    if self == someObject then ...  -- Incorrect, this condition is always false
+    core.sendGlobalEvent('something', self)  -- Incorrect, will raise an error
+
+    if self.object == someObject then ... -- Correct
+    core.sendGlobalEvent('something', self.object)  -- Correct
+
+
++-----------------------+---------------------+--------------------------------------------------+
+| Field                 | Type                | Description                                      |
++=======================+=====================+==================================================+
+| self.object           | `Game object`_      | The object the script is attached to (readonly)  |
++-----------------------+---------------------+--------------------------------------------------+
+| self.controls         | `Actor controls`_   | Movement controls (only for actors)              |
++-----------------------+---------------------+--------------------------------------------------+
+
++---------------------------------------------+--------------------------------------------------+
+| Function                                    | Description                                      |
++=============================================+==================================================+
+| self:setDirectControl(bool)                 | Enables or disables direct movement control      |
++---------------------------------------------+--------------------------------------------------+
+| self:setEquipment(table)                    | | Sets equipment. Keys in the table are equipment|
+|                                             | | slots (see `core.EQUIPMENT_SLOT`). Each value  |
+|                                             | | can be either an object or `recordId`. Raises  |
+|                                             | | an error if the object has no equipment        |
+|                                             | | slots and `table` is not empty.                |
++---------------------------------------------+--------------------------------------------------+
+| self:getCombatTarget() -> `Game object`_    | Returns current target or nil if not in combat   |
++---------------------------------------------+--------------------------------------------------+
+| self:stopCombat()                           | Removes all combat packages from the actor       |
++---------------------------------------------+--------------------------------------------------+
+| self:startCombat(target)                    | Attack `target`                                  |
++---------------------------------------------+--------------------------------------------------+
+
+
+Actor controls
+--------------
+
+Allows to control movements of an actor. Makes an effect only if `setDirectControl(true)` was called.
+All fields are mutable.
+
++-----------------------+---------------------+--------------------------------------------------+
+| Field                 | Type                | Description                                      |
++=======================+=====================+==================================================+
+| movement              | float number        | +1 - move forward, -1 - move backward            |
++-----------------------+---------------------+--------------------------------------------------+
+| sideMovement          | float number        | +1 - move right, -1 - move left                  |
++-----------------------+---------------------+--------------------------------------------------+
+| turn                  | float number        | turn right (radians); if negative - turn left    |
++-----------------------+---------------------+--------------------------------------------------+
+| run                   | boolean             | true - run, false - walk                         |
++-----------------------+---------------------+--------------------------------------------------+
+| jump                  | boolean             | if true - initiate a jump                        |
++-----------------------+---------------------+--------------------------------------------------+
+
+openmw.ui
+=========
+
+Can be used only by local scripts, that are attached to a player.
+
++---------------------------------------------+--------------------------------------------------+
+| Function                                    | Description                                      |
++=============================================+==================================================+
+| showMessage(string)                         | Shows given message at the bottom of the screen. |
++---------------------------------------------+--------------------------------------------------+
+
+openmw.camera
+=============
+
+.. warning::
+    Not implemented yet.
diff --git a/docs/source/reference/lua-scripting/index.rst b/docs/source/reference/lua-scripting/index.rst
new file mode 100644
index 0000000000..b779b8975c
--- /dev/null
+++ b/docs/source/reference/lua-scripting/index.rst
@@ -0,0 +1,14 @@
+####################
+OpenMW Lua scripting
+####################
+
+.. warning::
+    OpenMW Lua scripting is in early stage of development. Also note that OpenMW Lua is not compatible with MWSE.
+
+.. toctree::
+    :caption: Table of Contents
+    :maxdepth: 2
+
+    overview
+    api
+
diff --git a/docs/source/reference/lua-scripting/overview.rst b/docs/source/reference/lua-scripting/overview.rst
new file mode 100644
index 0000000000..119d4b14c4
--- /dev/null
+++ b/docs/source/reference/lua-scripting/overview.rst
@@ -0,0 +1,317 @@
+Overview of Lua scripting
+#########################
+
+Language and sandboxing
+=======================
+
+OpenMW supports scripts written in Lua 5.1.
+There are no plans to switch to any newer version of the language, because newer versions are not supported by LuaJIT.
+
+Here are starting points for learning Lua:
+
+- `Programing in Lua <https://www.lua.org/pil/contents.html>`__ (first edition, aimed at Lua 5.0)
+- `Lua 5.1 Reference Manual <https://www.lua.org/manual/5.1/>`__
+
+Each script works in a separate sandbox and doesn't have any access to operation system.
+Only limited list of allowed standard libraries can be used:
+`coroutine <https://www.lua.org/manual/5.1/manual.html#5.2>`__,
+`math <https://www.lua.org/manual/5.1/manual.html#5.6>`__,
+`string <https://www.lua.org/manual/5.1/manual.html#5.4>`__,
+`table <https://www.lua.org/manual/5.1/manual.html#5.5>`__.
+These libraries are loaded automatically and are always available (except the function `math.randomseed` -- it is called by the engine on startup and not available from scripts).
+
+Allowed `basic functions <https://www.lua.org/manual/5.1/manual.html#5.1>`__:
+``assert``, ``error``, ``ipairs``, ``next``, ``pairs``, ``pcall``, ``print``, ``tonumber``, ``tostring``, ``type``, ``unpack``, ``xpcall``, ``rawequal``, ``rawget``, ``rawset``, ``setmetatable``.
+
+Loading libraries with ``require('library_name')`` is allowed, but limited. It works this way:
+
+1. If `library_name` is one of the standard libraries, then return the library.
+2. If `library_name` is one of the built-in `API packages`_, then return the package.
+3. Otherwise search for a Lua source file with such name in :ref:`data folders <Multiple data folders>`. For example ``require('my_lua_library.something')`` will try to open the file ``my_lua_library/something.lua``.
+
+Loading DLLs and precompiled Lua files is intentionally prohibited for reasons of safety and compatibility between different platforms.
+
+Basic concepts
+==============
+
+Game object
+    Any object that exists in the game world and has a specific location. Player, actors, items, and statics are game objects.
+
+Record
+    Persistent information about an object. Includes starting stats and links to assets, but doesn't have a location. Game objects are instances of records. Some records (e.g. a unique NPC) have a single instance, some (e.g. a specific potion) may correspond to multiple objects.
+
+.. note::
+    Don't be confused with MWSE terminology. In MWSE game objects are "references" and records are "objects".
+
+Cell
+    An area of the game world. A position in the world is a link to a cell and coordinates X, Y, Z in the cell. At a specific moment in time each cell can be active or inactive. Inactive cells don't perform physics updates.
+
+Global scripts
+    Lua scripts that are not attached to any game object and are always active. Global scripts can not be started or stopped during a game session. List of global scripts is defined by `omwscripts` files, that should be :ref:`registered <Lua scripting>` in `openmw.cfg`.
+
+Local scripts
+    Lua scripts that are attached to some game object. A local script is active only if the object it is attached to is in an active cell. There are no limitations to the number of local scripts on one object. Local scripts can be attached to (or detached from) any object at any moment by a global script.
+
+Player scripts
+    It is a specific case of local scripts. *Player script* is a local script that is attached to a player. It can do everything that a normal local script can do, plus some player-specific functionality (e.g. control UI and camera).
+
+Scripting API was developed to be conceptually compatible with `multiplayer <https://github.com/TES3MP/openmw-tes3mp>`__. In multiplayer the server is lightweight and delegates most of the work to clients. Each client processes some part of the game world. Global scripts are server-side and local scripts are client-side. It leads to several rules of Lua scripting API:
+
+1. A local script can see only some area of the game world (cells that are active on a specific client). Any data from inactive cells can't be used, as they are not synchronized and could be already changed on another client.
+2. A local script can modify only the object it is attached to. Other objects can theoretically be processed by another client. To prevent synchronization problems the access to them is read only.
+3. Global scripts can access and modify the whole game world including unloaded areas, but the global scripts API is different from the local scripts API and in some aspects limited, because it is not always possible to have all game assets in memory at the same time.
+4. Though the scripting system doesn't actually work with multiplayer yet, the API assumes that there can be several players. That's why any command related to UI, camera, and everything else that is player-specific can be used only by player scripts.
+
+
+How to run a script
+===================
+
+Let's write a simple example of a `Player script`:
+
+.. code-block:: Lua
+
+    -- Saved to my_lua_mod/example/player.lua
+
+    local ui = require('openmw.ui')
+
+    return {
+        engineHandlers = {
+            onKeyPress = function(code, modifiers)
+                if code == string.byte('x') then
+                    ui.showMessage('You have pressed "X"')
+                end
+            end
+        }
+    }
+
+In order to attach it to the player we also need a global script:
+
+.. code-block:: Lua
+
+    -- Saved to my_lua_mod/example/global.lua
+
+    return {
+        engineHandlers = {
+            onPlayerAdded = function(player) player:addScript('example/player.lua') end
+        }
+    }
+
+And one more file -- to start the global script:
+
+::
+
+    # Saved to my_lua_mod/my_lua_mod.omwscripts
+
+    # It is just a list of global scripts to run. Each file is on a separate line.
+    example/global.lua
+
+Finally :ref:`register <Lua scripting>` it in ``openmw.cfg``:
+
+::
+
+    data=path/to/my_lua_mod
+    lua-scripts=my_lua_mod.omwscripts
+
+Now every time the player presses "X" on a keyboard, a message is shown.
+
+Script structure
+================
+
+Each script is a separate file in game assets.
+`Starting a script` means that the engine runs the file, parses the table it returns, and registers its interface, event handlers, and engine handlers. The handlers are permanent and exist until the script is stopped (if it is a local script, because global scripts can not be stopped).
+
+Here is an example of a basic script structure:
+
+.. code-block:: Lua
+
+    local util = require('openmw.util')
+
+    local function onUpdate(dt)
+        ...
+    end
+
+    local function onSave()
+        ...
+        return data
+    end
+
+    local function onLoad(data)
+        ...
+    end
+
+    local function myEventHandler(eventData)
+        ...
+    end
+
+    local function somePublicFunction(params, ...)
+        ...
+    end
+
+    return {
+        name = 'MyScriptInterface',
+        interface = {
+            somePublicFunction = somePublicFunction,
+        },
+
+        eventHandlers = { MyEvent = myEventHandler },
+
+        engineHandlers = {
+            onUpdate = onUpdate,
+            onSave = onSave,
+            onLoad = onLoad,
+        }
+    }
+
+
+.. note::
+    Every instance of every script works in a separate enviroment, so it is not necessary
+    to make everything local. It's local just because it makes the code a bit faster.
+
+All sections in the returned table are optional.
+If you just want to do something every frame, it is enough to write the following:
+
+.. code-block:: Lua
+
+    return {
+        engineHandlers = {
+            onUpdate = function()
+                print('Hello, World!')
+            end
+        }
+    }
+
+
+Engine handlers
+===============
+
+An engine handler is a function defined by a script, that can be called by the engine. I.e. it is an engine-to-script interaction.
+Not visible for other scripts. If several scripts register an engine handler with the same name,
+the engine calls all of them in the same order as the scripts were started.
+
+Some engine handlers are allowed only for global, or only for local/player scripts. Some are universal.
+See :ref:`Engine handlers reference`.
+
+
+onSave and onLoad
+=================
+
+When game is saved or loaded, the engine calls engine handlers `onSave` or `onLoad` for every script.
+The value that `onSave` returns will be passed to `onLoad` when the game is loaded.
+It is the only way to save internal state of a script. All other script vatiables will be lost after closing the game.
+The saved state must be :ref:`serializable <Serializable data>`.
+
+`onSave` and `onLoad` are special:
+
+- Unlike all other engine handlers it is called even for objects in inactive cells.
+- During saving and loading the environment may be not fully initialized, so these handlers shouldn't use any API calls.
+
+TODO: example, explain how global scripts are loading
+
+Serializable data
+-----------------
+
+`Serializable` value means that OpenMW is able to convert it to a sequence of bytes and then (probably on a different computer and with different OpenMW version) restore it back to the same form.
+
+Serializable value is one of:
+
+- `nil` value
+- a number
+- a string
+- a game object
+- a value of a type, defined by :ref:`openmw.util`
+- a table whith serializable keys and values
+
+Serializable data can not contain:
+
+- Functions
+- Tables with custom metatables
+- Several references to the same table. For example ``{ x = some_table, y = some_table }`` is not allowed.
+- Circular references (i.e. when some table contains itself).
+
+API packages
+============
+
+API packages provide functions that can be called by scripts. I.e. it is a script-to-engine interaction.
+A package can be loaded with ``require('<package name>')``.
+It can not be overloaded even if there is a lua file with the same name.
+The list of available packages is different for global and for local scripts.
+Player scripts are local scripts that are attached to a player.
+
++----------------------+--------------------+---------------------------------------------------------------+
+| Package              | Can be used        | Description                                                   |
++======================+====================+===============================================================+
+|:ref:`openmw.util`    | everywhere         | | Defines utility functions and classes like 3D vectors,      |
+|                      |                    | | that don't depend on the game world.                        |
++----------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.core`    | everywhere         | | Functions that are common for both global and local scripts |
++----------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.async`   | everywhere         | | Timers (implemented) and coroutine utils (not implemented)  |
++----------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.query`   | everywhere         | **TODO: write description**                                   |
++----------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.world`   | by global scripts  | | Read-write access to the game world.                        |
++----------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.self`    | by local scripts   | | Full access to the object the script is attached to.        |
++----------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.nearby`  | by local scripts   | | Read-only access to the nearest area of the game world.     |
++----------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.ui`      | by player scripts  | | Controls user interface                                     |
++----------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.camera`  | by player scripts  | | Controls camera (not implemented)                           |
++----------------------+--------------------+---------------------------------------------------------------+
+
+
+Script interfaces
+=================
+
+.. warning::
+    Not implemented yet.
+
+Each script can provide a named interface for other scripts.
+It is a script-to-script interaction. This mechanism is not used by the engine itself.
+
+A script can use an interface of another script only if either both a global scripts, or both are local scripts on the same object.
+In other cases events should be used.
+
+TODO: example, overloading
+
+
+Event system
+============
+
+It is another way of script-to-script interactions. The differences:
+
+- Any script can send an event to any object or a global event to global scripts.
+- Events are always delivered with a delay.
+- Event handlers can not return any data to a sender.
+- Event handlers have a single argument `eventData` (must be :ref:`serializable <Serializable data>`)
+
+Events are the main way of interactions between local and global scripts.
+It is not recommended to use for interactions between two global scripts, because in this case interfaces are more convenient.
+
+If several scripts register handlers for the same event, it will be called in the reversed order (opposite to engine handlers).
+I.e. handler from the last attached script will be called first.
+Return value 'false' in a handler means "skip all other handlers for this event".
+Any other return value (including nil) means nothing.
+
+TODO: example
+
+
+Timers
+======
+
+**TODO**
+
+
+Queries
+=======
+
+**TODO:** describe the concepts of `openmw.query` and `world.selectObjects`/`nearby.selectObjects`.
+
+
+Using IDE for Lua scripting
+===========================
+
+.. warning::
+    This section is not written yet. Later it will explain how to setup Lua Development Tools (eclipse-based IDE) with code autocompletion and integrated OpenMW API reference.
+
diff --git a/docs/source/reference/modding/extended.rst b/docs/source/reference/modding/extended.rst
index cd739cb1b2..f107617b33 100644
--- a/docs/source/reference/modding/extended.rst
+++ b/docs/source/reference/modding/extended.rst
@@ -327,6 +327,24 @@ Also groundcover detection should be enabled via settings.cfg:
     [Groundcover]
     enabled = true
 
+Lua scripting
+-------------
+
+OpenMW supports Lua scripts. See :ref:`Lua scripting documentation <OpenMW Lua scripting>`.
+It is not compatible with MWSE. A mod with Lua scripts will work only if it was developed specifically for OpenMW.
+
+Mods can contain ``*.omwscripts`` files. They should be registered in the ``openmw.cfg`` via "lua-scripts" entries. The order of the "lua-scripts" entries can be important. If "some_lua_mod" uses API provided by "another_lua_mod", then omwscripts from "another_lua_mod" should be registered first. For example:
+
+::
+
+    data="path/to/another_lua_mod"
+    content=another_lua_mod.omwaddon
+    lua-scripts=another_lua_mod.omwscripts
+
+    data="path/to/some_lua_mod"
+    content=some_lua_mod.omwaddon
+    lua-scripts=some_lua_mod.omwscripts
+
 .. _`Graphic Herbalism`: https://www.nexusmods.com/morrowind/mods/46599
 .. _`OpenMW Containers Animated`: https://www.nexusmods.com/morrowind/mods/46232
 .. _`Glow in the Dahrk`: https://www.nexusmods.com/morrowind/mods/45886

From 8facf2952ab227ae8acafb19af88091d6d629924 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sun, 14 Mar 2021 16:39:26 +0100
Subject: [PATCH 0990/2859] Documentation for lua package 'openmw.query'

---
 .../reference/lua-scripting/overview.rst      | 92 ++++++++++++++++++-
 1 file changed, 90 insertions(+), 2 deletions(-)

diff --git a/docs/source/reference/lua-scripting/overview.rst b/docs/source/reference/lua-scripting/overview.rst
index 119d4b14c4..1603529ab5 100644
--- a/docs/source/reference/lua-scripting/overview.rst
+++ b/docs/source/reference/lua-scripting/overview.rst
@@ -247,7 +247,7 @@ Player scripts are local scripts that are attached to a player.
 +----------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.async`   | everywhere         | | Timers (implemented) and coroutine utils (not implemented)  |
 +----------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.query`   | everywhere         | **TODO: write description**                                   |
+|:ref:`openmw.query`   | everywhere         | | Tools for constructing queries: base queries and fields.    |
 +----------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.world`   | by global scripts  | | Read-write access to the game world.                        |
 +----------------------+--------------------+---------------------------------------------------------------+
@@ -306,7 +306,95 @@ Timers
 Queries
 =======
 
-**TODO:** describe the concepts of `openmw.query` and `world.selectObjects`/`nearby.selectObjects`.
+`openmw.query` contains base queries of each type (e.g. `query.doors`, `query.containers`...), which return all of the objects of given type in no particular order. You can then modify that query to filter the results, sort them, group them, etc. Queries are immutable, so any operations on them return a new copy, leaving the original unchanged.
+
+`openmw.world.selectObjects` and `openmw.nearby.selectObjects` both accept a query and return objects that match it. However, `nearby.selectObjects` is only available in local scripts, and returns only objects from currently active cells, while `world.selectObjects` is only available in global scripts, and returns objects regardless of them being in active cells.
+**TODO:** describe how to filter out inactive objects from world queries
+
+A minimal example of an object query:
+
+.. code-block:: Lua
+
+    local query = require('openmw.query')
+    local nearby = require('openmw.nearby')
+    local ui = require('openmw.ui')
+
+    local doorQuery = query.doors:orderBy(query.DOOR.destPosition.x)
+
+    local function selectDoors(namePattern)
+        local query = doorQuery:where(query.DOOR.destCell:like(namePattern))
+        return nearby.selectObjects(query)
+    end
+
+    local function showGuildDoors()
+        ui.showMessage('Here are all the entrances to guilds!')
+        for _, door in selectDoors("%Guild%"):ipairs() do
+            local pos = door.position
+            local message = string.format("%.0f;%.0f;%.0f", pos.x, pos.y, pos.z)
+            ui.showMessage(message)
+        end
+    end
+
+    return {
+        engineHandlers = {
+            onKeyPress = function(code, modifiers)
+                if code == string.byte('e') then
+                    showGuildDoors()
+                end
+            end
+        }
+    }
+
+.. warning::
+    The example above uses operation `like` that is not implemented yet.
+
+**TODO:** add non-object queries, explain how relations work, and define what a field is
+
+Queries are constructed through the following method calls: (if you've used SQL before, you will find them familiar)
+
+- `:where(filter)` - filters the results to match the combination of conditions passed as the argument
+- `:orderBy(field)` and `:orderByDesc(field)` sort the result by the `field` argument. Sorts in descending order in case of `:orderByDesc`. Multiple calls can be chained, with the first call having priority. (i. e. if the first field is equal, objects are sorted by the second one...)
+- `:groupBy(field)` returns only one result for each value of the `field` argument. The choice of the result is arbitrary. Useful for counting only unique objects, or checking if certain objects exist.
+- `:limit(number)` will only return `number` of results (or fewer)
+- `:offset(number)` skips the first `number` results. Particularly useful in combination with `:limit`
+
+Filters consist of conditions, which are combined with "and" (operator `*`), "or" (operator `+`), "not" (operator `-`) and braces `()`.
+
+To make a condition, take a field from the `openmw.query` package and call any of the following methods:
+
+- `:eq` equal to
+- `:neq` not equal to
+- `:gt` greater than
+- `:gte` greater or equal to
+- `:lt` less than
+- `:lte` less or equal to
+- `:like` matches a pattern. Only applicable to text (strings)
+
+**TODO:** describe the pattern format
+
+All the condition methods are type sensitive, and will throw an error if you pass a value of the wrong type into them.
+
+A few examples of filters:
+
+.. warning::
+    `openmw.query.ACTOR` is not implemented yet
+
+.. code-block:: Lua
+
+    local query = require('openmw.query')
+    local ACTOR = query.ACTOR
+
+    local strong_guys_from_capital = (ACTOR.stats.level:gt(10) + ACTOR.stats.strength:gt(70))
+        * ACTOR.cell.name:eq("Default city")
+
+    -- could also write like this:
+    local strong_guys = ACTOR.stats.level:gt(10) + ACTOR.stats.strength:gt(70)
+    local guys_from_capital = ACTOR.cell.name:eq("Default city")
+    local strong_guys_from_capital_2 = strong_guys * guys_from_capital
+
+    local DOOR = query.DOOR
+
+    local interestingDoors = -DOOR.name:eq("") * DOOR.isTeleport:eq(true) * Door.destCell:neq("")
 
 
 Using IDE for Lua scripting

From 9d09ecf8cacd26b80d87540a3acd7fdf43207480 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 28 Mar 2021 17:44:08 +0200
Subject: [PATCH 0991/2859] Add mwlua/actions

---
 apps/openmw/CMakeLists.txt           |   4 +-
 apps/openmw/mwlua/actions.cpp        | 140 +++++++++++++++++++++++++++
 apps/openmw/mwlua/actions.hpp        |  55 +++++++++++
 apps/openmw/mwlua/localscripts.cpp   |  21 +++-
 apps/openmw/mwlua/luamanagerimp.cpp  |  20 ++++
 apps/openmw/mwlua/luamanagerimp.hpp  |   7 +-
 apps/openmw/mwlua/objectbindings.cpp |  54 +++++++++--
 7 files changed, 288 insertions(+), 13 deletions(-)
 create mode 100644 apps/openmw/mwlua/actions.cpp
 create mode 100644 apps/openmw/mwlua/actions.hpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index de55c36475..0cf609652b 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -56,8 +56,8 @@ add_openmw_dir (mwscript
     )
 
 add_openmw_dir (mwlua
-    luamanagerimp localscripts object worldview userdataserializer eventqueue query
-    luabindings objectbindings asyncbindings camerabindings uibindings
+    luamanagerimp actions object worldview userdataserializer eventqueue query
+    luabindings localscripts objectbindings asyncbindings camerabindings uibindings
     )
 
 add_openmw_dir (mwsound
diff --git a/apps/openmw/mwlua/actions.cpp b/apps/openmw/mwlua/actions.cpp
new file mode 100644
index 0000000000..bc9cdc3aad
--- /dev/null
+++ b/apps/openmw/mwlua/actions.cpp
@@ -0,0 +1,140 @@
+#include "actions.hpp"
+
+#include <components/debug/debuglog.hpp>
+
+#include "../mwworld/class.hpp"
+#include "../mwworld/inventorystore.hpp"
+#include "../mwworld/player.hpp"
+
+namespace MWLua
+{
+
+    void TeleportAction::apply(WorldView& worldView) const
+    {
+        MWBase::World* world = MWBase::Environment::get().getWorld();
+        bool exterior = mCell.empty() || world->getExterior(mCell);
+        MWWorld::CellStore* cell;
+        if (exterior)
+        {
+            int cellX, cellY;
+            world->positionToIndex(mPos.x(), mPos.y(), cellX, cellY);
+            cell = world->getExterior(cellX, cellY);
+        }
+        else
+            cell = world->getInterior(mCell);
+        if (!cell)
+        {
+            Log(Debug::Error) << "LuaManager::applyTeleport -> cell not found: '" << mCell << "'";
+            return;
+        }
+
+        MWWorld::Ptr obj = worldView.getObjectRegistry()->getPtr(mObject, false);
+        const MWWorld::Class& cls = obj.getClass();
+        bool isPlayer = obj == world->getPlayerPtr();
+        if (cls.isActor())
+            cls.getCreatureStats(obj).land(isPlayer);
+        if (isPlayer)
+        {
+            ESM::Position esmPos;
+            static_assert(sizeof(esmPos) == sizeof(osg::Vec3f) * 2);
+            std::memcpy(esmPos.pos, &mPos, sizeof(osg::Vec3f));
+            std::memcpy(esmPos.rot, &mRot, sizeof(osg::Vec3f));
+            world->getPlayer().setTeleported(true);
+            if (exterior)
+                world->changeToExteriorCell(esmPos, true);
+            else
+                world->changeToInteriorCell(mCell, esmPos, true);
+        }
+        else
+        {
+            MWWorld::Ptr newObj = world->moveObject(obj, cell, mPos.x(), mPos.y(), mPos.z());
+            world->rotateObject(newObj, mRot.x(), mRot.y(), mRot.z());
+            worldView.getObjectRegistry()->registerPtr(newObj);
+        }
+    }
+
+    void SetEquipmentAction::apply(WorldView& worldView) const
+    {
+        MWWorld::Ptr actor = worldView.getObjectRegistry()->getPtr(mActor, false);
+        MWWorld::InventoryStore& store = actor.getClass().getInventoryStore(actor);
+        std::array<bool, MWWorld::InventoryStore::Slots> usedSlots;
+        std::fill(usedSlots.begin(), usedSlots.end(), false);
+
+        constexpr int anySlot = -1;
+        auto tryEquipToSlot = [&](int slot, const Item& item) -> bool
+        {
+            auto old_it = slot != anySlot ? store.getSlot(slot) : store.end();
+            MWWorld::Ptr itemPtr;
+            if (std::holds_alternative<ObjectId>(item))
+            {
+                itemPtr = worldView.getObjectRegistry()->getPtr(std::get<ObjectId>(item), false);
+                if (old_it != store.end() && *old_it == itemPtr)
+                    return true;  // already equipped
+                if (itemPtr.isEmpty() || itemPtr.getRefData().getCount() == 0 ||
+                    itemPtr.getContainerStore() != static_cast<const MWWorld::ContainerStore*>(&store))
+                {
+                    Log(Debug::Warning) << "Object" << idToString(std::get<ObjectId>(item)) << " is not in inventory";
+                    return false;
+                }
+            }
+            else
+            {
+                const std::string& recordId = std::get<std::string>(item);
+                if (old_it != store.end() && *old_it->getCellRef().getRefIdPtr() == recordId)
+                    return true;  // already equipped
+                itemPtr = store.search(recordId);
+                if (itemPtr.isEmpty() || itemPtr.getRefData().getCount() == 0)
+                {
+                    Log(Debug::Warning) << "There is no object with recordId='" << recordId << "' in inventory";
+                    return false;
+                }
+            }
+
+            auto [allowedSlots, _] = itemPtr.getClass().getEquipmentSlots(itemPtr);
+            bool requestedSlotIsAllowed = false;
+            for (int allowedSlot : allowedSlots)
+                requestedSlotIsAllowed = requestedSlotIsAllowed || allowedSlot == slot;
+            if (!requestedSlotIsAllowed)
+            {
+                slot = anySlot;
+                for (int allowedSlot : allowedSlots)
+                    if (!usedSlots[allowedSlot])
+                    {
+                        slot = allowedSlot;
+                        break;
+                    }
+                if (slot == anySlot)
+                {
+                    Log(Debug::Warning) << "No suitable slot for " << ptrToString(itemPtr);
+                    return false;
+                }
+            }
+
+            // TODO: Refactor InventoryStore to accept Ptr and get rid of this linear search.
+            MWWorld::ContainerStoreIterator it = std::find(store.begin(), store.end(), itemPtr);
+            if (it == store.end())  // should never happen
+                throw std::logic_error("Item not found in container");
+
+            store.equip(slot, it, actor);
+            return requestedSlotIsAllowed;  // return true if equipped to requested slot and false if slot was changed
+        };
+
+        for (int slot = 0; slot < MWWorld::InventoryStore::Slots; ++slot)
+        {
+            auto old_it = store.getSlot(slot);
+            auto new_it = mEquipment.find(slot);
+            if (new_it == mEquipment.end())
+            {
+                if (old_it != store.end())
+                    store.unequipSlot(slot, actor);
+                continue;
+            }
+            if (tryEquipToSlot(slot, new_it->second))
+                usedSlots[slot] = true;
+        }
+        for (auto [slot, item] : mEquipment)
+            if (slot >= MWWorld::InventoryStore::Slots)
+                tryEquipToSlot(anySlot, item);
+    }
+
+}
diff --git a/apps/openmw/mwlua/actions.hpp b/apps/openmw/mwlua/actions.hpp
new file mode 100644
index 0000000000..900b175320
--- /dev/null
+++ b/apps/openmw/mwlua/actions.hpp
@@ -0,0 +1,55 @@
+#ifndef MWLUA_ACTIONS_H
+#define MWLUA_ACTIONS_H
+
+#include <variant>
+
+#include "object.hpp"
+#include "worldview.hpp"
+
+namespace MWLua
+{
+
+    // Some changes to the game world can not be done from the scripting thread (because it runs in parallel with OSG Cull),
+    // so we need to queue it and apply from the main thread. All such changes should be implemented as classes inherited
+    // from MWLua::Action.
+
+    class Action
+    {
+    public:
+        virtual ~Action() {}
+        virtual void apply(WorldView&) const = 0;
+    };
+
+    class TeleportAction final : public Action
+    {
+    public:
+        TeleportAction(ObjectId object, std::string cell, const osg::Vec3f& pos, const osg::Vec3f& rot)
+            : mObject(object), mCell(std::move(cell)), mPos(pos), mRot(rot) {}
+
+        void apply(WorldView&) const override;
+
+    private:
+        ObjectId mObject;
+        std::string mCell;
+        osg::Vec3f mPos;
+        osg::Vec3f mRot;
+    };
+
+    class SetEquipmentAction final : public Action
+    {
+    public:
+        using Item = std::variant<std::string, ObjectId>;  // recordId or ObjectId
+        using Equipment = std::map<int, Item>;  // slot to item
+
+        SetEquipmentAction(ObjectId actor, Equipment equipment) : mActor(actor), mEquipment(std::move(equipment)) {}
+
+        void apply(WorldView&) const override;
+
+    private:
+        ObjectId mActor;
+        Equipment mEquipment;
+    };
+
+}
+
+#endif // MWLUA_ACTIONS_H
diff --git a/apps/openmw/mwlua/localscripts.cpp b/apps/openmw/mwlua/localscripts.cpp
index 5b65c3f984..473ffd3fef 100644
--- a/apps/openmw/mwlua/localscripts.cpp
+++ b/apps/openmw/mwlua/localscripts.cpp
@@ -5,6 +5,8 @@
 #include "../mwmechanics/aisequence.hpp"
 #include "../mwmechanics/aicombat.hpp"
 
+#include "luamanagerimp.hpp"
+
 namespace sol
 {
     template <>
@@ -32,9 +34,24 @@ namespace MWLua
         selfAPI["object"] = sol::readonly_property([](SelfObject& self) -> LObject { return LObject(self); });
         selfAPI["controls"] = sol::readonly_property([](SelfObject& self) { return &self.mControls; });
         selfAPI["setDirectControl"] = [](SelfObject& self, bool v) { self.mControls.controlledFromLua = v; };
-        selfAPI["setEquipment"] = [](const GObject& obj, const sol::table& equipment)
+        selfAPI["setEquipment"] = [manager=context.mLuaManager](const SelfObject& obj, sol::table equipment)
         {
-            throw std::logic_error("Not implemented");
+            if (!obj.ptr().getClass().hasInventoryStore(obj.ptr()))
+            {
+                if (!equipment.empty())
+                    throw std::runtime_error(ptrToString(obj.ptr()) + " has no equipment slots");
+                return;
+            }
+            SetEquipmentAction::Equipment eqp;
+            for (auto& [key, value] : equipment)
+            {
+                int slot = key.as<int>();
+                if (value.is<LObject>())
+                    eqp[slot] = value.as<LObject>().id();
+                else
+                    eqp[slot] = value.as<std::string>();
+            }
+            manager->addAction(std::make_unique<SetEquipmentAction>(obj.id(), std::move(eqp)));
         };
         selfAPI["getCombatTarget"] = [worldView=context.mWorldView](SelfObject& self) -> sol::optional<LObject>
         {
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 4e7dcf2b24..fa885c88f5 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -98,6 +98,17 @@ namespace MWLua
 
     void LuaManager::update(bool paused, float dt)
     {
+        if (!mPlayer.isEmpty())
+        {
+            MWWorld::Ptr newPlayerPtr = MWBase::Environment::get().getWorld()->getPlayerPtr();
+            if (!(getId(mPlayer) == getId(newPlayerPtr)))
+                throw std::logic_error("Player Refnum was changed unexpectedly");
+            if (!mPlayer.isInCell() || !newPlayerPtr.isInCell() || mPlayer.getCell() != newPlayerPtr.getCell())
+            {
+                mPlayer = newPlayerPtr;
+                mWorldView.getObjectRegistry()->registerPtr(mPlayer);
+            }
+        }
         mWorldView.update();
 
         if (paused)
@@ -162,6 +173,14 @@ namespace MWLua
         for (const std::string& message : mUIMessages)
             windowManager->messageBox(message);
         mUIMessages.clear();
+
+        for (std::unique_ptr<Action>& action : mActionQueue)
+            action->apply(mWorldView);
+        mActionQueue.clear();
+        
+        if (mTeleportPlayerAction)
+            mTeleportPlayerAction->apply(mWorldView);
+        mTeleportPlayerAction.reset();
     }
 
     void LuaManager::clear()
@@ -314,4 +333,5 @@ namespace MWLua
         scripts->load(data, true);
         scripts->setSerializer(mLocalSerializer.get());
     }
+
 }
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index e8babc9695..d9934135ec 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -8,6 +8,7 @@
 
 #include "../mwbase/luamanager.hpp"
 
+#include "actions.hpp"
 #include "object.hpp"
 #include "eventqueue.hpp"
 #include "globalscripts.hpp"
@@ -46,8 +47,10 @@ namespace MWLua
         void clear() override;  // should be called before loading game or starting a new game to reset internal state.
         void setupPlayer(const MWWorld::Ptr& ptr) override;  // Should be called once after each "clear".
 
-        // Used only in luabindings.cpp
+        // Used only in luabindings
         void addLocalScript(const MWWorld::Ptr&, const std::string& scriptPath);
+        void addAction(std::unique_ptr<Action>&& action) { mActionQueue.push_back(std::move(action)); }
+        void addTeleportPlayerAction(std::unique_ptr<TeleportAction>&& action) { mTeleportPlayerAction = std::move(action); }
         void addUIMessage(std::string_view message) { mUIMessages.emplace_back(message); }
 
         // Saving
@@ -90,6 +93,8 @@ namespace MWLua
         std::vector<ObjectId> mActorAddedEvents;
 
         // Queued actions that should be done in main thread. Processed by applyQueuedChanges().
+        std::vector<std::unique_ptr<Action>> mActionQueue;
+        std::unique_ptr<TeleportAction> mTeleportPlayerAction;
         std::vector<std::string> mUIMessages;
     };
 
diff --git a/apps/openmw/mwlua/objectbindings.cpp b/apps/openmw/mwlua/objectbindings.cpp
index 3684521ceb..ca6fbae31f 100644
--- a/apps/openmw/mwlua/objectbindings.cpp
+++ b/apps/openmw/mwlua/objectbindings.cpp
@@ -95,6 +95,11 @@ namespace MWLua
         {
             return o.ptr().getCellRef().getRefId();
         });
+        objectT["cell"] = sol::readonly_property([](const ObjectT& o)
+        {
+            MWBase::World* world = MWBase::Environment::get().getWorld();
+            return world->getCellName(o.ptr().getCell());
+        });
         objectT["position"] = sol::readonly_property([](const ObjectT& o) -> osg::Vec3f
         {
             return o.ptr().getRefData().getPosition().asVec3();
@@ -120,10 +125,15 @@ namespace MWLua
             };
 
             objectT["teleport"] = [luaManager=context.mLuaManager](const GObject& object, std::string_view cell,
-                                                                   const osg::Vec3f& pos, const sol::optional<osg::Vec3f>& rot)
+                                                                   const osg::Vec3f& pos, const sol::optional<osg::Vec3f>& optRot)
             {
-                // TODO
-                throw std::logic_error("Not implemented");
+                MWWorld::Ptr ptr = object.ptr();
+                osg::Vec3f rot = optRot ? *optRot : ptr.getRefData().getPosition().asRotationVec3();
+                auto action = std::make_unique<TeleportAction>(object.id(), std::string(cell), pos, rot);
+                if (ptr == MWBase::Environment::get().getWorld()->getPlayerPtr())
+                    luaManager->addTeleportPlayerAction(std::move(action));
+                else
+                    luaManager->addAction(std::move(action));
             };
         }
     }
@@ -151,6 +161,20 @@ namespace MWLua
         });
     }
 
+    static SetEquipmentAction::Equipment parseEquipmentTable(sol::table equipment)
+    {
+        SetEquipmentAction::Equipment eqp;
+        for (auto& [key, value] : equipment)
+        {
+            int slot = key.as<int>();
+            if (value.is<GObject>())
+                eqp[slot] = value.as<GObject>().id();
+            else
+                eqp[slot] = value.as<std::string>();
+        }
+        return eqp;
+    }
+    
     template <class ObjectT>
     static void addInventoryBindings(sol::usertype<ObjectT>& objectT, const std::string& prefix, const Context& context)
     {
@@ -160,8 +184,11 @@ namespace MWLua
         objectT["getEquipment"] = [context](const ObjectT& o)
         {
             const MWWorld::Ptr& ptr = o.ptr();
-            MWWorld::InventoryStore& store = ptr.getClass().getInventoryStore(ptr);
             sol::table equipment(context.mLua->sol(), sol::create);
+            if (!ptr.getClass().hasInventoryStore(ptr))
+                return equipment;
+
+            MWWorld::InventoryStore& store = ptr.getClass().getInventoryStore(ptr);
             for (int slot = 0; slot < MWWorld::InventoryStore::Slots; ++slot)
             {
                 auto it = store.getSlot(slot);
@@ -175,6 +202,8 @@ namespace MWLua
         objectT["isEquipped"] = [](const ObjectT& actor, const ObjectT& item)
         {
             const MWWorld::Ptr& ptr = actor.ptr();
+            if (!ptr.getClass().hasInventoryStore(ptr))
+                return false;
             MWWorld::InventoryStore& store = ptr.getClass().getInventoryStore(ptr);
             return store.isEquipped(item.ptr());
         };
@@ -234,17 +263,26 @@ namespace MWLua
 
         if constexpr (std::is_same_v<ObjectT, GObject>)
         {  // Only for global scripts
-            // TODO
-            objectT["moveInto"] = [](const GObject& obj, const InventoryT& inventory) {};
-            objectT["setEquipment"] = [](const GObject& obj, const sol::table& equipment) {};
+            objectT["setEquipment"] = [manager=context.mLuaManager](const GObject& obj, sol::table equipment)
+            {
+                if (!obj.ptr().getClass().hasInventoryStore(obj.ptr()))
+                {
+                    if (!equipment.empty())
+                        throw std::runtime_error(ptrToString(obj.ptr()) + " has no equipment slots");
+                    return;
+                }
+                manager->addAction(std::make_unique<SetEquipmentAction>(obj.id(), parseEquipmentTable(equipment)));
+            };
 
+            // TODO
             // obj.inventory:drop(obj2, [count])
             // obj.inventory:drop(recordId, [count])
             // obj.inventory:addNew(recordId, [count])
             // obj.inventory:remove(obj/recordId, [count])
+            /*objectT["moveInto"] = [](const GObject& obj, const InventoryT& inventory) {};
             inventoryT["drop"] = [](const InventoryT& inventory) {};
             inventoryT["addNew"] = [](const InventoryT& inventory) {};
-            inventoryT["remove"] = [](const InventoryT& inventory) {};
+            inventoryT["remove"] = [](const InventoryT& inventory) {};*/
         }
     }
 

From d5cda6185519b8197960120b8bae0df82e57e1d9 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Mon, 12 Apr 2021 03:15:17 +0200
Subject: [PATCH 0992/2859] Console command "reload lua"

---
 apps/openmw/mwbase/luamanager.hpp             |  3 +++
 apps/openmw/mwgui/console.cpp                 |  1 +
 apps/openmw/mwlua/luamanagerimp.cpp           | 26 +++++++++++++++++++
 apps/openmw/mwlua/luamanagerimp.hpp           |  3 +++
 apps/openmw/mwlua/object.hpp                  |  1 +
 apps/openmw/mwscript/docs/vmformat.txt        |  3 ++-
 apps/openmw/mwscript/miscextensions.cpp       | 15 +++++++++--
 components/compiler/extensions0.cpp           |  1 +
 components/compiler/opcodes.hpp               |  1 +
 .../reference/lua-scripting/overview.rst      |  7 +++++
 10 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwbase/luamanager.hpp b/apps/openmw/mwbase/luamanager.hpp
index 5b4594728e..b9109518cc 100644
--- a/apps/openmw/mwbase/luamanager.hpp
+++ b/apps/openmw/mwbase/luamanager.hpp
@@ -59,6 +59,9 @@ namespace MWBase
 
         // Should be called before loading. The map is used to fix refnums if the order of content files was changed.
         virtual void setContentFileMapping(const std::map<int, int>&) = 0;
+
+        // Drops script cache and reloads all scripts. Calls `onSave` and `onLoad` for every script.
+        virtual void reloadAllScripts() = 0;
     };
 
 }
diff --git a/apps/openmw/mwgui/console.cpp b/apps/openmw/mwgui/console.cpp
index b9004fcdbb..3bc2607045 100644
--- a/apps/openmw/mwgui/console.cpp
+++ b/apps/openmw/mwgui/console.cpp
@@ -20,6 +20,7 @@
 #include "../mwbase/scriptmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
+#include "../mwbase/luamanager.hpp"
 
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/class.hpp"
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index fa885c88f5..b961550280 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -334,4 +334,30 @@ namespace MWLua
         scripts->setSerializer(mLocalSerializer.get());
     }
 
+    void LuaManager::reloadAllScripts()
+    {
+        Log(Debug::Info) << "Reload Lua";
+        mLua.dropScriptCache();
+
+        {  // Reload global scripts
+            ESM::LuaScripts data;
+            mGlobalScripts.save(data);
+            mGlobalScripts.removeAllScripts();
+            for (const std::string& path : mGlobalScriptList)
+                if (mGlobalScripts.addNewScript(path))
+                    Log(Debug::Info) << "Global script restarted: " << path;
+            mGlobalScripts.load(data, false);
+        }
+
+        for (const auto& [id, ptr] : mWorldView.getObjectRegistry()->mObjectMapping)
+        {  // Reload local scripts
+            LocalScripts* scripts = ptr.getRefData().getLuaScripts();
+            if (scripts == nullptr)
+                continue;
+            ESM::LuaScripts data;
+            scripts->save(data);
+            scripts->load(data, true);
+        }
+    }
+
 }
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index d9934135ec..275ee61614 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -62,6 +62,9 @@ namespace MWLua
         void loadLocalScripts(const MWWorld::Ptr& ptr, const ESM::LuaScripts& data) override;
         void setContentFileMapping(const std::map<int, int>& mapping) override { mContentFileMapping = mapping; }
 
+        // Drops script cache and reloads all scripts. Calls `onSave` and `onLoad` for every script.
+        void reloadAllScripts() override;
+
     private:
         LocalScripts* createLocalScripts(const MWWorld::Ptr& ptr);
 
diff --git a/apps/openmw/mwlua/object.hpp b/apps/openmw/mwlua/object.hpp
index ac079fb38f..c4f1dc32f1 100644
--- a/apps/openmw/mwlua/object.hpp
+++ b/apps/openmw/mwlua/object.hpp
@@ -47,6 +47,7 @@ namespace MWLua
         friend class Object;
         friend class GObject;
         friend class LObject;
+        friend class LuaManager;
 
         bool mChanged = false;
         int64_t mUpdateCounter = 0;
diff --git a/apps/openmw/mwscript/docs/vmformat.txt b/apps/openmw/mwscript/docs/vmformat.txt
index 7c470fe413..aaba5e5986 100644
--- a/apps/openmw/mwscript/docs/vmformat.txt
+++ b/apps/openmw/mwscript/docs/vmformat.txt
@@ -480,5 +480,6 @@ op 0x200031d: StartScript, explicit
 op 0x200031e: GetDistance
 op 0x200031f: GetDistance, explicit
 op 0x2000320: Help
+op 0x2000321: ReloadLua
 
-opcodes 0x2000321-0x3ffffff unused
+opcodes 0x2000322-0x3ffffff unused
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index ca9bcbe002..0b36d8bb48 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -28,6 +28,7 @@
 #include "../mwbase/scriptmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/world.hpp"
+#include "../mwbase/luamanager.hpp"
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/player.hpp"
@@ -169,8 +170,6 @@ namespace MWScript
                 void execute (Interpreter::Runtime& runtime) override
                 {
                     MWWorld::Ptr ptr = R()(runtime);
-                    if(!ptr.isEmpty() && !ptr.mRef->mData.isEnabled())
-                        ptr.mRef->mData.mPhysicsPostponed = false;
                     MWBase::Environment::get().getWorld()->enable (ptr);
                 }
         };
@@ -1599,6 +1598,17 @@ namespace MWScript
                 }
         };
 
+        class OpReloadLua : public Interpreter::Opcode0
+        {
+            public:
+
+                void execute (Interpreter::Runtime& runtime) override
+                {
+                    MWBase::Environment::get().getLuaManager()->reloadAllScripts();
+                    runtime.getContext().report("All Lua scripts are reloaded");
+                }
+        };
+
         void installOpcodes (Interpreter::Interpreter& interpreter)
         {
             interpreter.installSegment5 (Compiler::Misc::opcodeMenuMode, new OpMenuMode);
@@ -1719,6 +1729,7 @@ namespace MWScript
             interpreter.installSegment5 (Compiler::Misc::opcodeRepairedOnMeExplicit, new OpRepairedOnMe<ExplicitRef>);
             interpreter.installSegment5 (Compiler::Misc::opcodeToggleRecastMesh, new OpToggleRecastMesh);
             interpreter.installSegment5 (Compiler::Misc::opcodeHelp, new OpHelp);
+            interpreter.installSegment5 (Compiler::Misc::opcodeReloadLua, new OpReloadLua);
         }
     }
 }
diff --git a/components/compiler/extensions0.cpp b/components/compiler/extensions0.cpp
index 6de35d7137..3dfcadab10 100644
--- a/components/compiler/extensions0.cpp
+++ b/components/compiler/extensions0.cpp
@@ -338,6 +338,7 @@ namespace Compiler
             extensions.registerFunction ("repairedonme", 'l', "S", opcodeRepairedOnMe, opcodeRepairedOnMeExplicit);
             extensions.registerInstruction ("togglerecastmesh", "", opcodeToggleRecastMesh);
             extensions.registerInstruction ("help", "", opcodeHelp);
+            extensions.registerInstruction ("reloadlua", "", opcodeReloadLua);
         }
     }
 
diff --git a/components/compiler/opcodes.hpp b/components/compiler/opcodes.hpp
index 46ee31133c..49adfbe209 100644
--- a/components/compiler/opcodes.hpp
+++ b/components/compiler/opcodes.hpp
@@ -319,6 +319,7 @@ namespace Compiler
         const int opcodeGetDisabledExplicit = 0x200031c;
         const int opcodeStartScriptExplicit = 0x200031d;
         const int opcodeHelp = 0x2000320;
+        const int opcodeReloadLua = 0x2000321;
     }
 
     namespace Sky
diff --git a/docs/source/reference/lua-scripting/overview.rst b/docs/source/reference/lua-scripting/overview.rst
index 1603529ab5..f941c190a8 100644
--- a/docs/source/reference/lua-scripting/overview.rst
+++ b/docs/source/reference/lua-scripting/overview.rst
@@ -114,6 +114,13 @@ Finally :ref:`register <Lua scripting>` it in ``openmw.cfg``:
 
 Now every time the player presses "X" on a keyboard, a message is shown.
 
+Hot reloading
+=============
+
+It is possible to modify a script without restarting OpenMW. To apply changes open in-game console and run the command ``reloadlua``.
+It will restart all Lua scripts using `onSave and onLoad`_ handlers the same way as if the game was saved and loaded.
+It works only with existing ``*.lua`` files that are not packed to any archives. Adding new scripts or modifying ``*.omwscripts`` files always requires restarting the game.
+
 Script structure
 ================
 

From de349962d13f7b283e0480e518fa1810b40720da Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Wed, 14 Apr 2021 00:00:51 +0200
Subject: [PATCH 0993/2859] Engine handlers onActive/onInactive and a function
 self:isActive()

---
 apps/openmw/mwlua/localscripts.cpp  | 13 +++++++++++++
 apps/openmw/mwlua/localscripts.hpp  |  9 ++++++++-
 apps/openmw/mwlua/luamanagerimp.cpp | 19 ++++++++++++++++++-
 apps/openmw/mwlua/luamanagerimp.hpp |  2 ++
 4 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwlua/localscripts.cpp b/apps/openmw/mwlua/localscripts.cpp
index 473ffd3fef..4b556faa4d 100644
--- a/apps/openmw/mwlua/localscripts.cpp
+++ b/apps/openmw/mwlua/localscripts.cpp
@@ -33,6 +33,7 @@ namespace MWLua
         selfAPI[sol::meta_function::to_string] = [](SelfObject& self) { return "openmw.self[" + self.toString() + "]"; };
         selfAPI["object"] = sol::readonly_property([](SelfObject& self) -> LObject { return LObject(self); });
         selfAPI["controls"] = sol::readonly_property([](SelfObject& self) { return &self.mControls; });
+        selfAPI["isActive"] = [](SelfObject& self) { return &self.mIsActive; };
         selfAPI["setDirectControl"] = [](SelfObject& self, bool v) { self.mControls.controlledFromLua = v; };
         selfAPI["setEquipment"] = [manager=context.mLuaManager](const SelfObject& obj, sol::table equipment)
         {
@@ -87,6 +88,18 @@ namespace MWLua
     {
         mData.mControls.controlledFromLua = false;
         this->addPackage("openmw.self", sol::make_object(lua->sol(), &mData));
+        registerEngineHandlers({&mOnActiveHandlers, &mOnInactiveHandlers});
+    }
+
+    void LocalScripts::becomeActive()
+    {
+        mData.mIsActive = true;
+        callEngineHandlers(mOnActiveHandlers);
+    }
+    void LocalScripts::becomeInactive()
+    {
+        mData.mIsActive = false;
+        callEngineHandlers(mOnInactiveHandlers);
     }
 
 }
diff --git a/apps/openmw/mwlua/localscripts.hpp b/apps/openmw/mwlua/localscripts.hpp
index c8d85aad58..a738dfede5 100644
--- a/apps/openmw/mwlua/localscripts.hpp
+++ b/apps/openmw/mwlua/localscripts.hpp
@@ -26,12 +26,19 @@ namespace MWLua
 
         struct SelfObject : public LObject
         {
-            SelfObject(const LObject& obj) : LObject(obj) {}
+            SelfObject(const LObject& obj) : LObject(obj), mIsActive(false) {}
             MWBase::LuaManager::ActorControls mControls;
+            bool mIsActive;
         };
+
+        void becomeActive();
+        void becomeInactive();
     protected:
         LocalScripts(LuaUtil::LuaState* lua, const LObject& obj);
         SelfObject mData;
+    private:
+        EngineHandlerList mOnActiveHandlers{"onActive"};
+        EngineHandlerList mOnInactiveHandlers{"onInactive"};
     };
 
 }
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index b961550280..09b3eb6e13 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -44,7 +44,9 @@ namespace MWLua
         localContext.mSerializer = mLocalSerializer.get();
 
         initObjectBindingsForGlobalScripts(context);
+        initCellBindingsForGlobalScripts(context);
         initObjectBindingsForLocalScripts(localContext);
+        initCellBindingsForLocalScripts(localContext);
         LocalScripts::initializeSelfPackage(localContext);
 
         mLua.addCommonPackage("openmw.async", getAsyncPackageInitializer(context));
@@ -158,6 +160,13 @@ namespace MWLua
         }
         mKeyPressEvents.clear();
 
+        for (LocalScripts* localScripts : mObjectInactiveEvents)
+            localScripts->becomeInactive();
+        for (LocalScripts* localScripts : mObjectActiveEvents)
+            localScripts->becomeActive();
+        mObjectActiveEvents.clear();
+        mObjectInactiveEvents.clear();
+
         for (ObjectId id : mActorAddedEvents)
             mGlobalScripts.actorActive(GObject(id, mWorldView.getObjectRegistry()));
         mActorAddedEvents.clear();
@@ -190,6 +199,8 @@ namespace MWLua
         mGlobalEvents.clear();
         mKeyPressEvents.clear();
         mActorAddedEvents.clear();
+        mObjectActiveEvents.clear();
+        mObjectInactiveEvents.clear();
         mPlayerChanged = false;
         mPlayerScripts = nullptr;
         mWorldView.clear();
@@ -207,7 +218,10 @@ namespace MWLua
 
         LocalScripts* localScripts = ptr.getRefData().getLuaScripts();
         if (localScripts)
+        {
             mActiveLocalScripts.insert(localScripts);
+            mObjectActiveEvents.push_back(localScripts);
+        }
 
         if (ptr.getClass().isActor() && ptr != mPlayer)
             mActorAddedEvents.push_back(getId(ptr));
@@ -233,7 +247,10 @@ namespace MWLua
         mWorldView.objectRemovedFromScene(ptr);
         LocalScripts* localScripts = ptr.getRefData().getLuaScripts();
         if (localScripts)
+        {
             mActiveLocalScripts.erase(localScripts);
+            mObjectInactiveEvents.push_back(localScripts);
+        }
 
         // TODO: call mWorldView.objectUnloaded if object is unloaded from memory (does it ever happen?) and ptr becomes invalid.
     }
@@ -242,7 +259,7 @@ namespace MWLua
     {
         mKeyPressEvents.push_back(arg.keysym);
     }
-    
+
     const MWBase::LuaManager::ActorControls* LuaManager::getActorControls(const MWWorld::Ptr& ptr) const
     {
         LocalScripts* localScripts = ptr.getRefData().getLuaScripts();
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index 275ee61614..53f2955675 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -94,6 +94,8 @@ namespace MWLua
 
         std::vector<SDL_Keysym> mKeyPressEvents;
         std::vector<ObjectId> mActorAddedEvents;
+        std::vector<LocalScripts*> mObjectActiveEvents;
+        std::vector<LocalScripts*> mObjectInactiveEvents;
 
         // Queued actions that should be done in main thread. Processed by applyQueuedChanges().
         std::vector<std::unique_ptr<Action>> mActionQueue;

From c463f523907fad671f97238daa09ea0451d6bb0b Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sat, 17 Apr 2021 11:50:20 +0200
Subject: [PATCH 0994/2859] Add Cell Lua bindings

---
 apps/openmw/CMakeLists.txt           |   2 +-
 apps/openmw/mwlua/actions.cpp        |  16 +--
 apps/openmw/mwlua/cellbindings.cpp   |  62 +++++++++
 apps/openmw/mwlua/luabindings.cpp    |  16 +++
 apps/openmw/mwlua/luabindings.hpp    |  17 +++
 apps/openmw/mwlua/object.cpp         |  11 +-
 apps/openmw/mwlua/object.hpp         |   1 +
 apps/openmw/mwlua/objectbindings.cpp |  40 +++++-
 apps/openmw/mwlua/query.cpp          | 198 ++++++++++++++++-----------
 apps/openmw/mwlua/query.hpp          |   1 +
 apps/openmw/mwlua/worldview.cpp      |  36 +++++
 apps/openmw/mwlua/worldview.hpp      |   4 +
 12 files changed, 304 insertions(+), 100 deletions(-)
 create mode 100644 apps/openmw/mwlua/cellbindings.cpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 0cf609652b..3c29baf3aa 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -57,7 +57,7 @@ add_openmw_dir (mwscript
 
 add_openmw_dir (mwlua
     luamanagerimp actions object worldview userdataserializer eventqueue query
-    luabindings localscripts objectbindings asyncbindings camerabindings uibindings
+    luabindings localscripts objectbindings cellbindings asyncbindings camerabindings uibindings
     )
 
 add_openmw_dir (mwsound
diff --git a/apps/openmw/mwlua/actions.cpp b/apps/openmw/mwlua/actions.cpp
index bc9cdc3aad..00707b3d31 100644
--- a/apps/openmw/mwlua/actions.cpp
+++ b/apps/openmw/mwlua/actions.cpp
@@ -2,6 +2,7 @@
 
 #include <components/debug/debuglog.hpp>
 
+#include "../mwworld/cellstore.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/player.hpp"
@@ -11,23 +12,14 @@ namespace MWLua
 
     void TeleportAction::apply(WorldView& worldView) const
     {
-        MWBase::World* world = MWBase::Environment::get().getWorld();
-        bool exterior = mCell.empty() || world->getExterior(mCell);
-        MWWorld::CellStore* cell;
-        if (exterior)
-        {
-            int cellX, cellY;
-            world->positionToIndex(mPos.x(), mPos.y(), cellX, cellY);
-            cell = world->getExterior(cellX, cellY);
-        }
-        else
-            cell = world->getInterior(mCell);
+        MWWorld::CellStore* cell = worldView.findCell(mCell, mPos);
         if (!cell)
         {
             Log(Debug::Error) << "LuaManager::applyTeleport -> cell not found: '" << mCell << "'";
             return;
         }
 
+        MWBase::World* world = MWBase::Environment::get().getWorld();
         MWWorld::Ptr obj = worldView.getObjectRegistry()->getPtr(mObject, false);
         const MWWorld::Class& cls = obj.getClass();
         bool isPlayer = obj == world->getPlayerPtr();
@@ -40,7 +32,7 @@ namespace MWLua
             std::memcpy(esmPos.pos, &mPos, sizeof(osg::Vec3f));
             std::memcpy(esmPos.rot, &mRot, sizeof(osg::Vec3f));
             world->getPlayer().setTeleported(true);
-            if (exterior)
+            if (cell->isExterior())
                 world->changeToExteriorCell(esmPos, true);
             else
                 world->changeToInteriorCell(mCell, esmPos, true);
diff --git a/apps/openmw/mwlua/cellbindings.cpp b/apps/openmw/mwlua/cellbindings.cpp
new file mode 100644
index 0000000000..a23fb47c32
--- /dev/null
+++ b/apps/openmw/mwlua/cellbindings.cpp
@@ -0,0 +1,62 @@
+#include "luabindings.hpp"
+
+#include <components/esm/loadcell.hpp>
+
+#include "../mwworld/cellstore.hpp"
+
+namespace MWLua
+{
+
+    template <class CellT, class ObjectT>
+    static void initCellBindings(const std::string& prefix, const Context& context)
+    {
+        sol::usertype<CellT> cellT = context.mLua->sol().new_usertype<CellT>(prefix + "Cell");
+
+        cellT[sol::meta_function::equal_to] = [](const CellT& a, const CellT& b) { return a.mStore == b.mStore; };
+        cellT[sol::meta_function::to_string] = [](const CellT& c)
+        {
+            const ESM::Cell* cell = c.mStore->getCell();
+            std::stringstream res;
+            if (cell->isExterior())
+                res << "exterior(" << cell->getGridX() << ", " << cell->getGridY() << ")";
+            else
+                res << "interior(" << cell->mName << ")";
+            return res.str();
+        };
+
+        cellT["name"] = sol::readonly_property([](const CellT& c) { return c.mStore->getCell()->mName; });
+        cellT["region"] = sol::readonly_property([](const CellT& c) { return c.mStore->getCell()->mRegion; });
+        cellT["gridX"] = sol::readonly_property([](const CellT& c) { return c.mStore->getCell()->getGridX(); });
+        cellT["gridY"] = sol::readonly_property([](const CellT& c) { return c.mStore->getCell()->getGridY(); });
+        cellT["isExterior"] = sol::readonly_property([](const CellT& c) { return c.mStore->isExterior(); });
+        cellT["hasWater"] = sol::readonly_property([](const CellT& c) { return c.mStore->getCell()->hasWater(); });
+
+        cellT["isInSameSpace"] = [](const CellT& c, const ObjectT& obj)
+        {
+            const MWWorld::Ptr& ptr = obj.ptr();
+            if (!ptr.isInCell())
+                return false;
+            MWWorld::CellStore* cell = ptr.getCell();
+            return cell == c.mStore || (cell->isExterior() && c.mStore->isExterior());
+        };
+        
+        if constexpr (std::is_same_v<CellT, GCell>)
+        {  // only for global scripts
+            cellT["selectObjects"] = [context](const CellT& cell, const Queries::Query& query)
+            {
+                return GObjectList{selectObjectsFromCellStore(query, cell.mStore, context)};
+            };
+        }
+    }
+
+    void initCellBindingsForLocalScripts(const Context& context)
+    {
+        initCellBindings<LCell, LObject>("L", context);
+    }
+
+    void initCellBindingsForGlobalScripts(const Context& context)
+    {
+        initCellBindings<GCell, GObject>("G", context);
+    }
+
+}
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index 76a01ee416..bc50062546 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -62,6 +62,22 @@ namespace MWLua
     {
         sol::table api(context.mLua->sol(), sol::create);
         WorldView* worldView = context.mWorldView;
+        api["getCellByName"] = [worldView=context.mWorldView](const std::string& name) -> sol::optional<GCell>
+        {
+            MWWorld::CellStore* cell = worldView->findNamedCell(name);
+            if (cell)
+                return GCell{cell};
+            else
+                return {};
+        };
+        api["getExteriorCell"] = [worldView=context.mWorldView](int x, int y) -> sol::optional<GCell>
+        {
+            MWWorld::CellStore* cell = worldView->findExteriorCell(x, y);
+            if (cell)
+                return GCell{cell};
+            else
+                return {};
+        };
         api["activeActors"] = GObjectList{worldView->getActorsInScene()};
         api["selectObjects"] = [context](const Queries::Query& query)
         {
diff --git a/apps/openmw/mwlua/luabindings.hpp b/apps/openmw/mwlua/luabindings.hpp
index cb38e63fb7..ab83ce995f 100644
--- a/apps/openmw/mwlua/luabindings.hpp
+++ b/apps/openmw/mwlua/luabindings.hpp
@@ -11,6 +11,11 @@
 #include "query.hpp"
 #include "worldview.hpp"
 
+namespace MWWorld
+{
+    class CellStore;
+}
+
 namespace MWLua
 {
 
@@ -25,6 +30,18 @@ namespace MWLua
     void initObjectBindingsForLocalScripts(const Context&);
     void initObjectBindingsForGlobalScripts(const Context&);
 
+    // Implemented in cellbindings.cpp
+    struct LCell  // for local scripts
+    {
+        MWWorld::CellStore* mStore;
+    };
+    struct GCell  // for global scripts
+    {
+        MWWorld::CellStore* mStore;
+    };
+    void initCellBindingsForLocalScripts(const Context&);
+    void initCellBindingsForGlobalScripts(const Context&);
+
     // Implemented in asyncbindings.cpp
     struct AsyncPackageId
     {
diff --git a/apps/openmw/mwlua/object.cpp b/apps/openmw/mwlua/object.cpp
index 2eb8d16f3c..e3f5323736 100644
--- a/apps/openmw/mwlua/object.cpp
+++ b/apps/openmw/mwlua/object.cpp
@@ -49,12 +49,19 @@ namespace MWLua
             return fallback;
     }
 
+    bool isMarker(const MWWorld::Ptr& ptr)
+    {
+        std::string_view id = *ptr.getCellRef().getRefIdPtr();
+        return id == "prisonmarker" || id == "divinemarker" || id == "templemarker" || id == "northmarker";
+    }
+
     std::string_view getMWClassName(const MWWorld::Ptr& ptr)
     {
         if (*ptr.getCellRef().getRefIdPtr() == "player")
             return "Player";
-        else
-            return getMWClassName(typeid(ptr.getClass()), ptr.getTypeName());
+        if (isMarker(ptr))
+            return "Marker";
+        return getMWClassName(typeid(ptr.getClass()), ptr.getTypeName());
     }
 
     std::string ptrToString(const MWWorld::Ptr& ptr)
diff --git a/apps/openmw/mwlua/object.hpp b/apps/openmw/mwlua/object.hpp
index c4f1dc32f1..b45c8e247c 100644
--- a/apps/openmw/mwlua/object.hpp
+++ b/apps/openmw/mwlua/object.hpp
@@ -18,6 +18,7 @@ namespace MWLua
     inline const ObjectId& getId(const MWWorld::Ptr& ptr) { return ptr.getCellRef().getRefNum(); }
     std::string idToString(const ObjectId& id);
     std::string ptrToString(const MWWorld::Ptr& ptr);
+    bool isMarker(const MWWorld::Ptr& ptr);
     std::string_view getMWClassName(const std::type_index& cls_type, std::string_view fallback = "Unknown");
     std::string_view getMWClassName(const MWWorld::Ptr& ptr);
 
diff --git a/apps/openmw/mwlua/objectbindings.cpp b/apps/openmw/mwlua/objectbindings.cpp
index ca6fbae31f..64ac84e4f0 100644
--- a/apps/openmw/mwlua/objectbindings.cpp
+++ b/apps/openmw/mwlua/objectbindings.cpp
@@ -39,6 +39,9 @@ namespace sol
 namespace MWLua
 {
 
+    template <typename ObjT>
+    using Cell = std::conditional_t<std::is_same_v<ObjT, LObject>, LCell, GCell>;
+
     template <class Class>
     static const MWWorld::Ptr& requireClass(const MWWorld::Ptr& ptr)
     {
@@ -95,10 +98,13 @@ namespace MWLua
         {
             return o.ptr().getCellRef().getRefId();
         });
-        objectT["cell"] = sol::readonly_property([](const ObjectT& o)
+        objectT["cell"] = sol::readonly_property([](const ObjectT& o) -> sol::optional<Cell<ObjectT>>
         {
-            MWBase::World* world = MWBase::Environment::get().getWorld();
-            return world->getCellName(o.ptr().getCell());
+            const MWWorld::Ptr& ptr = o.ptr();
+            if (ptr.isInCell())
+                return Cell<ObjectT>{ptr.getCell()};
+            else
+                return {};
         });
         objectT["position"] = sol::readonly_property([](const ObjectT& o) -> osg::Vec3f
         {
@@ -117,6 +123,22 @@ namespace MWLua
             context.mLocalEventQueue->push_back({dest.id(), std::move(eventName), LuaUtil::serialize(eventData, context.mSerializer)});
         };
 
+        objectT["canMove"] = [context](const ObjectT& o)
+        {
+            const MWWorld::Class& cls = o.ptr().getClass();
+            return cls.getMaxSpeed(o.ptr()) > 0;
+        };
+        objectT["getRunSpeed"] = [context](const ObjectT& o)
+        {
+            const MWWorld::Class& cls = o.ptr().getClass();
+            return cls.getRunSpeed(o.ptr());
+        };
+        objectT["getWalkSpeed"] = [context](const ObjectT& o)
+        {
+            const MWWorld::Class& cls = o.ptr().getClass();
+            return cls.getWalkSpeed(o.ptr());
+        };
+
         if constexpr (std::is_same_v<ObjectT, GObject>)
         {  // Only for global scripts
             objectT["addScript"] = [luaManager=context.mLuaManager](const GObject& object, const std::string& path)
@@ -155,9 +177,17 @@ namespace MWLua
         {
             return ptr(o).getCellRef().getDoorDest().asRotationVec3();
         });
-        objectT["destCell"] = sol::readonly_property([ptr](const ObjectT& o) -> std::string_view
+        objectT["destCell"] = sol::readonly_property(
+            [ptr, worldView=context.mWorldView](const ObjectT& o) -> sol::optional<Cell<ObjectT>>
         {
-            return ptr(o).getCellRef().getDestCell();
+            const MWWorld::CellRef& cellRef = ptr(o).getCellRef();
+            if (!cellRef.getTeleport())
+                return {};
+            MWWorld::CellStore* cell = worldView->findCell(cellRef.getDestCell(), cellRef.getDoorDest().asVec3());
+            if (cell)
+                return Cell<ObjectT>{cell};
+            else
+                return {};
         });
     }
 
diff --git a/apps/openmw/mwlua/query.cpp b/apps/openmw/mwlua/query.cpp
index f51b99d8d5..f42c7ae2d4 100644
--- a/apps/openmw/mwlua/query.cpp
+++ b/apps/openmw/mwlua/query.cpp
@@ -5,6 +5,7 @@
 #include <components/lua/luastate.hpp>
 
 #include "../mwclass/container.hpp"
+#include "../mwworld/cellstore.hpp"
 
 #include "worldview.hpp"
 
@@ -24,11 +25,16 @@ namespace MWLua
         static std::array objectFields = {
             Queries::Field({"type"}, typeid(std::string)),
             Queries::Field({"recordId"}, typeid(std::string)),
+            Queries::Field({"cell", "name"}, typeid(std::string)),
+            Queries::Field({"cell", "region"}, typeid(std::string)),
+            Queries::Field({"cell", "isExterior"}, typeid(bool)),
             Queries::Field({"count"}, typeid(int32_t)),
         };
         static std::array doorFields = {
             Queries::Field({"isTeleport"}, typeid(bool)),
-            Queries::Field({"destCell"}, typeid(std::string)),
+            Queries::Field({"destCell", "name"}, typeid(std::string)),
+            Queries::Field({"destCell", "region"}, typeid(std::string)),
+            Queries::Field({"destCell", "isExterior"}, typeid(bool)),
         };
         return std::vector<QueryFieldGroup>{
             createGroup("OBJECT", objectFields),
@@ -42,13 +48,8 @@ namespace MWLua
         return fieldGroups;
     }
 
-    ObjectIdList selectObjectsFromList(const Queries::Query& query, const ObjectIdList& list, const Context& context)
+    bool checkQueryConditions(const Queries::Query& query, const ObjectId& id, const Context& context)
     {
-        if (!query.mOrderBy.empty() || !query.mGroupBy.empty() || query.mOffset > 0)
-            throw std::runtime_error("OrderBy, GroupBy, and Offset are not supported");
-
-        ObjectIdList res = std::make_shared<std::vector<ObjectId>>();
-        std::vector<char> condStack;
         auto compareFn = [](auto&& a, auto&& b, Queries::Condition::Type t)
         {
             switch (t)
@@ -63,88 +64,125 @@ namespace MWLua
                     throw std::runtime_error("Unsupported condition type");
             }
         };
-        for (const ObjectId& id : *list)
+        sol::object obj;
+        MWWorld::Ptr ptr;
+        if (context.mIsGlobal)
         {
-            if (static_cast<int64_t>(res->size()) == query.mLimit)
-                break;
-            sol::object obj;
-            MWWorld::Ptr ptr;
-            if (context.mIsGlobal)
-            {
-                GObject g(id, context.mWorldView->getObjectRegistry());
-                if (!g.isValid()) continue;
-                ptr = g.ptr();
-                obj = sol::make_object(context.mLua->sol(), g);
-            }
-            else
-            {
-                LObject l(id, context.mWorldView->getObjectRegistry());
-                if (!l.isValid()) continue;
-                ptr = l.ptr();
-                obj = sol::make_object(context.mLua->sol(), l);
-            }
-            const MWWorld::Class& cls = ptr.getClass();
-            if (cls.isActivator() && query.mQueryType != ObjectQueryTypes::ACTIVATORS)
-                continue;
-            if (cls.isActor() && query.mQueryType != ObjectQueryTypes::ACTORS)
-                continue;
-            if (cls.isDoor() && query.mQueryType != ObjectQueryTypes::DOORS)
-                continue;
-            if (typeid(cls) == typeid(MWClass::Container) && query.mQueryType != ObjectQueryTypes::CONTAINERS)
-                continue;
+            GObject g(id, context.mWorldView->getObjectRegistry());
+            if (!g.isValid())
+                return false;
+            ptr = g.ptr();
+            obj = sol::make_object(context.mLua->sol(), g);
+        }
+        else
+        {
+            LObject l(id, context.mWorldView->getObjectRegistry());
+            if (!l.isValid())
+                return false;
+            ptr = l.ptr();
+            obj = sol::make_object(context.mLua->sol(), l);
+        }
+        if (ptr.getRefData().getCount() == 0)
+            return false;
+        // It is stupid, but "prisonmarker" has class "Door" despite that it is only an invisible marker. So we ignore all markers.
+        if (isMarker(ptr))
+            return false;
+        const MWWorld::Class& cls = ptr.getClass();
+        if (cls.isActivator() != (query.mQueryType == ObjectQueryTypes::ACTIVATORS))
+            return false;
+        if (cls.isActor() != (query.mQueryType == ObjectQueryTypes::ACTORS))
+            return false;
+        if (cls.isDoor() != (query.mQueryType == ObjectQueryTypes::DOORS))
+            return false;
+        if ((typeid(cls) == typeid(MWClass::Container)) != (query.mQueryType == ObjectQueryTypes::CONTAINERS))
+            return false;
 
-            condStack.clear();
-            for (const Queries::Operation& op : query.mFilter.mOperations)
+        std::vector<char> condStack;
+        for (const Queries::Operation& op : query.mFilter.mOperations)
+        {
+            switch(op.mType)
             {
-                switch(op.mType)
+                case Queries::Operation::PUSH:
                 {
-                    case Queries::Operation::PUSH:
-                    {
-                        const Queries::Condition& cond = query.mFilter.mConditions[op.mConditionIndex];
-                        sol::object fieldObj = obj;
-                        for (const std::string& field : cond.mField->path())
-                            fieldObj = sol::table(fieldObj)[field];
-                        bool c;
-                        if (cond.mField->type() == typeid(std::string))
-                            c = compareFn(fieldObj.as<std::string_view>(), std::get<std::string>(cond.mValue), cond.mType);
-                        else if (cond.mField->type() == typeid(float))
-                            c = compareFn(fieldObj.as<float>(), std::get<float>(cond.mValue), cond.mType);
-                        else if (cond.mField->type() == typeid(double))
-                            c = compareFn(fieldObj.as<double>(), std::get<double>(cond.mValue), cond.mType);
-                        else if (cond.mField->type() == typeid(bool))
-                            c = compareFn(fieldObj.as<bool>(), std::get<bool>(cond.mValue), cond.mType);
-                        else if (cond.mField->type() == typeid(int32_t))
-                            c = compareFn(fieldObj.as<int32_t>(), std::get<int32_t>(cond.mValue), cond.mType);
-                        else if (cond.mField->type() == typeid(int64_t))
-                            c = compareFn(fieldObj.as<int64_t>(), std::get<int64_t>(cond.mValue), cond.mType);
-                        else
-                            throw std::runtime_error("Unknown field type");
-                        condStack.push_back(c);
-                        break;
-                    }
-                    case Queries::Operation::NOT:
-                        condStack.back() = !condStack.back();
-                        break;
-                    case Queries::Operation::AND:
-                    {
-                        bool v = condStack.back();
-                        condStack.pop_back();
-                        condStack.back() = condStack.back() && v;
-                        break;
-                    }
-                    case Queries::Operation::OR:
-                    {
-                        bool v = condStack.back();
-                        condStack.pop_back();
-                        condStack.back() = condStack.back() || v;
-                        break;
-                    }
+                    const Queries::Condition& cond = query.mFilter.mConditions[op.mConditionIndex];
+                    sol::object fieldObj = obj;
+                    for (const std::string& field : cond.mField->path())
+                        fieldObj = LuaUtil::getFieldOrNil(fieldObj, field);
+                    bool c;
+                    if (fieldObj == sol::nil)
+                        c = false;
+                    else if (cond.mField->type() == typeid(std::string))
+                        c = compareFn(fieldObj.as<std::string_view>(), std::get<std::string>(cond.mValue), cond.mType);
+                    else if (cond.mField->type() == typeid(float))
+                        c = compareFn(fieldObj.as<float>(), std::get<float>(cond.mValue), cond.mType);
+                    else if (cond.mField->type() == typeid(double))
+                        c = compareFn(fieldObj.as<double>(), std::get<double>(cond.mValue), cond.mType);
+                    else if (cond.mField->type() == typeid(bool))
+                        c = compareFn(fieldObj.as<bool>(), std::get<bool>(cond.mValue), cond.mType);
+                    else if (cond.mField->type() == typeid(int32_t))
+                        c = compareFn(fieldObj.as<int32_t>(), std::get<int32_t>(cond.mValue), cond.mType);
+                    else if (cond.mField->type() == typeid(int64_t))
+                        c = compareFn(fieldObj.as<int64_t>(), std::get<int64_t>(cond.mValue), cond.mType);
+                    else
+                        throw std::runtime_error("Unknown field type");
+                    condStack.push_back(c);
+                    break;
+                }
+                case Queries::Operation::NOT:
+                    condStack.back() = !condStack.back();
+                    break;
+                case Queries::Operation::AND:
+                {
+                    bool v = condStack.back();
+                    condStack.pop_back();
+                    condStack.back() = condStack.back() && v;
+                    break;
+                }
+                case Queries::Operation::OR:
+                {
+                    bool v = condStack.back();
+                    condStack.pop_back();
+                    condStack.back() = condStack.back() || v;
+                    break;
                 }
             }
-            if (condStack.empty() || condStack.back() != 0)
+        }
+        return condStack.empty() || condStack.back() != 0;
+    }
+
+    ObjectIdList selectObjectsFromList(const Queries::Query& query, const ObjectIdList& list, const Context& context)
+    {
+        if (!query.mOrderBy.empty() || !query.mGroupBy.empty() || query.mOffset > 0)
+            throw std::runtime_error("OrderBy, GroupBy, and Offset are not supported");
+
+        ObjectIdList res = std::make_shared<std::vector<ObjectId>>();
+        for (const ObjectId& id : *list)
+        {
+            if (static_cast<int64_t>(res->size()) == query.mLimit)
+                break;
+            if (checkQueryConditions(query, id, context))
                 res->push_back(id);
         }
         return res;
     }
 
+    ObjectIdList selectObjectsFromCellStore(const Queries::Query& query, MWWorld::CellStore* store, const Context& context)
+    {
+        if (!query.mOrderBy.empty() || !query.mGroupBy.empty() || query.mOffset > 0)
+            throw std::runtime_error("OrderBy, GroupBy, and Offset are not supported");
+
+        ObjectIdList res = std::make_shared<std::vector<ObjectId>>();
+        auto visitor = [&](const MWWorld::Ptr& ptr)
+        {
+            if (static_cast<int64_t>(res->size()) == query.mLimit)
+                return false;
+            context.mWorldView->getObjectRegistry()->registerPtr(ptr);
+            if (checkQueryConditions(query, getId(ptr), context))
+                res->push_back(getId(ptr));
+            return static_cast<int64_t>(res->size()) != query.mLimit;
+        };
+        store->forEach(std::move(visitor));  // TODO: maybe use store->forEachType<TYPE> depending on query.mType
+        return res;
+    }
+
 }
diff --git a/apps/openmw/mwlua/query.hpp b/apps/openmw/mwlua/query.hpp
index 6bb3fe09fa..65bf0c5105 100644
--- a/apps/openmw/mwlua/query.hpp
+++ b/apps/openmw/mwlua/query.hpp
@@ -32,6 +32,7 @@ namespace MWLua
     // TODO: Implement custom fields. QueryFieldGroup registerCustomFields(...);
 
     ObjectIdList selectObjectsFromList(const Queries::Query& query, const ObjectIdList& list, const Context&);
+    ObjectIdList selectObjectsFromCellStore(const Queries::Query& query, MWWorld::CellStore* store, const Context&);
 
 }
 
diff --git a/apps/openmw/mwlua/worldview.cpp b/apps/openmw/mwlua/worldview.cpp
index 6e54efac39..beaa2d4770 100644
--- a/apps/openmw/mwlua/worldview.cpp
+++ b/apps/openmw/mwlua/worldview.cpp
@@ -2,6 +2,7 @@
 
 #include <components/esm/esmreader.hpp>
 #include <components/esm/esmwriter.hpp>
+#include <components/esm/loadcell.hpp>
 
 #include "../mwclass/container.hpp"
 
@@ -33,6 +34,10 @@ namespace MWLua
 
     WorldView::ObjectGroup* WorldView::chooseGroup(const MWWorld::Ptr& ptr)
     {
+        // It is important to check `isMarker` first.
+        // For example "prisonmarker" has class "Door" despite that it is only an invisible marker.
+        if (isMarker(ptr))
+            return nullptr;
         const MWWorld::Class& cls = ptr.getClass();
         if (cls.isActivator())
             return &mActivatorsInScene;
@@ -113,4 +118,35 @@ namespace MWLua
         group.mChanged = true;
     }
 
+    // TODO: If Lua scripts will use several threads at the same time, then `find*Cell` functions should have critical sections.
+    MWWorld::CellStore* WorldView::findCell(const std::string& name, osg::Vec3f position)
+    {
+        MWBase::World* world = MWBase::Environment::get().getWorld();
+        bool exterior = name.empty() || world->getExterior(name);
+        if (exterior)
+        {
+            int cellX, cellY;
+            world->positionToIndex(position.x(), position.y(), cellX, cellY);
+            return world->getExterior(cellX, cellY);
+        }
+        else
+            return world->getInterior(name);
+    }
+
+    MWWorld::CellStore* WorldView::findNamedCell(const std::string& name)
+    {
+        MWBase::World* world = MWBase::Environment::get().getWorld();
+        const ESM::Cell* esmCell = world->getExterior(name);
+        if (esmCell)
+            return world->getExterior(esmCell->getGridX(), esmCell->getGridY());
+        else
+            return world->getInterior(name);
+    }
+
+    MWWorld::CellStore* WorldView::findExteriorCell(int x, int y)
+    {
+        MWBase::World* world = MWBase::Environment::get().getWorld();
+        return world->getExterior(x, y);
+    }
+
 }
diff --git a/apps/openmw/mwlua/worldview.hpp b/apps/openmw/mwlua/worldview.hpp
index bf2b458792..ea27e0ff84 100644
--- a/apps/openmw/mwlua/worldview.hpp
+++ b/apps/openmw/mwlua/worldview.hpp
@@ -44,6 +44,10 @@ namespace MWLua
         // If onlyActive = true, then search only among the objects that are currently in the scene.
         // TODO: ObjectIdList selectObjects(const Queries::Query& query, bool onlyActive);
 
+        MWWorld::CellStore* findCell(const std::string& name, osg::Vec3f position);
+        MWWorld::CellStore* findNamedCell(const std::string& name);
+        MWWorld::CellStore* findExteriorCell(int x, int y);
+
         void load(ESM::ESMReader& esm);
         void save(ESM::ESMWriter& esm) const;
 

From 7087eb1a4e4072d5f03d68a62abd8f010c5d3265 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Wed, 14 Apr 2021 23:37:57 +0200
Subject: [PATCH 0995/2859] Add built-in Lua library 'openmw_aux' that extends
 OpenMW Lua API

---
 files/builtin_scripts/openmw_aux/util.lua | 99 +++++++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 files/builtin_scripts/openmw_aux/util.lua

diff --git a/files/builtin_scripts/openmw_aux/util.lua b/files/builtin_scripts/openmw_aux/util.lua
new file mode 100644
index 0000000000..ba52ced2bd
--- /dev/null
+++ b/files/builtin_scripts/openmw_aux/util.lua
@@ -0,0 +1,99 @@
+-------------------------------------------------------------------------------
+-- `openmw_aux.util` defines utility functions that are implemented in Lua rather than in C++.
+-- Implementation can be found in `resources/vfs/openmw_aux/util.lua`.
+-- @module util
+-- @usage local aux_util = require('openmw_aux.util')
+
+local aux_util = {}
+
+-------------------------------------------------------------------------------
+-- Finds the nearest object to the given point in the given list.
+-- Ignores cells, uses only coordinates. Returns the nearest object,
+-- and the distance to it. If objectList is empty, returns nil.
+-- @function [parent=#util] findNearestTo
+-- @param openmw.util#Vector3 point
+-- @param openmw.core#ObjectList objectList
+-- @return openmw.core#GameObject, #number the nearest object and the distance
+function aux_util.findNearestTo(point, objectList)
+    local res = nil
+    local resDist = nil
+    for i = 1, #objectList do
+        local obj = objectList[i]
+        local dist = (obj.position - point):length()
+        if i == 1 or dist < resDist then
+            res = obj
+            resDist = dist
+        end
+    end
+    return res, resDist
+end
+
+-------------------------------------------------------------------------------
+-- Runs given function every N game seconds (seconds when the game is not paused).
+-- Note that loading a save stops the evaluation. If it should work always, call it in 2 places --
+-- when a script starts and in the engine handler `onLoad`.
+-- @function [parent=#util] runEveryNSeconds
+-- @param #number N interval in seconds
+-- @param #function fn the function that should be called every N seconds
+-- @param #number initialDelay optional argument -- delay in seconds before the first call. If missed then the delay is a random number in range [0, N]. Randomization is used for performance reasons -- to prevent all scripts from doing time consuming operations at the same time.
+-- @return #function a function without arguments that can be used to stop the periodical evaluation.
+-- @usage
+-- local stopFn = aux_util.runEveryNSeconds(5, function() print('Test') end)  -- print 'Test' every 5 seconds
+-- stopFn()  -- stop printing 'Test'
+-- aux_util.runEveryNSeconds(5, function() print('Test2') end, 1)  -- print 'Test' every 5 seconds starting from the next second
+function aux_util.runEveryNSeconds(N, fn, initialDelay)
+    if N <= 0 then
+        error('Interval must be positive. If you want it to be as small '..
+              'as possible, use the engine handler `onUpdate` instead', 2)
+    end
+    local async = require('openmw.async')
+    local core = require('openmw.core')
+    local breakFlag = false
+    local initialDelay = initialDelay or math.random() * N
+    local baseTime = core.getGameTimeInSeconds() + initialDelay
+    local wrappedFn
+    wrappedFn = function()
+        if breakFlag then return end
+        fn()
+        local nextDelay = 1.5 * N - math.fmod(core.getGameTimeInSeconds() - baseTime + N / 2, N)
+        async:newUnsavableTimerInSeconds(nextDelay, wrappedFn)
+    end
+    async:newUnsavableTimerInSeconds(initialDelay, wrappedFn)
+    return function() breakFlag = true end
+end
+
+-------------------------------------------------------------------------------
+-- Runs given function every N game hours.
+-- Note that loading a save stops the evaluation. If it should work always, call it in 2 places --
+-- when a script starts and in the engine handler `onLoad`.
+-- @function [parent=#util] runEveryNHours
+-- @param #number N interval in game hours
+-- @param #function fn the function that should be called every N game hours
+-- @param #number initialDelay optional argument -- delay in game hours before the first call. If missed then the delay is a random number in range [0, N]. Randomization is used for performance reasons -- to prevent all scripts from doing time consuming operations at the same time.
+-- @return #function a function without arguments that can be used to stop the periodical evaluation.
+-- @usage
+-- local timeBeforeMidnight = 24 - math.fmod(core.getGameTimeInHours(), 24)
+-- aux_util.runEveryNHours(24, doSomething, timeBeforeMidnight)  -- call `doSomething` at the end of every game day.
+function aux_util.runEveryNHours(N, fn, initialDelay)
+    if N <= 0 then
+        error('Interval must be positive. If you want it to be as small '..
+              'as possible, use the engine handler `onUpdate` instead', 2)
+    end
+    local async = require('openmw.async')
+    local core = require('openmw.core')
+    local breakFlag = false
+    local initialDelay = initialDelay or math.random() * N
+    local baseTime = core.getGameTimeInHours() + initialDelay
+    local wrappedFn
+    wrappedFn = function()
+        if breakFlag then return end
+        fn()
+        local nextDelay = 1.5 * N - math.fmod(core.getGameTimeInHours() - baseTime + N / 2, N)
+        async:newUnsavableTimerInHours(nextDelay, wrappedFn)
+    end
+    async:newUnsavableTimerInHours(initialDelay, wrappedFn)
+    return function() breakFlag = true end
+end
+
+return aux_util
+

From a8f76260bc0519a9ba217d74da2523469ddee0c7 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 18 Apr 2021 22:09:01 +0200
Subject: [PATCH 0996/2859] A possibility to view actor controls from lua
 scripts without disabling AI.

---
 apps/openmw/mwbase/luamanager.hpp   |  3 +-
 apps/openmw/mwlua/localscripts.cpp  |  2 ++
 apps/openmw/mwlua/localscripts.hpp  |  2 +-
 apps/openmw/mwlua/luamanagerimp.cpp |  2 +-
 apps/openmw/mwlua/luamanagerimp.hpp |  2 +-
 apps/openmw/mwmechanics/actors.cpp  | 51 +++++++++++++++++------------
 6 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/apps/openmw/mwbase/luamanager.hpp b/apps/openmw/mwbase/luamanager.hpp
index b9109518cc..0d6aee38f1 100644
--- a/apps/openmw/mwbase/luamanager.hpp
+++ b/apps/openmw/mwbase/luamanager.hpp
@@ -34,6 +34,7 @@ namespace MWBase
         virtual void keyPressed(const SDL_KeyboardEvent &arg) = 0;
 
         struct ActorControls {
+            bool disableAI;
             bool controlledFromLua;
 
             bool jump;
@@ -43,7 +44,7 @@ namespace MWBase
             float turn;
         };
 
-        virtual const ActorControls* getActorControls(const MWWorld::Ptr&) const = 0;
+        virtual ActorControls* getActorControls(const MWWorld::Ptr&) const = 0;
 
         virtual void clear() = 0;
         virtual void setupPlayer(const MWWorld::Ptr&) = 0;
diff --git a/apps/openmw/mwlua/localscripts.cpp b/apps/openmw/mwlua/localscripts.cpp
index 4b556faa4d..5b5347af03 100644
--- a/apps/openmw/mwlua/localscripts.cpp
+++ b/apps/openmw/mwlua/localscripts.cpp
@@ -35,6 +35,7 @@ namespace MWLua
         selfAPI["controls"] = sol::readonly_property([](SelfObject& self) { return &self.mControls; });
         selfAPI["isActive"] = [](SelfObject& self) { return &self.mIsActive; };
         selfAPI["setDirectControl"] = [](SelfObject& self, bool v) { self.mControls.controlledFromLua = v; };
+        selfAPI["enableAI"] = [](SelfObject& self, bool v) { self.mControls.disableAI = !v; };
         selfAPI["setEquipment"] = [manager=context.mLuaManager](const SelfObject& obj, sol::table equipment)
         {
             if (!obj.ptr().getClass().hasInventoryStore(obj.ptr()))
@@ -87,6 +88,7 @@ namespace MWLua
         : LuaUtil::ScriptsContainer(lua, "L" + idToString(obj.id())), mData(obj)
     {
         mData.mControls.controlledFromLua = false;
+        mData.mControls.disableAI = false;
         this->addPackage("openmw.self", sol::make_object(lua->sol(), &mData));
         registerEngineHandlers({&mOnActiveHandlers, &mOnInactiveHandlers});
     }
diff --git a/apps/openmw/mwlua/localscripts.hpp b/apps/openmw/mwlua/localscripts.hpp
index a738dfede5..40bff371a1 100644
--- a/apps/openmw/mwlua/localscripts.hpp
+++ b/apps/openmw/mwlua/localscripts.hpp
@@ -22,7 +22,7 @@ namespace MWLua
         static std::unique_ptr<LocalScripts> create(LuaUtil::LuaState* lua, const LObject& obj);
         static void initializeSelfPackage(const Context&);
 
-        const MWBase::LuaManager::ActorControls* getActorControls() const { return &mData.mControls; }
+        MWBase::LuaManager::ActorControls* getActorControls() { return &mData.mControls; }
 
         struct SelfObject : public LObject
         {
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 09b3eb6e13..15e45eba1a 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -260,7 +260,7 @@ namespace MWLua
         mKeyPressEvents.push_back(arg.keysym);
     }
 
-    const MWBase::LuaManager::ActorControls* LuaManager::getActorControls(const MWWorld::Ptr& ptr) const
+    MWBase::LuaManager::ActorControls* LuaManager::getActorControls(const MWWorld::Ptr& ptr) const
     {
         LocalScripts* localScripts = ptr.getRefData().getLuaScripts();
         if (!localScripts)
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index 53f2955675..c0b08ee546 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -42,7 +42,7 @@ namespace MWLua
         void objectRemovedFromScene(const MWWorld::Ptr& ptr) override;
         void keyPressed(const SDL_KeyboardEvent &arg) override;
 
-        const MWBase::LuaManager::ActorControls* getActorControls(const MWWorld::Ptr&) const override;
+        MWBase::LuaManager::ActorControls* getActorControls(const MWWorld::Ptr&) const override;
 
         void clear() override;  // should be called before loading game or starting a new game to reset internal state.
         void setupPlayer(const MWWorld::Ptr& ptr) override;  // Should be called once after each "clear".
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 9d3f16c31c..97d95251a4 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1962,6 +1962,8 @@ namespace MWMechanics
             {
                 bool isPlayer = iter->first == player;
                 CharacterController* ctrl = iter->second->getCharacterController();
+                MWBase::LuaManager::ActorControls* luaControls =
+                    MWBase::Environment::get().getLuaManager()->getActorControls(iter->first);
 
                 float distSqr = (playerPos - iter->first.getRefData().getPosition().asVec3()).length2();
                 // AI processing is only done within given distance to the player.
@@ -2010,25 +2012,6 @@ namespace MWMechanics
                         return; // for now abort update of the old cell when cell changes by teleportation magic effect
                                 // a better solution might be to apply cell changes at the end of the frame
                     }
-                    bool controlledFromLua;
-                    {
-                        const MWBase::LuaManager::ActorControls* luaControls =
-                            MWBase::Environment::get().getLuaManager()->getActorControls(iter->first);
-                        controlledFromLua = luaControls && luaControls->controlledFromLua;
-                        if (controlledFromLua && isConscious(iter->first))
-                        {
-                            Movement& mov = iter->first.getClass().getMovementSettings(iter->first);
-                            mov.mPosition[0] = luaControls->sideMovement;
-                            mov.mPosition[1] = luaControls->movement;
-                            mov.mPosition[2] = luaControls->jump ? 1 : 0;
-                            mov.mRotation[0] = mov.mRotation[1] = 0;
-                            mov.mRotation[2] = luaControls->turn;
-                            mov.mSpeedFactor = osg::Vec2(luaControls->movement, luaControls->sideMovement).length();
-
-                            CreatureStats& stats = iter->first.getClass().getCreatureStats(iter->first);
-                            stats.setMovementFlag(MWMechanics::CreatureStats::Flag_Run, luaControls->run);
-                        }
-                    }
                     if (aiActive && inProcessingRange)
                     {
                         if (engageCombatTimerStatus == Misc::TimerStatus::Elapsed)
@@ -2082,7 +2065,7 @@ namespace MWMechanics
                         if (iter->first != player)
                         {
                             CreatureStats &stats = iter->first.getClass().getCreatureStats(iter->first);
-                            if (isConscious(iter->first) && !controlledFromLua)
+                            if (isConscious(iter->first) && !(luaControls && luaControls->disableAI))
                             {
                                 stats.getAiSequence().execute(iter->first, *ctrl, duration);
                                 updateGreetingState(iter->first, *iter->second, timerUpdateHello > 0);
@@ -2091,7 +2074,7 @@ namespace MWMechanics
                             }
                         }
                     }
-                    else if (aiActive && iter->first != player && isConscious(iter->first) && !controlledFromLua)
+                    else if (aiActive && iter->first != player && isConscious(iter->first) && !(luaControls && luaControls->disableAI))
                     {
                         CreatureStats &stats = iter->first.getClass().getCreatureStats(iter->first);
                         stats.getAiSequence().execute(iter->first, *ctrl, duration, /*outOfRange*/true);
@@ -2108,6 +2091,32 @@ namespace MWMechanics
                         if (timerUpdateEquippedLight == 0)
                             updateEquippedLight(iter->first, updateEquippedLightInterval, showTorches);
                     }
+
+                    if (luaControls && isConscious(iter->first))
+                    {
+                        Movement& mov = iter->first.getClass().getMovementSettings(iter->first);
+                        CreatureStats& stats = iter->first.getClass().getCreatureStats(iter->first);
+                        float speedFactor = isPlayer ? 1.f : mov.mSpeedFactor;
+                        osg::Vec2f movement = osg::Vec2f(mov.mPosition[0], mov.mPosition[1]) * speedFactor;
+                        float rotationZ = mov.mRotation[2];
+                        bool jump = mov.mPosition[2] == 1;
+                        bool runFlag = stats.getMovementFlag(MWMechanics::CreatureStats::Flag_Run);
+                        if (luaControls->controlledFromLua)
+                        {
+                            mov.mPosition[0] = luaControls->sideMovement;
+                            mov.mPosition[1] = luaControls->movement;
+                            mov.mPosition[2] = luaControls->jump ? 1 : 0;
+                            mov.mRotation[1] = 0;
+                            mov.mRotation[2] = luaControls->turn;
+                            mov.mSpeedFactor = osg::Vec2(luaControls->movement, luaControls->sideMovement).length();
+                            stats.setMovementFlag(MWMechanics::CreatureStats::Flag_Run, luaControls->run);
+                        }
+                        luaControls->sideMovement = movement.x();
+                        luaControls->movement = movement.y();
+                        luaControls->turn = rotationZ;
+                        luaControls->jump = jump;
+                        luaControls->run = runFlag;
+                    }
                 }
             }
 

From 403d31313c75c8d99d1e4804988e6dae6ddcd6bc Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 18 Apr 2021 16:50:37 +0200
Subject: [PATCH 0997/2859] New setting "lua num threads". Thread
 syncronization is changed from std::thread::yield to std::condition_variable.

---
 apps/openmw/engine.cpp                        | 111 +++++++++++++-----
 apps/openmw/engine.hpp                        |   1 +
 .../reference/modding/settings/index.rst      |   1 +
 .../source/reference/modding/settings/lua.rst |  17 +++
 files/settings-default.cfg                    |   7 ++
 5 files changed, 107 insertions(+), 30 deletions(-)
 create mode 100644 docs/source/reference/modding/settings/lua.rst

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index b9f499ffb4..71d169c0bc 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -1,6 +1,6 @@
 #include "engine.hpp"
 
-#include <atomic>
+#include <condition_variable>
 #include <iomanip>
 #include <fstream>
 #include <chrono>
@@ -830,6 +830,82 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     mLuaManager->init();
 }
 
+class OMW::Engine::LuaWorker
+{
+public:
+    explicit LuaWorker(Engine* engine) :
+        mEngine(engine),
+        mSeparateThread(Settings::Manager::getInt("lua num threads", "Lua") > 0)
+    {
+        if (mSeparateThread)
+            mThread = std::thread([this]{ threadBody(); });
+    };
+
+    void allowUpdate(double dt)
+    {
+        mDt = dt;
+        if (!mSeparateThread)
+            return;
+        {
+            std::lock_guard<std::mutex> lk(mMutex);
+            mUpdateRequest = true;
+        }
+        mCV.notify_one();
+    }
+
+    void finishUpdate()
+    {
+        if (mSeparateThread)
+        {
+            std::unique_lock<std::mutex> lk(mMutex);
+            mCV.wait(lk, [&]{ return !mUpdateRequest; });
+        }
+        else
+            update();
+        mEngine->mLuaManager->applyQueuedChanges();
+    };
+
+    void join()
+    {
+        if (mSeparateThread)
+            mThread.join();
+    }
+
+private:
+    void update()
+    {
+        const auto& viewer = mEngine->mViewer;
+        const osg::Timer_t frameStart = viewer->getStartTick();
+        const unsigned int frameNumber = viewer->getFrameStamp()->getFrameNumber();
+        ScopedProfile<UserStatsType::Lua> profile(frameStart, frameNumber, *osg::Timer::instance(), *viewer->getViewerStats());
+
+        mEngine->mLuaManager->update(mEngine->mEnvironment.getWindowManager()->isGuiMode(), mDt);
+    }
+
+    void threadBody()
+    {
+        while (!mEngine->mViewer->done() && !mEngine->mEnvironment.getStateManager()->hasQuitRequest())
+        {
+            std::unique_lock<std::mutex> lk(mMutex);
+            mCV.wait(lk, [&]{ return mUpdateRequest; });
+
+            update();
+
+            mUpdateRequest = false;
+            lk.unlock();
+            mCV.notify_one();
+        }
+    }
+
+    Engine* mEngine;
+    const bool mSeparateThread;
+    std::mutex mMutex;
+    std::condition_variable mCV;
+    bool mUpdateRequest;
+    double mDt = 0;
+    std::thread mThread;
+};
+
 // Initialise and enter main loop.
 void OMW::Engine::go()
 {
@@ -912,27 +988,7 @@ void OMW::Engine::go()
         mEnvironment.getWindowManager()->executeInConsole(mStartupScript);
     }
 
-    // Start Lua scripting thread
-    std::atomic_bool luaUpdateRequest;
-    double luaDt = 0;
-    std::thread scriptingThread([&]() {
-        const osg::Timer* const timer = osg::Timer::instance();
-        osg::Stats* const stats = mViewer->getViewerStats();
-        while (!mViewer->done() && !mEnvironment.getStateManager()->hasQuitRequest())
-        {
-            while (!luaUpdateRequest)
-                std::this_thread::yield();
-
-            {
-                const osg::Timer_t frameStart = mViewer->getStartTick();
-                const unsigned int frameNumber = mViewer->getFrameStamp()->getFrameNumber();
-                ScopedProfile<UserStatsType::Lua> profile(frameStart, frameNumber, *timer, *stats);
-
-                mLuaManager->update(mEnvironment.getWindowManager()->isGuiMode(), luaDt);
-            }
-            luaUpdateRequest = false;
-        }
-    });
+    LuaWorker luaWorker(this);  // starts a separate lua thread if "lua num threads" > 0
 
     // Start the main rendering loop
     double simulationTime = 0.0;
@@ -959,16 +1015,11 @@ void OMW::Engine::go()
 
             mEnvironment.getWorld()->updateWindowManager();
 
-            // scriptingThread starts processing Lua scripts
-            luaDt = dt;
-            luaUpdateRequest = true;
+            luaWorker.allowUpdate(dt);  // if there is a separate Lua thread, it starts the update now
 
             mViewer->renderingTraversals();
 
-            // wait for scriptingThread to finish
-            while (luaUpdateRequest)
-                std::this_thread::yield();
-            mLuaManager->applyQueuedChanges();
+            luaWorker.finishUpdate();
 
             bool guiActive = mEnvironment.getWindowManager()->isGuiMode();
             if (!guiActive)
@@ -991,7 +1042,7 @@ void OMW::Engine::go()
         frameRateLimiter.limit();
     }
 
-    scriptingThread.join();
+    luaWorker.join();
 
     // Save user settings
     settings.saveUser(settingspath);
diff --git a/apps/openmw/engine.hpp b/apps/openmw/engine.hpp
index 0645939694..180e06bcbc 100644
--- a/apps/openmw/engine.hpp
+++ b/apps/openmw/engine.hpp
@@ -194,6 +194,7 @@ namespace OMW
 
         private:
             Files::ConfigurationManager& mCfgMgr;
+            class LuaWorker;
     };
 }
 
diff --git a/docs/source/reference/modding/settings/index.rst b/docs/source/reference/modding/settings/index.rst
index e9607fd9d1..b1cfad44ff 100644
--- a/docs/source/reference/modding/settings/index.rst
+++ b/docs/source/reference/modding/settings/index.rst
@@ -58,6 +58,7 @@ The ranges included with each setting are the physically possible ranges, not re
 	HUD
 	game
 	general
+	lua
 	shaders
 	shadows
 	input
diff --git a/docs/source/reference/modding/settings/lua.rst b/docs/source/reference/modding/settings/lua.rst
new file mode 100644
index 0000000000..4d1a3ca808
--- /dev/null
+++ b/docs/source/reference/modding/settings/lua.rst
@@ -0,0 +1,17 @@
+Lua Settings
+############
+
+lua num threads
+---------------
+
+:Type:		integer
+:Range:		0, 1
+:Default:	1
+
+The maximum number of threads used for Lua scripts.
+If zero, Lua scripts are processed in the main thread.
+If one, a separate thread is used.
+Values >1 are not yet supported.
+
+This setting can only be configured by editing the settings configuration file.
+
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 522762555d..d539ba34da 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -1096,3 +1096,10 @@ stomp mode = 2
 # 1 - Reduced levels.
 # 0 - Gentle levels.
 stomp intensity = 1
+
+[Lua]
+
+# Set the maximum number of threads used for Lua scripts.
+# If zero, Lua scripts are processed in the main thread.
+lua num threads = 1
+

From 12685976762294193c97d8ecec4f1ae778d25ebc Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Mon, 19 Apr 2021 13:33:25 +0200
Subject: [PATCH 0998/2859] Make loaded but inactive objects available in Lua
 scripts.

---
 apps/openmw/mwbase/luamanager.hpp   |  2 +
 apps/openmw/mwlua/luamanagerimp.cpp | 67 ++++++++++++++++++-----------
 apps/openmw/mwlua/luamanagerimp.hpp |  2 +
 apps/openmw/mwworld/cellstore.cpp   | 17 +++-----
 apps/openmw/mwworld/worldimp.cpp    |  4 +-
 5 files changed, 56 insertions(+), 36 deletions(-)

diff --git a/apps/openmw/mwbase/luamanager.hpp b/apps/openmw/mwbase/luamanager.hpp
index 0d6aee38f1..52d3102a45 100644
--- a/apps/openmw/mwbase/luamanager.hpp
+++ b/apps/openmw/mwbase/luamanager.hpp
@@ -31,6 +31,8 @@ namespace MWBase
         virtual void newGameStarted() = 0;
         virtual void objectAddedToScene(const MWWorld::Ptr& ptr) = 0;
         virtual void objectRemovedFromScene(const MWWorld::Ptr& ptr) = 0;
+        virtual void registerObject(const MWWorld::Ptr& ptr) = 0;
+        virtual void deregisterObject(const MWWorld::Ptr& ptr) = 0;
         virtual void keyPressed(const SDL_KeyboardEvent &arg) = 0;
 
         struct ActorControls {
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 15e45eba1a..f695e1245b 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -134,6 +134,7 @@ namespace MWLua
                 scripts->processTimers(seconds, hours);
         }
 
+        // Receive events
         for (GlobalEvent& e : globalEvents)
             mGlobalScripts.receiveEvent(e.eventName, e.eventData);
         for (LocalEvent& e : localEvents)
@@ -147,12 +148,7 @@ namespace MWLua
                                   << ". Object not found or has no attached scripts";
         }
 
-        if (mPlayerChanged)
-        {
-            mPlayerChanged = false;
-            mGlobalScripts.playerAdded(GObject(getId(mPlayer), mWorldView.getObjectRegistry()));
-        }
-
+        // Engine handlers in local scripts
         if (mPlayerScripts)
         {
             for (const SDL_Keysym key : mKeyPressEvents)
@@ -167,13 +163,21 @@ namespace MWLua
         mObjectActiveEvents.clear();
         mObjectInactiveEvents.clear();
 
+        for (LocalScripts* scripts : mActiveLocalScripts)
+            scripts->update(dt);
+
+        // Engine handlers in global scripts
+        if (mPlayerChanged)
+        {
+            mPlayerChanged = false;
+            mGlobalScripts.playerAdded(GObject(getId(mPlayer), mWorldView.getObjectRegistry()));
+        }
+
         for (ObjectId id : mActorAddedEvents)
             mGlobalScripts.actorActive(GObject(id, mWorldView.getObjectRegistry()));
         mActorAddedEvents.clear();
 
         mGlobalScripts.update(dt);
-        for (LocalScripts* scripts : mActiveLocalScripts)
-            scripts->update(dt);
     }
 
     void LuaManager::applyQueuedChanges()
@@ -212,21 +216,6 @@ namespace MWLua
         }
     }
 
-    void LuaManager::objectAddedToScene(const MWWorld::Ptr& ptr)
-    {
-        mWorldView.objectAddedToScene(ptr);  // assigns generated RefNum if it is not set yet.
-
-        LocalScripts* localScripts = ptr.getRefData().getLuaScripts();
-        if (localScripts)
-        {
-            mActiveLocalScripts.insert(localScripts);
-            mObjectActiveEvents.push_back(localScripts);
-        }
-
-        if (ptr.getClass().isActor() && ptr != mPlayer)
-            mActorAddedEvents.push_back(getId(ptr));
-    }
-
     void LuaManager::setupPlayer(const MWWorld::Ptr& ptr)
     {
         if (!mPlayer.isEmpty())
@@ -239,9 +228,25 @@ namespace MWLua
         if (!mPlayerScripts)
             throw std::logic_error("mPlayerScripts not initialized");
         mActiveLocalScripts.insert(mPlayerScripts);
+        mObjectActiveEvents.push_back(mPlayerScripts);
         mPlayerChanged = true;
     }
 
+    void LuaManager::objectAddedToScene(const MWWorld::Ptr& ptr)
+    {
+        mWorldView.objectAddedToScene(ptr);  // assigns generated RefNum if it is not set yet.
+
+        LocalScripts* localScripts = ptr.getRefData().getLuaScripts();
+        if (localScripts)
+        {
+            mActiveLocalScripts.insert(localScripts);
+            mObjectActiveEvents.push_back(localScripts);
+        }
+
+        if (ptr.getClass().isActor() && ptr != mPlayer)
+            mActorAddedEvents.push_back(getId(ptr));
+    }
+
     void LuaManager::objectRemovedFromScene(const MWWorld::Ptr& ptr)
     {
         mWorldView.objectRemovedFromScene(ptr);
@@ -249,10 +254,19 @@ namespace MWLua
         if (localScripts)
         {
             mActiveLocalScripts.erase(localScripts);
-            mObjectInactiveEvents.push_back(localScripts);
+            if (!mWorldView.getObjectRegistry()->getPtr(getId(ptr), true).isEmpty())
+                mObjectInactiveEvents.push_back(localScripts);
         }
+    }
 
-        // TODO: call mWorldView.objectUnloaded if object is unloaded from memory (does it ever happen?) and ptr becomes invalid.
+    void LuaManager::registerObject(const MWWorld::Ptr& ptr)
+    {
+        mWorldView.getObjectRegistry()->registerPtr(ptr);
+    }
+
+    void LuaManager::deregisterObject(const MWWorld::Ptr& ptr)
+    {
+        mWorldView.getObjectRegistry()->deregisterPtr(ptr);
     }
 
     void LuaManager::keyPressed(const SDL_KeyboardEvent& arg)
@@ -349,6 +363,9 @@ namespace MWLua
         scripts->setSerializer(mLocalLoader.get());
         scripts->load(data, true);
         scripts->setSerializer(mLocalSerializer.get());
+
+        // LiveCellRef is usually copied after loading, so this Ptr will become invalid and should be deregistered.
+        mWorldView.getObjectRegistry()->deregisterPtr(ptr);
     }
 
     void LuaManager::reloadAllScripts()
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index c0b08ee546..d3191e8428 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -40,6 +40,8 @@ namespace MWLua
         void newGameStarted() override { mGlobalScripts.newGameStarted(); }
         void objectAddedToScene(const MWWorld::Ptr& ptr) override;
         void objectRemovedFromScene(const MWWorld::Ptr& ptr) override;
+        void registerObject(const MWWorld::Ptr& ptr) override;
+        void deregisterObject(const MWWorld::Ptr& ptr) override;
         void keyPressed(const SDL_KeyboardEvent &arg) override;
 
         MWBase::LuaManager::ActorControls* getActorControls(const MWWorld::Ptr&) const override;
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 0d2ee85deb..53245be247 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -18,6 +18,7 @@
 #include <components/esm/doorstate.hpp>
 
 #include "../mwbase/environment.hpp"
+#include "../mwbase/luamanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/world.hpp"
 
@@ -195,6 +196,8 @@ namespace
                         iter->mData.enable();
                         MWBase::Environment::get().getWorld()->disable(MWWorld::Ptr(&*iter, cellstore));
                     }
+                    else
+                        MWBase::Environment::get().getLuaManager()->registerObject(MWWorld::Ptr(&*iter, cellstore));
                     return;
                 }
 
@@ -206,6 +209,9 @@ namespace
         MWWorld::LiveCellRef<T> ref (record);
         ref.load (state);
         collection.mList.push_back (ref);
+
+        MWWorld::LiveCellRefBase* base = &collection.mList.back();
+        MWBase::Environment::get().getLuaManager()->registerObject(MWWorld::Ptr(base, cellstore));
     }
 }
 
@@ -286,16 +292,7 @@ namespace MWWorld
         if (searchViaRefNum(object.getCellRef().getRefNum()).isEmpty())
             throw std::runtime_error("moveTo: object is not in this cell");
 
-
-        // Objects with no refnum can't be handled correctly in the merging process that happens
-        // on a save/load, so do a simple copy & delete for these objects.
-        if (!object.getCellRef().getRefNum().hasContentFile())
-        {
-            MWWorld::Ptr copied = object.getClass().copyToCell(object, *cellToMoveTo, object.getRefData().getCount());
-            object.getRefData().setCount(0);
-            object.getRefData().setBaseNode(nullptr);
-            return copied;
-        }
+        MWBase::Environment::get().getLuaManager()->registerObject(MWWorld::Ptr(object.getBase(), cellToMoveTo));
 
         MovedRefTracker::iterator found = mMovedHere.find(object.getBase());
         if (found != mMovedHere.end())
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index a7915dd30d..99bd53ef3f 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -813,7 +813,8 @@ namespace MWWorld
 
     void World::enable (const Ptr& reference)
     {
-        // enable is a no-op for items in containers
+        MWBase::Environment::get().getLuaManager()->registerObject(reference);
+
         if (!reference.isInCell())
             return;
 
@@ -864,6 +865,7 @@ namespace MWWorld
         if (reference == getPlayerPtr())
             throw std::runtime_error("can not disable player object");
 
+        MWBase::Environment::get().getLuaManager()->deregisterObject(reference);
         reference.getRefData().disable();
 
         if (reference.getCellRef().getRefNum().hasContentFile())

From b1a6441c2329612eb30ba052b815797ae8b52b86 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Wed, 21 Apr 2021 04:11:11 +0200
Subject: [PATCH 0999/2859] Add LocalScripts::LocalEngineEvent. Add `OnConsume`
 engine handler.

---
 apps/openmw/mwbase/luamanager.hpp   | 11 +++++--
 apps/openmw/mwclass/npc.cpp         |  2 ++
 apps/openmw/mwlua/eventqueue.cpp    |  8 ++---
 apps/openmw/mwlua/eventqueue.hpp    | 10 +++---
 apps/openmw/mwlua/localscripts.cpp  | 30 ++++++++++++------
 apps/openmw/mwlua/localscripts.hpp  | 13 ++++++--
 apps/openmw/mwlua/luamanagerimp.cpp | 49 ++++++++++++++++++-----------
 apps/openmw/mwlua/luamanagerimp.hpp | 10 ++++--
 8 files changed, 90 insertions(+), 43 deletions(-)

diff --git a/apps/openmw/mwbase/luamanager.hpp b/apps/openmw/mwbase/luamanager.hpp
index 52d3102a45..24c1780984 100644
--- a/apps/openmw/mwbase/luamanager.hpp
+++ b/apps/openmw/mwbase/luamanager.hpp
@@ -29,11 +29,16 @@ namespace MWBase
         virtual ~LuaManager() = default;
 
         virtual void newGameStarted() = 0;
-        virtual void objectAddedToScene(const MWWorld::Ptr& ptr) = 0;
-        virtual void objectRemovedFromScene(const MWWorld::Ptr& ptr) = 0;
+        virtual void keyPressed(const SDL_KeyboardEvent &arg) = 0;
+
         virtual void registerObject(const MWWorld::Ptr& ptr) = 0;
         virtual void deregisterObject(const MWWorld::Ptr& ptr) = 0;
-        virtual void keyPressed(const SDL_KeyboardEvent &arg) = 0;
+        virtual void objectAddedToScene(const MWWorld::Ptr& ptr) = 0;
+        virtual void objectRemovedFromScene(const MWWorld::Ptr& ptr) = 0;
+        virtual void appliedToObject(const MWWorld::Ptr& toPtr, std::string_view recordId, const MWWorld::Ptr& fromPtr) = 0;
+        // TODO: notify LuaManager about other events
+        // virtual void objectOnHit(const MWWorld::Ptr &ptr, float damage, bool ishealth, const MWWorld::Ptr &object,
+        //                          const MWWorld::Ptr &attacker, const osg::Vec3f &hitPosition, bool successful) = 0;
 
         struct ActorControls {
             bool disableAI;
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 6131f86269..5bf81caf9d 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -17,6 +17,7 @@
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/dialoguemanager.hpp"
 #include "../mwbase/soundmanager.hpp"
+#include "../mwbase/luamanager.hpp"
 
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/npcstats.hpp"
@@ -1095,6 +1096,7 @@ namespace MWClass
     bool Npc::apply (const MWWorld::Ptr& ptr, const std::string& id,
         const MWWorld::Ptr& actor) const
     {
+        MWBase::Environment::get().getLuaManager()->appliedToObject(ptr, id, actor);
         MWMechanics::CastSpell cast(ptr, ptr);
         return cast.cast(id);
     }
diff --git a/apps/openmw/mwlua/eventqueue.cpp b/apps/openmw/mwlua/eventqueue.cpp
index 5e63fee57a..1c136551c4 100644
--- a/apps/openmw/mwlua/eventqueue.cpp
+++ b/apps/openmw/mwlua/eventqueue.cpp
@@ -14,10 +14,10 @@ namespace MWLua
     template <typename Event>
     void saveEvent(ESM::ESMWriter& esm, const ObjectId& dest, const Event& event)
     {
-        esm.writeHNString("LUAE", event.eventName);
+        esm.writeHNString("LUAE", event.mEventName);
         dest.save(esm, true);
-        if (!event.eventData.empty())
-            saveLuaBinaryData(esm, event.eventData);
+        if (!event.mEventData.empty())
+            saveLuaBinaryData(esm, event.mEventData);
     }
 
     void loadEvents(sol::state& lua, ESM::ESMReader& esm, GlobalEventQueue& globalEvents, LocalEventQueue& localEvents,
@@ -57,7 +57,7 @@ namespace MWLua
         for (const GlobalEvent& e : globalEvents)
             saveEvent(esm, globalId, e);
         for (const LocalEvent& e : localEvents)
-            saveEvent(esm, e.dest, e);
+            saveEvent(esm, e.mDest, e);
     }
 
 }
diff --git a/apps/openmw/mwlua/eventqueue.hpp b/apps/openmw/mwlua/eventqueue.hpp
index b692d7162d..0e5f2dfcb4 100644
--- a/apps/openmw/mwlua/eventqueue.hpp
+++ b/apps/openmw/mwlua/eventqueue.hpp
@@ -23,14 +23,14 @@ namespace MWLua
 {
     struct GlobalEvent
     {
-        std::string eventName;
-        std::string eventData;
+        std::string mEventName;
+        std::string mEventData;
     };
     struct LocalEvent
     {
-        ObjectId dest;
-        std::string eventName;
-        std::string eventData;
+        ObjectId mDest;
+        std::string mEventName;
+        std::string mEventData;
     };
     using GlobalEventQueue = std::vector<GlobalEvent>;
     using LocalEventQueue = std::vector<LocalEvent>;
diff --git a/apps/openmw/mwlua/localscripts.cpp b/apps/openmw/mwlua/localscripts.cpp
index 5b5347af03..e4c50334d4 100644
--- a/apps/openmw/mwlua/localscripts.cpp
+++ b/apps/openmw/mwlua/localscripts.cpp
@@ -90,18 +90,30 @@ namespace MWLua
         mData.mControls.controlledFromLua = false;
         mData.mControls.disableAI = false;
         this->addPackage("openmw.self", sol::make_object(lua->sol(), &mData));
-        registerEngineHandlers({&mOnActiveHandlers, &mOnInactiveHandlers});
+        registerEngineHandlers({&mOnActiveHandlers, &mOnInactiveHandlers, &mOnConsumeHandlers});
     }
 
-    void LocalScripts::becomeActive()
+    void LocalScripts::receiveEngineEvent(const EngineEvent& event, ObjectRegistry*)
     {
-        mData.mIsActive = true;
-        callEngineHandlers(mOnActiveHandlers);
-    }
-    void LocalScripts::becomeInactive()
-    {
-        mData.mIsActive = false;
-        callEngineHandlers(mOnInactiveHandlers);
+        std::visit([this](auto&& arg)
+        {
+            using EventT = std::decay_t<decltype(arg)>;
+            if constexpr (std::is_same_v<EventT, OnActive>)
+            {
+                mData.mIsActive = true;
+                callEngineHandlers(mOnActiveHandlers);
+            }
+            else if constexpr (std::is_same_v<EventT, OnInactive>)
+            {
+                mData.mIsActive = false;
+                callEngineHandlers(mOnInactiveHandlers);
+            }
+            else
+            {
+                static_assert(std::is_same_v<EventT, OnConsume>);
+                callEngineHandlers(mOnConsumeHandlers, arg.mRecordId);
+            }
+        }, event);
     }
 
 }
diff --git a/apps/openmw/mwlua/localscripts.hpp b/apps/openmw/mwlua/localscripts.hpp
index 40bff371a1..49612be441 100644
--- a/apps/openmw/mwlua/localscripts.hpp
+++ b/apps/openmw/mwlua/localscripts.hpp
@@ -31,14 +31,23 @@ namespace MWLua
             bool mIsActive;
         };
 
-        void becomeActive();
-        void becomeInactive();
+        struct OnActive {};
+        struct OnInactive {};
+        struct OnConsume
+        {
+            std::string mRecordId;
+        };
+        using EngineEvent = std::variant<OnActive, OnInactive, OnConsume>;
+
+        void receiveEngineEvent(const EngineEvent&, ObjectRegistry*);
+
     protected:
         LocalScripts(LuaUtil::LuaState* lua, const LObject& obj);
         SelfObject mData;
     private:
         EngineHandlerList mOnActiveHandlers{"onActive"};
         EngineHandlerList mOnInactiveHandlers{"onInactive"};
+        EngineHandlerList mOnConsumeHandlers{"onConsume"};
     };
 
 }
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index f695e1245b..604dde8495 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -100,6 +100,8 @@ namespace MWLua
 
     void LuaManager::update(bool paused, float dt)
     {
+        ObjectRegistry* objectRegistry = mWorldView.getObjectRegistry();
+
         if (!mPlayer.isEmpty())
         {
             MWWorld::Ptr newPlayerPtr = MWBase::Environment::get().getWorld()->getPlayerPtr();
@@ -108,7 +110,7 @@ namespace MWLua
             if (!mPlayer.isInCell() || !newPlayerPtr.isInCell() || mPlayer.getCell() != newPlayerPtr.getCell())
             {
                 mPlayer = newPlayerPtr;
-                mWorldView.getObjectRegistry()->registerPtr(mPlayer);
+                objectRegistry->registerPtr(mPlayer);
             }
         }
         mWorldView.update();
@@ -136,15 +138,15 @@ namespace MWLua
 
         // Receive events
         for (GlobalEvent& e : globalEvents)
-            mGlobalScripts.receiveEvent(e.eventName, e.eventData);
+            mGlobalScripts.receiveEvent(e.mEventName, e.mEventData);
         for (LocalEvent& e : localEvents)
         {
-            LObject obj(e.dest, mWorldView.getObjectRegistry());
+            LObject obj(e.mDest, objectRegistry);
             LocalScripts* scripts = obj.isValid() ? obj.ptr().getRefData().getLuaScripts() : nullptr;
             if (scripts)
-                scripts->receiveEvent(e.eventName, e.eventData);
+                scripts->receiveEvent(e.mEventName, e.mEventData);
             else
-                Log(Debug::Debug) << "Ignored event " << e.eventName << " to L" << idToString(e.dest)
+                Log(Debug::Debug) << "Ignored event " << e.mEventName << " to L" << idToString(e.mDest)
                                   << ". Object not found or has no attached scripts";
         }
 
@@ -156,12 +158,19 @@ namespace MWLua
         }
         mKeyPressEvents.clear();
 
-        for (LocalScripts* localScripts : mObjectInactiveEvents)
-            localScripts->becomeInactive();
-        for (LocalScripts* localScripts : mObjectActiveEvents)
-            localScripts->becomeActive();
-        mObjectActiveEvents.clear();
-        mObjectInactiveEvents.clear();
+        for (const LocalEngineEvent& e : mLocalEngineEvents)
+        {
+            LObject obj(e.mDest, objectRegistry);
+            if (!obj.isValid())
+            {
+                Log(Debug::Verbose) << "Can not call engine handlers: object" << idToString(e.mDest) << " is not found";
+                continue;
+            }
+            LocalScripts* scripts = obj.ptr().getRefData().getLuaScripts();
+            if (scripts)
+                scripts->receiveEngineEvent(e.mEvent, objectRegistry);
+        }
+        mLocalEngineEvents.clear();
 
         for (LocalScripts* scripts : mActiveLocalScripts)
             scripts->update(dt);
@@ -170,11 +179,11 @@ namespace MWLua
         if (mPlayerChanged)
         {
             mPlayerChanged = false;
-            mGlobalScripts.playerAdded(GObject(getId(mPlayer), mWorldView.getObjectRegistry()));
+            mGlobalScripts.playerAdded(GObject(getId(mPlayer), objectRegistry));
         }
 
         for (ObjectId id : mActorAddedEvents)
-            mGlobalScripts.actorActive(GObject(id, mWorldView.getObjectRegistry()));
+            mGlobalScripts.actorActive(GObject(id, objectRegistry));
         mActorAddedEvents.clear();
 
         mGlobalScripts.update(dt);
@@ -203,8 +212,7 @@ namespace MWLua
         mGlobalEvents.clear();
         mKeyPressEvents.clear();
         mActorAddedEvents.clear();
-        mObjectActiveEvents.clear();
-        mObjectInactiveEvents.clear();
+        mLocalEngineEvents.clear();
         mPlayerChanged = false;
         mPlayerScripts = nullptr;
         mWorldView.clear();
@@ -228,7 +236,7 @@ namespace MWLua
         if (!mPlayerScripts)
             throw std::logic_error("mPlayerScripts not initialized");
         mActiveLocalScripts.insert(mPlayerScripts);
-        mObjectActiveEvents.push_back(mPlayerScripts);
+        mLocalEngineEvents.push_back({getId(ptr), LocalScripts::OnActive{}});
         mPlayerChanged = true;
     }
 
@@ -240,7 +248,7 @@ namespace MWLua
         if (localScripts)
         {
             mActiveLocalScripts.insert(localScripts);
-            mObjectActiveEvents.push_back(localScripts);
+            mLocalEngineEvents.push_back({getId(ptr), LocalScripts::OnActive{}});
         }
 
         if (ptr.getClass().isActor() && ptr != mPlayer)
@@ -255,7 +263,7 @@ namespace MWLua
         {
             mActiveLocalScripts.erase(localScripts);
             if (!mWorldView.getObjectRegistry()->getPtr(getId(ptr), true).isEmpty())
-                mObjectInactiveEvents.push_back(localScripts);
+                mLocalEngineEvents.push_back({getId(ptr), LocalScripts::OnInactive{}});
         }
     }
 
@@ -274,6 +282,11 @@ namespace MWLua
         mKeyPressEvents.push_back(arg.keysym);
     }
 
+    void LuaManager::appliedToObject(const MWWorld::Ptr& toPtr, std::string_view recordId, const MWWorld::Ptr& fromPtr)
+    {
+        mLocalEngineEvents.push_back({getId(toPtr), LocalScripts::OnConsume{std::string(recordId)}});
+    }
+
     MWBase::LuaManager::ActorControls* LuaManager::getActorControls(const MWWorld::Ptr& ptr) const
     {
         LocalScripts* localScripts = ptr.getRefData().getLuaScripts();
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index d3191e8428..5cfadebc40 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -43,6 +43,7 @@ namespace MWLua
         void registerObject(const MWWorld::Ptr& ptr) override;
         void deregisterObject(const MWWorld::Ptr& ptr) override;
         void keyPressed(const SDL_KeyboardEvent &arg) override;
+        void appliedToObject(const MWWorld::Ptr& toPtr, std::string_view recordId, const MWWorld::Ptr& fromPtr) override;
 
         MWBase::LuaManager::ActorControls* getActorControls(const MWWorld::Ptr&) const override;
 
@@ -96,8 +97,13 @@ namespace MWLua
 
         std::vector<SDL_Keysym> mKeyPressEvents;
         std::vector<ObjectId> mActorAddedEvents;
-        std::vector<LocalScripts*> mObjectActiveEvents;
-        std::vector<LocalScripts*> mObjectInactiveEvents;
+
+        struct LocalEngineEvent
+        {
+            ObjectId mDest;
+            LocalScripts::EngineEvent mEvent;
+        };
+        std::vector<LocalEngineEvent> mLocalEngineEvents;
 
         // Queued actions that should be done in main thread. Processed by applyQueuedChanges().
         std::vector<std::unique_ptr<Action>> mActionQueue;

From cc7dbabd191c8e64ec420fe11cb1c8cab212934a Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Fri, 9 Jul 2021 20:18:23 +0200
Subject: [PATCH 1000/2859] Change argument of `onKeyPress`

---
 apps/openmw/mwlua/luabindings.cpp   | 20 ++++++++++++++++++++
 apps/openmw/mwlua/luabindings.hpp   |  2 ++
 apps/openmw/mwlua/luamanagerimp.cpp |  5 +++--
 apps/openmw/mwlua/playerscripts.hpp |  4 +++-
 components/lua/scriptscontainer.hpp |  2 +-
 5 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index bc50062546..5ed5378c0a 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -1,5 +1,7 @@
 #include "luabindings.hpp"
 
+#include <SDL_events.h>
+
 #include <components/lua/luastate.hpp>
 #include <components/queries/luabindings.hpp>
 
@@ -8,6 +10,12 @@
 #include "eventqueue.hpp"
 #include "worldview.hpp"
 
+namespace sol
+{
+    template <>
+    struct is_automagical<SDL_Keysym> : std::false_type {};
+}
+
 namespace MWLua
 {
 
@@ -160,5 +168,17 @@ namespace MWLua
         return context.mLua->makeReadOnly(res);
     }
 
+    void initInputBindings(const Context& context)
+    {
+        sol::usertype<SDL_Keysym> keyEvent = context.mLua->sol().new_usertype<SDL_Keysym>("KeyEvent");
+        keyEvent["symbol"] = sol::readonly_property([](const SDL_Keysym& e) { return std::string(1, static_cast<char>(e.sym)); });
+        keyEvent["code"] = sol::readonly_property([](const SDL_Keysym& e) -> int { return e.sym; });
+        keyEvent["modifiers"] = sol::readonly_property([](const SDL_Keysym& e) -> int { return e.mod; });
+        keyEvent["withShift"] = sol::readonly_property([](const SDL_Keysym& e) -> bool { return e.mod & KMOD_SHIFT; });
+        keyEvent["withCtrl"] = sol::readonly_property([](const SDL_Keysym& e) -> bool { return e.mod & KMOD_CTRL; });
+        keyEvent["withAlt"] = sol::readonly_property([](const SDL_Keysym& e) -> bool { return e.mod & KMOD_ALT; });
+        keyEvent["withSuper"] = sol::readonly_property([](const SDL_Keysym& e) -> bool { return e.mod & KMOD_GUI; });
+    }
+
 }
 
diff --git a/apps/openmw/mwlua/luabindings.hpp b/apps/openmw/mwlua/luabindings.hpp
index ab83ce995f..8be96763a5 100644
--- a/apps/openmw/mwlua/luabindings.hpp
+++ b/apps/openmw/mwlua/luabindings.hpp
@@ -26,6 +26,8 @@ namespace MWLua
 
     sol::table initFieldGroup(const Context&, const QueryFieldGroup&);
 
+    void initInputBindings(const Context&);
+
     // Implemented in objectbindings.cpp
     void initObjectBindingsForLocalScripts(const Context&);
     void initObjectBindingsForGlobalScripts(const Context&);
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 604dde8495..bd07c191f9 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -48,6 +48,7 @@ namespace MWLua
         initObjectBindingsForLocalScripts(localContext);
         initCellBindingsForLocalScripts(localContext);
         LocalScripts::initializeSelfPackage(localContext);
+        initInputBindings(localContext);
 
         mLua.addCommonPackage("openmw.async", getAsyncPackageInitializer(context));
         mLua.addCommonPackage("openmw.util", LuaUtil::initUtilPackage(mLua.sol()));
@@ -153,8 +154,8 @@ namespace MWLua
         // Engine handlers in local scripts
         if (mPlayerScripts)
         {
-            for (const SDL_Keysym key : mKeyPressEvents)
-                mPlayerScripts->keyPress(key.sym, key.mod);
+            for (const SDL_Keysym& key : mKeyPressEvents)
+                mPlayerScripts->keyPress(key);
         }
         mKeyPressEvents.clear();
 
diff --git a/apps/openmw/mwlua/playerscripts.hpp b/apps/openmw/mwlua/playerscripts.hpp
index 9a08f917e7..72e064bb9b 100644
--- a/apps/openmw/mwlua/playerscripts.hpp
+++ b/apps/openmw/mwlua/playerscripts.hpp
@@ -1,6 +1,8 @@
 #ifndef MWLUA_PLAYERSCRIPTS_H
 #define MWLUA_PLAYERSCRIPTS_H
 
+#include <SDL_events.h>
+
 #include "localscripts.hpp"
 
 namespace MWLua
@@ -14,7 +16,7 @@ namespace MWLua
             registerEngineHandlers({&mKeyPressHandlers});
         }
 
-        void keyPress(int sym, int mod) { callEngineHandlers(mKeyPressHandlers, sym, mod); }
+        void keyPress(const SDL_Keysym& key) { callEngineHandlers(mKeyPressHandlers, key); }
 
     private:
         EngineHandlerList mKeyPressHandlers{"onKeyPress"};
diff --git a/components/lua/scriptscontainer.hpp b/components/lua/scriptscontainer.hpp
index a5cb7d3e58..da36109851 100644
--- a/components/lua/scriptscontainer.hpp
+++ b/components/lua/scriptscontainer.hpp
@@ -163,6 +163,7 @@ namespace LuaUtil
         void registerEngineHandlers(std::initializer_list<EngineHandlerList*> handlers);
 
         const std::string mNamePrefix;
+        LuaUtil::LuaState& mLua;
 
     private:
         struct Script
@@ -190,7 +191,6 @@ namespace LuaUtil
         void updateTimerQueue(std::vector<Timer>& timerQueue, double time);
         static void insertTimer(std::vector<Timer>& timerQueue, Timer&& t);
 
-        LuaUtil::LuaState& mLua;
         const UserdataSerializer* mSerializer = nullptr;
         std::map<std::string, sol::object> API;
 

From 4eb5841c60afdb8a12602a93e2e68ffdec19bac4 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Fri, 2 Apr 2021 19:42:19 +0200
Subject: [PATCH 1001/2859] Update OpenMW Lua documentation

---
 docs/source/conf.py                           |   2 +-
 docs/source/reference/lua-scripting/api.rst   | 455 ++----------------
 .../reference/lua-scripting/overview.rst      | 446 ++++++++++++++---
 files/CMakeLists.txt                          |   1 +
 files/lua_api/CMakeLists.txt                  |  21 +
 files/lua_api/README.md                       |  13 +
 files/lua_api/coroutine.doclua                |  71 +++
 files/lua_api/global.doclua                   | 269 +++++++++++
 files/lua_api/math.doclua                     | 200 ++++++++
 files/lua_api/openmw/README.md                |  14 +
 files/lua_api/openmw/async.lua                |  52 ++
 files/lua_api/openmw/core.lua                 | 328 +++++++++++++
 files/lua_api/openmw/generate_luadoc.sh       |   4 +
 files/lua_api/openmw/nearby.lua               |  36 ++
 files/lua_api/openmw/query.lua                | 116 +++++
 files/lua_api/openmw/self.lua                 |  68 +++
 files/lua_api/openmw/ui.lua                   |  15 +
 files/lua_api/openmw/util.lua                 | 150 ++++++
 files/lua_api/openmw/world.lua                |  34 ++
 files/lua_api/string.doclua                   | 231 +++++++++
 files/lua_api/table.doclua                    |  66 +++
 21 files changed, 2111 insertions(+), 481 deletions(-)
 create mode 100644 files/lua_api/CMakeLists.txt
 create mode 100644 files/lua_api/README.md
 create mode 100644 files/lua_api/coroutine.doclua
 create mode 100644 files/lua_api/global.doclua
 create mode 100644 files/lua_api/math.doclua
 create mode 100644 files/lua_api/openmw/README.md
 create mode 100644 files/lua_api/openmw/async.lua
 create mode 100644 files/lua_api/openmw/core.lua
 create mode 100755 files/lua_api/openmw/generate_luadoc.sh
 create mode 100644 files/lua_api/openmw/nearby.lua
 create mode 100644 files/lua_api/openmw/query.lua
 create mode 100644 files/lua_api/openmw/self.lua
 create mode 100644 files/lua_api/openmw/ui.lua
 create mode 100644 files/lua_api/openmw/util.lua
 create mode 100644 files/lua_api/openmw/world.lua
 create mode 100644 files/lua_api/string.doclua
 create mode 100644 files/lua_api/table.doclua

diff --git a/docs/source/conf.py b/docs/source/conf.py
index 7653b94edf..72bb17adbb 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -176,7 +176,7 @@ html_static_path = [
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
 # directly to the root of the documentation.
-#html_extra_path = []
+html_extra_path = ['generated-luadoc']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
diff --git a/docs/source/reference/lua-scripting/api.rst b/docs/source/reference/lua-scripting/api.rst
index a7b153c039..f98d4ef074 100644
--- a/docs/source/reference/lua-scripting/api.rst
+++ b/docs/source/reference/lua-scripting/api.rst
@@ -17,426 +17,69 @@ Engine handler is a function defined by a script, that can be called by the engi
 | onUpdate(dt)                     | | Called every frame if game not paused. `dt` is the time   |
 |                                  | | from the last update in seconds.                          |
 +----------------------------------+-------------------------------------------------------------+
-| onSave() -> data                 | Called when the game is saving.                             |
+| onSave() -> data                 | | Called when the game is saving. May be called in inactive |
+|                                  | | state, so it shouldn't use `openmw.nearby`.               |
 +----------------------------------+-------------------------------------------------------------+
-| onLoad(data)                     | Called on loading with the data previosly returned by onSave|
+| onLoad(data)                     | | Called on loading with the data previosly returned by     |
+|                                  | | onSave. During loading the object is always in inactive.  |
 +----------------------------------+-------------------------------------------------------------+
 | **Only for global scripts**                                                                    |
 +----------------------------------+-------------------------------------------------------------+
 | onNewGame()                      | New game is started                                         |
 +----------------------------------+-------------------------------------------------------------+
-| onPlayerAdded(player)            |Player added to game world. The argument is a `Game object`_.|
+| onPlayerAdded(player)            |Player added to game world. The argument is a `Game object`. |
 +----------------------------------+-------------------------------------------------------------+
 | onActorActive(actor)             | Actor (NPC or Creature) becomes active.                     |
 +----------------------------------+-------------------------------------------------------------+
+| **Only for local scripts**                                                                     |
++----------------------------------+-------------------------------------------------------------+
+| onActive()                       | | Called when the object becomes active (either a player    |
+|                                  | | came to this cell again, or a save was loaded).           |
++----------------------------------+-------------------------------------------------------------+
+| onInactive()                     | | Object became inactive. Since it is inactive the handler  |
+|                                  | | can not access anything nearby, but it is possible to send|
+|                                  | | an event to global scripts.                               |
++----------------------------------+-------------------------------------------------------------+
+| onConsume(recordId)              | | Called if `recordId` (e.g. a potion) is consumed.         |
++----------------------------------+-------------------------------------------------------------+
 | **Only for local scripts attached to a player**                                                |
 +----------------------------------+-------------------------------------------------------------+
 | onKeyPress(symbol, modifiers)    | | Key pressed. `Symbol` is an ASCII code, `modifiers` is    |
 |                                  | | a binary OR of flags of special keys (ctrl, shift, alt).  |
 +----------------------------------+-------------------------------------------------------------+
 
-.. _Game object:
-
-Game object reference
-=====================
-
-Game object is a universal reference to an object in the game world. Anything that has a reference number.
-
-**Can be used on any object:**
-
-+---------------------------------------------+--------------------------------------------------+
-| Function                                    | Description                                      |
-+=============================================+==================================================+
-| object:isValid()                            | | Returns true if the object exists and loaded,  |
-|                                             | | and false otherwise. If false, then every      |
-|                                             | | access to the object will raise an error.      |
-+---------------------------------------------+--------------------------------------------------+
-| object:sendEvent(eventName, eventData)      | Sends local event to the object.                 |
-+---------------------------------------------+--------------------------------------------------+
-| object:isEquipped(item)                     | Returns true if `item` is equipped on `object`.  |
-+---------------------------------------------+--------------------------------------------------+
-| object:getEquipment() -> table              | | Returns a table `slot` -> `object` of currently|
-|                                             | | equipped items. See `core.EQUIPMENT_SLOT`.     |
-|                                             | | Returns empty table if `object` doesn't have   |
-|                                             | | equipment slots.                               |
-+---------------------------------------------+--------------------------------------------------+
-| object:setEquipment(table)                  | | Sets equipment. Keys in the table are equipment|
-|                                             | | slots (see `core.EQUIPMENT_SLOT`). Each value  |
-|                                             | | can be either an object or `recordId`. Raises  |
-|                                             | | an error if `object` doesn't have equipment    |
-|                                             | | slots and `table` is not empty. Can be called  |
-|                                             | | only on `self` or from a global script.        |
-+---------------------------------------------+--------------------------------------------------+
-| object:addScript(scriptPath)                | | Adds new script to the object.                 |
-|                                             | | Can be called only from a global script.       |
-+---------------------------------------------+--------------------------------------------------+
-| object:teleport(cell, pos, [rot])           | | Moves object to given cell and position.       |
-|                                             | | The effect is not immediate: the position will |
-|                                             | | be updated only in the next frame.             |
-|                                             | | Can be called only from a global script.       |
-+---------------------------------------------+--------------------------------------------------+
-
-+-----------------------+---------------------+--------------------------------------------------+
-| Field                 | Type                | Description                                      |
-+=======================+=====================+==================================================+
-| object.position       | vector3_            | Position                                         |
-+-----------------------+---------------------+--------------------------------------------------+
-| object.rotation       | vector3_            | Rotation                                         |
-+-----------------------+---------------------+--------------------------------------------------+
-| object.cell           | string              | Cell                                             |
-+-----------------------+---------------------+--------------------------------------------------+
-| object.type           | string              | :ref:`Type <Object type>` of the object          |
-+-----------------------+---------------------+--------------------------------------------------+
-| object.count          | integer             | Count (makes sense if holded in a container)     |
-+-----------------------+---------------------+--------------------------------------------------+
-| object.recordId       | string              | Record ID                                        |
-+-----------------------+---------------------+--------------------------------------------------+
-| object.inventory      | Inventory           | Inventory of an actor or content of a container  |
-+-----------------------+---------------------+--------------------------------------------------+
-
-**Can be used if object.type == 'Door':**
-
-+-----------------------+---------------------+--------------------------------------------------+
-| Field                 | Type                | Description                                      |
-+=======================+=====================+==================================================+
-| object.isTeleport     | boolean             | True if it is a teleport door                    |
-+-----------------------+---------------------+--------------------------------------------------+
-| object.destPosition   | vector3_            | Destination (only if a teleport door)            |
-+-----------------------+---------------------+--------------------------------------------------+
-| object.destRotation   | vector3_            | Destination rotation (only if a teleport door)   |
-+-----------------------+---------------------+--------------------------------------------------+
-| object.destCell       | string              | Destination cell (only if a teleport door)       |
-+-----------------------+---------------------+--------------------------------------------------+
-
-Object type
------------
-
-Type is represented as a string. Can be one of:
-
-- "Activator"
-- "Armor"
-- "Book"
-- "Clothing"
-- "Container"
-- "Creature"
-- "Door"
-- "Ingredient"
-- "Light"
-- "Miscellaneous"
-- "NPC"
-- "Player"
-- "Potion"
-- "Static"
-- "Weapon"
-
-ObjectList
-----------
-
-List of game objects. Can't be created or modified by a script.
-
-.. code-block:: Lua
-
-    -- Iteration by index
-    for i = 1, #someList do
-        doSomething(someList[i])
-    end
-
-    -- Generic for (equivalent to iteration by index)
-    for i, item in someList:ipairs() do
-        doSomething(item)
-    end
-
-    -- WRONG: for i, item in ipairs(someList) do
-    -- It doesn't work because Lua 5.1 doesn't allow to overload ipairs for userdata.
-
-+---------------------------------------------+--------------------------------------------------+
-| Function                                    | Description                                      |
-+=============================================+==================================================+
-| list:ipairs()                               | Returns an iterator                              |
-+---------------------------------------------+--------------------------------------------------+
-| list:select(query) -> ObjectList            | Returns a filtered list                          |
-+---------------------------------------------+--------------------------------------------------+
-
-Object inventory
-----------------
-
-+---------------------------------------------+--------------------------------------------------+
-| Function                                    | Description                                      |
-+=============================================+==================================================+
-| inv:countOf(recordId) -> int                | The number of items with given recordId          |
-+---------------------------------------------+--------------------------------------------------+
-| inv:getAll(recordId) -> ObjectList_         | All contained items                              |
-+---------------------------------------------+--------------------------------------------------+
-| inv:getPotions() -> ObjectList_             | All potions from the inventory                   |
-+---------------------------------------------+--------------------------------------------------+
-| inv:getApparatuses() -> ObjectList_         | All apparatuses from the inventory               |
-+---------------------------------------------+--------------------------------------------------+
-| inv:getArmors() -> ObjectList_              | All armors from the inventory                    |
-+---------------------------------------------+--------------------------------------------------+
-| inv:getBooks() -> ObjectList_               | All books from the inventory                     |
-+---------------------------------------------+--------------------------------------------------+
-| inv:getClothing() -> ObjectList_            | All clothing from the inventory                  |
-+---------------------------------------------+--------------------------------------------------+
-| inv:getIngredients() -> ObjectList_         | All ingredients from the inventory               |
-+---------------------------------------------+--------------------------------------------------+
-| inv:getLights() -> ObjectList_              | All lights from the inventory                    |
-+---------------------------------------------+--------------------------------------------------+
-| inv:getLockpicks() -> ObjectList_           | All lockpicks from the inventory                 |
-+---------------------------------------------+--------------------------------------------------+
-| inv:getMiscellaneous() -> ObjectList_       | All miscellaneous items from the inventory       |
-+---------------------------------------------+--------------------------------------------------+
-| inv:getProbes() -> ObjectList_              | All probes from the inventory                    |
-+---------------------------------------------+--------------------------------------------------+
-| inv:getRepairKits() -> ObjectList_          | All repair kits from the inventory               |
-+---------------------------------------------+--------------------------------------------------+
-| inv:getWeapons() -> ObjectList_             | All weapon from the inventory                    |
-+---------------------------------------------+--------------------------------------------------+
-
-openmw.util
-===========
-
-+---------------------------------------------+--------------------------------------------------+
-| Function                                    | Description                                      |
-+=============================================+==================================================+
-| vector2(x, y) -> vector2_                   | Creates 2D vector                                |
-+---------------------------------------------+--------------------------------------------------+
-| vector3(x, y, z) -> vector3_                | Creates 3D vector                                |
-+---------------------------------------------+--------------------------------------------------+
-| clamp(value, from, to) -> number            | Limits given value to the interval [from, to]    |
-+---------------------------------------------+--------------------------------------------------+
-| normalizeAngle(radians) -> number           | Adds 2pi*k and puts the angle in range [-pi, pi] |
-+---------------------------------------------+--------------------------------------------------+
-
-vector2
--------
-
-Immutable 2D vector.
-
-.. code-block:: Lua
-
-    v = vector2(3, 4)
-    v.x, v.y       -- 3.0, 4.0
-    str(v)         -- "(3.0, 4.0)"
-    v:length()     -- 5.0    length
-    v:length2()    -- 25.0   square of the length
-    v:normalize()  -- vector2(3/5, 4/5)
-    v:rotate(radians)    -- rotate clockwise (returns rotated vector)
-    v1:dot(v2)     -- dot product (returns a number)
-    v1 * v2        -- dot product
-    v1 + v2        -- vector addition
-    v1 - v2        -- vector subtraction
-    v1 * x         -- multiplication by a number
-    v1 / x         -- division by a number
-
-vector3
--------
-
-.. code-block:: Lua
-
-    v = vector3(3, 4, 5)
-    v.x, v.y, v.z  -- 3.0, 4.0, 5.0
-    str(v)         -- "(3.0, 4.0, 4.5)"
-    v:length()     -- length
-    v:length2()    -- square of the length
-    v:normalize()  -- normalized vector
-    v1:dot(v2)     -- dot product (returns a number)
-    v1 * v2        -- dot product (returns a number)
-    v1:cross(v2)   -- cross product (returns a vector)
-    v1 ^ v2        -- cross product (returns a vector)
-    v1 + v2        -- vector addition
-    v1 - v2        -- vector subtraction
-    v1 * x         -- multiplication by a number
-    v1 / x         -- division by a number
-
-openmw.core
-===========
-
-+-----------------------+---------------------+---------------------------------------------------+
-| Field                 | Type                | Description                                       |
-+=======================+=====================+===================================================+
-| OBJECT_TYPE           | Readonly table      | Possible :ref:`object type <Object type>` values  |
-+-----------------------+---------------------+---------------------------------------------------+
-| EQUIPMENT_SLOTS       | Readonly table      | | Contains keys that can be used in               |
-|                       |                     | | `object:getEquipment` and `object:setEquipment`.|
-+-----------------------+---------------------+---------------------------------------------------+
-
-``EQUIPMENT_SLOTS`` contains fields: "Helmet", "Cuirass", "Greaves", "LeftPauldron", "RightPauldron",
-"LeftGauntlet", "RightGauntlet", "Boots", "Shirt", "Pants", "Skirt", "Robe", "LeftRing", "RightRing",
-"Amulet", "Belt", "CarriedRight", "CarriedLeft", "Ammunition".
-
-+---------------------------------------------+--------------------------------------------------+
-| Function                                    | Description                                      |
-+=============================================+==================================================+
-| sendGlobalEvent(eventName, eventData)       | Sends an event to global scripts                 |
-+---------------------------------------------+--------------------------------------------------+
-| getRealTime()                               | | The number of seconds (with floating point)    |
-|                                             | | passed from 00:00 UTC 1 Januar 1970 (unix time)|
-+---------------------------------------------+--------------------------------------------------+
-| getGameTimeInSeconds()                      | | The number of seconds in the game world, passed|
-|                                             | | from starting a new game.                      |
-+---------------------------------------------+--------------------------------------------------+
-| getGameTimeInHours()                        | | Current time of the game world in hours.       |
-|                                             | | Note that the number of game seconds in a game |
-|                                             | | hour is not guaranteed to be fixed.            |
-+---------------------------------------------+--------------------------------------------------+
-
-openmw.async
-============
-
-Timers and coroutine utils.
-All functions require the package itself as a first argument.
-I.e. functions should be called with ``:`` rather than with ``.``.
-
-+-----------------------------------------------------+--------------------------------------------------+
-| Function                                            | Description                                      |
-+=====================================================+==================================================+
-| async:registerTimerCallback(name, func) -> Callback | Registers a function as a timer callback         |
-+-----------------------------------------------------+--------------------------------------------------+
-| async:newTimerInSeconds(delay, Callback, arg)       | | Calls `Callback(arg)` in `delay` seconds.      |
-|                                                     | | `Callback` must be registered in advance.      |
-+-----------------------------------------------------+--------------------------------------------------+
-| async:newTimerInHours(delay, Callback, arg)         | | Calls `Callback(arg)` in `delay` game hours.   |
-|                                                     | | `Callback` must be registered in advance.      |
-+-----------------------------------------------------+--------------------------------------------------+
-| async:newUnsavableTimerInSeconds(delay, func)       | | Call `func()` in `delay` seconds. The timer    |
-|                                                     | | will be lost if the game is saved and loaded.  |
-+-----------------------------------------------------+--------------------------------------------------+
-| async:newUnsavableTimerInHours(delay, func)         | | Call `func()` in `delay` game hours. The timer |
-|                                                     | | will be lost if the game is saved and loaded.  |
-+-----------------------------------------------------+--------------------------------------------------+
-
-openmw.query
-============
-
-**TODO**
-
-openmw.world
-============
-
-Interface to the game world. Can be used only by global scripts.
-
-+-----------------------+---------------------+--------------------------------------------------+
-| Field                 | Type                | Description                                      |
-+=======================+=====================+==================================================+
-| activeActors          | ObjectList_         | List of currently active actors                  |
-+-----------------------+---------------------+--------------------------------------------------+
-
-+---------------------------------------------+--------------------------------------------------+
-| Function                                    | Description                                      |
-+=============================================+==================================================+
-| selectObjects(query) -> ObjectList_         | Evaluates a query                                |
-+---------------------------------------------+--------------------------------------------------+
-
-openmw.nearby
-=============
-
-Can be used only by local scripts.
-Read-only access to the nearest area of the game world.
-
-+-----------------------+---------------------+--------------------------------------------------+
-| Field                 | Type                | Description                                      |
-+=======================+=====================+==================================================+
-| activators            | ObjectList_         | List of nearby activators                        |
-+-----------------------+---------------------+--------------------------------------------------+
-| actors                | ObjectList_         | List of nearby actors                            |
-+-----------------------+---------------------+--------------------------------------------------+
-| containers            | ObjectList_         | List of nearby containers                        |
-+-----------------------+---------------------+--------------------------------------------------+
-| doors                 | ObjectList_         | List of nearby doors                             |
-+-----------------------+---------------------+--------------------------------------------------+
-| items                 | ObjectList_         | Everything that can be picked up in the nearby   |
-+-----------------------+---------------------+--------------------------------------------------+
-
-+---------------------------------------------+--------------------------------------------------+
-| Function                                    | Description                                      |
-+=============================================+==================================================+
-| selectObjects(query) -> ObjectList_         | Evaluates a query                                |
-+---------------------------------------------+--------------------------------------------------+
-
-openmw.self
-===========
-
-Can be used only by local scripts. Full access to the object the script is attached to.
-All fields and function of `Game object`_ are also available for `openmw.self`. For example:
-
-.. code-block:: Lua
-
-    local self = require('openmw.self')
-    if self.type == 'Player' then
-        self:sendEvent("something", self.position)
-    end
-
-Note that `self` is not a Game Object. If you need an actual object, use `self.object`:
-
-.. code-block:: Lua
-
-    if self == someObject then ...  -- Incorrect, this condition is always false
-    core.sendGlobalEvent('something', self)  -- Incorrect, will raise an error
-
-    if self.object == someObject then ... -- Correct
-    core.sendGlobalEvent('something', self.object)  -- Correct
-
-
-+-----------------------+---------------------+--------------------------------------------------+
-| Field                 | Type                | Description                                      |
-+=======================+=====================+==================================================+
-| self.object           | `Game object`_      | The object the script is attached to (readonly)  |
-+-----------------------+---------------------+--------------------------------------------------+
-| self.controls         | `Actor controls`_   | Movement controls (only for actors)              |
-+-----------------------+---------------------+--------------------------------------------------+
-
-+---------------------------------------------+--------------------------------------------------+
-| Function                                    | Description                                      |
-+=============================================+==================================================+
-| self:setDirectControl(bool)                 | Enables or disables direct movement control      |
-+---------------------------------------------+--------------------------------------------------+
-| self:setEquipment(table)                    | | Sets equipment. Keys in the table are equipment|
-|                                             | | slots (see `core.EQUIPMENT_SLOT`). Each value  |
-|                                             | | can be either an object or `recordId`. Raises  |
-|                                             | | an error if the object has no equipment        |
-|                                             | | slots and `table` is not empty.                |
-+---------------------------------------------+--------------------------------------------------+
-| self:getCombatTarget() -> `Game object`_    | Returns current target or nil if not in combat   |
-+---------------------------------------------+--------------------------------------------------+
-| self:stopCombat()                           | Removes all combat packages from the actor       |
-+---------------------------------------------+--------------------------------------------------+
-| self:startCombat(target)                    | Attack `target`                                  |
-+---------------------------------------------+--------------------------------------------------+
-
-
-Actor controls
---------------
-
-Allows to control movements of an actor. Makes an effect only if `setDirectControl(true)` was called.
-All fields are mutable.
-
-+-----------------------+---------------------+--------------------------------------------------+
-| Field                 | Type                | Description                                      |
-+=======================+=====================+==================================================+
-| movement              | float number        | +1 - move forward, -1 - move backward            |
-+-----------------------+---------------------+--------------------------------------------------+
-| sideMovement          | float number        | +1 - move right, -1 - move left                  |
-+-----------------------+---------------------+--------------------------------------------------+
-| turn                  | float number        | turn right (radians); if negative - turn left    |
-+-----------------------+---------------------+--------------------------------------------------+
-| run                   | boolean             | true - run, false - walk                         |
-+-----------------------+---------------------+--------------------------------------------------+
-| jump                  | boolean             | if true - initiate a jump                        |
-+-----------------------+---------------------+--------------------------------------------------+
-
-openmw.ui
-=========
-
-Can be used only by local scripts, that are attached to a player.
-
-+---------------------------------------------+--------------------------------------------------+
-| Function                                    | Description                                      |
-+=============================================+==================================================+
-| showMessage(string)                         | Shows given message at the bottom of the screen. |
-+---------------------------------------------+--------------------------------------------------+
 
-openmw.camera
-=============
+Packages reference
+==================
+
+API packages provide functions that can be called by scripts. I.e. it is a script-to-engine interaction.
+A package can be loaded with ``require('<package name>')``.
+It can not be overloaded even if there is a lua file with the same name.
+The list of available packages is different for global and for local scripts.
+Player scripts are local scripts that are attached to a player.
+
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+| Package                                                 | Can be used        | Description                                                   |
++=========================================================+====================+===============================================================+
+|:ref:`openmw.interfaces <Script interfaces>`             | everywhere         | | Public interfaces of other scripts.                         |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|`openmw.util <../../lua-api-reference/util.html>`_       | everywhere         | | Defines utility functions and classes like 3D vectors,      |
+|                                                         |                    | | that don't depend on the game world.                        |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|`openmw.core <../../lua-api-reference/core.html>`_       | everywhere         | | Functions that are common for both global and local scripts |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|`openmw.async <../../lua-api-reference/async.html>`_     | everywhere         | | Timers (implemented) and coroutine utils (not implemented)  |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|`openmw.query <../../lua-api-reference/query.html>`_     | everywhere         | | Tools for constructing queries: base queries and fields.    |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|`openmw.world <../../lua-api-reference/world.html>`_     | by global scripts  | | Read-write access to the game world.                        |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|`openmw.self <../../lua-api-reference/self.html>`_       | by local scripts   | | Full access to the object the script is attached to.        |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|`openmw.nearby <../../lua-api-reference/nearby.html>`_   | by local scripts   | | Read-only access to the nearest area of the game world.     |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|`openmw.ui <../../lua-api-reference/ui.html>`_           | by player scripts  | | Controls user interface                                     |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|openmw.camera                                            | by player scripts  | | Controls camera (not implemented)                           |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 
-.. warning::
-    Not implemented yet.
diff --git a/docs/source/reference/lua-scripting/overview.rst b/docs/source/reference/lua-scripting/overview.rst
index f941c190a8..635aeef462 100644
--- a/docs/source/reference/lua-scripting/overview.rst
+++ b/docs/source/reference/lua-scripting/overview.rst
@@ -12,8 +12,8 @@ Here are starting points for learning Lua:
 - `Programing in Lua <https://www.lua.org/pil/contents.html>`__ (first edition, aimed at Lua 5.0)
 - `Lua 5.1 Reference Manual <https://www.lua.org/manual/5.1/>`__
 
-Each script works in a separate sandbox and doesn't have any access to operation system.
-Only limited list of allowed standard libraries can be used:
+Each script works in a separate sandbox and doesn't have any access to the underlying operating system.
+Only a limited list of allowed standard libraries can be used:
 `coroutine <https://www.lua.org/manual/5.1/manual.html#5.2>`__,
 `math <https://www.lua.org/manual/5.1/manual.html#5.6>`__,
 `string <https://www.lua.org/manual/5.1/manual.html#5.4>`__,
@@ -21,7 +21,7 @@ Only limited list of allowed standard libraries can be used:
 These libraries are loaded automatically and are always available (except the function `math.randomseed` -- it is called by the engine on startup and not available from scripts).
 
 Allowed `basic functions <https://www.lua.org/manual/5.1/manual.html#5.1>`__:
-``assert``, ``error``, ``ipairs``, ``next``, ``pairs``, ``pcall``, ``print``, ``tonumber``, ``tostring``, ``type``, ``unpack``, ``xpcall``, ``rawequal``, ``rawget``, ``rawset``, ``setmetatable``.
+``assert``, ``error``, ``ipairs``, ``next``, ``pairs``, ``pcall``, ``print``, ``select``, ``tonumber``, ``tostring``, ``type``, ``unpack``, ``xpcall``, ``rawequal``, ``rawget``, ``rawset``, ``getmetatable``, ``setmetatable``.
 
 Loading libraries with ``require('library_name')`` is allowed, but limited. It works this way:
 
@@ -29,7 +29,7 @@ Loading libraries with ``require('library_name')`` is allowed, but limited. It w
 2. If `library_name` is one of the built-in `API packages`_, then return the package.
 3. Otherwise search for a Lua source file with such name in :ref:`data folders <Multiple data folders>`. For example ``require('my_lua_library.something')`` will try to open the file ``my_lua_library/something.lua``.
 
-Loading DLLs and precompiled Lua files is intentionally prohibited for reasons of safety and compatibility between different platforms.
+Loading DLLs and precompiled Lua files is intentionally prohibited for compatibility and security reasons.
 
 Basic concepts
 ==============
@@ -44,21 +44,21 @@ Record
     Don't be confused with MWSE terminology. In MWSE game objects are "references" and records are "objects".
 
 Cell
-    An area of the game world. A position in the world is a link to a cell and coordinates X, Y, Z in the cell. At a specific moment in time each cell can be active or inactive. Inactive cells don't perform physics updates.
+    An area of the game world. A position in the world is a link to a cell and X, Y, Z coordinates in the cell. At a specific moment in time each cell can be active or inactive. Inactive cells don't perform physics updates.
 
 Global scripts
-    Lua scripts that are not attached to any game object and are always active. Global scripts can not be started or stopped during a game session. List of global scripts is defined by `omwscripts` files, that should be :ref:`registered <Lua scripting>` in `openmw.cfg`.
+    Lua scripts that are not attached to any game object and are always active. Global scripts can not be started or stopped during a game session. Lists of global scripts are defined by `omwscripts` files, which should be :ref:`registered <Lua scripting>` in `openmw.cfg`.
 
 Local scripts
-    Lua scripts that are attached to some game object. A local script is active only if the object it is attached to is in an active cell. There are no limitations to the number of local scripts on one object. Local scripts can be attached to (or detached from) any object at any moment by a global script.
+    Lua scripts that are attached to some game object. A local script is active only if the object it is attached to is in an active cell. There are no limitations to the number of local scripts on one object. Local scripts can be attached to (or detached from) any object at any moment by a global script. In some cases inactive local scripts still can run code (for example during saving and loading), but while inactive they can not see nearby objects.
 
 Player scripts
-    It is a specific case of local scripts. *Player script* is a local script that is attached to a player. It can do everything that a normal local script can do, plus some player-specific functionality (e.g. control UI and camera).
+    A specific kind of local scripts; *player script* is a local script that is attached to a player. It can do everything that a normal local script can do, plus some player-specific functionality (e.g. control UI and camera).
 
-Scripting API was developed to be conceptually compatible with `multiplayer <https://github.com/TES3MP/openmw-tes3mp>`__. In multiplayer the server is lightweight and delegates most of the work to clients. Each client processes some part of the game world. Global scripts are server-side and local scripts are client-side. It leads to several rules of Lua scripting API:
+This scripting API was developed to be conceptually compatible with `multiplayer <https://github.com/TES3MP/openmw-tes3mp>`__. In multiplayer the server is lightweight and delegates most of the work to clients. Each client processes some part of the game world. Global scripts are server-side and local scripts are client-side. Because of this, there are several rules for the Lua scripting API:
 
 1. A local script can see only some area of the game world (cells that are active on a specific client). Any data from inactive cells can't be used, as they are not synchronized and could be already changed on another client.
-2. A local script can modify only the object it is attached to. Other objects can theoretically be processed by another client. To prevent synchronization problems the access to them is read only.
+2. A local script can only modify the object it is attached to. Other objects can theoretically be processed by another client. To prevent synchronization problems the access to them is read-only.
 3. Global scripts can access and modify the whole game world including unloaded areas, but the global scripts API is different from the local scripts API and in some aspects limited, because it is not always possible to have all game assets in memory at the same time.
 4. Though the scripting system doesn't actually work with multiplayer yet, the API assumes that there can be several players. That's why any command related to UI, camera, and everything else that is player-specific can be used only by player scripts.
 
@@ -76,8 +76,8 @@ Let's write a simple example of a `Player script`:
 
     return {
         engineHandlers = {
-            onKeyPress = function(code, modifiers)
-                if code == string.byte('x') then
+            onKeyPress = function(key)
+                if key.symbol == 'x' then
                     ui.showMessage('You have pressed "X"')
                 end
             end
@@ -117,14 +117,14 @@ Now every time the player presses "X" on a keyboard, a message is shown.
 Hot reloading
 =============
 
-It is possible to modify a script without restarting OpenMW. To apply changes open in-game console and run the command ``reloadlua``.
-It will restart all Lua scripts using `onSave and onLoad`_ handlers the same way as if the game was saved and loaded.
+It is possible to modify a script without restarting OpenMW. To apply changes, open the in-game console and run the command: ``reloadlua``.
+This will restart all Lua scripts using the `onSave and onLoad`_ handlers the same way as if the game was saved or loaded.
 It works only with existing ``*.lua`` files that are not packed to any archives. Adding new scripts or modifying ``*.omwscripts`` files always requires restarting the game.
 
 Script structure
 ================
 
-Each script is a separate file in game assets.
+Each script is a separate file in the game assets.
 `Starting a script` means that the engine runs the file, parses the table it returns, and registers its interface, event handlers, and engine handlers. The handlers are permanent and exist until the script is stopped (if it is a local script, because global scripts can not be stopped).
 
 Here is an example of a basic script structure:
@@ -155,7 +155,7 @@ Here is an example of a basic script structure:
     end
 
     return {
-        name = 'MyScriptInterface',
+        interfaceName = 'MyScriptInterface',
         interface = {
             somePublicFunction = somePublicFunction,
         },
@@ -192,7 +192,7 @@ Engine handlers
 ===============
 
 An engine handler is a function defined by a script, that can be called by the engine. I.e. it is an engine-to-script interaction.
-Not visible for other scripts. If several scripts register an engine handler with the same name,
+Not visible to other scripts. If several scripts register an engine handler with the same name,
 the engine calls all of them in the same order as the scripts were started.
 
 Some engine handlers are allowed only for global, or only for local/player scripts. Some are universal.
@@ -202,17 +202,61 @@ See :ref:`Engine handlers reference`.
 onSave and onLoad
 =================
 
-When game is saved or loaded, the engine calls engine handlers `onSave` or `onLoad` for every script.
+When a game is saved or loaded, the engine calls the engine handlers `onSave` or `onLoad` for every script.
 The value that `onSave` returns will be passed to `onLoad` when the game is loaded.
-It is the only way to save internal state of a script. All other script vatiables will be lost after closing the game.
+It is the only way to save the internal state of a script. All other script variables will be lost after closing the game.
 The saved state must be :ref:`serializable <Serializable data>`.
 
-`onSave` and `onLoad` are special:
+The list of active global scripts is controlled by ``*.omwscripts`` files. Loading a save doesn't synchronize
+the list of global scripts with those that were active previously, it only calls `onLoad` for those currently active.
 
-- Unlike all other engine handlers it is called even for objects in inactive cells.
-- During saving and loading the environment may be not fully initialized, so these handlers shouldn't use any API calls.
+For local scripts the situation is different. When a save is loading, it tries to run all local scripts that were saved.
+So if ``lua-scripts=`` entries of some mod are removed, but ``data=`` entries are still enabled, then local scripts from the mod may still run.
 
-TODO: example, explain how global scripts are loading
+`onSave` and `onLoad` can be called even for objects in inactive state, so it shouldn't use `openmw.nearby`.
+
+An example:
+
+.. code-block:: Lua
+
+    ...
+
+    local scriptVersion = 3  -- increase it every time when `onSave` is changed
+
+    local function onSave()
+        return {
+            version = scriptVersion
+            some = someVariable,
+            someOther = someOtherVariable
+        }
+    end
+
+    local function onLoad(data)
+        if not data or not data.version or data.version < 2 then
+            print('Was saved with an old version of the script, initializing to default')
+            someVariable = 'some value'
+            someOtherVariable = 42
+            return
+        end
+        if data.version > scriptVersion then
+            error('Required update to a new version of the script')
+        end
+        someVariable = data.some
+        if data.version == scriptVersion then
+            someOtherVariable = data.someOther
+        else
+            print(string.format('Updating from version %d to %d', data.version, scriptVersion))
+            someOtherVariable = 42
+        end
+    end
+
+    return {
+        engineHandlers = {
+            onUpdate = update,
+            onSave = onSave,
+            onLoad = onLoad,
+        }
+    }
 
 Serializable data
 -----------------
@@ -225,7 +269,7 @@ Serializable value is one of:
 - a number
 - a string
 - a game object
-- a value of a type, defined by :ref:`openmw.util`
+- a value of a type, defined by :ref:`openmw.util <Package openmw.util>`
 - a table whith serializable keys and values
 
 Serializable data can not contain:
@@ -244,70 +288,277 @@ It can not be overloaded even if there is a lua file with the same name.
 The list of available packages is different for global and for local scripts.
 Player scripts are local scripts that are attached to a player.
 
-+----------------------+--------------------+---------------------------------------------------------------+
-| Package              | Can be used        | Description                                                   |
-+======================+====================+===============================================================+
-|:ref:`openmw.util`    | everywhere         | | Defines utility functions and classes like 3D vectors,      |
-|                      |                    | | that don't depend on the game world.                        |
-+----------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.core`    | everywhere         | | Functions that are common for both global and local scripts |
-+----------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.async`   | everywhere         | | Timers (implemented) and coroutine utils (not implemented)  |
-+----------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.query`   | everywhere         | | Tools for constructing queries: base queries and fields.    |
-+----------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.world`   | by global scripts  | | Read-write access to the game world.                        |
-+----------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.self`    | by local scripts   | | Full access to the object the script is attached to.        |
-+----------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.nearby`  | by local scripts   | | Read-only access to the nearest area of the game world.     |
-+----------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.ui`      | by player scripts  | | Controls user interface                                     |
-+----------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.camera`  | by player scripts  | | Controls camera (not implemented)                           |
-+----------------------+--------------------+---------------------------------------------------------------+
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+| Package                                                 | Can be used        | Description                                                   |
++=========================================================+====================+===============================================================+
+|:ref:`openmw.interfaces <Script interfaces>`             | everywhere         | | Public interfaces of other scripts.                         |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.util <Package openmw.util>`                 | everywhere         | | Defines utility functions and classes like 3D vectors,      |
+|                                                         |                    | | that don't depend on the game world.                        |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.core <Package openmw.core>`                 | everywhere         | | Functions that are common for both global and local scripts |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.async <Package openmw.async>`               | everywhere         | | Timers (implemented) and coroutine utils (not implemented)  |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.query <Package openmw.query>`               | everywhere         | | Tools for constructing queries: base queries and fields.    |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.world <Package openmw.world>`               | by global scripts  | | Read-write access to the game world.                        |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.self <Package openmw.self>`                 | by local scripts   | | Full access to the object the script is attached to.        |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.nearby <Package openmw.nearby>`             | by local scripts   | | Read-only access to the nearest area of the game world.     |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.ui <Package openmw.ui>`                     | by player scripts  | | Controls user interface                                     |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|openmw.camera                                            | by player scripts  | | Controls camera (not implemented)                           |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+
+openmw_aux
+----------
+
+``openmw_aux.*`` are built-in libraries that are themselves implemented in Lua. They can not do anything that is not possible with the basic API, they only make it more convenient.
+Sources can be found in ``resources/vfs/openmw_aux``. In theory mods can override them, but it is not recommended.
+
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+| Built-in library                                        | Can be used        | Description                                                   |
++=========================================================+====================+===============================================================+
+|:ref:`openmw_aux.util <Package openmw_aux.util>`         | everywhere         | | Miscellaneous utils                                         |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+
+They can be loaded with ``require`` the same as API packages. For example:
+
+.. code-block:: Lua
+
+    local aux_util = require('openmw_aux.util')
+    aux_util.runEveryNSeconds(15, doSomething)  -- run `doSomething()` every 15 seconds
 
 
 Script interfaces
 =================
 
-.. warning::
-    Not implemented yet.
-
 Each script can provide a named interface for other scripts.
 It is a script-to-script interaction. This mechanism is not used by the engine itself.
 
-A script can use an interface of another script only if either both a global scripts, or both are local scripts on the same object.
+A script can use an interface of another script either if both are global scripts, or both are local scripts on the same object.
 In other cases events should be used.
 
-TODO: example, overloading
+Defining an interface:
+
+.. code-block:: Lua
+
+    return {
+        interfaceName = "SomeUtils"
+        interface = {
+            version = 1,
+            doSomething = function(x, y) ... end,
+        }
+    }
+
+Overriding the interface and adding a debug output:
+
+.. code-block:: Lua
+
+    local interfaces = require('openmw.interfaces')
+
+    -- it is important to save it before returning the new interface
+    local orig = interfaces.SomeUtils
+
+    return {
+        interfaceName = "SomeUtils"
+        interface = {
+            version = orig.version,
+            doSomething = function(x, y)
+                print(string.format('SomeUtils.doSomething(%d, %d)', x, y))
+                orig.doSomething(x, y)  -- calls the original `doSomething`
+
+                -- WRONG! Would lead to an infinite recursion.
+                -- interfaces.SomeUtils.doSomething(x, y)
+            end,
+        }
+    }
+
+A general recomendation about overriding is that the new interface should be fully compatible with the old one.
+So it is fine to change the behaviour of `SomeUtils.doSomething`, but if you want to add a completely new function, it would be
+better to create a new interface for it. For example `SomeUtilsExtended` with an additional function `doSomethingElse`.
+
+Using the interface:
+
+.. code-block:: Lua
+
+    local interfaces = require('openmw.interfaces')
+
+    local function onUpdate()
+        interfaces.SomeUtils.doSomething(2, 3)
+    end
+
+    return { engineHandlers = {onUpdate = onUpdate} }
+
+The order in which the scripts are started is important. So if one mod should override an interface provided by another mod, make sure that load order (i.e. the sequence of `lua-scripts=...` in `openmw.cfg`) is correct.
 
 
 Event system
 ============
 
-It is another way of script-to-script interactions. The differences:
+This is another kind of script-to-script interactions. The differences:
 
 - Any script can send an event to any object or a global event to global scripts.
-- Events are always delivered with a delay.
-- Event handlers can not return any data to a sender.
+- Events are delivered with a small delay (in single player the delay is always one frame).
+- Event handlers can not return any data to the sender.
 - Event handlers have a single argument `eventData` (must be :ref:`serializable <Serializable data>`)
 
-Events are the main way of interactions between local and global scripts.
-It is not recommended to use for interactions between two global scripts, because in this case interfaces are more convenient.
+Events are the main way of interacting between local and global scripts.
+They are not recommended for interactions between two global scripts, because in this case interfaces are more convenient.
 
-If several scripts register handlers for the same event, it will be called in the reversed order (opposite to engine handlers).
-I.e. handler from the last attached script will be called first.
-Return value 'false' in a handler means "skip all other handlers for this event".
+If several scripts register handlers for the same event, the handlers will be called in reverse order (opposite to engine handlers).
+I.e. the handler from the last attached script will be called first.
+Return value 'false' means "skip all other handlers for this event".
 Any other return value (including nil) means nothing.
 
-TODO: example
+An example. Imagine we are working on a mod that adds some "dark power" with special effects.
+We attach a local script to an item that can explode.
+At some moment it will send the 'DamagedByDarkPower' event to all nearby actors:
+
+.. code-block:: Lua
+
+    local self = require('openmw.self')
+    local nearby = require('openmw.nearby')
+
+    local function onActivate()
+        for i, actor in nearby.actors:ipairs() do
+            local dist = (self.position - actor.position):length()
+            if dist < 500 then
+                local damage = (1 - dist / 500) * 200
+                actor:sendEvent('DamagedByDarkPower', {source=self.object, damage=damage})
+            end
+        end
+    end
+
+    return { engineHandlers = { ... } }
+
+And every actor should have a local script that processes this event:
+
+.. code-block:: Lua
+
+    local function damagedByDarkPower(data)
+        ...  -- apply `data.damage` to stats / run custom animation / etc
+    end
+
+    return {
+        eventHandlers = { DamagedByDarkPower = damagedByDarkPower },
+    }
+
+Someone may create an additional mod that adds a protection from the dark power.
+The protection mod attaches an additional local script to every actor. The script intercepts and modifies the event:
+
+.. code-block:: Lua
+
+    local protectionLevel = ...
+
+    local function reduceDarkDamage(data)
+        data.damage = data.damage - protectionLevel  -- reduce the damage
+        return data.damage > 0  -- it skips the original handler if the damage becomes <= 0
+    end
+
+    return {
+        eventHandlers = { DamagedByDarkPower = reduceDarkDamage },
+    }
+
+In order to be able to intercept the event, the protection script should be attached after the original script (i.e. below in the load order).
 
 
 Timers
 ======
 
-**TODO**
+Timers are in the :ref:`openmw.async <Package openmw.async>` package.
+They can be set either in game seconds or in game hours.
+
+- `Game seconds`: the number of seconds in the game world (i.e. seconds when the game is not paused), passed from starting a new game.
+- `Game hours`: current time of the game world in hours. The number of seconds in a game hour is not guaranteed to be fixed.
+
+When the game is paused, all timers are paused as well.
+
+When an object becomes inactive, timers on this object are not paused, but callbacks are called only when the object becomes active again.
+For example if there were 3 timers with delays 30, 50, 90 seconds, and from the 15-th to the 65-th second the object was inactive, then the first two callbacks are both evaluated on the 65-th second and the third one -- on the 90-th second.
+
+There are two types: *reliable* and *unsavable* timers.
+
+Reliable timer
+--------------
+
+Reliable timers are automatically saved and restored when the game is saved or loaded.
+When the game is saved each timer record contains only name of a callback, the time when the callback should be called, and an argument that should be passed to the callback.
+The callback itself is not stored. That's why callbacks must be registered when the script is initialized with a function ``async:registerTimerCallback(name, func)``.
+`Name` is an arbitrary string.
+
+An example:
+
+.. code-block:: Lua
+
+    local async = require('openmw.async')
+
+    local teleportWithDelayCallback = async:registerTimerCallback('teleport',
+    function(data)
+        data.actor:teleport(data.destCellName, data.destPos)
+    end)
+
+    local function teleportWithDelay(delay, actor, cellName, pos)
+        async:newTimerInSeconds(delay, teleportWithDelayCallback, {
+            actor = actor,
+            destCellName = cellName,
+            destPos = pos,
+        })
+    end
+
+Unsavable timer
+---------------
+
+Unsavable timers can be created from any function without registering a callback in advance, but they can not be saved.
+If the player saves the game when an unsavable timer is running, then the timer will be lost after reloading.
+So be careful with unsavable timers and don't use them if there is a risk of leaving the game world in an inconsistent state.
+
+An example:
+
+.. code-block:: Lua
+
+    local async = require('openmw.async')
+    local ui = require('openmw.ui')
+
+    return {
+        engineHandlers = {
+            onKeyPress = function(key)
+                if key.symbol == 'x' then
+                    async:newUnsavableTimerInSeconds(
+                        10,
+                        function()
+                            ui.showMessage('You have pressed "X" 10 seconds ago')
+                        end)
+                end
+            end,
+        }
+    }
+
+Also in `openmw_aux`_ are the helper functions ``runEveryNSeconds`` and ``runEveryNHours``, they are implemented on top of unsavable timers:
+
+.. code-block:: Lua
+
+    local async = require('openmw.async')
+    local core = require('openmw.core')
+
+    -- call `doSomething()` at the end of every game day.
+    -- `timeBeforeMidnight` is a delay before the first call. `24` is an interval.
+    -- the periodical evaluation can be stopped at any moment by calling `stopFn()`
+    local timeBeforeMidnight = 24 - math.fmod(core.getGameTimeInHours(), 24)
+    local stopFn = aux_util.runEveryNHours(24, doSomething, timeBeforeMidnight)
+
+    return {
+        engineHandlers = {
+            onLoad = function()
+                -- the timer is unsavable, so we need to restart it in `onLoad`.
+                timeBeforeMidnight = 24 - math.fmod(core.getGameTimeInHours(), 24)
+                stopFn = aux_util.runEveryNHours(24, doSomething, timeBeforeMidnight)
+            end,
+        }
+    }
 
 
 Queries
@@ -318,7 +569,7 @@ Queries
 `openmw.world.selectObjects` and `openmw.nearby.selectObjects` both accept a query and return objects that match it. However, `nearby.selectObjects` is only available in local scripts, and returns only objects from currently active cells, while `world.selectObjects` is only available in global scripts, and returns objects regardless of them being in active cells.
 **TODO:** describe how to filter out inactive objects from world queries
 
-A minimal example of an object query:
+An example of an object query:
 
 .. code-block:: Lua
 
@@ -326,10 +577,8 @@ A minimal example of an object query:
     local nearby = require('openmw.nearby')
     local ui = require('openmw.ui')
 
-    local doorQuery = query.doors:orderBy(query.DOOR.destPosition.x)
-
     local function selectDoors(namePattern)
-        local query = doorQuery:where(query.DOOR.destCell:like(namePattern))
+        local query = query.doors:where(query.DOOR.destCell.name:like(namePattern))
         return nearby.selectObjects(query)
     end
 
@@ -344,8 +593,8 @@ A minimal example of an object query:
 
     return {
         engineHandlers = {
-            onKeyPress = function(code, modifiers)
-                if code == string.byte('e') then
+            onKeyPress = function(key)
+                if key.symbol == 'e' then
                     showGuildDoors()
                 end
             end
@@ -360,10 +609,10 @@ A minimal example of an object query:
 Queries are constructed through the following method calls: (if you've used SQL before, you will find them familiar)
 
 - `:where(filter)` - filters the results to match the combination of conditions passed as the argument
-- `:orderBy(field)` and `:orderByDesc(field)` sort the result by the `field` argument. Sorts in descending order in case of `:orderByDesc`. Multiple calls can be chained, with the first call having priority. (i. e. if the first field is equal, objects are sorted by the second one...)
-- `:groupBy(field)` returns only one result for each value of the `field` argument. The choice of the result is arbitrary. Useful for counting only unique objects, or checking if certain objects exist.
+- `:orderBy(field)` and `:orderByDesc(field)` sort the result by the `field` argument. Sorts in descending order in case of `:orderByDesc`. Multiple calls can be chained, with the first call having priority. (i. e. if the first field is equal, objects are sorted by the second one...) **(not implemented yet)**
+- `:groupBy(field)` returns only one result for each value of the `field` argument. The choice of the result is arbitrary. Useful for counting only unique objects, or checking if certain objects exist. **(not implemented yet)**
 - `:limit(number)` will only return `number` of results (or fewer)
-- `:offset(number)` skips the first `number` results. Particularly useful in combination with `:limit`
+- `:offset(number)` skips the first `number` results. Particularly useful in combination with `:limit` **(not implemented yet)**
 
 Filters consist of conditions, which are combined with "and" (operator `*`), "or" (operator `+`), "not" (operator `-`) and braces `()`.
 
@@ -375,7 +624,7 @@ To make a condition, take a field from the `openmw.query` package and call any o
 - `:gte` greater or equal to
 - `:lt` less than
 - `:lte` less or equal to
-- `:like` matches a pattern. Only applicable to text (strings)
+- `:like` matches a pattern. Only applicable to text (strings) **(not implemented yet)**
 
 **TODO:** describe the pattern format
 
@@ -401,12 +650,61 @@ A few examples of filters:
 
     local DOOR = query.DOOR
 
-    local interestingDoors = -DOOR.name:eq("") * DOOR.isTeleport:eq(true) * Door.destCell:neq("")
+    local interestingDoors = -DOOR.name:eq("") * DOOR.isTeleport:eq(true) * Door.destCell.isExterior:eq(false)
 
 
 Using IDE for Lua scripting
 ===========================
 
-.. warning::
-    This section is not written yet. Later it will explain how to setup Lua Development Tools (eclipse-based IDE) with code autocompletion and integrated OpenMW API reference.
+Find the directory ``resources/lua_api`` in your installation of OpenMW.
+It describes OpenMW LuaAPI in
+`LDT Documentation Language <https://wiki.eclipse.org/LDT/User_Area/Documentation_Language>`__.
+It is the source from which the :ref:`API reference <Lua API reference>` is generated.
+
+If you write scripts using `Lua Development Tools <https://www.eclipse.org/ldt/>`__ (eclipse-based IDE),
+you can import these files to get code autocompletion and integrated OpenMW API reference. Here are the steps:
+
+- Install and run `LDT <https://www.eclipse.org/ldt/#installation>`__.
+- Press `File` / `New` / `Lua Project` in menu.
+
+.. image:: https://gitlab.com/OpenMW/openmw-docs/raw/master/docs/source/reference/lua-scripting/_static/lua-ide-create-project.png
+
+- Specify project name (for example the title of your omwaddon)
+- Set `Targeted Execution Environment` to `No Execution Environment`, and `Target Grammar` to `lua-5.1`.
+
+.. image:: https://gitlab.com/OpenMW/openmw-docs/raw/master/docs/source/reference/lua-scripting/_static/lua-ide-project-settings.png
+
+- Press `Next`, choose the `Libraries` tab, and click `Add External Source Folder`.
+- Specify there the path to ``resources/lua_api`` in your OpenMW installation.
+- If you use `openmw_aux`_, add ``resources/vfs`` as an additional external source folder.
+
+.. image:: https://gitlab.com/OpenMW/openmw-docs/raw/master/docs/source/reference/lua-scripting/_static/lua-ide-import-api.png
+
+- Press `Finish`. Create a new Lua file.
+- Now you have code completion! Press ``Ctrl+Space`` in any place to see the variants.
+
+.. image:: https://gitlab.com/OpenMW/openmw-docs/raw/master/docs/source/reference/lua-scripting/_static/lua-ide-code-completion1.png
+
+In some cases LDT can deduce types automatically, but it is not always possible.
+You can add special hints to give LDT more information:
+
+- Before function definition: ``--- @param TYPE argName``
+- Before variable definition: ``--- @field TYPE variableName``
+
+.. code-block:: Lua
+
+    --- @param openmw.core#GameObject obj
+    local function doSomething(obj)
+        -- autocompletion now works with `obj`
+    end
+
+    --- @field openmw.util#Vector3 c
+    local c
+
+    -- autocompletion now works with `c`
+
+.. image:: https://gitlab.com/OpenMW/openmw-docs/raw/master/docs/source/reference/lua-scripting/_static/lua-ide-code-completion2.png
+
+See `LDT Documentation Language <https://wiki.eclipse.org/LDT/User_Area/Documentation_Language>`__ for more details.
+
 
diff --git a/files/CMakeLists.txt b/files/CMakeLists.txt
index 7e1e9059bd..cea33f0f40 100644
--- a/files/CMakeLists.txt
+++ b/files/CMakeLists.txt
@@ -2,3 +2,4 @@ add_subdirectory(mygui)
 add_subdirectory(shaders)
 add_subdirectory(vfs)
 add_subdirectory(builtin_scripts)
+add_subdirectory(lua_api)
diff --git a/files/lua_api/CMakeLists.txt b/files/lua_api/CMakeLists.txt
new file mode 100644
index 0000000000..8c5b46e8db
--- /dev/null
+++ b/files/lua_api/CMakeLists.txt
@@ -0,0 +1,21 @@
+set(LUA_API_FILES
+    README.md
+    coroutine.doclua
+    global.doclua
+    math.doclua
+    string.doclua
+    table.doclua
+    openmw/async.lua
+    openmw/core.lua
+    openmw/nearby.lua
+    openmw/query.lua
+    openmw/self.lua
+    openmw/ui.lua
+    openmw/util.lua
+    openmw/world.lua
+)
+
+foreach (f ${LUA_API_FILES})
+    copy_resource_file("${CMAKE_CURRENT_SOURCE_DIR}/${f}" "${OpenMW_BINARY_DIR}" "resources/lua_api/${f}")
+endforeach (f)
+
diff --git a/files/lua_api/README.md b/files/lua_api/README.md
new file mode 100644
index 0000000000..72f819734c
--- /dev/null
+++ b/files/lua_api/README.md
@@ -0,0 +1,13 @@
+Files in this directory describe OpenMW API for [Lua Development Tools](https://www.eclipse.org/ldt/) (LDT).
+
+`*.doclua` files are taken (with some modifications) from LDT distribution and are distributed under `MIT` license.
+Openmw-specific docs (`openmw/*.lua`) are under `GPLv3` license.
+
+To get a Lua IDE with integrated OpenMW documentation and code autocompletion do the following:
+
+1. Install and run [LDT](https://www.eclipse.org/ldt/#installation).
+2. Press `File` / `New` / `Lua Project` in menu.
+3. Specify project name (for example the title of your omwaddon)
+4. Set `Targeted Execution Environment` to `No Execution Environment`, and `Target Grammar` to `lua-5.1`.
+5. Press `Next`, choose the `Libraries` tab, and click `Add External Source Folder`. Then specify there the path to this directory.
+6. Press `Finish`.
diff --git a/files/lua_api/coroutine.doclua b/files/lua_api/coroutine.doclua
new file mode 100644
index 0000000000..3bd0358ea4
--- /dev/null
+++ b/files/lua_api/coroutine.doclua
@@ -0,0 +1,71 @@
+-------------------------------------------------------------------------------
+-- Coroutine Manipulation.
+-- The operations related to coroutines comprise a sub-library of the basic library 
+-- and come inside the table coroutine.
+-- See http://www.lua.org/manual/5.1/manual.html#2.11 for a general description of coroutines.
+-- @module coroutine
+
+
+
+-------------------------------------------------------------------------------
+-- Creates a new coroutine, with body `f`. `f` must be a Lua
+-- function. Returns this new coroutine, an object with type `"thread"`.
+-- @function [parent=#coroutine] create
+-- @param f a function used as coroutine body.  
+-- @return #thread a new coroutine.
+
+-------------------------------------------------------------------------------
+-- Starts or continues the execution of coroutine `co`. The first time
+-- you resume a coroutine, it starts running its body. The values `val1`,
+-- ... are passed as the arguments to the body function. If the coroutine
+-- has yielded, `resume` restarts it; the values `val1`, ... are passed
+-- as the results from the yield.
+-- 
+-- If the coroutine runs without any errors, `resume` returns true plus any
+-- values passed to `yield` (if the coroutine yields) or any values returned
+-- by the body function (if the coroutine terminates). If there is any error,
+-- `resume` returns false plus the error message.
+-- @function [parent=#coroutine] resume
+-- @param #thread co coroutine to start or resume.
+-- @param ... arguments passed to the body function or as result of yield call.
+-- @return #boolean true plus any values passed to `yield` (if the coroutine yields) or any values returned
+-- by the body function (if the coroutine terminates)
+-- @return #boolean false plus an error message.
+
+-------------------------------------------------------------------------------
+-- Returns the running coroutine, or nil when called by the main thread.
+-- @function [parent=#coroutine] running
+-- @return #thread the running coroutine, or nil when called by the main thread.
+
+-------------------------------------------------------------------------------
+-- Returns the status of coroutine `co`, as a string: `"running"`, if
+-- the coroutine is running (that is, it called `status`); `"suspended"`, if
+-- the coroutine is suspended in a call to `yield`, or if it has not started
+-- running yet; `"normal"` if the coroutine is active but not running (that
+-- is, it has resumed another coroutine); and `"dead"` if the coroutine has
+-- finished its body function, or if it has stopped with an error.
+-- @function [parent=#coroutine] status
+-- @param #thread co a coroutine
+-- @return #string the status : `"running"`, `"suspended"`, `"normal"` or `"dead"`.
+
+-------------------------------------------------------------------------------
+-- Creates a new coroutine, with body `f`. `f` must be a Lua
+-- function. Returns a function that resumes the coroutine each time it is
+-- called. Any arguments passed to the function behave as the extra arguments to
+-- `resume`. Returns the same values returned by `resume`, except the first
+-- boolean. In case of error, propagates the error.
+-- @function [parent=#coroutine] wrap
+-- @param f a function used as coroutine body. 
+-- @param ... arguments passed to the body function or as result of yield call.
+-- @return Any values passed to `yield` (if the coroutine yields) or any values returned
+-- by the body function (if the coroutine terminates).
+
+-------------------------------------------------------------------------------
+-- Suspends the execution of the calling coroutine. The coroutine cannot
+-- be running a C function, a metamethod, or an iterator. Any arguments to
+-- `yield` are passed as extra results to `resume`.
+-- @function [parent=#coroutine] yield
+-- @param ... arguments passed as extra results to `resume` function.
+-- @return Any values passed to the `resume` function.
+
+return nil
diff --git a/files/lua_api/global.doclua b/files/lua_api/global.doclua
new file mode 100644
index 0000000000..04f917980f
--- /dev/null
+++ b/files/lua_api/global.doclua
@@ -0,0 +1,269 @@
+-------------------------------------------------------------------------------
+-- Lua global variables.
+-- The basic library provides some core functions to Lua.
+-- All the preloaded module of Lua are declared here.
+-- @module global
+
+------------------------------------------------------------------------------
+-- This library provides generic functions for coroutine manipulation.
+-- This is a global variable which hold the preloaded @{coroutine} module.
+-- @field[parent = #global] coroutine#coroutine coroutine preloaded module
+
+------------------------------------------------------------------------------
+-- This library provides generic functions for string manipulation.
+-- This is a global variable which hold the preloaded @{string} module.
+-- @field[parent = #global] string#string string preloaded module
+
+------------------------------------------------------------------------------
+-- This library provides generic functions for table manipulation.
+-- This is a global variable which hold the preloaded @{table} module.
+-- @field[parent = #global] table#table table preloaded module
+
+------------------------------------------------------------------------------
+-- This library is an interface to the standard C math library.
+-- This is a global variable which hold the preloaded @{math} module.
+-- @field[parent = #global] math#math math preloaded module
+
+------------------------------------------------------------------------------
+-- This library is an interface to the standard C math library.
+-- This is a global variable which hold the preloaded @{omwutil} module.
+-- @field[parent = #global] omwutil#omwutil ou preloaded module
+
+-------------------------------------------------------------------------------
+-- Issues an error when the value of its argument `v` is false (i.e.,
+-- **nil** or **false**); otherwise, returns all its arguments. `message` is an error
+-- message; when absent, it defaults to *"assertion failed!"*.
+-- @function [parent=#global] assert
+-- @param v if this argument is false an error is issued.
+-- @param #string message an error message. defaults value is *"assertion failed"*.
+-- @return All its arguments.
+
+-------------------------------------------------------------------------------
+-- Terminates the last protected function called and returns `message`
+-- as the error message. Function `error` never returns.
+--
+-- Usually, `error` adds some information about the error position at the
+-- beginning of the message. The `level` argument specifies how to get the
+-- error position.  
+-- With level 1 (the default), the error position is where the
+-- `error` function was called.  
+-- Level 2 points the error to where the function
+-- that called `error` was called; and so on.  
+-- Passing a level 0 avoids the addition of error position information to the message.
+-- @function [parent=#global] error
+-- @param #string message an error message.
+-- @param #number level specifies how to get the error position, default value is `1`.
+
+-------------------------------------------------------------------------------
+-- If `object` does not have a metatable, returns nil. Otherwise, if the
+-- object's metatable has a `"__metatable"` field, returns the associated
+-- value. Otherwise, returns the metatable of the given object.
+-- @function [parent=#global] getmetatable
+-- @param object
+-- @return #table the metatable of object.
+
+-------------------------------------------------------------------------------
+-- Use to iterate over a table by index.
+-- Returns three values: an iterator function, the table `t`, and 0,
+-- so that the construction :
+-- 
+--     for i,v in ipairs(t) do *body* end
+-- will iterate over the pairs (`1,t[1]`), (`2,t[2]`), ..., up to the
+-- first integer key absent from the table.
+-- @function [parent=#global] ipairs
+-- @param #table t a table by index.
+
+-------------------------------------------------------------------------------
+-- Allows a program to traverse all fields of a table. Its first argument is
+-- a table and its second argument is an index in this table. `next` returns
+-- the next index of the table and its associated value.
+--
+-- When called with nil
+-- as its second argument, `next` returns an initial index and its associated
+-- value. When called with the last index, or with nil in an empty table, `next`
+-- returns nil.
+--
+-- If the second argument is absent, then it is interpreted as
+-- nil. In particular, you can use `next(t)` to check whether a table is empty.
+-- The order in which the indices are enumerated is not specified, *even for
+-- numeric indices*. (To traverse a table in numeric order, use a numerical
+-- for or the `ipairs` function.)
+--
+-- The behavior of `next` is *undefined* if, during the traversal, you assign
+-- any value to a non-existent field in the table. You may however modify
+-- existing fields. In particular, you may clear existing fields.
+-- @function [parent=#global] next
+-- @param #table table table to traverse.
+-- @param index initial index.
+
+-------------------------------------------------------------------------------
+-- Use to iterate over a table.
+-- Returns three values: the `next` function, the table `t`, and nil,
+-- so that the construction :
+-- 
+--     for k,v in pairs(t) do *body* end
+-- will iterate over all key-value pairs of table `t`.
+-- 
+-- See function `next` for the caveats of modifying the table during its
+-- traversal.
+-- @function [parent=#global] pairs
+-- @param #table t table to traverse.
+
+-------------------------------------------------------------------------------
+-- Calls function `f` with the given arguments in *protected mode*. This
+-- means that any error inside `f` is not propagated; instead, `pcall` catches
+-- the error and returns a status code. Its first result is the status code (a
+-- boolean), which is true if the call succeeds without errors. In such case,
+-- `pcall` also returns all results from the call, after this first result. In
+-- case of any error, `pcall` returns false plus the error message.
+-- @function [parent=#global] pcall
+-- @param f function to be call in *protected mode*.
+-- @param ... function arguments.
+-- @return #boolean true plus the result of `f` function if its call succeeds without errors.
+-- @return #boolean,#string  false plus the error message in case of any error.
+
+-------------------------------------------------------------------------------
+-- Receives any number of arguments, and prints their values to OpenMW log,
+-- using the `tostring` function to convert them to strings. `print` is not
+-- intended for formatted output, but only as a quick way to show a value,
+-- typically for debugging. For formatted output, use `string.format`.
+-- 
+-- @function [parent=#global] print
+-- @param ... values to print to `stdout`.
+
+-------------------------------------------------------------------------------
+-- Checks whether `v1` is equal to `v2`, without invoking any
+-- metamethod. Returns a boolean.
+-- @function [parent=#global] rawequal
+-- @param v1
+-- @param v2
+-- @return #boolean true if `v1` is equal to `v2`. 
+
+-------------------------------------------------------------------------------
+-- Gets the real value of `table[index]`, without invoking any
+-- metamethod. `table` must be a table; `index` may be any value.
+-- @function [parent=#global] rawget
+-- @param #table table
+-- @param index may be any value.
+-- @return The real value of `table[index]`, without invoking any
+-- metamethod.
+
+-------------------------------------------------------------------------------
+-- Sets the real value of `table[index]` to `value`, without invoking any
+-- metamethod. `table` must be a table, `index` any value different from nil,
+-- and `value` any Lua value.  
+-- This function returns `table`.
+-- @function [parent=#global] rawset
+-- @param #table table
+-- @param index any value different from nil.
+-- @param value any Lua value.
+
+-------------------------------------------------------------------------------
+-- If `index` is a number, returns all arguments after argument number
+-- `index`. Otherwise, `index` must be the string `"#"`, and `select` returns
+-- the total number of extra arguments it received.
+-- @function [parent=#global] select
+-- @param index a number or the string `"#"`
+-- @param ...
+
+-------------------------------------------------------------------------------
+-- Sets the metatable for the given table. (You cannot change the metatable
+-- of other types from Lua, only from C.) If `metatable` is nil, removes the
+-- metatable of the given table. If the original metatable has a `"__metatable"`
+-- field, raises an error.  
+-- This function returns `table`.
+-- @function [parent=#global] setmetatable
+-- @param #table table 
+-- @param #table metatable
+-- @return The first argument `table`. 
+
+-------------------------------------------------------------------------------
+-- Tries to convert its argument to a number. If the argument is already
+-- a number or a string convertible to a number, then `tonumber` returns this
+-- number; otherwise, it returns **nil.**
+--
+-- An optional argument specifies the base to interpret the numeral. The base
+-- may be any integer between 2 and 36, inclusive. In bases above 10, the
+-- letter '`A`' (in either upper or lower case) represents 10, '`B`' represents
+-- 11, and so forth, with '`Z`' representing 35. In base 10 (the default),
+-- the number can have a decimal part, as well as an optional exponent part.
+-- In other bases, only unsigned integers are accepted.
+-- @function [parent=#global] tonumber
+-- @param e a number or string to convert to a number.
+-- @param #number base the base to interpret the numeral, any integer between 2 and 36.(default is 10).
+-- @return #number a number if conversion succeeds else **nil**.
+
+-------------------------------------------------------------------------------
+-- Receives an argument of any type and converts it to a string in a
+-- reasonable format. For complete control of how numbers are converted, use
+-- `string.format`.
+--
+-- If the metatable of `e` has a `"__tostring"` field, then `tostring` calls
+-- the corresponding value with `e` as argument, and uses the result of the
+-- call as its result.
+-- @function [parent=#global] tostring
+-- @param e an argument of any type.
+-- @return #string a string in a reasonable format.
+
+-------------------------------------------------------------------------------
+-- Returns the type of its only argument, coded as a string. The possible
+-- results of this function are "
+-- `nil`" (a string, not the value nil), "`number`", "`string`", "`boolean`",
+-- "`table`", "`function`", "`thread`", and "`userdata`".
+-- @function [parent=#global] type
+-- @param v any value.
+-- @return #string the type of `v`.
+
+-------------------------------------------------------------------------------
+-- Returns the elements from the given table. This function is equivalent to
+-- 
+--     return list[i], list[i+1], ..., list[j]
+-- except that the above code can be written only for a fixed number of
+-- elements. By default, `i` is 1 and `j` is the length of the list, as
+-- defined by the length operator.
+-- @function [parent=#global] unpack
+-- @param #table list a table by index
+-- @param i index of first value.
+-- @param j index of last value.
+
+-------------------------------------------------------------------------------
+-- A global variable (not a function) that holds a string containing the
+-- current interpreter version. The current contents of this variable is
+-- "`Lua 5.1`".
+-- @field [parent = #global] #string _VERSION
+
+-------------------------------------------------------------------------------
+-- This function is similar to `pcall`, except that you can set a new
+-- error handler.
+--
+-- `xpcall` calls function `f` in protected mode, using `err` as the error
+-- handler. Any error inside `f` is not propagated; instead, `xpcall` catches
+-- the error, calls the `err` function with the original error object, and
+-- returns a status code. Its first result is the status code (a boolean),
+-- which is true if the call succeeds without errors. In this case, `xpcall`
+-- also returns all results from the call, after this first result. In case
+-- of any error, `xpcall` returns false plus the result from `err`.
+-- @function [parent=#global] xpcall
+-- @param f function to be call in *protected mode*.
+-- @param err function used as error handler.
+-- @return #boolean true plus the result of `f` function if its call succeeds without errors.
+-- @return #boolean,#string  false plus the result of `err` function. 
+
+-------------------------------------------------------------------------------
+-- Loads the given module. 
+-- If the requested module is one of the allowed standard libraries
+-- (`coroutine`, `math`, `string`, `table`), then returns the library.
+-- If it is one of the built-in OpenMW API packages, then returns the package.
+-- Otherwise it searches for a Lua source file with such name in OpenMW data folders.
+-- For example `require('my_lua_library.something')` will try to open the file
+-- `my_lua_library/something.lua`.
+--
+-- Loading DLLs and precompiled Lua files is intentionally prohibited for reasons
+-- of safety and compatibility between different platforms.
+--
+-- If there is any error loading or running the module, or if it cannot find
+-- any loader for the module, then `require` signals an error.
+-- @function [parent=#global] require
+-- @param #string modname name of module to load.
+
+return nil
diff --git a/files/lua_api/math.doclua b/files/lua_api/math.doclua
new file mode 100644
index 0000000000..7601c4d8b7
--- /dev/null
+++ b/files/lua_api/math.doclua
@@ -0,0 +1,200 @@
+-------------------------------------------------------------------------------
+-- Mathematical Functions.
+-- This library is an interface to the standard C math library.
+-- It provides all its functions inside the table math.
+-- @module math
+
+
+
+-------------------------------------------------------------------------------
+-- Returns the absolute value of `x`.
+-- @function [parent=#math] abs
+-- @param #number x
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Returns the arc cosine of `x` (in radians).
+-- @function [parent=#math] acos
+-- @param #number x
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Returns the arc sine of `x` (in radians).
+-- @function [parent=#math] asin
+-- @param #number x
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Returns the arc tangent of `x` (in radians).
+-- @function [parent=#math] atan
+-- @param #number x
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Returns the arc tangent of `y/x` (in radians), but uses the signs
+-- of both parameters to find the quadrant of the result. (It also handles
+-- correctly the case of `x` being zero.)
+-- @function [parent=#math] atan2
+-- @param #number y
+-- @param #number x
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Returns the smallest integer larger than or equal to `x`.
+-- @function [parent=#math] ceil
+-- @param #number x
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Returns the cosine of `x` (assumed to be in radians).
+-- @function [parent=#math] cos
+-- @param #number x
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Returns the hyperbolic cosine of `x`.
+-- @function [parent=#math] cosh
+-- @param #number x
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Returns the angle `x` (given in radians) in degrees.
+-- @function [parent=#math] deg
+-- @param #number x
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Returns the value *e^x*.
+-- @function [parent=#math] exp
+-- @param #number x
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Returns the largest integer smaller than or equal to `x`.
+-- @function [parent=#math] floor
+-- @param #number x
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Returns the remainder of the division of `x` by `y` that rounds the
+-- quotient towards zero.
+-- @function [parent=#math] fmod
+-- @param #number x
+-- @param #number y
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Returns `m` and `e` such that *x = m2^e*, `e` is an integer and the
+-- absolute value of `m` is in the range *[0.5, 1)* (or zero when `x` is zero).
+-- @function [parent=#math] frexp
+-- @param #number x
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- The value `HUGE_VAL`, a value larger than or equal to any other
+-- numerical value.
+-- @field [parent=#math] #number huge
+
+-------------------------------------------------------------------------------
+-- Returns *m2^e* (`e` should be an integer).
+-- @function [parent=#math] ldexp
+-- @param #number m
+-- @param #number e
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Returns the natural logarithm of `x`.
+-- @function [parent=#math] log
+-- @param #number x
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Returns the base-10 logarithm of `x`.
+-- @function [parent=#math] log10
+-- @param #number x
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Returns the maximum value among its arguments.
+-- @function [parent=#math] max
+-- @param #number x
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Returns the minimum value among its arguments.
+-- @function [parent=#math] min
+-- @param #number x
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Returns two numbers, the integral part of `x` and the fractional part of
+-- `x`.
+-- @function [parent=#math] modf
+-- @param #number x
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- The value of *pi*.
+-- @field [parent=#math] #number pi
+
+-------------------------------------------------------------------------------
+-- Returns *x^y*. (You can also use the expression `x^y` to compute this
+-- value.)
+-- @function [parent=#math] pow
+-- @param #number x
+-- @param #number y
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Returns the angle `x` (given in degrees) in radians.
+-- @function [parent=#math] rad
+-- @param #number x
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- This function is an interface to the simple pseudo-random generator
+-- function `rand` provided by ANSI C. (No guarantees can be given for its
+-- statistical properties.)
+-- 
+-- When called without arguments, returns a uniform pseudo-random real
+-- number in the range *[0,1)*. When called with an integer number `m`,
+-- `math.random` returns a uniform pseudo-random integer in the range *[1,
+-- m]*. When called with two integer numbers `m` and `n`, `math.random`
+-- returns a uniform pseudo-random integer in the range *[m, n]*.
+-- @function [parent=#math] random
+-- @param #number m
+-- @param #number n
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Returns the sine of `x` (assumed to be in radians).
+-- @function [parent=#math] sin
+-- @param #number x
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Returns the hyperbolic sine of `x`.
+-- @function [parent=#math] sinh
+-- @param #number x
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Returns the square root of `x`. (You can also use the expression `x^0.5`
+-- to compute this value.)
+-- @function [parent=#math] sqrt
+-- @param #number x
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Returns the tangent of `x` (assumed to be in radians).
+-- @function [parent=#math] tan
+-- @param #number x
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Returns the hyperbolic tangent of `x`.
+-- @function [parent=#math] tanh
+-- @param #number x
+-- @return #number
+
+return nil
diff --git a/files/lua_api/openmw/README.md b/files/lua_api/openmw/README.md
new file mode 100644
index 0000000000..4af9922b79
--- /dev/null
+++ b/files/lua_api/openmw/README.md
@@ -0,0 +1,14 @@
+`*.lua` files from this dir are also used to generate html documentation.
+
+After every change run the following commands to update it:
+
+```
+luadocumentor -f doc -d ../../../docs/source/generated-luadoc/lua-api-reference *.lua
+sed -i 's/openmw\.\(\w*\)\(\#\|\.html\)/\1\2/g' ../../../docs/source/generated-luadoc/lua-api-reference/*.html
+```
+
+`luadocumentor` can be installed via `luarocks`:
+
+```
+luarocks install luadocumentor
+```
diff --git a/files/lua_api/openmw/async.lua b/files/lua_api/openmw/async.lua
new file mode 100644
index 0000000000..68f63b5193
--- /dev/null
+++ b/files/lua_api/openmw/async.lua
@@ -0,0 +1,52 @@
+-------------------------------------------------------------------------------
+-- `openmw.async` contains timers and coroutine utils. All functions require
+-- the package itself as a first argument.
+-- @module async
+-- @usage local async = require('openmw.async')
+
+
+
+-------------------------------------------------------------------------------
+-- Register a function as a timer callback.
+-- @function [parent=#async] registerTimerCallback
+-- @param self
+-- @param #string name
+-- @param #function func
+-- @return #TimerCallback
+
+-------------------------------------------------------------------------------
+-- Calls callback(arg) in `delay` seconds.
+-- Callback must be registered in advance.
+-- @function [parent=#async] newTimerInSeconds
+-- @param self
+-- @param #number delay
+-- @param #TimerCallback callback A callback returned by `registerTimerCallback`
+-- @param arg An argument for `callback`; can be `nil`.
+
+-------------------------------------------------------------------------------
+-- Calls callback(arg) in `delay` game hours.
+-- Callback must be registered in advance.
+-- @function [parent=#async] newTimerInHours
+-- @param self
+-- @param #number delay
+-- @param #TimerCallback callback A callback returned by `registerTimerCallback`
+-- @param arg An argument for `callback`; can be `nil`.
+
+-------------------------------------------------------------------------------
+-- Calls `func()` in `delay` seconds.
+-- The timer will be lost if the game is saved and loaded.
+-- @function [parent=#async] newUnsavableTimerInSeconds
+-- @param self
+-- @param #number delay
+-- @param #function func
+
+-------------------------------------------------------------------------------
+-- Calls `func()` in `delay` game hours.
+-- The timer will be lost if the game is saved and loaded.
+-- @function [parent=#async] newUnsavableTimerInHours
+-- @param self
+-- @param #number delay
+-- @param #function func
+
+return nil
+
diff --git a/files/lua_api/openmw/core.lua b/files/lua_api/openmw/core.lua
new file mode 100644
index 0000000000..6b38fc20e1
--- /dev/null
+++ b/files/lua_api/openmw/core.lua
@@ -0,0 +1,328 @@
+-------------------------------------------------------------------------------
+-- `openmw.core` defines functions and types that are available in both local
+-- and global scripts.
+-- @module core
+-- @usage local core = require('openmw.core')
+
+
+
+-------------------------------------------------------------------------------
+-- The version of OpenMW Lua API. It is an integer that is incremented every time the API is changed.
+-- @field [parent=#core] #number API_VERSION
+
+-------------------------------------------------------------------------------
+-- Send an event to global scripts.
+-- @function [parent=#core] sendGlobalEvent
+-- @param #string eventName
+-- @param eventData
+
+-------------------------------------------------------------------------------
+-- Game time in seconds.
+-- The number of seconds in the game world, passed from starting a new game.
+-- @function [parent=#core] getGameTimeInSeconds
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Current time of the game world in hours.
+-- Note that the number of game seconds in a game hour is not guaranteed to be fixed.
+-- @function [parent=#core] getGameTimeInHours
+-- @return #number
+
+
+-------------------------------------------------------------------------------
+-- @type OBJECT_TYPE
+-- @field [parent=#OBJECT_TYPE] #string Activator "Activator"
+-- @field [parent=#OBJECT_TYPE] #string Armor "Armor"
+-- @field [parent=#OBJECT_TYPE] #string Book "Book"
+-- @field [parent=#OBJECT_TYPE] #string Clothing "Clothing"
+-- @field [parent=#OBJECT_TYPE] #string Container "Container"
+-- @field [parent=#OBJECT_TYPE] #string Creature "Creature"
+-- @field [parent=#OBJECT_TYPE] #string Door "Door"
+-- @field [parent=#OBJECT_TYPE] #string Ingredient "Ingredient"
+-- @field [parent=#OBJECT_TYPE] #string Light "Light"
+-- @field [parent=#OBJECT_TYPE] #string Miscellaneous "Miscellaneous"
+-- @field [parent=#OBJECT_TYPE] #string NPC "NPC"
+-- @field [parent=#OBJECT_TYPE] #string Player "Player"
+-- @field [parent=#OBJECT_TYPE] #string Potion "Potion"
+-- @field [parent=#OBJECT_TYPE] #string Static "Static"
+-- @field [parent=#OBJECT_TYPE] #string Weapon "Weapon"
+
+-------------------------------------------------------------------------------
+-- Possible `object.type` values.
+-- @field [parent=#core] #OBJECT_TYPE OBJECT_TYPE
+
+
+-------------------------------------------------------------------------------
+-- @type EQUIPMENT_SLOT
+-- @field [parent=#EQUIPMENT_SLOT] #number Helmet
+-- @field [parent=#EQUIPMENT_SLOT] #number Cuirass
+-- @field [parent=#EQUIPMENT_SLOT] #number Greaves
+-- @field [parent=#EQUIPMENT_SLOT] #number LeftPauldron
+-- @field [parent=#EQUIPMENT_SLOT] #number RightPauldron
+-- @field [parent=#EQUIPMENT_SLOT] #number LeftGauntlet
+-- @field [parent=#EQUIPMENT_SLOT] #number RightGauntlet
+-- @field [parent=#EQUIPMENT_SLOT] #number Boots
+-- @field [parent=#EQUIPMENT_SLOT] #number Shirt
+-- @field [parent=#EQUIPMENT_SLOT] #number Pants
+-- @field [parent=#EQUIPMENT_SLOT] #number Skirt
+-- @field [parent=#EQUIPMENT_SLOT] #number Robe
+-- @field [parent=#EQUIPMENT_SLOT] #number LeftRing
+-- @field [parent=#EQUIPMENT_SLOT] #number RightRing
+-- @field [parent=#EQUIPMENT_SLOT] #number Amulet
+-- @field [parent=#EQUIPMENT_SLOT] #number Belt
+-- @field [parent=#EQUIPMENT_SLOT] #number CarriedRight
+-- @field [parent=#EQUIPMENT_SLOT] #number CarriedLeft
+-- @field [parent=#EQUIPMENT_SLOT] #number Ammunition
+
+-------------------------------------------------------------------------------
+-- Available equipment slots. Used in `object:getEquipment` and `object:setEquipment`.
+-- @field [parent=#core] #EQUIPMENT_SLOT EQUIPMENT_SLOT
+
+
+-------------------------------------------------------------------------------
+-- Any object that exists in the game world and has a specific location.
+-- Player, actors, items, and statics are game objects.
+-- @type GameObject
+-- @field [parent=#GameObject] openmw.util#Vector3 position Object position.
+-- @field [parent=#GameObject] openmw.util#Vector3 rotation Object rotation (ZXY order).
+-- @field [parent=#GameObject] #Cell cell The cell where the object currently is. During loading a game and for objects in an inventory or a container `cell` is nil.
+-- @field [parent=#GameObject] #string type Type of the object (see @{openmw.core#OBJECT_TYPE}).
+-- @field [parent=#GameObject] #number count Count (makes sense if holded in a container).
+-- @field [parent=#GameObject] #string recordId Record ID.
+-- @field [parent=#GameObject] #Inventory inventory Inventory of an Player/NPC or content of an container.
+-- @field [parent=#GameObject] #boolean isTeleport `True` if it is a teleport door (only if `object.type` == "Door").
+-- @field [parent=#GameObject] openmw.util#Vector3 destPosition Destination (only if a teleport door).
+-- @field [parent=#GameObject] openmw.util#Vector3 destRotation Destination rotation (only if a teleport door).
+-- @field [parent=#GameObject] #string destCell Destination cell (only if a teleport door).
+
+-------------------------------------------------------------------------------
+-- Is the object still exists/available.
+-- Returns true if the object exists and loaded, and false otherwise. If false, then every
+-- access to the object will raise an error.
+-- @function [parent=#GameObject] isValid
+-- @param self
+-- @return #boolean
+
+-------------------------------------------------------------------------------
+-- Returns true if the object is an actor and is able to move. For dead, paralized,
+-- or knocked down actors in returns false.
+-- access to the object will raise an error.
+-- @function [parent=#GameObject] canMove
+-- @param self
+-- @return #boolean
+
+-------------------------------------------------------------------------------
+-- Speed of running. Returns 0 if not an actor, but for dead actors it still returns a positive value.
+-- @function [parent=#GameObject] getRunSpeed
+-- @param self
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Speed of walking. Returns 0 if not an actor, but for dead actors it still returns a positive value.
+-- @function [parent=#GameObject] getWalkSpeed
+-- @param self
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Send local event to the object.
+-- @function [parent=#GameObject] sendEvent
+-- @param self
+-- @param #string eventName
+-- @param eventData
+
+-------------------------------------------------------------------------------
+-- Returns `true` if the item is equipped on the object.
+-- @function [parent=#GameObject] isEquipped
+-- @param self
+-- @param #GameObject item
+-- @return #boolean
+
+-------------------------------------------------------------------------------
+-- Get equipment.
+-- Returns a table `slot` -> `GameObject` of currently equipped items.
+-- See @{openmw.core#EQUIPMENT_SLOT}. Returns empty table if the object doesn't have
+-- equipment slots.
+-- @function [parent=#GameObject] getEquipment
+-- @param self
+-- @return #map<#number,#GameObject>
+
+-------------------------------------------------------------------------------
+-- Set equipment.
+-- Keys in the table are equipment slots (see @{openmw.core#EQUIPMENT_SLOT}). Each
+-- value can be either a `GameObject` or recordId. Raises an error if
+-- the object doesn't have equipment slots and table is not empty. Can be
+-- called only on self or from a global script.
+-- @function [parent=#GameObject] setEquipment
+-- @param self
+-- @param equipment
+
+-------------------------------------------------------------------------------
+-- Add new local script to the object.
+-- Can be called only from a global script.
+-- @function [parent=#GameObject] addScript
+-- @param self
+-- @param #string scriptPath Path to the script in OpenMW virtual filesystem
+
+-------------------------------------------------------------------------------
+-- Moves object to given cell and position.
+-- The effect is not immediate: the position will be updated only in the next
+-- frame. Can be called only from a global script.
+-- @function [parent=#GameObject] teleport
+-- @param self
+-- @param #string cellName Name of the cell to teleport into. For exteriors can be empty.
+-- @param openmw.util#Vector3 position New position
+-- @param openmw.util#Vector3 rotation New rotation. Optional argument. If missed, then the current rotation is used.
+
+
+-------------------------------------------------------------------------------
+-- List of GameObjects.
+-- @type ObjectList
+-- @extends #list<#GameObject>
+
+-------------------------------------------------------------------------------
+-- Create iterator.
+-- @function [parent=#ObjectList] ipairs
+-- @param self
+
+-------------------------------------------------------------------------------
+-- Filter list with a Query.
+-- @function [parent=#ObjectList] select
+-- @param self
+-- @param openmw.query#Query query
+-- @return #ObjectList
+
+
+-------------------------------------------------------------------------------
+-- A cell of the game world.
+-- @type Cell
+-- @field [parent=#Cell] #string name Name of the cell (can be empty string).
+-- @field [parent=#Cell] #string region Region of the cell.
+-- @field [parent=#Cell] #boolean isExterior Is it exterior or interior.
+-- @field [parent=#Cell] #number gridX Index of the cell by X (only for exteriors).
+-- @field [parent=#Cell] #number gridY Index of the cell by Y (only for exteriors).
+-- @field [parent=#Cell] #boolean hasWater True if the cell contains water.
+
+-------------------------------------------------------------------------------
+-- Returns true either if the cell contains the object or if the cell is an exterior and the object is also in an exterior.
+-- @function [parent=#Cell] isInSameSpace
+-- @param self
+-- @param #GameObject object
+-- @return #boolean
+-- @usage
+-- if obj1.cell:isInSameSpace(obj2) then
+--     dist = (obj1.position - obj2.position):length()
+-- else
+--     -- the distance can't be calculated because the coordinates are in different spaces
+-- end
+
+-------------------------------------------------------------------------------
+-- Select objects from the cell with a Query (only in global scripts).
+-- Returns an empty list if the cell is not loaded.
+-- @function [parent=#Cell] selectObjects
+-- @param self
+-- @param openmw.query#Query query
+-- @return #ObjectList
+
+
+-------------------------------------------------------------------------------
+-- Inventory of a player/NPC or a content of a container.
+-- @type Inventory
+
+-------------------------------------------------------------------------------
+-- The number of items with given recordId.
+-- @function [parent=#Inventory] countOf
+-- @param self
+-- @param #string recordId
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Get all content of the inventory.
+-- @function [parent=#Inventory] getAll
+-- @param self
+-- @return #ObjectList
+
+-------------------------------------------------------------------------------
+-- Get all potions.
+-- @function [parent=#Inventory] getPotions
+-- @param self
+-- @return #ObjectList
+
+-------------------------------------------------------------------------------
+-- Get all apparatuses.
+-- @function [parent=#Inventory] getApparatuses
+-- @param self
+-- @return #ObjectList
+
+-------------------------------------------------------------------------------
+-- Get all armor.
+-- @function [parent=#Inventory] getArmor
+-- @param self
+-- @return #ObjectList
+
+-------------------------------------------------------------------------------
+-- Get all books.
+-- @function [parent=#Inventory] getBooks
+-- @param self
+-- @return #ObjectList
+
+-------------------------------------------------------------------------------
+-- Get all clothing.
+-- @function [parent=#Inventory] getClothing
+-- @param self
+-- @return #ObjectList
+
+-------------------------------------------------------------------------------
+-- Get all ingredients.
+-- @function [parent=#Inventory] getIngredients
+-- @param self
+-- @return #ObjectList
+
+-------------------------------------------------------------------------------
+-- Get all lights.
+-- @function [parent=#Inventory] getLights
+-- @param self
+-- @return #ObjectList
+
+-------------------------------------------------------------------------------
+-- Get all lockpicks.
+-- @function [parent=#Inventory] getLockpicks
+-- @param self
+-- @return #ObjectList
+
+-------------------------------------------------------------------------------
+-- Get all miscellaneous items.
+-- @function [parent=#Inventory] getMiscellaneous
+-- @param self
+-- @return #ObjectList
+
+-------------------------------------------------------------------------------
+-- Get all probes.
+-- @function [parent=#Inventory] getProbes
+-- @param self
+-- @return #ObjectList
+
+-------------------------------------------------------------------------------
+-- Get all repair kits.
+-- @function [parent=#Inventory] getRepairKits
+-- @param self
+-- @return #ObjectList
+
+-------------------------------------------------------------------------------
+-- Get all weapon.
+-- @function [parent=#Inventory] getWeapons
+-- @param self
+-- @return #ObjectList
+
+
+-------------------------------------------------------------------------------
+-- Argument of `onKeyPress` engine handler
+-- @type KeyboardEvent
+-- @field [parent=#KeyboardEvent] #string symbol The pressed symbol (1-symbol string).
+-- @field [parent=#KeyboardEvent] #string code Key code.
+-- @field [parent=#KeyboardEvent] #boolean withShift Is `Shift` key pressed.
+-- @field [parent=#KeyboardEvent] #boolean withCtrl Is `Control` key pressed.
+-- @field [parent=#KeyboardEvent] #boolean withAlt Is `Alt` key pressed.
+-- @field [parent=#KeyboardEvent] #boolean withSuper Is `Super`/`Win` key pressed.
+
+return nil
+
diff --git a/files/lua_api/openmw/generate_luadoc.sh b/files/lua_api/openmw/generate_luadoc.sh
new file mode 100755
index 0000000000..2eacf30f9f
--- /dev/null
+++ b/files/lua_api/openmw/generate_luadoc.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+luadocumentor -f doc -d ../../../docs/source/generated-luadoc/lua-api-reference *.lua
+sed -i 's/openmw\.\(\w*\)\(\#\|\.html\)/\1\2/g' ../../../docs/source/generated-luadoc/lua-api-reference/*.html
diff --git a/files/lua_api/openmw/nearby.lua b/files/lua_api/openmw/nearby.lua
new file mode 100644
index 0000000000..c24d5e3d10
--- /dev/null
+++ b/files/lua_api/openmw/nearby.lua
@@ -0,0 +1,36 @@
+-------------------------------------------------------------------------------
+-- `openmw.nearby` provides read-only access to the nearest area of the game world.
+-- Can be used only from local scripts.
+-- @module nearby
+-- @usage local nearby = require('openmw.nearby')
+
+
+
+-------------------------------------------------------------------------------
+-- List of nearby activators.
+-- @field [parent=#nearby] openmw.core#ObjectList activators
+
+-------------------------------------------------------------------------------
+-- List of nearby actors.
+-- @field [parent=#nearby] openmw.core#ObjectList actors
+
+-------------------------------------------------------------------------------
+-- List of nearby containers.
+-- @field [parent=#nearby] openmw.core#ObjectList containers
+
+-------------------------------------------------------------------------------
+-- List of nearby doors.
+-- @field [parent=#nearby] openmw.core#ObjectList doors
+
+-------------------------------------------------------------------------------
+-- Everything that can be picked up in the nearby.
+-- @field [parent=#nearby] openmw.core#ObjectList items
+
+-------------------------------------------------------------------------------
+-- Evaluates a Query.
+-- @function [parent=#nearby] selectObjects
+-- @param openmw.query#Query query
+-- @return openmw.core#ObjectList
+
+return nil
+
diff --git a/files/lua_api/openmw/query.lua b/files/lua_api/openmw/query.lua
new file mode 100644
index 0000000000..9684fb372c
--- /dev/null
+++ b/files/lua_api/openmw/query.lua
@@ -0,0 +1,116 @@
+-------------------------------------------------------------------------------
+-- `openmw.query` constructs queries that can be used in `world.selectObjects` and `nearby.selectObjects`.
+-- @module query
+-- @usage local query = require('openmw.query')
+
+
+
+-------------------------------------------------------------------------------
+-- Query. A Query itself can no return objects. It only holds search conditions.
+-- @type Query
+
+-------------------------------------------------------------------------------
+-- Add condition.
+-- @function [parent=#Query] where
+-- @param self
+-- @param condition
+-- @return #Query
+
+-------------------------------------------------------------------------------
+-- Limit result size.
+-- @function [parent=#Query] limit
+-- @param self
+-- @param #number maxCount
+-- @return #Query
+
+
+-------------------------------------------------------------------------------
+-- A field that can be used in a condition
+-- @type Field
+
+-------------------------------------------------------------------------------
+-- Equal
+-- @function [parent=#Field] eq
+-- @param self
+-- @param value
+
+-------------------------------------------------------------------------------
+-- Not equal
+-- @function [parent=#Field] neq
+-- @param self
+-- @param value
+
+-------------------------------------------------------------------------------
+-- Lesser
+-- @function [parent=#Field] lt
+-- @param self
+-- @param value
+
+-------------------------------------------------------------------------------
+-- Lesser or equal
+-- @function [parent=#Field] lte
+-- @param self
+-- @param value
+
+-------------------------------------------------------------------------------
+-- Greater
+-- @function [parent=#Field] gt
+-- @param self
+-- @param value
+
+-------------------------------------------------------------------------------
+-- Greater or equal
+-- @function [parent=#Field] gte
+-- @param self
+-- @param value
+
+
+-------------------------------------------------------------------------------
+-- @type OBJECT
+-- @field [parent=#OBJECT] #Field type
+-- @field [parent=#OBJECT] #Field recordId
+-- @field [parent=#OBJECT] #Field count
+-- @field [parent=#OBJECT] #CellFields cell
+
+-------------------------------------------------------------------------------
+-- Fields that can be used with any object.
+-- @field [parent=#query] #OBJECT OBJECT
+
+-------------------------------------------------------------------------------
+-- @type DOOR
+-- @field [parent=#DOOR] #Field isTeleport
+-- @field [parent=#DOOR] #CellFields destCell
+
+-------------------------------------------------------------------------------
+-- Fields that can be used only when search for doors.
+-- @field [parent=#query] #DOOR DOOR
+
+-------------------------------------------------------------------------------
+-- @type CellFields
+-- @field [parent=#CellFields] #Field name
+-- @field [parent=#CellFields] #Field region
+-- @field [parent=#CellFields] #Field isExterior
+
+
+-------------------------------------------------------------------------------
+-- Base Query to select activators.
+-- @field [parent=#query] #Query activators
+
+-------------------------------------------------------------------------------
+-- Base Query to select actors.
+-- @field [parent=#query] #Query actors
+
+-------------------------------------------------------------------------------
+-- Base Query to select containers.
+-- @field [parent=#query] #Query containers
+
+-------------------------------------------------------------------------------
+-- Base Query to select doors.
+-- @field [parent=#query] #Query doors
+
+-------------------------------------------------------------------------------
+-- Base Query to select items.
+-- @field [parent=#query] #Query items
+
+return nil
+
diff --git a/files/lua_api/openmw/self.lua b/files/lua_api/openmw/self.lua
new file mode 100644
index 0000000000..b65b20bab2
--- /dev/null
+++ b/files/lua_api/openmw/self.lua
@@ -0,0 +1,68 @@
+-------------------------------------------------------------------------------
+-- `openmw.self` provides full access to the object the script is attached to.
+-- Can be used only from local scripts. All fields and function of `GameObject` are also available for `openmw.self`.
+-- @module self
+-- @extends openmw.core#GameObject
+-- @usage local self = require('openmw.self')
+-- if self.type == 'Player' then  -- All fields and functions of `GameObject` are available.
+--     self:sendEvent("something", self.position)
+-- end
+
+
+
+-------------------------------------------------------------------------------
+-- Returns true if the script isActive (the object it is attached to is in an active cell).
+-- If it is not active, then `openmw.nearby` can not be used.
+-- @function [parent=#self] isActive
+-- @param self
+-- @return #boolean
+
+-------------------------------------------------------------------------------
+-- The object the script is attached to (readonly)
+-- @field [parent=#self] openmw.core#GameObject object
+
+-------------------------------------------------------------------------------
+-- Movement controls (only for actors)
+-- @field [parent=#self] #ActorControls controls
+
+-------------------------------------------------------------------------------
+-- Allows to view and/or modify controls of an actor. Makes an effect only if
+-- `setDirectControl(true)` was called. All fields are mutable.
+-- @type ActorControls
+-- @field [parent=#ActorControls] #number movement +1 - move forward, -1 - move backward
+-- @field [parent=#ActorControls] #number sideMovement +1 - move right, -1 - move left
+-- @field [parent=#ActorControls] #number turn Turn right (radians); if negative - turn left
+-- @field [parent=#ActorControls] #boolean run true - run, false - walk
+-- @field [parent=#ActorControls] #boolean jump If true - initiate a jump
+
+-------------------------------------------------------------------------------
+-- Enables or disables direct movement control (disabled by default).
+-- @function [parent=#self] setDirectControl
+-- @param self
+-- @param #boolean control
+
+-------------------------------------------------------------------------------
+-- Enables or disables standart AI (enabled by default).
+-- @function [parent=#self] enableAI
+-- @param self
+-- @param #boolean v
+
+-------------------------------------------------------------------------------
+-- Returns current target or nil if not in combat
+-- @function [parent=#self] getCombatTarget
+-- @param self
+-- @return openmw.core#GameObject
+
+-------------------------------------------------------------------------------
+-- Remove all combat packages from the actor.
+-- @function [parent=#self] stopCombat
+-- @param self
+
+-------------------------------------------------------------------------------
+-- Attack `target`.
+-- @function [parent=#self] startCombat
+-- @param self
+-- @param openmw.core#GameObject target
+
+return nil
+
diff --git a/files/lua_api/openmw/ui.lua b/files/lua_api/openmw/ui.lua
new file mode 100644
index 0000000000..bf6976c76b
--- /dev/null
+++ b/files/lua_api/openmw/ui.lua
@@ -0,0 +1,15 @@
+-------------------------------------------------------------------------------
+-- `openmw.ui` controls user interface.
+-- Can be used only by local scripts, that are attached to a player.
+-- @module ui
+-- @usage local ui = require('openmw.ui')
+
+
+
+-------------------------------------------------------------------------------
+-- Shows given message at the bottom of the screen.
+-- @function [parent=#ui] showMessage
+-- @param #string msg
+
+return nil
+
diff --git a/files/lua_api/openmw/util.lua b/files/lua_api/openmw/util.lua
new file mode 100644
index 0000000000..7d31ced408
--- /dev/null
+++ b/files/lua_api/openmw/util.lua
@@ -0,0 +1,150 @@
+-------------------------------------------------------------------------------
+-- `openmw.util` defines utility functions and classes like 3D vectors, that don't depend on the game world.
+-- @module util
+-- @usage local util = require('openmw.util')
+
+
+
+-------------------------------------------------------------------------------
+-- Limits given value to the interval [`from`, `to`]
+-- @function [parent=#util] clamp
+-- @param #number value
+-- @param #number from
+-- @param #number to
+-- @return #number min(max(value, from), to)
+
+-------------------------------------------------------------------------------
+-- Adds `2pi*k` and puts the angle in range `[-pi, pi]`
+-- @function [parent=#util] normalizeAngle
+-- @param #number angle Angle in radians
+-- @return #number Angle in range `[-pi, pi]`
+
+
+-------------------------------------------------------------------------------
+-- Immutable 2D vector
+-- @type Vector2
+-- @field #number x
+-- @field #number y
+-- @usage
+-- v = util.vector2(3, 4)
+-- v.x, v.y       -- 3.0, 4.0
+-- str(v)         -- "(3.0, 4.0)"
+-- v:length()     -- 5.0    length
+-- v:length2()    -- 25.0   square of the length
+-- v:normalize()  -- vector2(3/5, 4/5)
+-- v:rotate(radians)    -- rotate clockwise (returns rotated vector)
+-- v1:dot(v2)     -- dot product (returns a number)
+-- v1 * v2        -- dot product
+-- v1 + v2        -- vector addition
+-- v1 - v2        -- vector subtraction
+-- v1 * x         -- multiplication by a number
+-- v1 / x         -- division by a number
+
+-------------------------------------------------------------------------------
+-- Creates a new 2D vector. Vectors are immutable and can not be changed after creation.
+-- @function [parent=#util] vector2
+-- @param #number x.
+-- @param #number y.
+-- @return #Vector2.
+
+-------------------------------------------------------------------------------
+-- Length of the vector
+-- @function [parent=#Vector2] length
+-- @param self
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Square of the length of the vector
+-- @function [parent=#Vector2] length2
+-- @param self
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Normalizes vector.
+-- Returns two values: normalized vector and the length of the original vector.
+-- It doesn't change the original vector. 
+-- @function [parent=#Vector2] normalize
+-- @param self
+-- @return #Vector2, #number
+
+-------------------------------------------------------------------------------
+-- Rotates 2D vector clockwise.
+-- @function [parent=#Vector2] rotate
+-- @param self
+-- @param #number angle Angle in radians
+-- @return #Vector2 Rotated vector.
+
+-------------------------------------------------------------------------------
+-- Dot product.
+-- @function [parent=#Vector2] dot
+-- @param self
+-- @param #Vector2 v
+-- @return #number
+
+
+-------------------------------------------------------------------------------
+-- Immutable 3D vector
+-- @type Vector3
+-- @field #number x
+-- @field #number y
+-- @field #number z
+-- @usage
+-- v = util.vector3(3, 4, 5)
+-- v.x, v.y, v.z  -- 3.0, 4.0, 5.0
+-- str(v)         -- "(3.0, 4.0, 4.5)"
+-- v:length()     -- length
+-- v:length2()    -- square of the length
+-- v:normalize()  -- normalized vector
+-- v1:dot(v2)     -- dot product (returns a number)
+-- v1 * v2        -- dot product (returns a number)
+-- v1:cross(v2)   -- cross product (returns a vector)
+-- v1 ^ v2        -- cross product (returns a vector)
+-- v1 + v2        -- vector addition
+-- v1 - v2        -- vector subtraction
+-- v1 * x         -- multiplication by a number
+-- v1 / x         -- division by a number
+
+-------------------------------------------------------------------------------
+-- Creates a new 3D vector. Vectors are immutable and can not be changed after creation.
+-- @function [parent=#util] vector3
+-- @param #number x.
+-- @param #number y.
+-- @param #number z.
+-- @return #Vector3.
+
+-------------------------------------------------------------------------------
+-- Length of the vector
+-- @function [parent=#Vector3] length
+-- @param self
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Square of the length of the vector
+-- @function [parent=#Vector3] length2
+-- @param self
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Normalizes vector.
+-- Returns two values: normalized vector and the length of the original vector.
+-- It doesn't change the original vector. 
+-- @function [parent=#Vector3] normalize
+-- @param self
+-- @return #Vector3, #number
+
+-------------------------------------------------------------------------------
+-- Dot product.
+-- @function [parent=#Vector3] dot
+-- @param self
+-- @param #Vector3 v
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Cross product.
+-- @function [parent=#Vector3] cross
+-- @param self
+-- @param #Vector3 v
+-- @return #Vector3
+
+return nil
+
diff --git a/files/lua_api/openmw/world.lua b/files/lua_api/openmw/world.lua
new file mode 100644
index 0000000000..90ea23b4f5
--- /dev/null
+++ b/files/lua_api/openmw/world.lua
@@ -0,0 +1,34 @@
+-------------------------------------------------------------------------------
+-- `openmw.world` is an interface to the game world for global scripts.
+-- Can not be used from local scripts.
+-- @module world
+-- @usage local world = require('openmw.world')
+
+
+
+-------------------------------------------------------------------------------
+-- List of currently active actors.
+-- @field [parent=#world] openmw.core#ObjectList activeActors
+
+-------------------------------------------------------------------------------
+-- Evaluates a Query.
+-- @function [parent=#world] selectObjects
+-- @param openmw.query#Query query
+-- @return openmw.core#ObjectList
+
+-------------------------------------------------------------------------------
+-- Loads a named cell
+-- @function [parent=#world] getCellByName
+-- @param #string cellName
+-- @return openmw.core#Cell
+
+-------------------------------------------------------------------------------
+-- Loads an exterior cell by grid indices
+-- @function [parent=#world] getExteriorCell
+-- @param #number gridX
+-- @param #number gridY
+-- @return openmw.core#Cell
+
+
+return nil
+
diff --git a/files/lua_api/string.doclua b/files/lua_api/string.doclua
new file mode 100644
index 0000000000..47a056dd9d
--- /dev/null
+++ b/files/lua_api/string.doclua
@@ -0,0 +1,231 @@
+-------------------------------------------------------------------------------
+-- String Manipulation. 
+-- This library provides generic functions for string manipulation,
+-- such as finding and extracting substrings, and pattern matching.
+-- When indexing a string in Lua, the first character is at position 1 (not at 0, as in C). 
+-- Indices are allowed to be negative and are interpreted as indexing backwards, from the end of the string.
+-- Thus, the last character is at position -1, and so on.
+--
+-- The string library provides all its functions inside the table string. It also sets a metatable for strings where the __index field points to the string table. Therefore, you can use the string functions in object-oriented style.
+-- For instance, string.byte(s, i) can be written as s:byte(i).
+--
+-- The string library assumes one-byte character encodings.
+-- @module string
+
+-------------------------------------------------------------------------------
+-- Returns the internal numerical codes of the characters `s[i]`, `s[i+1]`,
+-- ..., `s[j]`. The default value for `i` is 1; the default value for `j`
+-- is `i`.
+-- Note that numerical codes are not necessarily portable across platforms.
+-- @function [parent=#string] byte
+-- @param #string s string to handle.
+-- @param #number i start index, default value is 1.
+-- @param #number j end index, default value is `i`.
+-- @return the internal numerical codes of the characters `s[i]`, `s[i+1]`,..., `s[j]`
+
+-------------------------------------------------------------------------------
+-- Receives zero or more integers. Returns a string with length equal to
+-- the number of arguments, in which each character has the internal numerical
+-- code equal to its corresponding argument.
+-- 
+-- Note that numerical codes are not necessarily portable across platforms.
+-- @function [parent=#string] char
+-- @param ... zero or more integers.
+-- @return #string a string with length equal to
+-- the number of arguments, in which each character has the internal numerical
+-- code equal to its corresponding argument.
+
+-------------------------------------------------------------------------------
+-- Returns a string containing a binary representation of the given
+-- function, so that a later `loadstring` on this string returns a copy of
+-- the function. `function` must be a Lua function without upvalues.
+-- @function [parent=#string] dump
+-- @param f the function to dump.
+-- @return #string a string representation of the given function.
+
+-------------------------------------------------------------------------------
+-- Looks for the first match of `pattern` in the string `s`. If it finds a
+-- match, then `find` returns the indices of `s` where this occurrence starts
+-- and ends; otherwise, it returns nil.A third, optional numerical argument
+-- `init` specifies where to start the search; its default value is 1 and
+-- can be negative. A value of true as a fourth, optional argument `plain`
+-- turns off the pattern matching facilities, so the function does a plain
+-- "find substring" operation, with no characters in `pattern` being considered
+-- "magic". 
+-- 
+-- Note that if `plain` is given, then `init` must be given as well.
+-- If the pattern has captures, then in a successful match the captured values
+-- are also returned, after the two indices.
+-- @function [parent=#string] find
+-- @param #string s string to handle.
+-- @param #string pattern pattern to search. 
+-- @param #number init index where to start the search. (default value is 1)
+-- @param #boolean plain set to true to search without pattern matching. (default value is false)
+-- @return #number, #number start and end indices of first occurence.
+-- @return #nil if pattern not found.
+
+-------------------------------------------------------------------------------
+-- Returns a formatted version of its variable number of arguments following
+-- the description given in its first argument (which must be a string). The
+-- format string follows the same rules as the `printf` family of standard C
+-- functions. The only differences are that the options/modifiers `*`, `l`,
+-- `L`, `n`, `p`, and `h` are not supported and that there is an extra option,
+-- `q`. The `q` option formats a string in a form suitable to be safely read
+-- back by the Lua interpreter: the string is written between double quotes,
+-- and all double quotes, newlines, embedded zeros, and backslashes in the
+-- string are correctly escaped when written. For instance, the call
+--
+--     string.format('%q', 'a string with "quotes" and \n new line')
+--
+-- will produce the string:
+--
+--     "a string with \"quotes\" and \
+--         new line"
+--
+-- The options `c`, `d`, `E`, `e`, `f`, `g`, `G`, `i`, `o`, `u`, `X`, and
+-- `x` all expect a number as argument, whereas `q` and `s` expect a string.
+-- This function does not accept string values containing embedded zeros,
+-- except as arguments to the `q` option.
+-- @function [parent=#string] format
+-- @param #string formatstring the string template. 
+-- @param ... arguments could be strings or numbers.
+-- @return #string the formatted string.
+
+-------------------------------------------------------------------------------
+-- Returns an iterator function that, each time it is called, returns the
+-- next captures from `pattern` over string `s`. If `pattern` specifies no
+-- captures, then the whole match is produced in each call.
+-- As an example, the following loop
+--
+--     s = "hello world from Lua"
+--     for w in string.gmatch(s, "%a+") do
+--       print(w)
+--     end
+--
+-- will iterate over all the words from string `s`, printing one per line. The
+-- next example collects all pairs `key=value` from the given string into
+-- a table:
+--
+--     t = {}
+--     s = "from=world, to=Lua"
+--     for k, v in string.gmatch(s, "(%w+)=(%w+)") do
+--       t[k] = v
+--     end
+--
+-- For this function, a '`^`' at the start of a pattern does not work as an
+-- anchor, as this would prevent the iteration.
+-- @function [parent=#string] gmatch
+-- @param #string s string to handle.
+-- @param #string pattern pattern to search.
+
+-------------------------------------------------------------------------------
+-- Returns a copy of `s` in which all (or the first `n`, if given)
+-- occurrences of the `pattern` have been replaced by a replacement string
+-- specified by `repl`, which can be a string, a table, or a function. `gsub`
+-- also returns, as its second value, the total number of matches that occurred.
+--
+-- If `repl` is a string, then its value is used for replacement. The character
+-- `%` works as an escape character: any sequence in `repl` of the form `%n`,
+-- with *n* between 1 and 9, stands for the value of the *n*-th captured
+-- substring (see below). The sequence `%0` stands for the whole match. The
+-- sequence `%%` stands for a single `%`.
+--
+-- If `repl` is a table, then the table is queried for every match, using
+-- the first capture as the key; if the pattern specifies no captures, then
+-- the whole match is used as the key.
+--
+-- If `repl` is a function, then this function is called every time a match
+-- occurs, with all captured substrings passed as arguments, in order; if
+-- the pattern specifies no captures, then the whole match is passed as a
+-- sole argument.
+--
+-- If the value returned by the table query or by the function call is a
+-- string or a number, then it is used as the replacement string; otherwise,
+-- if it is false or nil, then there is no replacement (that is, the original
+-- match is kept in the string).
+--
+-- Here are some examples:
+-- 
+--     x = string.gsub("hello world", "(%w+)", "%1 %1")
+--     --> x="hello hello world world"
+--     x = string.gsub("hello world", "%w+", "%0 %0", 1)
+--     --> x="hello hello world"
+--     x = string.gsub("hello world from Lua", "(%w+)%s*(%w+)", "%2 %1")
+--     --> x="world hello Lua from"
+--     x = string.gsub("home = $HOME, user = $USER", "%$(%w+)", os.getenv)
+--     --> x="home = /home/roberto, user = roberto"
+--     x = string.gsub("4+5 = $return 4+5$", "%$(.-)%$", function (s)
+--           return loadstring(s)()
+--         end)
+--     --> x="4+5 = 9"
+--     local t = {name="lua", version="5.1"}
+--     x = string.gsub("$name-$version.tar.gz", "%$(%w+)", t)
+--     --> x="lua-5.1.tar.gz"
+-- @function [parent=#string] gsub
+-- @param #string s string to handle.
+-- @param #string pattern pattern to search. 
+-- @param repl replacement could be a string, a table or a function.
+-- @param #number n number of occurences to replace, default is nil which means all occurences. 
+-- @return #string a modified copy of `s`.
+
+-------------------------------------------------------------------------------
+-- Receives a string and returns its length. The empty string `""` has
+-- length 0. Embedded zeros are counted, so `"a\000bc\000"` has length 5.
+-- @function [parent=#string] len
+-- @param #string s string to handle.
+-- @return #number the lenght of `s`.
+
+-------------------------------------------------------------------------------
+-- Receives a string and returns a copy of this string with all uppercase
+-- letters changed to lowercase. All other characters are left unchanged. The
+-- definition of what an uppercase letter is depends on the current locale.
+-- @function [parent=#string] lower
+-- @param #string s string to handle.
+-- @return #string a lower case version of `s`.
+
+-------------------------------------------------------------------------------
+-- Looks for the first *match* of `pattern` in the string `s`. If it
+-- finds one, then `match` returns the captures from the pattern; otherwise
+-- it returns nil. If `pattern` specifies no captures, then the whole match
+-- is returned. A third, optional numerical argument `init` specifies where
+-- to start the search; its default value is 1 and can be negative.
+-- @function [parent=#string] match
+-- @param #string s string to handle.
+-- @param #string pattern pattern to search. 
+-- @param #number init index where to start the search. (default value is 1)
+-- @return #string the captures from the pattern; otherwise it returns nil. If pattern specifies no captures, then the whole match is returned. 
+
+-------------------------------------------------------------------------------
+-- Returns a string that is the concatenation of `n` copies of the string `s`.
+-- @function [parent=#string] rep
+-- @param #string s string to handle.
+-- @param #number n number of repetition.
+-- @return #string the concatenation of `n` copies of the string `s`.
+
+-------------------------------------------------------------------------------
+-- Returns a string that is the string `s` reversed.
+-- @function [parent=#string] reverse
+-- @param #string s string to handle.
+-- @return #string the string `s` reversed.
+
+-------------------------------------------------------------------------------
+-- Returns the substring of `s` that starts at `i` and continues until
+-- `j`; `i` and `j` can be negative. If `j` is absent, then it is assumed to
+-- be equal to -1 (which is the same as the string length). In particular,
+-- the call `string.sub(s,1,j)` returns a prefix of `s` with length `j`, and
+-- `string.sub(s, -i)` returns a suffix of `s` with length `i`.
+-- @function [parent=#string] sub
+-- @param #string s string to handle.
+-- @param #number i start index.
+-- @param #number j end index. (default value is -1, which is the same as the string lenght)
+-- @return #string the substring of `s` that starts at `i` and continues until `j`. 
+
+-------------------------------------------------------------------------------
+-- Receives a string and returns a copy of this string with all lowercase
+-- letters changed to uppercase. All other characters are left unchanged. The
+-- definition of what a lowercase letter is depends on the current locale.
+-- @function [parent=#string] upper
+-- @param #string s string to handle.
+-- @return #string a upper case version of `s`.
+
+return nil
diff --git a/files/lua_api/table.doclua b/files/lua_api/table.doclua
new file mode 100644
index 0000000000..f8561e97a8
--- /dev/null
+++ b/files/lua_api/table.doclua
@@ -0,0 +1,66 @@
+-------------------------------------------------------------------------------
+-- Table Manipulation
+-- This library provides generic functions for table manipulation.
+-- It provides all its functions inside the table table.
+--
+-- Most functions in the table library assume that the table represents an array or a list.
+-- For these functions, when we talk about the "length" of a table we mean the result of the length operator.
+-- @module table
+
+
+
+-------------------------------------------------------------------------------
+-- Given an array where all elements are strings or numbers, returns
+-- `table[i]..sep..table[i+1]...sep..table[j]`. The default value for
+-- `sep` is the empty string, the default for `i` is 1, and the default for
+-- `j` is the length of the table. If `i` is greater than `j`, returns the
+-- empty string.
+-- @function [parent=#table] concat
+-- @param #table table table to handle.
+-- @param #string sep the separator, default value is an empty string. 
+-- @param #number i start index, default value is 1.
+-- @param #number j end index, default value is lenght of the table.
+-- @return #string the concatenated table.
+
+-------------------------------------------------------------------------------
+-- Inserts element `value` at position `pos` in `table`, shifting up
+-- other elements to open space, if necessary. The default value for `pos` is
+-- `n+1`, where `n` is the length of the table, so that a call
+-- `table.insert(t,x)` inserts `x` at the end of table `t`.
+-- @function [parent=#table] insert
+-- @param #table table table to modify.
+-- @param #number pos index of insertion.
+-- @param value value to insert.
+
+-------------------------------------------------------------------------------
+-- Returns the largest positive numerical index of the given table, or
+-- zero if the table has no positive numerical indices. (To do its job this
+-- function does a linear traversal of the whole table.)
+-- @function [parent=#table] maxn
+-- @param #table table table to traverse.
+-- @return #number the largest positive numerical index of the given table, or
+-- zero if the table has no positive numerical indices.
+
+-------------------------------------------------------------------------------
+-- Removes from `table` the element at position `pos`, shifting down other
+-- elements to close the space, if necessary. Returns the value of the removed
+-- element. The default value for `pos` is `n`, where `n` is the length of the
+-- table, so that a call `table.remove(t)` removes the last element of table
+-- `t`.
+-- @function [parent=#table] remove
+-- @param #table table table to modify.
+-- @param #number pos index of deletion. (default value is the lenght of the table)
+
+-------------------------------------------------------------------------------
+-- Sorts table elements in a given order,
+-- *in-place*, from `table[1]` to `table[n]`, where `n` is the length of the
+-- table. If `comp` is given, then it must be a function that receives two
+-- table elements, and returns true when the first is less than the second
+-- (so that `not comp(a[i+1],a[i])` will be true after the sort). Lua operator < is used instead.
+-- 
+-- The sort algorithm is not stable; that is, elements considered equal by the given order may have their relative positions changed by the sort.
+-- @function [parent=#table] sort
+-- @param #table table table to sort.
+-- @param comp a function which take to table and returns true when the first is less than the second.
+
+return nil

From 25cc884c173a86196ec81f854cc9f3cb8460cd9b Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 25 Apr 2021 00:55:08 +0200
Subject: [PATCH 1002/2859] Integrate Lua doc into sphinx doc (issue #5931)

---
 .gitignore                                    |   1 +
 docs/source/_static/luadoc.css                | 113 ++++++++++++++++++
 docs/source/conf.py                           |   9 +-
 docs/source/generate_luadoc.sh                |  51 ++++++++
 docs/source/reference/lua-scripting/api.rst   |  86 ++++++-------
 .../lua-scripting/engine_handlers.rst         |  43 +++++++
 docs/source/reference/lua-scripting/index.rst |   1 +
 .../reference/lua-scripting/openmw_async.rst  |   5 +
 .../lua-scripting/openmw_aux_util.rst         |   5 +
 .../reference/lua-scripting/openmw_core.rst   |   5 +
 .../reference/lua-scripting/openmw_nearby.rst |   5 +
 .../reference/lua-scripting/openmw_query.rst  |   5 +
 .../reference/lua-scripting/openmw_self.rst   |   5 +
 .../reference/lua-scripting/openmw_ui.rst     |   5 +
 .../reference/lua-scripting/openmw_util.rst   |   5 +
 .../reference/lua-scripting/openmw_world.rst  |   5 +
 files/lua_api/openmw/README.md                |  14 ---
 files/lua_api/openmw/generate_luadoc.sh       |   4 -
 18 files changed, 295 insertions(+), 72 deletions(-)
 create mode 100644 docs/source/_static/luadoc.css
 create mode 100755 docs/source/generate_luadoc.sh
 create mode 100644 docs/source/reference/lua-scripting/engine_handlers.rst
 create mode 100644 docs/source/reference/lua-scripting/openmw_async.rst
 create mode 100644 docs/source/reference/lua-scripting/openmw_aux_util.rst
 create mode 100644 docs/source/reference/lua-scripting/openmw_core.rst
 create mode 100644 docs/source/reference/lua-scripting/openmw_nearby.rst
 create mode 100644 docs/source/reference/lua-scripting/openmw_query.rst
 create mode 100644 docs/source/reference/lua-scripting/openmw_self.rst
 create mode 100644 docs/source/reference/lua-scripting/openmw_ui.rst
 create mode 100644 docs/source/reference/lua-scripting/openmw_util.rst
 create mode 100644 docs/source/reference/lua-scripting/openmw_world.rst
 delete mode 100644 files/lua_api/openmw/README.md
 delete mode 100755 files/lua_api/openmw/generate_luadoc.sh

diff --git a/.gitignore b/.gitignore
index 1905957d9b..5c07d3e54a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,6 +72,7 @@ components/ui_contentselector.h
 docs/mainpage.hpp
 docs/Doxyfile
 docs/DoxyfilePages
+docs/source/reference/lua-scripting/generated_html
 moc_*.cxx
 *.cxx_parameters
 *qrc_launcher.cxx
diff --git a/docs/source/_static/luadoc.css b/docs/source/_static/luadoc.css
new file mode 100644
index 0000000000..aa83013def
--- /dev/null
+++ b/docs/source/_static/luadoc.css
@@ -0,0 +1,113 @@
+#luadoc tt { font-family: monospace; }
+
+#luadoc p,
+#luadoc td,
+#luadoc th { font-size: .95em; line-height: 1.2em;}
+
+#luadoc p,
+#luadoc ul
+{ margin: 10px 0 0 10px;}
+
+#luadoc strong { font-weight: bold;}
+
+#luadoc em { font-style: italic;}
+
+#luadoc h1 {
+    font-size: 1.5em;
+    margin: 25px 0 20px 0;
+}
+#luadoc h2,
+#luadoc h3,
+#luadoc h4 { margin: 15px 0 10px 0; }
+#luadoc h2 { font-size: 1.25em; }
+#luadoc h3 { font-size: 1.15em; }
+#luadoc h4 { font-size: 1.06em; }
+
+#luadoc hr {
+    color:#cccccc;
+    background: #00007f;
+    height: 1px;
+}
+
+#luadoc blockquote { margin-left: 3em; }
+
+#luadoc ul { list-style-type: disc; }
+
+#luadoc p.name {
+    font-family: "Andale Mono", monospace;
+    padding-top: 1em;
+}
+
+#luadoc p:first-child {
+    margin-top: 0px;
+}
+
+#luadoc table.function_list {
+    border-width: 1px;
+    border-style: solid;
+    border-color: #cccccc;
+    border-collapse: collapse;
+}
+#luadoc table.function_list td {
+    border-width: 1px;
+    padding: 3px;
+    border-style: solid;
+    border-color: #cccccc;
+}
+
+#luadoc table.function_list td.name { background-color: #f0f0f0; }
+#luadoc table.function_list td.summary { width: 100%; }
+
+#luadoc dl.table dt,
+#luadoc dl.function dt {border-top: 1px solid #ccc; padding-top: 1em;}
+#luadoc dl.table dd,
+#luadoc dl.function dd {padding-bottom: 1em; margin: 10px 0 0 20px;}
+#luadoc dl.table h3,
+#luadoc dl.function h3 {font-size: .95em;}
+
+
+
+#luadoc pre.example {
+    background-color: #eeffcc;
+    border: 1px solid #e1e4e5;
+    padding: 10px;
+    margin: 10px 0 10px 0;
+    overflow-x: auto;
+}
+
+#luadoc code {
+    background-color: inherit;
+    color: inherit;
+    border: none;
+    font-family: monospace;
+}
+
+#luadoc pre.example code {
+    color: #404040;
+    background-color: #eeffcc;
+    border: none;
+    white-space: pre;
+    padding: 0px;
+}
+
+#luadoc dt {
+    background: inherit;
+    color: inherit;
+    width: 100%;
+    padding: 0px;
+}
+
+#luadoc a:not(:link) {
+    font-weight: bold;
+    color: #000;
+    text-decoration: none;
+    cursor: inherit;
+}
+#luadoc a:link { font-weight: bold; color: #004080; text-decoration: none; }
+#luadoc a:visited { font-weight: bold; color: #006699; text-decoration: none; }
+#luadoc a:link:hover { text-decoration: underline; }
+
+#luadoc dl,
+#luadoc dd {margin: 0px; line-height: 1.2em;}
+#luadoc li {list-style: bullet;}
+
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 72bb17adbb..7f2affbb75 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -13,6 +13,7 @@
 # serve to show the default.
 import os
 import sys
+import subprocess
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -148,7 +149,11 @@ html_theme = 'sphinx_rtd_theme'
 
 def setup(app):
     app.add_stylesheet('figures.css')
-
+    app.add_stylesheet('luadoc.css')
+    try:
+        subprocess.call(project_root + '/docs/source/generate_luadoc.sh')
+    except Exception as e:
+        print('Can\'t generate Lua API documentation:', e)
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
@@ -176,7 +181,7 @@ html_static_path = [
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
 # directly to the root of the documentation.
-html_extra_path = ['generated-luadoc']
+#html_extra_path = []
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
diff --git a/docs/source/generate_luadoc.sh b/docs/source/generate_luadoc.sh
new file mode 100755
index 0000000000..7a238eca5a
--- /dev/null
+++ b/docs/source/generate_luadoc.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+# How to install openmwluadocumentor:
+
+# sudo apt install luarocks
+# git clone https://gitlab.com/ptmikheev/openmw-luadocumentor.git
+# cd openmw-luadocumentor/luarocks
+# luarocks --local pack openmwluadocumentor-0.1.1-1.rockspec
+# luarocks --local install openmwluadocumentor-0.1.1-1.src.rock
+
+if [ -f /.dockerenv ]; then
+    # We are inside readthedocs pipeline
+    echo "Install lua 5.1"
+    cd ~
+    curl -R -O https://www.lua.org/ftp/lua-5.1.5.tar.gz
+    tar -zxf lua-5.1.5.tar.gz
+    cd lua-5.1.5/
+    make linux
+    PATH=$PATH:~/lua-5.1.5/src
+
+    echo "Install luarocks"
+    cd ~
+    wget https://luarocks.org/releases/luarocks-2.4.2.tar.gz
+    tar zxpf luarocks-2.4.2.tar.gz
+    cd luarocks-2.4.2/
+    ./configure --with-lua-bin=$HOME/lua-5.1.5/src --with-lua-include=$HOME/lua-5.1.5/src --prefix=$HOME/luarocks
+    make build
+    make install
+    PATH=$PATH:~/luarocks/bin
+
+    echo "Install openmwluadocumentor"
+    cd ~
+    git clone https://gitlab.com/ptmikheev/openmw-luadocumentor.git
+    cd openmw-luadocumentor/luarocks
+    luarocks --local install checks
+    luarocks --local pack openmwluadocumentor-0.1.1-1.rockspec
+    luarocks --local install openmwluadocumentor-0.1.1-1.src.rock
+fi
+
+DOCS_SOURCE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+FILES_DIR=$DOCS_SOURCE_DIR/../../files
+OUTPUT_DIR=$DOCS_SOURCE_DIR/reference/lua-scripting/generated_html
+
+rm -f $OUTPUT_DIR/*.html
+
+cd $FILES_DIR/lua_api
+~/.luarocks/bin/openmwluadocumentor -f doc -d $OUTPUT_DIR openmw/*lua
+
+cd $FILES_DIR/builtin_scripts
+~/.luarocks/bin/openmwluadocumentor -f doc -d $OUTPUT_DIR openmw_aux/*lua
+
diff --git a/docs/source/reference/lua-scripting/api.rst b/docs/source/reference/lua-scripting/api.rst
index f98d4ef074..3a18f2445a 100644
--- a/docs/source/reference/lua-scripting/api.rst
+++ b/docs/source/reference/lua-scripting/api.rst
@@ -3,54 +3,25 @@ Lua API reference
 #################
 
 .. toctree::
-    :caption: Table of Contents
-    :maxdepth: 2
+    :hidden:
 
-Engine handlers reference
-=========================
+    engine_handlers
+    openmw_util
+    openmw_core
+    openmw_async
+    openmw_query
+    openmw_world
+    openmw_self
+    openmw_nearby
+    openmw_ui
+    openmw_aux_util
 
-Engine handler is a function defined by a script, that can be called by the engine.
 
-+------------------------------------------------------------------------------------------------+
-| **Can be defined by any script**                                                               |
-+----------------------------------+-------------------------------------------------------------+
-| onUpdate(dt)                     | | Called every frame if game not paused. `dt` is the time   |
-|                                  | | from the last update in seconds.                          |
-+----------------------------------+-------------------------------------------------------------+
-| onSave() -> data                 | | Called when the game is saving. May be called in inactive |
-|                                  | | state, so it shouldn't use `openmw.nearby`.               |
-+----------------------------------+-------------------------------------------------------------+
-| onLoad(data)                     | | Called on loading with the data previosly returned by     |
-|                                  | | onSave. During loading the object is always in inactive.  |
-+----------------------------------+-------------------------------------------------------------+
-| **Only for global scripts**                                                                    |
-+----------------------------------+-------------------------------------------------------------+
-| onNewGame()                      | New game is started                                         |
-+----------------------------------+-------------------------------------------------------------+
-| onPlayerAdded(player)            |Player added to game world. The argument is a `Game object`. |
-+----------------------------------+-------------------------------------------------------------+
-| onActorActive(actor)             | Actor (NPC or Creature) becomes active.                     |
-+----------------------------------+-------------------------------------------------------------+
-| **Only for local scripts**                                                                     |
-+----------------------------------+-------------------------------------------------------------+
-| onActive()                       | | Called when the object becomes active (either a player    |
-|                                  | | came to this cell again, or a save was loaded).           |
-+----------------------------------+-------------------------------------------------------------+
-| onInactive()                     | | Object became inactive. Since it is inactive the handler  |
-|                                  | | can not access anything nearby, but it is possible to send|
-|                                  | | an event to global scripts.                               |
-+----------------------------------+-------------------------------------------------------------+
-| onConsume(recordId)              | | Called if `recordId` (e.g. a potion) is consumed.         |
-+----------------------------------+-------------------------------------------------------------+
-| **Only for local scripts attached to a player**                                                |
-+----------------------------------+-------------------------------------------------------------+
-| onKeyPress(symbol, modifiers)    | | Key pressed. `Symbol` is an ASCII code, `modifiers` is    |
-|                                  | | a binary OR of flags of special keys (ctrl, shift, alt).  |
-+----------------------------------+-------------------------------------------------------------+
+- :ref:`Engine handlers reference`
+- `Game object reference <openmw_core.html##(GameObject)>`_
+- `Cell reference <openmw_core.html##(Cell)>`_
 
-
-Packages reference
-==================
+**API packages**
 
 API packages provide functions that can be called by scripts. I.e. it is a script-to-engine interaction.
 A package can be loaded with ``require('<package name>')``.
@@ -63,23 +34,34 @@ Player scripts are local scripts that are attached to a player.
 +=========================================================+====================+===============================================================+
 |:ref:`openmw.interfaces <Script interfaces>`             | everywhere         | | Public interfaces of other scripts.                         |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|`openmw.util <../../lua-api-reference/util.html>`_       | everywhere         | | Defines utility functions and classes like 3D vectors,      |
+|:ref:`openmw.util <Package openmw.util>`                 | everywhere         | | Defines utility functions and classes like 3D vectors,      |
 |                                                         |                    | | that don't depend on the game world.                        |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|`openmw.core <../../lua-api-reference/core.html>`_       | everywhere         | | Functions that are common for both global and local scripts |
+|:ref:`openmw.core <Package openmw.core>`                 | everywhere         | | Functions that are common for both global and local scripts |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|`openmw.async <../../lua-api-reference/async.html>`_     | everywhere         | | Timers (implemented) and coroutine utils (not implemented)  |
+|:ref:`openmw.async <Package openmw.async>`               | everywhere         | | Timers (implemented) and coroutine utils (not implemented)  |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|`openmw.query <../../lua-api-reference/query.html>`_     | everywhere         | | Tools for constructing queries: base queries and fields.    |
+|:ref:`openmw.query <Package openmw.query>`               | everywhere         | | Tools for constructing queries: base queries and fields.    |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|`openmw.world <../../lua-api-reference/world.html>`_     | by global scripts  | | Read-write access to the game world.                        |
+|:ref:`openmw.world <Package openmw.world>`               | by global scripts  | | Read-write access to the game world.                        |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|`openmw.self <../../lua-api-reference/self.html>`_       | by local scripts   | | Full access to the object the script is attached to.        |
+|:ref:`openmw.self <Package openmw.self>`                 | by local scripts   | | Full access to the object the script is attached to.        |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|`openmw.nearby <../../lua-api-reference/nearby.html>`_   | by local scripts   | | Read-only access to the nearest area of the game world.     |
+|:ref:`openmw.nearby <Package openmw.nearby>`             | by local scripts   | | Read-only access to the nearest area of the game world.     |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|`openmw.ui <../../lua-api-reference/ui.html>`_           | by player scripts  | | Controls user interface                                     |
+|:ref:`openmw.ui <Package openmw.ui>`                     | by player scripts  | | Controls user interface                                     |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |openmw.camera                                            | by player scripts  | | Controls camera (not implemented)                           |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 
+**openmw_aux**
+
+``openmw_aux.*`` are built-in libraries that are itself implemented in Lua. They can not do anything that is not possible with the basic API, they only make it more convenient.
+Sources can be found in ``resources/vfs/openmw_aux``. In theory mods can override them, but it is not recommended.
+
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+| Built-in library                                        | Can be used        | Description                                                   |
++=========================================================+====================+===============================================================+
+|:ref:`openmw_aux.util <Package openmw_aux.util>`         | everywhere         | | Miscellaneous utils                                         |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+
diff --git a/docs/source/reference/lua-scripting/engine_handlers.rst b/docs/source/reference/lua-scripting/engine_handlers.rst
new file mode 100644
index 0000000000..f08892be36
--- /dev/null
+++ b/docs/source/reference/lua-scripting/engine_handlers.rst
@@ -0,0 +1,43 @@
+Engine handlers reference
+=========================
+
+Engine handler is a function defined by a script, that can be called by the engine.
+
++---------------------------------------------------------------------------------------------------------+
+| **Can be defined by any script**                                                                        |
++----------------------------------+----------------------------------------------------------------------+
+| onUpdate(dt)                     | | Called every frame if game not paused. `dt` is the time            |
+|                                  | | from the last update in seconds.                                   |
++----------------------------------+----------------------------------------------------------------------+
+| onSave() -> data                 | | Called when the game is saving. May be called in inactive          |
+|                                  | | state, so it shouldn't use `openmw.nearby`.                        |
++----------------------------------+----------------------------------------------------------------------+
+| onLoad(data)                     | | Called on loading with the data previosly returned by              |
+|                                  | | onSave. During loading the object is always inactive.              |
++----------------------------------+----------------------------------------------------------------------+
+| **Only for global scripts**                                                                             |
++----------------------------------+----------------------------------------------------------------------+
+| onNewGame()                      | New game is started                                                  |
++----------------------------------+----------------------------------------------------------------------+
+| onPlayerAdded(player)            | Player added to the game world. The argument is a `Game object`.     |
++----------------------------------+----------------------------------------------------------------------+
+| onActorActive(actor)             | Actor (NPC or Creature) becomes active.                              |
++----------------------------------+----------------------------------------------------------------------+
+| **Only for local scripts**                                                                              |
++----------------------------------+----------------------------------------------------------------------+
+| onActive()                       | | Called when the object becomes active (either a player             |
+|                                  | | came to this cell again, or a save was loaded).                    |
++----------------------------------+----------------------------------------------------------------------+
+| onInactive()                     | | Object became inactive. Since it is inactive the handler           |
+|                                  | | can not access anything nearby, but it is possible to send         |
+|                                  | | an event to global scripts.                                        |
++----------------------------------+----------------------------------------------------------------------+
+| onConsume(recordId)              | | Called if `recordId` (e.g. a potion) is consumed.                  |
++----------------------------------+----------------------------------------------------------------------+
+| **Only for local scripts attached to a player**                                                         |
++----------------------------------+----------------------------------------------------------------------+
+| onKeyPress(key)                  | | `Key <openmw_core.html##(KeyboardEvent)>`_ pressed. Usage example: |
+|                                  | | ``if key.symbol == 'z' and key.withShift then ...``                |
++----------------------------------+----------------------------------------------------------------------+
+
+
diff --git a/docs/source/reference/lua-scripting/index.rst b/docs/source/reference/lua-scripting/index.rst
index b779b8975c..75157982c9 100644
--- a/docs/source/reference/lua-scripting/index.rst
+++ b/docs/source/reference/lua-scripting/index.rst
@@ -7,6 +7,7 @@ OpenMW Lua scripting
 
 .. toctree::
     :caption: Table of Contents
+    :includehidden:
     :maxdepth: 2
 
     overview
diff --git a/docs/source/reference/lua-scripting/openmw_async.rst b/docs/source/reference/lua-scripting/openmw_async.rst
new file mode 100644
index 0000000000..9f24f63a4f
--- /dev/null
+++ b/docs/source/reference/lua-scripting/openmw_async.rst
@@ -0,0 +1,5 @@
+Package openmw.async
+====================
+
+.. raw:: html
+   :file: generated_html/openmw_async.html
diff --git a/docs/source/reference/lua-scripting/openmw_aux_util.rst b/docs/source/reference/lua-scripting/openmw_aux_util.rst
new file mode 100644
index 0000000000..01b200bfc2
--- /dev/null
+++ b/docs/source/reference/lua-scripting/openmw_aux_util.rst
@@ -0,0 +1,5 @@
+Package openmw_aux.util
+=======================
+
+.. raw:: html
+   :file: generated_html/openmw_aux_util.html
diff --git a/docs/source/reference/lua-scripting/openmw_core.rst b/docs/source/reference/lua-scripting/openmw_core.rst
new file mode 100644
index 0000000000..bde93fb9c9
--- /dev/null
+++ b/docs/source/reference/lua-scripting/openmw_core.rst
@@ -0,0 +1,5 @@
+Package openmw.core
+===================
+
+.. raw:: html
+   :file: generated_html/openmw_core.html
diff --git a/docs/source/reference/lua-scripting/openmw_nearby.rst b/docs/source/reference/lua-scripting/openmw_nearby.rst
new file mode 100644
index 0000000000..ca0a7d5d00
--- /dev/null
+++ b/docs/source/reference/lua-scripting/openmw_nearby.rst
@@ -0,0 +1,5 @@
+Package openmw.nearby
+=====================
+
+.. raw:: html
+   :file: generated_html/openmw_nearby.html
diff --git a/docs/source/reference/lua-scripting/openmw_query.rst b/docs/source/reference/lua-scripting/openmw_query.rst
new file mode 100644
index 0000000000..ea0932e8f0
--- /dev/null
+++ b/docs/source/reference/lua-scripting/openmw_query.rst
@@ -0,0 +1,5 @@
+Package openmw.query
+====================
+
+.. raw:: html
+   :file: generated_html/openmw_query.html
diff --git a/docs/source/reference/lua-scripting/openmw_self.rst b/docs/source/reference/lua-scripting/openmw_self.rst
new file mode 100644
index 0000000000..71a2cb04ae
--- /dev/null
+++ b/docs/source/reference/lua-scripting/openmw_self.rst
@@ -0,0 +1,5 @@
+Package openmw.self
+===================
+
+.. raw:: html
+   :file: generated_html/openmw_self.html
diff --git a/docs/source/reference/lua-scripting/openmw_ui.rst b/docs/source/reference/lua-scripting/openmw_ui.rst
new file mode 100644
index 0000000000..1b7b57c359
--- /dev/null
+++ b/docs/source/reference/lua-scripting/openmw_ui.rst
@@ -0,0 +1,5 @@
+Package openmw.ui
+=================
+
+.. raw:: html
+   :file: generated_html/openmw_ui.html
diff --git a/docs/source/reference/lua-scripting/openmw_util.rst b/docs/source/reference/lua-scripting/openmw_util.rst
new file mode 100644
index 0000000000..f054d7b44d
--- /dev/null
+++ b/docs/source/reference/lua-scripting/openmw_util.rst
@@ -0,0 +1,5 @@
+Package openmw.util
+===================
+
+.. raw:: html
+   :file: generated_html/openmw_util.html
diff --git a/docs/source/reference/lua-scripting/openmw_world.rst b/docs/source/reference/lua-scripting/openmw_world.rst
new file mode 100644
index 0000000000..b8818d4027
--- /dev/null
+++ b/docs/source/reference/lua-scripting/openmw_world.rst
@@ -0,0 +1,5 @@
+Package openmw.world
+====================
+
+.. raw:: html
+   :file: generated_html/openmw_world.html
diff --git a/files/lua_api/openmw/README.md b/files/lua_api/openmw/README.md
deleted file mode 100644
index 4af9922b79..0000000000
--- a/files/lua_api/openmw/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-`*.lua` files from this dir are also used to generate html documentation.
-
-After every change run the following commands to update it:
-
-```
-luadocumentor -f doc -d ../../../docs/source/generated-luadoc/lua-api-reference *.lua
-sed -i 's/openmw\.\(\w*\)\(\#\|\.html\)/\1\2/g' ../../../docs/source/generated-luadoc/lua-api-reference/*.html
-```
-
-`luadocumentor` can be installed via `luarocks`:
-
-```
-luarocks install luadocumentor
-```
diff --git a/files/lua_api/openmw/generate_luadoc.sh b/files/lua_api/openmw/generate_luadoc.sh
deleted file mode 100755
index 2eacf30f9f..0000000000
--- a/files/lua_api/openmw/generate_luadoc.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-luadocumentor -f doc -d ../../../docs/source/generated-luadoc/lua-api-reference *.lua
-sed -i 's/openmw\.\(\w*\)\(\#\|\.html\)/\1\2/g' ../../../docs/source/generated-luadoc/lua-api-reference/*.html

From 702eb19271fd8f9bb011f8caef887cd44a84e746 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Fri, 23 Apr 2021 02:49:12 +0200
Subject: [PATCH 1003/2859] Fixes and refactoring

---
 apps/openmw/engine.cpp                        | 21 ++++---
 apps/openmw/mwbase/luamanager.hpp             | 19 +++---
 apps/openmw/mwlua/actions.cpp                 | 19 ++----
 apps/openmw/mwlua/asyncbindings.cpp           | 13 ++--
 apps/openmw/mwlua/localscripts.cpp            | 23 +++-----
 apps/openmw/mwlua/localscripts.hpp            |  4 +-
 apps/openmw/mwlua/luabindings.cpp             |  8 ++-
 apps/openmw/mwlua/luamanagerimp.cpp           | 41 ++-----------
 apps/openmw/mwlua/luamanagerimp.hpp           |  1 -
 apps/openmw/mwlua/objectbindings.cpp          | 12 ++--
 apps/openmw/mwlua/query.cpp                   |  5 +-
 apps/openmw/mwmechanics/actors.cpp            | 28 ++++-----
 apps/openmw/mwworld/cellref.cpp               |  5 +-
 apps/openmw/mwworld/refdata.cpp               |  2 +-
 apps/openmw/mwworld/refdata.hpp               |  2 +-
 apps/openmw_test_suite/CMakeLists.txt         |  1 +
 .../lua/test_omwscriptsparser.cpp             | 59 +++++++++++++++++++
 .../lua/test_scriptscontainer.cpp             | 25 ++++----
 components/CMakeLists.txt                     |  2 +-
 components/esm/luascripts.cpp                 |  4 +-
 components/esm/luascripts.hpp                 |  8 ++-
 components/lua/luastate.cpp                   |  6 +-
 components/lua/omwscriptsparser.cpp           | 44 ++++++++++++++
 components/lua/omwscriptsparser.hpp           | 14 +++++
 components/lua/scriptscontainer.cpp           | 32 +++++-----
 components/lua/scriptscontainer.hpp           |  7 ++-
 components/lua/serialization.cpp              |  8 ++-
 27 files changed, 254 insertions(+), 159 deletions(-)
 create mode 100644 apps/openmw_test_suite/lua/test_omwscriptsparser.cpp
 create mode 100644 components/lua/omwscriptsparser.cpp
 create mode 100644 components/lua/omwscriptsparser.hpp

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 71d169c0bc..1bd79cdd02 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -833,18 +833,17 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
 class OMW::Engine::LuaWorker
 {
 public:
-    explicit LuaWorker(Engine* engine) :
-        mEngine(engine),
-        mSeparateThread(Settings::Manager::getInt("lua num threads", "Lua") > 0)
+    explicit LuaWorker(Engine* engine) : mEngine(engine)
     {
-        if (mSeparateThread)
+        if (Settings::Manager::getInt("lua num threads", "Lua") > 0)
             mThread = std::thread([this]{ threadBody(); });
     };
 
     void allowUpdate(double dt)
     {
         mDt = dt;
-        if (!mSeparateThread)
+        mIsGuiMode = mEngine->mEnvironment.getWindowManager()->isGuiMode();
+        if (!mThread)
             return;
         {
             std::lock_guard<std::mutex> lk(mMutex);
@@ -855,7 +854,7 @@ public:
 
     void finishUpdate()
     {
-        if (mSeparateThread)
+        if (mThread)
         {
             std::unique_lock<std::mutex> lk(mMutex);
             mCV.wait(lk, [&]{ return !mUpdateRequest; });
@@ -867,8 +866,8 @@ public:
 
     void join()
     {
-        if (mSeparateThread)
-            mThread.join();
+        if (mThread)
+            mThread->join();
     }
 
 private:
@@ -879,7 +878,7 @@ private:
         const unsigned int frameNumber = viewer->getFrameStamp()->getFrameNumber();
         ScopedProfile<UserStatsType::Lua> profile(frameStart, frameNumber, *osg::Timer::instance(), *viewer->getViewerStats());
 
-        mEngine->mLuaManager->update(mEngine->mEnvironment.getWindowManager()->isGuiMode(), mDt);
+        mEngine->mLuaManager->update(mIsGuiMode, mDt);
     }
 
     void threadBody()
@@ -898,12 +897,12 @@ private:
     }
 
     Engine* mEngine;
-    const bool mSeparateThread;
     std::mutex mMutex;
     std::condition_variable mCV;
     bool mUpdateRequest;
     double mDt = 0;
-    std::thread mThread;
+    bool mIsGuiMode = false;
+    std::optional<std::thread> mThread;
 };
 
 // Initialise and enter main loop.
diff --git a/apps/openmw/mwbase/luamanager.hpp b/apps/openmw/mwbase/luamanager.hpp
index 24c1780984..4e437246c4 100644
--- a/apps/openmw/mwbase/luamanager.hpp
+++ b/apps/openmw/mwbase/luamanager.hpp
@@ -17,7 +17,7 @@ namespace ESM
 {
     class ESMReader;
     class ESMWriter;
-    class LuaScripts;
+    struct LuaScripts;
 }
 
 namespace MWBase
@@ -40,15 +40,16 @@ namespace MWBase
         // virtual void objectOnHit(const MWWorld::Ptr &ptr, float damage, bool ishealth, const MWWorld::Ptr &object,
         //                          const MWWorld::Ptr &attacker, const osg::Vec3f &hitPosition, bool successful) = 0;
 
-        struct ActorControls {
-            bool disableAI;
-            bool controlledFromLua;
+        struct ActorControls
+        {
+            bool mDisableAI;
+            bool mControlledFromLua;
 
-            bool jump;
-            bool run;
-            float movement;
-            float sideMovement;
-            float turn;
+            bool mJump;
+            bool mRun;
+            float mMovement;
+            float mSideMovement;
+            float mTurn;
         };
 
         virtual ActorControls* getActorControls(const MWWorld::Ptr&) const = 0;
diff --git a/apps/openmw/mwlua/actions.cpp b/apps/openmw/mwlua/actions.cpp
index 00707b3d31..1664501f4f 100644
--- a/apps/openmw/mwlua/actions.cpp
+++ b/apps/openmw/mwlua/actions.cpp
@@ -53,7 +53,7 @@ namespace MWLua
         std::fill(usedSlots.begin(), usedSlots.end(), false);
 
         constexpr int anySlot = -1;
-        auto tryEquipToSlot = [&](int slot, const Item& item) -> bool
+        auto tryEquipToSlot = [&actor, &store, &usedSlots, &worldView, anySlot](int slot, const Item& item) -> bool
         {
             auto old_it = slot != anySlot ? store.getSlot(slot) : store.end();
             MWWorld::Ptr itemPtr;
@@ -83,23 +83,16 @@ namespace MWLua
             }
 
             auto [allowedSlots, _] = itemPtr.getClass().getEquipmentSlots(itemPtr);
-            bool requestedSlotIsAllowed = false;
-            for (int allowedSlot : allowedSlots)
-                requestedSlotIsAllowed = requestedSlotIsAllowed || allowedSlot == slot;
+            bool requestedSlotIsAllowed = std::find(allowedSlots.begin(), allowedSlots.end(), slot) != allowedSlots.end();
             if (!requestedSlotIsAllowed)
             {
-                slot = anySlot;
-                for (int allowedSlot : allowedSlots)
-                    if (!usedSlots[allowedSlot])
-                    {
-                        slot = allowedSlot;
-                        break;
-                    }
-                if (slot == anySlot)
+                auto firstAllowed = std::find_if(allowedSlots.begin(), allowedSlots.end(), [&](int s) { return !usedSlots[s]; });
+                if (firstAllowed == allowedSlots.end())
                 {
                     Log(Debug::Warning) << "No suitable slot for " << ptrToString(itemPtr);
                     return false;
                 }
+                slot = *firstAllowed;
             }
 
             // TODO: Refactor InventoryStore to accept Ptr and get rid of this linear search.
@@ -124,7 +117,7 @@ namespace MWLua
             if (tryEquipToSlot(slot, new_it->second))
                 usedSlots[slot] = true;
         }
-        for (auto [slot, item] : mEquipment)
+        for (const auto& [slot, item] : mEquipment)
             if (slot >= MWWorld::InventoryStore::Slots)
                 tryEquipToSlot(anySlot, item);
     }
diff --git a/apps/openmw/mwlua/asyncbindings.cpp b/apps/openmw/mwlua/asyncbindings.cpp
index 83c1dbd81b..fee6788b89 100644
--- a/apps/openmw/mwlua/asyncbindings.cpp
+++ b/apps/openmw/mwlua/asyncbindings.cpp
@@ -17,6 +17,7 @@ namespace MWLua
 
     sol::function getAsyncPackageInitializer(const Context& context)
     {
+        using TimeUnit = LuaUtil::ScriptsContainer::TimeUnit;
         sol::usertype<AsyncPackageId> api = context.mLua->sol().new_usertype<AsyncPackageId>("AsyncPackage");
         api["registerTimerCallback"] = [](const AsyncPackageId& asyncId, std::string_view name, sol::function callback)
         {
@@ -27,21 +28,25 @@ namespace MWLua
                                                               const TimerCallback& callback, sol::object callbackArg)
         {
             callback.mAsyncId.mContainer->setupSerializableTimer(
-                false, world->getGameTimeInSeconds() + delay, callback.mAsyncId.mScript, callback.mName, std::move(callbackArg));
+                TimeUnit::SECONDS, world->getGameTimeInSeconds() + delay,
+                callback.mAsyncId.mScript, callback.mName, std::move(callbackArg));
         };
         api["newTimerInHours"] = [world=context.mWorldView](const AsyncPackageId&, double delay,
                                                             const TimerCallback& callback, sol::object callbackArg)
         {
             callback.mAsyncId.mContainer->setupSerializableTimer(
-                true, world->getGameTimeInHours() + delay, callback.mAsyncId.mScript, callback.mName, std::move(callbackArg));
+                TimeUnit::HOURS, world->getGameTimeInHours() + delay,
+                callback.mAsyncId.mScript, callback.mName, std::move(callbackArg));
         };
         api["newUnsavableTimerInSeconds"] = [world=context.mWorldView](const AsyncPackageId& asyncId, double delay, sol::function callback)
         {
-            asyncId.mContainer->setupUnsavableTimer(false, world->getGameTimeInSeconds() + delay, asyncId.mScript, std::move(callback));
+            asyncId.mContainer->setupUnsavableTimer(
+                TimeUnit::SECONDS, world->getGameTimeInSeconds() + delay, asyncId.mScript, std::move(callback));
         };
         api["newUnsavableTimerInHours"] = [world=context.mWorldView](const AsyncPackageId& asyncId, double delay, sol::function callback)
         {
-            asyncId.mContainer->setupUnsavableTimer(true, world->getGameTimeInHours() + delay, asyncId.mScript, std::move(callback));
+            asyncId.mContainer->setupUnsavableTimer(
+                TimeUnit::HOURS, world->getGameTimeInHours() + delay, asyncId.mScript, std::move(callback));
         };
 
         auto initializer = [](sol::table hiddenData)
diff --git a/apps/openmw/mwlua/localscripts.cpp b/apps/openmw/mwlua/localscripts.cpp
index e4c50334d4..d9bb5ff26e 100644
--- a/apps/openmw/mwlua/localscripts.cpp
+++ b/apps/openmw/mwlua/localscripts.cpp
@@ -22,11 +22,11 @@ namespace MWLua
     {
         using ActorControls = MWBase::LuaManager::ActorControls;
         sol::usertype<ActorControls> controls = context.mLua->sol().new_usertype<ActorControls>("ActorControls");
-        controls["movement"] = &ActorControls::movement;
-        controls["sideMovement"] = &ActorControls::sideMovement;
-        controls["turn"] = &ActorControls::turn;
-        controls["run"] = &ActorControls::run;
-        controls["jump"] = &ActorControls::jump;
+        controls["movement"] = &ActorControls::mMovement;
+        controls["sideMovement"] = &ActorControls::mSideMovement;
+        controls["turn"] = &ActorControls::mTurn;
+        controls["run"] = &ActorControls::mRun;
+        controls["jump"] = &ActorControls::mJump;
 
         sol::usertype<SelfObject> selfAPI =
             context.mLua->sol().new_usertype<SelfObject>("SelfObject", sol::base_classes, sol::bases<LObject>());
@@ -34,8 +34,8 @@ namespace MWLua
         selfAPI["object"] = sol::readonly_property([](SelfObject& self) -> LObject { return LObject(self); });
         selfAPI["controls"] = sol::readonly_property([](SelfObject& self) { return &self.mControls; });
         selfAPI["isActive"] = [](SelfObject& self) { return &self.mIsActive; };
-        selfAPI["setDirectControl"] = [](SelfObject& self, bool v) { self.mControls.controlledFromLua = v; };
-        selfAPI["enableAI"] = [](SelfObject& self, bool v) { self.mControls.disableAI = !v; };
+        selfAPI["setDirectControl"] = [](SelfObject& self, bool v) { self.mControls.mControlledFromLua = v; };
+        selfAPI["enableAI"] = [](SelfObject& self, bool v) { self.mControls.mDisableAI = !v; };
         selfAPI["setEquipment"] = [manager=context.mLuaManager](const SelfObject& obj, sol::table equipment)
         {
             if (!obj.ptr().getClass().hasInventoryStore(obj.ptr()))
@@ -79,16 +79,11 @@ namespace MWLua
         };
     }
 
-    std::unique_ptr<LocalScripts> LocalScripts::create(LuaUtil::LuaState* lua, const LObject& obj)
-    {
-        return std::unique_ptr<LocalScripts>(new LocalScripts(lua, obj));
-    }
-
     LocalScripts::LocalScripts(LuaUtil::LuaState* lua, const LObject& obj)
         : LuaUtil::ScriptsContainer(lua, "L" + idToString(obj.id())), mData(obj)
     {
-        mData.mControls.controlledFromLua = false;
-        mData.mControls.disableAI = false;
+        mData.mControls.mControlledFromLua = false;
+        mData.mControls.mDisableAI = false;
         this->addPackage("openmw.self", sol::make_object(lua->sol(), &mData));
         registerEngineHandlers({&mOnActiveHandlers, &mOnInactiveHandlers, &mOnConsumeHandlers});
     }
diff --git a/apps/openmw/mwlua/localscripts.hpp b/apps/openmw/mwlua/localscripts.hpp
index 49612be441..80d04b7a40 100644
--- a/apps/openmw/mwlua/localscripts.hpp
+++ b/apps/openmw/mwlua/localscripts.hpp
@@ -19,8 +19,8 @@ namespace MWLua
     class LocalScripts : public LuaUtil::ScriptsContainer
     {
     public:
-        static std::unique_ptr<LocalScripts> create(LuaUtil::LuaState* lua, const LObject& obj);
         static void initializeSelfPackage(const Context&);
+        LocalScripts(LuaUtil::LuaState* lua, const LObject& obj);
 
         MWBase::LuaManager::ActorControls* getActorControls() { return &mData.mControls; }
 
@@ -42,8 +42,8 @@ namespace MWLua
         void receiveEngineEvent(const EngineEvent&, ObjectRegistry*);
 
     protected:
-        LocalScripts(LuaUtil::LuaState* lua, const LObject& obj);
         SelfObject mData;
+
     private:
         EngineHandlerList mOnActiveHandlers{"onActive"};
         EngineHandlerList mOnInactiveHandlers{"onInactive"};
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index 5ed5378c0a..f48f78fe38 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -76,7 +76,7 @@ namespace MWLua
             if (cell)
                 return GCell{cell};
             else
-                return {};
+                return sol::nullopt;
         };
         api["getExteriorCell"] = [worldView=context.mWorldView](int x, int y) -> sol::optional<GCell>
         {
@@ -84,7 +84,7 @@ namespace MWLua
             if (cell)
                 return GCell{cell};
             else
-                return {};
+                return sol::nullopt;
         };
         api["activeActors"] = GObjectList{worldView->getActorsInScene()};
         api["selectObjects"] = [context](const Queries::Query& query)
@@ -156,7 +156,9 @@ namespace MWLua
         for (const Queries::Field* field : group.mFields)
         {
             sol::table subgroup = res;
-            for (int i = 0; i < static_cast<int>(field->path().size()) - 1; ++i)
+            if (field->path().empty())
+                throw std::logic_error("Empty path in Queries::Field");
+            for (size_t i = 0; i < field->path().size() - 1; ++i)
             {
                 const std::string& name = field->path()[i];
                 if (subgroup[name] == sol::nil)
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index bd07c191f9..3c67be5418 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -7,6 +7,7 @@
 #include <components/esm/luascripts.hpp>
 
 #include <components/lua/utilpackage.hpp>
+#include <components/lua/omwscriptsparser.hpp>
 
 #include "../mwbase/windowmanager.hpp"
 
@@ -19,9 +20,10 @@
 namespace MWLua
 {
 
-    LuaManager::LuaManager(const VFS::Manager* vfs, const std::vector<std::string>& globalScriptLists) : mLua(vfs)
+    LuaManager::LuaManager(const VFS::Manager* vfs, const std::vector<std::string>& scriptLists) : mLua(vfs)
     {
         Log(Debug::Info) << "Lua version: " << LuaUtil::getLuaVersion();
+        mGlobalScriptList = LuaUtil::parseOMWScriptsFiles(vfs, scriptLists);
 
         mGlobalSerializer = createUserdataSerializer(false, mWorldView.getObjectRegistry());
         mLocalSerializer = createUserdataSerializer(true, mWorldView.getObjectRegistry());
@@ -58,37 +60,6 @@ namespace MWLua
         mCameraPackage = initCameraPackage(localContext);
         mUserInterfacePackage = initUserInterfacePackage(localContext);
         mNearbyPackage = initNearbyPackage(localContext);
-
-        auto endsWith = [](std::string_view s, std::string_view suffix)
-        {
-            return s.size() >= suffix.size() && std::equal(suffix.rbegin(), suffix.rend(), s.rbegin());
-        };
-        for (const std::string& scriptListFile : globalScriptLists)
-        {
-            if (!endsWith(scriptListFile, ".omwscripts"))
-            {
-                Log(Debug::Error) << "Script list should have suffix '.omwscripts', got: '" << scriptListFile << "'";
-                continue;
-            }
-            std::string content(std::istreambuf_iterator<char>(*vfs->get(scriptListFile)), {});
-            std::string_view view(content);
-            while (!view.empty())
-            {
-                size_t pos = 0;
-                while (pos < view.size() && view[pos] != '\n')
-                    pos++;
-                std::string_view line = view.substr(0, pos);
-                view = view.substr(pos + 1);
-                if (line.empty() || line[0] == '#')
-                    continue;
-                if (line.back() == '\r')
-                    line = line.substr(0, pos - 1);
-                if (endsWith(line, ".lua"))
-                    mGlobalScriptList.push_back(std::string(line));
-                else
-                    Log(Debug::Error) << "Lua script should have suffix '.lua', got: '" << line.substr(0, 300) << "'";
-            }
-        }
     }
 
     void LuaManager::init()
@@ -306,18 +277,18 @@ namespace MWLua
 
     LocalScripts* LuaManager::createLocalScripts(const MWWorld::Ptr& ptr)
     {
-        std::unique_ptr<LocalScripts> scripts;
+        std::shared_ptr<LocalScripts> scripts;
         // When loading a game, it can be called before LuaManager::setPlayer,
         // so we can't just check ptr == mPlayer here.
         if (*ptr.getCellRef().getRefIdPtr() == "player")
         {
             mPlayerScripts = new PlayerScripts(&mLua, LObject(getId(ptr), mWorldView.getObjectRegistry()));
-            scripts = std::unique_ptr<LocalScripts>(mPlayerScripts);
+            scripts = std::shared_ptr<LocalScripts>(mPlayerScripts);
             scripts->addPackage("openmw.ui", mUserInterfacePackage);
             scripts->addPackage("openmw.camera", mCameraPackage);
         }
         else
-            scripts = LocalScripts::create(&mLua, LObject(getId(ptr), mWorldView.getObjectRegistry()));
+            scripts = std::make_shared<LocalScripts>(&mLua, LObject(getId(ptr), mWorldView.getObjectRegistry()));
         scripts->addPackage("openmw.nearby", mNearbyPackage);
         scripts->setSerializer(mLocalSerializer.get());
 
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index 5cfadebc40..be7174a35a 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -23,7 +23,6 @@ namespace MWLua
     {
     public:
         LuaManager(const VFS::Manager* vfs, const std::vector<std::string>& globalScriptLists);
-        ~LuaManager() {}
 
         // Called by engine.cpp when environment is fully initialized.
         void init();
diff --git a/apps/openmw/mwlua/objectbindings.cpp b/apps/openmw/mwlua/objectbindings.cpp
index 64ac84e4f0..d4ae041549 100644
--- a/apps/openmw/mwlua/objectbindings.cpp
+++ b/apps/openmw/mwlua/objectbindings.cpp
@@ -104,7 +104,7 @@ namespace MWLua
             if (ptr.isInCell())
                 return Cell<ObjectT>{ptr.getCell()};
             else
-                return {};
+                return sol::nullopt;
         });
         objectT["position"] = sol::readonly_property([](const ObjectT& o) -> osg::Vec3f
         {
@@ -123,17 +123,17 @@ namespace MWLua
             context.mLocalEventQueue->push_back({dest.id(), std::move(eventName), LuaUtil::serialize(eventData, context.mSerializer)});
         };
 
-        objectT["canMove"] = [context](const ObjectT& o)
+        objectT["canMove"] = [](const ObjectT& o)
         {
             const MWWorld::Class& cls = o.ptr().getClass();
             return cls.getMaxSpeed(o.ptr()) > 0;
         };
-        objectT["getRunSpeed"] = [context](const ObjectT& o)
+        objectT["getRunSpeed"] = [](const ObjectT& o)
         {
             const MWWorld::Class& cls = o.ptr().getClass();
             return cls.getRunSpeed(o.ptr());
         };
-        objectT["getWalkSpeed"] = [context](const ObjectT& o)
+        objectT["getWalkSpeed"] = [](const ObjectT& o)
         {
             const MWWorld::Class& cls = o.ptr().getClass();
             return cls.getWalkSpeed(o.ptr());
@@ -182,12 +182,12 @@ namespace MWLua
         {
             const MWWorld::CellRef& cellRef = ptr(o).getCellRef();
             if (!cellRef.getTeleport())
-                return {};
+                return sol::nullopt;
             MWWorld::CellStore* cell = worldView->findCell(cellRef.getDestCell(), cellRef.getDoorDest().asVec3());
             if (cell)
                 return Cell<ObjectT>{cell};
             else
-                return {};
+                return sol::nullopt;
         });
     }
 
diff --git a/apps/openmw/mwlua/query.cpp b/apps/openmw/mwlua/query.cpp
index f42c7ae2d4..c357e56884 100644
--- a/apps/openmw/mwlua/query.cpp
+++ b/apps/openmw/mwlua/query.cpp
@@ -84,9 +84,12 @@ namespace MWLua
         }
         if (ptr.getRefData().getCount() == 0)
             return false;
-        // It is stupid, but "prisonmarker" has class "Door" despite that it is only an invisible marker. So we ignore all markers.
+
+        // It is important to exclude all markers before checking what class it is.
+        // For example "prisonmarker" has class "Door" despite that it is only an invisible marker.
         if (isMarker(ptr))
             return false;
+
         const MWWorld::Class& cls = ptr.getClass();
         if (cls.isActivator() != (query.mQueryType == ObjectQueryTypes::ACTIVATORS))
             return false;
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 97d95251a4..844b2b6987 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -2065,7 +2065,7 @@ namespace MWMechanics
                         if (iter->first != player)
                         {
                             CreatureStats &stats = iter->first.getClass().getCreatureStats(iter->first);
-                            if (isConscious(iter->first) && !(luaControls && luaControls->disableAI))
+                            if (isConscious(iter->first) && !(luaControls && luaControls->mDisableAI))
                             {
                                 stats.getAiSequence().execute(iter->first, *ctrl, duration);
                                 updateGreetingState(iter->first, *iter->second, timerUpdateHello > 0);
@@ -2074,7 +2074,7 @@ namespace MWMechanics
                             }
                         }
                     }
-                    else if (aiActive && iter->first != player && isConscious(iter->first) && !(luaControls && luaControls->disableAI))
+                    else if (aiActive && iter->first != player && isConscious(iter->first) && !(luaControls && luaControls->mDisableAI))
                     {
                         CreatureStats &stats = iter->first.getClass().getCreatureStats(iter->first);
                         stats.getAiSequence().execute(iter->first, *ctrl, duration, /*outOfRange*/true);
@@ -2101,21 +2101,21 @@ namespace MWMechanics
                         float rotationZ = mov.mRotation[2];
                         bool jump = mov.mPosition[2] == 1;
                         bool runFlag = stats.getMovementFlag(MWMechanics::CreatureStats::Flag_Run);
-                        if (luaControls->controlledFromLua)
+                        if (luaControls->mControlledFromLua)
                         {
-                            mov.mPosition[0] = luaControls->sideMovement;
-                            mov.mPosition[1] = luaControls->movement;
-                            mov.mPosition[2] = luaControls->jump ? 1 : 0;
+                            mov.mPosition[0] = luaControls->mSideMovement;
+                            mov.mPosition[1] = luaControls->mMovement;
+                            mov.mPosition[2] = luaControls->mJump ? 1 : 0;
                             mov.mRotation[1] = 0;
-                            mov.mRotation[2] = luaControls->turn;
-                            mov.mSpeedFactor = osg::Vec2(luaControls->movement, luaControls->sideMovement).length();
-                            stats.setMovementFlag(MWMechanics::CreatureStats::Flag_Run, luaControls->run);
+                            mov.mRotation[2] = luaControls->mTurn;
+                            mov.mSpeedFactor = osg::Vec2(luaControls->mMovement, luaControls->mSideMovement).length();
+                            stats.setMovementFlag(MWMechanics::CreatureStats::Flag_Run, luaControls->mRun);
                         }
-                        luaControls->sideMovement = movement.x();
-                        luaControls->movement = movement.y();
-                        luaControls->turn = rotationZ;
-                        luaControls->jump = jump;
-                        luaControls->run = runFlag;
+                        luaControls->mSideMovement = movement.x();
+                        luaControls->mMovement = movement.y();
+                        luaControls->mTurn = rotationZ;
+                        luaControls->mJump = jump;
+                        luaControls->mRun = runFlag;
                     }
                 }
             }
diff --git a/apps/openmw/mwworld/cellref.cpp b/apps/openmw/mwworld/cellref.cpp
index 88c38736e8..5e91ddcc67 100644
--- a/apps/openmw/mwworld/cellref.cpp
+++ b/apps/openmw/mwworld/cellref.cpp
@@ -22,8 +22,9 @@ namespace MWWorld
             lastAssignedRefNum.mIndex++;
             if (lastAssignedRefNum.mIndex == 0)  // mIndex overflow, so mContentFile should be changed
             {
-                lastAssignedRefNum.mContentFile--;
-                if (lastAssignedRefNum.mContentFile > 0)
+                if (lastAssignedRefNum.mContentFile > std::numeric_limits<int32_t>::min())
+                    lastAssignedRefNum.mContentFile--;
+                else
                     Log(Debug::Error) << "RefNum counter overflow in CellRef::getOrAssignRefNum";
             }
             mCellRef.mRefNum = lastAssignedRefNum;
diff --git a/apps/openmw/mwworld/refdata.cpp b/apps/openmw/mwworld/refdata.cpp
index b506671086..7398aef77e 100644
--- a/apps/openmw/mwworld/refdata.cpp
+++ b/apps/openmw/mwworld/refdata.cpp
@@ -23,7 +23,7 @@ enum RefDataFlags
 namespace MWWorld
 {
 
-    void RefData::setLuaScripts(std::unique_ptr<MWLua::LocalScripts>&& scripts)
+    void RefData::setLuaScripts(std::shared_ptr<MWLua::LocalScripts>&& scripts)
     {
         mChanged = true;
         mLuaScripts = std::move(scripts);
diff --git a/apps/openmw/mwworld/refdata.hpp b/apps/openmw/mwworld/refdata.hpp
index 3ae6a03293..d90224b9bb 100644
--- a/apps/openmw/mwworld/refdata.hpp
+++ b/apps/openmw/mwworld/refdata.hpp
@@ -103,7 +103,7 @@ namespace MWWorld
             void setLocals (const ESM::Script& script);
 
             MWLua::LocalScripts* getLuaScripts() { return mLuaScripts.get(); }
-            void setLuaScripts(std::unique_ptr<MWLua::LocalScripts>&&);
+            void setLuaScripts(std::shared_ptr<MWLua::LocalScripts>&&);
 
             void setCount (int count);
             ///< Set object count (an object pile is a simple object with a count >1).
diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index bd8b032378..7800efac3d 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -20,6 +20,7 @@ if (GTEST_FOUND AND GMOCK_FOUND)
         lua/test_utilpackage.cpp
         lua/test_serialization.cpp
         lua/test_querypackage.cpp
+        lua/test_omwscriptsparser.cpp
 
         misc/test_stringops.cpp
         misc/test_endianness.cpp
diff --git a/apps/openmw_test_suite/lua/test_omwscriptsparser.cpp b/apps/openmw_test_suite/lua/test_omwscriptsparser.cpp
new file mode 100644
index 0000000000..b1526ef9b6
--- /dev/null
+++ b/apps/openmw_test_suite/lua/test_omwscriptsparser.cpp
@@ -0,0 +1,59 @@
+#include "gmock/gmock.h"
+#include <gtest/gtest.h>
+
+#include <components/lua/omwscriptsparser.hpp>
+
+#include "testing_util.hpp"
+
+namespace
+{
+    using namespace testing;
+
+    TestFile file1(
+        "#comment.lua\n"
+        "\n"
+        "script1.lua\n"
+        "some mod/Some Script.lua"
+    );
+    TestFile file2(
+        "#comment.lua\r\n"
+        "\r\n"
+        "script2.lua\r\n"
+        "some other mod/Some Script.lua\r"
+    );
+    TestFile emptyFile("");
+    TestFile invalidFile("Invalid file");
+
+    struct OMWScriptsParserTest : Test
+    {
+        std::unique_ptr<VFS::Manager> mVFS = createTestVFS({
+            {"file1.omwscripts", &file1},
+            {"file2.omwscripts", &file2},
+            {"empty.omwscripts", &emptyFile},
+            {"invalid.lua", &file1},
+            {"invalid.omwscripts", &invalidFile},
+        });
+    };
+
+    TEST_F(OMWScriptsParserTest, Basic)
+    {
+        internal::CaptureStdout();
+        std::vector<std::string> res = LuaUtil::parseOMWScriptsFiles(
+            mVFS.get(), {"file2.omwscripts", "empty.omwscripts", "file1.omwscripts"});
+        EXPECT_EQ(internal::GetCapturedStdout(), "");
+        EXPECT_THAT(res, ElementsAre("script2.lua", "some other mod/Some Script.lua",
+                                     "script1.lua", "some mod/Some Script.lua"));
+    }
+
+    TEST_F(OMWScriptsParserTest, InvalidFiles)
+    {
+        internal::CaptureStdout();
+        std::vector<std::string> res = LuaUtil::parseOMWScriptsFiles(
+            mVFS.get(), {"invalid.lua", "invalid.omwscripts"});
+        EXPECT_EQ(internal::GetCapturedStdout(),
+                  "Script list should have suffix '.omwscripts', got: 'invalid.lua'\n"
+                  "Lua script should have suffix '.lua', got: 'Invalid file'\n");
+        EXPECT_THAT(res, ElementsAre());
+    }
+
+}
diff --git a/apps/openmw_test_suite/lua/test_scriptscontainer.cpp b/apps/openmw_test_suite/lua/test_scriptscontainer.cpp
index 072ad334e8..8f05138782 100644
--- a/apps/openmw_test_suite/lua/test_scriptscontainer.cpp
+++ b/apps/openmw_test_suite/lua/test_scriptscontainer.cpp
@@ -304,6 +304,7 @@ return {
 
     TEST_F(LuaScriptsContainerTest, Timers)
     {
+        using TimeUnit = LuaUtil::ScriptsContainer::TimeUnit;
         LuaUtil::ScriptsContainer scripts(&mLua, "Test");
         EXPECT_TRUE(scripts.addNewScript("test1.lua"));
         EXPECT_TRUE(scripts.addNewScript("test2.lua"));
@@ -321,18 +322,18 @@ return {
 
         scripts.processTimers(1, 2);
 
-        scripts.setupSerializableTimer(false, 10, "test1.lua", "B", sol::make_object(mLua.sol(), 3));
-        scripts.setupSerializableTimer(true, 10, "test2.lua", "B", sol::make_object(mLua.sol(), 4));
-        scripts.setupSerializableTimer(false, 5, "test1.lua", "A", sol::make_object(mLua.sol(), 1));
-        scripts.setupSerializableTimer(true, 5, "test2.lua", "A", sol::make_object(mLua.sol(), 2));
-        scripts.setupSerializableTimer(false, 15, "test1.lua", "A", sol::make_object(mLua.sol(), 10));
-        scripts.setupSerializableTimer(false, 15, "test1.lua", "B", sol::make_object(mLua.sol(), 20));
-
-        scripts.setupUnsavableTimer(false, 10, "test2.lua", fn2);
-        scripts.setupUnsavableTimer(true, 10, "test1.lua", fn2);
-        scripts.setupUnsavableTimer(false, 5, "test2.lua", fn1);
-        scripts.setupUnsavableTimer(true, 5, "test1.lua", fn1);
-        scripts.setupUnsavableTimer(false, 15, "test2.lua", fn1);
+        scripts.setupSerializableTimer(TimeUnit::SECONDS, 10, "test1.lua", "B", sol::make_object(mLua.sol(), 3));
+        scripts.setupSerializableTimer(TimeUnit::HOURS, 10, "test2.lua", "B", sol::make_object(mLua.sol(), 4));
+        scripts.setupSerializableTimer(TimeUnit::SECONDS, 5, "test1.lua", "A", sol::make_object(mLua.sol(), 1));
+        scripts.setupSerializableTimer(TimeUnit::HOURS, 5, "test2.lua", "A", sol::make_object(mLua.sol(), 2));
+        scripts.setupSerializableTimer(TimeUnit::SECONDS, 15, "test1.lua", "A", sol::make_object(mLua.sol(), 10));
+        scripts.setupSerializableTimer(TimeUnit::SECONDS, 15, "test1.lua", "B", sol::make_object(mLua.sol(), 20));
+
+        scripts.setupUnsavableTimer(TimeUnit::SECONDS, 10, "test2.lua", fn2);
+        scripts.setupUnsavableTimer(TimeUnit::HOURS, 10, "test1.lua", fn2);
+        scripts.setupUnsavableTimer(TimeUnit::SECONDS, 5, "test2.lua", fn1);
+        scripts.setupUnsavableTimer(TimeUnit::HOURS, 5, "test1.lua", fn1);
+        scripts.setupUnsavableTimer(TimeUnit::SECONDS, 15, "test2.lua", fn1);
 
         EXPECT_EQ(counter1, 0);
         EXPECT_EQ(counter3, 0);
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 7629c9798f..9d72320ca9 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -29,7 +29,7 @@ endif (GIT_CHECKOUT)
 # source files
 
 add_component_dir (lua
-    luastate scriptscontainer utilpackage serialization
+    luastate scriptscontainer utilpackage serialization omwscriptsparser
     )
 
 add_component_dir (settings
diff --git a/components/esm/luascripts.cpp b/components/esm/luascripts.cpp
index 41d25ee8be..1dd45ab2b1 100644
--- a/components/esm/luascripts.cpp
+++ b/components/esm/luascripts.cpp
@@ -48,7 +48,7 @@ void ESM::LuaScripts::load(ESMReader& esm)
         {
             esm.getSubHeader();
             LuaTimer timer;
-            esm.getT(timer.mHours);
+            esm.getT(timer.mUnit);
             esm.getT(timer.mTime);
             timer.mCallbackName = esm.getHNString("LUAC");
             timer.mCallbackArgument = loadLuaBinaryData(esm);
@@ -68,7 +68,7 @@ void ESM::LuaScripts::save(ESMWriter& esm) const
         for (const LuaTimer& timer : script.mTimers)
         {
             esm.startSubRecord("LUAT");
-            esm.writeT(timer.mHours);
+            esm.writeT(timer.mUnit);
             esm.writeT(timer.mTime);
             esm.endRecord("LUAT");
             esm.writeHNString("LUAC", timer.mCallbackName);
diff --git a/components/esm/luascripts.hpp b/components/esm/luascripts.hpp
index ef3553e2fb..f268f41536 100644
--- a/components/esm/luascripts.hpp
+++ b/components/esm/luascripts.hpp
@@ -14,8 +14,14 @@ namespace ESM
 
     struct LuaTimer
     {
+        enum class TimeUnit : bool
+        {
+            SECONDS = 0,
+            HOURS = 1,
+        };
+
+        TimeUnit mUnit;
         double mTime;
-        bool mHours;  // false - game seconds, true - game hours
         std::string mCallbackName;
         std::string mCallbackArgument;  // Serialized Lua table. It is a binary data. Can contain '\0'.
     };
diff --git a/components/lua/luastate.cpp b/components/lua/luastate.cpp
index 4020c815d0..25fa3aead1 100644
--- a/components/lua/luastate.cpp
+++ b/components/lua/luastate.cpp
@@ -12,9 +12,7 @@ namespace LuaUtil
     static std::string packageNameToPath(std::string_view packageName)
     {
         std::string res(packageName);
-        for (size_t i = 0; i < res.size(); ++i)
-            if (res[i] == '.')
-                res[i] = '/';
+        std::replace(res.begin(), res.end(), '.', '/');
         res.append(".lua");
         return res;
     }
@@ -28,7 +26,7 @@ namespace LuaUtil
     {
         mLua.open_libraries(sol::lib::base, sol::lib::coroutine, sol::lib::math, sol::lib::string, sol::lib::table);
 
-        mLua["math"]["randomseed"](static_cast<unsigned>(time(NULL)));
+        mLua["math"]["randomseed"](static_cast<unsigned>(std::time(nullptr)));
         mLua["math"]["randomseed"] = sol::nil;
 
         mLua["writeToLog"] = [](std::string_view s) { Log(Debug::Level::Info) << s; };
diff --git a/components/lua/omwscriptsparser.cpp b/components/lua/omwscriptsparser.cpp
new file mode 100644
index 0000000000..bc73e013db
--- /dev/null
+++ b/components/lua/omwscriptsparser.cpp
@@ -0,0 +1,44 @@
+#include "omwscriptsparser.hpp"
+
+#include <algorithm>
+
+#include <components/debug/debuglog.hpp>
+
+std::vector<std::string> LuaUtil::parseOMWScriptsFiles(const VFS::Manager* vfs, const std::vector<std::string>& scriptLists)
+{
+    auto endsWith = [](std::string_view s, std::string_view suffix)
+    {
+        return s.size() >= suffix.size() && std::equal(suffix.rbegin(), suffix.rend(), s.rbegin());
+    };
+    std::vector<std::string> res;
+    for (const std::string& scriptListFile : scriptLists)
+    {
+        if (!endsWith(scriptListFile, ".omwscripts"))
+        {
+            Log(Debug::Error) << "Script list should have suffix '.omwscripts', got: '" << scriptListFile << "'";
+            continue;
+        }
+        std::string content(std::istreambuf_iterator<char>(*vfs->get(scriptListFile)), {});
+        std::string_view view(content);
+        while (!view.empty())
+        {
+            size_t pos = 0;
+            while (pos < view.size() && view[pos] != '\n')
+                pos++;
+            std::string_view line = view.substr(0, pos);
+            view = view.substr(std::min(pos + 1, view.size()));
+            if (!line.empty() && line.back() == '\r')
+                line = line.substr(0, pos - 1);
+            // Lines starting with '#' are comments.
+            // TODO: Maybe make the parser more robust. It is a bit inconsistent that 'path/#to/file.lua'
+            //       is a valid path, but '#path/to/file.lua' is considered as a comment and ignored.
+            if (line.empty() || line[0] == '#')
+                continue;
+            if (endsWith(line, ".lua"))
+                res.push_back(std::string(line));
+            else
+                Log(Debug::Error) << "Lua script should have suffix '.lua', got: '" << line.substr(0, 300) << "'";
+        }
+    }
+    return res;
+}
diff --git a/components/lua/omwscriptsparser.hpp b/components/lua/omwscriptsparser.hpp
new file mode 100644
index 0000000000..1da9f123b2
--- /dev/null
+++ b/components/lua/omwscriptsparser.hpp
@@ -0,0 +1,14 @@
+#ifndef COMPONENTS_LUA_OMWSCRIPTSPARSER_H
+#define COMPONENTS_LUA_OMWSCRIPTSPARSER_H
+
+#include <components/vfs/manager.hpp>
+
+namespace LuaUtil
+{
+
+    // Parses list of `*.omwscripts` files.
+    std::vector<std::string> parseOMWScriptsFiles(const VFS::Manager* vfs, const std::vector<std::string>& scriptLists);
+
+}
+
+#endif // COMPONENTS_LUA_OMWSCRIPTSPARSER_H
diff --git a/components/lua/scriptscontainer.cpp b/components/lua/scriptscontainer.cpp
index cb2ab0a97e..a53b1d0404 100644
--- a/components/lua/scriptscontainer.cpp
+++ b/components/lua/scriptscontainer.cpp
@@ -78,10 +78,10 @@ namespace LuaUtil
 
     bool ScriptsContainer::removeScript(const std::string& path)
     {
-        auto it = mScripts.find(path);
-        if (it == mScripts.end())
+        auto scriptIter = mScripts.find(path);
+        if (scriptIter == mScripts.end())
             return false;  // no such script
-        sol::object& script = it->second.mInterface;
+        sol::object& script = scriptIter->second.mInterface;
         if (getFieldOrNil(script, INTERFACE_NAME) != sol::nil)
         {
             std::string_view interfaceName = getFieldOrNil(script, INTERFACE_NAME).as<std::string_view>();
@@ -110,10 +110,10 @@ namespace LuaUtil
             for (auto& [key, value] : sol::table(engineHandlers))
             {
                 std::string_view handlerName = key.as<std::string_view>();
-                auto it = mEngineHandlers.find(handlerName);
-                if (it == mEngineHandlers.end())
+                auto handlerIter = mEngineHandlers.find(handlerName);
+                if (handlerIter == mEngineHandlers.end())
                     continue;
-                std::vector<sol::protected_function>& list = it->second->mList;
+                std::vector<sol::protected_function>& list = handlerIter->second->mList;
                 list.erase(std::find(list.begin(), list.end(), value.as<sol::protected_function>()));
             }
         }
@@ -126,7 +126,7 @@ namespace LuaUtil
                 list.erase(std::find(list.begin(), list.end(), value.as<sol::protected_function>()));
             }
         }
-        mScripts.erase(it);
+        mScripts.erase(scriptIter);
         mScriptOrder.erase(std::find(mScriptOrder.begin(), mScriptOrder.end(), path));
         return true;
     }
@@ -201,13 +201,13 @@ namespace LuaUtil
     void ScriptsContainer::save(ESM::LuaScripts& data)
     {
         std::map<std::string, std::vector<ESM::LuaTimer>> timers;
-        auto saveTimerFn = [&](const Timer& timer, bool inHours)
+        auto saveTimerFn = [&](const Timer& timer, TimeUnit timeUnit)
         {
             if (!timer.mSerializable)
                 return;
             ESM::LuaTimer savedTimer;
             savedTimer.mTime = timer.mTime;
-            savedTimer.mHours = inHours;
+            savedTimer.mUnit = timeUnit;
             savedTimer.mCallbackName = std::get<std::string>(timer.mCallback);
             savedTimer.mCallbackArgument = timer.mSerializedArg;
             if (timers.count(timer.mScript) == 0)
@@ -215,9 +215,9 @@ namespace LuaUtil
             timers[timer.mScript].push_back(std::move(savedTimer));
         };
         for (const Timer& timer : mSecondsTimersQueue)
-            saveTimerFn(timer, false);
+            saveTimerFn(timer, TimeUnit::SECONDS);
         for (const Timer& timer : mHoursTimersQueue)
-            saveTimerFn(timer, true);
+            saveTimerFn(timer, TimeUnit::HOURS);
         data.mScripts.clear();
         for (const std::string& path : mScriptOrder)
         {
@@ -291,7 +291,7 @@ namespace LuaUtil
                     // updates refnums, so timer.mSerializedArg may be not equal to savedTimer.mCallbackArgument.
                     timer.mSerializedArg = serialize(timer.mArg, mSerializer);
 
-                    if (savedTimer.mHours)
+                    if (savedTimer.mUnit == TimeUnit::HOURS)
                         mHoursTimersQueue.push_back(std::move(timer));
                     else
                         mSecondsTimersQueue.push_back(std::move(timer));
@@ -352,7 +352,7 @@ namespace LuaUtil
         std::push_heap(timerQueue.begin(), timerQueue.end());
     }
 
-    void ScriptsContainer::setupSerializableTimer(bool inHours, double time, const std::string& scriptPath,
+    void ScriptsContainer::setupSerializableTimer(TimeUnit timeUnit, double time, const std::string& scriptPath,
                                                   std::string_view callbackName, sol::object callbackArg)
     {
         Timer t;
@@ -362,10 +362,10 @@ namespace LuaUtil
         t.mTime = time;
         t.mArg = callbackArg;
         t.mSerializedArg = serialize(t.mArg, mSerializer);
-        insertTimer(inHours ? mHoursTimersQueue : mSecondsTimersQueue, std::move(t));
+        insertTimer(timeUnit == TimeUnit::HOURS ? mHoursTimersQueue : mSecondsTimersQueue, std::move(t));
     }
 
-    void ScriptsContainer::setupUnsavableTimer(bool inHours, double time, const std::string& scriptPath, sol::function callback)
+    void ScriptsContainer::setupUnsavableTimer(TimeUnit timeUnit, double time, const std::string& scriptPath, sol::function callback)
     {
         Timer t;
         t.mScript = scriptPath;
@@ -376,7 +376,7 @@ namespace LuaUtil
         getHiddenData(scriptPath)[TEMPORARY_TIMER_CALLBACKS][mTemporaryCallbackCounter] = std::move(callback);
         mTemporaryCallbackCounter++;
 
-        insertTimer(inHours ? mHoursTimersQueue : mSecondsTimersQueue, std::move(t));
+        insertTimer(timeUnit == TimeUnit::HOURS ? mHoursTimersQueue : mSecondsTimersQueue, std::move(t));
     }
 
     void ScriptsContainer::callTimer(const Timer& t)
diff --git a/components/lua/scriptscontainer.hpp b/components/lua/scriptscontainer.hpp
index da36109851..7b2b2a7aa9 100644
--- a/components/lua/scriptscontainer.hpp
+++ b/components/lua/scriptscontainer.hpp
@@ -67,6 +67,7 @@ namespace LuaUtil
             ScriptsContainer* mContainer;
             std::string mPath;
         };
+        using TimeUnit = ESM::LuaTimer::TimeUnit;
 
         // `namePrefix` is a common prefix for all scripts in the container. Used in logs for error messages and `print` output.
         ScriptsContainer(LuaUtil::LuaState* lua, std::string_view namePrefix);
@@ -122,17 +123,17 @@ namespace LuaUtil
         void registerTimerCallback(const std::string& scriptPath, std::string_view callbackName, sol::function callback);
 
         // Sets up a timer, that can be automatically saved and loaded.
-        //   inHours - false if time unit is game seconds and true if time unit if game hours.
+        //   timeUnit - game seconds (TimeUnit::Seconds) or game hours (TimeUnit::Hours).
         //   time - the absolute game time (in seconds or in hours) when the timer should be executed.
         //   scriptPath - script path in VFS is used as script id. The script with the given path should already present in the container.
         //   callbackName - callback (should be registered in advance) for this timer.
         //   callbackArg - parameter for the callback (should be serializable).
-        void setupSerializableTimer(bool inHours, double time, const std::string& scriptPath,
+        void setupSerializableTimer(TimeUnit timeUnit, double time, const std::string& scriptPath,
                                     std::string_view callbackName, sol::object callbackArg);
 
         // Creates a timer. `callback` is an arbitrary Lua function. This type of timers is called "unsavable"
         // because it can not be stored in saves. I.e. loading a saved game will not fully restore the state.
-        void setupUnsavableTimer(bool inHours, double time, const std::string& scriptPath, sol::function callback);
+        void setupUnsavableTimer(TimeUnit timeUnit, double time, const std::string& scriptPath, sol::function callback);
 
     protected:
         struct EngineHandlerList
diff --git a/components/lua/serialization.cpp b/components/lua/serialization.cpp
index acbe3c23c7..53b6fe3b92 100644
--- a/components/lua/serialization.cpp
+++ b/components/lua/serialization.cpp
@@ -10,7 +10,7 @@ namespace LuaUtil
 
     constexpr unsigned char FORMAT_VERSION = 0;
 
-    enum class SerializedType
+    enum class SerializedType : char
     {
         NUMBER =       0x0,
         LONG_STRING =  0x1,
@@ -20,8 +20,10 @@ namespace LuaUtil
 
         VEC2 =         0x10,
         VEC3 =         0x11,
+
+        // All values should be lesser than 0x20 (SHORT_STRING_FLAG).
     };
-    constexpr unsigned char SHORT_STRING_FLAG = 0x20;    // 0x001SSSSS. SSSSS = string length
+    constexpr unsigned char SHORT_STRING_FLAG = 0x20;    // 0b001SSSSS. SSSSS = string length
     constexpr unsigned char CUSTOM_FULL_FLAG = 0x40;     // 0b01TTTTTT + 32bit dataSize
     constexpr unsigned char CUSTOM_COMPACT_FLAG = 0x80;  // 0b1SSSSTTT. SSSS = dataSize, TTT = (typeName size - 1)
 
@@ -224,8 +226,8 @@ namespace LuaUtil
                 sol::stack::push<osg::Vec3f>(lua.lua_state(), osg::Vec3f(x, y, z));
                 return;
             }
-            default: throw std::runtime_error("Unknown type: " + std::to_string(type));
         }
+        throw std::runtime_error("Unknown type: " + std::to_string(type));
     }
 
     BinaryData serialize(const sol::object& obj, const UserdataSerializer* customSerializer)

From 43b7e6964af45c66a480ed078f8d675a42bf5e22 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Tue, 4 May 2021 22:56:29 +0200
Subject: [PATCH 1004/2859] Add function World::isCellActive

---
 apps/openmw/mwbase/world.hpp     | 2 ++
 apps/openmw/mwworld/worldimp.cpp | 5 +++++
 apps/openmw/mwworld/worldimp.hpp | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 7afd0697eb..4110c8f489 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -129,6 +129,8 @@ namespace MWBase
 
             virtual MWWorld::CellStore *getCell (const ESM::CellId& id) = 0;
 
+            virtual bool isCellActive(MWWorld::CellStore* cell) const = 0;
+
             virtual void testExteriorCells() = 0;
             virtual void testInteriorCells() = 0;
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 99bd53ef3f..8fea737d8d 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -570,6 +570,11 @@ namespace MWWorld
             return getInterior (id.mWorldspace);
     }
 
+    bool World::isCellActive(CellStore* cell) const
+    {
+        return mWorldScene->getActiveCells().count(cell) > 0;
+    }
+
     void World::testExteriorCells()
     {
         mWorldScene->testExteriorCells();
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 2ed69aabdf..87cd14dd5c 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -216,6 +216,8 @@ namespace MWWorld
 
             CellStore *getCell (const ESM::CellId& id) override;
 
+            bool isCellActive(CellStore* cell) const override;
+
             void testExteriorCells() override;
             void testInteriorCells() override;
 

From 85c441ec9a224f0104a746ab71df6e175e88b893 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Fri, 9 Jul 2021 20:38:31 +0200
Subject: [PATCH 1005/2859] Refactoring and minor fixes related to
 active/inactive object state

---
 apps/openmw/mwlua/actions.cpp                 |  1 -
 apps/openmw/mwlua/luamanagerimp.cpp           | 33 ++++++++++---------
 apps/openmw/mwlua/luamanagerimp.hpp           |  1 -
 apps/openmw/mwlua/object.cpp                  |  8 ++---
 apps/openmw/mwlua/object.hpp                  |  9 ++---
 .../reference/lua-scripting/overview.rst      |  3 ++
 6 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/apps/openmw/mwlua/actions.cpp b/apps/openmw/mwlua/actions.cpp
index 1664501f4f..95a33fed0d 100644
--- a/apps/openmw/mwlua/actions.cpp
+++ b/apps/openmw/mwlua/actions.cpp
@@ -41,7 +41,6 @@ namespace MWLua
         {
             MWWorld::Ptr newObj = world->moveObject(obj, cell, mPos.x(), mPos.y(), mPos.z());
             world->rotateObject(newObj, mRot.x(), mRot.y(), mRot.z());
-            worldView.getObjectRegistry()->registerPtr(newObj);
         }
     }
 
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 3c67be5418..e01273bb84 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -81,7 +81,7 @@ namespace MWLua
                 throw std::logic_error("Player Refnum was changed unexpectedly");
             if (!mPlayer.isInCell() || !newPlayerPtr.isInCell() || mPlayer.getCell() != newPlayerPtr.getCell())
             {
-                mPlayer = newPlayerPtr;
+                mPlayer = newPlayerPtr;  // player was moved to another cell, update ptr in registry
                 objectRegistry->registerPtr(mPlayer);
             }
         }
@@ -123,10 +123,11 @@ namespace MWLua
         }
 
         // Engine handlers in local scripts
-        if (mPlayerScripts)
+        PlayerScripts* playerScripts = dynamic_cast<PlayerScripts*>(mPlayer.getRefData().getLuaScripts());
+        if (playerScripts)
         {
             for (const SDL_Keysym& key : mKeyPressEvents)
-                mPlayerScripts->keyPress(key);
+                playerScripts->keyPress(key);
         }
         mKeyPressEvents.clear();
 
@@ -186,7 +187,6 @@ namespace MWLua
         mActorAddedEvents.clear();
         mLocalEngineEvents.clear();
         mPlayerChanged = false;
-        mPlayerScripts = nullptr;
         mWorldView.clear();
         if (!mPlayer.isEmpty())
         {
@@ -202,12 +202,10 @@ namespace MWLua
             throw std::logic_error("Player is initialized twice");
         mWorldView.objectAddedToScene(ptr);
         mPlayer = ptr;
-        MWWorld::RefData& refData = ptr.getRefData();
-        if (!refData.getLuaScripts())
-            createLocalScripts(ptr);
-        if (!mPlayerScripts)
-            throw std::logic_error("mPlayerScripts not initialized");
-        mActiveLocalScripts.insert(mPlayerScripts);
+        LocalScripts* localScripts = ptr.getRefData().getLuaScripts();
+        if (!localScripts)
+            localScripts = createLocalScripts(ptr);
+        mActiveLocalScripts.insert(localScripts);
         mLocalEngineEvents.push_back({getId(ptr), LocalScripts::OnActive{}});
         mPlayerChanged = true;
     }
@@ -269,10 +267,14 @@ namespace MWLua
 
     void LuaManager::addLocalScript(const MWWorld::Ptr& ptr, const std::string& scriptPath)
     {
-        MWWorld::RefData& refData = ptr.getRefData();
-        if (!refData.getLuaScripts())
-            mActiveLocalScripts.insert(createLocalScripts(ptr));
-        refData.getLuaScripts()->addNewScript(scriptPath);
+        LocalScripts* localScripts = ptr.getRefData().getLuaScripts();
+        if (!localScripts)
+        {
+            localScripts = createLocalScripts(ptr);
+            if (ptr.isInCell() && MWBase::Environment::get().getWorld()->isCellActive(ptr.getCell()))
+                mActiveLocalScripts.insert(localScripts);
+        }
+        localScripts->addNewScript(scriptPath);
     }
 
     LocalScripts* LuaManager::createLocalScripts(const MWWorld::Ptr& ptr)
@@ -282,8 +284,7 @@ namespace MWLua
         // so we can't just check ptr == mPlayer here.
         if (*ptr.getCellRef().getRefIdPtr() == "player")
         {
-            mPlayerScripts = new PlayerScripts(&mLua, LObject(getId(ptr), mWorldView.getObjectRegistry()));
-            scripts = std::shared_ptr<LocalScripts>(mPlayerScripts);
+            scripts = std::make_shared<PlayerScripts>(&mLua, LObject(getId(ptr), mWorldView.getObjectRegistry()));
             scripts->addPackage("openmw.ui", mUserInterfacePackage);
             scripts->addPackage("openmw.camera", mCameraPackage);
         }
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index be7174a35a..df87457b23 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -82,7 +82,6 @@ namespace MWLua
 
         bool mPlayerChanged = false;
         MWWorld::Ptr mPlayer;
-        PlayerScripts* mPlayerScripts = nullptr;
 
         GlobalEventQueue mGlobalEvents;
         LocalEventQueue mLocalEvents;
diff --git a/apps/openmw/mwlua/object.cpp b/apps/openmw/mwlua/object.cpp
index e3f5323736..696179d003 100644
--- a/apps/openmw/mwlua/object.cpp
+++ b/apps/openmw/mwlua/object.cpp
@@ -118,16 +118,16 @@ namespace MWLua
         mLastAssignedId.unset();
     }
 
-    MWWorld::Ptr ObjectRegistry::getPtr(ObjectId id, bool onlyActive)
+    MWWorld::Ptr ObjectRegistry::getPtr(ObjectId id, bool local)
     {
         MWWorld::Ptr ptr;
         auto it = mObjectMapping.find(id);
         if (it != mObjectMapping.end())
             ptr = it->second;
-        if (onlyActive)
+        if (local)
         {
-            // TODO: add flag `isActive` to LiveCellRefBase. Return empty Ptr if the flag is not set.
-            //     Needed because in multiplayer mode inactive objects will not be synchronized, so will likely be out of date.
+            // TODO: Return ptr only if it is active or was active in the previous frame, otherwise return empty.
+            //     Needed because in multiplayer inactive objects will not be synchronized, so an be out of date.
         }
         else
         {
diff --git a/apps/openmw/mwlua/object.hpp b/apps/openmw/mwlua/object.hpp
index b45c8e247c..c0b6bf1919 100644
--- a/apps/openmw/mwlua/object.hpp
+++ b/apps/openmw/mwlua/object.hpp
@@ -35,10 +35,9 @@ namespace MWLua
         ObjectId deregisterPtr(const MWWorld::Ptr& ptr);
 
         // Returns Ptr by id. If object is not found, returns empty Ptr.
-        // If onlyActive = true, returns non-empty ptr only if it is registered and is in an active cell.
-        // If onlyActive = false, tries to load and register the object if it is not loaded yet.
-        // NOTE: `onlyActive` logic is not yet implemented.
-        MWWorld::Ptr getPtr(ObjectId id, bool onlyActive);
+        // If local = true, returns non-empty ptr only if it can be used in local scripts
+        // (i.e. is active or was active in the previous frame).
+        MWWorld::Ptr getPtr(ObjectId id, bool local);
 
         // Needed only for saving/loading.
         const ObjectId& getLastAssignedId() const { return mLastAssignedId; }
@@ -46,8 +45,6 @@ namespace MWLua
 
     private:
         friend class Object;
-        friend class GObject;
-        friend class LObject;
         friend class LuaManager;
 
         bool mChanged = false;
diff --git a/docs/source/reference/lua-scripting/overview.rst b/docs/source/reference/lua-scripting/overview.rst
index 635aeef462..d3ce319d01 100644
--- a/docs/source/reference/lua-scripting/overview.rst
+++ b/docs/source/reference/lua-scripting/overview.rst
@@ -52,6 +52,9 @@ Global scripts
 Local scripts
     Lua scripts that are attached to some game object. A local script is active only if the object it is attached to is in an active cell. There are no limitations to the number of local scripts on one object. Local scripts can be attached to (or detached from) any object at any moment by a global script. In some cases inactive local scripts still can run code (for example during saving and loading), but while inactive they can not see nearby objects.
 
+.. note::
+    Currently scripts on objects in a container or an inventory are considered inactive. Probably later this behaviour will be changed.
+
 Player scripts
     A specific kind of local scripts; *player script* is a local script that is attached to a player. It can do everything that a normal local script can do, plus some player-specific functionality (e.g. control UI and camera).
 

From c2280ada1da35516e8b7a253f9ac3bf371226b61 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Tue, 13 Apr 2021 01:16:06 +0200
Subject: [PATCH 1006/2859] OpenMW Lua, API_VERSION=0

---
 CHANGELOG.md                      | 1 +
 apps/openmw/mwlua/luabindings.cpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50de808c29..7cd9bdbba4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
     Bug #6143: Capturing a screenshot makes engine to be a temporary unresponsive
     Feature #2780: A way to see current OpenMW version in the console
     Feature #5489: MCP: Telekinesis fix for activators
+    Feature #5996: Support Lua scripts in OpenMW
     Feature #6017: Separate persistent and temporary cell references when saving
 
 0.47.0
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index f48f78fe38..ebb24401fc 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -31,6 +31,7 @@ namespace MWLua
     {
         auto* lua = context.mLua;
         sol::table api(lua->sol(), sol::create);
+        api["API_VERSION"] = 0;
         api["sendGlobalEvent"] = [context](std::string eventName, const sol::object& eventData)
         {
             context.mGlobalEventQueue->push_back({std::move(eventName), LuaUtil::serialize(eventData, context.mSerializer)});

From 36ec877a8ef10dc076a5dbfc7155fb826e80c88a Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 10 Jul 2021 01:01:50 +0200
Subject: [PATCH 1007/2859] Add missing include from sol/sol.hpp

---
 components/lua/luastate.hpp        | 1 +
 components/lua/serialization.hpp   | 1 +
 components/lua/utilpackage.hpp     | 1 +
 components/queries/luabindings.hpp | 1 +
 4 files changed, 4 insertions(+)

diff --git a/components/lua/luastate.hpp b/components/lua/luastate.hpp
index 9cb27fb114..6bac1612e7 100644
--- a/components/lua/luastate.hpp
+++ b/components/lua/luastate.hpp
@@ -3,6 +3,7 @@
 
 #include <map>
 
+#include <limits> // missing from sol/sol.hpp
 #include <sol/sol.hpp>
 
 #include <components/vfs/manager.hpp>
diff --git a/components/lua/serialization.hpp b/components/lua/serialization.hpp
index 63f93baac8..fddae2cfb4 100644
--- a/components/lua/serialization.hpp
+++ b/components/lua/serialization.hpp
@@ -1,6 +1,7 @@
 #ifndef COMPONENTS_LUA_SERIALIZATION_H
 #define COMPONENTS_LUA_SERIALIZATION_H
 
+#include <limits> // missing from sol/sol.hpp
 #include <sol/sol.hpp>
 
 namespace LuaUtil
diff --git a/components/lua/utilpackage.hpp b/components/lua/utilpackage.hpp
index 06996fb96a..9e73723561 100644
--- a/components/lua/utilpackage.hpp
+++ b/components/lua/utilpackage.hpp
@@ -1,6 +1,7 @@
 #ifndef COMPONENTS_LUA_UTILPACKAGE_H
 #define COMPONENTS_LUA_UTILPACKAGE_H
 
+#include <limits> // missing from sol/sol.hpp
 #include <sol/sol.hpp>
 
 namespace LuaUtil
diff --git a/components/queries/luabindings.hpp b/components/queries/luabindings.hpp
index a23dfa932b..16d1a822be 100644
--- a/components/queries/luabindings.hpp
+++ b/components/queries/luabindings.hpp
@@ -1,3 +1,4 @@
+#include <limits> // missing from sol/sol.hpp
 #include <sol/sol.hpp>
 
 #include "query.hpp"

From 269cd31059451f277a65008caeb721d3ed7ee824 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Mocquillon?= <cedric.mocquillon@gmail.com>
Date: Sat, 10 Jul 2021 19:04:46 +0200
Subject: [PATCH 1008/2859] Use same world coordinates to compute distances

---
 apps/openmw/mwrender/objectpaging.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index 6b5f9a6e34..ba0891da83 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -485,8 +485,7 @@ namespace MWRender
         constexpr auto copyMask = ~Mask_UpdateVisitor;
 
         AnalyzeVisitor analyzeVisitor(copyMask);
-        osg::Vec3f center3 = { center.x(), center.y(), 0.f };
-        analyzeVisitor.mCurrentDistance = (viewPoint - center3).length2();
+        analyzeVisitor.mCurrentDistance = (viewPoint - worldCenter).length2();
         float minSize = mMinSize;
         if (mMinSizeMergeFactor)
             minSize *= mMinSizeMergeFactor;

From 84721fb58a2691d6e557bee38527e5a8a304acbf Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sat, 10 Jul 2021 23:43:55 +0200
Subject: [PATCH 1009/2859] Disable special processing of Lua errors in debug
 builds. Fixes #6151.

---
 extern/sol_config/sol/config.hpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/extern/sol_config/sol/config.hpp b/extern/sol_config/sol/config.hpp
index fc8c93e64c..3b0625c2e9 100644
--- a/extern/sol_config/sol/config.hpp
+++ b/extern/sol_config/sol/config.hpp
@@ -6,10 +6,13 @@
 #define SOL_SAFE_FUNCTION_CALLS 1
 #define SOL_SAFE_FUNCTION 1
 #define SOL_NO_NIL 0
+#define SOL_IN_DEBUG_DETECTED 0
 
 #ifndef NO_LUAJIT
 #define SOL_LUAJIT 1
 #define SOL_EXCEPTIONS_SAFE_PROPAGATION 0
 #endif
 
+#include <limits> // missing in sol/sol.hpp
+
 #endif // SOL_SINGLE_CONFIG_HPP

From e1c525914c1f91470256ab715079c31049e81dfd Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 10 Jul 2021 18:57:20 +0200
Subject: [PATCH 1010/2859] Add CI jobs to build tests in debug mode

---
 .gitlab-ci.yml            | 18 ++++++++++++++++++
 CI/before_script.linux.sh |  6 ++++++
 2 files changed, 24 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ceba2841fe..47c3426913 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -76,6 +76,15 @@ Debian_GCC_tests:
     CCACHE_SIZE: 1G
     BUILD_TESTS_ONLY: 1
 
+Debian_GCC_tests_Debug:
+  extends: Debian_GCC
+  cache:
+    key: Debian_GCC_tests_Debug.v1
+  variables:
+    CCACHE_SIZE: 1G
+    BUILD_TESTS_ONLY: 1
+    CMAKE_BUILD_TYPE: Debug
+
 Debian_GCC_Static_Deps:
   extends: Debian_GCC
   cache:
@@ -118,6 +127,15 @@ Debian_Clang_tests:
     CCACHE_SIZE: 1G
     BUILD_TESTS_ONLY: 1
 
+Debian_Clang_tests_Debug:
+  extends: Debian_Clang
+  cache:
+    key: Debian_Clang_tests_Debug.v1
+  variables:
+    CCACHE_SIZE: 1G
+    BUILD_TESTS_ONLY: 1
+    CMAKE_BUILD_TYPE: Debug
+
 .MacOS:
   image: macos-11-xcode-12
   tags:
diff --git a/CI/before_script.linux.sh b/CI/before_script.linux.sh
index 17292e4e98..4344b5212f 100755
--- a/CI/before_script.linux.sh
+++ b/CI/before_script.linux.sh
@@ -34,6 +34,12 @@ if [[ $CI_OPENMW_USE_STATIC_DEPS ]]; then
     )
 fi
 
+if [[ "${CMAKE_BUILD_TYPE}" ]]; then
+    CMAKE_CONF_OPTS+=(
+        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    )
+fi
+
 mkdir -p build
 cd build
 

From 73639a93b64041102c43c8f9e0068bac655b4164 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 11 Jul 2021 13:22:26 +0200
Subject: [PATCH 1011/2859] Avoid CTAD to fix macOS build

../../../apps/openmw/engine.cpp:706:23: error: no viable constructor or deduction guide for deduction of template arguments of 'function'
                    ? std::function(ScheduleNonDialogMessageBox {})
                      ^
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/functional:1430:48: note: candidate template ignored: could not match 'function<_Fp>' against '(anonymous namespace)::ScheduleNonDialogMessageBox'
template<class _Fp> class _LIBCPP_TEMPLATE_VIS function; // undefined
                                               ^
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/functional:1430:48: note: candidate function template not viable: requires 0 arguments, but 1 was provided
../../../apps/openmw/engine.cpp:707:23: error: no viable constructor or deduction guide for deduction of template arguments of 'function'
                    : std::function(IgnoreString {})
                      ^
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/functional:1430:48: note: candidate template ignored: could not match 'function<_Fp>' against '(anonymous namespace)::IgnoreString'
template<class _Fp> class _LIBCPP_TEMPLATE_VIS function; // undefined
                                               ^
---
 apps/openmw/engine.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 1bd79cdd02..f554821b3d 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -703,8 +703,8 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
             mCfgMgr.getScreenshotPath().string(),
             Settings::Manager::getString("screenshot format", "General"),
             Settings::Manager::getBool("notify on saved screenshot", "General")
-                    ? std::function(ScheduleNonDialogMessageBox {})
-                    : std::function(IgnoreString {})
+                    ? std::function<void (std::string)>(ScheduleNonDialogMessageBox {})
+                    : std::function<void (std::string)>(IgnoreString {})
         )
     );
 

From 6ad2cf8e4f063f3be3b5f5e652f903f1dff5a3e7 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sun, 11 Jul 2021 16:42:45 +0200
Subject: [PATCH 1012/2859] Skip simulation result after calling
 Actor::updatePosition(). Otherwise when going out of tcl the player would go
 back to previous position for one frame.

---
 apps/openmw/mwphysics/actor.cpp | 4 +++-
 apps/openmw/mwphysics/actor.hpp | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index 21736543ab..4df5646516 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -124,11 +124,13 @@ void Actor::updatePosition()
     mPositionOffset = osg::Vec3f();
     mStandingOnPtr = nullptr;
     mSkipCollisions = true;
+    mSkipSimulation = true;
 }
 
 void Actor::setSimulationPosition(const osg::Vec3f& position)
 {
-    mSimulationPosition = position;
+    if (!std::exchange(mSkipSimulation, false))
+        mSimulationPosition = position;
 }
 
 osg::Vec3f Actor::getSimulationPosition() const
diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index dd4ea45714..8bbb90dbed 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -204,6 +204,7 @@ namespace MWPhysics
         osg::Vec3f mVelocity;
         bool mWorldPositionChanged;
         bool mSkipCollisions;
+        bool mSkipSimulation;
         btTransform mLocalTransform;
         mutable std::mutex mPositionMutex;
 

From 643a64cb2f2b5fe24b113ba343e7ef69788390cf Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sat, 24 Apr 2021 12:40:47 +0200
Subject: [PATCH 1013/2859] Change some settings for async physics: - default
 to 1 thread - default to always use defered aabb update, remove option -
 always keep a cache of LOS request for at least the current frame. This
 decreases number of raycast, especially when a lot of actors are involved and
 "NPCs avoid collisions" is on

---
 apps/openmw/mwphysics/mtphysics.cpp           | 16 +++++---------
 apps/openmw/mwphysics/mtphysics.hpp           |  1 -
 .../reference/modding/settings/physics.rst    | 22 +++++--------------
 files/settings-default.cfg                    |  6 +----
 4 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 9b98e7e8f7..0d57cc2f23 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -137,7 +137,6 @@ namespace MWPhysics
           , mNumJobs(0)
           , mRemainingSteps(0)
           , mLOSCacheExpiry(Settings::Manager::getInt("lineofsight keep inactive cache", "Physics"))
-          , mDeferAabbUpdate(Settings::Manager::getBool("defer aabb update", "Physics"))
           , mNewFrame(false)
           , mAdvanceSimulation(false)
           , mQuit(false)
@@ -163,8 +162,7 @@ namespace MWPhysics
         }
         else
         {
-            mLOSCacheExpiry = -1;
-            mDeferAabbUpdate = false;
+            mLOSCacheExpiry = 0;
         }
 
         mPreStepBarrier = std::make_unique<Misc::Barrier>(mNumThreads);
@@ -392,7 +390,7 @@ namespace MWPhysics
 
     void PhysicsTaskScheduler::updateSingleAabb(std::weak_ptr<PtrHolder> ptr, bool immediate)
     {
-        if (!mDeferAabbUpdate || immediate)
+        if (immediate)
         {
             updatePtrAabb(ptr);
         }
@@ -417,8 +415,7 @@ namespace MWPhysics
         if (result == mLOSCache.end())
         {
             req.mResult = hasLineOfSight(actorPtr1.get(), actorPtr2.get());
-            if (mLOSCacheExpiry >= 0)
-                mLOSCache.push_back(req);
+            mLOSCache.push_back(req);
             return req.mResult;
         }
         result->mAge = 0;
@@ -508,8 +505,7 @@ namespace MWPhysics
                     }
                 }
 
-                if (mLOSCacheExpiry >= 0)
-                    refreshLOSCache();
+                refreshLOSCache();
                 mPostSimBarrier->wait([this] { afterPostSim(); });
             }
         }
@@ -594,8 +590,7 @@ namespace MWPhysics
 
     void PhysicsTaskScheduler::afterPreStep()
     {
-        if (mDeferAabbUpdate)
-            updateAabbs();
+        updateAabbs();
         if (!mRemainingSteps)
             return;
         for (auto& data : mActorsFrameData)
@@ -619,7 +614,6 @@ namespace MWPhysics
     void PhysicsTaskScheduler::afterPostSim()
     {
         mNewFrame = false;
-        if (mLOSCacheExpiry >= 0)
         {
             std::unique_lock lock(mLOSCacheMutex);
             mLOSCache.erase(
diff --git a/apps/openmw/mwphysics/mtphysics.hpp b/apps/openmw/mwphysics/mtphysics.hpp
index 3fd4d5a693..ae82727c56 100644
--- a/apps/openmw/mwphysics/mtphysics.hpp
+++ b/apps/openmw/mwphysics/mtphysics.hpp
@@ -90,7 +90,6 @@ namespace MWPhysics
             int mNumJobs;
             int mRemainingSteps;
             int mLOSCacheExpiry;
-            bool mDeferAabbUpdate;
             bool mNewFrame;
             bool mAdvanceSimulation;
             bool mThreadSafeBullet;
diff --git a/docs/source/reference/modding/settings/physics.rst b/docs/source/reference/modding/settings/physics.rst
index 59aba91aa9..c6d27f58f8 100644
--- a/docs/source/reference/modding/settings/physics.rst
+++ b/docs/source/reference/modding/settings/physics.rst
@@ -6,7 +6,7 @@ async num threads
 
 :Type:		integer
 :Range:		>= 0
-:Default:	0
+:Default:	1
 
 Determines how many threads will be spawned to compute physics update in the background (that is, process actors movement). A value of 0 means that the update will be performed in the main thread.
 A value greater than 1 requires the Bullet library be compiled with multithreading support. If that's not the case, a warning will be written in ``openmw.log`` and a value of 1 will be used.
@@ -19,19 +19,9 @@ lineofsight keep inactive cache
 :Default:	0
 
 The line of sight determines if 2 actors can see each other (without taking into account game mechanics such as invisibility or sneaking). It is used by some scripts (the getLOS function), by the AI (to determine if an actor should start combat or chase an opponent) and for functionnalities such as greetings or turning NPC head toward an object.
-This parameters determine for how long a cache of request should be kept warm. It depends on :ref:`async num threads` being > 0, otherwise a value of -1 will be used. If a request is not found in the cache, it is always fulfilled immediately. In case Bullet is compiled without multithreading support, non-cached requests involve blocking the async thread(s), which might hurt performance.
-A value of -1 means no caching.
-A value of 0 means that for as long as a request is made (after the first one), it will be preemptively "refreshed" in the async thread, without blocking neither the main thread nor the async thread.
+This parameters determine for how long a cache of request should be kept warm.
+A value of 0 means that the cache is kept only for the current frame, that is if a request is done 2 times in the same frame, the second request will be in cache.
 Any value > 0 is the number of frames for which the values are kept in cache even if the results was not requested again.
-If Bullet is compiled with multithreading support, requests are non blocking, it is better to set this parameter to -1.
-
-defer aabb update
------------------
-
-:Type:		boolean
-:Range:		True/False
-:Default:	True
-
-Axis-aligned bounding box (aabb for short) are used by Bullet for collision detection. They should be updated anytime a physical object is modified (for instance moved) for collision detection to be correct.
-This parameter control wether the update should be done as soon as the object is modified (the default), which involves blocking the async thread(s), or queue the modifications to update them as a batch before the collision detections. It depends on :ref:`async num threads` being > 0, otherwise it will be disabled.
-Disabling this parameter is intended as an aid for debugging collisions detection issues.
+If :ref:`async num threads` is 0, a value of 0 will be used.
+If a request is not found in the cache, it is always fulfilled immediately. In case Bullet is compiled without multithreading support, non-cached requests involve blocking the async thread, which might hurt performance.
+If Bullet is compiled with multithreading support, requests are non blocking, it is better to set this parameter to 0.
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index d539ba34da..e7439fb5ae 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -985,16 +985,12 @@ enable indoor shadows = true
 # Set the number of background threads used for physics.
 # If no background threads are used, physics calculations are processed in the main thread
 # and the settings below have no effect.
-async num threads = 0
+async num threads = 1
 
 # Set the number of frames an inactive line-of-sight request will be kept
 # refreshed in the background physics thread cache.
-# If this is set to -1, line-of-sight requests are never cached.
 lineofsight keep inactive cache = 0
 
-# Defer bounding boxes update until collision detection.
-defer aabb update = true
-
 [Models]
 
 # Attempt to load any valid NIF file regardless of its version and track the progress.

From 1650dabed86fff39df673985d36e7b217ab7880e Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sun, 11 Jul 2021 18:01:20 +0200
Subject: [PATCH 1014/2859] Assign the return value of weak_ptr::lock() to a
 variable, so that the shared object lifetime is properly extended. Otherwise
 there is a possibility that the Actor gets destroyed during call to
 unstuck().

---
 apps/openmw/mwphysics/mtphysics.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 9b98e7e8f7..29d1e0b7c1 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -599,7 +599,7 @@ namespace MWPhysics
         if (!mRemainingSteps)
             return;
         for (auto& data : mActorsFrameData)
-            if (data.mActor.lock())
+            if (const auto actor = data.mActor.lock())
             {
                 std::unique_lock lock(mCollisionWorldMutex);
                 MovementSolver::unstuck(data, mCollisionWorld);

From 5aaac8e47e90891c3868e88978becf4ff991fe14 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Wed, 30 Jun 2021 18:29:00 +0200
Subject: [PATCH 1015/2859] Reduce a bit the size of getHT

Factoring common code parts outside of a template
is apparently a good practise to reduce code duplication
(and the size of openmw by around 0.5%),
and should improve a bit the performances,
since the whole `std::to_string` * 2 + string concatenation
dance results in quite a lot of code, preventing inlining on my machine.
---
 components/esm/esmreader.cpp |  2 +-
 components/esm/esmreader.hpp | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/components/esm/esmreader.cpp b/components/esm/esmreader.cpp
index a30ad2c069..0cf7c3f81f 100644
--- a/components/esm/esmreader.cpp
+++ b/components/esm/esmreader.cpp
@@ -198,7 +198,7 @@ void ESMReader::skipHSubSize(int size)
 {
     skipHSub();
     if (static_cast<int> (mCtx.leftSub) != size)
-        fail("skipHSubSize() mismatch");
+        reportSubSizeMismatch(mCtx.leftSub, size);
 }
 
 void ESMReader::skipHSubUntil(const char *name)
diff --git a/components/esm/esmreader.hpp b/components/esm/esmreader.hpp
index 6129147d33..608222a1bb 100644
--- a/components/esm/esmreader.hpp
+++ b/components/esm/esmreader.hpp
@@ -134,11 +134,7 @@ public:
   {
       getSubHeader();
       if (mCtx.leftSub != sizeof(X))
-      {
-          fail("getHT(): subrecord size mismatch,requested "
-                  + std::to_string(sizeof(X)) + ", got"
-                      + std::to_string(mCtx.leftSub));
-      }
+          reportSubSizeMismatch(sizeof(X), mCtx.leftSub);
       getT(x);
   }
 
@@ -261,6 +257,13 @@ public:
   size_t getFileSize() const { return mFileSize; }
 
 private:
+  [[noreturn]] void reportSubSizeMismatch(size_t want, size_t got) {
+          fail("subrecord size mismatch, requested " +
+                  std::to_string(want) +
+                  ", got" +
+                  std::to_string(got));
+  }
+
   void clearCtx();
 
   Files::IStreamPtr mEsm;

From 389b830046deefa4d7fe13178a6cd2e5b30ab590 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Sun, 11 Jul 2021 23:03:55 -0700
Subject: [PATCH 1016/2859] fix black objects with OP batch debug due to
 unitialized uniform

---
 apps/openmw/mwrender/objectpaging.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index ba0891da83..d91f4efaaa 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -364,6 +364,7 @@ namespace MWRender
             osg::ref_ptr<osg::StateSet> stateset = node.getStateSet() ? osg::clone(node.getStateSet(), osg::CopyOp::SHALLOW_COPY) : new osg::StateSet;
             stateset->setAttribute(m);
             stateset->addUniform(new osg::Uniform("colorMode", 0));
+            stateset->addUniform(new osg::Uniform("emissiveMult", 1.f));
             node.setStateSet(stateset);
         }
     };

From b8fcd6d3ba0a3a91879ae7a98b22f75c852433c1 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 11 Jul 2021 14:43:52 +0200
Subject: [PATCH 1017/2859] Manage work item lifetime on the client side

Instead of explicit work queue stop before any possibly used engine manager
is destructed. Based on an assumption that any engine manager can be destructed
independently from the work queue destruction. This model is already used in
CellPreloader that conflicts with explicit work queue stop.

After the work queue is requested to be stopped, any client waiting for a not
started work item to be done will wait forever because the work item is dropped
from the queue. Therefore either clients should not wait for own work items to
be completed in destructor or the work queue should not drop items before
clients are destructed. Other approaches are possible but are not considered
due to increasing complexity.

CellPreloader already tries to wait for all created work items to be done so
keep it that way and extend the model to AsyncScreenCaptureOperation and Scene.
Additionally abort all scheduled work items when owner is destructed. This
prevents a long exit when multiple screenshots are scheduled right before
exiting the game.
---
 apps/openmw/engine.cpp                 |  3 ++-
 apps/openmw/engine.hpp                 |  3 ++-
 apps/openmw/mwworld/scene.cpp          | 24 +++++++++++++++++++-
 apps/openmw/mwworld/scene.hpp          |  9 ++++++++
 components/sceneutil/screencapture.cpp | 31 +++++++++++++++++++++++++-
 components/sceneutil/screencapture.hpp |  9 ++++++++
 6 files changed, 75 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index f554821b3d..b0047fd1df 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -427,7 +427,8 @@ OMW::Engine::Engine(Files::ConfigurationManager& configurationManager)
 
 OMW::Engine::~Engine()
 {
-    mWorkQueue->stop();
+    if (mScreenCaptureOperation != nullptr)
+        mScreenCaptureOperation->stop();
 
     mEnvironment.cleanup();
 
diff --git a/apps/openmw/engine.hpp b/apps/openmw/engine.hpp
index 180e06bcbc..290fd890a6 100644
--- a/apps/openmw/engine.hpp
+++ b/apps/openmw/engine.hpp
@@ -21,6 +21,7 @@ namespace Resource
 namespace SceneUtil
 {
     class WorkQueue;
+    class AsyncScreenCaptureOperation;
 }
 
 namespace VFS
@@ -67,7 +68,7 @@ namespace OMW
             boost::filesystem::path mResDir;
             osg::ref_ptr<osgViewer::Viewer> mViewer;
             osg::ref_ptr<osgViewer::ScreenCaptureHandler> mScreenCaptureHandler;
-            osg::ref_ptr<osgViewer::ScreenCaptureHandler::CaptureOperation> mScreenCaptureOperation;
+            osg::ref_ptr<SceneUtil::AsyncScreenCaptureOperation> mScreenCaptureOperation;
             std::string mCellName;
             std::vector<std::string> mContentFiles;
             std::vector<std::string> mGroundcoverFiles;
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 7d3a6c7893..c43ee76d1b 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -3,6 +3,7 @@
 #include <limits>
 #include <chrono>
 #include <thread>
+#include <atomic>
 
 #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
 #include <BulletCollision/CollisionShapes/btCompoundShape.h>
@@ -867,6 +868,11 @@ namespace MWWorld
 
     Scene::~Scene()
     {
+        for (const osg::ref_ptr<SceneUtil::WorkItem>& v : mWorkItems)
+            v->abort();
+
+        for (const osg::ref_ptr<SceneUtil::WorkItem>& v : mWorkItems)
+            v->waitTillDone();
     }
 
     bool Scene::hasCellChanged() const
@@ -1061,6 +1067,9 @@ namespace MWWorld
 
         void doWork() override
         {
+            if (mAborted)
+                return;
+
             try
             {
                 mSceneManager->getTemplate(mMesh);
@@ -1069,9 +1078,16 @@ namespace MWWorld
             {
             }
         }
+
+        void abort() override
+        {
+            mAborted = true;
+        }
+
     private:
         std::string mMesh;
         Resource::SceneManager* mSceneManager;
+        std::atomic_bool mAborted {false};
     };
 
     void Scene::preload(const std::string &mesh, bool useAnim)
@@ -1081,7 +1097,13 @@ namespace MWWorld
             mesh_ = Misc::ResourceHelpers::correctActorModelPath(mesh_, mRendering.getResourceSystem()->getVFS());
 
         if (!mRendering.getResourceSystem()->getSceneManager()->checkLoaded(mesh_, mRendering.getReferenceTime()))
-            mRendering.getWorkQueue()->addWorkItem(new PreloadMeshItem(mesh_, mRendering.getResourceSystem()->getSceneManager()));
+        {
+            osg::ref_ptr<PreloadMeshItem> item(new PreloadMeshItem(mesh_, mRendering.getResourceSystem()->getSceneManager()));
+            mRendering.getWorkQueue()->addWorkItem(item);
+            const auto isDone = [] (const osg::ref_ptr<SceneUtil::WorkItem>& v) { return v->isDone(); };
+            mWorkItems.erase(std::remove_if(mWorkItems.begin(), mWorkItems.end(), isDone), mWorkItems.end());
+            mWorkItems.emplace_back(std::move(item));
+        }
     }
 
     void Scene::preloadCells(float dt)
diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp
index bc9c2386bb..75c070dd1e 100644
--- a/apps/openmw/mwworld/scene.hpp
+++ b/apps/openmw/mwworld/scene.hpp
@@ -3,6 +3,7 @@
 
 #include <osg/Vec4i>
 #include <osg/Vec2i>
+#include <osg/ref_ptr>
 
 #include "ptr.hpp"
 #include "globals.hpp"
@@ -10,6 +11,7 @@
 #include <set>
 #include <memory>
 #include <unordered_map>
+#include <vector>
 
 #include <components/misc/constants.hpp>
 
@@ -49,6 +51,11 @@ namespace MWPhysics
     class PhysicsSystem;
 }
 
+namespace SceneUtil
+{
+    class WorkItem;
+}
+
 namespace MWWorld
 {
     class Player;
@@ -91,6 +98,8 @@ namespace MWWorld
 
             std::set<ESM::RefNum> mPagedRefs;
 
+            std::vector<osg::ref_ptr<SceneUtil::WorkItem>> mWorkItems;
+
             void insertCell (CellStore &cell, Loading::Listener* loadingListener, bool onlyObjects, bool test = false);
             osg::Vec2i mCurrentGridCenter;
 
diff --git a/components/sceneutil/screencapture.cpp b/components/sceneutil/screencapture.cpp
index 47119f3644..99cb535326 100644
--- a/components/sceneutil/screencapture.cpp
+++ b/components/sceneutil/screencapture.cpp
@@ -15,6 +15,7 @@
 #include <iomanip>
 #include <sstream>
 #include <string>
+#include <atomic>
 
 namespace
 {
@@ -32,6 +33,9 @@ namespace
 
             void doWork() override
             {
+                if (mAborted)
+                    return;
+
                 try
                 {
                     (*mImpl)(*mImage, mContextId);
@@ -42,10 +46,16 @@ namespace
                 }
             }
 
+            void abort() override
+            {
+                mAborted = true;
+            }
+
         private:
             const osg::ref_ptr<osgViewer::ScreenCaptureHandler::CaptureOperation> mImpl;
             const osg::ref_ptr<const osg::Image> mImage;
             const unsigned int mContextId;
+            std::atomic_bool mAborted {false};
     };
 }
 
@@ -130,8 +140,27 @@ namespace SceneUtil
         assert(mImpl != nullptr);
     }
 
+    AsyncScreenCaptureOperation::~AsyncScreenCaptureOperation()
+    {
+        stop();
+    }
+
+    void AsyncScreenCaptureOperation::stop()
+    {
+        for (const osg::ref_ptr<SceneUtil::WorkItem>& item : *mWorkItems.lockConst())
+            item->abort();
+
+        for (const osg::ref_ptr<SceneUtil::WorkItem>& item : *mWorkItems.lockConst())
+            item->waitTillDone();
+    }
+
     void AsyncScreenCaptureOperation::operator()(const osg::Image& image, const unsigned int context_id)
     {
-        mQueue->addWorkItem(new ScreenCaptureWorkItem(mImpl, image, context_id));
+        osg::ref_ptr<SceneUtil::WorkItem> item(new ScreenCaptureWorkItem(mImpl, image, context_id));
+        mQueue->addWorkItem(item);
+        const auto isDone = [] (const osg::ref_ptr<SceneUtil::WorkItem>& v) { return v->isDone(); };
+        const auto workItems = mWorkItems.lock();
+        workItems->erase(std::remove_if(workItems->begin(), workItems->end(), isDone), workItems->end());
+        workItems->emplace_back(std::move(item));
     }
 }
diff --git a/components/sceneutil/screencapture.hpp b/components/sceneutil/screencapture.hpp
index 6395d989d8..87e396b020 100644
--- a/components/sceneutil/screencapture.hpp
+++ b/components/sceneutil/screencapture.hpp
@@ -1,10 +1,13 @@
 #ifndef OPENMW_COMPONENTS_SCENEUTIL_SCREENCAPTURE_H
 #define OPENMW_COMPONENTS_SCENEUTIL_SCREENCAPTURE_H
 
+#include <components/misc/guarded.hpp>
+
 #include <osg/ref_ptr>
 #include <osgViewer/ViewerEventHandlers>
 
 #include <string>
+#include <vector>
 
 namespace osg
 {
@@ -14,6 +17,7 @@ namespace osg
 namespace SceneUtil
 {
     class WorkQueue;
+    class WorkItem;
 
     std::string writeScreenshotToFile(const std::string& screenshotPath, const std::string& screenshotFormat,
                                       const osg::Image& image);
@@ -38,11 +42,16 @@ namespace SceneUtil
             AsyncScreenCaptureOperation(osg::ref_ptr<SceneUtil::WorkQueue> queue,
                                         osg::ref_ptr<osgViewer::ScreenCaptureHandler::CaptureOperation> impl);
 
+            ~AsyncScreenCaptureOperation();
+
+            void stop();
+
             void operator()(const osg::Image& image, const unsigned int context_id) override;
 
         private:
             const osg::ref_ptr<SceneUtil::WorkQueue> mQueue;
             const osg::ref_ptr<osgViewer::ScreenCaptureHandler::CaptureOperation> mImpl;
+            Misc::ScopeGuarded<std::vector<osg::ref_ptr<SceneUtil::WorkItem>>> mWorkItems;
     };
 }
 

From eece47f70e1f65891d101d42f1f445e71ad22a50 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 10 Jul 2021 12:11:48 +0200
Subject: [PATCH 1018/2859] Avoid copying osg::ref_ptr when adding or removing
 item from work queue

Copy constructor does refcounting, and move constructor doesn't.
---
 apps/openmw/mwrender/renderingmanager.cpp | 2 +-
 components/sceneutil/workqueue.cpp        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index e497fdecd2..016149ed90 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -492,7 +492,7 @@ namespace MWRender
 
         workItem->mTextures.emplace_back("textures/_land_default.dds");
 
-        mWorkQueue->addWorkItem(workItem);
+        mWorkQueue->addWorkItem(std::move(workItem));
     }
 
     double RenderingManager::getReferenceTime() const
diff --git a/components/sceneutil/workqueue.cpp b/components/sceneutil/workqueue.cpp
index 3c1df80ac4..81c9bee29c 100644
--- a/components/sceneutil/workqueue.cpp
+++ b/components/sceneutil/workqueue.cpp
@@ -74,9 +74,9 @@ void WorkQueue::addWorkItem(osg::ref_ptr<WorkItem> item, bool front)
 
     std::unique_lock<std::mutex> lock(mMutex);
     if (front)
-        mQueue.push_front(item);
+        mQueue.push_front(std::move(item));
     else
-        mQueue.push_back(item);
+        mQueue.push_back(std::move(item));
     mCondition.notify_one();
 }
 
@@ -89,7 +89,7 @@ osg::ref_ptr<WorkItem> WorkQueue::removeWorkItem()
     }
     if (!mQueue.empty())
     {
-        osg::ref_ptr<WorkItem> item = mQueue.front();
+        osg::ref_ptr<WorkItem> item = std::move(mQueue.front());
         mQueue.pop_front();
         return item;
     }

From d4a2dab9d93b5b9903112abca6888c68dda06079 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 10 Jul 2021 12:19:59 +0200
Subject: [PATCH 1019/2859] Remove redundant else

---
 components/sceneutil/workqueue.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/components/sceneutil/workqueue.cpp b/components/sceneutil/workqueue.cpp
index 81c9bee29c..0c68c61921 100644
--- a/components/sceneutil/workqueue.cpp
+++ b/components/sceneutil/workqueue.cpp
@@ -93,8 +93,7 @@ osg::ref_ptr<WorkItem> WorkQueue::removeWorkItem()
         mQueue.pop_front();
         return item;
     }
-    else
-        return nullptr;
+    return nullptr;
 }
 
 unsigned int WorkQueue::getNumItems() const

From 153cd9a20cf1891f9a953870d1b04d591740a5f3 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 10 Jul 2021 13:02:28 +0200
Subject: [PATCH 1020/2859] Avoid redundant search for existing element

---
 apps/openmw/mwworld/cellpreloader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index 44afde22ae..a2167c562f 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -317,7 +317,7 @@ namespace MWWorld
             if (found->second.mWorkItem)
             {
                 found->second.mWorkItem->abort();
-                mUnrefQueue->push(mPreloadCells[cell].mWorkItem);
+                mUnrefQueue->push(std::move(found->second.mWorkItem));
             }
 
             mPreloadCells.erase(found);

From 4db5fa351d4120d6141f98afa14a06e8840d0d92 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Mon, 12 Jul 2021 11:46:32 +0200
Subject: [PATCH 1021/2859] Add sol3.2.2/sol/sol.hpp to extern instead of
 downloading during building

---
 CMakeLists.txt              |     7 +-
 extern/sol3.2.2/README.md   |     3 +
 extern/sol3.2.2/sol/sol.hpp | 26674 ++++++++++++++++++++++++++++++++++
 3 files changed, 26679 insertions(+), 5 deletions(-)
 create mode 100644 extern/sol3.2.2/README.md
 create mode 100644 extern/sol3.2.2/sol/sol.hpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d20e451676..f81af9e38b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -404,11 +404,8 @@ else(USE_LUAJIT)
    add_compile_definitions(NO_LUAJIT)
 endif(USE_LUAJIT)
 
-# Download sol - C++ library binding to Lua
-file(DOWNLOAD
-     "https://github.com/ThePhD/sol2/releases/download/v3.2.2/sol.hpp" "${OpenMW_BINARY_DIR}/extern/sol3.2.2/sol/sol.hpp"
-     EXPECTED_MD5 ba113cf458f60672917108e69bb4d958)
-set(SOL_INCLUDE_DIRS ${OpenMW_BINARY_DIR}/extern/sol3.2.2 ${OpenMW_SOURCE_DIR}/extern/sol_config)
+# C++ library binding to Lua
+set(SOL_INCLUDE_DIRS ${OpenMW_SOURCE_DIR}/extern/sol3.2.2 ${OpenMW_SOURCE_DIR}/extern/sol_config)
 
 include_directories(
     BEFORE SYSTEM
diff --git a/extern/sol3.2.2/README.md b/extern/sol3.2.2/README.md
new file mode 100644
index 0000000000..c831941822
--- /dev/null
+++ b/extern/sol3.2.2/README.md
@@ -0,0 +1,3 @@
+sol/sol.hpp is downloaded from https://github.com/ThePhD/sol2/releases/download/v3.2.2/sol.hpp
+
+License: MIT
diff --git a/extern/sol3.2.2/sol/sol.hpp b/extern/sol3.2.2/sol/sol.hpp
new file mode 100644
index 0000000000..c25fd549e7
--- /dev/null
+++ b/extern/sol3.2.2/sol/sol.hpp
@@ -0,0 +1,26674 @@
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+// This file was generated with a script.
+// Generated 2020-10-03 21:34:24.496436 UTC
+// This header was generated with sol v3.2.1 (revision 48eea7b5)
+// https://github.com/ThePhD/sol2
+
+#ifndef SOL_SINGLE_INCLUDE_HPP
+#define SOL_SINGLE_INCLUDE_HPP
+
+// beginning of sol/sol.hpp
+
+#ifndef SOL_HPP
+#define SOL_HPP
+
+// beginning of sol/version.hpp
+
+#include <sol/config.hpp>
+
+#include <cstdint>
+
+#define SOL_VERSION_MAJOR 3
+#define SOL_VERSION_MINOR 5
+#define SOL_VERSION_PATCH 0
+#define SOL_VERSION_STRING "3.5.0"
+#define SOL_VERSION ((SOL_VERSION_MAJOR * 100000) + (SOL_VERSION_MINOR * 100) + (SOL_VERSION_PATCH))
+
+#define SOL_IS_ON(OP_SYMBOL) ((3 OP_SYMBOL 3) != 0)
+#define SOL_IS_OFF(OP_SYMBOL) ((3 OP_SYMBOL 3) == 0)
+#define SOL_IS_DEFAULT_ON(OP_SYMBOL) ((3 OP_SYMBOL 3) > 3)
+#define SOL_IS_DEFAULT_OFF(OP_SYMBOL) ((3 OP_SYMBOL 3 OP_SYMBOL 3) < 0)
+
+#define SOL_ON          |
+#define SOL_OFF         ^
+#define SOL_DEFAULT_ON  +
+#define SOL_DEFAULT_OFF -
+
+#if defined(_MSC_VER)
+	#define SOL_COMPILER_CLANG_I_ SOL_OFF
+	#define SOL_COMPILER_GCC_I_   SOL_OFF
+	#define SOL_COMPILER_EDG_I_   SOL_OFF
+	#define SOL_COMPILER_VCXX_I_  SOL_ON
+#elif defined(__clang__)
+	#define SOL_COMPILER_CLANG_I_ SOL_ON
+	#define SOL_COMPILER_GCC_I_   SOL_OFF
+	#define SOL_COMPILER_EDG_I_   SOL_OFF
+	#define SOL_COMPILER_VCXX_I_  SOL_OFF
+#elif defined(__GNUC__)
+	#define SOL_COMPILER_CLANG_I_ SOL_OFF
+	#define SOL_COMPILER_GCC_I_   SOL_ON
+	#define SOL_COMPILER_EDG_I_   SOL_OFF
+	#define SOL_COMPILER_VCXX_I_  SOL_OFF
+#else
+	#define SOL_COMPILER_CLANG_I_ SOL_OFF
+	#define SOL_COMPILER_GCC_I_   SOL_OFF
+	#define SOL_COMPILER_EDG_I_   SOL_OFF
+	#define SOL_COMPILER_VCXX_I_  SOL_OFF
+#endif
+
+#if defined(__MINGW32__)
+	#define SOL_COMPILER_FRONTEND_MINGW_I_ SOL_ON
+#else
+	#define SOL_COMPILER_FRONTEND_MINGW_I_ SOL_OFF
+#endif
+
+#if SIZE_MAX <= 0xFFFFULL
+	#define SOL_PLATFORM_X16_I_ SOL_ON
+	#define SOL_PLATFORM_X86_I_ SOL_OFF
+	#define SOL_PLATFORM_X64_I_ SOL_OFF
+#elif SIZE_MAX <= 0xFFFFFFFFULL
+	#define SOL_PLATFORM_X16_I_ SOL_OFF
+	#define SOL_PLATFORM_X86_I_ SOL_ON
+	#define SOL_PLATFORM_X64_I_ SOL_OFF
+#else
+	#define SOL_PLATFORM_X16_I_ SOL_OFF
+	#define SOL_PLATFORM_X86_I_ SOL_OFF
+	#define SOL_PLATFORM_X64_I_ SOL_ON
+#endif
+
+#define SOL_PLATFORM_ARM32_I_ SOL_OFF
+#define SOL_PLATFORM_ARM64_I_ SOL_OFF
+
+#if defined(_WIN32)
+	#define SOL_PLATFORM_WINDOWS_I_ SOL_ON
+#else
+	#define SOL_PLATFORM_WINDOWS_I_ SOL_OFF
+#endif
+#if defined(__APPLE__)
+	#define SOL_PLATFORM_APPLE_I_ SOL_ON
+#else
+	#define SOL_PLATFORM_APPLE_I_ SOL_OFF
+#endif
+#if defined(__unix__)
+	#define SOL_PLATFORM_UNIXLIKE_I_ SOL_ON
+#else
+	#define SOL_PLATFORM_UNIXLIKE_I_ SOL_OFF
+#endif
+#if defined(__linux__)
+	#define SOL_PLATFORM_LINUXLIKE_I_ SOL_ON
+#else
+	#define SOL_PLATFORM_LINUXLIKE_I_ SOL_OFF
+#endif
+
+#define SOL_PLATFORM_APPLE_IPHONE_I_ SOL_OFF
+#define SOL_PLATFORM_BSDLIKE_I_      SOL_OFF
+
+#if defined(SOL_IN_DEBUG_DETECTED)
+	#if SOL_IN_DEBUG_DETECTED != 0
+		#define SOL_DEBUG_BUILD_I_ SOL_ON
+	#else
+		#define SOL_DEBUG_BUILD_I_ SOL_OFF
+	#endif
+#elif !defined(NDEBUG)
+	#if SOL_IS_ON(SOL_COMPILER_VCXX_I_) && defined(_DEBUG)
+		#define SOL_DEBUG_BUILD_I_ SOL_ON
+	#elif (SOL_IS_ON(SOL_COMPILER_CLANG_I_) || SOL_IS_ON(SOL_COMPILER_GCC_I_)) && !defined(__OPTIMIZE__)
+		#define SOL_DEBUG_BUILD_I_ SOL_ON
+	#else
+		#define SOL_DEBUG_BUILD_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_DEBUG_BUILD_I_ SOL_DEFAULT_OFF
+#endif // We are in a debug mode of some sort
+
+#if defined(SOL_NO_EXCEPTIONS)
+	#if (SOL_NO_EXCEPTIONS != 0)
+		#define SOL_EXCEPTIONS_I_ SOL_OFF
+	#else
+		#define SOL_EXCEPTIONS_I_ SOL_ON
+	#endif
+#elif SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+	#if !defined(_CPPUNWIND)
+		#define SOL_EXCEPTIONS_I_ SOL_OFF
+	#else
+		#define SOL_EXCEPTIONS_I_ SOL_ON
+	#endif
+#elif SOL_IS_ON(SOL_COMPILER_CLANG_I_) || SOL_IS_ON(SOL_COMPILER_GCC_I_)
+	#if !defined(__EXCEPTIONS)
+		#define SOL_EXCEPTIONS_I_ SOL_OFF
+	#else
+		#define SOL_EXCEPTIONS_I_ SOL_ON
+	#endif
+#else
+	#define SOL_EXCEPTIONS_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_NO_RTTI)
+	#if (SOL_NO_RTTI != 0)
+		#define SOL_RTTI_I_ SOL_OFF
+	#else
+		#define SOL_RTTI_I_ SOL_ON
+	#endif
+#elif SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+	#if !defined(_CPPRTTI)
+		#define SOL_RTTI_I_ SOL_OFF
+	#else
+		#define SOL_RTTI_I_ SOL_ON
+	#endif
+#elif SOL_IS_ON(SOL_COMPILER_CLANG_I_) || SOL_IS_ON(SOL_COMPILER_GCC_I_)
+	#if !defined(__GXX_RTTI)
+		#define SOL_RTTI_I_ SOL_OFF
+	#else
+		#define SOL_RTTI_I_ SOL_ON
+	#endif
+#else
+	#define SOL_RTTI_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_NO_THREAD_LOCAL) && (SOL_NO_THREAD_LOCAL != 0)
+	#define SOL_USE_THREAD_LOCAL_I_ SOL_OFF
+#else
+	#define SOL_USE_THREAD_LOCAL_I_ SOL_DEFAULT_ON
+#endif // thread_local keyword is bjorked on some platforms
+
+#if defined(SOL_ALL_SAFETIES_ON) && (SOL_ALL_SAFETIES_ON != 0)
+	#define SOL_ALL_SAFETIES_ON_I_ SOL_ON
+#else
+	#define SOL_ALL_SAFETIES_ON_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_SAFE_GETTER) && (SOL_SAFE_GETTER != 0)
+	#define SOL_SAFE_GETTER_I_ SOL_ON
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON_I_)
+		#define SOL_SAFE_GETTER_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD_I_)
+		#define SOL_SAFE_GETTER_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_GETTER_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_USERTYPE) && (SOL_SAFE_USERTYPE != 0)
+	#define SOL_SAFE_USERTYPE_I_ SOL_ON
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON_I_)
+		#define SOL_SAFE_USERTYPE_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD_I_)
+		#define SOL_SAFE_USERTYPE_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_USERTYPE_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_REFERENCES) && (SOL_SAFE_REFERENCES != 0)
+	#define SOL_SAFE_REFERENCES_I_ SOL_ON
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON_I_)
+		#define SOL_SAFE_REFERENCES_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD_I_)
+		#define SOL_SAFE_REFERENCES_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_REFERENCES_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if (defined(SOL_SAFE_FUNCTIONS) && (SOL_SAFE_FUNCTIONS != 0)) \
+    || (defined(SOL_SAFE_FUNCTION_OBJECTS) && (SOL_SAFE_FUNCTION_OBJECTS != 0))
+	#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_ON
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON_I_)
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD_I_)
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_FUNCTION_CALLS) && (SOL_SAFE_FUNCTION_CALLS != 0)
+	#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_ON
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON_I_)
+		#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD_I_)
+		#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_PROXIES) && (SOL_SAFE_PROXIES != 0)
+	#define SOL_SAFE_PROXIES_I_ SOL_ON
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON_I_)
+		#define SOL_SAFE_PROXIES_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD_I_)
+		#define SOL_SAFE_PROXIES_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_PROXIES_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_NUMERICS) && (SOL_SAFE_NUMERICS != 0)
+	#define SOL_SAFE_NUMERICS_I_ SOL_ON
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON_I_)
+		#define SOL_SAFE_NUMERICS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD_I_)
+		#define SOL_SAFE_NUMERICS_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_NUMERICS_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_STACK_CHECK) && (SOL_SAFE_STACK_CHECK != 0)
+	#define SOL_SAFE_STACK_CHECK_I_ SOL_ON
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON_I_)
+		#define SOL_SAFE_STACK_CHECK_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD_I_)
+		#define SOL_SAFE_STACK_CHECK_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_STACK_CHECK_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if (defined(SOL_NO_CHECK_NUMBER_PRECISION) && (SOL_NO_CHECK_NUMBER_PRECISION != 0)) \
+    || (defined(SOL_NO_CHECKING_NUMBER_PRECISION) && (SOL_NO_CHECKING_NUMBER_PRECISION != 0))
+	#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_OFF
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON_I_)
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_SAFE_NUMERICS_I_)
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD_I_)
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_STRINGS_ARE_NUMBERS)
+	#if (SOL_STRINGS_ARE_NUMBERS != 0)
+		#define SOL_STRINGS_ARE_NUMBERS_I_ SOL_ON
+	#else
+		#define SOL_STRINGS_ARE_NUMBERS_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_STRINGS_ARE_NUMBERS_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_ENABLE_INTEROP) && (SOL_ENABLE_INTEROP != 0) \
+    || defined(SOL_USE_INTEROP) && (SOL_USE_INTEROP != 0)
+	#define SOL_USE_INTEROP_I_ SOL_ON
+#else
+	#define SOL_USE_INTEROP_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_NO_NIL)
+	#if (SOL_NO_NIL != 0)
+		#define SOL_NIL_I_ SOL_OFF
+	#else
+		#define SOL_NIL_I_ SOL_ON
+	#endif
+#elif defined(__MAC_OS_X_VERSION_MAX_ALLOWED) || defined(__OBJC__) || defined(nil)
+	#define SOL_NIL_I_ SOL_DEFAULT_OFF
+#else
+	#define SOL_NIL_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_USERTYPE_TYPE_BINDING_INFO)
+	#if (SOL_USERTYPE_TYPE_BINDING_INFO != 0)
+		#define SOL_USERTYPE_TYPE_BINDING_INFO_I_ SOL_ON
+	#else
+		#define SOL_USERTYPE_TYPE_BINDING_INFO_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_USERTYPE_TYPE_BINDING_INFO_I_ SOL_DEFAULT_ON
+#endif // We should generate a my_type.__type table with lots of class information for usertypes
+
+#if defined(SOL_AUTOMAGICAL_TYPES_BY_DEFAULT)
+	#if (SOL_AUTOMAGICAL_TYPES_BY_DEFAULT != 0)
+		#define SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_ SOL_ON
+	#else
+		#define SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_ SOL_OFF
+	#endif
+#elif defined(SOL_DEFAULT_AUTOMAGICAL_USERTYPES)
+	#if (SOL_DEFAULT_AUTOMAGICAL_USERTYPES != 0)
+		#define SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_ SOL_ON
+	#else
+		#define SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_ SOL_DEFAULT_ON
+#endif // make is_automagical on/off by default
+
+#if defined(SOL_STD_VARIANT)
+	#if (SOL_STD_VARIANT != 0)
+		#define SOL_STD_VARIANT_I_ SOL_ON
+	#else
+		#define SOL_STD_VARIANT_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_COMPILER_CLANG_I_) && SOL_IS_ON(SOL_PLATFORM_APPLE_I_)
+		#if defined(__has_include)
+			#if __has_include(<variant>)
+				#define SOL_STD_VARIANT_I_ SOL_ON
+			#else
+				#define SOL_STD_VARIANT_I_ SOL_OFF
+			#endif
+		#else
+			#define SOL_STD_VARIANT_I_ SOL_OFF
+		#endif
+	#else
+		#define SOL_STD_VARIANT_I_ SOL_DEFAULT_ON
+	#endif
+#endif // make is_automagical on/off by default
+
+#if defined(SOL_NOEXCEPT_FUNCTION_TYPE)
+	#if (SOL_NOEXCEPT_FUNCTION_TYPE != 0)
+		#define SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_ SOL_ON
+	#else
+		#define SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_ SOL_OFF
+	#endif
+#else
+	#if defined(__cpp_noexcept_function_type)
+		#define SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_COMPILER_VCXX_I_) && (defined(_MSVC_LANG) && (_MSVC_LANG < 201403L))
+		// There is a bug in the VC++ compiler??
+		// on /std:c++latest under x86 conditions (VS 15.5.2),
+		// compiler errors are tossed for noexcept markings being on function types
+		// that are identical in every other way to their non-noexcept marked types function types...
+		// VS 2019: There is absolutely a bug.
+		#define SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_ SOL_OFF
+	#else
+		#define SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_ SOL_DEFAULT_ON
+	#endif
+#endif // noexcept is part of a function's type
+
+#if defined(SOL_STACK_STRING_OPTIMIZATION_SIZE) && SOL_STACK_STRING_OPTIMIZATION_SIZE > 0
+	#define SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_ SOL_STACK_STRING_OPTIMIZATION_SIZE
+#else
+	#define SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_ 1024
+#endif
+
+#if defined(SOL_ID_SIZE) && SOL_ID_SIZE > 0
+	#define SOL_ID_SIZE_I_ SOL_ID_SIZE
+#else
+	#define SOL_ID_SIZE_I_ 512
+#endif
+
+#if defined(LUA_IDSIZE) && LUA_IDSIZE > 0
+	#define SOL_FILE_ID_SIZE_I_ LUA_IDSIZE
+#elif defined(SOL_ID_SIZE) && SOL_ID_SIZE > 0
+	#define SOL_FILE_ID_SIZE_I_ SOL_FILE_ID_SIZE
+#else
+	#define SOL_FILE_ID_SIZE_I_ 2048
+#endif
+
+#if defined(SOL_PRINT_ERRORS)
+	#if (SOL_PRINT_ERRORS != 0)
+		#define SOL_PRINT_ERRORS_I_ SOL_ON
+	#else
+		#define SOL_PRINT_ERRORS_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON_I_)
+		#define SOL_PRINT_ERRORS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD_I_)
+		#define SOL_PRINT_ERRORS_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_PRINT_ERRORS_I_ SOL_OFF
+	#endif
+#endif
+
+#if defined(SOL_DEFAULT_PASS_ON_ERROR) && (SOL_DEFAULT_PASS_ON_ERROR != 0)
+	#define SOL_DEFAULT_PASS_ON_ERROR_I_ SOL_ON
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON_I_)
+		#define SOL_DEFAULT_PASS_ON_ERROR_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD_I_)
+		#define SOL_DEFAULT_PASS_ON_ERROR_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_DEFAULT_PASS_ON_ERROR_I_ SOL_OFF
+	#endif
+#endif
+
+#if defined(SOL_USING_CXX_LUA)
+	#if (SOL_USING_CXX_LUA != 0)
+		#define SOL_USE_CXX_LUA_I_ SOL_ON
+	#else
+		#define SOL_USE_CXX_LUA_I_ SOL_OFF
+	#endif
+#elif defined(SOL_USE_CXX_LUA)
+	#if (SOL_USE_CXX_LUA != 0)
+		#define SOL_USE_CXX_LUA_I_ SOL_ON
+	#else
+		#define SOL_USE_CXX_LUA_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_USE_CXX_LUA_I_ SOL_OFF
+#endif
+
+#if defined(SOL_USING_CXX_LUAJIT)
+	#if (SOL_USING_CXX_LUA != 0)
+		#define SOL_USE_CXX_LUAJIT_I_ SOL_ON
+	#else
+		#define SOL_USE_CXX_LUAJIT_I_ SOL_OFF
+	#endif
+#elif defined(SOL_USE_CXX_LUAJIT)
+	#if (SOL_USE_CXX_LUA != 0)
+		#define SOL_USE_CXX_LUAJIT_I_ SOL_ON
+	#else
+		#define SOL_USE_CXX_LUAJIT_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_USE_CXX_LUAJIT_I_ SOL_OFF
+#endif
+
+#if defined(SOL_NO_LUA_HPP)
+	#if (SOL_NO_LUA_HPP != 0)
+		#define SOL_USE_LUA_HPP_I_ SOL_OFF
+	#else
+		#define SOL_USE_LUA_HPP_I_ SOL_ON
+	#endif
+#elif defined(SOL_USING_CXX_LUA)
+	#define SOL_USE_LUA_HPP_I_ SOL_OFF
+#elif defined(__has_include)
+	#if __has_include(<lua.hpp>)
+		#define SOL_USE_LUA_HPP_I_ SOL_ON
+	#else
+		#define SOL_USE_LUA_HPP_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_USE_LUA_HPP_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_CONTAINERS_START)
+	#define SOL_CONTAINER_START_INDEX_I_ SOL_CONTAINERS_START
+#elif defined(SOL_CONTAINERS_START_INDEX)
+	#define SOL_CONTAINER_START_INDEX_I_ SOL_CONTAINERS_START_INDEX
+#elif defined(SOL_CONTAINER_START_INDEX)
+	#define SOL_CONTAINER_START_INDEX_I_ SOL_CONTAINER_START_INDEX
+#else
+	#define SOL_CONTAINER_START_INDEX_I_ 1
+#endif
+
+#if defined (SOL_NO_MEMORY_ALIGNMENT)
+	#if (SOL_NO_MEMORY_ALIGNMENT != 0)
+		#define SOL_ALIGN_MEMORY_I_ SOL_OFF
+	#else
+		#define SOL_ALIGN_MEMORY_I_ SOL_ON
+	#endif
+#else
+	#define SOL_ALIGN_MEMORY_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_USE_BOOST)
+	#if (SOL_USE_BOOST != 0)
+		#define SOL_USE_BOOST_I_ SOL_ON
+	#else
+		#define SOL_USE_BOOST_I_ SOL_OFF
+	#endif
+#else
+		#define SOL_USE_BOOST_I_ SOL_OFF
+#endif
+
+#if defined(SOL_USE_UNSAFE_BASE_LOOKUP)
+	#if (SOL_USE_UNSAFE_BASE_LOOKUP != 0)
+		#define SOL_USE_UNSAFE_BASE_LOOKUP_I_ SOL_ON
+	#else
+		#define SOL_USE_UNSAFE_BASE_LOOKUP_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_USE_UNSAFE_BASE_LOOKUP_I_ SOL_OFF
+#endif
+
+#if defined(SOL_INSIDE_UNREAL)
+	#if (SOL_INSIDE_UNREAL != 0)
+		#define SOL_INSIDE_UNREAL_ENGINE_I_ SOL_ON
+	#else
+		#define SOL_INSIDE_UNREAL_ENGINE_I_ SOL_OFF
+	#endif
+#else
+	#if defined(UE_BUILD_DEBUG) || defined(UE_BUILD_DEVELOPMENT) || defined(UE_BUILD_TEST) || defined(UE_BUILD_SHIPPING) || defined(UE_SERVER)
+		#define SOL_INSIDE_UNREAL_ENGINE_I_ SOL_ON
+	#else
+		#define SOL_INSIDE_UNREAL_ENGINE_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_NO_COMPAT)
+	#if (SOL_NO_COMPAT != 0)
+		#define SOL_USE_COMPATIBILITY_LAYER_I_ SOL_OFF
+	#else
+		#define SOL_USE_COMPATIBILITY_LAYER_I_ SOL_ON
+	#endif
+#else
+	#define SOL_USE_COMPATIBILITY_LAYER_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_GET_FUNCTION_POINTER_UNSAFE)
+	#if (SOL_GET_FUNCTION_POINTER_UNSAFE != 0)
+		#define SOL_GET_FUNCTION_POINTER_UNSAFE_I_ SOL_ON
+	#else
+		#define SOL_GET_FUNCTION_POINTER_UNSAFE_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_GET_FUNCTION_POINTER_UNSAFE_I_ SOL_DEFAULT_OFF
+#endif
+
+#if SOL_IS_ON(SOL_COMPILER_FRONTEND_MINGW_I_) && defined(__GNUC__) && (__GNUC__ < 6)
+	// MinGW is off its rocker in some places...
+	#define SOL_MINGW_CCTYPE_IS_POISONED_I_ SOL_ON
+#else
+	#define SOL_MINGW_CCTYPE_IS_POISONED_I_ SOL_DEFAULT_OFF
+#endif
+
+// end of sol/version.hpp
+
+#if SOL_IS_ON(SOL_INSIDE_UNREAL_ENGINE_I_)
+#ifdef check
+#pragma push_macro("check")
+#undef check
+#endif
+#endif // Unreal Engine 4 Bullshit
+
+#if SOL_IS_ON(SOL_COMPILER_GCC_I_)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
+#pragma GCC diagnostic ignored "-Wconversion"
+#if __GNUC__ > 6
+#pragma GCC diagnostic ignored "-Wnoexcept-type"
+#endif
+#elif SOL_IS_ON(SOL_COMPILER_CLANG_I_)
+#elif SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+#pragma warning(push)
+#pragma warning(disable : 4505) // unreferenced local function has been removed GEE THANKS
+#endif                          // clang++ vs. g++ vs. VC++
+
+// beginning of sol/forward.hpp
+
+#ifndef SOL_FORWARD_HPP
+#define SOL_FORWARD_HPP
+
+#include <utility>
+#include <type_traits>
+#include <string_view>
+
+#if SOL_IS_ON(SOL_USE_CXX_LUA_I_) || SOL_IS_ON(SOL_USE_CXX_LUAJIT_I_)
+struct lua_State;
+#else
+extern "C" {
+struct lua_State;
+}
+#endif // C++ Mangling for Lua vs. Not
+
+namespace sol {
+
+	enum class type;
+
+	class stateless_reference;
+	template <bool b>
+	class basic_reference;
+	using reference = basic_reference<false>;
+	using main_reference = basic_reference<true>;
+	class stateless_stack_reference;
+	class stack_reference;
+
+	template <typename A>
+	class basic_bytecode;
+
+	struct lua_value;
+
+	struct proxy_base_tag;
+	template <typename>
+	struct proxy_base;
+	template <typename, typename>
+	struct table_proxy;
+
+	template <bool, typename>
+	class basic_table_core;
+	template <bool b>
+	using table_core = basic_table_core<b, reference>;
+	template <bool b>
+	using main_table_core = basic_table_core<b, main_reference>;
+	template <bool b>
+	using stack_table_core = basic_table_core<b, stack_reference>;
+	template <typename base_type>
+	using basic_table = basic_table_core<false, base_type>;
+	using table = table_core<false>;
+	using global_table = table_core<true>;
+	using main_table = main_table_core<false>;
+	using main_global_table = main_table_core<true>;
+	using stack_table = stack_table_core<false>;
+	using stack_global_table = stack_table_core<true>;
+
+	template <typename>
+	struct basic_lua_table;
+	using lua_table = basic_lua_table<reference>;
+	using stack_lua_table = basic_lua_table<stack_reference>;
+
+	template <typename T, typename base_type>
+	class basic_usertype;
+	template <typename T>
+	using usertype = basic_usertype<T, reference>;
+	template <typename T>
+	using stack_usertype = basic_usertype<T, stack_reference>;
+
+	template <typename base_type>
+	class basic_metatable;
+	using metatable = basic_metatable<reference>;
+	using stack_metatable = basic_metatable<stack_reference>;
+
+	template <typename base_t>
+	struct basic_environment;
+	using environment = basic_environment<reference>;
+	using main_environment = basic_environment<main_reference>;
+	using stack_environment = basic_environment<stack_reference>;
+
+	template <typename T, bool>
+	class basic_function;
+	template <typename T, bool, typename H>
+	class basic_protected_function;
+	using unsafe_function = basic_function<reference, false>;
+	using safe_function = basic_protected_function<reference, false, reference>;
+	using main_unsafe_function = basic_function<main_reference, false>;
+	using main_safe_function = basic_protected_function<main_reference, false, reference>;
+	using stack_unsafe_function = basic_function<stack_reference, false>;
+	using stack_safe_function = basic_protected_function<stack_reference, false, reference>;
+	using stack_aligned_unsafe_function = basic_function<stack_reference, true>;
+	using stack_aligned_safe_function = basic_protected_function<stack_reference, true, reference>;
+	using protected_function = safe_function;
+	using main_protected_function = main_safe_function;
+	using stack_protected_function = stack_safe_function;
+	using stack_aligned_protected_function = stack_aligned_safe_function;
+#if SOL_IS_ON(SOL_SAFE_FUNCTION_OBJECTS_I_)
+	using function = protected_function;
+	using main_function = main_protected_function;
+	using stack_function = stack_protected_function;
+	using stack_aligned_function = stack_aligned_safe_function;
+#else
+	using function = unsafe_function;
+	using main_function = main_unsafe_function;
+	using stack_function = stack_unsafe_function;
+	using stack_aligned_function = stack_aligned_unsafe_function;
+#endif
+	using stack_aligned_stack_handler_function = basic_protected_function<stack_reference, true, stack_reference>;
+
+	struct unsafe_function_result;
+	struct protected_function_result;
+	using safe_function_result = protected_function_result;
+#if SOL_IS_ON(SOL_SAFE_FUNCTION_OBJECTS_I_)
+	using function_result = safe_function_result;
+#else
+	using function_result = unsafe_function_result;
+#endif
+
+	template <typename base_t>
+	class basic_object_base;
+	template <typename base_t>
+	class basic_object;
+	template <typename base_t>
+	class basic_userdata;
+	template <typename base_t>
+	class basic_lightuserdata;
+	template <typename base_t>
+	class basic_coroutine;
+	template <typename base_t>
+	class basic_thread;
+
+	using object = basic_object<reference>;
+	using userdata = basic_userdata<reference>;
+	using lightuserdata = basic_lightuserdata<reference>;
+	using thread = basic_thread<reference>;
+	using coroutine = basic_coroutine<reference>;
+	using main_object = basic_object<main_reference>;
+	using main_userdata = basic_userdata<main_reference>;
+	using main_lightuserdata = basic_lightuserdata<main_reference>;
+	using main_coroutine = basic_coroutine<main_reference>;
+	using stack_object = basic_object<stack_reference>;
+	using stack_userdata = basic_userdata<stack_reference>;
+	using stack_lightuserdata = basic_lightuserdata<stack_reference>;
+	using stack_thread = basic_thread<stack_reference>;
+	using stack_coroutine = basic_coroutine<stack_reference>;
+
+	struct stack_proxy_base;
+	struct stack_proxy;
+	struct variadic_args;
+	struct variadic_results;
+	struct stack_count;
+	struct this_state;
+	struct this_main_state;
+	struct this_environment;
+
+	class state_view;
+	class state;
+
+	template <typename T>
+	struct as_table_t;
+	template <typename T>
+	struct as_container_t;
+	template <typename T>
+	struct nested;
+	template <typename T>
+	struct light;
+	template <typename T>
+	struct user;
+	template <typename T>
+	struct as_args_t;
+	template <typename T>
+	struct protect_t;
+	template <typename F, typename... Policies>
+	struct policy_wrapper;
+
+	template <typename T>
+	struct usertype_traits;
+	template <typename T>
+	struct unique_usertype_traits;
+
+	template <typename... Args>
+	struct types {
+		typedef std::make_index_sequence<sizeof...(Args)> indices;
+		static constexpr std::size_t size() {
+			return sizeof...(Args);
+		}
+	};
+
+	template <typename T>
+	struct derive : std::false_type {
+		typedef types<> type;
+	};
+
+	template <typename T>
+	struct base : std::false_type {
+		typedef types<> type;
+	};
+
+	template <typename T>
+	struct weak_derive {
+		static bool value;
+	};
+
+	template <typename T>
+	bool weak_derive<T>::value = false;
+
+	namespace stack {
+		struct record;
+	}
+
+#if SOL_IS_OFF(SOL_USE_BOOST_I_)
+	template <class T>
+	class optional;
+
+	template <class T>
+	class optional<T&>;
+#endif
+
+	using check_handler_type = int(lua_State*, int, type, type, const char*);
+
+} // namespace sol
+
+#define SOL_BASE_CLASSES(T, ...)                       \
+	namespace sol {                                   \
+		template <>                                  \
+		struct base<T> : std::true_type {            \
+			typedef ::sol::types<__VA_ARGS__> type; \
+		};                                           \
+	}                                                 \
+	void a_sol3_detail_function_decl_please_no_collide()
+#define SOL_DERIVED_CLASSES(T, ...)                    \
+	namespace sol {                                   \
+		template <>                                  \
+		struct derive<T> : std::true_type {          \
+			typedef ::sol::types<__VA_ARGS__> type; \
+		};                                           \
+	}                                                 \
+	void a_sol3_detail_function_decl_please_no_collide()
+
+#endif // SOL_FORWARD_HPP
+// end of sol/forward.hpp
+
+// beginning of sol/forward_detail.hpp
+
+#ifndef SOL_FORWARD_DETAIL_HPP
+#define SOL_FORWARD_DETAIL_HPP
+
+// beginning of sol/traits.hpp
+
+// beginning of sol/tuple.hpp
+
+// beginning of sol/base_traits.hpp
+
+#include <type_traits>
+
+namespace sol {
+	namespace detail {
+		struct unchecked_t {};
+		const unchecked_t unchecked = unchecked_t{};
+	} // namespace detail
+
+	namespace meta {
+		using sfinae_yes_t = std::true_type;
+		using sfinae_no_t = std::false_type;
+
+		template <typename T>
+		using void_t = void;
+
+		template <typename T>
+		using unqualified = std::remove_cv<std::remove_reference_t<T>>;
+
+		template <typename T>
+		using unqualified_t = typename unqualified<T>::type;
+
+		namespace meta_detail {
+			template <typename T>
+			struct unqualified_non_alias : unqualified<T> {};
+
+			template <template <class...> class Test, class, class... Args>
+			struct is_detected : std::false_type {};
+
+			template <template <class...> class Test, class... Args>
+			struct is_detected<Test, void_t<Test<Args...>>, Args...> : std::true_type {};
+		} // namespace meta_detail
+
+		template <template <class...> class Trait, class... Args>
+		using is_detected = typename meta_detail::is_detected<Trait, void, Args...>::type;
+
+		template <template <class...> class Trait, class... Args>
+		constexpr inline bool is_detected_v = is_detected<Trait, Args...>::value;
+
+		template <std::size_t I>
+		using index_value = std::integral_constant<std::size_t, I>;
+
+		template <bool>
+		struct conditional {
+			template <typename T, typename U>
+			using type = T;
+		};
+
+		template <>
+		struct conditional<false> {
+			template <typename T, typename U>
+			using type = U;
+		};
+
+		template <bool B, typename T, typename U>
+		using conditional_t = typename conditional<B>::template type<T, U>;
+
+		namespace meta_detail {
+			template <typename T, template <typename...> class Templ>
+			struct is_specialization_of : std::false_type {};
+			template <typename... T, template <typename...> class Templ>
+			struct is_specialization_of<Templ<T...>, Templ> : std::true_type {};
+		} // namespace meta_detail
+
+		template <typename T, template <typename...> class Templ>
+		using is_specialization_of = meta_detail::is_specialization_of<std::remove_cv_t<T>, Templ>;
+
+		template <typename T, template <typename...> class Templ>
+		inline constexpr bool is_specialization_of_v = is_specialization_of<std::remove_cv_t<T>, Templ>::value;
+
+		template <typename T>
+		struct identity {
+			typedef T type;
+		};
+
+		template <typename T>
+		using identity_t = typename identity<T>::type;
+
+		template <typename T>
+		using is_builtin_type = std::integral_constant<bool, std::is_arithmetic<T>::value || std::is_pointer<T>::value || std::is_array<T>::value>;
+
+	} // namespace meta
+} // namespace sol
+
+// end of sol/base_traits.hpp
+
+#include <tuple>
+#include <cstddef>
+
+namespace sol {
+	namespace detail {
+		using swallow = std::initializer_list<int>;
+	} // namespace detail
+
+	namespace meta {
+		template <typename T>
+		using is_tuple = is_specialization_of<T, std::tuple>;
+
+		template <typename T>
+		constexpr inline bool is_tuple_v = is_tuple<T>::value;
+
+		namespace detail {
+			template <typename... Args>
+			struct tuple_types_ { typedef types<Args...> type; };
+
+			template <typename... Args>
+			struct tuple_types_<std::tuple<Args...>> { typedef types<Args...> type; };
+		} // namespace detail
+
+		template <typename... Args>
+		using tuple_types = typename detail::tuple_types_<Args...>::type;
+
+		template <typename Arg>
+		struct pop_front_type;
+
+		template <typename Arg>
+		using pop_front_type_t = typename pop_front_type<Arg>::type;
+
+		template <typename... Args>
+		struct pop_front_type<types<Args...>> {
+			typedef void front_type;
+			typedef types<Args...> type;
+		};
+
+		template <typename Arg, typename... Args>
+		struct pop_front_type<types<Arg, Args...>> {
+			typedef Arg front_type;
+			typedef types<Args...> type;
+		};
+
+		template <std::size_t N, typename Tuple>
+		using tuple_element = std::tuple_element<N, std::remove_reference_t<Tuple>>;
+
+		template <std::size_t N, typename Tuple>
+		using tuple_element_t = std::tuple_element_t<N, std::remove_reference_t<Tuple>>;
+
+		template <std::size_t N, typename Tuple>
+		using unqualified_tuple_element = unqualified<tuple_element_t<N, Tuple>>;
+
+		template <std::size_t N, typename Tuple>
+		using unqualified_tuple_element_t = unqualified_t<tuple_element_t<N, Tuple>>;
+
+	} // namespace meta
+} // namespace sol
+
+// end of sol/tuple.hpp
+
+// beginning of sol/bind_traits.hpp
+
+namespace sol { namespace meta {
+	namespace meta_detail {
+
+		template <class F>
+		struct check_deducible_signature {
+			struct nat {};
+			template <class G>
+			static auto test(int) -> decltype(&G::operator(), void());
+			template <class>
+			static auto test(...) -> nat;
+
+			using type = std::is_void<decltype(test<F>(0))>;
+		};
+	} // namespace meta_detail
+
+	template <class F>
+	struct has_deducible_signature : meta_detail::check_deducible_signature<F>::type {};
+
+	namespace meta_detail {
+
+		template <std::size_t I, typename T>
+		struct void_tuple_element : meta::tuple_element<I, T> {};
+
+		template <std::size_t I>
+		struct void_tuple_element<I, std::tuple<>> {
+			typedef void type;
+		};
+
+		template <std::size_t I, typename T>
+		using void_tuple_element_t = typename void_tuple_element<I, T>::type;
+
+		template <bool it_is_noexcept, bool has_c_variadic, typename T, typename R, typename... Args>
+		struct basic_traits {
+		private:
+			using first_type = meta::conditional_t<std::is_void<T>::value, int, T>&;
+
+		public:
+			inline static constexpr const bool is_noexcept = it_is_noexcept;
+			inline static constexpr bool is_member_function = std::is_void<T>::value;
+			inline static constexpr bool has_c_var_arg = has_c_variadic;
+			inline static constexpr std::size_t arity = sizeof...(Args);
+			inline static constexpr std::size_t free_arity = sizeof...(Args) + static_cast<std::size_t>(!std::is_void<T>::value);
+			typedef types<Args...> args_list;
+			typedef std::tuple<Args...> args_tuple;
+			typedef T object_type;
+			typedef R return_type;
+			typedef tuple_types<R> returns_list;
+			typedef R(function_type)(Args...);
+			typedef meta::conditional_t<std::is_void<T>::value, args_list, types<first_type, Args...>> free_args_list;
+			typedef meta::conditional_t<std::is_void<T>::value, R(Args...), R(first_type, Args...)> free_function_type;
+			typedef meta::conditional_t<std::is_void<T>::value, R (*)(Args...), R (*)(first_type, Args...)> free_function_pointer_type;
+			typedef std::remove_pointer_t<free_function_pointer_type> signature_type;
+			template <std::size_t i>
+			using arg_at = void_tuple_element_t<i, args_tuple>;
+		};
+
+		template <typename Signature, bool b = has_deducible_signature<Signature>::value>
+		struct fx_traits : basic_traits<false, false, void, void> {};
+
+		// Free Functions
+		template <typename R, typename... Args>
+		struct fx_traits<R(Args...), false> : basic_traits<false, false, void, R, Args...> {
+			typedef R (*function_pointer_type)(Args...);
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R (*)(Args...), false> : basic_traits<false, false, void, R, Args...> {
+			typedef R (*function_pointer_type)(Args...);
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R(Args..., ...), false> : basic_traits<false, true, void, R, Args...> {
+			typedef R (*function_pointer_type)(Args..., ...);
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R (*)(Args..., ...), false> : basic_traits<false, true, void, R, Args...> {
+			typedef R (*function_pointer_type)(Args..., ...);
+		};
+
+		// Member Functions
+		/* C-Style Variadics */
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...), false> : basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...);
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...), false> : basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...);
+		};
+
+		/* Const Volatile */
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const, false> : basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const, false> : basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const volatile, false> : basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const volatile;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const volatile, false> : basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const volatile;
+		};
+
+		/* Member Function Qualifiers */
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...)&, false> : basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) &;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...)&, false> : basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) &;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const&, false> : basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const&, false> : basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const volatile&, false> : basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const volatile&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const volatile&, false> : basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const volatile&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...)&&, false> : basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) &&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...)&&, false> : basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) &&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const&&, false> : basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const&&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const&&, false> : basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const&&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const volatile&&, false> : basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const volatile&&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const volatile&&, false> : basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const volatile&&;
+		};
+
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_)
+
+		template <typename R, typename... Args>
+		struct fx_traits<R(Args...) noexcept, false> : basic_traits<true, false, void, R, Args...> {
+			typedef R (*function_pointer_type)(Args...) noexcept;
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R (*)(Args...) noexcept, false> : basic_traits<true, false, void, R, Args...> {
+			typedef R (*function_pointer_type)(Args...) noexcept;
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R(Args..., ...) noexcept, false> : basic_traits<true, true, void, R, Args...> {
+			typedef R (*function_pointer_type)(Args..., ...) noexcept;
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R (*)(Args..., ...) noexcept, false> : basic_traits<true, true, void, R, Args...> {
+			typedef R (*function_pointer_type)(Args..., ...) noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) noexcept, false> : basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) noexcept, false> : basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) noexcept;
+		};
+
+		/* Const Volatile */
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const noexcept, false> : basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const noexcept, false> : basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const volatile noexcept, false> : basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const volatile noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const volatile noexcept, false> : basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const volatile noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) & noexcept, false> : basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) & noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) & noexcept, false> : basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) & noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const& noexcept, false> : basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const& noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const& noexcept, false> : basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const& noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const volatile& noexcept, false> : basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const volatile& noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const volatile& noexcept, false> : basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const volatile& noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) && noexcept, false> : basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) && noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) && noexcept, false> : basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) && noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const&& noexcept, false> : basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const&& noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const&& noexcept, false> : basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const&& noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const volatile&& noexcept, false> : basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const volatile&& noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const volatile&& noexcept, false> : basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const volatile&& noexcept;
+		};
+
+#endif // noexcept is part of a function's type
+
+#if SOL_IS_ON(SOL_COMPILER_VCXX_I_) && SOL_IS_ON(SOL_PLATFORM_X86_I_)
+		template <typename R, typename... Args>
+		struct fx_traits<R __stdcall(Args...), false> : basic_traits<false, false, void, R, Args...> {
+			typedef R(__stdcall* function_pointer_type)(Args...);
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R(__stdcall*)(Args...), false> : basic_traits<false, false, void, R, Args...> {
+			typedef R(__stdcall* function_pointer_type)(Args...);
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...), false> : basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...);
+		};
+
+		/* Const Volatile */
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const, false> : basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const volatile, false> : basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const volatile;
+		};
+
+		/* Member Function Qualifiers */
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...)&, false> : basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) &;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const&, false> : basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const volatile&, false> : basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const volatile&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...)&&, false> : basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) &&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const&&, false> : basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const&&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const volatile&&, false> : basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const volatile&&;
+		};
+
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_)
+
+		template <typename R, typename... Args>
+		struct fx_traits<R __stdcall(Args...) noexcept, false> : basic_traits<true, false, void, R, Args...> {
+			typedef R(__stdcall* function_pointer_type)(Args...) noexcept;
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R(__stdcall*)(Args...) noexcept, false> : basic_traits<true, false, void, R, Args...> {
+			typedef R(__stdcall* function_pointer_type)(Args...) noexcept;
+		};
+
+		/* __stdcall cannot be applied to functions with varargs*/
+		/*template <typename R, typename... Args>
+		struct fx_traits<__stdcall R(Args..., ...) noexcept, false> : basic_traits<true, true, void, R, Args...> {
+			typedef R(__stdcall* function_pointer_type)(Args..., ...) noexcept;
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R (__stdcall *)(Args..., ...) noexcept, false> : basic_traits<true, true, void, R, Args...> {
+			typedef R(__stdcall* function_pointer_type)(Args..., ...) noexcept;
+		};*/
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) noexcept, false> : basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) noexcept, false> : basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) noexcept;
+		};*/
+
+		/* Const Volatile */
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const noexcept, false> : basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) const noexcept, false> : basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) const noexcept;
+		};*/
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const volatile noexcept, false> : basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const volatile noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) const volatile noexcept, false> : basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) const volatile noexcept;
+		};*/
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) & noexcept, false> : basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) & noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) & noexcept, false> : basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) & noexcept;
+		};*/
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const& noexcept, false> : basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const& noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) const& noexcept, false> : basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) const& noexcept;
+		};*/
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const volatile& noexcept, false> : basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const volatile& noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) const volatile& noexcept, false> : basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) const volatile& noexcept;
+		};*/
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) && noexcept, false> : basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) && noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) && noexcept, false> : basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) && noexcept;
+		};*/
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const&& noexcept, false> : basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const&& noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) const&& noexcept, false> : basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) const&& noexcept;
+		};*/
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const volatile&& noexcept, false> : basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const volatile&& noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) const volatile&& noexcept, false> : basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) const volatile&& noexcept;
+		};*/
+#endif // noexcept is part of a function's type
+#endif // __stdcall x86 VC++ bug
+
+		template <typename Signature>
+		struct fx_traits<Signature, true>
+		: public fx_traits<typename fx_traits<decltype(&Signature::operator())>::function_type, false> {};
+
+		template <typename Signature, bool b = std::is_member_object_pointer<Signature>::value>
+		struct callable_traits
+		: public fx_traits<std::decay_t<Signature>> {};
+
+		template <typename R, typename T>
+		struct callable_traits<R(T::*), true> {
+			typedef meta::conditional_t<std::is_array_v<R>, std::add_lvalue_reference_t<R>, R> return_type;
+			typedef return_type Arg;
+			typedef T object_type;
+			using signature_type = R(T::*);
+			inline static constexpr bool is_noexcept = false;
+			inline static constexpr bool is_member_function = false;
+			inline static constexpr std::size_t arity = 1;
+			inline static constexpr std::size_t free_arity = 2;
+			typedef std::tuple<Arg> args_tuple;
+			typedef types<Arg> args_list;
+			typedef types<T, Arg> free_args_list;
+			typedef meta::tuple_types<return_type> returns_list;
+			typedef return_type(function_type)(T&, return_type);
+			typedef return_type (*function_pointer_type)(T&, Arg);
+			typedef return_type (*free_function_pointer_type)(T&, Arg);
+			template <std::size_t i>
+			using arg_at = void_tuple_element_t<i, args_tuple>;
+		};
+
+	} // namespace meta_detail
+
+	template <typename Signature>
+	struct bind_traits : meta_detail::callable_traits<Signature> {};
+
+	template <typename Signature>
+	using function_args_t = typename bind_traits<Signature>::args_list;
+
+	template <typename Signature>
+	using function_signature_t = typename bind_traits<Signature>::signature_type;
+
+	template <typename Signature>
+	using function_return_t = typename bind_traits<Signature>::return_type;
+}} // namespace sol::meta
+
+// end of sol/bind_traits.hpp
+
+// beginning of sol/pointer_like.hpp
+
+#include <utility>
+#include <type_traits>
+
+namespace sol {
+
+	namespace meta {
+		namespace meta_detail {
+			template <typename T>
+			using is_dereferenceable_test = decltype(*std::declval<T>());
+
+			template <typename T>
+			using is_explicitly_dereferenceable_test = decltype(std::declval<T>().operator*());
+		}
+
+		template <typename T>
+		using is_pointer_like = std::integral_constant<bool, !std::is_array_v<T> && (std::is_pointer_v<T> || is_detected_v<meta_detail::is_explicitly_dereferenceable_test, T>)>;
+
+		template <typename T>
+		constexpr inline bool is_pointer_like_v = is_pointer_like<T>::value;
+	} // namespace meta
+
+	namespace detail {
+
+		template <typename T>
+		auto unwrap(T&& item) -> decltype(std::forward<T>(item)) {
+			return std::forward<T>(item);
+		}
+
+		template <typename T>
+		T& unwrap(std::reference_wrapper<T> arg) {
+			return arg.get();
+		}
+
+		template <typename T>
+		inline decltype(auto) deref(T&& item) {
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (meta::is_pointer_like_v<Tu>) {
+				return *std::forward<T>(item);
+			}
+			else {
+				return std::forward<T>(item);
+			}
+		}
+
+		template <typename T>
+		inline decltype(auto) deref_move_only(T&& item) {
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (meta::is_pointer_like_v<Tu> && !std::is_pointer_v<Tu> && !std::is_copy_constructible_v<Tu>) {
+				return *std::forward<T>(item);
+			}
+			else {
+				return std::forward<T>(item);
+			}
+		}
+
+		template <typename T>
+		inline T* ptr(T& val) {
+			return std::addressof(val);
+		}
+
+		template <typename T>
+		inline T* ptr(std::reference_wrapper<T> val) {
+			return std::addressof(val.get());
+		}
+
+		template <typename T>
+		inline T* ptr(T* val) {
+			return val;
+		}
+	} // namespace detail
+} // namespace sol
+
+// end of sol/pointer_like.hpp
+
+// beginning of sol/string_view.hpp
+
+#include <cstddef>
+#include <string>
+#include <string_view>
+#include <functional>
+
+namespace sol {
+	template <typename C, typename T = std::char_traits<C>>
+	using basic_string_view = std::basic_string_view<C, T>;
+
+	typedef std::string_view string_view;
+	typedef std::wstring_view wstring_view;
+	typedef std::u16string_view u16string_view;
+	typedef std::u32string_view u32string_view;
+	typedef std::hash<std::string_view> string_view_hash;
+} // namespace sol
+
+// end of sol/string_view.hpp
+
+#include <type_traits>
+#include <cstdint>
+#include <memory>
+#include <functional>
+#include <array>
+#include <iterator>
+#include <iosfwd>
+#if SOL_IS_ON(SOL_STD_VARIANT_I_)
+#include <variant>
+#endif // variant is weird on XCode, thanks XCode
+
+namespace sol { namespace meta {
+	template <typename T>
+	struct unwrapped {
+		typedef T type;
+	};
+
+	template <typename T>
+	struct unwrapped<std::reference_wrapper<T>> {
+		typedef T type;
+	};
+
+	template <typename T>
+	using unwrapped_t = typename unwrapped<T>::type;
+
+	template <typename T>
+	struct unwrap_unqualified : unwrapped<unqualified_t<T>> {};
+
+	template <typename T>
+	using unwrap_unqualified_t = typename unwrap_unqualified<T>::type;
+
+	template <typename T>
+	struct remove_member_pointer;
+
+	template <typename R, typename T>
+	struct remove_member_pointer<R T::*> {
+		typedef R type;
+	};
+
+	template <typename R, typename T>
+	struct remove_member_pointer<R T::*const> {
+		typedef R type;
+	};
+
+	template <typename T>
+	using remove_member_pointer_t = remove_member_pointer<T>;
+
+	template <typename T, typename...>
+	struct all_same : std::true_type {};
+
+	template <typename T, typename U, typename... Args>
+	struct all_same<T, U, Args...> : std::integral_constant<bool, std::is_same<T, U>::value && all_same<T, Args...>::value> {};
+
+	template <typename T, typename...>
+	struct any_same : std::false_type {};
+
+	template <typename T, typename U, typename... Args>
+	struct any_same<T, U, Args...> : std::integral_constant<bool, std::is_same<T, U>::value || any_same<T, Args...>::value> {};
+
+	template <typename T, typename... Args>
+	constexpr inline bool any_same_v = any_same<T, Args...>::value;
+
+	template <bool B>
+	using boolean = std::integral_constant<bool, B>;
+
+	template <bool B>
+	constexpr inline bool boolean_v = boolean<B>::value;
+
+	template <typename T>
+	using neg = boolean<!T::value>;
+
+	template <typename T>
+	constexpr inline bool neg_v = neg<T>::value;
+
+	template <typename... Args>
+	struct all : boolean<true> {};
+
+	template <typename T, typename... Args>
+	struct all<T, Args...> : std::conditional_t<T::value, all<Args...>, boolean<false>> {};
+
+	template <typename... Args>
+	struct any : boolean<false> {};
+
+	template <typename T, typename... Args>
+	struct any<T, Args...> : std::conditional_t<T::value, boolean<true>, any<Args...>> {};
+
+	template <typename T, typename... Args>
+	constexpr inline bool all_v = all<T, Args...>::value;
+
+	template <typename T, typename... Args>
+	constexpr inline bool any_v = any<T, Args...>::value;
+
+	enum class enable_t { _ };
+
+	constexpr const auto enabler = enable_t::_;
+
+	template <bool value, typename T = void>
+	using disable_if_t = std::enable_if_t<!value, T>;
+
+	template <typename... Args>
+	using enable = std::enable_if_t<all<Args...>::value, enable_t>;
+
+	template <typename... Args>
+	using disable = std::enable_if_t<neg<all<Args...>>::value, enable_t>;
+
+	template <typename... Args>
+	using enable_any = std::enable_if_t<any<Args...>::value, enable_t>;
+
+	template <typename... Args>
+	using disable_any = std::enable_if_t<neg<any<Args...>>::value, enable_t>;
+
+	template <typename V, typename... Vs>
+	struct find_in_pack_v : boolean<false> {};
+
+	template <typename V, typename Vs1, typename... Vs>
+	struct find_in_pack_v<V, Vs1, Vs...> : any<boolean<(V::value == Vs1::value)>, find_in_pack_v<V, Vs...>> {};
+
+	namespace meta_detail {
+		template <std::size_t I, typename T, typename... Args>
+		struct index_in_pack : std::integral_constant<std::size_t, SIZE_MAX> {};
+
+		template <std::size_t I, typename T, typename T1, typename... Args>
+		struct index_in_pack<I, T, T1, Args...>
+		: conditional_t<std::is_same<T, T1>::value, std::integral_constant<std::ptrdiff_t, I>, index_in_pack<I + 1, T, Args...>> {};
+	} // namespace meta_detail
+
+	template <typename T, typename... Args>
+	struct index_in_pack : meta_detail::index_in_pack<0, T, Args...> {};
+
+	template <typename T, typename List>
+	struct index_in : meta_detail::index_in_pack<0, T, List> {};
+
+	template <typename T, typename... Args>
+	struct index_in<T, types<Args...>> : meta_detail::index_in_pack<0, T, Args...> {};
+
+	template <std::size_t I, typename... Args>
+	struct at_in_pack {};
+
+	template <std::size_t I, typename... Args>
+	using at_in_pack_t = typename at_in_pack<I, Args...>::type;
+
+	template <std::size_t I, typename Arg, typename... Args>
+	struct at_in_pack<I, Arg, Args...> : std::conditional<I == 0, Arg, at_in_pack_t<I - 1, Args...>> {};
+
+	template <typename Arg, typename... Args>
+	struct at_in_pack<0, Arg, Args...> {
+		typedef Arg type;
+	};
+
+	namespace meta_detail {
+		template <typename, typename TI>
+		using on_even = meta::boolean<(TI::value % 2) == 0>;
+
+		template <typename, typename TI>
+		using on_odd = meta::boolean<(TI::value % 2) == 1>;
+
+		template <typename, typename>
+		using on_always = std::true_type;
+
+		template <template <typename...> class When, std::size_t Limit, std::size_t I, template <typename...> class Pred, typename... Ts>
+		struct count_when_for_pack : std::integral_constant<std::size_t, 0> {};
+		template <template <typename...> class When, std::size_t Limit, std::size_t I, template <typename...> class Pred, typename T, typename... Ts>
+			          struct count_when_for_pack<When, Limit, I, Pred, T, Ts...> : conditional_t < sizeof...(Ts)
+			     == 0
+			|| Limit<2, std::integral_constant<std::size_t, I + static_cast<std::size_t>(Limit != 0 && Pred<T>::value)>,
+			     count_when_for_pack<When, Limit - static_cast<std::size_t>(When<T, std::integral_constant<std::size_t, I>>::value),
+			          I + static_cast<std::size_t>(When<T, std::integral_constant<std::size_t, I>>::value&& Pred<T>::value), Pred, Ts...>> {};
+	} // namespace meta_detail
+
+	template <template <typename...> class Pred, typename... Ts>
+	struct count_for_pack : meta_detail::count_when_for_pack<meta_detail::on_always, sizeof...(Ts), 0, Pred, Ts...> {};
+
+	template <template <typename...> class Pred, typename... Ts>
+	inline constexpr std::size_t count_for_pack_v = count_for_pack<Pred, Ts...>::value;
+
+	template <template <typename...> class Pred, typename List>
+	struct count_for;
+
+	template <template <typename...> class Pred, typename... Args>
+	struct count_for<Pred, types<Args...>> : count_for_pack<Pred, Args...> {};
+
+	template <std::size_t Limit, template <typename...> class Pred, typename... Ts>
+	struct count_for_to_pack : meta_detail::count_when_for_pack<meta_detail::on_always, Limit, 0, Pred, Ts...> {};
+
+	template <std::size_t Limit, template <typename...> class Pred, typename... Ts>
+	inline constexpr std::size_t count_for_to_pack_v = count_for_to_pack<Limit, Pred, Ts...>::value;
+
+	template <template <typename...> class When, std::size_t Limit, template <typename...> class Pred, typename... Ts>
+	struct count_when_for_to_pack : meta_detail::count_when_for_pack<When, Limit, 0, Pred, Ts...> {};
+
+	template <template <typename...> class When, std::size_t Limit, template <typename...> class Pred, typename... Ts>
+	inline constexpr std::size_t count_when_for_to_pack_v = count_when_for_to_pack<When, Limit, Pred, Ts...>::value;
+
+	template <template <typename...> class Pred, typename... Ts>
+	using count_even_for_pack = count_when_for_to_pack<meta_detail::on_even, sizeof...(Ts), Pred, Ts...>;
+
+	template <template <typename...> class Pred, typename... Ts>
+	inline constexpr std::size_t count_even_for_pack_v = count_even_for_pack<Pred, Ts...>::value;
+
+	template <template <typename...> class Pred, typename... Ts>
+	using count_odd_for_pack = count_when_for_to_pack<meta_detail::on_odd, sizeof...(Ts), Pred, Ts...>;
+
+	template <template <typename...> class Pred, typename... Ts>
+	inline constexpr std::size_t count_odd_for_pack_v = count_odd_for_pack<Pred, Ts...>::value;
+
+	template <typename... Args>
+	struct return_type {
+		typedef std::tuple<Args...> type;
+	};
+
+	template <typename T>
+	struct return_type<T> {
+		typedef T type;
+	};
+
+	template <>
+	struct return_type<> {
+		typedef void type;
+	};
+
+	template <typename... Args>
+	using return_type_t = typename return_type<Args...>::type;
+
+	namespace meta_detail {
+		template <typename>
+		struct always_true : std::true_type {};
+		struct is_invokable_tester {
+			template <typename Fun, typename... Args>
+			static always_true<decltype(std::declval<Fun>()(std::declval<Args>()...))> test(int);
+			template <typename...>
+			static std::false_type test(...);
+		};
+	} // namespace meta_detail
+
+	template <typename T>
+	struct is_invokable;
+	template <typename Fun, typename... Args>
+	struct is_invokable<Fun(Args...)> : decltype(meta_detail::is_invokable_tester::test<Fun, Args...>(0)) {};
+
+	namespace meta_detail {
+
+		template <typename T, typename = void>
+		struct is_callable : std::is_function<std::remove_pointer_t<T>> {};
+
+		template <typename T>
+		struct is_callable<T,
+			std::enable_if_t<std::is_final<unqualified_t<T>>::value && std::is_class<unqualified_t<T>>::value
+			     && std::is_same<decltype(void(&T::operator())), void>::value>> {};
+
+		template <typename T>
+		struct is_callable<T,
+			std::enable_if_t<!std::is_final<unqualified_t<T>>::value && std::is_class<unqualified_t<T>>::value
+			     && std::is_destructible<unqualified_t<T>>::value>> {
+			struct F {
+				void operator()() {};
+			};
+			struct Derived : T, F {};
+			template <typename U, U>
+			struct Check;
+
+			template <typename V>
+			static sfinae_no_t test(Check<void (F::*)(), &V::operator()>*);
+
+			template <typename>
+			static sfinae_yes_t test(...);
+
+			static constexpr bool value = std::is_same_v<decltype(test<Derived>(0)), sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct is_callable<T,
+			std::enable_if_t<!std::is_final<unqualified_t<T>>::value && std::is_class<unqualified_t<T>>::value
+			     && !std::is_destructible<unqualified_t<T>>::value>> {
+			struct F {
+				void operator()() {};
+			};
+			struct Derived : T, F {
+				~Derived() = delete;
+			};
+			template <typename U, U>
+			struct Check;
+
+			template <typename V>
+			static sfinae_no_t test(Check<void (F::*)(), &V::operator()>*);
+
+			template <typename>
+			static sfinae_yes_t test(...);
+
+			static constexpr bool value = std::is_same_v<decltype(test<Derived>(0)), sfinae_yes_t>;
+		};
+
+		struct has_begin_end_impl {
+			template <typename T, typename U = unqualified_t<T>, typename B = decltype(std::declval<U&>().begin()),
+				typename E = decltype(std::declval<U&>().end())>
+			static std::true_type test(int);
+
+			template <typename...>
+			static std::false_type test(...);
+		};
+
+		struct has_key_type_impl {
+			template <typename T, typename U = unqualified_t<T>, typename V = typename U::key_type>
+			static std::true_type test(int);
+
+			template <typename...>
+			static std::false_type test(...);
+		};
+
+		struct has_key_comp_impl {
+			template <typename T, typename V = decltype(std::declval<unqualified_t<T>>().key_comp())>
+			static std::true_type test(int);
+
+			template <typename...>
+			static std::false_type test(...);
+		};
+
+		struct has_load_factor_impl {
+			template <typename T, typename V = decltype(std::declval<unqualified_t<T>>().load_factor())>
+			static std::true_type test(int);
+
+			template <typename...>
+			static std::false_type test(...);
+		};
+
+		struct has_mapped_type_impl {
+			template <typename T, typename V = typename unqualified_t<T>::mapped_type>
+			static std::true_type test(int);
+
+			template <typename...>
+			static std::false_type test(...);
+		};
+
+		struct has_value_type_impl {
+			template <typename T, typename V = typename unqualified_t<T>::value_type>
+			static std::true_type test(int);
+
+			template <typename...>
+			static std::false_type test(...);
+		};
+
+		struct has_iterator_impl {
+			template <typename T, typename V = typename unqualified_t<T>::iterator>
+			static std::true_type test(int);
+
+			template <typename...>
+			static std::false_type test(...);
+		};
+
+		struct has_key_value_pair_impl {
+			template <typename T, typename U = unqualified_t<T>, typename V = typename U::value_type, typename F = decltype(std::declval<V&>().first),
+				typename S = decltype(std::declval<V&>().second)>
+			static std::true_type test(int);
+
+			template <typename...>
+			static std::false_type test(...);
+		};
+
+		template <typename T>
+		struct has_push_back_test {
+		private:
+			template <typename C>
+			static sfinae_yes_t test(decltype(std::declval<C>().push_back(std::declval<std::add_rvalue_reference_t<typename C::value_type>>()))*);
+			template <typename C>
+			static sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_insert_test {
+		private:
+			template <typename C>
+			static sfinae_yes_t test(decltype(std::declval<C>().insert(std::declval<std::add_rvalue_reference_t<typename C::const_iterator>>(),
+				std::declval<std::add_rvalue_reference_t<typename C::value_type>>()))*);
+			template <typename C>
+			static sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_insert_after_test {
+		private:
+			template <typename C>
+			static sfinae_yes_t test(decltype(std::declval<C>().insert_after(std::declval<std::add_rvalue_reference_t<typename C::const_iterator>>(),
+				std::declval<std::add_rvalue_reference_t<typename C::value_type>>()))*);
+			template <typename C>
+			static sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_size_test {
+		private:
+			template <typename C>
+			static sfinae_yes_t test(decltype(std::declval<C>().size())*);
+			template <typename C>
+			static sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_max_size_test {
+		private:
+			template <typename C>
+			static sfinae_yes_t test(decltype(std::declval<C>().max_size())*);
+			template <typename C>
+			static sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_to_string_test {
+		private:
+			template <typename C>
+			static sfinae_yes_t test(decltype(std::declval<C>().to_string())*);
+			template <typename C>
+			static sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), sfinae_yes_t>;
+		};
+
+		template <typename T, typename U, typename = void>
+		class supports_op_less_test : public std::false_type {};
+		template <typename T, typename U>
+		class supports_op_less_test<T, U, void_t<decltype(std::declval<T&>() < std::declval<U&>())>>
+		: public std::integral_constant<bool,
+			  !is_specialization_of_v<unqualified_t<T>, std::variant> && !is_specialization_of_v<unqualified_t<U>, std::variant>> {};
+
+		template <typename T, typename U, typename = void>
+		class supports_op_equal_test : public std::false_type {};
+		template <typename T, typename U>
+		class supports_op_equal_test<T, U, void_t<decltype(std::declval<T&>() == std::declval<U&>())>>
+		: public std::integral_constant<bool,
+			  !is_specialization_of_v<unqualified_t<T>, std::variant> && !is_specialization_of_v<unqualified_t<U>, std::variant>> {};
+
+		template <typename T, typename U, typename = void>
+		class supports_op_less_equal_test : public std::false_type {};
+		template <typename T, typename U>
+		class supports_op_less_equal_test<T, U, void_t<decltype(std::declval<T&>() <= std::declval<U&>())>>
+		: public std::integral_constant<bool,
+			  !is_specialization_of_v<unqualified_t<T>, std::variant> && !is_specialization_of_v<unqualified_t<U>, std::variant>> {};
+
+		template <typename T, typename U, typename = void>
+		class supports_op_left_shift_test : public std::false_type {};
+		template <typename T, typename U>
+		class supports_op_left_shift_test<T, U, void_t<decltype(std::declval<T&>() << std::declval<U&>())>> : public std::true_type {};
+
+		template <typename T, typename = void>
+		class supports_adl_to_string_test : public std::false_type {};
+		template <typename T>
+		class supports_adl_to_string_test<T, void_t<decltype(to_string(std::declval<const T&>()))>> : public std::true_type {};
+
+		template <typename T, bool b>
+		struct is_matched_lookup_impl : std::false_type {};
+		template <typename T>
+		struct is_matched_lookup_impl<T, true> : std::is_same<typename T::key_type, typename T::value_type> {};
+
+		template <typename T>
+		using non_void_t = meta::conditional_t<std::is_void_v<T>, ::sol::detail::unchecked_t, T>;
+	} // namespace meta_detail
+
+	template <typename T, typename U = T>
+	class supports_op_less : public meta_detail::supports_op_less_test<T, U> {};
+
+	template <typename T, typename U = T>
+	class supports_op_equal : public meta_detail::supports_op_equal_test<T, U> {};
+
+	template <typename T, typename U = T>
+	class supports_op_less_equal : public meta_detail::supports_op_less_equal_test<T, U> {};
+
+	template <typename T, typename U = T>
+	class supports_op_left_shift : public meta_detail::supports_op_left_shift_test<T, U> {};
+
+	template <typename T>
+	class supports_adl_to_string : public meta_detail::supports_adl_to_string_test<T> {};
+
+	template <typename T>
+	class supports_to_string_member : public meta::boolean<meta_detail::has_to_string_test<meta_detail::non_void_t<T>>::value> {};
+
+	template <typename T>
+	using is_callable = boolean<meta_detail::is_callable<T>::value>;
+
+	template <typename T>
+	constexpr inline bool is_callable_v = is_callable<T>::value;
+
+	template <typename T>
+	struct has_begin_end : decltype(meta_detail::has_begin_end_impl::test<T>(0)) {};
+
+	template <typename T>
+	constexpr inline bool has_begin_end_v = has_begin_end<T>::value;
+
+	template <typename T>
+	struct has_key_value_pair : decltype(meta_detail::has_key_value_pair_impl::test<T>(0)) {};
+
+	template <typename T>
+	struct has_key_type : decltype(meta_detail::has_key_type_impl::test<T>(0)) {};
+
+	template <typename T>
+	struct has_key_comp : decltype(meta_detail::has_key_comp_impl::test<T>(0)) {};
+
+	template <typename T>
+	struct has_load_factor : decltype(meta_detail::has_load_factor_impl::test<T>(0)) {};
+
+	template <typename T>
+	struct has_mapped_type : decltype(meta_detail::has_mapped_type_impl::test<T>(0)) {};
+
+	template <typename T>
+	struct has_iterator : decltype(meta_detail::has_iterator_impl::test<T>(0)) {};
+
+	template <typename T>
+	struct has_value_type : decltype(meta_detail::has_value_type_impl::test<T>(0)) {};
+
+	template <typename T>
+	using has_push_back = meta::boolean<meta_detail::has_push_back_test<T>::value>;
+
+	template <typename T>
+	using has_max_size = meta::boolean<meta_detail::has_max_size_test<T>::value>;
+
+	template <typename T>
+	using has_insert = meta::boolean<meta_detail::has_insert_test<T>::value>;
+
+	template <typename T>
+	using has_insert_after = meta::boolean<meta_detail::has_insert_after_test<T>::value>;
+
+	template <typename T>
+	using has_size = meta::boolean<meta_detail::has_size_test<T>::value>;
+
+	template <typename T>
+	using is_associative = meta::all<has_key_type<T>, has_key_value_pair<T>, has_mapped_type<T>>;
+
+	template <typename T>
+	using is_lookup = meta::all<has_key_type<T>, has_value_type<T>>;
+
+	template <typename T>
+	using is_ordered = meta::all<has_key_comp<T>, meta::neg<has_load_factor<T>>>;
+
+	template <typename T>
+	using is_matched_lookup = meta_detail::is_matched_lookup_impl<T, is_lookup<T>::value>;
+
+	template <typename T>
+	using is_initializer_list = meta::is_specialization_of<T, std::initializer_list>;
+
+	template <typename T>
+	constexpr inline bool is_initializer_list_v = is_initializer_list<T>::value;
+
+	template <typename T, typename CharT = char>
+	using is_string_literal_array_of = boolean<std::is_array_v<T> && std::is_same_v<std::remove_all_extents_t<T>, CharT>>;
+
+	template <typename T, typename CharT = char>
+	constexpr inline bool is_string_literal_array_of_v = is_string_literal_array_of<T, CharT>::value;
+
+	template <typename T>
+	using is_string_literal_array = boolean<std::is_array_v<T> && any_same_v<std::remove_all_extents_t<T>, char, char16_t, char32_t, wchar_t>>;
+
+	template <typename T>
+	constexpr inline bool is_string_literal_array_v = is_string_literal_array<T>::value;
+
+	template <typename T, typename CharT>
+	struct is_string_of : std::false_type {};
+
+	template <typename CharT, typename CharTargetT, typename TraitsT, typename AllocT>
+	struct is_string_of<std::basic_string<CharT, TraitsT, AllocT>, CharTargetT> : std::is_same<CharT, CharTargetT> {};
+
+	template <typename T, typename CharT>
+	constexpr inline bool is_string_of_v = is_string_of<T, CharT>::value;
+
+	template <typename T, typename CharT>
+	struct is_string_view_of : std::false_type {};
+
+	template <typename CharT, typename CharTargetT, typename TraitsT>
+	struct is_string_view_of<std::basic_string_view<CharT, TraitsT>, CharTargetT> : std::is_same<CharT, CharTargetT> {};
+
+	template <typename T, typename CharT>
+	constexpr inline bool is_string_view_of_v = is_string_view_of<T, CharT>::value;
+
+	template <typename T>
+	using is_string_like
+		= meta::boolean<is_specialization_of_v<T, std::basic_string> || is_specialization_of_v<T, std::basic_string_view> || is_string_literal_array_v<T>>;
+
+	template <typename T>
+	constexpr inline bool is_string_like_v = is_string_like<T>::value;
+
+	template <typename T, typename CharT = char>
+	using is_string_constructible = meta::boolean<
+		is_string_literal_array_of_v<T,
+		     CharT> || std::is_same_v<T, const CharT*> || std::is_same_v<T, CharT> || is_string_of_v<T, CharT> || std::is_same_v<T, std::initializer_list<CharT>> || is_string_view_of_v<T, CharT>>;
+
+	template <typename T, typename CharT = char>
+	constexpr inline bool is_string_constructible_v = is_string_constructible<T, CharT>::value;
+
+	template <typename T>
+	using is_string_like_or_constructible = meta::boolean<is_string_like_v<T> || is_string_constructible_v<T>>;
+
+	template <typename T>
+	struct is_pair : std::false_type {};
+
+	template <typename T1, typename T2>
+	struct is_pair<std::pair<T1, T2>> : std::true_type {};
+
+	template <typename T, typename Char>
+	using is_c_str_of = any<std::is_same<T, const Char*>, std::is_same<T, Char const* const>, std::is_same<T, Char*>, is_string_of<T, Char>,
+		is_string_literal_array_of<T, Char>>;
+
+	template <typename T, typename Char>
+	constexpr inline bool is_c_str_of_v = is_c_str_of<T, Char>::value;
+
+	template <typename T>
+	using is_c_str = is_c_str_of<T, char>;
+
+	template <typename T>
+	constexpr inline bool is_c_str_v = is_c_str<T>::value;
+
+	template <typename T>
+	struct is_move_only : all<neg<std::is_reference<T>>, neg<std::is_copy_constructible<unqualified_t<T>>>, std::is_move_constructible<unqualified_t<T>>> {};
+
+	template <typename T>
+	using is_not_move_only = neg<is_move_only<T>>;
+
+	namespace meta_detail {
+		template <typename T>
+		decltype(auto) force_tuple(T&& x) {
+			if constexpr (meta::is_specialization_of_v<meta::unqualified_t<T>, std::tuple>) {
+				return std::forward<T>(x);
+			}
+			else {
+				return std::tuple<T>(std::forward<T>(x));
+			}
+		}
+	} // namespace meta_detail
+
+	template <typename... X>
+	decltype(auto) tuplefy(X&&... x) {
+		return std::tuple_cat(meta_detail::force_tuple(std::forward<X>(x))...);
+	}
+
+	template <typename T, typename = void>
+	struct iterator_tag {
+		using type = std::input_iterator_tag;
+	};
+
+	template <typename T>
+	struct iterator_tag<T, conditional_t<false, typename std::iterator_traits<T>::iterator_category, void>> {
+		using type = typename std::iterator_traits<T>::iterator_category;
+	};
+
+}} // namespace sol::meta
+
+// end of sol/traits.hpp
+
+namespace sol {
+	namespace detail {
+		const bool default_safe_function_calls =
+#if SOL_IS_ON(SOL_SAFE_FUNCTION_CALLS_I_)
+		     true;
+#else
+		     false;
+#endif
+	} // namespace detail
+
+	namespace meta { namespace meta_detail {
+	}} // namespace meta::meta_detail
+
+	namespace stack { namespace stack_detail {
+		using undefined_method_func = void (*)(stack_reference);
+
+		template <typename T>
+		void set_undefined_methods_on(stack_reference);
+
+		struct undefined_metatable;
+	}} // namespace stack::stack_detail
+} // namespace sol
+
+#endif // SOL_FORWARD_DETAIL_HPP
+// end of sol/forward_detail.hpp
+
+// beginning of sol/bytecode.hpp
+
+// beginning of sol/compatibility.hpp
+
+// beginning of sol/compatibility/lua_version.hpp
+
+#if SOL_IS_ON(SOL_USE_CXX_LUA_I_)
+	#include <lua.h>
+	#include <lualib.h>
+	#include <lauxlib.h>
+#elif SOL_IS_ON(SOL_USE_LUA_HPP_I_)
+	#include <lua.hpp>
+#else
+	extern "C" {
+		#include <lua.h>
+		#include <lauxlib.h>
+		#include <lualib.h>
+	}
+#endif // C++ Mangling for Lua vs. Not
+
+#if defined(SOL_LUAJIT)
+	#if (SOL_LUAJIT != 0)
+		#define SOL_USE_LUAJIT_I_ SOL_ON
+	#else
+		#define SOL_USE_LUAJIT_I_ SOL_OFF
+	#endif
+#elif defined(LUAJIT_VERSION)
+	#define SOL_USE_LUAJIT_I_ SOL_OFF
+#else
+	#define SOL_USE_LUAJIT_I_ SOL_DEFAULT_OFF
+#endif // luajit
+
+#if SOL_IS_ON(SOL_USE_CXX_LUAJIT_I_)
+	#include <luajit.h>
+#elif SOL_IS_ON(SOL_USE_LUAJIT_I_)
+	extern "C" {
+		#include <luajit.h>
+	}
+#endif // C++ LuaJIT ... whatever that means
+
+#if defined(SOL_LUAJIT_VERSION)
+	#define SOL_LUAJIT_VERSION_I_ SOL_LUAJIT_VERSION
+#elif SOL_IS_ON(SOL_USE_LUAJIT_I_)
+	#define SOL_LUAJIT_VERSION_I_ LUAJIT_VERSION_NUM
+#else
+	#define SOL_LUAJIT_VERSION_I_ 0
+#endif
+
+#if defined(MOONJIT_VERSION)
+	#define SOL_USE_MOONJIT_I_ SOL_ON
+#else
+	#define SOL_USE_MOONJIT_I_ SOL_OFF
+#endif
+
+#if !defined(SOL_LUA_VERSION)
+	#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 502
+		#define SOL_LUA_VERSION LUA_VERSION_NUM
+	#elif defined(LUA_VERSION_NUM) && LUA_VERSION_NUM == 501
+		#define SOL_LUA_VERSION LUA_VERSION_NUM
+	#elif !defined(LUA_VERSION_NUM) || !(LUA_VERSION_NUM)
+		// Definitely 5.0
+		#define SOL_LUA_VERSION 500
+	#else
+		// ??? Not sure, assume latest?
+		#define SOL_LUA_VERSION 504
+	#endif // Lua Version 503, 502, 501 || luajit, 500
+#endif // SOL_LUA_VERSION
+
+#if defined(SOL_LUA_VERSION)
+	#define SOL_LUA_VESION_I_ SOL_LUA_VERSION
+#else
+	#define SOL_LUA_VESION_I_ 504
+#endif
+
+#if defined(SOL_EXCEPTIONS_ALWAYS_UNSAFE)
+	#if (SOL_EXCEPTIONS_ALWAYS_UNSAFE != 0)
+		#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_OFF
+	#else
+		#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_ON
+	#endif
+#elif defined(SOL_EXCEPTIONS_SAFE_PROPAGATION)
+	#if (SOL_EXCEPTIONS_SAFE_PROPAGATION != 0)
+		#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_ON
+	#else
+		#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_OFF
+	#endif
+#elif SOL_LUAJIT_VERSION_I_ >= 20100
+	// LuaJIT 2.1.0-beta3 and better have exception support locked in for all platforms (mostly)
+	#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_DEFAULT_ON
+#elif SOL_LUAJIT_VERSION_I_ >= 20000
+	// LuaJIT 2.0.x have exception support only on x64 builds
+	#if SOL_IS_ON(SOL_PLATFORM_X64_I_)
+		#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_OFF
+	#endif
+#else
+	// otherwise, there is no exception safety for
+	// shoving exceptions through Lua and errors should
+	// always be serialized
+	#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_DEFAULT_OFF
+#endif // LuaJIT beta 02.01.00 have better exception handling on all platforms since beta3
+
+#if defined(SOL_LUAJIT_USE_EXCEPTION_TRAMPOLINE)
+	#if (SOL_LUAJIT_USE_EXCEPTION_TRAMPOLINE != 0)
+		#define SOL_USE_LUAJIT_EXCEPTION_TRAMPOLINE_I_ SOL_ON
+	#else
+		#define SOL_USE_LUAJIT_EXCEPTION_TRAMPOLINE_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_OFF(SOL_PROPAGATE_EXCEPTIONS_I_) && SOL_IS_ON(SOL_USE_LUAJIT_I_)
+		#define SOL_USE_LUAJIT_EXCEPTION_TRAMPOLINE_I_ SOL_ON
+	#else
+		#define SOL_USE_LUAJIT_EXCEPTION_TRAMPOLINE_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_LUAL_STREAM_HAS_CLOSE_FUNCTION)
+	#if (SOL_LUAL_STREAM_HAS_CLOSE_FUNCTION != 0)
+		#define SOL_LUAL_STREAM_USE_CLOSE_FUNCTION_I_ SOL_ON
+	#else
+		#define SOL_LUAL_STREAM_USE_CLOSE_FUNCTION_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_OFF(SOL_USE_LUAJIT_I_) && (SOL_LUA_VERSION > 501)
+		#define SOL_LUAL_STREAM_USE_CLOSE_FUNCTION_I_ SOL_ON
+	#else
+		#define SOL_LUAL_STREAM_USE_CLOSE_FUNCTION_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+// end of sol/compatibility/lua_version.hpp
+
+#if SOL_IS_ON(SOL_USE_COMPATIBILITY_LAYER_I_)
+
+#if SOL_IS_ON(SOL_USE_CXX_LUA_I_) || SOL_IS_ON(SOL_USE_CXX_LUAJIT_I_)
+#ifndef COMPAT53_LUA_CPP
+#define COMPAT53_LUA_CPP 1
+#endif // Build Lua Compat layer as C++
+#endif
+#ifndef COMPAT53_INCLUDE_SOURCE
+#define COMPAT53_INCLUDE_SOURCE 1
+#endif // Build Compat Layer Inline
+
+// beginning of sol/compatibility/compat-5.3.h
+
+#ifndef KEPLER_PROJECT_COMPAT53_H_
+#define KEPLER_PROJECT_COMPAT53_H_
+
+#include <stddef.h>
+#include <limits.h>
+#include <string.h>
+#if defined(__cplusplus) && !defined(COMPAT53_LUA_CPP)
+extern "C" {
+#endif
+#include <lua.h>
+#include <lauxlib.h>
+#include <lualib.h>
+#if defined(__cplusplus) && !defined(COMPAT53_LUA_CPP)
+}
+#endif
+
+#ifndef COMPAT53_PREFIX
+/* we chose this name because many other lua bindings / libs have
+* their own compatibility layer, and that use the compat53 declaration
+* frequently, causing all kinds of linker / compiler issues
+*/
+#  define COMPAT53_PREFIX kp_compat53
+#endif // COMPAT53_PREFIX
+
+#ifndef COMPAT53_API
+#  if defined(COMPAT53_INCLUDE_SOURCE) && COMPAT53_INCLUDE_SOURCE
+#    if defined(__GNUC__) || defined(__clang__)
+#      define COMPAT53_API __attribute__((__unused__)) static inline 
+#    else
+#      define COMPAT53_API static inline 
+#    endif /* Clang/GCC */
+#  else /* COMPAT53_INCLUDE_SOURCE */
+/* we are not including source, so everything is extern */
+#      define COMPAT53_API extern
+#  endif /* COMPAT53_INCLUDE_SOURCE */
+#endif /* COMPAT53_PREFIX */
+
+#define COMPAT53_CONCAT_HELPER(a, b) a##b
+#define COMPAT53_CONCAT(a, b) COMPAT53_CONCAT_HELPER(a, b)
+
+/* declarations for Lua 5.1 */
+#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM == 501
+
+/* XXX not implemented:
+* lua_arith (new operators)
+* lua_upvalueid
+* lua_upvaluejoin
+* lua_version
+* lua_yieldk
+*/
+
+#ifndef LUA_OK
+#  define LUA_OK 0
+#endif
+#ifndef LUA_OPADD
+#  define LUA_OPADD 0
+#endif
+#ifndef LUA_OPSUB
+#  define LUA_OPSUB 1
+#endif
+#ifndef LUA_OPMUL
+#  define LUA_OPMUL 2
+#endif
+#ifndef LUA_OPDIV
+#  define LUA_OPDIV 3
+#endif
+#ifndef LUA_OPMOD
+#  define LUA_OPMOD 4
+#endif
+#ifndef LUA_OPPOW
+#  define LUA_OPPOW 5
+#endif
+#ifndef LUA_OPUNM
+#  define LUA_OPUNM 6
+#endif
+#ifndef LUA_OPEQ
+#  define LUA_OPEQ 0
+#endif
+#ifndef LUA_OPLT
+#  define LUA_OPLT 1
+#endif
+#ifndef LUA_OPLE
+#  define LUA_OPLE 2
+#endif
+
+/* LuaJIT/Lua 5.1 does not have the updated
+* error codes for thread status/function returns (but some patched versions do)
+* define it only if it's not found
+*/
+#if !defined(LUA_ERRGCMM)
+/* Use + 2 because in some versions of Lua (Lua 5.1)
+* LUA_ERRFILE is defined as (LUA_ERRERR+1)
+* so we need to avoid it (LuaJIT might have something at this
+* integer value too)
+*/
+#  define LUA_ERRGCMM (LUA_ERRERR + 2)
+#endif /* LUA_ERRGCMM define */
+
+#if !defined(MOONJIT_VERSION)
+typedef size_t lua_Unsigned;
+#endif
+
+typedef struct luaL_Buffer_53 {
+	luaL_Buffer b; /* make incorrect code crash! */
+	char *ptr;
+	size_t nelems;
+	size_t capacity;
+	lua_State *L2;
+} luaL_Buffer_53;
+#define luaL_Buffer luaL_Buffer_53
+
+/* In PUC-Rio 5.1, userdata is a simple FILE*
+* In LuaJIT, it's a struct where the first member is a FILE*
+* We can't support the `closef` member
+*/
+typedef struct luaL_Stream {
+	FILE *f;
+} luaL_Stream;
+
+#define lua_absindex COMPAT53_CONCAT(COMPAT53_PREFIX, _absindex)
+COMPAT53_API int lua_absindex(lua_State *L, int i);
+
+#define lua_arith COMPAT53_CONCAT(COMPAT53_PREFIX, _arith)
+COMPAT53_API void lua_arith(lua_State *L, int op);
+
+#define lua_compare COMPAT53_CONCAT(COMPAT53_PREFIX, _compare)
+COMPAT53_API int lua_compare(lua_State *L, int idx1, int idx2, int op);
+
+#define lua_copy COMPAT53_CONCAT(COMPAT53_PREFIX, _copy)
+COMPAT53_API void lua_copy(lua_State *L, int from, int to);
+
+#define lua_getuservalue(L, i) \
+  (lua_getfenv((L), (i)), lua_type((L), -1))
+#define lua_setuservalue(L, i) \
+  (luaL_checktype((L), -1, LUA_TTABLE), lua_setfenv((L), (i)))
+
+#define lua_len COMPAT53_CONCAT(COMPAT53_PREFIX, _len)
+COMPAT53_API void lua_len(lua_State *L, int i);
+
+#define lua_pushstring(L, s) \
+  (lua_pushstring((L), (s)), lua_tostring((L), -1))
+
+#define lua_pushlstring(L, s, len) \
+  ((((len) == 0) ? lua_pushlstring((L), "", 0) : lua_pushlstring((L), (s), (len))), lua_tostring((L), -1))
+
+#ifndef luaL_newlibtable
+#  define luaL_newlibtable(L, l) \
+  (lua_createtable((L), 0, sizeof((l))/sizeof(*(l))-1))
+#endif
+#ifndef luaL_newlib
+#  define luaL_newlib(L, l) \
+  (luaL_newlibtable((L), (l)), luaL_register((L), NULL, (l)))
+#endif
+
+#ifndef lua_pushglobaltable
+#  define lua_pushglobaltable(L) \
+  lua_pushvalue((L), LUA_GLOBALSINDEX)
+#endif
+#define lua_rawgetp COMPAT53_CONCAT(COMPAT53_PREFIX, _rawgetp)
+COMPAT53_API int lua_rawgetp(lua_State *L, int i, const void *p);
+
+#define lua_rawsetp COMPAT53_CONCAT(COMPAT53_PREFIX, _rawsetp)
+COMPAT53_API void lua_rawsetp(lua_State *L, int i, const void *p);
+
+#define lua_rawlen(L, i) lua_objlen((L), (i))
+
+#define lua_tointeger(L, i) lua_tointegerx((L), (i), NULL)
+
+#define lua_tonumberx COMPAT53_CONCAT(COMPAT53_PREFIX, _tonumberx)
+COMPAT53_API lua_Number lua_tonumberx(lua_State *L, int i, int *isnum);
+
+#define luaL_checkversion COMPAT53_CONCAT(COMPAT53_PREFIX, L_checkversion)
+COMPAT53_API void luaL_checkversion(lua_State *L);
+
+#define lua_load COMPAT53_CONCAT(COMPAT53_PREFIX, _load_53)
+COMPAT53_API int lua_load(lua_State *L, lua_Reader reader, void *data, const char* source, const char* mode);
+
+#define luaL_loadfilex COMPAT53_CONCAT(COMPAT53_PREFIX, L_loadfilex)
+COMPAT53_API int luaL_loadfilex(lua_State *L, const char *filename, const char *mode);
+
+#define luaL_loadbufferx COMPAT53_CONCAT(COMPAT53_PREFIX, L_loadbufferx)
+COMPAT53_API int luaL_loadbufferx(lua_State *L, const char *buff, size_t sz, const char *name, const char *mode);
+
+#define luaL_checkstack COMPAT53_CONCAT(COMPAT53_PREFIX, L_checkstack_53)
+COMPAT53_API void luaL_checkstack(lua_State *L, int sp, const char *msg);
+
+#define luaL_getsubtable COMPAT53_CONCAT(COMPAT53_PREFIX, L_getsubtable)
+COMPAT53_API int luaL_getsubtable(lua_State* L, int i, const char *name);
+
+#define luaL_len COMPAT53_CONCAT(COMPAT53_PREFIX, L_len)
+COMPAT53_API lua_Integer luaL_len(lua_State *L, int i);
+
+#define luaL_setfuncs COMPAT53_CONCAT(COMPAT53_PREFIX, L_setfuncs)
+COMPAT53_API void luaL_setfuncs(lua_State *L, const luaL_Reg *l, int nup);
+
+#define luaL_setmetatable COMPAT53_CONCAT(COMPAT53_PREFIX, L_setmetatable)
+COMPAT53_API void luaL_setmetatable(lua_State *L, const char *tname);
+
+#define luaL_testudata COMPAT53_CONCAT(COMPAT53_PREFIX, L_testudata)
+COMPAT53_API void *luaL_testudata(lua_State *L, int i, const char *tname);
+
+#define luaL_traceback COMPAT53_CONCAT(COMPAT53_PREFIX, L_traceback)
+COMPAT53_API void luaL_traceback(lua_State *L, lua_State *L1, const char *msg, int level);
+
+#define luaL_fileresult COMPAT53_CONCAT(COMPAT53_PREFIX, L_fileresult)
+COMPAT53_API int luaL_fileresult(lua_State *L, int stat, const char *fname);
+
+#define luaL_execresult COMPAT53_CONCAT(COMPAT53_PREFIX, L_execresult)
+COMPAT53_API int luaL_execresult(lua_State *L, int stat);
+
+#define lua_callk(L, na, nr, ctx, cont) \
+  ((void)(ctx), (void)(cont), lua_call((L), (na), (nr)))
+#define lua_pcallk(L, na, nr, err, ctx, cont) \
+  ((void)(ctx), (void)(cont), lua_pcall((L), (na), (nr), (err)))
+
+#define lua_resume(L, from, nargs) \
+  ((void)(from), lua_resume((L), (nargs)))
+
+#define luaL_buffinit COMPAT53_CONCAT(COMPAT53_PREFIX, _buffinit_53)
+COMPAT53_API void luaL_buffinit(lua_State *L, luaL_Buffer_53 *B);
+
+#define luaL_prepbuffsize COMPAT53_CONCAT(COMPAT53_PREFIX, _prepbufsize_53)
+COMPAT53_API char *luaL_prepbuffsize(luaL_Buffer_53 *B, size_t s);
+
+#define luaL_addlstring COMPAT53_CONCAT(COMPAT53_PREFIX, _addlstring_53)
+COMPAT53_API void luaL_addlstring(luaL_Buffer_53 *B, const char *s, size_t l);
+
+#define luaL_addvalue COMPAT53_CONCAT(COMPAT53_PREFIX, _addvalue_53)
+COMPAT53_API void luaL_addvalue(luaL_Buffer_53 *B);
+
+#define luaL_pushresult COMPAT53_CONCAT(COMPAT53_PREFIX, _pushresult_53)
+COMPAT53_API void luaL_pushresult(luaL_Buffer_53 *B);
+
+#undef luaL_buffinitsize
+#define luaL_buffinitsize(L, B, s) \
+  (luaL_buffinit((L), (B)), luaL_prepbuffsize((B), (s)))
+
+#undef luaL_prepbuffer
+#define luaL_prepbuffer(B) \
+  luaL_prepbuffsize((B), LUAL_BUFFERSIZE)
+
+#undef luaL_addchar
+#define luaL_addchar(B, c) \
+  ((void)((B)->nelems < (B)->capacity || luaL_prepbuffsize((B), 1)), \
+   ((B)->ptr[(B)->nelems++] = (c)))
+
+#undef luaL_addsize
+#define luaL_addsize(B, s) \
+  ((B)->nelems += (s))
+
+#undef luaL_addstring
+#define luaL_addstring(B, s) \
+  luaL_addlstring((B), (s), strlen((s)))
+
+#undef luaL_pushresultsize
+#define luaL_pushresultsize(B, s) \
+  (luaL_addsize((B), (s)), luaL_pushresult((B)))
+
+#if defined(LUA_COMPAT_APIINTCASTS)
+#define lua_pushunsigned(L, n) \
+  lua_pushinteger((L), (lua_Integer)(n))
+#define lua_tounsignedx(L, i, is) \
+  ((lua_Unsigned)lua_tointegerx((L), (i), (is)))
+#define lua_tounsigned(L, i) \
+  lua_tounsignedx((L), (i), NULL)
+#define luaL_checkunsigned(L, a) \
+  ((lua_Unsigned)luaL_checkinteger((L), (a)))
+#define luaL_optunsigned(L, a, d) \
+  ((lua_Unsigned)luaL_optinteger((L), (a), (lua_Integer)(d)))
+#endif
+
+#endif /* Lua 5.1 only */
+
+/* declarations for Lua 5.1 and 5.2 */
+#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM <= 502
+
+typedef int lua_KContext;
+
+typedef int(*lua_KFunction)(lua_State *L, int status, lua_KContext ctx);
+
+#define lua_dump(L, w, d, s) \
+  ((void)(s), lua_dump((L), (w), (d)))
+
+#define lua_getfield(L, i, k) \
+  (lua_getfield((L), (i), (k)), lua_type((L), -1))
+
+#define lua_gettable(L, i) \
+  (lua_gettable((L), (i)), lua_type((L), -1))
+
+#define lua_geti COMPAT53_CONCAT(COMPAT53_PREFIX, _geti)
+COMPAT53_API int lua_geti(lua_State *L, int index, lua_Integer i);
+
+#define lua_isinteger COMPAT53_CONCAT(COMPAT53_PREFIX, _isinteger)
+COMPAT53_API int lua_isinteger(lua_State *L, int index);
+
+#define lua_tointegerx COMPAT53_CONCAT(COMPAT53_PREFIX, _tointegerx_53)
+COMPAT53_API lua_Integer lua_tointegerx(lua_State *L, int i, int *isnum);
+
+#define lua_numbertointeger(n, p) \
+  ((*(p) = (lua_Integer)(n)), 1)
+
+#define lua_rawget(L, i) \
+  (lua_rawget((L), (i)), lua_type((L), -1))
+
+#define lua_rawgeti(L, i, n) \
+  (lua_rawgeti((L), (i), (n)), lua_type((L), -1))
+
+#define lua_rotate COMPAT53_CONCAT(COMPAT53_PREFIX, _rotate)
+COMPAT53_API void lua_rotate(lua_State *L, int idx, int n);
+
+#define lua_seti COMPAT53_CONCAT(COMPAT53_PREFIX, _seti)
+COMPAT53_API void lua_seti(lua_State *L, int index, lua_Integer i);
+
+#define lua_stringtonumber COMPAT53_CONCAT(COMPAT53_PREFIX, _stringtonumber)
+COMPAT53_API size_t lua_stringtonumber(lua_State *L, const char *s);
+
+#define luaL_tolstring COMPAT53_CONCAT(COMPAT53_PREFIX, L_tolstring)
+COMPAT53_API const char *luaL_tolstring(lua_State *L, int idx, size_t *len);
+
+#define luaL_getmetafield(L, o, e) \
+  (luaL_getmetafield((L), (o), (e)) ? lua_type((L), -1) : LUA_TNIL)
+
+#define luaL_newmetatable(L, tn) \
+  (luaL_newmetatable((L), (tn)) ? (lua_pushstring((L), (tn)), lua_setfield((L), -2, "__name"), 1) : 0)
+
+#define luaL_requiref COMPAT53_CONCAT(COMPAT53_PREFIX, L_requiref_53)
+COMPAT53_API void luaL_requiref(lua_State *L, const char *modname,
+	lua_CFunction openf, int glb);
+
+#endif /* Lua 5.1 and Lua 5.2 */
+
+/* declarations for Lua 5.2 */
+#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM == 502
+
+/* XXX not implemented:
+* lua_isyieldable
+* lua_getextraspace
+* lua_arith (new operators)
+* lua_pushfstring (new formats)
+*/
+
+#define lua_getglobal(L, n) \
+  (lua_getglobal((L), (n)), lua_type((L), -1))
+
+#define lua_getuservalue(L, i) \
+  (lua_getuservalue((L), (i)), lua_type((L), -1))
+
+#define lua_pushlstring(L, s, len) \
+  (((len) == 0) ? lua_pushlstring((L), "", 0) : lua_pushlstring((L), (s), (len)))
+
+#define lua_rawgetp(L, i, p) \
+  (lua_rawgetp((L), (i), (p)), lua_type((L), -1))
+
+#define LUA_KFUNCTION(_name) \
+  static int (_name)(lua_State *L, int status, lua_KContext ctx); \
+  static int (_name ## _52)(lua_State *L) { \
+    lua_KContext ctx; \
+    int status = lua_getctx(L, &ctx); \
+    return (_name)(L, status, ctx); \
+  } \
+  static int (_name)(lua_State *L, int status, lua_KContext ctx)
+
+#define lua_pcallk(L, na, nr, err, ctx, cont) \
+  lua_pcallk((L), (na), (nr), (err), (ctx), cont ## _52)
+
+#define lua_callk(L, na, nr, ctx, cont) \
+  lua_callk((L), (na), (nr), (ctx), cont ## _52)
+
+#define lua_yieldk(L, nr, ctx, cont) \
+  lua_yieldk((L), (nr), (ctx), cont ## _52)
+
+#ifdef lua_call
+#  undef lua_call
+#  define lua_call(L, na, nr) \
+  (lua_callk)((L), (na), (nr), 0, NULL)
+#endif
+
+#ifdef lua_pcall
+#  undef lua_pcall
+#  define lua_pcall(L, na, nr, err) \
+  (lua_pcallk)((L), (na), (nr), (err), 0, NULL)
+#endif
+
+#ifdef lua_yield
+#  undef lua_yield
+#  define lua_yield(L, nr) \
+  (lua_yieldk)((L), (nr), 0, NULL)
+#endif
+
+#endif /* Lua 5.2 only */
+
+/* other Lua versions */
+#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 501 || LUA_VERSION_NUM > 504
+
+#  error "unsupported Lua version (i.e. not Lua 5.1, 5.2, 5.3, or 5.4)"
+
+#endif /* other Lua versions except 5.1, 5.2, 5.3, and 5.4 */
+
+/* helper macro for defining continuation functions (for every version
+* *except* Lua 5.2) */
+#ifndef LUA_KFUNCTION
+#define LUA_KFUNCTION(_name) \
+  static int (_name)(lua_State *L, int status, lua_KContext ctx)
+#endif
+
+#if defined(COMPAT53_INCLUDE_SOURCE) && COMPAT53_INCLUDE_SOURCE == 1
+// beginning of sol/compatibility/compat-5.3.c.h
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include <stdio.h>
+
+/* don't compile it again if it already is included via compat53.h */
+#ifndef KEPLER_PROJECT_COMPAT53_C_
+#define KEPLER_PROJECT_COMPAT53_C_
+
+/* definitions for Lua 5.1 only */
+#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM == 501
+
+#ifndef COMPAT53_FOPEN_NO_LOCK
+#if defined(_MSC_VER)
+#define COMPAT53_FOPEN_NO_LOCK 1
+#else /* otherwise */
+#define COMPAT53_FOPEN_NO_LOCK 0
+#endif /* VC++ only so far */
+#endif /* No-lock fopen_s usage if possible */
+
+#if defined(_MSC_VER) && COMPAT53_FOPEN_NO_LOCK
+#include <share.h>
+#endif /* VC++ _fsopen for share-allowed file read */
+
+#ifndef COMPAT53_HAVE_STRERROR_R
+#if defined(__GLIBC__) || defined(_POSIX_VERSION) || defined(__APPLE__) || (!defined(__MINGW32__) && defined(__GNUC__) && (__GNUC__ < 6))
+#define COMPAT53_HAVE_STRERROR_R 1
+#else /* none of the defines matched: define to 0 */
+#define COMPAT53_HAVE_STRERROR_R 0
+#endif /* have strerror_r of some form */
+#endif /* strerror_r */
+
+#ifndef COMPAT53_HAVE_STRERROR_S
+#if defined(_MSC_VER) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) || (defined(__STDC_LIB_EXT1__) && __STDC_LIB_EXT1__)
+#define COMPAT53_HAVE_STRERROR_S 1
+#else /* not VC++ or C11 */
+#define COMPAT53_HAVE_STRERROR_S 0
+#endif /* strerror_s from VC++ or C11 */
+#endif /* strerror_s */
+
+#ifndef COMPAT53_LUA_FILE_BUFFER_SIZE
+#define COMPAT53_LUA_FILE_BUFFER_SIZE 4096
+#endif /* Lua File Buffer Size */
+
+static char* compat53_strerror(int en, char* buff, size_t sz) {
+#if COMPAT53_HAVE_STRERROR_R
+	/* use strerror_r here, because it's available on these specific platforms */
+	if (sz > 0) {
+		buff[0] = '\0';
+		/* we don't care whether the GNU version or the XSI version is used: */
+		if (strerror_r(en, buff, sz)) {
+			/* Yes, we really DO want to ignore the return value!
+			 * GCC makes that extra hard, not even a (void) cast will do. */
+		}
+		if (buff[0] == '\0') {
+			/* Buffer is unchanged, so we probably have called GNU strerror_r which
+			 * returned a static constant string. Chances are that strerror will
+			 * return the same static constant string and therefore be thread-safe. */
+			return strerror(en);
+		}
+	}
+	return buff; /* sz is 0 *or* strerror_r wrote into the buffer */
+#elif COMPAT53_HAVE_STRERROR_S
+	/* for MSVC and other C11 implementations, use strerror_s since it's
+	 * provided by default by the libraries */
+	strerror_s(buff, sz, en);
+	return buff;
+#else
+	/* fallback, but strerror is not guaranteed to be threadsafe due to modifying
+	 * errno itself and some impls not locking a static buffer for it ... but most
+	 * known systems have threadsafe errno: this might only change if the locale
+	 * is changed out from under someone while this function is being called */
+	(void)buff;
+	(void)sz;
+	return strerror(en);
+#endif
+}
+
+COMPAT53_API int lua_absindex(lua_State* L, int i) {
+	if (i < 0 && i > LUA_REGISTRYINDEX)
+		i += lua_gettop(L) + 1;
+	return i;
+}
+
+static void compat53_call_lua(lua_State* L, char const code[], size_t len, int nargs, int nret) {
+	lua_rawgetp(L, LUA_REGISTRYINDEX, (void*)code);
+	if (lua_type(L, -1) != LUA_TFUNCTION) {
+		lua_pop(L, 1);
+		if (luaL_loadbuffer(L, code, len, "=none"))
+			lua_error(L);
+		lua_pushvalue(L, -1);
+		lua_rawsetp(L, LUA_REGISTRYINDEX, (void*)code);
+	}
+	lua_insert(L, -nargs - 1);
+	lua_call(L, nargs, nret);
+}
+
+static const char compat53_arith_code[]
+     = "local op,a,b=...\n"
+       "if op==0 then return a+b\n"
+       "elseif op==1 then return a-b\n"
+       "elseif op==2 then return a*b\n"
+       "elseif op==3 then return a/b\n"
+       "elseif op==4 then return a%b\n"
+       "elseif op==5 then return a^b\n"
+       "elseif op==6 then return -a\n"
+       "end\n";
+
+COMPAT53_API void lua_arith(lua_State* L, int op) {
+	if (op < LUA_OPADD || op > LUA_OPUNM)
+		luaL_error(L, "invalid 'op' argument for lua_arith");
+	luaL_checkstack(L, 5, "not enough stack slots");
+	if (op == LUA_OPUNM)
+		lua_pushvalue(L, -1);
+	lua_pushnumber(L, op);
+	lua_insert(L, -3);
+	compat53_call_lua(L, compat53_arith_code, sizeof(compat53_arith_code) - 1, 3, 1);
+}
+
+static const char compat53_compare_code[]
+     = "local a,b=...\n"
+       "return a<=b\n";
+
+COMPAT53_API int lua_compare(lua_State* L, int idx1, int idx2, int op) {
+	int result = 0;
+	switch (op) {
+	case LUA_OPEQ:
+		return lua_equal(L, idx1, idx2);
+	case LUA_OPLT:
+		return lua_lessthan(L, idx1, idx2);
+	case LUA_OPLE:
+		luaL_checkstack(L, 5, "not enough stack slots");
+		idx1 = lua_absindex(L, idx1);
+		idx2 = lua_absindex(L, idx2);
+		lua_pushvalue(L, idx1);
+		lua_pushvalue(L, idx2);
+		compat53_call_lua(L, compat53_compare_code, sizeof(compat53_compare_code) - 1, 2, 1);
+		result = lua_toboolean(L, -1);
+		lua_pop(L, 1);
+		return result;
+	default:
+		luaL_error(L, "invalid 'op' argument for lua_compare");
+	}
+	return 0;
+}
+
+COMPAT53_API void lua_copy(lua_State* L, int from, int to) {
+	int abs_to = lua_absindex(L, to);
+	luaL_checkstack(L, 1, "not enough stack slots");
+	lua_pushvalue(L, from);
+	lua_replace(L, abs_to);
+}
+
+COMPAT53_API void lua_len(lua_State* L, int i) {
+	switch (lua_type(L, i)) {
+	case LUA_TSTRING:
+		lua_pushnumber(L, (lua_Number)lua_objlen(L, i));
+		break;
+	case LUA_TTABLE:
+		if (!luaL_callmeta(L, i, "__len"))
+			lua_pushnumber(L, (lua_Number)lua_objlen(L, i));
+		break;
+	case LUA_TUSERDATA:
+		if (luaL_callmeta(L, i, "__len"))
+			break;
+		/* FALLTHROUGH */
+	default:
+		luaL_error(L, "attempt to get length of a %s value", lua_typename(L, lua_type(L, i)));
+	}
+}
+
+COMPAT53_API int lua_rawgetp(lua_State* L, int i, const void* p) {
+	int abs_i = lua_absindex(L, i);
+	lua_pushlightuserdata(L, (void*)p);
+	lua_rawget(L, abs_i);
+	return lua_type(L, -1);
+}
+
+COMPAT53_API void lua_rawsetp(lua_State* L, int i, const void* p) {
+	int abs_i = lua_absindex(L, i);
+	luaL_checkstack(L, 1, "not enough stack slots");
+	lua_pushlightuserdata(L, (void*)p);
+	lua_insert(L, -2);
+	lua_rawset(L, abs_i);
+}
+
+COMPAT53_API lua_Number lua_tonumberx(lua_State* L, int i, int* isnum) {
+	lua_Number n = lua_tonumber(L, i);
+	if (isnum != NULL) {
+		*isnum = (n != 0 || lua_isnumber(L, i));
+	}
+	return n;
+}
+
+COMPAT53_API void luaL_checkversion(lua_State* L) {
+	(void)L;
+}
+
+COMPAT53_API void luaL_checkstack(lua_State* L, int sp, const char* msg) {
+	if (!lua_checkstack(L, sp + LUA_MINSTACK)) {
+		if (msg != NULL)
+			luaL_error(L, "stack overflow (%s)", msg);
+		else {
+			lua_pushliteral(L, "stack overflow");
+			lua_error(L);
+		}
+	}
+}
+
+COMPAT53_API int luaL_getsubtable(lua_State* L, int i, const char* name) {
+	int abs_i = lua_absindex(L, i);
+	luaL_checkstack(L, 3, "not enough stack slots");
+	lua_pushstring(L, name);
+	lua_gettable(L, abs_i);
+	if (lua_istable(L, -1))
+		return 1;
+	lua_pop(L, 1);
+	lua_newtable(L);
+	lua_pushstring(L, name);
+	lua_pushvalue(L, -2);
+	lua_settable(L, abs_i);
+	return 0;
+}
+
+COMPAT53_API lua_Integer luaL_len(lua_State* L, int i) {
+	lua_Integer res = 0;
+	int isnum = 0;
+	luaL_checkstack(L, 1, "not enough stack slots");
+	lua_len(L, i);
+	res = lua_tointegerx(L, -1, &isnum);
+	lua_pop(L, 1);
+	if (!isnum)
+		luaL_error(L, "object length is not an integer");
+	return res;
+}
+
+COMPAT53_API void luaL_setfuncs(lua_State* L, const luaL_Reg* l, int nup) {
+	luaL_checkstack(L, nup + 1, "too many upvalues");
+	for (; l->name != NULL; l++) { /* fill the table with given functions */
+		int i;
+		lua_pushstring(L, l->name);
+		for (i = 0; i < nup; i++) /* copy upvalues to the top */
+			lua_pushvalue(L, -(nup + 1));
+		lua_pushcclosure(L, l->func, nup); /* closure with those upvalues */
+		lua_settable(L, -(nup + 3));       /* table must be below the upvalues, the name and the closure */
+	}
+	lua_pop(L, nup); /* remove upvalues */
+}
+
+COMPAT53_API void luaL_setmetatable(lua_State* L, const char* tname) {
+	luaL_checkstack(L, 1, "not enough stack slots");
+	luaL_getmetatable(L, tname);
+	lua_setmetatable(L, -2);
+}
+
+COMPAT53_API void* luaL_testudata(lua_State* L, int i, const char* tname) {
+	void* p = lua_touserdata(L, i);
+	luaL_checkstack(L, 2, "not enough stack slots");
+	if (p == NULL || !lua_getmetatable(L, i))
+		return NULL;
+	else {
+		int res = 0;
+		luaL_getmetatable(L, tname);
+		res = lua_rawequal(L, -1, -2);
+		lua_pop(L, 2);
+		if (!res)
+			p = NULL;
+	}
+	return p;
+}
+
+static int compat53_countlevels(lua_State* L) {
+	lua_Debug ar;
+	int li = 1, le = 1;
+	/* find an upper bound */
+	while (lua_getstack(L, le, &ar)) {
+		li = le;
+		le *= 2;
+	}
+	/* do a binary search */
+	while (li < le) {
+		int m = (li + le) / 2;
+		if (lua_getstack(L, m, &ar))
+			li = m + 1;
+		else
+			le = m;
+	}
+	return le - 1;
+}
+
+static int compat53_findfield(lua_State* L, int objidx, int level) {
+	if (level == 0 || !lua_istable(L, -1))
+		return 0;                               /* not found */
+	lua_pushnil(L);                              /* start 'next' loop */
+	while (lua_next(L, -2)) {                    /* for each pair in table */
+		if (lua_type(L, -2) == LUA_TSTRING) {   /* ignore non-string keys */
+			if (lua_rawequal(L, objidx, -1)) { /* found object? */
+				lua_pop(L, 1);                /* remove value (but keep name) */
+				return 1;
+			}
+			else if (compat53_findfield(L, objidx, level - 1)) { /* try recursively */
+				lua_remove(L, -2);                              /* remove table (but keep name) */
+				lua_pushliteral(L, ".");
+				lua_insert(L, -2); /* place '.' between the two names */
+				lua_concat(L, 3);
+				return 1;
+			}
+		}
+		lua_pop(L, 1); /* remove value */
+	}
+	return 0; /* not found */
+}
+
+static int compat53_pushglobalfuncname(lua_State* L, lua_Debug* ar) {
+	int top = lua_gettop(L);
+	lua_getinfo(L, "f", ar); /* push function */
+	lua_pushvalue(L, LUA_GLOBALSINDEX);
+	if (compat53_findfield(L, top + 1, 2)) {
+		lua_copy(L, -1, top + 1); /* move name to proper place */
+		lua_pop(L, 2);            /* remove pushed values */
+		return 1;
+	}
+	else {
+		lua_settop(L, top); /* remove function and global table */
+		return 0;
+	}
+}
+
+static void compat53_pushfuncname(lua_State* L, lua_Debug* ar) {
+	if (*ar->namewhat != '\0') /* is there a name? */
+		lua_pushfstring(L, "function " LUA_QS, ar->name);
+	else if (*ar->what == 'm') /* main? */
+		lua_pushliteral(L, "main chunk");
+	else if (*ar->what == 'C') {
+		if (compat53_pushglobalfuncname(L, ar)) {
+			lua_pushfstring(L, "function " LUA_QS, lua_tostring(L, -1));
+			lua_remove(L, -2); /* remove name */
+		}
+		else
+			lua_pushliteral(L, "?");
+	}
+	else
+		lua_pushfstring(L, "function <%s:%d>", ar->short_src, ar->linedefined);
+}
+
+#define COMPAT53_LEVELS1 12 /* size of the first part of the stack */
+#define COMPAT53_LEVELS2 10 /* size of the second part of the stack */
+
+COMPAT53_API void luaL_traceback(lua_State* L, lua_State* L1, const char* msg, int level) {
+	lua_Debug ar;
+	int top = lua_gettop(L);
+	int numlevels = compat53_countlevels(L1);
+	int mark = (numlevels > COMPAT53_LEVELS1 + COMPAT53_LEVELS2) ? COMPAT53_LEVELS1 : 0;
+	if (msg)
+		lua_pushfstring(L, "%s\n", msg);
+	lua_pushliteral(L, "stack traceback:");
+	while (lua_getstack(L1, level++, &ar)) {
+		if (level == mark) {                       /* too many levels? */
+			lua_pushliteral(L, "\n\t...");        /* add a '...' */
+			level = numlevels - COMPAT53_LEVELS2; /* and skip to last ones */
+		}
+		else {
+			lua_getinfo(L1, "Slnt", &ar);
+			lua_pushfstring(L, "\n\t%s:", ar.short_src);
+			if (ar.currentline > 0)
+				lua_pushfstring(L, "%d:", ar.currentline);
+			lua_pushliteral(L, " in ");
+			compat53_pushfuncname(L, &ar);
+			lua_concat(L, lua_gettop(L) - top);
+		}
+	}
+	lua_concat(L, lua_gettop(L) - top);
+}
+
+COMPAT53_API int luaL_fileresult(lua_State* L, int stat, const char* fname) {
+	const char* serr = NULL;
+	int en = errno; /* calls to Lua API may change this value */
+	char buf[512] = { 0 };
+	if (stat) {
+		lua_pushboolean(L, 1);
+		return 1;
+	}
+	else {
+		lua_pushnil(L);
+		serr = compat53_strerror(en, buf, sizeof(buf));
+		if (fname)
+			lua_pushfstring(L, "%s: %s", fname, serr);
+		else
+			lua_pushstring(L, serr);
+		lua_pushnumber(L, (lua_Number)en);
+		return 3;
+	}
+}
+
+static int compat53_checkmode(lua_State* L, const char* mode, const char* modename, int err) {
+	if (mode && strchr(mode, modename[0]) == NULL) {
+		lua_pushfstring(L, "attempt to load a %s chunk (mode is '%s')", modename, mode);
+		return err;
+	}
+	return LUA_OK;
+}
+
+typedef struct {
+	lua_Reader reader;
+	void* ud;
+	int has_peeked_data;
+	const char* peeked_data;
+	size_t peeked_data_size;
+} compat53_reader_data;
+
+static const char* compat53_reader(lua_State* L, void* ud, size_t* size) {
+	compat53_reader_data* data = (compat53_reader_data*)ud;
+	if (data->has_peeked_data) {
+		data->has_peeked_data = 0;
+		*size = data->peeked_data_size;
+		return data->peeked_data;
+	}
+	else
+		return data->reader(L, data->ud, size);
+}
+
+COMPAT53_API int lua_load(lua_State* L, lua_Reader reader, void* data, const char* source, const char* mode) {
+	int status = LUA_OK;
+	compat53_reader_data compat53_data = { reader, data, 1, 0, 0 };
+	compat53_data.peeked_data = reader(L, data, &(compat53_data.peeked_data_size));
+	if (compat53_data.peeked_data && compat53_data.peeked_data_size && compat53_data.peeked_data[0] == LUA_SIGNATURE[0]) /* binary file? */
+		status = compat53_checkmode(L, mode, "binary", LUA_ERRSYNTAX);
+	else
+		status = compat53_checkmode(L, mode, "text", LUA_ERRSYNTAX);
+	if (status != LUA_OK)
+		return status;
+		/* we need to call the original 5.1 version of lua_load! */
+#undef lua_load
+	return lua_load(L, compat53_reader, &compat53_data, source);
+#define lua_load COMPAT53_CONCAT(COMPAT53_PREFIX, _load_53)
+}
+
+typedef struct {
+	int n;                                    /* number of pre-read characters */
+	FILE* f;                                  /* file being read */
+	char buff[COMPAT53_LUA_FILE_BUFFER_SIZE]; /* area for reading file */
+} compat53_LoadF;
+
+static const char* compat53_getF(lua_State* L, void* ud, size_t* size) {
+	compat53_LoadF* lf = (compat53_LoadF*)ud;
+	(void)L;            /* not used */
+	if (lf->n > 0) {    /* are there pre-read characters to be read? */
+		*size = lf->n; /* return them (chars already in buffer) */
+		lf->n = 0;     /* no more pre-read characters */
+	}
+	else { /* read a block from file */
+		  /* 'fread' can return > 0 *and* set the EOF flag. If next call to
+		  'compat53_getF' called 'fread', it might still wait for user input.
+		  The next check avoids this problem. */
+		if (feof(lf->f))
+			return NULL;
+		*size = fread(lf->buff, 1, sizeof(lf->buff), lf->f); /* read block */
+	}
+	return lf->buff;
+}
+
+static int compat53_errfile(lua_State* L, const char* what, int fnameindex) {
+	char buf[512] = { 0 };
+	const char* serr = compat53_strerror(errno, buf, sizeof(buf));
+	const char* filename = lua_tostring(L, fnameindex) + 1;
+	lua_pushfstring(L, "cannot %s %s: %s", what, filename, serr);
+	lua_remove(L, fnameindex);
+	return LUA_ERRFILE;
+}
+
+static int compat53_skipBOM(compat53_LoadF* lf) {
+	const char* p = "\xEF\xBB\xBF"; /* UTF-8 BOM mark */
+	int c;
+	lf->n = 0;
+	do {
+		c = getc(lf->f);
+		if (c == EOF || c != *(const unsigned char*)p++)
+			return c;
+		lf->buff[lf->n++] = (char)c; /* to be read by the parser */
+	} while (*p != '\0');
+	lf->n = 0;          /* prefix matched; discard it */
+	return getc(lf->f); /* return next character */
+}
+
+/*
+** reads the first character of file 'f' and skips an optional BOM mark
+** in its beginning plus its first line if it starts with '#'. Returns
+** true if it skipped the first line.  In any case, '*cp' has the
+** first "valid" character of the file (after the optional BOM and
+** a first-line comment).
+*/
+static int compat53_skipcomment(compat53_LoadF* lf, int* cp) {
+	int c = *cp = compat53_skipBOM(lf);
+	if (c == '#') { /* first line is a comment (Unix exec. file)? */
+		do {       /* skip first line */
+			c = getc(lf->f);
+		} while (c != EOF && c != '\n');
+		*cp = getc(lf->f); /* skip end-of-line, if present */
+		return 1;          /* there was a comment */
+	}
+	else
+		return 0; /* no comment */
+}
+
+COMPAT53_API int luaL_loadfilex(lua_State* L, const char* filename, const char* mode) {
+	compat53_LoadF lf;
+	int status, readstatus;
+	int c;
+	int fnameindex = lua_gettop(L) + 1; /* index of filename on the stack */
+	if (filename == NULL) {
+		lua_pushliteral(L, "=stdin");
+		lf.f = stdin;
+	}
+	else {
+		lua_pushfstring(L, "@%s", filename);
+#if defined(_MSC_VER)
+		/* This code is here to stop a deprecation error that stops builds
+		 * if a certain macro is defined. While normally not caring would
+		 * be best, some header-only libraries and builds can't afford to
+		 * dictate this to the user. A quick check shows that fopen_s this
+		 * goes back to VS 2005, and _fsopen goes back to VS 2003 .NET,
+		 * possibly even before that so we don't need to do any version
+		 * number checks, since this has been there since forever.  */
+
+		/* TO USER: if you want the behavior of typical fopen_s/fopen,
+		 * which does lock the file on VC++, define the macro used below to 0 */
+#if COMPAT53_FOPEN_NO_LOCK
+		lf.f = _fsopen(filename, "r", _SH_DENYNO); /* do not lock the file in any way */
+		if (lf.f == NULL)
+			return compat53_errfile(L, "open", fnameindex);
+#else  /* use default locking version */
+		if (fopen_s(&lf.f, filename, "r") != 0)
+			return compat53_errfile(L, "open", fnameindex);
+#endif /* Locking vs. No-locking fopen variants */
+#else
+		lf.f = fopen(filename, "r"); /* default stdlib doesn't forcefully lock files here */
+		if (lf.f == NULL)
+			return compat53_errfile(L, "open", fnameindex);
+#endif
+	}
+	if (compat53_skipcomment(&lf, &c))       /* read initial portion */
+		lf.buff[lf.n++] = '\n';             /* add line to correct line numbers */
+	if (c == LUA_SIGNATURE[0] && filename) { /* binary file? */
+#if defined(_MSC_VER)
+		if (freopen_s(&lf.f, filename, "rb", lf.f) != 0)
+			return compat53_errfile(L, "reopen", fnameindex);
+#else
+		lf.f = freopen(filename, "rb", lf.f); /* reopen in binary mode */
+		if (lf.f == NULL)
+			return compat53_errfile(L, "reopen", fnameindex);
+#endif
+		compat53_skipcomment(&lf, &c); /* re-read initial portion */
+	}
+	if (c != EOF)
+		lf.buff[lf.n++] = (char)c; /* 'c' is the first character of the stream */
+	status = lua_load(L, &compat53_getF, &lf, lua_tostring(L, -1), mode);
+	readstatus = ferror(lf.f);
+	if (filename)
+		fclose(lf.f); /* close file (even in case of errors) */
+	if (readstatus) {
+		lua_settop(L, fnameindex); /* ignore results from 'lua_load' */
+		return compat53_errfile(L, "read", fnameindex);
+	}
+	lua_remove(L, fnameindex);
+	return status;
+}
+
+COMPAT53_API int luaL_loadbufferx(lua_State* L, const char* buff, size_t sz, const char* name, const char* mode) {
+	int status = LUA_OK;
+	if (sz > 0 && buff[0] == LUA_SIGNATURE[0]) {
+		status = compat53_checkmode(L, mode, "binary", LUA_ERRSYNTAX);
+	}
+	else {
+		status = compat53_checkmode(L, mode, "text", LUA_ERRSYNTAX);
+	}
+	if (status != LUA_OK)
+		return status;
+	return luaL_loadbuffer(L, buff, sz, name);
+}
+
+#if !defined(l_inspectstat) \
+     && (defined(unix) || defined(__unix) || defined(__unix__) || defined(__TOS_AIX__) || defined(_SYSTYPE_BSD) || (defined(__APPLE__) && defined(__MACH__)))
+/* some form of unix; check feature macros in unistd.h for details */
+#include <unistd.h>
+/* check posix version; the relevant include files and macros probably
+ * were available before 2001, but I'm not sure */
+#if defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L
+#include <sys/wait.h>
+#define l_inspectstat(stat, what)   \
+	if (WIFEXITED(stat)) {         \
+		stat = WEXITSTATUS(stat); \
+	}                              \
+	else if (WIFSIGNALED(stat)) {  \
+		stat = WTERMSIG(stat);    \
+		what = "signal";          \
+	}
+#endif
+#endif
+
+/* provide default (no-op) version */
+#if !defined(l_inspectstat)
+#define l_inspectstat(stat, what) ((void)0)
+#endif
+
+COMPAT53_API int luaL_execresult(lua_State* L, int stat) {
+	const char* what = "exit";
+	if (stat == -1)
+		return luaL_fileresult(L, 0, NULL);
+	else {
+		l_inspectstat(stat, what);
+		if (*what == 'e' && stat == 0)
+			lua_pushboolean(L, 1);
+		else
+			lua_pushnil(L);
+		lua_pushstring(L, what);
+		lua_pushinteger(L, stat);
+		return 3;
+	}
+}
+
+COMPAT53_API void luaL_buffinit(lua_State* L, luaL_Buffer_53* B) {
+	/* make it crash if used via pointer to a 5.1-style luaL_Buffer */
+	B->b.p = NULL;
+	B->b.L = NULL;
+	B->b.lvl = 0;
+	/* reuse the buffer from the 5.1-style luaL_Buffer though! */
+	B->ptr = B->b.buffer;
+	B->capacity = LUAL_BUFFERSIZE;
+	B->nelems = 0;
+	B->L2 = L;
+}
+
+COMPAT53_API char* luaL_prepbuffsize(luaL_Buffer_53* B, size_t s) {
+	if (B->capacity - B->nelems < s) { /* needs to grow */
+		char* newptr = NULL;
+		size_t newcap = B->capacity * 2;
+		if (newcap - B->nelems < s)
+			newcap = B->nelems + s;
+		if (newcap < B->capacity) /* overflow */
+			luaL_error(B->L2, "buffer too large");
+		newptr = (char*)lua_newuserdata(B->L2, newcap);
+		memcpy(newptr, B->ptr, B->nelems);
+		if (B->ptr != B->b.buffer)
+			lua_replace(B->L2, -2); /* remove old buffer */
+		B->ptr = newptr;
+		B->capacity = newcap;
+	}
+	return B->ptr + B->nelems;
+}
+
+COMPAT53_API void luaL_addlstring(luaL_Buffer_53* B, const char* s, size_t l) {
+	memcpy(luaL_prepbuffsize(B, l), s, l);
+	luaL_addsize(B, l);
+}
+
+COMPAT53_API void luaL_addvalue(luaL_Buffer_53* B) {
+	size_t len = 0;
+	const char* s = lua_tolstring(B->L2, -1, &len);
+	if (!s)
+		luaL_error(B->L2, "cannot convert value to string");
+	if (B->ptr != B->b.buffer)
+		lua_insert(B->L2, -2); /* userdata buffer must be at stack top */
+	luaL_addlstring(B, s, len);
+	lua_remove(B->L2, B->ptr != B->b.buffer ? -2 : -1);
+}
+
+void luaL_pushresult(luaL_Buffer_53* B) {
+	lua_pushlstring(B->L2, B->ptr, B->nelems);
+	if (B->ptr != B->b.buffer)
+		lua_replace(B->L2, -2); /* remove userdata buffer */
+}
+
+#endif /* Lua 5.1 */
+
+/* definitions for Lua 5.1 and Lua 5.2 */
+#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM <= 502
+
+COMPAT53_API int lua_geti(lua_State* L, int index, lua_Integer i) {
+	index = lua_absindex(L, index);
+	lua_pushinteger(L, i);
+	lua_gettable(L, index);
+	return lua_type(L, -1);
+}
+
+COMPAT53_API int lua_isinteger(lua_State* L, int index) {
+	if (lua_type(L, index) == LUA_TNUMBER) {
+		lua_Number n = lua_tonumber(L, index);
+		lua_Integer i = lua_tointeger(L, index);
+		if (i == n)
+			return 1;
+	}
+	return 0;
+}
+
+COMPAT53_API lua_Integer lua_tointegerx(lua_State* L, int i, int* isnum) {
+	int ok = 0;
+	lua_Number n = lua_tonumberx(L, i, &ok);
+	if (ok) {
+		if (n == (lua_Integer)n) {
+			if (isnum)
+				*isnum = 1;
+			return (lua_Integer)n;
+		}
+	}
+	if (isnum)
+		*isnum = 0;
+	return 0;
+}
+
+static void compat53_reverse(lua_State* L, int a, int b) {
+	for (; a < b; ++a, --b) {
+		lua_pushvalue(L, a);
+		lua_pushvalue(L, b);
+		lua_replace(L, a);
+		lua_replace(L, b);
+	}
+}
+
+COMPAT53_API void lua_rotate(lua_State* L, int idx, int n) {
+	int n_elems = 0;
+	idx = lua_absindex(L, idx);
+	n_elems = lua_gettop(L) - idx + 1;
+	if (n < 0)
+		n += n_elems;
+	if (n > 0 && n < n_elems) {
+		luaL_checkstack(L, 2, "not enough stack slots available");
+		n = n_elems - n;
+		compat53_reverse(L, idx, idx + n - 1);
+		compat53_reverse(L, idx + n, idx + n_elems - 1);
+		compat53_reverse(L, idx, idx + n_elems - 1);
+	}
+}
+
+COMPAT53_API void lua_seti(lua_State* L, int index, lua_Integer i) {
+	luaL_checkstack(L, 1, "not enough stack slots available");
+	index = lua_absindex(L, index);
+	lua_pushinteger(L, i);
+	lua_insert(L, -2);
+	lua_settable(L, index);
+}
+
+#if !defined(lua_str2number)
+#define lua_str2number(s, p) strtod((s), (p))
+#endif
+
+COMPAT53_API size_t lua_stringtonumber(lua_State* L, const char* s) {
+	char* endptr;
+	lua_Number n = lua_str2number(s, &endptr);
+	if (endptr != s) {
+		while (*endptr != '\0' && isspace((unsigned char)*endptr))
+			++endptr;
+		if (*endptr == '\0') {
+			lua_pushnumber(L, n);
+			return endptr - s + 1;
+		}
+	}
+	return 0;
+}
+
+COMPAT53_API const char* luaL_tolstring(lua_State* L, int idx, size_t* len) {
+	if (!luaL_callmeta(L, idx, "__tostring")) {
+		int t = lua_type(L, idx), tt = 0;
+		char const* name = NULL;
+		switch (t) {
+		case LUA_TNIL:
+			lua_pushliteral(L, "nil");
+			break;
+		case LUA_TSTRING:
+		case LUA_TNUMBER:
+			lua_pushvalue(L, idx);
+			break;
+		case LUA_TBOOLEAN:
+			if (lua_toboolean(L, idx))
+				lua_pushliteral(L, "true");
+			else
+				lua_pushliteral(L, "false");
+			break;
+		default:
+			tt = luaL_getmetafield(L, idx, "__name");
+			name = (tt == LUA_TSTRING) ? lua_tostring(L, -1) : lua_typename(L, t);
+			lua_pushfstring(L, "%s: %p", name, lua_topointer(L, idx));
+			if (tt != LUA_TNIL)
+				lua_replace(L, -2);
+			break;
+		}
+	}
+	else {
+		if (!lua_isstring(L, -1))
+			luaL_error(L, "'__tostring' must return a string");
+	}
+	return lua_tolstring(L, -1, len);
+}
+
+COMPAT53_API void luaL_requiref(lua_State* L, const char* modname, lua_CFunction openf, int glb) {
+	luaL_checkstack(L, 3, "not enough stack slots available");
+	luaL_getsubtable(L, LUA_REGISTRYINDEX, "_LOADED");
+	if (lua_getfield(L, -1, modname) == LUA_TNIL) {
+		lua_pop(L, 1);
+		lua_pushcfunction(L, openf);
+		lua_pushstring(L, modname);
+		lua_call(L, 1, 1);
+		lua_pushvalue(L, -1);
+		lua_setfield(L, -3, modname);
+	}
+	if (glb) {
+		lua_pushvalue(L, -1);
+		lua_setglobal(L, modname);
+	}
+	lua_replace(L, -2);
+}
+
+#endif /* Lua 5.1 and 5.2 */
+
+#endif /* KEPLER_PROJECT_COMPAT53_C_ */
+
+/*********************************************************************
+ * This file contains parts of Lua 5.2's and Lua 5.3's source code:
+ *
+ * Copyright (C) 1994-2014 Lua.org, PUC-Rio.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *********************************************************************/
+// end of sol/compatibility/compat-5.3.c.h
+
+#endif
+
+#endif /* KEPLER_PROJECT_COMPAT53_H_ */
+
+// end of sol/compatibility/compat-5.3.h
+
+// beginning of sol/compatibility/compat-5.4.h
+
+#ifndef NOT_KEPLER_PROJECT_COMPAT54_H_
+#define NOT_KEPLER_PROJECT_COMPAT54_H_
+
+#if defined(__cplusplus) && !defined(COMPAT53_LUA_CPP)
+extern "C" {
+#endif
+#include <lua.h>
+#include <lauxlib.h>
+#include <lualib.h>
+#if defined(__cplusplus) && !defined(COMPAT53_LUA_CPP)
+}
+#endif
+
+#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM == 504
+
+#if !defined(LUA_ERRGCMM)
+/* So Lua 5.4 actually removes this, which breaks sol2...
+ man, this API is quite unstable...!
+*/
+#  define LUA_ERRGCMM (LUA_ERRERR + 2)
+#endif /* LUA_ERRGCMM define */
+
+#endif // Lua 5.4 only
+
+#endif // NOT_KEPLER_PROJECT_COMPAT54_H_// end of sol/compatibility/compat-5.4.h
+
+#endif
+
+// end of sol/compatibility.hpp
+
+#include <vector>
+#include <cstdint>
+#include <cstddef>
+
+namespace sol {
+
+	template <typename Allocator = std::allocator<std::byte>>
+	class basic_bytecode : private std::vector<std::byte, Allocator> {
+	private:
+		using base_t = std::vector<std::byte, Allocator>;
+
+	public:
+		using typename base_t::allocator_type;
+		using typename base_t::const_iterator;
+		using typename base_t::const_pointer;
+		using typename base_t::const_reference;
+		using typename base_t::const_reverse_iterator;
+		using typename base_t::difference_type;
+		using typename base_t::iterator;
+		using typename base_t::pointer;
+		using typename base_t::reference;
+		using typename base_t::reverse_iterator;
+		using typename base_t::size_type;
+		using typename base_t::value_type;
+
+		using base_t::base_t;
+		using base_t::operator=;
+
+		using base_t::data;
+		using base_t::empty;
+		using base_t::max_size;
+		using base_t::size;
+
+		using base_t::at;
+		using base_t::operator[];
+		using base_t::back;
+		using base_t::front;
+
+		using base_t::begin;
+		using base_t::cbegin;
+		using base_t::cend;
+		using base_t::end;
+
+		using base_t::crbegin;
+		using base_t::crend;
+		using base_t::rbegin;
+		using base_t::rend;
+
+		using base_t::get_allocator;
+		using base_t::swap;
+
+		using base_t::clear;
+		using base_t::emplace;
+		using base_t::emplace_back;
+		using base_t::erase;
+		using base_t::insert;
+		using base_t::pop_back;
+		using base_t::push_back;
+		using base_t::reserve;
+		using base_t::resize;
+		using base_t::shrink_to_fit;
+
+		string_view as_string_view() const {
+			return string_view(reinterpret_cast<const char*>(this->data()), this->size());
+		}
+	};
+
+	template <typename Container>
+	inline int basic_insert_dump_writer(lua_State*, const void* memory, size_t memory_size, void* userdata) {
+		using storage_t = Container;
+		const std::byte* p_code = static_cast<const std::byte*>(memory);
+		storage_t& bc = *static_cast<storage_t*>(userdata);
+#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
+		bc.insert(bc.cend(), p_code, p_code + memory_size);
+#else
+		try {
+			bc.insert(bc.cend(), p_code, p_code + memory_size);
+		}
+		catch (...) {
+			return -1;
+		}
+#endif
+		return 0;
+	}
+
+	using bytecode = basic_bytecode<>;
+
+	constexpr inline auto bytecode_dump_writer = &basic_insert_dump_writer<bytecode>;
+
+} // namespace sol
+
+// end of sol/bytecode.hpp
+
+// beginning of sol/stack.hpp
+
+// beginning of sol/trampoline.hpp
+
+// beginning of sol/types.hpp
+
+// beginning of sol/error.hpp
+
+#include <stdexcept>
+#include <string>
+#include <array>
+
+namespace sol {
+	namespace detail {
+		struct direct_error_tag {};
+		const auto direct_error = direct_error_tag{};
+
+		struct error_result {
+			int results;
+			const char* format_string;
+			std::array<const char*, 4> args_strings;
+
+			error_result() : results(0), format_string(nullptr) {
+			}
+
+			error_result(int results) : results(results), format_string(nullptr) {
+			}
+
+			error_result(const char* fmt, const char* msg) : results(0), format_string(fmt) {
+				args_strings[0] = msg;
+			}
+		};
+
+		inline int handle_errors(lua_State* L, const error_result& er) {
+			if (er.format_string == nullptr) {
+				return er.results;
+			}
+			return luaL_error(L, er.format_string, er.args_strings[0], er.args_strings[1], er.args_strings[2], er.args_strings[3]);
+		}
+	} // namespace detail
+
+	class error : public std::runtime_error {
+	private:
+		// Because VC++ is upsetting, most of the time!
+		std::string what_reason;
+
+	public:
+		error(const std::string& str) : error(detail::direct_error, "lua: error: " + str) {
+		}
+		error(std::string&& str) : error(detail::direct_error, "lua: error: " + std::move(str)) {
+		}
+		error(detail::direct_error_tag, const std::string& str) : std::runtime_error(""), what_reason(str) {
+		}
+		error(detail::direct_error_tag, std::string&& str) : std::runtime_error(""), what_reason(std::move(str)) {
+		}
+
+		error(const error& e) = default;
+		error(error&& e) = default;
+		error& operator=(const error& e) = default;
+		error& operator=(error&& e) = default;
+
+		virtual const char* what() const noexcept override {
+			return what_reason.c_str();
+		}
+	};
+
+} // namespace sol
+
+// end of sol/error.hpp
+
+// beginning of sol/optional.hpp
+
+// beginning of sol/in_place.hpp
+
+#include <cstddef>
+#include <utility>
+
+namespace sol {
+
+	using in_place_t = std::in_place_t;
+	constexpr std::in_place_t in_place {};
+	constexpr std::in_place_t in_place_of {};
+
+	template <typename T>
+	using in_place_type_t = std::in_place_type_t<T>;
+	template <typename T>
+	constexpr std::in_place_type_t<T> in_place_type {};
+
+	template <size_t I>
+	using in_place_index_t = std::in_place_index_t<I>;
+	template <size_t I>
+	constexpr in_place_index_t<I> in_place_index {};
+
+} // namespace sol
+
+// end of sol/in_place.hpp
+
+#if SOL_IS_ON(SOL_USE_BOOST_I_)
+#include <boost/optional.hpp>
+#else
+// beginning of sol/optional_implementation.hpp
+
+#define SOL_TL_OPTIONAL_VERSION_MAJOR 0
+#define SOL_TL_OPTIONAL_VERSION_MINOR 5
+
+#include <exception>
+#include <functional>
+#include <new>
+#include <type_traits>
+#include <utility>
+#include <cstdlib>
+#include <optional>
+
+#if (defined(_MSC_VER) && _MSC_VER == 1900)
+#define SOL_TL_OPTIONAL_MSVC2015
+#endif
+
+#if (defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ <= 9 && !defined(__clang__))
+#define SOL_TL_OPTIONAL_GCC49
+#endif
+
+#if (defined(__GNUC__) && __GNUC__ == 5 && __GNUC_MINOR__ <= 4 && !defined(__clang__))
+#define SOL_TL_OPTIONAL_GCC54
+#endif
+
+#if (defined(__GNUC__) && __GNUC__ == 5 && __GNUC_MINOR__ <= 5 && !defined(__clang__))
+#define SOL_TL_OPTIONAL_GCC55
+#endif
+
+#if (defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ <= 9 && !defined(__clang__))
+#define SOL_TL_OPTIONAL_NO_CONSTRR
+
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_CONSTRUCTIBLE(T) std::has_trivial_copy_constructor<T>::value
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_ASSIGNABLE(T) std::has_trivial_copy_assign<T>::value
+
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_DESTRUCTIBLE(T) std::is_trivially_destructible<T>::value
+
+#elif (defined(__GNUC__) && __GNUC__ < 8 && !defined(__clang__))
+#ifndef SOL_TL_GCC_LESS_8_TRIVIALLY_COPY_CONSTRUCTIBLE_MUTEX
+#define SOL_TL_GCC_LESS_8_TRIVIALLY_COPY_CONSTRUCTIBLE_MUTEX
+namespace sol { namespace detail {
+	template <class T>
+	struct is_trivially_copy_constructible : std::is_trivially_copy_constructible<T> {};
+#ifdef _GLIBCXX_VECTOR
+	template <class T, class A>
+	struct is_trivially_copy_constructible<std::vector<T, A>> : std::is_trivially_copy_constructible<T> {};
+#endif
+}} // namespace sol::detail
+#endif
+
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_CONSTRUCTIBLE(T) sol::detail::is_trivially_copy_constructible<T>::value
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_ASSIGNABLE(T) std::is_trivially_copy_assignable<T>::value
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_DESTRUCTIBLE(T) std::is_trivially_destructible<T>::value
+#else
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_CONSTRUCTIBLE(T) std::is_trivially_copy_constructible<T>::value
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_ASSIGNABLE(T) std::is_trivially_copy_assignable<T>::value
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_DESTRUCTIBLE(T) std::is_trivially_destructible<T>::value
+#endif
+
+#if __cplusplus > 201103L
+#define SOL_TL_OPTIONAL_CXX14
+#endif
+
+#if (__cplusplus == 201103L || defined(SOL_TL_OPTIONAL_MSVC2015) || defined(SOL_TL_OPTIONAL_GCC49))
+#define SOL_TL_OPTIONAL_11_CONSTEXPR
+#else
+   /// \exclude
+#define SOL_TL_OPTIONAL_11_CONSTEXPR constexpr
+#endif
+
+namespace sol {
+#ifndef SOL_TL_MONOSTATE_INPLACE_MUTEX
+#define SOL_TL_MONOSTATE_INPLACE_MUTEX
+	/// \brief Used to represent an optional with no data; essentially a bool
+	class monostate {};
+#endif
+
+	template <class T>
+	class optional;
+
+	/// \exclude
+	namespace detail {
+#ifndef SOL_TL_TRAITS_MUTEX
+#define SOL_TL_TRAITS_MUTEX
+		// C++14-style aliases for brevity
+		template <class T>
+		using remove_const_t = typename std::remove_const<T>::type;
+		template <class T>
+		using remove_reference_t = typename std::remove_reference<T>::type;
+		template <class T>
+		using decay_t = typename std::decay<T>::type;
+		template <bool E, class T = void>
+		using enable_if_t = typename std::enable_if<E, T>::type;
+		template <bool B, class T, class F>
+		using conditional_t = typename std::conditional<B, T, F>::type;
+
+		// std::conjunction from C++17
+		template <class...>
+		struct conjunction : std::true_type {};
+		template <class B>
+		struct conjunction<B> : B {};
+		template <class B, class... Bs>
+		struct conjunction<B, Bs...> : std::conditional<bool(B::value), conjunction<Bs...>, B>::type {};
+
+#if defined(_LIBCPP_VERSION) && __cplusplus == 201103L
+#define SOL_TL_OPTIONAL_LIBCXX_MEM_FN_WORKAROUND
+#endif
+
+#ifdef SOL_TL_OPTIONAL_LIBCXX_MEM_FN_WORKAROUND
+		template <class T>
+		struct is_pointer_to_non_const_member_func : std::false_type {};
+		template <class T, class Ret, class... Args>
+		struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...)> : std::true_type {};
+		template <class T, class Ret, class... Args>
+		struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...)&> : std::true_type {};
+		template <class T, class Ret, class... Args>
+		struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...) &&> : std::true_type {};
+		template <class T, class Ret, class... Args>
+		struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...) volatile> : std::true_type {};
+		template <class T, class Ret, class... Args>
+		struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...) volatile&> : std::true_type {};
+		template <class T, class Ret, class... Args>
+		struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...) volatile&&> : std::true_type {};
+
+		template <class T>
+		struct is_const_or_const_ref : std::false_type {};
+		template <class T>
+		struct is_const_or_const_ref<T const&> : std::true_type {};
+		template <class T>
+		struct is_const_or_const_ref<T const> : std::true_type {};
+#endif
+
+		// std::invoke from C++17
+		// https://stackoverflow.com/questions/38288042/c11-14-invoke-workaround
+		template <typename Fn, typename... Args,
+#ifdef SOL_TL_OPTIONAL_LIBCXX_MEM_FN_WORKAROUND
+		     typename = enable_if_t<!(is_pointer_to_non_const_member_func<Fn>::value && is_const_or_const_ref<Args...>::value)>,
+#endif
+		     typename = enable_if_t<std::is_member_pointer<decay_t<Fn>>::value>, int = 0>
+		constexpr auto invoke(Fn&& f, Args&&... args) noexcept(noexcept(std::mem_fn(f)(std::forward<Args>(args)...)))
+		     -> decltype(std::mem_fn(f)(std::forward<Args>(args)...)) {
+			return std::mem_fn(f)(std::forward<Args>(args)...);
+		}
+
+		template <typename Fn, typename... Args, typename = enable_if_t<!std::is_member_pointer<decay_t<Fn>>::value>>
+		constexpr auto invoke(Fn&& f, Args&&... args) noexcept(noexcept(std::forward<Fn>(f)(std::forward<Args>(args)...)))
+		     -> decltype(std::forward<Fn>(f)(std::forward<Args>(args)...)) {
+			return std::forward<Fn>(f)(std::forward<Args>(args)...);
+		}
+
+		// std::invoke_result from C++17
+		template <class F, class, class... Us>
+		struct invoke_result_impl;
+
+		template <class F, class... Us>
+		struct invoke_result_impl<F, decltype(detail::invoke(std::declval<F>(), std::declval<Us>()...), void()), Us...> {
+			using type = decltype(detail::invoke(std::declval<F>(), std::declval<Us>()...));
+		};
+
+		template <class F, class... Us>
+		using invoke_result = invoke_result_impl<F, void, Us...>;
+
+		template <class F, class... Us>
+		using invoke_result_t = typename invoke_result<F, Us...>::type;
+#endif
+
+		// std::void_t from C++17
+		template <class...>
+		struct voider {
+			using type = void;
+		};
+		template <class... Ts>
+		using void_t = typename voider<Ts...>::type;
+
+		// Trait for checking if a type is a sol::optional
+		template <class T>
+		struct is_optional_impl : std::false_type {};
+		template <class T>
+		struct is_optional_impl<optional<T>> : std::true_type {};
+		template <class T>
+		using is_optional = is_optional_impl<decay_t<T>>;
+
+		// Change void to sol::monostate
+		template <class U>
+		using fixup_void = conditional_t<std::is_void<U>::value, monostate, U>;
+
+		template <class F, class U, class = invoke_result_t<F, U>>
+		using get_map_return = optional<fixup_void<invoke_result_t<F, U>>>;
+
+		// Check if invoking F for some Us returns void
+		template <class F, class = void, class... U>
+		struct returns_void_impl;
+		template <class F, class... U>
+		struct returns_void_impl<F, void_t<invoke_result_t<F, U...>>, U...> : std::is_void<invoke_result_t<F, U...>> {};
+		template <class F, class... U>
+		using returns_void = returns_void_impl<F, void, U...>;
+
+		template <class T, class... U>
+		using enable_if_ret_void = enable_if_t<returns_void<T&&, U...>::value>;
+
+		template <class T, class... U>
+		using disable_if_ret_void = enable_if_t<!returns_void<T&&, U...>::value>;
+
+		template <class T, class U>
+		using enable_forward_value = detail::enable_if_t<std::is_constructible<T, U&&>::value && !std::is_same<detail::decay_t<U>, in_place_t>::value
+		     && !std::is_same<optional<T>, detail::decay_t<U>>::value>;
+
+		template <class T, class U, class Other>
+		using enable_from_other = detail::enable_if_t<std::is_constructible<T, Other>::value && !std::is_constructible<T, optional<U>&>::value
+		     && !std::is_constructible<T, optional<U>&&>::value && !std::is_constructible<T, const optional<U>&>::value
+		     && !std::is_constructible<T, const optional<U>&&>::value && !std::is_convertible<optional<U>&, T>::value
+		     && !std::is_convertible<optional<U>&&, T>::value && !std::is_convertible<const optional<U>&, T>::value
+		     && !std::is_convertible<const optional<U>&&, T>::value>;
+
+		template <class T, class U>
+		using enable_assign_forward = detail::enable_if_t<!std::is_same<optional<T>, detail::decay_t<U>>::value
+		     && !detail::conjunction<std::is_scalar<T>, std::is_same<T, detail::decay_t<U>>>::value && std::is_constructible<T, U>::value
+		     && std::is_assignable<T&, U>::value>;
+
+		template <class T, class U, class Other>
+		using enable_assign_from_other = detail::enable_if_t<std::is_constructible<T, Other>::value && std::is_assignable<T&, Other>::value
+		     && !std::is_constructible<T, optional<U>&>::value && !std::is_constructible<T, optional<U>&&>::value
+		     && !std::is_constructible<T, const optional<U>&>::value && !std::is_constructible<T, const optional<U>&&>::value
+		     && !std::is_convertible<optional<U>&, T>::value && !std::is_convertible<optional<U>&&, T>::value
+		     && !std::is_convertible<const optional<U>&, T>::value && !std::is_convertible<const optional<U>&&, T>::value
+		     && !std::is_assignable<T&, optional<U>&>::value && !std::is_assignable<T&, optional<U>&&>::value
+		     && !std::is_assignable<T&, const optional<U>&>::value && !std::is_assignable<T&, const optional<U>&&>::value>;
+
+#ifdef _MSC_VER
+		// TODO make a version which works with MSVC
+		template <class T, class U = T>
+		struct is_swappable : std::true_type {};
+
+		template <class T, class U = T>
+		struct is_nothrow_swappable : std::true_type {};
+#else
+		// https://stackoverflow.com/questions/26744589/what-is-a-proper-way-to-implement-is-swappable-to-test-for-the-swappable-concept
+		namespace swap_adl_tests {
+			// if swap ADL finds this then it would call std::swap otherwise (same
+			// signature)
+			struct tag {};
+
+			template <class T>
+			tag swap(T&, T&);
+			template <class T, std::size_t N>
+			tag swap(T (&a)[N], T (&b)[N]);
+
+			// helper functions to test if an unqualified swap is possible, and if it
+			// becomes std::swap
+			template <class, class>
+			std::false_type can_swap(...) noexcept(false);
+			template <class T, class U, class = decltype(swap(std::declval<T&>(), std::declval<U&>()))>
+			std::true_type can_swap(int) noexcept(noexcept(swap(std::declval<T&>(), std::declval<U&>())));
+
+			template <class, class>
+			std::false_type uses_std(...);
+			template <class T, class U>
+			std::is_same<decltype(swap(std::declval<T&>(), std::declval<U&>())), tag> uses_std(int);
+
+			template <class T>
+			struct is_std_swap_noexcept
+			: std::integral_constant<bool, std::is_nothrow_move_constructible<T>::value && std::is_nothrow_move_assignable<T>::value> {};
+
+			template <class T, std::size_t N>
+			struct is_std_swap_noexcept<T[N]> : is_std_swap_noexcept<T> {};
+
+			template <class T, class U>
+			struct is_adl_swap_noexcept : std::integral_constant<bool, noexcept(can_swap<T, U>(0))> {};
+		} // namespace swap_adl_tests
+
+		template <class T, class U = T>
+		struct is_swappable : std::integral_constant<bool,
+		                           decltype(detail::swap_adl_tests::can_swap<T, U>(0))::value
+		                                && (!decltype(detail::swap_adl_tests::uses_std<T, U>(0))::value
+		                                     || (std::is_move_assignable<T>::value && std::is_move_constructible<T>::value))> {};
+
+		template <class T, std::size_t N>
+		struct is_swappable<T[N], T[N]> : std::integral_constant<bool,
+		                                       decltype(detail::swap_adl_tests::can_swap<T[N], T[N]>(0))::value
+		                                            && (!decltype(detail::swap_adl_tests::uses_std<T[N], T[N]>(0))::value || is_swappable<T, T>::value)> {};
+
+		template <class T, class U = T>
+		struct is_nothrow_swappable
+		: std::integral_constant<bool,
+		       is_swappable<T, U>::value
+		            && ((decltype(detail::swap_adl_tests::uses_std<T, U>(0))::value&& detail::swap_adl_tests::is_std_swap_noexcept<T>::value)
+		                 || (!decltype(detail::swap_adl_tests::uses_std<T, U>(0))::value&& detail::swap_adl_tests::is_adl_swap_noexcept<T, U>::value))> {};
+#endif
+
+		// The storage base manages the actual storage, and correctly propagates
+		// trivial destruction from T. This case is for when T is not trivially
+		// destructible.
+		template <class T, bool = ::std::is_trivially_destructible<T>::value>
+		struct optional_storage_base {
+			SOL_TL_OPTIONAL_11_CONSTEXPR optional_storage_base() noexcept : m_dummy(), m_has_value(false) {
+			}
+
+			template <class... U>
+			SOL_TL_OPTIONAL_11_CONSTEXPR optional_storage_base(in_place_t, U&&... u) : m_value(std::forward<U>(u)...), m_has_value(true) {
+			}
+
+			~optional_storage_base() {
+				if (m_has_value) {
+					m_value.~T();
+					m_has_value = false;
+				}
+			}
+
+			struct dummy {};
+			union {
+				dummy m_dummy;
+				T m_value;
+			};
+
+			bool m_has_value;
+		};
+
+		// This case is for when T is trivially destructible.
+		template <class T>
+		struct optional_storage_base<T, true> {
+			SOL_TL_OPTIONAL_11_CONSTEXPR optional_storage_base() noexcept : m_dummy(), m_has_value(false) {
+			}
+
+			template <class... U>
+			SOL_TL_OPTIONAL_11_CONSTEXPR optional_storage_base(in_place_t, U&&... u) : m_value(std::forward<U>(u)...), m_has_value(true) {
+			}
+
+			// No destructor, so this class is trivially destructible
+
+			struct dummy {};
+			union {
+				dummy m_dummy;
+				T m_value;
+			};
+
+			bool m_has_value = false;
+		};
+
+		// This base class provides some handy member functions which can be used in
+		// further derived classes
+		template <class T>
+		struct optional_operations_base : optional_storage_base<T> {
+			using optional_storage_base<T>::optional_storage_base;
+
+			void hard_reset() noexcept {
+				get().~T();
+				this->m_has_value = false;
+			}
+
+			template <class... Args>
+			void construct(Args&&... args) noexcept {
+				new (std::addressof(this->m_value)) T(std::forward<Args>(args)...);
+				this->m_has_value = true;
+			}
+
+			template <class Opt>
+			void assign(Opt&& rhs) {
+				if (this->has_value()) {
+					if (rhs.has_value()) {
+						this->m_value = std::forward<Opt>(rhs).get();
+					}
+					else {
+						this->m_value.~T();
+						this->m_has_value = false;
+					}
+				}
+
+				else if (rhs.has_value()) {
+					construct(std::forward<Opt>(rhs).get());
+				}
+			}
+
+			bool has_value() const {
+				return this->m_has_value;
+			}
+
+			SOL_TL_OPTIONAL_11_CONSTEXPR T& get() & {
+				return this->m_value;
+			}
+			SOL_TL_OPTIONAL_11_CONSTEXPR const T& get() const& {
+				return this->m_value;
+			}
+			SOL_TL_OPTIONAL_11_CONSTEXPR T&& get() && {
+				return std::move(this->m_value);
+			}
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+			constexpr const T&& get() const&& {
+				return std::move(this->m_value);
+			}
+#endif
+		};
+
+		// This class manages conditionally having a trivial copy constructor
+		// This specialization is for when T is trivially copy constructible
+		template <class T, bool = SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_CONSTRUCTIBLE(T)>
+		struct optional_copy_base : optional_operations_base<T> {
+			using optional_operations_base<T>::optional_operations_base;
+		};
+
+		// This specialization is for when T is not trivially copy constructible
+		template <class T>
+		struct optional_copy_base<T, false> : optional_operations_base<T> {
+			using base_t = optional_operations_base<T>;
+
+			using base_t::base_t;
+
+			optional_copy_base() = default;
+			optional_copy_base(const optional_copy_base& rhs) : base_t() {
+				if (rhs.has_value()) {
+					this->construct(rhs.get());
+				}
+				else {
+					this->m_has_value = false;
+				}
+			}
+
+			optional_copy_base(optional_copy_base&& rhs) = default;
+			optional_copy_base& operator=(const optional_copy_base& rhs) = default;
+			optional_copy_base& operator=(optional_copy_base&& rhs) = default;
+		};
+
+#ifndef SOL_TL_OPTIONAL_GCC49
+		template <class T, bool = std::is_trivially_move_constructible<T>::value>
+		struct optional_move_base : optional_copy_base<T> {
+			using optional_copy_base<T>::optional_copy_base;
+		};
+#else
+		template <class T, bool = false>
+		struct optional_move_base;
+#endif
+		template <class T>
+		struct optional_move_base<T, false> : optional_copy_base<T> {
+			using optional_copy_base<T>::optional_copy_base;
+
+			optional_move_base() = default;
+			optional_move_base(const optional_move_base& rhs) = default;
+
+			optional_move_base(optional_move_base&& rhs) noexcept(std::is_nothrow_move_constructible<T>::value) {
+				if (rhs.has_value()) {
+					this->construct(std::move(rhs.get()));
+				}
+				else {
+					this->m_has_value = false;
+				}
+			}
+			optional_move_base& operator=(const optional_move_base& rhs) = default;
+			optional_move_base& operator=(optional_move_base&& rhs) = default;
+		};
+
+		// This class manages conditionally having a trivial copy assignment operator
+		template <class T,
+		     bool = SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_ASSIGNABLE(T) && SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_CONSTRUCTIBLE(T)
+		          && SOL_TL_OPTIONAL_IS_TRIVIALLY_DESTRUCTIBLE(T)>
+		struct optional_copy_assign_base : optional_move_base<T> {
+			using optional_move_base<T>::optional_move_base;
+		};
+
+		template <class T>
+		struct optional_copy_assign_base<T, false> : optional_move_base<T> {
+			using optional_move_base<T>::optional_move_base;
+
+			optional_copy_assign_base() = default;
+			optional_copy_assign_base(const optional_copy_assign_base& rhs) = default;
+
+			optional_copy_assign_base(optional_copy_assign_base&& rhs) = default;
+			optional_copy_assign_base& operator=(const optional_copy_assign_base& rhs) {
+				this->assign(rhs);
+				return *this;
+			}
+			optional_copy_assign_base& operator=(optional_copy_assign_base&& rhs) = default;
+		};
+
+#ifndef SOL_TL_OPTIONAL_GCC49
+		template <class T,
+		     bool = std::is_trivially_destructible<T>::value&& std::is_trivially_move_constructible<T>::value&& std::is_trivially_move_assignable<T>::value>
+		struct optional_move_assign_base : optional_copy_assign_base<T> {
+			using optional_copy_assign_base<T>::optional_copy_assign_base;
+		};
+#else
+		template <class T, bool = false>
+		struct optional_move_assign_base;
+#endif
+
+		template <class T>
+		struct optional_move_assign_base<T, false> : optional_copy_assign_base<T> {
+			using optional_copy_assign_base<T>::optional_copy_assign_base;
+
+			optional_move_assign_base() = default;
+			optional_move_assign_base(const optional_move_assign_base& rhs) = default;
+
+			optional_move_assign_base(optional_move_assign_base&& rhs) = default;
+
+			optional_move_assign_base& operator=(const optional_move_assign_base& rhs) = default;
+
+			optional_move_assign_base& operator=(optional_move_assign_base&& rhs) noexcept(
+			     std::is_nothrow_move_constructible<T>::value&& std::is_nothrow_move_assignable<T>::value) {
+				this->assign(std::move(rhs));
+				return *this;
+			}
+		};
+
+		// optional_delete_ctor_base will conditionally delete copy and move
+		// constructors depending on whether T is copy/move constructible
+		template <class T, bool EnableCopy = std::is_copy_constructible<T>::value, bool EnableMove = std::is_move_constructible<T>::value>
+		struct optional_delete_ctor_base {
+			optional_delete_ctor_base() = default;
+			optional_delete_ctor_base(const optional_delete_ctor_base&) = default;
+			optional_delete_ctor_base(optional_delete_ctor_base&&) noexcept = default;
+			optional_delete_ctor_base& operator=(const optional_delete_ctor_base&) = default;
+			optional_delete_ctor_base& operator=(optional_delete_ctor_base&&) noexcept = default;
+		};
+
+		template <class T>
+		struct optional_delete_ctor_base<T, true, false> {
+			optional_delete_ctor_base() = default;
+			optional_delete_ctor_base(const optional_delete_ctor_base&) = default;
+			optional_delete_ctor_base(optional_delete_ctor_base&&) noexcept = delete;
+			optional_delete_ctor_base& operator=(const optional_delete_ctor_base&) = default;
+			optional_delete_ctor_base& operator=(optional_delete_ctor_base&&) noexcept = default;
+		};
+
+		template <class T>
+		struct optional_delete_ctor_base<T, false, true> {
+			optional_delete_ctor_base() = default;
+			optional_delete_ctor_base(const optional_delete_ctor_base&) = delete;
+			optional_delete_ctor_base(optional_delete_ctor_base&&) noexcept = default;
+			optional_delete_ctor_base& operator=(const optional_delete_ctor_base&) = default;
+			optional_delete_ctor_base& operator=(optional_delete_ctor_base&&) noexcept = default;
+		};
+
+		template <class T>
+		struct optional_delete_ctor_base<T, false, false> {
+			optional_delete_ctor_base() = default;
+			optional_delete_ctor_base(const optional_delete_ctor_base&) = delete;
+			optional_delete_ctor_base(optional_delete_ctor_base&&) noexcept = delete;
+			optional_delete_ctor_base& operator=(const optional_delete_ctor_base&) = default;
+			optional_delete_ctor_base& operator=(optional_delete_ctor_base&&) noexcept = default;
+		};
+
+		// optional_delete_assign_base will conditionally delete copy and move
+		// constructors depending on whether T is copy/move constructible + assignable
+		template <class T, bool EnableCopy = (std::is_copy_constructible<T>::value && std::is_copy_assignable<T>::value),
+		     bool EnableMove = (std::is_move_constructible<T>::value && std::is_move_assignable<T>::value)>
+		struct optional_delete_assign_base {
+			optional_delete_assign_base() = default;
+			optional_delete_assign_base(const optional_delete_assign_base&) = default;
+			optional_delete_assign_base(optional_delete_assign_base&&) noexcept = default;
+			optional_delete_assign_base& operator=(const optional_delete_assign_base&) = default;
+			optional_delete_assign_base& operator=(optional_delete_assign_base&&) noexcept = default;
+		};
+
+		template <class T>
+		struct optional_delete_assign_base<T, true, false> {
+			optional_delete_assign_base() = default;
+			optional_delete_assign_base(const optional_delete_assign_base&) = default;
+			optional_delete_assign_base(optional_delete_assign_base&&) noexcept = default;
+			optional_delete_assign_base& operator=(const optional_delete_assign_base&) = default;
+			optional_delete_assign_base& operator=(optional_delete_assign_base&&) noexcept = delete;
+		};
+
+		template <class T>
+		struct optional_delete_assign_base<T, false, true> {
+			optional_delete_assign_base() = default;
+			optional_delete_assign_base(const optional_delete_assign_base&) = default;
+			optional_delete_assign_base(optional_delete_assign_base&&) noexcept = default;
+			optional_delete_assign_base& operator=(const optional_delete_assign_base&) = delete;
+			optional_delete_assign_base& operator=(optional_delete_assign_base&&) noexcept = default;
+		};
+
+		template <class T>
+		struct optional_delete_assign_base<T, false, false> {
+			optional_delete_assign_base() = default;
+			optional_delete_assign_base(const optional_delete_assign_base&) = default;
+			optional_delete_assign_base(optional_delete_assign_base&&) noexcept = default;
+			optional_delete_assign_base& operator=(const optional_delete_assign_base&) = delete;
+			optional_delete_assign_base& operator=(optional_delete_assign_base&&) noexcept = delete;
+		};
+
+	} // namespace detail
+
+	/// \brief A tag type to represent an empty optional
+	using nullopt_t = std::nullopt_t;
+
+	/// \brief Represents an empty optional
+	/// \synopsis static constexpr nullopt_t nullopt;
+	///
+	/// *Examples*:
+	/// ```
+	/// sol::optional<int> a = sol::nullopt;
+	/// void foo (sol::optional<int>);
+	/// foo(sol::nullopt); //pass an empty optional
+	/// ```
+	using std::nullopt;
+
+	class bad_optional_access : public std::exception {
+	public:
+		bad_optional_access() = default;
+		const char* what() const noexcept {
+			return "Optional has no value";
+		}
+	};
+
+	/// An optional object is an object that contains the storage for another
+	/// object and manages the lifetime of this contained object, if any. The
+	/// contained object may be initialized after the optional object has been
+	/// initialized, and may be destroyed before the optional object has been
+	/// destroyed. The initialization state of the contained object is tracked by
+	/// the optional object.
+	template <class T>
+	class optional : private detail::optional_move_assign_base<T>,
+	                 private detail::optional_delete_ctor_base<T>,
+	                 private detail::optional_delete_assign_base<T> {
+		using base = detail::optional_move_assign_base<T>;
+
+		static_assert(!std::is_same<T, in_place_t>::value, "instantiation of optional with in_place_t is ill-formed");
+		static_assert(!std::is_same<detail::decay_t<T>, nullopt_t>::value, "instantiation of optional with nullopt_t is ill-formed");
+
+	public:
+#if defined(SOL_TL_OPTIONAL_CXX14) && !defined(SOL_TL_OPTIONAL_GCC49) && !defined(SOL_TL_OPTIONAL_GCC54) && !defined(SOL_TL_OPTIONAL_GCC55)
+		/// \group and_then
+		/// Carries out some operation which returns an optional on the stored
+		/// object if there is one. \requires `std::invoke(std::forward<F>(f),
+		/// value())` returns a `std::optional<U>` for some `U`. \returns Let `U` be
+		/// the result of `std::invoke(std::forward<F>(f), value())`. Returns a
+		/// `std::optional<U>`. The return value is empty if `*this` is empty,
+		/// otherwise the return value of `std::invoke(std::forward<F>(f), value())`
+		/// is returned.
+		/// \group and_then
+		/// \synopsis template <class F>\nconstexpr auto and_then(F &&f) &;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR auto and_then(F&& f) & {
+			using result = detail::invoke_result_t<F, T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+		/// \group and_then
+		/// \synopsis template <class F>\nconstexpr auto and_then(F &&f) &&;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR auto and_then(F&& f) && {
+			using result = detail::invoke_result_t<F, T&&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : result(nullopt);
+		}
+
+		/// \group and_then
+		/// \synopsis template <class F>\nconstexpr auto and_then(F &&f) const &;
+		template <class F>
+		constexpr auto and_then(F&& f) const& {
+			using result = detail::invoke_result_t<F, const T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group and_then
+		/// \synopsis template <class F>\nconstexpr auto and_then(F &&f) const &&;
+		template <class F>
+		constexpr auto and_then(F&& f) const&& {
+			using result = detail::invoke_result_t<F, const T&&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : result(nullopt);
+		}
+#endif
+#else
+		/// \group and_then
+		/// Carries out some operation which returns an optional on the stored
+		/// object if there is one. \requires `std::invoke(std::forward<F>(f),
+		/// value())` returns a `std::optional<U>` for some `U`.
+		/// \returns Let `U` be the result of `std::invoke(std::forward<F>(f),
+		/// value())`. Returns a `std::optional<U>`. The return value is empty if
+		/// `*this` is empty, otherwise the return value of
+		/// `std::invoke(std::forward<F>(f), value())` is returned.
+		/// \group and_then
+		/// \synopsis template <class F>\nconstexpr auto and_then(F &&f) &;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR detail::invoke_result_t<F, T&> and_then(F&& f) & {
+			using result = detail::invoke_result_t<F, T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+		/// \group and_then
+		/// \synopsis template <class F>\nconstexpr auto and_then(F &&f) &&;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR detail::invoke_result_t<F, T&&> and_then(F&& f) && {
+			using result = detail::invoke_result_t<F, T&&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : result(nullopt);
+		}
+
+		/// \group and_then
+		/// \synopsis template <class F>\nconstexpr auto and_then(F &&f) const &;
+		template <class F>
+		constexpr detail::invoke_result_t<F, const T&> and_then(F&& f) const& {
+			using result = detail::invoke_result_t<F, const T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group and_then
+		/// \synopsis template <class F>\nconstexpr auto and_then(F &&f) const &&;
+		template <class F>
+		constexpr detail::invoke_result_t<F, const T&&> and_then(F&& f) const&& {
+			using result = detail::invoke_result_t<F, const T&&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : result(nullopt);
+		}
+#endif
+#endif
+
+#if defined(SOL_TL_OPTIONAL_CXX14) && !defined(SOL_TL_OPTIONAL_GCC49) && !defined(SOL_TL_OPTIONAL_GCC54) && !defined(SOL_TL_OPTIONAL_GCC55)
+		/// \brief Carries out some operation on the stored object if there is one.
+		/// \returns Let `U` be the result of `std::invoke(std::forward<F>(f),
+		/// value())`. Returns a `std::optional<U>`. The return value is empty if
+		/// `*this` is empty, otherwise an `optional<U>` is constructed from the
+		/// return value of `std::invoke(std::forward<F>(f), value())` and is
+		/// returned.
+		///
+		/// \group map
+		/// \synopsis template <class F> constexpr auto map(F &&f) &;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR auto map(F&& f) & {
+			return optional_map_impl(*this, std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> constexpr auto map(F &&f) &&;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR auto map(F&& f) && {
+			return optional_map_impl(std::move(*this), std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> constexpr auto map(F &&f) const&;
+		template <class F>
+		constexpr auto map(F&& f) const& {
+			return optional_map_impl(*this, std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> constexpr auto map(F &&f) const&&;
+		template <class F>
+		constexpr auto map(F&& f) const&& {
+			return optional_map_impl(std::move(*this), std::forward<F>(f));
+		}
+#else
+		/// \brief Carries out some operation on the stored object if there is one.
+		/// \returns Let `U` be the result of `std::invoke(std::forward<F>(f),
+		/// value())`. Returns a `std::optional<U>`. The return value is empty if
+		/// `*this` is empty, otherwise an `optional<U>` is constructed from the
+		/// return value of `std::invoke(std::forward<F>(f), value())` and is
+		/// returned.
+		///
+		/// \group map
+		/// \synopsis template <class F> auto map(F &&f) &;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR decltype(optional_map_impl(std::declval<optional&>(), std::declval<F&&>())) map(F&& f) & {
+			return optional_map_impl(*this, std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> auto map(F &&f) &&;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR decltype(optional_map_impl(std::declval<optional&&>(), std::declval<F&&>())) map(F&& f) && {
+			return optional_map_impl(std::move(*this), std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> auto map(F &&f) const&;
+		template <class F>
+		constexpr decltype(optional_map_impl(std::declval<const optional&>(), std::declval<F&&>())) map(F&& f) const& {
+			return optional_map_impl(*this, std::forward<F>(f));
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group map
+		/// \synopsis template <class F> auto map(F &&f) const&&;
+		template <class F>
+		constexpr decltype(optional_map_impl(std::declval<const optional&&>(), std::declval<F&&>())) map(F&& f) const&& {
+			return optional_map_impl(std::move(*this), std::forward<F>(f));
+		}
+#endif
+#endif
+
+		/// \brief Calls `f` if the optional is empty
+		/// \requires `std::invoke_result_t<F>` must be void or convertible to
+		/// `optional<T>`.
+		/// \effects If `*this` has a value, returns `*this`.
+		/// Otherwise, if `f` returns `void`, calls `std::forward<F>(f)` and returns
+		/// `std::nullopt`. Otherwise, returns `std::forward<F>(f)()`.
+		///
+		/// \group or_else
+		/// \synopsis template <class F> optional<T> or_else (F &&f) &;
+		template <class F, detail::enable_if_ret_void<F>* = nullptr>
+		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) & {
+			if (has_value())
+				return *this;
+
+			std::forward<F>(f)();
+			return nullopt;
+		}
+
+		/// \exclude
+		template <class F, detail::disable_if_ret_void<F>* = nullptr>
+		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) & {
+			return has_value() ? *this : std::forward<F>(f)();
+		}
+
+		/// \group or_else
+		/// \synopsis template <class F> optional<T> or_else (F &&f) &&;
+		template <class F, detail::enable_if_ret_void<F>* = nullptr>
+		optional<T> or_else(F&& f) && {
+			if (has_value())
+				return std::move(*this);
+
+			std::forward<F>(f)();
+			return nullopt;
+		}
+
+		/// \exclude
+		template <class F, detail::disable_if_ret_void<F>* = nullptr>
+		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) && {
+			return has_value() ? std::move(*this) : std::forward<F>(f)();
+		}
+
+		/// \group or_else
+		/// \synopsis template <class F> optional<T> or_else (F &&f) const &;
+		template <class F, detail::enable_if_ret_void<F>* = nullptr>
+		optional<T> or_else(F&& f) const& {
+			if (has_value())
+				return *this;
+
+			std::forward<F>(f)();
+			return nullopt;
+		}
+
+		/// \exclude
+		template <class F, detail::disable_if_ret_void<F>* = nullptr>
+		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) const& {
+			return has_value() ? *this : std::forward<F>(f)();
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \exclude
+		template <class F, detail::enable_if_ret_void<F>* = nullptr>
+		optional<T> or_else(F&& f) const&& {
+			if (has_value())
+				return std::move(*this);
+
+			std::forward<F>(f)();
+			return nullopt;
+		}
+
+		/// \exclude
+		template <class F, detail::disable_if_ret_void<F>* = nullptr>
+		optional<T> or_else(F&& f) const&& {
+			return has_value() ? std::move(*this) : std::forward<F>(f)();
+		}
+#endif
+
+		/// \brief Maps the stored value with `f` if there is one, otherwise returns
+		/// `u`.
+		///
+		/// \details If there is a value stored, then `f` is called with `**this`
+		/// and the value is returned. Otherwise `u` is returned.
+		///
+		/// \group map_or
+		template <class F, class U>
+		U map_or(F&& f, U&& u) & {
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u);
+		}
+
+		/// \group map_or
+		template <class F, class U>
+		U map_or(F&& f, U&& u) && {
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u);
+		}
+
+		/// \group map_or
+		template <class F, class U>
+		U map_or(F&& f, U&& u) const& {
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group map_or
+		template <class F, class U>
+		U map_or(F&& f, U&& u) const&& {
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u);
+		}
+#endif
+
+		/// \brief Maps the stored value with `f` if there is one, otherwise calls
+		/// `u` and returns the result.
+		///
+		/// \details If there is a value stored, then `f` is
+		/// called with `**this` and the value is returned. Otherwise
+		/// `std::forward<U>(u)()` is returned.
+		///
+		/// \group map_or_else
+		/// \synopsis template <class F, class U>\nauto map_or_else(F &&f, U &&u) &;
+		template <class F, class U>
+		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) & {
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u)();
+		}
+
+		/// \group map_or_else
+		/// \synopsis template <class F, class U>\nauto map_or_else(F &&f, U &&u)
+		/// &&;
+		template <class F, class U>
+		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) && {
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u)();
+		}
+
+		/// \group map_or_else
+		/// \synopsis template <class F, class U>\nauto map_or_else(F &&f, U &&u)
+		/// const &;
+		template <class F, class U>
+		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) const& {
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u)();
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group map_or_else
+		/// \synopsis template <class F, class U>\nauto map_or_else(F &&f, U &&u)
+		/// const &&;
+		template <class F, class U>
+		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) const&& {
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u)();
+		}
+#endif
+
+		/// \returns `u` if `*this` has a value, otherwise an empty optional.
+		template <class U>
+		constexpr optional<typename std::decay<U>::type> conjunction(U&& u) const {
+			using result = optional<detail::decay_t<U>>;
+			return has_value() ? result { u } : result { nullopt };
+		}
+
+		/// \returns `rhs` if `*this` is empty, otherwise the current value.
+		/// \group disjunction
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(const optional& rhs) & {
+			return has_value() ? *this : rhs;
+		}
+
+		/// \group disjunction
+		constexpr optional disjunction(const optional& rhs) const& {
+			return has_value() ? *this : rhs;
+		}
+
+		/// \group disjunction
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(const optional& rhs) && {
+			return has_value() ? std::move(*this) : rhs;
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group disjunction
+		constexpr optional disjunction(const optional& rhs) const&& {
+			return has_value() ? std::move(*this) : rhs;
+		}
+#endif
+
+		/// \group disjunction
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(optional&& rhs) & {
+			return has_value() ? *this : std::move(rhs);
+		}
+
+		/// \group disjunction
+		constexpr optional disjunction(optional&& rhs) const& {
+			return has_value() ? *this : std::move(rhs);
+		}
+
+		/// \group disjunction
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(optional&& rhs) && {
+			return has_value() ? std::move(*this) : std::move(rhs);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group disjunction
+		constexpr optional disjunction(optional&& rhs) const&& {
+			return has_value() ? std::move(*this) : std::move(rhs);
+		}
+#endif
+
+		/// Takes the value out of the optional, leaving it empty
+		/// \group take
+		optional take() & {
+			optional ret = *this;
+			reset();
+			return ret;
+		}
+
+		/// \group take
+		optional take() const& {
+			optional ret = *this;
+			reset();
+			return ret;
+		}
+
+		/// \group take
+		optional take() && {
+			optional ret = std::move(*this);
+			reset();
+			return ret;
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group take
+		optional take() const&& {
+			optional ret = std::move(*this);
+			reset();
+			return ret;
+		}
+#endif
+
+		using value_type = T;
+
+		/// Constructs an optional that does not contain a value.
+		/// \group ctor_empty
+		constexpr optional() noexcept = default;
+
+		/// \group ctor_empty
+		constexpr optional(nullopt_t) noexcept {
+		}
+
+		/// Copy constructor
+		///
+		/// If `rhs` contains a value, the stored value is direct-initialized with
+		/// it. Otherwise, the constructed optional is empty.
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional(const optional& rhs) = default;
+
+		/// Move constructor
+		///
+		/// If `rhs` contains a value, the stored value is direct-initialized with
+		/// it. Otherwise, the constructed optional is empty.
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional(optional&& rhs) = default;
+
+		/// Constructs the stored value in-place using the given arguments.
+		/// \group in_place
+		/// \synopsis template <class... Args> constexpr explicit optional(in_place_t, Args&&... args);
+		template <class... Args>
+		constexpr explicit optional(detail::enable_if_t<std::is_constructible<T, Args...>::value, in_place_t>, Args&&... args)
+		: base(in_place, std::forward<Args>(args)...) {
+		}
+
+		/// \group in_place
+		/// \synopsis template <class U, class... Args>\nconstexpr explicit optional(in_place_t, std::initializer_list<U>&, Args&&... args);
+		template <class U, class... Args>
+		SOL_TL_OPTIONAL_11_CONSTEXPR explicit optional(detail::enable_if_t<std::is_constructible<T, std::initializer_list<U>&, Args&&...>::value, in_place_t>,
+		     std::initializer_list<U> il, Args&&... args) {
+			this->construct(il, std::forward<Args>(args)...);
+		}
+
+#if 0 // SOL_MODIFICATION
+      /// Constructs the stored value with `u`.
+      /// \synopsis template <class U=T> constexpr optional(U &&u);
+		template <class U = T, detail::enable_if_t<std::is_convertible<U&&, T>::value>* = nullptr, detail::enable_forward_value<T, U>* = nullptr>
+		constexpr optional(U&& u) : base(in_place, std::forward<U>(u)) {
+		}
+
+		/// \exclude
+		template <class U = T, detail::enable_if_t<!std::is_convertible<U&&, T>::value>* = nullptr, detail::enable_forward_value<T, U>* = nullptr>
+		constexpr explicit optional(U&& u) : base(in_place, std::forward<U>(u)) {
+		}
+#else
+		/// Constructs the stored value with `u`.
+		/// \synopsis template <class U=T> constexpr optional(U &&u);
+		constexpr optional(T&& u) : base(in_place, std::move(u)) {
+		}
+
+		/// \exclude
+		constexpr optional(const T& u) : base(in_place, u) {
+		}
+#endif // sol3 modification
+
+		/// Converting copy constructor.
+		/// \synopsis template <class U> optional(const optional<U> &rhs);
+		template <class U, detail::enable_from_other<T, U, const U&>* = nullptr, detail::enable_if_t<std::is_convertible<const U&, T>::value>* = nullptr>
+		optional(const optional<U>& rhs) {
+			if (rhs.has_value()) {
+				this->construct(*rhs);
+			}
+		}
+
+		/// \exclude
+		template <class U, detail::enable_from_other<T, U, const U&>* = nullptr, detail::enable_if_t<!std::is_convertible<const U&, T>::value>* = nullptr>
+		explicit optional(const optional<U>& rhs) {
+			if (rhs.has_value()) {
+				this->construct(*rhs);
+			}
+		}
+
+		/// Converting move constructor.
+		/// \synopsis template <class U> optional(optional<U> &&rhs);
+		template <class U, detail::enable_from_other<T, U, U&&>* = nullptr, detail::enable_if_t<std::is_convertible<U&&, T>::value>* = nullptr>
+		optional(optional<U>&& rhs) {
+			if (rhs.has_value()) {
+				this->construct(std::move(*rhs));
+			}
+		}
+
+		/// \exclude
+		template <class U, detail::enable_from_other<T, U, U&&>* = nullptr, detail::enable_if_t<!std::is_convertible<U&&, T>::value>* = nullptr>
+		explicit optional(optional<U>&& rhs) {
+			this->construct(std::move(*rhs));
+		}
+
+		/// Destroys the stored value if there is one.
+		~optional() = default;
+
+		/// Assignment to empty.
+		///
+		/// Destroys the current value if there is one.
+		optional& operator=(nullopt_t) noexcept {
+			if (has_value()) {
+				this->m_value.~T();
+				this->m_has_value = false;
+			}
+
+			return *this;
+		}
+
+		/// Copy assignment.
+		///
+		/// Copies the value from `rhs` if there is one. Otherwise resets the stored
+		/// value in `*this`.
+		optional& operator=(const optional& rhs) = default;
+
+		/// Move assignment.
+		///
+		/// Moves the value from `rhs` if there is one. Otherwise resets the stored
+		/// value in `*this`.
+		optional& operator=(optional&& rhs) = default;
+
+		/// Assigns the stored value from `u`, destroying the old value if there was
+		/// one.
+		/// \synopsis optional &operator=(U &&u);
+		template <class U = T, detail::enable_assign_forward<T, U>* = nullptr>
+		optional& operator=(U&& u) {
+			if (has_value()) {
+				this->m_value = std::forward<U>(u);
+			}
+			else {
+				this->construct(std::forward<U>(u));
+			}
+
+			return *this;
+		}
+
+		/// Converting copy assignment operator.
+		///
+		/// Copies the value from `rhs` if there is one. Otherwise resets the stored
+		/// value in `*this`.
+		/// \synopsis optional &operator=(const optional<U> & rhs);
+		template <class U, detail::enable_assign_from_other<T, U, const U&>* = nullptr>
+		optional& operator=(const optional<U>& rhs) {
+			if (has_value()) {
+				if (rhs.has_value()) {
+					this->m_value = *rhs;
+				}
+				else {
+					this->hard_reset();
+				}
+			}
+
+			if (rhs.has_value()) {
+				this->construct(*rhs);
+			}
+
+			return *this;
+		}
+
+		// TODO check exception guarantee
+		/// Converting move assignment operator.
+		///
+		/// Moves the value from `rhs` if there is one. Otherwise resets the stored
+		/// value in `*this`.
+		/// \synopsis optional &operator=(optional<U> && rhs);
+		template <class U, detail::enable_assign_from_other<T, U, U>* = nullptr>
+		optional& operator=(optional<U>&& rhs) {
+			if (has_value()) {
+				if (rhs.has_value()) {
+					this->m_value = std::move(*rhs);
+				}
+				else {
+					this->hard_reset();
+				}
+			}
+
+			if (rhs.has_value()) {
+				this->construct(std::move(*rhs));
+			}
+
+			return *this;
+		}
+
+		/// Constructs the value in-place, destroying the current one if there is
+		/// one.
+		/// \group emplace
+		template <class... Args>
+		T& emplace(Args&&... args) {
+			static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args");
+
+			*this = nullopt;
+			this->construct(std::forward<Args>(args)...);
+			return value();
+		}
+
+		/// \group emplace
+		/// \synopsis template <class U, class... Args>\nT& emplace(std::initializer_list<U> il, Args &&... args);
+		template <class U, class... Args>
+		detail::enable_if_t<std::is_constructible<T, std::initializer_list<U>&, Args&&...>::value, T&> emplace(std::initializer_list<U> il, Args&&... args) {
+			*this = nullopt;
+			this->construct(il, std::forward<Args>(args)...);
+			return value();
+		}
+
+		/// Swaps this optional with the other.
+		///
+		/// If neither optionals have a value, nothing happens.
+		/// If both have a value, the values are swapped.
+		/// If one has a value, it is moved to the other and the movee is left
+		/// valueless.
+		void swap(optional& rhs) noexcept(std::is_nothrow_move_constructible<T>::value&& detail::is_nothrow_swappable<T>::value) {
+			if (has_value()) {
+				if (rhs.has_value()) {
+					using std::swap;
+					swap(**this, *rhs);
+				}
+				else {
+					new (std::addressof(rhs.m_value)) T(std::move(this->m_value));
+					this->m_value.T::~T();
+				}
+			}
+			else if (rhs.has_value()) {
+				new (std::addressof(this->m_value)) T(std::move(rhs.m_value));
+				rhs.m_value.T::~T();
+			}
+		}
+
+		/// \returns a pointer to the stored value
+		/// \requires a value is stored
+		/// \group pointer
+		/// \synopsis constexpr const T *operator->() const;
+		constexpr const T* operator->() const {
+			return std::addressof(this->m_value);
+		}
+
+		/// \group pointer
+		/// \synopsis constexpr T *operator->();
+		SOL_TL_OPTIONAL_11_CONSTEXPR T* operator->() {
+			return std::addressof(this->m_value);
+		}
+
+		/// \returns the stored value
+		/// \requires a value is stored
+		/// \group deref
+		/// \synopsis constexpr T &operator*();
+		SOL_TL_OPTIONAL_11_CONSTEXPR T& operator*() & {
+			return this->m_value;
+		}
+
+		/// \group deref
+		/// \synopsis constexpr const T &operator*() const;
+		constexpr const T& operator*() const& {
+			return this->m_value;
+		}
+
+		/// \exclude
+		SOL_TL_OPTIONAL_11_CONSTEXPR T&& operator*() && {
+			return std::move(this->m_value);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \exclude
+		constexpr const T&& operator*() const&& {
+			return std::move(this->m_value);
+		}
+#endif
+
+		/// \returns whether or not the optional has a value
+		/// \group has_value
+		constexpr bool has_value() const noexcept {
+			return this->m_has_value;
+		}
+
+		/// \group has_value
+		constexpr explicit operator bool() const noexcept {
+			return this->m_has_value;
+		}
+
+		/// \returns the contained value if there is one, otherwise throws
+		/// [bad_optional_access]
+		/// \group value
+		/// \synopsis constexpr T &value();
+		SOL_TL_OPTIONAL_11_CONSTEXPR T& value() & {
+			if (has_value())
+				return this->m_value;
+#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
+			std::abort();
+#else
+			throw bad_optional_access();
+#endif // No exceptions allowed
+		}
+		/// \group value
+		/// \synopsis constexpr const T &value() const;
+		SOL_TL_OPTIONAL_11_CONSTEXPR const T& value() const& {
+			if (has_value())
+				return this->m_value;
+#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
+			std::abort();
+#else
+			throw bad_optional_access();
+#endif // No exceptions allowed
+		}
+		/// \exclude
+		SOL_TL_OPTIONAL_11_CONSTEXPR T&& value() && {
+			if (has_value())
+				return std::move(this->m_value);
+#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
+			std::abort();
+#else
+			throw bad_optional_access();
+#endif // No exceptions allowed
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \exclude
+		SOL_TL_OPTIONAL_11_CONSTEXPR const T&& value() const&& {
+			if (has_value())
+				return std::move(this->m_value);
+#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
+			std::abort();
+#else
+			throw bad_optional_access();
+#endif // No exceptions allowed
+		}
+#endif
+
+		/// \returns the stored value if there is one, otherwise returns `u`
+		/// \group value_or
+		template <class U>
+		constexpr T value_or(U&& u) const& {
+			static_assert(std::is_copy_constructible<T>::value && std::is_convertible<U&&, T>::value, "T must be copy constructible and convertible from U");
+			return has_value() ? **this : static_cast<T>(std::forward<U>(u));
+		}
+
+		/// \group value_or
+		template <class U>
+		SOL_TL_OPTIONAL_11_CONSTEXPR T value_or(U&& u) && {
+			static_assert(std::is_move_constructible<T>::value && std::is_convertible<U&&, T>::value, "T must be move constructible and convertible from U");
+			return has_value() ? **this : static_cast<T>(std::forward<U>(u));
+		}
+
+		/// Destroys the stored value if one exists, making the optional empty
+		void reset() noexcept {
+			if (has_value()) {
+				this->m_value.~T();
+				this->m_has_value = false;
+			}
+		}
+	}; // namespace sol
+
+	/// \group relop
+	/// \brief Compares two optional objects
+	/// \details If both optionals contain a value, they are compared with `T`s
+	/// relational operators. Otherwise `lhs` and `rhs` are equal only if they are
+	/// both empty, and `lhs` is less than `rhs` only if `rhs` is empty and `lhs`
+	/// is not.
+	template <class T, class U>
+	inline constexpr bool operator==(const optional<T>& lhs, const optional<U>& rhs) {
+		return lhs.has_value() == rhs.has_value() && (!lhs.has_value() || *lhs == *rhs);
+	}
+	/// \group relop
+	template <class T, class U>
+	inline constexpr bool operator!=(const optional<T>& lhs, const optional<U>& rhs) {
+		return lhs.has_value() != rhs.has_value() || (lhs.has_value() && *lhs != *rhs);
+	}
+	/// \group relop
+	template <class T, class U>
+	inline constexpr bool operator<(const optional<T>& lhs, const optional<U>& rhs) {
+		return rhs.has_value() && (!lhs.has_value() || *lhs < *rhs);
+	}
+	/// \group relop
+	template <class T, class U>
+	inline constexpr bool operator>(const optional<T>& lhs, const optional<U>& rhs) {
+		return lhs.has_value() && (!rhs.has_value() || *lhs > *rhs);
+	}
+	/// \group relop
+	template <class T, class U>
+	inline constexpr bool operator<=(const optional<T>& lhs, const optional<U>& rhs) {
+		return !lhs.has_value() || (rhs.has_value() && *lhs <= *rhs);
+	}
+	/// \group relop
+	template <class T, class U>
+	inline constexpr bool operator>=(const optional<T>& lhs, const optional<U>& rhs) {
+		return !rhs.has_value() || (lhs.has_value() && *lhs >= *rhs);
+	}
+
+	/// \group relop_nullopt
+	/// \brief Compares an optional to a `nullopt`
+	/// \details Equivalent to comparing the optional to an empty optional
+	template <class T>
+	inline constexpr bool operator==(const optional<T>& lhs, nullopt_t) noexcept {
+		return !lhs.has_value();
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator==(nullopt_t, const optional<T>& rhs) noexcept {
+		return !rhs.has_value();
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator!=(const optional<T>& lhs, nullopt_t) noexcept {
+		return lhs.has_value();
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator!=(nullopt_t, const optional<T>& rhs) noexcept {
+		return rhs.has_value();
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator<(const optional<T>&, nullopt_t) noexcept {
+		return false;
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator<(nullopt_t, const optional<T>& rhs) noexcept {
+		return rhs.has_value();
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator<=(const optional<T>& lhs, nullopt_t) noexcept {
+		return !lhs.has_value();
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator<=(nullopt_t, const optional<T>&) noexcept {
+		return true;
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator>(const optional<T>& lhs, nullopt_t) noexcept {
+		return lhs.has_value();
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator>(nullopt_t, const optional<T>&) noexcept {
+		return false;
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator>=(const optional<T>&, nullopt_t) noexcept {
+		return true;
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator>=(nullopt_t, const optional<T>& rhs) noexcept {
+		return !rhs.has_value();
+	}
+
+	/// \group relop_t
+	/// \brief Compares the optional with a value.
+	/// \details If the optional has a value, it is compared with the other value
+	/// using `T`s relational operators. Otherwise, the optional is considered
+	/// less than the value.
+	template <class T, class U>
+	inline constexpr bool operator==(const optional<T>& lhs, const U& rhs) {
+		return lhs.has_value() ? *lhs == rhs : false;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator==(const U& lhs, const optional<T>& rhs) {
+		return rhs.has_value() ? lhs == *rhs : false;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator!=(const optional<T>& lhs, const U& rhs) {
+		return lhs.has_value() ? *lhs != rhs : true;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator!=(const U& lhs, const optional<T>& rhs) {
+		return rhs.has_value() ? lhs != *rhs : true;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator<(const optional<T>& lhs, const U& rhs) {
+		return lhs.has_value() ? *lhs < rhs : true;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator<(const U& lhs, const optional<T>& rhs) {
+		return rhs.has_value() ? lhs < *rhs : false;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator<=(const optional<T>& lhs, const U& rhs) {
+		return lhs.has_value() ? *lhs <= rhs : true;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator<=(const U& lhs, const optional<T>& rhs) {
+		return rhs.has_value() ? lhs <= *rhs : false;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator>(const optional<T>& lhs, const U& rhs) {
+		return lhs.has_value() ? *lhs > rhs : false;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator>(const U& lhs, const optional<T>& rhs) {
+		return rhs.has_value() ? lhs > *rhs : true;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator>=(const optional<T>& lhs, const U& rhs) {
+		return lhs.has_value() ? *lhs >= rhs : false;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator>=(const U& lhs, const optional<T>& rhs) {
+		return rhs.has_value() ? lhs >= *rhs : true;
+	}
+
+	/// \synopsis template <class T>\nvoid swap(optional<T> &lhs, optional<T> &rhs);
+	template <class T, detail::enable_if_t<std::is_move_constructible<T>::value>* = nullptr, detail::enable_if_t<detail::is_swappable<T>::value>* = nullptr>
+	void swap(optional<T>& lhs, optional<T>& rhs) noexcept(noexcept(lhs.swap(rhs))) {
+		return lhs.swap(rhs);
+	}
+
+	namespace detail {
+		struct i_am_secret {};
+	} // namespace detail
+
+	template <class T = detail::i_am_secret, class U, class Ret = detail::conditional_t<std::is_same<T, detail::i_am_secret>::value, detail::decay_t<U>, T>>
+	inline constexpr optional<Ret> make_optional(U&& v) {
+		return optional<Ret>(std::forward<U>(v));
+	}
+
+	template <class T, class... Args>
+	inline constexpr optional<T> make_optional(Args&&... args) {
+		return optional<T>(in_place, std::forward<Args>(args)...);
+	}
+	template <class T, class U, class... Args>
+	inline constexpr optional<T> make_optional(std::initializer_list<U> il, Args&&... args) {
+		return optional<T>(in_place, il, std::forward<Args>(args)...);
+	}
+
+#if __cplusplus >= 201703L
+	template <class T>
+	optional(T)->optional<T>;
+#endif
+
+	/// \exclude
+	namespace detail {
+#ifdef SOL_TL_OPTIONAL_CXX14
+		template <class Opt, class F, class Ret = decltype(detail::invoke(std::declval<F>(), *std::declval<Opt>())),
+		     detail::enable_if_t<!std::is_void<Ret>::value>* = nullptr>
+		constexpr auto optional_map_impl(Opt&& opt, F&& f) {
+			return opt.has_value() ? detail::invoke(std::forward<F>(f), *std::forward<Opt>(opt)) : optional<Ret>(nullopt);
+		}
+
+		template <class Opt, class F, class Ret = decltype(detail::invoke(std::declval<F>(), *std::declval<Opt>())),
+		     detail::enable_if_t<std::is_void<Ret>::value>* = nullptr>
+		auto optional_map_impl(Opt&& opt, F&& f) {
+			if (opt.has_value()) {
+				detail::invoke(std::forward<F>(f), *std::forward<Opt>(opt));
+				return make_optional(monostate {});
+			}
+
+			return optional<monostate>(nullopt);
+		}
+#else
+		template <class Opt, class F, class Ret = decltype(detail::invoke(std::declval<F>(), *std::declval<Opt>())),
+		     detail::enable_if_t<!std::is_void<Ret>::value>* = nullptr>
+
+		constexpr auto optional_map_impl(Opt&& opt, F&& f) -> optional<Ret> {
+			return opt.has_value() ? detail::invoke(std::forward<F>(f), *std::forward<Opt>(opt)) : optional<Ret>(nullopt);
+		}
+
+		template <class Opt, class F, class Ret = decltype(detail::invoke(std::declval<F>(), *std::declval<Opt>())),
+		     detail::enable_if_t<std::is_void<Ret>::value>* = nullptr>
+
+		auto optional_map_impl(Opt&& opt, F&& f) -> optional<monostate> {
+			if (opt.has_value()) {
+				detail::invoke(std::forward<F>(f), *std::forward<Opt>(opt));
+				return monostate {};
+			}
+
+			return nullopt;
+		}
+#endif
+	} // namespace detail
+
+	/// Specialization for when `T` is a reference. `optional<T&>` acts similarly
+	/// to a `T*`, but provides more operations and shows intent more clearly.
+	///
+	/// *Examples*:
+	///
+	/// ```
+	/// int i = 42;
+	/// sol::optional<int&> o = i;
+	/// *o == 42; //true
+	/// i = 12;
+	/// *o = 12; //true
+	/// &*o == &i; //true
+	/// ```
+	///
+	/// Assignment has rebind semantics rather than assign-through semantics:
+	///
+	/// ```
+	/// int j = 8;
+	/// o = j;
+	///
+	/// &*o == &j; //true
+	/// ```
+	template <class T>
+	class optional<T&> {
+	public:
+#if defined(SOL_TL_OPTIONAL_CXX14) && !defined(SOL_TL_OPTIONAL_GCC49) && !defined(SOL_TL_OPTIONAL_GCC54) && !defined(SOL_TL_OPTIONAL_GCC55)
+		/// \group and_then
+		/// Carries out some operation which returns an optional on the stored
+		/// object if there is one. \requires `std::invoke(std::forward<F>(f),
+		/// value())` returns a `std::optional<U>` for some `U`. \returns Let `U` be
+		/// the result of `std::invoke(std::forward<F>(f), value())`. Returns a
+		/// `std::optional<U>`. The return value is empty if `*this` is empty,
+		/// otherwise the return value of `std::invoke(std::forward<F>(f), value())`
+		/// is returned.
+		/// \group and_then
+		/// \synopsis template <class F>\nconstexpr auto and_then(F &&f) &;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR auto and_then(F&& f) & {
+			using result = detail::invoke_result_t<F, T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+		/// \group and_then
+		/// \synopsis template <class F>\nconstexpr auto and_then(F &&f) &&;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR auto and_then(F&& f) && {
+			using result = detail::invoke_result_t<F, T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+		/// \group and_then
+		/// \synopsis template <class F>\nconstexpr auto and_then(F &&f) const &;
+		template <class F>
+		constexpr auto and_then(F&& f) const& {
+			using result = detail::invoke_result_t<F, const T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group and_then
+		/// \synopsis template <class F>\nconstexpr auto and_then(F &&f) const &&;
+		template <class F>
+		constexpr auto and_then(F&& f) const&& {
+			using result = detail::invoke_result_t<F, const T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+#endif
+#else
+		/// \group and_then
+		/// Carries out some operation which returns an optional on the stored
+		/// object if there is one. \requires `std::invoke(std::forward<F>(f),
+		/// value())` returns a `std::optional<U>` for some `U`. \returns Let `U` be
+		/// the result of `std::invoke(std::forward<F>(f), value())`. Returns a
+		/// `std::optional<U>`. The return value is empty if `*this` is empty,
+		/// otherwise the return value of `std::invoke(std::forward<F>(f), value())`
+		/// is returned.
+		/// \group and_then
+		/// \synopsis template <class F>\nconstexpr auto and_then(F &&f) &;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR detail::invoke_result_t<F, T&> and_then(F&& f) & {
+			using result = detail::invoke_result_t<F, T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+		/// \group and_then
+		/// \synopsis template <class F>\nconstexpr auto and_then(F &&f) &&;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR detail::invoke_result_t<F, T&> and_then(F&& f) && {
+			using result = detail::invoke_result_t<F, T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+		/// \group and_then
+		/// \synopsis template <class F>\nconstexpr auto and_then(F &&f) const &;
+		template <class F>
+		constexpr detail::invoke_result_t<F, const T&> and_then(F&& f) const& {
+			using result = detail::invoke_result_t<F, const T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group and_then
+		/// \synopsis template <class F>\nconstexpr auto and_then(F &&f) const &&;
+		template <class F>
+		constexpr detail::invoke_result_t<F, const T&> and_then(F&& f) const&& {
+			using result = detail::invoke_result_t<F, const T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+#endif
+#endif
+
+#if defined(SOL_TL_OPTIONAL_CXX14) && !defined(SOL_TL_OPTIONAL_GCC49) && !defined(SOL_TL_OPTIONAL_GCC54) && !defined(SOL_TL_OPTIONAL_GCC55)
+		/// \brief Carries out some operation on the stored object if there is one.
+		/// \returns Let `U` be the result of `std::invoke(std::forward<F>(f),
+		/// value())`. Returns a `std::optional<U>`. The return value is empty if
+		/// `*this` is empty, otherwise an `optional<U>` is constructed from the
+		/// return value of `std::invoke(std::forward<F>(f), value())` and is
+		/// returned.
+		///
+		/// \group map
+		/// \synopsis template <class F> constexpr auto map(F &&f) &;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR auto map(F&& f) & {
+			return detail::optional_map_impl(*this, std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> constexpr auto map(F &&f) &&;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR auto map(F&& f) && {
+			return detail::optional_map_impl(std::move(*this), std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> constexpr auto map(F &&f) const&;
+		template <class F>
+		constexpr auto map(F&& f) const& {
+			return detail::optional_map_impl(*this, std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> constexpr auto map(F &&f) const&&;
+		template <class F>
+		constexpr auto map(F&& f) const&& {
+			return detail::optional_map_impl(std::move(*this), std::forward<F>(f));
+		}
+#else
+		/// \brief Carries out some operation on the stored object if there is one.
+		/// \returns Let `U` be the result of `std::invoke(std::forward<F>(f),
+		/// value())`. Returns a `std::optional<U>`. The return value is empty if
+		/// `*this` is empty, otherwise an `optional<U>` is constructed from the
+		/// return value of `std::invoke(std::forward<F>(f), value())` and is
+		/// returned.
+		///
+		/// \group map
+		/// \synopsis template <class F> auto map(F &&f) &;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR decltype(detail::optional_map_impl(std::declval<optional&>(), std::declval<F&&>())) map(F&& f) & {
+			return detail::optional_map_impl(*this, std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> auto map(F &&f) &&;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR decltype(detail::optional_map_impl(std::declval<optional&&>(), std::declval<F&&>())) map(F&& f) && {
+			return detail::optional_map_impl(std::move(*this), std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> auto map(F &&f) const&;
+		template <class F>
+		constexpr decltype(detail::optional_map_impl(std::declval<const optional&>(), std::declval<F&&>())) map(F&& f) const& {
+			return detail::optional_map_impl(*this, std::forward<F>(f));
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group map
+		/// \synopsis template <class F> auto map(F &&f) const&&;
+		template <class F>
+		constexpr decltype(detail::optional_map_impl(std::declval<const optional&&>(), std::declval<F&&>())) map(F&& f) const&& {
+			return detail::optional_map_impl(std::move(*this), std::forward<F>(f));
+		}
+#endif
+#endif
+
+		/// \brief Calls `f` if the optional is empty
+		/// \requires `std::invoke_result_t<F>` must be void or convertible to
+		/// `optional<T>`. \effects If `*this` has a value, returns `*this`.
+		/// Otherwise, if `f` returns `void`, calls `std::forward<F>(f)` and returns
+		/// `std::nullopt`. Otherwise, returns `std::forward<F>(f)()`.
+		///
+		/// \group or_else
+		/// \synopsis template <class F> optional<T> or_else (F &&f) &;
+		template <class F, detail::enable_if_ret_void<F>* = nullptr>
+		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) & {
+			if (has_value())
+				return *this;
+
+			std::forward<F>(f)();
+			return nullopt;
+		}
+
+		/// \exclude
+		template <class F, detail::disable_if_ret_void<F>* = nullptr>
+		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) & {
+			return has_value() ? *this : std::forward<F>(f)();
+		}
+
+		/// \group or_else
+		/// \synopsis template <class F> optional<T> or_else (F &&f) &&;
+		template <class F, detail::enable_if_ret_void<F>* = nullptr>
+		optional<T> or_else(F&& f) && {
+			if (has_value())
+				return std::move(*this);
+
+			std::forward<F>(f)();
+			return nullopt;
+		}
+
+		/// \exclude
+		template <class F, detail::disable_if_ret_void<F>* = nullptr>
+		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) && {
+			return has_value() ? std::move(*this) : std::forward<F>(f)();
+		}
+
+		/// \group or_else
+		/// \synopsis template <class F> optional<T> or_else (F &&f) const &;
+		template <class F, detail::enable_if_ret_void<F>* = nullptr>
+		optional<T> or_else(F&& f) const& {
+			if (has_value())
+				return *this;
+
+			std::forward<F>(f)();
+			return nullopt;
+		}
+
+		/// \exclude
+		template <class F, detail::disable_if_ret_void<F>* = nullptr>
+		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) const& {
+			return has_value() ? *this : std::forward<F>(f)();
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \exclude
+		template <class F, detail::enable_if_ret_void<F>* = nullptr>
+		optional<T> or_else(F&& f) const&& {
+			if (has_value())
+				return std::move(*this);
+
+			std::forward<F>(f)();
+			return nullopt;
+		}
+
+		/// \exclude
+		template <class F, detail::disable_if_ret_void<F>* = nullptr>
+		optional<T> or_else(F&& f) const&& {
+			return has_value() ? std::move(*this) : std::forward<F>(f)();
+		}
+#endif
+
+		/// \brief Maps the stored value with `f` if there is one, otherwise returns
+		/// `u`.
+		///
+		/// \details If there is a value stored, then `f` is called with `**this`
+		/// and the value is returned. Otherwise `u` is returned.
+		///
+		/// \group map_or
+		template <class F, class U>
+		U map_or(F&& f, U&& u) & {
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u);
+		}
+
+		/// \group map_or
+		template <class F, class U>
+		U map_or(F&& f, U&& u) && {
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u);
+		}
+
+		/// \group map_or
+		template <class F, class U>
+		U map_or(F&& f, U&& u) const& {
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group map_or
+		template <class F, class U>
+		U map_or(F&& f, U&& u) const&& {
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u);
+		}
+#endif
+
+		/// \brief Maps the stored value with `f` if there is one, otherwise calls
+		/// `u` and returns the result.
+		///
+		/// \details If there is a value stored, then `f` is
+		/// called with `**this` and the value is returned. Otherwise
+		/// `std::forward<U>(u)()` is returned.
+		///
+		/// \group map_or_else
+		/// \synopsis template <class F, class U>\nauto map_or_else(F &&f, U &&u) &;
+		template <class F, class U>
+		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) & {
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u)();
+		}
+
+		/// \group map_or_else
+		/// \synopsis template <class F, class U>\nauto map_or_else(F &&f, U &&u)
+		/// &&;
+		template <class F, class U>
+		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) && {
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u)();
+		}
+
+		/// \group map_or_else
+		/// \synopsis template <class F, class U>\nauto map_or_else(F &&f, U &&u)
+		/// const &;
+		template <class F, class U>
+		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) const& {
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u)();
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group map_or_else
+		/// \synopsis template <class F, class U>\nauto map_or_else(F &&f, U &&u)
+		/// const &&;
+		template <class F, class U>
+		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) const&& {
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u)();
+		}
+#endif
+
+		/// \returns `u` if `*this` has a value, otherwise an empty optional.
+		template <class U>
+		constexpr optional<typename std::decay<U>::type> conjunction(U&& u) const {
+			using result = optional<detail::decay_t<U>>;
+			return has_value() ? result { u } : result { nullopt };
+		}
+
+		/// \returns `rhs` if `*this` is empty, otherwise the current value.
+		/// \group disjunction
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(const optional& rhs) & {
+			return has_value() ? *this : rhs;
+		}
+
+		/// \group disjunction
+		constexpr optional disjunction(const optional& rhs) const& {
+			return has_value() ? *this : rhs;
+		}
+
+		/// \group disjunction
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(const optional& rhs) && {
+			return has_value() ? std::move(*this) : rhs;
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group disjunction
+		constexpr optional disjunction(const optional& rhs) const&& {
+			return has_value() ? std::move(*this) : rhs;
+		}
+#endif
+
+		/// \group disjunction
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(optional&& rhs) & {
+			return has_value() ? *this : std::move(rhs);
+		}
+
+		/// \group disjunction
+		constexpr optional disjunction(optional&& rhs) const& {
+			return has_value() ? *this : std::move(rhs);
+		}
+
+		/// \group disjunction
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(optional&& rhs) && {
+			return has_value() ? std::move(*this) : std::move(rhs);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group disjunction
+		constexpr optional disjunction(optional&& rhs) const&& {
+			return has_value() ? std::move(*this) : std::move(rhs);
+		}
+#endif
+
+		/// Takes the value out of the optional, leaving it empty
+		/// \group take
+		optional take() & {
+			optional ret = *this;
+			reset();
+			return ret;
+		}
+
+		/// \group take
+		optional take() const& {
+			optional ret = *this;
+			reset();
+			return ret;
+		}
+
+		/// \group take
+		optional take() && {
+			optional ret = std::move(*this);
+			reset();
+			return ret;
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group take
+		optional take() const&& {
+			optional ret = std::move(*this);
+			reset();
+			return ret;
+		}
+#endif
+
+		using value_type = T&;
+
+		/// Constructs an optional that does not contain a value.
+		/// \group ctor_empty
+		constexpr optional() noexcept : m_value(nullptr) {
+		}
+
+		/// \group ctor_empty
+		constexpr optional(nullopt_t) noexcept : m_value(nullptr) {
+		}
+
+		/// Copy constructor
+		///
+		/// If `rhs` contains a value, the stored value is direct-initialized with
+		/// it. Otherwise, the constructed optional is empty.
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional(const optional& rhs) noexcept = default;
+
+		/// Move constructor
+		///
+		/// If `rhs` contains a value, the stored value is direct-initialized with
+		/// it. Otherwise, the constructed optional is empty.
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional(optional&& rhs) = default;
+
+		/// Constructs the stored value with `u`.
+		/// \synopsis template <class U=T> constexpr optional(U &&u);
+		template <class U = T, detail::enable_if_t<!detail::is_optional<detail::decay_t<U>>::value>* = nullptr>
+		constexpr optional(U&& u) : m_value(std::addressof(u)) {
+			static_assert(std::is_lvalue_reference<U>::value, "U must be an lvalue");
+		}
+
+		/// \exclude
+		template <class U>
+		constexpr explicit optional(const optional<U>& rhs) : optional(*rhs) {
+		}
+
+		/// No-op
+		~optional() = default;
+
+		/// Assignment to empty.
+		///
+		/// Destroys the current value if there is one.
+		optional& operator=(nullopt_t) noexcept {
+			m_value = nullptr;
+			return *this;
+		}
+
+		/// Copy assignment.
+		///
+		/// Rebinds this optional to the referee of `rhs` if there is one. Otherwise
+		/// resets the stored value in `*this`.
+		optional& operator=(const optional& rhs) = default;
+
+		/// Rebinds this optional to `u`.
+		///
+		/// \requires `U` must be an lvalue reference.
+		/// \synopsis optional &operator=(U &&u);
+		template <class U = T, detail::enable_if_t<!detail::is_optional<detail::decay_t<U>>::value>* = nullptr>
+		optional& operator=(U&& u) {
+			static_assert(std::is_lvalue_reference<U>::value, "U must be an lvalue");
+			m_value = std::addressof(u);
+			return *this;
+		}
+
+		/// Converting copy assignment operator.
+		///
+		/// Rebinds this optional to the referee of `rhs` if there is one. Otherwise
+		/// resets the stored value in `*this`.
+		template <class U>
+		optional& operator=(const optional<U>& rhs) {
+			m_value = std::addressof(rhs.value());
+			return *this;
+		}
+
+		/// Constructs the value in-place, destroying the current one if there is
+		/// one.
+		///
+		/// \group emplace
+		template <class... Args>
+		T& emplace(Args&&... args) noexcept {
+			static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args");
+
+			*this = nullopt;
+			this->construct(std::forward<Args>(args)...);
+		}
+
+		/// Swaps this optional with the other.
+		///
+		/// If neither optionals have a value, nothing happens.
+		/// If both have a value, the values are swapped.
+		/// If one has a value, it is moved to the other and the movee is left
+		/// valueless.
+		void swap(optional& rhs) noexcept {
+			std::swap(m_value, rhs.m_value);
+		}
+
+		/// \returns a pointer to the stored value
+		/// \requires a value is stored
+		/// \group pointer
+		/// \synopsis constexpr const T *operator->() const;
+		constexpr const T* operator->() const {
+			return m_value;
+		}
+
+		/// \group pointer
+		/// \synopsis constexpr T *operator->();
+		SOL_TL_OPTIONAL_11_CONSTEXPR T* operator->() {
+			return m_value;
+		}
+
+		/// \returns the stored value
+		/// \requires a value is stored
+		/// \group deref
+		/// \synopsis constexpr T &operator*();
+		SOL_TL_OPTIONAL_11_CONSTEXPR T& operator*() {
+			return *m_value;
+		}
+
+		/// \group deref
+		/// \synopsis constexpr const T &operator*() const;
+		constexpr const T& operator*() const {
+			return *m_value;
+		}
+
+		/// \returns whether or not the optional has a value
+		/// \group has_value
+		constexpr bool has_value() const noexcept {
+			return m_value != nullptr;
+		}
+
+		/// \group has_value
+		constexpr explicit operator bool() const noexcept {
+			return m_value != nullptr;
+		}
+
+		/// \returns the contained value if there is one, otherwise throws
+		/// [bad_optional_access]
+		/// \group value
+		/// synopsis constexpr T &value();
+		SOL_TL_OPTIONAL_11_CONSTEXPR T& value() {
+			if (has_value())
+				return *m_value;
+#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
+			std::abort();
+#else
+			throw bad_optional_access();
+#endif // No exceptions allowed
+		}
+		/// \group value
+		/// \synopsis constexpr const T &value() const;
+		SOL_TL_OPTIONAL_11_CONSTEXPR const T& value() const {
+			if (has_value())
+				return *m_value;
+#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
+			std::abort();
+#else
+			throw bad_optional_access();
+#endif // No exceptions allowed
+		}
+
+		/// \returns the stored value if there is one, otherwise returns `u`
+		/// \group value_or
+		template <class U>
+		constexpr T& value_or(U&& u) const {
+			static_assert(std::is_convertible<U&&, T&>::value, "T must be convertible from U");
+			return has_value() ? const_cast<T&>(**this) : static_cast<T&>(std::forward<U>(u));
+		}
+
+		/// Destroys the stored value if one exists, making the optional empty
+		void reset() noexcept {
+			m_value = nullptr;
+		}
+
+	private:
+		T* m_value;
+	};
+
+} // namespace sol
+
+namespace std {
+	// TODO SFINAE
+	template <class T>
+	struct hash<::sol::optional<T>> {
+		::std::size_t operator()(const ::sol::optional<T>& o) const {
+			if (!o.has_value())
+				return 0;
+
+			return ::std::hash<::sol::detail::remove_const_t<T>>()(*o);
+		}
+	};
+} // namespace std
+
+// end of sol/optional_implementation.hpp
+
+#endif // Boost vs. Better optional
+
+#include <optional>
+
+namespace sol {
+
+#if SOL_IS_ON(SOL_USE_BOOST_I_)
+	template <typename T>
+	using optional = boost::optional<T>;
+	using nullopt_t = boost::none_t;
+	const nullopt_t nullopt = boost::none;
+#endif // Boost vs. Better optional
+
+	namespace meta {
+		template <typename T>
+		using is_optional = any<is_specialization_of<T, optional>, is_specialization_of<T, std::optional>>;
+
+		template <typename T>
+		constexpr inline bool is_optional_v = is_optional<T>::value;
+	} // namespace meta
+
+	namespace detail {
+		template <typename T>
+		struct associated_nullopt {
+			inline static constexpr std::nullopt_t value = std::nullopt;
+		};
+
+#if SOL_IS_ON(SOL_USE_BOOST_I_)
+		template <typename T>
+		struct associated_nullopt<boost::optional<T>> {
+			inline static constexpr std::nullopt_t value = boost::nullopt;
+		};
+#endif // Boost nullopt
+
+		template <typename T>
+		inline constexpr auto associated_nullopt_v = associated_nullopt<T>::value;
+	} // namespace detail
+} // namespace sol
+
+// end of sol/optional.hpp
+
+// beginning of sol/raii.hpp
+
+#include <memory>
+
+namespace sol {
+	namespace detail {
+		struct default_construct {
+			template <typename T, typename... Args>
+			static void construct(T&& obj, Args&&... args) {
+				typedef meta::unqualified_t<T> Tu;
+				std::allocator<Tu> alloc{};
+				std::allocator_traits<std::allocator<Tu>>::construct(alloc, std::forward<T>(obj), std::forward<Args>(args)...);
+			}
+
+			template <typename T, typename... Args>
+			void operator()(T&& obj, Args&&... args) const {
+				construct(std::forward<T>(obj), std::forward<Args>(args)...);
+			}
+		};
+
+		struct default_destruct {
+			template <typename T>
+			static void destroy(T&& obj) {
+				std::allocator<meta::unqualified_t<T>> alloc{};
+				alloc.destroy(obj);
+			}
+
+			template <typename T>
+			void operator()(T&& obj) const {
+				destroy(std::forward<T>(obj));
+			}
+		};
+
+		struct deleter {
+			template <typename T>
+			void operator()(T* p) const {
+				delete p;
+			}
+		};
+
+		struct state_deleter {
+			void operator()(lua_State* L) const {
+				lua_close(L);
+			}
+		};
+
+		template <typename T, typename Dx, typename... Args>
+		inline std::unique_ptr<T, Dx> make_unique_deleter(Args&&... args) {
+			return std::unique_ptr<T, Dx>(new T(std::forward<Args>(args)...));
+		}
+
+		template <typename Tag, typename T>
+		struct tagged {
+		private:
+			T value_;
+		
+		public:
+			template <typename Arg, typename... Args, meta::disable<std::is_same<meta::unqualified_t<Arg>, tagged>> = meta::enabler>
+			tagged(Arg&& arg, Args&&... args)
+			: value_(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+			}
+
+			T& value() & {
+				return value_;
+			}
+
+			T const& value() const& {
+				return value_;
+			}
+
+			T&& value() && {
+				return std::move(value_);
+			}
+		};
+	} // namespace detail
+
+	template <typename... Args>
+	struct constructor_list {};
+
+	template <typename... Args>
+	using constructors = constructor_list<Args...>;
+
+	const auto default_constructor = constructors<types<>>{};
+
+	struct no_construction {};
+	const auto no_constructor = no_construction{};
+
+	struct call_construction {};
+	const auto call_constructor = call_construction{};
+
+	template <typename... Functions>
+	struct constructor_wrapper {
+		std::tuple<Functions...> functions;
+		template <typename Arg, typename... Args, meta::disable<std::is_same<meta::unqualified_t<Arg>, constructor_wrapper>> = meta::enabler>
+		constructor_wrapper(Arg&& arg, Args&&... args)
+		: functions(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+		}
+	};
+
+	template <typename... Functions>
+	inline auto initializers(Functions&&... functions) {
+		return constructor_wrapper<std::decay_t<Functions>...>(std::forward<Functions>(functions)...);
+	}
+
+	template <typename... Functions>
+	struct factory_wrapper {
+		std::tuple<Functions...> functions;
+		template <typename Arg, typename... Args, meta::disable<std::is_same<meta::unqualified_t<Arg>, factory_wrapper>> = meta::enabler>
+		factory_wrapper(Arg&& arg, Args&&... args)
+		: functions(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+		}
+	};
+
+	template <typename... Functions>
+	inline auto factories(Functions&&... functions) {
+		return factory_wrapper<std::decay_t<Functions>...>(std::forward<Functions>(functions)...);
+	}
+
+	template <typename Function>
+	struct destructor_wrapper {
+		Function fx;
+		destructor_wrapper(Function f)
+		: fx(std::move(f)) {
+		}
+	};
+
+	template <>
+	struct destructor_wrapper<void> {};
+
+	const destructor_wrapper<void> default_destructor{};
+
+	template <typename Fx>
+	inline auto destructor(Fx&& fx) {
+		return destructor_wrapper<std::decay_t<Fx>>(std::forward<Fx>(fx));
+	}
+
+} // namespace sol
+
+// end of sol/raii.hpp
+
+// beginning of sol/policies.hpp
+
+#include <array>
+
+namespace sol {
+	namespace detail {
+		struct policy_base_tag {};
+	} // namespace detail
+
+	template <int Target, int... In>
+	struct static_stack_dependencies : detail::policy_base_tag {};
+	typedef static_stack_dependencies<-1, 1> self_dependency;
+	template <int... In>
+	struct returns_self_with : detail::policy_base_tag {};
+	typedef returns_self_with<> returns_self;
+
+	struct stack_dependencies : detail::policy_base_tag {
+		int target;
+		std::array<int, 64> stack_indices;
+		std::size_t len;
+
+		template <typename... Args>
+		stack_dependencies(int stack_target, Args&&... args) : target(stack_target), stack_indices(), len(sizeof...(Args)) {
+			std::size_t i = 0;
+			(void)detail::swallow{ int(), (stack_indices[i++] = static_cast<int>(std::forward<Args>(args)), int())... };
+		}
+
+		int& operator[](std::size_t i) {
+			return stack_indices[i];
+		}
+
+		const int& operator[](std::size_t i) const {
+			return stack_indices[i];
+		}
+
+		std::size_t size() const {
+			return len;
+		}
+	};
+
+	template <typename F, typename... Policies>
+	struct policy_wrapper {
+		typedef std::index_sequence_for<Policies...> indices;
+
+		F value;
+		std::tuple<Policies...> policies;
+
+		template <typename Fx, typename... Args, meta::enable<meta::neg<std::is_same<meta::unqualified_t<Fx>, policy_wrapper>>> = meta::enabler>
+		policy_wrapper(Fx&& fx, Args&&... args) : value(std::forward<Fx>(fx)), policies(std::forward<Args>(args)...) {
+		}
+
+		policy_wrapper(const policy_wrapper&) = default;
+		policy_wrapper& operator=(const policy_wrapper&) = default;
+		policy_wrapper(policy_wrapper&&) = default;
+		policy_wrapper& operator=(policy_wrapper&&) = default;
+	};
+
+	template <typename F, typename... Args>
+	auto policies(F&& f, Args&&... args) {
+		return policy_wrapper<std::decay_t<F>, std::decay_t<Args>...>(std::forward<F>(f), std::forward<Args>(args)...);
+	}
+
+	namespace detail {
+		template <typename T>
+		using is_policy = meta::is_specialization_of<T, policy_wrapper>;
+
+		template <typename T>
+		inline constexpr bool is_policy_v = is_policy<T>::value;
+	} // namespace detail
+} // namespace sol
+
+// end of sol/policies.hpp
+
+// beginning of sol/ebco.hpp
+
+#include <type_traits>
+#include <utility>
+
+namespace sol { namespace detail {
+
+	template <typename T, std::size_t tag = 0, typename = void>
+	struct ebco {
+		T value_;
+
+		ebco() = default;
+		ebco(const ebco&) = default;
+		ebco(ebco&&) = default;
+		ebco& operator=(const ebco&) = default;
+		ebco& operator=(ebco&&) = default;
+		ebco(const T& v) : value_(v){};
+		ebco(T&& v) : value_(std::move(v)){};
+		ebco& operator=(const T& v) {
+			value_ = v;
+			return *this;
+		}
+		ebco& operator=(T&& v) {
+			value_ = std::move(v);
+			return *this;
+		};
+		template <typename Arg, typename... Args,
+		     typename = std::enable_if_t<!std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>,
+		                                      ebco> && !std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>, T>>>
+		ebco(Arg&& arg, Args&&... args) : T(std::forward<Arg>(arg), std::forward<Args>(args)...){}
+
+		T& value() & {
+			return value_;
+		}
+
+		T const& value() const & {
+			return value_;
+		}
+
+		T&& value() && {
+			return std::move(value_);
+		}
+	};
+
+	template <typename T, std::size_t tag>
+	struct ebco<T, tag, std::enable_if_t<!std::is_reference_v<T> && std::is_class_v<T> && !std::is_final_v<T>>> : T {
+		ebco() = default;
+		ebco(const ebco&) = default;
+		ebco(ebco&&) = default;
+		ebco(const T& v) : T(v){};
+		ebco(T&& v) : T(std::move(v)){};
+		template <typename Arg, typename... Args,
+			typename = std::enable_if_t<!std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>,
+			                                 ebco> && !std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>, T>>>
+		ebco(Arg&& arg, Args&&... args) : T(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+		}
+
+		ebco& operator=(const ebco&) = default;
+		ebco& operator=(ebco&&) = default;
+		ebco& operator=(const T& v) {
+			static_cast<T&>(*this) = v;
+			return *this;
+		}
+		ebco& operator=(T&& v) {
+			static_cast<T&>(*this) = std::move(v);
+			return *this;
+		};
+
+		T& value() & {
+			return static_cast<T&>(*this);
+		}
+
+		T const& value() const & {
+			return static_cast<T const&>(*this);
+		}
+
+		T&& value() && {
+			return std::move(static_cast<T&>(*this));
+		}
+	};
+
+	template <typename T, std::size_t tag>
+	struct ebco<T&, tag> {
+		T& ref;
+
+		ebco() = default;
+		ebco(const ebco&) = default;
+		ebco(ebco&&) = default;
+		ebco(T& v) : ref(v){};
+
+		ebco& operator=(const ebco&) = default;
+		ebco& operator=(ebco&&) = default;
+		ebco& operator=(T& v) {
+			ref = v;
+			return *this;
+		}
+
+		T& value() const {
+			return const_cast<ebco<T&, tag>&>(*this).ref;
+		}
+	};
+
+	template <typename T, std::size_t tag>
+	struct ebco<T&&, tag> {
+		T&& ref;
+
+		ebco() = default;
+		ebco(const ebco&) = default;
+		ebco(ebco&&) = default;
+		ebco(T&& v) : ref(v){};
+
+		ebco& operator=(const ebco&) = default;
+		ebco& operator=(ebco&&) = default;
+		ebco& operator=(T&& v) {
+			ref = std::move(v);
+			return *this;
+		}
+
+		T& value() & {
+			return ref;
+		}
+
+		const T& value() const & {
+			return ref;
+		}
+
+		T&& value() && {
+			return std::move(ref);
+		}
+	};
+
+}} // namespace sol::detail
+
+// end of sol/ebco.hpp
+
+#include <array>
+#include <initializer_list>
+#include <string>
+#include <string_view>
+#include <optional>
+#if SOL_IS_ON(SOL_STD_VARIANT_I_)
+#include <variant>
+#endif // variant shenanigans (thanks, Mac OSX)
+
+namespace sol {
+	namespace detail {
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_)
+		typedef int (*lua_CFunction_noexcept)(lua_State* L) noexcept;
+#else
+		typedef int (*lua_CFunction_noexcept)(lua_State* L);
+#endif // noexcept function type for lua_CFunction
+
+		template <typename T>
+		struct unique_usertype { };
+
+		template <typename T>
+		struct implicit_wrapper {
+			T& item;
+			implicit_wrapper(T* item) : item(*item) {
+			}
+			implicit_wrapper(T& item) : item(item) {
+			}
+			operator T&() {
+				return item;
+			}
+			operator T*() {
+				return std::addressof(item);
+			}
+		};
+
+		struct yield_tag_t { };
+		const yield_tag_t yield_tag = yield_tag_t {};
+	} // namespace detail
+
+	struct lua_nil_t { };
+	inline constexpr lua_nil_t lua_nil {};
+	inline bool operator==(lua_nil_t, lua_nil_t) {
+		return true;
+	}
+	inline bool operator!=(lua_nil_t, lua_nil_t) {
+		return false;
+	}
+#if SOL_IS_ON(SOL_NIL_I_)
+	using nil_t = lua_nil_t;
+	inline constexpr const nil_t& nil = lua_nil;
+#endif
+
+	namespace detail {
+		struct non_lua_nil_t { };
+	} // namespace detail
+
+	struct metatable_key_t { };
+	const metatable_key_t metatable_key = {};
+
+	struct env_key_t { };
+	const env_key_t env_key = {};
+
+	struct no_metatable_t { };
+	const no_metatable_t no_metatable = {};
+
+	template <typename T>
+	struct yielding_t {
+		T func;
+
+		yielding_t() = default;
+		yielding_t(const yielding_t&) = default;
+		yielding_t(yielding_t&&) = default;
+		yielding_t& operator=(const yielding_t&) = default;
+		yielding_t& operator=(yielding_t&&) = default;
+		template <typename Arg,
+		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<Arg>, yielding_t>>,
+		          meta::neg<std::is_base_of<proxy_base_tag, meta::unqualified_t<Arg>>>> = meta::enabler>
+		yielding_t(Arg&& arg) : func(std::forward<Arg>(arg)) {
+		}
+		template <typename Arg0, typename Arg1, typename... Args>
+		yielding_t(Arg0&& arg0, Arg1&& arg1, Args&&... args) : func(std::forward<Arg0>(arg0), std::forward<Arg1>(arg1), std::forward<Args>(args)...) {
+		}
+	};
+
+	template <typename F>
+	inline yielding_t<std::decay_t<F>> yielding(F&& f) {
+		return yielding_t<std::decay_t<F>>(std::forward<F>(f));
+	}
+
+	typedef std::remove_pointer_t<lua_CFunction> lua_CFunction_ref;
+
+	template <typename T>
+	struct non_null { };
+
+	template <typename... Args>
+	struct function_sig { };
+
+	struct upvalue_index {
+		int index;
+		upvalue_index(int idx) : index(lua_upvalueindex(idx)) {
+		}
+
+		operator int() const {
+			return index;
+		}
+	};
+
+	struct raw_index {
+		int index;
+		raw_index(int i) : index(i) {
+		}
+
+		operator int() const {
+			return index;
+		}
+	};
+
+	struct absolute_index {
+		int index;
+		absolute_index(lua_State* L, int idx) : index(lua_absindex(L, idx)) {
+		}
+
+		operator int() const {
+			return index;
+		}
+	};
+
+	struct ref_index {
+		int index;
+		ref_index(int idx) : index(idx) {
+		}
+
+		operator int() const {
+			return index;
+		}
+	};
+
+	struct stack_count {
+		int count;
+
+		stack_count(int cnt) : count(cnt) {
+		}
+	};
+
+	struct lightuserdata_value {
+		void* value;
+		lightuserdata_value(void* data) : value(data) {
+		}
+		operator void*() const {
+			return value;
+		}
+	};
+
+	struct userdata_value {
+		void* value;
+		userdata_value(void* data) : value(data) {
+		}
+		operator void*() const {
+			return value;
+		}
+	};
+
+	template <typename L>
+	struct light {
+		L* value;
+
+		light(L& x) : value(std::addressof(x)) {
+		}
+		light(L* x) : value(x) {
+		}
+		light(void* x) : value(static_cast<L*>(x)) {
+		}
+		operator L*() const {
+			return value;
+		}
+		operator L&() const {
+			return *value;
+		}
+	};
+
+	template <typename T>
+	auto make_light(T& l) {
+		typedef meta::unwrapped_t<std::remove_pointer_t<std::remove_pointer_t<T>>> L;
+		return light<L>(l);
+	}
+
+	template <typename U>
+	struct user {
+		U value;
+
+		user(U&& x) : value(std::forward<U>(x)) {
+		}
+		operator std::add_pointer_t<std::remove_reference_t<U>>() {
+			return std::addressof(value);
+		}
+		operator std::add_lvalue_reference_t<U>() {
+			return value;
+		}
+		operator std::add_const_t<std::add_lvalue_reference_t<U>> &() const {
+			return value;
+		}
+	};
+
+	template <typename T>
+	auto make_user(T&& u) {
+		typedef meta::unwrapped_t<meta::unqualified_t<T>> U;
+		return user<U>(std::forward<T>(u));
+	}
+
+	template <typename T>
+	struct metatable_registry_key {
+		T key;
+
+		metatable_registry_key(T key) : key(std::forward<T>(key)) {
+		}
+	};
+
+	template <typename T>
+	auto meta_registry_key(T&& key) {
+		typedef meta::unqualified_t<T> K;
+		return metatable_registry_key<K>(std::forward<T>(key));
+	}
+
+	template <typename... Upvalues>
+	struct closure {
+		lua_CFunction c_function;
+		std::tuple<Upvalues...> upvalues;
+		closure(lua_CFunction f, Upvalues... targetupvalues) : c_function(f), upvalues(std::forward<Upvalues>(targetupvalues)...) {
+		}
+	};
+
+	template <>
+	struct closure<> {
+		lua_CFunction c_function;
+		int upvalues;
+		closure(lua_CFunction f, int upvalue_count = 0) : c_function(f), upvalues(upvalue_count) {
+		}
+	};
+
+	typedef closure<> c_closure;
+
+	template <typename... Args>
+	closure<Args...> make_closure(lua_CFunction f, Args&&... args) {
+		return closure<Args...>(f, std::forward<Args>(args)...);
+	}
+
+	template <typename Sig, typename... Ps>
+	struct function_arguments {
+		std::tuple<Ps...> arguments;
+		template <typename Arg, typename... Args, meta::disable<std::is_same<meta::unqualified_t<Arg>, function_arguments>> = meta::enabler>
+		function_arguments(Arg&& arg, Args&&... args) : arguments(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+		}
+	};
+
+	template <typename Sig = function_sig<>, typename... Args>
+	auto as_function(Args&&... args) {
+		return function_arguments<Sig, std::decay_t<Args>...>(std::forward<Args>(args)...);
+	}
+
+	template <typename Sig = function_sig<>, typename... Args>
+	auto as_function_reference(Args&&... args) {
+		return function_arguments<Sig, Args...>(std::forward<Args>(args)...);
+	}
+
+	template <typename T>
+	struct as_table_t {
+	private:
+		T value_;
+
+	public:
+		as_table_t() = default;
+		as_table_t(const as_table_t&) = default;
+		as_table_t(as_table_t&&) = default;
+		as_table_t& operator=(const as_table_t&) = default;
+		as_table_t& operator=(as_table_t&&) = default;
+		template <typename Arg,
+		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<Arg>, as_table_t>>,
+		          meta::neg<std::is_base_of<proxy_base_tag, meta::unqualified_t<Arg>>>> = meta::enabler>
+		as_table_t(Arg&& arg) : value_(std::forward<Arg>(arg)) {
+		}
+		template <typename Arg0, typename Arg1, typename... Args>
+		as_table_t(Arg0&& arg0, Arg1&& arg1, Args&&... args) : value_(std::forward<Arg0>(arg0), std::forward<Arg1>(arg1), std::forward<Args>(args)...) {
+		}
+
+		T& value() & {
+			return value_;
+		}
+
+		T&& value() && {
+			return std::move(value_);
+		}
+
+		const T& value() const& {
+			return value_;
+		}
+
+		operator std::add_lvalue_reference_t<T>() {
+			return value_;
+		}
+	};
+
+	template <typename T>
+	struct nested {
+	private:
+		T value_;
+
+	public:
+		using nested_type = T;
+
+		nested() = default;
+		nested(const nested&) = default;
+		nested(nested&&) = default;
+		nested& operator=(const nested&) = default;
+		nested& operator=(nested&&) = default;
+		template <typename Arg,
+		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<Arg>, nested>>,
+		          meta::neg<std::is_base_of<proxy_base_tag, meta::unqualified_t<Arg>>>> = meta::enabler>
+		nested(Arg&& arg) : value_(std::forward<Arg>(arg)) {
+		}
+		template <typename Arg0, typename Arg1, typename... Args>
+		nested(Arg0&& arg0, Arg1&& arg1, Args&&... args) : value_(std::forward<Arg0>(arg0), std::forward<Arg1>(arg1), std::forward<Args>(args)...) {
+		}
+
+		T& value() & {
+			return value_;
+		}
+
+		T&& value() && {
+			return std::move(value_);
+		}
+
+		const T& value() const& {
+			return value_;
+		}
+
+		operator std::add_lvalue_reference_t<T>() {
+			return value_;
+		}
+	};
+
+	struct nested_tag_t { };
+	constexpr inline nested_tag_t nested_tag {};
+
+	template <typename T>
+	as_table_t<T> as_table_ref(T&& container) {
+		return as_table_t<T>(std::forward<T>(container));
+	}
+
+	template <typename T>
+	as_table_t<meta::unqualified_t<T>> as_table(T&& container) {
+		return as_table_t<meta::unqualified_t<T>>(std::forward<T>(container));
+	}
+
+	template <typename T>
+	nested<T> as_nested_ref(T&& container) {
+		return nested<T>(std::forward<T>(container));
+	}
+
+	template <typename T>
+	nested<meta::unqualified_t<T>> as_nested(T&& container) {
+		return nested<meta::unqualified_t<T>>(std::forward<T>(container));
+	}
+
+	template <typename T>
+	struct as_container_t {
+	private:
+		T value_;
+
+	public:
+		using type = T;
+
+		as_container_t() = default;
+		as_container_t(const as_container_t&) = default;
+		as_container_t(as_container_t&&) = default;
+		as_container_t& operator=(const as_container_t&) = default;
+		as_container_t& operator=(as_container_t&&) = default;
+		template <typename Arg,
+		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<Arg>, as_container_t>>,
+		          meta::neg<std::is_base_of<proxy_base_tag, meta::unqualified_t<Arg>>>> = meta::enabler>
+		as_container_t(Arg&& arg) : value_(std::forward<Arg>(arg)) {
+		}
+		template <typename Arg0, typename Arg1, typename... Args>
+		as_container_t(Arg0&& arg0, Arg1&& arg1, Args&&... args) : value_(std::forward<Arg0>(arg0), std::forward<Arg1>(arg1), std::forward<Args>(args)...) {
+		}
+
+		T& value() & {
+			return value_;
+		}
+
+		T&& value() && {
+			return std::move(value_);
+		}
+
+		const T& value() const& {
+			return value_;
+		}
+	};
+
+	template <typename T>
+	struct as_container_t<T&> {
+	private:
+		std::reference_wrapper<T> value_;
+
+	public:
+		as_container_t(T& value) : value_(value) {
+		}
+
+		T& value() {
+			return value_;
+		}
+
+		operator T&() {
+			return value();
+		}
+	};
+
+	template <typename T>
+	auto as_container(T&& value) {
+		return as_container_t<T>(std::forward<T>(value));
+	}
+
+	template <typename T>
+	struct push_invoke_t {
+	private:
+		T value_;
+
+	public:
+		push_invoke_t() = default;
+		push_invoke_t(const push_invoke_t&) = default;
+		push_invoke_t(push_invoke_t&&) = default;
+		push_invoke_t& operator=(const push_invoke_t&) = default;
+		push_invoke_t& operator=(push_invoke_t&&) = default;
+		template <typename Arg,
+		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<Arg>, push_invoke_t>>,
+		          meta::neg<std::is_base_of<proxy_base_tag, meta::unqualified_t<Arg>>>> = meta::enabler>
+		push_invoke_t(Arg&& arg) : value_(std::forward<Arg>(arg)) {
+		}
+		template <typename Arg0, typename Arg1, typename... Args>
+		push_invoke_t(Arg0&& arg0, Arg1&& arg1, Args&&... args) : value_(std::forward<Arg0>(arg0), std::forward<Arg1>(arg1), std::forward<Args>(args)...) {
+		}
+
+		T& value() & {
+			return value_;
+		}
+
+		T&& value() && {
+			return std::move(value_);
+		}
+
+		const T& value() const& {
+			return value_;
+		}
+	};
+
+	template <typename T>
+	struct push_invoke_t<T&> {
+		std::reference_wrapper<T> value_;
+
+		push_invoke_t(T& value) : value_(value) {
+		}
+
+		T& value() {
+			return value_;
+		}
+	};
+
+	template <typename Fx>
+	auto push_invoke(Fx&& fx) {
+		return push_invoke_t<Fx>(std::forward<Fx>(fx));
+	}
+
+	struct override_value_t { };
+	constexpr inline override_value_t override_value = override_value_t();
+	struct update_if_empty_t { };
+	constexpr inline update_if_empty_t update_if_empty = update_if_empty_t();
+	struct create_if_nil_t { };
+	constexpr inline create_if_nil_t create_if_nil = create_if_nil_t();
+
+	namespace detail {
+		enum insert_mode { none = 0x0, update_if_empty = 0x01, override_value = 0x02, create_if_nil = 0x04 };
+
+		template <typename T, typename...>
+		using is_insert_mode = std::integral_constant<bool,
+		     std::is_same_v<T, override_value_t> || std::is_same_v<T, update_if_empty_t> || std::is_same_v<T, create_if_nil_t>>;
+
+		template <typename T, typename...>
+		using is_not_insert_mode = meta::neg<is_insert_mode<T>>;
+	} // namespace detail
+
+	struct this_state {
+		lua_State* L;
+
+		this_state(lua_State* Ls) : L(Ls) {
+		}
+
+		operator lua_State*() const noexcept {
+			return lua_state();
+		}
+
+		lua_State* operator->() const noexcept {
+			return lua_state();
+		}
+
+		lua_State* lua_state() const noexcept {
+			return L;
+		}
+	};
+
+	struct this_main_state {
+		lua_State* L;
+
+		this_main_state(lua_State* Ls) : L(Ls) {
+		}
+
+		operator lua_State*() const noexcept {
+			return lua_state();
+		}
+
+		lua_State* operator->() const noexcept {
+			return lua_state();
+		}
+
+		lua_State* lua_state() const noexcept {
+			return L;
+		}
+	};
+
+	struct new_table {
+		int sequence_hint = 0;
+		int map_hint = 0;
+
+		new_table() = default;
+		new_table(const new_table&) = default;
+		new_table(new_table&&) = default;
+		new_table& operator=(const new_table&) = default;
+		new_table& operator=(new_table&&) = default;
+
+		new_table(int sequence_hint, int map_hint = 0) : sequence_hint(sequence_hint), map_hint(map_hint) {
+		}
+	};
+
+	const new_table create = {};
+
+	enum class lib : char {
+		// print, assert, and other base functions
+		base,
+		// require and other package functions
+		package,
+		// coroutine functions and utilities
+		coroutine,
+		// string library
+		string,
+		// functionality from the OS
+		os,
+		// all things math
+		math,
+		// the table manipulator and observer functions
+		table,
+		// the debug library
+		debug,
+		// the bit library: different based on which you're using
+		bit32,
+		// input/output library
+		io,
+		// LuaJIT only
+		ffi,
+		// LuaJIT only
+		jit,
+		// library for handling utf8: new to Lua
+		utf8,
+		// do not use
+		count
+	};
+
+	enum class call_syntax { dot = 0, colon = 1 };
+
+	enum class load_mode {
+		any = 0,
+		text = 1,
+		binary = 2,
+	};
+
+	enum class call_status : int {
+		ok = LUA_OK,
+		yielded = LUA_YIELD,
+		runtime = LUA_ERRRUN,
+		memory = LUA_ERRMEM,
+		handler = LUA_ERRERR,
+		gc = LUA_ERRGCMM,
+		syntax = LUA_ERRSYNTAX,
+		file = LUA_ERRFILE,
+	};
+
+	enum class thread_status : int {
+		ok = LUA_OK,
+		yielded = LUA_YIELD,
+		runtime = LUA_ERRRUN,
+		memory = LUA_ERRMEM,
+		gc = LUA_ERRGCMM,
+		handler = LUA_ERRERR,
+		dead = -1,
+	};
+
+	enum class load_status : int {
+		ok = LUA_OK,
+		syntax = LUA_ERRSYNTAX,
+		memory = LUA_ERRMEM,
+		gc = LUA_ERRGCMM,
+		file = LUA_ERRFILE,
+	};
+
+	enum class gc_mode : int {
+		incremental = 0,
+		generational = 1,
+		default_value = incremental,
+	};
+
+	enum class type : int {
+		none = LUA_TNONE,
+		lua_nil = LUA_TNIL,
+#if SOL_IS_ON(SOL_NIL_I_)
+		nil = lua_nil,
+#endif // Objective C/C++ Keyword that's found in OSX SDK and OBJC -- check for all forms to protect
+		string = LUA_TSTRING,
+		number = LUA_TNUMBER,
+		thread = LUA_TTHREAD,
+		boolean = LUA_TBOOLEAN,
+		function = LUA_TFUNCTION,
+		userdata = LUA_TUSERDATA,
+		lightuserdata = LUA_TLIGHTUSERDATA,
+		table = LUA_TTABLE,
+		poly = -0xFFFF
+	};
+
+	inline const std::string& to_string(call_status c) {
+		static const std::array<std::string, 10> names { { "ok",
+			"yielded",
+			"runtime",
+			"memory",
+			"handler",
+			"gc",
+			"syntax",
+			"file",
+			"CRITICAL_EXCEPTION_FAILURE",
+			"CRITICAL_INDETERMINATE_STATE_FAILURE" } };
+		switch (c) {
+		case call_status::ok:
+			return names[0];
+		case call_status::yielded:
+			return names[1];
+		case call_status::runtime:
+			return names[2];
+		case call_status::memory:
+			return names[3];
+		case call_status::handler:
+			return names[4];
+		case call_status::gc:
+			return names[5];
+		case call_status::syntax:
+			return names[6];
+		case call_status::file:
+			return names[7];
+		}
+		if (static_cast<std::ptrdiff_t>(c) == -1) {
+			// One of the many cases where a critical exception error has occurred
+			return names[8];
+		}
+		return names[9];
+	}
+
+	inline bool is_indeterminate_call_failure(call_status c) {
+		switch (c) {
+		case call_status::ok:
+		case call_status::yielded:
+		case call_status::runtime:
+		case call_status::memory:
+		case call_status::handler:
+		case call_status::gc:
+		case call_status::syntax:
+		case call_status::file:
+			return false;
+		}
+		return true;
+	}
+
+	inline const std::string& to_string(load_status c) {
+		static const std::array<std::string, 7> names {
+			{ "ok", "memory", "gc", "syntax", "file", "CRITICAL_EXCEPTION_FAILURE", "CRITICAL_INDETERMINATE_STATE_FAILURE" }
+		};
+		switch (c) {
+		case load_status::ok:
+			return names[0];
+		case load_status::memory:
+			return names[1];
+		case load_status::gc:
+			return names[2];
+		case load_status::syntax:
+			return names[3];
+		case load_status::file:
+			return names[4];
+		}
+		if (static_cast<int>(c) == -1) {
+			// One of the many cases where a critical exception error has occurred
+			return names[5];
+		}
+		return names[6];
+	}
+
+	inline const std::string& to_string(load_mode c) {
+		static const std::array<std::string, 3> names { {
+			"bt",
+			"t",
+			"b",
+		} };
+		return names[static_cast<std::size_t>(c)];
+	}
+
+	enum class meta_function {
+		construct,
+		index,
+		new_index,
+		mode,
+		call,
+		call_function = call,
+		metatable,
+		to_string,
+		length,
+		unary_minus,
+		addition,
+		subtraction,
+		multiplication,
+		division,
+		modulus,
+		power_of,
+		involution = power_of,
+		concatenation,
+		equal_to,
+		less_than,
+		less_than_or_equal_to,
+		garbage_collect,
+		floor_division,
+		bitwise_left_shift,
+		bitwise_right_shift,
+		bitwise_not,
+		bitwise_and,
+		bitwise_or,
+		bitwise_xor,
+		pairs,
+		ipairs,
+		next,
+		type,
+		type_info,
+		call_construct,
+		storage,
+		gc_names,
+		static_index,
+		static_new_index,
+	};
+
+	typedef meta_function meta_method;
+
+	inline const std::array<std::string, 37>& meta_function_names() {
+		static const std::array<std::string, 37> names = { { "new",
+			"__index",
+			"__newindex",
+			"__mode",
+			"__call",
+			"__metatable",
+			"__tostring",
+			"__len",
+			"__unm",
+			"__add",
+			"__sub",
+			"__mul",
+			"__div",
+			"__mod",
+			"__pow",
+			"__concat",
+			"__eq",
+			"__lt",
+			"__le",
+			"__gc",
+
+			"__idiv",
+			"__shl",
+			"__shr",
+			"__bnot",
+			"__band",
+			"__bor",
+			"__bxor",
+
+			"__pairs",
+			"__ipairs",
+			"next",
+
+			"__type",
+			"__typeinfo",
+			"__sol.call_new",
+			"__sol.storage",
+			"__sol.gc_names",
+			"__sol.static_index",
+			"__sol.static_new_index" } };
+		return names;
+	}
+
+	inline const std::string& to_string(meta_function mf) {
+		return meta_function_names()[static_cast<int>(mf)];
+	}
+
+	inline type type_of(lua_State* L, int index) {
+		return static_cast<type>(lua_type(L, index));
+	}
+
+	inline std::string type_name(lua_State* L, type t) {
+		return lua_typename(L, static_cast<int>(t));
+	}
+
+	template <typename T>
+	struct is_lua_reference
+	: std::integral_constant<bool, std::is_base_of_v<reference, T> || std::is_base_of_v<main_reference, T> || std::is_base_of_v<stack_reference, T>> { };
+
+	template <typename T>
+	inline constexpr bool is_lua_reference_v = is_lua_reference<T>::value;
+
+	template <typename T>
+	struct is_lua_reference_or_proxy : std::integral_constant<bool, is_lua_reference_v<T> || meta::is_specialization_of_v<T, table_proxy>> { };
+
+	template <typename T>
+	inline constexpr bool is_lua_reference_or_proxy_v = is_lua_reference_or_proxy<T>::value;
+
+	template <typename T>
+	struct is_transparent_argument : std::false_type { };
+
+	template <typename T>
+	constexpr inline bool is_transparent_argument_v = is_transparent_argument<T>::value;
+
+	template <>
+	struct is_transparent_argument<this_state> : std::true_type { };
+	template <>
+	struct is_transparent_argument<this_main_state> : std::true_type { };
+	template <>
+	struct is_transparent_argument<this_environment> : std::true_type { };
+	template <>
+	struct is_transparent_argument<variadic_args> : std::true_type { };
+	template <typename T>
+	struct is_variadic_arguments : std::is_same<T, variadic_args> { };
+
+	template <typename T>
+	struct is_container
+	: std::integral_constant<bool,
+	       !std::is_same_v<state_view,
+	            T> && !std::is_same_v<state, T> && !meta::is_initializer_list_v<T> && !meta::is_string_like_v<T> && !meta::is_string_literal_array_v<T> && !is_transparent_argument_v<T> && !is_lua_reference_v<T> && (meta::has_begin_end_v<T> || std::is_array_v<T>)> {
+	};
+
+	template <typename T>
+	constexpr inline bool is_container_v = is_container<T>::value;
+
+	template <typename T>
+	struct is_to_stringable : meta::any<meta::supports_to_string_member<meta::unqualified_t<T>>, meta::supports_adl_to_string<meta::unqualified_t<T>>,
+	                               meta::supports_op_left_shift<std::ostream, meta::unqualified_t<T>>> { };
+
+	namespace detail {
+		template <typename T, typename = void>
+		struct lua_type_of : std::integral_constant<type, type::userdata> { };
+
+		template <typename C, typename T, typename A>
+		struct lua_type_of<std::basic_string<C, T, A>> : std::integral_constant<type, type::string> { };
+
+		template <typename C, typename T>
+		struct lua_type_of<basic_string_view<C, T>> : std::integral_constant<type, type::string> { };
+
+		template <std::size_t N>
+		struct lua_type_of<char[N]> : std::integral_constant<type, type::string> { };
+
+		template <std::size_t N>
+		struct lua_type_of<wchar_t[N]> : std::integral_constant<type, type::string> { };
+
+		template <std::size_t N>
+		struct lua_type_of<char16_t[N]> : std::integral_constant<type, type::string> { };
+
+		template <std::size_t N>
+		struct lua_type_of<char32_t[N]> : std::integral_constant<type, type::string> { };
+
+		template <>
+		struct lua_type_of<char> : std::integral_constant<type, type::string> { };
+
+		template <>
+		struct lua_type_of<wchar_t> : std::integral_constant<type, type::string> { };
+
+		template <>
+		struct lua_type_of<char16_t> : std::integral_constant<type, type::string> { };
+
+		template <>
+		struct lua_type_of<char32_t> : std::integral_constant<type, type::string> { };
+
+		template <>
+		struct lua_type_of<const char*> : std::integral_constant<type, type::string> { };
+
+		template <>
+		struct lua_type_of<const char16_t*> : std::integral_constant<type, type::string> { };
+
+		template <>
+		struct lua_type_of<const char32_t*> : std::integral_constant<type, type::string> { };
+
+		template <>
+		struct lua_type_of<bool> : std::integral_constant<type, type::boolean> { };
+
+		template <>
+		struct lua_type_of<lua_nil_t> : std::integral_constant<type, type::lua_nil> { };
+
+		template <>
+		struct lua_type_of<nullopt_t> : std::integral_constant<type, type::lua_nil> { };
+
+		template <>
+		struct lua_type_of<lua_value> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<detail::non_lua_nil_t> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<std::nullptr_t> : std::integral_constant<type, type::lua_nil> { };
+
+		template <>
+		struct lua_type_of<error> : std::integral_constant<type, type::string> { };
+
+		template <bool b, typename Base>
+		struct lua_type_of<basic_table_core<b, Base>> : std::integral_constant<type, type::table> { };
+
+		template <typename Base>
+		struct lua_type_of<basic_lua_table<Base>> : std::integral_constant<type, type::table> { };
+
+		template <typename Base>
+		struct lua_type_of<basic_metatable<Base>> : std::integral_constant<type, type::table> { };
+
+		template <typename T, typename Base>
+		struct lua_type_of<basic_usertype<T, Base>> : std::integral_constant<type, type::table> { };
+
+		template <>
+		struct lua_type_of<metatable_key_t> : std::integral_constant<type, type::table> { };
+
+		template <typename B>
+		struct lua_type_of<basic_environment<B>> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<env_key_t> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<new_table> : std::integral_constant<type, type::table> { };
+
+		template <typename T>
+		struct lua_type_of<as_table_t<T>> : std::integral_constant<type, type::table> { };
+
+		template <typename T>
+		struct lua_type_of<std::initializer_list<T>> : std::integral_constant<type, type::table> { };
+
+		template <bool b>
+		struct lua_type_of<basic_reference<b>> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<stack_reference> : std::integral_constant<type, type::poly> { };
+
+		template <typename Base>
+		struct lua_type_of<basic_object<Base>> : std::integral_constant<type, type::poly> { };
+
+		template <typename... Args>
+		struct lua_type_of<std::tuple<Args...>> : std::integral_constant<type, type::poly> { };
+
+		template <typename A, typename B>
+		struct lua_type_of<std::pair<A, B>> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<void*> : std::integral_constant<type, type::lightuserdata> { };
+
+		template <>
+		struct lua_type_of<const void*> : std::integral_constant<type, type::lightuserdata> { };
+
+		template <>
+		struct lua_type_of<lightuserdata_value> : std::integral_constant<type, type::lightuserdata> { };
+
+		template <>
+		struct lua_type_of<userdata_value> : std::integral_constant<type, type::userdata> { };
+
+		template <typename T>
+		struct lua_type_of<light<T>> : std::integral_constant<type, type::lightuserdata> { };
+
+		template <typename T>
+		struct lua_type_of<user<T>> : std::integral_constant<type, type::userdata> { };
+
+		template <typename Base>
+		struct lua_type_of<basic_lightuserdata<Base>> : std::integral_constant<type, type::lightuserdata> { };
+
+		template <typename Base>
+		struct lua_type_of<basic_userdata<Base>> : std::integral_constant<type, type::userdata> { };
+
+		template <>
+		struct lua_type_of<lua_CFunction> : std::integral_constant<type, type::function> { };
+
+		template <>
+		struct lua_type_of<std::remove_pointer_t<lua_CFunction>> : std::integral_constant<type, type::function> { };
+
+		template <typename Base, bool aligned>
+		struct lua_type_of<basic_function<Base, aligned>> : std::integral_constant<type, type::function> { };
+
+		template <typename Base, bool aligned, typename Handler>
+		struct lua_type_of<basic_protected_function<Base, aligned, Handler>> : std::integral_constant<type, type::function> { };
+
+		template <typename Base>
+		struct lua_type_of<basic_coroutine<Base>> : std::integral_constant<type, type::function> { };
+
+		template <typename Base>
+		struct lua_type_of<basic_thread<Base>> : std::integral_constant<type, type::thread> { };
+
+		template <typename Signature>
+		struct lua_type_of<std::function<Signature>> : std::integral_constant<type, type::function> { };
+
+		template <typename T>
+		struct lua_type_of<optional<T>> : std::integral_constant<type, type::poly> { };
+
+		template <typename T>
+		struct lua_type_of<std::optional<T>> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<variadic_args> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<variadic_results> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<stack_count> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<this_state> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<this_main_state> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<this_environment> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<type> : std::integral_constant<type, type::poly> { };
+
+#if SOL_IS_ON(SOL_GET_FUNCTION_POINTER_UNSAFE_I_)
+		template <typename T>
+		struct lua_type_of<T*> : std::integral_constant<type, std::is_function_v<T> ? type::function : type::userdata> { };
+#else
+		template <typename T>
+		struct lua_type_of<T*> : std::integral_constant<type, type::userdata> { };
+#endif
+
+		template <typename T>
+		struct lua_type_of<T, std::enable_if_t<std::is_arithmetic_v<T> || std::is_same_v<T, lua_Number> || std::is_same_v<T, lua_Integer>>>
+		: std::integral_constant<type, type::number> { };
+
+		template <typename T>
+		struct lua_type_of<T, std::enable_if_t<std::is_function_v<T>>> : std::integral_constant<type, type::function> { };
+
+		template <typename T>
+		struct lua_type_of<T, std::enable_if_t<std::is_enum_v<T>>> : std::integral_constant<type, type::number> { };
+
+		template <>
+		struct lua_type_of<meta_function> : std::integral_constant<type, type::string> { };
+
+#if SOL_IS_ON(SOL_STD_VARIANT_I_)
+		template <typename... Tn>
+		struct lua_type_of<std::variant<Tn...>> : std::integral_constant<type, type::poly> { };
+#endif // std::variant deployment sucks on Clang
+
+		template <typename T>
+		struct lua_type_of<nested<T>> : meta::conditional_t<::sol::is_container_v<T>, std::integral_constant<type, type::table>, lua_type_of<T>> { };
+
+		template <typename C, C v, template <typename...> class V, typename... Args>
+		struct accumulate : std::integral_constant<C, v> { };
+
+		template <typename C, C v, template <typename...> class V, typename T, typename... Args>
+		struct accumulate<C, v, V, T, Args...> : accumulate<C, v + V<T>::value, V, Args...> { };
+
+		template <typename C, C v, template <typename...> class V, typename List>
+		struct accumulate_list;
+
+		template <typename C, C v, template <typename...> class V, typename... Args>
+		struct accumulate_list<C, v, V, types<Args...>> : accumulate<C, v, V, Args...> { };
+	} // namespace detail
+
+	template <typename T>
+	struct lua_type_of : detail::lua_type_of<T> {
+		typedef int SOL_INTERNAL_UNSPECIALIZED_MARKER_;
+	};
+
+	template <typename T>
+	inline constexpr type lua_type_of_v = lua_type_of<T>::value;
+
+	template <typename T>
+	struct lua_size : std::integral_constant<int, 1> {
+		typedef int SOL_INTERNAL_UNSPECIALIZED_MARKER_;
+	};
+
+	template <typename A, typename B>
+	struct lua_size<std::pair<A, B>> : std::integral_constant<int, lua_size<A>::value + lua_size<B>::value> { };
+
+	template <typename... Args>
+	struct lua_size<std::tuple<Args...>> : std::integral_constant<int, detail::accumulate<int, 0, lua_size, Args...>::value> { };
+
+	template <typename T>
+	inline constexpr int lua_size_v = lua_size<T>::value;
+
+	namespace detail {
+		template <typename...>
+		struct void_ {
+			typedef void type;
+		};
+		template <typename T, typename = void>
+		struct has_internal_marker_impl : std::false_type { };
+		template <typename T>
+		struct has_internal_marker_impl<T, typename void_<typename T::SOL_INTERNAL_UNSPECIALIZED_MARKER_>::type> : std::true_type { };
+
+		template <typename T>
+		using has_internal_marker = has_internal_marker_impl<T>;
+
+		template <typename T>
+		constexpr inline bool has_internal_marker_v = has_internal_marker<T>::value;
+	} // namespace detail
+
+	template <typename T>
+	struct is_lua_primitive
+	: std::integral_constant<bool,
+	       type::userdata
+	                 != lua_type_of_v<
+	                      T> || ((type::userdata == lua_type_of_v<T>)&&detail::has_internal_marker_v<lua_type_of<T>> && !detail::has_internal_marker_v<lua_size<T>>)
+	            || is_lua_reference_or_proxy_v<T> || meta::is_specialization_of_v<T, std::tuple> || meta::is_specialization_of_v<T, std::pair>> { };
+
+	template <typename T>
+	constexpr inline bool is_lua_primitive_v = is_lua_primitive<T>::value;
+
+	template <typename T>
+	struct is_main_threaded : std::is_base_of<main_reference, T> { };
+
+	template <typename T>
+	struct is_stack_based : std::is_base_of<stack_reference, T> { };
+	template <>
+	struct is_stack_based<variadic_args> : std::true_type { };
+	template <>
+	struct is_stack_based<unsafe_function_result> : std::true_type { };
+	template <>
+	struct is_stack_based<protected_function_result> : std::true_type { };
+	template <>
+	struct is_stack_based<stack_proxy> : std::true_type { };
+	template <>
+	struct is_stack_based<stack_proxy_base> : std::true_type { };
+	template <>
+	struct is_stack_based<stack_count> : std::true_type { };
+
+	template <typename T>
+	constexpr inline bool is_stack_based_v = is_stack_based<T>::value;
+
+	template <typename T>
+	struct is_lua_primitive<T*> : std::true_type { };
+	template <>
+	struct is_lua_primitive<unsafe_function_result> : std::true_type { };
+	template <>
+	struct is_lua_primitive<protected_function_result> : std::true_type { };
+	template <typename T>
+	struct is_lua_primitive<std::reference_wrapper<T>> : std::true_type { };
+	template <typename T>
+	struct is_lua_primitive<user<T>> : std::true_type { };
+	template <typename T>
+	struct is_lua_primitive<light<T>> : is_lua_primitive<T*> { };
+	template <typename T>
+	struct is_lua_primitive<optional<T>> : std::true_type { };
+	template <typename T>
+	struct is_lua_primitive<std::optional<T>> : std::true_type { };
+	template <typename T>
+	struct is_lua_primitive<as_table_t<T>> : std::true_type { };
+	template <typename T>
+	struct is_lua_primitive<nested<T>> : std::true_type { };
+	template <>
+	struct is_lua_primitive<userdata_value> : std::true_type { };
+	template <>
+	struct is_lua_primitive<lightuserdata_value> : std::true_type { };
+	template <>
+	struct is_lua_primitive<stack_proxy> : std::true_type { };
+	template <>
+	struct is_lua_primitive<stack_proxy_base> : std::true_type { };
+	template <typename T>
+	struct is_lua_primitive<non_null<T>> : is_lua_primitive<T*> { };
+
+	template <typename T>
+	struct is_lua_index : std::is_integral<T> { };
+	template <>
+	struct is_lua_index<raw_index> : std::true_type { };
+	template <>
+	struct is_lua_index<absolute_index> : std::true_type { };
+	template <>
+	struct is_lua_index<ref_index> : std::true_type { };
+	template <>
+	struct is_lua_index<upvalue_index> : std::true_type { };
+
+	template <typename Signature>
+	struct lua_bind_traits : meta::bind_traits<Signature> {
+	private:
+		typedef meta::bind_traits<Signature> base_t;
+
+	public:
+		typedef std::integral_constant<bool, meta::count_for<is_variadic_arguments, typename base_t::args_list>::value != 0> runtime_variadics_t;
+		static const std::size_t true_arity = base_t::arity;
+		static const std::size_t arity = detail::accumulate_list<std::size_t, 0, lua_size, typename base_t::args_list>::value
+		     - meta::count_for<is_transparent_argument, typename base_t::args_list>::value;
+		static const std::size_t true_free_arity = base_t::free_arity;
+		static const std::size_t free_arity = detail::accumulate_list<std::size_t, 0, lua_size, typename base_t::free_args_list>::value
+		     - meta::count_for<is_transparent_argument, typename base_t::args_list>::value;
+	};
+
+	template <typename T>
+	struct is_table : std::false_type { };
+	template <bool x, typename T>
+	struct is_table<basic_table_core<x, T>> : std::true_type { };
+	template <typename T>
+	struct is_table<basic_lua_table<T>> : std::true_type { };
+
+	template <typename T>
+	inline constexpr bool is_table_v = is_table<T>::value;
+
+	template <typename T>
+	struct is_stack_table : std::false_type { };
+	template <bool x, typename T>
+	struct is_stack_table<basic_table_core<x, T>> : std::integral_constant<bool, std::is_base_of_v<stack_reference, T>> { };
+	template <typename T>
+	struct is_stack_table<basic_lua_table<T>> : std::integral_constant<bool, std::is_base_of_v<stack_reference, T>> { };
+
+	template <typename T>
+	inline constexpr bool is_stack_table_v = is_stack_table<T>::value;
+
+	template <typename T>
+	struct is_function : std::false_type { };
+	template <typename T, bool aligned>
+	struct is_function<basic_function<T, aligned>> : std::true_type { };
+	template <typename T, bool aligned, typename Handler>
+	struct is_function<basic_protected_function<T, aligned, Handler>> : std::true_type { };
+
+	template <typename T>
+	using is_lightuserdata = meta::is_specialization_of<T, basic_lightuserdata>;
+
+	template <typename T>
+	inline constexpr bool is_lightuserdata_v = is_lightuserdata<T>::value;
+
+	template <typename T>
+	using is_userdata = meta::is_specialization_of<T, basic_userdata>;
+
+	template <typename T>
+	inline constexpr bool is_userdata_v = is_userdata<T>::value;
+
+	template <typename T>
+	using is_environment = std::integral_constant<bool, is_userdata_v<T> || is_table_v<T> || meta::is_specialization_of_v<T, basic_environment>>;
+
+	template <typename T>
+	inline constexpr bool is_environment_v = is_environment<T>::value;
+
+	template <typename T>
+	using is_table_like = std::integral_constant<bool, is_table_v<T> || is_environment_v<T> || is_userdata_v<T>>;
+
+	template <typename T>
+	inline constexpr bool is_table_like_v = is_table_like<T>::value;
+
+	template <typename T>
+	struct is_automagical
+	: std::integral_constant<bool,
+	       (SOL_IS_ON(SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_))
+	            || (std::is_array_v<
+	                     meta::unqualified_t<T>> || (!std::is_same_v<meta::unqualified_t<T>, state> && !std::is_same_v<meta::unqualified_t<T>, state_view>))> {
+	};
+
+	template <typename T>
+	inline type type_of() {
+		return lua_type_of<meta::unqualified_t<T>>::value;
+	}
+
+	namespace detail {
+		template <typename T>
+		struct is_non_factory_constructor : std::false_type { };
+
+		template <typename... Args>
+		struct is_non_factory_constructor<constructors<Args...>> : std::true_type { };
+
+		template <typename... Args>
+		struct is_non_factory_constructor<constructor_wrapper<Args...>> : std::true_type { };
+
+		template <>
+		struct is_non_factory_constructor<no_construction> : std::true_type { };
+
+		template <typename T>
+		inline constexpr bool is_non_factory_constructor_v = is_non_factory_constructor<T>::value;
+
+		template <typename T>
+		struct is_constructor : is_non_factory_constructor<T> { };
+
+		template <typename... Args>
+		struct is_constructor<factory_wrapper<Args...>> : std::true_type { };
+
+		template <typename T>
+		struct is_constructor<protect_t<T>> : is_constructor<meta::unqualified_t<T>> { };
+
+		template <typename F, typename... Policies>
+		struct is_constructor<policy_wrapper<F, Policies...>> : is_constructor<meta::unqualified_t<F>> { };
+
+		template <typename T>
+		inline constexpr bool is_constructor_v = is_constructor<T>::value;
+
+		template <typename... Args>
+		using any_is_constructor = meta::any<is_constructor<meta::unqualified_t<Args>>...>;
+
+		template <typename... Args>
+		inline constexpr bool any_is_constructor_v = any_is_constructor<Args...>::value;
+
+		template <typename T>
+		struct is_destructor : std::false_type { };
+
+		template <typename Fx>
+		struct is_destructor<destructor_wrapper<Fx>> : std::true_type { };
+
+		template <typename... Args>
+		using any_is_destructor = meta::any<is_destructor<meta::unqualified_t<Args>>...>;
+
+		template <typename... Args>
+		inline constexpr bool any_is_destructor_v = any_is_destructor<Args...>::value;
+	} // namespace detail
+
+	template <typename T>
+	using is_lua_c_function = meta::any<std::is_same<lua_CFunction, T>, std::is_same<detail::lua_CFunction_noexcept, T>, std::is_same<lua_CFunction_ref, T>>;
+
+	template <typename T>
+	inline constexpr bool is_lua_c_function_v = is_lua_c_function<T>::value;
+
+	struct automagic_enrollments {
+		bool default_constructor = true;
+		bool destructor = true;
+		bool pairs_operator = true;
+		bool to_string_operator = true;
+		bool call_operator = true;
+		bool less_than_operator = true;
+		bool less_than_or_equal_to_operator = true;
+		bool length_operator = true;
+		bool equal_to_operator = true;
+	};
+
+} // namespace sol
+
+// end of sol/types.hpp
+
+#include <exception>
+#include <cstring>
+
+#if SOL_IS_ON(SOL_PRINT_ERRORS_I_)
+#include <iostream>
+#endif
+
+namespace sol {
+	// must push a single object to be the error object
+	// NOTE: the VAST MAJORITY of all Lua libraries -- C or otherwise -- expect a string for the type of error
+	// break this convention at your own risk
+	using exception_handler_function = int (*)(lua_State*, optional<const std::exception&>, string_view);
+
+	namespace detail {
+		inline const char (&default_exception_handler_name())[11] {
+			static const char name[11] = "sol.\xE2\x98\xA2\xE2\x98\xA2";
+			return name;
+		}
+
+		// must push at least 1 object on the stack
+		inline int default_exception_handler(lua_State* L, optional<const std::exception&>, string_view what) {
+#if SOL_IS_ON(SOL_PRINT_ERRORS_I_)
+			std::cerr << "[sol3] An exception occurred: ";
+			std::cerr.write(what.data(), what.size());
+			std::cerr << std::endl;
+#endif
+			lua_pushlstring(L, what.data(), what.size());
+			return 1;
+		}
+
+		inline int call_exception_handler(lua_State* L, optional<const std::exception&> maybe_ex, string_view what) {
+			lua_getglobal(L, default_exception_handler_name());
+			type t = static_cast<type>(lua_type(L, -1));
+			if (t != type::lightuserdata) {
+				lua_pop(L, 1);
+				return default_exception_handler(L, std::move(maybe_ex), std::move(what));
+			}
+			void* vfunc = lua_touserdata(L, -1);
+			lua_pop(L, 1);
+			if (vfunc == nullptr) {
+				return default_exception_handler(L, std::move(maybe_ex), std::move(what));
+			}
+			exception_handler_function exfunc = reinterpret_cast<exception_handler_function>(vfunc);
+			return exfunc(L, std::move(maybe_ex), std::move(what));
+		}
+
+#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
+		template <lua_CFunction f>
+		int static_trampoline(lua_State* L) noexcept {
+			return f(L);
+		}
+
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_)
+		template <lua_CFunction_noexcept f>
+		int static_trampoline_noexcept(lua_State* L) noexcept {
+			return f(L);
+		}
+#else
+		template <lua_CFunction f>
+		int static_trampoline_noexcept(lua_State* L) noexcept {
+			return f(L);
+		}
+#endif
+
+		template <typename Fx, typename... Args>
+		int trampoline(lua_State* L, Fx&& f, Args&&... args) noexcept {
+			return f(L, std::forward<Args>(args)...);
+		}
+
+		inline int c_trampoline(lua_State* L, lua_CFunction f) noexcept {
+			return trampoline(L, f);
+		}
+#else
+
+		inline int lua_cfunction_trampoline(lua_State* L, lua_CFunction f) {
+#if SOL_IS_ON(SOL_PROPAGATE_EXCEPTIONS_I_)
+			return f(L);
+
+#else
+			try {
+				return f(L);
+			}
+			catch (const char* cs) {
+				call_exception_handler(L, optional<const std::exception&>(nullopt), string_view(cs));
+			}
+			catch (const std::string& s) {
+				call_exception_handler(L, optional<const std::exception&>(nullopt), string_view(s.c_str(), s.size()));
+			}
+			catch (const std::exception& e) {
+				call_exception_handler(L, optional<const std::exception&>(e), e.what());
+			}
+#if SOL_IS_OFF(SOL_USE_LUAJIT_I_)
+			// LuaJIT cannot have the catchall when the safe propagation is on
+			// but LuaJIT will swallow all C++ errors
+			// if we don't at least catch std::exception ones
+			catch (...) {
+				call_exception_handler(L, optional<const std::exception&>(nullopt), "caught (...) exception");
+			}
+#endif // LuaJIT cannot have the catchall, but we must catch std::exceps for it
+			return lua_error(L);
+#endif // Safe exceptions
+		}
+
+		template <lua_CFunction f>
+		int static_trampoline(lua_State* L) {
+			return lua_cfunction_trampoline(L, f);
+		}
+
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_)
+		template <lua_CFunction_noexcept f>
+		int static_trampoline_noexcept(lua_State* L) noexcept {
+			return f(L);
+		}
+#else
+		template <lua_CFunction f>
+		int static_trampoline_noexcept(lua_State* L) noexcept {
+			return f(L);
+		}
+#endif
+
+		template <typename Fx, typename... Args>
+		int trampoline(lua_State* L, Fx&& f, Args&&... args) {
+			if constexpr (meta::bind_traits<meta::unqualified_t<Fx>>::is_noexcept) {
+				return f(L, std::forward<Args>(args)...);
+			}
+			else {
+#if SOL_IS_ON(SOL_PROPAGATE_EXCEPTIONS_I_)
+				return f(L, std::forward<Args>(args)...);
+#else
+				try {
+					return f(L, std::forward<Args>(args)...);
+				}
+				catch (const char* cs) {
+					call_exception_handler(L, optional<const std::exception&>(nullopt), string_view(cs));
+				}
+				catch (const std::string& s) {
+					call_exception_handler(L, optional<const std::exception&>(nullopt), string_view(s.c_str(), s.size()));
+				}
+				catch (const std::exception& e) {
+					call_exception_handler(L, optional<const std::exception&>(e), e.what());
+				}
+#if SOL_IS_OFF(SOL_USE_LUAJIT_I_)
+				// LuaJIT cannot have the catchall when the safe propagation is on
+				// but LuaJIT will swallow all C++ errors
+				// if we don't at least catch std::exception ones
+				catch (...) {
+					call_exception_handler(L, optional<const std::exception&>(nullopt), "caught (...) exception");
+				}
+#endif
+				return lua_error(L);
+#endif
+			}
+		}
+
+		inline int c_trampoline(lua_State* L, lua_CFunction f) {
+			return trampoline(L, f);
+		}
+#endif // Exceptions vs. No Exceptions
+
+		template <typename F, F fx>
+		inline int typed_static_trampoline(lua_State* L) {
+			if constexpr (meta::bind_traits<F>::is_noexcept) {
+				return static_trampoline_noexcept<fx>(L);
+			}
+			else {
+				return static_trampoline<fx>(L);
+			}
+		}
+	} // namespace detail
+
+	inline void set_default_exception_handler(lua_State* L, exception_handler_function exf = &detail::default_exception_handler) {
+		static_assert(sizeof(void*) >= sizeof(exception_handler_function),
+		     "void* storage is too small to transport the exception handler: please file a bug on the sol2 issue tracker to get this looked at!");
+		void* storage;
+		std::memcpy(&storage, &exf, sizeof(exception_handler_function));
+		lua_pushlightuserdata(L, storage);
+		lua_setglobal(L, detail::default_exception_handler_name());
+	}
+} // namespace sol
+
+// end of sol/trampoline.hpp
+
+// beginning of sol/stack_core.hpp
+
+// beginning of sol/inheritance.hpp
+
+// beginning of sol/usertype_traits.hpp
+
+// beginning of sol/demangle.hpp
+
+#include <string>
+#include <array>
+#include <cctype>
+#if SOL_IS_ON(SOL_MINGW_CCTYPE_IS_POISONED_I_)
+extern "C" {
+#include <ctype.h>
+}
+#endif // MinGW is on some stuff
+#include <locale>
+
+namespace sol { namespace detail {
+	inline constexpr std::array<string_view, 9> removals { { "{anonymous}",
+		"(anonymous namespace)",
+		"public:",
+		"private:",
+		"protected:",
+		"struct ",
+		"class ",
+		"`anonymous-namespace'",
+		"`anonymous namespace'" } };
+
+#if SOL_IS_ON(SOL_COMPILER_GCC_I_) || SOL_IS_ON(SOL_COMPILER_CLANG_I_)
+	inline std::string ctti_get_type_name_from_sig(std::string name) {
+		// cardinal sins from MINGW
+		using namespace std;
+		std::size_t start = name.find_first_of('[');
+		start = name.find_first_of('=', start);
+		std::size_t end = name.find_last_of(']');
+		if (end == std::string::npos)
+			end = name.size();
+		if (start == std::string::npos)
+			start = 0;
+		if (start < name.size() - 1)
+			start += 1;
+		name = name.substr(start, end - start);
+		start = name.rfind("seperator_mark");
+		if (start != std::string::npos) {
+			name.erase(start - 2, name.length());
+		}
+		while (!name.empty() && isblank(name.front()))
+			name.erase(name.begin());
+		while (!name.empty() && isblank(name.back()))
+			name.pop_back();
+
+		for (std::size_t r = 0; r < removals.size(); ++r) {
+			auto found = name.find(removals[r]);
+			while (found != std::string::npos) {
+				name.erase(found, removals[r].size());
+				found = name.find(removals[r]);
+			}
+		}
+
+		return name;
+	}
+
+	template <typename T, class seperator_mark = int>
+	inline std::string ctti_get_type_name() {
+		return ctti_get_type_name_from_sig(__PRETTY_FUNCTION__);
+	}
+#elif SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+	inline std::string ctti_get_type_name_from_sig(std::string name) {
+		std::size_t start = name.find("get_type_name");
+		if (start == std::string::npos)
+			start = 0;
+		else
+			start += 13;
+		if (start < name.size() - 1)
+			start += 1;
+		std::size_t end = name.find_last_of('>');
+		if (end == std::string::npos)
+			end = name.size();
+		name = name.substr(start, end - start);
+		if (name.find("struct", 0) == 0)
+			name.replace(0, 6, "", 0);
+		if (name.find("class", 0) == 0)
+			name.replace(0, 5, "", 0);
+		while (!name.empty() && isblank(name.front()))
+			name.erase(name.begin());
+		while (!name.empty() && isblank(name.back()))
+			name.pop_back();
+
+		for (std::size_t r = 0; r < removals.size(); ++r) {
+			auto found = name.find(removals[r]);
+			while (found != std::string::npos) {
+				name.erase(found, removals[r].size());
+				found = name.find(removals[r]);
+			}
+		}
+
+		return name;
+	}
+
+	template <typename T>
+	std::string ctti_get_type_name() {
+		return ctti_get_type_name_from_sig(__FUNCSIG__);
+	}
+#else
+#error Compiler not supported for demangling
+#endif // compilers
+
+	template <typename T>
+	std::string demangle_once() {
+		std::string realname = ctti_get_type_name<T>();
+		return realname;
+	}
+
+	inline std::string short_demangle_from_type_name(std::string realname) {
+		// This isn't the most complete but it'll do for now...?
+		static const std::array<std::string, 10> ops = {
+			{ "operator<", "operator<<", "operator<<=", "operator<=", "operator>", "operator>>", "operator>>=", "operator>=", "operator->", "operator->*" }
+		};
+		int level = 0;
+		std::ptrdiff_t idx = 0;
+		for (idx = static_cast<std::ptrdiff_t>(realname.empty() ? 0 : realname.size() - 1); idx > 0; --idx) {
+			if (level == 0 && realname[idx] == ':') {
+				break;
+			}
+			bool isleft = realname[idx] == '<';
+			bool isright = realname[idx] == '>';
+			if (!isleft && !isright)
+				continue;
+			bool earlybreak = false;
+			for (const auto& op : ops) {
+				std::size_t nisop = realname.rfind(op, idx);
+				if (nisop == std::string::npos)
+					continue;
+				std::size_t nisopidx = idx - op.size() + 1;
+				if (nisop == nisopidx) {
+					idx = static_cast<std::ptrdiff_t>(nisopidx);
+					earlybreak = true;
+				}
+				break;
+			}
+			if (earlybreak) {
+				continue;
+			}
+			level += isleft ? -1 : 1;
+		}
+		if (idx > 0) {
+			realname.erase(0, realname.length() < static_cast<std::size_t>(idx) ? realname.length() : idx + 1);
+		}
+		return realname;
+	}
+
+	template <typename T>
+	std::string short_demangle_once() {
+		std::string realname = ctti_get_type_name<T>();
+		return short_demangle_from_type_name(realname);
+	}
+
+	template <typename T>
+	const std::string& demangle() {
+		static const std::string d = demangle_once<T>();
+		return d;
+	}
+
+	template <typename T>
+	const std::string& short_demangle() {
+		static const std::string d = short_demangle_once<T>();
+		return d;
+	}
+}} // namespace sol::detail
+
+// end of sol/demangle.hpp
+
+namespace sol {
+
+	template <typename T>
+	struct usertype_traits {
+		static const std::string& name() {
+			static const std::string& n = detail::short_demangle<T>();
+			return n;
+		}
+		static const std::string& qualified_name() {
+			static const std::string& q_n = detail::demangle<T>();
+			return q_n;
+		}
+		static const std::string& metatable() {
+			static const std::string m = std::string("sol.").append(detail::demangle<T>());
+			return m;
+		}
+		static const std::string& user_metatable() {
+			static const std::string u_m = std::string("sol.").append(detail::demangle<T>()).append(".user");
+			return u_m;
+		}
+		static const std::string& user_gc_metatable() {
+			static const std::string u_g_m = std::string("sol.").append(detail::demangle<T>()).append(".user\xE2\x99\xBB");
+			return u_g_m;
+		}
+		static const std::string& gc_table() {
+			static const std::string g_t = std::string("sol.").append(detail::demangle<T>()).append(".\xE2\x99\xBB");
+			return g_t;
+		}
+	};
+
+} // namespace sol
+
+// end of sol/usertype_traits.hpp
+
+// beginning of sol/unique_usertype_traits.hpp
+
+#include <memory>
+
+namespace sol {
+
+	template <typename T>
+	struct unique_usertype_traits {
+		typedef T type;
+		typedef T actual_type;
+		template <typename X>
+		using rebind_base = void;
+
+		static const bool value = false;
+
+		template <typename U>
+		static bool is_null(U&&) {
+			return false;
+		}
+
+		template <typename U>
+		static auto get(U&& value) {
+			return std::addressof(detail::deref(value));
+		}
+	};
+
+	template <typename T>
+	struct unique_usertype_traits<std::shared_ptr<T>> {
+		typedef T type;
+		typedef std::shared_ptr<T> actual_type;
+		// rebind is non-void
+		// if and only if unique usertype
+		// is cast-capable
+		template <typename X>
+		using rebind_base = std::shared_ptr<X>;
+
+		static const bool value = true;
+
+		static bool is_null(const actual_type& p) {
+			return p == nullptr;
+		}
+
+		static type* get(const actual_type& p) {
+			return p.get();
+		}
+	};
+
+	template <typename T, typename D>
+	struct unique_usertype_traits<std::unique_ptr<T, D>> {
+		using type = T;
+		using actual_type = std::unique_ptr<T, D>;
+
+		static const bool value = true;
+
+		static bool is_null(const actual_type& p) {
+			return p == nullptr;
+		}
+
+		static type* get(const actual_type& p) {
+			return p.get();
+		}
+	};
+
+	template <typename T>
+	struct is_unique_usertype : std::integral_constant<bool, unique_usertype_traits<T>::value> {};
+
+	template <typename T>
+	inline constexpr bool is_unique_usertype_v = is_unique_usertype<T>::value;
+
+	namespace detail {
+		template <typename T, typename Rebind = void>
+		using is_base_rebindable_test = typename T::template rebind_base<Rebind>;
+	}
+
+	template <typename T>
+	using is_base_rebindable = meta::is_detected<detail::is_base_rebindable_test, T>;
+
+	template <typename T>
+	inline constexpr bool is_base_rebindable_v = is_base_rebindable<T>::value;
+
+	namespace detail {
+		template <typename T, typename = void>
+		struct is_base_rebindable_non_void_sfinae : std::false_type {};
+
+		template <typename T>
+		struct is_base_rebindable_non_void_sfinae<T, std::enable_if_t<is_base_rebindable_v<T>>>
+		: std::integral_constant<bool, !std::is_void_v<typename T::template rebind_base<void>>> {};
+	} // namespace detail
+
+	template <typename T>
+	using is_base_rebindable_non_void = meta::is_detected<detail::is_base_rebindable_test, T>;
+
+	template <typename T>
+	inline constexpr bool is_base_rebindable_non_void_v = is_base_rebindable_non_void<T>::value;
+
+} // namespace sol
+
+// end of sol/unique_usertype_traits.hpp
+
+namespace sol {
+	template <typename... Args>
+	struct base_list {};
+	template <typename... Args>
+	using bases = base_list<Args...>;
+
+	typedef bases<> base_classes_tag;
+	const auto base_classes = base_classes_tag();
+
+	template <typename... Args>
+	struct is_to_stringable<base_list<Args...>> : std::false_type {};
+
+	namespace detail {
+
+		inline decltype(auto) base_class_check_key() {
+			static const auto& key = "class_check";
+			return key;
+		}
+
+		inline decltype(auto) base_class_cast_key() {
+			static const auto& key = "class_cast";
+			return key;
+		}
+
+		inline decltype(auto) base_class_index_propogation_key() {
+			static const auto& key = u8"\xF0\x9F\x8C\xB2.index";
+			return key;
+		}
+
+		inline decltype(auto) base_class_new_index_propogation_key() {
+			static const auto& key = u8"\xF0\x9F\x8C\xB2.new_index";
+			return key;
+		}
+
+		template <typename T>
+		struct inheritance {
+			typedef typename base<T>::type bases_t;
+
+			static bool type_check_bases(types<>, const string_view&) {
+				return false;
+			}
+
+			template <typename Base, typename... Args>
+			static bool type_check_bases(types<Base, Args...>, const string_view& ti) {
+				return ti == usertype_traits<Base>::qualified_name() || type_check_bases(types<Args...>(), ti);
+			}
+
+			static bool type_check(const string_view& ti) {
+				return ti == usertype_traits<T>::qualified_name() || type_check_bases(bases_t(), ti);
+			}
+
+			template <typename ...Bases>
+			static bool type_check_with(const string_view& ti) {
+				return ti == usertype_traits<T>::qualified_name() || type_check_bases(types<Bases...>(), ti);
+			}
+
+			static void* type_cast_bases(types<>, T*, const string_view&) {
+				return nullptr;
+			}
+
+			template <typename Base, typename... Args>
+			static void* type_cast_bases(types<Base, Args...>, T* data, const string_view& ti) {
+				// Make sure to convert to T first, and then dynamic cast to the proper type
+				return ti != usertype_traits<Base>::qualified_name() ? type_cast_bases(types<Args...>(), data, ti) : static_cast<void*>(static_cast<Base*>(data));
+			}
+
+			static void* type_cast(void* voiddata, const string_view& ti) {
+				T* data = static_cast<T*>(voiddata);
+				return static_cast<void*>(ti != usertype_traits<T>::qualified_name() ? type_cast_bases(bases_t(), data, ti) : data);
+			}
+
+			template <typename... Bases>
+			static void* type_cast_with(void* voiddata, const string_view& ti) {
+				T* data = static_cast<T*>(voiddata);
+				return static_cast<void*>(ti != usertype_traits<T>::qualified_name() ? type_cast_bases(types<Bases...>(), data, ti) : data);
+			}
+
+			template <typename U>
+			static bool type_unique_cast_bases(types<>, void*, void*, const string_view&) {
+				return 0;
+			}
+
+			template <typename U, typename Base, typename... Args>
+			static int type_unique_cast_bases(types<Base, Args...>, void* source_data, void* target_data, const string_view& ti) {
+				using uu_traits = unique_usertype_traits<U>;
+				using base_ptr = typename uu_traits::template rebind_base<Base>;
+				string_view base_ti = usertype_traits<Base>::qualified_name();
+				if (base_ti == ti) {
+					if (target_data != nullptr) {
+						U* source = static_cast<U*>(source_data);
+						base_ptr* target = static_cast<base_ptr*>(target_data);
+						// perform proper derived -> base conversion
+						*target = *source;
+					}
+					return 2;
+				}
+				return type_unique_cast_bases<U>(types<Args...>(), source_data, target_data, ti);
+			}
+
+			template <typename U>
+			static int type_unique_cast(void* source_data, void* target_data, const string_view& ti, const string_view& rebind_ti) {
+				typedef unique_usertype_traits<U> uu_traits;
+				if constexpr (is_base_rebindable_v<uu_traits>) {
+					typedef typename uu_traits::template rebind_base<void> rebind_t;
+					typedef meta::conditional_t<std::is_void<rebind_t>::value, types<>, bases_t> cond_bases_t;
+					string_view this_rebind_ti = usertype_traits<rebind_t>::qualified_name();
+					if (rebind_ti != this_rebind_ti) {
+						// this is not even of the same unique type
+						return 0;
+					}
+					string_view this_ti = usertype_traits<T>::qualified_name();
+					if (ti == this_ti) {
+						// direct match, return 1
+						return 1;
+					}
+					return type_unique_cast_bases<U>(cond_bases_t(), source_data, target_data, ti);
+				}
+				else {
+					(void)rebind_ti;
+					string_view this_ti = usertype_traits<T>::qualified_name();
+					if (ti == this_ti) {
+						// direct match, return 1
+						return 1;
+					}
+					return type_unique_cast_bases<U>(types<>(), source_data, target_data, ti);
+				}
+			}
+
+			template <typename U, typename... Bases>
+			static int type_unique_cast_with(void* source_data, void* target_data, const string_view& ti, const string_view& rebind_ti) {
+				using uc_bases_t = types<Bases...>;
+				typedef unique_usertype_traits<U> uu_traits;
+				if constexpr (is_base_rebindable_v<uu_traits>) {
+					using rebind_t = typename uu_traits::template rebind_base<void>;
+					using cond_bases_t = meta::conditional_t<std::is_void<rebind_t>::value, types<>, uc_bases_t>;
+					string_view this_rebind_ti = usertype_traits<rebind_t>::qualified_name();
+					if (rebind_ti != this_rebind_ti) {
+						// this is not even of the same unique type
+						return 0;
+					}
+					string_view this_ti = usertype_traits<T>::qualified_name();
+					if (ti == this_ti) {
+						// direct match, return 1
+						return 1;
+					}
+					return type_unique_cast_bases<U>(cond_bases_t(), source_data, target_data, ti);
+				}
+				else {
+					(void)rebind_ti;
+					string_view this_ti = usertype_traits<T>::qualified_name();
+					if (ti == this_ti) {
+						// direct match, return 1
+						return 1;
+					}
+					return type_unique_cast_bases<U>(types<>(), source_data, target_data, ti);
+				}
+			}
+		};
+
+		using inheritance_check_function = decltype(&inheritance<void>::type_check);
+		using inheritance_cast_function = decltype(&inheritance<void>::type_cast);
+		using inheritance_unique_cast_function = decltype(&inheritance<void>::type_unique_cast<void>);
+	} // namespace detail
+} // namespace sol
+
+// end of sol/inheritance.hpp
+
+// beginning of sol/error_handler.hpp
+
+#include <cstdio>
+
+namespace sol {
+
+	namespace detail {
+		constexpr const char* not_a_number = "not a numeric type";
+		constexpr const char* not_a_number_or_number_string = "not a numeric type or numeric string";
+		constexpr const char* not_a_number_integral = "not a numeric type that fits exactly an integer (number maybe has significant decimals)";
+		constexpr const char* not_a_number_or_number_string_integral
+		     = "not a numeric type or a numeric string that fits exactly an integer (e.g. number maybe has significant decimals)";
+
+		constexpr const char* not_enough_stack_space = "not enough space left on Lua stack";
+		constexpr const char* not_enough_stack_space_floating = "not enough space left on Lua stack for a floating point number";
+		constexpr const char* not_enough_stack_space_integral = "not enough space left on Lua stack for an integral number";
+		constexpr const char* not_enough_stack_space_string = "not enough space left on Lua stack for a string";
+		constexpr const char* not_enough_stack_space_meta_function_name = "not enough space left on Lua stack for the name of a meta_function";
+		constexpr const char* not_enough_stack_space_userdata = "not enough space left on Lua stack to create a sol3 userdata";
+		constexpr const char* not_enough_stack_space_generic = "not enough space left on Lua stack to push valuees";
+		constexpr const char* not_enough_stack_space_environment = "not enough space left on Lua stack to retrieve environment";
+		constexpr const char* protected_function_error = "caught (...) unknown error during protected_function call";
+
+		inline void accumulate_and_mark(const std::string& n, std::string& aux_message, int& marker) {
+			if (marker > 0) {
+				aux_message += ", ";
+			}
+			aux_message += n;
+			++marker;
+		}
+	} // namespace detail
+
+	inline std::string associated_type_name(lua_State* L, int index, type t) {
+		switch (t) {
+		case type::poly:
+			return "anything";
+		case type::userdata: {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 2, "not enough space to push get the type name");
+#endif // make sure stack doesn't overflow
+			if (lua_getmetatable(L, index) == 0) {
+				break;
+			}
+			lua_pushlstring(L, "__name", 6);
+			lua_rawget(L, -2);
+			size_t sz;
+			const char* name = lua_tolstring(L, -1, &sz);
+			std::string tn(name, static_cast<std::string::size_type>(sz));
+			lua_pop(L, 2);
+			return tn;
+		}
+		default:
+			break;
+		}
+		return lua_typename(L, static_cast<int>(t));
+	}
+
+	inline int push_type_panic_string(lua_State* L, int index, type expected, type actual, string_view message, string_view aux_message) noexcept {
+		const char* err = message.size() == 0
+		     ? (aux_message.size() == 0 ? "stack index %d, expected %s, received %s" : "stack index %d, expected %s, received %s: %s")
+		     : "stack index %d, expected %s, received %s: %s %s";
+		const char* type_name = expected == type::poly ? "anything" : lua_typename(L, static_cast<int>(expected));
+		{
+			std::string actual_name = associated_type_name(L, index, actual);
+			lua_pushfstring(L, err, index, type_name, actual_name.c_str(), message.data(), aux_message.data());
+		}
+		return 1;
+	}
+
+	inline int type_panic_string(lua_State* L, int index, type expected, type actual, string_view message = "") noexcept(false) {
+		push_type_panic_string(L, index, expected, actual, message, "");
+		return lua_error(L);
+	}
+
+	inline int type_panic_c_str(lua_State* L, int index, type expected, type actual, const char* message = nullptr) noexcept(false) {
+		push_type_panic_string(L, index, expected, actual, message == nullptr ? "" : message, "");
+		return lua_error(L);
+	}
+
+	struct type_panic_t {
+		int operator()(lua_State* L, int index, type expected, type actual) const noexcept(false) {
+			return type_panic_c_str(L, index, expected, actual, nullptr);
+		}
+		int operator()(lua_State* L, int index, type expected, type actual, string_view message) const noexcept(false) {
+			return type_panic_c_str(L, index, expected, actual, message.data());
+		}
+	};
+
+	const type_panic_t type_panic = {};
+
+	struct constructor_handler {
+		int operator()(lua_State* L, int index, type expected, type actual, string_view message) const noexcept(false) {
+			push_type_panic_string(L, index, expected, actual, message, "(type check failed in constructor)");
+			return lua_error(L);
+		}
+	};
+
+	template <typename F = void>
+	struct argument_handler {
+		int operator()(lua_State* L, int index, type expected, type actual, string_view message) const noexcept(false) {
+			push_type_panic_string(L, index, expected, actual, message, "(bad argument to variable or function call)");
+			return lua_error(L);
+		}
+	};
+
+	template <typename R, typename... Args>
+	struct argument_handler<types<R, Args...>> {
+		int operator()(lua_State* L, int index, type expected, type actual, string_view message) const noexcept(false) {
+			{
+				std::string aux_message = "(bad argument into '";
+				aux_message += detail::demangle<R>();
+				aux_message += "(";
+				int marker = 0;
+				(void)detail::swallow { int(), (detail::accumulate_and_mark(detail::demangle<Args>(), aux_message, marker), int())... };
+				aux_message += ")')";
+				push_type_panic_string(L, index, expected, actual, message, aux_message);
+			}
+			return lua_error(L);
+		}
+	};
+
+	// Specify this function as the handler for lua::check if you know there's nothing wrong
+	inline int no_panic(lua_State*, int, type, type, const char* = nullptr) noexcept {
+		return 0;
+	}
+
+	inline void type_error(lua_State* L, int expected, int actual) noexcept(false) {
+		luaL_error(L, "expected %s, received %s", lua_typename(L, expected), lua_typename(L, actual));
+	}
+
+	inline void type_error(lua_State* L, type expected, type actual) noexcept(false) {
+		type_error(L, static_cast<int>(expected), static_cast<int>(actual));
+	}
+
+	inline void type_assert(lua_State* L, int index, type expected, type actual) noexcept(false) {
+		if (expected != type::poly && expected != actual) {
+			type_panic_c_str(L, index, expected, actual, nullptr);
+		}
+	}
+
+	inline void type_assert(lua_State* L, int index, type expected) {
+		type actual = type_of(L, index);
+		type_assert(L, index, expected, actual);
+	}
+
+} // namespace sol
+
+// end of sol/error_handler.hpp
+
+// beginning of sol/reference.hpp
+
+// beginning of sol/stack_reference.hpp
+
+namespace sol {
+	namespace detail {
+		inline bool xmovable(lua_State* leftL, lua_State* rightL) {
+			if (rightL == nullptr || leftL == nullptr || leftL == rightL) {
+				return false;
+			}
+			const void* leftregistry = lua_topointer(leftL, LUA_REGISTRYINDEX);
+			const void* rightregistry = lua_topointer(rightL, LUA_REGISTRYINDEX);
+			return leftregistry == rightregistry;
+		}
+	} // namespace detail
+
+	class stateless_stack_reference {
+	private:
+		friend class stack_reference;
+		
+		int index = 0;
+
+		int registry_index() const noexcept {
+			return LUA_NOREF;
+		}
+
+	public:
+		stateless_stack_reference() noexcept = default;
+		stateless_stack_reference(lua_nil_t) noexcept : stateless_stack_reference(){};
+		stateless_stack_reference(lua_State* L, int i) noexcept : stateless_stack_reference(absolute_index(L, i)) {
+		}
+		stateless_stack_reference(lua_State*, absolute_index i) noexcept : stateless_stack_reference(i) {
+		}
+		stateless_stack_reference(lua_State*, raw_index i) noexcept : stateless_stack_reference(i) {
+		}
+		stateless_stack_reference(absolute_index i) noexcept : index(i) {
+		}
+		stateless_stack_reference(raw_index i) noexcept : index(i) {
+		}
+		stateless_stack_reference(lua_State*, ref_index) noexcept = delete;
+		stateless_stack_reference(ref_index) noexcept = delete;
+		stateless_stack_reference(const reference&) noexcept = delete;
+		stateless_stack_reference(const stateless_stack_reference&) noexcept = default;
+		stateless_stack_reference(stateless_stack_reference&& o) noexcept = default;
+		stateless_stack_reference& operator=(stateless_stack_reference&&) noexcept = default;
+		stateless_stack_reference& operator=(const stateless_stack_reference&) noexcept = default;
+
+		int push(lua_State* L) const noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, "not enough Lua stack space to push a single reference value");
+#endif // make sure stack doesn't overflow
+			lua_pushvalue(L, index);
+			return 1;
+		}
+
+		void pop(lua_State* L, int n = 1) const noexcept {
+			lua_pop(L, n);
+		}
+
+		int stack_index() const noexcept {
+			return index;
+		}
+
+		const void* pointer(lua_State* L) const noexcept {
+			const void* vp = lua_topointer(L, stack_index());
+			return vp;
+		}
+
+		type get_type(lua_State* L) const noexcept {
+			int result = lua_type(L, index);
+			return static_cast<type>(result);
+		}
+
+		bool valid(lua_State* L) const noexcept {
+			type t = get_type(L);
+			return t != type::lua_nil && t != type::none;
+		}
+
+		void abandon(lua_State* = nullptr) {
+			index = 0;
+		}
+	};
+
+	class stack_reference : public stateless_stack_reference {
+	private:
+		lua_State* luastate = nullptr;
+
+	public:
+		stack_reference() noexcept = default;
+		stack_reference(lua_nil_t) noexcept
+		: stack_reference() {};
+		stack_reference(lua_State* L, lua_nil_t) noexcept : stateless_stack_reference(L, 0), luastate(L) {
+		}
+		stack_reference(lua_State* L, int i) noexcept : stateless_stack_reference(L, i), luastate(L) {
+		}
+		stack_reference(lua_State* L, absolute_index i) noexcept : stateless_stack_reference(L, i), luastate(L) {
+		}
+		stack_reference(lua_State* L, raw_index i) noexcept : stateless_stack_reference(L, i), luastate(L) {
+		}
+		stack_reference(lua_State* L, ref_index i) noexcept = delete;
+		stack_reference(lua_State* L, const reference& r) noexcept = delete;
+		stack_reference(lua_State* L, const stack_reference& r) noexcept
+		: luastate(L) {
+			if (!r.valid()) {
+				index = 0;
+				return;
+			}
+			int i = r.stack_index();
+			if (detail::xmovable(lua_state(), r.lua_state())) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+				luaL_checkstack(L, 1, "not enough Lua stack space to push a single reference value");
+#endif // make sure stack doesn't overflow
+				lua_pushvalue(r.lua_state(), r.index);
+				lua_xmove(r.lua_state(), luastate, 1);
+				i = absolute_index(luastate, -1);
+			}
+			index = i;
+		}
+		stack_reference(stack_reference&& o) noexcept = default;
+		stack_reference& operator=(stack_reference&&) noexcept = default;
+		stack_reference(const stack_reference&) noexcept = default;
+		stack_reference& operator=(const stack_reference&) noexcept = default;
+
+		int push() const noexcept {
+			return push(lua_state());
+		}
+
+		int push(lua_State* Ls) const noexcept {
+			return stateless_stack_reference::push(Ls);
+		}
+
+		void pop() const noexcept {
+			pop(lua_state());
+		}
+
+		void pop(lua_State* Ls, int n = 1) const noexcept {
+			stateless_stack_reference::pop(Ls, n);
+		}
+
+		const void* pointer() const noexcept {
+			return stateless_stack_reference::pointer(lua_state());
+		}
+
+		type get_type() const noexcept {
+			return stateless_stack_reference::get_type(lua_state());
+		}
+
+		lua_State* lua_state() const noexcept {
+			return luastate;
+		}
+
+		bool valid() const noexcept {
+			return stateless_stack_reference::valid(lua_state());
+		}
+
+		void abandon () {
+			stateless_stack_reference::abandon(lua_state());
+		}
+	};
+
+	inline bool operator==(const stack_reference& l, const stack_reference& r) {
+		return lua_compare(l.lua_state(), l.stack_index(), r.stack_index(), LUA_OPEQ) == 0;
+	}
+
+	inline bool operator!=(const stack_reference& l, const stack_reference& r) {
+		return !operator==(l, r);
+	}
+
+	inline bool operator==(const stack_reference& lhs, const lua_nil_t&) {
+		return !lhs.valid();
+	}
+
+	inline bool operator==(const lua_nil_t&, const stack_reference& rhs) {
+		return !rhs.valid();
+	}
+
+	inline bool operator!=(const stack_reference& lhs, const lua_nil_t&) {
+		return lhs.valid();
+	}
+
+	inline bool operator!=(const lua_nil_t&, const stack_reference& rhs) {
+		return rhs.valid();
+	}
+
+	struct stack_reference_equals {
+		bool operator()(const lua_nil_t& lhs, const stack_reference& rhs) const {
+			return lhs == rhs;
+		}
+
+		bool operator()(const stack_reference& lhs, const lua_nil_t& rhs) const {
+			return lhs == rhs;
+		}
+
+		bool operator()(const stack_reference& lhs, const stack_reference& rhs) const {
+			return lhs == rhs;
+		}
+	};
+
+	struct stack_reference_hash {
+		typedef stack_reference argument_type;
+		typedef std::size_t result_type;
+
+		result_type operator()(const argument_type& lhs) const {
+			std::hash<const void*> h;
+			return h(lhs.pointer());
+		}
+	};
+} // namespace sol
+
+// end of sol/stack_reference.hpp
+
+#include <functional>
+
+namespace sol {
+	namespace detail {
+		inline const char (&default_main_thread_name())[9] {
+			static const char name[9] = "sol.\xF0\x9F\x93\x8C";
+			return name;
+		}
+	} // namespace detail
+
+	namespace stack {
+		inline void remove(lua_State* L, int rawindex, int count) {
+			if (count < 1)
+				return;
+			int top = lua_gettop(L);
+			if (top < 1) {
+				return;
+			}
+			if (rawindex == -count || top == rawindex) {
+				// Slice them right off the top
+				lua_pop(L, static_cast<int>(count));
+				return;
+			}
+
+			// Remove each item one at a time using stack operations
+			// Probably slower, maybe, haven't benchmarked,
+			// but necessary
+			int index = lua_absindex(L, rawindex);
+			if (index < 0) {
+				index = lua_gettop(L) + (index + 1);
+			}
+			int last = index + count;
+			for (int i = index; i < last; ++i) {
+				lua_remove(L, index);
+			}
+		}
+
+		struct push_popper_at {
+			lua_State* L;
+			int index;
+			int count;
+			push_popper_at(lua_State* luastate, int index = -1, int count = 1) : L(luastate), index(index), count(count) {
+			}
+			~push_popper_at() {
+				remove(L, index, count);
+			}
+		};
+
+		template <bool top_level>
+		struct push_popper_n {
+			lua_State* L;
+			int t;
+			push_popper_n(lua_State* luastate, int x) : L(luastate), t(x) {
+			}
+			push_popper_n(const push_popper_n&) = delete;
+			push_popper_n(push_popper_n&&) = default;
+			push_popper_n& operator=(const push_popper_n&) = delete;
+			push_popper_n& operator=(push_popper_n&&) = default;
+			~push_popper_n() {
+				lua_pop(L, t);
+			}
+		};
+
+		template <>
+		struct push_popper_n<true> {
+			push_popper_n(lua_State*, int) {
+			}
+		};
+
+		template <bool, typename T, typename = void>
+		struct push_popper {
+			using Tu = meta::unqualified_t<T>;
+			T t;
+			int idx;
+
+			push_popper(T x) : t(x), idx(lua_absindex(t.lua_state(), -t.push())) {
+			}
+
+			int index_of(const Tu&) {
+				return idx;
+			}
+
+			~push_popper() {
+				t.pop();
+			}
+		};
+
+		template <typename T, typename C>
+		struct push_popper<true, T, C> {
+			using Tu = meta::unqualified_t<T>;
+
+			push_popper(T) {
+			}
+
+			int index_of(const Tu&) {
+				return -1;
+			}
+
+			~push_popper() {
+			}
+		};
+
+		template <typename T>
+		struct push_popper<false, T, std::enable_if_t<is_stack_based_v<meta::unqualified_t<T>>>> {
+			using Tu = meta::unqualified_t<T>;
+
+			push_popper(T) {
+			}
+
+			int index_of(const Tu& r) {
+				return r.stack_index();
+			}
+
+			~push_popper() {
+			}
+		};
+
+		template <bool top_level = false, typename T>
+		push_popper<top_level, T> push_pop(T&& x) {
+			return push_popper<top_level, T>(std::forward<T>(x));
+		}
+
+		template <typename T>
+		push_popper_at push_pop_at(T&& x) {
+			int c = x.push();
+			lua_State* L = x.lua_state();
+			return push_popper_at(L, lua_absindex(L, -c), c);
+		}
+
+		template <bool top_level = false>
+		push_popper_n<top_level> pop_n(lua_State* L, int x) {
+			return push_popper_n<top_level>(L, x);
+		}
+	} // namespace stack
+
+	inline lua_State* main_thread(lua_State* L, lua_State* backup_if_unsupported = nullptr) {
+#if SOL_LUA_VESION_I_ < 502
+		if (L == nullptr)
+			return backup_if_unsupported;
+		lua_getglobal(L, detail::default_main_thread_name());
+		auto pp = stack::pop_n(L, 1);
+		if (type_of(L, -1) == type::thread) {
+			return lua_tothread(L, -1);
+		}
+		return backup_if_unsupported;
+#else
+		if (L == nullptr)
+			return backup_if_unsupported;
+		lua_rawgeti(L, LUA_REGISTRYINDEX, LUA_RIDX_MAINTHREAD);
+		lua_State* Lmain = lua_tothread(L, -1);
+		lua_pop(L, 1);
+		return Lmain;
+#endif // Lua 5.2+ has the main thread unqualified_getter
+	}
+
+	namespace detail {
+		struct global_tag {
+		} const global_ {};
+		struct no_safety_tag {
+		} const no_safety {};
+
+		template <bool b>
+		inline lua_State* pick_main_thread(lua_State* L, lua_State* backup_if_unsupported = nullptr) {
+			(void)L;
+			(void)backup_if_unsupported;
+			if (b) {
+				return main_thread(L, backup_if_unsupported);
+			}
+			return L;
+		}
+	} // namespace detail
+
+	class stateless_reference {
+	private:
+		template <bool o_main_only>
+		friend class basic_reference;
+
+		int ref = LUA_NOREF;
+
+		int copy(lua_State* L) const noexcept {
+			if (ref == LUA_NOREF)
+				return LUA_NOREF;
+			push(L);
+			return luaL_ref(L, LUA_REGISTRYINDEX);
+		}
+
+		lua_State* copy_assign(lua_State* L, lua_State* rL, const stateless_reference& r) {
+			if (valid(L)) {
+				deref(L);
+			}
+			ref = r.copy(L);
+			return rL;
+		}
+
+		lua_State* move_assign(lua_State* L, lua_State* rL, stateless_reference&& r) {
+			if (valid(L)) {
+				deref(L);
+			}
+			ref = r.ref;
+			r.ref = LUA_NOREF;
+			return rL;
+		}
+
+	protected:
+		int stack_index() const noexcept {
+			return -1;
+		}
+
+		stateless_reference(lua_State* L, detail::global_tag) noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, "not enough Lua stack space to push this reference value");
+#endif // make sure stack doesn't overflow
+			lua_pushglobaltable(L);
+			ref = luaL_ref(L, LUA_REGISTRYINDEX);
+		}
+
+		stateless_reference(int raw_ref_index) noexcept : ref(raw_ref_index) {
+		}
+
+	public:
+		stateless_reference() noexcept = default;
+		stateless_reference(lua_nil_t) noexcept : stateless_reference() {
+		}
+		stateless_reference(const stack_reference& r) noexcept : stateless_reference(r.lua_state(), r.stack_index()) {
+		}
+		stateless_reference(stack_reference&& r) noexcept : stateless_reference(r.lua_state(), r.stack_index()) {
+		}
+		stateless_reference(lua_State* L, const stateless_reference& r) noexcept {
+			if (r.ref == LUA_REFNIL) {
+				ref = LUA_REFNIL;
+				return;
+			}
+			if (r.ref == LUA_NOREF || L == nullptr) {
+				ref = LUA_NOREF;
+				return;
+			}
+			ref = r.copy(L);
+		}
+
+		stateless_reference(lua_State* L, stateless_reference&& r) noexcept {
+			if (r.ref == LUA_REFNIL) {
+				ref = LUA_REFNIL;
+				return;
+			}
+			if (r.ref == LUA_NOREF || L == nullptr) {
+				ref = LUA_NOREF;
+				return;
+			}
+			ref = r.ref;
+			r.ref = LUA_NOREF;
+		}
+
+		stateless_reference(lua_State* L, const stack_reference& r) noexcept {
+			if (L == nullptr || r.lua_state() == nullptr || r.get_type() == type::none) {
+				ref = LUA_NOREF;
+				return;
+			}
+			if (r.get_type() == type::lua_nil) {
+				ref = LUA_REFNIL;
+				return;
+			}
+			if (L != r.lua_state() && !detail::xmovable(L, r.lua_state())) {
+				return;
+			}
+			r.push(L);
+			ref = luaL_ref(L, LUA_REGISTRYINDEX);
+		}
+
+		stateless_reference(lua_State* L, int index = -1) noexcept {
+			// use L to stick with that state's execution stack
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, "not enough Lua stack space to push this reference value");
+#endif // make sure stack doesn't overflow
+			lua_pushvalue(L, index);
+			ref = luaL_ref(L, LUA_REGISTRYINDEX);
+		}
+		stateless_reference(lua_State* L, ref_index index) noexcept {
+			lua_rawgeti(L, LUA_REGISTRYINDEX, index.index);
+			ref = luaL_ref(L, LUA_REGISTRYINDEX);
+		}
+		stateless_reference(lua_State*, lua_nil_t) noexcept {
+		}
+
+		~stateless_reference() noexcept = default;
+
+		stateless_reference(const stateless_reference& o) noexcept = delete;
+		stateless_reference& operator=(const stateless_reference& r) noexcept = delete;
+
+		stateless_reference(stateless_reference&& o) noexcept : ref(o.ref) {
+			o.ref = LUA_NOREF;
+		}
+
+		stateless_reference& operator=(stateless_reference&& o) noexcept {
+			ref = o.ref;
+			o.ref = LUA_NOREF;
+			return *this;
+		}
+
+		int push(lua_State* L) const noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, "not enough Lua stack space to push this reference value");
+#endif // make sure stack doesn't overflow
+			lua_rawgeti(L, LUA_REGISTRYINDEX, ref);
+			return 1;
+		}
+
+		void pop(lua_State* L, int n = 1) const noexcept {
+			lua_pop(L, n);
+		}
+
+		int registry_index() const noexcept {
+			return ref;
+		}
+
+		bool valid(lua_State*) const noexcept {
+			return !(ref == LUA_NOREF || ref == LUA_REFNIL);
+		}
+
+		const void* pointer(lua_State* L) const noexcept {
+			int si = push(L);
+			const void* vp = lua_topointer(L, -si);
+			lua_pop(L, si);
+			return vp;
+		}
+
+		type get_type(lua_State* L) const noexcept {
+			int p = push(L);
+			int result = lua_type(L, -1);
+			pop(L, p);
+			return static_cast<type>(result);
+		}
+
+		void abandon(lua_State* = nullptr) {
+			ref = LUA_NOREF;
+		}
+
+		void deref(lua_State* L) const noexcept {
+			luaL_unref(L, LUA_REGISTRYINDEX, ref);
+		}
+	};
+
+	template <bool main_only = false>
+	class basic_reference : public stateless_reference {
+	private:
+		template <bool o_main_only>
+		friend class basic_reference;
+		lua_State* luastate = nullptr; // non-owning
+
+		template <bool r_main_only>
+		void copy_assign(const basic_reference<r_main_only>& r) {
+			if (valid()) {
+				deref();
+			}
+			if (r.ref == LUA_REFNIL) {
+				luastate = detail::pick_main_thread < main_only && !r_main_only > (r.lua_state(), r.lua_state());
+				ref = LUA_REFNIL;
+				return;
+			}
+			if (r.ref == LUA_NOREF) {
+				luastate = r.luastate;
+				ref = LUA_NOREF;
+				return;
+			}
+			if (detail::xmovable(lua_state(), r.lua_state())) {
+				r.push(lua_state());
+				ref = luaL_ref(lua_state(), LUA_REGISTRYINDEX);
+				return;
+			}
+			luastate = detail::pick_main_thread < main_only && !r_main_only > (r.lua_state(), r.lua_state());
+			ref = r.copy();
+		}
+
+		template <bool r_main_only>
+		void move_assign(basic_reference<r_main_only>&& r) {
+			if (valid()) {
+				deref();
+			}
+			if (r.ref == LUA_REFNIL) {
+				luastate = detail::pick_main_thread < main_only && !r_main_only > (r.lua_state(), r.lua_state());
+				ref = LUA_REFNIL;
+				return;
+			}
+			if (r.ref == LUA_NOREF) {
+				luastate = r.luastate;
+				ref = LUA_NOREF;
+				return;
+			}
+			if (detail::xmovable(lua_state(), r.lua_state())) {
+				r.push(lua_state());
+				ref = luaL_ref(lua_state(), LUA_REGISTRYINDEX);
+				return;
+			}
+
+			luastate = detail::pick_main_thread < main_only && !r_main_only > (r.lua_state(), r.lua_state());
+			ref = r.ref;
+			r.ref = LUA_NOREF;
+			r.luastate = nullptr;
+		}
+
+	protected:
+		basic_reference(lua_State* L, detail::global_tag) noexcept
+		: basic_reference(detail::pick_main_thread<main_only>(L, L), detail::global_, detail::global_) {
+		}
+
+		basic_reference(lua_State* L, detail::global_tag, detail::global_tag) noexcept : stateless_reference(L, detail::global_), luastate(L) {
+		}
+
+		basic_reference(lua_State* oL, const basic_reference<!main_only>& o) noexcept : stateless_reference(oL, o), luastate(oL) {
+		}
+
+		void deref() const noexcept {
+			return stateless_reference::deref(lua_state());
+		}
+
+		int copy() const noexcept {
+			return copy(lua_state());
+		}
+
+		int copy(lua_State* L) const noexcept {
+			return stateless_reference::copy(L);
+		}
+
+	public:
+		basic_reference() noexcept = default;
+		basic_reference(lua_nil_t) noexcept : basic_reference() {
+		}
+		basic_reference(const stack_reference& r) noexcept : basic_reference(r.lua_state(), r.stack_index()) {
+		}
+		basic_reference(stack_reference&& r) noexcept : basic_reference(r.lua_state(), r.stack_index()) {
+		}
+		template <bool r_main_only>
+		basic_reference(lua_State* L, const basic_reference<r_main_only>& r) noexcept : luastate(detail::pick_main_thread<main_only>(L, L)) {
+			if (r.ref == LUA_REFNIL) {
+				ref = LUA_REFNIL;
+				return;
+			}
+			if (r.ref == LUA_NOREF || lua_state() == nullptr) {
+				ref = LUA_NOREF;
+				return;
+			}
+			if (detail::xmovable(lua_state(), r.lua_state())) {
+				r.push(lua_state());
+				ref = luaL_ref(lua_state(), LUA_REGISTRYINDEX);
+				return;
+			}
+			ref = r.copy();
+		}
+
+		template <bool r_main_only>
+		basic_reference(lua_State* L, basic_reference<r_main_only>&& r) noexcept : luastate(detail::pick_main_thread<main_only>(L, L)) {
+			if (r.ref == LUA_REFNIL) {
+				ref = LUA_REFNIL;
+				return;
+			}
+			if (r.ref == LUA_NOREF || lua_state() == nullptr) {
+				ref = LUA_NOREF;
+				return;
+			}
+			if (detail::xmovable(lua_state(), r.lua_state())) {
+				r.push(lua_state());
+				ref = luaL_ref(lua_state(), LUA_REGISTRYINDEX);
+				return;
+			}
+			ref = r.ref;
+			r.ref = LUA_NOREF;
+			r.luastate = nullptr;
+		}
+
+		basic_reference(lua_State* L, const stack_reference& r) noexcept : luastate(detail::pick_main_thread<main_only>(L, L)) {
+			if (lua_state() == nullptr || r.lua_state() == nullptr || r.get_type() == type::none) {
+				ref = LUA_NOREF;
+				return;
+			}
+			if (r.get_type() == type::lua_nil) {
+				ref = LUA_REFNIL;
+				return;
+			}
+			if (lua_state() != r.lua_state() && !detail::xmovable(lua_state(), r.lua_state())) {
+				return;
+			}
+			r.push(lua_state());
+			ref = luaL_ref(lua_state(), LUA_REGISTRYINDEX);
+		}
+		basic_reference(lua_State* L, int index = -1) noexcept : luastate(detail::pick_main_thread<main_only>(L, L)) {
+			// use L to stick with that state's execution stack
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, "not enough Lua stack space to push this reference value");
+#endif // make sure stack doesn't overflow
+			lua_pushvalue(L, index);
+			ref = luaL_ref(L, LUA_REGISTRYINDEX);
+		}
+		basic_reference(lua_State* L, ref_index index) noexcept : luastate(detail::pick_main_thread<main_only>(L, L)) {
+			lua_rawgeti(lua_state(), LUA_REGISTRYINDEX, index.index);
+			ref = luaL_ref(lua_state(), LUA_REGISTRYINDEX);
+		}
+		basic_reference(lua_State* L, lua_nil_t) noexcept : luastate(detail::pick_main_thread<main_only>(L, L)) {
+		}
+
+		~basic_reference() noexcept {
+			if (lua_state() == nullptr || ref == LUA_NOREF)
+				return;
+			deref();
+		}
+
+		basic_reference(const basic_reference& o) noexcept : stateless_reference(o.copy()), luastate(o.lua_state()) {
+		}
+
+		basic_reference(basic_reference&& o) noexcept : stateless_reference(std::move(o)), luastate(o.lua_state()) {
+			o.luastate = nullptr;
+		}
+
+		basic_reference(const basic_reference<!main_only>& o) noexcept
+		: basic_reference(detail::pick_main_thread<main_only>(o.lua_state(), o.lua_state()), o) {
+		}
+
+		basic_reference(basic_reference<!main_only>&& o) noexcept
+		: stateless_reference(std::move(o)), luastate(detail::pick_main_thread<main_only>(o.lua_state(), o.lua_state())) {
+			o.luastate = nullptr;
+			o.ref = LUA_NOREF;
+		}
+
+		basic_reference& operator=(basic_reference&& r) noexcept {
+			move_assign(std::move(r));
+			return *this;
+		}
+
+		basic_reference& operator=(const basic_reference& r) noexcept {
+			copy_assign(r);
+			return *this;
+		}
+
+		basic_reference& operator=(basic_reference<!main_only>&& r) noexcept {
+			move_assign(std::move(r));
+			return *this;
+		}
+
+		basic_reference& operator=(const basic_reference<!main_only>& r) noexcept {
+			copy_assign(r);
+			return *this;
+		}
+
+		basic_reference& operator=(const lua_nil_t&) noexcept {
+			if (valid()) {
+				deref();
+			}
+			luastate = nullptr;
+			ref = LUA_NOREF;
+			return *this;
+		}
+
+		template <typename Super>
+		basic_reference& operator=(proxy_base<Super>&& r);
+
+		template <typename Super>
+		basic_reference& operator=(const proxy_base<Super>& r);
+
+		int push() const noexcept {
+			return push(lua_state());
+		}
+
+		int push(lua_State* L) const noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, "not enough Lua stack space to push this reference value");
+#endif // make sure stack doesn't overflow
+			if (lua_state() == nullptr) {
+				lua_pushnil(L);
+				return 1;
+			}
+			lua_rawgeti(lua_state(), LUA_REGISTRYINDEX, ref);
+			if (L != lua_state()) {
+				lua_xmove(lua_state(), L, 1);
+			}
+			return 1;
+		}
+
+		void pop() const noexcept {
+			pop(lua_state());
+		}
+
+		void pop(lua_State* L, int n = 1) const noexcept {
+			stateless_reference::pop(L, n);
+		}
+
+		int registry_index() const noexcept {
+			return stateless_reference::registry_index();
+		}
+
+		bool valid() const noexcept {
+			return stateless_reference::valid(lua_state());
+		}
+
+		const void* pointer() const noexcept {
+			return stateless_reference::pointer(lua_state());
+		}
+
+		explicit operator bool() const noexcept {
+			return valid();
+		}
+
+		type get_type() const noexcept {
+			return stateless_reference::get_type(lua_state());
+		}
+
+		lua_State* lua_state() const noexcept {
+			return luastate;
+		}
+	};
+
+	template <bool lb, bool rb>
+	inline bool operator==(const basic_reference<lb>& l, const basic_reference<rb>& r) {
+		auto ppl = stack::push_pop(l);
+		auto ppr = stack::push_pop(r);
+		return lua_compare(l.lua_state(), -1, -2, LUA_OPEQ) == 1;
+	}
+
+	template <bool lb, bool rb>
+	inline bool operator!=(const basic_reference<lb>& l, const basic_reference<rb>& r) {
+		return !operator==(l, r);
+	}
+
+	template <bool lb>
+	inline bool operator==(const basic_reference<lb>& l, const stack_reference& r) {
+		auto ppl = stack::push_pop(l);
+		return lua_compare(l.lua_state(), -1, r.stack_index(), LUA_OPEQ) == 1;
+	}
+
+	template <bool lb>
+	inline bool operator!=(const basic_reference<lb>& l, const stack_reference& r) {
+		return !operator==(l, r);
+	}
+
+	template <bool rb>
+	inline bool operator==(const stack_reference& l, const basic_reference<rb>& r) {
+		auto ppr = stack::push_pop(r);
+		return lua_compare(l.lua_state(), -1, r.stack_index(), LUA_OPEQ) == 1;
+	}
+
+	template <bool rb>
+	inline bool operator!=(const stack_reference& l, const basic_reference<rb>& r) {
+		return !operator==(l, r);
+	}
+
+	template <bool lb>
+	inline bool operator==(const basic_reference<lb>& lhs, const lua_nil_t&) {
+		return !lhs.valid();
+	}
+
+	template <bool rb>
+	inline bool operator==(const lua_nil_t&, const basic_reference<rb>& rhs) {
+		return !rhs.valid();
+	}
+
+	template <bool lb>
+	inline bool operator!=(const basic_reference<lb>& lhs, const lua_nil_t&) {
+		return lhs.valid();
+	}
+
+	template <bool rb>
+	inline bool operator!=(const lua_nil_t&, const basic_reference<rb>& rhs) {
+		return rhs.valid();
+	}
+
+	struct reference_equals : public stack_reference_equals {
+		template <bool rb>
+		bool operator()(const lua_nil_t& lhs, const basic_reference<rb>& rhs) const {
+			return lhs == rhs;
+		}
+
+		template <bool lb>
+		bool operator()(const basic_reference<lb>& lhs, const lua_nil_t& rhs) const {
+			return lhs == rhs;
+		}
+
+		template <bool lb, bool rb>
+		bool operator()(const basic_reference<lb>& lhs, const basic_reference<rb>& rhs) const {
+			return lhs == rhs;
+		}
+
+		template <bool lb>
+		bool operator()(const basic_reference<lb>& lhs, const stack_reference& rhs) const {
+			return lhs == rhs;
+		}
+
+		template <bool rb>
+		bool operator()(const stack_reference& lhs, const basic_reference<rb>& rhs) const {
+			return lhs == rhs;
+		}
+	};
+
+	struct reference_hash : public stack_reference_hash {
+		typedef reference argument_type;
+		typedef std::size_t result_type;
+
+		template <bool lb>
+		result_type operator()(const basic_reference<lb>& lhs) const {
+			std::hash<const void*> h;
+			return h(lhs.pointer());
+		}
+	};
+} // namespace sol
+
+// end of sol/reference.hpp
+
+// beginning of sol/tie.hpp
+
+namespace sol {
+
+	namespace detail {
+		template <typename T>
+		struct is_speshul : std::false_type {};
+	} // namespace detail
+
+	template <typename T>
+	struct tie_size : std::tuple_size<T> {};
+
+	template <typename T>
+	struct is_tieable : std::integral_constant<bool, (::sol::tie_size<T>::value > 0)> {};
+
+	template <typename... Tn>
+	struct tie_t : public std::tuple<std::add_lvalue_reference_t<Tn>...> {
+	private:
+		typedef std::tuple<std::add_lvalue_reference_t<Tn>...> base_t;
+
+		template <typename T>
+		void set(std::false_type, T&& target) {
+			std::get<0>(*this) = std::forward<T>(target);
+		}
+
+		template <typename T>
+		void set(std::true_type, T&& target) {
+			typedef tie_size<meta::unqualified_t<T>> value_size;
+			typedef tie_size<std::tuple<Tn...>> tie_size;
+			typedef meta::conditional_t<(value_size::value < tie_size::value), value_size, tie_size> indices_size;
+			typedef std::make_index_sequence<indices_size::value> indices;
+			set_extra(detail::is_speshul<meta::unqualified_t<T>>(), indices(), std::forward<T>(target));
+		}
+
+		template <std::size_t... I, typename T>
+		void set_extra(std::true_type, std::index_sequence<I...>, T&& target) {
+			using std::get;
+			(void)detail::swallow{0,
+				(get<I>(static_cast<base_t&>(*this)) = get<I>(types<Tn...>(), target), 0)..., 0};
+		}
+
+		template <std::size_t... I, typename T>
+		void set_extra(std::false_type, std::index_sequence<I...>, T&& target) {
+			using std::get;
+			(void)detail::swallow{0,
+				(get<I>(static_cast<base_t&>(*this)) = get<I>(target), 0)..., 0};
+		}
+
+	public:
+		using base_t::base_t;
+
+		template <typename T>
+		tie_t& operator=(T&& value) {
+			typedef is_tieable<meta::unqualified_t<T>> tieable;
+			set(tieable(), std::forward<T>(value));
+			return *this;
+		}
+	};
+
+	template <typename... Tn>
+	struct tie_size<tie_t<Tn...>> : std::tuple_size<std::tuple<Tn...>> {};
+
+	namespace adl_barrier_detail {
+		template <typename... Tn>
+		inline tie_t<std::remove_reference_t<Tn>...> tie(Tn&&... argn) {
+			return tie_t<std::remove_reference_t<Tn>...>(std::forward<Tn>(argn)...);
+		}
+	} // namespace adl_barrier_detail
+
+	using namespace adl_barrier_detail;
+
+} // namespace sol
+
+// end of sol/tie.hpp
+
+// beginning of sol/stack_guard.hpp
+
+#include <functional>
+
+namespace sol {
+	namespace detail {
+		inline void stack_fail(int, int) {
+#if !(defined(SOL_NO_EXCEPTIONS) && SOL_NO_EXCEPTIONS)
+			throw error(detail::direct_error, "imbalanced stack after operation finish");
+#else
+			// Lol, what do you want, an error printout? :3c
+			// There's no sane default here. The right way would be C-style abort(), and that's not acceptable, so
+			// hopefully someone will register their own stack_fail thing for the `fx` parameter of stack_guard.
+#endif // No Exceptions
+		}
+	} // namespace detail
+
+	struct stack_guard {
+		lua_State* L;
+		int top;
+		std::function<void(int, int)> on_mismatch;
+
+		stack_guard(lua_State* L) : stack_guard(L, lua_gettop(L)) {
+		}
+		stack_guard(lua_State* L, int top, std::function<void(int, int)> fx = detail::stack_fail) : L(L), top(top), on_mismatch(std::move(fx)) {
+		}
+		bool check_stack(int modification = 0) const {
+			int bottom = lua_gettop(L) + modification;
+			if (top == bottom) {
+				return true;
+			}
+			on_mismatch(top, bottom);
+			return false;
+		}
+		~stack_guard() {
+			check_stack();
+		}
+	};
+} // namespace sol
+
+// end of sol/stack_guard.hpp
+
+#include <vector>
+#include <bitset>
+#include <forward_list>
+#include <string>
+#include <algorithm>
+#include <sstream>
+#include <optional>
+
+namespace sol {
+	namespace detail {
+		struct with_function_tag { };
+		struct as_reference_tag { };
+		template <typename T>
+		struct as_pointer_tag { };
+		template <typename T>
+		struct as_value_tag { };
+		template <typename T>
+		struct as_unique_tag { };
+		template <typename T>
+		struct as_table_tag { };
+
+		using lua_reg_table = luaL_Reg[64];
+
+		using unique_destructor = void (*)(void*);
+		using unique_tag = detail::inheritance_unique_cast_function;
+
+		inline void* align(std::size_t alignment, std::size_t size, void*& ptr, std::size_t& space, std::size_t& required_space) {
+			// this handels arbitrary alignments...
+			// make this into a power-of-2-only?
+			// actually can't: this is a C++14-compatible framework,
+			// power of 2 alignment is C++17
+			std::uintptr_t initial = reinterpret_cast<std::uintptr_t>(ptr);
+			std::uintptr_t offby = static_cast<std::uintptr_t>(initial % alignment);
+			std::uintptr_t padding = (alignment - offby) % alignment;
+			required_space += size + padding;
+			if (space < required_space) {
+				return nullptr;
+			}
+			ptr = static_cast<void*>(static_cast<char*>(ptr) + padding);
+			space -= padding;
+			return ptr;
+		}
+
+		inline void* align(std::size_t alignment, std::size_t size, void*& ptr, std::size_t& space) {
+			std::size_t required_space = 0;
+			return align(alignment, size, ptr, space, required_space);
+		}
+
+		inline void align_one(std::size_t a, std::size_t s, void*& target_alignment) {
+			std::size_t space = (std::numeric_limits<std::size_t>::max)();
+			target_alignment = align(a, s, target_alignment, space);
+			target_alignment = static_cast<void*>(static_cast<char*>(target_alignment) + s);
+		}
+
+		template <typename... Args>
+		std::size_t aligned_space_for(void* alignment = nullptr) {
+			// use temporary storage to prevent strict UB shenanigans
+			char alignment_shim[(std::max)({ sizeof(Args)... }) + (std::max)({ alignof(Args)... })] {};
+			char* start = alignment == nullptr ? static_cast<char*>(alignment) : alignment_shim;
+			(void)detail::swallow { int {}, (align_one(std::alignment_of_v<Args>, sizeof(Args), alignment), int {})... };
+			return static_cast<char*>(alignment) - start;
+		}
+
+		inline void* align_usertype_pointer(void* ptr) {
+			using use_align = std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY_I_)
+			     false
+#else
+			     (std::alignment_of<void*>::value > 1)
+#endif
+			     >;
+			if (!use_align::value) {
+				return ptr;
+			}
+			std::size_t space = (std::numeric_limits<std::size_t>::max)();
+			return align(std::alignment_of<void*>::value, sizeof(void*), ptr, space);
+		}
+
+		template <bool pre_aligned = false, bool pre_shifted = false>
+		void* align_usertype_unique_destructor(void* ptr) {
+			using use_align = std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY_I_)
+			     false
+#else
+			     (std::alignment_of<unique_destructor>::value > 1)
+#endif
+			     >;
+			if (!pre_aligned) {
+				ptr = align_usertype_pointer(ptr);
+			}
+			if (!pre_shifted) {
+				ptr = static_cast<void*>(static_cast<char*>(ptr) + sizeof(void*));
+			}
+			if (!use_align::value) {
+				return static_cast<void*>(static_cast<void**>(ptr) + 1);
+			}
+			std::size_t space = (std::numeric_limits<std::size_t>::max)();
+			return align(std::alignment_of<unique_destructor>::value, sizeof(unique_destructor), ptr, space);
+		}
+
+		template <bool pre_aligned = false, bool pre_shifted = false>
+		void* align_usertype_unique_tag(void* ptr) {
+			using use_align = std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY_I_)
+			     false
+#else
+			     (std::alignment_of<unique_tag>::value > 1)
+#endif
+			     >;
+			if (!pre_aligned) {
+				ptr = align_usertype_unique_destructor(ptr);
+			}
+			if (!pre_shifted) {
+				ptr = static_cast<void*>(static_cast<char*>(ptr) + sizeof(unique_destructor));
+			}
+			if (!use_align::value) {
+				return ptr;
+			}
+			std::size_t space = (std::numeric_limits<std::size_t>::max)();
+			return align(std::alignment_of<unique_tag>::value, sizeof(unique_tag), ptr, space);
+		}
+
+		template <typename T, bool pre_aligned = false, bool pre_shifted = false>
+		void* align_usertype_unique(void* ptr) {
+			typedef std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY_I_)
+			     false
+#else
+			     (std::alignment_of_v<T> > 1)
+#endif
+			     >
+			     use_align;
+			if (!pre_aligned) {
+				ptr = align_usertype_unique_tag(ptr);
+			}
+			if (!pre_shifted) {
+				ptr = static_cast<void*>(static_cast<char*>(ptr) + sizeof(unique_tag));
+			}
+			if (!use_align::value) {
+				return ptr;
+			}
+			std::size_t space = (std::numeric_limits<std::size_t>::max)();
+			return align(std::alignment_of_v<T>, sizeof(T), ptr, space);
+		}
+
+		template <typename T>
+		void* align_user(void* ptr) {
+			typedef std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY_I_)
+			     false
+#else
+			     (std::alignment_of_v<T> > 1)
+#endif
+			     >
+			     use_align;
+			if (!use_align::value) {
+				return ptr;
+			}
+			std::size_t space = (std::numeric_limits<std::size_t>::max)();
+			return align(std::alignment_of_v<T>, sizeof(T), ptr, space);
+		}
+
+		template <typename T>
+		T** usertype_allocate_pointer(lua_State* L) {
+			typedef std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY_I_)
+			     false
+#else
+			     (std::alignment_of<T*>::value > 1)
+#endif
+			     >
+			     use_align;
+			if (!use_align::value) {
+				T** pointerpointer = static_cast<T**>(lua_newuserdata(L, sizeof(T*)));
+				return pointerpointer;
+			}
+			static const std::size_t initial_size = aligned_space_for<T*>(nullptr);
+			static const std::size_t misaligned_size = aligned_space_for<T*>(reinterpret_cast<void*>(0x1));
+
+			std::size_t allocated_size = initial_size;
+			void* unadjusted = lua_newuserdata(L, initial_size);
+			void* adjusted = align(std::alignment_of<T*>::value, sizeof(T*), unadjusted, allocated_size);
+			if (adjusted == nullptr) {
+				lua_pop(L, 1);
+				// what kind of absolute garbage trash allocator are we dealing with?
+				// whatever, add some padding in the case of MAXIMAL alignment waste...
+				allocated_size = misaligned_size;
+				unadjusted = lua_newuserdata(L, allocated_size);
+				adjusted = align(std::alignment_of<T*>::value, sizeof(T*), unadjusted, allocated_size);
+				if (adjusted == nullptr) {
+					// trash allocator can burn in hell
+					lua_pop(L, 1);
+					// luaL_error(L, "if you are the one that wrote this allocator you should feel bad for doing a
+					// worse job than malloc/realloc and should go read some books, yeah?");
+					luaL_error(L, "cannot properly align memory for '%s'", detail::demangle<T*>().data());
+				}
+			}
+			return static_cast<T**>(adjusted);
+		}
+
+		inline bool attempt_alloc(lua_State* L, std::size_t ptr_align, std::size_t ptr_size, std::size_t value_align, std::size_t value_size,
+		     std::size_t allocated_size, void*& pointer_adjusted, void*& data_adjusted) {
+			void* adjusted = lua_newuserdata(L, allocated_size);
+			pointer_adjusted = align(ptr_align, ptr_size, adjusted, allocated_size);
+			if (pointer_adjusted == nullptr) {
+				lua_pop(L, 1);
+				return false;
+			}
+			// subtract size of what we're going to allocate there
+			allocated_size -= ptr_size;
+			adjusted = static_cast<void*>(static_cast<char*>(pointer_adjusted) + ptr_size);
+			data_adjusted = align(value_align, value_size, adjusted, allocated_size);
+			if (data_adjusted == nullptr) {
+				lua_pop(L, 1);
+				return false;
+			}
+			return true;
+		}
+
+		inline bool attempt_alloc_unique(lua_State* L, std::size_t ptr_align, std::size_t ptr_size, std::size_t real_align, std::size_t real_size,
+		     std::size_t allocated_size, void*& pointer_adjusted, void*& dx_adjusted, void*& id_adjusted, void*& data_adjusted) {
+			void* adjusted = lua_newuserdata(L, allocated_size);
+			pointer_adjusted = align(ptr_align, ptr_size, adjusted, allocated_size);
+			if (pointer_adjusted == nullptr) {
+				lua_pop(L, 1);
+				return false;
+			}
+			allocated_size -= ptr_size;
+
+			adjusted = static_cast<void*>(static_cast<char*>(pointer_adjusted) + ptr_size);
+			dx_adjusted = align(std::alignment_of_v<unique_destructor>, sizeof(unique_destructor), adjusted, allocated_size);
+			if (dx_adjusted == nullptr) {
+				lua_pop(L, 1);
+				return false;
+			}
+			allocated_size -= sizeof(unique_destructor);
+
+			adjusted = static_cast<void*>(static_cast<char*>(dx_adjusted) + sizeof(unique_destructor));
+
+			id_adjusted = align(std::alignment_of_v<unique_tag>, sizeof(unique_tag), adjusted, allocated_size);
+			if (id_adjusted == nullptr) {
+				lua_pop(L, 1);
+				return false;
+			}
+			allocated_size -= sizeof(unique_tag);
+
+			adjusted = static_cast<void*>(static_cast<char*>(id_adjusted) + sizeof(unique_tag));
+			data_adjusted = align(real_align, real_size, adjusted, allocated_size);
+			if (data_adjusted == nullptr) {
+				lua_pop(L, 1);
+				return false;
+			}
+			return true;
+		}
+
+		template <typename T>
+		T* usertype_allocate(lua_State* L) {
+			typedef std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY_I_)
+			     false
+#else
+			     (std::alignment_of<T*>::value > 1 || std::alignment_of_v<T> > 1)
+#endif
+			     >
+			     use_align;
+			if (!use_align::value) {
+				T** pointerpointer = static_cast<T**>(lua_newuserdata(L, sizeof(T*) + sizeof(T)));
+				T*& pointerreference = *pointerpointer;
+				T* allocationtarget = reinterpret_cast<T*>(pointerpointer + 1);
+				pointerreference = allocationtarget;
+				return allocationtarget;
+			}
+
+			/* the assumption is that `lua_newuserdata` -- unless someone
+			passes a specific lua_Alloc that gives us bogus, un-aligned pointers
+			-- uses malloc, which tends to hand out more or less aligned pointers to memory
+			(most of the time, anyhow)
+
+			but it's not guaranteed, so we have to do a post-adjustment check and increase padding
+
+			we do this preliminarily with compile-time stuff, to see
+			if we strike lucky with the allocator and alignment values
+
+			otherwise, we have to re-allocate the userdata and
+			over-allocate some space for additional padding because
+			compilers are optimized for aligned reads/writes
+			(and clang will barf UBsan errors on us for not being aligned)
+			*/
+			static const std::size_t initial_size = aligned_space_for<T*, T>(nullptr);
+			static const std::size_t misaligned_size = aligned_space_for<T*, T>(reinterpret_cast<void*>(0x1));
+
+			void* pointer_adjusted;
+			void* data_adjusted;
+			bool result
+			     = attempt_alloc(L, std::alignment_of_v<T*>, sizeof(T*), std::alignment_of_v<T>, sizeof(T), initial_size, pointer_adjusted, data_adjusted);
+			if (!result) {
+				// we're likely to get something that fails to perform the proper allocation a second time,
+				// so we use the suggested_new_size bump to help us out here
+				pointer_adjusted = nullptr;
+				data_adjusted = nullptr;
+				result = attempt_alloc(
+				     L, std::alignment_of_v<T*>, sizeof(T*), std::alignment_of_v<T>, sizeof(T), misaligned_size, pointer_adjusted, data_adjusted);
+				if (!result) {
+					if (pointer_adjusted == nullptr) {
+						luaL_error(L, "aligned allocation of userdata block (pointer section) for '%s' failed", detail::demangle<T>().c_str());
+					}
+					else {
+						luaL_error(L, "aligned allocation of userdata block (data section) for '%s' failed", detail::demangle<T>().c_str());
+					}
+					return nullptr;
+				}
+			}
+
+			T** pointerpointer = reinterpret_cast<T**>(pointer_adjusted);
+			T*& pointerreference = *pointerpointer;
+			T* allocationtarget = reinterpret_cast<T*>(data_adjusted);
+			pointerreference = allocationtarget;
+			return allocationtarget;
+		}
+
+		template <typename T, typename Real>
+		Real* usertype_unique_allocate(lua_State* L, T**& pref, unique_destructor*& dx, unique_tag*& id) {
+			typedef std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY_I_)
+			     false
+#else
+			     (std::alignment_of<T*>::value > 1 || std::alignment_of<unique_tag>::value > 1 || std::alignment_of<unique_destructor>::value > 1
+			          || std::alignment_of<Real>::value > 1)
+#endif
+			     >
+			     use_align;
+			if (!use_align::value) {
+				pref = static_cast<T**>(lua_newuserdata(L, sizeof(T*) + sizeof(detail::unique_destructor) + sizeof(unique_tag) + sizeof(Real)));
+				dx = static_cast<detail::unique_destructor*>(static_cast<void*>(pref + 1));
+				id = static_cast<unique_tag*>(static_cast<void*>(dx + 1));
+				Real* mem = static_cast<Real*>(static_cast<void*>(id + 1));
+				return mem;
+			}
+
+			static const std::size_t initial_size = aligned_space_for<T*, unique_destructor, unique_tag, Real>(nullptr);
+			static const std::size_t misaligned_size = aligned_space_for<T*, unique_destructor, unique_tag, Real>(reinterpret_cast<void*>(0x1));
+
+			void* pointer_adjusted;
+			void* dx_adjusted;
+			void* id_adjusted;
+			void* data_adjusted;
+			bool result = attempt_alloc_unique(L,
+			     std::alignment_of_v<T*>,
+			     sizeof(T*),
+			     std::alignment_of_v<Real>,
+			     sizeof(Real),
+			     initial_size,
+			     pointer_adjusted,
+			     dx_adjusted,
+			     id_adjusted,
+			     data_adjusted);
+			if (!result) {
+				// we're likely to get something that fails to perform the proper allocation a second time,
+				// so we use the suggested_new_size bump to help us out here
+				pointer_adjusted = nullptr;
+				dx_adjusted = nullptr;
+				id_adjusted = nullptr;
+				data_adjusted = nullptr;
+				result = attempt_alloc_unique(L,
+				     std::alignment_of_v<T*>,
+				     sizeof(T*),
+				     std::alignment_of_v<Real>,
+				     sizeof(Real),
+				     misaligned_size,
+				     pointer_adjusted,
+				     dx_adjusted,
+				     id_adjusted,
+				     data_adjusted);
+				if (!result) {
+					if (pointer_adjusted == nullptr) {
+						luaL_error(L, "aligned allocation of userdata block (pointer section) for '%s' failed", detail::demangle<T>().c_str());
+					}
+					else if (dx_adjusted == nullptr) {
+						luaL_error(L, "aligned allocation of userdata block (deleter section) for '%s' failed", detail::demangle<T>().c_str());
+					}
+					else {
+						luaL_error(L, "aligned allocation of userdata block (data section) for '%s' failed", detail::demangle<T>().c_str());
+					}
+					return nullptr;
+				}
+			}
+
+			pref = static_cast<T**>(pointer_adjusted);
+			dx = static_cast<detail::unique_destructor*>(dx_adjusted);
+			id = static_cast<unique_tag*>(id_adjusted);
+			Real* mem = static_cast<Real*>(data_adjusted);
+			return mem;
+		}
+
+		template <typename T>
+		T* user_allocate(lua_State* L) {
+			typedef std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY_I_)
+			     false
+#else
+			     (std::alignment_of_v<T> > 1)
+#endif
+			     >
+			     use_align;
+			if (!use_align::value) {
+				T* pointer = static_cast<T*>(lua_newuserdata(L, sizeof(T)));
+				return pointer;
+			}
+
+			static const std::size_t initial_size = aligned_space_for<T>(nullptr);
+			static const std::size_t misaligned_size = aligned_space_for<T>(reinterpret_cast<void*>(0x1));
+
+			std::size_t allocated_size = initial_size;
+			void* unadjusted = lua_newuserdata(L, allocated_size);
+			void* adjusted = align(std::alignment_of_v<T>, sizeof(T), unadjusted, allocated_size);
+			if (adjusted == nullptr) {
+				lua_pop(L, 1);
+				// try again, add extra space for alignment padding
+				allocated_size = misaligned_size;
+				unadjusted = lua_newuserdata(L, allocated_size);
+				adjusted = align(std::alignment_of_v<T>, sizeof(T), unadjusted, allocated_size);
+				if (adjusted == nullptr) {
+					lua_pop(L, 1);
+					luaL_error(L, "cannot properly align memory for '%s'", detail::demangle<T>().data());
+				}
+			}
+			return static_cast<T*>(adjusted);
+		}
+
+		template <typename T>
+		int usertype_alloc_destruct(lua_State* L) {
+			void* memory = lua_touserdata(L, 1);
+			memory = align_usertype_pointer(memory);
+			T** pdata = static_cast<T**>(memory);
+			T* data = *pdata;
+			std::allocator<T> alloc {};
+			std::allocator_traits<std::allocator<T>>::destroy(alloc, data);
+			return 0;
+		}
+
+		template <typename T>
+		int unique_destruct(lua_State* L) {
+			void* memory = lua_touserdata(L, 1);
+			memory = align_usertype_unique_destructor(memory);
+			unique_destructor& dx = *static_cast<unique_destructor*>(memory);
+			memory = align_usertype_unique_tag<true>(memory);
+			(dx)(memory);
+			return 0;
+		}
+
+		template <typename T>
+		int user_alloc_destruct(lua_State* L) {
+			void* memory = lua_touserdata(L, 1);
+			memory = align_user<T>(memory);
+			T* data = static_cast<T*>(memory);
+			std::allocator<T> alloc;
+			std::allocator_traits<std::allocator<T>>::destroy(alloc, data);
+			return 0;
+		}
+
+		template <typename T, typename Real>
+		void usertype_unique_alloc_destroy(void* memory) {
+			memory = align_usertype_unique<Real, true>(memory);
+			Real* target = static_cast<Real*>(memory);
+			std::allocator<Real> alloc;
+			std::allocator_traits<std::allocator<Real>>::destroy(alloc, target);
+		}
+
+		template <typename T>
+		int cannot_destruct(lua_State* L) {
+			return luaL_error(L,
+			     "cannot call the destructor for '%s': it is either hidden (protected/private) or removed with '= "
+			     "delete' and thusly this type is being destroyed without properly destructing, invoking undefined "
+			     "behavior: please bind a usertype and specify a custom destructor to define the behavior properly",
+			     detail::demangle<T>().data());
+		}
+
+		template <typename T>
+		void reserve(T&, std::size_t) {
+		}
+
+		template <typename T, typename Al>
+		void reserve(std::vector<T, Al>& vec, std::size_t hint) {
+			vec.reserve(hint);
+		}
+
+		template <typename T, typename Tr, typename Al>
+		void reserve(std::basic_string<T, Tr, Al>& str, std::size_t hint) {
+			str.reserve(hint);
+		}
+
+		inline bool property_always_true(meta_function) {
+			return true;
+		}
+
+		struct properties_enrollment_allowed {
+			int& times_through;
+			std::bitset<64>& properties;
+			automagic_enrollments& enrollments;
+
+			properties_enrollment_allowed(int& times, std::bitset<64>& props, automagic_enrollments& enroll)
+			: times_through(times), properties(props), enrollments(enroll) {
+			}
+
+			bool operator()(meta_function mf) const {
+				bool p = properties[static_cast<int>(mf)];
+				if (times_through > 0) {
+					return p;
+				}
+				switch (mf) {
+				case meta_function::length:
+					return enrollments.length_operator && !p;
+				case meta_function::pairs:
+					return enrollments.pairs_operator && !p;
+				case meta_function::call:
+					return enrollments.call_operator && !p;
+				case meta_function::less_than:
+					return enrollments.less_than_operator && !p;
+				case meta_function::less_than_or_equal_to:
+					return enrollments.less_than_or_equal_to_operator && !p;
+				case meta_function::equal_to:
+					return enrollments.equal_to_operator && !p;
+				default:
+					break;
+				}
+				return !p;
+			}
+		};
+
+		struct indexed_insert {
+			lua_reg_table& l;
+			int& index;
+
+			indexed_insert(lua_reg_table& cont, int& idx) : l(cont), index(idx) {
+			}
+			void operator()(meta_function mf, lua_CFunction f) {
+				l[index] = luaL_Reg { to_string(mf).c_str(), f };
+				++index;
+			}
+		};
+	} // namespace detail
+
+	namespace stack {
+
+		template <typename T, bool global = false, bool raw = false, typename = void>
+		struct field_getter;
+		template <typename T, typename P, bool global = false, bool raw = false, typename = void>
+		struct probe_field_getter;
+
+		template <typename T, bool global = false, bool raw = false, typename = void>
+		struct field_setter;
+
+		template <typename T, typename = void>
+		struct unqualified_getter;
+		template <typename T, typename = void>
+		struct qualified_getter;
+
+		template <typename T, typename = void>
+		struct qualified_interop_getter;
+		template <typename T, typename = void>
+		struct unqualified_interop_getter;
+
+		template <typename T, typename = void>
+		struct popper;
+
+		template <typename T, typename = void>
+		struct unqualified_pusher;
+
+		template <typename T, type t, typename = void>
+		struct unqualified_checker;
+		template <typename T, type t, typename = void>
+		struct qualified_checker;
+
+		template <typename T, typename = void>
+		struct unqualified_check_getter;
+		template <typename T, typename = void>
+		struct qualified_check_getter;
+
+		struct probe {
+			bool success;
+			int levels;
+
+			probe(bool s, int l) : success(s), levels(l) {
+			}
+
+			operator bool() const {
+				return success;
+			};
+		};
+
+		struct record {
+			int last;
+			int used;
+
+			record() noexcept : last(), used() {
+			}
+			void use(int count) noexcept {
+				last = count;
+				used += count;
+			}
+		};
+
+		namespace stack_detail {
+			template <typename Function>
+			Function* get_function_pointer(lua_State*, int, record&) noexcept;
+			template <typename Function, typename Handler>
+			bool check_function_pointer(lua_State* L, int index, Handler&& handler, record& tracking) noexcept;
+		} // namespace stack_detail
+
+	} // namespace stack
+
+	namespace meta { namespace meta_detail {
+
+		template <typename T>
+		using adl_sol_lua_get_test_t = decltype(sol_lua_get(types<T>(), static_cast<lua_State*>(nullptr), -1, std::declval<stack::record&>()));
+
+		template <typename T>
+		using adl_sol_lua_interop_get_test_t
+			= decltype(sol_lua_interop_get(types<T>(), static_cast<lua_State*>(nullptr), -1, static_cast<void*>(nullptr), std::declval<stack::record&>()));
+
+		template <typename T>
+		using adl_sol_lua_check_test_t = decltype(sol_lua_check(types<T>(), static_cast<lua_State*>(nullptr), -1, no_panic, std::declval<stack::record&>()));
+
+		template <typename T>
+		using adl_sol_lua_interop_check_test_t
+			= decltype(sol_lua_interop_check(types<T>(), static_cast<lua_State*>(nullptr), -1, type::none, no_panic, std::declval<stack::record&>()));
+
+		template <typename T>
+		using adl_sol_lua_check_get_test_t
+			= decltype(sol_lua_check_get(types<T>(), static_cast<lua_State*>(nullptr), -1, no_panic, std::declval<stack::record&>()));
+
+		template <typename... Args>
+		using adl_sol_lua_push_test_t = decltype(sol_lua_push(static_cast<lua_State*>(nullptr), std::declval<Args>()...));
+
+		template <typename T, typename... Args>
+		using adl_sol_lua_push_exact_test_t = decltype(sol_lua_push(types<T>(), static_cast<lua_State*>(nullptr), std::declval<Args>()...));
+
+		template <typename T>
+		inline constexpr bool is_adl_sol_lua_get_v = meta::is_detected_v<adl_sol_lua_get_test_t, T>;
+
+		template <typename T>
+		inline constexpr bool is_adl_sol_lua_interop_get_v = meta::is_detected_v<adl_sol_lua_interop_get_test_t, T>;
+
+		template <typename T>
+		inline constexpr bool is_adl_sol_lua_check_v = meta::is_detected_v<adl_sol_lua_check_test_t, T>;
+
+		template <typename T>
+		inline constexpr bool is_adl_sol_lua_interop_check_v = meta::is_detected_v<adl_sol_lua_interop_check_test_t, T>;
+
+		template <typename T>
+		inline constexpr bool is_adl_sol_lua_check_get_v = meta::is_detected_v<adl_sol_lua_check_get_test_t, T>;
+
+		template <typename... Args>
+		inline constexpr bool is_adl_sol_lua_push_v = meta::is_detected_v<adl_sol_lua_push_test_t, Args...>;
+
+		template <typename T, typename... Args>
+		inline constexpr bool is_adl_sol_lua_push_exact_v = meta::is_detected_v<adl_sol_lua_push_exact_test_t, T, Args...>;
+	}} // namespace meta::meta_detail
+
+	namespace stack {
+		namespace stack_detail {
+			constexpr const char* not_enough_stack_space = "not enough space left on Lua stack";
+			constexpr const char* not_enough_stack_space_floating = "not enough space left on Lua stack for a floating point number";
+			constexpr const char* not_enough_stack_space_integral = "not enough space left on Lua stack for an integral number";
+			constexpr const char* not_enough_stack_space_string = "not enough space left on Lua stack for a string";
+			constexpr const char* not_enough_stack_space_meta_function_name = "not enough space left on Lua stack for the name of a meta_function";
+			constexpr const char* not_enough_stack_space_userdata = "not enough space left on Lua stack to create a sol3 userdata";
+			constexpr const char* not_enough_stack_space_generic = "not enough space left on Lua stack to push valuees";
+			constexpr const char* not_enough_stack_space_environment = "not enough space left on Lua stack to retrieve environment";
+
+			template <typename T>
+			struct strip {
+				typedef T type;
+			};
+			template <typename T>
+			struct strip<std::reference_wrapper<T>> {
+				typedef T& type;
+			};
+			template <typename T>
+			struct strip<user<T>> {
+				typedef T& type;
+			};
+			template <typename T>
+			struct strip<non_null<T>> {
+				typedef T type;
+			};
+			template <typename T>
+			using strip_t = typename strip<T>::type;
+
+			template <typename C>
+			static int get_size_hint(C& c) {
+				return static_cast<int>(c.size());
+			}
+
+			template <typename V, typename Al>
+			static int get_size_hint(const std::forward_list<V, Al>&) {
+				// forward_list makes me sad
+				return static_cast<int>(32);
+			}
+
+			template <typename T>
+			decltype(auto) unchecked_unqualified_get(lua_State* L, int index, record& tracking) {
+				using Tu = meta::unqualified_t<T>;
+				if constexpr (meta::meta_detail::is_adl_sol_lua_get_v<Tu>) {
+					return sol_lua_get(types<Tu>(), L, index, tracking);
+				}
+				else {
+					unqualified_getter<Tu> g {};
+					(void)g;
+					return g.get(L, index, tracking);
+				}
+			}
+
+			template <typename T>
+			decltype(auto) unchecked_get(lua_State* L, int index, record& tracking) {
+				if constexpr (meta::meta_detail::is_adl_sol_lua_get_v<T>) {
+					return sol_lua_get(types<T>(), L, index, tracking);
+				}
+				else {
+					qualified_getter<T> g {};
+					(void)g;
+					return g.get(L, index, tracking);
+				}
+			}
+
+			template <typename T>
+			decltype(auto) unqualified_interop_get(lua_State* L, int index, void* unadjusted_pointer, record& tracking) {
+				using Tu = meta::unqualified_t<T>;
+				if constexpr (meta::meta_detail::is_adl_sol_lua_interop_get_v<Tu>) {
+					return sol_lua_interop_get(types<Tu>(), L, index, unadjusted_pointer, tracking);
+				}
+				else {
+					(void)L;
+					(void)index;
+					(void)unadjusted_pointer;
+					(void)tracking;
+					using Ti = stack_detail::strip_t<Tu>;
+					return std::pair<bool, Ti*> { false, nullptr };
+				}
+			}
+
+			template <typename T>
+			decltype(auto) interop_get(lua_State* L, int index, void* unadjusted_pointer, record& tracking) {
+				if constexpr (meta::meta_detail::is_adl_sol_lua_interop_get_v<T>) {
+					return sol_lua_interop_get(types<T>(), L, index, unadjusted_pointer, tracking);
+				}
+				else {
+					return unqualified_interop_get<T>(L, index, unadjusted_pointer, tracking);
+				}
+			}
+
+			template <typename T, typename Handler>
+			bool unqualified_interop_check(lua_State* L, int index, type index_type, Handler&& handler, record& tracking) {
+				using Tu = meta::unqualified_t<T>;
+				if constexpr (meta::meta_detail::is_adl_sol_lua_interop_check_v<Tu>) {
+					return sol_lua_interop_check(types<Tu>(), L, index, index_type, std::forward<Handler>(handler), tracking);
+				}
+				else {
+					(void)L;
+					(void)index;
+					(void)index_type;
+					(void)handler;
+					(void)tracking;
+					return false;
+				}
+			}
+
+			template <typename T, typename Handler>
+			bool interop_check(lua_State* L, int index, type index_type, Handler&& handler, record& tracking) {
+				if constexpr (meta::meta_detail::is_adl_sol_lua_interop_check_v<T>) {
+					return sol_lua_interop_check(types<T>(), L, index, index_type, std::forward<Handler>(handler), tracking);
+				}
+				else {
+					return unqualified_interop_check<T>(L, index, index_type, std::forward<Handler>(handler), tracking);
+				}
+			}
+
+			using undefined_method_func = void (*)(stack_reference);
+
+			struct undefined_metatable {
+				lua_State* L;
+				const char* key;
+				undefined_method_func on_new_table;
+
+				undefined_metatable(lua_State* l, const char* k, undefined_method_func umf) : L(l), key(k), on_new_table(umf) {
+				}
+
+				void operator()() const {
+					if (luaL_newmetatable(L, key) == 1) {
+						on_new_table(stack_reference(L, -1));
+					}
+					lua_setmetatable(L, -2);
+				}
+			};
+		} // namespace stack_detail
+
+		inline bool maybe_indexable(lua_State* L, int index = -1) {
+			type t = type_of(L, index);
+			return t == type::userdata || t == type::table;
+		}
+
+		inline int top(lua_State* L) {
+			return lua_gettop(L);
+		}
+
+		inline bool is_main_thread(lua_State* L) {
+			int ismainthread = lua_pushthread(L);
+			lua_pop(L, 1);
+			return ismainthread == 1;
+		}
+
+		inline void coroutine_create_guard(lua_State* L) {
+			if (is_main_thread(L)) {
+				return;
+			}
+			int stacksize = lua_gettop(L);
+			if (stacksize < 1) {
+				return;
+			}
+			if (type_of(L, 1) != type::function) {
+				return;
+			}
+			// well now we're screwed...
+			// we can clean the stack and pray it doesn't destroy anything?
+			lua_pop(L, stacksize);
+		}
+
+		inline void clear(lua_State* L, int table_index) {
+			lua_pushnil(L);
+			while (lua_next(L, table_index) != 0) {
+				// remove value
+				lua_pop(L, 1);
+				// duplicate key to protect form rawset
+				lua_pushvalue(L, -1);
+				// push new value
+				lua_pushnil(L);
+				// table_index%[key] = nil
+				lua_rawset(L, table_index);
+			}
+		}
+
+		inline void clear(reference& r) {
+			auto pp = push_pop<false>(r);
+			int stack_index = pp.index_of(r);
+			clear(r.lua_state(), stack_index);
+		}
+
+		inline void clear(stack_reference& r) {
+			clear(r.lua_state(), r.stack_index());
+		}
+
+		template <typename T, typename... Args>
+		int push(lua_State* L, T&& t, Args&&... args) {
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (meta::meta_detail::is_adl_sol_lua_push_exact_v<T, T, Args...>) {
+				return sol_lua_push(types<T>(), L, std::forward<T>(t), std::forward<Args>(args)...);
+			}
+			else if constexpr (meta::meta_detail::is_adl_sol_lua_push_exact_v<Tu, T, Args...>) {
+				return sol_lua_push(types<Tu>(), L, std::forward<T>(t), std::forward<Args>(args)...);
+			}
+			else if constexpr (meta::meta_detail::is_adl_sol_lua_push_v<T, Args...>) {
+				return sol_lua_push(L, std::forward<T>(t), std::forward<Args>(args)...);
+			}
+			else {
+				unqualified_pusher<Tu> p {};
+				(void)p;
+				return p.push(L, std::forward<T>(t), std::forward<Args>(args)...);
+			}
+		}
+
+		// overload allows to use a pusher of a specific type, but pass in any kind of args
+		template <typename T, typename Arg, typename... Args, typename = std::enable_if_t<!std::is_same<T, Arg>::value>>
+		int push(lua_State* L, Arg&& arg, Args&&... args) {
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (meta::meta_detail::is_adl_sol_lua_push_exact_v<T, Arg, Args...>) {
+				return sol_lua_push(types<T>(), L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+			}
+			else if constexpr (meta::meta_detail::is_adl_sol_lua_push_exact_v<Tu, Arg, Args...>) {
+				return sol_lua_push(types<Tu>(), L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+			}
+			else if constexpr (meta::meta_detail::is_adl_sol_lua_push_v<Arg, Args...>) {
+				return sol_lua_push(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+			}
+			else {
+				unqualified_pusher<Tu> p {};
+				(void)p;
+				return p.push(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+			}
+		}
+
+		template <typename T, typename... Args>
+		int push_userdata(lua_State* L, T&& t, Args&&... args) {
+			using U = meta::unqualified_t<T>;
+			using Tr = meta::conditional_t<std::is_pointer_v<U>,
+			     detail::as_pointer_tag<std::remove_pointer_t<U>>,
+			     meta::conditional_t<is_unique_usertype_v<U>, detail::as_unique_tag<U>, detail::as_value_tag<U>>>;
+			return stack::push<Tr>(L, std::forward<T>(t), std::forward<Args>(args)...);
+		}
+
+		template <typename T, typename Arg, typename... Args>
+		int push_userdata(lua_State* L, Arg&& arg, Args&&... args) {
+			using U = meta::unqualified_t<T>;
+			using Tr = meta::conditional_t<std::is_pointer_v<U>,
+			     detail::as_pointer_tag<std::remove_pointer_t<U>>,
+			     meta::conditional_t<is_unique_usertype_v<U>, detail::as_unique_tag<U>, detail::as_value_tag<U>>>;
+			return stack::push<Tr>(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+		}
+
+		namespace stack_detail {
+
+			template <typename T, typename Arg, typename... Args>
+			int push_reference(lua_State* L, Arg&& arg, Args&&... args) {
+				using use_reference_tag = meta::all<std::is_lvalue_reference<T>,
+				     meta::neg<std::is_const<std::remove_reference_t<T>>>,
+				     meta::neg<is_lua_primitive<meta::unqualified_t<T>>>,
+				     meta::neg<is_unique_usertype<meta::unqualified_t<T>>>>;
+				using Tr = meta::conditional_t<use_reference_tag::value, detail::as_reference_tag, meta::unqualified_t<T>>;
+				return stack::push<Tr>(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+			}
+
+		} // namespace stack_detail
+
+		template <typename T, typename... Args>
+		int push_reference(lua_State* L, T&& t, Args&&... args) {
+			return stack_detail::push_reference<T>(L, std::forward<T>(t), std::forward<Args>(args)...);
+		}
+
+		template <typename T, typename Arg, typename... Args>
+		int push_reference(lua_State* L, Arg&& arg, Args&&... args) {
+			return stack_detail::push_reference<T>(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+		}
+
+		inline int multi_push(lua_State*) {
+			// do nothing
+			return 0;
+		}
+
+		template <typename T, typename... Args>
+		int multi_push(lua_State* L, T&& t, Args&&... args) {
+			int pushcount = push(L, std::forward<T>(t));
+			void(detail::swallow { (pushcount += stack::push(L, std::forward<Args>(args)), 0)... });
+			return pushcount;
+		}
+
+		inline int multi_push_reference(lua_State*) {
+			// do nothing
+			return 0;
+		}
+
+		template <typename T, typename... Args>
+		int multi_push_reference(lua_State* L, T&& t, Args&&... args) {
+			int pushcount = push_reference(L, std::forward<T>(t));
+			void(detail::swallow { (pushcount += stack::push_reference(L, std::forward<Args>(args)), 0)... });
+			return pushcount;
+		}
+
+		template <typename T, typename Handler>
+		bool unqualified_check(lua_State* L, int index, Handler&& handler, record& tracking) {
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (meta::meta_detail::is_adl_sol_lua_check_v<Tu>) {
+				return sol_lua_check(types<Tu>(), L, index, std::forward<Handler>(handler), tracking);
+			}
+			else {
+				unqualified_checker<Tu, lua_type_of_v<Tu>> c;
+				// VC++ has a bad warning here: shut it up
+				(void)c;
+				return c.check(L, index, std::forward<Handler>(handler), tracking);
+			}
+		}
+
+		template <typename T, typename Handler>
+		bool unqualified_check(lua_State* L, int index, Handler&& handler) {
+			record tracking {};
+			return unqualified_check<T>(L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename T>
+		bool unqualified_check(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
+			auto handler = no_panic;
+			return unqualified_check<T>(L, index, handler);
+		}
+
+		template <typename T, typename Handler>
+		bool check(lua_State* L, int index, Handler&& handler, record& tracking) {
+			if constexpr (meta::meta_detail::is_adl_sol_lua_check_v<T>) {
+				return sol_lua_check(types<T>(), L, index, std::forward<Handler>(handler), tracking);
+			}
+			else {
+				using Tu = meta::unqualified_t<T>;
+				qualified_checker<T, lua_type_of_v<Tu>> c;
+				// VC++ has a bad warning here: shut it up
+				(void)c;
+				return c.check(L, index, std::forward<Handler>(handler), tracking);
+			}
+		}
+
+		template <typename T, typename Handler>
+		bool check(lua_State* L, int index, Handler&& handler) {
+			record tracking {};
+			return check<T>(L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename T>
+		bool check(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
+			auto handler = no_panic;
+			return check<T>(L, index, handler);
+		}
+
+		template <typename T, typename Handler>
+		bool check_usertype(lua_State* L, int index, type, Handler&& handler, record& tracking) {
+			using Tu = meta::unqualified_t<T>;
+			using detail_t = meta::conditional_t<std::is_pointer_v<T>, detail::as_pointer_tag<Tu>, detail::as_value_tag<Tu>>;
+			return check<detail_t>(L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename T, typename Handler>
+		bool check_usertype(lua_State* L, int index, Handler&& handler, record& tracking) {
+			using Tu = meta::unqualified_t<T>;
+			using detail_t = meta::conditional_t<std::is_pointer_v<T>, detail::as_pointer_tag<Tu>, detail::as_value_tag<Tu>>;
+			return check<detail_t>(L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename T, typename Handler>
+		bool check_usertype(lua_State* L, int index, Handler&& handler) {
+			record tracking {};
+			return check_usertype<T>(L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename T>
+		bool check_usertype(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
+			auto handler = no_panic;
+			return check_usertype<T>(L, index, handler);
+		}
+
+		template <typename T, typename Handler>
+		decltype(auto) unqualified_check_get(lua_State* L, int index, Handler&& handler, record& tracking) {
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (meta::meta_detail::is_adl_sol_lua_check_get_v<T>) {
+				return sol_lua_check_get(types<T>(), L, index, std::forward<Handler>(handler), tracking);
+			}
+			else if constexpr (meta::meta_detail::is_adl_sol_lua_check_get_v<Tu>) {
+				return sol_lua_check_get(types<Tu>(), L, index, std::forward<Handler>(handler), tracking);
+			}
+			else {
+				unqualified_check_getter<Tu> cg {};
+				(void)cg;
+				return cg.get(L, index, std::forward<Handler>(handler), tracking);
+			}
+		}
+
+		template <typename T, typename Handler>
+		decltype(auto) unqualified_check_get(lua_State* L, int index, Handler&& handler) {
+			record tracking {};
+			return unqualified_check_get<T>(L, index, handler, tracking);
+		}
+
+		template <typename T>
+		decltype(auto) unqualified_check_get(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
+			auto handler = no_panic;
+			return unqualified_check_get<T>(L, index, handler);
+		}
+
+		template <typename T, typename Handler>
+		decltype(auto) check_get(lua_State* L, int index, Handler&& handler, record& tracking) {
+			if constexpr (meta::meta_detail::is_adl_sol_lua_check_get_v<T>) {
+				return sol_lua_check_get(types<T>(), L, index, std::forward<Handler>(handler), tracking);
+			}
+			else {
+				qualified_check_getter<T> cg {};
+				(void)cg;
+				return cg.get(L, index, std::forward<Handler>(handler), tracking);
+			}
+		}
+
+		template <typename T, typename Handler>
+		decltype(auto) check_get(lua_State* L, int index, Handler&& handler) {
+			record tracking {};
+			return check_get<T>(L, index, handler, tracking);
+		}
+
+		template <typename T>
+		decltype(auto) check_get(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
+			auto handler = no_panic;
+			return check_get<T>(L, index, handler);
+		}
+
+		namespace stack_detail {
+
+			template <typename Handler>
+			bool check_types(lua_State*, int, Handler&&, record&) {
+				return true;
+			}
+
+			template <typename T, typename... Args, typename Handler>
+			bool check_types(lua_State* L, int firstargument, Handler&& handler, record& tracking) {
+				if (!stack::check<T>(L, firstargument + tracking.used, handler, tracking))
+					return false;
+				return check_types<Args...>(L, firstargument, std::forward<Handler>(handler), tracking);
+			}
+
+			template <typename... Args, typename Handler>
+			bool check_types(types<Args...>, lua_State* L, int index, Handler&& handler, record& tracking) {
+				return check_types<Args...>(L, index, std::forward<Handler>(handler), tracking);
+			}
+
+		} // namespace stack_detail
+
+		template <typename... Args, typename Handler>
+		bool multi_check(lua_State* L, int index, Handler&& handler, record& tracking) {
+			return stack_detail::check_types<Args...>(L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename... Args, typename Handler>
+		bool multi_check(lua_State* L, int index, Handler&& handler) {
+			record tracking {};
+			return multi_check<Args...>(L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename... Args>
+		bool multi_check(lua_State* L, int index) {
+			return multi_check<Args...>(L, index);
+		}
+
+		template <typename T>
+		auto unqualified_get(lua_State* L, int index, record& tracking) -> decltype(stack_detail::unchecked_unqualified_get<T>(L, index, tracking)) {
+#if SOL_IS_ON(SOL_SAFE_GETTER_I_)
+			static constexpr bool is_op = meta::is_optional_v<T>;
+			if constexpr (is_op) {
+				return stack_detail::unchecked_unqualified_get<T>(L, index, tracking);
+			}
+			else {
+				if (is_lua_reference<T>::value) {
+					return stack_detail::unchecked_unqualified_get<T>(L, index, tracking);
+				}
+				auto op = unqualified_check_get<T>(L, index, type_panic_c_str, tracking);
+				return *std::move(op);
+			}
+#else
+			return stack_detail::unchecked_unqualified_get<T>(L, index, tracking);
+#endif
+		}
+
+		template <typename T>
+		decltype(auto) unqualified_get(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
+			record tracking {};
+			return unqualified_get<T>(L, index, tracking);
+		}
+
+		template <typename T>
+		auto get(lua_State* L, int index, record& tracking) -> decltype(stack_detail::unchecked_get<T>(L, index, tracking)) {
+#if SOL_IS_ON(SOL_SAFE_GETTER_I_)
+			static constexpr bool is_op = meta::is_optional_v<T>;
+			if constexpr (is_op) {
+				return stack_detail::unchecked_get<T>(L, index, tracking);
+			}
+			else {
+				if (is_lua_reference<T>::value) {
+					return stack_detail::unchecked_get<T>(L, index, tracking);
+				}
+				auto op = check_get<T>(L, index, type_panic_c_str, tracking);
+				return *std::move(op);
+			}
+#else
+			return stack_detail::unchecked_get<T>(L, index, tracking);
+#endif
+		}
+
+		template <typename T>
+		decltype(auto) get(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
+			record tracking {};
+			return get<T>(L, index, tracking);
+		}
+
+		template <typename T>
+		decltype(auto) get_usertype(lua_State* L, int index, record& tracking) {
+			using UT = meta::conditional_t<std::is_pointer<T>::value, detail::as_pointer_tag<std::remove_pointer_t<T>>, detail::as_value_tag<T>>;
+			return get<UT>(L, index, tracking);
+		}
+
+		template <typename T>
+		decltype(auto) get_usertype(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
+			record tracking {};
+			return get_usertype<T>(L, index, tracking);
+		}
+
+		template <typename T>
+		decltype(auto) pop(lua_State* L) {
+			return popper<meta::unqualified_t<T>> {}.pop(L);
+		}
+
+		template <bool global = false, bool raw = false, typename Key>
+		void get_field(lua_State* L, Key&& key) {
+			field_getter<meta::unqualified_t<Key>, global, raw> {}.get(L, std::forward<Key>(key));
+		}
+
+		template <bool global = false, bool raw = false, typename Key>
+		void get_field(lua_State* L, Key&& key, int tableindex) {
+			field_getter<meta::unqualified_t<Key>, global, raw> {}.get(L, std::forward<Key>(key), tableindex);
+		}
+
+		template <bool global = false, typename Key>
+		void raw_get_field(lua_State* L, Key&& key) {
+			get_field<global, true>(L, std::forward<Key>(key));
+		}
+
+		template <bool global = false, typename Key>
+		void raw_get_field(lua_State* L, Key&& key, int tableindex) {
+			get_field<global, true>(L, std::forward<Key>(key), tableindex);
+		}
+
+		template <bool global = false, bool raw = false, typename C = detail::non_lua_nil_t, typename Key>
+		probe probe_get_field(lua_State* L, Key&& key) {
+			return probe_field_getter<meta::unqualified_t<Key>, C, global, raw> {}.get(L, std::forward<Key>(key));
+		}
+
+		template <bool global = false, bool raw = false, typename C = detail::non_lua_nil_t, typename Key>
+		probe probe_get_field(lua_State* L, Key&& key, int tableindex) {
+			return probe_field_getter<meta::unqualified_t<Key>, C, global, raw> {}.get(L, std::forward<Key>(key), tableindex);
+		}
+
+		template <bool global = false, typename C = detail::non_lua_nil_t, typename Key>
+		probe probe_raw_get_field(lua_State* L, Key&& key) {
+			return probe_get_field<global, true, C>(L, std::forward<Key>(key));
+		}
+
+		template <bool global = false, typename C = detail::non_lua_nil_t, typename Key>
+		probe probe_raw_get_field(lua_State* L, Key&& key, int tableindex) {
+			return probe_get_field<global, true, C>(L, std::forward<Key>(key), tableindex);
+		}
+
+		template <bool global = false, bool raw = false, typename Key, typename Value>
+		void set_field(lua_State* L, Key&& key, Value&& value) {
+			field_setter<meta::unqualified_t<Key>, global, raw> {}.set(L, std::forward<Key>(key), std::forward<Value>(value));
+		}
+
+		template <bool global = false, bool raw = false, typename Key, typename Value>
+		void set_field(lua_State* L, Key&& key, Value&& value, int tableindex) {
+			field_setter<meta::unqualified_t<Key>, global, raw> {}.set(L, std::forward<Key>(key), std::forward<Value>(value), tableindex);
+		}
+
+		template <bool global = false, typename Key, typename Value>
+		void raw_set_field(lua_State* L, Key&& key, Value&& value) {
+			set_field<global, true>(L, std::forward<Key>(key), std::forward<Value>(value));
+		}
+
+		template <bool global = false, typename Key, typename Value>
+		void raw_set_field(lua_State* L, Key&& key, Value&& value, int tableindex) {
+			set_field<global, true>(L, std::forward<Key>(key), std::forward<Value>(value), tableindex);
+		}
+
+		template <typename T, typename F>
+		void modify_unique_usertype_as(const stack_reference& obj, F&& f) {
+			using u_traits = unique_usertype_traits<T>;
+			void* raw = lua_touserdata(obj.lua_state(), obj.stack_index());
+			void* ptr_memory = detail::align_usertype_pointer(raw);
+			void* uu_memory = detail::align_usertype_unique<T>(raw);
+			T& uu = *static_cast<T*>(uu_memory);
+			f(uu);
+			*static_cast<void**>(ptr_memory) = static_cast<void*>(u_traits::get(uu));
+		}
+
+		template <typename F>
+		void modify_unique_usertype(const stack_reference& obj, F&& f) {
+			using bt = meta::bind_traits<meta::unqualified_t<F>>;
+			using T = typename bt::template arg_at<0>;
+			using Tu = meta::unqualified_t<T>;
+			modify_unique_usertype_as<Tu>(obj, std::forward<F>(f));
+		}
+
+	} // namespace stack
+
+	namespace detail {
+
+		template <typename T>
+		lua_CFunction make_destructor(std::true_type) {
+			if constexpr (is_unique_usertype_v<T>) {
+				return &unique_destruct<T>;
+			}
+			else if constexpr (!std::is_pointer_v<T>) {
+				return &usertype_alloc_destruct<T>;
+			}
+			else {
+				return &cannot_destruct<T>;
+			}
+		}
+
+		template <typename T>
+		lua_CFunction make_destructor(std::false_type) {
+			return &cannot_destruct<T>;
+		}
+
+		template <typename T>
+		lua_CFunction make_destructor() {
+			return make_destructor<T>(std::is_destructible<T>());
+		}
+
+		struct no_comp {
+			template <typename A, typename B>
+			bool operator()(A&&, B&&) const {
+				return false;
+			}
+		};
+
+		template <typename T>
+		int is_check(lua_State* L) {
+			return stack::push(L, stack::check<T>(L, 1, &no_panic));
+		}
+
+		template <typename T>
+		int member_default_to_string(std::true_type, lua_State* L) {
+			decltype(auto) ts = stack::get<T>(L, 1).to_string();
+			return stack::push(L, std::forward<decltype(ts)>(ts));
+		}
+
+		template <typename T>
+		int member_default_to_string(std::false_type, lua_State* L) {
+			return luaL_error(L,
+			     "cannot perform to_string on '%s': no 'to_string' overload in namespace, 'to_string' member "
+			     "function, or operator<<(ostream&, ...) present",
+			     detail::demangle<T>().data());
+		}
+
+		template <typename T>
+		int adl_default_to_string(std::true_type, lua_State* L) {
+			using namespace std;
+			decltype(auto) ts = to_string(stack::get<T>(L, 1));
+			return stack::push(L, std::forward<decltype(ts)>(ts));
+		}
+
+		template <typename T>
+		int adl_default_to_string(std::false_type, lua_State* L) {
+			return member_default_to_string<T>(meta::supports_to_string_member<T>(), L);
+		}
+
+		template <typename T>
+		int oss_default_to_string(std::true_type, lua_State* L) {
+			std::ostringstream oss;
+			oss << stack::unqualified_get<T>(L, 1);
+			return stack::push(L, oss.str());
+		}
+
+		template <typename T>
+		int oss_default_to_string(std::false_type, lua_State* L) {
+			return adl_default_to_string<T>(meta::supports_adl_to_string<T>(), L);
+		}
+
+		template <typename T>
+		int default_to_string(lua_State* L) {
+			return oss_default_to_string<T>(meta::supports_op_left_shift<std::ostream, T>(), L);
+		}
+
+		template <typename T>
+		int default_size(lua_State* L) {
+			decltype(auto) self = stack::unqualified_get<T>(L, 1);
+			return stack::push(L, self.size());
+		}
+
+		template <typename T, typename Op>
+		int comparsion_operator_wrap(lua_State* L) {
+			if constexpr (std::is_void_v<T>) {
+				return stack::push(L, false);
+			}
+			else {
+				auto maybel = stack::unqualified_check_get<T>(L, 1);
+				if (!maybel) {
+					return stack::push(L, false);
+				}
+				auto mayber = stack::unqualified_check_get<T>(L, 2);
+				if (!mayber) {
+					return stack::push(L, false);
+				}
+				decltype(auto) l = *maybel;
+				decltype(auto) r = *mayber;
+				if constexpr (std::is_same_v<no_comp, Op>) {
+					std::equal_to<> op;
+					return stack::push(L, op(detail::ptr(l), detail::ptr(r)));
+				}
+				else {
+					if constexpr (std::is_same_v<std::equal_to<>, Op> // clang-format hack
+					     || std::is_same_v<std::less_equal<>, Op>     //
+					     || std::is_same_v<std::less_equal<>, Op>) {  //
+						if (detail::ptr(l) == detail::ptr(r)) {
+							return stack::push(L, true);
+						}
+					}
+					Op op;
+					return stack::push(L, op(detail::deref(l), detail::deref(r)));
+				}
+			}
+		}
+
+		template <typename T, typename IFx, typename Fx>
+		void insert_default_registrations(IFx&& ifx, Fx&& fx);
+
+		template <typename T, bool, bool>
+		struct get_is_primitive : is_lua_primitive<T> { };
+
+		template <typename T>
+		struct get_is_primitive<T, true, false>
+		: meta::neg<std::is_reference<decltype(sol_lua_get(types<T>(), nullptr, -1, std::declval<stack::record&>()))>> { };
+
+		template <typename T>
+		struct get_is_primitive<T, false, true>
+		: meta::neg<std::is_reference<decltype(sol_lua_get(types<meta::unqualified_t<T>>(), nullptr, -1, std::declval<stack::record&>()))>> { };
+
+		template <typename T>
+		struct get_is_primitive<T, true, true> : get_is_primitive<T, true, false> { };
+
+	} // namespace detail
+
+	template <typename T>
+	struct is_proxy_primitive
+	: detail::get_is_primitive<T, meta::meta_detail::is_adl_sol_lua_get_v<T>, meta::meta_detail::is_adl_sol_lua_get_v<meta::unqualified_t<T>>> { };
+
+} // namespace sol
+
+// end of sol/stack_core.hpp
+
+// beginning of sol/stack_check.hpp
+
+// beginning of sol/stack_check_unqualified.hpp
+
+#include <memory>
+#include <functional>
+#include <utility>
+#include <cmath>
+#include <optional>
+#if SOL_IS_ON(SOL_STD_VARIANT_I_)
+#include <variant>
+#endif // variant shenanigans
+
+namespace sol { namespace stack {
+	namespace stack_detail {
+		inline bool impl_check_metatable(lua_State* L, int index, const std::string& metakey, bool poptable) {
+			luaL_getmetatable(L, &metakey[0]);
+			const type expectedmetatabletype = static_cast<type>(lua_type(L, -1));
+			if (expectedmetatabletype != type::lua_nil) {
+				if (lua_rawequal(L, -1, index) == 1) {
+					lua_pop(L, 1 + static_cast<int>(poptable));
+					return true;
+				}
+			}
+			lua_pop(L, 1);
+			return false;
+		}
+
+		template <typename T, bool poptable = true>
+		inline bool check_metatable(lua_State* L, int index = -2) {
+			return impl_check_metatable(L, index, usertype_traits<T>::metatable(), poptable);
+		}
+
+		template <type expected, int (*check_func)(lua_State*, int)>
+		struct basic_check {
+			template <typename Handler>
+			static bool check(lua_State* L, int index, Handler&& handler, record& tracking) {
+				tracking.use(1);
+				bool success = check_func(L, index) == 1;
+				if (!success) {
+					// expected type, actual type
+					handler(L, index, expected, type_of(L, index), "");
+				}
+				return success;
+			}
+		};
+	} // namespace stack_detail
+
+	template <typename T, typename>
+	struct unqualified_interop_checker {
+		template <typename Handler>
+		static bool check(lua_State*, int, type, Handler&&, record&) {
+			return false;
+		}
+	};
+
+	template <typename T, typename>
+	struct qualified_interop_checker {
+		template <typename Handler>
+		static bool check(lua_State* L, int index, type index_type, Handler&& handler, record& tracking) {
+			return stack_detail::unqualified_interop_check<T>(L, index, index_type, std::forward<Handler>(handler), tracking);
+		}
+	};
+
+	template <typename T, type expected, typename>
+	struct unqualified_checker {
+		template <typename Handler>
+		static bool check(lua_State* L, int index, Handler&& handler, record& tracking) {
+			if constexpr (std::is_same_v<T, bool>) {
+				tracking.use(1);
+				bool success = lua_isboolean(L, index) == 1;
+				if (!success) {
+					// expected type, actual type
+					handler(L, index, expected, type_of(L, index), "");
+				}
+				return success;
+			}
+			else if constexpr (meta::any_same_v<T, char /* , char8_t*/, char16_t, char32_t>) {
+				return stack::check<std::basic_string<T>>(L, index, std::forward<Handler>(handler), tracking);
+			}
+			else if constexpr (std::is_integral_v<T> || std::is_same_v<T, lua_Integer>) {
+				tracking.use(1);
+#if SOL_LUA_VESION_I_ >= 503
+				// Lua 5.3 and greater checks for numeric precision
+#if SOL_IS_ON(SOL_STRINGS_ARE_NUMBERS_I_)
+				// imprecise, sloppy conversions
+				int isnum = 0;
+				lua_tointegerx(L, index, &isnum);
+				const bool success = isnum != 0;
+				if (!success) {
+					// expected type, actual type
+					handler(L, index, type::number, type_of(L, index), detail::not_a_number_or_number_string_integral);
+				}
+#elif SOL_IS_ON(SOL_NUMBER_PRECISION_CHECKS_I_)
+				// this check is precise, do not convert
+				if (lua_isinteger(L, index) == 1) {
+					return true;
+				}
+				const bool success = false;
+				if (!success) {
+					// expected type, actual type
+					handler(L, index, type::number, type_of(L, index), detail::not_a_number_integral);
+				}
+#else
+				// Numerics are neither safe nor string-convertible
+				type t = type_of(L, index);
+				const bool success = t == type::number;
+#endif
+				if (!success) {
+					// expected type, actual type
+					handler(L, index, type::number, type_of(L, index), detail::not_a_number);
+				}
+				return success;
+#else
+				// Lua 5.2 and below checks
+#if SOL_IS_OFF(SOL_STRINGS_ARE_NUMBERS_I_)
+				// must pre-check, because it will convert
+				type t = type_of(L, index);
+				if (t != type::number) {
+					// expected type, actual type
+					handler(L, index, type::number, t, detail::not_a_number);
+					return false;
+				}
+#endif // Do not allow strings to be numbers
+
+#if SOL_IS_ON(SOL_NUMBER_PRECISION_CHECKS_I_)
+				int isnum = 0;
+				const lua_Number v = lua_tonumberx(L, index, &isnum);
+				const bool success = isnum != 0 && static_cast<lua_Number>(llround(v)) == v;
+#else
+				const bool success = true;
+#endif // Safe numerics and number precision checking
+				if (!success) {
+					// Use defines to provide a better error message!
+#if SOL_IS_ON(SOL_STRINGS_ARE_NUMBERS_I_)
+					handler(L, index, type::number, type_of(L, index), detail::not_a_number_or_number_string);
+#elif SOL_IS_ON(SOL_NUMBER_PRECISION_CHECKS_I_)
+					handler(L, index, type::number, t, detail::not_a_number_or_number_string);
+#else
+					handler(L, index, type::number, t, detail::not_a_number);
+#endif
+				}
+				return success;
+#endif
+			}
+			else if constexpr (std::is_floating_point_v<T> || std::is_same_v<T, lua_Number>) {
+				tracking.use(1);
+#if SOL_IS_ON(SOL_STRINGS_ARE_NUMBERS_I_)
+				bool success = lua_isnumber(L, index) == 1;
+				if (!success) {
+					// expected type, actual type
+					handler(L, index, type::number, type_of(L, index), detail::not_a_number_or_number_string);
+				}
+				return success;
+#else
+				type t = type_of(L, index);
+				bool success = t == type::number;
+				if (!success) {
+					// expected type, actual type
+					handler(L, index, type::number, t, detail::not_a_number);
+				}
+				return success;
+#endif // Strings are Numbers
+			}
+			else if constexpr (meta::any_same_v<T, type, this_state, this_main_state, this_environment, variadic_args>) {
+				(void)L;
+				(void)index;
+				(void)handler;
+				tracking.use(0);
+				return true;
+			}
+			else if constexpr (is_unique_usertype_v<T>) {
+				using proper_T = typename unique_usertype_traits<T>::type;
+				const type indextype = type_of(L, index);
+				tracking.use(1);
+				if (indextype != type::userdata) {
+					handler(L, index, type::userdata, indextype, "value is not a userdata");
+					return false;
+				}
+				if (lua_getmetatable(L, index) == 0) {
+					return true;
+				}
+				int metatableindex = lua_gettop(L);
+				if (stack_detail::check_metatable<detail::unique_usertype<proper_T>>(L, metatableindex)) {
+					void* memory = lua_touserdata(L, index);
+					memory = detail::align_usertype_unique_destructor(memory);
+					detail::unique_destructor& pdx = *static_cast<detail::unique_destructor*>(memory);
+					bool success = &detail::usertype_unique_alloc_destroy<proper_T, T> == pdx;
+					if (!success) {
+						memory = detail::align_usertype_unique_tag<true>(memory);
+#if 0
+						// New version
+#else
+						const char*& name_tag = *static_cast<const char**>(memory);
+						success = usertype_traits<T>::qualified_name() == name_tag;
+#endif
+						if (!success) {
+							handler(L, index, type::userdata, indextype, "value is a userdata but is not the correct unique usertype");
+						}
+					}
+					return success;
+				}
+				lua_pop(L, 1);
+				handler(L, index, type::userdata, indextype, "unrecognized userdata (not pushed by sol?)");
+				return false;
+			}
+			else if constexpr (meta::any_same_v<T, lua_nil_t, std::nullopt_t, nullopt_t>) {
+				bool success = lua_isnil(L, index);
+				if (success) {
+					tracking.use(1);
+					return success;
+				}
+				tracking.use(0);
+				success = lua_isnone(L, index);
+				if (!success) {
+					// expected type, actual type
+					handler(L, index, expected, type_of(L, index), "");
+				}
+				return success;
+			}
+			else if constexpr (std::is_same_v<T, env_key_t>) {
+				tracking.use(1);
+				type t = type_of(L, index);
+				if (t == type::table || t == type::none || t == type::lua_nil || t == type::userdata) {
+					return true;
+				}
+				handler(L, index, type::table, t, "value cannot not have a valid environment");
+				return true;
+			}
+			else if constexpr (std::is_same_v<T, detail::non_lua_nil_t>) {
+				return !stack::unqualified_check<lua_nil_t>(L, index, std::forward<Handler>(handler), tracking);
+			}
+			else if constexpr (meta::is_specialization_of_v<T, basic_lua_table>) {
+				tracking.use(1);
+				type t = type_of(L, index);
+				if (t != type::table) {
+					handler(L, index, type::table, t, "value is not a table");
+					return false;
+				}
+				return true;
+			}
+			else if constexpr (meta::is_specialization_of_v<T, basic_bytecode>) {
+				tracking.use(1);
+				type t = type_of(L, index);
+				if (t != type::function) {
+					handler(L, index, type::function, t, "value is not a function that can be dumped");
+					return false;
+				}
+				return true;
+			}
+			else if constexpr (meta::is_specialization_of_v<T, basic_environment>) {
+				tracking.use(1);
+				if (lua_getmetatable(L, index) == 0) {
+					return true;
+				}
+				type t = type_of(L, -1);
+				if (t == type::table || t == type::none || t == type::lua_nil) {
+					lua_pop(L, 1);
+					return true;
+				}
+				if (t != type::userdata) {
+					lua_pop(L, 1);
+					handler(L, index, type::table, t, "value does not have a valid metatable");
+					return false;
+				}
+				return true;
+			}
+			else if constexpr (std::is_same_v<T, metatable_key_t>) {
+				tracking.use(1);
+				if (lua_getmetatable(L, index) == 0) {
+					return true;
+				}
+				type t = type_of(L, -1);
+				if (t == type::table || t == type::none || t == type::lua_nil) {
+					lua_pop(L, 1);
+					return true;
+				}
+				if (t != type::userdata) {
+					lua_pop(L, 1);
+					handler(L, index, expected, t, "value does not have a valid metatable");
+					return false;
+				}
+				return true;
+			}
+			else if constexpr (std::is_same_v<T, luaL_Stream*> || std::is_same_v<T, luaL_Stream>) {
+				if (lua_getmetatable(L, index) == 0) {
+					type t = type_of(L, index);
+					handler(L, index, expected, t, "value is not a valid luaL_Stream (has no metatable/is not a valid value)");
+					return false;
+				}
+				luaL_getmetatable(L, LUA_FILEHANDLE);
+				if (type_of(L, index) != type::table) {
+					type t = type_of(L, index);
+					lua_pop(L, 1);
+					handler(L,
+						index,
+						expected,
+						t,
+						"value is not a valid luaL_Stream (there is no metatable for luaL_Stream -- did you forget to "
+						"my_lua_state.open_libraries(sol::lib::state) or equivalent?)");
+					return false;
+				}
+				int is_stream_table = lua_compare(L, -1, -2, LUA_OPEQ);
+				lua_pop(L, 2);
+				if (is_stream_table == 0) {
+					type t = type_of(L, index);
+					handler(L, index, expected, t, "value is not a valid luaL_Stream (incorrect metatable)");
+					return false;
+				}
+				return true;
+			}
+			else if constexpr (meta::is_optional_v<T>) {
+				using ValueType = typename T::value_type;
+				(void)handler;
+				type t = type_of(L, index);
+				if (t == type::none) {
+					tracking.use(0);
+					return true;
+				}
+				if (t == type::lua_nil) {
+					tracking.use(1);
+					return true;
+				}
+				return stack::unqualified_check<ValueType>(L, index, no_panic, tracking);
+			}
+#if SOL_IS_ON(SOL_GET_FUNCTION_POINTER_UNSAFE_I_)
+			else if constexpr (std::is_function_v<T> || (std::is_pointer_v<T> && std::is_function_v<std::remove_pointer_t<T>>)) {
+				return stack_detail::check_function_pointer<std::remove_pointer_t<T>>(L, index, std::forward<Handler>(handler), tracking);
+			}
+#endif
+			else if constexpr (expected == type::userdata) {
+				if constexpr (meta::any_same_v<T, userdata_value> || meta::is_specialization_of_v<T, basic_userdata>) {
+					tracking.use(1);
+					type t = type_of(L, index);
+					bool success = t == type::userdata;
+					if (!success) {
+						// expected type, actual type
+						handler(L, index, type::userdata, t, "");
+					}
+					return success;
+				}
+				else if constexpr (meta::is_specialization_of_v<T, user>) {
+					unqualified_checker<lightuserdata_value, type::userdata> c;
+					(void)c;
+					return c.check(L, index, std::forward<Handler>(handler), tracking);
+				}
+				else {
+					if constexpr (std::is_pointer_v<T>) {
+						return check_usertype<T>(L, index, std::forward<Handler>(handler), tracking);
+					}
+					else if constexpr (meta::is_specialization_of_v<T, std::reference_wrapper>) {
+						using T_internal = typename T::type;
+						return stack::check<T_internal>(L, index, std::forward<Handler>(handler), tracking);
+					}
+					else {
+						return check_usertype<T>(L, index, std::forward<Handler>(handler), tracking);
+					}
+				}
+			}
+			else if constexpr (expected == type::poly) {
+				tracking.use(1);
+				bool success = is_lua_reference_v<T> || !lua_isnone(L, index);
+				if (!success) {
+					// expected type, actual type
+					handler(L, index, type::poly, type_of(L, index), "");
+				}
+				return success;
+			}
+			else if constexpr (expected == type::lightuserdata) {
+				tracking.use(1);
+				type t = type_of(L, index);
+				bool success = t == type::userdata || t == type::lightuserdata;
+				if (!success) {
+					// expected type, actual type
+					handler(L, index, type::lightuserdata, t, "");
+				}
+				return success;
+			}
+			else if constexpr (expected == type::function) {
+				if constexpr (meta::any_same_v<T, lua_CFunction, std::remove_pointer_t<lua_CFunction>, c_closure>) {
+					tracking.use(1);
+					bool success = lua_iscfunction(L, index) == 1;
+					if (!success) {
+						// expected type, actual type
+						handler(L, index, expected, type_of(L, index), "");
+					}
+					return success;
+				}
+				else {
+					tracking.use(1);
+					type t = type_of(L, index);
+					if (t == type::lua_nil || t == type::none || t == type::function) {
+						// allow for lua_nil to be returned
+						return true;
+					}
+					if (t != type::userdata && t != type::table) {
+						handler(L, index, type::function, t, "must be a function or table or a userdata");
+						return false;
+					}
+					// Do advanced check for call-style userdata?
+					static const auto& callkey = to_string(meta_function::call);
+					if (lua_getmetatable(L, index) == 0) {
+						// No metatable, no __call key possible
+						handler(L, index, type::function, t, "value is not a function and does not have overriden metatable");
+						return false;
+					}
+					if (lua_isnoneornil(L, -1)) {
+						lua_pop(L, 1);
+						handler(L, index, type::function, t, "value is not a function and does not have valid metatable");
+						return false;
+					}
+					lua_getfield(L, -1, &callkey[0]);
+					if (lua_isnoneornil(L, -1)) {
+						lua_pop(L, 2);
+						handler(L, index, type::function, t, "value's metatable does not have __call overridden in metatable, cannot call this type");
+						return false;
+					}
+					// has call, is definitely a function
+					lua_pop(L, 2);
+					return true;
+				}
+			}
+			else if constexpr (expected == type::table) {
+				tracking.use(1);
+				type t = type_of(L, index);
+				if (t == type::table) {
+					return true;
+				}
+				if (t != type::userdata) {
+					handler(L, index, type::table, t, "value is not a table or a userdata that can behave like one");
+					return false;
+				}
+				return true;
+			}
+			else {
+				tracking.use(1);
+				const type indextype = type_of(L, index);
+				bool success = expected == indextype;
+				if (!success) {
+					// expected type, actual type, message
+					handler(L, index, expected, indextype, "");
+				}
+				return success;
+			}
+		}
+	};
+
+	template <typename T>
+	struct unqualified_checker<non_null<T>, type::userdata> : unqualified_checker<T, lua_type_of_v<T>> { };
+
+	template <typename T>
+	struct unqualified_checker<detail::as_value_tag<T>, type::userdata> {
+		template <typename Handler>
+		static bool check(lua_State* L, int index, Handler&& handler, record& tracking) {
+			const type indextype = type_of(L, index);
+			return check(types<T>(), L, index, indextype, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename U, typename Handler>
+		static bool check(types<U>, lua_State* L, int index, type indextype, Handler&& handler, record& tracking) {
+			if constexpr (
+				std::is_same_v<T,
+				     lightuserdata_value> || std::is_same_v<T, userdata_value> || std::is_same_v<T, userdata> || std::is_same_v<T, lightuserdata>) {
+				tracking.use(1);
+				if (indextype != type::userdata) {
+					handler(L, index, type::userdata, indextype, "value is not a valid userdata");
+					return false;
+				}
+				return true;
+			}
+			else {
+#if SOL_IS_ON(SOL_USE_INTEROP_I_)
+				if (stack_detail::interop_check<U>(L, index, indextype, handler, tracking)) {
+					return true;
+				}
+#endif // interop extensibility
+				tracking.use(1);
+				if (indextype != type::userdata) {
+					handler(L, index, type::userdata, indextype, "value is not a valid userdata");
+					return false;
+				}
+				if (lua_getmetatable(L, index) == 0) {
+					return true;
+				}
+				int metatableindex = lua_gettop(L);
+				if (stack_detail::check_metatable<U>(L, metatableindex))
+					return true;
+				if (stack_detail::check_metatable<U*>(L, metatableindex))
+					return true;
+				if (stack_detail::check_metatable<detail::unique_usertype<U>>(L, metatableindex))
+					return true;
+				if (stack_detail::check_metatable<as_container_t<U>>(L, metatableindex))
+					return true;
+				bool success = false;
+				bool has_derived = derive<T>::value || weak_derive<T>::value;
+				if (has_derived) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+					luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
+#endif // make sure stack doesn't overflow
+					auto pn = stack::pop_n(L, 1);
+					lua_pushstring(L, &detail::base_class_check_key()[0]);
+					lua_rawget(L, metatableindex);
+					if (type_of(L, -1) != type::lua_nil) {
+						void* basecastdata = lua_touserdata(L, -1);
+						detail::inheritance_check_function ic = reinterpret_cast<detail::inheritance_check_function>(basecastdata);
+						success = ic(usertype_traits<T>::qualified_name());
+					}
+				}
+				lua_pop(L, 1);
+				if (!success) {
+					handler(L, index, type::userdata, indextype, "value at this index does not properly reflect the desired type");
+					return false;
+				}
+				return true;
+			}
+		}
+	};
+
+	template <typename T>
+	struct unqualified_checker<detail::as_pointer_tag<T>, type::userdata> {
+		template <typename Handler>
+		static bool check(lua_State* L, int index, type indextype, Handler&& handler, record& tracking) {
+			if (indextype == type::lua_nil) {
+				tracking.use(1);
+				return true;
+			}
+			return check_usertype<std::remove_pointer_t<T>>(L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename Handler>
+		static bool check(lua_State* L, int index, Handler&& handler, record& tracking) {
+			const type indextype = type_of(L, index);
+			return check(L, index, indextype, std::forward<Handler>(handler), tracking);
+		}
+	};
+
+	template <typename... Args>
+	struct unqualified_checker<std::tuple<Args...>, type::poly> {
+		template <typename Handler>
+		static bool check(lua_State* L, int index, Handler&& handler, record& tracking) {
+			return stack::multi_check<Args...>(L, index, std::forward<Handler>(handler), tracking);
+		}
+	};
+
+	template <typename A, typename B>
+	struct unqualified_checker<std::pair<A, B>, type::poly> {
+		template <typename Handler>
+		static bool check(lua_State* L, int index, Handler&& handler, record& tracking) {
+			return stack::multi_check<A, B>(L, index, std::forward<Handler>(handler), tracking);
+		}
+	};
+
+#if SOL_IS_ON(SOL_STD_VARIANT_I_)
+
+	template <typename... Tn>
+	struct unqualified_checker<std::variant<Tn...>, type::poly> {
+		typedef std::variant<Tn...> V;
+		typedef std::variant_size<V> V_size;
+		typedef std::integral_constant<bool, V_size::value == 0> V_is_empty;
+
+		template <typename Handler>
+		static bool is_one(std::integral_constant<std::size_t, 0>, lua_State* L, int index, Handler&& handler, record& tracking) {
+			if constexpr (V_is_empty::value) {
+				if (lua_isnone(L, index)) {
+					return true;
+				}
+			}
+			tracking.use(1);
+			handler(L, index, type::poly, type_of(L, index), "value does not fit any type present in the variant");
+			return false;
+		}
+
+		template <std::size_t I, typename Handler>
+		static bool is_one(std::integral_constant<std::size_t, I>, lua_State* L, int index, Handler&& handler, record& tracking) {
+			typedef std::variant_alternative_t<I - 1, V> T;
+			record temp_tracking = tracking;
+			if (stack::check<T>(L, index, no_panic, temp_tracking)) {
+				tracking = temp_tracking;
+				return true;
+			}
+			return is_one(std::integral_constant<std::size_t, I - 1>(), L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename Handler>
+		static bool check(lua_State* L, int index, Handler&& handler, record& tracking) {
+			return is_one(std::integral_constant<std::size_t, V_size::value>(), L, index, std::forward<Handler>(handler), tracking);
+		}
+	};
+
+#endif // variant shenanigans
+
+}} // namespace sol::stack
+
+// end of sol/stack_check_unqualified.hpp
+
+// beginning of sol/stack_check_qualified.hpp
+
+namespace sol {
+namespace stack {
+
+	template <typename X, type expected, typename>
+	struct qualified_checker {
+		template <typename Handler>
+		static bool check(lua_State* L, int index, Handler&& handler, record& tracking) {
+			if constexpr (!std::is_reference_v<X> && is_unique_usertype_v<X>) {
+				using u_traits = unique_usertype_traits<meta::unqualified_t<X>>;
+				using T = typename u_traits::type;
+				if constexpr (is_base_rebindable_non_void_v<u_traits>) {
+					using rebind_t = typename u_traits::template rebind_base<void>;
+					// we have a unique pointer type that can be
+					// rebound to a base/derived type
+					const type indextype = type_of(L, index);
+					tracking.use(1);
+					if (indextype != type::userdata) {
+						handler(L, index, type::userdata, indextype, "value is not a userdata");
+						return false;
+					}
+					void* memory = lua_touserdata(L, index);
+					memory = detail::align_usertype_unique_destructor(memory);
+					detail::unique_destructor& pdx = *static_cast<detail::unique_destructor*>(memory);
+					if (&detail::usertype_unique_alloc_destroy<T, X> == pdx) {
+						return true;
+					}
+					if constexpr (derive<T>::value) {
+						memory = detail::align_usertype_unique_tag<true, false>(memory);
+						detail::unique_tag& ic = *reinterpret_cast<detail::unique_tag*>(memory);
+						string_view ti = usertype_traits<T>::qualified_name();
+						string_view rebind_ti = usertype_traits<rebind_t>::qualified_name();
+						if (ic(nullptr, nullptr, ti, rebind_ti) != 0) {
+							return true;
+						}
+					}
+					handler(L, index, type::userdata, indextype, "value is a userdata but is not the correct unique usertype");
+					return false;
+				}
+				else {
+					return stack::unqualified_check<X>(L, index, std::forward<Handler>(handler), tracking);
+				}
+			}
+			else if constexpr (!std::is_reference_v<X> && is_container_v<X>) {
+				if (type_of(L, index) == type::userdata) {
+					return stack::unqualified_check<X>(L, index, std::forward<Handler>(handler), tracking);
+				}
+				else {
+					return stack::unqualified_check<nested<X>>(L, index, std::forward<Handler>(handler), tracking);
+				}
+			}
+			else if constexpr (!std::is_reference_v<X> && meta::is_specialization_of_v<X, nested>) {
+				using NestedX = typename meta::unqualified_t<X>::nested_type;
+				return stack::check<NestedX>(L, index, ::std::forward<Handler>(handler), tracking);
+			}
+			else {
+				return stack::unqualified_check<X>(L, index, std::forward<Handler>(handler), tracking);
+			}
+		}
+	};
+}
+} // namespace sol::stack
+
+// end of sol/stack_check_qualified.hpp
+
+// end of sol/stack_check.hpp
+
+// beginning of sol/stack_get.hpp
+
+// beginning of sol/stack_get_unqualified.hpp
+
+// beginning of sol/overload.hpp
+
+#include <utility>
+
+namespace sol {
+	template <typename... Functions>
+	struct overload_set {
+		std::tuple<Functions...> functions;
+		template <typename Arg, typename... Args, meta::disable<std::is_same<overload_set, meta::unqualified_t<Arg>>> = meta::enabler>
+		overload_set(Arg&& arg, Args&&... args)
+		: functions(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+		}
+		overload_set(const overload_set&) = default;
+		overload_set(overload_set&&) = default;
+		overload_set& operator=(const overload_set&) = default;
+		overload_set& operator=(overload_set&&) = default;
+	};
+
+	template <typename... Args>
+	decltype(auto) overload(Args&&... args) {
+		return overload_set<std::decay_t<Args>...>(std::forward<Args>(args)...);
+	}
+} // namespace sol
+
+// end of sol/overload.hpp
+
+// beginning of sol/unicode.hpp
+
+#include <array>
+#include <cstring>
+
+namespace sol {
+	// Everything here was lifted pretty much straight out of
+	// ogonek, because fuck figuring it out=
+	namespace unicode {
+		enum class error_code {
+			ok = 0,
+			invalid_code_point,
+			invalid_code_unit,
+			invalid_leading_surrogate,
+			invalid_trailing_surrogate,
+			sequence_too_short,
+			overlong_sequence,
+		};
+
+		inline const string_view& to_string(error_code ec) {
+			static const string_view storage[7] = {
+				"ok",
+				"invalid code points",
+				"invalid code unit",
+				"invalid leading surrogate",
+				"invalid trailing surrogate",
+				"sequence too short",
+				"overlong sequence"
+			};
+			return storage[static_cast<std::size_t>(ec)];
+		}
+
+		template <typename It>
+		struct decoded_result {
+			error_code error;
+			char32_t codepoint;
+			It next;
+		};
+
+		template <typename C>
+		struct encoded_result {
+			error_code error;
+			std::size_t code_units_size;
+			std::array<C, 4> code_units;
+		};
+
+		struct unicode_detail {
+			// codepoint related
+			static constexpr char32_t last_code_point = 0x10FFFF;
+
+			static constexpr char32_t first_lead_surrogate = 0xD800;
+			static constexpr char32_t last_lead_surrogate = 0xDBFF;
+
+			static constexpr char32_t first_trail_surrogate = 0xDC00;
+			static constexpr char32_t last_trail_surrogate = 0xDFFF;
+
+			static constexpr char32_t first_surrogate = first_lead_surrogate;
+			static constexpr char32_t last_surrogate = last_trail_surrogate;
+
+			static constexpr bool is_lead_surrogate(char32_t u) {
+				return u >= first_lead_surrogate && u <= last_lead_surrogate;
+			}
+			static constexpr bool is_trail_surrogate(char32_t u) {
+				return u >= first_trail_surrogate && u <= last_trail_surrogate;
+			}
+			static constexpr bool is_surrogate(char32_t u) {
+				return u >= first_surrogate && u <= last_surrogate;
+			}
+
+			// utf8 related
+			static constexpr auto last_1byte_value = 0x7Fu;
+			static constexpr auto last_2byte_value = 0x7FFu;
+			static constexpr auto last_3byte_value = 0xFFFFu;
+
+			static constexpr auto start_2byte_mask = 0x80u;
+			static constexpr auto start_3byte_mask = 0xE0u;
+			static constexpr auto start_4byte_mask = 0xF0u;
+
+			static constexpr auto continuation_mask = 0xC0u;
+			static constexpr auto continuation_signature = 0x80u;
+
+			static constexpr bool is_invalid(unsigned char b) {
+				return b == 0xC0 || b == 0xC1 || b > 0xF4;
+			}
+
+			static constexpr bool is_continuation(unsigned char b) {
+				return (b & unicode_detail::continuation_mask) == unicode_detail::continuation_signature;
+			}
+
+			static constexpr bool is_overlong(char32_t u, std::size_t bytes) {
+				return u <= unicode_detail::last_1byte_value || (u <= unicode_detail::last_2byte_value && bytes > 2)
+				     || (u <= unicode_detail::last_3byte_value && bytes > 3);
+			}
+
+			static constexpr int sequence_length(unsigned char b) {
+				return (b & start_2byte_mask) == 0 ? 1
+					: (b & start_3byte_mask) != start_3byte_mask ? 2
+					: (b & start_4byte_mask) != start_4byte_mask ? 3
+					: 4;
+			}
+
+			static constexpr char32_t decode(unsigned char b0, unsigned char b1) {
+				return ((b0 & 0x1F) << 6) | (b1 & 0x3F);
+			}
+			static constexpr char32_t decode(unsigned char b0, unsigned char b1, unsigned char b2) {
+				return ((b0 & 0x0F) << 12) | ((b1 & 0x3F) << 6) | (b2 & 0x3F);
+			}
+			static constexpr char32_t decode(unsigned char b0, unsigned char b1, unsigned char b2, unsigned char b3) {
+				return ((b0 & 0x07) << 18) | ((b1 & 0x3F) << 12) | ((b2 & 0x3F) << 6) | (b3 & 0x3F);
+			}
+
+			// utf16 related
+			static constexpr char32_t last_bmp_value = 0xFFFF;
+			static constexpr char32_t normalizing_value = 0x10000;
+			static constexpr int lead_surrogate_bitmask = 0xFFC00;
+			static constexpr int trail_surrogate_bitmask = 0x3FF;
+			static constexpr int lead_shifted_bits = 10;
+			static constexpr char32_t replacement = 0xFFFD;
+
+			static char32_t combine_surrogates(char16_t lead, char16_t trail) {
+				auto hi = lead - first_lead_surrogate;
+				auto lo = trail - first_trail_surrogate;
+				return normalizing_value + ((hi << lead_shifted_bits) | lo);
+			}
+		};
+
+		inline encoded_result<char> code_point_to_utf8(char32_t codepoint) {
+			encoded_result<char> er;
+			er.error = error_code::ok;
+			if (codepoint <= unicode_detail::last_1byte_value) {
+				er.code_units_size = 1;
+				er.code_units = std::array<char, 4>{ { static_cast<char>(codepoint) } };
+			}
+			else if (codepoint <= unicode_detail::last_2byte_value) {
+				er.code_units_size = 2;
+				er.code_units = std::array<char, 4>{{
+					static_cast<char>(0xC0 | ((codepoint & 0x7C0) >> 6)),
+					static_cast<char>(0x80 | (codepoint & 0x3F)),
+				}};
+			}
+			else if (codepoint <= unicode_detail::last_3byte_value) {
+				er.code_units_size = 3;
+				er.code_units = std::array<char, 4>{{
+					static_cast<char>(0xE0 | ((codepoint & 0xF000) >> 12)),
+					static_cast<char>(0x80 | ((codepoint & 0xFC0) >> 6)),
+					static_cast<char>(0x80 | (codepoint & 0x3F)),
+				}};
+			}
+			else {
+				er.code_units_size = 4;
+				er.code_units = std::array<char, 4>{ {
+					static_cast<char>(0xF0 | ((codepoint & 0x1C0000) >> 18)),
+						static_cast<char>(0x80 | ((codepoint & 0x3F000) >> 12)),
+						static_cast<char>(0x80 | ((codepoint & 0xFC0) >> 6)),
+						static_cast<char>(0x80 | (codepoint & 0x3F)),
+				} };
+			}
+			return er;
+		}
+
+		inline encoded_result<char16_t> code_point_to_utf16(char32_t codepoint) {
+			encoded_result<char16_t> er;
+
+			if (codepoint <= unicode_detail::last_bmp_value) {
+				er.code_units_size = 1;
+				er.code_units = std::array<char16_t, 4>{ { static_cast<char16_t>(codepoint) } };
+				er.error = error_code::ok;
+			}
+			else {
+				auto normal = codepoint - unicode_detail::normalizing_value;
+				auto lead = unicode_detail::first_lead_surrogate + ((normal & unicode_detail::lead_surrogate_bitmask) >> unicode_detail::lead_shifted_bits);
+				auto trail = unicode_detail::first_trail_surrogate + (normal & unicode_detail::trail_surrogate_bitmask);
+				er.code_units = std::array<char16_t, 4>{ {
+					static_cast<char16_t>(lead),
+					static_cast<char16_t>(trail)
+				} };
+				er.code_units_size = 2;
+				er.error = error_code::ok;
+			}
+			return er;
+		}
+
+		inline encoded_result<char32_t> code_point_to_utf32(char32_t codepoint) {
+			encoded_result<char32_t> er;
+			er.code_units_size = 1;
+			er.code_units[0] = codepoint;
+			er.error = error_code::ok;
+			return er;
+		}
+
+		template <typename It>
+		inline decoded_result<It> utf8_to_code_point(It it, It last) {
+			decoded_result<It> dr;
+			if (it == last) {
+				dr.next = it;
+				dr.error = error_code::sequence_too_short;
+				return dr;
+			}
+
+			unsigned char b0 = *it;
+			std::size_t length = unicode_detail::sequence_length(b0);
+
+			if (length == 1) {
+				dr.codepoint = static_cast<char32_t>(b0);
+				dr.error = error_code::ok;
+				++it;
+				dr.next = it;
+				return dr;
+			}
+
+			if (unicode_detail::is_invalid(b0) || unicode_detail::is_continuation(b0)) {
+				dr.error = error_code::invalid_code_unit;
+				dr.next = it;
+				return dr;
+			}
+
+			++it;
+			std::array<unsigned char, 4> b;
+			b[0] = b0;
+			for (std::size_t i = 1; i < length; ++i) {
+				b[i] = *it;
+				if (!unicode_detail::is_continuation(b[i])) {
+					dr.error = error_code::invalid_code_unit;
+					dr.next = it;
+					return dr;
+				}
+				++it;
+			}
+
+			char32_t decoded;
+			switch (length) {
+			case 2:
+				decoded = unicode_detail::decode(b[0], b[1]);
+				break;
+			case 3:
+				decoded = unicode_detail::decode(b[0], b[1], b[2]);
+				break;
+			default:
+				decoded = unicode_detail::decode(b[0], b[1], b[2], b[3]);
+				break;
+			}
+
+			if (unicode_detail::is_overlong(decoded, length)) {
+				dr.error = error_code::overlong_sequence;
+				return dr;
+			}
+			if (unicode_detail::is_surrogate(decoded) || decoded > unicode_detail::last_code_point) {
+				dr.error = error_code::invalid_code_point;
+				return dr;
+			}
+			
+			// then everything is fine
+			dr.codepoint = decoded;
+			dr.error = error_code::ok;
+			dr.next = it;
+			return dr;
+		}
+
+		template <typename It>
+		inline decoded_result<It> utf16_to_code_point(It it, It last) {
+			decoded_result<It> dr;
+			if (it == last) {
+				dr.next = it;
+				dr.error = error_code::sequence_too_short;
+				return dr;
+			}
+
+			char16_t lead = static_cast<char16_t>(*it);
+			
+			if (!unicode_detail::is_surrogate(lead)) {
+				++it;
+				dr.codepoint = static_cast<char32_t>(lead);
+				dr.next = it;
+				dr.error = error_code::ok;
+				return dr;
+			}
+			if (!unicode_detail::is_lead_surrogate(lead)) {
+				dr.error = error_code::invalid_leading_surrogate;
+				dr.next = it;
+				return dr;
+			}
+
+			++it;
+			auto trail = *it;
+			if (!unicode_detail::is_trail_surrogate(trail)) {
+				dr.error = error_code::invalid_trailing_surrogate;
+				dr.next = it;
+				return dr;
+			}
+			
+			dr.codepoint = unicode_detail::combine_surrogates(lead, trail);
+			dr.next = ++it;
+			dr.error = error_code::ok;
+			return dr;
+		}
+
+		template <typename It>
+		inline decoded_result<It> utf32_to_code_point(It it, It last) {
+			decoded_result<It> dr;
+			if (it == last) {
+				dr.next = it;
+				dr.error = error_code::sequence_too_short;
+				return dr;
+			}
+			dr.codepoint = static_cast<char32_t>(*it);
+			dr.next = ++it;
+			dr.error = error_code::ok;
+			return dr;
+		}
+	}
+}
+// end of sol/unicode.hpp
+
+#include <memory>
+#include <functional>
+#include <utility>
+#include <cstdlib>
+#include <cmath>
+#include <string_view>
+#if SOL_IS_ON(SOL_STD_VARIANT_I_)
+#include <variant>
+#endif // Apple clang screwed up
+
+namespace sol { namespace stack {
+
+	namespace stack_detail {
+		template <typename Ch>
+		struct count_code_units_utf {
+			std::size_t needed_size;
+
+			count_code_units_utf() : needed_size(0) {
+			}
+
+			void operator()(const unicode::encoded_result<Ch> er) {
+				needed_size += er.code_units_size;
+			}
+		};
+
+		template <typename Ch, typename ErCh>
+		struct copy_code_units_utf {
+			Ch* target_;
+
+			copy_code_units_utf(Ch* target) : target_(target) {
+			}
+
+			void operator()(const unicode::encoded_result<ErCh> er) {
+				std::memcpy(target_, er.code_units.data(), er.code_units_size * sizeof(ErCh));
+				target_ += er.code_units_size;
+			}
+		};
+
+		template <typename Ch, typename F>
+		inline void convert(const char* strb, const char* stre, F&& f) {
+			char32_t cp = 0;
+			for (const char* strtarget = strb; strtarget < stre;) {
+				auto dr = unicode::utf8_to_code_point(strtarget, stre);
+				if (dr.error != unicode::error_code::ok) {
+					cp = unicode::unicode_detail::replacement;
+					++strtarget;
+				}
+				else {
+					cp = dr.codepoint;
+					strtarget = dr.next;
+				}
+				if constexpr (std::is_same_v<Ch, char32_t>) {
+					auto er = unicode::code_point_to_utf32(cp);
+					f(er);
+				}
+				else {
+					auto er = unicode::code_point_to_utf16(cp);
+					f(er);
+				}
+			}
+		}
+
+		template <typename BaseCh, typename S>
+		inline S get_into(lua_State* L, int index, record& tracking) {
+			using Ch = typename S::value_type;
+			tracking.use(1);
+			size_t len;
+			auto utf8p = lua_tolstring(L, index, &len);
+			if (len < 1)
+				return S();
+			const char* strb = utf8p;
+			const char* stre = utf8p + len;
+			stack_detail::count_code_units_utf<BaseCh> count_units;
+			convert<BaseCh>(strb, stre, count_units);
+			S r(count_units.needed_size, static_cast<Ch>(0));
+			r.resize(count_units.needed_size);
+			Ch* target = &r[0];
+			stack_detail::copy_code_units_utf<Ch, BaseCh> copy_units(target);
+			convert<BaseCh>(strb, stre, copy_units);
+			return r;
+		}
+	} // namespace stack_detail
+
+	template <typename T, typename>
+	struct unqualified_getter {
+		static decltype(auto) get(lua_State* L, int index, record& tracking) {
+			if constexpr (std::is_same_v<T, bool>) {
+				tracking.use(1);
+				return lua_toboolean(L, index) != 0;
+			}
+			else if constexpr (std::is_enum_v<T>) {
+				tracking.use(1);
+				return static_cast<T>(lua_tointegerx(L, index, nullptr));
+			}
+			else if constexpr (std::is_integral_v<T> || std::is_same_v<T, lua_Integer>) {
+				tracking.use(1);
+#if SOL_LUA_VESION_I_ >= 503
+				if (lua_isinteger(L, index) != 0) {
+					return static_cast<T>(lua_tointeger(L, index));
+				}
+#endif
+				return static_cast<T>(llround(lua_tonumber(L, index)));
+			}
+			else if constexpr (std::is_floating_point_v<T> || std::is_same_v<T, lua_Number>) {
+				tracking.use(1);
+				return static_cast<T>(lua_tonumber(L, index));
+			}
+			else if constexpr (is_lua_reference_v<T>) {
+				tracking.use(1);
+				return T(L, index);
+			}
+			else if constexpr (is_unique_usertype_v<T>) {
+				using Real = typename unique_usertype_traits<T>::actual_type;
+
+				tracking.use(1);
+				void* memory = lua_touserdata(L, index);
+				memory = detail::align_usertype_unique<Real>(memory);
+				Real* mem = static_cast<Real*>(memory);
+				return *mem;
+			}
+			else if constexpr (meta::is_optional_v<T>) {
+				using ValueType = typename T::value_type;
+				return unqualified_check_getter<ValueType>::template get_using<T>(L, index, no_panic, tracking);
+			}
+			else if constexpr (std::is_same_v<T, luaL_Stream*>) {
+				luaL_Stream* pstream = static_cast<luaL_Stream*>(lua_touserdata(L, index));
+				return pstream;
+			}
+			else if constexpr (std::is_same_v<T, luaL_Stream>) {
+				luaL_Stream* pstream = static_cast<luaL_Stream*>(lua_touserdata(L, index));
+				return *pstream;
+			}
+#if SOL_IS_ON(SOL_GET_FUNCTION_POINTER_UNSAFE_I_)
+			else if constexpr (std::is_function_v<T> || (std::is_pointer_v<T> && std::is_function_v<std::remove_pointer_t<T>>)) {
+				return stack_detail::get_function_pointer<std::remove_pointer_t<T>>(L, index, tracking);
+			}
+#endif
+			else {
+				return stack_detail::unchecked_unqualified_get<detail::as_value_tag<T>>(L, index, tracking);
+			}
+		}
+	};
+
+	template <typename X, typename>
+	struct qualified_getter {
+		static decltype(auto) get(lua_State* L, int index, record& tracking) {
+			using Tu = meta::unqualified_t<X>;
+			static constexpr bool is_userdata_of_some_kind
+				= !std::is_reference_v<
+				       X> && is_container_v<Tu> && std::is_default_constructible_v<Tu> && !is_lua_primitive_v<Tu> && !is_transparent_argument_v<Tu>;
+			if constexpr (is_userdata_of_some_kind) {
+				if (type_of(L, index) == type::userdata) {
+					return static_cast<Tu>(stack_detail::unchecked_unqualified_get<Tu>(L, index, tracking));
+				}
+				else {
+					return stack_detail::unchecked_unqualified_get<sol::nested<Tu>>(L, index, tracking);
+				}
+			}
+			else if constexpr (!std::is_reference_v<X> && is_unique_usertype_v<Tu> && !is_base_rebindable_non_void_v<unique_usertype_traits<Tu>>) {
+				using u_traits = unique_usertype_traits<Tu>;
+				using T = typename u_traits::type;
+				using Real = typename u_traits::actual_type;
+				tracking.use(1);
+				void* memory = lua_touserdata(L, index);
+				memory = detail::align_usertype_unique_destructor(memory);
+				detail::unique_destructor& pdx = *static_cast<detail::unique_destructor*>(memory);
+				if (&detail::usertype_unique_alloc_destroy<T, X> == pdx) {
+					memory = detail::align_usertype_unique_tag<true, false>(memory);
+					memory = detail::align_usertype_unique<Real, true, false>(memory);
+					Real* mem = static_cast<Real*>(memory);
+					return static_cast<Real>(*mem);
+				}
+				Real r(nullptr);
+				if constexpr (!derive<T>::value) {
+					// TODO: abort / terminate, maybe only in debug modes?
+					return static_cast<Real>(std::move(r));
+				}
+				else {
+					memory = detail::align_usertype_unique_tag<true, false>(memory);
+					detail::unique_tag& ic = *reinterpret_cast<detail::unique_tag*>(memory);
+					memory = detail::align_usertype_unique<Real, true, false>(memory);
+					string_view ti = usertype_traits<T>::qualified_name();
+					int cast_operation;
+					if constexpr (is_base_rebindable_v<u_traits>) {
+						using rebind_t = typename u_traits::template rebind_base<void>;
+						string_view rebind_ti = usertype_traits<rebind_t>::qualified_name();
+						cast_operation = ic(memory, &r, ti, rebind_ti);
+					}
+					else {
+						string_view rebind_ti("");
+						cast_operation = ic(memory, &r, ti, rebind_ti);
+					}
+					switch (cast_operation) {
+					case 1: {
+						// it's a perfect match,
+						// alias memory directly
+						Real* mem = static_cast<Real*>(memory);
+						return static_cast<Real>(*mem);
+					}
+					case 2:
+						// it's a base match, return the
+						// aliased creation
+						return static_cast<Real>(std::move(r));
+					default:
+						// uh oh..
+						break;
+					}
+					// TODO: abort / terminate, maybe only in debug modes?
+					return static_cast<Real>(r);
+				}
+			}
+			else {
+				return stack_detail::unchecked_unqualified_get<Tu>(L, index, tracking);
+			}
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<as_table_t<T>> {
+		using Tu = meta::unqualified_t<T>;
+
+		template <typename V>
+		static void push_back_at_end(std::true_type, types<V>, lua_State* L, T& cont, std::size_t) {
+			cont.push_back(stack::get<V>(L, -lua_size<V>::value));
+		}
+
+		template <typename V>
+		static void push_back_at_end(std::false_type, types<V> t, lua_State* L, T& cont, std::size_t idx) {
+			insert_at_end(meta::has_insert<Tu>(), t, L, cont, idx);
+		}
+
+		template <typename V>
+		static void insert_at_end(std::true_type, types<V>, lua_State* L, T& cont, std::size_t) {
+			using std::cend;
+			cont.insert(cend(cont), stack::get<V>(L, -lua_size<V>::value));
+		}
+
+		template <typename V>
+		static void insert_at_end(std::false_type, types<V>, lua_State* L, T& cont, std::size_t idx) {
+			cont[idx] = stack::get<V>(L, -lua_size<V>::value);
+		}
+
+		static bool max_size_check(std::false_type, T&, std::size_t) {
+			return false;
+		}
+
+		static bool max_size_check(std::true_type, T& cont, std::size_t idx) {
+			return idx >= cont.max_size();
+		}
+
+		static T get(lua_State* L, int relindex, record& tracking) {
+			return get(meta::is_associative<Tu>(), L, relindex, tracking);
+		}
+
+		static T get(std::false_type, lua_State* L, int relindex, record& tracking) {
+			typedef typename Tu::value_type V;
+			return get(types<V>(), L, relindex, tracking);
+		}
+
+		template <typename V>
+		static T get(types<V> t, lua_State* L, int relindex, record& tracking) {
+			tracking.use(1);
+
+			// the W4 flag is really great,
+			// so great that it can tell my for loops (twice nested)
+			// below never actually terminate
+			// without hitting where the gotos have infested
+
+			// so now I would get the error W4XXX unreachable
+			// me that the return cont at the end of this function
+			// which is fair until other compilers complain
+			// that there isn't a return and that based on
+			// SOME MAGICAL FORCE
+			// control flow falls off the end of a non-void function
+			// so it needs to be there for the compilers that are
+			// too flimsy to analyze the basic blocks...
+			// (I'm sure I should file a bug but those compilers are already
+			// in the wild; it doesn't matter if I fix them,
+			// someone else is still going to get some old-ass compiler
+			// and then bother me about the unclean build for the 30th
+			// time)
+
+			// "Why not an IIFE?"
+			// Because additional lambdas / functions which serve as
+			// capture-all-and-then-invoke bloat binary sizes
+			// by an actually detectable amount
+			// (one user uses sol2 pretty heavily and 22 MB of binary size
+			// was saved by reducing reliance on lambdas in templates)
+
+			// This would really be solved by having break N;
+			// be a real, proper thing...
+			// but instead, we have to use labels and gotos
+			// and earn the universal vitriol of the dogmatic
+			// programming community
+
+			// all in all: W4 is great!~
+
+			int index = lua_absindex(L, relindex);
+			T cont;
+			std::size_t idx = 0;
+#if SOL_LUA_VESION_I_ >= 503
+			// This method is HIGHLY performant over regular table iteration
+			// thanks to the Lua API changes in 5.3
+			// Questionable in 5.4
+			for (lua_Integer i = 0;; i += lua_size<V>::value) {
+				if (max_size_check(meta::has_max_size<Tu>(), cont, idx)) {
+					// see above comment
+					goto done;
+				}
+				bool isnil = false;
+				for (int vi = 0; vi < lua_size<V>::value; ++vi) {
+#if defined(LUA_NILINTABLE) && LUA_NILINTABLE && SOL_LUA_VESION_I_ >= 600
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+					luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+					lua_pushinteger(L, static_cast<lua_Integer>(i + vi));
+					if (lua_keyin(L, index) == 0) {
+						// it's time to stop
+						isnil = true;
+					}
+					else {
+						// we have a key, have to get the value
+						lua_geti(L, index, i + vi);
+					}
+#else
+					type vt = static_cast<type>(lua_geti(L, index, i + vi));
+					isnil = vt == type::none || vt == type::lua_nil;
+#endif
+					if (isnil) {
+						if (i == 0) {
+							break;
+						}
+#if defined(LUA_NILINTABLE) && LUA_NILINTABLE && SOL_LUA_VESION_I_ >= 600
+						lua_pop(L, vi);
+#else
+						lua_pop(L, (vi + 1));
+#endif
+						// see above comment
+						goto done;
+					}
+				}
+				if (isnil) {
+#if defined(LUA_NILINTABLE) && LUA_NILINTABLE && SOL_LUA_VESION_I_ >= 600
+#else
+					lua_pop(L, lua_size<V>::value);
+#endif
+					continue;
+				}
+
+				push_back_at_end(meta::has_push_back<Tu>(), t, L, cont, idx);
+				++idx;
+				lua_pop(L, lua_size<V>::value);
+			}
+#else
+			// Zzzz slower but necessary thanks to the lower version API and missing functions qq
+			for (lua_Integer i = 0;; i += lua_size<V>::value, lua_pop(L, lua_size<V>::value)) {
+				if (idx >= cont.max_size()) {
+					// see above comment
+					goto done;
+				}
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+				luaL_checkstack(L, 2, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+				bool isnil = false;
+				for (int vi = 0; vi < lua_size<V>::value; ++vi) {
+					lua_pushinteger(L, i);
+					lua_gettable(L, index);
+					type vt = type_of(L, -1);
+					isnil = vt == type::lua_nil;
+					if (isnil) {
+						if (i == 0) {
+							break;
+						}
+						lua_pop(L, (vi + 1));
+						// see above comment
+						goto done;
+					}
+				}
+				if (isnil)
+					continue;
+				push_back_at_end(meta::has_push_back<Tu>(), t, L, cont, idx);
+				++idx;
+			}
+#endif
+		done:
+			return cont;
+		}
+
+		static T get(std::true_type, lua_State* L, int index, record& tracking) {
+			typedef typename Tu::value_type P;
+			typedef typename P::first_type K;
+			typedef typename P::second_type V;
+			return get(types<K, V>(), L, index, tracking);
+		}
+
+		template <typename K, typename V>
+		static T get(types<K, V>, lua_State* L, int relindex, record& tracking) {
+			tracking.use(1);
+
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 3, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+
+			T associative;
+			int index = lua_absindex(L, relindex);
+			lua_pushnil(L);
+			while (lua_next(L, index) != 0) {
+				decltype(auto) key = stack::check_get<K>(L, -2);
+				if (!key) {
+					lua_pop(L, 1);
+					continue;
+				}
+				associative.emplace(std::forward<decltype(*key)>(*key), stack::get<V>(L, -1));
+				lua_pop(L, 1);
+			}
+			return associative;
+		}
+	};
+
+	template <typename T, typename Al>
+	struct unqualified_getter<as_table_t<std::forward_list<T, Al>>> {
+		typedef std::forward_list<T, Al> C;
+
+		static C get(lua_State* L, int relindex, record& tracking) {
+			return get(meta::has_key_value_pair<C>(), L, relindex, tracking);
+		}
+
+		static C get(std::true_type, lua_State* L, int index, record& tracking) {
+			typedef typename T::value_type P;
+			typedef typename P::first_type K;
+			typedef typename P::second_type V;
+			return get(types<K, V>(), L, index, tracking);
+		}
+
+		static C get(std::false_type, lua_State* L, int relindex, record& tracking) {
+			typedef typename C::value_type V;
+			return get(types<V>(), L, relindex, tracking);
+		}
+
+		template <typename V>
+		static C get(types<V>, lua_State* L, int relindex, record& tracking) {
+			tracking.use(1);
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 3, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+
+			int index = lua_absindex(L, relindex);
+			C cont;
+			auto at = cont.cbefore_begin();
+			std::size_t idx = 0;
+#if SOL_LUA_VESION_I_ >= 503
+			// This method is HIGHLY performant over regular table iteration thanks to the Lua API changes in 5.3
+			for (lua_Integer i = 0;; i += lua_size<V>::value, lua_pop(L, lua_size<V>::value)) {
+				if (idx >= cont.max_size()) {
+					goto done;
+				}
+				bool isnil = false;
+				for (int vi = 0; vi < lua_size<V>::value; ++vi) {
+					type t = static_cast<type>(lua_geti(L, index, i + vi));
+					isnil = t == type::lua_nil;
+					if (isnil) {
+						if (i == 0) {
+							break;
+						}
+						lua_pop(L, (vi + 1));
+						goto done;
+					}
+				}
+				if (isnil)
+					continue;
+				at = cont.insert_after(at, stack::get<V>(L, -lua_size<V>::value));
+				++idx;
+			}
+#else
+			// Zzzz slower but necessary thanks to the lower version API and missing functions qq
+			for (lua_Integer i = 0;; i += lua_size<V>::value, lua_pop(L, lua_size<V>::value)) {
+				if (idx >= cont.max_size()) {
+					goto done;
+				}
+				bool isnil = false;
+				for (int vi = 0; vi < lua_size<V>::value; ++vi) {
+					lua_pushinteger(L, i);
+					lua_gettable(L, index);
+					type t = type_of(L, -1);
+					isnil = t == type::lua_nil;
+					if (isnil) {
+						if (i == 0) {
+							break;
+						}
+						lua_pop(L, (vi + 1));
+						goto done;
+					}
+				}
+				if (isnil)
+					continue;
+				at = cont.insert_after(at, stack::get<V>(L, -lua_size<V>::value));
+				++idx;
+			}
+#endif
+		done:
+			return cont;
+		}
+
+		template <typename K, typename V>
+		static C get(types<K, V>, lua_State* L, int relindex, record& tracking) {
+			tracking.use(1);
+
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 3, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+
+			C associative;
+			auto at = associative.cbefore_begin();
+			int index = lua_absindex(L, relindex);
+			lua_pushnil(L);
+			while (lua_next(L, index) != 0) {
+				decltype(auto) key = stack::check_get<K>(L, -2);
+				if (!key) {
+					lua_pop(L, 1);
+					continue;
+				}
+				at = associative.emplace_after(at, std::forward<decltype(*key)>(*key), stack::get<V>(L, -1));
+				lua_pop(L, 1);
+			}
+			return associative;
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<nested<T>> {
+		static T get(lua_State* L, int index, record& tracking) {
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (is_container_v<Tu>) {
+				if constexpr (meta::is_associative<Tu>::value) {
+					typedef typename T::value_type P;
+					typedef typename P::first_type K;
+					typedef typename P::second_type V;
+					unqualified_getter<as_table_t<T>> g;
+					// VC++ has a bad warning here: shut it up
+					(void)g;
+					return g.get(types<K, nested<V>>(), L, index, tracking);
+				}
+				else {
+					typedef typename T::value_type V;
+					unqualified_getter<as_table_t<T>> g;
+					// VC++ has a bad warning here: shut it up
+					(void)g;
+					return g.get(types<nested<V>>(), L, index, tracking);
+				}
+			}
+			else {
+				unqualified_getter<Tu> g;
+				// VC++ has a bad warning here: shut it up
+				(void)g;
+				return g.get(L, index, tracking);
+			}
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<as_container_t<T>> {
+		static decltype(auto) get(lua_State* L, int index, record& tracking) {
+			return stack::unqualified_get<T>(L, index, tracking);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<as_container_t<T>*> {
+		static decltype(auto) get(lua_State* L, int index, record& tracking) {
+			return stack::unqualified_get<T*>(L, index, tracking);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<userdata_value> {
+		static userdata_value get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			return userdata_value(lua_touserdata(L, index));
+		}
+	};
+
+	template <>
+	struct unqualified_getter<lightuserdata_value> {
+		static lightuserdata_value get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			return lightuserdata_value(lua_touserdata(L, index));
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<light<T>> {
+		static light<T> get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			void* memory = lua_touserdata(L, index);
+			return light<T>(static_cast<T*>(memory));
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<user<T>> {
+		static std::add_lvalue_reference_t<T> get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			void* memory = lua_touserdata(L, index);
+			memory = detail::align_user<T>(memory);
+			return *static_cast<std::remove_reference_t<T>*>(memory);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<user<T*>> {
+		static T* get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			void* memory = lua_touserdata(L, index);
+			memory = detail::align_user<T*>(memory);
+			return static_cast<T*>(memory);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<type> {
+		static type get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			return static_cast<type>(lua_type(L, index));
+		}
+	};
+
+	template <>
+	struct unqualified_getter<std::string> {
+		static std::string get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			std::size_t len;
+			auto str = lua_tolstring(L, index, &len);
+			return std::string(str, len);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<const char*> {
+		static const char* get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			size_t sz;
+			return lua_tolstring(L, index, &sz);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<char> {
+		static char get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			size_t len;
+			auto str = lua_tolstring(L, index, &len);
+			return len > 0 ? str[0] : '\0';
+		}
+	};
+
+	template <typename Traits>
+	struct unqualified_getter<basic_string_view<char, Traits>> {
+		static string_view get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			size_t sz;
+			const char* str = lua_tolstring(L, index, &sz);
+			return basic_string_view<char, Traits>(str, sz);
+		}
+	};
+
+	template <typename Traits, typename Al>
+	struct unqualified_getter<std::basic_string<wchar_t, Traits, Al>> {
+		using S = std::basic_string<wchar_t, Traits, Al>;
+		static S get(lua_State* L, int index, record& tracking) {
+			using Ch = meta::conditional_t<sizeof(wchar_t) == 2, char16_t, char32_t>;
+			return stack_detail::get_into<Ch, S>(L, index, tracking);
+		}
+	};
+
+	template <typename Traits, typename Al>
+	struct unqualified_getter<std::basic_string<char16_t, Traits, Al>> {
+		static std::basic_string<char16_t, Traits, Al> get(lua_State* L, int index, record& tracking) {
+			return stack_detail::get_into<char16_t, std::basic_string<char16_t, Traits, Al>>(L, index, tracking);
+		}
+	};
+
+	template <typename Traits, typename Al>
+	struct unqualified_getter<std::basic_string<char32_t, Traits, Al>> {
+		static std::basic_string<char32_t, Traits, Al> get(lua_State* L, int index, record& tracking) {
+			return stack_detail::get_into<char32_t, std::basic_string<char32_t, Traits, Al>>(L, index, tracking);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<char16_t> {
+		static char16_t get(lua_State* L, int index, record& tracking) {
+			string_view utf8 = stack::get<string_view>(L, index, tracking);
+			const char* strb = utf8.data();
+			const char* stre = utf8.data() + utf8.size();
+			char32_t cp = 0;
+			auto dr = unicode::utf8_to_code_point(strb, stre);
+			if (dr.error != unicode::error_code::ok) {
+				cp = unicode::unicode_detail::replacement;
+			}
+			else {
+				cp = dr.codepoint;
+			}
+			auto er = unicode::code_point_to_utf16(cp);
+			return er.code_units[0];
+		}
+	};
+
+	template <>
+	struct unqualified_getter<char32_t> {
+		static char32_t get(lua_State* L, int index, record& tracking) {
+			string_view utf8 = stack::get<string_view>(L, index, tracking);
+			const char* strb = utf8.data();
+			const char* stre = utf8.data() + utf8.size();
+			char32_t cp = 0;
+			auto dr = unicode::utf8_to_code_point(strb, stre);
+			if (dr.error != unicode::error_code::ok) {
+				cp = unicode::unicode_detail::replacement;
+			}
+			else {
+				cp = dr.codepoint;
+			}
+			auto er = unicode::code_point_to_utf32(cp);
+			return er.code_units[0];
+		}
+	};
+
+	template <>
+	struct unqualified_getter<wchar_t> {
+		static wchar_t get(lua_State* L, int index, record& tracking) {
+			typedef meta::conditional_t<sizeof(wchar_t) == 2, char16_t, char32_t> Ch;
+			unqualified_getter<Ch> g;
+			(void)g;
+			auto c = g.get(L, index, tracking);
+			return static_cast<wchar_t>(c);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<meta_function> {
+		static meta_function get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			const char* name = unqualified_getter<const char*> {}.get(L, index, tracking);
+			const auto& mfnames = meta_function_names();
+			for (std::size_t i = 0; i < mfnames.size(); ++i)
+				if (mfnames[i] == name)
+					return static_cast<meta_function>(i);
+			return meta_function::construct;
+		}
+	};
+
+	template <>
+	struct unqualified_getter<lua_nil_t> {
+		static lua_nil_t get(lua_State*, int, record& tracking) {
+			tracking.use(1);
+			return lua_nil;
+		}
+	};
+
+	template <>
+	struct unqualified_getter<std::nullptr_t> {
+		static std::nullptr_t get(lua_State*, int, record& tracking) {
+			tracking.use(1);
+			return nullptr;
+		}
+	};
+
+	template <>
+	struct unqualified_getter<nullopt_t> {
+		static nullopt_t get(lua_State*, int, record& tracking) {
+			tracking.use(1);
+			return nullopt;
+		}
+	};
+
+	template <>
+	struct unqualified_getter<this_state> {
+		static this_state get(lua_State* L, int, record& tracking) {
+			tracking.use(0);
+			return this_state(L);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<this_main_state> {
+		static this_main_state get(lua_State* L, int, record& tracking) {
+			tracking.use(0);
+			return this_main_state(main_thread(L, L));
+		}
+	};
+
+	template <>
+	struct unqualified_getter<lua_CFunction> {
+		static lua_CFunction get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			return lua_tocfunction(L, index);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<c_closure> {
+		static c_closure get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			return c_closure(lua_tocfunction(L, index), -1);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<error> {
+		static error get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			size_t sz = 0;
+			const char* err = lua_tolstring(L, index, &sz);
+			if (err == nullptr) {
+				return error(detail::direct_error, "");
+			}
+			return error(detail::direct_error, std::string(err, sz));
+		}
+	};
+
+	template <>
+	struct unqualified_getter<void*> {
+		static void* get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			return lua_touserdata(L, index);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<const void*> {
+		static const void* get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			return lua_touserdata(L, index);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<detail::as_value_tag<T>> {
+		static T* get_no_lua_nil(lua_State* L, int index, record& tracking) {
+			void* memory = lua_touserdata(L, index);
+#if SOL_IS_ON(SOL_USE_INTEROP_I_)
+			auto ugr = stack_detail::interop_get<T>(L, index, memory, tracking);
+			if (ugr.first) {
+				return ugr.second;
+			}
+#endif // interop extensibility
+			tracking.use(1);
+			void* rawdata = detail::align_usertype_pointer(memory);
+			void** pudata = static_cast<void**>(rawdata);
+			void* udata = *pudata;
+			return get_no_lua_nil_from(L, udata, index, tracking);
+		}
+
+		static T* get_no_lua_nil_from(lua_State* L, void* udata, int index, record&) {
+			bool has_derived = derive<T>::value || weak_derive<T>::value;
+			if (has_derived) {
+				if (lua_getmetatable(L, index) == 1) {
+					lua_getfield(L, -1, &detail::base_class_cast_key()[0]);
+					if (type_of(L, -1) != type::lua_nil) {
+						void* basecastdata = lua_touserdata(L, -1);
+						detail::inheritance_cast_function ic = reinterpret_cast<detail::inheritance_cast_function>(basecastdata);
+						// use the casting function to properly adjust the pointer for the desired T
+						udata = ic(udata, usertype_traits<T>::qualified_name());
+					}
+					lua_pop(L, 2);
+				}
+			}
+			T* obj = static_cast<T*>(udata);
+			return obj;
+		}
+
+		static T& get(lua_State* L, int index, record& tracking) {
+			return *get_no_lua_nil(L, index, tracking);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<detail::as_pointer_tag<T>> {
+		static T* get(lua_State* L, int index, record& tracking) {
+			type t = type_of(L, index);
+			if (t == type::lua_nil) {
+				tracking.use(1);
+				return nullptr;
+			}
+			unqualified_getter<detail::as_value_tag<T>> g;
+			// Avoid VC++ warning
+			(void)g;
+			return g.get_no_lua_nil(L, index, tracking);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<non_null<T*>> {
+		static T* get(lua_State* L, int index, record& tracking) {
+			unqualified_getter<detail::as_value_tag<T>> g;
+			// Avoid VC++ warning
+			(void)g;
+			return g.get_no_lua_nil(L, index, tracking);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<T&> {
+		static T& get(lua_State* L, int index, record& tracking) {
+			unqualified_getter<detail::as_value_tag<T>> g;
+			// Avoid VC++ warning
+			(void)g;
+			return g.get(L, index, tracking);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<std::reference_wrapper<T>> {
+		static T& get(lua_State* L, int index, record& tracking) {
+			unqualified_getter<T&> g;
+			// Avoid VC++ warning
+			(void)g;
+			return g.get(L, index, tracking);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<T*> {
+		static T* get(lua_State* L, int index, record& tracking) {
+#if SOL_IS_ON(SOL_GET_FUNCTION_POINTER_UNSAFE_I_)
+			if constexpr (std::is_function_v<T>) {
+				return stack_detail::get_function_pointer<T>(L, index, tracking);
+			}
+			else {
+				unqualified_getter<detail::as_pointer_tag<T>> g;
+				// Avoid VC++ warning
+				(void)g;
+				return g.get(L, index, tracking);
+			}
+#else
+			unqualified_getter<detail::as_pointer_tag<T>> g;
+			// Avoid VC++ warning
+			(void)g;
+			return g.get(L, index, tracking);
+#endif
+		}
+	};
+
+	template <typename... Tn>
+	struct unqualified_getter<std::tuple<Tn...>> {
+		typedef std::tuple<decltype(stack::get<Tn>(nullptr, 0))...> R;
+
+		template <typename... Args>
+		static R apply(std::index_sequence<>, lua_State*, int, record&, Args&&... args) {
+			// Fuck you too, VC++
+			return R { std::forward<Args>(args)... };
+		}
+
+		template <std::size_t I, std::size_t... Ix, typename... Args>
+		static R apply(std::index_sequence<I, Ix...>, lua_State* L, int index, record& tracking, Args&&... args) {
+			// Fuck you too, VC++
+			typedef std::tuple_element_t<I, std::tuple<Tn...>> T;
+			return apply(std::index_sequence<Ix...>(), L, index, tracking, std::forward<Args>(args)..., stack::get<T>(L, index + tracking.used, tracking));
+		}
+
+		static R get(lua_State* L, int index, record& tracking) {
+			return apply(std::make_index_sequence<sizeof...(Tn)>(), L, index, tracking);
+		}
+	};
+
+	template <typename A, typename B>
+	struct unqualified_getter<std::pair<A, B>> {
+		static decltype(auto) get(lua_State* L, int index, record& tracking) {
+			return std::pair<decltype(stack::get<A>(L, index)), decltype(stack::get<B>(L, index))> { stack::get<A>(L, index, tracking),
+				stack::get<B>(L, index + tracking.used, tracking) };
+		}
+	};
+
+#if SOL_IS_ON(SOL_STD_VARIANT_I_)
+
+	template <typename... Tn>
+	struct unqualified_getter<std::variant<Tn...>> {
+		using V = std::variant<Tn...>;
+
+		static V get_one(std::integral_constant<std::size_t, std::variant_size_v<V>>, lua_State* L, int index, record& tracking) {
+			(void)L;
+			(void)index;
+			(void)tracking;
+			if constexpr (std::variant_size_v<V> == 0) {
+				return V();
+			}
+			else {
+				// using T = std::variant_alternative_t<0, V>;
+				std::abort();
+				// return V(std::in_place_index<0>, stack::get<T>(L, index, tracking));
+			}
+		}
+
+		template <std::size_t I>
+		static V get_one(std::integral_constant<std::size_t, I>, lua_State* L, int index, record& tracking) {
+			typedef std::variant_alternative_t<I, V> T;
+			record temp_tracking = tracking;
+			if (stack::check<T>(L, index, no_panic, temp_tracking)) {
+				tracking = temp_tracking;
+				return V(std::in_place_index<I>, stack::get<T>(L, index));
+			}
+			return get_one(std::integral_constant<std::size_t, I + 1>(), L, index, tracking);
+		}
+
+		static V get(lua_State* L, int index, record& tracking) {
+			return get_one(std::integral_constant<std::size_t, 0>(), L, index, tracking);
+		}
+	};
+#endif // variant
+
+}} // namespace sol::stack
+
+// end of sol/stack_get_unqualified.hpp
+
+// beginning of sol/stack_get_qualified.hpp
+
+namespace sol {
+namespace stack {
+
+	// There are no more enable_ifs that can be used here,
+	// so this is just for posterity, I guess?
+	// maybe I'll fill this file in later.
+
+}
+} // namespace sol::stack
+
+// end of sol/stack_get_qualified.hpp
+
+// end of sol/stack_get.hpp
+
+// beginning of sol/stack_check_get.hpp
+
+// beginning of sol/stack_check_get_unqualified.hpp
+
+#include <cstdlib>
+#include <cmath>
+#include <optional>
+#if SOL_IS_ON(SOL_STD_VARIANT_I_)
+#include <variant>
+#endif // variant shenanigans (thanks, Mac OSX)
+
+namespace sol { namespace stack {
+	template <typename T, typename>
+	struct unqualified_check_getter {
+		typedef decltype(stack_detail::unchecked_unqualified_get<T>(nullptr, -1, std::declval<record&>())) R;
+
+		template <typename Optional, typename Handler>
+		static Optional get_using(lua_State* L, int index, Handler&& handler, record& tracking) {
+			if constexpr (!meta::meta_detail::is_adl_sol_lua_check_v<T> && !meta::meta_detail::is_adl_sol_lua_get_v<T>) {
+				if constexpr (is_lua_reference_v<T>) {
+					// actually check if it's none here, otherwise
+					// we'll have a none object inside an optional!
+					bool success = lua_isnoneornil(L, index) == 0 && stack::check<T>(L, index, no_panic);
+					if (!success) {
+						// expected type, actual type
+						tracking.use(static_cast<int>(success));
+						handler(L, index, type::poly, type_of(L, index), "");
+						return detail::associated_nullopt_v<Optional>;
+					}
+					return stack_detail::unchecked_get<T>(L, index, tracking);
+				}
+				else if constexpr ((std::is_integral_v<T> || std::is_same_v<T, lua_Integer>)&&!std::is_same_v<T, bool>) {
+#if SOL_LUA_VESION_I_ >= 503
+					if (lua_isinteger(L, index) != 0) {
+						tracking.use(1);
+						return static_cast<T>(lua_tointeger(L, index));
+					}
+#endif
+					int isnum = 0;
+					const lua_Number value = lua_tonumberx(L, index, &isnum);
+					if (isnum != 0) {
+#if SOL_IS_ON(SOL_NUMBER_PRECISION_CHECKS_I_)
+						const auto integer_value = llround(value);
+						if (static_cast<lua_Number>(integer_value) == value) {
+							tracking.use(1);
+							return static_cast<T>(integer_value);
+						}
+#else
+						tracking.use(1);
+						return static_cast<T>(value);
+#endif
+					}
+					const type t = type_of(L, index);
+					tracking.use(static_cast<int>(t != type::none));
+					handler(L, index, type::number, t, "not an integer");
+					return detail::associated_nullopt_v<Optional>;
+				}
+				else if constexpr (std::is_floating_point_v<T> || std::is_same_v<T, lua_Number>) {
+					int isnum = 0;
+					lua_Number value = lua_tonumberx(L, index, &isnum);
+					if (isnum == 0) {
+						type t = type_of(L, index);
+						tracking.use(static_cast<int>(t != type::none));
+						handler(L, index, type::number, t, "not a valid floating point number");
+						return detail::associated_nullopt_v<Optional>;
+					}
+					tracking.use(1);
+					return static_cast<T>(value);
+				}
+				else if constexpr (std::is_enum_v<T> && !meta::any_same_v<T, meta_function, type>) {
+					int isnum = 0;
+					lua_Integer value = lua_tointegerx(L, index, &isnum);
+					if (isnum == 0) {
+						type t = type_of(L, index);
+						tracking.use(static_cast<int>(t != type::none));
+						handler(L, index, type::number, t, "not a valid enumeration value");
+						return detail::associated_nullopt_v<Optional>;
+					}
+					tracking.use(1);
+					return static_cast<T>(value);
+				}
+				else {
+					if (!unqualified_check<T>(L, index, std::forward<Handler>(handler))) {
+						tracking.use(static_cast<int>(!lua_isnone(L, index)));
+						return detail::associated_nullopt_v<Optional>;
+					}
+					return stack_detail::unchecked_unqualified_get<T>(L, index, tracking);
+				}
+			}
+			else {
+				if (!unqualified_check<T>(L, index, std::forward<Handler>(handler))) {
+					tracking.use(static_cast<int>(!lua_isnone(L, index)));
+					return detail::associated_nullopt_v<Optional>;
+				}
+				return stack_detail::unchecked_unqualified_get<T>(L, index, tracking);
+			}
+		}
+
+		template <typename Handler>
+		static optional<R> get(lua_State* L, int index, Handler&& handler, record& tracking) {
+			return get_using<optional<R>>(L, index, std::forward<Handler>(handler), tracking);
+		}
+	};
+
+#if SOL_IS_ON(SOL_STD_VARIANT_I_)
+	template <typename... Tn, typename C>
+	struct unqualified_check_getter<std::variant<Tn...>, C> {
+		typedef std::variant<Tn...> V;
+		typedef std::variant_size<V> V_size;
+		typedef std::integral_constant<bool, V_size::value == 0> V_is_empty;
+
+		template <typename Handler>
+		static optional<V> get_empty(std::true_type, lua_State*, int, Handler&&, record&) {
+			return nullopt;
+		}
+
+		template <typename Handler>
+		static optional<V> get_empty(std::false_type, lua_State* L, int index, Handler&& handler, record&) {
+			// This should never be reached...
+			// please check your code and understand what you did to bring yourself here
+			// maybe file a bug report, or 5
+			handler(
+				L, index, type::poly, type_of(L, index), "this variant code should never be reached: if it has, you have done something so terribly wrong");
+			return nullopt;
+		}
+
+		template <typename Handler>
+		static optional<V> get_one(std::integral_constant<std::size_t, 0>, lua_State* L, int index, Handler&& handler, record& tracking) {
+			return get_empty(V_is_empty(), L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <std::size_t I, typename Handler>
+		static optional<V> get_one(std::integral_constant<std::size_t, I>, lua_State* L, int index, Handler&& handler, record& tracking) {
+			typedef std::variant_alternative_t<I - 1, V> T;
+			if (stack::check<T>(L, index, no_panic, tracking)) {
+				return V(std::in_place_index<I - 1>, stack::get<T>(L, index));
+			}
+			return get_one(std::integral_constant<std::size_t, I - 1>(), L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename Handler>
+		static optional<V> get(lua_State* L, int index, Handler&& handler, record& tracking) {
+			return get_one(std::integral_constant<std::size_t, V_size::value>(), L, index, std::forward<Handler>(handler), tracking);
+		}
+	};
+#endif // standard variant
+}}     // namespace sol::stack
+
+// end of sol/stack_check_get_unqualified.hpp
+
+// beginning of sol/stack_check_get_qualified.hpp
+
+namespace sol { namespace stack {
+	template <typename T, typename C>
+	struct qualified_check_getter {
+		typedef decltype(stack_detail::unchecked_get<T>(nullptr, -1, std::declval<record&>())) R;
+
+		template <typename Handler>
+		static optional<R> get(lua_State* L, int index, Handler&& handler, record& tracking) {
+			if constexpr (is_lua_reference_v<T>) {
+				// actually check if it's none here, otherwise
+				// we'll have a none object inside an optional!
+				bool success = lua_isnoneornil(L, index) == 0 && stack::check<T>(L, index, no_panic);
+				if (!success) {
+					// expected type, actual type
+					tracking.use(static_cast<int>(success));
+					handler(L, index, type::poly, type_of(L, index), "");
+					return nullopt;
+				}
+				return stack_detail::unchecked_get<T>(L, index, tracking);
+			}
+			else {
+				if (!check<T>(L, index, std::forward<Handler>(handler))) {
+					tracking.use(static_cast<int>(!lua_isnone(L, index)));
+					return nullopt;
+				}
+				return stack_detail::unchecked_get<T>(L, index, tracking);
+			}
+		}
+	};
+
+	template <typename T>
+	struct qualified_getter<T, std::enable_if_t<meta::is_optional_v<T>>> {
+		static T get(lua_State* L, int index, record& tracking) {
+			using ValueType = typename meta::unqualified_t<T>::value_type;
+			if constexpr (is_lua_reference_v<ValueType>) {
+				// actually check if it's none here, otherwise
+				// we'll have a none object inside an optional!
+				bool success = lua_isnoneornil(L, index) == 0 && stack::check<ValueType>(L, index, no_panic);
+				if (!success) {
+					// expected type, actual type
+					tracking.use(static_cast<int>(success));
+					return {};
+				}
+				return stack_detail::unchecked_get<ValueType>(L, index, tracking);
+			}
+			else {
+				if (!check<ValueType>(L, index, &no_panic)) {
+					tracking.use(static_cast<int>(!lua_isnone(L, index)));
+					return {};
+				}
+				return stack_detail::unchecked_get<ValueType>(L, index, tracking);
+			}
+		}
+	};
+
+}} // namespace sol::stack
+
+// end of sol/stack_check_get_qualified.hpp
+
+// end of sol/stack_check_get.hpp
+
+// beginning of sol/stack_push.hpp
+
+#include <memory>
+#include <type_traits>
+#include <cassert>
+#include <limits>
+#include <cmath>
+#include <string_view>
+#if SOL_IS_ON(SOL_STD_VARIANT_I_)
+#include <variant>
+#endif // Can use variant
+
+namespace sol { namespace stack {
+	namespace stack_detail {
+		template <typename T>
+		inline bool integer_value_fits(const T& value) {
+			if constexpr (sizeof(T) < sizeof(lua_Integer) || (std::is_signed_v<T> && sizeof(T) == sizeof(lua_Integer))) {
+				(void)value;
+				return true;
+			}
+			else {
+				auto u_min = static_cast<std::intmax_t>((std::numeric_limits<lua_Integer>::min)());
+				auto u_max = static_cast<std::uintmax_t>((std::numeric_limits<lua_Integer>::max)());
+				auto t_min = static_cast<std::intmax_t>((std::numeric_limits<T>::min)());
+				auto t_max = static_cast<std::uintmax_t>((std::numeric_limits<T>::max)());
+				return (u_min <= t_min || value >= static_cast<T>(u_min)) && (u_max >= t_max || value <= static_cast<T>(u_max));
+			}
+		}
+
+		template <typename T>
+		int msvc_is_ass_with_if_constexpr_push_enum(std::true_type, lua_State* L, const T& value) {
+			if constexpr (meta::any_same_v<std::underlying_type_t<T>, char /*, char8_t*/, char16_t, char32_t>) {
+				if constexpr (std::is_signed_v<T>) {
+					return stack::push(L, static_cast<std::int_least32_t>(value));
+				}
+				else {
+					return stack::push(L, static_cast<std::uint_least32_t>(value));
+				}
+			}
+			else {
+				return stack::push(L, static_cast<std::underlying_type_t<T>>(value));
+			}
+		}
+
+		template <typename T>
+		int msvc_is_ass_with_if_constexpr_push_enum(std::false_type, lua_State*, const T&) {
+			return 0;
+		}
+	} // namespace stack_detail
+
+	inline int push_environment_of(lua_State* L, int index = -1) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+		luaL_checkstack(L, 1, detail::not_enough_stack_space_environment);
+#endif // make sure stack doesn't overflow
+#if SOL_LUA_VESION_I_ < 502
+		// Use lua_getfenv
+		lua_getfenv(L, index);
+#else
+		// Use upvalues as explained in Lua 5.2 and beyond's manual
+		if (lua_getupvalue(L, index, 1) == nullptr) {
+			push(L, lua_nil);
+			return 1;
+		}
+#endif
+		return 1;
+	}
+
+	template <typename T>
+	int push_environment_of(const T& target) {
+		target.push();
+		return push_environment_of(target.lua_state(), -1) + 1;
+	}
+
+	template <typename T>
+	struct unqualified_pusher<detail::as_value_tag<T>> {
+		template <typename F, typename... Args>
+		static int push_fx(lua_State* L, F&& f, Args&&... args) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_userdata);
+#endif // make sure stack doesn't overflow
+       // Basically, we store all user-data like this:
+       // If it's a movable/copyable value (no std::ref(x)), then we store the pointer to the new
+       // data in the first sizeof(T*) bytes, and then however many bytes it takes to
+       // do the actual object. Things that are std::ref or plain T* are stored as
+       // just the sizeof(T*), and nothing else.
+			T* obj = detail::usertype_allocate<T>(L);
+			f();
+			std::allocator<T> alloc {};
+			std::allocator_traits<std::allocator<T>>::construct(alloc, obj, std::forward<Args>(args)...);
+			return 1;
+		}
+
+		template <typename K, typename... Args>
+		static int push_keyed(lua_State* L, K&& k, Args&&... args) {
+			stack_detail::undefined_metatable fx(L, &k[0], &stack::stack_detail::set_undefined_methods_on<T>);
+			return push_fx(L, fx, std::forward<Args>(args)...);
+		}
+
+		template <typename Arg, typename... Args>
+		static int push(lua_State* L, Arg&& arg, Args&&... args) {
+			if constexpr (std::is_same_v<meta::unqualified_t<Arg>, detail::with_function_tag>) {
+				(void)arg;
+				return push_fx(L, std::forward<Args>(args)...);
+			}
+			else {
+				return push_keyed(L, usertype_traits<T>::metatable(), std::forward<Arg>(arg), std::forward<Args>(args)...);
+			}
+		}
+
+		static int push(lua_State* L) {
+			return push_keyed(L, usertype_traits<T>::metatable());
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<detail::as_pointer_tag<T>> {
+		typedef meta::unqualified_t<T> U;
+
+		template <typename F>
+		static int push_fx(lua_State* L, F&& f, T* obj) {
+			if (obj == nullptr)
+				return stack::push(L, lua_nil);
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_userdata);
+#endif // make sure stack doesn't overflow
+			T** pref = detail::usertype_allocate_pointer<T>(L);
+			f();
+			*pref = obj;
+			return 1;
+		}
+
+		template <typename K>
+		static int push_keyed(lua_State* L, K&& k, T* obj) {
+			stack_detail::undefined_metatable fx(L, &k[0], &stack::stack_detail::set_undefined_methods_on<U*>);
+			return push_fx(L, fx, obj);
+		}
+
+		template <typename Arg, typename... Args>
+		static int push(lua_State* L, Arg&& arg, Args&&... args) {
+			if constexpr (std::is_same_v<meta::unqualified_t<Arg>, detail::with_function_tag>) {
+				(void)arg;
+				return push_fx(L, std::forward<Args>(args)...);
+			}
+			else {
+				return push_keyed(L, usertype_traits<U*>::metatable(), std::forward<Arg>(arg), std::forward<Args>(args)...);
+			}
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<detail::as_reference_tag> {
+		template <typename T>
+		static int push(lua_State* L, T&& obj) {
+			return stack::push(L, detail::ptr(obj));
+		}
+	};
+
+	namespace stack_detail {
+		template <typename T>
+		struct uu_pusher {
+			using u_traits = unique_usertype_traits<T>;
+			using P = typename u_traits::type;
+			using Real = typename u_traits::actual_type;
+
+			template <typename Arg, typename... Args>
+			static int push(lua_State* L, Arg&& arg, Args&&... args) {
+				if constexpr (std::is_base_of_v<Real, meta::unqualified_t<Arg>>) {
+					if (u_traits::is_null(arg)) {
+						return stack::push(L, lua_nil);
+					}
+					return push_deep(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+				}
+				else {
+					return push_deep(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+				}
+			}
+
+			template <typename... Args>
+			static int push_deep(lua_State* L, Args&&... args) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+				luaL_checkstack(L, 1, detail::not_enough_stack_space_userdata);
+#endif // make sure stack doesn't overflow
+				P** pref = nullptr;
+				detail::unique_destructor* fx = nullptr;
+				detail::unique_tag* id = nullptr;
+				Real* mem = detail::usertype_unique_allocate<P, Real>(L, pref, fx, id);
+				if (luaL_newmetatable(L, &usertype_traits<detail::unique_usertype<std::remove_cv_t<P>>>::metatable()[0]) == 1) {
+					detail::lua_reg_table l {};
+					int index = 0;
+					detail::indexed_insert insert_fx(l, index);
+					detail::insert_default_registrations<P>(insert_fx, detail::property_always_true);
+					l[index] = { to_string(meta_function::garbage_collect).c_str(), detail::make_destructor<T>() };
+					luaL_setfuncs(L, l, 0);
+				}
+				lua_setmetatable(L, -2);
+				*fx = detail::usertype_unique_alloc_destroy<P, Real>;
+				*id = &detail::inheritance<P>::template type_unique_cast<Real>;
+				detail::default_construct::construct(mem, std::forward<Args>(args)...);
+				*pref = unique_usertype_traits<T>::get(*mem);
+				return 1;
+			}
+		};
+	} // namespace stack_detail
+
+	template <typename T>
+	struct unqualified_pusher<detail::as_unique_tag<T>> {
+		template <typename... Args>
+		static int push(lua_State* L, Args&&... args) {
+			stack_detail::uu_pusher<T> p;
+			(void)p;
+			return p.push(L, std::forward<Args>(args)...);
+		}
+	};
+
+	template <typename T, typename>
+	struct unqualified_pusher {
+		template <typename... Args>
+		static int push(lua_State* L, Args&&... args) {
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (is_lua_reference_v<Tu>) {
+				using int_arr = int[];
+				int_arr p { (std::forward<Args>(args).push(L))... };
+				return p[0];
+			}
+			else if constexpr (std::is_same_v<Tu, bool>) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+				luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+				lua_pushboolean(L, std::forward<Args>(args)...);
+				return 1;
+			}
+			else if constexpr (std::is_integral_v<Tu> || std::is_same_v<Tu, lua_Integer>) {
+				const Tu& value(std::forward<Args>(args)...);
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+				luaL_checkstack(L, 1, detail::not_enough_stack_space_integral);
+#endif // make sure stack doesn't overflow
+#if SOL_LUA_VESION_I_ >= 503
+				if (stack_detail::integer_value_fits<Tu>(value)) {
+					lua_pushinteger(L, static_cast<lua_Integer>(value));
+					return 1;
+				}
+#endif // Lua 5.3 and above
+#if SOL_IS_ON(SOL_NUMBER_PRECISION_CHECKS_I_)
+				if (static_cast<T>(llround(static_cast<lua_Number>(value))) != value) {
+#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
+					// Is this really worth it?
+					assert(false && "integer value will be misrepresented in lua");
+					lua_pushinteger(L, static_cast<lua_Integer>(value));
+					return 1;
+#else
+					throw error(detail::direct_error, "integer value will be misrepresented in lua");
+#endif // No Exceptions
+				}
+#endif // Safe Numerics and Number Precision Check
+				lua_pushnumber(L, static_cast<lua_Number>(value));
+				return 1;
+			}
+			else if constexpr (std::is_floating_point_v<Tu> || std::is_same_v<Tu, lua_Number>) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+				luaL_checkstack(L, 1, detail::not_enough_stack_space_floating);
+#endif // make sure stack doesn't overflow
+				lua_pushnumber(L, std::forward<Args>(args)...);
+				return 1;
+			}
+			else if constexpr (std::is_same_v<Tu, luaL_Stream*>) {
+				luaL_Stream* source { std::forward<Args>(args)... };
+				luaL_Stream* stream = static_cast<luaL_Stream*>(lua_newuserdata(L, sizeof(luaL_Stream)));
+				stream->f = source->f;
+#if SOL_IS_ON(SOL_LUAL_STREAM_USE_CLOSE_FUNCTION_I_)
+				stream->closef = source->closef;
+#endif // LuaJIT and Lua 5.1 and below do not have
+				return 1;
+			}
+			else if constexpr (std::is_same_v<Tu, luaL_Stream>) {
+				luaL_Stream& source(std::forward<Args>(args)...);
+				luaL_Stream* stream = static_cast<luaL_Stream*>(lua_newuserdata(L, sizeof(luaL_Stream)));
+				stream->f = source.f;
+#if SOL_IS_ON(SOL_LUAL_STREAM_USE_CLOSE_FUNCTION_I_)
+				stream->closef = source.closef;
+#endif // LuaJIT and Lua 5.1 and below do not have
+				return 1;
+			}
+			else if constexpr (std::is_enum_v<Tu>) {
+				return stack_detail::msvc_is_ass_with_if_constexpr_push_enum(std::true_type(), L, std::forward<Args>(args)...);
+			}
+			else if constexpr (std::is_pointer_v<Tu>) {
+				return stack::push<detail::as_pointer_tag<std::remove_pointer_t<T>>>(L, std::forward<Args>(args)...);
+			}
+			else if constexpr (is_unique_usertype_v<Tu>) {
+				return stack::push<detail::as_unique_tag<T>>(L, std::forward<Args>(args)...);
+			}
+			else {
+				return stack::push<detail::as_value_tag<T>>(L, std::forward<Args>(args)...);
+			}
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<std::reference_wrapper<T>> {
+		static int push(lua_State* L, const std::reference_wrapper<T>& t) {
+			return stack::push(L, std::addressof(detail::deref(t.get())));
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<detail::as_table_tag<T>> {
+		using has_kvp = meta::has_key_value_pair<meta::unqualified_t<std::remove_pointer_t<T>>>;
+
+		static int push(lua_State* L, const T& tablecont) {
+			return push(has_kvp(), std::false_type(), L, tablecont);
+		}
+
+		static int push(lua_State* L, const T& tablecont, nested_tag_t) {
+			return push(has_kvp(), std::true_type(), L, tablecont);
+		}
+
+		static int push(std::true_type, lua_State* L, const T& tablecont) {
+			return push(has_kvp(), std::true_type(), L, tablecont);
+		}
+
+		static int push(std::false_type, lua_State* L, const T& tablecont) {
+			return push(has_kvp(), std::false_type(), L, tablecont);
+		}
+
+		template <bool is_nested>
+		static int push(std::true_type, std::integral_constant<bool, is_nested>, lua_State* L, const T& tablecont) {
+			auto& cont = detail::deref(detail::unwrap(tablecont));
+			lua_createtable(L, static_cast<int>(cont.size()), 0);
+			int tableindex = lua_gettop(L);
+			for (const auto& pair : cont) {
+				if (is_nested) {
+					set_field(L, pair.first, as_nested_ref(pair.second), tableindex);
+				}
+				else {
+					set_field(L, pair.first, pair.second, tableindex);
+				}
+			}
+			return 1;
+		}
+
+		template <bool is_nested>
+		static int push(std::false_type, std::integral_constant<bool, is_nested>, lua_State* L, const T& tablecont) {
+			auto& cont = detail::deref(detail::unwrap(tablecont));
+			lua_createtable(L, stack_detail::get_size_hint(cont), 0);
+			int tableindex = lua_gettop(L);
+			std::size_t index = 1;
+			for (const auto& i : cont) {
+#if SOL_LUA_VESION_I_ >= 503
+				int p = is_nested ? stack::push(L, as_nested_ref(i)) : stack::push(L, i);
+				for (int pi = 0; pi < p; ++pi) {
+					lua_seti(L, tableindex, static_cast<lua_Integer>(index++));
+				}
+#else
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+				luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+				lua_pushinteger(L, static_cast<lua_Integer>(index));
+				int p = is_nested ? stack::push(L, as_nested_ref(i)) : stack::push(L, i);
+				if (p == 1) {
+					++index;
+					lua_settable(L, tableindex);
+				}
+				else {
+					int firstindex = tableindex + 1 + 1;
+					for (int pi = 0; pi < p; ++pi) {
+						stack::push(L, index);
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+						luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+						lua_pushvalue(L, firstindex);
+						lua_settable(L, tableindex);
+						++index;
+						++firstindex;
+					}
+					lua_pop(L, 1 + p);
+				}
+#endif // Lua Version 5.3 and others
+			}
+			// TODO: figure out a better way to do this...?
+			// set_field(L, -1, cont.size());
+			return 1;
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<as_table_t<T>> {
+		static int push(lua_State* L, const T& v) {
+			using inner_t = std::remove_pointer_t<meta::unwrap_unqualified_t<T>>;
+			if constexpr (is_container_v<inner_t>) {
+				return stack::push<detail::as_table_tag<T>>(L, v);
+			}
+			else {
+				return stack::push(L, v);
+			}
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<nested<T>> {
+		static int push(lua_State* L, const T& tablecont) {
+			using Tu = meta::unwrap_unqualified_t<T>;
+			using inner_t = std::remove_pointer_t<Tu>;
+			if constexpr (is_container_v<inner_t>) {
+				return stack::push<detail::as_table_tag<T>>(L, tablecont, nested_tag);
+			}
+			else {
+				return stack::push<Tu>(L, tablecont);
+			}
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<std::initializer_list<T>> {
+		static int push(lua_State* L, const std::initializer_list<T>& il) {
+			unqualified_pusher<detail::as_table_tag<std::initializer_list<T>>> p {};
+			// silence annoying VC++ warning
+			(void)p;
+			return p.push(L, il);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<lua_nil_t> {
+		static int push(lua_State* L, lua_nil_t) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushnil(L);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<stack_count> {
+		static int push(lua_State*, stack_count st) {
+			return st.count;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<metatable_key_t> {
+		static int push(lua_State* L, metatable_key_t) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushlstring(L, to_string(meta_function::metatable).c_str(), 4);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<std::remove_pointer_t<lua_CFunction>> {
+		static int push(lua_State* L, lua_CFunction func, int n = 0) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushcclosure(L, func, n);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<lua_CFunction> {
+		static int push(lua_State* L, lua_CFunction func, int n = 0) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushcclosure(L, func, n);
+			return 1;
+		}
+	};
+
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_)
+	template <>
+	struct unqualified_pusher<std::remove_pointer_t<detail::lua_CFunction_noexcept>> {
+		static int push(lua_State* L, detail::lua_CFunction_noexcept func, int n = 0) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushcclosure(L, func, n);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<detail::lua_CFunction_noexcept> {
+		static int push(lua_State* L, detail::lua_CFunction_noexcept func, int n = 0) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushcclosure(L, func, n);
+			return 1;
+		}
+	};
+#endif // noexcept function type
+
+	template <>
+	struct unqualified_pusher<c_closure> {
+		static int push(lua_State* L, c_closure cc) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushcclosure(L, cc.c_function, cc.upvalues);
+			return 1;
+		}
+	};
+
+	template <typename Arg, typename... Args>
+	struct unqualified_pusher<closure<Arg, Args...>> {
+		template <std::size_t... I, typename T>
+		static int push(std::index_sequence<I...>, lua_State* L, T&& c) {
+			using f_tuple = decltype(std::forward<T>(c).upvalues);
+			int pushcount = multi_push(L, std::get<I>(std::forward<f_tuple>(std::forward<T>(c).upvalues))...);
+			return stack::push(L, c_closure(c.c_function, pushcount));
+		}
+
+		template <typename T>
+		static int push(lua_State* L, T&& c) {
+			return push(std::make_index_sequence<1 + sizeof...(Args)>(), L, std::forward<T>(c));
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<void*> {
+		static int push(lua_State* L, void* userdata) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushlightuserdata(L, userdata);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<const void*> {
+		static int push(lua_State* L, const void* userdata) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushlightuserdata(L, const_cast<void*>(userdata));
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<lightuserdata_value> {
+		static int push(lua_State* L, lightuserdata_value userdata) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushlightuserdata(L, userdata);
+			return 1;
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<light<T>> {
+		static int push(lua_State* L, light<T> l) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushlightuserdata(L, static_cast<void*>(l.value));
+			return 1;
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<user<T>> {
+		template <bool with_meta = true, typename Key, typename... Args>
+		static int push_with(lua_State* L, Key&& name, Args&&... args) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_userdata);
+#endif // make sure stack doesn't overflow
+       // A dumb pusher
+			T* data = detail::user_allocate<T>(L);
+			if (with_meta) {
+				// Make sure we have a plain GC set for this data
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+				luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+				if (luaL_newmetatable(L, name) != 0) {
+					lua_CFunction cdel = detail::user_alloc_destruct<T>;
+					lua_pushcclosure(L, cdel, 0);
+					lua_setfield(L, -2, "__gc");
+				}
+				lua_setmetatable(L, -2);
+			}
+			std::allocator<T> alloc {};
+			std::allocator_traits<std::allocator<T>>::construct(alloc, data, std::forward<Args>(args)...);
+			return 1;
+		}
+
+		template <typename Arg, typename... Args>
+		static int push(lua_State* L, Arg&& arg, Args&&... args) {
+			if constexpr (std::is_same_v<meta::unqualified_t<Arg>, metatable_key_t>) {
+				const auto name = &arg[0];
+				return push_with<true>(L, name, std::forward<Args>(args)...);
+			}
+			else if constexpr (std::is_same_v<meta::unqualified_t<Arg>, no_metatable_t>) {
+				(void)arg;
+				const auto name = &usertype_traits<meta::unqualified_t<T>>::user_gc_metatable()[0];
+				return push_with<false>(L, name, std::forward<Args>(args)...);
+			}
+			else {
+				const auto name = &usertype_traits<meta::unqualified_t<T>>::user_gc_metatable()[0];
+				return push_with(L, name, std::forward<Arg>(arg), std::forward<Args>(args)...);
+			}
+		}
+
+		static int push(lua_State* L, const user<T>& u) {
+			const auto name = &usertype_traits<meta::unqualified_t<T>>::user_gc_metatable()[0];
+			return push_with(L, name, u.value);
+		}
+
+		static int push(lua_State* L, user<T>&& u) {
+			const auto name = &usertype_traits<meta::unqualified_t<T>>::user_gc_metatable()[0];
+			return push_with(L, name, std::move(u.value));
+		}
+
+		static int push(lua_State* L, no_metatable_t, const user<T>& u) {
+			const auto name = &usertype_traits<meta::unqualified_t<T>>::user_gc_metatable()[0];
+			return push_with<false>(L, name, u.value);
+		}
+
+		static int push(lua_State* L, no_metatable_t, user<T>&& u) {
+			const auto name = &usertype_traits<meta::unqualified_t<T>>::user_gc_metatable()[0];
+			return push_with<false>(L, name, std::move(u.value));
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<userdata_value> {
+		static int push(lua_State* L, userdata_value data) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_userdata);
+#endif // make sure stack doesn't overflow
+			void** ud = detail::usertype_allocate_pointer<void>(L);
+			*ud = data.value;
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<const char*> {
+		static int push_sized(lua_State* L, const char* str, std::size_t len) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
+#endif // make sure stack doesn't overflow
+			lua_pushlstring(L, str, len);
+			return 1;
+		}
+
+		static int push(lua_State* L, const char* str) {
+			if (str == nullptr)
+				return stack::push(L, lua_nil);
+			return push_sized(L, str, std::char_traits<char>::length(str));
+		}
+
+		static int push(lua_State* L, const char* strb, const char* stre) {
+			return push_sized(L, strb, stre - strb);
+		}
+
+		static int push(lua_State* L, const char* str, std::size_t len) {
+			return push_sized(L, str, len);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<char*> {
+		static int push_sized(lua_State* L, const char* str, std::size_t len) {
+			unqualified_pusher<const char*> p {};
+			(void)p;
+			return p.push_sized(L, str, len);
+		}
+
+		static int push(lua_State* L, const char* str) {
+			unqualified_pusher<const char*> p {};
+			(void)p;
+			return p.push(L, str);
+		}
+
+		static int push(lua_State* L, const char* strb, const char* stre) {
+			unqualified_pusher<const char*> p {};
+			(void)p;
+			return p.push(L, strb, stre);
+		}
+
+		static int push(lua_State* L, const char* str, std::size_t len) {
+			unqualified_pusher<const char*> p {};
+			(void)p;
+			return p.push(L, str, len);
+		}
+	};
+
+	template <size_t N>
+	struct unqualified_pusher<char[N]> {
+		static int push(lua_State* L, const char (&str)[N]) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
+#endif // make sure stack doesn't overflow
+			lua_pushlstring(L, str, std::char_traits<char>::length(str));
+			return 1;
+		}
+
+		static int push(lua_State* L, const char (&str)[N], std::size_t sz) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
+#endif // make sure stack doesn't overflow
+			lua_pushlstring(L, str, sz);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<char> {
+		static int push(lua_State* L, char c) {
+			const char str[2] = { c, '\0' };
+			return stack::push(L, static_cast<const char*>(str), 1);
+		}
+	};
+
+	template <typename Ch, typename Traits, typename Al>
+	struct unqualified_pusher<std::basic_string<Ch, Traits, Al>> {
+		static int push(lua_State* L, const std::basic_string<Ch, Traits, Al>& str) {
+			if constexpr (!std::is_same_v<Ch, char>) {
+				return stack::push(L, str.data(), str.size());
+			}
+			else {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+				luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
+#endif // make sure stack doesn't overflow
+				lua_pushlstring(L, str.c_str(), str.size());
+				return 1;
+			}
+		}
+
+		static int push(lua_State* L, const std::basic_string<Ch, Traits, Al>& str, std::size_t sz) {
+			if constexpr (!std::is_same_v<Ch, char>) {
+				return stack::push(L, str.data(), sz);
+			}
+			else {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+				luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
+#endif // make sure stack doesn't overflow
+				lua_pushlstring(L, str.c_str(), sz);
+				return 1;
+			}
+		}
+	};
+
+	template <typename Ch, typename Traits>
+	struct unqualified_pusher<basic_string_view<Ch, Traits>> {
+		static int push(lua_State* L, const basic_string_view<Ch, Traits>& sv) {
+			return stack::push(L, sv.data(), sv.length());
+		}
+
+		static int push(lua_State* L, const basic_string_view<Ch, Traits>& sv, std::size_t n) {
+			return stack::push(L, sv.data(), n);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<meta_function> {
+		static int push(lua_State* L, meta_function m) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_meta_function_name);
+#endif // make sure stack doesn't overflow
+			const std::string& str = to_string(m);
+			lua_pushlstring(L, str.c_str(), str.size());
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<absolute_index> {
+		static int push(lua_State* L, absolute_index ai) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushvalue(L, ai);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<raw_index> {
+		static int push(lua_State* L, raw_index ri) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushvalue(L, ri);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<ref_index> {
+		static int push(lua_State* L, ref_index ri) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_rawgeti(L, LUA_REGISTRYINDEX, ri);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<const wchar_t*> {
+		static int push(lua_State* L, const wchar_t* wstr) {
+			return push(L, wstr, std::char_traits<wchar_t>::length(wstr));
+		}
+
+		static int push(lua_State* L, const wchar_t* wstr, std::size_t sz) {
+			return push(L, wstr, wstr + sz);
+		}
+
+		static int push(lua_State* L, const wchar_t* strb, const wchar_t* stre) {
+			if constexpr (sizeof(wchar_t) == 2) {
+				const char16_t* sb = reinterpret_cast<const char16_t*>(strb);
+				const char16_t* se = reinterpret_cast<const char16_t*>(stre);
+				return stack::push(L, sb, se);
+			}
+			else {
+				const char32_t* sb = reinterpret_cast<const char32_t*>(strb);
+				const char32_t* se = reinterpret_cast<const char32_t*>(stre);
+				return stack::push(L, sb, se);
+			}
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<wchar_t*> {
+		static int push(lua_State* L, const wchar_t* str) {
+			unqualified_pusher<const wchar_t*> p {};
+			(void)p;
+			return p.push(L, str);
+		}
+
+		static int push(lua_State* L, const wchar_t* strb, const wchar_t* stre) {
+			unqualified_pusher<const wchar_t*> p {};
+			(void)p;
+			return p.push(L, strb, stre);
+		}
+
+		static int push(lua_State* L, const wchar_t* str, std::size_t len) {
+			unqualified_pusher<const wchar_t*> p {};
+			(void)p;
+			return p.push(L, str, len);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<const char16_t*> {
+		static int convert_into(lua_State* L, char* start, std::size_t, const char16_t* strb, const char16_t* stre) {
+			char* target = start;
+			char32_t cp = 0;
+			for (const char16_t* strtarget = strb; strtarget < stre;) {
+				auto dr = unicode::utf16_to_code_point(strtarget, stre);
+				if (dr.error != unicode::error_code::ok) {
+					cp = unicode::unicode_detail::replacement;
+				}
+				else {
+					cp = dr.codepoint;
+				}
+				auto er = unicode::code_point_to_utf8(cp);
+				const char* utf8data = er.code_units.data();
+				std::memcpy(target, utf8data, er.code_units_size);
+				target += er.code_units_size;
+				strtarget = dr.next;
+			}
+
+			return stack::push(L, start, target);
+		}
+
+		static int push(lua_State* L, const char16_t* u16str) {
+			return push(L, u16str, std::char_traits<char16_t>::length(u16str));
+		}
+
+		static int push(lua_State* L, const char16_t* u16str, std::size_t sz) {
+			return push(L, u16str, u16str + sz);
+		}
+
+		static int push(lua_State* L, const char16_t* strb, const char16_t* stre) {
+			char sbo[SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_];
+			// if our max string space is small enough, use SBO
+			// right off the bat
+			std::size_t max_possible_code_units = (stre - strb) * 4;
+			if (max_possible_code_units <= SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_) {
+				return convert_into(L, sbo, max_possible_code_units, strb, stre);
+			}
+			// otherwise, we must manually count/check size
+			std::size_t needed_size = 0;
+			for (const char16_t* strtarget = strb; strtarget < stre;) {
+				auto dr = unicode::utf16_to_code_point(strtarget, stre);
+				auto er = unicode::code_point_to_utf8(dr.codepoint);
+				needed_size += er.code_units_size;
+				strtarget = dr.next;
+			}
+			if (needed_size < SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_) {
+				return convert_into(L, sbo, needed_size, strb, stre);
+			}
+			std::string u8str("", 0);
+			u8str.resize(needed_size);
+			char* target = const_cast<char*>(u8str.data());
+			return convert_into(L, target, needed_size, strb, stre);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<char16_t*> {
+		static int push(lua_State* L, const char16_t* str) {
+			unqualified_pusher<const char16_t*> p {};
+			(void)p;
+			return p.push(L, str);
+		}
+
+		static int push(lua_State* L, const char16_t* strb, const char16_t* stre) {
+			unqualified_pusher<const char16_t*> p {};
+			(void)p;
+			return p.push(L, strb, stre);
+		}
+
+		static int push(lua_State* L, const char16_t* str, std::size_t len) {
+			unqualified_pusher<const char16_t*> p {};
+			(void)p;
+			return p.push(L, str, len);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<const char32_t*> {
+		static int convert_into(lua_State* L, char* start, std::size_t, const char32_t* strb, const char32_t* stre) {
+			char* target = start;
+			char32_t cp = 0;
+			for (const char32_t* strtarget = strb; strtarget < stre;) {
+				auto dr = unicode::utf32_to_code_point(strtarget, stre);
+				if (dr.error != unicode::error_code::ok) {
+					cp = unicode::unicode_detail::replacement;
+				}
+				else {
+					cp = dr.codepoint;
+				}
+				auto er = unicode::code_point_to_utf8(cp);
+				const char* data = er.code_units.data();
+				std::memcpy(target, data, er.code_units_size);
+				target += er.code_units_size;
+				strtarget = dr.next;
+			}
+			return stack::push(L, start, target);
+		}
+
+		static int push(lua_State* L, const char32_t* u32str) {
+			return push(L, u32str, u32str + std::char_traits<char32_t>::length(u32str));
+		}
+
+		static int push(lua_State* L, const char32_t* u32str, std::size_t sz) {
+			return push(L, u32str, u32str + sz);
+		}
+
+		static int push(lua_State* L, const char32_t* strb, const char32_t* stre) {
+			char sbo[SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_];
+			// if our max string space is small enough, use SBO
+			// right off the bat
+			std::size_t max_possible_code_units = (stre - strb) * 4;
+			if (max_possible_code_units <= SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_) {
+				return convert_into(L, sbo, max_possible_code_units, strb, stre);
+			}
+			// otherwise, we must manually count/check size
+			std::size_t needed_size = 0;
+			for (const char32_t* strtarget = strb; strtarget < stre;) {
+				auto dr = unicode::utf32_to_code_point(strtarget, stre);
+				auto er = unicode::code_point_to_utf8(dr.codepoint);
+				needed_size += er.code_units_size;
+				strtarget = dr.next;
+			}
+			if (needed_size < SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_) {
+				return convert_into(L, sbo, needed_size, strb, stre);
+			}
+			std::string u8str("", 0);
+			u8str.resize(needed_size);
+			char* target = const_cast<char*>(u8str.data());
+			return convert_into(L, target, needed_size, strb, stre);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<char32_t*> {
+		static int push(lua_State* L, const char32_t* str) {
+			unqualified_pusher<const char32_t*> p {};
+			(void)p;
+			return p.push(L, str);
+		}
+
+		static int push(lua_State* L, const char32_t* strb, const char32_t* stre) {
+			unqualified_pusher<const char32_t*> p {};
+			(void)p;
+			return p.push(L, strb, stre);
+		}
+
+		static int push(lua_State* L, const char32_t* str, std::size_t len) {
+			unqualified_pusher<const char32_t*> p {};
+			(void)p;
+			return p.push(L, str, len);
+		}
+	};
+
+	template <size_t N>
+	struct unqualified_pusher<wchar_t[N]> {
+		static int push(lua_State* L, const wchar_t (&str)[N]) {
+			return push(L, str, std::char_traits<wchar_t>::length(str));
+		}
+
+		static int push(lua_State* L, const wchar_t (&str)[N], std::size_t sz) {
+			const wchar_t* str_ptr = static_cast<const wchar_t*>(str);
+			return stack::push<const wchar_t*>(L, str_ptr, str_ptr + sz);
+		}
+	};
+
+	template <size_t N>
+	struct unqualified_pusher<char16_t[N]> {
+		static int push(lua_State* L, const char16_t (&str)[N]) {
+			return push(L, str, std::char_traits<char16_t>::length(str));
+		}
+
+		static int push(lua_State* L, const char16_t (&str)[N], std::size_t sz) {
+			const char16_t* str_ptr = static_cast<const char16_t*>(str);
+			return stack::push<const char16_t*>(L, str_ptr, str_ptr + sz);
+		}
+	};
+
+	template <size_t N>
+	struct unqualified_pusher<char32_t[N]> {
+		static int push(lua_State* L, const char32_t (&str)[N]) {
+			return push(L, str, std::char_traits<char32_t>::length(str));
+		}
+
+		static int push(lua_State* L, const char32_t (&str)[N], std::size_t sz) {
+			const char32_t* str_ptr = static_cast<const char32_t*>(str);
+			return stack::push<const char32_t*>(L, str_ptr, str_ptr + sz);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<wchar_t> {
+		static int push(lua_State* L, wchar_t c) {
+			const wchar_t str[2] = { c, '\0' };
+			return stack::push(L, static_cast<const wchar_t*>(str), 1);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<char16_t> {
+		static int push(lua_State* L, char16_t c) {
+			const char16_t str[2] = { c, '\0' };
+			return stack::push(L, static_cast<const char16_t*>(str), 1);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<char32_t> {
+		static int push(lua_State* L, char32_t c) {
+			const char32_t str[2] = { c, '\0' };
+			return stack::push(L, static_cast<const char32_t*>(str), 1);
+		}
+	};
+
+	template <typename... Args>
+	struct unqualified_pusher<std::tuple<Args...>> {
+		template <std::size_t... I, typename T>
+		static int push(std::index_sequence<I...>, lua_State* L, T&& t) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, static_cast<int>(sizeof...(I)), detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			int pushcount = 0;
+			(void)detail::swallow { 0, (pushcount += stack::push(L, std::get<I>(std::forward<T>(t))), 0)... };
+			return pushcount;
+		}
+
+		template <typename T>
+		static int push(lua_State* L, T&& t) {
+			return push(std::index_sequence_for<Args...>(), L, std::forward<T>(t));
+		}
+	};
+
+	template <typename A, typename B>
+	struct unqualified_pusher<std::pair<A, B>> {
+		template <typename T>
+		static int push(lua_State* L, T&& t) {
+			int pushcount = stack::push(L, std::get<0>(std::forward<T>(t)));
+			pushcount += stack::push(L, std::get<1>(std::forward<T>(t)));
+			return pushcount;
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<T, std::enable_if_t<meta::is_optional_v<T>>> {
+		using ValueType = typename meta::unqualified_t<T>::value_type;
+
+		template <typename Optional>
+		static int push(lua_State* L, Optional&& op) {
+			using QualifiedValueType = meta::conditional_t<std::is_lvalue_reference_v<Optional>, ValueType&, ValueType&&>;
+			if (!op) {
+				return stack::push(L, nullopt);
+			}
+			return stack::push(L, static_cast<QualifiedValueType>(op.value()));
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<nullopt_t> {
+		static int push(lua_State* L, nullopt_t) {
+			return stack::push(L, lua_nil);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<std::nullptr_t> {
+		static int push(lua_State* L, std::nullptr_t) {
+			return stack::push(L, lua_nil);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<this_state> {
+		static int push(lua_State*, const this_state&) {
+			return 0;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<this_main_state> {
+		static int push(lua_State*, const this_main_state&) {
+			return 0;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<new_table> {
+		static int push(lua_State* L, const new_table& nt) {
+			lua_createtable(L, nt.sequence_hint, nt.map_hint);
+			return 1;
+		}
+	};
+
+	template <typename Allocator>
+	struct unqualified_pusher<basic_bytecode<Allocator>> {
+		template <typename T>
+		static int push(lua_State* L, T&& bc, const char* bytecode_name) {
+			const auto first = bc.data();
+			const auto bcsize = bc.size();
+			// pushes either the function, or an error
+			// if it errors, shit goes south, and people can test that upstream
+			(void)luaL_loadbuffer(
+				L, reinterpret_cast<const char*>(first), static_cast<std::size_t>(bcsize * (sizeof(*first) / sizeof(const char))), bytecode_name);
+			return 1;
+		}
+
+		template <typename T>
+		static int push(lua_State* L, T&& bc) {
+			return push(L, std::forward<bc>(bc), "bytecode");
+		}
+	};
+
+#if SOL_IS_ON(SOL_STD_VARIANT_I_)
+	namespace stack_detail {
+
+		struct push_function {
+			lua_State* L;
+
+			push_function(lua_State* L) : L(L) {
+			}
+
+			template <typename T>
+			int operator()(T&& value) const {
+				return stack::push<T>(L, std::forward<T>(value));
+			}
+		};
+
+	} // namespace stack_detail
+
+	template <typename... Tn>
+	struct unqualified_pusher<std::variant<Tn...>> {
+		static int push(lua_State* L, const std::variant<Tn...>& v) {
+			return std::visit(stack_detail::push_function(L), v);
+		}
+
+		static int push(lua_State* L, std::variant<Tn...>&& v) {
+			return std::visit(stack_detail::push_function(L), std::move(v));
+		}
+	};
+#endif // Variant because Clang is terrible
+
+}} // namespace sol::stack
+
+// end of sol/stack_push.hpp
+
+// beginning of sol/stack_pop.hpp
+
+#include <utility>
+#include <tuple>
+
+namespace sol {
+namespace stack {
+	template <typename T, typename>
+	struct popper {
+		inline static decltype(auto) pop(lua_State* L) {
+			if constexpr (is_stack_based_v<meta::unqualified_t<T>>) {
+				static_assert(!is_stack_based_v<meta::unqualified_t<T>>,
+					"You cannot pop something that lives solely on the stack: it will not remain on the stack when popped and thusly will go out of "
+					"scope!");
+			}
+			else {
+				record tracking{};
+				decltype(auto) r = get<T>(L, -lua_size<T>::value, tracking);
+				lua_pop(L, tracking.used);
+				return r;
+			}
+		}
+	};
+}
+} // namespace sol::stack
+
+// end of sol/stack_pop.hpp
+
+// beginning of sol/stack_field.hpp
+
+namespace sol { namespace stack {
+	template <typename T, bool global, bool raw, typename>
+	struct field_getter {
+		static constexpr int default_table_index = meta::conditional_t < meta::is_c_str_v<T>
+#if SOL_LUA_VESION_I_ >= 503
+			|| (std::is_integral_v<T> && !std::is_same_v<T, bool>)
+#endif // integer  global keys 5.3 or better
+			|| (raw && std::is_void_v<std::remove_pointer_t<T>>),
+			                std::integral_constant<int, -1>, std::integral_constant<int, -2> > ::value;
+
+		template <typename Key>
+		void get(lua_State* L, Key&& key, int tableindex = default_table_index) {
+			if constexpr (std::is_same_v<T, update_if_empty_t> || std::is_same_v<T, override_value_t> || std::is_same_v<T, create_if_nil_t>) {
+				(void)L;
+				(void)key;
+				(void)tableindex;
+			}
+			else if constexpr (std::is_same_v<T, env_key_t>) {
+				(void)key;
+#if SOL_LUA_VESION_I_ < 502
+				// Use lua_setfenv
+				lua_getfenv(L, tableindex);
+#else
+				// Use upvalues as explained in Lua 5.2 and beyond's manual
+				if (lua_getupvalue(L, tableindex, 1) == nullptr) {
+					push(L, lua_nil);
+				}
+#endif
+			}
+			else if constexpr (std::is_same_v<T, metatable_key_t>) {
+				(void)key;
+				if (lua_getmetatable(L, tableindex) == 0)
+					push(L, lua_nil);
+			}
+			else if constexpr (raw) {
+				if constexpr (std::is_integral_v<T> && !std::is_same_v<bool, T>) {
+					lua_rawgeti(L, tableindex, static_cast<lua_Integer>(key));
+				}
+#if SOL_LUA_VESION_I_ >= 502
+				else if constexpr (std::is_void_v<std::remove_pointer_t<T>>) {
+					lua_rawgetp(L, tableindex, key);
+				}
+#endif // Lua 5.2.x+
+				else {
+					push(L, std::forward<Key>(key));
+					lua_rawget(L, tableindex);
+				}
+			}
+			else {
+				if constexpr (meta::is_c_str_v<T>) {
+					if constexpr (global) {
+						(void)tableindex;
+						lua_getglobal(L, &key[0]);
+					}
+					else {
+						lua_getfield(L, tableindex, &key[0]);
+					}
+				}
+#if SOL_LUA_VESION_I_ >= 503
+				else if constexpr (std::is_integral_v<T> && !std::is_same_v<bool, T>) {
+					lua_geti(L, tableindex, static_cast<lua_Integer>(key));
+				}
+#endif // Lua 5.3.x+
+				else {
+					push(L, std::forward<Key>(key));
+					lua_gettable(L, tableindex);
+				}
+			}
+		}
+	};
+
+	template <typename... Args, bool b, bool raw, typename C>
+	struct field_getter<std::tuple<Args...>, b, raw, C> {
+		template <std::size_t... I, typename Keys>
+		void apply(std::index_sequence<0, I...>, lua_State* L, Keys&& keys, int tableindex) {
+			get_field<b, raw>(L, std::get<0>(std::forward<Keys>(keys)), tableindex);
+			void(detail::swallow { (get_field<false, raw>(L, std::get<I>(std::forward<Keys>(keys))), 0)... });
+			reference saved(L, -1);
+			lua_pop(L, static_cast<int>(sizeof...(I)));
+			saved.push();
+		}
+
+		template <typename Keys>
+		void get(lua_State* L, Keys&& keys) {
+			apply(std::make_index_sequence<sizeof...(Args)>(), L, std::forward<Keys>(keys), lua_absindex(L, -1));
+		}
+
+		template <typename Keys>
+		void get(lua_State* L, Keys&& keys, int tableindex) {
+			apply(std::make_index_sequence<sizeof...(Args)>(), L, std::forward<Keys>(keys), tableindex);
+		}
+	};
+
+	template <typename A, typename B, bool b, bool raw, typename C>
+	struct field_getter<std::pair<A, B>, b, raw, C> {
+		template <typename Keys>
+		void get(lua_State* L, Keys&& keys, int tableindex) {
+			get_field<b, raw>(L, std::get<0>(std::forward<Keys>(keys)), tableindex);
+			get_field<false, raw>(L, std::get<1>(std::forward<Keys>(keys)));
+			reference saved(L, -1);
+			lua_pop(L, static_cast<int>(2));
+			saved.push();
+		}
+
+		template <typename Keys>
+		void get(lua_State* L, Keys&& keys) {
+			get_field<b, raw>(L, std::get<0>(std::forward<Keys>(keys)));
+			get_field<false, raw>(L, std::get<1>(std::forward<Keys>(keys)));
+			reference saved(L, -1);
+			lua_pop(L, static_cast<int>(2));
+			saved.push();
+		}
+	};
+
+	template <typename T, bool global, bool raw, typename>
+	struct field_setter {
+		static constexpr int default_table_index
+			= meta::conditional_t < (meta::is_c_str_v<T> || meta::is_string_of_v<T, char>) || (std::is_integral_v<T> && !std::is_same_v<T, bool>)
+			|| (std::is_integral_v<T> && !std::is_same_v<T, bool>) || (raw && std::is_void_v<std::remove_pointer_t<T>>),
+			std::integral_constant<int, -2>, std::integral_constant<int, -3> > ::value;
+
+		template <typename Key, typename Value>
+		void set(lua_State* L, Key&& key, Value&& value, int tableindex = default_table_index) {
+			if constexpr (std::is_same_v<T, update_if_empty_t> || std::is_same_v<T, override_value_t>) {
+				(void)L;
+				(void)key;
+				(void)value;
+				(void)tableindex;
+			}
+			else if constexpr (std::is_same_v<T, metatable_key_t>) {
+				(void)key;
+				push(L, std::forward<Value>(value));
+				lua_setmetatable(L, tableindex);
+			}
+			else if constexpr (raw) {
+				if constexpr (std::is_integral_v<T> && !std::is_same_v<bool, T>) {
+					push(L, std::forward<Value>(value));
+					lua_rawseti(L, tableindex, static_cast<lua_Integer>(key));
+				}
+#if SOL_LUA_VESION_I_ >= 502
+				else if constexpr (std::is_void_v<std::remove_pointer_t<T>>) {
+					push(L, std::forward<Value>(value));
+					lua_rawsetp(L, tableindex, std::forward<Key>(key));
+				}
+#endif // Lua 5.2.x
+				else {
+					push(L, std::forward<Key>(key));
+					push(L, std::forward<Value>(value));
+					lua_rawset(L, tableindex);
+				}
+			}
+			else {
+				if constexpr (meta::is_c_str_v<T> || meta::is_string_of_v<T, char>) {
+					if constexpr (global) {
+						push(L, std::forward<Value>(value));
+						lua_setglobal(L, &key[0]);
+						(void)tableindex;
+					}
+					else {
+						push(L, std::forward<Value>(value));
+						lua_setfield(L, tableindex, &key[0]);
+					}
+				}
+#if SOL_LUA_VESION_I_ >= 503
+				else if constexpr (std::is_integral_v<T> && !std::is_same_v<bool, T>) {
+					push(L, std::forward<Value>(value));
+					lua_seti(L, tableindex, static_cast<lua_Integer>(key));
+				}
+#endif // Lua 5.3.x
+				else {
+					push(L, std::forward<Key>(key));
+					push(L, std::forward<Value>(value));
+					lua_settable(L, tableindex);
+				}
+			}
+		}
+	};
+
+	template <typename... Args, bool b, bool raw, typename C>
+	struct field_setter<std::tuple<Args...>, b, raw, C> {
+		template <bool g, std::size_t I, typename Keys, typename Value>
+		void apply(std::index_sequence<I>, lua_State* L, Keys&& keys, Value&& value, int tableindex) {
+			I < 1 ? set_field<g, raw>(L, std::get<I>(std::forward<Keys>(keys)), std::forward<Value>(value), tableindex)
+				 : set_field<g, raw>(L, std::get<I>(std::forward<Keys>(keys)), std::forward<Value>(value));
+		}
+
+		template <bool g, std::size_t I0, std::size_t I1, std::size_t... I, typename Keys, typename Value>
+		void apply(std::index_sequence<I0, I1, I...>, lua_State* L, Keys&& keys, Value&& value, int tableindex) {
+			I0 < 1 ? get_field<g, raw>(L, std::get<I0>(std::forward<Keys>(keys)), tableindex)
+				  : get_field<g, raw>(L, std::get<I0>(std::forward<Keys>(keys)), -1);
+			apply<false>(std::index_sequence<I1, I...>(), L, std::forward<Keys>(keys), std::forward<Value>(value), -1);
+		}
+
+		template <bool g, std::size_t I0, std::size_t... I, typename Keys, typename Value>
+		void top_apply(std::index_sequence<I0, I...>, lua_State* L, Keys&& keys, Value&& value, int tableindex) {
+			apply<g>(std::index_sequence<I0, I...>(), L, std::forward<Keys>(keys), std::forward<Value>(value), tableindex);
+			lua_pop(L, static_cast<int>(sizeof...(I)));
+		}
+
+		template <typename Keys, typename Value>
+		void set(lua_State* L, Keys&& keys, Value&& value, int tableindex = -3) {
+			top_apply<b>(std::make_index_sequence<sizeof...(Args)>(), L, std::forward<Keys>(keys), std::forward<Value>(value), tableindex);
+		}
+	};
+
+	template <typename A, typename B, bool b, bool raw, typename C>
+	struct field_setter<std::pair<A, B>, b, raw, C> {
+		template <typename Keys, typename Value>
+		void set(lua_State* L, Keys&& keys, Value&& value, int tableindex = -1) {
+			get_field<b, raw>(L, std::get<0>(std::forward<Keys>(keys)), tableindex);
+			set_field<false, raw>(L, std::get<1>(std::forward<Keys>(keys)), std::forward<Value>(value), lua_gettop(L));
+			lua_pop(L, 1);
+		}
+	};
+}} // namespace sol::stack
+
+// end of sol/stack_field.hpp
+
+// beginning of sol/stack_probe.hpp
+
+namespace sol {
+namespace stack {
+	template <typename T, typename P, bool b, bool raw, typename>
+	struct probe_field_getter {
+		template <typename Key>
+		probe get(lua_State* L, Key&& key, int tableindex = -2) {
+			if constexpr(!b) {
+				if (!maybe_indexable(L, tableindex)) {
+					return probe(false, 0);
+				}
+			}
+			get_field<b, raw>(L, std::forward<Key>(key), tableindex);
+			return probe(check<P>(L), 1);
+		}
+	};
+
+	template <typename A, typename B, typename P, bool b, bool raw, typename C>
+	struct probe_field_getter<std::pair<A, B>, P, b, raw, C> {
+		template <typename Keys>
+		probe get(lua_State* L, Keys&& keys, int tableindex = -2) {
+			if (!b && !maybe_indexable(L, tableindex)) {
+				return probe(false, 0);
+			}
+			get_field<b, raw>(L, std::get<0>(keys), tableindex);
+			if (!maybe_indexable(L)) {
+				return probe(false, 1);
+			}
+			get_field<false, raw>(L, std::get<1>(keys), tableindex);
+			return probe(check<P>(L), 2);
+		}
+	};
+
+	template <typename... Args, typename P, bool b, bool raw, typename C>
+	struct probe_field_getter<std::tuple<Args...>, P, b, raw, C> {
+		template <std::size_t I, typename Keys>
+		probe apply(std::index_sequence<I>, int sofar, lua_State* L, Keys&& keys, int tableindex) {
+			get_field<(I<1) && b, raw>(L, std::get<I>(keys), tableindex);
+			return probe(check<P>(L), sofar);
+		}
+
+		template <std::size_t I, std::size_t I1, std::size_t... In, typename Keys>
+		probe apply(std::index_sequence<I, I1, In...>, int sofar, lua_State* L, Keys&& keys, int tableindex) {
+			get_field < I<1 && b, raw>(L, std::get<I>(keys), tableindex);
+			if (!maybe_indexable(L)) {
+				return probe(false, sofar);
+			}
+			return apply(std::index_sequence<I1, In...>(), sofar + 1, L, std::forward<Keys>(keys), -1);
+		}
+
+		template <typename Keys>
+		probe get(lua_State* L, Keys&& keys, int tableindex = -2) {
+			if constexpr (!b) {
+				if (!maybe_indexable(L, tableindex)) {
+					return probe(false, 0);
+				}
+				return apply(std::index_sequence_for<Args...>(), 1, L, std::forward<Keys>(keys), tableindex);
+			}
+			else {
+				return apply(std::index_sequence_for<Args...>(), 1, L, std::forward<Keys>(keys), tableindex);
+			}
+		}
+	};
+}
+} // namespace sol::stack
+
+// end of sol/stack_probe.hpp
+
+#include <cstring>
+#include <array>
+
+namespace sol {
+	namespace detail {
+		using typical_chunk_name_t = char[SOL_ID_SIZE_I_];
+		using typical_file_chunk_name_t = char[SOL_FILE_ID_SIZE_I_];
+
+		inline const std::string& default_chunk_name() {
+			static const std::string name = "";
+			return name;
+		}
+
+		template <std::size_t N>
+		const char* make_chunk_name(const string_view& code, const std::string& chunkname, char (&basechunkname)[N]) {
+			if (chunkname.empty()) {
+				auto it = code.cbegin();
+				auto e = code.cend();
+				std::size_t i = 0;
+				static const std::size_t n = N - 4;
+				for (i = 0; i < n && it != e; ++i, ++it) {
+					basechunkname[i] = *it;
+				}
+				if (it != e) {
+					for (std::size_t c = 0; c < 3; ++i, ++c) {
+						basechunkname[i] = '.';
+					}
+				}
+				basechunkname[i] = '\0';
+				return &basechunkname[0];
+			}
+			else {
+				return chunkname.c_str();
+			}
+		}
+
+		inline void clear_entries(stack_reference r) {
+			stack::push(r.lua_state(), lua_nil);
+			while (lua_next(r.lua_state(), -2)) {
+				absolute_index key(r.lua_state(), -2);
+				auto pn = stack::pop_n(r.lua_state(), 1);
+				stack::set_field<false, true>(r.lua_state(), key, lua_nil, r.stack_index());
+			}
+		}
+
+		inline void clear_entries(const reference& registry_reference) {
+			auto pp = stack::push_pop(registry_reference);
+			stack_reference ref(registry_reference.lua_state(), -1);
+			clear_entries(ref);
+		}
+	} // namespace detail
+
+	namespace stack {
+		namespace stack_detail {
+			template <typename T>
+			inline int push_as_upvalues(lua_State* L, T& item) {
+				typedef std::decay_t<T> TValue;
+				static const std::size_t itemsize = sizeof(TValue);
+				static const std::size_t voidsize = sizeof(void*);
+				static const std::size_t voidsizem1 = voidsize - 1;
+				static const std::size_t data_t_count = (sizeof(TValue) + voidsizem1) / voidsize;
+				typedef std::array<void*, data_t_count> data_t;
+
+				data_t data { {} };
+				std::memcpy(&data[0], std::addressof(item), itemsize);
+				int pushcount = 0;
+				for (const auto& v : data) {
+					lua_pushlightuserdata(L, v);
+					pushcount += 1;
+				}
+				return pushcount;
+			}
+
+			template <typename T>
+			inline std::pair<T, int> get_as_upvalues(lua_State* L, int index = 2) {
+				static const std::size_t data_t_count = (sizeof(T) + (sizeof(void*) - 1)) / sizeof(void*);
+				typedef std::array<void*, data_t_count> data_t;
+				data_t voiddata { {} };
+				for (std::size_t i = 0, d = 0; d < sizeof(T); ++i, d += sizeof(void*)) {
+					voiddata[i] = lua_touserdata(L, upvalue_index(index++));
+				}
+				return std::pair<T, int>(*reinterpret_cast<T*>(static_cast<void*>(voiddata.data())), index);
+			}
+
+			template <typename T>
+			inline std::pair<T, int> get_as_upvalues_using_function(lua_State* L, int function_index = -1) {
+				static const std::size_t data_t_count = (sizeof(T) + (sizeof(void*) - 1)) / sizeof(void*);
+				typedef std::array<void*, data_t_count> data_t;
+				function_index = lua_absindex(L, function_index);
+				int index = 0;
+				data_t voiddata { {} };
+				for (std::size_t d = 0; d < sizeof(T); d += sizeof(void*)) {
+					// first upvalue is nullptr to respect environment shenanigans
+					// So +2 instead of +1
+					const char* upvalue_name = lua_getupvalue(L, function_index, index + 2);
+					if (upvalue_name == nullptr) {
+						// We should freak out here...
+						break;
+					}
+					voiddata[index] = lua_touserdata(L, -1);
+					++index;
+				}
+				lua_pop(L, index);
+				return std::pair<T, int>(*reinterpret_cast<T*>(static_cast<void*>(voiddata.data())), index);
+			}
+
+			template <typename Fx, typename... Args>
+			static decltype(auto) eval(types<>, std::index_sequence<>, lua_State*, int, record&, Fx&& fx, Args&&... args) {
+				return std::forward<Fx>(fx)(std::forward<Args>(args)...);
+			}
+
+			template <typename Fx, typename Arg, typename... Args, std::size_t I, std::size_t... Is, typename... FxArgs>
+			static decltype(auto) eval(
+			     types<Arg, Args...>, std::index_sequence<I, Is...>, lua_State* L, int start, record& tracking, Fx&& fx, FxArgs&&... fxargs) {
+				return eval(types<Args...>(),
+				     std::index_sequence<Is...>(),
+				     L,
+				     start,
+				     tracking,
+				     std::forward<Fx>(fx),
+				     std::forward<FxArgs>(fxargs)...,
+				     stack_detail::unchecked_get<Arg>(L, start + tracking.used, tracking));
+			}
+
+			template <bool checkargs = detail::default_safe_function_calls, std::size_t... I, typename R, typename... Args, typename Fx, typename... FxArgs>
+			inline decltype(auto) call(types<R>, types<Args...> ta, std::index_sequence<I...> tai, lua_State* L, int start, Fx&& fx, FxArgs&&... args) {
+				static_assert(meta::all<meta::is_not_move_only<Args>...>::value,
+				     "One of the arguments being bound is a move-only type, and it is not being taken by reference: this will break your code. Please take "
+				     "a reference and std::move it manually if this was your intention.");
+				if constexpr (checkargs) {
+					argument_handler<types<R, Args...>> handler {};
+					multi_check<Args...>(L, start, handler);
+				}
+				record tracking {};
+				if constexpr (std::is_void_v<R>) {
+					eval(ta, tai, L, start, tracking, std::forward<Fx>(fx), std::forward<FxArgs>(args)...);
+				}
+				else {
+					return eval(ta, tai, L, start, tracking, std::forward<Fx>(fx), std::forward<FxArgs>(args)...);
+				}
+			}
+		} // namespace stack_detail
+
+		template <typename T>
+		int set_ref(lua_State* L, T&& arg, int tableindex = -2) {
+			push(L, std::forward<T>(arg));
+			return luaL_ref(L, tableindex);
+		}
+
+		template <bool check_args = detail::default_safe_function_calls, typename R, typename... Args, typename Fx, typename... FxArgs>
+		inline decltype(auto) call(types<R> tr, types<Args...> ta, lua_State* L, int start, Fx&& fx, FxArgs&&... args) {
+			using args_indices = std::make_index_sequence<sizeof...(Args)>;
+			if constexpr (std::is_void_v<R>) {
+				stack_detail::call<check_args>(tr, ta, args_indices(), L, start, std::forward<Fx>(fx), std::forward<FxArgs>(args)...);
+			}
+			else {
+				return stack_detail::call<check_args>(tr, ta, args_indices(), L, start, std::forward<Fx>(fx), std::forward<FxArgs>(args)...);
+			}
+		}
+
+		template <bool check_args = detail::default_safe_function_calls, typename R, typename... Args, typename Fx, typename... FxArgs>
+		inline decltype(auto) call(types<R> tr, types<Args...> ta, lua_State* L, Fx&& fx, FxArgs&&... args) {
+			if constexpr (std::is_void_v<R>) {
+				call<check_args>(tr, ta, L, 1, std::forward<Fx>(fx), std::forward<FxArgs>(args)...);
+			}
+			else {
+				return call<check_args>(tr, ta, L, 1, std::forward<Fx>(fx), std::forward<FxArgs>(args)...);
+			}
+		}
+
+		template <bool check_args = detail::default_safe_function_calls, typename R, typename... Args, typename Fx, typename... FxArgs>
+		inline decltype(auto) call_from_top(types<R> tr, types<Args...> ta, lua_State* L, Fx&& fx, FxArgs&&... args) {
+			using expected_count_t = meta::count_for_pack<lua_size, Args...>;
+			if constexpr (std::is_void_v<R>) {
+				call<check_args>(tr,
+				     ta,
+				     L,
+				     (std::max)(static_cast<int>(lua_gettop(L) - expected_count_t::value), static_cast<int>(0)),
+				     std::forward<Fx>(fx),
+				     std::forward<FxArgs>(args)...);
+			}
+			else {
+				return call<check_args>(tr,
+				     ta,
+				     L,
+				     (std::max)(static_cast<int>(lua_gettop(L) - expected_count_t::value), static_cast<int>(0)),
+				     std::forward<Fx>(fx),
+				     std::forward<FxArgs>(args)...);
+			}
+		}
+
+		template <bool check_args = detail::default_safe_function_calls, bool clean_stack = true, typename Ret0, typename... Ret, typename... Args,
+		     typename Fx, typename... FxArgs>
+		inline int call_into_lua(types<Ret0, Ret...> tr, types<Args...> ta, lua_State* L, int start, Fx&& fx, FxArgs&&... fxargs) {
+			if constexpr (std::is_void_v<Ret0>) {
+				call<check_args>(tr, ta, L, start, std::forward<Fx>(fx), std::forward<FxArgs>(fxargs)...);
+				if constexpr (clean_stack) {
+					lua_settop(L, 0);
+				}
+				return 0;
+			}
+			else {
+				(void)tr;
+				decltype(auto) r
+				     = call<check_args>(types<meta::return_type_t<Ret0, Ret...>>(), ta, L, start, std::forward<Fx>(fx), std::forward<FxArgs>(fxargs)...);
+				using R = meta::unqualified_t<decltype(r)>;
+				using is_stack = meta::any<is_stack_based<R>, std::is_same<R, absolute_index>, std::is_same<R, ref_index>, std::is_same<R, raw_index>>;
+				if constexpr (clean_stack && !is_stack::value) {
+					lua_settop(L, 0);
+				}
+				return push_reference(L, std::forward<decltype(r)>(r));
+			}
+		}
+
+		template <bool check_args = detail::default_safe_function_calls, bool clean_stack = true, typename Fx, typename... FxArgs>
+		inline int call_lua(lua_State* L, int start, Fx&& fx, FxArgs&&... fxargs) {
+			using traits_type = lua_bind_traits<meta::unqualified_t<Fx>>;
+			using args_list = typename traits_type::args_list;
+			using returns_list = typename traits_type::returns_list;
+			return call_into_lua<check_args, clean_stack>(returns_list(), args_list(), L, start, std::forward<Fx>(fx), std::forward<FxArgs>(fxargs)...);
+		}
+
+		inline call_syntax get_call_syntax(lua_State* L, const string_view& key, int index) {
+			if (lua_gettop(L) < 1) {
+				return call_syntax::dot;
+			}
+			luaL_getmetatable(L, key.data());
+			auto pn = pop_n(L, 1);
+			if (lua_compare(L, -1, index, LUA_OPEQ) != 1) {
+				return call_syntax::dot;
+			}
+			return call_syntax::colon;
+		}
+
+		inline void script(
+		     lua_State* L, lua_Reader reader, void* data, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name("lua_Reader", chunkname, basechunkname);
+			if (lua_load(L, reader, data, chunknametarget, to_string(mode).c_str()) || lua_pcall(L, 0, LUA_MULTRET, 0)) {
+				lua_error(L);
+			}
+		}
+
+		inline void script(
+		     lua_State* L, const string_view& code, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name(code, chunkname, basechunkname);
+			if (luaL_loadbufferx(L, code.data(), code.size(), chunknametarget, to_string(mode).c_str()) || lua_pcall(L, 0, LUA_MULTRET, 0)) {
+				lua_error(L);
+			}
+		}
+
+		inline void script_file(lua_State* L, const std::string& filename, load_mode mode = load_mode::any) {
+			if (luaL_loadfilex(L, filename.c_str(), to_string(mode).c_str()) || lua_pcall(L, 0, LUA_MULTRET, 0)) {
+				lua_error(L);
+			}
+		}
+
+		inline void luajit_exception_handler(lua_State* L, int (*handler)(lua_State*, lua_CFunction) = detail::c_trampoline) {
+#if SOL_IS_ON(SOL_USE_LUAJIT_EXCEPTION_TRAMPOLINE_I_)
+			if (L == nullptr) {
+				return;
+			}
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushlightuserdata(L, (void*)handler);
+			auto pn = pop_n(L, 1);
+			luaJIT_setmode(L, -1, LUAJIT_MODE_WRAPCFUNC | LUAJIT_MODE_ON);
+#else
+			(void)L;
+			(void)handler;
+#endif
+		}
+
+		inline void luajit_exception_off(lua_State* L) {
+#if SOL_IS_ON(SOL_USE_LUAJIT_EXCEPTION_TRAMPOLINE_I_)
+			if (L == nullptr) {
+				return;
+			}
+			luaJIT_setmode(L, -1, LUAJIT_MODE_WRAPCFUNC | LUAJIT_MODE_OFF);
+#else
+			(void)L;
+#endif
+		}
+	} // namespace stack
+} // namespace sol
+
+// end of sol/stack.hpp
+
+// beginning of sol/object.hpp
+
+// beginning of sol/make_reference.hpp
+
+namespace sol {
+
+	template <typename R = reference, bool should_pop = !is_stack_based_v<R>, typename T>
+	R make_reference(lua_State* L, T&& value) {
+		int backpedal = stack::push(L, std::forward<T>(value));
+		R r = stack::get<R>(L, -backpedal);
+		if (should_pop) {
+			lua_pop(L, backpedal);
+		}
+		return r;
+	}
+
+	template <typename T, typename R = reference, bool should_pop = !is_stack_based_v<R>, typename... Args>
+	R make_reference(lua_State* L, Args&&... args) {
+		int backpedal = stack::push<T>(L, std::forward<Args>(args)...);
+		R r = stack::get<R>(L, -backpedal);
+		if (should_pop) {
+			lua_pop(L, backpedal);
+		}
+		return r;
+	}
+
+	template <typename R = reference, bool should_pop = !is_stack_based_v<R>, typename T>
+	R make_reference_userdata(lua_State* L, T&& value) {
+		int backpedal = stack::push_userdata(L, std::forward<T>(value));
+		R r = stack::get<R>(L, -backpedal);
+		if (should_pop) {
+			lua_pop(L, backpedal);
+		}
+		return r;
+	}
+
+	template <typename T, typename R = reference, bool should_pop = !is_stack_based_v<R>, typename... Args>
+	R make_reference_userdata(lua_State* L, Args&&... args) {
+		int backpedal = stack::push_userdata<T>(L, std::forward<Args>(args)...);
+		R r = stack::get<R>(L, -backpedal);
+		if (should_pop) {
+			lua_pop(L, backpedal);
+		}
+		return r;
+	}
+
+} // namespace sol
+
+// end of sol/make_reference.hpp
+
+// beginning of sol/object_base.hpp
+
+namespace sol {
+
+	template <typename ref_t>
+	class basic_object_base : public ref_t {
+	private:
+		using base_t = ref_t;
+		
+		template <typename T>
+		decltype(auto) as_stack(std::true_type) const {
+			return stack::get<T>(base_t::lua_state(), base_t::stack_index());
+		}
+
+		template <typename T>
+		decltype(auto) as_stack(std::false_type) const {
+			base_t::push();
+			return stack::pop<T>(base_t::lua_state());
+		}
+
+		template <typename T>
+		bool is_stack(std::true_type) const {
+			return stack::check<T>(base_t::lua_state(), base_t::stack_index(), no_panic);
+		}
+
+		template <typename T>
+		bool is_stack(std::false_type) const {
+			int r = base_t::registry_index();
+			if (r == LUA_REFNIL)
+				return meta::any_same<meta::unqualified_t<T>, lua_nil_t, nullopt_t, std::nullptr_t>::value ? true : false;
+			if (r == LUA_NOREF)
+				return false;
+			auto pp = stack::push_pop(*this);
+			return stack::check<T>(base_t::lua_state(), -1, no_panic);
+		}
+
+	public:
+		basic_object_base() noexcept = default;
+		basic_object_base(const basic_object_base&) = default;
+		basic_object_base(basic_object_base&&) = default;
+		basic_object_base& operator=(const basic_object_base&) = default;
+		basic_object_base& operator=(basic_object_base&&) = default;
+		template <typename T, typename... Args, meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_object_base>>> = meta::enabler>
+		basic_object_base(T&& arg, Args&&... args)
+		: base_t(std::forward<T>(arg), std::forward<Args>(args)...) {
+		}
+
+		template <typename T>
+		decltype(auto) as() const {
+			return as_stack<T>(is_stack_based<base_t>());
+		}
+
+		template <typename T>
+		bool is() const {
+			return is_stack<T>(is_stack_based<base_t>());
+		}
+	};
+} // namespace sol
+
+// end of sol/object_base.hpp
+
+namespace sol {
+
+	template <typename base_type>
+	class basic_object : public basic_object_base<base_type> {
+	private:
+		typedef basic_object_base<base_type> base_t;
+
+		template <bool invert_and_pop = false>
+		basic_object(std::integral_constant<bool, invert_and_pop>, lua_State* L, int index = -1) noexcept
+		: base_t(L, index) {
+			if (invert_and_pop) {
+				lua_pop(L, -index);
+			}
+		}
+
+	protected:
+		basic_object(detail::no_safety_tag, lua_nil_t n) : base_t(n) {
+		}
+		basic_object(detail::no_safety_tag, lua_State* L, int index) : base_t(L, index) {
+		}
+		basic_object(lua_State* L, detail::global_tag t) : base_t(L, t) {
+		}
+		basic_object(detail::no_safety_tag, lua_State* L, ref_index index) : base_t(L, index) {
+		}
+		template <typename T,
+		     meta::enable<meta::neg<meta::any_same<meta::unqualified_t<T>, basic_object>>, meta::neg<std::is_same<base_type, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_object(detail::no_safety_tag, T&& r) noexcept : base_t(std::forward<T>(r)) {
+		}
+
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_object(detail::no_safety_tag, lua_State* L, T&& r) noexcept : base_t(L, std::forward<T>(r)) {
+		}
+
+	public:
+		basic_object() noexcept = default;
+		template <typename T, meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_object>>, meta::neg<std::is_same<base_type, stack_reference>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_object(T&& r)
+		: base_t(std::forward<T>(r)) {
+		}
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_object(lua_State* L, T&& r)
+		: base_t(L, std::forward<T>(r)) {
+		}
+		basic_object(lua_nil_t r)
+		: base_t(r) {
+		}
+		basic_object(const basic_object&) = default;
+		basic_object(basic_object&&) = default;
+		basic_object(const stack_reference& r) noexcept
+		: basic_object(r.lua_state(), r.stack_index()) {
+		}
+		basic_object(stack_reference&& r) noexcept
+		: basic_object(r.lua_state(), r.stack_index()) {
+		}
+		template <typename Super>
+		basic_object(const proxy_base<Super>& r) noexcept
+		: basic_object(r.operator basic_object()) {
+		}
+		template <typename Super>
+		basic_object(proxy_base<Super>&& r) noexcept
+		: basic_object(r.operator basic_object()) {
+		}
+		basic_object(lua_State* L, lua_nil_t r) noexcept
+		: base_t(L, r) {
+		}
+		basic_object(lua_State* L, int index = -1) noexcept
+		: base_t(L, index) {
+		}
+		basic_object(lua_State* L, absolute_index index) noexcept
+		: base_t(L, index) {
+		}
+		basic_object(lua_State* L, raw_index index) noexcept
+		: base_t(L, index) {
+		}
+		basic_object(lua_State* L, ref_index index) noexcept
+		: base_t(L, index) {
+		}
+		template <typename T, typename... Args>
+		basic_object(lua_State* L, in_place_type_t<T>, Args&&... args) noexcept
+		: basic_object(std::integral_constant<bool, !is_stack_based<base_t>::value>(), L, -stack::push<T>(L, std::forward<Args>(args)...)) {
+		}
+		template <typename T, typename... Args>
+		basic_object(lua_State* L, in_place_t, T&& arg, Args&&... args) noexcept
+		: basic_object(L, in_place_type<T>, std::forward<T>(arg), std::forward<Args>(args)...) {
+		}
+		basic_object& operator=(const basic_object&) = default;
+		basic_object& operator=(basic_object&&) = default;
+		basic_object& operator=(const base_type& b) {
+			base_t::operator=(b);
+			return *this;
+		}
+		basic_object& operator=(base_type&& b) {
+			base_t::operator=(std::move(b));
+			return *this;
+		}
+		template <typename Super>
+		basic_object& operator=(const proxy_base<Super>& r) {
+			this->operator=(r.operator basic_object());
+			return *this;
+		}
+		template <typename Super>
+		basic_object& operator=(proxy_base<Super>&& r) {
+			this->operator=(r.operator basic_object());
+			return *this;
+		}
+	};
+
+	template <typename T>
+	object make_object(lua_State* L, T&& value) {
+		return make_reference<object, true>(L, std::forward<T>(value));
+	}
+
+	template <typename T, typename... Args>
+	object make_object(lua_State* L, Args&&... args) {
+		return make_reference<T, object, true>(L, std::forward<Args>(args)...);
+	}
+
+	template <typename T>
+	object make_object_userdata(lua_State* L, T&& value) {
+		return make_reference_userdata<object, true>(L, std::forward<T>(value));
+	}
+
+	template <typename T, typename... Args>
+	object make_object_userdata(lua_State* L, Args&&... args) {
+		return make_reference_userdata<T, object, true>(L, std::forward<Args>(args)...);
+	}
+} // namespace sol
+
+// end of sol/object.hpp
+
+// beginning of sol/function.hpp
+
+// beginning of sol/unsafe_function.hpp
+
+// beginning of sol/function_result.hpp
+
+// beginning of sol/protected_function_result.hpp
+
+// beginning of sol/proxy_base.hpp
+
+namespace sol {
+	struct proxy_base_tag {};
+
+	namespace detail {
+		template <typename T>
+		using proxy_key_t = meta::conditional_t<meta::is_specialization_of_v<meta::unqualified_t<T>, std::tuple>, T,
+		     std::tuple<meta::conditional_t<std::is_array_v<meta::unqualified_t<T>>, std::remove_reference_t<T>&, meta::unqualified_t<T>>>>;
+	}
+
+	template <typename Super>
+	struct proxy_base : proxy_base_tag {
+		operator std::string() const {
+			const Super& super = *static_cast<const Super*>(static_cast<const void*>(this));
+			return super.template get<std::string>();
+		}
+
+		template <typename T, meta::enable<meta::neg<meta::is_string_constructible<T>>, is_proxy_primitive<meta::unqualified_t<T>>> = meta::enabler>
+		operator T() const {
+			const Super& super = *static_cast<const Super*>(static_cast<const void*>(this));
+			return super.template get<T>();
+		}
+
+		template <typename T, meta::enable<meta::neg<meta::is_string_constructible<T>>, meta::neg<is_proxy_primitive<meta::unqualified_t<T>>>> = meta::enabler>
+		operator T&() const {
+			const Super& super = *static_cast<const Super*>(static_cast<const void*>(this));
+			return super.template get<T&>();
+		}
+
+		lua_State* lua_state() const {
+			const Super& super = *static_cast<const Super*>(static_cast<const void*>(this));
+			return super.lua_state();
+		}
+	};
+} // namespace sol
+
+// end of sol/proxy_base.hpp
+
+// beginning of sol/stack_iterator.hpp
+
+#include <limits>
+#include <iterator>
+
+namespace sol {
+	template <typename proxy_t, bool is_const>
+	struct stack_iterator {
+		typedef meta::conditional_t<is_const, const proxy_t, proxy_t> reference;
+		typedef meta::conditional_t<is_const, const proxy_t*, proxy_t*> pointer;
+		typedef proxy_t value_type;
+		typedef std::ptrdiff_t difference_type;
+		typedef std::random_access_iterator_tag iterator_category;
+		lua_State* L;
+		int index;
+		int stacktop;
+		proxy_t sp;
+
+		stack_iterator()
+			: L(nullptr), index((std::numeric_limits<int>::max)()), stacktop((std::numeric_limits<int>::max)()), sp() {
+		}
+		stack_iterator(const stack_iterator<proxy_t, true>& r)
+			: L(r.L), index(r.index), stacktop(r.stacktop), sp(r.sp) {
+		}
+		stack_iterator(lua_State* luastate, int idx, int topidx)
+			: L(luastate), index(idx), stacktop(topidx), sp(luastate, idx) {
+		}
+
+		reference operator*() {
+			return proxy_t(L, index);
+		}
+
+		reference operator*() const {
+			return proxy_t(L, index);
+		}
+
+		pointer operator->() {
+			sp = proxy_t(L, index);
+			return &sp;
+		}
+
+		pointer operator->() const {
+			const_cast<proxy_t&>(sp) = proxy_t(L, index);
+			return &sp;
+		}
+
+		stack_iterator& operator++() {
+			++index;
+			return *this;
+		}
+
+		stack_iterator operator++(int) {
+			auto r = *this;
+			this->operator++();
+			return r;
+		}
+
+		stack_iterator& operator--() {
+			--index;
+			return *this;
+		}
+
+		stack_iterator operator--(int) {
+			auto r = *this;
+			this->operator--();
+			return r;
+		}
+
+		stack_iterator& operator+=(difference_type idx) {
+			index += static_cast<int>(idx);
+			return *this;
+		}
+
+		stack_iterator& operator-=(difference_type idx) {
+			index -= static_cast<int>(idx);
+			return *this;
+		}
+
+		difference_type operator-(const stack_iterator& r) const {
+			return index - r.index;
+		}
+
+		stack_iterator operator+(difference_type idx) const {
+			stack_iterator r = *this;
+			r += idx;
+			return r;
+		}
+
+		reference operator[](difference_type idx) const {
+			return proxy_t(L, index + static_cast<int>(idx));
+		}
+
+		bool operator==(const stack_iterator& r) const {
+			if (stacktop == (std::numeric_limits<int>::max)()) {
+				return r.index == r.stacktop;
+			}
+			else if (r.stacktop == (std::numeric_limits<int>::max)()) {
+				return index == stacktop;
+			}
+			return index == r.index;
+		}
+
+		bool operator!=(const stack_iterator& r) const {
+			return !(this->operator==(r));
+		}
+
+		bool operator<(const stack_iterator& r) const {
+			return index < r.index;
+		}
+
+		bool operator>(const stack_iterator& r) const {
+			return index > r.index;
+		}
+
+		bool operator<=(const stack_iterator& r) const {
+			return index <= r.index;
+		}
+
+		bool operator>=(const stack_iterator& r) const {
+			return index >= r.index;
+		}
+	};
+
+	template <typename proxy_t, bool is_const>
+	inline stack_iterator<proxy_t, is_const> operator+(typename stack_iterator<proxy_t, is_const>::difference_type n, const stack_iterator<proxy_t, is_const>& r) {
+		return r + n;
+	}
+} // namespace sol
+
+// end of sol/stack_iterator.hpp
+
+// beginning of sol/stack_proxy.hpp
+
+// beginning of sol/stack_proxy_base.hpp
+
+namespace sol {
+	struct stack_proxy_base : public proxy_base<stack_proxy_base> {
+	private:
+		lua_State* L;
+		int index;
+
+	public:
+		stack_proxy_base()
+			: L(nullptr), index(0) {
+		}
+		stack_proxy_base(lua_State* L, int index)
+			: L(L), index(index) {
+		}
+
+		template <typename T>
+		decltype(auto) get() const {
+			return stack::get<T>(L, stack_index());
+		}
+
+		template <typename T>
+		bool is() const {
+			return stack::check<T>(L, stack_index());
+		}
+
+		template <typename T>
+		decltype(auto) as() const {
+			return get<T>();
+		}
+
+		type get_type() const noexcept {
+			return type_of(lua_state(), stack_index());
+		}
+
+		int push() const {
+			return push(L);
+		}
+
+		int push(lua_State* Ls) const {
+			lua_pushvalue(Ls, index);
+			return 1;
+		}
+
+		lua_State* lua_state() const {
+			return L;
+		}
+		int stack_index() const {
+			return index;
+		}
+	};
+
+	namespace stack {
+		template <>
+		struct unqualified_getter<stack_proxy_base> {
+			static stack_proxy_base get(lua_State* L, int index = -1) {
+				return stack_proxy_base(L, index);
+			}
+		};
+
+		template <>
+		struct unqualified_pusher<stack_proxy_base> {
+			static int push(lua_State*, const stack_proxy_base& ref) {
+				return ref.push();
+			}
+		};
+	} // namespace stack
+
+} // namespace sol
+
+// end of sol/stack_proxy_base.hpp
+
+namespace sol {
+	struct stack_proxy : public stack_proxy_base {
+	public:
+		stack_proxy() : stack_proxy_base() {
+		}
+		stack_proxy(lua_State* L, int index) : stack_proxy_base(L, index) {
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) call(Args&&... args);
+
+		template <typename... Args>
+		decltype(auto) operator()(Args&&... args) {
+			return call<>(std::forward<Args>(args)...);
+		}
+	};
+
+	namespace stack {
+		template <>
+		struct unqualified_getter<stack_proxy> {
+			static stack_proxy get(lua_State* L, int index, record& tracking) {
+				tracking.use(0);
+				return stack_proxy(L, index);
+			}
+		};
+
+		template <>
+		struct unqualified_pusher<stack_proxy> {
+			static int push(lua_State*, const stack_proxy& ref) {
+				return ref.push();
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+// end of sol/stack_proxy.hpp
+
+#include <cstdint>
+
+namespace sol {
+	struct protected_function_result : public proxy_base<protected_function_result> {
+	private:
+		lua_State* L;
+		int index;
+		int returncount;
+		int popcount;
+		call_status err;
+
+	public:
+		typedef stack_proxy reference_type;
+		typedef stack_proxy value_type;
+		typedef stack_proxy* pointer;
+		typedef std::ptrdiff_t difference_type;
+		typedef std::size_t size_type;
+		typedef stack_iterator<stack_proxy, false> iterator;
+		typedef stack_iterator<stack_proxy, true> const_iterator;
+		typedef std::reverse_iterator<iterator> reverse_iterator;
+		typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
+
+		protected_function_result() noexcept = default;
+		protected_function_result(lua_State* Ls, int idx = -1, int retnum = 0, int popped = 0, call_status pferr = call_status::ok) noexcept
+		: L(Ls), index(idx), returncount(retnum), popcount(popped), err(pferr) {
+		}
+
+		// We do not want anyone to copy these around willy-nilly
+		// Will likely break people, but also will probably get rid of quiet bugs that have
+		// been lurking. (E.g., Vanilla Lua will just quietly discard over-pops and under-pops:
+		// LuaJIT and other Lua engines will implode and segfault at random later times.)
+		protected_function_result(const protected_function_result&) = delete;
+		protected_function_result& operator=(const protected_function_result&) = delete;
+
+		protected_function_result(protected_function_result&& o) noexcept
+		: L(o.L), index(o.index), returncount(o.returncount), popcount(o.popcount), err(o.err) {
+			// Must be manual, otherwise destructor will screw us
+			// return count being 0 is enough to keep things clean
+			// but we will be thorough
+			o.abandon();
+		}
+		protected_function_result& operator=(protected_function_result&& o) noexcept {
+			L = o.L;
+			index = o.index;
+			returncount = o.returncount;
+			popcount = o.popcount;
+			err = o.err;
+			// Must be manual, otherwise destructor will screw us
+			// return count being 0 is enough to keep things clean
+			// but we will be thorough
+			o.abandon();
+			return *this;
+		}
+
+		protected_function_result(const unsafe_function_result& o) = delete;
+		protected_function_result& operator=(const unsafe_function_result& o) = delete;
+		protected_function_result(unsafe_function_result&& o) noexcept;
+		protected_function_result& operator=(unsafe_function_result&& o) noexcept;
+
+		call_status status() const noexcept {
+			return err;
+		}
+
+		bool valid() const noexcept {
+			return status() == call_status::ok || status() == call_status::yielded;
+		}
+
+		template <typename T>
+		decltype(auto) get(int index_offset = 0) const {
+			using UT = meta::unqualified_t<T>;
+			int target = index + index_offset;
+			if constexpr (meta::is_optional_v<UT>) {
+				using ValueType = typename UT::value_type;
+				if constexpr (std::is_same_v<ValueType, error>) {
+					if (valid()) {
+						return UT();
+					}
+					return UT(error(detail::direct_error, stack::get<std::string>(L, target)));
+				}
+				else {
+					if (!valid()) {
+						return UT();
+					}
+					return stack::get<UT>(L, target);
+				}
+			}
+			else {
+				if constexpr (std::is_same_v<T, error>) {
+#if SOL_IS_ON(SOL_SAFE_PROXIES_I_)
+					if (valid()) {
+						type t = type_of(L, target);
+						type_panic_c_str(L, target, t, type::none, "bad get from protected_function_result (is an error)");
+					}
+#endif // Check Argument Safety
+					return error(detail::direct_error, stack::get<std::string>(L, target));
+				}
+				else {
+#if SOL_IS_ON(SOL_SAFE_PROXIES_I_)
+					if (!valid()) {
+						type t = type_of(L, target);
+						type_panic_c_str(L, target, t, type::none, "bad get from protected_function_result (is not an error)");
+					}
+#endif // Check Argument Safety
+					return stack::get<T>(L, target);
+				}
+			}
+		}
+
+		type get_type(int index_offset = 0) const noexcept {
+			return type_of(L, index + static_cast<int>(index_offset));
+		}
+
+		stack_proxy operator[](difference_type index_offset) const {
+			return stack_proxy(L, index + static_cast<int>(index_offset));
+		}
+
+		iterator begin() {
+			return iterator(L, index, stack_index() + return_count());
+		}
+		iterator end() {
+			return iterator(L, stack_index() + return_count(), stack_index() + return_count());
+		}
+		const_iterator begin() const {
+			return const_iterator(L, index, stack_index() + return_count());
+		}
+		const_iterator end() const {
+			return const_iterator(L, stack_index() + return_count(), stack_index() + return_count());
+		}
+		const_iterator cbegin() const {
+			return begin();
+		}
+		const_iterator cend() const {
+			return end();
+		}
+
+		reverse_iterator rbegin() {
+			return std::reverse_iterator<iterator>(begin());
+		}
+		reverse_iterator rend() {
+			return std::reverse_iterator<iterator>(end());
+		}
+		const_reverse_iterator rbegin() const {
+			return std::reverse_iterator<const_iterator>(begin());
+		}
+		const_reverse_iterator rend() const {
+			return std::reverse_iterator<const_iterator>(end());
+		}
+		const_reverse_iterator crbegin() const {
+			return std::reverse_iterator<const_iterator>(cbegin());
+		}
+		const_reverse_iterator crend() const {
+			return std::reverse_iterator<const_iterator>(cend());
+		}
+
+		lua_State* lua_state() const noexcept {
+			return L;
+		};
+		int stack_index() const noexcept {
+			return index;
+		};
+		int return_count() const noexcept {
+			return returncount;
+		};
+		int pop_count() const noexcept {
+			return popcount;
+		};
+		void abandon() noexcept {
+			// L = nullptr;
+			index = 0;
+			returncount = 0;
+			popcount = 0;
+			err = call_status::runtime;
+		}
+		~protected_function_result() {
+			stack::remove(L, index, popcount);
+		}
+	};
+
+	namespace stack {
+		template <>
+		struct unqualified_pusher<protected_function_result> {
+			static int push(lua_State* L, const protected_function_result& pfr) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+				luaL_checkstack(L, static_cast<int>(pfr.pop_count()), detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+				int p = 0;
+				for (int i = 0; i < pfr.pop_count(); ++i) {
+					lua_pushvalue(L, i + pfr.stack_index());
+					++p;
+				}
+				return p;
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+// end of sol/protected_function_result.hpp
+
+// beginning of sol/unsafe_function_result.hpp
+
+#include <cstdint>
+
+namespace sol {
+	struct unsafe_function_result : public proxy_base<unsafe_function_result> {
+	private:
+		lua_State* L;
+		int index;
+		int returncount;
+
+	public:
+		typedef stack_proxy reference_type;
+		typedef stack_proxy value_type;
+		typedef stack_proxy* pointer;
+		typedef std::ptrdiff_t difference_type;
+		typedef std::size_t size_type;
+		typedef stack_iterator<stack_proxy, false> iterator;
+		typedef stack_iterator<stack_proxy, true> const_iterator;
+		typedef std::reverse_iterator<iterator> reverse_iterator;
+		typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
+
+		unsafe_function_result() noexcept = default;
+		unsafe_function_result(lua_State* Ls, int idx = -1, int retnum = 0) noexcept : L(Ls), index(idx), returncount(retnum) {
+		}
+
+		// We do not want anyone to copy these around willy-nilly
+		// Will likely break people, but also will probably get rid of quiet bugs that have
+		// been lurking. (E.g., Vanilla Lua will just quietly discard over-pops and under-pops:
+		// LuaJIT and other Lua engines will implode and segfault at random later times.)
+		unsafe_function_result(const unsafe_function_result&) = delete;
+		unsafe_function_result& operator=(const unsafe_function_result&) = delete;
+
+		unsafe_function_result(unsafe_function_result&& o) noexcept : L(o.L), index(o.index), returncount(o.returncount) {
+			// Must be manual, otherwise destructor will screw us
+			// return count being 0 is enough to keep things clean
+			// but will be thorough
+			o.abandon();
+		}
+		unsafe_function_result& operator=(unsafe_function_result&& o) noexcept {
+			L = o.L;
+			index = o.index;
+			returncount = o.returncount;
+			// Must be manual, otherwise destructor will screw us
+			// return count being 0 is enough to keep things clean
+			// but will be thorough
+			o.abandon();
+			return *this;
+		}
+
+		unsafe_function_result(const protected_function_result& o) = delete;
+		unsafe_function_result& operator=(const protected_function_result& o) = delete;
+		unsafe_function_result(protected_function_result&& o) noexcept;
+		unsafe_function_result& operator=(protected_function_result&& o) noexcept;
+
+		template <typename T>
+		decltype(auto) get(difference_type index_offset = 0) const {
+			return stack::get<T>(L, index + static_cast<int>(index_offset));
+		}
+
+		type get_type(difference_type index_offset = 0) const noexcept {
+			return type_of(L, index + static_cast<int>(index_offset));
+		}
+
+		stack_proxy operator[](difference_type index_offset) const {
+			return stack_proxy(L, index + static_cast<int>(index_offset));
+		}
+
+		iterator begin() {
+			return iterator(L, index, stack_index() + return_count());
+		}
+		iterator end() {
+			return iterator(L, stack_index() + return_count(), stack_index() + return_count());
+		}
+		const_iterator begin() const {
+			return const_iterator(L, index, stack_index() + return_count());
+		}
+		const_iterator end() const {
+			return const_iterator(L, stack_index() + return_count(), stack_index() + return_count());
+		}
+		const_iterator cbegin() const {
+			return begin();
+		}
+		const_iterator cend() const {
+			return end();
+		}
+
+		reverse_iterator rbegin() {
+			return std::reverse_iterator<iterator>(begin());
+		}
+		reverse_iterator rend() {
+			return std::reverse_iterator<iterator>(end());
+		}
+		const_reverse_iterator rbegin() const {
+			return std::reverse_iterator<const_iterator>(begin());
+		}
+		const_reverse_iterator rend() const {
+			return std::reverse_iterator<const_iterator>(end());
+		}
+		const_reverse_iterator crbegin() const {
+			return std::reverse_iterator<const_iterator>(cbegin());
+		}
+		const_reverse_iterator crend() const {
+			return std::reverse_iterator<const_iterator>(cend());
+		}
+
+		call_status status() const noexcept {
+			return call_status::ok;
+		}
+
+		bool valid() const noexcept {
+			return status() == call_status::ok || status() == call_status::yielded;
+		}
+
+		lua_State* lua_state() const {
+			return L;
+		};
+		int stack_index() const {
+			return index;
+		};
+		int return_count() const {
+			return returncount;
+		};
+		void abandon() noexcept {
+			// L = nullptr;
+			index = 0;
+			returncount = 0;
+		}
+		~unsafe_function_result() {
+			lua_pop(L, returncount);
+		}
+	};
+
+	namespace stack {
+		template <>
+		struct unqualified_pusher<unsafe_function_result> {
+			static int push(lua_State* L, const unsafe_function_result& fr) {
+				int p = 0;
+				for (int i = 0; i < fr.return_count(); ++i) {
+					lua_pushvalue(L, i + fr.stack_index());
+					++p;
+				}
+				return p;
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+// end of sol/unsafe_function_result.hpp
+
+#include <cstdint>
+
+namespace sol {
+
+	namespace detail {
+		template <>
+		struct is_speshul<unsafe_function_result> : std::true_type {};
+		template <>
+		struct is_speshul<protected_function_result> : std::true_type {};
+
+		template <std::size_t I, typename... Args, typename T>
+		stack_proxy get(types<Args...>, meta::index_value<0>, meta::index_value<I>, const T& fr) {
+			return stack_proxy(fr.lua_state(), static_cast<int>(fr.stack_index() + I));
+		}
+
+		template <std::size_t I, std::size_t N, typename Arg, typename... Args, typename T, meta::enable<meta::boolean<(N > 0)>> = meta::enabler>
+		stack_proxy get(types<Arg, Args...>, meta::index_value<N>, meta::index_value<I>, const T& fr) {
+			return get(types<Args...>(), meta::index_value<N - 1>(), meta::index_value<I + lua_size<Arg>::value>(), fr);
+		}
+	} // namespace detail
+
+	template <>
+	struct tie_size<unsafe_function_result> : std::integral_constant<std::size_t, SIZE_MAX> {};
+
+	template <>
+	struct tie_size<protected_function_result> : std::integral_constant<std::size_t, SIZE_MAX> {};
+
+	template <std::size_t I>
+	stack_proxy get(const unsafe_function_result& fr) {
+		return stack_proxy(fr.lua_state(), static_cast<int>(fr.stack_index() + I));
+	}
+
+	template <std::size_t I, typename... Args>
+	stack_proxy get(types<Args...> t, const unsafe_function_result& fr) {
+		return detail::get(t, meta::index_value<I>(), meta::index_value<0>(), fr);
+	}
+
+	template <std::size_t I>
+	stack_proxy get(const protected_function_result& fr) {
+		return stack_proxy(fr.lua_state(), static_cast<int>(fr.stack_index() + I));
+	}
+
+	template <std::size_t I, typename... Args>
+	stack_proxy get(types<Args...> t, const protected_function_result& fr) {
+		return detail::get(t, meta::index_value<I>(), meta::index_value<0>(), fr);
+	}
+} // namespace sol
+
+// end of sol/function_result.hpp
+
+// beginning of sol/function_types.hpp
+
+// beginning of sol/function_types_core.hpp
+
+// beginning of sol/wrapper.hpp
+
+namespace sol {
+
+	namespace detail {
+		template <typename T>
+		using array_return_type = meta::conditional_t<std::is_array<T>::value, std::add_lvalue_reference_t<T>, T>;
+	}
+
+	template <typename F, typename = void>
+	struct wrapper {
+		typedef lua_bind_traits<meta::unqualified_t<F>> traits_type;
+		typedef typename traits_type::args_list args_list;
+		typedef typename traits_type::args_list free_args_list;
+		typedef typename traits_type::returns_list returns_list;
+
+		template <typename... Args>
+		static decltype(auto) call(F& f, Args&&... args) {
+			return f(std::forward<Args>(args)...);
+		}
+
+		struct caller {
+			template <typename... Args>
+			decltype(auto) operator()(F& fx, Args&&... args) const {
+				return call(fx, std::forward<Args>(args)...);
+			}
+		};
+	};
+
+	template <typename F>
+	struct wrapper<F, std::enable_if_t<std::is_function<std::remove_pointer_t<meta::unqualified_t<F>>>::value>> {
+		typedef lua_bind_traits<std::remove_pointer_t<meta::unqualified_t<F>>> traits_type;
+		typedef typename traits_type::args_list args_list;
+		typedef typename traits_type::args_list free_args_list;
+		typedef typename traits_type::returns_list returns_list;
+
+		template <F fx, typename... Args>
+		static decltype(auto) invoke(Args&&... args) {
+			return fx(std::forward<Args>(args)...);
+		}
+
+		template <typename... Args>
+		static decltype(auto) call(F& fx, Args&&... args) {
+			return fx(std::forward<Args>(args)...);
+		}
+
+		struct caller {
+			template <typename... Args>
+			decltype(auto) operator()(F& fx, Args&&... args) const {
+				return call(fx, std::forward<Args>(args)...);
+			}
+		};
+
+		template <F fx>
+		struct invoker {
+			template <typename... Args>
+			decltype(auto) operator()(Args&&... args) const {
+				return invoke<fx>(std::forward<Args>(args)...);
+			}
+		};
+	};
+
+	template <typename F>
+	struct wrapper<F, std::enable_if_t<std::is_member_object_pointer<meta::unqualified_t<F>>::value>> {
+		typedef lua_bind_traits<meta::unqualified_t<F>> traits_type;
+		typedef typename traits_type::object_type object_type;
+		typedef typename traits_type::return_type return_type;
+		typedef typename traits_type::args_list args_list;
+		typedef types<object_type&, return_type> free_args_list;
+		typedef typename traits_type::returns_list returns_list;
+
+		template <F fx>
+		static auto call(object_type& mem) -> detail::array_return_type<decltype(mem.*fx)> {
+			return mem.*fx;
+		}
+
+		template <F fx, typename Arg, typename... Args>
+		static decltype(auto) invoke(object_type& mem, Arg&& arg, Args&&...) {
+			return mem.*fx = std::forward<Arg>(arg);
+		}
+
+		template <typename Fx>
+		static auto call(Fx&& fx, object_type& mem) -> detail::array_return_type<decltype(mem.*fx)> {
+			return mem.*fx;
+		}
+
+		template <typename Fx, typename Arg, typename... Args>
+		static void call(Fx&& fx, object_type& mem, Arg&& arg, Args&&...) {
+			using actual_type = meta::unqualified_t<detail::array_return_type<decltype(mem.*fx)>>;
+			if constexpr (std::is_array_v<actual_type>) {
+				using std::cbegin;
+				using std::cend;
+				auto first = cbegin(arg);
+				auto last = cend(arg);
+				for (std::size_t i = 0; first != last; ++i, ++first) {
+					(mem.*fx)[i] = *first;
+				}
+			}
+			else {
+				(mem.*fx) = std::forward<Arg>(arg);
+			}
+		}
+
+		struct caller {
+			template <typename Fx, typename... Args>
+			decltype(auto) operator()(Fx&& fx, object_type& mem, Args&&... args) const {
+				return call(std::forward<Fx>(fx), mem, std::forward<Args>(args)...);
+			}
+		};
+
+		template <F fx>
+		struct invoker {
+			template <typename... Args>
+			decltype(auto) operator()(Args&&... args) const {
+				return invoke<fx>(std::forward<Args>(args)...);
+			}
+		};
+	};
+
+	template <typename F, typename R, typename O, typename... FArgs>
+	struct member_function_wrapper {
+		typedef O object_type;
+		typedef lua_bind_traits<F> traits_type;
+		typedef typename traits_type::args_list args_list;
+		typedef types<object_type&, FArgs...> free_args_list;
+		typedef meta::tuple_types<R> returns_list;
+
+		template <F fx, typename... Args>
+		static R invoke(O& mem, Args&&... args) {
+			return (mem.*fx)(std::forward<Args>(args)...);
+		}
+
+		template <typename Fx, typename... Args>
+		static R call(Fx&& fx, O& mem, Args&&... args) {
+			return (mem.*fx)(std::forward<Args>(args)...);
+		}
+
+		struct caller {
+			template <typename Fx, typename... Args>
+			decltype(auto) operator()(Fx&& fx, O& mem, Args&&... args) const {
+				return call(std::forward<Fx>(fx), mem, std::forward<Args>(args)...);
+			}
+		};
+
+		template <F fx>
+		struct invoker {
+			template <typename... Args>
+			decltype(auto) operator()(O& mem, Args&&... args) const {
+				return invoke<fx>(mem, std::forward<Args>(args)...);
+			}
+		};
+	};
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...)> : public member_function_wrapper<R (O::*)(Args...), R, O, Args...> {};
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const> : public member_function_wrapper<R (O::*)(Args...) const, R, O, Args...> {};
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const volatile> : public member_function_wrapper<R (O::*)(Args...) const volatile, R, O, Args...> {};
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...)&> : public member_function_wrapper<R (O::*)(Args...)&, R, O, Args...> {};
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const&> : public member_function_wrapper<R (O::*)(Args...) const&, R, O, Args...> {};
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const volatile&> : public member_function_wrapper<R (O::*)(Args...) const volatile&, R, O, Args...> {};
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...)&> : public member_function_wrapper<R (O::*)(Args..., ...)&, R, O, Args...> {};
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) const&> : public member_function_wrapper<R (O::*)(Args..., ...) const&, R, O, Args...> {};
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) const volatile&> : public member_function_wrapper<R (O::*)(Args..., ...) const volatile&, R, O, Args...> {};
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) &&> : public member_function_wrapper<R (O::*)(Args...)&, R, O, Args...> {};
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const&&> : public member_function_wrapper<R (O::*)(Args...) const&, R, O, Args...> {};
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const volatile&&> : public member_function_wrapper<R (O::*)(Args...) const volatile&, R, O, Args...> {};
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) &&> : public member_function_wrapper<R (O::*)(Args..., ...)&, R, O, Args...> {};
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) const&&> : public member_function_wrapper<R (O::*)(Args..., ...) const&, R, O, Args...> {};
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) const volatile&&> : public member_function_wrapper<R (O::*)(Args..., ...) const volatile&, R, O, Args...> {};
+
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_)
+	// noexcept has become a part of a function's type
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) noexcept> : public member_function_wrapper<R (O::*)(Args...) noexcept, R, O, Args...> {};
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const noexcept> : public member_function_wrapper<R (O::*)(Args...) const noexcept, R, O, Args...> {};
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const volatile noexcept> : public member_function_wrapper<R (O::*)(Args...) const volatile noexcept, R, O, Args...> {};
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) & noexcept> : public member_function_wrapper<R (O::*)(Args...) & noexcept, R, O, Args...> {};
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const& noexcept> : public member_function_wrapper<R (O::*)(Args...) const& noexcept, R, O, Args...> {};
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const volatile& noexcept> : public member_function_wrapper<R (O::*)(Args...) const volatile& noexcept, R, O, Args...> {};
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) & noexcept> : public member_function_wrapper<R (O::*)(Args..., ...) & noexcept, R, O, Args...> {};
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) const& noexcept> : public member_function_wrapper<R (O::*)(Args..., ...) const& noexcept, R, O, Args...> {};
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) const volatile& noexcept>
+	: public member_function_wrapper<R (O::*)(Args..., ...) const volatile& noexcept, R, O, Args...> {};
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) && noexcept> : public member_function_wrapper<R (O::*)(Args...) & noexcept, R, O, Args...> {};
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const&& noexcept> : public member_function_wrapper<R (O::*)(Args...) const& noexcept, R, O, Args...> {};
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const volatile&& noexcept> : public member_function_wrapper<R (O::*)(Args...) const volatile& noexcept, R, O, Args...> {};
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) && noexcept> : public member_function_wrapper<R (O::*)(Args..., ...) & noexcept, R, O, Args...> {};
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) const&& noexcept> : public member_function_wrapper<R (O::*)(Args..., ...) const& noexcept, R, O, Args...> {};
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) const volatile&& noexcept>
+	: public member_function_wrapper<R (O::*)(Args..., ...) const volatile& noexcept, R, O, Args...> {};
+
+#endif // noexcept is part of a function's type
+
+} // namespace sol
+
+// end of sol/wrapper.hpp
+
+#include <memory>
+
+namespace sol {
+namespace function_detail {
+	template <typename Fx, int start = 1, bool is_yielding = false>
+	int call(lua_State* L) {
+		Fx& fx = stack::get<user<Fx>>(L, upvalue_index(start));
+		int nr = fx(L);
+		if (is_yielding) {
+			return lua_yield(L, nr);
+		}
+		else {
+			return nr;
+		}
+	}
+}
+} // namespace sol::function_detail
+
+// end of sol/function_types_core.hpp
+
+// beginning of sol/function_types_templated.hpp
+
+// beginning of sol/call.hpp
+
+// beginning of sol/property.hpp
+
+#include <type_traits>
+#include <utility>
+
+namespace sol {
+	namespace detail {
+		struct no_prop {};
+	}
+
+	template <typename R, typename W>
+	struct property_wrapper : detail::ebco<R, 0>, detail::ebco<W, 1> {
+	private:
+		using read_base_t = detail::ebco<R, 0>;
+		using write_base_t = detail::ebco<W, 1>;
+
+	public:
+		template <typename Rx, typename Wx>
+		property_wrapper(Rx&& r, Wx&& w)
+		: read_base_t(std::forward<Rx>(r)), write_base_t(std::forward<Wx>(w)) {
+		}
+
+		W& write() {
+			return write_base_t::value();
+		}
+
+		const W& write() const {
+			return write_base_t::value();
+		}
+
+		R& read() {
+			return read_base_t::value();
+		}
+
+		const R& read() const {
+			return read_base_t::value();
+		}
+	};
+
+	template <typename F, typename G>
+	inline decltype(auto) property(F&& f, G&& g) {
+		typedef lua_bind_traits<meta::unqualified_t<F>> left_traits;
+		typedef lua_bind_traits<meta::unqualified_t<G>> right_traits;
+		if constexpr (left_traits::free_arity < right_traits::free_arity) {
+			return property_wrapper<std::decay_t<F>, std::decay_t<G>>(std::forward<F>(f), std::forward<G>(g));
+		}
+		else {
+			return property_wrapper<std::decay_t<G>, std::decay_t<F>>(std::forward<G>(g), std::forward<F>(f));
+		}
+	}
+
+	template <typename F>
+	inline decltype(auto) property(F&& f) {
+		typedef lua_bind_traits<meta::unqualified_t<F>> left_traits;
+		if constexpr (left_traits::free_arity < 2) {
+			return property_wrapper<std::decay_t<F>, detail::no_prop>(std::forward<F>(f), detail::no_prop());
+		}
+		else {
+			return property_wrapper<detail::no_prop, std::decay_t<F>>(detail::no_prop(), std::forward<F>(f));
+		}
+	}
+
+	template <typename F>
+	inline decltype(auto) readonly_property(F&& f) {
+		return property_wrapper<std::decay_t<F>, detail::no_prop>(std::forward<F>(f), detail::no_prop());
+	}
+
+	template <typename F>
+	inline decltype(auto) writeonly_property(F&& f) {
+		return property_wrapper<detail::no_prop, std::decay_t<F>>(detail::no_prop(), std::forward<F>(f));
+	}
+
+	template <typename T>
+	struct readonly_wrapper : detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		using base_t::base_t;
+
+		operator T&() {
+			return base_t::value();
+		}
+		operator const T&() const {
+			return base_t::value();
+		}
+	};
+
+	// Allow someone to make a member variable readonly (const)
+	template <typename R, typename T>
+	inline auto readonly(R T::*v) {
+		return readonly_wrapper<meta::unqualified_t<decltype(v)>>(v);
+	}
+
+	template <typename T>
+	struct var_wrapper : detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		using base_t::base_t;
+	};
+
+	template <typename V>
+	inline auto var(V&& v) {
+		typedef std::decay_t<V> T;
+		return var_wrapper<T>(std::forward<V>(v));
+	}
+
+	namespace meta {
+		template <typename T>
+		struct is_member_object : std::is_member_object_pointer<T> {};
+
+		template <typename T>
+		struct is_member_object<readonly_wrapper<T>> : std::true_type {};
+
+		template <typename T>
+		inline constexpr bool is_member_object_v = is_member_object<T>::value;
+	} // namespace meta
+
+} // namespace sol
+
+// end of sol/property.hpp
+
+// beginning of sol/protect.hpp
+
+#include <utility>
+
+namespace sol {
+
+	template <typename T>
+	struct protect_t {
+		T value;
+
+		template <typename Arg, typename... Args, meta::disable<std::is_same<protect_t, meta::unqualified_t<Arg>>> = meta::enabler>
+		protect_t(Arg&& arg, Args&&... args)
+		: value(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+		}
+
+		protect_t(const protect_t&) = default;
+		protect_t(protect_t&&) = default;
+		protect_t& operator=(const protect_t&) = default;
+		protect_t& operator=(protect_t&&) = default;
+	};
+
+	template <typename T>
+	auto protect(T&& value) {
+		return protect_t<std::decay_t<T>>(std::forward<T>(value));
+	}
+
+} // namespace sol
+
+// end of sol/protect.hpp
+
+namespace sol {
+	namespace u_detail {
+
+	} // namespace u_detail
+
+	namespace policy_detail {
+		template <int I, int... In>
+		inline void handle_policy(static_stack_dependencies<I, In...>, lua_State* L, int&) {
+			if constexpr (sizeof...(In) == 0) {
+				(void)L;
+				return;
+			}
+			else {
+				absolute_index ai(L, I);
+				if (type_of(L, ai) != type::userdata) {
+					return;
+				}
+				lua_createtable(L, static_cast<int>(sizeof...(In)), 0);
+				stack_reference deps(L, -1);
+				auto per_dep = [&L, &deps](int i) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+					luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+					lua_pushvalue(L, i);
+					luaL_ref(L, deps.stack_index());
+				};
+				(void)per_dep;
+				(void)detail::swallow{ int(), (per_dep(In), int())... };
+				lua_setuservalue(L, ai);
+			}
+		}
+
+		template <int... In>
+		inline void handle_policy(returns_self_with<In...>, lua_State* L, int& pushed) {
+			pushed = stack::push(L, raw_index(1));
+			handle_policy(static_stack_dependencies<-1, In...>(), L, pushed);
+		}
+
+		inline void handle_policy(const stack_dependencies& sdeps, lua_State* L, int&) {
+			absolute_index ai(L, sdeps.target);
+			if (type_of(L, ai) != type::userdata) {
+				return;
+			}
+			lua_createtable(L, static_cast<int>(sdeps.size()), 0);
+			stack_reference deps(L, -1);
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, static_cast<int>(sdeps.size()), detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			for (std::size_t i = 0; i < sdeps.size(); ++i) {
+				lua_pushvalue(L, sdeps.stack_indices[i]);
+				luaL_ref(L, deps.stack_index());
+			}
+			lua_setuservalue(L, ai);
+		}
+
+		template <typename P, meta::disable<std::is_base_of<detail::policy_base_tag, meta::unqualified_t<P>>> = meta::enabler>
+		inline void handle_policy(P&& p, lua_State* L, int& pushed) {
+			pushed = std::forward<P>(p)(L, pushed);
+		}
+	} // namespace policy_detail
+
+	namespace function_detail {
+		inline int no_construction_error(lua_State* L) {
+			return luaL_error(L, "sol: cannot call this constructor (tagged as non-constructible)");
+		}
+	} // namespace function_detail
+
+	namespace call_detail {
+
+		template <typename R, typename W>
+		inline auto& pick(std::true_type, property_wrapper<R, W>& f) {
+			return f.read();
+		}
+
+		template <typename R, typename W>
+		inline auto& pick(std::false_type, property_wrapper<R, W>& f) {
+			return f.write();
+		}
+
+		template <typename T, typename List>
+		struct void_call : void_call<T, meta::function_args_t<List>> {};
+
+		template <typename T, typename... Args>
+		struct void_call<T, types<Args...>> {
+			static void call(Args...) {
+			}
+		};
+
+		template <typename T, bool checked, bool clean_stack>
+		struct constructor_match {
+			T* obj_;
+
+			constructor_match(T* o) : obj_(o) {
+			}
+
+			template <typename Fx, std::size_t I, typename... R, typename... Args>
+			int operator()(types<Fx>, meta::index_value<I>, types<R...> r, types<Args...> a, lua_State* L, int, int start) const {
+				detail::default_construct func{};
+				return stack::call_into_lua<checked, clean_stack>(r, a, L, start, func, obj_);
+			}
+		};
+
+		namespace overload_detail {
+			template <std::size_t... M, typename Match, typename... Args>
+			inline int overload_match_arity(types<>, std::index_sequence<>, std::index_sequence<M...>, Match&&, lua_State* L, int, int, Args&&...) {
+				return luaL_error(L, "sol: no matching function call takes this number of arguments and the specified types");
+			}
+
+			template <typename Fx, typename... Fxs, std::size_t I, std::size_t... In, std::size_t... M, typename Match, typename... Args>
+			inline int overload_match_arity(types<Fx, Fxs...>, std::index_sequence<I, In...>, std::index_sequence<M...>, Match&& matchfx, lua_State* L,
+			     int fxarity, int start, Args&&... args) {
+				typedef lua_bind_traits<meta::unwrap_unqualified_t<Fx>> traits;
+				typedef meta::tuple_types<typename traits::return_type> return_types;
+				typedef typename traits::free_args_list args_list;
+				// compile-time eliminate any functions that we know ahead of time are of improper arity
+				if constexpr (!traits::runtime_variadics_t::value
+				     && meta::find_in_pack_v<meta::index_value<traits::free_arity>, meta::index_value<M>...>::value) {
+					return overload_match_arity(types<Fxs...>(),
+					     std::index_sequence<In...>(),
+					     std::index_sequence<M...>(),
+					     std::forward<Match>(matchfx),
+					     L,
+					     fxarity,
+					     start,
+					     std::forward<Args>(args)...);
+				}
+				else {
+					if constexpr (!traits::runtime_variadics_t::value) {
+						if (traits::free_arity != fxarity) {
+							return overload_match_arity(types<Fxs...>(),
+							     std::index_sequence<In...>(),
+							     std::index_sequence<traits::free_arity, M...>(),
+							     std::forward<Match>(matchfx),
+							     L,
+							     fxarity,
+							     start,
+							     std::forward<Args>(args)...);
+						}
+					}
+					stack::record tracking{};
+					if (!stack::stack_detail::check_types(args_list(), L, start, no_panic, tracking)) {
+						return overload_match_arity(types<Fxs...>(),
+						     std::index_sequence<In...>(),
+						     std::index_sequence<M...>(),
+						     std::forward<Match>(matchfx),
+						     L,
+						     fxarity,
+						     start,
+						     std::forward<Args>(args)...);
+					}
+					return matchfx(types<Fx>(), meta::index_value<I>(), return_types(), args_list(), L, fxarity, start, std::forward<Args>(args)...);
+				}
+			}
+
+			template <std::size_t... M, typename Match, typename... Args>
+			inline int overload_match_arity_single(
+			     types<>, std::index_sequence<>, std::index_sequence<M...>, Match&& matchfx, lua_State* L, int fxarity, int start, Args&&... args) {
+				return overload_match_arity(types<>(),
+				     std::index_sequence<>(),
+				     std::index_sequence<M...>(),
+				     std::forward<Match>(matchfx),
+				     L,
+				     fxarity,
+				     start,
+				     std::forward<Args>(args)...);
+			}
+
+			template <typename Fx, std::size_t I, std::size_t... M, typename Match, typename... Args>
+			inline int overload_match_arity_single(
+			     types<Fx>, std::index_sequence<I>, std::index_sequence<M...>, Match&& matchfx, lua_State* L, int fxarity, int start, Args&&... args) {
+				typedef lua_bind_traits<meta::unwrap_unqualified_t<Fx>> traits;
+				typedef meta::tuple_types<typename traits::return_type> return_types;
+				typedef typename traits::free_args_list args_list;
+				// compile-time eliminate any functions that we know ahead of time are of improper arity
+				if constexpr (!traits::runtime_variadics_t::value
+				     && meta::find_in_pack_v<meta::index_value<traits::free_arity>, meta::index_value<M>...>::value) {
+					return overload_match_arity(types<>(),
+					     std::index_sequence<>(),
+					     std::index_sequence<M...>(),
+					     std::forward<Match>(matchfx),
+					     L,
+					     fxarity,
+					     start,
+					     std::forward<Args>(args)...);
+				}
+				if constexpr (!traits::runtime_variadics_t::value) {
+					if (traits::free_arity != fxarity) {
+						return overload_match_arity(types<>(),
+						     std::index_sequence<>(),
+						     std::index_sequence<traits::free_arity, M...>(),
+						     std::forward<Match>(matchfx),
+						     L,
+						     fxarity,
+						     start,
+						     std::forward<Args>(args)...);
+					}
+				}
+				return matchfx(types<Fx>(), meta::index_value<I>(), return_types(), args_list(), L, fxarity, start, std::forward<Args>(args)...);
+			}
+
+			template <typename Fx, typename Fx1, typename... Fxs, std::size_t I, std::size_t I1, std::size_t... In, std::size_t... M, typename Match,
+			     typename... Args>
+			inline int overload_match_arity_single(types<Fx, Fx1, Fxs...>, std::index_sequence<I, I1, In...>, std::index_sequence<M...>, Match&& matchfx,
+			     lua_State* L, int fxarity, int start, Args&&... args) {
+				typedef lua_bind_traits<meta::unwrap_unqualified_t<Fx>> traits;
+				typedef meta::tuple_types<typename traits::return_type> return_types;
+				typedef typename traits::free_args_list args_list;
+				// compile-time eliminate any functions that we know ahead of time are of improper arity
+				if constexpr (!traits::runtime_variadics_t::value
+				     && meta::find_in_pack_v<meta::index_value<traits::free_arity>, meta::index_value<M>...>::value) {
+					return overload_match_arity(types<Fx1, Fxs...>(),
+					     std::index_sequence<I1, In...>(),
+					     std::index_sequence<M...>(),
+					     std::forward<Match>(matchfx),
+					     L,
+					     fxarity,
+					     start,
+					     std::forward<Args>(args)...);
+				}
+				else {
+					if constexpr (!traits::runtime_variadics_t::value) {
+						if (traits::free_arity != fxarity) {
+							return overload_match_arity(types<Fx1, Fxs...>(),
+							     std::index_sequence<I1, In...>(),
+							     std::index_sequence<traits::free_arity, M...>(),
+							     std::forward<Match>(matchfx),
+							     L,
+							     fxarity,
+							     start,
+							     std::forward<Args>(args)...);
+						}
+					}
+					stack::record tracking{};
+					if (!stack::stack_detail::check_types(args_list(), L, start, no_panic, tracking)) {
+						return overload_match_arity(types<Fx1, Fxs...>(),
+						     std::index_sequence<I1, In...>(),
+						     std::index_sequence<M...>(),
+						     std::forward<Match>(matchfx),
+						     L,
+						     fxarity,
+						     start,
+						     std::forward<Args>(args)...);
+					}
+					return matchfx(types<Fx>(), meta::index_value<I>(), return_types(), args_list(), L, fxarity, start, std::forward<Args>(args)...);
+				}
+			}
+		} // namespace overload_detail
+
+		template <typename... Functions, typename Match, typename... Args>
+		inline int overload_match_arity(Match&& matchfx, lua_State* L, int fxarity, int start, Args&&... args) {
+			return overload_detail::overload_match_arity_single(types<Functions...>(),
+			     std::make_index_sequence<sizeof...(Functions)>(),
+			     std::index_sequence<>(),
+			     std::forward<Match>(matchfx),
+			     L,
+			     fxarity,
+			     start,
+			     std::forward<Args>(args)...);
+		}
+
+		template <typename... Functions, typename Match, typename... Args>
+		inline int overload_match(Match&& matchfx, lua_State* L, int start, Args&&... args) {
+			int fxarity = lua_gettop(L) - (start - 1);
+			return overload_match_arity<Functions...>(std::forward<Match>(matchfx), L, fxarity, start, std::forward<Args>(args)...);
+		}
+
+		template <typename T, typename... TypeLists, typename Match, typename... Args>
+		inline int construct_match(Match&& matchfx, lua_State* L, int fxarity, int start, Args&&... args) {
+			// use same overload resolution matching as all other parts of the framework
+			return overload_match_arity<decltype(void_call<T, TypeLists>::call)...>(
+			     std::forward<Match>(matchfx), L, fxarity, start, std::forward<Args>(args)...);
+		}
+
+		template <typename T, bool checked, bool clean_stack, typename... TypeLists>
+		inline int construct_trampolined(lua_State* L) {
+			static const auto& meta = usertype_traits<T>::metatable();
+			int argcount = lua_gettop(L);
+			call_syntax syntax = argcount > 0 ? stack::get_call_syntax(L, usertype_traits<T>::user_metatable(), 1) : call_syntax::dot;
+			argcount -= static_cast<int>(syntax);
+
+			T* obj = detail::usertype_allocate<T>(L);
+			reference userdataref(L, -1);
+			stack::stack_detail::undefined_metatable umf(L, &meta[0], &stack::stack_detail::set_undefined_methods_on<T>);
+			umf();
+
+			// put userdata at the first index
+			lua_insert(L, 1);
+			construct_match<T, TypeLists...>(constructor_match<T, checked, clean_stack>(obj), L, argcount, 1 + static_cast<int>(syntax));
+
+			userdataref.push();
+			return 1;
+		}
+
+		template <typename T, bool checked, bool clean_stack, typename... TypeLists>
+		inline int construct(lua_State* L) {
+			return detail::static_trampoline<&construct_trampolined<T, checked, clean_stack, TypeLists...>>(L);
+		}
+
+		template <typename F, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename = void>
+		struct agnostic_lua_call_wrapper {
+			template <typename Fx, typename... Args>
+			static int call(lua_State* L, Fx&& f, Args&&... args) {
+				using uFx = meta::unqualified_t<Fx>;
+				static constexpr bool is_ref = is_lua_reference_v<uFx>;
+				if constexpr (is_ref) {
+					if constexpr (is_index) {
+						return stack::push(L, std::forward<Fx>(f), std::forward<Args>(args)...);
+					}
+					else {
+						std::forward<Fx>(f) = stack::unqualified_get<F>(L, boost + (is_variable ? 3 : 1));
+						return 0;
+					}
+				}
+				else {
+					using wrap = wrapper<uFx>;
+					using traits_type = typename wrap::traits_type;
+					using fp_t = typename traits_type::function_pointer_type;
+					constexpr bool is_function_pointer_convertible
+					     = std::is_class_v<uFx> && std::is_convertible_v<std::decay_t<Fx>, fp_t>;
+					if constexpr (is_function_pointer_convertible) {
+						fp_t fx = f;
+						return agnostic_lua_call_wrapper<fp_t, is_index, is_variable, checked, boost, clean_stack>{}.call(
+						     L, fx, std::forward<Args>(args)...);
+					}
+					else {
+						using returns_list = typename wrap::returns_list;
+						using args_list = typename wrap::free_args_list;
+						using caller = typename wrap::caller;
+						return stack::call_into_lua<checked, clean_stack>(
+						     returns_list(), args_list(), L, boost + 1, caller(), std::forward<Fx>(f), std::forward<Args>(args)...);
+					}
+				}
+			}
+		};
+
+		template <typename T, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct agnostic_lua_call_wrapper<var_wrapper<T>, is_index, is_variable, checked, boost, clean_stack, C> {
+			template <typename F>
+			static int call(lua_State* L, F&& f) {
+				if constexpr (is_index) {
+					constexpr bool is_stack = is_stack_based_v<meta::unqualified_t<decltype(detail::unwrap(f.value()))>>;
+					if constexpr (clean_stack && !is_stack) {
+						lua_settop(L, 0);
+					}
+					return stack::push_reference(L, detail::unwrap(f.value()));
+				}
+				else {
+					if constexpr (std::is_const_v<meta::unwrapped_t<T>>) {
+						(void)f;
+						return luaL_error(L, "sol: cannot write to a readonly (const) variable");
+					}
+					else {
+						using R = meta::unwrapped_t<T>;
+						if constexpr (std::is_assignable_v<std::add_lvalue_reference_t<meta::unqualified_t<R>>, R>) {
+							detail::unwrap(f.value()) = stack::unqualified_get<meta::unwrapped_t<T>>(L, boost + (is_variable ? 3 : 1));
+							if (clean_stack) {
+								lua_settop(L, 0);
+							}
+							return 0;
+						}
+						else {
+							return luaL_error(L, "sol: cannot write to this variable: copy assignment/constructor not available");
+						}
+					}
+				}
+			}
+		};
+
+		template <bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct agnostic_lua_call_wrapper<lua_CFunction_ref, is_index, is_variable, checked, boost, clean_stack, C> {
+			static int call(lua_State* L, lua_CFunction_ref f) {
+				return f(L);
+			}
+		};
+
+		template <bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct agnostic_lua_call_wrapper<lua_CFunction, is_index, is_variable, checked, boost, clean_stack, C> {
+			static int call(lua_State* L, lua_CFunction f) {
+				return f(L);
+			}
+		};
+
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_)
+		template <bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct agnostic_lua_call_wrapper<detail::lua_CFunction_noexcept, is_index, is_variable, checked, boost, clean_stack, C> {
+			static int call(lua_State* L, detail::lua_CFunction_noexcept f) {
+				return f(L);
+			}
+		};
+#endif // noexcept function types
+
+		template <bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct agnostic_lua_call_wrapper<detail::no_prop, is_index, is_variable, checked, boost, clean_stack, C> {
+			static int call(lua_State* L, const detail::no_prop&) {
+				return luaL_error(L, is_index ? "sol: cannot read from a writeonly property" : "sol: cannot write to a readonly property");
+			}
+		};
+
+		template <bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct agnostic_lua_call_wrapper<no_construction, is_index, is_variable, checked, boost, clean_stack, C> {
+			static int call(lua_State* L, const no_construction&) {
+				return function_detail::no_construction_error(L);
+			}
+		};
+
+		template <typename... Args, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct agnostic_lua_call_wrapper<bases<Args...>, is_index, is_variable, checked, boost, clean_stack, C> {
+			static int call(lua_State*, const bases<Args...>&) {
+				// Uh. How did you even call this, lul
+				return 0;
+			}
+		};
+
+		template <typename T, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct agnostic_lua_call_wrapper<std::reference_wrapper<T>, is_index, is_variable, checked, boost, clean_stack, C> {
+			static int call(lua_State* L, std::reference_wrapper<T> f) {
+				agnostic_lua_call_wrapper<T, is_index, is_variable, checked, boost, clean_stack> alcw{};
+				return alcw.call(L, f.get());
+			}
+		};
+
+		template <typename T, typename F, bool is_index, bool is_variable, bool checked = detail::default_safe_function_calls, int boost = 0,
+		     bool clean_stack = true, typename = void>
+		struct lua_call_wrapper {
+			template <typename Fx, typename... Args>
+			static int call(lua_State* L, Fx&& fx, Args&&... args) {
+				if constexpr (std::is_member_function_pointer_v<F>) {
+					using wrap = wrapper<F>;
+					using object_type = typename wrap::object_type;
+					if constexpr (sizeof...(Args) < 1) {
+						using Ta = meta::conditional_t<std::is_void_v<T>, object_type, T>;
+						static_assert(std::is_base_of_v<object_type, Ta>, "It seems like you might have accidentally bound a class type with a member function method that does not correspond to the class. For example, there could be a small type in your new_usertype<T>(...) binding, where you specify one class \"T\" but then bind member methods from a complete unrelated class. Check things over!");
+#if SOL_IS_ON(SOL_SAFE_USERTYPE_I_)
+						auto maybeo = stack::check_get<Ta*>(L, 1);
+						if (!maybeo || maybeo.value() == nullptr) {
+							return luaL_error(L,
+							     "sol: received nil for 'self' argument (use ':' for accessing member functions, make sure member variables are "
+							     "preceeded by the "
+							     "actual object with '.' syntax)");
+						}
+						object_type* o = static_cast<object_type*>(maybeo.value());
+						return call(L, std::forward<Fx>(fx), *o);
+#else
+						object_type& o = static_cast<object_type&>(*stack::unqualified_get<non_null<Ta*>>(L, 1));
+						return call(L, std::forward<Fx>(fx), o);
+#endif // Safety
+					}
+					else {
+						using returns_list = typename wrap::returns_list;
+						using args_list = typename wrap::args_list;
+						using caller = typename wrap::caller;
+						return stack::call_into_lua<checked, clean_stack>(
+						     returns_list(), args_list(), L, boost + (is_variable ? 3 : 2), caller(), std::forward<Fx>(fx), std::forward<Args>(args)...);
+					}
+				}
+				else if constexpr (std::is_member_object_pointer_v<F>) {
+					using wrap = wrapper<F>;
+					using object_type = typename wrap::object_type;
+					if constexpr (is_index) {
+						if constexpr (sizeof...(Args) < 1) {
+							using Ta = meta::conditional_t<std::is_void_v<T>, object_type, T>;
+							static_assert(std::is_base_of_v<object_type, Ta>, "It seems like you might have accidentally bound a class type with a member function method that does not correspond to the class. For example, there could be a small type in your new_usertype<T>(...) binding, where you specify one class \"T\" but then bind member methods from a complete unrelated class. Check things over!");
+#if SOL_IS_ON(SOL_SAFE_USERTYPE_I_)
+							auto maybeo = stack::check_get<Ta*>(L, 1);
+							if (!maybeo || maybeo.value() == nullptr) {
+								if (is_variable) {
+									return luaL_error(L, "sol: 'self' argument is lua_nil (bad '.' access?)");
+								}
+								return luaL_error(L, "sol: 'self' argument is lua_nil (pass 'self' as first argument)");
+							}
+							object_type* o = static_cast<object_type*>(maybeo.value());
+							return call(L, std::forward<Fx>(fx), *o);
+#else
+							object_type& o = static_cast<object_type&>(*stack::get<non_null<Ta*>>(L, 1));
+							return call(L, std::forward<Fx>(fx), o);
+#endif // Safety
+						}
+						else {
+							using returns_list = typename wrap::returns_list;
+							using caller = typename wrap::caller;
+							return stack::call_into_lua<checked, clean_stack>(returns_list(),
+							     types<>(),
+							     L,
+							     boost + (is_variable ? 3 : 2),
+							     caller(),
+							     std::forward<Fx>(fx),
+							     std::forward<Args>(args)...);
+						}
+					}
+					else {
+						using traits_type = lua_bind_traits<F>;
+						using return_type = typename traits_type::return_type;
+						constexpr bool ret_is_const = std::is_const_v<std::remove_reference_t<return_type>>;
+						if constexpr (ret_is_const) {
+							(void)fx;
+							(void)detail::swallow{ 0, (static_cast<void>(args), 0)... };
+							return luaL_error(L, "sol: cannot write to a readonly (const) variable");
+						}
+						else {
+							using u_return_type = meta::unqualified_t<return_type>;
+							constexpr bool is_assignable = std::is_copy_assignable_v<u_return_type> || std::is_array_v<u_return_type>;
+							if constexpr (!is_assignable) {
+								(void)fx;
+								(void)detail::swallow{ 0, ((void)args, 0)... };
+								return luaL_error(L, "sol: cannot write to this variable: copy assignment/constructor not available");
+							}
+							else {
+								using args_list = typename wrap::args_list;
+								using caller = typename wrap::caller;
+								if constexpr (sizeof...(Args) > 0) {
+									return stack::call_into_lua<checked, clean_stack>(types<void>(),
+									     args_list(),
+									     L,
+									     boost + (is_variable ? 3 : 2),
+									     caller(),
+									     std::forward<Fx>(fx),
+									     std::forward<Args>(args)...);
+								}
+								else {
+									using Ta = meta::conditional_t<std::is_void_v<T>, object_type, T>;
+#if SOL_IS_ON(SOL_SAFE_USERTYPE_I_)
+									auto maybeo = stack::check_get<Ta*>(L, 1);
+									if (!maybeo || maybeo.value() == nullptr) {
+										if (is_variable) {
+											return luaL_error(L, "sol: received nil for 'self' argument (bad '.' access?)");
+										}
+										return luaL_error(L, "sol: received nil for 'self' argument (pass 'self' as first argument)");
+									}
+									object_type* po = static_cast<object_type*>(maybeo.value());
+									object_type& o = *po;
+#else
+									object_type& o = static_cast<object_type&>(*stack::get<non_null<Ta*>>(L, 1));
+#endif // Safety
+
+									return stack::call_into_lua<checked, clean_stack>(
+									     types<void>(), args_list(), L, boost + (is_variable ? 3 : 2), caller(), std::forward<Fx>(fx), o);
+								}
+							}
+						}
+					}
+				}
+				else {
+					agnostic_lua_call_wrapper<F, is_index, is_variable, checked, boost, clean_stack> alcw{};
+					return alcw.call(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+				}
+			}
+		};
+
+		template <typename T, typename F, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, readonly_wrapper<F>, is_index, is_variable, checked, boost, clean_stack, C> {
+			using traits_type = lua_bind_traits<F>;
+			using wrap = wrapper<F>;
+			using object_type = typename wrap::object_type;
+
+			static int call(lua_State* L, readonly_wrapper<F>&& rw) {
+				if constexpr (!is_index) {
+					(void)rw;
+					return luaL_error(L, "sol: cannot write to a sol::readonly variable");
+				}
+				else {
+					lua_call_wrapper<T, F, true, is_variable, checked, boost, clean_stack, C> lcw;
+					return lcw.call(L, std::move(rw.value()));
+				}
+			}
+
+			static int call(lua_State* L, readonly_wrapper<F>&& rw, object_type& o) {
+				if constexpr (!is_index) {
+					(void)o;
+					return call(L, std::move(rw));
+				}
+				else {
+					lua_call_wrapper<T, F, true, is_variable, checked, boost, clean_stack, C> lcw;
+					return lcw.call(L, rw.value(), o);
+				}
+			}
+
+			static int call(lua_State* L, const readonly_wrapper<F>& rw) {
+				if constexpr (!is_index) {
+					(void)rw;
+					return luaL_error(L, "sol: cannot write to a sol::readonly variable");
+				}
+				else {
+					lua_call_wrapper<T, F, true, is_variable, checked, boost, clean_stack, C> lcw;
+					return lcw.call(L, rw.value());
+				}
+			}
+
+			static int call(lua_State* L, const readonly_wrapper<F>& rw, object_type& o) {
+				if constexpr (!is_index) {
+					(void)o;
+					return call(L, rw);
+				}
+				else {
+					lua_call_wrapper<T, F, true, is_variable, checked, boost, clean_stack, C> lcw;
+					return lcw.call(L, rw.value(), o);
+				}
+			}
+		};
+
+		template <typename T, typename... Args, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, constructor_list<Args...>, is_index, is_variable, checked, boost, clean_stack, C> {
+			typedef constructor_list<Args...> F;
+
+			static int call(lua_State* L, F&) {
+				const auto& meta = usertype_traits<T>::metatable();
+				int argcount = lua_gettop(L);
+				call_syntax syntax = argcount > 0 ? stack::get_call_syntax(L, usertype_traits<T>::user_metatable(), 1) : call_syntax::dot;
+				argcount -= static_cast<int>(syntax);
+
+				T* obj = detail::usertype_allocate<T>(L);
+				reference userdataref(L, -1);
+				stack::stack_detail::undefined_metatable umf(L, &meta[0], &stack::stack_detail::set_undefined_methods_on<T>);
+				umf();
+
+				// put userdata at the first index
+				lua_insert(L, 1);
+				construct_match<T, Args...>(constructor_match<T, checked, clean_stack>(obj), L, argcount, boost + 1 + 1 + static_cast<int>(syntax));
+
+				userdataref.push();
+				return 1;
+			}
+		};
+
+		template <typename T, typename... Cxs, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, constructor_wrapper<Cxs...>, is_index, is_variable, checked, boost, clean_stack, C> {
+			typedef constructor_wrapper<Cxs...> F;
+
+			struct onmatch {
+				template <typename Fx, std::size_t I, typename... R, typename... Args>
+				int operator()(types<Fx>, meta::index_value<I>, types<R...> r, types<Args...> a, lua_State* L, int, int start, F& f) {
+					const auto& meta = usertype_traits<T>::metatable();
+					T* obj = detail::usertype_allocate<T>(L);
+					reference userdataref(L, -1);
+					stack::stack_detail::undefined_metatable umf(L, &meta[0], &stack::stack_detail::set_undefined_methods_on<T>);
+					umf();
+
+					auto& func = std::get<I>(f.functions);
+					// put userdata at the first index
+					lua_insert(L, 1);
+					stack::call_into_lua<checked, clean_stack>(r, a, L, boost + 1 + start, func, detail::implicit_wrapper<T>(obj));
+
+					userdataref.push();
+					return 1;
+				}
+			};
+
+			static int call(lua_State* L, F& f) {
+				call_syntax syntax = stack::get_call_syntax(L, usertype_traits<T>::user_metatable(), 1);
+				int syntaxval = static_cast<int>(syntax);
+				int argcount = lua_gettop(L) - syntaxval;
+				return construct_match<T, meta::pop_front_type_t<meta::function_args_t<Cxs>>...>(onmatch(), L, argcount, 1 + syntaxval, f);
+			}
+		};
+
+		template <typename T, typename Fx, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, destructor_wrapper<Fx>, is_index, is_variable, checked, boost, clean_stack, C> {
+
+			template <typename F>
+			static int call(lua_State* L, F&& f) {
+				if constexpr (std::is_void_v<Fx>) {
+					return detail::usertype_alloc_destruct<T>(L);
+				}
+				else {
+					using uFx = meta::unqualified_t<Fx>;
+					lua_call_wrapper<T, uFx, is_index, is_variable, checked, boost, clean_stack> lcw{};
+					return lcw.call(L, std::forward<F>(f).fx);
+				}
+			}
+		};
+
+		template <typename T, typename... Fs, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, overload_set<Fs...>, is_index, is_variable, checked, boost, clean_stack, C> {
+			typedef overload_set<Fs...> F;
+
+			struct on_match {
+				template <typename Fx, std::size_t I, typename... R, typename... Args>
+				int operator()(types<Fx>, meta::index_value<I>, types<R...>, types<Args...>, lua_State* L, int, int, F& fx) {
+					auto& f = std::get<I>(fx.functions);
+					return lua_call_wrapper<T, Fx, is_index, is_variable, checked, boost>{}.call(L, f);
+				}
+			};
+
+			static int call(lua_State* L, F& fx) {
+				return overload_match_arity<Fs...>(on_match(), L, lua_gettop(L), 1, fx);
+			}
+		};
+
+		template <typename T, typename... Fs, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, factory_wrapper<Fs...>, is_index, is_variable, checked, boost, clean_stack, C> {
+			typedef factory_wrapper<Fs...> F;
+
+			struct on_match {
+				template <typename Fx, std::size_t I, typename... R, typename... Args>
+				int operator()(types<Fx>, meta::index_value<I>, types<R...>, types<Args...>, lua_State* L, int, int, F& fx) {
+					auto& f = std::get<I>(fx.functions);
+					return lua_call_wrapper<T, Fx, is_index, is_variable, checked, boost, clean_stack>{}.call(L, f);
+				}
+			};
+
+			static int call(lua_State* L, F& fx) {
+				return overload_match_arity<Fs...>(on_match(), L, lua_gettop(L) - boost, 1 + boost, fx);
+			}
+		};
+
+		template <typename T, typename R, typename W, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, property_wrapper<R, W>, is_index, is_variable, checked, boost, clean_stack, C> {
+			typedef meta::conditional_t<is_index, R, W> P;
+			typedef meta::unqualified_t<P> U;
+			typedef wrapper<U> wrap;
+			typedef lua_bind_traits<U> traits_type;
+			typedef meta::unqualified_t<typename traits_type::template arg_at<0>> object_type;
+
+			template <typename F, typename... Args>
+			static int call(lua_State* L, F&& f, Args&&... args) {
+				constexpr bool is_specialized = meta::any<std::is_same<U, detail::no_prop>,
+				     meta::is_specialization_of<U, var_wrapper>,
+				     meta::is_specialization_of<U, constructor_wrapper>,
+				     meta::is_specialization_of<U, constructor_list>,
+				     std::is_member_pointer<U>>::value;
+				if constexpr (is_specialized) {
+					if constexpr (is_index) {
+						decltype(auto) p = f.read();
+						lua_call_wrapper<T, meta::unqualified_t<decltype(p)>, is_index, is_variable, checked, boost, clean_stack> lcw{};
+						return lcw.call(L, p, std::forward<Args>(args)...);
+					}
+					else {
+						decltype(auto) p = f.write();
+						lua_call_wrapper<T, meta::unqualified_t<decltype(p)>, is_index, is_variable, checked, boost, clean_stack> lcw{};
+						return lcw.call(L, p, std::forward<Args>(args)...);
+					}
+				}
+				else {
+					constexpr bool non_class_object_type = meta::any<std::is_void<object_type>,
+					     meta::boolean<lua_type_of<meta::unwrap_unqualified_t<object_type>>::value != type::userdata>>::value;
+					if constexpr (non_class_object_type) {
+						// The type being void means we don't have any arguments, so it might be a free functions?
+						using args_list = typename traits_type::free_args_list;
+						using returns_list = typename wrap::returns_list;
+						using caller = typename wrap::caller;
+						if constexpr (is_index) {
+							decltype(auto) pf = f.read();
+							return stack::call_into_lua<checked, clean_stack>(
+							     returns_list(), args_list(), L, boost + (is_variable ? 3 : 2), caller(), pf);
+						}
+						else {
+							decltype(auto) pf = f.write();
+							return stack::call_into_lua<checked, clean_stack>(
+							     returns_list(), args_list(), L, boost + (is_variable ? 3 : 2), caller(), pf);
+						}
+					}
+					else {
+						using args_list = meta::pop_front_type_t<typename traits_type::free_args_list>;
+						using Ta = T;
+						using Oa = std::remove_pointer_t<object_type>;
+#if SOL_IS_ON(SOL_SAFE_USERTYPE_I_)
+						auto maybeo = stack::check_get<Ta*>(L, 1);
+						if (!maybeo || maybeo.value() == nullptr) {
+							if (is_variable) {
+								return luaL_error(L, "sol: 'self' argument is lua_nil (bad '.' access?)");
+							}
+							return luaL_error(L, "sol: 'self' argument is lua_nil (pass 'self' as first argument)");
+						}
+						Oa* o = static_cast<Oa*>(maybeo.value());
+#else
+						Oa* o = static_cast<Oa*>(stack::get<non_null<Ta*>>(L, 1));
+#endif // Safety
+						using returns_list = typename wrap::returns_list;
+						using caller = typename wrap::caller;
+						if constexpr (is_index) {
+							decltype(auto) pf = f.read();
+							return stack::call_into_lua<checked, clean_stack>(
+							     returns_list(), args_list(), L, boost + (is_variable ? 3 : 2), caller(), pf, detail::implicit_wrapper<Oa>(*o));
+						}
+						else {
+							decltype(auto) pf = f.write();
+							return stack::call_into_lua<checked, clean_stack>(
+							     returns_list(), args_list(), L, boost + (is_variable ? 3 : 2), caller(), pf, detail::implicit_wrapper<Oa>(*o));
+						}
+					}
+				}
+			}
+		};
+
+		template <typename T, typename V, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, protect_t<V>, is_index, is_variable, checked, boost, clean_stack, C> {
+			typedef protect_t<V> F;
+
+			template <typename... Args>
+			static int call(lua_State* L, F& fx, Args&&... args) {
+				return lua_call_wrapper<T, V, is_index, is_variable, true, boost, clean_stack>{}.call(L, fx.value, std::forward<Args>(args)...);
+			}
+		};
+
+		template <typename T, typename F, typename... Policies, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, policy_wrapper<F, Policies...>, is_index, is_variable, checked, boost, clean_stack, C> {
+			typedef policy_wrapper<F, Policies...> P;
+
+			template <std::size_t... In>
+			static int call(std::index_sequence<In...>, lua_State* L, P& fx) {
+				int pushed = lua_call_wrapper<T, F, is_index, is_variable, checked, boost, false, C>{}.call(L, fx.value);
+				(void)detail::swallow{ int(), (policy_detail::handle_policy(std::get<In>(fx.policies), L, pushed), int())... };
+				return pushed;
+			}
+
+			static int call(lua_State* L, P& fx) {
+				typedef typename P::indices indices;
+				return call(indices(), L, fx);
+			}
+		};
+
+		template <typename T, typename Y, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, yielding_t<Y>, is_index, is_variable, checked, boost, clean_stack, C> {
+			template <typename F>
+			static int call(lua_State* L, F&& f) {
+				return lua_call_wrapper<T, meta::unqualified_t<Y>, is_index, is_variable, checked, boost, clean_stack>{}.call(L, f.func);
+			}
+		};
+
+		template <typename T, typename Sig, typename P, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, function_arguments<Sig, P>, is_index, is_variable, checked, boost, clean_stack, C> {
+			static int call(lua_State* L, const function_arguments<Sig, P>& f) {
+				lua_call_wrapper<T, meta::unqualified_t<P>, is_index, is_variable, checked, boost, clean_stack> lcw{};
+				return lcw.call(L, std::get<0>(f.arguments));
+			}
+
+			static int call(lua_State* L, function_arguments<Sig, P>&& f) {
+				lua_call_wrapper<T, meta::unqualified_t<P>, is_index, is_variable, checked, boost, clean_stack> lcw{};
+				return lcw.call(L, std::get<0>(std::move(f.arguments)));
+			}
+		};
+
+		template <typename T, bool is_index, bool is_variable, int boost = 0, bool checked = detail::default_safe_function_calls, bool clean_stack = true,
+		     typename Fx, typename... Args>
+		inline int call_wrapped(lua_State* L, Fx&& fx, Args&&... args) {
+			using uFx = meta::unqualified_t<Fx>;
+			if constexpr (meta::is_specialization_of_v<uFx, yielding_t>) {
+				using real_fx = meta::unqualified_t<decltype(std::forward<Fx>(fx).func)>;
+				lua_call_wrapper<T, real_fx, is_index, is_variable, checked, boost, clean_stack> lcw{};
+				return lcw.call(L, std::forward<Fx>(fx).func, std::forward<Args>(args)...);
+			}
+			else {
+				lua_call_wrapper<T, uFx, is_index, is_variable, checked, boost, clean_stack> lcw{};
+				return lcw.call(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+			}
+		}
+
+		template <typename T, bool is_index, bool is_variable, typename F, int start = 1, bool checked = detail::default_safe_function_calls,
+		     bool clean_stack = true>
+		inline int call_user(lua_State* L) {
+			auto& fx = stack::unqualified_get<user<F>>(L, upvalue_index(start));
+			using uFx = meta::unqualified_t<F>;
+			int nr = call_wrapped<T, is_index, is_variable, 0, checked, clean_stack>(L, fx);
+			if constexpr (meta::is_specialization_of_v<uFx, yielding_t>) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		template <typename T, typename = void>
+		struct is_var_bind : std::false_type {};
+
+		template <typename T>
+		struct is_var_bind<T, std::enable_if_t<std::is_member_object_pointer<T>::value>> : std::true_type {};
+
+		template <typename T>
+		struct is_var_bind<T, std::enable_if_t<is_lua_reference_or_proxy<T>::value>> : std::true_type {};
+
+		template <>
+		struct is_var_bind<detail::no_prop> : std::true_type {};
+
+		template <typename R, typename W>
+		struct is_var_bind<property_wrapper<R, W>> : std::true_type {};
+
+		template <typename T>
+		struct is_var_bind<var_wrapper<T>> : std::true_type {};
+
+		template <typename T>
+		struct is_var_bind<readonly_wrapper<T>> : is_var_bind<meta::unqualified_t<T>> {};
+
+		template <typename F, typename... Policies>
+		struct is_var_bind<policy_wrapper<F, Policies...>> : is_var_bind<meta::unqualified_t<F>> {};
+	} // namespace call_detail
+
+	template <typename T>
+	struct is_variable_binding : call_detail::is_var_bind<meta::unqualified_t<T>> {};
+
+	template <typename T>
+	using is_var_wrapper = meta::is_specialization_of<T, var_wrapper>;
+
+	template <typename T>
+	struct is_function_binding : meta::neg<is_variable_binding<T>> {};
+
+} // namespace sol
+
+// end of sol/call.hpp
+
+namespace sol {
+	namespace function_detail {
+		template <typename F, F fx>
+		inline int call_wrapper_variable(std::false_type, lua_State* L) {
+			typedef meta::bind_traits<meta::unqualified_t<F>> traits_type;
+			typedef typename traits_type::args_list args_list;
+			typedef meta::tuple_types<typename traits_type::return_type> return_type;
+			return stack::call_into_lua(return_type(), args_list(), L, 1, fx);
+		}
+
+		template <typename R, typename V, V, typename T>
+		inline int call_set_assignable(std::false_type, T&&, lua_State* L) {
+			return luaL_error(L, "cannot write to this type: copy assignment/constructor not available");
+		}
+
+		template <typename R, typename V, V variable, typename T>
+		inline int call_set_assignable(std::true_type, lua_State* L, T&& mem) {
+			(mem.*variable) = stack::get<R>(L, 2);
+			return 0;
+		}
+
+		template <typename R, typename V, V, typename T>
+		inline int call_set_variable(std::false_type, lua_State* L, T&&) {
+			return luaL_error(L, "cannot write to a const variable");
+		}
+
+		template <typename R, typename V, V variable, typename T>
+		inline int call_set_variable(std::true_type, lua_State* L, T&& mem) {
+			return call_set_assignable<R, V, variable>(std::is_assignable<std::add_lvalue_reference_t<R>, R>(), L, std::forward<T>(mem));
+		}
+
+		template <typename V, V variable>
+		inline int call_wrapper_variable(std::true_type, lua_State* L) {
+			typedef meta::bind_traits<meta::unqualified_t<V>> traits_type;
+			typedef typename traits_type::object_type T;
+			typedef typename traits_type::return_type R;
+			auto& mem = stack::get<T>(L, 1);
+			switch (lua_gettop(L)) {
+			case 1: {
+				decltype(auto) r = (mem.*variable);
+				stack::push_reference(L, std::forward<decltype(r)>(r));
+				return 1;
+			}
+			case 2:
+				return call_set_variable<R, V, variable>(meta::neg<std::is_const<R>>(), L, mem);
+			default:
+				return luaL_error(L, "incorrect number of arguments to member variable function call");
+			}
+		}
+
+		template <typename F, F fx>
+		inline int call_wrapper_function(std::false_type, lua_State* L) {
+			return call_wrapper_variable<F, fx>(std::is_member_object_pointer<F>(), L);
+		}
+
+		template <typename F, F fx>
+		inline int call_wrapper_function(std::true_type, lua_State* L) {
+			return call_detail::call_wrapped<void, false, false>(L, fx);
+		}
+
+		template <typename F, F fx>
+		int call_wrapper_entry(lua_State* L) noexcept(meta::bind_traits<F>::is_noexcept) {
+			return call_wrapper_function<F, fx>(std::is_member_function_pointer<meta::unqualified_t<F>>(), L);
+		}
+
+		template <typename... Fxs>
+		struct c_call_matcher {
+			template <typename Fx, std::size_t I, typename R, typename... Args>
+			int operator()(types<Fx>, meta::index_value<I>, types<R>, types<Args...>, lua_State* L, int, int) const {
+				typedef meta::at_in_pack_t<I, Fxs...> target;
+				return target::call(L);
+			}
+		};
+
+		template <typename F, F fx>
+		inline int c_call_raw(std::true_type, lua_State* L) {
+			return fx(L);
+		}
+
+		template <typename F, F fx>
+		inline int c_call_raw(std::false_type, lua_State* L) {
+#ifdef __clang__
+			return detail::trampoline(L, function_detail::call_wrapper_entry<F, fx>);
+#else
+			return detail::typed_static_trampoline<decltype(&function_detail::call_wrapper_entry<F, fx>), (&function_detail::call_wrapper_entry<F, fx>)>(L);
+#endif // fuck you clang :c
+		}
+
+	} // namespace function_detail
+
+	template <typename F, F fx>
+	inline int c_call(lua_State* L) {
+		typedef meta::unqualified_t<F> Fu;
+		typedef std::integral_constant<bool,
+		     std::is_same<Fu, lua_CFunction>::value
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_)
+		          || std::is_same<Fu, detail::lua_CFunction_noexcept>::value
+#endif
+		     >
+		     is_raw;
+		return function_detail::c_call_raw<F, fx>(is_raw(), L);
+	}
+
+	template <typename F, F f>
+	struct wrap {
+		typedef F type;
+
+		static int call(lua_State* L) {
+			return c_call<type, f>(L);
+		}
+	};
+
+	template <typename... Fxs>
+	inline int c_call(lua_State* L) {
+		if constexpr (sizeof...(Fxs) < 2) {
+			using target = meta::at_in_pack_t<0, Fxs...>;
+			return target::call(L);
+		}
+		else {
+			return call_detail::overload_match_arity<typename Fxs::type...>(function_detail::c_call_matcher<Fxs...>(), L, lua_gettop(L), 1);
+		}
+	}
+
+} // namespace sol
+
+// end of sol/function_types_templated.hpp
+
+// beginning of sol/function_types_stateless.hpp
+
+namespace sol { namespace function_detail {
+	template <typename Function, bool is_yielding>
+	struct upvalue_free_function {
+		using function_type = std::remove_pointer_t<std::decay_t<Function>>;
+		using traits_type = meta::bind_traits<function_type>;
+
+		static int real_call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			auto udata = stack::stack_detail::get_as_upvalues<function_type*>(L);
+			function_type* fx = udata.first;
+			return call_detail::call_wrapped<void, true, false>(L, fx);
+		}
+
+		static int call(lua_State* L) {
+			int nr = detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L) {
+			return call(L);
+		}
+	};
+
+	template <typename T, typename Function, bool is_yielding>
+	struct upvalue_member_function {
+		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
+		typedef lua_bind_traits<function_type> traits_type;
+
+		static int real_call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			// Layout:
+			// idx 1...n: verbatim data of member function pointer
+			// idx n + 1: is the object's void pointer
+			// We don't need to store the size, because the other side is templated
+			// with the same member function pointer type
+			function_type& memfx = stack::get<user<function_type>>(L, upvalue_index(2));
+			auto& item = *static_cast<T*>(stack::get<void*>(L, upvalue_index(3)));
+			return call_detail::call_wrapped<T, true, false, -1>(L, memfx, item);
+		}
+
+		static int call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			int nr = detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L) {
+			return call(L);
+		}
+	};
+
+	template <typename T, typename Function, bool is_yielding>
+	struct upvalue_member_variable {
+		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
+		typedef lua_bind_traits<function_type> traits_type;
+
+		static int real_call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			// Layout:
+			// idx 1...n: verbatim data of member variable pointer
+			// idx n + 1: is the object's void pointer
+			// We don't need to store the size, because the other side is templated
+			// with the same member function pointer type
+			auto memberdata = stack::stack_detail::get_as_upvalues<function_type>(L);
+			auto objdata = stack::stack_detail::get_as_upvalues<T*>(L, memberdata.second);
+			auto& mem = *objdata.first;
+			function_type& var = memberdata.first;
+			switch (lua_gettop(L)) {
+			case 0:
+				return call_detail::call_wrapped<T, true, false, -1>(L, var, mem);
+			case 1:
+				return call_detail::call_wrapped<T, false, false, -1>(L, var, mem);
+			default:
+				return luaL_error(L, "sol: incorrect number of arguments to member variable function");
+			}
+		}
+
+		static int call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			int nr = detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L) {
+			return call(L);
+		}
+	};
+
+	template <typename T, typename Function, bool is_yielding>
+	struct upvalue_member_variable<T, readonly_wrapper<Function>, is_yielding> {
+		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
+		typedef lua_bind_traits<function_type> traits_type;
+
+		static int real_call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			// Layout:
+			// idx 1...n: verbatim data of member variable pointer
+			// idx n + 1: is the object's void pointer
+			// We don't need to store the size, because the other side is templated
+			// with the same member function pointer type
+			auto memberdata = stack::stack_detail::get_as_upvalues<function_type>(L);
+			auto objdata = stack::stack_detail::get_as_upvalues<T*>(L, memberdata.second);
+			auto& mem = *objdata.first;
+			function_type& var = memberdata.first;
+			switch (lua_gettop(L)) {
+			case 0:
+				return call_detail::call_wrapped<T, true, false, -1>(L, var, mem);
+			default:
+				return luaL_error(L, "sol: incorrect number of arguments to member variable function");
+			}
+		}
+
+		static int call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			int nr = detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L) {
+			return call(L);
+		}
+	};
+
+	template <typename T, typename Function, bool is_yielding>
+	struct upvalue_this_member_function {
+		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
+		typedef lua_bind_traits<function_type> traits_type;
+
+		static int real_call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			// Layout:
+			// idx 1...n: verbatim data of member variable pointer
+			function_type& memfx = stack::get<user<function_type>>(L, upvalue_index(2));
+			return call_detail::call_wrapped<T, false, false>(L, memfx);
+		}
+
+		static int call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			int nr = detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L) {
+			return call(L);
+		}
+	};
+
+	template <typename T, typename Function, bool is_yielding>
+	struct upvalue_this_member_variable {
+		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
+
+		static int real_call(lua_State* L) noexcept(false) {
+			// Layout:
+			// idx 1...n: verbatim data of member variable pointer
+			auto memberdata = stack::stack_detail::get_as_upvalues<function_type>(L);
+			function_type& var = memberdata.first;
+			switch (lua_gettop(L)) {
+			case 1:
+				return call_detail::call_wrapped<T, true, false>(L, var);
+			case 2:
+				return call_detail::call_wrapped<T, false, false>(L, var);
+			default:
+				return luaL_error(L, "sol: incorrect number of arguments to member variable function");
+			}
+		}
+
+		static int call(lua_State* L) {
+			int nr = detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L) {
+			return call(L);
+		}
+	};
+
+	template <typename T, typename Function, bool is_yielding>
+	struct upvalue_this_member_variable<T, readonly_wrapper<Function>, is_yielding> {
+		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
+		typedef lua_bind_traits<function_type> traits_type;
+
+		static int real_call(lua_State* L) noexcept(false) {
+			// Layout:
+			// idx 1...n: verbatim data of member variable pointer
+			auto memberdata = stack::stack_detail::get_as_upvalues<function_type>(L);
+			function_type& var = memberdata.first;
+			switch (lua_gettop(L)) {
+			case 1:
+				return call_detail::call_wrapped<T, true, false>(L, var);
+			default:
+				return luaL_error(L, "sol: incorrect number of arguments to member variable function");
+			}
+		}
+
+		static int call(lua_State* L) {
+			int nr = detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L) {
+			return call(L);
+		}
+	};
+}} // namespace sol::function_detail
+
+// end of sol/function_types_stateless.hpp
+
+// beginning of sol/function_types_stateful.hpp
+
+namespace sol {
+namespace function_detail {
+	template <typename Func, bool is_yielding, bool no_trampoline>
+	struct functor_function {
+		typedef std::decay_t<meta::unwrap_unqualified_t<Func>> function_type;
+		function_type fx;
+
+		template <typename... Args>
+		functor_function(function_type f, Args&&... args)
+		: fx(std::move(f), std::forward<Args>(args)...) {
+		}
+
+		int call(lua_State* L) {
+			int nr = call_detail::call_wrapped<void, true, false>(L, fx);
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L) {
+			if (!no_trampoline) {
+				auto f = [&](lua_State*) -> int { return this->call(L); };
+				return detail::trampoline(L, f);
+			}
+			else {
+				return call(L);
+			}
+		}
+	};
+
+	template <typename T, typename Function, bool is_yielding>
+	struct member_function {
+		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
+		typedef meta::function_return_t<function_type> return_type;
+		typedef meta::function_args_t<function_type> args_lists;
+		function_type invocation;
+		T member;
+
+		template <typename... Args>
+		member_function(function_type f, Args&&... args)
+		: invocation(std::move(f)), member(std::forward<Args>(args)...) {
+		}
+
+		int call(lua_State* L) {
+			int nr = call_detail::call_wrapped<T, true, false, -1>(L, invocation, detail::unwrap(detail::deref(member)));
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L) {
+			auto f = [&](lua_State*) -> int { return this->call(L); };
+			return detail::trampoline(L, f);
+		}
+	};
+
+	template <typename T, typename Function, bool is_yielding>
+	struct member_variable {
+		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
+		typedef typename meta::bind_traits<function_type>::return_type return_type;
+		typedef typename meta::bind_traits<function_type>::args_list args_lists;
+		function_type var;
+		T member;
+		typedef std::add_lvalue_reference_t<meta::unwrapped_t<std::remove_reference_t<decltype(detail::deref(member))>>> M;
+
+		template <typename... Args>
+		member_variable(function_type v, Args&&... args)
+		: var(std::move(v)), member(std::forward<Args>(args)...) {
+		}
+
+		int call(lua_State* L) {
+			int nr;
+			{
+				M mem = detail::unwrap(detail::deref(member));
+				switch (lua_gettop(L)) {
+				case 0:
+					nr = call_detail::call_wrapped<T, true, false, -1>(L, var, mem);
+					break;
+				case 1:
+					nr = call_detail::call_wrapped<T, false, false, -1>(L, var, mem);
+					break;
+				default:
+					nr = luaL_error(L, "sol: incorrect number of arguments to member variable function");
+					break;
+				}
+			}
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L) {
+			auto f = [&](lua_State*) -> int { return this->call(L); };
+			return detail::trampoline(L, f);
+		}
+	};
+}
+} // namespace sol::function_detail
+
+// end of sol/function_types_stateful.hpp
+
+// beginning of sol/function_types_overloaded.hpp
+
+namespace sol {
+namespace function_detail {
+	template <int start_skew, typename... Functions>
+	struct overloaded_function {
+		typedef std::tuple<Functions...> overload_list;
+		typedef std::make_index_sequence<sizeof...(Functions)> indices;
+		overload_list overloads;
+
+		overloaded_function(overload_list set)
+		: overloads(std::move(set)) {
+		}
+
+		overloaded_function(Functions... fxs)
+		: overloads(fxs...) {
+		}
+
+		template <typename Fx, std::size_t I, typename... R, typename... Args>
+		static int call(types<Fx>, meta::index_value<I>, types<R...>, types<Args...>, lua_State* L, int, int, overload_list& ol) {
+			auto& func = std::get<I>(ol);
+			int nr = call_detail::call_wrapped<void, true, false, start_skew>(L, func);
+			return nr;
+		}
+
+		int operator()(lua_State* L) {
+			auto mfx = [](auto&&... args) { return call(std::forward<decltype(args)>(args)...); };
+			return call_detail::overload_match<Functions...>(mfx, L, 1 + start_skew, overloads);
+		}
+	};
+}
+} // namespace sol::function_detail
+
+// end of sol/function_types_overloaded.hpp
+
+// beginning of sol/resolve.hpp
+
+namespace sol {
+
+#ifndef __clang__
+	// constexpr is fine for not-clang
+
+	namespace detail {
+		template <typename R, typename... Args, typename F, typename = std::invoke_result_t<meta::unqualified_t<F>, Args...>>
+		inline constexpr auto resolve_i(types<R(Args...)>, F &&) -> R (meta::unqualified_t<F>::*)(Args...) {
+			using Sig = R(Args...);
+			typedef meta::unqualified_t<F> Fu;
+			return static_cast<Sig Fu::*>(&Fu::operator());
+		}
+
+		template <typename F, typename U = meta::unqualified_t<F>>
+		inline constexpr auto resolve_f(std::true_type, F&& f)
+		     -> decltype(resolve_i(types<meta::function_signature_t<decltype(&U::operator())>>(), std::forward<F>(f))) {
+			return resolve_i(types<meta::function_signature_t<decltype(&U::operator())>>(), std::forward<F>(f));
+		}
+
+		template <typename F>
+		inline constexpr void resolve_f(std::false_type, F&&) {
+			static_assert(
+			     meta::has_deducible_signature<F>::value, "Cannot use no-template-parameter call with an overloaded functor: specify the signature");
+		}
+
+		template <typename F, typename U = meta::unqualified_t<F>>
+		inline constexpr auto resolve_i(types<>, F&& f) -> decltype(resolve_f(meta::has_deducible_signature<U>(), std::forward<F>(f))) {
+			return resolve_f(meta::has_deducible_signature<U> {}, std::forward<F>(f));
+		}
+
+		template <typename... Args, typename F, typename R = std::invoke_result_t<F&, Args...>>
+		inline constexpr auto resolve_i(types<Args...>, F&& f) -> decltype(resolve_i(types<R(Args...)>(), std::forward<F>(f))) {
+			return resolve_i(types<R(Args...)>(), std::forward<F>(f));
+		}
+
+		template <typename Sig, typename C>
+		inline constexpr Sig C::*resolve_v(std::false_type, Sig C::*mem_func_ptr) {
+			return mem_func_ptr;
+		}
+
+		template <typename Sig, typename C>
+		inline constexpr Sig C::*resolve_v(std::true_type, Sig C::*mem_variable_ptr) {
+			return mem_variable_ptr;
+		}
+	} // namespace detail
+
+	template <typename... Args, typename R>
+	inline constexpr auto resolve(R fun_ptr(Args...)) -> R (*)(Args...) {
+		return fun_ptr;
+	}
+
+	template <typename Sig>
+	inline constexpr Sig* resolve(Sig* fun_ptr) {
+		return fun_ptr;
+	}
+
+	template <typename... Args, typename R, typename C>
+	inline constexpr auto resolve(R (C::*mem_ptr)(Args...)) -> R (C::*)(Args...) {
+		return mem_ptr;
+	}
+
+	template <typename Sig, typename C>
+	inline constexpr Sig C::*resolve(Sig C::*mem_ptr) {
+		return detail::resolve_v(std::is_member_object_pointer<Sig C::*>(), mem_ptr);
+	}
+
+	template <typename... Sig, typename F, meta::disable<std::is_function<meta::unqualified_t<F>>> = meta::enabler>
+	inline constexpr auto resolve(F&& f) -> decltype(detail::resolve_i(types<Sig...>(), std::forward<F>(f))) {
+		return detail::resolve_i(types<Sig...>(), std::forward<F>(f));
+	}
+#else
+
+	// Clang has distinct problems with constexpr arguments,
+	// so don't use the constexpr versions inside of clang.
+
+	namespace detail {
+		template <typename R, typename... Args, typename F, typename = std::invoke_result_t<meta::unqualified_t<F>, Args...>>
+		inline auto resolve_i(types<R(Args...)>, F &&) -> R (meta::unqualified_t<F>::*)(Args...) {
+			using Sig = R(Args...);
+			typedef meta::unqualified_t<F> Fu;
+			return static_cast<Sig Fu::*>(&Fu::operator());
+		}
+
+		template <typename F, typename U = meta::unqualified_t<F>>
+		inline auto resolve_f(std::true_type, F&& f)
+		     -> decltype(resolve_i(types<meta::function_signature_t<decltype(&U::operator())>>(), std::forward<F>(f))) {
+			return resolve_i(types<meta::function_signature_t<decltype(&U::operator())>>(), std::forward<F>(f));
+		}
+
+		template <typename F>
+		inline void resolve_f(std::false_type, F&&) {
+			static_assert(
+			     meta::has_deducible_signature<F>::value, "Cannot use no-template-parameter call with an overloaded functor: specify the signature");
+		}
+
+		template <typename F, typename U = meta::unqualified_t<F>>
+		inline auto resolve_i(types<>, F&& f) -> decltype(resolve_f(meta::has_deducible_signature<U>(), std::forward<F>(f))) {
+			return resolve_f(meta::has_deducible_signature<U> {}, std::forward<F>(f));
+		}
+
+		template <typename... Args, typename F, typename R = std::invoke_result_t<F&, Args...>>
+		inline auto resolve_i(types<Args...>, F&& f) -> decltype(resolve_i(types<R(Args...)>(), std::forward<F>(f))) {
+			return resolve_i(types<R(Args...)>(), std::forward<F>(f));
+		}
+
+		template <typename Sig, typename C>
+		inline Sig C::*resolve_v(std::false_type, Sig C::*mem_func_ptr) {
+			return mem_func_ptr;
+		}
+
+		template <typename Sig, typename C>
+		inline Sig C::*resolve_v(std::true_type, Sig C::*mem_variable_ptr) {
+			return mem_variable_ptr;
+		}
+	} // namespace detail
+
+	template <typename... Args, typename R>
+	inline auto resolve(R fun_ptr(Args...)) -> R (*)(Args...) {
+		return fun_ptr;
+	}
+
+	template <typename Sig>
+	inline Sig* resolve(Sig* fun_ptr) {
+		return fun_ptr;
+	}
+
+	template <typename... Args, typename R, typename C>
+	inline auto resolve(R (C::*mem_ptr)(Args...)) -> R (C::*)(Args...) {
+		return mem_ptr;
+	}
+
+	template <typename Sig, typename C>
+	inline Sig C::*resolve(Sig C::*mem_ptr) {
+		return detail::resolve_v(std::is_member_object_pointer<Sig C::*>(), mem_ptr);
+	}
+
+	template <typename... Sig, typename F>
+	inline auto resolve(F&& f) -> decltype(detail::resolve_i(types<Sig...>(), std::forward<F>(f))) {
+		return detail::resolve_i(types<Sig...>(), std::forward<F>(f));
+	}
+
+#endif
+
+} // namespace sol
+
+// end of sol/resolve.hpp
+
+namespace sol {
+	namespace function_detail {
+		template <typename T>
+		struct class_indicator {
+			using type = T;
+		};
+
+		struct call_indicator { };
+
+		template <bool yielding>
+		int lua_c_wrapper(lua_State* L) {
+			lua_CFunction cf = lua_tocfunction(L, lua_upvalueindex(2));
+			int nr = cf(L);
+			if constexpr (yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		template <bool yielding>
+		int lua_c_noexcept_wrapper(lua_State* L) noexcept {
+			detail::lua_CFunction_noexcept cf = reinterpret_cast<detail::lua_CFunction_noexcept>(lua_tocfunction(L, lua_upvalueindex(2)));
+			int nr = cf(L);
+			if constexpr (yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		struct c_function_invocation { };
+
+		template <bool is_yielding, typename Fx, typename... Args>
+		void select(lua_State* L, Fx&& fx, Args&&... args);
+
+		template <bool is_yielding, bool no_trampoline, typename Fx, typename... Args>
+		void select_set_fx(lua_State* L, Args&&... args) {
+			lua_CFunction freefunc = no_trampoline ? detail::static_trampoline<function_detail::call<meta::unqualified_t<Fx>, 2, is_yielding>>
+			                                       : function_detail::call<meta::unqualified_t<Fx>, 2, is_yielding>;
+
+			int upvalues = 0;
+			upvalues += stack::push(L, nullptr);
+			upvalues += stack::push<user<Fx>>(L, std::forward<Args>(args)...);
+			stack::push(L, c_closure(freefunc, upvalues));
+		}
+
+		template <bool is_yielding, typename R, typename... A, typename Fx, typename... Args>
+		void select_convertible(types<R(A...)>, lua_State* L, Fx&& fx, Args&&... args) {
+			using dFx = std::decay_t<meta::unwrap_unqualified_t<Fx>>;
+			using fx_ptr_t = R (*)(A...);
+			constexpr bool is_convertible = std::is_convertible_v<dFx, fx_ptr_t>;
+			if constexpr (is_convertible) {
+				fx_ptr_t fxptr = detail::unwrap(std::forward<Fx>(fx));
+				select<is_yielding>(L, std::move(fxptr), std::forward<Args>(args)...);
+			}
+			else {
+				using F = function_detail::functor_function<dFx, false, true>;
+				select_set_fx<is_yielding, false, F>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+			}
+		}
+
+		template <bool is_yielding, typename Fx, typename... Args>
+		void select_convertible(types<>, lua_State* L, Fx&& fx, Args&&... args) {
+			typedef meta::function_signature_t<meta::unwrap_unqualified_t<Fx>> Sig;
+			select_convertible<is_yielding>(types<Sig>(), L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+		}
+
+		template <bool is_yielding, typename Fx, typename... Args>
+		void select_member_variable(lua_State* L, Fx&& fx, Args&&... args) {
+			using uFx = meta::unqualified_t<Fx>;
+			if constexpr (sizeof...(Args) < 1) {
+				using C = typename meta::bind_traits<uFx>::object_type;
+				lua_CFunction freefunc = &function_detail::upvalue_this_member_variable<C, Fx, is_yielding>::call;
+
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::stack_detail::push_as_upvalues(L, fx);
+				stack::push(L, c_closure(freefunc, upvalues));
+			}
+			else if constexpr (sizeof...(Args) < 2) {
+				using Tu = typename meta::meta_detail::unqualified_non_alias<Args...>::type;
+				constexpr bool is_reference = meta::is_specialization_of_v<Tu, std::reference_wrapper> || std::is_pointer_v<Tu>;
+				if constexpr (meta::is_specialization_of_v<Tu, function_detail::class_indicator>) {
+					lua_CFunction freefunc = &function_detail::upvalue_this_member_variable<typename Tu::type, Fx, is_yielding>::call;
+
+					int upvalues = 0;
+					upvalues += stack::push(L, nullptr);
+					upvalues += stack::stack_detail::push_as_upvalues(L, fx);
+					stack::push(L, c_closure(freefunc, upvalues));
+				}
+				else if constexpr (is_reference) {
+					typedef std::decay_t<Fx> dFx;
+					dFx memfxptr(std::forward<Fx>(fx));
+					auto userptr = detail::ptr(std::forward<Args>(args)...);
+					lua_CFunction freefunc
+					     = &function_detail::upvalue_member_variable<std::decay_t<decltype(*userptr)>, meta::unqualified_t<Fx>, is_yielding>::call;
+
+					int upvalues = 0;
+					upvalues += stack::push(L, nullptr);
+					upvalues += stack::stack_detail::push_as_upvalues(L, memfxptr);
+					upvalues += stack::push(L, static_cast<void const*>(userptr));
+					stack::push(L, c_closure(freefunc, upvalues));
+				}
+				else {
+					using clean_fx = std::remove_pointer_t<std::decay_t<Fx>>;
+					using F = function_detail::member_variable<Tu, clean_fx, is_yielding>;
+					select_set_fx<false, false, F>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+				}
+			}
+			else {
+				using C = typename meta::bind_traits<uFx>::object_type;
+				using clean_fx = std::remove_pointer_t<std::decay_t<Fx>>;
+				using F = function_detail::member_variable<C, clean_fx, is_yielding>;
+				select_set_fx<false, false, F>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+			}
+		}
+
+		template <bool is_yielding, typename Fx, typename T, typename... Args>
+		void select_member_function_with(lua_State* L, Fx&& fx, T&& obj, Args&&... args) {
+			using dFx = std::decay_t<Fx>;
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (meta::is_specialization_of_v<Tu, function_detail::class_indicator>) {
+				(void)obj;
+				using C = typename Tu::type;
+				lua_CFunction freefunc = &function_detail::upvalue_this_member_function<C, dFx, is_yielding>::call;
+
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<dFx>>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+				stack::push(L, c_closure(freefunc, upvalues));
+			}
+			else {
+				constexpr bool is_reference = meta::is_specialization_of_v<Tu, std::reference_wrapper> || std::is_pointer_v<Tu>;
+				if constexpr (is_reference) {
+					auto userptr = detail::ptr(std::forward<T>(obj));
+					lua_CFunction freefunc = &function_detail::upvalue_member_function<std::decay_t<decltype(*userptr)>, dFx, is_yielding>::call;
+
+					int upvalues = 0;
+					upvalues += stack::push(L, nullptr);
+					upvalues += stack::push<user<dFx>>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+					upvalues += stack::push(L, lightuserdata_value(static_cast<void*>(userptr)));
+					stack::push(L, c_closure(freefunc, upvalues));
+				}
+				else {
+					using F = function_detail::member_function<Tu, dFx, is_yielding>;
+					select_set_fx<false, false, F>(L, std::forward<Fx>(fx), std::forward<T>(obj), std::forward<Args>(args)...);
+				}
+			}
+		}
+
+		template <bool is_yielding, typename Fx, typename... Args>
+		void select_member_function(lua_State* L, Fx&& fx, Args&&... args) {
+			using dFx = std::decay_t<Fx>;
+			if constexpr (sizeof...(Args) < 1) {
+				using C = typename meta::bind_traits<meta::unqualified_t<Fx>>::object_type;
+				lua_CFunction freefunc = &function_detail::upvalue_this_member_function<C, dFx, is_yielding>::call;
+
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<dFx>>(L, std::forward<Fx>(fx));
+				stack::push(L, c_closure(freefunc, upvalues));
+			}
+			else {
+				select_member_function_with<is_yielding>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+			}
+		}
+
+		template <bool is_yielding, typename Fx, typename... Args>
+		void select(lua_State* L, Fx&& fx, Args&&... args) {
+			using uFx = meta::unqualified_t<Fx>;
+			if constexpr (is_lua_reference_v<uFx>) {
+				// TODO: hoist into lambda in this case for yielding???
+				stack::push(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+			}
+			else if constexpr (is_lua_c_function_v<uFx>) {
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push(L, std::forward<Fx>(fx));
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_)
+				if constexpr (std::is_nothrow_invocable_r_v<int, uFx, lua_State*>) {
+					detail::lua_CFunction_noexcept cf = &lua_c_noexcept_wrapper<is_yielding>;
+					lua_pushcclosure(L, reinterpret_cast<lua_CFunction>(cf), 2);
+				}
+				else {
+					lua_CFunction cf = &lua_c_wrapper<is_yielding>;
+					lua_pushcclosure(L, cf, 2);
+				}
+#else
+				lua_CFunction cf = &function_detail::lua_c_wrapper<is_yielding>;
+				lua_pushcclosure(L, cf, 2);
+#endif
+			}
+			else if constexpr (std::is_function_v<std::remove_pointer_t<uFx>>) {
+				std::decay_t<Fx> target(std::forward<Fx>(fx), std::forward<Args>(args)...);
+				lua_CFunction freefunc = &function_detail::upvalue_free_function<Fx, is_yielding>::call;
+
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::stack_detail::push_as_upvalues(L, target);
+				stack::push(L, c_closure(freefunc, upvalues));
+			}
+			else if constexpr (std::is_member_function_pointer_v<uFx>) {
+				select_member_function<is_yielding>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+			}
+			else if constexpr (meta::is_member_object_v<uFx>) {
+				select_member_variable<is_yielding>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+			}
+			else {
+				select_convertible<is_yielding>(types<>(), L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+			}
+		}
+	} // namespace function_detail
+
+	namespace stack {
+		template <typename... Sigs>
+		struct unqualified_pusher<function_sig<Sigs...>> {
+			template <bool is_yielding, typename Arg0, typename... Args>
+			static int push(lua_State* L, Arg0&& arg0, Args&&... args) {
+				if constexpr (meta::is_specialization_of_v<meta::unqualified_t<Arg0>, std::function>) {
+					if constexpr (is_yielding) {
+						return stack::push<meta::unqualified_t<Arg0>>(L, detail::yield_tag, std::forward<Arg0>(arg0), std::forward<Args>(args)...);
+					}
+					else {
+						return stack::push(L, std::forward<Arg0>(arg0), std::forward<Args>(args)...);
+					}
+				}
+				else {
+					function_detail::select<is_yielding>(L, std::forward<Arg0>(arg0), std::forward<Args>(args)...);
+					return 1;
+				}
+			}
+
+			template <typename Arg0, typename... Args>
+			static int push(lua_State* L, Arg0&& arg0, Args&&... args) {
+				if constexpr (std::is_same_v<meta::unqualified_t<Arg0>, detail::yield_tag_t>) {
+					push<true>(L, std::forward<Args>(args)...);
+				}
+				else if constexpr (meta::is_specialization_of_v<meta::unqualified_t<Arg0>, yielding_t>) {
+					push<true>(L, std::forward<Arg0>(arg0).func, std::forward<Args>(args)...);
+				}
+				else {
+					push<false>(L, std::forward<Arg0>(arg0), std::forward<Args>(args)...);
+				}
+				return 1;
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<yielding_t<T>> {
+			template <typename... Args>
+			static int push(lua_State* L, const yielding_t<T>& f, Args&&... args) {
+				if constexpr (meta::is_specialization_of_v<meta::unqualified_t<T>, std::function>) {
+					return stack::push<T>(L, detail::yield_tag, f.func, std::forward<Args>(args)...);
+				}
+				else {
+					function_detail::select<true>(L, f.func, std::forward<Args>(args)...);
+					return 1;
+				}
+			}
+
+			template <typename... Args>
+			static int push(lua_State* L, yielding_t<T>&& f, Args&&... args) {
+				if constexpr (meta::is_specialization_of_v<meta::unqualified_t<T>, std::function>) {
+					return stack::push<T>(L, detail::yield_tag, std::move(f.func), std::forward<Args>(args)...);
+				}
+				else {
+					function_detail::select<true>(L, std::move(f.func), std::forward<Args>(args)...);
+					return 1;
+				}
+			}
+		};
+
+		template <typename T, typename... Args>
+		struct unqualified_pusher<function_arguments<T, Args...>> {
+			template <std::size_t... I, typename FP>
+			static int push_func(std::index_sequence<I...>, lua_State* L, FP&& fp) {
+				return stack::push<T>(L, std::get<I>(std::forward<FP>(fp).arguments)...);
+			}
+
+			static int push(lua_State* L, const function_arguments<T, Args...>& fp) {
+				return push_func(std::make_index_sequence<sizeof...(Args)>(), L, fp);
+			}
+
+			static int push(lua_State* L, function_arguments<T, Args...>&& fp) {
+				return push_func(std::make_index_sequence<sizeof...(Args)>(), L, std::move(fp));
+			}
+		};
+
+		template <typename Signature>
+		struct unqualified_pusher<std::function<Signature>> {
+			static int push(lua_State* L, detail::yield_tag_t, const std::function<Signature>& fx) {
+				if (fx) {
+					function_detail::select<true>(L, fx);
+					return 1;
+				}
+				return stack::push(L, lua_nil);
+			}
+
+			static int push(lua_State* L, detail::yield_tag_t, std::function<Signature>&& fx) {
+				if (fx) {
+					function_detail::select<true>(L, std::move(fx));
+					return 1;
+				}
+				return stack::push(L, lua_nil);
+			}
+
+			static int push(lua_State* L, const std::function<Signature>& fx) {
+				if (fx) {
+					function_detail::select<false>(L, fx);
+					return 1;
+				}
+				return stack::push(L, lua_nil);
+			}
+
+			static int push(lua_State* L, std::function<Signature>&& fx) {
+				if (fx) {
+					function_detail::select<false>(L, std::move(fx));
+					return 1;
+				}
+				return stack::push(L, lua_nil);
+			}
+		};
+
+		template <typename Signature>
+		struct unqualified_pusher<Signature, std::enable_if_t<std::is_member_pointer<Signature>::value>> {
+			template <typename... Args>
+			static int push(lua_State* L, Args&&... args) {
+				function_detail::select<false>(L, std::forward<Args>(args)...);
+				return 1;
+			}
+		};
+
+		template <typename Signature>
+		struct unqualified_pusher<Signature,
+		     std::enable_if_t<meta::all<std::is_function<std::remove_pointer_t<Signature>>, meta::neg<std::is_same<Signature, lua_CFunction>>,
+		          meta::neg<std::is_same<Signature, std::remove_pointer_t<lua_CFunction>>>
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_)
+		          ,
+		          meta::neg<std::is_same<Signature, detail::lua_CFunction_noexcept>>,
+		          meta::neg<std::is_same<Signature, std::remove_pointer_t<detail::lua_CFunction_noexcept>>>
+#endif // noexcept function types
+		          >::value>> {
+			template <typename F>
+			static int push(lua_State* L, F&& f) {
+				function_detail::select<false>(L, std::forward<F>(f));
+				return 1;
+			}
+		};
+
+		template <typename... Functions>
+		struct unqualified_pusher<overload_set<Functions...>> {
+			static int push(lua_State* L, overload_set<Functions...>&& set) {
+				using F = function_detail::overloaded_function<0, Functions...>;
+				function_detail::select_set_fx<false, false, F>(L, std::move(set.functions));
+				return 1;
+			}
+
+			static int push(lua_State* L, const overload_set<Functions...>& set) {
+				using F = function_detail::overloaded_function<0, Functions...>;
+				function_detail::select_set_fx<false, false, F>(L, set.functions);
+				return 1;
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<protect_t<T>> {
+			static int push(lua_State* L, protect_t<T>&& pw) {
+				lua_CFunction cf = call_detail::call_user<void, false, false, protect_t<T>, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<protect_t<T>>>(L, std::move(pw.value));
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+
+			static int push(lua_State* L, const protect_t<T>& pw) {
+				lua_CFunction cf = call_detail::call_user<void, false, false, protect_t<T>, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<protect_t<T>>>(L, pw.value);
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+		};
+
+		template <typename F, typename G>
+		struct unqualified_pusher<property_wrapper<F, G>> {
+			static int push(lua_State* L, property_wrapper<F, G>&& pw) {
+				if constexpr (std::is_void_v<F>) {
+					return stack::push(L, std::move(pw.write()));
+				}
+				else if constexpr (std::is_void_v<G>) {
+					return stack::push(L, std::move(pw.read()));
+				}
+				else {
+					return stack::push(L, overload(std::move(pw.read()), std::move(pw.write())));
+				}
+			}
+
+			static int push(lua_State* L, const property_wrapper<F, G>& pw) {
+				if constexpr (std::is_void_v<F>) {
+					return stack::push(L, pw.write);
+				}
+				else if constexpr (std::is_void_v<G>) {
+					return stack::push(L, pw.read);
+				}
+				else {
+					return stack::push(L, overload(pw.read, pw.write));
+				}
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<var_wrapper<T>> {
+			static int push(lua_State* L, var_wrapper<T>&& vw) {
+				return stack::push(L, std::move(vw.value()));
+			}
+			static int push(lua_State* L, const var_wrapper<T>& vw) {
+				return stack::push(L, vw.value());
+			}
+		};
+
+		template <typename... Functions>
+		struct unqualified_pusher<factory_wrapper<Functions...>> {
+			static int push(lua_State* L, const factory_wrapper<Functions...>& fw) {
+				using F = function_detail::overloaded_function<0, Functions...>;
+				function_detail::select_set_fx<false, false, F>(L, fw.functions);
+				return 1;
+			}
+
+			static int push(lua_State* L, factory_wrapper<Functions...>&& fw) {
+				using F = function_detail::overloaded_function<0, Functions...>;
+				function_detail::select_set_fx<false, false, F>(L, std::move(fw.functions));
+				return 1;
+			}
+
+			static int push(lua_State* L, const factory_wrapper<Functions...>& fw, function_detail::call_indicator) {
+				using F = function_detail::overloaded_function<1, Functions...>;
+				function_detail::select_set_fx<false, false, F>(L, fw.functions);
+				return 1;
+			}
+
+			static int push(lua_State* L, factory_wrapper<Functions...>&& fw, function_detail::call_indicator) {
+				using F = function_detail::overloaded_function<1, Functions...>;
+				function_detail::select_set_fx<false, false, F>(L, std::move(fw.functions));
+				return 1;
+			}
+		};
+
+		template <>
+		struct unqualified_pusher<no_construction> {
+			static int push(lua_State* L, no_construction) {
+				lua_CFunction cf = &function_detail::no_construction_error;
+				return stack::push(L, cf);
+			}
+
+			static int push(lua_State* L, no_construction c, function_detail::call_indicator) {
+				return push(L, c);
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<detail::tagged<T, no_construction>> {
+			static int push(lua_State* L, detail::tagged<T, no_construction>) {
+				lua_CFunction cf = &function_detail::no_construction_error;
+				return stack::push(L, cf);
+			}
+
+			static int push(lua_State* L, no_construction c, function_detail::call_indicator) {
+				return push(L, c);
+			}
+		};
+
+		template <typename T, typename... Lists>
+		struct unqualified_pusher<detail::tagged<T, constructor_list<Lists...>>> {
+			static int push(lua_State* L, detail::tagged<T, constructor_list<Lists...>>) {
+				lua_CFunction cf = call_detail::construct<T, detail::default_safe_function_calls, true, Lists...>;
+				return stack::push(L, cf);
+			}
+
+			static int push(lua_State* L, constructor_list<Lists...>) {
+				lua_CFunction cf = call_detail::construct<T, detail::default_safe_function_calls, true, Lists...>;
+				return stack::push(L, cf);
+			}
+		};
+
+		template <typename L0, typename... Lists>
+		struct unqualified_pusher<constructor_list<L0, Lists...>> {
+			typedef constructor_list<L0, Lists...> cl_t;
+			static int push(lua_State* L, cl_t cl) {
+				typedef typename meta::bind_traits<L0>::return_type T;
+				return stack::push<detail::tagged<T, cl_t>>(L, cl);
+			}
+		};
+
+		template <typename T, typename... Fxs>
+		struct unqualified_pusher<detail::tagged<T, constructor_wrapper<Fxs...>>> {
+			static int push(lua_State* L, detail::tagged<T, constructor_wrapper<Fxs...>>&& c) {
+				return push(L, std::move(c.value()));
+			}
+
+			static int push(lua_State* L, const detail::tagged<T, const constructor_wrapper<Fxs...>>& c) {
+				return push(L, c.value());
+			}
+
+			static int push(lua_State* L, constructor_wrapper<Fxs...>&& c) {
+				lua_CFunction cf = call_detail::call_user<T, false, false, constructor_wrapper<Fxs...>, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<constructor_wrapper<Fxs...>>>(L, std::move(c));
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+
+			static int push(lua_State* L, const constructor_wrapper<Fxs...>& c) {
+				lua_CFunction cf = call_detail::call_user<T, false, false, constructor_wrapper<Fxs...>, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<constructor_wrapper<Fxs...>>>(L, c);
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+		};
+
+		template <typename F, typename... Fxs>
+		struct unqualified_pusher<constructor_wrapper<F, Fxs...>> {
+			static int push(lua_State* L, const constructor_wrapper<F, Fxs...>& c) {
+				typedef typename meta::bind_traits<F>::template arg_at<0> arg0;
+				typedef meta::unqualified_t<std::remove_pointer_t<arg0>> T;
+				return stack::push<detail::tagged<T, constructor_wrapper<F, Fxs...>>>(L, c);
+			}
+
+			static int push(lua_State* L, constructor_wrapper<F, Fxs...>&& c) {
+				typedef typename meta::bind_traits<F>::template arg_at<0> arg0;
+				typedef meta::unqualified_t<std::remove_pointer_t<arg0>> T;
+				return stack::push<detail::tagged<T, constructor_wrapper<F, Fxs...>>>(L, std::move(c));
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<detail::tagged<T, destructor_wrapper<void>>> {
+			static int push(lua_State* L, destructor_wrapper<void>) {
+				lua_CFunction cf = detail::usertype_alloc_destruct<T>;
+				return stack::push(L, cf);
+			}
+		};
+
+		template <typename T, typename Fx>
+		struct unqualified_pusher<detail::tagged<T, destructor_wrapper<Fx>>> {
+			static int push(lua_State* L, destructor_wrapper<Fx>&& c) {
+				lua_CFunction cf = call_detail::call_user<T, false, false, destructor_wrapper<Fx>, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<destructor_wrapper<Fx>>>(L, std::move(c));
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+
+			static int push(lua_State* L, const destructor_wrapper<Fx>& c) {
+				lua_CFunction cf = call_detail::call_user<T, false, false, destructor_wrapper<Fx>, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<destructor_wrapper<Fx>>>(L, c);
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+		};
+
+		template <typename Fx>
+		struct unqualified_pusher<destructor_wrapper<Fx>> {
+			static int push(lua_State* L, destructor_wrapper<Fx>&& c) {
+				lua_CFunction cf = call_detail::call_user<void, false, false, destructor_wrapper<Fx>, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<destructor_wrapper<Fx>>>(L, std::move(c));
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+
+			static int push(lua_State* L, const destructor_wrapper<Fx>& c) {
+				lua_CFunction cf = call_detail::call_user<void, false, false, destructor_wrapper<Fx>, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<destructor_wrapper<Fx>>>(L, c);
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+		};
+
+		template <typename F, typename... Policies>
+		struct unqualified_pusher<policy_wrapper<F, Policies...>> {
+			using P = policy_wrapper<F, Policies...>;
+
+			static int push(lua_State* L, const P& p) {
+				lua_CFunction cf = call_detail::call_user<void, false, false, P, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<P>>(L, p);
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+
+			static int push(lua_State* L, P&& p) {
+				lua_CFunction cf = call_detail::call_user<void, false, false, P, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<P>>(L, std::move(p));
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+		};
+
+		template <typename T, typename F, typename... Policies>
+		struct unqualified_pusher<detail::tagged<T, policy_wrapper<F, Policies...>>> {
+			using P = policy_wrapper<F, Policies...>;
+			using Tagged = detail::tagged<T, P>;
+
+			static int push(lua_State* L, const Tagged& p) {
+				lua_CFunction cf = call_detail::call_user<T, false, false, P, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<P>>(L, p.value());
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+
+			static int push(lua_State* L, Tagged&& p) {
+				lua_CFunction cf = call_detail::call_user<T, false, false, P, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<P>>(L, std::move(p.value()));
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<push_invoke_t<T>> {
+			static int push(lua_State* L, push_invoke_t<T>&& pi) {
+				if constexpr (std::is_invocable_v<std::add_rvalue_reference_t<T>, lua_State*>) {
+					return stack::push(L, std::move(pi.value())(L));
+				}
+				else {
+					return stack::push(L, std::move(pi.value())());
+				}
+			}
+
+			static int push(lua_State* L, const push_invoke_t<T>& pi) {
+				if constexpr (std::is_invocable_v<const T, lua_State*>) {
+					return stack::push(L, pi.value()(L));
+				}
+				else {
+					return stack::push(L, pi.value()());
+				}
+			}
+		};
+
+		namespace stack_detail {
+			template <typename Function, typename Handler>
+			bool check_function_pointer(lua_State* L, int index, Handler&& handler, record& tracking) noexcept {
+#if SOL_IS_ON(SOL_GET_FUNCTION_POINTER_UNSAFE_I_)
+				tracking.use(1);
+				bool success = lua_iscfunction(L, index) == 1;
+				if (success) {
+					// there must be at LEAST 2 upvalues; otherwise, we didn't serialize it.
+					const char* upvalue_name = lua_getupvalue(L, index, 2);
+					lua_pop(L, 1);
+					success = upvalue_name != nullptr;
+				}
+				if (!success) {
+					// expected type, actual type
+					handler(
+					     L, index, type::function, type_of(L, index), "type must be a Lua C Function gotten from a function pointer serialized by sol2");
+				}
+				return success;
+#else
+				return false;
+#endif
+			}
+
+			template <typename Function>
+			Function* get_function_pointer(lua_State* L, int index, record& tracking) noexcept {
+#if SOL_IS_ON(SOL_GET_FUNCTION_POINTER_UNSAFE_I_)
+				tracking.use(1);
+				auto udata = stack::stack_detail::get_as_upvalues_using_function<Function*>(L, index);
+				Function* fx = udata.first;
+				return fx;
+#else
+				static_assert(meta::meta_detail::always_true<Function>::value,
+#if SOL_IS_DEFAULT_OFF(SOL_GET_FUNCTION_POINTER_UNSAFE_I_)
+				     "You are attempting to retrieve a function pointer type. "
+				     "This is inherently unsafe in sol2. In order to do this, you must turn on the "
+				     "SOL_GET_FUNCTION_POINTER_UNSAFE configuration macro, as detailed in the documentation. "
+				     "Please be careful!"
+#else
+				     "You are attempting to retrieve a function pointer type. "
+				     "You explicitly turned off the ability to do this by defining "
+				     "SOL_GET_FUNCTION_POINTER_UNSAFE or similar to be off. "
+				     "Please reconsider this!"
+#endif
+				);
+				return nullptr;
+#endif
+			}
+		} // namespace stack_detail
+	}      // namespace stack
+} // namespace sol
+
+// end of sol/function_types.hpp
+
+// beginning of sol/dump_handler.hpp
+
+#include <cstdint>
+#include <exception>
+
+namespace sol {
+
+	class dump_error : public error {
+	private:
+		int ec_;
+
+	public:
+		dump_error(int error_code_) : error("dump returned non-zero error of " + std::to_string(error_code_)), ec_(error_code_) {
+		}
+
+		int error_code() const {
+			return ec_;
+		}
+	};
+
+	inline int dump_pass_on_error(lua_State* L, int result_code, lua_Writer writer_function, void* userdata, bool strip) {
+		(void)L;
+		(void)writer_function;
+		(void)userdata;
+		(void)strip;
+		return result_code;
+	}
+
+	inline int dump_panic_on_error(lua_State* L, int result_code, lua_Writer writer_function, void* userdata, bool strip) {
+		(void)L;
+		(void)writer_function;
+		(void)userdata;
+		(void)strip;
+		return luaL_error(L, "a non-zero error code (%d) was returned by the lua_Writer for the dump function", result_code);
+	}
+
+	inline int dump_throw_on_error(lua_State* L, int result_code, lua_Writer writer_function, void* userdata, bool strip) {
+#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
+		return dump_panic_on_error(L, result_code, writer_function, userdata, strip);
+#else
+		(void)L;
+		(void)writer_function;
+		(void)userdata;
+		(void)strip;
+		throw dump_error(result_code);
+#endif // no exceptions stuff
+	}
+
+} // namespace sol
+
+// end of sol/dump_handler.hpp
+
+#include <cstdint>
+
+namespace sol {
+	template <typename ref_t, bool aligned = false>
+	class basic_function : public basic_object<ref_t> {
+	private:
+		using base_t = basic_object<ref_t>;
+
+		void luacall(std::ptrdiff_t argcount, std::ptrdiff_t resultcount) const {
+			lua_call(lua_state(), static_cast<int>(argcount), static_cast<int>(resultcount));
+		}
+
+		template <std::size_t... I, typename... Ret>
+		auto invoke(types<Ret...>, std::index_sequence<I...>, std::ptrdiff_t n) const {
+			luacall(n, lua_size<std::tuple<Ret...>>::value);
+			return stack::pop<std::tuple<Ret...>>(lua_state());
+		}
+
+		template <std::size_t I, typename Ret, meta::enable<meta::neg<std::is_void<Ret>>> = meta::enabler>
+		Ret invoke(types<Ret>, std::index_sequence<I>, std::ptrdiff_t n) const {
+			luacall(n, lua_size<Ret>::value);
+			return stack::pop<Ret>(lua_state());
+		}
+
+		template <std::size_t I>
+		void invoke(types<void>, std::index_sequence<I>, std::ptrdiff_t n) const {
+			luacall(n, 0);
+		}
+
+		unsafe_function_result invoke(types<>, std::index_sequence<>, std::ptrdiff_t n) const {
+			int stacksize = lua_gettop(lua_state());
+			int firstreturn = (std::max)(1, stacksize - static_cast<int>(n));
+			luacall(n, LUA_MULTRET);
+			int poststacksize = lua_gettop(lua_state());
+			int returncount = poststacksize - (firstreturn - 1);
+			return unsafe_function_result(lua_state(), firstreturn, returncount);
+		}
+
+	public:
+		using base_t::lua_state;
+
+		basic_function() = default;
+		template <typename T, meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_function>>, meta::neg<std::is_same<base_t, stack_reference>>, meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_function(T&& r) noexcept
+		: base_t(std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			if (!is_function<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				constructor_handler handler{};
+				stack::check<basic_function>(lua_state(), -1, handler);
+			}
+#endif // Safety
+		}
+		basic_function(const basic_function&) = default;
+		basic_function& operator=(const basic_function&) = default;
+		basic_function(basic_function&&) = default;
+		basic_function& operator=(basic_function&&) = default;
+		basic_function(const stack_reference& r)
+		: basic_function(r.lua_state(), r.stack_index()) {
+		}
+		basic_function(stack_reference&& r)
+		: basic_function(r.lua_state(), r.stack_index()) {
+		}
+		basic_function(lua_nil_t n)
+		: base_t(n) {
+		}
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_function(lua_State* L, T&& r)
+		: base_t(L, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler{};
+			stack::check<basic_function>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		basic_function(lua_State* L, int index = -1)
+		: base_t(L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			constructor_handler handler{};
+			stack::check<basic_function>(L, index, handler);
+#endif // Safety
+		}
+		basic_function(lua_State* L, ref_index index)
+		: base_t(L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler{};
+			stack::check<basic_function>(lua_state(), -1, handler);
+#endif // Safety
+		}
+
+		template <typename Fx>
+		int dump(lua_Writer writer, void* userdata, bool strip, Fx&& on_error) const {
+			this->push();
+			auto ppn = stack::push_popper_n<false>(this->lua_state(), 1);
+			int r = lua_dump(this->lua_state(), writer, userdata, strip ? 1 : 0);
+			if (r != 0) {
+				return on_error(this->lua_state(), r, writer, userdata, strip);
+			}
+			return r;
+		}
+
+		int dump(lua_Writer writer, void* userdata, bool strip = false) const {
+			return dump(writer, userdata, strip, &dump_throw_on_error);
+		}
+
+		template <typename Container = bytecode>
+		Container dump() const {
+			Container bc;
+			(void)dump(static_cast<lua_Writer>(&basic_insert_dump_writer<Container>), static_cast<void*>(&bc), false, &dump_panic_on_error);
+			return bc;
+		}
+
+		template <typename Container = bytecode, typename Fx>
+		Container dump(Fx&& on_error) const {
+			Container bc;
+			(void)dump(static_cast<lua_Writer>(&basic_insert_dump_writer<Container>), static_cast<void*>(&bc), false, std::forward<Fx>(on_error));
+			return bc;
+		}
+
+		template <typename... Args>
+		unsafe_function_result operator()(Args&&... args) const {
+			return call<>(std::forward<Args>(args)...);
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) operator()(types<Ret...>, Args&&... args) const {
+			return call<Ret...>(std::forward<Args>(args)...);
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) call(Args&&... args) const {
+			if (!aligned) {
+				base_t::push();
+			}
+			int pushcount = stack::multi_push_reference(lua_state(), std::forward<Args>(args)...);
+			return invoke(types<Ret...>(), std::make_index_sequence<sizeof...(Ret)>(), static_cast<std::ptrdiff_t>(pushcount));
+		}
+	};
+} // namespace sol
+
+// end of sol/unsafe_function.hpp
+
+// beginning of sol/protected_function.hpp
+
+// beginning of sol/protected_handler.hpp
+
+#include <cstdint>
+
+namespace sol {
+	namespace detail {
+		inline const char(&default_handler_name())[9]{
+			static const char name[9] = "sol.\xF0\x9F\x94\xA9";
+			return name;
+		}
+
+		template <bool b, typename target_t = reference>
+		struct protected_handler {
+			typedef is_stack_based<target_t> is_stack;
+			const target_t& target;
+			int stackindex;
+
+			protected_handler(std::false_type, const target_t& target)
+				: target(target), stackindex(0) {
+				if (b) {
+					stackindex = lua_gettop(target.lua_state()) + 1;
+					target.push();
+				}
+			}
+
+			protected_handler(std::true_type, const target_t& target)
+				: target(target), stackindex(0) {
+				if (b) {
+					stackindex = target.stack_index();
+				}
+			}
+
+			protected_handler(const target_t& target)
+				: protected_handler(is_stack(), target) {
+			}
+
+			bool valid() const noexcept {
+				return b;
+			}
+
+			~protected_handler() {
+				if constexpr (!is_stack::value) {
+					if (stackindex != 0) {
+						lua_remove(target.lua_state(), stackindex);
+					}
+				}
+			}
+		};
+
+		template <typename base_t, typename T>
+		basic_function<base_t> force_cast(T& p) {
+			return p;
+		}
+
+		template <typename Reference, bool is_main_ref = false>
+		static Reference get_default_handler(lua_State* L) {
+			if (is_stack_based<Reference>::value || L == nullptr)
+				return Reference(L, lua_nil);
+			L = is_main_ref ? main_thread(L, L) : L;
+			lua_getglobal(L, default_handler_name());
+			auto pp = stack::pop_n(L, 1);
+			return Reference(L, -1);
+		}
+
+		template <typename T>
+		static void set_default_handler(lua_State* L, const T& ref) {
+			if (L == nullptr) {
+				return;
+			}
+			if (!ref.valid()) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+				luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+				lua_pushnil(L);
+				lua_setglobal(L, default_handler_name());
+			}
+			else {
+				ref.push(L);
+				lua_setglobal(L, default_handler_name());
+			}
+		}
+	} // namespace detail
+} // namespace sol
+
+// end of sol/protected_handler.hpp
+
+#include <cstdint>
+#include <algorithm>
+
+namespace sol {
+	
+	namespace detail {
+		template <bool b, typename handler_t>
+		inline void handle_protected_exception(lua_State* L, optional<const std::exception&> maybe_ex, const char* error, detail::protected_handler<b, handler_t>& h) {
+			h.stackindex = 0;
+			if (b) {
+				h.target.push();
+				detail::call_exception_handler(L, maybe_ex, error);
+				lua_call(L, 1, 1);
+			}
+			else {
+				detail::call_exception_handler(L, maybe_ex, error);
+			}
+		}
+	}
+
+	template <typename ref_t, bool aligned = false, typename handler_t = reference>
+	class basic_protected_function : public basic_object<ref_t> {
+	private:
+		using base_t = basic_object<ref_t>;
+
+	public:
+		using is_stack_handler = is_stack_based<handler_t>;
+
+		static handler_t get_default_handler(lua_State* L) {
+			return detail::get_default_handler<handler_t, is_main_threaded<base_t>::value>(L);
+		}
+
+		template <typename T>
+		static void set_default_handler(const T& ref) {
+			detail::set_default_handler(ref.lua_state(), ref);
+		}
+
+	private:
+		template <bool b>
+		call_status luacall(std::ptrdiff_t argcount, std::ptrdiff_t resultcount, detail::protected_handler<b, handler_t>& h) const {
+			return static_cast<call_status>(lua_pcall(lua_state(), static_cast<int>(argcount), static_cast<int>(resultcount), h.stackindex));
+		}
+
+		template <std::size_t... I, bool b, typename... Ret>
+		auto invoke(types<Ret...>, std::index_sequence<I...>, std::ptrdiff_t n, detail::protected_handler<b, handler_t>& h) const {
+			luacall(n, sizeof...(Ret), h);
+			return stack::pop<std::tuple<Ret...>>(lua_state());
+		}
+
+		template <std::size_t I, bool b, typename Ret>
+		Ret invoke(types<Ret>, std::index_sequence<I>, std::ptrdiff_t n, detail::protected_handler<b, handler_t>& h) const {
+			luacall(n, 1, h);
+			return stack::pop<Ret>(lua_state());
+		}
+
+		template <std::size_t I, bool b>
+		void invoke(types<void>, std::index_sequence<I>, std::ptrdiff_t n, detail::protected_handler<b, handler_t>& h) const {
+			luacall(n, 0, h);
+		}
+
+		template <bool b>
+		protected_function_result invoke(types<>, std::index_sequence<>, std::ptrdiff_t n, detail::protected_handler<b, handler_t>& h) const {
+			int stacksize = lua_gettop(lua_state());
+			int poststacksize = stacksize;
+			int firstreturn = 1;
+			int returncount = 0;
+			call_status code = call_status::ok;
+#if !defined(SOL_NO_EXCEPTIONS) || !SOL_NO_EXCEPTIONS
+#if (!defined(SOL_EXCEPTIONS_SAFE_PROPAGATION) || !SOL_NO_EXCEPTIONS_SAFE_PROPAGATION) || (defined(SOL_LUAJIT) && SOL_LUAJIT)
+			try {
+#endif // Safe Exception Propagation
+#endif // No Exceptions
+				firstreturn = (std::max)(1, static_cast<int>(stacksize - n - static_cast<int>(h.valid() && !is_stack_handler::value)));
+				code = luacall(n, LUA_MULTRET, h);
+				poststacksize = lua_gettop(lua_state()) - static_cast<int>(h.valid() && !is_stack_handler::value);
+				returncount = poststacksize - (firstreturn - 1);
+#ifndef SOL_NO_EXCEPTIONS
+#if (!defined(SOL_EXCEPTIONS_SAFE_PROPAGATION) || !SOL_NO_EXCEPTIONS_SAFE_PROPAGATION) || (defined(SOL_LUAJIT) && SOL_LUAJIT)
+			}
+			// Handle C++ errors thrown from C++ functions bound inside of lua
+			catch (const char* error) {
+				detail::handle_protected_exception(lua_state(), optional<const std::exception&>(nullopt), error, h);
+				firstreturn = lua_gettop(lua_state());
+				return protected_function_result(lua_state(), firstreturn, 0, 1, call_status::runtime);
+			}
+			catch (const std::string& error) {
+				detail::handle_protected_exception(lua_state(), optional<const std::exception&>(nullopt), error.c_str(), h);
+				firstreturn = lua_gettop(lua_state());
+				return protected_function_result(lua_state(), firstreturn, 0, 1, call_status::runtime);
+			}
+			catch (const std::exception& error) {
+				detail::handle_protected_exception(lua_state(), optional<const std::exception&>(error), error.what(), h);
+				firstreturn = lua_gettop(lua_state());
+				return protected_function_result(lua_state(), firstreturn, 0, 1, call_status::runtime);
+			}
+#if (!defined(SOL_EXCEPTIONS_SAFE_PROPAGATION) || !SOL_NO_EXCEPTIONS_SAFE_PROPAGATION)
+			// LuaJIT cannot have the catchall when the safe propagation is on
+			// but LuaJIT will swallow all C++ errors 
+			// if we don't at least catch std::exception ones
+			catch (...) {
+				detail::handle_protected_exception(lua_state(), optional<const std::exception&>(nullopt), detail::protected_function_error, h);
+				firstreturn = lua_gettop(lua_state());
+				return protected_function_result(lua_state(), firstreturn, 0, 1, call_status::runtime);
+			}
+#endif // LuaJIT
+#else
+			// do not handle exceptions: they can be propogated into C++ and keep all type information / rich information
+#endif // Safe Exception Propagation
+#endif // Exceptions vs. No Exceptions
+			return protected_function_result(lua_state(), firstreturn, returncount, returncount, code);
+		}
+
+	public:
+		using base_t::lua_state;
+
+		handler_t error_handler;
+
+		basic_protected_function() = default;
+		template <typename T, meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_protected_function>>, meta::neg<std::is_base_of<proxy_base_tag, meta::unqualified_t<T>>>, meta::neg<std::is_same<base_t, stack_reference>>, meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_protected_function(T&& r) noexcept
+		: base_t(std::forward<T>(r)), error_handler(get_default_handler(r.lua_state())) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			if (!is_function<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				constructor_handler handler{};
+				stack::check<basic_protected_function>(lua_state(), -1, handler);
+			}
+#endif // Safety
+		}
+		basic_protected_function(const basic_protected_function&) = default;
+		basic_protected_function& operator=(const basic_protected_function&) = default;
+		basic_protected_function(basic_protected_function&&) = default;
+		basic_protected_function& operator=(basic_protected_function&&) = default;
+		basic_protected_function(const basic_function<base_t>& b)
+		: basic_protected_function(b, get_default_handler(b.lua_state())) {
+		}
+		basic_protected_function(basic_function<base_t>&& b)
+		: basic_protected_function(std::move(b), get_default_handler(b.lua_state())) {
+		}
+		basic_protected_function(const basic_function<base_t>& b, handler_t eh)
+		: base_t(b), error_handler(std::move(eh)) {
+		}
+		basic_protected_function(basic_function<base_t>&& b, handler_t eh)
+		: base_t(std::move(b)), error_handler(std::move(eh)) {
+		}
+		basic_protected_function(const stack_reference& r)
+		: basic_protected_function(r.lua_state(), r.stack_index(), get_default_handler(r.lua_state())) {
+		}
+		basic_protected_function(stack_reference&& r)
+		: basic_protected_function(r.lua_state(), r.stack_index(), get_default_handler(r.lua_state())) {
+		}
+		basic_protected_function(const stack_reference& r, handler_t eh)
+		: basic_protected_function(r.lua_state(), r.stack_index(), std::move(eh)) {
+		}
+		basic_protected_function(stack_reference&& r, handler_t eh)
+		: basic_protected_function(r.lua_state(), r.stack_index(), std::move(eh)) {
+		}
+
+		template <typename Super>
+		basic_protected_function(const proxy_base<Super>& p)
+		: basic_protected_function(p, get_default_handler(p.lua_state())) {
+		}
+		template <typename Super>
+		basic_protected_function(proxy_base<Super>&& p)
+		: basic_protected_function(std::move(p), get_default_handler(p.lua_state())) {
+		}
+		template <typename Proxy, typename Handler, meta::enable<std::is_base_of<proxy_base_tag, meta::unqualified_t<Proxy>>, meta::neg<is_lua_index<meta::unqualified_t<Handler>>>> = meta::enabler>
+		basic_protected_function(Proxy&& p, Handler&& eh)
+		: basic_protected_function(detail::force_cast<base_t>(p), std::forward<Handler>(eh)) {
+		}
+
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_protected_function(lua_State* L, T&& r)
+		: basic_protected_function(L, std::forward<T>(r), get_default_handler(L)) {
+		}
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_protected_function(lua_State* L, T&& r, handler_t eh)
+		: base_t(L, std::forward<T>(r)), error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler{};
+			stack::check<basic_protected_function>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		
+		basic_protected_function(lua_nil_t n)
+			: base_t(n), error_handler(n) {
+		}
+
+		basic_protected_function(lua_State* L, int index = -1)
+		: basic_protected_function(L, index, get_default_handler(L)) {
+		}
+		basic_protected_function(lua_State* L, int index, handler_t eh)
+		: base_t(L, index), error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			constructor_handler handler{};
+			stack::check<basic_protected_function>(L, index, handler);
+#endif // Safety
+		}
+		basic_protected_function(lua_State* L, absolute_index index)
+		: basic_protected_function(L, index, get_default_handler(L)) {
+		}
+		basic_protected_function(lua_State* L, absolute_index index, handler_t eh)
+		: base_t(L, index), error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			constructor_handler handler{};
+			stack::check<basic_protected_function>(L, index, handler);
+#endif // Safety
+		}
+		basic_protected_function(lua_State* L, raw_index index)
+		: basic_protected_function(L, index, get_default_handler(L)) {
+		}
+		basic_protected_function(lua_State* L, raw_index index, handler_t eh)
+		: base_t(L, index), error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			constructor_handler handler{};
+			stack::check<basic_protected_function>(L, index, handler);
+#endif // Safety
+		}
+		basic_protected_function(lua_State* L, ref_index index)
+		: basic_protected_function(L, index, get_default_handler(L)) {
+		}
+		basic_protected_function(lua_State* L, ref_index index, handler_t eh)
+		: base_t(L, index), error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler{};
+			stack::check<basic_protected_function>(lua_state(), -1, handler);
+#endif // Safety
+		}
+
+		template <typename Fx>
+		int dump(lua_Writer writer, void* userdata, bool strip, Fx&& on_error) const {
+			this->push();
+			auto ppn = stack::push_popper_n<false>(this->lua_state(), 1);
+			int r = lua_dump(this->lua_state(), writer, userdata, strip ? 1 : 0);
+			if (r != 0) {
+				return on_error(this->lua_state(), r, writer, userdata, strip);
+			}
+			return r;
+		}
+
+		int dump(lua_Writer writer, void* userdata, bool strip = false) const {
+			return dump(writer, userdata, strip, &dump_pass_on_error);
+		}
+
+		template <typename Container = bytecode>
+		Container dump() const {
+			Container bc;
+			(void)dump(static_cast<lua_Writer>(&basic_insert_dump_writer<Container>), static_cast<void*>(&bc), false, &dump_throw_on_error);
+			return bc;
+		}
+
+		template <typename Container = bytecode, typename Fx>
+		Container dump(Fx&& on_error) const {
+			Container bc;
+			(void)dump(static_cast<lua_Writer>(&basic_insert_dump_writer<Container>), static_cast<void*>(&bc), false, std::forward<Fx>(on_error));
+			return bc;
+		}
+
+		template <typename... Args>
+		protected_function_result operator()(Args&&... args) const {
+			return call<>(std::forward<Args>(args)...);
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) operator()(types<Ret...>, Args&&... args) const {
+			return call<Ret...>(std::forward<Args>(args)...);
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) call(Args&&... args) const {
+			if constexpr (!aligned) {
+				// we do not expect the function to already be on the stack: push it
+				if (error_handler.valid()) {
+					detail::protected_handler<true, handler_t> h(error_handler);
+					base_t::push();
+					int pushcount = stack::multi_push_reference(lua_state(), std::forward<Args>(args)...);
+					return invoke(types<Ret...>(), std::make_index_sequence<sizeof...(Ret)>(), pushcount, h);
+				}
+				else {
+					detail::protected_handler<false, handler_t> h(error_handler);
+					base_t::push();
+					int pushcount = stack::multi_push_reference(lua_state(), std::forward<Args>(args)...);
+					return invoke(types<Ret...>(), std::make_index_sequence<sizeof...(Ret)>(), pushcount, h);
+				}
+			}
+			else {
+				// the function is already on the stack at the right location
+				if (error_handler.valid()) {
+					// the handler will be pushed onto the stack manually,
+					// since it's not already on the stack this means we need to push our own
+					// function on the stack too and swap things to be in-place
+					if constexpr (!is_stack_handler::value) {
+						// so, we need to remove the function at the top and then dump the handler out ourselves
+						base_t::push();
+					}
+					detail::protected_handler<true, handler_t> h(error_handler);
+					if constexpr (!is_stack_handler::value) {
+						lua_replace(lua_state(), -3);
+						h.stackindex = lua_absindex(lua_state(), -2);
+					}
+					int pushcount = stack::multi_push_reference(lua_state(), std::forward<Args>(args)...);
+					return invoke(types<Ret...>(), std::make_index_sequence<sizeof...(Ret)>(), pushcount, h);
+				}
+				else {
+					detail::protected_handler<false, handler_t> h(error_handler);
+					int pushcount = stack::multi_push_reference(lua_state(), std::forward<Args>(args)...);
+					return invoke(types<Ret...>(), std::make_index_sequence<sizeof...(Ret)>(), pushcount, h);
+				}
+			}
+		}
+	};
+} // namespace sol
+
+// end of sol/protected_function.hpp
+
+#include <functional>
+
+namespace sol {
+	template <typename... Ret, typename... Args>
+	decltype(auto) stack_proxy::call(Args&&... args) {
+		stack_function sf(this->lua_state(), this->stack_index());
+		return sf.template call<Ret...>(std::forward<Args>(args)...);
+	}
+
+	inline protected_function_result::protected_function_result(unsafe_function_result&& o) noexcept
+	: L(o.lua_state()), index(o.stack_index()), returncount(o.return_count()), popcount(o.return_count()), err(o.status()) {
+		// Must be manual, otherwise destructor will screw us
+		// return count being 0 is enough to keep things clean
+		// but we will be thorough
+		o.abandon();
+	}
+
+	inline protected_function_result& protected_function_result::operator=(unsafe_function_result&& o) noexcept {
+		L = o.lua_state();
+		index = o.stack_index();
+		returncount = o.return_count();
+		popcount = o.return_count();
+		err = o.status();
+		// Must be manual, otherwise destructor will screw us
+		// return count being 0 is enough to keep things clean
+		// but we will be thorough
+		o.abandon();
+		return *this;
+	}
+
+	inline unsafe_function_result::unsafe_function_result(protected_function_result&& o) noexcept
+	: L(o.lua_state()), index(o.stack_index()), returncount(o.return_count()) {
+		// Must be manual, otherwise destructor will screw us
+		// return count being 0 is enough to keep things clean
+		// but we will be thorough
+		o.abandon();
+	}
+	inline unsafe_function_result& unsafe_function_result::operator=(protected_function_result&& o) noexcept {
+		L = o.lua_state();
+		index = o.stack_index();
+		returncount = o.return_count();
+		// Must be manual, otherwise destructor will screw us
+		// return count being 0 is enough to keep things clean
+		// but we will be thorough
+		o.abandon();
+		return *this;
+	}
+
+	namespace detail {
+		template <typename... R>
+		struct std_shim {
+			unsafe_function lua_func_;
+
+			std_shim(unsafe_function lua_func) : lua_func_(std::move(lua_func)) {
+			}
+
+			template <typename... Args>
+			meta::return_type_t<R...> operator()(Args&&... args) {
+				return lua_func_.call<R...>(std::forward<Args>(args)...);
+			}
+		};
+
+		template <>
+		struct std_shim<void> {
+			unsafe_function lua_func_;
+
+			std_shim(unsafe_function lua_func) : lua_func_(std::move(lua_func)) {
+			}
+
+			template <typename... Args>
+			void operator()(Args&&... args) {
+				lua_func_.call<void>(std::forward<Args>(args)...);
+			}
+		};
+	} // namespace detail
+
+	namespace stack {
+		template <typename Signature>
+		struct unqualified_getter<std::function<Signature>> {
+			typedef meta::bind_traits<Signature> fx_t;
+			typedef typename fx_t::args_list args_lists;
+			typedef meta::tuple_types<typename fx_t::return_type> return_types;
+
+			template <typename... R>
+			static std::function<Signature> get_std_func(types<R...>, lua_State* L, int index) {
+				detail::std_shim<R...> fx(unsafe_function(L, index));
+				return fx;
+			}
+
+			static std::function<Signature> get(lua_State* L, int index, record& tracking) {
+				tracking.use(1);
+				type t = type_of(L, index);
+				if (t == type::none || t == type::lua_nil) {
+					return nullptr;
+				}
+				return get_std_func(return_types(), L, index);
+			}
+		};
+
+		template <typename Allocator>
+		struct unqualified_getter<basic_bytecode<Allocator>> {
+			static basic_bytecode<Allocator> get(lua_State* L, int index, record& tracking) {
+				tracking.use(1);
+				stack_function sf(L, index);
+				return sf.dump(&dump_panic_on_error);
+			}
+		};
+	} // namespace stack
+
+} // namespace sol
+
+// end of sol/function.hpp
+
+// beginning of sol/usertype.hpp
+
+// beginning of sol/usertype_core.hpp
+
+// beginning of sol/deprecate.hpp
+
+#ifndef SOL_DEPRECATED
+#ifdef _MSC_VER
+#define SOL_DEPRECATED __declspec(deprecated)
+#elif __GNUC__
+#define SOL_DEPRECATED __attribute__((deprecated))
+#else
+#define SOL_DEPRECATED [[deprecated]]
+#endif // compilers
+#endif // SOL_DEPRECATED
+
+namespace sol {
+namespace detail {
+	template <typename T>
+	struct SOL_DEPRECATED deprecate_type {
+		using type = T;
+	};
+}
+} // namespace sol::detail
+
+// end of sol/deprecate.hpp
+
+// beginning of sol/usertype_container_launch.hpp
+
+// beginning of sol/usertype_container.hpp
+
+namespace sol {
+
+	template <typename T>
+	struct usertype_container;
+
+	namespace container_detail {
+
+		template <typename T>
+		struct has_clear_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::clear));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_empty_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::empty));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_erase_after_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(
+			     decltype(std::declval<C>().erase_after(std::declval<std::add_rvalue_reference_t<typename C::const_iterator>>()))*);
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T, typename = void>
+		struct has_find_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(std::declval<C>().find(std::declval<std::add_rvalue_reference_t<typename C::value_type>>()))*);
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_find_test<T, std::enable_if_t<meta::is_lookup<T>::value>> {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(std::declval<C>().find(std::declval<std::add_rvalue_reference_t<typename C::key_type>>()))*);
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_erase_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(std::declval<C>().erase(std::declval<typename C::iterator>()))*);
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_erase_key_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(std::declval<C>().erase(std::declval<typename C::key_type>()))*);
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_find_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::find));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_index_of_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::index_of));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_insert_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::insert));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_erase_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::erase));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_index_set_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::index_set));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_index_get_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::index_get));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_set_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::set));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_get_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::get));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_at_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::at));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_pairs_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::pairs));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_ipairs_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::ipairs));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_next_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::next));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_add_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::add));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_size_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::size));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		using has_clear = meta::boolean<has_clear_test<T>::value>;
+
+		template <typename T>
+		using has_empty = meta::boolean<has_empty_test<T>::value>;
+
+		template <typename T>
+		using has_find = meta::boolean<has_find_test<T>::value>;
+
+		template <typename T>
+		using has_erase = meta::boolean<has_erase_test<T>::value>;
+
+		template <typename T>
+		using has_erase_key = meta::boolean<has_erase_key_test<T>::value>;
+
+		template <typename T>
+		using has_erase_after = meta::boolean<has_erase_after_test<T>::value>;
+
+		template <typename T>
+		using has_traits_get = meta::boolean<has_traits_get_test<T>::value>;
+
+		template <typename T>
+		using has_traits_at = meta::boolean<has_traits_at_test<T>::value>;
+
+		template <typename T>
+		using has_traits_set = meta::boolean<has_traits_set_test<T>::value>;
+
+		template <typename T>
+		using has_traits_index_get = meta::boolean<has_traits_index_get_test<T>::value>;
+
+		template <typename T>
+		using has_traits_index_set = meta::boolean<has_traits_index_set_test<T>::value>;
+
+		template <typename T>
+		using has_traits_pairs = meta::boolean<has_traits_pairs_test<T>::value>;
+
+		template <typename T>
+		using has_traits_ipairs = meta::boolean<has_traits_ipairs_test<T>::value>;
+
+		template <typename T>
+		using has_traits_next = meta::boolean<has_traits_next_test<T>::value>;
+
+		template <typename T>
+		using has_traits_add = meta::boolean<has_traits_add_test<T>::value>;
+
+		template <typename T>
+		using has_traits_size = meta::boolean<has_traits_size_test<T>::value>;
+
+		template <typename T>
+		using has_traits_clear = has_clear<T>;
+
+		template <typename T>
+		using has_traits_empty = has_empty<T>;
+
+		template <typename T>
+		using has_traits_find = meta::boolean<has_traits_find_test<T>::value>;
+
+		template <typename T>
+		using has_traits_index_of = meta::boolean<has_traits_index_of_test<T>::value>;
+
+		template <typename T>
+		using has_traits_insert = meta::boolean<has_traits_insert_test<T>::value>;
+
+		template <typename T>
+		using has_traits_erase = meta::boolean<has_traits_erase_test<T>::value>;
+
+		template <typename T>
+		struct is_forced_container : is_container<T> {};
+
+		template <typename T>
+		struct is_forced_container<as_container_t<T>> : std::true_type {};
+
+		template <typename T>
+		struct container_decay {
+			typedef T type;
+		};
+
+		template <typename T>
+		struct container_decay<as_container_t<T>> {
+			typedef T type;
+		};
+
+		template <typename T>
+		using container_decay_t = typename container_decay<meta::unqualified_t<T>>::type;
+
+		template <typename T>
+		decltype(auto) get_key(std::false_type, T&& t) {
+			return std::forward<T>(t);
+		}
+
+		template <typename T>
+		decltype(auto) get_key(std::true_type, T&& t) {
+			return t.first;
+		}
+
+		template <typename T>
+		decltype(auto) get_value(std::false_type, T&& t) {
+			return std::forward<T>(t);
+		}
+
+		template <typename T>
+		decltype(auto) get_value(std::true_type, T&& t) {
+			return t.second;
+		}
+
+		template <typename X, typename = void>
+		struct usertype_container_default {
+		private:
+			typedef std::remove_pointer_t<meta::unwrap_unqualified_t<X>> T;
+
+		public:
+			typedef lua_nil_t iterator;
+			typedef lua_nil_t value_type;
+
+			static int at(lua_State* L) {
+				return luaL_error(L, "sol: cannot call 'at(index)' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int get(lua_State* L) {
+				return luaL_error(L, "sol: cannot call 'get(key)' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int index_get(lua_State* L) {
+				return luaL_error(L, "sol: cannot call 'container[key]' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int set(lua_State* L) {
+				return luaL_error(L, "sol: cannot call 'set(key, value)' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int index_set(lua_State* L) {
+				return luaL_error(
+				     L, "sol: cannot call 'container[key] = value' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int add(lua_State* L) {
+				return luaL_error(L, "sol: cannot call 'add' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int insert(lua_State* L) {
+				return luaL_error(L, "sol: cannot call 'insert' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int find(lua_State* L) {
+				return luaL_error(L, "sol: cannot call 'find' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int index_of(lua_State* L) {
+				return luaL_error(L, "sol: cannot call 'index_of' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int size(lua_State* L) {
+				return luaL_error(L, "sol: cannot call 'end' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int clear(lua_State* L) {
+				return luaL_error(L, "sol: cannot call 'clear' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int empty(lua_State* L) {
+				return luaL_error(L, "sol: cannot call 'empty' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int erase(lua_State* L) {
+				return luaL_error(L, "sol: cannot call 'erase' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int next(lua_State* L) {
+				return luaL_error(L, "sol: cannot call 'next' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int pairs(lua_State* L) {
+				return luaL_error(L, "sol: cannot call '__pairs/pairs' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int ipairs(lua_State* L) {
+				return luaL_error(L, "sol: cannot call '__ipairs' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static iterator begin(lua_State* L, T&) {
+				luaL_error(L, "sol: cannot call 'being' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+				return lua_nil;
+			}
+
+			static iterator end(lua_State* L, T&) {
+				luaL_error(L, "sol: cannot call 'end' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+				return lua_nil;
+			}
+		};
+
+		template <typename X>
+		struct usertype_container_default<X,
+		     std::enable_if_t<meta::all<is_forced_container<meta::unqualified_t<X>>, meta::has_value_type<meta::unqualified_t<container_decay_t<X>>>,
+		          meta::has_iterator<meta::unqualified_t<container_decay_t<X>>>>::value>> {
+		private:
+			using T = std::remove_pointer_t<meta::unwrap_unqualified_t<container_decay_t<X>>>;
+
+		private:
+			using deferred_uc = usertype_container<X>;
+			using is_associative = meta::is_associative<T>;
+			using is_lookup = meta::is_lookup<T>;
+			using is_ordered = meta::is_ordered<T>;
+			using is_matched_lookup = meta::is_matched_lookup<T>;
+			using iterator = typename T::iterator;
+			using value_type = typename T::value_type;
+			typedef meta::conditional_t<is_matched_lookup::value, std::pair<value_type, value_type>,
+			     meta::conditional_t<is_associative::value || is_lookup::value, value_type, std::pair<std::ptrdiff_t, value_type>>>
+			     KV;
+			typedef typename KV::first_type K;
+			typedef typename KV::second_type V;
+			typedef meta::conditional_t<is_matched_lookup::value, std::ptrdiff_t, K> next_K;
+			typedef decltype(*std::declval<iterator&>()) iterator_return;
+			typedef meta::conditional_t<is_associative::value || is_matched_lookup::value, std::add_lvalue_reference_t<V>,
+			     meta::conditional_t<is_lookup::value, V, iterator_return>>
+			     captured_type;
+			typedef typename meta::iterator_tag<iterator>::type iterator_category;
+			typedef std::is_same<iterator_category, std::input_iterator_tag> is_input_iterator;
+			typedef meta::conditional_t<is_input_iterator::value, V, decltype(detail::deref_move_only(std::declval<captured_type>()))> push_type;
+			typedef std::is_copy_assignable<V> is_copyable;
+			typedef meta::neg<meta::any<std::is_const<V>, std::is_const<std::remove_reference_t<iterator_return>>, meta::neg<is_copyable>>> is_writable;
+			typedef meta::unqualified_t<decltype(get_key(is_associative(), std::declval<std::add_lvalue_reference_t<value_type>>()))> key_type;
+			typedef meta::all<std::is_integral<K>, meta::neg<meta::any<is_associative, is_lookup>>> is_linear_integral;
+
+			struct iter {
+				T& source;
+				iterator it;
+				std::size_t i;
+
+				iter(T& source, iterator it) : source(source), it(std::move(it)), i(0) {
+				}
+
+				~iter() {
+				}
+			};
+
+			static auto& get_src(lua_State* L) {
+#if SOL_IS_ON(SOL_SAFE_USERTYPE_I_)
+				auto p = stack::unqualified_check_get<T*>(L, 1);
+				if (!p) {
+					luaL_error(L,
+					     "sol: 'self' is not of type '%s' (pass 'self' as first argument with ':' or call on proper type)",
+					     detail::demangle<T>().c_str());
+				}
+				if (p.value() == nullptr) {
+					luaL_error(
+					     L, "sol: 'self' argument is nil (pass 'self' as first argument with ':' or call on a '%s' type)", detail::demangle<T>().c_str());
+				}
+				return *p.value();
+#else
+				return stack::unqualified_get<T>(L, 1);
+#endif // Safe getting with error
+			}
+
+			static detail::error_result at_category(std::input_iterator_tag, lua_State* L, T& self, std::ptrdiff_t pos) {
+				pos += deferred_uc::index_adjustment(L, self);
+				if (pos < 0) {
+					return stack::push(L, lua_nil);
+				}
+				auto it = deferred_uc::begin(L, self);
+				auto e = deferred_uc::end(L, self);
+				if (it == e) {
+					return stack::push(L, lua_nil);
+				}
+				while (pos > 0) {
+					--pos;
+					++it;
+					if (it == e) {
+						return stack::push(L, lua_nil);
+					}
+				}
+				return get_associative(is_associative(), L, it);
+			}
+
+			static detail::error_result at_category(std::random_access_iterator_tag, lua_State* L, T& self, std::ptrdiff_t pos) {
+				std::ptrdiff_t len = static_cast<std::ptrdiff_t>(size_start(L, self));
+				pos += deferred_uc::index_adjustment(L, self);
+				if (pos < 0 || pos >= len) {
+					return stack::push(L, lua_nil);
+				}
+				auto it = std::next(deferred_uc::begin(L, self), pos);
+				return get_associative(is_associative(), L, it);
+			}
+
+			static detail::error_result at_start(lua_State* L, T& self, std::ptrdiff_t pos) {
+				return at_category(iterator_category(), L, self, pos);
+			}
+
+			template <typename Iter>
+			static detail::error_result get_associative(std::true_type, lua_State* L, Iter& it) {
+				decltype(auto) v = *it;
+				return stack::stack_detail::push_reference<push_type>(L, detail::deref_move_only(v.second));
+			}
+
+			template <typename Iter>
+			static detail::error_result get_associative(std::false_type, lua_State* L, Iter& it) {
+				return stack::stack_detail::push_reference<push_type>(L, detail::deref_move_only(*it));
+			}
+
+			static detail::error_result get_category(std::input_iterator_tag, lua_State* L, T& self, K& key) {
+				key += deferred_uc::index_adjustment(L, self);
+				if (key < 0) {
+					return stack::push(L, lua_nil);
+				}
+				auto it = deferred_uc::begin(L, self);
+				auto e = deferred_uc::end(L, self);
+				if (it == e) {
+					return stack::push(L, lua_nil);
+				}
+				while (key > 0) {
+					--key;
+					++it;
+					if (it == e) {
+						return stack::push(L, lua_nil);
+					}
+				}
+				return get_associative(is_associative(), L, it);
+			}
+
+			static detail::error_result get_category(std::random_access_iterator_tag, lua_State* L, T& self, K& key) {
+				std::ptrdiff_t len = static_cast<std::ptrdiff_t>(size_start(L, self));
+				key += deferred_uc::index_adjustment(L, self);
+				if (key < 0 || key >= len) {
+					return stack::push(L, lua_nil);
+				}
+				auto it = std::next(deferred_uc::begin(L, self), key);
+				return get_associative(is_associative(), L, it);
+			}
+
+			static detail::error_result get_it(std::true_type, lua_State* L, T& self, K& key) {
+				return get_category(iterator_category(), L, self, key);
+			}
+
+			static detail::error_result get_comparative(std::true_type, lua_State* L, T& self, K& key) {
+				auto fx = [&](const value_type& r) -> bool { return key == get_key(is_associative(), r); };
+				auto e = deferred_uc::end(L, self);
+				auto it = std::find_if(deferred_uc::begin(L, self), e, std::ref(fx));
+				if (it == e) {
+					return stack::push(L, lua_nil);
+				}
+				return get_associative(is_associative(), L, it);
+			}
+
+			static detail::error_result get_comparative(std::false_type, lua_State*, T&, K&) {
+				return detail::error_result("cannot get this key on '%s': no suitable way to increment iterator and compare to key value '%s'",
+				     detail::demangle<T>().data(),
+				     detail::demangle<K>().data());
+			}
+
+			static detail::error_result get_it(std::false_type, lua_State* L, T& self, K& key) {
+				return get_comparative(meta::supports_op_equal<K, key_type>(), L, self, key);
+			}
+
+			static detail::error_result set_associative(std::true_type, iterator& it, stack_object value) {
+				decltype(auto) v = *it;
+				v.second = value.as<V>();
+				return {};
+			}
+
+			static detail::error_result set_associative(std::false_type, iterator& it, stack_object value) {
+				decltype(auto) v = *it;
+				v = value.as<V>();
+				return {};
+			}
+
+			static detail::error_result set_writable(std::true_type, lua_State*, T&, iterator& it, stack_object value) {
+				return set_associative(is_associative(), it, std::move(value));
+			}
+
+			static detail::error_result set_writable(std::false_type, lua_State*, T&, iterator&, stack_object) {
+				return detail::error_result(
+				     "cannot perform a 'set': '%s's iterator reference is not writable (non-copy-assignable or const)", detail::demangle<T>().data());
+			}
+
+			static detail::error_result set_category(std::input_iterator_tag, lua_State* L, T& self, stack_object okey, stack_object value) {
+				decltype(auto) key = okey.as<K>();
+				key += deferred_uc::index_adjustment(L, self);
+				auto e = deferred_uc::end(L, self);
+				auto it = deferred_uc::begin(L, self);
+				auto backit = it;
+				for (; key > 0 && it != e; --key, ++it) {
+					backit = it;
+				}
+				if (it == e) {
+					if (key == 0) {
+						return add_copyable(is_copyable(), L, self, std::move(value), meta::has_insert_after<T>::value ? backit : it);
+					}
+					return detail::error_result("out of bounds (too big) for set on '%s'", detail::demangle<T>().c_str());
+				}
+				return set_writable(is_writable(), L, self, it, std::move(value));
+			}
+
+			static detail::error_result set_category(std::random_access_iterator_tag, lua_State* L, T& self, stack_object okey, stack_object value) {
+				decltype(auto) key = okey.as<K>();
+				key += deferred_uc::index_adjustment(L, self);
+				if (key < 0) {
+					return detail::error_result("sol: out of bounds (too small) for set on '%s'", detail::demangle<T>().c_str());
+				}
+				std::ptrdiff_t len = static_cast<std::ptrdiff_t>(size_start(L, self));
+				if (key == len) {
+					return add_copyable(is_copyable(), L, self, std::move(value));
+				}
+				else if (key >= len) {
+					return detail::error_result("sol: out of bounds (too big) for set on '%s'", detail::demangle<T>().c_str());
+				}
+				auto it = std::next(deferred_uc::begin(L, self), key);
+				return set_writable(is_writable(), L, self, it, std::move(value));
+			}
+
+			static detail::error_result set_comparative(std::true_type, lua_State* L, T& self, stack_object okey, stack_object value) {
+				decltype(auto) key = okey.as<K>();
+				if (!is_writable::value) {
+					return detail::error_result(
+					     "cannot perform a 'set': '%s's iterator reference is not writable (non-copy-assignable or const)", detail::demangle<T>().data());
+				}
+				auto fx = [&](const value_type& r) -> bool { return key == get_key(is_associative(), r); };
+				auto e = deferred_uc::end(L, self);
+				auto it = std::find_if(deferred_uc::begin(L, self), e, std::ref(fx));
+				if (it == e) {
+					return {};
+				}
+				return set_writable(is_writable(), L, self, it, std::move(value));
+			}
+
+			static detail::error_result set_comparative(std::false_type, lua_State*, T&, stack_object, stack_object) {
+				return detail::error_result("cannot set this value on '%s': no suitable way to increment iterator or compare to '%s' key",
+				     detail::demangle<T>().data(),
+				     detail::demangle<K>().data());
+			}
+
+			template <typename Iter>
+			static detail::error_result set_associative_insert(std::true_type, lua_State*, T& self, Iter& it, K& key, stack_object value) {
+				if constexpr (meta::has_insert<T>::value) {
+					self.insert(it, value_type(key, value.as<V>()));
+					return {};
+				}
+				else {
+					(void)self;
+					(void)it;
+					(void)key;
+					return detail::error_result(
+					     "cannot call 'set' on '%s': there is no 'insert' function on this associative type", detail::demangle<T>().c_str());
+				}
+			}
+
+			template <typename Iter>
+			static detail::error_result set_associative_insert(std::false_type, lua_State*, T& self, Iter& it, K& key, stack_object) {
+				if constexpr (meta::has_insert<T>::value) {
+					self.insert(it, key);
+					return {};
+				}
+				else {
+					(void)self;
+					(void)it;
+					(void)key;
+					return detail::error_result(
+					     "cannot call 'set' on '%s': there is no 'insert' function on this non-associative type", detail::demangle<T>().c_str());
+				}
+			}
+
+			static detail::error_result set_associative_find(std::true_type, lua_State* L, T& self, stack_object okey, stack_object value) {
+				decltype(auto) key = okey.as<K>();
+				auto it = self.find(key);
+				if (it == deferred_uc::end(L, self)) {
+					return set_associative_insert(is_associative(), L, self, it, key, std::move(value));
+				}
+				return set_writable(is_writable(), L, self, it, std::move(value));
+			}
+
+			static detail::error_result set_associative_find(std::false_type, lua_State* L, T& self, stack_object key, stack_object value) {
+				return set_comparative(meta::supports_op_equal<K, key_type>(), L, self, std::move(key), std::move(value));
+			}
+
+			static detail::error_result set_it(std::true_type, lua_State* L, T& self, stack_object key, stack_object value) {
+				return set_category(iterator_category(), L, self, std::move(key), std::move(value));
+			}
+
+			static detail::error_result set_it(std::false_type, lua_State* L, T& self, stack_object key, stack_object value) {
+				return set_associative_find(meta::all<has_find<T>, meta::any<is_associative, is_lookup>>(), L, self, std::move(key), std::move(value));
+			}
+
+			template <bool idx_of = false>
+			static detail::error_result find_has_associative_lookup(std::true_type, lua_State* L, T& self) {
+				if constexpr (!is_ordered::value && idx_of) {
+					(void)L;
+					(void)self;
+					return detail::error_result("cannot perform an 'index_of': '%s's is not an ordered container", detail::demangle<T>().data());
+				}
+				else {
+					decltype(auto) key = stack::unqualified_get<K>(L, 2);
+					auto it = self.find(key);
+					if (it == deferred_uc::end(L, self)) {
+						return stack::push(L, lua_nil);
+					}
+					if constexpr (idx_of) {
+						auto dist = std::distance(deferred_uc::begin(L, self), it);
+						dist -= deferred_uc::index_adjustment(L, self);
+						return stack::push(L, dist);
+					}
+					else {
+						return get_associative(is_associative(), L, it);
+					}
+				}
+			}
+
+			template <bool idx_of = false>
+			static detail::error_result find_has_associative_lookup(std::false_type, lua_State* L, T& self) {
+				if constexpr (!is_ordered::value && idx_of) {
+					(void)L;
+					(void)self;
+					return detail::error_result("cannot perform an 'index_of': '%s's is not an ordered container", detail::demangle<T>().data());
+				}
+				else {
+					decltype(auto) value = stack::unqualified_get<V>(L, 2);
+					auto it = self.find(value);
+					if (it == deferred_uc::end(L, self)) {
+						return stack::push(L, lua_nil);
+					}
+					if constexpr (idx_of) {
+						auto dist = std::distance(deferred_uc::begin(L, self), it);
+						dist -= deferred_uc::index_adjustment(L, self);
+						return stack::push(L, dist);
+					}
+					else {
+						return get_associative(is_associative(), L, it);
+					}
+				}
+			}
+
+			template <bool idx_of = false>
+			static detail::error_result find_has(std::true_type, lua_State* L, T& self) {
+				return find_has_associative_lookup<idx_of>(meta::any<is_lookup, is_associative>(), L, self);
+			}
+
+			template <typename Iter>
+			static detail::error_result find_associative_lookup(std::true_type, lua_State* L, T&, Iter& it, std::size_t) {
+				return get_associative(is_associative(), L, it);
+			}
+
+			template <typename Iter>
+			static detail::error_result find_associative_lookup(std::false_type, lua_State* L, T& self, Iter&, std::size_t idx) {
+				idx -= deferred_uc::index_adjustment(L, self);
+				return stack::push(L, idx);
+			}
+
+			template <bool = false>
+			static detail::error_result find_comparative(std::false_type, lua_State*, T&) {
+				return detail::error_result("cannot call 'find' on '%s': there is no 'find' function and the value_type is not equality comparable",
+				     detail::demangle<T>().c_str());
+			}
+
+			template <bool idx_of = false>
+			static detail::error_result find_comparative(std::true_type, lua_State* L, T& self) {
+				decltype(auto) value = stack::unqualified_get<V>(L, 2);
+				auto it = deferred_uc::begin(L, self);
+				auto e = deferred_uc::end(L, self);
+				std::size_t idx = 0;
+				for (;; ++it, ++idx) {
+					if (it == e) {
+						return stack::push(L, lua_nil);
+					}
+					if (value == get_value(is_associative(), *it)) {
+						break;
+					}
+				}
+				return find_associative_lookup(meta::all<meta::boolean<!idx_of>, meta::any<is_lookup, is_associative>>(), L, self, it, idx);
+			}
+
+			template <bool idx_of = false>
+			static detail::error_result find_has(std::false_type, lua_State* L, T& self) {
+				return find_comparative<idx_of>(meta::supports_op_equal<V>(), L, self);
+			}
+
+			template <typename Iter>
+			static detail::error_result add_insert_after(std::false_type, lua_State* L, T& self, stack_object value, Iter&) {
+				return add_insert_after(std::false_type(), L, self, value);
+			}
+
+			static detail::error_result add_insert_after(std::false_type, lua_State*, T&, stack_object) {
+				return detail::error_result("cannot call 'add' on type '%s': no suitable insert/push_back C++ functions", detail::demangle<T>().data());
+			}
+
+			template <typename Iter>
+			static detail::error_result add_insert_after(std::true_type, lua_State*, T& self, stack_object value, Iter& pos) {
+				self.insert_after(pos, value.as<V>());
+				return {};
+			}
+
+			static detail::error_result add_insert_after(std::true_type, lua_State* L, T& self, stack_object value) {
+				auto backit = self.before_begin();
+				{
+					auto e = deferred_uc::end(L, self);
+					for (auto it = deferred_uc::begin(L, self); it != e; ++backit, ++it) {
+					}
+				}
+				return add_insert_after(std::true_type(), L, self, value, backit);
+			}
+
+			template <typename Iter>
+			static detail::error_result add_insert(std::true_type, lua_State*, T& self, stack_object value, Iter& pos) {
+				self.insert(pos, value.as<V>());
+				return {};
+			}
+
+			static detail::error_result add_insert(std::true_type, lua_State* L, T& self, stack_object value) {
+				auto pos = deferred_uc::end(L, self);
+				return add_insert(std::true_type(), L, self, value, pos);
+			}
+
+			template <typename Iter>
+			static detail::error_result add_insert(std::false_type, lua_State* L, T& self, stack_object value, Iter& pos) {
+				return add_insert_after(meta::has_insert_after<T>(), L, self, std::move(value), pos);
+			}
+
+			static detail::error_result add_insert(std::false_type, lua_State* L, T& self, stack_object value) {
+				return add_insert_after(meta::has_insert_after<T>(), L, self, std::move(value));
+			}
+
+			template <typename Iter>
+			static detail::error_result add_push_back(std::true_type, lua_State*, T& self, stack_object value, Iter&) {
+				self.push_back(value.as<V>());
+				return {};
+			}
+
+			static detail::error_result add_push_back(std::true_type, lua_State*, T& self, stack_object value) {
+				self.push_back(value.as<V>());
+				return {};
+			}
+
+			template <typename Iter>
+			static detail::error_result add_push_back(std::false_type, lua_State* L, T& self, stack_object value, Iter& pos) {
+				return add_insert(meta::has_insert<T>(), L, self, value, pos);
+			}
+
+			static detail::error_result add_push_back(std::false_type, lua_State* L, T& self, stack_object value) {
+				return add_insert(meta::has_insert<T>(), L, self, value);
+			}
+
+			template <typename Iter>
+			static detail::error_result add_associative(std::true_type, lua_State* L, T& self, stack_object key, Iter& pos) {
+				if constexpr (meta::has_insert<T>::value) {
+					self.insert(pos, value_type(key.as<K>(), stack::unqualified_get<V>(L, 3)));
+					return {};
+				}
+				else {
+					(void)L;
+					(void)self;
+					(void)key;
+					(void)pos;
+					return detail::error_result(
+					     "cannot call 'insert' on '%s': there is no 'insert' function on this associative type", detail::demangle<T>().c_str());
+				}
+			}
+
+			static detail::error_result add_associative(std::true_type, lua_State* L, T& self, stack_object key) {
+				auto pos = deferred_uc::end(L, self);
+				return add_associative(std::true_type(), L, self, std::move(key), pos);
+			}
+
+			template <typename Iter>
+			static detail::error_result add_associative(std::false_type, lua_State* L, T& self, stack_object value, Iter& pos) {
+				return add_push_back(meta::has_push_back<T>(), L, self, value, pos);
+			}
+
+			static detail::error_result add_associative(std::false_type, lua_State* L, T& self, stack_object value) {
+				return add_push_back(meta::has_push_back<T>(), L, self, value);
+			}
+
+			template <typename Iter>
+			static detail::error_result add_copyable(std::true_type, lua_State* L, T& self, stack_object value, Iter& pos) {
+				return add_associative(is_associative(), L, self, std::move(value), pos);
+			}
+
+			static detail::error_result add_copyable(std::true_type, lua_State* L, T& self, stack_object value) {
+				return add_associative(is_associative(), L, self, value);
+			}
+
+			template <typename Iter>
+			static detail::error_result add_copyable(std::false_type, lua_State* L, T& self, stack_object value, Iter&) {
+				return add_copyable(std::false_type(), L, self, std::move(value));
+			}
+
+			static detail::error_result add_copyable(std::false_type, lua_State*, T&, stack_object) {
+				return detail::error_result("cannot call 'add' on '%s': value_type is non-copyable", detail::demangle<T>().data());
+			}
+
+			static detail::error_result insert_lookup(std::true_type, lua_State* L, T& self, stack_object, stack_object value) {
+				// TODO: should we warn or error about someone calling insert on an ordered / lookup container with no associativity?
+				return add_copyable(std::true_type(), L, self, std::move(value));
+			}
+
+			static detail::error_result insert_lookup(std::false_type, lua_State* L, T& self, stack_object where, stack_object value) {
+				auto it = deferred_uc::begin(L, self);
+				auto key = where.as<K>();
+				key += deferred_uc::index_adjustment(L, self);
+				std::advance(it, key);
+				self.insert(it, value.as<V>());
+				return {};
+			}
+
+			static detail::error_result insert_after_has(std::true_type, lua_State* L, T& self, stack_object where, stack_object value) {
+				auto key = where.as<K>();
+				auto backit = self.before_begin();
+				{
+					key += deferred_uc::index_adjustment(L, self);
+					auto e = deferred_uc::end(L, self);
+					for (auto it = deferred_uc::begin(L, self); key > 0; ++backit, ++it, --key) {
+						if (backit == e) {
+							return detail::error_result("sol: out of bounds (too big) for set on '%s'", detail::demangle<T>().c_str());
+						}
+					}
+				}
+				self.insert_after(backit, value.as<V>());
+				return {};
+			}
+
+			static detail::error_result insert_after_has(std::false_type, lua_State*, T&, stack_object, stack_object) {
+				return detail::error_result(
+				     "cannot call 'insert' on '%s': no suitable or similar functionality detected on this container", detail::demangle<T>().data());
+			}
+
+			static detail::error_result insert_has(std::true_type, lua_State* L, T& self, stack_object key, stack_object value) {
+				return insert_lookup(meta::any<is_associative, is_lookup>(), L, self, std::move(key), std::move(value));
+			}
+
+			static detail::error_result insert_has(std::false_type, lua_State* L, T& self, stack_object where, stack_object value) {
+				return insert_after_has(meta::has_insert_after<T>(), L, self, where, value);
+			}
+
+			static detail::error_result insert_copyable(std::true_type, lua_State* L, T& self, stack_object key, stack_object value) {
+				return insert_has(meta::has_insert<T>(), L, self, std::move(key), std::move(value));
+			}
+
+			static detail::error_result insert_copyable(std::false_type, lua_State*, T&, stack_object, stack_object) {
+				return detail::error_result("cannot call 'insert' on '%s': value_type is non-copyable", detail::demangle<T>().data());
+			}
+
+			static detail::error_result erase_integral(std::true_type, lua_State* L, T& self, K& key) {
+				auto it = deferred_uc::begin(L, self);
+				key += deferred_uc::index_adjustment(L, self);
+				std::advance(it, key);
+				self.erase(it);
+
+				return {};
+			}
+
+			static detail::error_result erase_integral(std::false_type, lua_State* L, T& self, const K& key) {
+				auto fx = [&](const value_type& r) -> bool { return key == r; };
+				auto e = deferred_uc::end(L, self);
+				auto it = std::find_if(deferred_uc::begin(L, self), e, std::ref(fx));
+				if (it == e) {
+					return {};
+				}
+				self.erase(it);
+
+				return {};
+			}
+
+			static detail::error_result erase_associative_lookup(std::true_type, lua_State*, T& self, const K& key) {
+				self.erase(key);
+				return {};
+			}
+
+			static detail::error_result erase_associative_lookup(std::false_type, lua_State* L, T& self, K& key) {
+				return erase_integral(std::is_integral<K>(), L, self, key);
+			}
+
+			static detail::error_result erase_after_has(std::true_type, lua_State* L, T& self, K& key) {
+				auto backit = self.before_begin();
+				{
+					key += deferred_uc::index_adjustment(L, self);
+					auto e = deferred_uc::end(L, self);
+					for (auto it = deferred_uc::begin(L, self); key > 0; ++backit, ++it, --key) {
+						if (backit == e) {
+							return detail::error_result("sol: out of bounds for erase on '%s'", detail::demangle<T>().c_str());
+						}
+					}
+				}
+				self.erase_after(backit);
+				return {};
+			}
+
+			static detail::error_result erase_after_has(std::false_type, lua_State*, T&, const K&) {
+				return detail::error_result("sol: cannot call erase on '%s'", detail::demangle<T>().c_str());
+			}
+
+			static detail::error_result erase_key_has(std::true_type, lua_State* L, T& self, K& key) {
+				return erase_associative_lookup(meta::any<is_associative, is_lookup>(), L, self, key);
+			}
+
+			static detail::error_result erase_key_has(std::false_type, lua_State* L, T& self, K& key) {
+				return erase_after_has(has_erase_after<T>(), L, self, key);
+			}
+
+			static detail::error_result erase_has(std::true_type, lua_State* L, T& self, K& key) {
+				return erase_associative_lookup(meta::any<is_associative, is_lookup>(), L, self, key);
+			}
+
+			static detail::error_result erase_has(std::false_type, lua_State* L, T& self, K& key) {
+				return erase_key_has(has_erase_key<T>(), L, self, key);
+			}
+
+			static auto size_has(std::false_type, lua_State* L, T& self) {
+				return std::distance(deferred_uc::begin(L, self), deferred_uc::end(L, self));
+			}
+
+			static auto size_has(std::true_type, lua_State*, T& self) {
+				return self.size();
+			}
+
+			static void clear_has(std::true_type, lua_State*, T& self) {
+				self.clear();
+			}
+
+			static void clear_has(std::false_type, lua_State* L, T&) {
+				luaL_error(L, "sol: cannot call clear on '%s'", detail::demangle<T>().c_str());
+			}
+
+			static bool empty_has(std::true_type, lua_State*, T& self) {
+				return self.empty();
+			}
+
+			static bool empty_has(std::false_type, lua_State* L, T& self) {
+				return deferred_uc::begin(L, self) == deferred_uc::end(L, self);
+			}
+
+			static detail::error_result get_associative_find(std::true_type, lua_State* L, T& self, K& key) {
+				auto it = self.find(key);
+				if (it == deferred_uc::end(L, self)) {
+					stack::push(L, lua_nil);
+					return {};
+				}
+				return get_associative(std::true_type(), L, it);
+			}
+
+			static detail::error_result get_associative_find(std::false_type, lua_State* L, T& self, K& key) {
+				return get_it(is_linear_integral(), L, self, key);
+			}
+
+			static detail::error_result get_start(lua_State* L, T& self, K& key) {
+				return get_associative_find(std::integral_constant < bool, is_associative::value&& has_find<T>::value > (), L, self, key);
+			}
+
+			static detail::error_result set_start(lua_State* L, T& self, stack_object key, stack_object value) {
+				return set_it(is_linear_integral(), L, self, std::move(key), std::move(value));
+			}
+
+			static std::size_t size_start(lua_State* L, T& self) {
+				return size_has(meta::has_size<T>(), L, self);
+			}
+
+			static void clear_start(lua_State* L, T& self) {
+				clear_has(has_clear<T>(), L, self);
+			}
+
+			static bool empty_start(lua_State* L, T& self) {
+				return empty_has(has_empty<T>(), L, self);
+			}
+
+			static detail::error_result erase_start(lua_State* L, T& self, K& key) {
+				return erase_has(has_erase<T>(), L, self, key);
+			}
+
+			template <bool ip>
+			static int next_associative(std::true_type, lua_State* L) {
+				iter& i = stack::unqualified_get<user<iter>>(L, 1);
+				auto& source = i.source;
+				auto& it = i.it;
+				if (it == deferred_uc::end(L, source)) {
+					return stack::push(L, lua_nil);
+				}
+				int p;
+				if constexpr (ip) {
+					++i.i;
+					p = stack::push_reference(L, i.i);
+				}
+				else {
+					p = stack::push_reference(L, it->first);
+				}
+				p += stack::stack_detail::push_reference<push_type>(L, detail::deref_move_only(it->second));
+				std::advance(it, 1);
+				return p;
+			}
+
+			template <bool>
+			static int next_associative(std::false_type, lua_State* L) {
+				iter& i = stack::unqualified_get<user<iter>>(L, 1);
+				auto& source = i.source;
+				auto& it = i.it;
+				next_K k = stack::unqualified_get<next_K>(L, 2);
+				if (it == deferred_uc::end(L, source)) {
+					return stack::push(L, lua_nil);
+				}
+				int p;
+				if constexpr (std::is_integral_v<next_K>) {
+					p = stack::push_reference(L, k + 1);
+				}
+				else {
+					p = stack::stack_detail::push_reference(L, k + 1);
+				}
+				p += stack::stack_detail::push_reference<push_type>(L, detail::deref_move_only(*it));
+				std::advance(it, 1);
+				return p;
+			}
+
+			template <bool ip>
+			static int next_iter(lua_State* L) {
+				typedef meta::any<is_associative, meta::all<is_lookup, meta::neg<is_matched_lookup>>> is_assoc;
+				return next_associative<ip>(is_assoc(), L);
+			}
+
+			template <bool ip>
+			static int pairs_associative(std::true_type, lua_State* L) {
+				auto& src = get_src(L);
+				stack::push(L, next_iter<ip>);
+				stack::push<user<iter>>(L, src, deferred_uc::begin(L, src));
+				stack::push(L, lua_nil);
+				return 3;
+			}
+
+			template <bool ip>
+			static int pairs_associative(std::false_type, lua_State* L) {
+				auto& src = get_src(L);
+				stack::push(L, next_iter<ip>);
+				stack::push<user<iter>>(L, src, deferred_uc::begin(L, src));
+				stack::push(L, 0);
+				return 3;
+			}
+
+		public:
+			static int at(lua_State* L) {
+				auto& self = get_src(L);
+				detail::error_result er;
+				{
+					std::ptrdiff_t pos = stack::unqualified_get<std::ptrdiff_t>(L, 2);
+					er = at_start(L, self, pos);
+				}
+				return handle_errors(L, er);
+			}
+
+			static int get(lua_State* L) {
+				auto& self = get_src(L);
+				detail::error_result er;
+				{
+					decltype(auto) key = stack::unqualified_get<K>(L);
+					er = get_start(L, self, key);
+				}
+				return handle_errors(L, er);
+			}
+
+			static int index_get(lua_State* L) {
+				return get(L);
+			}
+
+			static int set(lua_State* L) {
+				stack_object value = stack_object(L, raw_index(3));
+				if constexpr (is_linear_integral::value) {
+					// for non-associative containers,
+					// erasure only happens if it is the
+					// last index in the container
+					auto key = stack::get<K>(L, 2);
+					auto self_size = deferred_uc::size(L);
+					if (key == static_cast<K>(self_size)) {
+						if (type_of(L, 3) == type::lua_nil) {
+							return erase(L);
+						}
+					}
+				}
+				else {
+					if (type_of(L, 3) == type::lua_nil) {
+						return erase(L);
+					}
+				}
+				auto& self = get_src(L);
+				detail::error_result er = set_start(L, self, stack_object(L, raw_index(2)), std::move(value));
+				return handle_errors(L, er);
+			}
+
+			static int index_set(lua_State* L) {
+				return set(L);
+			}
+
+			static int add(lua_State* L) {
+				auto& self = get_src(L);
+				detail::error_result er = add_copyable(is_copyable(), L, self, stack_object(L, raw_index(2)));
+				return handle_errors(L, er);
+			}
+
+			static int insert(lua_State* L) {
+				auto& self = get_src(L);
+				detail::error_result er = insert_copyable(is_copyable(), L, self, stack_object(L, raw_index(2)), stack_object(L, raw_index(3)));
+				return handle_errors(L, er);
+			}
+
+			static int find(lua_State* L) {
+				auto& self = get_src(L);
+				detail::error_result er = find_has(has_find<T>(), L, self);
+				return handle_errors(L, er);
+			}
+
+			static int index_of(lua_State* L) {
+				auto& self = get_src(L);
+				detail::error_result er = find_has<true>(has_find<T>(), L, self);
+				return handle_errors(L, er);
+			}
+
+			static iterator begin(lua_State*, T& self) {
+				if constexpr (meta::has_begin_end_v<T>) {
+					return self.begin();
+				}
+				else {
+					using std::begin;
+					return begin(self);
+				}
+			}
+
+			static iterator end(lua_State*, T& self) {
+				if constexpr (meta::has_begin_end_v<T>) {
+					return self.end();
+				}
+				else {
+					using std::end;
+					return end(self);
+				}
+			}
+
+			static int size(lua_State* L) {
+				auto& self = get_src(L);
+				std::size_t r = size_start(L, self);
+				return stack::push(L, r);
+			}
+
+			static int clear(lua_State* L) {
+				auto& self = get_src(L);
+				clear_start(L, self);
+				return 0;
+			}
+
+			static int erase(lua_State* L) {
+				auto& self = get_src(L);
+				detail::error_result er;
+				{
+					decltype(auto) key = stack::unqualified_get<K>(L, 2);
+					er = erase_start(L, self, key);
+				}
+				return handle_errors(L, er);
+			}
+
+			static int empty(lua_State* L) {
+				auto& self = get_src(L);
+				return stack::push(L, empty_start(L, self));
+			}
+
+			static std::ptrdiff_t index_adjustment(lua_State*, T&) {
+				return static_cast<std::ptrdiff_t>((SOL_CONTAINER_START_INDEX_I_) == 0 ? 0 : -(SOL_CONTAINER_START_INDEX_I_));
+			}
+
+			static int pairs(lua_State* L) {
+				typedef meta::any<is_associative, meta::all<is_lookup, meta::neg<is_matched_lookup>>> is_assoc;
+				return pairs_associative<false>(is_assoc(), L);
+			}
+
+			static int ipairs(lua_State* L) {
+				typedef meta::any<is_associative, meta::all<is_lookup, meta::neg<is_matched_lookup>>> is_assoc;
+				return pairs_associative<true>(is_assoc(), L);
+			}
+
+			static int next(lua_State* L) {
+				return stack::push(L, next_iter<false>);
+			}
+		};
+
+		template <typename X>
+		struct usertype_container_default<X, std::enable_if_t<std::is_array<std::remove_pointer_t<meta::unwrap_unqualified_t<X>>>::value>> {
+		private:
+			typedef std::remove_pointer_t<meta::unwrap_unqualified_t<X>> T;
+			typedef usertype_container<X> deferred_uc;
+
+		public:
+			typedef std::remove_extent_t<T> value_type;
+			typedef value_type* iterator;
+
+		private:
+			struct iter {
+				T& source;
+				iterator it;
+
+				iter(T& source, iterator it) : source(source), it(std::move(it)) {
+				}
+			};
+
+			static auto& get_src(lua_State* L) {
+				auto p = stack::unqualified_check_get<T*>(L, 1);
+#if SOL_IS_ON(SOL_SAFE_USERTYPE_I_)
+				if (!p) {
+					luaL_error(L,
+					     "sol: 'self' is not of type '%s' (pass 'self' as first argument with ':' or call on proper type)",
+					     detail::demangle<T>().c_str());
+				}
+				if (p.value() == nullptr) {
+					luaL_error(
+					     L, "sol: 'self' argument is nil (pass 'self' as first argument with ':' or call on a '%s' type)", detail::demangle<T>().c_str());
+				}
+#endif // Safe getting with error
+				return *p.value();
+			}
+
+			static int find(std::true_type, lua_State* L) {
+				T& self = get_src(L);
+				decltype(auto) value = stack::unqualified_get<value_type>(L, 2);
+				std::size_t N = std::extent<T>::value;
+				for (std::size_t idx = 0; idx < N; ++idx) {
+					using v_t = std::add_const_t<decltype(self[idx])>;
+					v_t v = self[idx];
+					if (v == value) {
+						idx -= deferred_uc::index_adjustment(L, self);
+						return stack::push(L, idx);
+					}
+				}
+				return stack::push(L, lua_nil);
+			}
+
+			static int find(std::false_type, lua_State* L) {
+				return luaL_error(L, "sol: cannot call 'find' on '%s': no supported comparison operator for the value type", detail::demangle<T>().c_str());
+			}
+
+			static int next_iter(lua_State* L) {
+				iter& i = stack::unqualified_get<user<iter>>(L, 1);
+				auto& source = i.source;
+				auto& it = i.it;
+				std::size_t k = stack::unqualified_get<std::size_t>(L, 2);
+				if (it == deferred_uc::end(L, source)) {
+					return 0;
+				}
+				int p;
+				p = stack::push(L, k + 1);
+				p += stack::push_reference(L, detail::deref_move_only(*it));
+				std::advance(it, 1);
+				return p;
+			}
+
+		public:
+			static int clear(lua_State* L) {
+				return luaL_error(L, "sol: cannot call 'clear' on type '%s': cannot remove all items from a fixed array", detail::demangle<T>().c_str());
+			}
+
+			static int erase(lua_State* L) {
+				return luaL_error(L, "sol: cannot call 'erase' on type '%s': cannot remove an item from fixed arrays", detail::demangle<T>().c_str());
+			}
+
+			static int add(lua_State* L) {
+				return luaL_error(L, "sol: cannot call 'add' on type '%s': cannot add to fixed arrays", detail::demangle<T>().c_str());
+			}
+
+			static int insert(lua_State* L) {
+				return luaL_error(L, "sol: cannot call 'insert' on type '%s': cannot insert new entries into fixed arrays", detail::demangle<T>().c_str());
+			}
+
+			static int at(lua_State* L) {
+				return get(L);
+			}
+
+			static int get(lua_State* L) {
+				T& self = get_src(L);
+				std::ptrdiff_t idx = stack::unqualified_get<std::ptrdiff_t>(L, 2);
+				idx += deferred_uc::index_adjustment(L, self);
+				if (idx >= static_cast<std::ptrdiff_t>(std::extent<T>::value) || idx < 0) {
+					return stack::push(L, lua_nil);
+				}
+				return stack::push_reference(L, detail::deref_move_only(self[idx]));
+			}
+
+			static int index_get(lua_State* L) {
+				return get(L);
+			}
+
+			static int set(lua_State* L) {
+				T& self = get_src(L);
+				std::ptrdiff_t idx = stack::unqualified_get<std::ptrdiff_t>(L, 2);
+				idx += deferred_uc::index_adjustment(L, self);
+				if (idx >= static_cast<std::ptrdiff_t>(std::extent<T>::value)) {
+					return luaL_error(L, "sol: index out of bounds (too big) for set on '%s'", detail::demangle<T>().c_str());
+				}
+				if (idx < 0) {
+					return luaL_error(L, "sol: index out of bounds (too small) for set on '%s'", detail::demangle<T>().c_str());
+				}
+				self[idx] = stack::unqualified_get<value_type>(L, 3);
+				return 0;
+			}
+
+			static int index_set(lua_State* L) {
+				return set(L);
+			}
+
+			static int index_of(lua_State* L) {
+				return find(L);
+			}
+
+			static int find(lua_State* L) {
+				return find(meta::supports_op_equal<value_type, value_type>(), L);
+			}
+
+			static int size(lua_State* L) {
+				return stack::push(L, std::extent<T>::value);
+			}
+
+			static int empty(lua_State* L) {
+				return stack::push(L, std::extent<T>::value > 0);
+			}
+
+			static int pairs(lua_State* L) {
+				auto& src = get_src(L);
+				stack::push(L, next_iter);
+				stack::push<user<iter>>(L, src, deferred_uc::begin(L, src));
+				stack::push(L, 0);
+				return 3;
+			}
+
+			static int ipairs(lua_State* L) {
+				return pairs(L);
+			}
+
+			static int next(lua_State* L) {
+				return stack::push(L, next_iter);
+			}
+
+			static std::ptrdiff_t index_adjustment(lua_State*, T&) {
+				return (SOL_CONTAINER_START_INDEX_I_) == 0 ? 0 : -(SOL_CONTAINER_START_INDEX_I_);
+			}
+
+			static iterator begin(lua_State*, T& self) {
+				return std::addressof(self[0]);
+			}
+
+			static iterator end(lua_State*, T& self) {
+				return std::addressof(self[0]) + std::extent<T>::value;
+			}
+		};
+
+		template <typename X>
+		struct usertype_container_default<usertype_container<X>> : usertype_container_default<X> {};
+	} // namespace container_detail
+
+	template <typename T>
+	struct usertype_container : container_detail::usertype_container_default<T> {};
+
+} // namespace sol
+
+// end of sol/usertype_container.hpp
+
+#include <unordered_map>
+
+namespace sol {
+
+	namespace container_detail {
+		template <typename X>
+		struct u_c_launch {
+			using T = std::remove_pointer_t<meta::unqualified_t<X>>;
+			using uc = usertype_container<T>;
+			using default_uc = usertype_container_default<T>;
+
+			static inline int real_index_get_traits(std::true_type, lua_State* L) {
+				return uc::index_get(L);
+			}
+
+			static inline int real_index_get_traits(std::false_type, lua_State* L) {
+				return default_uc::index_get(L);
+			}
+
+			static inline int real_index_call(lua_State* L) {
+				static const std::unordered_map<string_view, lua_CFunction> calls {
+					{ "at", &real_at_call },
+					{ "get", &real_get_call },
+					{ "set", &real_set_call },
+					{ "size", &real_length_call },
+					{ "add", &real_add_call },
+					{ "empty", &real_empty_call },
+					{ "insert", &real_insert_call },
+					{ "clear", &real_clear_call },
+					{ "find", &real_find_call },
+					{ "index_of", &real_index_of_call },
+					{ "erase", &real_erase_call },
+					{ "pairs", &pairs_call },
+					{ "next", &next_call },
+				};
+				auto maybenameview = stack::unqualified_check_get<string_view>(L, 2);
+				if (maybenameview) {
+					const string_view& name = *maybenameview;
+					auto it = calls.find(name);
+					if (it != calls.cend()) {
+						return stack::push(L, it->second);
+					}
+				}
+				return real_index_get_traits(container_detail::has_traits_index_get<uc>(), L);
+			}
+
+			static inline int real_at_traits(std::true_type, lua_State* L) {
+				return uc::at(L);
+			}
+
+			static inline int real_at_traits(std::false_type, lua_State* L) {
+				return default_uc::at(L);
+			}
+
+			static inline int real_at_call(lua_State* L) {
+				return real_at_traits(container_detail::has_traits_at<uc>(), L);
+			}
+
+			static inline int real_get_traits(std::true_type, lua_State* L) {
+				return uc::get(L);
+			}
+
+			static inline int real_get_traits(std::false_type, lua_State* L) {
+				return default_uc::get(L);
+			}
+
+			static inline int real_get_call(lua_State* L) {
+				return real_get_traits(container_detail::has_traits_get<uc>(), L);
+			}
+
+			static inline int real_set_traits(std::true_type, lua_State* L) {
+				return uc::set(L);
+			}
+
+			static inline int real_set_traits(std::false_type, lua_State* L) {
+				return default_uc::set(L);
+			}
+
+			static inline int real_set_call(lua_State* L) {
+				return real_set_traits(container_detail::has_traits_set<uc>(), L);
+			}
+
+			static inline int real_index_set_traits(std::true_type, lua_State* L) {
+				return uc::index_set(L);
+			}
+
+			static inline int real_index_set_traits(std::false_type, lua_State* L) {
+				return default_uc::index_set(L);
+			}
+
+			static inline int real_new_index_call(lua_State* L) {
+				return real_index_set_traits(container_detail::has_traits_index_set<uc>(), L);
+			}
+
+			static inline int real_pairs_traits(std::true_type, lua_State* L) {
+				return uc::pairs(L);
+			}
+
+			static inline int real_pairs_traits(std::false_type, lua_State* L) {
+				return default_uc::pairs(L);
+			}
+
+			static inline int real_pairs_call(lua_State* L) {
+				return real_pairs_traits(container_detail::has_traits_pairs<uc>(), L);
+			}
+
+			static inline int real_ipairs_traits(std::true_type, lua_State* L) {
+				return uc::ipairs(L);
+			}
+
+			static inline int real_ipairs_traits(std::false_type, lua_State* L) {
+				return default_uc::ipairs(L);
+			}
+
+			static inline int real_ipairs_call(lua_State* L) {
+				return real_ipairs_traits(container_detail::has_traits_ipairs<uc>(), L);
+			}
+
+			static inline int real_next_traits(std::true_type, lua_State* L) {
+				return uc::next(L);
+			}
+
+			static inline int real_next_traits(std::false_type, lua_State* L) {
+				return default_uc::next(L);
+			}
+
+			static inline int real_next_call(lua_State* L) {
+				return real_next_traits(container_detail::has_traits_next<uc>(), L);
+			}
+
+			static inline int real_size_traits(std::true_type, lua_State* L) {
+				return uc::size(L);
+			}
+
+			static inline int real_size_traits(std::false_type, lua_State* L) {
+				return default_uc::size(L);
+			}
+
+			static inline int real_length_call(lua_State* L) {
+				return real_size_traits(container_detail::has_traits_size<uc>(), L);
+			}
+
+			static inline int real_add_traits(std::true_type, lua_State* L) {
+				return uc::add(L);
+			}
+
+			static inline int real_add_traits(std::false_type, lua_State* L) {
+				return default_uc::add(L);
+			}
+
+			static inline int real_add_call(lua_State* L) {
+				return real_add_traits(container_detail::has_traits_add<uc>(), L);
+			}
+
+			static inline int real_insert_traits(std::true_type, lua_State* L) {
+				return uc::insert(L);
+			}
+
+			static inline int real_insert_traits(std::false_type, lua_State* L) {
+				return default_uc::insert(L);
+			}
+
+			static inline int real_insert_call(lua_State* L) {
+				return real_insert_traits(container_detail::has_traits_insert<uc>(), L);
+			}
+
+			static inline int real_clear_traits(std::true_type, lua_State* L) {
+				return uc::clear(L);
+			}
+
+			static inline int real_clear_traits(std::false_type, lua_State* L) {
+				return default_uc::clear(L);
+			}
+
+			static inline int real_clear_call(lua_State* L) {
+				return real_clear_traits(container_detail::has_traits_clear<uc>(), L);
+			}
+
+			static inline int real_empty_traits(std::true_type, lua_State* L) {
+				return uc::empty(L);
+			}
+
+			static inline int real_empty_traits(std::false_type, lua_State* L) {
+				return default_uc::empty(L);
+			}
+
+			static inline int real_empty_call(lua_State* L) {
+				return real_empty_traits(container_detail::has_traits_empty<uc>(), L);
+			}
+
+			static inline int real_erase_traits(std::true_type, lua_State* L) {
+				return uc::erase(L);
+			}
+
+			static inline int real_erase_traits(std::false_type, lua_State* L) {
+				return default_uc::erase(L);
+			}
+
+			static inline int real_erase_call(lua_State* L) {
+				return real_erase_traits(container_detail::has_traits_erase<uc>(), L);
+			}
+
+			static inline int real_find_traits(std::true_type, lua_State* L) {
+				return uc::find(L);
+			}
+
+			static inline int real_find_traits(std::false_type, lua_State* L) {
+				return default_uc::find(L);
+			}
+
+			static inline int real_find_call(lua_State* L) {
+				return real_find_traits(container_detail::has_traits_find<uc>(), L);
+			}
+
+			static inline int real_index_of_call(lua_State* L) {
+				if constexpr (container_detail::has_traits_index_of<uc>()) {
+					return uc::index_of(L);
+				}
+				else {
+					return default_uc::index_of(L);
+				}
+			}
+
+			static inline int add_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_add_call), (&real_add_call)>(L);
+			}
+
+			static inline int erase_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_erase_call), (&real_erase_call)>(L);
+			}
+
+			static inline int insert_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_insert_call), (&real_insert_call)>(L);
+			}
+
+			static inline int clear_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_clear_call), (&real_clear_call)>(L);
+			}
+
+			static inline int empty_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_empty_call), (&real_empty_call)>(L);
+			}
+
+			static inline int find_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_find_call), (&real_find_call)>(L);
+			}
+
+			static inline int index_of_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_index_of_call), (&real_index_of_call)>(L);
+			}
+
+			static inline int length_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_length_call), (&real_length_call)>(L);
+			}
+
+			static inline int pairs_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_pairs_call), (&real_pairs_call)>(L);
+			}
+
+			static inline int ipairs_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_ipairs_call), (&real_ipairs_call)>(L);
+			}
+
+			static inline int next_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_next_call), (&real_next_call)>(L);
+			}
+
+			static inline int at_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_at_call), (&real_at_call)>(L);
+			}
+
+			static inline int get_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_get_call), (&real_get_call)>(L);
+			}
+
+			static inline int set_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_set_call), (&real_set_call)>(L);
+			}
+
+			static inline int index_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_index_call), (&real_index_call)>(L);
+			}
+
+			static inline int new_index_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_new_index_call), (&real_new_index_call)>(L);
+			}
+		};
+	} // namespace container_detail
+
+	namespace stack {
+		namespace stack_detail {
+			template <typename T, bool is_shim = false>
+			struct metatable_setup {
+				lua_State* L;
+
+				metatable_setup(lua_State* L) : L(L) {
+				}
+
+				void operator()() {
+					using meta_usertype_container
+					     = container_detail::u_c_launch<meta::conditional_t<is_shim, as_container_t<std::remove_pointer_t<T>>, std::remove_pointer_t<T>>>;
+					static const char* metakey
+					     = is_shim ? &usertype_traits<as_container_t<std::remove_pointer_t<T>>>::metatable()[0] : &usertype_traits<T>::metatable()[0];
+					static const std::array<luaL_Reg, 20> reg = { {
+						// clang-format off
+						{ "__pairs", &meta_usertype_container::pairs_call },
+						{ "__ipairs", &meta_usertype_container::ipairs_call },
+						{ "__len", &meta_usertype_container::length_call },
+						{ "__index", &meta_usertype_container::index_call },
+						{ "__newindex", &meta_usertype_container::new_index_call },
+						{ "pairs", &meta_usertype_container::pairs_call },
+						{ "next", &meta_usertype_container::next_call },
+						{ "at", &meta_usertype_container::at_call },
+						{ "get", &meta_usertype_container::get_call },
+						{ "set", &meta_usertype_container::set_call },
+						{ "size", &meta_usertype_container::length_call },
+						{ "empty", &meta_usertype_container::empty_call },
+						{ "clear", &meta_usertype_container::clear_call },
+						{ "insert", &meta_usertype_container::insert_call },
+						{ "add", &meta_usertype_container::add_call },
+						{ "find", &meta_usertype_container::find_call },
+						{ "index_of", &meta_usertype_container::index_of_call },
+						{ "erase", &meta_usertype_container::erase_call },
+						std::is_pointer<T>::value ? luaL_Reg{ nullptr, nullptr } : luaL_Reg{ "__gc", &detail::usertype_alloc_destruct<T> },
+						{ nullptr, nullptr }
+						// clang-format on 
+					} };
+
+					if (luaL_newmetatable(L, metakey) == 1) {
+						luaL_setfuncs(L, reg.data(), 0);
+					}
+					lua_setmetatable(L, -2);
+				}
+			};
+		} // namespace stack_detail
+
+		template <typename T>
+		struct unqualified_pusher<as_container_t<T>> {
+			using C = meta::unqualified_t<T>;
+
+			static int push_lvalue(std::true_type, lua_State* L, const C& cont) {
+				stack_detail::metatable_setup<C*, true> fx(L);
+				return stack::push<detail::as_pointer_tag<const C>>(L, detail::with_function_tag(), fx, detail::ptr(cont));
+			}
+
+			static int push_lvalue(std::false_type, lua_State* L, const C& cont) {
+				stack_detail::metatable_setup<C, true> fx(L);
+				return stack::push<detail::as_value_tag<C>>(L, detail::with_function_tag(), fx, cont);
+			}
+
+			static int push_rvalue(std::true_type, lua_State* L, C&& cont) {
+				stack_detail::metatable_setup<C, true> fx(L);
+				return stack::push<detail::as_value_tag<C>>(L, detail::with_function_tag(), fx, std::move(cont));
+			}
+
+			static int push_rvalue(std::false_type, lua_State* L, const C& cont) {
+				return push_lvalue(std::is_lvalue_reference<T>(), L, cont);
+			}
+
+			static int push(lua_State* L, const as_container_t<T>& as_cont) {
+				return push_lvalue(std::is_lvalue_reference<T>(), L, as_cont.value());
+			}
+
+			static int push(lua_State* L, as_container_t<T>&& as_cont) {
+				return push_rvalue(meta::all<std::is_rvalue_reference<T>, meta::neg<std::is_lvalue_reference<T>>>(), L, std::forward<T>(as_cont.value()));
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<as_container_t<T*>> {
+			using C = std::add_pointer_t<meta::unqualified_t<std::remove_pointer_t<T>>>;
+
+			static int push(lua_State* L, T* cont) {
+				stack_detail::metatable_setup<C> fx(L);
+				return stack::push<detail::as_pointer_tag<T>>(L, detail::with_function_tag(), fx, cont);
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<T, std::enable_if_t<is_container_v<T>>> {
+			using C = T;
+
+			template <typename... Args>
+			static int push(lua_State* L, Args&&... args) {
+				stack_detail::metatable_setup<C> fx(L);
+				return stack::push<detail::as_value_tag<T>>(L, detail::with_function_tag(), fx, std::forward<Args>(args)...);
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<T*, std::enable_if_t<is_container_v<T>>> {
+			using C = std::add_pointer_t<meta::unqualified_t<std::remove_pointer_t<T>>>;
+
+			static int push(lua_State* L, T* cont) {
+				stack_detail::metatable_setup<C> fx(L);
+				return stack::push<detail::as_pointer_tag<T>>(L, detail::with_function_tag(), fx, cont);
+			}
+		};
+	} // namespace stack
+
+} // namespace sol
+
+// end of sol/usertype_container_launch.hpp
+
+#include <sstream>
+#include <type_traits>
+
+namespace sol {
+	namespace u_detail {
+		constexpr const lua_Integer toplevel_magic = static_cast<lua_Integer>(0xCCC2CCC1);
+
+		constexpr const int environment_index = 1;
+		constexpr const int usertype_storage_index = 2;
+		constexpr const int usertype_storage_base_index = 3;
+		constexpr const int exact_function_index = 4;
+		constexpr const int magic_index = 5;
+
+		constexpr const int simple_usertype_storage_index = 2;
+		constexpr const int index_function_index = 3;
+		constexpr const int new_index_function_index = 4;
+
+		constexpr const int base_walking_failed_index = -32467;
+		constexpr const int lookup_failed_index = -42469;
+
+		enum class submetatable_type {
+			// must be sequential
+			value,
+			reference,
+			unique,
+			const_reference,
+			const_value,
+			// must be LAST!
+			named
+		};
+
+		inline auto make_string_view(string_view s) {
+			return s;
+		}
+
+		inline auto make_string_view(call_construction) {
+			return string_view(to_string(meta_function::call_function));
+		}
+
+		inline auto make_string_view(meta_function mf) {
+			return string_view(to_string(mf));
+		}
+
+		inline auto make_string_view(base_classes_tag) {
+			return string_view(detail::base_class_cast_key());
+		}
+
+		template <typename Arg>
+		inline std::string make_string(Arg&& arg) {
+			string_view s = make_string_view(arg);
+			return std::string(s.data(), s.size());
+		}
+
+		inline int is_indexer(string_view s) {
+			if (s == to_string(meta_function::index)) {
+				return 1;
+			}
+			else if (s == to_string(meta_function::new_index)) {
+				return 2;
+			}
+			return 0;
+		}
+
+		inline int is_indexer(meta_function mf) {
+			if (mf == meta_function::index) {
+				return 1;
+			}
+			else if (mf == meta_function::new_index) {
+				return 2;
+			}
+			return 0;
+		}
+
+		inline int is_indexer(call_construction) {
+			return 0;
+		}
+	} // namespace u_detail
+
+	namespace detail {
+
+		template <typename T, typename IFx, typename Fx>
+		inline void insert_default_registrations(IFx&& ifx, Fx&& fx) {
+			(void)ifx;
+			(void)fx;
+			if constexpr (is_automagical<T>::value) {
+				if (fx(meta_function::less_than)) {
+					if constexpr (meta::supports_op_less<T>::value) {
+						lua_CFunction f = &comparsion_operator_wrap<T, std::less<>>;
+						ifx(meta_function::less_than, f);
+					}
+				}
+				if (fx(meta_function::less_than_or_equal_to)) {
+					if constexpr (meta::supports_op_less_equal<T>::value) {
+						lua_CFunction f = &comparsion_operator_wrap<T, std::less_equal<>>;
+						ifx(meta_function::less_than_or_equal_to, f);
+					}
+				}
+				if (fx(meta_function::equal_to)) {
+					if constexpr (meta::supports_op_equal<T>::value) {
+						lua_CFunction f = &comparsion_operator_wrap<T, std::equal_to<>>;
+						ifx(meta_function::equal_to, f);
+					}
+					else {
+						lua_CFunction f = &comparsion_operator_wrap<T, no_comp>;
+						ifx(meta_function::equal_to, f);
+					}
+				}
+				if (fx(meta_function::pairs)) {
+					ifx(meta_function::pairs, &container_detail::u_c_launch<as_container_t<T>>::pairs_call);
+				}
+				if (fx(meta_function::length)) {
+					if constexpr (meta::has_size<const T>::value || meta::has_size<T>::value) {
+						auto f = &default_size<T>;
+						ifx(meta_function::length, f);
+					}
+				}
+				if (fx(meta_function::to_string)) {
+					if constexpr (is_to_stringable<T>::value) {
+						auto f = &detail::static_trampoline<&default_to_string<T>>;
+						ifx(meta_function::to_string, f);
+					}
+				}
+				if (fx(meta_function::call_function)) {
+					if constexpr (meta::has_deducible_signature<T>::value) {
+						auto f = &c_call<decltype(&T::operator()), &T::operator()>;
+						ifx(meta_function::call_function, f);
+					}
+				}
+			}
+		}
+	} // namespace detail
+
+	namespace stack { namespace stack_detail {
+		template <typename X>
+		void set_undefined_methods_on(stack_reference t) {
+			using T = std::remove_pointer_t<X>;
+
+			lua_State* L = t.lua_state();
+
+			t.push();
+
+			detail::lua_reg_table l{};
+			int index = 0;
+			detail::indexed_insert insert_fx(l, index);
+			detail::insert_default_registrations<T>(insert_fx, detail::property_always_true);
+			if constexpr (!std::is_pointer_v<X>) {
+				l[index] = luaL_Reg{ to_string(meta_function::garbage_collect).c_str(), detail::make_destructor<T>() };
+			}
+			luaL_setfuncs(L, l, 0);
+
+			// __type table
+			lua_createtable(L, 0, 2);
+			const std::string& name = detail::demangle<T>();
+			lua_pushlstring(L, name.c_str(), name.size());
+			lua_setfield(L, -2, "name");
+			lua_CFunction is_func = &detail::is_check<T>;
+			lua_pushcclosure(L, is_func, 0);
+			lua_setfield(L, -2, "is");
+			lua_setfield(L, t.stack_index(), to_string(meta_function::type).c_str());
+
+			t.pop();
+		}
+	}} // namespace stack::stack_detail
+} // namespace sol
+
+// end of sol/usertype_core.hpp
+
+// beginning of sol/usertype_storage.hpp
+
+#include <bitset>
+#include <unordered_map>
+
+namespace sol { namespace u_detail {
+
+	struct usertype_storage_base;
+	template <typename T>
+	struct usertype_storage;
+
+	optional<usertype_storage_base&> maybe_get_usertype_storage_base(lua_State* L, int index);
+	usertype_storage_base& get_usertype_storage_base(lua_State* L, const char* gcmetakey);
+	template <typename T>
+	optional<usertype_storage<T>&> maybe_get_usertype_storage(lua_State* L);
+	template <typename T>
+	usertype_storage<T>& get_usertype_storage(lua_State* L);
+
+	using index_call_function = int(lua_State*, void*);
+	using change_indexing_mem_func
+		= void (usertype_storage_base::*)(lua_State*, submetatable_type, void*, stack_reference&, lua_CFunction, lua_CFunction, lua_CFunction, lua_CFunction);
+
+	struct index_call_storage {
+		index_call_function* index;
+		index_call_function* new_index;
+		void* binding_data;
+	};
+
+	struct new_index_call_storage : index_call_storage {
+		void* new_binding_data;
+	};
+
+	struct binding_base {
+		virtual void* data() = 0;
+		virtual ~binding_base() {
+		}
+	};
+
+	template <typename K, typename Fq, typename T = void>
+	struct binding : binding_base {
+		using uF = meta::unqualified_t<Fq>;
+		using F = meta::conditional_t<meta::is_c_str_of_v<uF, char>
+#ifdef __cpp_char8_t
+			     || meta::is_c_str_of_v<uF, char8_t>
+#endif
+			     || meta::is_c_str_of_v<uF, char16_t> || meta::is_c_str_of_v<uF, char32_t> || meta::is_c_str_of_v<uF, wchar_t>,
+			std::add_pointer_t<std::add_const_t<std::remove_all_extents_t<Fq>>>, std::decay_t<Fq>>;
+		F data_;
+
+		template <typename... Args>
+		binding(Args&&... args) : data_(std::forward<Args>(args)...) {
+		}
+
+		virtual void* data() override {
+			return static_cast<void*>(std::addressof(data_));
+		}
+
+		template <bool is_index = true, bool is_variable = false>
+		static inline int call_with_(lua_State* L, void* target) {
+			constexpr int boost = !detail::is_non_factory_constructor<F>::value && std::is_same<K, call_construction>::value ? 1 : 0;
+			auto& f = *static_cast<F*>(target);
+			return call_detail::call_wrapped<T, is_index, is_variable, boost>(L, f);
+		}
+
+		template <bool is_index = true, bool is_variable = false>
+		static inline int call_(lua_State* L) {
+			void* f = stack::get<void*>(L, upvalue_index(usertype_storage_index));
+			return call_with_<is_index, is_variable>(L, f);
+		}
+
+		template <bool is_index = true, bool is_variable = false>
+		static inline int call(lua_State* L) {
+			int r = detail::typed_static_trampoline<decltype(&call_<is_index, is_variable>), (&call_<is_index, is_variable>)>(L);
+			if constexpr (meta::is_specialization_of_v<uF, yielding_t>) {
+				return lua_yield(L, r);
+			}
+			else {
+				return r;
+			}
+		}
+
+		template <bool is_index = true, bool is_variable = false>
+		static inline int index_call_with_(lua_State* L, void* target) {
+			if constexpr (!is_variable) {
+				if constexpr (is_lua_c_function_v<std::decay_t<F>>) {
+					auto& f = *static_cast<std::decay_t<F>*>(target);
+					return stack::push(L, f);
+				}
+				else {
+					// set up upvalues
+					// for a chained call
+					int upvalues = 0;
+					upvalues += stack::push(L, nullptr);
+					upvalues += stack::push(L, target);
+					auto cfunc = &call<is_index, is_variable>;
+					return stack::push(L, c_closure(cfunc, upvalues));
+				}
+			}
+			else {
+				constexpr int boost = !detail::is_non_factory_constructor<F>::value && std::is_same<K, call_construction>::value ? 1 : 0;
+				auto& f = *static_cast<F*>(target);
+				return call_detail::call_wrapped<T, is_index, is_variable, boost>(L, f);
+			}
+		}
+
+		template <bool is_index = true, bool is_variable = false>
+		static inline int index_call_(lua_State* L) {
+			void* f = stack::get<void*>(L, upvalue_index(usertype_storage_index));
+			return index_call_with_<is_index, is_variable>(L, f);
+		}
+
+		template <bool is_index = true, bool is_variable = false>
+		static inline int index_call(lua_State* L) {
+			int r = detail::typed_static_trampoline<decltype(&index_call_<is_index, is_variable>), (&index_call_<is_index, is_variable>)>(L);
+			if constexpr (meta::is_specialization_of_v<uF, yielding_t>) {
+				return lua_yield(L, r);
+			}
+			else {
+				return r;
+			}
+		}
+	};
+
+	inline int index_fail(lua_State* L) {
+		if (lua_getmetatable(L, 1) == 1) {
+			int metatarget = lua_gettop(L);
+			stack::get_field<false, true>(L, stack_reference(L, raw_index(2)), metatarget);
+			return 1;
+		}
+		// With runtime extensibility, we can't
+		// hard-error things. They have to
+		// return nil, like regular table types
+		return stack::push(L, lua_nil);
+	}
+
+	inline int index_target_fail(lua_State* L, void*) {
+		return index_fail(L);
+	}
+
+	inline int new_index_fail(lua_State* L) {
+		return luaL_error(L, "sol: cannot set (new_index) into this object: no defined new_index operation on usertype");
+	}
+
+	inline int new_index_target_fail(lua_State* L, void*) {
+		return new_index_fail(L);
+	}
+
+	struct string_for_each_metatable_func {
+		bool is_destruction = false;
+		bool is_index = false;
+		bool is_new_index = false;
+		bool is_static_index = false;
+		bool is_static_new_index = false;
+		bool poison_indexing = false;
+		bool is_unqualified_lua_CFunction = false;
+		bool is_unqualified_lua_reference = false;
+		std::string* p_key = nullptr;
+		reference* p_binding_ref = nullptr;
+		lua_CFunction call_func = nullptr;
+		index_call_storage* p_ics = nullptr;
+		usertype_storage_base* p_usb = nullptr;
+		void* p_derived_usb = nullptr;
+		lua_CFunction idx_call = nullptr, new_idx_call = nullptr, meta_idx_call = nullptr, meta_new_idx_call = nullptr;
+		change_indexing_mem_func change_indexing;
+
+		void operator()(lua_State* L, submetatable_type smt, reference& fast_index_table) {
+			std::string& key = *p_key;
+			usertype_storage_base& usb = *p_usb;
+			index_call_storage& ics = *p_ics;
+
+			if (smt == submetatable_type::named) {
+				// do not override __call or
+				// other specific meta functions on named metatable:
+				// we need that for call construction
+				// and other amenities
+				return;
+			}
+			int fast_index_table_push = fast_index_table.push();
+			stack_reference t(L, -fast_index_table_push);
+			if (poison_indexing) {
+				(usb.*change_indexing)(L, smt, p_derived_usb, t, idx_call, new_idx_call, meta_idx_call, meta_new_idx_call);
+			}
+			if (is_destruction
+				&& (smt == submetatable_type::reference || smt == submetatable_type::const_reference || smt == submetatable_type::named
+				     || smt == submetatable_type::unique)) {
+				// gc does not apply to us here
+				// for reference types (raw T*, std::ref)
+				// for the named metatable itself,
+				// or for unique_usertypes, which do their own custom destruction
+				t.pop();
+				return;
+			}
+			if (is_index || is_new_index || is_static_index || is_static_new_index) {
+				// do not serialize the new_index and index functions here directly
+				// we control those...
+				t.pop();
+				return;
+			}
+			if (is_unqualified_lua_CFunction) {
+				stack::set_field<false, true>(L, key, call_func, t.stack_index());
+			}
+			else if (is_unqualified_lua_reference) {
+				reference& binding_ref = *p_binding_ref;
+				stack::set_field<false, true>(L, key, binding_ref, t.stack_index());
+			}
+			else {
+				stack::set_field<false, true>(L, key, make_closure(call_func, nullptr, ics.binding_data), t.stack_index());
+			}
+			t.pop();
+		}
+	};
+
+	struct lua_reference_func {
+		reference key;
+		reference value;
+
+		void operator()(lua_State* L, submetatable_type smt, reference& fast_index_table) {
+			if (smt == submetatable_type::named) {
+				return;
+			}
+			int fast_index_table_push = fast_index_table.push();
+			stack_reference t(L, -fast_index_table_push);
+			stack::set_field<false, true>(L, key, value, t.stack_index());
+			t.pop();
+		}
+	};
+
+	struct update_bases_func {
+		detail::inheritance_check_function base_class_check_func;
+		detail::inheritance_cast_function base_class_cast_func;
+		lua_CFunction idx_call, new_idx_call, meta_idx_call, meta_new_idx_call;
+		usertype_storage_base* p_usb;
+		void* p_derived_usb;
+		change_indexing_mem_func change_indexing;
+
+		void operator()(lua_State* L, submetatable_type smt, reference& fast_index_table) {
+			int fast_index_table_push = fast_index_table.push();
+			stack_reference t(L, -fast_index_table_push);
+			stack::set_field(L, detail::base_class_check_key(), reinterpret_cast<void*>(base_class_check_func), t.stack_index());
+			stack::set_field(L, detail::base_class_cast_key(), reinterpret_cast<void*>(base_class_cast_func), t.stack_index());
+			// change indexing, forcefully
+			(p_usb->*change_indexing)(L, smt, p_derived_usb, t, idx_call, new_idx_call, meta_idx_call, meta_new_idx_call);
+			t.pop();
+		}
+	};
+
+	struct binding_data_equals {
+		void* binding_data;
+
+		binding_data_equals(void* b) : binding_data(b) {
+		}
+
+		bool operator()(const std::unique_ptr<binding_base>& ptr) const {
+			return binding_data == ptr->data();
+		}
+	};
+
+	struct usertype_storage_base {
+	public:
+		std::vector<std::unique_ptr<binding_base>> storage;
+		std::vector<std::unique_ptr<char[]>> string_keys_storage;
+		std::unordered_map<string_view, index_call_storage> string_keys;
+		std::unordered_map<reference, reference, reference_hash, reference_equals> auxiliary_keys;
+		reference value_index_table;
+		reference reference_index_table;
+		reference unique_index_table;
+		reference const_reference_index_table;
+		reference const_value_index_table;
+		reference named_index_table;
+		reference type_table;
+		reference gc_names_table;
+		reference named_metatable;
+		new_index_call_storage base_index;
+		new_index_call_storage static_base_index;
+		bool is_using_index;
+		bool is_using_new_index;
+		std::bitset<64> properties;
+
+		usertype_storage_base(lua_State* L)
+		: storage()
+		, string_keys()
+		, auxiliary_keys()
+		, value_index_table()
+		, reference_index_table()
+		, unique_index_table()
+		, const_reference_index_table()
+		, type_table(make_reference(L, create))
+		, gc_names_table(make_reference(L, create))
+		, named_metatable(make_reference(L, create))
+		, base_index()
+		, static_base_index()
+		, is_using_index(false)
+		, is_using_new_index(false)
+		, properties() {
+			base_index.binding_data = nullptr;
+			base_index.index = index_target_fail;
+			base_index.new_index = new_index_target_fail;
+			base_index.new_binding_data = nullptr;
+			static_base_index.binding_data = nullptr;
+			static_base_index.index = index_target_fail;
+			static_base_index.new_binding_data = this;
+			static_base_index.new_index = new_index_target_set;
+		}
+
+		template <typename Fx>
+		void for_each_table(lua_State* L, Fx&& fx) {
+			for (int i = 0; i < 6; ++i) {
+				submetatable_type smt = static_cast<submetatable_type>(i);
+				reference* p_fast_index_table = nullptr;
+				switch (smt) {
+				case submetatable_type::const_value:
+					p_fast_index_table = &this->const_value_index_table;
+					break;
+				case submetatable_type::reference:
+					p_fast_index_table = &this->reference_index_table;
+					break;
+				case submetatable_type::unique:
+					p_fast_index_table = &this->unique_index_table;
+					break;
+				case submetatable_type::const_reference:
+					p_fast_index_table = &this->const_reference_index_table;
+					break;
+				case submetatable_type::named:
+					p_fast_index_table = &this->named_index_table;
+					break;
+				case submetatable_type::value:
+				default:
+					p_fast_index_table = &this->value_index_table;
+					break;
+				}
+				fx(L, smt, *p_fast_index_table);
+			}
+		}
+
+		void add_entry(string_view sv, index_call_storage ics) {
+			string_keys_storage.emplace_back(new char[sv.size()]);
+			std::unique_ptr<char[]>& sv_storage = string_keys_storage.back();
+			std::memcpy(sv_storage.get(), sv.data(), sv.size());
+			string_view stored_sv(sv_storage.get(), sv.size());
+			string_keys.insert_or_assign(std::move(stored_sv), std::move(ics));
+		}
+
+		template <typename T, typename... Bases>
+		void update_bases(lua_State* L, bases<Bases...>) {
+			static_assert(sizeof(void*) <= sizeof(detail::inheritance_check_function),
+				"The size of this data pointer is too small to fit the inheritance checking function: Please file "
+				"a bug report.");
+			static_assert(sizeof(void*) <= sizeof(detail::inheritance_cast_function),
+				"The size of this data pointer is too small to fit the inheritance checking function: Please file "
+				"a bug report.");
+			static_assert(!meta::any_same<T, Bases...>::value, "base classes cannot list the original class as part of the bases");
+			if constexpr (sizeof...(Bases) < 1) {
+				return;
+			}
+
+			(void)detail::swallow { 0, ((weak_derive<Bases>::value = true), 0)... };
+
+			void* derived_this = static_cast<void*>(static_cast<usertype_storage<T>*>(this));
+
+			update_bases_func for_each_fx;
+			for_each_fx.base_class_check_func = &detail::inheritance<T>::template type_check_with<Bases...>;
+			for_each_fx.base_class_cast_func = &detail::inheritance<T>::template type_cast_with<Bases...>;
+			for_each_fx.idx_call = &usertype_storage<T>::template index_call_with_bases<false, Bases...>;
+			for_each_fx.new_idx_call = &usertype_storage<T>::template index_call_with_bases<true, Bases...>;
+			for_each_fx.meta_idx_call = &usertype_storage<T>::template meta_index_call_with_bases<false, Bases...>;
+			for_each_fx.meta_new_idx_call = &usertype_storage<T>::template meta_index_call_with_bases<true, Bases...>;
+			for_each_fx.p_usb = this;
+			for_each_fx.p_derived_usb = derived_this;
+			for_each_fx.change_indexing = &usertype_storage_base::change_indexing;
+			for_each_fx.p_derived_usb = derived_this;
+			this->for_each_table(L, for_each_fx);
+		}
+
+		void clear() {
+			if (value_index_table.valid()) {
+				stack::clear(value_index_table);
+			}
+			if (reference_index_table.valid()) {
+				stack::clear(reference_index_table);
+			}
+			if (unique_index_table.valid()) {
+				stack::clear(unique_index_table);
+			}
+			if (const_reference_index_table.valid()) {
+				stack::clear(const_reference_index_table);
+			}
+			if (const_value_index_table.valid()) {
+				stack::clear(const_value_index_table);
+			}
+			if (named_index_table.valid()) {
+				stack::clear(named_index_table);
+			}
+			if (type_table.valid()) {
+				stack::clear(type_table);
+			}
+			if (gc_names_table.valid()) {
+				stack::clear(gc_names_table);
+			}
+			if (named_metatable.valid()) {
+				lua_State* L = named_metatable.lua_state();
+				auto pp = stack::push_pop(named_metatable);
+				int named_metatable_index = pp.index_of(named_metatable);
+				if (lua_getmetatable(L, named_metatable_index) == 1) {
+					stack::clear(L, absolute_index(L, -1));
+				}
+				stack::clear(named_metatable);
+			}
+
+			value_index_table = lua_nil;
+			reference_index_table = lua_nil;
+			unique_index_table = lua_nil;
+			const_reference_index_table = lua_nil;
+			const_value_index_table = lua_nil;
+			named_index_table = lua_nil;
+			type_table = lua_nil;
+			gc_names_table = lua_nil;
+			named_metatable = lua_nil;
+
+			storage.clear();
+			string_keys.clear();
+			auxiliary_keys.clear();
+		}
+
+		template <bool is_new_index, typename Base>
+		static void base_walk_index(lua_State* L, usertype_storage_base& self, bool& keep_going, int& base_result) {
+			using bases = typename base<Base>::type;
+			if (!keep_going) {
+				return;
+			}
+			(void)L;
+			(void)self;
+#if SOL_IS_ON(SOL_USE_UNSAFE_BASE_LOOKUP_I_)
+			usertype_storage_base& base_storage = get_usertype_storage<Base>(L);
+			base_result = self_index_call<is_new_index, true>(bases(), L, base_storage);
+#else
+			optional<usertype_storage<Base>&> maybe_base_storage = maybe_get_usertype_storage<Base>(L);
+			if (static_cast<bool>(maybe_base_storage)) {
+				base_result = self_index_call<is_new_index, true>(bases(), L, *maybe_base_storage);
+				keep_going = base_result == base_walking_failed_index;
+			}
+#endif // Fast versus slow, safe base lookup
+		}
+
+		template <bool is_new_index = false, bool base_walking = false, bool from_named_metatable = false, typename... Bases>
+		static inline int self_index_call(types<Bases...>, lua_State* L, usertype_storage_base& self) {
+			type k_type = stack::get<type>(L, 2);
+			if (k_type == type::string) {
+				index_call_storage* target = nullptr;
+				{
+					string_view k = stack::get<string_view>(L, 2);
+					auto it = self.string_keys.find(k);
+					if (it != self.string_keys.cend()) {
+						target = &it->second;
+					}
+				}
+				if (target != nullptr) {
+					// let the target decide what to do
+					if constexpr (is_new_index) {
+						return (target->new_index)(L, target->binding_data);
+					}
+					else {
+						return (target->index)(L, target->binding_data);
+					}
+				}
+			}
+			else if (k_type != type::lua_nil && k_type != type::none) {
+				reference* target = nullptr;
+				{
+					stack_reference k = stack::get<stack_reference>(L, 2);
+					auto it = self.auxiliary_keys.find(k);
+					if (it != self.auxiliary_keys.cend()) {
+						target = &it->second;
+					}
+				}
+				if (target != nullptr) {
+					if constexpr (is_new_index) {
+						// set value and return
+						*target = reference(L, 3);
+						return 0;
+					}
+					else {
+						// push target to return
+						// what we found
+						return stack::push(L, *target);
+					}
+				}
+			}
+
+			// retrieve bases and walk through them.
+			bool keep_going = true;
+			int base_result;
+			(void)keep_going;
+			(void)base_result;
+			(void)detail::swallow { 1, (base_walk_index<is_new_index, Bases>(L, self, keep_going, base_result), 1)... };
+			if constexpr (sizeof...(Bases) > 0) {
+				if (!keep_going) {
+					return base_result;
+				}
+			}
+			if constexpr (base_walking) {
+				// if we're JUST base-walking then don't index-fail, just
+				// return the false bits
+				return base_walking_failed_index;
+			}
+			else if constexpr (from_named_metatable) {
+				if constexpr (is_new_index) {
+					return self.static_base_index.new_index(L, self.static_base_index.new_binding_data);
+				}
+				else {
+					return self.static_base_index.index(L, self.static_base_index.binding_data);
+				}
+			}
+			else {
+				if constexpr (is_new_index) {
+					return self.base_index.new_index(L, self.base_index.new_binding_data);
+				}
+				else {
+					return self.base_index.index(L, self.base_index.binding_data);
+				}
+			}
+		}
+
+		void change_indexing(lua_State* L, submetatable_type submetatable, void* derived_this, stack_reference& t, lua_CFunction index,
+			lua_CFunction new_index, lua_CFunction meta_index, lua_CFunction meta_new_index) {
+			usertype_storage_base& this_base = *this;
+			void* base_this = static_cast<void*>(&this_base);
+
+			this->is_using_index |= true;
+			this->is_using_new_index |= true;
+			if (submetatable == submetatable_type::named) {
+				stack::set_field(L, metatable_key, named_index_table, t.stack_index());
+				stack_reference stack_metametatable(L, -named_metatable.push());
+				stack::set_field<false, true>(L,
+					meta_function::index,
+					make_closure(meta_index, nullptr, derived_this, base_this, nullptr, toplevel_magic),
+					stack_metametatable.stack_index());
+				stack::set_field<false, true>(L,
+					meta_function::new_index,
+					make_closure(meta_new_index, nullptr, derived_this, base_this, nullptr, toplevel_magic),
+					stack_metametatable.stack_index());
+				stack_metametatable.pop();
+			}
+			else {
+				stack::set_field<false, true>(
+					L, meta_function::index, make_closure(index, nullptr, derived_this, base_this, nullptr, toplevel_magic), t.stack_index());
+				stack::set_field<false, true>(
+					L, meta_function::new_index, make_closure(new_index, nullptr, derived_this, base_this, nullptr, toplevel_magic), t.stack_index());
+			}
+		}
+
+		template <typename T = void, typename Key, typename Value>
+		void set(lua_State* L, Key&& key, Value&& value);
+
+		static int new_index_target_set(lua_State* L, void* target) {
+			usertype_storage_base& self = *static_cast<usertype_storage_base*>(target);
+			self.set(L, reference(L, raw_index(2)), reference(L, raw_index(3)));
+			return 0;
+		}
+	};
+
+	template <typename T>
+	struct usertype_storage : usertype_storage_base {
+
+		using usertype_storage_base::usertype_storage_base;
+
+		template <bool is_new_index, bool from_named_metatable>
+		static inline int index_call_(lua_State* L) {
+			using bases = typename base<T>::type;
+			usertype_storage_base& self = stack::get<light<usertype_storage_base>>(L, upvalue_index(usertype_storage_index));
+			return self_index_call<is_new_index, false, from_named_metatable>(bases(), L, self);
+		}
+
+		template <bool is_new_index, bool from_named_metatable, typename... Bases>
+		static inline int index_call_with_bases_(lua_State* L) {
+			using bases = types<Bases...>;
+			usertype_storage_base& self = stack::get<light<usertype_storage_base>>(L, upvalue_index(usertype_storage_index));
+			return self_index_call<is_new_index, false, from_named_metatable>(bases(), L, self);
+		}
+
+		template <bool is_new_index>
+		static inline int index_call(lua_State* L) {
+			return detail::static_trampoline<&index_call_<is_new_index, false>>(L);
+		}
+
+		template <bool is_new_index, typename... Bases>
+		static inline int index_call_with_bases(lua_State* L) {
+			return detail::static_trampoline<&index_call_with_bases_<is_new_index, false, Bases...>>(L);
+		}
+
+		template <bool is_new_index>
+		static inline int meta_index_call(lua_State* L) {
+			return detail::static_trampoline<&index_call_<is_new_index, true>>(L);
+		}
+
+		template <bool is_new_index, typename... Bases>
+		static inline int meta_index_call_with_bases(lua_State* L) {
+			return detail::static_trampoline<&index_call_with_bases_<is_new_index, true, Bases...>>(L);
+		}
+
+		template <typename Key, typename Value>
+		inline void set(lua_State* L, Key&& key, Value&& value);
+	};
+
+	template <typename T>
+	inline int destruct_usertype_storage(lua_State* L) {
+		return detail::user_alloc_destruct<usertype_storage<T>>(L);
+	}
+
+	template <typename T, typename Key, typename Value>
+	void usertype_storage_base::set(lua_State* L, Key&& key, Value&& value) {
+		using ValueU = meta::unwrap_unqualified_t<Value>;
+		using KeyU = meta::unwrap_unqualified_t<Key>;
+		using Binding = binding<KeyU, ValueU, T>;
+		using is_var_bind = is_variable_binding<ValueU>;
+		if constexpr (std::is_same_v<KeyU, call_construction>) {
+			(void)key;
+			std::unique_ptr<Binding> p_binding = std::make_unique<Binding>(std::forward<Value>(value));
+			Binding& b = *p_binding;
+			this->storage.push_back(std::move(p_binding));
+
+			this->named_index_table.push();
+			absolute_index metametatable_index(L, -1);
+			stack::push(L, nullptr);
+			stack::push(L, b.data());
+			lua_CFunction target_func = &b.template call<false, false>;
+			lua_pushcclosure(L, target_func, 2);
+			lua_setfield(L, metametatable_index, to_string(meta_function::call).c_str());
+			this->named_index_table.pop();
+		}
+		else if constexpr (std::is_same_v<KeyU, base_classes_tag>) {
+			(void)key;
+			this->update_bases<T>(L, std::forward<Value>(value));
+		}
+		else if constexpr ((meta::is_string_like_or_constructible<KeyU>::value || std::is_same_v<KeyU, meta_function>)) {
+			std::string s = u_detail::make_string(std::forward<Key>(key));
+			auto storage_it = this->storage.end();
+			auto string_it = this->string_keys.find(s);
+			if (string_it != this->string_keys.cend()) {
+				const auto& binding_data = string_it->second.binding_data;
+				storage_it = std::find_if(this->storage.begin(), this->storage.end(), binding_data_equals(binding_data));
+				this->string_keys.erase(string_it);
+			}
+
+			std::unique_ptr<Binding> p_binding = std::make_unique<Binding>(std::forward<Value>(value));
+			Binding& b = *p_binding;
+			if (storage_it != this->storage.cend()) {
+				*storage_it = std::move(p_binding);
+			}
+			else {
+				this->storage.push_back(std::move(p_binding));
+			}
+
+			bool is_index = (s == to_string(meta_function::index));
+			bool is_new_index = (s == to_string(meta_function::new_index));
+			bool is_static_index = (s == to_string(meta_function::static_index));
+			bool is_static_new_index = (s == to_string(meta_function::static_new_index));
+			bool is_destruction = s == to_string(meta_function::garbage_collect);
+			bool poison_indexing = (!is_using_index || !is_using_new_index) && (is_var_bind::value || is_index || is_new_index);
+			void* derived_this = static_cast<void*>(static_cast<usertype_storage<T>*>(this));
+			index_call_storage ics;
+			ics.binding_data = b.data();
+			ics.index = is_index || is_static_index ? &Binding::template call_with_<true, is_var_bind::value>
+				                                   : &Binding::template index_call_with_<true, is_var_bind::value>;
+			ics.new_index = is_new_index || is_static_new_index ? &Binding::template call_with_<false, is_var_bind::value>
+				                                               : &Binding::template index_call_with_<false, is_var_bind::value>;
+
+			string_for_each_metatable_func for_each_fx;
+			for_each_fx.is_destruction = is_destruction;
+			for_each_fx.is_index = is_index;
+			for_each_fx.is_new_index = is_new_index;
+			for_each_fx.is_static_index = is_static_index;
+			for_each_fx.is_static_new_index = is_static_new_index;
+			for_each_fx.poison_indexing = poison_indexing;
+			for_each_fx.p_key = &s;
+			for_each_fx.p_ics = &ics;
+			if constexpr (is_lua_c_function_v<ValueU>) {
+				for_each_fx.is_unqualified_lua_CFunction = true;
+				for_each_fx.call_func = *static_cast<lua_CFunction*>(ics.binding_data);
+			}
+			else if constexpr (is_lua_reference_or_proxy_v<ValueU>) {
+				for_each_fx.is_unqualified_lua_reference = true;
+				for_each_fx.p_binding_ref = static_cast<reference*>(ics.binding_data);
+			}
+			else {
+				for_each_fx.call_func = &b.template call<false, is_var_bind::value>;
+			}
+			for_each_fx.p_usb = this;
+			for_each_fx.p_derived_usb = derived_this;
+			for_each_fx.idx_call = &usertype_storage<T>::template index_call<false>;
+			for_each_fx.new_idx_call = &usertype_storage<T>::template index_call<true>;
+			for_each_fx.meta_idx_call = &usertype_storage<T>::template meta_index_call<false>;
+			for_each_fx.meta_new_idx_call = &usertype_storage<T>::template meta_index_call<true>;
+			for_each_fx.change_indexing = &usertype_storage_base::change_indexing;
+			// set base index and base new_index
+			// functions here
+			if (is_index) {
+				this->base_index.index = ics.index;
+				this->base_index.binding_data = ics.binding_data;
+			}
+			if (is_new_index) {
+				this->base_index.new_index = ics.new_index;
+				this->base_index.new_binding_data = ics.binding_data;
+			}
+			if (is_static_index) {
+				this->static_base_index.index = ics.index;
+				this->static_base_index.binding_data = ics.binding_data;
+			}
+			if (is_static_new_index) {
+				this->static_base_index.new_index = ics.new_index;
+				this->static_base_index.new_binding_data = ics.binding_data;
+			}
+			this->for_each_table(L, for_each_fx);
+			this->add_entry(s, std::move(ics));
+		}
+		else {
+			// the reference-based implementation might compare poorly and hash
+			// poorly in some cases...
+			if constexpr (is_lua_reference_v<KeyU> && is_lua_reference_v<ValueU>) {
+				if (key.get_type() == type::string) {
+					stack::push(L, key);
+					std::string string_key = stack::pop<std::string>(L);
+					this->set<T>(L, string_key, std::forward<Value>(value));
+				}
+				else {
+					lua_reference_func ref_additions_fx { key, value };
+
+					this->for_each_table(L, ref_additions_fx);
+					this->auxiliary_keys.insert_or_assign(std::forward<Key>(key), std::forward<Value>(value));
+				}
+			}
+			else {
+				reference ref_key = make_reference(L, std::forward<Key>(key));
+				reference ref_value = make_reference(L, std::forward<Value>(value));
+				lua_reference_func ref_additions_fx { key, value };
+
+				this->for_each_table(L, ref_additions_fx);
+				this->auxiliary_keys.insert_or_assign(std::move(ref_key), std::move(ref_value));
+			}
+		}
+	}
+
+	template <typename T>
+	template <typename Key, typename Value>
+	void usertype_storage<T>::set(lua_State* L, Key&& key, Value&& value) {
+		static_cast<usertype_storage_base&>(*this).set<T>(L, std::forward<Key>(key), std::forward<Value>(value));
+	}
+
+	template <typename T>
+	inline usertype_storage<T>& create_usertype_storage(lua_State* L) {
+		const char* gcmetakey = &usertype_traits<T>::gc_table()[0];
+
+		// Make sure userdata's memory is properly in lua first,
+		// otherwise all the light userdata we make later will become invalid
+		int usertype_storage_push_count = stack::push<user<usertype_storage<T>>>(L, no_metatable, L);
+		stack_reference usertype_storage_ref(L, -usertype_storage_push_count);
+
+		// create and push onto the stack a table to use as metatable for this GC
+		// we create a metatable to attach to the regular gc_table
+		// so that the destructor is called for the usertype storage
+		int usertype_storage_metatabe_count = stack::push(L, new_table(0, 1));
+		stack_reference usertype_storage_metatable(L, -usertype_storage_metatabe_count);
+		// set the destruction routine on the metatable
+		stack::set_field(L, meta_function::garbage_collect, &destruct_usertype_storage<T>, usertype_storage_metatable.stack_index());
+		// set the metatable on the usertype storage userdata
+		stack::set_field(L, metatable_key, usertype_storage_metatable, usertype_storage_ref.stack_index());
+		usertype_storage_metatable.pop();
+
+		// set the usertype storage and its metatable
+		// into the global table...
+		stack::set_field<true>(L, gcmetakey, usertype_storage_ref);
+		usertype_storage_ref.pop();
+
+		// then retrieve the lua-stored version so we have a well-pinned
+		// reference that does not die
+		stack::get_field<true>(L, gcmetakey);
+		usertype_storage<T>& target_umt = stack::pop<user<usertype_storage<T>>>(L);
+		return target_umt;
+	}
+
+	inline optional<usertype_storage_base&> maybe_get_usertype_storage_base(lua_State* L, int index) {
+		stack::record tracking;
+		if (!stack::check<user<usertype_storage_base>>(L, index)) {
+			return nullopt;
+		}
+		usertype_storage_base& target_umt = stack::stack_detail::unchecked_unqualified_get<user<usertype_storage_base>>(L, -1, tracking);
+		return target_umt;
+	}
+
+	inline optional<usertype_storage_base&> maybe_get_usertype_storage_base(lua_State* L, const char* gcmetakey) {
+		stack::get_field<true>(L, gcmetakey);
+		auto maybe_storage = maybe_get_usertype_storage_base(L, lua_gettop(L));
+		lua_pop(L, 1);
+		return maybe_storage;
+	}
+
+	inline usertype_storage_base& get_usertype_storage_base(lua_State* L, const char* gcmetakey) {
+		stack::get_field<true>(L, gcmetakey);
+		stack::record tracking;
+		usertype_storage_base& target_umt = stack::stack_detail::unchecked_unqualified_get<user<usertype_storage_base>>(L, -1, tracking);
+		lua_pop(L, 1);
+		return target_umt;
+	}
+
+	template <typename T>
+	inline optional<usertype_storage<T>&> maybe_get_usertype_storage(lua_State* L) {
+		const char* gcmetakey = &usertype_traits<T>::gc_table()[0];
+		stack::get_field<true>(L, gcmetakey);
+		int target = lua_gettop(L);
+		if (!stack::check<user<usertype_storage<T>>>(L, target)) {
+			return nullopt;
+		}
+		usertype_storage<T>& target_umt = stack::pop<user<usertype_storage<T>>>(L);
+		return target_umt;
+	}
+
+	template <typename T>
+	inline usertype_storage<T>& get_usertype_storage(lua_State* L) {
+		const char* gcmetakey = &usertype_traits<T>::gc_table()[0];
+		stack::get_field<true>(L, gcmetakey);
+		usertype_storage<T>& target_umt = stack::pop<user<usertype_storage<T>>>(L);
+		return target_umt;
+	}
+
+	template <typename T>
+	inline void delete_usertype_storage(lua_State* L) {
+		using u_traits = usertype_traits<T>;
+#if 0
+		using u_const_traits = usertype_traits<const T>;
+		using u_unique_traits = usertype_traits<detail::unique_usertype<T>>;
+		using u_ref_traits = usertype_traits<T*>;
+		using u_const_ref_traits = usertype_traits<T const*>;
+#endif
+		using uts = usertype_storage<T>;
+
+		const char* gcmetakey = &u_traits::gc_table()[0];
+		stack::get_field<true>(L, gcmetakey);
+		if (!stack::check<user<uts>>(L)) {
+			lua_pop(L, 1);
+			return;
+		}
+		usertype_storage<T>& target_umt = stack::pop<user<usertype_storage<T>>>(L);
+		target_umt.clear();
+
+		// get the registry
+#if 0
+		stack_reference registry(L, raw_index(LUA_REGISTRYINDEX));
+		registry.push();
+		// eliminate all named entries for this usertype
+		// in the registry (luaL_newmetatable does
+		// [name] = new table
+		// in registry upon creation
+		stack::set_field(L, &u_traits::metatable()[0], lua_nil, registry.stack_index());
+		stack::set_field(L, &u_const_traits::metatable()[0], lua_nil, registry.stack_index());
+		stack::set_field(L, &u_const_ref_traits::metatable()[0], lua_nil, registry.stack_index());
+		stack::set_field(L, &u_ref_traits::metatable()[0], lua_nil, registry.stack_index());
+		stack::set_field(L, &u_unique_traits::metatable()[0], lua_nil, registry.stack_index());
+		registry.pop();
+#endif // Registry Cleanout
+
+		stack::set_field<true>(L, gcmetakey, lua_nil);
+	}
+
+	template <typename T>
+	inline int register_usertype(lua_State* L, automagic_enrollments enrollments = {}) {
+		using u_traits = usertype_traits<T>;
+		using u_const_traits = usertype_traits<const T>;
+		using u_unique_traits = usertype_traits<detail::unique_usertype<T>>;
+		using u_ref_traits = usertype_traits<T*>;
+		using u_const_ref_traits = usertype_traits<T const*>;
+		using uts = usertype_storage<T>;
+
+		// always have __new_index point to usertype_storage method
+		// have __index always point to regular fast-lookup
+		// meta_method table
+		// if __new_index is invoked, runtime-swap
+		// to slow __index if necessary
+		// (no speed penalty because function calls
+		// are all read-only -- only depend on __index
+		// to retrieve function and then call happens VIA Lua)
+
+		// __type entry:
+		// table contains key -> value lookup,
+		// where key is entry in metatable
+		// and value is type information as a string as
+		// best as we can give it
+
+		// name entry:
+		// string that contains raw class name,
+		// as defined from C++
+
+		// is entry:
+		// checks if argument supplied is of type T
+
+		// __storage entry:
+		// a light userdata pointing to the storage
+		// mostly to enable this new abstraction
+		// to not require the type name `T`
+		// to get at the C++ usertype storage within
+
+		// we then let typical definitions potentially override these intrinsics
+		// it's the user's fault if they override things or screw them up:
+		// these names have been reserved and documented since sol3
+
+		// STEP 0: tell the old usertype (if it exists)
+		// to fuck off
+		delete_usertype_storage<T>(L);
+
+		// STEP 1: Create backing store for usertype storage
+		// Pretty much the most important step.
+		// STEP 2: Create Lua tables used for fast method indexing.
+		// This is done inside of the storage table's constructor
+		usertype_storage<T>& storage = create_usertype_storage<T>(L);
+		usertype_storage_base& base_storage = storage;
+		void* light_storage = static_cast<void*>(&storage);
+		void* light_base_storage = static_cast<void*>(&base_storage);
+
+		// STEP 3: set up GC escape hatch table entirely
+		storage.gc_names_table.push();
+		stack_reference gnt(L, -1);
+		stack::set_field(L, submetatable_type::named, &u_traits::gc_table()[0], gnt.stack_index());
+		stack::set_field(L, submetatable_type::const_value, &u_const_traits::metatable()[0], gnt.stack_index());
+		stack::set_field(L, submetatable_type::const_reference, &u_const_ref_traits::metatable()[0], gnt.stack_index());
+		stack::set_field(L, submetatable_type::reference, &u_ref_traits::metatable()[0], gnt.stack_index());
+		stack::set_field(L, submetatable_type::unique, &u_unique_traits::metatable()[0], gnt.stack_index());
+		stack::set_field(L, submetatable_type::value, &u_traits::metatable()[0], gnt.stack_index());
+		gnt.pop();
+
+		// STEP 4: add some useful information to the type table
+		stack_reference stacked_type_table(L, -storage.type_table.push());
+		stack::set_field(L, "name", detail::demangle<T>(), stacked_type_table.stack_index());
+		stack::set_field(L, "is", &detail::is_check<T>, stacked_type_table.stack_index());
+		stacked_type_table.pop();
+
+		// STEP 5: create and hook up metatable,
+		// add intrinsics
+		// this one is the actual meta-handling table,
+		// the next one will be the one for
+		int for_each_backing_metatable_calls = 0;
+		auto for_each_backing_metatable = [&](lua_State* L, submetatable_type smt, reference& fast_index_table) {
+			// Pointer types, AKA "references" from C++
+			const char* metakey = nullptr;
+			switch (smt) {
+			case submetatable_type::const_value:
+				metakey = &u_const_traits::metatable()[0];
+				break;
+			case submetatable_type::reference:
+				metakey = &u_ref_traits::metatable()[0];
+				break;
+			case submetatable_type::unique:
+				metakey = &u_unique_traits::metatable()[0];
+				break;
+			case submetatable_type::const_reference:
+				metakey = &u_const_ref_traits::metatable()[0];
+				break;
+			case submetatable_type::named:
+				metakey = &u_traits::user_metatable()[0];
+				break;
+			case submetatable_type::value:
+			default:
+				metakey = &u_traits::metatable()[0];
+				break;
+			}
+
+			luaL_newmetatable(L, metakey);
+			if (smt == submetatable_type::named) {
+				// the named table itself
+				// gets the associated name value
+				storage.named_metatable = reference(L, -1);
+				lua_pop(L, 1);
+				// but the thing we perform the methods on
+				// is still the metatable of the named
+				// table
+				lua_createtable(L, 0, 6);
+			}
+			stack_reference t(L, -1);
+			fast_index_table = reference(t);
+			stack::set_field<false, true>(L, meta_function::type, storage.type_table, t.stack_index());
+			if constexpr (std::is_destructible_v<T>) {
+				// destructible: serialize default
+				// destructor here
+				switch (smt) {
+				case submetatable_type::const_reference:
+				case submetatable_type::reference:
+				case submetatable_type::named:
+					break;
+				case submetatable_type::unique:
+					stack::set_field<false, true>(L, meta_function::garbage_collect, &detail::unique_destruct<T>, t.stack_index());
+					break;
+				case submetatable_type::value:
+				case submetatable_type::const_value:
+				default:
+					stack::set_field<false, true>(L, meta_function::garbage_collect, detail::make_destructor<T>(), t.stack_index());
+					break;
+				}
+			}
+			else {
+				// not destructible: serialize a
+				// "hey you messed up"
+				// destructor
+				switch (smt) {
+				case submetatable_type::const_reference:
+				case submetatable_type::reference:
+				case submetatable_type::named:
+					break;
+				case submetatable_type::unique:
+					stack::set_field<false, true>(L, meta_function::garbage_collect, &detail::cannot_destruct<T>, t.stack_index());
+					break;
+				case submetatable_type::value:
+				case submetatable_type::const_value:
+				default:
+					stack::set_field<false, true>(L, meta_function::garbage_collect, &detail::cannot_destruct<T>, t.stack_index());
+					break;
+				}
+			}
+
+			static_assert(sizeof(void*) <= sizeof(detail::inheritance_check_function),
+				"The size of this data pointer is too small to fit the inheritance checking function: file a bug "
+				"report.");
+			static_assert(sizeof(void*) <= sizeof(detail::inheritance_cast_function),
+				"The size of this data pointer is too small to fit the inheritance checking function: file a bug "
+				"report.");
+			stack::set_field<false, true>(L, detail::base_class_check_key(), reinterpret_cast<void*>(&detail::inheritance<T>::type_check), t.stack_index());
+			stack::set_field<false, true>(L, detail::base_class_cast_key(), reinterpret_cast<void*>(&detail::inheritance<T>::type_cast), t.stack_index());
+
+			auto prop_fx = detail::properties_enrollment_allowed(for_each_backing_metatable_calls, storage.properties, enrollments);
+			auto insert_fx = [&L, &t, &storage](meta_function mf, lua_CFunction reg) {
+				stack::set_field<false, true>(L, mf, reg, t.stack_index());
+				storage.properties[static_cast<int>(mf)] = true;
+			};
+			detail::insert_default_registrations<T>(insert_fx, prop_fx);
+
+			// There are no variables, so serialize the fast function stuff
+			// be sure to reset the index stuff to the non-fast version
+			// if the user ever adds something later!
+			if (smt == submetatable_type::named) {
+				// add escape hatch storage pointer and gc names
+				stack::set_field<false, true>(L, meta_function::storage, light_base_storage, t.stack_index());
+				stack::set_field<false, true>(L, meta_function::gc_names, storage.gc_names_table, t.stack_index());
+
+				// fancy new_indexing when using the named table
+				{
+					absolute_index named_metatable_index(L, -storage.named_metatable.push());
+					stack::set_field<false, true>(L, metatable_key, t, named_metatable_index);
+					storage.named_metatable.pop();
+				}
+				stack_reference stack_metametatable(L, -storage.named_index_table.push());
+				stack::set_field<false, true>(L,
+					meta_function::index,
+					make_closure(uts::template meta_index_call<false>, nullptr, light_storage, light_base_storage, nullptr, toplevel_magic),
+					stack_metametatable.stack_index());
+				stack::set_field<false, true>(L,
+					meta_function::new_index,
+					make_closure(uts::template meta_index_call<true>, nullptr, light_storage, light_base_storage, nullptr, toplevel_magic),
+					stack_metametatable.stack_index());
+				stack_metametatable.pop();
+			}
+			else {
+				// otherwise just plain for index,
+				// and elaborated for new_index
+				stack::set_field<false, true>(L, meta_function::index, t, t.stack_index());
+				stack::set_field<false, true>(L,
+					meta_function::new_index,
+					make_closure(uts::template index_call<true>, nullptr, light_storage, light_base_storage, nullptr, toplevel_magic),
+					t.stack_index());
+				storage.is_using_new_index = true;
+			}
+
+			++for_each_backing_metatable_calls;
+			fast_index_table = reference(L, t);
+			t.pop();
+		};
+
+		storage.for_each_table(L, for_each_backing_metatable);
+
+		// can only use set AFTER we initialize all the metatables
+		if constexpr (std::is_default_constructible_v<T>) {
+			if (enrollments.default_constructor) {
+				storage.set(L, meta_function::construct, constructors<T()>());
+			}
+		}
+
+		// return the named metatable we want names linked into
+		storage.named_metatable.push();
+		return 1;
+	}
+}} // namespace sol::u_detail
+
+// end of sol/usertype_storage.hpp
+
+// beginning of sol/usertype_proxy.hpp
+
+namespace sol {
+	template <typename Table, typename Key>
+	struct usertype_proxy : public proxy_base<usertype_proxy<Table, Key>> {
+	private:
+		using key_type = detail::proxy_key_t<Key>;
+
+		template <typename T, std::size_t... I>
+		decltype(auto) tuple_get(std::index_sequence<I...>) const & {
+			return tbl.template traverse_get<T>(std::get<I>(key)...);
+		}
+
+		template <typename T, std::size_t... I>
+		decltype(auto) tuple_get(std::index_sequence<I...>) && {
+			return tbl.template traverse_get<T>(std::get<I>(std::move(key))...);
+		}
+
+		template <std::size_t... I, typename T>
+		void tuple_set(std::index_sequence<I...>, T&& value) & {
+			if constexpr (sizeof...(I) > 1) {
+				tbl.traverse_set(std::get<I>(key)..., std::forward<T>(value));
+			}
+			else {
+				tbl.set(std::get<I>(key)..., std::forward<T>(value));
+			}
+		}
+
+		template <std::size_t... I, typename T>
+		void tuple_set(std::index_sequence<I...>, T&& value) && {
+			if constexpr (sizeof...(I) > 1) {
+				tbl.traverse_set(std::get<I>(std::move(key))..., std::forward<T>(value));
+			}
+			else {
+				tbl.set(std::get<I>(std::move(key))..., std::forward<T>(value));
+			}
+		}
+
+	public:
+		Table tbl;
+		key_type key;
+
+		template <typename T>
+		usertype_proxy(Table table, T&& k)
+		: tbl(table), key(std::forward<T>(k)) {
+		}
+
+		template <typename T>
+		usertype_proxy& set(T&& item) & {
+			using idx_seq = std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>;
+			tuple_set(idx_seq(), std::forward<T>(item));
+			return *this;
+		}
+
+		template <typename T>
+		usertype_proxy&& set(T&& item) && {
+			using idx_seq = std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>;
+			std::move(*this).tuple_set(idx_seq(), std::forward<T>(item));
+			return std::move(*this);
+		}
+
+		template <typename T>
+		usertype_proxy& operator=(T&& other) & {
+			return set(std::forward<T>(other));
+		}
+
+		template <typename T>
+		usertype_proxy&& operator=(T&& other) && {
+			return std::move(*this).set(std::forward<T>(other));
+		}
+
+		template <typename T>
+		usertype_proxy& operator=(std::initializer_list<T> other) & {
+			return set(std::move(other));
+		}
+
+		template <typename T>
+		usertype_proxy&& operator=(std::initializer_list<T> other) && {
+			return std::move(*this).set(std::move(other));
+		}
+
+		template <typename T>
+		decltype(auto) get() const& {
+			using idx_seq = std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>;
+			return tuple_get<T>(idx_seq());
+		}
+
+		template <typename T>
+		decltype(auto) get() && {
+			using idx_seq = std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>;
+			return std::move(*this).template tuple_get<T>(idx_seq());
+		}
+
+		template <typename K>
+		decltype(auto) operator[](K&& k) const& {
+			auto keys = meta::tuplefy(key, std::forward<K>(k));
+			return usertype_proxy<Table, decltype(keys)>(tbl, std::move(keys));
+		}
+
+		template <typename K>
+		decltype(auto) operator[](K&& k) & {
+			auto keys = meta::tuplefy(key, std::forward<K>(k));
+			return usertype_proxy<Table, decltype(keys)>(tbl, std::move(keys));
+		}
+
+		template <typename K>
+		decltype(auto) operator[](K&& k) && {
+			auto keys = meta::tuplefy(std::move(key), std::forward<K>(k));
+			return usertype_proxy<Table, decltype(keys)>(tbl, std::move(keys));
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) call(Args&&... args) {
+#if !defined(__clang__) && defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 191200000
+			// MSVC is ass sometimes
+			return get<function>().call<Ret...>(std::forward<Args>(args)...);
+#else
+			return get<function>().template call<Ret...>(std::forward<Args>(args)...);
+#endif
+		}
+
+		template <typename... Args>
+		decltype(auto) operator()(Args&&... args) {
+			return call<>(std::forward<Args>(args)...);
+		}
+
+		bool valid() const {
+			auto pp = stack::push_pop(tbl);
+			auto p = stack::probe_get_field<std::is_same<meta::unqualified_t<Table>, global_table>::value>(lua_state(), key, lua_gettop(lua_state()));
+			lua_pop(lua_state(), p.levels);
+			return p;
+		}
+
+		int push() const noexcept {
+			return push(this->lua_state());
+		}
+
+		int push(lua_State* L) const noexcept {
+			return get<reference>().push(L);
+		}
+
+		type get_type() const {
+			type t = type::none;
+			auto pp = stack::push_pop(tbl);
+			auto p = stack::probe_get_field<std::is_same<meta::unqualified_t<Table>, global_table>::value>(lua_state(), key, lua_gettop(lua_state()));
+			if (p) {
+				t = type_of(lua_state(), -1);
+			}
+			lua_pop(lua_state(), p.levels);
+			return t;
+		}
+
+		lua_State* lua_state() const {
+			return tbl.lua_state();
+		}
+	};
+} // namespace sol
+
+// end of sol/usertype_proxy.hpp
+
+// beginning of sol/metatable.hpp
+
+// beginning of sol/table_core.hpp
+
+// beginning of sol/table_proxy.hpp
+
+namespace sol {
+
+	template <typename Table, typename Key>
+	struct table_proxy : public proxy_base<table_proxy<Table, Key>> {
+	private:
+		using key_type = detail::proxy_key_t<Key>;
+
+		template <typename T, std::size_t... I>
+		decltype(auto) tuple_get(std::index_sequence<I...>) const& {
+			return tbl.template traverse_get<T>(std::get<I>(key)...);
+		}
+
+		template <typename T, std::size_t... I>
+		decltype(auto) tuple_get(std::index_sequence<I...>) && {
+			return tbl.template traverse_get<T>(std::get<I>(std::move(key))...);
+		}
+
+		template <std::size_t... I, typename T>
+		void tuple_set(std::index_sequence<I...>, T&& value) & {
+			tbl.traverse_set(std::get<I>(key)..., std::forward<T>(value));
+		}
+
+		template <std::size_t... I, typename T>
+		void tuple_set(std::index_sequence<I...>, T&& value) && {
+			tbl.traverse_set(std::get<I>(std::move(key))..., std::forward<T>(value));
+		}
+
+		auto setup_table(std::true_type) {
+			auto p = stack::probe_get_field<std::is_same_v<meta::unqualified_t<Table>, global_table>>(lua_state(), key, tbl.stack_index());
+			lua_pop(lua_state(), p.levels);
+			return p;
+		}
+
+		bool is_valid(std::false_type) {
+			auto pp = stack::push_pop(tbl);
+			auto p = stack::probe_get_field<std::is_same_v<meta::unqualified_t<Table>, global_table>>(lua_state(), key, lua_gettop(lua_state()));
+			lua_pop(lua_state(), p.levels);
+			return p;
+		}
+
+	public:
+		Table tbl;
+		key_type key;
+
+		template <typename T>
+		table_proxy(Table table, T&& k) : tbl(table), key(std::forward<T>(k)) {
+		}
+
+		template <typename T>
+		table_proxy& set(T&& item) & {
+			tuple_set(std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>(), std::forward<T>(item));
+			return *this;
+		}
+
+		template <typename T>
+		table_proxy&& set(T&& item) && {
+			tuple_set(std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>(), std::forward<T>(item));
+			return std::move(*this);
+		}
+
+		template <typename... Args>
+		table_proxy& set_function(Args&&... args) & {
+			tbl.set_function(key, std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename... Args>
+		table_proxy&& set_function(Args&&... args) && {
+			tbl.set_function(std::move(key), std::forward<Args>(args)...);
+			return std::move(*this);
+		}
+
+		template <typename T>
+		table_proxy& operator=(T&& other) & {
+			using Tu = meta::unwrap_unqualified_t<T>;
+			if constexpr (!is_lua_reference_or_proxy_v<Tu> && meta::is_callable_v<Tu>) {
+				return set_function(std::forward<T>(other));
+			}
+			else {
+				return set(std::forward<T>(other));
+			}
+		}
+
+		template <typename T>
+		table_proxy&& operator=(T&& other) && {
+			using Tu = meta::unwrap_unqualified_t<T>;
+			if constexpr (!is_lua_reference_or_proxy_v<Tu> && meta::is_callable_v<Tu>) {
+				return std::move(*this).set_function(std::forward<T>(other));
+			}
+			else {
+				return std::move(*this).set(std::forward<T>(other));
+			}
+		}
+
+		template <typename T>
+		table_proxy& operator=(std::initializer_list<T> other) & {
+			return set(std::move(other));
+		}
+
+		template <typename T>
+		table_proxy&& operator=(std::initializer_list<T> other) && {
+			return std::move(*this).set(std::move(other));
+		}
+
+		template <typename T>
+		decltype(auto) get() const& {
+			using idx_seq = std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>;
+			return tuple_get<T>(idx_seq());
+		}
+
+		template <typename T>
+		decltype(auto) get() && {
+			using idx_seq = std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>;
+			return std::move(*this).template tuple_get<T>(idx_seq());
+		}
+
+		template <typename T>
+		decltype(auto) get_or(T&& otherwise) const {
+			typedef decltype(get<T>()) U;
+			optional<U> option = get<optional<U>>();
+			if (option) {
+				return static_cast<U>(option.value());
+			}
+			return static_cast<U>(std::forward<T>(otherwise));
+		}
+
+		template <typename T, typename D>
+		decltype(auto) get_or(D&& otherwise) const {
+			optional<T> option = get<optional<T>>();
+			if (option) {
+				return static_cast<T>(option.value());
+			}
+			return static_cast<T>(std::forward<D>(otherwise));
+		}
+
+		template <typename T>
+		decltype(auto) get_or_create() {
+			return get_or_create<T>(new_table());
+		}
+
+		template <typename T, typename Otherwise>
+		decltype(auto) get_or_create(Otherwise&& other) {
+			if (!this->valid()) {
+				this->set(std::forward<Otherwise>(other));
+			}
+			return get<T>();
+		}
+
+		template <typename K>
+		decltype(auto) operator[](K&& k) const& {
+			auto keys = meta::tuplefy(key, std::forward<K>(k));
+			return table_proxy<Table, decltype(keys)>(tbl, std::move(keys));
+		}
+
+		template <typename K>
+		decltype(auto) operator[](K&& k) & {
+			auto keys = meta::tuplefy(key, std::forward<K>(k));
+			return table_proxy<Table, decltype(keys)>(tbl, std::move(keys));
+		}
+
+		template <typename K>
+		decltype(auto) operator[](K&& k) && {
+			auto keys = meta::tuplefy(std::move(key), std::forward<K>(k));
+			return table_proxy<Table, decltype(keys)>(tbl, std::move(keys));
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) call(Args&&... args) {
+			lua_State* L = this->lua_state();
+			push(L);
+			int idx = lua_gettop(L);
+			stack_aligned_function func(L, idx);
+			return func.call<Ret...>(std::forward<Args>(args)...);
+		}
+
+		template <typename... Args>
+		decltype(auto) operator()(Args&&... args) {
+			return call<>(std::forward<Args>(args)...);
+		}
+
+		bool valid() const {
+			auto pp = stack::push_pop(tbl);
+			auto p = stack::probe_get_field<std::is_same<meta::unqualified_t<Table>, global_table>::value>(lua_state(), key, lua_gettop(lua_state()));
+			lua_pop(lua_state(), p.levels);
+			return p;
+		}
+
+		int push() const noexcept {
+			return push(this->lua_state());
+		}
+
+		int push(lua_State* L) const noexcept {
+			if constexpr (std::is_same_v<meta::unqualified_t<Table>, global_table> || is_stack_table_v<meta::unqualified_t<Table>>) {
+				auto pp = stack::push_pop<true>(tbl);
+				int tableindex = pp.index_of(tbl);
+				int top_index = lua_gettop(L);
+				stack::get_field<true>(lua_state(), key, tableindex);
+				lua_replace(L, top_index + 1);
+				lua_settop(L, top_index + 1);
+			}
+			else {
+				auto pp = stack::push_pop<false>(tbl);
+				int tableindex = pp.index_of(tbl);
+				int aftertableindex = lua_gettop(L);
+				stack::get_field<false>(lua_state(), key, tableindex);
+				lua_replace(L, tableindex);
+				lua_settop(L, aftertableindex + 1);
+			}
+			return 1;
+		}
+
+		type get_type() const {
+			type t = type::none;
+			auto pp = stack::push_pop(tbl);
+			auto p = stack::probe_get_field<std::is_same<meta::unqualified_t<Table>, global_table>::value>(lua_state(), key, lua_gettop(lua_state()));
+			if (p) {
+				t = type_of(lua_state(), -1);
+			}
+			lua_pop(lua_state(), p.levels);
+			return t;
+		}
+
+		lua_State* lua_state() const {
+			return tbl.lua_state();
+		}
+
+		table_proxy& force() {
+			if (!this->valid()) {
+				this->set(new_table());
+			}
+			return *this;
+		}
+	};
+
+	template <typename Table, typename Key, typename T>
+	inline bool operator==(T&& left, const table_proxy<Table, Key>& right) {
+		using G = decltype(stack::get<T>(nullptr, 0));
+		return right.template get<optional<G>>() == left;
+	}
+
+	template <typename Table, typename Key, typename T>
+	inline bool operator==(const table_proxy<Table, Key>& right, T&& left) {
+		using G = decltype(stack::get<T>(nullptr, 0));
+		return right.template get<optional<G>>() == left;
+	}
+
+	template <typename Table, typename Key, typename T>
+	inline bool operator!=(T&& left, const table_proxy<Table, Key>& right) {
+		using G = decltype(stack::get<T>(nullptr, 0));
+		return right.template get<optional<G>>() != left;
+	}
+
+	template <typename Table, typename Key, typename T>
+	inline bool operator!=(const table_proxy<Table, Key>& right, T&& left) {
+		using G = decltype(stack::get<T>(nullptr, 0));
+		return right.template get<optional<G>>() != left;
+	}
+
+	template <typename Table, typename Key>
+	inline bool operator==(lua_nil_t, const table_proxy<Table, Key>& right) {
+		return !right.valid();
+	}
+
+	template <typename Table, typename Key>
+	inline bool operator==(const table_proxy<Table, Key>& right, lua_nil_t) {
+		return !right.valid();
+	}
+
+	template <typename Table, typename Key>
+	inline bool operator!=(lua_nil_t, const table_proxy<Table, Key>& right) {
+		return right.valid();
+	}
+
+	template <typename Table, typename Key>
+	inline bool operator!=(const table_proxy<Table, Key>& right, lua_nil_t) {
+		return right.valid();
+	}
+
+	template <bool b>
+	template <typename Super>
+	basic_reference<b>& basic_reference<b>::operator=(proxy_base<Super>&& r) {
+		basic_reference<b> v = r;
+		this->operator=(std::move(v));
+		return *this;
+	}
+
+	template <bool b>
+	template <typename Super>
+	basic_reference<b>& basic_reference<b>::operator=(const proxy_base<Super>& r) {
+		basic_reference<b> v = r;
+		this->operator=(std::move(v));
+		return *this;
+	}
+
+	namespace stack {
+		template <typename Table, typename Key>
+		struct unqualified_pusher<table_proxy<Table, Key>> {
+			static int push(lua_State* L, const table_proxy<Table, Key>& p) {
+				return p.push(L);
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+// end of sol/table_proxy.hpp
+
+// beginning of sol/table_iterator.hpp
+
+#include <iterator>
+
+namespace sol {
+
+	template <typename reference_type>
+	class basic_table_iterator {
+	public:
+		typedef object key_type;
+		typedef object mapped_type;
+		typedef std::pair<object, object> value_type;
+		typedef std::input_iterator_tag iterator_category;
+		typedef std::ptrdiff_t difference_type;
+		typedef value_type* pointer;
+		typedef value_type& reference;
+		typedef const value_type& const_reference;
+
+	private:
+		std::pair<object, object> kvp;
+		reference_type ref;
+		int tableidx = 0;
+		int keyidx = 0;
+		std::ptrdiff_t idx = 0;
+
+	public:
+		basic_table_iterator() : keyidx(-1), idx(-1) {
+		}
+
+		basic_table_iterator(reference_type x) : ref(std::move(x)) {
+			ref.push();
+			tableidx = lua_gettop(ref.lua_state());
+			stack::push(ref.lua_state(), lua_nil);
+			this->operator++();
+			if (idx == -1) {
+				return;
+			}
+			--idx;
+		}
+
+		basic_table_iterator& operator++() {
+			if (idx == -1)
+				return *this;
+
+			if (lua_next(ref.lua_state(), tableidx) == 0) {
+				idx = -1;
+				keyidx = -1;
+				return *this;
+			}
+			++idx;
+			kvp.first = object(ref.lua_state(), -2);
+			kvp.second = object(ref.lua_state(), -1);
+			lua_pop(ref.lua_state(), 1);
+			// leave key on the stack
+			keyidx = lua_gettop(ref.lua_state());
+			return *this;
+		}
+
+		basic_table_iterator operator++(int) {
+			auto saved = *this;
+			this->operator++();
+			return saved;
+		}
+
+		reference operator*() {
+			return kvp;
+		}
+
+		const_reference operator*() const {
+			return kvp;
+		}
+
+		bool operator==(const basic_table_iterator& right) const {
+			return idx == right.idx;
+		}
+
+		bool operator!=(const basic_table_iterator& right) const {
+			return idx != right.idx;
+		}
+
+		~basic_table_iterator() {
+			if (keyidx != -1) {
+				stack::remove(ref.lua_state(), keyidx, 1);
+			}
+			if (ref.lua_state() != nullptr && ref.valid()) {
+				stack::remove(ref.lua_state(), tableidx, 1);
+			}
+		}
+	};
+
+} // namespace sol
+
+// end of sol/table_iterator.hpp
+
+namespace sol {
+	namespace detail {
+		template <std::size_t n>
+		struct clean {
+			lua_State* L;
+			clean(lua_State* luastate) : L(luastate) {
+			}
+			~clean() {
+				lua_pop(L, static_cast<int>(n));
+			}
+		};
+
+		struct ref_clean {
+			lua_State* L;
+			int& n;
+			ref_clean(lua_State* luastate, int& n) : L(luastate), n(n) {
+			}
+			~ref_clean() {
+				lua_pop(L, static_cast<int>(n));
+			}
+		};
+
+		inline int fail_on_newindex(lua_State* L) {
+			return luaL_error(L, "sol: cannot modify the elements of an enumeration table");
+		}
+
+	} // namespace detail
+
+	template <bool top_level, typename ref_t>
+	class basic_table_core : public basic_object<ref_t> {
+	private:
+		using base_t = basic_object<ref_t>;
+
+		friend class state;
+		friend class state_view;
+		template <typename, typename>
+		friend class basic_usertype;
+		template <typename>
+		friend class basic_metatable;
+
+		template <bool raw, typename... Ret, typename... Keys>
+		decltype(auto) tuple_get(int table_index, Keys&&... keys) const {
+			if constexpr (sizeof...(Ret) < 2) {
+				return traverse_get_single_maybe_tuple<raw, Ret...>(table_index, std::forward<Keys>(keys)...);
+			}
+			else {
+				using multi_ret = decltype(stack::pop<std::tuple<Ret...>>(nullptr));
+				return multi_ret(traverse_get_single_maybe_tuple<raw, Ret>(table_index, std::forward<Keys>(keys))...);
+			}
+		}
+
+		template <bool raw, typename Ret, size_t... I, typename Key>
+		decltype(auto) traverse_get_single_tuple(int table_index, std::index_sequence<I...>, Key&& key) const {
+			return traverse_get_single<raw, Ret>(table_index, std::get<I>(std::forward<Key>(key))...);
+		}
+
+		template <bool raw, typename Ret, typename Key>
+		decltype(auto) traverse_get_single_maybe_tuple(int table_index, Key&& key) const {
+			if constexpr (meta::is_tuple_v<meta::unqualified_t<Key>>) {
+				return traverse_get_single_tuple<raw, Ret>(
+				     table_index, std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<Key>>>(), std::forward<Key>(key));
+			}
+			else {
+				return traverse_get_single<raw, Ret>(table_index, std::forward<Key>(key));
+			}
+		}
+
+		template <bool raw, typename Ret, typename... Keys>
+		decltype(auto) traverse_get_single(int table_index, Keys&&... keys) const {
+			constexpr static bool global = top_level && (meta::count_for_to_pack_v<1, meta::is_c_str, meta::unqualified_t<Keys>...> > 0);
+			if constexpr (meta::is_optional_v<meta::unqualified_t<Ret>>) {
+				int popcount = 0;
+				detail::ref_clean c(base_t::lua_state(), popcount);
+				return traverse_get_deep_optional<global, raw, detail::insert_mode::none, Ret>(popcount, table_index, std::forward<Keys>(keys)...);
+			}
+			else {
+				detail::clean<sizeof...(Keys) - meta::count_for_pack_v<detail::is_insert_mode, meta::unqualified_t<Keys>...>> c(base_t::lua_state());
+				return traverse_get_deep<global, raw, detail::insert_mode::none, Ret>(table_index, std::forward<Keys>(keys)...);
+			}
+		}
+
+		template <bool raw, typename Pairs, std::size_t... I>
+		void tuple_set(std::index_sequence<I...>, Pairs&& pairs) {
+			constexpr static bool global = top_level
+			     && (meta::count_even_for_pack_v<meta::is_c_str, meta::unqualified_t<decltype(std::get<I * 2>(std::forward<Pairs>(pairs)))>...> > 0);
+			auto pp = stack::push_pop<global>(*this);
+			int table_index = pp.index_of(*this);
+			lua_State* L = base_t::lua_state();
+			(void)table_index;
+			(void)L;
+			void(detail::swallow { (stack::set_field<(top_level), raw>(
+			                             L, std::get<I * 2>(std::forward<Pairs>(pairs)), std::get<I * 2 + 1>(std::forward<Pairs>(pairs)), table_index),
+			     0)... });
+		}
+
+		template <bool global, bool raw, detail::insert_mode mode, typename T, typename Key, typename... Keys>
+		decltype(auto) traverse_get_deep(int table_index, Key&& key, Keys&&... keys) const {
+			if constexpr (std::is_same_v<meta::unqualified_t<Key>, create_if_nil_t>) {
+				(void)key;
+				return traverse_get_deep<false, raw, static_cast<detail::insert_mode>(mode | detail::insert_mode::create_if_nil), T>(
+				     table_index, std::forward<Keys>(keys)...);
+			}
+			else {
+				lua_State* L = base_t::lua_state();
+				stack::get_field<global, raw>(L, std::forward<Key>(key), table_index);
+				if constexpr (sizeof...(Keys) > 0) {
+					if constexpr ((mode & detail::insert_mode::create_if_nil) == detail::insert_mode::create_if_nil) {
+						type t = type_of(L, -1);
+						if (t == type::lua_nil || t == type::none) {
+							lua_pop(L, 1);
+							stack::push(L, new_table(0, 0));
+						}
+					}
+					return traverse_get_deep<false, raw, mode, T>(lua_gettop(L), std::forward<Keys>(keys)...);
+				}
+				else {
+					if constexpr ((mode & detail::insert_mode::create_if_nil) == detail::insert_mode::create_if_nil) {
+						type t = type_of(L, -1);
+						if ((t == type::lua_nil || t == type::none) && (is_table_like_v<T>)) {
+							lua_pop(L, 1);
+							stack::push(L, new_table(0, 0));
+						}
+					}
+					return stack::get<T>(L);
+				}
+			}
+		}
+
+		template <bool global, bool raw, detail::insert_mode mode, typename T, typename Key, typename... Keys>
+		decltype(auto) traverse_get_deep_optional(int& popcount, int table_index, Key&& key, Keys&&... keys) const {
+			if constexpr (std::is_same_v<meta::unqualified_t<Key>, create_if_nil_t>) {
+				constexpr detail::insert_mode new_mode = static_cast<detail::insert_mode>(mode | detail::insert_mode::create_if_nil);
+				(void)key;
+				return traverse_get_deep_optional<global, raw, new_mode, T>(popcount, table_index, std::forward<Keys>(keys)...);
+			}
+			else if constexpr (std::is_same_v<meta::unqualified_t<Key>, update_if_empty_t>) {
+				constexpr detail::insert_mode new_mode = static_cast<detail::insert_mode>(mode | detail::insert_mode::update_if_empty);
+				(void)key;
+				return traverse_get_deep_optional<global, raw, new_mode, T>(popcount, table_index, std::forward<Keys>(keys)...);
+			}
+			else if constexpr (std::is_same_v<meta::unqualified_t<Key>, override_value_t>) {
+				constexpr detail::insert_mode new_mode = static_cast<detail::insert_mode>(mode | detail::insert_mode::override_value);
+				(void)key;
+				return traverse_get_deep_optional<global, raw, new_mode, T>(popcount, table_index, std::forward<Keys>(keys)...);
+			}
+			else {
+				if constexpr (sizeof...(Keys) > 0) {
+					lua_State* L = base_t::lua_state();
+					auto p = stack::probe_get_field<global, raw>(L, std::forward<Key>(key), table_index);
+					popcount += p.levels;
+					if (!p.success) {
+						if constexpr ((mode & detail::insert_mode::create_if_nil) == detail::insert_mode::create_if_nil) {
+							lua_pop(L, 1);
+							constexpr bool is_seq = meta::count_for_to_pack_v<1, std::is_integral, Keys...> > 0;
+							stack::push(L, new_table(static_cast<int>(is_seq), static_cast<int>(!is_seq)));
+							stack::set_field<global, raw>(L, std::forward<Key>(key), stack_reference(L, -1), table_index);
+						}
+						else {
+							return T(nullopt);
+						}
+					}
+					return traverse_get_deep_optional<false, raw, mode, T>(popcount, lua_gettop(L), std::forward<Keys>(keys)...);
+				}
+				else {
+					using R = decltype(stack::get<T>(nullptr));
+					using value_type = typename meta::unqualified_t<R>::value_type;
+					lua_State* L = base_t::lua_state();
+					auto p = stack::probe_get_field<global, raw, value_type>(L, key, table_index);
+					popcount += p.levels;
+					if (!p.success) {
+						if constexpr ((mode & detail::insert_mode::create_if_nil) == detail::insert_mode::create_if_nil) {
+							lua_pop(L, 1);
+							stack::push(L, new_table(0, 0));
+							stack::set_field<global, raw>(L, std::forward<Key>(key), stack_reference(L, -1), table_index);
+							if (stack::check<value_type>(L, lua_gettop(L), no_panic)) {
+								return stack::get<T>(L);
+							}
+						}
+						return R(nullopt);
+					}
+					return stack::get<T>(L);
+				}
+			}
+		}
+
+		template <bool global, bool raw, detail::insert_mode mode, typename Key, typename... Keys>
+		void traverse_set_deep(int table_index, Key&& key, Keys&&... keys) const {
+			using KeyU = meta::unqualified_t<Key>;
+			if constexpr (std::is_same_v<KeyU, update_if_empty_t>) {
+				(void)key;
+				traverse_set_deep<global, raw, static_cast<detail::insert_mode>(mode | detail::insert_mode::update_if_empty)>(
+				     table_index, std::forward<Keys>(keys)...);
+			}
+			else if constexpr (std::is_same_v<KeyU, create_if_nil_t>) {
+				(void)key;
+				traverse_set_deep<global, raw, static_cast<detail::insert_mode>(mode | detail::insert_mode::create_if_nil)>(
+				     table_index, std::forward<Keys>(keys)...);
+			}
+			else if constexpr (std::is_same_v<KeyU, override_value_t>) {
+				(void)key;
+				traverse_set_deep<global, raw, static_cast<detail::insert_mode>(mode | detail::insert_mode::override_value)>(
+				     table_index, std::forward<Keys>(keys)...);
+			}
+			else {
+				lua_State* L = base_t::lua_state();
+				if constexpr (sizeof...(Keys) == 1) {
+					if constexpr ((mode & detail::insert_mode::update_if_empty) == detail::insert_mode::update_if_empty) {
+						auto p = stack::probe_get_field<global, raw>(L, key, table_index);
+						lua_pop(L, p.levels);
+						if (!p.success) {
+							stack::set_field<global, raw>(L, std::forward<Key>(key), std::forward<Keys>(keys)..., table_index);
+						}
+					}
+					else {
+						stack::set_field<global, raw>(L, std::forward<Key>(key), std::forward<Keys>(keys)..., table_index);
+					}
+				}
+				else {
+					if constexpr (mode != detail::insert_mode::none) {
+						stack::get_field<global, raw>(L, key, table_index);
+						type vt = type_of(L, -1);
+						if constexpr ((mode & detail::insert_mode::update_if_empty) == detail::insert_mode::update_if_empty
+						     || (mode & detail::insert_mode::create_if_nil) == detail::insert_mode::create_if_nil) {
+							if (vt == type::lua_nil || vt == type::none) {
+								constexpr bool is_seq = meta::count_for_to_pack_v<1, std::is_integral, Keys...> > 0;
+								lua_pop(L, 1);
+								stack::push(L, new_table(static_cast<int>(is_seq), static_cast<int>(!is_seq)));
+								stack::set_field<global, raw>(L, std::forward<Key>(key), stack_reference(L, -1), table_index);
+							}
+						}
+						else {
+							if (vt != type::table) {
+								constexpr bool is_seq = meta::count_for_to_pack_v<1, std::is_integral, Keys...> > 0;
+								lua_pop(L, 1);
+								stack::push(L, new_table(static_cast<int>(is_seq), static_cast<int>(!is_seq)));
+								stack::set_field<global, raw>(L, std::forward<Key>(key), stack_reference(L, -1), table_index);
+							}
+						}
+					}
+					else {
+						stack::get_field<global, raw>(L, std::forward<Key>(key), table_index);
+					}
+					traverse_set_deep<false, raw, mode>(lua_gettop(L), std::forward<Keys>(keys)...);
+				}
+			}
+		}
+
+		basic_table_core(lua_State* L, detail::global_tag t) noexcept : base_t(L, t) {
+		}
+
+	protected:
+		basic_table_core(detail::no_safety_tag, lua_nil_t n) : base_t(n) {
+		}
+		basic_table_core(detail::no_safety_tag, lua_State* L, int index) : base_t(L, index) {
+		}
+		basic_table_core(detail::no_safety_tag, lua_State* L, ref_index index) : base_t(L, index) {
+		}
+		template <typename T,
+		     meta::enable<meta::neg<meta::any_same<meta::unqualified_t<T>, basic_table_core>>, meta::neg<std::is_same<ref_t, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_table_core(detail::no_safety_tag, T&& r) noexcept : base_t(std::forward<T>(r)) {
+		}
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_table_core(detail::no_safety_tag, lua_State* L, T&& r) noexcept : base_t(L, std::forward<T>(r)) {
+		}
+
+	public:
+		using iterator = basic_table_iterator<ref_t>;
+		using const_iterator = iterator;
+
+		using base_t::lua_state;
+
+		basic_table_core() noexcept = default;
+		basic_table_core(const basic_table_core&) = default;
+		basic_table_core(basic_table_core&&) = default;
+		basic_table_core& operator=(const basic_table_core&) = default;
+		basic_table_core& operator=(basic_table_core&&) = default;
+		basic_table_core(const stack_reference& r) : basic_table_core(r.lua_state(), r.stack_index()) {
+		}
+		basic_table_core(stack_reference&& r) : basic_table_core(r.lua_state(), r.stack_index()) {
+		}
+		template <typename T, meta::enable_any<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_table_core(lua_State* L, T&& r) : base_t(L, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			int table_index = pp.index_of(*this);
+			constructor_handler handler {};
+			stack::check<basic_table_core>(lua_state(), table_index, handler);
+#endif // Safety
+		}
+		basic_table_core(lua_State* L, const new_table& nt) : base_t(L, -stack::push(L, nt)) {
+			if (!is_stack_based<meta::unqualified_t<ref_t>>::value) {
+				lua_pop(L, 1);
+			}
+		}
+		basic_table_core(lua_State* L, int index = -1) : basic_table_core(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			constructor_handler handler {};
+			stack::check<basic_table_core>(L, index, handler);
+#endif // Safety
+		}
+		basic_table_core(lua_State* L, ref_index index) : basic_table_core(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			int table_index = pp.index_of(*this);
+			constructor_handler handler {};
+			stack::check<basic_table_core>(lua_state(), table_index, handler);
+#endif // Safety
+		}
+		template <typename T,
+		     meta::enable<meta::neg<meta::any_same<meta::unqualified_t<T>, basic_table_core>>, meta::neg<std::is_same<ref_t, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_table_core(T&& r) noexcept : basic_table_core(detail::no_safety, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			if (!is_table<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				int table_index = pp.index_of(*this);
+				constructor_handler handler {};
+				stack::check<basic_table_core>(lua_state(), table_index, handler);
+			}
+#endif // Safety
+		}
+		basic_table_core(lua_nil_t r) noexcept : basic_table_core(detail::no_safety, r) {
+		}
+
+		iterator begin() const {
+			if (this->get_type() == type::table) {
+				return iterator(*this);
+			}
+			return iterator();
+		}
+
+		iterator end() const {
+			return iterator();
+		}
+
+		const_iterator cbegin() const {
+			return begin();
+		}
+
+		const_iterator cend() const {
+			return end();
+		}
+
+		void clear() {
+			auto pp = stack::push_pop<false>(*this);
+			int table_index = pp.index_of(*this);
+			stack::clear(lua_state(), table_index);
+		}
+
+		template <typename... Ret, typename... Keys>
+		decltype(auto) get(Keys&&... keys) const {
+			static_assert(sizeof...(Keys) == sizeof...(Ret), "number of keys and number of return types do not match");
+			constexpr static bool global = meta::all<meta::boolean<top_level>, meta::is_c_str<meta::unqualified_t<Keys>>...>::value;
+			auto pp = stack::push_pop<global>(*this);
+			int table_index = pp.index_of(*this);
+			return tuple_get<false, Ret...>(table_index, std::forward<Keys>(keys)...);
+		}
+
+		template <typename T, typename Key>
+		decltype(auto) get_or(Key&& key, T&& otherwise) const {
+			typedef decltype(get<T>("")) U;
+			optional<U> option = get<optional<U>>(std::forward<Key>(key));
+			if (option) {
+				return static_cast<U>(option.value());
+			}
+			return static_cast<U>(std::forward<T>(otherwise));
+		}
+
+		template <typename T, typename Key, typename D>
+		decltype(auto) get_or(Key&& key, D&& otherwise) const {
+			optional<T> option = get<optional<T>>(std::forward<Key>(key));
+			if (option) {
+				return static_cast<T>(option.value());
+			}
+			return static_cast<T>(std::forward<D>(otherwise));
+		}
+
+		template <typename T, typename... Keys>
+		decltype(auto) traverse_get(Keys&&... keys) const {
+			static_assert(sizeof...(Keys) > 0, "must pass at least 1 key to get");
+			constexpr static bool global = top_level && (meta::count_for_to_pack_v<1, meta::is_c_str, meta::unqualified_t<Keys>...> > 0);
+			auto pp = stack::push_pop<global>(*this);
+			int table_index = pp.index_of(*this);
+			return traverse_get_single<false, T>(table_index, std::forward<Keys>(keys)...);
+		}
+
+		template <typename... Keys>
+		basic_table_core& traverse_set(Keys&&... keys) {
+			static_assert(sizeof...(Keys) > 1, "must pass at least 1 key and 1 value to set");
+			constexpr static bool global
+			     = top_level && (meta::count_when_for_to_pack_v<detail::is_not_insert_mode, 1, meta::is_c_str, meta::unqualified_t<Keys>...> > 0);
+			auto pp = stack::push_pop<global>(*this);
+			int table_index = pp.index_of(*this);
+			lua_State* L = base_t::lua_state();
+			auto pn = stack::pop_n(L, static_cast<int>(sizeof...(Keys) - 2 - meta::count_for_pack_v<detail::is_insert_mode, meta::unqualified_t<Keys>...>));
+			traverse_set_deep<top_level, false, detail::insert_mode::none>(table_index, std::forward<Keys>(keys)...);
+			return *this;
+		}
+
+		template <typename... Args>
+		basic_table_core& set(Args&&... args) {
+			if constexpr (sizeof...(Args) == 2) {
+				traverse_set(std::forward<Args>(args)...);
+			}
+			else {
+				tuple_set<false>(std::make_index_sequence<sizeof...(Args) / 2>(), std::forward_as_tuple(std::forward<Args>(args)...));
+			}
+			return *this;
+		}
+
+		template <typename... Ret, typename... Keys>
+		decltype(auto) raw_get(Keys&&... keys) const {
+			static_assert(sizeof...(Keys) == sizeof...(Ret), "number of keys and number of return types do not match");
+			constexpr static bool global = top_level && (meta::count_for_to_pack_v<1, meta::is_c_str, meta::unqualified_t<Keys>...> > 0);
+			auto pp = stack::push_pop<global>(*this);
+			int table_index = pp.index_of(*this);
+			return tuple_get<true, Ret...>(table_index, std::forward<Keys>(keys)...);
+		}
+
+		template <typename T, typename Key>
+		decltype(auto) raw_get_or(Key&& key, T&& otherwise) const {
+			typedef decltype(raw_get<T>("")) U;
+			optional<U> option = raw_get<optional<U>>(std::forward<Key>(key));
+			if (option) {
+				return static_cast<U>(option.value());
+			}
+			return static_cast<U>(std::forward<T>(otherwise));
+		}
+
+		template <typename T, typename Key, typename D>
+		decltype(auto) raw_get_or(Key&& key, D&& otherwise) const {
+			optional<T> option = raw_get<optional<T>>(std::forward<Key>(key));
+			if (option) {
+				return static_cast<T>(option.value());
+			}
+			return static_cast<T>(std::forward<D>(otherwise));
+		}
+
+		template <typename T, typename... Keys>
+		decltype(auto) traverse_raw_get(Keys&&... keys) const {
+			constexpr static bool global = top_level && (meta::count_for_to_pack_v<1, meta::is_c_str, meta::unqualified_t<Keys>...> > 0);
+			auto pp = stack::push_pop<global>(*this);
+			int table_index = pp.index_of(*this);
+			return traverse_get_single<true, T>(table_index, std::forward<Keys>(keys)...);
+		}
+
+		template <typename... Keys>
+		basic_table_core& traverse_raw_set(Keys&&... keys) {
+			constexpr static bool global = top_level && (meta::count_for_to_pack_v<1, meta::is_c_str, meta::unqualified_t<Keys>...> > 0);
+			auto pp = stack::push_pop<global>(*this);
+			lua_State* L = base_t::lua_state();
+			auto pn = stack::pop_n(L, static_cast<int>(sizeof...(Keys) - 2 - meta::count_for_pack_v<detail::is_insert_mode, meta::unqualified_t<Keys>...>));
+			traverse_set_deep<top_level, true, false>(std::forward<Keys>(keys)...);
+			return *this;
+		}
+
+		template <typename... Args>
+		basic_table_core& raw_set(Args&&... args) {
+			tuple_set<true>(std::make_index_sequence<sizeof...(Args) / 2>(), std::forward_as_tuple(std::forward<Args>(args)...));
+			return *this;
+		}
+
+		template <typename Class, typename Key>
+		usertype<Class> new_usertype(Key&& key);
+
+		template <typename Class, typename Key>
+		usertype<Class> new_usertype(Key&& key, automagic_enrollments enrollment);
+
+		template <typename Class, typename Key, typename Arg, typename... Args,
+		     typename = std::enable_if_t<!std::is_same_v<meta::unqualified_t<Arg>, automagic_enrollments>>>
+		usertype<Class> new_usertype(Key&& key, Arg&& arg, Args&&... args);
+
+		template <bool read_only = true, typename... Args>
+		table new_enum(const string_view& name, Args&&... args) {
+			table target = create_with(std::forward<Args>(args)...);
+			if (read_only) {
+				table x = create_with(meta_function::new_index, detail::fail_on_newindex, meta_function::index, target);
+				table shim = create_named(name, metatable_key, x);
+				return shim;
+			}
+			else {
+				set(name, target);
+				return target;
+			}
+		}
+
+		template <typename T, bool read_only = true>
+		table new_enum(const string_view& name, std::initializer_list<std::pair<string_view, T>> items) {
+			table target = create(static_cast<int>(items.size()), static_cast<int>(0));
+			for (const auto& kvp : items) {
+				target.set(kvp.first, kvp.second);
+			}
+			if constexpr (read_only) {
+				table x = create_with(meta_function::new_index, detail::fail_on_newindex, meta_function::index, target);
+				table shim = create_named(name, metatable_key, x);
+				return shim;
+			}
+			else {
+				set(name, target);
+				return target;
+			}
+		}
+
+		template <typename Key = object, typename Value = object, typename Fx>
+		void for_each(Fx&& fx) const {
+			lua_State* L = base_t::lua_state();
+			if constexpr (std::is_invocable_v<Fx, Key, Value>) {
+				auto pp = stack::push_pop(*this);
+				int table_index = pp.index_of(*this);
+				stack::push(L, lua_nil);
+				while (lua_next(L, table_index)) {
+					Key key(L, -2);
+					Value value(L, -1);
+					auto pn = stack::pop_n(L, 1);
+					fx(key, value);
+				}
+			}
+			else {
+				auto pp = stack::push_pop(*this);
+				int table_index = pp.index_of(*this);
+				stack::push(L, lua_nil);
+				while (lua_next(L, table_index)) {
+					Key key(L, -2);
+					Value value(L, -1);
+					auto pn = stack::pop_n(L, 1);
+					std::pair<Key&, Value&> keyvalue(key, value);
+					fx(keyvalue);
+				}
+			}
+		}
+
+		size_t size() const {
+			auto pp = stack::push_pop(*this);
+			int table_index = pp.index_of(*this);
+			lua_State* L = base_t::lua_state();
+			lua_len(L, table_index);
+			return stack::pop<size_t>(L);
+		}
+
+		bool empty() const {
+			return cbegin() == cend();
+		}
+
+		template <typename T>
+		auto operator[](T&& key) & {
+			return table_proxy<basic_table_core&, detail::proxy_key_t<T>>(*this, std::forward<T>(key));
+		}
+
+		template <typename T>
+		auto operator[](T&& key) const& {
+			return table_proxy<const basic_table_core&, detail::proxy_key_t<T>>(*this, std::forward<T>(key));
+		}
+
+		template <typename T>
+		auto operator[](T&& key) && {
+			return table_proxy<basic_table_core, detail::proxy_key_t<T>>(std::move(*this), std::forward<T>(key));
+		}
+
+		template <typename Sig, typename Key, typename... Args>
+		basic_table_core& set_function(Key&& key, Args&&... args) {
+			set_fx(types<Sig>(), std::forward<Key>(key), std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename Key, typename... Args>
+		basic_table_core& set_function(Key&& key, Args&&... args) {
+			set_fx(types<>(), std::forward<Key>(key), std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename... Args>
+		basic_table_core& add(Args&&... args) {
+			auto pp = stack::push_pop(*this);
+			int table_index = pp.index_of(*this);
+			lua_State* L = base_t::lua_state();
+			(void)detail::swallow { 0, (stack::set_ref(L, std::forward<Args>(args), table_index), 0)... };
+			return *this;
+		}
+
+	private:
+		template <typename R, typename... Args, typename Fx, typename Key, typename = std::invoke_result_t<Fx, Args...>>
+		void set_fx(types<R(Args...)>, Key&& key, Fx&& fx) {
+			set_resolved_function<R(Args...)>(std::forward<Key>(key), std::forward<Fx>(fx));
+		}
+
+		template <typename Fx, typename Key, meta::enable<meta::is_specialization_of<meta::unqualified_t<Fx>, overload_set>> = meta::enabler>
+		void set_fx(types<>, Key&& key, Fx&& fx) {
+			set(std::forward<Key>(key), std::forward<Fx>(fx));
+		}
+
+		template <typename Fx, typename Key, typename... Args,
+		     meta::disable<meta::is_specialization_of<meta::unqualified_t<Fx>, overload_set>> = meta::enabler>
+		void set_fx(types<>, Key&& key, Fx&& fx, Args&&... args) {
+			set(std::forward<Key>(key), as_function_reference(std::forward<Fx>(fx), std::forward<Args>(args)...));
+		}
+
+		template <typename... Sig, typename... Args, typename Key>
+		void set_resolved_function(Key&& key, Args&&... args) {
+			set(std::forward<Key>(key), as_function_reference<function_sig<Sig...>>(std::forward<Args>(args)...));
+		}
+
+	public:
+		static inline table create(lua_State* L, int narr = 0, int nrec = 0) {
+			lua_createtable(L, narr, nrec);
+			table result(L);
+			lua_pop(L, 1);
+			return result;
+		}
+
+		template <typename Key, typename Value, typename... Args>
+		static inline table create(lua_State* L, int narr, int nrec, Key&& key, Value&& value, Args&&... args) {
+			lua_createtable(L, narr, nrec);
+			table result(L);
+			result.set(std::forward<Key>(key), std::forward<Value>(value), std::forward<Args>(args)...);
+			lua_pop(L, 1);
+			return result;
+		}
+
+		template <typename... Args>
+		static inline table create_with(lua_State* L, Args&&... args) {
+			static_assert(sizeof...(Args) % 2 == 0, "You must have an even number of arguments for a key, value ... list.");
+			constexpr int narr = static_cast<int>(meta::count_odd_for_pack_v<std::is_integral, Args...>);
+			return create(L, narr, static_cast<int>((sizeof...(Args) / 2) - narr), std::forward<Args>(args)...);
+		}
+
+		table create(int narr = 0, int nrec = 0) {
+			return create(base_t::lua_state(), narr, nrec);
+		}
+
+		template <typename Key, typename Value, typename... Args>
+		table create(int narr, int nrec, Key&& key, Value&& value, Args&&... args) {
+			return create(base_t::lua_state(), narr, nrec, std::forward<Key>(key), std::forward<Value>(value), std::forward<Args>(args)...);
+		}
+
+		template <typename Name>
+		table create(Name&& name, int narr = 0, int nrec = 0) {
+			table x = create(base_t::lua_state(), narr, nrec);
+			this->set(std::forward<Name>(name), x);
+			return x;
+		}
+
+		template <typename Name, typename Key, typename Value, typename... Args>
+		table create(Name&& name, int narr, int nrec, Key&& key, Value&& value, Args&&... args) {
+			table x = create(base_t::lua_state(), narr, nrec, std::forward<Key>(key), std::forward<Value>(value), std::forward<Args>(args)...);
+			this->set(std::forward<Name>(name), x);
+			return x;
+		}
+
+		template <typename... Args>
+		table create_with(Args&&... args) {
+			return create_with(base_t::lua_state(), std::forward<Args>(args)...);
+		}
+
+		template <typename Name, typename... Args>
+		table create_named(Name&& name, Args&&... args) {
+			static const int narr = static_cast<int>(meta::count_even_for_pack_v<std::is_integral, Args...>);
+			return create(std::forward<Name>(name), narr, (sizeof...(Args) / 2) - narr, std::forward<Args>(args)...);
+		}
+	};
+} // namespace sol
+
+// end of sol/table_core.hpp
+
+namespace sol {
+
+	template <typename base_type>
+	class basic_metatable : public basic_table<base_type> {
+		typedef basic_table<base_type> base_t;
+		friend class state;
+		friend class state_view;
+
+	protected:
+		basic_metatable(detail::no_safety_tag, lua_nil_t n) : base_t(n) {
+		}
+		basic_metatable(detail::no_safety_tag, lua_State* L, int index) : base_t(L, index) {
+		}
+		basic_metatable(detail::no_safety_tag, lua_State* L, ref_index index) : base_t(L, index) {
+		}
+		template <typename T,
+		     meta::enable<meta::neg<meta::any_same<meta::unqualified_t<T>, basic_metatable>>, meta::neg<std::is_same<base_type, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_metatable(detail::no_safety_tag, T&& r) noexcept : base_t(std::forward<T>(r)) {
+		}
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_metatable(detail::no_safety_tag, lua_State* L, T&& r) noexcept : base_t(L, std::forward<T>(r)) {
+		}
+
+	public:
+		using base_t::lua_state;
+
+		basic_metatable() noexcept = default;
+		basic_metatable(const basic_metatable&) = default;
+		basic_metatable(basic_metatable&&) = default;
+		basic_metatable& operator=(const basic_metatable&) = default;
+		basic_metatable& operator=(basic_metatable&&) = default;
+		basic_metatable(const stack_reference& r) : basic_metatable(r.lua_state(), r.stack_index()) {
+		}
+		basic_metatable(stack_reference&& r) : basic_metatable(r.lua_state(), r.stack_index()) {
+		}
+		template <typename T, meta::enable_any<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_metatable(lua_State* L, T&& r) : base_t(L, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler{};
+			stack::check<basic_metatable>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		basic_metatable(lua_State* L, int index = -1) : basic_metatable(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			constructor_handler handler{};
+			stack::check<basic_metatable>(L, index, handler);
+#endif // Safety
+		}
+		basic_metatable(lua_State* L, ref_index index) : basic_metatable(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler{};
+			stack::check<basic_metatable>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		template <typename T,
+		     meta::enable<meta::neg<meta::any_same<meta::unqualified_t<T>, basic_metatable>>, meta::neg<std::is_same<base_type, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_metatable(T&& r) noexcept : basic_metatable(detail::no_safety, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			if (!is_table<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				constructor_handler handler{};
+				stack::check<basic_metatable>(base_t::lua_state(), -1, handler);
+			}
+#endif // Safety
+		}
+		basic_metatable(lua_nil_t r) noexcept : basic_metatable(detail::no_safety, r) {
+		}
+
+		template <typename Key, typename Value>
+		void set(Key&& key, Value&& value);
+
+		void unregister() {
+			using ustorage_base = u_detail::usertype_storage_base;
+
+			lua_State* L = this->lua_state();
+
+			auto pp = stack::push_pop(*this);
+			int top = lua_gettop(L);
+
+			stack_reference mt(L, -1);
+			stack::get_field(L, meta_function::gc_names, mt.stack_index());
+			if (type_of(L, -1) != type::table) {
+				return;
+			}
+			stack_reference gc_names_table(L, -1);
+			stack::get_field(L, meta_function::storage, mt.stack_index());
+			if (type_of(L, -1) != type::lightuserdata) {
+				return;
+			}
+			ustorage_base& base_storage = *static_cast<ustorage_base*>(stack::get<void*>(L, -1));
+			std::array<string_view, 6> registry_traits;
+			for (std::size_t i = 0; i < registry_traits.size(); ++i) {
+				u_detail::submetatable_type smt = static_cast<u_detail::submetatable_type>(i);
+				stack::get_field<false, true>(L, smt, gc_names_table.stack_index());
+				registry_traits[i] = stack::get<string_view>(L, -1);
+			}
+
+			// get the registry
+			stack_reference registry(L, raw_index(LUA_REGISTRYINDEX));
+			registry.push();
+			// eliminate all named entries for this usertype
+			// in the registry (luaL_newmetatable does
+			// [name] = new table
+			// in registry upon creation)
+			for (std::size_t i = 0; i < registry_traits.size(); ++i) {
+				u_detail::submetatable_type smt = static_cast<u_detail::submetatable_type>(i);
+				const string_view& gcmetakey = registry_traits[i];
+				if (smt == u_detail::submetatable_type::named) {
+					// use .data() to make it treat it like a c string,
+					// which it is...
+					stack::set_field<true>(L, gcmetakey.data(), lua_nil);
+				}
+				else {
+					// do not change the values in the registry: they need to be present
+					// no matter what, for safety's sake
+					//stack::set_field(L, gcmetakey, lua_nil, registry.stack_index());
+				}
+			}
+
+			// destroy all storage and tables
+			base_storage.clear();
+
+			// 6 strings from gc_names table,
+			// + 1 registry,
+			// + 1 gc_names table
+			// + 1 light userdata of storage
+			// + 1 registry
+			// 10 total, 4 left since popping off 6 gc_names tables
+			lua_settop(L, top);
+		}
+	};
+
+} // namespace sol
+
+// end of sol/metatable.hpp
+
+namespace sol {
+
+	template <typename T, typename base_type>
+	class basic_usertype : private basic_metatable<base_type> {
+	private:
+		using base_t = basic_metatable<base_type>;
+		using table_base_t = basic_table<base_type>;
+
+		template <typename>
+		friend class basic_metatable;
+
+		template <bool, typename>
+		friend class basic_table_core;
+
+		template <std::size_t... I, typename... Args>
+		void tuple_set(std::index_sequence<I...>, std::tuple<Args...>&& args) {
+			(void)args;
+			(void)detail::swallow{ 0,
+				(this->set(std::get<I * 2>(std::move(args)), std::get<I * 2 + 1>(std::move(args))), 0)... };
+		}
+
+	public:
+		using base_t::base_t;
+
+		using base_t::pop;
+		using base_t::push;
+		using base_t::lua_state;
+		using base_t::get;
+		using base_t::set_function;
+		using base_t::traverse_set;
+		using base_t::traverse_get;
+		using base_t::unregister;
+
+		template <typename Key, typename Value>
+		void set(Key&& key, Value&& value) {
+			optional<u_detail::usertype_storage<T>&> maybe_uts = u_detail::maybe_get_usertype_storage<T>(this->lua_state());
+			if (maybe_uts) {
+				u_detail::usertype_storage<T>& uts = *maybe_uts;
+				uts.set(this->lua_state(), std::forward<Key>(key), std::forward<Value>(value));
+			}
+			else {
+				using ValueU = meta::unqualified_t<Value>;
+				// cannot get metatable: try regular table set?
+				if constexpr (detail::is_non_factory_constructor_v<ValueU> || detail::is_policy_v<ValueU>) {
+					// tag constructors so we don't get destroyed by lack of info
+					table_base_t::set(std::forward<Key>(key), detail::tagged<T, Value>(std::forward<Value>(value)));
+				}
+				else {
+					table_base_t::set(std::forward<Key>(key), std::forward<Value>(value));
+				}
+			}
+		}
+
+		template <typename Key>
+		usertype_proxy<basic_usertype&, std::decay_t<Key>> operator[](Key&& key) {
+			return usertype_proxy<basic_usertype&, std::decay_t<Key>>(*this, std::forward<Key>(key));
+		}
+
+		template <typename Key>
+		usertype_proxy<const basic_usertype&, std::decay_t<Key>> operator[](Key&& key) const {
+			return usertype_proxy<const basic_usertype&, std::decay_t<Key>>(*this, std::forward<Key>(key));
+		}
+	};
+
+} // namespace sol
+
+// end of sol/usertype.hpp
+
+// beginning of sol/table.hpp
+
+// beginning of sol/lua_table.hpp
+
+namespace sol {
+
+	template <typename ref_t>
+	struct basic_lua_table : basic_table_core<false, ref_t> {
+	private:
+		using base_t = basic_table_core<false, ref_t>;
+
+		friend class state;
+		friend class state_view;
+
+	public:
+		using base_t::lua_state;
+
+		basic_lua_table() noexcept = default;
+		basic_lua_table(const basic_lua_table&) = default;
+		basic_lua_table(basic_lua_table&&) = default;
+		basic_lua_table& operator=(const basic_lua_table&) = default;
+		basic_lua_table& operator=(basic_lua_table&&) = default;
+		basic_lua_table(const stack_reference& r) : basic_lua_table(r.lua_state(), r.stack_index()) {
+		}
+		basic_lua_table(stack_reference&& r) : basic_lua_table(r.lua_state(), r.stack_index()) {
+		}
+		template <typename T, meta::enable_any<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_lua_table(lua_State* L, T&& r) : base_t(L, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler{};
+			stack::check<basic_lua_table>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		basic_lua_table(lua_State* L, const new_table& nt) : base_t(L, nt) {
+			if (!is_stack_based<meta::unqualified_t<ref_t>>::value) {
+				lua_pop(L, 1);
+			}
+		}
+		basic_lua_table(lua_State* L, int index = -1) : base_t(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			constructor_handler handler{};
+			stack::check<basic_lua_table>(L, index, handler);
+#endif // Safety
+		}
+		basic_lua_table(lua_State* L, ref_index index) : base_t(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler{};
+			stack::check<basic_lua_table>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		template <typename T,
+		     meta::enable<meta::neg<meta::any_same<meta::unqualified_t<T>, basic_lua_table>>, meta::neg<std::is_same<ref_t, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_lua_table(T&& r) noexcept : basic_lua_table(detail::no_safety, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			if (!is_table<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				constructor_handler handler{};
+				stack::check<basic_lua_table>(lua_state(), -1, handler);
+			}
+#endif // Safety
+		}
+		basic_lua_table(lua_nil_t r) noexcept : basic_lua_table(detail::no_safety, r) {
+		}
+	};
+
+}
+
+// end of sol/lua_table.hpp
+
+namespace sol {
+	typedef table_core<false> table;
+
+	template <bool is_global, typename base_type>
+	template <typename Class, typename Key>
+	usertype<Class> basic_table_core<is_global, base_type>::new_usertype(Key&& key) {
+		automagic_enrollments enrollments;
+		return this->new_usertype<Class>(std::forward<Key>(key), std::move(enrollments));
+	}
+
+	template <bool is_global, typename base_type>
+	template <typename Class, typename Key>
+	usertype<Class> basic_table_core<is_global, base_type>::new_usertype(Key&& key, automagic_enrollments enrollments) {
+		int mt_index = u_detail::register_usertype<Class>(this->lua_state(), std::move(enrollments));
+		usertype<Class> mt(this->lua_state(), -mt_index);
+		lua_pop(this->lua_state(), 1);
+		set(std::forward<Key>(key), mt);
+		return mt;
+	}
+
+	template <bool is_global, typename base_type>
+	template <typename Class, typename Key, typename Arg, typename... Args, typename>
+	usertype<Class> basic_table_core<is_global, base_type>::new_usertype(Key&& key, Arg&& arg, Args&&... args) {
+		automagic_enrollments enrollments;
+		enrollments.default_constructor = !detail::any_is_constructor_v<Arg, Args...>;
+		enrollments.destructor = !detail::any_is_destructor_v<Arg, Args...>;
+		usertype<Class> ut = this->new_usertype<Class>(std::forward<Key>(key), std::move(enrollments));
+		static_assert(sizeof...(Args) % 2 == static_cast<std::size_t>(!detail::any_is_constructor_v<Arg>), 
+			"you must pass an even number of arguments to new_usertype after first passing a constructor");
+		if constexpr (detail::any_is_constructor_v<Arg>) {
+			ut.set(meta_function::construct, std::forward<Arg>(arg));
+			ut.tuple_set(std::make_index_sequence<(sizeof...(Args)) / 2>(), std::forward_as_tuple(std::forward<Args>(args)...));
+		}
+		else {
+			ut.tuple_set(std::make_index_sequence<(sizeof...(Args) + 1) / 2>(), std::forward_as_tuple(std::forward<Arg>(arg), std::forward<Args>(args)...));
+		}
+		return ut;
+	}
+
+	template <typename base_type>
+	template <typename Key, typename Value>
+	void basic_metatable<base_type>::set(Key&& key, Value&& value) {
+		this->push();
+		lua_State* L = this->lua_state();
+		int target = lua_gettop(L);
+		optional<u_detail::usertype_storage_base&> maybe_uts = u_detail::maybe_get_usertype_storage_base(L, target);
+		lua_pop(L, 1);
+		if (maybe_uts) {
+			u_detail::usertype_storage_base& uts = *maybe_uts;
+			uts.set(L, std::forward<Key>(key), std::forward<Value>(value));
+		}
+		else {
+			base_t::set(std::forward<Key>(key), std::forward<Value>(value));
+		}
+	}
+
+	namespace stack {
+		template <>
+		struct unqualified_getter<metatable_key_t> {
+			static table get(lua_State* L, int index = -1) {
+				if (lua_getmetatable(L, index) == 0) {
+					return table(L, ref_index(LUA_REFNIL));
+				}
+				return table(L, -1);
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+// end of sol/table.hpp
+
+// beginning of sol/state.hpp
+
+// beginning of sol/state_view.hpp
+
+// beginning of sol/environment.hpp
+
+namespace sol {
+
+	template <typename base_type>
+	struct basic_environment : basic_table<base_type> {
+	private:
+		typedef basic_table<base_type> base_t;
+
+	public:
+		using base_t::lua_state;
+
+		basic_environment() noexcept = default;
+		basic_environment(const basic_environment&) = default;
+		basic_environment(basic_environment&&) = default;
+		basic_environment& operator=(const basic_environment&) = default;
+		basic_environment& operator=(basic_environment&&) = default;
+		basic_environment(const stack_reference& r) : basic_environment(r.lua_state(), r.stack_index()) {
+		}
+		basic_environment(stack_reference&& r) : basic_environment(r.lua_state(), r.stack_index()) {
+		}
+
+		basic_environment(lua_State* L, new_table nt) : base_t(L, std::move(nt)) {
+		}
+		template <bool b>
+		basic_environment(lua_State* L, new_table t, const basic_reference<b>& fallback) : basic_environment(L, std::move(t)) {
+			stack_table mt(L, new_table(0, 1));
+			mt.set(meta_function::index, fallback);
+			this->set(metatable_key, mt);
+			mt.pop();
+		}
+
+		basic_environment(env_key_t, const stack_reference& extraction_target)
+		: base_t(detail::no_safety, extraction_target.lua_state(), (stack::push_environment_of(extraction_target), -1)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			constructor_handler handler {};
+			stack::check<env_key_t>(this->lua_state(), -1, handler);
+#endif // Safety
+			lua_pop(this->lua_state(), 2);
+		}
+		template <bool b>
+		basic_environment(env_key_t, const basic_reference<b>& extraction_target)
+		: base_t(detail::no_safety, extraction_target.lua_state(), (stack::push_environment_of(extraction_target), -1)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			constructor_handler handler {};
+			stack::check<env_key_t>(this->lua_state(), -1, handler);
+#endif // Safety
+			lua_pop(this->lua_state(), 2);
+		}
+		basic_environment(lua_State* L, int index = -1) : base_t(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			constructor_handler handler {};
+			stack::check<basic_environment>(L, index, handler);
+#endif // Safety
+		}
+		basic_environment(lua_State* L, ref_index index) : base_t(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_environment>(L, -1, handler);
+#endif // Safety
+		}
+		template <typename T,
+		     meta::enable<meta::neg<meta::any_same<meta::unqualified_t<T>, basic_environment>>, meta::neg<std::is_same<base_type, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_environment(T&& r) noexcept : base_t(detail::no_safety, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			if (!is_environment<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				constructor_handler handler {};
+				stack::check<basic_environment>(lua_state(), -1, handler);
+			}
+#endif // Safety
+		}
+		basic_environment(lua_nil_t r) noexcept : base_t(detail::no_safety, r) {
+		}
+
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_environment(lua_State* L, T&& r) noexcept : base_t(detail::no_safety, L, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			if (!is_environment<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				constructor_handler handler {};
+				stack::check<basic_environment>(lua_state(), -1, handler);
+			}
+#endif // Safety
+		}
+
+		template <typename T>
+		void set_on(const T& target) const {
+			lua_State* L = target.lua_state();
+			auto pp = stack::push_pop(target);
+#if SOL_LUA_VESION_I_ < 502
+			// Use lua_setfenv
+			this->push();
+			lua_setfenv(L, -2);
+#else
+			// Use upvalues as explained in Lua 5.2 and beyond's manual
+			this->push();
+			const char* name = lua_setupvalue(L, -2, 1);
+			if (name == nullptr) {
+				this->pop();
+			}
+#endif
+		}
+	};
+
+	template <typename T, typename E>
+	void set_environment(const basic_environment<E>& env, const T& target) {
+		env.set_on(target);
+	}
+
+	template <typename E = reference, typename T>
+	basic_environment<E> get_environment(const T& target) {
+		lua_State* L = target.lua_state();
+		auto pp = stack::pop_n(L, stack::push_environment_of(target));
+		return basic_environment<E>(L, -1);
+	}
+
+	struct this_environment {
+		optional<environment> env;
+
+		this_environment() : env(nullopt) {
+		}
+		this_environment(environment e) : env(std::move(e)) {
+		}
+		this_environment(const this_environment&) = default;
+		this_environment(this_environment&&) = default;
+		this_environment& operator=(const this_environment&) = default;
+		this_environment& operator=(this_environment&&) = default;
+
+		explicit operator bool() const {
+			return static_cast<bool>(env);
+		}
+
+		operator optional<environment> &() {
+			return env;
+		}
+
+		operator const optional<environment> &() const {
+			return env;
+		}
+
+		operator environment&() {
+			return env.value();
+		}
+
+		operator const environment&() const {
+			return env.value();
+		}
+	};
+
+	namespace stack {
+		template <>
+		struct unqualified_getter<env_key_t> {
+			static environment get(lua_State* L, int index, record& tracking) {
+				tracking.use(1);
+				return get_environment(stack_reference(L, raw_index(index)));
+			}
+		};
+
+		template <>
+		struct unqualified_getter<this_environment> {
+			static this_environment get(lua_State* L, int, record& tracking) {
+				tracking.use(0);
+				lua_Debug info;
+				// Level 0 means current function (this C function, which may or may not be useful for us?)
+				// Level 1 means next call frame up the stack. (Can be nothing if function called directly from C++ with lua_p/call)
+				int pre_stack_size = lua_gettop(L);
+				if (lua_getstack(L, 1, &info) != 1) {
+					if (lua_getstack(L, 0, &info) != 1) {
+						lua_settop(L, pre_stack_size);
+						return this_environment();
+					}
+				}
+				if (lua_getinfo(L, "f", &info) == 0) {
+					lua_settop(L, pre_stack_size);
+					return this_environment();
+				}
+
+				stack_reference f(L, -1);
+				environment env(env_key, f);
+				if (!env.valid()) {
+					lua_settop(L, pre_stack_size);
+					return this_environment();
+				}
+				return this_environment(std::move(env));
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+// end of sol/environment.hpp
+
+// beginning of sol/load_result.hpp
+
+#include <cstdint>
+
+namespace sol {
+	struct load_result : public proxy_base<load_result> {
+	private:
+		lua_State* L;
+		int index;
+		int returncount;
+		int popcount;
+		load_status err;
+
+	public:
+		load_result() noexcept = default;
+		load_result(lua_State* Ls, int stackindex = -1, int retnum = 0, int popnum = 0, load_status lerr = load_status::ok) noexcept
+		: L(Ls), index(stackindex), returncount(retnum), popcount(popnum), err(lerr) {
+		}
+
+		// We do not want anyone to copy these around willy-nilly
+		// Will likely break people, but also will probably get rid of quiet bugs that have
+		// been lurking. (E.g., Vanilla Lua will just quietly discard over-pops and under-pops:
+		// LuaJIT and other Lua engines will implode and segfault at random later times.)
+		load_result(const load_result&) = delete;
+		load_result& operator=(const load_result&) = delete;
+
+		load_result(load_result&& o) noexcept : L(o.L), index(o.index), returncount(o.returncount), popcount(o.popcount), err(o.err) {
+			// Must be manual, otherwise destructor will screw us
+			// return count being 0 is enough to keep things clean
+			// but we will be thorough
+			o.L = nullptr;
+			o.index = 0;
+			o.returncount = 0;
+			o.popcount = 0;
+			o.err = load_status::syntax;
+		}
+		load_result& operator=(load_result&& o) noexcept {
+			L = o.L;
+			index = o.index;
+			returncount = o.returncount;
+			popcount = o.popcount;
+			err = o.err;
+			// Must be manual, otherwise destructor will screw us
+			// return count being 0 is enough to keep things clean
+			// but we will be thorough
+			o.L = nullptr;
+			o.index = 0;
+			o.returncount = 0;
+			o.popcount = 0;
+			o.err = load_status::syntax;
+			return *this;
+		}
+
+		load_status status() const noexcept {
+			return err;
+		}
+
+		bool valid() const noexcept {
+			return status() == load_status::ok;
+		}
+
+		template <typename T>
+		T get() const {
+			using UT = meta::unqualified_t<T>;
+			if constexpr (meta::is_optional_v<UT>) {
+				using ValueType = typename UT::value_type;
+				if constexpr (std::is_same_v<ValueType, error>) {
+					if (valid()) {
+						return UT(nullopt);
+					}
+					return error(detail::direct_error, stack::get<std::string>(L, index));
+				}
+				else {
+					if (!valid()) {
+						return UT(nullopt);
+					}
+					return stack::get<UT>(L, index);
+				}
+			}
+			else {
+				if constexpr (std::is_same_v<T, error>) {
+#if SOL_IS_ON(SOL_SAFE_PROXIES_I_)
+					if (valid()) {
+						type_panic_c_str(L, index, type_of(L, index), type::none, "expecting an error type (a string, from Lua)");
+					}
+#endif // Check proxy type's safety
+					return error(detail::direct_error, stack::get<std::string>(L, index));
+				}
+				else {
+#if SOL_IS_ON(SOL_SAFE_PROXIES_I_)
+					if (!valid()) {
+						type_panic_c_str(L, index, type_of(L, index), type::none);
+					}
+#endif // Check proxy type's safety
+					return stack::get<T>(L, index);
+				}
+			}
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) call(Args&&... args) {
+#if !defined(__clang__) && defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 191200000
+			// MSVC is ass sometimes
+			return get<protected_function>().call<Ret...>(std::forward<Args>(args)...);
+#else
+			return get<protected_function>().template call<Ret...>(std::forward<Args>(args)...);
+#endif
+		}
+
+		template <typename... Args>
+		decltype(auto) operator()(Args&&... args) {
+			return call<>(std::forward<Args>(args)...);
+		}
+
+		lua_State* lua_state() const noexcept {
+			return L;
+		};
+		int stack_index() const noexcept {
+			return index;
+		};
+
+		~load_result() {
+			stack::remove(L, index, popcount);
+		}
+	};
+} // namespace sol
+
+// end of sol/load_result.hpp
+
+// beginning of sol/state_handling.hpp
+
+// beginning of sol/lua_value.hpp
+
+namespace sol {
+	struct lua_value {
+	public:
+		struct arr : detail::ebco<std::initializer_list<lua_value>> {
+		private:
+			using base_t = detail::ebco<std::initializer_list<lua_value>>;
+
+		public:
+			using base_t::base_t;
+		};
+
+	private:
+		template <typename T>
+		using is_reference_or_lua_value_init_list
+		     = meta::any<meta::is_specialization_of<T, std::initializer_list>, std::is_same<T, reference>, std::is_same<T, arr>>;
+
+		template <typename T>
+		using is_lua_value_single_constructible = meta::any<std::is_same<T, lua_value>, is_reference_or_lua_value_init_list<T>>;
+
+		static lua_State*& thread_local_lua_state() {
+#if SOL_IS_ON(SOL_USE_THREAD_LOCAL_I_)
+			static thread_local lua_State* L = nullptr;
+#else
+			static lua_State* L = nullptr;
+#endif
+			return L;
+		}
+
+		reference ref_value;
+
+	public:
+		static void set_lua_state(lua_State* L) {
+			thread_local_lua_state() = L;
+		}
+
+		template <typename T, meta::disable<is_reference_or_lua_value_init_list<meta::unqualified_t<T>>> = meta::enabler>
+		lua_value(lua_State* L_, T&& value) : lua_value(((set_lua_state(L_)), std::forward<T>(value))) {
+		}
+
+		template <typename T, meta::disable<is_lua_value_single_constructible<meta::unqualified_t<T>>> = meta::enabler>
+		lua_value(T&& value) : ref_value(make_reference(thread_local_lua_state(), std::forward<T>(value))) {
+		}
+
+		lua_value(lua_State* L_, std::initializer_list<std::pair<lua_value, lua_value>> il)
+		: lua_value([&L_, &il]() {
+			set_lua_state(L_);
+			return std::move(il);
+		}()) {
+		}
+
+		lua_value(std::initializer_list<std::pair<lua_value, lua_value>> il) : ref_value(make_reference(thread_local_lua_state(), std::move(il))) {
+		}
+
+		lua_value(lua_State* L_, arr il)
+		: lua_value([&L_, &il]() {
+			set_lua_state(L_);
+			return std::move(il);
+		}()) {
+		}
+
+		lua_value(arr il) : ref_value(make_reference(thread_local_lua_state(), std::move(il.value()))) {
+		}
+
+		lua_value(lua_State* L_, reference r)
+		: lua_value([&L_, &r]() {
+			set_lua_state(L_);
+			return std::move(r);
+		}()) {
+		}
+
+		lua_value(reference r) : ref_value(std::move(r)) {
+		}
+
+		lua_value(const lua_value&) noexcept = default;
+		lua_value(lua_value&&) = default;
+		lua_value& operator=(const lua_value&) = default;
+		lua_value& operator=(lua_value&&) = default;
+
+		const reference& value() const& {
+			return ref_value;
+		}
+
+		reference& value() & {
+			return ref_value;
+		}
+
+		reference&& value() && {
+			return std::move(ref_value);
+		}
+
+		template <typename T>
+		decltype(auto) as() const {
+			ref_value.push();
+			return stack::pop<T>(ref_value.lua_state());
+		}
+
+		template <typename T>
+		bool is() const {
+			int r = ref_value.registry_index();
+			if (r == LUA_REFNIL)
+				return meta::any_same<meta::unqualified_t<T>, lua_nil_t, nullopt_t, std::nullptr_t>::value ? true : false;
+			if (r == LUA_NOREF)
+				return false;
+			auto pp = stack::push_pop(ref_value);
+			return stack::check<T>(ref_value.lua_state(), -1, no_panic);
+		}
+	};
+
+	using array_value = typename lua_value::arr;
+
+	namespace stack {
+		template <>
+		struct unqualified_pusher<lua_value> {
+			static int push(lua_State* L, const lua_value& lv) {
+				return stack::push(L, lv.value());
+			}
+
+			static int push(lua_State* L, lua_value&& lv) {
+				return stack::push(L, std::move(lv).value());
+			}
+		};
+
+		template <>
+		struct unqualified_getter<lua_value> {
+			static lua_value get(lua_State* L, int index, record& tracking) {
+				return lua_value(L, stack::get<reference>(L, index, tracking));
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+// end of sol/lua_value.hpp
+
+#if SOL_IS_ON(SOL_PRINT_ERRORS_I_)
+#include <iostream>
+#endif
+
+namespace sol {
+	inline void register_main_thread(lua_State* L) {
+#if SOL_LUA_VESION_I_ < 502
+		if (L == nullptr) {
+			lua_pushnil(L);
+			lua_setglobal(L, detail::default_main_thread_name());
+			return;
+		}
+		lua_pushthread(L);
+		lua_setglobal(L, detail::default_main_thread_name());
+#else
+		(void)L;
+#endif
+	}
+
+	inline int default_at_panic(lua_State* L) {
+#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
+		(void)L;
+		return -1;
+#else
+		size_t messagesize;
+		const char* message = lua_tolstring(L, -1, &messagesize);
+		if (message) {
+			std::string err(message, messagesize);
+			lua_settop(L, 0);
+#if SOL_IS_ON(SOL_PRINT_ERRORS_I_)
+			std::cerr << "[sol3] An error occurred and panic has been invoked: ";
+			std::cerr << err;
+			std::cerr << std::endl;
+#endif
+			throw error(err);
+		}
+		lua_settop(L, 0);
+		throw error(std::string("An unexpected error occurred and panic has been invoked"));
+#endif // Printing Errors
+	}
+
+	inline int default_traceback_error_handler(lua_State* L) {
+		std::string msg = "An unknown error has triggered the default error handler";
+		optional<string_view> maybetopmsg = stack::unqualified_check_get<string_view>(L, 1, no_panic);
+		if (maybetopmsg) {
+			const string_view& topmsg = maybetopmsg.value();
+			msg.assign(topmsg.data(), topmsg.size());
+		}
+		luaL_traceback(L, L, msg.c_str(), 1);
+		optional<string_view> maybetraceback = stack::unqualified_check_get<string_view>(L, -1, no_panic);
+		if (maybetraceback) {
+			const string_view& traceback = maybetraceback.value();
+			msg.assign(traceback.data(), traceback.size());
+		}
+#if SOL_IS_ON(SOL_PRINT_ERRORS_I_)
+		// std::cerr << "[sol3] An error occurred and was caught in traceback: ";
+		// std::cerr << msg;
+		// std::cerr << std::endl;
+#endif // Printing
+		return stack::push(L, msg);
+	}
+
+	inline void set_default_state(lua_State* L, lua_CFunction panic_function = &default_at_panic,
+	     lua_CFunction traceback_function = c_call<decltype(&default_traceback_error_handler), &default_traceback_error_handler>,
+	     exception_handler_function exf = detail::default_exception_handler) {
+		lua_atpanic(L, panic_function);
+		protected_function::set_default_handler(object(L, in_place, traceback_function));
+		set_default_exception_handler(L, exf);
+		register_main_thread(L);
+		stack::luajit_exception_handler(L);
+		lua_value::set_lua_state(L);
+	}
+
+	inline std::size_t total_memory_used(lua_State* L) {
+		std::size_t kb = lua_gc(L, LUA_GCCOUNT, 0);
+		kb *= 1024;
+		kb += lua_gc(L, LUA_GCCOUNTB, 0);
+		return kb;
+	}
+
+	inline protected_function_result script_pass_on_error(lua_State*, protected_function_result result) {
+		return result;
+	}
+
+	inline protected_function_result script_throw_on_error(lua_State* L, protected_function_result result) {
+		type t = type_of(L, result.stack_index());
+		std::string err = "sol: ";
+		err += to_string(result.status());
+		err += " error";
+#if SOL_IS_ON(SOL_EXCEPTIONS_I_)
+		std::exception_ptr eptr = std::current_exception();
+		if (eptr) {
+			err += " with a ";
+			try {
+				std::rethrow_exception(eptr);
+			}
+			catch (const std::exception& ex) {
+				err += "std::exception -- ";
+				err.append(ex.what());
+			}
+			catch (const std::string& message) {
+				err += "thrown message -- ";
+				err.append(message);
+			}
+			catch (const char* message) {
+				err += "thrown message -- ";
+				err.append(message);
+			}
+			catch (...) {
+				err.append("thrown but unknown type, cannot serialize into error message");
+			}
+		}
+#endif // serialize exception information if possible
+		if (t == type::string) {
+			err += ": ";
+			string_view serr = stack::unqualified_get<string_view>(L, result.stack_index());
+			err.append(serr.data(), serr.size());
+		}
+#if SOL_IS_ON(SOL_PRINT_ERRORS_I_)
+		std::cerr << "[sol3] An error occurred and has been passed to an error handler: ";
+		std::cerr << err;
+		std::cerr << std::endl;
+#endif
+		// replacing information of stack error into pfr
+		int target = result.stack_index();
+		if (result.pop_count() > 0) {
+			stack::remove(L, target, result.pop_count());
+		}
+		stack::push(L, err);
+		int top = lua_gettop(L);
+		int towards = top - target;
+		if (towards != 0) {
+			lua_rotate(L, top, towards);
+		}
+#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
+		return result;
+#else
+		// just throw our error
+		throw error(detail::direct_error, err);
+#endif // If exceptions are allowed
+	}
+
+	inline protected_function_result script_default_on_error(lua_State* L, protected_function_result pfr) {
+#if SOL_IS_ON(SOL_DEFAULT_PASS_ON_ERROR_I_)
+		return script_pass_on_error(L, std::move(pfr));
+#else
+		return script_throw_on_error(L, std::move(pfr));
+#endif
+	}
+
+	namespace stack {
+		inline error get_traceback_or_errors(lua_State* L) {
+			int p = default_traceback_error_handler(L);
+			sol::error err = stack::get<sol::error>(L, -p);
+			lua_pop(L, p);
+			return err;
+		}
+	} // namespace stack
+} // namespace sol
+
+// end of sol/state_handling.hpp
+
+#include <memory>
+#include <cstddef>
+
+namespace sol {
+
+	class state_view {
+	private:
+		lua_State* L;
+		table reg;
+		global_table global;
+
+		optional<object> is_loaded_package(const std::string& key) {
+			auto loaded = reg.traverse_get<optional<object>>("_LOADED", key);
+			bool is53mod = loaded && !(loaded->is<bool>() && !loaded->as<bool>());
+			if (is53mod)
+				return loaded;
+#if SOL_LUA_VESION_I_ <= 501
+			auto loaded51 = global.traverse_get<optional<object>>("package", "loaded", key);
+			bool is51mod = loaded51 && !(loaded51->is<bool>() && !loaded51->as<bool>());
+			if (is51mod)
+				return loaded51;
+#endif
+			return nullopt;
+		}
+
+		template <typename T>
+		void ensure_package(const std::string& key, T&& sr) {
+#if SOL_LUA_VESION_I_ <= 501
+			auto pkg = global["package"];
+			if (!pkg.valid()) {
+				pkg = create_table_with("loaded", create_table_with(key, sr));
+			}
+			else {
+				auto ld = pkg["loaded"];
+				if (!ld.valid()) {
+					ld = create_table_with(key, sr);
+				}
+				else {
+					ld[key] = sr;
+				}
+			}
+#endif
+			auto loaded = reg["_LOADED"];
+			if (!loaded.valid()) {
+				loaded = create_table_with(key, sr);
+			}
+			else {
+				loaded[key] = sr;
+			}
+		}
+
+		template <typename Fx>
+		object require_core(const std::string& key, Fx&& action, bool create_global = true) {
+			optional<object> loaded = is_loaded_package(key);
+			if (loaded && loaded->valid())
+				return std::move(*loaded);
+			action();
+			stack_reference sr(L, -1);
+			if (create_global)
+				set(key, sr);
+			ensure_package(key, sr);
+			return stack::pop<object>(L);
+		}
+
+	public:
+		using iterator = typename global_table::iterator;
+		using const_iterator = typename global_table::const_iterator;
+
+		state_view(lua_State* Ls) : L(Ls), reg(Ls, LUA_REGISTRYINDEX), global(Ls, detail::global_) {
+		}
+
+		state_view(this_state Ls) : state_view(Ls.L) {
+		}
+
+		lua_State* lua_state() const {
+			return L;
+		}
+
+		template <typename... Args>
+		void open_libraries(Args&&... args) {
+			static_assert(meta::all_same<lib, meta::unqualified_t<Args>...>::value, "all types must be libraries");
+			if constexpr (sizeof...(args) == 0) {
+				luaL_openlibs(L);
+				return;
+			}
+			else {
+				lib libraries[1 + sizeof...(args)] = { lib::count, std::forward<Args>(args)... };
+
+				for (auto&& library : libraries) {
+					switch (library) {
+#if SOL_LUA_VESION_I_ <= 501 && defined(SOL_LUAJIT)
+					case lib::coroutine:
+#endif // luajit opens coroutine base stuff
+					case lib::base:
+						luaL_requiref(L, "base", luaopen_base, 1);
+						lua_pop(L, 1);
+						break;
+					case lib::package:
+						luaL_requiref(L, "package", luaopen_package, 1);
+						lua_pop(L, 1);
+						break;
+#if !defined(SOL_LUAJIT)
+					case lib::coroutine:
+#if SOL_LUA_VESION_I_ > 501
+						luaL_requiref(L, "coroutine", luaopen_coroutine, 1);
+						lua_pop(L, 1);
+#endif // Lua 5.2+ only
+						break;
+#endif // Not LuaJIT - comes builtin
+					case lib::string:
+						luaL_requiref(L, "string", luaopen_string, 1);
+						lua_pop(L, 1);
+						break;
+					case lib::table:
+						luaL_requiref(L, "table", luaopen_table, 1);
+						lua_pop(L, 1);
+						break;
+					case lib::math:
+						luaL_requiref(L, "math", luaopen_math, 1);
+						lua_pop(L, 1);
+						break;
+					case lib::bit32:
+#ifdef SOL_LUAJIT
+						luaL_requiref(L, "bit32", luaopen_bit, 1);
+						lua_pop(L, 1);
+#elif (SOL_LUA_VESION_I_ == 502) || defined(LUA_COMPAT_BITLIB) || defined(LUA_COMPAT_5_2)
+						luaL_requiref(L, "bit32", luaopen_bit32, 1);
+						lua_pop(L, 1);
+#else
+#endif // Lua 5.2 only (deprecated in 5.3 (503)) (Can be turned on with Compat flags)
+						break;
+					case lib::io:
+						luaL_requiref(L, "io", luaopen_io, 1);
+						lua_pop(L, 1);
+						break;
+					case lib::os:
+						luaL_requiref(L, "os", luaopen_os, 1);
+						lua_pop(L, 1);
+						break;
+					case lib::debug:
+						luaL_requiref(L, "debug", luaopen_debug, 1);
+						lua_pop(L, 1);
+						break;
+					case lib::utf8:
+#if SOL_LUA_VESION_I_ > 502 && !defined(SOL_LUAJIT)
+						luaL_requiref(L, "utf8", luaopen_utf8, 1);
+						lua_pop(L, 1);
+#endif // Lua 5.3+ only
+						break;
+					case lib::ffi:
+#ifdef SOL_LUAJIT
+						luaL_requiref(L, "ffi", luaopen_ffi, 1);
+						lua_pop(L, 1);
+#endif // LuaJIT only
+						break;
+					case lib::jit:
+#ifdef SOL_LUAJIT
+						luaL_requiref(L, "jit", luaopen_jit, 0);
+						lua_pop(L, 1);
+#endif // LuaJIT Only
+						break;
+					case lib::count:
+					default:
+						break;
+					}
+				}
+			}
+		}
+
+		object require(const std::string& key, lua_CFunction open_function, bool create_global = true) {
+			luaL_requiref(L, key.c_str(), open_function, create_global ? 1 : 0);
+			return stack::pop<object>(L);
+		}
+
+		object require_script(const std::string& key, const string_view& code, bool create_global = true,
+		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			auto action = [this, &code, &chunkname, &mode]() { stack::script(L, code, chunkname, mode); };
+			return require_core(key, action, create_global);
+		}
+
+		object require_file(const std::string& key, const std::string& filename, bool create_global = true, load_mode mode = load_mode::any) {
+			auto action = [this, &filename, &mode]() { stack::script_file(L, filename, mode); };
+			return require_core(key, action, create_global);
+		}
+
+		void clear_package_loaders() {
+			optional<table> maybe_package = this->global["package"];
+			if (!maybe_package) {
+				// package lib wasn't opened
+				// open package lib
+				return;
+			}
+			table& package = *maybe_package;
+			// yay for version differences...
+			// one day Lua 5.1 will die a peaceful death
+			// and its old bones will find blissful rest
+			auto loaders_proxy = package
+#if SOL_LUA_VESION_I_ < 502
+			     ["loaders"]
+#else
+			     ["searchers"]
+#endif
+			     ;
+			if (!loaders_proxy.valid()) {
+				// nothing to clear
+				return;
+			}
+			// we need to create the table for loaders
+			// table does not exist, so create and move forward
+			loaders_proxy = new_table(1, 0);
+		}
+
+		template <typename Fx>
+		void add_package_loader(Fx&& fx, bool clear_all_package_loaders = false) {
+			optional<table> maybe_package = this->global["package"];
+			if (!maybe_package) {
+				// package lib wasn't opened
+				// open package lib
+				return;
+			}
+			table& package = *maybe_package;
+			// yay for version differences...
+			// one day Lua 5.1 will die a peaceful death
+			// and its old bones will find blissful rest
+			auto loaders_proxy = package
+#if SOL_LUA_VESION_I_ < 502
+			     ["loaders"]
+#else
+			     ["searchers"]
+#endif
+			     ;
+			bool make_new_table = clear_all_package_loaders || !loaders_proxy.valid();
+			if (make_new_table) {
+				// we need to create the table for loaders
+				// table does not exist, so create and move forward
+				loaders_proxy = new_table(1, 0);
+			}
+			optional<table> maybe_loaders = loaders_proxy;
+			if (!maybe_loaders) {
+				// loaders/searches
+				// thing exists in package, but it
+				// ain't a table or a table-alike...!
+				return;
+			}
+			table loaders = loaders_proxy;
+			loaders.add(std::forward<Fx>(fx));
+		}
+
+		template <typename E>
+		protected_function_result do_reader(lua_Reader reader, void* data, const basic_environment<E>& env,
+		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name("lua_Reader", chunkname, basechunkname);
+			load_status x = static_cast<load_status>(lua_load(L, reader, data, chunknametarget, to_string(mode).c_str()));
+			if (x != load_status::ok) {
+				return protected_function_result(L, absolute_index(L, -1), 0, 1, static_cast<call_status>(x));
+			}
+			stack_aligned_protected_function pf(L, -1);
+			set_environment(env, pf);
+			return pf();
+		}
+
+		protected_function_result do_reader(
+		     lua_Reader reader, void* data, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name("lua_Reader", chunkname, basechunkname);
+			load_status x = static_cast<load_status>(lua_load(L, reader, data, chunknametarget, to_string(mode).c_str()));
+			if (x != load_status::ok) {
+				return protected_function_result(L, absolute_index(L, -1), 0, 1, static_cast<call_status>(x));
+			}
+			stack_aligned_protected_function pf(L, -1);
+			return pf();
+		}
+
+		template <typename E>
+		protected_function_result do_string(const string_view& code, const basic_environment<E>& env,
+		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name(code, chunkname, basechunkname);
+			load_status x = static_cast<load_status>(luaL_loadbufferx(L, code.data(), code.size(), chunknametarget, to_string(mode).c_str()));
+			if (x != load_status::ok) {
+				return protected_function_result(L, absolute_index(L, -1), 0, 1, static_cast<call_status>(x));
+			}
+			stack_aligned_protected_function pf(L, -1);
+			set_environment(env, pf);
+			return pf();
+		}
+
+		protected_function_result do_string(
+		     const string_view& code, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name(code, chunkname, basechunkname);
+			load_status x = static_cast<load_status>(luaL_loadbufferx(L, code.data(), code.size(), chunknametarget, to_string(mode).c_str()));
+			if (x != load_status::ok) {
+				return protected_function_result(L, absolute_index(L, -1), 0, 1, static_cast<call_status>(x));
+			}
+			stack_aligned_protected_function pf(L, -1);
+			return pf();
+		}
+
+		template <typename E>
+		protected_function_result do_file(const std::string& filename, const basic_environment<E>& env, load_mode mode = load_mode::any) {
+			load_status x = static_cast<load_status>(luaL_loadfilex(L, filename.c_str(), to_string(mode).c_str()));
+			if (x != load_status::ok) {
+				return protected_function_result(L, absolute_index(L, -1), 0, 1, static_cast<call_status>(x));
+			}
+			stack_aligned_protected_function pf(L, -1);
+			set_environment(env, pf);
+			return pf();
+		}
+
+		protected_function_result do_file(const std::string& filename, load_mode mode = load_mode::any) {
+			load_status x = static_cast<load_status>(luaL_loadfilex(L, filename.c_str(), to_string(mode).c_str()));
+			if (x != load_status::ok) {
+				return protected_function_result(L, absolute_index(L, -1), 0, 1, static_cast<call_status>(x));
+			}
+			stack_aligned_protected_function pf(L, -1);
+			return pf();
+		}
+
+		template <typename Fx,
+		     meta::disable_any<meta::is_string_constructible<meta::unqualified_t<Fx>>,
+		          meta::is_specialization_of<meta::unqualified_t<Fx>, basic_environment>> = meta::enabler>
+		protected_function_result safe_script(
+		     lua_Reader reader, void* data, Fx&& on_error, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			protected_function_result pfr = do_reader(reader, data, chunkname, mode);
+			if (!pfr.valid()) {
+				return on_error(L, std::move(pfr));
+			}
+			return pfr;
+		}
+
+		protected_function_result safe_script(
+		     lua_Reader reader, void* data, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return safe_script(reader, data, script_default_on_error, chunkname, mode);
+		}
+
+		template <typename Fx,
+		     meta::disable_any<meta::is_string_constructible<meta::unqualified_t<Fx>>,
+		          meta::is_specialization_of<meta::unqualified_t<Fx>, basic_environment>> = meta::enabler>
+		protected_function_result safe_script(
+		     const string_view& code, Fx&& on_error, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			protected_function_result pfr = do_string(code, chunkname, mode);
+			if (!pfr.valid()) {
+				return on_error(L, std::move(pfr));
+			}
+			return pfr;
+		}
+
+		template <typename Fx, typename E>
+		protected_function_result safe_script(const string_view& code, const basic_environment<E>& env, Fx&& on_error,
+		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			protected_function_result pfr = do_string(code, env, chunkname, mode);
+			if (!pfr.valid()) {
+				return on_error(L, std::move(pfr));
+			}
+			return pfr;
+		}
+
+		template <typename E>
+		protected_function_result safe_script(const string_view& code, const basic_environment<E>& env,
+		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return safe_script(code, env, script_default_on_error, chunkname, mode);
+		}
+
+		protected_function_result safe_script(
+		     const string_view& code, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return safe_script(code, script_default_on_error, chunkname, mode);
+		}
+
+		template <typename Fx,
+		     meta::disable_any<meta::is_string_constructible<meta::unqualified_t<Fx>>,
+		          meta::is_specialization_of<meta::unqualified_t<Fx>, basic_environment>> = meta::enabler>
+		protected_function_result safe_script_file(const std::string& filename, Fx&& on_error, load_mode mode = load_mode::any) {
+			protected_function_result pfr = do_file(filename, mode);
+			if (!pfr.valid()) {
+				return on_error(L, std::move(pfr));
+			}
+			return pfr;
+		}
+
+		template <typename Fx, typename E>
+		protected_function_result safe_script_file(
+		     const std::string& filename, const basic_environment<E>& env, Fx&& on_error, load_mode mode = load_mode::any) {
+			protected_function_result pfr = do_file(filename, env, mode);
+			if (!pfr.valid()) {
+				return on_error(L, std::move(pfr));
+			}
+			return pfr;
+		}
+
+		template <typename E>
+		protected_function_result safe_script_file(const std::string& filename, const basic_environment<E>& env, load_mode mode = load_mode::any) {
+			return safe_script_file(filename, env, script_default_on_error, mode);
+		}
+
+		protected_function_result safe_script_file(const std::string& filename, load_mode mode = load_mode::any) {
+			return safe_script_file(filename, script_default_on_error, mode);
+		}
+
+		template <typename E>
+		unsafe_function_result unsafe_script(lua_Reader reader, void* data, const basic_environment<E>& env,
+		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name("lua_Reader", chunkname, basechunkname);
+			int index = lua_gettop(L);
+			if (lua_load(L, reader, data, chunknametarget, to_string(mode).c_str())) {
+				lua_error(L);
+			}
+			set_environment(env, stack_reference(L, raw_index(index + 1)));
+			if (lua_pcall(L, 0, LUA_MULTRET, 0)) {
+				lua_error(L);
+			}
+			int postindex = lua_gettop(L);
+			int returns = postindex - index;
+			return unsafe_function_result(L, (std::max)(postindex - (returns - 1), 1), returns);
+		}
+
+		unsafe_function_result unsafe_script(
+		     lua_Reader reader, void* data, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			int index = lua_gettop(L);
+			stack::script(L, reader, data, chunkname, mode);
+			int postindex = lua_gettop(L);
+			int returns = postindex - index;
+			return unsafe_function_result(L, (std::max)(postindex - (returns - 1), 1), returns);
+		}
+
+		template <typename E>
+		unsafe_function_result unsafe_script(const string_view& code, const basic_environment<E>& env,
+		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name(code, chunkname, basechunkname);
+			int index = lua_gettop(L);
+			if (luaL_loadbufferx(L, code.data(), code.size(), chunknametarget, to_string(mode).c_str())) {
+				lua_error(L);
+			}
+			set_environment(env, stack_reference(L, raw_index(index + 1)));
+			if (lua_pcall(L, 0, LUA_MULTRET, 0)) {
+				lua_error(L);
+			}
+			int postindex = lua_gettop(L);
+			int returns = postindex - index;
+			return unsafe_function_result(L, (std::max)(postindex - (returns - 1), 1), returns);
+		}
+
+		unsafe_function_result unsafe_script(
+		     const string_view& code, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			int index = lua_gettop(L);
+			stack::script(L, code, chunkname, mode);
+			int postindex = lua_gettop(L);
+			int returns = postindex - index;
+			return unsafe_function_result(L, (std::max)(postindex - (returns - 1), 1), returns);
+		}
+
+		template <typename E>
+		unsafe_function_result unsafe_script_file(const std::string& filename, const basic_environment<E>& env, load_mode mode = load_mode::any) {
+			int index = lua_gettop(L);
+			if (luaL_loadfilex(L, filename.c_str(), to_string(mode).c_str())) {
+				lua_error(L);
+			}
+			set_environment(env, stack_reference(L, raw_index(index + 1)));
+			if (lua_pcall(L, 0, LUA_MULTRET, 0)) {
+				lua_error(L);
+			}
+			int postindex = lua_gettop(L);
+			int returns = postindex - index;
+			return unsafe_function_result(L, (std::max)(postindex - (returns - 1), 1), returns);
+		}
+
+		unsafe_function_result unsafe_script_file(const std::string& filename, load_mode mode = load_mode::any) {
+			int index = lua_gettop(L);
+			stack::script_file(L, filename, mode);
+			int postindex = lua_gettop(L);
+			int returns = postindex - index;
+			return unsafe_function_result(L, (std::max)(postindex - (returns - 1), 1), returns);
+		}
+
+		template <typename Fx,
+		     meta::disable_any<meta::is_string_constructible<meta::unqualified_t<Fx>>,
+		          meta::is_specialization_of<meta::unqualified_t<Fx>, basic_environment>> = meta::enabler>
+		protected_function_result script(
+		     const string_view& code, Fx&& on_error, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return safe_script(code, std::forward<Fx>(on_error), chunkname, mode);
+		}
+
+		template <typename Fx,
+		     meta::disable_any<meta::is_string_constructible<meta::unqualified_t<Fx>>,
+		          meta::is_specialization_of<meta::unqualified_t<Fx>, basic_environment>> = meta::enabler>
+		protected_function_result script_file(const std::string& filename, Fx&& on_error, load_mode mode = load_mode::any) {
+			return safe_script_file(filename, std::forward<Fx>(on_error), mode);
+		}
+
+		template <typename Fx, typename E>
+		protected_function_result script(const string_view& code, const basic_environment<E>& env, Fx&& on_error,
+		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return safe_script(code, env, std::forward<Fx>(on_error), chunkname, mode);
+		}
+
+		template <typename Fx, typename E>
+		protected_function_result script_file(const std::string& filename, const basic_environment<E>& env, Fx&& on_error, load_mode mode = load_mode::any) {
+			return safe_script_file(filename, env, std::forward<Fx>(on_error), mode);
+		}
+
+		protected_function_result script(
+		     const string_view& code, const environment& env, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return safe_script(code, env, script_default_on_error, chunkname, mode);
+		}
+
+		protected_function_result script_file(const std::string& filename, const environment& env, load_mode mode = load_mode::any) {
+			return safe_script_file(filename, env, script_default_on_error, mode);
+		}
+
+#if SOL_IS_ON(SOL_SAFE_FUNCTION_OBJECTS_I_)
+		protected_function_result script(
+		     lua_Reader reader, void* data, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return safe_script(reader, data, chunkname, mode);
+		}
+
+		protected_function_result script(
+		     const string_view& code, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return safe_script(code, chunkname, mode);
+		}
+
+		protected_function_result script_file(const std::string& filename, load_mode mode = load_mode::any) {
+			return safe_script_file(filename, mode);
+		}
+#else
+		unsafe_function_result script(const string_view& code, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return unsafe_script(code, chunkname, mode);
+		}
+
+		unsafe_function_result script_file(const std::string& filename, load_mode mode = load_mode::any) {
+			return unsafe_script_file(filename, mode);
+		}
+#endif
+		load_result load(const string_view& code, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name(code, chunkname, basechunkname);
+			load_status x = static_cast<load_status>(luaL_loadbufferx(L, code.data(), code.size(), chunknametarget, to_string(mode).c_str()));
+			return load_result(L, absolute_index(L, -1), 1, 1, x);
+		}
+
+		load_result load_buffer(const char* buff, size_t size, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return load(string_view(buff, size), chunkname, mode);
+		}
+
+		load_result load_buffer(
+		     const std::byte* buff, size_t size, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return load(string_view(reinterpret_cast<const char*>(buff), size), chunkname, mode);
+		}
+
+		load_result load_file(const std::string& filename, load_mode mode = load_mode::any) {
+			load_status x = static_cast<load_status>(luaL_loadfilex(L, filename.c_str(), to_string(mode).c_str()));
+			return load_result(L, absolute_index(L, -1), 1, 1, x);
+		}
+
+		load_result load(lua_Reader reader, void* data, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name("lua_Reader", chunkname, basechunkname);
+			load_status x = static_cast<load_status>(lua_load(L, reader, data, chunknametarget, to_string(mode).c_str()));
+			return load_result(L, absolute_index(L, -1), 1, 1, x);
+		}
+
+		iterator begin() const {
+			return global.begin();
+		}
+
+		iterator end() const {
+			return global.end();
+		}
+
+		const_iterator cbegin() const {
+			return global.cbegin();
+		}
+
+		const_iterator cend() const {
+			return global.cend();
+		}
+
+		global_table globals() const {
+			// if we return a reference
+			// we'll be screwed a bit
+			return global;
+		}
+
+		global_table& globals() {
+			return global;
+		}
+
+		table registry() const {
+			return reg;
+		}
+
+		std::size_t memory_used() const {
+			return total_memory_used(lua_state());
+		}
+
+		int stack_top() const {
+			return stack::top(L);
+		}
+
+		int stack_clear() {
+			int s = stack_top();
+			lua_pop(L, s);
+			return s;
+		}
+
+		bool supports_gc_mode(gc_mode mode) const noexcept {
+#if SOL_LUA_VESION_I_ >= 504
+			// supports all modes
+			(void)mode;
+			return true;
+#endif
+			return mode == gc_mode::default_value;
+		}
+
+		bool is_gc_on() const {
+#if SOL_LUA_VESION_I_ >= 502
+			return lua_gc(lua_state(), LUA_GCISRUNNING, 0) == 1;
+#else
+			// You cannot turn it off in Lua 5.1
+			return true;
+#endif
+		}
+
+		void collect_garbage() {
+			lua_gc(lua_state(), LUA_GCCOLLECT, 0);
+		}
+
+		void collect_gc() {
+			collect_garbage();
+		}
+
+		bool step_gc(int step_size_kilobytes) {
+			// THOUGHT: std::chrono-alikes to map "kilobyte size" here...?
+			// Make it harder to give MB or KB to a B parameter...?
+			// Probably overkill for now.
+#if SOL_LUA_VESION_I_ >= 504
+			// The manual implies that this function is almost always successful...
+			// is it?? It could depend on the GC mode...
+			return lua_gc(lua_state(), LUA_GCSTEP, step_size_kilobytes) != 0;
+#else
+			return lua_gc(lua_state(), LUA_GCSTEP, step_size_kilobytes) == 1;
+#endif
+		}
+
+		void restart_gc() {
+			lua_gc(lua_state(), LUA_GCRESTART, 0);
+		}
+
+		void stop_gc() {
+			lua_gc(lua_state(), LUA_GCSTOP, 0);
+		}
+
+		// Returns the old GC mode. Check support using the supports_gc_mode function.
+		gc_mode change_gc_mode_incremental(int pause, int step_multiplier, int step_byte_size) {
+			// "What the fuck does any of this mean??"
+			// http://www.lua.org/manual/5.4/manual.html#2.5.1
+
+			// THOUGHT: std::chrono-alikes to map "byte size" here...?
+			// Make it harder to give MB or KB to a B parameter...?
+			// Probably overkill for now.
+#if SOL_LUA_VESION_I_ >= 504
+			int old_mode = lua_gc(lua_state(), LUA_GCINC, pause, step_multiplier, step_byte_size);
+			if (old_mode == LUA_GCGEN) {
+				return gc_mode::generational;
+			}
+			else if (old_mode == LUA_GCINC) {
+				return gc_mode::incremental;
+			}
+#else
+			lua_gc(lua_state(), LUA_GCSETPAUSE, pause);
+			lua_gc(lua_state(), LUA_GCSETSTEPMUL, step_multiplier);
+			(void)step_byte_size; // means nothing in older versions
+#endif
+			return gc_mode::default_value;
+		}
+
+		// Returns the old GC mode. Check support using the supports_gc_mode function.
+		gc_mode change_gc_mode_generational(int minor_multiplier, int major_multiplier) {
+#if SOL_LUA_VESION_I_ >= 504
+			// "What does this shit mean?"
+			// http://www.lua.org/manual/5.4/manual.html#2.5.2
+			int old_mode = lua_gc(lua_state(), LUA_GCGEN, minor_multiplier, major_multiplier);
+			if (old_mode == LUA_GCGEN) {
+				return gc_mode::generational;
+			}
+			else if (old_mode == LUA_GCINC) {
+				return gc_mode::incremental;
+			}
+#endif
+			return gc_mode::default_value;
+		}
+
+		operator lua_State*() const {
+			return lua_state();
+		}
+
+		void set_panic(lua_CFunction panic) {
+			lua_atpanic(lua_state(), panic);
+		}
+
+		void set_exception_handler(exception_handler_function handler) {
+			set_default_exception_handler(lua_state(), handler);
+		}
+
+		template <typename... Args, typename... Keys>
+		decltype(auto) get(Keys&&... keys) const {
+			return global.get<Args...>(std::forward<Keys>(keys)...);
+		}
+
+		template <typename T, typename Key>
+		decltype(auto) get_or(Key&& key, T&& otherwise) const {
+			return global.get_or(std::forward<Key>(key), std::forward<T>(otherwise));
+		}
+
+		template <typename T, typename Key, typename D>
+		decltype(auto) get_or(Key&& key, D&& otherwise) const {
+			return global.get_or<T>(std::forward<Key>(key), std::forward<D>(otherwise));
+		}
+
+		template <typename... Args>
+		state_view& set(Args&&... args) {
+			global.set(std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename T, typename... Keys>
+		decltype(auto) traverse_get(Keys&&... keys) const {
+			return global.traverse_get<T>(std::forward<Keys>(keys)...);
+		}
+
+		template <typename... Args>
+		state_view& traverse_set(Args&&... args) {
+			global.traverse_set(std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename Class, typename... Args>
+		usertype<Class> new_usertype(const std::string& name, Args&&... args) {
+			return global.new_usertype<Class>(name, std::forward<Args>(args)...);
+		}
+
+		template <bool read_only = true, typename... Args>
+		state_view& new_enum(const string_view& name, Args&&... args) {
+			global.new_enum<read_only>(name, std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename T, bool read_only = true>
+		state_view& new_enum(const string_view& name, std::initializer_list<std::pair<string_view, T>> items) {
+			global.new_enum<T, read_only>(name, std::move(items));
+			return *this;
+		}
+
+		template <typename Fx>
+		void for_each(Fx&& fx) {
+			global.for_each(std::forward<Fx>(fx));
+		}
+
+		template <typename T>
+		table_proxy<global_table&, detail::proxy_key_t<T>> operator[](T&& key) {
+			return global[std::forward<T>(key)];
+		}
+
+		template <typename T>
+		table_proxy<const global_table&, detail::proxy_key_t<T>> operator[](T&& key) const {
+			return global[std::forward<T>(key)];
+		}
+
+		template <typename Sig, typename... Args, typename Key>
+		state_view& set_function(Key&& key, Args&&... args) {
+			global.set_function<Sig>(std::forward<Key>(key), std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename... Args, typename Key>
+		state_view& set_function(Key&& key, Args&&... args) {
+			global.set_function(std::forward<Key>(key), std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename Name>
+		table create_table(Name&& name, int narr = 0, int nrec = 0) {
+			return global.create(std::forward<Name>(name), narr, nrec);
+		}
+
+		template <typename Name, typename Key, typename Value, typename... Args>
+		table create_table(Name&& name, int narr, int nrec, Key&& key, Value&& value, Args&&... args) {
+			return global.create(std::forward<Name>(name), narr, nrec, std::forward<Key>(key), std::forward<Value>(value), std::forward<Args>(args)...);
+		}
+
+		template <typename Name, typename... Args>
+		table create_named_table(Name&& name, Args&&... args) {
+			table x = global.create_with(std::forward<Args>(args)...);
+			global.set(std::forward<Name>(name), x);
+			return x;
+		}
+
+		table create_table(int narr = 0, int nrec = 0) {
+			return create_table(lua_state(), narr, nrec);
+		}
+
+		template <typename Key, typename Value, typename... Args>
+		table create_table(int narr, int nrec, Key&& key, Value&& value, Args&&... args) {
+			return create_table(lua_state(), narr, nrec, std::forward<Key>(key), std::forward<Value>(value), std::forward<Args>(args)...);
+		}
+
+		template <typename... Args>
+		table create_table_with(Args&&... args) {
+			return create_table_with(lua_state(), std::forward<Args>(args)...);
+		}
+
+		static inline table create_table(lua_State* L, int narr = 0, int nrec = 0) {
+			return global_table::create(L, narr, nrec);
+		}
+
+		template <typename Key, typename Value, typename... Args>
+		static inline table create_table(lua_State* L, int narr, int nrec, Key&& key, Value&& value, Args&&... args) {
+			return global_table::create(L, narr, nrec, std::forward<Key>(key), std::forward<Value>(value), std::forward<Args>(args)...);
+		}
+
+		template <typename... Args>
+		static inline table create_table_with(lua_State* L, Args&&... args) {
+			return global_table::create_with(L, std::forward<Args>(args)...);
+		}
+	};
+} // namespace sol
+
+// end of sol/state_view.hpp
+
+// beginning of sol/thread.hpp
+
+namespace sol {
+	struct lua_thread_state {
+		lua_State* L;
+
+		lua_thread_state(lua_State* Ls)
+		: L(Ls) {
+		}
+
+		lua_State* lua_state() const noexcept {
+			return L;
+		}
+		operator lua_State*() const noexcept {
+			return lua_state();
+		}
+		lua_State* operator->() const noexcept {
+			return lua_state();
+		}
+	};
+
+	namespace stack {
+		template <>
+		struct unqualified_pusher<lua_thread_state> {
+			int push(lua_State*, lua_thread_state lts) {
+				lua_pushthread(lts.L);
+				return 1;
+			}
+		};
+
+		template <>
+		struct unqualified_getter<lua_thread_state> {
+			lua_thread_state get(lua_State* L, int index, record& tracking) {
+				tracking.use(1);
+				lua_thread_state lts( lua_tothread(L, index) );
+				return lts;
+			}
+		};
+
+		template <>
+		struct unqualified_check_getter<lua_thread_state> {
+			template <typename Handler>
+			optional<lua_thread_state> get(lua_State* L, int index, Handler&& handler, record& tracking) {
+				lua_thread_state lts( lua_tothread(L, index) );
+				if (lts.lua_state() == nullptr) {
+					handler(L, index, type::thread, type_of(L, index), "value is not a valid thread type");
+					return nullopt;
+				}
+				tracking.use(1);
+				return lts;
+			}
+		};
+	} // namespace stack
+
+	template <typename ref_t>
+	class basic_thread : public basic_object<ref_t> {
+	private:
+		using base_t = basic_object<ref_t>;
+
+	public:
+		using base_t::lua_state;
+
+		basic_thread() noexcept = default;
+		basic_thread(const basic_thread&) = default;
+		basic_thread(basic_thread&&) = default;
+		template <typename T, meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_thread>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_thread(T&& r)
+		: base_t(std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler{};
+			stack::check<basic_thread>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		basic_thread(const stack_reference& r)
+		: basic_thread(r.lua_state(), r.stack_index()){};
+		basic_thread(stack_reference&& r)
+		: basic_thread(r.lua_state(), r.stack_index()){};
+		basic_thread& operator=(const basic_thread&) = default;
+		basic_thread& operator=(basic_thread&&) = default;
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_thread(lua_State* L, T&& r)
+		: base_t(L, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler{};
+			stack::check<basic_thread>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		basic_thread(lua_State* L, int index = -1)
+		: base_t(L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			constructor_handler handler{};
+			stack::check<basic_thread>(L, index, handler);
+#endif // Safety
+		}
+		basic_thread(lua_State* L, ref_index index)
+		: base_t(L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler{};
+			stack::check<basic_thread>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		basic_thread(lua_State* L, lua_State* actualthread)
+		: basic_thread(L, lua_thread_state{ actualthread }) {
+		}
+		basic_thread(lua_State* L, this_state actualthread)
+		: basic_thread(L, lua_thread_state{ actualthread.L }) {
+		}
+		basic_thread(lua_State* L, lua_thread_state actualthread)
+		: base_t(L, -stack::push(L, actualthread)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			constructor_handler handler{};
+			stack::check<basic_thread>(lua_state(), -1, handler);
+#endif // Safety
+			if (!is_stack_based<base_t>::value) {
+				lua_pop(lua_state(), 1);
+			}
+		}
+
+		state_view state() const {
+			return state_view(this->thread_state());
+		}
+
+		bool is_main_thread() const {
+			return stack::is_main_thread(this->thread_state());
+		}
+
+		lua_State* thread_state() const {
+			auto pp = stack::push_pop(*this);
+			lua_State* lthread = lua_tothread(lua_state(), -1);
+			return lthread;
+		}
+
+		thread_status status() const {
+			lua_State* lthread = thread_state();
+			auto lstat = static_cast<thread_status>(lua_status(lthread));
+			if (lstat == thread_status::ok) {
+				lua_Debug ar;
+				if (lua_getstack(lthread, 0, &ar) > 0)
+					return thread_status::ok;
+				else if (lua_gettop(lthread) == 0)
+					return thread_status::dead;
+				else
+					return thread_status::yielded;
+			}
+			return lstat;
+		}
+
+		basic_thread create() {
+			return create(lua_state());
+		}
+
+		static basic_thread create(lua_State* L) {
+			lua_newthread(L);
+			basic_thread result(L);
+			if (!is_stack_based<base_t>::value) {
+				lua_pop(L, 1);
+			}
+			return result;
+		}
+	};
+
+	typedef basic_thread<reference> thread;
+	typedef basic_thread<stack_reference> stack_thread;
+} // namespace sol
+
+// end of sol/thread.hpp
+
+namespace sol {
+
+	class state : private std::unique_ptr<lua_State, detail::state_deleter>, public state_view {
+	private:
+		typedef std::unique_ptr<lua_State, detail::state_deleter> unique_base;
+
+	public:
+		state(lua_CFunction panic = default_at_panic)
+		: unique_base(luaL_newstate()), state_view(unique_base::get()) {
+			set_default_state(unique_base::get(), panic);
+		}
+
+		state(lua_CFunction panic, lua_Alloc alfunc, void* alpointer = nullptr)
+		: unique_base(lua_newstate(alfunc, alpointer)), state_view(unique_base::get()) {
+			set_default_state(unique_base::get(), panic);
+		}
+
+		state(const state&) = delete;
+		state(state&&) = default;
+		state& operator=(const state&) = delete;
+		state& operator=(state&& that) {
+			state_view::operator=(std::move(that));
+			unique_base::operator=(std::move(that));
+			return *this;
+		}
+
+		using state_view::get;
+
+		~state() {
+		}
+	};
+} // namespace sol
+
+// end of sol/state.hpp
+
+// beginning of sol/coroutine.hpp
+
+namespace sol {
+	template <typename ref_t>
+	class basic_coroutine : public basic_object<ref_t> {
+	private:
+		using base_t = basic_object<ref_t>;
+
+	public:
+		typedef reference handler_t;
+		handler_t error_handler;
+
+	private:
+		call_status stats = call_status::yielded;
+
+		void luacall(std::ptrdiff_t argcount, std::ptrdiff_t) {
+#if SOL_LUA_VESION_I_ >= 504
+			int nresults;
+			stats = static_cast<call_status>(lua_resume(lua_state(), nullptr, static_cast<int>(argcount), &nresults));
+#else
+			stats = static_cast<call_status>(lua_resume(lua_state(), nullptr, static_cast<int>(argcount)));
+#endif
+		}
+
+		template <std::size_t... I, typename... Ret>
+		auto invoke(types<Ret...>, std::index_sequence<I...>, std::ptrdiff_t n) {
+			luacall(n, sizeof...(Ret));
+			return stack::pop<std::tuple<Ret...>>(lua_state());
+		}
+
+		template <std::size_t I, typename Ret>
+		Ret invoke(types<Ret>, std::index_sequence<I>, std::ptrdiff_t n) {
+			luacall(n, 1);
+			return stack::pop<Ret>(lua_state());
+		}
+
+		template <std::size_t I>
+		void invoke(types<void>, std::index_sequence<I>, std::ptrdiff_t n) {
+			luacall(n, 0);
+		}
+
+		protected_function_result invoke(types<>, std::index_sequence<>, std::ptrdiff_t n) {
+			int firstreturn = 1;
+			luacall(n, LUA_MULTRET);
+			int poststacksize = lua_gettop(this->lua_state());
+			int returncount = poststacksize - (firstreturn - 1);
+			if (error()) {
+				if (error_handler.valid()) {
+					string_view err = stack::get<string_view>(this->lua_state(), poststacksize);
+					error_handler.push();
+					stack::push(this->lua_state(), err);
+					lua_call(lua_state(), 1, 1);
+				}
+				return protected_function_result(this->lua_state(), lua_absindex(this->lua_state(), -1), 1, returncount, status());
+			}
+			return protected_function_result(this->lua_state(), firstreturn, returncount, returncount, status());
+		}
+
+	public:
+		using base_t::lua_state;
+
+		basic_coroutine() = default;
+		template <typename T,
+		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_coroutine>>,
+		          meta::neg<std::is_base_of<proxy_base_tag, meta::unqualified_t<T>>>, meta::neg<std::is_same<base_t, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_coroutine(T&& r) noexcept
+		: base_t(std::forward<T>(r)), error_handler(detail::get_default_handler<reference, is_main_threaded<base_t>::value>(r.lua_state())) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			if (!is_function<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				constructor_handler handler {};
+				stack::check<basic_coroutine>(lua_state(), -1, handler);
+			}
+#endif // Safety
+		}
+		basic_coroutine(const basic_coroutine&) = default;
+		basic_coroutine& operator=(const basic_coroutine&) = default;
+		basic_coroutine(basic_coroutine&&) = default;
+		basic_coroutine& operator=(basic_coroutine&&) = default;
+		basic_coroutine(const basic_function<base_t>& b)
+		: basic_coroutine(b, detail::get_default_handler<reference, is_main_threaded<base_t>::value>(b.lua_state())) {
+		}
+		basic_coroutine(basic_function<base_t>&& b)
+		: basic_coroutine(std::move(b), detail::get_default_handler<reference, is_main_threaded<base_t>::value>(b.lua_state())) {
+		}
+		basic_coroutine(const basic_function<base_t>& b, handler_t eh) : base_t(b), error_handler(std::move(eh)) {
+		}
+		basic_coroutine(basic_function<base_t>&& b, handler_t eh) : base_t(std::move(b)), error_handler(std::move(eh)) {
+		}
+		basic_coroutine(const stack_reference& r)
+		: basic_coroutine(r.lua_state(), r.stack_index(), detail::get_default_handler<reference, is_main_threaded<base_t>::value>(r.lua_state())) {
+		}
+		basic_coroutine(stack_reference&& r)
+		: basic_coroutine(r.lua_state(), r.stack_index(), detail::get_default_handler<reference, is_main_threaded<base_t>::value>(r.lua_state())) {
+		}
+		basic_coroutine(const stack_reference& r, handler_t eh) : basic_coroutine(r.lua_state(), r.stack_index(), std::move(eh)) {
+		}
+		basic_coroutine(stack_reference&& r, handler_t eh) : basic_coroutine(r.lua_state(), r.stack_index(), std::move(eh)) {
+		}
+
+		template <typename Super>
+		basic_coroutine(const proxy_base<Super>& p)
+		: basic_coroutine(p, detail::get_default_handler<reference, is_main_threaded<base_t>::value>(p.lua_state())) {
+		}
+		template <typename Super>
+		basic_coroutine(proxy_base<Super>&& p)
+		: basic_coroutine(std::move(p), detail::get_default_handler<reference, is_main_threaded<base_t>::value>(p.lua_state())) {
+		}
+		template <typename Proxy, typename Handler,
+		     meta::enable<std::is_base_of<proxy_base_tag, meta::unqualified_t<Proxy>>, meta::neg<is_lua_index<meta::unqualified_t<Handler>>>> = meta::enabler>
+		basic_coroutine(Proxy&& p, Handler&& eh) : basic_coroutine(detail::force_cast<base_t>(p), std::forward<Handler>(eh)) {
+		}
+
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_coroutine(lua_State* L, T&& r)
+		: basic_coroutine(L, std::forward<T>(r), detail::get_default_handler<reference, is_main_threaded<base_t>::value>(L)) {
+		}
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_coroutine(lua_State* L, T&& r, handler_t eh) : base_t(L, std::forward<T>(r)), error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_coroutine>(lua_state(), -1, handler);
+#endif // Safety
+		}
+
+		basic_coroutine(lua_nil_t n) : base_t(n), error_handler(n) {
+		}
+
+		basic_coroutine(lua_State* L, int index = -1)
+		: basic_coroutine(L, index, detail::get_default_handler<reference, is_main_threaded<base_t>::value>(L)) {
+		}
+		basic_coroutine(lua_State* L, int index, handler_t eh) : base_t(L, index), error_handler(std::move(eh)) {
+#ifdef SOL_SAFE_REFERENCES
+			constructor_handler handler {};
+			stack::check<basic_coroutine>(L, index, handler);
+#endif // Safety
+		}
+		basic_coroutine(lua_State* L, absolute_index index)
+		: basic_coroutine(L, index, detail::get_default_handler<reference, is_main_threaded<base_t>::value>(L)) {
+		}
+		basic_coroutine(lua_State* L, absolute_index index, handler_t eh) : base_t(L, index), error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			constructor_handler handler {};
+			stack::check<basic_coroutine>(L, index, handler);
+#endif // Safety
+		}
+		basic_coroutine(lua_State* L, raw_index index)
+		: basic_coroutine(L, index, detail::get_default_handler<reference, is_main_threaded<base_t>::value>(L)) {
+		}
+		basic_coroutine(lua_State* L, raw_index index, handler_t eh) : base_t(L, index), error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			constructor_handler handler {};
+			stack::check<basic_coroutine>(L, index, handler);
+#endif // Safety
+		}
+		basic_coroutine(lua_State* L, ref_index index)
+		: basic_coroutine(L, index, detail::get_default_handler<reference, is_main_threaded<base_t>::value>(L)) {
+		}
+		basic_coroutine(lua_State* L, ref_index index, handler_t eh) : base_t(L, index), error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_coroutine>(lua_state(), -1, handler);
+#endif // Safety
+		}
+
+		call_status status() const noexcept {
+			return stats;
+		}
+
+		bool error() const noexcept {
+			call_status cs = status();
+			return cs != call_status::ok && cs != call_status::yielded;
+		}
+
+		bool runnable() const noexcept {
+			return base_t::valid() && (status() == call_status::yielded);
+		}
+
+		explicit operator bool() const noexcept {
+			return runnable();
+		}
+
+		template <typename... Args>
+		protected_function_result operator()(Args&&... args) {
+			return call<>(std::forward<Args>(args)...);
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) operator()(types<Ret...>, Args&&... args) {
+			return call<Ret...>(std::forward<Args>(args)...);
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) call(Args&&... args) {
+			// some users screw up coroutine.create
+			// and try to use it with sol::coroutine without ever calling the first resume in Lua
+			// this makes the stack incompatible with other kinds of stacks: protect against this
+			// make sure coroutines don't screw us over
+			base_t::push();
+			int pushcount = stack::multi_push_reference(lua_state(), std::forward<Args>(args)...);
+			return invoke(types<Ret...>(), std::make_index_sequence<sizeof...(Ret)>(), pushcount);
+		}
+	};
+} // namespace sol
+
+// end of sol/coroutine.hpp
+
+// beginning of sol/userdata.hpp
+
+namespace sol {
+	template <typename base_type>
+	class basic_userdata : public basic_table<base_type> {
+	private:
+		using base_t = basic_table<base_type>;
+
+	public:
+		using base_t::lua_state;
+
+		basic_userdata() noexcept = default;
+		template <typename T, meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_userdata>>, meta::neg<std::is_same<base_t, stack_reference>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_userdata(T&& r) noexcept
+		: base_t(std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			if (!is_userdata<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				type_assert(lua_state(), -1, type::userdata);
+			}
+#endif // Safety
+		}
+		basic_userdata(const basic_userdata&) = default;
+		basic_userdata(basic_userdata&&) = default;
+		basic_userdata& operator=(const basic_userdata&) = default;
+		basic_userdata& operator=(basic_userdata&&) = default;
+		basic_userdata(const stack_reference& r)
+		: basic_userdata(r.lua_state(), r.stack_index()) {
+		}
+		basic_userdata(stack_reference&& r)
+		: basic_userdata(r.lua_state(), r.stack_index()) {
+		}
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_userdata(lua_State* L, T&& r)
+		: base_t(L, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler{};
+			stack::check<basic_userdata>(L, -1, handler);
+#endif // Safety
+		}
+		basic_userdata(lua_State* L, int index = -1)
+		: base_t(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			constructor_handler handler{};
+			stack::check<basic_userdata>(L, index, handler);
+#endif // Safety
+		}
+		basic_userdata(lua_State* L, ref_index index)
+		: base_t(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler{};
+			stack::check<basic_userdata>(L, -1, handler);
+#endif // Safety
+		}
+	};
+
+	template <typename base_type>
+	class basic_lightuserdata : public basic_object_base<base_type> {
+		typedef basic_object_base<base_type> base_t;
+
+	public:
+		using base_t::lua_state;
+
+		basic_lightuserdata() noexcept = default;
+		template <typename T, meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_lightuserdata>>, meta::neg<std::is_same<base_t, stack_reference>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_lightuserdata(T&& r) noexcept
+		: base_t(std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			if (!is_lightuserdata<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				type_assert(lua_state(), -1, type::lightuserdata);
+			}
+#endif // Safety
+		}
+		basic_lightuserdata(const basic_lightuserdata&) = default;
+		basic_lightuserdata(basic_lightuserdata&&) = default;
+		basic_lightuserdata& operator=(const basic_lightuserdata&) = default;
+		basic_lightuserdata& operator=(basic_lightuserdata&&) = default;
+		basic_lightuserdata(const stack_reference& r)
+		: basic_lightuserdata(r.lua_state(), r.stack_index()) {
+		}
+		basic_lightuserdata(stack_reference&& r)
+		: basic_lightuserdata(r.lua_state(), r.stack_index()) {
+		}
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_lightuserdata(lua_State* L, T&& r)
+		: basic_lightuserdata(L, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler{};
+			stack::check<basic_lightuserdata>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		basic_lightuserdata(lua_State* L, int index = -1)
+		: base_t(L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			constructor_handler handler{};
+			stack::check<basic_lightuserdata>(L, index, handler);
+#endif // Safety
+		}
+		basic_lightuserdata(lua_State* L, ref_index index)
+		: base_t(L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler{};
+			stack::check<basic_lightuserdata>(lua_state(), index, handler);
+#endif // Safety
+		}
+	};
+
+} // namespace sol
+
+// end of sol/userdata.hpp
+
+// beginning of sol/as_args.hpp
+
+namespace sol {
+	template <typename T>
+	struct as_args_t {
+		T src;
+	};
+
+	template <typename Source>
+	auto as_args(Source&& source) {
+		return as_args_t<Source> { std::forward<Source>(source) };
+	}
+
+	namespace stack {
+		template <typename T>
+		struct unqualified_pusher<as_args_t<T>> {
+			int push(lua_State* L, const as_args_t<T>& e) {
+				int p = 0;
+				for (const auto& i : e.src) {
+					p += stack::push(L, i);
+				}
+				return p;
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+// end of sol/as_args.hpp
+
+// beginning of sol/variadic_args.hpp
+
+#include <limits>
+#include <iterator>
+
+namespace sol {
+	struct variadic_args {
+	private:
+		lua_State* L;
+		int index;
+		int stacktop;
+
+	public:
+		typedef stack_proxy reference_type;
+		typedef stack_proxy value_type;
+		typedef stack_proxy* pointer;
+		typedef std::ptrdiff_t difference_type;
+		typedef std::size_t size_type;
+		typedef stack_iterator<stack_proxy, false> iterator;
+		typedef stack_iterator<stack_proxy, true> const_iterator;
+		typedef std::reverse_iterator<iterator> reverse_iterator;
+		typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
+
+		variadic_args() = default;
+		variadic_args(lua_State* luastate, int stackindex = -1)
+			: L(luastate), index(lua_absindex(luastate, stackindex)), stacktop(lua_gettop(luastate)) {
+		}
+		variadic_args(lua_State* luastate, int stackindex, int lastindex)
+			: L(luastate), index(lua_absindex(luastate, stackindex)), stacktop(lastindex) {
+		}
+		variadic_args(const variadic_args&) = default;
+		variadic_args& operator=(const variadic_args&) = default;
+		variadic_args(variadic_args&& o)
+			: L(o.L), index(o.index), stacktop(o.stacktop) {
+			// Must be manual, otherwise destructor will screw us
+			// return count being 0 is enough to keep things clean
+			// but will be thorough
+			o.L = nullptr;
+			o.index = 0;
+			o.stacktop = 0;
+		}
+		variadic_args& operator=(variadic_args&& o) {
+			L = o.L;
+			index = o.index;
+			stacktop = o.stacktop;
+			// Must be manual, otherwise destructor will screw us
+			// return count being 0 is enough to keep things clean
+			// but will be thorough
+			o.L = nullptr;
+			o.index = 0;
+			o.stacktop = 0;
+			return *this;
+		}
+
+		iterator begin() {
+			return iterator(L, index, stacktop + 1);
+		}
+		iterator end() {
+			return iterator(L, stacktop + 1, stacktop + 1);
+		}
+		const_iterator begin() const {
+			return const_iterator(L, index, stacktop + 1);
+		}
+		const_iterator end() const {
+			return const_iterator(L, stacktop + 1, stacktop + 1);
+		}
+		const_iterator cbegin() const {
+			return begin();
+		}
+		const_iterator cend() const {
+			return end();
+		}
+
+		reverse_iterator rbegin() {
+			return std::reverse_iterator<iterator>(begin());
+		}
+		reverse_iterator rend() {
+			return std::reverse_iterator<iterator>(end());
+		}
+		const_reverse_iterator rbegin() const {
+			return std::reverse_iterator<const_iterator>(begin());
+		}
+		const_reverse_iterator rend() const {
+			return std::reverse_iterator<const_iterator>(end());
+		}
+		const_reverse_iterator crbegin() const {
+			return std::reverse_iterator<const_iterator>(cbegin());
+		}
+		const_reverse_iterator crend() const {
+			return std::reverse_iterator<const_iterator>(cend());
+		}
+
+		int push() const {
+			return push(L);
+		}
+
+		int push(lua_State* target) const {
+			int pushcount = 0;
+			for (int i = index; i <= stacktop; ++i) {
+				lua_pushvalue(L, i);
+				pushcount += 1;
+			}
+			if (target != L) {
+				lua_xmove(L, target, pushcount);
+			}
+			return pushcount;
+		}
+
+		template <typename T>
+		decltype(auto) get(difference_type index_offset = 0) const {
+			return stack::get<T>(L, index + static_cast<int>(index_offset));
+		}
+
+		type get_type(difference_type index_offset = 0) const noexcept {
+			return type_of(L, index + static_cast<int>(index_offset));
+		}
+
+		stack_proxy operator[](difference_type index_offset) const {
+			return stack_proxy(L, index + static_cast<int>(index_offset));
+		}
+
+		lua_State* lua_state() const {
+			return L;
+		};
+		int stack_index() const {
+			return index;
+		};
+		int leftover_count() const {
+			return stacktop - (index - 1);
+		}
+		std::size_t size() const {
+			return static_cast<std::size_t>(leftover_count());
+		}
+		int top() const {
+			return stacktop;
+		}
+	};
+
+	namespace stack {
+		template <>
+		struct unqualified_getter<variadic_args> {
+			static variadic_args get(lua_State* L, int index, record& tracking) {
+				tracking.last = 0;
+				return variadic_args(L, index);
+			}
+		};
+
+		template <>
+		struct unqualified_pusher<variadic_args> {
+			static int push(lua_State* L, const variadic_args& ref) {
+				return ref.push(L);
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+// end of sol/variadic_args.hpp
+
+// beginning of sol/variadic_results.hpp
+
+// beginning of sol/as_returns.hpp
+
+namespace sol {
+	template <typename T>
+	struct as_returns_t {
+		T src;
+	};
+
+	template <typename Source>
+	auto as_returns(Source&& source) {
+		return as_returns_t<std::decay_t<Source>>{ std::forward<Source>(source) };
+	}
+
+	namespace stack {
+		template <typename T>
+		struct unqualified_pusher<as_returns_t<T>> {
+			int push(lua_State* L, const as_returns_t<T>& e) {
+				auto& src = detail::unwrap(e.src);
+				int p = 0;
+				for (const auto& i : src) {
+					p += stack::push(L, i);
+				}
+				return p;
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+// end of sol/as_returns.hpp
+
+#include <vector>
+
+namespace sol {
+
+	template <typename Al = typename std::allocator<object>>
+	struct basic_variadic_results : public std::vector<object, Al> {
+	private:
+		using base_t = std::vector<object, Al>;
+
+	public:
+		basic_variadic_results() : base_t() {
+		}
+
+		basic_variadic_results(unsafe_function_result fr) : base_t() {
+			this->reserve(fr.return_count());
+			this->insert(this->cend(), fr.begin(), fr.end());
+		}
+
+		basic_variadic_results(protected_function_result fr) : base_t() {
+			this->reserve(fr.return_count());
+			this->insert(this->cend(), fr.begin(), fr.end());
+		}
+
+		template <typename Arg0, typename... Args,
+		     meta::disable_any<std::is_same<meta::unqualified_t<Arg0>, basic_variadic_results>, std::is_same<meta::unqualified_t<Arg0>, function_result>,
+		          std::is_same<meta::unqualified_t<Arg0>, protected_function_result>> = meta::enabler>
+		basic_variadic_results(Arg0&& arg0, Args&&... args) : base_t(std::forward<Arg0>(arg0), std::forward<Args>(args)...) {
+		}
+
+		basic_variadic_results(const basic_variadic_results&) = default;
+		basic_variadic_results(basic_variadic_results&&) = default;
+	};
+
+	struct variadic_results : public basic_variadic_results<> {
+	private:
+		using base_t = basic_variadic_results<>;
+
+	public:
+		using base_t::base_t;
+	};
+
+	template <typename Al>
+	struct is_container<basic_variadic_results<Al>> : std::false_type { };
+
+	template <>
+	struct is_container<variadic_results> : std::false_type { };
+
+	namespace stack {
+		template <typename Al>
+		struct unqualified_pusher<basic_variadic_results<Al>> {
+			int push(lua_State* L, const basic_variadic_results<Al>& e) {
+				int p = 0;
+				for (const auto& i : e) {
+					p += stack::push(L, i);
+				}
+				return p;
+			}
+		};
+
+		template <>
+		struct unqualified_pusher<variadic_results> {
+			int push(lua_State* L, const variadic_results& r) {
+				using base_t = basic_variadic_results<>;
+				return stack::push(L, static_cast<const base_t&>(r));
+			}
+		};
+	} // namespace stack
+
+} // namespace sol
+
+// end of sol/variadic_results.hpp
+
+#if SOL_IS_ON(SOL_COMPILER_GCC_I_)
+#pragma GCC diagnostic pop
+#elif SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+#pragma warning(pop)
+#endif // g++
+
+#if SOL_IS_ON(SOL_INSIDE_UNREAL_ENGINE_I_)
+#undef check
+#pragma pop_macro("check")
+#endif // Unreal Engine 4 Bullshit
+
+#endif // SOL_HPP
+// end of sol/sol.hpp
+
+#endif // SOL_SINGLE_INCLUDE_HPP

From 8ff8ec4abd98ce185c2f3fd1688523b16f847f57 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Mon, 12 Jul 2021 11:01:32 +0200
Subject: [PATCH 1022/2859] Fix coverity issues

---
 apps/openmw/engine.cpp            |  3 ++-
 apps/openmw/mwbase/luamanager.hpp | 16 ++++++++--------
 components/lua/luastate.cpp       |  4 +++-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index f554821b3d..8c210076a4 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -407,6 +407,7 @@ OMW::Engine::Engine(Files::ConfigurationManager& configurationManager)
   , mExportFonts(false)
   , mRandomSeed(0)
   , mScriptContext (nullptr)
+  , mLuaManager (nullptr)
   , mFSStrict (false)
   , mScriptBlacklistUse (true)
   , mNewGame (false)
@@ -899,7 +900,7 @@ private:
     Engine* mEngine;
     std::mutex mMutex;
     std::condition_variable mCV;
-    bool mUpdateRequest;
+    bool mUpdateRequest = false;
     double mDt = 0;
     bool mIsGuiMode = false;
     std::optional<std::thread> mThread;
diff --git a/apps/openmw/mwbase/luamanager.hpp b/apps/openmw/mwbase/luamanager.hpp
index 4e437246c4..7f3c50a9cf 100644
--- a/apps/openmw/mwbase/luamanager.hpp
+++ b/apps/openmw/mwbase/luamanager.hpp
@@ -42,14 +42,14 @@ namespace MWBase
 
         struct ActorControls
         {
-            bool mDisableAI;
-            bool mControlledFromLua;
-
-            bool mJump;
-            bool mRun;
-            float mMovement;
-            float mSideMovement;
-            float mTurn;
+            bool mDisableAI = false;
+            bool mControlledFromLua = false;
+
+            bool mJump = false;
+            bool mRun = false;
+            float mMovement = 0;
+            float mSideMovement = 0;
+            float mTurn = 0;
         };
 
         virtual ActorControls* getActorControls(const MWWorld::Ptr&) const = 0;
diff --git a/components/lua/luastate.cpp b/components/lua/luastate.cpp
index 25fa3aead1..753e3369f6 100644
--- a/components/lua/luastate.cpp
+++ b/components/lua/luastate.cpp
@@ -82,7 +82,9 @@ namespace LuaUtil
     sol::table LuaState::getMutableFromReadOnly(const sol::userdata& ro)
     {
         sol::stack::push(mLua, ro);
-        lua_getmetatable(mLua, -1);
+        int ok = lua_getmetatable(mLua, -1);
+        assert(ok);
+        (void)ok;
         sol::table res = sol::stack::pop<sol::table>(mLua);
         lua_pop(mLua, 1);
         return res;

From f90c4ae22f02e0285181fe95bf223c1813622313 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 12 Jul 2021 18:26:27 +0200
Subject: [PATCH 1023/2859] Add yaml-like separator between cell refs

To be able to separate records visually.
---
 apps/esmtool/esmtool.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp
index 6b6e428e62..ee2223b6a8 100644
--- a/apps/esmtool/esmtool.cpp
+++ b/apps/esmtool/esmtool.cpp
@@ -244,7 +244,7 @@ void loadCell(ESM::Cell &cell, ESM::ESMReader &esm, Arguments& info)
 
         if(quiet) continue;
 
-        std::cout << "    Refnum: " << ref.mRefNum.mIndex << '\n';
+        std::cout << "  - Refnum: " << ref.mRefNum.mIndex << '\n';
         std::cout << "    ID: " << ref.mRefID << '\n';
         std::cout << "    Position: (" << ref.mPos.pos[0] << ", " << ref.mPos.pos[1] << ", " << ref.mPos.pos[2] << ")\n";
         if (ref.mScale != 1.f)

From cfdbd0d471c6bac72f904f86a1bec486ca2a3822 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 12 Jul 2021 17:30:39 +0200
Subject: [PATCH 1024/2859] Indicate moved cell refs explicitly

This is less error prone approach than use of MovedCellRef fields.

Also make separate functions for skipping and reading moved cell refs to avoid
passing special flags  logic and null pointers for unused arguments.
---
 apps/opencs/model/world/refcollection.cpp |  7 ++--
 apps/openmw/mwrender/objectpaging.cpp     | 10 +++---
 apps/openmw/mwworld/cellstore.cpp         | 21 ++++--------
 apps/openmw/mwworld/store.cpp             |  8 ++---
 components/esm/loadcell.cpp               | 40 +++++++++++++++--------
 components/esm/loadcell.hpp               |  9 ++---
 6 files changed, 48 insertions(+), 47 deletions(-)

diff --git a/apps/opencs/model/world/refcollection.cpp b/apps/opencs/model/world/refcollection.cpp
index dfdb8e73bf..003a300c06 100644
--- a/apps/opencs/model/world/refcollection.cpp
+++ b/apps/opencs/model/world/refcollection.cpp
@@ -19,8 +19,9 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
     ESM::MovedCellRef mref;
     mref.mRefNum.mIndex = 0;
     bool isDeleted = false;
+    bool isMoved = false;
 
-    while (ESM::Cell::getNextRef(reader, ref, isDeleted, true, &mref))
+    while (ESM::Cell::getNextRef(reader, ref, isDeleted, mref, isMoved))
     {
         // Keep mOriginalCell empty when in modified (as an indicator that the
         // original cell will always be equal the current cell).
@@ -34,7 +35,7 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
             ref.mCell = "#" + std::to_string(index.first) + " " + std::to_string(index.second);
 
             // Handle non-base moved references
-            if (!base && mref.mRefNum.mIndex != 0)
+            if (!base && !isMoved)
             {
                 // Moved references must have a link back to their original cell
                 // See discussion: https://forum.openmw.org/viewtopic.php?f=6&t=577&start=30
@@ -59,8 +60,6 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
         else
             ref.mCell = cell2.mId;
 
-        mref.mRefNum.mIndex = 0;
-
         // ignore content file number
         std::map<ESM::RefNum, std::string>::iterator iter = cache.begin();
         unsigned int thisIndex = ref.mRefNum.mIndex & 0x00ffffff;
diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index d91f4efaaa..2cbffbc6eb 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -427,13 +427,11 @@ namespace MWRender
                         ESM::MovedCellRef cMRef;
                         cMRef.mRefNum.mIndex = 0;
                         bool deleted = false;
-                        while(cell->getNextRef(esm[index], ref, deleted, /*ignoreMoves*/true, &cMRef))
+                        bool moved = false;
+                        while(cell->getNextRef(esm[index], ref, deleted, cMRef, moved))
                         {
-                            if (cMRef.mRefNum.mIndex)
-                            {
-                                cMRef.mRefNum.mIndex = 0;
-                                continue; // ignore refs that are moved
-                            }
+                            if (moved)
+                                continue;
 
                             if (std::find(cell->mMovedRefs.begin(), cell->mMovedRefs.end(), ref.mRefNum) != cell->mMovedRefs.end()) continue;
                             Misc::StringUtils::lowerCaseInPlace(ref.mRefID);
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 53245be247..2b73a3362b 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -553,17 +553,12 @@ namespace MWWorld
                 ESM::MovedCellRef cMRef;
                 cMRef.mRefNum.mIndex = 0;
                 bool deleted = false;
-                while(mCell->getNextRef(esm[index], ref, deleted, /*ignoreMoves*/true, &cMRef))
+                bool moved = false;
+                while(mCell->getNextRef(esm[index], ref, deleted, cMRef, moved))
                 {
-                    if (deleted)
+                    if (deleted || moved)
                         continue;
 
-                    if (cMRef.mRefNum.mIndex)
-                    {
-                        cMRef.mRefNum.mIndex = 0;
-                        continue; // ignore refs that are moved
-                    }
-
                     // Don't list reference if it was moved to a different cell.
                     ESM::MovedCellRefTracker::const_iterator iter =
                         std::find(mCell->mMovedRefs.begin(), mCell->mMovedRefs.end(), ref.mRefNum);
@@ -618,13 +613,11 @@ namespace MWWorld
                 ESM::MovedCellRef cMRef;
                 cMRef.mRefNum.mIndex = 0;
                 bool deleted = false;
-                while(mCell->getNextRef(esm[index], ref, deleted, /*ignoreMoves*/true, &cMRef))
+                bool moved = false;
+                while(mCell->getNextRef(esm[index], ref, deleted, cMRef, moved))
                 {
-                    if (cMRef.mRefNum.mIndex)
-                    {
-                        cMRef.mRefNum.mIndex = 0;
-                        continue; // ignore refs that are moved
-                    }
+                    if (moved)
+                        continue;
 
                     // Don't load reference if it was moved to a different cell.
                     ESM::MovedCellRefTracker::const_iterator iter =
diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index 2ed051a141..1614e07461 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -502,8 +502,8 @@ namespace MWWorld
     {
         ESM::CellRef ref;
         ESM::MovedCellRef cMRef;
-        cMRef.mRefNum.mIndex = 0;
         bool deleted = false;
+        bool moved = false;
 
         ESM::ESM_Context ctx = esm.getContext();
 
@@ -512,10 +512,10 @@ namespace MWWorld
         //
         // Get regular moved reference data. Adapted from CellStore::loadRefs. Maybe we can optimize the following
         //  implementation when the oher implementation works as well.
-        while (cell->getNextRef(esm, ref, deleted, /*ignoreMoves*/true, &cMRef))
+        while (cell->getNextRef(esm, ref, deleted, cMRef, moved))
         {
-            if (!cMRef.mRefNum.mIndex)
-                continue; // ignore refs that are not moved
+            if (!moved)
+                continue;
 
             ESM::Cell *cellAlt = const_cast<ESM::Cell*>(searchOrCreate(cMRef.mTarget[0], cMRef.mTarget[1]));
 
diff --git a/components/esm/loadcell.cpp b/components/esm/loadcell.cpp
index d43911135a..e90af7b2f6 100644
--- a/components/esm/loadcell.cpp
+++ b/components/esm/loadcell.cpp
@@ -224,7 +224,7 @@ namespace ESM
         return region + ' ' + cellGrid;
     }
 
-    bool Cell::getNextRef(ESMReader &esm, CellRef &ref, bool &isDeleted, bool ignoreMoves, MovedCellRef *mref)
+    bool Cell::getNextRef(ESMReader& esm, CellRef& ref, bool& isDeleted)
     {
         isDeleted = false;
 
@@ -236,18 +236,9 @@ namespace ESM
         // more plugins, and how they treat these moved references.
         if (esm.isNextSub("MVRF"))
         {
-            if (ignoreMoves)
-            {
-                esm.getHT (mref->mRefNum.mIndex);
-                esm.getHNOT (mref->mTarget, "CNDT");
-                adjustRefNum (mref->mRefNum, esm);
-            }
-            else
-            {
-                // skip rest of cell record (moved references), they are handled elsewhere
-                esm.skipRecord(); // skip MVRF, CNDT
-                return false;
-            }
+            // skip rest of cell record (moved references), they are handled elsewhere
+            esm.skipRecord(); // skip MVRF, CNDT
+            return false;
         }
 
         if (esm.peekNextSub("FRMR"))
@@ -263,6 +254,29 @@ namespace ESM
         return false;
     }
 
+    bool Cell::getNextRef(ESMReader& esm, CellRef& cellRef, bool& deleted, MovedCellRef& movedCellRef, bool& moved)
+    {
+        deleted = false;
+        moved = false;
+
+        if (!esm.hasMoreSubs())
+            return false;
+
+        if (esm.isNextSub("MVRF"))
+        {
+            moved = true;
+            getNextMVRF(esm, movedCellRef);
+        }
+
+        if (!esm.peekNextSub("FRMR"))
+            return false;
+
+        cellRef.load(esm, deleted);
+        adjustRefNum(cellRef.mRefNum, esm);
+
+        return true;
+    }
+
     bool Cell::getNextMVRF(ESMReader &esm, MovedCellRef &mref)
     {
         esm.getHT(mref.mRefNum.mIndex);
diff --git a/components/esm/loadcell.hpp b/components/esm/loadcell.hpp
index c49dc20c59..3a8133d881 100644
--- a/components/esm/loadcell.hpp
+++ b/components/esm/loadcell.hpp
@@ -181,12 +181,9 @@ struct Cell
      All fields of the CellRef struct are overwritten. You can safely
      reuse one memory location without blanking it between calls.
   */
-  /// \param ignoreMoves ignore MVRF record and read reference like a regular CellRef.
-  static bool getNextRef(ESMReader &esm, 
-                         CellRef &ref, 
-                         bool &isDeleted,
-                         bool ignoreMoves = false, 
-                         MovedCellRef *mref = nullptr);
+    static bool getNextRef(ESMReader& esm, CellRef& ref, bool& deleted);
+
+    static bool getNextRef(ESMReader& esm, CellRef& cellRef, bool& deleted, MovedCellRef& movedCellRef, bool& moved);
 
   /* This fetches an MVRF record, which is used to track moved references.
    * Since they are comparably rare, we use a separate method for this.

From aec4e02417cef6106b78ffa5978c6279c32abdd0 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 12 Jul 2021 18:20:51 +0200
Subject: [PATCH 1025/2859] Ignore only CellRefs with preceding MVRF subrecord

MVRF subrecord means that only single following FRMR subrecord is moved not the
rest of subrecords.
---
 components/esm/loadcell.cpp | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/components/esm/loadcell.cpp b/components/esm/loadcell.cpp
index e90af7b2f6..562e8f643a 100644
--- a/components/esm/loadcell.cpp
+++ b/components/esm/loadcell.cpp
@@ -232,13 +232,18 @@ namespace ESM
         if (!esm.hasMoreSubs())
             return false;
 
-        // NOTE: We should not need this check. It is a safety check until we have checked
-        // more plugins, and how they treat these moved references.
-        if (esm.isNextSub("MVRF"))
+        // MVRF are FRMR are present in pairs. MVRF indicates that following FRMR describes moved CellRef.
+        // This function has to skip all moved CellRefs therefore read all such pairs to ignored values.
+        while (esm.isNextSub("MVRF"))
         {
-            // skip rest of cell record (moved references), they are handled elsewhere
-            esm.skipRecord(); // skip MVRF, CNDT
-            return false;
+            MovedCellRef movedCellRef;
+            esm.getHT(movedCellRef.mRefNum.mIndex);
+            esm.getHNOT(movedCellRef.mTarget, "CNDT");
+            CellRef skippedCellRef;
+            if (!esm.peekNextSub("FRMR"))
+                return false;
+            bool skippedDeleted;
+            skippedCellRef.load(esm, skippedDeleted);
         }
 
         if (esm.peekNextSub("FRMR"))

From 5c9af1742a65fc70565725ffb7d18fbb21ea6d02 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 12 Jul 2021 18:24:51 +0200
Subject: [PATCH 1026/2859] Dump moved cell refs in esmtool

---
 apps/esmtool/esmtool.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp
index ee2223b6a8..dc893061a7 100644
--- a/apps/esmtool/esmtool.cpp
+++ b/apps/esmtool/esmtool.cpp
@@ -236,7 +236,9 @@ void loadCell(ESM::Cell &cell, ESM::ESMReader &esm, Arguments& info)
     if(!quiet) std::cout << "  References:\n";
 
     bool deleted = false;
-    while(cell.getNextRef(esm, ref, deleted))
+    ESM::MovedCellRef movedCellRef;
+    bool moved = false;
+    while(cell.getNextRef(esm, ref, deleted, movedCellRef, moved))
     {
         if (save) {
             info.data.mCellRefs[&cell].push_back(std::make_pair(ref, deleted));
@@ -276,6 +278,13 @@ void loadCell(ESM::Cell &cell, ESM::ESMReader &esm, Arguments& info)
             if (!ref.mDestCell.empty())
                 std::cout << "    Destination cell: " << ref.mDestCell << '\n';
         }
+        std::cout << "    Moved: " << std::boolalpha << moved << '\n';
+        if (moved)
+        {
+            std::cout << "    Moved refnum: " << movedCellRef.mRefNum.mIndex << '\n';
+            std::cout << "    Moved content file: " << movedCellRef.mRefNum.mContentFile << '\n';
+            std::cout << "    Target: " << movedCellRef.mTarget[0] << ", " << movedCellRef.mTarget[1] << '\n';
+        }
     }
 }
 

From 86c50ece92c7acf05f0df6b3b7c8da715ea6bd0e Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 12 Jul 2021 20:51:13 +0200
Subject: [PATCH 1027/2859] Improve save cleaning

---
 apps/openmw/mwworld/cellstore.cpp |  7 +++++-
 apps/openmw/mwworld/esmstore.cpp  | 41 +++++++++++++++++++++++++++++++
 apps/openmw/mwworld/esmstore.hpp  |  3 +++
 3 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 53245be247..b2345a96ea 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -844,7 +844,12 @@ namespace MWWorld
             if (type == 0)
             {
                 Log(Debug::Warning) << "Dropping reference to '" << cref.mRefID << "' (object no longer exists)";
-                reader.skipHSubUntil("OBJE");
+                // Skip until the next OBJE or MVRF
+                while(reader.hasMoreSubs() && !reader.peekNextSub("OBJE") && !reader.peekNextSub("MVRF"))
+                {
+                    reader.getSubName();
+                    reader.skipHSub();
+                }
                 continue;
             }
 
diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index 4b9bdf7426..3bfa01a3da 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -109,6 +109,21 @@ namespace
 
         return npcsToReplace;
     }
+
+    // Custom enchanted items can reference scripts that no longer exist, this doesn't necessarily mean the base item no longer exists however.
+    // So instead of removing the item altogether, we're only removing the script.
+    template<class T>
+    void removeMissingScripts(const MWWorld::Store<ESM::Script>& scripts, std::map<std::string, T>& items)
+    {
+        for(auto& [id, item] : items)
+        {
+            if(!item.mScript.empty() && !scripts.search(item.mScript))
+            {
+                item.mScript.clear();
+                Log(Debug::Verbose) << "Item '" << id << "' (" << item.mName << ") has nonexistent script '" << item.mScript << "', ignoring it.";
+            }
+        }
+    }
 }
 
 namespace MWWorld
@@ -366,6 +381,32 @@ void ESMStore::validateDynamic()
 
     for (const ESM::NPC &npc : npcsToReplace)
         mNpcs.insert(npc);
+
+    removeMissingScripts(mScripts, mArmors.mDynamic);
+    removeMissingScripts(mScripts, mBooks.mDynamic);
+    removeMissingScripts(mScripts, mClothes.mDynamic);
+    removeMissingScripts(mScripts, mWeapons.mDynamic);
+
+    removeMissingObjects(mCreatureLists);
+    removeMissingObjects(mItemLists);
+}
+
+// Leveled lists can be modified by scripts. This removes items that no longer exist (presumably because the plugin was removed) from modified lists
+template<class T>
+void ESMStore::removeMissingObjects(Store<T>& store)
+{
+    for(auto& [id, list] : store.mDynamic)
+    {
+        std::remove_if(list.mList.begin(), list.mList.end(), [&] (const auto& item)
+        {
+            if(!find(item.mId))
+            {
+                Log(Debug::Verbose) << "Leveled list '" << id << "' has nonexistent object '" << item.mId << "', ignoring it.";
+                return true;
+            }
+            return false;
+        });
+    }
 }
 
     int ESMStore::countSavedGameRecords() const
diff --git a/apps/openmw/mwworld/esmstore.hpp b/apps/openmw/mwworld/esmstore.hpp
index 608b5489ea..6ad479f8bf 100644
--- a/apps/openmw/mwworld/esmstore.hpp
+++ b/apps/openmw/mwworld/esmstore.hpp
@@ -89,6 +89,9 @@ namespace MWWorld
         void validate();
 
         void countRecords();
+
+        template<class T>
+        void removeMissingObjects(Store<T>& store);
     public:
         /// \todo replace with SharedIterator<StoreBase>
         typedef std::map<int, StoreBase *>::const_iterator iterator;

From 1e1ebb049e71579f2250f39e380df8d1c3457f29 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Tue, 13 Jul 2021 21:18:24 +0200
Subject: [PATCH 1028/2859] Workaround clang and actually erase from the vector

---
 apps/openmw/mwworld/esmstore.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index 3bfa01a3da..ecb2cad021 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -395,17 +395,18 @@ void ESMStore::validateDynamic()
 template<class T>
 void ESMStore::removeMissingObjects(Store<T>& store)
 {
-    for(auto& [id, list] : store.mDynamic)
+    for(auto& entry : store.mDynamic)
     {
-        std::remove_if(list.mList.begin(), list.mList.end(), [&] (const auto& item)
+        auto first = std::remove_if(entry.second.mList.begin(), entry.second.mList.end(), [&] (const auto& item)
         {
             if(!find(item.mId))
             {
-                Log(Debug::Verbose) << "Leveled list '" << id << "' has nonexistent object '" << item.mId << "', ignoring it.";
+                Log(Debug::Verbose) << "Leveled list '" << entry.first << "' has nonexistent object '" << item.mId << "', ignoring it.";
                 return true;
             }
             return false;
         });
+        entry.second.mList.erase(first, entry.second.mList.end());
     }
 }
 

From 6128fcfc8291d202d92c9a9a95baa3398ad09054 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 13 Jul 2021 23:17:08 +0200
Subject: [PATCH 1029/2859] Use empty off mesh connections in benchmark

To get proper comparison with the next change removing it from the cache key.
---
 .../benchmarks/detournavigator/navmeshtilescache.cpp | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/apps/benchmarks/detournavigator/navmeshtilescache.cpp b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
index d39161fda2..dc3b31ce41 100644
--- a/apps/benchmarks/detournavigator/navmeshtilescache.cpp
+++ b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
@@ -88,17 +88,6 @@ namespace
         });
     }
 
-    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)
     {
@@ -117,7 +106,6 @@ namespace
         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)};
     }
 

From beeb882ea88938c3ae98784b841e9935636147d7 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 14 Jul 2021 00:03:10 +0200
Subject: [PATCH 1030/2859] Do not use off mesh connections as a part of
 navmesh cache key

To reduce cache size and make it more flexible.

Adding off mesh connections to the navmesh is the last step of navmesh
generation and it's very fast comparing to other steps (microseconds vs
milliseconds). Having less cache size makes get and set operations almost 2x
times faster that also have an order of microseconds. So in total there is
no performance impact.
---
 .../detournavigator/navmeshtilescache.cpp     |  14 +-
 .../detournavigator/navmeshtilescache.cpp     | 366 +++++++++++-------
 components/CMakeLists.txt                     |   2 +
 components/detournavigator/makenavmesh.cpp    | 133 +++----
 components/detournavigator/makenavmesh.hpp    |  11 +
 .../detournavigator/navmeshcacheitem.cpp      |  82 ++++
 .../detournavigator/navmeshcacheitem.hpp      | 102 +----
 components/detournavigator/navmeshdata.hpp    |   1 -
 .../detournavigator/navmeshtilescache.cpp     |  37 +-
 .../detournavigator/navmeshtilescache.hpp     |  94 +----
 .../detournavigator/navmeshtileview.cpp       |  45 +--
 .../detournavigator/offmeshconnection.hpp     |   1 +
 .../detournavigator/preparednavmeshdata.cpp   |  52 +++
 .../detournavigator/preparednavmeshdata.hpp   |  48 +++
 .../preparednavmeshdatatuple.hpp              |  51 +++
 components/detournavigator/recastmesh.hpp     |   9 +
 components/detournavigator/ref.hpp            |  55 +++
 17 files changed, 627 insertions(+), 476 deletions(-)
 create mode 100644 components/detournavigator/navmeshcacheitem.cpp
 create mode 100644 components/detournavigator/preparednavmeshdata.cpp
 create mode 100644 components/detournavigator/preparednavmeshdata.hpp
 create mode 100644 components/detournavigator/preparednavmeshdatatuple.hpp
 create mode 100644 components/detournavigator/ref.hpp

diff --git a/apps/benchmarks/detournavigator/navmeshtilescache.cpp b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
index dc3b31ce41..487562f404 100644
--- a/apps/benchmarks/detournavigator/navmeshtilescache.cpp
+++ b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
@@ -15,13 +15,12 @@ namespace
         osg::Vec3f mAgentHalfExtents;
         TilePosition mTilePosition;
         RecastMesh mRecastMesh;
-        std::vector<OffMeshConnection> mOffMeshConnections;
     };
 
     struct Item
     {
         Key mKey;
-        NavMeshData mValue;
+        PreparedNavMeshData mValue;
     };
 
     template <typename Random>
@@ -105,8 +104,7 @@ namespace
         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;
-        return Key {agentHalfExtents, tilePosition, std::move(recastMesh), std::move(offMeshConnections)};
+        return Key {agentHalfExtents, tilePosition, std::move(recastMesh)};
     }
 
     constexpr std::size_t trianglesPerTile = 310;
@@ -125,7 +123,8 @@ namespace
         while (true)
         {
             Key key = generateKey(trianglesPerTile, random);
-            cache.set(key.mAgentHalfExtents, key.mTilePosition, key.mRecastMesh, key.mOffMeshConnections, NavMeshData());
+            cache.set(key.mAgentHalfExtents, key.mTilePosition, key.mRecastMesh,
+                      std::make_unique<PreparedNavMeshData>());
             *out++ = std::move(key);
             const std::size_t newSize = cache.getStats().mNavMeshCacheSize;
             if (size >= newSize)
@@ -147,7 +146,7 @@ namespace
         while (state.KeepRunning())
         {
             const auto& key = keys[n++ % keys.size()];
-            const auto result = cache.get(key.mAgentHalfExtents, key.mTilePosition, key.mRecastMesh, key.mOffMeshConnections);
+            const auto result = cache.get(key.mAgentHalfExtents, key.mTilePosition, key.mRecastMesh);
             benchmark::DoNotOptimize(result);
         }
     }
@@ -175,7 +174,8 @@ namespace
         while (state.KeepRunning())
         {
             const auto& key = keys[n++ % keys.size()];
-            const auto result = cache.set(key.mAgentHalfExtents, key.mTilePosition, key.mRecastMesh, key.mOffMeshConnections, NavMeshData());
+            const auto result = cache.set(key.mAgentHalfExtents, key.mTilePosition, key.mRecastMesh,
+                                          std::make_unique<PreparedNavMeshData>());
             benchmark::DoNotOptimize(result);
         }
     }
diff --git a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
index 447a5b44e4..17c1b955cf 100644
--- a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
+++ b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
@@ -3,24 +3,131 @@
 #include <components/detournavigator/navmeshtilescache.hpp>
 #include <components/detournavigator/exceptions.hpp>
 #include <components/detournavigator/recastmesh.hpp>
+#include <components/detournavigator/preparednavmeshdata.hpp>
+#include <components/detournavigator/ref.hpp>
+#include <components/detournavigator/preparednavmeshdatatuple.hpp>
+
+#include <RecastAlloc.h>
 
 #include <LinearMath/btTransform.h>
 
 #include <gtest/gtest.h>
 
-namespace DetourNavigator
-{
-    static inline bool operator ==(const NavMeshDataRef& lhs, const NavMeshDataRef& rhs)
-    {
-        return std::make_pair(lhs.mValue, lhs.mSize) == std::make_pair(rhs.mValue, rhs.mSize);
-    }
-}
+#include <random>
+#include <stdexcept>
 
 namespace
 {
     using namespace testing;
     using namespace DetourNavigator;
 
+    void* permRecastAlloc(int size)
+    {
+        void* result = rcAlloc(static_cast<std::size_t>(size), RC_ALLOC_PERM);
+        if (result == nullptr)
+            throw std::bad_alloc();
+        return result;
+    }
+
+    template <class T>
+    void generate(T*& values, int size)
+    {
+        values = static_cast<T*>(permRecastAlloc(size * sizeof(T)));
+        std::generate_n(values, static_cast<std::size_t>(size), [] { return static_cast<T>(std::rand()); });
+    }
+
+    void generate(rcPolyMesh& value, int size)
+    {
+        value.nverts = size;
+        value.maxpolys = size;
+        value.nvp = size;
+        value.npolys = size;
+        rcVcopy(value.bmin, osg::Vec3f(-1, -2, -3).ptr());
+        rcVcopy(value.bmax, osg::Vec3f(3, 2, 1).ptr());
+        value.cs = 1.0f / (std::rand() % 999 + 1);
+        value.ch = 1.0f / (std::rand() % 999 + 1);
+        value.borderSize = std::rand();
+        value.maxEdgeError = 1.0f / (std::rand() % 999 + 1);
+        generate(value.verts, 3 * value.nverts);
+        generate(value.polys, value.maxpolys * 2 * value.nvp);
+        generate(value.regs, value.maxpolys);
+        generate(value.flags, value.maxpolys);
+        generate(value.areas, value.maxpolys);
+    }
+
+    void generate(rcPolyMeshDetail& value, int size)
+    {
+        value.nmeshes = size;
+        value.nverts = size;
+        value.ntris = size;
+        generate(value.meshes, 4 * value.nmeshes);
+        generate(value.verts, 3 * value.nverts);
+        generate(value.tris, 4 * value.ntris);
+    }
+
+    void generate(PreparedNavMeshData& value, int size)
+    {
+        value.mUserId = std::rand();
+        value.mCellHeight = 1.0f / (std::rand() % 999 + 1);
+        value.mCellSize = 1.0f / (std::rand() % 999 + 1);
+        generate(value.mPolyMesh, size);
+        generate(value.mPolyMeshDetail, size);
+    }
+
+    std::unique_ptr<PreparedNavMeshData> makePeparedNavMeshData(int size)
+    {
+        auto result = std::make_unique<PreparedNavMeshData>();
+        generate(*result, size);
+        return result;
+    }
+
+    template <class T>
+    void clone(const T* src, T*& dst, int size)
+    {
+        dst = static_cast<T*>(permRecastAlloc(size * sizeof(T)));
+        std::memcpy(dst, src, static_cast<std::size_t>(size) * sizeof(T));
+    }
+
+    void clone(const rcPolyMesh& src, rcPolyMesh& dst)
+    {
+        dst.nverts = src.nverts;
+        dst.npolys = src.npolys;
+        dst.maxpolys = src.maxpolys;
+        dst.nvp = src.nvp;
+        rcVcopy(dst.bmin, src.bmin);
+        rcVcopy(dst.bmax, src.bmax);
+        dst.cs = src.cs;
+        dst.ch = src.ch;
+        dst.borderSize = src.borderSize;
+        dst.maxEdgeError = src.maxEdgeError;
+        clone(src.verts, dst.verts, 3 * dst.nverts);
+        clone(src.polys, dst.polys, dst.maxpolys * 2 * dst.nvp);
+        clone(src.regs, dst.regs, dst.maxpolys);
+        clone(src.flags, dst.flags, dst.maxpolys);
+        clone(src.areas, dst.areas, dst.maxpolys);
+    }
+
+    void clone(const rcPolyMeshDetail& src, rcPolyMeshDetail& dst)
+    {
+        dst.nmeshes = src.nmeshes;
+        dst.nverts = src.nverts;
+        dst.ntris = src.ntris;
+        clone(src.meshes, dst.meshes, 4 * dst.nmeshes);
+        clone(src.verts, dst.verts, 3 * dst.nverts);
+        clone(src.tris, dst.tris, 4 * dst.ntris);
+    }
+
+    std::unique_ptr<PreparedNavMeshData> clone(const PreparedNavMeshData& value)
+    {
+        auto result = std::make_unique<PreparedNavMeshData>();
+        result->mUserId = value.mUserId;
+        result->mCellHeight = value.mCellHeight;
+        result->mCellSize = value.mCellSize;
+        clone(value.mPolyMesh, result->mPolyMesh);
+        clone(value.mPolyMeshDetail, result->mPolyMeshDetail);
+        return result;
+    }
+
     struct DetourNavigatorNavMeshTilesCacheTest : Test
     {
         const osg::Vec3f mAgentHalfExtents {1, 2, 3};
@@ -32,17 +139,11 @@ namespace
         const std::vector<AreaType> mAreaTypes {1, AreaType_ground};
         const std::vector<RecastMesh::Water> mWater {};
         const RecastMesh mRecastMesh {mGeneration, mRevision, mIndices, mVertices, mAreaTypes, mWater};
-        const std::vector<OffMeshConnection> mOffMeshConnections {};
-        unsigned char* const mData = reinterpret_cast<unsigned char*>(dtAlloc(1, DT_ALLOC_PERM));
-        NavMeshData mNavMeshData {mData, 1};
-
-        const size_t cRecastMeshKeySize = mRecastMesh.getIndices().size() * sizeof(int)
-            + mRecastMesh.getVertices().size() * sizeof(float)
-            + mRecastMesh.getAreaTypes().size() * sizeof(AreaType)
-            + mRecastMesh.getWater().size() * sizeof(RecastMesh::Water)
-            + mOffMeshConnections.size() * sizeof(OffMeshConnection);
+        std::unique_ptr<PreparedNavMeshData> mPreparedNavMeshData {makePeparedNavMeshData(3)};
 
-        const size_t cRecastMeshWithWaterKeySize = cRecastMeshKeySize + sizeof(RecastMesh::Water);
+        const std::size_t mRecastMeshSize = sizeof(mRecastMesh) + getSize(mRecastMesh);
+        const std::size_t mRecastMeshWithWaterSize = mRecastMeshSize + sizeof(RecastMesh::Water);
+        const std::size_t mPreparedNavMeshDataSize = sizeof(*mPreparedNavMeshData) + getSize(*mPreparedNavMeshData);
     };
 
     TEST_F(DetourNavigatorNavMeshTilesCacheTest, get_for_empty_cache_should_return_empty_value)
@@ -50,7 +151,7 @@ namespace
         const std::size_t maxSize = 0;
         NavMeshTilesCache cache(maxSize);
 
-        EXPECT_FALSE(cache.get(mAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections));
+        EXPECT_FALSE(cache.get(mAgentHalfExtents, mTilePosition, mRecastMesh));
     }
 
     TEST_F(DetourNavigatorNavMeshTilesCacheTest, set_for_not_enought_cache_size_should_return_empty_value)
@@ -58,51 +159,46 @@ namespace
         const std::size_t maxSize = 0;
         NavMeshTilesCache cache(maxSize);
 
-        EXPECT_FALSE(cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections,
-                               std::move(mNavMeshData)));
-        EXPECT_NE(mNavMeshData.mValue, nullptr);
+        EXPECT_FALSE(cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData)));
+        EXPECT_NE(mPreparedNavMeshData, nullptr);
     }
 
     TEST_F(DetourNavigatorNavMeshTilesCacheTest, set_should_return_cached_value)
     {
-        const std::size_t navMeshDataSize = 1;
-        const std::size_t navMeshKeySize = cRecastMeshKeySize;
-        const std::size_t maxSize = navMeshDataSize + navMeshKeySize;
+        const std::size_t maxSize = mRecastMeshSize + mPreparedNavMeshDataSize;
         NavMeshTilesCache cache(maxSize);
+        const auto copy = clone(*mPreparedNavMeshData);
+        ASSERT_EQ(*mPreparedNavMeshData, *copy);
 
-        const auto result = cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections,
-                                      std::move(mNavMeshData));
+        const auto result = cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
         ASSERT_TRUE(result);
-        EXPECT_EQ(result.get(), (NavMeshDataRef {mData, 1}));
+        EXPECT_EQ(result.get(), *copy);
     }
 
     TEST_F(DetourNavigatorNavMeshTilesCacheTest, set_existing_element_should_return_cached_element)
     {
-        const std::size_t navMeshDataSize = 1;
-        const std::size_t navMeshKeySize = cRecastMeshKeySize;
-        const std::size_t maxSize = 2 * (navMeshDataSize + navMeshKeySize);
+        const std::size_t maxSize = 2 * (mRecastMeshSize + mPreparedNavMeshDataSize);
         NavMeshTilesCache cache(maxSize);
-        const auto anotherData = reinterpret_cast<unsigned char*>(dtAlloc(1, DT_ALLOC_PERM));
-        NavMeshData anotherNavMeshData {anotherData, 1};
+        auto copy = clone(*mPreparedNavMeshData);
+        const auto sameCopy = clone(*mPreparedNavMeshData);
 
-        cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections, std::move(mNavMeshData));
-        EXPECT_EQ(mNavMeshData.mValue, nullptr);
-        const auto result = cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections, std::move(anotherNavMeshData));
+        cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
+        EXPECT_EQ(mPreparedNavMeshData, nullptr);
+        const auto result = cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(copy));
         ASSERT_TRUE(result);
-        EXPECT_EQ(result.get(), (NavMeshDataRef {mData, 1}));
+        EXPECT_EQ(result.get(), *sameCopy);
     }
 
     TEST_F(DetourNavigatorNavMeshTilesCacheTest, get_should_return_cached_value)
     {
-        const std::size_t navMeshDataSize = 1;
-        const std::size_t navMeshKeySize = cRecastMeshKeySize;
-        const std::size_t maxSize = navMeshDataSize + navMeshKeySize;
+        const std::size_t maxSize = mRecastMeshSize + mPreparedNavMeshDataSize;
         NavMeshTilesCache cache(maxSize);
+        const auto copy = clone(*mPreparedNavMeshData);
 
-        cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections, std::move(mNavMeshData));
-        const auto result = cache.get(mAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections);
+        cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
+        const auto result = cache.get(mAgentHalfExtents, mTilePosition, mRecastMesh);
         ASSERT_TRUE(result);
-        EXPECT_EQ(result.get(), (NavMeshDataRef {mData, 1}));
+        EXPECT_EQ(result.get(), *copy);
     }
 
     TEST_F(DetourNavigatorNavMeshTilesCacheTest, get_for_cache_miss_by_agent_half_extents_should_return_empty_value)
@@ -111,8 +207,8 @@ namespace
         NavMeshTilesCache cache(maxSize);
         const osg::Vec3f unexsistentAgentHalfExtents {1, 1, 1};
 
-        cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections, std::move(mNavMeshData));
-        EXPECT_FALSE(cache.get(unexsistentAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections));
+        cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
+        EXPECT_FALSE(cache.get(unexsistentAgentHalfExtents, mTilePosition, mRecastMesh));
     }
 
     TEST_F(DetourNavigatorNavMeshTilesCacheTest, get_for_cache_miss_by_tile_position_should_return_empty_value)
@@ -121,8 +217,8 @@ namespace
         NavMeshTilesCache cache(maxSize);
         const TilePosition unexistentTilePosition {1, 1};
 
-        cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections, std::move(mNavMeshData));
-        EXPECT_FALSE(cache.get(mAgentHalfExtents, unexistentTilePosition, mRecastMesh, mOffMeshConnections));
+        cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
+        EXPECT_FALSE(cache.get(mAgentHalfExtents, unexistentTilePosition, mRecastMesh));
     }
 
     TEST_F(DetourNavigatorNavMeshTilesCacheTest, get_for_cache_miss_by_recast_mesh_should_return_empty_value)
@@ -132,217 +228,189 @@ namespace
         const std::vector<RecastMesh::Water> water {1, RecastMesh::Water {1, btTransform::getIdentity()}};
         const RecastMesh unexistentRecastMesh {mGeneration, mRevision, mIndices, mVertices, mAreaTypes, water};
 
-        cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections, std::move(mNavMeshData));
-        EXPECT_FALSE(cache.get(mAgentHalfExtents, mTilePosition, unexistentRecastMesh, mOffMeshConnections));
+        cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
+        EXPECT_FALSE(cache.get(mAgentHalfExtents, mTilePosition, unexistentRecastMesh));
     }
 
     TEST_F(DetourNavigatorNavMeshTilesCacheTest, set_should_replace_unused_value)
     {
-        const std::size_t navMeshDataSize = 1;
-        const std::size_t navMeshKeySize = cRecastMeshWithWaterKeySize;
-        const std::size_t maxSize = navMeshDataSize + navMeshKeySize;
+        const std::size_t maxSize = mRecastMeshWithWaterSize + mPreparedNavMeshDataSize;
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<RecastMesh::Water> water {1, RecastMesh::Water {1, btTransform::getIdentity()}};
         const RecastMesh anotherRecastMesh {mGeneration, mRevision, mIndices, mVertices, mAreaTypes, water};
-        const auto anotherData = reinterpret_cast<unsigned char*>(dtAlloc(1, DT_ALLOC_PERM));
-        NavMeshData anotherNavMeshData {anotherData, 1};
+        auto anotherPreparedNavMeshData = makePeparedNavMeshData(3);
+        const auto copy = clone(*anotherPreparedNavMeshData);
 
-        cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections, std::move(mNavMeshData));
-        const auto result = cache.set(mAgentHalfExtents, mTilePosition, anotherRecastMesh, mOffMeshConnections,
-                                      std::move(anotherNavMeshData));
+        cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
+        const auto result = cache.set(mAgentHalfExtents, mTilePosition, anotherRecastMesh,
+                                      std::move(anotherPreparedNavMeshData));
         ASSERT_TRUE(result);
-        EXPECT_EQ(result.get(), (NavMeshDataRef {anotherData, 1}));
-        EXPECT_FALSE(cache.get(mAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections));
+        EXPECT_EQ(result.get(), *copy);
+        EXPECT_FALSE(cache.get(mAgentHalfExtents, mTilePosition, mRecastMesh));
     }
 
     TEST_F(DetourNavigatorNavMeshTilesCacheTest, set_should_not_replace_used_value)
     {
-        const std::size_t navMeshDataSize = 1;
-        const std::size_t navMeshKeySize = cRecastMeshKeySize;
-        const std::size_t maxSize = navMeshDataSize + navMeshKeySize;
+        const std::size_t maxSize = mRecastMeshWithWaterSize + mPreparedNavMeshDataSize;
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<RecastMesh::Water> water {1, RecastMesh::Water {1, btTransform::getIdentity()}};
         const RecastMesh anotherRecastMesh {mGeneration, mRevision, mIndices, mVertices, mAreaTypes, water};
-        const auto anotherData = reinterpret_cast<unsigned char*>(dtAlloc(1, DT_ALLOC_PERM));
-        NavMeshData anotherNavMeshData {anotherData, 1};
+        auto anotherPreparedNavMeshData = makePeparedNavMeshData(3);
 
-        const auto value = cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections,
-                                     std::move(mNavMeshData));
-        EXPECT_FALSE(cache.set(mAgentHalfExtents, mTilePosition, anotherRecastMesh, mOffMeshConnections,
-                               std::move(anotherNavMeshData)));
+        const auto value = cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh,
+                                     std::move(mPreparedNavMeshData));
+        EXPECT_FALSE(cache.set(mAgentHalfExtents, mTilePosition, anotherRecastMesh,
+                               std::move(anotherPreparedNavMeshData)));
     }
 
     TEST_F(DetourNavigatorNavMeshTilesCacheTest, set_should_replace_unused_least_recently_set_value)
     {
-        const std::size_t navMeshDataSize = 1;
-        const std::size_t navMeshKeySize = cRecastMeshWithWaterKeySize;
-        const std::size_t maxSize = 2 * (navMeshDataSize + navMeshKeySize);
+        const std::size_t maxSize = 2 * (mRecastMeshWithWaterSize + mPreparedNavMeshDataSize);
         NavMeshTilesCache cache(maxSize);
+        const auto copy = clone(*mPreparedNavMeshData);
 
         const std::vector<RecastMesh::Water> leastRecentlySetWater {1, RecastMesh::Water {1, btTransform::getIdentity()}};
         const RecastMesh leastRecentlySetRecastMesh {mGeneration, mRevision, mIndices, mVertices,
             mAreaTypes, leastRecentlySetWater};
-        const auto leastRecentlySetData = reinterpret_cast<unsigned char*>(dtAlloc(1, DT_ALLOC_PERM));
-        NavMeshData leastRecentlySetNavMeshData {leastRecentlySetData, 1};
+        auto leastRecentlySetData = makePeparedNavMeshData(3);
 
         const std::vector<RecastMesh::Water> mostRecentlySetWater {1, RecastMesh::Water {2, btTransform::getIdentity()}};
         const RecastMesh mostRecentlySetRecastMesh {mGeneration, mRevision, mIndices, mVertices,
             mAreaTypes, mostRecentlySetWater};
-        const auto mostRecentlySetData = reinterpret_cast<unsigned char*>(dtAlloc(1, DT_ALLOC_PERM));
-        NavMeshData mostRecentlySetNavMeshData {mostRecentlySetData, 1};
+        auto mostRecentlySetData = makePeparedNavMeshData(3);
 
-        ASSERT_TRUE(cache.set(mAgentHalfExtents, mTilePosition, leastRecentlySetRecastMesh, mOffMeshConnections,
-                              std::move(leastRecentlySetNavMeshData)));
-        ASSERT_TRUE(cache.set(mAgentHalfExtents, mTilePosition, mostRecentlySetRecastMesh, mOffMeshConnections,
-                              std::move(mostRecentlySetNavMeshData)));
+        ASSERT_TRUE(cache.set(mAgentHalfExtents, mTilePosition, leastRecentlySetRecastMesh,
+                              std::move(leastRecentlySetData)));
+        ASSERT_TRUE(cache.set(mAgentHalfExtents, mTilePosition, mostRecentlySetRecastMesh,
+                              std::move(mostRecentlySetData)));
 
-        const auto result = cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections,
-                                      std::move(mNavMeshData));
-        EXPECT_EQ(result.get(), (NavMeshDataRef {mData, 1}));
+        const auto result = cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh,
+                                      std::move(mPreparedNavMeshData));
+        EXPECT_EQ(result.get(), *copy);
 
-        EXPECT_FALSE(cache.get(mAgentHalfExtents, mTilePosition, leastRecentlySetRecastMesh, mOffMeshConnections));
-        EXPECT_TRUE(cache.get(mAgentHalfExtents, mTilePosition, mostRecentlySetRecastMesh, mOffMeshConnections));
+        EXPECT_FALSE(cache.get(mAgentHalfExtents, mTilePosition, leastRecentlySetRecastMesh));
+        EXPECT_TRUE(cache.get(mAgentHalfExtents, mTilePosition, mostRecentlySetRecastMesh));
     }
 
     TEST_F(DetourNavigatorNavMeshTilesCacheTest, set_should_replace_unused_least_recently_used_value)
     {
-        const std::size_t navMeshDataSize = 1;
-        const std::size_t navMeshKeySize = cRecastMeshWithWaterKeySize;
-        const std::size_t maxSize = 2 * (navMeshDataSize + navMeshKeySize);
+        const std::size_t maxSize = 2 * (mRecastMeshWithWaterSize + mPreparedNavMeshDataSize);
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<RecastMesh::Water> leastRecentlyUsedWater {1, RecastMesh::Water {1, btTransform::getIdentity()}};
         const RecastMesh leastRecentlyUsedRecastMesh {mGeneration, mRevision, mIndices, mVertices,
             mAreaTypes, leastRecentlyUsedWater};
-        const auto leastRecentlyUsedData = reinterpret_cast<unsigned char*>(dtAlloc(1, DT_ALLOC_PERM));
-        NavMeshData leastRecentlyUsedNavMeshData {leastRecentlyUsedData, 1};
+        auto leastRecentlyUsedData = makePeparedNavMeshData(3);
+        const auto leastRecentlyUsedCopy = clone(*leastRecentlyUsedData);
 
         const std::vector<RecastMesh::Water> mostRecentlyUsedWater {1, RecastMesh::Water {2, btTransform::getIdentity()}};
         const RecastMesh mostRecentlyUsedRecastMesh {mGeneration, mRevision, mIndices, mVertices,
             mAreaTypes, mostRecentlyUsedWater};
-        const auto mostRecentlyUsedData = reinterpret_cast<unsigned char*>(dtAlloc(1, DT_ALLOC_PERM));
-        NavMeshData mostRecentlyUsedNavMeshData {mostRecentlyUsedData, 1};
+        auto mostRecentlyUsedData = makePeparedNavMeshData(3);
+        const auto mostRecentlyUsedCopy = clone(*mostRecentlyUsedData);
 
-        cache.set(mAgentHalfExtents, mTilePosition, leastRecentlyUsedRecastMesh, mOffMeshConnections,
-                  std::move(leastRecentlyUsedNavMeshData));
-        cache.set(mAgentHalfExtents, mTilePosition, mostRecentlyUsedRecastMesh, mOffMeshConnections,
-                  std::move(mostRecentlyUsedNavMeshData));
+        cache.set(mAgentHalfExtents, mTilePosition, leastRecentlyUsedRecastMesh, std::move(leastRecentlyUsedData));
+        cache.set(mAgentHalfExtents, mTilePosition, mostRecentlyUsedRecastMesh, std::move(mostRecentlyUsedData));
 
         {
-            const auto value = cache.get(mAgentHalfExtents, mTilePosition, leastRecentlyUsedRecastMesh, mOffMeshConnections);
+            const auto value = cache.get(mAgentHalfExtents, mTilePosition, leastRecentlyUsedRecastMesh);
             ASSERT_TRUE(value);
-            ASSERT_EQ(value.get(), (NavMeshDataRef {leastRecentlyUsedData, 1}));
+            ASSERT_EQ(value.get(), *leastRecentlyUsedCopy);
         }
 
         {
-            const auto value = cache.get(mAgentHalfExtents, mTilePosition, mostRecentlyUsedRecastMesh, mOffMeshConnections);
+            const auto value = cache.get(mAgentHalfExtents, mTilePosition, mostRecentlyUsedRecastMesh);
             ASSERT_TRUE(value);
-            ASSERT_EQ(value.get(), (NavMeshDataRef {mostRecentlyUsedData, 1}));
+            ASSERT_EQ(value.get(), *mostRecentlyUsedCopy);
         }
 
-        const auto result = cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections,
-                                      std::move(mNavMeshData));
-        EXPECT_EQ(result.get(), (NavMeshDataRef {mData, 1}));
+        const auto copy = clone(*mPreparedNavMeshData);
+        const auto result = cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh,
+                                      std::move(mPreparedNavMeshData));
+        EXPECT_EQ(result.get(), *copy);
 
-        EXPECT_FALSE(cache.get(mAgentHalfExtents, mTilePosition, leastRecentlyUsedRecastMesh, mOffMeshConnections));
-        EXPECT_TRUE(cache.get(mAgentHalfExtents, mTilePosition, mostRecentlyUsedRecastMesh, mOffMeshConnections));
+        EXPECT_FALSE(cache.get(mAgentHalfExtents, mTilePosition, leastRecentlyUsedRecastMesh));
+        EXPECT_TRUE(cache.get(mAgentHalfExtents, mTilePosition, mostRecentlyUsedRecastMesh));
     }
 
     TEST_F(DetourNavigatorNavMeshTilesCacheTest, set_should_not_replace_unused_least_recently_used_value_when_item_does_not_not_fit_cache_max_size)
     {
-        const std::size_t navMeshDataSize = 1;
-        const std::size_t navMeshKeySize = cRecastMeshKeySize;
-        const std::size_t maxSize = 2 * (navMeshDataSize + navMeshKeySize);
+        const std::size_t maxSize = 2 * (mRecastMeshWithWaterSize + mPreparedNavMeshDataSize);
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<RecastMesh::Water> water {1, RecastMesh::Water {1, btTransform::getIdentity()}};
         const RecastMesh tooLargeRecastMesh {mGeneration, mRevision, mIndices, mVertices, mAreaTypes, water};
-        const auto tooLargeData = reinterpret_cast<unsigned char*>(dtAlloc(2, DT_ALLOC_PERM));
-        NavMeshData tooLargeNavMeshData {tooLargeData, 2};
+        auto tooLargeData = makePeparedNavMeshData(10);
 
-        cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections, std::move(mNavMeshData));
-        EXPECT_FALSE(cache.set(mAgentHalfExtents, mTilePosition, tooLargeRecastMesh, mOffMeshConnections,
-                               std::move(tooLargeNavMeshData)));
-        EXPECT_TRUE(cache.get(mAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections));
+        cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
+        EXPECT_FALSE(cache.set(mAgentHalfExtents, mTilePosition, tooLargeRecastMesh, std::move(tooLargeData)));
+        EXPECT_TRUE(cache.get(mAgentHalfExtents, mTilePosition, mRecastMesh));
     }
 
     TEST_F(DetourNavigatorNavMeshTilesCacheTest, set_should_not_replace_unused_least_recently_used_value_when_item_does_not_not_fit_size_of_unused_items)
     {
-        const std::size_t navMeshDataSize = 1;
-        const std::size_t navMeshKeySize1 = cRecastMeshKeySize;
-        const std::size_t navMeshKeySize2 = cRecastMeshWithWaterKeySize;
-        const std::size_t maxSize = 2 * navMeshDataSize + navMeshKeySize1 + navMeshKeySize2;
+        const std::size_t maxSize = 2 * (mRecastMeshWithWaterSize + mPreparedNavMeshDataSize);
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<RecastMesh::Water> anotherWater {1, RecastMesh::Water {1, btTransform::getIdentity()}};
         const RecastMesh anotherRecastMesh {mGeneration, mRevision, mIndices, mVertices, mAreaTypes, anotherWater};
-        const auto anotherData = reinterpret_cast<unsigned char*>(dtAlloc(1, DT_ALLOC_PERM));
-        NavMeshData anotherNavMeshData {anotherData, 1};
+        auto anotherData = makePeparedNavMeshData(3);
 
         const std::vector<RecastMesh::Water> tooLargeWater {1, RecastMesh::Water {2, btTransform::getIdentity()}};
         const RecastMesh tooLargeRecastMesh {mGeneration, mRevision, mIndices, mVertices,
             mAreaTypes, tooLargeWater};
-        const auto tooLargeData = reinterpret_cast<unsigned char*>(dtAlloc(2, DT_ALLOC_PERM));
-        NavMeshData tooLargeNavMeshData {tooLargeData, 2};
+        auto tooLargeData = makePeparedNavMeshData(10);
 
-        const auto value = cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections,
-                                     std::move(mNavMeshData));
+        const auto value = cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh,
+                                     std::move(mPreparedNavMeshData));
         ASSERT_TRUE(value);
-        ASSERT_TRUE(cache.set(mAgentHalfExtents, mTilePosition, anotherRecastMesh, mOffMeshConnections,
-                              std::move(anotherNavMeshData)));
-        EXPECT_FALSE(cache.set(mAgentHalfExtents, mTilePosition, tooLargeRecastMesh, mOffMeshConnections,
-                               std::move(tooLargeNavMeshData)));
-        EXPECT_TRUE(cache.get(mAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections));
-        EXPECT_TRUE(cache.get(mAgentHalfExtents, mTilePosition, anotherRecastMesh, mOffMeshConnections));
+        ASSERT_TRUE(cache.set(mAgentHalfExtents, mTilePosition, anotherRecastMesh,
+                              std::move(anotherData)));
+        EXPECT_FALSE(cache.set(mAgentHalfExtents, mTilePosition, tooLargeRecastMesh,
+                               std::move(tooLargeData)));
+        EXPECT_TRUE(cache.get(mAgentHalfExtents, mTilePosition, mRecastMesh));
+        EXPECT_TRUE(cache.get(mAgentHalfExtents, mTilePosition, anotherRecastMesh));
     }
 
     TEST_F(DetourNavigatorNavMeshTilesCacheTest, release_used_after_set_then_used_by_get_item_should_left_this_item_available)
     {
-        const std::size_t navMeshDataSize = 1;
-        const std::size_t navMeshKeySize = cRecastMeshKeySize;
-        const std::size_t maxSize = navMeshDataSize + navMeshKeySize;
+        const std::size_t maxSize = mRecastMeshWithWaterSize + mPreparedNavMeshDataSize;
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<RecastMesh::Water> water {1, RecastMesh::Water {1, btTransform::getIdentity()}};
         const RecastMesh anotherRecastMesh {mGeneration, mRevision, mIndices, mVertices,
             mAreaTypes, water};
-        const auto anotherData = reinterpret_cast<unsigned char*>(dtAlloc(1, DT_ALLOC_PERM));
-        NavMeshData anotherNavMeshData {anotherData, 1};
+        auto anotherData = makePeparedNavMeshData(3);
 
-        const auto firstCopy = cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections, std::move(mNavMeshData));
+        const auto firstCopy = cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
         ASSERT_TRUE(firstCopy);
         {
-            const auto secondCopy = cache.get(mAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections);
+            const auto secondCopy = cache.get(mAgentHalfExtents, mTilePosition, mRecastMesh);
             ASSERT_TRUE(secondCopy);
         }
-        EXPECT_FALSE(cache.set(mAgentHalfExtents, mTilePosition, anotherRecastMesh, mOffMeshConnections,
-                               std::move(anotherNavMeshData)));
-        EXPECT_TRUE(cache.get(mAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections));
+        EXPECT_FALSE(cache.set(mAgentHalfExtents, mTilePosition, anotherRecastMesh, std::move(anotherData)));
+        EXPECT_TRUE(cache.get(mAgentHalfExtents, mTilePosition, mRecastMesh));
     }
 
     TEST_F(DetourNavigatorNavMeshTilesCacheTest, release_twice_used_item_should_left_this_item_available)
     {
-        const std::size_t navMeshDataSize = 1;
-        const std::size_t navMeshKeySize = cRecastMeshKeySize;
-        const std::size_t maxSize = navMeshDataSize + navMeshKeySize;
+        const std::size_t maxSize = mRecastMeshWithWaterSize + mPreparedNavMeshDataSize;
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<RecastMesh::Water> water {1, RecastMesh::Water {1, btTransform::getIdentity()}};
         const RecastMesh anotherRecastMesh {mGeneration, mRevision, mIndices, mVertices, mAreaTypes, water};
-        const auto anotherData = reinterpret_cast<unsigned char*>(dtAlloc(1, DT_ALLOC_PERM));
-        NavMeshData anotherNavMeshData {anotherData, 1};
+        auto anotherData = makePeparedNavMeshData(3);
 
-        cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections, std::move(mNavMeshData));
-        const auto firstCopy = cache.get(mAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections);
+        cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
+        const auto firstCopy = cache.get(mAgentHalfExtents, mTilePosition, mRecastMesh);
         ASSERT_TRUE(firstCopy);
         {
-            const auto secondCopy = cache.get(mAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections);
+            const auto secondCopy = cache.get(mAgentHalfExtents, mTilePosition, mRecastMesh);
             ASSERT_TRUE(secondCopy);
         }
-        EXPECT_FALSE(cache.set(mAgentHalfExtents, mTilePosition, anotherRecastMesh, mOffMeshConnections,
-                               std::move(anotherNavMeshData)));
-        EXPECT_TRUE(cache.get(mAgentHalfExtents, mTilePosition, mRecastMesh, mOffMeshConnections));
+        EXPECT_FALSE(cache.set(mAgentHalfExtents, mTilePosition, anotherRecastMesh, std::move(anotherData)));
+        EXPECT_TRUE(cache.get(mAgentHalfExtents, mTilePosition, mRecastMesh));
     }
 }
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 9d72320ca9..678a4ea02f 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -193,6 +193,8 @@ add_component_dir(detournavigator
     navmeshtileview
     oscillatingrecastmeshobject
     offmeshconnectionsmanager
+    preparednavmeshdata
+    navmeshcacheitem
     )
 
 set (ESM_UI ${CMAKE_SOURCE_DIR}/files/ui/contentselector.ui
diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index 422fdffb1d..507ca078e9 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -7,6 +7,8 @@
 #include "sharednavmesh.hpp"
 #include "flags.hpp"
 #include "navmeshtilescache.hpp"
+#include "preparednavmeshdata.hpp"
+#include "navmeshdata.hpp"
 
 #include <components/misc/convert.hpp>
 
@@ -26,25 +28,6 @@ namespace
 {
     using namespace DetourNavigator;
 
-    void initPolyMeshDetail(rcPolyMeshDetail& value)
-    {
-        value.meshes = nullptr;
-        value.verts = nullptr;
-        value.tris = nullptr;
-    }
-
-    struct PolyMeshDetailStackDeleter
-    {
-        void operator ()(rcPolyMeshDetail* value) const
-        {
-            rcFree(value->meshes);
-            rcFree(value->verts);
-            rcFree(value->tris);
-        }
-    };
-
-    using PolyMeshDetailStackPtr = std::unique_ptr<rcPolyMeshDetail, PolyMeshDetailStackDeleter>;
-
     struct WaterBounds
     {
         osg::Vec3f mMin;
@@ -363,10 +346,25 @@ namespace
         return true;
     }
 
-    NavMeshData makeNavMeshTileData(const osg::Vec3f& agentHalfExtents, const RecastMesh& recastMesh,
-        const std::vector<OffMeshConnection>& offMeshConnections, const TilePosition& tile,
-        const osg::Vec3f& boundsMin, const osg::Vec3f& boundsMax, const Settings& settings)
+    template <class T>
+    unsigned long getMinValuableBitsNumber(const T value)
+    {
+        unsigned long power = 0;
+        while (power < sizeof(T) * 8 && (static_cast<T>(1) << power) < value)
+            ++power;
+        return power;
+    }
+}
+
+namespace DetourNavigator
+{
+    std::unique_ptr<PreparedNavMeshData> prepareNavMeshTileData(const RecastMesh& recastMesh,
+        const TilePosition& tile, const Bounds& bounds, const osg::Vec3f& agentHalfExtents, const Settings& settings)
     {
+        const TileBounds tileBounds = makeTileBounds(settings, tile);
+        const osg::Vec3f boundsMin(tileBounds.mMin.x(), bounds.mMin.y() - 1, tileBounds.mMin.y());
+        const osg::Vec3f boundsMax(tileBounds.mMax.x(), bounds.mMax.y() + 1, tileBounds.mMax.y());
+
         rcContext context;
         const auto config = makeConfig(agentHalfExtents, boundsMin, boundsMax, settings);
 
@@ -374,19 +372,27 @@ namespace
         createHeightfield(context, solid, config.width, config.height, config.bmin, config.bmax, config.cs, config.ch);
 
         if (!rasterizeTriangles(context, agentHalfExtents, recastMesh, config, settings, solid))
-            return NavMeshData();
+            return nullptr;
 
         rcFilterLowHangingWalkableObstacles(&context, config.walkableClimb, solid);
         rcFilterLedgeSpans(&context, config.walkableHeight, config.walkableClimb, solid);
         rcFilterWalkableLowHeightSpans(&context, config.walkableHeight, solid);
 
-        rcPolyMesh polyMesh;
-        rcPolyMeshDetail polyMeshDetail;
-        initPolyMeshDetail(polyMeshDetail);
-        const PolyMeshDetailStackPtr polyMeshDetailPtr(&polyMeshDetail);
-        if (!fillPolyMesh(context, config, solid, polyMesh, polyMeshDetail))
-            return NavMeshData();
+        std::unique_ptr<PreparedNavMeshData> result = std::make_unique<PreparedNavMeshData>();
 
+        if (!fillPolyMesh(context, config, solid, result->mPolyMesh, result->mPolyMeshDetail))
+            return nullptr;
+
+        result->mCellSize = config.cs;
+        result->mCellHeight = config.ch;
+
+        return result;
+    }
+
+    NavMeshData makeNavMeshTileData(const PreparedNavMeshData& data,
+        const std::vector<OffMeshConnection>& offMeshConnections, const osg::Vec3f& agentHalfExtents,
+        const TilePosition& tile, const Settings& settings)
+    {
         const auto offMeshConVerts = getOffMeshVerts(offMeshConnections);
         const std::vector<float> offMeshConRad(offMeshConnections.size(), getRadius(settings, agentHalfExtents));
         const std::vector<unsigned char> offMeshConDir(offMeshConnections.size(), 0);
@@ -394,18 +400,18 @@ namespace
         const std::vector<unsigned short> offMeshConFlags = getOffMeshFlags(offMeshConnections);
 
         dtNavMeshCreateParams params;
-        params.verts = polyMesh.verts;
-        params.vertCount = polyMesh.nverts;
-        params.polys = polyMesh.polys;
-        params.polyAreas = polyMesh.areas;
-        params.polyFlags = polyMesh.flags;
-        params.polyCount = polyMesh.npolys;
-        params.nvp = polyMesh.nvp;
-        params.detailMeshes = polyMeshDetail.meshes;
-        params.detailVerts = polyMeshDetail.verts;
-        params.detailVertsCount = polyMeshDetail.nverts;
-        params.detailTris = polyMeshDetail.tris;
-        params.detailTriCount = polyMeshDetail.ntris;
+        params.verts = data.mPolyMesh.verts;
+        params.vertCount = data.mPolyMesh.nverts;
+        params.polys = data.mPolyMesh.polys;
+        params.polyAreas = data.mPolyMesh.areas;
+        params.polyFlags = data.mPolyMesh.flags;
+        params.polyCount = data.mPolyMesh.npolys;
+        params.nvp = data.mPolyMesh.nvp;
+        params.detailMeshes = data.mPolyMeshDetail.meshes;
+        params.detailVerts = data.mPolyMeshDetail.verts;
+        params.detailVertsCount = data.mPolyMeshDetail.nverts;
+        params.detailTris = data.mPolyMeshDetail.tris;
+        params.detailTriCount = data.mPolyMeshDetail.ntris;
         params.offMeshConVerts = offMeshConVerts.data();
         params.offMeshConRad = offMeshConRad.data();
         params.offMeshConDir = offMeshConDir.data();
@@ -416,12 +422,12 @@ namespace
         params.walkableHeight = getHeight(settings, agentHalfExtents);
         params.walkableRadius = getRadius(settings, agentHalfExtents);
         params.walkableClimb = getMaxClimb(settings);
-        rcVcopy(params.bmin, polyMesh.bmin);
-        rcVcopy(params.bmax, polyMesh.bmax);
-        params.cs = config.cs;
-        params.ch = config.ch;
+        rcVcopy(params.bmin, data.mPolyMesh.bmin);
+        rcVcopy(params.bmax, data.mPolyMesh.bmax);
+        params.cs = data.mCellSize;
+        params.ch = data.mCellHeight;
         params.buildBvTree = true;
-        params.userId = 0;
+        params.userId = data.mUserId;
         params.tileX = tile.x();
         params.tileY = tile.y();
         params.tileLayer = 0;
@@ -436,20 +442,6 @@ namespace
         return NavMeshData(navMeshData, navMeshDataSize);
     }
 
-
-
-    template <class T>
-    unsigned long getMinValuableBitsNumber(const T value)
-    {
-        unsigned long power = 0;
-        while (power < sizeof(T) * 8 && (static_cast<T>(1) << power) < value)
-            ++power;
-        return power;
-    }
-}
-
-namespace DetourNavigator
-{
     NavMeshPtr makeEmptyNavMesh(const Settings& settings)
     {
         // Max tiles and max polys affect how the tile IDs are caculated.
@@ -522,35 +514,32 @@ namespace DetourNavigator
             return navMeshCacheItem->lock()->removeTile(changedTile);
         }
 
-        auto cachedNavMeshData = navMeshTilesCache.get(agentHalfExtents, changedTile, *recastMesh, offMeshConnections);
+        auto cachedNavMeshData = navMeshTilesCache.get(agentHalfExtents, changedTile, *recastMesh);
         bool cached = static_cast<bool>(cachedNavMeshData);
 
         if (!cachedNavMeshData)
         {
-            const auto tileBounds = makeTileBounds(settings, changedTile);
-            const osg::Vec3f tileBorderMin(tileBounds.mMin.x(), recastMeshBounds.mMin.y() - 1, tileBounds.mMin.y());
-            const osg::Vec3f tileBorderMax(tileBounds.mMax.x(), recastMeshBounds.mMax.y() + 1, tileBounds.mMax.y());
-
-            auto navMeshData = makeNavMeshTileData(agentHalfExtents, *recastMesh, offMeshConnections, changedTile,
-                tileBorderMin, tileBorderMax, settings);
+            auto prepared = prepareNavMeshTileData(*recastMesh, changedTile, recastMeshBounds,
+                                                   agentHalfExtents, settings);
 
-            if (!navMeshData.mValue)
+            if (prepared == nullptr)
             {
                 Log(Debug::Debug) << "Ignore add tile: NavMeshData is null";
                 return navMeshCacheItem->lock()->removeTile(changedTile);
             }
 
-            cachedNavMeshData = navMeshTilesCache.set(agentHalfExtents, changedTile, *recastMesh,
-                                                      offMeshConnections, std::move(navMeshData));
+            cachedNavMeshData = navMeshTilesCache.set(agentHalfExtents, changedTile, *recastMesh, std::move(prepared));
 
             if (!cachedNavMeshData)
             {
                 Log(Debug::Debug) << "Navigator cache overflow";
-                return navMeshCacheItem->lock()->updateTile(changedTile, std::move(navMeshData));
+                return navMeshCacheItem->lock()->updateTile(changedTile, NavMeshTilesCache::Value(),
+                    makeNavMeshTileData(*prepared, offMeshConnections, agentHalfExtents, changedTile, settings));
             }
         }
 
-        const auto updateStatus = navMeshCacheItem->lock()->updateTile(changedTile, std::move(cachedNavMeshData));
+        const auto updateStatus = navMeshCacheItem->lock()->updateTile(changedTile, std::move(cachedNavMeshData),
+            makeNavMeshTileData(cachedNavMeshData.get(), offMeshConnections, agentHalfExtents, changedTile, settings));
 
         return UpdateNavMeshStatusBuilder(updateStatus).cached(cached).getResult();
     }
diff --git a/components/detournavigator/makenavmesh.hpp b/components/detournavigator/makenavmesh.hpp
index 95720634cd..3e07341106 100644
--- a/components/detournavigator/makenavmesh.hpp
+++ b/components/detournavigator/makenavmesh.hpp
@@ -6,10 +6,12 @@
 #include "tileposition.hpp"
 #include "sharednavmesh.hpp"
 #include "navmeshtilescache.hpp"
+#include "offmeshconnection.hpp"
 
 #include <osg/Vec3f>
 
 #include <memory>
+#include <vector>
 
 class dtNavMesh;
 
@@ -17,6 +19,8 @@ namespace DetourNavigator
 {
     class RecastMesh;
     struct Settings;
+    struct PreparedNavMeshData;
+    struct NavMeshData;
 
     inline float getLength(const osg::Vec2i& value)
     {
@@ -34,6 +38,13 @@ namespace DetourNavigator
         return expectedTilesCount <= maxTiles;
     }
 
+    std::unique_ptr<PreparedNavMeshData> prepareNavMeshTileData(const RecastMesh& recastMesh, const TilePosition& tile,
+        const Bounds& bounds, const osg::Vec3f& agentHalfExtents, const Settings& settings);
+
+    NavMeshData makeNavMeshTileData(const PreparedNavMeshData& data,
+        const std::vector<OffMeshConnection>& offMeshConnections, const osg::Vec3f& agentHalfExtents,
+        const TilePosition& tile, const Settings& settings);
+
     NavMeshPtr makeEmptyNavMesh(const Settings& settings);
 
     UpdateNavMeshStatus updateNavMesh(const osg::Vec3f& agentHalfExtents, const RecastMesh* recastMesh,
diff --git a/components/detournavigator/navmeshcacheitem.cpp b/components/detournavigator/navmeshcacheitem.cpp
new file mode 100644
index 0000000000..ee6f3308d0
--- /dev/null
+++ b/components/detournavigator/navmeshcacheitem.cpp
@@ -0,0 +1,82 @@
+#include "tileposition.hpp"
+#include "navmeshtilescache.hpp"
+#include "dtstatus.hpp"
+#include "navmeshtileview.hpp"
+#include "navmeshcacheitem.hpp"
+#include "navmeshdata.hpp"
+
+#include <components/misc/guarded.hpp>
+
+#include <DetourNavMesh.h>
+
+namespace
+{
+    using DetourNavigator::TilePosition;
+
+    const dtMeshTile* getTile(const dtNavMesh& navMesh, const TilePosition& position)
+    {
+        const int layer = 0;
+        return navMesh.getTileAt(position.x(), position.y(), layer);
+    }
+
+    bool removeTile(dtNavMesh& navMesh, const TilePosition& position)
+    {
+        const int layer = 0;
+        const auto tileRef = navMesh.getTileRefAt(position.x(), position.y(), layer);
+        if (tileRef == 0)
+            return false;
+        unsigned char** const data = nullptr;
+        int* const dataSize = nullptr;
+        return dtStatusSucceed(navMesh.removeTile(tileRef, data, dataSize));
+    }
+
+    dtStatus addTile(dtNavMesh& navMesh, unsigned char* data, int size)
+    {
+        const int doNotTransferOwnership = 0;
+        const dtTileRef lastRef = 0;
+        dtTileRef* const result = nullptr;
+        return navMesh.addTile(data, size, doNotTransferOwnership, lastRef, result);
+    }
+}
+
+namespace DetourNavigator
+{
+    UpdateNavMeshStatus NavMeshCacheItem::updateTile(const TilePosition& position, NavMeshTilesCache::Value&& cached,
+        NavMeshData&& navMeshData)
+    {
+        const dtMeshTile* currentTile = ::getTile(*mImpl, position);
+        if (currentTile != nullptr
+            && asNavMeshTileConstView(*currentTile) == asNavMeshTileConstView(navMeshData.mValue.get()))
+        {
+            return UpdateNavMeshStatus::ignored;
+        }
+        const auto removed = ::removeTile(*mImpl, position);
+        const auto addStatus = addTile(*mImpl, navMeshData.mValue.get(), navMeshData.mSize);
+        if (dtStatusSucceed(addStatus))
+        {
+            mUsedTiles[position] = std::make_pair(std::move(cached), std::move(navMeshData));
+            ++mNavMeshRevision;
+            return UpdateNavMeshStatusBuilder().added(true).removed(removed).getResult();
+        }
+        else
+        {
+            if (removed)
+            {
+                mUsedTiles.erase(position);
+                ++mNavMeshRevision;
+            }
+            return UpdateNavMeshStatusBuilder().removed(removed).failed((addStatus & DT_OUT_OF_MEMORY) != 0).getResult();
+        }
+    }
+
+    UpdateNavMeshStatus NavMeshCacheItem::removeTile(const TilePosition& position)
+    {
+        const auto removed = ::removeTile(*mImpl, position);
+        if (removed)
+        {
+            mUsedTiles.erase(position);
+            ++mNavMeshRevision;
+        }
+        return UpdateNavMeshStatusBuilder().removed(removed).getResult();
+    }
+}
diff --git a/components/detournavigator/navmeshcacheitem.hpp b/components/detournavigator/navmeshcacheitem.hpp
index a9a4ebee62..5558f4e1f5 100644
--- a/components/detournavigator/navmeshcacheitem.hpp
+++ b/components/detournavigator/navmeshcacheitem.hpp
@@ -5,14 +5,14 @@
 #include "tileposition.hpp"
 #include "navmeshtilescache.hpp"
 #include "dtstatus.hpp"
-#include "navmeshtileview.hpp"
+#include "navmeshdata.hpp"
 
 #include <components/misc/guarded.hpp>
 
-#include <DetourNavMesh.h>
-
 #include <map>
 
+struct dtMeshTile;
+
 namespace DetourNavigator
 {
     enum class UpdateNavMeshStatus : unsigned
@@ -96,26 +96,6 @@ namespace DetourNavigator
         }
     };
 
-    inline unsigned char* getRawData(NavMeshData& navMeshData)
-    {
-        return navMeshData.mValue.get();
-    }
-
-    inline unsigned char* getRawData(NavMeshTilesCache::Value& cachedNavMeshData)
-    {
-        return cachedNavMeshData.get().mValue;
-    }
-
-    inline int getSize(const NavMeshData& navMeshData)
-    {
-        return navMeshData.mSize;
-    }
-
-    inline int getSize(const NavMeshTilesCache::Value& cachedNavMeshData)
-    {
-        return cachedNavMeshData.get().mSize;
-    }
-
     class NavMeshCacheItem
     {
     public:
@@ -139,86 +119,16 @@ namespace DetourNavigator
             return mNavMeshRevision;
         }
 
-        template <class T>
-        UpdateNavMeshStatus updateTile(const TilePosition& position, T&& navMeshData)
-        {
-            const dtMeshTile* currentTile = getTile(position);
-            if (currentTile != nullptr
-                && asNavMeshTileConstView(*currentTile) == asNavMeshTileConstView(getRawData(navMeshData)))
-            {
-                return UpdateNavMeshStatus::ignored;
-            }
-            const auto removed = removeTileImpl(position);
-            const auto addStatus = addTileImpl(getRawData(navMeshData), getSize(navMeshData));
-            if (dtStatusSucceed(addStatus))
-            {
-                setUsedTile(position, std::forward<T>(navMeshData));
-                return UpdateNavMeshStatusBuilder().added(true).removed(removed).getResult();
-            }
-            else
-            {
-                if (removed)
-                    removeUsedTile(position);
-                return UpdateNavMeshStatusBuilder().removed(removed).failed((addStatus & DT_OUT_OF_MEMORY) != 0).getResult();
-            }
-        }
+        UpdateNavMeshStatus updateTile(const TilePosition& position, NavMeshTilesCache::Value&& cached,
+                                       NavMeshData&& navMeshData);
 
-        UpdateNavMeshStatus removeTile(const TilePosition& position)
-        {
-            const auto removed = removeTileImpl(position);
-            if (removed)
-                removeUsedTile(position);
-            return UpdateNavMeshStatusBuilder().removed(removed).getResult();
-        }
+        UpdateNavMeshStatus removeTile(const TilePosition& position);
 
     private:
         NavMeshPtr mImpl;
         std::size_t mGeneration;
         std::size_t mNavMeshRevision;
         std::map<TilePosition, std::pair<NavMeshTilesCache::Value, NavMeshData>> mUsedTiles;
-
-        void setUsedTile(const TilePosition& tilePosition, NavMeshTilesCache::Value value)
-        {
-            mUsedTiles[tilePosition] = std::make_pair(std::move(value), NavMeshData());
-            ++mNavMeshRevision;
-        }
-
-        void setUsedTile(const TilePosition& tilePosition, NavMeshData value)
-        {
-            mUsedTiles[tilePosition] = std::make_pair(NavMeshTilesCache::Value(), std::move(value));
-            ++mNavMeshRevision;
-        }
-
-        void removeUsedTile(const TilePosition& tilePosition)
-        {
-            mUsedTiles.erase(tilePosition);
-            ++mNavMeshRevision;
-        }
-
-        dtStatus addTileImpl(unsigned char* data, int size)
-        {
-            const int doNotTransferOwnership = 0;
-            const dtTileRef lastRef = 0;
-            dtTileRef* const result = nullptr;
-            return mImpl->addTile(data, size, doNotTransferOwnership, lastRef, result);
-        }
-
-        bool removeTileImpl(const TilePosition& position)
-        {
-            const int layer = 0;
-            const auto tileRef = mImpl->getTileRefAt(position.x(), position.y(), layer);
-            if (tileRef == 0)
-                return false;
-            unsigned char** const data = nullptr;
-            int* const dataSize = nullptr;
-            return dtStatusSucceed(mImpl->removeTile(tileRef, data, dataSize));
-        }
-
-        const dtMeshTile* getTile(const TilePosition& position) const
-        {
-            const int layer = 0;
-            return mImpl->getTileAt(position.x(), position.y(), layer);
-        }
     };
 
     using GuardedNavMeshCacheItem = Misc::ScopeGuarded<NavMeshCacheItem>;
diff --git a/components/detournavigator/navmeshdata.hpp b/components/detournavigator/navmeshdata.hpp
index 8ce79614b3..501e971cba 100644
--- a/components/detournavigator/navmeshdata.hpp
+++ b/components/detournavigator/navmeshdata.hpp
@@ -3,7 +3,6 @@
 
 #include <DetourAlloc.h>
 
-#include <algorithm>
 #include <memory>
 
 namespace DetourNavigator
diff --git a/components/detournavigator/navmeshtilescache.cpp b/components/detournavigator/navmeshtilescache.cpp
index ccc41a666d..7c29f734ea 100644
--- a/components/detournavigator/navmeshtilescache.cpp
+++ b/components/detournavigator/navmeshtilescache.cpp
@@ -6,32 +6,18 @@
 
 namespace DetourNavigator
 {
-    namespace
-    {
-        inline std::size_t getSize(const RecastMesh& recastMesh,
-                                   const std::vector<OffMeshConnection>& offMeshConnections)
-        {
-            const std::size_t indicesSize = recastMesh.getIndices().size() * sizeof(int);
-            const std::size_t verticesSize = recastMesh.getVertices().size() * sizeof(float);
-            const std::size_t areaTypesSize = recastMesh.getAreaTypes().size() * sizeof(AreaType);
-            const std::size_t waterSize = recastMesh.getWater().size() * sizeof(RecastMesh::Water);
-            const std::size_t offMeshConnectionsSize = offMeshConnections.size() * sizeof(OffMeshConnection);
-            return indicesSize + verticesSize + areaTypesSize + waterSize + offMeshConnectionsSize;
-        }
-    }
-
     NavMeshTilesCache::NavMeshTilesCache(const std::size_t maxNavMeshDataSize)
         : mMaxNavMeshDataSize(maxNavMeshDataSize), mUsedNavMeshDataSize(0), mFreeNavMeshDataSize(0),
           mHitCount(0), mGetCount(0) {}
 
     NavMeshTilesCache::Value NavMeshTilesCache::get(const osg::Vec3f& agentHalfExtents, const TilePosition& changedTile,
-        const RecastMesh& recastMesh, const std::vector<OffMeshConnection>& offMeshConnections)
+        const RecastMesh& recastMesh)
     {
         const std::lock_guard<std::mutex> lock(mMutex);
 
         ++mGetCount;
 
-        const auto tile = mValues.find(std::make_tuple(agentHalfExtents, changedTile, NavMeshKeyView(recastMesh, offMeshConnections)));
+        const auto tile = mValues.find(std::make_tuple(agentHalfExtents, changedTile, recastMesh));
         if (tile == mValues.end())
             return Value();
 
@@ -43,10 +29,10 @@ namespace DetourNavigator
     }
 
     NavMeshTilesCache::Value NavMeshTilesCache::set(const osg::Vec3f& agentHalfExtents, const TilePosition& changedTile,
-        const RecastMesh& recastMesh, const std::vector<OffMeshConnection>& offMeshConnections,
-        NavMeshData&& value)
+        const RecastMesh& recastMesh, std::unique_ptr<PreparedNavMeshData>&& value)
     {
-        const auto itemSize = static_cast<std::size_t>(value.mSize) + getSize(recastMesh, offMeshConnections);
+        const auto itemSize = sizeof(RecastMesh) + getSize(recastMesh)
+            + (value == nullptr ? 0 : sizeof(PreparedNavMeshData) + getSize(*value));
 
         const std::lock_guard<std::mutex> lock(mMutex);
 
@@ -56,13 +42,10 @@ namespace DetourNavigator
         while (!mFreeItems.empty() && mUsedNavMeshDataSize + itemSize > mMaxNavMeshDataSize)
             removeLeastRecentlyUsed();
 
-        NavMeshKey navMeshKey {
-            RecastMeshData {recastMesh.getIndices(), recastMesh.getVertices(), recastMesh.getAreaTypes(), recastMesh.getWater()},
-            offMeshConnections
-        };
+        RecastMeshData key {recastMesh.getIndices(), recastMesh.getVertices(), recastMesh.getAreaTypes(), recastMesh.getWater()};
 
-        const auto iterator = mFreeItems.emplace(mFreeItems.end(), agentHalfExtents, changedTile, std::move(navMeshKey), itemSize);
-        const auto emplaced = mValues.emplace(std::make_tuple(agentHalfExtents, changedTile, NavMeshKeyRef(iterator->mNavMeshKey)), iterator);
+        const auto iterator = mFreeItems.emplace(mFreeItems.end(), agentHalfExtents, changedTile, std::move(key), itemSize);
+        const auto emplaced = mValues.emplace(std::make_tuple(agentHalfExtents, changedTile, std::cref(iterator->mRecastMeshData)), iterator);
 
         if (!emplaced.second)
         {
@@ -73,7 +56,7 @@ namespace DetourNavigator
             return Value(*this, emplaced.first->second);
         }
 
-        iterator->mNavMeshData = std::move(value);
+        iterator->mPreparedNavMeshData = std::move(value);
         ++iterator->mUseCount;
         mUsedNavMeshDataSize += itemSize;
         mBusyItems.splice(mBusyItems.end(), mFreeItems, iterator);
@@ -108,7 +91,7 @@ namespace DetourNavigator
     {
         const auto& item = mFreeItems.back();
 
-        const auto value = mValues.find(std::make_tuple(item.mAgentHalfExtents, item.mChangedTile, NavMeshKeyRef(item.mNavMeshKey)));
+        const auto value = mValues.find(std::make_tuple(item.mAgentHalfExtents, item.mChangedTile, std::cref(item.mRecastMeshData)));
         if (value == mValues.end())
             return;
 
diff --git a/components/detournavigator/navmeshtilescache.hpp b/components/detournavigator/navmeshtilescache.hpp
index afa53beba0..37c0be7211 100644
--- a/components/detournavigator/navmeshtilescache.hpp
+++ b/components/detournavigator/navmeshtilescache.hpp
@@ -1,8 +1,7 @@
 #ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_NAVMESHTILESCACHE_H
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_NAVMESHTILESCACHE_H
 
-#include "offmeshconnection.hpp"
-#include "navmeshdata.hpp"
+#include "preparednavmeshdata.hpp"
 #include "recastmesh.hpp"
 #include "tileposition.hpp"
 
@@ -21,12 +20,6 @@ namespace osg
 
 namespace DetourNavigator
 {
-    struct NavMeshDataRef
-    {
-        unsigned char* mValue;
-        int mSize;
-    };
-
     struct RecastMeshData
     {
         std::vector<int> mIndices;
@@ -53,71 +46,6 @@ namespace DetourNavigator
                 < std::tie(rhs.mIndices, rhs.mVertices, rhs.mAreaTypes, rhs.mWater);
     }
 
-    struct NavMeshKey
-    {
-        RecastMeshData mRecastMesh;
-        std::vector<OffMeshConnection> mOffMeshConnections;
-    };
-
-    inline bool operator <(const NavMeshKey& lhs, const NavMeshKey& rhs)
-    {
-        return std::tie(lhs.mRecastMesh, lhs.mOffMeshConnections)
-                < std::tie(rhs.mRecastMesh, rhs.mOffMeshConnections);
-    }
-
-    struct NavMeshKeyRef
-    {
-        std::reference_wrapper<const NavMeshKey> mRef;
-
-        explicit NavMeshKeyRef(const NavMeshKey& ref) : mRef(ref) {}
-    };
-
-    inline bool operator <(const NavMeshKeyRef& lhs, const NavMeshKeyRef& rhs)
-    {
-        return lhs.mRef.get() < rhs.mRef.get();
-    }
-
-    struct NavMeshKeyView
-    {
-        std::reference_wrapper<const RecastMesh> mRecastMesh;
-        std::reference_wrapper<const std::vector<OffMeshConnection>> mOffMeshConnections;
-
-        NavMeshKeyView(const RecastMesh& recastMesh, const std::vector<OffMeshConnection>& offMeshConnections)
-            : mRecastMesh(recastMesh), mOffMeshConnections(offMeshConnections) {}
-    };
-
-    inline bool operator <(const NavMeshKeyView& lhs, const NavMeshKey& rhs)
-    {
-        return std::tie(lhs.mRecastMesh.get(), lhs.mOffMeshConnections.get())
-                < std::tie(rhs.mRecastMesh, rhs.mOffMeshConnections);
-    }
-
-    inline bool operator <(const NavMeshKey& lhs, const NavMeshKeyView& rhs)
-    {
-        return std::tie(lhs.mRecastMesh, lhs.mOffMeshConnections)
-                < std::tie(rhs.mRecastMesh.get(), rhs.mOffMeshConnections.get());
-    }
-
-    template <class R>
-    inline bool operator <(const NavMeshKeyRef& lhs, const R& rhs)
-    {
-        return lhs.mRef.get() < rhs;
-    }
-
-    template <class L>
-    inline bool operator <(const L& lhs, const NavMeshKeyRef& rhs)
-    {
-        return lhs < rhs.mRef.get();
-    }
-
-    template <class L, class R>
-    inline bool operator <(const std::tuple<osg::Vec3f, TilePosition, L>& lhs, const std::tuple<osg::Vec3f, TilePosition, R>& rhs)
-    {
-        const auto left = std::tie(std::get<0>(lhs), std::get<1>(lhs));
-        const auto right = std::tie(std::get<0>(rhs), std::get<1>(rhs));
-        return std::tie(left, std::get<2>(lhs)) < std::tie(right, std::get<2>(rhs));
-    }
-
     class NavMeshTilesCache
     {
     public:
@@ -126,15 +54,16 @@ namespace DetourNavigator
             std::atomic<std::int64_t> mUseCount;
             osg::Vec3f mAgentHalfExtents;
             TilePosition mChangedTile;
-            NavMeshKey mNavMeshKey;
-            NavMeshData mNavMeshData;
+            RecastMeshData mRecastMeshData;
+            std::unique_ptr<PreparedNavMeshData> mPreparedNavMeshData;
             std::size_t mSize;
 
-            Item(const osg::Vec3f& agentHalfExtents, const TilePosition& changedTile, NavMeshKey&& navMeshKey, std::size_t size)
+            Item(const osg::Vec3f& agentHalfExtents, const TilePosition& changedTile,
+                 RecastMeshData&& recastMeshData, std::size_t size)
                 : mUseCount(0)
                 , mAgentHalfExtents(agentHalfExtents)
                 , mChangedTile(changedTile)
-                , mNavMeshKey(navMeshKey)
+                , mRecastMeshData(std::move(recastMeshData))
                 , mSize(size)
             {}
         };
@@ -181,9 +110,9 @@ namespace DetourNavigator
                 return *this;
             }
 
-            NavMeshDataRef get() const
+            const PreparedNavMeshData& get() const
             {
-                return NavMeshDataRef {mIterator->mNavMeshData.mValue.get(), mIterator->mNavMeshData.mSize};
+                return *mIterator->mPreparedNavMeshData;
             }
 
             operator bool() const
@@ -208,11 +137,10 @@ namespace DetourNavigator
         NavMeshTilesCache(const std::size_t maxNavMeshDataSize);
 
         Value get(const osg::Vec3f& agentHalfExtents, const TilePosition& changedTile,
-            const RecastMesh& recastMesh, const std::vector<OffMeshConnection>& offMeshConnections);
+            const RecastMesh& recastMesh);
 
         Value set(const osg::Vec3f& agentHalfExtents, const TilePosition& changedTile,
-            const RecastMesh& recastMesh, const std::vector<OffMeshConnection>& offMeshConnections,
-            NavMeshData&& value);
+            const RecastMesh& recastMesh, std::unique_ptr<PreparedNavMeshData>&& value);
 
         Stats getStats() const;
 
@@ -227,7 +155,7 @@ namespace DetourNavigator
         std::size_t mGetCount;
         std::list<Item> mBusyItems;
         std::list<Item> mFreeItems;
-        std::map<std::tuple<osg::Vec3f, TilePosition, NavMeshKeyRef>, ItemIterator, std::less<>> mValues;
+        std::map<std::tuple<osg::Vec3f, TilePosition, std::reference_wrapper<const RecastMeshData>>, ItemIterator, std::less<>> mValues;
 
         void removeLeastRecentlyUsed();
 
diff --git a/components/detournavigator/navmeshtileview.cpp b/components/detournavigator/navmeshtileview.cpp
index 96f07c6b1c..336cd1ba84 100644
--- a/components/detournavigator/navmeshtileview.cpp
+++ b/components/detournavigator/navmeshtileview.cpp
@@ -1,4 +1,5 @@
 #include "navmeshtileview.hpp"
+#include "ref.hpp"
 
 #include <DetourCommon.h>
 #include <DetourNavMesh.h>
@@ -10,47 +11,9 @@
 
 namespace
 {
-    template <typename T>
-    struct Ref
-    {
-        T& mRef;
-
-        explicit Ref(T& ref) : mRef(ref) {}
-
-        friend bool operator==(const Ref& lhs, const Ref& rhs)
-        {
-            return lhs.mRef == rhs.mRef;
-        }
-    };
-
-    template <typename T, std::size_t size>
-    struct ArrayRef
-    {
-        T (&mRef)[size];
-
-        explicit ArrayRef(T (&ref)[size]) : mRef(ref) {}
-
-        friend bool operator==(const ArrayRef& lhs, const ArrayRef& rhs)
-        {
-            return std::equal(std::begin(lhs.mRef), std::end(lhs.mRef), std::begin(rhs.mRef));
-        }
-    };
-
-    template <typename T>
-    struct Span
-    {
-        T* mBegin;
-        T* mEnd;
-
-        explicit Span(T* data, int size) : mBegin(data), mEnd(data + static_cast<std::size_t>(size)) {}
-
-        friend bool operator==(const Span& lhs, const Span& rhs)
-        {
-            // size is already equal if headers are equal
-            assert((lhs.mEnd - lhs.mBegin) == (rhs.mEnd - rhs.mBegin));
-            return std::equal(lhs.mBegin, lhs.mEnd, rhs.mBegin);
-        }
-    };
+    using DetourNavigator::ArrayRef;
+    using DetourNavigator::Ref;
+    using DetourNavigator::Span;
 
     auto makeTuple(const dtMeshHeader& v)
     {
diff --git a/components/detournavigator/offmeshconnection.hpp b/components/detournavigator/offmeshconnection.hpp
index 01bae02732..9312bc6c48 100644
--- a/components/detournavigator/offmeshconnection.hpp
+++ b/components/detournavigator/offmeshconnection.hpp
@@ -5,6 +5,7 @@
 
 #include <osg/Vec3f>
 
+#include <vector>
 #include <tuple>
 
 namespace DetourNavigator
diff --git a/components/detournavigator/preparednavmeshdata.cpp b/components/detournavigator/preparednavmeshdata.cpp
new file mode 100644
index 0000000000..3fea46b26c
--- /dev/null
+++ b/components/detournavigator/preparednavmeshdata.cpp
@@ -0,0 +1,52 @@
+#include "preparednavmeshdata.hpp"
+#include "preparednavmeshdatatuple.hpp"
+
+#include <Recast.h>
+#include <RecastAlloc.h>
+
+namespace
+{
+    using namespace DetourNavigator;
+
+    void initPolyMeshDetail(rcPolyMeshDetail& value) noexcept
+    {
+        value.meshes = nullptr;
+        value.verts = nullptr;
+        value.tris = nullptr;
+        value.nmeshes = 0;
+        value.nverts = 0;
+        value.ntris = 0;
+    }
+
+    void freePolyMeshDetail(rcPolyMeshDetail& value) noexcept
+    {
+        rcFree(value.meshes);
+        rcFree(value.verts);
+        rcFree(value.tris);
+    }
+}
+
+template <class T>
+inline constexpr auto operator==(const T& lhs, const T& rhs) noexcept
+    -> std::enable_if_t<std::is_same_v<std::void_t<decltype(makeTuple(lhs))>, void>, bool>
+{
+    return makeTuple(lhs) == makeTuple(rhs);
+}
+
+namespace DetourNavigator
+{
+    PreparedNavMeshData::PreparedNavMeshData() noexcept
+    {
+        initPolyMeshDetail(mPolyMeshDetail);
+    }
+
+    PreparedNavMeshData::~PreparedNavMeshData() noexcept
+    {
+        freePolyMeshDetail(mPolyMeshDetail);
+    }
+
+    bool operator==(const PreparedNavMeshData& lhs, const PreparedNavMeshData& rhs) noexcept
+    {
+        return makeTuple(lhs) == makeTuple(rhs);
+    }
+}
diff --git a/components/detournavigator/preparednavmeshdata.hpp b/components/detournavigator/preparednavmeshdata.hpp
new file mode 100644
index 0000000000..4a92265231
--- /dev/null
+++ b/components/detournavigator/preparednavmeshdata.hpp
@@ -0,0 +1,48 @@
+#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_PREPAREDNAVMESHDATA_H
+#define OPENMW_COMPONENTS_DETOURNAVIGATOR_PREPAREDNAVMESHDATA_H
+
+#include <Recast.h>
+
+#include <cstddef>
+
+namespace DetourNavigator
+{
+    struct PreparedNavMeshData
+    {
+        unsigned int mUserId = 0;
+        float mCellSize = 0;
+        float mCellHeight = 0;
+        rcPolyMesh mPolyMesh;
+        rcPolyMeshDetail mPolyMeshDetail;
+
+        PreparedNavMeshData() noexcept;
+        PreparedNavMeshData(const PreparedNavMeshData&) = delete;
+
+        ~PreparedNavMeshData() noexcept;
+
+        friend bool operator==(const PreparedNavMeshData& lhs, const PreparedNavMeshData& rhs) noexcept;
+    };
+
+    inline constexpr std::size_t getSize(const rcPolyMesh& value) noexcept
+    {
+        return static_cast<std::size_t>(3 * value.nverts) * sizeof(*value.verts)
+            + static_cast<std::size_t>(value.maxpolys * 2 * value.nvp) * sizeof(*value.polys)
+            + static_cast<std::size_t>(value.maxpolys) * sizeof(*value.regs)
+            + static_cast<std::size_t>(value.maxpolys) * sizeof(*value.flags)
+            + static_cast<std::size_t>(value.maxpolys) * sizeof(*value.areas);
+    }
+
+    inline constexpr std::size_t getSize(const rcPolyMeshDetail& value) noexcept
+    {
+        return static_cast<std::size_t>(4 * value.nmeshes) * sizeof(*value.meshes)
+            + static_cast<std::size_t>(4 * value.ntris) * sizeof(*value.tris)
+            + static_cast<std::size_t>(3 * value.nverts) * sizeof(*value.verts);
+    }
+
+    inline constexpr std::size_t getSize(const PreparedNavMeshData& value) noexcept
+    {
+        return getSize(value.mPolyMesh) + getSize(value.mPolyMeshDetail);
+    }
+}
+
+#endif
diff --git a/components/detournavigator/preparednavmeshdatatuple.hpp b/components/detournavigator/preparednavmeshdatatuple.hpp
new file mode 100644
index 0000000000..5b5a72f629
--- /dev/null
+++ b/components/detournavigator/preparednavmeshdatatuple.hpp
@@ -0,0 +1,51 @@
+#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_PREPAREDNAVMESHDATATUPLE_H
+#define OPENMW_COMPONENTS_DETOURNAVIGATOR_PREPAREDNAVMESHDATATUPLE_H
+
+#include "preparednavmeshdata.hpp"
+#include "ref.hpp"
+
+#include <Recast.h>
+
+#include <tuple>
+
+namespace DetourNavigator
+{
+    constexpr auto makeTuple(const rcPolyMesh& v) noexcept
+    {
+        return std::tuple(
+            Span(v.verts, 3 * v.nverts),
+            Span(v.polys, v.maxpolys * 2 * v.nvp),
+            Span(v.regs, v.maxpolys),
+            Span(v.flags, v.maxpolys),
+            Span(v.areas, v.maxpolys),
+            ArrayRef(v.bmin),
+            ArrayRef(v.bmax),
+            v.cs,
+            v.ch,
+            v.borderSize,
+            v.maxEdgeError
+        );
+    }
+
+    constexpr auto makeTuple(const rcPolyMeshDetail& v) noexcept
+    {
+        return std::tuple(
+            Span(v.meshes, 4 * v.nmeshes),
+            Span(v.verts, 3 * v.nverts),
+            Span(v.tris, 4 * v.ntris)
+        );
+    }
+
+    constexpr auto makeTuple(const PreparedNavMeshData& v) noexcept
+    {
+        return std::tuple(
+            v.mUserId,
+            v.mCellHeight,
+            v.mCellSize,
+            Ref(v.mPolyMesh),
+            Ref(v.mPolyMeshDetail)
+        );
+    }
+}
+
+#endif
diff --git a/components/detournavigator/recastmesh.hpp b/components/detournavigator/recastmesh.hpp
index 0e6bc49204..7f5758a85e 100644
--- a/components/detournavigator/recastmesh.hpp
+++ b/components/detournavigator/recastmesh.hpp
@@ -80,6 +80,15 @@ namespace DetourNavigator
         std::vector<AreaType> mAreaTypes;
         std::vector<Water> mWater;
         Bounds mBounds;
+
+        friend inline std::size_t getSize(const RecastMesh& recastMesh) noexcept
+        {
+            const std::size_t indicesSize = recastMesh.mIndices.size() * sizeof(int);
+            const std::size_t verticesSize = recastMesh.mVertices.size() * sizeof(float);
+            const std::size_t areaTypesSize = recastMesh.mAreaTypes.size() * sizeof(AreaType);
+            const std::size_t waterSize = recastMesh.mWater.size() * sizeof(RecastMesh::Water);
+            return indicesSize + verticesSize + areaTypesSize + waterSize;
+        }
     };
 
     inline bool operator<(const RecastMesh::Water& lhs, const RecastMesh::Water& rhs)
diff --git a/components/detournavigator/ref.hpp b/components/detournavigator/ref.hpp
new file mode 100644
index 0000000000..d800bde8f8
--- /dev/null
+++ b/components/detournavigator/ref.hpp
@@ -0,0 +1,55 @@
+#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_REF_H
+#define OPENMW_COMPONENTS_DETOURNAVIGATOR_REF_H
+
+#include <algorithm>
+#include <cassert>
+
+namespace DetourNavigator
+{
+    template <typename T>
+    struct Ref
+    {
+        T& mRef;
+
+        constexpr explicit Ref(T& ref) noexcept : mRef(ref) {}
+
+        friend bool operator==(const Ref& lhs, const Ref& rhs)
+        {
+            return lhs.mRef == rhs.mRef;
+        }
+    };
+
+    template <typename T, std::size_t size>
+    struct ArrayRef
+    {
+        T (&mRef)[size];
+
+        constexpr explicit ArrayRef(T (&ref)[size]) noexcept : mRef(ref) {}
+
+        friend bool operator==(const ArrayRef& lhs, const ArrayRef& rhs)
+        {
+            return std::equal(std::begin(lhs.mRef), std::end(lhs.mRef), std::begin(rhs.mRef));
+        }
+    };
+
+    template <typename T>
+    struct Span
+    {
+        T* mBegin;
+        T* mEnd;
+
+        constexpr explicit Span(T* data, int size) noexcept
+            : mBegin(data)
+            , mEnd(data + static_cast<std::size_t>(size))
+        {}
+
+        friend bool operator==(const Span& lhs, const Span& rhs)
+        {
+            // size is already equal if headers are equal
+            assert((lhs.mEnd - lhs.mBegin) == (rhs.mEnd - rhs.mBegin));
+            return std::equal(lhs.mBegin, lhs.mEnd, rhs.mBegin);
+        }
+    };
+}
+
+#endif

From 087e9333266e4aac8d70f62e95c66720b50b6857 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 15 Jul 2021 22:31:26 +0200
Subject: [PATCH 1031/2859] Close windows using Ptrs that are about to be
 deleted

---
 CHANGELOG.md                             |  1 +
 apps/openmw/mwbase/windowmanager.hpp     |  2 ++
 apps/openmw/mwclass/creature.cpp         |  1 +
 apps/openmw/mwclass/npc.cpp              |  1 +
 apps/openmw/mwgui/container.cpp          |  5 +++++
 apps/openmw/mwgui/container.hpp          |  2 ++
 apps/openmw/mwgui/containeritemmodel.cpp | 10 ++++++++++
 apps/openmw/mwgui/containeritemmodel.hpp |  2 ++
 apps/openmw/mwgui/hud.cpp                |  1 +
 apps/openmw/mwgui/inventoryitemmodel.cpp |  5 +++++
 apps/openmw/mwgui/inventoryitemmodel.hpp |  2 ++
 apps/openmw/mwgui/itemmodel.cpp          |  5 +++++
 apps/openmw/mwgui/itemmodel.hpp          |  4 ++++
 apps/openmw/mwgui/tradewindow.cpp        |  6 ++++++
 apps/openmw/mwgui/tradewindow.hpp        |  2 ++
 apps/openmw/mwgui/windowbase.hpp         |  2 ++
 apps/openmw/mwgui/windowmanagerimp.cpp   |  6 ++++++
 apps/openmw/mwgui/windowmanagerimp.hpp   |  2 ++
 apps/openmw/mwscript/statsextensions.cpp |  1 +
 19 files changed, 60 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 801b48a1a3..e45b808771 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
     Bug #3737: Scripts from The Underground 2 .esp do not play (all patched versions)
     Bug #3846: Strings starting with "-" fail to compile if not enclosed in quotes
     Bug #3905: Great House Dagoth issues
+    Bug #4203: Resurrecting an actor should close the loot GUI
     Bug #5100: Persuasion doesn't always clamp the resulting disposition
     Bug #5120: Scripted object spawning updates physics system
     Bug #5379: Wandering NPCs falling through cantons
diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index f256cc387e..961a63ac79 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -353,6 +353,8 @@ namespace MWBase
             virtual MWWorld::Ptr getWatchedActor() const = 0;
 
             virtual const std::string& getVersionDescription() const = 0;
+
+            virtual void onDeleteCustomData(const MWWorld::Ptr& ptr) = 0;
     };
 }
 
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 141bf99e92..7e231c60fe 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -830,6 +830,7 @@ namespace MWClass
                 }
 
                 MWBase::Environment::get().getWorld()->removeContainerScripts(ptr);
+                MWBase::Environment::get().getWindowManager()->onDeleteCustomData(ptr);
                 ptr.getRefData().setCustomData(nullptr);
 
                 // Reset to original position
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 5bf81caf9d..f7e78a299f 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -1384,6 +1384,7 @@ namespace MWClass
                 }
 
                 MWBase::Environment::get().getWorld()->removeContainerScripts(ptr);
+                MWBase::Environment::get().getWindowManager()->onDeleteCustomData(ptr);
                 ptr.getRefData().setCustomData(nullptr);
 
                 // Reset to original position
diff --git a/apps/openmw/mwgui/container.cpp b/apps/openmw/mwgui/container.cpp
index 4cdd8b137f..b649e41b0f 100644
--- a/apps/openmw/mwgui/container.cpp
+++ b/apps/openmw/mwgui/container.cpp
@@ -302,4 +302,9 @@ namespace MWGui
         return mModel->onTakeItem(item.mBase, count);
     }
 
+    void ContainerWindow::onDeleteCustomData(const MWWorld::Ptr& ptr)
+    {
+        if(mModel && mModel->usesContainer(ptr))
+            MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Container);
+    }
 }
diff --git a/apps/openmw/mwgui/container.hpp b/apps/openmw/mwgui/container.hpp
index 85c0dddc67..2a0dee44e2 100644
--- a/apps/openmw/mwgui/container.hpp
+++ b/apps/openmw/mwgui/container.hpp
@@ -35,6 +35,8 @@ namespace MWGui
 
         void resetReference() override;
 
+        void onDeleteCustomData(const MWWorld::Ptr& ptr) override;
+
     private:
         DragAndDrop* mDragAndDrop;
 
diff --git a/apps/openmw/mwgui/containeritemmodel.cpp b/apps/openmw/mwgui/containeritemmodel.cpp
index 56f084bb9d..a1e42ba45f 100644
--- a/apps/openmw/mwgui/containeritemmodel.cpp
+++ b/apps/openmw/mwgui/containeritemmodel.cpp
@@ -249,4 +249,14 @@ bool ContainerItemModel::onTakeItem(const MWWorld::Ptr &item, int count)
     return true;
 }
 
+bool ContainerItemModel::usesContainer(const MWWorld::Ptr& container)
+{
+    for(const auto& source : mItemSources)
+    {
+        if(source.first == container)
+            return true;
+    }
+    return false;
+}
+
 }
diff --git a/apps/openmw/mwgui/containeritemmodel.hpp b/apps/openmw/mwgui/containeritemmodel.hpp
index c54f113147..df2eebea22 100644
--- a/apps/openmw/mwgui/containeritemmodel.hpp
+++ b/apps/openmw/mwgui/containeritemmodel.hpp
@@ -36,6 +36,8 @@ namespace MWGui
 
         void update() override;
 
+        bool usesContainer(const MWWorld::Ptr& container) override;
+
     private:
         std::vector<std::pair<MWWorld::Ptr, MWWorld::ResolutionHandle>> mItemSources;
         std::vector<MWWorld::Ptr> mWorldItems;
diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp
index 45defe9a56..7e999bd582 100644
--- a/apps/openmw/mwgui/hud.cpp
+++ b/apps/openmw/mwgui/hud.cpp
@@ -57,6 +57,7 @@ namespace MWGui
         void update() override {}
         size_t getItemCount() override { return 0; }
         ItemStack getItem (ModelIndex index) override { throw std::runtime_error("getItem not implemented"); }
+        bool usesContainer(const MWWorld::Ptr&) override { return false; }
 
     private:
         // Where to drop the item
diff --git a/apps/openmw/mwgui/inventoryitemmodel.cpp b/apps/openmw/mwgui/inventoryitemmodel.cpp
index f2ff64aa16..91d2fdbf76 100644
--- a/apps/openmw/mwgui/inventoryitemmodel.cpp
+++ b/apps/openmw/mwgui/inventoryitemmodel.cpp
@@ -131,4 +131,9 @@ bool InventoryItemModel::onTakeItem(const MWWorld::Ptr &item, int count)
     return true;
 }
 
+bool InventoryItemModel::usesContainer(const MWWorld::Ptr& container)
+{
+    return mActor == container;
+}
+
 }
diff --git a/apps/openmw/mwgui/inventoryitemmodel.hpp b/apps/openmw/mwgui/inventoryitemmodel.hpp
index 30d17f3e6c..85e2a5a8d2 100644
--- a/apps/openmw/mwgui/inventoryitemmodel.hpp
+++ b/apps/openmw/mwgui/inventoryitemmodel.hpp
@@ -25,6 +25,8 @@ namespace MWGui
 
         void update() override;
 
+        bool usesContainer(const MWWorld::Ptr& container) override;
+
     protected:
         MWWorld::Ptr mActor;
     private:
diff --git a/apps/openmw/mwgui/itemmodel.cpp b/apps/openmw/mwgui/itemmodel.cpp
index 4e4d77da47..3db74916e5 100644
--- a/apps/openmw/mwgui/itemmodel.cpp
+++ b/apps/openmw/mwgui/itemmodel.cpp
@@ -162,4 +162,9 @@ namespace MWGui
     {
         return mSourceModel->onTakeItem(item, count);
     }
+
+    bool ProxyItemModel::usesContainer(const MWWorld::Ptr& container)
+    {
+        return mSourceModel->usesContainer(container);
+    }
 }
diff --git a/apps/openmw/mwgui/itemmodel.hpp b/apps/openmw/mwgui/itemmodel.hpp
index e120dde0fa..6ead0f8d1f 100644
--- a/apps/openmw/mwgui/itemmodel.hpp
+++ b/apps/openmw/mwgui/itemmodel.hpp
@@ -75,6 +75,8 @@ namespace MWGui
         virtual bool onDropItem(const MWWorld::Ptr &item, int count);
         virtual bool onTakeItem(const MWWorld::Ptr &item, int count);
 
+        virtual bool usesContainer(const MWWorld::Ptr& container) = 0;
+
     private:
         ItemModel(const ItemModel&);
         ItemModel& operator=(const ItemModel&);
@@ -103,6 +105,8 @@ namespace MWGui
 
         ModelIndex mapToSource (ModelIndex index);
         ModelIndex mapFromSource (ModelIndex index);
+
+        bool usesContainer(const MWWorld::Ptr& container) override;
     protected:
         ItemModel* mSourceModel;
     };
diff --git a/apps/openmw/mwgui/tradewindow.cpp b/apps/openmw/mwgui/tradewindow.cpp
index 19ea383483..7c68798f91 100644
--- a/apps/openmw/mwgui/tradewindow.cpp
+++ b/apps/openmw/mwgui/tradewindow.cpp
@@ -523,4 +523,10 @@ namespace MWGui
             return;
         resetReference();
     }
+
+    void TradeWindow::onDeleteCustomData(const MWWorld::Ptr& ptr)
+    {
+        if(mTradeModel && mTradeModel->usesContainer(ptr))
+            MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Barter);
+    }
 }
diff --git a/apps/openmw/mwgui/tradewindow.hpp b/apps/openmw/mwgui/tradewindow.hpp
index f82d7b0f72..5ace09e8e2 100644
--- a/apps/openmw/mwgui/tradewindow.hpp
+++ b/apps/openmw/mwgui/tradewindow.hpp
@@ -42,6 +42,8 @@ namespace MWGui
 
             void resetReference() override;
 
+            void onDeleteCustomData(const MWWorld::Ptr& ptr) override;
+
             typedef MyGUI::delegates::CMultiDelegate0 EventHandle_TradeDone;
             EventHandle_TradeDone eventTradeDone;
 
diff --git a/apps/openmw/mwgui/windowbase.hpp b/apps/openmw/mwgui/windowbase.hpp
index 90ef2118de..395bb8414f 100644
--- a/apps/openmw/mwgui/windowbase.hpp
+++ b/apps/openmw/mwgui/windowbase.hpp
@@ -47,6 +47,8 @@ namespace MWGui
         /// Called when GUI viewport changes size
         virtual void onResChange(int width, int height) {}
 
+        virtual void onDeleteCustomData(const MWWorld::Ptr& ptr) {}
+
     protected:
         virtual void onTitleDoubleClicked();
 
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 544a0927e7..96aee5297c 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -2220,4 +2220,10 @@ namespace MWGui
             messageBox(v.mMessage, v.mShowInDialogueMode);
         scheduledMessageBoxes->clear();
     }
+
+    void WindowManager::onDeleteCustomData(const MWWorld::Ptr& ptr)
+    {
+        for(auto* window : mWindows)
+            window->onDeleteCustomData(ptr);
+    }
 }
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index 8c7e365ec7..a213bd8a45 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -388,6 +388,8 @@ namespace MWGui
 
     const std::string& getVersionDescription() const override;
 
+    void onDeleteCustomData(const MWWorld::Ptr& ptr) override;
+
   private:
     unsigned int mOldUpdateMask; unsigned int mOldCullMask;
 
diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp
index 073312f538..fe2df68473 100644
--- a/apps/openmw/mwscript/statsextensions.cpp
+++ b/apps/openmw/mwscript/statsextensions.cpp
@@ -1205,6 +1205,7 @@ namespace MWScript
                         bool wasEnabled = ptr.getRefData().isEnabled();
                         MWBase::Environment::get().getWorld()->undeleteObject(ptr);
                         MWBase::Environment::get().getWorld()->removeContainerScripts(ptr);
+                        MWBase::Environment::get().getWindowManager()->onDeleteCustomData(ptr);
 
                         // HACK: disable/enable object to re-add it to the scene properly (need a new Animation).
                         MWBase::Environment::get().getWorld()->disable(ptr);

From 08a9abc46f313e55d8e7c70dcb9fb6003798e2ed Mon Sep 17 00:00:00 2001
From: Bret Curtis <bret.curtis@gmail.com>
Date: Fri, 16 Jul 2021 16:35:03 +0200
Subject: [PATCH 1032/2859] get openmw building with LuaJIT on macos

---
 CI/before_install.osx.sh | 2 +-
 CI/before_script.osx.sh  | 1 -
 CMakeLists.txt           | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index d962e76086..d0b5b6a0aa 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -17,7 +17,7 @@ qmake --version
 
 brew install lua
 
-curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/macos/openmw-deps-20210617.zip -o ~/openmw-deps.zip
+curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/macos/openmw-deps-20210716.zip -o ~/openmw-deps.zip
 unzip -o ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null
 
 # additional libraries
diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh
index 27667c1c82..265e05b8ee 100755
--- a/CI/before_script.osx.sh
+++ b/CI/before_script.osx.sh
@@ -25,6 +25,5 @@ cmake \
 -D BUILD_BSATOOL=TRUE \
 -D BUILD_ESSIMPORTER=TRUE \
 -D BUILD_NIFTEST=TRUE \
--D USE_LUAJIT=FALSE \
 -G"Unix Makefiles" \
 ..
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f81af9e38b..b69cb5b71f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -678,7 +678,7 @@ if (WIN32)
     if (BUILD_OPENMW)
         # \bigobj is required:
         #  1) for OPENMW_UNITY_BUILD;
-        #  2) to compile lua binginds, because sol3 is heavily templated.
+        #  2) to compile lua bindings, because sol3 is heavily templated.
         set_target_properties(openmw PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD} /bigobj")
     endif()
 

From 6bcb7a86ddee8b8a2d2100abb24fdb0636f880b9 Mon Sep 17 00:00:00 2001
From: Bret Curtis <bret.curtis@gmail.com>
Date: Fri, 16 Jul 2021 20:01:12 +0200
Subject: [PATCH 1033/2859] update brew; remove need for brew install lua

---
 CI/before_install.osx.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index d0b5b6a0aa..81a89f4796 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -1,11 +1,15 @@
 #!/bin/sh -ex
 
+export HOMEBREW_NO_EMOJI=1
+brew update --quiet
+
 # 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
+[ -z "${TRAVIS}" ] brew uninstall --ignore-dependencies python@3.8 || true
+[ -z "${TRAVIS}" ] brew uninstall --ignore-dependencies python@3.9 || true
+[ -z "${TRAVIS}" ] brew uninstall --ignore-dependencies qt@6 || true
 
 # Some of these tools can come from places other than brew, so check before installing
+[ -z "${TRAVIS}" ] brew install fontconfig
 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
@@ -15,10 +19,6 @@ ccache --version
 cmake --version
 qmake --version
 
-brew install lua
-
 curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/macos/openmw-deps-20210716.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

From 4396a2e27a9a15eefec7a3800257da25e7eba290 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Fri, 16 Jul 2021 21:09:11 +0200
Subject: [PATCH 1034/2859] Build __everything__ in coverity

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 47c3426913..d0f7ba3f4d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,7 +43,7 @@ Coverity:
   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
+    - cov-analysis-linux64-*/bin/cov-build --dir cov-int cmake --build build -- -j $(nproc)
   after_script:
     - tar cfz cov-int.tar.gz cov-int
     - curl https://scan.coverity.com/builds?project=$COVERITY_SCAN_PROJECT_NAME

From c2c754b1cc21c59a90ec3cae516af4b424a3ae08 Mon Sep 17 00:00:00 2001
From: Bret Curtis <bret.curtis@gmail.com>
Date: Fri, 16 Jul 2021 23:18:28 +0200
Subject: [PATCH 1035/2859] typo

---
 CI/before_install.osx.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index 81a89f4796..5007db26ea 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -4,9 +4,9 @@ export HOMEBREW_NO_EMOJI=1
 brew update --quiet
 
 # workaround python issue on travis
-[ -z "${TRAVIS}" ] brew uninstall --ignore-dependencies python@3.8 || true
-[ -z "${TRAVIS}" ] brew uninstall --ignore-dependencies python@3.9 || true
-[ -z "${TRAVIS}" ] brew uninstall --ignore-dependencies qt@6 || true
+[ -z "${TRAVIS}" ] && brew uninstall --ignore-dependencies python@3.8 || true
+[ -z "${TRAVIS}" ] && brew uninstall --ignore-dependencies python@3.9 || true
+[ -z "${TRAVIS}" ] && brew uninstall --ignore-dependencies qt@6 || true
 
 # Some of these tools can come from places other than brew, so check before installing
 [ -z "${TRAVIS}" ] brew install fontconfig

From ae5302f9cf7b6417fe8c807fe7a7e2883518e67e Mon Sep 17 00:00:00 2001
From: Bret Curtis <bret.curtis@gmail.com>
Date: Sat, 17 Jul 2021 10:14:04 +0200
Subject: [PATCH 1036/2859] typo2

---
 CI/before_install.osx.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index 5007db26ea..ec4ece6343 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -9,7 +9,7 @@ brew update --quiet
 [ -z "${TRAVIS}" ] && brew uninstall --ignore-dependencies qt@6 || true
 
 # Some of these tools can come from places other than brew, so check before installing
-[ -z "${TRAVIS}" ] brew install fontconfig
+[ -z "${TRAVIS}" ] && brew install fontconfig
 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

From 62ef708910c7c900e87c24076da29ad7576533e3 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sat, 17 Jul 2021 08:54:20 +0200
Subject: [PATCH 1037/2859] Do not store a btTransform into Actor class: reduce
 its size by 128 bytes

---
 apps/openmw/mwphysics/actor.cpp | 14 ++++++++------
 apps/openmw/mwphysics/actor.hpp |  7 +++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index 4df5646516..50b400c2ac 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -147,18 +147,20 @@ void Actor::updateCollisionObjectPosition()
 {
     std::scoped_lock lock(mPositionMutex);
     mShape->setLocalScaling(Misc::Convert::toBullet(mScale));
-    osg::Vec3f scaledTranslation = mRotation * osg::componentMultiply(mMeshTranslation, mScale);
-    osg::Vec3f newPosition = scaledTranslation + mPosition;
-    mLocalTransform.setOrigin(Misc::Convert::toBullet(newPosition));
-    mLocalTransform.setRotation(Misc::Convert::toBullet(mRotation));
-    mCollisionObject->setWorldTransform(mLocalTransform);
+    osg::Vec3f newPosition = getScaledMeshTranslation() + mPosition;
+
+    auto& trans = mCollisionObject->getWorldTransform();
+    trans.setOrigin(Misc::Convert::toBullet(newPosition));
+    trans.setRotation(Misc::Convert::toBullet(mRotation));
+    mCollisionObject->setWorldTransform(trans);
+
     mWorldPositionChanged = false;
 }
 
 osg::Vec3f Actor::getCollisionObjectPosition() const
 {
     std::scoped_lock lock(mPositionMutex);
-    return Misc::Convert::toOsg(mLocalTransform.getOrigin());
+    return getScaledMeshTranslation() + mPosition;
 }
 
 bool Actor::setPosition(const osg::Vec3f& position)
diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index 8bbb90dbed..3925edf59f 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -74,9 +74,6 @@ namespace MWPhysics
          */
         osg::Vec3f getOriginalHalfExtents() const;
 
-        /// Returns the mesh translation, scaled and rotated as necessary
-        osg::Vec3f getScaledMeshTranslation() const;
-
         /**
          * Returns the position of the collision body
          * @note The collision shape's origin is in its center, so the position returned can be described as center of the actor collision box in world space.
@@ -181,6 +178,9 @@ namespace MWPhysics
         void addCollisionMask(int collisionMask);
         int getCollisionMask() const;
 
+        /// Returns the mesh translation, scaled and rotated as necessary
+        osg::Vec3f getScaledMeshTranslation() const;
+
         bool mCanWaterWalk;
         std::atomic<bool> mWalkingOnWater;
 
@@ -205,7 +205,6 @@ namespace MWPhysics
         bool mWorldPositionChanged;
         bool mSkipCollisions;
         bool mSkipSimulation;
-        btTransform mLocalTransform;
         mutable std::mutex mPositionMutex;
 
         unsigned int mStuckFrames;

From f02d01ef0c80592bad39fdff297c8b1cc7b3fd1e Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sat, 17 Jul 2021 08:55:39 +0200
Subject: [PATCH 1038/2859] Do not store btTransform into Object class: reduce
 its size by 104 bytes

---
 apps/openmw/mwphysics/object.cpp        | 18 ++++++++++++------
 apps/openmw/mwphysics/object.hpp        |  6 +++---
 apps/openmw/mwphysics/physicssystem.cpp |  2 +-
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwphysics/object.cpp b/apps/openmw/mwphysics/object.cpp
index 2a94d28f12..9575a97da2 100644
--- a/apps/openmw/mwphysics/object.cpp
+++ b/apps/openmw/mwphysics/object.cpp
@@ -28,7 +28,7 @@ namespace MWPhysics
 
         setScale(ptr.getCellRef().getScale());
         setRotation(rotation);
-        setOrigin(Misc::Convert::toBullet(ptr.getRefData().getPosition().asVec3()));
+        updatePosition();
         commitPositionChange();
 
         mTaskScheduler->addCollisionObject(mCollisionObject.get(), collisionType, CollisionType_Actor|CollisionType_HeightMap|CollisionType_Projectile);
@@ -54,14 +54,14 @@ namespace MWPhysics
     void Object::setRotation(osg::Quat quat)
     {
         std::unique_lock<std::mutex> lock(mPositionMutex);
-        mLocalTransform.setRotation(Misc::Convert::toBullet(quat));
+        mRotation = quat;
         mTransformUpdatePending = true;
     }
 
-    void Object::setOrigin(const btVector3& vec)
+    void Object::updatePosition()
     {
         std::unique_lock<std::mutex> lock(mPositionMutex);
-        mLocalTransform.setOrigin(vec);
+        mPosition = mPtr.getRefData().getPosition().asVec3();
         mTransformUpdatePending = true;
     }
 
@@ -75,7 +75,10 @@ namespace MWPhysics
         }
         if (mTransformUpdatePending)
         {
-            mCollisionObject->setWorldTransform(mLocalTransform);
+            btTransform trans;
+            trans.setOrigin(Misc::Convert::toBullet(mPosition));
+            trans.setRotation(Misc::Convert::toBullet(mRotation));
+            mCollisionObject->setWorldTransform(trans);
             mTransformUpdatePending = false;
         }
     }
@@ -93,7 +96,10 @@ namespace MWPhysics
     btTransform Object::getTransform() const
     {
         std::unique_lock<std::mutex> lock(mPositionMutex);
-        return mLocalTransform;
+        btTransform trans;
+        trans.setOrigin(Misc::Convert::toBullet(mPosition));
+        trans.setRotation(Misc::Convert::toBullet(mRotation));
+        return trans;
     }
 
     bool Object::isSolid() const
diff --git a/apps/openmw/mwphysics/object.hpp b/apps/openmw/mwphysics/object.hpp
index c2273831e5..fe395dc89b 100644
--- a/apps/openmw/mwphysics/object.hpp
+++ b/apps/openmw/mwphysics/object.hpp
@@ -16,7 +16,6 @@ namespace Resource
 }
 
 class btCollisionObject;
-class btQuaternion;
 class btVector3;
 
 namespace MWPhysics
@@ -32,7 +31,7 @@ namespace MWPhysics
         const Resource::BulletShapeInstance* getShapeInstance() const;
         void setScale(float scale);
         void setRotation(osg::Quat quat);
-        void setOrigin(const btVector3& vec);
+        void updatePosition();
         void commitPositionChange();
         btCollisionObject* getCollisionObject();
         const btCollisionObject* getCollisionObject() const;
@@ -51,7 +50,8 @@ namespace MWPhysics
         std::map<int, osg::NodePath> mRecIndexToNodePath;
         bool mSolid;
         btVector3 mScale;
-        btTransform mLocalTransform;
+        osg::Vec3f mPosition;
+        osg::Quat mRotation;
         bool mScaleUpdatePending;
         bool mTransformUpdatePending;
         mutable std::mutex mPositionMutex;
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index e5bd936abb..69a4d8d478 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -658,7 +658,7 @@ namespace MWPhysics
         ObjectMap::iterator found = mObjects.find(ptr);
         if (found != mObjects.end())
         {
-            found->second->setOrigin(Misc::Convert::toBullet(ptr.getRefData().getPosition().asVec3()));
+            found->second->updatePosition();
             mTaskScheduler->updateSingleAabb(found->second);
             return;
         }

From 44f822da56755451a83e73dbd324f43fe949ed5f Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sat, 17 Jul 2021 08:56:43 +0200
Subject: [PATCH 1039/2859] Do not store a btTransform into Projectile class:
 reduce its size by 112 bytes

---
 apps/openmw/mwphysics/projectile.cpp | 11 +++++------
 apps/openmw/mwphysics/projectile.hpp |  5 +++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwphysics/projectile.cpp b/apps/openmw/mwphysics/projectile.cpp
index 0a6e9ac123..1a94de01ee 100644
--- a/apps/openmw/mwphysics/projectile.cpp
+++ b/apps/openmw/mwphysics/projectile.cpp
@@ -3,14 +3,11 @@
 #include <BulletCollision/CollisionShapes/btSphereShape.h>
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 
-#include <LinearMath/btVector3.h>
-
 #include <components/misc/convert.hpp>
 
 #include "../mwworld/class.hpp"
 
 #include "collisiontype.hpp"
-#include "memory"
 #include "mtphysics.hpp"
 #include "projectile.hpp"
 
@@ -55,7 +52,9 @@ void Projectile::commitPositionChange()
     std::scoped_lock lock(mMutex);
     if (mTransformUpdatePending)
     {
-        mCollisionObject->setWorldTransform(mLocalTransform);
+        auto& trans = mCollisionObject->getWorldTransform();
+        trans.setOrigin(Misc::Convert::toBullet(mPosition));
+        mCollisionObject->setWorldTransform(trans);
         mTransformUpdatePending = false;
     }
 }
@@ -63,14 +62,14 @@ void Projectile::commitPositionChange()
 void Projectile::setPosition(const osg::Vec3f &position)
 {
     std::scoped_lock lock(mMutex);
-    mLocalTransform.setOrigin(Misc::Convert::toBullet(position));
+    mPosition = position;
     mTransformUpdatePending = true;
 }
 
 osg::Vec3f Projectile::getPosition() const
 {
     std::scoped_lock lock(mMutex);
-    return Misc::Convert::toOsg(mLocalTransform.getOrigin());
+    return mPosition;
 }
 
 bool Projectile::canTraverseWater() const
diff --git a/apps/openmw/mwphysics/projectile.hpp b/apps/openmw/mwphysics/projectile.hpp
index 7bcf33b38d..f18c455020 100644
--- a/apps/openmw/mwphysics/projectile.hpp
+++ b/apps/openmw/mwphysics/projectile.hpp
@@ -6,12 +6,13 @@
 #include <mutex>
 #include <optional>
 
+#include <LinearMath/btVector3.h>
+
 #include "ptrholder.hpp"
 
 class btCollisionObject;
 class btCollisionShape;
 class btConvexShape;
-class btVector3;
 
 namespace osg
 {
@@ -76,7 +77,6 @@ namespace MWPhysics
         btConvexShape* mConvexShape;
 
         std::unique_ptr<btCollisionObject> mCollisionObject;
-        btTransform mLocalTransform;
         bool mTransformUpdatePending;
         bool mCanCrossWaterSurface;
         bool mCrossedWaterSurface;
@@ -84,6 +84,7 @@ namespace MWPhysics
         MWWorld::Ptr mCaster;
         MWWorld::Ptr mHitTarget;
         std::optional<btVector3> mWaterHitPosition;
+        osg::Vec3f mPosition;
         btVector3 mHitPosition;
         btVector3 mHitNormal;
 

From f92843e3d28b044cdcb2892a8ff944e46ffeeb66 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 17 Jul 2021 17:40:32 +0200
Subject: [PATCH 1040/2859] Fix UB: reference binding to misaligned address in
 Lua tests

/home/elsid/dev/openmw/apps/openmw_test_suite/lua/test_serialization.cpp:166:34: runtime error: reference binding to misaligned address 0x562ea892076c for type 'const struct TestStruct1', which requires 8 byte alignment
0x562ea892076c: note: pointer points here
  00 74 73 31 00 00 00 00  00 00 f8 3f 00 00 00 00  00 00 04 40 21 79 4b 08  00 00 00 74 65 73 74 5f
              ^
    #0 0x562ea6462b8e in deserialize /home/elsid/dev/openmw/apps/openmw_test_suite/lua/test_serialization.cpp:166
    #1 0x562ea68b7402 in deserializeImpl /home/elsid/dev/openmw/components/lua/serialization.cpp:172
    #2 0x562ea68b7bf6 in deserializeImpl /home/elsid/dev/openmw/components/lua/serialization.cpp:204
    #3 0x562ea68b86ea in LuaUtil::deserialize(sol::state&, std::basic_string_view<char, std::char_traits<char> >, LuaUtil::UserdataSerializer const*) /home/elsid/dev/openmw/components/lua/serialization.cpp:251
    #4 0x562ea6464d96 in TestBody /home/elsid/dev/openmw/apps/openmw_test_suite/lua/test_serialization.cpp:197
    #5 0x562ea6d9dac6 in void testing::internal::HandleSehExceptionsInMethodIfSupported<testing::Test, void>(testing::Test*, void (testing::Test::*)(), char const*) /home/elsid/dev/googletest/googletest/src/gtest.cc:2607
    #6 0x562ea6d9dac6 in void testing::internal::HandleExceptionsInMethodIfSupported<testing::Test, void>(testing::Test*, void (testing::Test::*)(), char const*) /home/elsid/dev/googletest/googletest/src/gtest.cc:2643
    #7 0x562ea6d92e25 in testing::Test::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:2682
    #8 0x562ea6d92e25 in testing::Test::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:2672
    #9 0x562ea6d93024 in testing::TestInfo::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:2861
    #10 0x562ea6d93728 in testing::TestInfo::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:2834
    #11 0x562ea6d93728 in testing::TestSuite::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:3015
    #12 0x562ea6d94142 in testing::TestSuite::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:2994
    #13 0x562ea6d94142 in testing::internal::UnitTestImpl::RunAllTests() /home/elsid/dev/googletest/googletest/src/gtest.cc:5855
    #14 0x562ea6d9e096 in bool testing::internal::HandleSehExceptionsInMethodIfSupported<testing::internal::UnitTestImpl, bool>(testing::internal::UnitTestImpl*, bool (testing::internal::UnitTestImpl::*)(), char const*) /home/elsid/dev/googletest/googletest/src/gtest.cc:2607
    #15 0x562ea6d9e096 in bool testing::internal::HandleExceptionsInMethodIfSupported<testing::internal::UnitTestImpl, bool>(testing::internal::UnitTestImpl*, bool (testing::internal::UnitTestImpl::*)(), char const*) /home/elsid/dev/googletest/googletest/src/gtest.cc:2643
    #16 0x562ea6d93140 in testing::UnitTest::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:5438
    #17 0x562ea5d3fdc6 in RUN_ALL_TESTS() /home/elsid/dev/googletest/build/gcc/release/install/include/gtest/gtest.h:2490
    #18 0x562ea5d3fc6f in main /home/elsid/dev/openmw/apps/openmw_test_suite/openmw_test_suite.cpp:11
    #19 0x7fe3938d0b24 in __libc_start_main (/usr/lib/libc.so.6+0x27b24)
    #20 0x562ea5d3fb7d in _start (/home/elsid/dev/openmw/build/gcc/ubsan/openmw_test_suite+0x173eb7d)

/home/elsid/dev/openmw/apps/openmw_test_suite/lua/test_serialization.cpp:176:34: runtime error: reference binding to misaligned address 0x562ea892078f for type 'const struct TestStruct2', which requires 4 byte alignment
0x562ea892078f: note: pointer points here
 75 63 74 32 04  00 00 00 03 00 00 00 04  00 6e 64 69 74 69 6f 6e  73 00 73 68 61 70 65 00  51 00 00
             ^
    #0 0x562ea6462df9 in deserialize /home/elsid/dev/openmw/apps/openmw_test_suite/lua/test_serialization.cpp:176
    #1 0x562ea68b7402 in deserializeImpl /home/elsid/dev/openmw/components/lua/serialization.cpp:172
    #2 0x562ea68b7bf6 in deserializeImpl /home/elsid/dev/openmw/components/lua/serialization.cpp:204
    #3 0x562ea68b86ea in LuaUtil::deserialize(sol::state&, std::basic_string_view<char, std::char_traits<char> >, LuaUtil::UserdataSerializer const*) /home/elsid/dev/openmw/components/lua/serialization.cpp:251
    #4 0x562ea6464d96 in TestBody /home/elsid/dev/openmw/apps/openmw_test_suite/lua/test_serialization.cpp:197
    #5 0x562ea6d9dac6 in void testing::internal::HandleSehExceptionsInMethodIfSupported<testing::Test, void>(testing::Test*, void (testing::Test::*)(), char const*) /home/elsid/dev/googletest/googletest/src/gtest.cc:2607
    #6 0x562ea6d9dac6 in void testing::internal::HandleExceptionsInMethodIfSupported<testing::Test, void>(testing::Test*, void (testing::Test::*)(), char const*) /home/elsid/dev/googletest/googletest/src/gtest.cc:2643
    #7 0x562ea6d92e25 in testing::Test::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:2682
    #8 0x562ea6d92e25 in testing::Test::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:2672
    #9 0x562ea6d93024 in testing::TestInfo::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:2861
    #10 0x562ea6d93728 in testing::TestInfo::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:2834
    #11 0x562ea6d93728 in testing::TestSuite::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:3015
    #12 0x562ea6d94142 in testing::TestSuite::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:2994
    #13 0x562ea6d94142 in testing::internal::UnitTestImpl::RunAllTests() /home/elsid/dev/googletest/googletest/src/gtest.cc:5855
    #14 0x562ea6d9e096 in bool testing::internal::HandleSehExceptionsInMethodIfSupported<testing::internal::UnitTestImpl, bool>(testing::internal::UnitTestImpl*, bool (testing::internal::UnitTestImpl::*)(), char const*) /home/elsid/dev/googletest/googletest/src/gtest.cc:2607
    #15 0x562ea6d9e096 in bool testing::internal::HandleExceptionsInMethodIfSupported<testing::internal::UnitTestImpl, bool>(testing::internal::UnitTestImpl*, bool (testing::internal::UnitTestImpl::*)(), char const*) /home/elsid/dev/googletest/googletest/src/gtest.cc:2643
    #16 0x562ea6d93140 in testing::UnitTest::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:5438
    #17 0x562ea5d3fdc6 in RUN_ALL_TESTS() /home/elsid/dev/googletest/build/gcc/release/install/include/gtest/gtest.h:2490
    #18 0x562ea5d3fc6f in main /home/elsid/dev/openmw/apps/openmw_test_suite/openmw_test_suite.cpp:11
    #19 0x7fe3938d0b24 in __libc_start_main (/usr/lib/libc.so.6+0x27b24)
    #20 0x562ea5d3fb7d in _start (/home/elsid/dev/openmw/build/gcc/ubsan/openmw_test_suite+0x173eb7d)
---
 apps/openmw_test_suite/lua/test_serialization.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/openmw_test_suite/lua/test_serialization.cpp b/apps/openmw_test_suite/lua/test_serialization.cpp
index d3c01f6298..f8c6960c51 100644
--- a/apps/openmw_test_suite/lua/test_serialization.cpp
+++ b/apps/openmw_test_suite/lua/test_serialization.cpp
@@ -163,7 +163,8 @@ namespace
             {
                 if (sizeof(TestStruct1) != binaryData.size())
                     throw std::runtime_error("Incorrect binaryData.size() for TestStruct1: " + std::to_string(binaryData.size()));
-                TestStruct1 t = *reinterpret_cast<const TestStruct1*>(binaryData.data());
+                TestStruct1 t;
+                std::memcpy(&t, binaryData.data(), sizeof(t));
                 t.a = Misc::fromLittleEndian(t.a);
                 t.b = Misc::fromLittleEndian(t.b);
                 sol::stack::push<TestStruct1>(lua, t);
@@ -173,7 +174,8 @@ namespace
             {
                 if (sizeof(TestStruct2) != binaryData.size())
                     throw std::runtime_error("Incorrect binaryData.size() for TestStruct2: " + std::to_string(binaryData.size()));
-                TestStruct2 t = *reinterpret_cast<const TestStruct2*>(binaryData.data());
+                TestStruct2 t;
+                std::memcpy(&t, binaryData.data(), sizeof(t));
                 t.a = Misc::fromLittleEndian(t.a);
                 t.b = Misc::fromLittleEndian(t.b);
                 sol::stack::push<TestStruct2>(lua, t);

From d4e149409fef63dfc6d7f6659913f4141e9f76c4 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sat, 17 Jul 2021 19:55:30 +0200
Subject: [PATCH 1041/2859] Hardcode coverity targets for now

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d0f7ba3f4d..6daa6ab758 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,8 +42,8 @@ Coverity:
     - 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)
+    # Remove the specific targets and build everything once we can do it under 3h
+    - cov-analysis-linux64-*/bin/cov-build --dir cov-int cmake --build build -- -j $(nproc) openmw esmtool bsatool openmw-wizard openmw-launcher openmw-iniimporter openmw-essimporter
   after_script:
     - tar cfz cov-int.tar.gz cov-int
     - curl https://scan.coverity.com/builds?project=$COVERITY_SCAN_PROJECT_NAME

From 5ec2ddb4a09b0a0735b8098bd795d77bc7b1a4e9 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Sat, 17 Jul 2021 20:47:55 +0100
Subject: [PATCH 1042/2859] Actually increment iterators to be erased.

---
 components/shader/shadervisitor.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 25dfa4af1e..67a8ec86ad 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -598,7 +598,7 @@ namespace Shader
             for (auto itr = writableStateSet->getUniformList().begin(); itr != writableStateSet->getUniformList().end();)
             {
                 if (addedState->hasUniform(itr->first))
-                    writableStateSet->getUniformList().erase(itr);
+                    writableStateSet->getUniformList().erase(itr++);
                 else
                     ++itr;
             }
@@ -606,7 +606,7 @@ namespace Shader
             for (auto itr = writableStateSet->getModeList().begin(); itr != writableStateSet->getModeList().end();)
             {
                 if (addedState->hasMode(itr->first))
-                    writableStateSet->getModeList().erase(itr);
+                    writableStateSet->getModeList().erase(itr++);
                 else
                     ++itr;
             }

From b95cf4fd00c226094cbaec21a35dabf2cbd8890d Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 18 Jul 2021 15:04:25 +0200
Subject: [PATCH 1043/2859] Set the ptr's custom data before filling the store
 so leveled lists have access to the level

---
 apps/openmw/mwclass/npc.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index f7e78a299f..691dfe5871 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -383,15 +383,15 @@ namespace MWClass
             if (!spellsInitialised)
                 data->mNpcStats.getSpells().addAllToInstance(ref->mBase->mSpells.mList);
 
-            // inventory
-            // setting ownership is used to make the NPC auto-equip his initial equipment only, and not bartered items
-            data->mInventoryStore.fill(ref->mBase->mInventory, ptr.getCellRef().getRefId());
-
             data->mNpcStats.setGoldPool(gold);
 
             // store
             ptr.getRefData().setCustomData(std::move(data));
 
+            // inventory
+            // setting ownership is used to make the NPC auto-equip his initial equipment only, and not bartered items
+            getInventoryStore(ptr).fill(ref->mBase->mInventory, ptr.getCellRef().getRefId());
+
             getInventoryStore(ptr).autoEquip(ptr);
         }
     }

From 36657698fb46b2af751f2f25f0fbd0e5efb9bf7f Mon Sep 17 00:00:00 2001
From: Nuri <nurivan.gomez@gmail.com>
Date: Wed, 21 Jul 2021 07:46:02 +0000
Subject: [PATCH 1044/2859] Added checks for paralysis, knocked down, and death
 when picking up items from inventory. Fixes #6165

---
 AUTHORS.md                            | 1 +
 CHANGELOG.md                          | 1 +
 apps/openmw/mwgui/inventorywindow.cpp | 7 +++++++
 3 files changed, 9 insertions(+)

diff --git a/AUTHORS.md b/AUTHORS.md
index aa492f6c1e..beb2b490f2 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -159,6 +159,7 @@ Programmers
     Nikolay Kasyanov (corristo)
     nobrakal
     Nolan Poe (nopoe)
+    Nurivan Gomez (Nuri-G)
     Oleg Chkan (mrcheko)
     Paul Cercueil (pcercuei)
     Paul McElroy (Greendogo)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e45b808771..36cde3b894 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@
     Bug #6131: Item selection in the avatar window not working correctly for large window sizes
     Bug #6133: Cannot reliably sneak or steal in the sight of the NPCs siding with player
     Bug #6143: Capturing a screenshot makes engine to be a temporary unresponsive
+    Bug #6165: Paralyzed player character can pickup items when the inventory is open
     Feature #2780: A way to see current OpenMW version in the console
     Feature #5489: MCP: Telekinesis fix for activators
     Feature #5996: Support Lua scripts in OpenMW
diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index 5f18fba91f..eead3919e0 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -29,6 +29,7 @@
 
 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/creaturestats.hpp"
+#include "../mwmechanics/npcstats.hpp"
 
 #include "itemview.hpp"
 #include "inventoryitemmodel.hpp"
@@ -732,6 +733,12 @@ namespace MWGui
         if (!object.getRefData().activate())
             return;
 
+        // Player must not be paralyzed, knocked down, or dead to pick up an item.
+        const MWMechanics::NpcStats& playerStats = player.getClass().getNpcStats(player);
+        bool godmode = MWBase::Environment::get().getWorld()->getGodModeState();
+        if ((!godmode && playerStats.isParalyzed()) || playerStats.getKnockedDown() || playerStats.isDead())
+            return;
+
         MWBase::Environment::get().getMechanicsManager()->itemTaken(player, object, MWWorld::Ptr(), count);
 
         // add to player inventory

From d2b935684d6b8e25de4dcde99a8c978b38687faa Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 21 Jul 2021 11:37:50 +0200
Subject: [PATCH 1045/2859] Add missing include

---
 components/detournavigator/ref.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/detournavigator/ref.hpp b/components/detournavigator/ref.hpp
index d800bde8f8..5a9e49e22a 100644
--- a/components/detournavigator/ref.hpp
+++ b/components/detournavigator/ref.hpp
@@ -3,6 +3,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <iterator>
 
 namespace DetourNavigator
 {

From 5e3f000b667a5993f7149ad323c4fdfe12cf9848 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Wed, 21 Jul 2021 14:40:54 +0200
Subject: [PATCH 1046/2859] Add a std::noboolalpha to a std::boolalpha

---
 apps/esmtool/esmtool.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp
index dc893061a7..bf5f47a76d 100644
--- a/apps/esmtool/esmtool.cpp
+++ b/apps/esmtool/esmtool.cpp
@@ -278,7 +278,7 @@ void loadCell(ESM::Cell &cell, ESM::ESMReader &esm, Arguments& info)
             if (!ref.mDestCell.empty())
                 std::cout << "    Destination cell: " << ref.mDestCell << '\n';
         }
-        std::cout << "    Moved: " << std::boolalpha << moved << '\n';
+        std::cout << "    Moved: " << std::boolalpha << moved << std::noboolalpha << '\n';
         if (moved)
         {
             std::cout << "    Moved refnum: " << movedCellRef.mRefNum.mIndex << '\n';

From 7b32458aec8324e050bfac19e44f1829b234cbc2 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Wed, 21 Jul 2021 15:38:41 +0200
Subject: [PATCH 1047/2859] Improve a bit two esmreader logging call

---
 components/esm/esmreader.cpp | 5 ++---
 components/esm/esmreader.hpp | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/components/esm/esmreader.cpp b/components/esm/esmreader.cpp
index 0cf7c3f81f..dbf713315b 100644
--- a/components/esm/esmreader.cpp
+++ b/components/esm/esmreader.cpp
@@ -125,8 +125,7 @@ void ESMReader::getHExact(void*p, int size)
 {
     getSubHeader();
     if (size != static_cast<int> (mCtx.leftSub))
-        fail("Size mismatch, requested " + std::to_string(size) + " but got "
-                + std::to_string(mCtx.leftSub));
+        reportSubSizeMismatch(size, mCtx.leftSub);
     getExact(p, size);
 }
 
@@ -264,7 +263,7 @@ void ESMReader::getRecHeader(uint32_t &flags)
 
     // Check that sizes add up
     if (mCtx.leftFile < mCtx.leftRec)
-        fail("Record size is larger than rest of file");
+        reportSubSizeMismatch(mCtx.leftFile, mCtx.leftRec);
 
     // Adjust number of bytes mCtx.left in file
     mCtx.leftFile -= mCtx.leftRec;
diff --git a/components/esm/esmreader.hpp b/components/esm/esmreader.hpp
index 608222a1bb..a438dca0cd 100644
--- a/components/esm/esmreader.hpp
+++ b/components/esm/esmreader.hpp
@@ -258,7 +258,7 @@ public:
 
 private:
   [[noreturn]] void reportSubSizeMismatch(size_t want, size_t got) {
-          fail("subrecord size mismatch, requested " +
+          fail("record size mismatch, requested " +
                   std::to_string(want) +
                   ", got" +
                   std::to_string(got));

From 5f84494046003933a0d3f5b691b85c43b8e8eaf3 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 21 Jul 2021 16:00:25 +0000
Subject: [PATCH 1048/2859] Fail on invalid water levels

---
 CHANGELOG.md                |  1 +
 components/esm/loadcell.cpp | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36cde3b894..ff4996d05c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
     Bug #5483: AutoCalc flag is not used to calculate spells cost
     Bug #5842: GetDisposition adds temporary disposition change from different actors
     Bug #6037: Morrowind Content Language Cannot be Set to English in OpenMW Launcher
+    Bug #6051: NaN water height in ESM file is not handled gracefully
     Bug #6066: addtopic "return" does not work from within script. No errors thrown
     Bug #6067: esp loader fails in for certain subrecord orders
     Bug #6101: Disarming trapped unlocked owned objects isn't considered a crime
diff --git a/components/esm/loadcell.cpp b/components/esm/loadcell.cpp
index 562e8f643a..f84373fb9d 100644
--- a/components/esm/loadcell.cpp
+++ b/components/esm/loadcell.cpp
@@ -1,10 +1,12 @@
 #include "loadcell.hpp"
 
 #include <string>
+#include <limits>
 #include <list>
 
 #include <boost/concept_check.hpp>
 
+#include <components/debug/debuglog.hpp>
 #include <components/misc/stringops.hpp>
 
 #include "esmreader.hpp"
@@ -109,6 +111,7 @@ namespace ESM
 
     void Cell::loadCell(ESMReader &esm, bool saveContext)
     {
+        bool overriding = !mName.empty();
         bool isLoaded = false;
         mHasAmbi = false;
         while (!isLoaded && esm.hasMoreSubs())
@@ -123,8 +126,17 @@ namespace ESM
                     mWaterInt = true;
                     break;
                 case ESM::FourCC<'W','H','G','T'>::value:
-                    esm.getHT(mWater);
+                    float waterLevel;
+                    esm.getHT(waterLevel);
                     mWaterInt = false;
+                    if(!std::isfinite(waterLevel))
+                    {
+                        if(!overriding)
+                            mWater = std::numeric_limits<float>::max();
+                        Log(Debug::Warning) << "Warning: Encountered invalid water level in cell " << mName << " defined in " << esm.getContext().filename;
+                    }
+                    else
+                        mWater = waterLevel;
                     break;
                 case ESM::FourCC<'A','M','B','I'>::value:
                     esm.getHT(mAmbi);

From f86ddef4db416d2a397f34c15cfd9e7c8a7af66c Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Thu, 22 Jul 2021 15:15:41 +0200
Subject: [PATCH 1049/2859] Minor code cleanup

---
 apps/openmw/mwinput/actionmanager.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwinput/actionmanager.cpp b/apps/openmw/mwinput/actionmanager.cpp
index e0fcc5ccfc..c91722fbfb 100644
--- a/apps/openmw/mwinput/actionmanager.cpp
+++ b/apps/openmw/mwinput/actionmanager.cpp
@@ -490,16 +490,17 @@ namespace MWInput
         if (MyGUI::InputManager::getInstance ().isModalAny())
             return;
 
-        if (MWBase::Environment::get().getWindowManager()->getMode() != MWGui::GM_Journal
-                && MWBase::Environment::get().getWindowManager()->getMode() != MWGui::GM_MainMenu
-                && MWBase::Environment::get().getWindowManager()->getMode() != MWGui::GM_Settings
-                && MWBase::Environment::get().getWindowManager ()->getJournalAllowed())
+        MWBase::WindowManager* windowManager = MWBase::Environment::get().getWindowManager();
+        if (windowManager->getMode() != MWGui::GM_Journal
+                && windowManager->getMode() != MWGui::GM_MainMenu
+                && windowManager->getMode() != MWGui::GM_Settings
+                && windowManager->getJournalAllowed())
         {
-            MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Journal);
+            windowManager->pushGuiMode(MWGui::GM_Journal);
         }
-        else if (MWBase::Environment::get().getWindowManager()->containsMode(MWGui::GM_Journal))
+        else if (windowManager->containsMode(MWGui::GM_Journal))
         {
-            MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_Journal);
+            windowManager->removeGuiMode(MWGui::GM_Journal);
         }
     }
 

From 74fab99b89d1c4c16843f41cf46e74d580535edb Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Thu, 22 Jul 2021 21:33:18 +0200
Subject: [PATCH 1050/2859] Use a const-ref for an osg::Quat

Since an osg::Quat contains at least 4 floats,
it should be worth it to use a const-ref instead
of passing it by value.
---
 apps/openmw/mwclass/activator.cpp | 4 ++--
 apps/openmw/mwclass/activator.hpp | 4 ++--
 apps/openmw/mwclass/actor.cpp     | 2 +-
 apps/openmw/mwclass/actor.hpp     | 2 +-
 apps/openmw/mwclass/container.cpp | 4 ++--
 apps/openmw/mwclass/container.hpp | 4 ++--
 apps/openmw/mwclass/door.cpp      | 4 ++--
 apps/openmw/mwclass/door.hpp      | 4 ++--
 apps/openmw/mwclass/light.cpp     | 4 ++--
 apps/openmw/mwclass/light.hpp     | 4 ++--
 apps/openmw/mwclass/static.cpp    | 4 ++--
 apps/openmw/mwclass/static.hpp    | 4 ++--
 apps/openmw/mwworld/class.cpp     | 4 ++--
 apps/openmw/mwworld/class.hpp     | 4 ++--
 14 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/apps/openmw/mwclass/activator.cpp b/apps/openmw/mwclass/activator.cpp
index 8ffcf70253..e4ba7af4f0 100644
--- a/apps/openmw/mwclass/activator.cpp
+++ b/apps/openmw/mwclass/activator.cpp
@@ -38,12 +38,12 @@ namespace MWClass
         }
     }
 
-    void Activator::insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
+    void Activator::insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
     {
         insertObjectPhysics(ptr, model, rotation, physics, skipAnimated);
     }
 
-    void Activator::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
+    void Activator::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
     {
         if(!model.empty())
             physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World, skipAnimated);
diff --git a/apps/openmw/mwclass/activator.hpp b/apps/openmw/mwclass/activator.hpp
index f7497f01bc..32bf1564c9 100644
--- a/apps/openmw/mwclass/activator.hpp
+++ b/apps/openmw/mwclass/activator.hpp
@@ -17,9 +17,9 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
 
-            void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const override;
+            void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const override;
 
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
diff --git a/apps/openmw/mwclass/actor.cpp b/apps/openmw/mwclass/actor.cpp
index 6621df1ec8..b142fd2643 100644
--- a/apps/openmw/mwclass/actor.cpp
+++ b/apps/openmw/mwclass/actor.cpp
@@ -22,7 +22,7 @@ namespace MWClass
         MWBase::Environment::get().getWorld()->adjustPosition(ptr, force);
     }
 
-    void Actor::insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
+    void Actor::insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
     {
         if (!model.empty())
         {
diff --git a/apps/openmw/mwclass/actor.hpp b/apps/openmw/mwclass/actor.hpp
index cc1d0c9089..6a5d4c5150 100644
--- a/apps/openmw/mwclass/actor.hpp
+++ b/apps/openmw/mwclass/actor.hpp
@@ -24,7 +24,7 @@ namespace MWClass
         ///< Adjust position to stand on ground. Must be called post model load
         /// @param force do this even if the ptr is flying
 
-        void insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
+        void insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
 
         bool useAnim() const override;
 
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index 5c1ddd8bd1..051fbafeb5 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -106,12 +106,12 @@ namespace MWClass
         }
     }
 
-    void Container::insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
+    void Container::insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
     {
         insertObjectPhysics(ptr, model, rotation, physics, skipAnimated);
     }
 
-    void Container::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
+    void Container::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
     {
         if(!model.empty())
             physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World, skipAnimated);
diff --git a/apps/openmw/mwclass/container.hpp b/apps/openmw/mwclass/container.hpp
index 1cbc5a6142..9407dab243 100644
--- a/apps/openmw/mwclass/container.hpp
+++ b/apps/openmw/mwclass/container.hpp
@@ -42,8 +42,8 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
-            void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
+            void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
 
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index e608c27000..70c4a27582 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -55,7 +55,7 @@ namespace MWClass
         }
     }
 
-    void Door::insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
+    void Door::insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
     {
         insertObjectPhysics(ptr, model, rotation, physics, skipAnimated);
 
@@ -70,7 +70,7 @@ namespace MWClass
         }
     }
 
-    void Door::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
+    void Door::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
     {
         if(!model.empty())
             physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_Door, skipAnimated);
diff --git a/apps/openmw/mwclass/door.hpp b/apps/openmw/mwclass/door.hpp
index 5882842e91..1fd59f8f52 100644
--- a/apps/openmw/mwclass/door.hpp
+++ b/apps/openmw/mwclass/door.hpp
@@ -18,8 +18,8 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
-            void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
+            void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
 
             bool isDoor() const override;
 
diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index ad5eb4e737..0281861980 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -33,7 +33,7 @@ namespace MWClass
         renderingInterface.getObjects().insertModel(ptr, model, true, !(ref->mBase->mData.mFlags & ESM::Light::OffDefault));
     }
 
-    void Light::insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
+    void Light::insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
     {
         MWWorld::LiveCellRef<ESM::Light> *ref =
             ptr.get<ESM::Light>();
@@ -47,7 +47,7 @@ namespace MWClass
                                                                       MWSound::PlayMode::Loop);
     }
 
-    void Light::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
+    void Light::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
     {
         // TODO: add option somewhere to enable collision for placeable objects
         if (!model.empty() && (ptr.get<ESM::Light>()->mBase->mData.mFlags & ESM::Light::Carry) == 0)
diff --git a/apps/openmw/mwclass/light.hpp b/apps/openmw/mwclass/light.hpp
index 55fef759aa..206abede43 100644
--- a/apps/openmw/mwclass/light.hpp
+++ b/apps/openmw/mwclass/light.hpp
@@ -14,8 +14,8 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
-            void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
+            void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
 
             bool useAnim() const override;
 
diff --git a/apps/openmw/mwclass/static.cpp b/apps/openmw/mwclass/static.cpp
index 25029528ea..5cbe219580 100644
--- a/apps/openmw/mwclass/static.cpp
+++ b/apps/openmw/mwclass/static.cpp
@@ -23,12 +23,12 @@ namespace MWClass
         }
     }
 
-    void Static::insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
+    void Static::insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
     {
         insertObjectPhysics(ptr, model, rotation, physics, skipAnimated);
     }
 
-    void Static::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
+    void Static::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
     {
         if(!model.empty())
             physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World, skipAnimated);
diff --git a/apps/openmw/mwclass/static.hpp b/apps/openmw/mwclass/static.hpp
index d1991d0550..7c326987a8 100644
--- a/apps/openmw/mwclass/static.hpp
+++ b/apps/openmw/mwclass/static.hpp
@@ -14,8 +14,8 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
-            void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
+            void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
 
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index 96f03af6c3..55e39de55e 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -30,12 +30,12 @@ namespace MWWorld
 
     }
 
-    void Class::insertObject(const Ptr& ptr, const std::string& mesh, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
+    void Class::insertObject(const Ptr& ptr, const std::string& mesh, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
     {
 
     }
 
-    void Class::insertObjectPhysics(const Ptr& ptr, const std::string& mesh, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
+    void Class::insertObjectPhysics(const Ptr& ptr, const std::string& mesh, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
     {}
 
     bool Class::apply (const MWWorld::Ptr& ptr, const std::string& id,  const MWWorld::Ptr& actor) const
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index 7937209c6e..4779a3065b 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -78,9 +78,9 @@ namespace MWWorld
             }
 
             virtual void insertObjectRendering (const Ptr& ptr, const std::string& mesh, MWRender::RenderingInterface& renderingInterface) const;
-            virtual void insertObject(const Ptr& ptr, const std::string& mesh, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const;
+            virtual void insertObject(const Ptr& ptr, const std::string& mesh, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const;
             ///< Add reference into a cell for rendering (default implementation: don't render anything).
-            virtual void insertObjectPhysics(const Ptr& ptr, const std::string& mesh, osg::Quat rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const;
+            virtual void insertObjectPhysics(const Ptr& ptr, const std::string& mesh, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const;
 
             virtual std::string getName (const ConstPtr& ptr) const = 0;
             ///< \return name or ID; can return an empty string.

From 73c20be29a50a7aa5f34aa9b172deedb26bbf191 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Thu, 22 Jul 2021 22:03:59 +0200
Subject: [PATCH 1051/2859] Use prefix increment for iterators in esmstore.cpp

See https://pvs-studio.com/en/docs/warnings/v803/
for the rationale.
---
 apps/openmw/mwworld/esmstore.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index ecb2cad021..befe65d641 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -274,9 +274,9 @@ void ESMStore::countRecords()
     std::vector<Ref> refs;
     std::vector<std::string> refIDs;
     std::vector<ESM::ESMReader> readers;
-    for(auto it = mCells.intBegin(); it != mCells.intEnd(); it++)
+    for(auto it = mCells.intBegin(); it != mCells.intEnd(); ++it)
         readRefs(*it, refs, refIDs, readers);
-    for(auto it = mCells.extBegin(); it != mCells.extEnd(); it++)
+    for(auto it = mCells.extBegin(); it != mCells.extEnd(); ++it)
         readRefs(*it, refs, refIDs, readers);
     const auto lessByRefNum = [] (const Ref& l, const Ref& r) { return l.mRefNum < r.mRefNum; };
     std::stable_sort(refs.begin(), refs.end(), lessByRefNum);

From e8c6f31e0cd200aca70b2bb1cc0eff2afde23204 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Thu, 22 Jul 2021 15:55:30 -0700
Subject: [PATCH 1052/2859] add shader path for mygui (#6162)

---
 CHANGELOG.md                                  |  1 +
 apps/openmw/engine.cpp                        |  8 +++++-
 apps/openmw/mwgui/windowmanagerimp.cpp        |  6 ++++-
 apps/openmw/mwgui/windowmanagerimp.hpp        |  2 +-
 apps/openmw/mwrender/renderingmanager.cpp     |  1 -
 .../myguiplatform/myguirendermanager.cpp      | 27 +++++++++++++++++++
 .../myguiplatform/myguirendermanager.hpp      |  7 +++++
 files/shaders/CMakeLists.txt                  |  2 ++
 files/shaders/gui_fragment.glsl               | 11 ++++++++
 files/shaders/gui_vertex.glsl                 | 11 ++++++++
 10 files changed, 72 insertions(+), 4 deletions(-)
 create mode 100644 files/shaders/gui_fragment.glsl
 create mode 100644 files/shaders/gui_vertex.glsl

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 801b48a1a3..50161358d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@
     Feature #5489: MCP: Telekinesis fix for activators
     Feature #5996: Support Lua scripts in OpenMW
     Feature #6017: Separate persistent and temporary cell references when saving
+    Feature #6162: Refactor GUI to use shaders and to be GLES and GL3+ friendly
 
 0.47.0
 ------
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index c98498dc9c..f968bbfac7 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -753,6 +753,12 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     else
         gameControllerdb = ""; //if it doesn't exist, pass in an empty string
 
+    // gui needs our shaders path before everything else
+    mResourceSystem->getSceneManager()->setShaderPath((mResDir / "shaders").string());
+
+    osg::ref_ptr<osg::GLExtensions> exts = osg::GLExtensions::Get(0, false);
+    bool shadersSupported = exts && (exts->glslLanguageVersion >= 1.2f);
+
     std::string myguiResources = (mResDir / "mygui").string();
     osg::ref_ptr<osg::Group> guiRoot = new osg::Group;
     guiRoot->setName("GUI Root");
@@ -761,7 +767,7 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     MWGui::WindowManager* window = new MWGui::WindowManager(mWindow, mViewer, guiRoot, mResourceSystem.get(), mWorkQueue.get(),
                 mCfgMgr.getLogPath().string() + std::string("/"), myguiResources,
                 mScriptConsoleMode, mTranslationDataStorage, mEncoding, mExportFonts,
-                Version::getOpenmwVersionDescription(mResDir.string()), mCfgMgr.getUserConfigPath().string());
+                Version::getOpenmwVersionDescription(mResDir.string()), mCfgMgr.getUserConfigPath().string(), shadersSupported);
     mEnvironment.setWindowManager (window);
 
     MWInput::InputManager* input = new MWInput::InputManager (mWindow, mViewer, mScreenCaptureHandler, mScreenCaptureOperation, keybinderUser, keybinderUserExists, userGameControllerdb, gameControllerdb, mGrab);
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 544a0927e7..40c3da5482 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -35,6 +35,7 @@
 
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/imagemanager.hpp>
+#include <components/resource/scenemanager.hpp>
 
 #include <components/sceneutil/workqueue.hpp>
 
@@ -124,7 +125,7 @@ namespace MWGui
     WindowManager::WindowManager(
             SDL_Window* window, osgViewer::Viewer* viewer, osg::Group* guiRoot, Resource::ResourceSystem* resourceSystem, SceneUtil::WorkQueue* workQueue,
             const std::string& logpath, const std::string& resourcePath, bool consoleOnlyScripts, Translation::Storage& translationDataStorage,
-            ToUTF8::FromType encoding, bool exportFonts, const std::string& versionDescription, const std::string& userDataPath)
+            ToUTF8::FromType encoding, bool exportFonts, const std::string& versionDescription, const std::string& userDataPath, bool useShaders)
       : mOldUpdateMask(0)
       , mOldCullMask(0)
       , mStore(nullptr)
@@ -275,6 +276,9 @@ namespace MWGui
         mVideoWrapper->setGammaContrast(Settings::Manager::getFloat("gamma", "Video"),
                                         Settings::Manager::getFloat("contrast", "Video"));
 
+        if (useShaders)
+            mGuiPlatform->getRenderManagerPtr()->enableShaders(mResourceSystem->getSceneManager()->getShaderManager());
+
         mStatsWatcher.reset(new StatsWatcher());
     }
 
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index 8c7e365ec7..9a6b6b54a5 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -135,7 +135,7 @@ namespace MWGui
 
     WindowManager(SDL_Window* window, osgViewer::Viewer* viewer, osg::Group* guiRoot, Resource::ResourceSystem* resourceSystem, SceneUtil::WorkQueue* workQueue,
                   const std::string& logpath, const std::string& cacheDir, bool consoleOnlyScripts, Translation::Storage& translationDataStorage,
-                  ToUTF8::FromType encoding, bool exportFonts, const std::string& versionDescription, const std::string& localPath);
+                  ToUTF8::FromType encoding, bool exportFonts, const std::string& versionDescription, const std::string& localPath, bool useShaders);
     virtual ~WindowManager();
 
     /// Set the ESMStore to use for retrieving of GUI-related strings.
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 016149ed90..81687a712a 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -201,7 +201,6 @@ namespace MWRender
         auto lightingMethod = SceneUtil::LightManager::getLightingMethodFromString(Settings::Manager::getString("lighting method", "Shaders"));
 
         resourceSystem->getSceneManager()->setParticleSystemMask(MWRender::Mask_ParticleSystem);
-        resourceSystem->getSceneManager()->setShaderPath(resourcePath + "/shaders");
         // Shadows and radial fog have problems with fixed-function mode
         bool forceShaders = Settings::Manager::getBool("radial fog", "Shaders")
                             || Settings::Manager::getBool("force shaders", "Shaders")
diff --git a/components/myguiplatform/myguirendermanager.cpp b/components/myguiplatform/myguirendermanager.cpp
index 77a5ee533b..abc170c02e 100644
--- a/components/myguiplatform/myguirendermanager.cpp
+++ b/components/myguiplatform/myguirendermanager.cpp
@@ -14,6 +14,7 @@
 #include <osgGA/GUIEventHandler>
 
 #include <components/resource/imagemanager.hpp>
+#include <components/shader/shadermanager.hpp>
 
 #include <components/debug/debuglog.hpp>
 
@@ -127,9 +128,13 @@ public:
                 state->apply();
             }
 
+            // A GUI element without an associated texture would be extremely rare.
+            // It is worth it to use a dummy 1x1 black texture sampler instead of either adding a conditional or relinking shaders.
             osg::Texture2D* texture = batch.mTexture;
             if(texture)
                 state->applyTextureAttribute(0, texture);
+            else
+                state->applyTextureAttribute(0, mDummyTexture);
 
             osg::GLBufferObject* bufferobject = state->isVertexBufferObjectSupported() ? vbo->getOrCreateGLBufferObject(state->getContextID()) : nullptr;
             if (bufferobject)
@@ -189,6 +194,10 @@ public:
         mStateSet->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
         mStateSet->setMode(GL_BLEND, osg::StateAttribute::ON);
 
+        mDummyTexture = new osg::Texture2D;
+        mDummyTexture->setInternalFormat(GL_RGB);
+        mDummyTexture->setTextureSize(1,1);
+
         // need to flip tex coords since MyGUI uses DirectX convention of top left image origin
         osg::Matrix flipMat;
         flipMat.preMultTranslate(osg::Vec3f(0,1,0));
@@ -201,6 +210,7 @@ public:
         , mStateSet(copy.mStateSet)
         , mWriteTo(0)
         , mReadFrom(0)
+        , mDummyTexture(copy.mDummyTexture)
     {
     }
 
@@ -231,6 +241,11 @@ public:
         mBatchVector[mWriteTo].clear();
     }
 
+    osg::StateSet* getDrawableStateSet()
+    {
+        return mStateSet;
+    }
+
     META_Object(osgMyGUI, Drawable)
 
 private:
@@ -242,6 +257,8 @@ private:
 
     int mWriteTo;
     mutable int mReadFrom;
+
+    osg::ref_ptr<osg::Texture2D> mDummyTexture;
 };
 
 class OSGVertexBuffer : public MyGUI::IVertexBuffer
@@ -417,6 +434,16 @@ void RenderManager::shutdown()
     mSceneRoot->removeChild(mGuiRoot);
 }
 
+void RenderManager::enableShaders(Shader::ShaderManager& shaderManager)
+{
+    auto vertexShader = shaderManager.getShader("gui_vertex.glsl", {}, osg::Shader::VERTEX);
+    auto fragmentShader = shaderManager.getShader("gui_fragment.glsl", {}, osg::Shader::FRAGMENT);
+    auto program = shaderManager.getProgram(vertexShader, fragmentShader);
+
+    mDrawable->getDrawableStateSet()->setAttributeAndModes(program, osg::StateAttribute::ON);
+    mDrawable->getDrawableStateSet()->addUniform(new osg::Uniform("diffuseMap", 0));
+}
+
 MyGUI::IVertexBuffer* RenderManager::createVertexBuffer()
 {
     return new OSGVertexBuffer();
diff --git a/components/myguiplatform/myguirendermanager.hpp b/components/myguiplatform/myguirendermanager.hpp
index 3c3fb672d6..8ef9691e4f 100644
--- a/components/myguiplatform/myguirendermanager.hpp
+++ b/components/myguiplatform/myguirendermanager.hpp
@@ -12,6 +12,11 @@ namespace Resource
     class ImageManager;
 }
 
+namespace Shader
+{
+    class ShaderManager;
+}
+
 namespace osgViewer
 {
     class Viewer;
@@ -62,6 +67,8 @@ public:
     void initialise();
     void shutdown();
 
+    void enableShaders(Shader::ShaderManager& shaderManager);
+
     void setScalingFactor(float factor);
 
     static RenderManager& getInstance() { return *getInstancePtr(); }
diff --git a/files/shaders/CMakeLists.txt b/files/shaders/CMakeLists.txt
index c4a8637767..5297b2e752 100644
--- a/files/shaders/CMakeLists.txt
+++ b/files/shaders/CMakeLists.txt
@@ -31,6 +31,8 @@ set(SHADER_FILES
     nv_default_fragment.glsl
     nv_nolighting_vertex.glsl
     nv_nolighting_fragment.glsl
+    gui_vertex.glsl
+    gui_fragment.glsl
 )
 
 copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_SHADERS_ROOT} ${DDIRRELATIVE} "${SHADER_FILES}")
diff --git a/files/shaders/gui_fragment.glsl b/files/shaders/gui_fragment.glsl
new file mode 100644
index 0000000000..a8c9434711
--- /dev/null
+++ b/files/shaders/gui_fragment.glsl
@@ -0,0 +1,11 @@
+#version 120
+
+uniform sampler2D diffuseMap;
+
+varying vec2 diffuseMapUV;
+varying vec4 passColor;
+
+void main()
+{
+    gl_FragData[0] = texture2D(diffuseMap, diffuseMapUV) * passColor;
+}
diff --git a/files/shaders/gui_vertex.glsl b/files/shaders/gui_vertex.glsl
new file mode 100644
index 0000000000..b378b097bd
--- /dev/null
+++ b/files/shaders/gui_vertex.glsl
@@ -0,0 +1,11 @@
+#version 120
+
+varying vec2 diffuseMapUV;
+varying vec4 passColor;
+
+void main()
+{
+    gl_Position = vec4(gl_Vertex.xyz, 1.0);
+    diffuseMapUV = (gl_TextureMatrix[0] * gl_MultiTexCoord0).xy;
+    passColor = gl_Color;
+}

From be45092e55bcbcba314905054e00e947f40862ab Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Fri, 23 Jul 2021 14:21:21 +1000
Subject: [PATCH 1053/2859] Use std::unique_ptr to store records in
 collections,  RefidCollection and RefIdData.

(copied the changes from commit 23e7e3c165bb2631f9d8eb298f86da862e91cefa)
---
 apps/opencs/model/doc/document.cpp            |  25 ++--
 apps/opencs/model/doc/savingstages.cpp        |  12 +-
 apps/opencs/model/tools/journalcheck.cpp      |   2 +-
 apps/opencs/model/tools/mergestages.cpp       |  22 ++--
 apps/opencs/model/tools/mergestages.hpp       |   4 +-
 apps/opencs/model/world/collection.hpp        | 111 +++++++++---------
 apps/opencs/model/world/collectionbase.hpp    |   5 +-
 apps/opencs/model/world/commands.cpp          |  35 +++---
 apps/opencs/model/world/commands.hpp          |   4 +-
 apps/opencs/model/world/data.cpp              |  23 ++--
 apps/opencs/model/world/idcollection.hpp      |  33 +++---
 apps/opencs/model/world/idtable.cpp           |  11 +-
 apps/opencs/model/world/idtable.hpp           |   3 +-
 apps/opencs/model/world/infocollection.cpp    |  45 +++----
 apps/opencs/model/world/infocollection.hpp    |   2 +-
 .../opencs/model/world/nestedidcollection.hpp |  32 ++---
 .../model/world/nestedinfocollection.cpp      |  32 ++---
 apps/opencs/model/world/record.hpp            |  18 +--
 apps/opencs/model/world/refcollection.cpp     |  23 ++--
 apps/opencs/model/world/refidcollection.cpp   |  15 +--
 apps/opencs/model/world/refidcollection.hpp   |   4 +-
 apps/opencs/model/world/refiddata.cpp         |  12 +-
 apps/opencs/model/world/refiddata.hpp         |  59 ++++++----
 23 files changed, 278 insertions(+), 254 deletions(-)

diff --git a/apps/opencs/model/doc/document.cpp b/apps/opencs/model/doc/document.cpp
index 3a20555d1e..f4071c525d 100644
--- a/apps/opencs/model/doc/document.cpp
+++ b/apps/opencs/model/doc/document.cpp
@@ -1,6 +1,7 @@
 #include "document.hpp"
 
 #include <cassert>
+#include <memory>
 
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
@@ -115,10 +116,10 @@ void CSMDoc::Document::addOptionalGmst (const ESM::GameSetting& gmst)
 {
     if (getData().getGmsts().searchId (gmst.mId)==-1)
     {
-        CSMWorld::Record<ESM::GameSetting> record;
-        record.mBase = gmst;
-        record.mState = CSMWorld::RecordBase::State_BaseOnly;
-        getData().getGmsts().appendRecord (record);
+        std::unique_ptr<CSMWorld::Record<ESM::GameSetting> > record(new CSMWorld::Record<ESM::GameSetting>);
+        record->mBase = gmst;
+        record->mState = CSMWorld::RecordBase::State_BaseOnly;
+        getData().getGmsts().appendRecord (std::move(record));
     }
 }
 
@@ -126,10 +127,10 @@ void CSMDoc::Document::addOptionalGlobal (const ESM::Global& global)
 {
     if (getData().getGlobals().searchId (global.mId)==-1)
     {
-        CSMWorld::Record<ESM::Global> record;
-        record.mBase = global;
-        record.mState = CSMWorld::RecordBase::State_BaseOnly;
-        getData().getGlobals().appendRecord (record);
+        std::unique_ptr<CSMWorld::Record<ESM::Global> > record(new CSMWorld::Record<ESM::Global>);
+        record->mBase = global;
+        record->mState = CSMWorld::RecordBase::State_BaseOnly;
+        getData().getGlobals().appendRecord (std::move(record));
     }
 }
 
@@ -137,10 +138,10 @@ void CSMDoc::Document::addOptionalMagicEffect (const ESM::MagicEffect& magicEffe
 {
     if (getData().getMagicEffects().searchId (magicEffect.mId)==-1)
     {
-        CSMWorld::Record<ESM::MagicEffect> record;
-        record.mBase = magicEffect;
-        record.mState = CSMWorld::RecordBase::State_BaseOnly;
-        getData().getMagicEffects().appendRecord (record);
+        std::unique_ptr<CSMWorld::Record<ESM::MagicEffect> > record(new CSMWorld::Record<ESM::MagicEffect>);
+        record->mBase = magicEffect;
+        record->mState = CSMWorld::RecordBase::State_BaseOnly;
+        getData().getMagicEffects().appendRecord (std::move(record));
     }
 }
 
diff --git a/apps/opencs/model/doc/savingstages.cpp b/apps/opencs/model/doc/savingstages.cpp
index 8c17a3b8c1..a410d34b2a 100644
--- a/apps/opencs/model/doc/savingstages.cpp
+++ b/apps/opencs/model/doc/savingstages.cpp
@@ -114,7 +114,7 @@ void CSMDoc::WriteDialogueCollectionStage::perform (int stage, Messages& message
 
     for (CSMWorld::InfoCollection::RecordConstIterator iter (range.first); iter!=range.second; ++iter)
     {
-        if (iter->isModified() || iter->mState == CSMWorld::RecordBase::State_Deleted)
+        if ((*iter)->isModified() || (*iter)->mState == CSMWorld::RecordBase::State_Deleted)
         {
             infoModified = true;
             break;
@@ -140,9 +140,9 @@ void CSMDoc::WriteDialogueCollectionStage::perform (int stage, Messages& message
         // write modified selected info records
         for (CSMWorld::InfoCollection::RecordConstIterator iter (range.first); iter!=range.second; ++iter)
         {
-            if (iter->isModified() || iter->mState == CSMWorld::RecordBase::State_Deleted)
+            if ((*iter)->isModified() || (*iter)->mState == CSMWorld::RecordBase::State_Deleted)
             {
-                ESM::DialInfo info = iter->get();
+                ESM::DialInfo info = (*iter)->get();
                 info.mId = info.mId.substr (info.mId.find_last_of ('#')+1);
 
                 info.mPrev = "";
@@ -151,7 +151,7 @@ void CSMDoc::WriteDialogueCollectionStage::perform (int stage, Messages& message
                     CSMWorld::InfoCollection::RecordConstIterator prev = iter;
                     --prev;
 
-                    info.mPrev = prev->get().mId.substr (prev->get().mId.find_last_of ('#')+1);
+                    info.mPrev = (*prev)->get().mId.substr ((*prev)->get().mId.find_last_of ('#')+1);
                 }
 
                 CSMWorld::InfoCollection::RecordConstIterator next = iter;
@@ -160,11 +160,11 @@ void CSMDoc::WriteDialogueCollectionStage::perform (int stage, Messages& message
                 info.mNext = "";
                 if (next!=range.second)
                 {
-                    info.mNext = next->get().mId.substr (next->get().mId.find_last_of ('#')+1);
+                    info.mNext = (*next)->get().mId.substr ((*next)->get().mId.find_last_of ('#')+1);
                 }
 
                 writer.startRecord (info.sRecordId);
-                info.save (writer, iter->mState == CSMWorld::RecordBase::State_Deleted);
+                info.save (writer, (*iter)->mState == CSMWorld::RecordBase::State_Deleted);
                 writer.endRecord (info.sRecordId);
             }
         }
diff --git a/apps/opencs/model/tools/journalcheck.cpp b/apps/opencs/model/tools/journalcheck.cpp
index ae83abfa01..5959cdf54b 100644
--- a/apps/opencs/model/tools/journalcheck.cpp
+++ b/apps/opencs/model/tools/journalcheck.cpp
@@ -35,7 +35,7 @@ void CSMTools::JournalCheckStage::perform(int stage, CSMDoc::Messages& messages)
 
     for (CSMWorld::InfoCollection::RecordConstIterator it = range.first; it != range.second; ++it)
     {
-        const CSMWorld::Record<CSMWorld::Info> infoRecord = (*it);
+        const CSMWorld::Record<CSMWorld::Info> infoRecord = (*it->get());
 
         if (infoRecord.isDeleted())
             continue;
diff --git a/apps/opencs/model/tools/mergestages.cpp b/apps/opencs/model/tools/mergestages.cpp
index 016e2da392..021cf61d81 100644
--- a/apps/opencs/model/tools/mergestages.cpp
+++ b/apps/opencs/model/tools/mergestages.cpp
@@ -103,10 +103,9 @@ void CSMTools::MergeReferencesStage::perform (int stage, CSMDoc::Messages& messa
         ref.mRefNum.mContentFile = 0;
         ref.mNew = false;
 
-        CSMWorld::Record<CSMWorld::CellRef> newRecord (
-            CSMWorld::RecordBase::State_ModifiedOnly, nullptr, &ref);
-
-        mState.mTarget->getData().getReferences().appendRecord (newRecord);
+        mState.mTarget->getData().getReferences().appendRecord (
+                std::make_unique<CSMWorld::Record<CSMWorld::CellRef> >(
+                    CSMWorld::Record<CSMWorld::CellRef>(CSMWorld::RecordBase::State_ModifiedOnly, nullptr, &ref)));
     }
 }
 
@@ -128,7 +127,9 @@ void CSMTools::PopulateLandTexturesMergeStage::perform (int stage, CSMDoc::Messa
 
     if (!record.isDeleted())
     {
-        mState.mTarget->getData().getLandTextures().appendRecord(record);
+        mState.mTarget->getData().getLandTextures().appendRecord(
+            std::make_unique<CSMWorld::Record<CSMWorld::LandTexture> >(
+                CSMWorld::Record<CSMWorld::LandTexture>(CSMWorld::RecordBase::State_ModifiedOnly, nullptr, &record.get())));
     }
 }
 
@@ -150,7 +151,9 @@ void CSMTools::MergeLandStage::perform (int stage, CSMDoc::Messages& messages)
 
     if (!record.isDeleted())
     {
-        mState.mTarget->getData().getLand().appendRecord (record);
+        mState.mTarget->getData().getLand().appendRecord (
+            std::make_unique<CSMWorld::Record<CSMWorld::Land> >(
+                CSMWorld::Record<CSMWorld::Land>(CSMWorld::RecordBase::State_ModifiedOnly, nullptr, &record.get())));
     }
 }
 
@@ -185,10 +188,9 @@ void CSMTools::FixLandsAndLandTexturesMergeStage::perform (int stage, CSMDoc::Me
         const CSMWorld::Record<CSMWorld::Land>& oldRecord =
             mState.mTarget->getData().getLand().getRecord (stage);
 
-        CSMWorld::Record<CSMWorld::Land> newRecord(CSMWorld::RecordBase::State_ModifiedOnly,
-            nullptr, &oldRecord.get());
-
-        mState.mTarget->getData().getLand().setRecord(stage, newRecord);
+          mState.mTarget->getData().getLand().setRecord (stage,
+                std::make_unique<CSMWorld::Record<CSMWorld::Land> >(
+                    CSMWorld::Record<CSMWorld::Land>(CSMWorld::RecordBase::State_ModifiedOnly, nullptr, &oldRecord.get())));
     }
 }
 
diff --git a/apps/opencs/model/tools/mergestages.hpp b/apps/opencs/model/tools/mergestages.hpp
index a6b6de58f8..778bea7c68 100644
--- a/apps/opencs/model/tools/mergestages.hpp
+++ b/apps/opencs/model/tools/mergestages.hpp
@@ -3,6 +3,7 @@
 
 #include <algorithm>
 #include <map>
+#include <memory>
 
 #include <components/to_utf8/to_utf8.hpp>
 
@@ -82,7 +83,8 @@ namespace CSMTools
         const CSMWorld::Record<RecordType>& record = source.getRecord (stage);
 
         if (!record.isDeleted())
-            target.appendRecord (CSMWorld::Record<RecordType> (CSMWorld::RecordBase::State_ModifiedOnly, nullptr, &record.get()));
+            target.appendRecord (std::make_unique<CSMWorld::Record<RecordType> >(
+                    CSMWorld::Record<RecordType>(CSMWorld::RecordBase::State_ModifiedOnly, nullptr, &record.get())));
     }
 
     class MergeRefIdsStage : public CSMDoc::Stage
diff --git a/apps/opencs/model/world/collection.hpp b/apps/opencs/model/world/collection.hpp
index 451ef9d0e1..8fc5d076ce 100644
--- a/apps/opencs/model/world/collection.hpp
+++ b/apps/opencs/model/world/collection.hpp
@@ -8,6 +8,7 @@
 #include <stdexcept>
 #include <string>
 #include <functional>
+#include <memory>
 
 #include <QVariant>
 
@@ -84,7 +85,7 @@ namespace CSMWorld
 
         private:
 
-            std::vector<Record<ESXRecordT> > mRecords;
+            std::vector<std::unique_ptr<Record<ESXRecordT> > > mRecords;
             std::map<std::string, int> mIndex;
             std::vector<Column<ESXRecordT> *> mColumns;
 
@@ -96,7 +97,7 @@ namespace CSMWorld
 
             const std::map<std::string, int>& getIdMap() const;
 
-            const std::vector<Record<ESXRecordT> >& getRecords() const;
+            const std::vector<std::unique_ptr<Record<ESXRecordT> > >& getRecords() const;
 
             bool reorderRowsImp (int baseIndex, const std::vector<int>& newOrder);
             ///< Reorder the rows [baseIndex, baseIndex+newOrder.size()) according to the indices
@@ -158,12 +159,12 @@ namespace CSMWorld
             ////< Search record with \a id.
             /// \return index of record (if found) or -1 (not found)
 
-            void replace (int index, const RecordBase& record) override;
+            void replace (int index, std::unique_ptr<RecordBase> record) override;
             ///< If the record type does not match, an exception is thrown.
             ///
             /// \attention \a record must not change the ID.
 
-            void appendRecord (const RecordBase& record,
+            void appendRecord (std::unique_ptr<RecordBase> record,
                 UniversalId::Type type = UniversalId::Type_None) override;
             ///< If the record type does not match, an exception is thrown.
             ///< \param type Will be ignored, unless the collection supports multiple record types
@@ -181,7 +182,7 @@ namespace CSMWorld
             ///
             /// \param listDeleted include deleted record in the list
 
-            virtual void insertRecord (const RecordBase& record, int index,
+            virtual void insertRecord (std::unique_ptr<RecordBase> record, int index,
                 UniversalId::Type type = UniversalId::Type_None);
             ///< Insert record before index.
             ///
@@ -198,7 +199,7 @@ namespace CSMWorld
 
             void addColumn (Column<ESXRecordT> *column);
 
-            void setRecord (int index, const Record<ESXRecordT>& record);
+            void setRecord (int index, std::unique_ptr<Record<ESXRecordT> > record);
             ///< \attention This function must not change the ID.
 
             NestableColumn *getNestableColumn (int column) const;
@@ -211,7 +212,7 @@ namespace CSMWorld
     }
 
     template<typename ESXRecordT, typename IdAccessorT>
-    const std::vector<Record<ESXRecordT> >& Collection<ESXRecordT, IdAccessorT>::getRecords() const
+    const std::vector<std::unique_ptr<Record<ESXRecordT> > >& Collection<ESXRecordT, IdAccessorT>::getRecords() const
     {
         return mRecords;
     }
@@ -231,15 +232,15 @@ namespace CSMWorld
                 return false;
 
             // reorder records
-            std::vector<Record<ESXRecordT> > buffer (size);
+            std::vector<std::unique_ptr<Record<ESXRecordT> > > buffer (size);
 
             for (int i=0; i<size; ++i)
             {
-                buffer[newOrder[i]] = mRecords [baseIndex+i];
-                buffer[newOrder[i]].setModified (buffer[newOrder[i]].get());
+                buffer[newOrder[i]] = std::move(mRecords [baseIndex+i]);
+                buffer[newOrder[i]]->setModified (buffer[newOrder[i]]->get());
             }
 
-            std::copy (buffer.begin(), buffer.end(), mRecords.begin()+baseIndex);
+            std::move (buffer.begin(), buffer.end(), mRecords.begin()+baseIndex);
 
             // adjust index
             for (std::map<std::string, int>::iterator iter (mIndex.begin()); iter!=mIndex.end();
@@ -255,18 +256,18 @@ namespace CSMWorld
     int Collection<ESXRecordT, IdAccessorT>::cloneRecordImp(const std::string& origin,
         const std::string& destination, UniversalId::Type type)
     {
-        Record<ESXRecordT> copy;
-        copy.mModified = getRecord(origin).get();
-        copy.mState = RecordBase::State_ModifiedOnly;
-        IdAccessorT().setId(copy.get(), destination);
+       std::unique_ptr<Record<ESXRecordT> > copy(new Record<ESXRecordT>);
+       copy->mModified = getRecord(origin).get();
+       copy->mState = RecordBase::State_ModifiedOnly;
+       IdAccessorT().setId(copy->get(), destination);
 
         if (type == UniversalId::Type_Reference) {
-            CSMWorld::CellRef* ptr = (CSMWorld::CellRef*) &copy.mModified;
+            CSMWorld::CellRef* ptr = (CSMWorld::CellRef*) &copy->mModified;
             ptr->mRefNum.mIndex = 0;
         }
 
         int index = getAppendIndex(destination, type);
-        insertRecord(copy, getAppendIndex(destination, type));
+        insertRecord(std::move(copy), getAppendIndex(destination, type));
 
         return index;
     }
@@ -275,7 +276,7 @@ namespace CSMWorld
     int Collection<ESXRecordT, IdAccessorT>::touchRecordImp(const std::string& id)
     {
         int index = getIndex(id);
-        Record<ESXRecordT>& record = mRecords.at(index);
+        Record<ESXRecordT>& record = *mRecords.at(index);
         if (record.isDeleted())
         {
             throw std::runtime_error("attempt to touch deleted record");
@@ -302,7 +303,7 @@ namespace CSMWorld
         const std::string& destination, const UniversalId::Type type)
     {
         int index = cloneRecordImp(origin, destination, type);
-        mRecords.at(index).get().mPlugin = 0;
+        mRecords.at(index)->get().mPlugin = 0;
     }
 
     template<typename ESXRecordT, typename IdAccessorT>
@@ -317,7 +318,7 @@ namespace CSMWorld
         int index = touchRecordImp(id);
         if (index >= 0)
         {
-            mRecords.at(index).get().mPlugin = 0;
+            mRecords.at(index)->get().mPlugin = 0;
             return true;
         }
 
@@ -344,15 +345,15 @@ namespace CSMWorld
 
         if (iter==mIndex.end())
         {
-            Record<ESXRecordT> record2;
-            record2.mState = Record<ESXRecordT>::State_ModifiedOnly;
-            record2.mModified = record;
+            std::unique_ptr<Record<ESXRecordT> > record2(new Record<ESXRecordT>);
+            record2->mState = Record<ESXRecordT>::State_ModifiedOnly;
+            record2->mModified = record;
 
-            insertRecord (record2, getAppendIndex (id));
+            insertRecord (std::move(record2), getAppendIndex (id));
         }
         else
         {
-            mRecords[iter->second].setModified (record);
+            mRecords[iter->second]->setModified (record);
         }
     }
 
@@ -365,7 +366,7 @@ namespace CSMWorld
     template<typename ESXRecordT, typename IdAccessorT>
     std::string Collection<ESXRecordT, IdAccessorT>::getId (int index) const
     {
-        return IdAccessorT().getId (mRecords.at (index).get());
+        return IdAccessorT().getId (mRecords.at (index)->get());
     }
 
     template<typename ESXRecordT, typename IdAccessorT>
@@ -388,13 +389,13 @@ namespace CSMWorld
     template<typename ESXRecordT, typename IdAccessorT>
     QVariant Collection<ESXRecordT, IdAccessorT>::getData (int index, int column) const
     {
-        return mColumns.at (column)->get (mRecords.at (index));
+        return mColumns.at (column)->get (*mRecords.at (index));
     }
 
     template<typename ESXRecordT, typename IdAccessorT>
     void Collection<ESXRecordT, IdAccessorT>::setData (int index, int column, const QVariant& data)
     {
-        return mColumns.at (column)->set (mRecords.at (index), data);
+        return mColumns.at (column)->set (*mRecords.at (index), data);
     }
 
     template<typename ESXRecordT, typename IdAccessorT>
@@ -421,8 +422,8 @@ namespace CSMWorld
     template<typename ESXRecordT, typename IdAccessorT>
     void Collection<ESXRecordT, IdAccessorT>::merge()
     {
-        for (typename std::vector<Record<ESXRecordT> >::iterator iter (mRecords.begin()); iter!=mRecords.end(); ++iter)
-            iter->merge();
+        for (typename std::vector<std::unique_ptr<Record<ESXRecordT> > >::iterator iter (mRecords.begin()); iter!=mRecords.end(); ++iter)
+            (*iter)->merge();
 
         purge();
     }
@@ -434,7 +435,7 @@ namespace CSMWorld
 
         while (i<static_cast<int> (mRecords.size()))
         {
-            if (mRecords[i].isErased())
+            if (mRecords[i]->isErased())
                 removeRows (i, 1);
             else
                 ++i;
@@ -475,11 +476,11 @@ namespace CSMWorld
         IdAccessorT().setId(record, id);
         record.blank();
 
-        Record<ESXRecordT> record2;
-        record2.mState = Record<ESXRecordT>::State_ModifiedOnly;
-        record2.mModified = record;
+        std::unique_ptr<Record<ESXRecordT> > record2(new Record<ESXRecordT>);
+        record2->mState = Record<ESXRecordT>::State_ModifiedOnly;
+        record2->mModified = record;
 
-        insertRecord (record2, getAppendIndex (id, type), type);
+        insertRecord (std::move(record2), getAppendIndex (id, type), type);
     }
 
     template<typename ESXRecordT, typename IdAccessorT>
@@ -496,18 +497,19 @@ namespace CSMWorld
     }
 
     template<typename ESXRecordT, typename IdAccessorT>
-    void Collection<ESXRecordT, IdAccessorT>::replace (int index, const RecordBase& record)
+    void Collection<ESXRecordT, IdAccessorT>::replace (int index, std::unique_ptr<RecordBase> record)
     {
-        mRecords.at (index) = dynamic_cast<const Record<ESXRecordT>&> (record);
+        std::unique_ptr<Record<ESXRecordT> > tmp(static_cast<Record<ESXRecordT>*>(record.release()));
+        mRecords.at (index) = std::move(tmp);
     }
 
     template<typename ESXRecordT, typename IdAccessorT>
-    void Collection<ESXRecordT, IdAccessorT>::appendRecord (const RecordBase& record,
+    void Collection<ESXRecordT, IdAccessorT>::appendRecord (std::unique_ptr<RecordBase> record,
         UniversalId::Type type)
     {
-        insertRecord (record,
-            getAppendIndex (IdAccessorT().getId (
-            dynamic_cast<const Record<ESXRecordT>&> (record).get()), type), type);
+        int index =
+            getAppendIndex(IdAccessorT().getId(static_cast<Record<ESXRecordT>*>(record.get())->get()), type);
+        insertRecord (std::move(record), index, type);
     }
 
     template<typename ESXRecordT, typename IdAccessorT>
@@ -525,8 +527,8 @@ namespace CSMWorld
         for (typename std::map<std::string, int>::const_iterator iter = mIndex.begin();
             iter!=mIndex.end(); ++iter)
         {
-            if (listDeleted || !mRecords[iter->second].isDeleted())
-                ids.push_back (IdAccessorT().getId (mRecords[iter->second].get()));
+            if (listDeleted || !mRecords[iter->second]->isDeleted())
+                ids.push_back (IdAccessorT().getId (mRecords[iter->second]->get()));
         }
 
         return ids;
@@ -536,25 +538,26 @@ namespace CSMWorld
     const Record<ESXRecordT>& Collection<ESXRecordT, IdAccessorT>::getRecord (const std::string& id) const
     {
         int index = getIndex (id);
-        return mRecords.at (index);
+        return *mRecords.at (index);
     }
 
     template<typename ESXRecordT, typename IdAccessorT>
     const Record<ESXRecordT>& Collection<ESXRecordT, IdAccessorT>::getRecord (int index) const
     {
-        return mRecords.at (index);
+        return *mRecords.at (index);
     }
 
     template<typename ESXRecordT, typename IdAccessorT>
-    void Collection<ESXRecordT, IdAccessorT>::insertRecord (const RecordBase& record, int index,
+    void Collection<ESXRecordT, IdAccessorT>::insertRecord (std::unique_ptr<RecordBase> record, int index,
         UniversalId::Type type)
     {
         if (index<0 || index>static_cast<int> (mRecords.size()))
             throw std::runtime_error ("index out of range");
 
-        const Record<ESXRecordT>& record2 = dynamic_cast<const Record<ESXRecordT>&> (record);
+        std::unique_ptr<Record<ESXRecordT> > record2(static_cast<Record<ESXRecordT>*>(record.release()));
+        std::string lowerId = Misc::StringUtils::lowerCase(IdAccessorT().getId(record2->get()));
 
-        mRecords.insert (mRecords.begin()+index, record2);
+        mRecords.insert (mRecords.begin()+index, std::move(record2));
 
         if (index<static_cast<int> (mRecords.size())-1)
         {
@@ -564,18 +567,18 @@ namespace CSMWorld
                      ++(iter->second);
         }
 
-        mIndex.insert (std::make_pair (Misc::StringUtils::lowerCase (IdAccessorT().getId (
-            record2.get())), index));
+        mIndex.insert (std::make_pair (lowerId, index));
     }
 
     template<typename ESXRecordT, typename IdAccessorT>
-    void Collection<ESXRecordT, IdAccessorT>::setRecord (int index, const Record<ESXRecordT>& record)
+    void Collection<ESXRecordT, IdAccessorT>::setRecord (int index,
+            std::unique_ptr<Record<ESXRecordT> > record)
     {
-        if (Misc::StringUtils::lowerCase (IdAccessorT().getId (mRecords.at (index).get()))!=
-            Misc::StringUtils::lowerCase (IdAccessorT().getId (record.get())))
+        if (Misc::StringUtils::lowerCase (IdAccessorT().getId (mRecords.at (index)->get())) !=
+            Misc::StringUtils::lowerCase (IdAccessorT().getId (record->get())))
             throw std::runtime_error ("attempt to change the ID of a record");
 
-        mRecords.at (index) = record;
+        mRecords.at (index) = std::move(record);
     }
 
     template<typename ESXRecordT, typename IdAccessorT>
diff --git a/apps/opencs/model/world/collectionbase.hpp b/apps/opencs/model/world/collectionbase.hpp
index bac790c5d0..ae06d892f5 100644
--- a/apps/opencs/model/world/collectionbase.hpp
+++ b/apps/opencs/model/world/collectionbase.hpp
@@ -3,6 +3,7 @@
 
 #include <string>
 #include <vector>
+#include <memory>
 
 #include "universalid.hpp"
 #include "columns.hpp"
@@ -64,13 +65,13 @@ namespace CSMWorld
             ////< Search record with \a id.
             /// \return index of record (if found) or -1 (not found)
 
-            virtual void replace (int index, const RecordBase& record) = 0;
+            virtual void replace (int index, std::unique_ptr<RecordBase> record) = 0;
             ///< If the record type does not match, an exception is thrown.
             ///
             /// \attention \a record must not change the ID.
             ///< \param type Will be ignored, unless the collection supports multiple record types
 
-            virtual void appendRecord (const RecordBase& record,
+            virtual void appendRecord (std::unique_ptr<RecordBase> record,
                 UniversalId::Type type = UniversalId::Type_None) = 0;
             ///< If the record type does not match, an exception is thrown.
 
diff --git a/apps/opencs/model/world/commands.cpp b/apps/opencs/model/world/commands.cpp
index 5ec7401dc9..e69600eff4 100644
--- a/apps/opencs/model/world/commands.cpp
+++ b/apps/opencs/model/world/commands.cpp
@@ -24,7 +24,7 @@ CSMWorld::TouchCommand::TouchCommand(IdTable& table, const std::string& id, QUnd
     , mChanged(false)
 {
     setText(("Touch " + mId).c_str());
-    mOld.reset(mTable.getRecord(mId).clone());
+    mOld.reset(mTable.getRecord(mId).clone().get());
 }
 
 void CSMWorld::TouchCommand::redo()
@@ -36,7 +36,7 @@ void CSMWorld::TouchCommand::undo()
 {
     if (mChanged)
     {
-        mTable.setRecord(mId, *mOld);
+        mTable.setRecord(mId, std::move(mOld));
         mChanged = false;
     }
 }
@@ -159,7 +159,7 @@ CSMWorld::TouchLandCommand::TouchLandCommand(IdTable& landTable, IdTable& ltexTa
     , mChanged(false)
 {
     setText(("Touch " + mId).c_str());
-    mOld.reset(mLands.getRecord(mId).clone());
+    mOld.reset(mLands.getRecord(mId).clone().get());
 }
 
 const std::string& CSMWorld::TouchLandCommand::getOriginId() const
@@ -181,7 +181,7 @@ void CSMWorld::TouchLandCommand::onUndo()
 {
     if (mChanged)
     {
-        mLands.setRecord(mId, *mOld);
+        mLands.setRecord(mId, std::move(mOld));
         mChanged = false;
     }
 }
@@ -291,16 +291,15 @@ void CSMWorld::CreateCommand::undo()
 }
 
 CSMWorld::RevertCommand::RevertCommand (IdTable& model, const std::string& id, QUndoCommand* parent)
-: QUndoCommand (parent), mModel (model), mId (id), mOld (nullptr)
+: QUndoCommand (parent), mModel (model), mId (id)
 {
     setText (("Revert record " + id).c_str());
 
-    mOld = model.getRecord (id).clone();
+    mOld = std::move(model.getRecord (id).clone());
 }
 
 CSMWorld::RevertCommand::~RevertCommand()
 {
-    delete mOld;
 }
 
 void CSMWorld::RevertCommand::redo()
@@ -322,21 +321,20 @@ void CSMWorld::RevertCommand::redo()
 
 void CSMWorld::RevertCommand::undo()
 {
-    mModel.setRecord (mId, *mOld);
+    mModel.setRecord (mId, std::move(mOld));
 }
 
 CSMWorld::DeleteCommand::DeleteCommand (IdTable& model,
         const std::string& id, CSMWorld::UniversalId::Type type, QUndoCommand* parent)
-: QUndoCommand (parent), mModel (model), mId (id), mOld (nullptr), mType(type)
+: QUndoCommand (parent), mModel (model), mId (id), mType(type)
 {
     setText (("Delete record " + id).c_str());
 
-    mOld = model.getRecord (id).clone();
+    mOld = std::move(model.getRecord (id).clone());
 }
 
 CSMWorld::DeleteCommand::~DeleteCommand()
 {
-    delete mOld;
 }
 
 void CSMWorld::DeleteCommand::redo()
@@ -358,7 +356,7 @@ void CSMWorld::DeleteCommand::redo()
 
 void CSMWorld::DeleteCommand::undo()
 {
-    mModel.setRecord (mId, *mOld, mType);
+    mModel.setRecord (mId, std::move(mOld), mType);
 }
 
 
@@ -424,18 +422,19 @@ void CSMWorld::CreatePathgridCommand::redo()
 {
     CreateCommand::redo();
 
-    Record<Pathgrid> record = static_cast<const Record<Pathgrid>& >(mModel.getRecord(mId));
-    record.get().blank();
-    record.get().mCell = mId;
+    std::unique_ptr<Record<Pathgrid> > record
+        = std::make_unique<Record<Pathgrid> >(static_cast<const Record<Pathgrid>& >(mModel.getRecord(mId)));
+    record->get().blank();
+    record->get().mCell = mId;
 
     std::pair<CellCoordinates, bool> coords = CellCoordinates::fromId(mId);
     if (coords.second)
     {
-        record.get().mData.mX = coords.first.getX();
-        record.get().mData.mY = coords.first.getY();
+        record->get().mData.mX = coords.first.getX();
+        record->get().mData.mY = coords.first.getY();
     }
 
-    mModel.setRecord(mId, record, mType);
+    mModel.setRecord(mId, std::move(record), mType);
 }
 
 CSMWorld::UpdateCellCommand::UpdateCellCommand (IdTable& model, int row, QUndoCommand *parent)
diff --git a/apps/opencs/model/world/commands.hpp b/apps/opencs/model/world/commands.hpp
index 33608304f4..2ed629ef5c 100644
--- a/apps/opencs/model/world/commands.hpp
+++ b/apps/opencs/model/world/commands.hpp
@@ -203,7 +203,7 @@ namespace CSMWorld
     {
             IdTable& mModel;
             std::string mId;
-            RecordBase *mOld;
+            std::unique_ptr<RecordBase> mOld;
 
             // not implemented
             RevertCommand (const RevertCommand&);
@@ -224,7 +224,7 @@ namespace CSMWorld
     {
             IdTable& mModel;
             std::string mId;
-            RecordBase *mOld;
+            std::unique_ptr<RecordBase> mOld;
             UniversalId::Type mType;
 
             // not implemented
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 4ccd2a06db..7d6f0f37cb 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -917,8 +917,8 @@ const CSMWorld::MetaData& CSMWorld::Data::getMetaData() const
 
 void CSMWorld::Data::setMetaData (const MetaData& metaData)
 {
-    Record<MetaData> record (RecordBase::State_ModifiedOnly, nullptr, &metaData);
-    mMetaData.setRecord (0, record);
+    mMetaData.setRecord (0, std::make_unique<Record<MetaData> >(
+            Record<MetaData>(RecordBase::State_ModifiedOnly, nullptr, &metaData)));
 }
 
 QAbstractItemModel *CSMWorld::Data::getTableModel (const CSMWorld::UniversalId& id)
@@ -983,7 +983,8 @@ int CSMWorld::Data::startLoading (const boost::filesystem::path& path, bool base
         metaData.mId = "sys::meta";
         metaData.load (*mReader);
 
-        mMetaData.setRecord (0, Record<MetaData> (RecordBase::State_ModifiedOnly, nullptr, &metaData));
+        mMetaData.setRecord (0, std::make_unique<Record<MetaData> >(
+                    Record<MetaData> (RecordBase::State_ModifiedOnly, nullptr, &metaData)));
     }
 
     return mReader->getRecordCount();
@@ -1011,10 +1012,10 @@ void CSMWorld::Data::loadFallbackEntries()
             ESM::Static newMarker;
             newMarker.mId = marker.first;
             newMarker.mModel = marker.second;
-            CSMWorld::Record<ESM::Static> record;
-            record.mBase = newMarker;
-            record.mState = CSMWorld::RecordBase::State_BaseOnly;
-            mReferenceables.appendRecord (record, CSMWorld::UniversalId::Type_Static);
+            std::unique_ptr<CSMWorld::Record<ESM::Static> > record(new CSMWorld::Record<ESM::Static>);
+            record->mBase = newMarker;
+            record->mState = CSMWorld::RecordBase::State_BaseOnly;
+            mReferenceables.appendRecord (std::move(record), CSMWorld::UniversalId::Type_Static);
         }
     }
 
@@ -1025,10 +1026,10 @@ void CSMWorld::Data::loadFallbackEntries()
             ESM::Door newMarker;
             newMarker.mId = marker.first;
             newMarker.mModel = marker.second;
-            CSMWorld::Record<ESM::Door> record;
-            record.mBase = newMarker;
-            record.mState = CSMWorld::RecordBase::State_BaseOnly;
-            mReferenceables.appendRecord (record, CSMWorld::UniversalId::Type_Door);
+            std::unique_ptr<CSMWorld::Record<ESM::Door> > record(new CSMWorld::Record<ESM::Door>);
+            record->mBase = newMarker;
+            record->mState = CSMWorld::RecordBase::State_BaseOnly;
+            mReferenceables.appendRecord (std::move(record), CSMWorld::UniversalId::Type_Door);
         }
     }
 }
diff --git a/apps/opencs/model/world/idcollection.hpp b/apps/opencs/model/world/idcollection.hpp
index 7849aab926..9f834d8fae 100644
--- a/apps/opencs/model/world/idcollection.hpp
+++ b/apps/opencs/model/world/idcollection.hpp
@@ -83,9 +83,9 @@ namespace CSMWorld
                 return -1;
             }
 
-            Record<ESXRecordT> baseRecord = this->getRecord (index);
-            baseRecord.mState = RecordBase::State_Deleted;
-            this->setRecord (index, baseRecord);
+            std::unique_ptr<Record<ESXRecordT> > baseRecord(new Record<ESXRecordT>(this->getRecord(index)));
+            baseRecord->mState = RecordBase::State_Deleted;
+            this->setRecord(index, std::move(baseRecord));
             return index;
         }
 
@@ -96,30 +96,31 @@ namespace CSMWorld
     int IdCollection<ESXRecordT, IdAccessorT>::load (const ESXRecordT& record, bool base,
         int index)
     {
-        if (index==-2)
+        if (index==-2) // index unknown
             index = this->searchId (IdAccessorT().getId (record));
 
         if (index==-1)
         {
             // new record
-            Record<ESXRecordT> record2;
-            record2.mState = base ? RecordBase::State_BaseOnly : RecordBase::State_ModifiedOnly;
-            (base ? record2.mBase : record2.mModified) = record;
+            std::unique_ptr<Record<ESXRecordT> > record2(new Record<ESXRecordT>);
+            record2->mState = base ? RecordBase::State_BaseOnly : RecordBase::State_ModifiedOnly;
+            (base ? record2->mBase : record2->mModified) = record;
 
             index = this->getSize();
-            this->appendRecord (record2);
+            this->appendRecord(std::move(record2));
         }
         else
         {
             // old record
-            Record<ESXRecordT> record2 = Collection<ESXRecordT, IdAccessorT>::getRecord (index);
+            std::unique_ptr<Record<ESXRecordT> > record2(
+                    new Record<ESXRecordT>(Collection<ESXRecordT, IdAccessorT>::getRecord(index)));
 
             if (base)
-                record2.mBase = record;
+                record2->mBase = record;
             else
-                record2.setModified (record);
+                record2->setModified(record);
 
-            this->setRecord (index, record2);
+            this->setRecord(index, std::move(record2));
         }
 
         return index;
@@ -133,7 +134,7 @@ namespace CSMWorld
         if (index==-1)
             return false;
 
-        Record<ESXRecordT> record = Collection<ESXRecordT, IdAccessorT>::getRecord (index);
+        const Record<ESXRecordT>& record = Collection<ESXRecordT, IdAccessorT>::getRecord (index);
 
         if (record.isDeleted())
             return false;
@@ -144,8 +145,10 @@ namespace CSMWorld
         }
         else
         {
-            record.mState = RecordBase::State_Deleted;
-            this->setRecord (index, record);
+            std::unique_ptr<Record<ESXRecordT> > record2(
+                    new Record<ESXRecordT>(Collection<ESXRecordT, IdAccessorT>::getRecord(index)));
+            record2->mState = RecordBase::State_Deleted;
+            this->setRecord(index, std::move(record2));
         }
 
         return true;
diff --git a/apps/opencs/model/world/idtable.cpp b/apps/opencs/model/world/idtable.cpp
index 30fe6f639a..bce934bd9f 100644
--- a/apps/opencs/model/world/idtable.cpp
+++ b/apps/opencs/model/world/idtable.cpp
@@ -228,23 +228,24 @@ QModelIndex CSMWorld::IdTable::getModelIndex (const std::string& id, int column)
     return QModelIndex();
 }
 
-void CSMWorld::IdTable::setRecord (const std::string& id, const RecordBase& record, CSMWorld::UniversalId::Type type)
+void CSMWorld::IdTable::setRecord (const std::string& id,
+        std::unique_ptr<RecordBase> record, CSMWorld::UniversalId::Type type)
 {
     int index = mIdCollection->searchId (id);
 
     if (index==-1)
     {
-        index = mIdCollection->getAppendIndex (id, type);
+        int index2 = mIdCollection->getAppendIndex (id, type);
 
-        beginInsertRows (QModelIndex(), index, index);
+        beginInsertRows (QModelIndex(), index2, index2);
 
-        mIdCollection->appendRecord (record, type);
+        mIdCollection->appendRecord (std::move(record), type);
 
         endInsertRows();
     }
     else
     {
-        mIdCollection->replace (index, record);
+        mIdCollection->replace (index, std::move(record));
         emit dataChanged (CSMWorld::IdTable::index (index, 0),
             CSMWorld::IdTable::index (index, mIdCollection->getColumns()-1));
     }
diff --git a/apps/opencs/model/world/idtable.hpp b/apps/opencs/model/world/idtable.hpp
index 6b7b8d3182..c38e1b5f9c 100644
--- a/apps/opencs/model/world/idtable.hpp
+++ b/apps/opencs/model/world/idtable.hpp
@@ -2,6 +2,7 @@
 #define CSM_WOLRD_IDTABLE_H
 
 #include <vector>
+#include <memory>
 
 #include "idtablebase.hpp"
 #include "universalid.hpp"
@@ -67,7 +68,7 @@ namespace CSMWorld
 
             QModelIndex getModelIndex (const std::string& id, int column) const override;
 
-            void setRecord (const std::string& id, const RecordBase& record,
+            void setRecord (const std::string& id, std::unique_ptr<RecordBase> record,
                     UniversalId::Type type = UniversalId::Type_None);
             ///< Add record or overwrite existing record.
 
diff --git a/apps/opencs/model/world/infocollection.cpp b/apps/opencs/model/world/infocollection.cpp
index be73aece6f..c64e21d3c7 100644
--- a/apps/opencs/model/world/infocollection.cpp
+++ b/apps/opencs/model/world/infocollection.cpp
@@ -15,23 +15,23 @@ void CSMWorld::InfoCollection::load (const Info& record, bool base)
     if (index==-1)
     {
         // new record
-        Record<Info> record2;
-        record2.mState = base ? RecordBase::State_BaseOnly : RecordBase::State_ModifiedOnly;
-        (base ? record2.mBase : record2.mModified) = record;
+        std::unique_ptr<Record<Info> > record2(new Record<Info>);
+        record2->mState = base ? RecordBase::State_BaseOnly : RecordBase::State_ModifiedOnly;
+        (base ? record2->mBase : record2->mModified) = record;
 
-        std::string topic = Misc::StringUtils::lowerCase (record2.get().mTopicId);
+        std::string topic = Misc::StringUtils::lowerCase (record2->get().mTopicId);
 
-        if (!record2.get().mPrev.empty())
+        if (!record2->get().mPrev.empty())
         {
-            index = getInfoIndex (record2.get().mPrev, topic);
+            index = getInfoIndex (record2->get().mPrev, topic); // WARN: index repurposed
 
             if (index!=-1)
                 ++index;
         }
 
-        if (index==-1 && !record2.get().mNext.empty())
+        if (index==-1 && !record2->get().mNext.empty())
         {
-            index = getInfoIndex (record2.get().mNext, topic);
+            index = getInfoIndex (record2->get().mNext, topic);
         }
 
         if (index==-1)
@@ -41,19 +41,19 @@ void CSMWorld::InfoCollection::load (const Info& record, bool base)
             index = std::distance (getRecords().begin(), range.second);
         }
 
-        insertRecord (record2, index);
+        insertRecord (std::move(record2), index);
     }
     else
     {
         // old record
-        Record<Info> record2 = getRecord (index);
+        std::unique_ptr<Record<Info> > record2(new Record<Info>(getRecord(index)));
 
         if (base)
-            record2.mBase = record;
+            record2->mBase = record;
         else
-            record2.setModified (record);
+            record2->setModified (record);
 
-        setRecord (index, record2);
+        setRecord (index, std::move(record2));
     }
 }
 
@@ -64,7 +64,7 @@ int CSMWorld::InfoCollection::getInfoIndex (const std::string& id, const std::st
     std::pair<RecordConstIterator, RecordConstIterator> range = getTopicRange (topic);
 
     for (; range.first!=range.second; ++range.first)
-        if (Misc::StringUtils::ciEqual(range.first->get().mId, fullId))
+        if (Misc::StringUtils::ciEqual((*range.first).get()->get().mId, fullId))
             return std::distance (getRecords().begin(), range.first);
 
     return -1;
@@ -126,9 +126,9 @@ void CSMWorld::InfoCollection::load (ESM::ESMReader& reader, bool base, const ES
         }
         else
         {
-            Record<Info> record = getRecord (index);
-            record.mState = RecordBase::State_Deleted;
-            setRecord (index, record);
+            std::unique_ptr<Record<Info> > record(new Record<Info>(getRecord(index)));
+            record->mState = RecordBase::State_Deleted;
+            setRecord (index, std::move(record));
         }
     }
     else
@@ -169,7 +169,7 @@ CSMWorld::InfoCollection::Range CSMWorld::InfoCollection::getTopicRange (const s
 
     while (begin != getRecords().begin())
     {
-        if (!Misc::StringUtils::ciEqual(begin->get().mTopicId, topic2))
+        if (!Misc::StringUtils::ciEqual((*begin)->get().mTopicId, topic2))
         {
             // we've gone one too far, go back
             ++begin;
@@ -182,7 +182,7 @@ CSMWorld::InfoCollection::Range CSMWorld::InfoCollection::getTopicRange (const s
     RecordConstIterator end = begin;
 
     for (; end!=getRecords().end(); ++end)
-        if (!Misc::StringUtils::ciEqual(end->get().mTopicId, topic2))
+        if (!Misc::StringUtils::ciEqual((*end)->get().mTopicId, topic2))
             break;
 
     return Range (begin, end);
@@ -197,7 +197,7 @@ void CSMWorld::InfoCollection::removeDialogueInfos(const std::string& dialogueId
     std::map<std::string, int>::const_iterator end = getIdMap().end();
     for (; current != end; ++current)
     {
-        Record<Info> record = getRecord(current->second);
+        const Record<Info>& record = getRecord(current->second);
 
         if (Misc::StringUtils::ciEqual(dialogueId, record.get().mTopicId))
         {
@@ -207,8 +207,9 @@ void CSMWorld::InfoCollection::removeDialogueInfos(const std::string& dialogueId
             }
             else
             {
-                record.mState = RecordBase::State_Deleted;
-                setRecord(current->second, record);
+                std::unique_ptr<Record<Info> > record2(new Record<Info>(record));
+                record2->mState = RecordBase::State_Deleted;
+                setRecord(current->second, std::move(record2));
             }
         }
         else
diff --git a/apps/opencs/model/world/infocollection.hpp b/apps/opencs/model/world/infocollection.hpp
index 8f5aea6012..f0379b3c14 100644
--- a/apps/opencs/model/world/infocollection.hpp
+++ b/apps/opencs/model/world/infocollection.hpp
@@ -15,7 +15,7 @@ namespace CSMWorld
     {
         public:
 
-            typedef std::vector<Record<Info> >::const_iterator RecordConstIterator;
+            typedef std::vector<std::unique_ptr<Record<Info> > >::const_iterator RecordConstIterator;
             typedef std::pair<RecordConstIterator, RecordConstIterator> Range;
 
         private:
diff --git a/apps/opencs/model/world/nestedidcollection.hpp b/apps/opencs/model/world/nestedidcollection.hpp
index 1bd20aeebf..4af864eb42 100644
--- a/apps/opencs/model/world/nestedidcollection.hpp
+++ b/apps/opencs/model/world/nestedidcollection.hpp
@@ -90,23 +90,23 @@ namespace CSMWorld
     template<typename ESXRecordT, typename IdAccessorT>
     void NestedIdCollection<ESXRecordT, IdAccessorT>::addNestedRow(int row, int column, int position)
     {
-        Record<ESXRecordT> record;
-        record.assign(Collection<ESXRecordT, IdAccessorT>::getRecord(row));
+        std::unique_ptr<Record<ESXRecordT> > record(new Record<ESXRecordT>);
+        record->assign(Collection<ESXRecordT, IdAccessorT>::getRecord(row));
 
-        getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column)).addRow(record, position);
+        getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column)).addRow(*record, position);
 
-        Collection<ESXRecordT, IdAccessorT>::setRecord(row, record);
+        Collection<ESXRecordT, IdAccessorT>::setRecord(row, std::move(record));
     }
 
     template<typename ESXRecordT, typename IdAccessorT>
     void NestedIdCollection<ESXRecordT, IdAccessorT>::removeNestedRows(int row, int column, int subRow)
     {
-        Record<ESXRecordT> record;
-        record.assign(Collection<ESXRecordT, IdAccessorT>::getRecord(row));
+        std::unique_ptr<Record<ESXRecordT> > record(new Record<ESXRecordT>);
+        record->assign(Collection<ESXRecordT, IdAccessorT>::getRecord(row));
 
-        getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column)).removeRow(record, subRow);
+        getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column)).removeRow(*record, subRow);
 
-        Collection<ESXRecordT, IdAccessorT>::setRecord(row, record);
+        Collection<ESXRecordT, IdAccessorT>::setRecord(row, std::move(record));
     }
 
     template<typename ESXRecordT, typename IdAccessorT>
@@ -121,13 +121,13 @@ namespace CSMWorld
     void NestedIdCollection<ESXRecordT, IdAccessorT>::setNestedData(int row,
             int column, const QVariant& data, int subRow, int subColumn)
     {
-        Record<ESXRecordT> record;
-        record.assign(Collection<ESXRecordT, IdAccessorT>::getRecord(row));
+        std::unique_ptr<Record<ESXRecordT> > record(new Record<ESXRecordT>);
+        record->assign(Collection<ESXRecordT, IdAccessorT>::getRecord(row));
 
         getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column)).setData(
-                record, data, subRow, subColumn);
+                *record, data, subRow, subColumn);
 
-        Collection<ESXRecordT, IdAccessorT>::setRecord(row, record);
+        Collection<ESXRecordT, IdAccessorT>::setRecord(row, std::move(record));
     }
 
     template<typename ESXRecordT, typename IdAccessorT>
@@ -142,13 +142,13 @@ namespace CSMWorld
     void NestedIdCollection<ESXRecordT, IdAccessorT>::setNestedTable(int row,
             int column, const CSMWorld::NestedTableWrapperBase& nestedTable)
     {
-        Record<ESXRecordT> record;
-        record.assign(Collection<ESXRecordT, IdAccessorT>::getRecord(row));
+        std::unique_ptr<Record<ESXRecordT> > record(new Record<ESXRecordT>);
+        record->assign(Collection<ESXRecordT, IdAccessorT>::getRecord(row));
 
         getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column)).setTable(
-                record, nestedTable);
+                *record, nestedTable);
 
-        Collection<ESXRecordT, IdAccessorT>::setRecord(row, record);
+        Collection<ESXRecordT, IdAccessorT>::setRecord(row, std::move(record));
     }
 
     template<typename ESXRecordT, typename IdAccessorT>
diff --git a/apps/opencs/model/world/nestedinfocollection.cpp b/apps/opencs/model/world/nestedinfocollection.cpp
index 4abaaf9c02..d404bb9a63 100644
--- a/apps/opencs/model/world/nestedinfocollection.cpp
+++ b/apps/opencs/model/world/nestedinfocollection.cpp
@@ -35,22 +35,22 @@ namespace CSMWorld
 
     void NestedInfoCollection::addNestedRow(int row, int column, int position)
     {
-        Record<Info> record;
-        record.assign(Collection<Info, IdAccessor<Info> >::getRecord(row));
+        std::unique_ptr<Record<Info> > record(new Record<Info>);
+        record->assign(Collection<Info, IdAccessor<Info> >::getRecord(row));
 
-        getAdapter(Collection<Info, IdAccessor<Info> >::getColumn(column)).addRow(record, position);
+        getAdapter(Collection<Info, IdAccessor<Info> >::getColumn(column)).addRow(*record, position);
 
-        Collection<Info, IdAccessor<Info> >::setRecord(row, record);
+        Collection<Info, IdAccessor<Info> >::setRecord(row, std::move(record));
     }
 
     void NestedInfoCollection::removeNestedRows(int row, int column, int subRow)
     {
-        Record<Info> record;
-        record.assign(Collection<Info, IdAccessor<Info> >::getRecord(row));
+        std::unique_ptr<Record<Info> > record(new Record<Info>);
+        record->assign(Collection<Info, IdAccessor<Info> >::getRecord(row));
 
-        getAdapter(Collection<Info, IdAccessor<Info> >::getColumn(column)).removeRow(record, subRow);
+        getAdapter(Collection<Info, IdAccessor<Info> >::getColumn(column)).removeRow(*record, subRow);
 
-        Collection<Info, IdAccessor<Info> >::setRecord(row, record);
+        Collection<Info, IdAccessor<Info> >::setRecord(row, std::move(record));
     }
 
     QVariant NestedInfoCollection::getNestedData (int row,
@@ -63,13 +63,13 @@ namespace CSMWorld
     void NestedInfoCollection::setNestedData(int row,
             int column, const QVariant& data, int subRow, int subColumn)
     {
-        Record<Info> record;
-        record.assign(Collection<Info, IdAccessor<Info> >::getRecord(row));
+        std::unique_ptr<Record<Info> > record(new Record<Info>);
+        record->assign(Collection<Info, IdAccessor<Info> >::getRecord(row));
 
         getAdapter(Collection<Info, IdAccessor<Info> >::getColumn(column)).setData(
-                record, data, subRow, subColumn);
+                *record, data, subRow, subColumn);
 
-        Collection<Info, IdAccessor<Info> >::setRecord(row, record);
+        Collection<Info, IdAccessor<Info> >::setRecord(row, std::move(record));
     }
 
     CSMWorld::NestedTableWrapperBase* NestedInfoCollection::nestedTable(int row,
@@ -82,13 +82,13 @@ namespace CSMWorld
     void NestedInfoCollection::setNestedTable(int row,
             int column, const CSMWorld::NestedTableWrapperBase& nestedTable)
     {
-        Record<Info> record;
-        record.assign(Collection<Info, IdAccessor<Info> >::getRecord(row));
+        std::unique_ptr<Record<Info> > record(new Record<Info>);
+        record->assign(Collection<Info, IdAccessor<Info> >::getRecord(row));
 
         getAdapter(Collection<Info, IdAccessor<Info> >::getColumn(column)).setTable(
-                record, nestedTable);
+                *record, nestedTable);
 
-        Collection<Info, IdAccessor<Info> >::setRecord(row, record);
+        Collection<Info, IdAccessor<Info> >::setRecord(row, std::move(record));
     }
 
     int NestedInfoCollection::getNestedRowsCount(int row, int column) const
diff --git a/apps/opencs/model/world/record.hpp b/apps/opencs/model/world/record.hpp
index 5f67a93b12..eb4a74c343 100644
--- a/apps/opencs/model/world/record.hpp
+++ b/apps/opencs/model/world/record.hpp
@@ -1,6 +1,7 @@
 #ifndef CSM_WOLRD_RECORD_H
 #define CSM_WOLRD_RECORD_H
 
+#include <memory>
 #include <stdexcept>
 
 namespace CSMWorld
@@ -20,9 +21,9 @@ namespace CSMWorld
 
         virtual ~RecordBase();
 
-        virtual RecordBase *clone() const = 0;
+        virtual std::unique_ptr<RecordBase> clone() const = 0;
 
-        virtual RecordBase *modifiedCopy() const = 0;
+        virtual std::unique_ptr<RecordBase> modifiedCopy() const = 0;
 
         virtual void assign (const RecordBase& record) = 0;
         ///< Will throw an exception if the types don't match.
@@ -45,9 +46,9 @@ namespace CSMWorld
         Record(State state,
                 const ESXRecordT *base = 0, const ESXRecordT *modified = 0);
 
-        RecordBase *clone() const override;
+        std::unique_ptr<RecordBase> clone() const;
 
-        RecordBase *modifiedCopy() const override;
+        std::unique_ptr<RecordBase> modifiedCopy() const;
 
         void assign (const RecordBase& record) override;
 
@@ -85,15 +86,16 @@ namespace CSMWorld
     }
 
     template <typename ESXRecordT>
-    RecordBase *Record<ESXRecordT>::modifiedCopy() const
+    std::unique_ptr<RecordBase> Record<ESXRecordT>::modifiedCopy() const
     {
-        return new Record<ESXRecordT> (State_ModifiedOnly, nullptr, &(this->get()));
+        return std::make_unique<Record<ESXRecordT> >(
+                Record<ESXRecordT>(State_ModifiedOnly, nullptr, &(this->get())));
     }
 
     template <typename ESXRecordT>
-    RecordBase *Record<ESXRecordT>::clone() const
+    std::unique_ptr<RecordBase> Record<ESXRecordT>::clone() const
     {
-        return new Record<ESXRecordT> (*this);
+        return std::make_unique<Record<ESXRecordT> >(Record<ESXRecordT>(*this));
     }
 
     template <typename ESXRecordT>
diff --git a/apps/opencs/model/world/refcollection.cpp b/apps/opencs/model/world/refcollection.cpp
index 003a300c06..f5210ca3e4 100644
--- a/apps/opencs/model/world/refcollection.cpp
+++ b/apps/opencs/model/world/refcollection.cpp
@@ -84,8 +84,6 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
 
             int index = getIndex (iter->second);
 
-            Record<CellRef> record = getRecord (index);
-
             if (base)
             {
                 removeRows (index, 1);
@@ -93,8 +91,9 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
             }
             else
             {
-                record.mState = RecordBase::State_Deleted;
-                setRecord (index, record);
+                std::unique_ptr<Record<CellRef> > record2(new Record<CellRef>(getRecord(index)));
+                record2->mState = RecordBase::State_Deleted;
+                setRecord(index, std::move(record2));
             }
 
             continue;
@@ -105,13 +104,13 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
             // new reference
             ref.mId = getNewId();
 
-            Record<CellRef> record;
-            record.mState = base ? RecordBase::State_BaseOnly : RecordBase::State_ModifiedOnly;
+            std::unique_ptr<Record<CellRef> > record(new Record<CellRef>);
+            record->mState = base ? RecordBase::State_BaseOnly : RecordBase::State_ModifiedOnly;
             const ESM::RefNum refNum = ref.mRefNum;
             std::string refId = ref.mId;
-            (base ? record.mBase : record.mModified) = std::move(ref);
+            (base ? record->mBase : record->mModified) = std::move(ref);
 
-            appendRecord (record);
+            appendRecord(std::move(record));
 
             cache.emplace(refNum, std::move(refId));
         }
@@ -122,11 +121,11 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
 
             int index = getIndex (ref.mId);
 
-            Record<CellRef> record = getRecord (index);
-            record.mState = base ? RecordBase::State_BaseOnly : RecordBase::State_Modified;
-            (base ? record.mBase : record.mModified) = std::move(ref);
+            std::unique_ptr<Record<CellRef> > record(new Record<CellRef>(getRecord(index)));
+            record->mState = base ? RecordBase::State_BaseOnly : RecordBase::State_Modified;
+            (base ? record->mBase : record->mModified) = std::move(ref);
 
-            setRecord (index, record);
+            setRecord(index, std::move(record));
         }
     }
 }
diff --git a/apps/opencs/model/world/refidcollection.cpp b/apps/opencs/model/world/refidcollection.cpp
index 0cf9a4e6dc..7f3e71106c 100644
--- a/apps/opencs/model/world/refidcollection.cpp
+++ b/apps/opencs/model/world/refidcollection.cpp
@@ -796,18 +796,19 @@ int CSMWorld::RefIdCollection::searchId (const std::string& id) const
     return mData.localToGlobalIndex (localIndex);
 }
 
-void CSMWorld::RefIdCollection::replace (int index, const RecordBase& record)
+void CSMWorld::RefIdCollection::replace (int index, std::unique_ptr<RecordBase> record)
 {
-    mData.getRecord (mData.globalToLocalIndex (index)).assign (record);
+    mData.getRecord (mData.globalToLocalIndex (index)).assign (*record.release());
 }
 
 void CSMWorld::RefIdCollection::cloneRecord(const std::string& origin,
                                      const std::string& destination,
                                      const CSMWorld::UniversalId::Type type)
 {
-        std::unique_ptr<RecordBase> newRecord(mData.getRecord(mData.searchId(origin)).modifiedCopy());
+        std::unique_ptr<RecordBase> newRecord =
+            std::move(mData.getRecord(mData.searchId(origin)).modifiedCopy());
         mAdapters.find(type)->second->setId(*newRecord, destination);
-        mData.insertRecord(*newRecord, type, destination);
+        mData.insertRecord(std::move(newRecord), type, destination);
 }
 
 bool CSMWorld::RefIdCollection::touchRecord(const std::string& id)
@@ -816,16 +817,16 @@ bool CSMWorld::RefIdCollection::touchRecord(const std::string& id)
     return false;
 }
 
-void CSMWorld::RefIdCollection::appendRecord (const RecordBase& record,
+void CSMWorld::RefIdCollection::appendRecord (std::unique_ptr<RecordBase> record,
     UniversalId::Type type)
 {
-    std::string id = findAdapter (type).getId (record);
+    std::string id = findAdapter (type).getId (*record.get());
 
     int index = mData.getAppendIndex (type);
 
     mData.appendRecord (type, id, false);
 
-    mData.getRecord (mData.globalToLocalIndex (index)).assign (record);
+    mData.getRecord (mData.globalToLocalIndex (index)).assign (*record.release());
 }
 
 const CSMWorld::RecordBase& CSMWorld::RefIdCollection::getRecord (const std::string& id) const
diff --git a/apps/opencs/model/world/refidcollection.hpp b/apps/opencs/model/world/refidcollection.hpp
index 5b38e80da5..dc722055ff 100644
--- a/apps/opencs/model/world/refidcollection.hpp
+++ b/apps/opencs/model/world/refidcollection.hpp
@@ -89,12 +89,12 @@ namespace CSMWorld
             ////< Search record with \a id.
             /// \return index of record (if found) or -1 (not found)
 
-            void replace (int index, const RecordBase& record) override;
+            void replace (int index, std::unique_ptr<RecordBase> record) override;
             ///< If the record type does not match, an exception is thrown.
             ///
             /// \attention \a record must not change the ID.
 
-            void appendRecord (const RecordBase& record, UniversalId::Type type) override;
+            void appendRecord (std::unique_ptr<RecordBase> record, UniversalId::Type type) override;
             ///< If the record type does not match, an exception is thrown.
             ///
             ///< \param type Will be ignored, unless the collection supports multiple record types
diff --git a/apps/opencs/model/world/refiddata.cpp b/apps/opencs/model/world/refiddata.cpp
index 79a2efdcc8..df8e06c251 100644
--- a/apps/opencs/model/world/refiddata.cpp
+++ b/apps/opencs/model/world/refiddata.cpp
@@ -400,7 +400,7 @@ const CSMWorld::RefIdDataContainer< ESM::Static >& CSMWorld::RefIdData::getStati
     return mStatics;
 }
 
-void CSMWorld::RefIdData::insertRecord (CSMWorld::RecordBase& record, CSMWorld::UniversalId::Type type, const std::string& id)
+void CSMWorld::RefIdData::insertRecord (std::unique_ptr<CSMWorld::RecordBase> record, CSMWorld::UniversalId::Type type, const std::string& id)
 {
   std::map<UniversalId::Type, RefIdDataContainerBase *>::iterator iter =
         mRecordContainers.find (type);
@@ -408,7 +408,7 @@ void CSMWorld::RefIdData::insertRecord (CSMWorld::RecordBase& record, CSMWorld::
     if (iter==mRecordContainers.end())
         throw std::logic_error ("invalid local index type");
 
-    iter->second->insertRecord(record);
+    iter->second->insertRecord(std::move(record));
 
     mIndex.insert (std::make_pair (Misc::StringUtils::lowerCase (id),
         LocalIndex (iter->second->getSize()-1, type)));
@@ -420,9 +420,7 @@ void CSMWorld::RefIdData::copyTo (int index, RefIdData& target) const
 
     RefIdDataContainerBase *source = mRecordContainers.find (localIndex.second)->second;
 
-    std::string id = source->getId (localIndex.first);
-
-    std::unique_ptr<CSMWorld::RecordBase> newRecord (source->getRecord (localIndex.first).modifiedCopy());
-
-    target.insertRecord (*newRecord, localIndex.second, id);
+    target.insertRecord(source->getRecord(localIndex.first).modifiedCopy(),
+                        localIndex.second,
+                        source->getId(localIndex.first));
 }
diff --git a/apps/opencs/model/world/refiddata.hpp b/apps/opencs/model/world/refiddata.hpp
index ab5269b390..7eeb936985 100644
--- a/apps/opencs/model/world/refiddata.hpp
+++ b/apps/opencs/model/world/refiddata.hpp
@@ -3,6 +3,7 @@
 
 #include <vector>
 #include <map>
+#include <memory>
 
 #include <components/esm/loadacti.hpp>
 #include <components/esm/loadalch.hpp>
@@ -51,7 +52,7 @@ namespace CSMWorld
 
         virtual void appendRecord (const std::string& id, bool base) = 0;
 
-        virtual void insertRecord (RecordBase& record) = 0;
+        virtual void insertRecord (std::unique_ptr<RecordBase> record) = 0;
 
         virtual int load (ESM::ESMReader& reader, bool base) = 0;
         ///< \return index of a loaded record or -1 if no record was loaded
@@ -66,7 +67,7 @@ namespace CSMWorld
     template<typename RecordT>
     struct RefIdDataContainer : public RefIdDataContainerBase
     {
-        std::vector<Record<RecordT> > mContainer;
+        std::vector<std::unique_ptr<Record<RecordT> > > mContainer;
 
         int getSize() const override;
 
@@ -78,7 +79,7 @@ namespace CSMWorld
 
         void appendRecord (const std::string& id, bool base) override;
 
-        void insertRecord (RecordBase& record) override;
+        void insertRecord (std::unique_ptr<RecordBase> record) override;
 
         int load (ESM::ESMReader& reader, bool base) override;
         ///< \return index of a loaded record or -1 if no record was loaded
@@ -91,10 +92,18 @@ namespace CSMWorld
     };
 
     template<typename RecordT>
-    void RefIdDataContainer<RecordT>::insertRecord(RecordBase& record)
+    void RefIdDataContainer<RecordT>::insertRecord(std::unique_ptr<RecordBase> record)
     {
-        Record<RecordT>& newRecord = dynamic_cast<Record<RecordT>& >(record);
-        mContainer.push_back(newRecord);
+        Record<RecordT> *tmp = dynamic_cast<Record<RecordT>*>(record.get());
+        if(tmp != nullptr)
+        {
+            record.release();
+            std::unique_ptr<Record<RecordT> > newRecord;
+            newRecord.reset(tmp);
+            mContainer.push_back(std::move(newRecord));
+        }
+        else
+            throw std::runtime_error ("invalid record for RefIdDataContainer");
     }
 
     template<typename RecordT>
@@ -106,33 +115,33 @@ namespace CSMWorld
     template<typename RecordT>
     const RecordBase& RefIdDataContainer<RecordT>::getRecord (int index) const
     {
-        return mContainer.at (index);
+        return *mContainer.at (index);
     }
 
     template<typename RecordT>
     RecordBase& RefIdDataContainer<RecordT>::getRecord (int index)
     {
-        return mContainer.at (index);
+        return *mContainer.at (index);
     }
 
     template<typename RecordT>
     unsigned int RefIdDataContainer<RecordT>::getRecordFlags (int index) const
     {
-        return mContainer.at (index).get().mRecordFlags;
+        return mContainer.at (index)->get().mRecordFlags;
     }
 
     template<typename RecordT>
     void RefIdDataContainer<RecordT>::appendRecord (const std::string& id, bool base)
     {
-        Record<RecordT> record;
+        std::unique_ptr<Record<RecordT> > record(new Record<RecordT>);
 
-        record.mState = base ? RecordBase::State_BaseOnly : RecordBase::State_ModifiedOnly;
+        record->mState = base ? RecordBase::State_BaseOnly : RecordBase::State_ModifiedOnly;
 
-        record.mBase.mId = id;
-        record.mModified.mId = id;
-        (base ? record.mBase : record.mModified).blank();
+        record->mBase.mId = id;
+        record->mModified.mId = id;
+        (base ? record->mBase : record->mModified).blank();
 
-        mContainer.push_back (record);
+        mContainer.push_back (std::move(record));
     }
 
     template<typename RecordT>
@@ -147,7 +156,7 @@ namespace CSMWorld
         int numRecords = static_cast<int>(mContainer.size());
         for (; index < numRecords; ++index)
         {
-            if (Misc::StringUtils::ciEqual(mContainer[index].get().mId, record.mId))
+            if (Misc::StringUtils::ciEqual(mContainer[index]->get().mId, record.mId))
             {
                 break;
             }
@@ -165,7 +174,7 @@ namespace CSMWorld
 
             // Flag the record as Deleted even for a base content file.
             // RefIdData is responsible for its erasure.
-            mContainer[index].mState = RecordBase::State_Deleted;
+            mContainer[index]->mState = RecordBase::State_Deleted;
         }
         else
         {
@@ -174,22 +183,22 @@ namespace CSMWorld
                 appendRecord(record.mId, base);
                 if (base)
                 {
-                    mContainer.back().mBase = record;
+                    mContainer.back()->mBase = record;
                 }
                 else
                 {
-                    mContainer.back().mModified = record;
+                    mContainer.back()->mModified = record;
                 }
             }
             else if (!base)
             {
-                mContainer[index].setModified(record);
+                mContainer[index]->setModified(record);
             }
             else
             {
                 // Overwrite
-                mContainer[index].setModified(record);
-                mContainer[index].merge();
+                mContainer[index]->setModified(record);
+                mContainer[index]->merge();
             }
         }
 
@@ -208,13 +217,13 @@ namespace CSMWorld
     template<typename RecordT>
     std::string RefIdDataContainer<RecordT>::getId (int index) const
     {
-        return mContainer.at (index).get().mId;
+        return mContainer.at (index)->get().mId;
     }
 
     template<typename RecordT>
     void RefIdDataContainer<RecordT>::save (int index, ESM::ESMWriter& writer) const
     {
-        Record<RecordT> record = mContainer.at(index);
+        const Record<RecordT>& record = *mContainer.at(index);
 
         if (record.isModified() || record.mState == RecordBase::State_Deleted)
         {
@@ -276,7 +285,7 @@ namespace CSMWorld
 
             void erase (int index, int count);
 
-            void insertRecord (CSMWorld::RecordBase& record, CSMWorld::UniversalId::Type type,
+            void insertRecord (std::unique_ptr<RecordBase> record, CSMWorld::UniversalId::Type type,
                 const std::string& id);
 
             const RecordBase& getRecord (const LocalIndex& index) const;

From 66bda842405b431c50d781db036b6a51128a99b5 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Fri, 23 Jul 2021 15:30:33 +1000
Subject: [PATCH 1054/2859] Convert RefNum index map to use find().

(copied the changes from commits 68e16b6cee0f533027e1d8f1293b8a5582ac5a68 and 0de223c637d0820a97417d84796c1bfeb1836fb8)

NOTE: it is unclear how this change affects commit 61a4a0807b4ed2398b8169b477132b12a1a3a106
---
 apps/opencs/model/world/data.hpp          |  2 +-
 apps/opencs/model/world/refcollection.cpp | 22 ++++++++--------------
 apps/opencs/model/world/refcollection.hpp |  2 +-
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/apps/opencs/model/world/data.hpp b/apps/opencs/model/world/data.hpp
index 5e2054b712..f7a51b289f 100644
--- a/apps/opencs/model/world/data.hpp
+++ b/apps/opencs/model/world/data.hpp
@@ -118,7 +118,7 @@ namespace CSMWorld
             const ESM::Dialogue *mDialogue; // last loaded dialogue
             bool mBase;
             bool mProject;
-            std::map<std::string, std::map<ESM::RefNum, std::string> > mRefLoadCache;
+            std::map<std::string, std::map<unsigned int, std::string> > mRefLoadCache;
             int mReaderIndex;
 
             bool mFsStrict;
diff --git a/apps/opencs/model/world/refcollection.cpp b/apps/opencs/model/world/refcollection.cpp
index f5210ca3e4..a26bf1d2f4 100644
--- a/apps/opencs/model/world/refcollection.cpp
+++ b/apps/opencs/model/world/refcollection.cpp
@@ -8,7 +8,7 @@
 #include "record.hpp"
 
 void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool base,
-    std::map<ESM::RefNum, std::string>& cache, CSMDoc::Messages& messages)
+    std::map<unsigned int, std::string>& cache, CSMDoc::Messages& messages)
 {
     Record<Cell> cell = mCells.getRecord (cellIndex);
 
@@ -60,16 +60,12 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
         else
             ref.mCell = cell2.mId;
 
-        // ignore content file number
-        std::map<ESM::RefNum, std::string>::iterator iter = cache.begin();
-        unsigned int thisIndex = ref.mRefNum.mIndex & 0x00ffffff;
-        if (ref.mRefNum.mContentFile != -1 && !base) ref.mRefNum.mContentFile = ref.mRefNum.mIndex >> 24;
+        unsigned int  refNum = (ref.mRefNum.mIndex & 0x00ffffff) |
+            (ref.mRefNum.hasContentFile() ? ref.mRefNum.mContentFile : 0xff) << 24;
 
-        for (; iter != cache.end(); ++iter)
-        {
-            if (thisIndex == iter->first.mIndex)
-                break;
-        }
+        std::map<unsigned int, std::string>::iterator iter = cache.find(refNum);
+
+        if (ref.mRefNum.mContentFile != -1 && !base) ref.mRefNum.mContentFile = ref.mRefNum.mIndex >> 24;
 
         if (isDeleted)
         {
@@ -104,15 +100,13 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
             // new reference
             ref.mId = getNewId();
 
+            cache.emplace(refNum, ref.mId);
+
             std::unique_ptr<Record<CellRef> > record(new Record<CellRef>);
             record->mState = base ? RecordBase::State_BaseOnly : RecordBase::State_ModifiedOnly;
-            const ESM::RefNum refNum = ref.mRefNum;
-            std::string refId = ref.mId;
             (base ? record->mBase : record->mModified) = std::move(ref);
 
             appendRecord(std::move(record));
-
-            cache.emplace(refNum, std::move(refId));
         }
         else
         {
diff --git a/apps/opencs/model/world/refcollection.hpp b/apps/opencs/model/world/refcollection.hpp
index d031398d3f..42bb363570 100644
--- a/apps/opencs/model/world/refcollection.hpp
+++ b/apps/opencs/model/world/refcollection.hpp
@@ -27,7 +27,7 @@ namespace CSMWorld
             {}
 
             void load (ESM::ESMReader& reader, int cellIndex, bool base,
-                std::map<ESM::RefNum, std::string>& cache, CSMDoc::Messages& messages);
+                std::map<unsigned int, std::string>& cache, CSMDoc::Messages& messages);
             ///< Load a sequence of references.
 
             std::string getNewId();

From 5fffcab94f57c8f9f20404d795ea3cd1de89fe9b Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Fri, 23 Jul 2021 16:05:58 +1000
Subject: [PATCH 1055/2859] Performance improvements for loading Info records.

- The order of info records with the same topic are maintained in Collection::mRecords
- The index lookup data structure are not ordered.  The topic string is hashed.  The infos for the topic are simply placed in a vector.
- The index values for appending or inserting a record takes prev/next values (if exist)
- FIXME: prev/next values are not adjusted for adding or removing records
- FIXME: undo after reordering does not reset the modified flag

(copied the changes from commit SHA-1: 06f9922822bf5a076894bce44bde37234d7ccee1)
---
 CMakeLists.txt                             |   1 +
 apps/opencs/CMakeLists.txt                 |   1 +
 apps/opencs/model/world/collection.hpp     |   8 -
 apps/opencs/model/world/collectionbase.cpp |   5 +
 apps/opencs/model/world/collectionbase.hpp |   6 +
 apps/opencs/model/world/idtable.cpp        |   8 +-
 apps/opencs/model/world/infocollection.cpp | 335 ++++++++++---
 apps/opencs/model/world/infocollection.hpp |  76 ++-
 extern/murmurhash/CMakeLists.txt           |  17 +
 extern/murmurhash/MurmurHash2.cpp          | 522 +++++++++++++++++++++
 extern/murmurhash/MurmurHash2.h            |  38 ++
 11 files changed, 929 insertions(+), 88 deletions(-)
 create mode 100644 extern/murmurhash/CMakeLists.txt
 create mode 100644 extern/murmurhash/MurmurHash2.cpp
 create mode 100644 extern/murmurhash/MurmurHash2.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b69cb5b71f..f40d77c1dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -536,6 +536,7 @@ endif (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clan
 add_subdirectory (extern/osg-ffmpeg-videoplayer)
 add_subdirectory (extern/oics)
 add_subdirectory (extern/Base64)
+add_subdirectory (extern/murmurhash)
 if (BUILD_OPENCS)
     add_subdirectory (extern/osgQt)
 endif()
diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 88c4233c9c..9a70950879 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -226,6 +226,7 @@ target_link_libraries(openmw-cs
     ${OSGTEXT_LIBRARIES}
     ${OSG_LIBRARIES}
     ${EXTERN_OSGQT_LIBRARY}
+    ${MURMURHASH_LIBRARIES}
     ${Boost_SYSTEM_LIBRARY}
     ${Boost_FILESYSTEM_LIBRARY}
     ${Boost_PROGRAM_OPTIONS_LIBRARY}
diff --git a/apps/opencs/model/world/collection.hpp b/apps/opencs/model/world/collection.hpp
index 8fc5d076ce..89430f1c58 100644
--- a/apps/opencs/model/world/collection.hpp
+++ b/apps/opencs/model/world/collection.hpp
@@ -95,8 +95,6 @@ namespace CSMWorld
 
         protected:
 
-            const std::map<std::string, int>& getIdMap() const;
-
             const std::vector<std::unique_ptr<Record<ESXRecordT> > >& getRecords() const;
 
             bool reorderRowsImp (int baseIndex, const std::vector<int>& newOrder);
@@ -205,12 +203,6 @@ namespace CSMWorld
             NestableColumn *getNestableColumn (int column) const;
     };
 
-    template<typename ESXRecordT, typename IdAccessorT>
-    const std::map<std::string, int>& Collection<ESXRecordT, IdAccessorT>::getIdMap() const
-    {
-        return mIndex;
-    }
-
     template<typename ESXRecordT, typename IdAccessorT>
     const std::vector<std::unique_ptr<Record<ESXRecordT> > >& Collection<ESXRecordT, IdAccessorT>::getRecords() const
     {
diff --git a/apps/opencs/model/world/collectionbase.cpp b/apps/opencs/model/world/collectionbase.cpp
index 6134dc1727..f20fc643e2 100644
--- a/apps/opencs/model/world/collectionbase.cpp
+++ b/apps/opencs/model/world/collectionbase.cpp
@@ -8,6 +8,11 @@ CSMWorld::CollectionBase::CollectionBase() {}
 
 CSMWorld::CollectionBase::~CollectionBase() {}
 
+int CSMWorld::CollectionBase::getInsertIndex (const std::string& id, UniversalId::Type type, RecordBase *record) const
+{
+    return getAppendIndex(id, type);
+}
+
 int CSMWorld::CollectionBase::searchColumnIndex (Columns::ColumnId id) const
 {
     int columns = getColumns();
diff --git a/apps/opencs/model/world/collectionbase.hpp b/apps/opencs/model/world/collectionbase.hpp
index ae06d892f5..13471b9886 100644
--- a/apps/opencs/model/world/collectionbase.hpp
+++ b/apps/opencs/model/world/collectionbase.hpp
@@ -100,6 +100,12 @@ namespace CSMWorld
             ///
             /// \return Success?
 
+            virtual int getInsertIndex (const std::string& id,
+                UniversalId::Type type = UniversalId::Type_None,
+                RecordBase *record = nullptr) const;
+            ///< Works like getAppendIndex unless an overloaded method uses the record pointer
+            /// to get additional info about the record that results in an alternative index.
+
             int searchColumnIndex (Columns::ColumnId id) const;
             ///< Return index of column with the given \a id. If no such column exists, -1 is returned.
 
diff --git a/apps/opencs/model/world/idtable.cpp b/apps/opencs/model/world/idtable.cpp
index bce934bd9f..8fb3cd6593 100644
--- a/apps/opencs/model/world/idtable.cpp
+++ b/apps/opencs/model/world/idtable.cpp
@@ -235,7 +235,13 @@ void CSMWorld::IdTable::setRecord (const std::string& id,
 
     if (index==-1)
     {
-        int index2 = mIdCollection->getAppendIndex (id, type);
+        // For info records, appendRecord may use a different index than the one returned by
+        // getAppendIndex (because of prev/next links).  This can result in the display not
+        // updating correctly after an undo
+        //
+        // Use an alternative method to get the correct index.  For non-Info records the
+        // record pointer is ignored and internally calls getAppendIndex.
+        int index2 = mIdCollection->getInsertIndex (id, type, record.get());
 
         beginInsertRows (QModelIndex(), index2, index2);
 
diff --git a/apps/opencs/model/world/infocollection.cpp b/apps/opencs/model/world/infocollection.cpp
index c64e21d3c7..d229ddacc2 100644
--- a/apps/opencs/model/world/infocollection.cpp
+++ b/apps/opencs/model/world/infocollection.cpp
@@ -8,40 +8,79 @@
 
 #include <components/misc/stringops.hpp>
 
-void CSMWorld::InfoCollection::load (const Info& record, bool base)
+namespace CSMWorld
 {
-    int index = searchId (record.mId);
+    template<>
+    void Collection<Info, IdAccessor<Info> >::removeRows (int index, int count)
+    {
+        mRecords.erase(mRecords.begin()+index, mRecords.begin()+index+count);
 
-    if (index==-1)
+        // index map is updated in InfoCollection::removeRows()
+    }
+
+    template<>
+    void Collection<Info, IdAccessor<Info> >::insertRecord (std::unique_ptr<RecordBase> record,
+        int index, UniversalId::Type type)
     {
-        // new record
-        std::unique_ptr<Record<Info> > record2(new Record<Info>);
-        record2->mState = base ? RecordBase::State_BaseOnly : RecordBase::State_ModifiedOnly;
-        (base ? record2->mBase : record2->mModified) = record;
+        int size = static_cast<int>(mRecords.size());
+        if (index < 0 || index > size)
+            throw std::runtime_error("index out of range");
 
-        std::string topic = Misc::StringUtils::lowerCase (record2->get().mTopicId);
+        std::unique_ptr<Record<Info> > record2(static_cast<Record<Info>*>(record.release()));
 
-        if (!record2->get().mPrev.empty())
-        {
-            index = getInfoIndex (record2->get().mPrev, topic); // WARN: index repurposed
+        if (index == size)
+            mRecords.push_back(std::move(record2));
+        else
+            mRecords.insert(mRecords.begin()+index, std::move(record2));
 
-            if (index!=-1)
-                ++index;
-        }
+        // index map is updated in InfoCollection::insertRecord()
+    }
 
-        if (index==-1 && !record2->get().mNext.empty())
+    template<>
+    bool Collection<Info, IdAccessor<Info> >::reorderRowsImp (int baseIndex,
+        const std::vector<int>& newOrder)
+    {
+        if (!newOrder.empty())
         {
-            index = getInfoIndex (record2->get().mNext, topic);
-        }
+            int size = static_cast<int>(newOrder.size());
 
-        if (index==-1)
-        {
-            Range range = getTopicRange (topic);
+            // check that all indices are present
+            std::vector<int> test(newOrder);
+            std::sort(test.begin(), test.end());
+            if (*test.begin() != 0 || *--test.end() != size-1)
+                return false;
+
+            // reorder records
+            std::vector<std::unique_ptr<Record<Info> > > buffer(size);
+
+            // FIXME: BUG: undo does not remove modified flag
+            for (int i = 0; i < size; ++i)
+            {
+                buffer[newOrder[i]] = std::move(mRecords[baseIndex+i]);
+                buffer[newOrder[i]]->setModified(buffer[newOrder[i]]->get());
+            }
+
+            std::move(buffer.begin(), buffer.end(), mRecords.begin()+baseIndex);
 
-            index = std::distance (getRecords().begin(), range.second);
+            // index map is updated in InfoCollection::reorderRows()
         }
 
-        insertRecord (std::move(record2), index);
+        return true;
+    }
+}
+
+void CSMWorld::InfoCollection::load (const Info& record, bool base)
+{
+    int index = searchId (record.mId);
+
+    if (index==-1)
+    {
+        // new record
+        std::unique_ptr<Record<Info> > record2(new Record<Info>);
+        record2->mState = base ? RecordBase::State_BaseOnly : RecordBase::State_ModifiedOnly;
+        (base ? record2->mBase : record2->mModified) = record;
+
+        appendRecord(std::move(record2));
     }
     else
     {
@@ -59,30 +98,74 @@ void CSMWorld::InfoCollection::load (const Info& record, bool base)
 
 int CSMWorld::InfoCollection::getInfoIndex (const std::string& id, const std::string& topic) const
 {
-    std::string fullId = Misc::StringUtils::lowerCase (topic) + "#" +  id;
+    // find the topic first
+    std::map<StringHash, std::vector<std::pair<std::string, int> > >::const_iterator iter
+        = mInfoIndex.find(StringHash(std::make_shared<std::string>(Misc::StringUtils::lowerCase(topic))));
 
-    std::pair<RecordConstIterator, RecordConstIterator> range = getTopicRange (topic);
+    if (iter == mInfoIndex.end())
+        return -1;
 
-    for (; range.first!=range.second; ++range.first)
-        if (Misc::StringUtils::ciEqual((*range.first).get()->get().mId, fullId))
-            return std::distance (getRecords().begin(), range.first);
+    // brute force loop
+    for (std::vector<std::pair<std::string, int> >::const_iterator it = iter->second.begin();
+            it != iter->second.end(); ++it)
+    {
+        if (Misc::StringUtils::ciEqual(it->first, id))
+            return it->second;
+    }
 
     return -1;
 }
 
-int CSMWorld::InfoCollection::getAppendIndex (const std::string& id, UniversalId::Type type) const
+// Calling insertRecord() using index from getInsertIndex() needs to take into account of
+// prev/next records; an example is deleting a record then undo
+int CSMWorld::InfoCollection::getInsertIndex (const std::string& id,
+        UniversalId::Type type, RecordBase *record) const
 {
-    std::string::size_type separator = id.find_last_of ('#');
+    if (record == nullptr)
+    {
+        std::string::size_type separator = id.find_last_of('#');
 
-    if (separator==std::string::npos)
-        throw std::runtime_error ("invalid info ID: " + id);
+        if (separator == std::string::npos)
+            throw std::runtime_error("invalid info ID: " + id);
 
-    std::pair<RecordConstIterator, RecordConstIterator> range = getTopicRange (id.substr (0, separator));
+        std::pair<RecordConstIterator, RecordConstIterator> range = getTopicRange(id.substr(0, separator));
 
-    if (range.first==range.second)
-        return Collection<Info, IdAccessor<Info> >::getAppendIndex (id, type);
+        if (range.first == range.second)
+            return Collection<Info, IdAccessor<Info> >::getAppendIndex(id, type);
+
+        return std::distance(getRecords().begin(), range.second);
+    }
 
-    return std::distance (getRecords().begin(), range.second);
+    int index = -1;
+
+    const Info& info = static_cast<Record<Info>*>(record)->get();
+    std::string topic = info.mTopicId;
+
+    // if the record has a prev, find its index value
+    if (!info.mPrev.empty())
+    {
+        index = getInfoIndex(info.mPrev, topic);
+
+        if (index != -1)
+            ++index; // if prev exists, set current index to one above prev
+    }
+
+    // if prev doesn't exist or not found and the record has a next, find its index value
+    if (index == -1 && !info.mNext.empty())
+    {
+        // if next exists, use its index as the current index
+        index = getInfoIndex(info.mNext, topic);
+    }
+
+    // if next doesn't exist or not found (i.e. neither exist yet) then start a new one
+    if (index == -1)
+    {
+        Range range = getTopicRange(topic); // getTopicRange converts topic to lower case first
+
+        index = std::distance(getRecords().begin(), range.second);
+    }
+
+    return index;
 }
 
 bool CSMWorld::InfoCollection::reorderRows (int baseIndex, const std::vector<int>& newOrder)
@@ -99,7 +182,23 @@ bool CSMWorld::InfoCollection::reorderRows (int baseIndex, const std::vector<int
         return false;
 
     // reorder
-    return reorderRowsImp (baseIndex, newOrder);
+    if (!Collection<Info, IdAccessor<Info> >::reorderRowsImp(baseIndex, newOrder))
+        return false;
+
+    // adjust index
+    int size = static_cast<int>(newOrder.size());
+    for (std::map<StringHash, std::vector<std::pair<std::string, int> > >::iterator iter
+            = mInfoIndex.begin(); iter != mInfoIndex.end(); ++iter)
+    {
+        for (std::vector<std::pair<std::string, int> >::iterator it = iter->second.begin();
+                it != iter->second.end(); ++it)
+        {
+            if (it->second >= baseIndex && it->second < baseIndex+size)
+                it->second = newOrder.at(it->second-baseIndex)+baseIndex;
+        }
+    }
+
+    return true;
 }
 
 void CSMWorld::InfoCollection::load (ESM::ESMReader& reader, bool base, const ESM::Dialogue& dialogue)
@@ -142,74 +241,54 @@ void CSMWorld::InfoCollection::load (ESM::ESMReader& reader, bool base, const ES
 CSMWorld::InfoCollection::Range CSMWorld::InfoCollection::getTopicRange (const std::string& topic)
     const
 {
-    std::string topic2 = Misc::StringUtils::lowerCase (topic);
-
-    std::map<std::string, int>::const_iterator iter = getIdMap().lower_bound (topic2);
-
-    // Skip invalid records: The beginning of a topic string could be identical to another topic
-    // string.
-    for (; iter!=getIdMap().end(); ++iter)
-    {
-        std::string testTopicId =
-            Misc::StringUtils::lowerCase (getRecord (iter->second).get().mTopicId);
-
-        if (testTopicId==topic2)
-            break;
+    std::string lowerTopic = Misc::StringUtils::lowerCase (topic);
 
-        std::size_t size = topic2.size();
+    // find the topic
+    std::map<StringHash, std::vector<std::pair<std::string, int> > >::const_iterator iter
+        = mInfoIndex.find(StringHash(std::make_shared<std::string>(lowerTopic)));
 
-        if (testTopicId.size()<size || testTopicId.substr (0, size)!=topic2)
-            return Range (getRecords().end(), getRecords().end());
-    }
-
-    if (iter==getIdMap().end())
+    if (iter == mInfoIndex.end())
         return Range (getRecords().end(), getRecords().end());
 
-    RecordConstIterator begin = getRecords().begin()+iter->second;
-
-    while (begin != getRecords().begin())
+    // topic found, find the starting index
+    int low = INT_MAX;
+    for (std::vector<std::pair<std::string, int> >::const_iterator it = iter->second.begin();
+            it != iter->second.end(); ++it)
     {
-        if (!Misc::StringUtils::ciEqual((*begin)->get().mTopicId, topic2))
-        {
-            // we've gone one too far, go back
-            ++begin;
-            break;
-        }
-        --begin;
+        low = std::min(low, it->second);
     }
 
-    // Find end
-    RecordConstIterator end = begin;
+    RecordConstIterator begin = getRecords().begin() + low;
 
-    for (; end!=getRecords().end(); ++end)
-        if (!Misc::StringUtils::ciEqual((*end)->get().mTopicId, topic2))
-            break;
+    // Find end (one past the range)
+    RecordConstIterator end = begin + iter->second.size();
+    if (end != getRecords().end())
+        ++end;
 
     return Range (begin, end);
 }
 
 void CSMWorld::InfoCollection::removeDialogueInfos(const std::string& dialogueId)
 {
-    std::string id = Misc::StringUtils::lowerCase(dialogueId);
     std::vector<int> erasedRecords;
 
-    std::map<std::string, int>::const_iterator current = getIdMap().lower_bound(id);
-    std::map<std::string, int>::const_iterator end = getIdMap().end();
-    for (; current != end; ++current)
+    Range range = getTopicRange(dialogueId); // getTopicRange converts dialogueId to lower case first
+
+    for (; range.first != range.second; ++range.first)
     {
-        const Record<Info>& record = getRecord(current->second);
+        const Record<Info>& record = **range.first;
 
         if (Misc::StringUtils::ciEqual(dialogueId, record.get().mTopicId))
         {
             if (record.mState == RecordBase::State_ModifiedOnly)
             {
-                erasedRecords.push_back(current->second);
+                erasedRecords.push_back(range.first - getRecords().begin());
             }
             else
             {
                 std::unique_ptr<Record<Info> > record2(new Record<Info>(record));
                 record2->mState = RecordBase::State_Deleted;
-                setRecord(current->second, std::move(record2));
+                setRecord(range.first - getRecords().begin(), std::move(record2));
             }
         }
         else
@@ -224,3 +303,105 @@ void CSMWorld::InfoCollection::removeDialogueInfos(const std::string& dialogueId
         erasedRecords.pop_back();
     }
 }
+
+// FIXME: removing a record should adjust prev/next and mark those records as modified
+// accordingly (also consider undo)
+void CSMWorld::InfoCollection::removeRows (int index, int count)
+{
+    Collection<Info, IdAccessor<Info> >::removeRows(index, count); // erase records only
+
+    for (std::map<StringHash, std::vector<std::pair<std::string, int> > >::iterator iter
+        = mInfoIndex.begin(); iter != mInfoIndex.end();)
+    {
+        for (std::vector<std::pair<std::string, int> >::iterator it = iter->second.begin();
+                it != iter->second.end();)
+        {
+            if (it->second >= index)
+            {
+                if (it->second >= index+count)
+                {
+                    it->second -= count;
+                    ++it;
+                }
+                else
+                    iter->second.erase(it);
+            }
+            else
+                ++it;
+        }
+
+        // check for an empty vector
+        if (iter->second.empty())
+            mInfoIndex.erase(iter++);
+        else
+            ++iter;
+    }
+}
+
+void  CSMWorld::InfoCollection::appendBlankRecord (const std::string& id, UniversalId::Type type)
+{
+    std::unique_ptr<Record<Info> > record2(new Record<Info>);
+
+    record2->mState = Record<Info>::State_ModifiedOnly;
+    record2->mModified.blank();
+
+    record2->get().mId = id;
+
+    insertRecord(std::move(record2), getInsertIndex(id, type, nullptr), type); // call InfoCollection::insertRecord()
+}
+
+int CSMWorld::InfoCollection::searchId (const std::string& id) const
+{
+    std::string::size_type separator = id.find_last_of('#');
+
+    if (separator == std::string::npos)
+        throw std::runtime_error("invalid info ID: " + id);
+
+    return getInfoIndex(id.substr(separator+1), id.substr(0, separator));
+}
+
+void CSMWorld::InfoCollection::appendRecord (std::unique_ptr<RecordBase> record, UniversalId::Type type)
+{
+    int index = getInsertIndex(static_cast<Record<Info>*>(record.get())->get().mId, type, record.get());
+
+    insertRecord(std::move(record), index, type);
+}
+
+void CSMWorld::InfoCollection::insertRecord (std::unique_ptr<RecordBase> record, int index,
+    UniversalId::Type type)
+{
+    int size = static_cast<int>(getRecords().size());
+
+    std::string id = static_cast<Record<Info>*>(record.get())->get().mId;
+    std::string::size_type separator = id.find_last_of('#');
+
+    if (separator == std::string::npos)
+        throw std::runtime_error("invalid info ID: " + id);
+
+    Collection<Info, IdAccessor<Info> >::insertRecord(std::move(record), index, type); // add records only
+
+    // adjust index
+    if (index < size-1)
+    {
+        for (std::map<StringHash, std::vector<std::pair<std::string, int> > >::iterator iter
+            = mInfoIndex.begin(); iter != mInfoIndex.end(); ++iter)
+        {
+            for (std::vector<std::pair<std::string, int> >::iterator it = iter->second.begin();
+                    it != iter->second.end(); ++it)
+            {
+                if (it->second >= index)
+                    ++(it->second);
+            }
+        }
+    }
+
+    // get iterator for existing topic or a new topic
+    std::string lowerId = Misc::StringUtils::lowerCase(id);
+    std::pair<std::map<StringHash, std::vector<std::pair<std::string, int> > >::iterator, bool> res
+        = mInfoIndex.insert(
+                std::make_pair(StringHash(std::make_shared<std::string>(lowerId.substr(0, separator))),
+                               std::vector<std::pair<std::string, int> >())); // empty vector
+
+    // insert info and index
+    res.first->second.push_back(std::make_pair(lowerId.substr(separator+1), index));
+}
diff --git a/apps/opencs/model/world/infocollection.hpp b/apps/opencs/model/world/infocollection.hpp
index f0379b3c14..1417af6659 100644
--- a/apps/opencs/model/world/infocollection.hpp
+++ b/apps/opencs/model/world/infocollection.hpp
@@ -1,6 +1,8 @@
 #ifndef CSM_WOLRD_INFOCOLLECTION_H
 #define CSM_WOLRD_INFOCOLLECTION_H
 
+#include <extern/murmurhash/MurmurHash2.h>
+
 #include "collection.hpp"
 #include "info.hpp"
 
@@ -11,6 +13,48 @@ namespace ESM
 
 namespace CSMWorld
 {
+    struct StringHash
+    {
+        uint64_t mHash;
+        std::shared_ptr<std::string> mString;
+
+        StringHash (std::shared_ptr<std::string> str) : mString(str)
+        {
+            mHash = MurmurHash64A(str->c_str(), str->size(), /*seed*/1);
+        }
+    };
+}
+
+namespace std
+{
+    template<> struct less<CSMWorld::StringHash>
+    {
+        bool operator() (const CSMWorld::StringHash& lhs, const CSMWorld::StringHash& rhs) const
+        {
+            if (lhs.mHash < rhs.mHash)
+                return true;
+
+            if (lhs.mHash > rhs.mHash)
+                return false;
+
+            return *lhs.mString < *rhs.mString;
+        }
+    };
+}
+
+namespace CSMWorld
+{
+    template<>
+    void Collection<Info, IdAccessor<Info> >::removeRows (int index, int count);
+
+    template<>
+    void Collection<Info, IdAccessor<Info> >::insertRecord (std::unique_ptr<RecordBase> record,
+        int index, UniversalId::Type type);
+
+    template<>
+    bool Collection<Info, IdAccessor<Info> >::reorderRowsImp (int baseIndex,
+        const std::vector<int>& newOrder);
+
     class InfoCollection : public Collection<Info, IdAccessor<Info> >
     {
         public:
@@ -20,18 +64,32 @@ namespace CSMWorld
 
         private:
 
+            // The general strategy is to keep the records in Collection kept in order (within
+            // a topic group) while the index lookup maps are not ordered.  It is assumed that
+            // each topic has a small number of infos, which allows the use of vectors for
+            // iterating through them without too much penalty.
+            //
+            // NOTE: hashed topic string as well as id string are stored in lower case.
+            std::map<StringHash, std::vector<std::pair<std::string, int> > > mInfoIndex;
+
             void load (const Info& record, bool base);
 
             int getInfoIndex (const std::string& id, const std::string& topic) const;
             ///< Return index for record \a id or -1 (if not present; deleted records are considered)
             ///
             /// \param id info ID without topic prefix
+            //
+            /// \attention id and topic are assumed to be in lower case
 
         public:
 
-            int getAppendIndex (const std::string& id,
-                UniversalId::Type type = UniversalId::Type_None) const override;
+            int getInsertIndex (const std::string& id,
+                UniversalId::Type type = UniversalId::Type_None,
+                RecordBase *record = nullptr) const override;
             ///< \param type Will be ignored, unless the collection supports multiple record types
+            ///
+            /// Works like getAppendIndex unless an overloaded method uses the record pointer
+            /// to get additional info about the record that results in an alternative index.
 
             bool reorderRows (int baseIndex, const std::vector<int>& newOrder) override;
             ///< Reorder the rows [baseIndex, baseIndex+newOrder.size()) according to the indices
@@ -46,6 +104,20 @@ namespace CSMWorld
             /// the given topic.
 
             void removeDialogueInfos(const std::string& dialogueId);
+
+            void removeRows (int index, int count);
+
+            void appendBlankRecord (const std::string& id,
+                                            UniversalId::Type type = UniversalId::Type_None);
+
+            int searchId (const std::string& id) const;
+
+            void appendRecord (std::unique_ptr<RecordBase> record,
+                UniversalId::Type type = UniversalId::Type_None);
+
+            void insertRecord (std::unique_ptr<RecordBase> record,
+                                       int index,
+                                       UniversalId::Type type = UniversalId::Type_None);
     };
 }
 
diff --git a/extern/murmurhash/CMakeLists.txt b/extern/murmurhash/CMakeLists.txt
new file mode 100644
index 0000000000..cd8199ff06
--- /dev/null
+++ b/extern/murmurhash/CMakeLists.txt
@@ -0,0 +1,17 @@
+cmake_minimum_required(VERSION 2.8)
+
+# This is NOT intended as a stand-alone build system! Instead, you should include this from the main CMakeLists of your project.
+
+set(MURMURHASH_LIBRARY "murmurhash")
+
+# Sources
+set(SOURCE_FILES
+    MurmurHash2.cpp
+)
+
+add_library(${MURMURHASH_LIBRARY} STATIC ${SOURCE_FILES})
+
+set(MURMURHASH_LIBRARIES ${MURMURHASH_LIBRARY})
+
+link_directories(${CMAKE_CURRENT_BINARY_DIR})
+set(MURMURHASH_LIBRARIES ${MURMURHASH_LIBRARIES} PARENT_SCOPE)
diff --git a/extern/murmurhash/MurmurHash2.cpp b/extern/murmurhash/MurmurHash2.cpp
new file mode 100644
index 0000000000..d1b6f476e8
--- /dev/null
+++ b/extern/murmurhash/MurmurHash2.cpp
@@ -0,0 +1,522 @@
+//-----------------------------------------------------------------------------
+// MurmurHash2 was written by Austin Appleby, and is placed in the public
+// domain. The author hereby disclaims copyright to this source code.
+
+// Note - This code makes a few assumptions about how your machine behaves -
+
+// 1. We can read a 4-byte value from any address without crashing
+// 2. sizeof(int) == 4
+
+// And it has a few limitations -
+
+// 1. It will not work incrementally.
+// 2. It will not produce the same results on little-endian and big-endian
+//    machines.
+
+#include "MurmurHash2.h"
+
+//-----------------------------------------------------------------------------
+// Platform-specific functions and macros
+
+// Microsoft Visual Studio
+
+#if defined(_MSC_VER)
+
+#define BIG_CONSTANT(x) (x)
+
+// Other compilers
+
+#else   // defined(_MSC_VER)
+
+#define BIG_CONSTANT(x) (x##LLU)
+
+#endif // !defined(_MSC_VER)
+
+//-----------------------------------------------------------------------------
+
+uint32_t MurmurHash2 ( const void * key, int len, uint32_t seed )
+{
+  // 'm' and 'r' are mixing constants generated offline.
+  // They're not really 'magic', they just happen to work well.
+
+  const uint32_t m = 0x5bd1e995;
+  const int r = 24;
+
+  // Initialize the hash to a 'random' value
+
+  uint32_t h = seed ^ len;
+
+  // Mix 4 bytes at a time into the hash
+
+  const unsigned char * data = (const unsigned char *)key;
+
+  while(len >= 4)
+  {
+    uint32_t k = *(uint32_t*)data;
+
+    k *= m;
+    k ^= k >> r;
+    k *= m;
+
+    h *= m;
+    h ^= k;
+
+    data += 4;
+    len -= 4;
+  }
+
+  // Handle the last few bytes of the input array
+
+  switch(len)
+  {
+  case 3: h ^= data[2] << 16;
+  case 2: h ^= data[1] << 8;
+  case 1: h ^= data[0];
+      h *= m;
+  };
+
+  // Do a few final mixes of the hash to ensure the last few
+  // bytes are well-incorporated.
+
+  h ^= h >> 13;
+  h *= m;
+  h ^= h >> 15;
+
+  return h;
+}
+
+//-----------------------------------------------------------------------------
+// MurmurHash2, 64-bit versions, by Austin Appleby
+
+// The same caveats as 32-bit MurmurHash2 apply here - beware of alignment
+// and endian-ness issues if used across multiple platforms.
+
+// 64-bit hash for 64-bit platforms
+
+uint64_t MurmurHash64A ( const void * key, int len, uint64_t seed )
+{
+  const uint64_t m = BIG_CONSTANT(0xc6a4a7935bd1e995);
+  const int r = 47;
+
+  uint64_t h = seed ^ (len * m);
+
+  const uint64_t * data = (const uint64_t *)key;
+  const uint64_t * end = data + (len/8);
+
+  while(data != end)
+  {
+    uint64_t k = *data++;
+
+    k *= m;
+    k ^= k >> r;
+    k *= m;
+
+    h ^= k;
+    h *= m;
+  }
+
+  const unsigned char * data2 = (const unsigned char*)data;
+
+  switch(len & 7)
+  {
+  case 7: h ^= uint64_t(data2[6]) << 48;
+  case 6: h ^= uint64_t(data2[5]) << 40;
+  case 5: h ^= uint64_t(data2[4]) << 32;
+  case 4: h ^= uint64_t(data2[3]) << 24;
+  case 3: h ^= uint64_t(data2[2]) << 16;
+  case 2: h ^= uint64_t(data2[1]) << 8;
+  case 1: h ^= uint64_t(data2[0]);
+          h *= m;
+  };
+
+  h ^= h >> r;
+  h *= m;
+  h ^= h >> r;
+
+  return h;
+}
+
+
+// 64-bit hash for 32-bit platforms
+
+uint64_t MurmurHash64B ( const void * key, int len, uint64_t seed )
+{
+  const uint32_t m = 0x5bd1e995;
+  const int r = 24;
+
+  uint32_t h1 = uint32_t(seed) ^ len;
+  uint32_t h2 = uint32_t(seed >> 32);
+
+  const uint32_t * data = (const uint32_t *)key;
+
+  while(len >= 8)
+  {
+    uint32_t k1 = *data++;
+    k1 *= m; k1 ^= k1 >> r; k1 *= m;
+    h1 *= m; h1 ^= k1;
+    len -= 4;
+
+    uint32_t k2 = *data++;
+    k2 *= m; k2 ^= k2 >> r; k2 *= m;
+    h2 *= m; h2 ^= k2;
+    len -= 4;
+  }
+
+  if(len >= 4)
+  {
+    uint32_t k1 = *data++;
+    k1 *= m; k1 ^= k1 >> r; k1 *= m;
+    h1 *= m; h1 ^= k1;
+    len -= 4;
+  }
+
+  switch(len)
+  {
+  case 3: h2 ^= ((unsigned char*)data)[2] << 16;
+  case 2: h2 ^= ((unsigned char*)data)[1] << 8;
+  case 1: h2 ^= ((unsigned char*)data)[0];
+      h2 *= m;
+  };
+
+  h1 ^= h2 >> 18; h1 *= m;
+  h2 ^= h1 >> 22; h2 *= m;
+  h1 ^= h2 >> 17; h1 *= m;
+  h2 ^= h1 >> 19; h2 *= m;
+
+  uint64_t h = h1;
+
+  h = (h << 32) | h2;
+
+  return h;
+}
+
+//-----------------------------------------------------------------------------
+// MurmurHash2A, by Austin Appleby
+
+// This is a variant of MurmurHash2 modified to use the Merkle-Damgard
+// construction. Bulk speed should be identical to Murmur2, small-key speed
+// will be 10%-20% slower due to the added overhead at the end of the hash.
+
+// This variant fixes a minor issue where null keys were more likely to
+// collide with each other than expected, and also makes the function
+// more amenable to incremental implementations.
+
+#define mmix(h,k) { k *= m; k ^= k >> r; k *= m; h *= m; h ^= k; }
+
+uint32_t MurmurHash2A ( const void * key, int len, uint32_t seed )
+{
+  const uint32_t m = 0x5bd1e995;
+  const int r = 24;
+  uint32_t l = len;
+
+  const unsigned char * data = (const unsigned char *)key;
+
+  uint32_t h = seed;
+
+  while(len >= 4)
+  {
+    uint32_t k = *(uint32_t*)data;
+
+    mmix(h,k);
+
+    data += 4;
+    len -= 4;
+  }
+
+  uint32_t t = 0;
+
+  switch(len)
+  {
+  case 3: t ^= data[2] << 16;
+  case 2: t ^= data[1] << 8;
+  case 1: t ^= data[0];
+  };
+
+  mmix(h,t);
+  mmix(h,l);
+
+  h ^= h >> 13;
+  h *= m;
+  h ^= h >> 15;
+
+  return h;
+}
+
+//-----------------------------------------------------------------------------
+// CMurmurHash2A, by Austin Appleby
+
+// This is a sample implementation of MurmurHash2A designed to work
+// incrementally.
+
+// Usage -
+
+// CMurmurHash2A hasher
+// hasher.Begin(seed);
+// hasher.Add(data1,size1);
+// hasher.Add(data2,size2);
+// ...
+// hasher.Add(dataN,sizeN);
+// uint32_t hash = hasher.End()
+
+class CMurmurHash2A
+{
+public:
+
+  void Begin ( uint32_t seed = 0 )
+  {
+    m_hash  = seed;
+    m_tail  = 0;
+    m_count = 0;
+    m_size  = 0;
+  }
+
+  void Add ( const unsigned char * data, int len )
+  {
+    m_size += len;
+
+    MixTail(data,len);
+
+    while(len >= 4)
+    {
+      uint32_t k = *(uint32_t*)data;
+
+      mmix(m_hash,k);
+
+      data += 4;
+      len -= 4;
+    }
+
+    MixTail(data,len);
+  }
+
+  uint32_t End ( void )
+  {
+    mmix(m_hash,m_tail);
+    mmix(m_hash,m_size);
+
+    m_hash ^= m_hash >> 13;
+    m_hash *= m;
+    m_hash ^= m_hash >> 15;
+
+    return m_hash;
+  }
+
+private:
+
+  static const uint32_t m = 0x5bd1e995;
+  static const int r = 24;
+
+  void MixTail ( const unsigned char * & data, int & len )
+  {
+    while( len && ((len<4) || m_count) )
+    {
+      m_tail |= (*data++) << (m_count * 8);
+
+      m_count++;
+      len--;
+
+      if(m_count == 4)
+      {
+        mmix(m_hash,m_tail);
+        m_tail = 0;
+        m_count = 0;
+      }
+    }
+  }
+
+  uint32_t m_hash;
+  uint32_t m_tail;
+  uint32_t m_count;
+  uint32_t m_size;
+};
+
+//-----------------------------------------------------------------------------
+// MurmurHashNeutral2, by Austin Appleby
+
+// Same as MurmurHash2, but endian- and alignment-neutral.
+// Half the speed though, alas.
+
+uint32_t MurmurHashNeutral2 ( const void * key, int len, uint32_t seed )
+{
+  const uint32_t m = 0x5bd1e995;
+  const int r = 24;
+
+  uint32_t h = seed ^ len;
+
+  const unsigned char * data = (const unsigned char *)key;
+
+  while(len >= 4)
+  {
+    uint32_t k;
+
+    k  = data[0];
+    k |= data[1] << 8;
+    k |= data[2] << 16;
+    k |= data[3] << 24;
+
+    k *= m;
+    k ^= k >> r;
+    k *= m;
+
+    h *= m;
+    h ^= k;
+
+    data += 4;
+    len -= 4;
+  }
+
+  switch(len)
+  {
+  case 3: h ^= data[2] << 16;
+  case 2: h ^= data[1] << 8;
+  case 1: h ^= data[0];
+          h *= m;
+  };
+
+  h ^= h >> 13;
+  h *= m;
+  h ^= h >> 15;
+
+  return h;
+}
+
+//-----------------------------------------------------------------------------
+// MurmurHashAligned2, by Austin Appleby
+
+// Same algorithm as MurmurHash2, but only does aligned reads - should be safer
+// on certain platforms.
+
+// Performance will be lower than MurmurHash2
+
+#define MIX(h,k,m) { k *= m; k ^= k >> r; k *= m; h *= m; h ^= k; }
+
+
+uint32_t MurmurHashAligned2 ( const void * key, int len, uint32_t seed )
+{
+  const uint32_t m = 0x5bd1e995;
+  const int r = 24;
+
+  const unsigned char * data = (const unsigned char *)key;
+
+  uint32_t h = seed ^ len;
+
+  int align = (uint64_t)data & 3;
+
+  if(align && (len >= 4))
+  {
+    // Pre-load the temp registers
+
+    uint32_t t = 0, d = 0;
+
+    switch(align)
+    {
+      case 1: t |= data[2] << 16;
+      case 2: t |= data[1] << 8;
+      case 3: t |= data[0];
+    }
+
+    t <<= (8 * align);
+
+    data += 4-align;
+    len -= 4-align;
+
+    int sl = 8 * (4-align);
+    int sr = 8 * align;
+
+    // Mix
+
+    while(len >= 4)
+    {
+      d = *(uint32_t *)data;
+      t = (t >> sr) | (d << sl);
+
+      uint32_t k = t;
+
+      MIX(h,k,m);
+
+      t = d;
+
+      data += 4;
+      len -= 4;
+    }
+
+    // Handle leftover data in temp registers
+
+    d = 0;
+
+    if(len >= align)
+    {
+      switch(align)
+      {
+      case 3: d |= data[2] << 16;
+      case 2: d |= data[1] << 8;
+      case 1: d |= data[0];
+      }
+
+      uint32_t k = (t >> sr) | (d << sl);
+      MIX(h,k,m);
+
+      data += align;
+      len -= align;
+
+      //----------
+      // Handle tail bytes
+
+      switch(len)
+      {
+      case 3: h ^= data[2] << 16;
+      case 2: h ^= data[1] << 8;
+      case 1: h ^= data[0];
+          h *= m;
+      };
+    }
+    else
+    {
+      switch(len)
+      {
+      case 3: d |= data[2] << 16;
+      case 2: d |= data[1] << 8;
+      case 1: d |= data[0];
+      case 0: h ^= (t >> sr) | (d << sl);
+          h *= m;
+      }
+    }
+
+    h ^= h >> 13;
+    h *= m;
+    h ^= h >> 15;
+
+    return h;
+  }
+  else
+  {
+    while(len >= 4)
+    {
+      uint32_t k = *(uint32_t *)data;
+
+      MIX(h,k,m);
+
+      data += 4;
+      len -= 4;
+    }
+
+    //----------
+    // Handle tail bytes
+
+    switch(len)
+    {
+    case 3: h ^= data[2] << 16;
+    case 2: h ^= data[1] << 8;
+    case 1: h ^= data[0];
+        h *= m;
+    };
+
+    h ^= h >> 13;
+    h *= m;
+    h ^= h >> 15;
+
+    return h;
+  }
+}
+
+//-----------------------------------------------------------------------------
diff --git a/extern/murmurhash/MurmurHash2.h b/extern/murmurhash/MurmurHash2.h
new file mode 100644
index 0000000000..e6d0c36924
--- /dev/null
+++ b/extern/murmurhash/MurmurHash2.h
@@ -0,0 +1,38 @@
+//-----------------------------------------------------------------------------
+// MurmurHash2 was written by Austin Appleby, and is placed in the public
+// domain. The author hereby disclaims copyright to this source code.
+
+#ifndef _MURMURHASH2_H_
+#define _MURMURHASH2_H_
+
+//-----------------------------------------------------------------------------
+// Platform-specific functions and macros
+
+// Microsoft Visual Studio
+
+#if defined(_MSC_VER) && (_MSC_VER < 1600)
+
+typedef unsigned char uint8_t;
+typedef unsigned int uint32_t;
+typedef unsigned __int64 uint64_t;
+
+// Other compilers
+
+#else   // defined(_MSC_VER)
+
+#include <stdint.h>
+
+#endif // !defined(_MSC_VER)
+
+//-----------------------------------------------------------------------------
+
+uint32_t MurmurHash2        ( const void * key, int len, uint32_t seed );
+uint64_t MurmurHash64A      ( const void * key, int len, uint64_t seed );
+uint64_t MurmurHash64B      ( const void * key, int len, uint64_t seed );
+uint32_t MurmurHash2A       ( const void * key, int len, uint32_t seed );
+uint32_t MurmurHashNeutral2 ( const void * key, int len, uint32_t seed );
+uint32_t MurmurHashAligned2 ( const void * key, int len, uint32_t seed );
+
+//-----------------------------------------------------------------------------
+
+#endif // _MURMURHASH2_H_

From fc2f68a4650f4205ebef80c6d678b66508b12612 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Fri, 23 Jul 2021 17:34:27 +1000
Subject: [PATCH 1056/2859] Change the loader's top progress bar to show total
 number of records processed rather than the number of files.

(copied the changes from commit SHA-1: ff072441fde05d189cb06cb44cc9c360690c2f09)
---
 apps/opencs/model/doc/loader.cpp |  8 ++---
 apps/opencs/model/world/data.cpp | 16 +++++++++
 apps/opencs/model/world/data.hpp |  2 ++
 apps/opencs/view/doc/loader.cpp  | 56 +++++++++++++++++---------------
 apps/opencs/view/doc/loader.hpp  |  8 +++--
 5 files changed, 56 insertions(+), 34 deletions(-)

diff --git a/apps/opencs/model/doc/loader.cpp b/apps/opencs/model/doc/loader.cpp
index 1c5a7348c8..9d2f89b8e9 100644
--- a/apps/opencs/model/doc/loader.cpp
+++ b/apps/opencs/model/doc/loader.cpp
@@ -85,19 +85,19 @@ void CSMDoc::Loader::load()
             return;
         }
 
-        if (iter->second.mFile<size)
+        if (iter->second.mFile<size) // start loading the files
         {
             boost::filesystem::path path = document->getContentFiles()[iter->second.mFile];
 
-            int steps = document->getData().startLoading (path, iter->second.mFile!=editedIndex, false);
+            int steps = document->getData().startLoading (path, iter->second.mFile!=editedIndex, /*project*/false);
             iter->second.mRecordsLeft = true;
             iter->second.mRecordsLoaded = 0;
 
             emit nextStage (document, path.filename().string(), steps);
         }
-        else if (iter->second.mFile==size)
+        else if (iter->second.mFile==size) // start loading the last (project) file
         {
-            int steps = document->getData().startLoading (document->getProjectPath(), false, true);
+            int steps = document->getData().startLoading (document->getProjectPath(), /*base*/false, true);
             iter->second.mRecordsLeft = true;
             iter->second.mRecordsLoaded = 0;
 
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 7d6f0f37cb..5db052bcbf 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -958,6 +958,22 @@ void CSMWorld::Data::merge()
     mGlobals.merge();
 }
 
+int CSMWorld::Data::getTotalRecords (const std::vector<boost::filesystem::path>& files)
+{
+    int records = 0;
+
+    std::unique_ptr<ESM::ESMReader> reader = std::unique_ptr<ESM::ESMReader>(new ESM::ESMReader);
+
+    for (unsigned int i = 0; i < files.size(); ++i)
+    {
+        reader->open(files[i].string());
+        records += reader->getRecordCount();
+        reader->close();
+    }
+
+    return records;
+}
+
 int CSMWorld::Data::startLoading (const boost::filesystem::path& path, bool base, bool project)
 {
     // Don't delete the Reader yet. Some record types store a reference to the Reader to handle on-demand loading
diff --git a/apps/opencs/model/world/data.hpp b/apps/opencs/model/world/data.hpp
index f7a51b289f..d38d40c456 100644
--- a/apps/opencs/model/world/data.hpp
+++ b/apps/opencs/model/world/data.hpp
@@ -292,6 +292,8 @@ namespace CSMWorld
             void merge();
             ///< Merge modified into base.
 
+            int getTotalRecords (const std::vector<boost::filesystem::path>& files); // for better loading bar
+
             int startLoading (const boost::filesystem::path& path, bool base, bool project);
             ///< Begin merging content of a file into base or modified.
             ///
diff --git a/apps/opencs/view/doc/loader.cpp b/apps/opencs/view/doc/loader.cpp
index 1cdfc01733..7929b13f6c 100644
--- a/apps/opencs/view/doc/loader.cpp
+++ b/apps/opencs/view/doc/loader.cpp
@@ -17,7 +17,7 @@ void CSVDoc::LoadingDocument::closeEvent (QCloseEvent *event)
 }
 
 CSVDoc::LoadingDocument::LoadingDocument (CSMDoc::Document *document)
-: mDocument (document), mAborted (false), mMessages (nullptr), mTotalRecords (0)
+: mDocument (document), mAborted (false), mMessages (nullptr), mRecordsLabel (0), mTotalRecordsLabel (0)
 {
     setWindowTitle (QString::fromUtf8((std::string("Opening ") + document->getSavePath().filename().string()).c_str()));
 
@@ -25,26 +25,25 @@ CSVDoc::LoadingDocument::LoadingDocument (CSMDoc::Document *document)
 
     mLayout = new QVBoxLayout (this);
 
-    // file progress
-    mFile = new QLabel (this);
+    // total progress
+    mTotalRecordsLabel = new QLabel (this);
 
-    mLayout->addWidget (mFile);
+    mLayout->addWidget (mTotalRecordsLabel);
 
-    mFileProgress = new QProgressBar (this);
+    mTotalProgress = new QProgressBar (this);
 
-    mLayout->addWidget (mFileProgress);
+    mLayout->addWidget (mTotalProgress);
 
-    int size = static_cast<int> (document->getContentFiles().size())+1;
-    if (document->isNew())
-        --size;
+    mTotalProgress->setMinimum (0);
+    mTotalProgress->setMaximum (document->getData().getTotalRecords(document->getContentFiles()));
+    mTotalProgress->setTextVisible (true);
+    mTotalProgress->setValue (0);
+    mTotalRecords = 0;
 
-    mFileProgress->setMinimum (0);
-    mFileProgress->setMaximum (size);
-    mFileProgress->setTextVisible (true);
-    mFileProgress->setValue (0);
+    mFilesLoaded = 0;
 
     // record progress
-    mLayout->addWidget (mRecords = new QLabel ("Records", this));
+    mLayout->addWidget (mRecordsLabel = new QLabel ("Records", this));
 
     mRecordProgress = new QProgressBar (this);
 
@@ -74,29 +73,32 @@ CSVDoc::LoadingDocument::LoadingDocument (CSMDoc::Document *document)
     connect (mButtons, SIGNAL (rejected()), this, SLOT (cancel()));
 }
 
-void CSVDoc::LoadingDocument::nextStage (const std::string& name, int totalRecords)
+void CSVDoc::LoadingDocument::nextStage (const std::string& name, int fileRecords)
 {
-    mFile->setText (QString::fromUtf8 (("Loading: " + name).c_str()));
+    ++mFilesLoaded;
+    size_t numFiles = mDocument->getContentFiles().size();
 
-    mFileProgress->setValue (mFileProgress->value()+1);
+    mTotalRecordsLabel->setText (QString::fromUtf8 (("Loading: "+name
+                    +" ("+std::to_string(mFilesLoaded)+" of "+std::to_string((numFiles))+")").c_str()));
+
+    mTotalRecords = mTotalProgress->value();
 
     mRecordProgress->setValue (0);
-    mRecordProgress->setMaximum (totalRecords>0 ? totalRecords : 1);
+    mRecordProgress->setMaximum (fileRecords>0 ? fileRecords : 1);
 
-    mTotalRecords = totalRecords;
+    mRecords = fileRecords;
 }
 
 void CSVDoc::LoadingDocument::nextRecord (int records)
 {
-    if (records<=mTotalRecords)
+    if (records <= mRecords)
     {
-        mRecordProgress->setValue (records);
-
-        std::ostringstream stream;
+        mTotalProgress->setValue (mTotalRecords+records);
 
-        stream << "Records: " << records << " of " << mTotalRecords;
+        mRecordProgress->setValue(records);
 
-        mRecords->setText (QString::fromUtf8 (stream.str().c_str()));
+        mRecordsLabel->setText(QString::fromStdString(
+                    "Records: "+std::to_string(records)+" of "+std::to_string(mRecords)));
     }
 }
 
@@ -176,12 +178,12 @@ void CSVDoc::Loader::loadingStopped (CSMDoc::Document *document, bool completed,
 }
 
 void CSVDoc::Loader::nextStage (CSMDoc::Document *document, const std::string& name,
-    int totalRecords)
+    int fileRecords)
 {
     std::map<CSMDoc::Document *, LoadingDocument *>::iterator iter = mDocuments.find (document);
 
     if (iter!=mDocuments.end())
-        iter->second->nextStage (name, totalRecords);
+        iter->second->nextStage (name, fileRecords);
 }
 
 void CSVDoc::Loader::nextRecord (CSMDoc::Document *document, int records)
diff --git a/apps/opencs/view/doc/loader.hpp b/apps/opencs/view/doc/loader.hpp
index 63b03ec8d2..1d21d1e02e 100644
--- a/apps/opencs/view/doc/loader.hpp
+++ b/apps/opencs/view/doc/loader.hpp
@@ -25,16 +25,18 @@ namespace CSVDoc
             Q_OBJECT
 
             CSMDoc::Document *mDocument;
-            QLabel *mFile;
-            QLabel *mRecords;
-            QProgressBar *mFileProgress;
+            QLabel *mTotalRecordsLabel;
+            QLabel *mRecordsLabel;
+            QProgressBar *mTotalProgress;
             QProgressBar *mRecordProgress;
             bool mAborted;
             QDialogButtonBox *mButtons;
             QLabel *mError;
             QListWidget *mMessages;
             QVBoxLayout *mLayout;
+            int mRecords;
             int mTotalRecords;
+            int mFilesLoaded;
 
         private:
 

From 10c6304a1fbf374861dc3fef865ab08577945d4b Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Fri, 23 Jul 2021 18:12:09 +1000
Subject: [PATCH 1057/2859] Fix typo from commit
 cfdbd0d471c6bac72f904f86a1bec486ca2a3822.

---
 apps/opencs/model/world/refcollection.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/opencs/model/world/refcollection.cpp b/apps/opencs/model/world/refcollection.cpp
index a26bf1d2f4..f4dc0bcb97 100644
--- a/apps/opencs/model/world/refcollection.cpp
+++ b/apps/opencs/model/world/refcollection.cpp
@@ -35,7 +35,7 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
             ref.mCell = "#" + std::to_string(index.first) + " " + std::to_string(index.second);
 
             // Handle non-base moved references
-            if (!base && !isMoved)
+            if (!base && isMoved)
             {
                 // Moved references must have a link back to their original cell
                 // See discussion: https://forum.openmw.org/viewtopic.php?f=6&t=577&start=30

From 5c504e4d22d4d4f5eb0982e1c66a64257d22b1da Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Fri, 23 Jul 2021 19:07:56 +1000
Subject: [PATCH 1058/2859] Convert the CellRef record index lookup maps to use
 integer keys rather than strings.

- Morrowind load over 300,000 references, so even small inefficiencies add up to longer loading times.
- std::map is used, but should try others, std::unordered_map or even std::vector

(copied the changes from commit SHA-1: 86945d19128468ad987b5bf4332602d613d25d9f)
---
 apps/opencs/model/world/data.hpp          |   2 +-
 apps/opencs/model/world/ref.cpp           |   2 +-
 apps/opencs/model/world/ref.hpp           |   1 +
 apps/opencs/model/world/refcollection.cpp | 180 +++++++++++++++++++++-
 apps/opencs/model/world/refcollection.hpp |  35 ++++-
 5 files changed, 210 insertions(+), 10 deletions(-)

diff --git a/apps/opencs/model/world/data.hpp b/apps/opencs/model/world/data.hpp
index d38d40c456..b1c20b8629 100644
--- a/apps/opencs/model/world/data.hpp
+++ b/apps/opencs/model/world/data.hpp
@@ -118,7 +118,7 @@ namespace CSMWorld
             const ESM::Dialogue *mDialogue; // last loaded dialogue
             bool mBase;
             bool mProject;
-            std::map<std::string, std::map<unsigned int, std::string> > mRefLoadCache;
+            std::map<std::string, std::map<unsigned int, unsigned int> > mRefLoadCache;
             int mReaderIndex;
 
             bool mFsStrict;
diff --git a/apps/opencs/model/world/ref.cpp b/apps/opencs/model/world/ref.cpp
index b336235909..0b07b484ca 100644
--- a/apps/opencs/model/world/ref.cpp
+++ b/apps/opencs/model/world/ref.cpp
@@ -2,7 +2,7 @@
 
 #include "cellcoordinates.hpp"
 
-CSMWorld::CellRef::CellRef() : mNew (true)
+CSMWorld::CellRef::CellRef() : mNew (true), mIdNum(0)
 {
     mRefNum.mIndex = 0;
     mRefNum.mContentFile = 0;
diff --git a/apps/opencs/model/world/ref.hpp b/apps/opencs/model/world/ref.hpp
index 5d10a3a1b3..23b4ad1b5c 100644
--- a/apps/opencs/model/world/ref.hpp
+++ b/apps/opencs/model/world/ref.hpp
@@ -14,6 +14,7 @@ namespace CSMWorld
         std::string mCell;
         std::string mOriginalCell;
         bool mNew; // new reference, not counted yet, ref num not assigned yet
+        unsigned int mIdNum;
 
         CellRef();
 
diff --git a/apps/opencs/model/world/refcollection.cpp b/apps/opencs/model/world/refcollection.cpp
index f4dc0bcb97..61cdd8205a 100644
--- a/apps/opencs/model/world/refcollection.cpp
+++ b/apps/opencs/model/world/refcollection.cpp
@@ -7,8 +7,37 @@
 #include "universalid.hpp"
 #include "record.hpp"
 
+namespace CSMWorld
+{
+    template<>
+    void Collection<CellRef, IdAccessor<CellRef> >::removeRows (int index, int count)
+    {
+        mRecords.erase(mRecords.begin()+index, mRecords.begin()+index+count);
+
+        // index map is updated in RefCollection::removeRows()
+    }
+
+    template<>
+    void Collection<CellRef, IdAccessor<CellRef> >::insertRecord (std::unique_ptr<RecordBase> record, int index,
+        UniversalId::Type type)
+    {
+        int size = static_cast<int>(mRecords.size());
+        if (index < 0 || index > size)
+            throw std::runtime_error("index out of range");
+
+        std::unique_ptr<Record<CellRef> > record2(static_cast<Record<CellRef>*>(record.release()));
+
+        if (index == size)
+            mRecords.push_back(std::move(record2));
+        else
+            mRecords.insert(mRecords.begin()+index, std::move(record2));
+
+        // index map is updated in RefCollection::insertRecord()
+    }
+}
+
 void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool base,
-    std::map<unsigned int, std::string>& cache, CSMDoc::Messages& messages)
+    std::map<unsigned int, unsigned int>& cache, CSMDoc::Messages& messages)
 {
     Record<Cell> cell = mCells.getRecord (cellIndex);
 
@@ -63,7 +92,7 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
         unsigned int  refNum = (ref.mRefNum.mIndex & 0x00ffffff) |
             (ref.mRefNum.hasContentFile() ? ref.mRefNum.mContentFile : 0xff) << 24;
 
-        std::map<unsigned int, std::string>::iterator iter = cache.find(refNum);
+        std::map<unsigned int, unsigned int>::iterator iter = cache.find(refNum);
 
         if (ref.mRefNum.mContentFile != -1 && !base) ref.mRefNum.mContentFile = ref.mRefNum.mIndex >> 24;
 
@@ -74,11 +103,15 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
                 CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Cell,
                     mCells.getId (cellIndex));
 
-                messages.add (id, "Attempt to delete a non-existent reference");
+                messages.add (id, "Attempt to delete a non-existent reference - RefNum index "
+                        + std::to_string(ref.mRefNum.mIndex) + ", refID " + ref.mRefID + ", content file index "
+                        + std::to_string(ref.mRefNum.mContentFile),
+                        /*hint*/"",
+                        CSMDoc::Message::Severity_Warning);
                 continue;
             }
 
-            int index = getIndex (iter->second);
+            int index = getIntIndex (iter->second);
 
             if (base)
             {
@@ -98,9 +131,10 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
         if (iter==cache.end())
         {
             // new reference
+            ref.mIdNum = mNextId; // FIXME: fragile
             ref.mId = getNewId();
 
-            cache.emplace(refNum, ref.mId);
+            cache.emplace(refNum, ref.mIdNum);
 
             std::unique_ptr<Record<CellRef> > record(new Record<CellRef>);
             record->mState = base ? RecordBase::State_BaseOnly : RecordBase::State_ModifiedOnly;
@@ -111,9 +145,27 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
         else
         {
             // old reference -> merge
-            ref.mId = iter->second;
+            int index = getIntIndex(iter->second);
+#if 0
+            // ref.mRefNum.mIndex     : the key
+            // iter->second           : previously cached idNum for the key
+            // index                  : position of the record for that idNum
+            // getRecord(index).get() : record in the index position
+            assert(iter->second != getRecord(index).get().mIdNum); // sanity check
 
-            int index = getIndex (ref.mId);
+            // check if the plugin used the same RefNum index for a different record
+            if (ref.mRefID != getRecord(index).get().mRefID)
+            {
+                CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Cell, mCells.getId(cellIndex));
+                messages.add(id,
+                    "RefNum renamed from RefID \"" + getRecord(index).get().mRefID + "\" to \""
+                    + ref.mRefID + "\" (RefNum index " + std::to_string(ref.mRefNum.mIndex) + ")",
+                    /*hint*/"",
+                    CSMDoc::Message::Severity_Info);
+            }
+#endif
+            ref.mId = getRecord(index).get().mId;
+            ref.mIdNum = extractIdNum(ref.mId);
 
             std::unique_ptr<Record<CellRef> > record(new Record<CellRef>(getRecord(index)));
             record->mState = base ? RecordBase::State_BaseOnly : RecordBase::State_Modified;
@@ -128,3 +180,117 @@ std::string CSMWorld::RefCollection::getNewId()
 {
     return "ref#" + std::to_string(mNextId++);
 }
+
+unsigned int CSMWorld::RefCollection::extractIdNum (const std::string& id) const
+{
+    std::string::size_type separator = id.find_last_of('#');
+
+    if (separator == std::string::npos)
+        throw std::runtime_error("invalid ref ID: " + id);
+
+    return static_cast<unsigned int>(std::stoi(id.substr(separator+1)));
+}
+
+int CSMWorld::RefCollection::getIntIndex (unsigned int id) const
+{
+    int index = searchId(id);
+
+    if (index == -1)
+        throw std::runtime_error("invalid RefNum: " + std::to_string(id));
+
+    return index;
+}
+
+int CSMWorld::RefCollection::searchId (unsigned int id) const
+{
+    std::map<unsigned int, int>::const_iterator iter = mRefIndex.find(id);
+
+    if (iter == mRefIndex.end())
+        return -1;
+
+    return iter->second;
+}
+
+void CSMWorld::RefCollection::removeRows (int index, int count)
+{
+    Collection<CellRef, IdAccessor<CellRef> >::removeRows(index, count); // erase records only
+
+    std::map<unsigned int, int>::iterator iter = mRefIndex.begin();
+    while (iter != mRefIndex.end())
+    {
+        if (iter->second>=index)
+        {
+            if (iter->second >= index+count)
+            {
+                iter->second -= count;
+                ++iter;
+            }
+            else
+                mRefIndex.erase(iter++);
+        }
+        else
+            ++iter;
+    }
+}
+
+void  CSMWorld::RefCollection::appendBlankRecord (const std::string& id, UniversalId::Type type)
+{
+    std::unique_ptr<Record<CellRef> > record2(new Record<CellRef>);
+
+    record2->mState = Record<CellRef>::State_ModifiedOnly;
+    record2->mModified.blank();
+
+    record2->get().mId = id;
+    record2->get().mIdNum = extractIdNum(id);
+
+    Collection<CellRef, IdAccessor<CellRef> >::appendRecord(std::move(record2));
+}
+
+void CSMWorld::RefCollection::cloneRecord (const std::string& origin,
+                                           const std::string& destination,
+                                           const UniversalId::Type type)
+{
+   std::unique_ptr<Record<CellRef> > copy(new Record<CellRef>);
+
+   copy->mModified = getRecord(origin).get();
+   copy->mState = RecordBase::State_ModifiedOnly;
+
+   copy->get().mId = destination;
+   copy->get().mIdNum = extractIdNum(destination);
+
+   insertRecord(std::move(copy), getAppendIndex(destination, type)); // call RefCollection::insertRecord()
+}
+
+int CSMWorld::RefCollection::searchId (const std::string& id) const
+{
+    return searchId(extractIdNum(id));
+}
+
+void CSMWorld::RefCollection::appendRecord (std::unique_ptr<RecordBase> record, UniversalId::Type type)
+{
+    int index = getAppendIndex(/*id*/"", type); // for CellRef records id is ignored
+
+    mRefIndex.insert(std::make_pair(static_cast<Record<CellRef>*>(record.get())->get().mIdNum, index));
+
+    Collection<CellRef, IdAccessor<CellRef> >::insertRecord(std::move(record), index, type); // add records only
+}
+
+void CSMWorld::RefCollection::insertRecord (std::unique_ptr<RecordBase> record, int index,
+    UniversalId::Type type)
+{
+    int size = getAppendIndex(/*id*/"", type); // for CellRef records id is ignored
+    unsigned int idNum = static_cast<Record<CellRef>*>(record.get())->get().mIdNum;
+
+    Collection<CellRef, IdAccessor<CellRef> >::insertRecord(std::move(record), index, type); // add records only
+
+    if (index < size-1)
+    {
+        for (std::map<unsigned int, int>::iterator iter(mRefIndex.begin()); iter != mRefIndex.end(); ++iter)
+        {
+            if (iter->second >= index)
+                ++(iter->second);
+        }
+    }
+
+    mRefIndex.insert(std::make_pair(idNum, index));
+}
diff --git a/apps/opencs/model/world/refcollection.hpp b/apps/opencs/model/world/refcollection.hpp
index 42bb363570..1bdfda3925 100644
--- a/apps/opencs/model/world/refcollection.hpp
+++ b/apps/opencs/model/world/refcollection.hpp
@@ -14,12 +14,27 @@ namespace CSMWorld
     struct Cell;
     class UniversalId;
 
+    template<>
+    void Collection<CellRef, IdAccessor<CellRef> >::removeRows (int index, int count);
+
+    template<>
+    void Collection<CellRef, IdAccessor<CellRef> >::insertRecord (std::unique_ptr<RecordBase> record, int index,
+        UniversalId::Type type);
+
     /// \brief References in cells
     class RefCollection : public Collection<CellRef>
     {
             Collection<Cell>& mCells;
+            std::map<unsigned int, int> mRefIndex;
+
             int mNextId;
 
+            unsigned int extractIdNum(const std::string& id) const;
+
+            int getIntIndex (unsigned int id) const;
+
+            int searchId (unsigned int id) const;
+
         public:
             // MSVC needs the constructor for a class inheriting a template to be defined in header
             RefCollection (Collection<Cell>& cells)
@@ -27,10 +42,28 @@ namespace CSMWorld
             {}
 
             void load (ESM::ESMReader& reader, int cellIndex, bool base,
-                std::map<unsigned int, std::string>& cache, CSMDoc::Messages& messages);
+                std::map<unsigned int, unsigned int>& cache, CSMDoc::Messages& messages);
             ///< Load a sequence of references.
 
             std::string getNewId();
+
+            virtual void removeRows (int index, int count);
+
+            virtual void appendBlankRecord (const std::string& id,
+                                            UniversalId::Type type = UniversalId::Type_None);
+
+            virtual void cloneRecord (const std::string& origin,
+                                      const std::string& destination,
+                                      const UniversalId::Type type);
+
+            virtual int searchId (const std::string& id) const;
+
+            virtual void appendRecord (std::unique_ptr<RecordBase> record,
+                                       UniversalId::Type type = UniversalId::Type_None);
+
+            virtual void insertRecord (std::unique_ptr<RecordBase> record,
+                                       int index,
+                                       UniversalId::Type type = UniversalId::Type_None);
     };
 }
 

From 44a333b6db8690d984aa1375d7962ad49f8f4613 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Fri, 23 Jul 2021 21:25:35 +1000
Subject: [PATCH 1059/2859] Don't attempt to open files yet to be created.

---
 apps/opencs/model/world/data.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 5db052bcbf..192602290d 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -966,6 +966,9 @@ int CSMWorld::Data::getTotalRecords (const std::vector<boost::filesystem::path>&
 
     for (unsigned int i = 0; i < files.size(); ++i)
     {
+        if (!boost::filesystem::exists(files[i]))
+            continue;
+
         reader->open(files[i].string());
         records += reader->getRecordCount();
         reader->close();

From 725d689e8aa95c245ef625d36011afb9a95de509 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Fri, 23 Jul 2021 23:17:16 +1000
Subject: [PATCH 1060/2859] Call push_back() if inserting to the end of the
 vector.  It seems MSVC may be generating different code compared to insert().

(copied the changes from commit SHA-1: 257126ed69a5f6f964ba771766de061e81f87433)
---
 apps/opencs/model/world/collection.hpp | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/apps/opencs/model/world/collection.hpp b/apps/opencs/model/world/collection.hpp
index 89430f1c58..9d9c69a5da 100644
--- a/apps/opencs/model/world/collection.hpp
+++ b/apps/opencs/model/world/collection.hpp
@@ -543,20 +543,25 @@ namespace CSMWorld
     void Collection<ESXRecordT, IdAccessorT>::insertRecord (std::unique_ptr<RecordBase> record, int index,
         UniversalId::Type type)
     {
-        if (index<0 || index>static_cast<int> (mRecords.size()))
+        int size = static_cast<int>(mRecords.size());
+        if (index < 0 || index > size)
             throw std::runtime_error ("index out of range");
 
         std::unique_ptr<Record<ESXRecordT> > record2(static_cast<Record<ESXRecordT>*>(record.release()));
         std::string lowerId = Misc::StringUtils::lowerCase(IdAccessorT().getId(record2->get()));
 
-        mRecords.insert (mRecords.begin()+index, std::move(record2));
+        if (index == size)
+            mRecords.push_back (std::move(record2));
+        else
+            mRecords.insert (mRecords.begin()+index, std::move(record2));
 
-        if (index<static_cast<int> (mRecords.size())-1)
+        if (index < size-1)
         {
-            for (std::map<std::string, int>::iterator iter (mIndex.begin()); iter!=mIndex.end();
-                ++iter)
-                 if (iter->second>=index)
-                     ++(iter->second);
+            for (std::map<std::string, int>::iterator iter (mIndex.begin()); iter!=mIndex.end(); ++iter)
+            {
+                if (iter->second >= index)
+                    ++(iter->second);
+            }
         }
 
         mIndex.insert (std::make_pair (lowerId, index));

From ee3361a118d51850f99935cd393edcae7186f078 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Fri, 23 Jul 2021 23:18:11 +1000
Subject: [PATCH 1061/2859] Fix table being sorted twice (at least it appeared
 that way according to the sample profiler)

- Quoting Qt-4.8: "Note: . Setting the property to true with setSortingEnabled() immediately triggers a call to sortByColumn() with the current sort section and order."

(copied the changes from commit SHA-1: 77394fce99281cea65f30c67dbcd69a2d3eeba88)
---
 apps/opencs/view/world/table.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/apps/opencs/view/world/table.cpp b/apps/opencs/view/world/table.cpp
index c676a5ecc0..5c54bb9344 100644
--- a/apps/opencs/view/world/table.cpp
+++ b/apps/opencs/view/world/table.cpp
@@ -269,12 +269,6 @@ CSVWorld::Table::Table (const CSMWorld::UniversalId& id,
     setSelectionBehavior (QAbstractItemView::SelectRows);
     setSelectionMode (QAbstractItemView::ExtendedSelection);
 
-    setSortingEnabled (sorting);
-    if (sorting)
-    {
-        sortByColumn (mModel->findColumnIndex(CSMWorld::Columns::ColumnId_Id), Qt::AscendingOrder);
-    }
-
     int columns = mModel->columnCount();
     for (int i=0; i<columns; ++i)
     {
@@ -295,6 +289,13 @@ CSVWorld::Table::Table (const CSMWorld::UniversalId& id,
             hideColumn (i);
     }
 
+    if (sorting)
+    {
+        // FIXME: some tables (e.g. CellRef) have this column hidden, which makes it confusing
+        sortByColumn (mModel->findColumnIndex(CSMWorld::Columns::ColumnId_Id), Qt::AscendingOrder);
+    }
+    setSortingEnabled (sorting);
+
     mEditAction = new QAction (tr ("Edit Record"), this);
     connect (mEditAction, SIGNAL (triggered()), this, SLOT (editRecord()));
     mEditAction->setIcon(QIcon(":edit-edit"));

From f348b70733c942cfb14b00605ad3f8f67bf65a62 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Fri, 23 Jul 2021 17:59:54 +0200
Subject: [PATCH 1062/2859] Set mCanWaterWalk and mOnGround when adding Actor
 to the scene. mCanWaterWalk was set to false and updated during next frame's
 simulation mOnGround is set to true but then was updated as part of the scene
 loading logic.

---
 apps/openmw/mwphysics/actor.cpp         |  4 ++--
 apps/openmw/mwphysics/actor.hpp         |  2 +-
 apps/openmw/mwphysics/physicssystem.cpp | 10 +++++++++-
 apps/openmw/mwworld/scene.cpp           |  6 ------
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index 50b400c2ac..67bfb4dffe 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -19,8 +19,8 @@ namespace MWPhysics
 {
 
 
-Actor::Actor(const MWWorld::Ptr& ptr, const Resource::BulletShape* shape, PhysicsTaskScheduler* scheduler)
-  : mStandingOnPtr(nullptr), mCanWaterWalk(false), mWalkingOnWater(false)
+Actor::Actor(const MWWorld::Ptr& ptr, const Resource::BulletShape* shape, PhysicsTaskScheduler* scheduler, bool canWaterWalk)
+  : mStandingOnPtr(nullptr), mCanWaterWalk(canWaterWalk), mWalkingOnWater(false)
   , mCollisionObject(nullptr), mMeshTranslation(shape->mCollisionBox.center), mHalfExtents(shape->mCollisionBox.extents)
   , mVelocity(0,0,0), mStuckFrames(0), mLastStuckPosition{0, 0, 0}
   , mForce(0.f, 0.f, 0.f), mOnGround(true), mOnSlope(false)
diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index 3925edf59f..703d8a191b 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -27,7 +27,7 @@ namespace MWPhysics
     class Actor final : public PtrHolder
     {
     public:
-        Actor(const MWWorld::Ptr& ptr, const Resource::BulletShape* shape, PhysicsTaskScheduler* scheduler);
+        Actor(const MWWorld::Ptr& ptr, const Resource::BulletShape* shape, PhysicsTaskScheduler* scheduler, bool canWaterWalk);
         ~Actor() override;
 
         /**
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 69a4d8d478..9814af09f5 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -688,7 +688,15 @@ namespace MWPhysics
         if (!shape)
             return;
 
-        auto actor = std::make_shared<Actor>(ptr, shape, mTaskScheduler.get());
+        // check if Actor should spawn above water
+        const MWMechanics::MagicEffects& effects = ptr.getClass().getCreatureStats(ptr).getMagicEffects();
+        const bool canWaterWalk = effects.get(ESM::MagicEffect::WaterWalking).getMagnitude() > 0;
+
+        auto actor = std::make_shared<Actor>(ptr, shape, mTaskScheduler.get(), canWaterWalk);
+        
+        // check if Actor is on the ground or in the air
+        traceDown(ptr, ptr.getRefData().getPosition().asVec3(), 10.f);
+
         mActors.emplace(ptr, std::move(actor));
     }
 
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index c43ee76d1b..10c0ebe84c 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -486,12 +486,6 @@ namespace MWWorld
 
             const auto player = MWBase::Environment::get().getWorld()->getPlayerPtr();
 
-            // By default the player is grounded, with the scene fully loaded, we validate and correct this.
-            if (player.mCell == cell) // Only run once, during initial cell load.
-            {
-                mPhysics->traceDown(player, player.getRefData().getPosition().asVec3(), 10.f);
-            }
-
             navigator->update(player.getRefData().getPosition().asVec3());
 
             if (!cell->isExterior() && !(cell->getCell()->mData.mFlags & ESM::Cell::QuasiEx))

From fd67ebde2549bf5eb626c8c4ea76536c1f003a56 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Sat, 24 Jul 2021 09:17:48 +1000
Subject: [PATCH 1063/2859] Changes based on review comments, including:

* replace murmurhash with std::unordered_map
* plug potential leak from unique_ptr release
* replacing some sections with cleaner code
---
 CMakeLists.txt                             |   1 -
 apps/opencs/CMakeLists.txt                 |   1 -
 apps/opencs/model/world/infocollection.cpp |  30 +-
 apps/opencs/model/world/infocollection.hpp |  37 +-
 apps/opencs/model/world/refcollection.cpp  |  35 +-
 apps/opencs/model/world/refcollection.hpp  |   2 +-
 apps/opencs/model/world/refiddata.hpp      |   6 +-
 extern/murmurhash/CMakeLists.txt           |  17 -
 extern/murmurhash/MurmurHash2.cpp          | 522 ---------------------
 extern/murmurhash/MurmurHash2.h            |  38 --
 10 files changed, 39 insertions(+), 650 deletions(-)
 delete mode 100644 extern/murmurhash/CMakeLists.txt
 delete mode 100644 extern/murmurhash/MurmurHash2.cpp
 delete mode 100644 extern/murmurhash/MurmurHash2.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f40d77c1dc..b69cb5b71f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -536,7 +536,6 @@ endif (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clan
 add_subdirectory (extern/osg-ffmpeg-videoplayer)
 add_subdirectory (extern/oics)
 add_subdirectory (extern/Base64)
-add_subdirectory (extern/murmurhash)
 if (BUILD_OPENCS)
     add_subdirectory (extern/osgQt)
 endif()
diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 9a70950879..88c4233c9c 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -226,7 +226,6 @@ target_link_libraries(openmw-cs
     ${OSGTEXT_LIBRARIES}
     ${OSG_LIBRARIES}
     ${EXTERN_OSGQT_LIBRARY}
-    ${MURMURHASH_LIBRARIES}
     ${Boost_SYSTEM_LIBRARY}
     ${Boost_FILESYSTEM_LIBRARY}
     ${Boost_PROGRAM_OPTIONS_LIBRARY}
diff --git a/apps/opencs/model/world/infocollection.cpp b/apps/opencs/model/world/infocollection.cpp
index d229ddacc2..b4223d03ab 100644
--- a/apps/opencs/model/world/infocollection.cpp
+++ b/apps/opencs/model/world/infocollection.cpp
@@ -99,8 +99,8 @@ void CSMWorld::InfoCollection::load (const Info& record, bool base)
 int CSMWorld::InfoCollection::getInfoIndex (const std::string& id, const std::string& topic) const
 {
     // find the topic first
-    std::map<StringHash, std::vector<std::pair<std::string, int> > >::const_iterator iter
-        = mInfoIndex.find(StringHash(std::make_shared<std::string>(Misc::StringUtils::lowerCase(topic))));
+    std::unordered_map<std::string, std::vector<std::pair<std::string, int> > >::const_iterator iter
+        = mInfoIndex.find(Misc::StringUtils::lowerCase(topic));
 
     if (iter == mInfoIndex.end())
         return -1;
@@ -187,16 +187,10 @@ bool CSMWorld::InfoCollection::reorderRows (int baseIndex, const std::vector<int
 
     // adjust index
     int size = static_cast<int>(newOrder.size());
-    for (std::map<StringHash, std::vector<std::pair<std::string, int> > >::iterator iter
-            = mInfoIndex.begin(); iter != mInfoIndex.end(); ++iter)
-    {
-        for (std::vector<std::pair<std::string, int> >::iterator it = iter->second.begin();
-                it != iter->second.end(); ++it)
-        {
-            if (it->second >= baseIndex && it->second < baseIndex+size)
-                it->second = newOrder.at(it->second-baseIndex)+baseIndex;
-        }
-    }
+    for (auto& [hash, infos] : mInfoIndex)
+        for (auto& [a, b] : infos)
+            if (b >= baseIndex && b < baseIndex + size)
+                b = newOrder.at(b - baseIndex) + baseIndex;
 
     return true;
 }
@@ -244,8 +238,8 @@ CSMWorld::InfoCollection::Range CSMWorld::InfoCollection::getTopicRange (const s
     std::string lowerTopic = Misc::StringUtils::lowerCase (topic);
 
     // find the topic
-    std::map<StringHash, std::vector<std::pair<std::string, int> > >::const_iterator iter
-        = mInfoIndex.find(StringHash(std::make_shared<std::string>(lowerTopic)));
+    std::unordered_map<std::string, std::vector<std::pair<std::string, int> > >::const_iterator iter
+        = mInfoIndex.find(lowerTopic);
 
     if (iter == mInfoIndex.end())
         return Range (getRecords().end(), getRecords().end());
@@ -310,7 +304,7 @@ void CSMWorld::InfoCollection::removeRows (int index, int count)
 {
     Collection<Info, IdAccessor<Info> >::removeRows(index, count); // erase records only
 
-    for (std::map<StringHash, std::vector<std::pair<std::string, int> > >::iterator iter
+    for (std::unordered_map<std::string, std::vector<std::pair<std::string, int> > >::iterator iter
         = mInfoIndex.begin(); iter != mInfoIndex.end();)
     {
         for (std::vector<std::pair<std::string, int> >::iterator it = iter->second.begin();
@@ -383,7 +377,7 @@ void CSMWorld::InfoCollection::insertRecord (std::unique_ptr<RecordBase> record,
     // adjust index
     if (index < size-1)
     {
-        for (std::map<StringHash, std::vector<std::pair<std::string, int> > >::iterator iter
+        for (std::unordered_map<std::string, std::vector<std::pair<std::string, int> > >::iterator iter
             = mInfoIndex.begin(); iter != mInfoIndex.end(); ++iter)
         {
             for (std::vector<std::pair<std::string, int> >::iterator it = iter->second.begin();
@@ -397,9 +391,9 @@ void CSMWorld::InfoCollection::insertRecord (std::unique_ptr<RecordBase> record,
 
     // get iterator for existing topic or a new topic
     std::string lowerId = Misc::StringUtils::lowerCase(id);
-    std::pair<std::map<StringHash, std::vector<std::pair<std::string, int> > >::iterator, bool> res
+    std::pair<std::unordered_map<std::string, std::vector<std::pair<std::string, int> > >::iterator, bool> res
         = mInfoIndex.insert(
-                std::make_pair(StringHash(std::make_shared<std::string>(lowerId.substr(0, separator))),
+                std::make_pair(lowerId.substr(0, separator),
                                std::vector<std::pair<std::string, int> >())); // empty vector
 
     // insert info and index
diff --git a/apps/opencs/model/world/infocollection.hpp b/apps/opencs/model/world/infocollection.hpp
index 1417af6659..8974cbb8fb 100644
--- a/apps/opencs/model/world/infocollection.hpp
+++ b/apps/opencs/model/world/infocollection.hpp
@@ -1,8 +1,6 @@
 #ifndef CSM_WOLRD_INFOCOLLECTION_H
 #define CSM_WOLRD_INFOCOLLECTION_H
 
-#include <extern/murmurhash/MurmurHash2.h>
-
 #include "collection.hpp"
 #include "info.hpp"
 
@@ -11,37 +9,6 @@ namespace ESM
     struct Dialogue;
 }
 
-namespace CSMWorld
-{
-    struct StringHash
-    {
-        uint64_t mHash;
-        std::shared_ptr<std::string> mString;
-
-        StringHash (std::shared_ptr<std::string> str) : mString(str)
-        {
-            mHash = MurmurHash64A(str->c_str(), str->size(), /*seed*/1);
-        }
-    };
-}
-
-namespace std
-{
-    template<> struct less<CSMWorld::StringHash>
-    {
-        bool operator() (const CSMWorld::StringHash& lhs, const CSMWorld::StringHash& rhs) const
-        {
-            if (lhs.mHash < rhs.mHash)
-                return true;
-
-            if (lhs.mHash > rhs.mHash)
-                return false;
-
-            return *lhs.mString < *rhs.mString;
-        }
-    };
-}
-
 namespace CSMWorld
 {
     template<>
@@ -69,8 +36,8 @@ namespace CSMWorld
             // each topic has a small number of infos, which allows the use of vectors for
             // iterating through them without too much penalty.
             //
-            // NOTE: hashed topic string as well as id string are stored in lower case.
-            std::map<StringHash, std::vector<std::pair<std::string, int> > > mInfoIndex;
+            // NOTE: topic string as well as id string are stored in lower case.
+            std::unordered_map<std::string, std::vector<std::pair<std::string, int> > > mInfoIndex;
 
             void load (const Info& record, bool base);
 
diff --git a/apps/opencs/model/world/refcollection.cpp b/apps/opencs/model/world/refcollection.cpp
index 61cdd8205a..1f6fc76c4d 100644
--- a/apps/opencs/model/world/refcollection.cpp
+++ b/apps/opencs/model/world/refcollection.cpp
@@ -1,5 +1,7 @@
 #include "refcollection.hpp"
 
+#include <charconv>
+
 #include <components/esm/loadcell.hpp>
 
 #include "ref.hpp"
@@ -120,9 +122,9 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
             }
             else
             {
-                std::unique_ptr<Record<CellRef> > record2(new Record<CellRef>(getRecord(index)));
-                record2->mState = RecordBase::State_Deleted;
-                setRecord(index, std::move(record2));
+                std::unique_ptr<Record<CellRef> > record(new Record<CellRef>(getRecord(index)));
+                record->mState = RecordBase::State_Deleted;
+                setRecord(index, std::move(record));
             }
 
             continue;
@@ -181,14 +183,19 @@ std::string CSMWorld::RefCollection::getNewId()
     return "ref#" + std::to_string(mNextId++);
 }
 
-unsigned int CSMWorld::RefCollection::extractIdNum (const std::string& id) const
+unsigned int CSMWorld::RefCollection::extractIdNum(std::string_view id) const
 {
-    std::string::size_type separator = id.find_last_of('#');
+    const auto separator = id.find_last_of('#');
+
+    if (separator == std::string_view::npos)
+        throw std::runtime_error("invalid ref ID: " + std::string(id));
 
-    if (separator == std::string::npos)
-        throw std::runtime_error("invalid ref ID: " + id);
+    const std::string_view number = id.substr(separator + 1);
+    unsigned int result;
+    if (std::from_chars(number.data(), number.data() + number.size(), result).ec != std::errc())
+        throw std::runtime_error("invalid ref ID number: " + std::string(number));
 
-    return static_cast<unsigned int>(std::stoi(id.substr(separator+1)));
+    return result;
 }
 
 int CSMWorld::RefCollection::getIntIndex (unsigned int id) const
@@ -235,15 +242,15 @@ void CSMWorld::RefCollection::removeRows (int index, int count)
 
 void  CSMWorld::RefCollection::appendBlankRecord (const std::string& id, UniversalId::Type type)
 {
-    std::unique_ptr<Record<CellRef> > record2(new Record<CellRef>);
+    std::unique_ptr<Record<CellRef> > record(new Record<CellRef>);
 
-    record2->mState = Record<CellRef>::State_ModifiedOnly;
-    record2->mModified.blank();
+    record->mState = Record<CellRef>::State_ModifiedOnly;
+    record->mModified.blank();
 
-    record2->get().mId = id;
-    record2->get().mIdNum = extractIdNum(id);
+    record->get().mId = id;
+    record->get().mIdNum = extractIdNum(id);
 
-    Collection<CellRef, IdAccessor<CellRef> >::appendRecord(std::move(record2));
+    Collection<CellRef, IdAccessor<CellRef> >::appendRecord(std::move(record));
 }
 
 void CSMWorld::RefCollection::cloneRecord (const std::string& origin,
diff --git a/apps/opencs/model/world/refcollection.hpp b/apps/opencs/model/world/refcollection.hpp
index 1bdfda3925..e0e88d721f 100644
--- a/apps/opencs/model/world/refcollection.hpp
+++ b/apps/opencs/model/world/refcollection.hpp
@@ -29,7 +29,7 @@ namespace CSMWorld
 
             int mNextId;
 
-            unsigned int extractIdNum(const std::string& id) const;
+            unsigned int extractIdNum(std::string_view id) const;
 
             int getIntIndex (unsigned int id) const;
 
diff --git a/apps/opencs/model/world/refiddata.hpp b/apps/opencs/model/world/refiddata.hpp
index 7eeb936985..c921ab7244 100644
--- a/apps/opencs/model/world/refiddata.hpp
+++ b/apps/opencs/model/world/refiddata.hpp
@@ -94,13 +94,13 @@ namespace CSMWorld
     template<typename RecordT>
     void RefIdDataContainer<RecordT>::insertRecord(std::unique_ptr<RecordBase> record)
     {
-        Record<RecordT> *tmp = dynamic_cast<Record<RecordT>*>(record.get());
-        if(tmp != nullptr)
+        // convert base pointer to record type pointer first
+        if(Record<RecordT> *tmp = dynamic_cast<Record<RecordT>*>(record.get()))
         {
-            record.release();
             std::unique_ptr<Record<RecordT> > newRecord;
             newRecord.reset(tmp);
             mContainer.push_back(std::move(newRecord));
+            record.release();
         }
         else
             throw std::runtime_error ("invalid record for RefIdDataContainer");
diff --git a/extern/murmurhash/CMakeLists.txt b/extern/murmurhash/CMakeLists.txt
deleted file mode 100644
index cd8199ff06..0000000000
--- a/extern/murmurhash/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-# This is NOT intended as a stand-alone build system! Instead, you should include this from the main CMakeLists of your project.
-
-set(MURMURHASH_LIBRARY "murmurhash")
-
-# Sources
-set(SOURCE_FILES
-    MurmurHash2.cpp
-)
-
-add_library(${MURMURHASH_LIBRARY} STATIC ${SOURCE_FILES})
-
-set(MURMURHASH_LIBRARIES ${MURMURHASH_LIBRARY})
-
-link_directories(${CMAKE_CURRENT_BINARY_DIR})
-set(MURMURHASH_LIBRARIES ${MURMURHASH_LIBRARIES} PARENT_SCOPE)
diff --git a/extern/murmurhash/MurmurHash2.cpp b/extern/murmurhash/MurmurHash2.cpp
deleted file mode 100644
index d1b6f476e8..0000000000
--- a/extern/murmurhash/MurmurHash2.cpp
+++ /dev/null
@@ -1,522 +0,0 @@
-//-----------------------------------------------------------------------------
-// MurmurHash2 was written by Austin Appleby, and is placed in the public
-// domain. The author hereby disclaims copyright to this source code.
-
-// Note - This code makes a few assumptions about how your machine behaves -
-
-// 1. We can read a 4-byte value from any address without crashing
-// 2. sizeof(int) == 4
-
-// And it has a few limitations -
-
-// 1. It will not work incrementally.
-// 2. It will not produce the same results on little-endian and big-endian
-//    machines.
-
-#include "MurmurHash2.h"
-
-//-----------------------------------------------------------------------------
-// Platform-specific functions and macros
-
-// Microsoft Visual Studio
-
-#if defined(_MSC_VER)
-
-#define BIG_CONSTANT(x) (x)
-
-// Other compilers
-
-#else   // defined(_MSC_VER)
-
-#define BIG_CONSTANT(x) (x##LLU)
-
-#endif // !defined(_MSC_VER)
-
-//-----------------------------------------------------------------------------
-
-uint32_t MurmurHash2 ( const void * key, int len, uint32_t seed )
-{
-  // 'm' and 'r' are mixing constants generated offline.
-  // They're not really 'magic', they just happen to work well.
-
-  const uint32_t m = 0x5bd1e995;
-  const int r = 24;
-
-  // Initialize the hash to a 'random' value
-
-  uint32_t h = seed ^ len;
-
-  // Mix 4 bytes at a time into the hash
-
-  const unsigned char * data = (const unsigned char *)key;
-
-  while(len >= 4)
-  {
-    uint32_t k = *(uint32_t*)data;
-
-    k *= m;
-    k ^= k >> r;
-    k *= m;
-
-    h *= m;
-    h ^= k;
-
-    data += 4;
-    len -= 4;
-  }
-
-  // Handle the last few bytes of the input array
-
-  switch(len)
-  {
-  case 3: h ^= data[2] << 16;
-  case 2: h ^= data[1] << 8;
-  case 1: h ^= data[0];
-      h *= m;
-  };
-
-  // Do a few final mixes of the hash to ensure the last few
-  // bytes are well-incorporated.
-
-  h ^= h >> 13;
-  h *= m;
-  h ^= h >> 15;
-
-  return h;
-}
-
-//-----------------------------------------------------------------------------
-// MurmurHash2, 64-bit versions, by Austin Appleby
-
-// The same caveats as 32-bit MurmurHash2 apply here - beware of alignment
-// and endian-ness issues if used across multiple platforms.
-
-// 64-bit hash for 64-bit platforms
-
-uint64_t MurmurHash64A ( const void * key, int len, uint64_t seed )
-{
-  const uint64_t m = BIG_CONSTANT(0xc6a4a7935bd1e995);
-  const int r = 47;
-
-  uint64_t h = seed ^ (len * m);
-
-  const uint64_t * data = (const uint64_t *)key;
-  const uint64_t * end = data + (len/8);
-
-  while(data != end)
-  {
-    uint64_t k = *data++;
-
-    k *= m;
-    k ^= k >> r;
-    k *= m;
-
-    h ^= k;
-    h *= m;
-  }
-
-  const unsigned char * data2 = (const unsigned char*)data;
-
-  switch(len & 7)
-  {
-  case 7: h ^= uint64_t(data2[6]) << 48;
-  case 6: h ^= uint64_t(data2[5]) << 40;
-  case 5: h ^= uint64_t(data2[4]) << 32;
-  case 4: h ^= uint64_t(data2[3]) << 24;
-  case 3: h ^= uint64_t(data2[2]) << 16;
-  case 2: h ^= uint64_t(data2[1]) << 8;
-  case 1: h ^= uint64_t(data2[0]);
-          h *= m;
-  };
-
-  h ^= h >> r;
-  h *= m;
-  h ^= h >> r;
-
-  return h;
-}
-
-
-// 64-bit hash for 32-bit platforms
-
-uint64_t MurmurHash64B ( const void * key, int len, uint64_t seed )
-{
-  const uint32_t m = 0x5bd1e995;
-  const int r = 24;
-
-  uint32_t h1 = uint32_t(seed) ^ len;
-  uint32_t h2 = uint32_t(seed >> 32);
-
-  const uint32_t * data = (const uint32_t *)key;
-
-  while(len >= 8)
-  {
-    uint32_t k1 = *data++;
-    k1 *= m; k1 ^= k1 >> r; k1 *= m;
-    h1 *= m; h1 ^= k1;
-    len -= 4;
-
-    uint32_t k2 = *data++;
-    k2 *= m; k2 ^= k2 >> r; k2 *= m;
-    h2 *= m; h2 ^= k2;
-    len -= 4;
-  }
-
-  if(len >= 4)
-  {
-    uint32_t k1 = *data++;
-    k1 *= m; k1 ^= k1 >> r; k1 *= m;
-    h1 *= m; h1 ^= k1;
-    len -= 4;
-  }
-
-  switch(len)
-  {
-  case 3: h2 ^= ((unsigned char*)data)[2] << 16;
-  case 2: h2 ^= ((unsigned char*)data)[1] << 8;
-  case 1: h2 ^= ((unsigned char*)data)[0];
-      h2 *= m;
-  };
-
-  h1 ^= h2 >> 18; h1 *= m;
-  h2 ^= h1 >> 22; h2 *= m;
-  h1 ^= h2 >> 17; h1 *= m;
-  h2 ^= h1 >> 19; h2 *= m;
-
-  uint64_t h = h1;
-
-  h = (h << 32) | h2;
-
-  return h;
-}
-
-//-----------------------------------------------------------------------------
-// MurmurHash2A, by Austin Appleby
-
-// This is a variant of MurmurHash2 modified to use the Merkle-Damgard
-// construction. Bulk speed should be identical to Murmur2, small-key speed
-// will be 10%-20% slower due to the added overhead at the end of the hash.
-
-// This variant fixes a minor issue where null keys were more likely to
-// collide with each other than expected, and also makes the function
-// more amenable to incremental implementations.
-
-#define mmix(h,k) { k *= m; k ^= k >> r; k *= m; h *= m; h ^= k; }
-
-uint32_t MurmurHash2A ( const void * key, int len, uint32_t seed )
-{
-  const uint32_t m = 0x5bd1e995;
-  const int r = 24;
-  uint32_t l = len;
-
-  const unsigned char * data = (const unsigned char *)key;
-
-  uint32_t h = seed;
-
-  while(len >= 4)
-  {
-    uint32_t k = *(uint32_t*)data;
-
-    mmix(h,k);
-
-    data += 4;
-    len -= 4;
-  }
-
-  uint32_t t = 0;
-
-  switch(len)
-  {
-  case 3: t ^= data[2] << 16;
-  case 2: t ^= data[1] << 8;
-  case 1: t ^= data[0];
-  };
-
-  mmix(h,t);
-  mmix(h,l);
-
-  h ^= h >> 13;
-  h *= m;
-  h ^= h >> 15;
-
-  return h;
-}
-
-//-----------------------------------------------------------------------------
-// CMurmurHash2A, by Austin Appleby
-
-// This is a sample implementation of MurmurHash2A designed to work
-// incrementally.
-
-// Usage -
-
-// CMurmurHash2A hasher
-// hasher.Begin(seed);
-// hasher.Add(data1,size1);
-// hasher.Add(data2,size2);
-// ...
-// hasher.Add(dataN,sizeN);
-// uint32_t hash = hasher.End()
-
-class CMurmurHash2A
-{
-public:
-
-  void Begin ( uint32_t seed = 0 )
-  {
-    m_hash  = seed;
-    m_tail  = 0;
-    m_count = 0;
-    m_size  = 0;
-  }
-
-  void Add ( const unsigned char * data, int len )
-  {
-    m_size += len;
-
-    MixTail(data,len);
-
-    while(len >= 4)
-    {
-      uint32_t k = *(uint32_t*)data;
-
-      mmix(m_hash,k);
-
-      data += 4;
-      len -= 4;
-    }
-
-    MixTail(data,len);
-  }
-
-  uint32_t End ( void )
-  {
-    mmix(m_hash,m_tail);
-    mmix(m_hash,m_size);
-
-    m_hash ^= m_hash >> 13;
-    m_hash *= m;
-    m_hash ^= m_hash >> 15;
-
-    return m_hash;
-  }
-
-private:
-
-  static const uint32_t m = 0x5bd1e995;
-  static const int r = 24;
-
-  void MixTail ( const unsigned char * & data, int & len )
-  {
-    while( len && ((len<4) || m_count) )
-    {
-      m_tail |= (*data++) << (m_count * 8);
-
-      m_count++;
-      len--;
-
-      if(m_count == 4)
-      {
-        mmix(m_hash,m_tail);
-        m_tail = 0;
-        m_count = 0;
-      }
-    }
-  }
-
-  uint32_t m_hash;
-  uint32_t m_tail;
-  uint32_t m_count;
-  uint32_t m_size;
-};
-
-//-----------------------------------------------------------------------------
-// MurmurHashNeutral2, by Austin Appleby
-
-// Same as MurmurHash2, but endian- and alignment-neutral.
-// Half the speed though, alas.
-
-uint32_t MurmurHashNeutral2 ( const void * key, int len, uint32_t seed )
-{
-  const uint32_t m = 0x5bd1e995;
-  const int r = 24;
-
-  uint32_t h = seed ^ len;
-
-  const unsigned char * data = (const unsigned char *)key;
-
-  while(len >= 4)
-  {
-    uint32_t k;
-
-    k  = data[0];
-    k |= data[1] << 8;
-    k |= data[2] << 16;
-    k |= data[3] << 24;
-
-    k *= m;
-    k ^= k >> r;
-    k *= m;
-
-    h *= m;
-    h ^= k;
-
-    data += 4;
-    len -= 4;
-  }
-
-  switch(len)
-  {
-  case 3: h ^= data[2] << 16;
-  case 2: h ^= data[1] << 8;
-  case 1: h ^= data[0];
-          h *= m;
-  };
-
-  h ^= h >> 13;
-  h *= m;
-  h ^= h >> 15;
-
-  return h;
-}
-
-//-----------------------------------------------------------------------------
-// MurmurHashAligned2, by Austin Appleby
-
-// Same algorithm as MurmurHash2, but only does aligned reads - should be safer
-// on certain platforms.
-
-// Performance will be lower than MurmurHash2
-
-#define MIX(h,k,m) { k *= m; k ^= k >> r; k *= m; h *= m; h ^= k; }
-
-
-uint32_t MurmurHashAligned2 ( const void * key, int len, uint32_t seed )
-{
-  const uint32_t m = 0x5bd1e995;
-  const int r = 24;
-
-  const unsigned char * data = (const unsigned char *)key;
-
-  uint32_t h = seed ^ len;
-
-  int align = (uint64_t)data & 3;
-
-  if(align && (len >= 4))
-  {
-    // Pre-load the temp registers
-
-    uint32_t t = 0, d = 0;
-
-    switch(align)
-    {
-      case 1: t |= data[2] << 16;
-      case 2: t |= data[1] << 8;
-      case 3: t |= data[0];
-    }
-
-    t <<= (8 * align);
-
-    data += 4-align;
-    len -= 4-align;
-
-    int sl = 8 * (4-align);
-    int sr = 8 * align;
-
-    // Mix
-
-    while(len >= 4)
-    {
-      d = *(uint32_t *)data;
-      t = (t >> sr) | (d << sl);
-
-      uint32_t k = t;
-
-      MIX(h,k,m);
-
-      t = d;
-
-      data += 4;
-      len -= 4;
-    }
-
-    // Handle leftover data in temp registers
-
-    d = 0;
-
-    if(len >= align)
-    {
-      switch(align)
-      {
-      case 3: d |= data[2] << 16;
-      case 2: d |= data[1] << 8;
-      case 1: d |= data[0];
-      }
-
-      uint32_t k = (t >> sr) | (d << sl);
-      MIX(h,k,m);
-
-      data += align;
-      len -= align;
-
-      //----------
-      // Handle tail bytes
-
-      switch(len)
-      {
-      case 3: h ^= data[2] << 16;
-      case 2: h ^= data[1] << 8;
-      case 1: h ^= data[0];
-          h *= m;
-      };
-    }
-    else
-    {
-      switch(len)
-      {
-      case 3: d |= data[2] << 16;
-      case 2: d |= data[1] << 8;
-      case 1: d |= data[0];
-      case 0: h ^= (t >> sr) | (d << sl);
-          h *= m;
-      }
-    }
-
-    h ^= h >> 13;
-    h *= m;
-    h ^= h >> 15;
-
-    return h;
-  }
-  else
-  {
-    while(len >= 4)
-    {
-      uint32_t k = *(uint32_t *)data;
-
-      MIX(h,k,m);
-
-      data += 4;
-      len -= 4;
-    }
-
-    //----------
-    // Handle tail bytes
-
-    switch(len)
-    {
-    case 3: h ^= data[2] << 16;
-    case 2: h ^= data[1] << 8;
-    case 1: h ^= data[0];
-        h *= m;
-    };
-
-    h ^= h >> 13;
-    h *= m;
-    h ^= h >> 15;
-
-    return h;
-  }
-}
-
-//-----------------------------------------------------------------------------
diff --git a/extern/murmurhash/MurmurHash2.h b/extern/murmurhash/MurmurHash2.h
deleted file mode 100644
index e6d0c36924..0000000000
--- a/extern/murmurhash/MurmurHash2.h
+++ /dev/null
@@ -1,38 +0,0 @@
-//-----------------------------------------------------------------------------
-// MurmurHash2 was written by Austin Appleby, and is placed in the public
-// domain. The author hereby disclaims copyright to this source code.
-
-#ifndef _MURMURHASH2_H_
-#define _MURMURHASH2_H_
-
-//-----------------------------------------------------------------------------
-// Platform-specific functions and macros
-
-// Microsoft Visual Studio
-
-#if defined(_MSC_VER) && (_MSC_VER < 1600)
-
-typedef unsigned char uint8_t;
-typedef unsigned int uint32_t;
-typedef unsigned __int64 uint64_t;
-
-// Other compilers
-
-#else   // defined(_MSC_VER)
-
-#include <stdint.h>
-
-#endif // !defined(_MSC_VER)
-
-//-----------------------------------------------------------------------------
-
-uint32_t MurmurHash2        ( const void * key, int len, uint32_t seed );
-uint64_t MurmurHash64A      ( const void * key, int len, uint64_t seed );
-uint64_t MurmurHash64B      ( const void * key, int len, uint64_t seed );
-uint32_t MurmurHash2A       ( const void * key, int len, uint32_t seed );
-uint32_t MurmurHashNeutral2 ( const void * key, int len, uint32_t seed );
-uint32_t MurmurHashAligned2 ( const void * key, int len, uint32_t seed );
-
-//-----------------------------------------------------------------------------
-
-#endif // _MURMURHASH2_H_

From 3e466699c8c68961f0160bc676be97ca91e25bf3 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Sat, 24 Jul 2021 21:23:03 +1000
Subject: [PATCH 1064/2859] A better way to plug a potential memory leak in the
 event of an exception during push_back().

---
 apps/opencs/model/world/refiddata.hpp | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/apps/opencs/model/world/refiddata.hpp b/apps/opencs/model/world/refiddata.hpp
index c921ab7244..175aaef410 100644
--- a/apps/opencs/model/world/refiddata.hpp
+++ b/apps/opencs/model/world/refiddata.hpp
@@ -4,6 +4,7 @@
 #include <vector>
 #include <map>
 #include <memory>
+#include <cassert>
 
 #include <components/esm/loadacti.hpp>
 #include <components/esm/loadalch.hpp>
@@ -94,16 +95,11 @@ namespace CSMWorld
     template<typename RecordT>
     void RefIdDataContainer<RecordT>::insertRecord(std::unique_ptr<RecordBase> record)
     {
-        // convert base pointer to record type pointer first
-        if(Record<RecordT> *tmp = dynamic_cast<Record<RecordT>*>(record.get()))
-        {
-            std::unique_ptr<Record<RecordT> > newRecord;
-            newRecord.reset(tmp);
-            mContainer.push_back(std::move(newRecord));
-            record.release();
-        }
-        else
-            throw std::runtime_error ("invalid record for RefIdDataContainer");
+        assert(record != nullptr);
+        // convert base pointer to record type pointer
+        std::unique_ptr<Record<RecordT>> typedRecord(&dynamic_cast<Record<RecordT>&>(*record));
+        record.release();
+        mContainer.push_back(std::move(typedRecord));
     }
 
     template<typename RecordT>

From 33dcd7585af1b4227e4f0fada4afed78d7cf78f0 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Sat, 24 Jul 2021 20:00:25 +0000
Subject: [PATCH 1065/2859] OpenCS - Jump To Modified

---
 CHANGELOG.md                                  |  1 +
 apps/opencs/model/world/idtable.cpp           |  2 +-
 apps/opencs/model/world/idtableproxymodel.cpp |  7 ++-
 apps/opencs/view/world/table.cpp              | 41 +++++++++++++--
 apps/opencs/view/world/table.hpp              |  7 +++
 apps/opencs/view/world/tablesubview.cpp       | 51 ++++++++++++++++++-
 apps/opencs/view/world/tablesubview.hpp       |  4 ++
 7 files changed, 104 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff4996d05c..3d760f1b79 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@
     Bug #6133: Cannot reliably sneak or steal in the sight of the NPCs siding with player
     Bug #6143: Capturing a screenshot makes engine to be a temporary unresponsive
     Bug #6165: Paralyzed player character can pickup items when the inventory is open
+    Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
     Feature #2780: A way to see current OpenMW version in the console
     Feature #5489: MCP: Telekinesis fix for activators
     Feature #5996: Support Lua scripts in OpenMW
diff --git a/apps/opencs/model/world/idtable.cpp b/apps/opencs/model/world/idtable.cpp
index 30fe6f639a..ee08158e3f 100644
--- a/apps/opencs/model/world/idtable.cpp
+++ b/apps/opencs/model/world/idtable.cpp
@@ -191,7 +191,7 @@ void CSMWorld::IdTable::cloneRecord(const std::string& origin,
                                     const std::string& destination,
                                     CSMWorld::UniversalId::Type type)
 {
-    int index = mIdCollection->getAppendIndex (destination);
+    int index = mIdCollection->getAppendIndex (destination, type);
 
     beginInsertRows (QModelIndex(), index, index);
     mIdCollection->cloneRecord(origin, destination, type);
diff --git a/apps/opencs/model/world/idtableproxymodel.cpp b/apps/opencs/model/world/idtableproxymodel.cpp
index 3e24f8d12e..9d9dd7db3d 100644
--- a/apps/opencs/model/world/idtableproxymodel.cpp
+++ b/apps/opencs/model/world/idtableproxymodel.cpp
@@ -121,8 +121,11 @@ QString CSMWorld::IdTableProxyModel::getRecordId(int sourceRow) const
 
 void CSMWorld::IdTableProxyModel::refreshFilter()
 {
-    updateColumnMap();
-    invalidateFilter();
+    if (mFilter)
+    {
+        updateColumnMap();
+        invalidateFilter();
+    }
 }
 
 void CSMWorld::IdTableProxyModel::sourceRowsInserted(const QModelIndex &parent, int /*start*/, int end)
diff --git a/apps/opencs/view/world/table.cpp b/apps/opencs/view/world/table.cpp
index c676a5ecc0..cbfc70e367 100644
--- a/apps/opencs/view/world/table.cpp
+++ b/apps/opencs/view/world/table.cpp
@@ -5,6 +5,7 @@
 #include <QMenu>
 #include <QContextMenuEvent>
 #include <QString>
+#include <QMetaObject>
 #include <QtCore/qnamespace.h>
 
 #include <components/debug/debuglog.hpp>
@@ -239,7 +240,7 @@ void CSVWorld::Table::mouseDoubleClickEvent (QMouseEvent *event)
 CSVWorld::Table::Table (const CSMWorld::UniversalId& id,
     bool createAndDelete, bool sorting, CSMDoc::Document& document)
     : DragRecordTable(document), mCreateAction (nullptr), mCloneAction(nullptr), mTouchAction(nullptr),
-    mRecordStatusDisplay (0), mJumpToAddedRecord(false), mUnselectAfterJump(false)
+    mRecordStatusDisplay (0), mJumpToAddedRecord(false), mUnselectAfterJump(false), mAutoJump (false)
 {
     mModel = &dynamic_cast<CSMWorld::IdTableBase&> (*mDocument.getData().getTableModel (id));
 
@@ -405,7 +406,7 @@ CSVWorld::Table::Table (const CSMWorld::UniversalId& id,
     /// \note This signal could instead be connected to a slot that filters out changes not affecting
     /// the records status column (for permanence reasons)
     connect (mProxyModel, SIGNAL (dataChanged (const QModelIndex&, const QModelIndex&)),
-        this, SLOT (tableSizeUpdate()));
+        this, SLOT (dataChangedEvent(const QModelIndex&, const QModelIndex&)));
 
     connect (selectionModel(), SIGNAL (selectionChanged (const QItemSelection&, const QItemSelection&)),
         this, SLOT (selectionSizeUpdate ()));
@@ -801,7 +802,7 @@ void CSVWorld::Table::tableSizeUpdate()
                     case CSMWorld::RecordBase::State_BaseOnly: ++size; break;
                     case CSMWorld::RecordBase::State_Modified: ++size; ++modified; break;
                     case CSMWorld::RecordBase::State_ModifiedOnly: ++size; ++modified; break;
-                    case CSMWorld::RecordBase:: State_Deleted: ++deleted; ++modified; break;
+                    case CSMWorld::RecordBase::State_Deleted: ++deleted; ++modified; break;
                 }
             }
         }
@@ -874,15 +875,47 @@ std::vector< CSMWorld::UniversalId > CSVWorld::Table::getDraggedRecords() const
     return idToDrag;
 }
 
+// parent, start and end depend on the model sending the signal, in this case mProxyModel
+//
+// If, for example, mModel was used instead, then scrolTo() should use the index
+//   mProxyModel->mapFromSource(mModel->index(end, 0))
 void CSVWorld::Table::rowAdded(const std::string &id)
 {
     tableSizeUpdate();
     if(mJumpToAddedRecord)
     {
         int idColumn = mModel->findColumnIndex(CSMWorld::Columns::ColumnId_Id);
-        selectRow(mProxyModel->getModelIndex(id, idColumn).row());
+        int end = mProxyModel->getModelIndex(id, idColumn).row();
+        selectRow(end);
+
+        // without this delay the scroll works but goes to top for add/clone
+        QMetaObject::invokeMethod(this, "queuedScrollTo", Qt::QueuedConnection, Q_ARG(int, end));
 
         if(mUnselectAfterJump)
             clearSelection();
     }
 }
+
+void CSVWorld::Table::queuedScrollTo(int row)
+{
+    scrollTo(mProxyModel->index(row, 0), QAbstractItemView::PositionAtCenter);
+}
+
+void CSVWorld::Table::dataChangedEvent(const QModelIndex &topLeft, const QModelIndex &bottomRight)
+{
+    tableSizeUpdate();
+
+    if (mAutoJump)
+    {
+        selectRow(bottomRight.row());
+        scrollTo(bottomRight, QAbstractItemView::PositionAtCenter);
+    }
+}
+
+void CSVWorld::Table::jumpAfterModChanged(int state)
+{
+    if(state == Qt::Checked)
+        mAutoJump = true;
+    else
+        mAutoJump = false;
+}
diff --git a/apps/opencs/view/world/table.hpp b/apps/opencs/view/world/table.hpp
index 9c4b9b5e5a..a7c932a383 100644
--- a/apps/opencs/view/world/table.hpp
+++ b/apps/opencs/view/world/table.hpp
@@ -74,6 +74,7 @@ namespace CSVWorld
             std::map<Qt::KeyboardModifiers, DoubleClickAction> mDoubleClickActions;
             bool mJumpToAddedRecord;
             bool mUnselectAfterJump;
+            bool mAutoJump;
 
         private:
 
@@ -164,6 +165,12 @@ namespace CSVWorld
             void recordFilterChanged (std::shared_ptr<CSMFilter::Node> filter);
 
             void rowAdded(const std::string &id);
+
+            void dataChangedEvent(const QModelIndex &topLeft, const QModelIndex &bottomRight);
+
+            void jumpAfterModChanged(int state);
+
+            void queuedScrollTo(int state);
     };
 }
 
diff --git a/apps/opencs/view/world/tablesubview.cpp b/apps/opencs/view/world/tablesubview.cpp
index 5413f87a6e..6b4f12738e 100644
--- a/apps/opencs/view/world/tablesubview.cpp
+++ b/apps/opencs/view/world/tablesubview.cpp
@@ -1,5 +1,8 @@
 #include "tablesubview.hpp"
 
+#include <QHBoxLayout>
+#include <QPushButton>
+#include <QCheckBox>
 #include <QVBoxLayout>
 #include <QEvent>
 #include <QHeaderView>
@@ -18,7 +21,7 @@
 
 CSVWorld::TableSubView::TableSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document,
     const CreatorFactoryBase& creatorFactory, bool sorting)
-: SubView (id)
+: SubView (id), mShowOptions(false), mOptions(0)
 {
     QVBoxLayout *layout = new QVBoxLayout;
 
@@ -30,7 +33,37 @@ CSVWorld::TableSubView::TableSubView (const CSMWorld::UniversalId& id, CSMDoc::D
 
     mFilterBox = new CSVFilter::FilterBox (document.getData(), this);
 
-    layout->insertWidget (0, mFilterBox);
+    QHBoxLayout *hLayout = new QHBoxLayout;
+    hLayout->insertWidget(0,mFilterBox);
+
+    mOptions = new QWidget;
+
+    QHBoxLayout *optHLayout = new QHBoxLayout;
+    QCheckBox *autoJump = new QCheckBox("Auto Jump");
+    autoJump->setToolTip ("Whether to jump to the modified record."
+                "\nCan be useful in finding the moved or modified"
+                "\nobject instance while 3D editing.");
+    autoJump->setCheckState(Qt::Unchecked);
+    connect(autoJump, SIGNAL (stateChanged(int)), mTable, SLOT (jumpAfterModChanged(int)));
+    optHLayout->insertWidget(0, autoJump);
+    optHLayout->setContentsMargins (QMargins (0, 3, 0, 0));
+    mOptions->setLayout(optHLayout);
+    mOptions->resize(mOptions->width(), mFilterBox->height());
+    mOptions->hide();
+
+    QPushButton *opt = new QPushButton ();
+    opt->setIcon (QIcon (":startup/configure"));
+    opt->setSizePolicy (QSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed));
+    opt->setToolTip ("Open additional options for this subview.");
+    connect (opt, SIGNAL (clicked()), this, SLOT (toggleOptions()));
+
+    QVBoxLayout *buttonLayout = new QVBoxLayout; // work around margin issues
+    buttonLayout->setContentsMargins (QMargins (0/*left*/, 3/*top*/, 3/*right*/, 0/*bottom*/));
+    buttonLayout->insertWidget(0, opt, 0, Qt::AlignVCenter|Qt::AlignRight);
+    hLayout->insertWidget(1, mOptions);
+    hLayout->insertLayout(2, buttonLayout);
+
+    layout->insertLayout (0, hLayout);
 
     CSVDoc::SizeHintWidget *widget = new CSVDoc::SizeHintWidget;
 
@@ -166,6 +199,20 @@ bool CSVWorld::TableSubView::eventFilter (QObject* object, QEvent* event)
     return false;
 }
 
+void CSVWorld::TableSubView::toggleOptions()
+{
+    if (mShowOptions)
+    {
+        mShowOptions = false;
+        mOptions->hide();
+    }
+    else
+    {
+        mShowOptions = true;
+        mOptions->show();
+    }
+}
+
 void CSVWorld::TableSubView::requestFocus (const std::string& id)
 {
     mTable->requestFocus(id);
diff --git a/apps/opencs/view/world/tablesubview.hpp b/apps/opencs/view/world/tablesubview.hpp
index 337d2c7621..d89f71e8a4 100644
--- a/apps/opencs/view/world/tablesubview.hpp
+++ b/apps/opencs/view/world/tablesubview.hpp
@@ -6,6 +6,7 @@
 #include <QtCore/qnamespace.h>
 
 class QModelIndex;
+class QWidget;
 
 namespace CSMWorld
 {
@@ -35,6 +36,8 @@ namespace CSVWorld
             Table *mTable;
             TableBottomBox *mBottom;
             CSVFilter::FilterBox *mFilterBox;
+            bool mShowOptions;
+            QWidget *mOptions;
 
         public:
 
@@ -60,6 +63,7 @@ namespace CSVWorld
             void cloneRequest (const CSMWorld::UniversalId& toClone);
             void createFilterRequest(std::vector< CSMWorld::UniversalId >& types,
                                      Qt::DropAction action);
+            void toggleOptions ();
 
         public slots:
 

From 216d91837f983231c47e93f453cbc2eb23011896 Mon Sep 17 00:00:00 2001
From: Abdu Sharif <narukomanroom@gmail.com>
Date: Sun, 25 Jul 2021 07:20:00 +0000
Subject: [PATCH 1066/2859] Fix #6174

---
 CHANGELOG.md                          | 1 +
 files/mygui/openmw_edit_effect.layout | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d760f1b79..fccbba4ac9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@
     Bug #6133: Cannot reliably sneak or steal in the sight of the NPCs siding with player
     Bug #6143: Capturing a screenshot makes engine to be a temporary unresponsive
     Bug #6165: Paralyzed player character can pickup items when the inventory is open
+    Bug #6174: Spellmaking and Enchanting sliders differences from vanilla
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
     Feature #2780: A way to see current OpenMW version in the console
     Feature #5489: MCP: Telekinesis fix for activators
diff --git a/files/mygui/openmw_edit_effect.layout b/files/mygui/openmw_edit_effect.layout
index 3b26286c4c..cd6453c817 100644
--- a/files/mygui/openmw_edit_effect.layout
+++ b/files/mygui/openmw_edit_effect.layout
@@ -40,6 +40,8 @@
             <Widget type="ScrollBar" skin="MW_HScroll" position="122 20 210 13" name="MagnitudeMinSlider">
                 <Property key="Range" value="100"/>
                 <Property key="Page" value="1"/>
+                <Property key="ViewPage" value="10"/>
+                <Property key="MoveToClick" value="false"/>
             </Widget>
 
             <Widget type="TextBox" skin="SandText" position="122 32 210 20" name="MagnitudeMaxValue">
@@ -49,6 +51,8 @@
             <Widget type="ScrollBar" skin="MW_HScroll" position="122 52 210 13" name="MagnitudeMaxSlider">
                 <Property key="Range" value="100"/>
                 <Property key="Page" value="1"/>
+                <Property key="ViewPage" value="10"/>
+                <Property key="MoveToClick" value="false"/>
             </Widget>
         </Widget>
 
@@ -70,6 +74,8 @@
             <Widget type="ScrollBar" skin="MW_HScroll" position="122 20 210 13" name="DurationSlider">
                 <Property key="Range" value="1440"/>
                 <Property key="Page" value="1"/>
+                <Property key="ViewPage" value="20"/>
+                <Property key="MoveToClick" value="false"/>
             </Widget>
         </Widget>
 
@@ -90,6 +96,8 @@
             <Widget type="ScrollBar" skin="MW_HScroll" position="122 20 210 13" name="AreaSlider">
                 <Property key="Range" value="51"/>
                 <Property key="Page" value="1"/>
+                <Property key="ViewPage" value="5"/>
+                <Property key="MoveToClick" value="false"/>
             </Widget>
         </Widget>
 

From 99cd4b6742b4bcc23b697b6eaf23ab4d1bfc07de Mon Sep 17 00:00:00 2001
From: CedricMocquillon <cedric.mocquillon@sage.com>
Date: Mon, 9 Nov 2020 14:06:50 +0100
Subject: [PATCH 1067/2859] [Refactoring] Several refactorings:

[Refactoring] Add marker size method instead of using magic constant

[Refactoring] Simplify worldPosToImageSpace and cellTopLeftCornerToImageSpace usage

[Refactoring] Add a missing 'f' to specify the float type

[Refactoring] Make cellTopLeftCornerToImageSpace more homogenous with worldPosToImageSpace

[Refactoring] Extract createmakrercoords method

[Refactoring] Use worldPosToImageSpace instead of cellTopLeftCornerToImageSpace
Remove cellTopLeftCornerToImageSpace as it is not used anymore
Remove getCellSize as it is not used anymore

[Refactoring] Extract new method createMarker

[Refactoring] Extract new method getMarkerCoordinates

[Refactoring] Extract new method getPosition

[Refactoring] Extract new method centerView

[Refactoring] Extract new method createDoorMarker

[Refactoring] Simplify for loop

[Refactoring] Make the test before the loop
---
 apps/openmw/mwgui/mapwindow.cpp    | 240 +++++++++++++++--------------
 apps/openmw/mwgui/mapwindow.hpp    |  11 +-
 apps/openmw/mwrender/globalmap.cpp |  12 +-
 apps/openmw/mwrender/globalmap.hpp |   4 -
 4 files changed, 134 insertions(+), 133 deletions(-)

diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index 6e8804a43f..f90f5c133a 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -167,7 +167,7 @@ namespace MWGui
         , mFogOfWarToggled(true)
         , mFogOfWarEnabled(fogOfWarEnabled)
         , mMapWidgetSize(0)
-        , mNumCells(0)
+        , mNumCells(1)
         , mCellDistance(0)
         , mCustomMarkers(markers)
         , mMarkerUpdateTimer(0.0f)
@@ -234,65 +234,82 @@ namespace MWGui
 
     void LocalMapBase::applyFogOfWar()
     {
-        for (int mx=0; mx<mNumCells; ++mx)
+        if (!mFogOfWarToggled || !mFogOfWarEnabled)
         {
-            for (int my=0; my<mNumCells; ++my)
+            for (auto& entry : mMaps)
             {
-                MapEntry& entry = mMaps[my + mNumCells*mx];
-                MyGUI::ImageBox* fog = entry.mFogWidget;
-
-                if (!mFogOfWarToggled || !mFogOfWarEnabled)
-                {
-                    fog->setImageTexture("");
-                    entry.mFogTexture.reset();
-                    continue;
-                }
+                entry.mFogWidget->setImageTexture("");
+                entry.mFogTexture.reset();
             }
         }
 
         redraw();
     }
 
-    MyGUI::IntPoint LocalMapBase::getMarkerPosition(float worldX, float worldY, MarkerUserData& markerPos)
+    MyGUI::IntPoint LocalMapBase::getPosition(int cellX, int cellY, float nX, float nY) const
+    {
+        // normalized cell coordinates
+        auto mapWidgetSize = getWidgetSize();
+        return MyGUI::IntPoint(
+            static_cast<int>(nX * mapWidgetSize + (mCellDistance + (cellX - mCurX)) * mapWidgetSize),
+            static_cast<int>(nY * mapWidgetSize + (mCellDistance - (cellY - mCurY)) * mapWidgetSize)
+        );
+    }
+
+    MyGUI::IntPoint LocalMapBase::getMarkerPosition(float worldX, float worldY, MarkerUserData& markerPos) const
     {
-        MyGUI::IntPoint widgetPos;
+        int cellX, cellY;
         // normalized cell coordinates
         float nX,nY;
 
         if (!mInterior)
         {
-            int cellX, cellY;
             MWBase::Environment::get().getWorld()->positionToIndex(worldX, worldY, cellX, cellY);
             nX = (worldX - cellSize * cellX) / cellSize;
             // Image space is -Y up, cells are Y up
             nY = 1 - (worldY - cellSize * cellY) / cellSize;
-
-            float cellDx = static_cast<float>(cellX - mCurX);
-            float cellDy = static_cast<float>(cellY - mCurY);
-
-            markerPos.cellX = cellX;
-            markerPos.cellY = cellY;
-
-            widgetPos = MyGUI::IntPoint(static_cast<int>(nX * mMapWidgetSize + (mCellDistance + cellDx) * mMapWidgetSize),
-                                        static_cast<int>(nY * mMapWidgetSize + (mCellDistance - cellDy) * mMapWidgetSize));
         }
         else
-        {
-            int cellX, cellY;
-            osg::Vec2f worldPos (worldX, worldY);
-            mLocalMapRender->worldToInteriorMapPosition(worldPos, nX, nY, cellX, cellY);
-
-            markerPos.cellX = cellX;
-            markerPos.cellY = cellY;
-
-            // Image space is -Y up, cells are Y up
-            widgetPos = MyGUI::IntPoint(static_cast<int>(nX * mMapWidgetSize + (mCellDistance + (cellX - mCurX)) * mMapWidgetSize),
-                                        static_cast<int>(nY * mMapWidgetSize + (mCellDistance - (cellY - mCurY)) * mMapWidgetSize));
-        }
+            mLocalMapRender->worldToInteriorMapPosition({ worldX, worldY }, nX, nY, cellX, cellY);
 
+        markerPos.cellX = cellX;
+        markerPos.cellY = cellY;
         markerPos.nX = nX;
         markerPos.nY = nY;
-        return widgetPos;
+        return getPosition(markerPos.cellX, markerPos.cellY, markerPos.nX, markerPos.nY);
+    }
+
+    MyGUI::IntCoord LocalMapBase::getMarkerCoordinates(float worldX, float worldY, MarkerUserData& markerPos, size_t markerSize) const
+    {
+        int halfMarkerSize = markerSize / 2;
+        auto position = getMarkerPosition(worldX, worldY, markerPos);
+        return MyGUI::IntCoord(position.left - halfMarkerSize, position.top - halfMarkerSize, markerSize, markerSize);
+    }
+
+    MyGUI::Widget* LocalMapBase::createDoorMarker(const std::string& name, const MyGUI::VectorString& notes, float x, float y) const
+    {
+        MarkerUserData data(mLocalMapRender);
+        data.notes = notes;
+        data.caption = name;
+        MarkerWidget* markerWidget = mLocalMap->createWidget<MarkerWidget>("MarkerButton",
+            getMarkerCoordinates(x, y, data, 8), MyGUI::Align::Default);
+        markerWidget->setNormalColour(MyGUI::Colour::parse(MyGUI::LanguageManager::getInstance().replaceTags("#{fontcolour=normal}")));
+        markerWidget->setHoverColour(MyGUI::Colour::parse(MyGUI::LanguageManager::getInstance().replaceTags("#{fontcolour=normal_over}")));
+        markerWidget->setDepth(Local_MarkerLayer);
+        markerWidget->setNeedMouseFocus(true);
+        // Used by tooltips to not show the tooltip if marker is hidden by fog of war
+        markerWidget->setUserString("ToolTipType", "MapMarker");
+
+        markerWidget->setUserData(data);
+        return markerWidget;
+    }
+
+    void LocalMapBase::centerView()
+    {
+        MyGUI::IntPoint pos = mCompass->getPosition() + MyGUI::IntPoint{ 16, 16 };
+        MyGUI::IntSize viewsize = mLocalMap->getSize();
+        MyGUI::IntPoint viewOffset((viewsize.width / 2) - pos.left, (viewsize.height / 2) - pos.top);
+        mLocalMap->setViewOffset(viewOffset);
     }
 
     void LocalMapBase::updateCustomMarkers()
@@ -317,13 +334,8 @@ namespace MWGui
                     const ESM::CustomMarker& marker = it->second;
 
                     MarkerUserData markerPos (mLocalMapRender);
-                    MyGUI::IntPoint widgetPos = getMarkerPosition(marker.mWorldX, marker.mWorldY, markerPos);
-
-                    MyGUI::IntCoord widgetCoord(widgetPos.left - 8,
-                                                widgetPos.top - 8,
-                                                16, 16);
                     MarkerWidget* markerWidget = mLocalMap->createWidget<MarkerWidget>("CustomMarkerButton",
-                        widgetCoord, MyGUI::Align::Default);
+                        getMarkerCoordinates(marker.mWorldX, marker.mWorldY, markerPos, 16), MyGUI::Align::Default);
                     markerWidget->setDepth(Local_MarkerAboveFogLayer);
                     markerWidget->setUserString("ToolTipType", "Layout");
                     markerWidget->setUserString("ToolTipLayout", "TextToolTipOneLine");
@@ -385,21 +397,21 @@ namespace MWGui
         mLocalMap->getParent()->_updateChilds();
     }
 
+    float LocalMapBase::getWidgetSize() const
+    {
+        return mMapWidgetSize;
+    }
+
     void LocalMapBase::setPlayerPos(int cellX, int cellY, const float nx, const float ny)
     {
-        MyGUI::IntPoint pos(static_cast<int>(mMapWidgetSize * mCellDistance + nx*mMapWidgetSize - 16), static_cast<int>(mMapWidgetSize * mCellDistance + ny*mMapWidgetSize - 16));
-        pos.left += (cellX - mCurX) * mMapWidgetSize;
-        pos.top -= (cellY - mCurY) * mMapWidgetSize;
+        MyGUI::IntPoint pos = getPosition(cellX, cellY, nx, ny) - MyGUI::IntPoint{ 16, 16 };
 
         if (pos != mCompass->getPosition())
         {
             notifyPlayerUpdate ();
 
             mCompass->setPosition(pos);
-            MyGUI::IntPoint middle (pos.left+16, pos.top+16);
-                    MyGUI::IntCoord viewsize = mLocalMap->getCoord();
-            MyGUI::IntPoint viewOffset((viewsize.width / 2) - middle.left, (viewsize.height / 2) - middle.top);
-            mLocalMap->setViewOffset(viewOffset);
+            centerView();
         }
     }
 
@@ -449,13 +461,9 @@ namespace MWGui
         {
             const ESM::Position& worldPos = ptr.getRefData().getPosition();
             MarkerUserData markerPos (mLocalMapRender);
-            MyGUI::IntPoint widgetPos = getMarkerPosition(worldPos.pos[0], worldPos.pos[1], markerPos);
-            MyGUI::IntCoord widgetCoord(widgetPos.left - 4,
-                                        widgetPos.top - 4,
-                                        8, 8);
             ++counter;
             MyGUI::ImageBox* markerWidget = mLocalMap->createWidget<MyGUI::ImageBox>("ImageBox",
-                widgetCoord, MyGUI::Align::Default);
+                getMarkerCoordinates(worldPos.pos[0], worldPos.pos[1], markerPos, 8), MyGUI::Align::Default);
             markerWidget->setDepth(Local_MarkerAboveFogLayer);
             markerWidget->setImageTexture(markerTexture);
             markerWidget->setImageCoord(MyGUI::IntCoord(0,0,8,8));
@@ -561,18 +569,17 @@ namespace MWGui
         }
         else
         {
-            for (int dX=-mCellDistance; dX<=mCellDistance; ++dX)
+            for (int x = mCurX - mCellDistance; x <= mCurX + mCellDistance; ++x)
             {
-                for (int dY=-mCellDistance; dY<=mCellDistance; ++dY)
+                for (int y = mCurY - mCellDistance; y <= mCurY + mCellDistance; ++y)
                 {
-                    MWWorld::CellStore* cell = world->getExterior (mCurX+dX, mCurY+dY);
+                    MWWorld::CellStore* cell = world->getExterior (x, y);
                     world->getDoorMarkers(cell, doors);
                 }
             }
         }
 
         // Create a widget for each marker
-        int counter = 0;
         for (MWBase::World::DoorMarker& marker : doors)
         {
             std::vector<std::string> destNotes;
@@ -580,24 +587,7 @@ namespace MWGui
             for (CustomMarkerCollection::ContainerType::const_iterator iter = markers.first; iter != markers.second; ++iter)
                 destNotes.push_back(iter->second.mNote);
 
-            MarkerUserData data (mLocalMapRender);
-            data.notes = destNotes;
-            data.caption = marker.name;
-            MyGUI::IntPoint widgetPos = getMarkerPosition(marker.x, marker.y, data);
-            MyGUI::IntCoord widgetCoord(widgetPos.left - 4,
-                                        widgetPos.top - 4,
-                                        8, 8);
-            ++counter;
-            MarkerWidget* markerWidget = mLocalMap->createWidget<MarkerWidget>("MarkerButton",
-                widgetCoord, MyGUI::Align::Default);
-            markerWidget->setNormalColour(MyGUI::Colour::parse(MyGUI::LanguageManager::getInstance().replaceTags("#{fontcolour=normal}")));
-            markerWidget->setHoverColour(MyGUI::Colour::parse(MyGUI::LanguageManager::getInstance().replaceTags("#{fontcolour=normal_over}")));
-            markerWidget->setDepth(Local_MarkerLayer);
-            markerWidget->setNeedMouseFocus(true);
-            // Used by tooltips to not show the tooltip if marker is hidden by fog of war
-            markerWidget->setUserString("ToolTipType", "MapMarker");
-
-            markerWidget->setUserData(data);
+            MyGUI::Widget* markerWidget = createDoorMarker(marker.name, destNotes, marker.x, marker.y);
             doorMarkerCreated(markerWidget);
 
             mDoorMarkerWidgets.push_back(markerWidget);
@@ -623,12 +613,8 @@ namespace MWGui
                 && (!mInterior || Misc::StringUtils::ciEqual(markedCell->getCell()->mName, mPrefix)))
         {
             MarkerUserData markerPos (mLocalMapRender);
-            MyGUI::IntPoint widgetPos = getMarkerPosition(markedPosition.pos[0], markedPosition.pos[1], markerPos);
-            MyGUI::IntCoord widgetCoord(widgetPos.left - 4,
-                                        widgetPos.top - 4,
-                                        8, 8);
             MyGUI::ImageBox* markerWidget = mLocalMap->createWidget<MyGUI::ImageBox>("ImageBox",
-                widgetCoord, MyGUI::Align::Default);
+                getMarkerCoordinates(markedPosition.pos[0], markedPosition.pos[1], markerPos, 8), MyGUI::Align::Default);
             markerWidget->setDepth(Local_MarkerAboveFogLayer);
             markerWidget->setImageTexture("textures\\menu_map_smark.dds");
             markerWidget->setNeedMouseFocus(false);
@@ -745,10 +731,11 @@ namespace MWGui
         MyGUI::IntPoint clickedPos = MyGUI::InputManager::getInstance().getMousePosition();
 
         MyGUI::IntPoint widgetPos = clickedPos - mEventBoxLocal->getAbsolutePosition();
-        int x = int(widgetPos.left/float(mMapWidgetSize))-mCellDistance;
-        int y = (int(widgetPos.top/float(mMapWidgetSize))-mCellDistance)*-1;
-        float nX = widgetPos.left/float(mMapWidgetSize) - int(widgetPos.left/float(mMapWidgetSize));
-        float nY = widgetPos.top/float(mMapWidgetSize) - int(widgetPos.top/float(mMapWidgetSize));
+        auto mapWidgetSize = getWidgetSize();
+        int x = int(widgetPos.left/float(mapWidgetSize))-mCellDistance;
+        int y = (int(widgetPos.top/float(mapWidgetSize))-mCellDistance)*-1;
+        float nX = widgetPos.left/float(mapWidgetSize) - int(widgetPos.left/float(mapWidgetSize));
+        float nY = widgetPos.top/float(mapWidgetSize) - int(widgetPos.top/float(mapWidgetSize));
         x += mCurX;
         y += mCurY;
 
@@ -818,38 +805,47 @@ namespace MWGui
         setTitle("#{sCell=" + cellName + "}");
     }
 
-    void MapWindow::addVisitedLocation(const std::string& name, int x, int y)
+    MyGUI::IntCoord MapWindow::createMarkerCoords(float x, float y) const
     {
-        CellId cell;
-        cell.first = x;
-        cell.second = y;
-        if (mMarkers.insert(cell).second)
-        {
-            float worldX, worldY;
-            mGlobalMapRender->cellTopLeftCornerToImageSpace (x, y, worldX, worldY);
+        float worldX, worldY;
+        mGlobalMapRender->worldPosToImageSpace((x + 0.5f) * Constants::CellSizeInUnits, (y + 0.5f)* Constants::CellSizeInUnits, worldX, worldY);
 
-            int markerSize = 12;
-            int offset = mGlobalMapRender->getCellSize()/2 - markerSize/2;
-            MyGUI::IntCoord widgetCoord(
-                        static_cast<int>(worldX * mGlobalMapRender->getWidth()+offset),
-                        static_cast<int>(worldY * mGlobalMapRender->getHeight() + offset),
-                        markerSize, markerSize);
+        const float markerSize = getMarkerSize();
+        const float halfMarkerSize = markerSize / 2.0f;
+        return MyGUI::IntCoord(
+            static_cast<int>(worldX - halfMarkerSize),
+            static_cast<int>(worldY - halfMarkerSize),
+            markerSize, markerSize);
+    }
 
-            MyGUI::Widget* markerWidget = mGlobalMap->createWidget<MyGUI::Widget>("MarkerButton",
-                widgetCoord, MyGUI::Align::Default);
+    MyGUI::Widget* MapWindow::createMarker(const std::string& name, float x, float y)
+    {
+        MyGUI::Widget* markerWidget = mGlobalMap->createWidget<MyGUI::Widget>("MarkerButton",
+            createMarkerCoords(x, y), MyGUI::Align::Default);
 
-            markerWidget->setUserString("Caption_TextOneLine", "#{sCell=" + name + "}");
+        markerWidget->setUserString("Caption_TextOneLine", "#{sCell=" + name + "}");
 
-            setGlobalMapMarkerTooltip(markerWidget, x, y);
+        setGlobalMapMarkerTooltip(markerWidget, x, y);
 
-            markerWidget->setUserString("ToolTipLayout", "TextToolTipOneLine");
+        markerWidget->setUserString("ToolTipLayout", "TextToolTipOneLine");
 
-            markerWidget->setNeedMouseFocus(true);
-            markerWidget->setColour(MyGUI::Colour::parse(MyGUI::LanguageManager::getInstance().replaceTags("#{fontcolour=normal}")));
-            markerWidget->setDepth(Global_MarkerLayer);
-            markerWidget->eventMouseDrag += MyGUI::newDelegate(this, &MapWindow::onMouseDrag);
-            markerWidget->eventMouseButtonPressed += MyGUI::newDelegate(this, &MapWindow::onDragStart);
-            mGlobalMapMarkers[std::make_pair(x,y)] = markerWidget;
+        markerWidget->setNeedMouseFocus(true);
+        markerWidget->setColour(MyGUI::Colour::parse(MyGUI::LanguageManager::getInstance().replaceTags("#{fontcolour=normal}")));
+        markerWidget->setDepth(Global_MarkerLayer);
+        markerWidget->eventMouseDrag += MyGUI::newDelegate(this, &MapWindow::onMouseDrag);
+        markerWidget->eventMouseButtonPressed += MyGUI::newDelegate(this, &MapWindow::onDragStart);
+
+        return markerWidget;
+    }
+
+    void MapWindow::addVisitedLocation(const std::string& name, int x, int y)
+    {
+        CellId cell;
+        cell.first = x;
+        cell.second = y;
+        if (mMarkers.insert(cell).second)
+        {
+            mGlobalMapMarkers[std::make_pair(x, y)] = createMarker(name, x, y);
         }
     }
 
@@ -891,6 +887,11 @@ namespace MWGui
         }
     }
 
+    float MapWindow::getMarkerSize() const
+    {
+        return 12.0f;
+    }
+
     void MapWindow::updateCustomMarkers()
     {
         LocalMapBase::updateCustomMarkers();
@@ -978,19 +979,22 @@ namespace MWGui
         setGlobalMapPlayerDir(mLastDirectionX, mLastDirectionY);
     }
 
+    void MapWindow::centerView()
+    {
+        // set the view offset so that player is in the center
+        MyGUI::IntSize viewsize = mGlobalMap->getSize();
+        MyGUI::IntPoint pos = mPlayerArrowGlobal->getPosition() + MyGUI::IntPoint{ 16,16 };
+        MyGUI::IntPoint viewoffs(static_cast<int>(viewsize.width * 0.5f - pos.left), static_cast<int>(viewsize.height * 0.5f - pos.top));
+        mGlobalMap->setViewOffset(viewoffs);
+    }
+
     void MapWindow::setGlobalMapPlayerPosition(float worldX, float worldY)
     {
         float x, y;
         mGlobalMapRender->worldPosToImageSpace (worldX, worldY, x, y);
-        x *= mGlobalMapRender->getWidth();
-        y *= mGlobalMapRender->getHeight();
-
         mPlayerArrowGlobal->setPosition(MyGUI::IntPoint(static_cast<int>(x - 16), static_cast<int>(y - 16)));
 
-        // set the view offset so that player is in the center
-        MyGUI::IntSize viewsize = mGlobalMap->getSize();
-        MyGUI::IntPoint viewoffs(static_cast<int>(viewsize.width * 0.5f - x), static_cast<int>(viewsize.height *0.5 - y));
-        mGlobalMap->setViewOffset(viewoffs);
+        centerView();
     }
 
     void MapWindow::setGlobalMapPlayerDir(const float x, const float y)
diff --git a/apps/openmw/mwgui/mapwindow.hpp b/apps/openmw/mwgui/mapwindow.hpp
index 7e8092f289..f4559b9abf 100644
--- a/apps/openmw/mwgui/mapwindow.hpp
+++ b/apps/openmw/mwgui/mapwindow.hpp
@@ -149,9 +149,13 @@ namespace MWGui
 
         void applyFogOfWar();
 
-        MyGUI::IntPoint getMarkerPosition (float worldX, float worldY, MarkerUserData& markerPos);
+        MyGUI::IntPoint getPosition(int cellX, int cellY, float nx, float ny) const;
+        MyGUI::IntPoint getMarkerPosition (float worldX, float worldY, MarkerUserData& markerPos) const;
+        MyGUI::IntCoord getMarkerCoordinates(float worldX, float worldY, MarkerUserData& markerPos, size_t markerSize) const;
+        MyGUI::Widget* createDoorMarker(const std::string& name, const MyGUI::VectorString& notes, float x, float y) const;
 
         virtual void notifyPlayerUpdate() {}
+        void centerView();
         virtual void notifyMapChanged() {}
 
         virtual void customMarkerCreated(MyGUI::Widget* marker) {}
@@ -163,6 +167,7 @@ namespace MWGui
         void addDetectionMarkers(int type);
 
         void redraw();
+        float getWidgetSize() const;
 
         float mMarkerUpdateTimer;
 
@@ -252,6 +257,9 @@ namespace MWGui
         void onChangeScrollWindowCoord(MyGUI::Widget* sender);
         void globalMapUpdatePlayer();
         void setGlobalMapMarkerTooltip(MyGUI::Widget* widget, int x, int y);
+        float getMarkerSize() const;
+        MyGUI::IntCoord createMarkerCoords(float x, float y) const;
+        MyGUI::Widget* createMarker(const std::string& name, float x, float y);
 
         MyGUI::ScrollView* mGlobalMap;
         std::unique_ptr<MyGUI::ITexture> mGlobalMapTexture;
@@ -288,6 +296,7 @@ namespace MWGui
 
         void notifyPlayerUpdate() override;
 
+        void centerView();
     };
 }
 #endif
diff --git a/apps/openmw/mwrender/globalmap.cpp b/apps/openmw/mwrender/globalmap.cpp
index 8784eb501a..dcaf9c1612 100644
--- a/apps/openmw/mwrender/globalmap.cpp
+++ b/apps/openmw/mwrender/globalmap.cpp
@@ -270,17 +270,9 @@ namespace MWRender
 
     void GlobalMap::worldPosToImageSpace(float x, float z, float& imageX, float& imageY)
     {
-        imageX = float(x / float(Constants::CellSizeInUnits) - mMinX) / (mMaxX - mMinX + 1);
+        imageX = (float(x / float(Constants::CellSizeInUnits) - mMinX) / (mMaxX - mMinX + 1)) * getWidth();
 
-        imageY = 1.f-float(z / float(Constants::CellSizeInUnits) - mMinY) / (mMaxY - mMinY + 1);
-    }
-
-    void GlobalMap::cellTopLeftCornerToImageSpace(int x, int y, float& imageX, float& imageY)
-    {
-        imageX = float(x - mMinX) / (mMaxX - mMinX + 1);
-
-        // NB y + 1, because we want the top left corner, not bottom left where the origin of the cell is
-        imageY = 1.f-float(y - mMinY + 1) / (mMaxY - mMinY + 1);
+        imageY = (1.f-float(z / float(Constants::CellSizeInUnits) - mMinY) / (mMaxY - mMinY + 1)) * getHeight();
     }
 
     void GlobalMap::requestOverlayTextureUpdate(int x, int y, int width, int height, osg::ref_ptr<osg::Texture2D> texture, bool clear, bool cpuCopy,
diff --git a/apps/openmw/mwrender/globalmap.hpp b/apps/openmw/mwrender/globalmap.hpp
index b359c852be..fd8a8d1016 100644
--- a/apps/openmw/mwrender/globalmap.hpp
+++ b/apps/openmw/mwrender/globalmap.hpp
@@ -41,12 +41,8 @@ namespace MWRender
         int getWidth() const { return mWidth; }
         int getHeight() const { return mHeight; }
 
-        int getCellSize() const { return mCellSize; }
-
         void worldPosToImageSpace(float x, float z, float& imageX, float& imageY);
 
-        void cellTopLeftCornerToImageSpace(int x, int y, float& imageX, float& imageY);
-
         void exploreCell (int cellX, int cellY, osg::ref_ptr<osg::Texture2D> localMapTexture);
 
         /// Clears the overlay

From 3373afcc83ab3599d99c026f3ec74e3ce46c0de5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Mocquillon?= <cedric.mocquillon@gmail.com>
Date: Sat, 24 Jul 2021 17:42:04 +0200
Subject: [PATCH 1068/2859] [Settings] Set values

---
 docs/source/reference/modding/settings/map.rst | 11 +++++++++++
 files/settings-default.cfg                     |  3 +++
 2 files changed, 14 insertions(+)

diff --git a/docs/source/reference/modding/settings/map.rst b/docs/source/reference/modding/settings/map.rst
index ac989f3dea..b0e30789ac 100644
--- a/docs/source/reference/modding/settings/map.rst
+++ b/docs/source/reference/modding/settings/map.rst
@@ -103,3 +103,14 @@ and typically require more panning to see all available portions of the map.
 This larger size also enables an overall greater level of detail if the local map resolution setting is also increased.
 
 This setting can not be configured except by editing the settings configuration file.
+
+allow zooming
+-------------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	False
+
+If this setting is true the user can zoom in/out on local and global map with the mouse wheel.
+
+This setting can be controlled in Advanced tab of the launcher.
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index e7439fb5ae..c3c22c061c 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -199,6 +199,9 @@ local map widget size = 512
 # If true, map in world mode, otherwise in local mode
 global = false
 
+# If true, allow zoom on local and global maps
+allow zooming = false
+
 [GUI]
 
 # Scales GUI window and widget size. (<1.0 is smaller, >1.0 is larger).

From 9fadbd5b7aebdb299d2294091d20f2c7574f0793 Mon Sep 17 00:00:00 2001
From: CedricMocquillon <cedric.mocquillon@sage.com>
Date: Sat, 21 Nov 2020 16:37:42 +0100
Subject: [PATCH 1069/2859] [Global map] Allow zoom on global map

---
 apps/openmw/mwgui/mapwindow.cpp | 78 +++++++++++++++++++++++++++++----
 apps/openmw/mwgui/mapwindow.hpp |  6 +++
 2 files changed, 76 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index f90f5c133a..a9efe0af42 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -34,6 +34,7 @@ namespace
 {
 
     const int cellSize = Constants::CellSizeInUnits;
+    constexpr float speed = 1.08;   //the zoom speed, it should be greater than 1
 
     enum LocalMapWidgetDepth
     {
@@ -676,6 +677,7 @@ namespace MWGui
         getWidget(mEventBoxGlobal, "EventBoxGlobal");
         mEventBoxGlobal->eventMouseDrag += MyGUI::newDelegate(this, &MapWindow::onMouseDrag);
         mEventBoxGlobal->eventMouseButtonPressed += MyGUI::newDelegate(this, &MapWindow::onDragStart);
+        mEventBoxGlobal->eventMouseWheel += MyGUI::newDelegate(this, &MapWindow::onMapZoomed);
         mEventBoxGlobal->setDepth(Global_ExploreOverlayLayer);
 
         getWidget(mEventBoxLocal, "EventBoxLocal");
@@ -768,6 +770,57 @@ namespace MWGui
         mEditNoteDialog.setText("");
     }
 
+    void MapWindow::onMapZoomed(MyGUI::Widget* sender, int rel)
+    {
+        const bool zoomOut = rel < 0;
+        const bool zoomIn = !zoomOut;
+        const double speedDiff = zoomOut ? 1.0 / speed : speed;
+
+        if (mGlobal)
+        {
+            const float currentGlobalZoom = mGlobalMapZoom;
+            const float currentMinGlobalMapZoom = std::min(
+                float(mGlobalMap->getWidth()) / float(mGlobalMapRender->getWidth()),
+                float(mGlobalMap->getHeight()) / float(mGlobalMapRender->getHeight())
+            );
+
+            mGlobalMapZoom *= speedDiff;
+
+            if (zoomIn && mGlobalMapZoom > 4.f)
+            {
+                mGlobalMapZoom = currentGlobalZoom;
+                return; //the zoom in is too big
+            }
+
+            if (zoomOut && mGlobalMapZoom < currentMinGlobalMapZoom)
+            {
+                mGlobalMapZoom = currentGlobalZoom;
+                return; //the zoom out is too big, we have reach the borders of the widget
+            }
+            zoomOnCursor(speedDiff);
+        }
+    }
+
+    void MapWindow::zoomOnCursor(float speedDiff)
+    {
+        auto cursor = MyGUI::InputManager::getInstance().getMousePosition() - mGlobalMap->getAbsolutePosition();
+        auto centerView = mGlobalMap->getViewOffset() - cursor;
+        updateGlobalMap();
+        mGlobalMap->setViewOffset(MyGUI::IntPoint(
+            std::round(centerView.left * speedDiff) + cursor.left,
+            std::round(centerView.top * speedDiff) + cursor.top
+        ));
+    }
+
+    void MapWindow::updateGlobalMap()
+    {
+        resizeGlobalMap();
+        notifyPlayerUpdate();
+
+        for (auto& marker : mGlobalMapMarkers)
+            marker.second->setCoord(createMarkerCoords(marker.first.first, marker.first.second));
+    }
+
     void MapWindow::onChangeScrollWindowCoord(MyGUI::Widget* sender)
     {
         MyGUI::IntCoord currentCoordinates = sender->getCoord();
@@ -791,8 +844,7 @@ namespace MWGui
     void MapWindow::renderGlobalMap()
     {
         mGlobalMapRender->render();
-        mGlobalMap->setCanvasSize (mGlobalMapRender->getWidth(), mGlobalMapRender->getHeight());
-        mGlobalMapImage->setSize(mGlobalMapRender->getWidth(), mGlobalMapRender->getHeight());
+        resizeGlobalMap();
     }
 
     MapWindow::~MapWindow()
@@ -808,7 +860,7 @@ namespace MWGui
     MyGUI::IntCoord MapWindow::createMarkerCoords(float x, float y) const
     {
         float worldX, worldY;
-        mGlobalMapRender->worldPosToImageSpace((x + 0.5f) * Constants::CellSizeInUnits, (y + 0.5f)* Constants::CellSizeInUnits, worldX, worldY);
+        worldPosToGlobalMapImageSpace((x + 0.5f) * Constants::CellSizeInUnits, (y + 0.5f)* Constants::CellSizeInUnits, worldX, worldY);
 
         const float markerSize = getMarkerSize();
         const float halfMarkerSize = markerSize / 2.0f;
@@ -833,6 +885,7 @@ namespace MWGui
         markerWidget->setColour(MyGUI::Colour::parse(MyGUI::LanguageManager::getInstance().replaceTags("#{fontcolour=normal}")));
         markerWidget->setDepth(Global_MarkerLayer);
         markerWidget->eventMouseDrag += MyGUI::newDelegate(this, &MapWindow::onMouseDrag);
+        markerWidget->eventMouseWheel += MyGUI::newDelegate(this, &MapWindow::onMapZoomed);
         markerWidget->eventMouseButtonPressed += MyGUI::newDelegate(this, &MapWindow::onDragStart);
 
         return markerWidget;
@@ -889,7 +942,19 @@ namespace MWGui
 
     float MapWindow::getMarkerSize() const
     {
-        return 12.0f;
+        return 12.0f * mGlobalMapZoom;
+    }
+
+    void MapWindow::resizeGlobalMap()
+    {
+        mGlobalMap->setCanvasSize(mGlobalMapRender->getWidth() * mGlobalMapZoom, mGlobalMapRender->getHeight() * mGlobalMapZoom);
+        mGlobalMapImage->setSize(mGlobalMapRender->getWidth() * mGlobalMapZoom, mGlobalMapRender->getHeight() * mGlobalMapZoom);
+    }
+
+    void MapWindow::worldPosToGlobalMapImageSpace(float x, float y, float& imageX, float& imageY) const
+    {
+        mGlobalMapRender->worldPosToImageSpace(x, y, imageX, imageY);
+        imageX *= mGlobalMapZoom, imageY *= mGlobalMapZoom;
     }
 
     void MapWindow::updateCustomMarkers()
@@ -935,9 +1000,6 @@ namespace MWGui
 
         mButton->setCaptionWithReplacing( mGlobal ? "#{sLocal}" :
                 "#{sWorld}");
-
-        if (mGlobal)
-            globalMapUpdatePlayer ();
     }
 
     void MapWindow::onPinToggled()
@@ -991,7 +1053,7 @@ namespace MWGui
     void MapWindow::setGlobalMapPlayerPosition(float worldX, float worldY)
     {
         float x, y;
-        mGlobalMapRender->worldPosToImageSpace (worldX, worldY, x, y);
+        worldPosToGlobalMapImageSpace(worldX, worldY, x, y);
         mPlayerArrowGlobal->setPosition(MyGUI::IntPoint(static_cast<int>(x - 16), static_cast<int>(y - 16)));
 
         centerView();
diff --git a/apps/openmw/mwgui/mapwindow.hpp b/apps/openmw/mwgui/mapwindow.hpp
index f4559b9abf..9723c809ff 100644
--- a/apps/openmw/mwgui/mapwindow.hpp
+++ b/apps/openmw/mwgui/mapwindow.hpp
@@ -249,6 +249,9 @@ namespace MWGui
         void onMouseDrag(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id);
         void onWorldButtonClicked(MyGUI::Widget* _sender);
         void onMapDoubleClicked(MyGUI::Widget* sender);
+        void onMapZoomed(MyGUI::Widget* sender, int rel);
+        void zoomOnCursor(float speedDiff);
+        void updateGlobalMap();
         void onCustomMarkerDoubleClicked(MyGUI::Widget* sender);
         void onNoteEditOk();
         void onNoteEditDelete();
@@ -258,6 +261,8 @@ namespace MWGui
         void globalMapUpdatePlayer();
         void setGlobalMapMarkerTooltip(MyGUI::Widget* widget, int x, int y);
         float getMarkerSize() const;
+        void resizeGlobalMap();
+        void worldPosToGlobalMapImageSpace(float x, float z, float& imageX, float& imageY) const;
         MyGUI::IntCoord createMarkerCoords(float x, float y) const;
         MyGUI::Widget* createMarker(const std::string& name, float x, float y);
 
@@ -281,6 +286,7 @@ namespace MWGui
         MyGUI::Button* mEventBoxGlobal;
         MyGUI::Button* mEventBoxLocal;
 
+        float mGlobalMapZoom = 1.0f;
         MWRender::GlobalMap* mGlobalMapRender;
 
         std::map<std::pair<int, int>, MyGUI::Widget*> mGlobalMapMarkers;

From ed04ebe9ffa65bc4ffff99012f849dca68ddf54d Mon Sep 17 00:00:00 2001
From: CedricMocquillon <cedric.mocquillon@sage.com>
Date: Thu, 26 Nov 2020 16:32:50 +0100
Subject: [PATCH 1070/2859] [Local map] Allow zoom on local map

---
 apps/openmw/mwgui/mapwindow.cpp | 103 ++++++++++++++++++++++++++++----
 apps/openmw/mwgui/mapwindow.hpp |  11 +++-
 2 files changed, 100 insertions(+), 14 deletions(-)

diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index a9efe0af42..d7e3888fa8 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -252,8 +252,8 @@ namespace MWGui
         // normalized cell coordinates
         auto mapWidgetSize = getWidgetSize();
         return MyGUI::IntPoint(
-            static_cast<int>(nX * mapWidgetSize + (mCellDistance + (cellX - mCurX)) * mapWidgetSize),
-            static_cast<int>(nY * mapWidgetSize + (mCellDistance - (cellY - mCurY)) * mapWidgetSize)
+            std::round(nX * mapWidgetSize + (mCellDistance + (cellX - mCurX)) * mapWidgetSize),
+            std::round(nY * mapWidgetSize + (mCellDistance - (cellY - mCurY)) * mapWidgetSize)
         );
     }
 
@@ -313,6 +313,13 @@ namespace MWGui
         mLocalMap->setViewOffset(viewOffset);
     }
 
+    MyGUI::IntCoord LocalMapBase::getMarkerCoordinates(MyGUI::Widget* widget, size_t markerSize) const
+    {
+        MarkerUserData& markerPos(*widget->getUserData<MarkerUserData>());
+        auto position = getPosition(markerPos.cellX, markerPos.cellY, markerPos.nX, markerPos.nY);
+        return MyGUI::IntCoord(position.left - markerSize / 2, position.top - markerSize / 2, markerSize, markerSize);
+    }
+
     void LocalMapBase::updateCustomMarkers()
     {
         for (MyGUI::Widget* widget : mCustomMarkerWidgets)
@@ -379,6 +386,9 @@ namespace MWGui
             }
         }
 
+        for (MyGUI::Widget* widget : mDoorMarkerWidgets)
+            widget->setCoord(getMarkerCoordinates(widget, 8));
+
         // Delay the door markers update until scripts have been given a chance to run.
         // If we don't do this, door markers that should be disabled will still appear on the map.
         mNeedDoorMarkersUpdate = true;
@@ -400,7 +410,7 @@ namespace MWGui
 
     float LocalMapBase::getWidgetSize() const
     {
-        return mMapWidgetSize;
+        return mLocalMapZoom * mMapWidgetSize;
     }
 
     void LocalMapBase::setPlayerPos(int cellX, int cellY, const float nx, const float ny)
@@ -412,6 +422,11 @@ namespace MWGui
             notifyPlayerUpdate ();
 
             mCompass->setPosition(pos);
+        }
+        osg::Vec2f curPos((cellX + nx) * cellSize, (cellY + 1 - ny) * cellSize);
+        if ((curPos - mCurPos).length2() > 0.001)
+        {
+            mCurPos = curPos;
             centerView();
         }
     }
@@ -469,6 +484,7 @@ namespace MWGui
             markerWidget->setImageTexture(markerTexture);
             markerWidget->setImageCoord(MyGUI::IntCoord(0,0,8,8));
             markerWidget->setNeedMouseFocus(false);
+            markerWidget->setUserData(markerPos);
             mMagicMarkerWidgets.push_back(markerWidget);
         }
     }
@@ -619,12 +635,40 @@ namespace MWGui
             markerWidget->setDepth(Local_MarkerAboveFogLayer);
             markerWidget->setImageTexture("textures\\menu_map_smark.dds");
             markerWidget->setNeedMouseFocus(false);
+            markerWidget->setUserData(markerPos);
             mMagicMarkerWidgets.push_back(markerWidget);
         }
 
         redraw();
     }
 
+    void LocalMapBase::updateLocalMap()
+    {
+        auto mapWidgetSize = getWidgetSize();
+        mLocalMap->setCanvasSize(mapWidgetSize * mNumCells, mapWidgetSize * mNumCells);
+
+        const auto size = MyGUI::IntSize(std::ceil(mapWidgetSize), std::ceil(mapWidgetSize));
+        for (auto& entry : mMaps)
+        {
+            const auto position = getPosition(entry.mCellX, entry.mCellY, 0, 0);
+            entry.mMapWidget->setCoord({ position, size });
+            entry.mFogWidget->setCoord({ position, size });
+        }
+
+        MarkerUserData markerPos(mLocalMapRender);
+        for (MyGUI::Widget* widget : mDoorMarkerWidgets)
+            widget->setCoord(getMarkerCoordinates(widget, 8));
+
+        for (MyGUI::Widget* widget : mCustomMarkerWidgets)
+        {
+            const auto& marker = *widget->getUserData<ESM::CustomMarker>();
+            widget->setCoord(getMarkerCoordinates(marker.mWorldX, marker.mWorldY, markerPos, 16));
+        }
+
+        for (MyGUI::Widget* widget : mMagicMarkerWidgets)
+            widget->setCoord(getMarkerCoordinates(widget, 8));
+    }
+
     // ------------------------------------------------------------------------------------------
 
     MapWindow::MapWindow(CustomMarkerCollection &customMarkers, DragAndDrop* drag, MWRender::LocalMap* localMapRender, SceneUtil::WorkQueue* workQueue)
@@ -684,6 +728,7 @@ namespace MWGui
         mEventBoxLocal->eventMouseDrag += MyGUI::newDelegate(this, &MapWindow::onMouseDrag);
         mEventBoxLocal->eventMouseButtonPressed += MyGUI::newDelegate(this, &MapWindow::onDragStart);
         mEventBoxLocal->eventMouseButtonDoubleClick += MyGUI::newDelegate(this, &MapWindow::onMapDoubleClicked);
+        mEventBoxLocal->eventMouseWheel += MyGUI::newDelegate(this, &MapWindow::onMapZoomed);
 
         LocalMapBase::init(mLocalMap, mPlayerArrowLocal);
 
@@ -772,9 +817,17 @@ namespace MWGui
 
     void MapWindow::onMapZoomed(MyGUI::Widget* sender, int rel)
     {
+        const static int localWidgetSize = Settings::Manager::getInt("local map widget size", "Map");
+
         const bool zoomOut = rel < 0;
         const bool zoomIn = !zoomOut;
         const double speedDiff = zoomOut ? 1.0 / speed : speed;
+        const float localMapSizeInUnits = localWidgetSize * mNumCells;
+
+        const float currentMinLocalMapZoom = std::max(
+            float(mLocalMap->getWidth()) / localMapSizeInUnits,
+            float(mLocalMap->getHeight()) / localMapSizeInUnits
+        );
 
         if (mGlobal)
         {
@@ -797,16 +850,36 @@ namespace MWGui
                 mGlobalMapZoom = currentGlobalZoom;
                 return; //the zoom out is too big, we have reach the borders of the widget
             }
-            zoomOnCursor(speedDiff);
         }
+        else
+        {
+            auto const currentLocalZoom = mLocalMapZoom;
+            mLocalMapZoom *= speedDiff;
+
+            if (zoomIn && mLocalMapZoom > 4.0f)
+            {
+                mLocalMapZoom = currentLocalZoom;
+                return; //the zoom in is too big
+            }
+
+            if (zoomOut && mLocalMapZoom < currentMinLocalMapZoom)
+            {
+                mLocalMapZoom = currentLocalZoom;
+                return; //the zoom out is too big
+            }
+        }
+        zoomOnCursor(speedDiff);
     }
 
     void MapWindow::zoomOnCursor(float speedDiff)
     {
-        auto cursor = MyGUI::InputManager::getInstance().getMousePosition() - mGlobalMap->getAbsolutePosition();
-        auto centerView = mGlobalMap->getViewOffset() - cursor;
-        updateGlobalMap();
-        mGlobalMap->setViewOffset(MyGUI::IntPoint(
+        auto map = mGlobal ? mGlobalMap : mLocalMap;
+        auto cursor = MyGUI::InputManager::getInstance().getMousePosition() - map->getAbsolutePosition();
+        auto centerView = map->getViewOffset() - cursor;
+
+        mGlobal? updateGlobalMap() : updateLocalMap();
+
+        map->setViewOffset(MyGUI::IntPoint(
             std::round(centerView.left * speedDiff) + cursor.left,
             std::round(centerView.top * speedDiff) + cursor.top
         ));
@@ -815,7 +888,14 @@ namespace MWGui
     void MapWindow::updateGlobalMap()
     {
         resizeGlobalMap();
-        notifyPlayerUpdate();
+
+        float x = mCurPos.x(), y = mCurPos.y();
+        if (mInterior)
+        {
+            auto pos = MWBase::Environment::get().getWorld()->getPlayer().getLastKnownExteriorPosition();
+            x = pos.x(), y = pos.y();
+        }
+        setGlobalMapPlayerPosition(x, y);
 
         for (auto& marker : mGlobalMapMarkers)
             marker.second->setCoord(createMarkerCoords(marker.first.first, marker.first.second));
@@ -1043,6 +1123,7 @@ namespace MWGui
 
     void MapWindow::centerView()
     {
+        LocalMapBase::centerView();
         // set the view offset so that player is in the center
         MyGUI::IntSize viewsize = mGlobalMap->getSize();
         MyGUI::IntPoint pos = mPlayerArrowGlobal->getPosition() + MyGUI::IntPoint{ 16,16 };
@@ -1055,8 +1136,6 @@ namespace MWGui
         float x, y;
         worldPosToGlobalMapImageSpace(worldX, worldY, x, y);
         mPlayerArrowGlobal->setPosition(MyGUI::IntPoint(static_cast<int>(x - 16), static_cast<int>(y - 16)));
-
-        centerView();
     }
 
     void MapWindow::setGlobalMapPlayerDir(const float x, const float y)
@@ -1141,12 +1220,14 @@ namespace MWGui
         marker->eventMouseDrag += MyGUI::newDelegate(this, &MapWindow::onMouseDrag);
         marker->eventMouseButtonPressed += MyGUI::newDelegate(this, &MapWindow::onDragStart);
         marker->eventMouseButtonDoubleClick += MyGUI::newDelegate(this, &MapWindow::onCustomMarkerDoubleClicked);
+        marker->eventMouseWheel += MyGUI::newDelegate(this, &MapWindow::onMapZoomed);
     }
 
     void MapWindow::doorMarkerCreated(MyGUI::Widget *marker)
     {
         marker->eventMouseDrag += MyGUI::newDelegate(this, &MapWindow::onMouseDrag);
         marker->eventMouseButtonPressed += MyGUI::newDelegate(this, &MapWindow::onDragStart);
+        marker->eventMouseWheel += MyGUI::newDelegate(this, &MapWindow::onMapZoomed);
     }
 
     // -------------------------------------------------------------------
diff --git a/apps/openmw/mwgui/mapwindow.hpp b/apps/openmw/mwgui/mapwindow.hpp
index 9723c809ff..f8c398b75b 100644
--- a/apps/openmw/mwgui/mapwindow.hpp
+++ b/apps/openmw/mwgui/mapwindow.hpp
@@ -107,9 +107,13 @@ namespace MWGui
         };
 
     protected:
+        void updateLocalMap();
+
+        float mLocalMapZoom = 1.f;
         MWRender::LocalMap* mLocalMapRender;
 
-        int mCurX, mCurY;
+        int mCurX, mCurY;   //the position of the active cell on the global map (in cell coords)
+        osg::Vec2f mCurPos;   //the position of the player in the world (in cell coords)
         bool mInterior;
         MyGUI::ScrollView* mLocalMap;
         MyGUI::ImageBox* mCompass;
@@ -153,9 +157,10 @@ namespace MWGui
         MyGUI::IntPoint getMarkerPosition (float worldX, float worldY, MarkerUserData& markerPos) const;
         MyGUI::IntCoord getMarkerCoordinates(float worldX, float worldY, MarkerUserData& markerPos, size_t markerSize) const;
         MyGUI::Widget* createDoorMarker(const std::string& name, const MyGUI::VectorString& notes, float x, float y) const;
+        MyGUI::IntCoord getMarkerCoordinates(MyGUI::Widget* widget, size_t markerSize) const;
 
         virtual void notifyPlayerUpdate() {}
-        void centerView();
+        virtual void centerView();
         virtual void notifyMapChanged() {}
 
         virtual void customMarkerCreated(MyGUI::Widget* marker) {}
@@ -302,7 +307,7 @@ namespace MWGui
 
         void notifyPlayerUpdate() override;
 
-        void centerView();
+        void centerView() override;
     };
 }
 #endif

From 8c87defddf8dd3c31ac949db857b02793187fb25 Mon Sep 17 00:00:00 2001
From: CedricMocquillon <cedric.mocquillon@sage.com>
Date: Tue, 3 Nov 2020 08:08:50 +0100
Subject: [PATCH 1071/2859] [Local map] Use the distance view in the local map

---
 apps/openmw/mwgui/mapwindow.cpp               | 130 +++++++++++++-----
 apps/openmw/mwgui/mapwindow.hpp               |  13 +-
 apps/openmw/mwrender/localmap.cpp             |  68 ++++-----
 apps/openmw/mwrender/localmap.hpp             |   6 +-
 .../source/reference/modding/settings/map.rst |  12 ++
 files/settings-default.cfg                    |   3 +
 6 files changed, 156 insertions(+), 76 deletions(-)

diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index d7e3888fa8..9cc47e8c16 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -85,6 +85,23 @@ namespace
             setColour(mHoverColour);
         }
     };
+
+    MyGUI::IntRect createRect(const MyGUI::IntPoint& center, int radius)
+    {
+        return { center.left - radius, center.top + radius, center.left + radius, center.top - radius };
+    }
+
+    int getLocalViewingDistance()
+    {
+        if (!Settings::Manager::getBool("allow zooming", "Map"))
+            return Constants::CellGridRadius;
+        if (!Settings::Manager::getBool("distant terrain", "Terrain"))
+            return Constants::CellGridRadius;
+        const float localViewingDistanceCoef = Settings::Manager::getFloat("local viewing distance coef", "Map");
+        const int viewingDistance = Settings::Manager::getInt("viewing distance", "Camera");
+        const int localViewingDistanceInCells = (viewingDistance * localViewingDistanceCoef) / double(Constants::CellSizeInUnits);
+        return std::max(Constants::CellGridRadius, localViewingDistanceInCells);
+    }
 }
 
 namespace MWGui
@@ -174,7 +191,6 @@ namespace MWGui
         , mMarkerUpdateTimer(0.0f)
         , mLastDirectionX(0.0f)
         , mLastDirectionY(0.0f)
-        , mNeedDoorMarkersUpdate(false)
     {
         mCustomMarkers.eventMarkersChanged += MyGUI::newDelegate(this, &LocalMapBase::updateCustomMarkers);
     }
@@ -184,12 +200,12 @@ namespace MWGui
         mCustomMarkers.eventMarkersChanged -= MyGUI::newDelegate(this, &LocalMapBase::updateCustomMarkers);
     }
 
-    void LocalMapBase::init(MyGUI::ScrollView* widget, MyGUI::ImageBox* compass)
+    void LocalMapBase::init(MyGUI::ScrollView* widget, MyGUI::ImageBox* compass, int cellDistance)
     {
         mLocalMap = widget;
         mCompass = compass;
         mMapWidgetSize = std::max(1, Settings::Manager::getInt("local map widget size", "Map"));
-        mCellDistance = Constants::CellGridRadius;
+        mCellDistance = cellDistance;
         mNumCells = mCellDistance * 2 + 1;
 
         mLocalMap->setCanvasSize(mMapWidgetSize*mNumCells, mMapWidgetSize*mNumCells);
@@ -320,6 +336,11 @@ namespace MWGui
         return MyGUI::IntCoord(position.left - markerSize / 2, position.top - markerSize / 2, markerSize, markerSize);
     }
 
+    std::vector<MyGUI::Widget*>& LocalMapBase::currentDoorMarkersWidgets()
+    {
+        return mInterior ? mInteriorDoorMarkerWidgets : mExteriorDoorMarkerWidgets;
+    }
+
     void LocalMapBase::updateCustomMarkers()
     {
         for (MyGUI::Widget* widget : mCustomMarkerWidgets)
@@ -366,6 +387,38 @@ namespace MWGui
         if (x==mCurX && y==mCurY && mInterior==interior && !mChanged)
             return; // don't do anything if we're still in the same cell
 
+        if (!interior && !(x == mCurX && y == mCurY))
+        {
+            const MyGUI::IntRect intersection = {
+                std::max(x, mCurX) - mCellDistance, std::max(y, mCurY) - mCellDistance,
+                std::min(x, mCurX) + mCellDistance, std::min(y, mCurY) + mCellDistance
+            };
+
+            const MyGUI::IntRect activeGrid = createRect({ x, y }, Constants::CellGridRadius);
+            const MyGUI::IntRect currentView = createRect({ x, y }, mCellDistance);
+
+            mExteriorDoorMarkerWidgets.clear();
+            for (auto& [coord, doors] : mExteriorDoorsByCell)
+            {
+                if (!mHasALastActiveCell || !currentView.inside({ coord.first, coord.second }) || activeGrid.inside({ coord.first, coord.second }))
+                {
+                    mDoorMarkersToRecycle.insert(mDoorMarkersToRecycle.end(), doors.begin(), doors.end());
+                    doors.clear();
+                }
+                else
+                    mExteriorDoorMarkerWidgets.insert(mExteriorDoorMarkerWidgets.end(), doors.begin(), doors.end());
+            }
+
+            for (auto& widget : mDoorMarkersToRecycle)
+                widget->setVisible(false);
+
+            for (auto const& cell : mMaps)
+            {
+                if (mHasALastActiveCell && !intersection.inside({ cell.mCellX, cell.mCellY }))
+                    mLocalMapRender->removeExteriorCell(cell.mCellX, cell.mCellY);
+            }
+        }
+
         mCurX = x;
         mCurY = y;
         mInterior = interior;
@@ -386,12 +439,11 @@ namespace MWGui
             }
         }
 
-        for (MyGUI::Widget* widget : mDoorMarkerWidgets)
+        for (MyGUI::Widget* widget : currentDoorMarkersWidgets())
             widget->setCoord(getMarkerCoordinates(widget, 8));
 
-        // Delay the door markers update until scripts have been given a chance to run.
-        // If we don't do this, door markers that should be disabled will still appear on the map.
-        mNeedDoorMarkersUpdate = true;
+        if (!mInterior)
+            mHasALastActiveCell = true;
 
         updateMagicMarkers();
         updateCustomMarkers();
@@ -491,11 +543,7 @@ namespace MWGui
 
     void LocalMapBase::onFrame(float dt)
     {
-        if (mNeedDoorMarkersUpdate)
-        {
-            updateDoorMarkers();
-            mNeedDoorMarkersUpdate = false;
-        }
+        updateDoorMarkers();
 
         mMarkerUpdateTimer += dt;
 
@@ -570,30 +618,29 @@ namespace MWGui
 
     void LocalMapBase::updateDoorMarkers()
     {
-        // clear all previous door markers
-        for (MyGUI::Widget* widget : mDoorMarkerWidgets)
-            MyGUI::Gui::getInstance().destroyWidget(widget);
-        mDoorMarkerWidgets.clear();
-
+        std::vector<MWBase::World::DoorMarker> doors;
         MWBase::World* world = MWBase::Environment::get().getWorld();
 
-        // Retrieve the door markers we want to show
-        std::vector<MWBase::World::DoorMarker> doors;
+        mDoorMarkersToRecycle.insert(mDoorMarkersToRecycle.end(), mInteriorDoorMarkerWidgets.begin(), mInteriorDoorMarkerWidgets.end());
+        mInteriorDoorMarkerWidgets.clear();
+
         if (mInterior)
         {
+            for (MyGUI::Widget* widget : mExteriorDoorMarkerWidgets)
+                widget->setVisible(false);
+
             MWWorld::CellStore* cell = world->getInterior (mPrefix);
             world->getDoorMarkers(cell, doors);
         }
         else
         {
-            for (int x = mCurX - mCellDistance; x <= mCurX + mCellDistance; ++x)
+            for (MapEntry& entry : mMaps)
             {
-                for (int y = mCurY - mCellDistance; y <= mCurY + mCellDistance; ++y)
-                {
-                    MWWorld::CellStore* cell = world->getExterior (x, y);
-                    world->getDoorMarkers(cell, doors);
-                }
+                if (!entry.mMapTexture && !widgetCropped(entry.mMapWidget, mLocalMap))
+                    world->getDoorMarkers(world->getExterior(entry.mCellX, entry.mCellY), doors);
             }
+            if (doors.empty())
+                return;
         }
 
         // Create a widget for each marker
@@ -604,11 +651,33 @@ namespace MWGui
             for (CustomMarkerCollection::ContainerType::const_iterator iter = markers.first; iter != markers.second; ++iter)
                 destNotes.push_back(iter->second.mNote);
 
-            MyGUI::Widget* markerWidget = createDoorMarker(marker.name, destNotes, marker.x, marker.y);
-            doorMarkerCreated(markerWidget);
+            MyGUI::Widget* markerWidget = nullptr;
+            MarkerUserData* data;
+            if (mDoorMarkersToRecycle.empty())
+            {
+                markerWidget = createDoorMarker(marker.name, destNotes, marker.x, marker.y);
+                data = markerWidget->getUserData<MarkerUserData>();
+                doorMarkerCreated(markerWidget);
+            }
+            else
+            {
+                markerWidget = (MarkerWidget*)mDoorMarkersToRecycle.back();
+                mDoorMarkersToRecycle.pop_back();
+
+                data = markerWidget->getUserData<MarkerUserData>();
+                data->notes = destNotes;
+                data->caption = marker.name;
+                markerWidget->setCoord(getMarkerCoordinates(marker.x, marker.y, *data, 8));
+                markerWidget->setVisible(true);
+            }
 
-            mDoorMarkerWidgets.push_back(markerWidget);
+            currentDoorMarkersWidgets().push_back(markerWidget);
+            if (!mInterior)
+                mExteriorDoorsByCell[{data->cellX, data->cellY}].push_back(markerWidget);
         }
+
+        for (auto& widget : mDoorMarkersToRecycle)
+            widget->setVisible(false);
     }
 
     void LocalMapBase::updateMagicMarkers()
@@ -656,7 +725,7 @@ namespace MWGui
         }
 
         MarkerUserData markerPos(mLocalMapRender);
-        for (MyGUI::Widget* widget : mDoorMarkerWidgets)
+        for (MyGUI::Widget* widget : currentDoorMarkersWidgets())
             widget->setCoord(getMarkerCoordinates(widget, 8));
 
         for (MyGUI::Widget* widget : mCustomMarkerWidgets)
@@ -670,7 +739,6 @@ namespace MWGui
     }
 
     // ------------------------------------------------------------------------------------------
-
     MapWindow::MapWindow(CustomMarkerCollection &customMarkers, DragAndDrop* drag, MWRender::LocalMap* localMapRender, SceneUtil::WorkQueue* workQueue)
         : WindowPinnableBase("openmw_map_window.layout")
         , LocalMapBase(customMarkers, localMapRender)
@@ -730,7 +798,7 @@ namespace MWGui
         mEventBoxLocal->eventMouseButtonDoubleClick += MyGUI::newDelegate(this, &MapWindow::onMapDoubleClicked);
         mEventBoxLocal->eventMouseWheel += MyGUI::newDelegate(this, &MapWindow::onMapZoomed);
 
-        LocalMapBase::init(mLocalMap, mPlayerArrowLocal);
+        LocalMapBase::init(mLocalMap, mPlayerArrowLocal, getLocalViewingDistance());
 
         mGlobalMap->setVisible(mGlobal);
         mLocalMap->setVisible(!mGlobal);
diff --git a/apps/openmw/mwgui/mapwindow.hpp b/apps/openmw/mwgui/mapwindow.hpp
index f8c398b75b..f1d5d495fb 100644
--- a/apps/openmw/mwgui/mapwindow.hpp
+++ b/apps/openmw/mwgui/mapwindow.hpp
@@ -9,6 +9,7 @@
 #include <components/esm/cellid.hpp>
 
 #include <components/esm/custommarkerstate.hpp>
+#include <components/misc/constants.hpp>
 
 namespace MWRender
 {
@@ -72,7 +73,7 @@ namespace MWGui
     public:
         LocalMapBase(CustomMarkerCollection& markers, MWRender::LocalMap* localMapRender, bool fogOfWarEnabled = true);
         virtual ~LocalMapBase();
-        void init(MyGUI::ScrollView* widget, MyGUI::ImageBox* compass);
+        void init(MyGUI::ScrollView* widget, MyGUI::ImageBox* compass, int cellDistance = Constants::CellGridRadius);
 
         void setCellPrefix(const std::string& prefix);
         void setActiveCell(const int x, const int y, bool interior=false);
@@ -113,7 +114,9 @@ namespace MWGui
         MWRender::LocalMap* mLocalMapRender;
 
         int mCurX, mCurY;   //the position of the active cell on the global map (in cell coords)
+        bool mHasALastActiveCell = false;
         osg::Vec2f mCurPos;   //the position of the player in the world (in cell coords)
+
         bool mInterior;
         MyGUI::ScrollView* mLocalMap;
         MyGUI::ImageBox* mCompass;
@@ -145,9 +148,14 @@ namespace MWGui
         std::vector<MapEntry> mMaps;
 
         // Keep track of created marker widgets, just to easily remove them later.
-        std::vector<MyGUI::Widget*> mDoorMarkerWidgets;
+        std::vector<MyGUI::Widget*> mExteriorDoorMarkerWidgets;
+        std::map<std::pair<int, int>, std::vector<MyGUI::Widget*>> mExteriorDoorsByCell;
+        std::vector<MyGUI::Widget*> mInteriorDoorMarkerWidgets;
         std::vector<MyGUI::Widget*> mMagicMarkerWidgets;
         std::vector<MyGUI::Widget*> mCustomMarkerWidgets;
+        std::vector<MyGUI::Widget*> mDoorMarkersToRecycle;
+
+        std::vector<MyGUI::Widget*>& currentDoorMarkersWidgets();
 
         virtual void updateCustomMarkers();
 
@@ -181,7 +189,6 @@ namespace MWGui
 
     private:
         void updateDoorMarkers();
-        bool mNeedDoorMarkersUpdate;
     };
 
     class EditNoteDialog : public MWGui::WindowModal
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index 24c00048d9..858d577335 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -118,14 +118,15 @@ const osg::Vec2f LocalMap::rotatePoint(const osg::Vec2f& point, const osg::Vec2f
 
 void LocalMap::clear()
 {
-    mSegments.clear();
+    mExteriorSegments.clear();
+    mInteriorSegments.clear();
 }
 
 void LocalMap::saveFogOfWar(MWWorld::CellStore* cell)
 {
     if (!mInterior)
     {
-        const MapSegment& segment = mSegments[std::make_pair(cell->getCell()->getGridX(), cell->getCell()->getGridY())];
+        const MapSegment& segment = mExteriorSegments[std::make_pair(cell->getCell()->getGridX(), cell->getCell()->getGridY())];
 
         if (segment.mFogOfWarImage && segment.mHasFogState)
         {
@@ -155,7 +156,7 @@ void LocalMap::saveFogOfWar(MWWorld::CellStore* cell)
         {
             for (int y = 0; y < segments.second; ++y)
             {
-                const MapSegment& segment = mSegments[std::make_pair(x,y)];
+                const MapSegment& segment = mInteriorSegments[std::make_pair(x,y)];
 
                 fog->mFogTextures.emplace_back();
 
@@ -249,26 +250,10 @@ void LocalMap::setupRenderToTexture(osg::ref_ptr<osg::Camera> camera, int x, int
     mRoot->addChild(camera);
     mActiveCameras.push_back(camera);
 
-    MapSegment& segment = mSegments[std::make_pair(x, y)];
+    MapSegment& segment = mInterior? mInteriorSegments[std::make_pair(x, y)] : mExteriorSegments[std::make_pair(x, y)];
     segment.mMapTexture = texture;
 }
 
-bool needUpdate(std::set<std::pair<int, int> >& renderedGrid, std::set<std::pair<int, int> >& currentGrid, int cellX, int cellY)
-{
-    // if all the cells of the current grid are contained in the rendered grid then we can keep the old render
-    for (int dx=-1;dx<2;dx+=1)
-    {
-        for (int dy=-1;dy<2;dy+=1)
-        {
-            bool haveInRenderedGrid = renderedGrid.find(std::make_pair(cellX+dx,cellY+dy)) != renderedGrid.end();
-            bool haveInCurrentGrid = currentGrid.find(std::make_pair(cellX+dx,cellY+dy)) != currentGrid.end();
-            if (haveInCurrentGrid && !haveInRenderedGrid)
-                return true;
-        }
-    }
-    return false;
-}
-
 void LocalMap::requestMap(const MWWorld::CellStore* cell)
 {
     if (cell->isExterior())
@@ -276,13 +261,13 @@ void LocalMap::requestMap(const MWWorld::CellStore* cell)
         int cellX = cell->getCell()->getGridX();
         int cellY = cell->getCell()->getGridY();
 
-        MapSegment& segment = mSegments[std::make_pair(cellX, cellY)];
-        if (!needUpdate(segment.mGrid, mCurrentGrid, cellX, cellY))
+        MapSegment& segment = mExteriorSegments[std::make_pair(cellX, cellY)];
+        if (!segment.needUpdate)
             return;
         else
         {
-            segment.mGrid = mCurrentGrid;
             requestExteriorMap(cell);
+            segment.needUpdate = false;
         }
     }
     else
@@ -292,27 +277,27 @@ void LocalMap::requestMap(const MWWorld::CellStore* cell)
 void LocalMap::addCell(MWWorld::CellStore *cell)
 {
     if (cell->isExterior())
-        mCurrentGrid.emplace(cell->getCell()->getGridX(), cell->getCell()->getGridY());
+        mExteriorSegments[std::make_pair(cell->getCell()->getGridX(), cell->getCell()->getGridY())].needUpdate = true;
+}
+
+void LocalMap::removeExteriorCell(int x, int y)
+{
+    mExteriorSegments.erase({ x, y });
 }
 
 void LocalMap::removeCell(MWWorld::CellStore *cell)
 {
     saveFogOfWar(cell);
 
-    if (cell->isExterior())
-    {
-        std::pair<int, int> coords = std::make_pair(cell->getCell()->getGridX(), cell->getCell()->getGridY());
-        mSegments.erase(coords);
-        mCurrentGrid.erase(coords);
-    }
-    else
-        mSegments.clear();
+    if (!cell->isExterior())
+        mInteriorSegments.clear();
 }
 
 osg::ref_ptr<osg::Texture2D> LocalMap::getMapTexture(int x, int y)
 {
-    SegmentMap::iterator found = mSegments.find(std::make_pair(x, y));
-    if (found == mSegments.end())
+    auto& segments(mInterior ? mInteriorSegments : mExteriorSegments);
+    SegmentMap::iterator found = segments.find(std::make_pair(x, y));
+    if (found == segments.end())
         return osg::ref_ptr<osg::Texture2D>();
     else
         return found->second.mMapTexture;
@@ -320,8 +305,9 @@ osg::ref_ptr<osg::Texture2D> LocalMap::getMapTexture(int x, int y)
 
 osg::ref_ptr<osg::Texture2D> LocalMap::getFogOfWarTexture(int x, int y)
 {
-    SegmentMap::iterator found = mSegments.find(std::make_pair(x, y));
-    if (found == mSegments.end())
+    auto& segments(mInterior ? mInteriorSegments : mExteriorSegments);
+    SegmentMap::iterator found = segments.find(std::make_pair(x, y));
+    if (found == segments.end())
         return osg::ref_ptr<osg::Texture2D>();
     else
         return found->second.mFogOfWarTexture;
@@ -371,7 +357,7 @@ void LocalMap::requestExteriorMap(const MWWorld::CellStore* cell)
                                                                 osg::Vec3d(0,1,0), zmin, zmax);
     setupRenderToTexture(camera, cell->getCell()->getGridX(), cell->getCell()->getGridY());
 
-    MapSegment& segment = mSegments[std::make_pair(cell->getCell()->getGridX(), cell->getCell()->getGridY())];
+    MapSegment& segment = mExteriorSegments[std::make_pair(cell->getCell()->getGridX(), cell->getCell()->getGridY())];
     if (!segment.mFogOfWarImage)
     {
         if (cell->getFog())
@@ -512,7 +498,7 @@ void LocalMap::requestInteriorMap(const MWWorld::CellStore* cell)
             setupRenderToTexture(camera, x, y);
 
             auto coords = std::make_pair(x,y);
-            MapSegment& segment = mSegments[coords];
+            MapSegment& segment = mInteriorSegments[coords];
             if (!segment.mFogOfWarImage)
             {
                 bool loaded = false;
@@ -558,7 +544,8 @@ osg::Vec2f LocalMap::interiorMapToWorldPosition (float nX, float nY, int x, int
 
 bool LocalMap::isPositionExplored (float nX, float nY, int x, int y)
 {
-    const MapSegment& segment = mSegments[std::make_pair(x, y)];
+    auto& segments(mInterior ? mInteriorSegments : mExteriorSegments);
+    const MapSegment& segment = segments[std::make_pair(x, y)];
     if (!segment.mFogOfWarImage)
         return false;
 
@@ -630,7 +617,8 @@ void LocalMap::updatePlayer (const osg::Vec3f& position, const osg::Quat& orient
             int texX = x + mx;
             int texY = y + my*-1;
 
-            MapSegment& segment = mSegments[std::make_pair(texX, texY)];
+            auto& segments(mInterior ? mInteriorSegments : mExteriorSegments);
+            MapSegment& segment = segments[std::make_pair(texX, texY)];
 
             if (!segment.mFogOfWarImage || !segment.mMapTexture)
                 continue;
diff --git a/apps/openmw/mwrender/localmap.hpp b/apps/openmw/mwrender/localmap.hpp
index e586f8fb02..f9ccd5a011 100644
--- a/apps/openmw/mwrender/localmap.hpp
+++ b/apps/openmw/mwrender/localmap.hpp
@@ -50,6 +50,7 @@ namespace MWRender
         void requestMap (const MWWorld::CellStore* cell);
 
         void addCell(MWWorld::CellStore* cell);
+        void removeExteriorCell(int x, int y);
 
         void removeCell (MWWorld::CellStore* cell);
 
@@ -126,13 +127,14 @@ namespace MWRender
             osg::ref_ptr<osg::Texture2D> mFogOfWarTexture;
             osg::ref_ptr<osg::Image> mFogOfWarImage;
 
-            Grid mGrid; // the grid that was active at the time of rendering this segment
+            bool needUpdate = true;
 
             bool mHasFogState;
         };
 
         typedef std::map<std::pair<int, int>, MapSegment> SegmentMap;
-        SegmentMap mSegments;
+        SegmentMap mExteriorSegments;
+        SegmentMap mInteriorSegments;
 
         int mMapResolution;
 
diff --git a/docs/source/reference/modding/settings/map.rst b/docs/source/reference/modding/settings/map.rst
index b0e30789ac..eeef0a1f39 100644
--- a/docs/source/reference/modding/settings/map.rst
+++ b/docs/source/reference/modding/settings/map.rst
@@ -114,3 +114,15 @@ allow zooming
 If this setting is true the user can zoom in/out on local and global map with the mouse wheel.
 
 This setting can be controlled in Advanced tab of the launcher.
+
+local viewing distance coef
+---------------------------
+
+:Type:		float
+:Range:		> 0 and <= 1
+:Default:	0.5
+
+This setting controls viewing distance on local map. It is the coefficient of the viewing distance viewable on the local map if 'distant terrain' is enabled otherwise you will see the default value (a 3x3 square centered on the player).
+If view distance is changed in settings menu during the game, then viewable distance on the local map is not updated.
+
+This setting can not be configured except by editing the settings configuration file.
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index c3c22c061c..36eca7f1ab 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -202,6 +202,9 @@ global = false
 # If true, allow zoom on local and global maps
 allow zooming = false
 
+# The local view distance coefficient (1.0 is full view distance if distant terrain is enabled)
+local viewing distance coef = 0.5
+
 [GUI]
 
 # Scales GUI window and widget size. (<1.0 is smaller, >1.0 is larger).

From 18f5853279ddf8c0dfae0b58321fc703d6abb0b7 Mon Sep 17 00:00:00 2001
From: CedricMocquillon <cedric.mocquillon@sage.com>
Date: Sun, 29 Nov 2020 22:03:16 +0100
Subject: [PATCH 1072/2859] [Global <-> Local] Auto switch between local and
 global map when zoom in/out

---
 apps/openmw/mwgui/mapwindow.cpp | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index 9cc47e8c16..d4f63c0a26 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -886,16 +886,18 @@ namespace MWGui
     void MapWindow::onMapZoomed(MyGUI::Widget* sender, int rel)
     {
         const static int localWidgetSize = Settings::Manager::getInt("local map widget size", "Map");
+        const static int globalCellSize = Settings::Manager::getInt("global map cell size", "Map");
 
         const bool zoomOut = rel < 0;
         const bool zoomIn = !zoomOut;
         const double speedDiff = zoomOut ? 1.0 / speed : speed;
         const float localMapSizeInUnits = localWidgetSize * mNumCells;
 
-        const float currentMinLocalMapZoom = std::max(
+        const float currentMinLocalMapZoom = std::max({
+            (float(globalCellSize) * 4.f) / float(localWidgetSize),
             float(mLocalMap->getWidth()) / localMapSizeInUnits,
             float(mLocalMap->getHeight()) / localMapSizeInUnits
-        );
+        });
 
         if (mGlobal)
         {
@@ -910,6 +912,9 @@ namespace MWGui
             if (zoomIn && mGlobalMapZoom > 4.f)
             {
                 mGlobalMapZoom = currentGlobalZoom;
+                mLocalMapZoom = currentMinLocalMapZoom;
+                onWorldButtonClicked(nullptr);
+                updateLocalMap();
                 return; //the zoom in is too big
             }
 
@@ -933,7 +938,13 @@ namespace MWGui
             if (zoomOut && mLocalMapZoom < currentMinLocalMapZoom)
             {
                 mLocalMapZoom = currentLocalZoom;
-                return; //the zoom out is too big
+
+                float zoomRatio = 4.f/ mGlobalMapZoom;
+                mGlobalMapZoom = 4.f;
+                onWorldButtonClicked(nullptr);
+
+                zoomOnCursor(zoomRatio);
+                return; //the zoom out is too big, we switch to the global map
             }
         }
         zoomOnCursor(speedDiff);

From 9fee9dbc9cff147c48ec245cdfbd1092e611d7f2 Mon Sep 17 00:00:00 2001
From: CedricMocquillon <cedric.mocquillon@sage.com>
Date: Sun, 29 Nov 2020 22:03:54 +0100
Subject: [PATCH 1073/2859] [Global map] Regroup markers when the zoom out

---
 apps/openmw/mwgui/mapwindow.cpp | 67 +++++++++++++++++++++++----------
 apps/openmw/mwgui/mapwindow.hpp | 20 ++++++++--
 2 files changed, 64 insertions(+), 23 deletions(-)

diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index d4f63c0a26..efb434d3bc 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -30,6 +30,8 @@
 #include "confirmationdialog.hpp"
 #include "tooltips.hpp"
 
+#include <numeric>
+
 namespace
 {
 
@@ -976,8 +978,11 @@ namespace MWGui
         }
         setGlobalMapPlayerPosition(x, y);
 
-        for (auto& marker : mGlobalMapMarkers)
-            marker.second->setCoord(createMarkerCoords(marker.first.first, marker.first.second));
+        for (auto& [marker, col] : mGlobalMapMarkers)
+        {
+            marker.widget->setCoord(createMarkerCoords(marker.position.x(), marker.position.y(), col.size()));
+            marker.widget->setVisible(marker.widget->getHeight() >= 6);
+        }
     }
 
     void MapWindow::onChangeScrollWindowCoord(MyGUI::Widget* sender)
@@ -1016,12 +1021,12 @@ namespace MWGui
         setTitle("#{sCell=" + cellName + "}");
     }
 
-    MyGUI::IntCoord MapWindow::createMarkerCoords(float x, float y) const
+    MyGUI::IntCoord MapWindow::createMarkerCoords(float x, float y, float agregatedWeight) const
     {
         float worldX, worldY;
         worldPosToGlobalMapImageSpace((x + 0.5f) * Constants::CellSizeInUnits, (y + 0.5f)* Constants::CellSizeInUnits, worldX, worldY);
 
-        const float markerSize = getMarkerSize();
+        const float markerSize = getMarkerSize(agregatedWeight);
         const float halfMarkerSize = markerSize / 2.0f;
         return MyGUI::IntCoord(
             static_cast<int>(worldX - halfMarkerSize),
@@ -1029,13 +1034,12 @@ namespace MWGui
             markerSize, markerSize);
     }
 
-    MyGUI::Widget* MapWindow::createMarker(const std::string& name, float x, float y)
+    MyGUI::Widget* MapWindow::createMarker(const std::string& name, float x, float y, float agregatedWeight)
     {
         MyGUI::Widget* markerWidget = mGlobalMap->createWidget<MyGUI::Widget>("MarkerButton",
-            createMarkerCoords(x, y), MyGUI::Align::Default);
-
+            createMarkerCoords(x, y, agregatedWeight), MyGUI::Align::Default);
+        markerWidget->setVisible(markerWidget->getHeight() >= 6.0);
         markerWidget->setUserString("Caption_TextOneLine", "#{sCell=" + name + "}");
-
         setGlobalMapMarkerTooltip(markerWidget, x, y);
 
         markerWidget->setUserString("ToolTipLayout", "TextToolTipOneLine");
@@ -1057,7 +1061,33 @@ namespace MWGui
         cell.second = y;
         if (mMarkers.insert(cell).second)
         {
-            mGlobalMapMarkers[std::make_pair(x, y)] = createMarker(name, x, y);
+            MapMarkerType mapMarkerWidget = { osg::Vec2f(x, y), createMarker(name, x, y, 0) };
+            mGlobalMapMarkers.emplace(mapMarkerWidget, std::vector<MapMarkerType>());
+
+            std::string name_ = name.substr(0, name.find(','));
+            auto& entry = mGlobalMapMarkersByName[name_];
+            if (!entry.widget)
+            {
+                entry = { osg::Vec2f(x, y), entry.widget };   //update the coords
+
+                entry.widget = createMarker(name_, entry.position.x(), entry.position.y(), 1);
+                mGlobalMapMarkers.emplace(entry, std::vector<MapMarkerType>{ entry });
+            }
+            else
+            {
+                auto it = mGlobalMapMarkers.find(entry);
+                auto& marker = const_cast<MapMarkerType&>(it->first);
+                auto& elements = it->second;
+                elements.emplace_back(mapMarkerWidget);
+
+                //we compute the barycenter of the entry elements => it will be the place on the world map for the agregated widget
+                marker.position = std::accumulate(elements.begin(), elements.end(), osg::Vec2f(0.f, 0.f), [](const auto& left, const auto& right) {
+                    return left + right.position;
+                }) / float(elements.size());
+
+                marker.widget->setCoord(createMarkerCoords(marker.position.x(), marker.position.y(), elements.size()));
+                marker.widget->setVisible(marker.widget->getHeight() >= 6);
+            }
         }
     }
 
@@ -1099,9 +1129,12 @@ namespace MWGui
         }
     }
 
-    float MapWindow::getMarkerSize() const
+    float MapWindow::getMarkerSize(size_t agregatedWeight) const
     {
-        return 12.0f * mGlobalMapZoom;
+        float markerSize = 12.f * mGlobalMapZoom;
+        if (mGlobalMapZoom < 1)
+            return markerSize * std::sqrt(agregatedWeight);  //we want to see agregated object
+        return agregatedWeight ? 0 : markerSize; //we want to see only original markers (i.e. non agregated)
     }
 
     void MapWindow::resizeGlobalMap()
@@ -1120,13 +1153,8 @@ namespace MWGui
     {
         LocalMapBase::updateCustomMarkers();
 
-        for (auto& widgetPair : mGlobalMapMarkers)
-        {
-            int x = widgetPair.first.first;
-            int y = widgetPair.first.second;
-            MyGUI::Widget* markerWidget = widgetPair.second;
-            setGlobalMapMarkerTooltip(markerWidget, x, y);
-        }
+        for (auto& [widgetPair, ignore]: mGlobalMapMarkers)
+            setGlobalMapMarkerTooltip(widgetPair.widget, widgetPair.position.x(), widgetPair.position.y());
     }
 
     void MapWindow::onDragStart(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id)
@@ -1251,8 +1279,9 @@ namespace MWGui
         mChanged = true;
 
         for (auto& widgetPair : mGlobalMapMarkers)
-            MyGUI::Gui::getInstance().destroyWidget(widgetPair.second);
+            MyGUI::Gui::getInstance().destroyWidget(widgetPair.first.widget);
         mGlobalMapMarkers.clear();
+        mGlobalMapMarkersByName.clear();
     }
 
     void MapWindow::write(ESM::ESMWriter &writer, Loading::Listener& progress)
diff --git a/apps/openmw/mwgui/mapwindow.hpp b/apps/openmw/mwgui/mapwindow.hpp
index f1d5d495fb..cb0d368b30 100644
--- a/apps/openmw/mwgui/mapwindow.hpp
+++ b/apps/openmw/mwgui/mapwindow.hpp
@@ -272,11 +272,12 @@ namespace MWGui
         void onChangeScrollWindowCoord(MyGUI::Widget* sender);
         void globalMapUpdatePlayer();
         void setGlobalMapMarkerTooltip(MyGUI::Widget* widget, int x, int y);
-        float getMarkerSize() const;
+        float getMarkerSize(size_t agregatedWeight) const;
         void resizeGlobalMap();
         void worldPosToGlobalMapImageSpace(float x, float z, float& imageX, float& imageY) const;
-        MyGUI::IntCoord createMarkerCoords(float x, float y) const;
-        MyGUI::Widget* createMarker(const std::string& name, float x, float y);
+        MyGUI::IntCoord createMarkerCoords(float x, float y, float agregatedWeight) const;
+        MyGUI::Widget* createMarker(const std::string& name, float x, float y, float agregatedWeight);
+
 
         MyGUI::ScrollView* mGlobalMap;
         std::unique_ptr<MyGUI::ITexture> mGlobalMapTexture;
@@ -301,7 +302,18 @@ namespace MWGui
         float mGlobalMapZoom = 1.0f;
         MWRender::GlobalMap* mGlobalMapRender;
 
-        std::map<std::pair<int, int>, MyGUI::Widget*> mGlobalMapMarkers;
+        struct MapMarkerType
+        {
+            osg::Vec2f position;
+            MyGUI::Widget* widget = nullptr;
+
+            bool operator<(const MapMarkerType& right) const {
+                return widget < right.widget;
+            }
+        };
+
+        std::map<std::string, MapMarkerType> mGlobalMapMarkersByName;
+        std::map<MapMarkerType, std::vector<MapMarkerType>> mGlobalMapMarkers;
 
         EditNoteDialog mEditNoteDialog;
         ESM::CustomMarker mEditingMarker;

From a6f9e7274fdb3173bb6a45bc3e7722490ee67276 Mon Sep 17 00:00:00 2001
From: CedricMocquillon <cedric.mocquillon@sage.com>
Date: Mon, 19 Oct 2020 22:48:37 +0200
Subject: [PATCH 1074/2859] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fccbba4ac9..526c6d9681 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@
     Bug #6174: Spellmaking and Enchanting sliders differences from vanilla
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
     Feature #2780: A way to see current OpenMW version in the console
+    Feature #3616: Allow Zoom levels on the World Map
     Feature #5489: MCP: Telekinesis fix for activators
     Feature #5996: Support Lua scripts in OpenMW
     Feature #6017: Separate persistent and temporary cell references when saving

From 1051745f29c161acb517b4bce734a17e1003e711 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Mocquillon?= <cedric.mocquillon@gmail.com>
Date: Sat, 24 Jul 2021 19:17:49 +0200
Subject: [PATCH 1075/2859] [Launcher] Add new setting 'allow zooming' to
 advanced tab in the launcher

---
 apps/launcher/advancedpage.cpp |  2 ++
 files/ui/advancedpage.ui       | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index 00021268e3..2c33992ac3 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -192,6 +192,7 @@ bool Launcher::AdvancedPage::loadSettings()
         if (showOwnedIndex >= 0 && showOwnedIndex <= 3)
             showOwnedComboBox->setCurrentIndex(showOwnedIndex);
         loadSettingBool(stretchBackgroundCheckBox, "stretch menu background", "GUI");
+        loadSettingBool(useZoomOnMapCheckBox, "allow zooming", "Map");
         loadSettingBool(graphicHerbalismCheckBox, "graphic herbalism", "Game");
         scalingSpinBox->setValue(Settings::Manager::getFloat("scaling factor", "GUI"));
     }
@@ -352,6 +353,7 @@ void Launcher::AdvancedPage::saveSettings()
         if (showOwnedCurrentIndex != Settings::Manager::getInt("show owned", "Game"))
             Settings::Manager::setInt("show owned", "Game", showOwnedCurrentIndex);
         saveSettingBool(stretchBackgroundCheckBox, "stretch menu background", "GUI");
+        saveSettingBool(useZoomOnMapCheckBox, "allow zooming", "Map");
         saveSettingBool(graphicHerbalismCheckBox, "graphic herbalism", "Game");
         float uiScalingFactor = scalingSpinBox->value();
         if (uiScalingFactor != Settings::Manager::getFloat("scaling factor", "GUI"))
diff --git a/files/ui/advancedpage.ui b/files/ui/advancedpage.ui
index f72150df22..7964399319 100644
--- a/files/ui/advancedpage.ui
+++ b/files/ui/advancedpage.ui
@@ -1006,6 +1006,16 @@ True: In non-combat mode camera is positioned behind the character's shoulder. C
          </property>
         </widget>
        </item>
+       <item>
+        <widget class="QCheckBox" name="useZoomOnMapCheckBox">
+         <property name="toolTip">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable zooming on local and global maps.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="text">
+          <string>Can zoom on maps</string>
+         </property>
+        </widget>
+       </item>
        <item>
         <widget class="QCheckBox" name="graphicHerbalismCheckBox">
          <property name="toolTip">

From ce8c30bf07ecaf8a2513c7cd709a8ba238acd788 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Thu, 22 Jul 2021 22:22:12 +0200
Subject: [PATCH 1076/2859] Minor code simplification in npcanimation.cpp

---
 apps/openmw/mwrender/npcanimation.cpp | 59 +++++++++++++--------------
 1 file changed, 29 insertions(+), 30 deletions(-)

diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index b538f0b7b6..d338d70873 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -286,37 +286,36 @@ NpcAnimation::NpcType NpcAnimation::getNpcType(const MWWorld::Ptr& ptr)
     return curType;
 }
 
-static NpcAnimation::PartBoneMap createPartListMap()
+static const inline NpcAnimation::PartBoneMap createPartListMap()
 {
-    NpcAnimation::PartBoneMap result;
-    result.insert(std::make_pair(ESM::PRT_Head, "Head"));
-    result.insert(std::make_pair(ESM::PRT_Hair, "Head")); // note it uses "Head" as attach bone, but "Hair" as filter
-    result.insert(std::make_pair(ESM::PRT_Neck, "Neck"));
-    result.insert(std::make_pair(ESM::PRT_Cuirass, "Chest"));
-    result.insert(std::make_pair(ESM::PRT_Groin, "Groin"));
-    result.insert(std::make_pair(ESM::PRT_Skirt, "Groin"));
-    result.insert(std::make_pair(ESM::PRT_RHand, "Right Hand"));
-    result.insert(std::make_pair(ESM::PRT_LHand, "Left Hand"));
-    result.insert(std::make_pair(ESM::PRT_RWrist, "Right Wrist"));
-    result.insert(std::make_pair(ESM::PRT_LWrist, "Left Wrist"));
-    result.insert(std::make_pair(ESM::PRT_Shield, "Shield Bone"));
-    result.insert(std::make_pair(ESM::PRT_RForearm, "Right Forearm"));
-    result.insert(std::make_pair(ESM::PRT_LForearm, "Left Forearm"));
-    result.insert(std::make_pair(ESM::PRT_RUpperarm, "Right Upper Arm"));
-    result.insert(std::make_pair(ESM::PRT_LUpperarm, "Left Upper Arm"));
-    result.insert(std::make_pair(ESM::PRT_RFoot, "Right Foot"));
-    result.insert(std::make_pair(ESM::PRT_LFoot, "Left Foot"));
-    result.insert(std::make_pair(ESM::PRT_RAnkle, "Right Ankle"));
-    result.insert(std::make_pair(ESM::PRT_LAnkle, "Left Ankle"));
-    result.insert(std::make_pair(ESM::PRT_RKnee, "Right Knee"));
-    result.insert(std::make_pair(ESM::PRT_LKnee, "Left Knee"));
-    result.insert(std::make_pair(ESM::PRT_RLeg, "Right Upper Leg"));
-    result.insert(std::make_pair(ESM::PRT_LLeg, "Left Upper Leg"));
-    result.insert(std::make_pair(ESM::PRT_RPauldron, "Right Clavicle"));
-    result.insert(std::make_pair(ESM::PRT_LPauldron, "Left Clavicle"));
-    result.insert(std::make_pair(ESM::PRT_Weapon, "Weapon Bone")); // Fallback. The real node name depends on the current weapon type.
-    result.insert(std::make_pair(ESM::PRT_Tail, "Tail"));
-    return result;
+    return {
+        {ESM::PRT_Head, "Head"},
+        {ESM::PRT_Hair, "Head"}, // note it uses "Head" as attach bone, but "Hair" as filter
+        {ESM::PRT_Neck, "Neck"},
+        {ESM::PRT_Cuirass, "Chest"},
+        {ESM::PRT_Groin, "Groin"},
+        {ESM::PRT_Skirt, "Groin"},
+        {ESM::PRT_RHand, "Right Hand"},
+        {ESM::PRT_LHand, "Left Hand"},
+        {ESM::PRT_RWrist, "Right Wrist"},
+        {ESM::PRT_LWrist, "Left Wrist"},
+        {ESM::PRT_Shield, "Shield Bone"},
+        {ESM::PRT_RForearm, "Right Forearm"},
+        {ESM::PRT_LForearm, "Left Forearm"},
+        {ESM::PRT_RUpperarm, "Right Upper Arm"},
+        {ESM::PRT_LUpperarm, "Left Upper Arm"},
+        {ESM::PRT_RFoot, "Right Foot"},
+        {ESM::PRT_LFoot, "Left Foot"},
+        {ESM::PRT_RAnkle, "Right Ankle"},
+        {ESM::PRT_LAnkle, "Left Ankle"},
+        {ESM::PRT_RKnee, "Right Knee"},
+        {ESM::PRT_LKnee, "Left Knee"},
+        {ESM::PRT_RLeg, "Right Upper Leg"},
+        {ESM::PRT_LLeg, "Left Upper Leg"},
+        {ESM::PRT_RPauldron, "Right Clavicle"},
+        {ESM::PRT_LPauldron, "Left Clavicle"},
+        {ESM::PRT_Weapon, "Weapon Bone"}, // Fallback. The real node name depends on the current weapon type.
+        {ESM::PRT_Tail, "Tail"}};
 }
 const NpcAnimation::PartBoneMap NpcAnimation::sPartList = createPartListMap();
 

From 7145ef4ce06117bbaebd8e1b138dd2cd4f8b6382 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sun, 25 Jul 2021 18:00:48 +0200
Subject: [PATCH 1077/2859] Update AABB also in sync cases

---
 apps/openmw/mwphysics/mtphysics.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index efeeb2cffc..10bec49612 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -390,7 +390,7 @@ namespace MWPhysics
 
     void PhysicsTaskScheduler::updateSingleAabb(std::weak_ptr<PtrHolder> ptr, bool immediate)
     {
-        if (immediate)
+        if (immediate || mNumThreads == 0)
         {
             updatePtrAabb(ptr);
         }

From 8056476d642bf443288ff8ffae94bc65501077a0 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Fri, 21 May 2021 17:07:55 +0200
Subject: [PATCH 1078/2859] Add clang-tidy

---
 .gitlab-ci.yml            | 18 ++++++++++++++++++
 CI/before_script.linux.sh |  7 +++++++
 CI/install_debian_deps.sh |  1 +
 extern/CMakeLists.txt     |  2 ++
 4 files changed, 28 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6daa6ab758..baeebcf3ca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,6 +31,23 @@ stages:
     paths:
       - build/install/
 
+Clang_Tidy:
+  extends: .Debian_Image
+  stage: build
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
+  before_script:
+    - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic clang-tidy clang
+  script:
+    - CI/before_script.linux.sh
+    - cd build
+    - cmake --build . -- -j $(nproc)
+  variables:
+    CC: clang
+    CXX: clang++
+    CI_CLANG_TIDY: 1
+  timeout: 8h
+
 Coverity:
   extends: .Debian_Image
   stage: build
@@ -430,3 +447,4 @@ Debian_AndroidNDK_arm64-v8a:
       - 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
+
diff --git a/CI/before_script.linux.sh b/CI/before_script.linux.sh
index 4344b5212f..2687946f41 100755
--- a/CI/before_script.linux.sh
+++ b/CI/before_script.linux.sh
@@ -34,6 +34,13 @@ if [[ $CI_OPENMW_USE_STATIC_DEPS ]]; then
     )
 fi
 
+if [[ $CI_CLANG_TIDY ]]; then
+	CMAKE_CONF_OPTS+=(
+	      -DCMAKE_CXX_CLANG_TIDY='clang-tidy;-checks=-*,boost-*,clang-analyzer-*,concurrency-*,performance-*,-header-filter=.*,bugprone-*,misc-definitions-in-headers,misc-misplaced-const,misc-redundant-expression'
+	)
+fi
+
+
 if [[ "${CMAKE_BUILD_TYPE}" ]]; then
     CMAKE_CONF_OPTS+=(
         -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
diff --git a/CI/install_debian_deps.sh b/CI/install_debian_deps.sh
index 6a7f4a84a7..4b47c937da 100755
--- a/CI/install_debian_deps.sh
+++ b/CI/install_debian_deps.sh
@@ -29,6 +29,7 @@ declare -rA GROUPED_DEPS=(
   # These dependencies can alternatively be built and linked statically.
   [openmw-deps-dynamic]="libmygui-dev libopenscenegraph-dev"
   [coverity]="curl"
+  [clang-tidy]="clang-tidy"
 
   # Pre-requisites for building MyGUI and OSG for static linking.
   #
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 5dc9642d7c..6ed0bffa6b 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+set(CMAKE_CXX_CLANG_TIDY "")
+
 # Like `FetchContent_MakeAvailable` but passes EXCLUDE_FROM_ALL to `add_subdirectory`.
 macro(FetchContent_MakeAvailableExcludeFromAll)
     foreach(contentName IN ITEMS ${ARGV})

From 100cba6260a5c0c61fa22c7fb4162f38e1b8ab34 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 29 Jun 2021 20:12:22 +0200
Subject: [PATCH 1079/2859] Use navigator field in Scene

---
 apps/openmw/mwworld/scene.cpp | 37 +++++++++++++++--------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 10c0ebe84c..f7c9b43fb6 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -370,7 +370,6 @@ namespace MWWorld
         if (!test)
             Log(Debug::Info) << "Deactivate cell " << cell->getCell()->getDescription();
 
-        const auto navigator = MWBase::Environment::get().getWorld()->getNavigator();
         ListAndResetObjectsVisitor visitor;
 
         cell->forEach(visitor);
@@ -379,13 +378,13 @@ namespace MWWorld
         {
             if (const auto object = mPhysics->getObject(ptr))
             {
-                navigator->removeObject(DetourNavigator::ObjectId(object));
+                mNavigator.removeObject(DetourNavigator::ObjectId(object));
                 if (object->isAnimated())
                     mPhysics->remove(ptr);
             }
             else if (mPhysics->getActor(ptr))
             {
-                navigator->removeAgent(world->getPathfindingHalfExtents(ptr));
+                mNavigator.removeAgent(world->getPathfindingHalfExtents(ptr));
                 mRendering.removeActorPath(ptr);
                 mPhysics->remove(ptr);
             }
@@ -398,17 +397,17 @@ namespace MWWorld
         if (cell->getCell()->isExterior())
         {
             if (const auto heightField = mPhysics->getHeightField(cellX, cellY))
-                navigator->removeObject(DetourNavigator::ObjectId(heightField));
+                mNavigator.removeObject(DetourNavigator::ObjectId(heightField));
         }
 
         if (cell->getCell()->hasWater())
-            navigator->removeWater(osg::Vec2i(cellX, cellY));
+            mNavigator.removeWater(osg::Vec2i(cellX, cellY));
 
         if (const auto pathgrid = world->getStore().get<ESM::Pathgrid>().search(*cell->getCell()))
-            navigator->removePathgrid(*pathgrid);
+            mNavigator.removePathgrid(*pathgrid);
 
         const auto player = world->getPlayerPtr();
-        navigator->update(player.getRefData().getPosition().asVec3());
+        mNavigator.update(player.getRefData().getPosition().asVec3());
 
         MWBase::Environment::get().getMechanicsManager()->drop (cell);
 
@@ -433,7 +432,6 @@ namespace MWWorld
             Log(Debug::Info) << "Loading cell " << cell->getCell()->getDescription();
 
         const auto world = MWBase::Environment::get().getWorld();
-        const auto navigator = world->getNavigator();
 
         const int cellX = cell->getCell()->getGridX();
         const int cellY = cell->getCell()->getGridY();
@@ -441,12 +439,12 @@ namespace MWWorld
         if (!test && cell->getCell()->isExterior())
         {
             if (const auto heightField = mPhysics->getHeightField(cellX, cellY))
-                navigator->addObject(DetourNavigator::ObjectId(heightField), *heightField->getShape(),
+                mNavigator.addObject(DetourNavigator::ObjectId(heightField), *heightField->getShape(),
                         heightField->getCollisionObject()->getWorldTransform());
         }
 
         if (const auto pathgrid = world->getStore().get<ESM::Pathgrid>().search(*cell->getCell()))
-            navigator->addPathgrid(*cell->getCell(), *pathgrid);
+            mNavigator.addPathgrid(*cell->getCell(), *pathgrid);
 
         // register local scripts
         // do this before insertCell, to make sure we don't add scripts from levelled creature spawning twice
@@ -472,12 +470,12 @@ namespace MWWorld
                 if (cell->getCell()->isExterior())
                 {
                     if (const auto heightField = mPhysics->getHeightField(cellX, cellY))
-                        navigator->addWater(osg::Vec2i(cellX, cellY), ESM::Land::REAL_SIZE,
+                        mNavigator.addWater(osg::Vec2i(cellX, cellY), ESM::Land::REAL_SIZE,
                                 cell->getWaterLevel(), heightField->getCollisionObject()->getWorldTransform());
                 }
                 else
                 {
-                    navigator->addWater(osg::Vec2i(cellX, cellY), std::numeric_limits<int>::max(),
+                    mNavigator.addWater(osg::Vec2i(cellX, cellY), std::numeric_limits<int>::max(),
                             cell->getWaterLevel(), btTransform::getIdentity());
                 }
             }
@@ -486,7 +484,7 @@ namespace MWWorld
 
             const auto player = MWBase::Environment::get().getWorld()->getPlayerPtr();
 
-            navigator->update(player.getRefData().getPosition().asVec3());
+            mNavigator.update(player.getRefData().getPosition().asVec3());
 
             if (!cell->isExterior() && !(cell->getCell()->mData.mFlags & ESM::Cell::QuasiEx))
                 mRendering.configureAmbient(cell->getCell());
@@ -569,9 +567,8 @@ namespace MWWorld
 
     void Scene::playerMoved(const osg::Vec3f &pos)
     {
-        const auto navigator = MWBase::Environment::get().getWorld()->getNavigator();
         const auto player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-        navigator->updatePlayerPosition(player.getRefData().getPosition().asVec3());
+        mNavigator.updatePlayerPosition(player.getRefData().getPosition().asVec3());
 
         if (!mCurrentCell || !mCurrentCell->isExterior())
             return;
@@ -996,9 +993,8 @@ namespace MWWorld
             addObject(ptr, *mPhysics, mRendering, mPagedRefs, false);
             addObject(ptr, *mPhysics, mNavigator);
             MWBase::Environment::get().getWorld()->scaleObject(ptr, ptr.getCellRef().getScale());
-            const auto navigator = MWBase::Environment::get().getWorld()->getNavigator();
             const auto player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-            navigator->update(player.getRefData().getPosition().asVec3());
+            mNavigator.update(player.getRefData().getPosition().asVec3());
         }
         catch (std::exception& e)
         {
@@ -1011,16 +1007,15 @@ namespace MWWorld
         MWBase::Environment::get().getMechanicsManager()->remove (ptr);
         MWBase::Environment::get().getSoundManager()->stopSound3D (ptr);
         MWBase::Environment::get().getLuaManager()->objectRemovedFromScene(ptr);
-        const auto navigator = MWBase::Environment::get().getWorld()->getNavigator();
         if (const auto object = mPhysics->getObject(ptr))
         {
-            navigator->removeObject(DetourNavigator::ObjectId(object));
+            mNavigator.removeObject(DetourNavigator::ObjectId(object));
             const auto player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-            navigator->update(player.getRefData().getPosition().asVec3());
+            mNavigator.update(player.getRefData().getPosition().asVec3());
         }
         else if (mPhysics->getActor(ptr))
         {
-            navigator->removeAgent(MWBase::Environment::get().getWorld()->getPathfindingHalfExtents(ptr));
+            mNavigator.removeAgent(MWBase::Environment::get().getWorld()->getPathfindingHalfExtents(ptr));
         }
         mPhysics->remove(ptr);
         mRendering.removeObject (ptr);

From 07c70dfb738c970717b096cf3e323cdc1ed75595 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 3 Jul 2021 04:08:22 +0200
Subject: [PATCH 1080/2859] Remove unused local variables

---
 components/detournavigator/makenavmesh.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index 507ca078e9..42676f4294 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -160,8 +160,6 @@ namespace
     bool rasterizeSolidObjectsTriangles(rcContext& context, const RecastMesh& recastMesh, const rcConfig& config,
         rcHeightfield& solid)
     {
-        const osg::Vec2f tileBoundsMin(config.bmin[0], config.bmin[2]);
-        const osg::Vec2f tileBoundsMax(config.bmax[0], config.bmax[2]);
         std::vector<unsigned char> areas(recastMesh.getAreaTypes().begin(), recastMesh.getAreaTypes().end());
 
         rcClearUnwalkableTriangles(
@@ -485,7 +483,6 @@ namespace DetourNavigator
             " changedTileDistance=" << getDistance(changedTile, playerTile);
 
         const auto params = *navMeshCacheItem->lockConst()->getImpl().getParams();
-        const osg::Vec3f origin(params.orig[0], params.orig[1], params.orig[2]);
 
         if (!recastMesh)
         {

From af7059373c3169e623aabb0e9615a9af214833e6 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 11 Jul 2021 21:43:19 +0200
Subject: [PATCH 1081/2859] Make RecastMesh independent from the order of
 RecastMeshBuilder calls

To make sure RecastMesh objects are equal if built with the same data but in
different order. Will be used later when there will be more than one place
building RecasMesh objects.
---
 .../detournavigator/navmeshtilescache.cpp     |  23 +-
 .../detournavigator/navmeshtilescache.cpp     |  44 ++--
 .../detournavigator/recastmeshbuilder.cpp     | 234 +++++++++---------
 components/detournavigator/debug.cpp          |   4 +-
 components/detournavigator/makenavmesh.cpp    |  18 +-
 .../detournavigator/navmeshtilescache.cpp     |   2 +-
 .../detournavigator/navmeshtilescache.hpp     |  16 +-
 components/detournavigator/recastmesh.cpp     |  31 ++-
 components/detournavigator/recastmesh.hpp     |  83 +++----
 .../detournavigator/recastmeshbuilder.cpp     | 126 +++++-----
 .../detournavigator/recastmeshbuilder.hpp     |  29 ++-
 .../detournavigator/recastmeshmanager.cpp     |  21 +-
 .../detournavigator/recastmeshmanager.hpp     |   7 +-
 components/sceneutil/recastmesh.cpp           |   7 +-
 14 files changed, 332 insertions(+), 313 deletions(-)

diff --git a/apps/benchmarks/detournavigator/navmeshtilescache.cpp b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
index 487562f404..030162ab59 100644
--- a/apps/benchmarks/detournavigator/navmeshtilescache.cpp
+++ b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
@@ -87,6 +87,19 @@ namespace
         });
     }
 
+    template <class Random>
+    Mesh generateMesh(std::size_t triangles, Random& random)
+    {
+        std::uniform_real_distribution<float> distribution(0.0, 1.0);
+        std::vector<float> vertices;
+        std::vector<int> indices;
+        std::vector<AreaType> areaTypes;
+        generateVertices(std::back_inserter(vertices), triangles * 1.98, random);
+        generateIndices(std::back_inserter(indices), static_cast<int>(vertices.size() / 3) - 1, vertices.size() * 1.53, random);
+        generateAreaTypes(std::back_inserter(areaTypes), indices.size() / 3, random);
+        return Mesh(std::move(indices), std::move(vertices), std::move(areaTypes));
+    }
+
     template <class Random>
     Key generateKey(std::size_t triangles, Random& random)
     {
@@ -94,16 +107,10 @@ namespace
         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);
+        Mesh mesh = generateMesh(triangles, 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));
+        RecastMesh recastMesh(generation, revision, std::move(mesh), std::move(water));
         return Key {agentHalfExtents, tilePosition, std::move(recastMesh)};
     }
 
diff --git a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
index 17c1b955cf..fa607db371 100644
--- a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
+++ b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
@@ -128,17 +128,23 @@ namespace
         return result;
     }
 
+    Mesh makeMesh()
+    {
+        std::vector<int> indices {{0, 1, 2}};
+        std::vector<float> vertices {{0, 0, 0, 1, 0, 0, 1, 1, 0}};
+        std::vector<AreaType> areaTypes {1, AreaType_ground};
+        return Mesh(std::move(indices), std::move(vertices), std::move(areaTypes));
+    }
+
     struct DetourNavigatorNavMeshTilesCacheTest : Test
     {
         const osg::Vec3f mAgentHalfExtents {1, 2, 3};
         const TilePosition mTilePosition {0, 0};
         const std::size_t mGeneration = 0;
         const std::size_t mRevision = 0;
-        const std::vector<int> mIndices {{0, 1, 2}};
-        const std::vector<float> mVertices {{0, 0, 0, 1, 0, 0, 1, 1, 0}};
-        const std::vector<AreaType> mAreaTypes {1, AreaType_ground};
+        const Mesh mMesh {makeMesh()};
         const std::vector<RecastMesh::Water> mWater {};
-        const RecastMesh mRecastMesh {mGeneration, mRevision, mIndices, mVertices, mAreaTypes, mWater};
+        const RecastMesh mRecastMesh {mGeneration, mRevision, mMesh, mWater};
         std::unique_ptr<PreparedNavMeshData> mPreparedNavMeshData {makePeparedNavMeshData(3)};
 
         const std::size_t mRecastMeshSize = sizeof(mRecastMesh) + getSize(mRecastMesh);
@@ -226,7 +232,7 @@ namespace
         const std::size_t maxSize = 1;
         NavMeshTilesCache cache(maxSize);
         const std::vector<RecastMesh::Water> water {1, RecastMesh::Water {1, btTransform::getIdentity()}};
-        const RecastMesh unexistentRecastMesh {mGeneration, mRevision, mIndices, mVertices, mAreaTypes, water};
+        const RecastMesh unexistentRecastMesh {mGeneration, mRevision, mMesh, water};
 
         cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
         EXPECT_FALSE(cache.get(mAgentHalfExtents, mTilePosition, unexistentRecastMesh));
@@ -238,7 +244,7 @@ namespace
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<RecastMesh::Water> water {1, RecastMesh::Water {1, btTransform::getIdentity()}};
-        const RecastMesh anotherRecastMesh {mGeneration, mRevision, mIndices, mVertices, mAreaTypes, water};
+        const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, water};
         auto anotherPreparedNavMeshData = makePeparedNavMeshData(3);
         const auto copy = clone(*anotherPreparedNavMeshData);
 
@@ -256,7 +262,7 @@ namespace
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<RecastMesh::Water> water {1, RecastMesh::Water {1, btTransform::getIdentity()}};
-        const RecastMesh anotherRecastMesh {mGeneration, mRevision, mIndices, mVertices, mAreaTypes, water};
+        const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, water};
         auto anotherPreparedNavMeshData = makePeparedNavMeshData(3);
 
         const auto value = cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh,
@@ -272,13 +278,11 @@ namespace
         const auto copy = clone(*mPreparedNavMeshData);
 
         const std::vector<RecastMesh::Water> leastRecentlySetWater {1, RecastMesh::Water {1, btTransform::getIdentity()}};
-        const RecastMesh leastRecentlySetRecastMesh {mGeneration, mRevision, mIndices, mVertices,
-            mAreaTypes, leastRecentlySetWater};
+        const RecastMesh leastRecentlySetRecastMesh {mGeneration, mRevision, mMesh, leastRecentlySetWater};
         auto leastRecentlySetData = makePeparedNavMeshData(3);
 
         const std::vector<RecastMesh::Water> mostRecentlySetWater {1, RecastMesh::Water {2, btTransform::getIdentity()}};
-        const RecastMesh mostRecentlySetRecastMesh {mGeneration, mRevision, mIndices, mVertices,
-            mAreaTypes, mostRecentlySetWater};
+        const RecastMesh mostRecentlySetRecastMesh {mGeneration, mRevision, mMesh, mostRecentlySetWater};
         auto mostRecentlySetData = makePeparedNavMeshData(3);
 
         ASSERT_TRUE(cache.set(mAgentHalfExtents, mTilePosition, leastRecentlySetRecastMesh,
@@ -300,14 +304,12 @@ namespace
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<RecastMesh::Water> leastRecentlyUsedWater {1, RecastMesh::Water {1, btTransform::getIdentity()}};
-        const RecastMesh leastRecentlyUsedRecastMesh {mGeneration, mRevision, mIndices, mVertices,
-            mAreaTypes, leastRecentlyUsedWater};
+        const RecastMesh leastRecentlyUsedRecastMesh {mGeneration, mRevision, mMesh, leastRecentlyUsedWater};
         auto leastRecentlyUsedData = makePeparedNavMeshData(3);
         const auto leastRecentlyUsedCopy = clone(*leastRecentlyUsedData);
 
         const std::vector<RecastMesh::Water> mostRecentlyUsedWater {1, RecastMesh::Water {2, btTransform::getIdentity()}};
-        const RecastMesh mostRecentlyUsedRecastMesh {mGeneration, mRevision, mIndices, mVertices,
-            mAreaTypes, mostRecentlyUsedWater};
+        const RecastMesh mostRecentlyUsedRecastMesh {mGeneration, mRevision, mMesh, mostRecentlyUsedWater};
         auto mostRecentlyUsedData = makePeparedNavMeshData(3);
         const auto mostRecentlyUsedCopy = clone(*mostRecentlyUsedData);
 
@@ -341,7 +343,7 @@ namespace
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<RecastMesh::Water> water {1, RecastMesh::Water {1, btTransform::getIdentity()}};
-        const RecastMesh tooLargeRecastMesh {mGeneration, mRevision, mIndices, mVertices, mAreaTypes, water};
+        const RecastMesh tooLargeRecastMesh {mGeneration, mRevision, mMesh, water};
         auto tooLargeData = makePeparedNavMeshData(10);
 
         cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
@@ -355,12 +357,11 @@ namespace
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<RecastMesh::Water> anotherWater {1, RecastMesh::Water {1, btTransform::getIdentity()}};
-        const RecastMesh anotherRecastMesh {mGeneration, mRevision, mIndices, mVertices, mAreaTypes, anotherWater};
+        const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, anotherWater};
         auto anotherData = makePeparedNavMeshData(3);
 
         const std::vector<RecastMesh::Water> tooLargeWater {1, RecastMesh::Water {2, btTransform::getIdentity()}};
-        const RecastMesh tooLargeRecastMesh {mGeneration, mRevision, mIndices, mVertices,
-            mAreaTypes, tooLargeWater};
+        const RecastMesh tooLargeRecastMesh {mGeneration, mRevision, mMesh, tooLargeWater};
         auto tooLargeData = makePeparedNavMeshData(10);
 
         const auto value = cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh,
@@ -380,8 +381,7 @@ namespace
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<RecastMesh::Water> water {1, RecastMesh::Water {1, btTransform::getIdentity()}};
-        const RecastMesh anotherRecastMesh {mGeneration, mRevision, mIndices, mVertices,
-            mAreaTypes, water};
+        const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, water};
         auto anotherData = makePeparedNavMeshData(3);
 
         const auto firstCopy = cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
@@ -400,7 +400,7 @@ namespace
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<RecastMesh::Water> water {1, RecastMesh::Water {1, btTransform::getIdentity()}};
-        const RecastMesh anotherRecastMesh {mGeneration, mRevision, mIndices, mVertices, mAreaTypes, water};
+        const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, water};
         auto anotherData = makePeparedNavMeshData(3);
 
         cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
diff --git a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
index 2624389b70..b11b10965b 100644
--- a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
+++ b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
@@ -11,6 +11,8 @@
 #include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
 #include <BulletCollision/CollisionShapes/btCompoundShape.h>
 
+#include <DetourCommon.h>
+
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
@@ -50,9 +52,9 @@ namespace
     {
         RecastMeshBuilder builder(mSettings, mBounds);
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
-        EXPECT_EQ(recastMesh->getVertices(), std::vector<float>());
-        EXPECT_EQ(recastMesh->getIndices(), std::vector<int>());
-        EXPECT_EQ(recastMesh->getAreaTypes(), std::vector<AreaType>());
+        EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>());
+        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>());
+        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>());
     }
 
     TEST_F(DetourNavigatorRecastMeshBuilderTest, add_bhv_triangle_mesh_shape)
@@ -64,13 +66,13 @@ namespace
         RecastMeshBuilder builder(mSettings, mBounds);
         builder.addObject(static_cast<const btCollisionShape&>(shape), btTransform::getIdentity(), AreaType_ground);
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
-        EXPECT_EQ(recastMesh->getVertices(), std::vector<float>({
-            1, 0, -1,
-            -1, 0, 1,
+        EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
             -1, 0, -1,
-        }));
-        EXPECT_EQ(recastMesh->getIndices(), std::vector<int>({0, 1, 2}));
-        EXPECT_EQ(recastMesh->getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
+            -1, 0, 1,
+            1, 0, -1,
+        })) << recastMesh->getMesh().getVertices();
+        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({2, 1, 0}));
+        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
     }
 
     TEST_F(DetourNavigatorRecastMeshBuilderTest, add_transformed_bhv_triangle_mesh_shape)
@@ -85,13 +87,13 @@ namespace
             AreaType_ground
         );
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
-        EXPECT_EQ(recastMesh->getVertices(), std::vector<float>({
-            2, 3, 0,
-            0, 3, 4,
+        EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
             0, 3, 0,
-        }));
-        EXPECT_EQ(recastMesh->getIndices(), std::vector<int>({0, 1, 2}));
-        EXPECT_EQ(recastMesh->getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
+            0, 3, 4,
+            2, 3, 0,
+        })) << recastMesh->getMesh().getVertices();
+        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({2, 1, 0}));
+        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
     }
 
     TEST_F(DetourNavigatorRecastMeshBuilderTest, add_heightfield_terrian_shape)
@@ -101,14 +103,14 @@ namespace
         RecastMeshBuilder builder(mSettings, mBounds);
         builder.addObject(static_cast<const btCollisionShape&>(shape), btTransform::getIdentity(), AreaType_ground);
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
-        EXPECT_EQ(recastMesh->getVertices(), std::vector<float>({
+        EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
             -0.5, 0, -0.5,
             -0.5, 0, 0.5,
             0.5, 0, -0.5,
             0.5, 0, 0.5,
         }));
-        EXPECT_EQ(recastMesh->getIndices(), std::vector<int>({0, 1, 2, 2, 1, 3}));
-        EXPECT_EQ(recastMesh->getAreaTypes(), std::vector<AreaType>({AreaType_ground, AreaType_ground}));
+        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({0, 1, 2, 2, 1, 3}));
+        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_ground, AreaType_ground}));
     }
 
     TEST_F(DetourNavigatorRecastMeshBuilderTest, add_box_shape_should_produce_12_triangles)
@@ -117,31 +119,31 @@ namespace
         RecastMeshBuilder builder(mSettings, mBounds);
         builder.addObject(static_cast<const btCollisionShape&>(shape), btTransform::getIdentity(), AreaType_ground);
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
-        EXPECT_EQ(recastMesh->getVertices(), std::vector<float>({
-            1, 2, 1,
-            -1, 2, 1,
-            1, 2, -1,
-            -1, 2, -1,
-            1, -2, 1,
+        EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
+            -1, -2, -1,
             -1, -2, 1,
+            -1, 2, -1,
+            -1, 2, 1,
             1, -2, -1,
-            -1, -2, -1,
-        })) << recastMesh->getVertices();
-        EXPECT_EQ(recastMesh->getIndices(), std::vector<int>({
-            0, 2, 3,
-            3, 1, 0,
-            0, 4, 6,
-            6, 2, 0,
-            0, 1, 5,
-            5, 4, 0,
-            7, 5, 1,
-            1, 3, 7,
-            7, 3, 2,
-            2, 6, 7,
-            7, 6, 4,
-            4, 5, 7,
-        })) << recastMesh->getIndices();
-        EXPECT_EQ(recastMesh->getAreaTypes(), std::vector<AreaType>(12, AreaType_ground));
+            1, -2, 1,
+            1, 2, -1,
+            1, 2, 1,
+        })) << recastMesh->getMesh().getVertices();
+        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({
+            0, 1, 3,
+            0, 2, 6,
+            0, 4, 5,
+            1, 5, 7,
+            2, 3, 7,
+            3, 2, 0,
+            4, 6, 7,
+            5, 1, 0,
+            6, 4, 0,
+            7, 3, 1,
+            7, 5, 4,
+            7, 6, 2,
+        })) << recastMesh->getMesh().getIndices();
+        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>(12, AreaType_ground));
     }
 
     TEST_F(DetourNavigatorRecastMeshBuilderTest, add_compound_shape)
@@ -164,7 +166,7 @@ namespace
             AreaType_ground
         );
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
-        EXPECT_EQ(recastMesh->getVertices(), std::vector<float>({
+        EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
             -1, -2, -1,
             -1, -2, 1,
             -1, 0, -1,
@@ -177,24 +179,24 @@ namespace
             1, 0, 1,
             1, 2, -1,
             1, 2, 1,
-        })) << recastMesh->getVertices();
-        EXPECT_EQ(recastMesh->getIndices(), std::vector<int>({
-            8, 3, 2,
-            11, 10, 4,
-            4, 5, 11,
-            11, 7, 6,
-            6, 10, 11,
-            11, 5, 1,
-            1, 7, 11,
+        })) << recastMesh->getMesh().getVertices();
+        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({
             0, 1, 5,
-            5, 4, 0,
             0, 4, 10,
-            10, 6, 0,
             0, 6, 7,
+            1, 7, 11,
+            4, 5, 11,
+            5, 4, 0,
+            6, 10, 11,
             7, 1, 0,
+            8, 3, 2,
             8, 3, 9,
-        })) << recastMesh->getIndices();
-        EXPECT_EQ(recastMesh->getAreaTypes(), std::vector<AreaType>(14, AreaType_ground));
+            10, 6, 0,
+            11, 5, 1,
+            11, 7, 6,
+            11, 10, 4,
+        })) << recastMesh->getMesh().getIndices();
+        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>(14, AreaType_ground));
     }
 
     TEST_F(DetourNavigatorRecastMeshBuilderTest, add_transformed_compound_shape)
@@ -211,13 +213,13 @@ namespace
             AreaType_ground
         );
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
-        EXPECT_EQ(recastMesh->getVertices(), std::vector<float>({
-            2, 3, 0,
-            0, 3, 4,
+        EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
             0, 3, 0,
-        }));
-        EXPECT_EQ(recastMesh->getIndices(), std::vector<int>({0, 1, 2}));
-        EXPECT_EQ(recastMesh->getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
+            0, 3, 4,
+            2, 3, 0,
+        })) << recastMesh->getMesh().getVertices();
+        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({2, 1, 0}));
+        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
     }
 
     TEST_F(DetourNavigatorRecastMeshBuilderTest, add_transformed_compound_shape_with_transformed_bhv_triangle_shape)
@@ -235,13 +237,13 @@ namespace
             AreaType_ground
         );
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
-        EXPECT_EQ(recastMesh->getVertices(), std::vector<float>({
-            3, 12, 2,
-            1, 12, 10,
+        EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
             1, 12, 2,
-        }));
-        EXPECT_EQ(recastMesh->getIndices(), std::vector<int>({0, 1, 2}));
-        EXPECT_EQ(recastMesh->getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
+            1, 12, 10,
+            3, 12, 2,
+        })) << recastMesh->getMesh().getVertices();
+        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({2, 1, 0}));
+        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
     }
 
     TEST_F(DetourNavigatorRecastMeshBuilderTest, without_bounds_add_bhv_triangle_shape_should_not_filter_by_bounds)
@@ -257,16 +259,16 @@ namespace
             AreaType_ground
         );
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
-        EXPECT_EQ(recastMesh->getVertices(), std::vector<float>({
-            1, 0, -1,
-            -1, 0, 1,
-            -1, 0, -1,
-            -2, 0, -3,
-            -3, 0, -2,
+        EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
             -3, 0, -3,
-        }));
-        EXPECT_EQ(recastMesh->getIndices(), std::vector<int>({0, 1, 2, 3, 4, 5}));
-        EXPECT_EQ(recastMesh->getAreaTypes(), std::vector<AreaType>(2, AreaType_ground));
+            -3, 0, -2,
+            -2, 0, -3,
+            -1, 0, -1,
+            -1, 0, 1,
+            1, 0, -1,
+        })) << recastMesh->getMesh().getVertices();
+        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({2, 1, 0, 5, 4, 3}));
+        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>(2, AreaType_ground));
     }
 
     TEST_F(DetourNavigatorRecastMeshBuilderTest, with_bounds_add_bhv_triangle_shape_should_filter_by_bounds)
@@ -285,13 +287,13 @@ namespace
             AreaType_ground
         );
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
-        EXPECT_EQ(recastMesh->getVertices(), std::vector<float>({
-            -0.2f, 0, -0.3f,
-            -0.3f, 0, -0.2f,
+        EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
             -0.3f, 0, -0.3f,
-        }));
-        EXPECT_EQ(recastMesh->getIndices(), std::vector<int>({0, 1, 2}));
-        EXPECT_EQ(recastMesh->getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
+            -0.3f, 0, -0.2f,
+            -0.2f, 0, -0.3f,
+        })) << recastMesh->getMesh().getVertices();
+        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({2, 1, 0}));
+        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
     }
 
     TEST_F(DetourNavigatorRecastMeshBuilderTest, with_bounds_add_rotated_by_x_bhv_triangle_shape_should_filter_by_bounds)
@@ -310,13 +312,13 @@ namespace
             AreaType_ground
         );
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
-        EXPECT_THAT(recastMesh->getVertices(), Pointwise(FloatNear(1e-5), std::vector<float>({
-            0, -0.70710659027099609375, -3.535533905029296875,
-            0, 0.707107067108154296875, -3.535533905029296875,
-            0, 2.384185791015625e-07, -4.24264049530029296875,
-        })));
-        EXPECT_EQ(recastMesh->getIndices(), std::vector<int>({0, 1, 2}));
-        EXPECT_EQ(recastMesh->getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
+        EXPECT_THAT(recastMesh->getMesh().getVertices(), Pointwise(FloatNear(1e-5), std::vector<float>({
+            0, -0.707106769084930419921875, -3.535533905029296875,
+            0, 4.44089209850062616169452667236328125e-16, -4.24264049530029296875,
+            0, 0.707106769084930419921875, -3.535533905029296875,
+        }))) << recastMesh->getMesh().getVertices();
+        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({0, 2, 1}));
+        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
     }
 
     TEST_F(DetourNavigatorRecastMeshBuilderTest, with_bounds_add_rotated_by_y_bhv_triangle_shape_should_filter_by_bounds)
@@ -335,13 +337,13 @@ namespace
             AreaType_ground
         );
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
-        EXPECT_THAT(recastMesh->getVertices(), Pointwise(FloatNear(1e-5), std::vector<float>({
-            -3.535533905029296875, -0.70710659027099609375, 0,
-            -3.535533905029296875, 0.707107067108154296875, 0,
-            -4.24264049530029296875, 2.384185791015625e-07, 0,
-        })));
-        EXPECT_EQ(recastMesh->getIndices(), std::vector<int>({0, 1, 2}));
-        EXPECT_EQ(recastMesh->getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
+        EXPECT_THAT(recastMesh->getMesh().getVertices(), Pointwise(FloatNear(1e-5), std::vector<float>({
+            -4.24264049530029296875, 4.44089209850062616169452667236328125e-16, 0,
+            -3.535533905029296875, -0.707106769084930419921875, 0,
+            -3.535533905029296875, 0.707106769084930419921875, 0,
+        }))) << recastMesh->getMesh().getVertices();
+        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({1, 2, 0}));
+        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
     }
 
     TEST_F(DetourNavigatorRecastMeshBuilderTest, with_bounds_add_rotated_by_z_bhv_triangle_shape_should_filter_by_bounds)
@@ -360,13 +362,13 @@ namespace
             AreaType_ground
         );
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
-        EXPECT_THAT(recastMesh->getVertices(), Pointwise(FloatNear(1e-5), std::vector<float>({
-            1.41421353816986083984375, 0, 1.1920928955078125e-07,
-            -1.41421353816986083984375, 0, -1.1920928955078125e-07,
-            1.1920928955078125e-07, 0, -1.41421353816986083984375,
-        })));
-        EXPECT_EQ(recastMesh->getIndices(), std::vector<int>({0, 1, 2}));
-        EXPECT_EQ(recastMesh->getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
+        EXPECT_THAT(recastMesh->getMesh().getVertices(), Pointwise(FloatNear(1e-5), std::vector<float>({
+            -1.41421353816986083984375, 0, -1.1102230246251565404236316680908203125e-16,
+            1.1102230246251565404236316680908203125e-16, 0, -1.41421353816986083984375,
+            1.41421353816986083984375, 0, 1.1102230246251565404236316680908203125e-16,
+        }))) << recastMesh->getMesh().getVertices();
+        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({2, 0, 1}));
+        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
     }
 
     TEST_F(DetourNavigatorRecastMeshBuilderTest, flags_values_should_be_corresponding_to_added_objects)
@@ -389,16 +391,16 @@ namespace
             AreaType_null
         );
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
-        EXPECT_EQ(recastMesh->getVertices(), std::vector<float>({
-            1, 0, -1,
-            -1, 0, 1,
-            -1, 0, -1,
-            -2, 0, -3,
-            -3, 0, -2,
+        EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
             -3, 0, -3,
-        }));
-        EXPECT_EQ(recastMesh->getIndices(), std::vector<int>({0, 1, 2, 3, 4, 5}));
-        EXPECT_EQ(recastMesh->getAreaTypes(), std::vector<AreaType>({AreaType_ground, AreaType_null}));
+            -3, 0, -2,
+            -2, 0, -3,
+            -1, 0, -1,
+            -1, 0, 1,
+            1, 0, -1,
+        })) << recastMesh->getMesh().getVertices();
+        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({2, 1, 0, 5, 4, 3}));
+        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_null, AreaType_ground}));
     }
 
     TEST_F(DetourNavigatorRecastMeshBuilderTest, add_water_then_get_water_should_return_it)
@@ -421,13 +423,13 @@ namespace
         RecastMeshBuilder builder(mSettings, mBounds);
         builder.addObject(static_cast<const btCollisionShape&>(shape), btTransform::getIdentity(), AreaType_ground);
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
-        EXPECT_EQ(recastMesh->getVertices(), std::vector<float>({
+        EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
             -1, 0, -1,
             -1, 0, 1,
             1, 0, -1,
             1, 0, 1,
-        })) << recastMesh->getVertices();
-        EXPECT_EQ(recastMesh->getIndices(), std::vector<int>({2, 1, 0, 2, 1, 3}));
-        EXPECT_EQ(recastMesh->getAreaTypes(), std::vector<AreaType>({AreaType_ground, AreaType_ground}));
+        })) << recastMesh->getMesh().getVertices();
+        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({2, 1, 0, 2, 1, 3}));
+        EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_ground, AreaType_ground}));
     }
 }
diff --git a/components/detournavigator/debug.cpp b/components/detournavigator/debug.cpp
index c3d67b1848..4cb5b248b0 100644
--- a/components/detournavigator/debug.cpp
+++ b/components/detournavigator/debug.cpp
@@ -18,7 +18,7 @@ namespace DetourNavigator
         file.exceptions(std::ios::failbit | std::ios::badbit);
         file.precision(std::numeric_limits<float>::max_exponent10);
         std::size_t count = 0;
-        for (auto v : recastMesh.getVertices())
+        for (float v : recastMesh.getMesh().getVertices())
         {
             if (count % 3 == 0)
             {
@@ -31,7 +31,7 @@ namespace DetourNavigator
         }
         file << '\n';
         count = 0;
-        for (auto v : recastMesh.getIndices())
+        for (int v : recastMesh.getMesh().getIndices())
         {
             if (count % 3 == 0)
             {
diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index 42676f4294..7145bebae7 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -157,26 +157,26 @@ namespace
             throw NavigatorException("Failed to create heightfield for navmesh");
     }
 
-    bool rasterizeSolidObjectsTriangles(rcContext& context, const RecastMesh& recastMesh, const rcConfig& config,
+    bool rasterizeTriangles(rcContext& context, const Mesh& mesh, const rcConfig& config,
         rcHeightfield& solid)
     {
-        std::vector<unsigned char> areas(recastMesh.getAreaTypes().begin(), recastMesh.getAreaTypes().end());
+        std::vector<unsigned char> areas(mesh.getAreaTypes().begin(), mesh.getAreaTypes().end());
 
         rcClearUnwalkableTriangles(
             &context,
             config.walkableSlopeAngle,
-            recastMesh.getVertices().data(),
-            static_cast<int>(recastMesh.getVerticesCount()),
-            recastMesh.getIndices().data(),
+            mesh.getVertices().data(),
+            static_cast<int>(mesh.getVerticesCount()),
+            mesh.getIndices().data(),
             static_cast<int>(areas.size()),
             areas.data()
         );
 
         return rcRasterizeTriangles(
             &context,
-            recastMesh.getVertices().data(),
-            static_cast<int>(recastMesh.getVerticesCount()),
-            recastMesh.getIndices().data(),
+            mesh.getVertices().data(),
+            static_cast<int>(mesh.getVerticesCount()),
+            mesh.getIndices().data(),
             areas.data(),
             static_cast<int>(areas.size()),
             solid,
@@ -242,7 +242,7 @@ namespace
     bool rasterizeTriangles(rcContext& context, const osg::Vec3f& agentHalfExtents, const RecastMesh& recastMesh,
         const rcConfig& config, const Settings& settings, rcHeightfield& solid)
     {
-        if (!rasterizeSolidObjectsTriangles(context, recastMesh, config, solid))
+        if (!rasterizeTriangles(context, recastMesh.getMesh(), config, solid))
             return false;
 
         rasterizeWaterTriangles(context, agentHalfExtents, recastMesh, settings, config, solid);
diff --git a/components/detournavigator/navmeshtilescache.cpp b/components/detournavigator/navmeshtilescache.cpp
index 7c29f734ea..c4f81727ab 100644
--- a/components/detournavigator/navmeshtilescache.cpp
+++ b/components/detournavigator/navmeshtilescache.cpp
@@ -42,7 +42,7 @@ namespace DetourNavigator
         while (!mFreeItems.empty() && mUsedNavMeshDataSize + itemSize > mMaxNavMeshDataSize)
             removeLeastRecentlyUsed();
 
-        RecastMeshData key {recastMesh.getIndices(), recastMesh.getVertices(), recastMesh.getAreaTypes(), recastMesh.getWater()};
+        RecastMeshData key {recastMesh.getMesh(), recastMesh.getWater()};
 
         const auto iterator = mFreeItems.emplace(mFreeItems.end(), agentHalfExtents, changedTile, std::move(key), itemSize);
         const auto emplaced = mValues.emplace(std::make_tuple(agentHalfExtents, changedTile, std::cref(iterator->mRecastMeshData)), iterator);
diff --git a/components/detournavigator/navmeshtilescache.hpp b/components/detournavigator/navmeshtilescache.hpp
index 37c0be7211..b6b9391e66 100644
--- a/components/detournavigator/navmeshtilescache.hpp
+++ b/components/detournavigator/navmeshtilescache.hpp
@@ -22,28 +22,26 @@ namespace DetourNavigator
 {
     struct RecastMeshData
     {
-        std::vector<int> mIndices;
-        std::vector<float> mVertices;
-        std::vector<AreaType> mAreaTypes;
+        Mesh mMesh;
         std::vector<RecastMesh::Water> mWater;
     };
 
     inline bool operator <(const RecastMeshData& lhs, const RecastMeshData& rhs)
     {
-        return std::tie(lhs.mIndices, lhs.mVertices, lhs.mAreaTypes, lhs.mWater)
-                < std::tie(rhs.mIndices, rhs.mVertices, rhs.mAreaTypes, rhs.mWater);
+        return std::tie(lhs.mMesh, lhs.mWater)
+                < std::tie(rhs.mMesh, rhs.mWater);
     }
 
     inline bool operator <(const RecastMeshData& lhs, const RecastMesh& rhs)
     {
-        return std::tie(lhs.mIndices, lhs.mVertices, lhs.mAreaTypes, lhs.mWater)
-                < std::tie(rhs.getIndices(), rhs.getVertices(), rhs.getAreaTypes(), rhs.getWater());
+        return std::tie(lhs.mMesh, lhs.mWater)
+                < std::tie(rhs.getMesh(), rhs.getWater());
     }
 
     inline bool operator <(const RecastMesh& lhs, const RecastMeshData& rhs)
     {
-        return std::tie(lhs.getIndices(), lhs.getVertices(), lhs.getAreaTypes(), lhs.getWater())
-                < std::tie(rhs.mIndices, rhs.mVertices, rhs.mAreaTypes, rhs.mWater);
+        return std::tie(lhs.getMesh(), lhs.getWater())
+                < std::tie(rhs.mMesh, rhs.mWater);
     }
 
     class NavMeshTilesCache
diff --git a/components/detournavigator/recastmesh.cpp b/components/detournavigator/recastmesh.cpp
index 00d6ae556a..354be8207b 100644
--- a/components/detournavigator/recastmesh.cpp
+++ b/components/detournavigator/recastmesh.cpp
@@ -5,23 +5,28 @@
 
 namespace DetourNavigator
 {
-    RecastMesh::RecastMesh(std::size_t generation, std::size_t revision, std::vector<int> indices, std::vector<float> vertices,
-            std::vector<AreaType> areaTypes, std::vector<Water> water)
+    Mesh::Mesh(std::vector<int>&& indices, std::vector<float>&& vertices, std::vector<AreaType>&& areaTypes)
+    {
+        if (indices.size() / 3 != areaTypes.size())
+           throw InvalidArgument("Number of flags doesn't match number of triangles: triangles="
+               + std::to_string(indices.size() / 3) + ", areaTypes=" + std::to_string(areaTypes.size()));
+        indices.shrink_to_fit();
+        vertices.shrink_to_fit();
+        areaTypes.shrink_to_fit();
+        mIndices = std::move(indices);
+        mVertices = std::move(vertices);
+        mAreaTypes = std::move(areaTypes);
+    }
+
+    RecastMesh::RecastMesh(std::size_t generation, std::size_t revision, Mesh mesh, std::vector<Water> water)
         : mGeneration(generation)
         , mRevision(revision)
-        , mIndices(std::move(indices))
-        , mVertices(std::move(vertices))
-        , mAreaTypes(std::move(areaTypes))
+        , mMesh(std::move(mesh))
         , mWater(std::move(water))
     {
-        if (getTrianglesCount() != mAreaTypes.size())
-            throw InvalidArgument("Number of flags doesn't match number of triangles: triangles="
-                + std::to_string(getTrianglesCount()) + ", areaTypes=" + std::to_string(mAreaTypes.size()));
-        if (getVerticesCount())
-            rcCalcBounds(mVertices.data(), static_cast<int>(getVerticesCount()), mBounds.mMin.ptr(), mBounds.mMax.ptr());
-        mIndices.shrink_to_fit();
-        mVertices.shrink_to_fit();
-        mAreaTypes.shrink_to_fit();
+        if (mMesh.getVerticesCount() > 0)
+            rcCalcBounds(mMesh.getVertices().data(), static_cast<int>(mMesh.getVerticesCount()),
+                         mBounds.mMin.ptr(), mBounds.mMax.ptr());
         mWater.shrink_to_fit();
     }
 }
diff --git a/components/detournavigator/recastmesh.hpp b/components/detournavigator/recastmesh.hpp
index 7f5758a85e..9989bab061 100644
--- a/components/detournavigator/recastmesh.hpp
+++ b/components/detournavigator/recastmesh.hpp
@@ -15,6 +15,36 @@
 
 namespace DetourNavigator
 {
+    class Mesh
+    {
+    public:
+        Mesh(std::vector<int>&& indices, std::vector<float>&& vertices, std::vector<AreaType>&& areaTypes);
+
+        const std::vector<int>& getIndices() const noexcept { return mIndices; }
+        const std::vector<float>& getVertices() const noexcept { return mVertices; }
+        const std::vector<AreaType>& getAreaTypes() const noexcept { return mAreaTypes; }
+        std::size_t getVerticesCount() const noexcept { return mVertices.size() / 3; }
+        std::size_t getTrianglesCount() const noexcept { return mAreaTypes.size(); }
+
+    private:
+        std::vector<int> mIndices;
+        std::vector<float> mVertices;
+        std::vector<AreaType> mAreaTypes;
+
+        friend inline bool operator<(const Mesh& lhs, const Mesh& rhs) noexcept
+        {
+            return std::tie(lhs.mIndices, lhs.mVertices, lhs.mAreaTypes)
+                    < std::tie(rhs.mIndices, rhs.mVertices, rhs.mAreaTypes);
+        }
+
+        friend inline std::size_t getSize(const Mesh& value) noexcept
+        {
+            return value.mIndices.size() * sizeof(int)
+                + value.mVertices.size() * sizeof(float)
+                + value.mAreaTypes.size() * sizeof(AreaType);
+        }
+    };
+
     class RecastMesh
     {
     public:
@@ -24,8 +54,7 @@ namespace DetourNavigator
             btTransform mTransform;
         };
 
-        RecastMesh(std::size_t generation, std::size_t revision, std::vector<int> indices, std::vector<float> vertices,
-            std::vector<AreaType> areaTypes, std::vector<Water> water);
+        RecastMesh(std::size_t generation, std::size_t revision, Mesh mesh, std::vector<Water> water);
 
         std::size_t getGeneration() const
         {
@@ -37,36 +66,13 @@ namespace DetourNavigator
             return mRevision;
         }
 
-        const std::vector<int>& getIndices() const
-        {
-            return mIndices;
-        }
-
-        const std::vector<float>& getVertices() const
-        {
-            return mVertices;
-        }
-
-        const std::vector<AreaType>& getAreaTypes() const
-        {
-            return mAreaTypes;
-        }
+        const Mesh& getMesh() const noexcept { return mMesh; }
 
         const std::vector<Water>& getWater() const
         {
             return mWater;
         }
 
-        std::size_t getVerticesCount() const
-        {
-            return mVertices.size() / 3;
-        }
-
-        std::size_t getTrianglesCount() const
-        {
-            return mIndices.size() / 3;
-        }
-
         const Bounds& getBounds() const
         {
             return mBounds;
@@ -75,32 +81,25 @@ namespace DetourNavigator
     private:
         std::size_t mGeneration;
         std::size_t mRevision;
-        std::vector<int> mIndices;
-        std::vector<float> mVertices;
-        std::vector<AreaType> mAreaTypes;
+        Mesh mMesh;
         std::vector<Water> mWater;
         Bounds mBounds;
 
-        friend inline std::size_t getSize(const RecastMesh& recastMesh) noexcept
+        friend inline bool operator <(const RecastMesh& lhs, const RecastMesh& rhs) noexcept
         {
-            const std::size_t indicesSize = recastMesh.mIndices.size() * sizeof(int);
-            const std::size_t verticesSize = recastMesh.mVertices.size() * sizeof(float);
-            const std::size_t areaTypesSize = recastMesh.mAreaTypes.size() * sizeof(AreaType);
-            const std::size_t waterSize = recastMesh.mWater.size() * sizeof(RecastMesh::Water);
-            return indicesSize + verticesSize + areaTypesSize + waterSize;
+            return std::tie(lhs.mMesh, lhs.mWater) < std::tie(rhs.mMesh, rhs.mWater);
+        }
+
+        friend inline std::size_t getSize(const RecastMesh& value) noexcept
+        {
+            return getSize(value.mMesh) + value.mWater.size() * sizeof(RecastMesh::Water);
         }
     };
 
-    inline bool operator<(const RecastMesh::Water& lhs, const RecastMesh::Water& rhs)
+    inline bool operator<(const RecastMesh::Water& lhs, const RecastMesh::Water& rhs) noexcept
     {
         return std::tie(lhs.mCellSize, lhs.mTransform) < std::tie(rhs.mCellSize, rhs.mTransform);
     }
-
-    inline bool operator <(const RecastMesh& lhs, const RecastMesh& rhs)
-    {
-        return std::tie(lhs.getIndices(), lhs.getVertices(), lhs.getAreaTypes(), lhs.getWater())
-                < std::tie(rhs.getIndices(), rhs.getVertices(), rhs.getAreaTypes(), rhs.getWater());
-    }
 }
 
 #endif
diff --git a/components/detournavigator/recastmeshbuilder.cpp b/components/detournavigator/recastmeshbuilder.cpp
index 8ecbf1ec8e..8de82bee16 100644
--- a/components/detournavigator/recastmeshbuilder.cpp
+++ b/components/detournavigator/recastmeshbuilder.cpp
@@ -17,8 +17,8 @@
 
 #include <algorithm>
 #include <cassert>
-#include <tuple>
 #include <array>
+#include <vector>
 
 namespace DetourNavigator
 {
@@ -26,40 +26,59 @@ namespace DetourNavigator
 
     namespace
     {
-        void optimizeRecastMesh(std::vector<int>& indices, std::vector<float>& vertices)
+        RecastMeshTriangle makeRecastMeshTriangle(const btVector3* vertices, const AreaType areaType, const Settings& settings)
         {
-            std::vector<std::tuple<float, float, float>> uniqueVertices;
-            uniqueVertices.reserve(vertices.size() / 3);
+            RecastMeshTriangle result;
+            result.mAreaType = areaType;
+            for (std::size_t i = 0; i < 3; ++i)
+                result.mVertices[i] = toNavMeshCoordinates(settings, Misc::Convert::makeOsgVec3f(vertices[i]));
+            return result;
+        }
+    }
+
+    Mesh makeMesh(std::vector<RecastMeshTriangle>&& triangles)
+    {
+        std::vector<osg::Vec3f> uniqueVertices;
+        uniqueVertices.reserve(3 * triangles.size());
+
+        for (const RecastMeshTriangle& v : triangles)
+            for (const osg::Vec3f& v : v.mVertices)
+                uniqueVertices.push_back(v);
 
-            for (std::size_t i = 0, n = vertices.size() / 3; i < n; ++i)
-                uniqueVertices.emplace_back(vertices[i * 3], vertices[i * 3 + 1], vertices[i * 3 + 2]);
+        std::sort(uniqueVertices.begin(), uniqueVertices.end());
+        uniqueVertices.erase(std::unique(uniqueVertices.begin(), uniqueVertices.end()), uniqueVertices.end());
 
-            std::sort(uniqueVertices.begin(), uniqueVertices.end());
-            const auto end = std::unique(uniqueVertices.begin(), uniqueVertices.end());
-            uniqueVertices.erase(end, uniqueVertices.end());
+        std::vector<int> indices;
+        indices.reserve(3 * triangles.size());
+        std::vector<AreaType> areaTypes;
+        areaTypes.reserve(triangles.size());
 
-            if (uniqueVertices.size() == vertices.size() / 3)
-                return;
+        for (const RecastMeshTriangle& v : triangles)
+        {
+            areaTypes.push_back(v.mAreaType);
 
-            for (std::size_t i = 0, n = indices.size(); i < n; ++i)
+            for (const osg::Vec3f& v : v.mVertices)
             {
-                const auto index = indices[i];
-                const auto vertex = std::make_tuple(vertices[index * 3], vertices[index * 3 + 1], vertices[index * 3 + 2]);
-                const auto it = std::lower_bound(uniqueVertices.begin(), uniqueVertices.end(), vertex);
+                const auto it = std::lower_bound(uniqueVertices.begin(), uniqueVertices.end(), v);
                 assert(it != uniqueVertices.end());
-                assert(*it == vertex);
-                indices[i] = std::distance(uniqueVertices.begin(), it);
+                assert(*it == v);
+                indices.push_back(static_cast<int>(it - uniqueVertices.begin()));
             }
+        }
 
-            vertices.resize(uniqueVertices.size() * 3);
+        triangles.clear();
 
-            for (std::size_t i = 0, n = uniqueVertices.size(); i < n; ++i)
-            {
-                vertices[i * 3] = std::get<0>(uniqueVertices[i]);
-                vertices[i * 3 + 1] = std::get<1>(uniqueVertices[i]);
-                vertices[i * 3 + 2] = std::get<2>(uniqueVertices[i]);
-            }
+        std::vector<float> vertices;
+        vertices.reserve(3 * uniqueVertices.size());
+
+        for (const osg::Vec3f& v : uniqueVertices)
+        {
+            vertices.push_back(v.x());
+            vertices.push_back(v.y());
+            vertices.push_back(v.z());
         }
+
+        return Mesh(std::move(indices), std::move(vertices), std::move(areaTypes));
     }
 
     RecastMeshBuilder::RecastMeshBuilder(const Settings& settings, const TileBounds& bounds)
@@ -96,37 +115,26 @@ namespace DetourNavigator
     void RecastMeshBuilder::addObject(const btConcaveShape& shape, const btTransform& transform,
                                       const AreaType areaType)
     {
-        return addObject(shape, transform, makeProcessTriangleCallback([&] (btVector3* triangle, int, int)
+        return addObject(shape, transform, makeProcessTriangleCallback([&] (btVector3* vertices, int, int)
         {
-            for (std::size_t i = 3; i > 0; --i)
-                addTriangleVertex(triangle[i - 1]);
-            mAreaTypes.push_back(areaType);
+            RecastMeshTriangle triangle = makeRecastMeshTriangle(vertices, areaType, mSettings);
+            std::reverse(triangle.mVertices.begin(), triangle.mVertices.end());
+            mTriangles.emplace_back(triangle);
         }));
     }
 
     void RecastMeshBuilder::addObject(const btHeightfieldTerrainShape& shape, const btTransform& transform,
                                       const AreaType areaType)
     {
-        return addObject(shape, transform, makeProcessTriangleCallback([&] (btVector3* triangle, int, int)
+        return addObject(shape, transform, makeProcessTriangleCallback([&] (btVector3* vertices, int, int)
         {
-            for (std::size_t i = 0; i < 3; ++i)
-                addTriangleVertex(triangle[i]);
-            mAreaTypes.push_back(areaType);
+            mTriangles.emplace_back(makeRecastMeshTriangle(vertices, areaType, mSettings));
         }));
     }
 
     void RecastMeshBuilder::addObject(const btBoxShape& shape, const btTransform& transform, const AreaType areaType)
     {
-        const auto indexOffset = static_cast<int>(mVertices.size() / 3);
-
-        for (int vertex = 0, count = shape.getNumVertices(); vertex < count; ++vertex)
-        {
-            btVector3 position;
-            shape.getVertex(vertex, position);
-            addVertex(transform(position));
-        }
-
-        const std::array<int, 36> indices {{
+        constexpr std::array<int, 36> indices {{
             0, 2, 3,
             3, 1, 0,
             0, 4, 6,
@@ -141,10 +149,17 @@ namespace DetourNavigator
             4, 5, 7,
         }};
 
-        std::transform(indices.begin(), indices.end(), std::back_inserter(mIndices),
-            [&] (int index) { return index + indexOffset; });
-
-        std::generate_n(std::back_inserter(mAreaTypes), 12, [=] { return areaType; });
+        for (std::size_t i = 0; i < indices.size(); i += 3)
+        {
+            std::array<btVector3, 3> vertices;
+            for (std::size_t j = 0; j < 3; ++j)
+            {
+                btVector3 position;
+                shape.getVertex(indices[i + j], position);
+                vertices[j] = transform(position);
+            }
+            mTriangles.emplace_back(makeRecastMeshTriangle(vertices.data(), areaType, mSettings));
+        }
     }
 
     void RecastMeshBuilder::addWater(const int cellSize, const btTransform& transform)
@@ -154,9 +169,10 @@ namespace DetourNavigator
 
     std::shared_ptr<RecastMesh> RecastMeshBuilder::create(std::size_t generation, std::size_t revision) &&
     {
-        optimizeRecastMesh(mIndices, mVertices);
+        std::sort(mTriangles.begin(), mTriangles.end());
         std::sort(mWater.begin(), mWater.end());
-        return std::make_shared<RecastMesh>(generation, revision, std::move(mIndices), std::move(mVertices), std::move(mAreaTypes), std::move(mWater));
+        Mesh mesh = makeMesh(std::move(mTriangles));
+        return std::make_shared<RecastMesh>(generation, revision, std::move(mesh), std::move(mWater));
     }
 
     void RecastMeshBuilder::addObject(const btConcaveShape& shape, const btTransform& transform,
@@ -218,18 +234,4 @@ namespace DetourNavigator
 
         shape.processAllTriangles(&wrapper, aabbMin, aabbMax);
     }
-
-    void RecastMeshBuilder::addTriangleVertex(const btVector3& worldPosition)
-    {
-        mIndices.push_back(static_cast<int>(mVertices.size() / 3));
-        addVertex(worldPosition);
-    }
-
-    void RecastMeshBuilder::addVertex(const btVector3& worldPosition)
-    {
-        const auto navMeshPosition = toNavMeshCoordinates(mSettings, Misc::Convert::makeOsgVec3f(worldPosition));
-        mVertices.push_back(navMeshPosition.x());
-        mVertices.push_back(navMeshPosition.y());
-        mVertices.push_back(navMeshPosition.z());
-    }
 }
diff --git a/components/detournavigator/recastmeshbuilder.hpp b/components/detournavigator/recastmeshbuilder.hpp
index cb1b79377a..1d163a406f 100644
--- a/components/detournavigator/recastmeshbuilder.hpp
+++ b/components/detournavigator/recastmeshbuilder.hpp
@@ -4,8 +4,16 @@
 #include "recastmesh.hpp"
 #include "tilebounds.hpp"
 
+#include <osg/Vec3f>
+
 #include <LinearMath/btTransform.h>
 
+#include <array>
+#include <functional>
+#include <memory>
+#include <tuple>
+#include <vector>
+
 class btBoxShape;
 class btCollisionShape;
 class btCompoundShape;
@@ -17,6 +25,17 @@ namespace DetourNavigator
 {
     struct Settings;
 
+    struct RecastMeshTriangle
+    {
+        AreaType mAreaType;
+        std::array<osg::Vec3f, 3> mVertices;
+
+        friend inline bool operator<(const RecastMeshTriangle& lhs, const RecastMeshTriangle& rhs)
+        {
+            return std::tie(lhs.mAreaType, lhs.mVertices) < std::tie(rhs.mAreaType, rhs.mVertices);
+        }
+    };
+
     class RecastMeshBuilder
     {
     public:
@@ -39,19 +58,15 @@ namespace DetourNavigator
     private:
         std::reference_wrapper<const Settings> mSettings;
         TileBounds mBounds;
-        std::vector<int> mIndices;
-        std::vector<float> mVertices;
-        std::vector<AreaType> mAreaTypes;
+        std::vector<RecastMeshTriangle> mTriangles;
         std::vector<RecastMesh::Water> mWater;
 
         void addObject(const btConcaveShape& shape, const btTransform& transform, btTriangleCallback&& callback);
 
         void addObject(const btHeightfieldTerrainShape& shape, const btTransform& transform, btTriangleCallback&& callback);
-
-        void addTriangleVertex(const btVector3& worldPosition);
-
-        void addVertex(const btVector3& worldPosition);
     };
+
+    Mesh makeMesh(std::vector<RecastMeshTriangle>&& triangles);
 }
 
 #endif
diff --git a/components/detournavigator/recastmeshmanager.cpp b/components/detournavigator/recastmeshmanager.cpp
index e7afeb2848..ed77b4cef4 100644
--- a/components/detournavigator/recastmeshmanager.cpp
+++ b/components/detournavigator/recastmeshmanager.cpp
@@ -16,9 +16,8 @@ namespace DetourNavigator
         const auto object = mObjects.lower_bound(id);
         if (object != mObjects.end() && object->first == id)
             return false;
-        const auto iterator = mObjectsOrder.emplace(mObjectsOrder.end(),
+        mObjects.emplace_hint(object, id,
             OscillatingRecastMeshObject(RecastMeshObject(shape, transform, areaType), mRevision + 1));
-        mObjects.emplace_hint(object, id, iterator);
         ++mRevision;
         return true;
     }
@@ -30,7 +29,7 @@ namespace DetourNavigator
             return false;
         const std::size_t lastChangeRevision = mLastNavMeshReportedChange.has_value()
                 ? mLastNavMeshReportedChange->mRevision : mRevision;
-        if (!object->second->update(transform, areaType, lastChangeRevision, mTileBounds))
+        if (!object->second.update(transform, areaType, lastChangeRevision, mTileBounds))
             return false;
         ++mRevision;
         return true;
@@ -41,8 +40,7 @@ namespace DetourNavigator
         const auto object = mObjects.find(id);
         if (object == mObjects.end())
             return std::nullopt;
-        const RemovedRecastMeshObject result {object->second->getImpl().getShape(), object->second->getImpl().getTransform()};
-        mObjectsOrder.erase(object->second);
+        const RemovedRecastMeshObject result {object->second.getImpl().getShape(), object->second.getImpl().getTransform()};
         mObjects.erase(object);
         ++mRevision;
         return result;
@@ -51,12 +49,8 @@ namespace DetourNavigator
     bool RecastMeshManager::addWater(const osg::Vec2i& cellPosition, const int cellSize,
         const btTransform& transform)
     {
-        const auto iterator = mWaterOrder.emplace(mWaterOrder.end(), Water {cellSize, transform});
-        if (!mWater.emplace(cellPosition, iterator).second)
-        {
-            mWaterOrder.erase(iterator);
+        if (!mWater.emplace(cellPosition, Water {cellSize, transform}).second)
             return false;
-        }
         ++mRevision;
         return true;
     }
@@ -67,8 +61,7 @@ namespace DetourNavigator
         if (water == mWater.end())
             return std::nullopt;
         ++mRevision;
-        const auto result = *water->second;
-        mWaterOrder.erase(water->second);
+        const Water result = water->second;
         mWater.erase(water);
         return result;
     }
@@ -76,9 +69,9 @@ namespace DetourNavigator
     std::shared_ptr<RecastMesh> RecastMeshManager::getMesh()
     {
         RecastMeshBuilder builder(mSettings, mTileBounds);
-        for (const auto& v : mWaterOrder)
+        for (const auto& [k, v] : mWater)
             builder.addWater(v.mCellSize, v.mTransform);
-        for (const auto& object : mObjectsOrder)
+        for (const auto& [k, object] : mObjects)
         {
             const RecastMeshObject& v = object.getImpl();
             builder.addObject(v.getShape(), v.getTransform(), v.getAreaType());
diff --git a/components/detournavigator/recastmeshmanager.hpp b/components/detournavigator/recastmeshmanager.hpp
index 956170d3b4..d67f287dfc 100644
--- a/components/detournavigator/recastmeshmanager.hpp
+++ b/components/detournavigator/recastmeshmanager.hpp
@@ -9,7 +9,6 @@
 
 #include <osg/Vec2i>
 
-#include <list>
 #include <map>
 #include <optional>
 #include <memory>
@@ -68,10 +67,8 @@ namespace DetourNavigator
         std::size_t mRevision = 0;
         std::size_t mGeneration;
         TileBounds mTileBounds;
-        std::list<OscillatingRecastMeshObject> mObjectsOrder;
-        std::map<ObjectId, std::list<OscillatingRecastMeshObject>::iterator> mObjects;
-        std::list<Water> mWaterOrder;
-        std::map<osg::Vec2i, std::list<Water>::iterator> mWater;
+        std::map<ObjectId, OscillatingRecastMeshObject> mObjects;
+        std::map<osg::Vec2i, Water> mWater;
         std::optional<Report> mLastNavMeshReportedChange;
         std::optional<Report> mLastNavMeshReport;
     };
diff --git a/components/sceneutil/recastmesh.cpp b/components/sceneutil/recastmesh.cpp
index 2716f46832..ce92b16a0e 100644
--- a/components/sceneutil/recastmesh.cpp
+++ b/components/sceneutil/recastmesh.cpp
@@ -39,10 +39,11 @@ namespace SceneUtil
     {
         const osg::ref_ptr<osg::Group> group(new osg::Group);
         DebugDraw debugDraw(*group, osg::Vec3f(0, 0, 0), 1.0f / settings.mRecastScaleFactor);
-        const auto normals = calculateNormals(recastMesh.getVertices(), recastMesh.getIndices());
+        const DetourNavigator::Mesh& mesh = recastMesh.getMesh();
+        const auto normals = calculateNormals(mesh.getVertices(), mesh.getIndices());
         const auto texScale = 1.0f / (settings.mCellSize * 10.0f);
-        duDebugDrawTriMesh(&debugDraw, recastMesh.getVertices().data(), recastMesh.getVerticesCount(),
-            recastMesh.getIndices().data(), normals.data(), recastMesh.getTrianglesCount(), nullptr, texScale);
+        duDebugDrawTriMesh(&debugDraw, mesh.getVertices().data(), mesh.getVerticesCount(),
+            mesh.getIndices().data(), normals.data(), mesh.getTrianglesCount(), nullptr, texScale);
         return group;
     }
 }

From d60edb36aadae13d007717e6e93332ba92e6d728 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 16 Jul 2021 20:19:11 +0200
Subject: [PATCH 1082/2859] Make RecastMesh independent from recast scale
 factor

To avoid scaling until it's required by delaying coordinates conversion until
navmesh generation.
---
 .../detournavigator/recastmeshbuilder.cpp     | 224 +++++++++---------
 components/detournavigator/makenavmesh.cpp    |  18 +-
 .../detournavigator/recastmeshbuilder.cpp     |  20 +-
 .../detournavigator/recastmeshbuilder.hpp     |   7 +-
 .../detournavigator/recastmeshmanager.cpp     |   6 +-
 components/sceneutil/recastmesh.cpp           |  18 +-
 6 files changed, 153 insertions(+), 140 deletions(-)

diff --git a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
index b11b10965b..0528205b58 100644
--- a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
+++ b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
@@ -1,7 +1,6 @@
 #include "operators.hpp"
 
 #include <components/detournavigator/recastmeshbuilder.hpp>
-#include <components/detournavigator/settings.hpp>
 #include <components/detournavigator/recastmesh.hpp>
 #include <components/detournavigator/exceptions.hpp>
 
@@ -33,14 +32,12 @@ namespace
 
     struct DetourNavigatorRecastMeshBuilderTest : Test
     {
-        Settings mSettings;
         TileBounds mBounds;
         const std::size_t mGeneration = 0;
         const std::size_t mRevision = 0;
 
         DetourNavigatorRecastMeshBuilderTest()
         {
-            mSettings.mRecastScaleFactor = 1.0f;
             mBounds.mMin = osg::Vec2f(-std::numeric_limits<float>::max() * std::numeric_limits<float>::epsilon(),
                                       -std::numeric_limits<float>::max() * std::numeric_limits<float>::epsilon());
             mBounds.mMax = osg::Vec2f(std::numeric_limits<float>::max() * std::numeric_limits<float>::epsilon(),
@@ -50,7 +47,7 @@ namespace
 
     TEST_F(DetourNavigatorRecastMeshBuilderTest, create_for_empty_should_return_empty)
     {
-        RecastMeshBuilder builder(mSettings, mBounds);
+        RecastMeshBuilder builder(mBounds);
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>());
         EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>());
@@ -63,13 +60,13 @@ namespace
         mesh.addTriangle(btVector3(-1, -1, 0), btVector3(-1, 1, 0), btVector3(1, -1, 0));
         btBvhTriangleMeshShape shape(&mesh, true);
 
-        RecastMeshBuilder builder(mSettings, mBounds);
+        RecastMeshBuilder builder(mBounds);
         builder.addObject(static_cast<const btCollisionShape&>(shape), btTransform::getIdentity(), AreaType_ground);
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
-            -1, 0, -1,
-            -1, 0, 1,
-            1, 0, -1,
+            -1, -1, 0,
+            -1, 1, 0,
+            1, -1, 0,
         })) << recastMesh->getMesh().getVertices();
         EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({2, 1, 0}));
         EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
@@ -80,7 +77,7 @@ namespace
         btTriangleMesh mesh;
         mesh.addTriangle(btVector3(-1, -1, 0), btVector3(-1, 1, 0), btVector3(1, -1, 0));
         btBvhTriangleMeshShape shape(&mesh, true);
-        RecastMeshBuilder builder(mSettings, mBounds);
+        RecastMeshBuilder builder(mBounds);
         builder.addObject(
             static_cast<const btCollisionShape&>(shape),
             btTransform(btMatrix3x3::getIdentity().scaled(btVector3(1, 2, 3)), btVector3(1, 2, 3)),
@@ -88,9 +85,9 @@ namespace
         );
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
-            0, 3, 0,
-            0, 3, 4,
-            2, 3, 0,
+            0, 0, 3,
+            0, 4, 3,
+            2, 0, 3,
         })) << recastMesh->getMesh().getVertices();
         EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({2, 1, 0}));
         EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
@@ -100,15 +97,15 @@ namespace
     {
         const std::array<btScalar, 4> heightfieldData {{0, 0, 0, 0}};
         btHeightfieldTerrainShape shape(2, 2, heightfieldData.data(), 1, 0, 0, 2, PHY_FLOAT, false);
-        RecastMeshBuilder builder(mSettings, mBounds);
+        RecastMeshBuilder builder(mBounds);
         builder.addObject(static_cast<const btCollisionShape&>(shape), btTransform::getIdentity(), AreaType_ground);
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
-            -0.5, 0, -0.5,
-            -0.5, 0, 0.5,
-            0.5, 0, -0.5,
-            0.5, 0, 0.5,
-        }));
+            -0.5, -0.5, 0,
+            -0.5, 0.5, 0,
+            0.5, -0.5, 0,
+            0.5, 0.5, 0,
+        })) << recastMesh->getMesh().getVertices();
         EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({0, 1, 2, 2, 1, 3}));
         EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_ground, AreaType_ground}));
     }
@@ -116,32 +113,32 @@ namespace
     TEST_F(DetourNavigatorRecastMeshBuilderTest, add_box_shape_should_produce_12_triangles)
     {
         btBoxShape shape(btVector3(1, 1, 2));
-        RecastMeshBuilder builder(mSettings, mBounds);
+        RecastMeshBuilder builder(mBounds);
         builder.addObject(static_cast<const btCollisionShape&>(shape), btTransform::getIdentity(), AreaType_ground);
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
-            -1, -2, -1,
-            -1, -2, 1,
-            -1, 2, -1,
-            -1, 2, 1,
-            1, -2, -1,
-            1, -2, 1,
-            1, 2, -1,
-            1, 2, 1,
+            -1, -1, -2,
+            -1, -1, 2,
+            -1, 1, -2,
+            -1, 1, 2,
+            1, -1, -2,
+            1, -1, 2,
+            1, 1, -2,
+            1, 1, 2,
         })) << recastMesh->getMesh().getVertices();
         EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({
-            0, 1, 3,
-            0, 2, 6,
-            0, 4, 5,
-            1, 5, 7,
-            2, 3, 7,
-            3, 2, 0,
-            4, 6, 7,
-            5, 1, 0,
-            6, 4, 0,
-            7, 3, 1,
-            7, 5, 4,
-            7, 6, 2,
+            0, 1, 5,
+            0, 2, 3,
+            0, 4, 6,
+            1, 3, 7,
+            2, 6, 7,
+            3, 1, 0,
+            4, 5, 7,
+            5, 4, 0,
+            6, 2, 0,
+            7, 3, 2,
+            7, 5, 1,
+            7, 6, 4,
         })) << recastMesh->getMesh().getIndices();
         EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>(12, AreaType_ground));
     }
@@ -159,7 +156,7 @@ namespace
         shape.addChildShape(btTransform::getIdentity(), &triangle1);
         shape.addChildShape(btTransform::getIdentity(), &box);
         shape.addChildShape(btTransform::getIdentity(), &triangle2);
-        RecastMeshBuilder builder(mSettings, mBounds);
+        RecastMeshBuilder builder(mBounds);
         builder.addObject(
             static_cast<const btCollisionShape&>(shape),
             btTransform::getIdentity(),
@@ -167,34 +164,34 @@ namespace
         );
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
-            -1, -2, -1,
-            -1, -2, 1,
-            -1, 0, -1,
-            -1, 0, 1,
-            -1, 2, -1,
-            -1, 2, 1,
-            1, -2, -1,
-            1, -2, 1,
-            1, 0, -1,
-            1, 0, 1,
-            1, 2, -1,
-            1, 2, 1,
+            -1, -1, -2,
+            -1, -1, 0,
+            -1, -1, 2,
+            -1, 1, -2,
+            -1, 1, 0,
+            -1, 1, 2,
+            1, -1, -2,
+            1, -1, 0,
+            1, -1, 2,
+            1, 1, -2,
+            1, 1, 0,
+            1, 1, 2,
         })) << recastMesh->getMesh().getVertices();
         EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({
-            0, 1, 5,
-            0, 4, 10,
-            0, 6, 7,
-            1, 7, 11,
-            4, 5, 11,
-            5, 4, 0,
-            6, 10, 11,
-            7, 1, 0,
-            8, 3, 2,
-            8, 3, 9,
-            10, 6, 0,
-            11, 5, 1,
-            11, 7, 6,
-            11, 10, 4,
+            0, 2, 8,
+            0, 3, 5,
+            0, 6, 9,
+            2, 5, 11,
+            3, 9, 11,
+            5, 2, 0,
+            6, 8, 11,
+            7, 4, 1,
+            7, 4, 10,
+            8, 6, 0,
+            9, 3, 0,
+            11, 5, 3,
+            11, 8, 2,
+            11, 9, 6,
         })) << recastMesh->getMesh().getIndices();
         EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>(14, AreaType_ground));
     }
@@ -206,7 +203,7 @@ namespace
         btBvhTriangleMeshShape triangle(&mesh, true);
         btCompoundShape shape;
         shape.addChildShape(btTransform::getIdentity(), &triangle);
-        RecastMeshBuilder builder(mSettings, mBounds);
+        RecastMeshBuilder builder(mBounds);
         builder.addObject(
             static_cast<const btCollisionShape&>(shape),
             btTransform(btMatrix3x3::getIdentity().scaled(btVector3(1, 2, 3)), btVector3(1, 2, 3)),
@@ -214,9 +211,9 @@ namespace
         );
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
-            0, 3, 0,
-            0, 3, 4,
-            2, 3, 0,
+            0, 0, 3,
+            0, 4, 3,
+            2, 0, 3,
         })) << recastMesh->getMesh().getVertices();
         EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({2, 1, 0}));
         EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
@@ -230,7 +227,7 @@ namespace
         btCompoundShape shape;
         shape.addChildShape(btTransform(btMatrix3x3::getIdentity().scaled(btVector3(1, 2, 3)), btVector3(1, 2, 3)),
                             &triangle);
-        RecastMeshBuilder builder(mSettings, mBounds);
+        RecastMeshBuilder builder(mBounds);
         builder.addObject(
             static_cast<const btCollisionShape&>(shape),
             btTransform(btMatrix3x3::getIdentity().scaled(btVector3(1, 2, 3)), btVector3(1, 2, 3)),
@@ -238,9 +235,9 @@ namespace
         );
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
-            1, 12, 2,
-            1, 12, 10,
-            3, 12, 2,
+            1, 2, 12,
+            1, 10, 12,
+            3, 2, 12,
         })) << recastMesh->getMesh().getVertices();
         EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({2, 1, 0}));
         EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
@@ -252,7 +249,7 @@ namespace
         mesh.addTriangle(btVector3(-1, -1, 0), btVector3(-1, 1, 0), btVector3(1, -1, 0));
         mesh.addTriangle(btVector3(-3, -3, 0), btVector3(-3, -2, 0), btVector3(-2, -3, 0));
         btBvhTriangleMeshShape shape(&mesh, true);
-        RecastMeshBuilder builder(mSettings, mBounds);
+        RecastMeshBuilder builder(mBounds);
         builder.addObject(
             static_cast<const btCollisionShape&>(shape),
             btTransform::getIdentity(),
@@ -260,12 +257,12 @@ namespace
         );
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
-            -3, 0, -3,
-            -3, 0, -2,
-            -2, 0, -3,
-            -1, 0, -1,
-            -1, 0, 1,
-            1, 0, -1,
+            -3, -3, 0,
+            -3, -2, 0,
+            -2, -3, 0,
+            -1, -1, 0,
+            -1, 1, 0,
+            1, -1, 0,
         })) << recastMesh->getMesh().getVertices();
         EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({2, 1, 0, 5, 4, 3}));
         EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>(2, AreaType_ground));
@@ -273,14 +270,13 @@ namespace
 
     TEST_F(DetourNavigatorRecastMeshBuilderTest, with_bounds_add_bhv_triangle_shape_should_filter_by_bounds)
     {
-        mSettings.mRecastScaleFactor = 0.1f;
-        mBounds.mMin = osg::Vec2f(-3, -3) * mSettings.mRecastScaleFactor;
-        mBounds.mMax = osg::Vec2f(-2, -2) * mSettings.mRecastScaleFactor;
+        mBounds.mMin = osg::Vec2f(-3, -3);
+        mBounds.mMax = osg::Vec2f(-2, -2);
         btTriangleMesh mesh;
         mesh.addTriangle(btVector3(-1, -1, 0), btVector3(-1, 1, 0), btVector3(1, -1, 0));
         mesh.addTriangle(btVector3(-3, -3, 0), btVector3(-3, -2, 0), btVector3(-2, -3, 0));
         btBvhTriangleMeshShape shape(&mesh, true);
-        RecastMeshBuilder builder(mSettings, mBounds);
+        RecastMeshBuilder builder(mBounds);
         builder.addObject(
             static_cast<const btCollisionShape&>(shape),
             btTransform::getIdentity(),
@@ -288,9 +284,9 @@ namespace
         );
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
-            -0.3f, 0, -0.3f,
-            -0.3f, 0, -0.2f,
-            -0.2f, 0, -0.3f,
+            -3, -3, 0,
+            -3, -2, 0,
+            -2, -3, 0,
         })) << recastMesh->getMesh().getVertices();
         EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({2, 1, 0}));
         EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
@@ -304,7 +300,7 @@ namespace
         mesh.addTriangle(btVector3(0, -1, -1), btVector3(0, -1, -1), btVector3(0, 1, -1));
         mesh.addTriangle(btVector3(0, -3, -3), btVector3(0, -3, -2), btVector3(0, -2, -3));
         btBvhTriangleMeshShape shape(&mesh, true);
-        RecastMeshBuilder builder(mSettings, mBounds);
+        RecastMeshBuilder builder(mBounds);
         builder.addObject(
             static_cast<const btCollisionShape&>(shape),
             btTransform(btQuaternion(btVector3(1, 0, 0),
@@ -313,11 +309,11 @@ namespace
         );
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_THAT(recastMesh->getMesh().getVertices(), Pointwise(FloatNear(1e-5), std::vector<float>({
-            0, -0.707106769084930419921875, -3.535533905029296875,
-            0, 4.44089209850062616169452667236328125e-16, -4.24264049530029296875,
-            0, 0.707106769084930419921875, -3.535533905029296875,
+            0, -4.24264049530029296875, 4.44089209850062616169452667236328125e-16,
+            0, -3.535533905029296875, -0.707106769084930419921875,
+            0, -3.535533905029296875, 0.707106769084930419921875,
         }))) << recastMesh->getMesh().getVertices();
-        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({0, 2, 1}));
+        EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({1, 2, 0}));
         EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
     }
 
@@ -329,7 +325,7 @@ namespace
         mesh.addTriangle(btVector3(-1, 0, -1), btVector3(-1, 0, 1), btVector3(1, 0, -1));
         mesh.addTriangle(btVector3(-3, 0, -3), btVector3(-3, 0, -2), btVector3(-2, 0, -3));
         btBvhTriangleMeshShape shape(&mesh, true);
-        RecastMeshBuilder builder(mSettings, mBounds);
+        RecastMeshBuilder builder(mBounds);
         builder.addObject(
             static_cast<const btCollisionShape&>(shape),
             btTransform(btQuaternion(btVector3(0, 1, 0),
@@ -338,9 +334,9 @@ namespace
         );
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_THAT(recastMesh->getMesh().getVertices(), Pointwise(FloatNear(1e-5), std::vector<float>({
-            -4.24264049530029296875, 4.44089209850062616169452667236328125e-16, 0,
-            -3.535533905029296875, -0.707106769084930419921875, 0,
-            -3.535533905029296875, 0.707106769084930419921875, 0,
+            -4.24264049530029296875, 0, 4.44089209850062616169452667236328125e-16,
+            -3.535533905029296875, 0, -0.707106769084930419921875,
+            -3.535533905029296875, 0, 0.707106769084930419921875,
         }))) << recastMesh->getMesh().getVertices();
         EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({1, 2, 0}));
         EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
@@ -354,7 +350,7 @@ namespace
         mesh.addTriangle(btVector3(-1, -1, 0), btVector3(-1, 1, 0), btVector3(1, -1, 0));
         mesh.addTriangle(btVector3(-3, -3, 0), btVector3(-3, -2, 0), btVector3(-2, -3, 0));
         btBvhTriangleMeshShape shape(&mesh, true);
-        RecastMeshBuilder builder(mSettings, mBounds);
+        RecastMeshBuilder builder(mBounds);
         builder.addObject(
             static_cast<const btCollisionShape&>(shape),
             btTransform(btQuaternion(btVector3(0, 0, 1),
@@ -363,9 +359,9 @@ namespace
         );
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_THAT(recastMesh->getMesh().getVertices(), Pointwise(FloatNear(1e-5), std::vector<float>({
-            -1.41421353816986083984375, 0, -1.1102230246251565404236316680908203125e-16,
-            1.1102230246251565404236316680908203125e-16, 0, -1.41421353816986083984375,
-            1.41421353816986083984375, 0, 1.1102230246251565404236316680908203125e-16,
+            -1.41421353816986083984375, -1.1102230246251565404236316680908203125e-16, 0,
+            1.1102230246251565404236316680908203125e-16, -1.41421353816986083984375, 0,
+            1.41421353816986083984375, 1.1102230246251565404236316680908203125e-16, 0,
         }))) << recastMesh->getMesh().getVertices();
         EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({2, 0, 1}));
         EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
@@ -379,7 +375,7 @@ namespace
         btTriangleMesh mesh2;
         mesh2.addTriangle(btVector3(-3, -3, 0), btVector3(-3, -2, 0), btVector3(-2, -3, 0));
         btBvhTriangleMeshShape shape2(&mesh2, true);
-        RecastMeshBuilder builder(mSettings, mBounds);
+        RecastMeshBuilder builder(mBounds);
         builder.addObject(
             static_cast<const btCollisionShape&>(shape1),
             btTransform::getIdentity(),
@@ -392,12 +388,12 @@ namespace
         );
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
-            -3, 0, -3,
-            -3, 0, -2,
-            -2, 0, -3,
-            -1, 0, -1,
-            -1, 0, 1,
-            1, 0, -1,
+            -3, -3, 0,
+            -3, -2, 0,
+            -2, -3, 0,
+            -1, -1, 0,
+            -1, 1, 0,
+            1, -1, 0,
         })) << recastMesh->getMesh().getVertices();
         EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({2, 1, 0, 5, 4, 3}));
         EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_null, AreaType_ground}));
@@ -405,7 +401,7 @@ namespace
 
     TEST_F(DetourNavigatorRecastMeshBuilderTest, add_water_then_get_water_should_return_it)
     {
-        RecastMeshBuilder builder(mSettings, mBounds);
+        RecastMeshBuilder builder(mBounds);
         builder.addWater(1000, btTransform(btMatrix3x3::getIdentity(), btVector3(100, 200, 300)));
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getWater(), std::vector<RecastMesh::Water>({
@@ -420,14 +416,14 @@ namespace
         mesh.addTriangle(btVector3(1, 1, 0), btVector3(-1, 1, 0), btVector3(1, -1, 0));
         btBvhTriangleMeshShape shape(&mesh, true);
 
-        RecastMeshBuilder builder(mSettings, mBounds);
+        RecastMeshBuilder builder(mBounds);
         builder.addObject(static_cast<const btCollisionShape&>(shape), btTransform::getIdentity(), AreaType_ground);
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
-            -1, 0, -1,
-            -1, 0, 1,
-            1, 0, -1,
-            1, 0, 1,
+            -1, -1, 0,
+            -1, 1, 0,
+            1, -1, 0,
+            1, 1, 0,
         })) << recastMesh->getMesh().getVertices();
         EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({2, 1, 0, 2, 1, 3}));
         EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_ground, AreaType_ground}));
diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index 7145bebae7..0824e9cb86 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -157,15 +157,23 @@ namespace
             throw NavigatorException("Failed to create heightfield for navmesh");
     }
 
-    bool rasterizeTriangles(rcContext& context, const Mesh& mesh, const rcConfig& config,
+    bool rasterizeTriangles(rcContext& context, const Mesh& mesh, const Settings& settings, const rcConfig& config,
         rcHeightfield& solid)
     {
         std::vector<unsigned char> areas(mesh.getAreaTypes().begin(), mesh.getAreaTypes().end());
+        std::vector<float> vertices = mesh.getVertices();
+
+        for (std::size_t i = 0; i < vertices.size(); i += 3)
+        {
+            for (std::size_t j = 0; j < 3; ++j)
+                vertices[i + j] = toNavMeshCoordinates(settings, vertices[i + j]);
+            std::swap(vertices[i + 1], vertices[i + 2]);
+        }
 
         rcClearUnwalkableTriangles(
             &context,
             config.walkableSlopeAngle,
-            mesh.getVertices().data(),
+            vertices.data(),
             static_cast<int>(mesh.getVerticesCount()),
             mesh.getIndices().data(),
             static_cast<int>(areas.size()),
@@ -174,7 +182,7 @@ namespace
 
         return rcRasterizeTriangles(
             &context,
-            mesh.getVertices().data(),
+            vertices.data(),
             static_cast<int>(mesh.getVerticesCount()),
             mesh.getIndices().data(),
             areas.data(),
@@ -242,7 +250,7 @@ namespace
     bool rasterizeTriangles(rcContext& context, const osg::Vec3f& agentHalfExtents, const RecastMesh& recastMesh,
         const rcConfig& config, const Settings& settings, rcHeightfield& solid)
     {
-        if (!rasterizeTriangles(context, recastMesh.getMesh(), config, solid))
+        if (!rasterizeTriangles(context, recastMesh.getMesh(), settings, config, solid))
             return false;
 
         rasterizeWaterTriangles(context, agentHalfExtents, recastMesh, settings, config, solid);
@@ -491,6 +499,8 @@ namespace DetourNavigator
         }
 
         auto recastMeshBounds = recastMesh->getBounds();
+        recastMeshBounds.mMin = toNavMeshCoordinates(settings, recastMeshBounds.mMin);
+        recastMeshBounds.mMax = toNavMeshCoordinates(settings, recastMeshBounds.mMax);
 
         for (const auto& water : recastMesh->getWater())
         {
diff --git a/components/detournavigator/recastmeshbuilder.cpp b/components/detournavigator/recastmeshbuilder.cpp
index 8de82bee16..81fb6f21cf 100644
--- a/components/detournavigator/recastmeshbuilder.cpp
+++ b/components/detournavigator/recastmeshbuilder.cpp
@@ -1,12 +1,11 @@
 #include "recastmeshbuilder.hpp"
 #include "debug.hpp"
-#include "settings.hpp"
-#include "settingsutils.hpp"
 #include "exceptions.hpp"
 
 #include <components/bullethelpers/transformboundingbox.hpp>
 #include <components/bullethelpers/processtrianglecallback.hpp>
 #include <components/misc/convert.hpp>
+#include <components/debug/debuglog.hpp>
 
 #include <BulletCollision/CollisionShapes/btBoxShape.h>
 #include <BulletCollision/CollisionShapes/btCompoundShape.h>
@@ -26,12 +25,12 @@ namespace DetourNavigator
 
     namespace
     {
-        RecastMeshTriangle makeRecastMeshTriangle(const btVector3* vertices, const AreaType areaType, const Settings& settings)
+        RecastMeshTriangle makeRecastMeshTriangle(const btVector3* vertices, const AreaType areaType)
         {
             RecastMeshTriangle result;
             result.mAreaType = areaType;
             for (std::size_t i = 0; i < 3; ++i)
-                result.mVertices[i] = toNavMeshCoordinates(settings, Misc::Convert::makeOsgVec3f(vertices[i]));
+                result.mVertices[i] = Misc::Convert::makeOsgVec3f(vertices[i]);
             return result;
         }
     }
@@ -81,12 +80,9 @@ namespace DetourNavigator
         return Mesh(std::move(indices), std::move(vertices), std::move(areaTypes));
     }
 
-    RecastMeshBuilder::RecastMeshBuilder(const Settings& settings, const TileBounds& bounds)
-        : mSettings(settings)
-        , mBounds(bounds)
+    RecastMeshBuilder::RecastMeshBuilder(const TileBounds& bounds) noexcept
+        : mBounds(bounds)
     {
-        mBounds.mMin /= mSettings.get().mRecastScaleFactor;
-        mBounds.mMax /= mSettings.get().mRecastScaleFactor;
     }
 
     void RecastMeshBuilder::addObject(const btCollisionShape& shape, const btTransform& transform,
@@ -117,7 +113,7 @@ namespace DetourNavigator
     {
         return addObject(shape, transform, makeProcessTriangleCallback([&] (btVector3* vertices, int, int)
         {
-            RecastMeshTriangle triangle = makeRecastMeshTriangle(vertices, areaType, mSettings);
+            RecastMeshTriangle triangle = makeRecastMeshTriangle(vertices, areaType);
             std::reverse(triangle.mVertices.begin(), triangle.mVertices.end());
             mTriangles.emplace_back(triangle);
         }));
@@ -128,7 +124,7 @@ namespace DetourNavigator
     {
         return addObject(shape, transform, makeProcessTriangleCallback([&] (btVector3* vertices, int, int)
         {
-            mTriangles.emplace_back(makeRecastMeshTriangle(vertices, areaType, mSettings));
+            mTriangles.emplace_back(makeRecastMeshTriangle(vertices, areaType));
         }));
     }
 
@@ -158,7 +154,7 @@ namespace DetourNavigator
                 shape.getVertex(indices[i + j], position);
                 vertices[j] = transform(position);
             }
-            mTriangles.emplace_back(makeRecastMeshTriangle(vertices.data(), areaType, mSettings));
+            mTriangles.emplace_back(makeRecastMeshTriangle(vertices.data(), areaType));
         }
     }
 
diff --git a/components/detournavigator/recastmeshbuilder.hpp b/components/detournavigator/recastmeshbuilder.hpp
index 1d163a406f..66d9128bdd 100644
--- a/components/detournavigator/recastmeshbuilder.hpp
+++ b/components/detournavigator/recastmeshbuilder.hpp
@@ -23,8 +23,6 @@ class btTriangleCallback;
 
 namespace DetourNavigator
 {
-    struct Settings;
-
     struct RecastMeshTriangle
     {
         AreaType mAreaType;
@@ -39,7 +37,7 @@ namespace DetourNavigator
     class RecastMeshBuilder
     {
     public:
-        RecastMeshBuilder(const Settings& settings, const TileBounds& bounds);
+        explicit RecastMeshBuilder(const TileBounds& bounds) noexcept;
 
         void addObject(const btCollisionShape& shape, const btTransform& transform, const AreaType areaType);
 
@@ -56,8 +54,7 @@ namespace DetourNavigator
         std::shared_ptr<RecastMesh> create(std::size_t generation, std::size_t revision) &&;
 
     private:
-        std::reference_wrapper<const Settings> mSettings;
-        TileBounds mBounds;
+        const TileBounds mBounds;
         std::vector<RecastMeshTriangle> mTriangles;
         std::vector<RecastMesh::Water> mWater;
 
diff --git a/components/detournavigator/recastmeshmanager.cpp b/components/detournavigator/recastmeshmanager.cpp
index ed77b4cef4..69f16df509 100644
--- a/components/detournavigator/recastmeshmanager.cpp
+++ b/components/detournavigator/recastmeshmanager.cpp
@@ -1,5 +1,6 @@
 #include "recastmeshmanager.hpp"
 #include "recastmeshbuilder.hpp"
+#include "settings.hpp"
 
 namespace DetourNavigator
 {
@@ -68,7 +69,10 @@ namespace DetourNavigator
 
     std::shared_ptr<RecastMesh> RecastMeshManager::getMesh()
     {
-        RecastMeshBuilder builder(mSettings, mTileBounds);
+        TileBounds tileBounds = mTileBounds;
+        tileBounds.mMin /= mSettings.mRecastScaleFactor;
+        tileBounds.mMax /= mSettings.mRecastScaleFactor;
+        RecastMeshBuilder builder(tileBounds);
         for (const auto& [k, v] : mWater)
             builder.addWater(v.mCellSize, v.mTransform);
         for (const auto& [k, object] : mObjects)
diff --git a/components/sceneutil/recastmesh.cpp b/components/sceneutil/recastmesh.cpp
index ce92b16a0e..556fc3f3b5 100644
--- a/components/sceneutil/recastmesh.cpp
+++ b/components/sceneutil/recastmesh.cpp
@@ -8,6 +8,9 @@
 
 #include <osg/Group>
 
+#include <algorithm>
+#include <vector>
+
 namespace
 {
     std::vector<float> calculateNormals(const std::vector<float>& vertices, const std::vector<int>& indices)
@@ -37,13 +40,20 @@ namespace SceneUtil
     osg::ref_ptr<osg::Group> createRecastMeshGroup(const DetourNavigator::RecastMesh& recastMesh,
         const DetourNavigator::Settings& settings)
     {
+        using namespace DetourNavigator;
+
         const osg::ref_ptr<osg::Group> group(new osg::Group);
-        DebugDraw debugDraw(*group, osg::Vec3f(0, 0, 0), 1.0f / settings.mRecastScaleFactor);
+        DebugDraw debugDraw(*group, osg::Vec3f(0, 0, 0), 1.0f);
         const DetourNavigator::Mesh& mesh = recastMesh.getMesh();
-        const auto normals = calculateNormals(mesh.getVertices(), mesh.getIndices());
+        std::vector<float> vertices = mesh.getVertices();
+
+        for (std::size_t i = 0; i < vertices.size(); i += 3)
+            std::swap(vertices[i + 1], vertices[i + 2]);
+
+        const auto normals = calculateNormals(vertices, mesh.getIndices());
         const auto texScale = 1.0f / (settings.mCellSize * 10.0f);
-        duDebugDrawTriMesh(&debugDraw, mesh.getVertices().data(), mesh.getVerticesCount(),
-            mesh.getIndices().data(), normals.data(), mesh.getTrianglesCount(), nullptr, texScale);
+        duDebugDrawTriMesh(&debugDraw, vertices.data(), static_cast<int>(vertices.size() / 3),
+            mesh.getIndices().data(), normals.data(), static_cast<int>(mesh.getIndices().size() / 3), nullptr, texScale);
         return group;
     }
 }

From a1549321d759510ac3a73164b7bb10e376ea9593 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 14 Jul 2021 17:30:47 +0200
Subject: [PATCH 1083/2859] Move Water struct out of RecastMesh class

---
 .../detournavigator/navmeshtilescache.cpp     |  4 +--
 .../detournavigator/navmeshtilescache.cpp     | 28 +++++++++----------
 .../detournavigator/recastmeshbuilder.cpp     |  6 ++--
 components/detournavigator/makenavmesh.cpp    |  2 +-
 .../detournavigator/navmeshtilescache.hpp     |  2 +-
 components/detournavigator/recastmesh.hpp     | 16 +++++------
 .../detournavigator/recastmeshbuilder.cpp     |  2 +-
 .../detournavigator/recastmeshbuilder.hpp     |  2 +-
 8 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/apps/benchmarks/detournavigator/navmeshtilescache.cpp b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
index 030162ab59..1d7358fa02 100644
--- a/apps/benchmarks/detournavigator/navmeshtilescache.cpp
+++ b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
@@ -83,7 +83,7 @@ namespace
         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)};
+            return Water {1, btTransform(btMatrix3x3::getIdentity(), shift)};
         });
     }
 
@@ -108,7 +108,7 @@ namespace
         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);
         Mesh mesh = generateMesh(triangles, random);
-        std::vector<RecastMesh::Water> water;
+        std::vector<Water> water;
         generateWater(std::back_inserter(water), 2, random);
         RecastMesh recastMesh(generation, revision, std::move(mesh), std::move(water));
         return Key {agentHalfExtents, tilePosition, std::move(recastMesh)};
diff --git a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
index fa607db371..137da9cd88 100644
--- a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
+++ b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
@@ -143,12 +143,12 @@ namespace
         const std::size_t mGeneration = 0;
         const std::size_t mRevision = 0;
         const Mesh mMesh {makeMesh()};
-        const std::vector<RecastMesh::Water> mWater {};
+        const std::vector<Water> mWater {};
         const RecastMesh mRecastMesh {mGeneration, mRevision, mMesh, mWater};
         std::unique_ptr<PreparedNavMeshData> mPreparedNavMeshData {makePeparedNavMeshData(3)};
 
         const std::size_t mRecastMeshSize = sizeof(mRecastMesh) + getSize(mRecastMesh);
-        const std::size_t mRecastMeshWithWaterSize = mRecastMeshSize + sizeof(RecastMesh::Water);
+        const std::size_t mRecastMeshWithWaterSize = mRecastMeshSize + sizeof(Water);
         const std::size_t mPreparedNavMeshDataSize = sizeof(*mPreparedNavMeshData) + getSize(*mPreparedNavMeshData);
     };
 
@@ -231,7 +231,7 @@ namespace
     {
         const std::size_t maxSize = 1;
         NavMeshTilesCache cache(maxSize);
-        const std::vector<RecastMesh::Water> water {1, RecastMesh::Water {1, btTransform::getIdentity()}};
+        const std::vector<Water> water {1, Water {1, btTransform::getIdentity()}};
         const RecastMesh unexistentRecastMesh {mGeneration, mRevision, mMesh, water};
 
         cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
@@ -243,7 +243,7 @@ namespace
         const std::size_t maxSize = mRecastMeshWithWaterSize + mPreparedNavMeshDataSize;
         NavMeshTilesCache cache(maxSize);
 
-        const std::vector<RecastMesh::Water> water {1, RecastMesh::Water {1, btTransform::getIdentity()}};
+        const std::vector<Water> water {1, Water {1, btTransform::getIdentity()}};
         const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, water};
         auto anotherPreparedNavMeshData = makePeparedNavMeshData(3);
         const auto copy = clone(*anotherPreparedNavMeshData);
@@ -261,7 +261,7 @@ namespace
         const std::size_t maxSize = mRecastMeshWithWaterSize + mPreparedNavMeshDataSize;
         NavMeshTilesCache cache(maxSize);
 
-        const std::vector<RecastMesh::Water> water {1, RecastMesh::Water {1, btTransform::getIdentity()}};
+        const std::vector<Water> water {1, Water {1, btTransform::getIdentity()}};
         const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, water};
         auto anotherPreparedNavMeshData = makePeparedNavMeshData(3);
 
@@ -277,11 +277,11 @@ namespace
         NavMeshTilesCache cache(maxSize);
         const auto copy = clone(*mPreparedNavMeshData);
 
-        const std::vector<RecastMesh::Water> leastRecentlySetWater {1, RecastMesh::Water {1, btTransform::getIdentity()}};
+        const std::vector<Water> leastRecentlySetWater {1, Water {1, btTransform::getIdentity()}};
         const RecastMesh leastRecentlySetRecastMesh {mGeneration, mRevision, mMesh, leastRecentlySetWater};
         auto leastRecentlySetData = makePeparedNavMeshData(3);
 
-        const std::vector<RecastMesh::Water> mostRecentlySetWater {1, RecastMesh::Water {2, btTransform::getIdentity()}};
+        const std::vector<Water> mostRecentlySetWater {1, Water {2, btTransform::getIdentity()}};
         const RecastMesh mostRecentlySetRecastMesh {mGeneration, mRevision, mMesh, mostRecentlySetWater};
         auto mostRecentlySetData = makePeparedNavMeshData(3);
 
@@ -303,12 +303,12 @@ namespace
         const std::size_t maxSize = 2 * (mRecastMeshWithWaterSize + mPreparedNavMeshDataSize);
         NavMeshTilesCache cache(maxSize);
 
-        const std::vector<RecastMesh::Water> leastRecentlyUsedWater {1, RecastMesh::Water {1, btTransform::getIdentity()}};
+        const std::vector<Water> leastRecentlyUsedWater {1, Water {1, btTransform::getIdentity()}};
         const RecastMesh leastRecentlyUsedRecastMesh {mGeneration, mRevision, mMesh, leastRecentlyUsedWater};
         auto leastRecentlyUsedData = makePeparedNavMeshData(3);
         const auto leastRecentlyUsedCopy = clone(*leastRecentlyUsedData);
 
-        const std::vector<RecastMesh::Water> mostRecentlyUsedWater {1, RecastMesh::Water {2, btTransform::getIdentity()}};
+        const std::vector<Water> mostRecentlyUsedWater {1, Water {2, btTransform::getIdentity()}};
         const RecastMesh mostRecentlyUsedRecastMesh {mGeneration, mRevision, mMesh, mostRecentlyUsedWater};
         auto mostRecentlyUsedData = makePeparedNavMeshData(3);
         const auto mostRecentlyUsedCopy = clone(*mostRecentlyUsedData);
@@ -342,7 +342,7 @@ namespace
         const std::size_t maxSize = 2 * (mRecastMeshWithWaterSize + mPreparedNavMeshDataSize);
         NavMeshTilesCache cache(maxSize);
 
-        const std::vector<RecastMesh::Water> water {1, RecastMesh::Water {1, btTransform::getIdentity()}};
+        const std::vector<Water> water {1, Water {1, btTransform::getIdentity()}};
         const RecastMesh tooLargeRecastMesh {mGeneration, mRevision, mMesh, water};
         auto tooLargeData = makePeparedNavMeshData(10);
 
@@ -356,11 +356,11 @@ namespace
         const std::size_t maxSize = 2 * (mRecastMeshWithWaterSize + mPreparedNavMeshDataSize);
         NavMeshTilesCache cache(maxSize);
 
-        const std::vector<RecastMesh::Water> anotherWater {1, RecastMesh::Water {1, btTransform::getIdentity()}};
+        const std::vector<Water> anotherWater {1, Water {1, btTransform::getIdentity()}};
         const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, anotherWater};
         auto anotherData = makePeparedNavMeshData(3);
 
-        const std::vector<RecastMesh::Water> tooLargeWater {1, RecastMesh::Water {2, btTransform::getIdentity()}};
+        const std::vector<Water> tooLargeWater {1, Water {2, btTransform::getIdentity()}};
         const RecastMesh tooLargeRecastMesh {mGeneration, mRevision, mMesh, tooLargeWater};
         auto tooLargeData = makePeparedNavMeshData(10);
 
@@ -380,7 +380,7 @@ namespace
         const std::size_t maxSize = mRecastMeshWithWaterSize + mPreparedNavMeshDataSize;
         NavMeshTilesCache cache(maxSize);
 
-        const std::vector<RecastMesh::Water> water {1, RecastMesh::Water {1, btTransform::getIdentity()}};
+        const std::vector<Water> water {1, Water {1, btTransform::getIdentity()}};
         const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, water};
         auto anotherData = makePeparedNavMeshData(3);
 
@@ -399,7 +399,7 @@ namespace
         const std::size_t maxSize = mRecastMeshWithWaterSize + mPreparedNavMeshDataSize;
         NavMeshTilesCache cache(maxSize);
 
-        const std::vector<RecastMesh::Water> water {1, RecastMesh::Water {1, btTransform::getIdentity()}};
+        const std::vector<Water> water {1, Water {1, btTransform::getIdentity()}};
         const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, water};
         auto anotherData = makePeparedNavMeshData(3);
 
diff --git a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
index 0528205b58..56f94701f0 100644
--- a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
+++ b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
@@ -19,7 +19,7 @@
 
 namespace DetourNavigator
 {
-    static inline bool operator ==(const RecastMesh::Water& lhs, const RecastMesh::Water& rhs)
+    static inline bool operator ==(const Water& lhs, const Water& rhs)
     {
         return lhs.mCellSize == rhs.mCellSize && lhs.mTransform == rhs.mTransform;
     }
@@ -404,8 +404,8 @@ namespace
         RecastMeshBuilder builder(mBounds);
         builder.addWater(1000, btTransform(btMatrix3x3::getIdentity(), btVector3(100, 200, 300)));
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
-        EXPECT_EQ(recastMesh->getWater(), std::vector<RecastMesh::Water>({
-            RecastMesh::Water {1000, btTransform(btMatrix3x3::getIdentity(), btVector3(100, 200, 300))}
+        EXPECT_EQ(recastMesh->getWater(), std::vector<Water>({
+            Water {1000, btTransform(btMatrix3x3::getIdentity(), btVector3(100, 200, 300))}
         }));
     }
 
diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index 0824e9cb86..1e2d4d5167 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -34,7 +34,7 @@ namespace
         osg::Vec3f mMax;
     };
 
-    WaterBounds getWaterBounds(const RecastMesh::Water& water, const Settings& settings,
+    WaterBounds getWaterBounds(const Water& water, const Settings& settings,
         const osg::Vec3f& agentHalfExtents)
     {
         if (water.mCellSize == std::numeric_limits<int>::max())
diff --git a/components/detournavigator/navmeshtilescache.hpp b/components/detournavigator/navmeshtilescache.hpp
index b6b9391e66..974420c158 100644
--- a/components/detournavigator/navmeshtilescache.hpp
+++ b/components/detournavigator/navmeshtilescache.hpp
@@ -23,7 +23,7 @@ namespace DetourNavigator
     struct RecastMeshData
     {
         Mesh mMesh;
-        std::vector<RecastMesh::Water> mWater;
+        std::vector<Water> mWater;
     };
 
     inline bool operator <(const RecastMeshData& lhs, const RecastMeshData& rhs)
diff --git a/components/detournavigator/recastmesh.hpp b/components/detournavigator/recastmesh.hpp
index 9989bab061..c70405c85c 100644
--- a/components/detournavigator/recastmesh.hpp
+++ b/components/detournavigator/recastmesh.hpp
@@ -45,15 +45,15 @@ namespace DetourNavigator
         }
     };
 
+    struct Water
+    {
+        int mCellSize;
+        btTransform mTransform;
+    };
+
     class RecastMesh
     {
     public:
-        struct Water
-        {
-            int mCellSize;
-            btTransform mTransform;
-        };
-
         RecastMesh(std::size_t generation, std::size_t revision, Mesh mesh, std::vector<Water> water);
 
         std::size_t getGeneration() const
@@ -92,11 +92,11 @@ namespace DetourNavigator
 
         friend inline std::size_t getSize(const RecastMesh& value) noexcept
         {
-            return getSize(value.mMesh) + value.mWater.size() * sizeof(RecastMesh::Water);
+            return getSize(value.mMesh) + value.mWater.size() * sizeof(Water);
         }
     };
 
-    inline bool operator<(const RecastMesh::Water& lhs, const RecastMesh::Water& rhs) noexcept
+    inline bool operator<(const Water& lhs, const Water& rhs) noexcept
     {
         return std::tie(lhs.mCellSize, lhs.mTransform) < std::tie(rhs.mCellSize, rhs.mTransform);
     }
diff --git a/components/detournavigator/recastmeshbuilder.cpp b/components/detournavigator/recastmeshbuilder.cpp
index 81fb6f21cf..ad896c2a57 100644
--- a/components/detournavigator/recastmeshbuilder.cpp
+++ b/components/detournavigator/recastmeshbuilder.cpp
@@ -160,7 +160,7 @@ namespace DetourNavigator
 
     void RecastMeshBuilder::addWater(const int cellSize, const btTransform& transform)
     {
-        mWater.push_back(RecastMesh::Water {cellSize, transform});
+        mWater.push_back(Water {cellSize, transform});
     }
 
     std::shared_ptr<RecastMesh> RecastMeshBuilder::create(std::size_t generation, std::size_t revision) &&
diff --git a/components/detournavigator/recastmeshbuilder.hpp b/components/detournavigator/recastmeshbuilder.hpp
index 66d9128bdd..2692e8f486 100644
--- a/components/detournavigator/recastmeshbuilder.hpp
+++ b/components/detournavigator/recastmeshbuilder.hpp
@@ -56,7 +56,7 @@ namespace DetourNavigator
     private:
         const TileBounds mBounds;
         std::vector<RecastMeshTriangle> mTriangles;
-        std::vector<RecastMesh::Water> mWater;
+        std::vector<Water> mWater;
 
         void addObject(const btConcaveShape& shape, const btTransform& transform, btTriangleCallback&& callback);
 

From da4ec31cd86b1765690ba0aa973fd52280a9b875 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 14 Jul 2021 21:39:39 +0200
Subject: [PATCH 1084/2859] Remove redundant RecastMeshManager::Water

---
 components/detournavigator/cachedrecastmeshmanager.cpp     | 2 +-
 components/detournavigator/cachedrecastmeshmanager.hpp     | 2 +-
 components/detournavigator/recastmeshmanager.cpp           | 2 +-
 components/detournavigator/recastmeshmanager.hpp           | 7 +------
 components/detournavigator/tilecachedrecastmeshmanager.cpp | 4 ++--
 components/detournavigator/tilecachedrecastmeshmanager.hpp | 2 +-
 6 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/components/detournavigator/cachedrecastmeshmanager.cpp b/components/detournavigator/cachedrecastmeshmanager.cpp
index 4666b66a83..38bc954342 100644
--- a/components/detournavigator/cachedrecastmeshmanager.cpp
+++ b/components/detournavigator/cachedrecastmeshmanager.cpp
@@ -42,7 +42,7 @@ namespace DetourNavigator
         return true;
     }
 
-    std::optional<RecastMeshManager::Water> CachedRecastMeshManager::removeWater(const osg::Vec2i& cellPosition)
+    std::optional<Water> CachedRecastMeshManager::removeWater(const osg::Vec2i& cellPosition)
     {
         const auto water = mImpl.removeWater(cellPosition);
         if (water)
diff --git a/components/detournavigator/cachedrecastmeshmanager.hpp b/components/detournavigator/cachedrecastmeshmanager.hpp
index 96604c3628..e4a262bc6a 100644
--- a/components/detournavigator/cachedrecastmeshmanager.hpp
+++ b/components/detournavigator/cachedrecastmeshmanager.hpp
@@ -18,7 +18,7 @@ namespace DetourNavigator
 
         bool addWater(const osg::Vec2i& cellPosition, const int cellSize, const btTransform& transform);
 
-        std::optional<RecastMeshManager::Water> removeWater(const osg::Vec2i& cellPosition);
+        std::optional<Water> removeWater(const osg::Vec2i& cellPosition);
 
         std::optional<RemovedRecastMeshObject> removeObject(const ObjectId id);
 
diff --git a/components/detournavigator/recastmeshmanager.cpp b/components/detournavigator/recastmeshmanager.cpp
index 69f16df509..267c3ee9a3 100644
--- a/components/detournavigator/recastmeshmanager.cpp
+++ b/components/detournavigator/recastmeshmanager.cpp
@@ -56,7 +56,7 @@ namespace DetourNavigator
         return true;
     }
 
-    std::optional<RecastMeshManager::Water> RecastMeshManager::removeWater(const osg::Vec2i& cellPosition)
+    std::optional<Water> RecastMeshManager::removeWater(const osg::Vec2i& cellPosition)
     {
         const auto water = mWater.find(cellPosition);
         if (water == mWater.end())
diff --git a/components/detournavigator/recastmeshmanager.hpp b/components/detournavigator/recastmeshmanager.hpp
index d67f287dfc..a1d6123062 100644
--- a/components/detournavigator/recastmeshmanager.hpp
+++ b/components/detournavigator/recastmeshmanager.hpp
@@ -4,6 +4,7 @@
 #include "oscillatingrecastmeshobject.hpp"
 #include "objectid.hpp"
 #include "version.hpp"
+#include "recastmesh.hpp"
 
 #include <LinearMath/btTransform.h>
 
@@ -29,12 +30,6 @@ namespace DetourNavigator
     class RecastMeshManager
     {
     public:
-        struct Water
-        {
-            int mCellSize = 0;
-            btTransform mTransform;
-        };
-
         RecastMeshManager(const Settings& settings, const TileBounds& bounds, std::size_t generation);
 
         bool addObject(const ObjectId id, const btCollisionShape& shape, const btTransform& transform,
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.cpp b/components/detournavigator/tilecachedrecastmeshmanager.cpp
index 42ae93e806..c19e43c498 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -102,12 +102,12 @@ namespace DetourNavigator
         return result;
     }
 
-    std::optional<RecastMeshManager::Water> TileCachedRecastMeshManager::removeWater(const osg::Vec2i& cellPosition)
+    std::optional<Water> TileCachedRecastMeshManager::removeWater(const osg::Vec2i& cellPosition)
     {
         const auto object = mWaterTilesPositions.find(cellPosition);
         if (object == mWaterTilesPositions.end())
             return std::nullopt;
-        std::optional<RecastMeshManager::Water> result;
+        std::optional<Water> result;
         for (const auto& tilePosition : object->second)
         {
             const auto tiles = mTiles.lock();
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.hpp b/components/detournavigator/tilecachedrecastmeshmanager.hpp
index 23ecc77634..087e3e1f36 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.hpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.hpp
@@ -78,7 +78,7 @@ namespace DetourNavigator
 
         bool addWater(const osg::Vec2i& cellPosition, const int cellSize, const btTransform& transform);
 
-        std::optional<RecastMeshManager::Water> removeWater(const osg::Vec2i& cellPosition);
+        std::optional<Water> removeWater(const osg::Vec2i& cellPosition);
 
         std::shared_ptr<RecastMesh> getMesh(const TilePosition& tilePosition);
 

From 753767d6d96141796bd8acc3868a4c0b578fe40f Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 14 Jul 2021 21:54:41 +0200
Subject: [PATCH 1085/2859] Store only water shift

Rotation is not used.
---
 .../detournavigator/navmeshtilescache.cpp     |  6 ++--
 apps/openmw/mwworld/scene.cpp                 |  9 ++++--
 .../detournavigator/navigator.cpp             |  8 +++---
 .../detournavigator/navmeshtilescache.cpp     | 28 +++++++++----------
 .../detournavigator/recastmeshbuilder.cpp     |  6 ++--
 .../tilecachedrecastmeshmanager.cpp           | 12 ++++----
 .../cachedrecastmeshmanager.cpp               |  4 +--
 .../cachedrecastmeshmanager.hpp               |  2 +-
 .../detournavigator/gettilespositions.hpp     |  3 +-
 components/detournavigator/makenavmesh.cpp    |  4 +--
 components/detournavigator/navigator.hpp      |  6 ++--
 components/detournavigator/navigatorimpl.cpp  |  6 ++--
 components/detournavigator/navigatorimpl.hpp  |  3 +-
 components/detournavigator/navigatorstub.hpp  |  3 +-
 components/detournavigator/navmeshmanager.cpp | 12 ++++----
 components/detournavigator/navmeshmanager.hpp |  4 +--
 components/detournavigator/recastmesh.hpp     |  8 +++---
 .../detournavigator/recastmeshbuilder.cpp     |  4 +--
 .../detournavigator/recastmeshbuilder.hpp     |  2 +-
 .../detournavigator/recastmeshmanager.cpp     |  7 ++---
 .../detournavigator/recastmeshmanager.hpp     |  2 +-
 components/detournavigator/settingsutils.hpp  |  6 ++--
 .../tilecachedrecastmeshmanager.cpp           |  8 +++---
 .../tilecachedrecastmeshmanager.hpp           |  2 +-
 24 files changed, 77 insertions(+), 78 deletions(-)

diff --git a/apps/benchmarks/detournavigator/navmeshtilescache.cpp b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
index 1d7358fa02..c6e6ecbdbc 100644
--- a/apps/benchmarks/detournavigator/navmeshtilescache.cpp
+++ b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
@@ -80,10 +80,10 @@ namespace
     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::uniform_real_distribution<float> distribution(0.0, 1.0);
         std::generate_n(out, count, [&] {
-            const btVector3 shift(distribution(random), distribution(random), distribution(random));
-            return Water {1, btTransform(btMatrix3x3::getIdentity(), shift)};
+            const osg::Vec3f shift(distribution(random), distribution(random), distribution(random));
+            return Water {1, shift};
         });
     }
 
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index f7c9b43fb6..61ef3e1538 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -470,13 +470,18 @@ namespace MWWorld
                 if (cell->getCell()->isExterior())
                 {
                     if (const auto heightField = mPhysics->getHeightField(cellX, cellY))
+                    {
+                        const btTransform& transform =heightField->getCollisionObject()->getWorldTransform();
                         mNavigator.addWater(osg::Vec2i(cellX, cellY), ESM::Land::REAL_SIZE,
-                                cell->getWaterLevel(), heightField->getCollisionObject()->getWorldTransform());
+                                            osg::Vec3f(static_cast<float>(transform.getOrigin().x()),
+                                                       static_cast<float>(transform.getOrigin().y()),
+                                                       waterLevel));
+                    }
                 }
                 else
                 {
                     mNavigator.addWater(osg::Vec2i(cellX, cellY), std::numeric_limits<int>::max(),
-                            cell->getWaterLevel(), btTransform::getIdentity());
+                                        osg::Vec3f(0, 0, waterLevel));
                 }
             }
             else
diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index b0fec1a1a3..b815c50bbe 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -452,7 +452,7 @@ namespace
         shape.setLocalScaling(btVector3(128, 128, 1));
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addWater(osg::Vec2i(0, 0), 128 * 4, 300, btTransform::getIdentity());
+        mNavigator->addWater(osg::Vec2i(0, 0), 128 * 4, osg::Vec3f(0, 0, 300));
         mNavigator->addObject(ObjectId(&shape), shape, btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
@@ -499,7 +499,7 @@ namespace
         shape.setLocalScaling(btVector3(128, 128, 1));
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addWater(osg::Vec2i(0, 0), 128 * 4, -25, btTransform::getIdentity());
+        mNavigator->addWater(osg::Vec2i(0, 0), 128 * 4, osg::Vec3f(0, 0, -25));
         mNavigator->addObject(ObjectId(&shape), shape, btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
@@ -546,7 +546,7 @@ namespace
 
         mNavigator->addAgent(mAgentHalfExtents);
         mNavigator->addObject(ObjectId(&shape), shape, btTransform::getIdentity());
-        mNavigator->addWater(osg::Vec2i(0, 0), std::numeric_limits<int>::max(), -25, btTransform::getIdentity());
+        mNavigator->addWater(osg::Vec2i(0, 0), std::numeric_limits<int>::max(), osg::Vec3f(0, 0, -25));
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -591,7 +591,7 @@ namespace
         shape.setLocalScaling(btVector3(128, 128, 1));
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addWater(osg::Vec2i(0, 0), 128 * 4, -25, btTransform::getIdentity());
+        mNavigator->addWater(osg::Vec2i(0, 0), 128 * 4, osg::Vec3f(0, 0, -25));
         mNavigator->addObject(ObjectId(&shape), shape, btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
diff --git a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
index 137da9cd88..c9c2a6528b 100644
--- a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
+++ b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
@@ -7,9 +7,9 @@
 #include <components/detournavigator/ref.hpp>
 #include <components/detournavigator/preparednavmeshdatatuple.hpp>
 
-#include <RecastAlloc.h>
+#include <osg/Vec3f>
 
-#include <LinearMath/btTransform.h>
+#include <RecastAlloc.h>
 
 #include <gtest/gtest.h>
 
@@ -231,7 +231,7 @@ namespace
     {
         const std::size_t maxSize = 1;
         NavMeshTilesCache cache(maxSize);
-        const std::vector<Water> water {1, Water {1, btTransform::getIdentity()}};
+        const std::vector<Water> water {1, Water {1, osg::Vec3f()}};
         const RecastMesh unexistentRecastMesh {mGeneration, mRevision, mMesh, water};
 
         cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
@@ -243,7 +243,7 @@ namespace
         const std::size_t maxSize = mRecastMeshWithWaterSize + mPreparedNavMeshDataSize;
         NavMeshTilesCache cache(maxSize);
 
-        const std::vector<Water> water {1, Water {1, btTransform::getIdentity()}};
+        const std::vector<Water> water {1, Water {1, osg::Vec3f()}};
         const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, water};
         auto anotherPreparedNavMeshData = makePeparedNavMeshData(3);
         const auto copy = clone(*anotherPreparedNavMeshData);
@@ -261,7 +261,7 @@ namespace
         const std::size_t maxSize = mRecastMeshWithWaterSize + mPreparedNavMeshDataSize;
         NavMeshTilesCache cache(maxSize);
 
-        const std::vector<Water> water {1, Water {1, btTransform::getIdentity()}};
+        const std::vector<Water> water {1, Water {1, osg::Vec3f()}};
         const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, water};
         auto anotherPreparedNavMeshData = makePeparedNavMeshData(3);
 
@@ -277,11 +277,11 @@ namespace
         NavMeshTilesCache cache(maxSize);
         const auto copy = clone(*mPreparedNavMeshData);
 
-        const std::vector<Water> leastRecentlySetWater {1, Water {1, btTransform::getIdentity()}};
+        const std::vector<Water> leastRecentlySetWater {1, Water {1, osg::Vec3f()}};
         const RecastMesh leastRecentlySetRecastMesh {mGeneration, mRevision, mMesh, leastRecentlySetWater};
         auto leastRecentlySetData = makePeparedNavMeshData(3);
 
-        const std::vector<Water> mostRecentlySetWater {1, Water {2, btTransform::getIdentity()}};
+        const std::vector<Water> mostRecentlySetWater {1, Water {2, osg::Vec3f()}};
         const RecastMesh mostRecentlySetRecastMesh {mGeneration, mRevision, mMesh, mostRecentlySetWater};
         auto mostRecentlySetData = makePeparedNavMeshData(3);
 
@@ -303,12 +303,12 @@ namespace
         const std::size_t maxSize = 2 * (mRecastMeshWithWaterSize + mPreparedNavMeshDataSize);
         NavMeshTilesCache cache(maxSize);
 
-        const std::vector<Water> leastRecentlyUsedWater {1, Water {1, btTransform::getIdentity()}};
+        const std::vector<Water> leastRecentlyUsedWater {1, Water {1, osg::Vec3f()}};
         const RecastMesh leastRecentlyUsedRecastMesh {mGeneration, mRevision, mMesh, leastRecentlyUsedWater};
         auto leastRecentlyUsedData = makePeparedNavMeshData(3);
         const auto leastRecentlyUsedCopy = clone(*leastRecentlyUsedData);
 
-        const std::vector<Water> mostRecentlyUsedWater {1, Water {2, btTransform::getIdentity()}};
+        const std::vector<Water> mostRecentlyUsedWater {1, Water {2, osg::Vec3f()}};
         const RecastMesh mostRecentlyUsedRecastMesh {mGeneration, mRevision, mMesh, mostRecentlyUsedWater};
         auto mostRecentlyUsedData = makePeparedNavMeshData(3);
         const auto mostRecentlyUsedCopy = clone(*mostRecentlyUsedData);
@@ -342,7 +342,7 @@ namespace
         const std::size_t maxSize = 2 * (mRecastMeshWithWaterSize + mPreparedNavMeshDataSize);
         NavMeshTilesCache cache(maxSize);
 
-        const std::vector<Water> water {1, Water {1, btTransform::getIdentity()}};
+        const std::vector<Water> water {1, Water {1, osg::Vec3f()}};
         const RecastMesh tooLargeRecastMesh {mGeneration, mRevision, mMesh, water};
         auto tooLargeData = makePeparedNavMeshData(10);
 
@@ -356,11 +356,11 @@ namespace
         const std::size_t maxSize = 2 * (mRecastMeshWithWaterSize + mPreparedNavMeshDataSize);
         NavMeshTilesCache cache(maxSize);
 
-        const std::vector<Water> anotherWater {1, Water {1, btTransform::getIdentity()}};
+        const std::vector<Water> anotherWater {1, Water {1, osg::Vec3f()}};
         const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, anotherWater};
         auto anotherData = makePeparedNavMeshData(3);
 
-        const std::vector<Water> tooLargeWater {1, Water {2, btTransform::getIdentity()}};
+        const std::vector<Water> tooLargeWater {1, Water {2, osg::Vec3f()}};
         const RecastMesh tooLargeRecastMesh {mGeneration, mRevision, mMesh, tooLargeWater};
         auto tooLargeData = makePeparedNavMeshData(10);
 
@@ -380,7 +380,7 @@ namespace
         const std::size_t maxSize = mRecastMeshWithWaterSize + mPreparedNavMeshDataSize;
         NavMeshTilesCache cache(maxSize);
 
-        const std::vector<Water> water {1, Water {1, btTransform::getIdentity()}};
+        const std::vector<Water> water {1, Water {1, osg::Vec3f()}};
         const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, water};
         auto anotherData = makePeparedNavMeshData(3);
 
@@ -399,7 +399,7 @@ namespace
         const std::size_t maxSize = mRecastMeshWithWaterSize + mPreparedNavMeshDataSize;
         NavMeshTilesCache cache(maxSize);
 
-        const std::vector<Water> water {1, Water {1, btTransform::getIdentity()}};
+        const std::vector<Water> water {1, Water {1, osg::Vec3f()}};
         const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, water};
         auto anotherData = makePeparedNavMeshData(3);
 
diff --git a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
index 56f94701f0..ac565e36c0 100644
--- a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
+++ b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
@@ -21,7 +21,7 @@ namespace DetourNavigator
 {
     static inline bool operator ==(const Water& lhs, const Water& rhs)
     {
-        return lhs.mCellSize == rhs.mCellSize && lhs.mTransform == rhs.mTransform;
+        return lhs.mCellSize == rhs.mCellSize && lhs.mShift == rhs.mShift;
     }
 }
 
@@ -402,10 +402,10 @@ namespace
     TEST_F(DetourNavigatorRecastMeshBuilderTest, add_water_then_get_water_should_return_it)
     {
         RecastMeshBuilder builder(mBounds);
-        builder.addWater(1000, btTransform(btMatrix3x3::getIdentity(), btVector3(100, 200, 300)));
+        builder.addWater(1000, osg::Vec3f(100, 200, 300));
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getWater(), std::vector<Water>({
-            Water {1000, btTransform(btMatrix3x3::getIdentity(), btVector3(100, 200, 300))}
+            Water {1000, osg::Vec3f(100, 200, 300)}
         }));
     }
 
diff --git a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
index fb0f97831a..59938ad2be 100644
--- a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -254,7 +254,7 @@ namespace
         TileCachedRecastMeshManager manager(mSettings);
         const osg::Vec2i cellPosition(0, 0);
         const int cellSize = 8192;
-        EXPECT_TRUE(manager.addWater(cellPosition, cellSize, btTransform::getIdentity()));
+        EXPECT_TRUE(manager.addWater(cellPosition, cellSize, osg::Vec3f()));
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, add_water_for_not_max_int_should_add_new_tiles)
@@ -262,7 +262,7 @@ namespace
         TileCachedRecastMeshManager manager(mSettings);
         const osg::Vec2i cellPosition(0, 0);
         const int cellSize = 8192;
-        ASSERT_TRUE(manager.addWater(cellPosition, cellSize, btTransform::getIdentity()));
+        ASSERT_TRUE(manager.addWater(cellPosition, cellSize, osg::Vec3f()));
         for (int x = -6; x < 6; ++x)
             for (int y = -6; y < 6; ++y)
                 ASSERT_TRUE(manager.hasTile(TilePosition(x, y)));
@@ -275,7 +275,7 @@ namespace
         ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground));
         const osg::Vec2i cellPosition(0, 0);
         const int cellSize = std::numeric_limits<int>::max();
-        ASSERT_TRUE(manager.addWater(cellPosition, cellSize, btTransform::getIdentity()));
+        ASSERT_TRUE(manager.addWater(cellPosition, cellSize, osg::Vec3f()));
         for (int x = -6; x < 6; ++x)
             for (int y = -6; y < 6; ++y)
                 ASSERT_EQ(manager.hasTile(TilePosition(x, y)), -1 <= x && x <= 0 && -1 <= y && y <= 0);
@@ -292,7 +292,7 @@ namespace
         TileCachedRecastMeshManager manager(mSettings);
         const osg::Vec2i cellPosition(0, 0);
         const int cellSize = 8192;
-        ASSERT_TRUE(manager.addWater(cellPosition, cellSize, btTransform::getIdentity()));
+        ASSERT_TRUE(manager.addWater(cellPosition, cellSize, osg::Vec3f()));
         const auto result = manager.removeWater(cellPosition);
         ASSERT_TRUE(result.has_value());
         EXPECT_EQ(result->mCellSize, cellSize);
@@ -303,7 +303,7 @@ namespace
         TileCachedRecastMeshManager manager(mSettings);
         const osg::Vec2i cellPosition(0, 0);
         const int cellSize = 8192;
-        ASSERT_TRUE(manager.addWater(cellPosition, cellSize, btTransform::getIdentity()));
+        ASSERT_TRUE(manager.addWater(cellPosition, cellSize, osg::Vec3f()));
         ASSERT_TRUE(manager.removeWater(cellPosition));
         for (int x = -6; x < 6; ++x)
             for (int y = -6; y < 6; ++y)
@@ -317,7 +317,7 @@ namespace
         ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground));
         const osg::Vec2i cellPosition(0, 0);
         const int cellSize = 8192;
-        ASSERT_TRUE(manager.addWater(cellPosition, cellSize, btTransform::getIdentity()));
+        ASSERT_TRUE(manager.addWater(cellPosition, cellSize, osg::Vec3f()));
         ASSERT_TRUE(manager.removeWater(cellPosition));
         for (int x = -6; x < 6; ++x)
             for (int y = -6; y < 6; ++y)
diff --git a/components/detournavigator/cachedrecastmeshmanager.cpp b/components/detournavigator/cachedrecastmeshmanager.cpp
index 38bc954342..1242b32318 100644
--- a/components/detournavigator/cachedrecastmeshmanager.cpp
+++ b/components/detournavigator/cachedrecastmeshmanager.cpp
@@ -34,9 +34,9 @@ namespace DetourNavigator
     }
 
     bool CachedRecastMeshManager::addWater(const osg::Vec2i& cellPosition, const int cellSize,
-        const btTransform& transform)
+        const osg::Vec3f& shift)
     {
-        if (!mImpl.addWater(cellPosition, cellSize, transform))
+        if (!mImpl.addWater(cellPosition, cellSize, shift))
             return false;
         mCached.reset();
         return true;
diff --git a/components/detournavigator/cachedrecastmeshmanager.hpp b/components/detournavigator/cachedrecastmeshmanager.hpp
index e4a262bc6a..247775e3e7 100644
--- a/components/detournavigator/cachedrecastmeshmanager.hpp
+++ b/components/detournavigator/cachedrecastmeshmanager.hpp
@@ -16,7 +16,7 @@ namespace DetourNavigator
 
         bool updateObject(const ObjectId id, const btTransform& transform, const AreaType areaType);
 
-        bool addWater(const osg::Vec2i& cellPosition, const int cellSize, const btTransform& transform);
+        bool addWater(const osg::Vec2i& cellPosition, const int cellSize, const osg::Vec3f& shift);
 
         std::optional<Water> removeWater(const osg::Vec2i& cellPosition);
 
diff --git a/components/detournavigator/gettilespositions.hpp b/components/detournavigator/gettilespositions.hpp
index e233795e68..27c8f7a4ac 100644
--- a/components/detournavigator/gettilespositions.hpp
+++ b/components/detournavigator/gettilespositions.hpp
@@ -50,10 +50,11 @@ namespace DetourNavigator
     }
 
     template <class Callback>
-    void getTilesPositions(const int cellSize, const btTransform& transform,
+    void getTilesPositions(const int cellSize, const osg::Vec3f& shift,
         const Settings& settings, Callback&& callback)
     {
         const auto halfCellSize = cellSize / 2;
+        const btTransform transform(btMatrix3x3::getIdentity(), Misc::Convert::toBullet(shift));
         auto aabbMin = transform(btVector3(-halfCellSize, -halfCellSize, 0));
         auto aabbMax = transform(btVector3(halfCellSize, halfCellSize, 0));
 
diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index 1e2d4d5167..ba1e93f50e 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -39,7 +39,7 @@ namespace
     {
         if (water.mCellSize == std::numeric_limits<int>::max())
         {
-            const auto transform = getSwimLevelTransform(settings, water.mTransform, agentHalfExtents.z());
+            const auto transform = getSwimLevelTransform(settings, water.mShift, agentHalfExtents.z());
             const auto min = toNavMeshCoordinates(settings, Misc::Convert::makeOsgVec3f(transform(btVector3(-1, -1, 0))));
             const auto max = toNavMeshCoordinates(settings, Misc::Convert::makeOsgVec3f(transform(btVector3(1, 1, 0))));
             return WaterBounds {
@@ -49,7 +49,7 @@ namespace
         }
         else
         {
-            const auto transform = getSwimLevelTransform(settings, water.mTransform, agentHalfExtents.z());
+            const auto transform = getSwimLevelTransform(settings, water.mShift, agentHalfExtents.z());
             const auto halfCellSize = water.mCellSize / 2.0f;
             return WaterBounds {
                 toNavMeshCoordinates(settings, Misc::Convert::makeOsgVec3f(transform(btVector3(-halfCellSize, -halfCellSize, 0)))),
diff --git a/components/detournavigator/navigator.hpp b/components/detournavigator/navigator.hpp
index 0dab7ba6b3..f7ee4ed96e 100644
--- a/components/detournavigator/navigator.hpp
+++ b/components/detournavigator/navigator.hpp
@@ -134,14 +134,12 @@ namespace DetourNavigator
          * @brief addWater is used to set water level at given world cell.
          * @param cellPosition allows to distinguish cells if there is many in current world.
          * @param cellSize set cell borders. std::numeric_limits<int>::max() disables cell borders.
-         * @param level set z coordinate of water surface at the scene.
-         * @param transform set global shift of cell center.
+         * @param shift set global shift of cell center.
          * @return true if there was no water at given cell if cellSize != std::numeric_limits<int>::max() or there is
          * at least single object is added to the scene, false if there is already water for given cell or there is no
          * any other objects.
          */
-        virtual bool addWater(const osg::Vec2i& cellPosition, const int cellSize, const btScalar level,
-            const btTransform& transform) = 0;
+        virtual bool addWater(const osg::Vec2i& cellPosition, int cellSize, const osg::Vec3f& shift) = 0;
 
         /**
          * @brief removeWater to make it no more available at the scene.
diff --git a/components/detournavigator/navigatorimpl.cpp b/components/detournavigator/navigatorimpl.cpp
index 1aa4768de5..a6e1062fbb 100644
--- a/components/detournavigator/navigatorimpl.cpp
+++ b/components/detournavigator/navigatorimpl.cpp
@@ -102,11 +102,9 @@ namespace DetourNavigator
         return result;
     }
 
-    bool NavigatorImpl::addWater(const osg::Vec2i& cellPosition, const int cellSize, const btScalar level,
-        const btTransform& transform)
+    bool NavigatorImpl::addWater(const osg::Vec2i& cellPosition, int cellSize, const osg::Vec3f& shift)
     {
-        return mNavMeshManager.addWater(cellPosition, cellSize,
-            btTransform(transform.getBasis(), btVector3(transform.getOrigin().x(), transform.getOrigin().y(), level)));
+        return mNavMeshManager.addWater(cellPosition, cellSize, shift);
     }
 
     bool NavigatorImpl::removeWater(const osg::Vec2i& cellPosition)
diff --git a/components/detournavigator/navigatorimpl.hpp b/components/detournavigator/navigatorimpl.hpp
index 80c6957d79..3d021ec7e9 100644
--- a/components/detournavigator/navigatorimpl.hpp
+++ b/components/detournavigator/navigatorimpl.hpp
@@ -35,8 +35,7 @@ namespace DetourNavigator
 
         bool removeObject(const ObjectId id) override;
 
-        bool addWater(const osg::Vec2i& cellPosition, const int cellSize, const btScalar level,
-            const btTransform& transform) override;
+        bool addWater(const osg::Vec2i& cellPosition, int cellSize, const osg::Vec3f& shift) override;
 
         bool removeWater(const osg::Vec2i& cellPosition) override;
 
diff --git a/components/detournavigator/navigatorstub.hpp b/components/detournavigator/navigatorstub.hpp
index 0a08813938..cab8feaf39 100644
--- a/components/detournavigator/navigatorstub.hpp
+++ b/components/detournavigator/navigatorstub.hpp
@@ -54,8 +54,7 @@ namespace DetourNavigator
             return false;
         }
 
-        bool addWater(const osg::Vec2i& /*cellPosition*/, const int /*cellSize*/, const btScalar /*level*/,
-            const btTransform& /*transform*/) override
+        bool addWater(const osg::Vec2i& /*cellPosition*/, int /*cellSize*/, const osg::Vec3f& /*shift*/) override
         {
             return false;
         }
diff --git a/components/detournavigator/navmeshmanager.cpp b/components/detournavigator/navmeshmanager.cpp
index c42fb5c4be..767dfd59aa 100644
--- a/components/detournavigator/navmeshmanager.cpp
+++ b/components/detournavigator/navmeshmanager.cpp
@@ -72,11 +72,11 @@ namespace DetourNavigator
         return true;
     }
 
-    bool NavMeshManager::addWater(const osg::Vec2i& cellPosition, const int cellSize, const btTransform& transform)
+    bool NavMeshManager::addWater(const osg::Vec2i& cellPosition, const int cellSize, const osg::Vec3f& shift)
     {
-        if (!mRecastMeshManager.addWater(cellPosition, cellSize, transform))
+        if (!mRecastMeshManager.addWater(cellPosition, cellSize, shift))
             return false;
-        addChangedTiles(cellSize, transform, ChangeType::add);
+        addChangedTiles(cellSize, shift, ChangeType::add);
         return true;
     }
 
@@ -85,7 +85,7 @@ namespace DetourNavigator
         const auto water = mRecastMeshManager.removeWater(cellPosition);
         if (!water)
             return false;
-        addChangedTiles(water->mCellSize, water->mTransform, ChangeType::remove);
+        addChangedTiles(water->mCellSize, water->mShift, ChangeType::remove);
         return true;
     }
 
@@ -231,13 +231,13 @@ namespace DetourNavigator
             [&] (const TilePosition& v) { addChangedTile(v, changeType); });
     }
 
-    void NavMeshManager::addChangedTiles(const int cellSize, const btTransform& transform,
+    void NavMeshManager::addChangedTiles(const int cellSize, const osg::Vec3f& shift,
             const ChangeType changeType)
     {
         if (cellSize == std::numeric_limits<int>::max())
             return;
 
-        getTilesPositions(cellSize, transform, mSettings,
+        getTilesPositions(cellSize, shift, mSettings,
             [&] (const TilePosition& v) { addChangedTile(v, changeType); });
     }
 
diff --git a/components/detournavigator/navmeshmanager.hpp b/components/detournavigator/navmeshmanager.hpp
index b176515e3b..a93d8824e3 100644
--- a/components/detournavigator/navmeshmanager.hpp
+++ b/components/detournavigator/navmeshmanager.hpp
@@ -33,7 +33,7 @@ namespace DetourNavigator
 
         void addAgent(const osg::Vec3f& agentHalfExtents);
 
-        bool addWater(const osg::Vec2i& cellPosition, const int cellSize, const btTransform& transform);
+        bool addWater(const osg::Vec2i& cellPosition, const int cellSize, const osg::Vec3f& shift);
 
         bool removeWater(const osg::Vec2i& cellPosition);
 
@@ -68,7 +68,7 @@ namespace DetourNavigator
 
         void addChangedTiles(const btCollisionShape& shape, const btTransform& transform, const ChangeType changeType);
 
-        void addChangedTiles(const int cellSize, const btTransform& transform, const ChangeType changeType);
+        void addChangedTiles(const int cellSize, const osg::Vec3f& shift, const ChangeType changeType);
 
         void addChangedTile(const TilePosition& tilePosition, const ChangeType changeType);
 
diff --git a/components/detournavigator/recastmesh.hpp b/components/detournavigator/recastmesh.hpp
index c70405c85c..c1d01e48fd 100644
--- a/components/detournavigator/recastmesh.hpp
+++ b/components/detournavigator/recastmesh.hpp
@@ -6,13 +6,13 @@
 
 #include <components/bullethelpers/operators.hpp>
 
+#include <osg/Vec3f>
+
 #include <memory>
 #include <string>
 #include <vector>
 #include <tuple>
 
-#include <LinearMath/btTransform.h>
-
 namespace DetourNavigator
 {
     class Mesh
@@ -48,7 +48,7 @@ namespace DetourNavigator
     struct Water
     {
         int mCellSize;
-        btTransform mTransform;
+        osg::Vec3f mShift;
     };
 
     class RecastMesh
@@ -98,7 +98,7 @@ namespace DetourNavigator
 
     inline bool operator<(const Water& lhs, const Water& rhs) noexcept
     {
-        return std::tie(lhs.mCellSize, lhs.mTransform) < std::tie(rhs.mCellSize, rhs.mTransform);
+        return std::tie(lhs.mCellSize, lhs.mShift) < std::tie(rhs.mCellSize, rhs.mShift);
     }
 }
 
diff --git a/components/detournavigator/recastmeshbuilder.cpp b/components/detournavigator/recastmeshbuilder.cpp
index ad896c2a57..1b2b5b08cd 100644
--- a/components/detournavigator/recastmeshbuilder.cpp
+++ b/components/detournavigator/recastmeshbuilder.cpp
@@ -158,9 +158,9 @@ namespace DetourNavigator
         }
     }
 
-    void RecastMeshBuilder::addWater(const int cellSize, const btTransform& transform)
+    void RecastMeshBuilder::addWater(const int cellSize, const osg::Vec3f& shift)
     {
-        mWater.push_back(Water {cellSize, transform});
+        mWater.push_back(Water {cellSize, shift});
     }
 
     std::shared_ptr<RecastMesh> RecastMeshBuilder::create(std::size_t generation, std::size_t revision) &&
diff --git a/components/detournavigator/recastmeshbuilder.hpp b/components/detournavigator/recastmeshbuilder.hpp
index 2692e8f486..95dfc9cb52 100644
--- a/components/detournavigator/recastmeshbuilder.hpp
+++ b/components/detournavigator/recastmeshbuilder.hpp
@@ -49,7 +49,7 @@ namespace DetourNavigator
 
         void addObject(const btBoxShape& shape, const btTransform& transform, const AreaType areaType);
 
-        void addWater(const int mCellSize, const btTransform& transform);
+        void addWater(const int mCellSize, const osg::Vec3f& shift);
 
         std::shared_ptr<RecastMesh> create(std::size_t generation, std::size_t revision) &&;
 
diff --git a/components/detournavigator/recastmeshmanager.cpp b/components/detournavigator/recastmeshmanager.cpp
index 267c3ee9a3..336ecf3fe5 100644
--- a/components/detournavigator/recastmeshmanager.cpp
+++ b/components/detournavigator/recastmeshmanager.cpp
@@ -47,10 +47,9 @@ namespace DetourNavigator
         return result;
     }
 
-    bool RecastMeshManager::addWater(const osg::Vec2i& cellPosition, const int cellSize,
-        const btTransform& transform)
+    bool RecastMeshManager::addWater(const osg::Vec2i& cellPosition, const int cellSize, const osg::Vec3f& shift)
     {
-        if (!mWater.emplace(cellPosition, Water {cellSize, transform}).second)
+        if (!mWater.emplace(cellPosition, Water {cellSize, shift}).second)
             return false;
         ++mRevision;
         return true;
@@ -74,7 +73,7 @@ namespace DetourNavigator
         tileBounds.mMax /= mSettings.mRecastScaleFactor;
         RecastMeshBuilder builder(tileBounds);
         for (const auto& [k, v] : mWater)
-            builder.addWater(v.mCellSize, v.mTransform);
+            builder.addWater(v.mCellSize, v.mShift);
         for (const auto& [k, object] : mObjects)
         {
             const RecastMeshObject& v = object.getImpl();
diff --git a/components/detournavigator/recastmeshmanager.hpp b/components/detournavigator/recastmeshmanager.hpp
index a1d6123062..bcb716353a 100644
--- a/components/detournavigator/recastmeshmanager.hpp
+++ b/components/detournavigator/recastmeshmanager.hpp
@@ -37,7 +37,7 @@ namespace DetourNavigator
 
         bool updateObject(const ObjectId id, const btTransform& transform, const AreaType areaType);
 
-        bool addWater(const osg::Vec2i& cellPosition, const int cellSize, const btTransform& transform);
+        bool addWater(const osg::Vec2i& cellPosition, const int cellSize, const osg::Vec3f& shift);
 
         std::optional<Water> removeWater(const osg::Vec2i& cellPosition);
 
diff --git a/components/detournavigator/settingsutils.hpp b/components/detournavigator/settingsutils.hpp
index 245e4a7e56..cbd0205e7f 100644
--- a/components/detournavigator/settingsutils.hpp
+++ b/components/detournavigator/settingsutils.hpp
@@ -82,12 +82,12 @@ namespace DetourNavigator
         return - settings.mSwimHeightScale * agentHalfExtentsZ;
     }
 
-    inline btTransform getSwimLevelTransform(const Settings& settings, const btTransform& transform,
+    inline btTransform getSwimLevelTransform(const Settings& settings, const osg::Vec3f& shift,
         const float agentHalfExtentsZ)
     {
         return btTransform(
-            transform.getBasis(),
-            transform.getOrigin() + btVector3(0, 0, getSwimLevel(settings, agentHalfExtentsZ) - agentHalfExtentsZ)
+            btMatrix3x3::getIdentity(),
+            btVector3(shift.x(), shift.y(), shift.z() + getSwimLevel(settings, agentHalfExtentsZ) - agentHalfExtentsZ)
         );
     }
 
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.cpp b/components/detournavigator/tilecachedrecastmeshmanager.cpp
index c19e43c498..15851d7daa 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -54,7 +54,7 @@ namespace DetourNavigator
     }
 
     bool TileCachedRecastMeshManager::addWater(const osg::Vec2i& cellPosition, const int cellSize,
-        const btTransform& transform)
+        const osg::Vec3f& shift)
     {
         const auto border = getBorderSize(mSettings);
 
@@ -67,7 +67,7 @@ namespace DetourNavigator
             const auto tiles = mTiles.lock();
             for (auto& tile : *tiles)
             {
-                if (tile.second.addWater(cellPosition, cellSize, transform))
+                if (tile.second.addWater(cellPosition, cellSize, shift))
                 {
                     tilesPositions.push_back(tile.first);
                     result = true;
@@ -76,7 +76,7 @@ namespace DetourNavigator
         }
         else
         {
-            getTilesPositions(cellSize, transform, mSettings, [&] (const TilePosition& tilePosition)
+            getTilesPositions(cellSize, shift, mSettings, [&] (const TilePosition& tilePosition)
                 {
                     const auto tiles = mTiles.lock();
                     auto tile = tiles->find(tilePosition);
@@ -88,7 +88,7 @@ namespace DetourNavigator
                         tile = tiles->insert(std::make_pair(tilePosition,
                                 CachedRecastMeshManager(mSettings, tileBounds, mTilesGeneration))).first;
                     }
-                    if (tile->second.addWater(cellPosition, cellSize, transform))
+                    if (tile->second.addWater(cellPosition, cellSize, shift))
                     {
                         tilesPositions.push_back(tilePosition);
                         result = true;
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.hpp b/components/detournavigator/tilecachedrecastmeshmanager.hpp
index 087e3e1f36..2c0faeca7d 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.hpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.hpp
@@ -76,7 +76,7 @@ namespace DetourNavigator
 
         std::optional<RemovedRecastMeshObject> removeObject(const ObjectId id);
 
-        bool addWater(const osg::Vec2i& cellPosition, const int cellSize, const btTransform& transform);
+        bool addWater(const osg::Vec2i& cellPosition, const int cellSize, const osg::Vec3f& shift);
 
         std::optional<Water> removeWater(const osg::Vec2i& cellPosition);
 

From 5d6c93566ddeb15fe7398583ce90853cca3e2299 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 14 Jul 2021 22:00:16 +0200
Subject: [PATCH 1086/2859] Rename DetourNavigator::Water -> Cell

---
 .../detournavigator/navmeshtilescache.cpp     |  4 +--
 .../detournavigator/navmeshtilescache.cpp     | 28 +++++++++----------
 .../detournavigator/recastmeshbuilder.cpp     |  8 +++---
 .../tilecachedrecastmeshmanager.cpp           |  2 +-
 .../cachedrecastmeshmanager.cpp               |  2 +-
 .../cachedrecastmeshmanager.hpp               |  2 +-
 components/detournavigator/makenavmesh.cpp    |  6 ++--
 components/detournavigator/navmeshmanager.cpp |  2 +-
 .../detournavigator/navmeshtilescache.hpp     |  2 +-
 components/detournavigator/recastmesh.cpp     |  2 +-
 components/detournavigator/recastmesh.hpp     | 16 +++++------
 .../detournavigator/recastmeshbuilder.cpp     |  2 +-
 .../detournavigator/recastmeshbuilder.hpp     |  2 +-
 .../detournavigator/recastmeshmanager.cpp     |  8 +++---
 .../detournavigator/recastmeshmanager.hpp     |  4 +--
 .../tilecachedrecastmeshmanager.cpp           |  4 +--
 .../tilecachedrecastmeshmanager.hpp           |  2 +-
 17 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/apps/benchmarks/detournavigator/navmeshtilescache.cpp b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
index c6e6ecbdbc..70ffdde3c9 100644
--- a/apps/benchmarks/detournavigator/navmeshtilescache.cpp
+++ b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
@@ -83,7 +83,7 @@ namespace
         std::uniform_real_distribution<float> distribution(0.0, 1.0);
         std::generate_n(out, count, [&] {
             const osg::Vec3f shift(distribution(random), distribution(random), distribution(random));
-            return Water {1, shift};
+            return Cell {1, shift};
         });
     }
 
@@ -108,7 +108,7 @@ namespace
         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);
         Mesh mesh = generateMesh(triangles, random);
-        std::vector<Water> water;
+        std::vector<Cell> water;
         generateWater(std::back_inserter(water), 2, random);
         RecastMesh recastMesh(generation, revision, std::move(mesh), std::move(water));
         return Key {agentHalfExtents, tilePosition, std::move(recastMesh)};
diff --git a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
index c9c2a6528b..8c66f1a3ef 100644
--- a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
+++ b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
@@ -143,12 +143,12 @@ namespace
         const std::size_t mGeneration = 0;
         const std::size_t mRevision = 0;
         const Mesh mMesh {makeMesh()};
-        const std::vector<Water> mWater {};
+        const std::vector<Cell> mWater {};
         const RecastMesh mRecastMesh {mGeneration, mRevision, mMesh, mWater};
         std::unique_ptr<PreparedNavMeshData> mPreparedNavMeshData {makePeparedNavMeshData(3)};
 
         const std::size_t mRecastMeshSize = sizeof(mRecastMesh) + getSize(mRecastMesh);
-        const std::size_t mRecastMeshWithWaterSize = mRecastMeshSize + sizeof(Water);
+        const std::size_t mRecastMeshWithWaterSize = mRecastMeshSize + sizeof(Cell);
         const std::size_t mPreparedNavMeshDataSize = sizeof(*mPreparedNavMeshData) + getSize(*mPreparedNavMeshData);
     };
 
@@ -231,7 +231,7 @@ namespace
     {
         const std::size_t maxSize = 1;
         NavMeshTilesCache cache(maxSize);
-        const std::vector<Water> water {1, Water {1, osg::Vec3f()}};
+        const std::vector<Cell> water {1, Cell {1, osg::Vec3f()}};
         const RecastMesh unexistentRecastMesh {mGeneration, mRevision, mMesh, water};
 
         cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
@@ -243,7 +243,7 @@ namespace
         const std::size_t maxSize = mRecastMeshWithWaterSize + mPreparedNavMeshDataSize;
         NavMeshTilesCache cache(maxSize);
 
-        const std::vector<Water> water {1, Water {1, osg::Vec3f()}};
+        const std::vector<Cell> water {1, Cell {1, osg::Vec3f()}};
         const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, water};
         auto anotherPreparedNavMeshData = makePeparedNavMeshData(3);
         const auto copy = clone(*anotherPreparedNavMeshData);
@@ -261,7 +261,7 @@ namespace
         const std::size_t maxSize = mRecastMeshWithWaterSize + mPreparedNavMeshDataSize;
         NavMeshTilesCache cache(maxSize);
 
-        const std::vector<Water> water {1, Water {1, osg::Vec3f()}};
+        const std::vector<Cell> water {1, Cell {1, osg::Vec3f()}};
         const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, water};
         auto anotherPreparedNavMeshData = makePeparedNavMeshData(3);
 
@@ -277,11 +277,11 @@ namespace
         NavMeshTilesCache cache(maxSize);
         const auto copy = clone(*mPreparedNavMeshData);
 
-        const std::vector<Water> leastRecentlySetWater {1, Water {1, osg::Vec3f()}};
+        const std::vector<Cell> leastRecentlySetWater {1, Cell {1, osg::Vec3f()}};
         const RecastMesh leastRecentlySetRecastMesh {mGeneration, mRevision, mMesh, leastRecentlySetWater};
         auto leastRecentlySetData = makePeparedNavMeshData(3);
 
-        const std::vector<Water> mostRecentlySetWater {1, Water {2, osg::Vec3f()}};
+        const std::vector<Cell> mostRecentlySetWater {1, Cell {2, osg::Vec3f()}};
         const RecastMesh mostRecentlySetRecastMesh {mGeneration, mRevision, mMesh, mostRecentlySetWater};
         auto mostRecentlySetData = makePeparedNavMeshData(3);
 
@@ -303,12 +303,12 @@ namespace
         const std::size_t maxSize = 2 * (mRecastMeshWithWaterSize + mPreparedNavMeshDataSize);
         NavMeshTilesCache cache(maxSize);
 
-        const std::vector<Water> leastRecentlyUsedWater {1, Water {1, osg::Vec3f()}};
+        const std::vector<Cell> leastRecentlyUsedWater {1, Cell {1, osg::Vec3f()}};
         const RecastMesh leastRecentlyUsedRecastMesh {mGeneration, mRevision, mMesh, leastRecentlyUsedWater};
         auto leastRecentlyUsedData = makePeparedNavMeshData(3);
         const auto leastRecentlyUsedCopy = clone(*leastRecentlyUsedData);
 
-        const std::vector<Water> mostRecentlyUsedWater {1, Water {2, osg::Vec3f()}};
+        const std::vector<Cell> mostRecentlyUsedWater {1, Cell {2, osg::Vec3f()}};
         const RecastMesh mostRecentlyUsedRecastMesh {mGeneration, mRevision, mMesh, mostRecentlyUsedWater};
         auto mostRecentlyUsedData = makePeparedNavMeshData(3);
         const auto mostRecentlyUsedCopy = clone(*mostRecentlyUsedData);
@@ -342,7 +342,7 @@ namespace
         const std::size_t maxSize = 2 * (mRecastMeshWithWaterSize + mPreparedNavMeshDataSize);
         NavMeshTilesCache cache(maxSize);
 
-        const std::vector<Water> water {1, Water {1, osg::Vec3f()}};
+        const std::vector<Cell> water {1, Cell {1, osg::Vec3f()}};
         const RecastMesh tooLargeRecastMesh {mGeneration, mRevision, mMesh, water};
         auto tooLargeData = makePeparedNavMeshData(10);
 
@@ -356,11 +356,11 @@ namespace
         const std::size_t maxSize = 2 * (mRecastMeshWithWaterSize + mPreparedNavMeshDataSize);
         NavMeshTilesCache cache(maxSize);
 
-        const std::vector<Water> anotherWater {1, Water {1, osg::Vec3f()}};
+        const std::vector<Cell> anotherWater {1, Cell {1, osg::Vec3f()}};
         const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, anotherWater};
         auto anotherData = makePeparedNavMeshData(3);
 
-        const std::vector<Water> tooLargeWater {1, Water {2, osg::Vec3f()}};
+        const std::vector<Cell> tooLargeWater {1, Cell {2, osg::Vec3f()}};
         const RecastMesh tooLargeRecastMesh {mGeneration, mRevision, mMesh, tooLargeWater};
         auto tooLargeData = makePeparedNavMeshData(10);
 
@@ -380,7 +380,7 @@ namespace
         const std::size_t maxSize = mRecastMeshWithWaterSize + mPreparedNavMeshDataSize;
         NavMeshTilesCache cache(maxSize);
 
-        const std::vector<Water> water {1, Water {1, osg::Vec3f()}};
+        const std::vector<Cell> water {1, Cell {1, osg::Vec3f()}};
         const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, water};
         auto anotherData = makePeparedNavMeshData(3);
 
@@ -399,7 +399,7 @@ namespace
         const std::size_t maxSize = mRecastMeshWithWaterSize + mPreparedNavMeshDataSize;
         NavMeshTilesCache cache(maxSize);
 
-        const std::vector<Water> water {1, Water {1, osg::Vec3f()}};
+        const std::vector<Cell> water {1, Cell {1, osg::Vec3f()}};
         const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, water};
         auto anotherData = makePeparedNavMeshData(3);
 
diff --git a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
index ac565e36c0..b6478f9ea6 100644
--- a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
+++ b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
@@ -19,9 +19,9 @@
 
 namespace DetourNavigator
 {
-    static inline bool operator ==(const Water& lhs, const Water& rhs)
+    static inline bool operator ==(const Cell& lhs, const Cell& rhs)
     {
-        return lhs.mCellSize == rhs.mCellSize && lhs.mShift == rhs.mShift;
+        return lhs.mSize == rhs.mSize && lhs.mShift == rhs.mShift;
     }
 }
 
@@ -404,8 +404,8 @@ namespace
         RecastMeshBuilder builder(mBounds);
         builder.addWater(1000, osg::Vec3f(100, 200, 300));
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
-        EXPECT_EQ(recastMesh->getWater(), std::vector<Water>({
-            Water {1000, osg::Vec3f(100, 200, 300)}
+        EXPECT_EQ(recastMesh->getWater(), std::vector<Cell>({
+            Cell {1000, osg::Vec3f(100, 200, 300)}
         }));
     }
 
diff --git a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
index 59938ad2be..cb1f04b8b0 100644
--- a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -295,7 +295,7 @@ namespace
         ASSERT_TRUE(manager.addWater(cellPosition, cellSize, osg::Vec3f()));
         const auto result = manager.removeWater(cellPosition);
         ASSERT_TRUE(result.has_value());
-        EXPECT_EQ(result->mCellSize, cellSize);
+        EXPECT_EQ(result->mSize, cellSize);
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, remove_water_for_existing_cell_should_remove_empty_tiles)
diff --git a/components/detournavigator/cachedrecastmeshmanager.cpp b/components/detournavigator/cachedrecastmeshmanager.cpp
index 1242b32318..cfbb77f238 100644
--- a/components/detournavigator/cachedrecastmeshmanager.cpp
+++ b/components/detournavigator/cachedrecastmeshmanager.cpp
@@ -42,7 +42,7 @@ namespace DetourNavigator
         return true;
     }
 
-    std::optional<Water> CachedRecastMeshManager::removeWater(const osg::Vec2i& cellPosition)
+    std::optional<Cell> CachedRecastMeshManager::removeWater(const osg::Vec2i& cellPosition)
     {
         const auto water = mImpl.removeWater(cellPosition);
         if (water)
diff --git a/components/detournavigator/cachedrecastmeshmanager.hpp b/components/detournavigator/cachedrecastmeshmanager.hpp
index 247775e3e7..83eb5c1ec3 100644
--- a/components/detournavigator/cachedrecastmeshmanager.hpp
+++ b/components/detournavigator/cachedrecastmeshmanager.hpp
@@ -18,7 +18,7 @@ namespace DetourNavigator
 
         bool addWater(const osg::Vec2i& cellPosition, const int cellSize, const osg::Vec3f& shift);
 
-        std::optional<Water> removeWater(const osg::Vec2i& cellPosition);
+        std::optional<Cell> removeWater(const osg::Vec2i& cellPosition);
 
         std::optional<RemovedRecastMeshObject> removeObject(const ObjectId id);
 
diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index ba1e93f50e..9c0f726540 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -34,10 +34,10 @@ namespace
         osg::Vec3f mMax;
     };
 
-    WaterBounds getWaterBounds(const Water& water, const Settings& settings,
+    WaterBounds getWaterBounds(const Cell& water, const Settings& settings,
         const osg::Vec3f& agentHalfExtents)
     {
-        if (water.mCellSize == std::numeric_limits<int>::max())
+        if (water.mSize == std::numeric_limits<int>::max())
         {
             const auto transform = getSwimLevelTransform(settings, water.mShift, agentHalfExtents.z());
             const auto min = toNavMeshCoordinates(settings, Misc::Convert::makeOsgVec3f(transform(btVector3(-1, -1, 0))));
@@ -50,7 +50,7 @@ namespace
         else
         {
             const auto transform = getSwimLevelTransform(settings, water.mShift, agentHalfExtents.z());
-            const auto halfCellSize = water.mCellSize / 2.0f;
+            const auto halfCellSize = water.mSize / 2.0f;
             return WaterBounds {
                 toNavMeshCoordinates(settings, Misc::Convert::makeOsgVec3f(transform(btVector3(-halfCellSize, -halfCellSize, 0)))),
                 toNavMeshCoordinates(settings, Misc::Convert::makeOsgVec3f(transform(btVector3(halfCellSize, halfCellSize, 0))))
diff --git a/components/detournavigator/navmeshmanager.cpp b/components/detournavigator/navmeshmanager.cpp
index 767dfd59aa..f2dd814d46 100644
--- a/components/detournavigator/navmeshmanager.cpp
+++ b/components/detournavigator/navmeshmanager.cpp
@@ -85,7 +85,7 @@ namespace DetourNavigator
         const auto water = mRecastMeshManager.removeWater(cellPosition);
         if (!water)
             return false;
-        addChangedTiles(water->mCellSize, water->mShift, ChangeType::remove);
+        addChangedTiles(water->mSize, water->mShift, ChangeType::remove);
         return true;
     }
 
diff --git a/components/detournavigator/navmeshtilescache.hpp b/components/detournavigator/navmeshtilescache.hpp
index 974420c158..d218ffdcee 100644
--- a/components/detournavigator/navmeshtilescache.hpp
+++ b/components/detournavigator/navmeshtilescache.hpp
@@ -23,7 +23,7 @@ namespace DetourNavigator
     struct RecastMeshData
     {
         Mesh mMesh;
-        std::vector<Water> mWater;
+        std::vector<Cell> mWater;
     };
 
     inline bool operator <(const RecastMeshData& lhs, const RecastMeshData& rhs)
diff --git a/components/detournavigator/recastmesh.cpp b/components/detournavigator/recastmesh.cpp
index 354be8207b..bf7a97caa8 100644
--- a/components/detournavigator/recastmesh.cpp
+++ b/components/detournavigator/recastmesh.cpp
@@ -18,7 +18,7 @@ namespace DetourNavigator
         mAreaTypes = std::move(areaTypes);
     }
 
-    RecastMesh::RecastMesh(std::size_t generation, std::size_t revision, Mesh mesh, std::vector<Water> water)
+    RecastMesh::RecastMesh(std::size_t generation, std::size_t revision, Mesh mesh, std::vector<Cell> water)
         : mGeneration(generation)
         , mRevision(revision)
         , mMesh(std::move(mesh))
diff --git a/components/detournavigator/recastmesh.hpp b/components/detournavigator/recastmesh.hpp
index c1d01e48fd..f316abf653 100644
--- a/components/detournavigator/recastmesh.hpp
+++ b/components/detournavigator/recastmesh.hpp
@@ -45,16 +45,16 @@ namespace DetourNavigator
         }
     };
 
-    struct Water
+    struct Cell
     {
-        int mCellSize;
+        int mSize;
         osg::Vec3f mShift;
     };
 
     class RecastMesh
     {
     public:
-        RecastMesh(std::size_t generation, std::size_t revision, Mesh mesh, std::vector<Water> water);
+        RecastMesh(std::size_t generation, std::size_t revision, Mesh mesh, std::vector<Cell> water);
 
         std::size_t getGeneration() const
         {
@@ -68,7 +68,7 @@ namespace DetourNavigator
 
         const Mesh& getMesh() const noexcept { return mMesh; }
 
-        const std::vector<Water>& getWater() const
+        const std::vector<Cell>& getWater() const
         {
             return mWater;
         }
@@ -82,7 +82,7 @@ namespace DetourNavigator
         std::size_t mGeneration;
         std::size_t mRevision;
         Mesh mMesh;
-        std::vector<Water> mWater;
+        std::vector<Cell> mWater;
         Bounds mBounds;
 
         friend inline bool operator <(const RecastMesh& lhs, const RecastMesh& rhs) noexcept
@@ -92,13 +92,13 @@ namespace DetourNavigator
 
         friend inline std::size_t getSize(const RecastMesh& value) noexcept
         {
-            return getSize(value.mMesh) + value.mWater.size() * sizeof(Water);
+            return getSize(value.mMesh) + value.mWater.size() * sizeof(Cell);
         }
     };
 
-    inline bool operator<(const Water& lhs, const Water& rhs) noexcept
+    inline bool operator<(const Cell& lhs, const Cell& rhs) noexcept
     {
-        return std::tie(lhs.mCellSize, lhs.mShift) < std::tie(rhs.mCellSize, rhs.mShift);
+        return std::tie(lhs.mSize, lhs.mShift) < std::tie(rhs.mSize, rhs.mShift);
     }
 }
 
diff --git a/components/detournavigator/recastmeshbuilder.cpp b/components/detournavigator/recastmeshbuilder.cpp
index 1b2b5b08cd..b47d823199 100644
--- a/components/detournavigator/recastmeshbuilder.cpp
+++ b/components/detournavigator/recastmeshbuilder.cpp
@@ -160,7 +160,7 @@ namespace DetourNavigator
 
     void RecastMeshBuilder::addWater(const int cellSize, const osg::Vec3f& shift)
     {
-        mWater.push_back(Water {cellSize, shift});
+        mWater.push_back(Cell {cellSize, shift});
     }
 
     std::shared_ptr<RecastMesh> RecastMeshBuilder::create(std::size_t generation, std::size_t revision) &&
diff --git a/components/detournavigator/recastmeshbuilder.hpp b/components/detournavigator/recastmeshbuilder.hpp
index 95dfc9cb52..d08ff94418 100644
--- a/components/detournavigator/recastmeshbuilder.hpp
+++ b/components/detournavigator/recastmeshbuilder.hpp
@@ -56,7 +56,7 @@ namespace DetourNavigator
     private:
         const TileBounds mBounds;
         std::vector<RecastMeshTriangle> mTriangles;
-        std::vector<Water> mWater;
+        std::vector<Cell> mWater;
 
         void addObject(const btConcaveShape& shape, const btTransform& transform, btTriangleCallback&& callback);
 
diff --git a/components/detournavigator/recastmeshmanager.cpp b/components/detournavigator/recastmeshmanager.cpp
index 336ecf3fe5..e8ecee6027 100644
--- a/components/detournavigator/recastmeshmanager.cpp
+++ b/components/detournavigator/recastmeshmanager.cpp
@@ -49,19 +49,19 @@ namespace DetourNavigator
 
     bool RecastMeshManager::addWater(const osg::Vec2i& cellPosition, const int cellSize, const osg::Vec3f& shift)
     {
-        if (!mWater.emplace(cellPosition, Water {cellSize, shift}).second)
+        if (!mWater.emplace(cellPosition, Cell {cellSize, shift}).second)
             return false;
         ++mRevision;
         return true;
     }
 
-    std::optional<Water> RecastMeshManager::removeWater(const osg::Vec2i& cellPosition)
+    std::optional<Cell> RecastMeshManager::removeWater(const osg::Vec2i& cellPosition)
     {
         const auto water = mWater.find(cellPosition);
         if (water == mWater.end())
             return std::nullopt;
         ++mRevision;
-        const Water result = water->second;
+        const Cell result = water->second;
         mWater.erase(water);
         return result;
     }
@@ -73,7 +73,7 @@ namespace DetourNavigator
         tileBounds.mMax /= mSettings.mRecastScaleFactor;
         RecastMeshBuilder builder(tileBounds);
         for (const auto& [k, v] : mWater)
-            builder.addWater(v.mCellSize, v.mShift);
+            builder.addWater(v.mSize, v.mShift);
         for (const auto& [k, object] : mObjects)
         {
             const RecastMeshObject& v = object.getImpl();
diff --git a/components/detournavigator/recastmeshmanager.hpp b/components/detournavigator/recastmeshmanager.hpp
index bcb716353a..266d6a9385 100644
--- a/components/detournavigator/recastmeshmanager.hpp
+++ b/components/detournavigator/recastmeshmanager.hpp
@@ -39,7 +39,7 @@ namespace DetourNavigator
 
         bool addWater(const osg::Vec2i& cellPosition, const int cellSize, const osg::Vec3f& shift);
 
-        std::optional<Water> removeWater(const osg::Vec2i& cellPosition);
+        std::optional<Cell> removeWater(const osg::Vec2i& cellPosition);
 
         std::optional<RemovedRecastMeshObject> removeObject(const ObjectId id);
 
@@ -63,7 +63,7 @@ namespace DetourNavigator
         std::size_t mGeneration;
         TileBounds mTileBounds;
         std::map<ObjectId, OscillatingRecastMeshObject> mObjects;
-        std::map<osg::Vec2i, Water> mWater;
+        std::map<osg::Vec2i, Cell> mWater;
         std::optional<Report> mLastNavMeshReportedChange;
         std::optional<Report> mLastNavMeshReport;
     };
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.cpp b/components/detournavigator/tilecachedrecastmeshmanager.cpp
index 15851d7daa..1292e31d4e 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -102,12 +102,12 @@ namespace DetourNavigator
         return result;
     }
 
-    std::optional<Water> TileCachedRecastMeshManager::removeWater(const osg::Vec2i& cellPosition)
+    std::optional<Cell> TileCachedRecastMeshManager::removeWater(const osg::Vec2i& cellPosition)
     {
         const auto object = mWaterTilesPositions.find(cellPosition);
         if (object == mWaterTilesPositions.end())
             return std::nullopt;
-        std::optional<Water> result;
+        std::optional<Cell> result;
         for (const auto& tilePosition : object->second)
         {
             const auto tiles = mTiles.lock();
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.hpp b/components/detournavigator/tilecachedrecastmeshmanager.hpp
index 2c0faeca7d..4ea705f4cd 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.hpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.hpp
@@ -78,7 +78,7 @@ namespace DetourNavigator
 
         bool addWater(const osg::Vec2i& cellPosition, const int cellSize, const osg::Vec3f& shift);
 
-        std::optional<Water> removeWater(const osg::Vec2i& cellPosition);
+        std::optional<Cell> removeWater(const osg::Vec2i& cellPosition);
 
         std::shared_ptr<RecastMesh> getMesh(const TilePosition& tilePosition);
 

From 24b802b3d8683513006674f0c304f631606932ad Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 16 Jul 2021 00:09:05 +0200
Subject: [PATCH 1087/2859] Simplify adding water to recast mesh

Remove redundant computations and conversions.
---
 components/detournavigator/makenavmesh.cpp   | 81 ++++++++++----------
 components/detournavigator/settingsutils.hpp | 18 ++---
 2 files changed, 46 insertions(+), 53 deletions(-)

diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index 9c0f726540..797d73667b 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -28,32 +28,35 @@ namespace
 {
     using namespace DetourNavigator;
 
-    struct WaterBounds
+    struct Rectangle
     {
-        osg::Vec3f mMin;
-        osg::Vec3f mMax;
+        TileBounds mBounds;
+        float mHeight;
     };
 
-    WaterBounds getWaterBounds(const Cell& water, const Settings& settings,
+    Rectangle getSwimRectangle(const Cell& water, const Settings& settings,
         const osg::Vec3f& agentHalfExtents)
     {
         if (water.mSize == std::numeric_limits<int>::max())
         {
-            const auto transform = getSwimLevelTransform(settings, water.mShift, agentHalfExtents.z());
-            const auto min = toNavMeshCoordinates(settings, Misc::Convert::makeOsgVec3f(transform(btVector3(-1, -1, 0))));
-            const auto max = toNavMeshCoordinates(settings, Misc::Convert::makeOsgVec3f(transform(btVector3(1, 1, 0))));
-            return WaterBounds {
-                osg::Vec3f(-std::numeric_limits<float>::max(), min.y(), -std::numeric_limits<float>::max()),
-                osg::Vec3f(std::numeric_limits<float>::max(), max.y(), std::numeric_limits<float>::max())
+            return Rectangle {
+                TileBounds {
+                    osg::Vec2f(-std::numeric_limits<float>::max(), -std::numeric_limits<float>::max()),
+                    osg::Vec2f(std::numeric_limits<float>::max(), std::numeric_limits<float>::max())
+                },
+                toNavMeshCoordinates(settings, getSwimLevel(settings, water.mShift.z(), agentHalfExtents.z()))
             };
         }
         else
         {
-            const auto transform = getSwimLevelTransform(settings, water.mShift, agentHalfExtents.z());
-            const auto halfCellSize = water.mSize / 2.0f;
-            return WaterBounds {
-                toNavMeshCoordinates(settings, Misc::Convert::makeOsgVec3f(transform(btVector3(-halfCellSize, -halfCellSize, 0)))),
-                toNavMeshCoordinates(settings, Misc::Convert::makeOsgVec3f(transform(btVector3(halfCellSize, halfCellSize, 0))))
+            const osg::Vec2f shift(water.mShift.x(), water.mShift.y());
+            const float halfCellSize = water.mSize / 2.0f;
+            return Rectangle {
+                TileBounds{
+                    toNavMeshCoordinates(settings, shift + osg::Vec2f(-halfCellSize, -halfCellSize)),
+                    toNavMeshCoordinates(settings, shift + osg::Vec2f(halfCellSize, halfCellSize))
+                },
+                toNavMeshCoordinates(settings, getSwimLevel(settings, water.mShift.z(), agentHalfExtents.z()))
             };
         }
     }
@@ -192,49 +195,43 @@ namespace
         );
     }
 
-    void rasterizeWaterTriangles(rcContext& context, const osg::Vec3f& agentHalfExtents, const RecastMesh& recastMesh,
+    void rasterizeWaterTriangles(rcContext& context, const osg::Vec3f& agentHalfExtents, const std::vector<Cell>& cells,
         const Settings& settings, const rcConfig& config, rcHeightfield& solid)
     {
         const std::array<unsigned char, 2> areas {{AreaType_water, AreaType_water}};
 
-        for (const auto& water : recastMesh.getWater())
+        for (const Cell& cell : cells)
         {
-            const auto bounds = getWaterBounds(water, settings, agentHalfExtents);
+            const auto rectangle = getSwimRectangle(cell, settings, agentHalfExtents);
 
             const osg::Vec2f tileBoundsMin(
-                std::min(config.bmax[0], std::max(config.bmin[0], bounds.mMin.x())),
-                std::min(config.bmax[2], std::max(config.bmin[2], bounds.mMin.z()))
+                std::min(config.bmax[0], std::max(config.bmin[0], rectangle.mBounds.mMin.x())),
+                std::min(config.bmax[2], std::max(config.bmin[2], rectangle.mBounds.mMin.y()))
             );
             const osg::Vec2f tileBoundsMax(
-                std::min(config.bmax[0], std::max(config.bmin[0], bounds.mMax.x())),
-                std::min(config.bmax[2], std::max(config.bmin[2], bounds.mMax.z()))
+                std::min(config.bmax[0], std::max(config.bmin[0], rectangle.mBounds.mMax.x())),
+                std::min(config.bmax[2], std::max(config.bmin[2], rectangle.mBounds.mMax.y()))
             );
 
             if (tileBoundsMax == tileBoundsMin)
                 continue;
 
-            const std::array<osg::Vec3f, 4> vertices {{
-                osg::Vec3f(tileBoundsMin.x(), bounds.mMin.y(), tileBoundsMin.y()),
-                osg::Vec3f(tileBoundsMin.x(), bounds.mMin.y(), tileBoundsMax.y()),
-                osg::Vec3f(tileBoundsMax.x(), bounds.mMin.y(), tileBoundsMax.y()),
-                osg::Vec3f(tileBoundsMax.x(), bounds.mMin.y(), tileBoundsMin.y()),
-            }};
-
-            std::array<float, 4 * 3> convertedVertices;
-            auto convertedVerticesIt = convertedVertices.begin();
-
-            for (const auto& vertex : vertices)
-                convertedVerticesIt = std::copy(vertex.ptr(), vertex.ptr() + 3, convertedVerticesIt);
+            const std::array vertices {
+                tileBoundsMin.x(), rectangle.mHeight, tileBoundsMin.y(),
+                tileBoundsMin.x(), rectangle.mHeight, tileBoundsMax.y(),
+                tileBoundsMax.x(), rectangle.mHeight, tileBoundsMax.y(),
+                tileBoundsMax.x(), rectangle.mHeight, tileBoundsMin.y(),
+            };
 
-            const std::array<int, 6> indices {{
+            const std::array indices {
                 0, 1, 2,
                 0, 2, 3,
-            }};
+            };
 
             const auto trianglesRasterized = rcRasterizeTriangles(
                 &context,
-                convertedVertices.data(),
-                static_cast<int>(convertedVertices.size() / 3),
+                vertices.data(),
+                static_cast<int>(vertices.size() / 3),
                 indices.data(),
                 areas.data(),
                 static_cast<int>(areas.size()),
@@ -253,7 +250,7 @@ namespace
         if (!rasterizeTriangles(context, recastMesh.getMesh(), settings, config, solid))
             return false;
 
-        rasterizeWaterTriangles(context, agentHalfExtents, recastMesh, settings, config, solid);
+        rasterizeWaterTriangles(context, agentHalfExtents, recastMesh.getWater(), settings, config, solid);
 
         return true;
     }
@@ -504,9 +501,9 @@ namespace DetourNavigator
 
         for (const auto& water : recastMesh->getWater())
         {
-            const auto waterBounds = getWaterBounds(water, settings, agentHalfExtents);
-            recastMeshBounds.mMin.y() = std::min(recastMeshBounds.mMin.y(), waterBounds.mMin.y());
-            recastMeshBounds.mMax.y() = std::max(recastMeshBounds.mMax.y(), waterBounds.mMax.y());
+            const float height = toNavMeshCoordinates(settings, getSwimLevel(settings, water.mShift.z(), agentHalfExtents.z()));
+            recastMeshBounds.mMin.y() = std::min(recastMeshBounds.mMin.y(), height);
+            recastMeshBounds.mMax.y() = std::max(recastMeshBounds.mMax.y(), height);
         }
 
         if (isEmpty(recastMeshBounds))
diff --git a/components/detournavigator/settingsutils.hpp b/components/detournavigator/settingsutils.hpp
index cbd0205e7f..258eb64c65 100644
--- a/components/detournavigator/settingsutils.hpp
+++ b/components/detournavigator/settingsutils.hpp
@@ -37,6 +37,11 @@ namespace DetourNavigator
         return value * settings.mRecastScaleFactor;
     }
 
+    inline osg::Vec2f toNavMeshCoordinates(const Settings& settings, osg::Vec2f position)
+    {
+        return position * settings.mRecastScaleFactor;
+    }
+
     inline osg::Vec3f toNavMeshCoordinates(const Settings& settings, osg::Vec3f position)
     {
         std::swap(position.y(), position.z());
@@ -77,18 +82,9 @@ namespace DetourNavigator
         return static_cast<float>(settings.mBorderSize) * settings.mCellSize;
     }
 
-    inline float getSwimLevel(const Settings& settings, const float agentHalfExtentsZ)
+    inline float getSwimLevel(const Settings& settings, const float waterLevel, const float agentHalfExtentsZ)
     {
-        return - settings.mSwimHeightScale * agentHalfExtentsZ;
-    }
-
-    inline btTransform getSwimLevelTransform(const Settings& settings, const osg::Vec3f& shift,
-        const float agentHalfExtentsZ)
-    {
-        return btTransform(
-            btMatrix3x3::getIdentity(),
-            btVector3(shift.x(), shift.y(), shift.z() + getSwimLevel(settings, agentHalfExtentsZ) - agentHalfExtentsZ)
-        );
+        return waterLevel - settings.mSwimHeightScale * agentHalfExtentsZ - agentHalfExtentsZ;;
     }
 
     inline float getRealTileSize(const Settings& settings)

From fdee9db20c4cd2b281b7c17359844a169cd67f45 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 17 Jul 2021 13:32:57 +0200
Subject: [PATCH 1088/2859] Consider RecastMeshManager not empty when there is
 water

---
 .../tilecachedrecastmeshmanager.cpp                | 14 ++++++++++++++
 components/detournavigator/recastmeshmanager.cpp   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
index cb1f04b8b0..4c49e75dc9 100644
--- a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -323,4 +323,18 @@ namespace
             for (int y = -6; y < 6; ++y)
                 ASSERT_EQ(manager.hasTile(TilePosition(x, y)), -1 <= x && x <= 0 && -1 <= y && y <= 0);
     }
+
+    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, remove_object_should_not_remove_tile_with_water)
+    {
+        TileCachedRecastMeshManager manager(mSettings);
+        const osg::Vec2i cellPosition(0, 0);
+        const int cellSize = 8192;
+        const btBoxShape boxShape(btVector3(20, 20, 100));
+        ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground));
+        ASSERT_TRUE(manager.addWater(cellPosition, cellSize, osg::Vec3f()));
+        ASSERT_TRUE(manager.removeObject(ObjectId(&boxShape)));
+        for (int x = -6; x < 6; ++x)
+            for (int y = -6; y < 6; ++y)
+                ASSERT_TRUE(manager.hasTile(TilePosition(x, y)));
+    }
 }
diff --git a/components/detournavigator/recastmeshmanager.cpp b/components/detournavigator/recastmeshmanager.cpp
index e8ecee6027..a6798ee8cd 100644
--- a/components/detournavigator/recastmeshmanager.cpp
+++ b/components/detournavigator/recastmeshmanager.cpp
@@ -84,7 +84,7 @@ namespace DetourNavigator
 
     bool RecastMeshManager::isEmpty() const
     {
-        return mObjects.empty();
+        return mObjects.empty() && mWater.empty();
     }
 
     void RecastMeshManager::reportNavMeshChange(const Version& recastMeshVersion, const Version& navMeshVersion)

From 28b2f769c28116ef30f6ca8cf3c65dfe411917aa Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 19 Jul 2021 18:26:38 +0200
Subject: [PATCH 1089/2859] Update navmeshtilescache benchmark generators

---
 apps/benchmarks/detournavigator/navmeshtilescache.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/benchmarks/detournavigator/navmeshtilescache.cpp b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
index 70ffdde3c9..e31514afaf 100644
--- a/apps/benchmarks/detournavigator/navmeshtilescache.cpp
+++ b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
@@ -94,8 +94,8 @@ namespace
         std::vector<float> vertices;
         std::vector<int> indices;
         std::vector<AreaType> areaTypes;
-        generateVertices(std::back_inserter(vertices), triangles * 1.98, random);
-        generateIndices(std::back_inserter(indices), static_cast<int>(vertices.size() / 3) - 1, vertices.size() * 1.53, random);
+        generateVertices(std::back_inserter(vertices), triangles * 1.946, random);
+        generateIndices(std::back_inserter(indices), static_cast<int>(vertices.size() / 3) - 1, vertices.size() * 1.545, random);
         generateAreaTypes(std::back_inserter(areaTypes), indices.size() / 3, random);
         return Mesh(std::move(indices), std::move(vertices), std::move(areaTypes));
     }
@@ -109,12 +109,12 @@ namespace
         const std::size_t revision = std::uniform_int_distribution<std::size_t>(0, 10000)(random);
         Mesh mesh = generateMesh(triangles, random);
         std::vector<Cell> water;
-        generateWater(std::back_inserter(water), 2, random);
+        generateWater(std::back_inserter(water), 1, random);
         RecastMesh recastMesh(generation, revision, std::move(mesh), std::move(water));
         return Key {agentHalfExtents, tilePosition, std::move(recastMesh)};
     }
 
-    constexpr std::size_t trianglesPerTile = 310;
+    constexpr std::size_t trianglesPerTile = 438;
 
     template <typename OutputIterator, typename Random>
     void generateKeys(OutputIterator out, std::size_t count, Random& random)

From 9a5ec5fd0333375a2376bbb1b56a0472a9889415 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 14 Jul 2021 20:57:52 +0200
Subject: [PATCH 1090/2859] Store heightfields as array of heights instead of
 triangles

To reduce size of RecastMesh and therefore cache size.
---
 .../detournavigator/navmeshtilescache.cpp     |  51 +++-
 apps/openmw/mwworld/scene.cpp                 |  29 ++-
 .../detournavigator/navigator.cpp             | 218 ++++++++++++++----
 .../detournavigator/navmeshtilescache.cpp     |  35 +--
 .../detournavigator/recastmeshbuilder.cpp     |  94 ++++++++
 .../cachedrecastmeshmanager.cpp               |  17 ++
 .../cachedrecastmeshmanager.hpp               |   8 +-
 .../detournavigator/heightfieldshape.hpp      |  25 ++
 components/detournavigator/makenavmesh.cpp    | 120 ++++++----
 components/detournavigator/navigator.hpp      |   8 +
 components/detournavigator/navigatorimpl.cpp  |  12 +
 components/detournavigator/navigatorimpl.hpp  |   5 +
 components/detournavigator/navigatorstub.hpp  |  11 +
 components/detournavigator/navmeshmanager.cpp |  18 ++
 components/detournavigator/navmeshmanager.hpp |   6 +
 .../detournavigator/navmeshtilescache.cpp     |   3 +-
 .../detournavigator/navmeshtilescache.hpp     |  14 +-
 components/detournavigator/recastmesh.cpp     |  27 ++-
 components/detournavigator/recastmesh.hpp     |  55 ++++-
 .../detournavigator/recastmeshbuilder.cpp     |  95 +++++++-
 .../detournavigator/recastmeshbuilder.hpp     |  11 +-
 .../detournavigator/recastmeshmanager.cpp     |  48 +++-
 .../detournavigator/recastmeshmanager.hpp     |  17 +-
 components/detournavigator/tilebounds.hpp     |  22 ++
 .../tilecachedrecastmeshmanager.cpp           |  62 +++++
 .../tilecachedrecastmeshmanager.hpp           |   7 +
 components/sceneutil/recastmesh.cpp           |  15 +-
 27 files changed, 897 insertions(+), 136 deletions(-)
 create mode 100644 components/detournavigator/heightfieldshape.hpp

diff --git a/apps/benchmarks/detournavigator/navmeshtilescache.cpp b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
index e31514afaf..6c530db41c 100644
--- a/apps/benchmarks/detournavigator/navmeshtilescache.cpp
+++ b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
@@ -1,6 +1,7 @@
 #include <benchmark/benchmark.h>
 
 #include <components/detournavigator/navmeshtilescache.hpp>
+#include <components/esm/loadland.hpp>
 
 #include <algorithm>
 #include <random>
@@ -30,6 +31,14 @@ namespace
         return TilePosition(distribution(random), distribution(random));
     }
 
+    template <typename Random>
+    TileBounds generateTileBounds(Random& random)
+    {
+        std::uniform_real_distribution<float> distribution(0.0, 1.0);
+        const osg::Vec2f min(distribution(random), distribution(random));
+        return TileBounds {min, min + osg::Vec2f(1.0, 1.0)};
+    }
+
     template <typename Random>
     osg::Vec3f generateAgentHalfExtents(float min, float max, Random& random)
     {
@@ -94,12 +103,43 @@ namespace
         std::vector<float> vertices;
         std::vector<int> indices;
         std::vector<AreaType> areaTypes;
-        generateVertices(std::back_inserter(vertices), triangles * 1.946, random);
-        generateIndices(std::back_inserter(indices), static_cast<int>(vertices.size() / 3) - 1, vertices.size() * 1.545, random);
-        generateAreaTypes(std::back_inserter(areaTypes), indices.size() / 3, random);
+        if (distribution(random) < 0.939)
+        {
+            generateVertices(std::back_inserter(vertices), triangles * 2.467, random);
+            generateIndices(std::back_inserter(indices), static_cast<int>(vertices.size() / 3) - 1, vertices.size() * 1.279, random);
+            generateAreaTypes(std::back_inserter(areaTypes), indices.size() / 3, random);
+        }
         return Mesh(std::move(indices), std::move(vertices), std::move(areaTypes));
     }
 
+    template <class Random>
+    Heightfield generateHeightfield(Random& random)
+    {
+        std::uniform_real_distribution<float> distribution(0.0, 1.0);
+        Heightfield result;
+        result.mBounds = generateTileBounds(random);
+        result.mMinHeight = distribution(random);
+        result.mMaxHeight = result.mMinHeight + 1.0;
+        result.mShift = osg::Vec3f(distribution(random), distribution(random), distribution(random));
+        result.mScale = distribution(random);
+        result.mLength = static_cast<std::uint8_t>(ESM::Land::LAND_SIZE);
+        std::generate_n(std::back_inserter(result.mHeights), ESM::Land::LAND_NUM_VERTS, [&]
+        {
+            return distribution(random);
+        });
+        return result;
+    }
+
+    template <class Random>
+    FlatHeightfield generateFlatHeightfield(Random& random)
+    {
+        std::uniform_real_distribution<float> distribution(0.0, 1.0);
+        FlatHeightfield result;
+        result.mBounds = generateTileBounds(random);
+        result.mHeight = distribution(random);
+        return result;
+    }
+
     template <class Random>
     Key generateKey(std::size_t triangles, Random& random)
     {
@@ -110,11 +150,12 @@ namespace
         Mesh mesh = generateMesh(triangles, random);
         std::vector<Cell> water;
         generateWater(std::back_inserter(water), 1, random);
-        RecastMesh recastMesh(generation, revision, std::move(mesh), std::move(water));
+        RecastMesh recastMesh(generation, revision, std::move(mesh), std::move(water),
+                              {generateHeightfield(random)}, {generateFlatHeightfield(random)});
         return Key {agentHalfExtents, tilePosition, std::move(recastMesh)};
     }
 
-    constexpr std::size_t trianglesPerTile = 438;
+    constexpr std::size_t trianglesPerTile = 239;
 
     template <typename OutputIterator, typename Random>
     void generateKeys(OutputIterator out, std::size_t count, Random& random)
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 61ef3e1538..1dc0f904bc 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -20,6 +20,7 @@
 #include <components/detournavigator/navigator.hpp>
 #include <components/detournavigator/debug.hpp>
 #include <components/misc/convert.hpp>
+#include <components/detournavigator/heightfieldshape.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
@@ -422,6 +423,8 @@ namespace MWWorld
 
     void Scene::activateCell (CellStore *cell, Loading::Listener* loadingListener, bool respawn, bool test)
     {
+        using DetourNavigator::HeightfieldShape;
+
         assert(mActiveCells.find(cell) == mActiveCells.end());
         assert(mInactiveCells.find(cell) != mInactiveCells.end());
         mActiveCells.insert(cell);
@@ -439,8 +442,30 @@ namespace MWWorld
         if (!test && cell->getCell()->isExterior())
         {
             if (const auto heightField = mPhysics->getHeightField(cellX, cellY))
-                mNavigator.addObject(DetourNavigator::ObjectId(heightField), *heightField->getShape(),
-                        heightField->getCollisionObject()->getWorldTransform());
+            {
+                const osg::Vec2i cellPosition(cellX, cellY);
+                const btVector3& origin = heightField->getCollisionObject()->getWorldTransform().getOrigin();
+                const osg::Vec3f shift(origin.x(), origin.y(), origin.z());
+                const osg::ref_ptr<const ESMTerrain::LandObject> land = mRendering.getLandManager()->getLand(cellX, cellY);
+                const ESM::Land::LandData* const data = land == nullptr ? nullptr : land->getData(ESM::Land::DATA_VHGT);
+                const HeightfieldShape shape = [&] () -> HeightfieldShape
+                {
+                    if (data == nullptr)
+                    {
+                        return DetourNavigator::HeightfieldPlane {static_cast<float>(ESM::Land::DEFAULT_HEIGHT)};
+                    }
+                    else
+                    {
+                        DetourNavigator::HeightfieldSurface heights;
+                        heights.mHeights = data->mHeights;
+                        heights.mSize = static_cast<std::size_t>(ESM::Land::LAND_SIZE);
+                        heights.mMinHeight = data->mMinHeight;
+                        heights.mMaxHeight = data->mMaxHeight;
+                        return heights;
+                    }
+                } ();
+                mNavigator.addHeightfield(cellPosition, ESM::Land::REAL_SIZE, shift, shape);
+            }
         }
 
         if (const auto pathgrid = world->getStore().get<ESM::Pathgrid>().search(*cell->getCell()))
diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index b815c50bbe..a75275079b 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -4,6 +4,7 @@
 #include <components/detournavigator/exceptions.hpp>
 #include <components/misc/rng.hpp>
 #include <components/loadinglistener/loadinglistener.hpp>
+#include <components/esm/loadland.hpp>
 
 #include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
 #include <BulletCollision/CollisionShapes/btBoxShape.h>
@@ -38,6 +39,9 @@ namespace
         float mStepSize;
         AreaCosts mAreaCosts;
         Loading::Listener mListener;
+        const osg::Vec2i mCellPosition {0, 0};
+        const int mHeightfieldTileSize = ESM::Land::REAL_SIZE / (ESM::Land::LAND_SIZE - 1);
+        const osg::Vec3f mShift {0, 0, 0};
 
         DetourNavigatorNavigatorTest()
             : mPlayerPosition(0, 0, 0)
@@ -90,6 +94,19 @@ namespace
         return btHeightfieldTerrainShape(width, width, values.data(), heightScale, -greater, greater, upAxis, heightDataType, flipQuadEdges);
     }
 
+    template <std::size_t size>
+    HeightfieldSurface makeSquareHeightfieldSurface(const std::array<float, size>& values)
+    {
+        const auto [min, max] = std::minmax_element(values.begin(), values.end());
+        const float greater = std::max(std::abs(*min), std::abs(*max));
+        HeightfieldSurface surface;
+        surface.mHeights = values.data();
+        surface.mMinHeight = -greater;
+        surface.mMaxHeight = greater;
+        surface.mSize = static_cast<int>(std::sqrt(size));
+        return surface;
+    }
+
     TEST_F(DetourNavigatorNavigatorTest, find_path_for_empty_should_return_empty)
     {
         EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut),
@@ -115,18 +132,17 @@ namespace
 
     TEST_F(DetourNavigatorNavigatorTest, update_then_find_path_should_return_path)
     {
-        const std::array<btScalar, 5 * 5> heightfieldData {{
+        constexpr std::array<float, 5 * 5> heightfieldData {{
             0,   0,    0,    0,    0,
             0, -25,  -25,  -25,  -25,
             0, -25, -100, -100, -100,
             0, -25, -100, -100, -100,
             0, -25, -100, -100, -100,
         }};
-        btHeightfieldTerrainShape shape = makeSquareHeightfieldTerrainShape(heightfieldData);
-        shape.setLocalScaling(btVector3(128, 128, 1));
+        const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addObject(ObjectId(&shape), shape, btTransform::getIdentity());
+        mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::requiredTilesPresent);
 
@@ -160,22 +176,21 @@ namespace
 
     TEST_F(DetourNavigatorNavigatorTest, add_object_should_change_navmesh)
     {
-        const std::array<btScalar, 5 * 5> heightfieldData {{
+        const std::array<float, 5 * 5> heightfieldData {{
             0,   0,    0,    0,    0,
             0, -25,  -25,  -25,  -25,
             0, -25, -100, -100, -100,
             0, -25, -100, -100, -100,
             0, -25, -100, -100, -100,
         }};
-        btHeightfieldTerrainShape heightfieldShape = makeSquareHeightfieldTerrainShape(heightfieldData);
-        heightfieldShape.setLocalScaling(btVector3(128, 128, 1));
+        const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
 
         btBoxShape boxShape(btVector3(20, 20, 100));
         btCompoundShape compoundShape;
         compoundShape.addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(0, 0, 0)), &boxShape);
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addObject(ObjectId(&heightfieldShape), heightfieldShape, btTransform::getIdentity());
+        mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -243,22 +258,21 @@ namespace
 
     TEST_F(DetourNavigatorNavigatorTest, update_changed_object_should_change_navmesh)
     {
-        const std::array<btScalar, 5 * 5> heightfieldData {{
+        const std::array<float, 5 * 5> heightfieldData {{
             0,   0,    0,    0,    0,
             0, -25,  -25,  -25,  -25,
             0, -25, -100, -100, -100,
             0, -25, -100, -100, -100,
             0, -25, -100, -100, -100,
         }};
-        btHeightfieldTerrainShape heightfieldShape = makeSquareHeightfieldTerrainShape(heightfieldData);
-        heightfieldShape.setLocalScaling(btVector3(128, 128, 1));
+        const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
 
         btBoxShape boxShape(btVector3(20, 20, 100));
         btCompoundShape compoundShape;
         compoundShape.addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(0, 0, 0)), &boxShape);
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addObject(ObjectId(&heightfieldShape), heightfieldShape, btTransform::getIdentity());
+        mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
         mNavigator->addObject(ObjectId(&compoundShape), compoundShape, btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
@@ -327,16 +341,16 @@ namespace
         )) << mPath;
     }
 
-    TEST_F(DetourNavigatorNavigatorTest, for_overlapping_heightfields_should_use_higher)
+    TEST_F(DetourNavigatorNavigatorTest, for_overlapping_heightfields_objects_should_use_higher)
     {
-        const std::array<btScalar, 5 * 5> heightfieldData {{
+        const std::array<btScalar, 5 * 5> heightfieldData1 {{
             0,   0,    0,    0,    0,
             0, -25,  -25,  -25,  -25,
             0, -25, -100, -100, -100,
             0, -25, -100, -100, -100,
             0, -25, -100, -100, -100,
         }};
-        btHeightfieldTerrainShape shape = makeSquareHeightfieldTerrainShape(heightfieldData);
+        btHeightfieldTerrainShape shape = makeSquareHeightfieldTerrainShape(heightfieldData1);
         shape.setLocalScaling(btVector3(128, 128, 1));
 
         const std::array<btScalar, 5 * 5> heightfieldData2 {{
@@ -383,6 +397,31 @@ namespace
         )) << mPath;
     }
 
+    TEST_F(DetourNavigatorNavigatorTest, only_one_heightfield_per_cell_is_allowed)
+    {
+        const std::array<float, 5 * 5> heightfieldData1 {{
+            0,   0,    0,    0,    0,
+            0, -25,  -25,  -25,  -25,
+            0, -25, -100, -100, -100,
+            0, -25, -100, -100, -100,
+            0, -25, -100, -100, -100,
+        }};
+        const HeightfieldSurface surface1 = makeSquareHeightfieldSurface(heightfieldData1);
+
+        const std::array<float, 5 * 5> heightfieldData2 {{
+            -25, -25, -25, -25, -25,
+            -25, -25, -25, -25, -25,
+            -25, -25, -25, -25, -25,
+            -25, -25, -25, -25, -25,
+            -25, -25, -25, -25, -25,
+        }};
+        const HeightfieldSurface surface2 = makeSquareHeightfieldSurface(heightfieldData2);
+
+        mNavigator->addAgent(mAgentHalfExtents);
+        EXPECT_TRUE(mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface1.mSize - 1), mShift, surface1));
+        EXPECT_FALSE(mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface2.mSize - 1), mShift, surface2));
+    }
+
     TEST_F(DetourNavigatorNavigatorTest, path_should_be_around_avoid_shape)
     {
         std::array<btScalar, 5 * 5> heightfieldData {{
@@ -441,19 +480,18 @@ namespace
 
     TEST_F(DetourNavigatorNavigatorTest, path_should_be_over_water_ground_lower_than_water_with_only_swim_flag)
     {
-        std::array<btScalar, 5 * 5> heightfieldData {{
+        std::array<float, 5 * 5> heightfieldData {{
             -50,  -50,  -50,  -50,    0,
             -50, -100, -150, -100,  -50,
             -50, -150, -200, -150, -100,
             -50, -100, -150, -100, -100,
               0,  -50, -100, -100, -100,
         }};
-        btHeightfieldTerrainShape shape = makeSquareHeightfieldTerrainShape(heightfieldData);
-        shape.setLocalScaling(btVector3(128, 128, 1));
+        const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
 
         mNavigator->addAgent(mAgentHalfExtents);
         mNavigator->addWater(osg::Vec2i(0, 0), 128 * 4, osg::Vec3f(0, 0, 300));
-        mNavigator->addObject(ObjectId(&shape), shape, btTransform::getIdentity());
+        mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -486,7 +524,7 @@ namespace
 
     TEST_F(DetourNavigatorNavigatorTest, path_should_be_over_water_when_ground_cross_water_with_swim_and_walk_flags)
     {
-        std::array<btScalar, 7 * 7> heightfieldData {{
+        std::array<float, 7 * 7> heightfieldData {{
             0,    0,    0,    0,    0,    0, 0,
             0, -100, -100, -100, -100, -100, 0,
             0, -100, -150, -150, -150, -100, 0,
@@ -495,12 +533,11 @@ namespace
             0, -100, -100, -100, -100, -100, 0,
             0,    0,    0,    0,    0,    0, 0,
         }};
-        btHeightfieldTerrainShape shape = makeSquareHeightfieldTerrainShape(heightfieldData);
-        shape.setLocalScaling(btVector3(128, 128, 1));
+        const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addWater(osg::Vec2i(0, 0), 128 * 4, osg::Vec3f(0, 0, -25));
-        mNavigator->addObject(ObjectId(&shape), shape, btTransform::getIdentity());
+        mNavigator->addWater(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), osg::Vec3f(0, 0, -25));
+        mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -532,7 +569,7 @@ namespace
 
     TEST_F(DetourNavigatorNavigatorTest, path_should_be_over_water_when_ground_cross_water_with_max_int_cells_size_and_swim_and_walk_flags)
     {
-        std::array<btScalar, 7 * 7> heightfieldData {{
+        std::array<float, 7 * 7> heightfieldData {{
             0,    0,    0,    0,    0,    0, 0,
             0, -100, -100, -100, -100, -100, 0,
             0, -100, -150, -150, -150, -100, 0,
@@ -541,11 +578,10 @@ namespace
             0, -100, -100, -100, -100, -100, 0,
             0,    0,    0,    0,    0,    0, 0,
         }};
-        btHeightfieldTerrainShape shape = makeSquareHeightfieldTerrainShape(heightfieldData);
-        shape.setLocalScaling(btVector3(128, 128, 1));
+        const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addObject(ObjectId(&shape), shape, btTransform::getIdentity());
+        mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
         mNavigator->addWater(osg::Vec2i(0, 0), std::numeric_limits<int>::max(), osg::Vec3f(0, 0, -25));
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
@@ -578,7 +614,7 @@ namespace
 
     TEST_F(DetourNavigatorNavigatorTest, path_should_be_over_ground_when_ground_cross_water_with_only_walk_flag)
     {
-        std::array<btScalar, 7 * 7> heightfieldData {{
+        std::array<float, 7 * 7> heightfieldData {{
             0,    0,    0,    0,    0,    0, 0,
             0, -100, -100, -100, -100, -100, 0,
             0, -100, -150, -150, -150, -100, 0,
@@ -587,12 +623,11 @@ namespace
             0, -100, -100, -100, -100, -100, 0,
             0,    0,    0,    0,    0,    0, 0,
         }};
-        btHeightfieldTerrainShape shape = makeSquareHeightfieldTerrainShape(heightfieldData);
-        shape.setLocalScaling(btVector3(128, 128, 1));
+        const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
 
         mNavigator->addAgent(mAgentHalfExtents);
         mNavigator->addWater(osg::Vec2i(0, 0), 128 * 4, osg::Vec3f(0, 0, -25));
-        mNavigator->addObject(ObjectId(&shape), shape, btTransform::getIdentity());
+        mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -622,7 +657,7 @@ namespace
         )) << mPath;
     }
 
-    TEST_F(DetourNavigatorNavigatorTest, update_remove_and_update_then_find_path_should_return_path)
+    TEST_F(DetourNavigatorNavigatorTest, update_object_remove_and_update_then_find_path_should_return_path)
     {
         const std::array<btScalar, 5 * 5> heightfieldData {{
             0,   0,    0,    0,    0,
@@ -675,20 +710,71 @@ namespace
         )) << mPath;
     }
 
+    TEST_F(DetourNavigatorNavigatorTest, update_heightfield_remove_and_update_then_find_path_should_return_path)
+    {
+        const std::array<float, 5 * 5> heightfieldData {{
+            0,   0,    0,    0,    0,
+            0, -25,  -25,  -25,  -25,
+            0, -25, -100, -100, -100,
+            0, -25, -100, -100, -100,
+            0, -25, -100, -100, -100,
+        }};
+        const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
+
+        mNavigator->addAgent(mAgentHalfExtents);
+        mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
+        mNavigator->update(mPlayerPosition);
+        mNavigator->wait(mListener, WaitConditionType::allJobsDone);
+
+        mNavigator->removeHeightfield(mCellPosition);
+        mNavigator->update(mPlayerPosition);
+        mNavigator->wait(mListener, WaitConditionType::allJobsDone);
+
+        mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
+        mNavigator->update(mPlayerPosition);
+        mNavigator->wait(mListener, WaitConditionType::allJobsDone);
+
+        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
+
+        EXPECT_THAT(mPath, ElementsAre(
+            Vec3fEq(-204, 204, 1.99998295307159423828125),
+            Vec3fEq(-183.965301513671875, 183.965301513671875, 1.99998819828033447265625),
+            Vec3fEq(-163.9306182861328125, 163.9306182861328125, 1.99999344348907470703125),
+            Vec3fEq(-143.89593505859375, 143.89593505859375, -2.7206256389617919921875),
+            Vec3fEq(-123.86124420166015625, 123.86124420166015625, -13.1089839935302734375),
+            Vec3fEq(-103.8265533447265625, 103.8265533447265625, -23.4973468780517578125),
+            Vec3fEq(-83.7918548583984375, 83.7918548583984375, -33.885707855224609375),
+            Vec3fEq(-63.75716400146484375, 63.75716400146484375, -44.27407073974609375),
+            Vec3fEq(-43.72247314453125, 43.72247314453125, -54.662433624267578125),
+            Vec3fEq(-23.6877803802490234375, 23.6877803802490234375, -65.0507965087890625),
+            Vec3fEq(-3.653090000152587890625, 3.653090000152587890625, -75.43915557861328125),
+            Vec3fEq(16.3816013336181640625, -16.3816013336181640625, -69.749267578125),
+            Vec3fEq(36.416290283203125, -36.416290283203125, -60.4739532470703125),
+            Vec3fEq(56.450984954833984375, -56.450984954833984375, -51.1986236572265625),
+            Vec3fEq(76.4856719970703125, -76.4856719970703125, -41.92330169677734375),
+            Vec3fEq(96.52036285400390625, -96.52036285400390625, -31.46941375732421875),
+            Vec3fEq(116.5550537109375, -116.5550537109375, -19.597003936767578125),
+            Vec3fEq(136.5897369384765625, -136.5897369384765625, -7.724592685699462890625),
+            Vec3fEq(156.6244354248046875, -156.6244354248046875, 1.99999535083770751953125),
+            Vec3fEq(176.6591339111328125, -176.6591339111328125, 1.99999010562896728515625),
+            Vec3fEq(196.693817138671875, -196.693817138671875, 1.99998486042022705078125),
+            Vec3fEq(204, -204, 1.99998295307159423828125)
+        )) << mPath;
+    }
+
     TEST_F(DetourNavigatorNavigatorTest, update_then_find_random_point_around_circle_should_return_position)
     {
-        const std::array<btScalar, 5 * 5> heightfieldData {{
+        const std::array<float, 5 * 5> heightfieldData {{
             0,   0,    0,    0,    0,
             0, -25,  -25,  -25,  -25,
             0, -25, -100, -100, -100,
             0, -25, -100, -100, -100,
             0, -25, -100, -100, -100,
         }};
-        btHeightfieldTerrainShape shape = makeSquareHeightfieldTerrainShape(heightfieldData);
-        shape.setLocalScaling(btVector3(128, 128, 1));
+        const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addObject(ObjectId(&shape), shape, btTransform::getIdentity());
+        mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -709,21 +795,20 @@ namespace
         mSettings.mAsyncNavMeshUpdaterThreads = 2;
         mNavigator.reset(new NavigatorImpl(mSettings));
 
-        const std::array<btScalar, 5 * 5> heightfieldData {{
+        const std::array<float, 5 * 5> heightfieldData {{
             0,   0,    0,    0,    0,
             0, -25,  -25,  -25,  -25,
             0, -25, -100, -100, -100,
             0, -25, -100, -100, -100,
             0, -25, -100, -100, -100,
         }};
-        btHeightfieldTerrainShape heightfieldShape = makeSquareHeightfieldTerrainShape(heightfieldData);
-        heightfieldShape.setLocalScaling(btVector3(128, 128, 1));
+        const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
 
         const std::vector<btBoxShape> boxShapes(100, btVector3(20, 20, 100));
 
         mNavigator->addAgent(mAgentHalfExtents);
 
-        mNavigator->addObject(ObjectId(&heightfieldShape), heightfieldShape, btTransform::getIdentity());
+        mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
 
         for (std::size_t i = 0; i < boxShapes.size(); ++i)
         {
@@ -810,18 +895,17 @@ namespace
 
     TEST_F(DetourNavigatorNavigatorTest, update_then_raycast_should_return_position)
     {
-        const std::array<btScalar, 5 * 5> heightfieldData {{
+        const std::array<float, 5 * 5> heightfieldData {{
             0,   0,    0,    0,    0,
             0, -25,  -25,  -25,  -25,
             0, -25, -100, -100, -100,
             0, -25, -100, -100, -100,
             0, -25, -100, -100, -100,
         }};
-        btHeightfieldTerrainShape shape = makeSquareHeightfieldTerrainShape(heightfieldData);
-        shape.setLocalScaling(btVector3(128, 128, 1));
+        const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addObject(ObjectId(&shape), shape, btTransform::getIdentity());
+        mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -833,22 +917,21 @@ namespace
 
     TEST_F(DetourNavigatorNavigatorTest, update_for_oscillating_object_that_does_not_change_navmesh_should_not_trigger_navmesh_update)
     {
-        const std::array<btScalar, 5 * 5> heightfieldData {{
+        const std::array<float, 5 * 5> heightfieldData {{
             0,   0,    0,    0,    0,
             0, -25,  -25,  -25,  -25,
             0, -25, -100, -100, -100,
             0, -25, -100, -100, -100,
             0, -25, -100, -100, -100,
         }};
-        btHeightfieldTerrainShape heightfieldShape = makeSquareHeightfieldTerrainShape(heightfieldData);
-        heightfieldShape.setLocalScaling(btVector3(128, 128, 1));
+        const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
 
         const btBoxShape oscillatingBoxShape(btVector3(20, 20, 20));
         const btVector3 oscillatingBoxShapePosition(32, 32, 400);
         const btBoxShape boderBoxShape(btVector3(50, 50, 50));
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addObject(ObjectId(&heightfieldShape), heightfieldShape, btTransform::getIdentity());
+        mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
         mNavigator->addObject(ObjectId(&oscillatingBoxShape), oscillatingBoxShape,
                               btTransform(btMatrix3x3::getIdentity(), oscillatingBoxShapePosition));
         // add this box to make navmesh bound box independent from oscillatingBoxShape rotations
@@ -881,4 +964,41 @@ namespace
             ASSERT_EQ(navMesh->getNavMeshRevision(), 4);
         }
     }
+
+    TEST_F(DetourNavigatorNavigatorTest, should_provide_path_over_flat_heightfield)
+    {
+        const HeightfieldPlane plane {100};
+
+        mNavigator->addAgent(mAgentHalfExtents);
+        mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * 4, mShift, plane);
+        mNavigator->update(mPlayerPosition);
+        mNavigator->wait(mListener, WaitConditionType::requiredTilesPresent);
+
+        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
+
+        EXPECT_THAT(mPath, ElementsAre(
+            Vec3fEq(-204, 204, 101.99999237060546875),
+            Vec3fEq(-183.965301513671875, 183.965301513671875, 101.99999237060546875),
+            Vec3fEq(-163.9306182861328125, 163.9306182861328125, 101.99999237060546875),
+            Vec3fEq(-143.89593505859375, 143.89593505859375, 101.99999237060546875),
+            Vec3fEq(-123.86124420166015625, 123.86124420166015625, 101.99999237060546875),
+            Vec3fEq(-103.8265533447265625, 103.8265533447265625, 101.99999237060546875),
+            Vec3fEq(-83.7918548583984375, 83.7918548583984375, 101.99999237060546875),
+            Vec3fEq(-63.75716400146484375, 63.75716400146484375, 101.99999237060546875),
+            Vec3fEq(-43.72247314453125, 43.72247314453125, 101.99999237060546875),
+            Vec3fEq(-23.6877803802490234375, 23.6877803802490234375, 101.99999237060546875),
+            Vec3fEq(-3.653090000152587890625, 3.653090000152587890625, 101.99999237060546875),
+            Vec3fEq(16.3816013336181640625, -16.3816013336181640625, 101.99999237060546875),
+            Vec3fEq(36.416290283203125, -36.416290283203125, 101.99999237060546875),
+            Vec3fEq(56.450984954833984375, -56.450984954833984375, 101.99999237060546875),
+            Vec3fEq(76.4856719970703125, -76.4856719970703125, 101.99999237060546875),
+            Vec3fEq(96.52036285400390625, -96.52036285400390625, 101.99999237060546875),
+            Vec3fEq(116.5550537109375, -116.5550537109375, 101.99999237060546875),
+            Vec3fEq(136.5897369384765625, -136.5897369384765625, 101.99999237060546875),
+            Vec3fEq(156.6244354248046875, -156.6244354248046875, 101.99999237060546875),
+            Vec3fEq(176.6591339111328125, -176.6591339111328125, 101.99999237060546875),
+            Vec3fEq(196.693817138671875, -196.693817138671875, 101.99999237060546875),
+            Vec3fEq(204, -204, 101.99999237060546875)
+        )) << mPath;
+    }
 }
diff --git a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
index 8c66f1a3ef..9405bd7739 100644
--- a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
+++ b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
@@ -144,7 +144,9 @@ namespace
         const std::size_t mRevision = 0;
         const Mesh mMesh {makeMesh()};
         const std::vector<Cell> mWater {};
-        const RecastMesh mRecastMesh {mGeneration, mRevision, mMesh, mWater};
+        const std::vector<Heightfield> mHeightfields {};
+        const std::vector<FlatHeightfield> mFlatHeightfields {};
+        const RecastMesh mRecastMesh {mGeneration, mRevision, mMesh, mWater, mHeightfields, mFlatHeightfields};
         std::unique_ptr<PreparedNavMeshData> mPreparedNavMeshData {makePeparedNavMeshData(3)};
 
         const std::size_t mRecastMeshSize = sizeof(mRecastMesh) + getSize(mRecastMesh);
@@ -232,7 +234,7 @@ namespace
         const std::size_t maxSize = 1;
         NavMeshTilesCache cache(maxSize);
         const std::vector<Cell> water {1, Cell {1, osg::Vec3f()}};
-        const RecastMesh unexistentRecastMesh {mGeneration, mRevision, mMesh, water};
+        const RecastMesh unexistentRecastMesh {mGeneration, mRevision, mMesh, water, mHeightfields, mFlatHeightfields};
 
         cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
         EXPECT_FALSE(cache.get(mAgentHalfExtents, mTilePosition, unexistentRecastMesh));
@@ -244,7 +246,7 @@ namespace
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<Cell> water {1, Cell {1, osg::Vec3f()}};
-        const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, water};
+        const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, water, mHeightfields, mFlatHeightfields};
         auto anotherPreparedNavMeshData = makePeparedNavMeshData(3);
         const auto copy = clone(*anotherPreparedNavMeshData);
 
@@ -262,7 +264,7 @@ namespace
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<Cell> water {1, Cell {1, osg::Vec3f()}};
-        const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, water};
+        const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, water, mHeightfields, mFlatHeightfields};
         auto anotherPreparedNavMeshData = makePeparedNavMeshData(3);
 
         const auto value = cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh,
@@ -278,11 +280,13 @@ namespace
         const auto copy = clone(*mPreparedNavMeshData);
 
         const std::vector<Cell> leastRecentlySetWater {1, Cell {1, osg::Vec3f()}};
-        const RecastMesh leastRecentlySetRecastMesh {mGeneration, mRevision, mMesh, leastRecentlySetWater};
+        const RecastMesh leastRecentlySetRecastMesh {mGeneration, mRevision, mMesh, leastRecentlySetWater,
+                    mHeightfields, mFlatHeightfields};
         auto leastRecentlySetData = makePeparedNavMeshData(3);
 
         const std::vector<Cell> mostRecentlySetWater {1, Cell {2, osg::Vec3f()}};
-        const RecastMesh mostRecentlySetRecastMesh {mGeneration, mRevision, mMesh, mostRecentlySetWater};
+        const RecastMesh mostRecentlySetRecastMesh {mGeneration, mRevision, mMesh, mostRecentlySetWater,
+                    mHeightfields, mFlatHeightfields};
         auto mostRecentlySetData = makePeparedNavMeshData(3);
 
         ASSERT_TRUE(cache.set(mAgentHalfExtents, mTilePosition, leastRecentlySetRecastMesh,
@@ -304,12 +308,14 @@ namespace
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<Cell> leastRecentlyUsedWater {1, Cell {1, osg::Vec3f()}};
-        const RecastMesh leastRecentlyUsedRecastMesh {mGeneration, mRevision, mMesh, leastRecentlyUsedWater};
+        const RecastMesh leastRecentlyUsedRecastMesh {mGeneration, mRevision, mMesh, leastRecentlyUsedWater,
+                    mHeightfields, mFlatHeightfields};
         auto leastRecentlyUsedData = makePeparedNavMeshData(3);
         const auto leastRecentlyUsedCopy = clone(*leastRecentlyUsedData);
 
         const std::vector<Cell> mostRecentlyUsedWater {1, Cell {2, osg::Vec3f()}};
-        const RecastMesh mostRecentlyUsedRecastMesh {mGeneration, mRevision, mMesh, mostRecentlyUsedWater};
+        const RecastMesh mostRecentlyUsedRecastMesh {mGeneration, mRevision, mMesh, mostRecentlyUsedWater,
+                    mHeightfields, mFlatHeightfields};
         auto mostRecentlyUsedData = makePeparedNavMeshData(3);
         const auto mostRecentlyUsedCopy = clone(*mostRecentlyUsedData);
 
@@ -343,7 +349,8 @@ namespace
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<Cell> water {1, Cell {1, osg::Vec3f()}};
-        const RecastMesh tooLargeRecastMesh {mGeneration, mRevision, mMesh, water};
+        const RecastMesh tooLargeRecastMesh {mGeneration, mRevision, mMesh, water,
+                    mHeightfields, mFlatHeightfields};
         auto tooLargeData = makePeparedNavMeshData(10);
 
         cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
@@ -357,11 +364,13 @@ namespace
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<Cell> anotherWater {1, Cell {1, osg::Vec3f()}};
-        const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, anotherWater};
+        const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, anotherWater,
+                    mHeightfields, mFlatHeightfields};
         auto anotherData = makePeparedNavMeshData(3);
 
         const std::vector<Cell> tooLargeWater {1, Cell {2, osg::Vec3f()}};
-        const RecastMesh tooLargeRecastMesh {mGeneration, mRevision, mMesh, tooLargeWater};
+        const RecastMesh tooLargeRecastMesh {mGeneration, mRevision, mMesh, tooLargeWater,
+                    mHeightfields, mFlatHeightfields};
         auto tooLargeData = makePeparedNavMeshData(10);
 
         const auto value = cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh,
@@ -381,7 +390,7 @@ namespace
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<Cell> water {1, Cell {1, osg::Vec3f()}};
-        const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, water};
+        const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, water, mHeightfields, mFlatHeightfields};
         auto anotherData = makePeparedNavMeshData(3);
 
         const auto firstCopy = cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
@@ -400,7 +409,7 @@ namespace
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<Cell> water {1, Cell {1, osg::Vec3f()}};
-        const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, water};
+        const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, water, mHeightfields, mFlatHeightfields};
         auto anotherData = makePeparedNavMeshData(3);
 
         cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
diff --git a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
index b6478f9ea6..73d86bd6ee 100644
--- a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
+++ b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
@@ -3,12 +3,16 @@
 #include <components/detournavigator/recastmeshbuilder.hpp>
 #include <components/detournavigator/recastmesh.hpp>
 #include <components/detournavigator/exceptions.hpp>
+#include <components/esm/loadland.hpp>
+#include <components/misc/convert.hpp>
+#include <components/debug/debuglog.hpp>
 
 #include <BulletCollision/CollisionShapes/btBoxShape.h>
 #include <BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h>
 #include <BulletCollision/CollisionShapes/btTriangleMesh.h>
 #include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
 #include <BulletCollision/CollisionShapes/btCompoundShape.h>
+#include <BulletCollision/CollisionDispatch/btCollisionObject.h>
 
 #include <DetourCommon.h>
 
@@ -23,6 +27,35 @@ namespace DetourNavigator
     {
         return lhs.mSize == rhs.mSize && lhs.mShift == rhs.mShift;
     }
+
+    static inline bool operator==(const Heightfield& lhs, const Heightfield& rhs)
+    {
+        return makeTuple(lhs) == makeTuple(rhs);
+    }
+
+    static inline bool operator==(const FlatHeightfield& lhs, const FlatHeightfield& rhs)
+    {
+        return std::tie(lhs.mBounds, lhs.mHeight) == std::tie(rhs.mBounds, rhs.mHeight);
+    }
+
+    static inline std::ostream& operator<<(std::ostream& s, const FlatHeightfield& v)
+    {
+        return s << "FlatHeightfield {" << v.mBounds << ", " << v.mHeight << "}";
+    }
+
+    static inline std::ostream& operator<<(std::ostream& s, const Heightfield& v)
+    {
+        s << "Heightfield {.mBounds=" << v.mBounds
+          << ", .mLength=" << int(v.mLength)
+          << ", .mMinHeight=" << v.mMinHeight
+          << ", .mMaxHeight=" << v.mMaxHeight
+          << ", .mShift=" << v.mShift
+          << ", .mScale=" << v.mScale
+          << ", .mHeights={";
+        for (float h : v.mHeights)
+            s << h << ", ";
+        return s << "}}";
+    }
 }
 
 namespace
@@ -428,4 +461,65 @@ namespace
         EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({2, 1, 0, 2, 1, 3}));
         EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_ground, AreaType_ground}));
     }
+
+    TEST_F(DetourNavigatorRecastMeshBuilderTest, add_flat_heightfield_should_add_intersection)
+    {
+        mBounds.mMin = osg::Vec2f(0, 0);
+        RecastMeshBuilder builder(mBounds);
+        builder.addHeightfield(1000, osg::Vec3f(1, 2, 3), 10);
+        const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
+        EXPECT_EQ(recastMesh->getFlatHeightfields(), std::vector<FlatHeightfield>({
+            FlatHeightfield {TileBounds {osg::Vec2f(0, 0), osg::Vec2f(501, 502)}, 13},
+        }));
+    }
+
+    TEST_F(DetourNavigatorRecastMeshBuilderTest, add_heightfield_inside_tile)
+    {
+        constexpr std::array<float, 9> heights {{
+            0, 1, 2,
+            3, 4, 5,
+            6, 7, 8,
+        }};
+        RecastMeshBuilder builder(mBounds);
+        builder.addHeightfield(1000, osg::Vec3f(1, 2, 3), heights.data(), 3, 0, 8);
+        const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
+        Heightfield expected;
+        expected.mBounds = TileBounds {osg::Vec2f(-499, -498), osg::Vec2f(501, 502)};
+        expected.mLength = 3;
+        expected.mMinHeight = 0;
+        expected.mMaxHeight = 8;
+        expected.mShift = osg::Vec3f(-499, -498, 3);
+        expected.mScale = 500;
+        expected.mHeights = {
+            0, 1, 2,
+            3, 4, 5,
+            6, 7, 8,
+        };
+        EXPECT_EQ(recastMesh->getHeightfields(), std::vector<Heightfield>({expected}));
+    }
+
+    TEST_F(DetourNavigatorRecastMeshBuilderTest, add_heightfield_should_add_intersection)
+    {
+        constexpr std::array<float, 9> heights {{
+            0, 1, 2,
+            3, 4, 5,
+            6, 7, 8,
+        }};
+        mBounds.mMin = osg::Vec2f(250, 250);
+        RecastMeshBuilder builder(mBounds);
+        builder.addHeightfield(1000, osg::Vec3f(-1, -2, 3), heights.data(), 3, 0, 8);
+        const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
+        Heightfield expected;
+        expected.mBounds = TileBounds {osg::Vec2f(250, 250), osg::Vec2f(499, 498)};
+        expected.mLength = 2;
+        expected.mMinHeight = 0;
+        expected.mMaxHeight = 8;
+        expected.mShift = osg::Vec3f(-1, -2, 3);
+        expected.mScale = 500;
+        expected.mHeights = {
+            4, 5,
+            7, 8,
+        };
+        EXPECT_EQ(recastMesh->getHeightfields(), std::vector<Heightfield>({expected}));
+    }
 }
diff --git a/components/detournavigator/cachedrecastmeshmanager.cpp b/components/detournavigator/cachedrecastmeshmanager.cpp
index cfbb77f238..154da806d7 100644
--- a/components/detournavigator/cachedrecastmeshmanager.cpp
+++ b/components/detournavigator/cachedrecastmeshmanager.cpp
@@ -50,6 +50,23 @@ namespace DetourNavigator
         return water;
     }
 
+    bool CachedRecastMeshManager::addHeightfield(const osg::Vec2i& cellPosition, int cellSize,
+        const osg::Vec3f& shift, const HeightfieldShape& shape)
+    {
+        if (!mImpl.addHeightfield(cellPosition, cellSize, shift, shape))
+            return false;
+        mCached.reset();
+        return true;
+    }
+
+    std::optional<Cell> CachedRecastMeshManager::removeHeightfield(const osg::Vec2i& cellPosition)
+    {
+        const auto cell = mImpl.removeHeightfield(cellPosition);
+        if (cell)
+            mCached.reset();
+        return cell;
+    }
+
     std::shared_ptr<RecastMesh> CachedRecastMeshManager::getMesh()
     {
         if (!mCached)
diff --git a/components/detournavigator/cachedrecastmeshmanager.hpp b/components/detournavigator/cachedrecastmeshmanager.hpp
index 83eb5c1ec3..ab7bb9e7cb 100644
--- a/components/detournavigator/cachedrecastmeshmanager.hpp
+++ b/components/detournavigator/cachedrecastmeshmanager.hpp
@@ -3,6 +3,7 @@
 
 #include "recastmeshmanager.hpp"
 #include "version.hpp"
+#include "heightfieldshape.hpp"
 
 namespace DetourNavigator
 {
@@ -16,11 +17,16 @@ namespace DetourNavigator
 
         bool updateObject(const ObjectId id, const btTransform& transform, const AreaType areaType);
 
+        std::optional<RemovedRecastMeshObject> removeObject(const ObjectId id);
+
         bool addWater(const osg::Vec2i& cellPosition, const int cellSize, const osg::Vec3f& shift);
 
         std::optional<Cell> removeWater(const osg::Vec2i& cellPosition);
 
-        std::optional<RemovedRecastMeshObject> removeObject(const ObjectId id);
+        bool addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const osg::Vec3f& shift,
+            const HeightfieldShape& shape);
+
+        std::optional<Cell> removeHeightfield(const osg::Vec2i& cellPosition);
 
         std::shared_ptr<RecastMesh> getMesh();
 
diff --git a/components/detournavigator/heightfieldshape.hpp b/components/detournavigator/heightfieldshape.hpp
new file mode 100644
index 0000000000..48a273725b
--- /dev/null
+++ b/components/detournavigator/heightfieldshape.hpp
@@ -0,0 +1,25 @@
+#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_HEIGHFIELDSHAPE_H
+#define OPENMW_COMPONENTS_DETOURNAVIGATOR_HEIGHFIELDSHAPE_H
+
+#include <cstddef>
+#include <variant>
+
+namespace DetourNavigator
+{
+    struct HeightfieldPlane
+    {
+        float mHeight;
+    };
+
+    struct HeightfieldSurface
+    {
+        const float* mHeights;
+        std::size_t mSize;
+        float mMinHeight;
+        float mMaxHeight;
+    };
+
+    using HeightfieldShape = std::variant<HeightfieldPlane, HeightfieldSurface>;
+}
+
+#endif
diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index 797d73667b..07e9c7da66 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -9,8 +9,10 @@
 #include "navmeshtilescache.hpp"
 #include "preparednavmeshdata.hpp"
 #include "navmeshdata.hpp"
+#include "recastmeshbuilder.hpp"
 
 #include <components/misc/convert.hpp>
+#include <components/bullethelpers/processtrianglecallback.hpp>
 
 #include <DetourNavMesh.h>
 #include <DetourNavMeshBuilder.h>
@@ -195,64 +197,92 @@ namespace
         );
     }
 
-    void rasterizeWaterTriangles(rcContext& context, const osg::Vec3f& agentHalfExtents, const std::vector<Cell>& cells,
+    bool rasterizeTriangles(rcContext& context, const Rectangle& rectangle, const rcConfig& config,
+        const unsigned char* areas, std::size_t areasSize, rcHeightfield& solid)
+    {
+        const osg::Vec2f tileBoundsMin(
+            std::clamp(rectangle.mBounds.mMin.x(), config.bmin[0], config.bmax[0]),
+            std::clamp(rectangle.mBounds.mMin.y(), config.bmin[2], config.bmax[2])
+        );
+        const osg::Vec2f tileBoundsMax(
+            std::clamp(rectangle.mBounds.mMax.x(), config.bmin[0], config.bmax[0]),
+            std::clamp(rectangle.mBounds.mMax.y(), config.bmin[2], config.bmax[2])
+        );
+
+        if (tileBoundsMax == tileBoundsMin)
+            return true;
+
+        const std::array vertices {
+            tileBoundsMin.x(), rectangle.mHeight, tileBoundsMin.y(),
+            tileBoundsMin.x(), rectangle.mHeight, tileBoundsMax.y(),
+            tileBoundsMax.x(), rectangle.mHeight, tileBoundsMax.y(),
+            tileBoundsMax.x(), rectangle.mHeight, tileBoundsMin.y(),
+        };
+
+        const std::array indices {
+            0, 1, 2,
+            0, 2, 3,
+        };
+
+        return rcRasterizeTriangles(
+            &context,
+            vertices.data(),
+            static_cast<int>(vertices.size() / 3),
+            indices.data(),
+            areas,
+            static_cast<int>(areasSize),
+            solid,
+            config.walkableClimb
+        );
+    }
+
+    bool rasterizeTriangles(rcContext& context, const osg::Vec3f& agentHalfExtents, const std::vector<Cell>& cells,
         const Settings& settings, const rcConfig& config, rcHeightfield& solid)
     {
         const std::array<unsigned char, 2> areas {{AreaType_water, AreaType_water}};
-
         for (const Cell& cell : cells)
         {
-            const auto rectangle = getSwimRectangle(cell, settings, agentHalfExtents);
-
-            const osg::Vec2f tileBoundsMin(
-                std::min(config.bmax[0], std::max(config.bmin[0], rectangle.mBounds.mMin.x())),
-                std::min(config.bmax[2], std::max(config.bmin[2], rectangle.mBounds.mMin.y()))
-            );
-            const osg::Vec2f tileBoundsMax(
-                std::min(config.bmax[0], std::max(config.bmin[0], rectangle.mBounds.mMax.x())),
-                std::min(config.bmax[2], std::max(config.bmin[2], rectangle.mBounds.mMax.y()))
-            );
-
-            if (tileBoundsMax == tileBoundsMin)
-                continue;
-
-            const std::array vertices {
-                tileBoundsMin.x(), rectangle.mHeight, tileBoundsMin.y(),
-                tileBoundsMin.x(), rectangle.mHeight, tileBoundsMax.y(),
-                tileBoundsMax.x(), rectangle.mHeight, tileBoundsMax.y(),
-                tileBoundsMax.x(), rectangle.mHeight, tileBoundsMin.y(),
-            };
+            const Rectangle rectangle = getSwimRectangle(cell, settings, agentHalfExtents);
+            if (!rasterizeTriangles(context, rectangle, config, areas.data(), areas.size(), solid))
+                return false;
+        }
+        return true;
+    }
 
-            const std::array indices {
-                0, 1, 2,
-                0, 2, 3,
-            };
+    bool rasterizeTriangles(rcContext& context, const std::vector<FlatHeightfield>& heightfields,
+        const Settings& settings, const rcConfig& config, rcHeightfield& solid)
+    {
+        for (const FlatHeightfield& heightfield : heightfields)
+        {
+            const std::array<unsigned char, 2> areas {{AreaType_ground, AreaType_ground}};
+            const Rectangle rectangle {heightfield.mBounds, toNavMeshCoordinates(settings, heightfield.mHeight)};
+            if (!rasterizeTriangles(context, rectangle, config, areas.data(), areas.size(), solid))
+                return false;
+        }
+        return true;
+    }
 
-            const auto trianglesRasterized = rcRasterizeTriangles(
-                &context,
-                vertices.data(),
-                static_cast<int>(vertices.size() / 3),
-                indices.data(),
-                areas.data(),
-                static_cast<int>(areas.size()),
-                solid,
-                config.walkableClimb
-            );
-
-            if (!trianglesRasterized)
-                throw NavigatorException("Failed to create rasterize water triangles for navmesh");
+    bool rasterizeTriangles(rcContext& context, const std::vector<Heightfield>& heightfields,
+        const Settings& settings, const rcConfig& config, rcHeightfield& solid)
+    {
+        using BulletHelpers::makeProcessTriangleCallback;
+
+        for (const Heightfield& heightfield : heightfields)
+        {
+            const Mesh mesh = makeMesh(heightfield);
+            if (!rasterizeTriangles(context, mesh, settings, config, solid))
+                return false;
         }
+        return true;
     }
 
     bool rasterizeTriangles(rcContext& context, const osg::Vec3f& agentHalfExtents, const RecastMesh& recastMesh,
         const rcConfig& config, const Settings& settings, rcHeightfield& solid)
     {
-        if (!rasterizeTriangles(context, recastMesh.getMesh(), settings, config, solid))
-            return false;
-
-        rasterizeWaterTriangles(context, agentHalfExtents, recastMesh.getWater(), settings, config, solid);
-
-        return true;
+        return rasterizeTriangles(context, recastMesh.getMesh(), settings, config, solid)
+            && rasterizeTriangles(context, agentHalfExtents, recastMesh.getWater(), settings, config, solid)
+            && rasterizeTriangles(context, recastMesh.getHeightfields(), settings, config, solid)
+            && rasterizeTriangles(context, recastMesh.getFlatHeightfields(), settings, config, solid);
     }
 
     void buildCompactHeightfield(rcContext& context, const int walkableHeight, const int walkableClimb,
diff --git a/components/detournavigator/navigator.hpp b/components/detournavigator/navigator.hpp
index f7ee4ed96e..6e0f773fb6 100644
--- a/components/detournavigator/navigator.hpp
+++ b/components/detournavigator/navigator.hpp
@@ -8,6 +8,9 @@
 #include "navmeshcacheitem.hpp"
 #include "recastmeshtiles.hpp"
 #include "waitconditiontype.hpp"
+#include "heightfieldshape.hpp"
+
+#include <variant>
 
 namespace ESM
 {
@@ -148,6 +151,11 @@ namespace DetourNavigator
          */
         virtual bool removeWater(const osg::Vec2i& cellPosition) = 0;
 
+        virtual bool addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const osg::Vec3f& shift,
+            const HeightfieldShape& shape) = 0;
+
+        virtual bool removeHeightfield(const osg::Vec2i& cellPosition) = 0;
+
         virtual void addPathgrid(const ESM::Cell& cell, const ESM::Pathgrid& pathgrid) = 0;
 
         virtual void removePathgrid(const ESM::Pathgrid& pathgrid) = 0;
diff --git a/components/detournavigator/navigatorimpl.cpp b/components/detournavigator/navigatorimpl.cpp
index a6e1062fbb..e256d8f76f 100644
--- a/components/detournavigator/navigatorimpl.cpp
+++ b/components/detournavigator/navigatorimpl.cpp
@@ -2,6 +2,7 @@
 #include "debug.hpp"
 #include "settingsutils.hpp"
 
+#include <components/debug/debuglog.hpp>
 #include <components/esm/loadpgrd.hpp>
 #include <components/misc/coordinateconverter.hpp>
 
@@ -112,6 +113,17 @@ namespace DetourNavigator
         return mNavMeshManager.removeWater(cellPosition);
     }
 
+    bool NavigatorImpl::addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const osg::Vec3f& shift,
+        const HeightfieldShape& shape)
+    {
+        return mNavMeshManager.addHeightfield(cellPosition, cellSize, shift, shape);
+    }
+
+    bool NavigatorImpl::removeHeightfield(const osg::Vec2i& cellPosition)
+    {
+        return mNavMeshManager.removeHeightfield(cellPosition);
+    }
+
     void NavigatorImpl::addPathgrid(const ESM::Cell& cell, const ESM::Pathgrid& pathgrid)
     {
         Misc::CoordinateConverter converter(&cell);
diff --git a/components/detournavigator/navigatorimpl.hpp b/components/detournavigator/navigatorimpl.hpp
index 3d021ec7e9..35a6888551 100644
--- a/components/detournavigator/navigatorimpl.hpp
+++ b/components/detournavigator/navigatorimpl.hpp
@@ -39,6 +39,11 @@ namespace DetourNavigator
 
         bool removeWater(const osg::Vec2i& cellPosition) override;
 
+        bool addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const osg::Vec3f& shift,
+            const HeightfieldShape& shape) override;
+
+        bool removeHeightfield(const osg::Vec2i& cellPosition) override;
+
         void addPathgrid(const ESM::Cell& cell, const ESM::Pathgrid& pathgrid) override;
 
         void removePathgrid(const ESM::Pathgrid& pathgrid) override;
diff --git a/components/detournavigator/navigatorstub.hpp b/components/detournavigator/navigatorstub.hpp
index cab8feaf39..2d2fc936ca 100644
--- a/components/detournavigator/navigatorstub.hpp
+++ b/components/detournavigator/navigatorstub.hpp
@@ -64,6 +64,17 @@ namespace DetourNavigator
             return false;
         }
 
+        bool addHeightfield(const osg::Vec2i& /*cellPosition*/, int /*cellSize*/, const osg::Vec3f& /*shift*/,
+            const HeightfieldShape& /*height*/) override
+        {
+            return false;
+        }
+
+        bool removeHeightfield(const osg::Vec2i& /*cellPosition*/) override
+        {
+            return false;
+        }
+
         void addPathgrid(const ESM::Cell& /*cell*/, const ESM::Pathgrid& /*pathgrid*/) override {}
 
         void removePathgrid(const ESM::Pathgrid& /*pathgrid*/) override {}
diff --git a/components/detournavigator/navmeshmanager.cpp b/components/detournavigator/navmeshmanager.cpp
index f2dd814d46..287a3c8ef9 100644
--- a/components/detournavigator/navmeshmanager.cpp
+++ b/components/detournavigator/navmeshmanager.cpp
@@ -89,6 +89,24 @@ namespace DetourNavigator
         return true;
     }
 
+    bool NavMeshManager::addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const osg::Vec3f& shift,
+        const HeightfieldShape& shape)
+    {
+        if (!mRecastMeshManager.addHeightfield(cellPosition, cellSize, shift, shape))
+            return false;
+        addChangedTiles(cellSize, shift, ChangeType::add);
+        return true;
+    }
+
+    bool NavMeshManager::removeHeightfield(const osg::Vec2i& cellPosition)
+    {
+        const auto heightfield = mRecastMeshManager.removeHeightfield(cellPosition);
+        if (!heightfield)
+            return false;
+        addChangedTiles(heightfield->mSize, heightfield->mShift, ChangeType::remove);
+        return true;
+    }
+
     void NavMeshManager::addAgent(const osg::Vec3f& agentHalfExtents)
     {
         auto cached = mCache.find(agentHalfExtents);
diff --git a/components/detournavigator/navmeshmanager.hpp b/components/detournavigator/navmeshmanager.hpp
index a93d8824e3..390ba41ec8 100644
--- a/components/detournavigator/navmeshmanager.hpp
+++ b/components/detournavigator/navmeshmanager.hpp
@@ -6,6 +6,7 @@
 #include "offmeshconnectionsmanager.hpp"
 #include "recastmeshtiles.hpp"
 #include "waitconditiontype.hpp"
+#include "heightfieldshape.hpp"
 
 #include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
 
@@ -37,6 +38,11 @@ namespace DetourNavigator
 
         bool removeWater(const osg::Vec2i& cellPosition);
 
+        bool addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const osg::Vec3f& shift,
+            const HeightfieldShape& shape);
+
+        bool removeHeightfield(const osg::Vec2i& cellPosition);
+
         bool reset(const osg::Vec3f& agentHalfExtents);
 
         void addOffMeshConnection(const ObjectId id, const osg::Vec3f& start, const osg::Vec3f& end, const AreaType areaType);
diff --git a/components/detournavigator/navmeshtilescache.cpp b/components/detournavigator/navmeshtilescache.cpp
index c4f81727ab..4710a0a4f6 100644
--- a/components/detournavigator/navmeshtilescache.cpp
+++ b/components/detournavigator/navmeshtilescache.cpp
@@ -42,7 +42,8 @@ namespace DetourNavigator
         while (!mFreeItems.empty() && mUsedNavMeshDataSize + itemSize > mMaxNavMeshDataSize)
             removeLeastRecentlyUsed();
 
-        RecastMeshData key {recastMesh.getMesh(), recastMesh.getWater()};
+        RecastMeshData key {recastMesh.getMesh(), recastMesh.getWater(),
+                    recastMesh.getHeightfields(), recastMesh.getFlatHeightfields()};
 
         const auto iterator = mFreeItems.emplace(mFreeItems.end(), agentHalfExtents, changedTile, std::move(key), itemSize);
         const auto emplaced = mValues.emplace(std::make_tuple(agentHalfExtents, changedTile, std::cref(iterator->mRecastMeshData)), iterator);
diff --git a/components/detournavigator/navmeshtilescache.hpp b/components/detournavigator/navmeshtilescache.hpp
index d218ffdcee..06d6c69e9b 100644
--- a/components/detournavigator/navmeshtilescache.hpp
+++ b/components/detournavigator/navmeshtilescache.hpp
@@ -24,24 +24,26 @@ namespace DetourNavigator
     {
         Mesh mMesh;
         std::vector<Cell> mWater;
+        std::vector<Heightfield> mHeightfields;
+        std::vector<FlatHeightfield> mFlatHeightfields;
     };
 
     inline bool operator <(const RecastMeshData& lhs, const RecastMeshData& rhs)
     {
-        return std::tie(lhs.mMesh, lhs.mWater)
-                < std::tie(rhs.mMesh, rhs.mWater);
+        return std::tie(lhs.mMesh, lhs.mWater, lhs.mHeightfields, lhs.mFlatHeightfields)
+                < std::tie(rhs.mMesh, rhs.mWater, rhs.mHeightfields, rhs.mFlatHeightfields);
     }
 
     inline bool operator <(const RecastMeshData& lhs, const RecastMesh& rhs)
     {
-        return std::tie(lhs.mMesh, lhs.mWater)
-                < std::tie(rhs.getMesh(), rhs.getWater());
+        return std::tie(lhs.mMesh, lhs.mWater, lhs.mHeightfields, lhs.mFlatHeightfields)
+                < std::tie(rhs.getMesh(), rhs.getWater(), rhs.getHeightfields(), rhs.getFlatHeightfields());
     }
 
     inline bool operator <(const RecastMesh& lhs, const RecastMeshData& rhs)
     {
-        return std::tie(lhs.getMesh(), lhs.getWater())
-                < std::tie(rhs.mMesh, rhs.mWater);
+        return std::tie(lhs.getMesh(), lhs.getWater(), lhs.getHeightfields(), lhs.getFlatHeightfields())
+                < std::tie(rhs.mMesh, rhs.mWater, rhs.mHeightfields, rhs.mFlatHeightfields);
     }
 
     class NavMeshTilesCache
diff --git a/components/detournavigator/recastmesh.cpp b/components/detournavigator/recastmesh.cpp
index bf7a97caa8..e2dea0ad6e 100644
--- a/components/detournavigator/recastmesh.cpp
+++ b/components/detournavigator/recastmesh.cpp
@@ -18,15 +18,40 @@ namespace DetourNavigator
         mAreaTypes = std::move(areaTypes);
     }
 
-    RecastMesh::RecastMesh(std::size_t generation, std::size_t revision, Mesh mesh, std::vector<Cell> water)
+    RecastMesh::RecastMesh(std::size_t generation, std::size_t revision, Mesh mesh, std::vector<Cell> water,
+        std::vector<Heightfield> heightfields, std::vector<FlatHeightfield> flatHeightfields)
         : mGeneration(generation)
         , mRevision(revision)
         , mMesh(std::move(mesh))
         , mWater(std::move(water))
+        , mHeightfields(std::move(heightfields))
+        , mFlatHeightfields(std::move(flatHeightfields))
     {
         if (mMesh.getVerticesCount() > 0)
             rcCalcBounds(mMesh.getVertices().data(), static_cast<int>(mMesh.getVerticesCount()),
                          mBounds.mMin.ptr(), mBounds.mMax.ptr());
         mWater.shrink_to_fit();
+        mHeightfields.shrink_to_fit();
+        for (Heightfield& v : mHeightfields)
+            v.mHeights.shrink_to_fit();
+        for (const Heightfield& v : mHeightfields)
+        {
+            const auto [min, max] = std::minmax_element(v.mHeights.begin(), v.mHeights.end());
+            mBounds.mMin.x() = std::min(mBounds.mMin.x(), v.mBounds.mMin.x());
+            mBounds.mMin.y() = std::min(mBounds.mMin.y(), v.mBounds.mMin.y());
+            mBounds.mMin.z() = std::min(mBounds.mMin.z(), *min);
+            mBounds.mMax.x() = std::max(mBounds.mMax.x(), v.mBounds.mMax.x());
+            mBounds.mMax.y() = std::max(mBounds.mMax.y(), v.mBounds.mMax.y());
+            mBounds.mMax.z() = std::max(mBounds.mMax.z(), *max);
+        }
+        for (const FlatHeightfield& v : mFlatHeightfields)
+        {
+            mBounds.mMin.x() = std::min(mBounds.mMin.x(), v.mBounds.mMin.x());
+            mBounds.mMin.y() = std::min(mBounds.mMin.y(), v.mBounds.mMin.y());
+            mBounds.mMin.z() = std::min(mBounds.mMin.z(), v.mHeight);
+            mBounds.mMax.x() = std::max(mBounds.mMax.x(), v.mBounds.mMax.x());
+            mBounds.mMax.y() = std::max(mBounds.mMax.y(), v.mBounds.mMax.y());
+            mBounds.mMax.z() = std::max(mBounds.mMax.z(), v.mHeight);
+        }
     }
 }
diff --git a/components/detournavigator/recastmesh.hpp b/components/detournavigator/recastmesh.hpp
index f316abf653..c8e160603b 100644
--- a/components/detournavigator/recastmesh.hpp
+++ b/components/detournavigator/recastmesh.hpp
@@ -3,6 +3,7 @@
 
 #include "areatype.hpp"
 #include "bounds.hpp"
+#include "tilebounds.hpp"
 
 #include <components/bullethelpers/operators.hpp>
 
@@ -12,6 +13,7 @@
 #include <string>
 #include <vector>
 #include <tuple>
+#include <numeric>
 
 namespace DetourNavigator
 {
@@ -51,10 +53,43 @@ namespace DetourNavigator
         osg::Vec3f mShift;
     };
 
+    struct Heightfield
+    {
+        TileBounds mBounds;
+        std::uint8_t mLength;
+        float mMinHeight;
+        float mMaxHeight;
+        osg::Vec3f mShift;
+        float mScale;
+        std::vector<float> mHeights;
+    };
+
+    inline auto makeTuple(const Heightfield& v) noexcept
+    {
+        return std::tie(v.mBounds, v.mLength, v.mMinHeight, v.mMaxHeight, v.mShift, v.mScale, v.mHeights);
+    }
+
+    inline bool operator<(const Heightfield& lhs, const Heightfield& rhs) noexcept
+    {
+        return makeTuple(lhs) < makeTuple(rhs);
+    }
+
+    struct FlatHeightfield
+    {
+        TileBounds mBounds;
+        float mHeight;
+    };
+
+    inline bool operator<(const FlatHeightfield& lhs, const FlatHeightfield& rhs) noexcept
+    {
+        return std::tie(lhs.mBounds, lhs.mHeight) < std::tie(rhs.mBounds, rhs.mHeight);
+    }
+
     class RecastMesh
     {
     public:
-        RecastMesh(std::size_t generation, std::size_t revision, Mesh mesh, std::vector<Cell> water);
+        RecastMesh(std::size_t generation, std::size_t revision, Mesh mesh, std::vector<Cell> water,
+            std::vector<Heightfield> heightfields, std::vector<FlatHeightfield> flatHeightfields);
 
         std::size_t getGeneration() const
         {
@@ -73,6 +108,16 @@ namespace DetourNavigator
             return mWater;
         }
 
+        const std::vector<Heightfield>& getHeightfields() const noexcept
+        {
+            return mHeightfields;
+        }
+
+        const std::vector<FlatHeightfield>& getFlatHeightfields() const noexcept
+        {
+            return mFlatHeightfields;
+        }
+
         const Bounds& getBounds() const
         {
             return mBounds;
@@ -83,6 +128,8 @@ namespace DetourNavigator
         std::size_t mRevision;
         Mesh mMesh;
         std::vector<Cell> mWater;
+        std::vector<Heightfield> mHeightfields;
+        std::vector<FlatHeightfield> mFlatHeightfields;
         Bounds mBounds;
 
         friend inline bool operator <(const RecastMesh& lhs, const RecastMesh& rhs) noexcept
@@ -92,7 +139,11 @@ namespace DetourNavigator
 
         friend inline std::size_t getSize(const RecastMesh& value) noexcept
         {
-            return getSize(value.mMesh) + value.mWater.size() * sizeof(Cell);
+            return getSize(value.mMesh) + value.mWater.size() * sizeof(Cell)
+                + value.mHeightfields.size() * sizeof(Heightfield)
+                + std::accumulate(value.mHeightfields.begin(), value.mHeightfields.end(), std::size_t {0},
+                                  [] (std::size_t r, const Heightfield& v) { return r + v.mHeights.size() * sizeof(float); })
+                + value.mFlatHeightfields.size() * sizeof(FlatHeightfield);
         }
     };
 
diff --git a/components/detournavigator/recastmeshbuilder.cpp b/components/detournavigator/recastmeshbuilder.cpp
index b47d823199..6ee16cdc6c 100644
--- a/components/detournavigator/recastmeshbuilder.cpp
+++ b/components/detournavigator/recastmeshbuilder.cpp
@@ -33,9 +33,18 @@ namespace DetourNavigator
                 result.mVertices[i] = Misc::Convert::makeOsgVec3f(vertices[i]);
             return result;
         }
+
+        TileBounds maxCellTileBounds(int size, const osg::Vec3f& shift)
+        {
+            const float halfCellSize = size / 2;
+            return TileBounds {
+                osg::Vec2f(shift.x() - halfCellSize, shift.y() - halfCellSize),
+                osg::Vec2f(shift.x() + halfCellSize, shift.y() + halfCellSize)
+            };
+        }
     }
 
-    Mesh makeMesh(std::vector<RecastMeshTriangle>&& triangles)
+    Mesh makeMesh(std::vector<RecastMeshTriangle>&& triangles, const osg::Vec3f& shift)
     {
         std::vector<osg::Vec3f> uniqueVertices;
         uniqueVertices.reserve(3 * triangles.size());
@@ -72,14 +81,46 @@ namespace DetourNavigator
 
         for (const osg::Vec3f& v : uniqueVertices)
         {
-            vertices.push_back(v.x());
-            vertices.push_back(v.y());
-            vertices.push_back(v.z());
+            vertices.push_back(v.x() + shift.x());
+            vertices.push_back(v.y() + shift.y());
+            vertices.push_back(v.z() + shift.z());
         }
 
         return Mesh(std::move(indices), std::move(vertices), std::move(areaTypes));
     }
 
+    Mesh makeMesh(const Heightfield& heightfield)
+    {
+        using BulletHelpers::makeProcessTriangleCallback;
+        using Misc::Convert::toOsg;
+
+        constexpr int upAxis = 2;
+        constexpr bool flipQuadEdges = false;
+#if BT_BULLET_VERSION < 310
+        std::vector<btScalar> heights(heightfield.mHeights.begin(), heightfield.mHeights.end());
+        btHeightfieldTerrainShape shape(static_cast<int>(heightfield.mHeights.size() / heightfield.mLength),
+            static_cast<int>(heightfield.mLength), heights.data(), 1,
+            heightfield.mMinHeight, heightfield.mMaxHeight, upAxis, PHY_FLOAT, flipQuadEdges
+        );
+#else
+        btHeightfieldTerrainShape shape(static_cast<int>(heightfield.mHeights.size() / heightfield.mLength),
+            static_cast<int>(heightfield.mLength), heightfield.mHeights.data(),
+            heightfield.mMinHeight, heightfield.mMaxHeight, upAxis, flipQuadEdges);
+#endif
+        shape.setLocalScaling(btVector3(heightfield.mScale, heightfield.mScale, 1));
+        btVector3 aabbMin;
+        btVector3 aabbMax;
+        shape.getAabb(btTransform::getIdentity(), aabbMin, aabbMax);
+        std::vector<RecastMeshTriangle> triangles;
+        auto callback = makeProcessTriangleCallback([&] (btVector3* vertices, int, int)
+        {
+            triangles.emplace_back(makeRecastMeshTriangle(vertices, AreaType_ground));
+        });
+        shape.processAllTriangles(&callback, aabbMin, aabbMax);
+        const osg::Vec2f shift = (osg::Vec2f(aabbMax.x(), aabbMax.y()) - osg::Vec2f(aabbMin.x(), aabbMin.y())) * 0.5;
+        return makeMesh(std::move(triangles), heightfield.mShift + osg::Vec3f(shift.x(), shift.y(), 0));
+    }
+
     RecastMeshBuilder::RecastMeshBuilder(const TileBounds& bounds) noexcept
         : mBounds(bounds)
     {
@@ -122,7 +163,7 @@ namespace DetourNavigator
     void RecastMeshBuilder::addObject(const btHeightfieldTerrainShape& shape, const btTransform& transform,
                                       const AreaType areaType)
     {
-        return addObject(shape, transform, makeProcessTriangleCallback([&] (btVector3* vertices, int, int)
+        addObject(shape, transform, makeProcessTriangleCallback([&] (btVector3* vertices, int, int)
         {
             mTriangles.emplace_back(makeRecastMeshTriangle(vertices, areaType));
         }));
@@ -163,12 +204,54 @@ namespace DetourNavigator
         mWater.push_back(Cell {cellSize, shift});
     }
 
+    void RecastMeshBuilder::addHeightfield(int cellSize, const osg::Vec3f& shift, float height)
+    {
+        if (const auto intersection = getIntersection(mBounds, maxCellTileBounds(cellSize, shift)))
+            mFlatHeightfields.emplace_back(FlatHeightfield {*intersection, height + shift.z()});
+    }
+
+    void RecastMeshBuilder::addHeightfield(int cellSize, const osg::Vec3f& shift, const float* heights,
+        std::size_t size, float minHeight, float maxHeight)
+    {
+        const auto intersection = getIntersection(mBounds, maxCellTileBounds(cellSize, shift));
+        if (!intersection.has_value())
+            return;
+        const float stepSize = static_cast<float>(cellSize) / (size - 1);
+        const int halfCellSize = cellSize / 2;
+        const auto local = [&] (float v, float shift) { return (v - shift + halfCellSize) / stepSize; };
+        const auto index = [&] (float v, int add) { return std::clamp<int>(static_cast<int>(v) + add, 0, size); };
+        const std::size_t minX = index(std::round(local(intersection->mMin.x(), shift.x())), -1);
+        const std::size_t minY = index(std::round(local(intersection->mMin.y(), shift.y())), -1);
+        const std::size_t maxX = index(std::round(local(intersection->mMax.x(), shift.x())), 1);
+        const std::size_t maxY = index(std::round(local(intersection->mMax.y(), shift.y())), 1);
+        const std::size_t endX = std::min(maxX + 1, size);
+        const std::size_t endY = std::min(maxY + 1, size);
+        const std::size_t sliceSize = (endX - minX) * (endY - minY);
+        if (sliceSize == 0)
+            return;
+        std::vector<float> tileHeights;
+        tileHeights.reserve(sliceSize);
+        for (std::size_t y = minY; y < endY; ++y)
+            for (std::size_t x = minX; x < endX; ++x)
+                tileHeights.push_back(heights[x + y * size]);
+        Heightfield heightfield;
+        heightfield.mBounds = *intersection;
+        heightfield.mLength = static_cast<std::uint8_t>(endY - minY);
+        heightfield.mMinHeight = minHeight;
+        heightfield.mMaxHeight = maxHeight;
+        heightfield.mShift = shift + osg::Vec3f(minX, minY, 0) * stepSize - osg::Vec3f(halfCellSize, halfCellSize, 0);
+        heightfield.mScale = stepSize;
+        heightfield.mHeights = std::move(tileHeights);
+        mHeightfields.emplace_back(heightfield);
+    }
+
     std::shared_ptr<RecastMesh> RecastMeshBuilder::create(std::size_t generation, std::size_t revision) &&
     {
         std::sort(mTriangles.begin(), mTriangles.end());
         std::sort(mWater.begin(), mWater.end());
         Mesh mesh = makeMesh(std::move(mTriangles));
-        return std::make_shared<RecastMesh>(generation, revision, std::move(mesh), std::move(mWater));
+        return std::make_shared<RecastMesh>(generation, revision, std::move(mesh), std::move(mWater),
+                                            std::move(mHeightfields), std::move(mFlatHeightfields));
     }
 
     void RecastMeshBuilder::addObject(const btConcaveShape& shape, const btTransform& transform,
diff --git a/components/detournavigator/recastmeshbuilder.hpp b/components/detournavigator/recastmeshbuilder.hpp
index d08ff94418..120e4b045a 100644
--- a/components/detournavigator/recastmeshbuilder.hpp
+++ b/components/detournavigator/recastmeshbuilder.hpp
@@ -51,19 +51,28 @@ namespace DetourNavigator
 
         void addWater(const int mCellSize, const osg::Vec3f& shift);
 
+        void addHeightfield(int cellSize, const osg::Vec3f& shift, float height);
+
+        void addHeightfield(int cellSize, const osg::Vec3f& shift, const float* heights, std::size_t size,
+            float minHeight, float maxHeight);
+
         std::shared_ptr<RecastMesh> create(std::size_t generation, std::size_t revision) &&;
 
     private:
         const TileBounds mBounds;
         std::vector<RecastMeshTriangle> mTriangles;
         std::vector<Cell> mWater;
+        std::vector<Heightfield> mHeightfields;
+        std::vector<FlatHeightfield> mFlatHeightfields;
 
         void addObject(const btConcaveShape& shape, const btTransform& transform, btTriangleCallback&& callback);
 
         void addObject(const btHeightfieldTerrainShape& shape, const btTransform& transform, btTriangleCallback&& callback);
     };
 
-    Mesh makeMesh(std::vector<RecastMeshTriangle>&& triangles);
+    Mesh makeMesh(std::vector<RecastMeshTriangle>&& triangles, const osg::Vec3f& shift = osg::Vec3f());
+
+    Mesh makeMesh(const Heightfield& heightfield);
 }
 
 #endif
diff --git a/components/detournavigator/recastmeshmanager.cpp b/components/detournavigator/recastmeshmanager.cpp
index a6798ee8cd..151b3161c1 100644
--- a/components/detournavigator/recastmeshmanager.cpp
+++ b/components/detournavigator/recastmeshmanager.cpp
@@ -1,6 +1,30 @@
 #include "recastmeshmanager.hpp"
 #include "recastmeshbuilder.hpp"
 #include "settings.hpp"
+#include "heightfieldshape.hpp"
+
+#include <components/debug/debuglog.hpp>
+
+#include <utility>
+
+namespace
+{
+    struct AddHeightfield
+    {
+        const DetourNavigator::Cell& mCell;
+        DetourNavigator::RecastMeshBuilder& mBuilder;
+
+        void operator()(const DetourNavigator::HeightfieldSurface& v)
+        {
+            mBuilder.addHeightfield(mCell.mSize, mCell.mShift, v.mHeights, v.mSize, v.mMinHeight, v.mMaxHeight);
+        }
+
+        void operator()(DetourNavigator::HeightfieldPlane v)
+        {
+            mBuilder.addHeightfield(mCell.mSize, mCell.mShift, v.mHeight);
+        }
+    };
+}
 
 namespace DetourNavigator
 {
@@ -66,6 +90,26 @@ namespace DetourNavigator
         return result;
     }
 
+    bool RecastMeshManager::addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const osg::Vec3f& shift,
+        const HeightfieldShape& shape)
+    {
+        if (!mHeightfields.emplace(cellPosition, Heightfield {Cell {cellSize, shift}, shape}).second)
+            return false;
+        ++mRevision;
+        return true;
+    }
+
+    std::optional<Cell> RecastMeshManager::removeHeightfield(const osg::Vec2i& cellPosition)
+    {
+        const auto it = mHeightfields.find(cellPosition);
+        if (it == mHeightfields.end())
+            return std::nullopt;
+        ++mRevision;
+        const auto result = std::make_optional(it->second.mCell);
+        mHeightfields.erase(it);
+        return result;
+    }
+
     std::shared_ptr<RecastMesh> RecastMeshManager::getMesh()
     {
         TileBounds tileBounds = mTileBounds;
@@ -79,12 +123,14 @@ namespace DetourNavigator
             const RecastMeshObject& v = object.getImpl();
             builder.addObject(v.getShape(), v.getTransform(), v.getAreaType());
         }
+        for (const auto& [cellPosition, v] : mHeightfields)
+            std::visit(AddHeightfield {v.mCell, builder}, v.mShape);
         return std::move(builder).create(mGeneration, mRevision);
     }
 
     bool RecastMeshManager::isEmpty() const
     {
-        return mObjects.empty() && mWater.empty();
+        return mObjects.empty() && mWater.empty() && mHeightfields.empty();
     }
 
     void RecastMeshManager::reportNavMeshChange(const Version& recastMeshVersion, const Version& navMeshVersion)
diff --git a/components/detournavigator/recastmeshmanager.hpp b/components/detournavigator/recastmeshmanager.hpp
index 266d6a9385..88124c44cf 100644
--- a/components/detournavigator/recastmeshmanager.hpp
+++ b/components/detournavigator/recastmeshmanager.hpp
@@ -5,6 +5,7 @@
 #include "objectid.hpp"
 #include "version.hpp"
 #include "recastmesh.hpp"
+#include "heightfieldshape.hpp"
 
 #include <LinearMath/btTransform.h>
 
@@ -13,6 +14,8 @@
 #include <map>
 #include <optional>
 #include <memory>
+#include <variant>
+#include <tuple>
 
 class btCollisionShape;
 
@@ -37,11 +40,16 @@ namespace DetourNavigator
 
         bool updateObject(const ObjectId id, const btTransform& transform, const AreaType areaType);
 
+        std::optional<RemovedRecastMeshObject> removeObject(const ObjectId id);
+
         bool addWater(const osg::Vec2i& cellPosition, const int cellSize, const osg::Vec3f& shift);
 
         std::optional<Cell> removeWater(const osg::Vec2i& cellPosition);
 
-        std::optional<RemovedRecastMeshObject> removeObject(const ObjectId id);
+        bool addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const osg::Vec3f& shift,
+            const HeightfieldShape& shape);
+
+        std::optional<Cell> removeHeightfield(const osg::Vec2i& cellPosition);
 
         std::shared_ptr<RecastMesh> getMesh();
 
@@ -58,12 +66,19 @@ namespace DetourNavigator
             Version mNavMeshVersion;
         };
 
+        struct Heightfield
+        {
+            Cell mCell;
+            HeightfieldShape mShape;
+        };
+
         const Settings& mSettings;
         std::size_t mRevision = 0;
         std::size_t mGeneration;
         TileBounds mTileBounds;
         std::map<ObjectId, OscillatingRecastMeshObject> mObjects;
         std::map<osg::Vec2i, Cell> mWater;
+        std::map<osg::Vec2i, Heightfield> mHeightfields;
         std::optional<Report> mLastNavMeshReportedChange;
         std::optional<Report> mLastNavMeshReport;
     };
diff --git a/components/detournavigator/tilebounds.hpp b/components/detournavigator/tilebounds.hpp
index 83fe2b6296..8557045342 100644
--- a/components/detournavigator/tilebounds.hpp
+++ b/components/detournavigator/tilebounds.hpp
@@ -3,6 +3,10 @@
 
 #include <osg/Vec2f>
 
+#include <algorithm>
+#include <optional>
+#include <tuple>
+
 namespace DetourNavigator
 {
     struct TileBounds
@@ -10,6 +14,24 @@ namespace DetourNavigator
         osg::Vec2f mMin;
         osg::Vec2f mMax;
     };
+
+    inline bool operator<(const TileBounds& lhs, const TileBounds& rhs) noexcept
+    {
+        return std::tie(lhs.mMin, lhs.mMax) < std::tie(rhs.mMin, rhs.mMax);
+    }
+
+    inline std::optional<TileBounds> getIntersection(const TileBounds& a, const TileBounds& b) noexcept
+    {
+        const float minX = std::max(a.mMin.x(), b.mMin.x());
+        const float maxX = std::min(a.mMax.x(), b.mMax.x());
+        if (minX > maxX)
+            return std::nullopt;
+        const float minY = std::max(a.mMin.y(), b.mMin.y());
+        const float maxY = std::min(a.mMax.y(), b.mMax.y());
+        if (minY > maxY)
+            return std::nullopt;
+        return TileBounds {osg::Vec2f(minX, minY), osg::Vec2f(maxX, maxY)};
+    }
 }
 
 #endif
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.cpp b/components/detournavigator/tilecachedrecastmeshmanager.cpp
index 1292e31d4e..a37d24399d 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -3,6 +3,8 @@
 #include "gettilespositions.hpp"
 #include "settingsutils.hpp"
 
+#include <components/debug/debuglog.hpp>
+
 #include <algorithm>
 #include <vector>
 
@@ -128,6 +130,66 @@ namespace DetourNavigator
         return result;
     }
 
+    bool TileCachedRecastMeshManager::addHeightfield(const osg::Vec2i& cellPosition, int cellSize,
+        const osg::Vec3f& shift, const HeightfieldShape& shape)
+    {
+        const auto border = getBorderSize(mSettings);
+
+        auto& tilesPositions = mHeightfieldTilesPositions[cellPosition];
+
+        bool result = false;
+
+        getTilesPositions(cellSize, shift, mSettings, [&] (const TilePosition& tilePosition)
+            {
+                const auto tiles = mTiles.lock();
+                auto tile = tiles->find(tilePosition);
+                if (tile == tiles->end())
+                {
+                    auto tileBounds = makeTileBounds(mSettings, tilePosition);
+                    tileBounds.mMin -= osg::Vec2f(border, border);
+                    tileBounds.mMax += osg::Vec2f(border, border);
+                    tile = tiles->insert(std::make_pair(tilePosition,
+                            CachedRecastMeshManager(mSettings, tileBounds, mTilesGeneration))).first;
+                }
+                if (tile->second.addHeightfield(cellPosition, cellSize, shift, shape))
+                {
+                    tilesPositions.push_back(tilePosition);
+                    result = true;
+                }
+            });
+
+        if (result)
+            ++mRevision;
+
+        return result;
+    }
+
+    std::optional<Cell> TileCachedRecastMeshManager::removeHeightfield(const osg::Vec2i& cellPosition)
+    {
+        const auto object = mHeightfieldTilesPositions.find(cellPosition);
+        if (object == mHeightfieldTilesPositions.end())
+            return std::nullopt;
+        std::optional<Cell> result;
+        for (const auto& tilePosition : object->second)
+        {
+            const auto tiles = mTiles.lock();
+            const auto tile = tiles->find(tilePosition);
+            if (tile == tiles->end())
+                continue;
+            const auto tileResult = tile->second.removeHeightfield(cellPosition);
+            if (tile->second.isEmpty())
+            {
+                tiles->erase(tile);
+                ++mTilesGeneration;
+            }
+            if (tileResult && !result)
+                result = tileResult;
+        }
+        if (result)
+            ++mRevision;
+        return result;
+    }
+
     std::shared_ptr<RecastMesh> TileCachedRecastMeshManager::getMesh(const TilePosition& tilePosition)
     {
         const auto tiles = mTiles.lock();
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.hpp b/components/detournavigator/tilecachedrecastmeshmanager.hpp
index 4ea705f4cd..f3292cbf9b 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.hpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.hpp
@@ -6,6 +6,7 @@
 #include "settingsutils.hpp"
 #include "gettilespositions.hpp"
 #include "version.hpp"
+#include "heightfieldshape.hpp"
 
 #include <components/misc/guarded.hpp>
 
@@ -80,6 +81,11 @@ namespace DetourNavigator
 
         std::optional<Cell> removeWater(const osg::Vec2i& cellPosition);
 
+        bool addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const osg::Vec3f& shift,
+            const HeightfieldShape& shape);
+
+        std::optional<Cell> removeHeightfield(const osg::Vec2i& cellPosition);
+
         std::shared_ptr<RecastMesh> getMesh(const TilePosition& tilePosition);
 
         bool hasTile(const TilePosition& tilePosition);
@@ -100,6 +106,7 @@ namespace DetourNavigator
         Misc::ScopeGuarded<std::map<TilePosition, CachedRecastMeshManager>> mTiles;
         std::unordered_map<ObjectId, std::vector<TilePosition>> mObjectsTilesPositions;
         std::map<osg::Vec2i, std::vector<TilePosition>> mWaterTilesPositions;
+        std::map<osg::Vec2i, std::vector<TilePosition>> mHeightfieldTilesPositions;
         std::size_t mRevision = 0;
         std::size_t mTilesGeneration = 0;
 
diff --git a/components/sceneutil/recastmesh.cpp b/components/sceneutil/recastmesh.cpp
index 556fc3f3b5..85f3e7177b 100644
--- a/components/sceneutil/recastmesh.cpp
+++ b/components/sceneutil/recastmesh.cpp
@@ -3,6 +3,7 @@
 
 #include <components/detournavigator/settings.hpp>
 #include <components/detournavigator/recastmesh.hpp>
+#include <components/detournavigator/recastmeshbuilder.hpp>
 
 #include <RecastDebugDraw.h>
 
@@ -45,15 +46,25 @@ namespace SceneUtil
         const osg::ref_ptr<osg::Group> group(new osg::Group);
         DebugDraw debugDraw(*group, osg::Vec3f(0, 0, 0), 1.0f);
         const DetourNavigator::Mesh& mesh = recastMesh.getMesh();
+        std::vector<int> indices = mesh.getIndices();
         std::vector<float> vertices = mesh.getVertices();
 
+        for (const Heightfield& heightfield : recastMesh.getHeightfields())
+        {
+            const Mesh mesh = makeMesh(heightfield);
+            const int indexShift = static_cast<int>(vertices.size() / 3);
+            std::copy(mesh.getVertices().begin(), mesh.getVertices().end(), std::back_inserter(vertices));
+            std::transform(mesh.getIndices().begin(), mesh.getIndices().end(), std::back_inserter(indices),
+                           [&] (int index) { return index + indexShift; });
+        }
+
         for (std::size_t i = 0; i < vertices.size(); i += 3)
             std::swap(vertices[i + 1], vertices[i + 2]);
 
-        const auto normals = calculateNormals(vertices, mesh.getIndices());
+        const auto normals = calculateNormals(vertices, indices);
         const auto texScale = 1.0f / (settings.mCellSize * 10.0f);
         duDebugDrawTriMesh(&debugDraw, vertices.data(), static_cast<int>(vertices.size() / 3),
-            mesh.getIndices().data(), normals.data(), static_cast<int>(mesh.getIndices().size() / 3), nullptr, texScale);
+            indices.data(), normals.data(), static_cast<int>(indices.size() / 3), nullptr, texScale);
         return group;
     }
 }

From d5ab6e40abd91754ed907637c2da15f6334e111f Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Mon, 26 Jul 2021 04:46:03 +0300
Subject: [PATCH 1091/2859] Handle NiExtraData

---
 components/nif/niffile.cpp | 1 +
 components/nif/record.hpp  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index 08301ce47a..6f7ed093c0 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -79,6 +79,7 @@ static std::map<std::string,RecordFactoryEntry> makeFactory()
     factory["NiPointLight"]                 = {&construct <NiPointLight>                , RC_NiLight                    };
     factory["NiSpotLight"]                  = {&construct <NiSpotLight>                 , RC_NiLight                    };
     factory["NiTextureEffect"]              = {&construct <NiTextureEffect>             , RC_NiTextureEffect            };
+    factory["NiExtraData"]                  = {&construct <Extra>                       , RC_NiExtraData                };
     factory["NiVertWeightsExtraData"]       = {&construct <NiVertWeightsExtraData>      , RC_NiVertWeightsExtraData     };
     factory["NiTextKeyExtraData"]           = {&construct <NiTextKeyExtraData>          , RC_NiTextKeyExtraData         };
     factory["NiStringExtraData"]            = {&construct <NiStringExtraData>           , RC_NiStringExtraData          };
diff --git a/components/nif/record.hpp b/components/nif/record.hpp
index ed97acabc6..dc81eb69c7 100644
--- a/components/nif/record.hpp
+++ b/components/nif/record.hpp
@@ -72,6 +72,7 @@ enum RecordType
   RC_NiBSAnimationNode,
   RC_NiLight,
   RC_NiTextureEffect,
+  RC_NiExtraData,
   RC_NiVertWeightsExtraData,
   RC_NiTextKeyExtraData,
   RC_NiStringExtraData,

From 166e23a6d9a9d0ee375d3b8276debca4b9a9161d Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Sun, 25 Jul 2021 20:49:17 -0700
Subject: [PATCH 1092/2859] fix CI artifacts, missing header

---
 apps/launcher/graphicspage.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/launcher/graphicspage.cpp b/apps/launcher/graphicspage.cpp
index cd353a0651..8359834ddb 100644
--- a/apps/launcher/graphicspage.cpp
+++ b/apps/launcher/graphicspage.cpp
@@ -14,6 +14,7 @@
 #include <SDL_video.h>
 
 #include <numeric>
+#include <array>
 
 QString getAspect(int x, int y)
 {

From 41c08b1c3bd0fc22b666295913ea2177bd7c8284 Mon Sep 17 00:00:00 2001
From: madsbuvi <madssandvei@zoho.com>
Date: Sun, 24 Jan 2021 10:34:33 +0100
Subject: [PATCH 1093/2859] Stereo friendly StateSetUpdater

(cherry picked from commit 496b3aef88b8fd867dcdd23a6ca43144573b1b2f)

Stereo friendly water

(cherry picked from commit 0e22c55e48a7f965367d3d430c1bef5357b22748)

Option to disable per view mapping.

Include memory header

De-hardcode settings and buffers.

formatting error

Update water.cpp (whitespace)

Update water.cpp (more whitespace)

include render order

c array -> c++ array
---
 apps/openmw/mwrender/screenshotmanager.cpp |   4 +-
 apps/openmw/mwrender/water.cpp             | 295 ++++++++++-----------
 apps/openmw/mwrender/water.hpp             |   5 +-
 components/CMakeLists.txt                  |   2 +-
 components/sceneutil/rtt.cpp               | 110 ++++++++
 components/sceneutil/rtt.hpp               |  68 +++++
 components/sceneutil/statesetupdater.cpp   |  57 ++--
 components/sceneutil/statesetupdater.hpp   |  25 +-
 8 files changed, 385 insertions(+), 181 deletions(-)
 create mode 100644 components/sceneutil/rtt.cpp
 create mode 100644 components/sceneutil/rtt.hpp

diff --git a/apps/openmw/mwrender/screenshotmanager.cpp b/apps/openmw/mwrender/screenshotmanager.cpp
index f474a5a9f6..b24572dbaa 100644
--- a/apps/openmw/mwrender/screenshotmanager.cpp
+++ b/apps/openmw/mwrender/screenshotmanager.cpp
@@ -324,8 +324,8 @@ namespace MWRender
         rttCamera->setUpdateCallback(new NoTraverseCallback);
         rttCamera->addChild(mSceneRoot);
 
-        rttCamera->addChild(mWater->getReflectionCamera());
-        rttCamera->addChild(mWater->getRefractionCamera());
+        rttCamera->addChild(mWater->getReflectionNode());
+        rttCamera->addChild(mWater->getRefractionNode());
 
         rttCamera->setCullMask(mViewer->getCamera()->getCullMask() & (~Mask_GUI));
 
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index c5fd1a3637..621a5e7c25 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -25,6 +25,7 @@
 #include <components/resource/imagemanager.hpp>
 #include <components/resource/scenemanager.hpp>
 
+#include <components/sceneutil/rtt.hpp>
 #include <components/sceneutil/shadow.hpp>
 #include <components/sceneutil/util.hpp>
 #include <components/sceneutil/waterutil.hpp>
@@ -261,65 +262,43 @@ osg::ref_ptr<osg::Image> readPngImage (const std::string& file)
     return result.getImage();
 }
 
-
-class Refraction : public osg::Camera
+class Refraction : public SceneUtil::RTTNode
 {
 public:
-    Refraction()
+    Refraction(uint32_t rttSize)
+        : RTTNode(rttSize, rttSize, 1, false)
     {
-        unsigned int rttSize = Settings::Manager::getInt("rtt size", "Water");
-        setRenderOrder(osg::Camera::PRE_RENDER, 1);
-        setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-        setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT);
-        setReferenceFrame(osg::Camera::RELATIVE_RF);
-        setSmallFeatureCullingPixelSize(Settings::Manager::getInt("small feature culling pixel size", "Water"));
-        osg::Camera::setName("RefractionCamera");
-        setCullCallback(new InheritViewPointCallback);
-        setComputeNearFarMode(osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR);
-
-        setCullMask(Mask_Effect|Mask_Scene|Mask_Object|Mask_Static|Mask_Terrain|Mask_Actor|Mask_ParticleSystem|Mask_Sky|Mask_Sun|Mask_Player|Mask_Lighting|Mask_Groundcover);
-        setNodeMask(Mask_RenderToTexture);
-        setViewport(0, 0, rttSize, rttSize);
-
-        // No need for Update traversal since the scene is already updated as part of the main scene graph
-        // A double update would mess with the light collection (in addition to being plain redundant)
-        setUpdateCallback(new NoTraverseCallback);
+        mClipCullNode = new ClipCullNode;
+    }
+
+    void setDefaults(osg::Camera* camera) override
+    {
+        camera->setReferenceFrame(osg::Camera::RELATIVE_RF);
+        camera->setSmallFeatureCullingPixelSize(Settings::Manager::getInt("small feature culling pixel size", "Water"));
+        camera->setName("RefractionCamera");
+        camera->addCullCallback(new InheritViewPointCallback);
+        camera->setComputeNearFarMode(osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR);
+
+        camera->setCullMask(Mask_Effect | Mask_Scene | Mask_Object | Mask_Static | Mask_Terrain | Mask_Actor | Mask_ParticleSystem | Mask_Sky | Mask_Sun | Mask_Player | Mask_Lighting | Mask_Groundcover);
 
         // No need for fog here, we are already applying fog on the water surface itself as well as underwater fog
         // assign large value to effectively turn off fog
         // shaders don't respect glDisable(GL_FOG)
-        osg::ref_ptr<osg::Fog> fog (new osg::Fog);
+        osg::ref_ptr<osg::Fog> fog(new osg::Fog);
         fog->setStart(10000000);
         fog->setEnd(10000000);
-        getOrCreateStateSet()->setAttributeAndModes(fog, osg::StateAttribute::OFF|osg::StateAttribute::OVERRIDE);
+        camera->getOrCreateStateSet()->setAttributeAndModes(fog, osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE);
 
-        mClipCullNode = new ClipCullNode;
-        osg::Camera::addChild(mClipCullNode);
-
-        mRefractionTexture = new osg::Texture2D;
-        mRefractionTexture->setTextureSize(rttSize, rttSize);
-        mRefractionTexture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
-        mRefractionTexture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
-        mRefractionTexture->setInternalFormat(GL_RGB);
-        mRefractionTexture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
-        mRefractionTexture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
-
-        SceneUtil::attachAlphaToCoverageFriendlyFramebufferToCamera(this, osg::Camera::COLOR_BUFFER, mRefractionTexture);
-
-        mRefractionDepthTexture = new osg::Texture2D;
-        mRefractionDepthTexture->setTextureSize(rttSize, rttSize);
-        mRefractionDepthTexture->setSourceFormat(GL_DEPTH_COMPONENT);
-        mRefractionDepthTexture->setInternalFormat(GL_DEPTH_COMPONENT24);
-        mRefractionDepthTexture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
-        mRefractionDepthTexture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
-        mRefractionDepthTexture->setSourceType(GL_UNSIGNED_INT);
-        mRefractionDepthTexture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
-        mRefractionDepthTexture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
-
-        attach(osg::Camera::DEPTH_BUFFER, mRefractionDepthTexture);
+        camera->addChild(mClipCullNode);
+        camera->setNodeMask(Mask_RenderToTexture);
 
         if (Settings::Manager::getFloat("refraction scale", "Water") != 1) // TODO: to be removed with issue #5709
-            SceneUtil::ShadowManager::disableShadowsForStateSet(getOrCreateStateSet());
+            SceneUtil::ShadowManager::disableShadowsForStateSet(camera->getOrCreateStateSet());
+    }
+
+    void apply(osg::Camera* camera) override
+    {
+        camera->setViewMatrix(mViewMatrix);
     }
 
     void setScene(osg::Node* scene)
@@ -332,74 +311,53 @@ public:
 
     void setWaterLevel(float waterLevel)
     {
-        const float refractionScale = std::min(1.0f,std::max(0.0f,
+        const float refractionScale = std::min(1.0f, std::max(0.0f,
             Settings::Manager::getFloat("refraction scale", "Water")));
 
-        setViewMatrix(osg::Matrix::scale(1,1,refractionScale) *
-            osg::Matrix::translate(0,0,(1.0 - refractionScale) * waterLevel));
-
-        mClipCullNode->setPlane(osg::Plane(osg::Vec3d(0,0,-1), osg::Vec3d(0,0, waterLevel)));
-    }
-
-    osg::Texture2D* getRefractionTexture() const
-    {
-        return mRefractionTexture.get();
-    }
+        mViewMatrix = osg::Matrix::scale(1, 1, refractionScale) *
+            osg::Matrix::translate(0, 0, (1.0 - refractionScale) * waterLevel);
 
-    osg::Texture2D* getRefractionDepthTexture() const
-    {
-        return mRefractionDepthTexture.get();
+        mClipCullNode->setPlane(osg::Plane(osg::Vec3d(0, 0, -1), osg::Vec3d(0, 0, waterLevel)));
     }
 
 private:
     osg::ref_ptr<ClipCullNode> mClipCullNode;
-    osg::ref_ptr<osg::Texture2D> mRefractionTexture;
-    osg::ref_ptr<osg::Texture2D> mRefractionDepthTexture;
     osg::ref_ptr<osg::Node> mScene;
+    osg::Matrix mViewMatrix{ osg::Matrix::identity() };
 };
 
-class Reflection : public osg::Camera
+class Reflection : public SceneUtil::RTTNode
 {
 public:
-    Reflection(bool isInterior)
+    Reflection(uint32_t rttSize, bool isInterior)
+        : RTTNode(rttSize, rttSize, 0, false)
     {
-        setRenderOrder(osg::Camera::PRE_RENDER);
-        setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-        setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT);
-        setReferenceFrame(osg::Camera::RELATIVE_RF);
-        setSmallFeatureCullingPixelSize(Settings::Manager::getInt("small feature culling pixel size", "Water"));
-        osg::Camera::setName("ReflectionCamera");
-        setCullCallback(new InheritViewPointCallback);
-
         setInterior(isInterior);
-        setNodeMask(Mask_RenderToTexture);
-
-        unsigned int rttSize = Settings::Manager::getInt("rtt size", "Water");
-        setViewport(0, 0, rttSize, rttSize);
-
-        // No need for Update traversal since the mSceneRoot is already updated as part of the main scene graph
-        // A double update would mess with the light collection (in addition to being plain redundant)
-        setUpdateCallback(new NoTraverseCallback);
-
-        mReflectionTexture = new osg::Texture2D;
-        mReflectionTexture->setTextureSize(rttSize, rttSize);
-        mReflectionTexture->setInternalFormat(GL_RGB);
-        mReflectionTexture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
-        mReflectionTexture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
-        mReflectionTexture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
-        mReflectionTexture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+        mClipCullNode = new ClipCullNode;
+    }
 
-        SceneUtil::attachAlphaToCoverageFriendlyFramebufferToCamera(this, osg::Camera::COLOR_BUFFER, mReflectionTexture);
+    void setDefaults(osg::Camera* camera) override
+    {
+        camera->setReferenceFrame(osg::Camera::RELATIVE_RF);
+        camera->setSmallFeatureCullingPixelSize(Settings::Manager::getInt("small feature culling pixel size", "Water"));
+        camera->setName("ReflectionCamera");
+        camera->addCullCallback(new InheritViewPointCallback);
 
         // XXX: should really flip the FrontFace on each renderable instead of forcing clockwise.
-        osg::ref_ptr<osg::FrontFace> frontFace (new osg::FrontFace);
+        osg::ref_ptr<osg::FrontFace> frontFace(new osg::FrontFace);
         frontFace->setMode(osg::FrontFace::CLOCKWISE);
-        getOrCreateStateSet()->setAttributeAndModes(frontFace, osg::StateAttribute::ON);
+        camera->getOrCreateStateSet()->setAttributeAndModes(frontFace, osg::StateAttribute::ON);
 
-        mClipCullNode = new ClipCullNode;
-        osg::Camera::addChild(mClipCullNode);
+        camera->addChild(mClipCullNode);
+        camera->setNodeMask(Mask_RenderToTexture);
 
-        SceneUtil::ShadowManager::disableShadowsForStateSet(getOrCreateStateSet());
+        SceneUtil::ShadowManager::disableShadowsForStateSet(camera->getOrCreateStateSet());
+    }
+
+    void apply(osg::Camera* camera) override
+    {
+        camera->setViewMatrix(mViewMatrix);
+        camera->setCullMask(mNodeMask);
     }
 
     void setInterior(bool isInterior)
@@ -409,16 +367,16 @@ public:
         unsigned int extraMask = 0;
         if(reflectionDetail >= 1) extraMask |= Mask_Terrain;
         if(reflectionDetail >= 2) extraMask |= Mask_Static;
-        if(reflectionDetail >= 3) extraMask |= Mask_Effect|Mask_ParticleSystem|Mask_Object;
-        if(reflectionDetail >= 4) extraMask |= Mask_Player|Mask_Actor;
+        if(reflectionDetail >= 3) extraMask |= Mask_Effect | Mask_ParticleSystem | Mask_Object;
+        if(reflectionDetail >= 4) extraMask |= Mask_Player | Mask_Actor;
         if(reflectionDetail >= 5) extraMask |= Mask_Groundcover;
-        setCullMask(Mask_Scene|Mask_Sky|Mask_Lighting|extraMask);
+        mNodeMask = Mask_Scene | Mask_Sky | Mask_Lighting | extraMask;
     }
 
     void setWaterLevel(float waterLevel)
     {
-        setViewMatrix(osg::Matrix::scale(1,1,-1) * osg::Matrix::translate(0,0,2 * waterLevel));
-        mClipCullNode->setPlane(osg::Plane(osg::Vec3d(0,0,1), osg::Vec3d(0,0,waterLevel)));
+        mViewMatrix = osg::Matrix::scale(1, 1, -1) * osg::Matrix::translate(0, 0, 2 * waterLevel);
+        mClipCullNode->setPlane(osg::Plane(osg::Vec3d(0, 0, 1), osg::Vec3d(0, 0, waterLevel)));
     }
 
     void setScene(osg::Node* scene)
@@ -429,15 +387,11 @@ public:
         mClipCullNode->addChild(scene);
     }
 
-    osg::Texture2D* getReflectionTexture() const
-    {
-        return mReflectionTexture.get();
-    }
-
 private:
-    osg::ref_ptr<osg::Texture2D> mReflectionTexture;
     osg::ref_ptr<ClipCullNode> mClipCullNode;
     osg::ref_ptr<osg::Node> mScene;
+    osg::Node::NodeMask mNodeMask;
+    osg::Matrix mViewMatrix{ osg::Matrix::identity() };
 };
 
 /// DepthClampCallback enables GL_DEPTH_CLAMP for the current draw, if supported.
@@ -474,6 +428,7 @@ Water::Water(osg::Group *parent, osg::Group* sceneRoot, Resource::ResourceSystem
     , mTop(0)
     , mInterior(false)
     , mCullCallback(nullptr)
+    , mShaderWaterStateSetUpdater(nullptr)
 {
     mSimulation.reset(new RippleSimulation(mSceneRoot, resourceSystem));
 
@@ -528,22 +483,31 @@ void Water::setCullCallback(osg::Callback* callback)
 
 void Water::updateWaterMaterial()
 {
+    if (mShaderWaterStateSetUpdater)
+    {
+        mWaterNode->removeCullCallback(mShaderWaterStateSetUpdater);
+        mShaderWaterStateSetUpdater = nullptr;
+    }
     if (mReflection)
     {
-        mReflection->removeChildren(0, mReflection->getNumChildren());
         mParent->removeChild(mReflection);
         mReflection = nullptr;
     }
     if (mRefraction)
     {
-        mRefraction->removeChildren(0, mRefraction->getNumChildren());
         mParent->removeChild(mRefraction);
         mRefraction = nullptr;
     }
 
+    mWaterNode->setStateSet(nullptr);
+    mWaterGeom->setStateSet(nullptr);
+    mWaterGeom->setUpdateCallback(nullptr);
+
     if (Settings::Manager::getBool("shader", "Water"))
     {
-        mReflection = new Reflection(mInterior);
+        unsigned int rttSize = Settings::Manager::getInt("rtt size", "Water");
+
+        mReflection = new Reflection(rttSize, mInterior);
         mReflection->setWaterLevel(mTop);
         mReflection->setScene(mSceneRoot);
         if (mCullCallback)
@@ -552,7 +516,7 @@ void Water::updateWaterMaterial()
 
         if (Settings::Manager::getBool("refraction", "Water"))
         {
-            mRefraction = new Refraction;
+            mRefraction = new Refraction(rttSize);
             mRefraction->setWaterLevel(mTop);
             mRefraction->setScene(mSceneRoot);
             if (mCullCallback)
@@ -560,7 +524,7 @@ void Water::updateWaterMaterial()
             mParent->addChild(mRefraction);
         }
 
-        createShaderWaterStateSet(mWaterGeom, mReflection, mRefraction);
+        createShaderWaterStateSet(mWaterNode, mReflection, mRefraction);
     }
     else
         createSimpleWaterStateSet(mWaterGeom, Fallback::Map::getFloat("Water_World_Alpha"));
@@ -568,12 +532,12 @@ void Water::updateWaterMaterial()
     updateVisible();
 }
 
-osg::Camera *Water::getReflectionCamera()
+osg::Node *Water::getReflectionNode()
 {
     return mReflection;
 }
 
-osg::Camera *Water::getRefractionCamera()
+osg::Node* Water::getRefractionNode()
 {
     return mRefraction;
 }
@@ -620,17 +584,74 @@ void Water::createSimpleWaterStateSet(osg::Node* node, float alpha)
     sceneManager->setForceShaders(oldValue);
 }
 
+class ShaderWaterStateSetUpdater : public SceneUtil::StateSetUpdater
+{
+public:
+    ShaderWaterStateSetUpdater(Water* water, Reflection* reflection, Refraction* refraction, osg::ref_ptr<osg::Program> program, osg::ref_ptr<osg::Texture2D> normalMap)
+        : mWater(water)
+        , mReflection(reflection)
+        , mRefraction(refraction)
+        , mProgram(program)
+        , mNormalMap(normalMap)
+    {
+    }
+
+    void setDefaults(osg::StateSet* stateset) override
+    {
+        stateset->addUniform(new osg::Uniform("normalMap", 0));
+        stateset->setTextureAttributeAndModes(0, mNormalMap, osg::StateAttribute::ON);
+        stateset->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
+        stateset->setAttributeAndModes(mProgram, osg::StateAttribute::ON);
+
+        stateset->addUniform(new osg::Uniform("reflectionMap", 1));
+        if (mRefraction)
+        {
+            stateset->addUniform(new osg::Uniform("refractionMap", 2));
+            stateset->addUniform(new osg::Uniform("refractionDepthMap", 3));
+            stateset->setRenderBinDetails(MWRender::RenderBin_Default, "RenderBin");
+        }
+        else
+        {
+            stateset->setMode(GL_BLEND, osg::StateAttribute::ON);
+            stateset->setRenderBinDetails(MWRender::RenderBin_Water, "RenderBin");
+            osg::ref_ptr<osg::Depth> depth(new osg::Depth);
+            depth->setWriteMask(false);
+            stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
+        }
+    }
+
+    void apply(osg::StateSet* stateset, osg::NodeVisitor* nv) override
+    {
+        osgUtil::CullVisitor* cv = static_cast<osgUtil::CullVisitor*>(nv);
+        stateset->setTextureAttributeAndModes(1, mReflection->getColorTexture(cv), osg::StateAttribute::ON);
+
+        if (mRefraction)
+        {
+            stateset->setTextureAttributeAndModes(2, mRefraction->getColorTexture(cv), osg::StateAttribute::ON);
+            stateset->setTextureAttributeAndModes(3, mRefraction->getDepthTexture(cv), osg::StateAttribute::ON);
+        }
+    }
+
+private:
+    Water* mWater;
+    Reflection* mReflection;
+    Refraction* mRefraction;
+    osg::ref_ptr<osg::Program> mProgram;
+    osg::ref_ptr<osg::Texture2D> mNormalMap;
+};
+
 void Water::createShaderWaterStateSet(osg::Node* node, Reflection* reflection, Refraction* refraction)
 {
     // use a define map to conditionally compile the shader
     std::map<std::string, std::string> defineMap;
-    defineMap.insert(std::make_pair(std::string("refraction_enabled"), std::string(refraction ? "1" : "0")));
+    defineMap.insert(std::make_pair(std::string("refraction_enabled"), std::string(mRefraction ? "1" : "0")));
 
     Shader::ShaderManager& shaderMgr = mResourceSystem->getSceneManager()->getShaderManager();
-    osg::ref_ptr<osg::Shader> vertexShader (shaderMgr.getShader("water_vertex.glsl", defineMap, osg::Shader::VERTEX));
-    osg::ref_ptr<osg::Shader> fragmentShader (shaderMgr.getShader("water_fragment.glsl", defineMap, osg::Shader::FRAGMENT));
+    osg::ref_ptr<osg::Shader> vertexShader(shaderMgr.getShader("water_vertex.glsl", defineMap, osg::Shader::VERTEX));
+    osg::ref_ptr<osg::Shader> fragmentShader(shaderMgr.getShader("water_fragment.glsl", defineMap, osg::Shader::FRAGMENT));
+    osg::ref_ptr<osg::Program> program = shaderMgr.getProgram(vertexShader, fragmentShader);
 
-    osg::ref_ptr<osg::Texture2D> normalMap (new osg::Texture2D(readPngImage(mResourcePath + "/shaders/water_nm.png")));
+    osg::ref_ptr<osg::Texture2D> normalMap(new osg::Texture2D(readPngImage(mResourcePath + "/shaders/water_nm.png")));
 
     if (normalMap->getImage())
         normalMap->getImage()->flipVertical();
@@ -640,46 +661,14 @@ void Water::createShaderWaterStateSet(osg::Node* node, Reflection* reflection, R
     normalMap->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR_MIPMAP_LINEAR);
     normalMap->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
 
-    osg::ref_ptr<osg::StateSet> shaderStateset = new osg::StateSet;
-    shaderStateset->addUniform(new osg::Uniform("normalMap", 0));
-    shaderStateset->addUniform(new osg::Uniform("reflectionMap", 1));
-
-    shaderStateset->setTextureAttributeAndModes(0, normalMap, osg::StateAttribute::ON);
-    shaderStateset->setTextureAttributeAndModes(1, reflection->getReflectionTexture(), osg::StateAttribute::ON);
-
-    if (refraction)
-    {
-        shaderStateset->setTextureAttributeAndModes(2, refraction->getRefractionTexture(), osg::StateAttribute::ON);
-        shaderStateset->setTextureAttributeAndModes(3, refraction->getRefractionDepthTexture(), osg::StateAttribute::ON);
-        shaderStateset->addUniform(new osg::Uniform("refractionMap", 2));
-        shaderStateset->addUniform(new osg::Uniform("refractionDepthMap", 3));
-        shaderStateset->setRenderBinDetails(MWRender::RenderBin_Default, "RenderBin");
-    }
-    else
-    {
-        shaderStateset->setMode(GL_BLEND, osg::StateAttribute::ON);
-
-        shaderStateset->setRenderBinDetails(MWRender::RenderBin_Water, "RenderBin");
-
-        osg::ref_ptr<osg::Depth> depth (new osg::Depth);
-        depth->setWriteMask(false);
-        shaderStateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
-    }
-
-    shaderStateset->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
-
-    osg::ref_ptr<osg::Program> program (new osg::Program);
-    program->addShader(vertexShader);
-    program->addShader(fragmentShader);
     auto method = mResourceSystem->getSceneManager()->getLightingMethod();
     if (method == SceneUtil::LightingMethod::SingleUBO)
         program->addBindUniformBlock("LightBufferBinding", static_cast<int>(Shader::UBOBinding::LightBuffer));
-    shaderStateset->setAttributeAndModes(program, osg::StateAttribute::ON);
-
-    node->setStateSet(shaderStateset);
-
     mRainIntensityUpdater = new RainIntensityUpdater();
     node->setUpdateCallback(mRainIntensityUpdater);
+
+    mShaderWaterStateSetUpdater = new ShaderWaterStateSetUpdater(this, mReflection, mRefraction, program, normalMap);
+    node->addCullCallback(mShaderWaterStateSetUpdater);
 }
 
 void Water::processChangedSettings(const Settings::CategorySettingVector& settings)
@@ -693,13 +682,11 @@ Water::~Water()
 
     if (mReflection)
     {
-        mReflection->removeChildren(0, mReflection->getNumChildren());
         mParent->removeChild(mReflection);
         mReflection = nullptr;
     }
     if (mRefraction)
     {
-        mRefraction->removeChildren(0, mRefraction->getNumChildren());
         mParent->removeChild(mRefraction);
         mRefraction = nullptr;
     }
diff --git a/apps/openmw/mwrender/water.hpp b/apps/openmw/mwrender/water.hpp
index ec7dc95db8..8b6c5c83e5 100644
--- a/apps/openmw/mwrender/water.hpp
+++ b/apps/openmw/mwrender/water.hpp
@@ -72,6 +72,7 @@ namespace MWRender
         bool mInterior;
 
         osg::Callback* mCullCallback;
+        osg::ref_ptr<osg::NodeCallback> mShaderWaterStateSetUpdater;
 
         osg::Vec3f getSceneNodeCoordinates(int gridX, int gridY);
         void updateVisible();
@@ -116,8 +117,8 @@ namespace MWRender
 
         void update(float dt);
 
-        osg::Camera *getReflectionCamera();
-        osg::Camera *getRefractionCamera();
+        osg::Node* getReflectionNode();
+        osg::Node* getRefractionNode();
 
         void processChangedSettings(const Settings::CategorySettingVector& settings);
     };
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 678a4ea02f..3388d34a09 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -56,7 +56,7 @@ add_component_dir (shader
 add_component_dir (sceneutil
     clone attach visitor util statesetupdater controller skeleton riggeometry morphgeometry lightcontroller
     lightmanager lightutil positionattitudetransform workqueue unrefqueue pathgridutil waterutil writescene serialize optimizer
-    actorutil detourdebugdraw navmesh agentpath shadow mwshadowtechnique recastmesh shadowsbin osgacontroller
+    actorutil detourdebugdraw navmesh agentpath shadow mwshadowtechnique recastmesh shadowsbin osgacontroller rtt
     screencapture
     )
 
diff --git a/components/sceneutil/rtt.cpp b/components/sceneutil/rtt.cpp
new file mode 100644
index 0000000000..a661a90279
--- /dev/null
+++ b/components/sceneutil/rtt.cpp
@@ -0,0 +1,110 @@
+#include "rtt.hpp"
+#include "util.hpp"
+
+#include <osg/Node>
+#include <osg/NodeVisitor>
+#include <osg/Texture2D>
+#include <osgUtil/CullVisitor>
+
+#include <components/settings/settings.hpp>
+
+namespace SceneUtil
+{
+    // RTTNode's cull callback
+    class CullCallback : public osg::NodeCallback
+    {
+    public:
+        CullCallback(RTTNode* group)
+            : mGroup(group) {}
+
+        void operator()(osg::Node* node, osg::NodeVisitor* nv) override
+        {
+            osgUtil::CullVisitor* cv = static_cast<osgUtil::CullVisitor*>(nv);
+            mGroup->cull(cv);
+        }
+        RTTNode* mGroup;
+    };
+
+    RTTNode::RTTNode(uint32_t textureWidth, uint32_t textureHeight, int renderOrderNum, bool doPerViewMapping)
+        : mTextureWidth(textureWidth)
+        , mTextureHeight(textureHeight)
+        , mRenderOrderNum(renderOrderNum)
+        , mDoPerViewMapping(doPerViewMapping)
+    {
+        addCullCallback(new CullCallback(this));
+        setCullingActive(false);
+    }
+
+    RTTNode::~RTTNode()
+    {
+    }
+
+    void RTTNode::cull(osgUtil::CullVisitor* cv)
+    {
+        auto* vdd = getViewDependentData(cv);
+        apply(vdd->mCamera);
+        vdd->mCamera->accept(*cv);
+    }
+
+    osg::Texture* RTTNode::getColorTexture(osgUtil::CullVisitor* cv)
+    {
+        return getViewDependentData(cv)->mCamera->getBufferAttachmentMap()[osg::Camera::COLOR_BUFFER]._texture;
+    }
+
+    osg::Texture* RTTNode::getDepthTexture(osgUtil::CullVisitor* cv)
+    {
+        return getViewDependentData(cv)->mCamera->getBufferAttachmentMap()[osg::Camera::DEPTH_BUFFER]._texture;
+    }
+
+    RTTNode::ViewDependentData* RTTNode::getViewDependentData(osgUtil::CullVisitor* cv)
+    {
+        if (!mDoPerViewMapping)
+            // Always setting it to null is an easy way to disable per-view mapping when mDoPerViewMapping is false.
+            // This is safe since the visitor is never dereferenced.
+            cv = nullptr;
+
+        if (mViewDependentDataMap.count(cv) == 0)
+        {
+            auto camera = new osg::Camera();
+            mViewDependentDataMap[cv].reset(new ViewDependentData);
+            mViewDependentDataMap[cv]->mCamera = camera;
+
+            camera->setRenderOrder(osg::Camera::PRE_RENDER, mRenderOrderNum);
+            camera->setClearMask(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
+            camera->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT);
+            camera->setViewport(0, 0, mTextureWidth, mTextureHeight);
+
+            setDefaults(mViewDependentDataMap[cv]->mCamera.get());
+
+            // Create any buffer attachments not added in setDefaults
+            if (camera->getBufferAttachmentMap().count(osg::Camera::COLOR_BUFFER) == 0)
+            {
+                auto colorBuffer = new osg::Texture2D;
+                colorBuffer->setTextureSize(mTextureWidth, mTextureHeight);
+                colorBuffer->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+                colorBuffer->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+                colorBuffer->setInternalFormat(GL_RGB);
+                colorBuffer->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
+                colorBuffer->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
+                camera->attach(osg::Camera::COLOR_BUFFER, colorBuffer);
+                SceneUtil::attachAlphaToCoverageFriendlyFramebufferToCamera(camera, osg::Camera::COLOR_BUFFER, colorBuffer);
+            }
+
+            if (camera->getBufferAttachmentMap().count(osg::Camera::DEPTH_BUFFER) == 0)
+            {
+                auto depthBuffer = new osg::Texture2D;
+                depthBuffer->setTextureSize(mTextureWidth, mTextureHeight);
+                depthBuffer->setSourceFormat(GL_DEPTH_COMPONENT);
+                depthBuffer->setInternalFormat(GL_DEPTH_COMPONENT24);
+                depthBuffer->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+                depthBuffer->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+                depthBuffer->setSourceType(GL_UNSIGNED_INT);
+                depthBuffer->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
+                depthBuffer->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
+                camera->attach(osg::Camera::DEPTH_BUFFER, depthBuffer);
+            }
+        }
+
+        return mViewDependentDataMap[cv].get();
+    }
+}
diff --git a/components/sceneutil/rtt.hpp b/components/sceneutil/rtt.hpp
new file mode 100644
index 0000000000..7adfa098eb
--- /dev/null
+++ b/components/sceneutil/rtt.hpp
@@ -0,0 +1,68 @@
+#ifndef OPENMW_RTT_H
+#define OPENMW_RTT_H
+
+#include <osg/Node>
+
+#include <map>
+#include <memory>
+
+namespace osg
+{
+    class Texture2D;
+    class Camera;
+}
+
+namespace osgUtil
+{
+    class CullVisitor;
+}
+
+namespace SceneUtil
+{
+    /// @brief Implements per-view RTT operations.
+    /// @par With a naive RTT implementation, subsequent views of multiple views will overwrite the results of the previous views, leading to
+    ///     the results of the last view being broadcast to all views. An error in all cases where the RTT result depends on the view.
+    /// @par If using an RTTNode this is solved by mapping RTT operations to CullVisitors, which will be unique per view. This requires
+    ///     instancing one camera per view, and traversing only the camera mapped to that CV during cull traversals.
+    /// @par Camera settings should be effectuated by overriding the setDefaults() and apply() methods, following a pattern similar to SceneUtil::StateSetUpdater
+    /// @par When using the RTT texture in your statesets, it is recommended to use SceneUtil::StateSetUpdater as a cull callback to handle this as the appropriate
+    ///     textures can be retrieved during SceneUtil::StateSetUpdater::Apply()
+    /// @par For any of COLOR_BUFFER or DEPTH_BUFFER not added during setDefaults(), RTTNode will attach a default buffer. The default color buffer has an internal format of GL_RGB.
+    ///     The default depth buffer has internal format GL_DEPTH_COMPONENT24, source format GL_DEPTH_COMPONENT, and source type GL_UNSIGNED_INT. Default wrap is CLAMP_TO_EDGE and filter LINEAR.
+    class RTTNode : public osg::Node
+    {
+    public:
+        RTTNode(uint32_t textureWidth, uint32_t textureHeight, int renderOrderNum, bool doPerViewMapping);
+        ~RTTNode();
+
+        osg::Texture* getColorTexture(osgUtil::CullVisitor* cv);
+
+        osg::Texture* getDepthTexture(osgUtil::CullVisitor* cv);
+
+
+        /// Apply state - to override in derived classes
+        /// @note Due to the view mapping approach you *have* to apply all camera settings, even if they have not changed since the last frame.
+        virtual void setDefaults(osg::Camera* camera) {};
+
+        /// Set default settings - optionally override in derived classes
+        virtual void apply(osg::Camera* camera) {};
+
+        void cull(osgUtil::CullVisitor* cv);
+
+    private:
+        struct ViewDependentData
+        {
+            osg::ref_ptr<osg::Camera> mCamera;
+        };
+
+        ViewDependentData* getViewDependentData(osgUtil::CullVisitor* cv);
+
+        typedef std::map< osgUtil::CullVisitor*, std::unique_ptr<ViewDependentData> >  ViewDependentDataMap;
+        ViewDependentDataMap mViewDependentDataMap;
+        uint32_t mTextureWidth;
+        uint32_t mTextureHeight;
+        int mRenderOrderNum;
+        bool mDoPerViewMapping;
+    };
+}
+#endif
diff --git a/components/sceneutil/statesetupdater.cpp b/components/sceneutil/statesetupdater.cpp
index 5d7dbd7559..a8232f938e 100644
--- a/components/sceneutil/statesetupdater.cpp
+++ b/components/sceneutil/statesetupdater.cpp
@@ -10,36 +10,57 @@ namespace SceneUtil
     void StateSetUpdater::operator()(osg::Node* node, osg::NodeVisitor* nv)
     {
         bool isCullVisitor = nv->getVisitorType() == osg::NodeVisitor::CULL_VISITOR;
-        if (!mStateSets[0])
+
+        if (isCullVisitor)
+            return applyCull(node, static_cast<osgUtil::CullVisitor*>(nv));
+        else
+            return applyUpdate(node, nv);
+    }
+
+    void StateSetUpdater::applyUpdate(osg::Node* node, osg::NodeVisitor* nv)
+    {
+        if (!mStateSetsUpdate[0])
         {
-            for (int i=0; i<2; ++i)
+            for (int i = 0; i < 2; ++i)
             {
-                if (!isCullVisitor)
-                    mStateSets[i] = new osg::StateSet(*node->getOrCreateStateSet(), osg::CopyOp::SHALLOW_COPY); // Using SHALLOW_COPY for StateAttributes, if users want to modify it is their responsibility to set a non-shared one first in setDefaults
-                else
-                    mStateSets[i] = new osg::StateSet;
-                setDefaults(mStateSets[i]);
+                mStateSetsUpdate[i] = new osg::StateSet(*node->getOrCreateStateSet(), osg::CopyOp::SHALLOW_COPY); // Using SHALLOW_COPY for StateAttributes, if users want to modify it is their responsibility to set a non-shared one first in setDefaults
+                setDefaults(mStateSetsUpdate[i]);
             }
         }
 
-        osg::ref_ptr<osg::StateSet> stateset = mStateSets[nv->getTraversalNumber()%2];
+        osg::ref_ptr<osg::StateSet> stateset = mStateSetsUpdate[nv->getTraversalNumber() % 2];
         apply(stateset, nv);
-
-        if (!isCullVisitor)
-            node->setStateSet(stateset);
-        else
-            static_cast<osgUtil::CullVisitor*>(nv)->pushStateSet(stateset);
-
+        node->setStateSet(stateset);
         traverse(node, nv);
+    }
+    
+    void StateSetUpdater::applyCull(osg::Node* node, osgUtil::CullVisitor* cv)
+    {
+        auto stateset = getCvDependentStateset(cv);
+        apply(stateset, cv);
+        cv->pushStateSet(stateset);
+        traverse(node, cv);
+        cv->popStateSet();
+    }
 
-        if (isCullVisitor)
-            static_cast<osgUtil::CullVisitor*>(nv)->popStateSet();
+    osg::StateSet* StateSetUpdater::getCvDependentStateset(osgUtil::CullVisitor* cv)
+    {
+        auto it = mStateSetsCull.find(cv);
+        if (it == mStateSetsCull.end())
+        {
+            osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
+            mStateSetsCull.emplace(cv, stateset);
+            setDefaults(stateset);
+            return stateset;
+        }
+        return it->second;
     }
 
     void StateSetUpdater::reset()
     {
-        mStateSets[0] = nullptr;
-        mStateSets[1] = nullptr;
+        mStateSetsUpdate[0] = nullptr;
+        mStateSetsUpdate[1] = nullptr;
+        mStateSetsCull.clear();
     }
 
     StateSetUpdater::StateSetUpdater()
diff --git a/components/sceneutil/statesetupdater.hpp b/components/sceneutil/statesetupdater.hpp
index 25e50acfd2..263f76ae54 100644
--- a/components/sceneutil/statesetupdater.hpp
+++ b/components/sceneutil/statesetupdater.hpp
@@ -3,6 +3,14 @@
 
 #include <osg/NodeCallback>
 
+#include <map>
+#include <array>
+
+namespace osgUtil
+{
+    class CullVisitor;
+}
+
 namespace SceneUtil
 {
 
@@ -11,11 +19,15 @@ namespace SceneUtil
     ///     queues up a StateSet that we want to modify for the next frame. To solve this we could set the StateSet to
     ///     DYNAMIC data variance but that would undo all the benefits of the threading model - having the cull and draw
     ///     traversals run in parallel can yield up to 200% framerates.
-    /// @par Race conditions are prevented using a "double buffering" scheme - we have two StateSets that take turns,
+    /// @par Must be set as UpdateCallback or CullCallback on a Node. If set as a CullCallback, the StateSetUpdater operates on an empty StateSet, 
+    ///     otherwise it operates on a clone of the node's existing StateSet.
+    /// @par If set as an UpdateCallback, race conditions are prevented using a "double buffering" scheme - we have two StateSets that take turns,
     ///     one StateSet we can write to, the second one is currently in use by the draw traversal of the last frame.
-    /// @par Must be set as UpdateCallback or CullCallback on a Node. If set as a CullCallback, the StateSetUpdater operates on an empty StateSet, otherwise it operates on a clone of the node's existing StateSet.
+    /// @par If set as a CullCallback, race conditions are prevented by mapping statesets to cull visitors - OSG has two cull visitors that take turns,
+    ///     allowing the updater to automatically scale for the number of views.
+    /// @note When used as a CullCallback, StateSetUpdater will have no effect on leaf nodes such as osg::Geometry and must be used on branch nodes only.
     /// @note Do not add the same StateSetUpdater to multiple nodes.
-    /// @note Do not add multiple StateSetControllers on the same Node as they will conflict - instead use the CompositeStateSetUpdater.
+    /// @note Do not add multiple StateSetUpdaters on the same Node as they will conflict - instead use the CompositeStateSetUpdater.
     class StateSetUpdater : public osg::NodeCallback
     {
     public:
@@ -40,7 +52,12 @@ namespace SceneUtil
         void reset();
 
     private:
-        osg::ref_ptr<osg::StateSet> mStateSets[2];
+        void applyCull(osg::Node* node, osgUtil::CullVisitor* cv);
+        void applyUpdate(osg::Node* node, osg::NodeVisitor* nv);
+        osg::StateSet* getCvDependentStateset(osgUtil::CullVisitor* cv);
+
+        std::array<osg::ref_ptr<osg::StateSet>, 2> mStateSetsUpdate;
+        std::map<osgUtil::CullVisitor*, osg::ref_ptr<osg::StateSet>> mStateSetsCull;
     };
 
     /// @brief A variant of the StateSetController that can be made up of multiple controllers all controlling the same target.

From 7772f5111b4d4ced3a7311010fdfbe0b3704b5a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Mocquillon?= <cedric.mocquillon@gmail.com>
Date: Mon, 26 Jul 2021 18:30:06 +0200
Subject: [PATCH 1094/2859] std::set version

---
 apps/openmw/mwworld/store.cpp | 11 +++++------
 apps/openmw/mwworld/store.hpp | 30 ++++++++++++------------------
 2 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index d2c4725117..b6e8aafdc9 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -422,9 +422,8 @@ namespace MWWorld
     const ESM::Land *Store<ESM::Land>::search(int x, int y) const
     {
         std::pair<int, int> comp(x,y);
-        if (auto it = mStatic.find(comp); it != mStatic.end() && (*it)->mX == x && (*it)->mY == y) {
-            return it->get();
-        }
+        if (auto it = mStatic.find(comp); it != mStatic.end() && it->mX == x && it->mY == y)
+            return &*it;
         return nullptr;
     }
     const ESM::Land *Store<ESM::Land>::find(int x, int y) const
@@ -439,13 +438,13 @@ namespace MWWorld
     }
     RecordId Store<ESM::Land>::load(ESM::ESMReader &esm)
     {
-        auto ptr = std::make_unique<ESM::Land>();
+        ESM::Land land;
         bool isDeleted = false;
 
-        ptr->load(esm, isDeleted);
+        land.load(esm, isDeleted);
 
         // Same area defined in multiple plugins? -> last plugin wins
-        mStatic.insert(std::move(ptr));
+        mStatic.insert(std::move(land));
 
         return RecordId("", isDeleted);
     }
diff --git a/apps/openmw/mwworld/store.hpp b/apps/openmw/mwworld/store.hpp
index d65422516a..88edb71ddf 100644
--- a/apps/openmw/mwworld/store.hpp
+++ b/apps/openmw/mwworld/store.hpp
@@ -5,7 +5,7 @@
 #include <vector>
 #include <memory>
 #include <map>
-#include <boost/container/flat_set.hpp>
+#include <set>
 
 #include "recordcmp.hpp"
 
@@ -239,30 +239,24 @@ namespace MWWorld
         {
             using is_transparent = void;
 
-            bool operator()(const std::unique_ptr<ESM::Land>& x, const std::unique_ptr<ESM::Land>& y) const {
-                if (x->mX == y->mX) {
-                    return x->mY < y->mY;
-                }
-                return x->mX < y->mX;
+            bool operator()(const ESM::Land& x, const ESM::Land& y) const
+            {
+                return std::tie(x.mX, x.mY) < std::tie(y.mX, y.mY);
             }
-            bool operator()(const std::unique_ptr<ESM::Land>& x, const std::pair<int, int>& y) const {
-                if (x->mX == y.first) {
-                    return x->mY < y.second;
-                }
-                return x->mX < y.first;
+            bool operator()(const ESM::Land& x, const std::pair<int, int>& y) const
+            {
+                return std::tie(x.mX, x.mY) < std::tie(y.first, y.second);
             }
-            bool operator()(const std::pair<int, int>& x, const std::unique_ptr<ESM::Land>& y) const {
-                if (x.first == y->mX) {
-                    return x.second < y->mY;
-                }
-                return x.first < y->mX;
+            bool operator()(const std::pair<int, int>& x, const ESM::Land& y) const
+            {
+                return std::tie(x.first, x.second) < std::tie(y.mX, y.mY);
             }
         };
-        using Statics = boost::container::flat_set<std::unique_ptr<ESM::Land>, SpatialComparator>;
+        using Statics = std::set<ESM::Land, SpatialComparator>;
         Statics mStatic;
 
     public:
-        typedef SharedIterator<ESM::Land, Statics> iterator;
+        typedef typename Statics::iterator iterator;
 
         virtual ~Store();
 

From 536dc6a0c6b46bae950afc801dbc16ecd0c55b33 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Mon, 26 Jul 2021 04:37:13 +0300
Subject: [PATCH 1095/2859] Correct creature landing sound type (bug #6118)

---
 CHANGELOG.md                          | 1 +
 apps/openmw/mwmechanics/character.cpp | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0405757b69..799f5e0658 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
     Bug #6101: Disarming trapped unlocked owned objects isn't considered a crime
     Bug #6107: Fatigue is incorrectly recalculated when fortify effect is applied or removed
     Bug #6115: Showmap overzealous matching
+    Bug #6118: Creature landing sound counts as a footstep
     Bug #6123: NPC with broken script freezes the game on hello
     Bug #6129: Player avatar not displayed correctly for large window sizes when GUI scaling active
     Bug #6131: Item selection in the avatar window not working correctly for large window sizes
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index d5a1d46a88..c9bb1b7c4d 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -989,8 +989,7 @@ void CharacterController::handleTextKey(const std::string &groupname, SceneUtil:
         if(!sound.empty())
         {
             MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
-            // NB: landing sound is not played for NPCs here
-            if(soundgen == "left" || soundgen == "right" || soundgen == "land")
+            if (soundgen == "left" || soundgen == "right")
             {
                 sndMgr->playSound3D(mPtr, sound, volume, pitch, MWSound::Type::Foot,
                                     MWSound::PlayMode::NoPlayerLocal);

From 66a1adc31eea6f2dd04cda74c92b86bf329e9f72 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Tue, 27 Jul 2021 07:58:57 +0300
Subject: [PATCH 1096/2859] Handle NiExtraData *properly*

---
 components/nif/base.hpp    | 3 ++-
 components/nif/extra.cpp   | 7 +++++++
 components/nif/extra.hpp   | 7 +++++++
 components/nif/niffile.cpp | 2 +-
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/components/nif/base.hpp b/components/nif/base.hpp
index 022e5224a0..0728a46512 100644
--- a/components/nif/base.hpp
+++ b/components/nif/base.hpp
@@ -15,6 +15,7 @@ struct Extra : public Record
 {
     std::string name;
     ExtraPtr next; // Next extra data record in the list
+    unsigned int recordSize{0u};
 
     void read(NIFStream *nif) override
     {
@@ -23,7 +24,7 @@ struct Extra : public Record
         else if (nif->getVersion() <= NIFStream::generateVersion(4,2,2,0))
         {
             next.read(nif);
-            nif->getUInt(); // Size of the record
+            recordSize = nif->getUInt();
         }
     }
 
diff --git a/components/nif/extra.cpp b/components/nif/extra.cpp
index eeaf9d3ac4..a45ea8c50b 100644
--- a/components/nif/extra.cpp
+++ b/components/nif/extra.cpp
@@ -3,6 +3,13 @@
 namespace Nif
 {
 
+void NiExtraData::read(NIFStream *nif)
+{
+    Extra::read(nif);
+    if (recordSize)
+        nif->getChars(data, recordSize);
+}
+
 void NiStringExtraData::read(NIFStream *nif)
 {
     Extra::read(nif);
diff --git a/components/nif/extra.hpp b/components/nif/extra.hpp
index 6d345a18ea..f4ac1caff9 100644
--- a/components/nif/extra.hpp
+++ b/components/nif/extra.hpp
@@ -29,6 +29,13 @@
 namespace Nif
 {
 
+struct NiExtraData : public Extra
+{
+    std::vector<char> data;
+
+    void read(NIFStream *nif) override;
+};
+
 struct NiVertWeightsExtraData : public Extra
 {
     void read(NIFStream *nif) override;
diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index 6f7ed093c0..6863209988 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -79,7 +79,7 @@ static std::map<std::string,RecordFactoryEntry> makeFactory()
     factory["NiPointLight"]                 = {&construct <NiPointLight>                , RC_NiLight                    };
     factory["NiSpotLight"]                  = {&construct <NiSpotLight>                 , RC_NiLight                    };
     factory["NiTextureEffect"]              = {&construct <NiTextureEffect>             , RC_NiTextureEffect            };
-    factory["NiExtraData"]                  = {&construct <Extra>                       , RC_NiExtraData                };
+    factory["NiExtraData"]                  = {&construct <NiExtraData>                 , RC_NiExtraData                };
     factory["NiVertWeightsExtraData"]       = {&construct <NiVertWeightsExtraData>      , RC_NiVertWeightsExtraData     };
     factory["NiTextKeyExtraData"]           = {&construct <NiTextKeyExtraData>          , RC_NiTextKeyExtraData         };
     factory["NiStringExtraData"]            = {&construct <NiStringExtraData>           , RC_NiStringExtraData          };

From 977f717f8bc99a17880a1551bdb525bc6f3dc1e4 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Tue, 27 Jul 2021 16:33:07 +0200
Subject: [PATCH 1097/2859] Prevent a missing weapon animation from partially
 freezing actors

---
 apps/openmw/mwmechanics/character.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index d5a1d46a88..8952c21daa 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -1661,7 +1661,8 @@ bool CharacterController::updateWeaponState(CharacterState& idle)
                                  MWRender::Animation::BlendMask_All, false,
                                  weapSpeed, startKey, stopKey,
                                  0.0f, 0);
-                mUpperBodyState = UpperCharState_StartToMinAttack;
+                if(mAnimation->isPlaying(mCurrentWeapon))
+                    mUpperBodyState = UpperCharState_StartToMinAttack;
             }
         }
 

From 68b8a148d7e97fb94407b211ff8514fccaaa36d7 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sat, 17 Jul 2021 20:12:41 +0200
Subject: [PATCH 1098/2859] Initialize Lua packages in LuaManager::init rather
 than in constructor.

---
 apps/openmw/mwlua/luamanagerimp.cpp | 10 +++++++---
 apps/openmw/mwlua/luamanagerimp.hpp |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index e01273bb84..b02dbbc296 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -31,7 +31,10 @@ namespace MWLua
         mLocalLoader = createUserdataSerializer(true, mWorldView.getObjectRegistry(), &mContentFileMapping);
 
         mGlobalScripts.setSerializer(mGlobalSerializer.get());
+    }
 
+    void LuaManager::init()
+    {
         Context context;
         context.mIsGlobal = true;
         context.mLuaManager = this;
@@ -60,14 +63,12 @@ namespace MWLua
         mCameraPackage = initCameraPackage(localContext);
         mUserInterfacePackage = initUserInterfacePackage(localContext);
         mNearbyPackage = initNearbyPackage(localContext);
-    }
 
-    void LuaManager::init()
-    {
         mKeyPressEvents.clear();
         for (const std::string& path : mGlobalScriptList)
             if (mGlobalScripts.addNewScript(path))
                 Log(Debug::Info) << "Global script started: " << path;
+        mInitialized = true;
     }
 
     void LuaManager::update(bool paused, float dt)
@@ -198,6 +199,8 @@ namespace MWLua
 
     void LuaManager::setupPlayer(const MWWorld::Ptr& ptr)
     {
+        if (!mInitialized)
+            return;
         if (!mPlayer.isEmpty())
             throw std::logic_error("Player is initialized twice");
         mWorldView.objectAddedToScene(ptr);
@@ -279,6 +282,7 @@ namespace MWLua
 
     LocalScripts* LuaManager::createLocalScripts(const MWWorld::Ptr& ptr)
     {
+        assert(mInitialized);
         std::shared_ptr<LocalScripts> scripts;
         // When loading a game, it can be called before LuaManager::setPlayer,
         // so we can't just check ptr == mPlayer here.
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index df87457b23..a212f213c0 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -70,6 +70,7 @@ namespace MWLua
     private:
         LocalScripts* createLocalScripts(const MWWorld::Ptr& ptr);
 
+        bool mInitialized = false;
         LuaUtil::LuaState mLua;
         sol::table mNearbyPackage;
         sol::table mUserInterfacePackage;

From 3e4c0b775dbeea3b610f9e90d341911f34fd57dc Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Tue, 1 Jun 2021 23:18:42 +0200
Subject: [PATCH 1099/2859] Add Lua package 'openmw.settings'

---
 apps/openmw/CMakeLists.txt                    |  2 +-
 apps/openmw/mwlua/luabindings.cpp             |  2 +-
 apps/openmw/mwlua/luabindings.hpp             |  5 ++
 apps/openmw/mwlua/luamanagerimp.cpp           |  7 ++
 apps/openmw/mwlua/luamanagerimp.hpp           |  2 +
 apps/openmw/mwlua/settingsbindings.cpp        | 72 +++++++++++++++++++
 docs/source/reference/lua-scripting/api.rst   |  4 ++
 .../lua-scripting/openmw_settings.rst         |  5 ++
 .../reference/lua-scripting/overview.rst      |  3 +
 files/lua_api/openmw/settings.lua             | 14 ++++
 10 files changed, 114 insertions(+), 2 deletions(-)
 create mode 100644 apps/openmw/mwlua/settingsbindings.cpp
 create mode 100644 docs/source/reference/lua-scripting/openmw_settings.rst
 create mode 100644 files/lua_api/openmw/settings.lua

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 3c29baf3aa..6d58e880ed 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -57,7 +57,7 @@ add_openmw_dir (mwscript
 
 add_openmw_dir (mwlua
     luamanagerimp actions object worldview userdataserializer eventqueue query
-    luabindings localscripts objectbindings cellbindings asyncbindings camerabindings uibindings
+    luabindings localscripts objectbindings cellbindings asyncbindings camerabindings uibindings settingsbindings
     )
 
 add_openmw_dir (mwsound
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index ebb24401fc..ca800f2dd4 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -31,7 +31,7 @@ namespace MWLua
     {
         auto* lua = context.mLua;
         sol::table api(lua->sol(), sol::create);
-        api["API_VERSION"] = 0;
+        api["API_VERSION"] = 1;
         api["sendGlobalEvent"] = [context](std::string eventName, const sol::object& eventData)
         {
             context.mGlobalEventQueue->push_back({std::move(eventName), LuaUtil::serialize(eventData, context.mSerializer)});
diff --git a/apps/openmw/mwlua/luabindings.hpp b/apps/openmw/mwlua/luabindings.hpp
index 8be96763a5..568eb4e1ef 100644
--- a/apps/openmw/mwlua/luabindings.hpp
+++ b/apps/openmw/mwlua/luabindings.hpp
@@ -59,6 +59,11 @@ namespace MWLua
     // Implemented in uibindings.cpp
     sol::table initUserInterfacePackage(const Context&);
 
+    // Implemented in settingsbindings.cpp
+    sol::table initGlobalSettingsPackage(const Context&);
+    sol::table initLocalSettingsPackage(const Context&);
+    sol::table initPlayerSettingsPackage(const Context&);
+
     // openmw.self package is implemented in localscripts.cpp
 }
 
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index b02dbbc296..bbfe0b8c3a 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -60,9 +60,12 @@ namespace MWLua
         mLua.addCommonPackage("openmw.core", initCorePackage(context));
         mLua.addCommonPackage("openmw.query", initQueryPackage(context));
         mGlobalScripts.addPackage("openmw.world", initWorldPackage(context));
+        mGlobalScripts.addPackage("openmw.settings", initGlobalSettingsPackage(context));
         mCameraPackage = initCameraPackage(localContext);
         mUserInterfacePackage = initUserInterfacePackage(localContext);
         mNearbyPackage = initNearbyPackage(localContext);
+        mLocalSettingsPackage = initLocalSettingsPackage(localContext);
+        mPlayerSettingsPackage = initPlayerSettingsPackage(localContext);
 
         mKeyPressEvents.clear();
         for (const std::string& path : mGlobalScriptList)
@@ -291,9 +294,13 @@ namespace MWLua
             scripts = std::make_shared<PlayerScripts>(&mLua, LObject(getId(ptr), mWorldView.getObjectRegistry()));
             scripts->addPackage("openmw.ui", mUserInterfacePackage);
             scripts->addPackage("openmw.camera", mCameraPackage);
+            scripts->addPackage("openmw.settings", mPlayerSettingsPackage);
         }
         else
+        {
             scripts = std::make_shared<LocalScripts>(&mLua, LObject(getId(ptr), mWorldView.getObjectRegistry()));
+            scripts->addPackage("openmw.settings", mLocalSettingsPackage);
+        }
         scripts->addPackage("openmw.nearby", mNearbyPackage);
         scripts->setSerializer(mLocalSerializer.get());
 
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index a212f213c0..48cdeba026 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -75,6 +75,8 @@ namespace MWLua
         sol::table mNearbyPackage;
         sol::table mUserInterfacePackage;
         sol::table mCameraPackage;
+        sol::table mLocalSettingsPackage;
+        sol::table mPlayerSettingsPackage;
 
         std::vector<std::string> mGlobalScriptList;
         GlobalScripts mGlobalScripts{&mLua};
diff --git a/apps/openmw/mwlua/settingsbindings.cpp b/apps/openmw/mwlua/settingsbindings.cpp
new file mode 100644
index 0000000000..0e267182ac
--- /dev/null
+++ b/apps/openmw/mwlua/settingsbindings.cpp
@@ -0,0 +1,72 @@
+#include "luabindings.hpp"
+
+#include <components/settings/settings.hpp>
+
+#include "../mwworld/esmstore.hpp"
+#include "../mwworld/store.hpp"
+
+namespace MWLua
+{
+
+    static sol::table initSettingsPackage(const Context& context, bool /*global*/, bool player)
+    {
+        LuaUtil::LuaState* lua = context.mLua;
+        sol::table config(lua->sol(), sol::create);
+
+        // Access to settings.cfg. Temporary, will be removed at some point.
+        auto checkRead = [player](std::string_view category)
+        {
+            if ((category == "Camera" || category == "GUI" || category == "Hud" ||
+                 category == "Windows" || category == "Input") && !player)
+                throw std::runtime_error("This setting is only available in player scripts");
+        };
+        config["_getBoolFromSettingsCfg"] = [=](const std::string& category, const std::string& setting)
+        {
+            checkRead(category);
+            return Settings::Manager::getBool(setting, category);
+        };
+        config["_getIntFromSettingsCfg"] = [=](const std::string& category, const std::string& setting)
+        {
+            checkRead(category);
+            return Settings::Manager::getInt(setting, category);
+        };
+        config["_getFloatFromSettingsCfg"] = [=](const std::string& category, const std::string& setting)
+        {
+            checkRead(category);
+            return Settings::Manager::getFloat(setting, category);
+        };
+        config["_getStringFromSettingsCfg"] = [=](const std::string& category, const std::string& setting)
+        {
+            checkRead(category);
+            return Settings::Manager::getString(setting, category);
+        };
+        config["_getVector2FromSettingsCfg"] = [=](const std::string& category, const std::string& setting)
+        {
+            checkRead(category);
+            return Settings::Manager::getVector2(setting, category);
+        };
+        config["_getVector3FromSettingsCfg"] = [=](const std::string& category, const std::string& setting)
+        {
+            checkRead(category);
+            return Settings::Manager::getVector3(setting, category);
+        };
+
+        const MWWorld::Store<ESM::GameSetting>* gmst = &MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        config["getGMST"] = [lua, gmst](const std::string setting) -> sol::object
+        {
+            const ESM::Variant& value = gmst->find(setting)->mValue;
+            if (value.getType() == ESM::VT_String)
+                return sol::make_object<std::string>(lua->sol(), value.getString());
+            else if (value.getType() == ESM::VT_Int)
+                return sol::make_object<int>(lua->sol(), value.getInteger());
+            else
+                return sol::make_object<float>(lua->sol(), value.getFloat());
+        };
+        return lua->makeReadOnly(config);
+    }
+
+    sol::table initGlobalSettingsPackage(const Context& context) { return initSettingsPackage(context, true, false); }
+    sol::table initLocalSettingsPackage(const Context& context) { return initSettingsPackage(context, false, false); }
+    sol::table initPlayerSettingsPackage(const Context& context) { return initSettingsPackage(context, false, true); }
+
+}
diff --git a/docs/source/reference/lua-scripting/api.rst b/docs/source/reference/lua-scripting/api.rst
index 3a18f2445a..356fc16cbb 100644
--- a/docs/source/reference/lua-scripting/api.rst
+++ b/docs/source/reference/lua-scripting/api.rst
@@ -7,6 +7,7 @@ Lua API reference
 
     engine_handlers
     openmw_util
+    openmw_settings
     openmw_core
     openmw_async
     openmw_query
@@ -37,6 +38,9 @@ Player scripts are local scripts that are attached to a player.
 |:ref:`openmw.util <Package openmw.util>`                 | everywhere         | | Defines utility functions and classes like 3D vectors,      |
 |                                                         |                    | | that don't depend on the game world.                        |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.settings <Package openmw.settings>`         | everywhere         | | Access to GMST records in content files (implemented) and   |
+|                                                         |                    | | to mod settings (not implemented).                          |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.core <Package openmw.core>`                 | everywhere         | | Functions that are common for both global and local scripts |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.async <Package openmw.async>`               | everywhere         | | Timers (implemented) and coroutine utils (not implemented)  |
diff --git a/docs/source/reference/lua-scripting/openmw_settings.rst b/docs/source/reference/lua-scripting/openmw_settings.rst
new file mode 100644
index 0000000000..f3d26882bb
--- /dev/null
+++ b/docs/source/reference/lua-scripting/openmw_settings.rst
@@ -0,0 +1,5 @@
+Package openmw.settings
+=======================
+
+.. raw:: html
+   :file: generated_html/openmw_settings.html
diff --git a/docs/source/reference/lua-scripting/overview.rst b/docs/source/reference/lua-scripting/overview.rst
index d3ce319d01..c193886340 100644
--- a/docs/source/reference/lua-scripting/overview.rst
+++ b/docs/source/reference/lua-scripting/overview.rst
@@ -299,6 +299,9 @@ Player scripts are local scripts that are attached to a player.
 |:ref:`openmw.util <Package openmw.util>`                 | everywhere         | | Defines utility functions and classes like 3D vectors,      |
 |                                                         |                    | | that don't depend on the game world.                        |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.settings <Package openmw.settings>`         | everywhere         | | Access to GMST records in content files (implemented) and   |
+|                                                         |                    | | to mod settings (not implemented).                          |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.core <Package openmw.core>`                 | everywhere         | | Functions that are common for both global and local scripts |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.async <Package openmw.async>`               | everywhere         | | Timers (implemented) and coroutine utils (not implemented)  |
diff --git a/files/lua_api/openmw/settings.lua b/files/lua_api/openmw/settings.lua
new file mode 100644
index 0000000000..6c35caa8af
--- /dev/null
+++ b/files/lua_api/openmw/settings.lua
@@ -0,0 +1,14 @@
+-------------------------------------------------------------------------------
+-- `openmw.settings` provides read-only access to GMST records in content files.
+-- @module settings
+-- @usage
+-- local settings = require('openmw.settings')
+
+-------------------------------------------------------------------------------
+-- Get a GMST setting from content files.
+-- @function [parent=#settings] getGMST
+-- @param #string setting
+
+
+return nil
+

From 2938aaf05c43f2f996c7142d7dd4c7270dfef41e Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 25 Jul 2021 15:36:25 +0200
Subject: [PATCH 1100/2859] Rename `API_VERSION` -> `API_REVISION` in Lua API.

---
 apps/openmw/mwlua/luabindings.cpp | 2 +-
 files/lua_api/openmw/core.lua     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index ca800f2dd4..48174f55ee 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -31,7 +31,7 @@ namespace MWLua
     {
         auto* lua = context.mLua;
         sol::table api(lua->sol(), sol::create);
-        api["API_VERSION"] = 1;
+        api["API_REVISION"] = 1;
         api["sendGlobalEvent"] = [context](std::string eventName, const sol::object& eventData)
         {
             context.mGlobalEventQueue->push_back({std::move(eventName), LuaUtil::serialize(eventData, context.mSerializer)});
diff --git a/files/lua_api/openmw/core.lua b/files/lua_api/openmw/core.lua
index 6b38fc20e1..040e6968dd 100644
--- a/files/lua_api/openmw/core.lua
+++ b/files/lua_api/openmw/core.lua
@@ -7,8 +7,8 @@
 
 
 -------------------------------------------------------------------------------
--- The version of OpenMW Lua API. It is an integer that is incremented every time the API is changed.
--- @field [parent=#core] #number API_VERSION
+-- The revision of OpenMW Lua API. It is an integer that is incremented every time the API is changed.
+-- @field [parent=#core] #number API_REVISION
 
 -------------------------------------------------------------------------------
 -- Send an event to global scripts.

From 6adf7b10ae377736fa2085aaccb152278efe8e24 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 27 Jul 2021 20:08:36 +0200
Subject: [PATCH 1101/2859] Fix removing heightfield from navigator

It's added not as object so it shouldn't be removed as it.
---
 apps/openmw/mwworld/scene.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 1dc0f904bc..3111a28f04 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -397,8 +397,8 @@ namespace MWWorld
 
         if (cell->getCell()->isExterior())
         {
-            if (const auto heightField = mPhysics->getHeightField(cellX, cellY))
-                mNavigator.removeObject(DetourNavigator::ObjectId(heightField));
+            if (mPhysics->getHeightField(cellX, cellY) != nullptr)
+                mNavigator.removeHeightfield(osg::Vec2i(cellX, cellY));
         }
 
         if (cell->getCell()->hasWater())

From c98b0f713de6dace3582dac98d475fbdded02a8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Mocquillon?= <cedric.mocquillon@gmail.com>
Date: Wed, 28 Jul 2021 10:29:16 +0200
Subject: [PATCH 1102/2859] If same area is defined in multiple plugin the last
 must wins

---
 apps/openmw/mwworld/store.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index 41cba3b46b..125239e9a3 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -431,7 +431,12 @@ namespace MWWorld
         land.load(esm, isDeleted);
 
         // Same area defined in multiple plugins? -> last plugin wins
-        mStatic.insert(std::move(land));
+        auto [it, inserted] = mStatic.insert(std::move(land));
+        if (!inserted) {
+            auto nh = mStatic.extract(it);
+            nh.value() = std::move(land);
+            mStatic.insert(std::move(nh));
+        }
 
         return RecordId("", isDeleted);
     }

From 11694ba87f792bd0c91428bd85c66580f6baeda6 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Thu, 29 Jul 2021 03:40:21 +0300
Subject: [PATCH 1103/2859] Correct dark map and detail map alpha handling

Comment texenv usage in NIF loader
---
 components/nifosg/nifloader.cpp     | 55 +++++++++++++++++------------
 files/shaders/objects_fragment.glsl |  2 +-
 2 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 702ab33669..7c32bb04f8 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -1503,11 +1503,14 @@ namespace NifOsg
         osg::ref_ptr<osg::TexEnvCombine> createEmissiveTexEnv()
         {
             osg::ref_ptr<osg::TexEnvCombine> texEnv(new osg::TexEnvCombine);
-            texEnv->setCombine_Alpha(osg::TexEnvCombine::REPLACE);
-            texEnv->setSource0_Alpha(osg::TexEnvCombine::PREVIOUS);
+            // Sum the previous colour and the emissive colour.
             texEnv->setCombine_RGB(osg::TexEnvCombine::ADD);
             texEnv->setSource0_RGB(osg::TexEnvCombine::PREVIOUS);
             texEnv->setSource1_RGB(osg::TexEnvCombine::TEXTURE);
+            // Keep the previous alpha.
+            texEnv->setCombine_Alpha(osg::TexEnvCombine::REPLACE);
+            texEnv->setSource0_Alpha(osg::TexEnvCombine::PREVIOUS);
+            texEnv->setOperand0_Alpha(osg::TexEnvCombine::SRC_ALPHA);
             return texEnv;
         }
 
@@ -1602,27 +1605,31 @@ namespace NifOsg
                     else if (i == Nif::NiTexturingProperty::DarkTexture)
                     {
                         osg::TexEnv* texEnv = new osg::TexEnv;
+                        // Modulate both the colour and the alpha with the dark map.
                         texEnv->setMode(osg::TexEnv::MODULATE);
                         stateset->setTextureAttributeAndModes(texUnit, texEnv, osg::StateAttribute::ON);
                     }
                     else if (i == Nif::NiTexturingProperty::DetailTexture)
                     {
                         osg::TexEnvCombine* texEnv = new osg::TexEnvCombine;
-                        texEnv->setScale_RGB(2.f);
-                        texEnv->setCombine_Alpha(osg::TexEnvCombine::MODULATE);
-                        texEnv->setOperand0_Alpha(osg::TexEnvCombine::SRC_ALPHA);
-                        texEnv->setOperand1_Alpha(osg::TexEnvCombine::SRC_ALPHA);
-                        texEnv->setSource0_Alpha(osg::TexEnvCombine::PREVIOUS);
-                        texEnv->setSource1_Alpha(osg::TexEnvCombine::TEXTURE);
+                        // Modulate previous colour...
                         texEnv->setCombine_RGB(osg::TexEnvCombine::MODULATE);
-                        texEnv->setOperand0_RGB(osg::TexEnvCombine::SRC_COLOR);
-                        texEnv->setOperand1_RGB(osg::TexEnvCombine::SRC_COLOR);
                         texEnv->setSource0_RGB(osg::TexEnvCombine::PREVIOUS);
+                        texEnv->setOperand0_RGB(osg::TexEnvCombine::SRC_COLOR);
+                        // with the detail map's colour,
                         texEnv->setSource1_RGB(osg::TexEnvCombine::TEXTURE);
+                        texEnv->setOperand1_RGB(osg::TexEnvCombine::SRC_COLOR);
+                        // and a twist:
+                        texEnv->setScale_RGB(2.f);
+                        // Keep the previous alpha.
+                        texEnv->setCombine_Alpha(osg::TexEnvCombine::REPLACE);
+                        texEnv->setSource0_Alpha(osg::TexEnvCombine::PREVIOUS);
+                        texEnv->setOperand0_Alpha(osg::TexEnvCombine::SRC_ALPHA);
                         stateset->setTextureAttributeAndModes(texUnit, texEnv, osg::StateAttribute::ON);
                     }
                     else if (i == Nif::NiTexturingProperty::BumpTexture)
                     {
+                        // Bump maps offset the environment map.
                         // Set this texture to Off by default since we can't render it with the fixed-function pipeline
                         stateset->setTextureMode(texUnit, GL_TEXTURE_2D, osg::StateAttribute::OFF);
                         osg::Matrix2 bumpMapMatrix(texprop->bumpMapMatrix.x(), texprop->bumpMapMatrix.y(),
@@ -1632,18 +1639,22 @@ namespace NifOsg
                     }
                     else if (i == Nif::NiTexturingProperty::DecalTexture)
                     {
-                         osg::TexEnvCombine* texEnv = new osg::TexEnvCombine;
-                         texEnv->setCombine_RGB(osg::TexEnvCombine::INTERPOLATE);
-                         texEnv->setSource0_RGB(osg::TexEnvCombine::TEXTURE);
-                         texEnv->setOperand0_RGB(osg::TexEnvCombine::SRC_COLOR);
-                         texEnv->setSource1_RGB(osg::TexEnvCombine::PREVIOUS);
-                         texEnv->setOperand1_RGB(osg::TexEnvCombine::SRC_COLOR);
-                         texEnv->setSource2_RGB(osg::TexEnvCombine::TEXTURE);
-                         texEnv->setOperand2_RGB(osg::TexEnvCombine::SRC_ALPHA);
-                         texEnv->setCombine_Alpha(osg::TexEnvCombine::REPLACE);
-                         texEnv->setSource0_Alpha(osg::TexEnvCombine::PREVIOUS);
-                         texEnv->setOperand0_Alpha(osg::TexEnvCombine::SRC_ALPHA);
-                         stateset->setTextureAttributeAndModes(texUnit, texEnv, osg::StateAttribute::ON);
+                        osg::TexEnvCombine* texEnv = new osg::TexEnvCombine;
+                        // Interpolate to the decal texture's colour...
+                        texEnv->setCombine_RGB(osg::TexEnvCombine::INTERPOLATE);
+                        texEnv->setSource0_RGB(osg::TexEnvCombine::TEXTURE);
+                        texEnv->setOperand0_RGB(osg::TexEnvCombine::SRC_COLOR);
+                        // ...from the previous colour...
+                        texEnv->setSource1_RGB(osg::TexEnvCombine::PREVIOUS);
+                        texEnv->setOperand1_RGB(osg::TexEnvCombine::SRC_COLOR);
+                        // using the decal texture's alpha as the factor.
+                        texEnv->setSource2_RGB(osg::TexEnvCombine::TEXTURE);
+                        texEnv->setOperand2_RGB(osg::TexEnvCombine::SRC_ALPHA);
+                        // Keep the previous alpha.
+                        texEnv->setCombine_Alpha(osg::TexEnvCombine::REPLACE);
+                        texEnv->setSource0_Alpha(osg::TexEnvCombine::PREVIOUS);
+                        texEnv->setOperand0_Alpha(osg::TexEnvCombine::SRC_ALPHA);
+                        stateset->setTextureAttributeAndModes(texUnit, texEnv, osg::StateAttribute::ON);
                     }
 
                     switch (i)
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index 74929ec24c..045c0259d6 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -134,7 +134,7 @@ void main()
 #endif
 
 #if @darkMap
-    gl_FragData[0].xyz *= texture2D(darkMap, darkMapUV).xyz;
+    gl_FragData[0] *= texture2D(darkMap, darkMapUV);
 #endif
 
 #if @decalMap

From 779795734fbc2c0f1ecec5358df95459008a03e2 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 29 Jul 2021 18:23:45 +0200
Subject: [PATCH 1104/2859] Remove calm/rally/demoralize and turn undead from
 the wrong targets

---
 CHANGELOG.md                             |  1 +
 apps/openmw/mwmechanics/actors.cpp       | 24 +++++++++---------------
 apps/openmw/mwmechanics/spellcasting.cpp | 19 +++++++++++++++++++
 3 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 799f5e0658..47f94c6952 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@
     Bug #6143: Capturing a screenshot makes engine to be a temporary unresponsive
     Bug #6165: Paralyzed player character can pickup items when the inventory is open
     Bug #6174: Spellmaking and Enchanting sliders differences from vanilla
+    Bug #6184: Command and Calm and Demoralize and Frenzy and Rally magic effects inconsistencies with vanilla
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
     Feature #2780: A way to see current OpenMW version in the console
     Feature #3616: Allow Zoom levels on the World Map
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 844b2b6987..21ec5d987b 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1158,21 +1158,15 @@ namespace MWMechanics
 
         // AI setting modifiers
         int creature = !ptr.getClass().isNpc();
-        if (creature && ptr.get<ESM::Creature>()->mBase->mData.mType == ESM::Creature::Humanoid)
-            creature = false;
-        // Note: the Creature variants only work on normal creatures, not on daedra or undead creatures.
-        if (!creature || ptr.get<ESM::Creature>()->mBase->mData.mType == ESM::Creature::Creatures)
-        {
-            Stat<int> stat = creatureStats.getAiSetting(CreatureStats::AI_Fight);
-            stat.setModifier(static_cast<int>(effects.get(ESM::MagicEffect::FrenzyHumanoid + creature).getMagnitude()
-                - effects.get(ESM::MagicEffect::CalmHumanoid+creature).getMagnitude()));
-            creatureStats.setAiSetting(CreatureStats::AI_Fight, stat);
-
-            stat = creatureStats.getAiSetting(CreatureStats::AI_Flee);
-            stat.setModifier(static_cast<int>(effects.get(ESM::MagicEffect::DemoralizeHumanoid + creature).getMagnitude()
-                - effects.get(ESM::MagicEffect::RallyHumanoid+creature).getMagnitude()));
-            creatureStats.setAiSetting(CreatureStats::AI_Flee, stat);
-        }
+        Stat<int> stat = creatureStats.getAiSetting(CreatureStats::AI_Fight);
+        stat.setModifier(static_cast<int>(effects.get(ESM::MagicEffect::FrenzyHumanoid + creature).getMagnitude()
+            - effects.get(ESM::MagicEffect::CalmHumanoid+creature).getMagnitude()));
+        creatureStats.setAiSetting(CreatureStats::AI_Fight, stat);
+
+        stat = creatureStats.getAiSetting(CreatureStats::AI_Flee);
+        stat.setModifier(static_cast<int>(effects.get(ESM::MagicEffect::DemoralizeHumanoid + creature).getMagnitude()
+            - effects.get(ESM::MagicEffect::RallyHumanoid+creature).getMagnitude()));
+        creatureStats.setAiSetting(CreatureStats::AI_Flee, stat);
         if (creature && ptr.get<ESM::Creature>()->mBase->mData.mType == ESM::Creature::Undead)
         {
             Stat<int> stat = creatureStats.getAiSetting(CreatureStats::AI_Flee);
diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index 6b07fdbb86..502e56edf7 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -383,6 +383,25 @@ namespace MWMechanics
             target.getClass().getCreatureStats(target).getActiveSpells().purgeAll(magnitude, true);
             return true;
         }
+        else if(target.getClass().isActor() && effectId >= ESM::MagicEffect::CalmHumanoid && effectId <= ESM::MagicEffect::RallyCreature)
+        {
+            // Treat X Humanoid spells on creatures and X Creature spells on NPCs as instant effects and remove their VFX
+            bool affectsCreatures = (effectId - ESM::MagicEffect::CalmHumanoid) & 1;
+            if(affectsCreatures == target.getClass().isNpc())
+            {
+                MWBase::Environment::get().getWorld()->getAnimation(target)->removeEffect(effectId);
+                return true;
+            }
+        }
+        else if(target.getClass().isActor() && effectId == ESM::MagicEffect::TurnUndead)
+        {
+            // Diverge from vanilla by giving scripts a chance to detect Turn Undead on non-undead, but still remove the effect and VFX
+            if(target.getClass().isNpc() || target.get<ESM::Creature>()->mBase->mData.mType != ESM::Creature::Undead)
+            {
+                MWBase::Environment::get().getWorld()->getAnimation(target)->removeEffect(effectId);
+                return true;
+            }
+        }
         else if (target.getClass().isActor() && target == getPlayer())
         {
             MWRender::Animation* anim = MWBase::Environment::get().getWorld()->getAnimation(mCaster);

From 828a44a5ca225cf3f22344e68138fa4a80c7bcae Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Thu, 29 Jul 2021 18:44:11 +0000
Subject: [PATCH 1105/2859] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6daa6ab758..d2fb58fc00 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,7 +43,7 @@ Coverity:
   script:
     - CI/before_script.linux.sh
     # Remove the specific targets and build everything once we can do it under 3h
-    - cov-analysis-linux64-*/bin/cov-build --dir cov-int cmake --build build -- -j $(nproc) openmw esmtool bsatool openmw-wizard openmw-launcher openmw-iniimporter openmw-essimporter
+    - cov-analysis-linux64-*/bin/cov-build --dir cov-int cmake --build build -- -j $(nproc) openmw esmtool bsatool niftest openmw-cs openmw-wizard openmw-launcher openmw-iniimporter openmw-essimporter
   after_script:
     - tar cfz cov-int.tar.gz cov-int
     - curl https://scan.coverity.com/builds?project=$COVERITY_SCAN_PROJECT_NAME
@@ -97,6 +97,8 @@ Debian_GCC_Static_Deps:
     - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-static
   variables:
     CI_OPENMW_USE_STATIC_DEPS: 1
+    CCACHE_SIZE: 3G
+  timeout: 3h
 
 Debian_GCC_Static_Deps_tests:
   extends: Debian_GCC_Static_Deps

From 9834fd51af283ee5a3f8dddabe8997253f5e4808 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Thu, 29 Jul 2021 22:28:05 +0300
Subject: [PATCH 1106/2859] Address shader issues pointed out by AnyOldName3

---
 files/shaders/objects_fragment.glsl | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index 045c0259d6..d304b2abe8 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -127,16 +127,18 @@ void main()
 
     vec4 diffuseColor = getDiffuseColor();
     gl_FragData[0].a *= diffuseColor.a;
+
+#if @darkMap
+    gl_FragData[0] *= texture2D(darkMap, darkMapUV);
+    gl_FragData[0].a *= coveragePreservingAlphaScale(darkMap, darkMapUV);
+#endif
+
     alphaTest();
 
 #if @detailMap
     gl_FragData[0].xyz *= texture2D(detailMap, detailMapUV).xyz * 2.0;
 #endif
 
-#if @darkMap
-    gl_FragData[0] *= texture2D(darkMap, darkMapUV);
-#endif
-
 #if @decalMap
     vec4 decalTex = texture2D(decalMap, decalMapUV);
     gl_FragData[0].xyz = mix(gl_FragData[0].xyz, decalTex.xyz, decalTex.a);

From c49c378c0f42b2f7f4882f722a9a04bce860d866 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Thu, 29 Jul 2021 22:11:18 +0000
Subject: [PATCH 1107/2859] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d2fb58fc00..90698edfa8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -97,7 +97,6 @@ Debian_GCC_Static_Deps:
     - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-static
   variables:
     CI_OPENMW_USE_STATIC_DEPS: 1
-    CCACHE_SIZE: 3G
   timeout: 3h
 
 Debian_GCC_Static_Deps_tests:

From 05d349e4a760f453a61c5fe6e054971c45a457ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matja=C5=BE=20Lamut?= <matjaz.lamut@gmail.com>
Date: Fri, 30 Jul 2021 12:14:21 +0000
Subject: [PATCH 1108/2859] Source svg file used to generate OpenMW-CS icons.

---
 files/opencs/scalable/editor-icons.svg | 9395 ++++++++++++++++++++++++
 1 file changed, 9395 insertions(+)
 create mode 100644 files/opencs/scalable/editor-icons.svg

diff --git a/files/opencs/scalable/editor-icons.svg b/files/opencs/scalable/editor-icons.svg
new file mode 100644
index 0000000000..d41fdbde60
--- /dev/null
+++ b/files/opencs/scalable/editor-icons.svg
@@ -0,0 +1,9395 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="editor-icons.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 314.32484 192.06654"
+   height="725.92078"
+   width="1187.9994">
+  <style
+     id="style1923" />
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="powermask"
+       id="path-effect2301"
+       is_visible="true"
+       lpeversion="1"
+       uri="#mask-powermask-path-effect2301"
+       invert="false"
+       hide_mask="false"
+       background="true"
+       background_color="#ffffffff" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 176.45612 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="31.220831 : 176.45612 : 1"
+       inkscape:persp3d-origin="15.610416 : 171.25265 : 1"
+       id="perspective1361" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect2765"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0.15103573,0,1 @ F,0,0,1,0,0.22544994,0,1 @ F,0,0,1,0,0.15103573,0,1 @ F,0,1,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0.125"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="true"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect2561"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0.15103573,0,1 @ F,0,0,1,0,0.22544994,0,1 @ F,0,0,1,0,0.15103573,0,1 @ F,0,1,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0.125"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="true"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect2528"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0.15103573,0,1 @ F,0,0,1,0,0.22544994,0,1 @ F,0,0,1,0,0.15103573,0,1 @ F,0,1,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0.125"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="true"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect2524"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0.15103573,0,1 @ F,0,0,1,0,0.22544994,0,1 @ F,0,0,1,0,0.15103573,0,1 @ F,0,1,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0.125"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="true"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect2504"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0.15103573,0,1 @ F,0,0,1,0,0.22544994,0,1 @ F,0,0,1,0,0.15103573,0,1 @ F,0,1,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0.125"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="true"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect2500"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0.15103573,0,1 @ F,0,0,1,0,0.22544994,0,1 @ F,0,0,1,0,0.15103573,0,1 @ F,0,1,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0.125"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="true"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect2149"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0.15103573,0,1 @ F,0,0,1,0,0.22544994,0,1 @ F,0,0,1,0,0.15103573,0,1 @ F,0,1,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0.125"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="true"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect2139"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0.15103573,0,1 @ F,0,0,1,0,0.22544994,0,1 @ F,0,0,1,0,0.15103573,0,1 @ F,0,1,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0.125"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="true"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="powermask"
+       id="path-effect2030"
+       is_visible="true"
+       lpeversion="1"
+       uri="#mask-powermask-path-effect2030"
+       invert="false"
+       hide_mask="false"
+       background="true"
+       background_color="#ffffffff" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect1936"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0.15103573,0,1 @ F,0,0,1,0,0.22544994,0,1 @ F,0,0,1,0,0.15103573,0,1 @ F,0,1,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0.125"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="true"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect2488"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0.15103573,0,1 @ F,0,1,1,0,0.22544994,0,1 @ F,0,0,1,0,0.15103573,0,1 @ F,0,0,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0.125"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="true"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect2408"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0.2,0,1 @ F,0,0,1,0,0.2,0,1 @ F,0,0,1,0,0.2,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0.2"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect2344"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,1,1,0,1,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,1,1,0,1,0,1 @ F,0,1,1,0,1,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,1,1,0,1,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="1"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="true"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect1930"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0.1,0,1 @ F,0,0,1,0,0.1,0,1 @ F,0,0,1,0,0.1,0,1 @ F,0,0,1,0,0.1,0,1 @ F,0,0,1,0,0.1,0,1 @ F,0,0,1,0,0.1,0,1 @ F,0,0,1,0,0.1,0,1 @ F,0,0,1,0,0.1,0,1 @ F,0,0,1,0,0.1,0,1 @ F,0,0,1,0,0.1,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0.1"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect6530"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0.2,0,1 @ F,0,0,1,0,0.2,0,1 @ F,0,0,1,0,0.2,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0.2"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="powermask"
+       id="path-effect3119"
+       is_visible="true"
+       lpeversion="1"
+       uri="#mask-powermask-path-effect3119"
+       invert="false"
+       hide_mask="false"
+       background="true"
+       background_color="#ffffffff" />
+    <linearGradient
+       id="FRAME">
+      <stop
+         style="stop-color:#a51d2d;stop-opacity:1;"
+         offset="0"
+         id="stop3109" />
+    </linearGradient>
+    <linearGradient
+       id="Orange"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#fdb433;stop-opacity:1;"
+         offset="0"
+         id="stop2584" />
+    </linearGradient>
+    <linearGradient
+       id="Red"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ff664d;stop-opacity:1;"
+         offset="0"
+         id="stop2533" />
+    </linearGradient>
+    <linearGradient
+       id="Green"
+       osb:paint="solid"
+       gradientTransform="scale(3.7795276)">
+      <stop
+         style="stop-color:#66ff7a;stop-opacity:1;"
+         offset="0"
+         id="stop2506" />
+    </linearGradient>
+    <linearGradient
+       id="Blue"
+       osb:paint="solid"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-13.80713,103.48169)">
+      <stop
+         style="stop-color:#55c3ff;stop-opacity:1;"
+         offset="0"
+         id="stop2484" />
+    </linearGradient>
+    <linearGradient
+       id="Main"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082" />
+    </linearGradient>
+    <inkscape:path-effect
+       effect="powermask"
+       id="path-effect1741"
+       is_visible="true"
+       lpeversion="1"
+       uri="#mask-powermask-path-effect1741"
+       invert="false"
+       hide_mask="false"
+       background="true"
+       background_color="#ffffffff" />
+    <inkscape:path-effect
+       effect="powermask"
+       id="path-effect1105"
+       is_visible="true"
+       lpeversion="1"
+       uri="#mask-powermask-path-effect1105"
+       invert="false"
+       hide_mask="false"
+       background="true"
+       background_color="#ffffffff" />
+    <inkscape:path-effect
+       effect="powermask"
+       id="path-effect1447"
+       is_visible="true"
+       lpeversion="1"
+       uri="#mask-powermask-path-effect1447"
+       invert="false"
+       hide_mask="false"
+       background="true"
+       background_color="#ffffffff" />
+    <inkscape:path-effect
+       effect="powermask"
+       id="path-effect1389"
+       is_visible="true"
+       lpeversion="1"
+       uri="#mask-powermask-path-effect1389"
+       invert="false"
+       hide_mask="false"
+       background="true"
+       background_color="#ffffffff" />
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1389">
+      <path
+         id="mask-powermask-path-effect1389_box"
+         style="fill:#ffffff;fill-opacity:1"
+         d="M 0.99999997,80.999893 H 17 V 89 H 0.99999997 Z" />
+      <path
+         id="path1387"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         sodipodi:type="inkscape:offset"
+         inkscape:radius="0.28664058"
+         inkscape:original="M 4.2207031 24.310547 C 3.9597461 24.310547 3.5253456 24.433094 3.4785156 24.919922 L 3.8476562 24.970703 C 3.8960633 24.739611 4.0459141 24.609375 4.2363281 24.609375 C 4.4267421 24.609375 4.5839844 24.703991 4.5839844 24.890625 C 4.5839844 25.054476 4.3994887 25.175666 4.3242188 25.228516 C 4.0334707 25.432672 3.9665719 25.585755 3.9824219 25.925781 L 4.3359375 25.925781 C 4.3597495 25.585431 4.4462736 25.587747 4.5722656 25.472656 C 4.6058866 25.441943 4.9707031 25.2133 4.9707031 24.908203 C 4.9707031 24.56508 4.6441891 24.310547 4.2207031 24.310547 z "
+         d="m 4.2207031,24.023438 c -0.1753479,0 -0.3947921,0.03617 -0.6035156,0.166015 -0.2087235,0.129841 -0.3925439,0.377906 -0.4238281,0.703125 a 0.28666925,0.28666925 0 0 0 0.2460937,0.310547 l 0.3691407,0.05078 a 0.28666925,0.28666925 0 0 0 0.1171874,-0.0078 c -0.045424,0.05363 -0.1156032,0.092 -0.1464843,0.15625 -0.080497,0.167485 -0.092876,0.34636 -0.083984,0.537109 a 0.28666925,0.28666925 0 0 0 0.2871094,0.273438 h 0.3535156 a 0.28666925,0.28666925 0 0 0 0.2851563,-0.267579 c 0.010216,-0.146017 0.029974,-0.167735 0.027344,-0.164062 -0.00263,0.0037 0.02936,-0.01743 0.1171875,-0.09766 -0.025712,0.02349 -0.00947,0.008 0.00391,-0.002 0.01338,-0.0099 0.033862,-0.02316 0.056641,-0.04102 0.045556,-0.03572 0.1034485,-0.08545 0.1640625,-0.148437 0.1212279,-0.125968 0.2675781,-0.317187 0.2675781,-0.583985 0,-0.262483 -0.1335655,-0.499873 -0.3261719,-0.652344 -0.1926063,-0.15247 -0.4417668,-0.232421 -0.7109375,-0.232421 z m 0.015625,0.873046 c 0.023977,0 0.024427,0.0042 0.037109,0.0078 -0.028312,0.02874 -0.070644,0.05991 -0.1132813,0.08984 -0.00937,0.0066 -0.012316,0.01679 -0.021484,0.02344 0.024909,-0.102384 0.043275,-0.121094 0.097656,-0.121094 z"
+         transform="matrix(3.7795275,0,0,3.7795275,-6.9999997,-6.9999997)" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1447">
+      <path
+         id="mask-powermask-path-effect1447_box"
+         style="fill:#ffffff;fill-opacity:1"
+         d="m 6.4083334,23.077084 h 6.2333336 v 4.910417 H 6.4083334 Z" />
+      <path
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 7.6729166,24.341667 h 3.7041664 v 0.264583 l -1.058333,0.264583 -0.264583,0.621995 V 26.4215 c 0.28151,0.01578 0.67084,0.01464 0.926041,0.301417 H 8.2020832 c 0.476199,-0.268355 0.79375,-0.288311 0.79375,-0.48181 V 25.532292 C 8.1907673,25.056093 7.6729166,24.847155 7.6729166,24.341667 Z"
+         id="path1445"
+         sodipodi:nodetypes="ccccccccccc" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1105">
+      <path
+         id="mask-powermask-path-effect1105_box"
+         style="fill:#ffffff;fill-opacity:1"
+         d="m 11.964583,22.283334 h 5.968751 v 6.233333 h -5.968751 z" />
+      <path
+         id="path1103"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:type="inkscape:offset"
+         inkscape:radius="-0.2655834"
+         inkscape:original="M 14.816406 23.283203 C 13.793104 23.283203 12.964844 23.850339 12.964844 24.871094 C 12.964844 25.381522 13.167182 26.11045 13.503906 26.445312 C 13.721488 26.659316 13.757812 27.144904 13.757812 27.517578 L 15.611328 27.517578 L 15.611328 26.988281 C 16.04309 26.988281 16.404297 26.859734 16.404297 25.929688 L 16.933594 25.929688 L 16.933594 25.400391 L 16.404297 24.871094 C 16.404297 23.707361 15.329984 23.283203 14.816406 23.283203 z "
+         d="m 14.816406,23.548828 c -0.462587,0 -0.865246,0.128541 -1.142578,0.351563 -0.277332,0.223021 -0.443359,0.532158 -0.443359,0.970703 0,0.440241 0.223134,1.15023 0.460937,1.386718 0.173632,0.171974 0.240157,0.39466 0.28125,0.615235 0.02425,0.130152 0.02273,0.252283 0.0293,0.378906 h 1.34375 v -0.263672 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265625 c 0.189524,0 0.294319,-0.02466 0.367188,-0.09961 0.07287,-0.07495 0.160156,-0.262719 0.160156,-0.693359 a 0.26560995,0.26560995 0 0 1 0.265625,-0.265626 h 0.263672 v -0.154296 l -0.451172,-0.451172 a 0.26560995,0.26560995 0 0 1 -0.07813,-0.1875 c 0,-0.500141 -0.215724,-0.80568 -0.496094,-1.017578 -0.28037,-0.211899 -0.642497,-0.304688 -0.826172,-0.304688 z" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1741">
+      <path
+         id="mask-powermask-path-effect1741_box"
+         style="fill:#ffffff;fill-opacity:1"
+         d="m 16.991666,59.324974 h 6.233333 v 6.233352 h -6.233333 z" />
+      <path
+         id="path1739"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.992157;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 20.095414,60.589583 a 0.52916663,0.52916663 0 0 0 -0.516248,0.529166 0.52916663,0.52916663 0 0 0 0.529167,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529166 0.52916663,0.52916663 0 0 0 -0.01292,0 z m -1.058333,2.116666 A 0.52916663,0.52916663 0 0 0 18.520833,63.235416 0.52916663,0.52916663 0 0 0 19.05,63.764583 0.52916663,0.52916663 0 0 0 19.579166,63.235416 0.52916663,0.52916663 0 0 0 19.05,62.706249 a 0.52916663,0.52916663 0 0 0 -0.01292,0 z m 2.116666,0 a 0.52916663,0.52916663 0 0 0 -0.516247,0.529167 0.52916663,0.52916663 0 0 0 0.529166,0.529167 0.52916663,0.52916663 0 0 0 0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.529167,-0.529167 0.52916663,0.52916663 0 0 0 -0.01292,0 z" />
+    </mask>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2092"
+       x1="45.243748"
+       y1="62.838539"
+       x2="47.88958"
+       y2="62.838539"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2094"
+       x1="44.989498"
+       y1="61.780205"
+       x2="46.088139"
+       y2="61.780205"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2096"
+       x1="50.281166"
+       y1="62.838539"
+       x2="52.926998"
+       y2="62.838539"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2098"
+       x1="52.082603"
+       y1="61.780205"
+       x2="53.181248"
+       y2="61.780205"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2100"
+       x1="202"
+       y1="229"
+       x2="216"
+       y2="229"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2102"
+       x1="225"
+       y1="228.5"
+       x2="234"
+       y2="228.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2104"
+       x1="3"
+       y1="229.5"
+       x2="15"
+       y2="229.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2106"
+       x1="23"
+       y1="229.5"
+       x2="35"
+       y2="229.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2108"
+       x1="27"
+       y1="234"
+       x2="35"
+       y2="234"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2110"
+       x1="43"
+       y1="225"
+       x2="50"
+       y2="225"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2112"
+       x1="14.816667"
+       y1="62.441669"
+       x2="16.668751"
+       y2="62.441669"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2114"
+       x1="13.229167"
+       y1="63.5"
+       x2="15.08125"
+       y2="63.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2116"
+       x1="18.520834"
+       y1="62.441669"
+       x2="21.695833"
+       y2="62.441669"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2118"
+       x1="67"
+       y1="231"
+       x2="75"
+       y2="231"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2120"
+       x1="82"
+       y1="229"
+       x2="96"
+       y2="229"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2122"
+       x1="29.104166"
+       y1="61.912502"
+       x2="32.279167"
+       y2="61.912502"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2124"
+       x1="103"
+       y1="233.5"
+       x2="115"
+       y2="233.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2126"
+       x1="125"
+       y1="223.5"
+       x2="130"
+       y2="223.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2128"
+       x1="130"
+       y1="228.5"
+       x2="135"
+       y2="228.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2130"
+       x1="34.660416"
+       y1="63.63229"
+       x2="35.983334"
+       y2="63.63229"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2132"
+       x1="33.866669"
+       y1="62.309376"
+       x2="36.380211"
+       y2="62.309376"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2134"
+       x1="36.115627"
+       y1="60.986462"
+       x2="38.099998"
+       y2="60.986462"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2136"
+       x1="33.866669"
+       y1="60.986462"
+       x2="35.057293"
+       y2="60.986462"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2138"
+       x1="37.438541"
+       y1="62.309376"
+       x2="38.100002"
+       y2="62.309376"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2140"
+       x1="35.851044"
+       y1="63.632294"
+       x2="38.100006"
+       y2="63.632294"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2142"
+       x1="33.866665"
+       y1="63.632294"
+       x2="34.792709"
+       y2="63.632294"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2144"
+       x1="41.900211"
+       y1="248.99886"
+       x2="56.855469"
+       y2="248.99886"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2146"
+       x1="61.899818"
+       y1="249"
+       x2="76.100182"
+       y2="249"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2152"
+       x1="2"
+       y1="246.5"
+       x2="11"
+       y2="246.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2154"
+       x1="22"
+       y1="188.5"
+       x2="36"
+       y2="188.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2156"
+       x1="24"
+       y1="185.5"
+       x2="28"
+       y2="185.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2158"
+       x1="29"
+       y1="185.5"
+       x2="34"
+       y2="185.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2160"
+       x1="24"
+       y1="191.5"
+       x2="28"
+       y2="191.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2162"
+       x1="29"
+       y1="191.5"
+       x2="34"
+       y2="191.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2164"
+       x1="42"
+       y1="189"
+       x2="56"
+       y2="189"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2166"
+       x1="17.991667"
+       y1="51.858334"
+       x2="22.224998"
+       y2="51.858334"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2168"
+       x1="18.520832"
+       y1="51.858334"
+       x2="21.695831"
+       y2="51.858334"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2170"
+       x1="4.1660156"
+       y1="189"
+       x2="13.324219"
+       y2="189"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2172"
+       x1="24.077084"
+       y1="52.784374"
+       x2="25.664583"
+       y2="52.784374"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2174"
+       x1="88"
+       y1="185.5"
+       x2="94"
+       y2="185.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2176"
+       x1="101"
+       y1="189"
+       x2="117"
+       y2="189"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2178"
+       x1="122"
+       y1="189"
+       x2="136"
+       y2="189"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2180"
+       x1="141"
+       y1="189"
+       x2="157"
+       y2="189"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2182"
+       x1="162"
+       y1="189"
+       x2="176"
+       y2="189"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2184"
+       x1="14.816667"
+       y1="46.566666"
+       x2="16.933334"
+       y2="46.566666"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2186"
+       x1="27"
+       y1="163"
+       x2="31"
+       y2="163"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2188"
+       x1="2.6458333"
+       y1="46.434372"
+       x2="2.9104166"
+       y2="46.434372"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2190"
+       x1="3.175"
+       y1="46.434376"
+       x2="3.4395833"
+       y2="46.434376"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2192"
+       x1="3.4395833"
+       y1="46.963547"
+       x2="3.7041667"
+       y2="46.963547"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2194"
+       x1="5.0270834"
+       y1="46.43438"
+       x2="5.2916665"
+       y2="46.43438"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2196"
+       x1="4.7624998"
+       y1="46.963547"
+       x2="5.0270829"
+       y2="46.963547"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2198"
+       x1="5.5562501"
+       y1="46.434372"
+       x2="5.8208332"
+       y2="46.434372"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2200"
+       x1="1"
+       y1="174"
+       x2="17"
+       y2="174"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2202"
+       x1="1"
+       y1="163"
+       x2="17"
+       y2="163"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2204"
+       x1="-25.818237"
+       y1="39.662796"
+       x2="-24.321527"
+       y2="39.662796"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2206"
+       x1="8.2020855"
+       y1="45.772919"
+       x2="9.2604179"
+       y2="45.772919"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2208"
+       x1="8.2020855"
+       y1="47.360416"
+       x2="9.2604179"
+       y2="47.360416"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2210"
+       x1="9.7895861"
+       y1="47.360416"
+       x2="10.847917"
+       y2="47.360416"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2212"
+       x1="8.9958334"
+       y1="48.154167"
+       x2="10.054167"
+       y2="48.154167"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2214"
+       x1="7.4083352"
+       y1="46.566669"
+       x2="8.4666681"
+       y2="46.566669"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2216"
+       x1="10.583335"
+       y1="46.566669"
+       x2="11.641668"
+       y2="46.566669"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2218"
+       x1="3.7041683"
+       y1="46.302086"
+       x2="4.7625012"
+       y2="46.302086"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2220"
+       x1="17.991667"
+       y1="62.44165"
+       x2="22.224998"
+       y2="62.44165"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2222"
+       x1="8.2020836"
+       y1="40.481251"
+       x2="10.847917"
+       y2="40.481251"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2224"
+       x1="7.4083333"
+       y1="42.068752"
+       x2="8.4666662"
+       y2="42.068752"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2226"
+       x1="8.9958334"
+       y1="42.597919"
+       x2="10.054167"
+       y2="42.597919"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2228"
+       x1="10.583333"
+       y1="42.068752"
+       x2="11.641667"
+       y2="42.068752"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2230"
+       x1="7.4083333"
+       y1="40.613544"
+       x2="11.641667"
+       y2="40.613544"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2232"
+       x1="2.1166666"
+       y1="41.275002"
+       x2="6.3499999"
+       y2="41.275002"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2234"
+       x1="12.700004"
+       y1="41.275002"
+       x2="16.662027"
+       y2="41.275002"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2236"
+       x1="15.261501"
+       y1="42.025791"
+       x2="15.91278"
+       y2="42.025791"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2240"
+       x1="28.574999"
+       y1="41.275002"
+       x2="32.808331"
+       y2="41.275002"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2242"
+       x1="29.104164"
+       y1="40.084377"
+       x2="30.956247"
+       y2="40.084377"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2244"
+       x1="34.131248"
+       y1="41.142712"
+       x2="37.835415"
+       y2="41.142712"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2246"
+       x1="35.454163"
+       y1="40.745834"
+       x2="36.512497"
+       y2="40.745834"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2248"
+       x1="39.158333"
+       y1="41.142712"
+       x2="43.127083"
+       y2="41.142712"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2250"
+       x1="40.216663"
+       y1="40.348961"
+       x2="42.068748"
+       y2="40.348961"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2252"
+       x1="44.449993"
+       y1="41.142712"
+       x2="48.418743"
+       y2="41.142712"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2254"
+       x1="46.037495"
+       y1="41.010418"
+       x2="47.095829"
+       y2="41.010418"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2256"
+       x1="50.249126"
+       y1="41.275002"
+       x2="53.445831"
+       y2="41.275002"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2258"
+       x1="55.033333"
+       y1="41.275002"
+       x2="59.266663"
+       y2="41.275002"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2260"
+       x1="56.356247"
+       y1="41.274986"
+       x2="57.943748"
+       y2="41.274986"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2262"
+       x1="60.324997"
+       y1="41.142712"
+       x2="64.558327"
+       y2="41.142712"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2264"
+       x1="7.4083338"
+       y1="30.691668"
+       x2="11.641667"
+       y2="30.691668"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2266"
+       x1="7.9374995"
+       y1="30.691668"
+       x2="11.1125"
+       y2="30.691668"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2268"
+       x1="12.964583"
+       y1="29.633335"
+       x2="14.2875"
+       y2="29.633335"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2270"
+       x1="14.816666"
+       y1="29.633335"
+       x2="16.139582"
+       y2="29.633335"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2272"
+       x1="12.964583"
+       y1="31.749998"
+       x2="14.2875"
+       y2="31.749998"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2274"
+       x1="14.816666"
+       y1="31.749998"
+       x2="16.139582"
+       y2="31.749998"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2276"
+       x1="17.991667"
+       y1="30.691668"
+       x2="21.960417"
+       y2="30.691668"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2278"
+       x1="28.574999"
+       y1="30.691668"
+       x2="32.808331"
+       y2="30.691668"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2280"
+       x1="-31.750002"
+       y1="30.691675"
+       x2="-30.1625"
+       y2="30.691675"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2282"
+       x1="23.547915"
+       y1="32.014591"
+       x2="25.135414"
+       y2="32.014591"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2284"
+       x1="25.664579"
+       y1="31.485422"
+       x2="27.252081"
+       y2="31.485422"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2286"
+       x1="24.870832"
+       y1="30.691669"
+       x2="25.135416"
+       y2="30.691669"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2288"
+       x1="26.987499"
+       y1="30.162504"
+       x2="27.252083"
+       y2="30.162504"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2290"
+       x1="24.870832"
+       y1="29.196154"
+       x2="27.252083"
+       y2="29.196154"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2292"
+       x1="24.870832"
+       y1="29.989902"
+       x2="27.252083"
+       y2="29.989902"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2294"
+       x1="33.866669"
+       y1="30.691666"
+       x2="38.099998"
+       y2="30.691666"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2298"
+       x1="44.692448"
+       y1="14.850656"
+       x2="48.418747"
+       y2="14.850656"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2300"
+       x1="12.964584"
+       y1="20.108334"
+       x2="16.933334"
+       y2="20.108334"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2302"
+       x1="44.726234"
+       y1="15.44105"
+       x2="47.230007"
+       y2="15.44105"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2304"
+       x1="44.449993"
+       y1="20.108332"
+       x2="48.683331"
+       y2="20.108332"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2306"
+       x1="29.104166"
+       y1="20.108332"
+       x2="32.279167"
+       y2="20.108332"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2310"
+       x1="7.6729169"
+       y1="20.902056"
+       x2="11.641667"
+       y2="20.902056"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2312"
+       x1="8.7312498"
+       y1="18.634495"
+       x2="9.8087034"
+       y2="18.634495"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2314"
+       x1="39.687496"
+       y1="14.81664"
+       x2="42.862495"
+       y2="14.81664"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2316"
+       x1="7.4083333"
+       y1="15.610416"
+       x2="11.641667"
+       y2="15.610416"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2318"
+       x1="7.4311438"
+       y1="13.585216"
+       x2="9.7828169"
+       y2="13.585216"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2320"
+       x1="2.6458335"
+       y1="14.816667"
+       x2="5.8208332"
+       y2="14.816667"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2322"
+       x1="3.1750002"
+       y1="14.816651"
+       x2="5.2916675"
+       y2="14.816651"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2324"
+       x1="5.6885424"
+       y1="14.816667"
+       x2="6.3500004"
+       y2="14.816667"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2326"
+       x1="4.17975"
+       y1="16.49861"
+       x2="5.3575182"
+       y2="16.49861"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2328"
+       x1="2.2552035"
+       y1="15.843752"
+       x2="3.3670816"
+       y2="15.843752"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2330"
+       x1="2.2552028"
+       y1="13.789582"
+       x2="3.3670833"
+       y2="13.789582"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2332"
+       x1="4.17975"
+       y1="13.134723"
+       x2="5.3575163"
+       y2="13.134723"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2334"
+       x1="12.7"
+       y1="14.834408"
+       x2="16.933334"
+       y2="14.834408"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2336"
+       x1="13.229167"
+       y1="14.816667"
+       x2="16.404167"
+       y2="14.816667"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2338"
+       x1="17.991667"
+       y1="13.62678"
+       x2="20.108334"
+       y2="13.62678"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2340"
+       x1="19.84375"
+       y1="14.816667"
+       x2="20.372917"
+       y2="14.816667"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2342"
+       x1="17.991667"
+       y1="14.948958"
+       x2="18.25625"
+       y2="14.948958"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2344"
+       x1="21.960417"
+       y1="14.948958"
+       x2="22.225"
+       y2="14.948958"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2346"
+       x1="17.991667"
+       y1="15.478861"
+       x2="20.108334"
+       y2="15.478861"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2348"
+       x1="17.991667"
+       y1="16.008026"
+       x2="20.108334"
+       y2="16.008026"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2350"
+       x1="20.108332"
+       y1="13.62678"
+       x2="22.224998"
+       y2="13.62678"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2352"
+       x1="20.108332"
+       y1="16.008026"
+       x2="22.224998"
+       y2="16.008026"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2354"
+       x1="20.108332"
+       y1="15.478861"
+       x2="22.224998"
+       y2="15.478861"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2356"
+       x1="24.077084"
+       y1="15.345833"
+       x2="26.722918"
+       y2="15.345833"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2358"
+       x1="23.283335"
+       y1="14.022916"
+       x2="27.516666"
+       y2="14.022916"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2360"
+       x1="24.606251"
+       y1="13.49375"
+       x2="26.19375"
+       y2="13.49375"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2362"
+       x1="29.094776"
+       y1="14.816666"
+       x2="32.288559"
+       y2="14.816666"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2364"
+       x1="30.030209"
+       y1="13.361459"
+       x2="31.353125"
+       y2="13.361459"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2366"
+       x1="33.866665"
+       y1="15.339633"
+       x2="38.099998"
+       y2="15.339633"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2368"
+       x1="34.131252"
+       y1="15.742709"
+       x2="37.835419"
+       y2="15.742709"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2370"
+       x1="35.454166"
+       y1="14.948958"
+       x2="35.71875"
+       y2="14.948958"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2372"
+       x1="36.247917"
+       y1="14.948958"
+       x2="36.512501"
+       y2="14.948958"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2374"
+       x1="35.58646"
+       y1="13.626042"
+       x2="36.380211"
+       y2="13.626042"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2376"
+       x1="34.660416"
+       y1="13.758335"
+       x2="35.189579"
+       y2="13.758335"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2378"
+       x1="36.777081"
+       y1="13.758334"
+       x2="37.306248"
+       y2="13.758334"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2380"
+       x1="34.131248"
+       y1="13.75832"
+       x2="35.718746"
+       y2="13.75832"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2382"
+       x1="36.247913"
+       y1="13.75832"
+       x2="37.835415"
+       y2="13.75832"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2384"
+       x1="17.991669"
+       y1="20.108334"
+       x2="22.225"
+       y2="20.108334"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2386"
+       x1="50.26144"
+       y1="14.816667"
+       x2="53.455223"
+       y2="14.816667"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2388"
+       x1="51.196869"
+       y1="13.36146"
+       x2="52.519787"
+       y2="13.36146"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2390"
+       x1="51.593742"
+       y1="16.139584"
+       x2="52.12291"
+       y2="16.139584"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2392"
+       x1="51.103855"
+       y1="14.800131"
+       x2="52.596062"
+       y2="14.800131"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2394"
+       x1="34.063038"
+       y1="20.097998"
+       x2="38.099998"
+       y2="20.097998"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2396"
+       x1="2.1166666"
+       y1="20.6313"
+       x2="6.3499999"
+       y2="20.6313"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2398"
+       x1="2.3812499"
+       y1="21.034376"
+       x2="6.0854168"
+       y2="21.034376"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2400"
+       x1="2"
+       y1="84.999947"
+       x2="16"
+       y2="84.999947"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2402"
+       x1="3.96875"
+       y1="21.166668"
+       x2="4.4979157"
+       y2="21.166668"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2404"
+       x1="3.4788599"
+       y1="19.827215"
+       x2="4.9710684"
+       y2="19.827215"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2406"
+       x1="7.4083333"
+       y1="25.532291"
+       x2="11.641667"
+       y2="25.532291"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2408"
+       x1="41.446728"
+       y1="18.654196"
+       x2="42.593815"
+       y2="18.654196"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2410"
+       x1="41.754128"
+       y1="17.453333"
+       x2="42.23296"
+       y2="17.453333"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2412"
+       x1="49.741661"
+       y1="20.116692"
+       x2="53.991711"
+       y2="20.116692"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2414"
+       x1="12.964583"
+       y1="25.4"
+       x2="16.933334"
+       y2="25.4"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2416"
+       x1="24.606249"
+       y1="20.108334"
+       x2="25.135416"
+       y2="20.108334"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2418"
+       x1="25.929167"
+       y1="19.598701"
+       x2="26.855207"
+       y2="19.598701"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2420"
+       x1="44.449993"
+       y1="20.108332"
+       x2="48.683331"
+       y2="20.108332"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2422"
+       x1="28.839582"
+       y1="3.9687502"
+       x2="32.014584"
+       y2="3.9687502"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2424"
+       x1="40.481247"
+       y1="4.2333221"
+       x2="42.068748"
+       y2="4.2333221"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2426"
+       x1="40.87812"
+       y1="4.2333136"
+       x2="41.671894"
+       y2="4.2333136"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2428"
+       x1="41.274998"
+       y1="3.7041686"
+       x2="43.127083"
+       y2="3.7041686"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2430"
+       x1="39.422913"
+       y1="3.7041686"
+       x2="41.274998"
+       y2="3.7041686"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2432"
+       x1="45.243748"
+       y1="4.6302114"
+       x2="47.88958"
+       y2="4.6302114"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2434"
+       x1="44.989498"
+       y1="3.5718777"
+       x2="46.088139"
+       y2="3.5718777"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2444"
+       x1="4.2333331"
+       y1="68.527084"
+       x2="5.8208337"
+       y2="68.527084"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2450"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2462"
+       x1="12.700001"
+       y1="46.566666"
+       x2="14.816667"
+       y2="46.566666"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Blue"
+       id="linearGradient2488"
+       x1="60.325001"
+       y1="62.441669"
+       x2="64.558334"
+       y2="62.441669"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Blue"
+       id="linearGradient2490"
+       x1="47.36042"
+       y1="53.048962"
+       x2="48.418751"
+       y2="53.048962"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Blue"
+       id="linearGradient2492"
+       x1="25.929165"
+       y1="52.784374"
+       x2="27.252083"
+       y2="52.784374"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Blue"
+       id="linearGradient2494"
+       x1="23.547918"
+       y1="50.932293"
+       x2="24.870834"
+       y2="50.932293"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Blue"
+       id="linearGradient2496"
+       x1="2.6458352"
+       y1="4.2333331"
+       x2="5.8208356"
+       y2="4.2333331"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Blue"
+       id="linearGradient2498"
+       x1="23.8125"
+       y1="4.2333331"
+       x2="26.987499"
+       y2="4.2333331"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Blue"
+       id="linearGradient2500"
+       x1="31.220833"
+       y1="5.6885419"
+       x2="32.543751"
+       y2="5.6885419"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Blue"
+       id="linearGradient2502"
+       x1="7.4083338"
+       y1="-3.7041662"
+       x2="11.641667"
+       y2="-3.7041662"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Green"
+       id="linearGradient2510"
+       x1="2.1166668"
+       y1="4.2333336"
+       x2="6.3500004"
+       y2="4.2333336"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-5.2916666)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Red"
+       id="linearGradient2537"
+       x1="23.283335"
+       y1="-3.7041662"
+       x2="27.516668"
+       y2="-3.7041662"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#FRAME"
+       id="linearGradient3113"
+       x1="17.991665"
+       y1="4.2333331"
+       x2="22.224998"
+       y2="4.2333331"
+       gradientUnits="userSpaceOnUse" />
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect3119">
+      <path
+         id="mask-powermask-path-effect3119_box"
+         style="fill:#ffffff;fill-opacity:1"
+         d="M 6.9374996,65.145837 H 12.1125 v 5.175 H 6.9374996 Z" />
+      <path
+         id="path3117"
+         style="opacity:1;fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.250537,66.995394 -0.0047,0.0047 c -0.02767,-0.0066 -0.211799,-0.04039 -0.4563028,0.204116 C 9.6572915,67.468749 9.6572915,67.468749 9.5249999,67.49562 9.3927082,67.468749 9.3927082,67.468749 9.2604165,67.204166 9.061979,67.005731 8.8982935,66.990872 8.8289184,66.99591 c -0.023124,0.0016 -0.035657,0.0057 -0.035657,0.0057 0,0 -0.062009,0.20257 0.2025716,0.467154 0.2645833,0.132291 0.2645841,0.132291 0.291455,0.264583 -0.026871,0.132292 -0.026872,0.132292 -0.291455,0.264583 -0.2445017,0.244505 -0.2107512,0.428639 -0.2041218,0.456304 l -0.00465,0.0047 c 0,0 0.00465,2.65e-4 0.00517,5.29e-4 1.736e-4,5.3e-4 0.00103,0.0057 0.00103,0.0057 l 0.00465,-0.0047 c 0.027721,0.0066 0.2118445,0.04033 0.4563028,-0.204123 0.1322919,-0.264584 0.1322919,-0.264584 0.2645833,-0.291455 0.1322919,0.02687 0.1322917,0.02687 0.2645833,0.291455 0.1984378,0.198435 0.3621234,0.213294 0.4314984,0.208256 0.02312,-0.0016 0.03566,-0.0057 0.03566,-0.0057 0,0 0.06201,-0.20257 -0.202572,-0.467156 -0.2645836,-0.132289 -0.2645839,-0.132291 -0.291455,-0.264583 0.026871,-0.132279 0.026873,-0.132292 0.291455,-0.264583 0.244502,-0.244505 0.210752,-0.428639 0.204122,-0.456304 l 0.0047,-0.0047 c 0,0 -0.0046,-7.94e-4 -0.0052,-0.0011 -1.47e-4,-5.29e-4 -10e-4,-0.0052 -10e-4,-0.0052 z" />
+    </mask>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient3131"
+       gradientUnits="userSpaceOnUse"
+       x1="17.991667"
+       y1="30.691668"
+       x2="21.960417"
+       y2="30.691668" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient4009"
+       gradientUnits="userSpaceOnUse"
+       x1="2.1166666"
+       y1="4.2333336"
+       x2="6.3500004"
+       y2="4.2333336"
+       gradientTransform="translate(21.166665,37.041663)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Green"
+       id="linearGradient4011"
+       gradientUnits="userSpaceOnUse"
+       x1="2.1166668"
+       y1="4.2333336"
+       x2="6.3500004"
+       y2="4.2333336"
+       gradientTransform="translate(21.166665,37.041663)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient4013"
+       gradientUnits="userSpaceOnUse"
+       x1="2.1166666"
+       y1="4.2333336"
+       x2="6.3500004"
+       y2="4.2333336"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,21.166665,37.041663)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient4015"
+       gradientUnits="userSpaceOnUse"
+       x1="17.991667"
+       y1="62.44165"
+       x2="22.224998"
+       y2="62.44165" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient4017"
+       gradientUnits="userSpaceOnUse"
+       x1="17.991667"
+       y1="62.44165"
+       x2="22.224998"
+       y2="62.44165" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient4019"
+       gradientUnits="userSpaceOnUse"
+       x1="17.991667"
+       y1="62.44165"
+       x2="22.224998"
+       y2="62.44165" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient4021"
+       gradientUnits="userSpaceOnUse"
+       x1="17.991667"
+       y1="62.44165"
+       x2="22.224998"
+       y2="62.44165" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient4023"
+       gradientUnits="userSpaceOnUse"
+       x1="17.991667"
+       y1="62.44165"
+       x2="22.224998"
+       y2="62.44165" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Red"
+       id="linearGradient4025"
+       gradientUnits="userSpaceOnUse"
+       x1="23.283335"
+       y1="-3.7041662"
+       x2="27.516668"
+       y2="-3.7041662"
+       gradientTransform="translate(0,5.2916666)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient4027"
+       gradientUnits="userSpaceOnUse"
+       x1="14.816667"
+       y1="46.566666"
+       x2="16.933334"
+       y2="46.566666" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient4029"
+       gradientUnits="userSpaceOnUse"
+       x1="14.816667"
+       y1="46.566666"
+       x2="16.933334"
+       y2="46.566666" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Red"
+       id="linearGradient4031"
+       gradientUnits="userSpaceOnUse"
+       x1="23.283335"
+       y1="-3.7041662"
+       x2="27.516668"
+       y2="-3.7041662" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Orange"
+       id="linearGradient4033"
+       gradientUnits="userSpaceOnUse"
+       x1="17.991667"
+       y1="-3.7041662"
+       x2="22.225"
+       y2="-3.7041662" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Orange"
+       id="linearGradient4035"
+       gradientUnits="userSpaceOnUse"
+       x1="17.991667"
+       y1="-3.7041662"
+       x2="22.225"
+       y2="-3.7041662" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Orange"
+       id="linearGradient4037"
+       gradientUnits="userSpaceOnUse"
+       x1="17.991667"
+       y1="-3.7041662"
+       x2="22.225"
+       y2="-3.7041662" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient1655"
+       gradientUnits="userSpaceOnUse"
+       x1="22"
+       y1="188.5"
+       x2="36"
+       y2="188.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient1659"
+       gradientUnits="userSpaceOnUse"
+       x1="29"
+       y1="185.5"
+       x2="34"
+       y2="185.5"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,0.52916674,1.8520833)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient1663"
+       gradientUnits="userSpaceOnUse"
+       x1="29"
+       y1="191.5"
+       x2="34"
+       y2="191.5"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,0.52916674,1.8520833)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient1676"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(125.99999,-19.999999)"
+       x1="24"
+       y1="185.5"
+       x2="28"
+       y2="185.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient1720"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(114.99999,-19.999999)"
+       x1="29"
+       y1="185.5"
+       x2="34"
+       y2="185.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Red"
+       id="linearGradient6522"
+       gradientUnits="userSpaceOnUse"
+       x1="23.283335"
+       y1="-3.7041662"
+       x2="27.516668"
+       y2="-3.7041662" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient6770"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.7795276,0,0,3.7795276,-5.9999999,-6.9999999)"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient6778"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.7795276,0,0,3.7795276,-5.9999999,-6.9999999)"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient6786"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.7795276,0,0,3.7795276,-5.9999999,-6.9999999)"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient6788"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.7795276,0,0,3.7795276,-5.9999999,-6.9999999)"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient1803"
+       gradientUnits="userSpaceOnUse"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662"
+       gradientTransform="translate(5.2916666)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Green"
+       id="linearGradient1726"
+       gradientUnits="userSpaceOnUse"
+       x1="2.1166668"
+       y1="4.2333336"
+       x2="6.3500004"
+       y2="4.2333336"
+       gradientTransform="translate(5.2916666)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2163"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(19.999965,19.999991)"
+       x1="122"
+       y1="189"
+       x2="136"
+       y2="189" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Red"
+       id="linearGradient2167"
+       gradientUnits="userSpaceOnUse"
+       x1="23.283335"
+       y1="-3.7041662"
+       x2="27.516668"
+       y2="-3.7041662"
+       gradientTransform="translate(-0.26458333,7.9374999)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2177"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,23.018748,1.8520832)"
+       x1="122"
+       y1="189"
+       x2="136"
+       y2="189" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient1728"
+       gradientUnits="userSpaceOnUse"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662"
+       gradientTransform="translate(5.2916666,-5.2916666)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient1730"
+       gradientUnits="userSpaceOnUse"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662"
+       gradientTransform="translate(5.2916666,-5.2916666)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Red"
+       id="linearGradient1850"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(19.843741,12.699998)"
+       x1="23.283335"
+       y1="-3.7041662"
+       x2="27.516668"
+       y2="-3.7041662" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Red"
+       id="linearGradient1852"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(19.843741,12.699998)"
+       x1="23.283335"
+       y1="-3.7041662"
+       x2="27.516668"
+       y2="-3.7041662" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient1947"
+       gradientUnits="userSpaceOnUse"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient1818"
+       gradientUnits="userSpaceOnUse"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient1820"
+       gradientUnits="userSpaceOnUse"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient1822"
+       gradientUnits="userSpaceOnUse"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient1824"
+       gradientUnits="userSpaceOnUse"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Red"
+       id="linearGradient1826"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.26458333,7.9374999)"
+       x1="23.283335"
+       y1="-3.7041662"
+       x2="27.516668"
+       y2="-3.7041662" />
+    <linearGradient
+       id="Blue-2"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#24bee8;stop-opacity:1;"
+         offset="0"
+         id="stop2484-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Blue"
+       id="linearGradient2147"
+       gradientUnits="userSpaceOnUse"
+       x1="7.4083338"
+       y1="-3.7041662"
+       x2="11.641667"
+       y2="-3.7041662"
+       gradientTransform="translate(-2.1238232e-6,-3.4830508e-5)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Blue"
+       id="linearGradient2518"
+       gradientUnits="userSpaceOnUse"
+       x1="7.4083338"
+       y1="-3.7041662"
+       x2="11.641667"
+       y2="-3.7041662"
+       gradientTransform="matrix(3.0000001,0,0,3.0000001,10.018197,-85.463352)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Blue"
+       id="linearGradient2099"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-111.65414,-0.26458333)"
+       x1="7.4083338"
+       y1="-3.7041662"
+       x2="11.641667"
+       y2="-3.7041662" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Blue"
+       id="linearGradient2616"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(27.516637,50.138547)"
+       x1="23.547918"
+       y1="50.932293"
+       x2="24.870834"
+       y2="50.932293" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2307"
+       gradientUnits="userSpaceOnUse"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662"
+       gradientTransform="translate(-1.8520815,-1.852082)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient1898"
+       gradientUnits="userSpaceOnUse"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662"
+       gradientTransform="translate(-1.8520804,-1.852082)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient1900"
+       gradientUnits="userSpaceOnUse"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662"
+       gradientTransform="translate(-1.8520804,-1.852082)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient1902"
+       gradientUnits="userSpaceOnUse"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662"
+       gradientTransform="translate(-1.8520815,-1.852082)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient1910"
+       gradientUnits="userSpaceOnUse"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662"
+       gradientTransform="translate(-1.8522115,-1.8522118)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient1912"
+       gradientUnits="userSpaceOnUse"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662"
+       gradientTransform="translate(-1.8522115,-1.8522118)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient1914"
+       gradientUnits="userSpaceOnUse"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662"
+       gradientTransform="translate(-1.8522115,-1.8522118)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient1916"
+       gradientUnits="userSpaceOnUse"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,3.8406662e-6,0.13229438)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient1918"
+       gradientUnits="userSpaceOnUse"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,3.8406662e-6,0.13229438)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient1905"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(82.324078,32.769146)"
+       x1="29"
+       y1="185.5"
+       x2="34"
+       y2="185.5" />
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect2030">
+      <path
+         style="fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 37.570812,104.24581 5.291677,-2.64583 -5.291677,-2.645822 -5.291667,2.645822 z"
+         id="path2028"
+         sodipodi:nodetypes="ccccc" />
+    </mask>
+    <meshgradient
+       inkscape:collect="always"
+       id="meshgradient2125"
+       gradientUnits="userSpaceOnUse"
+       x="95.51458"
+       y="95.51458"
+       gradientTransform="matrix(0.46584749,0,0,0.46584749,-114.45504,115.6876)">
+      <meshrow
+         id="meshrow2309">
+        <meshpatch
+           id="meshpatch2311">
+          <stop
+             path="l 2.54,0"
+             style="stop-color:#fba40f;stop-opacity:1"
+             id="stop2313" />
+          <stop
+             path="l 0,2.54"
+             style="stop-color:#fdbc4b;stop-opacity:1"
+             id="stop2315" />
+          <stop
+             path="l -2.54,0"
+             style="stop-color:#fba40f;stop-opacity:1"
+             id="stop2317" />
+          <stop
+             path="l 0,-2.54"
+             style="stop-color:#fba40f;stop-opacity:1"
+             id="stop2319" />
+        </meshpatch>
+        <meshpatch
+           id="meshpatch2321">
+          <stop
+             path="l 2.54,0"
+             id="stop2323" />
+          <stop
+             path="l 0,2.54"
+             style="stop-color:#fba40f;stop-opacity:1"
+             id="stop2325" />
+          <stop
+             path="l -2.54,0"
+             style="stop-color:#fbfbfb;stop-opacity:1"
+             id="stop2327" />
+        </meshpatch>
+        <meshpatch
+           id="meshpatch2329">
+          <stop
+             path="l 2.54,0"
+             id="stop2331" />
+          <stop
+             path="l 0,2.54"
+             style="stop-color:#fb4d6e;stop-opacity:1"
+             id="stop2333" />
+          <stop
+             path="l -2.54,0"
+             style="stop-color:#fbfbfb;stop-opacity:1"
+             id="stop2335" />
+        </meshpatch>
+        <meshpatch
+           id="meshpatch2337">
+          <stop
+             path="l 2.54,0"
+             id="stop2339" />
+          <stop
+             path="l 0,2.54"
+             style="stop-color:#fb4d6e;stop-opacity:1"
+             id="stop2341" />
+          <stop
+             path="l -2.54,0"
+             style="stop-color:#fb4d6e;stop-opacity:1"
+             id="stop2343" />
+        </meshpatch>
+        <meshpatch
+           id="meshpatch2345">
+          <stop
+             path="l 2.54,0"
+             id="stop2347" />
+          <stop
+             path="l 0,2.54"
+             style="stop-color:#fb4d6e;stop-opacity:1"
+             id="stop2349" />
+          <stop
+             path="l -2.54,0"
+             style="stop-color:#fb4d6e;stop-opacity:1"
+             id="stop2351" />
+        </meshpatch>
+      </meshrow>
+      <meshrow
+         id="meshrow2353">
+        <meshpatch
+           id="meshpatch2355">
+          <stop
+             path="l 0,2.54"
+             id="stop2357" />
+          <stop
+             path="l -2.54,0"
+             style="stop-color:#fbfbfb;stop-opacity:1"
+             id="stop2359" />
+          <stop
+             path="l 0,-2.54"
+             style="stop-color:#fba40f;stop-opacity:1"
+             id="stop2361" />
+        </meshpatch>
+        <meshpatch
+           id="meshpatch2363">
+          <stop
+             path="l 0,2.54"
+             id="stop2365" />
+          <stop
+             path="l -2.54,0"
+             style="stop-color:#fbfbfb;stop-opacity:1"
+             id="stop2367" />
+        </meshpatch>
+        <meshpatch
+           id="meshpatch2369">
+          <stop
+             path="l 0,2.54"
+             id="stop2371" />
+          <stop
+             path="l -2.54,0"
+             style="stop-color:#fbfbfb;stop-opacity:1"
+             id="stop2373" />
+        </meshpatch>
+        <meshpatch
+           id="meshpatch2375">
+          <stop
+             path="l 0,2.54"
+             id="stop2377" />
+          <stop
+             path="l -2.54,0"
+             style="stop-color:#fbfbfb;stop-opacity:1"
+             id="stop2379" />
+        </meshpatch>
+        <meshpatch
+           id="meshpatch2381">
+          <stop
+             path="l 0,2.54"
+             id="stop2383" />
+          <stop
+             path="l -2.54,0"
+             style="stop-color:#fb4d6e;stop-opacity:1"
+             id="stop2385" />
+        </meshpatch>
+      </meshrow>
+      <meshrow
+         id="meshrow2387">
+        <meshpatch
+           id="meshpatch2389">
+          <stop
+             path="l 0,2.54"
+             id="stop2391" />
+          <stop
+             path="l -2.54,0"
+             style="stop-color:#fbfbfb;stop-opacity:1"
+             id="stop2393" />
+          <stop
+             path="l 0,-2.54"
+             style="stop-color:#0a9dfc;stop-opacity:1"
+             id="stop2395" />
+        </meshpatch>
+        <meshpatch
+           id="meshpatch2397">
+          <stop
+             path="l 0,2.54"
+             id="stop2399" />
+          <stop
+             path="l -2.54,0"
+             style="stop-color:#fbfbfb;stop-opacity:1"
+             id="stop2401" />
+        </meshpatch>
+        <meshpatch
+           id="meshpatch2403">
+          <stop
+             path="l 0,2.54"
+             id="stop2405" />
+          <stop
+             path="l -2.54,0"
+             style="stop-color:#fbfbfb;stop-opacity:1"
+             id="stop2407" />
+        </meshpatch>
+        <meshpatch
+           id="meshpatch2409">
+          <stop
+             path="l 0,2.54"
+             id="stop2411" />
+          <stop
+             path="l -2.54,0"
+             style="stop-color:#fbfbfb;stop-opacity:1"
+             id="stop2413" />
+        </meshpatch>
+        <meshpatch
+           id="meshpatch2415">
+          <stop
+             path="l 0,2.54"
+             id="stop2417" />
+          <stop
+             path="l -2.54,0"
+             style="stop-color:#fc553b;stop-opacity:1"
+             id="stop2419" />
+        </meshpatch>
+      </meshrow>
+      <meshrow
+         id="meshrow2421">
+        <meshpatch
+           id="meshpatch2423">
+          <stop
+             path="l 0,2.54"
+             id="stop2425" />
+          <stop
+             path="l -2.54,0"
+             style="stop-color:#0a9dfc;stop-opacity:1"
+             id="stop2427" />
+          <stop
+             path="l 0,-2.54"
+             style="stop-color:#0a9dfc;stop-opacity:1"
+             id="stop2429" />
+        </meshpatch>
+        <meshpatch
+           id="meshpatch2431">
+          <stop
+             path="l 0,2.54"
+             id="stop2433" />
+          <stop
+             path="l -2.54,0"
+             style="stop-color:#fbfbfb;stop-opacity:1"
+             id="stop2435" />
+        </meshpatch>
+        <meshpatch
+           id="meshpatch2437">
+          <stop
+             path="l 0,2.54"
+             id="stop2439" />
+          <stop
+             path="l -2.54,0"
+             style="stop-color:#fbfbfb;stop-opacity:1"
+             id="stop2441" />
+        </meshpatch>
+        <meshpatch
+           id="meshpatch2443">
+          <stop
+             path="l 0,2.54"
+             id="stop2445" />
+          <stop
+             path="l -2.54,0"
+             style="stop-color:#fc553b;stop-opacity:1"
+             id="stop2447" />
+        </meshpatch>
+        <meshpatch
+           id="meshpatch2449">
+          <stop
+             path="l 0,2.54"
+             id="stop2451" />
+          <stop
+             path="l -2.54,0"
+             style="stop-color:#fc553b;stop-opacity:1"
+             id="stop2453" />
+        </meshpatch>
+      </meshrow>
+      <meshrow
+         id="meshrow2455">
+        <meshpatch
+           id="meshpatch2457">
+          <stop
+             path="l 0,2.54"
+             id="stop2459" />
+          <stop
+             path="l -2.54,0"
+             style="stop-color:#0a9dfc;stop-opacity:1"
+             id="stop2461" />
+          <stop
+             path="l 0,-2.54"
+             style="stop-color:#0a9dfc;stop-opacity:1"
+             id="stop2463" />
+        </meshpatch>
+        <meshpatch
+           id="meshpatch2465">
+          <stop
+             path="l 0,2.54"
+             id="stop2467" />
+          <stop
+             path="l -2.54,0"
+             style="stop-color:#0a9dfc;stop-opacity:1"
+             id="stop2469" />
+        </meshpatch>
+        <meshpatch
+           id="meshpatch2471">
+          <stop
+             path="l 0,2.54"
+             id="stop2473" />
+          <stop
+             path="l -2.54,0"
+             style="stop-color:#fc553b;stop-opacity:1"
+             id="stop2475" />
+        </meshpatch>
+        <meshpatch
+           id="meshpatch2477">
+          <stop
+             path="l 0,2.54"
+             id="stop2479" />
+          <stop
+             path="l -2.54,0"
+             style="stop-color:#fc553b;stop-opacity:1"
+             id="stop2481" />
+        </meshpatch>
+        <meshpatch
+           id="meshpatch2483">
+          <stop
+             path="l 0,2.54"
+             id="stop2485" />
+          <stop
+             path="l -2.54,0"
+             style="stop-color:#fc553b;stop-opacity:1"
+             id="stop2487" />
+        </meshpatch>
+      </meshrow>
+    </meshgradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient3534"
+       gradientUnits="userSpaceOnUse"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662"
+       gradientTransform="translate(0,-5.2916666)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2159"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(98.199077,64.519142)"
+       x1="29"
+       y1="185.5"
+       x2="34"
+       y2="185.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2359"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(98.199077,98.914971)"
+       x1="29"
+       y1="185.5"
+       x2="34"
+       y2="185.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2367"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(73.877546,88.840673)"
+       x1="29"
+       y1="185.5"
+       x2="34"
+       y2="185.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2415"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,-1,96.346481,204.22575)"
+       x1="29"
+       y1="185.5"
+       x2="34"
+       y2="185.5" />
+    <filter
+       id="mask-powermask-path-effect1741_inverse"
+       inkscape:label="filtermask-powermask-path-effect1741"
+       style="color-interpolation-filters:sRGB"
+       height="100"
+       width="100"
+       x="-50"
+       y="-50">
+      <feColorMatrix
+         id="mask-powermask-path-effect1741_primitive1"
+         values="1"
+         type="saturate"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="mask-powermask-path-effect1741_primitive2"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
+         in="fbSourceGraphic" />
+    </filter>
+    <filter
+       id="mask-powermask-path-effect1105_inverse"
+       inkscape:label="filtermask-powermask-path-effect1105"
+       style="color-interpolation-filters:sRGB"
+       height="100"
+       width="100"
+       x="-50"
+       y="-50">
+      <feColorMatrix
+         id="mask-powermask-path-effect1105_primitive1"
+         values="1"
+         type="saturate"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="mask-powermask-path-effect1105_primitive2"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
+         in="fbSourceGraphic" />
+    </filter>
+    <filter
+       id="mask-powermask-path-effect1447_inverse"
+       inkscape:label="filtermask-powermask-path-effect1447"
+       style="color-interpolation-filters:sRGB"
+       height="100"
+       width="100"
+       x="-50"
+       y="-50">
+      <feColorMatrix
+         id="mask-powermask-path-effect1447_primitive1"
+         values="1"
+         type="saturate"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="mask-powermask-path-effect1447_primitive2"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
+         in="fbSourceGraphic" />
+    </filter>
+    <filter
+       id="mask-powermask-path-effect1389_inverse"
+       inkscape:label="filtermask-powermask-path-effect1389"
+       style="color-interpolation-filters:sRGB"
+       height="100"
+       width="100"
+       x="-50"
+       y="-50">
+      <feColorMatrix
+         id="mask-powermask-path-effect1389_primitive1"
+         values="1"
+         type="saturate"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="mask-powermask-path-effect1389_primitive2"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
+         in="fbSourceGraphic" />
+    </filter>
+    <filter
+       id="mask-powermask-path-effect3119_inverse"
+       inkscape:label="filtermask-powermask-path-effect3119"
+       style="color-interpolation-filters:sRGB"
+       height="100"
+       width="100"
+       x="-50"
+       y="-50">
+      <feColorMatrix
+         id="mask-powermask-path-effect3119_primitive1"
+         values="1"
+         type="saturate"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="mask-powermask-path-effect3119_primitive2"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
+         in="fbSourceGraphic" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Blue"
+       id="linearGradient2809"
+       gradientUnits="userSpaceOnUse"
+       x1="7.4083338"
+       y1="-3.7041662"
+       x2="11.641667"
+       y2="-3.7041662" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Blue"
+       id="linearGradient1351"
+       gradientUnits="userSpaceOnUse"
+       x1="7.4083338"
+       y1="-3.7041662"
+       x2="11.641667"
+       y2="-3.7041662" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Red"
+       id="linearGradient2457"
+       gradientUnits="userSpaceOnUse"
+       x1="23.283335"
+       y1="-3.7041662"
+       x2="27.516668"
+       y2="-3.7041662"
+       gradientTransform="translate(0,-5.2916666)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Orange"
+       id="linearGradient2459"
+       gradientUnits="userSpaceOnUse"
+       x1="17.991667"
+       y1="-3.7041662"
+       x2="22.225"
+       y2="-3.7041662"
+       gradientTransform="translate(0,-5.2916666)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2265"
+       gradientUnits="userSpaceOnUse"
+       x1="7.4083333"
+       y1="4.2333331"
+       x2="11.641666"
+       y2="4.2333331" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2267"
+       gradientUnits="userSpaceOnUse"
+       x1="7.4083333"
+       y1="4.2333331"
+       x2="11.641666"
+       y2="4.2333331" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient2269"
+       gradientUnits="userSpaceOnUse"
+       x1="7.4083333"
+       y1="4.2333331"
+       x2="11.641666"
+       y2="4.2333331" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Orange"
+       id="linearGradient2275"
+       gradientUnits="userSpaceOnUse"
+       x1="17.991667"
+       y1="-3.7041662"
+       x2="22.225"
+       y2="-3.7041662" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Orange"
+       id="linearGradient2277"
+       gradientUnits="userSpaceOnUse"
+       x1="17.991667"
+       y1="-3.7041662"
+       x2="22.225"
+       y2="-3.7041662"
+       gradientTransform="scale(0.26458333)" />
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect2301">
+      <path
+         id="mask-powermask-path-effect2301_box"
+         style="fill:#ffffff;fill-opacity:1"
+         d="m 31.967073,99.171248 h 12.794982 v 7.503322 H 31.967073 Z" />
+      <path
+         style="fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 38.364583,103.71668 5.291669,-2.64584 -5.291669,-2.645833 -5.291667,2.645833 z"
+         id="path2299"
+         sodipodi:nodetypes="ccccc" />
+    </mask>
+    <filter
+       id="mask-powermask-path-effect2301_inverse"
+       inkscape:label="filtermask-powermask-path-effect2301"
+       style="color-interpolation-filters:sRGB"
+       height="100"
+       width="100"
+       x="-50"
+       y="-50">
+      <feColorMatrix
+         id="mask-powermask-path-effect2301_primitive1"
+         values="1"
+         type="saturate"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="mask-powermask-path-effect2301_primitive2"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
+         in="fbSourceGraphic" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Red"
+       id="linearGradient6466"
+       gradientUnits="userSpaceOnUse"
+       x1="23.283335"
+       y1="-3.7041662"
+       x2="27.516668"
+       y2="-3.7041662" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient6468"
+       gradientUnits="userSpaceOnUse"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient6470"
+       gradientUnits="userSpaceOnUse"
+       x1="2.116667"
+       y1="-3.7041662"
+       x2="6.3499999"
+       y2="-3.7041662" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient6472"
+       gradientUnits="userSpaceOnUse"
+       x1="7.9374995"
+       y1="30.691668"
+       x2="11.1125"
+       y2="30.691668" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient6474"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(114.99999,-19.999999)"
+       x1="29"
+       y1="185.5"
+       x2="34"
+       y2="185.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Main"
+       id="linearGradient6476"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(114.99999,-19.999999)"
+       x1="29"
+       y1="185.5"
+       x2="34"
+       y2="185.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Blue"
+       id="linearGradient6478"
+       gradientUnits="userSpaceOnUse"
+       x1="7.4083338"
+       y1="-3.7041662"
+       x2="11.641667"
+       y2="-3.7041662" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-maximized="1"
+     inkscape:window-y="0"
+     inkscape:window-x="0"
+     inkscape:window-height="2055"
+     inkscape:window-width="3840"
+     inkscape:pagecheckerboard="false"
+     showgrid="false"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     inkscape:cy="465.80219"
+     inkscape:cx="478.45994"
+     inkscape:zoom="1.4142136"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#eff0f1"
+     id="base"
+     inkscape:snap-global="true"
+     inkscape:snap-object-midpoints="false"
+     inkscape:snap-center="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-paths="true"
+     units="px"
+     inkscape:snap-grids="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     showborder="false"
+     inkscape:object-nodes="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true">
+    <inkscape:grid
+       empopacity="0.54509804"
+       empcolor="#3f3fff"
+       spacingy="0.13229167"
+       spacingx="0.13229167"
+       empspacing="4"
+       id="grid60"
+       type="xygrid"
+       originx="13.758332"
+       originy="50.249944" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     style="display:inline;opacity:0.106324"
+     inkscape:label="layout"
+     id="layer2"
+     inkscape:groupmode="layer"
+     transform="translate(13.758332,50.249943)"
+     sodipodi:insensitive="true">
+    <path
+       id="path976"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 28.310415,12.435417 v 4.762499 h 4.762499 V 12.435417 Z M 28.574998,12.7 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       d="m 23.018749,12.435417 v 4.762499 h 4.762499 V 12.435417 Z M 23.283332,12.7 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path974" />
+    <path
+       id="path972"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 17.727083,12.435417 v 4.762499 h 4.762499 V 12.435417 Z M 17.991666,12.7 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       d="M 28.310415,7.1437499 V 11.90625 h 4.762499 V 7.1437499 Z m 0.264583,0.2645833 h 4.233333 v 4.2333338 h -4.233333 z"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path958" />
+    <path
+       id="path956"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="M 23.018749,7.1437499 V 11.90625 h 4.762499 V 7.1437499 Z m 0.264583,0.2645833 h 4.233333 v 4.2333338 h -4.233333 z" />
+    <path
+       d="M 17.727083,7.1437499 V 11.90625 h 4.762499 V 7.1437499 Z m 0.264583,0.2645833 h 4.233333 v 4.2333338 h -4.233333 z"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path954" />
+    <path
+       id="path952"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 28.310415,1.8520833 v 4.7624999 h 4.762499 V 1.8520833 Z m 0.264583,0.2645833 h 4.233333 v 4.2333333 h -4.233333 z" />
+    <path
+       d="m 23.018749,1.8520833 v 4.7624999 h 4.762499 V 1.8520833 Z m 0.264583,0.2645833 h 4.233333 v 4.2333333 h -4.233333 z"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path950" />
+    <path
+       id="path948"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 17.727083,1.8520833 v 4.7624999 h 4.762499 V 1.8520833 Z m 0.264583,0.2645833 h 4.233333 v 4.2333333 h -4.233333 z" />
+    <path
+       d="m 12.435417,12.435417 v 4.762499 h 4.762499 V 12.435417 Z M 12.7,12.7 h 4.233333 v 4.233333 H 12.7 Z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path970" />
+    <path
+       id="path968"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 7.1437504,12.435417 v 4.762499 H 11.90625 V 12.435417 Z M 7.4083337,12.7 h 4.2333333 v 4.233333 H 7.4083337 Z" />
+    <path
+       d="m 1.8520838,12.435417 v 4.762499 H 6.6145834 V 12.435417 Z M 2.1166671,12.7 h 4.2333333 v 4.233333 H 2.1166671 Z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path966" />
+    <path
+       id="path964"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="M 12.435417,7.1437499 V 11.90625 h 4.762499 V 7.1437499 Z M 12.7,7.4083332 h 4.233333 V 11.641667 H 12.7 Z" />
+    <path
+       d="M 7.1437504,7.1437499 V 11.90625 H 11.90625 V 7.1437499 Z M 7.4083337,7.4083332 H 11.641667 V 11.641667 H 7.4083337 Z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path962" />
+    <path
+       id="path960"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="M 1.8520838,7.1437499 V 11.90625 H 6.6145834 V 7.1437499 Z M 2.1166671,7.4083332 H 6.3500004 V 11.641667 H 2.1166671 Z" />
+    <path
+       d="m 12.435417,1.8520833 v 4.7624999 h 4.762499 V 1.8520833 Z M 12.7,2.1166666 h 4.233333 V 6.3499999 H 12.7 Z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path946" />
+    <path
+       id="path944"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 7.14375,1.8520833 v 4.7624999 h 4.7625 V 1.8520833 Z M 7.4083333,2.1166666 H 11.641667 V 6.3499999 H 7.4083333 Z" />
+    <path
+       transform="scale(0.26458333)"
+       d="M 7,7 V 25 H 25 V 7 Z M 8,8 H 24 V 24 H 8 Z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.999999"
+       id="rect937" />
+    <path
+       id="path1019"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 28.310415,28.310415 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       d="m 23.018749,28.310415 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1021" />
+    <path
+       id="path1023"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 17.727083,28.310415 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       d="m 28.310415,23.018749 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1025" />
+    <path
+       id="path1027"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 23.018749,23.018749 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       d="m 17.727083,23.018749 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1029" />
+    <path
+       id="path1031"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 28.310415,17.727083 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       d="m 23.018749,17.727083 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1033" />
+    <path
+       id="path1035"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 17.727083,17.727083 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       d="m 12.435417,28.310415 v 4.762499 h 4.762499 V 28.310415 Z M 12.7,28.574998 h 4.233333 v 4.233333 H 12.7 Z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1037" />
+    <path
+       id="path1039"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 7.1437504,28.310415 v 4.762499 H 11.90625 v -4.762499 z m 0.2645833,0.264583 h 4.2333333 v 4.233333 H 7.4083337 Z" />
+    <path
+       d="m 1.8520838,28.310415 v 4.762499 h 4.7624996 v -4.762499 z m 0.2645833,0.264583 h 4.2333333 v 4.233333 H 2.1166671 Z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1041" />
+    <path
+       id="path1043"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 12.435417,23.018749 v 4.762499 h 4.762499 V 23.018749 Z M 12.7,23.283332 h 4.233333 v 4.233333 H 12.7 Z" />
+    <path
+       d="m 7.1437504,23.018749 v 4.762499 H 11.90625 v -4.762499 z m 0.2645833,0.264583 h 4.2333333 v 4.233333 H 7.4083337 Z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1045" />
+    <path
+       id="path1047"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 1.8520838,23.018749 v 4.762499 h 4.7624996 v -4.762499 z m 0.2645833,0.264583 h 4.2333333 v 4.233333 H 2.1166671 Z" />
+    <path
+       d="m 12.435417,17.727083 v 4.762499 h 4.762499 V 17.727083 Z M 12.7,17.991666 h 4.233333 v 4.233333 H 12.7 Z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1049" />
+    <path
+       id="path1051"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 7.14375,17.727083 v 4.762499 h 4.7625 v -4.762499 z m 0.2645833,0.264583 h 4.2333337 v 4.233333 H 7.4083333 Z" />
+    <path
+       d="m 1.8520833,17.727083 v 4.762499 h 4.7624999 v -4.762499 z m 0.2645833,0.264583 h 4.2333333 v 4.233333 H 2.1166666 Z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1053" />
+    <path
+       id="path1360"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 28.310415,44.185413 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       d="m 23.018749,44.185413 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1362" />
+    <path
+       id="path1364"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 17.727083,44.185413 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       d="m 28.310415,38.893747 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1366" />
+    <path
+       id="path1368"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 23.018749,38.893747 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       d="m 17.727083,38.893747 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1370" />
+    <path
+       id="path1372"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 28.310415,33.602081 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       d="m 23.018749,33.602081 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1374" />
+    <path
+       id="path1376"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 17.727083,33.602081 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       d="m 12.435417,44.185413 v 4.762499 h 4.762499 V 44.185413 Z M 12.7,44.449996 h 4.233333 v 4.233333 H 12.7 Z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1378" />
+    <path
+       id="path1380"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 7.1437504,44.185413 v 4.762499 H 11.90625 v -4.762499 z m 0.2645833,0.264583 h 4.2333333 v 4.233333 H 7.4083337 Z" />
+    <path
+       d="m 1.8520838,44.185413 v 4.762499 h 4.7624996 v -4.762499 z m 0.2645833,0.264583 h 4.2333333 v 4.233333 H 2.1166671 Z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1382" />
+    <path
+       id="path1384"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 12.435417,38.893747 v 4.762499 h 4.762499 V 38.893747 Z M 12.7,39.15833 h 4.233333 v 4.233333 H 12.7 Z" />
+    <path
+       d="m 7.1437504,38.893747 v 4.762499 H 11.90625 v -4.762499 z m 0.2645833,0.264583 h 4.2333333 v 4.233333 H 7.4083337 Z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1386" />
+    <path
+       id="path1388"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 1.8520838,38.893747 v 4.762499 h 4.7624996 v -4.762499 z m 0.2645833,0.264583 h 4.2333333 v 4.233333 H 2.1166671 Z" />
+    <path
+       d="m 12.435417,33.602081 v 4.762499 h 4.762499 V 33.602081 Z M 12.7,33.866664 h 4.233333 v 4.233333 H 12.7 Z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1390" />
+    <path
+       id="path1392"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 7.14375,33.602081 v 4.762499 h 4.7625 v -4.762499 z m 0.2645833,0.264583 h 4.2333337 v 4.233333 H 7.4083333 Z" />
+    <path
+       d="m 1.8520833,33.602081 v 4.762499 h 4.7624999 v -4.762499 z m 0.2645833,0.264583 h 4.2333333 v 4.233333 H 2.1166666 Z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1394" />
+    <path
+       d="m 28.310415,54.768745 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1402" />
+    <path
+       id="path1404"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 23.018749,54.768745 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       d="m 17.727083,54.768745 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1406" />
+    <path
+       id="path1408"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 28.310415,49.477079 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       d="m 23.018749,49.477079 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1410" />
+    <path
+       id="path1412"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 17.727083,49.477079 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       id="path1420"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 12.435417,54.768745 v 4.762499 h 4.762499 V 54.768745 Z M 12.7,55.033328 h 4.233333 v 4.233333 H 12.7 Z" />
+    <path
+       d="m 7.1437504,54.768745 v 4.762499 H 11.90625 v -4.762499 z m 0.2645833,0.264583 h 4.2333333 v 4.233333 H 7.4083337 Z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1422" />
+    <path
+       id="path1424"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 1.8520838,54.768745 v 4.762499 h 4.7624996 v -4.762499 z m 0.2645833,0.264583 h 4.2333333 v 4.233333 H 2.1166671 Z" />
+    <path
+       d="m 12.435417,49.477079 v 4.762499 h 4.762499 V 49.477079 Z M 12.7,49.741662 h 4.233333 v 4.233333 H 12.7 Z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1426" />
+    <path
+       id="path1428"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 7.14375,49.477079 v 4.762499 h 4.7625 v -4.762499 z m 0.2645833,0.264583 h 4.2333337 v 4.233333 H 7.4083333 Z" />
+    <path
+       d="m 1.8520833,49.477079 v 4.762499 h 4.7624999 v -4.762499 z m 0.2645833,0.264583 h 4.2333333 v 4.233333 H 2.1166666 Z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1430" />
+    <path
+       id="path1291"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 60.060411,12.435417 v 4.762499 H 64.82291 V 12.435417 Z M 60.324994,12.7 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       d="m 54.768745,12.435417 v 4.762499 h 4.762499 V 12.435417 Z M 55.033328,12.7 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1293" />
+    <path
+       id="path1295"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 49.477079,12.435417 v 4.762499 h 4.762499 V 12.435417 Z M 49.741662,12.7 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       d="M 60.060411,7.1437504 V 11.90625 H 64.82291 V 7.1437504 Z m 0.264583,0.2645833 h 4.233333 v 4.2333333 h -4.233333 z"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1297" />
+    <path
+       id="path1299"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="M 54.768745,7.1437504 V 11.90625 h 4.762499 V 7.1437504 Z m 0.264583,0.2645833 h 4.233333 v 4.2333333 h -4.233333 z" />
+    <path
+       d="M 49.477079,7.1437504 V 11.90625 h 4.762499 V 7.1437504 Z m 0.264583,0.2645833 h 4.233333 v 4.2333333 h -4.233333 z"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1301" />
+    <path
+       id="path1303"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="M 60.060411,1.8520838 V 6.6145834 H 64.82291 V 1.8520838 Z m 0.264583,0.2645833 h 4.233333 v 4.2333333 h -4.233333 z" />
+    <path
+       d="m 54.768745,1.8520838 v 4.7624996 h 4.762499 V 1.8520838 Z m 0.264583,0.2645833 h 4.233333 v 4.2333333 h -4.233333 z"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1305" />
+    <path
+       id="path1307"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 49.477079,1.8520838 v 4.7624996 h 4.762499 V 1.8520838 Z m 0.264583,0.2645833 h 4.233333 v 4.2333333 h -4.233333 z" />
+    <path
+       d="m 44.185413,12.435417 v 4.762499 h 4.762499 V 12.435417 Z M 44.449996,12.7 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1309" />
+    <path
+       id="path1311"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 38.893747,12.435417 v 4.762499 h 4.762499 V 12.435417 Z M 39.15833,12.7 h 4.233333 v 4.233333 H 39.15833 Z" />
+    <path
+       d="m 33.602081,12.435417 v 4.762499 H 38.36458 V 12.435417 Z M 33.866664,12.7 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1313" />
+    <path
+       id="path1315"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="M 44.185413,7.1437504 V 11.90625 h 4.762499 V 7.1437504 Z m 0.264583,0.2645833 h 4.233333 v 4.2333333 h -4.233333 z" />
+    <path
+       d="M 38.893747,7.1437504 V 11.90625 h 4.762499 V 7.1437504 Z m 0.264583,0.2645833 h 4.233333 V 11.641667 H 39.15833 Z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1317" />
+    <path
+       id="path1319"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="M 33.602081,7.1437504 V 11.90625 H 38.36458 V 7.1437504 Z m 0.264583,0.2645833 h 4.233333 v 4.2333333 h -4.233333 z" />
+    <path
+       d="m 44.185413,1.8520838 v 4.7624996 h 4.762499 V 1.8520838 Z m 0.264583,0.2645833 h 4.233333 v 4.2333333 h -4.233333 z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1321" />
+    <path
+       id="path1323"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 38.893747,1.8520838 v 4.7624996 h 4.762499 V 1.8520838 Z m 0.264583,0.2645833 h 4.233333 V 6.3500004 H 39.15833 Z" />
+    <path
+       d="M 33.602081,1.8520838 V 6.6145834 H 38.36458 V 1.8520838 Z m 0.264583,0.2645833 h 4.233333 v 4.2333333 h -4.233333 z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1325" />
+    <path
+       id="path1327"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 60.060411,28.310415 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       d="m 54.768745,28.310415 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1329" />
+    <path
+       id="path1331"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 49.477079,28.310415 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       d="m 60.060411,23.018749 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1333" />
+    <path
+       id="path1336"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 54.768745,23.018749 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       d="m 49.477079,23.018749 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1338" />
+    <path
+       id="path1340"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 60.060411,17.727083 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       d="m 54.768745,17.727083 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1342" />
+    <path
+       id="path1344"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 49.477079,17.727083 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       d="m 44.185413,28.310415 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1346" />
+    <path
+       id="path1348"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 38.893747,28.310415 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 H 39.15833 Z" />
+    <path
+       d="m 33.602081,28.310415 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1350" />
+    <path
+       id="path1352"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 44.185413,23.018749 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       d="m 38.893747,23.018749 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 H 39.15833 Z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1354" />
+    <path
+       id="path1356"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 33.602081,23.018749 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       d="m 44.185413,17.727083 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1358" />
+    <path
+       id="path1361"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 38.893747,17.727083 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 H 39.15833 Z" />
+    <path
+       d="m 33.602081,17.727083 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1363" />
+    <path
+       id="path1365"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 60.060411,44.185413 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       d="m 54.768745,44.185413 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1367" />
+    <path
+       id="path1369"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 49.477079,44.185413 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       d="m 60.060411,38.893747 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1371" />
+    <path
+       id="path1373"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 54.768745,38.893747 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       d="m 49.477079,38.893747 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1375" />
+    <path
+       id="path1377"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 60.060411,33.602081 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       d="m 54.768745,33.602081 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1379" />
+    <path
+       id="path1381"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 49.477079,33.602081 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       d="m 44.185413,44.185413 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1383" />
+    <path
+       id="path1385"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 38.893747,44.185413 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 H 39.15833 Z" />
+    <path
+       d="m 33.602081,44.185413 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1389" />
+    <path
+       id="path1391"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 44.185413,38.893747 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       d="m 38.893747,38.893747 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 H 39.15833 Z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1393" />
+    <path
+       id="path1395"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 33.602081,38.893747 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       d="m 44.185413,33.602081 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1397" />
+    <path
+       id="path1399"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 38.893747,33.602081 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 H 39.15833 Z" />
+    <path
+       d="m 33.602081,33.602081 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1401" />
+    <path
+       d="m 60.060411,54.768745 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1411" />
+    <path
+       id="path1413"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 54.768745,54.768745 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       d="m 49.477079,54.768745 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1415" />
+    <path
+       id="path1417"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 60.060411,49.477079 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       d="m 54.768745,49.477079 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1419" />
+    <path
+       id="path1421"
+       style="opacity:0.547431;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 49.477079,49.477079 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       id="path1429"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 44.185413,54.768745 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       d="m 38.893747,54.768745 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 H 39.15833 Z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1431" />
+    <path
+       id="path1433"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 33.602081,54.768745 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z" />
+    <path
+       d="m 44.185413,49.477079 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1435" />
+    <path
+       id="path1437"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 38.893747,49.477079 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 H 39.15833 Z" />
+    <path
+       d="m 33.602081,49.477079 v 4.762499 h 4.762499 v -4.762499 z m 0.264583,0.264583 h 4.233333 v 4.233333 h -4.233333 z"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       id="path1439" />
+    <path
+       id="path1917"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="M 1.8520838,65.352077 V 78.581242 H 15.081249 V 65.352077 Z M 2.1166671,65.61666 H 14.816666 V 78.316659 H 2.1166671 Z"
+       sodipodi:nodetypes="cccccccccc" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1427"
+       transform="translate(15.874999)"
+       width="100%"
+       height="100%" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1429"
+       width="100%"
+       height="100%"
+       transform="translate(31.749997)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1431"
+       width="100%"
+       height="100%"
+       transform="translate(47.624995)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1433"
+       width="100%"
+       height="100%"
+       transform="translate(63.499993)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1435"
+       width="100%"
+       height="100%"
+       transform="translate(79.374991)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1437"
+       width="100%"
+       height="100%"
+       transform="translate(95.249989)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1439"
+       width="100%"
+       height="100%"
+       transform="translate(111.12498)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1441"
+       width="100%"
+       height="100%"
+       transform="translate(126.99996)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1443"
+       width="100%"
+       height="100%"
+       transform="translate(142.87494)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1445"
+       width="100%"
+       height="100%"
+       transform="translate(158.74992)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1447"
+       width="100%"
+       height="100%"
+       transform="translate(0,15.874999)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1449"
+       width="100%"
+       height="100%"
+       transform="translate(15.874999,15.874999)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1451"
+       width="100%"
+       height="100%"
+       transform="translate(31.749997,15.874999)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1453"
+       width="100%"
+       height="100%"
+       transform="translate(47.624995,15.874999)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1455"
+       width="100%"
+       height="100%"
+       transform="translate(63.499993,15.874999)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1457"
+       width="100%"
+       height="100%"
+       transform="translate(79.374991,15.874999)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1459"
+       width="100%"
+       height="100%"
+       transform="translate(95.249989,15.874999)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1461"
+       width="100%"
+       height="100%"
+       transform="translate(111.12498,15.874999)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1463"
+       transform="translate(126.99996,15.874999)"
+       width="100%"
+       height="100%" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1465"
+       width="100%"
+       height="100%"
+       transform="translate(142.87494,15.874999)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1467"
+       width="100%"
+       height="100%"
+       transform="translate(158.74992,15.874999)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1469"
+       width="100%"
+       height="100%"
+       transform="translate(0,31.749997)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1471"
+       width="100%"
+       height="100%"
+       transform="translate(15.874999,31.749997)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1473"
+       transform="translate(31.749997,31.749997)"
+       width="100%"
+       height="100%" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1475"
+       width="100%"
+       height="100%"
+       transform="translate(47.624995,31.749997)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1477"
+       width="100%"
+       height="100%"
+       transform="translate(63.499993,31.749997)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1479"
+       width="100%"
+       height="100%"
+       transform="translate(79.374991,31.749997)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1481"
+       width="100%"
+       height="100%"
+       transform="translate(95.249989,31.749997)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1483"
+       width="100%"
+       height="100%"
+       transform="translate(111.12498,31.749997)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1485"
+       width="100%"
+       height="100%"
+       transform="translate(126.99996,31.749997)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1487"
+       width="100%"
+       height="100%"
+       transform="translate(142.87494,31.749997)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1489"
+       width="100%"
+       height="100%"
+       transform="translate(0,47.624995)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1491"
+       width="100%"
+       height="100%"
+       transform="translate(15.874999,47.624995)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1493"
+       width="100%"
+       height="100%"
+       transform="translate(31.749997,47.624995)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1495"
+       width="100%"
+       height="100%"
+       transform="translate(0,63.499993)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1497"
+       width="100%"
+       height="100%"
+       transform="translate(15.874999,63.499993)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1499"
+       width="100%"
+       height="100%"
+       transform="translate(31.749997,63.499993)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1501"
+       transform="translate(47.624995,47.624995)"
+       width="100%"
+       height="100%" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1503"
+       width="100%"
+       height="100%"
+       transform="translate(63.499993,47.624995)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1505"
+       width="100%"
+       height="100%"
+       transform="translate(79.374991,47.624995)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1543"
+       transform="translate(95.249989,47.624995)"
+       width="100%"
+       height="100%" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1545"
+       transform="translate(111.12498,47.624995)"
+       width="100%"
+       height="100%" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1547"
+       width="100%"
+       height="100%"
+       transform="translate(126.99996,47.624995)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1549"
+       width="100%"
+       height="100%"
+       transform="translate(142.87494,47.624995)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1551"
+       width="100%"
+       height="100%"
+       transform="translate(158.74992,47.624995)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1553"
+       width="100%"
+       height="100%"
+       transform="translate(158.74992,31.749997)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1555"
+       width="100%"
+       height="100%"
+       transform="translate(174.6249,47.624995)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1557"
+       width="100%"
+       height="100%"
+       transform="translate(190.49988,47.624995)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1559"
+       width="100%"
+       height="100%"
+       transform="translate(206.37486,47.624995)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1561"
+       width="100%"
+       height="100%"
+       transform="translate(222.24984,47.624995)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1563"
+       width="100%"
+       height="100%"
+       transform="translate(238.12482,47.624995)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1565"
+       width="100%"
+       height="100%"
+       transform="translate(253.9998,47.624995)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1567"
+       width="100%"
+       height="100%"
+       transform="translate(269.87478,47.624995)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path1917"
+       id="use1569"
+       width="100%"
+       height="100%"
+       transform="translate(285.74976,47.624995)" />
+  </g>
+  <g
+     style="display:inline"
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="16icons"
+     transform="translate(13.758332,50.249943)">
+    <rect
+       style="fill:#31363b;fill-opacity:1;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#000000"
+       id="rect2450"
+       width="716.62445"
+       height="620.98468"
+       x="-817.56665"
+       y="-192.98071" />
+    <g
+       id="list-added"
+       inkscape:label="list-added"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1362"
+         width="4.2333331"
+         height="4.2333331"
+         x="2.1166692"
+         y="2.1166668"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1434"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2496);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 3.9687511,2.6458331 v 1.322917 h -1.322916 v 0.529167 h 1.322916 v 1.3229163 h 0.529167 V 4.4979171 H 5.8208354 V 3.9687501 H 4.4979181 v -1.322917 z" />
+    </g>
+    <g
+       id="list-base"
+       inkscape:label="list-base"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         inkscape:label="FRAME"
+         y="2.1166666"
+         x="7.4083333"
+         height="4.2333331"
+         width="4.2333331"
+         id="rect933"
+         style="opacity:0;fill:url(#linearGradient2265);fill-opacity:1;stroke:none;stroke-width:1.00012;stroke-miterlimit:4;stroke-dasharray:none" />
+      <path
+         d="M 8.4666703,3.175 V 5.2916666 H 10.583339 V 3.175 Z M 8.7312536,3.4395833 H 10.318756 V 5.0270832 H 8.7312536 Z"
+         style="fill:url(#linearGradient2269);fill-opacity:1;stroke:none;stroke-width:1.00012;stroke-miterlimit:4;stroke-dasharray:none"
+         id="path922"
+         sodipodi:nodetypes="cccccccccc" />
+      <path
+         id="rect913"
+         style="fill:url(#linearGradient2267);fill-opacity:1;stroke:none;stroke-width:1.00012;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 7.9375036,2.6458333 v 3.175 h 3.1750024 v -3.175 z M 8.2020869,2.9104166 H 10.847923 V 5.5562499 H 8.2020869 Z" />
+    </g>
+    <g
+       id="list-modified"
+       inkscape:label="list-modified"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         inkscape:label="frame"
+         style="font-variation-settings:normal;opacity:0;vector-effect:none;fill:url(#linearGradient2275);fill-opacity:1;stroke:none;stroke-width:0.999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect935"
+         width="4.2333331"
+         height="4.2333331"
+         x="12.7"
+         y="2.1166666" />
+      <path
+         id="path924"
+         style="font-variation-settings:normal;vector-effect:none;fill:url(#linearGradient2277);fill-opacity:1;stroke:none;stroke-width:0.999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+         d="m 14.816666,2.6458333 a 1.5874996,1.5874997 0 0 0 -1.587499,1.5875 1.5874996,1.5874997 0 0 0 1.587499,1.5875 1.5874996,1.5874997 0 0 0 1.5875,-1.5875 1.5874996,1.5874997 0 0 0 -1.5875,-1.5875 z M 14.800646,3.175 a 1.0583329,1.058333 0 0 1 0.01602,0 A 1.0583329,1.058333 0 0 1 15.875,4.2333333 1.0583329,1.058333 0 0 1 14.816666,5.2916666 1.0583329,1.058333 0 0 1 13.758333,4.2333333 1.0583329,1.058333 0 0 1 14.800647,3.175 Z" />
+    </g>
+    <g
+       id="list-removed"
+       inkscape:label="list-removed"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:url(#linearGradient3113);fill-opacity:1;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1356"
+         width="4.2333331"
+         height="4.2333331"
+         x="17.991665"
+         y="2.1166668"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1436"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient6466);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 18.520834,3.9687501 v 0.529167 h 3.175 v -0.529167 z"
+         sodipodi:nodetypes="ccccc" />
+    </g>
+    <g
+       id="record-add"
+       inkscape:label="record-add"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1354"
+         width="4.2333331"
+         height="4.2333331"
+         x="23.283337"
+         y="2.1166668"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="rect1113"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2498);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 25.135416,2.6458331 v 1.322917 H 23.8125 v 0.529167 h 1.322916 v 1.3229163 h 0.529167 V 4.4979171 H 26.9875 v -0.529167 h -1.322917 v -1.322917 z" />
+    </g>
+    <g
+       id="record-clone"
+       inkscape:label="record-clone"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1352"
+         width="4.2333331"
+         height="4.2333331"
+         x="28.575001"
+         y="2.1166668"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="rect1120"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2422);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 28.839583,2.1166671 v 3.7041663 h 1.058333 v -0.264583 h -0.79375 V 2.3812501 H 31.75 v 0.529167 h 0.264583 v -0.79375 z"
+         sodipodi:nodetypes="ccccccccccc" />
+      <path
+         id="path1127"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2184);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 29.897916,2.9104171 v 3.4395833 h 1.322917 V 6.0854164 H 30.1625 V 3.1750001 h 2.116666 V 5.0270834 H 32.54375 V 2.9104171 Z"
+         sodipodi:nodetypes="ccccccccccc" />
+      <path
+         id="rect1137"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2500);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 31.75,5.0270834 v 0.529167 h -0.529167 v 0.264583 H 31.75 v 0.529167 h 0.264583 v -0.529167 h 0.529167 v -0.264583 h -0.529167 v -0.529167 z" />
+    </g>
+    <g
+       id="record-delete"
+       inkscape:label="record-delete"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1350"
+         width="4.2333331"
+         height="4.2333331"
+         x="33.866673"
+         y="2.1166668"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1144"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2537);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 34.395832,3.9687501 v 0.529167 h 3.175 v -0.529167 z"
+         sodipodi:nodetypes="ccccc" />
+    </g>
+    <g
+       id="record-preview"
+       inkscape:label="record-preview"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1348"
+         width="4.2333331"
+         height="4.2333331"
+         x="39.158333"
+         y="2.1166668"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1160"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2424);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 41.261561,3.4395861 a 0.79374999,0.79375052 0 0 0 -0.780314,0.79375 0.79374999,0.79375052 0 0 0 0.79375,0.7937503 0.79374999,0.79375052 0 0 0 0.79375,-0.7937503 0.79374999,0.79375052 0 0 0 -0.79375,-0.79375 0.79374999,0.79375052 0 0 0 -0.01344,0 z m 5.29e-4,0.264583 a 0.52916663,0.52916663 0 0 1 0.01291,0 0.52916663,0.52916663 0 0 1 0.529167,0.529167 A 0.52916663,0.52916663 0 0 1 41.275,4.7625024 0.52916663,0.52916663 0 0 1 40.745833,4.2333361 0.52916663,0.52916663 0 0 1 41.262081,3.7041691 Z" />
+      <path
+         id="ellipse1162"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2426);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 41.274997,3.8364611 a 0.396875,0.396875 0 0 0 -0.396875,0.396875 0.396875,0.396875 0 0 0 0.396875,0.396875 0.396875,0.396875 0 0 0 0.396875,-0.396875 0.396875,0.396875 0 0 0 0,-0.0083 0.27667566,0.27667566 0 0 1 -0.218591,0.106452 0.27667566,0.27667566 0 0 1 -0.276469,-0.276468 0.27667566,0.27667566 0 0 1 0.10697,-0.218075 0.396875,0.396875 0 0 0 -0.0088,-5.29e-4 z" />
+      <path
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2428);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 41.274998,3.1750021 v 0.319409 c 0.861767,0 1.44543,0.520557 1.5875,0.738924 h 0.264583 c -0.213105,-0.491985 -0.995246,-1.058333 -1.852083,-1.058333 z"
+         id="path1177"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2430);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 41.274997,3.1750021 v 0.319409 c -0.861767,0 -1.44543,0.520557 -1.5875,0.738924 h -0.264583 c 0.213105,-0.491985 0.995246,-1.058333 1.852083,-1.058333 z"
+         id="path1179"
+         sodipodi:nodetypes="ccccc" />
+    </g>
+    <g
+       id="record-revert"
+       inkscape:label="record-revert"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1346"
+         width="4.2333331"
+         height="4.2333331"
+         x="44.450001"
+         y="2.1166668"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1265"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2432);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 45.243747,3.4395861 v 0.264583 h 1.455208 c 0.511439,0 0.926042,0.414602 0.926042,0.926042 0,0.5114393 -0.414603,0.9260413 -0.926042,0.9260413 H 46.30208 v 0.264584 h 0.396875 c 0.657564,0 1.190625,-0.533062 1.190625,-1.1906253 0,-0.657564 -0.533061,-1.190625 -1.190625,-1.190625 z"
+         sodipodi:nodetypes="ccsssccsssc" />
+      <path
+         id="path1284"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2434);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 45.96515,2.6458361 -0.975651,0.926041 0.975651,0.926042 0.12299,-0.181901 -0.65009,-0.611849 v -0.264583 l 0.65009,-0.611849 z"
+         sodipodi:nodetypes="cccccccc" />
+    </g>
+    <g
+       id="record-next"
+       inkscape:label="record-next"
+       transform="translate(-47.624995)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="font-variation-settings:normal;opacity:0;vector-effect:none;fill:#e66100;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect6764"
+         width="4.2333331"
+         height="4.2333331"
+         x="49.741665"
+         y="7.4083338"
+         rx="2.8318619e-14"
+         inkscape:label="frame" />
+      <path
+         id="path6766"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient6770);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="M 186.2207,24.220703 C 186.09149,24.184168 186,24.274642 186,24.46875 v 8.931641 c 0,0.331351 0.20639,0.426988 0.46094,0.214843 l 5.17968,-4.314453 c 0.19881,-0.165685 0.19881,-0.435875 0,-0.601562 l -5.28124,-4.398438 c -0.0497,-0.04142 -0.0956,-0.0679 -0.13868,-0.08008 z m 0.78321,1.916016 3.43164,2.865234 -3.43164,2.855469 z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    </g>
+    <g
+       id="record-previous"
+       transform="rotate(180,30.691659,9.5250004)"
+       inkscape:label="record-previous"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="font-variation-settings:normal;opacity:0;vector-effect:none;fill:#e66100;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect6772"
+         width="4.2333331"
+         height="4.2333331"
+         x="49.741665"
+         y="7.4083338"
+         rx="2.8318619e-14"
+         inkscape:label="frame" />
+      <path
+         id="path6774"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient6778);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="M 186.2207,24.220703 C 186.09149,24.184168 186,24.274642 186,24.46875 v 8.931641 c 0,0.331351 0.20639,0.426988 0.46094,0.214843 l 5.17968,-4.314453 c 0.19881,-0.165685 0.19881,-0.435875 0,-0.601562 l -5.28124,-4.398438 c -0.0497,-0.04142 -0.0956,-0.0679 -0.13868,-0.08008 z m 0.78321,1.916016 3.43164,2.865234 -3.43164,2.855469 z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    </g>
+    <g
+       id="record-up"
+       transform="rotate(-90,33.337493,28.045838)"
+       inkscape:label="record-up"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="font-variation-settings:normal;opacity:0;vector-effect:none;fill:#e66100;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect6756"
+         width="4.2333331"
+         height="4.2333331"
+         x="49.741665"
+         y="7.4083338"
+         rx="2.8318619e-14"
+         inkscape:label="frame" />
+      <path
+         id="path6695"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient6788);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="M 186.2207,24.220703 C 186.09149,24.184168 186,24.274642 186,24.46875 v 8.931641 c 0,0.331351 0.20639,0.426988 0.46094,0.214843 l 5.17968,-4.314453 c 0.19881,-0.165685 0.19881,-0.435875 0,-0.601562 l -5.28124,-4.398438 c -0.0497,-0.04142 -0.0956,-0.0679 -0.13868,-0.08008 z m 0.78321,1.916016 3.43164,2.865234 -3.43164,2.855469 z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    </g>
+    <g
+       id="record-down"
+       transform="rotate(90,35.983327,-6.35)"
+       inkscape:label="record-down"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="font-variation-settings:normal;opacity:0;vector-effect:none;fill:#e66100;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect6780"
+         width="4.2333331"
+         height="4.2333331"
+         x="49.741665"
+         y="7.4083338"
+         rx="2.8318619e-14"
+         inkscape:label="frame" />
+      <path
+         id="path6782"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient6786);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="M 186.2207,24.220703 C 186.09149,24.184168 186,24.274642 186,24.46875 v 8.931641 c 0,0.331351 0.20639,0.426988 0.46094,0.214843 l 5.17968,-4.314453 c 0.19881,-0.165685 0.19881,-0.435875 0,-0.601562 l -5.28124,-4.398438 c -0.0497,-0.04142 -0.0956,-0.0679 -0.13868,-0.08008 z m 0.78321,1.916016 3.43164,2.865234 -3.43164,2.855469 z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    </g>
+    <g
+       id="activator"
+       inkscape:label="activator"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1388"
+         width="4.2333331"
+         height="4.2333331"
+         x="2.1166692"
+         y="12.7"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1591"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2320);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 4.2333336,13.229167 a 1.5875001,1.5874996 0 0 0 -1.5875001,1.5875 1.5875001,1.5874996 0 0 0 1.5875001,1.5875 1.5875001,1.5874996 0 0 0 1.5874998,-1.5875 1.5875001,1.5874996 0 0 0 -1.5874998,-1.5875 z m 0,0.264583 A 1.3229167,1.3229167 0 0 1 5.5562504,14.816667 1.3229167,1.3229167 0 0 1 4.2333336,16.139583 1.3229167,1.3229167 0 0 1 2.9104169,14.816667 1.3229167,1.3229167 0 0 1 4.2333336,13.49375 Z" />
+      <path
+         id="path1598"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2322);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="M 4.2173138,13.758333 A 1.0583334,1.0583334 0 0 0 3.1750002,14.816667 1.0583334,1.0583334 0 0 0 4.2333336,15.875 1.0583334,1.0583334 0 0 0 5.2916674,14.816667 1.0583334,1.0583334 0 0 0 4.2333336,13.758333 a 1.0583334,1.0583334 0 0 0 -0.016021,0 z m 0.00259,0.264584 a 0.79374999,0.79374999 0 0 1 0.013427,0 0.79374999,0.79374999 0 0 1 0.7937496,0.79375 0.79374999,0.79374999 0 0 1 -0.7937496,0.79375 0.79374999,0.79374999 0 0 1 -0.7937501,-0.79375 0.79374999,0.79374999 0 0 1 0.7803143,-0.79375 z" />
+      <path
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2324);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 5.6885424,14.2875 v 0.264584 h 0.396875 v 0.529166 h -0.396875 v 0.264584 c 0,0 0.264583,0 0.396875,0 0.264583,0 0.264583,0 0.264583,-0.264584 0,-0.176389 0,-0.529166 0,-0.529166 0,-0.264584 0,-0.264584 -0.264583,-0.264584 z"
+         id="path1605"
+         sodipodi:nodetypes="ccccccssssc"
+         inkscape:transform-center-x="-1.7859378" />
+      <path
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2326);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 5.1862854,16.037131 -0.251634,0.08176 0.122641,0.377451 -0.5032668,0.163521 -0.1226411,-0.377451 -0.2516344,0.08176 c 0,0 0.081761,0.251634 0.1226411,0.377451 0.081761,0.251633 0.081761,0.251633 0.333395,0.169872 0.1677562,-0.05451 0.5032672,-0.163521 0.5032672,-0.163521 0.251634,-0.08176 0.251634,-0.08176 0.169873,-0.333394 z"
+         id="path1607"
+         sodipodi:nodetypes="ccccccssssc"
+         inkscape:transform-center-x="-0.53530048"
+         inkscape:transform-center-y="1.6819418" />
+      <path
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2328);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="M 3.3670817,16.100122 3.2115641,15.886069 2.890485,16.119347 2.5794493,15.691242 2.9005284,15.457965 2.7450107,15.243911 c 0,0 -0.2140526,0.155519 -0.321079,0.233278 -0.2140517,0.155518 -0.2140517,0.155518 -0.058533,0.369571 0.1036816,0.142701 0.3110358,0.428104 0.3110358,0.428104 0.1555176,0.214053 0.1555176,0.214053 0.3695702,0.05853 z"
+         id="path1609"
+         sodipodi:nodetypes="ccccccssssc"
+         inkscape:transform-center-x="1.422191"
+         inkscape:transform-center-y="1.0270848" />
+      <path
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2330);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="M 2.7450088,14.389422 2.9005278,14.17537 2.5794483,13.942092 2.890485,13.513988 3.2115635,13.747266 3.3670834,13.533213 c 0,0 -0.2140533,-0.155518 -0.3210794,-0.233277 C 2.8319519,13.144419 2.8319519,13.144419 2.6764334,13.358476 2.572756,13.50118 2.3653976,13.78658 2.3653976,13.78658 c -0.1555189,0.214052 -0.1555189,0.214052 0.058538,0.369569 z"
+         id="path1611"
+         sodipodi:nodetypes="ccccccssssc"
+         inkscape:transform-center-x="1.4221905"
+         inkscape:transform-center-y="-1.0270846" />
+      <path
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2332);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 4.1797501,13.26916 0.2516335,0.08176 0.1226416,-0.377452 0.5032662,0.163522 -0.122641,0.377451 0.251634,0.08176 c 0,0 0.08176,-0.251634 0.122641,-0.377451 0.08176,-0.251633 0.08176,-0.251633 -0.169878,-0.333393 -0.167758,-0.0545 -0.5032668,-0.163521 -0.5032668,-0.163521 -0.2516336,-0.08176 -0.2516336,-0.08176 -0.3333918,0.169876 z"
+         id="path1613"
+         sodipodi:nodetypes="ccccccssssc"
+         inkscape:transform-center-x="-0.53529952"
+         inkscape:transform-center-y="-1.6819439" />
+    </g>
+    <g
+       id="apparatus"
+       inkscape:label="apparatus"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1386"
+         width="4.2333331"
+         height="4.2333331"
+         x="7.4083323"
+         y="12.7"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1548"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2316);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 7.4083332,14.2875 c 0,1.058334 10e-8,1.852084 0.7937501,2.116667 v 0.529166 h 2.6458337 v -0.529166 c 0.79375,-0.264583 0.79375,-1.058333 0.79375,-2.116667 z m 0.2645835,0.264583 h 3.7041663 c -0.0043,0.391937 -0.02302,0.776349 -0.08992,1.021643 -0.08422,0.308823 -0.201392,0.472102 -0.522965,0.579293 -0.108066,0.03605 -0.180927,0.0049 -0.180868,0.118856 V 16.66875 H 8.4666666 l 10e-8,-0.396875 c 5.96e-5,-0.113922 -0.072801,-0.0828 -0.1808676,-0.118856 C 7.9642258,16.045828 7.847058,15.882549 7.7628336,15.573726 7.6959349,15.328432 7.6772196,14.94402 7.6729167,14.552083 Z"
+         sodipodi:nodetypes="cccccccccsccccccsc" />
+      <path
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2318);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 8.0303333,14.440792 c 0,0 -0.2549422,-0.503321 -0.5872624,-1.214834 -0.051288,-0.109811 0.072913,-0.283564 0.1805731,-0.367422 0.1272316,-0.0991 0.335854,-0.186629 0.4261393,-0.102012 0.6564188,0.615209 1.7330335,1.691503 1.7330335,1.691503 l -0.443406,-0.08626 c 0,0 -0.8603506,-0.879948 -1.300715,-1.309642 -0.1226325,-0.119661 -0.3779304,0.08975 -0.3032537,0.272244 0.1220055,0.29815 0.5843882,1.043318 0.5843882,1.043318 z"
+         id="path1575"
+         sodipodi:nodetypes="csssccsscc" />
+    </g>
+    <g
+       id="armor"
+       inkscape:label="armor"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1384"
+         width="4.2333331"
+         height="4.2333331"
+         x="12.700003"
+         y="12.7"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1648"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2334);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 12.7,12.7 c -10e-7,2.645834 0.529166,3.307291 1.984375,4.233333 0.07443,0.04731 0.190154,0.04731 0.264584,0 1.455208,-0.926042 1.984375,-1.587499 1.984375,-4.233333 z m 0.264584,0.264583 h 3.704166 c 0,1.984375 -0.463021,2.869609 -1.736328,3.673161 -0.06513,0.04105 -0.16638,0.04105 -0.23151,0 -1.273308,-0.803552 -1.736328,-1.688786 -1.736328,-3.673161 z" />
+      <path
+         id="path1653"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2336);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 14.816667,16.404167 c 1.364557,-0.881951 1.49242,-1.658193 1.5875,-3.175 h -1.5875 -1.5875 c 0.09508,1.516807 0.222943,2.293049 1.5875,3.175 z m 0,-2.910417 h 1.30638 c -0.115736,1.322698 -0.265299,1.809261 -1.30638,2.588086 -1.041081,-0.778825 -1.190644,-1.265388 -1.30638,-2.588086 z"
+         sodipodi:nodetypes="cccccccc" />
+    </g>
+    <g
+       id="book"
+       inkscape:label="book"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1382"
+         width="4.2333331"
+         height="4.2333331"
+         x="17.991665"
+         y="12.7"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1701"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2338);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 20.108334,13.493751 h -0.264583 c -0.631361,-0.523199 -1.676055,-0.176816 -1.852084,0.264583 l 0.04547,0.264583 c 0.176029,-0.441399 1.167806,-0.797084 1.806609,-0.264583 h 0.264583 z"
+         sodipodi:nodetypes="ccccccc" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2340);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         id="rect1714"
+         width="0.5291667"
+         height="2.3812501"
+         x="19.84375"
+         y="13.626042" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2342);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         id="rect1716"
+         width="0.26458335"
+         height="2.3812501"
+         x="17.991667"
+         y="13.758333" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2344);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         id="rect1718"
+         width="0.26458335"
+         height="2.3812501"
+         x="21.960417"
+         y="13.758333" />
+      <path
+         id="path1736"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2346);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 20.108334,15.345832 h -0.264583 c -0.631361,-0.523199 -1.676055,-0.176816 -1.852084,0.264583 l 0.04547,0.264583 c 0.176029,-0.441399 1.167806,-0.797084 1.806609,-0.264583 h 0.264583 z"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         id="path1738"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2348);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 20.108334,15.874998 h -0.264583 c -0.631361,-0.523199 -1.676055,-0.176816 -1.852084,0.264583 l 0.04547,0.264583 c 0.176029,-0.441399 1.167806,-0.797084 1.806609,-0.264583 h 0.264583 z"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         id="path1740"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2350);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 20.108331,13.493751 h 0.264583 c 0.631361,-0.523199 1.676055,-0.176816 1.852084,0.264583 l -0.04547,0.264583 c -0.176029,-0.441399 -1.167806,-0.797084 -1.806609,-0.264583 h -0.264583 z"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         id="path1742"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2352);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 20.108331,15.874998 h 0.264583 c 0.631361,-0.523199 1.676055,-0.176816 1.852084,0.264583 l -0.04547,0.264583 C 22.003499,15.962765 21.011722,15.60708 20.372919,16.139581 h -0.264583 z"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         id="path1744"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2354);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 20.108331,15.345832 h 0.264583 c 0.631361,-0.523199 1.676055,-0.176816 1.852084,0.264583 l -0.04547,0.264583 c -0.176029,-0.441399 -1.167806,-0.797084 -1.806609,-0.264583 h -0.264583 z"
+         sodipodi:nodetypes="ccccccc" />
+    </g>
+    <g
+       id="clothing"
+       inkscape:label="clothing"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1380"
+         width="4.2333331"
+         height="4.2333331"
+         x="23.283337"
+         y="12.7"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="rect923"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2356);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 24.077084,14.022917 v 2.645833 h 2.645833 V 14.022917 H 26.458334 V 15.875 h -2.116667 v -1.852083 z m 0.264583,2.116666 h 2.116667 v 0.264584 h -2.116667 z"
+         sodipodi:nodetypes="cccccccccccccc" />
+      <path
+         id="rect939"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2358);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 24.232113,12.964583 -0.948779,0.94878 V 14.2875 l 0.79375,0.79375 0.187068,-0.187069 -0.716235,-0.716235 v -0.155029 l 0.79375,-0.79375 h 2.116667 l 0.79375,0.79375 v 0.155029 l -0.716235,0.716235 0.187068,0.187069 0.79375,-0.79375 v -0.374137 l -0.948779,-0.94878 z"
+         sodipodi:nodetypes="ccccccccccccccccc" />
+      <path
+         id="rect941"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2360);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 24.606251,13.229167 c 0,0.293158 0.236008,0.529166 0.529166,0.529166 h 0.529167 c 0.293159,0 0.529167,-0.236008 0.529167,-0.529166 -0.264584,0 -0.264584,0 -0.264584,0 0,0.14658 -0.118004,0.264583 -0.264583,0.264583 h -0.529167 c -0.146579,0 -0.264583,-0.118003 -0.264583,-0.264583 0,0 0,0 -0.264583,0 z"
+         sodipodi:nodetypes="csscssssc" />
+    </g>
+    <g
+       id="container"
+       inkscape:label="container"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1378"
+         width="4.2333331"
+         height="4.2333331"
+         x="28.575001"
+         y="12.7"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path984"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2362);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 29.633334,12.7 v 0.264583 c 0,0.426244 0.264583,0.08279 0.264583,0.529167 -0.715613,0.463044 -1.37628,1.653273 0,3.439583 h 1.5875 c 1.376281,-1.78631 0.715614,-2.976539 0,-3.439583 0,-0.446376 0.264584,-0.102923 0.264584,-0.529167 V 12.7 Z m 0.264583,0.264583 h 1.5875 c -0.07834,0.100665 -0.264583,0.264582 -0.264583,0.79375 0.718095,0.381372 1.301385,1.237143 0.14056,2.910417 h -1.339453 c -1.160825,-1.673274 -0.577535,-2.529045 0.14056,-2.910417 0,-0.529168 -0.186243,-0.693085 -0.264584,-0.79375 z"
+         sodipodi:nodetypes="csccccsccccccccc" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2364);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         id="rect1003"
+         width="1.3229167"
+         height="0.26458335"
+         x="30.030209"
+         y="13.229167"
+         rx="3.6718346e-17" />
+    </g>
+    <g
+       id="creature"
+       inkscape:label="creature"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1376"
+         width="4.2333331"
+         height="4.2333331"
+         x="33.866673"
+         y="12.7"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1055"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2366);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 34.337953,14.010515 c -0.468809,0.463228 -0.471289,1.108824 -0.471289,1.518254 0,0.612415 0.731447,1.139982 1.5875,1.139982 h 1.058333 c 0.856053,0 1.5875,-0.527567 1.5875,-1.139982 0,-0.40943 -0.0025,-1.055026 -0.471289,-1.518254 l -0.202572,0.209806 c 0.357187,0.264171 0.409277,0.911565 0.409277,1.308448 0,0.47278 -0.688493,0.875398 -1.322916,0.875398 h -1.058333 c -0.634424,0 -1.322917,-0.402618 -1.322917,-0.875398 0,-0.396883 0.05209,-1.044277 0.409277,-1.308448 z"
+         sodipodi:nodetypes="cssssccsssscc" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2368);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         id="rect1057"
+         width="3.7041667"
+         height="0.26458335"
+         x="34.131252"
+         y="15.610417"
+         rx="3.6718346e-17" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2370);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         id="rect1059"
+         width="0.26458335"
+         height="0.26458335"
+         x="35.454166"
+         y="14.816667"
+         rx="3.6718346e-17" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2372);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         id="rect1061"
+         width="0.26458335"
+         height="0.26458335"
+         x="36.247917"
+         y="14.816667"
+         rx="3.6718346e-17" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2374);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         id="rect1063"
+         width="0.79375005"
+         height="0.26458335"
+         x="35.58646"
+         y="13.493751"
+         rx="3.6718346e-17" />
+      <path
+         id="rect1065"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2376);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 34.924997,13.493752 h 0.264583 v 0 0.529166 0 h -0.529166 v 0 0 -0.264584 c 0,-0.264583 0.264583,-0.264582 0.264583,-0.264582 z"
+         sodipodi:nodetypes="cccccccccc" />
+      <path
+         id="path1068"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2378);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 37.041663,13.493751 h 0.264584 v 0 0.529166 0 H 36.77708 v 0 0 -0.264584 c 0,-0.264583 0.264583,-0.264582 0.264583,-0.264582 z"
+         sodipodi:nodetypes="cccccccccc" />
+      <path
+         id="path1070"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2380);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 34.911561,12.964584 a 0.79375005,0.79375005 0 0 0 -0.780314,0.79375 0.79375005,0.79375005 0 0 0 0.79375,0.79375 0.79375005,0.79375005 0 0 0 0.79375,-0.79375 0.79375005,0.79375005 0 0 0 -0.79375,-0.79375 0.79375005,0.79375005 0 0 0 -0.01344,0 z m 5.16e-4,0.264583 a 0.52916671,0.52916671 0 0 1 0.01292,0 0.52916671,0.52916671 0 0 1 0.529167,0.529167 0.52916671,0.52916671 0 0 1 -0.529167,0.529167 0.52916671,0.52916671 0 0 1 -0.529167,-0.529167 0.52916671,0.52916671 0 0 1 0.516247,-0.529167 z" />
+      <path
+         id="path1077"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2382);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 37.028227,12.964584 a 0.79375005,0.79375005 0 0 0 -0.780313,0.79375 0.79375005,0.79375005 0 0 0 0.793749,0.79375 0.79375005,0.79375005 0 0 0 0.79375,-0.79375 0.79375005,0.79375005 0 0 0 -0.79375,-0.79375 0.79375005,0.79375005 0 0 0 -0.01344,0 z m 5.16e-4,0.264584 a 0.52916671,0.52916671 0 0 1 0.01292,0 0.52916671,0.52916671 0 0 1 0.529167,0.529166 0.52916671,0.52916671 0 0 1 -0.529167,0.529167 0.52916671,0.52916671 0 0 1 -0.529166,-0.529167 0.52916671,0.52916671 0 0 1 0.516246,-0.529166 z" />
+    </g>
+    <g
+       id="door"
+       inkscape:label="door"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1374"
+         width="4.2333331"
+         height="4.2333331"
+         x="39.158333"
+         y="12.7"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1081"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2314);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 41.274996,12.699973 c -0.876752,0 -1.5875,0.710748 -1.5875,1.5875 v 2.645833 h 3.175 v -2.645833 c 0,-0.876752 -0.710747,-1.5875 -1.5875,-1.5875 z m 0,0.264584 c 0.730626,0 1.322917,0.59229 1.322917,1.322916 v 2.38125 H 42.33333 v -2.38125 c 0,-0.584504 -0.473824,-1.058337 -1.058334,-1.058333 -0.584509,1e-6 -1.058333,0.473833 -1.058333,1.058333 v 2.38125 H 39.95208 v -2.38125 c 0,-0.730626 0.592291,-1.322916 1.322916,-1.322916 z m 0,0.529166 c 0.438381,0 0.79375,0.355374 0.79375,0.79375 v 2.38125 h -1.5875 v -2.38125 c 0,-0.438376 0.35537,-0.79375 0.79375,-0.79375 z m 0.264584,1.322917 v 0.529166 h 0.264583 V 14.81664 Z" />
+    </g>
+    <g
+       id="ingredient"
+       inkscape:label="ingredient"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1372"
+         width="4.2333331"
+         height="4.2333331"
+         x="44.450001"
+         y="12.7"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1112"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2298);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 48.418746,12.964584 c -1.243361,0 -3.934467,0.829085 -3.713469,3.444234 0,0 0.0093,0.206234 0.0093,0.259933 1.746944,0.368331 3.70417,-0.757662 3.70417,-3.439584 z m -0.264584,0.301274 v 0.227893 c -0.08419,1.366455 -0.965018,3.114878 -3.117122,2.89388 -0.0056,-0.0537 -0.02274,-0.24753 -0.02274,-0.24753 -0.09471,-1.767988 1.8965,-2.874243 3.13986,-2.874243 z" />
+      <path
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2302);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 44.735297,16.384216 c -0.05833,0.02461 0.182844,0.256314 0.213106,0.242046 0.297543,-0.140285 0.537168,-0.305529 0.823482,-0.678781 0.554949,-0.723455 0.71781,-1.153972 1.458122,-1.692275 -0.606594,0.103773 -1.03702,0.826593 -1.654857,1.499632 -0.31705,0.345377 -0.67329,0.559102 -0.839853,0.629378 z"
+         id="path1110"
+         sodipodi:nodetypes="ssscss" />
+    </g>
+    <g
+       id="levelled-item"
+       inkscape:label="levelled-item"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1366"
+         width="4.2333331"
+         height="4.2333331"
+         x="49.741661"
+         y="12.7"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1268"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2386);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 50.799997,12.700001 v 0.264583 c 0,0.426244 0.264584,0.08279 0.264584,0.529167 -0.715614,0.463044 -1.376281,1.653273 0,3.439583 h 1.5875 c 1.37628,-1.78631 0.715613,-2.976539 0,-3.439583 0,-0.446376 0.264583,-0.102923 0.264583,-0.529167 v -0.264583 z m 0.264584,0.264583 h 1.5875 c -0.07834,0.100665 -0.264584,0.264582 -0.264584,0.79375 0.718095,0.381372 1.301385,1.237143 0.14056,2.910417 h -1.339453 c -1.160825,-1.673274 -0.577535,-2.529045 0.14056,-2.910417 0,-0.529168 -0.186243,-0.693085 -0.264583,-0.79375 z"
+         sodipodi:nodetypes="csccccsccccccccc" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2388);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         id="rect1270"
+         width="1.3229167"
+         height="0.26458335"
+         x="51.196869"
+         y="13.229168"
+         rx="3.6718346e-17" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2390);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         id="rect1272"
+         width="0.52916592"
+         height="0.52916592"
+         x="51.593742"
+         y="15.875001"
+         rx="3.6718346e-17" />
+      <path
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2392);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 51.103855,14.60128 c 0.04683,-0.486828 0.48153,-0.608541 0.742487,-0.608541 0.423486,0 0.749721,0.25405 0.749721,0.597173 0,0.305097 -0.365143,0.532309 -0.398764,0.563022 -0.125992,0.115091 -0.211803,0.11424 -0.235615,0.45459 H 51.60677 c -0.01585,-0.340026 0.05156,-0.493476 0.342308,-0.697632 0.07527,-0.05285 0.259652,-0.174733 0.259652,-0.338584 0,-0.186634 -0.156674,-0.280913 -0.347088,-0.280913 -0.190414,0 -0.340407,0.129816 -0.388814,0.360908 z"
+         id="path1278"
+         sodipodi:nodetypes="cccsccsszcc" />
+    </g>
+    <g
+       id="levelled-creature"
+       inkscape:label="levelled-creature"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1412"
+         width="4.2333331"
+         height="4.2333331"
+         x="2.1166692"
+         y="17.991667"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1335"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2396);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 2.5879557,19.302182 c -0.4688086,0.463228 -0.4712891,1.108823 -0.4712891,1.518253 0,0.612416 0.7314471,1.139983 1.5875001,1.139983 H 4.7625 c 0.8560531,0 1.5875001,-0.527567 1.5875001,-1.139983 0,-0.40943 -0.00249,-1.055025 -0.4712891,-1.518253 l -0.2025716,0.209806 c 0.3571872,0.26417 0.4092773,0.911564 0.4092773,1.308447 0,0.47278 -0.6884932,0.875399 -1.3229167,0.875399 H 3.7041667 c -0.6344236,0 -1.3229167,-0.402619 -1.3229167,-0.875399 0,-0.396883 0.05209,-1.044277 0.4092773,-1.308447 z"
+         sodipodi:nodetypes="cssssccsssscc" />
+      <path
+         id="rect1337"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2398);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 2.38125,20.902084 v 0.264584 h 1.3229167 v -0.264584 z m 2.38125,0 v 0.264584 h 1.3229167 v -0.264584 z" />
+      <path
+         id="path1345"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2400);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="M 4.9492188,82 A 3.0000001,3.0000001 0 0 0 2,85 3.0000001,3.0000001 0 0 0 5,88 3.0000001,3.0000001 0 0 0 8,85 3.0000001,3.0000001 0 0 0 5,82 3.0000001,3.0000001 0 0 0 4.9492188,82 Z m 8.0000002,0 A 3.0000001,3.0000001 0 0 0 10,85 a 3.0000001,3.0000001 0 0 0 3,3 3.0000001,3.0000001 0 0 0 3,-3 3.0000001,3.0000001 0 0 0 -3,-3 3.0000001,3.0000001 0 0 0 -0.05078,0 z m -8.0000002,1 a 2.0000001,2.0000001 0 0 1 0.00195,0 A 2.0000001,2.0000001 0 0 1 5,83 2.0000001,2.0000001 0 0 1 7,85 2.0000001,2.0000001 0 0 1 5,87 2.0000001,2.0000001 0 0 1 3,85 2.0000001,2.0000001 0 0 1 4.9492188,83 Z m 8.0000002,0 a 2.0000001,2.0000001 0 0 1 0.002,0 2.0000001,2.0000001 0 0 1 0.04883,0 2.0000001,2.0000001 0 0 1 2,2 2.0000001,2.0000001 0 0 1 -2,2 2.0000001,2.0000001 0 0 1 -2,-2 2.0000001,2.0000001 0 0 1 1.949219,-2 z M 5,84 c 0,0 -1,10e-7 -1,1 v 1 h 2 v -2 z m 8,0 c 0,0 -1,10e-7 -1,1 v 1 h 2 v -2 z"
+         transform="matrix(0.26458334,0,0,0.26458334,1.8520833,-3.4395833)"
+         mask="url(#mask-powermask-path-effect1389)"
+         inkscape:path-effect="#path-effect1389"
+         inkscape:original-d="M 4.9492188,82 A 3.0000001,3.0000001 0 0 0 2,85 3.0000001,3.0000001 0 0 0 5,88 3.0000001,3.0000001 0 0 0 8,85 3.0000001,3.0000001 0 0 0 5,82 3.0000001,3.0000001 0 0 0 4.9492188,82 Z m 8.0000002,0 A 3.0000001,3.0000001 0 0 0 10,85 a 3.0000001,3.0000001 0 0 0 3,3 3.0000001,3.0000001 0 0 0 3,-3 3.0000001,3.0000001 0 0 0 -3,-3 3.0000001,3.0000001 0 0 0 -0.05078,0 z m -8.0000002,1 a 2.0000001,2.0000001 0 0 1 0.00195,0 A 2.0000001,2.0000001 0 0 1 5,83 2.0000001,2.0000001 0 0 1 7,85 2.0000001,2.0000001 0 0 1 5,87 2.0000001,2.0000001 0 0 1 3,85 2.0000001,2.0000001 0 0 1 4.9492188,83 Z m 8.0000002,0 a 2.0000001,2.0000001 0 0 1 0.002,0 2.0000001,2.0000001 0 0 1 0.04883,0 2.0000001,2.0000001 0 0 1 2,2 2.0000001,2.0000001 0 0 1 -2,2 2.0000001,2.0000001 0 0 1 -2,-2 2.0000001,2.0000001 0 0 1 1.949219,-2 z M 5,84 c 0,0 -1,10e-7 -1,1 v 1 h 2 v -2 z m 8,0 c 0,0 -1,10e-7 -1,1 v 1 h 2 v -2 z" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2402);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         id="rect1353"
+         width="0.52916592"
+         height="0.52916592"
+         x="3.96875"
+         y="20.902084"
+         rx="3.6718346e-17" />
+      <path
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2404);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 3.4788598,19.628363 c 0.04683,-0.486828 0.48153,-0.608541 0.742487,-0.608541 0.423486,0 0.7497214,0.25405 0.7497214,0.597173 0,0.305097 -0.3651434,0.532309 -0.3987644,0.563022 -0.125992,0.115091 -0.211803,0.11424 -0.235615,0.45459 h -0.354914 c -0.01585,-0.340026 0.05156,-0.493476 0.342308,-0.697632 0.07527,-0.05285 0.259652,-0.174733 0.259652,-0.338584 0,-0.186634 -0.156674,-0.280913 -0.347088,-0.280913 -0.190414,0 -0.340407,0.129816 -0.388814,0.360908 z"
+         id="path1355"
+         sodipodi:nodetypes="cccsccsszcc" />
+    </g>
+    <g
+       id="light"
+       inkscape:label="light"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1410"
+         width="4.2333331"
+         height="4.2333331"
+         x="7.4083323"
+         y="17.991667"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="rect1005"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2310);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 9.2604167,19.579139 -0.529167,0.529167 v 1.322916 h -1.058333 v 0.264584 c 0,0.29316 0.236007,0.529166 0.529167,0.529166 H 10.31875 c 0.29316,0 0.529167,-0.236006 0.529167,-0.529166 0.52917,0 0.79375,-0.138564 0.79375,-0.661459 0,-0.537573 -0.377708,-0.661458 -0.661458,-0.661458 -0.25713,0 -0.661459,0.06577 -0.661459,0.396875 0,0.320575 0.264587,0.396875 0.529167,0.396875 v -0.264583 c -0.160619,0 -0.245463,0 -0.245463,-0.132292 0,-0.121612 0.100252,-0.132292 0.377755,-0.132292 0.32318,0 0.396875,0.197611 0.396875,0.396875 0,0.336315 -0.264577,0.396875 -0.529167,0.396875 H 9.7895837 v -1.852083 z m 0.107487,0.264584 h 0.157096 v 1.587499 h -0.529166 v -1.215429 z m -1.430404,1.852083 h 2.6458343 c 0,0 -4e-6,0.264583 -0.264584,0.264583 H 8.2020837 c -0.264585,0 -0.264584,-0.264583 -0.264584,-0.264583 z"
+         sodipodi:nodetypes="ccccssscsssccsssscccccccccccssc" />
+      <path
+         id="path1034"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2312);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 8.9808467,17.954432 c 0.174874,0.699492 -0.249597,0.644263 -0.249597,0.971517 0,0.241483 0.0899,0.388607 0.529167,0.388607 0.36296,0 0.548287,-0.146481 0.548287,-0.404626 0,-0.499817 -0.569263,-0.944354 -0.827857,-0.955498 z m 0.280087,0.445968 c 0.12115,0.108594 0.250338,0.237265 0.290938,0.454236 0,0.06718 -0.0068,0.126624 -0.03514,0.147794 -0.02826,0.02118 -0.108928,0.05426 -0.255798,0.05426 -0.17336,-0.02599 -0.257315,0.01369 -0.256315,-0.171565 0.0403,-0.110583 0.06666,-0.07326 0.125056,-0.152446 0.05866,-0.07948 0.108059,-0.19064 0.131259,-0.332279 z" />
+    </g>
+    <g
+       id="lockpick"
+       inkscape:label="lockpick"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1408"
+         width="4.2333331"
+         height="4.2333331"
+         x="12.700003"
+         y="17.991667"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1156"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2300);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 16.554029,17.991667 -2.001945,2.006079 v 0.375171 l -1.5875,1.5875 V 22.225 h 0.112654 l 2.004012,-1.852083 h 0.388607 l 1.463477,-1.46451 v -0.91674 z m 0.114721,0.264583 v 0.529167 l -1.322916,1.322916 h -0.529167 z" />
+    </g>
+    <g
+       id="miscellaneous"
+       inkscape:label="miscellaneous"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1406"
+         width="4.2333331"
+         height="4.2333331"
+         x="17.991665"
+         y="17.991667"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1204"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2384);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 20.6375,17.991667 -2.551782,3.439583 -0.09405,0.529167 0.264583,0.264583 0.529167,-0.264583 2.645833,-2.38125 0.793749,-1.058334 -0.264583,-0.529166 z m 0.275953,0.264583 h 0.8816 l 0.12299,0.238745 -0.619084,0.819588 -0.168465,0.03824 z m -0.239779,0.128158 0.204639,1.022159 -1.14205,0.240296 z m 0.275952,1.275374 -0.674894,0.60048 v -0.45682 z m -0.841292,0.183968 v 0.573609 l -1.474329,1.321366 -0.326078,0.164848 -0.03307,-0.03411 0.06459,-0.337447 1.158586,-1.563212 z" />
+    </g>
+    <g
+       id="npc"
+       inkscape:label="npc"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1404"
+         width="4.2333331"
+         height="4.2333331"
+         x="23.283337"
+         y="17.991667"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2414);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 14.816667,23.283334 c 0.513578,0 1.5875,0.423767 1.5875,1.5875 L 16.933334,25.4 v 0.529167 h -0.529167 c 0,0.930046 -0.361988,1.058334 -0.79375,1.058334 v 0.529166 h -1.852083 c 0,-0.372674 -0.0377,-0.857766 -0.255282,-1.071769 -0.336724,-0.334863 -0.538469,-1.063636 -0.538469,-1.574064 0,-1.020755 0.828782,-1.5875 1.852084,-1.5875 z"
+         id="path1078"
+         sodipodi:nodetypes="ccccccccccc"
+         mask="url(#mask-powermask-path-effect1105)"
+         inkscape:path-effect="#path-effect1105"
+         inkscape:original-d="m 14.816667,23.283334 c 0.513578,0 1.5875,0.423767 1.5875,1.5875 L 16.933334,25.4 v 0.529167 h -0.529167 c 0,0.930046 -0.361988,1.058334 -0.79375,1.058334 v 0.529166 h -1.852083 c 0,-0.372674 -0.0377,-0.857766 -0.255282,-1.071769 -0.336724,-0.334863 -0.538469,-1.063636 -0.538469,-1.574064 0,-1.020755 0.828782,-1.5875 1.852084,-1.5875 z"
+         transform="translate(10.583333,-5.2916664)" />
+      <path
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2416);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 24.606249,20.108334 v -0.264583 l 0.365869,-0.264583 0.163298,0.233577 -0.29559,0.163298 0.29559,0.42788 -0.163298,0.233578 z"
+         id="path1080"
+         sodipodi:nodetypes="cccccccc" />
+      <path
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2418);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 26.855207,19.314584 h -0.926041 l 0.463434,0.568234 0.187895,-0.15813 -0.258589,-0.241845 0.52834,0.100458 z"
+         id="path1111"
+         sodipodi:nodetypes="ccccccc" />
+    </g>
+    <g
+       id="potion"
+       inkscape:label="potion"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1402"
+         width="4.2333331"
+         height="4.2333331"
+         x="28.575001"
+         y="17.991667"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path979"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2306);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 30.691666,17.991666 h -0.26458 c 0,0 -0.264584,0 -0.264584,0.264583 h -0.264586 v 0.264584 c 0,0 0.216853,0.149352 0.264584,0.264583 2e-6,0 0,0.355534 0,0.355534 -0.634225,0.224232 -1.058265,0.823851 -1.058334,1.496549 0,0.876752 0.710748,1.587499 1.5875,1.587499 0.876753,0 1.5875,-0.710747 1.5875,-1.587499 -6.9e-5,-0.672698 -0.424108,-1.272317 -1.058333,-1.496549 v -0.355534 c 0.04773,-0.115231 0.264583,-0.264583 0.264583,-0.264583 v -0.264584 h -0.264583 c 3e-6,-0.264583 -0.264581,-0.264583 -0.264581,-0.264583 z m -0.264583,0.264583 h 0.529167 v 0.264584 h -0.529167 z m 0,0.529167 h 0.529167 v 0.556038 c 0.615886,0.125719 1.058267,0.667461 1.058333,1.296045 0,0.730623 -0.592288,1.322911 -1.322917,1.322917 -0.730628,-6e-6 -1.322916,-0.592294 -1.322916,-1.322917 6.6e-5,-0.628584 0.442446,-1.170326 1.058333,-1.296045 z"
+         sodipodi:nodetypes="ccccccccscccccccccccccccccsccc" />
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient6468);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+         d="m 29.427734,19.857422 -0.117187,0.236328 c 0.56072,0.28036 1.116277,0.279297 1.380859,0.279297 0.264585,0 0.822092,0.0011 1.382813,-0.279297 l -0.119141,-0.236328 c -0.497614,0.248806 -0.999087,0.25 -1.263672,0.25 -0.264582,0 -0.766058,-0.0012 -1.263672,-0.25 z"
+         id="path6699" />
+    </g>
+    <g
+       id="probe"
+       inkscape:label="probe"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1400"
+         width="4.2333331"
+         height="4.2333331"
+         x="33.866673"
+         y="17.991667"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1310"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2394);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 37.46128,17.991667 -3.398242,3.399275 v 0.132292 l 0.681095,0.681096 0.227375,-0.227377 -0.491442,-0.49506 v -0.133325 l 1.503267,-1.504818 h 0.926042 L 38.1,18.653125 v -0.661458 z m 0.109553,0.264583 0.264584,0.264583 -1.058334,1.058334 h -0.529166 z" />
+    </g>
+    <g
+       id="repair"
+       inkscape:label="repair"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1398"
+         width="4.2333331"
+         height="4.2333331"
+         x="39.158333"
+         y="17.991667"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2406);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 7.4083334,24.077084 h 4.2333336 v 0.79375 l -1.173055,0.264583 -0.149862,0.428915 v 0.629419 c 0.267897,0 1.058334,0.153181 1.058334,0.79375 H 7.6729168 c 0,-0.636251 1.0583333,-0.622331 1.0583333,-0.88098 V 25.664584 C 7.9033937,25.214379 7.501351,24.981835 7.4083334,24.473959 Z"
+         id="path1409"
+         sodipodi:nodetypes="cccccccccccc"
+         mask="url(#mask-powermask-path-effect1447)"
+         inkscape:original-d="m 7.4083334,24.077084 h 4.2333336 v 0.79375 l -1.173055,0.264583 -0.149862,0.428915 v 0.629419 c 0.267897,0 1.058334,0.153181 1.058334,0.79375 H 7.6729168 c 0,-0.636251 1.0583333,-0.622331 1.0583333,-0.88098 V 25.664584 C 7.9033937,25.214379 7.501351,24.981835 7.4083334,24.473959 Z"
+         inkscape:path-effect="#path-effect1447"
+         transform="translate(31.749997,-5.2916664)" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2408);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         id="rect1428"
+         width="1.1470873"
+         height="0.11313022"
+         x="41.446728"
+         y="18.59763"
+         rx="3.6718346e-17"
+         transform="rotate(2.1988888)" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2410);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         id="rect1430"
+         width="0.4788301"
+         height="0.15522514"
+         x="41.754128"
+         y="17.375719"
+         rx="3.6718346e-17"
+         transform="rotate(3.7917997)" />
+    </g>
+    <g
+       id="static"
+       inkscape:label="static"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1396"
+         width="4.2333331"
+         height="4.2333331"
+         x="44.450001"
+         y="17.991667"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="rect889"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2304);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 44.449995,17.991666 v 4.233332 h 4.233334 v -4.233332 z m 0.264583,0.264584 h 0.264584 v 0.529167 h -0.264584 z m 0.529167,0 h 0.793751 v 0.529167 h -0.793751 z m 1.058334,0 h 1.058334 v 0.529167 h -1.058334 z m 1.322917,0 h 0.79375 v 0.529167 h -0.79375 z M 44.714578,19.05 h 0.793751 v 0.529167 h -0.793751 z m 1.058335,0 h 1.058333 v 0.529167 h -1.058333 z m 1.322916,0 h 0.79375 v 0.529167 h -0.79375 z m 1.058334,0 h 0.264583 v 0.529167 h -0.264583 z m -3.439585,0.793749 h 0.264584 v 0.529168 h -0.264584 z m 0.529167,0 h 0.793751 v 0.529168 h -0.793751 z m 1.058334,0 h 1.058334 v 0.529168 h -1.058334 z m 1.322917,0 h 0.79375 v 0.529168 h -0.79375 z m -2.910418,0.79375 h 0.793751 v 0.529167 h -0.793751 z m 1.058335,0 h 1.058333 v 0.529167 h -1.058333 z m 1.322916,0 h 0.79375 v 0.529167 h -0.79375 z m 1.058334,0 h 0.264583 v 0.529167 h -0.264583 z m -3.439585,0.79375 h 0.264584 v 0.529167 h -0.264584 z m 0.529167,0 h 0.793751 v 0.529167 h -0.793751 z m 1.058334,0 h 1.058334 v 0.529167 h -1.058334 z m 1.322917,0 h 0.79375 v 0.529167 h -0.79375 z" />
+      <path
+         id="path1181"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2420);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 44.449995,17.991666 v 4.233332 h 4.233334 v -4.233332 z m 0.264583,0.264584 h 0.264584 v 0.529167 h -0.264584 z m 0.529167,0 h 0.793751 v 0.529167 h -0.793751 z m 1.058334,0 h 1.058334 v 0.529167 h -1.058334 z m 1.322917,0 h 0.79375 v 0.529167 h -0.79375 z M 44.714578,19.05 h 0.793751 v 0.529167 h -0.793751 z m 1.058335,0 h 1.058333 v 0.529167 h -1.058333 z m 1.322916,0 h 0.79375 v 0.529167 h -0.79375 z m 1.058334,0 h 0.264583 v 0.529167 h -0.264583 z m -3.439585,0.793749 h 0.264584 v 0.529168 h -0.264584 z m 0.529167,0 h 0.793751 v 0.529168 h -0.793751 z m 1.058334,0 h 1.058334 v 0.529168 h -1.058334 z m 1.322917,0 h 0.79375 v 0.529168 h -0.79375 z m -2.910418,0.79375 h 0.793751 v 0.529167 h -0.793751 z m 1.058335,0 h 1.058333 v 0.529167 h -1.058333 z m 1.322916,0 h 0.79375 v 0.529167 h -0.79375 z m 1.058334,0 h 0.264583 v 0.529167 h -0.264583 z m -3.439585,0.79375 h 0.264584 v 0.529167 h -0.264584 z m 0.529167,0 h 0.793751 v 0.529167 h -0.793751 z m 1.058334,0 h 1.058334 v 0.529167 h -1.058334 z m 1.322917,0 h 0.79375 v 0.529167 h -0.79375 z" />
+    </g>
+    <g
+       id="weapon"
+       inkscape:label="weapon"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1390"
+         width="4.2333331"
+         height="4.2333331"
+         x="49.741661"
+         y="17.991667"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1467"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2412);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 49.741662,17.991667 c 0.09866,0.503824 0.186284,0.621705 0.570401,1.195248 l 2.123017,2.09817 -0.445069,0.523261 0.234226,0.211571 0.572225,-0.539344 c 0.164436,0.122335 0.594222,0.509892 0.887574,0.761143 l 0.307673,-0.307672 C 53.740458,21.640691 53.3529,21.210905 53.230565,21.046469 l 0.539345,-0.572225 -0.21157,-0.234227 -0.523261,0.44507 -2.09817,-2.123018 c -0.573544,-0.384116 -0.691424,-0.471741 -1.195247,-0.570402 z m 0.280633,0.280633 c 0.242046,0.0684 0.748789,0.421099 1.061873,0.692082 l 1.816074,1.852617 -0.166626,0.166627 -0.16626,0.16626 -1.852978,-1.815714 c -0.27099,-0.313077 -0.623677,-0.819828 -0.692082,-1.061874 z" />
+    </g>
+    <g
+       id="resources-mesh"
+       inkscape:label="resources-mesh"
+       transform="translate(-47.625,-31.749994)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="font-variation-settings:normal;opacity:0.5;vector-effect:none;fill:none;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect1941"
+         width="4.2333331"
+         height="4.2333331"
+         x="49.741665"
+         y="55.033333"
+         inkscape:label="frame" />
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient6470);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+         d="m 51.792969,55.050781 -1.71875,0.992188 -0.06641,0.115234 v 1.984375 l 0.06641,0.113281 1.71875,0.992188 h 0.130859 l 1.71875,-0.992188 0.06641,-0.113281 v -1.984375 l -0.06641,-0.115234 -1.71875,-0.992188 z m 0.06641,0.265625 1.585937,0.917969 v 1.832031 l -1.58789,0.916016 -1.585938,-0.916016 v -1.832031 z"
+         id="path2002" />
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;overflow:visible;visibility:visible;opacity:0.5;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient2450);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+         d="m 51.857422,55.033203 a 0.1322915,0.1322915 0 0 0 -0.13086,0.132813 v 0.925781 h -1.585937 -0.002 a 0.1322915,0.1322915 0 0 0 -0.03516,0.0059 0.1322915,0.1322915 0 0 0 -0.01758,0.0039 0.1322915,0.1322915 0 0 0 -0.0059,0.0039 0.1322915,0.1322915 0 0 0 -0.02539,0.01758 0.1322915,0.1322915 0 0 0 -0.0332,0.04102 0.1322915,0.1322915 0 0 0 -0.0098,0.01953 0.1322915,0.1322915 0 0 0 -0.002,0.01172 0.1322915,0.1322915 0 0 0 -0.0039,0.02344 0.1322915,0.1322915 0 0 0 0,0.0039 0.1322915,0.1322915 0 0 0 0,0.002 0.1322915,0.1322915 0 0 0 0.0039,0.0293 0.1322915,0.1322915 0 0 0 0.0078,0.02148 0.1322915,0.1322915 0 0 0 0.0059,0.01367 l 0.707031,1.654297 h -0.591797 a 0.1322915,0.1322915 0 0 0 -0.132813,0.132813 0.1322915,0.1322915 0 0 0 0.132813,0.132812 h 0.732422 l 0.886718,1.011719 h 0.199219 l 0.888672,-1.011719 h 0.732422 a 0.1322915,0.1322915 0 0 0 0.132813,-0.132812 0.1322915,0.1322915 0 0 0 -0.132813,-0.132813 h -0.591797 l 0.710938,-1.662109 0.002,-0.0039 a 0.1322915,0.1322915 0 0 0 0,-0.002 0.1322915,0.1322915 0 0 0 0.0098,-0.02734 0.1322915,0.1322915 0 0 0 0,-0.002 0.1322915,0.1322915 0 0 0 0.002,-0.02148 0.1322915,0.1322915 0 0 0 0,-0.0078 0.1322915,0.1322915 0 0 0 -0.0039,-0.02344 0.1322915,0.1322915 0 0 0 -0.002,-0.0078 0.1322915,0.1322915 0 0 0 -0.0078,-0.02148 0.1322915,0.1322915 0 0 0 -0.0039,-0.0059 0.1322915,0.1322915 0 0 0 -0.01367,-0.01953 0.1322915,0.1322915 0 0 0 -0.02148,-0.01953 0.1322915,0.1322915 0 0 0 -0.02734,-0.01758 0.1322915,0.1322915 0 0 0 -0.0293,-0.0078 0.1322915,0.1322915 0 0 0 -0.02344,-0.002 0.1322915,0.1322915 0 0 0 -0.0078,0 h -1.580078 v -0.925781 a 0.1322915,0.1322915 0 0 0 -0.132812,-0.132813 z m -1.519531,1.322266 h 1.30664 l -0.703125,1.40625 z m 1.734375,0 h 1.30664 l -0.603515,1.40625 z m -0.212891,0.164062 0.710937,1.423828 h -1.423828 z m -0.634766,1.689453 h 1.267579 l -0.634766,0.72461 z"
+         id="path1996" />
+    </g>
+    <g
+       id="resources-texture"
+       inkscape:label="resources-texture"
+       transform="translate(0,-5.2916664)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1435"
+         width="4.2333331"
+         height="4.2333331"
+         x="7.4083323"
+         y="28.575003"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="rect1042"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2264);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 7.4083337,28.575001 v 4.233334 h 4.2333333 v -4.233334 z m 0.264583,0.264584 h 3.7041663 v 3.704166 H 7.6729167 Z" />
+      <path
+         id="rect1049"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient6472);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 7.9374997,29.104168 v 3.175 H 11.1125 v -3.175 z m 0.264584,0.264583 h 0.529166 v 0.529167 h 0.79375 V 29.368751 H 10.31875 v 0.529167 h 0.529167 v 0.79375 H 10.31875 v 0.79375 h 0.529167 v 0.529167 H 10.31875 V 31.485418 H 9.5249997 v 0.529167 h -0.79375 v -0.529167 h -0.529166 v -0.79375 h 0.529166 v -0.79375 h -0.529166 z m 0.529166,1.322917 v 0.79375 h 0.79375 v -0.79375 z m 0.79375,0 H 10.31875 v -0.79375 H 9.5249997 Z" />
+    </g>
+    <g
+       id="resources-icon"
+       inkscape:label="resources-icon"
+       transform="translate(0,-5.2916664)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1433"
+         width="4.2333331"
+         height="4.2333331"
+         x="12.700003"
+         y="28.575003"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="rect1106"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2268);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 12.964583,28.839585 v 1.058333 h 1.058333 v -1.058333 z m 0.264583,0.264583 h 0.529167 v 0.529167 h -0.529167 z m -0.264583,1.058333 v 0.264584 H 14.2875 v -0.264584 z" />
+      <path
+         id="path1117"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2270);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 14.816666,28.839585 v 1.058333 h 1.058332 v -1.058333 z m 0.264583,0.264583 h 0.529167 v 0.529167 h -0.529167 z m -0.264583,1.058333 v 0.264584 h 1.322916 v -0.264584 z" />
+      <path
+         id="path1119"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2272);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 12.964583,30.956249 v 1.058333 h 1.058333 v -1.058333 z m 0.264583,0.264583 h 0.529167 v 0.529167 h -0.529167 z m -0.264583,1.058334 v 0.264583 H 14.2875 v -0.264583 z" />
+      <path
+         id="path1121"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2274);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 14.816666,30.956249 v 1.058333 h 1.058332 v -1.058333 z m 0.264583,0.264583 h 0.529167 v 0.529167 h -0.529167 z m -0.264583,1.058333 v 0.264584 h 1.322916 v -0.264584 z" />
+    </g>
+    <g
+       id="resources-sound"
+       inkscape:label="resources-sound"
+       transform="translate(0,-5.2916664)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1431"
+         width="4.2333331"
+         height="4.2333331"
+         x="17.991665"
+         y="28.575003"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="rect1123"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2276);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 18.520833,28.575001 v 4.233334 h 0.264583 v -4.233334 z m 0.529166,0.529167 v 3.175 h 0.264584 v -3.175 z m 1.058334,0.264583 v 2.645834 h 0.264583 v -2.645834 z m -2.116667,0.529167 v 1.5875 h 0.264583 v -1.5875 z m 1.5875,0 v 1.5875 h 0.264583 v -1.5875 z m 1.058333,0.264583 v 1.058334 h 0.264584 v -1.058334 z m 0.529167,0.264584 v 0.529166 h 0.264583 v -0.529166 z m 0.529167,0 v 0.529166 h 0.264583 v -0.529166 z" />
+    </g>
+    <g
+       id="resources-music"
+       inkscape:label="resources-music"
+       transform="translate(0,-5.2916664)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1429"
+         width="4.2333331"
+         height="4.2333331"
+         x="23.283337"
+         y="28.575003"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <ellipse
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2282);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         id="path1207"
+         cx="24.341665"
+         cy="32.014591"
+         rx="0.79374999"
+         ry="0.52916664" />
+      <ellipse
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2284);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         id="path1209"
+         cx="26.45833"
+         cy="31.485422"
+         rx="0.79374999"
+         ry="0.52916664" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2286);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         id="rect1214"
+         width="0.26458332"
+         height="2.6458333"
+         x="24.870832"
+         y="29.368753"
+         rx="1.9824198e-15" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2288);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         id="rect1216"
+         width="0.26458332"
+         height="2.6458333"
+         x="26.987499"
+         y="28.839588"
+         rx="1.9824198e-15" />
+      <path
+         id="path1224"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2290);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 27.252083,28.683523 -2.38125,0.680061 v 0.345199 l 2.38125,-0.680063 z" />
+      <path
+         id="path1240"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2292);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 27.252083,29.477272 -2.38125,0.680061 v 0.3452 l 2.38125,-0.680064 z" />
+    </g>
+    <g
+       id="resources-video"
+       inkscape:label="resources-video"
+       transform="translate(0,-5.2916664)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1426"
+         width="4.2333331"
+         height="4.2333331"
+         x="28.575001"
+         y="28.575003"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="rect1171"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2278);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 28.574999,28.839585 v 3.704166 h 4.233333 v -3.704166 z m 0.264583,0.264583 h 3.704167 v 0.264583 h -3.704167 z m 0,0.529167 h 3.704167 v 2.116666 h -3.704167 z m 0,2.38125 h 3.704167 v 0.264583 h -3.704167 z" />
+      <path
+         sodipodi:type="star"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2280);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         id="path1186"
+         sodipodi:sides="3"
+         sodipodi:cx="-30.691668"
+         sodipodi:cy="30.691675"
+         sodipodi:r1="1.0583333"
+         sodipodi:r2="0.52916664"
+         sodipodi:arg1="3.1415927"
+         sodipodi:arg2="4.1887902"
+         inkscape:flatsided="true"
+         inkscape:rounded="0"
+         inkscape:randomized="0"
+         d="m -31.750001,30.691675 1.5875,-0.916543 0,1.833087 z"
+         inkscape:transform-center-x="-0.26458281"
+         transform="scale(-1,1)" />
+    </g>
+    <g
+       id="sound-generator"
+       inkscape:label="sound-generator"
+       transform="translate(0,-5.2916664)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1424"
+         width="4.2333331"
+         height="4.2333331"
+         x="33.866673"
+         y="28.575003"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1662"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2294);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 35.924421,29.104166 -1.058333,0.79375 H 34.13125 v 0.79375 0.79375 h 0.734838 l 1.058333,0.793751 h 0.05891 0.264584 v -1.587501 -1.5875 h -0.264584 z m 0.05891,0.281635 v 1.305865 1.305865 l -1.058333,-0.79375 v -0.512115 -0.512114 z m 1.360641,-0.315743 -0.170016,0.202573 c 0.419401,0.351984 0.661566,0.871503 0.661458,1.419034 -1.73e-4,0.547435 -0.242518,1.066749 -0.661974,1.418519 l 0.170532,0.203089 c 0.479304,-0.402221 0.756088,-0.995897 0.756026,-1.621608 6.1e-5,-0.625711 -0.276722,-1.219386 -0.756026,-1.621607 z m -0.510048,0.608232 -0.170532,0.203089 c 0.23961,0.200945 0.378086,0.497569 0.378272,0.810286 -1.86e-4,0.312717 -0.138662,0.609342 -0.378272,0.810287 l 0.170532,0.203089 c 0.299459,-0.251396 0.472372,-0.622383 0.472324,-1.013376 4.8e-5,-0.390993 -0.172865,-0.761979 -0.472324,-1.013375 z m -2.438091,0.48421 h 0.205671 0.05891 v 0.281635 0.247531 0.247531 0.281636 h -0.05891 -0.205671 v -0.529167 z"
+         sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccc" />
+    </g>
+    <g
+       id="sound"
+       inkscape:label="sound"
+       transform="translate(21.166665,-5.2916664)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect3125"
+         width="4.2333331"
+         height="4.2333331"
+         x="17.991665"
+         y="28.575003"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path3127"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient3131);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 18.520833,28.575001 v 4.233334 h 0.264583 v -4.233334 z m 0.529166,0.529167 v 3.175 h 0.264584 v -3.175 z m 1.058334,0.264583 v 2.645834 h 0.264583 v -2.645834 z m -2.116667,0.529167 v 1.5875 h 0.264583 v -1.5875 z m 1.5875,0 v 1.5875 h 0.264583 v -1.5875 z m 1.058333,0.264583 v 1.058334 h 0.264584 v -1.058334 z m 0.529167,0.264584 v 0.529166 h 0.264583 v -0.529166 z m 0.529167,0 v 0.529166 h 0.264583 v -0.529166 z" />
+    </g>
+    <g
+       id="attribute"
+       inkscape:label="attribute"
+       transform="translate(0,-10.583333)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1461"
+         width="4.2333331"
+         height="4.2333331"
+         x="2.1166692"
+         y="39.158333"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="rect1081"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2232);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="M 3.9687499,39.158335 2.1166666,42.862502 2.453597,43.391668 H 6.0130694 L 6.3499999,42.862502 4.4979166,39.158335 Z m 0.1638143,0.264583 h 0.2015381 l 0.2645832,0.529167 H 3.8679809 Z m -0.396875,0.79375 h 0.995288 l 0.396875,0.79375 h -1.789038 z m -0.5291666,1.058334 h 2.0536213 l 0.396875,0.79375 H 2.8096476 Z m -0.5291667,1.058333 h 3.1119546 l 0.2361616,0.472323 -0.2046388,0.321427 h -3.175 L 2.4411946,42.805658 Z"
+         sodipodi:nodetypes="ccccccccccccccccccccccccccccc" />
+    </g>
+    <g
+       id="birthsign"
+       inkscape:label="birthsign"
+       transform="translate(0,-10.583333)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1459"
+         width="4.2333331"
+         height="4.2333331"
+         x="7.4083323"
+         y="39.158333"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path10688"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2222);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 9.5249999,39.158335 a 1.3229166,1.3229166 0 0 0 -1.3229167,1.322916 1.3229166,1.3229166 0 0 0 1.3229167,1.322917 1.3229166,1.3229166 0 0 0 1.3229171,-1.322917 1.3229166,1.3229166 0 0 0 -1.3229171,-1.322916 z m -0.01602,0.264583 a 1.0583333,1.0583333 0 0 1 0.01602,0 1.0583333,1.0583333 0 0 1 1.0583331,1.058333 1.0583333,1.0583333 0 0 1 -1.0583331,1.058334 1.0583333,1.0583333 0 0 1 -1.0583333,-1.058334 1.0583333,1.0583333 0 0 1 1.0423133,-1.058333 z" />
+      <path
+         id="rect10697"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2224);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 7.6729166,41.539585 c -0.1465789,0 -0.2645834,0.118004 -0.2645834,0.264583 v 0.529167 c 0,0.146579 0.1180045,0.264583 0.2645834,0.264583 h 0.5291666 c 0.146579,0 0.2645834,-0.118004 0.2645834,-0.264583 v -0.529167 c 0,-0.146579 -0.1180044,-0.264583 -0.2645834,-0.264583 z m 0,0.264583 h 0.5291666 v 0.529167 H 7.6729166 Z" />
+      <path
+         id="path10718"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2226);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 9.2604166,42.068753 c -0.1465789,0 -0.2645833,0.118005 -0.2645833,0.264584 v 0.529166 c 0,0.14658 0.1180044,0.264584 0.2645833,0.264584 h 0.5291667 c 0.146579,0 0.2645837,-0.118004 0.2645837,-0.264584 v -0.529166 c 0,-0.146579 -0.1180047,-0.264584 -0.2645837,-0.264584 z m 0,0.264584 h 0.5291667 v 0.529166 H 9.2604166 Z" />
+      <path
+         id="path10720"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2228);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 10.847917,41.539587 c -0.146579,0 -0.264584,0.118005 -0.264584,0.264584 v 0.529166 c 0,0.14658 0.118005,0.264584 0.264584,0.264584 h 0.529166 c 0.146579,0 0.264584,-0.118004 0.264584,-0.264584 v -0.529166 c 0,-0.146579 -0.118005,-0.264584 -0.264584,-0.264584 z m 0,0.264584 h 0.529166 v 0.529166 h -0.529166 z" />
+      <path
+         id="path10722"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2230);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 7.9374999,40.216668 c -0.2922507,0 -0.5291667,0.177686 -0.5291667,0.396875 0,0.219189 0.236916,0.396875 0.5291667,0.396875 H 9.2604165 9.7895832 11.1125 c 0.292251,0 0.529167,-0.177686 0.529167,-0.396875 0,-0.219189 -0.236916,-0.396875 -0.529167,-0.396875 h -0.432015 v 0.264583 H 11.1125 c 0.0019,-2.4e-5 0.0038,-2.4e-5 0.0057,0 0.09451,0.0024 0.169547,0.06084 0.169499,0.132292 0,0.07309 -0.07845,0.132334 -0.175183,0.132292 h -0.0057 -1.3172328 -0.5291667 -1.3172322 -0.00568 c -0.096734,4.2e-5 -0.1751831,-0.0592 -0.1751831,-0.132292 -4.81e-5,-0.07145 0.074991,-0.130014 0.1694987,-0.132292 0.00189,-2.4e-5 0.00379,-2.4e-5 0.00568,0 h 0.432015 v -0.264583 z" />
+    </g>
+    <g
+       id="body-part"
+       inkscape:label="body-part"
+       transform="translate(0,-10.583333)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1457"
+         width="4.2333331"
+         height="4.2333331"
+         x="12.700003"
+         y="39.158333"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1689"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2234);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 14.305075,39.158335 c 0.660363,1.331254 0.764294,1.869768 0.764294,2.462382 0,0.424307 -0.988158,0.901957 -1.840199,0.987536 -0.18112,0.0063 -0.529166,0.09876 -0.529166,0.518832 0,0.229584 0.339402,0.264584 0.529166,0.264584 h 3.024106 c 0.686469,-0.431602 0.364641,-0.995913 0.07028,-1.802474 -0.223239,-0.779487 -0.183967,-1.148525 -0.183967,-2.43086 z m 0.432014,0.264584 h 1.137915 c 0.01315,1.138401 -0.05581,1.388856 0.167431,2.168342 0.294362,0.806564 0.370625,1.401879 0.09715,1.535824 h -2.910417 c -0.324061,0 -0.321976,-0.267568 0,-0.293523 0.859047,-0.06925 2.12235,-0.654593 2.12235,-1.212845 0.0016,-0.218358 0.106445,-0.895485 -0.614431,-2.197798 z" />
+      <path
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2236);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 15.261501,42.27091 c 0.204639,0.05209 0.511182,-0.240606 0.55025,-0.599654 0.113481,0.139526 0.14858,0.519555 0.01464,0.635827 -0.133946,0.116272 -0.449543,0.08661 -0.564885,-0.03617 z"
+         id="path1693"
+         sodipodi:nodetypes="cczc" />
+    </g>
+    <g
+       id="class"
+       inkscape:label="class"
+       transform="translate(0,-10.583333)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1455"
+         width="4.2333331"
+         height="4.2333331"
+         x="17.991665"
+         y="39.158333"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <g
+         id="g1724"
+         mask="url(#mask-powermask-path-effect1741)"
+         inkscape:path-effect="#path-effect1741"
+         transform="translate(0,-21.166665)"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2220);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1">
+        <path
+           id="path843"
+           style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient4015);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+           d="m 20.108333,60.324994 a 2.1166666,2.1166666 0 0 0 -2.116667,2.116667 2.1166666,2.1166666 0 0 0 2.116667,2.116665 2.1166666,2.1166666 0 0 0 2.116666,-2.116665 2.1166666,2.1166666 0 0 0 -2.116666,-2.116667 z m -0.02479,0.264583 a 1.8520806,1.8520806 0 0 1 0.02479,0 1.8520806,1.8520806 0 0 1 1.852082,1.852084 1.8520806,1.8520806 0 0 1 -1.852082,1.852083 1.8520806,1.8520806 0 0 1 -1.852084,-1.852083 1.8520806,1.8520806 0 0 1 1.827279,-1.852084 z"
+           inkscape:original-d="m 20.108333,60.324994 a 2.1166666,2.1166666 0 0 0 -2.116667,2.116667 2.1166666,2.1166666 0 0 0 2.116667,2.116665 2.1166666,2.1166666 0 0 0 2.116666,-2.116665 2.1166666,2.1166666 0 0 0 -2.116666,-2.116667 z m -0.02479,0.264583 a 1.8520806,1.8520806 0 0 1 0.02479,0 1.8520806,1.8520806 0 0 1 1.852082,1.852084 1.8520806,1.8520806 0 0 1 -1.852082,1.852083 1.8520806,1.8520806 0 0 1 -1.852084,-1.852083 1.8520806,1.8520806 0 0 1 1.827279,-1.852084 z" />
+        <path
+           id="path850"
+           style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient4017);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+           d="m 20.108333,60.854161 a 1.5875,1.5875 0 0 0 -1.5875,1.5875 1.5875,1.5875 0 0 0 1.5875,1.587499 1.5875,1.5875 0 0 0 1.587499,-1.587499 1.5875,1.5875 0 0 0 -1.587499,-1.5875 z m 5.29e-4,0.264583 a 1.3235013,1.3229139 0 0 1 1.323435,1.322917 1.3235013,1.3229139 0 0 1 -1.323435,1.322916 1.3235013,1.3229139 0 0 1 -1.323433,-1.322916 1.3235013,1.3229139 0 0 1 1.323433,-1.322917 z"
+           inkscape:original-d="m 20.108333,60.854161 a 1.5875,1.5875 0 0 0 -1.5875,1.5875 1.5875,1.5875 0 0 0 1.5875,1.587499 1.5875,1.5875 0 0 0 1.587499,-1.587499 1.5875,1.5875 0 0 0 -1.587499,-1.5875 z m 5.29e-4,0.264583 a 1.3235013,1.3229139 0 0 1 1.323435,1.322917 1.3235013,1.3229139 0 0 1 -1.323435,1.322916 1.3235013,1.3229139 0 0 1 -1.323433,-1.322916 1.3235013,1.3229139 0 0 1 1.323433,-1.322917 z" />
+        <path
+           id="path860"
+           style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient4019);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+           d="m 20.094895,60.325002 a 0.79375,0.79375 0 0 0 -0.780315,0.79375 0.79375,0.79375 0 0 0 0.79375,0.79375 0.79375,0.79375 0 0 0 0.793749,-0.79375 0.79375,0.79375 0 0 0 -0.793749,-0.79375 0.79375,0.79375 0 0 0 -0.01344,0 z m 5.29e-4,0.264584 a 0.52916664,0.52916664 0 0 1 0.01291,0 0.52916664,0.52916664 0 0 1 0.529166,0.529166 0.52916664,0.52916664 0 0 1 -0.529166,0.529167 0.52916664,0.52916664 0 0 1 -0.529167,-0.529167 0.52916664,0.52916664 0 0 1 0.516247,-0.529166 z"
+           mask="none"
+           inkscape:original-d="m 20.094895,60.325002 a 0.79375,0.79375 0 0 0 -0.780315,0.79375 0.79375,0.79375 0 0 0 0.79375,0.79375 0.79375,0.79375 0 0 0 0.793749,-0.79375 0.79375,0.79375 0 0 0 -0.793749,-0.79375 0.79375,0.79375 0 0 0 -0.01344,0 z m 5.29e-4,0.264584 a 0.52916664,0.52916664 0 0 1 0.01291,0 0.52916664,0.52916664 0 0 1 0.529166,0.529166 0.52916664,0.52916664 0 0 1 -0.529166,0.529167 0.52916664,0.52916664 0 0 1 -0.529167,-0.529167 0.52916664,0.52916664 0 0 1 0.516247,-0.529166 z" />
+        <path
+           id="path867"
+           style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient4021);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+           d="m 19.036561,62.441668 a 0.79375,0.79375 0 0 0 -0.780315,0.793749 0.79375,0.79375 0 0 0 0.79375,0.79375 0.79375,0.79375 0 0 0 0.79375,-0.79375 0.79375,0.79375 0 0 0 -0.79375,-0.793749 0.79375,0.79375 0 0 0 -0.01344,0 z m 5.29e-4,0.264584 a 0.52916664,0.52916664 0 0 1 0.01291,0 0.52916664,0.52916664 0 0 1 0.529166,0.529165 A 0.52916664,0.52916664 0 0 1 19.05,63.764584 0.52916664,0.52916664 0 0 1 18.520833,63.235417 0.52916664,0.52916664 0 0 1 19.03708,62.706252 Z"
+           inkscape:original-d="m 19.036561,62.441668 a 0.79375,0.79375 0 0 0 -0.780315,0.793749 0.79375,0.79375 0 0 0 0.79375,0.79375 0.79375,0.79375 0 0 0 0.79375,-0.79375 0.79375,0.79375 0 0 0 -0.79375,-0.793749 0.79375,0.79375 0 0 0 -0.01344,0 z m 5.29e-4,0.264584 a 0.52916664,0.52916664 0 0 1 0.01291,0 0.52916664,0.52916664 0 0 1 0.529166,0.529165 A 0.52916664,0.52916664 0 0 1 19.05,63.764584 0.52916664,0.52916664 0 0 1 18.520833,63.235417 0.52916664,0.52916664 0 0 1 19.03708,62.706252 Z" />
+        <path
+           id="path869"
+           style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient4023);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+           d="m 21.153232,62.441668 a 0.79375,0.79375 0 0 0 -0.780314,0.793749 0.79375,0.79375 0 0 0 0.793749,0.79375 0.79375,0.79375 0 0 0 0.79375,-0.79375 0.79375,0.79375 0 0 0 -0.79375,-0.793749 0.79375,0.79375 0 0 0 -0.01344,0 z m 5.3e-4,0.264584 a 0.52916664,0.52916664 0 0 1 0.01291,0 0.52916664,0.52916664 0 0 1 0.529166,0.529165 0.52916664,0.52916664 0 0 1 -0.529166,0.529167 0.52916664,0.52916664 0 0 1 -0.529167,-0.529167 0.52916664,0.52916664 0 0 1 0.516247,-0.529165 z"
+           inkscape:original-d="m 21.153232,62.441668 a 0.79375,0.79375 0 0 0 -0.780314,0.793749 0.79375,0.79375 0 0 0 0.793749,0.79375 0.79375,0.79375 0 0 0 0.79375,-0.79375 0.79375,0.79375 0 0 0 -0.79375,-0.793749 0.79375,0.79375 0 0 0 -0.01344,0 z m 5.3e-4,0.264584 a 0.52916664,0.52916664 0 0 1 0.01291,0 0.52916664,0.52916664 0 0 1 0.529166,0.529165 0.52916664,0.52916664 0 0 1 -0.529166,0.529167 0.52916664,0.52916664 0 0 1 -0.529167,-0.529167 0.52916664,0.52916664 0 0 1 0.516247,-0.529165 z" />
+      </g>
+    </g>
+    <g
+       id="cell"
+       inkscape:label="cell"
+       transform="translate(0,-10.583333)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         inkscape:label="FRAME"
+         style="opacity:0;fill:url(#linearGradient4009);fill-opacity:1;stroke:none;stroke-width:0.264583"
+         id="rect931"
+         width="4.2333331"
+         height="4.2333331"
+         x="23.283331"
+         y="39.158329" />
+      <path
+         id="path887"
+         style="fill:url(#linearGradient4011);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 24.077082,39.95208 h 2.645833 v 2.645833 c 0,0 -2.645833,0 -2.645833,0 z m -0.264584,-0.79375 v 0.529166 h -0.529166 v 0.264584 h 0.529166 v 2.645833 h -0.529166 v 0.264583 h 0.529166 v 0.529167 h 0.264584 v -0.529167 h 2.645833 v 0.529167 h 0.264583 v -0.529167 h 0.529167 V 42.597913 H 26.987498 V 39.95208 h 0.529167 V 39.687496 H 26.987498 V 39.15833 h -0.264583 v 0.529166 H 24.077082 V 39.15833 Z" />
+      <path
+         id="rect890"
+         style="fill:url(#linearGradient4013);fill-opacity:1;stroke:none;stroke-width:0.264583"
+         d="m 24.341665,40.216663 v 2.116667 h 2.116667 v -2.116667 z m 0.264583,0.264583 h 1.5875 v 1.5875 h -1.5875 z" />
+    </g>
+    <g
+       id="dialogue-info1"
+       inkscape:label="dialogue-info"
+       transform="translate(0,-10.583333)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1451"
+         width="4.2333331"
+         height="4.2333331"
+         x="28.575001"
+         y="39.158333"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="rect1130"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2240);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 28.574998,39.158335 v 3.175 h 1.852083 l 1.058333,1.058334 h 0.264583 v -1.058334 h 1.058334 v -3.175 z m 0.264583,0.264584 h 3.704166 v 2.645833 h -1.058333 v 0.94878 l -0.948779,-0.94878 h -1.697054 z"
+         sodipodi:nodetypes="ccccccccccccccccc" />
+      <path
+         id="rect1168"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2242);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 29.236456,39.687502 c -0.07329,0 -0.132292,0.059 -0.132292,0.132292 v 0.529166 c 0,0.07329 0.059,0.132292 0.132292,0.132292 h 1.5875 c 0.07329,0 0.132292,-0.059 0.132292,-0.132292 v -0.529166 c 0,-0.07329 -0.059,-0.132292 -0.132292,-0.132292 z m 0.132292,0.264583 h 1.322916 v 0.264584 h -1.322916 z" />
+    </g>
+    <g
+       id="dialogue-info"
+       inkscape:label="dialogue-info"
+       transform="translate(0,-10.583333)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1449"
+         width="4.2333331"
+         height="4.2333331"
+         x="33.866673"
+         y="39.158333"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1189"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2244);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 34.131247,39.158335 v 3.175 h 1.852083 l 0.79375,0.793751 h 0.264583 v -0.793751 h 0.793751 v -3.175 z m 0.264583,0.264584 h 3.175 v 2.645833 h -0.79375 v 0.684197 L 36.092884,42.068752 H 34.39583 Z"
+         sodipodi:nodetypes="ccccccccccccccccc" />
+      <path
+         id="rect1191"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2246);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 35.851039,39.687502 c -0.07329,0 -0.132292,0.059 -0.132292,0.132292 v 0.264583 c 0,0.07329 0.059,0.132292 0.132292,0.132292 h 0.264583 c 0.07329,0 0.132292,-0.059 0.132292,-0.132292 v -0.264583 c 0,-0.07329 -0.059,-0.132292 -0.132292,-0.132292 z m -0.264583,0.79375 c -0.07329,0 -0.132292,0.059 -0.132292,0.132292 0,0.07329 0.059,0.132291 0.132292,0.132291 h 0.132291 v 0.79375 h -0.132291 c -0.07329,0 -0.132292,0.059 -0.132292,0.132292 0,0.07329 0.059,0.132292 0.132292,0.132292 h 0.264583 0.264583 0.264584 c 0.07329,0 0.132291,-0.059 0.132291,-0.132292 0,-0.07329 -0.059,-0.132292 -0.132291,-0.132292 h -0.132292 v -0.926041 c 0,-0.07329 -0.059,-0.132292 -0.132292,-0.132292 z" />
+    </g>
+    <g
+       id="journal-topics"
+       inkscape:label="journal-topics"
+       transform="translate(0,-10.583333)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1447"
+         width="4.2333331"
+         height="4.2333331"
+         x="39.158333"
+         y="39.158333"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="rect1204"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2248);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 39.422914,39.158335 v 0.529167 h -0.264583 v 0.264583 h 0.264583 v 0.264584 h -0.264583 v 0.264583 h 0.264583 v 0.264583 h -0.264583 v 0.264584 h 0.264583 v 0.264583 h -0.264583 v 0.264583 h 0.264583 v 0.264584 h -0.264583 v 0.264583 h 0.264583 v 0.264583 h -0.264583 v 0.264584 h 0.264583 v 0.529166 h 3.704167 v -3.96875 z m 0.264583,0.264584 h 2.645834 v 3.439583 h -2.645834 v -0.264583 h 0.264584 v -0.264584 h -0.264584 v -0.264583 h 0.264584 v -0.264583 h -0.264584 v -0.264584 h 0.264584 v -0.264583 h -0.264584 v -0.264583 h 0.264584 v -0.264584 h -0.264584 v -0.264583 h 0.264584 v -0.264583 h -0.264584 v -0.264584 h 0.264584 v -0.264583 h -0.264584 z m 2.910417,0 h 0.264583 v 3.439583 h -0.264583 z" />
+      <path
+         id="path1234"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2250);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 40.348956,39.952087 c -0.07329,0 -0.132292,0.059 -0.132292,0.132292 v 0.529167 c 0,0.07329 0.059,0.132291 0.132292,0.132291 h 1.5875 c 0.07329,0 0.132292,-0.059 0.132292,-0.132291 v -0.529167 c 0,-0.07329 -0.059,-0.132292 -0.132292,-0.132292 z m 0.132292,0.264584 h 1.322916 v 0.264583 h -1.322916 z" />
+    </g>
+    <g
+       id="journal-topic-infos"
+       inkscape:label="journal-topic-infos"
+       transform="translate(0,-10.583333)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1445"
+         width="4.2333331"
+         height="4.2333331"
+         x="44.450001"
+         y="39.158333"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1236"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2252);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 44.714577,39.158335 v 0.529167 h -0.264583 v 0.264583 h 0.264583 v 0.264584 h -0.264583 v 0.264583 h 0.264583 v 0.264583 h -0.264583 v 0.264584 h 0.264583 v 0.264583 h -0.264583 v 0.264583 h 0.264583 v 0.264584 h -0.264583 v 0.264583 h 0.264583 v 0.264583 h -0.264583 v 0.264584 h 0.264583 v 0.529166 h 3.704167 v -3.96875 z m 0.264583,0.264584 h 2.645834 v 3.439583 H 44.97916 v -0.264583 h 0.264584 V 42.333335 H 44.97916 v -0.264583 h 0.264584 V 41.804169 H 44.97916 v -0.264584 h 0.264584 V 41.275002 H 44.97916 v -0.264583 h 0.264584 V 40.745835 H 44.97916 v -0.264583 h 0.264584 V 40.216669 H 44.97916 v -0.264584 h 0.264584 V 39.687502 H 44.97916 Z m 2.910417,0 h 0.264583 v 3.439583 h -0.264583 z" />
+      <path
+         id="path1238"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2254);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 46.434371,39.952085 c -0.07329,0 -0.132292,0.059 -0.132292,0.132292 v 0.264583 c 0,0.07329 0.059,0.132292 0.132292,0.132292 h 0.264583 c 0.07329,0 0.132292,-0.059 0.132292,-0.132292 v -0.264583 c 0,-0.07329 -0.059,-0.132292 -0.132292,-0.132292 z m -0.264583,0.79375 c -0.07329,0 -0.132292,0.059 -0.132292,0.132292 0,0.07329 0.059,0.132291 0.132292,0.132291 h 0.132291 v 0.79375 h -0.132291 c -0.07329,0 -0.132292,0.059 -0.132292,0.132292 0,0.07329 0.059,0.132292 0.132292,0.132292 h 0.264583 0.264583 0.264584 c 0.07329,0 0.132291,-0.059 0.132291,-0.132292 0,-0.07329 -0.059,-0.132292 -0.132291,-0.132292 h -0.132292 v -0.926041 c 0,-0.07329 -0.059,-0.132292 -0.132292,-0.132292 z" />
+    </g>
+    <g
+       id="enchantment"
+       inkscape:label="enchantment"
+       transform="translate(0,-10.583333)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1439"
+         width="4.2333331"
+         height="4.2333331"
+         x="49.741661"
+         y="39.158333"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1254"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2256);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 51.14158,39.422919 c -0.517835,0 -0.868273,0.700013 -0.892453,0.772562 l 0.02791,0.077 c 0.102317,-0.08372 0.33977,-0.320395 0.868164,-0.320395 0.331164,0 0.713135,0.237302 0.713135,0.689364 0,0.452414 -0.794579,1.159825 -1.322917,1.691886 v 0.264584 h 1.322912 v 0.529166 h 0.264583 V 42.59792 h 0.264583 c 0.115761,0.155225 0.264581,0.264583 0.529167,0.264583 0.264586,0 0.529167,-0.121753 0.529167,-0.396875 0,-0.275122 -0.264581,-0.396875 -0.529167,-0.396875 -0.264586,0 -0.413406,0.104095 -0.529167,0.264583 h -0.264583 v -0.529167 h -0.264583 v 0.529166 h -0.925008 c 0.532062,-0.528341 1.454174,-1.073533 1.454174,-1.691886 0,-0.826206 -0.2668,-1.21853 -1.245917,-1.21853 z m -0.341583,1.058333 v 0.529167 h 0.264584 c 0,-0.132292 0.132291,-0.264584 0.264583,-0.264584 v -0.264583 z m 1.852084,1.852083 h 0.529166 v 0.264584 h -0.529166 z" />
+    </g>
+    <g
+       id="faction"
+       inkscape:label="faction"
+       transform="translate(0,-10.583333)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1441"
+         width="4.2333331"
+         height="4.2333331"
+         x="55.033329"
+         y="39.158333"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="rect1588"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2258);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 55.033331,39.158335 v 0.264584 h 0.79375 v 0.264583 h -0.529167 v 0.264583 h 0.264583 v 3.439584 h 0.264584 l 1.322916,-0.529167 1.322917,0.529167 h 0.264583 v -3.439584 h 0.264583 v -0.264583 h -0.529166 v -0.264583 h 0.79375 v -0.264584 z m 1.058333,0.264584 h 0.529167 v 0.264583 h -0.529167 z m 0.79375,0 h 0.529167 v 0.264583 h -0.529167 z m 0.79375,0 h 0.529166 v 0.264583 h -0.529166 z m -1.852083,0.529166 h 2.645833 v 3.175 l -1.322917,-0.529166 -1.322916,0.529166 z" />
+      <path
+         id="path1615"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2260);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 57.136562,40.481252 a 0.79374999,0.79374999 0 0 0 -0.780315,0.79375 0.79374999,0.79374999 0 0 0 0.79375,0.79375 0.79374999,0.79374999 0 0 0 0.79375,-0.79375 0.79374999,0.79374999 0 0 0 -0.79375,-0.79375 0.79374999,0.79374999 0 0 0 -0.01344,0 z m 5.29e-4,0.264583 a 0.5291661,0.52916788 0 0 1 0.01291,0 0.5291661,0.52916788 0 0 1 0.529167,0.529167 0.5291661,0.52916788 0 0 1 -0.529167,0.529167 0.5291661,0.52916788 0 0 1 -0.529166,-0.529167 0.5291661,0.52916788 0 0 1 0.516247,-0.529167 z" />
+    </g>
+    <g
+       id="filter"
+       inkscape:label="filter"
+       transform="translate(0,-10.583333)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1465"
+         width="4.2333331"
+         height="4.2333331"
+         x="60.325001"
+         y="39.158333"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1654"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2262);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 60.324997,39.158335 v 0.507463 l 1.5875,1.5875 v 1.322917 l 0.550871,0.55087 h 0.507462 v -1.873787 l 1.5875,-1.5875 v -0.507463 z m 0.264583,0.264584 h 3.704167 v 0.132291 l -1.5875,1.5875 v 1.719792 H 62.573955 L 62.17708,42.465627 V 41.14271 l -1.5875,-1.5875 z" />
+    </g>
+    <g
+       id="spell"
+       inkscape:label="spell"
+       transform="translate(0,-10.583333)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1485"
+         width="4.2333331"
+         height="4.2333331"
+         x="2.1166692"
+         y="44.449997"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2188);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect1536"
+         width="0.26458332"
+         height="1.8520834"
+         x="2.6458333"
+         y="45.508331"
+         rx="1.3877792e-16" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2190);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect1538"
+         width="0.26458332"
+         height="0.26458332"
+         x="3.175"
+         y="46.302082"
+         rx="1.3877792e-16" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2192);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect1540"
+         width="0.26458332"
+         height="0.26458332"
+         x="3.4395833"
+         y="46.831253"
+         rx="1.3877792e-16" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2194);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect1542"
+         width="0.26458332"
+         height="0.26458332"
+         x="5.0270834"
+         y="46.302086"
+         rx="1.3877792e-16" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2196);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect1544"
+         width="0.26458332"
+         height="0.26458332"
+         x="4.7624998"
+         y="46.831253"
+         rx="1.3877792e-16" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2198);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect1546"
+         width="0.26458332"
+         height="1.8520834"
+         x="5.5562501"
+         y="45.508331"
+         rx="1.3877792e-16" />
+      <path
+         id="rect1548"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2200);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="M 2.5,172 C 2.2229984,172 2,172.22299 2,172.5 V 173 H 1 v 2 h 1 v 0.5 c 0,0.277 0.2229999,0.5 0.5,0.5 h 13 c 0.277002,0 0.5,-0.22299 0.5,-0.5 V 175 h 1 v -2 h -1 v -0.5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m 0.5,1 h 12 v 2 H 3 Z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+      <path
+         id="rect1552"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2202);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="M 2.5,161 C 2.2229984,161 2,161.223 2,161.5 V 162 H 1 v 2 h 1 v 0.5 c 0,0.27701 0.2229984,0.5 0.5,0.5 h 13 c 0.277002,0 0.5,-0.223 0.5,-0.5 V 164 h 1 v -2 h -1 v -0.5 c 0,-0.27701 -0.222998,-0.5 -0.5,-0.5 z m 0.5,1 h 12 v 2 H 3 Z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+      <path
+         id="path1720"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2218);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 3.9687513,45.772918 c 0,0.132294 -0.132292,0.264586 -0.264583,0.264583 v 0.529167 c 0.132291,2e-6 0.264583,0.132294 0.264583,0.264583 h 0.529167 c 0,-0.132289 0.132291,-0.264581 0.264583,-0.264583 v -0.529167 c -0.132292,3e-6 -0.264583,-0.132289 -0.264583,-0.264583 z m 0,0.264583 h 0.529167 v 0.529167 h -0.529167 z"
+         sodipodi:nodetypes="cccccccccccccc" />
+    </g>
+    <g
+       id="magic-effect"
+       inkscape:label="magic-effect"
+       transform="translate(0,-10.583333)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1483"
+         width="4.2333331"
+         height="4.2333331"
+         x="7.4083323"
+         y="44.449997"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="rect1699"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2204);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         transform="rotate(-45)"
+         d="m -25.631978,39.530506 h 1.124191 l 0.186259,0.132293 -0.186259,0.13229 h -1.124191 l -0.186259,-0.13229 z"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         id="path1702"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2206);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 8.2402436,45.469002 0.7949232,0.794923 0.2252513,0.03816 -0.03816,-0.225249 -0.7949239,-0.794923 -0.2252483,-0.03816 z"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         id="path1704"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2208);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 9.2222604,47.0565 -0.7949232,0.794923 -0.2252513,0.03816 0.03816,-0.225249 0.7949239,-0.794923 0.2252483,-0.03816 z"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         id="path1706"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2210);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 9.8277434,47.0565 0.7949226,0.794923 0.225251,0.03816 -0.03816,-0.225249 -0.794923,-0.794923 -0.2252483,-0.03816 z"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         id="path1708"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2186);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 28,161 c 1e-6,0.50001 -0.499999,1.00001 -1,1 v 2 c 0.500001,1e-5 1.000001,0.50001 1,1 h 2 c 1e-6,-0.49999 0.500001,-0.99999 1,-1 v -2 c -0.499999,1e-5 -0.999999,-0.49999 -1,-1 z m 0,1 h 2 v 2 h -2 z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)"
+         sodipodi:nodetypes="cccccccccccccc" />
+      <path
+         id="path1714"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2212);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 9.2604165,47.624999 c 3e-7,0.132294 -0.1322914,0.264586 -0.2645833,0.264583 v 0.529167 c 0.1322919,2e-6 0.2645836,0.132294 0.2645833,0.264583 h 0.5291667 c 3e-7,-0.132289 0.1322919,-0.264581 0.2645838,-0.264583 v -0.529167 c -0.1322919,3e-6 -0.2645835,-0.132289 -0.2645838,-0.264583 z m 0,0.264583 h 0.5291667 v 0.529167 H 9.2604165 Z"
+         sodipodi:nodetypes="cccccccccccccc" />
+      <path
+         id="path1716"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2214);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 7.6729184,46.037501 c 0,0.132294 -0.132292,0.264586 -0.264583,0.264583 v 0.529167 c 0.132291,2e-6 0.264583,0.132294 0.264583,0.264583 h 0.529167 c 0,-0.132289 0.132291,-0.264581 0.264583,-0.264583 v -0.529167 c -0.132292,3e-6 -0.264583,-0.132289 -0.264583,-0.264583 z m 0,0.264583 h 0.529167 v 0.529167 h -0.529167 z"
+         sodipodi:nodetypes="cccccccccccccc" />
+      <path
+         id="path1718"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2216);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 10.847918,46.037501 c 0,0.132294 -0.132292,0.264586 -0.264583,0.264583 v 0.529167 c 0.132291,2e-6 0.264583,0.132294 0.264583,0.264583 h 0.529167 c 0,-0.132289 0.132291,-0.264581 0.264583,-0.264583 v -0.529167 c -0.132292,3e-6 -0.264583,-0.132289 -0.264583,-0.264583 z m 0,0.264583 h 0.529167 v 0.529167 h -0.529167 z"
+         sodipodi:nodetypes="cccccccccccccc" />
+    </g>
+    <g
+       id="race"
+       inkscape:label="race"
+       transform="translate(0,-10.583333)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1481"
+         width="4.2333331"
+         height="4.2333331"
+         x="12.700003"
+         y="44.449997"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1801"
+         mask="none"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2462);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 14.816667,44.449999 c -0.513578,0 -1.5875,0.423768 -1.5875,1.5875 l -0.529166,0.529167 v 0.529167 h 0.529166 c 0,0.930045 0.361988,1.058333 0.79375,1.058333 v 0.529167 h 0.79375 v -0.264584 h -0.529166 v -0.263548 a 0.26560994,0.26560994 0 0 0 -0.265617,-0.266134 c -0.189524,0 -0.294034,-0.02426 -0.366903,-0.09922 -0.07287,-0.07495 -0.160197,-0.262858 -0.160197,-0.693499 a 0.26560994,0.26560994 0 0 0 -0.265617,-0.265616 h -0.263549 v -0.154514 l 0.451135,-0.451135 a 0.26560994,0.26560994 0 0 0 0.07803,-0.187069 c 0,-0.500139 0.215724,-0.806127 0.496094,-1.018024 0.280156,-0.211738 0.641983,-0.304233 0.825789,-0.304374 z" />
+      <path
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient4027);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 13.361461,45.772914 h 0.926041 l -0.463434,0.568234 -0.187895,-0.15813 0.258589,-0.241845 -0.52834,0.100458 z"
+         id="path1805"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         id="path1866"
+         mask="none"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient4029);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 14.816667,44.449999 v 4.233334 h 0.79375 v -0.529167 c 0.431762,0 0.79375,-0.128288 0.79375,-1.058333 h 0.529167 v -0.529167 l -0.529167,-0.529167 c 0,-1.163732 -1.073922,-1.5875 -1.5875,-1.5875 z m 0.514697,1.322917 h 1.008724 l 0.03514,0.165365 -0.642855,-0.03979 0.333829,0.168981 -0.183968,0.109554 z" />
+    </g>
+    <g
+       id="global-variable"
+       inkscape:label="global-variable"
+       transform="translate(0,-10.583333)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1509"
+         width="4.2333331"
+         height="4.2333331"
+         x="2.1166692"
+         y="49.741661"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1755"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2170);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 5.9140625,185 -0.080078,0.48828 0.8886718,0.16602 1.6425782,3.24804 -3.2011719,3.4668 -0.9082031,0.14648 L 4.1660156,193 h 2.7285156 l 0.089844,-0.47656 -0.8828125,-0.15625 2.59375,-2.8086 1.4199213,2.81055 -0.9531244,0.14844 L 9.0683594,193 h 3.3964846 l 0.07813,-0.48242 -0.90625,-0.16797 -1.9511721,-3.86328 2.6289061,-2.84571 0.919922,-0.15039 L 13.324219,185 H 10.59375 l -0.08984,0.48242 0.875,0.15625 -2.0234372,2.19141 -1.1074219,-2.19141 0.9667969,-0.15039 L 9.3085938,185 Z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    </g>
+    <g
+       id="gmst"
+       inkscape:label="gmst"
+       transform="translate(0,-10.583333)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1507"
+         width="4.2333331"
+         height="4.2333331"
+         x="7.4083323"
+         y="49.741661"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="rect1797"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2154);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 22,181 v 15 h 14 v -15 z m 1,1 h 12 v 13 H 23 Z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)"
+         sodipodi:nodetypes="cccccccccc" />
+      <path
+         id="rect1804"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2156);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 24,183 v 5 h 4 v -3 h -2 v 1 h 1 v 1 h -2 v -3 h 1 2 v -1 z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)"
+         sodipodi:nodetypes="cccccccccccccc" />
+      <path
+         id="rect1806"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2158);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 29,183 v 5 h 1 v -3.5 l 1.5,2.5 1.5,-2.5 v 3.5 h 1 v -5 H 33 L 31.5,185.5 30,183 Z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+      <path
+         id="rect1808"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2160);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 24,189 v 3 h 2.75 v 1 H 24 v 1 h 4 v -3 h -3 v -1 h 3 v -1 z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+      <path
+         id="rect1810"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2162);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 29,189 v 1 h 2 v 4 h 1 v -4 h 2 v -1 z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    </g>
+    <g
+       id="land-heightmap"
+       inkscape:label="land-heightmap"
+       transform="translate(0,-10.583333)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1505"
+         width="4.2333331"
+         height="4.2333331"
+         x="12.700003"
+         y="49.741661"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="rect1888"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2164);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 42,182 v 14 h 14 v -14 z m 1,1 h 1 v 1 h -1 z m 2,0 h 2 v 1 h -2 z m 3,0 h 2 v 1 h -2 z m 3,0 h 2 v 1 h -2 z m 3,0 h 1 v 1 h -1 z m -11,2 h 1 v 2 h -1 z m 2,0 h 2 v 2 h -2 z m 3,0 h 2 v 2 h -2 z m 3,0 h 2 v 2 h -2 z m 3,0 h 1 v 2 h -1 z m -11,3 h 1 v 2 h -1 z m 2,0 h 2 v 2 h -2 z m 3,0 h 2 v 2 h -2 z m 3,0 h 2 v 2 h -2 z m 3,0 h 1 v 2 h -1 z m -11,3 h 1 v 2 h -1 z m 2,0 h 2 v 2 h -2 z m 3,0 h 2 v 2 h -2 z m 3,0 h 2 v 2 h -2 z m 3,0 h 1 v 2 h -1 z m -11,3 h 1 v 1 h -1 z m 2,0 h 2 v 1 h -2 z m 3,0 h 2 v 1 h -2 z m 3,0 h 2 v 1 h -2 z m 3,0 h 1 v 1 h -1 z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    </g>
+    <g
+       id="land-texture"
+       inkscape:label="land-texture"
+       transform="translate(0,-10.583333)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1503"
+         width="4.2333331"
+         height="4.2333331"
+         x="17.991665"
+         y="49.741661"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1973"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2166);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 17.991666,49.741665 v 4.233334 h 4.233333 v -4.233334 z m 0.264583,0.264584 h 3.704166 v 3.704166 h -3.704166 z" />
+      <path
+         id="path1975"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2168);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 18.520832,50.270832 v 3.175 h 3.175 v -3.175 z m 0.264584,0.264583 h 0.529166 v 0.529167 h 0.79375 v -0.529167 h 0.79375 v 0.529167 h 0.529167 v 0.79375 h -0.529167 v 0.79375 h 0.529167 v 0.529167 h -0.529167 v -0.529167 h -0.79375 v 0.529167 h -0.79375 v -0.529167 h -0.529166 v -0.79375 h 0.529166 v -0.79375 h -0.529166 z m 0.529166,1.322917 v 0.79375 h 0.79375 v -0.79375 z m 0.79375,0 h 0.79375 v -0.79375 h -0.79375 z" />
+    </g>
+    <g
+       id="pathgrid"
+       inkscape:label="pathgrid"
+       transform="translate(0,-10.583333)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1501"
+         width="4.2333331"
+         height="4.2333331"
+         x="23.283337"
+         y="49.741661"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="rect1979"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2174);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 88,184 v 1 h 5 v 2 h 1 v -3 z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+      <path
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#62a0ea;fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 24.209376,49.741668 -0.661458,1.190624 0.661458,1.190626 0.661459,-1.190626 z"
+         id="path1986"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         id="path1988"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2172);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 25.664584,53.181251 v -0.264583 h -1.322917 v -0.529167 h -0.264583 v 0.79375 z" />
+      <path
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2492);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 26.590624,53.974999 0.661458,-1.190624 -0.661458,-1.190626 -0.661459,1.190626 z"
+         id="path1990"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2494);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 24.209376,49.741668 -0.661458,1.190624 0.661458,1.190626 0.661459,-1.190626 z"
+         id="path7234"
+         sodipodi:nodetypes="ccccc" />
+    </g>
+    <g
+       id="region"
+       inkscape:label="region"
+       transform="translate(0,-10.583333)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1499"
+         width="4.2333331"
+         height="4.2333331"
+         x="28.575001"
+         y="49.741661"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="rect1992"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2176);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 101,181 v 16 h 16 v -16 z m 1,1 h 5 v 4 h -2 v 4 h -3 z m 6,0 h 6 2 v 6 h -2 v -2 h -4 v -2 h -2 z m 0,3 h 1 v 1 h -1 z m -2,2 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m -6,2 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 2 v 7 h -2 -4 v -3 h 2 v -2 h 2 z m -12,2 h 3 v 2 h 4 v 3 h -4 -3 z m 4,0 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    </g>
+    <g
+       id="script"
+       inkscape:label="script"
+       transform="translate(0,-10.583333)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1497"
+         width="4.2333331"
+         height="4.2333331"
+         x="33.866673"
+         y="49.741661"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="rect2091"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2178);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 122,181 v 16 h 14 v -16 z m 1,1 h 12 v 14 h -12 z m 1,1 v 1 h 1 v -1 z m 2,0 v 1 h 8 v -1 z m -2,2 v 1 h 1 v -1 z m 2,0 v 1 h 5 v -1 z m -2,2 v 1 h 1 v -1 z m 2,0 v 1 h 2 v -1 z m -2,2 v 1 h 1 v -1 z m 0,2 v 1 h 1 v -1 z m 2,0 v 1 h 6 v -1 z m -2,2 v 1 h 1 v -1 z m 2,0 v 1 h 3 v -1 z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    </g>
+    <g
+       id="skill"
+       inkscape:label="skill"
+       transform="translate(0,-10.583333)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1495"
+         width="4.2333331"
+         height="4.2333331"
+         x="39.158333"
+         y="49.741661"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="rect2146"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2180);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 146.5,181 c -0.27702,0 -0.5,0.223 -0.5,0.5 v 2 c 0,0.27702 0.223,0.5 0.5,0.5 h 2.5 v 1 h -5 v -0.5 c 0,-0.27704 -0.22299,-0.5 -0.5,-0.5 h -2 c -0.27704,0 -0.5,0.22299 -0.5,0.5 v 2 c 0,0.277 0.22299,0.5 0.5,0.5 h 2 c 0.277,0 0.5,-0.22299 0.5,-0.5 V 186 h 5 v 2 h -4 v 1 1 h -0.5 c -0.27704,0 -0.5,0.22299 -0.5,0.5 v 2 c 0,0.277 0.22299,0.5 0.5,0.5 h 2 c 0.277,0 0.5,-0.22299 0.5,-0.5 v -2 c 0,-0.27704 -0.22299,-0.5 -0.5,-0.5 H 146 v -1 h 3 v 6 h -4 v -0.5 c 0,-0.27704 -0.22299,-0.5 -0.5,-0.5 h -2 c -0.27704,0 -0.5,0.22299 -0.5,0.5 v 2 c 0,0.277 0.22299,0.5 0.5,0.5 h 2 c 0.277,0 0.5,-0.22299 0.5,-0.5 V 196 h 7 v 0.5 c 0,0.277 0.22299,0.5 0.5,0.5 h 2 c 0.277,0 0.5,-0.22299 0.5,-0.5 v -2 c 0,-0.27704 -0.22299,-0.5 -0.5,-0.5 h -2 c -0.27704,0 -0.5,0.22299 -0.5,0.5 v 0.5 h -2 v -4 h 4 v 0.5 c 0,0.277 0.22299,0.5 0.5,0.5 h 2 c 0.277,0 0.5,-0.22299 0.5,-0.5 v -2 c 0,-0.27704 -0.22299,-0.5 -0.5,-0.5 h -2 c -0.27704,0 -0.5,0.22299 -0.5,0.5 v 0.5 h -4 v -3 h 3 v 0.5 c 0,0.277 0.22299,0.5 0.5,0.5 h 2 c 0.277,0 0.5,-0.22299 0.5,-0.5 v -2 c 0,-0.27704 -0.22299,-0.5 -0.5,-0.5 h -2 c -0.27704,0 -0.5,0.22299 -0.5,0.5 v 0.5 h -3 v -2 h 2.5 c 0.27702,0 0.5,-0.223 0.5,-0.5 v -2 c 0,-0.27702 -0.223,-0.5 -0.5,-0.5 z m 0.5,1 h 5 v 1 h -5 z m -5,3 h 1 v 1 h -1 z m 12,1 h 1 v 1 h -1 z m 1,4 h 1 v 1 h -1 z m -10,1 h 1 v 1 h -1 z m -2,4 h 1 v 1 h -1 z m 10,0 h 1 v 1 h -1 z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    </g>
+    <g
+       id="start-script"
+       inkscape:label="start-script"
+       transform="translate(0,-10.583333)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1493"
+         width="4.2333331"
+         height="4.2333331"
+         x="44.450001"
+         y="49.741661"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1895"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2182);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 162,181 v 16 h 9 v -1 h -8 v -14 h 12 v 9 h 1 v -10 z m 2,2 v 1 h 1 v -1 z m 2,0 v 1 h 8 v -1 z m -2,2 v 1 h 1 v -1 z m 2,0 v 1 h 5 v -1 z m -2,2 v 1 h 1 v -1 z m 2,0 v 1 h 2 v -1 z m -2,2 v 1 h 1 v -1 z m 0,2 v 1 h 1 v -1 z m 2,0 v 1 h 5 v -1 z m -2,2 v 1 h 1 v -1 z m 2,0 v 1 h 3 v -1 z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)"
+         sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" />
+      <path
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2490);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;stop-color:#000000;stop-opacity:1"
+         d="m 48.418752,53.181252 -0.79375,0.79375 h -0.264583 v -1.852083 h 0.264583 l 0.79375,0.79375 z"
+         id="path1897" />
+    </g>
+    <g
+       id="menu-new-game"
+       inkscape:label="menu-new-game"
+       transform="translate(0,-15.874999)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1534"
+         width="4.2333331"
+         height="4.2333331"
+         x="2.1166692"
+         y="60.324989"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1440"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2104);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 3,222 v 15 h 12 v -11 l -4,-4 z m 1,1 h 6 v 4 h 4 v 9 H 4 Z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    </g>
+    <g
+       id="menu-new-addon"
+       inkscape:label="menu-new-addon"
+       transform="translate(0,-15.874999)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1532"
+         width="4.2333331"
+         height="4.2333331"
+         x="7.4083323"
+         y="60.324989"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1444"
+         style="fill:url(#linearGradient2106);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 23,222 v 15 h 3 v -1 h -2 v -13 h 6 v 4 h 4 v 5 h 1 v -6 l -4,-4 z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+      <path
+         id="path1449"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2108);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 29,231 v 2 h -2 v 4 h 8 v -4 h -2 v -2 z m 1,1 h 2 v 2 h 2 v 2 h -6 v -2 h 2 z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    </g>
+    <g
+       id="menu-merge"
+       inkscape:label="menu-merge"
+       transform="translate(0,-15.874999)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1530"
+         width="4.2333331"
+         height="4.2333331"
+         x="12.700003"
+         y="60.324989"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="rect1525"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2110);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 43,223 v 4 h 7 v -4 z m 1,1 h 5 v 2 h -5 z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+      <path
+         id="path1533"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2112);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 14.816667,61.912502 v 1.058333 h 1.852083 v -1.058333 z m 0.264583,0.264583 h 1.322917 v 0.529167 H 15.08125 Z" />
+      <path
+         id="path1535"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2114);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 13.229167,62.970835 v 1.058333 h 1.852083 v -1.058333 z m 0.264583,0.264583 h 1.322917 v 0.529167 H 13.49375 Z" />
+    </g>
+    <g
+       id="menu-new-window"
+       inkscape:label="menu-new-window"
+       transform="translate(0,-15.874999)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1528"
+         width="4.2333331"
+         height="4.2333331"
+         x="17.991665"
+         y="60.324989"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2116);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 19.314584,64.029168 h -0.79375 v -3.174999 h 3.175 v 0.79375 h -0.264583 v -0.264584 h -2.645834 v 2.38125 h 0.529167 z"
+         id="path1537" />
+      <path
+         id="path1541"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2118);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 67,227 v 8 h 8 v -8 z m 1,2 h 6 v 5 h -6 z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    </g>
+    <g
+       id="menu-open"
+       inkscape:label="menu-open"
+       transform="translate(0,-15.874999)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1526"
+         width="4.2333331"
+         height="4.2333331"
+         x="23.283337"
+         y="60.324989"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1564"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2120);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 82,222 v 14 h 14 v -12 h -6 l -2,-2 z m 5,4 h 8 v 9 H 83 v -7 h 2 z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    </g>
+    <g
+       id="menu-status-bar"
+       inkscape:label="menu-status-bar"
+       transform="translate(0,-15.874999)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1523"
+         width="4.2333331"
+         height="4.2333331"
+         x="28.575001"
+         y="60.324989"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2122);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 29.104166,62.970835 v -2.116666 h 3.175 v 2.116666 h -0.264583 v -1.5875 H 29.36875 v 1.5875 z"
+         id="path2048" />
+      <path
+         id="rect2052"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2124);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 103,232 v 3 h 12 v -3 z m 1,1 h 10 v 1 h -10 z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    </g>
+    <g
+       id="menu-preferences"
+       inkscape:label="menu-preferences"
+       transform="translate(0,-15.874999)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1521"
+         width="4.2333331"
+         height="4.2333331"
+         x="33.866673"
+         y="60.324989"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path2087"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2126);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 127.5,221 a 2.4999999,2.4999999 0 0 0 -2.5,2.5 2.4999999,2.4999999 0 0 0 2.5,2.5 2.4999999,2.4999999 0 0 0 2.5,-2.5 2.4999999,2.4999999 0 0 0 -2.5,-2.5 z m 0,1 a 1.5,1.5 0 0 1 1.5,1.5 1.5,1.5 0 0 1 -1.5,1.5 1.5,1.5 0 0 1 -1.5,-1.5 1.5,1.5 0 0 1 1.5,-1.5 z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+      <path
+         id="path2089"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2128);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 132.5,226 a 2.4999999,2.4999999 0 0 0 -2.5,2.5 2.4999999,2.4999999 0 0 0 2.5,2.5 2.4999999,2.4999999 0 0 0 2.5,-2.5 2.4999999,2.4999999 0 0 0 -2.5,-2.5 z m 0,1 a 1.5,1.5 0 0 1 1.5,1.5 1.5,1.5 0 0 1 -1.5,1.5 1.5,1.5 0 0 1 -1.5,-1.5 1.5,1.5 0 0 1 1.5,-1.5 z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+      <path
+         id="path2091"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2130);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 35.321875,62.970833 a 0.6614583,0.6614583 0 0 0 -0.661459,0.661458 0.6614583,0.6614583 0 0 0 0.661459,0.661458 0.6614583,0.6614583 0 0 0 0.661458,-0.661458 0.6614583,0.6614583 0 0 0 -0.661458,-0.661458 z m 0,0.264583 a 0.396875,0.396875 0 0 1 0.396875,0.396875 0.396875,0.396875 0 0 1 -0.396875,0.396875 0.396875,0.396875 0 0 1 -0.396875,-0.396875 0.396875,0.396875 0 0 1 0.396875,-0.396875 z" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2132);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect2095"
+         width="2.5135405"
+         height="0.26458237"
+         x="33.866669"
+         y="62.177086"
+         rx="1.3877792e-16" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2134);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect1311"
+         width="1.9843726"
+         height="0.26458332"
+         x="36.115627"
+         y="60.854168"
+         rx="1.3877792e-16" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2136);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect1313"
+         width="1.1906255"
+         height="0.26458332"
+         x="33.866669"
+         y="60.854168"
+         rx="1.3877792e-16" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2138);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect1315"
+         width="0.66145945"
+         height="0.26458237"
+         x="37.438541"
+         y="62.177086"
+         rx="1.3877792e-16" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2140);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect1317"
+         width="2.2489626"
+         height="0.26458359"
+         x="35.851044"
+         y="63.5"
+         rx="1.3877792e-16" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2142);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect1319"
+         width="0.92604423"
+         height="0.26458359"
+         x="33.866665"
+         y="63.5"
+         rx="1.3877792e-16" />
+    </g>
+    <g
+       id="menu-exit"
+       inkscape:label="menu-exit"
+       transform="translate(0,-15.874999)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1519"
+         width="4.2333331"
+         height="4.2333331"
+         x="39.158333"
+         y="60.324989"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="rect2073"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient6522);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 39.6875,60.854168 v 3.175 h 3.175 v -3.175 z m 0.264584,0.79375 h 2.645833 v 2.116666 h -2.645833 z m 0.79375,0.79375 v 0.529166 h 1.058333 v -0.529166 z" />
+    </g>
+    <g
+       id="menu-undo"
+       inkscape:label="menu-undo"
+       transform="translate(0,-15.874999)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1517"
+         width="4.2333331"
+         height="4.2333331"
+         x="44.450001"
+         y="60.324989"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1337"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2092);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 45.243747,61.647913 v 0.264583 h 1.455208 c 0.511439,0 0.926042,0.414602 0.926042,0.926042 0,0.511439 -0.414603,0.926041 -0.926042,0.926041 H 46.30208 v 0.264584 h 0.396875 c 0.657564,0 1.190625,-0.533062 1.190625,-1.190625 0,-0.657564 -0.533061,-1.190625 -1.190625,-1.190625 z"
+         sodipodi:nodetypes="ccsssccsssc" />
+      <path
+         id="path1339"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2094);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 45.96515,60.854163 -0.975651,0.926041 0.975651,0.926042 0.12299,-0.181901 -0.65009,-0.611849 v -0.264583 l 0.65009,-0.611849 z"
+         sodipodi:nodetypes="cccccccc" />
+    </g>
+    <g
+       id="menu-redo"
+       inkscape:label="menu-redo"
+       transform="translate(0,-15.874999)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1511"
+         width="4.2333331"
+         height="4.2333331"
+         x="49.741661"
+         y="60.324989"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1343"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2096);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 52.926998,61.647913 v 0.264583 H 51.47179 c -0.511439,0 -0.926042,0.414602 -0.926042,0.926042 0,0.511439 0.414603,0.926041 0.926042,0.926041 h 0.396875 v 0.264584 H 51.47179 c -0.657564,0 -1.190625,-0.533062 -1.190625,-1.190625 0,-0.657564 0.533061,-1.190625 1.190625,-1.190625 z"
+         sodipodi:nodetypes="ccsssccsssc" />
+      <path
+         id="path1347"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2098);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 52.205595,60.854163 0.975651,0.926041 -0.975651,0.926042 -0.12299,-0.181901 0.65009,-0.611849 v -0.264583 l -0.65009,-0.611849 z"
+         sodipodi:nodetypes="cccccccc" />
+    </g>
+    <g
+       id="menu-save"
+       inkscape:label="menu-save"
+       transform="translate(0,-15.874999)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1513"
+         width="4.2333331"
+         height="4.2333331"
+         x="55.033329"
+         y="60.324989"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1447"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2100);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 202,222 v 14 h 14 v -11 l -3,-3 z m 10.5,1 2.5,2.5 v 9.5 h -2 v -6 h -8 v 6 h -2 v -12 h 3 v 4 h 6 v -4 m -5,0 h 2 v 3 h -2 z m -1,7 h 6 v 5 h -6 z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)"
+         sodipodi:nodetypes="ccccccccccccccccccccccccccccc" />
+    </g>
+    <g
+       id="region-map"
+       inkscape:label="region-map"
+       transform="translate(0,-15.874999)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1539"
+         width="4.2333331"
+         height="4.2333331"
+         x="60.325001"
+         y="60.325001"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1481"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2102);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 227,224 v 2 h -2 v 7 h 7 v -2 h 2 v -5 h -4 v -2 z m 1,1 h 1 v 1 h -1 z m -2,2 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m -6,2 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m -6,2 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)"
+         sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" />
+      <path
+         id="path1499"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2488);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 60.325002,60.325001 v 2.38125 h 0.79375 v -1.322917 h 0.529167 v -0.529166 h 0.264583 v -0.529167 z m 1.852083,0 v 0.529167 h 0.79375 v 0.529166 h 1.058334 v 0.79375 h 0.529166 v -1.852083 z m 1.852084,2.116667 v 0.79375 h -0.529167 v 0.529166 h -0.79375 v 0.79375 h 1.852083 v -2.116666 z m -3.704167,0.529166 v 1.5875 h 2.116667 v -0.79375 h -1.322917 v -0.79375 z" />
+    </g>
+    <g
+       id="menu-search"
+       inkscape:label="menu-search"
+       transform="translate(0,-15.874999)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1559"
+         width="4.2333331"
+         height="4.2333331"
+         x="2.1166692"
+         y="65.616653"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1935"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="M 6.5,242 A 4.5,4.5 0 0 0 2,246.5 4.5,4.5 0 0 0 6.5,251 4.5,4.5 0 0 0 11,246.5 4.5,4.5 0 0 0 6.5,242 Z m 0,1 A 3.5000002,3.5000002 0 0 1 10,246.5 3.5000002,3.5000002 0 0 1 6.5,250 3.5000002,3.5000002 0 0 1 3,246.5 3.5000002,3.5000002 0 0 1 6.5,243 Z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient4033);fill-opacity:1;stroke:none;stroke-width:0.999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect1942"
+         width="0.52916664"
+         height="0.52916664"
+         x="2.6458333"
+         y="68.791672" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient4035);fill-opacity:1;stroke:none;stroke-width:0.999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect1948"
+         width="0.52916664"
+         height="0.52916664"
+         x="3.4395833"
+         y="68.791672" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient4037);fill-opacity:1;stroke:none;stroke-width:0.999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect1950"
+         width="0.52916664"
+         height="0.52916664"
+         x="4.2333336"
+         y="68.791672" />
+      <path
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2444);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 4.2333333,67.997918 1.3229166,1.322917 0.2031949,-0.06139 0.061389,-0.203195 -1.3229167,-1.322917 z"
+         id="path1952"
+         sodipodi:nodetypes="cccccc" />
+      <path
+         id="path2095"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2152);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="M 6.5,242 A 4.5,4.5 0 0 0 2,246.5 4.5,4.5 0 0 0 6.5,251 4.5,4.5 0 0 0 11,246.5 4.5,4.5 0 0 0 6.5,242 Z m 0,1 A 3.5000002,3.5000002 0 0 1 10,246.5 3.5000002,3.5000002 0 0 1 6.5,250 3.5000002,3.5000002 0 0 1 3,246.5 3.5000002,3.5000002 0 0 1 6.5,243 Z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    </g>
+    <g
+       id="menu-close"
+       inkscape:label="menu-close"
+       transform="translate(0,-15.874999)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1557"
+         width="4.2333331"
+         height="4.2333331"
+         x="7.4083323"
+         y="65.616653"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient4031);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="path2014"
+         mask="url(#mask-powermask-path-effect3119)"
+         inkscape:path-effect="#path-effect3119"
+         sodipodi:type="arc"
+         sodipodi:cx="9.5249996"
+         sodipodi:cy="67.733337"
+         sodipodi:rx="1.5875"
+         sodipodi:ry="1.5875"
+         d="m 11.1125,67.733337 a 1.5875,1.5875 0 0 1 -1.5875004,1.5875 1.5875,1.5875 0 0 1 -1.5875,-1.5875 1.5875,1.5875 0 0 1 1.5875,-1.5875 1.5875,1.5875 0 0 1 1.5875004,1.5875 z" />
+    </g>
+    <g
+       id="menu-verify"
+       inkscape:label="menu-verify"
+       transform="translate(0,-15.874999)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1555"
+         width="4.2333331"
+         height="4.2333331"
+         x="12.700003"
+         y="65.616653"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path2058"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2144);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 48.957031,241.89844 a 7.0999998,7.0999998 0 0 0 -0.08594,0.002 7.0999998,7.0999998 0 0 0 -5,2.18945 7.0999998,7.0999998 0 0 0 -0.578125,9.13282 7.0999998,7.0999998 0 0 0 8.902343,2.11718 7.0999998,7.0999998 0 0 0 3.59375,-8.41601 l -1.242187,0.38086 A 5.7999999,5.7999999 0 0 1 54.800781,249 5.7999999,5.7999999 0 0 1 49,254.80078 5.7999999,5.7999999 0 0 1 43.199219,249 5.7999999,5.7999999 0 0 1 49,243.19922 a 5.7999999,5.7999999 0 0 1 3.244141,0.99219 l 0.726562,-1.07813 a 7.0999998,7.0999998 0 0 0 -4.013672,-1.21484 z m 6.908203,0.43554 -7.798828,7.79688 -1.941406,-1.94141 -0.990234,0.99024 2.93164,2.93164 8.789063,-8.78711 z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    </g>
+    <g
+       id="menu-reload"
+       inkscape:label="menu-reload"
+       transform="translate(0,-15.874999)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1553"
+         width="4.2333331"
+         height="4.2333331"
+         x="17.991665"
+         y="65.616653"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="circle2129"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2146);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 69.046875,241.90039 a 7.0999998,7.0999998 0 0 0 -3.628906,0.9707 l 3.210937,3.21094 0.800782,-0.80273 -1.892579,-1.89258 A 5.7999999,5.7999999 0 0 1 69,243.19922 5.7999999,5.7999999 0 0 1 74.800781,249 a 5.7999999,5.7999999 0 0 1 -0.697265,2.75586 l 1.144531,0.61719 a 7.0999998,7.0999998 0 0 0 -1.316406,-8.48047 7.0999998,7.0999998 0 0 0 -4.884766,-1.99219 z m -6.294922,3.72656 a 7.0999998,7.0999998 0 0 0 1.316406,8.48047 7.0999998,7.0999998 0 0 0 4.884766,1.99219 7.0999998,7.0999998 0 0 0 3.628906,-0.9707 l -3.210937,-3.21094 -0.800782,0.80273 1.892579,1.89258 A 5.7999999,5.7999999 0 0 1 69,254.80078 5.7999999,5.7999999 0 0 1 63.199219,249 a 5.7999999,5.7999999 0 0 1 0.697265,-2.75586 z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+    </g>
+    <g
+       id="metadata"
+       inkscape:label="metadata"
+       transform="translate(26.458331)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1641"
+         width="4.2333331"
+         height="4.2333331"
+         x="7.4083323"
+         y="49.741661"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1643"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient1655);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 22,181 v 15 h 14 v -15 z m 1,1 h 12 v 13 H 23 Z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)"
+         sodipodi:nodetypes="cccccccccc" />
+      <path
+         id="path1645"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient1676);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 150,163 v 5 h 4 v -1 h -3 v -1 h 2 v -1 h -2 v -1 h 3 v -1 z"
+         transform="matrix(0.26458333,0,0,0.26458333,-29.897914,7.1437497)" />
+      <path
+         id="path1647"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient1659);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 8.2020833,50.270833 v 1.322916 h 0.2645834 v -0.926041 l 0.396875,0.661458 0.3968754,-0.661458 v 0.926041 H 9.5250004 V 50.270833 H 9.2604171 l -0.3968754,0.661458 -0.396875,-0.661458 z" />
+      <path
+         id="path1651"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient1663);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 8.2020833,51.858333 v 0.264583 H 8.73125 v 1.058333 h 0.2645838 v -1.058333 h 0.5291666 v -0.264583 z" />
+      <path
+         id="rect1681"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient6474);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 150,169 v 5 h 1 v -2 h 2 v 2 h 1 v -5 h -1 -2 z m 1,1 h 2 v 1 h -2 z"
+         transform="matrix(0.26458333,0,0,0.26458333,-29.897914,7.1437497)" />
+    </g>
+    <g
+       id="object"
+       inkscape:label="object"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="font-variation-settings:normal;vector-effect:none;fill:none;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect2002"
+         width="4.2333331"
+         height="4.2333331"
+         x="39.158329"
+         y="49.741665"
+         inkscape:label="FRAME" />
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient6476);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+         d="m 41.121094,50.037109 a 0.13249999,0.13249999 0 0 0 -0.01172,0.0039 0.13249999,0.13249999 0 0 0 -0.0098,0.002 0.13249999,0.13249999 0 0 0 -0.0078,0.0039 0.13249999,0.13249999 0 0 0 -0.01563,0.0078 0.13249999,0.13249999 0 0 0 -0.01172,0.0078 l -1.568359,0.904297 -0.0078,0.0039 a 0.13249999,0.13249999 0 0 0 -0.0059,0.0059 0.13249999,0.13249999 0 0 0 -0.01563,0.0098 0.13249999,0.13249999 0 0 0 -0.0059,0.0078 0.13249999,0.13249999 0 0 0 -0.01367,0.01563 0.13249999,0.13249999 0 0 0 -0.0039,0.0039 0.13249999,0.13249999 0 0 0 -0.01172,0.02539 0.13249999,0.13249999 0 0 0 -0.0059,0.02344 0.13249999,0.13249999 0 0 0 -0.002,0.01172 0.13249999,0.13249999 0 0 0 -0.002,0.01172 V 52.9375 a 0.13249999,0.13249999 0 0 0 0.002,0.01172 0.13249999,0.13249999 0 0 0 0.107422,0.117187 h 0.002 l 1.537109,0.886719 0.0059,0.0039 a 0.13249999,0.13249999 0 0 0 0.01367,0.0059 0.13249999,0.13249999 0 0 0 0.0078,0.0039 0.13249999,0.13249999 0 0 0 0.0059,0.002 0.13249999,0.13249999 0 0 0 0.0059,0 0.13249999,0.13249999 0 0 0 0.02539,0.0059 0.13249999,0.13249999 0 0 0 0.0293,-0.002 0.13249999,0.13249999 0 0 0 0.002,0 0.13249999,0.13249999 0 0 0 0.02148,-0.0059 0.13249999,0.13249999 0 0 0 0.01758,-0.0078 0.13249999,0.13249999 0 0 0 0.01563,-0.0098 L 42.75,53.068359 A 0.13249999,0.13249999 0 0 0 42.863281,52.9375 v -1.84375 a 0.13249999,0.13249999 0 0 0 0,-0.01563 0.13249999,0.13249999 0 0 0 -0.002,-0.01563 0.13249999,0.13249999 0 0 0 -0.002,-0.0078 0.13249999,0.13249999 0 0 0 -0.0078,-0.02148 0.13249999,0.13249999 0 0 0 -0.0098,-0.01758 A 0.13249999,0.13249999 0 0 0 42.831881,51 0.13249999,0.13249999 0 0 0 42.816251,50.98437 0.13249999,0.13249999 0 0 0 42.796721,50.9707 l -0.01367,-0.0078 -1.564453,-0.902344 -0.002,-0.002 a 0.13249999,0.13249999 0 0 0 -0.02734,-0.01367 0.13249999,0.13249999 0 0 0 -0.02344,-0.0059 0.13249999,0.13249999 0 0 0 -0.0078,-0.002 0.13249999,0.13249999 0 0 0 -0.0078,0 0.13249999,0.13249999 0 0 0 -0.02148,0 0.13249999,0.13249999 0 0 0 -0.0078,0 z m 0.02148,0.285157 1.455078,0.83789 v 1.689453 L 41.142578,53.689453 39.6875,52.849609 v -1.689453 z"
+         id="path7555" />
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;overflow:visible;visibility:visible;opacity:0.5;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1720);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+         d="m 39.5625,50.941406 a 0.1322915,0.1322915 0 0 0 -0.121094,0.06641 0.1322915,0.1322915 0 0 0 0.04687,0.181641 l 1.521485,0.876953 v 1.785156 a 0.1322915,0.1322915 0 0 0 0.132812,0.132813 0.1322915,0.1322915 0 0 0 0.132813,-0.132813 V 52.06641 l 1.521484,-0.876953 a 0.1322915,0.1322915 0 0 0 0.04883,-0.181641 0.1322915,0.1322915 0 0 0 -0.181641,-0.04883 l -1.521484,0.878907 -1.521484,-0.878907 a 0.1322915,0.1322915 0 0 0 -0.05859,-0.01758 z"
+         id="path7559" />
+    </g>
+    <g
+       id="instance"
+       inkscape:label="instance"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <path
+         id="path7443"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient2266);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+         d="M 162.50391,181.99805 A 0.49999938,0.49999938 0 0 0 162.00195,182.5 v 2.99805 a 0.49999938,0.49999938 0 0 0 0.50196,0.50195 0.49999938,0.49999938 0 0 0 0.49414,-0.50195 v -2.4961 H 165.5 A 0.49999938,0.49999938 0 0 0 166.00195,182.5 0.49999938,0.49999938 0 0 0 165.5,181.99805 Z m 9.99414,0 a 0.49999938,0.49999938 0 0 0 -0.49414,0.50195 0.49999938,0.49999938 0 0 0 0.49414,0.50195 H 175 v 2.4961 a 0.49999938,0.49999938 0 0 0 0.50195,0.50195 0.49999938,0.49999938 0 0 0 0.49414,-0.50195 v -2.98828 a 0.49999938,0.49999938 0 0 0 0,-0.01 0.49999938,0.49999938 0 0 0 -0.49414,-0.50195 z M 165.5,185.00391 a 0.49999938,0.49999938 0 0 0 -0.50195,0.49414 v 6.98828 a 0.49999938,0.49999938 0 0 0 0,0.0176 0.49999938,0.49999938 0 0 0 0.50195,0.49414 h 6.99805 a 0.49999938,0.49999938 0 0 0 0.0586,-0.004 A 0.49999938,0.49999938 0 0 0 173,192.50391 v -6.99024 a 0.49999938,0.49999938 0 0 0 0,-0.0156 0.49999938,0.49999938 0 0 0 -0.50195,-0.49414 z M 166.00195,186 h 6.00196 v 6.00195 h -6.00196 z m -3.49804,6.00195 a 0.49999938,0.49999938 0 0 0 -0.50196,0.50196 v 2.98047 a 0.49999938,0.49999938 0 0 0 0,0.0156 0.49999938,0.49999938 0 0 0 0.50196,0.50195 H 165.5 A 0.49999938,0.49999938 0 0 0 166.00195,195.5 0.49999938,0.49999938 0 0 0 165.5,194.99805 h -2.50195 v -2.49414 a 0.49999938,0.49999938 0 0 0 -0.49414,-0.50196 z m 12.99804,0 A 0.49999938,0.49999938 0 0 0 175,192.50391 v 2.49414 h -2.50195 a 0.49999938,0.49999938 0 0 0 -0.49414,0.50195 0.49999938,0.49999938 0 0 0 0.49414,0.50195 h 3.0039 A 0.49999938,0.49999938 0 0 0 175.99609,195.5 v -2.99609 a 0.49999938,0.49999938 0 0 0 -0.49414,-0.50196 z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+      <rect
+         style="font-variation-settings:normal;opacity:0.5;vector-effect:none;fill:none;fill-opacity:1;stroke:none;stroke-width:0.999998px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect7651"
+         width="4.2333331"
+         height="4.2333331"
+         x="44.449997"
+         y="49.741661"
+         ry="0"
+         inkscape:label="frame" />
+    </g>
+    <g
+       id="info"
+       inkscape:label="info"
+       transform="translate(-58.208327,5.2916666)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect6790"
+         width="4.2333331"
+         height="4.2333331"
+         x="60.325001"
+         y="49.741669"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="rect1809"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient1728);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 61.647915,51.429167 v 0.06458 a 0.1,0.1 45 0 0 0.1,0.1 l 0.329167,0 a 0.1,0.1 45 0 1 0.1,0.1 v 1.122917 a 0.1,0.1 135 0 1 -0.1,0.1 l -0.329167,0 a 0.1,0.1 135 0 0 -0.1,0.1 v 0.06458 a 0.1,0.1 45 0 0 0.1,0.1 l 1.3875,0 a 0.1,0.1 135 0 0 0.1,-0.1 v -0.06458 a 0.1,0.1 45 0 0 -0.1,-0.1 l -0.329166,0 a 0.1,0.1 45 0 1 -0.1,-0.1 v -1.3875 a 0.1,0.1 45 0 0 -0.1,-0.1 h -0.858334 a 0.1,0.1 135 0 0 -0.1,0.1 z"
+         sodipodi:nodetypes="ccccccccccc"
+         inkscape:path-effect="#path-effect1930"
+         inkscape:original-d="m 61.647915,51.329167 v 0.264583 h 0.529167 v 1.322917 h -0.529167 v 0.264583 h 1.5875 v -0.264583 h -0.529166 v -1.5875 z" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient1730);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect1813"
+         width="0.52916718"
+         height="0.52916741"
+         x="62.177082"
+         y="50.535419"
+         rx="0.13229308"
+         ry="0.13229308" />
+    </g>
+    <g
+       id="debug-profile"
+       inkscape:label="debug-profile"
+       transform="translate(-47.624995)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1727"
+         width="4.2333331"
+         height="4.2333331"
+         x="55.033321"
+         y="55.033325"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path1761"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient1818);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 209,202 a 2.9999865,1.9999999 0 0 0 -3,2 2.9999865,1.9999999 0 0 0 0.40234,1 H 209 a 1.9999864,0.99999996 0 0 1 -2,-1 1.9999864,0.99999996 0 0 1 1.93555,-1 1.9999864,0.99999996 0 0 1 0.0644,0 1.9999864,0.99999996 0 0 1 2,1 1.9999864,0.99999996 0 0 1 -1.93555,1 h 2.53321 A 2.9999865,1.9999999 0 0 0 212,204 a 2.9999865,1.9999999 0 0 0 -3,-2 z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+      <path
+         id="path1879"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1820);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+         d="m 202.49805,201.50195 a 0.49999938,0.49999938 0 0 0 -0.49414,0.50196 v 1.99218 l 0.0801,0.28125 1.99024,2.97657 C 204.0283,207.50738 204,207.758 204,208 v 0.17383 l -1.70117,0.76172 -0.27344,0.29492 -0.99609,3.00391 a 0.49999938,0.49999938 0 0 0 0.31054,0.62695 0.49999938,0.49999938 0 0 0 0.63477,-0.3086 L 202.9043,209.75391 204,209.26953 V 209.5 c 0,0.81387 0.17708,1.73329 0.46094,2.64844 l -1.24024,0.82422 -0.2207,0.42187 v 2.99609 a 0.49999938,0.49999938 0 0 0 0.50195,0.50196 0.49999938,0.49999938 0 0 0 0.49414,-0.50196 v -2.73046 l 0.80274,-0.53516 c 0.15327,0.37806 0.32336,0.7488 0.50976,1.10156 0.39322,0.74413 0.85277,1.40937 1.37696,1.91211 C 207.20974,216.64142 207.81856,217 208.5,217 h 1 c 0.68144,0 1.29026,-0.35858 1.81445,-0.86133 0.52419,-0.50274 0.98374,-1.16798 1.37696,-1.91211 0.1864,-0.35276 0.35649,-0.7235 0.50976,-1.10156 l 0.79688,0.53516 v 2.73046 a 0.49999938,0.49999938 0 0 0 0.50195,0.50196 0.49999938,0.49999938 0 0 0 0.50391,-0.50196 v -2.99609 l -0.23047,-0.42187 -1.23633,-0.82227 C 213.82142,211.23447 214,210.31456 214,209.5 v -0.23242 l 1.09961,0.48633 0.92969,2.79882 a 0.49999938,0.49999938 0 0 0 0.62695,0.3086 0.49999938,0.49999938 0 0 0 0.31836,-0.62695 l -0.99805,-3.00391 -0.27148,-0.29492 L 214,208.17383 V 208 c 0,-0.24011 -0.0271,-0.48879 -0.0723,-0.74023 l 1.99024,-2.98243 0.082,-0.28125 v -1.99218 a 0.49999938,0.49999938 0 0 0 -0.50195,-0.50196 0.49999938,0.49999938 0 0 0 -0.49414,0.50196 v 1.8457 l -1.48047,2.21484 c -0.12453,-0.24081 -0.26999,-0.47429 -0.44922,-0.69336 C 212.42603,204.57887 211.38333,204 210,204 h -2 c -1.38333,0 -2.42603,0.57887 -3.07422,1.37109 -0.17826,0.21788 -0.32313,0.45004 -0.44726,0.68946 L 203,203.84961 v -1.8457 a 0.49999938,0.49999938 0 0 0 -0.50195,-0.50196 z M 208,205 h 2 c 1.11667,0 1.82397,0.42113 2.30078,1.00391 C 212.7776,206.58668 213,207.36111 213,208 v 1.5 c 0,1.19673 -0.47784,2.90744 -1.19141,4.25781 -0.35678,0.67519 -0.77223,1.26376 -1.18554,1.66016 C 210.20974,215.81437 209.81856,216 209.5,216 h -1 c -0.31856,0 -0.70974,-0.18563 -1.12305,-0.58203 -0.41331,-0.3964 -0.82876,-0.98497 -1.18554,-1.66016 C 205.47784,212.40744 205,210.69673 205,209.5 V 208 c 0,-0.63889 0.2224,-1.41332 0.69922,-1.99609 C 206.17603,205.42113 206.88333,205 208,205 Z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient1852);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect1846"
+         width="0.52916664"
+         height="0.52916664"
+         x="56.885406"
+         y="58.208336" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient1850);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect1848"
+         width="0.52916664"
+         height="1.5875"
+         x="56.885406"
+         y="56.356251" />
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1822);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+         d="m 56.488281,55.033203 a 0.1322915,0.1322915 0 0 0 -0.132812,0.132813 v 0.132812 l 0.03906,0.0918 0.265625,0.265625 a 0.1322915,0.1322915 0 0 0 0.185547,0 0.1322915,0.1322915 0 0 0 0,-0.1875 l -0.224609,-0.226562 v -0.07617 a 0.1322915,0.1322915 0 0 0 -0.132813,-0.132813 z"
+         id="path1867" />
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1824);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+         d="m 57.810547,55.033203 a 0.1322915,0.1322915 0 0 0 -0.130859,0.132813 v 0.07617 l -0.226563,0.226562 a 0.1322915,0.1322915 0 0 0 0,0.1875 0.1322915,0.1322915 0 0 0 0.1875,0 l 0.263672,-0.265625 0.03906,-0.0918 v -0.132812 a 0.1322915,0.1322915 0 0 0 -0.132812,-0.132813 z"
+         id="path1871" />
+    </g>
+    <g
+       id="error-log"
+       inkscape:label="error-log"
+       transform="translate(-21.166674,5.2916643)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect2006"
+         width="4.2333331"
+         height="4.2333331"
+         x="33.866673"
+         y="49.741661"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+      <path
+         id="path2008"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2163);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 142,201 v 16 h 9 v -1 h -8 v -14 h 12 v 15 h 1 v -16 z m 2,2 v 1 h 10 v -1 z m 0,2 v 1 h 8 v -1 z m 0,2 v 1 h 7 v -1 z m 0,2 v 1 h 7 v -1 z m 0,2 v 1 h 6 v -1 z m 0,2 v 1 h 5 v -1 z"
+         transform="matrix(0.26458333,0,0,0.26458333,-3.4395741,-3.439581)"
+         sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccc" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient1826);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect2207"
+         width="0.52916664"
+         height="0.52916664"
+         x="36.777092"
+         y="53.445839" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2167);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect2220"
+         width="0.52916664"
+         height="1.5875"
+         x="36.777092"
+         y="51.593754" />
+    </g>
+    <g
+       id="run-log"
+       inkscape:label="run-log"
+       transform="translate(-42.333329)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <path
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient1803);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="M 64.29375,58.472917 63.5,59.266667 H 63.235417 V 57.414584 H 63.5 l 0.79375,0.79375 z"
+         id="path2179" />
+      <path
+         id="path2171"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2177);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 55.297923,49.741668 v 4.233334 h 2.38125 v -0.264584 h -2.116667 v -3.704166 h 3.175 v 2.38125 h 0.264584 v -2.645834 z m 0.529167,0.529167 v 0.264583 h 2.645833 v -0.264583 z m 0,0.529167 v 0.264583 h 1.852083 v -0.264583 z m 0,0.529166 v 0.264584 h 2.38125 v -0.264584 z m 0,0.529167 v 0.264583 h 1.852083 v -0.264583 z m 0,0.529167 v 0.264583 h 1.5875 v -0.264583 z m 0,0.529166 v 0.264584 h 1.852083 v -0.264584 z"
+         sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccc"
+         transform="translate(5.2916573,5.2916642)" />
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect2169"
+         width="4.2333331"
+         height="4.2333331"
+         x="55.033329"
+         y="49.741661"
+         rx="1.9824198e-15"
+         inkscape:label="frame"
+         transform="translate(5.2916573,5.2916642)" />
+    </g>
+    <g
+       id="qt"
+       inkscape:label="qt"
+       transform="translate(-10.583333)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <path
+         id="rect1703"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient1726);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 34.660415,55.827083 h 3.175 v 0 2.116667 0 0 l -0.529167,0.529167 h -3.175 v 0 0 0 0 -2.116667 z"
+         sodipodi:nodetypes="cccccccccccccc" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect1863"
+         width="0.26458332"
+         height="1.5875"
+         x="36.512501"
+         y="56.356251"
+         rx="0.13229299"
+         ry="0.13229299" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect1867"
+         width="0.79374999"
+         height="0.26458332"
+         x="36.247917"
+         y="56.620834"
+         rx="0.13229299"
+         ry="0.13229299" />
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect1871"
+         width="0.52916664"
+         height="0.26458332"
+         x="36.512501"
+         y="57.679169"
+         rx="0.13229299"
+         ry="0.13229299" />
+      <path
+         id="rect1875"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 126.5,206 c -0.831,0 -1.5,0.669 -1.5,1.5 v 3 c 0,0.831 0.669,1.5 1.5,1.5 h 1 c 0.831,0 1.5,-0.669 1.5,-1.5 v -3 c 0,-0.831 -0.669,-1.5 -1.5,-1.5 z m 0.25,1 h 0.5 c 0.4155,0 0.75,0.33449 0.75,0.75 v 2.5 c 0,0.4155 -0.33449,0.75 -0.75,0.75 h -0.5 c -0.4155,0 -0.75,-0.33449 -0.75,-0.75 v -2.5 c 0,-0.4155 0.33449,-0.75 0.75,-0.75 z"
+         transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+      <path
+         id="rect1907"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 35.621906,57.811459 0.229136,-0.132291 0.198438,0.343704 -0.229136,0.132291 z"
+         sodipodi:nodetypes="ccccc" />
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1788"
+         width="4.2333331"
+         height="4.2333331"
+         x="33.866669"
+         y="55.033325"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+    </g>
+    <g
+       id="stop-openmw"
+       inkscape:label="stop-openmw"
+       transform="translate(-15.874999,5.2916666)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient4025);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect1645"
+         width="2.6458333"
+         height="2.6458333"
+         x="45.243748"
+         y="50.535412"
+         rx="2.8318619e-14" />
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1774"
+         width="4.2333331"
+         height="4.2333331"
+         x="44.450008"
+         y="49.741669"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+    </g>
+    <g
+       id="run-openmw"
+       inkscape:label="run-openmw"
+       transform="translate(-15.874999,5.2916666)"
+       inkscape:export-filename="/home/matjaz/list-added.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <path
+         sodipodi:type="star"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient1947);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="path6526"
+         sodipodi:sides="3"
+         sodipodi:cx="51.609734"
+         sodipodi:cy="51.859638"
+         sodipodi:r1="1.6194628"
+         sodipodi:r2="0.85989583"
+         sodipodi:arg1="0.0016114343"
+         sodipodi:arg2="1.048809"
+         inkscape:flatsided="true"
+         inkscape:rounded="0"
+         inkscape:randomized="0"
+         d="m 53.055828,51.961969 -2.084719,1.199138 a 0.11547005,0.11547005 30.092328 0 1 -0.173044,-0.100279 l 0.0039,-2.404989 a 0.11547005,0.11547005 150.09233 0 1 0.173366,-0.09972 l 2.080844,1.205851 a 0.11547005,0.11547005 90.092328 0 1 -3.23e-4,0.2 z"
+         inkscape:transform-center-x="-0.4299478"
+         inkscape:path-effect="#path-effect6530" />
+      <rect
+         style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1782"
+         width="4.2333331"
+         height="4.2333331"
+         x="49.741661"
+         y="49.741661"
+         rx="1.9824198e-15"
+         inkscape:label="frame" />
+    </g>
+    <circle
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2457);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="circle1604"
+       cx="25.400002"
+       cy="-8.9958324"
+       r="2.1166666"
+       inkscape:label="Red" />
+    <circle
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2459);fill-opacity:1;stroke:none;stroke-width:0.999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="circle1602"
+       cx="20.108334"
+       cy="-8.9958324"
+       r="2.1166666"
+       inkscape:label="Orange" />
+    <circle
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2510);fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="circle1600"
+       cx="14.816667"
+       cy="-8.9958324"
+       r="2.1166666"
+       inkscape:label="Green" />
+    <circle
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#Blue);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="circle1598"
+       cx="9.5250006"
+       cy="-8.9958324"
+       r="2.1166666"
+       inkscape:label="Blue" />
+    <circle
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient3534);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="path1588"
+       cx="4.2333336"
+       cy="-8.9958324"
+       r="2.1166666"
+       inkscape:label="Main" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:3.52778px;line-height:1.55;font-family:sans-serif;font-variation-settings:normal;letter-spacing:0.0529167px;opacity:1;vector-effect:none;fill:#2480b2;fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       x="2.2255323"
+       y="-43.184959"
+       id="text2463"><tspan
+         sodipodi:role="line"
+         id="tspan2461"
+         x="2.2255323"
+         y="-43.184959"
+         style="font-size:3.52778px;font-variation-settings:normal;vector-effect:none;fill:#2480b2;fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1">* Each icon is its own group with shapes and an invisible box to define icon dimensions. </tspan><tspan
+         sodipodi:role="line"
+         x="2.2255323"
+         y="-37.7169"
+         style="font-size:3.52778px;font-variation-settings:normal;vector-effect:none;fill:#2480b2;fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="tspan2190">* Each such group exports to a .png file that takes its name from the group's ID.</tspan><tspan
+         sodipodi:role="line"
+         x="2.2255323"
+         y="-32.24884"
+         style="font-size:3.52778px;font-variation-settings:normal;vector-effect:none;fill:#2480b2;fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="tspan2469">* Select more than one icon group and export using Batch export.</tspan><tspan
+         sodipodi:role="line"
+         x="2.2255323"
+         y="-26.780783"
+         style="font-size:3.52778px;font-variation-settings:normal;vector-effect:none;fill:#2480b2;fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="tspan2465">* Change dpi at export to get higher resolutions. 96 dpi outputs 16x16 for small and 48x48 for large icons.</tspan><tspan
+         sodipodi:role="line"
+         x="2.2255323"
+         y="-21.312723"
+         style="font-size:3.52778px;font-variation-settings:normal;vector-effect:none;fill:#2480b2;fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="tspan2467">* Change swatch colour to recolour the icons</tspan></text>
+    <rect
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#2480b2;stroke-width:0.582879;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+       id="rect2210"
+       width="201.65625"
+       height="33.472843"
+       x="-1.6219535"
+       y="-49.958504" />
+  </g>
+  <g
+     id="layer3"
+     inkscape:label="48icons"
+     style="display:inline"
+     transform="translate(15.610415,52.102027)">
+    <path
+       id="path2497"
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:url(#Blue);fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m -9.2604164,115.35833 -6.3499986,3.175 v 0.52917 l 6.3499986,3.175 6.3499999,-3.175 v -0.52917 z"
+       sodipodi:nodetypes="ccccccc"
+       inkscape:label="water_ORIGINAL" />
+    <g
+       id="g2126"
+       style="display:inline;fill:#c0bfbc;fill-opacity:1;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none"
+       inkscape:label="land_ORIGINAL">
+      <path
+         id="path2630"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#e5e4e1;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m -14.552077,117.87186 -2.8e-5,0.79371 1.058334,0.52917 1.058329,0.52917 1.05834,0.52916 1.058334,0.52917 1.0583296,0.52916 1.0583333,-0.52916 1.05834,-0.52917 1.05833,-0.52916 1.0583433,-0.52917 1.05833,-0.52917 1.9e-5,-0.79371 m -5.2916966,-2.64586 -1.0583296,0.52917 -1.058334,0.52917 -1.05834,0.52916 -1.058329,0.52917 -1.058334,0.52916 1.058334,0.52917 1.058329,0.52917 1.05834,0.52916 1.058334,0.52917 1.0583296,0.52916 1.0583333,-0.52916 1.05834,-0.52917 1.05833,-0.52916 1.0583433,-0.52917 1.05833,-0.52917 -1.05833,-0.52916 -1.0583433,-0.52917 -1.05833,-0.52916 -1.05834,-0.52917 z" />
+      <path
+         id="path2628"
+         style="font-variation-settings:normal;opacity:0.6;vector-effect:none;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m -8.2021061,115.7552 -5.2916659,2.64583 2.8e-5,0.79378 m 6.3499779,-2.91044 -5.2916769,2.64583 3.2e-5,0.79377 m 6.3499749,-2.91044 -5.2916669,2.64583 2.5e-5,0.79378 m 6.3499852,-2.91044 -5.2916762,2.64583 2.5e-5,0.79378 m -3.175028,-3.43961 5.2916659,2.64583 2.9e-5,0.79378 m -4.2333659,-3.96878 5.2916769,2.64583 2.2e-5,0.79378 m -4.2333589,-3.96877 5.2916669,2.64583 2.6e-5,0.79377 m -4.2333589,-3.96877 5.2916762,2.64583 1.6e-5,0.79378 m -4.2333336,1.32291 v 0.79375" />
+    </g>
+    <path
+       id="use3162"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#Blue);fill-opacity:1;stroke:none;stroke-width:0.105833;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       d="m -14.022909,114.5646 -0.529174,1.05832 0.529174,1.05835 0.529161,-1.05835 z m 1.5875,-0.79375 -0.529174,1.05832 0.529174,1.05835 0.529161,-1.05835 z m 1.5875,-0.79375 -0.529173,1.05832 0.529173,1.05835 0.529162,-1.05835 z"
+       sodipodi:nodetypes="ccccccccccccccc"
+       inkscape:label="pathgrid_ORIGINAL" />
+    <g
+       id="g2518"
+       transform="translate(15.874999)"
+       style="display:inline"
+       inkscape:label="instance_ORIGINAL">
+      <circle
+         style="opacity:1;fill:#cc9465;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+         id="path2368"
+         cx="-23.812502"
+         cy="116.41668"
+         r="1.984375" />
+      <circle
+         style="opacity:1;fill:#e5bfa0;fill-opacity:1;stroke:none;stroke-width:0.20556;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+         id="ellipse2375"
+         cx="-23.547916"
+         cy="116.15208"
+         r="1.5875" />
+      <circle
+         style="opacity:1;fill:none;stroke:#4d4d4d;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+         id="ellipse2395"
+         cx="-23.812502"
+         cy="116.41664"
+         r="1.984375" />
+    </g>
+    <g
+       id="transform-move"
+       inkscape:label="transform-move">
+      <rect
+         style="opacity:0;fill:#ffbe6f;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#000000"
+         id="rect2459"
+         width="12.699999"
+         height="12.699999"
+         x="0.2645838"
+         y="63.76458"
+         inkscape:label="FRAME" />
+      <path
+         id="path2155"
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:url(#linearGradient1351);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 6.6145834,74.612502 -1.0583333,-1.5875 h 0.5291667 v -1.852083 h 1.0583333 v 1.852083 H 7.6729168 Z M 2.1166673,70.114585 3.7041668,69.056252 v 0.529167 h 1.8520833 v 1.058333 H 3.7041668 v 0.529167 z m 8.9958327,0 -1.5874995,-1.058333 v 0.529167 H 7.6729172 v 1.058333 h 1.8520833 v 0.529167 z m -4.4979168,-4.497919 -1.0583333,1.5875 h 0.5291667 v 1.852083 h 1.0583333 v -1.852083 h 0.5291667 z m -0.5291664,3.968753 h 1.0583333 v 1.058333 H 6.0854168 Z" />
+    </g>
+    <g
+       id="transform-rotate"
+       inkscape:label="transform-rotate">
+      <rect
+         style="opacity:0;fill:#ffbe6f;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#000000"
+         id="rect2461"
+         width="12.699998"
+         height="12.699999"
+         x="16.139584"
+         y="63.76458"
+         inkscape:label="FRAME" />
+      <path
+         id="path2173"
+         mask="none"
+         style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#linearGradient2147);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+         d="m 23.718448,66.063632 -0.422713,1.392679 c 0.261452,0.0794 0.509761,0.196938 0.736906,0.348816 l 0.808734,-1.210259 c -0.346148,-0.231333 -0.724531,-0.41034 -1.122927,-0.531236 z m -3.580661,0.531236 c -1.59297,1.064453 -2.272468,3.066073 -1.656746,4.880321 0.61593,1.814293 2.373637,2.988713 4.285527,2.863391 1.911922,-0.125257 3.501349,-1.519053 3.875216,-3.398243 L 25.21448,70.656634 c -0.258621,1.299922 -1.399499,2.236122 -2.724897,2.236039 -1.534316,0 -2.778125,-1.243809 -2.778125,-2.778125 -3.4e-5,-0.927824 0.463121,-1.794419 1.23455,-2.309937 l 0.484195,0.724612 0.871637,-2.505441 -2.648249,-0.153574 z m 5.34541,0.526066 -1.029395,1.029394 c 0.193237,0.193171 0.356914,0.413795 0.48576,0.65474 l 1.283641,-0.686262 C 26.026949,67.7516 25.777598,67.415355 25.483201,67.120932 Z m 1.057302,1.764749 -1.392682,0.422196 c 0.07942,0.261529 0.119825,0.533347 0.11989,0.80667 h 1.455209 c -4.4e-5,-0.416365 -0.06151,-0.830443 -0.182417,-1.228866 z"
+         sodipodi:nodetypes="cccccccccccccccccccccccccccc" />
+    </g>
+    <g
+       id="transform-scale"
+       inkscape:label="transform-scale">
+      <rect
+         style="opacity:0;fill:#ffbe6f;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#000000"
+         id="rect2463"
+         width="12.699998"
+         height="12.699999"
+         x="32.01458"
+         y="63.76458"
+         inkscape:label="FRAME" />
+      <path
+         id="rect2195"
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:url(#linearGradient6478);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 34.395833,66.145833 v 1.058333 h 0.79375 v -0.264583 h 6.35 v 6.35 h -0.264584 v 0.79375 h 0.264584 0.529166 0.264584 v -7.14375 -0.529167 -0.264583 h -7.14375 z m 0,1.5875 v 0.79375 h 0.79375 v -0.79375 z m 0,1.322916 v 0.79375 h 0.79375 v -0.79375 z m 0,1.322917 v 3.704167 H 38.1 v -3.704167 z m 4.233333,2.910417 v 0.79375 h 0.79375 v -0.79375 z m 1.322917,0 v 0.79375 h 0.79375 v -0.79375 z" />
+    </g>
+    <g
+       id="brush-circle"
+       inkscape:label="brush-circle">
+      <rect
+         style="opacity:0;fill:#ffbe6f;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#000000"
+         id="rect2443"
+         width="12.699998"
+         height="12.699999"
+         x="47.88958"
+         y="63.76458"
+         inkscape:label="FRAME" />
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1902);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+         d="m 54.239717,66.675262 c -1.898174,0 -3.439453,1.541279 -3.439453,3.439453 0,1.898174 1.541279,3.439453 3.439453,3.439453 1.898174,0 3.439453,-1.541279 3.439453,-3.439453 0,-1.898174 -1.541279,-3.439453 -3.439453,-3.439453 z m 0,0.246094 c 1.765397,0 3.193359,1.427962 3.193359,3.193359 0,1.765397 -1.427962,3.193359 -3.193359,3.193359 -1.765397,0 -3.193359,-1.427962 -3.193359,-3.193359 0,-1.765397 1.427962,-3.193359 3.193359,-3.193359 z"
+         id="path1903" />
+      <circle
+         style="font-variation-settings:normal;display:inline;opacity:0.35;vector-effect:none;fill:url(#linearGradient2307);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="circle4316"
+         cx="54.239586"
+         cy="70.114586"
+         r="3.3072917" />
+    </g>
+    <g
+       id="brush-square"
+       inkscape:label="brush-square">
+      <rect
+         style="opacity:0;fill:#ffbe6f;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#000000"
+         id="rect2445"
+         width="12.699998"
+         height="12.699999"
+         x="63.76458"
+         y="63.76458"
+         inkscape:label="FRAME" />
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1898);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+         d="m 67.468232,66.938934 c -0.290871,0 -0.529296,0.238425 -0.529296,0.529296 v 5.292969 c 0,0.290872 0.238425,0.529297 0.529296,0.529297 h 5.292969 c 0.290872,0 0.529297,-0.238425 0.529297,-0.529297 V 67.46823 c 0,-0.290871 -0.238425,-0.529296 -0.529297,-0.529296 z m 0,0.265625 h 5.292969 c 0.14887,0 0.263672,0.114803 0.263672,0.263671 v 5.292969 c 0,0.14887 -0.114802,0.263672 -0.263672,0.263672 h -5.292969 c -0.148868,0 -0.263671,-0.114802 -0.263671,-0.263672 V 67.46823 c 0,-0.148868 0.114803,-0.263671 0.263671,-0.263671 z"
+         id="path1979" />
+      <rect
+         style="font-variation-settings:normal;display:inline;opacity:0.35;vector-effect:none;fill:url(#linearGradient1900);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect4160"
+         width="6.0854306"
+         height="6.085434"
+         x="67.071869"
+         y="67.071869"
+         ry="0.39687774" />
+    </g>
+    <g
+       id="brush-point"
+       inkscape:label="brush-point">
+      <rect
+         style="opacity:0;fill:#ffbe6f;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#000000"
+         id="rect2447"
+         width="12.699998"
+         height="12.699999"
+         x="79.639572"
+         y="63.76458"
+         inkscape:label="FRAME" />
+      <path
+         id="path1998"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1910);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+         d="m 82.284507,69.84896 c -0.144291,0 -0.792839,0.121337 -0.792839,0.265625 0,0.144291 0.648546,0.263672 0.792839,0.263672 h 1.853515 c 0.144291,0 0.263672,-0.119384 0.263672,-0.263672 0,-0.144291 -0.119379,-0.265625 -0.263672,-0.265625 z m 3.96875,-3.439453 c 0,-0.144291 -0.119384,-0.792839 -0.263672,-0.792839 -0.144291,0 -0.265625,0.648546 -0.265625,0.792839 v 1.853515 c 0,0.144291 0.121337,0.263672 0.265625,0.263672 0.144291,0 0.263672,-0.119379 0.263672,-0.263672 z m 0,5.55664 c 0,-0.14429 -0.119384,-0.263671 -0.263672,-0.263671 -0.144291,0 -0.265625,0.119378 -0.265625,0.263671 v 1.851563 c 0,0.144291 0.121337,0.794792 0.265625,0.794792 0.144291,0 0.263672,-0.650499 0.263672,-0.794792 z m 1.58789,-2.117187 c -0.14429,0 -0.263671,0.121337 -0.263671,0.265625 0,0.144291 0.119378,0.263672 0.263671,0.263672 h 1.851563 c 0.144291,0 0.794792,-0.119384 0.794792,-0.263672 0,-0.144291 -0.650499,-0.265625 -0.794792,-0.265625 z" />
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1912);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+         d="m 85.460288,69.055991 c -0.290872,0 -0.529297,0.238426 -0.529297,0.529297 v 1.058594 c 0,0.290872 0.238426,0.529297 0.529297,0.529297 h 1.058594 c 0.290872,0 0.529297,-0.238425 0.529297,-0.529297 v -1.058594 c 0,-0.290871 -0.238425,-0.529297 -0.529297,-0.529297 z m 0,0.265625 h 1.058594 c 0.14887,0 0.263672,0.114803 0.263672,0.263672 v 1.058594 c 0,0.14887 -0.114802,0.263672 -0.263672,0.263672 h -1.058594 c -0.148869,0 -0.263672,-0.114802 -0.263672,-0.263672 v -1.058594 c 0,-0.148869 0.114804,-0.263672 0.263672,-0.263672 z"
+         id="path1983" />
+      <rect
+         style="font-variation-settings:normal;display:inline;opacity:0.35;vector-effect:none;fill:url(#linearGradient1914);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect4187"
+         width="1.8521576"
+         height="1.8521612"
+         x="85.063393"
+         y="69.188377"
+         ry="0.39687774" />
+    </g>
+    <g
+       id="brush-custom"
+       inkscape:label="brush-custom">
+      <rect
+         style="opacity:0;fill:#ffbe6f;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#000000"
+         id="rect2449"
+         width="12.699994"
+         height="12.699999"
+         x="95.514572"
+         y="63.76458"
+         inkscape:label="FRAME" />
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.5;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1916);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
+         d="m 101.20313,66.675005 c -1.607378,0 -2.910416,1.303038 -2.910416,2.910416 8.2e-5,0.618498 0.197196,1.220886 0.562755,1.719792 -0.193855,0.26987 -0.298146,0.593762 -0.298172,0.926041 0,0.876753 0.710747,1.5875 1.587503,1.5875 0.79217,1.04e-4 1.46317,-0.583803 1.57251,-1.368393 0.32436,-0.05839 0.63645,-0.171445 0.92294,-0.334346 0.3955,0.569286 1.04469,0.908841 1.73788,0.908989 1.169,0 2.11667,-0.947663 2.11667,-2.116666 0,-1.169003 -0.94767,-2.116667 -2.11667,-2.116667 -0.12281,-1.43e-4 -0.2454,0.0104 -0.36639,0.03152 -0.34406,-1.267889 -1.49487,-2.148092 -2.80861,-2.148189 z"
+         id="path2186" />
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1918);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
+         d="m 101.20313,66.54271 c -1.678876,0 -3.042711,1.363835 -3.042711,3.042709 8.2e-5,0.61718 0.198856,1.213246 0.548288,1.720307 -0.178268,0.276987 -0.283678,0.594905 -0.283704,0.925526 0,0.948248 0.771543,1.719791 1.719787,1.719791 0.827,1.09e-4 1.52138,-0.595452 1.67639,-1.399397 0.27684,-0.05797 0.54302,-0.155514 0.79323,-0.287321 0.4243,0.549629 1.06517,0.89282 1.76372,0.892968 1.2405,0 2.24896,-1.008459 2.24896,-2.248958 0,-1.240499 -1.00846,-2.248958 -2.24896,-2.248958 -0.0962,-1.11e-4 -0.19147,0.01262 -0.28681,0.02479 -0.39574,-1.263941 -1.55476,-2.141357 -2.88819,-2.141457 z m 0,0.264584 c 1.25466,9.5e-5 2.35238,0.839655 2.68097,2.05052 l 0.0315,0.116271 0.11886,-0.02066 c 0.11342,-0.01979 0.22851,-0.02959 0.34365,-0.02946 1.09751,0 1.98437,0.886868 1.98437,1.984375 0,1.097508 -0.88686,1.984375 -1.98437,1.984375 -0.65001,-1.37e-4 -1.2585,-0.318322 -1.62936,-0.852143 l -0.0687,-0.09922 -0.10542,0.05943 c -0.27347,0.155496 -0.57095,0.263626 -0.88057,0.31936 l -0.0946,0.01707 -0.0134,0.09509 c -0.10037,0.720193 -0.71411,1.254281 -1.44126,1.254186 -0.805258,0 -1.455209,-0.649952 -1.455209,-1.455209 2.3e-5,-0.304604 0.09566,-0.601652 0.273367,-0.849042 l 0.05581,-0.07751 -0.05684,-0.07752 c -0.348953,-0.476242 -0.536839,-1.051359 -0.536919,-1.641761 0,-1.535882 1.242243,-2.778125 2.778121,-2.778125 z"
+         id="path2188" />
+    </g>
+    <g
+       id="camera-orbit"
+       inkscape:label="camera-orbit">
+      <rect
+         style="opacity:0;fill:#ffbe6f;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#000000"
+         id="rect2451"
+         width="12.699989"
+         height="12.699999"
+         x="111.38956"
+         y="63.76458"
+         inkscape:label="FRAME" />
+      <path
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:url(#linearGradient2502);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 114.81181,69.118264 c -3.49828,3.08633 1.51943,2.817376 3.58014,2.334121 2.06071,-0.483255 7.1306,-3.705601 -1.60983,-3.162598 7.34302,-2.156354 7.21991,2.475405 2.60397,3.889003 -4.95879,1.518595 -8.7571,-0.657262 -4.57428,-3.060526 z"
+         id="path2279"
+         sodipodi:nodetypes="czcsc" />
+      <ellipse
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="path2257"
+         cx="115.8875"
+         cy="68.659378"
+         rx="1.5874941"
+         ry="1.5875033" />
+      <circle
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="path2261"
+         cx="116.41667"
+         cy="69.056252"
+         r="0.52916664" />
+    </g>
+    <g
+       id="camera-free"
+       inkscape:label="camera-free">
+      <rect
+         style="opacity:0;fill:#ffbe6f;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#000000"
+         id="rect2453"
+         width="12.699989"
+         height="12.699999"
+         x="127.26453"
+         y="63.76458"
+         inkscape:label="FRAME" />
+      <circle
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="ellipse2315"
+         cx="133.08542"
+         cy="72.628128"
+         r="1.3229166" />
+      <circle
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="circle2319"
+         cx="131.36563"
+         cy="68.130211"
+         r="1.4552083" />
+      <ellipse
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:0.237741px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="circle2317"
+         cx="123.01057"
+         cy="68.208794"
+         rx="0.48718452"
+         ry="0.46406204"
+         transform="matrix(1,0,0.12650781,0.99196561,0,0)" />
+      <ellipse
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:0.205204px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="circle2321"
+         cx="132.5358"
+         cy="72.584305"
+         rx="0.3821989"
+         ry="0.440696" />
+      <circle
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="circle2323"
+         cx="135.99583"
+         cy="69.056252"
+         r="1.984375" />
+      <ellipse
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:0.326641px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="ellipse2325"
+         cx="136.92188"
+         cy="69.171593"
+         rx="0.65753078"
+         ry="0.64905536" />
+    </g>
+    <g
+       id="camera-first-person"
+       inkscape:label="camera-first-person">
+      <rect
+         style="opacity:0;fill:#ffbe6f;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#000000"
+         id="rect2455"
+         width="12.699989"
+         height="12.699999"
+         x="143.13951"
+         y="63.76458"
+         inkscape:label="FRAME" />
+      <path
+         id="rect2331"
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:url(#linearGradient2809);fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="M 558.40946,259.99589 557.5,270 h 3 l 0.91695,11.00345 A 1.0867995,1.0867995 42.618179 0 0 562.5,282 h 5 a 1.0867995,1.0867995 137.38182 0 0 1.08305,-0.99655 L 569.5,270 h 2.75 l -0.90946,-10.00411 A 1.0950328,1.0950328 42.402786 0 0 570.25,259 H 559.5 a 1.0950328,1.0950328 137.59721 0 0 -1.09054,0.99589 z"
+         sodipodi:nodetypes="ccccccccc"
+         inkscape:path-effect="#path-effect2344"
+         inkscape:original-d="m 558.5,259 -1,11 h 3 l 1,12 h 7 l 1,-12 h 2.75 l -1,-11 z"
+         transform="scale(0.26458333)" />
+      <ellipse
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="ellipse2327"
+         cx="149.48953"
+         cy="67.071899"
+         rx="1.5874941"
+         ry="1.5875033" />
+      <circle
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:0.326641px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="circle2329"
+         cx="150.01872"
+         cy="67.204193"
+         r="0.52916664" />
+    </g>
+    <g
+       id="run-game"
+       inkscape:label="run-game">
+      <rect
+         style="opacity:0;fill:#ffbe6f;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#000000"
+         id="rect2457"
+         width="12.699989"
+         height="12.699999"
+         x="159.0145"
+         y="63.76458"
+         inkscape:label="FRAME" />
+      <path
+         sodipodi:type="star"
+         style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#linearGradient2518);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000"
+         id="path2402"
+         sodipodi:sides="3"
+         sodipodi:cx="164.8474"
+         sodipodi:cy="70.115562"
+         sodipodi:r1="3.728143"
+         sodipodi:r2="2.5796876"
+         sodipodi:arg1="0.00052574647"
+         sodipodi:arg2="1.0477234"
+         inkscape:flatsided="true"
+         inkscape:rounded="0"
+         inkscape:randomized="0"
+         d="m 168.40228,70.217431 -5.24739,3.025909 a 0.11547005,0.11547005 30.030123 0 1 -0.17316,-0.100091 l 0.003,-6.057333 a 0.11547005,0.11547005 150.03012 0 1 0.17326,-0.09991 l 5.24421,3.031424 a 0.11547005,0.11547005 90.030123 0 1 -1.1e-4,0.2 z"
+         inkscape:transform-center-x="-0.4299478"
+         inkscape:path-effect="#path-effect2408" />
+    </g>
+    <g
+       id="scene-exterior-arrows"
+       inkscape:label="scene-exterior-arrows">
+      <rect
+         style="opacity:0;fill:#ffbe6f;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#000000"
+         id="rect2560"
+         width="12.699999"
+         height="12.699999"
+         x="0.2645838"
+         y="79.639572"
+         ry="0"
+         inkscape:label="FRAME" />
+      <path
+         id="path2096"
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:url(#linearGradient2099);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 2.1166671,84.402082 v 1.058334 l 2.116667,-1.058334 z m 6.8791676,0 2.1166663,1.058334 v -1.058334 z m -6.8791676,4.233334 v 1.058333 h 2.116667 z m 8.9958339,0 -2.1166663,1.058333 h 2.1166663 z"
+         sodipodi:nodetypes="cccccccccccccccc" />
+    </g>
+    <g
+       id="scene-exterior-borders"
+       inkscape:label="scene-exterior-borders">
+      <rect
+         style="opacity:0;fill:#ffbe6f;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#000000"
+         id="rect2562"
+         width="12.699998"
+         height="12.699999"
+         x="16.139584"
+         y="79.639572"
+         inkscape:label="FRAME" />
+      <path
+         id="path2636"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#Green);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+         d="m 85.001953,316.49805 a 0.50004934,0.50004934 0 0 0 -0.228515,0.0527 L 61,328.43945 v 1.1211 l 23.773438,11.88867 a 0.50004934,0.50004934 0 0 0 0.451171,0 L 109,329.55859 v -1.11718 L 85.224609,316.55078 a 0.50004934,0.50004934 0 0 0 -0.222656,-0.0527 z m 0,1.0625 22.884767,11.44336 -22.884767,11.43359 -22.882812,-11.44141 z"
+         transform="scale(0.26458333)" />
+    </g>
+    <g
+       id="scene-exterior-markers"
+       inkscape:label="scene-exterior-markers">
+      <rect
+         style="opacity:0;fill:#c01c28;stroke:none;stroke-width:0.264583;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;paint-order:stroke fill markers;stop-color:#000000"
+         id="frame2674"
+         width="12.699996"
+         height="12.699995"
+         x="32.01458"
+         y="79.639572"
+         inkscape:label="FRAME" />
+      <rect
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#5e5c64;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect2105"
+         width="4.7625012"
+         height="2.6458344"
+         x="35.983326"
+         y="80.433334" />
+      <path
+         id="path2109"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+         d="m 38.697918,81.227082 0.460443,0.530717 v 0.527617 h 0.26458 v -0.527617 l 0.46044,-0.530717 h -0.33797 l -0.25476,0.318326 -0.254763,-0.318326 z m -1.85208,0 0.42426,0.529167 -0.42323,0.529167 h 0.33642 l 0.25528,-0.318326 0.25528,0.318326 h 0.33641 l -0.42323,-0.529167 0.42426,-0.529167 h -0.33796 l -0.25476,0.318326 -0.25477,-0.318326 z"
+         sodipodi:nodetypes="ccccccccccccccccccccccc" />
+      <rect
+         style="opacity:0;fill:#ffbe6f;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#000000"
+         id="rect2564"
+         width="12.699998"
+         height="12.699999"
+         x="32.01458"
+         y="79.639572" />
+    </g>
+    <g
+       id="scene-exterior-status-0"
+       inkscape:label="scene-exterior-status-0">
+      <rect
+         style="opacity:0;fill:#c01c28;stroke:none;stroke-width:0.264583;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;paint-order:stroke fill markers;stop-color:#000000"
+         id="frame2676"
+         width="12.699998"
+         height="12.699999"
+         x="47.88958"
+         y="79.639572"
+         inkscape:label="FRAME" />
+      <path
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:url(#Main);stroke-width:0.211667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 54.239556,84.402085 -5.291666,2.645833 5.291666,2.645834 5.291676,-2.645834 z"
+         id="path1908"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         id="path1926"
+         style="font-variation-settings:normal;display:inline;opacity:0.6;vector-effect:none;fill:none;fill-opacity:1;stroke:url(#Main);stroke-width:0.211667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 58.472902,86.518752 c -0.881943,0.440974 -1.763893,0.576438 -2.645833,1.017409 -0.881953,0.440972 -1.763893,1.187453 -2.645843,1.628424 m 4.233333,-3.175 c -0.88194,0.440973 -1.76389,0.08819 -2.645833,0.529167 -0.88194,0.440972 -1.76389,1.675694 -2.645833,2.116666 m 4.233336,-3.175 c -0.88194,0.440974 -1.763893,0.0882 -2.645843,0.529169 -0.88194,0.440972 -1.763883,1.675694 -2.645833,2.116665 m -1.05833,-0.529167 c 0.88195,-0.440973 1.76389,-1.187454 2.645833,-1.628426 0.88194,-0.440972 1.76389,-0.576435 2.645833,-1.017407 m -2.116663,0 c 0.88195,0.44097 1.76389,0.576433 2.645843,1.017406 0.88194,0.440972 1.76389,1.187454 2.645833,1.628427 m -6.350009,-2.116667 c 0.881953,0.440973 1.763893,0.08819 2.645833,0.529167 0.881943,0.440972 1.763893,1.675694 2.645833,2.116667 m -6.350006,-2.116667 c 0.90872,0.454355 1.809303,0.110897 2.693883,0.553183 0.88457,0.442286 1.753133,1.670316 2.597793,2.09265 m -6.350006,-2.116666 c 0.88195,0.440972 1.76389,0.576435 2.645833,1.017407 0.88194,0.440972 1.76389,1.187453 2.645833,1.628426"
+         sodipodi:nodetypes="csccsccsccsccsccsccsccsc" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2096"
+         id="use2063"
+         transform="translate(47.624994)"
+         width="100%"
+         height="100%"
+         style="display:inline;opacity:0.25" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#rect2105"
+         id="use2238"
+         width="100%"
+         height="100%"
+         transform="translate(15.874999)"
+         style="display:inline;opacity:0.25" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2109"
+         id="use2240"
+         width="100%"
+         height="100%"
+         transform="translate(15.874999)"
+         style="display:inline;opacity:0.25" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2636"
+         id="use2648"
+         width="100%"
+         height="100%"
+         transform="translate(31.749997)"
+         style="opacity:0.25" />
+    </g>
+    <g
+       id="scene-exterior-status-1"
+       inkscape:label="scene-exterior-status-1">
+      <rect
+         style="opacity:0;fill:#c01c28;stroke:none;stroke-width:0.264583;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;paint-order:stroke fill markers;stop-color:#000000"
+         id="frame2678"
+         width="12.699998"
+         height="12.699999"
+         x="63.76458"
+         y="79.639572"
+         inkscape:label="FRAME" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2096"
+         id="use2065"
+         width="100%"
+         height="100%"
+         transform="translate(63.499994)"
+         style="display:inline;opacity:0.25" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path1908"
+         id="use2169"
+         width="100%"
+         height="100%"
+         transform="translate(15.874999)"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path1926"
+         id="use2171"
+         width="100%"
+         height="100%"
+         transform="translate(15.874999)"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#rect2105"
+         id="use2242"
+         width="100%"
+         height="100%"
+         transform="translate(31.749997)"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2109"
+         id="use2244"
+         width="100%"
+         height="100%"
+         transform="translate(31.749997)"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2636"
+         id="use2652"
+         width="100%"
+         height="100%"
+         transform="translate(47.624995)"
+         style="opacity:0.25" />
+    </g>
+    <g
+       id="scene-exterior-status-2"
+       inkscape:label="scene-exterior-status-2">
+      <rect
+         style="opacity:0;fill:#c01c28;stroke:none;stroke-width:0.264583;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;paint-order:stroke fill markers;stop-color:#000000"
+         id="frame2680"
+         width="12.699998"
+         height="12.699999"
+         x="79.639572"
+         y="79.639572"
+         inkscape:label="FRAME" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2096"
+         id="use2067"
+         width="100%"
+         height="100%"
+         transform="translate(79.374991)"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path1908"
+         id="use2173"
+         width="100%"
+         height="100%"
+         transform="translate(31.749997)"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path1926"
+         id="use2175"
+         width="100%"
+         height="100%"
+         transform="translate(31.749997)"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#rect2105"
+         id="use2246"
+         transform="translate(47.624994)"
+         width="100%"
+         height="100%"
+         style="display:inline;opacity:0.25" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2109"
+         id="use2248"
+         transform="translate(47.624994)"
+         width="100%"
+         height="100%"
+         style="display:inline;opacity:0.25" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2636"
+         id="use2654"
+         width="100%"
+         height="100%"
+         transform="translate(63.499993)"
+         style="opacity:0.25" />
+    </g>
+    <g
+       id="scene-exterior-status-3"
+       inkscape:label="scene-exterior-status-3">
+      <rect
+         style="opacity:0;fill:#c01c28;stroke:none;stroke-width:0.264583;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;paint-order:stroke fill markers;stop-color:#000000"
+         id="frame2682"
+         width="12.699994"
+         height="12.699999"
+         x="95.514572"
+         y="79.639572"
+         inkscape:label="FRAME" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2096"
+         id="use2069"
+         width="100%"
+         height="100%"
+         transform="translate(95.249988)"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path1908"
+         id="use2181"
+         width="100%"
+         height="100%"
+         transform="translate(47.624994)"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path1926"
+         id="use2183"
+         width="100%"
+         height="100%"
+         transform="translate(47.624994)"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#rect2105"
+         id="use2250"
+         transform="translate(63.499994)"
+         width="100%"
+         height="100%"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2109"
+         id="use2252"
+         transform="translate(63.499994)"
+         width="100%"
+         height="100%"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2636"
+         id="use2656"
+         width="100%"
+         height="100%"
+         transform="translate(79.374991)"
+         style="opacity:0.25" />
+    </g>
+    <g
+       id="scene-exterior-status-4"
+       inkscape:label="scene-exterior-status-4">
+      <rect
+         style="opacity:0;fill:#c01c28;stroke:none;stroke-width:0.264583;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;paint-order:stroke fill markers;stop-color:#000000"
+         id="frame2684"
+         width="12.699989"
+         height="12.699999"
+         x="111.38956"
+         y="79.639572"
+         inkscape:label="FRAME" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2096"
+         id="use2071"
+         transform="translate(111.12498)"
+         width="100%"
+         height="100%"
+         style="display:inline;opacity:0.25" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path1908"
+         id="use2185"
+         width="100%"
+         height="100%"
+         transform="translate(63.499994)"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path1926"
+         id="use2187"
+         width="100%"
+         height="100%"
+         transform="translate(63.499994)"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#rect2105"
+         id="use2254"
+         transform="translate(79.374991)"
+         width="100%"
+         height="100%"
+         style="display:inline;opacity:0.25" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2109"
+         id="use2256"
+         transform="translate(79.374991)"
+         width="100%"
+         height="100%"
+         style="display:inline;opacity:0.25" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2636"
+         id="use2658"
+         width="100%"
+         height="100%"
+         transform="translate(95.249989)" />
+    </g>
+    <g
+       id="scene-exterior-status-5"
+       inkscape:label="scene-exterior-status-5">
+      <rect
+         style="opacity:0;fill:#c01c28;stroke:none;stroke-width:0.264583;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;paint-order:stroke fill markers;stop-color:#000000"
+         id="frame2686"
+         width="12.699989"
+         height="12.699999"
+         x="127.26453"
+         y="79.639572"
+         inkscape:label="FRAME" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2096"
+         id="use2073"
+         width="100%"
+         height="100%"
+         transform="translate(126.99996)"
+         style="display:inline;opacity:0.25" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path1908"
+         id="use2189"
+         width="100%"
+         height="100%"
+         transform="translate(79.374991)"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path1926"
+         id="use2191"
+         width="100%"
+         height="100%"
+         transform="translate(79.374991)"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#rect2105"
+         id="use2258"
+         transform="translate(95.249988)"
+         width="100%"
+         height="100%"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2109"
+         id="use2260"
+         transform="translate(95.249988)"
+         width="100%"
+         height="100%"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2636"
+         id="use2660"
+         width="100%"
+         height="100%"
+         transform="translate(111.12498)" />
+    </g>
+    <g
+       id="scene-exterior-status-6"
+       inkscape:label="scene-exterior-status-6">
+      <rect
+         style="opacity:0;fill:#c01c28;stroke:none;stroke-width:0.264583;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;paint-order:stroke fill markers;stop-color:#000000"
+         id="frame2688"
+         width="12.699989"
+         height="12.699999"
+         x="143.13951"
+         y="79.639572"
+         inkscape:label="FRAME" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2096"
+         id="use2075"
+         width="100%"
+         height="100%"
+         transform="translate(142.87494)"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path1908"
+         id="use2193"
+         width="100%"
+         height="100%"
+         transform="translate(95.249988)"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path1926"
+         id="use2195"
+         width="100%"
+         height="100%"
+         transform="translate(95.249988)"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#rect2105"
+         id="use2262"
+         transform="translate(111.12498)"
+         width="100%"
+         height="100%"
+         style="display:inline;opacity:0.25" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2109"
+         id="use2264"
+         transform="translate(111.12498)"
+         width="100%"
+         height="100%"
+         style="display:inline;opacity:0.25" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2636"
+         id="use2662"
+         width="100%"
+         height="100%"
+         transform="translate(126.99996)" />
+    </g>
+    <g
+       id="scene-exterior-status-7"
+       inkscape:label="scene-exterior-status-7">
+      <rect
+         style="opacity:0;fill:#c01c28;stroke:none;stroke-width:0.264583;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;paint-order:stroke fill markers;stop-color:#000000"
+         id="frame2690"
+         width="12.699989"
+         height="12.699999"
+         x="159.0145"
+         y="79.639572"
+         inkscape:label="FRAME" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2096"
+         id="use2077"
+         width="100%"
+         height="100%"
+         transform="translate(158.74992)"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path1908"
+         id="use2197"
+         width="100%"
+         height="100%"
+         transform="translate(111.12498)"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path1926"
+         id="use2199"
+         width="100%"
+         height="100%"
+         transform="translate(111.12498)"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#rect2105"
+         id="use2266"
+         transform="translate(126.99996)"
+         width="100%"
+         height="100%"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2109"
+         id="use2268"
+         transform="translate(126.99996)"
+         width="100%"
+         height="100%"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2636"
+         id="use2664"
+         width="100%"
+         height="100%"
+         transform="translate(142.87494)" />
+    </g>
+    <g
+       id="editing-instance"
+       inkscape:label="editing-instance">
+      <path
+         id="path2834"
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:url(#Main);stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 9.9218752,99.880206 v 3.704174 m -3.1750001,1.5875 3.1750005,-1.58756 m -2e-7,-3.704086 -3.1750005,-1.587546 M 3.571875,99.880211 v 3.704179 m 3.1750005,1.58755 -3.1750005,-1.58756 m 0,-3.704169 3.1750005,-1.587546" />
+      <path
+         id="path2559"
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#666666;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers;stop-color:#000000;stop-opacity:1"
+         inkscape:transform-center-x="-1.449936"
+         inkscape:transform-center-y="1.4499356"
+         d="m 11.667162,104.66822 -2.5119115,-2.51191 a 0.09338434,0.09338434 157.50002 0 0 -0.1594171,0.066 v 3.72455 a 0.05795809,0.05795809 20.993685 0 0 0.1010379,0.0388 l 1.0895877,-1.21065 h 1.436465 a 0.0625611,0.0625611 112.50002 0 0 0.04424,-0.1068 z"
+         sodipodi:nodetypes="ccccc"
+         inkscape:path-effect="#path-effect2561"
+         inkscape:original-d="m 11.77396,104.77502 -2.7781266,-2.77813 v 4.10104 l 1.1906256,-1.32291 z" />
+      <path
+         id="path2840"
+         style="font-variation-settings:normal;display:inline;opacity:0.5;vector-effect:none;fill:none;fill-opacity:1;stroke:url(#Main);stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="M 6.7468751,101.46771 9.9218756,99.880147 M 6.7468755,101.46777 3.571875,99.880211 m 3.1750001,1.587499 v 3.70417" />
+      <rect
+         style="opacity:0;fill:#ffbe6f;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#000000"
+         id="rect2566"
+         width="12.699999"
+         height="12.699994"
+         x="0.2645838"
+         y="95.514572" />
+    </g>
+    <g
+       id="editing-terrain-shape"
+       inkscape:label="editing-terrain-shape">
+      <path
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:url(#Main);stroke-width:0.211667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 22.48956,100.27708 -1.05833,0.52917 -1.058333,0.52917 -1.05834,0.52916 -1.05833,0.52917 -1.058333,0.52916 1.058333,0.52917 1.05833,0.52917 1.05834,0.52916 1.058333,0.52917 1.05833,0.52916 1.058333,-0.52916 1.05834,-0.52917 1.05833,-0.52916 1.058343,-0.52917 1.05833,-0.52917 -1.05833,-0.52916 -1.058343,-0.52917 -1.05833,-0.52916 -1.05834,-0.52917 z"
+         id="path2229"
+         sodipodi:nodetypes="ccccccccccccccccccccc" />
+      <path
+         id="path2231"
+         style="font-variation-settings:normal;display:inline;opacity:0.6;vector-effect:none;fill:none;fill-opacity:1;stroke:url(#Main);stroke-width:0.211667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 26.722906,102.39375 c -0.881943,0.44097 -1.763893,0.57644 -2.645833,1.01741 -0.881953,0.44097 -1.763893,1.18745 -2.645843,1.62842 m 4.233333,-3.175 c -0.88194,0.44098 -1.76389,0.0882 -2.645833,0.52917 -0.88194,0.44097 -1.76389,1.67569 -2.645833,2.11666 m 4.233336,-3.17499 c -0.88194,0.44097 -1.763893,0.0882 -2.645843,0.52917 -0.88194,0.44097 -1.763883,1.67569 -2.645833,2.11666 m -1.05833,-0.52917 c 0.88195,-0.44097 1.76389,-1.18745 2.645833,-1.62842 0.88194,-0.44097 1.76389,-0.57644 2.645833,-1.01741 m -2.116663,0 c 0.88195,0.44097 1.76389,0.57643 2.645843,1.01741 0.88194,0.44097 1.76389,1.18745 2.645833,1.62842 m -6.350009,-2.11666 c 0.881953,0.44097 1.763893,0.0882 2.645833,0.52916 0.881943,0.44098 1.763893,1.67569 2.645833,2.11667 m -6.350006,-2.11667 c 0.90872,0.45436 1.809303,0.1109 2.693883,0.55319 0.88457,0.44228 1.753133,1.67031 2.597793,2.09264 m -6.350006,-2.11666 c 0.88195,0.44097 1.76389,0.57643 2.645833,1.0174 0.88194,0.44098 1.76389,1.18746 2.645833,1.62843"
+         sodipodi:nodetypes="csccsccsccsccsccsccsccsc" />
+      <rect
+         style="opacity:0;fill:#ffbe6f;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#000000"
+         id="rect2579"
+         width="12.699998"
+         height="12.699994"
+         x="16.139584"
+         y="95.514572" />
+    </g>
+    <g
+       id="editing-pathgrid"
+       inkscape:label="editing-pathgrid">
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2229"
+         id="use2493"
+         width="100%"
+         height="100%"
+         transform="translate(31.749997)"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2231"
+         id="use2495"
+         width="100%"
+         height="100%"
+         transform="translate(31.749997)"
+         style="display:inline" />
+      <path
+         style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#linearGradient2616);fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+         d="m 51.990594,99.615634 -0.926041,1.455206 0.926041,1.45521 0.926043,-1.45521 z"
+         id="path2614"
+         sodipodi:nodetypes="ccccc" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2614"
+         id="use2327"
+         width="100%"
+         height="100%"
+         transform="translate(4.4979166)"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2614"
+         id="use2329"
+         width="100%"
+         height="100%"
+         transform="translate(2.2489834,2.2489414)"
+         style="display:inline" />
+      <rect
+         style="opacity:0;fill:#ffbe6f;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#000000"
+         id="rect2590"
+         width="12.699998"
+         height="12.699994"
+         x="47.88958"
+         y="95.514572" />
+    </g>
+    <g
+       id="editing-terrain-texture"
+       inkscape:label="editing-terrain-texture">
+      <path
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#f6f5f4;fill-opacity:1;stroke:#1a1a1a;stroke-width:0.211667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 70.114554,100.27708 -1.05833,0.52917 -1.058333,0.52917 -1.05834,0.52916 -1.05833,0.52917 -1.058333,0.52916 1.058333,0.52917 1.05833,0.52917 1.05834,0.52916 1.058333,0.52917 1.05833,0.52916 1.058333,-0.52916 1.05834,-0.52917 1.05833,-0.52916 1.058343,-0.52917 1.05833,-0.52917 -1.05833,-0.52916 -1.058343,-0.52917 -1.05833,-0.52916 -1.05834,-0.52917 z"
+         id="path3258"
+         sodipodi:nodetypes="ccccccccccccccccccccc" />
+      <path
+         style="display:inline;fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 65.881221,102.39375 c 0,0 0.358847,0.19095 1.058339,0.42163 0.364629,-0.25301 1.04967,-0.69007 1.04967,-0.69007 0,0 -0.588311,-0.0301 -1.049678,-0.26073 z"
+         id="path3192"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="display:inline;fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 65.881221,103.45208 c 0,0 0.366219,-0.16792 1.05827,-0.63673 0.520898,0.15627 1.054113,0.36132 1.054113,0.36132 0,0 -0.451298,0.46972 -1.054052,0.80458 l -1.058331,-0.52917"
+         id="path3194"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="display:inline;fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 67.993599,103.17667 c 0,0 0.468905,-0.47075 1.049335,-0.95444 0.58043,0.0893 1.08017,0.51193 1.08017,0.51193 0,0 -0.75801,0.64369 -1.07055,0.97111 -0.42416,-0.28277 -1.058955,-0.5286 -1.058955,-0.5286 z"
+         id="path3196"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="display:inline;fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 67.997893,104.51041 c 0,0 0.556087,-0.29912 1.054661,-0.80514 0.468808,0.29021 1.062,0.69761 1.062,0.69761 0,0 -0.656494,0.45811 -1.05833,0.6367 z"
+         id="path3198"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="display:inline;fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 69.042934,102.22223 c 0,0 -0.584922,-0.0895 -1.05373,-0.0969 0,0 0.461813,-0.30863 1.07945,-0.53931 0.52834,0.007 1.04591,0.0965 1.04591,0.0965 0,0 -0.439111,0.0337 -1.07163,0.53971 z"
+         id="path3200"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="display:inline;fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 69.068624,101.58603 c 0,0 -0.616812,-0.009 -1.070731,-0.25061 l 1.058331,-0.52917 c 0.483691,0.23812 1.05834,0.42163 1.05834,0.42163 z"
+         id="path3202"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="display:inline;fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 74.35639,102.39375 c 0,0 -0.35885,0.19095 -1.058343,0.42163 -0.36463,-0.25301 -1.04967,-0.69007 -1.04967,-0.69007 0,0 0.58831,-0.0301 1.04968,-0.26073 z"
+         id="path3204"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="display:inline;fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 74.35639,103.45208 c 0,0 -0.36622,-0.16792 -1.058273,-0.63673 -0.5209,0.15627 -1.05411,0.36132 -1.05411,0.36132 0,0 0.4513,0.46972 1.05405,0.80458 l 1.058333,-0.52917"
+         id="path3206"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="display:inline;fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 72.244017,103.17667 c 0,0 -0.4689,-0.47075 -1.04933,-0.95444 -0.580423,0.0893 -1.080163,0.51193 -1.080163,0.51193 0,0 0.75801,0.64369 1.070543,0.97111 0.42416,-0.28277 1.05895,-0.5286 1.05895,-0.5286 z"
+         id="path3208"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="display:inline;fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 72.239717,104.51041 c 0,0 -0.55608,-0.29912 -1.05465,-0.80514 -0.468803,0.29021 -1.061993,0.69761 -1.061993,0.69761 0,0 0.65649,0.45811 1.058323,0.6367 z"
+         id="path3210"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="display:inline;fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 71.194687,102.22223 c 0,0 0.58492,-0.0895 1.05372,-0.0969 0,0 -0.4618,-0.30863 -1.07944,-0.53931 -0.528333,0.007 -1.045903,0.0965 -1.045903,0.0965 0,0 0.43911,0.0337 1.071623,0.53971 z"
+         id="path3212"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="display:inline;fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 71.168997,101.58603 c 0,0 0.61681,-0.009 1.07072,-0.25061 l -1.05832,-0.52917 c -0.483683,0.23812 -1.058333,0.42163 -1.058333,0.42163 z"
+         id="path3214"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         id="path3298"
+         style="font-variation-settings:normal;display:inline;opacity:0.5;vector-effect:none;fill:none;fill-opacity:1;stroke:#1a1a1a;stroke-width:0.132292;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 74.3479,102.39375 c -0.881943,0.44097 -1.763893,0.57644 -2.645833,1.01741 -0.881953,0.44097 -1.763893,1.18745 -2.645843,1.62842 m 4.233333,-3.175 c -0.88194,0.44098 -1.76389,0.0882 -2.645833,0.52917 -0.88194,0.44097 -1.76389,1.67569 -2.645833,2.11666 m 4.233336,-3.17499 c -0.88194,0.44097 -1.763893,0.0882 -2.645843,0.52917 -0.88194,0.44097 -1.763883,1.67569 -2.645833,2.11666 m -1.05833,-0.52917 c 0.88195,-0.44097 1.76389,-1.18745 2.645833,-1.62842 0.88194,-0.44097 1.76389,-0.57644 2.645833,-1.01741 m -2.116663,0 c 0.88195,0.44097 1.76389,0.57643 2.645843,1.01741 0.88194,0.44097 1.76389,1.18745 2.645833,1.62842 m -6.350009,-2.11666 c 0.881953,0.44097 1.763893,0.0882 2.645833,0.52916 0.881943,0.44098 1.763893,1.67569 2.645833,2.11667 m -6.350006,-2.11667 c 0.90872,0.45436 1.809303,0.1109 2.693883,0.55319 0.88457,0.44228 1.753133,1.67031 2.597793,2.09264 m -6.350006,-2.11666 c 0.88195,0.44097 1.76389,0.57643 2.645833,1.0174 0.88194,0.44098 1.76389,1.18746 2.645833,1.62843"
+         sodipodi:nodetypes="csccsccsccsccsccsccsccsc" />
+      <rect
+         style="opacity:0;fill:#ffbe6f;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#000000"
+         id="rect2592"
+         width="12.699998"
+         height="12.699994"
+         x="63.76458"
+         y="95.514572" />
+    </g>
+    <g
+       id="editing-terrain-vertex-paint"
+       inkscape:label="editing-terrain-vertex-paint">
+      <rect
+         style="display:inline;opacity:1;fill:url(#meshgradient2125);fill-opacity:1;stroke-width:0.246511;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect1913"
+         width="5.9162631"
+         height="5.9162631"
+         x="-69.959816"
+         y="160.18283"
+         transform="matrix(0.89442718,-0.44721359,0.89442718,0.44721359,0,0)" />
+      <path
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#1a1a1a;stroke-width:0.211667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 85.989552,100.27708 -1.05833,0.52917 -1.058333,0.52917 -1.05834,0.52916 -1.05833,0.52917 -1.058333,0.52916 1.058333,0.52917 1.05833,0.52917 1.05834,0.52916 1.058333,0.52917 1.05833,0.52916 1.058333,-0.52916 1.05834,-0.52917 1.05833,-0.52916 1.058343,-0.52917 1.05833,-0.52917 -1.05833,-0.52916 -1.058343,-0.52917 -1.05833,-0.52916 -1.05834,-0.52917 z"
+         id="path2245"
+         sodipodi:nodetypes="ccccccccccccccccccccc" />
+      <path
+         id="path2247"
+         style="font-variation-settings:normal;display:inline;opacity:0.6;vector-effect:none;fill:none;fill-opacity:1;stroke:#1a1a1a;stroke-width:0.211667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 90.222898,102.39375 c -0.881943,0.44097 -1.763893,0.57644 -2.645833,1.01741 -0.881953,0.44097 -1.763893,1.18745 -2.645843,1.62842 m 4.233333,-3.175 c -0.88194,0.44098 -1.76389,0.0882 -2.645833,0.52917 -0.88194,0.44097 -1.76389,1.67569 -2.645833,2.11666 m 4.233336,-3.17499 c -0.88194,0.44097 -1.763893,0.0882 -2.645843,0.52917 -0.88194,0.44097 -1.763883,1.67569 -2.645833,2.11666 m -1.05833,-0.52917 c 0.88195,-0.44097 1.76389,-1.18745 2.645833,-1.62842 0.88194,-0.44097 1.76389,-0.57644 2.645833,-1.01741 m -2.116663,0 c 0.88195,0.44097 1.76389,0.57643 2.645843,1.01741 0.88194,0.44097 1.76389,1.18745 2.645833,1.62842 m -6.350009,-2.11666 c 0.881953,0.44097 1.763893,0.0882 2.645833,0.52916 0.881943,0.44098 1.763893,1.67569 2.645833,2.11667 m -6.350006,-2.11667 c 0.90872,0.45436 1.809303,0.1109 2.693883,0.55319 0.88457,0.44228 1.753133,1.67031 2.597793,2.09264 m -6.350006,-2.11666 c 0.88195,0.44097 1.76389,0.57643 2.645833,1.0174 0.88194,0.44098 1.76389,1.18746 2.645833,1.62843"
+         sodipodi:nodetypes="csccsccsccsccsccsccsccsc" />
+      <rect
+         style="opacity:0;fill:#ffbe6f;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#000000"
+         id="rect2594"
+         width="12.699998"
+         height="12.699994"
+         x="79.639572"
+         y="95.514572" />
+    </g>
+    <g
+       id="lighting-sun"
+       inkscape:label="lighting-sun">
+      <rect
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#ccc2a3;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:3.4;stroke-dasharray:0.264583, 0.79375;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect3536"
+         width="12.699989"
+         height="12.699994"
+         x="113.24164"
+         y="97.366661"
+         ry="0.13229166"
+         transform="translate(-1.8520833,-1.8520833)" />
+      <ellipse
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#f9f06b;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="circle3260"
+         cx="117.73962"
+         cy="101.86462"
+         rx="1.8521135"
+         ry="1.8521138" />
+      <rect
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#f9f06b;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect3272"
+         width="0.52917033"
+         height="1.8520808"
+         x="117.47501"
+         y="97.366669"
+         ry="0.26458332"
+         inkscape:transform-center-x="-1.0805879e-05"
+         inkscape:transform-center-y="-4.1010545" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#rect3272"
+         inkscape:transform-center-x="-2.0505391"
+         inkscape:transform-center-y="-3.5516133"
+         id="use3274"
+         width="100%"
+         height="100%"
+         transform="rotate(30,117.73959,101.86459)"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#rect3272"
+         inkscape:transform-center-x="-3.5516282"
+         inkscape:transform-center-y="-2.0505191"
+         id="use3278"
+         width="100%"
+         height="100%"
+         transform="rotate(60,117.73959,101.86459)"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#rect3272"
+         inkscape:transform-center-x="-4.1010623"
+         inkscape:transform-center-y="1.1105879e-05"
+         id="use3280"
+         width="100%"
+         height="100%"
+         transform="rotate(90,117.73959,101.86459)"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#rect3272"
+         inkscape:transform-center-x="-3.5516211"
+         inkscape:transform-center-y="2.0505394"
+         id="use3282"
+         width="100%"
+         height="100%"
+         transform="rotate(120,117.7396,101.86459)"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#rect3272"
+         inkscape:transform-center-x="-2.0505269"
+         inkscape:transform-center-y="3.5516285"
+         id="use3284"
+         width="100%"
+         height="100%"
+         transform="rotate(150,117.73959,101.86459)"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#rect3272"
+         inkscape:transform-center-x="3.2987925e-06"
+         inkscape:transform-center-y="4.1010626"
+         id="use3286"
+         width="100%"
+         height="100%"
+         transform="rotate(180,117.73959,101.86459)"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#rect3272"
+         inkscape:transform-center-x="2.0505316"
+         inkscape:transform-center-y="3.5516214"
+         id="use3288"
+         width="100%"
+         height="100%"
+         transform="rotate(-150,117.73959,101.86459)"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#rect3272"
+         inkscape:transform-center-x="3.5516207"
+         inkscape:transform-center-y="2.0505272"
+         id="use3290"
+         width="100%"
+         height="100%"
+         transform="rotate(-120,117.73959,101.86459)"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#rect3272"
+         inkscape:transform-center-x="4.1010548"
+         inkscape:transform-center-y="-2.9987926e-06"
+         id="use3292"
+         width="100%"
+         height="100%"
+         transform="rotate(-90,117.73959,101.86459)"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#rect3272"
+         inkscape:transform-center-x="3.5516136"
+         inkscape:transform-center-y="-2.0505313"
+         id="use3294"
+         width="100%"
+         height="100%"
+         transform="rotate(-60,117.73959,101.86459)"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#rect3272"
+         inkscape:transform-center-x="2.0505194"
+         inkscape:transform-center-y="-3.5516204"
+         id="use3296"
+         width="100%"
+         height="100%"
+         transform="rotate(-30,117.73959,101.86459)"
+         style="display:inline" />
+    </g>
+    <g
+       id="lighting-moon"
+       inkscape:label="lighting-moon">
+      <rect
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#3b3b40;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:3.4;stroke-dasharray:0.264583, 0.79375;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect3538"
+         width="12.699989"
+         height="12.699994"
+         x="129.11664"
+         y="97.366661"
+         ry="0.13229166"
+         transform="translate(-1.8520833,-1.8520833)" />
+      <circle
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#99c1f1;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="circle3327"
+         cx="133.61461"
+         cy="101.86462"
+         r="3.7041888" />
+      <path
+         id="ellipse3325"
+         style="font-variation-settings:normal;display:inline;opacity:0.75;vector-effect:none;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="m 131.57853,98.770197 a 3.7041888,3.7041888 0 0 0 -1.66811,3.094393 3.7041888,3.7041888 0 0 0 3.70416,3.70416 3.7041888,3.7041888 0 0 0 3.09439,-1.66811 3.7041888,3.7041888 0 0 1 -2.03606,0.60978 3.7041888,3.7041888 0 0 1 -3.70416,-3.70417 3.7041888,3.7041888 0 0 1 0.60978,-2.036053 z" />
+      <circle
+         style="font-variation-settings:normal;display:inline;opacity:0.75;vector-effect:none;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="circle3331"
+         cx="134.93753"
+         cy="100.27711"
+         r="0.79374999" />
+      <circle
+         style="font-variation-settings:normal;display:inline;opacity:0.75;vector-effect:none;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="circle3333"
+         cx="136.12811"
+         cy="101.73229"
+         r="0.39687499" />
+    </g>
+    <g
+       id="lighting-lamp"
+       inkscape:label="lighting-lamp">
+      <rect
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#cccbc8;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:3.4;stroke-dasharray:0.264583, 0.79375;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect3540"
+         width="12.699989"
+         height="12.699994"
+         x="144.99161"
+         y="97.366661"
+         ry="0.13229166"
+         transform="translate(-1.8520833,-1.8520833)" />
+      <ellipse
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="ellipse3462"
+         cx="149.48958"
+         cy="101.86462"
+         rx="1.8521135"
+         ry="1.8521138" />
+      <path
+         id="ellipse3464"
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         d="M 564.88672,370 A 15,15 0 0 0 550,385 a 15,15 0 0 0 15,15 15,15 0 0 0 15,-15 15,15 0 0 0 -15,-15 15,15 0 0 0 -0.11328,0 z M 565,371 a 14,14 0 0 1 14,14 14,14 0 0 1 -14,14 14,14 0 0 1 -14,-14 14,14 0 0 1 14,-14 z"
+         transform="scale(0.26458333)" />
+    </g>
+    <g
+       id="selection-mode-cube-sphere"
+       inkscape:label="selection-mode-cube-sphere">
+      <ellipse
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#666666;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:stroke fill markers;stop-color:#000000;stop-opacity:1"
+         id="ellipse2756"
+         ry="3.8364651"
+         rx="3.8364584"
+         cy="133.61459"
+         cx="6.6145835" />
+      <path
+         style="font-variation-settings:normal;display:inline;opacity:0.5;vector-effect:none;fill:none;fill-opacity:1;stroke:url(#Main);stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.529167, 0.529167;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:stroke fill markers;stop-color:#000000;stop-opacity:1"
+         id="ellipse2394"
+         inkscape:transform-center-y="6.7258594e-06"
+         sodipodi:type="arc"
+         sodipodi:cx="6.614583"
+         sodipodi:cy="133.61459"
+         sodipodi:rx="3.8364584"
+         sodipodi:ry="1.8520901"
+         sodipodi:start="0"
+         sodipodi:end="3.1415927"
+         sodipodi:arc-type="arc"
+         d="m 10.451041,133.61459 a 3.8364584,1.8520901 0 0 1 -1.9182288,1.60396 3.8364584,1.8520901 0 0 1 -3.8364585,0 3.8364584,1.8520901 0 0 1 -1.9182291,-1.60396"
+         sodipodi:open="true" />
+      <ellipse
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:stroke fill markers;stop-color:#000000;stop-opacity:1"
+         id="path2311"
+         ry="3.8364651"
+         rx="3.8364584"
+         cy="133.61459"
+         cx="6.6145835" />
+      <path
+         id="path2502"
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#666666;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers;stop-color:#000000;stop-opacity:1"
+         inkscape:transform-center-x="-1.449936"
+         inkscape:transform-center-y="1.4499356"
+         d="m 11.931745,137.4765 -2.5119112,-2.51191 a 0.09338433,0.09338433 157.50002 0 0 -0.1594171,0.066 v 3.72455 a 0.05795808,0.05795808 20.993682 0 0 0.1010379,0.0388 l 1.0895874,-1.21065 h 1.436465 a 0.06256111,0.06256111 112.50002 0 0 0.04424,-0.1068 z"
+         sodipodi:nodetypes="ccccc"
+         inkscape:path-effect="#path-effect2504"
+         inkscape:original-d="m 12.038543,137.5833 -2.7781263,-2.77813 v 4.10104 l 1.1906253,-1.32291 z" />
+      <ellipse
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:stroke fill markers;stop-color:#000000;stop-opacity:1"
+         id="ellipse2532"
+         cx="6.7468772"
+         cy="133.48232"
+         rx="0.39687636"
+         ry="0.39687669" />
+      <rect
+         style="opacity:0;fill:#ffbe6f;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#000000"
+         id="rect2387"
+         width="12.699999"
+         height="12.699989"
+         x="0.2645838"
+         y="127.26453"
+         inkscape:label="frame" />
+    </g>
+    <g
+       id="selection-mode-cube-corner"
+       inkscape:label="selection-mode-cube-corner">
+      <path
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#666666;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 22.886465,137.7156 -4.762501,-2.3813"
+         id="path2645"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#666666;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 22.886457,137.7156 4.762501,-2.3813"
+         id="path2647"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#666666;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 27.648962,132.95312 v 2.38125"
+         id="path2649"
+         sodipodi:nodetypes="cc" />
+      <path
+         id="path2492"
+         style="font-variation-settings:normal;display:inline;opacity:0.5;vector-effect:none;fill:none;fill-opacity:1;stroke:url(#Main);stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.529167, 0.529167;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 22.886455,135.33434 v 2.38125 m 3e-6,-2.3812 4.762501,-2.38129 m -4.762494,2.38129 -4.762501,-2.38129"
+         sodipodi:nodetypes="cccccc" />
+      <path
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#666666;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 18.123964,132.95317 4.762501,-2.3813"
+         id="path2582"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#666666;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 22.886464,130.57187 4.762501,2.3813"
+         id="path2613"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#666666;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 18.12396,132.95312 v 2.38125"
+         id="path2629"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 18.123964,132.95317 4.762501,-2.3813"
+         id="path2465"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 22.886465,137.7156 -4.762501,-2.3813"
+         id="path2471"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 18.12396,132.95312 v 2.38125"
+         id="path2482"
+         sodipodi:nodetypes="cc" />
+      <ellipse
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:stroke fill markers;stop-color:#000000;stop-opacity:1"
+         id="ellipse2530"
+         cx="18.123959"
+         cy="135.33443"
+         rx="0.39687636"
+         ry="0.39687669" />
+      <path
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 27.648958,132.95317 -4.762501,-2.38129"
+         id="path2553"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 22.886457,137.7156 4.762501,-2.3813"
+         id="path2555"
+         sodipodi:nodetypes="cc" />
+      <path
+         id="path2498"
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#666666;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers;stop-color:#000000;stop-opacity:1"
+         inkscape:transform-center-x="-1.449936"
+         inkscape:transform-center-y="1.4499356"
+         d="m 27.806743,137.4765 -2.511911,-2.51191 a 0.09338433,0.09338433 157.50002 0 0 -0.159417,0.066 v 3.72455 a 0.05795806,0.05795806 20.993678 0 0 0.101038,0.0388 l 1.089587,-1.21065 h 1.436465 a 0.06256111,0.06256111 112.50002 0 0 0.04424,-0.1068 z"
+         sodipodi:nodetypes="ccccc"
+         inkscape:path-effect="#path-effect2500"
+         inkscape:original-d="m 27.913541,137.5833 -2.778126,-2.77813 v 4.10104 l 1.190625,-1.32291 z" />
+      <path
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 27.648962,132.95312 v 2.38125"
+         id="path2557"
+         sodipodi:nodetypes="cc" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#rect2387"
+         id="use2393"
+         width="100%"
+         height="100%"
+         transform="translate(15.874999)" />
+    </g>
+    <g
+       id="selection-mode-cube"
+       inkscape:label="selection-mode-cube">
+      <path
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#666666;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 33.998962,130.30733 4.233334,-2.11671"
+         id="path2714"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#666666;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="M 38.232296,137.45102 33.998962,135.3343"
+         id="path2716"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#666666;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 33.998958,130.30728 v 5.02709"
+         id="path2718"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#666666;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 42.465623,130.30733 -4.233334,-2.11671"
+         id="path2720"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#666666;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 38.232289,137.45102 4.233334,-2.11672"
+         id="path2722"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#666666;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 42.465627,130.30728 v 5.02709"
+         id="path2724"
+         sodipodi:nodetypes="cc" />
+      <path
+         id="path2506"
+         style="font-variation-settings:normal;display:inline;opacity:0.5;vector-effect:none;fill:none;fill-opacity:1;stroke:url(#Main);stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.529167, 0.529167;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 38.232286,132.42392 v 5.02709 m 3e-6,-5.02704 4.233334,-2.11671 m -4.233327,2.11671 -4.233334,-2.11671"
+         sodipodi:nodetypes="cccccc" />
+      <path
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 33.998962,130.30733 4.233334,-2.11671"
+         id="path2508"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="M 38.232296,137.45102 33.998962,135.3343"
+         id="path2510"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 33.998958,130.30728 v 5.02709"
+         id="path2512"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 42.465623,130.30733 -4.233334,-2.11671"
+         id="path2514"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 38.232289,137.45102 4.233334,-2.11672"
+         id="path2516"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 42.465627,130.30728 v 5.02709"
+         id="path2518"
+         sodipodi:nodetypes="cc" />
+      <ellipse
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:stroke fill markers;stop-color:#000000;stop-opacity:1"
+         id="ellipse2520"
+         cx="38.232292"
+         cy="132.68855"
+         rx="0.39687636"
+         ry="0.39687669" />
+      <path
+         id="path2522"
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#666666;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers;stop-color:#000000;stop-opacity:1"
+         inkscape:transform-center-x="-1.449936"
+         inkscape:transform-center-y="1.4499356"
+         d="m 43.681741,137.4765 -2.511911,-2.51191 a 0.09338433,0.09338433 157.50002 0 0 -0.159417,0.066 v 3.72455 a 0.05795806,0.05795806 20.993678 0 0 0.101038,0.0388 l 1.089587,-1.21065 h 1.436465 a 0.06256111,0.06256111 112.50002 0 0 0.04424,-0.1068 z"
+         sodipodi:nodetypes="ccccc"
+         inkscape:path-effect="#path-effect2524"
+         inkscape:original-d="m 43.788539,137.5833 -2.778126,-2.77813 v 4.10104 l 1.190625,-1.32291 z" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#rect2387"
+         id="use2397"
+         width="100%"
+         height="100%"
+         transform="translate(31.749997)" />
+    </g>
+    <g
+       id="scene-view-status-1"
+       style="display:inline"
+       inkscape:label="scene-view-status-1"
+       transform="translate(63.499993)">
+      <rect
+         style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:0.0529167;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+         id="rect2582"
+         width="12.699999"
+         height="12.699989"
+         x="0.2645838"
+         y="111.38956"
+         inkscape:label="FRAME" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#g2518"
+         id="use2522"
+         transform="translate(15.874999)"
+         width="100%"
+         height="100%" />
+    </g>
+    <g
+       id="scene-view-status-2"
+       style="display:inline"
+       inkscape:label="scene-view-status-2"
+       transform="translate(63.499993)">
+      <use
+         x="0"
+         y="0"
+         xlink:href="#rect2582"
+         id="use2584"
+         transform="translate(15.874999)"
+         width="100%"
+         height="100%"
+         style="fill:none"
+         inkscape:label="FRAME" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#use3162"
+         id="use2524"
+         width="100%"
+         height="100%"
+         transform="translate(31.749997)" />
+    </g>
+    <g
+       id="scene-view-status-3"
+       style="display:inline"
+       inkscape:label="scene-view-status-3"
+       transform="translate(63.499993)">
+      <use
+         x="0"
+         y="0"
+         xlink:href="#use2584"
+         id="use2586"
+         transform="translate(15.874998)"
+         width="100%"
+         height="100%"
+         style="fill:none"
+         inkscape:label="FRAME" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#use3162"
+         id="use2526"
+         width="100%"
+         height="100%"
+         transform="translate(47.624995)" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#g2518"
+         id="use2528"
+         width="100%"
+         height="100%"
+         transform="translate(47.624995)" />
+    </g>
+    <g
+       id="scene-view-status-4"
+       style="display:inline"
+       inkscape:label="scene-view-status-4"
+       transform="translate(63.499993)">
+      <use
+         x="0"
+         y="0"
+         xlink:href="#use2586"
+         id="use2588"
+         transform="translate(15.874998)"
+         width="100%"
+         height="100%"
+         style="fill:none"
+         inkscape:label="FRAME" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2497"
+         id="use2530"
+         width="100%"
+         height="100%"
+         transform="translate(63.499993)" />
+    </g>
+    <g
+       id="scene-view-status-5"
+       style="display:inline"
+       inkscape:label="scene-view-status-5"
+       transform="translate(63.499993)">
+      <use
+         x="0"
+         y="0"
+         xlink:href="#use2588"
+         id="use2590"
+         transform="translate(15.874998)"
+         width="100%"
+         height="100%"
+         style="fill:none"
+         inkscape:label="FRAME" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2497"
+         id="use2532"
+         width="100%"
+         height="100%"
+         transform="translate(79.374991)" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#g2518"
+         id="use2534"
+         width="100%"
+         height="100%"
+         transform="translate(79.374991)" />
+    </g>
+    <g
+       id="scene-view-status-6"
+       style="display:inline"
+       inkscape:label="scene-view-status-6"
+       transform="translate(63.499993)">
+      <use
+         x="0"
+         y="0"
+         xlink:href="#use2590"
+         id="use2592"
+         transform="translate(15.874998)"
+         width="100%"
+         height="100%"
+         style="fill:none"
+         inkscape:label="FRAME" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2497"
+         id="use2536"
+         width="100%"
+         height="100%"
+         transform="translate(95.249989)" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#use3162"
+         id="use2538"
+         width="100%"
+         height="100%"
+         transform="translate(95.249989)" />
+    </g>
+    <g
+       id="scene-view-status-7"
+       style="display:inline"
+       inkscape:label="scene-view-status-7"
+       transform="translate(63.499993)">
+      <use
+         x="0"
+         y="0"
+         xlink:href="#use2592"
+         id="use2594"
+         transform="translate(15.874998)"
+         width="100%"
+         height="100%"
+         style="fill:none"
+         inkscape:label="FRAME" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2497"
+         id="use2540"
+         transform="translate(111.12498)"
+         width="100%"
+         height="100%" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#use3162"
+         id="use2542"
+         transform="translate(111.12498)"
+         width="100%"
+         height="100%" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#g2518"
+         id="use2544"
+         transform="translate(111.12498)"
+         width="100%"
+         height="100%" />
+    </g>
+    <g
+       id="scene-view-status-16"
+       style="display:inline"
+       inkscape:label="scene-view-status-16"
+       transform="translate(63.499993)">
+      <use
+         x="0"
+         y="0"
+         xlink:href="#use2594"
+         id="use2596"
+         transform="translate(15.87498)"
+         width="100%"
+         height="100%"
+         style="fill:none"
+         inkscape:label="FRAME" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#g2126"
+         id="use2546"
+         width="100%"
+         height="100%"
+         transform="translate(126.99996)" />
+    </g>
+    <g
+       id="scene-view-status-17"
+       style="display:inline"
+       inkscape:label="scene-view-status-17"
+       transform="translate(63.499993)">
+      <use
+         x="0"
+         y="0"
+         xlink:href="#use2596"
+         id="use2598"
+         transform="translate(15.874984)"
+         width="100%"
+         height="100%"
+         style="fill:none"
+         inkscape:label="FRAME" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#g2126"
+         id="use2548"
+         transform="translate(142.87494)"
+         width="100%"
+         height="100%" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#g2518"
+         id="use2550"
+         transform="translate(142.87494)"
+         width="100%"
+         height="100%" />
+    </g>
+    <g
+       id="scene-view-status-18"
+       style="display:inline"
+       inkscape:label="scene-view-status-18"
+       transform="translate(63.499993)">
+      <use
+         x="0"
+         y="0"
+         xlink:href="#use2598"
+         id="use2600"
+         transform="translate(15.87498)"
+         width="100%"
+         height="100%"
+         style="fill:none"
+         inkscape:label="FRAME" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#g2126"
+         id="use2552"
+         transform="translate(158.74992)"
+         width="100%"
+         height="100%" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#use3162"
+         id="use2554"
+         transform="translate(158.74992)"
+         width="100%"
+         height="100%" />
+    </g>
+    <g
+       id="scene-view-status-19"
+       style="display:inline"
+       inkscape:label="scene-view-status-19"
+       transform="translate(63.499993)">
+      <use
+         x="0"
+         y="0"
+         xlink:href="#use2600"
+         id="use2602"
+         transform="translate(15.874976)"
+         width="100%"
+         height="100%"
+         style="fill:none"
+         inkscape:label="FRAME" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#g2126"
+         id="use2556"
+         transform="translate(174.6249)"
+         width="100%"
+         height="100%" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#use3162"
+         id="use2558"
+         transform="translate(174.6249)"
+         width="100%"
+         height="100%" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#g2518"
+         id="use2560"
+         transform="translate(174.6249)"
+         width="100%"
+         height="100%" />
+    </g>
+    <g
+       id="scene-view-status-21"
+       style="display:inline"
+       inkscape:label="scene-view-status-21"
+       transform="translate(79.374991)">
+      <use
+         x="0"
+         y="0"
+         xlink:href="#use2602"
+         id="use2604"
+         transform="translate(15.87498)"
+         width="100%"
+         height="100%"
+         style="fill:none"
+         inkscape:label="FRAME" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2497"
+         id="use2562"
+         transform="translate(190.49988)"
+         width="100%"
+         height="100%" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#g2126"
+         id="use2564"
+         transform="translate(190.49988)"
+         width="100%"
+         height="100%" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#g2518"
+         id="use2566"
+         transform="translate(190.49988)"
+         width="100%"
+         height="100%" />
+    </g>
+    <g
+       id="scene-view-status-22"
+       style="display:inline"
+       inkscape:label="scene-view-status-22"
+       transform="translate(79.374991)">
+      <use
+         x="0"
+         y="0"
+         xlink:href="#use2604"
+         id="use2614"
+         transform="translate(15.874984)"
+         width="100%"
+         height="100%"
+         style="fill:none"
+         inkscape:label="FRAME" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2497"
+         id="use2568"
+         transform="translate(206.37486)"
+         width="100%"
+         height="100%" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#g2126"
+         id="use2570"
+         transform="translate(206.37486)"
+         width="100%"
+         height="100%" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#use3162"
+         id="use2572"
+         transform="translate(206.37486)"
+         width="100%"
+         height="100%" />
+    </g>
+    <g
+       id="scene-view-status-23"
+       style="display:inline"
+       inkscape:label="scene-view-status-23"
+       transform="translate(79.374991)">
+      <use
+         x="0"
+         y="0"
+         xlink:href="#use2614"
+         id="use2616"
+         transform="translate(15.87498)"
+         width="100%"
+         height="100%"
+         style="fill:none"
+         inkscape:label="FRAME" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2497"
+         id="use2574"
+         transform="translate(222.24984)"
+         width="100%"
+         height="100%" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#g2126"
+         id="use2576"
+         transform="translate(222.24984)"
+         width="100%"
+         height="100%" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#use3162"
+         id="use2578"
+         transform="translate(222.24984)"
+         width="100%"
+         height="100%" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#g2518"
+         id="use2580"
+         transform="translate(222.24984)"
+         width="100%"
+         height="100%" />
+    </g>
+    <g
+       id="scene-view-status-20"
+       inkscape:label="scene-view-status-20"
+       transform="translate(126.99996,-15.874999)">
+      <rect
+         style="opacity:0;fill:#c01c28;stroke:none;stroke-width:0.264583;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;paint-order:stroke fill markers;stop-color:#000000"
+         id="rect2811"
+         width="12.699989"
+         height="12.699989"
+         x="111.38956"
+         y="127.26453"
+         inkscape:label="FRAME" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2497"
+         id="use2126"
+         width="100%"
+         height="100%"
+         transform="translate(126.99996,15.874999)"
+         style="display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#g2126"
+         id="use2128"
+         width="100%"
+         height="100%"
+         transform="translate(126.99996,15.874999)"
+         style="display:inline" />
+    </g>
+    <g
+       id="scene-view-instance"
+       inkscape:label="scene-view-instance">
+      <rect
+         style="fill:none;stroke:#eff0f1;stroke-width:0;paint-order:stroke fill markers;stop-color:#000000"
+         id="rect1371"
+         width="12.7"
+         height="12.7"
+         x="0.26458332"
+         y="111.38958"
+         ry="0"
+         inkscape:label="FRAME" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#g2518"
+         id="use1363"
+         width="100%"
+         height="100%"
+         transform="translate(15.874999)" />
+    </g>
+    <g
+       id="scene-view-terrain"
+       inkscape:label="scene-view-terrain">
+      <use
+         x="0"
+         y="0"
+         xlink:href="#use1373"
+         id="use1375"
+         transform="translate(15.874999)"
+         width="100%"
+         height="100%"
+         inkscape:label="FRAME" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#g2126"
+         id="use1365"
+         width="100%"
+         height="100%"
+         transform="translate(47.624995)" />
+    </g>
+    <g
+       id="scene-view-pathgrid"
+       inkscape:label="scene-view-pathgrid">
+      <use
+         x="0"
+         y="0"
+         xlink:href="#rect1371"
+         id="use1373"
+         width="100%"
+         height="100%"
+         transform="translate(15.874999)"
+         inkscape:label="FRAME" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#use3162"
+         id="use1367"
+         width="100%"
+         height="100%"
+         transform="translate(31.749997)" />
+    </g>
+    <g
+       id="scene-view-water"
+       inkscape:label="scene-view-water">
+      <use
+         x="0"
+         y="0"
+         xlink:href="#use1375"
+         id="use1377"
+         transform="translate(15.874999)"
+         width="100%"
+         height="100%"
+         inkscape:label="FRAME" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path2497"
+         id="use1369"
+         width="100%"
+         height="100%"
+         transform="translate(63.499993)" />
+    </g>
+    <g
+       id="editing-terrain-movement"
+       inkscape:label="editing-terrain-movement">
+      <rect
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:none;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
+         id="rect2307"
+         width="12.699999"
+         height="12.699999"
+         x="32.01458"
+         y="95.514572"
+         inkscape:label="FRAME" />
+      <g
+         id="g2283"
+         mask="url(#mask-powermask-path-effect2301)"
+         inkscape:path-effect="#path-effect2301">
+        <use
+           x="0"
+           y="0"
+           xlink:href="#path2229"
+           id="use2581"
+           width="100%"
+           height="100%"
+           transform="translate(15.874999)" />
+        <use
+           x="0"
+           y="0"
+           xlink:href="#path2231"
+           id="use2583"
+           width="100%"
+           height="100%"
+           transform="translate(15.874999)" />
+      </g>
+      <path
+         style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:url(#Blue);stroke-width:0.211667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+         d="m 38.364561,98.424992 -1.05833,0.529176 -1.058333,0.529166 -1.05834,0.529166 -1.05833,0.52916 -1.058333,0.52916 1.058333,0.52917 1.05833,0.52917 1.05834,0.52916 1.058333,0.52917 1.05833,0.52916 1.058333,-0.52916 1.05834,-0.52917 1.05833,-0.52916 1.058343,-0.52917 1.05833,-0.52917 -1.05833,-0.52916 -1.058343,-0.52916 -1.05833,-0.529166 -1.05834,-0.529166 z"
+         id="use1991"
+         sodipodi:nodetypes="ccccccccccccccccccccc" />
+      <path
+         id="use1993"
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:url(#Blue);stroke-width:0.211667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+         d="m 42.597907,100.54166 c -0.881943,0.44097 -1.763893,0.57644 -2.645833,1.01741 -0.881953,0.44097 -1.763893,1.18745 -2.645843,1.62842 m 4.233333,-3.17499 c -0.88194,0.44097 -1.76389,0.0882 -2.645833,0.52916 -0.88194,0.44097 -1.76389,1.67569 -2.645833,2.11666 m 4.233336,-3.174983 c -0.88194,0.44097 -1.763893,0.0882 -2.645843,0.529173 -0.88194,0.44096 -1.763883,1.67568 -2.645833,2.11665 m -1.05833,-0.52917 c 0.88195,-0.44097 1.76389,-1.18745 2.645833,-1.628413 0.88194,-0.44097 1.76389,-0.57644 2.645833,-1.01741 m -2.116663,0 c 0.88195,0.44097 1.76389,0.57643 2.645843,1.01741 0.88194,0.440963 1.76389,1.187443 2.645833,1.628413 m -6.350009,-2.116653 c 0.881953,0.44097 1.763893,0.0882 2.645833,0.529163 0.881943,0.44097 1.763893,1.67568 2.645833,2.11666 m -6.350006,-2.11666 c 0.90872,0.45435 1.809303,0.1109 2.693883,0.55318 0.88457,0.44228 1.753133,1.67031 2.597793,2.09264 m -6.350006,-2.11666 c 0.88195,0.44097 1.76389,0.57643 2.645833,1.0174 0.88194,0.44098 1.76389,1.18746 2.645833,1.62843"
+         sodipodi:nodetypes="csccsccsccsccsccsccsccsc" />
+    </g>
+  </g>
+  <script
+     id="mesh_polyfill"
+     type="text/javascript">
+!function(){const t=&quot;http://www.w3.org/2000/svg&quot;,e=&quot;http://www.w3.org/1999/xlink&quot;,s=&quot;http://www.w3.org/1999/xhtml&quot;,r=2;if(document.createElementNS(t,&quot;meshgradient&quot;).x)return;const n=(t,e,s,r)=&gt;{let n=new x(.5*(e.x+s.x),.5*(e.y+s.y)),o=new x(.5*(t.x+e.x),.5*(t.y+e.y)),i=new x(.5*(s.x+r.x),.5*(s.y+r.y)),a=new x(.5*(n.x+o.x),.5*(n.y+o.y)),h=new x(.5*(n.x+i.x),.5*(n.y+i.y)),l=new x(.5*(a.x+h.x),.5*(a.y+h.y));return[[t,o,a,l],[l,h,i,r]]},o=t=&gt;{let e=t[0].distSquared(t[1]),s=t[2].distSquared(t[3]),r=.25*t[0].distSquared(t[2]),n=.25*t[1].distSquared(t[3]),o=e&gt;s?e:s,i=r&gt;n?r:n;return 18*(o&gt;i?o:i)},i=(t,e)=&gt;Math.sqrt(t.distSquared(e)),a=(t,e)=&gt;t.scale(2/3).add(e.scale(1/3)),h=t=&gt;{let e,s,r,n,o,i,a,h=new g;return t.match(/(\w+\(\s*[^)]+\))+/g).forEach(t=&gt;{let l=t.match(/[\w.-]+/g),d=l.shift();switch(d){case&quot;translate&quot;:2===l.length?e=new g(1,0,0,1,l[0],l[1]):(console.error(&quot;mesh.js: translate does not have 2 arguments!&quot;),e=new g(1,0,0,1,0,0)),h=h.append(e);break;case&quot;scale&quot;:1===l.length?s=new g(l[0],0,0,l[0],0,0):2===l.length?s=new g(l[0],0,0,l[1],0,0):(console.error(&quot;mesh.js: scale does not have 1 or 2 arguments!&quot;),s=new g(1,0,0,1,0,0)),h=h.append(s);break;case&quot;rotate&quot;:if(3===l.length&amp;&amp;(e=new g(1,0,0,1,l[1],l[2]),h=h.append(e)),l[0]){r=l[0]*Math.PI/180;let t=Math.cos(r),e=Math.sin(r);Math.abs(t)&lt;1e-16&amp;&amp;(t=0),Math.abs(e)&lt;1e-16&amp;&amp;(e=0),a=new g(t,e,-e,t,0,0),h=h.append(a)}else console.error(&quot;math.js: No argument to rotate transform!&quot;);3===l.length&amp;&amp;(e=new g(1,0,0,1,-l[1],-l[2]),h=h.append(e));break;case&quot;skewX&quot;:l[0]?(r=l[0]*Math.PI/180,n=Math.tan(r),o=new g(1,0,n,1,0,0),h=h.append(o)):console.error(&quot;math.js: No argument to skewX transform!&quot;);break;case&quot;skewY&quot;:l[0]?(r=l[0]*Math.PI/180,n=Math.tan(r),i=new g(1,n,0,1,0,0),h=h.append(i)):console.error(&quot;math.js: No argument to skewY transform!&quot;);break;case&quot;matrix&quot;:6===l.length?h=h.append(new g(...l)):console.error(&quot;math.js: Incorrect number of arguments for matrix!&quot;);break;default:console.error(&quot;mesh.js: Unhandled transform type: &quot;+d)}}),h},l=t=&gt;{let e=[],s=t.split(/[ ,]+/);for(let t=0,r=s.length-1;t&lt;r;t+=2)e.push(new x(parseFloat(s[t]),parseFloat(s[t+1])));return e},d=(t,e)=&gt;{for(let s in e)t.setAttribute(s,e[s])},c=(t,e,s,r,n)=&gt;{let o,i,a=[0,0,0,0];for(let h=0;h&lt;3;++h)e[h]&lt;t[h]&amp;&amp;e[h]&lt;s[h]||t[h]&lt;e[h]&amp;&amp;s[h]&lt;e[h]?a[h]=0:(a[h]=.5*((e[h]-t[h])/r+(s[h]-e[h])/n),o=Math.abs(3*(e[h]-t[h])/r),i=Math.abs(3*(s[h]-e[h])/n),a[h]&gt;o?a[h]=o:a[h]&gt;i&amp;&amp;(a[h]=i));return a},u=[[1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0],[-3,3,0,0,-2,-1,0,0,0,0,0,0,0,0,0,0],[2,-2,0,0,1,1,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0],[0,0,0,0,0,0,0,0,-3,3,0,0,-2,-1,0,0],[0,0,0,0,0,0,0,0,2,-2,0,0,1,1,0,0],[-3,0,3,0,0,0,0,0,-2,0,-1,0,0,0,0,0],[0,0,0,0,-3,0,3,0,0,0,0,0,-2,0,-1,0],[9,-9,-9,9,6,3,-6,-3,6,-6,3,-3,4,2,2,1],[-6,6,6,-6,-3,-3,3,3,-4,4,-2,2,-2,-2,-1,-1],[2,0,-2,0,0,0,0,0,1,0,1,0,0,0,0,0],[0,0,0,0,2,0,-2,0,0,0,0,0,1,0,1,0],[-6,6,6,-6,-4,-2,4,2,-3,3,-3,3,-2,-1,-2,-1],[4,-4,-4,4,2,2,-2,-2,2,-2,2,-2,1,1,1,1]],f=t=&gt;{let e=[];for(let s=0;s&lt;16;++s){e[s]=0;for(let r=0;r&lt;16;++r)e[s]+=u[s][r]*t[r]}return e},p=(t,e,s)=&gt;{const r=e*e,n=s*s,o=e*e*e,i=s*s*s;return t[0]+t[1]*e+t[2]*r+t[3]*o+t[4]*s+t[5]*s*e+t[6]*s*r+t[7]*s*o+t[8]*n+t[9]*n*e+t[10]*n*r+t[11]*n*o+t[12]*i+t[13]*i*e+t[14]*i*r+t[15]*i*o},y=t=&gt;{let e=[],s=[],r=[];for(let s=0;s&lt;4;++s)e[s]=[],e[s][0]=n(t[0][s],t[1][s],t[2][s],t[3][s]),e[s][1]=[],e[s][1].push(...n(...e[s][0][0])),e[s][1].push(...n(...e[s][0][1])),e[s][2]=[],e[s][2].push(...n(...e[s][1][0])),e[s][2].push(...n(...e[s][1][1])),e[s][2].push(...n(...e[s][1][2])),e[s][2].push(...n(...e[s][1][3]));for(let t=0;t&lt;8;++t){s[t]=[];for(let r=0;r&lt;4;++r)s[t][r]=[],s[t][r][0]=n(e[0][2][t][r],e[1][2][t][r],e[2][2][t][r],e[3][2][t][r]),s[t][r][1]=[],s[t][r][1].push(...n(...s[t][r][0][0])),s[t][r][1].push(...n(...s[t][r][0][1])),s[t][r][2]=[],s[t][r][2].push(...n(...s[t][r][1][0])),s[t][r][2].push(...n(...s[t][r][1][1])),s[t][r][2].push(...n(...s[t][r][1][2])),s[t][r][2].push(...n(...s[t][r][1][3]))}for(let t=0;t&lt;8;++t){r[t]=[];for(let e=0;e&lt;8;++e)r[t][e]=[],r[t][e][0]=s[t][0][2][e],r[t][e][1]=s[t][1][2][e],r[t][e][2]=s[t][2][2][e],r[t][e][3]=s[t][3][2][e]}return r};class x{constructor(t,e){this.x=t||0,this.y=e||0}toString(){return`(x=${this.x}, y=${this.y})`}clone(){return new x(this.x,this.y)}add(t){return new x(this.x+t.x,this.y+t.y)}scale(t){return void 0===t.x?new x(this.x*t,this.y*t):new x(this.x*t.x,this.y*t.y)}distSquared(t){let e=this.x-t.x,s=this.y-t.y;return e*e+s*s}transform(t){let e=this.x*t.a+this.y*t.c+t.e,s=this.x*t.b+this.y*t.d+t.f;return new x(e,s)}}class g{constructor(t,e,s,r,n,o){void 0===t?(this.a=1,this.b=0,this.c=0,this.d=1,this.e=0,this.f=0):(this.a=t,this.b=e,this.c=s,this.d=r,this.e=n,this.f=o)}toString(){return`affine: ${this.a} ${this.c} ${this.e} \n       ${this.b} ${this.d} ${this.f}`}append(t){t instanceof g||console.error(&quot;mesh.js: argument to Affine.append is not affine!&quot;);let e=this.a*t.a+this.c*t.b,s=this.b*t.a+this.d*t.b,r=this.a*t.c+this.c*t.d,n=this.b*t.c+this.d*t.d,o=this.a*t.e+this.c*t.f+this.e,i=this.b*t.e+this.d*t.f+this.f;return new g(e,s,r,n,o,i)}}class w{constructor(t,e){this.nodes=t,this.colors=e}paintCurve(t,e){if(o(this.nodes)&gt;r){const s=n(...this.nodes);let r=[[],[]],o=[[],[]];for(let t=0;t&lt;4;++t)r[0][t]=this.colors[0][t],r[1][t]=(this.colors[0][t]+this.colors[1][t])/2,o[0][t]=r[1][t],o[1][t]=this.colors[1][t];let i=new w(s[0],r),a=new w(s[1],o);i.paintCurve(t,e),a.paintCurve(t,e)}else{let s=Math.round(this.nodes[0].x);if(s&gt;=0&amp;&amp;s&lt;e){let r=4*(~~this.nodes[0].y*e+s);t[r]=Math.round(this.colors[0][0]),t[r+1]=Math.round(this.colors[0][1]),t[r+2]=Math.round(this.colors[0][2]),t[r+3]=Math.round(this.colors[0][3])}}}}class m{constructor(t,e){this.nodes=t,this.colors=e}split(){let t=[[],[],[],[]],e=[[],[],[],[]],s=[[[],[]],[[],[]]],r=[[[],[]],[[],[]]];for(let s=0;s&lt;4;++s){const r=n(this.nodes[0][s],this.nodes[1][s],this.nodes[2][s],this.nodes[3][s]);t[0][s]=r[0][0],t[1][s]=r[0][1],t[2][s]=r[0][2],t[3][s]=r[0][3],e[0][s]=r[1][0],e[1][s]=r[1][1],e[2][s]=r[1][2],e[3][s]=r[1][3]}for(let t=0;t&lt;4;++t)s[0][0][t]=this.colors[0][0][t],s[0][1][t]=this.colors[0][1][t],s[1][0][t]=(this.colors[0][0][t]+this.colors[1][0][t])/2,s[1][1][t]=(this.colors[0][1][t]+this.colors[1][1][t])/2,r[0][0][t]=s[1][0][t],r[0][1][t]=s[1][1][t],r[1][0][t]=this.colors[1][0][t],r[1][1][t]=this.colors[1][1][t];return[new m(t,s),new m(e,r)]}paint(t,e){let s,n=!1;for(let t=0;t&lt;4;++t)if((s=o([this.nodes[0][t],this.nodes[1][t],this.nodes[2][t],this.nodes[3][t]]))&gt;r){n=!0;break}if(n){let s=this.split();s[0].paint(t,e),s[1].paint(t,e)}else{new w([...this.nodes[0]],[...this.colors[0]]).paintCurve(t,e)}}}class b{constructor(t){this.readMesh(t),this.type=t.getAttribute(&quot;type&quot;)||&quot;bilinear&quot;}readMesh(t){let e=[[]],s=[[]],r=Number(t.getAttribute(&quot;x&quot;)),n=Number(t.getAttribute(&quot;y&quot;));e[0][0]=new x(r,n);let o=t.children;for(let t=0,r=o.length;t&lt;r;++t){e[3*t+1]=[],e[3*t+2]=[],e[3*t+3]=[],s[t+1]=[];let r=o[t].children;for(let n=0,o=r.length;n&lt;o;++n){let o=r[n].children;for(let r=0,i=o.length;r&lt;i;++r){let i=r;0!==t&amp;&amp;++i;let h,d=o[r].getAttribute(&quot;path&quot;),c=&quot;l&quot;;null!=d&amp;&amp;(c=(h=d.match(/\s*([lLcC])\s*(.*)/))[1]);let u=l(h[2]);switch(c){case&quot;l&quot;:0===i?(e[3*t][3*n+3]=u[0].add(e[3*t][3*n]),e[3*t][3*n+1]=a(e[3*t][3*n],e[3*t][3*n+3]),e[3*t][3*n+2]=a(e[3*t][3*n+3],e[3*t][3*n])):1===i?(e[3*t+3][3*n+3]=u[0].add(e[3*t][3*n+3]),e[3*t+1][3*n+3]=a(e[3*t][3*n+3],e[3*t+3][3*n+3]),e[3*t+2][3*n+3]=a(e[3*t+3][3*n+3],e[3*t][3*n+3])):2===i?(0===n&amp;&amp;(e[3*t+3][3*n+0]=u[0].add(e[3*t+3][3*n+3])),e[3*t+3][3*n+1]=a(e[3*t+3][3*n],e[3*t+3][3*n+3]),e[3*t+3][3*n+2]=a(e[3*t+3][3*n+3],e[3*t+3][3*n])):(e[3*t+1][3*n]=a(e[3*t][3*n],e[3*t+3][3*n]),e[3*t+2][3*n]=a(e[3*t+3][3*n],e[3*t][3*n]));break;case&quot;L&quot;:0===i?(e[3*t][3*n+3]=u[0],e[3*t][3*n+1]=a(e[3*t][3*n],e[3*t][3*n+3]),e[3*t][3*n+2]=a(e[3*t][3*n+3],e[3*t][3*n])):1===i?(e[3*t+3][3*n+3]=u[0],e[3*t+1][3*n+3]=a(e[3*t][3*n+3],e[3*t+3][3*n+3]),e[3*t+2][3*n+3]=a(e[3*t+3][3*n+3],e[3*t][3*n+3])):2===i?(0===n&amp;&amp;(e[3*t+3][3*n+0]=u[0]),e[3*t+3][3*n+1]=a(e[3*t+3][3*n],e[3*t+3][3*n+3]),e[3*t+3][3*n+2]=a(e[3*t+3][3*n+3],e[3*t+3][3*n])):(e[3*t+1][3*n]=a(e[3*t][3*n],e[3*t+3][3*n]),e[3*t+2][3*n]=a(e[3*t+3][3*n],e[3*t][3*n]));break;case&quot;c&quot;:0===i?(e[3*t][3*n+1]=u[0].add(e[3*t][3*n]),e[3*t][3*n+2]=u[1].add(e[3*t][3*n]),e[3*t][3*n+3]=u[2].add(e[3*t][3*n])):1===i?(e[3*t+1][3*n+3]=u[0].add(e[3*t][3*n+3]),e[3*t+2][3*n+3]=u[1].add(e[3*t][3*n+3]),e[3*t+3][3*n+3]=u[2].add(e[3*t][3*n+3])):2===i?(e[3*t+3][3*n+2]=u[0].add(e[3*t+3][3*n+3]),e[3*t+3][3*n+1]=u[1].add(e[3*t+3][3*n+3]),0===n&amp;&amp;(e[3*t+3][3*n+0]=u[2].add(e[3*t+3][3*n+3]))):(e[3*t+2][3*n]=u[0].add(e[3*t+3][3*n]),e[3*t+1][3*n]=u[1].add(e[3*t+3][3*n]));break;case&quot;C&quot;:0===i?(e[3*t][3*n+1]=u[0],e[3*t][3*n+2]=u[1],e[3*t][3*n+3]=u[2]):1===i?(e[3*t+1][3*n+3]=u[0],e[3*t+2][3*n+3]=u[1],e[3*t+3][3*n+3]=u[2]):2===i?(e[3*t+3][3*n+2]=u[0],e[3*t+3][3*n+1]=u[1],0===n&amp;&amp;(e[3*t+3][3*n+0]=u[2])):(e[3*t+2][3*n]=u[0],e[3*t+1][3*n]=u[1]);break;default:console.error(&quot;mesh.js: &quot;+c+&quot; invalid path type.&quot;)}if(0===t&amp;&amp;0===n||r&gt;0){let e=window.getComputedStyle(o[r]).stopColor.match(/^rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)$/i),a=window.getComputedStyle(o[r]).stopOpacity,h=255;a&amp;&amp;(h=Math.floor(255*a)),e&amp;&amp;(0===i?(s[t][n]=[],s[t][n][0]=Math.floor(e[1]),s[t][n][1]=Math.floor(e[2]),s[t][n][2]=Math.floor(e[3]),s[t][n][3]=h):1===i?(s[t][n+1]=[],s[t][n+1][0]=Math.floor(e[1]),s[t][n+1][1]=Math.floor(e[2]),s[t][n+1][2]=Math.floor(e[3]),s[t][n+1][3]=h):2===i?(s[t+1][n+1]=[],s[t+1][n+1][0]=Math.floor(e[1]),s[t+1][n+1][1]=Math.floor(e[2]),s[t+1][n+1][2]=Math.floor(e[3]),s[t+1][n+1][3]=h):3===i&amp;&amp;(s[t+1][n]=[],s[t+1][n][0]=Math.floor(e[1]),s[t+1][n][1]=Math.floor(e[2]),s[t+1][n][2]=Math.floor(e[3]),s[t+1][n][3]=h))}}e[3*t+1][3*n+1]=new x,e[3*t+1][3*n+2]=new x,e[3*t+2][3*n+1]=new x,e[3*t+2][3*n+2]=new x,e[3*t+1][3*n+1].x=(-4*e[3*t][3*n].x+6*(e[3*t][3*n+1].x+e[3*t+1][3*n].x)+-2*(e[3*t][3*n+3].x+e[3*t+3][3*n].x)+3*(e[3*t+3][3*n+1].x+e[3*t+1][3*n+3].x)+-1*e[3*t+3][3*n+3].x)/9,e[3*t+1][3*n+2].x=(-4*e[3*t][3*n+3].x+6*(e[3*t][3*n+2].x+e[3*t+1][3*n+3].x)+-2*(e[3*t][3*n].x+e[3*t+3][3*n+3].x)+3*(e[3*t+3][3*n+2].x+e[3*t+1][3*n].x)+-1*e[3*t+3][3*n].x)/9,e[3*t+2][3*n+1].x=(-4*e[3*t+3][3*n].x+6*(e[3*t+3][3*n+1].x+e[3*t+2][3*n].x)+-2*(e[3*t+3][3*n+3].x+e[3*t][3*n].x)+3*(e[3*t][3*n+1].x+e[3*t+2][3*n+3].x)+-1*e[3*t][3*n+3].x)/9,e[3*t+2][3*n+2].x=(-4*e[3*t+3][3*n+3].x+6*(e[3*t+3][3*n+2].x+e[3*t+2][3*n+3].x)+-2*(e[3*t+3][3*n].x+e[3*t][3*n+3].x)+3*(e[3*t][3*n+2].x+e[3*t+2][3*n].x)+-1*e[3*t][3*n].x)/9,e[3*t+1][3*n+1].y=(-4*e[3*t][3*n].y+6*(e[3*t][3*n+1].y+e[3*t+1][3*n].y)+-2*(e[3*t][3*n+3].y+e[3*t+3][3*n].y)+3*(e[3*t+3][3*n+1].y+e[3*t+1][3*n+3].y)+-1*e[3*t+3][3*n+3].y)/9,e[3*t+1][3*n+2].y=(-4*e[3*t][3*n+3].y+6*(e[3*t][3*n+2].y+e[3*t+1][3*n+3].y)+-2*(e[3*t][3*n].y+e[3*t+3][3*n+3].y)+3*(e[3*t+3][3*n+2].y+e[3*t+1][3*n].y)+-1*e[3*t+3][3*n].y)/9,e[3*t+2][3*n+1].y=(-4*e[3*t+3][3*n].y+6*(e[3*t+3][3*n+1].y+e[3*t+2][3*n].y)+-2*(e[3*t+3][3*n+3].y+e[3*t][3*n].y)+3*(e[3*t][3*n+1].y+e[3*t+2][3*n+3].y)+-1*e[3*t][3*n+3].y)/9,e[3*t+2][3*n+2].y=(-4*e[3*t+3][3*n+3].y+6*(e[3*t+3][3*n+2].y+e[3*t+2][3*n+3].y)+-2*(e[3*t+3][3*n].y+e[3*t][3*n+3].y)+3*(e[3*t][3*n+2].y+e[3*t+2][3*n].y)+-1*e[3*t][3*n].y)/9}}this.nodes=e,this.colors=s}paintMesh(t,e){let s=(this.nodes.length-1)/3,r=(this.nodes[0].length-1)/3;if(&quot;bilinear&quot;===this.type||s&lt;2||r&lt;2){let n;for(let o=0;o&lt;s;++o)for(let s=0;s&lt;r;++s){let r=[];for(let t=3*o,e=3*o+4;t&lt;e;++t)r.push(this.nodes[t].slice(3*s,3*s+4));let i=[];i.push(this.colors[o].slice(s,s+2)),i.push(this.colors[o+1].slice(s,s+2)),(n=new m(r,i)).paint(t,e)}}else{let n,o,a,h,l,d,u;const x=s,g=r;s++,r++;let w=new Array(s);for(let t=0;t&lt;s;++t){w[t]=new Array(r);for(let e=0;e&lt;r;++e)w[t][e]=[],w[t][e][0]=this.nodes[3*t][3*e],w[t][e][1]=this.colors[t][e]}for(let t=0;t&lt;s;++t)for(let e=0;e&lt;r;++e)0!==t&amp;&amp;t!==x&amp;&amp;(n=i(w[t-1][e][0],w[t][e][0]),o=i(w[t+1][e][0],w[t][e][0]),w[t][e][2]=c(w[t-1][e][1],w[t][e][1],w[t+1][e][1],n,o)),0!==e&amp;&amp;e!==g&amp;&amp;(n=i(w[t][e-1][0],w[t][e][0]),o=i(w[t][e+1][0],w[t][e][0]),w[t][e][3]=c(w[t][e-1][1],w[t][e][1],w[t][e+1][1],n,o));for(let t=0;t&lt;r;++t){w[0][t][2]=[],w[x][t][2]=[];for(let e=0;e&lt;4;++e)n=i(w[1][t][0],w[0][t][0]),o=i(w[x][t][0],w[x-1][t][0]),w[0][t][2][e]=n&gt;0?2*(w[1][t][1][e]-w[0][t][1][e])/n-w[1][t][2][e]:0,w[x][t][2][e]=o&gt;0?2*(w[x][t][1][e]-w[x-1][t][1][e])/o-w[x-1][t][2][e]:0}for(let t=0;t&lt;s;++t){w[t][0][3]=[],w[t][g][3]=[];for(let e=0;e&lt;4;++e)n=i(w[t][1][0],w[t][0][0]),o=i(w[t][g][0],w[t][g-1][0]),w[t][0][3][e]=n&gt;0?2*(w[t][1][1][e]-w[t][0][1][e])/n-w[t][1][3][e]:0,w[t][g][3][e]=o&gt;0?2*(w[t][g][1][e]-w[t][g-1][1][e])/o-w[t][g-1][3][e]:0}for(let s=0;s&lt;x;++s)for(let r=0;r&lt;g;++r){let n=i(w[s][r][0],w[s+1][r][0]),o=i(w[s][r+1][0],w[s+1][r+1][0]),c=i(w[s][r][0],w[s][r+1][0]),x=i(w[s+1][r][0],w[s+1][r+1][0]),g=[[],[],[],[]];for(let t=0;t&lt;4;++t){(d=[])[0]=w[s][r][1][t],d[1]=w[s+1][r][1][t],d[2]=w[s][r+1][1][t],d[3]=w[s+1][r+1][1][t],d[4]=w[s][r][2][t]*n,d[5]=w[s+1][r][2][t]*n,d[6]=w[s][r+1][2][t]*o,d[7]=w[s+1][r+1][2][t]*o,d[8]=w[s][r][3][t]*c,d[9]=w[s+1][r][3][t]*x,d[10]=w[s][r+1][3][t]*c,d[11]=w[s+1][r+1][3][t]*x,d[12]=0,d[13]=0,d[14]=0,d[15]=0,u=f(d);for(let e=0;e&lt;9;++e){g[t][e]=[];for(let s=0;s&lt;9;++s)g[t][e][s]=p(u,e/8,s/8),g[t][e][s]&gt;255?g[t][e][s]=255:g[t][e][s]&lt;0&amp;&amp;(g[t][e][s]=0)}}h=[];for(let t=3*s,e=3*s+4;t&lt;e;++t)h.push(this.nodes[t].slice(3*r,3*r+4));l=y(h);for(let s=0;s&lt;8;++s)for(let r=0;r&lt;8;++r)(a=new m(l[s][r],[[[g[0][s][r],g[1][s][r],g[2][s][r],g[3][s][r]],[g[0][s][r+1],g[1][s][r+1],g[2][s][r+1],g[3][s][r+1]]],[[g[0][s+1][r],g[1][s+1][r],g[2][s+1][r],g[3][s+1][r]],[g[0][s+1][r+1],g[1][s+1][r+1],g[2][s+1][r+1],g[3][s+1][r+1]]]])).paint(t,e)}}}transform(t){if(t instanceof x)for(let e=0,s=this.nodes.length;e&lt;s;++e)for(let s=0,r=this.nodes[0].length;s&lt;r;++s)this.nodes[e][s]=this.nodes[e][s].add(t);else if(t instanceof g)for(let e=0,s=this.nodes.length;e&lt;s;++e)for(let s=0,r=this.nodes[0].length;s&lt;r;++s)this.nodes[e][s]=this.nodes[e][s].transform(t)}scale(t){for(let e=0,s=this.nodes.length;e&lt;s;++e)for(let s=0,r=this.nodes[0].length;s&lt;r;++s)this.nodes[e][s]=this.nodes[e][s].scale(t)}}document.querySelectorAll(&quot;rect,circle,ellipse,path,text&quot;).forEach((r,n)=&gt;{let o=r.getAttribute(&quot;id&quot;);o||(o=&quot;patchjs_shape&quot;+n,r.setAttribute(&quot;id&quot;,o));const i=r.style.fill.match(/^url\(\s*&quot;?\s*#([^\s&quot;]+)&quot;?\s*\)/),a=r.style.stroke.match(/^url\(\s*&quot;?\s*#([^\s&quot;]+)&quot;?\s*\)/);if(i&amp;&amp;i[1]){const a=document.getElementById(i[1]);if(a&amp;&amp;&quot;meshgradient&quot;===a.nodeName){const i=r.getBBox();let l=document.createElementNS(s,&quot;canvas&quot;);d(l,{width:i.width,height:i.height});const c=l.getContext(&quot;2d&quot;);let u=c.createImageData(i.width,i.height);const f=new b(a);&quot;objectBoundingBox&quot;===a.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;f.scale(new x(i.width,i.height));const p=a.getAttribute(&quot;gradientTransform&quot;);null!=p&amp;&amp;f.transform(h(p)),&quot;userSpaceOnUse&quot;===a.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;f.transform(new x(-i.x,-i.y)),f.paintMesh(u.data,l.width),c.putImageData(u,0,0);const y=document.createElementNS(t,&quot;image&quot;);d(y,{width:i.width,height:i.height,x:i.x,y:i.y});let g=l.toDataURL();y.setAttributeNS(e,&quot;xlink:href&quot;,g),r.parentNode.insertBefore(y,r),r.style.fill=&quot;none&quot;;const w=document.createElementNS(t,&quot;use&quot;);w.setAttributeNS(e,&quot;xlink:href&quot;,&quot;#&quot;+o);const m=&quot;patchjs_clip&quot;+n,M=document.createElementNS(t,&quot;clipPath&quot;);M.setAttribute(&quot;id&quot;,m),M.appendChild(w),r.parentElement.insertBefore(M,r),y.setAttribute(&quot;clip-path&quot;,&quot;url(#&quot;+m+&quot;)&quot;),u=null,l=null,g=null}}if(a&amp;&amp;a[1]){const o=document.getElementById(a[1]);if(o&amp;&amp;&quot;meshgradient&quot;===o.nodeName){const i=parseFloat(r.style.strokeWidth.slice(0,-2))*(parseFloat(r.style.strokeMiterlimit)||parseFloat(r.getAttribute(&quot;stroke-miterlimit&quot;))||1),a=r.getBBox(),l=Math.trunc(a.width+i),c=Math.trunc(a.height+i),u=Math.trunc(a.x-i/2),f=Math.trunc(a.y-i/2);let p=document.createElementNS(s,&quot;canvas&quot;);d(p,{width:l,height:c});const y=p.getContext(&quot;2d&quot;);let g=y.createImageData(l,c);const w=new b(o);&quot;objectBoundingBox&quot;===o.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;w.scale(new x(l,c));const m=o.getAttribute(&quot;gradientTransform&quot;);null!=m&amp;&amp;w.transform(h(m)),&quot;userSpaceOnUse&quot;===o.getAttribute(&quot;gradientUnits&quot;)&amp;&amp;w.transform(new x(-u,-f)),w.paintMesh(g.data,p.width),y.putImageData(g,0,0);const M=document.createElementNS(t,&quot;image&quot;);d(M,{width:l,height:c,x:0,y:0});let S=p.toDataURL();M.setAttributeNS(e,&quot;xlink:href&quot;,S);const k=&quot;pattern_clip&quot;+n,A=document.createElementNS(t,&quot;pattern&quot;);d(A,{id:k,patternUnits:&quot;userSpaceOnUse&quot;,width:l,height:c,x:u,y:f}),A.appendChild(M),o.parentNode.appendChild(A),r.style.stroke=&quot;url(#&quot;+k+&quot;)&quot;,g=null,p=null,S=null}}})}();
+</script>
+</svg>

From d0677c3f07678a5eb351572c4eb9b14b0e1f03e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Mocquillon?= <cedric.mocquillon@gmail.com>
Date: Wed, 28 Jul 2021 21:31:41 +0200
Subject: [PATCH 1109/2859] Move reference to the right cell according to its
 geographical position

---
 apps/openmw/mwrender/objectpaging.cpp | 10 ++++++++++
 apps/openmw/mwworld/store.cpp         | 12 ++++++++++++
 components/esm/loadcell.hpp           |  5 +++++
 3 files changed, 27 insertions(+)

diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index 2cbffbc6eb..aae8f2e4f1 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -434,6 +434,7 @@ namespace MWRender
                                 continue;
 
                             if (std::find(cell->mMovedRefs.begin(), cell->mMovedRefs.end(), ref.mRefNum) != cell->mMovedRefs.end()) continue;
+                            if (std::find(cell->mMovedRefsByPos.begin(), cell->mMovedRefsByPos.end(), ref.mRefNum) != cell->mMovedRefsByPos.end()) continue;
                             Misc::StringUtils::lowerCaseInPlace(ref.mRefID);
                             int type = store.findStatic(ref.mRefID);
                             if (!typeFilter(type,size>=2)) continue;
@@ -455,6 +456,15 @@ namespace MWRender
                     if (!typeFilter(type,size>=2)) continue;
                     refs[ref.mRefNum] = std::move(ref);
                 }
+
+                for (auto [ref, deleted] : cell->mLeasedRefsByPos)
+                {
+                    if (deleted) { refs.erase(ref.mRefNum); continue; }
+                    Misc::StringUtils::lowerCaseInPlace(ref.mRefID);
+                    int type = store.findStatic(ref.mRefID);
+                    if (!typeFilter(type, size >= 2)) continue;
+                    refs[ref.mRefNum] = std::move(ref);
+                }
             }
         }
 
diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index 125239e9a3..add8b541e0 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -478,6 +478,15 @@ namespace MWWorld
         //  implementation when the oher implementation works as well.
         while (cell->getNextRef(esm, ref, deleted, cMRef, moved))
         {
+
+            auto x = static_cast<int>(std::floor(ref.mPos.pos[0] / float(ESM::Land::REAL_SIZE)));
+            auto y = static_cast<int>(std::floor(ref.mPos.pos[1] / float(ESM::Land::REAL_SIZE)));
+            if (x != cell->getGridX() || y != cell->getGridY())
+            {
+                ESM::Cell* cellAlt = const_cast<ESM::Cell*>(searchOrCreate(x, y));
+                cellAlt->mLeasedRefsByPos.emplace_back(ref, deleted);
+                cell->mMovedRefsByPos.push_back(ref.mRefNum);
+            }
             if (!moved)
                 continue;
 
@@ -678,6 +687,9 @@ namespace MWWorld
                         oldcell->mMovedRefs.push_back(*it);
                 }
 
+                oldcell->mLeasedRefsByPos.splice(oldcell->mLeasedRefsByPos.end(), cell.mLeasedRefsByPos);
+                oldcell->mMovedRefsByPos.splice(oldcell->mMovedRefsByPos.end(), cell.mMovedRefsByPos);
+
                 // We don't need to merge mLeasedRefs of cell / oldcell. This list is filled when another cell moves a
                 // reference to this cell, so the list for the new cell should be empty. The list for oldcell,
                 // however, could have leased refs in it and so should be kept.
diff --git a/components/esm/loadcell.hpp b/components/esm/loadcell.hpp
index 3a8133d881..7770f719e3 100644
--- a/components/esm/loadcell.hpp
+++ b/components/esm/loadcell.hpp
@@ -124,6 +124,11 @@ struct Cell
   CellRefTracker mLeasedRefs;
   MovedCellRefTracker mMovedRefs;
 
+  // References "adopted" from another cell (i.e. a different cell
+  //  introduced this ref, and it has been moved here as it geographically in this cell)
+  CellRefTracker mLeasedRefsByPos;
+  std::list<RefNum> mMovedRefsByPos;
+
   void postLoad(ESMReader &esm);
 
   // This method is left in for compatibility with esmtool. Parsing moved references currently requires

From 1fff39d5fa21f30a3c9eeeafcbcfaba9c35d080b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Mocquillon?= <cedric.mocquillon@gmail.com>
Date: Fri, 30 Jul 2021 18:24:20 +0200
Subject: [PATCH 1110/2859] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47f94c6952..90fda783a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
     Bug #5379: Wandering NPCs falling through cantons
     Bug #5453: Magic effect VFX are offset for creatures
     Bug #5483: AutoCalc flag is not used to calculate spells cost
+    Bug #5755: Active grid object paging - disappearing textures
     Bug #5842: GetDisposition adds temporary disposition change from different actors
     Bug #6037: Morrowind Content Language Cannot be Set to English in OpenMW Launcher
     Bug #6051: NaN water height in ESM file is not handled gracefully

From 4e7c128d2523243e105470d39ed6ca27fd75332c Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Fri, 30 Jul 2021 22:23:42 +0200
Subject: [PATCH 1111/2859] The LOS cache is now unconditionally used without
 async physics as well with a TTL of 0 frame. It helps performance when
 several subsystems request the same LOS in the same frame (combat,
 headtracking, etc). Except it doesn't work if the cache is never trimmed.

---
 apps/openmw/mwphysics/mtphysics.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 10bec49612..f66af8bae4 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -565,6 +565,7 @@ namespace MWPhysics
             if (mAdvanceSimulation)
                 actorData.mActorRaw->setStandingOnPtr(actorData.mStandingOn);
         }
+        refreshLOSCache();
     }
 
     void PhysicsTaskScheduler::updateStats(osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)

From 88a5ca440b8afecc70cad318d7f302d74fb6f34b Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sun, 11 Apr 2021 18:18:10 +0200
Subject: [PATCH 1112/2859] Change moveObject() to take a osg::Vec3f argument
 instead of 3 floats for readability.

---
 apps/openmw/mwbase/world.hpp                  |  4 +--
 apps/openmw/mwclass/creature.cpp              |  4 +--
 apps/openmw/mwclass/npc.cpp                   |  4 +--
 apps/openmw/mwlua/actions.cpp                 |  2 +-
 apps/openmw/mwmechanics/aitravel.cpp          |  5 +--
 apps/openmw/mwmechanics/aiwander.cpp          |  4 +--
 apps/openmw/mwphysics/physicssystem.cpp       |  2 +-
 .../mwscript/transformationextensions.cpp     |  9 +++--
 apps/openmw/mwworld/actionteleport.cpp        |  4 +--
 apps/openmw/mwworld/cellstore.cpp             |  2 +-
 apps/openmw/mwworld/scene.cpp                 |  4 +--
 apps/openmw/mwworld/worldimp.cpp              | 34 +++++++++----------
 apps/openmw/mwworld/worldimp.hpp              |  4 +--
 13 files changed, 38 insertions(+), 44 deletions(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 4110c8f489..2c651796f0 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -283,10 +283,10 @@ namespace MWBase
             virtual void deleteObject (const MWWorld::Ptr& ptr) = 0;
             virtual void undeleteObject (const MWWorld::Ptr& ptr) = 0;
 
-            virtual MWWorld::Ptr moveObject (const MWWorld::Ptr& ptr, float x, float y, float z, bool movePhysics=true, bool moveToActive=false) = 0;
+            virtual MWWorld::Ptr moveObject (const MWWorld::Ptr& ptr, const osg::Vec3f& position, bool movePhysics=true, bool moveToActive=false) = 0;
             ///< @return an updated Ptr in case the Ptr's cell changes
 
-            virtual MWWorld::Ptr moveObject(const MWWorld::Ptr &ptr, MWWorld::CellStore* newCell, float x, float y, float z, bool movePhysics=true) = 0;
+            virtual MWWorld::Ptr moveObject(const MWWorld::Ptr &ptr, MWWorld::CellStore* newCell, const osg::Vec3f& position, bool movePhysics=true) = 0;
             ///< @return an updated Ptr
 
             virtual MWWorld::Ptr moveObjectBy(const MWWorld::Ptr &ptr, osg::Vec3f vec, bool moveToActive, bool ignoreCollisions) = 0;
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 7e231c60fe..d03ea70a87 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -834,9 +834,7 @@ namespace MWClass
                 ptr.getRefData().setCustomData(nullptr);
 
                 // Reset to original position
-                MWBase::Environment::get().getWorld()->moveObject(ptr, ptr.getCellRef().getPosition().pos[0],
-                        ptr.getCellRef().getPosition().pos[1],
-                        ptr.getCellRef().getPosition().pos[2]);
+                MWBase::Environment::get().getWorld()->moveObject(ptr, ptr.getCellRef().getPosition().asVec3());
             }
         }
     }
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 691dfe5871..736ae537fe 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -1388,9 +1388,7 @@ namespace MWClass
                 ptr.getRefData().setCustomData(nullptr);
 
                 // Reset to original position
-                MWBase::Environment::get().getWorld()->moveObject(ptr, ptr.getCellRef().getPosition().pos[0],
-                        ptr.getCellRef().getPosition().pos[1],
-                        ptr.getCellRef().getPosition().pos[2]);
+                MWBase::Environment::get().getWorld()->moveObject(ptr, ptr.getCellRef().getPosition().asVec3());
             }
         }
     }
diff --git a/apps/openmw/mwlua/actions.cpp b/apps/openmw/mwlua/actions.cpp
index 95a33fed0d..719d713e6f 100644
--- a/apps/openmw/mwlua/actions.cpp
+++ b/apps/openmw/mwlua/actions.cpp
@@ -39,7 +39,7 @@ namespace MWLua
         }
         else
         {
-            MWWorld::Ptr newObj = world->moveObject(obj, cell, mPos.x(), mPos.y(), mPos.z());
+            MWWorld::Ptr newObj = world->moveObject(obj, cell, mPos);
             world->rotateObject(newObj, mRot.x(), mRot.y(), mRot.z());
         }
     }
diff --git a/apps/openmw/mwmechanics/aitravel.cpp b/apps/openmw/mwmechanics/aitravel.cpp
index 8e5372c46d..91fe96a2aa 100644
--- a/apps/openmw/mwmechanics/aitravel.cpp
+++ b/apps/openmw/mwmechanics/aitravel.cpp
@@ -93,11 +93,12 @@ namespace MWMechanics
 
     void AiTravel::fastForward(const MWWorld::Ptr& actor, AiState& state)
     {
-        if (!isWithinMaxRange(osg::Vec3f(mX, mY, mZ), actor.getRefData().getPosition().asVec3()))
+        osg::Vec3f pos(mX, mY, mZ);
+        if (!isWithinMaxRange(pos, actor.getRefData().getPosition().asVec3()))
             return;
         // does not do any validation on the travel target (whether it's in air, inside collision geometry, etc),
         // that is the user's responsibility
-        MWBase::Environment::get().getWorld()->moveObject(actor, mX, mY, mZ);
+        MWBase::Environment::get().getWorld()->moveObject(actor, pos);
         actor.getClass().adjustPosition(actor, false);
         reset();
     }
diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 0e424b2f8b..24fdff7065 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -744,8 +744,8 @@ namespace MWMechanics
 
         state.moveIn(new AiWanderStorage());
 
-        MWBase::Environment::get().getWorld()->moveObject(actor, static_cast<float>(dest.mX),
-            static_cast<float>(dest.mY), static_cast<float>(dest.mZ));
+        osg::Vec3f pos(static_cast<float>(dest.mX), static_cast<float>(dest.mY), static_cast<float>(dest.mZ));
+        MWBase::Environment::get().getWorld()->moveObject(actor, pos);
         actor.getClass().adjustPosition(actor, false);
     }
 
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 9814af09f5..ab880abaaa 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -958,7 +958,7 @@ namespace MWPhysics
         if (mWaterCollision && mPosition.z() < mWaterlevel && canMoveToWaterSurface(mActorRaw, mWaterlevel, world))
         {
             mPosition.z() = mWaterlevel;
-            MWBase::Environment::get().getWorld()->moveObject(mActorRaw->getPtr(), mPosition.x(), mPosition.y(), mPosition.z(), false);
+            MWBase::Environment::get().getWorld()->moveObject(mActorRaw->getPtr(), mPosition, false);
         }
         mOldHeight = mPosition.z();
         mRefpos = mActorRaw->getPtr().getRefData().getPosition();
diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index 096e78d34b..47733ea24b 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -393,7 +393,7 @@ namespace MWScript
                     if(store)
                     {
                         MWWorld::Ptr base = ptr;
-                        ptr = MWBase::Environment::get().getWorld()->moveObject(ptr,store,x,y,z);
+                        ptr = MWBase::Environment::get().getWorld()->moveObject(ptr,store,osg::Vec3f(x,y,z));
                         dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(base,ptr);
 
                         float ax = ptr.getRefData().getPosition().rot[0];
@@ -444,11 +444,11 @@ namespace MWScript
                     if (ptr == MWMechanics::getPlayer())
                     {
                         MWWorld::CellStore* cell = MWBase::Environment::get().getWorld()->getExterior(cx,cy);
-                        ptr = MWBase::Environment::get().getWorld()->moveObject(ptr,cell,x,y,z);
+                        ptr = MWBase::Environment::get().getWorld()->moveObject(ptr, cell, osg::Vec3(x, y, z));
                     }
                     else
                     {
-                        ptr = MWBase::Environment::get().getWorld()->moveObject(ptr, x, y, z, true, true);
+                        ptr = MWBase::Environment::get().getWorld()->moveObject(ptr, osg::Vec3f(x, y, z), true, true);
                     }
                     dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(base,ptr);
 
@@ -689,8 +689,7 @@ namespace MWScript
                     MWBase::Environment::get().getWorld()->rotateObject(ptr, xr, yr, zr);
 
                     dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(ptr,
-                        MWBase::Environment::get().getWorld()->moveObject(ptr, ptr.getCellRef().getPosition().pos[0],
-                            ptr.getCellRef().getPosition().pos[1], ptr.getCellRef().getPosition().pos[2]));
+                        MWBase::Environment::get().getWorld()->moveObject(ptr, ptr.getCellRef().getPosition().asVec3()));
 
                 }
         };
diff --git a/apps/openmw/mwworld/actionteleport.cpp b/apps/openmw/mwworld/actionteleport.cpp
index 9cd8469a39..fcfafc5f4f 100644
--- a/apps/openmw/mwworld/actionteleport.cpp
+++ b/apps/openmw/mwworld/actionteleport.cpp
@@ -55,10 +55,10 @@ namespace MWWorld
                 int cellY;
                 world->positionToIndex(mPosition.pos[0],mPosition.pos[1],cellX,cellY);
                 world->moveObject(actor,world->getExterior(cellX,cellY),
-                    mPosition.pos[0],mPosition.pos[1],mPosition.pos[2]);
+                    mPosition.asVec3());
             }
             else
-                world->moveObject(actor,world->getInterior(mCellName),mPosition.pos[0],mPosition.pos[1],mPosition.pos[2]);
+                world->moveObject(actor,world->getInterior(mCellName),mPosition.asVec3());
         }
     }
 
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 39c00cd4e8..37c4e178ad 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -190,7 +190,7 @@ namespace
                     const ESM::Position & newpos = iter->mData.getPosition();
                     const MWWorld::Ptr ptr(&*iter, cellstore);
                     if ((oldscale != iter->mRef.getScale() || oldpos.asVec3() != newpos.asVec3() || oldpos.rot[0] != newpos.rot[0] || oldpos.rot[1] != newpos.rot[1] || oldpos.rot[2] != newpos.rot[2]) && !ptr.getClass().isActor())
-                        MWBase::Environment::get().getWorld()->moveObject(ptr, newpos.pos[0], newpos.pos[1], newpos.pos[2]);
+                        MWBase::Environment::get().getWorld()->moveObject(ptr, newpos.asVec3());
                     if (!iter->mData.isEnabled())
                     {
                         iter->mData.enable();
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 3111a28f04..aee6493c08 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -842,7 +842,7 @@ namespace MWWorld
         mRendering.updatePlayerPtr(player);
 
         if (adjustPlayerPos) {
-            world->moveObject(player, pos.pos[0], pos.pos[1], pos.pos[2]);
+            world->moveObject(player, pos.asVec3());
 
             float x = pos.rot[0];
             float y = pos.rot[1];
@@ -921,7 +921,7 @@ namespace MWWorld
         if(mCurrentCell != nullptr && *mCurrentCell == *cell)
         {
             MWBase::World *world = MWBase::Environment::get().getWorld();
-            world->moveObject(world->getPlayerPtr(), position.pos[0], position.pos[1], position.pos[2]);
+            world->moveObject(world->getPlayerPtr(), position.asVec3());
 
             float x = position.rot[0];
             float y = position.rot[1];
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 8fea737d8d..d2fbd9ed5a 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1128,18 +1128,16 @@ namespace MWWorld
         }
     }
 
-    MWWorld::Ptr World::moveObject(const Ptr &ptr, CellStore* newCell, float x, float y, float z, bool movePhysics)
+    MWWorld::Ptr World::moveObject(const Ptr &ptr, CellStore* newCell, const osg::Vec3f& position, bool movePhysics)
     {
         ESM::Position pos = ptr.getRefData().getPosition();
 
-        pos.pos[0] = x;
-        pos.pos[1] = y;
-        pos.pos[2] = z;
+        pos.pos[0] = position.x();
+        pos.pos[1] = position.y();
+        pos.pos[2] = position.z();
 
         ptr.getRefData().setPosition(pos);
 
-        osg::Vec3f vec(x, y, z);
-
         CellStore *currCell = ptr.isInCell() ? ptr.getCell() : nullptr; // currCell == nullptr should only happen for player, during initial startup
         bool isPlayer = ptr == mPlayer->getPlayer();
         bool haveToMove = isPlayer || (currCell && mWorldScene->isCellActive(*currCell));
@@ -1228,7 +1226,7 @@ namespace MWWorld
         }
         if (haveToMove && newPtr.getRefData().getBaseNode())
         {
-            mWorldScene->updateObjectPosition(newPtr, vec, movePhysics);
+            mWorldScene->updateObjectPosition(newPtr, position, movePhysics);
             if (movePhysics)
             {
                 if (const auto object = mPhysics->getObject(ptr))
@@ -1237,7 +1235,7 @@ namespace MWWorld
         }
 
         if (isPlayer)
-            mWorldScene->playerMoved(vec);
+            mWorldScene->playerMoved(position);
         else
         {
             mRendering->pagingBlacklistObject(mStore.find(ptr.getCellRef().getRefId()), ptr);
@@ -1247,10 +1245,10 @@ namespace MWWorld
         return newPtr;
     }
 
-    MWWorld::Ptr World::moveObject (const Ptr& ptr, float x, float y, float z, bool movePhysics, bool moveToActive)
+    MWWorld::Ptr World::moveObject(const Ptr& ptr, const osg::Vec3f& position, bool movePhysics, bool moveToActive)
     {
         int cellX, cellY;
-        positionToIndex(x, y, cellX, cellY);
+        positionToIndex(position.x(), position.y(), cellX, cellY);
 
         CellStore* cell = ptr.getCell();
         CellStore* newCell = getExterior(cellX, cellY);
@@ -1259,7 +1257,7 @@ namespace MWWorld
         if (cell->isExterior() || (moveToActive && isCellActive && ptr.getClass().isActor()))
             cell = newCell;
 
-        return moveObject(ptr, cell, x, y, z, movePhysics);
+        return moveObject(ptr, cell, position, movePhysics);
     }
 
     MWWorld::Ptr World::moveObjectBy(const Ptr& ptr, osg::Vec3f vec, bool moveToActive, bool ignoreCollisions)
@@ -1269,8 +1267,8 @@ namespace MWWorld
         if (actor)
             actor->adjustPosition(vec, ignoreCollisions);
         if (ptr.getClass().isActor())
-            return moveObject(ptr, newpos.x(), newpos.y(), newpos.z(), false, moveToActive && ptr != getPlayerPtr());
-        return moveObject(ptr, newpos.x(), newpos.y(), newpos.z());
+            return moveObject(ptr, newpos, false, moveToActive && ptr != getPlayerPtr());
+        return moveObject(ptr, newpos);
     }
 
     void World::scaleObject (const Ptr& ptr, float scale)
@@ -1377,7 +1375,7 @@ namespace MWWorld
             pos.z() = std::min(pos.z(), traced.z());
         }
 
-        moveObject(ptr, ptr.getCell(), pos.x(), pos.y(), pos.z());
+        moveObject(ptr, ptr.getCell(), pos);
     }
 
     void World::fixPosition()
@@ -1536,7 +1534,7 @@ namespace MWWorld
                 auto* physactor = mPhysics->getActor(actor);
                 assert(physactor);
                 const auto position = physactor->getSimulationPosition();
-                moveObject(actor, position.x(), position.y(), position.z(), false, false);
+                moveObject(actor, position, false, false);
             }
         }
 
@@ -1546,7 +1544,7 @@ namespace MWWorld
             auto* physactor = mPhysics->getActor(*player);
             assert(physactor);
             const auto position = physactor->getSimulationPosition();
-            moveObject(*player, position.x(), position.y(), position.z(), false, false);
+            moveObject(*player, position, false, false);
         }
     }
 
@@ -2279,7 +2277,7 @@ namespace MWWorld
                 pos.pos[0] -= adjust.x();
                 pos.pos[1] -= adjust.y();
                 pos.pos[2] -= adjust.z();
-                moveObject(dropped, pos.pos[0], pos.pos[1], pos.pos[2]);
+                moveObject(dropped, pos.asVec3());
             }
         }
 
@@ -3859,7 +3857,7 @@ namespace MWWorld
                     return true;
 
                 const ESM::Position& origPos = ptr.getCellRef().getPosition();
-                MWBase::Environment::get().getWorld()->moveObject(ptr, origPos.pos[0], origPos.pos[1], origPos.pos[2]);
+                MWBase::Environment::get().getWorld()->moveObject(ptr, origPos.asVec3());
                 MWBase::Environment::get().getWorld()->rotateObject(ptr, origPos.rot[0], origPos.rot[1], origPos.rot[2]);
                 ptr.getClass().adjustPosition(ptr, true);
             }
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 87cd14dd5c..4da790f6b8 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -372,10 +372,10 @@ namespace MWWorld
 
             void undeleteObject (const Ptr& ptr) override;
 
-            MWWorld::Ptr moveObject (const Ptr& ptr, float x, float y, float z, bool movePhysics=true, bool moveToActive=false) override;
+            MWWorld::Ptr moveObject (const Ptr& ptr, const osg::Vec3f& position, bool movePhysics=true, bool moveToActive=false) override;
             ///< @return an updated Ptr in case the Ptr's cell changes
 
-            MWWorld::Ptr moveObject (const Ptr& ptr, CellStore* newCell, float x, float y, float z, bool movePhysics=true) override;
+            MWWorld::Ptr moveObject (const Ptr& ptr, CellStore* newCell, const osg::Vec3f& position, bool movePhysics=true) override;
             ///< @return an updated Ptr
 
             MWWorld::Ptr moveObjectBy(const Ptr& ptr, osg::Vec3f vec, bool moveToActive, bool ignoreCollisions) override;

From a7b190ad29daafbcd8d53fd846279248a1c9761b Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sun, 11 Apr 2021 19:17:17 +0200
Subject: [PATCH 1113/2859] Change rotateObject() to take a osg::Vec3f argument
 instead of 3 floats for readability.

---
 apps/openmw/mwbase/world.hpp                  |  3 +-
 apps/openmw/mwinput/controlswitch.cpp         |  2 +-
 apps/openmw/mwlua/actions.cpp                 |  2 +-
 apps/openmw/mwmechanics/character.cpp         |  7 +++-
 .../mwscript/transformationextensions.cpp     | 42 ++++++++-----------
 apps/openmw/mwworld/scene.cpp                 | 12 +-----
 apps/openmw/mwworld/worldimp.cpp              | 27 +++++-------
 apps/openmw/mwworld/worldimp.hpp              |  5 +--
 8 files changed, 39 insertions(+), 61 deletions(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 2c651796f0..bd806c7cac 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -294,8 +294,7 @@ namespace MWBase
 
             virtual void scaleObject (const MWWorld::Ptr& ptr, float scale) = 0;
 
-            virtual void rotateObject(const MWWorld::Ptr& ptr, float x, float y, float z,
-                RotationFlags flags = RotationFlag_inverseOrder) = 0;
+            virtual void rotateObject(const MWWorld::Ptr& ptr, const osg::Vec3f& rot, RotationFlags flags = RotationFlag_inverseOrder) = 0;
 
             virtual MWWorld::Ptr placeObject(const MWWorld::ConstPtr& ptr, MWWorld::CellStore* cell, ESM::Position pos) = 0;
             ///< Place an object. Makes a copy of the Ptr.
diff --git a/apps/openmw/mwinput/controlswitch.cpp b/apps/openmw/mwinput/controlswitch.cpp
index 33c4b75dcc..f31744fca6 100644
--- a/apps/openmw/mwinput/controlswitch.cpp
+++ b/apps/openmw/mwinput/controlswitch.cpp
@@ -57,7 +57,7 @@ namespace MWInput
         }
         else if (key == "playerlooking" && !value)
         {
-            MWBase::Environment::get().getWorld()->rotateObject(player.getPlayer(), 0.f, 0.f, 0.f);
+            MWBase::Environment::get().getWorld()->rotateObject(player.getPlayer(), osg::Vec3f());
         }
         mSwitches[key] = value;
     }
diff --git a/apps/openmw/mwlua/actions.cpp b/apps/openmw/mwlua/actions.cpp
index 719d713e6f..500ad98490 100644
--- a/apps/openmw/mwlua/actions.cpp
+++ b/apps/openmw/mwlua/actions.cpp
@@ -40,7 +40,7 @@ namespace MWLua
         else
         {
             MWWorld::Ptr newObj = world->moveObject(obj, cell, mPos);
-            world->rotateObject(newObj, mRot.x(), mRot.y(), mRot.z());
+            world->rotateObject(newObj, mRot);
         }
     }
 
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index d5a1d46a88..fe21da0840 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -2394,12 +2394,15 @@ void CharacterController::update(float duration)
             if(!isKnockedDown() && !isKnockedOut())
             {
                 if (rot != osg::Vec3f())
-                    world->rotateObject(mPtr, rot.x(), rot.y(), rot.z(), true);
+                    world->rotateObject(mPtr, rot, true);
             }
             else //avoid z-rotating for knockdown
             {
                 if (rot.x() != 0 && rot.y() != 0)
-                    world->rotateObject(mPtr, rot.x(), rot.y(), 0.0f, true);
+                {
+                    rot.z() = 0.0f;
+                    world->rotateObject(mPtr, rot, true);
+                }
             }
 
             if (!mMovementAnimationControlled)
diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index 47733ea24b..3d00b24ef8 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -167,17 +167,17 @@ namespace MWScript
                     // XYZ axis use the inverse (XYZ) rotation order like vanilla SetAngle.
                     // UWV axis use the standard (ZYX) rotation order like TESCS/OpenMW-CS and the rest of the game.
                     if (axis == "x")
-                        MWBase::Environment::get().getWorld()->rotateObject(ptr,angle,ay,az,MWBase::RotationFlag_inverseOrder);
+                        MWBase::Environment::get().getWorld()->rotateObject(ptr,osg::Vec3f(angle,ay,az),MWBase::RotationFlag_inverseOrder);
                     else if (axis == "y")
-                        MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,angle,az,MWBase::RotationFlag_inverseOrder);
+                        MWBase::Environment::get().getWorld()->rotateObject(ptr,osg::Vec3f(ax,angle,az),MWBase::RotationFlag_inverseOrder);
                     else if (axis == "z")
-                        MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,ay,angle,MWBase::RotationFlag_inverseOrder);
+                        MWBase::Environment::get().getWorld()->rotateObject(ptr,osg::Vec3f(ax,ay,angle),MWBase::RotationFlag_inverseOrder);
                     else if (axis == "u")
-                        MWBase::Environment::get().getWorld()->rotateObject(ptr,angle,ay,az,MWBase::RotationFlag_none);
+                        MWBase::Environment::get().getWorld()->rotateObject(ptr,osg::Vec3f(angle,ay,az),MWBase::RotationFlag_none);
                     else if (axis == "w")
-                        MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,angle,az,MWBase::RotationFlag_none);
+                        MWBase::Environment::get().getWorld()->rotateObject(ptr,osg::Vec3f(ax,angle,az),MWBase::RotationFlag_none);
                     else if (axis == "v")
-                        MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,ay,angle,MWBase::RotationFlag_none);
+                        MWBase::Environment::get().getWorld()->rotateObject(ptr,osg::Vec3f(ax,ay,angle),MWBase::RotationFlag_none);
                 }
         };
 
@@ -396,14 +396,14 @@ namespace MWScript
                         ptr = MWBase::Environment::get().getWorld()->moveObject(ptr,store,osg::Vec3f(x,y,z));
                         dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(base,ptr);
 
-                        float ax = ptr.getRefData().getPosition().rot[0];
-                        float ay = ptr.getRefData().getPosition().rot[1];
+                        auto rot = ptr.getRefData().getPosition().asRotationVec3();
                         // Note that you must specify ZRot in minutes (1 degree = 60 minutes; north = 0, east = 5400, south = 10800, west = 16200)
                         // except for when you position the player, then degrees must be used.
                         // See "Morrowind Scripting for Dummies (9th Edition)" pages 50 and 54 for reference.
                         if(ptr != MWMechanics::getPlayer())
                             zRot = zRot/60.0f;
-                        MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,ay,osg::DegreesToRadians(zRot));
+                        rot.z() = osg::DegreesToRadians(zRot);
+                        MWBase::Environment::get().getWorld()->rotateObject(ptr,rot);
 
                         ptr.getClass().adjustPosition(ptr, false);
                     }
@@ -452,14 +452,14 @@ namespace MWScript
                     }
                     dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(base,ptr);
 
-                    float ax = ptr.getRefData().getPosition().rot[0];
-                    float ay = ptr.getRefData().getPosition().rot[1];
+                    auto rot = ptr.getRefData().getPosition().asRotationVec3();
                     // Note that you must specify ZRot in minutes (1 degree = 60 minutes; north = 0, east = 5400, south = 10800, west = 16200)
                     // except for when you position the player, then degrees must be used.
                     // See "Morrowind Scripting for Dummies (9th Edition)" pages 50 and 54 for reference.
                     if(ptr != MWMechanics::getPlayer())
                         zRot = zRot/60.0f;
-                    MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,ay,osg::DegreesToRadians(zRot));
+                    rot.z() = osg::DegreesToRadians(zRot);
+                    MWBase::Environment::get().getWorld()->rotateObject(ptr,rot);
                     ptr.getClass().adjustPosition(ptr, false);
                 }
         };
@@ -621,16 +621,14 @@ namespace MWScript
                     Interpreter::Type_Float rotation = osg::DegreesToRadians(runtime[0].mFloat*MWBase::Environment::get().getFrameDuration());
                     runtime.pop();
 
-                    float ax = ptr.getRefData().getPosition().rot[0];
-                    float ay = ptr.getRefData().getPosition().rot[1];
-                    float az = ptr.getRefData().getPosition().rot[2];
-
+                    auto rot = ptr.getRefData().getPosition().asRotationVec3();
                     if (axis == "x")
-                        MWBase::Environment::get().getWorld()->rotateObject(ptr,ax+rotation,ay,az);
+                        rot.x() += rotation;
                     else if (axis == "y")
-                        MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,ay+rotation,az);
+                        rot.y() += rotation;
                     else if (axis == "z")
-                        MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,ay,az+rotation);
+                        rot.z() += rotation;
+                    MWBase::Environment::get().getWorld()->rotateObject(ptr,rot);
                 }
         };
 
@@ -682,11 +680,7 @@ namespace MWScript
                     if (!ptr.isInCell())
                         return;
 
-                    float xr = ptr.getCellRef().getPosition().rot[0];
-                    float yr = ptr.getCellRef().getPosition().rot[1];
-                    float zr = ptr.getCellRef().getPosition().rot[2];
-
-                    MWBase::Environment::get().getWorld()->rotateObject(ptr, xr, yr, zr);
+                    MWBase::Environment::get().getWorld()->rotateObject(ptr, ptr.getCellRef().getPosition().asRotationVec3());
 
                     dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(ptr,
                         MWBase::Environment::get().getWorld()->moveObject(ptr, ptr.getCellRef().getPosition().asVec3()));
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index aee6493c08..8c401dcf12 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -843,11 +843,7 @@ namespace MWWorld
 
         if (adjustPlayerPos) {
             world->moveObject(player, pos.asVec3());
-
-            float x = pos.rot[0];
-            float y = pos.rot[1];
-            float z = pos.rot[2];
-            world->rotateObject(player, x, y, z);
+            world->rotateObject(player, pos.asRotationVec3());
 
             player.getClass().adjustPosition(player, true);
         }
@@ -922,11 +918,7 @@ namespace MWWorld
         {
             MWBase::World *world = MWBase::Environment::get().getWorld();
             world->moveObject(world->getPlayerPtr(), position.asVec3());
-
-            float x = position.rot[0];
-            float y = position.rot[1];
-            float z = position.rot[2];
-            world->rotateObject(world->getPlayerPtr(), x, y, z);
+            world->rotateObject(world->getPlayerPtr(), position.asRotationVec3());
 
             if (adjustPlayerPos)
                 world->getPlayerPtr().getClass().adjustPosition(world->getPlayerPtr(), true);
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index d2fbd9ed5a..38785740a9 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1131,11 +1131,7 @@ namespace MWWorld
     MWWorld::Ptr World::moveObject(const Ptr &ptr, CellStore* newCell, const osg::Vec3f& position, bool movePhysics)
     {
         ESM::Position pos = ptr.getRefData().getPosition();
-
-        pos.pos[0] = position.x();
-        pos.pos[1] = position.y();
-        pos.pos[2] = position.z();
-
+        std::memcpy(pos.pos, &position, sizeof(osg::Vec3f));
         ptr.getRefData().setPosition(pos);
 
         CellStore *currCell = ptr.isInCell() ? ptr.getCell() : nullptr; // currCell == nullptr should only happen for player, during initial startup
@@ -1292,7 +1288,7 @@ namespace MWWorld
             updateNavigatorObject(*object);
     }
 
-    void World::rotateObjectImp(const Ptr& ptr, const osg::Vec3f& rot, MWBase::RotationFlags flags)
+    void World::rotateObject(const Ptr& ptr, const osg::Vec3f& rot, MWBase::RotationFlags flags)
     {
         const float pi = static_cast<float>(osg::PI);
 
@@ -1414,11 +1410,6 @@ namespace MWWorld
         }
     }
 
-    void World::rotateObject (const Ptr& ptr, float x, float y, float z, MWBase::RotationFlags flags)
-    {
-        rotateObjectImp(ptr, osg::Vec3f(x, y, z), flags);
-    }
-
     void World::rotateWorldObject (const Ptr& ptr, osg::Quat rotate)
     {
         if(ptr.getRefData().getBaseNode() != nullptr)
@@ -1602,14 +1593,16 @@ namespace MWWorld
     bool World::rotateDoor(const Ptr door, MWWorld::DoorState state, float duration)
     {
         const ESM::Position& objPos = door.getRefData().getPosition();
-        float oldRot = objPos.rot[2];
+        auto oldRot = objPos.asRotationVec3();
+        auto newRot = oldRot;
 
         float minRot = door.getCellRef().getPosition().rot[2];
         float maxRot = minRot + osg::DegreesToRadians(90.f);
 
         float diff = duration * osg::DegreesToRadians(90.f) * (state == MWWorld::DoorState::Opening ? 1 : -1);
-        float targetRot = std::min(std::max(minRot, oldRot + diff), maxRot);
-        rotateObject(door, objPos.rot[0], objPos.rot[1], targetRot, MWBase::RotationFlag_none);
+        float targetRot = std::clamp(oldRot.z() + diff, minRot, maxRot);
+        newRot.z() = targetRot;
+        rotateObject(door, newRot, MWBase::RotationFlag_none);
 
         bool reached = (targetRot == maxRot && state != MWWorld::DoorState::Idle) || targetRot == minRot;
 
@@ -1660,7 +1653,7 @@ namespace MWWorld
                     MWBase::Environment::get().getSoundManager()->stopSound3D(door, closeSound);
             }
 
-            rotateObject(door, objPos.rot[0], objPos.rot[1], oldRot, MWBase::RotationFlag_none);
+            rotateObject(door, oldRot, MWBase::RotationFlag_none);
         }
 
         return reached;
@@ -2511,7 +2504,7 @@ namespace MWWorld
         player.getClass().getInventoryStore(player).setContListener(anim);
 
         scaleObject(player, player.getCellRef().getScale()); // apply race height
-        rotateObject(player, 0.f, 0.f, 0.f, MWBase::RotationFlag_inverseOrder | MWBase::RotationFlag_adjust);
+        rotateObject(player, osg::Vec3f(), MWBase::RotationFlag_inverseOrder | MWBase::RotationFlag_adjust);
 
         MWBase::Environment::get().getMechanicsManager()->add(getPlayerPtr());
         MWBase::Environment::get().getWindowManager()->watchActor(getPlayerPtr());
@@ -3858,7 +3851,7 @@ namespace MWWorld
 
                 const ESM::Position& origPos = ptr.getCellRef().getPosition();
                 MWBase::Environment::get().getWorld()->moveObject(ptr, origPos.asVec3());
-                MWBase::Environment::get().getWorld()->rotateObject(ptr, origPos.rot[0], origPos.rot[1], origPos.rot[2]);
+                MWBase::Environment::get().getWorld()->rotateObject(ptr, origPos.asRotationVec3());
                 ptr.getClass().adjustPosition(ptr, true);
             }
             return true;
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 4da790f6b8..11769372f8 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -133,8 +133,6 @@ namespace MWWorld
 
             void updateWeather(float duration, bool paused = false);
 
-            void rotateObjectImp (const Ptr& ptr, const osg::Vec3f& rot, MWBase::RotationFlags flags);
-
             Ptr copyObjectToCell(const ConstPtr &ptr, CellStore* cell, ESM::Position pos, int count, bool adjustPos);
 
             void updateSoundListener();
@@ -387,8 +385,7 @@ namespace MWWorld
             /// @note Rotations via this method use a different rotation order than the initial rotations in the CS. This
             /// could be considered a bug, but is needed for MW compatibility.
             /// \param adjust indicates rotation should be set or adjusted
-            void rotateObject (const Ptr& ptr, float x, float y, float z,
-                MWBase::RotationFlags flags = MWBase::RotationFlag_inverseOrder) override;
+            void rotateObject (const Ptr& ptr, const osg::Vec3f& rot, MWBase::RotationFlags flags = MWBase::RotationFlag_inverseOrder) override;
 
             MWWorld::Ptr placeObject(const MWWorld::ConstPtr& ptr, MWWorld::CellStore* cell, ESM::Position pos) override;
             ///< Place an object. Makes a copy of the Ptr.

From c76387162bbb0f776a811222246962de5668e0b2 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sat, 31 Jul 2021 23:08:50 +0200
Subject: [PATCH 1114/2859] Add projectiles number to the resources stats

---
 apps/openmw/mwphysics/physicssystem.cpp | 1 +
 components/resource/stats.cpp           | 1 +
 2 files changed, 2 insertions(+)

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index ab880abaaa..63f25eb5f5 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -925,6 +925,7 @@ namespace MWPhysics
     {
         stats.setAttribute(frameNumber, "Physics Actors", mActors.size());
         stats.setAttribute(frameNumber, "Physics Objects", mObjects.size());
+        stats.setAttribute(frameNumber, "Physics Projectiles", mProjectiles.size());
         stats.setAttribute(frameNumber, "Physics HeightFields", mHeightFields.size());
     }
 
diff --git a/components/resource/stats.cpp b/components/resource/stats.cpp
index 4d07889d0c..b5975e28e3 100644
--- a/components/resource/stats.cpp
+++ b/components/resource/stats.cpp
@@ -401,6 +401,7 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase *viewer)
             "",
             "Physics Actors",
             "Physics Objects",
+            "Physics Projectiles",
             "Physics HeightFields",
         });
 

From 35928cf4d3bfa5de77879402fef8806bf6369509 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sat, 31 Jul 2021 23:26:10 +0200
Subject: [PATCH 1115/2859] Refactor a bit the physics simulation to make it
 not actor centric: - inline PhysicsSystem::applyQueuedMovements() into
 PhysicsSystem::stepSimulation() - rename PhysicsTaskScheduler::moveActors()
 to PhysicsTaskScheduler::applyQueuedMovements() - move the actor movement
 code from World::doPhysics() to   PhysicsSystem::moveActors() (analogically
 to the projectile manager)

---
 apps/openmw/mwphysics/mtphysics.cpp     | 14 +++-------
 apps/openmw/mwphysics/mtphysics.hpp     |  5 ++--
 apps/openmw/mwphysics/physicssystem.cpp | 36 ++++++++++++++++---------
 apps/openmw/mwphysics/physicssystem.hpp | 11 ++++----
 apps/openmw/mwworld/worldimp.cpp        | 27 ++-----------------
 5 files changed, 37 insertions(+), 56 deletions(-)

diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 10bec49612..efc67a8e42 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -230,7 +230,7 @@ namespace MWPhysics
         return std::make_tuple(numSteps, actualDelta);
     }
 
-    const std::vector<MWWorld::Ptr>& PhysicsTaskScheduler::moveActors(float & timeAccum, std::vector<ActorFrameData>&& actorsData, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
+    void PhysicsTaskScheduler::applyQueuedMovements(float & timeAccum, std::vector<ActorFrameData>&& actorsData, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
     {
         // This function run in the main thread.
         // While the mSimulationMutex is held, background physics threads can't run.
@@ -239,8 +239,6 @@ namespace MWPhysics
 
         double timeStart = mTimer->tick();
 
-        mMovedActors.clear();
-
         // start by finishing previous background computation
         if (mNumThreads != 0)
         {
@@ -260,7 +258,6 @@ namespace MWPhysics
                     if (mAdvanceSimulation)
                         data.mActorRaw->setStandingOnPtr(data.mStandingOn);
                     data.mActorRaw->setSimulationPosition(interpolateMovements(data, mTimeAccum, mPhysicsDt));
-                    mMovedActors.emplace_back(data.mActorRaw->getPtr());
                 }
             }
             if(mAdvanceSimulation)
@@ -296,7 +293,7 @@ namespace MWPhysics
             syncComputation();
             if(mAdvanceSimulation)
                 mBudget.update(mTimer->delta_s(timeStart, mTimer->tick()), numSteps, mBudgetCursor);
-            return mMovedActors;
+            return;
         }
 
         mAsyncStartTime = mTimer->tick();
@@ -304,23 +301,19 @@ namespace MWPhysics
         mHasJob.notify_all();
         if (mAdvanceSimulation)
             mBudget.update(mTimer->delta_s(timeStart, mTimer->tick()), 1, mBudgetCursor);
-        return mMovedActors;
     }
 
-    const std::vector<MWWorld::Ptr>& PhysicsTaskScheduler::resetSimulation(const ActorMap& actors)
+    void PhysicsTaskScheduler::resetSimulation(const ActorMap& actors)
     {
         std::unique_lock lock(mSimulationMutex);
         mBudget.reset(mDefaultPhysicsDt);
         mAsyncBudget.reset(0.0f);
-        mMovedActors.clear();
         mActorsFrameData.clear();
         for (const auto& [_, actor] : actors)
         {
             actor->updatePosition();
             actor->updateCollisionObjectPosition();
-            mMovedActors.emplace_back(actor->getPtr());
         }
-        return mMovedActors;
     }
 
     void PhysicsTaskScheduler::rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, btCollisionWorld::RayResultCallback& resultCallback) const
@@ -561,7 +554,6 @@ namespace MWPhysics
             handleFall(actorData, mAdvanceSimulation);
             actorData.mActorRaw->setSimulationPosition(interpolateMovements(actorData, mTimeAccum, mPhysicsDt));
             updateMechanics(actorData);
-            mMovedActors.emplace_back(actorData.mActorRaw->getPtr());
             if (mAdvanceSimulation)
                 actorData.mActorRaw->setStandingOnPtr(actorData.mStandingOn);
         }
diff --git a/apps/openmw/mwphysics/mtphysics.hpp b/apps/openmw/mwphysics/mtphysics.hpp
index ae82727c56..21698e52bd 100644
--- a/apps/openmw/mwphysics/mtphysics.hpp
+++ b/apps/openmw/mwphysics/mtphysics.hpp
@@ -38,9 +38,9 @@ namespace MWPhysics
             /// @param timeAccum accumulated time from previous run to interpolate movements
             /// @param actorsData per actor data needed to compute new positions
             /// @return new position of each actor
-            const std::vector<MWWorld::Ptr>& moveActors(float & timeAccum, std::vector<ActorFrameData>&& actorsData, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
+            void applyQueuedMovements(float & timeAccum, std::vector<ActorFrameData>&& actorsData, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
 
-            const std::vector<MWWorld::Ptr>& resetSimulation(const ActorMap& actors);
+            void resetSimulation(const ActorMap& actors);
 
             // Thread safe wrappers
             void rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, btCollisionWorld::RayResultCallback& resultCallback) const;
@@ -72,7 +72,6 @@ namespace MWPhysics
 
             std::unique_ptr<WorldFrameData> mWorldFrameData;
             std::vector<ActorFrameData> mActorsFrameData;
-            std::vector<MWWorld::Ptr> mMovedActors;
             float mDefaultPhysicsDt;
             float mPhysicsDt;
             float mTimeAccum;
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index ab880abaaa..a4d8bdb457 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -751,17 +751,6 @@ namespace MWPhysics
             actor->setVelocity(osg::Vec3f());
     }
 
-    const std::vector<MWWorld::Ptr>& PhysicsSystem::applyQueuedMovement(float dt, bool skipSimulation, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
-    {
-        mTimeAccum += dt;
-
-        if (skipSimulation)
-            return mTaskScheduler->resetSimulation(mActors);
-
-        // modifies mTimeAccum
-        return mTaskScheduler->moveActors(mTimeAccum, prepareFrameData(mTimeAccum >= mPhysicsDt), frameStart, frameNumber, stats);
-    }
-
     std::vector<ActorFrameData> PhysicsSystem::prepareFrameData(bool willSimulate)
     {
         std::vector<ActorFrameData> actorsFrameData;
@@ -798,20 +787,43 @@ namespace MWPhysics
         return actorsFrameData;
     }
 
-    void PhysicsSystem::stepSimulation()
+    void PhysicsSystem::stepSimulation(float dt, bool skipSimulation, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
     {
         for (Object* animatedObject : mAnimatedObjects)
+        {
             if (animatedObject->animateCollisionShapes())
             {
                 auto obj = mObjects.find(animatedObject->getPtr());
                 assert(obj != mObjects.end());
                 mTaskScheduler->updateSingleAabb(obj->second);
             }
+        }
 
 #ifndef BT_NO_PROFILE
         CProfileManager::Reset();
         CProfileManager::Increment_Frame_Counter();
 #endif
+
+        mTimeAccum += dt;
+
+        if (skipSimulation)
+            mTaskScheduler->resetSimulation(mActors);
+        else
+            // modifies mTimeAccum
+            mTaskScheduler->applyQueuedMovements(mTimeAccum, prepareFrameData(mTimeAccum >= mPhysicsDt), frameStart, frameNumber, stats);
+    }
+
+    void PhysicsSystem::moveActors()
+    {
+        auto* player = getActor(MWMechanics::getPlayer());
+        auto* world = MWBase::Environment::get().getWorld();
+        for (auto& [ptr, physicActor] : mActors)
+        {
+            if (physicActor.get() == player)
+                continue;
+            world->moveObject(physicActor->getPtr(), physicActor->getSimulationPosition(), false, false);
+        }
+        world->moveObject(player->getPtr(), player->getSimulationPosition(), false, false);
     }
 
     void PhysicsSystem::updateAnimatedCollisionShape(const MWWorld::Ptr& object)
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 1eb1fd419a..ee62ab6ace 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -154,7 +154,11 @@ namespace MWPhysics
 
             bool toggleCollisionMode();
 
-            void stepSimulation();
+            /// Determine new position based on all queued movements, then clear the list.
+            void stepSimulation(float dt, bool skipSimulation, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
+
+            /// Apply new positions to actors
+            void moveActors();
             void debugDraw();
 
             std::vector<MWWorld::Ptr> getCollisions(const MWWorld::ConstPtr &ptr, int collisionGroup, int collisionMask) const; ///< get handles this object collides with
@@ -204,12 +208,9 @@ namespace MWPhysics
             osg::BoundingBox getBoundingBox(const MWWorld::ConstPtr &object) const;
 
             /// Queues velocity movement for a Ptr. If a Ptr is already queued, its velocity will
-            /// be overwritten. Valid until the next call to applyQueuedMovement.
+            /// be overwritten. Valid until the next call to stepSimulation
             void queueObjectMovement(const MWWorld::Ptr &ptr, const osg::Vec3f &velocity);
 
-            /// Apply all queued movements, then clear the list.
-            const std::vector<MWWorld::Ptr>& applyQueuedMovement(float dt, bool skipSimulation, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
-
             /// Clear the queued movements list without applying.
             void clearQueuedMovement();
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 38785740a9..5fcab477cf 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1508,35 +1508,12 @@ namespace MWWorld
 
     void World::doPhysics(float duration, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
     {
-        mPhysics->stepSimulation();
         processDoors(duration);
-
         mProjectileManager->update(duration);
-
-        const auto& results = mPhysics->applyQueuedMovement(duration, mDiscardMovements, frameStart, frameNumber, stats);
+        mPhysics->stepSimulation(duration, mDiscardMovements, frameStart, frameNumber, stats);
         mProjectileManager->processHits();
         mDiscardMovements = false;
-
-        for(const auto& actor : results)
-        {
-            // Handle player last, in case a cell transition occurs
-            if(actor != getPlayerPtr())
-            {
-                auto* physactor = mPhysics->getActor(actor);
-                assert(physactor);
-                const auto position = physactor->getSimulationPosition();
-                moveObject(actor, position, false, false);
-            }
-        }
-
-        const auto player = std::find(results.begin(), results.end(), getPlayerPtr());
-        if (player != results.end())
-        {
-            auto* physactor = mPhysics->getActor(*player);
-            assert(physactor);
-            const auto position = physactor->getSimulationPosition();
-            moveObject(*player, position, false, false);
-        }
+        mPhysics->moveActors();
     }
 
     void World::updateNavigator()

From 4727ae4b3b274eddc13feb7649df496809336a61 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Sun, 1 Aug 2021 02:47:10 +0100
Subject: [PATCH 1116/2859] Make it possible to opt out of composing variables

---
 apps/opencs/model/doc/runner.cpp          |  2 ++
 apps/openmw/main.cpp                      |  4 ++++
 components/files/configurationmanager.cpp | 17 +++++++++++++++++
 3 files changed, 23 insertions(+)

diff --git a/apps/opencs/model/doc/runner.cpp b/apps/opencs/model/doc/runner.cpp
index 8dafbaf5ae..f1179b1624 100644
--- a/apps/opencs/model/doc/runner.cpp
+++ b/apps/opencs/model/doc/runner.cpp
@@ -83,6 +83,8 @@ void CSMDoc::Runner::start (bool delayed)
         arguments <<
             QString::fromUtf8 (("--data=\""+mProjectPath.parent_path().string()+"\"").c_str());
 
+        arguments << "--replace=content";
+
         for (std::vector<std::string>::const_iterator iter (mContentFiles.begin());
             iter!=mContentFiles.end(); ++iter)
         {
diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index 324a18bdee..78be8974b3 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -44,6 +44,10 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     desc.add_options()
         ("help", "print help message")
         ("version", "print version information and quit")
+
+        ("replace", bpo::value<Files::EscapeStringVector>()->default_value(Files::EscapeStringVector(), "")
+            ->multitoken()->composing(), "settings where the values from the current source should replace those from lower-priority sources instead of being appended")
+
         ("data", bpo::value<Files::EscapePathContainer>()->default_value(Files::EscapePathContainer(), "data")
             ->multitoken()->composing(), "set data directories (later directories have higher priority)")
 
diff --git a/components/files/configurationmanager.cpp b/components/files/configurationmanager.cpp
index 92d35a6b65..35679ef293 100644
--- a/components/files/configurationmanager.cpp
+++ b/components/files/configurationmanager.cpp
@@ -100,6 +100,17 @@ boost::program_options::variables_map ConfigurationManager::separateComposingVar
 
 void ConfigurationManager::mergeComposingVariables(boost::program_options::variables_map & first, boost::program_options::variables_map & second, boost::program_options::options_description& description)
 {
+    // There are a few places this assumes all variables are present in second, but it's never crashed in the wild, so it looks like that's guaranteed.
+    std::set<std::string> replacedVariables;
+    if (description.find_nothrow("replace", false))
+    {
+        auto replace = second["replace"];
+        if (!replace.defaulted() && !replace.empty())
+        {
+            std::vector<std::string> replaceVector = replace.as<Files::EscapeStringVector>().toStdStringVector();
+            replacedVariables.insert(replaceVector.begin(), replaceVector.end());
+        }
+    }
     for (const auto& option : description.options())
     {
         if (option->semantic()->is_composing())
@@ -113,6 +124,12 @@ void ConfigurationManager::mergeComposingVariables(boost::program_options::varia
                 continue;
             }
 
+            if (replacedVariables.count(name))
+            {
+                firstPosition->second = second[name];
+                continue;
+            }
+
             if (second[name].defaulted() || second[name].empty())
                 continue;
 

From 04e9b6d242f2fc110a65839a7b4051c09c67a026 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Sun, 1 Aug 2021 03:04:12 +0100
Subject: [PATCH 1117/2859] Abort on duplicate content file

---
 apps/openmw/main.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index 78be8974b3..de0fb0df03 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -199,6 +199,15 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
         Log(Debug::Error) << "No content file given (esm/esp, nor omwgame/omwaddon). Aborting...";
         return false;
     }
+    std::set<std::string> contentDedupe;
+    for (const auto& contentFile : content)
+    {
+        if (!contentDedupe.insert(contentFile).second)
+        {
+            Log(Debug::Error) << "Content file specified more than once: " << contentFile << ". Aborting...";
+            return false;
+        }
+    }
 
     for (auto& file : content)
     {

From 67cad2c5158c32b309e6983222e48a99bf1d9949 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Sun, 1 Aug 2021 14:16:37 +1000
Subject: [PATCH 1118/2859] Fix `CSMWorld::InfoCollection::getTopicRange()`
 returning one too many.

---
 apps/opencs/model/world/infocollection.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/model/world/infocollection.cpp b/apps/opencs/model/world/infocollection.cpp
index b4223d03ab..978ce3595d 100644
--- a/apps/opencs/model/world/infocollection.cpp
+++ b/apps/opencs/model/world/infocollection.cpp
@@ -2,6 +2,7 @@
 
 #include <stdexcept>
 #include <iterator>
+#include <cassert>
 
 #include <components/esm/esmreader.hpp>
 #include <components/esm/loaddial.hpp>
@@ -256,8 +257,8 @@ CSMWorld::InfoCollection::Range CSMWorld::InfoCollection::getTopicRange (const s
 
     // Find end (one past the range)
     RecordConstIterator end = begin + iter->second.size();
-    if (end != getRecords().end())
-        ++end;
+
+    assert(static_cast<size_t>(std::distance(begin, end)) == iter->second.size());
 
     return Range (begin, end);
 }

From bede1ea1ec3d6d5cf6b24f4219c719a8d2a407e9 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sun, 1 Aug 2021 13:13:47 +0200
Subject: [PATCH 1119/2859] Fix build

---
 apps/opencs/model/world/infocollection.hpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/opencs/model/world/infocollection.hpp b/apps/opencs/model/world/infocollection.hpp
index 8974cbb8fb..c1dcbafb01 100644
--- a/apps/opencs/model/world/infocollection.hpp
+++ b/apps/opencs/model/world/infocollection.hpp
@@ -1,6 +1,8 @@
 #ifndef CSM_WOLRD_INFOCOLLECTION_H
 #define CSM_WOLRD_INFOCOLLECTION_H
 
+#include <unordered_map>
+
 #include "collection.hpp"
 #include "info.hpp"
 

From 36e33b0cf20eb99b87e5a72c0c2278f0de36dd41 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sun, 1 Aug 2021 13:14:05 +0200
Subject: [PATCH 1120/2859] Add missing override

---
 apps/opencs/model/world/infocollection.hpp | 10 +++++-----
 apps/opencs/model/world/record.hpp         |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/opencs/model/world/infocollection.hpp b/apps/opencs/model/world/infocollection.hpp
index c1dcbafb01..3e8455c399 100644
--- a/apps/opencs/model/world/infocollection.hpp
+++ b/apps/opencs/model/world/infocollection.hpp
@@ -74,19 +74,19 @@ namespace CSMWorld
 
             void removeDialogueInfos(const std::string& dialogueId);
 
-            void removeRows (int index, int count);
+            void removeRows (int index, int count) override;
 
             void appendBlankRecord (const std::string& id,
-                                            UniversalId::Type type = UniversalId::Type_None);
+                                            UniversalId::Type type = UniversalId::Type_None) override;
 
-            int searchId (const std::string& id) const;
+            int searchId (const std::string& id) const override;
 
             void appendRecord (std::unique_ptr<RecordBase> record,
-                UniversalId::Type type = UniversalId::Type_None);
+                UniversalId::Type type = UniversalId::Type_None) override;
 
             void insertRecord (std::unique_ptr<RecordBase> record,
                                        int index,
-                                       UniversalId::Type type = UniversalId::Type_None);
+                                       UniversalId::Type type = UniversalId::Type_None) override;
     };
 }
 
diff --git a/apps/opencs/model/world/record.hpp b/apps/opencs/model/world/record.hpp
index eb4a74c343..bb43612e5e 100644
--- a/apps/opencs/model/world/record.hpp
+++ b/apps/opencs/model/world/record.hpp
@@ -46,9 +46,9 @@ namespace CSMWorld
         Record(State state,
                 const ESXRecordT *base = 0, const ESXRecordT *modified = 0);
 
-        std::unique_ptr<RecordBase> clone() const;
+        std::unique_ptr<RecordBase> clone() const override;
 
-        std::unique_ptr<RecordBase> modifiedCopy() const;
+        std::unique_ptr<RecordBase> modifiedCopy() const override;
 
         void assign (const RecordBase& record) override;
 

From 9ba459662d509a070d0ca5fa1073b339be44e9bb Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sun, 1 Aug 2021 13:05:40 +0200
Subject: [PATCH 1121/2859] Remove unneeded std::move

[19/199] Building CXX object apps/opencs/CMakeFiles/openmw-cs.dir/model/world/commands.cpp.o
../../../apps/opencs/model/world/commands.cpp:298:12: warning: moving a temporary object prevents copy elision [-Wpessimizing-move]
    mOld = std::move(model.getRecord (id).clone());
           ^
../../../apps/opencs/model/world/commands.cpp:298:12: note: remove std::move call here
    mOld = std::move(model.getRecord (id).clone());
           ^~~~~~~~~~                            ~
../../../apps/opencs/model/world/commands.cpp:333:12: warning: moving a temporary object prevents copy elision [-Wpessimizing-move]
    mOld = std::move(model.getRecord (id).clone());
           ^
../../../apps/opencs/model/world/commands.cpp:333:12: note: remove std::move call here
    mOld = std::move(model.getRecord (id).clone());
           ^~~~~~~~~~                            ~
2 warnings generated.
---
 apps/opencs/model/world/commands.cpp        | 4 ++--
 apps/opencs/model/world/refidcollection.cpp | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/opencs/model/world/commands.cpp b/apps/opencs/model/world/commands.cpp
index e69600eff4..7c5bafb52f 100644
--- a/apps/opencs/model/world/commands.cpp
+++ b/apps/opencs/model/world/commands.cpp
@@ -295,7 +295,7 @@ CSMWorld::RevertCommand::RevertCommand (IdTable& model, const std::string& id, Q
 {
     setText (("Revert record " + id).c_str());
 
-    mOld = std::move(model.getRecord (id).clone());
+    mOld = model.getRecord (id).clone();
 }
 
 CSMWorld::RevertCommand::~RevertCommand()
@@ -330,7 +330,7 @@ CSMWorld::DeleteCommand::DeleteCommand (IdTable& model,
 {
     setText (("Delete record " + id).c_str());
 
-    mOld = std::move(model.getRecord (id).clone());
+    mOld = model.getRecord (id).clone();
 }
 
 CSMWorld::DeleteCommand::~DeleteCommand()
diff --git a/apps/opencs/model/world/refidcollection.cpp b/apps/opencs/model/world/refidcollection.cpp
index 7f3e71106c..03337106ae 100644
--- a/apps/opencs/model/world/refidcollection.cpp
+++ b/apps/opencs/model/world/refidcollection.cpp
@@ -805,8 +805,7 @@ void CSMWorld::RefIdCollection::cloneRecord(const std::string& origin,
                                      const std::string& destination,
                                      const CSMWorld::UniversalId::Type type)
 {
-        std::unique_ptr<RecordBase> newRecord =
-            std::move(mData.getRecord(mData.searchId(origin)).modifiedCopy());
+        std::unique_ptr<RecordBase> newRecord = mData.getRecord(mData.searchId(origin)).modifiedCopy();
         mAdapters.find(type)->second->setId(*newRecord, destination);
         mData.insertRecord(std::move(newRecord), type, destination);
 }

From 139119415283a7f6c0d8b7431b1cdf2125311f5a Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sun, 1 Aug 2021 13:11:16 +0200
Subject: [PATCH 1122/2859] Remove unneeded return statement

---
 apps/opencs/model/world/refidcollection.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/apps/opencs/model/world/refidcollection.cpp b/apps/opencs/model/world/refidcollection.cpp
index 03337106ae..4ee99a2702 100644
--- a/apps/opencs/model/world/refidcollection.cpp
+++ b/apps/opencs/model/world/refidcollection.cpp
@@ -764,7 +764,6 @@ void CSMWorld::RefIdCollection::setNestedData(int row, int column, const QVarian
     const CSMWorld::NestedRefIdAdapterBase& nestedAdapter = getNestedAdapter(mColumns.at(column), localIndex.second);
 
     nestedAdapter.setNestedData(&mColumns.at (column), mData, localIndex.first, data, subRow, subColumn);
-    return;
 }
 
 void CSMWorld::RefIdCollection::removeRows (int index, int count)
@@ -778,7 +777,6 @@ void CSMWorld::RefIdCollection::removeNestedRows(int row, int column, int subRow
     const CSMWorld::NestedRefIdAdapterBase& nestedAdapter = getNestedAdapter(mColumns.at(column), localIndex.second);
 
     nestedAdapter.removeNestedRow(&mColumns.at (column), mData, localIndex.first, subRow);
-    return;
 }
 
 void CSMWorld::RefIdCollection::appendBlankRecord (const std::string& id, UniversalId::Type type)
@@ -895,7 +893,6 @@ void CSMWorld::RefIdCollection::addNestedRow(int row, int col, int position)
     const CSMWorld::NestedRefIdAdapterBase& nestedAdapter = getNestedAdapter(mColumns.at(col), localIndex.second);
 
     nestedAdapter.addNestedRow(&mColumns.at(col), mData, localIndex.first, position);
-    return;
 }
 
 void CSMWorld::RefIdCollection::setNestedTable(int row, int column, const CSMWorld::NestedTableWrapperBase& nestedTable)
@@ -904,7 +901,6 @@ void CSMWorld::RefIdCollection::setNestedTable(int row, int column, const CSMWor
     const CSMWorld::NestedRefIdAdapterBase& nestedAdapter = getNestedAdapter(mColumns.at(column), localIndex.second);
 
     nestedAdapter.setNestedTable(&mColumns.at(column), mData, localIndex.first, nestedTable);
-    return;
 }
 
 CSMWorld::NestedTableWrapperBase* CSMWorld::RefIdCollection::nestedTable(int row, int column) const

From 09ee2a0a36bc029e9544170e90d5938e2827e9c2 Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Sun, 1 Aug 2021 19:42:41 +0300
Subject: [PATCH 1123/2859] fix texture brush index search

---
 apps/opencs/view/widget/scenetooltexturebrush.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/view/widget/scenetooltexturebrush.cpp b/apps/opencs/view/widget/scenetooltexturebrush.cpp
index 272a5de42e..80eca21785 100644
--- a/apps/opencs/view/widget/scenetooltexturebrush.cpp
+++ b/apps/opencs/view/widget/scenetooltexturebrush.cpp
@@ -179,10 +179,10 @@ void CSVWidget::TextureBrushWindow::setBrushTexture(std::string brushTexture)
         undoStack.endMacro();
     }
 
-    if (index != -1 && !landtexturesCollection.getRecord(index).isDeleted())
+    if (index != -1 && !landtexturesCollection.getRecord(rowInNew).isDeleted())
     {
         mBrushTextureLabel = "Selected texture: " + newBrushTextureId + " ";
-        mSelectedBrush->setText(QString::fromStdString(mBrushTextureLabel) + landtexturesCollection.getData(index, landTextureFilename).value<QString>());
+        mSelectedBrush->setText(QString::fromStdString(mBrushTextureLabel) + landtexturesCollection.getData(rowInNew, landTextureFilename).value<QString>());
     } else
     {
         newBrushTextureId = "";

From 0b9b7240200247e18b42cf839afac0bdd7a5d28e Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Sun, 1 Aug 2021 18:19:39 -0700
Subject: [PATCH 1124/2859] correct reflection label for in-game settings menu

---
 files/mygui/openmw_settings_window.layout | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index b602f35260..a07d8125d5 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -443,7 +443,7 @@
                             </Widget>
                             <Widget type="HBox" skin="" position="4 56 350 24">
                                 <Widget type="ComboBox" skin="MW_ComboBox" position="0 0 115 24" align="Left Top" name="WaterReflectionDetail">
-                                    <Property key="AddItem" value="Off"/>
+                                    <Property key="AddItem" value="Sky"/>
                                     <Property key="AddItem" value="Terrain"/>
                                     <Property key="AddItem" value="World"/>
                                     <Property key="AddItem" value="Objects"/>

From 1e52ca2b642e9f1f11e915e4e3189e16598cb1b3 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Sun, 1 Aug 2021 23:46:45 -0700
Subject: [PATCH 1125/2859] properly initialize light settings

---
 components/sceneutil/lightmanager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 2c83c43fef..63a475566b 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -884,8 +884,6 @@ namespace SceneUtil
         std::string lightingMethodString = Settings::Manager::getString("lighting method", "Shaders");
         auto lightingMethod = LightManager::getLightingMethodFromString(lightingMethodString);
 
-        updateSettings();
-
         static bool hasLoggedWarnings = false;
 
         if (lightingMethod == LightingMethod::SingleUBO && !hasLoggedWarnings)
@@ -904,6 +902,8 @@ namespace SceneUtil
         else
             initSingleUBO(targetLights);
 
+        updateSettings();
+
         getOrCreateStateSet()->addUniform(new osg::Uniform("PointLightCount", 0));
 
         addCullCallback(new LightManagerCullCallback(this));

From bc738c56406384d22ba0756fe3641e0070cf2fc5 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Tue, 3 Aug 2021 07:00:42 +0200
Subject: [PATCH 1126/2859] Use extract/insert instead of erase/emplace

When we call moveObject(), we might trigger a change of cell for the
actor, which in turn triggers updatePtr(). The erase/emplace
construct invalidate references, whereas extract/insert do not.

The reason is was working before !1075 is because we were always
"refreshing" the reference by a call to getActor().
---
 apps/openmw/mwphysics/physicssystem.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 67766e4bf9..85fb463a95 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -519,13 +519,12 @@ namespace MWPhysics
             mObjects.emplace(updated, std::move(obj));
         }
 
-        ActorMap::iterator foundActor = mActors.find(old);
-        if (foundActor != mActors.end())
+        auto actorNode = mActors.extract(old);
+        if (!actorNode.empty())
         {
-            auto actor = foundActor->second;
-            actor->updatePtr(updated);
-            mActors.erase(foundActor);
-            mActors.emplace(updated, std::move(actor));
+            actorNode.key() = updated;
+            actorNode.mapped()->updatePtr(updated);
+            mActors.insert(std::move(actorNode));
         }
 
         for (auto& [_, actor] : mActors)

From 4574e5f565cec7c60aa7e962fc8ea776ed47d9fb Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 1 Aug 2021 01:27:41 +0200
Subject: [PATCH 1127/2859] Remove redundant Navigator API functions

---
 .../detournavigator/navigator.cpp             | 30 +++++++++----------
 components/detournavigator/navigator.hpp      | 18 -----------
 components/detournavigator/navigatorimpl.cpp  | 14 ++-------
 components/detournavigator/navigatorimpl.hpp  |  4 ---
 components/detournavigator/navigatorstub.hpp  | 10 -------
 5 files changed, 17 insertions(+), 59 deletions(-)

diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index a75275079b..05d8b4b663 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -221,7 +221,7 @@ namespace
             Vec3fEq(204, -204, 1.99998295307159423828125)
         )) << mPath;
 
-        mNavigator->addObject(ObjectId(&compoundShape), compoundShape, btTransform::getIdentity());
+        mNavigator->addObject(ObjectId(&compoundShape), ObjectShapes(compoundShape, nullptr), btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -273,7 +273,7 @@ namespace
 
         mNavigator->addAgent(mAgentHalfExtents);
         mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
-        mNavigator->addObject(ObjectId(&compoundShape), compoundShape, btTransform::getIdentity());
+        mNavigator->addObject(ObjectId(&compoundShape), ObjectShapes(compoundShape, nullptr), btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -307,7 +307,7 @@ namespace
 
         compoundShape.updateChildTransform(0, btTransform(btMatrix3x3::getIdentity(), btVector3(1000, 0, 0)));
 
-        mNavigator->updateObject(ObjectId(&compoundShape), compoundShape, btTransform::getIdentity());
+        mNavigator->updateObject(ObjectId(&compoundShape), ObjectShapes(compoundShape, nullptr), btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -364,8 +364,8 @@ namespace
         shape2.setLocalScaling(btVector3(128, 128, 1));
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addObject(ObjectId(&shape), shape, btTransform::getIdentity());
-        mNavigator->addObject(ObjectId(&shape2), shape2, btTransform::getIdentity());
+        mNavigator->addObject(ObjectId(&shape), ObjectShapes(shape, nullptr), btTransform::getIdentity());
+        mNavigator->addObject(ObjectId(&shape2), ObjectShapes(shape2, nullptr), btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -670,7 +670,7 @@ namespace
         shape.setLocalScaling(btVector3(128, 128, 1));
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addObject(ObjectId(&shape), shape, btTransform::getIdentity());
+        mNavigator->addObject(ObjectId(&shape), ObjectShapes(shape, nullptr), btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -678,7 +678,7 @@ namespace
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        mNavigator->addObject(ObjectId(&shape), shape, btTransform::getIdentity());
+        mNavigator->addObject(ObjectId(&shape), ObjectShapes(shape, nullptr), btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -813,7 +813,7 @@ namespace
         for (std::size_t i = 0; i < boxShapes.size(); ++i)
         {
             const btTransform transform(btMatrix3x3::getIdentity(), btVector3(i * 10, i * 10, i * 10));
-            mNavigator->addObject(ObjectId(&boxShapes[i]), boxShapes[i], transform);
+            mNavigator->addObject(ObjectId(&boxShapes[i]), ObjectShapes(boxShapes[i], nullptr), transform);
         }
 
         std::this_thread::sleep_for(std::chrono::microseconds(1));
@@ -821,7 +821,7 @@ namespace
         for (std::size_t i = 0; i < boxShapes.size(); ++i)
         {
             const btTransform transform(btMatrix3x3::getIdentity(), btVector3(i * 10 + 1, i * 10 + 1, i * 10 + 1));
-            mNavigator->updateObject(ObjectId(&boxShapes[i]), boxShapes[i], transform);
+            mNavigator->updateObject(ObjectId(&boxShapes[i]), ObjectShapes(boxShapes[i], nullptr), transform);
         }
 
         mNavigator->update(mPlayerPosition);
@@ -865,7 +865,7 @@ namespace
         for (std::size_t i = 0; i < shapes.size(); ++i)
         {
             const btTransform transform(btMatrix3x3::getIdentity(), btVector3(i * 32, i * 32, i * 32));
-            mNavigator->addObject(ObjectId(&shapes[i]), shapes[i], transform);
+            mNavigator->addObject(ObjectId(&shapes[i]), ObjectShapes(shapes[i], nullptr), transform);
         }
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
@@ -874,7 +874,7 @@ namespace
         for (std::size_t i = 0; i < shapes.size(); ++i)
         {
             const btTransform transform(btMatrix3x3::getIdentity(), btVector3(i * 32 + 1, i * 32 + 1, i * 32 + 1));
-            mNavigator->updateObject(ObjectId(&shapes[i]), shapes[i], transform);
+            mNavigator->updateObject(ObjectId(&shapes[i]), ObjectShapes(shapes[i], nullptr), transform);
         }
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
@@ -882,7 +882,7 @@ namespace
         for (std::size_t i = 0; i < shapes.size(); ++i)
         {
             const btTransform transform(btMatrix3x3::getIdentity(), btVector3(i * 32 + 2, i * 32 + 2, i * 32 + 2));
-            mNavigator->updateObject(ObjectId(&shapes[i]), shapes[i], transform);
+            mNavigator->updateObject(ObjectId(&shapes[i]), ObjectShapes(shapes[i], nullptr), transform);
         }
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
@@ -932,10 +932,10 @@ namespace
 
         mNavigator->addAgent(mAgentHalfExtents);
         mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
-        mNavigator->addObject(ObjectId(&oscillatingBoxShape), oscillatingBoxShape,
+        mNavigator->addObject(ObjectId(&oscillatingBoxShape), ObjectShapes(oscillatingBoxShape, nullptr),
                               btTransform(btMatrix3x3::getIdentity(), oscillatingBoxShapePosition));
         // add this box to make navmesh bound box independent from oscillatingBoxShape rotations
-        mNavigator->addObject(ObjectId(&boderBoxShape), boderBoxShape,
+        mNavigator->addObject(ObjectId(&boderBoxShape), ObjectShapes(boderBoxShape, nullptr),
                               btTransform(btMatrix3x3::getIdentity(), oscillatingBoxShapePosition + btVector3(0, 0, 200)));
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
@@ -952,7 +952,7 @@ namespace
         {
             const btTransform transform(btQuaternion(btVector3(0, 0, 1), n * 2 * osg::PI / 10),
                                         oscillatingBoxShapePosition);
-            mNavigator->updateObject(ObjectId(&oscillatingBoxShape), oscillatingBoxShape, transform);
+            mNavigator->updateObject(ObjectId(&oscillatingBoxShape), ObjectShapes(oscillatingBoxShape, nullptr), transform);
             mNavigator->update(mPlayerPosition);
             mNavigator->wait(mListener, WaitConditionType::allJobsDone);
         }
diff --git a/components/detournavigator/navigator.hpp b/components/detournavigator/navigator.hpp
index 6e0f773fb6..e1c4694642 100644
--- a/components/detournavigator/navigator.hpp
+++ b/components/detournavigator/navigator.hpp
@@ -72,15 +72,6 @@ namespace DetourNavigator
          */
         virtual void removeAgent(const osg::Vec3f& agentHalfExtents) = 0;
 
-        /**
-         * @brief addObject is used to add object represented by single btCollisionShape and btTransform.
-         * @param id is used to distinguish different objects.
-         * @param shape must live until object is updated by another shape removed from Navigator.
-         * @param transform allows to setup object geometry according to its world state.
-         * @return true if object is added, false if there is already object with given id.
-         */
-        virtual bool addObject(const ObjectId id, const btCollisionShape& shape, const btTransform& transform) = 0;
-
         /**
          * @brief addObject is used to add complex object with allowed to walk and avoided to walk shapes
          * @param id is used to distinguish different objects
@@ -99,15 +90,6 @@ namespace DetourNavigator
          */
         virtual bool addObject(const ObjectId id, const DoorShapes& shapes, const btTransform& transform) = 0;
 
-        /**
-         * @brief updateObject replace object geometry by given data.
-         * @param id is used to find object.
-         * @param shape must live until object is updated by another shape removed from Navigator.
-         * @param transform allows to setup objects geometry according to its world state.
-         * @return true if object is updated, false if there is no object with given id.
-         */
-        virtual bool updateObject(const ObjectId id, const btCollisionShape& shape, const btTransform& transform) = 0;
-
         /**
          * @brief updateObject replace object geometry by given data.
          * @param id is used to find object.
diff --git a/components/detournavigator/navigatorimpl.cpp b/components/detournavigator/navigatorimpl.cpp
index e256d8f76f..2168497cc3 100644
--- a/components/detournavigator/navigatorimpl.cpp
+++ b/components/detournavigator/navigatorimpl.cpp
@@ -32,14 +32,9 @@ namespace DetourNavigator
             --it->second;
     }
 
-    bool NavigatorImpl::addObject(const ObjectId id, const btCollisionShape& shape, const btTransform& transform)
-    {
-        return mNavMeshManager.addObject(id, shape, transform, AreaType_ground);
-    }
-
     bool NavigatorImpl::addObject(const ObjectId id, const ObjectShapes& shapes, const btTransform& transform)
     {
-        bool result = addObject(id, shapes.mShape, transform);
+        bool result = mNavMeshManager.addObject(id, shapes.mShape, transform, AreaType_ground);
         if (shapes.mAvoid)
         {
             const ObjectId avoidId(shapes.mAvoid);
@@ -65,14 +60,9 @@ namespace DetourNavigator
         return false;
     }
 
-    bool NavigatorImpl::updateObject(const ObjectId id, const btCollisionShape& shape, const btTransform& transform)
-    {
-        return mNavMeshManager.updateObject(id, shape, transform, AreaType_ground);
-    }
-
     bool NavigatorImpl::updateObject(const ObjectId id, const ObjectShapes& shapes, const btTransform& transform)
     {
-        bool result = updateObject(id, shapes.mShape, transform);
+        bool result = mNavMeshManager.updateObject(id, shapes.mShape, transform, AreaType_ground);
         if (shapes.mAvoid)
         {
             const ObjectId avoidId(shapes.mAvoid);
diff --git a/components/detournavigator/navigatorimpl.hpp b/components/detournavigator/navigatorimpl.hpp
index 35a6888551..cda6158958 100644
--- a/components/detournavigator/navigatorimpl.hpp
+++ b/components/detournavigator/navigatorimpl.hpp
@@ -21,14 +21,10 @@ namespace DetourNavigator
 
         void removeAgent(const osg::Vec3f& agentHalfExtents) override;
 
-        bool addObject(const ObjectId id, const btCollisionShape& shape, const btTransform& transform) override;
-
         bool addObject(const ObjectId id, const ObjectShapes& shapes, const btTransform& transform) override;
 
         bool addObject(const ObjectId id, const DoorShapes& shapes, const btTransform& transform) override;
 
-        bool updateObject(const ObjectId id, const btCollisionShape& shape, const btTransform& transform) override;
-
         bool updateObject(const ObjectId id, const ObjectShapes& shapes, const btTransform& transform) override;
 
         bool updateObject(const ObjectId id, const DoorShapes& shapes, const btTransform& transform) override;
diff --git a/components/detournavigator/navigatorstub.hpp b/components/detournavigator/navigatorstub.hpp
index 2d2fc936ca..40de90f256 100644
--- a/components/detournavigator/navigatorstub.hpp
+++ b/components/detournavigator/navigatorstub.hpp
@@ -19,11 +19,6 @@ namespace DetourNavigator
 
         void removeAgent(const osg::Vec3f& /*agentHalfExtents*/) override {}
 
-        bool addObject(const ObjectId /*id*/, const btCollisionShape& /*shape*/, const btTransform& /*transform*/) override
-        {
-            return false;
-        }
-
         bool addObject(const ObjectId /*id*/, const ObjectShapes& /*shapes*/, const btTransform& /*transform*/) override
         {
             return false;
@@ -34,11 +29,6 @@ namespace DetourNavigator
             return false;
         }
 
-        bool updateObject(const ObjectId /*id*/, const btCollisionShape& /*shape*/, const btTransform& /*transform*/) override
-        {
-            return false;
-        }
-
         bool updateObject(const ObjectId /*id*/, const ObjectShapes& /*shapes*/, const btTransform& /*transform*/) override
         {
             return false;

From c8987bda2f1c19fe877c90ae20f9e4ca5904e806 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 1 Aug 2021 02:13:55 +0200
Subject: [PATCH 1128/2859] Store reference to BulletShapeInstance for
 btCollisionShape

To keep btCollisionShape lifetime.
---
 apps/openmw/mwworld/scene.cpp                 |  16 +--
 apps/openmw/mwworld/worldimp.cpp              |   5 +-
 .../detournavigator/navigator.cpp             | 116 +++++++++++-------
 .../detournavigator/recastmeshobject.cpp      |  16 +--
 .../tilecachedrecastmeshmanager.cpp           |  75 ++++++-----
 .../cachedrecastmeshmanager.cpp               |   2 +-
 .../cachedrecastmeshmanager.hpp               |   2 +-
 components/detournavigator/navigator.hpp      |  13 +-
 components/detournavigator/navigatorimpl.cpp  |  20 +--
 components/detournavigator/navmeshmanager.cpp |   7 +-
 components/detournavigator/navmeshmanager.hpp |   4 +-
 .../detournavigator/recastmeshmanager.cpp     |   2 +-
 .../detournavigator/recastmeshmanager.hpp     |   2 +-
 .../detournavigator/recastmeshobject.cpp      |  45 ++++---
 .../detournavigator/recastmeshobject.hpp      |  27 +++-
 .../tilecachedrecastmeshmanager.cpp           |   6 +-
 .../tilecachedrecastmeshmanager.hpp           |   8 +-
 components/resource/bulletshape.cpp           |   4 +
 18 files changed, 221 insertions(+), 149 deletions(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 8c401dcf12..3de4940a37 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -151,11 +151,9 @@ namespace
         {
             if (ptr.getClass().isDoor() && !ptr.getCellRef().getTeleport())
             {
-                const auto shape = object->getShapeInstance()->getCollisionShape();
-
                 btVector3 aabbMin;
                 btVector3 aabbMax;
-                shape->getAabb(btTransform::getIdentity(), aabbMin, aabbMax);
+                object->getShapeInstance()->getCollisionShape()->getAabb(btTransform::getIdentity(), aabbMin, aabbMax);
 
                 const auto center = (aabbMax + aabbMin) * 0.5f;
 
@@ -182,12 +180,7 @@ namespace
 
                 navigator.addObject(
                     DetourNavigator::ObjectId(object),
-                    DetourNavigator::DoorShapes(
-                        *shape,
-                        object->getShapeInstance()->getAvoidCollisionShape(),
-                        connectionStart,
-                        connectionEnd
-                    ),
+                    DetourNavigator::DoorShapes(object->getShapeInstance(), connectionStart, connectionEnd),
                     transform
                 );
             }
@@ -195,10 +188,7 @@ namespace
             {
                 navigator.addObject(
                     DetourNavigator::ObjectId(object),
-                    DetourNavigator::ObjectShapes {
-                        *object->getShapeInstance()->getCollisionShape(),
-                        object->getShapeInstance()->getAvoidCollisionShape()
-                    },
+                    DetourNavigator::ObjectShapes(object->getShapeInstance()),
                     object->getTransform()
                 );
             }
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 5fcab477cf..54b15e4412 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1533,10 +1533,7 @@ namespace MWWorld
 
     void World::updateNavigatorObject(const MWPhysics::Object& object)
     {
-        const DetourNavigator::ObjectShapes shapes {
-            *object.getShapeInstance()->getCollisionShape(),
-            object.getShapeInstance()->getAvoidCollisionShape()
-        };
+        const DetourNavigator::ObjectShapes shapes(object.getShapeInstance());
         mShouldUpdateNavigator = mNavigator->updateObject(DetourNavigator::ObjectId(&object), shapes, object.getTransform())
             || mShouldUpdateNavigator;
     }
diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index 05d8b4b663..35fde5b657 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -5,6 +5,9 @@
 #include <components/misc/rng.hpp>
 #include <components/loadinglistener/loadinglistener.hpp>
 #include <components/esm/loadland.hpp>
+#include <components/resource/bulletshape.hpp>
+
+#include <osg/ref_ptr>
 
 #include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
 #include <BulletCollision/CollisionShapes/btBoxShape.h>
@@ -15,6 +18,7 @@
 
 #include <array>
 #include <deque>
+#include <memory>
 
 MATCHER_P3(Vec3fEq, x, y, z, "")
 {
@@ -84,14 +88,15 @@ namespace
     };
 
     template <std::size_t size>
-    btHeightfieldTerrainShape makeSquareHeightfieldTerrainShape(const std::array<btScalar, size>& values,
+    std::unique_ptr<btHeightfieldTerrainShape> makeSquareHeightfieldTerrainShape(const std::array<btScalar, size>& values,
         btScalar heightScale = 1, int upAxis = 2, PHY_ScalarType heightDataType = PHY_FLOAT, bool flipQuadEdges = false)
     {
         const int width = static_cast<int>(std::sqrt(size));
         const btScalar min = *std::min_element(values.begin(), values.end());
         const btScalar max = *std::max_element(values.begin(), values.end());
         const btScalar greater = std::max(std::abs(min), std::abs(max));
-        return btHeightfieldTerrainShape(width, width, values.data(), heightScale, -greater, greater, upAxis, heightDataType, flipQuadEdges);
+        return std::make_unique<btHeightfieldTerrainShape>(width, width, values.data(), heightScale, -greater, greater,
+                                                           upAxis, heightDataType, flipQuadEdges);
     }
 
     template <std::size_t size>
@@ -107,6 +112,27 @@ namespace
         return surface;
     }
 
+    template <class T>
+    osg::ref_ptr<const Resource::BulletShapeInstance> makeBulletShapeInstance(std::unique_ptr<T>&& shape)
+    {
+        osg::ref_ptr<Resource::BulletShape> bulletShape(new Resource::BulletShape);
+        bulletShape->mCollisionShape = std::move(shape).release();
+        return new Resource::BulletShapeInstance(bulletShape);
+    }
+
+    template <class T>
+    class CollisionShapeInstance
+    {
+    public:
+        CollisionShapeInstance(std::unique_ptr<T>&& shape) : mInstance(makeBulletShapeInstance(std::move(shape))) {}
+
+        T& shape() { return static_cast<T&>(*mInstance->mCollisionShape); }
+        const osg::ref_ptr<const Resource::BulletShapeInstance>& instance() const { return mInstance; }
+
+    private:
+        osg::ref_ptr<const Resource::BulletShapeInstance> mInstance;
+    };
+
     TEST_F(DetourNavigatorNavigatorTest, find_path_for_empty_should_return_empty)
     {
         EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut),
@@ -185,9 +211,8 @@ namespace
         }};
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
 
-        btBoxShape boxShape(btVector3(20, 20, 100));
-        btCompoundShape compoundShape;
-        compoundShape.addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(0, 0, 0)), &boxShape);
+        CollisionShapeInstance compound(std::make_unique<btCompoundShape>());
+        compound.shape().addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(0, 0, 0)), new btBoxShape(btVector3(20, 20, 100)));
 
         mNavigator->addAgent(mAgentHalfExtents);
         mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
@@ -221,7 +246,7 @@ namespace
             Vec3fEq(204, -204, 1.99998295307159423828125)
         )) << mPath;
 
-        mNavigator->addObject(ObjectId(&compoundShape), ObjectShapes(compoundShape, nullptr), btTransform::getIdentity());
+        mNavigator->addObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance()), btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -267,13 +292,12 @@ namespace
         }};
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
 
-        btBoxShape boxShape(btVector3(20, 20, 100));
-        btCompoundShape compoundShape;
-        compoundShape.addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(0, 0, 0)), &boxShape);
+        CollisionShapeInstance compound(std::make_unique<btCompoundShape>());
+        compound.shape().addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(0, 0, 0)), new btBoxShape(btVector3(20, 20, 100)));
 
         mNavigator->addAgent(mAgentHalfExtents);
         mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
-        mNavigator->addObject(ObjectId(&compoundShape), ObjectShapes(compoundShape, nullptr), btTransform::getIdentity());
+        mNavigator->addObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance()), btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -305,9 +329,9 @@ namespace
             Vec3fEq(204, -204, 1.99998295307159423828125)
         )) << mPath;
 
-        compoundShape.updateChildTransform(0, btTransform(btMatrix3x3::getIdentity(), btVector3(1000, 0, 0)));
+        compound.shape().updateChildTransform(0, btTransform(btMatrix3x3::getIdentity(), btVector3(1000, 0, 0)));
 
-        mNavigator->updateObject(ObjectId(&compoundShape), ObjectShapes(compoundShape, nullptr), btTransform::getIdentity());
+        mNavigator->updateObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance()), btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -350,8 +374,8 @@ namespace
             0, -25, -100, -100, -100,
             0, -25, -100, -100, -100,
         }};
-        btHeightfieldTerrainShape shape = makeSquareHeightfieldTerrainShape(heightfieldData1);
-        shape.setLocalScaling(btVector3(128, 128, 1));
+        CollisionShapeInstance heightfield1(makeSquareHeightfieldTerrainShape(heightfieldData1));
+        heightfield1.shape().setLocalScaling(btVector3(128, 128, 1));
 
         const std::array<btScalar, 5 * 5> heightfieldData2 {{
             -25, -25, -25, -25, -25,
@@ -360,12 +384,12 @@ namespace
             -25, -25, -25, -25, -25,
             -25, -25, -25, -25, -25,
         }};
-        btHeightfieldTerrainShape shape2 = makeSquareHeightfieldTerrainShape(heightfieldData2);
-        shape2.setLocalScaling(btVector3(128, 128, 1));
+        CollisionShapeInstance heightfield2(makeSquareHeightfieldTerrainShape(heightfieldData2));
+        heightfield2.shape().setLocalScaling(btVector3(128, 128, 1));
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addObject(ObjectId(&shape), ObjectShapes(shape, nullptr), btTransform::getIdentity());
-        mNavigator->addObject(ObjectId(&shape2), ObjectShapes(shape2, nullptr), btTransform::getIdentity());
+        mNavigator->addObject(ObjectId(&heightfield1.shape()), ObjectShapes(heightfield1.instance()), btTransform::getIdentity());
+        mNavigator->addObject(ObjectId(&heightfield2.shape()), ObjectShapes(heightfield2.instance()), btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -424,6 +448,8 @@ namespace
 
     TEST_F(DetourNavigatorNavigatorTest, path_should_be_around_avoid_shape)
     {
+        osg::ref_ptr<Resource::BulletShape> bulletShape(new Resource::BulletShape);
+
         std::array<btScalar, 5 * 5> heightfieldData {{
             0,   0,    0,    0,    0,
             0, -25,  -25,  -25,  -25,
@@ -431,8 +457,9 @@ namespace
             0, -25, -100, -100, -100,
             0, -25, -100, -100, -100,
         }};
-        btHeightfieldTerrainShape shape = makeSquareHeightfieldTerrainShape(heightfieldData);
-        shape.setLocalScaling(btVector3(128, 128, 1));
+        std::unique_ptr<btHeightfieldTerrainShape> shapePtr = makeSquareHeightfieldTerrainShape(heightfieldData);
+        shapePtr->setLocalScaling(btVector3(128, 128, 1));
+        bulletShape->mCollisionShape = shapePtr.release();
 
         std::array<btScalar, 5 * 5> heightfieldDataAvoid {{
             -25, -25, -25, -25, -25,
@@ -441,11 +468,14 @@ namespace
             -25, -25, -25, -25, -25,
             -25, -25, -25, -25, -25,
         }};
-        btHeightfieldTerrainShape shapeAvoid = makeSquareHeightfieldTerrainShape(heightfieldDataAvoid);
-        shapeAvoid.setLocalScaling(btVector3(128, 128, 1));
+        std::unique_ptr<btHeightfieldTerrainShape> shapeAvoidPtr = makeSquareHeightfieldTerrainShape(heightfieldDataAvoid);
+        shapeAvoidPtr->setLocalScaling(btVector3(128, 128, 1));
+        bulletShape->mAvoidCollisionShape = shapeAvoidPtr.release();
+
+        osg::ref_ptr<const Resource::BulletShapeInstance> instance(new Resource::BulletShapeInstance(bulletShape));
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addObject(ObjectId(&shape), ObjectShapes {shape, &shapeAvoid}, btTransform::getIdentity());
+        mNavigator->addObject(ObjectId(instance->getCollisionShape()), ObjectShapes(instance), btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -666,19 +696,19 @@ namespace
             0, -25, -100, -100, -100,
             0, -25, -100, -100, -100,
         }};
-        btHeightfieldTerrainShape shape = makeSquareHeightfieldTerrainShape(heightfieldData);
-        shape.setLocalScaling(btVector3(128, 128, 1));
+        CollisionShapeInstance heightfield(makeSquareHeightfieldTerrainShape(heightfieldData));
+        heightfield.shape().setLocalScaling(btVector3(128, 128, 1));
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addObject(ObjectId(&shape), ObjectShapes(shape, nullptr), btTransform::getIdentity());
+        mNavigator->addObject(ObjectId(&heightfield.shape()), ObjectShapes(heightfield.instance()), btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        mNavigator->removeObject(ObjectId(&shape));
+        mNavigator->removeObject(ObjectId(&heightfield.shape()));
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        mNavigator->addObject(ObjectId(&shape), ObjectShapes(shape, nullptr), btTransform::getIdentity());
+        mNavigator->addObject(ObjectId(&heightfield.shape()), ObjectShapes(heightfield.instance()), btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -804,24 +834,25 @@ namespace
         }};
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
 
-        const std::vector<btBoxShape> boxShapes(100, btVector3(20, 20, 100));
+        std::vector<CollisionShapeInstance<btBoxShape>> boxes;
+        std::generate_n(std::back_inserter(boxes), 100, [] { return std::make_unique<btBoxShape>(btVector3(20, 20, 100)); });
 
         mNavigator->addAgent(mAgentHalfExtents);
 
         mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
 
-        for (std::size_t i = 0; i < boxShapes.size(); ++i)
+        for (std::size_t i = 0; i < boxes.size(); ++i)
         {
             const btTransform transform(btMatrix3x3::getIdentity(), btVector3(i * 10, i * 10, i * 10));
-            mNavigator->addObject(ObjectId(&boxShapes[i]), ObjectShapes(boxShapes[i], nullptr), transform);
+            mNavigator->addObject(ObjectId(&boxes[i].shape()), ObjectShapes(boxes[i].instance()), transform);
         }
 
         std::this_thread::sleep_for(std::chrono::microseconds(1));
 
-        for (std::size_t i = 0; i < boxShapes.size(); ++i)
+        for (std::size_t i = 0; i < boxes.size(); ++i)
         {
             const btTransform transform(btMatrix3x3::getIdentity(), btVector3(i * 10 + 1, i * 10 + 1, i * 10 + 1));
-            mNavigator->updateObject(ObjectId(&boxShapes[i]), ObjectShapes(boxShapes[i], nullptr), transform);
+            mNavigator->updateObject(ObjectId(&boxes[i].shape()), ObjectShapes(boxes[i].instance()), transform);
         }
 
         mNavigator->update(mPlayerPosition);
@@ -858,14 +889,15 @@ namespace
 
     TEST_F(DetourNavigatorNavigatorTest, update_changed_multiple_times_object_should_delay_navmesh_change)
     {
-        const std::vector<btBoxShape> shapes(100, btVector3(64, 64, 64));
+        std::vector<CollisionShapeInstance<btBoxShape>> shapes;
+        std::generate_n(std::back_inserter(shapes), 100, [] { return std::make_unique<btBoxShape>(btVector3(64, 64, 64)); });
 
         mNavigator->addAgent(mAgentHalfExtents);
 
         for (std::size_t i = 0; i < shapes.size(); ++i)
         {
             const btTransform transform(btMatrix3x3::getIdentity(), btVector3(i * 32, i * 32, i * 32));
-            mNavigator->addObject(ObjectId(&shapes[i]), ObjectShapes(shapes[i], nullptr), transform);
+            mNavigator->addObject(ObjectId(&shapes[i].shape()), ObjectShapes(shapes[i].instance()), transform);
         }
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
@@ -874,7 +906,7 @@ namespace
         for (std::size_t i = 0; i < shapes.size(); ++i)
         {
             const btTransform transform(btMatrix3x3::getIdentity(), btVector3(i * 32 + 1, i * 32 + 1, i * 32 + 1));
-            mNavigator->updateObject(ObjectId(&shapes[i]), ObjectShapes(shapes[i], nullptr), transform);
+            mNavigator->updateObject(ObjectId(&shapes[i].shape()), ObjectShapes(shapes[i].instance()), transform);
         }
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
@@ -882,7 +914,7 @@ namespace
         for (std::size_t i = 0; i < shapes.size(); ++i)
         {
             const btTransform transform(btMatrix3x3::getIdentity(), btVector3(i * 32 + 2, i * 32 + 2, i * 32 + 2));
-            mNavigator->updateObject(ObjectId(&shapes[i]), ObjectShapes(shapes[i], nullptr), transform);
+            mNavigator->updateObject(ObjectId(&shapes[i].shape()), ObjectShapes(shapes[i].instance()), transform);
         }
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
@@ -926,16 +958,16 @@ namespace
         }};
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
 
-        const btBoxShape oscillatingBoxShape(btVector3(20, 20, 20));
+        CollisionShapeInstance oscillatingBox(std::make_unique<btBoxShape>(btVector3(20, 20, 20)));
         const btVector3 oscillatingBoxShapePosition(32, 32, 400);
-        const btBoxShape boderBoxShape(btVector3(50, 50, 50));
+        CollisionShapeInstance boderBox(std::make_unique<btBoxShape>(btVector3(50, 50, 50)));
 
         mNavigator->addAgent(mAgentHalfExtents);
         mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
-        mNavigator->addObject(ObjectId(&oscillatingBoxShape), ObjectShapes(oscillatingBoxShape, nullptr),
+        mNavigator->addObject(ObjectId(&oscillatingBox.shape()), ObjectShapes(oscillatingBox.instance()),
                               btTransform(btMatrix3x3::getIdentity(), oscillatingBoxShapePosition));
         // add this box to make navmesh bound box independent from oscillatingBoxShape rotations
-        mNavigator->addObject(ObjectId(&boderBoxShape), ObjectShapes(boderBoxShape, nullptr),
+        mNavigator->addObject(ObjectId(&boderBox.shape()), ObjectShapes(boderBox.instance()),
                               btTransform(btMatrix3x3::getIdentity(), oscillatingBoxShapePosition + btVector3(0, 0, 200)));
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
@@ -952,7 +984,7 @@ namespace
         {
             const btTransform transform(btQuaternion(btVector3(0, 0, 1), n * 2 * osg::PI / 10),
                                         oscillatingBoxShapePosition);
-            mNavigator->updateObject(ObjectId(&oscillatingBoxShape), ObjectShapes(oscillatingBoxShape, nullptr), transform);
+            mNavigator->updateObject(ObjectId(&oscillatingBox.shape()), ObjectShapes(oscillatingBox.instance()), transform);
             mNavigator->update(mPlayerPosition);
             mNavigator->wait(mListener, WaitConditionType::allJobsDone);
         }
diff --git a/apps/openmw_test_suite/detournavigator/recastmeshobject.cpp b/apps/openmw_test_suite/detournavigator/recastmeshobject.cpp
index 621db51a89..7751d5220c 100644
--- a/apps/openmw_test_suite/detournavigator/recastmeshobject.cpp
+++ b/apps/openmw_test_suite/detournavigator/recastmeshobject.cpp
@@ -14,20 +14,22 @@ namespace
 
     struct DetourNavigatorRecastMeshObjectTest : Test
     {
-        btBoxShape mBoxShape {btVector3(1, 2, 3)};
-        btCompoundShape mCompoundShape {true};
+        btBoxShape mBoxShapeImpl {btVector3(1, 2, 3)};
+        CollisionShape mBoxShape {nullptr, mBoxShapeImpl};
+        btCompoundShape mCompoundShapeImpl {true};
+        CollisionShape mCompoundShape {nullptr, mCompoundShapeImpl};
         btTransform mTransform {btQuaternion(btVector3(1, 2, 3), 1), btVector3(1, 2, 3)};
 
         DetourNavigatorRecastMeshObjectTest()
         {
-            mCompoundShape.addChildShape(mTransform, std::addressof(mBoxShape));
+            mCompoundShapeImpl.addChildShape(mTransform, std::addressof(mBoxShapeImpl));
         }
     };
 
     TEST_F(DetourNavigatorRecastMeshObjectTest, constructed_object_should_have_shape_and_transform)
     {
         const RecastMeshObject object(mBoxShape, mTransform, AreaType_ground);
-        EXPECT_EQ(std::addressof(object.getShape()), std::addressof(mBoxShape));
+        EXPECT_EQ(std::addressof(object.getShape()), std::addressof(mBoxShapeImpl));
         EXPECT_EQ(object.getTransform(), mTransform);
     }
 
@@ -58,14 +60,14 @@ namespace
     TEST_F(DetourNavigatorRecastMeshObjectTest, update_for_compound_shape_with_same_transform_and_changed_child_transform_should_return_true)
     {
         RecastMeshObject object(mCompoundShape, mTransform, AreaType_ground);
-        mCompoundShape.updateChildTransform(0, btTransform::getIdentity());
+        mCompoundShapeImpl.updateChildTransform(0, btTransform::getIdentity());
         EXPECT_TRUE(object.update(mTransform, AreaType_ground));
     }
 
     TEST_F(DetourNavigatorRecastMeshObjectTest, repeated_update_for_compound_shape_without_changes_should_return_false)
     {
         RecastMeshObject object(mCompoundShape, mTransform, AreaType_ground);
-        mCompoundShape.updateChildTransform(0, btTransform::getIdentity());
+        mCompoundShapeImpl.updateChildTransform(0, btTransform::getIdentity());
         object.update(mTransform, AreaType_ground);
         EXPECT_FALSE(object.update(mTransform, AreaType_ground));
     }
@@ -73,7 +75,7 @@ namespace
     TEST_F(DetourNavigatorRecastMeshObjectTest, update_for_changed_local_scaling_should_return_true)
     {
         RecastMeshObject object(mBoxShape, mTransform, AreaType_ground);
-        mBoxShape.setLocalScaling(btVector3(2, 2, 2));
+        mBoxShapeImpl.setLocalScaling(btVector3(2, 2, 2));
         EXPECT_TRUE(object.update(mTransform, AreaType_ground));
     }
 }
diff --git a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
index 4c49e75dc9..51580906ce 100644
--- a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -62,22 +62,25 @@ namespace
     {
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
-        EXPECT_TRUE(manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground));
+        const CollisionShape shape(nullptr, boxShape);
+        EXPECT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground));
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, add_object_for_existing_object_should_return_false)
     {
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
-        manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
-        EXPECT_FALSE(manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground));
+        const CollisionShape shape(nullptr, boxShape);
+        manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
+        EXPECT_FALSE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground));
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, add_object_should_add_tiles)
     {
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
-        ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground));
+        const CollisionShape shape(nullptr, boxShape);
+        ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground));
         for (int x = -1; x < 1; ++x)
             for (int y = -1; y < 1; ++y)
                 ASSERT_TRUE(manager.hasTile(TilePosition(x, y)));
@@ -88,8 +91,9 @@ namespace
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const btTransform transform(btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
-        manager.addObject(ObjectId(&boxShape), boxShape, transform, AreaType::AreaType_ground);
-        EXPECT_TRUE(manager.updateObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground,
+        const CollisionShape shape(nullptr, boxShape);
+        manager.addObject(ObjectId(&boxShape), shape, transform, AreaType::AreaType_ground);
+        EXPECT_TRUE(manager.updateObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground,
                                          [&] (const auto& v) { onChangedTile(v); }));
         EXPECT_THAT(
             mChangedTiles,
@@ -102,8 +106,9 @@ namespace
     {
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
-        manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
-        EXPECT_FALSE(manager.updateObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground,
+        const CollisionShape shape(nullptr, boxShape);
+        manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
+        EXPECT_FALSE(manager.updateObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground,
                                           [&] (const auto& v) { onChangedTile(v); }));
         EXPECT_EQ(mChangedTiles, std::vector<TilePosition>());
     }
@@ -112,7 +117,8 @@ namespace
     {
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
-        manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+        const CollisionShape shape(nullptr, boxShape);
+        manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
         EXPECT_NE(manager.getMesh(TilePosition(-1, -1)), nullptr);
         EXPECT_NE(manager.getMesh(TilePosition(-1, 0)), nullptr);
         EXPECT_NE(manager.getMesh(TilePosition(0, -1)), nullptr);
@@ -123,7 +129,8 @@ namespace
     {
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
-        manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+        const CollisionShape shape(nullptr, boxShape);
+        manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
         EXPECT_EQ(manager.getMesh(TilePosition(1, 0)), nullptr);
     }
 
@@ -132,14 +139,15 @@ namespace
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const btTransform transform(btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
+        const CollisionShape shape(nullptr, boxShape);
 
-        manager.addObject(ObjectId(&boxShape), boxShape, transform, AreaType::AreaType_ground);
+        manager.addObject(ObjectId(&boxShape), shape, transform, AreaType::AreaType_ground);
         EXPECT_NE(manager.getMesh(TilePosition(0, -1)), nullptr);
         EXPECT_NE(manager.getMesh(TilePosition(0, 0)), nullptr);
         EXPECT_NE(manager.getMesh(TilePosition(1, 0)), nullptr);
         EXPECT_NE(manager.getMesh(TilePosition(1, -1)), nullptr);
 
-        manager.updateObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {});
+        manager.updateObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {});
         EXPECT_NE(manager.getMesh(TilePosition(-1, -1)), nullptr);
         EXPECT_NE(manager.getMesh(TilePosition(-1, 0)), nullptr);
         EXPECT_NE(manager.getMesh(TilePosition(0, -1)), nullptr);
@@ -151,12 +159,13 @@ namespace
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const btTransform transform(btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
+        const CollisionShape shape(nullptr, boxShape);
 
-        manager.addObject(ObjectId(&boxShape), boxShape, transform, AreaType::AreaType_ground);
+        manager.addObject(ObjectId(&boxShape), shape, transform, AreaType::AreaType_ground);
         EXPECT_EQ(manager.getMesh(TilePosition(-1, -1)), nullptr);
         EXPECT_EQ(manager.getMesh(TilePosition(-1, 0)), nullptr);
 
-        manager.updateObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {});
+        manager.updateObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {});
         EXPECT_EQ(manager.getMesh(TilePosition(1, 0)), nullptr);
         EXPECT_EQ(manager.getMesh(TilePosition(1, -1)), nullptr);
     }
@@ -165,7 +174,8 @@ namespace
     {
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
-        manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+        const CollisionShape shape(nullptr, boxShape);
+        manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
         manager.removeObject(ObjectId(&boxShape));
         EXPECT_EQ(manager.getMesh(TilePosition(-1, -1)), nullptr);
         EXPECT_EQ(manager.getMesh(TilePosition(-1, 0)), nullptr);
@@ -177,14 +187,15 @@ namespace
     {
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
+        const CollisionShape shape(nullptr, boxShape);
 
-        manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+        manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
         EXPECT_NE(manager.getMesh(TilePosition(-1, -1)), nullptr);
         EXPECT_NE(manager.getMesh(TilePosition(-1, 0)), nullptr);
         EXPECT_NE(manager.getMesh(TilePosition(0, -1)), nullptr);
         EXPECT_NE(manager.getMesh(TilePosition(0, 0)), nullptr);
 
-        manager.updateObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {});
+        manager.updateObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {});
         EXPECT_NE(manager.getMesh(TilePosition(-1, -1)), nullptr);
         EXPECT_NE(manager.getMesh(TilePosition(-1, 0)), nullptr);
         EXPECT_NE(manager.getMesh(TilePosition(0, -1)), nullptr);
@@ -196,7 +207,8 @@ namespace
         TileCachedRecastMeshManager manager(mSettings);
         const auto initialRevision = manager.getRevision();
         const btBoxShape boxShape(btVector3(20, 20, 100));
-        manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+        const CollisionShape shape(nullptr, boxShape);
+        manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
         EXPECT_EQ(manager.getRevision(), initialRevision + 1);
     }
 
@@ -204,9 +216,10 @@ namespace
     {
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
-        manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+        const CollisionShape shape(nullptr, boxShape);
+        manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
         const auto beforeAddRevision = manager.getRevision();
-        manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+        manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
         EXPECT_EQ(manager.getRevision(), beforeAddRevision);
     }
 
@@ -215,9 +228,10 @@ namespace
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const btTransform transform(btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
-        manager.addObject(ObjectId(&boxShape), boxShape, transform, AreaType::AreaType_ground);
+        const CollisionShape shape(nullptr, boxShape);
+        manager.addObject(ObjectId(&boxShape), shape, transform, AreaType::AreaType_ground);
         const auto beforeUpdateRevision = manager.getRevision();
-        manager.updateObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {});
+        manager.updateObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {});
         EXPECT_EQ(manager.getRevision(), beforeUpdateRevision + 1);
     }
 
@@ -225,9 +239,10 @@ namespace
     {
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
-        manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+        const CollisionShape shape(nullptr, boxShape);
+        manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
         const auto beforeUpdateRevision = manager.getRevision();
-        manager.updateObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {});
+        manager.updateObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {});
         EXPECT_EQ(manager.getRevision(), beforeUpdateRevision);
     }
 
@@ -235,7 +250,8 @@ namespace
     {
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
-        manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+        const CollisionShape shape(nullptr, boxShape);
+        manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
         const auto beforeRemoveRevision = manager.getRevision();
         manager.removeObject(ObjectId(&boxShape));
         EXPECT_EQ(manager.getRevision(), beforeRemoveRevision + 1);
@@ -272,7 +288,8 @@ namespace
     {
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
-        ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground));
+        const CollisionShape shape(nullptr, boxShape);
+        ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground));
         const osg::Vec2i cellPosition(0, 0);
         const int cellSize = std::numeric_limits<int>::max();
         ASSERT_TRUE(manager.addWater(cellPosition, cellSize, osg::Vec3f()));
@@ -314,7 +331,8 @@ namespace
     {
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
-        ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground));
+        const CollisionShape shape(nullptr, boxShape);
+        ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground));
         const osg::Vec2i cellPosition(0, 0);
         const int cellSize = 8192;
         ASSERT_TRUE(manager.addWater(cellPosition, cellSize, osg::Vec3f()));
@@ -330,7 +348,8 @@ namespace
         const osg::Vec2i cellPosition(0, 0);
         const int cellSize = 8192;
         const btBoxShape boxShape(btVector3(20, 20, 100));
-        ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground));
+        const CollisionShape shape(nullptr, boxShape);
+        ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground));
         ASSERT_TRUE(manager.addWater(cellPosition, cellSize, osg::Vec3f()));
         ASSERT_TRUE(manager.removeObject(ObjectId(&boxShape)));
         for (int x = -6; x < 6; ++x)
diff --git a/components/detournavigator/cachedrecastmeshmanager.cpp b/components/detournavigator/cachedrecastmeshmanager.cpp
index 154da806d7..36f5e9e03a 100644
--- a/components/detournavigator/cachedrecastmeshmanager.cpp
+++ b/components/detournavigator/cachedrecastmeshmanager.cpp
@@ -8,7 +8,7 @@ namespace DetourNavigator
         : mImpl(settings, bounds, generation)
     {}
 
-    bool CachedRecastMeshManager::addObject(const ObjectId id, const btCollisionShape& shape,
+    bool CachedRecastMeshManager::addObject(const ObjectId id, const CollisionShape& shape,
                                             const btTransform& transform, const AreaType areaType)
     {
         if (!mImpl.addObject(id, shape, transform, areaType))
diff --git a/components/detournavigator/cachedrecastmeshmanager.hpp b/components/detournavigator/cachedrecastmeshmanager.hpp
index ab7bb9e7cb..1af249404b 100644
--- a/components/detournavigator/cachedrecastmeshmanager.hpp
+++ b/components/detournavigator/cachedrecastmeshmanager.hpp
@@ -12,7 +12,7 @@ namespace DetourNavigator
     public:
         CachedRecastMeshManager(const Settings& settings, const TileBounds& bounds, std::size_t generation);
 
-        bool addObject(const ObjectId id, const btCollisionShape& shape, const btTransform& transform,
+        bool addObject(const ObjectId id, const CollisionShape& shape, const btTransform& transform,
                        const AreaType areaType);
 
         bool updateObject(const ObjectId id, const btTransform& transform, const AreaType areaType);
diff --git a/components/detournavigator/navigator.hpp b/components/detournavigator/navigator.hpp
index e1c4694642..1a78b602cd 100644
--- a/components/detournavigator/navigator.hpp
+++ b/components/detournavigator/navigator.hpp
@@ -10,6 +10,8 @@
 #include "waitconditiontype.hpp"
 #include "heightfieldshape.hpp"
 
+#include <components/resource/bulletshape.hpp>
+
 #include <variant>
 
 namespace ESM
@@ -27,11 +29,10 @@ namespace DetourNavigator
 {
     struct ObjectShapes
     {
-        const btCollisionShape& mShape;
-        const btCollisionShape* mAvoid;
+        osg::ref_ptr<const Resource::BulletShapeInstance> mShapeInstance;
 
-        ObjectShapes(const btCollisionShape& shape, const btCollisionShape* avoid)
-            : mShape(shape), mAvoid(avoid)
+        ObjectShapes(const osg::ref_ptr<const Resource::BulletShapeInstance>& shapeInstance)
+            : mShapeInstance(shapeInstance)
         {}
     };
 
@@ -40,9 +41,9 @@ namespace DetourNavigator
         osg::Vec3f mConnectionStart;
         osg::Vec3f mConnectionEnd;
 
-        DoorShapes(const btCollisionShape& shape, const btCollisionShape* avoid,
+        DoorShapes(const osg::ref_ptr<const Resource::BulletShapeInstance>& shapeInstance,
                    const osg::Vec3f& connectionStart,const osg::Vec3f& connectionEnd)
-            : ObjectShapes(shape, avoid)
+            : ObjectShapes(shapeInstance)
             , mConnectionStart(connectionStart)
             , mConnectionEnd(connectionEnd)
         {}
diff --git a/components/detournavigator/navigatorimpl.cpp b/components/detournavigator/navigatorimpl.cpp
index 2168497cc3..5a8488c8d0 100644
--- a/components/detournavigator/navigatorimpl.cpp
+++ b/components/detournavigator/navigatorimpl.cpp
@@ -34,11 +34,13 @@ namespace DetourNavigator
 
     bool NavigatorImpl::addObject(const ObjectId id, const ObjectShapes& shapes, const btTransform& transform)
     {
-        bool result = mNavMeshManager.addObject(id, shapes.mShape, transform, AreaType_ground);
-        if (shapes.mAvoid)
+        CollisionShape collisionShape {shapes.mShapeInstance, *shapes.mShapeInstance->getCollisionShape()};
+        bool result = mNavMeshManager.addObject(id, collisionShape, transform, AreaType_ground);
+        if (const btCollisionShape* const avoidShape = shapes.mShapeInstance->getAvoidCollisionShape())
         {
-            const ObjectId avoidId(shapes.mAvoid);
-            if (mNavMeshManager.addObject(avoidId, *shapes.mAvoid, transform, AreaType_null))
+            const ObjectId avoidId(avoidShape);
+            CollisionShape collisionShape {shapes.mShapeInstance, *avoidShape};
+            if (mNavMeshManager.addObject(avoidId, collisionShape, transform, AreaType_null))
             {
                 updateAvoidShapeId(id, avoidId);
                 result = true;
@@ -62,11 +64,13 @@ namespace DetourNavigator
 
     bool NavigatorImpl::updateObject(const ObjectId id, const ObjectShapes& shapes, const btTransform& transform)
     {
-        bool result = mNavMeshManager.updateObject(id, shapes.mShape, transform, AreaType_ground);
-        if (shapes.mAvoid)
+        const CollisionShape collisionShape {shapes.mShapeInstance, *shapes.mShapeInstance->getCollisionShape()};
+        bool result = mNavMeshManager.updateObject(id, collisionShape, transform, AreaType_ground);
+        if (const btCollisionShape* const avoidShape = shapes.mShapeInstance->getAvoidCollisionShape())
         {
-            const ObjectId avoidId(shapes.mAvoid);
-            if (mNavMeshManager.updateObject(avoidId, *shapes.mAvoid, transform, AreaType_null))
+            const ObjectId avoidId(avoidShape);
+            const CollisionShape collisionShape {shapes.mShapeInstance, *avoidShape};
+            if (mNavMeshManager.updateObject(avoidId, collisionShape, transform, AreaType_null))
             {
                 updateAvoidShapeId(id, avoidId);
                 result = true;
diff --git a/components/detournavigator/navmeshmanager.cpp b/components/detournavigator/navmeshmanager.cpp
index 287a3c8ef9..c378230845 100644
--- a/components/detournavigator/navmeshmanager.cpp
+++ b/components/detournavigator/navmeshmanager.cpp
@@ -47,16 +47,17 @@ namespace DetourNavigator
         , mAsyncNavMeshUpdater(settings, mRecastMeshManager, mOffMeshConnectionsManager)
     {}
 
-    bool NavMeshManager::addObject(const ObjectId id, const btCollisionShape& shape, const btTransform& transform,
+    bool NavMeshManager::addObject(const ObjectId id, const CollisionShape& shape, const btTransform& transform,
                                    const AreaType areaType)
     {
+        const btCollisionShape& collisionShape = shape.getShape();
         if (!mRecastMeshManager.addObject(id, shape, transform, areaType))
             return false;
-        addChangedTiles(shape, transform, ChangeType::add);
+        addChangedTiles(collisionShape, transform, ChangeType::add);
         return true;
     }
 
-    bool NavMeshManager::updateObject(const ObjectId id, const btCollisionShape& shape, const btTransform& transform,
+    bool NavMeshManager::updateObject(const ObjectId id, const CollisionShape& shape, const btTransform& transform,
                                       const AreaType areaType)
     {
         return mRecastMeshManager.updateObject(id, shape, transform, areaType,
diff --git a/components/detournavigator/navmeshmanager.hpp b/components/detournavigator/navmeshmanager.hpp
index 390ba41ec8..76c9b1e0b9 100644
--- a/components/detournavigator/navmeshmanager.hpp
+++ b/components/detournavigator/navmeshmanager.hpp
@@ -24,10 +24,10 @@ namespace DetourNavigator
     public:
         NavMeshManager(const Settings& settings);
 
-        bool addObject(const ObjectId id, const btCollisionShape& shape, const btTransform& transform,
+        bool addObject(const ObjectId id, const CollisionShape& shape, const btTransform& transform,
                        const AreaType areaType);
 
-        bool updateObject(const ObjectId id, const btCollisionShape& shape, const btTransform& transform,
+        bool updateObject(const ObjectId id, const CollisionShape& shape, const btTransform& transform,
                           const AreaType areaType);
 
         bool removeObject(const ObjectId id);
diff --git a/components/detournavigator/recastmeshmanager.cpp b/components/detournavigator/recastmeshmanager.cpp
index 151b3161c1..872996d9e6 100644
--- a/components/detournavigator/recastmeshmanager.cpp
+++ b/components/detournavigator/recastmeshmanager.cpp
@@ -35,7 +35,7 @@ namespace DetourNavigator
     {
     }
 
-    bool RecastMeshManager::addObject(const ObjectId id, const btCollisionShape& shape, const btTransform& transform,
+    bool RecastMeshManager::addObject(const ObjectId id, const CollisionShape& shape, const btTransform& transform,
                                       const AreaType areaType)
     {
         const auto object = mObjects.lower_bound(id);
diff --git a/components/detournavigator/recastmeshmanager.hpp b/components/detournavigator/recastmeshmanager.hpp
index 88124c44cf..fb7018d922 100644
--- a/components/detournavigator/recastmeshmanager.hpp
+++ b/components/detournavigator/recastmeshmanager.hpp
@@ -35,7 +35,7 @@ namespace DetourNavigator
     public:
         RecastMeshManager(const Settings& settings, const TileBounds& bounds, std::size_t generation);
 
-        bool addObject(const ObjectId id, const btCollisionShape& shape, const btTransform& transform,
+        bool addObject(const ObjectId id, const CollisionShape& shape, const btTransform& transform,
                        const AreaType areaType);
 
         bool updateObject(const ObjectId id, const btTransform& transform, const AreaType areaType);
diff --git a/components/detournavigator/recastmeshobject.cpp b/components/detournavigator/recastmeshobject.cpp
index 3f35462781..862460b34b 100644
--- a/components/detournavigator/recastmeshobject.cpp
+++ b/components/detournavigator/recastmeshobject.cpp
@@ -22,15 +22,36 @@ namespace DetourNavigator
             }
             return result;
         }
+
+        std::vector<RecastMeshObject> makeChildrenObjects(const osg::ref_ptr<const Resource::BulletShapeInstance>& instance,
+                                                          const btCompoundShape& shape, const AreaType areaType)
+        {
+            std::vector<RecastMeshObject> result;
+            for (int i = 0, num = shape.getNumChildShapes(); i < num; ++i)
+            {
+                const CollisionShape collisionShape {instance, *shape.getChildShape(i)};
+                result.emplace_back(collisionShape, shape.getChildTransform(i), areaType);
+            }
+            return result;
+        }
+
+        std::vector<RecastMeshObject> makeChildrenObjects(const osg::ref_ptr<const Resource::BulletShapeInstance>& instance,
+                                                          const btCollisionShape& shape, const AreaType areaType)
+        {
+            if (shape.isCompound())
+                return makeChildrenObjects(std::move(instance), static_cast<const btCompoundShape&>(shape), areaType);
+            return std::vector<RecastMeshObject>();
+        }
     }
 
-    RecastMeshObject::RecastMeshObject(const btCollisionShape& shape, const btTransform& transform,
+    RecastMeshObject::RecastMeshObject(const CollisionShape& shape, const btTransform& transform,
             const AreaType areaType)
-        : mShape(shape)
+        : mShapeInstance(shape.getShapeInstance())
+        , mShape(shape.getShape())
         , mTransform(transform)
         , mAreaType(areaType)
-        , mLocalScaling(shape.getLocalScaling())
-        , mChildren(makeChildrenObjects(shape, mAreaType))
+        , mLocalScaling(mShape.get().getLocalScaling())
+        , mChildren(makeChildrenObjects(mShapeInstance, mShape.get(), mAreaType))
     {
     }
 
@@ -57,20 +78,4 @@ namespace DetourNavigator
                     || result;
         return result;
     }
-
-    std::vector<RecastMeshObject> makeChildrenObjects(const btCollisionShape& shape, const AreaType areaType)
-    {
-        if (shape.isCompound())
-            return makeChildrenObjects(static_cast<const btCompoundShape&>(shape), areaType);
-        else
-            return std::vector<RecastMeshObject>();
-    }
-
-    std::vector<RecastMeshObject> makeChildrenObjects(const btCompoundShape& shape, const AreaType areaType)
-    {
-        std::vector<RecastMeshObject> result;
-        for (int i = 0, num = shape.getNumChildShapes(); i < num; ++i)
-            result.emplace_back(*shape.getChildShape(i), shape.getChildTransform(i), areaType);
-        return result;
-    }
 }
diff --git a/components/detournavigator/recastmeshobject.hpp b/components/detournavigator/recastmeshobject.hpp
index e659300e68..81199c5bad 100644
--- a/components/detournavigator/recastmeshobject.hpp
+++ b/components/detournavigator/recastmeshobject.hpp
@@ -3,8 +3,12 @@
 
 #include "areatype.hpp"
 
+#include <components/resource/bulletshape.hpp>
+
 #include <LinearMath/btTransform.h>
 
+#include <osg/ref_ptr>
+
 #include <functional>
 #include <vector>
 
@@ -13,10 +17,26 @@ class btCompoundShape;
 
 namespace DetourNavigator
 {
+    class CollisionShape
+    {
+    public:
+        CollisionShape(osg::ref_ptr<const Resource::BulletShapeInstance> instance, const btCollisionShape& shape)
+            : mShapeInstance(std::move(instance))
+            , mShape(shape)
+        {}
+
+        const osg::ref_ptr<const Resource::BulletShapeInstance>& getShapeInstance() const { return mShapeInstance; }
+        const btCollisionShape& getShape() const { return mShape; }
+
+    private:
+        osg::ref_ptr<const Resource::BulletShapeInstance> mShapeInstance;
+        std::reference_wrapper<const btCollisionShape> mShape;
+    };
+
     class RecastMeshObject
     {
         public:
-            RecastMeshObject(const btCollisionShape& shape, const btTransform& transform, const AreaType areaType);
+            RecastMeshObject(const CollisionShape& shape, const btTransform& transform, const AreaType areaType);
 
             bool update(const btTransform& transform, const AreaType areaType);
 
@@ -36,16 +56,13 @@ namespace DetourNavigator
             }
 
         private:
+            osg::ref_ptr<const Resource::BulletShapeInstance> mShapeInstance;
             std::reference_wrapper<const btCollisionShape> mShape;
             btTransform mTransform;
             AreaType mAreaType;
             btVector3 mLocalScaling;
             std::vector<RecastMeshObject> mChildren;
     };
-
-    std::vector<RecastMeshObject> makeChildrenObjects(const btCollisionShape& shape, const AreaType areaType);
-
-    std::vector<RecastMeshObject> makeChildrenObjects(const btCompoundShape& shape, const AreaType areaType);
 }
 
 #endif
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.cpp b/components/detournavigator/tilecachedrecastmeshmanager.cpp
index a37d24399d..61bd973cbf 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -14,14 +14,14 @@ namespace DetourNavigator
         : mSettings(settings)
     {}
 
-    bool TileCachedRecastMeshManager::addObject(const ObjectId id, const btCollisionShape& shape,
+    bool TileCachedRecastMeshManager::addObject(const ObjectId id, const CollisionShape& shape,
                                                 const btTransform& transform, const AreaType areaType)
     {
         std::vector<TilePosition> tilesPositions;
         const auto border = getBorderSize(mSettings);
         {
             auto tiles = mTiles.lock();
-            getTilesPositions(shape, transform, mSettings, [&] (const TilePosition& tilePosition)
+            getTilesPositions(shape.getShape(), transform, mSettings, [&] (const TilePosition& tilePosition)
                 {
                     if (addTile(id, shape, transform, areaType, tilePosition, border, tiles.get()))
                         tilesPositions.push_back(tilePosition);
@@ -218,7 +218,7 @@ namespace DetourNavigator
         it->second.reportNavMeshChange(recastMeshVersion, navMeshVersion);
     }
 
-    bool TileCachedRecastMeshManager::addTile(const ObjectId id, const btCollisionShape& shape,
+    bool TileCachedRecastMeshManager::addTile(const ObjectId id, const CollisionShape& shape,
         const btTransform& transform, const AreaType areaType, const TilePosition& tilePosition, float border,
         std::map<TilePosition, CachedRecastMeshManager>& tiles)
     {
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.hpp b/components/detournavigator/tilecachedrecastmeshmanager.hpp
index f3292cbf9b..38d004ccca 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.hpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.hpp
@@ -22,11 +22,11 @@ namespace DetourNavigator
     public:
         TileCachedRecastMeshManager(const Settings& settings);
 
-        bool addObject(const ObjectId id, const btCollisionShape& shape, const btTransform& transform,
+        bool addObject(const ObjectId id, const CollisionShape& shape, const btTransform& transform,
                        const AreaType areaType);
 
         template <class OnChangedTile>
-        bool updateObject(const ObjectId id, const btCollisionShape& shape, const btTransform& transform,
+        bool updateObject(const ObjectId id, const CollisionShape& shape, const btTransform& transform,
             const AreaType areaType, OnChangedTile&& onChangedTile)
         {
             const auto object = mObjectsTilesPositions.find(id);
@@ -56,7 +56,7 @@ namespace DetourNavigator
                         changed = true;
                     }
                 };
-                getTilesPositions(shape, transform, mSettings, onTilePosition);
+                getTilesPositions(shape.getShape(), transform, mSettings, onTilePosition);
                 std::sort(newTiles.begin(), newTiles.end());
                 for (const auto& tile : currentTiles)
                 {
@@ -110,7 +110,7 @@ namespace DetourNavigator
         std::size_t mRevision = 0;
         std::size_t mTilesGeneration = 0;
 
-        bool addTile(const ObjectId id, const btCollisionShape& shape, const btTransform& transform,
+        bool addTile(const ObjectId id, const CollisionShape& shape, const btTransform& transform,
                      const AreaType areaType, const TilePosition& tilePosition, float border,
                      std::map<TilePosition, CachedRecastMeshManager>& tiles);
 
diff --git a/components/resource/bulletshape.cpp b/components/resource/bulletshape.cpp
index c6f6369dba..ce896610a9 100644
--- a/components/resource/bulletshape.cpp
+++ b/components/resource/bulletshape.cpp
@@ -6,6 +6,7 @@
 #include <BulletCollision/CollisionShapes/btBoxShape.h>
 #include <BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h>
 #include <BulletCollision/CollisionShapes/btCompoundShape.h>
+#include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
 
 namespace Resource
 {
@@ -75,6 +76,9 @@ btCollisionShape* BulletShape::duplicateCollisionShape(const btCollisionShape *s
         return new btBoxShape(*boxshape);
     }
 
+    if (shape->getShapeType() == TERRAIN_SHAPE_PROXYTYPE)
+        return new btHeightfieldTerrainShape(static_cast<const btHeightfieldTerrainShape&>(*shape));
+
     throw std::logic_error(std::string("Unhandled Bullet shape duplication: ")+shape->getName());
 }
 

From 050b7d31aac95b97a69fa9b122e75297327cbfba Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 1 Aug 2021 02:43:36 +0200
Subject: [PATCH 1129/2859] Create RecastMesh outside critical section

To not lock main thread when it tries to update objects.
---
 .../cachedrecastmeshmanager.cpp               | 23 +++++----
 .../cachedrecastmeshmanager.hpp               |  4 +-
 .../detournavigator/recastmeshmanager.cpp     | 32 +++++++++---
 .../detournavigator/recastmeshmanager.hpp     |  6 ++-
 .../tilecachedrecastmeshmanager.cpp           | 50 +++++++++++--------
 .../tilecachedrecastmeshmanager.hpp           | 13 ++---
 6 files changed, 79 insertions(+), 49 deletions(-)

diff --git a/components/detournavigator/cachedrecastmeshmanager.cpp b/components/detournavigator/cachedrecastmeshmanager.cpp
index 36f5e9e03a..e7e5886589 100644
--- a/components/detournavigator/cachedrecastmeshmanager.cpp
+++ b/components/detournavigator/cachedrecastmeshmanager.cpp
@@ -13,7 +13,7 @@ namespace DetourNavigator
     {
         if (!mImpl.addObject(id, shape, transform, areaType))
             return false;
-        mCached.reset();
+        mCached.lock()->reset();
         return true;
     }
 
@@ -21,7 +21,7 @@ namespace DetourNavigator
     {
         if (!mImpl.updateObject(id, transform, areaType))
             return false;
-        mCached.reset();
+        mCached.lock()->reset();
         return true;
     }
 
@@ -29,7 +29,7 @@ namespace DetourNavigator
     {
         const auto object = mImpl.removeObject(id);
         if (object)
-            mCached.reset();
+            mCached.lock()->reset();
         return object;
     }
 
@@ -38,7 +38,7 @@ namespace DetourNavigator
     {
         if (!mImpl.addWater(cellPosition, cellSize, shift))
             return false;
-        mCached.reset();
+        mCached.lock()->reset();
         return true;
     }
 
@@ -46,7 +46,7 @@ namespace DetourNavigator
     {
         const auto water = mImpl.removeWater(cellPosition);
         if (water)
-            mCached.reset();
+            mCached.lock()->reset();
         return water;
     }
 
@@ -55,7 +55,7 @@ namespace DetourNavigator
     {
         if (!mImpl.addHeightfield(cellPosition, cellSize, shift, shape))
             return false;
-        mCached.reset();
+        mCached.lock()->reset();
         return true;
     }
 
@@ -63,15 +63,18 @@ namespace DetourNavigator
     {
         const auto cell = mImpl.removeHeightfield(cellPosition);
         if (cell)
-            mCached.reset();
+            mCached.lock()->reset();
         return cell;
     }
 
     std::shared_ptr<RecastMesh> CachedRecastMeshManager::getMesh()
     {
-        if (!mCached)
-            mCached = mImpl.getMesh();
-        return mCached;
+        std::shared_ptr<RecastMesh> cached = *mCached.lock();
+        if (cached != nullptr)
+            return cached;
+        cached = mImpl.getMesh();
+        *mCached.lock() = cached;
+        return cached;
     }
 
     bool CachedRecastMeshManager::isEmpty() const
diff --git a/components/detournavigator/cachedrecastmeshmanager.hpp b/components/detournavigator/cachedrecastmeshmanager.hpp
index 1af249404b..b506f807fa 100644
--- a/components/detournavigator/cachedrecastmeshmanager.hpp
+++ b/components/detournavigator/cachedrecastmeshmanager.hpp
@@ -5,6 +5,8 @@
 #include "version.hpp"
 #include "heightfieldshape.hpp"
 
+#include <components/misc/guarded.hpp>
+
 namespace DetourNavigator
 {
     class CachedRecastMeshManager
@@ -38,7 +40,7 @@ namespace DetourNavigator
 
     private:
         RecastMeshManager mImpl;
-        std::shared_ptr<RecastMesh> mCached;
+        Misc::ScopeGuarded<std::shared_ptr<RecastMesh>> mCached;
     };
 }
 
diff --git a/components/detournavigator/recastmeshmanager.cpp b/components/detournavigator/recastmeshmanager.cpp
index 872996d9e6..5bbbbe4dea 100644
--- a/components/detournavigator/recastmeshmanager.cpp
+++ b/components/detournavigator/recastmeshmanager.cpp
@@ -38,6 +38,7 @@ namespace DetourNavigator
     bool RecastMeshManager::addObject(const ObjectId id, const CollisionShape& shape, const btTransform& transform,
                                       const AreaType areaType)
     {
+        const std::lock_guard lock(mMutex);
         const auto object = mObjects.lower_bound(id);
         if (object != mObjects.end() && object->first == id)
             return false;
@@ -49,6 +50,7 @@ namespace DetourNavigator
 
     bool RecastMeshManager::updateObject(const ObjectId id, const btTransform& transform, const AreaType areaType)
     {
+        const std::lock_guard lock(mMutex);
         const auto object = mObjects.find(id);
         if (object == mObjects.end())
             return false;
@@ -62,6 +64,7 @@ namespace DetourNavigator
 
     std::optional<RemovedRecastMeshObject> RecastMeshManager::removeObject(const ObjectId id)
     {
+        const std::lock_guard lock(mMutex);
         const auto object = mObjects.find(id);
         if (object == mObjects.end())
             return std::nullopt;
@@ -73,6 +76,7 @@ namespace DetourNavigator
 
     bool RecastMeshManager::addWater(const osg::Vec2i& cellPosition, const int cellSize, const osg::Vec3f& shift)
     {
+        const std::lock_guard lock(mMutex);
         if (!mWater.emplace(cellPosition, Cell {cellSize, shift}).second)
             return false;
         ++mRevision;
@@ -81,6 +85,7 @@ namespace DetourNavigator
 
     std::optional<Cell> RecastMeshManager::removeWater(const osg::Vec2i& cellPosition)
     {
+        const std::lock_guard lock(mMutex);
         const auto water = mWater.find(cellPosition);
         if (water == mWater.end())
             return std::nullopt;
@@ -93,6 +98,7 @@ namespace DetourNavigator
     bool RecastMeshManager::addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const osg::Vec3f& shift,
         const HeightfieldShape& shape)
     {
+        const std::lock_guard lock(mMutex);
         if (!mHeightfields.emplace(cellPosition, Heightfield {Cell {cellSize, shift}, shape}).second)
             return false;
         ++mRevision;
@@ -101,6 +107,7 @@ namespace DetourNavigator
 
     std::optional<Cell> RecastMeshManager::removeHeightfield(const osg::Vec2i& cellPosition)
     {
+        const std::lock_guard lock(mMutex);
         const auto it = mHeightfields.find(cellPosition);
         if (it == mHeightfields.end())
             return std::nullopt;
@@ -116,20 +123,27 @@ namespace DetourNavigator
         tileBounds.mMin /= mSettings.mRecastScaleFactor;
         tileBounds.mMax /= mSettings.mRecastScaleFactor;
         RecastMeshBuilder builder(tileBounds);
-        for (const auto& [k, v] : mWater)
-            builder.addWater(v.mSize, v.mShift);
-        for (const auto& [k, object] : mObjects)
+        std::vector<RecastMeshObject> objects;
+        std::size_t revision;
         {
-            const RecastMeshObject& v = object.getImpl();
-            builder.addObject(v.getShape(), v.getTransform(), v.getAreaType());
+            const std::lock_guard lock(mMutex);
+            for (const auto& [k, v] : mWater)
+                builder.addWater(v.mSize, v.mShift);
+            for (const auto& [cellPosition, v] : mHeightfields)
+                std::visit(AddHeightfield {v.mCell, builder}, v.mShape);
+            objects.reserve(mObjects.size());
+            for (const auto& [k, object] : mObjects)
+                objects.push_back(object.getImpl());
+            revision = mRevision;
         }
-        for (const auto& [cellPosition, v] : mHeightfields)
-            std::visit(AddHeightfield {v.mCell, builder}, v.mShape);
-        return std::move(builder).create(mGeneration, mRevision);
+        for (const auto& v : objects)
+            builder.addObject(v.getShape(), v.getTransform(), v.getAreaType());
+        return std::move(builder).create(mGeneration, revision);
     }
 
     bool RecastMeshManager::isEmpty() const
     {
+        const std::lock_guard lock(mMutex);
         return mObjects.empty() && mWater.empty() && mHeightfields.empty();
     }
 
@@ -137,6 +151,7 @@ namespace DetourNavigator
     {
         if (recastMeshVersion.mGeneration != mGeneration)
             return;
+        const std::lock_guard lock(mMutex);
         if (mLastNavMeshReport.has_value() && navMeshVersion < mLastNavMeshReport->mNavMeshVersion)
             return;
         mLastNavMeshReport = {recastMeshVersion.mRevision, navMeshVersion};
@@ -147,6 +162,7 @@ namespace DetourNavigator
 
     Version RecastMeshManager::getVersion() const
     {
+        const std::lock_guard lock(mMutex);
         return Version {mGeneration, mRevision};
     }
 }
diff --git a/components/detournavigator/recastmeshmanager.hpp b/components/detournavigator/recastmeshmanager.hpp
index fb7018d922..1cd35ca467 100644
--- a/components/detournavigator/recastmeshmanager.hpp
+++ b/components/detournavigator/recastmeshmanager.hpp
@@ -16,6 +16,7 @@
 #include <memory>
 #include <variant>
 #include <tuple>
+#include <mutex>
 
 class btCollisionShape;
 
@@ -73,9 +74,10 @@ namespace DetourNavigator
         };
 
         const Settings& mSettings;
+        const std::size_t mGeneration;
+        const TileBounds mTileBounds;
+        mutable std::mutex mMutex;
         std::size_t mRevision = 0;
-        std::size_t mGeneration;
-        TileBounds mTileBounds;
         std::map<ObjectId, OscillatingRecastMeshObject> mObjects;
         std::map<osg::Vec2i, Cell> mWater;
         std::map<osg::Vec2i, Heightfield> mHeightfields;
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.cpp b/components/detournavigator/tilecachedrecastmeshmanager.cpp
index 61bd973cbf..2b8c85b8a3 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -69,7 +69,7 @@ namespace DetourNavigator
             const auto tiles = mTiles.lock();
             for (auto& tile : *tiles)
             {
-                if (tile.second.addWater(cellPosition, cellSize, shift))
+                if (tile.second->addWater(cellPosition, cellSize, shift))
                 {
                     tilesPositions.push_back(tile.first);
                     result = true;
@@ -88,9 +88,9 @@ namespace DetourNavigator
                         tileBounds.mMin -= osg::Vec2f(border, border);
                         tileBounds.mMax += osg::Vec2f(border, border);
                         tile = tiles->insert(std::make_pair(tilePosition,
-                                CachedRecastMeshManager(mSettings, tileBounds, mTilesGeneration))).first;
+                                std::make_shared<CachedRecastMeshManager>(mSettings, tileBounds, mTilesGeneration))).first;
                     }
-                    if (tile->second.addWater(cellPosition, cellSize, shift))
+                    if (tile->second->addWater(cellPosition, cellSize, shift))
                     {
                         tilesPositions.push_back(tilePosition);
                         result = true;
@@ -116,8 +116,8 @@ namespace DetourNavigator
             const auto tile = tiles->find(tilePosition);
             if (tile == tiles->end())
                 continue;
-            const auto tileResult = tile->second.removeWater(cellPosition);
-            if (tile->second.isEmpty())
+            const auto tileResult = tile->second->removeWater(cellPosition);
+            if (tile->second->isEmpty())
             {
                 tiles->erase(tile);
                 ++mTilesGeneration;
@@ -149,9 +149,9 @@ namespace DetourNavigator
                     tileBounds.mMin -= osg::Vec2f(border, border);
                     tileBounds.mMax += osg::Vec2f(border, border);
                     tile = tiles->insert(std::make_pair(tilePosition,
-                            CachedRecastMeshManager(mSettings, tileBounds, mTilesGeneration))).first;
+                            std::make_shared<CachedRecastMeshManager>(mSettings, tileBounds, mTilesGeneration))).first;
                 }
-                if (tile->second.addHeightfield(cellPosition, cellSize, shift, shape))
+                if (tile->second->addHeightfield(cellPosition, cellSize, shift, shape))
                 {
                     tilesPositions.push_back(tilePosition);
                     result = true;
@@ -176,8 +176,8 @@ namespace DetourNavigator
             const auto tile = tiles->find(tilePosition);
             if (tile == tiles->end())
                 continue;
-            const auto tileResult = tile->second.removeHeightfield(cellPosition);
-            if (tile->second.isEmpty())
+            const auto tileResult = tile->second->removeHeightfield(cellPosition);
+            if (tile->second->isEmpty())
             {
                 tiles->erase(tile);
                 ++mTilesGeneration;
@@ -192,11 +192,17 @@ namespace DetourNavigator
 
     std::shared_ptr<RecastMesh> TileCachedRecastMeshManager::getMesh(const TilePosition& tilePosition)
     {
-        const auto tiles = mTiles.lock();
-        const auto it = tiles->find(tilePosition);
-        if (it == tiles->end())
+        const auto manager = [&] () -> std::shared_ptr<CachedRecastMeshManager>
+        {
+            const auto tiles = mTiles.lock();
+            const auto it = tiles->find(tilePosition);
+            if (it == tiles->end())
+                return nullptr;
+            return it->second;
+        } ();
+        if (manager == nullptr)
             return nullptr;
-        return it->second.getMesh();
+        return manager->getMesh();
     }
 
     bool TileCachedRecastMeshManager::hasTile(const TilePosition& tilePosition)
@@ -215,12 +221,12 @@ namespace DetourNavigator
         const auto it = tiles->find(tilePosition);
         if (it == tiles->end())
             return;
-        it->second.reportNavMeshChange(recastMeshVersion, navMeshVersion);
+        it->second->reportNavMeshChange(recastMeshVersion, navMeshVersion);
     }
 
     bool TileCachedRecastMeshManager::addTile(const ObjectId id, const CollisionShape& shape,
         const btTransform& transform, const AreaType areaType, const TilePosition& tilePosition, float border,
-        std::map<TilePosition, CachedRecastMeshManager>& tiles)
+        TilesMap& tiles)
     {
         auto tile = tiles.find(tilePosition);
         if (tile == tiles.end())
@@ -229,26 +235,26 @@ namespace DetourNavigator
             tileBounds.mMin -= osg::Vec2f(border, border);
             tileBounds.mMax += osg::Vec2f(border, border);
             tile = tiles.insert(std::make_pair(
-                tilePosition, CachedRecastMeshManager(mSettings, tileBounds, mTilesGeneration))).first;
+                tilePosition, std::make_shared<CachedRecastMeshManager>(mSettings, tileBounds, mTilesGeneration))).first;
         }
-        return tile->second.addObject(id, shape, transform, areaType);
+        return tile->second->addObject(id, shape, transform, areaType);
     }
 
     bool TileCachedRecastMeshManager::updateTile(const ObjectId id, const btTransform& transform,
-        const AreaType areaType, const TilePosition& tilePosition, std::map<TilePosition, CachedRecastMeshManager>& tiles)
+        const AreaType areaType, const TilePosition& tilePosition, TilesMap& tiles)
     {
         const auto tile = tiles.find(tilePosition);
-        return tile != tiles.end() && tile->second.updateObject(id, transform, areaType);
+        return tile != tiles.end() && tile->second->updateObject(id, transform, areaType);
     }
 
     std::optional<RemovedRecastMeshObject> TileCachedRecastMeshManager::removeTile(const ObjectId id,
-        const TilePosition& tilePosition, std::map<TilePosition, CachedRecastMeshManager>& tiles)
+        const TilePosition& tilePosition, TilesMap& tiles)
     {
         const auto tile = tiles.find(tilePosition);
         if (tile == tiles.end())
             return std::optional<RemovedRecastMeshObject>();
-        const auto tileResult = tile->second.removeObject(id);
-        if (tile->second.isEmpty())
+        const auto tileResult = tile->second->removeObject(id);
+        if (tile->second->isEmpty())
         {
             tiles.erase(tile);
             ++mTilesGeneration;
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.hpp b/components/detournavigator/tilecachedrecastmeshmanager.hpp
index 38d004ccca..f8cb5a8b0e 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.hpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.hpp
@@ -94,7 +94,7 @@ namespace DetourNavigator
         void forEachTile(Function&& function)
         {
             for (auto& [tilePosition, recastMeshManager] : *mTiles.lock())
-                function(tilePosition, recastMeshManager);
+                function(tilePosition, *recastMeshManager);
         }
 
         std::size_t getRevision() const;
@@ -102,8 +102,10 @@ namespace DetourNavigator
         void reportNavMeshChange(const TilePosition& tilePosition, Version recastMeshVersion, Version navMeshVersion);
 
     private:
+        using TilesMap = std::map<TilePosition, std::shared_ptr<CachedRecastMeshManager>>;
+
         const Settings& mSettings;
-        Misc::ScopeGuarded<std::map<TilePosition, CachedRecastMeshManager>> mTiles;
+        Misc::ScopeGuarded<TilesMap> mTiles;
         std::unordered_map<ObjectId, std::vector<TilePosition>> mObjectsTilesPositions;
         std::map<osg::Vec2i, std::vector<TilePosition>> mWaterTilesPositions;
         std::map<osg::Vec2i, std::vector<TilePosition>> mHeightfieldTilesPositions;
@@ -111,14 +113,13 @@ namespace DetourNavigator
         std::size_t mTilesGeneration = 0;
 
         bool addTile(const ObjectId id, const CollisionShape& shape, const btTransform& transform,
-                     const AreaType areaType, const TilePosition& tilePosition, float border,
-                     std::map<TilePosition, CachedRecastMeshManager>& tiles);
+                const AreaType areaType, const TilePosition& tilePosition, float border, TilesMap& tiles);
 
         bool updateTile(const ObjectId id, const btTransform& transform, const AreaType areaType,
-                        const TilePosition& tilePosition, std::map<TilePosition, CachedRecastMeshManager>& tiles);
+                const TilePosition& tilePosition, TilesMap& tiles);
 
         std::optional<RemovedRecastMeshObject> removeTile(const ObjectId id, const TilePosition& tilePosition,
-                                                            std::map<TilePosition, CachedRecastMeshManager>& tiles);
+                TilesMap& tiles);
     };
 }
 

From 0f7f5ce140c19df5c813c8c83e33949d37c89d8d Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Tue, 3 Aug 2021 02:40:44 +0300
Subject: [PATCH 1130/2859] Remove Lua command "self:setDirectControl"

---
 apps/openmw/mwbase/luamanager.hpp  |  2 +-
 apps/openmw/mwlua/localscripts.cpp | 17 +++++++++--------
 apps/openmw/mwlua/luabindings.cpp  |  2 +-
 apps/openmw/mwmechanics/actors.cpp |  3 ++-
 files/lua_api/openmw/self.lua      |  9 +--------
 5 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/apps/openmw/mwbase/luamanager.hpp b/apps/openmw/mwbase/luamanager.hpp
index 7f3c50a9cf..cc416c9ab0 100644
--- a/apps/openmw/mwbase/luamanager.hpp
+++ b/apps/openmw/mwbase/luamanager.hpp
@@ -43,7 +43,7 @@ namespace MWBase
         struct ActorControls
         {
             bool mDisableAI = false;
-            bool mControlledFromLua = false;
+            bool mChanged = false;
 
             bool mJump = false;
             bool mRun = false;
diff --git a/apps/openmw/mwlua/localscripts.cpp b/apps/openmw/mwlua/localscripts.cpp
index d9bb5ff26e..8a1b76a8ce 100644
--- a/apps/openmw/mwlua/localscripts.cpp
+++ b/apps/openmw/mwlua/localscripts.cpp
@@ -22,11 +22,15 @@ namespace MWLua
     {
         using ActorControls = MWBase::LuaManager::ActorControls;
         sol::usertype<ActorControls> controls = context.mLua->sol().new_usertype<ActorControls>("ActorControls");
-        controls["movement"] = &ActorControls::mMovement;
-        controls["sideMovement"] = &ActorControls::mSideMovement;
-        controls["turn"] = &ActorControls::mTurn;
-        controls["run"] = &ActorControls::mRun;
-        controls["jump"] = &ActorControls::mJump;
+
+#define CONTROL(TYPE, FIELD) sol::property([](const ActorControls& c) { return c.FIELD; },\
+                                           [](ActorControls& c, const TYPE& v) { c.FIELD = v; c.mChanged = true; })
+        controls["movement"] = CONTROL(float, mMovement);
+        controls["sideMovement"] = CONTROL(float, mSideMovement);
+        controls["turn"] = CONTROL(float, mTurn);
+        controls["run"] = CONTROL(bool, mRun);
+        controls["jump"] = CONTROL(bool, mJump);
+#undef CONTROL
 
         sol::usertype<SelfObject> selfAPI =
             context.mLua->sol().new_usertype<SelfObject>("SelfObject", sol::base_classes, sol::bases<LObject>());
@@ -34,7 +38,6 @@ namespace MWLua
         selfAPI["object"] = sol::readonly_property([](SelfObject& self) -> LObject { return LObject(self); });
         selfAPI["controls"] = sol::readonly_property([](SelfObject& self) { return &self.mControls; });
         selfAPI["isActive"] = [](SelfObject& self) { return &self.mIsActive; };
-        selfAPI["setDirectControl"] = [](SelfObject& self, bool v) { self.mControls.mControlledFromLua = v; };
         selfAPI["enableAI"] = [](SelfObject& self, bool v) { self.mControls.mDisableAI = !v; };
         selfAPI["setEquipment"] = [manager=context.mLuaManager](const SelfObject& obj, sol::table equipment)
         {
@@ -82,8 +85,6 @@ namespace MWLua
     LocalScripts::LocalScripts(LuaUtil::LuaState* lua, const LObject& obj)
         : LuaUtil::ScriptsContainer(lua, "L" + idToString(obj.id())), mData(obj)
     {
-        mData.mControls.mControlledFromLua = false;
-        mData.mControls.mDisableAI = false;
         this->addPackage("openmw.self", sol::make_object(lua->sol(), &mData));
         registerEngineHandlers({&mOnActiveHandlers, &mOnInactiveHandlers, &mOnConsumeHandlers});
     }
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index 48174f55ee..24640c1863 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -31,7 +31,7 @@ namespace MWLua
     {
         auto* lua = context.mLua;
         sol::table api(lua->sol(), sol::create);
-        api["API_REVISION"] = 1;
+        api["API_REVISION"] = 2;
         api["sendGlobalEvent"] = [context](std::string eventName, const sol::object& eventData)
         {
             context.mGlobalEventQueue->push_back({std::move(eventName), LuaUtil::serialize(eventData, context.mSerializer)});
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 21ec5d987b..3669fd9391 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -2095,7 +2095,7 @@ namespace MWMechanics
                         float rotationZ = mov.mRotation[2];
                         bool jump = mov.mPosition[2] == 1;
                         bool runFlag = stats.getMovementFlag(MWMechanics::CreatureStats::Flag_Run);
-                        if (luaControls->mControlledFromLua)
+                        if (luaControls->mChanged)
                         {
                             mov.mPosition[0] = luaControls->mSideMovement;
                             mov.mPosition[1] = luaControls->mMovement;
@@ -2104,6 +2104,7 @@ namespace MWMechanics
                             mov.mRotation[2] = luaControls->mTurn;
                             mov.mSpeedFactor = osg::Vec2(luaControls->mMovement, luaControls->mSideMovement).length();
                             stats.setMovementFlag(MWMechanics::CreatureStats::Flag_Run, luaControls->mRun);
+                            luaControls->mChanged = false;
                         }
                         luaControls->mSideMovement = movement.x();
                         luaControls->mMovement = movement.y();
diff --git a/files/lua_api/openmw/self.lua b/files/lua_api/openmw/self.lua
index b65b20bab2..98f1071cf6 100644
--- a/files/lua_api/openmw/self.lua
+++ b/files/lua_api/openmw/self.lua
@@ -26,8 +26,7 @@
 -- @field [parent=#self] #ActorControls controls
 
 -------------------------------------------------------------------------------
--- Allows to view and/or modify controls of an actor. Makes an effect only if
--- `setDirectControl(true)` was called. All fields are mutable.
+-- Allows to view and/or modify controls of an actor. All fields are mutable.
 -- @type ActorControls
 -- @field [parent=#ActorControls] #number movement +1 - move forward, -1 - move backward
 -- @field [parent=#ActorControls] #number sideMovement +1 - move right, -1 - move left
@@ -35,12 +34,6 @@
 -- @field [parent=#ActorControls] #boolean run true - run, false - walk
 -- @field [parent=#ActorControls] #boolean jump If true - initiate a jump
 
--------------------------------------------------------------------------------
--- Enables or disables direct movement control (disabled by default).
--- @function [parent=#self] setDirectControl
--- @param self
--- @param #boolean control
-
 -------------------------------------------------------------------------------
 -- Enables or disables standart AI (enabled by default).
 -- @function [parent=#self] enableAI

From 3ce5e9e680ee12ab2fe4e7ff6fb779d2008c571f Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Tue, 3 Aug 2021 14:46:53 +0300
Subject: [PATCH 1131/2859] Improve error messages in
 components/lua/serialization.cpp

---
 .../lua/test_serialization.cpp                |  4 ++--
 components/lua/serialization.cpp              | 20 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/apps/openmw_test_suite/lua/test_serialization.cpp b/apps/openmw_test_suite/lua/test_serialization.cpp
index f8c6960c51..1983daa158 100644
--- a/apps/openmw_test_suite/lua/test_serialization.cpp
+++ b/apps/openmw_test_suite/lua/test_serialization.cpp
@@ -193,9 +193,9 @@ namespace
         table["y"] = TestStruct2{4, 3};
         TestSerializer serializer;
 
-        EXPECT_ERROR(LuaUtil::serialize(table), "Unknown userdata");
+        EXPECT_ERROR(LuaUtil::serialize(table), "Value is not serializable.");
         std::string serialized = LuaUtil::serialize(table, &serializer);
-        EXPECT_ERROR(LuaUtil::deserialize(lua, serialized), "Unknown type:");
+        EXPECT_ERROR(LuaUtil::deserialize(lua, serialized), "Unknown type in serialized data:");
         sol::table res = LuaUtil::deserialize(lua, serialized, &serializer);
 
         TestStruct1 rx = res.get<TestStruct1>("x");
diff --git a/components/lua/serialization.cpp b/components/lua/serialization.cpp
index 53b6fe3b92..2e13cfe29f 100644
--- a/components/lua/serialization.cpp
+++ b/components/lua/serialization.cpp
@@ -43,7 +43,7 @@ namespace LuaUtil
     static T getValue(std::string_view& binaryData)
     {
         if (binaryData.size() < sizeof(T))
-            throw std::runtime_error("Unexpected end");
+            throw std::runtime_error("Unexpected end of serialized data.");
         T v;
         std::memcpy(&v, binaryData.data(), sizeof(T));
         binaryData = binaryData.substr(sizeof(T));
@@ -107,15 +107,15 @@ namespace LuaUtil
         if (customSerializer && customSerializer->serialize(out, data))
             return;
         else
-            throw std::runtime_error("Unknown userdata");
+            throw std::runtime_error("Value is not serializable.");
     }
 
     static void serialize(BinaryData& out, const sol::object& obj, const UserdataSerializer* customSerializer, int recursionCounter)
     {
         if (obj.get_type() == sol::type::lightuserdata)
-            throw std::runtime_error("light userdata is not allowed to be serialized");
+            throw std::runtime_error("Light userdata is not allowed to be serialized.");
         if (obj.is<sol::function>())
-            throw std::runtime_error("functions are not allowed to be serialized");
+            throw std::runtime_error("Functions are not allowed to be serialized.");
         else if (obj.is<sol::userdata>())
             serializeUserdata(out, obj, customSerializer);
         else if (obj.is<sol::lua_table>())
@@ -144,13 +144,13 @@ namespace LuaUtil
             appendType(out, SerializedType::BOOLEAN);
             out.push_back(v);
         } else
-            throw std::runtime_error("Unknown lua type");
+            throw std::runtime_error("Unknown Lua type.");
     }
 
     static void deserializeImpl(sol::state& lua, std::string_view& binaryData, const UserdataSerializer* customSerializer)
     {
         if (binaryData.empty())
-            throw std::runtime_error("Unexpected end");
+            throw std::runtime_error("Unexpected end of serialized data.");
         unsigned char type = binaryData[0];
         binaryData = binaryData.substr(1);
         if (type & (CUSTOM_COMPACT_FLAG | CUSTOM_FULL_FLAG))
@@ -170,7 +170,7 @@ namespace LuaUtil
             std::string_view data = binaryData.substr(typeNameSize, dataSize);
             binaryData = binaryData.substr(typeNameSize + dataSize);
             if (!customSerializer || !customSerializer->deserialize(typeName, data, lua))
-                throw std::runtime_error("Unknown type: " + std::string(typeName));
+                throw std::runtime_error("Unknown type in serialized data: " + std::string(typeName));
             return;
         }
         if (type & SHORT_STRING_FLAG)
@@ -205,12 +205,12 @@ namespace LuaUtil
                     lua_settable(lua, -3);
                 }
                 if (binaryData.empty())
-                    throw std::runtime_error("Unexpected end");
+                    throw std::runtime_error("Unexpected end of serialized data.");
                 binaryData = binaryData.substr(1);
                 return;
             }
             case SerializedType::TABLE_END:
-                throw std::runtime_error("Unexpected table end");
+                throw std::runtime_error("Unexpected end of table during deserialization.");
             case SerializedType::VEC2:
             {
                 float x = getValue<float>(binaryData);
@@ -227,7 +227,7 @@ namespace LuaUtil
                 return;
             }
         }
-        throw std::runtime_error("Unknown type: " + std::to_string(type));
+        throw std::runtime_error("Unknown type in serialized data: " + std::to_string(type));
     }
 
     BinaryData serialize(const sol::object& obj, const UserdataSerializer* customSerializer)

From 99e691fbe36cdd7922cab8d3a79057dc3f65f278 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Wed, 4 Aug 2021 06:47:14 +1000
Subject: [PATCH 1132/2859] Avoid the inclusion of <charconv> header due to
 Ubuntu Bionic (18.04) which as gcc version less than 8.1

Partially reverts commit fd67ebde2549bf5eb626c8c4ea76536c1f003a56
---
 apps/opencs/model/world/refcollection.cpp | 17 +++++------------
 apps/opencs/model/world/refcollection.hpp |  2 +-
 apps/opencs/view/doc/loader.cpp           |  2 +-
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/apps/opencs/model/world/refcollection.cpp b/apps/opencs/model/world/refcollection.cpp
index 1f6fc76c4d..f47a79accd 100644
--- a/apps/opencs/model/world/refcollection.cpp
+++ b/apps/opencs/model/world/refcollection.cpp
@@ -1,7 +1,5 @@
 #include "refcollection.hpp"
 
-#include <charconv>
-
 #include <components/esm/loadcell.hpp>
 
 #include "ref.hpp"
@@ -183,19 +181,14 @@ std::string CSMWorld::RefCollection::getNewId()
     return "ref#" + std::to_string(mNextId++);
 }
 
-unsigned int CSMWorld::RefCollection::extractIdNum(std::string_view id) const
+unsigned int CSMWorld::RefCollection::extractIdNum (const std::string& id) const
 {
-    const auto separator = id.find_last_of('#');
-
-    if (separator == std::string_view::npos)
-        throw std::runtime_error("invalid ref ID: " + std::string(id));
+    std::string::size_type separator = id.find_last_of('#');
 
-    const std::string_view number = id.substr(separator + 1);
-    unsigned int result;
-    if (std::from_chars(number.data(), number.data() + number.size(), result).ec != std::errc())
-        throw std::runtime_error("invalid ref ID number: " + std::string(number));
+    if (separator == std::string::npos)
+        throw std::runtime_error("invalid ref ID: " + id);
 
-    return result;
+    return static_cast<unsigned int>(std::stoi(id.substr(separator+1)));
 }
 
 int CSMWorld::RefCollection::getIntIndex (unsigned int id) const
diff --git a/apps/opencs/model/world/refcollection.hpp b/apps/opencs/model/world/refcollection.hpp
index e0e88d721f..1bdfda3925 100644
--- a/apps/opencs/model/world/refcollection.hpp
+++ b/apps/opencs/model/world/refcollection.hpp
@@ -29,7 +29,7 @@ namespace CSMWorld
 
             int mNextId;
 
-            unsigned int extractIdNum(std::string_view id) const;
+            unsigned int extractIdNum(const std::string& id) const;
 
             int getIntIndex (unsigned int id) const;
 
diff --git a/apps/opencs/view/doc/loader.cpp b/apps/opencs/view/doc/loader.cpp
index 7929b13f6c..2420b87c6c 100644
--- a/apps/opencs/view/doc/loader.cpp
+++ b/apps/opencs/view/doc/loader.cpp
@@ -17,7 +17,7 @@ void CSVDoc::LoadingDocument::closeEvent (QCloseEvent *event)
 }
 
 CSVDoc::LoadingDocument::LoadingDocument (CSMDoc::Document *document)
-: mDocument (document), mAborted (false), mMessages (nullptr), mRecordsLabel (0), mTotalRecordsLabel (0)
+: mDocument (document), mTotalRecordsLabel (0), mRecordsLabel (0), mAborted (false), mMessages (nullptr), mRecords(0)
 {
     setWindowTitle (QString::fromUtf8((std::string("Opening ") + document->getSavePath().filename().string()).c_str()));
 

From bf06898a79a5460c571b1d6f5b2b9cb7c7f52052 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Wed, 4 Aug 2021 08:23:22 +1000
Subject: [PATCH 1133/2859] Retain the use of std::string_view in the function
 signature.

---
 apps/opencs/model/world/refcollection.cpp | 6 +++---
 apps/opencs/model/world/refcollection.hpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/opencs/model/world/refcollection.cpp b/apps/opencs/model/world/refcollection.cpp
index f47a79accd..4782bde6b9 100644
--- a/apps/opencs/model/world/refcollection.cpp
+++ b/apps/opencs/model/world/refcollection.cpp
@@ -181,14 +181,14 @@ std::string CSMWorld::RefCollection::getNewId()
     return "ref#" + std::to_string(mNextId++);
 }
 
-unsigned int CSMWorld::RefCollection::extractIdNum (const std::string& id) const
+unsigned int CSMWorld::RefCollection::extractIdNum(std::string_view id) const
 {
     std::string::size_type separator = id.find_last_of('#');
 
     if (separator == std::string::npos)
-        throw std::runtime_error("invalid ref ID: " + id);
+        throw std::runtime_error("invalid ref ID: " + std::string(id));
 
-    return static_cast<unsigned int>(std::stoi(id.substr(separator+1)));
+    return static_cast<unsigned int>(std::stoi(std::string(id.substr(separator+1))));
 }
 
 int CSMWorld::RefCollection::getIntIndex (unsigned int id) const
diff --git a/apps/opencs/model/world/refcollection.hpp b/apps/opencs/model/world/refcollection.hpp
index 1bdfda3925..e0e88d721f 100644
--- a/apps/opencs/model/world/refcollection.hpp
+++ b/apps/opencs/model/world/refcollection.hpp
@@ -29,7 +29,7 @@ namespace CSMWorld
 
             int mNextId;
 
-            unsigned int extractIdNum(const std::string& id) const;
+            unsigned int extractIdNum(std::string_view id) const;
 
             int getIntIndex (unsigned int id) const;
 

From fa18f049afcfd98b4281d4c323b742ede0d8436e Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Tue, 3 Aug 2021 23:02:41 +0000
Subject: [PATCH 1134/2859] Add #5788 to changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90fda783a2..bcdf269464 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
     Bug #5453: Magic effect VFX are offset for creatures
     Bug #5483: AutoCalc flag is not used to calculate spells cost
     Bug #5755: Active grid object paging - disappearing textures
+    Bug #5788: Texture editing parses the selected indexes wrongly
     Bug #5842: GetDisposition adds temporary disposition change from different actors
     Bug #6037: Morrowind Content Language Cannot be Set to English in OpenMW Launcher
     Bug #6051: NaN water height in ESM file is not handled gracefully

From 9b7e14ec00a82f3887294df22521aaed00ebc743 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Tue, 3 Aug 2021 23:08:57 +0000
Subject: [PATCH 1135/2859] Merge branch 'OpenCS-moved-reference' into 'master'

OpenCS - Fix moved reference - Issues #3514 and #4752

See merge request OpenMW/openmw!1051

(cherry picked from commit 2bee171c7990522da33c2667f7d079fa35f4ede0)

36c30f7f Fix for Issue #3514 where moving a reference to another cell is not handled properly.
40327681 Update the changelog.
---
 CHANGELOG.md                                  |  2 +
 apps/opencs/model/doc/savingstages.cpp        |  3 +-
 apps/opencs/model/world/commanddispatcher.cpp | 69 +++++++++++++------
 components/esm/loadcell.cpp                   |  2 +-
 components/esm/loadcell.hpp                   |  2 +-
 5 files changed, 54 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bcdf269464..f79eca3e5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,12 @@
 0.48.0
 ------
 
+    Bug #3514: Editing a reference's position after loading an esp file makes the reference disappear
     Bug #3737: Scripts from The Underground 2 .esp do not play (all patched versions)
     Bug #3846: Strings starting with "-" fail to compile if not enclosed in quotes
     Bug #3905: Great House Dagoth issues
     Bug #4203: Resurrecting an actor should close the loot GUI
+    Bug #4752: UpdateCellCommand doesn't undo properly
     Bug #5100: Persuasion doesn't always clamp the resulting disposition
     Bug #5120: Scripted object spawning updates physics system
     Bug #5379: Wandering NPCs falling through cantons
diff --git a/apps/opencs/model/doc/savingstages.cpp b/apps/opencs/model/doc/savingstages.cpp
index a410d34b2a..9da2c2c144 100644
--- a/apps/opencs/model/doc/savingstages.cpp
+++ b/apps/opencs/model/doc/savingstages.cpp
@@ -285,7 +285,8 @@ void CSMDoc::WriteCellCollectionStage::writeReferences (const std::deque<int>& r
             {
                 refRecord.mRefNum.mIndex = newRefNum++;
             }
-            else if ((refRecord.mOriginalCell.empty() ? refRecord.mCell : refRecord.mOriginalCell)
+
+            if ((refRecord.mOriginalCell.empty() ? refRecord.mCell : refRecord.mOriginalCell)
                     != stream.str() && !interior)
             {
                 // An empty mOriginalCell is meant to indicate that it is the same as
diff --git a/apps/opencs/model/world/commanddispatcher.cpp b/apps/opencs/model/world/commanddispatcher.cpp
index 36b3ba2e00..b517fed0fb 100644
--- a/apps/opencs/model/world/commanddispatcher.cpp
+++ b/apps/opencs/model/world/commanddispatcher.cpp
@@ -139,13 +139,28 @@ void CSMWorld::CommandDispatcher::executeModify (QAbstractItemModel *model, cons
     if (mLocked)
         return;
 
-    std::unique_ptr<CSMWorld::UpdateCellCommand> modifyCell;
+    std::unique_ptr<CSMWorld::CloneCommand> clonedData;
+    std::unique_ptr<CSMWorld::DeleteCommand> deleteData;
+
+    std::string newId;
 
-    std::unique_ptr<CSMWorld::ModifyCommand> modifyDataRefNum;
+    std::unique_ptr<CSMWorld::ModifyCommand> modifyData;
+    std::unique_ptr<CSMWorld::UpdateCellCommand> modifyCell;
 
     int columnId = model->data (index, ColumnBase::Role_ColumnId).toInt();
 
-    if (columnId==Columns::ColumnId_PositionXPos || columnId==Columns::ColumnId_PositionYPos)
+    int stateColumn = dynamic_cast<CSMWorld::IdTable&>(*model).findColumnIndex(Columns::ColumnId_Modification);
+
+    CSMWorld::IdTable& table = dynamic_cast<CSMWorld::IdTable&>(*model); // for getId()
+    QModelIndex stateIndex = table.getModelIndex(table.getId(index.row()), stateColumn);
+    RecordBase::State state = static_cast<RecordBase::State> (model->data(stateIndex).toInt());
+
+    // This is not guaranteed to be the same as \a model, since a proxy could be used.
+    IdTable& model2 = dynamic_cast<IdTable&> (*mDocument.getData().getTableModel(mId));
+
+    // DeleteCommand triggers a signal to the whole row from IdTable::setData(), so ignore the second call
+    if (state != RecordBase::State_Deleted &&
+        (columnId==Columns::ColumnId_PositionXPos || columnId==Columns::ColumnId_PositionYPos))
     {
         const float oldPosition = model->data (index).toFloat();
 
@@ -157,12 +172,9 @@ void CSMWorld::CommandDispatcher::executeModify (QAbstractItemModel *model, cons
 
             int row = proxy ? proxy->mapToSource (index).row() : index.row();
 
-            // This is not guaranteed to be the same as \a model, since a proxy could be used.
-            IdTable& model2 = dynamic_cast<IdTable&> (*mDocument.getData().getTableModel (mId));
-
             int cellColumn = model2.searchColumnIndex (Columns::ColumnId_Cell);
 
-            if (cellColumn!=-1)
+            if (cellColumn != -1)
             {
                 QModelIndex cellIndex = model2.index (row, cellColumn);
 
@@ -170,31 +182,46 @@ void CSMWorld::CommandDispatcher::executeModify (QAbstractItemModel *model, cons
 
                 if (cellId.find ('#')!=std::string::npos)
                 {
-                    // Need to recalculate the cell and (if necessary) clear the instance's refNum
-                    modifyCell.reset (new UpdateCellCommand (model2, row));
+                    RefCollection& collection = mDocument.getData().getReferences();
+                    newId = collection.getNewId();
 
-                    // Not sure which model this should be applied to
-                    int refNumColumn = model2.searchColumnIndex (Columns::ColumnId_RefNum);
+                    clonedData.reset(new CloneCommand(table,
+                                table.getId(row),
+                                newId,
+                                CSMWorld::UniversalId::Type_Reference));
 
-                    if (refNumColumn!=-1)
-                        modifyDataRefNum.reset (new ModifyCommand(*model, model->index(row, refNumColumn), 0));
+                    deleteData.reset(new DeleteCommand(table,
+                                table.getId(row),
+                                CSMWorld::UniversalId::Type_Reference));
                 }
             }
         }
     }
 
-    std::unique_ptr<CSMWorld::ModifyCommand> modifyData (
-        new CSMWorld::ModifyCommand (*model, index, new_));
+    if (!clonedData.get())
+    {
+        // DeleteCommand will trigger executeModify after setting the state to State_Deleted
+        // from CommandDelegate::setModelDataImp() - ignore
+        if (state != RecordBase::State_Deleted)
+            modifyData.reset(new CSMWorld::ModifyCommand(*model, index, new_));
+    }
 
-    if (modifyCell.get())
+    if (clonedData.get())
     {
         CommandMacro macro (mDocument.getUndoStack());
-        macro.push (modifyData.release());
-        macro.push (modifyCell.release());
-        if (modifyDataRefNum.get())
-            macro.push (modifyDataRefNum.release());
+        macro.push(clonedData.release());
+        macro.push(deleteData.release());
+
+        // cannot do these earlier because newIndex is not available until CloneCommand is executed
+        QModelIndex newIndex = model2.getModelIndex (newId, index.column());
+        modifyData.reset (new CSMWorld::ModifyCommand (*model, newIndex, new_));
+        macro.push(modifyData.release());
+
+        // once the data is updated update the cell location
+        modifyCell.reset(new UpdateCellCommand(model2, newIndex.row()));
+        macro.push(modifyCell.release());
     }
-    else
+    else if (!clonedData.get() && modifyData.get())
         mDocument.getUndoStack().push (modifyData.release());
 }
 
diff --git a/components/esm/loadcell.cpp b/components/esm/loadcell.cpp
index f84373fb9d..d2cb23146f 100644
--- a/components/esm/loadcell.cpp
+++ b/components/esm/loadcell.cpp
@@ -311,7 +311,7 @@ namespace ESM
         mWater = 0;
         mWaterInt = false;
         mMapColor = 0;
-        mRefNumCounter = -1;
+        mRefNumCounter = 0;
 
         mData.mFlags = 0;
         mData.mX = 0;
diff --git a/components/esm/loadcell.hpp b/components/esm/loadcell.hpp
index 7770f719e3..23f3d38cc8 100644
--- a/components/esm/loadcell.hpp
+++ b/components/esm/loadcell.hpp
@@ -94,7 +94,7 @@ struct Cell
            mWater(0),
            mWaterInt(false),
            mMapColor(0),
-           mRefNumCounter(-1)
+           mRefNumCounter(0)
   {}
 
   // Interior cells are indexed by this (it's the 'id'), for exterior

From 8aee84c46ea68ebb2a66d959decab54be53818a5 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Wed, 4 Aug 2021 09:06:04 +1000
Subject: [PATCH 1136/2859] Disallow entry of strings longer than the lengths
 allowed by the file format.

It is possible to allow longer strings but that will require an extension in the omwaddon format as well as changes to the reader to handle that extension.  Such changes should be a separate MR.

(applied the patch in https://gitlab.com/OpenMW/openmw/-/issues/3066)
---
 CHANGELOG.md                                  |  1 +
 apps/opencs/model/world/columnbase.cpp        |  3 ++-
 apps/opencs/model/world/columnbase.hpp        |  1 +
 apps/opencs/model/world/columnimp.hpp         |  3 ++-
 apps/opencs/model/world/data.cpp              |  4 +--
 apps/opencs/model/world/refidcollection.cpp   |  9 ++++---
 apps/opencs/view/world/cellcreator.cpp        |  7 +++++
 apps/opencs/view/world/genericcreator.cpp     |  5 ++++
 apps/opencs/view/world/genericcreator.hpp     |  2 ++
 .../view/world/idcompletiondelegate.cpp       | 17 ++++++++++++
 .../view/world/referenceablecreator.cpp       | 26 +++++++++++++++++++
 .../view/world/referenceablecreator.hpp       |  3 +++
 apps/opencs/view/world/util.cpp               |  8 ++++++
 13 files changed, 82 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90fda783a2..42a50a4ce7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1942,6 +1942,7 @@
     Bug #2025: Missing mouse-over text for non affordable items
     Bug #2028: [MOD: Tamriel Rebuilt] Crashing when trying to enter interior cell "Ruinous Keep, Great Hall"
     Bug #2029: Ienith Brothers Thiev's Guild quest journal entry not adding
+    Bug #3066: Editor doesn't check if IDs and other strings are longer than their hardcoded field length
     Feature #471: Editor: Special case implementation for top-level window with single sub-window
     Feature #472: Editor: Sub-Window re-use settings
     Feature #704: Font colors import from fallback settings
diff --git a/apps/opencs/model/world/columnbase.cpp b/apps/opencs/model/world/columnbase.cpp
index cf333c1b1a..6f7bb12b3c 100644
--- a/apps/opencs/model/world/columnbase.cpp
+++ b/apps/opencs/model/world/columnbase.cpp
@@ -104,7 +104,8 @@ bool CSMWorld::ColumnBase::isId (Display display)
 bool CSMWorld::ColumnBase::isText (Display display)
 {
     return display==Display_String || display==Display_LongString ||
-        display==Display_String32 || display==Display_LongString256;
+        display==Display_String32 || display==Display_String64 ||
+        display==Display_LongString256;
 }
 
 bool CSMWorld::ColumnBase::isScript (Display display)
diff --git a/apps/opencs/model/world/columnbase.hpp b/apps/opencs/model/world/columnbase.hpp
index 6dc58bd634..b7c0d8a248 100644
--- a/apps/opencs/model/world/columnbase.hpp
+++ b/apps/opencs/model/world/columnbase.hpp
@@ -135,6 +135,7 @@ namespace CSMWorld
             Display_InfoCondVar,
             Display_InfoCondComp,
             Display_String32,
+            Display_String64,
             Display_LongString256,
             Display_BookType,
             Display_BloodType,
diff --git a/apps/opencs/model/world/columnimp.hpp b/apps/opencs/model/world/columnimp.hpp
index 17518937c2..e0148d6cc6 100644
--- a/apps/opencs/model/world/columnimp.hpp
+++ b/apps/opencs/model/world/columnimp.hpp
@@ -334,7 +334,8 @@ namespace CSMWorld
     template<typename ESXRecordT>
     struct NameColumn : public Column<ESXRecordT>
     {
-        NameColumn() : Column<ESXRecordT> (Columns::ColumnId_Name, ColumnBase::Display_String) {}
+        NameColumn(ColumnBase::Display display = ColumnBase::Display_String)
+        : Column<ESXRecordT> (Columns::ColumnId_Name, display) {}
 
         QVariant get (const Record<ESXRecordT>& record) const override
         {
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 192602290d..01bd858c62 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -130,7 +130,7 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding, bool fsStrict, const Files::Pat
     mFactions.addColumn (new StringIdColumn<ESM::Faction>);
     mFactions.addColumn (new RecordStateColumn<ESM::Faction>);
     mFactions.addColumn (new FixedRecordTypeColumn<ESM::Faction> (UniversalId::Type_Faction));
-    mFactions.addColumn (new NameColumn<ESM::Faction>);
+    mFactions.addColumn (new NameColumn<ESM::Faction>(ColumnBase::Display_String32));
     mFactions.addColumn (new AttributesColumn<ESM::Faction> (0));
     mFactions.addColumn (new AttributesColumn<ESM::Faction> (1));
     mFactions.addColumn (new HiddenColumn<ESM::Faction>);
@@ -339,7 +339,7 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding, bool fsStrict, const Files::Pat
     mCells.addColumn (new StringIdColumn<Cell>);
     mCells.addColumn (new RecordStateColumn<Cell>);
     mCells.addColumn (new FixedRecordTypeColumn<Cell> (UniversalId::Type_Cell));
-    mCells.addColumn (new NameColumn<Cell>);
+    mCells.addColumn (new NameColumn<Cell>(ColumnBase::Display_String64));
     mCells.addColumn (new FlagColumn<Cell> (Columns::ColumnId_SleepForbidden, ESM::Cell::NoSleep));
     mCells.addColumn (new FlagColumn<Cell> (Columns::ColumnId_InteriorWater, ESM::Cell::HasWater,
         ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue | ColumnBase::Flag_Dialogue_Refresh));
diff --git a/apps/opencs/model/world/refidcollection.cpp b/apps/opencs/model/world/refidcollection.cpp
index 4ee99a2702..177844a31d 100644
--- a/apps/opencs/model/world/refidcollection.cpp
+++ b/apps/opencs/model/world/refidcollection.cpp
@@ -59,7 +59,9 @@ CSMWorld::RefIdCollection::RefIdCollection()
 
     NameColumns nameColumns (modelColumns);
 
-    mColumns.emplace_back(Columns::ColumnId_Name, ColumnBase::Display_String);
+    // Only items that can be placed in a container have the 32 character limit, but enforce
+    // that for all referenceable types for now.
+    mColumns.emplace_back(Columns::ColumnId_Name, ColumnBase::Display_String32);
     nameColumns.mName = &mColumns.back();
     mColumns.emplace_back(Columns::ColumnId_Script, ColumnBase::Display_Script);
     nameColumns.mScript = &mColumns.back();
@@ -231,9 +233,9 @@ CSMWorld::RefIdCollection::RefIdCollection()
     mColumns.back().addColumn(
             new RefIdColumn (Columns::ColumnId_AiWanderRepeat, CSMWorld::ColumnBase::Display_Boolean));
     mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_AiActivateName, CSMWorld::ColumnBase::Display_String));
+            new RefIdColumn (Columns::ColumnId_AiActivateName, CSMWorld::ColumnBase::Display_String32));
     mColumns.back().addColumn(
-            new RefIdColumn (Columns::ColumnId_AiTargetId, CSMWorld::ColumnBase::Display_String));
+            new RefIdColumn (Columns::ColumnId_AiTargetId, CSMWorld::ColumnBase::Display_String32));
     mColumns.back().addColumn(
             new RefIdColumn (Columns::ColumnId_AiTargetCell, CSMWorld::ColumnBase::Display_String));
     mColumns.back().addColumn(
@@ -479,6 +481,7 @@ CSMWorld::RefIdCollection::RefIdCollection()
     mColumns.emplace_back(Columns::ColumnId_Class, ColumnBase::Display_Class);
     npcColumns.mClass = &mColumns.back();
 
+    // NAME32 enforced in IdCompletionDelegate::createEditor()
     mColumns.emplace_back(Columns::ColumnId_Faction, ColumnBase::Display_Faction);
     npcColumns.mFaction = &mColumns.back();
 
diff --git a/apps/opencs/view/world/cellcreator.cpp b/apps/opencs/view/world/cellcreator.cpp
index 5b428a4b37..22c27c3d74 100644
--- a/apps/opencs/view/world/cellcreator.cpp
+++ b/apps/opencs/view/world/cellcreator.cpp
@@ -84,6 +84,13 @@ void CSVWorld::CellCreator::setType (int index)
     mYLabel->setVisible (index==1);
     mY->setVisible (index==1);
 
+    // The cell name is limited to 64 characters. (ESM::Header::GMDT::mCurrentCell)
+    std::string text = mType->currentText().toStdString();
+    if (text == "Interior Cell")
+        GenericCreator::setEditorMaxLength (64);
+    else
+        GenericCreator::setEditorMaxLength (32767);
+
     update();
 }
 
diff --git a/apps/opencs/view/world/genericcreator.cpp b/apps/opencs/view/world/genericcreator.cpp
index 23813f8066..8ae8f8764d 100644
--- a/apps/opencs/view/world/genericcreator.cpp
+++ b/apps/opencs/view/world/genericcreator.cpp
@@ -184,6 +184,11 @@ CSVWorld::GenericCreator::GenericCreator (CSMWorld::Data& data, QUndoStack& undo
     connect (&mData, SIGNAL (idListChanged()), this, SLOT (dataIdListChanged()));
 }
 
+void CSVWorld::GenericCreator::setEditorMaxLength (int length)
+{
+    mId->setMaxLength (length);
+}
+
 void CSVWorld::GenericCreator::setEditLock (bool locked)
 {
     mLocked = locked;
diff --git a/apps/opencs/view/world/genericcreator.hpp b/apps/opencs/view/world/genericcreator.hpp
index 3e2a43c918..90c5946ae5 100644
--- a/apps/opencs/view/world/genericcreator.hpp
+++ b/apps/opencs/view/world/genericcreator.hpp
@@ -84,6 +84,8 @@ namespace CSVWorld
 
             std::string getNamespace() const;
 
+            void setEditorMaxLength(int length);
+
         private:
 
             void updateNamespace();
diff --git a/apps/opencs/view/world/idcompletiondelegate.cpp b/apps/opencs/view/world/idcompletiondelegate.cpp
index 447bcc25d9..9ef04ec3ab 100644
--- a/apps/opencs/view/world/idcompletiondelegate.cpp
+++ b/apps/opencs/view/world/idcompletiondelegate.cpp
@@ -81,6 +81,23 @@ QWidget *CSVWorld::IdCompletionDelegate::createEditor(QWidget *parent,
     CSMWorld::IdCompletionManager &completionManager = getDocument().getIdCompletionManager();
     CSVWidget::DropLineEdit *editor = new CSVWidget::DropLineEdit(display, parent);
     editor->setCompleter(completionManager.getCompleter(display).get());
+
+    // The savegame format limits the player faction string to 32 characters.
+    // The region sound name is limited to 32 characters. (ESM::Region::SoundRef::mSound)
+    // The script name is limited to 32 characters. (ESM::Script::SCHD::mName)
+    // The cell name is limited to 64 characters. (ESM::Header::GMDT::mCurrentCell)
+    if (display == CSMWorld::ColumnBase::Display_Faction ||
+        display == CSMWorld::ColumnBase::Display_Sound ||
+        display == CSMWorld::ColumnBase::Display_Script ||
+        display == CSMWorld::ColumnBase::Display_Referenceable)
+    {
+        editor->setMaxLength (32);
+    }
+    else if (display == CSMWorld::ColumnBase::Display_Cell)
+    {
+        editor->setMaxLength (64);
+    }
+
     return editor;
 }
 
diff --git a/apps/opencs/view/world/referenceablecreator.cpp b/apps/opencs/view/world/referenceablecreator.cpp
index 836e8ac7dc..1a2f2bbaa3 100644
--- a/apps/opencs/view/world/referenceablecreator.cpp
+++ b/apps/opencs/view/world/referenceablecreator.cpp
@@ -33,6 +33,8 @@ CSVWorld::ReferenceableCreator::ReferenceableCreator (CSMWorld::Data& data, QUnd
     }
 
     insertBeforeButtons (mType, false);
+
+    connect (mType, SIGNAL (currentIndexChanged (int)), this, SLOT (setType (int)));
 }
 
 void CSVWorld::ReferenceableCreator::reset()
@@ -41,6 +43,30 @@ void CSVWorld::ReferenceableCreator::reset()
     GenericCreator::reset();
 }
 
+void CSVWorld::ReferenceableCreator::setType (int index)
+{
+    // container items have name limit of 32 characters
+    std::string text = mType->currentText().toStdString();
+    if (text == "Potion" ||
+        text == "Apparatus" ||
+        text == "Armor" ||
+        text == "Book" ||
+        text == "Clothing" ||
+        text == "Ingredient" ||
+        text == "ItemLevelledList" ||
+        text == "Light" ||
+        text == "Lockpick" ||
+        text == "Miscellaneous" ||
+        text == "Probe" ||
+        text == "Repair" ||
+        text == "Weapon")
+    {
+        GenericCreator::setEditorMaxLength (32);
+    }
+    else
+        GenericCreator::setEditorMaxLength (32767);
+}
+
 void CSVWorld::ReferenceableCreator::cloneMode (const std::string& originId,
     const CSMWorld::UniversalId::Type type)
 {
diff --git a/apps/opencs/view/world/referenceablecreator.hpp b/apps/opencs/view/world/referenceablecreator.hpp
index d4657bcf7f..354347cc88 100644
--- a/apps/opencs/view/world/referenceablecreator.hpp
+++ b/apps/opencs/view/world/referenceablecreator.hpp
@@ -29,6 +29,9 @@ namespace CSVWorld
 
             void toggleWidgets(bool active = true) override;
 
+        private slots:
+
+            void setType (int index);
     };
 }
 
diff --git a/apps/opencs/view/world/util.cpp b/apps/opencs/view/world/util.cpp
index 58d3d49e44..80bd4580c8 100644
--- a/apps/opencs/view/world/util.cpp
+++ b/apps/opencs/view/world/util.cpp
@@ -291,6 +291,14 @@ QWidget *CSVWorld::CommandDelegate::createEditor (QWidget *parent, const QStyleO
             return widget;
         }
 
+        case CSMWorld::ColumnBase::Display_String64:
+        {
+        // For other Display types (that represent record IDs) with drop support IdCompletionDelegate is used
+            CSVWidget::DropLineEdit *widget = new CSVWidget::DropLineEdit(display, parent);
+            widget->setMaxLength (64);
+            return widget;
+        }
+
         default:
 
             return QStyledItemDelegate::createEditor (parent, option, index);

From 8a14daaac70985087c790f6bd36be1f9de63a4e1 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Wed, 4 Aug 2021 09:53:31 +0000
Subject: [PATCH 1137/2859] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f79eca3e5d..a9ec5a946e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
     Feature #2780: A way to see current OpenMW version in the console
     Feature #3616: Allow Zoom levels on the World Map
+    Feature #4737: Handle instance move from one cell to another
     Feature #5489: MCP: Telekinesis fix for activators
     Feature #5996: Support Lua scripts in OpenMW
     Feature #6017: Separate persistent and temporary cell references when saving

From a94072243bcc24c9cb34973e380076c1eda5a247 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Wed, 4 Aug 2021 19:14:24 +0300
Subject: [PATCH 1138/2859] Lua command `core.quit`

---
 apps/openmw/mwlua/luabindings.cpp | 10 +++++++++-
 components/lua/luastate.cpp       |  3 ++-
 files/lua_api/openmw/core.lua     |  4 ++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index 24640c1863..9d978ddd52 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -5,6 +5,8 @@
 #include <components/lua/luastate.hpp>
 #include <components/queries/luabindings.hpp>
 
+#include "../mwbase/environment.hpp"
+#include "../mwbase/statemanager.hpp"
 #include "../mwworld/inventorystore.hpp"
 
 #include "eventqueue.hpp"
@@ -31,7 +33,13 @@ namespace MWLua
     {
         auto* lua = context.mLua;
         sol::table api(lua->sol(), sol::create);
-        api["API_REVISION"] = 2;
+        api["API_REVISION"] = 3;
+        api["quit"] = [lua]()
+        {
+            std::string traceback = lua->sol()["debug"]["traceback"]().get<std::string>();
+            Log(Debug::Warning) << "Quit requested by a Lua script.\n" << traceback;
+            MWBase::Environment::get().getStateManager()->requestQuit();
+        };
         api["sendGlobalEvent"] = [context](std::string eventName, const sol::object& eventData)
         {
             context.mGlobalEventQueue->push_back({std::move(eventName), LuaUtil::serialize(eventData, context.mSerializer)});
diff --git a/components/lua/luastate.cpp b/components/lua/luastate.cpp
index 753e3369f6..1b52db11ad 100644
--- a/components/lua/luastate.cpp
+++ b/components/lua/luastate.cpp
@@ -24,7 +24,8 @@ namespace LuaUtil
 
     LuaState::LuaState(const VFS::Manager* vfs) : mVFS(vfs)
     {
-        mLua.open_libraries(sol::lib::base, sol::lib::coroutine, sol::lib::math, sol::lib::string, sol::lib::table);
+        mLua.open_libraries(sol::lib::base, sol::lib::coroutine, sol::lib::math,
+                            sol::lib::string, sol::lib::table, sol::lib::debug);
 
         mLua["math"]["randomseed"](static_cast<unsigned>(std::time(nullptr)));
         mLua["math"]["randomseed"] = sol::nil;
diff --git a/files/lua_api/openmw/core.lua b/files/lua_api/openmw/core.lua
index 040e6968dd..affd052700 100644
--- a/files/lua_api/openmw/core.lua
+++ b/files/lua_api/openmw/core.lua
@@ -10,6 +10,10 @@
 -- The revision of OpenMW Lua API. It is an integer that is incremented every time the API is changed.
 -- @field [parent=#core] #number API_REVISION
 
+-------------------------------------------------------------------------------
+-- Terminates the game and quits to the OS. Should be used only for testing purposes.
+-- @function [parent=#core] quit
+
 -------------------------------------------------------------------------------
 -- Send an event to global scripts.
 -- @function [parent=#core] sendGlobalEvent

From 1d69681c0aeb3bef14d158e8a03325e559bd8ce5 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 4 Aug 2021 21:48:43 +0200
Subject: [PATCH 1139/2859] Add a script to analyze OpenSceneGraph log

---
 scripts/osg_stats.py | 238 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 238 insertions(+)
 create mode 100755 scripts/osg_stats.py

diff --git a/scripts/osg_stats.py b/scripts/osg_stats.py
new file mode 100755
index 0000000000..140a911fea
--- /dev/null
+++ b/scripts/osg_stats.py
@@ -0,0 +1,238 @@
+#!/usr/bin/env python3
+"""
+osg_stats.py is a script to analyze OpenSceneGraph log. It parses given file
+and builds timeseries, histograms, plots, calculate statistics for a given
+set of keys over given range of frames.
+"""
+
+import click
+import collections
+import matplotlib.pyplot
+import numpy
+import statistics
+import sys
+import termtables
+
+@click.command()
+@click.option('--print_keys', is_flag=True,
+              help='Print a list of all present keys in the input file.')
+@click.option('--timeseries', type=str, multiple=True,
+              help='Show a graph for given metric over time.')
+@click.option('--hist', type=str, multiple=True,
+              help='Show a histogram for all values of given metric.')
+@click.option('--hist_ratio', nargs=2, type=str, multiple=True,
+              help='Show a histogram for a ratio of two given metric (first / second). '
+                   'Format: --hist_ratio <first_metric> <second_metric>.')
+@click.option('--stdev_hist', nargs=2, type=str, multiple=True,
+              help='Show a histogram for a standard deviation of a given metric at given scale (number). '
+                   'Format: --stdev_hist <metric> <scale>.')
+@click.option('--plot', nargs=3, type=str, multiple=True,
+              help='Show a 2D plot for relation between two metrix (first is axis x, second is y)'
+                   'using one of aggregation functions (mean, median). For example show a relation '
+                   'between Physics Actors and physics_time_taken. Format: --plot <x> <y> <function>.')
+@click.option('--stats', type=str, multiple=True,
+              help='Print table with stats for a given metric containing min, max, mean, median etc.')
+@click.option('--timeseries_sum', is_flag=True,
+              help='Add a graph to timeseries for a sum per frame of all given timeseries metrics.')
+@click.option('--stats_sum', is_flag=True,
+              help='Add a row to stats table for a sum per frame of all given stats metrics.')
+@click.option('--begin_frame', type=int, default=0,
+              help='Start processing from this frame.')
+@click.option('--end_frame', type=int, default=sys.maxsize,
+              help='End processing at this frame.')
+@click.argument('path', default='', type=click.Path())
+def main(print_keys, timeseries, hist, hist_ratio, stdev_hist, plot, stats,
+         timeseries_sum, stats_sum, begin_frame, end_frame, path):
+    data = list(read_data(path))
+    keys = collect_unique_keys(data)
+    frames = collect_per_frame(data=data, keys=keys, begin_frame=begin_frame, end_frame=end_frame)
+    if print_keys:
+        for v in keys:
+            print(v)
+    if timeseries:
+        draw_timeseries(frames=frames, keys=timeseries, timeseries_sum=timeseries_sum)
+    if hist:
+        draw_hists(frames=frames, keys=hist)
+    if hist_ratio:
+        draw_hist_ratio(frames=frames, pairs=hist_ratio)
+    if stdev_hist:
+        draw_stdev_hists(frames=frames, stdev_hists=stdev_hist)
+    if plot:
+        draw_plots(frames=frames, plots=plot)
+    if stats:
+        print_stats(frames=frames, keys=stats, stats_sum=stats_sum)
+    matplotlib.pyplot.show()
+
+
+def read_data(path):
+    with open(path) if path else sys.stdin as stream:
+        frame = dict()
+        camera = 0
+        for line in stream:
+            if line.startswith('Stats Viewer'):
+                if frame:
+                    camera = 0
+                    yield frame
+                _, _, key, value = line.split(' ')
+                frame = {key: int(value)}
+            elif line.startswith('Stats Camera'):
+                camera += 1
+            elif line.startswith('    '):
+                key, value = line.strip().rsplit(maxsplit=1)
+                if camera:
+                    key = f'{key} Camera {camera}'
+                frame[key] = to_number(value)
+
+
+def collect_per_frame(data, keys, begin_frame, end_frame):
+    result = collections.defaultdict(list)
+    for frame in data:
+        for key in keys:
+            if key in frame:
+                result[key].append(frame[key])
+            else:
+                result[key].append(None)
+    for key, values in result.items():
+        result[key] = numpy.array(values[begin_frame:end_frame])
+    return result
+
+
+def collect_unique_keys(frames):
+    result = set()
+    for frame in frames:
+        for key in frame.keys():
+            result.add(key)
+    return sorted(result)
+
+
+def draw_timeseries(frames, keys, timeseries_sum):
+    fig, ax = matplotlib.pyplot.subplots()
+    x = numpy.array(range(max(len(v) for k, v in frames.items() if k in keys)))
+    for key in keys:
+        ax.plot(x, frames[key], label=key)
+    if timeseries_sum:
+        ax.plot(x, numpy.sum(list(frames[k] for k in keys), axis=0), label='sum')
+    ax.grid(True)
+    ax.legend()
+    fig.canvas.set_window_title('timeseries')
+
+
+def draw_hists(frames, keys):
+    fig, ax = matplotlib.pyplot.subplots()
+    bins = numpy.linspace(
+        start=min(min(v) for k, v in frames.items() if k in keys),
+        stop=max(max(v) for k, v in frames.items() if k in keys),
+        num=20,
+    )
+    for key in keys:
+        ax.hist(frames[key], bins=bins, label=key, alpha=1 / len(keys))
+    ax.set_xticks(bins)
+    ax.grid(True)
+    ax.legend()
+    fig.canvas.set_window_title('hists')
+
+
+def draw_hist_ratio(frames, pairs):
+    fig, ax = matplotlib.pyplot.subplots()
+    bins = numpy.linspace(
+        start=min(min(a / b for a, b in zip(frames[a], frames[b])) for a, b in pairs),
+        stop=max(max(a / b for a, b in zip(frames[a], frames[b])) for a, b in pairs),
+        num=20,
+    )
+    for a, b in pairs:
+        ax.hist(frames[a] / frames[b], bins=bins, label=f'{a} / {b}', alpha=1 / len(pairs))
+    ax.set_xticks(bins)
+    ax.grid(True)
+    ax.legend()
+    fig.canvas.set_window_title('hists')
+
+
+def draw_stdev_hists(frames, stdev_hists):
+    for key, scale in stdev_hists:
+        scale = float(scale)
+        fig, ax = matplotlib.pyplot.subplots()
+        median = statistics.median(frames[key])
+        stdev = statistics.stdev(frames[key])
+        start = median - stdev / 2 * scale
+        stop = median + stdev / 2 * scale
+        bins = numpy.linspace(start=start, stop=stop, num=9)
+        values = [v for v in frames[key] if start <= v <= stop]
+        ax.hist(values, bins=bins, label=key, alpha=1 / len(stdev_hists))
+        ax.set_xticks(bins)
+        ax.grid(True)
+        ax.legend()
+        fig.canvas.set_window_title('stdev_hists')
+
+
+def draw_plots(frames, plots):
+    fig, ax = matplotlib.pyplot.subplots()
+    for x_key, y_key, agg in plots:
+        if agg is None:
+            ax.plot(frames[x_key], frames[y_key], label=f'x={x_key}, y={y_key}')
+        elif agg:
+            agg_f = dict(
+                mean=statistics.mean,
+                median=statistics.median,
+            )[agg]
+            grouped = collections.defaultdict(list)
+            for x, y in zip(frames[x_key], frames[y_key]):
+                grouped[x].append(y)
+            aggregated = sorted((k, agg_f(v)) for k, v in grouped.items())
+            ax.plot(
+                numpy.array([v[0] for v in aggregated]),
+                numpy.array([v[1] for v in aggregated]),
+                label=f'x={x_key}, y={y_key}, agg={agg}',
+            )
+    ax.grid(True)
+    ax.legend()
+    fig.canvas.set_window_title('plots')
+
+
+def print_stats(frames, keys, stats_sum):
+    stats = [make_stats(key=key, values=filter_not_none(frames[key])) for key in keys]
+    if stats_sum:
+        stats.append(make_stats(key='sum', values=sum_multiple(frames, keys)))
+    metrics = list(stats[0].keys())
+    max_key_size = max(len(tuple(v.values())[0]) for v in stats)
+    termtables.print(
+        [list(v.values()) for v in stats],
+        header=metrics,
+        style=termtables.styles.markdown,
+    )
+
+
+def filter_not_none(values):
+    return [v for v in values if v is not None]
+
+
+def sum_multiple(frames, keys):
+    result = collections.Counter()
+    for key in keys:
+        values = frames[key]
+        for i, value in enumerate(values):
+            if value is not None:
+                result[i] += float(value)
+    return numpy.array([result[k] for k in sorted(result.keys())])
+
+
+def make_stats(key, values):
+    return collections.OrderedDict(
+        key=key,
+        number=len(values),
+        min=min(values),
+        max=max(values),
+        mean=statistics.mean(values),
+        median=statistics.median(values),
+        stdev=statistics.stdev(values),
+        q95=numpy.quantile(values, 0.95),
+    )
+
+
+def to_number(value):
+    try:
+        return int(value)
+    except ValueError:
+        return float(value)
+
+if __name__ == '__main__':
+    main()

From 70fac33940f11096ee1a8448f8dc9dd03b012b1c Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Tue, 1 Jun 2021 12:15:25 -0700
Subject: [PATCH 1140/2859] initial reverse-z depth implementation

---
 apps/opencs/view/render/cellwater.cpp      |   2 +-
 apps/openmw/CMakeLists.txt                 |   2 +-
 apps/openmw/mwgui/bookpage.cpp             |   8 +-
 apps/openmw/mwgui/mapwindow.cpp            |   4 +-
 apps/openmw/mwgui/mapwindow.hpp            |   2 +-
 apps/openmw/mwgui/windowmanagerimp.cpp     |   5 +-
 apps/openmw/mwrender/characterpreview.cpp  |   5 +-
 apps/openmw/mwrender/globalmap.cpp         |   6 +-
 apps/openmw/mwrender/globalmap.hpp         |   4 +-
 apps/openmw/mwrender/localmap.cpp          |  17 +-
 apps/openmw/mwrender/localmap.hpp          |   3 +-
 apps/openmw/mwrender/npcanimation.cpp      |   6 +-
 apps/openmw/mwrender/objectpaging.cpp      |   1 +
 apps/openmw/mwrender/postprocessor.cpp     | 216 +++++++++++++++++++++
 apps/openmw/mwrender/postprocessor.hpp     |  46 +++++
 apps/openmw/mwrender/renderingmanager.cpp  |  47 ++++-
 apps/openmw/mwrender/renderingmanager.hpp  |   2 +
 apps/openmw/mwrender/ripplesimulation.cpp  |   3 +-
 apps/openmw/mwrender/sky.cpp               |  21 +-
 apps/openmw/mwrender/water.cpp             |   4 +-
 components/nifosg/nifloader.cpp            |  14 +-
 components/nifosg/nifloader.hpp            |   4 +
 components/resource/scenemanager.cpp       |  10 +
 components/resource/scenemanager.hpp       |   4 +
 components/sceneutil/mwshadowtechnique.cpp |  79 ++++++--
 components/sceneutil/mwshadowtechnique.hpp |   6 +
 components/sceneutil/optimizer.cpp         |   5 +-
 components/sceneutil/optimizer.hpp         |  13 +-
 components/sceneutil/shadow.cpp            |  18 +-
 components/sceneutil/shadow.hpp            |   5 +-
 components/sceneutil/util.cpp              |  39 ++++
 components/sceneutil/util.hpp              |  18 ++
 components/sceneutil/waterutil.cpp         |   6 +-
 components/sceneutil/waterutil.hpp         |   2 +-
 components/terrain/chunkmanager.cpp        |   4 +-
 components/terrain/material.cpp            |  18 +-
 components/terrain/material.hpp            |   6 +-
 files/shaders/CMakeLists.txt               |   1 +
 files/shaders/depth.glsl                   |  12 ++
 files/shaders/groundcover_vertex.glsl      |   3 +-
 files/shaders/nv_default_vertex.glsl       |   3 +-
 files/shaders/nv_nolighting_vertex.glsl    |   3 +-
 files/shaders/objects_vertex.glsl          |   3 +-
 files/shaders/terrain_vertex.glsl          |   3 +-
 files/shaders/water_fragment.glsl          |  13 +-
 files/shaders/water_vertex.glsl            |   6 +-
 46 files changed, 612 insertions(+), 90 deletions(-)
 create mode 100644 apps/openmw/mwrender/postprocessor.cpp
 create mode 100644 apps/openmw/mwrender/postprocessor.hpp
 create mode 100644 files/shaders/depth.glsl

diff --git a/apps/opencs/view/render/cellwater.cpp b/apps/opencs/view/render/cellwater.cpp
index f8857c3afc..485eed00fe 100644
--- a/apps/opencs/view/render/cellwater.cpp
+++ b/apps/opencs/view/render/cellwater.cpp
@@ -161,7 +161,7 @@ namespace CSVRender
         }
 
         mWaterGeometry = SceneUtil::createWaterGeometry(size, segments, textureRepeats);
-        mWaterGeometry->setStateSet(SceneUtil::createSimpleWaterStateSet(Alpha, RenderBin));
+        mWaterGeometry->setStateSet(SceneUtil::createSimpleWaterStateSet(Alpha, RenderBin, false));
 
         // Add water texture
         std::string textureName = Fallback::Map::getString("Water_SurfaceTexture");
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 6d58e880ed..a6d9402c4f 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -21,7 +21,7 @@ add_openmw_dir (mwrender
     actors objects renderingmanager animation rotatecontroller sky npcanimation vismask
     creatureanimation effectmanager util renderinginterface pathgrid rendermode weaponanimation screenshotmanager
     bulletdebugdraw globalmap characterpreview camera viewovershoulder localmap water terrainstorage ripplesimulation
-    renderbin actoranimation landmanager navmesh actorspaths recastmesh fogmanager objectpaging groundcover
+    renderbin actoranimation landmanager navmesh actorspaths recastmesh fogmanager objectpaging groundcover postprocessor
     )
 
 add_openmw_dir (mwinput
diff --git a/apps/openmw/mwgui/bookpage.cpp b/apps/openmw/mwgui/bookpage.cpp
index 49fae04619..c902ceb88a 100644
--- a/apps/openmw/mwgui/bookpage.cpp
+++ b/apps/openmw/mwgui/bookpage.cpp
@@ -8,7 +8,11 @@
 #include "MyGUI_FactoryManager.h"
 
 #include <components/misc/utf8stream.hpp>
+#include <components/sceneutil/util.hpp>
+#include <components/resource/resourcesystem.hpp>
+#include <components/resource/scenemanager.hpp>
 
+#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 
@@ -1217,8 +1221,10 @@ public:
 
         RenderXform renderXform (mCroppedParent, textFormat.mRenderItem->getRenderTarget()->getInfo());
 
+        float z = MWBase::Environment::get().getResourceSystem()->getSceneManager()->getReverseZ() ? 1.0 : -1.0;
+
         GlyphStream glyphStream(textFormat.mFont, static_cast<float>(mCoord.left), static_cast<float>(mCoord.top - mViewTop),
-                                  -1 /*mNode->getNodeDepth()*/, vertices, renderXform);
+                                  z /*mNode->getNodeDepth()*/, vertices, renderXform);
 
         int visit_top    = (std::max) (mViewTop,    mViewTop + int (renderXform.clipTop   ));
         int visit_bottom = (std::min) (mViewBottom, mViewTop + int (renderXform.clipBottom));
diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index efb434d3bc..538b866cac 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -741,7 +741,7 @@ namespace MWGui
     }
 
     // ------------------------------------------------------------------------------------------
-    MapWindow::MapWindow(CustomMarkerCollection &customMarkers, DragAndDrop* drag, MWRender::LocalMap* localMapRender, SceneUtil::WorkQueue* workQueue)
+    MapWindow::MapWindow(CustomMarkerCollection &customMarkers, DragAndDrop* drag, MWRender::LocalMap* localMapRender, SceneUtil::WorkQueue* workQueue, bool reverseZ)
         : WindowPinnableBase("openmw_map_window.layout")
         , LocalMapBase(customMarkers, localMapRender)
         , NoDrop(drag, mMainWidget)
@@ -751,7 +751,7 @@ namespace MWGui
         , mGlobal(Settings::Manager::getBool("global", "Map"))
         , mEventBoxGlobal(nullptr)
         , mEventBoxLocal(nullptr)
-        , mGlobalMapRender(new MWRender::GlobalMap(localMapRender->getRoot(), workQueue))
+        , mGlobalMapRender(new MWRender::GlobalMap(localMapRender->getRoot(), workQueue, reverseZ))
         , mEditNoteDialog()
     {
         static bool registered = false;
diff --git a/apps/openmw/mwgui/mapwindow.hpp b/apps/openmw/mwgui/mapwindow.hpp
index cb0d368b30..b7664505af 100644
--- a/apps/openmw/mwgui/mapwindow.hpp
+++ b/apps/openmw/mwgui/mapwindow.hpp
@@ -222,7 +222,7 @@ namespace MWGui
     class MapWindow : public MWGui::WindowPinnableBase, public LocalMapBase, public NoDrop
     {
     public:
-        MapWindow(CustomMarkerCollection& customMarkers, DragAndDrop* drag, MWRender::LocalMap* localMapRender, SceneUtil::WorkQueue* workQueue);
+        MapWindow(CustomMarkerCollection& customMarkers, DragAndDrop* drag, MWRender::LocalMap* localMapRender, SceneUtil::WorkQueue* workQueue, bool reverseZ);
         virtual ~MapWindow();
 
         void setCellName(const std::string& cellName);
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 6eeb2d3654..5feed41864 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -305,8 +305,9 @@ namespace MWGui
         mGuiModeStates[GM_MainMenu] = GuiModeState(menu);
         mWindows.push_back(menu);
 
-        mLocalMapRender = new MWRender::LocalMap(mViewer->getSceneData()->asGroup());
-        mMap = new MapWindow(mCustomMarkers, mDragAndDrop, mLocalMapRender, mWorkQueue);
+        bool reverseZ = mResourceSystem->getSceneManager()->getReverseZ();
+        mLocalMapRender = new MWRender::LocalMap(mViewer->getSceneData()->asGroup(), reverseZ);
+        mMap = new MapWindow(mCustomMarkers, mDragAndDrop, mLocalMapRender, mWorkQueue, reverseZ);
         mWindows.push_back(mMap);
         mMap->renderGlobalMap();
         trackWindow(mMap, "map");
diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index e88c4cee32..c4c628e04d 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -168,7 +168,7 @@ namespace MWRender
         mCamera->setRenderOrder(osg::Camera::PRE_RENDER);
         mCamera->attach(osg::Camera::COLOR_BUFFER, mTexture, 0, 0, false, Settings::Manager::getInt("antialiasing", "Video"));
         mCamera->setName("CharacterPreview");
-        mCamera->setComputeNearFarMode(osg::Camera::COMPUTE_NEAR_FAR_USING_BOUNDING_VOLUMES);
+        mCamera->setComputeNearFarMode(osg::Camera::DO_NOT_COMPUTE_NEAR_FAR);
         mCamera->setCullMask(~(Mask_UpdateVisitor));
 
         mCamera->setNodeMask(Mask_RenderToTexture);
@@ -188,6 +188,9 @@ namespace MWRender
         defaultMat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 0.f));
         stateset->setAttribute(defaultMat);
 
+        osg::ref_ptr<osg::Depth> depth = new osg::Depth;
+        stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
+
         SceneUtil::ShadowManager::disableShadowsForStateSet(stateset);
 
         // assign large value to effectively turn off fog
diff --git a/apps/openmw/mwrender/globalmap.cpp b/apps/openmw/mwrender/globalmap.cpp
index dcaf9c1612..f9bbb3d2f4 100644
--- a/apps/openmw/mwrender/globalmap.cpp
+++ b/apps/openmw/mwrender/globalmap.cpp
@@ -15,6 +15,7 @@
 #include <components/debug/debuglog.hpp>
 
 #include <components/sceneutil/workqueue.hpp>
+#include <components/sceneutil/util.hpp>
 
 #include <components/esm/globalmap.hpp>
 
@@ -219,13 +220,14 @@ namespace MWRender
         osg::ref_ptr<osg::Texture2D> mOverlayTexture;
     };
 
-    GlobalMap::GlobalMap(osg::Group* root, SceneUtil::WorkQueue* workQueue)
+    GlobalMap::GlobalMap(osg::Group* root, SceneUtil::WorkQueue* workQueue, bool reverseZ)
         : mRoot(root)
         , mWorkQueue(workQueue)
         , mWidth(0)
         , mHeight(0)
         , mMinX(0), mMaxX(0)
         , mMinY(0), mMaxY(0)
+        , mReverseZ(reverseZ)
 
     {
         mCellSize = Settings::Manager::getInt("global map cell size", "Map");
@@ -323,7 +325,7 @@ namespace MWRender
         if (texture)
         {
             osg::ref_ptr<osg::Geometry> geom = createTexturedQuad(srcLeft, srcTop, srcRight, srcBottom);
-            osg::ref_ptr<osg::Depth> depth = new osg::Depth;
+            auto depth = SceneUtil::createDepth(mReverseZ);
             depth->setWriteMask(0);
             osg::StateSet* stateset = geom->getOrCreateStateSet();
             stateset->setAttribute(depth);
diff --git a/apps/openmw/mwrender/globalmap.hpp b/apps/openmw/mwrender/globalmap.hpp
index fd8a8d1016..a27621c9f4 100644
--- a/apps/openmw/mwrender/globalmap.hpp
+++ b/apps/openmw/mwrender/globalmap.hpp
@@ -33,7 +33,7 @@ namespace MWRender
     class GlobalMap
     {
     public:
-        GlobalMap(osg::Group* root, SceneUtil::WorkQueue* workQueue);
+        GlobalMap(osg::Group* root, SceneUtil::WorkQueue* workQueue, bool reverseZ);
         ~GlobalMap();
 
         void render();
@@ -126,6 +126,8 @@ namespace MWRender
         int mHeight;
 
         int mMinX, mMaxX, mMinY, mMaxY;
+
+        bool mReverseZ;
     };
 
 }
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index 858d577335..e0b3d6c69b 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -83,13 +83,14 @@ namespace
 namespace MWRender
 {
 
-LocalMap::LocalMap(osg::Group* root)
+LocalMap::LocalMap(osg::Group* root, bool reverseZ)
     : mRoot(root)
     , mMapResolution(Settings::Manager::getInt("local map resolution", "Map"))
     , mMapWorldSize(Constants::CellSizeInUnits)
     , mCellDistance(Constants::CellGridRadius)
     , mAngle(0.f)
     , mInterior(false)
+    , mReverseZ(reverseZ)
 {
     // Increase map resolution, if use UI scaling
     float uiScale = MWBase::Environment::get().getWindowManager()->getScalingFactor();
@@ -176,7 +177,12 @@ void LocalMap::saveFogOfWar(MWWorld::CellStore* cell)
 osg::ref_ptr<osg::Camera> LocalMap::createOrthographicCamera(float x, float y, float width, float height, const osg::Vec3d& upVector, float zmin, float zmax)
 {
     osg::ref_ptr<osg::Camera> camera (new osg::Camera);
-    camera->setProjectionMatrixAsOrtho(-width/2, width/2, -height/2, height/2, 5, (zmax-zmin) + 10);
+
+    if (mReverseZ)
+        camera->setProjectionMatrix(SceneUtil::getReversedZProjectionMatrixAsOrtho(-width/2, width/2, -height/2, height/2, 5, (zmax-zmin) + 10));
+    else
+        camera->setProjectionMatrixAsOrtho(-width/2, width/2, -height/2, height/2, 5, (zmax-zmin) + 10);
+
     camera->setComputeNearFarMode(osg::Camera::DO_NOT_COMPUTE_NEAR_FAR);
     camera->setViewMatrixAsLookAt(osg::Vec3d(x, y, zmax + 5), osg::Vec3d(x, y, zmin), upVector);
     camera->setReferenceFrame(osg::Camera::ABSOLUTE_RF_INHERIT_VIEWPOINT);
@@ -195,6 +201,13 @@ osg::ref_ptr<osg::Camera> LocalMap::createOrthographicCamera(float x, float y, f
     osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
     stateset->setAttribute(new osg::PolygonMode(osg::PolygonMode::FRONT_AND_BACK, osg::PolygonMode::FILL), osg::StateAttribute::OVERRIDE);
 
+    if (mReverseZ)
+    {
+        camera->setClearDepth(0.0);
+        auto depth = SceneUtil::createDepth(mReverseZ);
+        stateset->setAttributeAndModes(depth, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+    }
+
     // assign large value to effectively turn off fog
     // shaders don't respect glDisable(GL_FOG)
     osg::ref_ptr<osg::Fog> fog (new osg::Fog);
diff --git a/apps/openmw/mwrender/localmap.hpp b/apps/openmw/mwrender/localmap.hpp
index f9ccd5a011..316cbd53d3 100644
--- a/apps/openmw/mwrender/localmap.hpp
+++ b/apps/openmw/mwrender/localmap.hpp
@@ -36,7 +36,7 @@ namespace MWRender
     class LocalMap
     {
     public:
-        LocalMap(osg::Group* root);
+        LocalMap(osg::Group* root, bool reverseZ);
         ~LocalMap();
 
         /**
@@ -156,6 +156,7 @@ namespace MWRender
         void setupRenderToTexture(osg::ref_ptr<osg::Camera> camera, int x, int y);
 
         bool mInterior;
+        bool mReverseZ;
         osg::BoundingBox mBounds;
     };
 
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index d338d70873..d103234f31 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -370,9 +370,9 @@ void NpcAnimation::setViewMode(NpcAnimation::ViewMode viewMode)
 class DepthClearCallback : public osgUtil::RenderBin::DrawCallback
 {
 public:
-    DepthClearCallback()
+    DepthClearCallback(bool reverseZ)
     {
-        mDepth = new osg::Depth;
+        mDepth = SceneUtil::createDepth(reverseZ);
         mDepth->setWriteMask(true);
     }
 
@@ -432,7 +432,7 @@ void NpcAnimation::setRenderBin()
         if (!prototypeAdded)
         {
             osg::ref_ptr<osgUtil::RenderBin> depthClearBin (new osgUtil::RenderBin);
-            depthClearBin->setDrawCallback(new DepthClearCallback);
+            depthClearBin->setDrawCallback(new DepthClearCallback(mResourceSystem->getSceneManager()->getReverseZ()));
             osgUtil::RenderBin::addRenderBinPrototype("DepthClear", depthClearBin);
             prototypeAdded = true;
         }
diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index aae8f2e4f1..709c67bc2d 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -661,6 +661,7 @@ namespace MWRender
         if (mergeGroup->getNumChildren())
         {
             SceneUtil::Optimizer optimizer;
+            optimizer.setReverseZ(mSceneManager->getReverseZ());
             if (size > 1/8.f)
             {
                 optimizer.setViewPoint(relativeViewPoint);
diff --git a/apps/openmw/mwrender/postprocessor.cpp b/apps/openmw/mwrender/postprocessor.cpp
new file mode 100644
index 0000000000..ed8171bd91
--- /dev/null
+++ b/apps/openmw/mwrender/postprocessor.cpp
@@ -0,0 +1,216 @@
+#include "postprocessor.hpp"
+
+#include <osg/Group>
+#include <osg/Camera>
+#include <osg/Callback>
+#include <osg/Texture2D>
+#include <osg/FrameBufferObject>
+
+#include <osgViewer/Viewer>
+
+#include <components/settings/settings.hpp>
+
+namespace
+{
+    osg::ref_ptr<osg::Geometry> createFullScreenTri()
+    {
+        osg::ref_ptr<osg::Geometry> geom = new osg::Geometry;
+
+        osg::ref_ptr<osg::Vec3Array> verts = new osg::Vec3Array;
+        verts->push_back(osg::Vec3f(-1, -1, 0));
+        verts->push_back(osg::Vec3f(-1, 3, 0));
+        verts->push_back(osg::Vec3f(3, -1, 0));
+
+        geom->setVertexArray(verts);
+
+        geom->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::TRIANGLES, 0, 3));
+
+        return geom;
+    }
+
+    class CullCallback : public osg::NodeCallback
+    {
+    public:
+        CullCallback(MWRender::PostProcessor* postProcessor)
+            : mPostProcessor(postProcessor)
+            , mLastFrameNumber(0)
+        {}
+
+        void operator()(osg::Node* node, osg::NodeVisitor* nv) override
+        {
+            osgUtil::RenderStage* renderStage = nv->asCullVisitor()->getCurrentRenderStage();
+
+            unsigned int frame = nv->getTraversalNumber();
+            if (frame != mLastFrameNumber)
+            {
+                mLastFrameNumber = frame;
+                if (!mPostProcessor->getMsaaFbo())
+                {
+                    renderStage->setFrameBufferObject(mPostProcessor->getFbo());
+                }
+                else
+                {
+                    renderStage->setMultisampleResolveFramebufferObject(mPostProcessor->getFbo());
+                    renderStage->setFrameBufferObject(mPostProcessor->getMsaaFbo());
+                }
+            }
+
+            traverse(node, nv);
+        }
+        MWRender::PostProcessor* mPostProcessor;
+        unsigned int mLastFrameNumber;
+    };
+
+    struct ResizedCallback : osg::GraphicsContext::ResizedCallback
+    {
+        ResizedCallback(MWRender::PostProcessor* postProcessor)
+            : mPostProcessor(postProcessor)
+        {
+        }
+
+        void resizedImplementation(osg::GraphicsContext* gc, int x, int y, int width, int height) override
+        {
+            mPostProcessor->resize(width, height);
+        }
+
+        MWRender::PostProcessor* mPostProcessor;
+    };
+}
+
+namespace MWRender
+{
+    PostProcessor::PostProcessor(osgViewer::Viewer* viewer, osg::Group* rootNode)
+        : mViewer(viewer)
+        , mRootNode(new osg::Group)
+    {
+        int width = viewer->getCamera()->getViewport()->width();
+        int height = viewer->getCamera()->getViewport()->height();
+
+        createTexturesAndCamera(width, height);
+        resize(width, height);
+
+        mRootNode->addChild(mHUDCamera);
+        mRootNode->addChild(rootNode);
+        mViewer->setSceneData(mRootNode);
+
+        // Main camera is treated specially, we need to manually set the FBO and
+        // resolve FBO during the cull callback.
+        mViewer->getCamera()->addCullCallback(new CullCallback(this));
+        mViewer->getCamera()->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT);
+        mViewer->getCamera()->attach(osg::Camera::COLOR_BUFFER0, mSceneTex);
+        mViewer->getCamera()->attach(osg::Camera::DEPTH_BUFFER, mDepthTex);
+
+        mViewer->getCamera()->getGraphicsContext()->setResizedCallback(new ResizedCallback(this));
+    }
+
+    void PostProcessor::resize(int width, int height)
+    {
+        mDepthTex->setTextureSize(width, height);
+        mSceneTex->setTextureSize(width, height);
+		mDepthTex->dirtyTextureObject();
+		mSceneTex->dirtyTextureObject();
+
+        int samples = Settings::Manager::getInt("antialiasing", "Video");
+
+        mFbo = new osg::FrameBufferObject;
+        mFbo->setAttachment(osg::Camera::COLOR_BUFFER0, osg::FrameBufferAttachment(mSceneTex));
+        mFbo->setAttachment(osg::Camera::DEPTH_BUFFER, osg::FrameBufferAttachment(mDepthTex));
+
+        // When MSAA is enabled we must first render to a render buffer, then
+        // blit the result to the FBO which is either passed to the main frame
+        // buffer for display or used as the entry point for a post process chain.
+        if (samples > 0)
+        {
+            mMsaaFbo = new osg::FrameBufferObject;
+            osg::ref_ptr<osg::RenderBuffer> colorRB = new osg::RenderBuffer(width, height, mSceneTex->getInternalFormat(), samples);
+            osg::ref_ptr<osg::RenderBuffer> depthRB = new osg::RenderBuffer(width, height, mDepthTex->getInternalFormat(), samples);
+            mMsaaFbo->setAttachment(osg::Camera::COLOR_BUFFER0, osg::FrameBufferAttachment(colorRB));
+            mMsaaFbo->setAttachment(osg::Camera::DEPTH_BUFFER, osg::FrameBufferAttachment(depthRB));
+        }
+
+        double prevWidth = mViewer->getCamera()->getViewport()->width();
+        double prevHeight = mViewer->getCamera()->getViewport()->height();
+        double scaleX = prevWidth / width;
+        double scaleY = prevHeight / height;
+
+        mViewer->getCamera()->resize(width,height);
+        mHUDCamera->resize(width,height);
+
+        mViewer->getCamera()->getProjectionMatrix() *= osg::Matrix::scale(scaleX, scaleY, 1.0);
+    }
+
+    void PostProcessor::createTexturesAndCamera(int width, int height)
+    {
+        mDepthTex = new osg::Texture2D;
+        mDepthTex->setTextureSize(width, height);
+        mDepthTex->setSourceFormat(GL_DEPTH_COMPONENT);
+        mDepthTex->setSourceType(GL_FLOAT);
+        mDepthTex->setInternalFormat(GL_DEPTH_COMPONENT32F);
+        mDepthTex->setFilter(osg::Texture2D::MIN_FILTER, osg::Texture2D::NEAREST);
+        mDepthTex->setFilter(osg::Texture2D::MAG_FILTER, osg::Texture2D::NEAREST);
+        mDepthTex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+        mDepthTex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+        mDepthTex->setResizeNonPowerOfTwoHint(false);
+
+        mSceneTex = new osg::Texture2D;
+        mSceneTex->setTextureSize(width, height);
+        mSceneTex->setSourceFormat(GL_RGB);
+        mSceneTex->setSourceType(GL_UNSIGNED_BYTE);
+        mSceneTex->setInternalFormat(GL_RGB);
+        mSceneTex->setFilter(osg::Texture2D::MIN_FILTER, osg::Texture2D::NEAREST);
+        mSceneTex->setFilter(osg::Texture2D::MAG_FILTER, osg::Texture2D::NEAREST);
+        mSceneTex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+        mSceneTex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+        mSceneTex->setResizeNonPowerOfTwoHint(false);
+
+        mHUDCamera = new osg::Camera;
+        mHUDCamera->setReferenceFrame(osg::Camera::ABSOLUTE_RF);
+        mHUDCamera->setRenderOrder(osg::Camera::POST_RENDER);
+        mHUDCamera->setClearColor(osg::Vec4(0.45, 0.45, 0.14, 1.0));
+        mHUDCamera->setProjectionMatrix(osg::Matrix::ortho2D(0, 1, 0, 1));
+        mHUDCamera->setAllowEventFocus(false);
+        mHUDCamera->setViewport(0, 0, width, height);
+
+        // Shaders calculate correct UV coordinates for our fullscreen triangle
+        constexpr char vertSrc[] = R"GLSL(
+            #version 120
+
+            varying vec2 uv;
+
+            void main()
+            {
+                gl_Position = vec4(gl_Vertex.xy, 0.0, 1.0);
+                uv = gl_Position.xy * 0.5 + 0.5;
+            }
+        )GLSL";
+
+        constexpr char fragSrc[] = R"GLSL(
+            #version 120
+
+            varying vec2 uv;
+            uniform sampler2D sceneTex;
+
+            void main()
+            {
+                gl_FragData[0] = texture2D(sceneTex, uv);
+            }
+        )GLSL";
+
+        osg::ref_ptr<osg::Shader> vertShader = new osg::Shader(osg::Shader::VERTEX, vertSrc);
+        osg::ref_ptr<osg::Shader> fragShader = new osg::Shader(osg::Shader::FRAGMENT, fragSrc);
+
+        osg::ref_ptr<osg::Program> program = new osg::Program;
+        program->addShader(vertShader);
+        program->addShader(fragShader);
+
+        mHUDCamera->addChild(createFullScreenTri());
+
+        auto* stateset = mHUDCamera->getOrCreateStateSet();
+        stateset->setTextureAttributeAndModes(0, mSceneTex, osg::StateAttribute::ON);
+        stateset->setAttributeAndModes(program, osg::StateAttribute::ON);
+        stateset->addUniform(new osg::Uniform("sceneTex", 0));
+        stateset->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+        stateset->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
+    }
+
+}
diff --git a/apps/openmw/mwrender/postprocessor.hpp b/apps/openmw/mwrender/postprocessor.hpp
new file mode 100644
index 0000000000..c9d353f8cb
--- /dev/null
+++ b/apps/openmw/mwrender/postprocessor.hpp
@@ -0,0 +1,46 @@
+#ifndef OPENMW_MWRENDER_POSTPROCESSOR_H
+#define OPENMW_MWRENDER_POSTPROCESSOR_H
+
+#include <osg/ref_ptr>
+
+namespace osg
+{
+    class Texture2D;
+    class Group;
+    class FrameBufferObject;
+    class Camera;
+}
+
+namespace osgViewer
+{
+    class Viewer;
+}
+
+namespace MWRender
+{
+    class PostProcessor
+    {
+    public:
+        PostProcessor(osgViewer::Viewer* viewer, osg::Group* rootNode);
+
+        auto getMsaaFbo() { return mMsaaFbo; }
+        auto getFbo() { return mFbo; }
+
+        void resize(int width, int height);
+
+    private:
+        osgViewer::Viewer* mViewer;
+        osg::ref_ptr<osg::Group> mRootNode;
+        osg::ref_ptr<osg::Camera> mHUDCamera;
+
+        osg::ref_ptr<osg::FrameBufferObject> mMsaaFbo;
+        osg::ref_ptr<osg::FrameBufferObject> mFbo;
+
+        osg::ref_ptr<osg::Texture2D> mSceneTex;
+        osg::ref_ptr<osg::Texture2D> mDepthTex;
+
+        void createTexturesAndCamera(int width, int height);
+    };
+}
+
+#endif
\ No newline at end of file
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 81687a712a..dc439f00b8 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -11,6 +11,8 @@
 #include <osg/Group>
 #include <osg/UserDataContainer>
 #include <osg/ComputeBoundsVisitor>
+#include <osg/Depth>
+#include <osg/ClipControl>
 
 #include <osgUtil/LineSegmentIntersector>
 
@@ -68,6 +70,7 @@
 #include "objectpaging.hpp"
 #include "screenshotmanager.hpp"
 #include "groundcover.hpp"
+#include "postprocessor.hpp"
 
 namespace MWRender
 {
@@ -198,6 +201,17 @@ namespace MWRender
         , mFieldOfViewOverridden(false)
         , mFieldOfViewOverride(0.f)
     {
+        auto ext = osg::GLExtensions::Get(0, false);
+        bool reverseZ = ext && ext->isClipControlSupported;
+
+        if (getenv("OPENMW_DISABLE_REVERSEZ") != nullptr)
+            reverseZ = false;
+
+        if (reverseZ)
+            Log(Debug::Info) << "Using reverse-z depth buffer";
+        else
+            Log(Debug::Info) << "Using standard depth buffer";
+
         auto lightingMethod = SceneUtil::LightManager::getLightingMethodFromString(Settings::Manager::getString("lighting method", "Shaders"));
 
         resourceSystem->getSceneManager()->setParticleSystemMask(MWRender::Mask_ParticleSystem);
@@ -216,6 +230,7 @@ namespace MWRender
         resourceSystem->getSceneManager()->setSpecularMapPattern(Settings::Manager::getString("specular map pattern", "Shaders"));
         resourceSystem->getSceneManager()->setApplyLightingToEnvMaps(Settings::Manager::getBool("apply lighting to environment maps", "Shaders"));
         resourceSystem->getSceneManager()->setConvertAlphaTestToAlphaToCoverage(Settings::Manager::getBool("antialias alpha test", "Shaders") && Settings::Manager::getInt("antialiasing", "Video") > 1);
+        resourceSystem->getSceneManager()->setReverseZ(reverseZ);
 
         // Let LightManager choose which backend to use based on our hint. For methods besides legacy lighting, this depends on support for various OpenGL extensions.
         osg::ref_ptr<SceneUtil::LightManager> sceneRoot = new SceneUtil::LightManager(lightingMethod == SceneUtil::LightingMethod::FFP);
@@ -242,7 +257,7 @@ namespace MWRender
         if (Settings::Manager::getBool("object shadows", "Shadows"))
             shadowCastingTraversalMask |= (Mask_Object|Mask_Static);
 
-        mShadowManager.reset(new SceneUtil::ShadowManager(sceneRoot, mRootNode, shadowCastingTraversalMask, indoorShadowCastingTraversalMask, mResourceSystem->getSceneManager()->getShaderManager()));
+        mShadowManager.reset(new SceneUtil::ShadowManager(sceneRoot, mRootNode, shadowCastingTraversalMask, indoorShadowCastingTraversalMask, mResourceSystem->getSceneManager()->getShaderManager(), reverseZ));
 
         Shader::ShaderManager::DefineMap shadowDefines = mShadowManager->getShadowDefines();
         Shader::ShaderManager::DefineMap lightDefines = sceneRoot->getLightDefines();
@@ -267,6 +282,8 @@ namespace MWRender
         globalDefines["groundcoverStompMode"] = std::to_string(std::clamp(Settings::Manager::getInt("stomp mode", "Groundcover"), 0, 2));
         globalDefines["groundcoverStompIntensity"] = std::to_string(std::clamp(Settings::Manager::getInt("stomp intensity", "Groundcover"), 0, 2));
 
+        globalDefines["reverseZ"] = reverseZ ? "1" : "0";
+
         // It is unnecessary to stop/start the viewer as no frames are being rendered yet.
         mResourceSystem->getSceneManager()->getShaderManager().setGlobalDefines(globalDefines);
 
@@ -413,6 +430,7 @@ namespace MWRender
         mViewer->getCamera()->setCullMask(~(Mask_UpdateVisitor|Mask_SimpleWater));
         NifOsg::Loader::setHiddenNodeMask(Mask_UpdateVisitor);
         NifOsg::Loader::setIntersectionDisabledNodeMask(Mask_Effect);
+        NifOsg::Loader::setReverseZ(reverseZ);
         Nif::NIFFile::setLoadUnsupportedFiles(Settings::Manager::getBool("load unsupported nif files", "Models"));
 
         mNearClip = Settings::Manager::getFloat("near clip", "Camera");
@@ -434,6 +452,18 @@ namespace MWRender
 
         mUniformNear = mRootNode->getOrCreateStateSet()->getUniform("near");
         mUniformFar = mRootNode->getOrCreateStateSet()->getUniform("far");
+
+        if (reverseZ)
+        {
+            auto depth = SceneUtil::createDepth(reverseZ);
+            osg::ref_ptr<osg::ClipControl> clipcontrol = new osg::ClipControl(osg::ClipControl::LOWER_LEFT, osg::ClipControl::ZERO_TO_ONE);
+            mViewer->getCamera()->setClearDepth(0.0);
+            mRootNode->getOrCreateStateSet()->setAttributeAndModes(depth, osg::StateAttribute::ON);
+            mRootNode->getOrCreateStateSet()->setAttributeAndModes(clipcontrol, osg::StateAttribute::ON);
+        }
+
+        mPostProcessor.reset(new PostProcessor(viewer, mRootNode));
+
         updateProjectionMatrix();
     }
 
@@ -1066,7 +1096,20 @@ namespace MWRender
         float fov = mFieldOfView;
         if (mFieldOfViewOverridden)
             fov = mFieldOfViewOverride;
-        mViewer->getCamera()->setProjectionMatrixAsPerspective(fov, aspect, mNearClip, mViewDistance);
+
+        if (mResourceSystem->getSceneManager()->getReverseZ())
+        {
+            mViewer->getCamera()->setProjectionMatrix(SceneUtil::getReversedZProjectionMatrixAsPerspectiveInf(fov, aspect, mNearClip));
+            float linearFac = -mNearClip / (mViewDistance - mNearClip) - 1.0;
+            mRootNode->getOrCreateStateSet()->getOrCreateUniform("linearFac", osg::Uniform::FLOAT, 1)->set(linearFac);
+
+            osg::Matrix shadowProj = osg::Matrix::perspective(fov, aspect, mNearClip, mViewDistance);
+            mViewer->getCamera()->setUserValue("shadowProj", shadowProj);
+            mViewer->getCamera()->setUserValue("near", static_cast<double>(mNearClip));
+            mViewer->getCamera()->setUserValue("far", static_cast<double>(mViewDistance));
+        }
+        else
+            mViewer->getCamera()->setProjectionMatrixAsPerspective(fov, aspect, mNearClip, mViewDistance);
 
         mUniformNear->set(mNearClip);
         mUniformFar->set(mViewDistance);
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index a0a74bd5c4..b63841494b 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -89,6 +89,7 @@ namespace MWRender
     class RecastMesh;
     class ObjectPaging;
     class Groundcover;
+    class PostProcessor;
 
     class RenderingManager : public MWRender::RenderingInterface
     {
@@ -287,6 +288,7 @@ namespace MWRender
         std::unique_ptr<ScreenshotManager> mScreenshotManager;
         std::unique_ptr<EffectManager> mEffectManager;
         std::unique_ptr<SceneUtil::ShadowManager> mShadowManager;
+        std::unique_ptr<PostProcessor> mPostProcessor;
         osg::ref_ptr<NpcAnimation> mPlayerAnimation;
         osg::ref_ptr<SceneUtil::PositionAttitudeTransform> mPlayerNode;
         std::unique_ptr<Camera> mCamera;
diff --git a/apps/openmw/mwrender/ripplesimulation.cpp b/apps/openmw/mwrender/ripplesimulation.cpp
index 6788f53f44..c7deac51de 100644
--- a/apps/openmw/mwrender/ripplesimulation.cpp
+++ b/apps/openmw/mwrender/ripplesimulation.cpp
@@ -16,6 +16,7 @@
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/fallback/fallback.hpp>
+#include <components/sceneutil/util.hpp>
 
 #include "vismask.hpp"
 
@@ -55,7 +56,7 @@ namespace
         stateset->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
         stateset->setTextureAttributeAndModes(0, textures[0], osg::StateAttribute::ON);
 
-        osg::ref_ptr<osg::Depth> depth (new osg::Depth);
+        auto depth = SceneUtil::createDepth(resourceSystem->getSceneManager()->getReverseZ());
         depth->setWriteMask(false);
         stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
 
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index 8bac90604b..604e417a45 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -473,7 +473,7 @@ const float CelestialBody::mDistance = 1000.0f;
 class Sun : public CelestialBody
 {
 public:
-    Sun(osg::Group* parentNode, Resource::ImageManager& imageManager)
+    Sun(osg::Group* parentNode, Resource::ImageManager& imageManager, bool reverseZ)
         : CelestialBody(parentNode, 1.0f, 1, Mask_Sun)
         , mUpdater(new Updater)
     {
@@ -502,8 +502,8 @@ public:
 
         mTransform->addChild(queryNode);
 
-        mOcclusionQueryVisiblePixels = createOcclusionQueryNode(queryNode, true);
-        mOcclusionQueryTotalPixels = createOcclusionQueryNode(queryNode, false);
+        mOcclusionQueryVisiblePixels = createOcclusionQueryNode(queryNode, true, reverseZ);
+        mOcclusionQueryTotalPixels = createOcclusionQueryNode(queryNode, false, reverseZ);
 
         createSunFlash(imageManager);
         createSunGlare();
@@ -556,7 +556,7 @@ private:
     };
 
     /// @param queryVisible If true, queries the amount of visible pixels. If false, queries the total amount of pixels.
-    osg::ref_ptr<osg::OcclusionQueryNode> createOcclusionQueryNode(osg::Group* parent, bool queryVisible)
+    osg::ref_ptr<osg::OcclusionQueryNode> createOcclusionQueryNode(osg::Group* parent, bool queryVisible, bool reverseZ)
     {
         osg::ref_ptr<osg::OcclusionQueryNode> oqn = new osg::OcclusionQueryNode;
         oqn->setQueriesEnabled(true);
@@ -594,13 +594,13 @@ private:
         osg::StateSet* queryStateSet = new osg::StateSet;
         if (queryVisible)
         {
-            osg::ref_ptr<osg::Depth> depth (new osg::Depth);
-            depth->setFunction(osg::Depth::LEQUAL);
+            auto depth = SceneUtil::createDepth(reverseZ);
             // This is a trick to make fragments written by the query always use the maximum depth value,
             // without having to retrieve the current far clipping distance.
             // We want the sun glare to be "infinitely" far away.
-            depth->setZNear(1.0);
-            depth->setZFar(1.0);
+            float far = reverseZ ? 0.0 : 1.0;
+            depth->setZNear(far);
+            depth->setZFar(far);
             depth->setWriteMask(false);
             queryStateSet->setAttributeAndModes(depth, osg::StateAttribute::ON);
         }
@@ -1188,7 +1188,8 @@ void SkyManager::create()
     mAtmosphereNightUpdater = new AtmosphereNightUpdater(mSceneManager->getImageManager());
     atmosphereNight->addUpdateCallback(mAtmosphereNightUpdater);
 
-    mSun.reset(new Sun(mEarlyRenderBinRoot, *mSceneManager->getImageManager()));
+    bool reverseZ = mSceneManager->getReverseZ();
+    mSun.reset(new Sun(mEarlyRenderBinRoot, *mSceneManager->getImageManager(), reverseZ));
 
     mMasser.reset(new Moon(mEarlyRenderBinRoot, *mSceneManager->getImageManager(), Fallback::Map::getFloat("Moons_Masser_Size")/125, Moon::Type_Masser));
     mSecunda.reset(new Moon(mEarlyRenderBinRoot, *mSceneManager->getImageManager(), Fallback::Map::getFloat("Moons_Secunda_Size")/125, Moon::Type_Secunda));
@@ -1209,7 +1210,7 @@ void SkyManager::create()
     mCloudMesh2->addUpdateCallback(mCloudUpdater2);
     mCloudMesh2->setNodeMask(0);
 
-    osg::ref_ptr<osg::Depth> depth = new osg::Depth;
+    auto depth = SceneUtil::createDepth(reverseZ);
     depth->setWriteMask(false);
     mEarlyRenderBinRoot->getOrCreateStateSet()->setAttributeAndModes(depth, osg::StateAttribute::ON);
     mEarlyRenderBinRoot->getOrCreateStateSet()->setMode(GL_BLEND, osg::StateAttribute::ON);
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index 621a5e7c25..1318921688 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -273,6 +273,7 @@ public:
 
     void setDefaults(osg::Camera* camera) override
     {
+        camera->setClearDepth(1.0);
         camera->setReferenceFrame(osg::Camera::RELATIVE_RF);
         camera->setSmallFeatureCullingPixelSize(Settings::Manager::getInt("small feature culling pixel size", "Water"));
         camera->setName("RefractionCamera");
@@ -338,6 +339,7 @@ public:
 
     void setDefaults(osg::Camera* camera) override
     {
+        camera->setClearDepth(1.0);
         camera->setReferenceFrame(osg::Camera::RELATIVE_RF);
         camera->setSmallFeatureCullingPixelSize(Settings::Manager::getInt("small feature culling pixel size", "Water"));
         camera->setName("ReflectionCamera");
@@ -544,7 +546,7 @@ osg::Node* Water::getRefractionNode()
 
 void Water::createSimpleWaterStateSet(osg::Node* node, float alpha)
 {
-    osg::ref_ptr<osg::StateSet> stateset = SceneUtil::createSimpleWaterStateSet(alpha, MWRender::RenderBin_Water);
+    osg::ref_ptr<osg::StateSet> stateset = SceneUtil::createSimpleWaterStateSet(alpha, MWRender::RenderBin_Water, mResourceSystem->getSceneManager()->getReverseZ());
 
     node->setStateSet(stateset);
     node->setUpdateCallback(nullptr);
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 7c32bb04f8..384c640388 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -226,6 +226,18 @@ namespace NifOsg
         return sIntersectionDisabledNodeMask;
     }
 
+    bool Loader::sReverseZ = false;
+
+    void Loader::setReverseZ(bool reverseZ)
+    {
+        sReverseZ = reverseZ;
+    }
+
+    bool Loader::getReverseZ()
+    {
+        return sReverseZ;
+    }
+
     class LoaderImpl
     {
     public:
@@ -1823,7 +1835,7 @@ namespace NifOsg
                 // Depth test flag
                 stateset->setMode(GL_DEPTH_TEST, zprop->flags&1 ? osg::StateAttribute::ON
                                                                 : osg::StateAttribute::OFF);
-                osg::ref_ptr<osg::Depth> depth = new osg::Depth;
+                auto depth = SceneUtil::createDepth(Loader::getReverseZ());
                 // Depth write flag
                 depth->setWriteMask((zprop->flags>>1)&1);
                 // Morrowind ignores depth test function
diff --git a/components/nifosg/nifloader.hpp b/components/nifosg/nifloader.hpp
index 8ee6b41674..cee75de6d2 100644
--- a/components/nifosg/nifloader.hpp
+++ b/components/nifosg/nifloader.hpp
@@ -51,10 +51,14 @@ namespace NifOsg
         static void setIntersectionDisabledNodeMask(unsigned int mask);
         static unsigned int getIntersectionDisabledNodeMask();
 
+        static void setReverseZ(bool reverseZ);
+        static bool getReverseZ();
+
     private:
         static unsigned int sHiddenNodeMask;
         static unsigned int sIntersectionDisabledNodeMask;
         static bool sShowMarkers;
+        static bool sReverseZ;
     };
 
 }
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index f6035a47dd..70e849b234 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -275,6 +275,16 @@ namespace Resource
         return mClampLighting;
     }
 
+    void SceneManager::setReverseZ(bool reverseZ)
+    {
+        mReverseZ = reverseZ;
+    }
+
+    bool SceneManager::getReverseZ() const
+    {
+        return mReverseZ;
+    }
+
     void SceneManager::setAutoUseNormalMaps(bool use)
     {
         mAutoUseNormalMaps = use;
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index de014165bf..260fd4717f 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -92,6 +92,9 @@ namespace Resource
         void setClampLighting(bool clamp);
         bool getClampLighting() const;
 
+        void setReverseZ(bool reverseZ);
+        bool getReverseZ() const;
+
         /// @see ShaderVisitor::setAutoUseNormalMaps
         void setAutoUseNormalMaps(bool use);
 
@@ -202,6 +205,7 @@ namespace Resource
         SceneUtil::LightingMethod mLightingMethod;
         SceneUtil::LightManager::SupportedMethods mSupportedLightingMethods;
         bool mConvertAlphaTestToAlphaToCoverage;
+        bool mReverseZ;
 
         osg::ref_ptr<MultiObjectCache> mInstanceCache;
 
diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
index ad3fc5fd65..bbda5442bf 100644
--- a/components/sceneutil/mwshadowtechnique.cpp
+++ b/components/sceneutil/mwshadowtechnique.cpp
@@ -23,10 +23,13 @@
 #include <osg/Geometry>
 #include <osg/io_utils>
 #include <osg/Depth>
+#include <osg/ClipControl>
 
 #include <sstream>
 #include "shadowsbin.hpp"
 
+#include <components/sceneutil/util.hpp>
+
 namespace {
 
 using namespace osgShadow;
@@ -347,6 +350,11 @@ void VDSMCameraCullCallback::operator()(osg::Node* node, osg::NodeVisitor* nv)
     _projectionMatrix = cv->getProjectionMatrix();
 }
 
+bool isOrthographicViewFrustum(const osg::Matrix& m)
+{
+    return m(0,3)==0.0 && m(1,3)==0.0 && m(2,3)==0.0; 
+}
+
 } // namespace
 
 MWShadowTechnique::ComputeLightSpaceBounds::ComputeLightSpaceBounds(osg::Viewport* viewport, const osg::Matrixd& projectionMatrix, osg::Matrixd& viewMatrix) :
@@ -890,6 +898,16 @@ void SceneUtil::MWShadowTechnique::disableFrontFaceCulling()
     }
 }
 
+void SceneUtil::MWShadowTechnique::enableReverseZ()
+{
+    _reverseZ = true;
+}
+
+void SceneUtil::MWShadowTechnique::disableReverseZ()
+{
+    _reverseZ = false;
+}
+
 void SceneUtil::MWShadowTechnique::setupCastingShader(Shader::ShaderManager & shaderManager)
 {
     // This can't be part of the constructor as OSG mandates that there be a trivial constructor available
@@ -970,6 +988,9 @@ void MWShadowTechnique::cull(osgUtil::CullVisitor& cv)
         return;
     }
 
+    osg::Matrix shadowProj;
+    cv.getCurrentCamera()->getUserValue("shadowProj", shadowProj);
+
     ViewDependentData* vdd = getViewDependentData(&cv);
 
     if (!vdd)
@@ -985,34 +1006,41 @@ void MWShadowTechnique::cull(osgUtil::CullVisitor& cv)
 
     osg::CullSettings::ComputeNearFarMode cachedNearFarMode = cv.getComputeNearFarMode();
 
-    osg::RefMatrix& viewProjectionMatrix = *cv.getProjectionMatrix();
-
-    // check whether this main views projection is perspective or orthographic
-    bool orthographicViewFrustum = viewProjectionMatrix(0,3)==0.0 &&
-                                   viewProjectionMatrix(1,3)==0.0 &&
-                                   viewProjectionMatrix(2,3)==0.0;
-
     double minZNear = 0.0;
     double maxZFar = dbl_max;
+    bool orthographicViewFrustum;
 
-    if (cachedNearFarMode==osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR)
+    if (_reverseZ)
     {
-        double left, right, top, bottom;
-        if (orthographicViewFrustum)
+        cv.getCurrentCamera()->getUserValue("near", minZNear);
+        cv.getCurrentCamera()->getUserValue("far", maxZFar);
+        orthographicViewFrustum = isOrthographicViewFrustum(shadowProj);
+    }
+    else
+    {
+        osg::RefMatrix& viewProjectionMatrix = *cv.getProjectionMatrix();
+
+        // check whether this main views projection is perspective or orthographic
+        orthographicViewFrustum = isOrthographicViewFrustum(viewProjectionMatrix);
+
+        if (cachedNearFarMode==osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR)
         {
-            viewProjectionMatrix.getOrtho(left, right, bottom, top, minZNear, maxZFar);
+            double left, right, top, bottom;
+            if (orthographicViewFrustum)
+            {
+                viewProjectionMatrix.getOrtho(left, right, bottom, top, minZNear, maxZFar);
+            }
+            else
+            {
+                viewProjectionMatrix.getFrustum(left, right, bottom, top, minZNear, maxZFar);
+            }
         }
-        else
+
+        // set the compute near/far mode to the highest quality setting to ensure we push the near plan out as far as possible
+        if (settings->getComputeNearFarModeOverride()!=osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR)
         {
-            viewProjectionMatrix.getFrustum(left, right, bottom, top, minZNear, maxZFar);
+            cv.setComputeNearFarMode(settings->getComputeNearFarModeOverride());
         }
-        OSG_INFO<<"minZNear="<<minZNear<<", maxZFar="<<maxZFar<<std::endl;
-    }
-
-    // set the compute near/far mode to the highest quality setting to ensure we push the near plan out as far as possible
-    if (settings->getComputeNearFarModeOverride()!=osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR)
-    {
-        cv.setComputeNearFarMode(settings->getComputeNearFarModeOverride());
     }
 
     // 1. Traverse main scene graph
@@ -1024,6 +1052,9 @@ void MWShadowTechnique::cull(osgUtil::CullVisitor& cv)
 
     cv.popStateSet();
 
+    if (_reverseZ)
+        cv.pushProjectionMatrix(new osg::RefMatrix(shadowProj));
+
     if (cv.getComputeNearFarMode()!=osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR)
     {
         OSG_INFO<<"Just done main subgraph traversak"<<std::endl;
@@ -1063,7 +1094,8 @@ void MWShadowTechnique::cull(osgUtil::CullVisitor& cv)
     }
 
     // return compute near far mode back to it's original settings
-    cv.setComputeNearFarMode(cachedNearFarMode);
+    if (!_reverseZ)
+        cv.setComputeNearFarMode(cachedNearFarMode);
 
     OSG_INFO<<"frustum.eye="<<frustum.eye<<", frustum.centerNearPlane, "<<frustum.centerNearPlane<<" distance = "<<(frustum.eye-frustum.centerNearPlane).length()<<std::endl;
 
@@ -1448,6 +1480,8 @@ void MWShadowTechnique::cull(osgUtil::CullVisitor& cv)
         prepareStateSetForRenderingShadow(*vdd, cv.getTraversalNumber());
     }
 
+    if (_reverseZ)
+        cv.popProjectionMatrix();
     // OSG_NOTICE<<"End of shadow setup Projection matrix "<<*cv.getProjectionMatrix()<<std::endl;
 }
 
@@ -1636,6 +1670,9 @@ void MWShadowTechnique::createShaders()
     _shadowCastingStateSet->addUniform(new osg::Uniform("alphaTestShadows", false));
     osg::ref_ptr<osg::Depth> depth = new osg::Depth;
     depth->setWriteMask(true);
+    osg::ref_ptr<osg::ClipControl> clipcontrol = new osg::ClipControl(osg::ClipControl::LOWER_LEFT, osg::ClipControl::NEGATIVE_ONE_TO_ONE);
+    if (_reverseZ)
+        _shadowCastingStateSet->setAttribute(clipcontrol, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
     _shadowCastingStateSet->setAttribute(depth, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
     _shadowCastingStateSet->setMode(GL_DEPTH_CLAMP, osg::StateAttribute::ON);
 
diff --git a/components/sceneutil/mwshadowtechnique.hpp b/components/sceneutil/mwshadowtechnique.hpp
index de57bf1fdc..7fde0d7dbb 100644
--- a/components/sceneutil/mwshadowtechnique.hpp
+++ b/components/sceneutil/mwshadowtechnique.hpp
@@ -85,6 +85,10 @@ namespace SceneUtil {
 
         virtual void disableFrontFaceCulling();
 
+        virtual void enableReverseZ();
+
+        virtual void disableReverseZ();
+
         virtual void setupCastingShader(Shader::ShaderManager &shaderManager);
 
         class ComputeLightSpaceBounds : public osg::NodeVisitor, public osg::CullStack
@@ -266,6 +270,8 @@ namespace SceneUtil {
 
         float                                   _shadowFadeStart = 0.0;
 
+        bool                                    _reverseZ = false;
+
         class DebugHUD final : public osg::Referenced
         {
         public:
diff --git a/components/sceneutil/optimizer.cpp b/components/sceneutil/optimizer.cpp
index b48ceda409..6bde81c12d 100644
--- a/components/sceneutil/optimizer.cpp
+++ b/components/sceneutil/optimizer.cpp
@@ -40,6 +40,8 @@
 
 #include <iterator>
 
+#include <components/sceneutil/util.hpp>
+
 using namespace osgUtil;
 
 namespace SceneUtil
@@ -107,6 +109,7 @@ void Optimizer::optimize(osg::Node* node, unsigned int options)
         MergeGeometryVisitor mgv(this);
         mgv.setTargetMaximumNumberOfVertices(1000000);
         mgv.setMergeAlphaBlending(_mergeAlphaBlending);
+        mgv.setReverseZ(_reverseZ);
         mgv.setViewPoint(_viewPoint);
         node->accept(mgv);
 
@@ -1560,7 +1563,7 @@ bool Optimizer::MergeGeometryVisitor::mergeGroup(osg::Group& group)
                 }
                 if (_alphaBlendingActive && _mergeAlphaBlending && !geom->getStateSet())
                 {
-                    osg::Depth* d = new osg::Depth;
+                    auto d = createDepth(_reverseZ);
                     d->setWriteMask(0);
                     geom->getOrCreateStateSet()->setAttribute(d);
                 }
diff --git a/components/sceneutil/optimizer.hpp b/components/sceneutil/optimizer.hpp
index 2d6293e231..9f9c788445 100644
--- a/components/sceneutil/optimizer.hpp
+++ b/components/sceneutil/optimizer.hpp
@@ -65,7 +65,7 @@ class Optimizer
 
     public:
 
-        Optimizer() : _mergeAlphaBlending(false) {}
+        Optimizer() : _mergeAlphaBlending(false), _reverseZ(false) {}
         virtual ~Optimizer() {}
 
         enum OptimizationOptions
@@ -119,6 +119,7 @@ class Optimizer
         };
 
         void setMergeAlphaBlending(bool merge) { _mergeAlphaBlending = merge; }
+        void setReverseZ(bool reverseZ) { _reverseZ = reverseZ; }
         void setViewPoint(const osg::Vec3f& viewPoint) { _viewPoint = viewPoint; }
 
         /** Reset internal data to initial state - the getPermissibleOptionsMap is cleared.*/
@@ -257,6 +258,7 @@ class Optimizer
 
         osg::Vec3f _viewPoint;
         bool _mergeAlphaBlending;
+        bool _reverseZ;
 
     public:
 
@@ -377,12 +379,18 @@ class Optimizer
                 /// default to traversing all children.
                 MergeGeometryVisitor(Optimizer* optimizer=0) :
                     BaseOptimizerVisitor(optimizer, MERGE_GEOMETRY),
-                    _targetMaximumNumberOfVertices(10000), _alphaBlendingActive(false), _mergeAlphaBlending(false) {}
+                    _targetMaximumNumberOfVertices(10000), _alphaBlendingActive(false), _mergeAlphaBlending(false), _reverseZ(false) {}
 
                 void setMergeAlphaBlending(bool merge)
                 {
                     _mergeAlphaBlending = merge;
                 }
+
+                void setReverseZ(bool reverseZ)
+                {
+                    _reverseZ = reverseZ;
+                }
+
                 void setViewPoint(const osg::Vec3f& viewPoint)
                 {
                     _viewPoint = viewPoint;
@@ -421,6 +429,7 @@ class Optimizer
                 std::vector<osg::StateSet*> _stateSetStack;
                 bool _alphaBlendingActive;
                 bool _mergeAlphaBlending;
+                bool _reverseZ;
                 osg::Vec3f _viewPoint;
         };
 
diff --git a/components/sceneutil/shadow.cpp b/components/sceneutil/shadow.cpp
index 3244dc672a..32c2edeccd 100644
--- a/components/sceneutil/shadow.cpp
+++ b/components/sceneutil/shadow.cpp
@@ -94,10 +94,12 @@ namespace SceneUtil
         }
     }
 
-    ShadowManager::ShadowManager(osg::ref_ptr<osg::Group> sceneRoot, osg::ref_ptr<osg::Group> rootNode, unsigned int outdoorShadowCastingMask, unsigned int indoorShadowCastingMask, Shader::ShaderManager &shaderManager) : mShadowedScene(new osgShadow::ShadowedScene),
-        mShadowTechnique(new MWShadowTechnique),
-        mOutdoorShadowCastingMask(outdoorShadowCastingMask),
-        mIndoorShadowCastingMask(indoorShadowCastingMask)
+    ShadowManager::ShadowManager(osg::ref_ptr<osg::Group> sceneRoot, osg::ref_ptr<osg::Group> rootNode, unsigned int outdoorShadowCastingMask, unsigned int indoorShadowCastingMask, Shader::ShaderManager &shaderManager, bool reverseZ)
+        : mShadowedScene(new osgShadow::ShadowedScene)
+        , mReverseZ(reverseZ)
+        , mShadowTechnique(new MWShadowTechnique)
+        , mOutdoorShadowCastingMask(outdoorShadowCastingMask)
+        , mIndoorShadowCastingMask(indoorShadowCastingMask)
     {
         mShadowedScene->setShadowTechnique(mShadowTechnique);
 
@@ -108,6 +110,9 @@ namespace SceneUtil
         mShadowSettings = mShadowedScene->getShadowSettings();
         setupShadowSettings();
 
+        if (mReverseZ)
+            mShadowTechnique->enableReverseZ();
+
         mShadowTechnique->setupCastingShader(shaderManager);
 
         enableOutdoorMode();
@@ -180,4 +185,9 @@ namespace SceneUtil
             mShadowTechnique->enableShadows();
         mShadowSettings->setCastsShadowTraversalMask(mOutdoorShadowCastingMask);
     }
+    
+    bool ShadowManager::getReverseZ() const
+    {
+        return mReverseZ;
+    }
 }
diff --git a/components/sceneutil/shadow.hpp b/components/sceneutil/shadow.hpp
index c823ecf860..8092f77f93 100644
--- a/components/sceneutil/shadow.hpp
+++ b/components/sceneutil/shadow.hpp
@@ -17,7 +17,7 @@ namespace SceneUtil
 
         static Shader::ShaderManager::DefineMap getShadowsDisabledDefines();
 
-        ShadowManager(osg::ref_ptr<osg::Group> sceneRoot, osg::ref_ptr<osg::Group> rootNode, unsigned int outdoorShadowCastingMask, unsigned int indoorShadowCastingMask, Shader::ShaderManager &shaderManager);
+        ShadowManager(osg::ref_ptr<osg::Group> sceneRoot, osg::ref_ptr<osg::Group> rootNode, unsigned int outdoorShadowCastingMask, unsigned int indoorShadowCastingMask, Shader::ShaderManager &shaderManager, bool reverseZ);
 
         void setupShadowSettings();
 
@@ -26,8 +26,11 @@ namespace SceneUtil
         void enableIndoorMode();
 
         void enableOutdoorMode();
+
+        bool getReverseZ() const;
     protected:
         bool mEnableShadows;
+        bool mReverseZ;
 
         osg::ref_ptr<osgShadow::ShadowedScene> mShadowedScene;
         osg::ref_ptr<osgShadow::ShadowSettings> mShadowSettings;
diff --git a/components/sceneutil/util.cpp b/components/sceneutil/util.cpp
index 9b4fb9d3fb..2e37260eb7 100644
--- a/components/sceneutil/util.cpp
+++ b/components/sceneutil/util.cpp
@@ -285,4 +285,43 @@ bool attachAlphaToCoverageFriendlyFramebufferToCamera(osg::Camera* camera, osg::
     return addMSAAIntermediateTarget;
 }
 
+osg::ref_ptr<osg::Depth> createDepth(bool reverseZ)
+{
+    static osg::Depth::Function func = reverseZ ? osg::Depth::GEQUAL : osg::Depth::LEQUAL;
+    return new osg::Depth(func);
+}
+
+osg::Matrix getReversedZProjectionMatrixAsPerspectiveInf(double fov, double aspect, double near)
+{
+    double A = 1.0/std::tan(osg::DegreesToRadians(fov)/2.0);
+    return osg::Matrix(
+        A/aspect,   0,      0,      0,
+        0,          A,      0,      0,
+        0,          0,      0,      -1,
+        0,          0,      near,   0
+    );
+}
+
+osg::Matrix getReversedZProjectionMatrixAsPerspective(double fov, double aspect, double near, double far)
+{
+    double A = 1.0/std::tan(osg::DegreesToRadians(fov)/2.0);
+    return osg::Matrix(
+        A/aspect,   0,      0,                          0,
+        0,          A,      0,                          0,
+        0,          0,      far/(far-near)-1.0,         -1,
+        0,          0,      -(far*near)/(far - near),   0
+    );
+}
+
+osg::Matrix getReversedZProjectionMatrixAsOrtho(double left, double right, double bottom, double top, double near, double far)
+{
+    return osg::Matrix(
+        2/(right-left),             0,                          0,                  0,
+        0,                          2/(top-bottom),             0,                  0,
+        0,                          0,                          1/(far-near),       0,
+        (right+left)/(left-right),  (top+bottom)/(bottom-top),  far/(far-near),     1
+    );
+}
+
+
 }
diff --git a/components/sceneutil/util.hpp b/components/sceneutil/util.hpp
index f297c42d2e..0164e0c99e 100644
--- a/components/sceneutil/util.hpp
+++ b/components/sceneutil/util.hpp
@@ -7,6 +7,7 @@
 #include <osg/NodeCallback>
 #include <osg/Texture2D>
 #include <osg/Vec4f>
+#include <osg/Depth>
 
 #include <components/resource/resourcesystem.hpp>
 
@@ -64,6 +65,23 @@ namespace SceneUtil
 
     // Alpha-to-coverage requires a multisampled framebuffer, so we need to set that up for RTTs
     bool attachAlphaToCoverageFriendlyFramebufferToCamera(osg::Camera* camera, osg::Camera::BufferComponent buffer, osg::Texture* texture, unsigned int level = 0, unsigned int face = 0, bool mipMapGeneration = false);
+
+    // Returns a suitable depth state attribute dependent on whether a reverse-z
+    // depth buffer is in use.
+    osg::ref_ptr<osg::Depth> createDepth(bool reverseZ);
+
+    // Returns a perspective projection matrix for use with a reversed z-buffer
+    // and an infinite far plane. This is derived by mapping the default z-range
+    // of [0,1] to [1,0], then taking the limit as far plane approaches
+    // infinity.
+    osg::Matrix getReversedZProjectionMatrixAsPerspectiveInf(double fov, double aspect, double near);
+
+    // Returns a perspective projection matrix for use with a reversed z-buffer.
+    osg::Matrix getReversedZProjectionMatrixAsPerspective(double fov, double aspect, double near, double far);
+
+    // Returns an orthographic projection matrix for use with a reversed z-buffer.
+    osg::Matrix getReversedZProjectionMatrixAsOrtho(double left, double right, double bottom, double top, double near, double far);
+
 }
 
 #endif
diff --git a/components/sceneutil/waterutil.cpp b/components/sceneutil/waterutil.cpp
index 8a434105c8..dccc534ecc 100644
--- a/components/sceneutil/waterutil.cpp
+++ b/components/sceneutil/waterutil.cpp
@@ -5,6 +5,8 @@
 #include <osg/Material>
 #include <osg/StateSet>
 
+#include "util.hpp"
+
 namespace SceneUtil
 {
     // disable nonsense test against a worldsize bb what will always pass
@@ -62,7 +64,7 @@ namespace SceneUtil
         return waterGeom;
     }
 
-    osg::ref_ptr<osg::StateSet> createSimpleWaterStateSet(float alpha, int renderBin)
+    osg::ref_ptr<osg::StateSet> createSimpleWaterStateSet(float alpha, int renderBin, bool reverseZ)
     {
         osg::ref_ptr<osg::StateSet> stateset (new osg::StateSet);
 
@@ -76,7 +78,7 @@ namespace SceneUtil
         stateset->setMode(GL_BLEND, osg::StateAttribute::ON);
         stateset->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
 
-        osg::ref_ptr<osg::Depth> depth (new osg::Depth);
+        auto depth = createDepth(reverseZ);
         depth->setWriteMask(false);
         stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
 
diff --git a/components/sceneutil/waterutil.hpp b/components/sceneutil/waterutil.hpp
index 7b8c380109..7f08dbcfa9 100644
--- a/components/sceneutil/waterutil.hpp
+++ b/components/sceneutil/waterutil.hpp
@@ -13,7 +13,7 @@ namespace SceneUtil
 {
     osg::ref_ptr<osg::Geometry> createWaterGeometry(float size, int segments, float textureRepeats);
 
-    osg::ref_ptr<osg::StateSet> createSimpleWaterStateSet(float alpha, int renderBin);
+    osg::ref_ptr<osg::StateSet> createSimpleWaterStateSet(float alpha, int renderBin, bool reverseZ);
 }
 
 #endif
diff --git a/components/terrain/chunkmanager.cpp b/components/terrain/chunkmanager.cpp
index a744471de5..5354b9d8a2 100644
--- a/components/terrain/chunkmanager.cpp
+++ b/components/terrain/chunkmanager.cpp
@@ -163,7 +163,7 @@ std::vector<osg::ref_ptr<osg::StateSet> > ChunkManager::createPasses(float chunk
 
     float blendmapScale = mStorage->getBlendmapScale(chunkSize);
 
-    return ::Terrain::createPasses(useShaders, &mSceneManager->getShaderManager(), layers, blendmapTextures, blendmapScale, blendmapScale);
+    return ::Terrain::createPasses(useShaders, mSceneManager, layers, blendmapTextures, blendmapScale, blendmapScale);
 }
 
 osg::ref_ptr<osg::Node> ChunkManager::createChunk(float chunkSize, const osg::Vec2f &chunkCenter, unsigned char lod, unsigned int lodFlags, bool compile)
@@ -219,7 +219,7 @@ osg::ref_ptr<osg::Node> ChunkManager::createChunk(float chunkSize, const osg::Ve
         layer.mDiffuseMap = compositeMap->mTexture;
         layer.mParallax = false;
         layer.mSpecular = false;
-        geometry->setPasses(::Terrain::createPasses(mSceneManager->getForceShaders() || !mSceneManager->getClampLighting(), &mSceneManager->getShaderManager(), std::vector<TextureLayer>(1, layer), std::vector<osg::ref_ptr<osg::Texture2D> >(), 1.f, 1.f));
+        geometry->setPasses(::Terrain::createPasses(mSceneManager->getForceShaders() || !mSceneManager->getClampLighting(), mSceneManager, std::vector<TextureLayer>(1, layer), std::vector<osg::ref_ptr<osg::Texture2D> >(), 1.f, 1.f));
     }
     else
     {
diff --git a/components/terrain/material.cpp b/components/terrain/material.cpp
index e662f4439f..dc74b58560 100644
--- a/components/terrain/material.cpp
+++ b/components/terrain/material.cpp
@@ -7,7 +7,9 @@
 #include <osg/TexMat>
 #include <osg/BlendFunc>
 
+#include <components/resource/scenemanager.hpp>
 #include <components/shader/shadermanager.hpp>
+#include <components/sceneutil/util.hpp>
 
 #include <mutex>
 
@@ -95,19 +97,18 @@ namespace
     class LequalDepth
     {
     public:
-        static const osg::ref_ptr<osg::Depth>& value()
+        static const osg::ref_ptr<osg::Depth>& value(bool reverseZ)
         {
-            static LequalDepth instance;
+            static LequalDepth instance(reverseZ);
             return instance.mValue;
         }
 
     private:
         osg::ref_ptr<osg::Depth> mValue;
 
-        LequalDepth()
-            : mValue(new osg::Depth)
+        LequalDepth(bool reverseZ)
+            : mValue(SceneUtil::createDepth(reverseZ))
         {
-            mValue->setFunction(osg::Depth::LEQUAL);
         }
     };
 
@@ -170,9 +171,10 @@ namespace
 
 namespace Terrain
 {
-    std::vector<osg::ref_ptr<osg::StateSet> > createPasses(bool useShaders, Shader::ShaderManager* shaderManager, const std::vector<TextureLayer> &layers,
+    std::vector<osg::ref_ptr<osg::StateSet> > createPasses(bool useShaders, Resource::SceneManager* sceneManager, const std::vector<TextureLayer> &layers,
                                                            const std::vector<osg::ref_ptr<osg::Texture2D> > &blendmaps, int blendmapScale, float layerTileSize)
     {
+        Shader::ShaderManager* shaderManager = &sceneManager->getShaderManager();
         std::vector<osg::ref_ptr<osg::StateSet> > passes;
 
         unsigned int blendmapIndex = 0;
@@ -195,7 +197,7 @@ namespace Terrain
                 else
                 {
                     stateset->setAttributeAndModes(BlendFuncFirst::value(), osg::StateAttribute::ON);
-                    stateset->setAttributeAndModes(LequalDepth::value(), osg::StateAttribute::ON);
+                    stateset->setAttributeAndModes(LequalDepth::value(sceneManager->getReverseZ()), osg::StateAttribute::ON);
                 }
             }
 
@@ -238,7 +240,7 @@ namespace Terrain
                 if (!vertexShader || !fragmentShader)
                 {
                     // Try again without shader. Error already logged by above
-                    return createPasses(false, shaderManager, layers, blendmaps, blendmapScale, layerTileSize);
+                    return createPasses(false, sceneManager, layers, blendmaps, blendmapScale, layerTileSize);
                 }
 
                 stateset->setAttributeAndModes(shaderManager->getProgram(vertexShader, fragmentShader));
diff --git a/components/terrain/material.hpp b/components/terrain/material.hpp
index 5f78af6a06..d5ef40a29e 100644
--- a/components/terrain/material.hpp
+++ b/components/terrain/material.hpp
@@ -10,9 +10,9 @@ namespace osg
     class Texture2D;
 }
 
-namespace Shader
+namespace Resource
 {
-    class ShaderManager;
+    class SceneManager;
 }
 
 namespace Terrain
@@ -26,7 +26,7 @@ namespace Terrain
         bool mSpecular;
     };
 
-    std::vector<osg::ref_ptr<osg::StateSet> > createPasses(bool useShaders, Shader::ShaderManager* shaderManager,
+    std::vector<osg::ref_ptr<osg::StateSet> > createPasses(bool useShaders, Resource::SceneManager* sceneManager,
                                                            const std::vector<TextureLayer>& layers,
                                                            const std::vector<osg::ref_ptr<osg::Texture2D> >& blendmaps, int blendmapScale, float layerTileSize);
 
diff --git a/files/shaders/CMakeLists.txt b/files/shaders/CMakeLists.txt
index 5297b2e752..5e049b8a3f 100644
--- a/files/shaders/CMakeLists.txt
+++ b/files/shaders/CMakeLists.txt
@@ -13,6 +13,7 @@ set(SHADER_FILES
     water_fragment.glsl
     water_nm.png
     alpha.glsl
+    depth.glsl
     objects_vertex.glsl
     objects_fragment.glsl
     terrain_vertex.glsl
diff --git a/files/shaders/depth.glsl b/files/shaders/depth.glsl
new file mode 100644
index 0000000000..0adde7a2a7
--- /dev/null
+++ b/files/shaders/depth.glsl
@@ -0,0 +1,12 @@
+#if @reverseZ
+uniform float linearFac;
+#endif
+
+float getLinearDepth(in vec4 viewPos)
+{
+#if @reverseZ
+    return linearFac*viewPos.z;
+#else
+    return gl_Position.z;
+#endif
+}
\ No newline at end of file
diff --git a/files/shaders/groundcover_vertex.glsl b/files/shaders/groundcover_vertex.glsl
index a12fb3d9d9..94586734b6 100644
--- a/files/shaders/groundcover_vertex.glsl
+++ b/files/shaders/groundcover_vertex.glsl
@@ -39,6 +39,7 @@ centroid varying vec3 shadowDiffuseLighting;
 
 #include "shadows_vertex.glsl"
 #include "lighting.glsl"
+#include "depth.glsl"
 
 uniform float osg_SimulationTime;
 uniform mat4 osg_ViewMatrixInverse;
@@ -143,7 +144,7 @@ void main(void)
     else
         gl_Position = gl_ProjectionMatrix * viewPos;
 
-    linearDepth = gl_Position.z;
+    linearDepth = getLinearDepth(viewPos);
 
 #if (!PER_PIXEL_LIGHTING || @shadows_enabled)
     vec3 viewNormal = normalize((gl_NormalMatrix * rotation3(rotation) * gl_Normal).xyz);
diff --git a/files/shaders/nv_default_vertex.glsl b/files/shaders/nv_default_vertex.glsl
index 50f5daf25e..1c5483dcda 100644
--- a/files/shaders/nv_default_vertex.glsl
+++ b/files/shaders/nv_default_vertex.glsl
@@ -32,6 +32,7 @@ varying vec3 passNormal;
 #include "vertexcolors.glsl"
 #include "shadows_vertex.glsl"
 #include "lighting.glsl"
+#include "depth.glsl"
 
 void main(void)
 {
@@ -40,7 +41,7 @@ void main(void)
     vec4 viewPos = (gl_ModelViewMatrix * gl_Vertex);
     gl_ClipVertex = viewPos;
     euclideanDepth = length(viewPos.xyz);
-    linearDepth = gl_Position.z;
+    linearDepth = getLinearDepth(viewPos);
 
 #if @diffuseMap
     diffuseMapUV = (gl_TextureMatrix[@diffuseMapUV] * gl_MultiTexCoord@diffuseMapUV).xy;
diff --git a/files/shaders/nv_nolighting_vertex.glsl b/files/shaders/nv_nolighting_vertex.glsl
index 275f1e5730..02c28eb5e3 100644
--- a/files/shaders/nv_nolighting_vertex.glsl
+++ b/files/shaders/nv_nolighting_vertex.glsl
@@ -17,6 +17,7 @@ varying vec3 passViewPos;
 varying float passFalloff;
 
 #include "vertexcolors.glsl"
+#include "depth.glsl"
 
 void main(void)
 {
@@ -27,7 +28,7 @@ void main(void)
 #if @radialFog
     euclideanDepth = length(viewPos.xyz);
 #else
-    linearDepth = gl_Position.z;
+    linearDepth = getLinearDepth(viewPos);
 #endif
 
 #if @diffuseMap
diff --git a/files/shaders/objects_vertex.glsl b/files/shaders/objects_vertex.glsl
index 64c35a21cc..34484ebd41 100644
--- a/files/shaders/objects_vertex.glsl
+++ b/files/shaders/objects_vertex.glsl
@@ -62,6 +62,7 @@ varying vec3 passNormal;
 #include "shadows_vertex.glsl"
 
 #include "lighting.glsl"
+#include "depth.glsl"
 
 void main(void)
 {
@@ -70,7 +71,7 @@ void main(void)
     vec4 viewPos = (gl_ModelViewMatrix * gl_Vertex);
     gl_ClipVertex = viewPos;
     euclideanDepth = length(viewPos.xyz);
-    linearDepth = gl_Position.z;
+    linearDepth = getLinearDepth(viewPos);
 
 #if (@envMap || !PER_PIXEL_LIGHTING || @shadows_enabled)
     vec3 viewNormal = normalize((gl_NormalMatrix * gl_Normal).xyz);
diff --git a/files/shaders/terrain_vertex.glsl b/files/shaders/terrain_vertex.glsl
index 638d6cca0b..221e0c27a9 100644
--- a/files/shaders/terrain_vertex.glsl
+++ b/files/shaders/terrain_vertex.glsl
@@ -25,6 +25,7 @@ varying vec3 passNormal;
 #include "shadows_vertex.glsl"
 
 #include "lighting.glsl"
+#include "depth.glsl"
 
 void main(void)
 {
@@ -33,7 +34,7 @@ void main(void)
     vec4 viewPos = (gl_ModelViewMatrix * gl_Vertex);
     gl_ClipVertex = viewPos;
     euclideanDepth = length(viewPos.xyz);
-    linearDepth = gl_Position.z;
+    linearDepth = getLinearDepth(viewPos);
 
 #if (!PER_PIXEL_LIGHTING || @shadows_enabled)
     vec3 viewNormal = normalize((gl_NormalMatrix * gl_Normal).xyz);
diff --git a/files/shaders/water_fragment.glsl b/files/shaders/water_fragment.glsl
index d1e795eca7..ed0ebdc913 100644
--- a/files/shaders/water_fragment.glsl
+++ b/files/shaders/water_fragment.glsl
@@ -158,11 +158,14 @@ uniform float rainIntensity;
 float frustumDepth;
 
 float linearizeDepth(float depth)
-  {
-    float z_n = 2.0 * depth - 1.0;
-    depth = 2.0 * near * far / (far + near - z_n * frustumDepth);
-    return depth;
-  }
+{
+#if @reverseZ
+  depth = 1.0 - depth;
+#endif
+  float z_n = 2.0 * depth - 1.0;
+  depth = 2.0 * near * far / (far + near - z_n * frustumDepth);
+  return depth;
+}
 
 void main(void)
 {
diff --git a/files/shaders/water_vertex.glsl b/files/shaders/water_vertex.glsl
index 02a395f95d..9513001847 100644
--- a/files/shaders/water_vertex.glsl
+++ b/files/shaders/water_vertex.glsl
@@ -5,6 +5,7 @@ varying vec4  position;
 varying float linearDepth;
 
 #include "shadows_vertex.glsl"
+#include "depth.glsl"
 
 void main(void)
 {
@@ -20,7 +21,8 @@ void main(void)
 
     position = gl_Vertex;
 
-    linearDepth = gl_Position.z;
+    vec4 viewPos = gl_ModelViewMatrix * gl_Vertex;
+    linearDepth = getLinearDepth(viewPos);
 
-    setupShadowCoords(gl_ModelViewMatrix * gl_Vertex, normalize((gl_NormalMatrix * gl_Normal).xyz));
+    setupShadowCoords(viewPos, normalize((gl_NormalMatrix * gl_Normal).xyz));
 }

From d89e37d6895c19b558668b6d4f193250807bc36d Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Wed, 2 Jun 2021 14:46:26 -0700
Subject: [PATCH 1141/2859] add framebuffer extension check and fix issues with
 manual screenshots

---
 apps/openmw/mwgui/savegamedialog.cpp       |  1 +
 apps/openmw/mwrender/postprocessor.cpp     |  2 ++
 apps/openmw/mwrender/renderingmanager.cpp  |  5 ++++-
 apps/openmw/mwrender/screenshotmanager.cpp | 23 +++++++++++++++++++++-
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwgui/savegamedialog.cpp b/apps/openmw/mwgui/savegamedialog.cpp
index c4d608443c..987d27c9a6 100644
--- a/apps/openmw/mwgui/savegamedialog.cpp
+++ b/apps/openmw/mwgui/savegamedialog.cpp
@@ -450,6 +450,7 @@ namespace MWGui
 
         osg::ref_ptr<osg::Texture2D> texture (new osg::Texture2D);
         texture->setImage(result.getImage());
+        texture->setInternalFormat(GL_RGBA);
         texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
         texture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
         texture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
diff --git a/apps/openmw/mwrender/postprocessor.cpp b/apps/openmw/mwrender/postprocessor.cpp
index ed8171bd91..43765a25ba 100644
--- a/apps/openmw/mwrender/postprocessor.cpp
+++ b/apps/openmw/mwrender/postprocessor.cpp
@@ -116,6 +116,8 @@ namespace MWRender
         mFbo->setAttachment(osg::Camera::COLOR_BUFFER0, osg::FrameBufferAttachment(mSceneTex));
         mFbo->setAttachment(osg::Camera::DEPTH_BUFFER, osg::FrameBufferAttachment(mDepthTex));
 
+        mViewer->getCamera()->setUserData(mFbo);
+
         // When MSAA is enabled we must first render to a render buffer, then
         // blit the result to the FBO which is either passed to the main frame
         // buffer for display or used as the entry point for a post process chain.
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index dc439f00b8..65aa4a5a6b 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -462,7 +462,10 @@ namespace MWRender
             mRootNode->getOrCreateStateSet()->setAttributeAndModes(clipcontrol, osg::StateAttribute::ON);
         }
 
-        mPostProcessor.reset(new PostProcessor(viewer, mRootNode));
+        if (ext && ext->isFrameBufferObjectSupported)
+           mPostProcessor.reset(new PostProcessor(viewer, mRootNode));
+        else
+           Log(Debug::Warning) << "Disabling postprocessing and using default framebuffer for rendering: FrameBufferObjects not supported";
 
         updateProjectionMatrix();
     }
diff --git a/apps/openmw/mwrender/screenshotmanager.cpp b/apps/openmw/mwrender/screenshotmanager.cpp
index b24572dbaa..ba4282e5b6 100644
--- a/apps/openmw/mwrender/screenshotmanager.cpp
+++ b/apps/openmw/mwrender/screenshotmanager.cpp
@@ -12,6 +12,7 @@
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/shader/shadermanager.hpp>
+#include <components/sceneutil/util.hpp>
 
 #include <components/settings/settings.hpp>
 
@@ -88,6 +89,19 @@ namespace MWRender
             int topPadding = std::max(0, static_cast<int>(screenH - screenW / imageaspect) / 2);
             int width = screenW - leftPadding*2;
             int height = screenH - topPadding*2;
+
+            // Ensure we are reading from the resolved framebuffer and not the multisampled render buffer when in use.
+            // glReadPixel() cannot read from multisampled targets.
+
+            osg::FrameBufferObject* fbo = dynamic_cast<osg::FrameBufferObject*>(renderInfo.getCurrentCamera()->getUserData());
+
+            if (fbo)
+            {
+                osg::GLExtensions* ext = osg::GLExtensions::Get(renderInfo.getContextID(), false);
+                if (ext)
+                    ext->glBindFramebuffer(GL_FRAMEBUFFER_EXT, fbo->getHandle(renderInfo.getContextID()));
+            }
+
             mImage->readPixels(leftPadding, topPadding, width, height, GL_RGB, GL_UNSIGNED_BYTE);
             mImage->scaleImage(mWidth, mHeight, 1);
         }
@@ -236,6 +250,7 @@ namespace MWRender
 
         osg::ref_ptr<osg::Camera> screenshotCamera(new osg::Camera);
         osg::ref_ptr<osg::ShapeDrawable> quad(new osg::ShapeDrawable(new osg::Box(osg::Vec3(0,0,0), 2.0)));
+        quad->getOrCreateStateSet()->setRenderBinDetails(100, "RenderBin", osg::StateSet::USE_RENDERBIN_DETAILS);
 
         std::map<std::string, std::string> defineMap;
 
@@ -283,6 +298,9 @@ namespace MWRender
         camera->setReferenceFrame(osg::Camera::ABSOLUTE_RF);
         camera->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT,osg::Camera::PIXEL_BUFFER_RTT);
 
+        if (MWBase::Environment::get().getResourceSystem()->getSceneManager()->getReverseZ())
+            camera->setClearDepth(0.0);
+
         camera->setViewport(0, 0, w, h);
 
         osg::ref_ptr<osg::Texture2D> texture (new osg::Texture2D);
@@ -318,7 +336,10 @@ namespace MWRender
         float nearClip = Settings::Manager::getFloat("near clip", "Camera");
         float viewDistance = Settings::Manager::getFloat("viewing distance", "Camera");
         // each cubemap side sees 90 degrees
-        rttCamera->setProjectionMatrixAsPerspective(90.0, w/float(h), nearClip, viewDistance);
+        if (MWBase::Environment::get().getResourceSystem()->getSceneManager()->getReverseZ())
+            rttCamera->setProjectionMatrix(SceneUtil::getReversedZProjectionMatrixAsPerspectiveInf(90.0, w/float(h), nearClip));
+        else
+            rttCamera->setProjectionMatrixAsPerspective(90.0, w/float(h), nearClip, viewDistance);
         rttCamera->setViewMatrix(mViewer->getCamera()->getViewMatrix() * cameraTransform);
 
         rttCamera->setUpdateCallback(new NoTraverseCallback);

From b457dfd8b838ad63613c4c19edf51f43af4943a5 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Fri, 4 Jun 2021 12:13:52 -0700
Subject: [PATCH 1142/2859] fix water RTTs and minor math error in non-infinite
 projection matrix

---
 components/sceneutil/util.cpp | 31 +++++++++++++++++++++++++++++--
 components/sceneutil/util.hpp | 17 +++++++++++++++++
 2 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/components/sceneutil/util.cpp b/components/sceneutil/util.cpp
index 2e37260eb7..79fe5d13c5 100644
--- a/components/sceneutil/util.cpp
+++ b/components/sceneutil/util.cpp
@@ -150,6 +150,33 @@ void GlowUpdater::setDuration(float duration)
     mDuration = duration;
 }
 
+AttachMultisampledDepthColorCallback::AttachMultisampledDepthColorCallback(const osg::ref_ptr<osg::Texture2D>& colorTex, const osg::ref_ptr<osg::Texture2D>& depthTex, int samples, int colorSamples)
+{
+    int width = colorTex->getTextureWidth();
+    int height = colorTex->getTextureHeight();
+
+    osg::ref_ptr<osg::RenderBuffer> rbColor = new osg::RenderBuffer(width, height, colorTex->getInternalFormat(), samples, colorSamples);
+    osg::ref_ptr<osg::RenderBuffer> rbDepth = new osg::RenderBuffer(width, height, depthTex->getInternalFormat(), samples, colorSamples);
+
+    mMsaaFbo = new osg::FrameBufferObject;
+    mMsaaFbo->setAttachment(osg::Camera::COLOR_BUFFER0, osg::FrameBufferAttachment(rbColor));
+    mMsaaFbo->setAttachment(osg::Camera::DEPTH_BUFFER, osg::FrameBufferAttachment(rbDepth));
+
+    mFbo = new osg::FrameBufferObject;
+    mFbo->setAttachment(osg::Camera::COLOR_BUFFER0, osg::FrameBufferAttachment(colorTex));
+    mFbo->setAttachment(osg::Camera::DEPTH_BUFFER, osg::FrameBufferAttachment(depthTex));
+}
+
+void AttachMultisampledDepthColorCallback::operator()(osg::Node* node, osg::NodeVisitor* nv)
+{
+    osgUtil::RenderStage* renderStage = nv->asCullVisitor()->getCurrentRenderStage();
+
+    renderStage->setMultisampleResolveFramebufferObject(mFbo);
+    renderStage->setFrameBufferObject(mMsaaFbo);
+
+    traverse(node, nv);
+}
+
 void transformBoundingSphere (const osg::Matrixf& matrix, osg::BoundingSphere& bsphere)
 {
     osg::BoundingSphere::vec_type xdash = bsphere._center;
@@ -308,8 +335,8 @@ osg::Matrix getReversedZProjectionMatrixAsPerspective(double fov, double aspect,
     return osg::Matrix(
         A/aspect,   0,      0,                          0,
         0,          A,      0,                          0,
-        0,          0,      far/(far-near)-1.0,         -1,
-        0,          0,      -(far*near)/(far - near),   0
+        0,          0,      near/(far-near),            -1,
+        0,          0,      (far*near)/(far - near),    0
     );
 }
 
diff --git a/components/sceneutil/util.hpp b/components/sceneutil/util.hpp
index 0164e0c99e..69e66bb8b3 100644
--- a/components/sceneutil/util.hpp
+++ b/components/sceneutil/util.hpp
@@ -8,6 +8,7 @@
 #include <osg/Texture2D>
 #include <osg/Vec4f>
 #include <osg/Depth>
+#include <osg/FrameBufferObject>
 
 #include <components/resource/resourcesystem.hpp>
 
@@ -48,6 +49,22 @@ namespace SceneUtil
         bool mDone;
     };
 
+    // Allows camera to render to a color and floating point depth texture with a multisampled framebuffer.
+    // Must be set on a cameras cull callback.
+    // When the depth texture isn't needed as a sampler, use osg::Camera::attach(osg::Camera::DEPTH_COMPONENT, GL_DEPTH_COMPONENT32F) instead.
+    // If multisampling is not being used on the color buffer attachment, use the osg::Camera::attach() method.
+    class AttachMultisampledDepthColorCallback : public osg::NodeCallback
+    {
+    public:
+        AttachMultisampledDepthColorCallback(const osg::ref_ptr<osg::Texture2D>& colorTex, const osg::ref_ptr<osg::Texture2D>& depthTex, int samples, int colorSamples);
+
+        void operator()(osg::Node* node, osg::NodeVisitor* nv) override;
+
+    private:
+        osg::ref_ptr<osg::FrameBufferObject> mFbo;
+        osg::ref_ptr<osg::FrameBufferObject> mMsaaFbo;
+    };
+
     // Transform a bounding sphere by a matrix
     // based off private code in osg::Transform
     // TODO: patch osg to make public

From cad0b151cb915556f9e30fcc36c193009c37f818 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Fri, 9 Jul 2021 10:05:27 -0700
Subject: [PATCH 1143/2859] enable shaders path and dehardcode depth formats

---
 CHANGELOG.md                                  |  1 +
 apps/openmw/mwgui/bookpage.cpp                |  8 +-
 apps/openmw/mwgui/mapwindow.cpp               |  4 +-
 apps/openmw/mwgui/mapwindow.hpp               |  2 +-
 apps/openmw/mwgui/windowmanagerimp.cpp        |  6 +-
 apps/openmw/mwrender/actorspaths.cpp          |  5 ++
 apps/openmw/mwrender/bulletdebugdraw.cpp      | 14 +++-
 apps/openmw/mwrender/characterpreview.cpp     |  3 +-
 apps/openmw/mwrender/globalmap.cpp            |  6 +-
 apps/openmw/mwrender/globalmap.hpp            |  4 +-
 apps/openmw/mwrender/localmap.cpp             | 12 +--
 apps/openmw/mwrender/localmap.hpp             |  3 +-
 apps/openmw/mwrender/navmesh.cpp              |  6 ++
 apps/openmw/mwrender/npcanimation.cpp         |  7 +-
 apps/openmw/mwrender/pathgrid.cpp             |  5 ++
 apps/openmw/mwrender/postprocessor.cpp        | 72 +++++++++++++----
 apps/openmw/mwrender/postprocessor.hpp        | 12 ++-
 apps/openmw/mwrender/recastmesh.cpp           |  6 ++
 apps/openmw/mwrender/renderingmanager.cpp     | 77 ++++++++++++++-----
 apps/openmw/mwrender/renderingmanager.hpp     |  6 +-
 apps/openmw/mwrender/screenshotmanager.cpp    |  4 +-
 apps/openmw/mwrender/sky.cpp                  | 18 ++---
 apps/openmw/mwrender/util.cpp                 |  8 ++
 apps/openmw/mwrender/util.hpp                 |  2 +
 components/resource/scenemanager.cpp          | 10 +++
 components/resource/scenemanager.hpp          |  4 +
 components/sceneutil/mwshadowtechnique.cpp    | 69 ++++++-----------
 components/sceneutil/shadow.cpp               |  4 +-
 components/sceneutil/util.cpp                 |  8 +-
 components/sceneutil/util.hpp                 |  4 +-
 components/terrain/cellborder.cpp             | 13 +++-
 components/terrain/cellborder.hpp             |  8 +-
 components/terrain/world.cpp                  |  3 +-
 .../reference/modding/settings/camera.rst     | 24 +++++-
 files/settings-default.cfg                    |  5 +-
 files/shaders/CMakeLists.txt                  |  2 +
 files/shaders/debug_fragment.glsl             |  8 ++
 files/shaders/debug_vertex.glsl               | 12 +++
 files/shaders/depth.glsl                      |  6 +-
 files/shaders/groundcover_vertex.glsl         |  5 +-
 files/shaders/nv_default_vertex.glsl          |  6 +-
 files/shaders/nv_nolighting_vertex.glsl       |  6 +-
 files/shaders/objects_vertex.glsl             |  7 +-
 files/shaders/terrain_vertex.glsl             |  6 +-
 files/shaders/water_vertex.glsl               |  8 +-
 45 files changed, 353 insertions(+), 156 deletions(-)
 create mode 100644 files/shaders/debug_fragment.glsl
 create mode 100644 files/shaders/debug_vertex.glsl

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a9ec5a946e..7e136d707a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,7 @@
     Feature #5489: MCP: Telekinesis fix for activators
     Feature #5996: Support Lua scripts in OpenMW
     Feature #6017: Separate persistent and temporary cell references when saving
+    Feature #6032: Reverse-z depth buffer
     Feature #6162: Refactor GUI to use shaders and to be GLES and GL3+ friendly
 
 0.47.0
diff --git a/apps/openmw/mwgui/bookpage.cpp b/apps/openmw/mwgui/bookpage.cpp
index c902ceb88a..e4ce2a9593 100644
--- a/apps/openmw/mwgui/bookpage.cpp
+++ b/apps/openmw/mwgui/bookpage.cpp
@@ -8,14 +8,12 @@
 #include "MyGUI_FactoryManager.h"
 
 #include <components/misc/utf8stream.hpp>
-#include <components/sceneutil/util.hpp>
-#include <components/resource/resourcesystem.hpp>
-#include <components/resource/scenemanager.hpp>
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 
+#include "../mwrender/util.hpp"
+
 namespace MWGui
 {
 struct TypesetBookImpl;
@@ -1221,7 +1219,7 @@ public:
 
         RenderXform renderXform (mCroppedParent, textFormat.mRenderItem->getRenderTarget()->getInfo());
 
-        float z = MWBase::Environment::get().getResourceSystem()->getSceneManager()->getReverseZ() ? 1.0 : -1.0;
+        float z = MWRender::getReverseZ() ? 1.f : -1.f;
 
         GlyphStream glyphStream(textFormat.mFont, static_cast<float>(mCoord.left), static_cast<float>(mCoord.top - mViewTop),
                                   z /*mNode->getNodeDepth()*/, vertices, renderXform);
diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index 538b866cac..efb434d3bc 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -741,7 +741,7 @@ namespace MWGui
     }
 
     // ------------------------------------------------------------------------------------------
-    MapWindow::MapWindow(CustomMarkerCollection &customMarkers, DragAndDrop* drag, MWRender::LocalMap* localMapRender, SceneUtil::WorkQueue* workQueue, bool reverseZ)
+    MapWindow::MapWindow(CustomMarkerCollection &customMarkers, DragAndDrop* drag, MWRender::LocalMap* localMapRender, SceneUtil::WorkQueue* workQueue)
         : WindowPinnableBase("openmw_map_window.layout")
         , LocalMapBase(customMarkers, localMapRender)
         , NoDrop(drag, mMainWidget)
@@ -751,7 +751,7 @@ namespace MWGui
         , mGlobal(Settings::Manager::getBool("global", "Map"))
         , mEventBoxGlobal(nullptr)
         , mEventBoxLocal(nullptr)
-        , mGlobalMapRender(new MWRender::GlobalMap(localMapRender->getRoot(), workQueue, reverseZ))
+        , mGlobalMapRender(new MWRender::GlobalMap(localMapRender->getRoot(), workQueue))
         , mEditNoteDialog()
     {
         static bool registered = false;
diff --git a/apps/openmw/mwgui/mapwindow.hpp b/apps/openmw/mwgui/mapwindow.hpp
index b7664505af..cb0d368b30 100644
--- a/apps/openmw/mwgui/mapwindow.hpp
+++ b/apps/openmw/mwgui/mapwindow.hpp
@@ -222,7 +222,7 @@ namespace MWGui
     class MapWindow : public MWGui::WindowPinnableBase, public LocalMapBase, public NoDrop
     {
     public:
-        MapWindow(CustomMarkerCollection& customMarkers, DragAndDrop* drag, MWRender::LocalMap* localMapRender, SceneUtil::WorkQueue* workQueue, bool reverseZ);
+        MapWindow(CustomMarkerCollection& customMarkers, DragAndDrop* drag, MWRender::LocalMap* localMapRender, SceneUtil::WorkQueue* workQueue);
         virtual ~MapWindow();
 
         void setCellName(const std::string& cellName);
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 5feed41864..e42d606966 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -35,7 +35,6 @@
 
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/imagemanager.hpp>
-#include <components/resource/scenemanager.hpp>
 
 #include <components/sceneutil/workqueue.hpp>
 
@@ -305,9 +304,8 @@ namespace MWGui
         mGuiModeStates[GM_MainMenu] = GuiModeState(menu);
         mWindows.push_back(menu);
 
-        bool reverseZ = mResourceSystem->getSceneManager()->getReverseZ();
-        mLocalMapRender = new MWRender::LocalMap(mViewer->getSceneData()->asGroup(), reverseZ);
-        mMap = new MapWindow(mCustomMarkers, mDragAndDrop, mLocalMapRender, mWorkQueue, reverseZ);
+        mLocalMapRender = new MWRender::LocalMap(mViewer->getSceneData()->asGroup());
+        mMap = new MapWindow(mCustomMarkers, mDragAndDrop, mLocalMapRender, mWorkQueue);
         mWindows.push_back(mMap);
         mMap->renderGlobalMap();
         trackWindow(mMap, "map");
diff --git a/apps/openmw/mwrender/actorspaths.cpp b/apps/openmw/mwrender/actorspaths.cpp
index 35b2553555..4e3bfd79a6 100644
--- a/apps/openmw/mwrender/actorspaths.cpp
+++ b/apps/openmw/mwrender/actorspaths.cpp
@@ -2,9 +2,13 @@
 #include "vismask.hpp"
 
 #include <components/sceneutil/agentpath.hpp>
+#include <components/resource/resourcesystem.hpp>
+#include <components/resource/scenemanager.hpp>
 
 #include <osg/PositionAttitudeTransform>
 
+#include "../mwbase/world.hpp"
+#include "../mwbase/environment.hpp"
 namespace MWRender
 {
     ActorsPaths::ActorsPaths(const osg::ref_ptr<osg::Group>& root, bool enabled)
@@ -43,6 +47,7 @@ namespace MWRender
         const auto newGroup = SceneUtil::createAgentPathGroup(path, halfExtents, start, end, settings);
         if (newGroup)
         {
+            MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(newGroup, "debug");
             newGroup->setNodeMask(Mask_Debug);
             mRootNode->addChild(newGroup);
             mGroups[actor] = newGroup;
diff --git a/apps/openmw/mwrender/bulletdebugdraw.cpp b/apps/openmw/mwrender/bulletdebugdraw.cpp
index 207b0ee504..9039ec53ce 100644
--- a/apps/openmw/mwrender/bulletdebugdraw.cpp
+++ b/apps/openmw/mwrender/bulletdebugdraw.cpp
@@ -10,10 +10,19 @@
 #include <osg/PolygonMode>
 #include <osg/ShapeDrawable>
 #include <osg/StateSet>
+#include <osg/Fog>
 
 #include "bulletdebugdraw.hpp"
 #include "vismask.hpp"
 
+#include <components/resource/resourcesystem.hpp>
+#include <components/resource/scenemanager.hpp>
+
+#include <components/sceneutil/util.hpp>
+
+#include "../mwbase/world.hpp"
+#include "../mwbase/environment.hpp"
+
 namespace MWRender
 {
 
@@ -30,7 +39,6 @@ void DebugDrawer::createGeometry()
     {
         mGeometry = new osg::Geometry;
         mGeometry->setNodeMask(Mask_Debug);
-
         mVertices = new osg::Vec3Array;
         mColors = new osg::Vec4Array;
 
@@ -42,6 +50,8 @@ void DebugDrawer::createGeometry()
         mGeometry->setColorBinding(osg::Geometry::BIND_PER_VERTEX);
         mGeometry->setDataVariance(osg::Object::DYNAMIC);
         mGeometry->addPrimitiveSet(mDrawArrays);
+        // make this friendly to recreateShaders()
+        mGeometry->setStateSet(new osg::StateSet);
 
         mParentNode->addChild(mGeometry);
 
@@ -52,6 +62,8 @@ void DebugDrawer::createGeometry()
         mShapesRoot->setDataVariance(osg::Object::DYNAMIC);
         mShapesRoot->setNodeMask(Mask_Debug);
         mParentNode->addChild(mShapesRoot);
+
+        MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(mGeometry, "debug");
     }
 }
 
diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index c4c628e04d..580451ff8f 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -168,7 +168,7 @@ namespace MWRender
         mCamera->setRenderOrder(osg::Camera::PRE_RENDER);
         mCamera->attach(osg::Camera::COLOR_BUFFER, mTexture, 0, 0, false, Settings::Manager::getInt("antialiasing", "Video"));
         mCamera->setName("CharacterPreview");
-        mCamera->setComputeNearFarMode(osg::Camera::DO_NOT_COMPUTE_NEAR_FAR);
+        mCamera->setComputeNearFarMode(osg::Camera::COMPUTE_NEAR_FAR_USING_BOUNDING_VOLUMES);
         mCamera->setCullMask(~(Mask_UpdateVisitor));
 
         mCamera->setNodeMask(Mask_RenderToTexture);
@@ -187,6 +187,7 @@ namespace MWRender
         defaultMat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
         defaultMat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 0.f));
         stateset->setAttribute(defaultMat);
+        stateset->addUniform(new osg::Uniform("projectionMatrix", static_cast<osg::Matrixf>(mCamera->getProjectionMatrix())));
 
         osg::ref_ptr<osg::Depth> depth = new osg::Depth;
         stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
diff --git a/apps/openmw/mwrender/globalmap.cpp b/apps/openmw/mwrender/globalmap.cpp
index f9bbb3d2f4..2f160933fd 100644
--- a/apps/openmw/mwrender/globalmap.cpp
+++ b/apps/openmw/mwrender/globalmap.cpp
@@ -25,6 +25,7 @@
 #include "../mwworld/esmstore.hpp"
 
 #include "vismask.hpp"
+#include "util.hpp"
 
 namespace
 {
@@ -220,14 +221,13 @@ namespace MWRender
         osg::ref_ptr<osg::Texture2D> mOverlayTexture;
     };
 
-    GlobalMap::GlobalMap(osg::Group* root, SceneUtil::WorkQueue* workQueue, bool reverseZ)
+    GlobalMap::GlobalMap(osg::Group* root, SceneUtil::WorkQueue* workQueue)
         : mRoot(root)
         , mWorkQueue(workQueue)
         , mWidth(0)
         , mHeight(0)
         , mMinX(0), mMaxX(0)
         , mMinY(0), mMaxY(0)
-        , mReverseZ(reverseZ)
 
     {
         mCellSize = Settings::Manager::getInt("global map cell size", "Map");
@@ -325,7 +325,7 @@ namespace MWRender
         if (texture)
         {
             osg::ref_ptr<osg::Geometry> geom = createTexturedQuad(srcLeft, srcTop, srcRight, srcBottom);
-            auto depth = SceneUtil::createDepth(mReverseZ);
+            auto depth = SceneUtil::createDepth(getReverseZ());
             depth->setWriteMask(0);
             osg::StateSet* stateset = geom->getOrCreateStateSet();
             stateset->setAttribute(depth);
diff --git a/apps/openmw/mwrender/globalmap.hpp b/apps/openmw/mwrender/globalmap.hpp
index a27621c9f4..fd8a8d1016 100644
--- a/apps/openmw/mwrender/globalmap.hpp
+++ b/apps/openmw/mwrender/globalmap.hpp
@@ -33,7 +33,7 @@ namespace MWRender
     class GlobalMap
     {
     public:
-        GlobalMap(osg::Group* root, SceneUtil::WorkQueue* workQueue, bool reverseZ);
+        GlobalMap(osg::Group* root, SceneUtil::WorkQueue* workQueue);
         ~GlobalMap();
 
         void render();
@@ -126,8 +126,6 @@ namespace MWRender
         int mHeight;
 
         int mMinX, mMaxX, mMinY, mMaxY;
-
-        bool mReverseZ;
     };
 
 }
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index e0b3d6c69b..72f2828ace 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -30,6 +30,7 @@
 #include "../mwworld/cellstore.hpp"
 
 #include "vismask.hpp"
+#include "util.hpp"
 
 namespace
 {
@@ -83,14 +84,13 @@ namespace
 namespace MWRender
 {
 
-LocalMap::LocalMap(osg::Group* root, bool reverseZ)
+LocalMap::LocalMap(osg::Group* root)
     : mRoot(root)
     , mMapResolution(Settings::Manager::getInt("local map resolution", "Map"))
     , mMapWorldSize(Constants::CellSizeInUnits)
     , mCellDistance(Constants::CellGridRadius)
     , mAngle(0.f)
     , mInterior(false)
-    , mReverseZ(reverseZ)
 {
     // Increase map resolution, if use UI scaling
     float uiScale = MWBase::Environment::get().getWindowManager()->getScalingFactor();
@@ -178,7 +178,7 @@ osg::ref_ptr<osg::Camera> LocalMap::createOrthographicCamera(float x, float y, f
 {
     osg::ref_ptr<osg::Camera> camera (new osg::Camera);
 
-    if (mReverseZ)
+    if (getReverseZ())
         camera->setProjectionMatrix(SceneUtil::getReversedZProjectionMatrixAsOrtho(-width/2, width/2, -height/2, height/2, 5, (zmax-zmin) + 10));
     else
         camera->setProjectionMatrixAsOrtho(-width/2, width/2, -height/2, height/2, 5, (zmax-zmin) + 10);
@@ -201,13 +201,15 @@ osg::ref_ptr<osg::Camera> LocalMap::createOrthographicCamera(float x, float y, f
     osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
     stateset->setAttribute(new osg::PolygonMode(osg::PolygonMode::FRONT_AND_BACK, osg::PolygonMode::FILL), osg::StateAttribute::OVERRIDE);
 
-    if (mReverseZ)
+    if (getReverseZ())
     {
         camera->setClearDepth(0.0);
-        auto depth = SceneUtil::createDepth(mReverseZ);
+        auto depth = SceneUtil::createDepth(true);
         stateset->setAttributeAndModes(depth, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
     }
 
+    stateset->addUniform(new osg::Uniform("projectionMatrix", static_cast<osg::Matrixf>(camera->getProjectionMatrix())), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+
     // assign large value to effectively turn off fog
     // shaders don't respect glDisable(GL_FOG)
     osg::ref_ptr<osg::Fog> fog (new osg::Fog);
diff --git a/apps/openmw/mwrender/localmap.hpp b/apps/openmw/mwrender/localmap.hpp
index 316cbd53d3..f9ccd5a011 100644
--- a/apps/openmw/mwrender/localmap.hpp
+++ b/apps/openmw/mwrender/localmap.hpp
@@ -36,7 +36,7 @@ namespace MWRender
     class LocalMap
     {
     public:
-        LocalMap(osg::Group* root, bool reverseZ);
+        LocalMap(osg::Group* root);
         ~LocalMap();
 
         /**
@@ -156,7 +156,6 @@ namespace MWRender
         void setupRenderToTexture(osg::ref_ptr<osg::Camera> camera, int x, int y);
 
         bool mInterior;
-        bool mReverseZ;
         osg::BoundingBox mBounds;
     };
 
diff --git a/apps/openmw/mwrender/navmesh.cpp b/apps/openmw/mwrender/navmesh.cpp
index 791c41a1a0..523f7531af 100644
--- a/apps/openmw/mwrender/navmesh.cpp
+++ b/apps/openmw/mwrender/navmesh.cpp
@@ -2,9 +2,14 @@
 #include "vismask.hpp"
 
 #include <components/sceneutil/navmesh.hpp>
+#include <components/resource/resourcesystem.hpp>
+#include <components/resource/scenemanager.hpp>
 
 #include <osg/PositionAttitudeTransform>
 
+#include "../mwbase/world.hpp"
+#include "../mwbase/environment.hpp"
+
 namespace MWRender
 {
     NavMesh::NavMesh(const osg::ref_ptr<osg::Group>& root, bool enabled)
@@ -45,6 +50,7 @@ namespace MWRender
         mGroup = SceneUtil::createNavMeshGroup(navMesh, settings);
         if (mGroup)
         {
+            MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(mGroup, "debug");
             mGroup->setNodeMask(Mask_Debug);
             mRootNode->addChild(mGroup);
         }
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index d103234f31..64dc9ecfe0 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -43,6 +43,7 @@
 #include "rotatecontroller.hpp"
 #include "renderbin.hpp"
 #include "vismask.hpp"
+#include "util.hpp"
 
 namespace
 {
@@ -370,9 +371,9 @@ void NpcAnimation::setViewMode(NpcAnimation::ViewMode viewMode)
 class DepthClearCallback : public osgUtil::RenderBin::DrawCallback
 {
 public:
-    DepthClearCallback(bool reverseZ)
+    DepthClearCallback()
     {
-        mDepth = SceneUtil::createDepth(reverseZ);
+        mDepth = SceneUtil::createDepth(getReverseZ());
         mDepth->setWriteMask(true);
     }
 
@@ -432,7 +433,7 @@ void NpcAnimation::setRenderBin()
         if (!prototypeAdded)
         {
             osg::ref_ptr<osgUtil::RenderBin> depthClearBin (new osgUtil::RenderBin);
-            depthClearBin->setDrawCallback(new DepthClearCallback(mResourceSystem->getSceneManager()->getReverseZ()));
+            depthClearBin->setDrawCallback(new DepthClearCallback);
             osgUtil::RenderBin::addRenderBinPrototype("DepthClear", depthClearBin);
             prototypeAdded = true;
         }
diff --git a/apps/openmw/mwrender/pathgrid.cpp b/apps/openmw/mwrender/pathgrid.cpp
index c20e81bb2d..42d9150811 100644
--- a/apps/openmw/mwrender/pathgrid.cpp
+++ b/apps/openmw/mwrender/pathgrid.cpp
@@ -8,7 +8,10 @@
 
 #include <components/esm/loadpgrd.hpp>
 #include <components/sceneutil/pathgridutil.hpp>
+#include <components/sceneutil/util.hpp>
 #include <components/misc/coordinateconverter.hpp>
+#include <components/resource/resourcesystem.hpp>
+#include <components/resource/scenemanager.hpp>
 
 #include "../mwbase/world.hpp" // these includes can be removed once the static-hack is gone
 #include "../mwbase/environment.hpp"
@@ -112,6 +115,8 @@ void Pathgrid::enableCellPathgrid(const MWWorld::CellStore *store)
 
     osg::ref_ptr<osg::Geometry> geometry = SceneUtil::createPathgridGeometry(*pathgrid);
 
+    MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(geometry, "debug");
+
     cellPathGrid->addChild(geometry);
 
     mPathGridRoot->addChild(cellPathGrid);
diff --git a/apps/openmw/mwrender/postprocessor.cpp b/apps/openmw/mwrender/postprocessor.cpp
index 43765a25ba..a412ca8cfa 100644
--- a/apps/openmw/mwrender/postprocessor.cpp
+++ b/apps/openmw/mwrender/postprocessor.cpp
@@ -9,6 +9,11 @@
 #include <osgViewer/Viewer>
 
 #include <components/settings/settings.hpp>
+#include <components/sceneutil/util.hpp>
+#include <components/debug/debuglog.hpp>
+
+#include "vismask.hpp"
+#include "renderingmanager.hpp"
 
 namespace
 {
@@ -57,6 +62,8 @@ namespace
 
             traverse(node, nv);
         }
+
+    private:
         MWRender::PostProcessor* mPostProcessor;
         unsigned int mLastFrameNumber;
     };
@@ -70,6 +77,7 @@ namespace
 
         void resizedImplementation(osg::GraphicsContext* gc, int x, int y, int width, int height) override
         {
+            gc->resizedImplementation(x, y, width, height);
             mPostProcessor->resize(width, height);
         }
 
@@ -79,22 +87,55 @@ namespace
 
 namespace MWRender
 {
-    PostProcessor::PostProcessor(osgViewer::Viewer* viewer, osg::Group* rootNode)
+    PostProcessor::PostProcessor(RenderingManager& rendering, osgViewer::Viewer* viewer, osg::Group* rootNode)
         : mViewer(viewer)
         , mRootNode(new osg::Group)
+        , mRendering(rendering)
     {
+        osg::GraphicsContext* gc = viewer->getCamera()->getGraphicsContext();
+        unsigned int contextID = gc->getState()->getContextID();
+        osg::GLExtensions* ext = gc->getState()->get<osg::GLExtensions>();
+
+        constexpr char errPreamble[] = "Postprocessing and floating point depth buffers disabled: ";
+
+        if (!ext->isFrameBufferObjectSupported)
+        {
+            Log(Debug::Warning) << errPreamble << "FrameBufferObject unsupported.";
+            return;
+        }
+
+        if (Settings::Manager::getInt("antialiasing", "Video") > 1 && !ext->isRenderbufferMultisampleSupported())
+        {
+            Log(Debug::Warning) << errPreamble << "RenderBufferMultiSample unsupported. Disabling antialiasing will resolve this issue.";
+            return;
+        }
+
+        if (osg::isGLExtensionSupported(contextID, "GL_ARB_depth_buffer_float"))
+            mDepthFormat = GL_DEPTH_COMPONENT32F;
+        else if (osg::isGLExtensionSupported(contextID, "GL_NV_depth_buffer_float"))
+            mDepthFormat = GL_DEPTH_COMPONENT32F_NV;
+        else
+        {
+            // TODO: Once we have post-processing implemented we want to skip this return and continue with setup.
+            // Rendering to a FBO to fullscreen geometry has overhead (especially when MSAA is enabled) and there are no 
+            // benefits if no floating point depth formats are supported.
+            mDepthFormat = GL_DEPTH_COMPONENT24;
+            Log(Debug::Warning) << errPreamble << "'GL_ARB_depth_buffer_float' and 'GL_NV_depth_buffer_float' unsupported.";
+            return;
+        }
+
         int width = viewer->getCamera()->getViewport()->width();
         int height = viewer->getCamera()->getViewport()->height();
 
         createTexturesAndCamera(width, height);
-        resize(width, height);
+        resize(width, height, true);
 
         mRootNode->addChild(mHUDCamera);
         mRootNode->addChild(rootNode);
         mViewer->setSceneData(mRootNode);
 
-        // Main camera is treated specially, we need to manually set the FBO and
-        // resolve FBO during the cull callback.
+        // We need to manually set the FBO and resolve FBO during the cull callback. If we were using a separate
+        // RTT camera this would not be needed.
         mViewer->getCamera()->addCullCallback(new CullCallback(this));
         mViewer->getCamera()->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT);
         mViewer->getCamera()->attach(osg::Camera::COLOR_BUFFER0, mSceneTex);
@@ -103,12 +144,12 @@ namespace MWRender
         mViewer->getCamera()->getGraphicsContext()->setResizedCallback(new ResizedCallback(this));
     }
 
-    void PostProcessor::resize(int width, int height)
+    void PostProcessor::resize(int width, int height, bool init)
     {
         mDepthTex->setTextureSize(width, height);
         mSceneTex->setTextureSize(width, height);
-		mDepthTex->dirtyTextureObject();
-		mSceneTex->dirtyTextureObject();
+        mDepthTex->dirtyTextureObject();
+        mSceneTex->dirtyTextureObject();
 
         int samples = Settings::Manager::getInt("antialiasing", "Video");
 
@@ -130,15 +171,13 @@ namespace MWRender
             mMsaaFbo->setAttachment(osg::Camera::DEPTH_BUFFER, osg::FrameBufferAttachment(depthRB));
         }
 
-        double prevWidth = mViewer->getCamera()->getViewport()->width();
-        double prevHeight = mViewer->getCamera()->getViewport()->height();
-        double scaleX = prevWidth / width;
-        double scaleY = prevHeight / height;
+        if (init)
+            return;
 
-        mViewer->getCamera()->resize(width,height);
-        mHUDCamera->resize(width,height);
+        mViewer->getCamera()->resize(width, height);
+        mHUDCamera->resize(width, height);
 
-        mViewer->getCamera()->getProjectionMatrix() *= osg::Matrix::scale(scaleX, scaleY, 1.0);
+        mRendering.updateProjectionMatrix();
     }
 
     void PostProcessor::createTexturesAndCamera(int width, int height)
@@ -146,8 +185,8 @@ namespace MWRender
         mDepthTex = new osg::Texture2D;
         mDepthTex->setTextureSize(width, height);
         mDepthTex->setSourceFormat(GL_DEPTH_COMPONENT);
-        mDepthTex->setSourceType(GL_FLOAT);
-        mDepthTex->setInternalFormat(GL_DEPTH_COMPONENT32F);
+        mDepthTex->setSourceType(SceneUtil::isFloatingPointDepthFormat(getDepthFormat()) ? GL_FLOAT : GL_UNSIGNED_INT);
+        mDepthTex->setInternalFormat(mDepthFormat);
         mDepthTex->setFilter(osg::Texture2D::MIN_FILTER, osg::Texture2D::NEAREST);
         mDepthTex->setFilter(osg::Texture2D::MAG_FILTER, osg::Texture2D::NEAREST);
         mDepthTex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
@@ -206,6 +245,7 @@ namespace MWRender
         program->addShader(fragShader);
 
         mHUDCamera->addChild(createFullScreenTri());
+        mHUDCamera->setNodeMask(Mask_RenderToTexture);
 
         auto* stateset = mHUDCamera->getOrCreateStateSet();
         stateset->setTextureAttributeAndModes(0, mSceneTex, osg::StateAttribute::ON);
diff --git a/apps/openmw/mwrender/postprocessor.hpp b/apps/openmw/mwrender/postprocessor.hpp
index c9d353f8cb..5be58f33ac 100644
--- a/apps/openmw/mwrender/postprocessor.hpp
+++ b/apps/openmw/mwrender/postprocessor.hpp
@@ -18,15 +18,19 @@ namespace osgViewer
 
 namespace MWRender
 {
+    class RenderingManager;
+
     class PostProcessor
     {
     public:
-        PostProcessor(osgViewer::Viewer* viewer, osg::Group* rootNode);
+        PostProcessor(RenderingManager& rendering, osgViewer::Viewer* viewer, osg::Group* rootNode);
 
         auto getMsaaFbo() { return mMsaaFbo; }
         auto getFbo() { return mFbo; }
 
-        void resize(int width, int height);
+        int getDepthFormat() { return mDepthFormat; }
+
+        void resize(int width, int height, bool init=false);
 
     private:
         osgViewer::Viewer* mViewer;
@@ -39,7 +43,11 @@ namespace MWRender
         osg::ref_ptr<osg::Texture2D> mSceneTex;
         osg::ref_ptr<osg::Texture2D> mDepthTex;
 
+        int mDepthFormat;
+
         void createTexturesAndCamera(int width, int height);
+
+        RenderingManager& mRendering;
     };
 }
 
diff --git a/apps/openmw/mwrender/recastmesh.cpp b/apps/openmw/mwrender/recastmesh.cpp
index 7c7c6b8eb1..5afa78cd93 100644
--- a/apps/openmw/mwrender/recastmesh.cpp
+++ b/apps/openmw/mwrender/recastmesh.cpp
@@ -1,11 +1,15 @@
 #include "recastmesh.hpp"
 
 #include <components/sceneutil/recastmesh.hpp>
+#include <components/resource/resourcesystem.hpp>
+#include <components/resource/scenemanager.hpp>
 
 #include <osg/PositionAttitudeTransform>
 
 #include "vismask.hpp"
 
+#include "../mwbase/world.hpp"
+#include "../mwbase/environment.hpp"
 namespace MWRender
 {
     RecastMesh::RecastMesh(const osg::ref_ptr<osg::Group>& root, bool enabled)
@@ -49,6 +53,7 @@ namespace MWRender
                 || it->second.mRevision != tile->second->getRevision())
             {
                 const auto group = SceneUtil::createRecastMeshGroup(*tile->second, settings);
+                MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(group, "debug");
                 group->setNodeMask(Mask_Debug);
                 mRootNode->removeChild(it->second.mValue);
                 mRootNode->addChild(group);
@@ -66,6 +71,7 @@ namespace MWRender
             if (mGroups.count(tile.first))
                 continue;
             const auto group = SceneUtil::createRecastMeshGroup(*tile.second, settings);
+            MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(group, "debug");
             group->setNodeMask(Mask_Debug);
             mGroups.emplace(tile.first, Group {tile.second->getGeneration(), tile.second->getRevision(), group});
             mRootNode->addChild(group);
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 65aa4a5a6b..c64bcd3383 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -74,6 +74,45 @@
 
 namespace MWRender
 {
+    class SharedUniformStateUpdater : public SceneUtil::StateSetUpdater
+    {
+    public:
+        SharedUniformStateUpdater()
+            : mLinearFac(0.f)
+        {
+        }
+
+        void setDefaults(osg::StateSet *stateset) override
+        {
+            stateset->addUniform(new osg::Uniform("projectionMatrix", osg::Matrixf{}));
+            stateset->addUniform(new osg::Uniform("linearFac", 0.f));
+        }
+
+        void apply(osg::StateSet* stateset, osg::NodeVisitor* nv) override
+        {
+            auto* uProjectionMatrix = stateset->getUniform("projectionMatrix");
+            if (uProjectionMatrix)
+                uProjectionMatrix->set(mProjectionMatrix);
+
+            auto* uLinearFac = stateset->getUniform("linearFac");
+            if (uLinearFac)
+                uLinearFac->set(mLinearFac);
+        }
+
+        void setProjectionMatrix(const osg::Matrixf& projectionMatrix)
+        {
+            mProjectionMatrix = projectionMatrix;
+        }
+
+        void setLinearFac(float linearFac)
+        {
+            mLinearFac = linearFac;
+        }
+
+    private:
+        osg::Matrixf mProjectionMatrix;
+        float mLinearFac;
+    };
 
     class StateUpdater : public SceneUtil::StateSetUpdater
     {
@@ -202,10 +241,7 @@ namespace MWRender
         , mFieldOfViewOverride(0.f)
     {
         auto ext = osg::GLExtensions::Get(0, false);
-        bool reverseZ = ext && ext->isClipControlSupported;
-
-        if (getenv("OPENMW_DISABLE_REVERSEZ") != nullptr)
-            reverseZ = false;
+        bool reverseZ = Settings::Manager::getBool("reverse z", "Camera") && ext && ext->isClipControlSupported;
 
         if (reverseZ)
             Log(Debug::Info) << "Using reverse-z depth buffer";
@@ -219,7 +255,8 @@ namespace MWRender
         bool forceShaders = Settings::Manager::getBool("radial fog", "Shaders")
                             || Settings::Manager::getBool("force shaders", "Shaders")
                             || Settings::Manager::getBool("enable shadows", "Shadows")
-                            || lightingMethod != SceneUtil::LightingMethod::FFP;
+                            || lightingMethod != SceneUtil::LightingMethod::FFP
+                            || reverseZ;
         resourceSystem->getSceneManager()->setForceShaders(forceShaders);
         // FIXME: calling dummy method because terrain needs to know whether lighting is clamped
         resourceSystem->getSceneManager()->setClampLighting(Settings::Manager::getBool("clamp lighting", "Shaders"));
@@ -370,6 +407,10 @@ namespace MWRender
             // Use a stub grid to avoid splitting between chunks for active grid and chunks for distant cells.
             mGroundcoverWorld->setActiveGrid(osg::Vec4i(0, 0, 0, 0));
         }
+
+        mPostProcessor.reset(new PostProcessor(*this, viewer, mRootNode));
+        resourceSystem->getSceneManager()->setDepthFormat(mPostProcessor->getDepthFormat());
+
         // water goes after terrain for correct waterculling order
         mWater.reset(new Water(sceneRoot->getParent(0), sceneRoot, mResourceSystem, mViewer->getIncrementalCompileOperation(), resourcePath));
 
@@ -412,6 +453,9 @@ namespace MWRender
         mStateUpdater = new StateUpdater;
         sceneRoot->addUpdateCallback(mStateUpdater);
 
+        mSharedUniformStateUpdater = new SharedUniformStateUpdater;
+        rootNode->addUpdateCallback(mSharedUniformStateUpdater);
+
         osg::Camera::CullingMode cullingMode = osg::Camera::DEFAULT_CULLING|osg::Camera::FAR_PLANE_CULLING;
 
         if (!Settings::Manager::getBool("small feature culling", "Camera"))
@@ -433,7 +477,9 @@ namespace MWRender
         NifOsg::Loader::setReverseZ(reverseZ);
         Nif::NIFFile::setLoadUnsupportedFiles(Settings::Manager::getBool("load unsupported nif files", "Models"));
 
-        mNearClip = Settings::Manager::getFloat("near clip", "Camera");
+        // TODO: Near clip should not need to be bounded like this, but too small values break OSG shadow calculations CPU-side.
+        // See issue: #6072
+        mNearClip = std::max(0.005f, Settings::Manager::getFloat("near clip", "Camera"));
         mViewDistance = Settings::Manager::getFloat("viewing distance", "Camera");
         float fov = Settings::Manager::getFloat("field of view", "Camera");
         mFieldOfView = std::min(std::max(1.f, fov), 179.f);
@@ -462,11 +508,6 @@ namespace MWRender
             mRootNode->getOrCreateStateSet()->setAttributeAndModes(clipcontrol, osg::StateAttribute::ON);
         }
 
-        if (ext && ext->isFrameBufferObjectSupported)
-           mPostProcessor.reset(new PostProcessor(viewer, mRootNode));
-        else
-           Log(Debug::Warning) << "Disabling postprocessing and using default framebuffer for rendering: FrameBufferObjects not supported";
-
         updateProjectionMatrix();
     }
 
@@ -1100,19 +1141,15 @@ namespace MWRender
         if (mFieldOfViewOverridden)
             fov = mFieldOfViewOverride;
 
+        mViewer->getCamera()->setProjectionMatrixAsPerspective(fov, aspect, mNearClip, mViewDistance);
+
         if (mResourceSystem->getSceneManager()->getReverseZ())
         {
-            mViewer->getCamera()->setProjectionMatrix(SceneUtil::getReversedZProjectionMatrixAsPerspectiveInf(fov, aspect, mNearClip));
-            float linearFac = -mNearClip / (mViewDistance - mNearClip) - 1.0;
-            mRootNode->getOrCreateStateSet()->getOrCreateUniform("linearFac", osg::Uniform::FLOAT, 1)->set(linearFac);
-
-            osg::Matrix shadowProj = osg::Matrix::perspective(fov, aspect, mNearClip, mViewDistance);
-            mViewer->getCamera()->setUserValue("shadowProj", shadowProj);
-            mViewer->getCamera()->setUserValue("near", static_cast<double>(mNearClip));
-            mViewer->getCamera()->setUserValue("far", static_cast<double>(mViewDistance));
+            mSharedUniformStateUpdater->setLinearFac(-mNearClip / (mViewDistance - mNearClip) - 1.f);
+            mSharedUniformStateUpdater->setProjectionMatrix(SceneUtil::getReversedZProjectionMatrixAsPerspective(fov, aspect, mNearClip, mViewDistance));
         }
         else
-            mViewer->getCamera()->setProjectionMatrixAsPerspective(fov, aspect, mNearClip, mViewDistance);
+            mSharedUniformStateUpdater->setProjectionMatrix(mViewer->getCamera()->getProjectionMatrix());
 
         mUniformNear->set(mNearClip);
         mUniformFar->set(mViewDistance);
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index b63841494b..cbe25addf1 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -72,6 +72,7 @@ namespace MWRender
 {
     class GroundcoverUpdater;
     class StateUpdater;
+    class SharedUniformStateUpdater;
 
     class EffectManager;
     class ScreenshotManager;
@@ -240,9 +241,9 @@ namespace MWRender
         void pagingBlacklistObject(int type, const MWWorld::ConstPtr &ptr);
         bool pagingUnlockCache();
         void getPagedRefnums(const osg::Vec4i &activeGrid, std::set<ESM::RefNum> &out);
-
-    private:
+        
         void updateProjectionMatrix();
+    private:
         void updateTextureFiltering();
         void updateAmbient();
         void setFogColor(const osg::Vec4f& color);
@@ -296,6 +297,7 @@ namespace MWRender
         osg::Vec3f mCurrentCameraPos;
 
         osg::ref_ptr<StateUpdater> mStateUpdater;
+        osg::ref_ptr<SharedUniformStateUpdater> mSharedUniformStateUpdater;
 
         osg::Vec4f mAmbientColor;
         float mMinimumAmbientLuminance;
diff --git a/apps/openmw/mwrender/screenshotmanager.cpp b/apps/openmw/mwrender/screenshotmanager.cpp
index ba4282e5b6..967e282f30 100644
--- a/apps/openmw/mwrender/screenshotmanager.cpp
+++ b/apps/openmw/mwrender/screenshotmanager.cpp
@@ -298,7 +298,7 @@ namespace MWRender
         camera->setReferenceFrame(osg::Camera::ABSOLUTE_RF);
         camera->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT,osg::Camera::PIXEL_BUFFER_RTT);
 
-        if (MWBase::Environment::get().getResourceSystem()->getSceneManager()->getReverseZ())
+        if (getReverseZ())
             camera->setClearDepth(0.0);
 
         camera->setViewport(0, 0, w, h);
@@ -336,7 +336,7 @@ namespace MWRender
         float nearClip = Settings::Manager::getFloat("near clip", "Camera");
         float viewDistance = Settings::Manager::getFloat("viewing distance", "Camera");
         // each cubemap side sees 90 degrees
-        if (MWBase::Environment::get().getResourceSystem()->getSceneManager()->getReverseZ())
+        if (getReverseZ())
             rttCamera->setProjectionMatrix(SceneUtil::getReversedZProjectionMatrixAsPerspectiveInf(90.0, w/float(h), nearClip));
         else
             rttCamera->setProjectionMatrixAsPerspective(90.0, w/float(h), nearClip, viewDistance);
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index 604e417a45..dd97f79eda 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -54,6 +54,7 @@
 
 #include "vismask.hpp"
 #include "renderbin.hpp"
+#include "util.hpp"
 
 namespace
 {
@@ -473,7 +474,7 @@ const float CelestialBody::mDistance = 1000.0f;
 class Sun : public CelestialBody
 {
 public:
-    Sun(osg::Group* parentNode, Resource::ImageManager& imageManager, bool reverseZ)
+    Sun(osg::Group* parentNode, Resource::ImageManager& imageManager)
         : CelestialBody(parentNode, 1.0f, 1, Mask_Sun)
         , mUpdater(new Updater)
     {
@@ -502,8 +503,8 @@ public:
 
         mTransform->addChild(queryNode);
 
-        mOcclusionQueryVisiblePixels = createOcclusionQueryNode(queryNode, true, reverseZ);
-        mOcclusionQueryTotalPixels = createOcclusionQueryNode(queryNode, false, reverseZ);
+        mOcclusionQueryVisiblePixels = createOcclusionQueryNode(queryNode, true);
+        mOcclusionQueryTotalPixels = createOcclusionQueryNode(queryNode, false);
 
         createSunFlash(imageManager);
         createSunGlare();
@@ -556,7 +557,7 @@ private:
     };
 
     /// @param queryVisible If true, queries the amount of visible pixels. If false, queries the total amount of pixels.
-    osg::ref_ptr<osg::OcclusionQueryNode> createOcclusionQueryNode(osg::Group* parent, bool queryVisible, bool reverseZ)
+    osg::ref_ptr<osg::OcclusionQueryNode> createOcclusionQueryNode(osg::Group* parent, bool queryVisible)
     {
         osg::ref_ptr<osg::OcclusionQueryNode> oqn = new osg::OcclusionQueryNode;
         oqn->setQueriesEnabled(true);
@@ -594,11 +595,11 @@ private:
         osg::StateSet* queryStateSet = new osg::StateSet;
         if (queryVisible)
         {
-            auto depth = SceneUtil::createDepth(reverseZ);
+            auto depth = SceneUtil::createDepth(getReverseZ());
             // This is a trick to make fragments written by the query always use the maximum depth value,
             // without having to retrieve the current far clipping distance.
             // We want the sun glare to be "infinitely" far away.
-            float far = reverseZ ? 0.0 : 1.0;
+            double far = getReverseZ() ? 0.0 : 1.0;
             depth->setZNear(far);
             depth->setZFar(far);
             depth->setWriteMask(false);
@@ -1188,8 +1189,7 @@ void SkyManager::create()
     mAtmosphereNightUpdater = new AtmosphereNightUpdater(mSceneManager->getImageManager());
     atmosphereNight->addUpdateCallback(mAtmosphereNightUpdater);
 
-    bool reverseZ = mSceneManager->getReverseZ();
-    mSun.reset(new Sun(mEarlyRenderBinRoot, *mSceneManager->getImageManager(), reverseZ));
+    mSun.reset(new Sun(mEarlyRenderBinRoot, *mSceneManager->getImageManager()));
 
     mMasser.reset(new Moon(mEarlyRenderBinRoot, *mSceneManager->getImageManager(), Fallback::Map::getFloat("Moons_Masser_Size")/125, Moon::Type_Masser));
     mSecunda.reset(new Moon(mEarlyRenderBinRoot, *mSceneManager->getImageManager(), Fallback::Map::getFloat("Moons_Secunda_Size")/125, Moon::Type_Secunda));
@@ -1210,7 +1210,7 @@ void SkyManager::create()
     mCloudMesh2->addUpdateCallback(mCloudUpdater2);
     mCloudMesh2->setNodeMask(0);
 
-    auto depth = SceneUtil::createDepth(reverseZ);
+    auto depth = SceneUtil::createDepth(mSceneManager->getReverseZ());
     depth->setWriteMask(false);
     mEarlyRenderBinRoot->getOrCreateStateSet()->setAttributeAndModes(depth, osg::StateAttribute::ON);
     mEarlyRenderBinRoot->getOrCreateStateSet()->setMode(GL_BLEND, osg::StateAttribute::ON);
diff --git a/apps/openmw/mwrender/util.cpp b/apps/openmw/mwrender/util.cpp
index e3fc48040f..5740f7df6c 100644
--- a/apps/openmw/mwrender/util.cpp
+++ b/apps/openmw/mwrender/util.cpp
@@ -4,10 +4,13 @@
 #include <osg/ValueObject>
 
 #include <components/resource/resourcesystem.hpp>
+#include <components/resource/scenemanager.hpp>
 #include <components/resource/imagemanager.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/sceneutil/visitor.hpp>
 
+#include "../mwbase/environment.hpp"
+
 namespace MWRender
 {
 
@@ -64,4 +67,9 @@ void overrideTexture(const std::string &texture, Resource::ResourceSystem *resou
     node->setStateSet(stateset);
 }
 
+bool getReverseZ()
+{
+    return MWBase::Environment::get().getResourceSystem()->getSceneManager()->getReverseZ();
+}
+
 }
diff --git a/apps/openmw/mwrender/util.hpp b/apps/openmw/mwrender/util.hpp
index a89baa22b1..c005dd9b23 100644
--- a/apps/openmw/mwrender/util.hpp
+++ b/apps/openmw/mwrender/util.hpp
@@ -32,6 +32,8 @@ namespace MWRender
             // no traverse()
         }
     };
+
+    bool getReverseZ();
 }
 
 #endif
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 70e849b234..3c548ead23 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -285,6 +285,16 @@ namespace Resource
         return mReverseZ;
     }
 
+    void SceneManager::setDepthFormat(GLenum format)
+    {
+        mDepthFormat = format;
+    }
+
+    GLenum SceneManager::getDepthFormat() const
+    {
+        return mDepthFormat;
+    }
+
     void SceneManager::setAutoUseNormalMaps(bool use)
     {
         mAutoUseNormalMaps = use;
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index 260fd4717f..780375f77e 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -95,6 +95,9 @@ namespace Resource
         void setReverseZ(bool reverseZ);
         bool getReverseZ() const;
 
+        void setDepthFormat(GLenum format);
+        GLenum getDepthFormat() const;
+
         /// @see ShaderVisitor::setAutoUseNormalMaps
         void setAutoUseNormalMaps(bool use);
 
@@ -206,6 +209,7 @@ namespace Resource
         SceneUtil::LightManager::SupportedMethods mSupportedLightingMethods;
         bool mConvertAlphaTestToAlphaToCoverage;
         bool mReverseZ;
+        GLenum mDepthFormat;
 
         osg::ref_ptr<MultiObjectCache> mInstanceCache;
 
diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
index bbda5442bf..0004045dc8 100644
--- a/components/sceneutil/mwshadowtechnique.cpp
+++ b/components/sceneutil/mwshadowtechnique.cpp
@@ -28,8 +28,6 @@
 #include <sstream>
 #include "shadowsbin.hpp"
 
-#include <components/sceneutil/util.hpp>
-
 namespace {
 
 using namespace osgShadow;
@@ -350,11 +348,6 @@ void VDSMCameraCullCallback::operator()(osg::Node* node, osg::NodeVisitor* nv)
     _projectionMatrix = cv->getProjectionMatrix();
 }
 
-bool isOrthographicViewFrustum(const osg::Matrix& m)
-{
-    return m(0,3)==0.0 && m(1,3)==0.0 && m(2,3)==0.0; 
-}
-
 } // namespace
 
 MWShadowTechnique::ComputeLightSpaceBounds::ComputeLightSpaceBounds(osg::Viewport* viewport, const osg::Matrixd& projectionMatrix, osg::Matrixd& viewMatrix) :
@@ -988,9 +981,6 @@ void MWShadowTechnique::cull(osgUtil::CullVisitor& cv)
         return;
     }
 
-    osg::Matrix shadowProj;
-    cv.getCurrentCamera()->getUserValue("shadowProj", shadowProj);
-
     ViewDependentData* vdd = getViewDependentData(&cv);
 
     if (!vdd)
@@ -1006,41 +996,34 @@ void MWShadowTechnique::cull(osgUtil::CullVisitor& cv)
 
     osg::CullSettings::ComputeNearFarMode cachedNearFarMode = cv.getComputeNearFarMode();
 
+    osg::RefMatrix& viewProjectionMatrix = *cv.getProjectionMatrix();
+
+    // check whether this main views projection is perspective or orthographic
+    bool orthographicViewFrustum = viewProjectionMatrix(0,3)==0.0 &&
+                                   viewProjectionMatrix(1,3)==0.0 &&
+                                   viewProjectionMatrix(2,3)==0.0;
+
     double minZNear = 0.0;
     double maxZFar = dbl_max;
-    bool orthographicViewFrustum;
 
-    if (_reverseZ)
-    {
-        cv.getCurrentCamera()->getUserValue("near", minZNear);
-        cv.getCurrentCamera()->getUserValue("far", maxZFar);
-        orthographicViewFrustum = isOrthographicViewFrustum(shadowProj);
-    }
-    else
+    if (cachedNearFarMode==osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR)
     {
-        osg::RefMatrix& viewProjectionMatrix = *cv.getProjectionMatrix();
-
-        // check whether this main views projection is perspective or orthographic
-        orthographicViewFrustum = isOrthographicViewFrustum(viewProjectionMatrix);
-
-        if (cachedNearFarMode==osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR)
+        double left, right, top, bottom;
+        if (orthographicViewFrustum)
         {
-            double left, right, top, bottom;
-            if (orthographicViewFrustum)
-            {
-                viewProjectionMatrix.getOrtho(left, right, bottom, top, minZNear, maxZFar);
-            }
-            else
-            {
-                viewProjectionMatrix.getFrustum(left, right, bottom, top, minZNear, maxZFar);
-            }
+            viewProjectionMatrix.getOrtho(left, right, bottom, top, minZNear, maxZFar);
         }
-
-        // set the compute near/far mode to the highest quality setting to ensure we push the near plan out as far as possible
-        if (settings->getComputeNearFarModeOverride()!=osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR)
+        else
         {
-            cv.setComputeNearFarMode(settings->getComputeNearFarModeOverride());
+            viewProjectionMatrix.getFrustum(left, right, bottom, top, minZNear, maxZFar);
         }
+        OSG_INFO<<"minZNear="<<minZNear<<", maxZFar="<<maxZFar<<std::endl;
+    }
+
+    // set the compute near/far mode to the highest quality setting to ensure we push the near plan out as far as possible
+    if (settings->getComputeNearFarModeOverride()!=osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR)
+    {
+        cv.setComputeNearFarMode(settings->getComputeNearFarModeOverride());
     }
 
     // 1. Traverse main scene graph
@@ -1052,9 +1035,6 @@ void MWShadowTechnique::cull(osgUtil::CullVisitor& cv)
 
     cv.popStateSet();
 
-    if (_reverseZ)
-        cv.pushProjectionMatrix(new osg::RefMatrix(shadowProj));
-
     if (cv.getComputeNearFarMode()!=osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR)
     {
         OSG_INFO<<"Just done main subgraph traversak"<<std::endl;
@@ -1094,8 +1074,7 @@ void MWShadowTechnique::cull(osgUtil::CullVisitor& cv)
     }
 
     // return compute near far mode back to it's original settings
-    if (!_reverseZ)
-        cv.setComputeNearFarMode(cachedNearFarMode);
+    cv.setComputeNearFarMode(cachedNearFarMode);
 
     OSG_INFO<<"frustum.eye="<<frustum.eye<<", frustum.centerNearPlane, "<<frustum.centerNearPlane<<" distance = "<<(frustum.eye-frustum.centerNearPlane).length()<<std::endl;
 
@@ -1480,8 +1459,6 @@ void MWShadowTechnique::cull(osgUtil::CullVisitor& cv)
         prepareStateSetForRenderingShadow(*vdd, cv.getTraversalNumber());
     }
 
-    if (_reverseZ)
-        cv.popProjectionMatrix();
     // OSG_NOTICE<<"End of shadow setup Projection matrix "<<*cv.getProjectionMatrix()<<std::endl;
 }
 
@@ -1670,9 +1647,11 @@ void MWShadowTechnique::createShaders()
     _shadowCastingStateSet->addUniform(new osg::Uniform("alphaTestShadows", false));
     osg::ref_ptr<osg::Depth> depth = new osg::Depth;
     depth->setWriteMask(true);
-    osg::ref_ptr<osg::ClipControl> clipcontrol = new osg::ClipControl(osg::ClipControl::LOWER_LEFT, osg::ClipControl::NEGATIVE_ONE_TO_ONE);
     if (_reverseZ)
+    {
+        osg::ref_ptr<osg::ClipControl> clipcontrol = new osg::ClipControl(osg::ClipControl::LOWER_LEFT, osg::ClipControl::NEGATIVE_ONE_TO_ONE);
         _shadowCastingStateSet->setAttribute(clipcontrol, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+    }
     _shadowCastingStateSet->setAttribute(depth, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
     _shadowCastingStateSet->setMode(GL_DEPTH_CLAMP, osg::StateAttribute::ON);
 
diff --git a/components/sceneutil/shadow.cpp b/components/sceneutil/shadow.cpp
index 32c2edeccd..7ca15e612d 100644
--- a/components/sceneutil/shadow.cpp
+++ b/components/sceneutil/shadow.cpp
@@ -95,8 +95,8 @@ namespace SceneUtil
     }
 
     ShadowManager::ShadowManager(osg::ref_ptr<osg::Group> sceneRoot, osg::ref_ptr<osg::Group> rootNode, unsigned int outdoorShadowCastingMask, unsigned int indoorShadowCastingMask, Shader::ShaderManager &shaderManager, bool reverseZ)
-        : mShadowedScene(new osgShadow::ShadowedScene)
-        , mReverseZ(reverseZ)
+        : mReverseZ(reverseZ)
+        , mShadowedScene(new osgShadow::ShadowedScene)
         , mShadowTechnique(new MWShadowTechnique)
         , mOutdoorShadowCastingMask(outdoorShadowCastingMask)
         , mIndoorShadowCastingMask(indoorShadowCastingMask)
diff --git a/components/sceneutil/util.cpp b/components/sceneutil/util.cpp
index 79fe5d13c5..1f79469a19 100644
--- a/components/sceneutil/util.cpp
+++ b/components/sceneutil/util.cpp
@@ -9,6 +9,7 @@
 #include <osg/TexGen>
 #include <osg/TexEnvCombine>
 #include <osg/Version>
+#include <osg/Fog>
 
 #include <components/resource/imagemanager.hpp>
 #include <components/resource/scenemanager.hpp>
@@ -314,8 +315,7 @@ bool attachAlphaToCoverageFriendlyFramebufferToCamera(osg::Camera* camera, osg::
 
 osg::ref_ptr<osg::Depth> createDepth(bool reverseZ)
 {
-    static osg::Depth::Function func = reverseZ ? osg::Depth::GEQUAL : osg::Depth::LEQUAL;
-    return new osg::Depth(func);
+    return new osg::Depth(reverseZ ? osg::Depth::GEQUAL : osg::Depth::LEQUAL);
 }
 
 osg::Matrix getReversedZProjectionMatrixAsPerspectiveInf(double fov, double aspect, double near)
@@ -350,5 +350,9 @@ osg::Matrix getReversedZProjectionMatrixAsOrtho(double left, double right, doubl
     );
 }
 
+bool isFloatingPointDepthFormat(GLenum format)
+{
+    return format == GL_DEPTH_COMPONENT32F || format == GL_DEPTH_COMPONENT32F_NV;
+}
 
 }
diff --git a/components/sceneutil/util.hpp b/components/sceneutil/util.hpp
index 69e66bb8b3..bd4df5441a 100644
--- a/components/sceneutil/util.hpp
+++ b/components/sceneutil/util.hpp
@@ -50,7 +50,7 @@ namespace SceneUtil
     };
 
     // Allows camera to render to a color and floating point depth texture with a multisampled framebuffer.
-    // Must be set on a cameras cull callback.
+    // Must be set on a camera's cull callback.
     // When the depth texture isn't needed as a sampler, use osg::Camera::attach(osg::Camera::DEPTH_COMPONENT, GL_DEPTH_COMPONENT32F) instead.
     // If multisampling is not being used on the color buffer attachment, use the osg::Camera::attach() method.
     class AttachMultisampledDepthColorCallback : public osg::NodeCallback
@@ -99,6 +99,8 @@ namespace SceneUtil
     // Returns an orthographic projection matrix for use with a reversed z-buffer.
     osg::Matrix getReversedZProjectionMatrixAsOrtho(double left, double right, double bottom, double top, double near, double far);
 
+    // Returns true if the GL format is a floating point depth format
+    bool isFloatingPointDepthFormat(GLenum format); 
 }
 
 #endif
diff --git a/components/terrain/cellborder.cpp b/components/terrain/cellborder.cpp
index 47c567f544..c34ed9ab0a 100644
--- a/components/terrain/cellborder.cpp
+++ b/components/terrain/cellborder.cpp
@@ -8,13 +8,16 @@
 #include "world.hpp"
 #include "../esm/loadland.hpp"
 
+#include <components/resource/scenemanager.hpp>
+
 namespace Terrain
 {
 
-CellBorder::CellBorder(Terrain::World *world, osg::Group *root, int borderMask):
-    mWorld(world),
-    mRoot(root),
-    mBorderMask(borderMask)
+CellBorder::CellBorder(Terrain::World *world, osg::Group *root, int borderMask, Resource::SceneManager* sceneManager)
+    : mWorld(world)
+    , mSceneManager(sceneManager)
+    , mRoot(root)
+    , mBorderMask(borderMask)
 {
 }
 
@@ -73,6 +76,8 @@ void CellBorder::createCellBorderGeometry(int x, int y)
     polygonmode->setMode(osg::PolygonMode::FRONT_AND_BACK, osg::PolygonMode::LINE);
     stateSet->setAttributeAndModes(polygonmode,osg::StateAttribute::ON);
 
+    mSceneManager->recreateShaders(borderGeode, "debug");
+
     borderGeode->setNodeMask(mBorderMask);
 
     mRoot->addChild(borderGeode);
diff --git a/components/terrain/cellborder.hpp b/components/terrain/cellborder.hpp
index 908cdea097..ee8fd72593 100644
--- a/components/terrain/cellborder.hpp
+++ b/components/terrain/cellborder.hpp
@@ -4,6 +4,11 @@
 #include <map>
 #include <osg/Group>
 
+namespace Resource
+{
+    class SceneManager;
+}
+
 namespace Terrain
 {
     class World;
@@ -16,7 +21,7 @@ namespace Terrain
     public:
         typedef std::map<std::pair<int, int>, osg::ref_ptr<osg::Node> > CellGrid; 
 
-        CellBorder(Terrain::World *world, osg::Group *root, int borderMask);
+        CellBorder(Terrain::World *world, osg::Group *root, int borderMask, Resource::SceneManager* sceneManager);
 
         void createCellBorderGeometry(int x, int y);
         void destroyCellBorderGeometry(int x, int y);
@@ -28,6 +33,7 @@ namespace Terrain
 
     protected:
         Terrain::World *mWorld;
+        Resource::SceneManager* mSceneManager;
         osg::Group *mRoot;
 
         CellGrid mCellBorderNodes;
diff --git a/components/terrain/world.cpp b/components/terrain/world.cpp
index d1581724e0..17a51913e5 100644
--- a/components/terrain/world.cpp
+++ b/components/terrain/world.cpp
@@ -4,6 +4,7 @@
 #include <osg/Camera>
 
 #include <components/resource/resourcesystem.hpp>
+#include <components/resource/scenemanager.hpp>
 
 #include "storage.hpp"
 #include "texturemanager.hpp"
@@ -43,7 +44,7 @@ World::World(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSyst
     mTextureManager.reset(new TextureManager(mResourceSystem->getSceneManager()));
     mChunkManager.reset(new ChunkManager(mStorage, mResourceSystem->getSceneManager(), mTextureManager.get(), mCompositeMapRenderer));
     mChunkManager->setNodeMask(nodeMask);
-    mCellBorder.reset(new CellBorder(this,mTerrainRoot.get(),borderMask));
+    mCellBorder.reset(new CellBorder(this,mTerrainRoot.get(),borderMask,mResourceSystem->getSceneManager()));
 
     mResourceSystem->addResourceManager(mChunkManager.get());
     mResourceSystem->addResourceManager(mTextureManager.get());
diff --git a/docs/source/reference/modding/settings/camera.rst b/docs/source/reference/modding/settings/camera.rst
index a880a2b62d..fe6217b22b 100644
--- a/docs/source/reference/modding/settings/camera.rst
+++ b/docs/source/reference/modding/settings/camera.rst
@@ -5,8 +5,8 @@ near clip
 ---------
 
 :Type:		floating point
-:Range:		> 0
-:Default:	3.0
+:Range:		>= 0.005
+:Default:	1.0
 
 This setting controls the distance to the near clipping plane. The value must be greater than zero.
 Values greater than approximately 18.0 will occasionally clip objects in the world in front of the character.
@@ -235,3 +235,23 @@ Maximum roll angle in degrees.
 
 This setting can only be configured by editing the settings configuration file.
 
+reverse z
+---------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	True
+
+Enables a reverse-z depth buffer in which the depth range is reversed. This
+allows for small :ref:`near clip` values and removes almost all z-fighting with
+terrain and even tightly coupled meshes at extreme view distances. For this to
+be useful, a floating point depth buffer is required. These features require
+driver and hardware support, but should work on any semi-modern desktop hardware
+through OpenGL extensions. The exception is macOS, which has since dropped
+development of OpenGL drivers. If unsupported, this setting has no effect.
+
+Note, this will force OpenMW to use shaders as if :ref:`force shaders` was enabled.
+The performance impact of this feature should be negligible.
+
+This setting can only be configured by editing the settings configuration file.
+
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 36eca7f1ab..4943ce969b 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -15,7 +15,7 @@
 [Camera]
 
 # Near clipping plane (>0.0, e.g. 0.01 to 18.0).
-near clip = 3
+near clip = 1
 
 # Cull objects that occupy less than 'small feature culling pixel size' on the screen.
 small feature culling = true
@@ -67,6 +67,9 @@ head bobbing height = 3.0
 # Maximum camera roll angle (degrees)
 head bobbing roll = 0.2
 
+# Reverse the depth range from [0,1] to [1,0].
+reverse z = true
+
 [Cells]
 
 # Preload cells in a background thread. All settings starting with 'preload' have no effect unless this is enabled.
diff --git a/files/shaders/CMakeLists.txt b/files/shaders/CMakeLists.txt
index 5e049b8a3f..04446d2982 100644
--- a/files/shaders/CMakeLists.txt
+++ b/files/shaders/CMakeLists.txt
@@ -34,6 +34,8 @@ set(SHADER_FILES
     nv_nolighting_fragment.glsl
     gui_vertex.glsl
     gui_fragment.glsl
+    debug_vertex.glsl
+    debug_fragment.glsl
 )
 
 copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_SHADERS_ROOT} ${DDIRRELATIVE} "${SHADER_FILES}")
diff --git a/files/shaders/debug_fragment.glsl b/files/shaders/debug_fragment.glsl
new file mode 100644
index 0000000000..263d4e1f24
--- /dev/null
+++ b/files/shaders/debug_fragment.glsl
@@ -0,0 +1,8 @@
+#version 120
+
+varying vec4 passColor;
+
+void main()
+{
+    gl_FragData[0] = passColor;
+}
diff --git a/files/shaders/debug_vertex.glsl b/files/shaders/debug_vertex.glsl
new file mode 100644
index 0000000000..f68c3d6459
--- /dev/null
+++ b/files/shaders/debug_vertex.glsl
@@ -0,0 +1,12 @@
+#version 120
+
+uniform mat4 projectionMatrix;
+
+varying vec4 passColor;
+
+void main()
+{
+    gl_Position = projectionMatrix * (gl_ModelViewMatrix * gl_Vertex);
+
+    passColor = gl_Color;
+}
diff --git a/files/shaders/depth.glsl b/files/shaders/depth.glsl
index 0adde7a2a7..aa6f54b99d 100644
--- a/files/shaders/depth.glsl
+++ b/files/shaders/depth.glsl
@@ -2,11 +2,11 @@
 uniform float linearFac;
 #endif
 
-float getLinearDepth(in vec4 viewPos)
+float getLinearDepth(in float z, in float viewZ)
 {
 #if @reverseZ
-    return linearFac*viewPos.z;
+    return linearFac*viewZ;
 #else
-    return gl_Position.z;
+    return z;
 #endif
 }
\ No newline at end of file
diff --git a/files/shaders/groundcover_vertex.glsl b/files/shaders/groundcover_vertex.glsl
index 94586734b6..c8db4be000 100644
--- a/files/shaders/groundcover_vertex.glsl
+++ b/files/shaders/groundcover_vertex.glsl
@@ -46,6 +46,7 @@ uniform mat4 osg_ViewMatrixInverse;
 uniform mat4 osg_ViewMatrix;
 uniform float windSpeed;
 uniform vec3 playerPos;
+uniform mat4 projectionMatrix;
 
 #if @groundcoverStompMode == 0
 #else
@@ -142,9 +143,9 @@ void main(void)
     if (length(gl_ModelViewMatrix * vec4(position, 1.0)) > @groundcoverFadeEnd)
         gl_Position = vec4(0.0, 0.0, 0.0, 1.0);
     else
-        gl_Position = gl_ProjectionMatrix * viewPos;
+        gl_Position = projectionMatrix * viewPos;
 
-    linearDepth = getLinearDepth(viewPos);
+    linearDepth = getLinearDepth(gl_Position.z, viewPos.z);
 
 #if (!PER_PIXEL_LIGHTING || @shadows_enabled)
     vec3 viewNormal = normalize((gl_NormalMatrix * rotation3(rotation) * gl_Normal).xyz);
diff --git a/files/shaders/nv_default_vertex.glsl b/files/shaders/nv_default_vertex.glsl
index 1c5483dcda..34d5415250 100644
--- a/files/shaders/nv_default_vertex.glsl
+++ b/files/shaders/nv_default_vertex.glsl
@@ -8,6 +8,8 @@
     #extension GL_EXT_gpu_shader4: require
 #endif
 
+uniform mat4 projectionMatrix;
+
 #if @diffuseMap
 varying vec2 diffuseMapUV;
 #endif
@@ -36,12 +38,12 @@ varying vec3 passNormal;
 
 void main(void)
 {
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+    gl_Position = projectionMatrix * (gl_ModelViewMatrix * gl_Vertex);
 
     vec4 viewPos = (gl_ModelViewMatrix * gl_Vertex);
     gl_ClipVertex = viewPos;
     euclideanDepth = length(viewPos.xyz);
-    linearDepth = getLinearDepth(viewPos);
+    linearDepth = getLinearDepth(gl_Position.z, viewPos.z);
 
 #if @diffuseMap
     diffuseMapUV = (gl_TextureMatrix[@diffuseMapUV] * gl_MultiTexCoord@diffuseMapUV).xy;
diff --git a/files/shaders/nv_nolighting_vertex.glsl b/files/shaders/nv_nolighting_vertex.glsl
index 02c28eb5e3..617f0489a4 100644
--- a/files/shaders/nv_nolighting_vertex.glsl
+++ b/files/shaders/nv_nolighting_vertex.glsl
@@ -1,5 +1,7 @@
 #version 120
 
+uniform mat4 projectionMatrix;
+
 #if @diffuseMap
 varying vec2 diffuseMapUV;
 #endif
@@ -21,14 +23,14 @@ varying float passFalloff;
 
 void main(void)
 {
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+    gl_Position = projectionMatrix * (gl_ModelViewMatrix * gl_Vertex);
 
     vec4 viewPos = (gl_ModelViewMatrix * gl_Vertex);
     gl_ClipVertex = viewPos;
 #if @radialFog
     euclideanDepth = length(viewPos.xyz);
 #else
-    linearDepth = getLinearDepth(viewPos);
+    linearDepth = getLinearDepth(gl_Position.z, viewPos.z);
 #endif
 
 #if @diffuseMap
diff --git a/files/shaders/objects_vertex.glsl b/files/shaders/objects_vertex.glsl
index 34484ebd41..969fe5903e 100644
--- a/files/shaders/objects_vertex.glsl
+++ b/files/shaders/objects_vertex.glsl
@@ -8,6 +8,8 @@
     #extension GL_EXT_gpu_shader4: require
 #endif
 
+uniform mat4 projectionMatrix;
+
 #if @diffuseMap
 varying vec2 diffuseMapUV;
 #endif
@@ -66,12 +68,13 @@ varying vec3 passNormal;
 
 void main(void)
 {
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+    gl_Position = projectionMatrix * (gl_ModelViewMatrix * gl_Vertex);
 
     vec4 viewPos = (gl_ModelViewMatrix * gl_Vertex);
+
     gl_ClipVertex = viewPos;
     euclideanDepth = length(viewPos.xyz);
-    linearDepth = getLinearDepth(viewPos);
+    linearDepth = getLinearDepth(gl_Position.z, viewPos.z);
 
 #if (@envMap || !PER_PIXEL_LIGHTING || @shadows_enabled)
     vec3 viewNormal = normalize((gl_NormalMatrix * gl_Normal).xyz);
diff --git a/files/shaders/terrain_vertex.glsl b/files/shaders/terrain_vertex.glsl
index 221e0c27a9..b46b299e2b 100644
--- a/files/shaders/terrain_vertex.glsl
+++ b/files/shaders/terrain_vertex.glsl
@@ -8,6 +8,8 @@
     #extension GL_EXT_gpu_shader4: require
 #endif
 
+uniform mat4 projectionMatrix;
+
 varying vec2 uv;
 varying float euclideanDepth;
 varying float linearDepth;
@@ -29,12 +31,12 @@ varying vec3 passNormal;
 
 void main(void)
 {
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+    gl_Position = projectionMatrix * (gl_ModelViewMatrix * gl_Vertex);
 
     vec4 viewPos = (gl_ModelViewMatrix * gl_Vertex);
     gl_ClipVertex = viewPos;
     euclideanDepth = length(viewPos.xyz);
-    linearDepth = getLinearDepth(viewPos);
+    linearDepth = getLinearDepth(gl_Position.z, viewPos.z);
 
 #if (!PER_PIXEL_LIGHTING || @shadows_enabled)
     vec3 viewNormal = normalize((gl_NormalMatrix * gl_Normal).xyz);
diff --git a/files/shaders/water_vertex.glsl b/files/shaders/water_vertex.glsl
index 9513001847..8e506a57f8 100644
--- a/files/shaders/water_vertex.glsl
+++ b/files/shaders/water_vertex.glsl
@@ -1,5 +1,7 @@
 #version 120
-    
+
+uniform mat4 projectionMatrix;
+
 varying vec3  screenCoordsPassthrough;
 varying vec4  position;
 varying float linearDepth;
@@ -9,7 +11,7 @@ varying float linearDepth;
 
 void main(void)
 {
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+    gl_Position = projectionMatrix * (gl_ModelViewMatrix * gl_Vertex);
 
     mat4 scalemat = mat4(0.5, 0.0, 0.0, 0.0,
                          0.0, -0.5, 0.0, 0.0,
@@ -22,7 +24,7 @@ void main(void)
     position = gl_Vertex;
 
     vec4 viewPos = gl_ModelViewMatrix * gl_Vertex;
-    linearDepth = getLinearDepth(viewPos);
+    linearDepth = getLinearDepth(gl_Position.z, viewPos.z);
 
     setupShadowCoords(viewPos, normalize((gl_NormalMatrix * gl_Normal).xyz));
 }

From 09e03fde2e689fd1dcff054a16a761128d36ffff Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Wed, 4 Aug 2021 17:49:57 -0700
Subject: [PATCH 1144/2859] refactor and fix wobbly shores

---
 CHANGELOG.md                               |   1 +
 apps/opencs/model/world/data.cpp           |   1 +
 apps/opencs/view/render/cellwater.cpp      |   2 +-
 apps/openmw/mwgui/bookpage.cpp             |   5 +-
 apps/openmw/mwgui/savegamedialog.cpp       |   2 +-
 apps/openmw/mwgui/windowmanagerimp.cpp     |   1 +
 apps/openmw/mwrender/bulletdebugdraw.cpp   |  11 ++-
 apps/openmw/mwrender/globalmap.cpp         |   2 +-
 apps/openmw/mwrender/localmap.cpp          |  12 +--
 apps/openmw/mwrender/npcanimation.cpp      |   2 +-
 apps/openmw/mwrender/objectpaging.cpp      |   1 -
 apps/openmw/mwrender/postprocessor.cpp     |  34 ++++---
 apps/openmw/mwrender/postprocessor.hpp     |  18 ++--
 apps/openmw/mwrender/renderingmanager.cpp  |  54 +++++++----
 apps/openmw/mwrender/renderingmanager.hpp  |   8 +-
 apps/openmw/mwrender/ripplesimulation.cpp  |   6 +-
 apps/openmw/mwrender/screenshotmanager.cpp |  16 ++--
 apps/openmw/mwrender/sky.cpp               |   6 +-
 apps/openmw/mwrender/util.cpp              |   8 --
 apps/openmw/mwrender/util.hpp              |   2 -
 apps/openmw/mwrender/water.cpp             |   8 +-
 components/nifosg/nifloader.cpp            |  14 +--
 components/nifosg/nifloader.hpp            |   4 -
 components/resource/scenemanager.cpp       |  10 --
 components/resource/scenemanager.hpp       |   4 -
 components/sceneutil/agentpath.cpp         |   6 ++
 components/sceneutil/mwshadowtechnique.cpp |  15 +--
 components/sceneutil/mwshadowtechnique.hpp |   6 --
 components/sceneutil/navmesh.cpp           |   6 ++
 components/sceneutil/optimizer.cpp         |   3 +-
 components/sceneutil/optimizer.hpp         |  13 +--
 components/sceneutil/pathgridutil.cpp      |   6 ++
 components/sceneutil/recastmesh.cpp        |   6 ++
 components/sceneutil/shadow.cpp            |  18 +---
 components/sceneutil/shadow.hpp            |   5 +-
 components/sceneutil/util.cpp              | 106 ++++++++++++++++-----
 components/sceneutil/util.hpp              |  27 ++----
 components/sceneutil/waterutil.cpp         |   4 +-
 components/sceneutil/waterutil.hpp         |   2 +-
 components/terrain/chunkmanager.cpp        |   4 +-
 components/terrain/material.cpp            |  16 ++--
 components/terrain/material.hpp            |   6 +-
 files/settings-default.cfg                 |   2 +-
 files/shaders/debug_fragment.glsl          |   4 +-
 files/shaders/water_fragment.glsl          |   8 +-
 45 files changed, 256 insertions(+), 239 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e136d707a..801d05d357 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,7 @@
     Feature #6017: Separate persistent and temporary cell references when saving
     Feature #6032: Reverse-z depth buffer
     Feature #6162: Refactor GUI to use shaders and to be GLES and GL3+ friendly
+    Feature #6199: Support FBO Rendering
 
 0.47.0
 ------
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 192602290d..5e8c548368 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -84,6 +84,7 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding, bool fsStrict, const Files::Pat
     defines["preLightEnv"] = "0"; // Apply environment maps after lighting like Morrowind
     defines["radialFog"] = "0";
     defines["lightingModel"] = "0";
+    defines["reverseZ"] = "0";
     for (const auto& define : shadowDefines)
         defines[define.first] = define.second;
     mResourceSystem->getSceneManager()->getShaderManager().setGlobalDefines(defines);
diff --git a/apps/opencs/view/render/cellwater.cpp b/apps/opencs/view/render/cellwater.cpp
index 485eed00fe..f8857c3afc 100644
--- a/apps/opencs/view/render/cellwater.cpp
+++ b/apps/opencs/view/render/cellwater.cpp
@@ -161,7 +161,7 @@ namespace CSVRender
         }
 
         mWaterGeometry = SceneUtil::createWaterGeometry(size, segments, textureRepeats);
-        mWaterGeometry->setStateSet(SceneUtil::createSimpleWaterStateSet(Alpha, RenderBin, false));
+        mWaterGeometry->setStateSet(SceneUtil::createSimpleWaterStateSet(Alpha, RenderBin));
 
         // Add water texture
         std::string textureName = Fallback::Map::getString("Water_SurfaceTexture");
diff --git a/apps/openmw/mwgui/bookpage.cpp b/apps/openmw/mwgui/bookpage.cpp
index e4ce2a9593..2f12b83572 100644
--- a/apps/openmw/mwgui/bookpage.cpp
+++ b/apps/openmw/mwgui/bookpage.cpp
@@ -8,12 +8,11 @@
 #include "MyGUI_FactoryManager.h"
 
 #include <components/misc/utf8stream.hpp>
+#include <components/sceneutil/util.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 
-#include "../mwrender/util.hpp"
-
 namespace MWGui
 {
 struct TypesetBookImpl;
@@ -1219,7 +1218,7 @@ public:
 
         RenderXform renderXform (mCroppedParent, textFormat.mRenderItem->getRenderTarget()->getInfo());
 
-        float z = MWRender::getReverseZ() ? 1.f : -1.f;
+        float z = SceneUtil::getReverseZ() ? 1.f : -1.f;
 
         GlyphStream glyphStream(textFormat.mFont, static_cast<float>(mCoord.left), static_cast<float>(mCoord.top - mViewTop),
                                   z /*mNode->getNodeDepth()*/, vertices, renderXform);
diff --git a/apps/openmw/mwgui/savegamedialog.cpp b/apps/openmw/mwgui/savegamedialog.cpp
index 987d27c9a6..086135d035 100644
--- a/apps/openmw/mwgui/savegamedialog.cpp
+++ b/apps/openmw/mwgui/savegamedialog.cpp
@@ -450,7 +450,7 @@ namespace MWGui
 
         osg::ref_ptr<osg::Texture2D> texture (new osg::Texture2D);
         texture->setImage(result.getImage());
-        texture->setInternalFormat(GL_RGBA);
+        texture->setInternalFormat(GL_RGB);
         texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
         texture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
         texture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index e42d606966..6eeb2d3654 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -35,6 +35,7 @@
 
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/imagemanager.hpp>
+#include <components/resource/scenemanager.hpp>
 
 #include <components/sceneutil/workqueue.hpp>
 
diff --git a/apps/openmw/mwrender/bulletdebugdraw.cpp b/apps/openmw/mwrender/bulletdebugdraw.cpp
index 9039ec53ce..b008ebc6d9 100644
--- a/apps/openmw/mwrender/bulletdebugdraw.cpp
+++ b/apps/openmw/mwrender/bulletdebugdraw.cpp
@@ -4,13 +4,13 @@
 
 #include <osg/Geometry>
 #include <osg/Group>
+#include <osg/Material>
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/convert.hpp>
 #include <osg/PolygonMode>
 #include <osg/ShapeDrawable>
 #include <osg/StateSet>
-#include <osg/Fog>
 
 #include "bulletdebugdraw.hpp"
 #include "vismask.hpp"
@@ -18,8 +18,6 @@
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
 
-#include <components/sceneutil/util.hpp>
-
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 
@@ -39,6 +37,7 @@ void DebugDrawer::createGeometry()
     {
         mGeometry = new osg::Geometry;
         mGeometry->setNodeMask(Mask_Debug);
+
         mVertices = new osg::Vec3Array;
         mColors = new osg::Vec4Array;
 
@@ -50,8 +49,10 @@ void DebugDrawer::createGeometry()
         mGeometry->setColorBinding(osg::Geometry::BIND_PER_VERTEX);
         mGeometry->setDataVariance(osg::Object::DYNAMIC);
         mGeometry->addPrimitiveSet(mDrawArrays);
-        // make this friendly to recreateShaders()
-        mGeometry->setStateSet(new osg::StateSet);
+
+        osg::ref_ptr<osg::Material> material = new osg::Material;
+        material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
+        mGeometry->getOrCreateStateSet()->setAttribute(material);
 
         mParentNode->addChild(mGeometry);
 
diff --git a/apps/openmw/mwrender/globalmap.cpp b/apps/openmw/mwrender/globalmap.cpp
index 2f160933fd..7d7c6e45df 100644
--- a/apps/openmw/mwrender/globalmap.cpp
+++ b/apps/openmw/mwrender/globalmap.cpp
@@ -325,7 +325,7 @@ namespace MWRender
         if (texture)
         {
             osg::ref_ptr<osg::Geometry> geom = createTexturedQuad(srcLeft, srcTop, srcRight, srcBottom);
-            auto depth = SceneUtil::createDepth(getReverseZ());
+            auto depth = SceneUtil::createDepth();
             depth->setWriteMask(0);
             osg::StateSet* stateset = geom->getOrCreateStateSet();
             stateset->setAttribute(depth);
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index 72f2828ace..02f59e0ed0 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -178,7 +178,7 @@ osg::ref_ptr<osg::Camera> LocalMap::createOrthographicCamera(float x, float y, f
 {
     osg::ref_ptr<osg::Camera> camera (new osg::Camera);
 
-    if (getReverseZ())
+    if (SceneUtil::getReverseZ())
         camera->setProjectionMatrix(SceneUtil::getReversedZProjectionMatrixAsOrtho(-width/2, width/2, -height/2, height/2, 5, (zmax-zmin) + 10));
     else
         camera->setProjectionMatrixAsOrtho(-width/2, width/2, -height/2, height/2, 5, (zmax-zmin) + 10);
@@ -201,12 +201,10 @@ osg::ref_ptr<osg::Camera> LocalMap::createOrthographicCamera(float x, float y, f
     osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
     stateset->setAttribute(new osg::PolygonMode(osg::PolygonMode::FRONT_AND_BACK, osg::PolygonMode::FILL), osg::StateAttribute::OVERRIDE);
 
-    if (getReverseZ())
-    {
-        camera->setClearDepth(0.0);
-        auto depth = SceneUtil::createDepth(true);
-        stateset->setAttributeAndModes(depth, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
-    }
+    if (SceneUtil::getReverseZ())
+        stateset->setAttributeAndModes(SceneUtil::createDepth(), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+
+    SceneUtil::setCameraClearDepth(camera);
 
     stateset->addUniform(new osg::Uniform("projectionMatrix", static_cast<osg::Matrixf>(camera->getProjectionMatrix())), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
 
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 64dc9ecfe0..12ed88e55d 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -373,7 +373,7 @@ class DepthClearCallback : public osgUtil::RenderBin::DrawCallback
 public:
     DepthClearCallback()
     {
-        mDepth = SceneUtil::createDepth(getReverseZ());
+        mDepth = SceneUtil::createDepth();
         mDepth->setWriteMask(true);
     }
 
diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index 709c67bc2d..aae8f2e4f1 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -661,7 +661,6 @@ namespace MWRender
         if (mergeGroup->getNumChildren())
         {
             SceneUtil::Optimizer optimizer;
-            optimizer.setReverseZ(mSceneManager->getReverseZ());
             if (size > 1/8.f)
             {
                 optimizer.setViewPoint(relativeViewPoint);
diff --git a/apps/openmw/mwrender/postprocessor.cpp b/apps/openmw/mwrender/postprocessor.cpp
index a412ca8cfa..eff7d46892 100644
--- a/apps/openmw/mwrender/postprocessor.cpp
+++ b/apps/openmw/mwrender/postprocessor.cpp
@@ -36,10 +36,10 @@ namespace
     class CullCallback : public osg::NodeCallback
     {
     public:
-        CullCallback(MWRender::PostProcessor* postProcessor)
-            : mPostProcessor(postProcessor)
-            , mLastFrameNumber(0)
-        {}
+        CullCallback()
+            : mLastFrameNumber(0)
+        {
+        }
 
         void operator()(osg::Node* node, osg::NodeVisitor* nv) override
         {
@@ -49,14 +49,24 @@ namespace
             if (frame != mLastFrameNumber)
             {
                 mLastFrameNumber = frame;
-                if (!mPostProcessor->getMsaaFbo())
+
+                MWRender::PostProcessor* postProcessor = dynamic_cast<MWRender::PostProcessor*>(nv->asCullVisitor()->getCurrentCamera()->getUserData());
+
+                if (!postProcessor)
                 {
-                    renderStage->setFrameBufferObject(mPostProcessor->getFbo());
+                    Log(Debug::Error) << "Failed retrieving user data for master camera: FBO setup failed";
+                    traverse(node, nv);
+                    return;
+                }
+
+                if (!postProcessor->getMsaaFbo())
+                {
+                    renderStage->setFrameBufferObject(postProcessor->getFbo());
                 }
                 else
                 {
-                    renderStage->setMultisampleResolveFramebufferObject(mPostProcessor->getFbo());
-                    renderStage->setFrameBufferObject(mPostProcessor->getMsaaFbo());
+                    renderStage->setMultisampleResolveFramebufferObject(postProcessor->getFbo());
+                    renderStage->setFrameBufferObject(postProcessor->getMsaaFbo());
                 }
             }
 
@@ -64,7 +74,6 @@ namespace
         }
 
     private:
-        MWRender::PostProcessor* mPostProcessor;
         unsigned int mLastFrameNumber;
     };
 
@@ -117,7 +126,7 @@ namespace MWRender
         else
         {
             // TODO: Once we have post-processing implemented we want to skip this return and continue with setup.
-            // Rendering to a FBO to fullscreen geometry has overhead (especially when MSAA is enabled) and there are no 
+            // Rendering to a FBO to fullscreen geometry has overhead (especially when MSAA is enabled) and there are no
             // benefits if no floating point depth formats are supported.
             mDepthFormat = GL_DEPTH_COMPONENT24;
             Log(Debug::Warning) << errPreamble << "'GL_ARB_depth_buffer_float' and 'GL_NV_depth_buffer_float' unsupported.";
@@ -136,12 +145,13 @@ namespace MWRender
 
         // We need to manually set the FBO and resolve FBO during the cull callback. If we were using a separate
         // RTT camera this would not be needed.
-        mViewer->getCamera()->addCullCallback(new CullCallback(this));
+        mViewer->getCamera()->addCullCallback(new CullCallback);
         mViewer->getCamera()->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT);
         mViewer->getCamera()->attach(osg::Camera::COLOR_BUFFER0, mSceneTex);
         mViewer->getCamera()->attach(osg::Camera::DEPTH_BUFFER, mDepthTex);
 
         mViewer->getCamera()->getGraphicsContext()->setResizedCallback(new ResizedCallback(this));
+        mViewer->getCamera()->setUserData(this);
     }
 
     void PostProcessor::resize(int width, int height, bool init)
@@ -157,8 +167,6 @@ namespace MWRender
         mFbo->setAttachment(osg::Camera::COLOR_BUFFER0, osg::FrameBufferAttachment(mSceneTex));
         mFbo->setAttachment(osg::Camera::DEPTH_BUFFER, osg::FrameBufferAttachment(mDepthTex));
 
-        mViewer->getCamera()->setUserData(mFbo);
-
         // When MSAA is enabled we must first render to a render buffer, then
         // blit the result to the FBO which is either passed to the main frame
         // buffer for display or used as the entry point for a post process chain.
diff --git a/apps/openmw/mwrender/postprocessor.hpp b/apps/openmw/mwrender/postprocessor.hpp
index 5be58f33ac..ad922c1cbc 100644
--- a/apps/openmw/mwrender/postprocessor.hpp
+++ b/apps/openmw/mwrender/postprocessor.hpp
@@ -1,16 +1,12 @@
 #ifndef OPENMW_MWRENDER_POSTPROCESSOR_H
 #define OPENMW_MWRENDER_POSTPROCESSOR_H
 
+#include <osg/Texture2D>
+#include <osg/Group>
+#include <osg/FrameBufferObject>
+#include <osg/Camera>
 #include <osg/ref_ptr>
 
-namespace osg
-{
-    class Texture2D;
-    class Group;
-    class FrameBufferObject;
-    class Camera;
-}
-
 namespace osgViewer
 {
     class Viewer;
@@ -20,7 +16,7 @@ namespace MWRender
 {
     class RenderingManager;
 
-    class PostProcessor
+    class PostProcessor : public osg::Referenced
     {
     public:
         PostProcessor(RenderingManager& rendering, osgViewer::Viewer* viewer, osg::Group* rootNode);
@@ -33,6 +29,8 @@ namespace MWRender
         void resize(int width, int height, bool init=false);
 
     private:
+        void createTexturesAndCamera(int width, int height);
+
         osgViewer::Viewer* mViewer;
         osg::ref_ptr<osg::Group> mRootNode;
         osg::ref_ptr<osg::Camera> mHUDCamera;
@@ -45,8 +43,6 @@ namespace MWRender
 
         int mDepthFormat;
 
-        void createTexturesAndCamera(int width, int height);
-
         RenderingManager& mRendering;
     };
 }
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index c64bcd3383..5ffc54f3f8 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -79,6 +79,8 @@ namespace MWRender
     public:
         SharedUniformStateUpdater()
             : mLinearFac(0.f)
+            , mNear(0.f)
+            , mFar(0.f)
         {
         }
 
@@ -86,6 +88,8 @@ namespace MWRender
         {
             stateset->addUniform(new osg::Uniform("projectionMatrix", osg::Matrixf{}));
             stateset->addUniform(new osg::Uniform("linearFac", 0.f));
+            stateset->addUniform(new osg::Uniform("near", 0.f));
+            stateset->addUniform(new osg::Uniform("far", 0.f));
         }
 
         void apply(osg::StateSet* stateset, osg::NodeVisitor* nv) override
@@ -97,6 +101,15 @@ namespace MWRender
             auto* uLinearFac = stateset->getUniform("linearFac");
             if (uLinearFac)
                 uLinearFac->set(mLinearFac);
+
+            auto* uNear = stateset->getUniform("near");
+            if (uNear)
+                uNear->set(mNear);
+
+            auto* uFar = stateset->getUniform("far");
+            if (uFar)
+                uFar->set(mFar);
+
         }
 
         void setProjectionMatrix(const osg::Matrixf& projectionMatrix)
@@ -109,9 +122,21 @@ namespace MWRender
             mLinearFac = linearFac;
         }
 
+        void setNear(float near)
+        {
+            mNear = near;
+        }
+
+        void setFar(float far)
+        {
+            mFar = far;
+        }
+
     private:
         osg::Matrixf mProjectionMatrix;
         float mLinearFac;
+        float mNear;
+        float mFar;
     };
 
     class StateUpdater : public SceneUtil::StateSetUpdater
@@ -240,8 +265,7 @@ namespace MWRender
         , mFieldOfViewOverridden(false)
         , mFieldOfViewOverride(0.f)
     {
-        auto ext = osg::GLExtensions::Get(0, false);
-        bool reverseZ = Settings::Manager::getBool("reverse z", "Camera") && ext && ext->isClipControlSupported;
+        bool reverseZ = SceneUtil::getReverseZ();
 
         if (reverseZ)
             Log(Debug::Info) << "Using reverse-z depth buffer";
@@ -267,7 +291,6 @@ namespace MWRender
         resourceSystem->getSceneManager()->setSpecularMapPattern(Settings::Manager::getString("specular map pattern", "Shaders"));
         resourceSystem->getSceneManager()->setApplyLightingToEnvMaps(Settings::Manager::getBool("apply lighting to environment maps", "Shaders"));
         resourceSystem->getSceneManager()->setConvertAlphaTestToAlphaToCoverage(Settings::Manager::getBool("antialias alpha test", "Shaders") && Settings::Manager::getInt("antialiasing", "Video") > 1);
-        resourceSystem->getSceneManager()->setReverseZ(reverseZ);
 
         // Let LightManager choose which backend to use based on our hint. For methods besides legacy lighting, this depends on support for various OpenGL extensions.
         osg::ref_ptr<SceneUtil::LightManager> sceneRoot = new SceneUtil::LightManager(lightingMethod == SceneUtil::LightingMethod::FFP);
@@ -294,7 +317,7 @@ namespace MWRender
         if (Settings::Manager::getBool("object shadows", "Shadows"))
             shadowCastingTraversalMask |= (Mask_Object|Mask_Static);
 
-        mShadowManager.reset(new SceneUtil::ShadowManager(sceneRoot, mRootNode, shadowCastingTraversalMask, indoorShadowCastingTraversalMask, mResourceSystem->getSceneManager()->getShaderManager(), reverseZ));
+        mShadowManager.reset(new SceneUtil::ShadowManager(sceneRoot, mRootNode, shadowCastingTraversalMask, indoorShadowCastingTraversalMask, mResourceSystem->getSceneManager()->getShaderManager()));
 
         Shader::ShaderManager::DefineMap shadowDefines = mShadowManager->getShadowDefines();
         Shader::ShaderManager::DefineMap lightDefines = sceneRoot->getLightDefines();
@@ -408,9 +431,12 @@ namespace MWRender
             mGroundcoverWorld->setActiveGrid(osg::Vec4i(0, 0, 0, 0));
         }
 
-        mPostProcessor.reset(new PostProcessor(*this, viewer, mRootNode));
+        mPostProcessor = new PostProcessor(*this, viewer, mRootNode);
         resourceSystem->getSceneManager()->setDepthFormat(mPostProcessor->getDepthFormat());
 
+        if (reverseZ && !SceneUtil::isFloatingPointDepthFormat(mPostProcessor->getDepthFormat()))
+            Log(Debug::Warning) << "Floating point depth format not in use but reverse-z buffer is enabled, consider disabling it.";
+
         // water goes after terrain for correct waterculling order
         mWater.reset(new Water(sceneRoot->getParent(0), sceneRoot, mResourceSystem, mViewer->getIncrementalCompileOperation(), resourcePath));
 
@@ -474,7 +500,6 @@ namespace MWRender
         mViewer->getCamera()->setCullMask(~(Mask_UpdateVisitor|Mask_SimpleWater));
         NifOsg::Loader::setHiddenNodeMask(Mask_UpdateVisitor);
         NifOsg::Loader::setIntersectionDisabledNodeMask(Mask_Effect);
-        NifOsg::Loader::setReverseZ(reverseZ);
         Nif::NIFFile::setLoadUnsupportedFiles(Settings::Manager::getBool("load unsupported nif files", "Models"));
 
         // TODO: Near clip should not need to be bounded like this, but too small values break OSG shadow calculations CPU-side.
@@ -487,8 +512,6 @@ namespace MWRender
         mFirstPersonFieldOfView = std::min(std::max(1.f, firstPersonFov), 179.f);
         mStateUpdater->setFogEnd(mViewDistance);
 
-        mRootNode->getOrCreateStateSet()->addUniform(new osg::Uniform("near", mNearClip));
-        mRootNode->getOrCreateStateSet()->addUniform(new osg::Uniform("far", mViewDistance));
         mRootNode->getOrCreateStateSet()->addUniform(new osg::Uniform("simpleWater", false));
 
         // Hopefully, anything genuinely requiring the default alpha func of GL_ALWAYS explicitly sets it
@@ -496,18 +519,15 @@ namespace MWRender
         // The transparent renderbin sets alpha testing on because that was faster on old GPUs. It's now slower and breaks things.
         mRootNode->getOrCreateStateSet()->setMode(GL_ALPHA_TEST, osg::StateAttribute::OFF);
 
-        mUniformNear = mRootNode->getOrCreateStateSet()->getUniform("near");
-        mUniformFar = mRootNode->getOrCreateStateSet()->getUniform("far");
-
         if (reverseZ)
         {
-            auto depth = SceneUtil::createDepth(reverseZ);
             osg::ref_ptr<osg::ClipControl> clipcontrol = new osg::ClipControl(osg::ClipControl::LOWER_LEFT, osg::ClipControl::ZERO_TO_ONE);
-            mViewer->getCamera()->setClearDepth(0.0);
-            mRootNode->getOrCreateStateSet()->setAttributeAndModes(depth, osg::StateAttribute::ON);
+            mRootNode->getOrCreateStateSet()->setAttributeAndModes(SceneUtil::createDepth(), osg::StateAttribute::ON);
             mRootNode->getOrCreateStateSet()->setAttributeAndModes(clipcontrol, osg::StateAttribute::ON);
         }
 
+        SceneUtil::setCameraClearDepth(mViewer->getCamera());
+
         updateProjectionMatrix();
     }
 
@@ -1143,7 +1163,7 @@ namespace MWRender
 
         mViewer->getCamera()->setProjectionMatrixAsPerspective(fov, aspect, mNearClip, mViewDistance);
 
-        if (mResourceSystem->getSceneManager()->getReverseZ())
+        if (SceneUtil::getReverseZ())
         {
             mSharedUniformStateUpdater->setLinearFac(-mNearClip / (mViewDistance - mNearClip) - 1.f);
             mSharedUniformStateUpdater->setProjectionMatrix(SceneUtil::getReversedZProjectionMatrixAsPerspective(fov, aspect, mNearClip, mViewDistance));
@@ -1151,8 +1171,8 @@ namespace MWRender
         else
             mSharedUniformStateUpdater->setProjectionMatrix(mViewer->getCamera()->getProjectionMatrix());
 
-        mUniformNear->set(mNearClip);
-        mUniformFar->set(mViewDistance);
+        mSharedUniformStateUpdater->setNear(mNearClip);
+        mSharedUniformStateUpdater->setFar(mViewDistance);
 
         // Since our fog is not radial yet, we should take FOV in account, otherwise terrain near viewing distance may disappear.
         // Limit FOV here just for sure, otherwise viewing distance can be too high.
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index cbe25addf1..d6d7e74634 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -110,9 +110,6 @@ namespace MWRender
         SceneUtil::UnrefQueue* getUnrefQueue();
         Terrain::World* getTerrain();
 
-        osg::Uniform* mUniformNear;
-        osg::Uniform* mUniformFar;
-
         void preloadCommonAssets();
 
         double getReferenceTime() const;
@@ -241,8 +238,9 @@ namespace MWRender
         void pagingBlacklistObject(int type, const MWWorld::ConstPtr &ptr);
         bool pagingUnlockCache();
         void getPagedRefnums(const osg::Vec4i &activeGrid, std::set<ESM::RefNum> &out);
-        
+
         void updateProjectionMatrix();
+
     private:
         void updateTextureFiltering();
         void updateAmbient();
@@ -289,7 +287,7 @@ namespace MWRender
         std::unique_ptr<ScreenshotManager> mScreenshotManager;
         std::unique_ptr<EffectManager> mEffectManager;
         std::unique_ptr<SceneUtil::ShadowManager> mShadowManager;
-        std::unique_ptr<PostProcessor> mPostProcessor;
+        osg::ref_ptr<PostProcessor> mPostProcessor;
         osg::ref_ptr<NpcAnimation> mPlayerAnimation;
         osg::ref_ptr<SceneUtil::PositionAttitudeTransform> mPlayerNode;
         std::unique_ptr<Camera> mCamera;
diff --git a/apps/openmw/mwrender/ripplesimulation.cpp b/apps/openmw/mwrender/ripplesimulation.cpp
index c7deac51de..fdfc3db63d 100644
--- a/apps/openmw/mwrender/ripplesimulation.cpp
+++ b/apps/openmw/mwrender/ripplesimulation.cpp
@@ -56,13 +56,13 @@ namespace
         stateset->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
         stateset->setTextureAttributeAndModes(0, textures[0], osg::StateAttribute::ON);
 
-        auto depth = SceneUtil::createDepth(resourceSystem->getSceneManager()->getReverseZ());
+        auto depth = SceneUtil::createDepth();
         depth->setWriteMask(false);
         stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
 
         osg::ref_ptr<osg::PolygonOffset> polygonOffset (new osg::PolygonOffset);
-        polygonOffset->setUnits(-1);
-        polygonOffset->setFactor(-1);
+        polygonOffset->setUnits(SceneUtil::getReverseZ() ? 1 : -1);
+        polygonOffset->setFactor(SceneUtil::getReverseZ() ? 1 : -1);
         stateset->setAttributeAndModes(polygonOffset, osg::StateAttribute::ON);
 
         stateset->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
diff --git a/apps/openmw/mwrender/screenshotmanager.cpp b/apps/openmw/mwrender/screenshotmanager.cpp
index 967e282f30..96a8a9450a 100644
--- a/apps/openmw/mwrender/screenshotmanager.cpp
+++ b/apps/openmw/mwrender/screenshotmanager.cpp
@@ -23,6 +23,7 @@
 #include "util.hpp"
 #include "vismask.hpp"
 #include "water.hpp"
+#include "postprocessor.hpp"
 
 namespace MWRender
 {
@@ -92,14 +93,13 @@ namespace MWRender
 
             // Ensure we are reading from the resolved framebuffer and not the multisampled render buffer when in use.
             // glReadPixel() cannot read from multisampled targets.
+            PostProcessor* postProcessor = dynamic_cast<PostProcessor*>(renderInfo.getCurrentCamera()->getUserData());
 
-            osg::FrameBufferObject* fbo = dynamic_cast<osg::FrameBufferObject*>(renderInfo.getCurrentCamera()->getUserData());
-
-            if (fbo)
+            if (postProcessor && postProcessor->getFbo() && postProcessor->getMsaaFbo())
             {
                 osg::GLExtensions* ext = osg::GLExtensions::Get(renderInfo.getContextID(), false);
                 if (ext)
-                    ext->glBindFramebuffer(GL_FRAMEBUFFER_EXT, fbo->getHandle(renderInfo.getContextID()));
+                    ext->glBindFramebuffer(GL_FRAMEBUFFER_EXT, postProcessor->getFbo()->getHandle(renderInfo.getContextID()));
             }
 
             mImage->readPixels(leftPadding, topPadding, width, height, GL_RGB, GL_UNSIGNED_BYTE);
@@ -297,12 +297,10 @@ namespace MWRender
         camera->setRenderOrder(osg::Camera::PRE_RENDER);
         camera->setReferenceFrame(osg::Camera::ABSOLUTE_RF);
         camera->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT,osg::Camera::PIXEL_BUFFER_RTT);
-
-        if (getReverseZ())
-            camera->setClearDepth(0.0);
-
         camera->setViewport(0, 0, w, h);
 
+        SceneUtil::setCameraClearDepth(camera);
+
         osg::ref_ptr<osg::Texture2D> texture (new osg::Texture2D);
         texture->setInternalFormat(GL_RGB);
         texture->setTextureSize(w,h);
@@ -336,7 +334,7 @@ namespace MWRender
         float nearClip = Settings::Manager::getFloat("near clip", "Camera");
         float viewDistance = Settings::Manager::getFloat("viewing distance", "Camera");
         // each cubemap side sees 90 degrees
-        if (getReverseZ())
+        if (SceneUtil::getReverseZ())
             rttCamera->setProjectionMatrix(SceneUtil::getReversedZProjectionMatrixAsPerspectiveInf(90.0, w/float(h), nearClip));
         else
             rttCamera->setProjectionMatrixAsPerspective(90.0, w/float(h), nearClip, viewDistance);
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index dd97f79eda..2b58730fe1 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -595,11 +595,11 @@ private:
         osg::StateSet* queryStateSet = new osg::StateSet;
         if (queryVisible)
         {
-            auto depth = SceneUtil::createDepth(getReverseZ());
+            auto depth = SceneUtil::createDepth();
             // This is a trick to make fragments written by the query always use the maximum depth value,
             // without having to retrieve the current far clipping distance.
             // We want the sun glare to be "infinitely" far away.
-            double far = getReverseZ() ? 0.0 : 1.0;
+            double far = SceneUtil::getReverseZ() ? 0.0 : 1.0;
             depth->setZNear(far);
             depth->setZFar(far);
             depth->setWriteMask(false);
@@ -1210,7 +1210,7 @@ void SkyManager::create()
     mCloudMesh2->addUpdateCallback(mCloudUpdater2);
     mCloudMesh2->setNodeMask(0);
 
-    auto depth = SceneUtil::createDepth(mSceneManager->getReverseZ());
+    auto depth = SceneUtil::createDepth();
     depth->setWriteMask(false);
     mEarlyRenderBinRoot->getOrCreateStateSet()->setAttributeAndModes(depth, osg::StateAttribute::ON);
     mEarlyRenderBinRoot->getOrCreateStateSet()->setMode(GL_BLEND, osg::StateAttribute::ON);
diff --git a/apps/openmw/mwrender/util.cpp b/apps/openmw/mwrender/util.cpp
index 5740f7df6c..e3fc48040f 100644
--- a/apps/openmw/mwrender/util.cpp
+++ b/apps/openmw/mwrender/util.cpp
@@ -4,13 +4,10 @@
 #include <osg/ValueObject>
 
 #include <components/resource/resourcesystem.hpp>
-#include <components/resource/scenemanager.hpp>
 #include <components/resource/imagemanager.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/sceneutil/visitor.hpp>
 
-#include "../mwbase/environment.hpp"
-
 namespace MWRender
 {
 
@@ -67,9 +64,4 @@ void overrideTexture(const std::string &texture, Resource::ResourceSystem *resou
     node->setStateSet(stateset);
 }
 
-bool getReverseZ()
-{
-    return MWBase::Environment::get().getResourceSystem()->getSceneManager()->getReverseZ();
-}
-
 }
diff --git a/apps/openmw/mwrender/util.hpp b/apps/openmw/mwrender/util.hpp
index c005dd9b23..a89baa22b1 100644
--- a/apps/openmw/mwrender/util.hpp
+++ b/apps/openmw/mwrender/util.hpp
@@ -32,8 +32,6 @@ namespace MWRender
             // no traverse()
         }
     };
-
-    bool getReverseZ();
 }
 
 #endif
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index 1318921688..da26595c8c 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -273,7 +273,7 @@ public:
 
     void setDefaults(osg::Camera* camera) override
     {
-        camera->setClearDepth(1.0);
+        SceneUtil::setCameraClearDepth(camera);
         camera->setReferenceFrame(osg::Camera::RELATIVE_RF);
         camera->setSmallFeatureCullingPixelSize(Settings::Manager::getInt("small feature culling pixel size", "Water"));
         camera->setName("RefractionCamera");
@@ -339,7 +339,7 @@ public:
 
     void setDefaults(osg::Camera* camera) override
     {
-        camera->setClearDepth(1.0);
+        SceneUtil::setCameraClearDepth(camera);
         camera->setReferenceFrame(osg::Camera::RELATIVE_RF);
         camera->setSmallFeatureCullingPixelSize(Settings::Manager::getInt("small feature culling pixel size", "Water"));
         camera->setName("ReflectionCamera");
@@ -546,7 +546,7 @@ osg::Node* Water::getRefractionNode()
 
 void Water::createSimpleWaterStateSet(osg::Node* node, float alpha)
 {
-    osg::ref_ptr<osg::StateSet> stateset = SceneUtil::createSimpleWaterStateSet(alpha, MWRender::RenderBin_Water, mResourceSystem->getSceneManager()->getReverseZ());
+    osg::ref_ptr<osg::StateSet> stateset = SceneUtil::createSimpleWaterStateSet(alpha, MWRender::RenderBin_Water);
 
     node->setStateSet(stateset);
     node->setUpdateCallback(nullptr);
@@ -616,7 +616,7 @@ public:
         {
             stateset->setMode(GL_BLEND, osg::StateAttribute::ON);
             stateset->setRenderBinDetails(MWRender::RenderBin_Water, "RenderBin");
-            osg::ref_ptr<osg::Depth> depth(new osg::Depth);
+            osg::ref_ptr<osg::Depth> depth = SceneUtil::createDepth();
             depth->setWriteMask(false);
             stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
         }
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 384c640388..83b9fb61c2 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -226,18 +226,6 @@ namespace NifOsg
         return sIntersectionDisabledNodeMask;
     }
 
-    bool Loader::sReverseZ = false;
-
-    void Loader::setReverseZ(bool reverseZ)
-    {
-        sReverseZ = reverseZ;
-    }
-
-    bool Loader::getReverseZ()
-    {
-        return sReverseZ;
-    }
-
     class LoaderImpl
     {
     public:
@@ -1835,7 +1823,7 @@ namespace NifOsg
                 // Depth test flag
                 stateset->setMode(GL_DEPTH_TEST, zprop->flags&1 ? osg::StateAttribute::ON
                                                                 : osg::StateAttribute::OFF);
-                auto depth = SceneUtil::createDepth(Loader::getReverseZ());
+                auto depth = SceneUtil::createDepth();
                 // Depth write flag
                 depth->setWriteMask((zprop->flags>>1)&1);
                 // Morrowind ignores depth test function
diff --git a/components/nifosg/nifloader.hpp b/components/nifosg/nifloader.hpp
index cee75de6d2..8ee6b41674 100644
--- a/components/nifosg/nifloader.hpp
+++ b/components/nifosg/nifloader.hpp
@@ -51,14 +51,10 @@ namespace NifOsg
         static void setIntersectionDisabledNodeMask(unsigned int mask);
         static unsigned int getIntersectionDisabledNodeMask();
 
-        static void setReverseZ(bool reverseZ);
-        static bool getReverseZ();
-
     private:
         static unsigned int sHiddenNodeMask;
         static unsigned int sIntersectionDisabledNodeMask;
         static bool sShowMarkers;
-        static bool sReverseZ;
     };
 
 }
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 3c548ead23..ffcd4c3308 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -275,16 +275,6 @@ namespace Resource
         return mClampLighting;
     }
 
-    void SceneManager::setReverseZ(bool reverseZ)
-    {
-        mReverseZ = reverseZ;
-    }
-
-    bool SceneManager::getReverseZ() const
-    {
-        return mReverseZ;
-    }
-
     void SceneManager::setDepthFormat(GLenum format)
     {
         mDepthFormat = format;
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index 780375f77e..9d798177a1 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -92,9 +92,6 @@ namespace Resource
         void setClampLighting(bool clamp);
         bool getClampLighting() const;
 
-        void setReverseZ(bool reverseZ);
-        bool getReverseZ() const;
-
         void setDepthFormat(GLenum format);
         GLenum getDepthFormat() const;
 
@@ -208,7 +205,6 @@ namespace Resource
         SceneUtil::LightingMethod mLightingMethod;
         SceneUtil::LightManager::SupportedMethods mSupportedLightingMethods;
         bool mConvertAlphaTestToAlphaToCoverage;
-        bool mReverseZ;
         GLenum mDepthFormat;
 
         osg::ref_ptr<MultiObjectCache> mInstanceCache;
diff --git a/components/sceneutil/agentpath.cpp b/components/sceneutil/agentpath.cpp
index abe332f758..5f9b574e7d 100644
--- a/components/sceneutil/agentpath.cpp
+++ b/components/sceneutil/agentpath.cpp
@@ -1,6 +1,8 @@
 #include "agentpath.hpp"
 #include "detourdebugdraw.hpp"
 
+#include <osg/Material>
+
 #include <components/detournavigator/settings.hpp>
 
 #include <algorithm>
@@ -65,6 +67,10 @@ namespace SceneUtil
 
         debugDraw.depthMask(true);
 
+        osg::ref_ptr<osg::Material> material = new osg::Material;
+        material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
+        group->getOrCreateStateSet()->setAttribute(material);
+
         return group;
     }
 }
diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
index 0004045dc8..19222eda23 100644
--- a/components/sceneutil/mwshadowtechnique.cpp
+++ b/components/sceneutil/mwshadowtechnique.cpp
@@ -26,6 +26,9 @@
 #include <osg/ClipControl>
 
 #include <sstream>
+
+#include <components/sceneutil/util.hpp>
+
 #include "shadowsbin.hpp"
 
 namespace {
@@ -891,16 +894,6 @@ void SceneUtil::MWShadowTechnique::disableFrontFaceCulling()
     }
 }
 
-void SceneUtil::MWShadowTechnique::enableReverseZ()
-{
-    _reverseZ = true;
-}
-
-void SceneUtil::MWShadowTechnique::disableReverseZ()
-{
-    _reverseZ = false;
-}
-
 void SceneUtil::MWShadowTechnique::setupCastingShader(Shader::ShaderManager & shaderManager)
 {
     // This can't be part of the constructor as OSG mandates that there be a trivial constructor available
@@ -1647,7 +1640,7 @@ void MWShadowTechnique::createShaders()
     _shadowCastingStateSet->addUniform(new osg::Uniform("alphaTestShadows", false));
     osg::ref_ptr<osg::Depth> depth = new osg::Depth;
     depth->setWriteMask(true);
-    if (_reverseZ)
+    if (SceneUtil::getReverseZ())
     {
         osg::ref_ptr<osg::ClipControl> clipcontrol = new osg::ClipControl(osg::ClipControl::LOWER_LEFT, osg::ClipControl::NEGATIVE_ONE_TO_ONE);
         _shadowCastingStateSet->setAttribute(clipcontrol, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
diff --git a/components/sceneutil/mwshadowtechnique.hpp b/components/sceneutil/mwshadowtechnique.hpp
index 7fde0d7dbb..de57bf1fdc 100644
--- a/components/sceneutil/mwshadowtechnique.hpp
+++ b/components/sceneutil/mwshadowtechnique.hpp
@@ -85,10 +85,6 @@ namespace SceneUtil {
 
         virtual void disableFrontFaceCulling();
 
-        virtual void enableReverseZ();
-
-        virtual void disableReverseZ();
-
         virtual void setupCastingShader(Shader::ShaderManager &shaderManager);
 
         class ComputeLightSpaceBounds : public osg::NodeVisitor, public osg::CullStack
@@ -270,8 +266,6 @@ namespace SceneUtil {
 
         float                                   _shadowFadeStart = 0.0;
 
-        bool                                    _reverseZ = false;
-
         class DebugHUD final : public osg::Referenced
         {
         public:
diff --git a/components/sceneutil/navmesh.cpp b/components/sceneutil/navmesh.cpp
index aeb1779bd6..b0f356f089 100644
--- a/components/sceneutil/navmesh.cpp
+++ b/components/sceneutil/navmesh.cpp
@@ -6,6 +6,7 @@
 #include <DetourDebugDraw.h>
 
 #include <osg/Group>
+#include <osg/Material>
 
 namespace SceneUtil
 {
@@ -17,6 +18,11 @@ namespace SceneUtil
         navMeshQuery.init(&navMesh, settings.mMaxNavMeshQueryNodes);
         duDebugDrawNavMeshWithClosedList(&debugDraw, navMesh, navMeshQuery,
                                          DU_DRAWNAVMESH_OFFMESHCONS | DU_DRAWNAVMESH_CLOSEDLIST);
+
+        osg::ref_ptr<osg::Material> material = new osg::Material;
+        material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
+        group->getOrCreateStateSet()->setAttribute(material);
+
         return group;
     }
 }
diff --git a/components/sceneutil/optimizer.cpp b/components/sceneutil/optimizer.cpp
index 6bde81c12d..5fbeb681fc 100644
--- a/components/sceneutil/optimizer.cpp
+++ b/components/sceneutil/optimizer.cpp
@@ -109,7 +109,6 @@ void Optimizer::optimize(osg::Node* node, unsigned int options)
         MergeGeometryVisitor mgv(this);
         mgv.setTargetMaximumNumberOfVertices(1000000);
         mgv.setMergeAlphaBlending(_mergeAlphaBlending);
-        mgv.setReverseZ(_reverseZ);
         mgv.setViewPoint(_viewPoint);
         node->accept(mgv);
 
@@ -1563,7 +1562,7 @@ bool Optimizer::MergeGeometryVisitor::mergeGroup(osg::Group& group)
                 }
                 if (_alphaBlendingActive && _mergeAlphaBlending && !geom->getStateSet())
                 {
-                    auto d = createDepth(_reverseZ);
+                    auto d = createDepth();
                     d->setWriteMask(0);
                     geom->getOrCreateStateSet()->setAttribute(d);
                 }
diff --git a/components/sceneutil/optimizer.hpp b/components/sceneutil/optimizer.hpp
index 9f9c788445..2d6293e231 100644
--- a/components/sceneutil/optimizer.hpp
+++ b/components/sceneutil/optimizer.hpp
@@ -65,7 +65,7 @@ class Optimizer
 
     public:
 
-        Optimizer() : _mergeAlphaBlending(false), _reverseZ(false) {}
+        Optimizer() : _mergeAlphaBlending(false) {}
         virtual ~Optimizer() {}
 
         enum OptimizationOptions
@@ -119,7 +119,6 @@ class Optimizer
         };
 
         void setMergeAlphaBlending(bool merge) { _mergeAlphaBlending = merge; }
-        void setReverseZ(bool reverseZ) { _reverseZ = reverseZ; }
         void setViewPoint(const osg::Vec3f& viewPoint) { _viewPoint = viewPoint; }
 
         /** Reset internal data to initial state - the getPermissibleOptionsMap is cleared.*/
@@ -258,7 +257,6 @@ class Optimizer
 
         osg::Vec3f _viewPoint;
         bool _mergeAlphaBlending;
-        bool _reverseZ;
 
     public:
 
@@ -379,18 +377,12 @@ class Optimizer
                 /// default to traversing all children.
                 MergeGeometryVisitor(Optimizer* optimizer=0) :
                     BaseOptimizerVisitor(optimizer, MERGE_GEOMETRY),
-                    _targetMaximumNumberOfVertices(10000), _alphaBlendingActive(false), _mergeAlphaBlending(false), _reverseZ(false) {}
+                    _targetMaximumNumberOfVertices(10000), _alphaBlendingActive(false), _mergeAlphaBlending(false) {}
 
                 void setMergeAlphaBlending(bool merge)
                 {
                     _mergeAlphaBlending = merge;
                 }
-
-                void setReverseZ(bool reverseZ)
-                {
-                    _reverseZ = reverseZ;
-                }
-
                 void setViewPoint(const osg::Vec3f& viewPoint)
                 {
                     _viewPoint = viewPoint;
@@ -429,7 +421,6 @@ class Optimizer
                 std::vector<osg::StateSet*> _stateSetStack;
                 bool _alphaBlendingActive;
                 bool _mergeAlphaBlending;
-                bool _reverseZ;
                 osg::Vec3f _viewPoint;
         };
 
diff --git a/components/sceneutil/pathgridutil.cpp b/components/sceneutil/pathgridutil.cpp
index f37a8ba597..9ebdef61b0 100644
--- a/components/sceneutil/pathgridutil.cpp
+++ b/components/sceneutil/pathgridutil.cpp
@@ -1,6 +1,7 @@
 #include "pathgridutil.hpp"
 
 #include <osg/Geometry>
+#include <osg/Material>
 
 #include <components/esm/loadpgrd.hpp>
 
@@ -174,6 +175,11 @@ namespace SceneUtil
                 gridGeometry->addPrimitiveSet(lineIndices);
             gridGeometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
         }
+
+        osg::ref_ptr<osg::Material> material = new osg::Material;
+        material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
+        gridGeometry->getOrCreateStateSet()->setAttribute(material);
+
         return gridGeometry;
     }
 
diff --git a/components/sceneutil/recastmesh.cpp b/components/sceneutil/recastmesh.cpp
index 85f3e7177b..8d6d47c2b6 100644
--- a/components/sceneutil/recastmesh.cpp
+++ b/components/sceneutil/recastmesh.cpp
@@ -8,6 +8,7 @@
 #include <RecastDebugDraw.h>
 
 #include <osg/Group>
+#include <osg/Material>
 
 #include <algorithm>
 #include <vector>
@@ -65,6 +66,11 @@ namespace SceneUtil
         const auto texScale = 1.0f / (settings.mCellSize * 10.0f);
         duDebugDrawTriMesh(&debugDraw, vertices.data(), static_cast<int>(vertices.size() / 3),
             indices.data(), normals.data(), static_cast<int>(indices.size() / 3), nullptr, texScale);
+
+        osg::ref_ptr<osg::Material> material = new osg::Material;
+        material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
+        group->getOrCreateStateSet()->setAttribute(material);
+
         return group;
     }
 }
diff --git a/components/sceneutil/shadow.cpp b/components/sceneutil/shadow.cpp
index 7ca15e612d..3244dc672a 100644
--- a/components/sceneutil/shadow.cpp
+++ b/components/sceneutil/shadow.cpp
@@ -94,12 +94,10 @@ namespace SceneUtil
         }
     }
 
-    ShadowManager::ShadowManager(osg::ref_ptr<osg::Group> sceneRoot, osg::ref_ptr<osg::Group> rootNode, unsigned int outdoorShadowCastingMask, unsigned int indoorShadowCastingMask, Shader::ShaderManager &shaderManager, bool reverseZ)
-        : mReverseZ(reverseZ)
-        , mShadowedScene(new osgShadow::ShadowedScene)
-        , mShadowTechnique(new MWShadowTechnique)
-        , mOutdoorShadowCastingMask(outdoorShadowCastingMask)
-        , mIndoorShadowCastingMask(indoorShadowCastingMask)
+    ShadowManager::ShadowManager(osg::ref_ptr<osg::Group> sceneRoot, osg::ref_ptr<osg::Group> rootNode, unsigned int outdoorShadowCastingMask, unsigned int indoorShadowCastingMask, Shader::ShaderManager &shaderManager) : mShadowedScene(new osgShadow::ShadowedScene),
+        mShadowTechnique(new MWShadowTechnique),
+        mOutdoorShadowCastingMask(outdoorShadowCastingMask),
+        mIndoorShadowCastingMask(indoorShadowCastingMask)
     {
         mShadowedScene->setShadowTechnique(mShadowTechnique);
 
@@ -110,9 +108,6 @@ namespace SceneUtil
         mShadowSettings = mShadowedScene->getShadowSettings();
         setupShadowSettings();
 
-        if (mReverseZ)
-            mShadowTechnique->enableReverseZ();
-
         mShadowTechnique->setupCastingShader(shaderManager);
 
         enableOutdoorMode();
@@ -185,9 +180,4 @@ namespace SceneUtil
             mShadowTechnique->enableShadows();
         mShadowSettings->setCastsShadowTraversalMask(mOutdoorShadowCastingMask);
     }
-    
-    bool ShadowManager::getReverseZ() const
-    {
-        return mReverseZ;
-    }
 }
diff --git a/components/sceneutil/shadow.hpp b/components/sceneutil/shadow.hpp
index 8092f77f93..c823ecf860 100644
--- a/components/sceneutil/shadow.hpp
+++ b/components/sceneutil/shadow.hpp
@@ -17,7 +17,7 @@ namespace SceneUtil
 
         static Shader::ShaderManager::DefineMap getShadowsDisabledDefines();
 
-        ShadowManager(osg::ref_ptr<osg::Group> sceneRoot, osg::ref_ptr<osg::Group> rootNode, unsigned int outdoorShadowCastingMask, unsigned int indoorShadowCastingMask, Shader::ShaderManager &shaderManager, bool reverseZ);
+        ShadowManager(osg::ref_ptr<osg::Group> sceneRoot, osg::ref_ptr<osg::Group> rootNode, unsigned int outdoorShadowCastingMask, unsigned int indoorShadowCastingMask, Shader::ShaderManager &shaderManager);
 
         void setupShadowSettings();
 
@@ -26,11 +26,8 @@ namespace SceneUtil
         void enableIndoorMode();
 
         void enableOutdoorMode();
-
-        bool getReverseZ() const;
     protected:
         bool mEnableShadows;
-        bool mReverseZ;
 
         osg::ref_ptr<osgShadow::ShadowedScene> mShadowedScene;
         osg::ref_ptr<osgShadow::ShadowSettings> mShadowSettings;
diff --git a/components/sceneutil/util.cpp b/components/sceneutil/util.cpp
index 1f79469a19..02cd9295e7 100644
--- a/components/sceneutil/util.cpp
+++ b/components/sceneutil/util.cpp
@@ -4,16 +4,31 @@
 #include <sstream>
 #include <iomanip>
 
+#include <SDL_opengl_glext.h>
+
 #include <osg/Node>
 #include <osg/NodeVisitor>
 #include <osg/TexGen>
 #include <osg/TexEnvCombine>
 #include <osg/Version>
-#include <osg/Fog>
 
 #include <components/resource/imagemanager.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/settings/settings.hpp>
+#include <components/debug/debuglog.hpp>
+
+namespace
+{
+
+bool isReverseZSupported()
+{
+    if (!Settings::Manager::mDefaultSettings.count({"Camera", "reverse z"}))
+        return false;
+    auto ext = osg::GLExtensions::Get(0, false);
+    return Settings::Manager::getBool("reverse z", "Camera") && ext && ext->isClipControlSupported;
+}
+
+}
 
 namespace SceneUtil
 {
@@ -151,32 +166,42 @@ void GlowUpdater::setDuration(float duration)
     mDuration = duration;
 }
 
-AttachMultisampledDepthColorCallback::AttachMultisampledDepthColorCallback(const osg::ref_ptr<osg::Texture2D>& colorTex, const osg::ref_ptr<osg::Texture2D>& depthTex, int samples, int colorSamples)
+// Allows camera to render to a color and floating point depth texture with a multisampled framebuffer.
+// Must be set on a camera's cull callback.
+class AttachMultisampledDepthColorCallback : public osg::NodeCallback
 {
-    int width = colorTex->getTextureWidth();
-    int height = colorTex->getTextureHeight();
+public:
+    AttachMultisampledDepthColorCallback(osg::Texture2D* colorTex, osg::Texture2D* depthTex, int samples, int colorSamples)
+    {
+        int width = colorTex->getTextureWidth();
+        int height = colorTex->getTextureHeight();
 
-    osg::ref_ptr<osg::RenderBuffer> rbColor = new osg::RenderBuffer(width, height, colorTex->getInternalFormat(), samples, colorSamples);
-    osg::ref_ptr<osg::RenderBuffer> rbDepth = new osg::RenderBuffer(width, height, depthTex->getInternalFormat(), samples, colorSamples);
+        osg::ref_ptr<osg::RenderBuffer> rbColor = new osg::RenderBuffer(width, height, colorTex->getInternalFormat(), samples, colorSamples);
+        osg::ref_ptr<osg::RenderBuffer> rbDepth = new osg::RenderBuffer(width, height, depthTex->getInternalFormat(), samples, colorSamples);
 
-    mMsaaFbo = new osg::FrameBufferObject;
-    mMsaaFbo->setAttachment(osg::Camera::COLOR_BUFFER0, osg::FrameBufferAttachment(rbColor));
-    mMsaaFbo->setAttachment(osg::Camera::DEPTH_BUFFER, osg::FrameBufferAttachment(rbDepth));
+        mMsaaFbo = new osg::FrameBufferObject;
+        mMsaaFbo->setAttachment(osg::Camera::COLOR_BUFFER0, osg::FrameBufferAttachment(rbColor));
+        mMsaaFbo->setAttachment(osg::Camera::DEPTH_BUFFER, osg::FrameBufferAttachment(rbDepth));
 
-    mFbo = new osg::FrameBufferObject;
-    mFbo->setAttachment(osg::Camera::COLOR_BUFFER0, osg::FrameBufferAttachment(colorTex));
-    mFbo->setAttachment(osg::Camera::DEPTH_BUFFER, osg::FrameBufferAttachment(depthTex));
-}
+        mFbo = new osg::FrameBufferObject;
+        mFbo->setAttachment(osg::Camera::COLOR_BUFFER0, osg::FrameBufferAttachment(colorTex));
+        mFbo->setAttachment(osg::Camera::DEPTH_BUFFER, osg::FrameBufferAttachment(depthTex));
+    }
 
-void AttachMultisampledDepthColorCallback::operator()(osg::Node* node, osg::NodeVisitor* nv)
-{
-    osgUtil::RenderStage* renderStage = nv->asCullVisitor()->getCurrentRenderStage();
+    void operator()(osg::Node* node, osg::NodeVisitor* nv) override
+    {
+        osgUtil::RenderStage* renderStage = nv->asCullVisitor()->getCurrentRenderStage();
 
-    renderStage->setMultisampleResolveFramebufferObject(mFbo);
-    renderStage->setFrameBufferObject(mMsaaFbo);
+        renderStage->setMultisampleResolveFramebufferObject(mFbo);
+        renderStage->setFrameBufferObject(mMsaaFbo);
 
-    traverse(node, nv);
-}
+        traverse(node, nv);
+    }
+
+private:
+    osg::ref_ptr<osg::FrameBufferObject> mFbo;
+    osg::ref_ptr<osg::FrameBufferObject> mMsaaFbo;
+};
 
 void transformBoundingSphere (const osg::Matrixf& matrix, osg::BoundingSphere& bsphere)
 {
@@ -313,9 +338,37 @@ bool attachAlphaToCoverageFriendlyFramebufferToCamera(osg::Camera* camera, osg::
     return addMSAAIntermediateTarget;
 }
 
-osg::ref_ptr<osg::Depth> createDepth(bool reverseZ)
+void attachAlphaToCoverageFriendlyDepthColor(osg::Camera* camera, osg::Texture2D* colorTex, osg::Texture2D* depthTex, GLenum depthFormat)
+{
+    bool addMSAAIntermediateTarget = Settings::Manager::getBool("antialias alpha test", "Shaders") && Settings::Manager::getInt("antialiasing", "Video") > 1;
+
+    if (isFloatingPointDepthFormat(depthFormat) && addMSAAIntermediateTarget)
+    {
+        camera->attach(osg::Camera::COLOR_BUFFER0, colorTex);
+        camera->attach(osg::Camera::DEPTH_BUFFER, depthTex);
+        camera->addCullCallback(new AttachMultisampledDepthColorCallback(colorTex, depthTex, 2, 1));
+    }
+    else
+    {
+        attachAlphaToCoverageFriendlyFramebufferToCamera(camera, osg::Camera::COLOR_BUFFER, colorTex);
+        camera->attach(osg::Camera::DEPTH_BUFFER, depthTex);
+    }
+}
+
+bool getReverseZ()
+{
+    static bool reverseZ = isReverseZSupported();
+    return reverseZ;
+}
+
+void setCameraClearDepth(osg::Camera* camera)
+{
+    camera->setClearDepth(getReverseZ() ? 0.0 : 1.0);
+}
+
+osg::ref_ptr<osg::Depth> createDepth()
 {
-    return new osg::Depth(reverseZ ? osg::Depth::GEQUAL : osg::Depth::LEQUAL);
+    return new osg::Depth(getReverseZ() ? osg::Depth::GEQUAL : osg::Depth::LEQUAL);
 }
 
 osg::Matrix getReversedZProjectionMatrixAsPerspectiveInf(double fov, double aspect, double near)
@@ -352,7 +405,14 @@ osg::Matrix getReversedZProjectionMatrixAsOrtho(double left, double right, doubl
 
 bool isFloatingPointDepthFormat(GLenum format)
 {
-    return format == GL_DEPTH_COMPONENT32F || format == GL_DEPTH_COMPONENT32F_NV;
+    constexpr std::array<GLenum, 4> formats = {
+        GL_DEPTH_COMPONENT32F,
+        GL_DEPTH_COMPONENT32F_NV,
+        GL_DEPTH32F_STENCIL8,
+        GL_DEPTH32F_STENCIL8_NV,
+    };
+
+    return std::find(formats.cbegin(), formats.cend(), format) != formats.cend();
 }
 
 }
diff --git a/components/sceneutil/util.hpp b/components/sceneutil/util.hpp
index bd4df5441a..0bca32c325 100644
--- a/components/sceneutil/util.hpp
+++ b/components/sceneutil/util.hpp
@@ -8,7 +8,6 @@
 #include <osg/Texture2D>
 #include <osg/Vec4f>
 #include <osg/Depth>
-#include <osg/FrameBufferObject>
 
 #include <components/resource/resourcesystem.hpp>
 
@@ -49,22 +48,6 @@ namespace SceneUtil
         bool mDone;
     };
 
-    // Allows camera to render to a color and floating point depth texture with a multisampled framebuffer.
-    // Must be set on a camera's cull callback.
-    // When the depth texture isn't needed as a sampler, use osg::Camera::attach(osg::Camera::DEPTH_COMPONENT, GL_DEPTH_COMPONENT32F) instead.
-    // If multisampling is not being used on the color buffer attachment, use the osg::Camera::attach() method.
-    class AttachMultisampledDepthColorCallback : public osg::NodeCallback
-    {
-    public:
-        AttachMultisampledDepthColorCallback(const osg::ref_ptr<osg::Texture2D>& colorTex, const osg::ref_ptr<osg::Texture2D>& depthTex, int samples, int colorSamples);
-
-        void operator()(osg::Node* node, osg::NodeVisitor* nv) override;
-
-    private:
-        osg::ref_ptr<osg::FrameBufferObject> mFbo;
-        osg::ref_ptr<osg::FrameBufferObject> mMsaaFbo;
-    };
-
     // Transform a bounding sphere by a matrix
     // based off private code in osg::Transform
     // TODO: patch osg to make public
@@ -83,9 +66,15 @@ namespace SceneUtil
     // Alpha-to-coverage requires a multisampled framebuffer, so we need to set that up for RTTs
     bool attachAlphaToCoverageFriendlyFramebufferToCamera(osg::Camera* camera, osg::Camera::BufferComponent buffer, osg::Texture* texture, unsigned int level = 0, unsigned int face = 0, bool mipMapGeneration = false);
 
+    void attachAlphaToCoverageFriendlyDepthColor(osg::Camera* camera, osg::Texture2D* colorTex, osg::Texture2D* depthTex, GLenum depthFormat);
+
+    bool getReverseZ();
+
+    void setCameraClearDepth(osg::Camera* camera);
+
     // Returns a suitable depth state attribute dependent on whether a reverse-z
     // depth buffer is in use.
-    osg::ref_ptr<osg::Depth> createDepth(bool reverseZ);
+    osg::ref_ptr<osg::Depth> createDepth();
 
     // Returns a perspective projection matrix for use with a reversed z-buffer
     // and an infinite far plane. This is derived by mapping the default z-range
@@ -100,7 +89,7 @@ namespace SceneUtil
     osg::Matrix getReversedZProjectionMatrixAsOrtho(double left, double right, double bottom, double top, double near, double far);
 
     // Returns true if the GL format is a floating point depth format
-    bool isFloatingPointDepthFormat(GLenum format); 
+    bool isFloatingPointDepthFormat(GLenum format);
 }
 
 #endif
diff --git a/components/sceneutil/waterutil.cpp b/components/sceneutil/waterutil.cpp
index dccc534ecc..ac171005ae 100644
--- a/components/sceneutil/waterutil.cpp
+++ b/components/sceneutil/waterutil.cpp
@@ -64,7 +64,7 @@ namespace SceneUtil
         return waterGeom;
     }
 
-    osg::ref_ptr<osg::StateSet> createSimpleWaterStateSet(float alpha, int renderBin, bool reverseZ)
+    osg::ref_ptr<osg::StateSet> createSimpleWaterStateSet(float alpha, int renderBin)
     {
         osg::ref_ptr<osg::StateSet> stateset (new osg::StateSet);
 
@@ -78,7 +78,7 @@ namespace SceneUtil
         stateset->setMode(GL_BLEND, osg::StateAttribute::ON);
         stateset->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
 
-        auto depth = createDepth(reverseZ);
+        auto depth = createDepth();
         depth->setWriteMask(false);
         stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
 
diff --git a/components/sceneutil/waterutil.hpp b/components/sceneutil/waterutil.hpp
index 7f08dbcfa9..7b8c380109 100644
--- a/components/sceneutil/waterutil.hpp
+++ b/components/sceneutil/waterutil.hpp
@@ -13,7 +13,7 @@ namespace SceneUtil
 {
     osg::ref_ptr<osg::Geometry> createWaterGeometry(float size, int segments, float textureRepeats);
 
-    osg::ref_ptr<osg::StateSet> createSimpleWaterStateSet(float alpha, int renderBin, bool reverseZ);
+    osg::ref_ptr<osg::StateSet> createSimpleWaterStateSet(float alpha, int renderBin);
 }
 
 #endif
diff --git a/components/terrain/chunkmanager.cpp b/components/terrain/chunkmanager.cpp
index 5354b9d8a2..a744471de5 100644
--- a/components/terrain/chunkmanager.cpp
+++ b/components/terrain/chunkmanager.cpp
@@ -163,7 +163,7 @@ std::vector<osg::ref_ptr<osg::StateSet> > ChunkManager::createPasses(float chunk
 
     float blendmapScale = mStorage->getBlendmapScale(chunkSize);
 
-    return ::Terrain::createPasses(useShaders, mSceneManager, layers, blendmapTextures, blendmapScale, blendmapScale);
+    return ::Terrain::createPasses(useShaders, &mSceneManager->getShaderManager(), layers, blendmapTextures, blendmapScale, blendmapScale);
 }
 
 osg::ref_ptr<osg::Node> ChunkManager::createChunk(float chunkSize, const osg::Vec2f &chunkCenter, unsigned char lod, unsigned int lodFlags, bool compile)
@@ -219,7 +219,7 @@ osg::ref_ptr<osg::Node> ChunkManager::createChunk(float chunkSize, const osg::Ve
         layer.mDiffuseMap = compositeMap->mTexture;
         layer.mParallax = false;
         layer.mSpecular = false;
-        geometry->setPasses(::Terrain::createPasses(mSceneManager->getForceShaders() || !mSceneManager->getClampLighting(), mSceneManager, std::vector<TextureLayer>(1, layer), std::vector<osg::ref_ptr<osg::Texture2D> >(), 1.f, 1.f));
+        geometry->setPasses(::Terrain::createPasses(mSceneManager->getForceShaders() || !mSceneManager->getClampLighting(), &mSceneManager->getShaderManager(), std::vector<TextureLayer>(1, layer), std::vector<osg::ref_ptr<osg::Texture2D> >(), 1.f, 1.f));
     }
     else
     {
diff --git a/components/terrain/material.cpp b/components/terrain/material.cpp
index dc74b58560..2fbd0a7fc0 100644
--- a/components/terrain/material.cpp
+++ b/components/terrain/material.cpp
@@ -7,7 +7,6 @@
 #include <osg/TexMat>
 #include <osg/BlendFunc>
 
-#include <components/resource/scenemanager.hpp>
 #include <components/shader/shadermanager.hpp>
 #include <components/sceneutil/util.hpp>
 
@@ -97,17 +96,17 @@ namespace
     class LequalDepth
     {
     public:
-        static const osg::ref_ptr<osg::Depth>& value(bool reverseZ)
+        static const osg::ref_ptr<osg::Depth>& value()
         {
-            static LequalDepth instance(reverseZ);
+            static LequalDepth instance;
             return instance.mValue;
         }
 
     private:
         osg::ref_ptr<osg::Depth> mValue;
 
-        LequalDepth(bool reverseZ)
-            : mValue(SceneUtil::createDepth(reverseZ))
+        LequalDepth()
+            : mValue(SceneUtil::createDepth())
         {
         }
     };
@@ -171,10 +170,9 @@ namespace
 
 namespace Terrain
 {
-    std::vector<osg::ref_ptr<osg::StateSet> > createPasses(bool useShaders, Resource::SceneManager* sceneManager, const std::vector<TextureLayer> &layers,
+    std::vector<osg::ref_ptr<osg::StateSet> > createPasses(bool useShaders, Shader::ShaderManager* shaderManager, const std::vector<TextureLayer> &layers,
                                                            const std::vector<osg::ref_ptr<osg::Texture2D> > &blendmaps, int blendmapScale, float layerTileSize)
     {
-        Shader::ShaderManager* shaderManager = &sceneManager->getShaderManager();
         std::vector<osg::ref_ptr<osg::StateSet> > passes;
 
         unsigned int blendmapIndex = 0;
@@ -197,7 +195,7 @@ namespace Terrain
                 else
                 {
                     stateset->setAttributeAndModes(BlendFuncFirst::value(), osg::StateAttribute::ON);
-                    stateset->setAttributeAndModes(LequalDepth::value(sceneManager->getReverseZ()), osg::StateAttribute::ON);
+                    stateset->setAttributeAndModes(LequalDepth::value(), osg::StateAttribute::ON);
                 }
             }
 
@@ -240,7 +238,7 @@ namespace Terrain
                 if (!vertexShader || !fragmentShader)
                 {
                     // Try again without shader. Error already logged by above
-                    return createPasses(false, sceneManager, layers, blendmaps, blendmapScale, layerTileSize);
+                    return createPasses(false, shaderManager, layers, blendmaps, blendmapScale, layerTileSize);
                 }
 
                 stateset->setAttributeAndModes(shaderManager->getProgram(vertexShader, fragmentShader));
diff --git a/components/terrain/material.hpp b/components/terrain/material.hpp
index d5ef40a29e..5f78af6a06 100644
--- a/components/terrain/material.hpp
+++ b/components/terrain/material.hpp
@@ -10,9 +10,9 @@ namespace osg
     class Texture2D;
 }
 
-namespace Resource
+namespace Shader
 {
-    class SceneManager;
+    class ShaderManager;
 }
 
 namespace Terrain
@@ -26,7 +26,7 @@ namespace Terrain
         bool mSpecular;
     };
 
-    std::vector<osg::ref_ptr<osg::StateSet> > createPasses(bool useShaders, Resource::SceneManager* sceneManager,
+    std::vector<osg::ref_ptr<osg::StateSet> > createPasses(bool useShaders, Shader::ShaderManager* shaderManager,
                                                            const std::vector<TextureLayer>& layers,
                                                            const std::vector<osg::ref_ptr<osg::Texture2D> >& blendmaps, int blendmapScale, float layerTileSize);
 
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 4943ce969b..2c287a889c 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -67,7 +67,7 @@ head bobbing height = 3.0
 # Maximum camera roll angle (degrees)
 head bobbing roll = 0.2
 
-# Reverse the depth range from [0,1] to [1,0].
+# Reverse the depth range, reduces z-fighting of distant objects and terrain
 reverse z = true
 
 [Cells]
diff --git a/files/shaders/debug_fragment.glsl b/files/shaders/debug_fragment.glsl
index 263d4e1f24..1b25510d66 100644
--- a/files/shaders/debug_fragment.glsl
+++ b/files/shaders/debug_fragment.glsl
@@ -1,8 +1,8 @@
 #version 120
 
-varying vec4 passColor;
+#include "vertexcolors.glsl"
 
 void main()
 {
-    gl_FragData[0] = passColor;
+    gl_FragData[0] = getDiffuseColor();
 }
diff --git a/files/shaders/water_fragment.glsl b/files/shaders/water_fragment.glsl
index ed0ebdc913..26f83e052c 100644
--- a/files/shaders/water_fragment.glsl
+++ b/files/shaders/water_fragment.glsl
@@ -51,6 +51,8 @@ const float WIND_SPEED = 0.2f;
 
 const vec3 WATER_COLOR = vec3(0.090195, 0.115685, 0.12745);
 
+const float WOBBLY_SHORE_FADE_DISTANCE = 6200.0;   // fade out wobbly shores to mask precision errors, the effect is almost impossible to see at a distance
+
 // ---------------- rain ripples related stuff ---------------------
 
 const float RAIN_RIPPLE_GAPS = 5.0;
@@ -270,10 +272,10 @@ void main(void)
     vec3 normalShoreRippleRain = texture2D(normalMap,normalCoords(UV, 2.0, 2.7, -1.0*waterTimer,  0.05,  0.1,  normal3)).rgb - 0.5
                                + texture2D(normalMap,normalCoords(UV, 2.0, 2.7,      waterTimer,  0.04, -0.13, normal4)).rgb - 0.5;
     float verticalWaterDepth = realWaterDepth * mix(abs(vVec.z), 1.0, 0.2); // an estimate
-    float shoreOffset = verticalWaterDepth - (normal2.r + mix(0, normalShoreRippleRain.r, rainIntensity) + 0.15)*8;
-    float fuzzFactor = min(1.0, 1000.0/surfaceDepth) * mix(abs(vVec.z), 1, 0.2);
+    float shoreOffset = verticalWaterDepth - (normal2.r + mix(0.0, normalShoreRippleRain.r, rainIntensity) + 0.15)*8.0;
+    float fuzzFactor = min(1.0, 1000.0/surfaceDepth) * mix(abs(vVec.z), 1.0, 0.2);
     shoreOffset *= fuzzFactor;
-    shoreOffset = clamp(shoreOffset, 0, 1);
+    shoreOffset = clamp(mix(shoreOffset, 1.0, clamp(linearDepth / WOBBLY_SHORE_FADE_DISTANCE, 0.0, 1.0)), 0.0, 1.0);
     gl_FragData[0].xyz = mix(rawRefraction, gl_FragData[0].xyz, shoreOffset);
 #else
     gl_FragData[0].xyz = mix(reflection,  waterColor,  (1.0-fresnel)*0.5) + specular * sunSpec.xyz + vec3(rainRipple.w) * 0.7;

From cdf5b315c3d8078beec13b77f4a8d5bf47b7d9c2 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Thu, 5 Aug 2021 16:52:40 -0700
Subject: [PATCH 1145/2859] fix mac runner undefined macro

---
 components/sceneutil/util.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/components/sceneutil/util.cpp b/components/sceneutil/util.cpp
index 02cd9295e7..14bfd35cb4 100644
--- a/components/sceneutil/util.cpp
+++ b/components/sceneutil/util.cpp
@@ -17,6 +17,10 @@
 #include <components/settings/settings.hpp>
 #include <components/debug/debuglog.hpp>
 
+#ifndef GL_DEPTH32F_STENCIL8_NV
+#define GL_DEPTH32F_STENCIL8_NV 0x8DAC
+#endif
+
 namespace
 {
 

From 76760cd993557330b9df7cf640b05b12c635fc5e Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Fri, 6 Aug 2021 14:50:09 +0200
Subject: [PATCH 1146/2859] Don't try to build openmw-cs in coverity

We need more than 3h to build everything with coverity.
---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 90698edfa8..a727fce684 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,7 +43,7 @@ Coverity:
   script:
     - CI/before_script.linux.sh
     # Remove the specific targets and build everything once we can do it under 3h
-    - cov-analysis-linux64-*/bin/cov-build --dir cov-int cmake --build build -- -j $(nproc) openmw esmtool bsatool niftest openmw-cs openmw-wizard openmw-launcher openmw-iniimporter openmw-essimporter
+    - cov-analysis-linux64-*/bin/cov-build --dir cov-int cmake --build build -- -j $(nproc) openmw esmtool bsatool niftest openmw-wizard openmw-launcher openmw-iniimporter openmw-essimporter
   after_script:
     - tar cfz cov-int.tar.gz cov-int
     - curl https://scan.coverity.com/builds?project=$COVERITY_SCAN_PROJECT_NAME

From 29921bf9faaf7084014130d64acc37e6fb662463 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 7 Aug 2021 10:06:56 +0200
Subject: [PATCH 1147/2859] Don't stack cast packages

---
 CHANGELOG.md                            |  1 +
 apps/openmw/mwmechanics/aisequence.cpp  |  5 +++--
 apps/openmw/mwscript/miscextensions.cpp | 15 +++++++++++----
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00b490405a..8d8405fb41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@
     Bug #6165: Paralyzed player character can pickup items when the inventory is open
     Bug #6174: Spellmaking and Enchanting sliders differences from vanilla
     Bug #6184: Command and Calm and Demoralize and Frenzy and Rally magic effects inconsistencies with vanilla
+    Bug #6197: Infinite Casting Loop
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
     Feature #2780: A way to see current OpenMW version in the console
     Feature #3616: Allow Zoom levels on the World Map
diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index fada7761df..bf4cf28deb 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -361,11 +361,12 @@ void AiSequence::stack (const AiPackage& package, const MWWorld::Ptr& actor, boo
     // insert new package in correct place depending on priority
     for (auto it = mPackages.begin(); it != mPackages.end(); ++it)
     {
-        // We should keep current AiCast package, if we try to add a new one.
+        // We should override current AiCast package, if we try to add a new one.
         if ((*it)->getTypeId() == MWMechanics::AiPackageTypeId::Cast &&
             package.getTypeId() == MWMechanics::AiPackageTypeId::Cast)
         {
-            continue;
+            *it = package.clone();
+            return;
         }
 
         if((*it)->getPriority() <= package.getPriority())
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index 0b36d8bb48..b34a359dc4 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -25,6 +25,7 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/scriptmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/world.hpp"
@@ -1233,8 +1234,11 @@ namespace MWScript
 
                 if (ptr.getClass().isActor())
                 {
-                    MWMechanics::AiCast castPackage(targetId, spellId, true);
-                    ptr.getClass().getCreatureStats (ptr).getAiSequence().stack(castPackage, ptr);
+                    if (!MWBase::Environment::get().getMechanicsManager()->isCastingSpell(ptr))
+                    {
+                        MWMechanics::AiCast castPackage(targetId, spellId, true);
+                        ptr.getClass().getCreatureStats (ptr).getAiSequence().stack(castPackage, ptr);
+                    }
                     return;
                 }
 
@@ -1276,8 +1280,11 @@ namespace MWScript
 
                 if (ptr.getClass().isActor())
                 {
-                    MWMechanics::AiCast castPackage(ptr.getCellRef().getRefId(), spellId, true);
-                    ptr.getClass().getCreatureStats (ptr).getAiSequence().stack(castPackage, ptr);
+                    if (!MWBase::Environment::get().getMechanicsManager()->isCastingSpell(ptr))
+                    {
+                        MWMechanics::AiCast castPackage(ptr.getCellRef().getRefId(), spellId, true);
+                        ptr.getClass().getCreatureStats (ptr).getAiSequence().stack(castPackage, ptr);
+                    }
                     return;
                 }
 

From c91ef34a70ecc4176b2bfa809c9feb03a8981260 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 4 Aug 2021 11:35:53 +0200
Subject: [PATCH 1148/2859] Avoid using a specific type for stored ref_ptr to
 extend lifetime

---
 components/detournavigator/recastmeshobject.cpp | 12 ++++++------
 components/detournavigator/recastmeshobject.hpp | 13 ++++++-------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/components/detournavigator/recastmeshobject.cpp b/components/detournavigator/recastmeshobject.cpp
index 862460b34b..8b4bc2fd6f 100644
--- a/components/detournavigator/recastmeshobject.cpp
+++ b/components/detournavigator/recastmeshobject.cpp
@@ -23,35 +23,35 @@ namespace DetourNavigator
             return result;
         }
 
-        std::vector<RecastMeshObject> makeChildrenObjects(const osg::ref_ptr<const Resource::BulletShapeInstance>& instance,
+        std::vector<RecastMeshObject> makeChildrenObjects(const osg::ref_ptr<const osg::Referenced>& holder,
                                                           const btCompoundShape& shape, const AreaType areaType)
         {
             std::vector<RecastMeshObject> result;
             for (int i = 0, num = shape.getNumChildShapes(); i < num; ++i)
             {
-                const CollisionShape collisionShape {instance, *shape.getChildShape(i)};
+                const CollisionShape collisionShape {holder, *shape.getChildShape(i)};
                 result.emplace_back(collisionShape, shape.getChildTransform(i), areaType);
             }
             return result;
         }
 
-        std::vector<RecastMeshObject> makeChildrenObjects(const osg::ref_ptr<const Resource::BulletShapeInstance>& instance,
+        std::vector<RecastMeshObject> makeChildrenObjects(const osg::ref_ptr<const osg::Referenced>& holder,
                                                           const btCollisionShape& shape, const AreaType areaType)
         {
             if (shape.isCompound())
-                return makeChildrenObjects(std::move(instance), static_cast<const btCompoundShape&>(shape), areaType);
+                return makeChildrenObjects(holder, static_cast<const btCompoundShape&>(shape), areaType);
             return std::vector<RecastMeshObject>();
         }
     }
 
     RecastMeshObject::RecastMeshObject(const CollisionShape& shape, const btTransform& transform,
             const AreaType areaType)
-        : mShapeInstance(shape.getShapeInstance())
+        : mHolder(shape.getHolder())
         , mShape(shape.getShape())
         , mTransform(transform)
         , mAreaType(areaType)
         , mLocalScaling(mShape.get().getLocalScaling())
-        , mChildren(makeChildrenObjects(mShapeInstance, mShape.get(), mAreaType))
+        , mChildren(makeChildrenObjects(mHolder, mShape.get(), mAreaType))
     {
     }
 
diff --git a/components/detournavigator/recastmeshobject.hpp b/components/detournavigator/recastmeshobject.hpp
index 81199c5bad..445dfe50f5 100644
--- a/components/detournavigator/recastmeshobject.hpp
+++ b/components/detournavigator/recastmeshobject.hpp
@@ -3,11 +3,10 @@
 
 #include "areatype.hpp"
 
-#include <components/resource/bulletshape.hpp>
-
 #include <LinearMath/btTransform.h>
 
 #include <osg/ref_ptr>
+#include <osg/Referenced>
 
 #include <functional>
 #include <vector>
@@ -20,16 +19,16 @@ namespace DetourNavigator
     class CollisionShape
     {
     public:
-        CollisionShape(osg::ref_ptr<const Resource::BulletShapeInstance> instance, const btCollisionShape& shape)
-            : mShapeInstance(std::move(instance))
+        CollisionShape(osg::ref_ptr<const osg::Referenced> holder, const btCollisionShape& shape)
+            : mHolder(std::move(holder))
             , mShape(shape)
         {}
 
-        const osg::ref_ptr<const Resource::BulletShapeInstance>& getShapeInstance() const { return mShapeInstance; }
+        const osg::ref_ptr<const osg::Referenced>& getHolder() const { return mHolder; }
         const btCollisionShape& getShape() const { return mShape; }
 
     private:
-        osg::ref_ptr<const Resource::BulletShapeInstance> mShapeInstance;
+        osg::ref_ptr<const osg::Referenced> mHolder;
         std::reference_wrapper<const btCollisionShape> mShape;
     };
 
@@ -56,7 +55,7 @@ namespace DetourNavigator
             }
 
         private:
-            osg::ref_ptr<const Resource::BulletShapeInstance> mShapeInstance;
+            osg::ref_ptr<const osg::Referenced> mHolder;
             std::reference_wrapper<const btCollisionShape> mShape;
             btTransform mTransform;
             AreaType mAreaType;

From 41b02ff1aa9a4f07d0ef61d79a9c9521d4709df8 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 4 Aug 2021 18:35:25 +0200
Subject: [PATCH 1149/2859] Copy only required RecastMeshObject fields

---
 .../detournavigator/recastmeshmanager.cpp       | 17 +++++++++++++----
 components/detournavigator/recastmeshobject.hpp |  5 +++++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/components/detournavigator/recastmeshmanager.cpp b/components/detournavigator/recastmeshmanager.cpp
index 5bbbbe4dea..e4e5b76449 100644
--- a/components/detournavigator/recastmeshmanager.cpp
+++ b/components/detournavigator/recastmeshmanager.cpp
@@ -123,7 +123,13 @@ namespace DetourNavigator
         tileBounds.mMin /= mSettings.mRecastScaleFactor;
         tileBounds.mMax /= mSettings.mRecastScaleFactor;
         RecastMeshBuilder builder(tileBounds);
-        std::vector<RecastMeshObject> objects;
+        using Object = std::tuple<
+            osg::ref_ptr<const osg::Referenced>,
+            std::reference_wrapper<const btCollisionShape>,
+            btTransform,
+            AreaType
+        >;
+        std::vector<Object> objects;
         std::size_t revision;
         {
             const std::lock_guard lock(mMutex);
@@ -133,11 +139,14 @@ namespace DetourNavigator
                 std::visit(AddHeightfield {v.mCell, builder}, v.mShape);
             objects.reserve(mObjects.size());
             for (const auto& [k, object] : mObjects)
-                objects.push_back(object.getImpl());
+            {
+                const RecastMeshObject& impl = object.getImpl();
+                objects.emplace_back(impl.getHolder(), impl.getShape(), impl.getTransform(), impl.getAreaType());
+            }
             revision = mRevision;
         }
-        for (const auto& v : objects)
-            builder.addObject(v.getShape(), v.getTransform(), v.getAreaType());
+        for (const auto& [holder, shape, transform, areaType] : objects)
+            builder.addObject(shape, transform, areaType);
         return std::move(builder).create(mGeneration, revision);
     }
 
diff --git a/components/detournavigator/recastmeshobject.hpp b/components/detournavigator/recastmeshobject.hpp
index 445dfe50f5..0c50c2f346 100644
--- a/components/detournavigator/recastmeshobject.hpp
+++ b/components/detournavigator/recastmeshobject.hpp
@@ -39,6 +39,11 @@ namespace DetourNavigator
 
             bool update(const btTransform& transform, const AreaType areaType);
 
+            const osg::ref_ptr<const osg::Referenced>& getHolder() const
+            {
+                return mHolder;
+            }
+
             const btCollisionShape& getShape() const
             {
                 return mShape;

From 9472728fa49a8e7820d3e7543205d1dc2dcfebb0 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Tue, 20 Jul 2021 05:38:06 +0200
Subject: [PATCH 1150/2859] Do not generate data for immobile actors instead of
 early out from the solver

---
 apps/openmw/mwphysics/movementsolver.cpp | 11 -----------
 apps/openmw/mwphysics/physicssystem.cpp  |  2 ++
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/apps/openmw/mwphysics/movementsolver.cpp b/apps/openmw/mwphysics/movementsolver.cpp
index fd0e090fcb..66530e37ca 100644
--- a/apps/openmw/mwphysics/movementsolver.cpp
+++ b/apps/openmw/mwphysics/movementsolver.cpp
@@ -120,13 +120,6 @@ namespace MWPhysics
     {
         auto* physicActor = actor.mActorRaw;
         const ESM::Position& refpos = actor.mRefpos;
-        // Early-out for totally static creatures
-        // (Not sure if gravity should still apply?)
-        {
-            const auto ptr = physicActor->getPtr();
-            if (!ptr.getClass().isMobile(ptr))
-                return;
-        }
 
         // Reset per-frame data
         physicActor->setWalkingOnWater(false);
@@ -432,10 +425,6 @@ namespace MWPhysics
 
     void MovementSolver::unstuck(ActorFrameData& actor, const btCollisionWorld* collisionWorld)
     {
-        const auto& ptr = actor.mActorRaw->getPtr();
-        if (!ptr.getClass().isMobile(ptr))
-            return;
-
         auto* physicActor = actor.mActorRaw;
         if(!physicActor->getCollisionMode() || actor.mSkipCollisionDetection) // noclipping/tcl
             return;
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 85fb463a95..1028c0062e 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -757,6 +757,8 @@ namespace MWPhysics
         const MWBase::World *world = MWBase::Environment::get().getWorld();
         for (const auto& [ptr, physicActor] : mActors)
         {
+            if (!ptr.getClass().isMobile(physicActor->getPtr()))
+                continue;
             float waterlevel = -std::numeric_limits<float>::max();
             const MWWorld::CellStore *cell = ptr.getCell();
             if(cell->getCell()->hasWater())

From 1bfaf353bec713636ab927cc5b4c21cd60ada0d2 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Wed, 21 Jul 2021 19:04:36 +0200
Subject: [PATCH 1151/2859] Explicitely store all the potential states an Actor
 can have into the ActActorFrameData structure. It makes it easier to reason
 about the simulation (and hopefully simplify it). Remove atomics from Actor
 class as a side effect.

Rename mFloatToSurface to mInert to make is explicit what it represent, not what it is used for
Store the Actor rotation (1 Vec2) instead of the whole ESM::Position (2 Vec3)
---
 apps/openmw/mwphysics/actor.cpp          | 10 +++----
 apps/openmw/mwphysics/actor.hpp          | 15 +++++-----
 apps/openmw/mwphysics/movementsolver.cpp | 37 ++++++++++++------------
 apps/openmw/mwphysics/mtphysics.cpp      | 12 +++++++-
 apps/openmw/mwphysics/physicssystem.cpp  | 27 +++++++++++++----
 apps/openmw/mwphysics/physicssystem.hpp  |  7 +++--
 6 files changed, 67 insertions(+), 41 deletions(-)

diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index 67bfb4dffe..5416223264 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -82,7 +82,7 @@ Actor::~Actor()
 
 void Actor::enableCollisionMode(bool collision)
 {
-    mInternalCollisionMode.store(collision, std::memory_order_release);
+    mInternalCollisionMode = collision;
 }
 
 void Actor::enableCollisionBody(bool collision)
@@ -250,22 +250,22 @@ void Actor::setInertialForce(const osg::Vec3f &force)
 
 void Actor::setOnGround(bool grounded)
 {
-    mOnGround.store(grounded, std::memory_order_release);
+    mOnGround = grounded;
 }
 
 void Actor::setOnSlope(bool slope)
 {
-    mOnSlope.store(slope, std::memory_order_release);
+    mOnSlope = slope;
 }
 
 bool Actor::isWalkingOnWater() const
 {
-    return mWalkingOnWater.load(std::memory_order_acquire);
+    return mWalkingOnWater;
 }
 
 void Actor::setWalkingOnWater(bool walkingOnWater)
 {
-    mWalkingOnWater.store(walkingOnWater, std::memory_order_release);
+    mWalkingOnWater = walkingOnWater;
 }
 
 void Actor::setCanWaterWalk(bool waterWalk)
diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index 703d8a191b..eb81064937 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -1,7 +1,6 @@
 #ifndef OPENMW_MWPHYSICS_ACTOR_H
 #define OPENMW_MWPHYSICS_ACTOR_H
 
-#include <atomic>
 #include <memory>
 #include <mutex>
 
@@ -37,7 +36,7 @@ namespace MWPhysics
 
         bool getCollisionMode() const
         {
-            return mInternalCollisionMode.load(std::memory_order_acquire);
+            return mInternalCollisionMode;
         }
 
         btConvexShape* getConvexShape() const { return mConvexShape; }
@@ -123,14 +122,14 @@ namespace MWPhysics
 
         bool getOnGround() const
         {
-            return mInternalCollisionMode.load(std::memory_order_acquire) && mOnGround.load(std::memory_order_acquire);
+            return mInternalCollisionMode && mOnGround;
         }
 
         void setOnSlope(bool slope);
 
         bool getOnSlope() const
         {
-            return mInternalCollisionMode.load(std::memory_order_acquire) && mOnSlope.load(std::memory_order_acquire);
+            return mInternalCollisionMode && mOnSlope;
         }
 
         btCollisionObject* getCollisionObject() const
@@ -182,7 +181,7 @@ namespace MWPhysics
         osg::Vec3f getScaledMeshTranslation() const;
 
         bool mCanWaterWalk;
-        std::atomic<bool> mWalkingOnWater;
+        bool mWalkingOnWater;
 
         bool mRotationallyInvariant;
 
@@ -211,9 +210,9 @@ namespace MWPhysics
         osg::Vec3f mLastStuckPosition;
 
         osg::Vec3f mForce;
-        std::atomic<bool> mOnGround;
-        std::atomic<bool> mOnSlope;
-        std::atomic<bool> mInternalCollisionMode;
+        bool mOnGround;
+        bool mOnSlope;
+        bool mInternalCollisionMode;
         bool mExternalCollisionMode;
 
         PhysicsTaskScheduler* mTaskScheduler;
diff --git a/apps/openmw/mwphysics/movementsolver.cpp b/apps/openmw/mwphysics/movementsolver.cpp
index 66530e37ca..76f7a8d5a2 100644
--- a/apps/openmw/mwphysics/movementsolver.cpp
+++ b/apps/openmw/mwphysics/movementsolver.cpp
@@ -119,15 +119,14 @@ namespace MWPhysics
                                            WorldFrameData& worldData)
     {
         auto* physicActor = actor.mActorRaw;
-        const ESM::Position& refpos = actor.mRefpos;
 
         // Reset per-frame data
-        physicActor->setWalkingOnWater(false);
+        actor.mWalkingOnWater = false;
         // Anything to collide with?
-        if(!physicActor->getCollisionMode() || actor.mSkipCollisionDetection)
+        if(actor.mSkipCollisionDetection)
         {
-            actor.mPosition += (osg::Quat(refpos.rot[0], osg::Vec3f(-1, 0, 0)) *
-                                osg::Quat(refpos.rot[2], osg::Vec3f(0, 0, -1))
+            actor.mPosition += (osg::Quat(actor.mRotation.x(), osg::Vec3f(-1, 0, 0)) *
+                                osg::Quat(actor.mRotation.y(), osg::Vec3f(0, 0, -1))
                                 ) * actor.mMovement * time;
             return;
         }
@@ -151,22 +150,22 @@ namespace MWPhysics
 
         if (actor.mPosition.z() < swimlevel || actor.mFlying)
         {
-            velocity = (osg::Quat(refpos.rot[0], osg::Vec3f(-1, 0, 0)) * osg::Quat(refpos.rot[2], osg::Vec3f(0, 0, -1))) * actor.mMovement;
+            velocity = (osg::Quat(actor.mRotation.x(), osg::Vec3f(-1, 0, 0)) * osg::Quat(actor.mRotation.y(), osg::Vec3f(0, 0, -1))) * actor.mMovement;
         }
         else
         {
-            velocity = (osg::Quat(refpos.rot[2], osg::Vec3f(0, 0, -1))) * actor.mMovement;
+            velocity = (osg::Quat(actor.mRotation.y(), osg::Vec3f(0, 0, -1))) * actor.mMovement;
 
-            if ((velocity.z() > 0.f && physicActor->getOnGround() && !physicActor->getOnSlope())
-            || (velocity.z() > 0.f && velocity.z() + inertia.z() <= -velocity.z() && physicActor->getOnSlope()))
+            if ((velocity.z() > 0.f && actor.mIsOnGround && !actor.mIsOnSlope)
+            || (velocity.z() > 0.f && velocity.z() + inertia.z() <= -velocity.z() && actor.mIsOnSlope))
                 inertia = velocity;
-            else if (!physicActor->getOnGround() || physicActor->getOnSlope())
+            else if (!actor.mIsOnGround || actor.mIsOnSlope)
                 velocity = velocity + inertia;
         }
 
         // Dead and paralyzed actors underwater will float to the surface,
         // if the CharacterController tells us to do so
-        if (actor.mMovement.z() > 0 && actor.mFloatToSurface && actor.mPosition.z() < swimlevel)
+        if (actor.mMovement.z() > 0 && actor.mInert && actor.mPosition.z() < swimlevel)
             velocity = osg::Vec3f(0,0,1) * 25;
 
         if (actor.mWantJump)
@@ -190,7 +189,7 @@ namespace MWPhysics
          * The initial velocity was set earlier (see above).
         */
         float remainingTime = time;
-        bool seenGround = physicActor->getOnGround() && !physicActor->getOnSlope() && !actor.mFlying;
+        bool seenGround = actor.mIsOnGround && !actor.mIsOnSlope && !actor.mFlying;
 
         int numTimesSlid = 0;
         osg::Vec3f lastSlideNormal(0,0,1);
@@ -349,7 +348,7 @@ namespace MWPhysics
         if (forceGroundTest || (inertia.z() <= 0.f && newPosition.z() >= swimlevel))
         {
             osg::Vec3f from = newPosition;
-            auto dropDistance = 2*sGroundOffset + (physicActor->getOnGround() ? sStepSizeDown : 0);
+            auto dropDistance = 2*sGroundOffset + (actor.mIsOnGround ? sStepSizeDown : 0);
             osg::Vec3f to = newPosition - osg::Vec3f(0,0,dropDistance);
             tracer.doTrace(colobj, from, to, collisionWorld);
             if(tracer.mFraction < 1.0f)
@@ -365,7 +364,7 @@ namespace MWPhysics
                         actor.mStandingOn = ptrHolder->getPtr();
 
                     if (standingOn->getBroadphaseHandle()->m_collisionFilterGroup == CollisionType_Water)
-                        physicActor->setWalkingOnWater(true);
+                        actor.mWalkingOnWater = true;
                     if (!actor.mFlying && !isOnSlope)
                     {
                         if (tracer.mFraction*dropDistance > sGroundOffset)
@@ -408,8 +407,8 @@ namespace MWPhysics
             }
             physicActor->setInertialForce(inertia);
         }
-        physicActor->setOnGround(isOnGround);
-        physicActor->setOnSlope(isOnSlope);
+        actor.mIsOnGround = isOnGround;
+        actor.mIsOnSlope = isOnSlope;
 
         actor.mPosition = newPosition;
         // remove what was added earlier in compensating for doTrace not taking interior transformation into account
@@ -426,7 +425,7 @@ namespace MWPhysics
     void MovementSolver::unstuck(ActorFrameData& actor, const btCollisionWorld* collisionWorld)
     {
         auto* physicActor = actor.mActorRaw;
-        if(!physicActor->getCollisionMode() || actor.mSkipCollisionDetection) // noclipping/tcl
+        if(actor.mSkipCollisionDetection) // noclipping/tcl
             return;
 
         auto* collisionObject = physicActor->getCollisionObject();
@@ -448,9 +447,9 @@ namespace MWPhysics
         const auto verticalHalfExtent = osg::Vec3f(0.0, 0.0, physicActor->getHalfExtents().z());
 
         // use a 3d approximation of the movement vector to better judge player intent
-        auto velocity = (osg::Quat(actor.mRefpos.rot[0], osg::Vec3f(-1, 0, 0)) * osg::Quat(actor.mRefpos.rot[2], osg::Vec3f(0, 0, -1))) * actor.mMovement;
+        auto velocity = (osg::Quat(actor.mRotation.x(), osg::Vec3f(-1, 0, 0)) * osg::Quat(actor.mRotation.y(), osg::Vec3f(0, 0, -1))) * actor.mMovement;
         // try to pop outside of the world before doing anything else if we're inside of it
-        if (!physicActor->getOnGround() || physicActor->getOnSlope())
+        if (!actor.mIsOnGround || actor.mIsOnSlope)
                 velocity += physicActor->getInertialForce();
 
         // because of the internal collision box offset hack, and the fact that we're moving the collision box manually,
diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 81b1dc34d6..eaa1948cba 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -54,7 +54,7 @@ namespace
     {
         const float heightDiff = actorData.mPosition.z() - actorData.mOldHeight;
 
-        const bool isStillOnGround = (simulationPerformed && actorData.mWasOnGround && actorData.mActorRaw->getOnGround());
+        const bool isStillOnGround = (simulationPerformed && actorData.mWasOnGround && actorData.mIsOnGround);
 
         if (isStillOnGround || actorData.mFlying || actorData.mSwimming || actorData.mSlowFall < 1)
             actorData.mNeedLand = true;
@@ -256,7 +256,12 @@ namespace MWPhysics
 
                     // these variables are accessed directly from the main thread, update them here to prevent accessing "too new" values
                     if (mAdvanceSimulation)
+                    {
                         data.mActorRaw->setStandingOnPtr(data.mStandingOn);
+                        data.mActorRaw->setOnGround(data.mIsOnGround);
+                        data.mActorRaw->setOnSlope(data.mIsOnSlope);
+                        data.mActorRaw->setWalkingOnWater(data.mWalkingOnWater);
+                    }
                     data.mActorRaw->setSimulationPosition(interpolateMovements(data, mTimeAccum, mPhysicsDt));
                 }
             }
@@ -555,7 +560,12 @@ namespace MWPhysics
             actorData.mActorRaw->setSimulationPosition(interpolateMovements(actorData, mTimeAccum, mPhysicsDt));
             updateMechanics(actorData);
             if (mAdvanceSimulation)
+            {
                 actorData.mActorRaw->setStandingOnPtr(actorData.mStandingOn);
+                actorData.mActorRaw->setOnGround(actorData.mIsOnGround);
+                actorData.mActorRaw->setOnSlope(actorData.mIsOnSlope);
+                actorData.mActorRaw->setWalkingOnWater(actorData.mWalkingOnWater);
+            }
         }
         refreshLOSCache();
     }
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 1028c0062e..3130f90bd0 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -950,9 +950,24 @@ namespace MWPhysics
 
     ActorFrameData::ActorFrameData(const std::shared_ptr<Actor>& actor, const MWWorld::Ptr standingOn,
             bool waterCollision, float slowFall, float waterlevel)
-        : mActor(actor), mActorRaw(actor.get()), mStandingOn(standingOn),
-        mDidJump(false), mNeedLand(false), mWaterCollision(waterCollision), mSkipCollisionDetection(actor->skipCollisions()),
-        mWaterlevel(waterlevel), mSlowFall(slowFall), mOldHeight(0), mFallHeight(0), mMovement(actor->velocity()), mPosition(), mRefpos()
+        : mActor(actor)
+        , mActorRaw(actor.get())
+        , mStandingOn(standingOn)
+        , mWasOnGround(actor->getOnGround())
+        , mIsOnGround(actor->getOnGround())
+        , mIsOnSlope(actor->getOnSlope())
+        , mDidJump(false)
+        , mNeedLand(false)
+        , mWaterCollision(waterCollision)
+        , mWalkingOnWater(false)
+        , mSkipCollisionDetection(actor->skipCollisions() || !actor->getCollisionMode())
+        , mWaterlevel(waterlevel)
+        , mSlowFall(slowFall)
+        , mOldHeight(0)
+        , mFallHeight(0)
+        , mMovement(actor->velocity())
+        , mPosition()
+        , mRotation()
     {
         const MWBase::World *world = MWBase::Environment::get().getWorld();
         const auto ptr = actor->getPtr();
@@ -961,8 +976,7 @@ namespace MWPhysics
         mWantJump = ptr.getClass().getMovementSettings(ptr).mPosition[2] != 0;
         auto& stats = ptr.getClass().getCreatureStats(ptr);
         const bool godmode = ptr == world->getPlayerConstPtr() && world->getGodModeState();
-        mFloatToSurface = stats.isDead() || (!godmode && stats.getMagicEffects().get(ESM::MagicEffect::Paralyze).getModifier() > 0);
-        mWasOnGround = actor->getOnGround();
+        mInert = stats.isDead() || (!godmode && stats.getMagicEffects().get(ESM::MagicEffect::Paralyze).getModifier() > 0);
     }
 
     void ActorFrameData::updatePosition(btCollisionWorld* world)
@@ -975,7 +989,8 @@ namespace MWPhysics
             MWBase::Environment::get().getWorld()->moveObject(mActorRaw->getPtr(), mPosition, false);
         }
         mOldHeight = mPosition.z();
-        mRefpos = mActorRaw->getPtr().getRefData().getPosition();
+        const auto rotation = mActorRaw->getPtr().getRefData().getPosition().asRotationVec3();
+        mRotation = osg::Vec2f(rotation.x(), rotation.z());
     }
 
     WorldFrameData::WorldFrameData()
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index ee62ab6ace..59f4de10ea 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -86,11 +86,14 @@ namespace MWPhysics
         bool mFlying;
         bool mSwimming;
         bool mWasOnGround;
+        bool mIsOnGround;
+        bool mIsOnSlope;
         bool mWantJump;
         bool mDidJump;
-        bool mFloatToSurface;
+        bool mInert;
         bool mNeedLand;
         bool mWaterCollision;
+        bool mWalkingOnWater;
         bool mSkipCollisionDetection;
         float mWaterlevel;
         float mSlowFall;
@@ -98,7 +101,7 @@ namespace MWPhysics
         float mFallHeight;
         osg::Vec3f mMovement;
         osg::Vec3f mPosition;
-        ESM::Position mRefpos;
+        osg::Vec2f mRotation;
     };
 
     struct WorldFrameData

From 51514e44cc137ee362c0e4f2166848fec444a163 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Wed, 21 Jul 2021 19:40:22 +0200
Subject: [PATCH 1152/2859] Handle jump as part of the simulation preparation
 (inside of PhysicsSystem) instead of inside the simulaiton. For mechanics, we
 don't care how the jump is handled, just that it will be.

---
 apps/openmw/mwphysics/movementsolver.cpp |  3 --
 apps/openmw/mwphysics/mtphysics.cpp      | 28 -------------
 apps/openmw/mwphysics/physicssystem.cpp  | 50 ++++++++++++++++++++----
 apps/openmw/mwphysics/physicssystem.hpp  |  2 -
 4 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/apps/openmw/mwphysics/movementsolver.cpp b/apps/openmw/mwphysics/movementsolver.cpp
index 76f7a8d5a2..4eb1417cdd 100644
--- a/apps/openmw/mwphysics/movementsolver.cpp
+++ b/apps/openmw/mwphysics/movementsolver.cpp
@@ -168,9 +168,6 @@ namespace MWPhysics
         if (actor.mMovement.z() > 0 && actor.mInert && actor.mPosition.z() < swimlevel)
             velocity = osg::Vec3f(0,0,1) * 25;
 
-        if (actor.mWantJump)
-            actor.mDidJump = true;
-
         // Now that we have the effective movement vector, apply wind forces to it
         if (worldData.mIsInStorm)
         {
diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index eaa1948cba..68a69a5c6d 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -11,7 +11,6 @@
 #include "../mwmechanics/movement.hpp"
 #include "../mwrender/bulletdebugdraw.hpp"
 #include "../mwworld/class.hpp"
-#include "../mwworld/player.hpp"
 
 #include "actor.hpp"
 #include "contacttestwrapper.h"
@@ -62,36 +61,9 @@ namespace
             actorData.mFallHeight += heightDiff;
     }
 
-    void handleJump(const MWWorld::Ptr &ptr)
-    {
-        const bool isPlayer = (ptr == MWMechanics::getPlayer());
-        // Advance acrobatics and set flag for GetPCJumping
-        if (isPlayer)
-        {
-            ptr.getClass().skillUsageSucceeded(ptr, ESM::Skill::Acrobatics, 0);
-            MWBase::Environment::get().getWorld()->getPlayer().setJumping(true);
-        }
-
-        // Decrease fatigue
-        if (!isPlayer || !MWBase::Environment::get().getWorld()->getGodModeState())
-        {
-            const MWWorld::Store<ESM::GameSetting> &gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
-            const float fFatigueJumpBase = gmst.find("fFatigueJumpBase")->mValue.getFloat();
-            const float fFatigueJumpMult = gmst.find("fFatigueJumpMult")->mValue.getFloat();
-            const float normalizedEncumbrance = std::min(1.f, ptr.getClass().getNormalizedEncumbrance(ptr));
-            const float fatigueDecrease = fFatigueJumpBase + normalizedEncumbrance * fFatigueJumpMult;
-            MWMechanics::DynamicStat<float> fatigue = ptr.getClass().getCreatureStats(ptr).getFatigue();
-            fatigue.setCurrent(fatigue.getCurrent() - fatigueDecrease);
-            ptr.getClass().getCreatureStats(ptr).setFatigue(fatigue);
-        }
-        ptr.getClass().getMovementSettings(ptr).mPosition[2] = 0;
-    }
-
     void updateMechanics(MWPhysics::ActorFrameData& actorData)
     {
         auto ptr = actorData.mActorRaw->getPtr();
-        if (actorData.mDidJump)
-            handleJump(ptr);
 
         MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
         if (actorData.mNeedLand)
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 3130f90bd0..7757b3eb65 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -38,6 +38,7 @@
 
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/player.hpp"
 
 #include "../mwrender/bulletdebugdraw.hpp"
 
@@ -72,6 +73,36 @@ namespace
         tracer.doTrace(physicActor->getCollisionObject(), startingPosition, destinationPosition, world);
         return (tracer.mFraction >= 1.0f);
     }
+
+    void handleJump(const MWWorld::Ptr &ptr)
+    {
+        if (!ptr.getClass().isActor())
+            return;
+        if (ptr.getClass().getMovementSettings(ptr).mPosition[2] == 0)
+            return;
+        const bool isPlayer = (ptr == MWMechanics::getPlayer());
+        // Advance acrobatics and set flag for GetPCJumping
+        if (isPlayer)
+        {
+            ptr.getClass().skillUsageSucceeded(ptr, ESM::Skill::Acrobatics, 0);
+            MWBase::Environment::get().getWorld()->getPlayer().setJumping(true);
+        }
+
+        // Decrease fatigue
+        if (!isPlayer || !MWBase::Environment::get().getWorld()->getGodModeState())
+        {
+            const MWWorld::Store<ESM::GameSetting> &gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+            const float fFatigueJumpBase = gmst.find("fFatigueJumpBase")->mValue.getFloat();
+            const float fFatigueJumpMult = gmst.find("fFatigueJumpMult")->mValue.getFloat();
+            const float normalizedEncumbrance = std::min(1.f, ptr.getClass().getNormalizedEncumbrance(ptr));
+            const float fatigueDecrease = fFatigueJumpBase + normalizedEncumbrance * fFatigueJumpMult;
+            MWMechanics::DynamicStat<float> fatigue = ptr.getClass().getCreatureStats(ptr).getFatigue();
+            fatigue.setCurrent(fatigue.getCurrent() - fatigueDecrease);
+            ptr.getClass().getCreatureStats(ptr).setFatigue(fatigue);
+        }
+        ptr.getClass().getMovementSettings(ptr).mPosition[2] = 0;
+    }
+
 }
 
 namespace MWPhysics
@@ -755,21 +786,22 @@ namespace MWPhysics
         std::vector<ActorFrameData> actorsFrameData;
         actorsFrameData.reserve(mActors.size());
         const MWBase::World *world = MWBase::Environment::get().getWorld();
-        for (const auto& [ptr, physicActor] : mActors)
+        for (const auto& [actor, physicActor] : mActors)
         {
-            if (!ptr.getClass().isMobile(physicActor->getPtr()))
+            auto ptr = physicActor->getPtr();
+            if (!actor.getClass().isMobile(ptr))
                 continue;
             float waterlevel = -std::numeric_limits<float>::max();
-            const MWWorld::CellStore *cell = ptr.getCell();
+            const MWWorld::CellStore *cell = actor.getCell();
             if(cell->getCell()->hasWater())
                 waterlevel = cell->getWaterLevel();
 
-            const MWMechanics::MagicEffects& effects = ptr.getClass().getCreatureStats(physicActor->getPtr()).getMagicEffects();
+            const MWMechanics::MagicEffects& effects = actor.getClass().getCreatureStats(ptr).getMagicEffects();
 
             bool waterCollision = false;
             if (cell->getCell()->hasWater() && effects.get(ESM::MagicEffect::WaterWalking).getMagnitude())
             {
-                if (physicActor->getCollisionMode() || !world->isUnderwater(ptr.getCell(), osg::Vec3f(ptr.getRefData().getPosition().asVec3())))
+                if (physicActor->getCollisionMode() || !world->isUnderwater(actor.getCell(), actor.getRefData().getPosition().asVec3()))
                     waterCollision = true;
             }
 
@@ -784,6 +816,10 @@ namespace MWPhysics
                 standingOn = physicActor->getStandingOnPtr();
 
             actorsFrameData.emplace_back(physicActor, standingOn, waterCollision, slowFall, waterlevel);
+
+            // if the simulation will run, a jump request will be fulfilled. Update mechanics accordingly.
+            if (willSimulate)
+                handleJump(ptr);
         }
         return actorsFrameData;
     }
@@ -956,7 +992,6 @@ namespace MWPhysics
         , mWasOnGround(actor->getOnGround())
         , mIsOnGround(actor->getOnGround())
         , mIsOnSlope(actor->getOnSlope())
-        , mDidJump(false)
         , mNeedLand(false)
         , mWaterCollision(waterCollision)
         , mWalkingOnWater(false)
@@ -973,8 +1008,7 @@ namespace MWPhysics
         const auto ptr = actor->getPtr();
         mFlying = world->isFlying(ptr);
         mSwimming = world->isSwimming(ptr);
-        mWantJump = ptr.getClass().getMovementSettings(ptr).mPosition[2] != 0;
-        auto& stats = ptr.getClass().getCreatureStats(ptr);
+        const auto& stats = ptr.getClass().getCreatureStats(ptr);
         const bool godmode = ptr == world->getPlayerConstPtr() && world->getGodModeState();
         mInert = stats.isDead() || (!godmode && stats.getMagicEffects().get(ESM::MagicEffect::Paralyze).getModifier() > 0);
     }
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 59f4de10ea..e5e1aa0c06 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -88,8 +88,6 @@ namespace MWPhysics
         bool mWasOnGround;
         bool mIsOnGround;
         bool mIsOnSlope;
-        bool mWantJump;
-        bool mDidJump;
         bool mInert;
         bool mNeedLand;
         bool mWaterCollision;

From 6e51a9a512f360d9eed83b45d045145c6d17d53d Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Wed, 21 Jul 2021 23:19:17 +0200
Subject: [PATCH 1153/2859] Simplify a bit the solver

---
 apps/openmw/mwphysics/movementsolver.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwphysics/movementsolver.cpp b/apps/openmw/mwphysics/movementsolver.cpp
index 4eb1417cdd..fd72ea3220 100644
--- a/apps/openmw/mwphysics/movementsolver.cpp
+++ b/apps/openmw/mwphysics/movementsolver.cpp
@@ -148,7 +148,13 @@ namespace MWPhysics
         osg::Vec3f inertia = physicActor->getInertialForce();
         osg::Vec3f velocity;
 
-        if (actor.mPosition.z() < swimlevel || actor.mFlying)
+        // Dead and paralyzed actors underwater will float to the surface,
+        // if the CharacterController tells us to do so
+        if (actor.mMovement.z() > 0 && actor.mInert && actor.mPosition.z() < swimlevel)
+        {
+            velocity = osg::Vec3f(0,0,1) * 25;
+        }
+        else if (actor.mPosition.z() < swimlevel || actor.mFlying)
         {
             velocity = (osg::Quat(actor.mRotation.x(), osg::Vec3f(-1, 0, 0)) * osg::Quat(actor.mRotation.y(), osg::Vec3f(0, 0, -1))) * actor.mMovement;
         }
@@ -163,11 +169,6 @@ namespace MWPhysics
                 velocity = velocity + inertia;
         }
 
-        // Dead and paralyzed actors underwater will float to the surface,
-        // if the CharacterController tells us to do so
-        if (actor.mMovement.z() > 0 && actor.mInert && actor.mPosition.z() < swimlevel)
-            velocity = osg::Vec3f(0,0,1) * 25;
-
         // Now that we have the effective movement vector, apply wind forces to it
         if (worldData.mIsInStorm)
         {
@@ -186,7 +187,6 @@ namespace MWPhysics
          * The initial velocity was set earlier (see above).
         */
         float remainingTime = time;
-        bool seenGround = actor.mIsOnGround && !actor.mIsOnSlope && !actor.mFlying;
 
         int numTimesSlid = 0;
         osg::Vec3f lastSlideNormal(0,0,1);
@@ -196,9 +196,10 @@ namespace MWPhysics
         for (int iterations = 0; iterations < sMaxIterations && remainingTime > 0.0001f; ++iterations)
         {
             osg::Vec3f nextpos = newPosition + velocity * remainingTime;
+            bool underwater = newPosition.z() < swimlevel;
 
             // If not able to fly, don't allow to swim up into the air
-            if(!actor.mFlying && nextpos.z() > swimlevel && newPosition.z() < swimlevel)
+            if(!actor.mFlying && nextpos.z() > swimlevel && underwater)
             {
                 const osg::Vec3f down(0,0,-1);
                 velocity = reject(velocity, down);
@@ -230,8 +231,7 @@ namespace MWPhysics
                 break;
             }
 
-            if (isWalkableSlope(tracer.mPlaneNormal) && !actor.mFlying && newPosition.z() >= swimlevel)
-                seenGround = true;
+            bool seenGround = !actor.mFlying && !underwater && ((actor.mIsOnGround && !actor.mIsOnSlope) || isWalkableSlope(tracer.mPlaneNormal));
 
             // We hit something. Check if we can step up.
             float hitHeight = tracer.mHitPoint.z() - tracer.mEndPos.z() + halfExtents.z();

From b04c9584105781bb475c01aee5366421a544aa91 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Thu, 22 Jul 2021 00:08:44 +0200
Subject: [PATCH 1154/2859] Modify the way swimming is handled: - compute the
 swimming state instead of storing it, it changes as part of the simulation
 and was not updated, so it was wrong anyway. - store the swim level in
 ActorFrameData, it is constant per Actor so no need to compute it inside the
 simulation

---
 apps/openmw/mwphysics/movementsolver.cpp | 3 +--
 apps/openmw/mwphysics/mtphysics.cpp      | 9 +++++++--
 apps/openmw/mwphysics/physicssystem.cpp  | 3 ++-
 apps/openmw/mwphysics/physicssystem.hpp  | 2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwphysics/movementsolver.cpp b/apps/openmw/mwphysics/movementsolver.cpp
index fd72ea3220..ccb9105147 100644
--- a/apps/openmw/mwphysics/movementsolver.cpp
+++ b/apps/openmw/mwphysics/movementsolver.cpp
@@ -140,8 +140,7 @@ namespace MWPhysics
         osg::Vec3f halfExtents = physicActor->getHalfExtents();
         actor.mPosition.z() += halfExtents.z(); // vanilla-accurate
 
-        static const float fSwimHeightScale = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fSwimHeightScale")->mValue.getFloat();
-        float swimlevel = actor.mWaterlevel + halfExtents.z() - (physicActor->getRenderingHalfExtents().z() * 2 * fSwimHeightScale);
+        float swimlevel = actor.mSwimLevel + halfExtents.z();
 
         ActorTracer tracer;
 
diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 68a69a5c6d..de390aee1f 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -49,13 +49,18 @@ namespace
             bool mCanBeSharedLock;
     };
 
+    bool isUnderWater(const MWPhysics::ActorFrameData& actorData)
+    {
+        return actorData.mPosition.z() < actorData.mSwimLevel;
+    }
+
     void handleFall(MWPhysics::ActorFrameData& actorData, bool simulationPerformed)
     {
         const float heightDiff = actorData.mPosition.z() - actorData.mOldHeight;
 
         const bool isStillOnGround = (simulationPerformed && actorData.mWasOnGround && actorData.mIsOnGround);
 
-        if (isStillOnGround || actorData.mFlying || actorData.mSwimming || actorData.mSlowFall < 1)
+        if (isStillOnGround || actorData.mFlying || isUnderWater(actorData) || actorData.mSlowFall < 1)
             actorData.mNeedLand = true;
         else if (heightDiff < 0)
             actorData.mFallHeight += heightDiff;
@@ -67,7 +72,7 @@ namespace
 
         MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
         if (actorData.mNeedLand)
-            stats.land(ptr == MWMechanics::getPlayer() && (actorData.mFlying || actorData.mSwimming));
+            stats.land(ptr == MWMechanics::getPlayer() && (actorData.mFlying || isUnderWater(actorData)));
         else if (actorData.mFallHeight < 0)
             stats.addToFallHeight(-actorData.mFallHeight);
     }
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 7757b3eb65..f67e732751 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -1007,10 +1007,11 @@ namespace MWPhysics
         const MWBase::World *world = MWBase::Environment::get().getWorld();
         const auto ptr = actor->getPtr();
         mFlying = world->isFlying(ptr);
-        mSwimming = world->isSwimming(ptr);
         const auto& stats = ptr.getClass().getCreatureStats(ptr);
         const bool godmode = ptr == world->getPlayerConstPtr() && world->getGodModeState();
         mInert = stats.isDead() || (!godmode && stats.getMagicEffects().get(ESM::MagicEffect::Paralyze).getModifier() > 0);
+        static const float fSwimHeightScale = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fSwimHeightScale")->mValue.getFloat();
+        mSwimLevel = mWaterlevel - (actor->getRenderingHalfExtents().z() * 2 * fSwimHeightScale);
     }
 
     void ActorFrameData::updatePosition(btCollisionWorld* world)
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index e5e1aa0c06..e4c67ed188 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -84,7 +84,6 @@ namespace MWPhysics
         Actor* mActorRaw;
         MWWorld::Ptr mStandingOn;
         bool mFlying;
-        bool mSwimming;
         bool mWasOnGround;
         bool mIsOnGround;
         bool mIsOnSlope;
@@ -94,6 +93,7 @@ namespace MWPhysics
         bool mWalkingOnWater;
         bool mSkipCollisionDetection;
         float mWaterlevel;
+        float mSwimLevel;
         float mSlowFall;
         float mOldHeight;
         float mFallHeight;

From 9e911cc8b5a6d069ef6f98474debbbcf3efcc84a Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Fri, 23 Jul 2021 19:07:01 +0200
Subject: [PATCH 1155/2859] Introduce helper function to write back updated
 values inside parent Actor class

---
 apps/openmw/mwphysics/mtphysics.cpp | 32 +++++++++++++----------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index de390aee1f..be94638301 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -83,6 +83,18 @@ namespace
         return actorData.mPosition * interpolationFactor + actorData.mActorRaw->getPreviousPosition() * (1.f - interpolationFactor);
     }
 
+    void updateActor(MWPhysics::ActorFrameData& actorData, bool simulationPerformed, float timeAccum, float dt)
+    {
+        actorData.mActorRaw->setSimulationPosition(interpolateMovements(actorData, timeAccum, dt));
+        if (simulationPerformed)
+        {
+            actorData.mActorRaw->setStandingOnPtr(actorData.mStandingOn);
+            actorData.mActorRaw->setOnGround(actorData.mIsOnGround);
+            actorData.mActorRaw->setOnSlope(actorData.mIsOnSlope);
+            actorData.mActorRaw->setWalkingOnWater(actorData.mWalkingOnWater);
+        }
+    }
+
     namespace Config
     {
         /// @return either the number of thread as configured by the user, or 1 if Bullet doesn't support multithreading
@@ -230,16 +242,7 @@ namespace MWPhysics
                 if (std::any_of(actorsData.begin(), actorsData.end(), actorActive))
                 {
                     updateMechanics(data);
-
-                    // these variables are accessed directly from the main thread, update them here to prevent accessing "too new" values
-                    if (mAdvanceSimulation)
-                    {
-                        data.mActorRaw->setStandingOnPtr(data.mStandingOn);
-                        data.mActorRaw->setOnGround(data.mIsOnGround);
-                        data.mActorRaw->setOnSlope(data.mIsOnSlope);
-                        data.mActorRaw->setWalkingOnWater(data.mWalkingOnWater);
-                    }
-                    data.mActorRaw->setSimulationPosition(interpolateMovements(data, mTimeAccum, mPhysicsDt));
+                    updateActor(data, mAdvanceSimulation, mTimeAccum, mPhysicsDt);
                 }
             }
             if(mAdvanceSimulation)
@@ -534,15 +537,8 @@ namespace MWPhysics
         for (auto& actorData : mActorsFrameData)
         {
             handleFall(actorData, mAdvanceSimulation);
-            actorData.mActorRaw->setSimulationPosition(interpolateMovements(actorData, mTimeAccum, mPhysicsDt));
             updateMechanics(actorData);
-            if (mAdvanceSimulation)
-            {
-                actorData.mActorRaw->setStandingOnPtr(actorData.mStandingOn);
-                actorData.mActorRaw->setOnGround(actorData.mIsOnGround);
-                actorData.mActorRaw->setOnSlope(actorData.mIsOnSlope);
-                actorData.mActorRaw->setWalkingOnWater(actorData.mWalkingOnWater);
-            }
+            updateActor(actorData, mAdvanceSimulation, mTimeAccum, mPhysicsDt);
         }
         refreshLOSCache();
     }

From f68273c3c05d6f1d71d0334db2acf651ad252a71 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Thu, 22 Jul 2021 19:29:20 +0200
Subject: [PATCH 1156/2859] Remove Actor* from ActorFrameData

---
 apps/openmw/mwphysics/movementsolver.cpp | 85 +++++++++++-------------
 apps/openmw/mwphysics/mtphysics.cpp      | 46 +++++++------
 apps/openmw/mwphysics/physicssystem.cpp  | 19 ++++--
 apps/openmw/mwphysics/physicssystem.hpp  |  9 ++-
 4 files changed, 80 insertions(+), 79 deletions(-)

diff --git a/apps/openmw/mwphysics/movementsolver.cpp b/apps/openmw/mwphysics/movementsolver.cpp
index ccb9105147..990000b257 100644
--- a/apps/openmw/mwphysics/movementsolver.cpp
+++ b/apps/openmw/mwphysics/movementsolver.cpp
@@ -118,8 +118,6 @@ namespace MWPhysics
     void MovementSolver::move(ActorFrameData& actor, float time, const btCollisionWorld* collisionWorld,
                                            WorldFrameData& worldData)
     {
-        auto* physicActor = actor.mActorRaw;
-
         // Reset per-frame data
         actor.mWalkingOnWater = false;
         // Anything to collide with?
@@ -131,20 +129,16 @@ namespace MWPhysics
             return;
         }
 
-        const btCollisionObject *colobj = physicActor->getCollisionObject();
-
         // Adjust for collision mesh offset relative to actor's "location"
         // (doTrace doesn't take local/interior collision shape translation into account, so we have to do it on our own)
         // for compatibility with vanilla assets, we have to derive this from the vertical half extent instead of from internal hull translation
         // if not for this hack, the "correct" collision hull position would be physicActor->getScaledMeshTranslation()
-        osg::Vec3f halfExtents = physicActor->getHalfExtents();
-        actor.mPosition.z() += halfExtents.z(); // vanilla-accurate
+        actor.mPosition.z() += actor.mHalfExtentsZ; // vanilla-accurate
 
-        float swimlevel = actor.mSwimLevel + halfExtents.z();
+        float swimlevel = actor.mSwimLevel + actor.mHalfExtentsZ;
 
         ActorTracer tracer;
 
-        osg::Vec3f inertia = physicActor->getInertialForce();
         osg::Vec3f velocity;
 
         // Dead and paralyzed actors underwater will float to the surface,
@@ -162,10 +156,10 @@ namespace MWPhysics
             velocity = (osg::Quat(actor.mRotation.y(), osg::Vec3f(0, 0, -1))) * actor.mMovement;
 
             if ((velocity.z() > 0.f && actor.mIsOnGround && !actor.mIsOnSlope)
-            || (velocity.z() > 0.f && velocity.z() + inertia.z() <= -velocity.z() && actor.mIsOnSlope))
-                inertia = velocity;
+            || (velocity.z() > 0.f && velocity.z() + actor.mInertia.z() <= -velocity.z() && actor.mIsOnSlope))
+                actor.mInertia = velocity;
             else if (!actor.mIsOnGround || actor.mIsOnSlope)
-                velocity = velocity + inertia;
+                velocity = velocity + actor.mInertia;
         }
 
         // Now that we have the effective movement vector, apply wind forces to it
@@ -177,7 +171,7 @@ namespace MWPhysics
             velocity *= 1.f-(fStromWalkMult * (angleDegrees/180.f));
         }
 
-        Stepper stepper(collisionWorld, colobj);
+        Stepper stepper(collisionWorld, actor.mCollisionObject);
         osg::Vec3f origVelocity = velocity;
         osg::Vec3f newPosition = actor.mPosition;
         /*
@@ -209,7 +203,7 @@ namespace MWPhysics
             if((newPosition - nextpos).length2() > 0.0001)
             {
                 // trace to where character would go if there were no obstructions
-                tracer.doTrace(colobj, newPosition, nextpos, collisionWorld);
+                tracer.doTrace(actor.mCollisionObject, newPosition, nextpos, collisionWorld);
 
                 // check for obstructions
                 if(tracer.mFraction >= 1.0f)
@@ -233,7 +227,7 @@ namespace MWPhysics
             bool seenGround = !actor.mFlying && !underwater && ((actor.mIsOnGround && !actor.mIsOnSlope) || isWalkableSlope(tracer.mPlaneNormal));
 
             // We hit something. Check if we can step up.
-            float hitHeight = tracer.mHitPoint.z() - tracer.mEndPos.z() + halfExtents.z();
+            float hitHeight = tracer.mHitPoint.z() - tracer.mEndPos.z() + actor.mHalfExtentsZ;
             osg::Vec3f oldPosition = newPosition;
             bool usedStepLogic = false;
             if (hitHeight < sStepSizeUp && !isActor(tracer.mHitObject))
@@ -244,9 +238,7 @@ namespace MWPhysics
             }
             if (usedStepLogic)
             {
-                // don't let pure water creatures move out of water after stepMove
-                const auto ptr = physicActor->getPtr();
-                if (ptr.getClass().isPureWaterCreature(ptr) && newPosition.z() + halfExtents.z() > actor.mWaterlevel)
+                if (actor.mIsAquatic && newPosition.z() + actor.mHalfExtentsZ > actor.mWaterlevel)
                     newPosition = oldPosition;
                 else if(!actor.mFlying && actor.mPosition.z() >= swimlevel)
                     forceGroundTest = true;
@@ -305,7 +297,7 @@ namespace MWPhysics
                             // version of surface rejection for acute crevices/seams
                             auto averageNormal = bestNormal + planeNormal;
                             averageNormal.normalize();
-                            tracer.doTrace(colobj, newPosition, newPosition + averageNormal*(sCollisionMargin*2.0), collisionWorld);
+                            tracer.doTrace(actor.mCollisionObject, newPosition, newPosition + averageNormal*(sCollisionMargin*2.0), collisionWorld);
                             newPosition = (newPosition + tracer.mEndPos)/2.0;
 
                             usedSeamLogic = true;
@@ -321,7 +313,7 @@ namespace MWPhysics
                 // but this is along the collision normal
                 if(!usedSeamLogic && (iterations > 0 || remainingTime < 0.01f))
                 {
-                    tracer.doTrace(colobj, newPosition, newPosition + planeNormal*(sCollisionMargin*2.0), collisionWorld);
+                    tracer.doTrace(actor.mCollisionObject, newPosition, newPosition + planeNormal*(sCollisionMargin*2.0), collisionWorld);
                     newPosition = (newPosition + tracer.mEndPos)/2.0;
                 }
 
@@ -341,12 +333,12 @@ namespace MWPhysics
 
         bool isOnGround = false;
         bool isOnSlope = false;
-        if (forceGroundTest || (inertia.z() <= 0.f && newPosition.z() >= swimlevel))
+        if (forceGroundTest || (actor.mInertia.z() <= 0.f && newPosition.z() >= swimlevel))
         {
             osg::Vec3f from = newPosition;
             auto dropDistance = 2*sGroundOffset + (actor.mIsOnGround ? sStepSizeDown : 0);
             osg::Vec3f to = newPosition - osg::Vec3f(0,0,dropDistance);
-            tracer.doTrace(colobj, from, to, collisionWorld);
+            tracer.doTrace(actor.mCollisionObject, from, to, collisionWorld);
             if(tracer.mFraction < 1.0f)
             {
                 if (!isActor(tracer.mHitObject))
@@ -368,7 +360,7 @@ namespace MWPhysics
                         else
                         {
                             newPosition.z() = tracer.mEndPos.z();
-                            tracer.doTrace(colobj, newPosition, newPosition + osg::Vec3f(0, 0, 2*sGroundOffset), collisionWorld);
+                            tracer.doTrace(actor.mCollisionObject, newPosition, newPosition + osg::Vec3f(0, 0, 2*sGroundOffset), collisionWorld);
                             newPosition = (newPosition+tracer.mEndPos)/2.0;
                         }
                     }
@@ -383,7 +375,7 @@ namespace MWPhysics
                 }
             }
             // forcibly treat stuck actors as if they're on flat ground because buggy collisions when inside of things can/will break ground detection
-            if(physicActor->getStuckFrames() > 0)
+            if(actor.mStuckFrames > 0)
             {
                 isOnGround = true;
                 isOnSlope = false;
@@ -391,24 +383,23 @@ namespace MWPhysics
         }
 
         if((isOnGround && !isOnSlope) || newPosition.z() < swimlevel || actor.mFlying)
-            physicActor->setInertialForce(osg::Vec3f(0.f, 0.f, 0.f));
+            actor.mInertia = osg::Vec3f(0.f, 0.f, 0.f);
         else
         {
-            inertia.z() -= time * Constants::GravityConst * Constants::UnitsPerMeter;
-            if (inertia.z() < 0)
-                inertia.z() *= actor.mSlowFall;
+            actor.mInertia.z() -= time * Constants::GravityConst * Constants::UnitsPerMeter;
+            if (actor.mInertia.z() < 0)
+                actor.mInertia.z() *= actor.mSlowFall;
             if (actor.mSlowFall < 1.f) {
-                inertia.x() *= actor.mSlowFall;
-                inertia.y() *= actor.mSlowFall;
+                actor.mInertia.x() *= actor.mSlowFall;
+                actor.mInertia.y() *= actor.mSlowFall;
             }
-            physicActor->setInertialForce(inertia);
         }
         actor.mIsOnGround = isOnGround;
         actor.mIsOnSlope = isOnSlope;
 
         actor.mPosition = newPosition;
         // remove what was added earlier in compensating for doTrace not taking interior transformation into account
-        actor.mPosition.z() -= halfExtents.z(); // vanilla-accurate
+        actor.mPosition.z() -= actor.mHalfExtentsZ; // vanilla-accurate
     }
 
     btVector3 addMarginToDelta(btVector3 delta)
@@ -420,49 +411,47 @@ namespace MWPhysics
 
     void MovementSolver::unstuck(ActorFrameData& actor, const btCollisionWorld* collisionWorld)
     {
-        auto* physicActor = actor.mActorRaw;
         if(actor.mSkipCollisionDetection) // noclipping/tcl
             return;
 
-        auto* collisionObject = physicActor->getCollisionObject();
         auto tempPosition = actor.mPosition;
 
-        if(physicActor->getStuckFrames() >= 10)
+        if(actor.mStuckFrames >= 10)
         {
-            if((physicActor->getLastStuckPosition() - actor.mPosition).length2() < 100)
+            if((actor.mLastStuckPosition - actor.mPosition).length2() < 100)
                 return;
             else
             {
-                physicActor->setStuckFrames(0);
-                physicActor->setLastStuckPosition({0, 0, 0});
+                actor.mStuckFrames = 0;
+                actor.mLastStuckPosition = {0, 0, 0};
             }
         }
 
         // use vanilla-accurate collision hull position hack (do same hitbox offset hack as movement solver)
         // if vanilla compatibility didn't matter, the "correct" collision hull position would be physicActor->getScaledMeshTranslation()
-        const auto verticalHalfExtent = osg::Vec3f(0.0, 0.0, physicActor->getHalfExtents().z());
+        const auto verticalHalfExtent = osg::Vec3f(0.0, 0.0, actor.mHalfExtentsZ);
 
         // use a 3d approximation of the movement vector to better judge player intent
         auto velocity = (osg::Quat(actor.mRotation.x(), osg::Vec3f(-1, 0, 0)) * osg::Quat(actor.mRotation.y(), osg::Vec3f(0, 0, -1))) * actor.mMovement;
         // try to pop outside of the world before doing anything else if we're inside of it
         if (!actor.mIsOnGround || actor.mIsOnSlope)
-                velocity += physicActor->getInertialForce();
+                velocity += actor.mInertia;
 
         // because of the internal collision box offset hack, and the fact that we're moving the collision box manually,
         // we need to replicate part of the collision box's transform process from scratch
         osg::Vec3f refPosition = tempPosition + verticalHalfExtent;
         osg::Vec3f goodPosition = refPosition;
-        const btTransform oldTransform = collisionObject->getWorldTransform();
+        const btTransform oldTransform = actor.mCollisionObject->getWorldTransform();
         btTransform newTransform = oldTransform;
 
         auto gatherContacts = [&](btVector3 newOffset) -> ContactCollectionCallback
         {
             goodPosition = refPosition + Misc::Convert::toOsg(addMarginToDelta(newOffset));
             newTransform.setOrigin(Misc::Convert::toBullet(goodPosition));
-            collisionObject->setWorldTransform(newTransform);
+            actor.mCollisionObject->setWorldTransform(newTransform);
 
-            ContactCollectionCallback callback{collisionObject, velocity};
-            ContactTestWrapper::contactTest(const_cast<btCollisionWorld*>(collisionWorld), collisionObject, callback);
+            ContactCollectionCallback callback{actor.mCollisionObject, velocity};
+            ContactTestWrapper::contactTest(const_cast<btCollisionWorld*>(collisionWorld), actor.mCollisionObject, callback);
             return callback;
         };
 
@@ -470,8 +459,8 @@ namespace MWPhysics
         auto contactCallback = gatherContacts({0.0, 0.0, 0.0});
         if(contactCallback.mDistance < -sAllowedPenetration)
         {
-            physicActor->setStuckFrames(physicActor->getStuckFrames() + 1);
-            physicActor->setLastStuckPosition(actor.mPosition);
+            ++actor.mStuckFrames;
+            actor.mLastStuckPosition = actor.mPosition;
             // we are; try moving it out of the world
             auto positionDelta = contactCallback.mContactSum;
             // limit rejection delta to the largest known individual rejections
@@ -506,11 +495,11 @@ namespace MWPhysics
         }
         else
         {
-            physicActor->setStuckFrames(0);
-            physicActor->setLastStuckPosition({0, 0, 0});
+                actor.mStuckFrames = 0;
+                actor.mLastStuckPosition = {0, 0, 0};
         }
 
-        collisionObject->setWorldTransform(oldTransform);
+        actor.mCollisionObject->setWorldTransform(oldTransform);
         actor.mPosition = tempPosition;
     }
 }
diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index be94638301..9fc7b08675 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -66,9 +66,9 @@ namespace
             actorData.mFallHeight += heightDiff;
     }
 
-    void updateMechanics(MWPhysics::ActorFrameData& actorData)
+    void updateMechanics(MWPhysics::Actor& actor, MWPhysics::ActorFrameData& actorData)
     {
-        auto ptr = actorData.mActorRaw->getPtr();
+        auto ptr = actor.getPtr();
 
         MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
         if (actorData.mNeedLand)
@@ -77,21 +77,24 @@ namespace
             stats.addToFallHeight(-actorData.mFallHeight);
     }
 
-    osg::Vec3f interpolateMovements(MWPhysics::ActorFrameData& actorData, float timeAccum, float physicsDt)
+    osg::Vec3f interpolateMovements(MWPhysics::Actor& actor, MWPhysics::ActorFrameData& actorData, float timeAccum, float physicsDt)
     {
         const float interpolationFactor = std::clamp(timeAccum / physicsDt, 0.0f, 1.0f);
-        return actorData.mPosition * interpolationFactor + actorData.mActorRaw->getPreviousPosition() * (1.f - interpolationFactor);
+        return actorData.mPosition * interpolationFactor + actor.getPreviousPosition() * (1.f - interpolationFactor);
     }
 
-    void updateActor(MWPhysics::ActorFrameData& actorData, bool simulationPerformed, float timeAccum, float dt)
+    void updateActor(MWPhysics::Actor& actor, MWPhysics::ActorFrameData& actorData, bool simulationPerformed, float timeAccum, float dt)
     {
-        actorData.mActorRaw->setSimulationPosition(interpolateMovements(actorData, timeAccum, dt));
+        actor.setSimulationPosition(interpolateMovements(actor, actorData, timeAccum, dt));
+        actor.setLastStuckPosition(actorData.mLastStuckPosition);
+        actor.setStuckFrames(actorData.mStuckFrames);
         if (simulationPerformed)
         {
-            actorData.mActorRaw->setStandingOnPtr(actorData.mStandingOn);
-            actorData.mActorRaw->setOnGround(actorData.mIsOnGround);
-            actorData.mActorRaw->setOnSlope(actorData.mIsOnSlope);
-            actorData.mActorRaw->setWalkingOnWater(actorData.mWalkingOnWater);
+            actor.setStandingOnPtr(actorData.mStandingOn);
+            actor.setOnGround(actorData.mIsOnGround);
+            actor.setOnSlope(actorData.mIsOnSlope);
+            actor.setWalkingOnWater(actorData.mWalkingOnWater);
+            actor.setInertialForce(actorData.mInertia);
         }
     }
 
@@ -233,16 +236,10 @@ namespace MWPhysics
         {
             for (auto& data : mActorsFrameData)
             {
-                const auto actorActive = [&data](const auto& newFrameData) -> bool
+                if (auto actor = data.mActor.lock())
                 {
-                    const auto actor = data.mActor.lock();
-                    return actor && actor->getPtr() == newFrameData.mActorRaw->getPtr();
-                };
-                // Only return actors that are still part of the scene
-                if (std::any_of(actorsData.begin(), actorsData.end(), actorActive))
-                {
-                    updateMechanics(data);
-                    updateActor(data, mAdvanceSimulation, mTimeAccum, mPhysicsDt);
+                    updateMechanics(*actor, data);
+                    updateActor(*actor, data, mAdvanceSimulation, mTimeAccum, mPhysicsDt);
                 }
             }
             if(mAdvanceSimulation)
@@ -255,7 +252,10 @@ namespace MWPhysics
 
         // init
         for (auto& data : actorsData)
-            data.updatePosition(mCollisionWorld);
+        {
+            assert(data.mActor.lock());
+            data.updatePosition(*data.mActor.lock(), mCollisionWorld);
+        }
         mPrevStepCount = numSteps;
         mRemainingSteps = numSteps;
         mTimeAccum = timeAccum;
@@ -536,9 +536,11 @@ namespace MWPhysics
 
         for (auto& actorData : mActorsFrameData)
         {
+            auto actor = actorData.mActor.lock();
+            assert(actor);
             handleFall(actorData, mAdvanceSimulation);
-            updateMechanics(actorData);
-            updateActor(actorData, mAdvanceSimulation, mTimeAccum, mPhysicsDt);
+            updateMechanics(*actor, actorData);
+            updateActor(*actor, actorData, mAdvanceSimulation, mTimeAccum, mPhysicsDt);
         }
         refreshLOSCache();
     }
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index f67e732751..11fbf74e4b 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -987,7 +987,7 @@ namespace MWPhysics
     ActorFrameData::ActorFrameData(const std::shared_ptr<Actor>& actor, const MWWorld::Ptr standingOn,
             bool waterCollision, float slowFall, float waterlevel)
         : mActor(actor)
-        , mActorRaw(actor.get())
+        , mCollisionObject(actor->getCollisionObject())
         , mStandingOn(standingOn)
         , mWasOnGround(actor->getOnGround())
         , mIsOnGround(actor->getOnGround())
@@ -1000,6 +1000,7 @@ namespace MWPhysics
         , mSlowFall(slowFall)
         , mOldHeight(0)
         , mFallHeight(0)
+        , mHalfExtentsZ(actor->getHalfExtents().z())
         , mMovement(actor->velocity())
         , mPosition()
         , mRotation()
@@ -1007,6 +1008,7 @@ namespace MWPhysics
         const MWBase::World *world = MWBase::Environment::get().getWorld();
         const auto ptr = actor->getPtr();
         mFlying = world->isFlying(ptr);
+        mIsAquatic = ptr.getClass().isPureWaterCreature(ptr);
         const auto& stats = ptr.getClass().getCreatureStats(ptr);
         const bool godmode = ptr == world->getPlayerConstPtr() && world->getGodModeState();
         mInert = stats.isDead() || (!godmode && stats.getMagicEffects().get(ESM::MagicEffect::Paralyze).getModifier() > 0);
@@ -1014,18 +1016,21 @@ namespace MWPhysics
         mSwimLevel = mWaterlevel - (actor->getRenderingHalfExtents().z() * 2 * fSwimHeightScale);
     }
 
-    void ActorFrameData::updatePosition(btCollisionWorld* world)
+    void ActorFrameData::updatePosition(Actor& actor, btCollisionWorld* world)
     {
-        mActorRaw->applyOffsetChange();
-        mPosition = mActorRaw->getPosition();
-        if (mWaterCollision && mPosition.z() < mWaterlevel && canMoveToWaterSurface(mActorRaw, mWaterlevel, world))
+        actor.applyOffsetChange();
+        mPosition = actor.getPosition();
+        if (mWaterCollision && mPosition.z() < mWaterlevel && canMoveToWaterSurface(&actor, mWaterlevel, world))
         {
             mPosition.z() = mWaterlevel;
-            MWBase::Environment::get().getWorld()->moveObject(mActorRaw->getPtr(), mPosition, false);
+            MWBase::Environment::get().getWorld()->moveObject(actor.getPtr(), mPosition, false);
         }
         mOldHeight = mPosition.z();
-        const auto rotation = mActorRaw->getPtr().getRefData().getPosition().asRotationVec3();
+        const auto rotation = actor.getPtr().getRefData().getPosition().asRotationVec3();
         mRotation = osg::Vec2f(rotation.x(), rotation.z());
+        mInertia = actor.getInertialForce();
+        mStuckFrames = actor.getStuckFrames();
+        mLastStuckPosition = actor.getLastStuckPosition();
     }
 
     WorldFrameData::WorldFrameData()
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index e4c67ed188..52e72c69e8 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -79,9 +79,9 @@ namespace MWPhysics
     struct ActorFrameData
     {
         ActorFrameData(const std::shared_ptr<Actor>& actor, const MWWorld::Ptr standingOn, bool moveToWaterSurface, float slowFall, float waterlevel);
-        void  updatePosition(btCollisionWorld* world);
+        void  updatePosition(Actor& actor, btCollisionWorld* world);
         std::weak_ptr<Actor> mActor;
-        Actor* mActorRaw;
+        btCollisionObject* mCollisionObject;
         MWWorld::Ptr mStandingOn;
         bool mFlying;
         bool mWasOnGround;
@@ -89,17 +89,22 @@ namespace MWPhysics
         bool mIsOnSlope;
         bool mInert;
         bool mNeedLand;
+        bool mIsAquatic;
         bool mWaterCollision;
         bool mWalkingOnWater;
         bool mSkipCollisionDetection;
+        unsigned int mStuckFrames;
         float mWaterlevel;
         float mSwimLevel;
         float mSlowFall;
         float mOldHeight;
         float mFallHeight;
+        float mHalfExtentsZ;
         osg::Vec3f mMovement;
         osg::Vec3f mPosition;
         osg::Vec2f mRotation;
+        osg::Vec3f mInertia;
+        osg::Vec3f mLastStuckPosition;
     };
 
     struct WorldFrameData

From 26d9052b8ca79210b9898dfcf773602fc387a347 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Fri, 23 Jul 2021 20:39:26 +0200
Subject: [PATCH 1157/2859] Move the weak_ptr<Actor> outside of ActorFrameData.

---
 apps/openmw/mwphysics/mtphysics.cpp     | 50 +++++++++++++------------
 apps/openmw/mwphysics/mtphysics.hpp     |  3 +-
 apps/openmw/mwphysics/physicssystem.cpp | 38 ++++++++++---------
 apps/openmw/mwphysics/physicssystem.hpp |  5 +--
 4 files changed, 51 insertions(+), 45 deletions(-)

diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 9fc7b08675..8c2250c05c 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -222,7 +222,7 @@ namespace MWPhysics
         return std::make_tuple(numSteps, actualDelta);
     }
 
-    void PhysicsTaskScheduler::applyQueuedMovements(float & timeAccum, std::vector<ActorFrameData>&& actorsData, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
+    void PhysicsTaskScheduler::applyQueuedMovements(float & timeAccum, std::vector<std::weak_ptr<Actor>>&& actors, std::vector<ActorFrameData>&& actorsData, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
     {
         // This function run in the main thread.
         // While the mSimulationMutex is held, background physics threads can't run.
@@ -234,12 +234,12 @@ namespace MWPhysics
         // start by finishing previous background computation
         if (mNumThreads != 0)
         {
-            for (auto& data : mActorsFrameData)
+            for (size_t i = 0; i < mActors.size(); ++i)
             {
-                if (auto actor = data.mActor.lock())
+                if (auto actor = mActors[i].lock())
                 {
-                    updateMechanics(*actor, data);
-                    updateActor(*actor, data, mAdvanceSimulation, mTimeAccum, mPhysicsDt);
+                    updateMechanics(*actor, mActorsFrameData[i]);
+                    updateActor(*actor, mActorsFrameData[i], mAdvanceSimulation, mTimeAccum, mPhysicsDt);
                 }
             }
             if(mAdvanceSimulation)
@@ -251,15 +251,16 @@ namespace MWPhysics
         timeAccum -= numSteps*newDelta;
 
         // init
-        for (auto& data : actorsData)
+        for (size_t i = 0; i < actors.size(); ++i)
         {
-            assert(data.mActor.lock());
-            data.updatePosition(*data.mActor.lock(), mCollisionWorld);
+            assert(actors[i].lock());
+            actorsData[i].updatePosition(*actors[i].lock(), mCollisionWorld);
         }
         mPrevStepCount = numSteps;
         mRemainingSteps = numSteps;
         mTimeAccum = timeAccum;
         mPhysicsDt = newDelta;
+        mActors = std::move(actors);
         mActorsFrameData = std::move(actorsData);
         mAdvanceSimulation = (mRemainingSteps != 0);
         mNewFrame = true;
@@ -463,7 +464,7 @@ namespace MWPhysics
             int job = 0;
             while (mRemainingSteps && (job = mNextJob.fetch_add(1, std::memory_order_relaxed)) < mNumJobs)
             {
-                if(const auto actor = mActorsFrameData[job].mActor.lock())
+                if(const auto actor = mActors[job].lock())
                 {
                     MaybeSharedLock lockColWorld(mCollisionWorldMutex, mThreadSafeBullet);
                     MovementSolver::move(mActorsFrameData[job], mPhysicsDt, mCollisionWorld, *mWorldFrameData);
@@ -476,10 +477,9 @@ namespace MWPhysics
             {
                 while ((job = mNextJob.fetch_add(1, std::memory_order_relaxed)) < mNumJobs)
                 {
-                    if(const auto actor = mActorsFrameData[job].mActor.lock())
+                    if(const auto actor = mActors[job].lock())
                     {
-                        auto& actorData = mActorsFrameData[job];
-                        handleFall(actorData, mAdvanceSimulation);
+                        handleFall(mActorsFrameData[job], mAdvanceSimulation);
                     }
                 }
 
@@ -491,14 +491,14 @@ namespace MWPhysics
 
     void PhysicsTaskScheduler::updateActorsPositions()
     {
-        for (auto& actorData : mActorsFrameData)
+        for (size_t i = 0; i < mActors.size(); ++i)
         {
-            if(const auto actor = actorData.mActor.lock())
+            if(const auto actor = mActors[i].lock())
             {
-                if (actor->setPosition(actorData.mPosition))
+                if (actor->setPosition(mActorsFrameData[i].mPosition))
                 {
                     std::scoped_lock lock(mCollisionWorldMutex);
-                    actorData.mPosition = actor->getPosition(); // account for potential position change made by script
+                    mActorsFrameData[i].mPosition = actor->getPosition(); // account for potential position change made by script
                     actor->updateCollisionObjectPosition();
                     mCollisionWorld->updateSingleAabb(actor->getCollisionObject());
                 }
@@ -534,13 +534,13 @@ namespace MWPhysics
             updateActorsPositions();
         }
 
-        for (auto& actorData : mActorsFrameData)
+        for (size_t i = 0; i < mActors.size(); ++i)
         {
-            auto actor = actorData.mActor.lock();
+            auto actor = mActors[i].lock();
             assert(actor);
-            handleFall(actorData, mAdvanceSimulation);
-            updateMechanics(*actor, actorData);
-            updateActor(*actor, actorData, mAdvanceSimulation, mTimeAccum, mPhysicsDt);
+            handleFall(mActorsFrameData[i], mAdvanceSimulation);
+            updateMechanics(*actor, mActorsFrameData[i]);
+            updateActor(*actor, mActorsFrameData[i], mAdvanceSimulation, mTimeAccum, mPhysicsDt);
         }
         refreshLOSCache();
     }
@@ -571,12 +571,14 @@ namespace MWPhysics
         updateAabbs();
         if (!mRemainingSteps)
             return;
-        for (auto& data : mActorsFrameData)
-            if (const auto actor = data.mActor.lock())
+        for (size_t i = 0; i < mActors.size(); ++i)
+        {
+            if (auto actor = mActors[i].lock())
             {
                 std::unique_lock lock(mCollisionWorldMutex);
-                MovementSolver::unstuck(data, mCollisionWorld);
+                MovementSolver::unstuck(mActorsFrameData[i], mCollisionWorld);
             }
+        }
     }
 
     void PhysicsTaskScheduler::afterPostStep()
diff --git a/apps/openmw/mwphysics/mtphysics.hpp b/apps/openmw/mwphysics/mtphysics.hpp
index 21698e52bd..6c2116f18f 100644
--- a/apps/openmw/mwphysics/mtphysics.hpp
+++ b/apps/openmw/mwphysics/mtphysics.hpp
@@ -38,7 +38,7 @@ namespace MWPhysics
             /// @param timeAccum accumulated time from previous run to interpolate movements
             /// @param actorsData per actor data needed to compute new positions
             /// @return new position of each actor
-            void applyQueuedMovements(float & timeAccum, std::vector<ActorFrameData>&& actorsData, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
+            void applyQueuedMovements(float & timeAccum, std::vector<std::weak_ptr<Actor>>&& actors, std::vector<ActorFrameData>&& actorsData, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
 
             void resetSimulation(const ActorMap& actors);
 
@@ -71,6 +71,7 @@ namespace MWPhysics
             void afterPostSim();
 
             std::unique_ptr<WorldFrameData> mWorldFrameData;
+            std::vector<std::weak_ptr<Actor>> mActors;
             std::vector<ActorFrameData> mActorsFrameData;
             float mDefaultPhysicsDt;
             float mPhysicsDt;
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 11fbf74e4b..c7d19a3b5c 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -781,10 +781,11 @@ namespace MWPhysics
             actor->setVelocity(osg::Vec3f());
     }
 
-    std::vector<ActorFrameData> PhysicsSystem::prepareFrameData(bool willSimulate)
+    std::pair<std::vector<std::weak_ptr<Actor>>, std::vector<ActorFrameData>> PhysicsSystem::prepareFrameData(bool willSimulate)
     {
-        std::vector<ActorFrameData> actorsFrameData;
-        actorsFrameData.reserve(mActors.size());
+        std::pair<std::vector<std::weak_ptr<Actor>>, std::vector<ActorFrameData>> framedata;
+        framedata.first.reserve(mActors.size());
+        framedata.second.reserve(mActors.size());
         const MWBase::World *world = MWBase::Environment::get().getWorld();
         for (const auto& [actor, physicActor] : mActors)
         {
@@ -815,13 +816,14 @@ namespace MWPhysics
             if (!willSimulate)
                 standingOn = physicActor->getStandingOnPtr();
 
-            actorsFrameData.emplace_back(physicActor, standingOn, waterCollision, slowFall, waterlevel);
+            framedata.first.emplace_back(physicActor);
+            framedata.second.emplace_back(*physicActor, standingOn, waterCollision, slowFall, waterlevel);
 
             // if the simulation will run, a jump request will be fulfilled. Update mechanics accordingly.
             if (willSimulate)
                 handleJump(ptr);
         }
-        return actorsFrameData;
+        return framedata;
     }
 
     void PhysicsSystem::stepSimulation(float dt, bool skipSimulation, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
@@ -846,8 +848,11 @@ namespace MWPhysics
         if (skipSimulation)
             mTaskScheduler->resetSimulation(mActors);
         else
+        {
+            auto [actors, framedata] = prepareFrameData(mTimeAccum >= mPhysicsDt);
             // modifies mTimeAccum
-            mTaskScheduler->applyQueuedMovements(mTimeAccum, prepareFrameData(mTimeAccum >= mPhysicsDt), frameStart, frameNumber, stats);
+            mTaskScheduler->applyQueuedMovements(mTimeAccum, std::move(actors), std::move(framedata), frameStart, frameNumber, stats);
+        }
     }
 
     void PhysicsSystem::moveActors()
@@ -984,36 +989,35 @@ namespace MWPhysics
             mDebugDrawer->addCollision(position, normal);
     }
 
-    ActorFrameData::ActorFrameData(const std::shared_ptr<Actor>& actor, const MWWorld::Ptr standingOn,
+    ActorFrameData::ActorFrameData(Actor& actor, const MWWorld::Ptr standingOn,
             bool waterCollision, float slowFall, float waterlevel)
-        : mActor(actor)
-        , mCollisionObject(actor->getCollisionObject())
+        : mCollisionObject(actor.getCollisionObject())
         , mStandingOn(standingOn)
-        , mWasOnGround(actor->getOnGround())
-        , mIsOnGround(actor->getOnGround())
-        , mIsOnSlope(actor->getOnSlope())
+        , mWasOnGround(actor.getOnGround())
+        , mIsOnGround(actor.getOnGround())
+        , mIsOnSlope(actor.getOnSlope())
         , mNeedLand(false)
         , mWaterCollision(waterCollision)
         , mWalkingOnWater(false)
-        , mSkipCollisionDetection(actor->skipCollisions() || !actor->getCollisionMode())
+        , mSkipCollisionDetection(actor.skipCollisions() || !actor.getCollisionMode())
         , mWaterlevel(waterlevel)
         , mSlowFall(slowFall)
         , mOldHeight(0)
         , mFallHeight(0)
-        , mHalfExtentsZ(actor->getHalfExtents().z())
-        , mMovement(actor->velocity())
+        , mHalfExtentsZ(actor.getHalfExtents().z())
+        , mMovement(actor.velocity())
         , mPosition()
         , mRotation()
     {
         const MWBase::World *world = MWBase::Environment::get().getWorld();
-        const auto ptr = actor->getPtr();
+        const auto ptr = actor.getPtr();
         mFlying = world->isFlying(ptr);
         mIsAquatic = ptr.getClass().isPureWaterCreature(ptr);
         const auto& stats = ptr.getClass().getCreatureStats(ptr);
         const bool godmode = ptr == world->getPlayerConstPtr() && world->getGodModeState();
         mInert = stats.isDead() || (!godmode && stats.getMagicEffects().get(ESM::MagicEffect::Paralyze).getModifier() > 0);
         static const float fSwimHeightScale = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fSwimHeightScale")->mValue.getFloat();
-        mSwimLevel = mWaterlevel - (actor->getRenderingHalfExtents().z() * 2 * fSwimHeightScale);
+        mSwimLevel = mWaterlevel - (actor.getRenderingHalfExtents().z() * 2 * fSwimHeightScale);
     }
 
     void ActorFrameData::updatePosition(Actor& actor, btCollisionWorld* world)
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 52e72c69e8..9d0d661d22 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -78,9 +78,8 @@ namespace MWPhysics
 
     struct ActorFrameData
     {
-        ActorFrameData(const std::shared_ptr<Actor>& actor, const MWWorld::Ptr standingOn, bool moveToWaterSurface, float slowFall, float waterlevel);
+        ActorFrameData(Actor& actor, const MWWorld::Ptr standingOn, bool moveToWaterSurface, float slowFall, float waterlevel);
         void  updatePosition(Actor& actor, btCollisionWorld* world);
-        std::weak_ptr<Actor> mActor;
         btCollisionObject* mCollisionObject;
         MWWorld::Ptr mStandingOn;
         bool mFlying;
@@ -260,7 +259,7 @@ namespace MWPhysics
 
             void updateWater();
 
-            std::vector<ActorFrameData> prepareFrameData(bool willSimulate);
+            std::pair<std::vector<std::weak_ptr<Actor>>, std::vector<ActorFrameData>> prepareFrameData(bool willSimulate);
 
             osg::ref_ptr<SceneUtil::UnrefQueue> mUnrefQueue;
 

From 0c5cf6ec19cf9ee28895031bbee72af707841cc0 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Fri, 23 Jul 2021 22:37:55 +0200
Subject: [PATCH 1158/2859] Store the btCollisionObject* of the object we're
 standing on instead of MWWorld::Ptr: - they are equivalent -
 btCollisionObject* is readily available from the simulation, it saves   a
 call to a mutex - btCollisionObject* is smaller

---
 apps/openmw/mwphysics/movementsolver.cpp |  8 ++---
 apps/openmw/mwphysics/mtphysics.cpp      | 46 ++++++++++++++++--------
 apps/openmw/mwphysics/mtphysics.hpp      |  4 +++
 apps/openmw/mwphysics/physicssystem.cpp  | 12 ++-----
 apps/openmw/mwphysics/physicssystem.hpp  |  4 +--
 5 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/apps/openmw/mwphysics/movementsolver.cpp b/apps/openmw/mwphysics/movementsolver.cpp
index 990000b257..2401f78367 100644
--- a/apps/openmw/mwphysics/movementsolver.cpp
+++ b/apps/openmw/mwphysics/movementsolver.cpp
@@ -345,13 +345,9 @@ namespace MWPhysics
                 {
                     isOnGround = true;
                     isOnSlope = !isWalkableSlope(tracer.mPlaneNormal);
+                    actor.mStandingOn = tracer.mHitObject;
 
-                    const btCollisionObject* standingOn = tracer.mHitObject;
-                    PtrHolder* ptrHolder = static_cast<PtrHolder*>(standingOn->getUserPointer());
-                    if (ptrHolder)
-                        actor.mStandingOn = ptrHolder->getPtr();
-
-                    if (standingOn->getBroadphaseHandle()->m_collisionFilterGroup == CollisionType_Water)
+                    if (actor.mStandingOn->getBroadphaseHandle()->m_collisionFilterGroup == CollisionType_Water)
                         actor.mWalkingOnWater = true;
                     if (!actor.mFlying && !isOnSlope)
                     {
diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 8c2250c05c..41cec6facc 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -83,21 +83,6 @@ namespace
         return actorData.mPosition * interpolationFactor + actor.getPreviousPosition() * (1.f - interpolationFactor);
     }
 
-    void updateActor(MWPhysics::Actor& actor, MWPhysics::ActorFrameData& actorData, bool simulationPerformed, float timeAccum, float dt)
-    {
-        actor.setSimulationPosition(interpolateMovements(actor, actorData, timeAccum, dt));
-        actor.setLastStuckPosition(actorData.mLastStuckPosition);
-        actor.setStuckFrames(actorData.mStuckFrames);
-        if (simulationPerformed)
-        {
-            actor.setStandingOnPtr(actorData.mStandingOn);
-            actor.setOnGround(actorData.mIsOnGround);
-            actor.setOnSlope(actorData.mIsOnSlope);
-            actor.setWalkingOnWater(actorData.mWalkingOnWater);
-            actor.setInertialForce(actorData.mInertia);
-        }
-    }
-
     namespace Config
     {
         /// @return either the number of thread as configured by the user, or 1 if Bullet doesn't support multithreading
@@ -357,12 +342,14 @@ namespace MWPhysics
 
     void PhysicsTaskScheduler::addCollisionObject(btCollisionObject* collisionObject, int collisionFilterGroup, int collisionFilterMask)
     {
+        mCollisionObjects.insert(collisionObject);
         std::unique_lock lock(mCollisionWorldMutex);
         mCollisionWorld->addCollisionObject(collisionObject, collisionFilterGroup, collisionFilterMask);
     }
 
     void PhysicsTaskScheduler::removeCollisionObject(btCollisionObject* collisionObject)
     {
+        mCollisionObjects.erase(collisionObject);
         std::unique_lock lock(mCollisionWorldMutex);
         mCollisionWorld->removeCollisionObject(collisionObject);
     }
@@ -506,6 +493,27 @@ namespace MWPhysics
         }
     }
 
+    void PhysicsTaskScheduler::updateActor(Actor& actor, ActorFrameData& actorData, bool simulationPerformed, float timeAccum, float dt) const
+    {
+        actor.setSimulationPosition(interpolateMovements(actor, actorData, timeAccum, dt));
+        actor.setLastStuckPosition(actorData.mLastStuckPosition);
+        actor.setStuckFrames(actorData.mStuckFrames);
+        if (simulationPerformed)
+        {
+            MWWorld::Ptr standingOn;
+            auto* ptrHolder = static_cast<MWPhysics::PtrHolder*>(getUserPointer(actorData.mStandingOn));
+            if (ptrHolder)
+                standingOn = ptrHolder->getPtr();
+            actor.setStandingOnPtr(standingOn);
+            // the "on ground" state of an actor might have been updated by a traceDown, don't overwrite the change
+            if (actor.getOnGround() == actorData.mWasOnGround)
+                actor.setOnGround(actorData.mIsOnGround);
+            actor.setOnSlope(actorData.mIsOnSlope);
+            actor.setWalkingOnWater(actorData.mWalkingOnWater);
+            actor.setInertialForce(actorData.mInertia);
+        }
+    }
+
     bool PhysicsTaskScheduler::hasLineOfSight(const Actor* actor1, const Actor* actor2)
     {
         btVector3 pos1  = Misc::Convert::toBullet(actor1->getCollisionObjectPosition() + osg::Vec3f(0,0,actor1->getHalfExtents().z() * 0.9)); // eye level
@@ -566,6 +574,14 @@ namespace MWPhysics
         mDebugDrawer->step();
     }
 
+    void* PhysicsTaskScheduler::getUserPointer(const btCollisionObject* object) const
+    {
+        auto it = mCollisionObjects.find(object);
+        if (it == mCollisionObjects.end())
+            return nullptr;
+        return (*it)->getUserPointer();
+    }
+
     void PhysicsTaskScheduler::afterPreStep()
     {
         updateAabbs();
diff --git a/apps/openmw/mwphysics/mtphysics.hpp b/apps/openmw/mwphysics/mtphysics.hpp
index 6c2116f18f..e758c557e2 100644
--- a/apps/openmw/mwphysics/mtphysics.hpp
+++ b/apps/openmw/mwphysics/mtphysics.hpp
@@ -6,6 +6,7 @@
 #include <optional>
 #include <shared_mutex>
 #include <thread>
+#include <unordered_set>
 
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 
@@ -55,11 +56,13 @@ namespace MWPhysics
             void updateSingleAabb(std::weak_ptr<PtrHolder> ptr, bool immediate=false);
             bool getLineOfSight(const std::weak_ptr<Actor>& actor1, const std::weak_ptr<Actor>& actor2);
             void debugDraw();
+            void* getUserPointer(const btCollisionObject* object) const;
 
         private:
             void syncComputation();
             void worker();
             void updateActorsPositions();
+            void updateActor(Actor& actor, ActorFrameData& actorData, bool simulationPerformed, float timeAccum, float dt) const;
             bool hasLineOfSight(const Actor* actor1, const Actor* actor2);
             void refreshLOSCache();
             void updateAabbs();
@@ -73,6 +76,7 @@ namespace MWPhysics
             std::unique_ptr<WorldFrameData> mWorldFrameData;
             std::vector<std::weak_ptr<Actor>> mActors;
             std::vector<ActorFrameData> mActorsFrameData;
+            std::unordered_set<const btCollisionObject*> mCollisionObjects;
             float mDefaultPhysicsDt;
             float mPhysicsDt;
             float mTimeAccum;
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index c7d19a3b5c..d65231322a 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -811,13 +811,8 @@ namespace MWPhysics
             // Slow fall reduces fall speed by a factor of (effect magnitude / 200)
             const float slowFall = 1.f - std::max(0.f, std::min(1.f, effects.get(ESM::MagicEffect::SlowFall).getMagnitude() * 0.005f));
 
-            // Ue current value only if we don't advance the simulation. Otherwise we might get a stale value.
-            MWWorld::Ptr standingOn;
-            if (!willSimulate)
-                standingOn = physicActor->getStandingOnPtr();
-
             framedata.first.emplace_back(physicActor);
-            framedata.second.emplace_back(*physicActor, standingOn, waterCollision, slowFall, waterlevel);
+            framedata.second.emplace_back(*physicActor, waterCollision, slowFall, waterlevel);
 
             // if the simulation will run, a jump request will be fulfilled. Update mechanics accordingly.
             if (willSimulate)
@@ -989,10 +984,9 @@ namespace MWPhysics
             mDebugDrawer->addCollision(position, normal);
     }
 
-    ActorFrameData::ActorFrameData(Actor& actor, const MWWorld::Ptr standingOn,
-            bool waterCollision, float slowFall, float waterlevel)
+    ActorFrameData::ActorFrameData(Actor& actor, bool waterCollision, float slowFall, float waterlevel)
         : mCollisionObject(actor.getCollisionObject())
-        , mStandingOn(standingOn)
+        , mStandingOn(nullptr)
         , mWasOnGround(actor.getOnGround())
         , mIsOnGround(actor.getOnGround())
         , mIsOnSlope(actor.getOnSlope())
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 9d0d661d22..208e6cc71d 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -78,10 +78,10 @@ namespace MWPhysics
 
     struct ActorFrameData
     {
-        ActorFrameData(Actor& actor, const MWWorld::Ptr standingOn, bool moveToWaterSurface, float slowFall, float waterlevel);
+        ActorFrameData(Actor& actor, bool moveToWaterSurface, float slowFall, float waterlevel);
         void  updatePosition(Actor& actor, btCollisionWorld* world);
         btCollisionObject* mCollisionObject;
-        MWWorld::Ptr mStandingOn;
+        const btCollisionObject* mStandingOn;
         bool mFlying;
         bool mWasOnGround;
         bool mIsOnGround;

From bcd6541d3e259e9998b9c43fec10b6bb21788c10 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Fri, 23 Jul 2021 23:08:35 +0200
Subject: [PATCH 1159/2859] Reorganize ActorFrameData members: - constify all
 read-only variables - order them so that all variables modified as aprt of
 the simulation   fits in one cache line

---
 apps/openmw/mwphysics/physicssystem.cpp | 42 ++++++++++++-------------
 apps/openmw/mwphysics/physicssystem.hpp | 38 +++++++++++-----------
 2 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index d65231322a..f8862ea400 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -797,7 +797,8 @@ namespace MWPhysics
             if(cell->getCell()->hasWater())
                 waterlevel = cell->getWaterLevel();
 
-            const MWMechanics::MagicEffects& effects = actor.getClass().getCreatureStats(ptr).getMagicEffects();
+            const auto& stats = ptr.getClass().getCreatureStats(ptr);
+            const MWMechanics::MagicEffects& effects = stats.getMagicEffects();
 
             bool waterCollision = false;
             if (cell->getCell()->hasWater() && effects.get(ESM::MagicEffect::WaterWalking).getMagnitude())
@@ -810,9 +811,11 @@ namespace MWPhysics
 
             // Slow fall reduces fall speed by a factor of (effect magnitude / 200)
             const float slowFall = 1.f - std::max(0.f, std::min(1.f, effects.get(ESM::MagicEffect::SlowFall).getMagnitude() * 0.005f));
+            const bool godmode = ptr == world->getPlayerConstPtr() && world->getGodModeState();
+            const bool inert = stats.isDead() || (!godmode && stats.getMagicEffects().get(ESM::MagicEffect::Paralyze).getModifier() > 0);
 
             framedata.first.emplace_back(physicActor);
-            framedata.second.emplace_back(*physicActor, waterCollision, slowFall, waterlevel);
+            framedata.second.emplace_back(*physicActor, inert, waterCollision, slowFall, waterlevel);
 
             // if the simulation will run, a jump request will be fulfilled. Update mechanics accordingly.
             if (willSimulate)
@@ -984,34 +987,29 @@ namespace MWPhysics
             mDebugDrawer->addCollision(position, normal);
     }
 
-    ActorFrameData::ActorFrameData(Actor& actor, bool waterCollision, float slowFall, float waterlevel)
-        : mCollisionObject(actor.getCollisionObject())
+    ActorFrameData::ActorFrameData(Actor& actor, bool inert, bool waterCollision, float slowFall, float waterlevel)
+        : mPosition()
         , mStandingOn(nullptr)
-        , mWasOnGround(actor.getOnGround())
         , mIsOnGround(actor.getOnGround())
         , mIsOnSlope(actor.getOnSlope())
-        , mNeedLand(false)
-        , mWaterCollision(waterCollision)
         , mWalkingOnWater(false)
-        , mSkipCollisionDetection(actor.skipCollisions() || !actor.getCollisionMode())
-        , mWaterlevel(waterlevel)
+        , mInert(inert)
+        , mCollisionObject(actor.getCollisionObject())
+        , mSwimLevel(waterlevel - (actor.getRenderingHalfExtents().z() * 2 * MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fSwimHeightScale")->mValue.getFloat()))
         , mSlowFall(slowFall)
+        , mRotation()
+        , mMovement(actor.velocity())
+        , mWaterlevel(waterlevel)
+        , mHalfExtentsZ(actor.getHalfExtents().z())
         , mOldHeight(0)
         , mFallHeight(0)
-        , mHalfExtentsZ(actor.getHalfExtents().z())
-        , mMovement(actor.velocity())
-        , mPosition()
-        , mRotation()
+        , mFlying(MWBase::Environment::get().getWorld()->isFlying(actor.getPtr()))
+        , mWasOnGround(actor.getOnGround())
+        , mIsAquatic(actor.getPtr().getClass().isPureWaterCreature(actor.getPtr()))
+        , mWaterCollision(waterCollision)
+        , mSkipCollisionDetection(actor.skipCollisions() || !actor.getCollisionMode())
+        , mNeedLand(false)
     {
-        const MWBase::World *world = MWBase::Environment::get().getWorld();
-        const auto ptr = actor.getPtr();
-        mFlying = world->isFlying(ptr);
-        mIsAquatic = ptr.getClass().isPureWaterCreature(ptr);
-        const auto& stats = ptr.getClass().getCreatureStats(ptr);
-        const bool godmode = ptr == world->getPlayerConstPtr() && world->getGodModeState();
-        mInert = stats.isDead() || (!godmode && stats.getMagicEffects().get(ESM::MagicEffect::Paralyze).getModifier() > 0);
-        static const float fSwimHeightScale = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fSwimHeightScale")->mValue.getFloat();
-        mSwimLevel = mWaterlevel - (actor.getRenderingHalfExtents().z() * 2 * fSwimHeightScale);
     }
 
     void ActorFrameData::updatePosition(Actor& actor, btCollisionWorld* world)
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 208e6cc71d..f1b6bc147a 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -78,32 +78,32 @@ namespace MWPhysics
 
     struct ActorFrameData
     {
-        ActorFrameData(Actor& actor, bool moveToWaterSurface, float slowFall, float waterlevel);
+        ActorFrameData(Actor& actor, bool inert, bool waterCollision, float slowFall, float waterlevel);
         void  updatePosition(Actor& actor, btCollisionWorld* world);
-        btCollisionObject* mCollisionObject;
+        osg::Vec3f mPosition;
+        osg::Vec3f mInertia;
         const btCollisionObject* mStandingOn;
-        bool mFlying;
-        bool mWasOnGround;
         bool mIsOnGround;
         bool mIsOnSlope;
-        bool mInert;
-        bool mNeedLand;
-        bool mIsAquatic;
-        bool mWaterCollision;
         bool mWalkingOnWater;
-        bool mSkipCollisionDetection;
-        unsigned int mStuckFrames;
-        float mWaterlevel;
-        float mSwimLevel;
-        float mSlowFall;
-        float mOldHeight;
-        float mFallHeight;
-        float mHalfExtentsZ;
-        osg::Vec3f mMovement;
-        osg::Vec3f mPosition;
+        const bool mInert;
+        btCollisionObject* mCollisionObject;
+        const float mSwimLevel;
+        const float mSlowFall;
         osg::Vec2f mRotation;
-        osg::Vec3f mInertia;
+        osg::Vec3f mMovement;
         osg::Vec3f mLastStuckPosition;
+        const float mWaterlevel;
+        const float mHalfExtentsZ;
+        float mOldHeight;
+        float mFallHeight;
+        unsigned int mStuckFrames;
+        const bool mFlying;
+        const bool mWasOnGround;
+        const bool mIsAquatic;
+        const bool mWaterCollision;
+        const bool mSkipCollisionDetection;
+        bool mNeedLand;
     };
 
     struct WorldFrameData

From 7dd5e715d727f8ce38aaf2727d01b64388adbbd7 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sat, 24 Jul 2021 16:44:21 +0200
Subject: [PATCH 1160/2859] Compute and store actor half extents. This is
 faster for 2 reasons: - half extents changes when actor scale is modified,
 which is very rare - we don't need to protect them by the actor mutex.

---
 apps/openmw/mwphysics/actor.cpp | 29 ++++++++++++++---------------
 apps/openmw/mwphysics/actor.hpp |  3 ++-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index 5416223264..c566c3a1ed 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -21,7 +21,7 @@ namespace MWPhysics
 
 Actor::Actor(const MWWorld::Ptr& ptr, const Resource::BulletShape* shape, PhysicsTaskScheduler* scheduler, bool canWaterWalk)
   : mStandingOnPtr(nullptr), mCanWaterWalk(canWaterWalk), mWalkingOnWater(false)
-  , mCollisionObject(nullptr), mMeshTranslation(shape->mCollisionBox.center), mHalfExtents(shape->mCollisionBox.extents)
+  , mCollisionObject(nullptr), mMeshTranslation(shape->mCollisionBox.center), mOriginalHalfExtents(shape->mCollisionBox.extents)
   , mVelocity(0,0,0), mStuckFrames(0), mLastStuckPosition{0, 0, 0}
   , mForce(0.f, 0.f, 0.f), mOnGround(true), mOnSlope(false)
   , mInternalCollisionMode(true)
@@ -33,7 +33,7 @@ Actor::Actor(const MWWorld::Ptr& ptr, const Resource::BulletShape* shape, Physic
     // We can not create actor without collisions - he will fall through the ground.
     // In this case we should autogenerate collision box based on mesh shape
     // (NPCs have bodyparts and use a different approach)
-    if (!ptr.getClass().isNpc() && mHalfExtents.length2() == 0.f)
+    if (!ptr.getClass().isNpc() && mOriginalHalfExtents.length2() == 0.f)
     {
         if (shape->mCollisionShape)
         {
@@ -43,19 +43,19 @@ Actor::Actor(const MWWorld::Ptr& ptr, const Resource::BulletShape* shape, Physic
             btVector3 max;
 
             shape->mCollisionShape->getAabb(transform, min, max);
-            mHalfExtents.x() = (max[0] - min[0])/2.f;
-            mHalfExtents.y() = (max[1] - min[1])/2.f;
-            mHalfExtents.z() = (max[2] - min[2])/2.f;
+            mOriginalHalfExtents.x() = (max[0] - min[0])/2.f;
+            mOriginalHalfExtents.y() = (max[1] - min[1])/2.f;
+            mOriginalHalfExtents.z() = (max[2] - min[2])/2.f;
 
-            mMeshTranslation = osg::Vec3f(0.f, 0.f, mHalfExtents.z());
+            mMeshTranslation = osg::Vec3f(0.f, 0.f, mOriginalHalfExtents.z());
         }
 
-        if (mHalfExtents.length2() == 0.f)
+        if (mOriginalHalfExtents.length2() == 0.f)
             Log(Debug::Error) << "Error: Failed to calculate bounding box for actor \"" << ptr.getCellRef().getRefId() << "\".";
     }
 
-    mShape.reset(new btBoxShape(Misc::Convert::toBullet(mHalfExtents)));
-    mRotationallyInvariant = (mMeshTranslation.x() == 0.0 && mMeshTranslation.y() == 0.0) && std::fabs(mHalfExtents.x() - mHalfExtents.y()) < 2.2;
+    mShape.reset(new btBoxShape(Misc::Convert::toBullet(mOriginalHalfExtents)));
+    mRotationallyInvariant = (mMeshTranslation.x() == 0.0 && mMeshTranslation.y() == 0.0) && std::fabs(mOriginalHalfExtents.x() - mOriginalHalfExtents.y()) < 2.2;
 
     mConvexShape = static_cast<btConvexShape*>(mShape.get());
 
@@ -220,27 +220,26 @@ void Actor::updateScale()
 
     mPtr.getClass().adjustScale(mPtr, scaleVec, false);
     mScale = scaleVec;
+    mHalfExtents = osg::componentMultiply(mOriginalHalfExtents, scaleVec);
 
     scaleVec = osg::Vec3f(scale,scale,scale);
     mPtr.getClass().adjustScale(mPtr, scaleVec, true);
-    mRenderingScale = scaleVec;
+    mRenderingHalfExtents = osg::componentMultiply(mOriginalHalfExtents, scaleVec);
 }
 
 osg::Vec3f Actor::getHalfExtents() const
 {
-    std::scoped_lock lock(mPositionMutex);
-    return osg::componentMultiply(mHalfExtents, mScale);
+    return mHalfExtents;
 }
 
 osg::Vec3f Actor::getOriginalHalfExtents() const
 {
-    return mHalfExtents;
+    return mOriginalHalfExtents;
 }
 
 osg::Vec3f Actor::getRenderingHalfExtents() const
 {
-    std::scoped_lock lock(mPositionMutex);
-    return osg::componentMultiply(mHalfExtents, mRenderingScale);
+    return mRenderingHalfExtents;
 }
 
 void Actor::setInertialForce(const osg::Vec3f &force)
diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index eb81064937..e52a4caca7 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -191,11 +191,12 @@ namespace MWPhysics
         std::unique_ptr<btCollisionObject> mCollisionObject;
 
         osg::Vec3f mMeshTranslation;
+        osg::Vec3f mOriginalHalfExtents;
         osg::Vec3f mHalfExtents;
+        osg::Vec3f mRenderingHalfExtents;
         osg::Quat mRotation;
 
         osg::Vec3f mScale;
-        osg::Vec3f mRenderingScale;
         osg::Vec3f mSimulationPosition;
         osg::Vec3f mPosition;
         osg::Vec3f mPreviousPosition;

From 5fc3b80406a16930f412d3266bdb9ca8152681a2 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sat, 24 Jul 2021 21:12:02 +0200
Subject: [PATCH 1161/2859] Don't query actor halfextent in a tight loop, use
 the already existing variable. These repeated calls become costly with > 150
 actors.

---
 apps/openmw/mwmechanics/actors.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 3669fd9391..c5b46c3764 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1831,7 +1831,7 @@ namespace MWMechanics
             osg::Vec2f baseSpeed = origMovement * maxSpeed;
             osg::Vec3f basePos = ptr.getRefData().getPosition().asVec3();
             float baseRotZ = ptr.getRefData().getPosition().rot[2];
-            osg::Vec3f halfExtents = world->getHalfExtents(ptr);
+            const osg::Vec3f halfExtents = world->getHalfExtents(ptr);
             float maxDistToCheck = isMoving ? maxDistForPartialAvoiding : maxDistForStrictAvoiding;
 
             float timeToCollision = maxTimeToCheck;
@@ -1849,7 +1849,7 @@ namespace MWMechanics
                 if (otherPtr == ptr || otherPtr == currentTarget)
                     continue;
 
-                osg::Vec3f otherHalfExtents = world->getHalfExtents(otherPtr);
+                const osg::Vec3f otherHalfExtents = world->getHalfExtents(otherPtr);
                 osg::Vec3f deltaPos = otherPtr.getRefData().getPosition().asVec3() - basePos;
                 osg::Vec2f relPos = Misc::rotateVec2f(osg::Vec2f(deltaPos.x(), deltaPos.y()), baseRotZ);
                 float dist = deltaPos.length();
@@ -1867,7 +1867,7 @@ namespace MWMechanics
                 float rotZ = otherPtr.getRefData().getPosition().rot[2];
                 osg::Vec2f relSpeed = Misc::rotateVec2f(osg::Vec2f(speed.x(), speed.y()), baseRotZ - rotZ) - baseSpeed;
 
-                float collisionDist = minGap + world->getHalfExtents(ptr).x() + world->getHalfExtents(otherPtr).x();
+                float collisionDist = minGap + halfExtents.x() + otherHalfExtents.x();
                 collisionDist = std::min(collisionDist, relPos.length());
 
                 // Find the earliest `t` when |relPos + relSpeed * t| == collisionDist.

From fa1fb2a6b5c0d1050bf5779cbbc86aa0a802d782 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 7 Aug 2021 19:29:08 +0200
Subject: [PATCH 1162/2859] Reset mIsReleased before starting threads

To fix TSAN warning:

WARNING: ThreadSanitizer: data race (pid=68597)
  Write of size 1 at 0x7b3800079234 by main thread:
    #0 SceneUtil::WorkQueue::start(unsigned long) /home/elsid/dev/openmw/components/sceneutil/workqueue.cpp:51 (openmw+0x10daa10)
    #1 SceneUtil::WorkQueue::WorkQueue(unsigned long) /home/elsid/dev/openmw/components/sceneutil/workqueue.cpp:39 (openmw+0x10dad97)
    #2 OMW::Engine::prepareEngine(Settings::Manager&) /home/elsid/dev/openmw/apps/openmw/engine.cpp:700 (openmw+0xf7cb5a)
    #3 OMW::Engine::go() /home/elsid/dev/openmw/apps/openmw/engine.cpp:949 (openmw+0xf82688)
    #4 runApplication(int, char**) /home/elsid/dev/openmw/apps/openmw/main.cpp:316 (openmw+0xf62611)
    #5 wrapApplication(int (*)(int, char**), int, char**, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) /home/elsid/dev/openmw/components/debug/debugging.cpp:205 (openmw+0x125df1c)
    #6 main /home/elsid/dev/openmw/apps/openmw/main.cpp:328 (openmw+0x596323)

  Previous read of size 1 at 0x7b3800079234 by thread T10 (mutexes: write M19275778865205896):
    #0 SceneUtil::WorkQueue::removeWorkItem() /home/elsid/dev/openmw/components/sceneutil/workqueue.cpp:86 (openmw+0x10d9e51)
    #1 SceneUtil::WorkThread::run() /home/elsid/dev/openmw/components/sceneutil/workqueue.cpp:127 (openmw+0x10da52a)
    #2 operator() /home/elsid/dev/openmw/components/sceneutil/workqueue.cpp:114 (openmw+0x10da664)
    #3 __invoke_impl<void, SceneUtil::WorkThread::WorkThread(SceneUtil::WorkQueue&)::<lambda()> > /usr/include/c++/11.1.0/bits/invoke.h:61 (openmw+0x10da664)
    #4 __invoke<SceneUtil::WorkThread::WorkThread(SceneUtil::WorkQueue&)::<lambda()> > /usr/include/c++/11.1.0/bits/invoke.h:96 (openmw+0x10da664)
    #5 _M_invoke<0> /usr/include/c++/11.1.0/bits/std_thread.h:253 (openmw+0x10da664)
    #6 operator() /usr/include/c++/11.1.0/bits/std_thread.h:260 (openmw+0x10da664)
    #7 _M_run /usr/include/c++/11.1.0/bits/std_thread.h:211 (openmw+0x10da664)
    #8 execute_native_thread_routine /build/gcc/src/gcc/libstdc++-v3/src/c++11/thread.cc:82 (libstdc++.so.6+0xd33c3)

  Location is heap block of size 216 at 0x7b3800079220 allocated by main thread:
    #0 operator new(unsigned long) /build/gcc/src/gcc/libsanitizer/tsan/tsan_new_delete.cpp:64 (libtsan.so.0+0x91824)
    #1 OMW::Engine::prepareEngine(Settings::Manager&) /home/elsid/dev/openmw/apps/openmw/engine.cpp:700 (openmw+0xf7cb4c)
    #2 OMW::Engine::go() /home/elsid/dev/openmw/apps/openmw/engine.cpp:949 (openmw+0xf82688)
    #3 runApplication(int, char**) /home/elsid/dev/openmw/apps/openmw/main.cpp:316 (openmw+0xf62611)
    #4 wrapApplication(int (*)(int, char**), int, char**, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) /home/elsid/dev/openmw/components/debug/debugging.cpp:205 (openmw+0x125df1c)
    #5 main /home/elsid/dev/openmw/apps/openmw/main.cpp:328 (openmw+0x596323)

  Mutex M19275778865205896 is already destroyed.

  Thread T10 (tid=68609, running) created by main thread at:
    #0 pthread_create /build/gcc/src/gcc/libsanitizer/tsan/tsan_interceptors_posix.cpp:969 (libtsan.so.0+0x61c3a)
    #1 std::thread::_M_start_thread(std::unique_ptr<std::thread::_State, std::default_delete<std::thread::_State> >, void (*)()) /build/gcc/src/gcc-build/x86_64-pc-linux-gnu/libstdc++-v3/include/x86_64-pc-linux-gnu/bits/gthr-default.h:663 (libstdc++.so.6+0xd36aa)
    #2 std::_MakeUniq<SceneUtil::WorkThread>::__single_object std::make_unique<SceneUtil::WorkThread, SceneUtil::WorkQueue&>(SceneUtil::WorkQueue&) /usr/include/c++/11.1.0/bits/unique_ptr.h:962 (openmw+0x10da987)
    #3 SceneUtil::WorkQueue::start(unsigned long) /home/elsid/dev/openmw/components/sceneutil/workqueue.cpp:50 (openmw+0x10da987)
    #4 SceneUtil::WorkQueue::WorkQueue(unsigned long) /home/elsid/dev/openmw/components/sceneutil/workqueue.cpp:39 (openmw+0x10dad97)
    #5 OMW::Engine::prepareEngine(Settings::Manager&) /home/elsid/dev/openmw/apps/openmw/engine.cpp:700 (openmw+0xf7cb5a)
    #6 OMW::Engine::go() /home/elsid/dev/openmw/apps/openmw/engine.cpp:949 (openmw+0xf82688)
    #7 runApplication(int, char**) /home/elsid/dev/openmw/apps/openmw/main.cpp:316 (openmw+0xf62611)
    #8 wrapApplication(int (*)(int, char**), int, char**, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) /home/elsid/dev/openmw/components/debug/debugging.cpp:205 (openmw+0x125df1c)
    #9 main /home/elsid/dev/openmw/apps/openmw/main.cpp:328 (openmw+0x596323)
---
 components/sceneutil/workqueue.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/components/sceneutil/workqueue.cpp b/components/sceneutil/workqueue.cpp
index 0c68c61921..eb7a7b2cae 100644
--- a/components/sceneutil/workqueue.cpp
+++ b/components/sceneutil/workqueue.cpp
@@ -46,9 +46,12 @@ WorkQueue::~WorkQueue()
 
 void WorkQueue::start(std::size_t workerThreads)
 {
+    {
+        const std::lock_guard lock(mMutex);
+        mIsReleased = false;
+    }
     while (mThreads.size() < workerThreads)
         mThreads.emplace_back(std::make_unique<WorkThread>(*this));
-    mIsReleased = false;
 }
 
 void WorkQueue::stop()

From 3cbe93358abd28b7acd5108836f00b1b019a4578 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 7 Aug 2021 11:58:02 +0200
Subject: [PATCH 1163/2859] Move dtNavMeshParams initialization to where it's
 required

---
 components/detournavigator/makenavmesh.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index 07e9c7da66..246f9d85b6 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -517,8 +517,6 @@ namespace DetourNavigator
             " playerTile=(" << playerTile << ")" <<
             " changedTileDistance=" << getDistance(changedTile, playerTile);
 
-        const auto params = *navMeshCacheItem->lockConst()->getImpl().getParams();
-
         if (!recastMesh)
         {
             Log(Debug::Debug) << "Ignore add tile: recastMesh is null";
@@ -542,6 +540,8 @@ namespace DetourNavigator
             return navMeshCacheItem->lock()->removeTile(changedTile);
         }
 
+        const dtNavMeshParams params = *navMeshCacheItem->lockConst()->getImpl().getParams();
+
         if (!shouldAddTile(changedTile, playerTile, std::min(settings.mMaxTilesNumber, params.maxTiles)))
         {
             Log(Debug::Debug) << "Ignore add tile: too far from player";

From 1fc7cb8191116c551dbabc69bd0204af6a86fbc3 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sun, 8 Aug 2021 03:36:35 +0300
Subject: [PATCH 1164/2859] Don't use FreezeOnCull for any particle system
 (#4744)

---
 CHANGELOG.md                              |  1 +
 apps/openmw/mwrender/animation.cpp        |  3 ---
 apps/openmw/mwrender/sky.cpp              |  3 ---
 apps/openmw/mwworld/projectilemanager.cpp |  3 ---
 components/nifosg/nifloader.cpp           |  2 --
 components/sceneutil/visitor.cpp          | 11 -----------
 components/sceneutil/visitor.hpp          | 14 --------------
 7 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d8405fb41..f735bd5a13 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
     Bug #3846: Strings starting with "-" fail to compile if not enclosed in quotes
     Bug #3905: Great House Dagoth issues
     Bug #4203: Resurrecting an actor should close the loot GUI
+    Bug #4744: Invisible particles must still be processed
     Bug #4752: UpdateCellCommand doesn't undo properly
     Bug #5100: Persuasion doesn't always clamp the resulting disposition
     Bug #5120: Scripted object spawning updates physics system
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 53673d8a22..07b1deeff3 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -1678,9 +1678,6 @@ namespace MWRender
         SceneUtil::FindMaxControllerLengthVisitor findMaxLengthVisitor;
         node->accept(findMaxLengthVisitor);
 
-        // FreezeOnCull doesn't work so well with effect particles, that tend to have moving emitters
-        SceneUtil::DisableFreezeOnCullVisitor disableFreezeOnCullVisitor;
-        node->accept(disableFreezeOnCullVisitor);
         node->setNodeMask(Mask_Effect);
 
         params.mMaxControllerLength = findMaxLengthVisitor.getMaxLength();
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index 2b58730fe1..05ce0f1560 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -1731,9 +1731,6 @@ void SkyManager::setWeather(const WeatherResult& weather)
 
             mParticleEffect->accept(alphaFaderSetupVisitor);
 
-            SceneUtil::DisableFreezeOnCullVisitor disableFreezeOnCullVisitor;
-            mParticleEffect->accept(disableFreezeOnCullVisitor);
-
             SceneUtil::FindByClassVisitor findPSVisitor(std::string("ParticleSystem"));
             mParticleEffect->accept(findPSVisitor);
 
diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index 439f5a4605..04f4573369 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -238,9 +238,6 @@ namespace MWWorld
             state.mNode->addChild(projectileLightSource);
             projectileLightSource->setLight(projectileLight);
         }
-        
-        SceneUtil::DisableFreezeOnCullVisitor disableFreezeOnCullVisitor;
-        state.mNode->accept(disableFreezeOnCullVisitor);
 
         state.mNode->addCullCallback(new SceneUtil::LightListCallback);
 
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 83b9fb61c2..17551e0b91 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -1103,8 +1103,6 @@ namespace NifOsg
             partsys->getDefaultParticleTemplate().setColorRange(osgParticle::rangev4(osg::Vec4f(1.f,1.f,1.f,1.f), osg::Vec4f(1.f,1.f,1.f,1.f)));
             partsys->getDefaultParticleTemplate().setAlphaRange(osgParticle::rangef(1.f, 1.f));
 
-            partsys->setFreezeOnCull(true);
-
             if (!partctrl->emitter.empty())
             {
                 osg::ref_ptr<Emitter> emitter = handleParticleEmitter(partctrl);
diff --git a/components/sceneutil/visitor.cpp b/components/sceneutil/visitor.cpp
index 1f5a0ea4cf..f1f15f786f 100644
--- a/components/sceneutil/visitor.cpp
+++ b/components/sceneutil/visitor.cpp
@@ -46,17 +46,6 @@ namespace SceneUtil
     {
     }
 
-    void DisableFreezeOnCullVisitor::apply(osg::MatrixTransform &node)
-    {
-        traverse(node);
-    }
-
-    void DisableFreezeOnCullVisitor::apply(osg::Drawable& drw)
-    {
-        if (osgParticle::ParticleSystem* partsys = dynamic_cast<osgParticle::ParticleSystem*>(&drw))
-            partsys->setFreezeOnCull(false);
-    }
-
     void NodeMapVisitor::apply(osg::MatrixTransform& trans)
     {
         // Take transformation for first found node in file
diff --git a/components/sceneutil/visitor.hpp b/components/sceneutil/visitor.hpp
index 5e041dc454..fcf3c1f944 100644
--- a/components/sceneutil/visitor.hpp
+++ b/components/sceneutil/visitor.hpp
@@ -45,20 +45,6 @@ namespace SceneUtil
         std::vector<osg::Node *> mFoundNodes;
     };
 
-    // Disable freezeOnCull for all visited particlesystems
-    class DisableFreezeOnCullVisitor : public osg::NodeVisitor
-    {
-    public:
-        DisableFreezeOnCullVisitor()
-            : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
-        {
-        }
-
-        void apply(osg::MatrixTransform& node) override;
-
-        void apply(osg::Drawable& drw) override;
-    };
-
     /// Maps names to nodes
     class NodeMapVisitor : public osg::NodeVisitor
     {

From 86e6d3dac8bd542b04148521d81bde9d5d3a0695 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 7 Aug 2021 12:03:21 +0200
Subject: [PATCH 1165/2859] Do not cache navmesh when only object
 transformation is changed

This saves cache capacity when a scene contains objects contantly transforming
by scripts and causing changes in navmesh. The probability to get cache hit for
such states is almost zero because even a constant change in a single float
value may give up to 2^32 different states.
---
 components/detournavigator/asyncnavmeshupdater.cpp | 11 ++++++++++-
 components/detournavigator/makenavmesh.cpp         |  6 +++++-
 components/detournavigator/makenavmesh.hpp         |  8 +++++++-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index 11de607456..a0c9cba613 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -18,6 +18,8 @@ namespace
 {
     using DetourNavigator::ChangeType;
     using DetourNavigator::TilePosition;
+    using DetourNavigator::UpdateType;
+    using DetourNavigator::ChangeType;
 
     int getManhattanDistance(const TilePosition& lhs, const TilePosition& rhs)
     {
@@ -35,6 +37,13 @@ namespace
                     result = std::min(result, getManhattanDistance(position, tile));
         return result;
     }
+
+    UpdateType getUpdateType(ChangeType changeType) noexcept
+    {
+        if (changeType == ChangeType::update)
+            return UpdateType::Temporary;
+        return UpdateType::Persistent;
+    }
 }
 
 namespace DetourNavigator
@@ -282,7 +291,7 @@ namespace DetourNavigator
         const auto offMeshConnections = mOffMeshConnectionsManager.get().get(job.mChangedTile);
 
         const auto status = updateNavMesh(job.mAgentHalfExtents, recastMesh.get(), job.mChangedTile, playerTile,
-            offMeshConnections, mSettings, navMeshCacheItem, mNavMeshTilesCache);
+            offMeshConnections, mSettings, navMeshCacheItem, mNavMeshTilesCache, getUpdateType(job.mChangeType));
 
         if (recastMesh != nullptr)
         {
diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index 246f9d85b6..892f9c2dd2 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -506,7 +506,7 @@ namespace DetourNavigator
     UpdateNavMeshStatus updateNavMesh(const osg::Vec3f& agentHalfExtents, const RecastMesh* recastMesh,
         const TilePosition& changedTile, const TilePosition& playerTile,
         const std::vector<OffMeshConnection>& offMeshConnections, const Settings& settings,
-        const SharedNavMeshCacheItem& navMeshCacheItem, NavMeshTilesCache& navMeshTilesCache)
+        const SharedNavMeshCacheItem& navMeshCacheItem, NavMeshTilesCache& navMeshTilesCache, UpdateType updateType)
     {
         Log(Debug::Debug) << std::fixed << std::setprecision(2) <<
             "Update NavMesh with multiple tiles:" <<
@@ -562,6 +562,10 @@ namespace DetourNavigator
                 return navMeshCacheItem->lock()->removeTile(changedTile);
             }
 
+            if (updateType == UpdateType::Temporary)
+                return navMeshCacheItem->lock()->updateTile(changedTile, NavMeshTilesCache::Value(),
+                    makeNavMeshTileData(*prepared, offMeshConnections, agentHalfExtents, changedTile, settings));
+
             cachedNavMeshData = navMeshTilesCache.set(agentHalfExtents, changedTile, *recastMesh, std::move(prepared));
 
             if (!cachedNavMeshData)
diff --git a/components/detournavigator/makenavmesh.hpp b/components/detournavigator/makenavmesh.hpp
index 3e07341106..5b4169374b 100644
--- a/components/detournavigator/makenavmesh.hpp
+++ b/components/detournavigator/makenavmesh.hpp
@@ -47,10 +47,16 @@ namespace DetourNavigator
 
     NavMeshPtr makeEmptyNavMesh(const Settings& settings);
 
+    enum class UpdateType
+    {
+        Persistent,
+        Temporary
+    };
+
     UpdateNavMeshStatus updateNavMesh(const osg::Vec3f& agentHalfExtents, const RecastMesh* recastMesh,
         const TilePosition& changedTile, const TilePosition& playerTile,
         const std::vector<OffMeshConnection>& offMeshConnections, const Settings& settings,
-        const SharedNavMeshCacheItem& navMeshCacheItem, NavMeshTilesCache& navMeshTilesCache);
+        const SharedNavMeshCacheItem& navMeshCacheItem, NavMeshTilesCache& navMeshTilesCache, UpdateType updateType);
 }
 
 #endif

From 81267e7be76556f935dfde91cb9536fb1fbd9573 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Sat, 7 Aug 2021 18:04:11 -0700
Subject: [PATCH 1166/2859] add missing centroid to debug vertex shaders

---
 files/shaders/debug_vertex.glsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/shaders/debug_vertex.glsl b/files/shaders/debug_vertex.glsl
index f68c3d6459..a26d2573cf 100644
--- a/files/shaders/debug_vertex.glsl
+++ b/files/shaders/debug_vertex.glsl
@@ -2,7 +2,7 @@
 
 uniform mat4 projectionMatrix;
 
-varying vec4 passColor;
+centroid varying vec4 passColor;
 
 void main()
 {

From e88b94d0b0b19d491d566f390b97fe07b5e49df6 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Thu, 5 Aug 2021 06:26:05 +0200
Subject: [PATCH 1167/2859] Move btCollisionObject* into PtrHolder

Remove unused function
---
 apps/openmw/mwphysics/actor.cpp      |  2 +-
 apps/openmw/mwphysics/actor.hpp      |  7 -------
 apps/openmw/mwphysics/object.cpp     | 10 ----------
 apps/openmw/mwphysics/object.hpp     |  3 ---
 apps/openmw/mwphysics/projectile.hpp |  6 ------
 apps/openmw/mwphysics/ptrholder.hpp  | 11 +++++++----
 6 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index c566c3a1ed..e140141e32 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -21,7 +21,7 @@ namespace MWPhysics
 
 Actor::Actor(const MWWorld::Ptr& ptr, const Resource::BulletShape* shape, PhysicsTaskScheduler* scheduler, bool canWaterWalk)
   : mStandingOnPtr(nullptr), mCanWaterWalk(canWaterWalk), mWalkingOnWater(false)
-  , mCollisionObject(nullptr), mMeshTranslation(shape->mCollisionBox.center), mOriginalHalfExtents(shape->mCollisionBox.extents)
+  , mMeshTranslation(shape->mCollisionBox.center), mOriginalHalfExtents(shape->mCollisionBox.extents)
   , mVelocity(0,0,0), mStuckFrames(0), mLastStuckPosition{0, 0, 0}
   , mForce(0.f, 0.f, 0.f), mOnGround(true), mOnSlope(false)
   , mInternalCollisionMode(true)
diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index e52a4caca7..0846401c1d 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -132,11 +132,6 @@ namespace MWPhysics
             return mInternalCollisionMode && mOnSlope;
         }
 
-        btCollisionObject* getCollisionObject() const
-        {
-            return mCollisionObject.get();
-        }
-
         /// Sets whether this actor should be able to collide with the water surface
         void setCanWaterWalk(bool waterWalk);
 
@@ -188,8 +183,6 @@ namespace MWPhysics
         std::unique_ptr<btCollisionShape> mShape;
         btConvexShape* mConvexShape;
 
-        std::unique_ptr<btCollisionObject> mCollisionObject;
-
         osg::Vec3f mMeshTranslation;
         osg::Vec3f mOriginalHalfExtents;
         osg::Vec3f mHalfExtents;
diff --git a/apps/openmw/mwphysics/object.cpp b/apps/openmw/mwphysics/object.cpp
index 9575a97da2..a95672f8cf 100644
--- a/apps/openmw/mwphysics/object.cpp
+++ b/apps/openmw/mwphysics/object.cpp
@@ -83,16 +83,6 @@ namespace MWPhysics
         }
     }
 
-    btCollisionObject* Object::getCollisionObject()
-    {
-        return mCollisionObject.get();
-    }
-
-    const btCollisionObject* Object::getCollisionObject() const
-    {
-        return mCollisionObject.get();
-    }
-
     btTransform Object::getTransform() const
     {
         std::unique_lock<std::mutex> lock(mPositionMutex);
diff --git a/apps/openmw/mwphysics/object.hpp b/apps/openmw/mwphysics/object.hpp
index fe395dc89b..1484c1472c 100644
--- a/apps/openmw/mwphysics/object.hpp
+++ b/apps/openmw/mwphysics/object.hpp
@@ -33,8 +33,6 @@ namespace MWPhysics
         void setRotation(osg::Quat quat);
         void updatePosition();
         void commitPositionChange();
-        btCollisionObject* getCollisionObject();
-        const btCollisionObject* getCollisionObject() const;
         btTransform getTransform() const;
         /// Return solid flag. Not used by the object itself, true by default.
         bool isSolid() const;
@@ -45,7 +43,6 @@ namespace MWPhysics
         bool animateCollisionShapes();
 
     private:
-        std::unique_ptr<btCollisionObject> mCollisionObject;
         osg::ref_ptr<Resource::BulletShapeInstance> mShapeInstance;
         std::map<int, osg::NodePath> mRecIndexToNodePath;
         bool mSolid;
diff --git a/apps/openmw/mwphysics/projectile.hpp b/apps/openmw/mwphysics/projectile.hpp
index f18c455020..b5ccee4f63 100644
--- a/apps/openmw/mwphysics/projectile.hpp
+++ b/apps/openmw/mwphysics/projectile.hpp
@@ -42,11 +42,6 @@ namespace MWPhysics
         void setPosition(const osg::Vec3f& position);
         osg::Vec3f getPosition() const;
 
-        btCollisionObject* getCollisionObject() const
-        {
-            return mCollisionObject.get();
-        }
-
         bool isActive() const
         {
             return mActive.load(std::memory_order_acquire);
@@ -76,7 +71,6 @@ namespace MWPhysics
         std::unique_ptr<btCollisionShape> mShape;
         btConvexShape* mConvexShape;
 
-        std::unique_ptr<btCollisionObject> mCollisionObject;
         bool mTransformUpdatePending;
         bool mCanCrossWaterSurface;
         bool mCrossedWaterSurface;
diff --git a/apps/openmw/mwphysics/ptrholder.hpp b/apps/openmw/mwphysics/ptrholder.hpp
index 152a5d64fc..4d0238ecd9 100644
--- a/apps/openmw/mwphysics/ptrholder.hpp
+++ b/apps/openmw/mwphysics/ptrholder.hpp
@@ -2,6 +2,9 @@
 #define OPENMW_MWPHYSICS_PTRHOLDER_H
 
 #include <mutex>
+#include <memory>
+
+#include <BulletCollision/CollisionDispatch/btCollisionObject.h>
 
 #include "../mwworld/ptr.hpp"
 
@@ -10,7 +13,7 @@ namespace MWPhysics
     class PtrHolder
     {
     public:
-        virtual ~PtrHolder() {}
+        virtual ~PtrHolder() = default;
 
         void updatePtr(const MWWorld::Ptr& updated)
         {
@@ -24,14 +27,14 @@ namespace MWPhysics
             return mPtr;
         }
 
-        MWWorld::ConstPtr getPtr() const
+        btCollisionObject* getCollisionObject() const
         {
-            std::scoped_lock lock(mMutex);
-            return mPtr;
+            return mCollisionObject.get();
         }
 
     protected:
         MWWorld::Ptr mPtr;
+        std::unique_ptr<btCollisionObject> mCollisionObject;
 
     private:
         mutable std::mutex mMutex;

From 07fa1803f77efbdf5861fefd32e6a88573c38b87 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Thu, 5 Aug 2021 10:55:19 +0200
Subject: [PATCH 1168/2859] Use btCollisionObject* instead of MWWorld::Ptr
 inside of Projectile collision handling and castRay() to avoid calling
 getPtr(). It is a step forward removing the mutex inside of PtrHolder.

Do the same for DeepestNotMeContactTestResultCallback. It is used
only for not-ranged combat for now, but do it anyway for parity with all
other callback. This way, once the PtrHolder mutex is gone one will not
have to worry about wether it is safe to use the callback in a specific
context.

To avoid use-after-free with projectile / projectile collision, defer deletion of projectile.
Since instead of storing a copy of target Ptr we have a pointer to its collision object,
we can't delete projectiles until after we finished iterating over the loops.
---
 apps/openmw/mwphysics/actorconvexcallback.cpp |  6 +-
 .../closestnotmerayresultcallback.cpp         | 14 ++---
 .../deepestnotmecontacttestresultcallback.cpp |  9 +--
 apps/openmw/mwphysics/physicssystem.cpp       | 14 +----
 apps/openmw/mwphysics/projectile.cpp          | 58 ++++++++++++-------
 apps/openmw/mwphysics/projectile.hpp          | 19 +++---
 .../mwphysics/projectileconvexcallback.cpp    | 35 +++++------
 .../mwphysics/projectileconvexcallback.hpp    |  3 +-
 apps/openmw/mwworld/projectilemanager.cpp     | 16 ++++-
 9 files changed, 90 insertions(+), 84 deletions(-)

diff --git a/apps/openmw/mwphysics/actorconvexcallback.cpp b/apps/openmw/mwphysics/actorconvexcallback.cpp
index ef52e07c21..672af05058 100644
--- a/apps/openmw/mwphysics/actorconvexcallback.cpp
+++ b/apps/openmw/mwphysics/actorconvexcallback.cpp
@@ -77,10 +77,8 @@ namespace MWPhysics
             auto* projectileHolder = static_cast<Projectile*>(convexResult.m_hitCollisionObject->getUserPointer());
             if (!projectileHolder->isActive())
                 return btScalar(1);
-            auto* targetHolder = static_cast<PtrHolder*>(mMe->getUserPointer());
-            const MWWorld::Ptr target = targetHolder->getPtr();
-            if (projectileHolder->isValidTarget(target))
-                projectileHolder->hit(target, convexResult.m_hitPointLocal, convexResult.m_hitNormalLocal);
+            if (projectileHolder->isValidTarget(mMe))
+                projectileHolder->hit(mMe, convexResult.m_hitPointLocal, convexResult.m_hitNormalLocal);
             return btScalar(1);
         }
 
diff --git a/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp b/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp
index 32d97d6c75..3f6cb2b727 100644
--- a/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp
+++ b/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp
@@ -7,6 +7,7 @@
 
 #include "../mwworld/class.hpp"
 
+#include "collisiontype.hpp"
 #include "ptrholder.hpp"
 
 namespace MWPhysics
@@ -19,17 +20,14 @@ namespace MWPhysics
 
     btScalar ClosestNotMeRayResultCallback::addSingleResult(btCollisionWorld::LocalRayResult& rayResult, bool normalInWorldSpace)
     {
-        if (rayResult.m_collisionObject == mMe)
+        const auto* hitObject = rayResult.m_collisionObject;
+        if (hitObject == mMe)
             return 1.f;
 
-        if (!mTargets.empty())
+        if (hitObject->getBroadphaseHandle()->m_collisionFilterGroup == CollisionType_Actor && !mTargets.empty())
         {
-            if ((std::find(mTargets.begin(), mTargets.end(), rayResult.m_collisionObject) == mTargets.end()))
-            {
-                auto* holder = static_cast<PtrHolder*>(rayResult.m_collisionObject->getUserPointer());
-                if (holder && !holder->getPtr().isEmpty() && holder->getPtr().getClass().isActor())
-                    return 1.f;
-            }
+            if ((std::find(mTargets.begin(), mTargets.end(), hitObject) == mTargets.end()))
+                return 1.f;
         }
 
         return btCollisionWorld::ClosestRayResultCallback::addSingleResult(rayResult, normalInWorldSpace);
diff --git a/apps/openmw/mwphysics/deepestnotmecontacttestresultcallback.cpp b/apps/openmw/mwphysics/deepestnotmecontacttestresultcallback.cpp
index 7744af14b5..3531cc8eb8 100644
--- a/apps/openmw/mwphysics/deepestnotmecontacttestresultcallback.cpp
+++ b/apps/openmw/mwphysics/deepestnotmecontacttestresultcallback.cpp
@@ -6,6 +6,7 @@
 
 #include "../mwworld/class.hpp"
 
+#include "collisiontype.hpp"
 #include "ptrholder.hpp"
 
 namespace MWPhysics
@@ -23,14 +24,10 @@ namespace MWPhysics
         const btCollisionObject* collisionObject = col1Wrap->m_collisionObject;
         if (collisionObject != mMe)
         {
-            if (!mTargets.empty())
+            if (collisionObject->getBroadphaseHandle()->m_collisionFilterGroup == CollisionType_Actor && !mTargets.empty())
             {
                 if ((std::find(mTargets.begin(), mTargets.end(), collisionObject) == mTargets.end()))
-                {
-                    PtrHolder* holder = static_cast<PtrHolder*>(collisionObject->getUserPointer());
-                    if (holder && !holder->getPtr().isEmpty() && holder->getPtr().getClass().isActor())
-                        return 0.f;
-                }
+                    return 0.f;
             }
 
             btScalar distsqr = mOrigin.distance2(cp.getPositionWorldOnA());
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index f8862ea400..45120d15b2 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -635,19 +635,7 @@ namespace MWPhysics
         if (btFrom == btTo)
             return;
 
-        const auto casterPtr = projectile->getCaster();
-        const auto* caster = [this,&casterPtr]() -> const btCollisionObject*
-        {
-            const Actor* actor = getActor(casterPtr);
-            if (actor)
-                return actor->getCollisionObject();
-            const Object* object = getObject(casterPtr);
-            if (object)
-                return object->getCollisionObject();
-            return nullptr;
-        }();
-
-        ProjectileConvexCallback resultCallback(caster, btFrom, btTo, projectile);
+        ProjectileConvexCallback resultCallback(projectile->getCasterCollisionObject(), projectile->getCollisionObject(), btFrom, btTo, projectile);
         resultCallback.m_collisionFilterMask = 0xff;
         resultCallback.m_collisionFilterGroup = CollisionType_Projectile;
 
diff --git a/apps/openmw/mwphysics/projectile.cpp b/apps/openmw/mwphysics/projectile.cpp
index 1a94de01ee..a8bb444956 100644
--- a/apps/openmw/mwphysics/projectile.cpp
+++ b/apps/openmw/mwphysics/projectile.cpp
@@ -7,8 +7,10 @@
 
 #include "../mwworld/class.hpp"
 
+#include "actor.hpp"
 #include "collisiontype.hpp"
 #include "mtphysics.hpp"
+#include "object.hpp"
 #include "projectile.hpp"
 
 namespace MWPhysics
@@ -17,7 +19,7 @@ Projectile::Projectile(const MWWorld::Ptr& caster, const osg::Vec3f& position, f
     : mCanCrossWaterSurface(canCrossWaterSurface)
     , mCrossedWaterSurface(false)
     , mActive(true)
-    , mCaster(caster)
+    , mHitTarget(nullptr)
     , mWaterHitPosition(std::nullopt)
     , mPhysics(physicssystem)
     , mTaskScheduler(scheduler)
@@ -32,6 +34,7 @@ Projectile::Projectile(const MWWorld::Ptr& caster, const osg::Vec3f& position, f
     mCollisionObject->setUserPointer(this);
 
     setPosition(position);
+    setCaster(caster);
 
     const int collisionMask = CollisionType_World | CollisionType_HeightMap |
         CollisionType_Actor | CollisionType_Door | CollisionType_Water | CollisionType_Projectile;
@@ -77,54 +80,67 @@ bool Projectile::canTraverseWater() const
     return mCanCrossWaterSurface;
 }
 
-void Projectile::hit(const MWWorld::Ptr& target, btVector3 pos, btVector3 normal)
+void Projectile::hit(const btCollisionObject* target, btVector3 pos, btVector3 normal)
 {
-    if (!mActive.load(std::memory_order_acquire))
+    bool active = true;
+    if (!mActive.compare_exchange_strong(active, false, std::memory_order_relaxed) || !active)
         return;
-    std::scoped_lock lock(mMutex);
     mHitTarget = target;
     mHitPosition = pos;
     mHitNormal = normal;
-    mActive.store(false, std::memory_order_release);
+}
+
+MWWorld::Ptr Projectile::getTarget() const
+{
+    assert(!mActive);
+    auto* target = static_cast<PtrHolder*>(mHitTarget->getUserPointer());
+    return target ? target->getPtr() : MWWorld::Ptr();
 }
 
 MWWorld::Ptr Projectile::getCaster() const
 {
-    std::scoped_lock lock(mMutex);
     return mCaster;
 }
 
 void Projectile::setCaster(const MWWorld::Ptr& caster)
 {
-    std::scoped_lock lock(mMutex);
     mCaster = caster;
+    mCasterColObj = [this,&caster]() -> const btCollisionObject*
+    {
+        const Actor* actor = mPhysics->getActor(caster);
+        if (actor)
+            return actor->getCollisionObject();
+        const Object* object = mPhysics->getObject(caster);
+        if (object)
+            return object->getCollisionObject();
+        return nullptr;
+    }();
 }
 
 void Projectile::setValidTargets(const std::vector<MWWorld::Ptr>& targets)
 {
     std::scoped_lock lock(mMutex);
-    mValidTargets = targets;
+    mValidTargets.clear();
+    for (const auto& ptr : targets)
+    {
+        const auto* physicActor = mPhysics->getActor(ptr);
+        if (physicActor)
+            mValidTargets.push_back(physicActor->getCollisionObject());
+    }
 }
 
-bool Projectile::isValidTarget(const MWWorld::Ptr& target) const
+bool Projectile::isValidTarget(const btCollisionObject* target) const
 {
+    assert(target);
     std::scoped_lock lock(mMutex);
-    if (mCaster == target)
+    if (mCasterColObj == target)
         return false;
 
-    if (target.isEmpty() || mValidTargets.empty())
+    if (mValidTargets.empty())
         return true;
 
-    bool validTarget = false;
-    for (const auto& targetActor : mValidTargets)
-    {
-        if (targetActor == target)
-        {
-            validTarget = true;
-            break;
-        }
-    }
-    return validTarget;
+    return std::any_of(mValidTargets.begin(), mValidTargets.end(),
+            [target](const btCollisionObject* actor) { return target == actor; });
 }
 
 std::optional<btVector3> Projectile::getWaterHitPosition()
diff --git a/apps/openmw/mwphysics/projectile.hpp b/apps/openmw/mwphysics/projectile.hpp
index b5ccee4f63..dd659b6581 100644
--- a/apps/openmw/mwphysics/projectile.hpp
+++ b/apps/openmw/mwphysics/projectile.hpp
@@ -47,21 +47,21 @@ namespace MWPhysics
             return mActive.load(std::memory_order_acquire);
         }
 
-        MWWorld::Ptr getTarget() const
-        {
-            assert(!mActive);
-            return mHitTarget;
-        }
+        MWWorld::Ptr getTarget() const;
 
         MWWorld::Ptr getCaster() const;
         void setCaster(const MWWorld::Ptr& caster);
+        const btCollisionObject* getCasterCollisionObject() const
+        {
+            return mCasterColObj;
+        }
 
         bool canTraverseWater() const;
 
-        void hit(const MWWorld::Ptr& target, btVector3 pos, btVector3 normal);
+        void hit(const btCollisionObject* target, btVector3 pos, btVector3 normal);
 
         void setValidTargets(const std::vector<MWWorld::Ptr>& targets);
-        bool isValidTarget(const MWWorld::Ptr& target) const;
+        bool isValidTarget(const btCollisionObject* target) const;
 
         std::optional<btVector3> getWaterHitPosition();
         void setWaterHitPosition(btVector3 pos);
@@ -76,13 +76,14 @@ namespace MWPhysics
         bool mCrossedWaterSurface;
         std::atomic<bool> mActive;
         MWWorld::Ptr mCaster;
-        MWWorld::Ptr mHitTarget;
+        const btCollisionObject* mCasterColObj;
+        const btCollisionObject* mHitTarget;
         std::optional<btVector3> mWaterHitPosition;
         osg::Vec3f mPosition;
         btVector3 mHitPosition;
         btVector3 mHitNormal;
 
-        std::vector<MWWorld::Ptr> mValidTargets;
+        std::vector<const btCollisionObject*> mValidTargets;
 
         mutable std::mutex mMutex;
 
diff --git a/apps/openmw/mwphysics/projectileconvexcallback.cpp b/apps/openmw/mwphysics/projectileconvexcallback.cpp
index b803c4400b..687253e1cc 100644
--- a/apps/openmw/mwphysics/projectileconvexcallback.cpp
+++ b/apps/openmw/mwphysics/projectileconvexcallback.cpp
@@ -1,3 +1,5 @@
+#include <BulletCollision/CollisionDispatch/btCollisionObject.h>
+
 #include "../mwworld/class.hpp"
 
 #include "actor.hpp"
@@ -8,41 +10,41 @@
 
 namespace MWPhysics
 {
-    ProjectileConvexCallback::ProjectileConvexCallback(const btCollisionObject* me, const btVector3& from, const btVector3& to, Projectile* proj)
+    ProjectileConvexCallback::ProjectileConvexCallback(const btCollisionObject* caster, const btCollisionObject* me, const btVector3& from, const btVector3& to, Projectile* proj)
         : btCollisionWorld::ClosestConvexResultCallback(from, to)
-        , mMe(me), mProjectile(proj)
+        , mCaster(caster)
+        , mMe(me)
+        , mProjectile(proj)
     {
         assert(mProjectile);
     }
 
     btScalar ProjectileConvexCallback::addSingleResult(btCollisionWorld::LocalConvexResult& result, bool normalInWorldSpace)
     {
+        const auto* hitObject = result.m_hitCollisionObject;
         // don't hit the caster
-        if (result.m_hitCollisionObject == mMe)
+        if (hitObject == mCaster)
             return 1.f;
 
         // don't hit the projectile
-        if (result.m_hitCollisionObject == mProjectile->getCollisionObject())
+        if (hitObject == mMe)
             return 1.f;
 
         btCollisionWorld::ClosestConvexResultCallback::addSingleResult(result, normalInWorldSpace);
-        switch (result.m_hitCollisionObject->getBroadphaseHandle()->m_collisionFilterGroup)
+        switch (hitObject->getBroadphaseHandle()->m_collisionFilterGroup)
         {
             case CollisionType_Actor:
                 {
-                    auto* target = static_cast<Actor*>(result.m_hitCollisionObject->getUserPointer());
-                    if (!mProjectile->isValidTarget(target->getPtr()))
+                    if (!mProjectile->isValidTarget(hitObject))
                         return 1.f;
-                    mProjectile->hit(target->getPtr(), result.m_hitPointLocal, result.m_hitNormalLocal);
                     break;
                 }
             case CollisionType_Projectile:
                 {
-                    auto* target = static_cast<Projectile*>(result.m_hitCollisionObject->getUserPointer());
-                    if (!mProjectile->isValidTarget(target->getCaster()))
+                    auto* target = static_cast<Projectile*>(hitObject->getUserPointer());
+                    if (!mProjectile->isValidTarget(target->getCasterCollisionObject()))
                         return 1.f;
-                    target->hit(mProjectile->getPtr(), m_hitPointWorld, m_hitNormalWorld);
-                    mProjectile->hit(target->getPtr(), m_hitPointWorld, m_hitNormalWorld);
+                    target->hit(mMe, m_hitPointWorld, m_hitNormalWorld);
                     break;
                 }
             case CollisionType_Water:
@@ -50,17 +52,10 @@ namespace MWPhysics
                     mProjectile->setWaterHitPosition(m_hitPointWorld);
                     if (mProjectile->canTraverseWater())
                         return 1.f;
-                    mProjectile->hit(MWWorld::Ptr(), m_hitPointWorld, m_hitNormalWorld);
-                    break;
-                }
-            default:
-                {
-                    auto* target = static_cast<PtrHolder*>(result.m_hitCollisionObject->getUserPointer());
-                    auto ptr = target ? target->getPtr() : MWWorld::Ptr();
-                    mProjectile->hit(ptr, m_hitPointWorld, m_hitNormalWorld);
                     break;
                 }
         }
+        mProjectile->hit(hitObject, m_hitPointWorld, m_hitNormalWorld);
 
         return result.m_hitFraction;
     }
diff --git a/apps/openmw/mwphysics/projectileconvexcallback.hpp b/apps/openmw/mwphysics/projectileconvexcallback.hpp
index 96c84b1fe2..f35cfbd3c8 100644
--- a/apps/openmw/mwphysics/projectileconvexcallback.hpp
+++ b/apps/openmw/mwphysics/projectileconvexcallback.hpp
@@ -12,11 +12,12 @@ namespace MWPhysics
     class ProjectileConvexCallback : public btCollisionWorld::ClosestConvexResultCallback
     {
     public:
-        ProjectileConvexCallback(const btCollisionObject* me, const btVector3& from, const btVector3& to, Projectile* proj);
+        ProjectileConvexCallback(const btCollisionObject* caster, const btCollisionObject* me, const btVector3& from, const btVector3& to, Projectile* proj);
 
         btScalar addSingleResult(btCollisionWorld::LocalConvexResult& result, bool normalInWorldSpace) override;
 
     private:
+        const btCollisionObject* mCaster;
         const btCollisionObject* mMe;
         Projectile* mProjectile;
     };
diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index 04f4573369..76c6ca7548 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -521,7 +521,7 @@ namespace MWWorld
             }
 
             MWMechanics::projectileHit(caster, target, bow, projectileRef.getPtr(), pos, projectileState.mAttackStrength);
-            cleanupProjectile(projectileState);
+            projectileState.mToDelete = true;
         }
         for (auto& magicBoltState : mMagicBolts)
         {
@@ -550,7 +550,19 @@ namespace MWWorld
             cast.inflict(target, caster, magicBoltState.mEffects, ESM::RT_Target, false, true);
 
             MWBase::Environment::get().getWorld()->explodeSpell(pos, magicBoltState.mEffects, caster, target, ESM::RT_Target, magicBoltState.mSpellId, magicBoltState.mSourceName);
-            cleanupMagicBolt(magicBoltState);
+            magicBoltState.mToDelete = true;
+        }
+
+        for (auto& projectileState : mProjectiles)
+        {
+            if (projectileState.mToDelete)
+                cleanupProjectile(projectileState);
+        }
+
+        for (auto& magicBoltState : mMagicBolts)
+        {
+            if (magicBoltState.mToDelete)
+                cleanupMagicBolt(magicBoltState);
         }
         mProjectiles.erase(std::remove_if(mProjectiles.begin(), mProjectiles.end(), [](const State& state) { return state.mToDelete; }),
                 mProjectiles.end());

From ee09f3095f84bccb2c6135102dfb34570c653efd Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Thu, 5 Aug 2021 14:21:56 +0200
Subject: [PATCH 1169/2859] At last kill PtrHolder mutex

---
 apps/openmw/mwphysics/ptrholder.hpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/apps/openmw/mwphysics/ptrholder.hpp b/apps/openmw/mwphysics/ptrholder.hpp
index 4d0238ecd9..e84f3d1cfe 100644
--- a/apps/openmw/mwphysics/ptrholder.hpp
+++ b/apps/openmw/mwphysics/ptrholder.hpp
@@ -17,13 +17,11 @@ namespace MWPhysics
 
         void updatePtr(const MWWorld::Ptr& updated)
         {
-            std::scoped_lock lock(mMutex);
             mPtr = updated;
         }
 
         MWWorld::Ptr getPtr()
         {
-            std::scoped_lock lock(mMutex);
             return mPtr;
         }
 
@@ -35,9 +33,6 @@ namespace MWPhysics
     protected:
         MWWorld::Ptr mPtr;
         std::unique_ptr<btCollisionObject> mCollisionObject;
-
-    private:
-        mutable std::mutex mMutex;
     };
 }
 

From b4dd9e6b4d20ad949c1832cc950adb552aab8e2c Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sun, 8 Aug 2021 17:19:18 +0200
Subject: [PATCH 1170/2859] Avoid division by zero in movementsolver when an
 actor is immobile and in a storm

---
 apps/openmw/mwphysics/movementsolver.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwphysics/movementsolver.cpp b/apps/openmw/mwphysics/movementsolver.cpp
index 2401f78367..df9239dd83 100644
--- a/apps/openmw/mwphysics/movementsolver.cpp
+++ b/apps/openmw/mwphysics/movementsolver.cpp
@@ -163,7 +163,7 @@ namespace MWPhysics
         }
 
         // Now that we have the effective movement vector, apply wind forces to it
-        if (worldData.mIsInStorm)
+        if (worldData.mIsInStorm && velocity.length() > 0)
         {
             osg::Vec3f stormDirection = worldData.mStormDirection;
             float angleDegrees = osg::RadiansToDegrees(std::acos(stormDirection * velocity / (stormDirection.length() * velocity.length())));

From 8b4c2d205dc39aa7e02c36000675e99fe51862d6 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Tue, 23 Mar 2021 22:40:19 +0000
Subject: [PATCH 1171/2859] WIP-ish glPolygonOffset for Bullet debug geometry

---
 apps/openmw/mwrender/bulletdebugdraw.cpp | 126 ++++++++++++++++-------
 apps/openmw/mwrender/bulletdebugdraw.hpp |  13 ++-
 2 files changed, 99 insertions(+), 40 deletions(-)

diff --git a/apps/openmw/mwrender/bulletdebugdraw.cpp b/apps/openmw/mwrender/bulletdebugdraw.cpp
index b008ebc6d9..a6081936d2 100644
--- a/apps/openmw/mwrender/bulletdebugdraw.cpp
+++ b/apps/openmw/mwrender/bulletdebugdraw.cpp
@@ -8,7 +8,9 @@
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/convert.hpp>
+#include <components/sceneutil/util.hpp>
 #include <osg/PolygonMode>
+#include <osg/PolygonOffset>
 #include <osg/ShapeDrawable>
 #include <osg/StateSet>
 
@@ -33,50 +35,68 @@ DebugDrawer::DebugDrawer(osg::ref_ptr<osg::Group> parentNode, btCollisionWorld *
 
 void DebugDrawer::createGeometry()
 {
-    if (!mGeometry)
+    if (!mLinesGeometry)
     {
-        mGeometry = new osg::Geometry;
-        mGeometry->setNodeMask(Mask_Debug);
+        mLinesGeometry = new osg::Geometry;
+        mTrisGeometry = new osg::Geometry;
+        mLinesGeometry->setNodeMask(Mask_Debug);
+        mTrisGeometry->setNodeMask(Mask_Debug);
 
-        mVertices = new osg::Vec3Array;
-        mColors = new osg::Vec4Array;
+        mLinesVertices = new osg::Vec3Array;
+        mTrisVertices = new osg::Vec3Array;
+        mLinesColors = new osg::Vec4Array;
 
-        mDrawArrays = new osg::DrawArrays(osg::PrimitiveSet::LINES);
+        mLinesDrawArrays = new osg::DrawArrays(osg::PrimitiveSet::LINES);
+        mTrisDrawArrays = new osg::DrawArrays(osg::PrimitiveSet::TRIANGLES);
 
-        mGeometry->setUseDisplayList(false);
-        mGeometry->setVertexArray(mVertices);
-        mGeometry->setColorArray(mColors);
-        mGeometry->setColorBinding(osg::Geometry::BIND_PER_VERTEX);
-        mGeometry->setDataVariance(osg::Object::DYNAMIC);
-        mGeometry->addPrimitiveSet(mDrawArrays);
+        mLinesGeometry->setUseDisplayList(false);
+        mLinesGeometry->setVertexArray(mLinesVertices);
+        mLinesGeometry->setColorArray(mLinesColors);
+        mLinesGeometry->setColorBinding(osg::Geometry::BIND_PER_VERTEX);
+        mLinesGeometry->setDataVariance(osg::Object::DYNAMIC);
+        mLinesGeometry->addPrimitiveSet(mLinesDrawArrays);
 
-        osg::ref_ptr<osg::Material> material = new osg::Material;
-        material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
-        mGeometry->getOrCreateStateSet()->setAttribute(material);
+        mTrisGeometry->setUseDisplayList(false);
+        mTrisGeometry->setVertexArray(mTrisVertices);
+        mTrisGeometry->setDataVariance(osg::Object::DYNAMIC);
+        mTrisGeometry->addPrimitiveSet(mTrisDrawArrays);
 
-        mParentNode->addChild(mGeometry);
+        mParentNode->addChild(mLinesGeometry);
+        mParentNode->addChild(mTrisGeometry);
 
         auto* stateSet = new osg::StateSet;
         stateSet->setAttributeAndModes(new osg::PolygonMode(osg::PolygonMode::FRONT_AND_BACK, osg::PolygonMode::LINE), osg::StateAttribute::ON);
+        stateSet->setAttributeAndModes(new osg::PolygonOffset(SceneUtil::getReverseZ() ? 1.0 : -1.0, SceneUtil::getReverseZ() ? 1.0 : -1.0));
+        osg::ref_ptr<osg::Material> material = new osg::Material;
+        material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
+        stateSet->setAttribute(material);
+        mTrisGeometry->setStateSet(stateSet);
         mShapesRoot = new osg::Group;
         mShapesRoot->setStateSet(stateSet);
         mShapesRoot->setDataVariance(osg::Object::DYNAMIC);
         mShapesRoot->setNodeMask(Mask_Debug);
         mParentNode->addChild(mShapesRoot);
 
-        MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(mGeometry, "debug");
+        MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(mLinesGeometry, "debug");
+        MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(mTrisGeometry, "debug");
+        MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(mShapesRoot, "debug");
     }
 }
 
 void DebugDrawer::destroyGeometry()
 {
-    if (mGeometry)
+    if (mLinesGeometry)
     {
-        mParentNode->removeChild(mGeometry);
+        mParentNode->removeChild(mLinesGeometry);
+        mParentNode->removeChild(mTrisGeometry);
         mParentNode->removeChild(mShapesRoot);
-        mGeometry = nullptr;
-        mVertices = nullptr;
-        mDrawArrays = nullptr;
+        mLinesGeometry = nullptr;
+        mLinesVertices = nullptr;
+        mLinesColors = nullptr;
+        mLinesDrawArrays = nullptr;
+        mTrisGeometry = nullptr;
+        mTrisVertices = nullptr;
+        mTrisDrawArrays = nullptr;
     }
 }
 
@@ -89,24 +109,58 @@ void DebugDrawer::step()
 {
     if (mDebugOn)
     {
-        mVertices->clear();
-        mColors->clear();
+        mLinesVertices->clear();
+        mTrisVertices->clear();
+        mLinesColors->clear();
         mShapesRoot->removeChildren(0, mShapesRoot->getNumChildren());
         mWorld->debugDrawWorld();
         showCollisions();
-        mDrawArrays->setCount(mVertices->size());
-        mVertices->dirty();
-        mColors->dirty();
-        mGeometry->dirtyBound();
+        mLinesDrawArrays->setCount(mLinesVertices->size());
+        mTrisDrawArrays->setCount(mTrisVertices->size());
+        mLinesVertices->dirty();
+        mTrisVertices->dirty();
+        mLinesColors->dirty();
+        mLinesGeometry->dirtyBound();
+        mTrisGeometry->dirtyBound();
     }
 }
 
 void DebugDrawer::drawLine(const btVector3 &from, const btVector3 &to, const btVector3 &color)
 {
-    mVertices->push_back(Misc::Convert::toOsg(from));
-    mVertices->push_back(Misc::Convert::toOsg(to));
-    mColors->push_back({1,1,1,1});
-    mColors->push_back({1,1,1,1});
+    mLinesVertices->push_back(Misc::Convert::toOsg(from));
+    mLinesVertices->push_back(Misc::Convert::toOsg(to));
+    mLinesColors->push_back({1,1,1,1});
+    mLinesColors->push_back({1,1,1,1});
+
+    size_t size = mLinesVertices->size();
+    if (size >= 6
+        && (*mLinesVertices)[size - 1] == (*mLinesVertices)[size - 6]
+        && (*mLinesVertices)[size - 2] == (*mLinesVertices)[size - 3]
+        && (*mLinesVertices)[size - 4] == (*mLinesVertices)[size - 5])
+    {
+        mTrisVertices->push_back(mLinesVertices->back());
+        mLinesVertices->pop_back();
+        mLinesColors->pop_back();
+        mTrisVertices->push_back(mLinesVertices->back());
+        mLinesVertices->pop_back();
+        mLinesColors->pop_back();
+        mLinesVertices->pop_back();
+        mLinesColors->pop_back();
+        mTrisVertices->push_back(mLinesVertices->back());
+        mLinesVertices->pop_back();
+        mLinesColors->pop_back();
+        mLinesVertices->pop_back();
+        mLinesColors->pop_back();
+        mLinesVertices->pop_back();
+        mLinesColors->pop_back();
+    }
+}
+
+void DebugDrawer::drawTriangle(const btVector3& v0, const btVector3& v1, const btVector3& v2, const btVector3& color, btScalar)
+{
+    mTrisVertices->push_back(Misc::Convert::toOsg(v0));
+    mTrisVertices->push_back(Misc::Convert::toOsg(v1));
+    mTrisVertices->push_back(Misc::Convert::toOsg(v2));
 }
 
 void DebugDrawer::addCollision(const btVector3& orig, const btVector3& normal)
@@ -121,10 +175,10 @@ void DebugDrawer::showCollisions()
     {
         if (now - created < std::chrono::seconds(2))
         {
-            mVertices->push_back(Misc::Convert::toOsg(from));
-            mVertices->push_back(Misc::Convert::toOsg(to));
-            mColors->push_back({1,0,0,1});
-            mColors->push_back({1,0,0,1});
+            mLinesVertices->push_back(Misc::Convert::toOsg(from));
+            mLinesVertices->push_back(Misc::Convert::toOsg(to));
+            mLinesColors->push_back({1,0,0,1});
+            mLinesColors->push_back({1,0,0,1});
         }
     }
     mCollisionViews.erase(std::remove_if(mCollisionViews.begin(), mCollisionViews.end(),
diff --git a/apps/openmw/mwrender/bulletdebugdraw.hpp b/apps/openmw/mwrender/bulletdebugdraw.hpp
index b24640427d..cea5794ba7 100644
--- a/apps/openmw/mwrender/bulletdebugdraw.hpp
+++ b/apps/openmw/mwrender/bulletdebugdraw.hpp
@@ -37,10 +37,13 @@ private:
 protected:
     osg::ref_ptr<osg::Group> mParentNode;
     btCollisionWorld *mWorld;
-    osg::ref_ptr<osg::Geometry> mGeometry;
-    osg::ref_ptr<osg::Vec3Array> mVertices;
-    osg::ref_ptr<osg::Vec4Array> mColors;
-    osg::ref_ptr<osg::DrawArrays> mDrawArrays;
+    osg::ref_ptr<osg::Geometry> mLinesGeometry;
+    osg::ref_ptr<osg::Geometry> mTrisGeometry;
+    osg::ref_ptr<osg::Vec3Array> mLinesVertices;
+    osg::ref_ptr<osg::Vec3Array> mTrisVertices;
+    osg::ref_ptr<osg::Vec4Array> mLinesColors;
+    osg::ref_ptr<osg::DrawArrays> mLinesDrawArrays;
+    osg::ref_ptr<osg::DrawArrays> mTrisDrawArrays;
 
     bool mDebugOn;
 
@@ -56,6 +59,8 @@ public:
 
     void drawLine(const btVector3& from,const btVector3& to,const btVector3& color) override;
 
+    void drawTriangle(const btVector3& v0, const btVector3& v1, const btVector3& v2, const btVector3& color, btScalar) override;
+
     void addCollision(const btVector3& orig, const btVector3& normal);
 
     void showCollisions();

From cf15803e67aeb53f2aa96bfc7c59862221c92c00 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Sat, 15 May 2021 21:26:42 +0100
Subject: [PATCH 1172/2859] Disable triangle detection workaround when Bullet
 actually uses triangles

---
 apps/openmw/mwrender/bulletdebugdraw.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/openmw/mwrender/bulletdebugdraw.cpp b/apps/openmw/mwrender/bulletdebugdraw.cpp
index a6081936d2..bf56e9a330 100644
--- a/apps/openmw/mwrender/bulletdebugdraw.cpp
+++ b/apps/openmw/mwrender/bulletdebugdraw.cpp
@@ -132,6 +132,7 @@ void DebugDrawer::drawLine(const btVector3 &from, const btVector3 &to, const btV
     mLinesColors->push_back({1,1,1,1});
     mLinesColors->push_back({1,1,1,1});
 
+#if BT_BULLET_VERSION < 317
     size_t size = mLinesVertices->size();
     if (size >= 6
         && (*mLinesVertices)[size - 1] == (*mLinesVertices)[size - 6]
@@ -154,6 +155,7 @@ void DebugDrawer::drawLine(const btVector3 &from, const btVector3 &to, const btV
         mLinesVertices->pop_back();
         mLinesColors->pop_back();
     }
+#endif
 }
 
 void DebugDrawer::drawTriangle(const btVector3& v0, const btVector3& v1, const btVector3& v2, const btVector3& color, btScalar)

From 8d93748f87eb9088b0b413fd9389809dd9de2b6b Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Sun, 8 Aug 2021 17:25:57 +0100
Subject: [PATCH 1173/2859] Fix rebase issue

---
 apps/openmw/mwrender/bulletdebugdraw.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/openmw/mwrender/bulletdebugdraw.cpp b/apps/openmw/mwrender/bulletdebugdraw.cpp
index bf56e9a330..9155132871 100644
--- a/apps/openmw/mwrender/bulletdebugdraw.cpp
+++ b/apps/openmw/mwrender/bulletdebugdraw.cpp
@@ -70,6 +70,7 @@ void DebugDrawer::createGeometry()
         osg::ref_ptr<osg::Material> material = new osg::Material;
         material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
         stateSet->setAttribute(material);
+        mLinesGeometry->setStateSet(stateSet);
         mTrisGeometry->setStateSet(stateSet);
         mShapesRoot = new osg::Group;
         mShapesRoot->setStateSet(stateSet);

From c1e50f530b6b7c229864b20ab26be284e3edec42 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sat, 7 Aug 2021 12:40:08 +0200
Subject: [PATCH 1174/2859] Calls directly MovementSolver::traceDown instead of
 PhysicsSystem::traceDown before inserting into mActors.

The latter does nothing until the actor is inserted into mActors.
We can't move the call after the insertion either because then
the actor is part of the simulation, and we'd have a race.
---
 apps/openmw/mwphysics/physicssystem.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index f8862ea400..0afeb2d622 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -725,8 +725,7 @@ namespace MWPhysics
         auto actor = std::make_shared<Actor>(ptr, shape, mTaskScheduler.get(), canWaterWalk);
         
         // check if Actor is on the ground or in the air
-        traceDown(ptr, ptr.getRefData().getPosition().asVec3(), 10.f);
-
+        MovementSolver::traceDown(ptr, ptr.getRefData().getPosition().asVec3(), actor.get(), mCollisionWorld.get(), 10);
         mActors.emplace(ptr, std::move(actor));
     }
 

From 586d8684d00d28b6e645f3df3b5d6dc871afbce4 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Mon, 9 Aug 2021 12:43:30 +0200
Subject: [PATCH 1175/2859] Fix two coverity issues about uninitialised
 variables

---
 apps/openmw/mwphysics/physicssystem.cpp | 1 +
 components/resource/scenemanager.cpp    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 602f95104f..bec273daaf 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -996,6 +996,7 @@ namespace MWPhysics
         , mWaterCollision(waterCollision)
         , mSkipCollisionDetection(actor.skipCollisions() || !actor.getCollisionMode())
         , mNeedLand(false)
+        , mStuckFrames(0)
     {
     }
 
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index ffcd4c3308..974ae6a7fd 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -237,6 +237,7 @@ namespace Resource
         , mMaxAnisotropy(1)
         , mUnRefImageDataAfterApply(false)
         , mParticleSystemMask(~0u)
+        , mDepthFormat(0)
     {
     }
 

From 8e3984ae5a2cf0f5361a833b7f83afa24b1275c3 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Mon, 9 Aug 2021 14:46:41 +0200
Subject: [PATCH 1176/2859] Clear mActors when reseting the simulation.
 Otherwise during next run we can try to read past the end of
 mActorsFrameData.

---
 apps/openmw/mwphysics/mtphysics.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 41cec6facc..e9bedcbc75 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -279,6 +279,7 @@ namespace MWPhysics
         std::unique_lock lock(mSimulationMutex);
         mBudget.reset(mDefaultPhysicsDt);
         mAsyncBudget.reset(0.0f);
+        mActors.clear();
         mActorsFrameData.clear();
         for (const auto& [_, actor] : actors)
         {

From a6260453ea91b32e37893df38c2ac0108bb18f68 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 1 Jul 2021 19:00:22 +0200
Subject: [PATCH 1177/2859] Add missing initialization

---
 components/detournavigator/navmeshdata.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/detournavigator/navmeshdata.hpp b/components/detournavigator/navmeshdata.hpp
index 501e971cba..6e400af3bc 100644
--- a/components/detournavigator/navmeshdata.hpp
+++ b/components/detournavigator/navmeshdata.hpp
@@ -20,7 +20,7 @@ namespace DetourNavigator
     struct NavMeshData
     {
         NavMeshDataValue mValue;
-        int mSize;
+        int mSize = 0;
 
         NavMeshData() = default;
 

From 0985d8e03dda74ff011ec72af480ecf7caf850ef Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 3 Jul 2021 04:08:03 +0200
Subject: [PATCH 1178/2859] Handle failed NavMesh allocation

---
 components/detournavigator/makenavmesh.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index 892f9c2dd2..3f133f5033 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -495,6 +495,10 @@ namespace DetourNavigator
         params.maxPolys = 1 << polysBits;
 
         NavMeshPtr navMesh(dtAllocNavMesh(), &dtFreeNavMesh);
+
+        if (navMesh == nullptr)
+            throw NavigatorException("Failed to allocate navmesh");
+
         const auto status = navMesh->init(&params);
 
         if (!dtStatusSucceed(status))

From 94e71d9b148c83c85f60e3b8d64ad3206cb03f3a Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 7 Aug 2021 15:51:08 +0200
Subject: [PATCH 1179/2859] Avoid division by zero

---
 components/detournavigator/navmeshtilescache.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/detournavigator/navmeshtilescache.cpp b/components/detournavigator/navmeshtilescache.cpp
index 4710a0a4f6..3d595f13a8 100644
--- a/components/detournavigator/navmeshtilescache.cpp
+++ b/components/detournavigator/navmeshtilescache.cpp
@@ -85,7 +85,8 @@ namespace DetourNavigator
         out.setAttribute(frameNumber, "NavMesh CacheSize", stats.mNavMeshCacheSize);
         out.setAttribute(frameNumber, "NavMesh UsedTiles", stats.mUsedNavMeshTiles);
         out.setAttribute(frameNumber, "NavMesh CachedTiles", stats.mCachedNavMeshTiles);
-        out.setAttribute(frameNumber, "NavMesh CacheHitRate", static_cast<double>(stats.mHitCount) / stats.mGetCount * 100.0);
+        if (stats.mGetCount > 0)
+            out.setAttribute(frameNumber, "NavMesh CacheHitRate", static_cast<double>(stats.mHitCount) / stats.mGetCount * 100.0);
     }
 
     void NavMeshTilesCache::removeLeastRecentlyUsed()

From b27de8f1888b643fb6bf1665ac3f8b87b41c73a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Mocquillon?= <cedric.mocquillon@gmail.com>
Date: Sun, 8 Aug 2021 12:09:40 +0200
Subject: [PATCH 1180/2859] Disable zooming when setting is off

---
 apps/openmw/mwgui/mapwindow.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index efb434d3bc..9f7cfc73e6 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -791,14 +791,17 @@ namespace MWGui
         getWidget(mEventBoxGlobal, "EventBoxGlobal");
         mEventBoxGlobal->eventMouseDrag += MyGUI::newDelegate(this, &MapWindow::onMouseDrag);
         mEventBoxGlobal->eventMouseButtonPressed += MyGUI::newDelegate(this, &MapWindow::onDragStart);
-        mEventBoxGlobal->eventMouseWheel += MyGUI::newDelegate(this, &MapWindow::onMapZoomed);
+        const bool allowZooming = Settings::Manager::getBool("allow zooming", "Map");
+        if(allowZooming)
+            mEventBoxGlobal->eventMouseWheel += MyGUI::newDelegate(this, &MapWindow::onMapZoomed);
         mEventBoxGlobal->setDepth(Global_ExploreOverlayLayer);
 
         getWidget(mEventBoxLocal, "EventBoxLocal");
         mEventBoxLocal->eventMouseDrag += MyGUI::newDelegate(this, &MapWindow::onMouseDrag);
         mEventBoxLocal->eventMouseButtonPressed += MyGUI::newDelegate(this, &MapWindow::onDragStart);
         mEventBoxLocal->eventMouseButtonDoubleClick += MyGUI::newDelegate(this, &MapWindow::onMapDoubleClicked);
-        mEventBoxLocal->eventMouseWheel += MyGUI::newDelegate(this, &MapWindow::onMapZoomed);
+        if (allowZooming)
+            mEventBoxLocal->eventMouseWheel += MyGUI::newDelegate(this, &MapWindow::onMapZoomed);
 
         LocalMapBase::init(mLocalMap, mPlayerArrowLocal, getLocalViewingDistance());
 

From b0e30e4bb6fd965bf9c3873d02dc1342f7993e6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Mocquillon?= <cedric.mocquillon@gmail.com>
Date: Sun, 8 Aug 2021 12:10:17 +0200
Subject: [PATCH 1181/2859] Change setting to clamp the local viewing distance
 to fix value (instead of coeff)

---
 apps/openmw/mwgui/mapwindow.cpp                |  7 +++----
 docs/source/reference/modding/settings/map.rst | 14 +++++++++-----
 files/settings-default.cfg                     |  4 ++--
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index 9f7cfc73e6..7f1ecd89d8 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -99,10 +99,9 @@ namespace
             return Constants::CellGridRadius;
         if (!Settings::Manager::getBool("distant terrain", "Terrain"))
             return Constants::CellGridRadius;
-        const float localViewingDistanceCoef = Settings::Manager::getFloat("local viewing distance coef", "Map");
-        const int viewingDistance = Settings::Manager::getInt("viewing distance", "Camera");
-        const int localViewingDistanceInCells = (viewingDistance * localViewingDistanceCoef) / double(Constants::CellSizeInUnits);
-        return std::max(Constants::CellGridRadius, localViewingDistanceInCells);
+        const int maxLocalViewingDistance = std::max(Settings::Manager::getInt("max local viewing distance", "Map"), Constants::CellGridRadius);
+        const int viewingDistanceInCells = Settings::Manager::getFloat("viewing distance", "Camera") / Constants::CellSizeInUnits;
+        return std::min(maxLocalViewingDistance, viewingDistanceInCells);
     }
 }
 
diff --git a/docs/source/reference/modding/settings/map.rst b/docs/source/reference/modding/settings/map.rst
index eeef0a1f39..a4d3cd7e0d 100644
--- a/docs/source/reference/modding/settings/map.rst
+++ b/docs/source/reference/modding/settings/map.rst
@@ -115,14 +115,18 @@ If this setting is true the user can zoom in/out on local and global map with th
 
 This setting can be controlled in Advanced tab of the launcher.
 
-local viewing distance coef
+max local viewing distance
 ---------------------------
 
-:Type:		float
-:Range:		> 0 and <= 1
-:Default:	0.5
+:Type:		integer
+:Range:		> 0
+:Default:	10
 
-This setting controls viewing distance on local map. It is the coefficient of the viewing distance viewable on the local map if 'distant terrain' is enabled otherwise you will see the default value (a 3x3 square centered on the player).
+This setting controls the viewing distance on local map when 'distant terrain' is enabled.
+If this setting is greater than the viewing distance then only up to the viewing distance is used for local map, otherwise the viewing distance is used.
 If view distance is changed in settings menu during the game, then viewable distance on the local map is not updated.
+.. warning::
+	Increasing this setting can increase cell load times,
+	because the localmap take a snapshot of each cell contained in a square of 2 x (max local viewing distance) + 1 square.
 
 This setting can not be configured except by editing the settings configuration file.
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 2c287a889c..4737fcf5ee 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -205,8 +205,8 @@ global = false
 # If true, allow zoom on local and global maps
 allow zooming = false
 
-# The local view distance coefficient (1.0 is full view distance if distant terrain is enabled)
-local viewing distance coef = 0.5
+# The local view distance in number of cells (up to the view distance)
+max local viewing distance = 10
 
 [GUI]
 

From bfc9ea9e32c30f1b0c73fa7c49202e22493d147d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Mocquillon?= <cedric.mocquillon@gmail.com>
Date: Mon, 9 Aug 2021 14:14:26 +0200
Subject: [PATCH 1182/2859] Fix warning on MSVC convertion from double to float

---
 apps/openmw/mwgui/mapwindow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index 7f1ecd89d8..485e7f7ed0 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -36,7 +36,7 @@ namespace
 {
 
     const int cellSize = Constants::CellSizeInUnits;
-    constexpr float speed = 1.08;   //the zoom speed, it should be greater than 1
+    constexpr float speed = 1.08f;   //the zoom speed, it should be greater than 1
 
     enum LocalMapWidgetDepth
     {

From 956edca52492b261744f474263d7222cf6ecf7ec Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Mon, 9 Aug 2021 21:17:13 +0300
Subject: [PATCH 1183/2859] Don't re-enable specularity w/ material controller
 for MW models

---
 components/nifosg/nifloader.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 17551e0b91..81c3d24dcc 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -845,8 +845,10 @@ namespace NifOsg
                     const Nif::NiMaterialColorController* matctrl = static_cast<const Nif::NiMaterialColorController*>(ctrl.getPtr());
                     if (matctrl->data.empty() && matctrl->interpolator.empty())
                         continue;
-                    osg::ref_ptr<MaterialColorController> osgctrl;
                     auto targetColor = static_cast<MaterialColorController::TargetColor>(matctrl->targetColor);
+                    if (mVersion <= Nif::NIFFile::NIFVersion::VER_MW && targetColor == MaterialColorController::TargetColor::Specular)
+                        continue;
+                    osg::ref_ptr<MaterialColorController> osgctrl;
                     if (!matctrl->interpolator.empty())
                         osgctrl = new MaterialColorController(matctrl->interpolator.getPtr(), targetColor, baseMaterial);
                     else // if (!matctrl->data.empty())
@@ -1967,6 +1969,7 @@ namespace NifOsg
                 case Nif::RC_NiSpecularProperty:
                 {
                     // Specular property can turn specular lighting off.
+                    // FIXME: NiMaterialColorController doesn't care about this.
                     auto specprop = static_cast<const Nif::NiSpecularProperty*>(property);
                     specEnabled = specprop->flags & 1;
                     break;

From 7dfaef7644ef5bbf9cb49d30746c789b8b84b037 Mon Sep 17 00:00:00 2001
From: Bret Curtis <bret.curtis@gmail.com>
Date: Mon, 9 Aug 2021 22:05:12 +0200
Subject: [PATCH 1184/2859] resolve issue of meshes that cross boundaries;
 should only be calculating the maxBound, not the minBound of y; also fix it
 in groundcover as it was copied blindly over;

---
 apps/openmw/mwrender/groundcover.cpp  | 2 +-
 apps/openmw/mwrender/objectpaging.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwrender/groundcover.cpp b/apps/openmw/mwrender/groundcover.cpp
index dd64c851f1..947bdad202 100644
--- a/apps/openmw/mwrender/groundcover.cpp
+++ b/apps/openmw/mwrender/groundcover.cpp
@@ -172,7 +172,7 @@ namespace MWRender
         osg::Vec3f pos = ref.mPos.asVec3();
         osg::Vec3f cellPos = pos / ESM::Land::REAL_SIZE;
         if ((minBound.x() > std::floor(minBound.x()) && cellPos.x() < minBound.x()) || (minBound.y() > std::floor(minBound.y()) && cellPos.y() < minBound.y())
-            || (maxBound.x() < std::ceil(maxBound.x()) && cellPos.x() >= maxBound.x()) || (minBound.y() < std::ceil(maxBound.y()) && cellPos.y() >= maxBound.y()))
+            || (maxBound.x() < std::ceil(maxBound.x()) && cellPos.x() >= maxBound.x()) || (maxBound.y() < std::ceil(maxBound.y()) && cellPos.y() >= maxBound.y()))
             return false;
 
         return true;
diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index aae8f2e4f1..ec0a381b84 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -507,7 +507,7 @@ namespace MWRender
             {
                 osg::Vec3f cellPos = pos / ESM::Land::REAL_SIZE;
                 if ((minBound.x() > std::floor(minBound.x()) && cellPos.x() < minBound.x()) || (minBound.y() > std::floor(minBound.y()) && cellPos.y() < minBound.y())
-                 || (maxBound.x() < std::ceil(maxBound.x()) && cellPos.x() >= maxBound.x()) || (minBound.y() < std::ceil(maxBound.y()) && cellPos.y() >= maxBound.y()))
+                 || (maxBound.x() < std::ceil(maxBound.x()) && cellPos.x() >= maxBound.x()) || (maxBound.y() < std::ceil(maxBound.y()) && cellPos.y() >= maxBound.y()))
                     continue;
             }
 

From c99bddc8dcebf2e49aa7bd90b548f7583c6e5e7a Mon Sep 17 00:00:00 2001
From: Bret Curtis <bret.curtis@gmail.com>
Date: Mon, 9 Aug 2021 22:11:00 +0200
Subject: [PATCH 1185/2859] Revert "Move reference to the right cell according
 to its geographical position"

This reverts commit d0677c3f07678a5eb351572c4eb9b14b0e1f03e4.
---
 apps/openmw/mwrender/objectpaging.cpp | 10 ----------
 apps/openmw/mwworld/store.cpp         | 12 ------------
 components/esm/loadcell.hpp           |  5 -----
 3 files changed, 27 deletions(-)

diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index ec0a381b84..db81027d9b 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -434,7 +434,6 @@ namespace MWRender
                                 continue;
 
                             if (std::find(cell->mMovedRefs.begin(), cell->mMovedRefs.end(), ref.mRefNum) != cell->mMovedRefs.end()) continue;
-                            if (std::find(cell->mMovedRefsByPos.begin(), cell->mMovedRefsByPos.end(), ref.mRefNum) != cell->mMovedRefsByPos.end()) continue;
                             Misc::StringUtils::lowerCaseInPlace(ref.mRefID);
                             int type = store.findStatic(ref.mRefID);
                             if (!typeFilter(type,size>=2)) continue;
@@ -456,15 +455,6 @@ namespace MWRender
                     if (!typeFilter(type,size>=2)) continue;
                     refs[ref.mRefNum] = std::move(ref);
                 }
-
-                for (auto [ref, deleted] : cell->mLeasedRefsByPos)
-                {
-                    if (deleted) { refs.erase(ref.mRefNum); continue; }
-                    Misc::StringUtils::lowerCaseInPlace(ref.mRefID);
-                    int type = store.findStatic(ref.mRefID);
-                    if (!typeFilter(type, size >= 2)) continue;
-                    refs[ref.mRefNum] = std::move(ref);
-                }
             }
         }
 
diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index add8b541e0..125239e9a3 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -478,15 +478,6 @@ namespace MWWorld
         //  implementation when the oher implementation works as well.
         while (cell->getNextRef(esm, ref, deleted, cMRef, moved))
         {
-
-            auto x = static_cast<int>(std::floor(ref.mPos.pos[0] / float(ESM::Land::REAL_SIZE)));
-            auto y = static_cast<int>(std::floor(ref.mPos.pos[1] / float(ESM::Land::REAL_SIZE)));
-            if (x != cell->getGridX() || y != cell->getGridY())
-            {
-                ESM::Cell* cellAlt = const_cast<ESM::Cell*>(searchOrCreate(x, y));
-                cellAlt->mLeasedRefsByPos.emplace_back(ref, deleted);
-                cell->mMovedRefsByPos.push_back(ref.mRefNum);
-            }
             if (!moved)
                 continue;
 
@@ -687,9 +678,6 @@ namespace MWWorld
                         oldcell->mMovedRefs.push_back(*it);
                 }
 
-                oldcell->mLeasedRefsByPos.splice(oldcell->mLeasedRefsByPos.end(), cell.mLeasedRefsByPos);
-                oldcell->mMovedRefsByPos.splice(oldcell->mMovedRefsByPos.end(), cell.mMovedRefsByPos);
-
                 // We don't need to merge mLeasedRefs of cell / oldcell. This list is filled when another cell moves a
                 // reference to this cell, so the list for the new cell should be empty. The list for oldcell,
                 // however, could have leased refs in it and so should be kept.
diff --git a/components/esm/loadcell.hpp b/components/esm/loadcell.hpp
index 23f3d38cc8..18e929e13b 100644
--- a/components/esm/loadcell.hpp
+++ b/components/esm/loadcell.hpp
@@ -124,11 +124,6 @@ struct Cell
   CellRefTracker mLeasedRefs;
   MovedCellRefTracker mMovedRefs;
 
-  // References "adopted" from another cell (i.e. a different cell
-  //  introduced this ref, and it has been moved here as it geographically in this cell)
-  CellRefTracker mLeasedRefsByPos;
-  std::list<RefNum> mMovedRefsByPos;
-
   void postLoad(ESMReader &esm);
 
   // This method is left in for compatibility with esmtool. Parsing moved references currently requires

From 436c640da2fa807b2e68f146ce96788e0dc17841 Mon Sep 17 00:00:00 2001
From: Bret Curtis <bret.curtis@gmail.com>
Date: Mon, 9 Aug 2021 22:56:04 +0200
Subject: [PATCH 1186/2859] the old switch-a-roo because we shoudl only
 StopTraversal when the node size is larger than 1 and not the other way
 around

---
 components/terrain/quadtreeworld.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/components/terrain/quadtreeworld.cpp b/components/terrain/quadtreeworld.cpp
index e9f5805566..e26fc1b617 100644
--- a/components/terrain/quadtreeworld.cpp
+++ b/components/terrain/quadtreeworld.cpp
@@ -65,8 +65,7 @@ public:
     {
         const osg::Vec2f& center = node->getCenter();
         bool activeGrid = (center.x() > mActiveGrid.x() && center.y() > mActiveGrid.y() && center.x() < mActiveGrid.z() && center.y() < mActiveGrid.w());
-        if (dist > mViewDistance && !activeGrid) // for Scene<->ObjectPaging sync the activegrid must remain loaded
-            return StopTraversal;
+
         if (node->getSize()>1)
         {
             float halfSize = node->getSize()/2;
@@ -77,6 +76,9 @@ public:
                 return Deeper;
         }
 
+        if (dist > mViewDistance && !activeGrid) // for Scene<->ObjectPaging sync the activegrid must remain loaded
+            return StopTraversal;
+
         int nativeLodLevel = Log2(static_cast<unsigned int>(node->getSize()/mMinSize));
         int lodLevel = Log2(static_cast<unsigned int>(dist/(Constants::CellSizeInUnits*mMinSize*mFactor)));
 

From 0e6fbbc126c58d46c62f817211751c770880d840 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sat, 26 Jun 2021 23:10:24 +0200
Subject: [PATCH 1187/2859] Lua package 'openmw.input'

---
 apps/openmw/CMakeLists.txt                    |   3 +-
 apps/openmw/mwbase/inputmanager.hpp           |  16 +-
 apps/openmw/mwbase/luamanager.hpp             |  10 +-
 apps/openmw/mwinput/actionmanager.cpp         |   2 +
 apps/openmw/mwinput/actionmanager.hpp         |   1 +
 apps/openmw/mwinput/bindingsmanager.cpp       |  10 ++
 apps/openmw/mwinput/bindingsmanager.hpp       |   3 +-
 apps/openmw/mwinput/controllermanager.cpp     |  10 ++
 apps/openmw/mwinput/inputmanagerimp.cpp       |  41 ++++-
 apps/openmw/mwinput/inputmanagerimp.hpp       |  15 +-
 apps/openmw/mwinput/keyboardmanager.cpp       |   6 +-
 apps/openmw/mwinput/mousemanager.cpp          |   5 +
 apps/openmw/mwinput/mousemanager.hpp          |   8 +
 apps/openmw/mwlua/inputbindings.cpp           | 150 ++++++++++++++++
 apps/openmw/mwlua/luabindings.cpp             |  22 +--
 apps/openmw/mwlua/luabindings.hpp             |   5 +-
 apps/openmw/mwlua/luamanagerimp.cpp           |  20 +--
 apps/openmw/mwlua/luamanagerimp.hpp           |   5 +-
 apps/openmw/mwlua/playerscripts.hpp           |  33 +++-
 docs/source/reference/lua-scripting/api.rst   |   3 +
 .../lua-scripting/engine_handlers.rst         |  19 +-
 .../reference/lua-scripting/openmw_input.rst  |   6 +
 .../reference/lua-scripting/overview.rst      |   2 +
 files/lua_api/openmw/core.lua                 |  10 --
 files/lua_api/openmw/input.lua                | 170 ++++++++++++++++++
 25 files changed, 509 insertions(+), 66 deletions(-)
 create mode 100644 apps/openmw/mwlua/inputbindings.cpp
 create mode 100644 docs/source/reference/lua-scripting/openmw_input.rst
 create mode 100644 files/lua_api/openmw/input.lua

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index a6d9402c4f..53e35f3310 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -57,7 +57,8 @@ add_openmw_dir (mwscript
 
 add_openmw_dir (mwlua
     luamanagerimp actions object worldview userdataserializer eventqueue query
-    luabindings localscripts objectbindings cellbindings asyncbindings camerabindings uibindings settingsbindings
+    luabindings localscripts objectbindings cellbindings asyncbindings settingsbindings
+    camerabindings uibindings inputbindings
     )
 
 add_openmw_dir (mwsound
diff --git a/apps/openmw/mwbase/inputmanager.hpp b/apps/openmw/mwbase/inputmanager.hpp
index 951b5053a2..5ac7c218b5 100644
--- a/apps/openmw/mwbase/inputmanager.hpp
+++ b/apps/openmw/mwbase/inputmanager.hpp
@@ -5,6 +5,7 @@
 #include <set>
 #include <vector>
 
+#include <SDL_gamecontroller.h>
 #include <stdint.h>
 
 namespace Loading
@@ -51,9 +52,17 @@ namespace MWBase
             virtual void toggleControlSwitch (const std::string& sw, bool value) = 0;
             virtual bool getControlSwitch (const std::string& sw) = 0;
 
-            virtual std::string getActionDescription (int action) = 0;
-            virtual std::string getActionKeyBindingName (int action) = 0;
-            virtual std::string getActionControllerBindingName (int action) = 0;
+            virtual std::string getActionDescription (int action) const = 0;
+            virtual std::string getActionKeyBindingName (int action) const = 0;
+            virtual std::string getActionControllerBindingName (int action) const = 0;
+            virtual bool actionIsActive(int action) const = 0;
+
+            virtual float getActionValue(int action) const = 0;  // returns value in range [0, 1]
+            virtual float getControllerAxisValue(SDL_GameControllerAxis axis) const = 0;  // returns value in range [-1, 1]
+            virtual uint32_t getMouseButtonsState() const = 0;
+            virtual int getMouseMoveX() const = 0;
+            virtual int getMouseMoveY() const = 0;
+
             ///Actions available for binding to keyboard buttons
             virtual std::vector<int> getActionKeySorting() = 0;
             ///Actions available for binding to controller buttons
@@ -74,6 +83,7 @@ namespace MWBase
             virtual void readRecord(ESM::ESMReader& reader, uint32_t type) = 0;
 
             virtual void resetIdleTime() = 0;
+            virtual bool isIdle() const = 0;
 
             virtual void executeAction(int action) = 0;
 
diff --git a/apps/openmw/mwbase/luamanager.hpp b/apps/openmw/mwbase/luamanager.hpp
index cc416c9ab0..ebcd8f50b3 100644
--- a/apps/openmw/mwbase/luamanager.hpp
+++ b/apps/openmw/mwbase/luamanager.hpp
@@ -1,6 +1,7 @@
 #ifndef GAME_MWBASE_LUAMANAGER_H
 #define GAME_MWBASE_LUAMANAGER_H
 
+#include <variant>
 #include <SDL_events.h>
 
 namespace MWWorld
@@ -29,8 +30,6 @@ namespace MWBase
         virtual ~LuaManager() = default;
 
         virtual void newGameStarted() = 0;
-        virtual void keyPressed(const SDL_KeyboardEvent &arg) = 0;
-
         virtual void registerObject(const MWWorld::Ptr& ptr) = 0;
         virtual void deregisterObject(const MWWorld::Ptr& ptr) = 0;
         virtual void objectAddedToScene(const MWWorld::Ptr& ptr) = 0;
@@ -40,6 +39,13 @@ namespace MWBase
         // virtual void objectOnHit(const MWWorld::Ptr &ptr, float damage, bool ishealth, const MWWorld::Ptr &object,
         //                          const MWWorld::Ptr &attacker, const osg::Vec3f &hitPosition, bool successful) = 0;
 
+        struct InputEvent
+        {
+            enum {KeyPressed, KeyReleased, ControllerPressed, ControllerReleased, Action} mType;
+            std::variant<SDL_Keysym, int> mValue;
+        };
+        virtual void inputEvent(const InputEvent& event) = 0;
+
         struct ActorControls
         {
             bool mDisableAI = false;
diff --git a/apps/openmw/mwinput/actionmanager.cpp b/apps/openmw/mwinput/actionmanager.cpp
index c91722fbfb..e080437d92 100644
--- a/apps/openmw/mwinput/actionmanager.cpp
+++ b/apps/openmw/mwinput/actionmanager.cpp
@@ -9,6 +9,7 @@
 #include "../mwbase/inputmanager.hpp"
 #include "../mwbase/statemanager.hpp"
 #include "../mwbase/environment.hpp"
+#include "../mwbase/luamanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
@@ -195,6 +196,7 @@ namespace MWInput
 
     void ActionManager::executeAction(int action)
     {
+        MWBase::Environment::get().getLuaManager()->inputEvent({MWBase::LuaManager::InputEvent::Action, action});
         auto* inputManager = MWBase::Environment::get().getInputManager();
         auto* windowManager = MWBase::Environment::get().getWindowManager();
         // trigger action activated
diff --git a/apps/openmw/mwinput/actionmanager.hpp b/apps/openmw/mwinput/actionmanager.hpp
index eceac2e94f..2180e1944e 100644
--- a/apps/openmw/mwinput/actionmanager.hpp
+++ b/apps/openmw/mwinput/actionmanager.hpp
@@ -48,6 +48,7 @@ namespace MWInput
         void showQuickKeysMenu();
 
         void resetIdleTime();
+        float getIdleTime() const { return mTimeIdle; }
 
         bool isAlwaysRunActive() const { return mAlwaysRunActive; };
         bool isSneaking() const { return mSneaking; };
diff --git a/apps/openmw/mwinput/bindingsmanager.cpp b/apps/openmw/mwinput/bindingsmanager.cpp
index 851e33a87c..ca7911ecc2 100644
--- a/apps/openmw/mwinput/bindingsmanager.cpp
+++ b/apps/openmw/mwinput/bindingsmanager.cpp
@@ -653,6 +653,16 @@ namespace MWInput
         return mInputBinder->getKeyBinding(mInputBinder->getControl(actionId), ICS::Control::INCREASE);
     }
 
+    float BindingsManager::getControllerAxisValue(SDL_GameControllerAxis axis) const
+    {
+        const auto& controllers = mInputBinder->getJoystickInstanceMap();
+        if (controllers.empty())
+            return 0;
+        SDL_GameController* cntrl = controllers.begin()->second;
+        constexpr int AXIS_MAX_ABSOLUTE_VALUE = 32768;
+        return SDL_GameControllerGetAxis(cntrl, axis) / static_cast<float>(AXIS_MAX_ABSOLUTE_VALUE);
+    }
+
     void BindingsManager::actionValueChanged(int action, float currentValue, float previousValue)
     {
         MWBase::Environment::get().getInputManager()->resetIdleTime();
diff --git a/apps/openmw/mwinput/bindingsmanager.hpp b/apps/openmw/mwinput/bindingsmanager.hpp
index 74416d3c7f..5c653f0b3e 100644
--- a/apps/openmw/mwinput/bindingsmanager.hpp
+++ b/apps/openmw/mwinput/bindingsmanager.hpp
@@ -42,7 +42,8 @@ namespace MWInput
         bool isLeftOrRightButton(int action, bool joystick) const;
 
         bool actionIsActive(int id) const;
-        float getActionValue(int id) const;
+        float getActionValue(int id) const;  // returns value in range [0, 1]
+        float getControllerAxisValue(SDL_GameControllerAxis axis) const;  // returns value in range [-1, 1]
 
         void mousePressed(const SDL_MouseButtonEvent &evt, int deviceID);
         void mouseReleased(const SDL_MouseButtonEvent &arg, int deviceID);
diff --git a/apps/openmw/mwinput/controllermanager.cpp b/apps/openmw/mwinput/controllermanager.cpp
index 03d492c9cf..7a91f8643b 100644
--- a/apps/openmw/mwinput/controllermanager.cpp
+++ b/apps/openmw/mwinput/controllermanager.cpp
@@ -8,6 +8,7 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/inputmanager.hpp"
+#include "../mwbase/luamanager.hpp"
 #include "../mwbase/statemanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
@@ -198,6 +199,9 @@ namespace MWInput
         if (!mJoystickEnabled || mBindingsManager->isDetectingBindingState())
             return;
 
+        MWBase::Environment::get().getLuaManager()->inputEvent(
+            {MWBase::LuaManager::InputEvent::ControllerPressed, arg.button});
+
         mJoystickLastUsed = true;
         if (MWBase::Environment::get().getWindowManager()->isGuiMode())
         {
@@ -240,6 +244,12 @@ namespace MWInput
             return;
         }
 
+        if (mJoystickEnabled)
+        {
+            MWBase::Environment::get().getLuaManager()->inputEvent(
+                {MWBase::LuaManager::InputEvent::ControllerReleased, arg.button});
+        }
+
         if (!mJoystickEnabled || MWBase::Environment::get().getInputManager()->controlsDisabled())
             return;
 
diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index 436eab7ad3..31f515afb0 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -150,21 +150,56 @@ namespace MWInput
         mActionManager->resetIdleTime();
     }
 
-    std::string InputManager::getActionDescription(int action)
+    bool InputManager::isIdle() const
+    {
+        return mActionManager->getIdleTime() > 0.5;
+    }
+
+    std::string InputManager::getActionDescription(int action) const
     {
         return mBindingsManager->getActionDescription(action);
     }
 
-    std::string InputManager::getActionKeyBindingName(int action)
+    std::string InputManager::getActionKeyBindingName(int action) const
     {
         return mBindingsManager->getActionKeyBindingName(action);
     }
 
-    std::string InputManager::getActionControllerBindingName(int action)
+    std::string InputManager::getActionControllerBindingName(int action) const
     {
         return mBindingsManager->getActionControllerBindingName(action);
     }
 
+    bool InputManager::actionIsActive(int action) const
+    {
+        return mBindingsManager->actionIsActive(action);
+    }
+
+    float InputManager::getActionValue(int action) const
+    {
+        return mBindingsManager->getActionValue(action);
+    }
+
+    float InputManager::getControllerAxisValue(SDL_GameControllerAxis axis) const
+    {
+        return mBindingsManager->getControllerAxisValue(axis);
+    }
+
+    uint32_t InputManager::getMouseButtonsState() const
+    {
+        return mMouseManager->getButtonsState();
+    }
+
+    int InputManager::getMouseMoveX() const
+    {
+        return mMouseManager->getMouseMoveX();
+    }
+
+    int InputManager::getMouseMoveY() const
+    {
+        return mMouseManager->getMouseMoveY();
+    }
+
     std::vector<int> InputManager::getActionKeySorting()
     {
         return mBindingsManager->getActionKeySorting();
diff --git a/apps/openmw/mwinput/inputmanagerimp.hpp b/apps/openmw/mwinput/inputmanagerimp.hpp
index f930836d1c..adb8319498 100644
--- a/apps/openmw/mwinput/inputmanagerimp.hpp
+++ b/apps/openmw/mwinput/inputmanagerimp.hpp
@@ -73,9 +73,17 @@ namespace MWInput
         void toggleControlSwitch (const std::string& sw, bool value) override;
         bool getControlSwitch (const std::string& sw) override;
 
-        std::string getActionDescription (int action) override;
-        std::string getActionKeyBindingName (int action) override;
-        std::string getActionControllerBindingName (int action) override;
+        std::string getActionDescription (int action) const override;
+        std::string getActionKeyBindingName (int action) const override;
+        std::string getActionControllerBindingName (int action) const override;
+        bool actionIsActive(int action) const override;
+
+        float getActionValue(int action) const override;
+        float getControllerAxisValue(SDL_GameControllerAxis axis) const override;
+        uint32_t getMouseButtonsState() const override;
+        int getMouseMoveX() const override;
+        int getMouseMoveY() const override;
+
         int getNumActions() override { return A_Last; }
         std::vector<int> getActionKeySorting() override;
         std::vector<int> getActionControllerSorting() override;
@@ -91,6 +99,7 @@ namespace MWInput
         void readRecord(ESM::ESMReader& reader, uint32_t type) override;
 
         void resetIdleTime() override;
+        bool isIdle() const override;
 
         void executeAction(int action) override;
 
diff --git a/apps/openmw/mwinput/keyboardmanager.cpp b/apps/openmw/mwinput/keyboardmanager.cpp
index 03db584192..b8019b12ba 100644
--- a/apps/openmw/mwinput/keyboardmanager.cpp
+++ b/apps/openmw/mwinput/keyboardmanager.cpp
@@ -60,7 +60,10 @@ namespace MWInput
             mBindingsManager->keyPressed(arg);
 
         if (!consumed)
-            MWBase::Environment::get().getLuaManager()->keyPressed(arg);
+        {
+            MWBase::Environment::get().getLuaManager()->inputEvent(
+                {MWBase::LuaManager::InputEvent::KeyPressed, arg.keysym});
+        }
 
         input->setJoystickLastUsed(false);
     }
@@ -73,5 +76,6 @@ namespace MWInput
         if (!mBindingsManager->isDetectingBindingState())
             mBindingsManager->setPlayerControlsEnabled(!MyGUI::InputManager::getInstance().injectKeyRelease(kc));
         mBindingsManager->keyReleased(arg);
+        MWBase::Environment::get().getLuaManager()->inputEvent({MWBase::LuaManager::InputEvent::KeyReleased, arg.keysym});
     }
 }
diff --git a/apps/openmw/mwinput/mousemanager.cpp b/apps/openmw/mwinput/mousemanager.cpp
index cf151dfac7..7810a40ad2 100644
--- a/apps/openmw/mwinput/mousemanager.cpp
+++ b/apps/openmw/mwinput/mousemanager.cpp
@@ -34,6 +34,9 @@ namespace MWInput
         , mMouseWheel(0)
         , mMouseLookEnabled(false)
         , mGuiCursorEnabled(true)
+        , mButtonsState(0)
+        , mMouseMoveX(0)
+        , mMouseMoveY(0)
     {
         int w,h;
         SDL_GetWindowSize(window, &w, &h);
@@ -196,6 +199,8 @@ namespace MWInput
 
     void MouseManager::update(float dt)
     {
+        mButtonsState = SDL_GetRelativeMouseState(&mMouseMoveX, &mMouseMoveY);
+
         if (!mMouseLookEnabled)
             return;
 
diff --git a/apps/openmw/mwinput/mousemanager.hpp b/apps/openmw/mwinput/mousemanager.hpp
index 000e7cd0b6..d5504c5f5a 100644
--- a/apps/openmw/mwinput/mousemanager.hpp
+++ b/apps/openmw/mwinput/mousemanager.hpp
@@ -38,6 +38,10 @@ namespace MWInput
         void setMouseLookEnabled(bool enabled) { mMouseLookEnabled = enabled; }
         void setGuiCursorEnabled(bool enabled) { mGuiCursorEnabled = enabled; }
 
+        uint32_t getButtonsState() const { return mButtonsState; }
+        int getMouseMoveX() const { return mMouseMoveX; }
+        int getMouseMoveY() const { return mMouseMoveY; }
+
     private:
         bool mInvertX;
         bool mInvertY;
@@ -53,6 +57,10 @@ namespace MWInput
         int mMouseWheel;
         bool mMouseLookEnabled;
         bool mGuiCursorEnabled;
+
+        uint32_t mButtonsState;
+        int mMouseMoveX;
+        int mMouseMoveY;
     };
 }
 #endif
diff --git a/apps/openmw/mwlua/inputbindings.cpp b/apps/openmw/mwlua/inputbindings.cpp
new file mode 100644
index 0000000000..f815d9c344
--- /dev/null
+++ b/apps/openmw/mwlua/inputbindings.cpp
@@ -0,0 +1,150 @@
+#include "luabindings.hpp"
+
+#include <SDL_events.h>
+#include <SDL_gamecontroller.h>
+
+#include "../mwbase/inputmanager.hpp"
+#include "../mwinput/actions.hpp"
+
+namespace sol
+{
+    template <>
+    struct is_automagical<SDL_Keysym> : std::false_type {};
+}
+
+namespace MWLua
+{
+
+    sol::table initInputPackage(const Context& context)
+    {
+        sol::usertype<SDL_Keysym> keyEvent = context.mLua->sol().new_usertype<SDL_Keysym>("KeyEvent");
+        keyEvent["symbol"] = sol::readonly_property([](const SDL_Keysym& e) { return std::string(1, static_cast<char>(e.sym)); });
+        keyEvent["code"] = sol::readonly_property([](const SDL_Keysym& e) -> int { return e.sym; });
+        keyEvent["modifiers"] = sol::readonly_property([](const SDL_Keysym& e) -> int { return e.mod; });
+        keyEvent["withShift"] = sol::readonly_property([](const SDL_Keysym& e) -> bool { return e.mod & KMOD_SHIFT; });
+        keyEvent["withCtrl"] = sol::readonly_property([](const SDL_Keysym& e) -> bool { return e.mod & KMOD_CTRL; });
+        keyEvent["withAlt"] = sol::readonly_property([](const SDL_Keysym& e) -> bool { return e.mod & KMOD_ALT; });
+        keyEvent["withSuper"] = sol::readonly_property([](const SDL_Keysym& e) -> bool { return e.mod & KMOD_GUI; });
+
+        MWBase::InputManager* input = MWBase::Environment::get().getInputManager();
+        sol::table api(context.mLua->sol(), sol::create);
+
+        api["isIdle"] = [input]() { return input->isIdle(); };
+        api["isActionPressed"] = [input](int action) { return input->actionIsActive(action); };
+        api["isMouseButtonPressed"] = [input](int button) -> bool
+        {
+            return input->getMouseButtonsState() & (1 << (button - 1));
+        };
+        api["getMouseMoveX"] = [input]() { return input->getMouseMoveX(); };
+        api["getMouseMoveY"] = [input]() { return input->getMouseMoveY(); };
+        api["getAxisValue"] = [input](int axis)
+        {
+            if (axis < SDL_CONTROLLER_AXIS_MAX)
+                return input->getControllerAxisValue(static_cast<SDL_GameControllerAxis>(axis));
+            else
+                return input->getActionValue(axis - SDL_CONTROLLER_AXIS_MAX) * 2 - 1;
+        };
+
+        api["getControlSwitch"] = [input](const std::string& key) { return input->getControlSwitch(key); };
+        api["setControlSwitch"] = [input](const std::string& key, bool v) { input->toggleControlSwitch(key, v); };
+
+        api["ACTION"] = context.mLua->makeReadOnly(context.mLua->sol().create_table_with(
+            "GameMenu", MWInput::A_GameMenu,
+            "Screenshot", MWInput::A_Screenshot,
+            "Inventory", MWInput::A_Inventory,
+            "Console", MWInput::A_Console,
+
+            "MoveLeft", MWInput::A_MoveLeft,
+            "MoveRight", MWInput::A_MoveRight,
+            "MoveForward", MWInput::A_MoveForward,
+            "MoveBackward", MWInput::A_MoveBackward,
+
+            "Activate", MWInput::A_Activate,
+            "Use", MWInput::A_Use,
+            "Jump", MWInput::A_Jump,
+            "AutoMove", MWInput::A_AutoMove,
+            "Rest", MWInput::A_Rest,
+            "Journal", MWInput::A_Journal,
+            "Weapon", MWInput::A_Weapon,
+            "Spell", MWInput::A_Spell,
+            "Run", MWInput::A_Run,
+            "CycleSpellLeft", MWInput::A_CycleSpellLeft,
+            "CycleSpellRight", MWInput::A_CycleSpellRight,
+            "CycleWeaponLeft", MWInput::A_CycleWeaponLeft,
+            "CycleWeaponRight", MWInput::A_CycleWeaponRight,
+            "ToggleSneak", MWInput::A_ToggleSneak,
+            "AlwaysRun", MWInput::A_AlwaysRun,
+            "Sneak", MWInput::A_Sneak,
+
+            "QuickSave", MWInput::A_QuickSave,
+            "QuickLoad", MWInput::A_QuickLoad,
+            "QuickMenu", MWInput::A_QuickMenu,
+            "ToggleWeapon", MWInput::A_ToggleWeapon,
+            "ToggleSpell", MWInput::A_ToggleSpell,
+            "TogglePOV", MWInput::A_TogglePOV,
+
+            "QuickKey1", MWInput::A_QuickKey1,
+            "QuickKey2", MWInput::A_QuickKey2,
+            "QuickKey3", MWInput::A_QuickKey3,
+            "QuickKey4", MWInput::A_QuickKey4,
+            "QuickKey5", MWInput::A_QuickKey5,
+            "QuickKey6", MWInput::A_QuickKey6,
+            "QuickKey7", MWInput::A_QuickKey7,
+            "QuickKey8", MWInput::A_QuickKey8,
+            "QuickKey9", MWInput::A_QuickKey9,
+            "QuickKey10", MWInput::A_QuickKey10,
+            "QuickKeysMenu", MWInput::A_QuickKeysMenu,
+
+            "ToggleHUD", MWInput::A_ToggleHUD,
+            "ToggleDebug", MWInput::A_ToggleDebug,
+
+            "ZoomIn", MWInput::A_ZoomIn,
+            "ZoomOut", MWInput::A_ZoomOut
+        ));
+
+        api["CONTROL_SWITCH"] = context.mLua->makeReadOnly(context.mLua->sol().create_table_with(
+            "Controls", "playercontrols",
+            "Fighting", "playerfighting",
+            "Jumping", "playerjumping",
+            "Looking", "playerlooking",
+            "Magic", "playermagic",
+            "ViewMode", "playerviewswitch",
+            "VanityMode", "vanitymode"
+        ));
+
+        api["CONTROLLER_BUTTON"] = context.mLua->makeReadOnly(context.mLua->sol().create_table_with(
+            "A", SDL_CONTROLLER_BUTTON_A,
+            "B", SDL_CONTROLLER_BUTTON_B,
+            "X", SDL_CONTROLLER_BUTTON_X,
+            "Y", SDL_CONTROLLER_BUTTON_Y,
+            "Back", SDL_CONTROLLER_BUTTON_BACK,
+            "Guide", SDL_CONTROLLER_BUTTON_GUIDE,
+            "Start", SDL_CONTROLLER_BUTTON_START,
+            "LeftStick", SDL_CONTROLLER_BUTTON_LEFTSTICK,
+            "RightStick", SDL_CONTROLLER_BUTTON_RIGHTSTICK,
+            "LeftShoulder", SDL_CONTROLLER_BUTTON_LEFTSHOULDER,
+            "RightShoulder", SDL_CONTROLLER_BUTTON_RIGHTSHOULDER,
+            "DPadUp", SDL_CONTROLLER_BUTTON_DPAD_UP,
+            "DPadDown", SDL_CONTROLLER_BUTTON_DPAD_DOWN,
+            "DPadLeft", SDL_CONTROLLER_BUTTON_DPAD_LEFT,
+            "DPadRight", SDL_CONTROLLER_BUTTON_DPAD_RIGHT
+        ));
+
+        api["CONTROLLER_AXIS"] = context.mLua->makeReadOnly(context.mLua->sol().create_table_with(
+            "LeftX", SDL_CONTROLLER_AXIS_LEFTX,
+            "LeftY", SDL_CONTROLLER_AXIS_LEFTY,
+            "RightX", SDL_CONTROLLER_AXIS_RIGHTX,
+            "RightY", SDL_CONTROLLER_AXIS_RIGHTY,
+            "TriggerLeft", SDL_CONTROLLER_AXIS_TRIGGERLEFT,
+            "TriggerRight", SDL_CONTROLLER_AXIS_TRIGGERRIGHT,
+
+            "LookUpDown", SDL_CONTROLLER_AXIS_MAX + MWInput::A_LookUpDown,
+            "LookLeftRight", SDL_CONTROLLER_AXIS_MAX + MWInput::A_LookLeftRight,
+            "MoveForwardBackward", SDL_CONTROLLER_AXIS_MAX + MWInput::A_MoveForwardBackward,
+            "MoveLeftRight", SDL_CONTROLLER_AXIS_MAX + MWInput::A_MoveLeftRight
+        ));
+
+        return context.mLua->makeReadOnly(api);
+    }
+
+}
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index 9d978ddd52..e50af836b5 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -1,7 +1,5 @@
 #include "luabindings.hpp"
 
-#include <SDL_events.h>
-
 #include <components/lua/luastate.hpp>
 #include <components/queries/luabindings.hpp>
 
@@ -12,12 +10,6 @@
 #include "eventqueue.hpp"
 #include "worldview.hpp"
 
-namespace sol
-{
-    template <>
-    struct is_automagical<SDL_Keysym> : std::false_type {};
-}
-
 namespace MWLua
 {
 
@@ -33,7 +25,7 @@ namespace MWLua
     {
         auto* lua = context.mLua;
         sol::table api(lua->sol(), sol::create);
-        api["API_REVISION"] = 3;
+        api["API_REVISION"] = 4;
         api["quit"] = [lua]()
         {
             std::string traceback = lua->sol()["debug"]["traceback"]().get<std::string>();
@@ -179,17 +171,5 @@ namespace MWLua
         return context.mLua->makeReadOnly(res);
     }
 
-    void initInputBindings(const Context& context)
-    {
-        sol::usertype<SDL_Keysym> keyEvent = context.mLua->sol().new_usertype<SDL_Keysym>("KeyEvent");
-        keyEvent["symbol"] = sol::readonly_property([](const SDL_Keysym& e) { return std::string(1, static_cast<char>(e.sym)); });
-        keyEvent["code"] = sol::readonly_property([](const SDL_Keysym& e) -> int { return e.sym; });
-        keyEvent["modifiers"] = sol::readonly_property([](const SDL_Keysym& e) -> int { return e.mod; });
-        keyEvent["withShift"] = sol::readonly_property([](const SDL_Keysym& e) -> bool { return e.mod & KMOD_SHIFT; });
-        keyEvent["withCtrl"] = sol::readonly_property([](const SDL_Keysym& e) -> bool { return e.mod & KMOD_CTRL; });
-        keyEvent["withAlt"] = sol::readonly_property([](const SDL_Keysym& e) -> bool { return e.mod & KMOD_ALT; });
-        keyEvent["withSuper"] = sol::readonly_property([](const SDL_Keysym& e) -> bool { return e.mod & KMOD_GUI; });
-    }
-
 }
 
diff --git a/apps/openmw/mwlua/luabindings.hpp b/apps/openmw/mwlua/luabindings.hpp
index 568eb4e1ef..c58b556a3d 100644
--- a/apps/openmw/mwlua/luabindings.hpp
+++ b/apps/openmw/mwlua/luabindings.hpp
@@ -26,8 +26,6 @@ namespace MWLua
 
     sol::table initFieldGroup(const Context&, const QueryFieldGroup&);
 
-    void initInputBindings(const Context&);
-
     // Implemented in objectbindings.cpp
     void initObjectBindingsForLocalScripts(const Context&);
     void initObjectBindingsForGlobalScripts(const Context&);
@@ -59,6 +57,9 @@ namespace MWLua
     // Implemented in uibindings.cpp
     sol::table initUserInterfacePackage(const Context&);
 
+    // Implemented in inputbindings.cpp
+    sol::table initInputPackage(const Context&);
+
     // Implemented in settingsbindings.cpp
     sol::table initGlobalSettingsPackage(const Context&);
     sol::table initLocalSettingsPackage(const Context&);
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index bbfe0b8c3a..d358979aec 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -53,7 +53,6 @@ namespace MWLua
         initObjectBindingsForLocalScripts(localContext);
         initCellBindingsForLocalScripts(localContext);
         LocalScripts::initializeSelfPackage(localContext);
-        initInputBindings(localContext);
 
         mLua.addCommonPackage("openmw.async", getAsyncPackageInitializer(context));
         mLua.addCommonPackage("openmw.util", LuaUtil::initUtilPackage(mLua.sol()));
@@ -63,11 +62,12 @@ namespace MWLua
         mGlobalScripts.addPackage("openmw.settings", initGlobalSettingsPackage(context));
         mCameraPackage = initCameraPackage(localContext);
         mUserInterfacePackage = initUserInterfacePackage(localContext);
+        mInputPackage = initInputPackage(localContext);
         mNearbyPackage = initNearbyPackage(localContext);
         mLocalSettingsPackage = initLocalSettingsPackage(localContext);
         mPlayerSettingsPackage = initPlayerSettingsPackage(localContext);
 
-        mKeyPressEvents.clear();
+        mInputEvents.clear();
         for (const std::string& path : mGlobalScriptList)
             if (mGlobalScripts.addNewScript(path))
                 Log(Debug::Info) << "Global script started: " << path;
@@ -93,7 +93,7 @@ namespace MWLua
 
         if (paused)
         {
-            mKeyPressEvents.clear();
+            mInputEvents.clear();
             return;
         }
 
@@ -130,10 +130,10 @@ namespace MWLua
         PlayerScripts* playerScripts = dynamic_cast<PlayerScripts*>(mPlayer.getRefData().getLuaScripts());
         if (playerScripts)
         {
-            for (const SDL_Keysym& key : mKeyPressEvents)
-                playerScripts->keyPress(key);
+            for (const auto& event : mInputEvents)
+                playerScripts->processInputEvent(event);
         }
-        mKeyPressEvents.clear();
+        mInputEvents.clear();
 
         for (const LocalEngineEvent& e : mLocalEngineEvents)
         {
@@ -187,7 +187,7 @@ namespace MWLua
         mActiveLocalScripts.clear();
         mLocalEvents.clear();
         mGlobalEvents.clear();
-        mKeyPressEvents.clear();
+        mInputEvents.clear();
         mActorAddedEvents.clear();
         mLocalEngineEvents.clear();
         mPlayerChanged = false;
@@ -253,11 +253,6 @@ namespace MWLua
         mWorldView.getObjectRegistry()->deregisterPtr(ptr);
     }
 
-    void LuaManager::keyPressed(const SDL_KeyboardEvent& arg)
-    {
-        mKeyPressEvents.push_back(arg.keysym);
-    }
-
     void LuaManager::appliedToObject(const MWWorld::Ptr& toPtr, std::string_view recordId, const MWWorld::Ptr& fromPtr)
     {
         mLocalEngineEvents.push_back({getId(toPtr), LocalScripts::OnConsume{std::string(recordId)}});
@@ -294,6 +289,7 @@ namespace MWLua
             scripts = std::make_shared<PlayerScripts>(&mLua, LObject(getId(ptr), mWorldView.getObjectRegistry()));
             scripts->addPackage("openmw.ui", mUserInterfacePackage);
             scripts->addPackage("openmw.camera", mCameraPackage);
+            scripts->addPackage("openmw.input", mInputPackage);
             scripts->addPackage("openmw.settings", mPlayerSettingsPackage);
         }
         else
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index 48cdeba026..8fdfb02701 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -41,7 +41,7 @@ namespace MWLua
         void objectRemovedFromScene(const MWWorld::Ptr& ptr) override;
         void registerObject(const MWWorld::Ptr& ptr) override;
         void deregisterObject(const MWWorld::Ptr& ptr) override;
-        void keyPressed(const SDL_KeyboardEvent &arg) override;
+        void inputEvent(const InputEvent& event) override { mInputEvents.push_back(event); }
         void appliedToObject(const MWWorld::Ptr& toPtr, std::string_view recordId, const MWWorld::Ptr& fromPtr) override;
 
         MWBase::LuaManager::ActorControls* getActorControls(const MWWorld::Ptr&) const override;
@@ -75,6 +75,7 @@ namespace MWLua
         sol::table mNearbyPackage;
         sol::table mUserInterfacePackage;
         sol::table mCameraPackage;
+        sol::table mInputPackage;
         sol::table mLocalSettingsPackage;
         sol::table mPlayerSettingsPackage;
 
@@ -96,7 +97,7 @@ namespace MWLua
         std::unique_ptr<LuaUtil::UserdataSerializer> mGlobalLoader;
         std::unique_ptr<LuaUtil::UserdataSerializer> mLocalLoader;
 
-        std::vector<SDL_Keysym> mKeyPressEvents;
+        std::vector<MWBase::LuaManager::InputEvent> mInputEvents;
         std::vector<ObjectId> mActorAddedEvents;
 
         struct LocalEngineEvent
diff --git a/apps/openmw/mwlua/playerscripts.hpp b/apps/openmw/mwlua/playerscripts.hpp
index 72e064bb9b..ff0349b3c6 100644
--- a/apps/openmw/mwlua/playerscripts.hpp
+++ b/apps/openmw/mwlua/playerscripts.hpp
@@ -3,6 +3,8 @@
 
 #include <SDL_events.h>
 
+#include "../mwbase/luamanager.hpp"
+
 #include "localscripts.hpp"
 
 namespace MWLua
@@ -13,13 +15,40 @@ namespace MWLua
     public:
         PlayerScripts(LuaUtil::LuaState* lua, const LObject& obj) : LocalScripts(lua, obj)
         {
-            registerEngineHandlers({&mKeyPressHandlers});
+            registerEngineHandlers({&mKeyPressHandlers, &mKeyReleaseHandlers,
+                                    &mControllerButtonPressHandlers, &mControllerButtonReleaseHandlers,
+                                    &mActionHandlers});
         }
 
-        void keyPress(const SDL_Keysym& key) { callEngineHandlers(mKeyPressHandlers, key); }
+        void processInputEvent(const MWBase::LuaManager::InputEvent& event)
+        {
+            using InputEvent = MWBase::LuaManager::InputEvent;
+            switch (event.mType)
+            {
+            case InputEvent::KeyPressed:
+                callEngineHandlers(mKeyPressHandlers, std::get<SDL_Keysym>(event.mValue));
+                break;
+            case InputEvent::KeyReleased:
+                callEngineHandlers(mKeyReleaseHandlers, std::get<SDL_Keysym>(event.mValue));
+                break;
+            case InputEvent::ControllerPressed:
+                callEngineHandlers(mControllerButtonPressHandlers, std::get<int>(event.mValue));
+                break;
+            case InputEvent::ControllerReleased:
+                callEngineHandlers(mControllerButtonReleaseHandlers, std::get<int>(event.mValue));
+                break;
+            case InputEvent::Action:
+                callEngineHandlers(mActionHandlers, std::get<int>(event.mValue));
+                break;
+            }
+        }
 
     private:
         EngineHandlerList mKeyPressHandlers{"onKeyPress"};
+        EngineHandlerList mKeyReleaseHandlers{"onKeyRelease"};
+        EngineHandlerList mControllerButtonPressHandlers{"onControllerButtonPress"};
+        EngineHandlerList mControllerButtonReleaseHandlers{"onControllerButtonRelease"};
+        EngineHandlerList mActionHandlers{"onInputAction"};
     };
 
 }
diff --git a/docs/source/reference/lua-scripting/api.rst b/docs/source/reference/lua-scripting/api.rst
index 356fc16cbb..5075f8a5fe 100644
--- a/docs/source/reference/lua-scripting/api.rst
+++ b/docs/source/reference/lua-scripting/api.rst
@@ -14,6 +14,7 @@ Lua API reference
     openmw_world
     openmw_self
     openmw_nearby
+    openmw_input
     openmw_ui
     openmw_aux_util
 
@@ -53,6 +54,8 @@ Player scripts are local scripts that are attached to a player.
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.nearby <Package openmw.nearby>`             | by local scripts   | | Read-only access to the nearest area of the game world.     |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.input <Package openmw.input>`               | by player scripts  | | User input                                                  |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.ui <Package openmw.ui>`                     | by player scripts  | | Controls user interface                                     |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |openmw.camera                                            | by player scripts  | | Controls camera (not implemented)                           |
diff --git a/docs/source/reference/lua-scripting/engine_handlers.rst b/docs/source/reference/lua-scripting/engine_handlers.rst
index f08892be36..bcbee4349e 100644
--- a/docs/source/reference/lua-scripting/engine_handlers.rst
+++ b/docs/source/reference/lua-scripting/engine_handlers.rst
@@ -36,8 +36,21 @@ Engine handler is a function defined by a script, that can be called by the engi
 +----------------------------------+----------------------------------------------------------------------+
 | **Only for local scripts attached to a player**                                                         |
 +----------------------------------+----------------------------------------------------------------------+
-| onKeyPress(key)                  | | `Key <openmw_core.html##(KeyboardEvent)>`_ pressed. Usage example: |
-|                                  | | ``if key.symbol == 'z' and key.withShift then ...``                |
+| onKeyPress(key)                  | | `Key <openmw_input.html##(KeyboardEvent)>`_ is pressed.            |
+|                                  | | Usage example: ``if key.symbol == 'z' and key.withShift then ...`` |
++----------------------------------+----------------------------------------------------------------------+
+| onKeyRelease(key)                | | `Key <openmw_input.html##(KeyboardEvent)>`_ is released.           |
+|                                  | | Usage example: ``if key.symbol == 'z' and key.withShift then ...`` |
++----------------------------------+----------------------------------------------------------------------+
+| onControllerButtonPress(id)      | | A `button <openmw_input.html##(CONTROLLER_BUTTON)>`_ on a game     |
+|                                  |   controller is pressed. Usage example:                              |
+|                                  | | ``if id == input.CONTROLLER_BUTTON.LeftStick then ...``            |
++----------------------------------+----------------------------------------------------------------------+
+| onControllerButtonRelease(id)    | | A `button <openmw_input.html##(CONTROLLER_BUTTON)>`_ on a game     |
+|                                  |   controller is released. Usage example:                             |
+|                                  | | ``if id == input.CONTROLLER_BUTTON.LeftStick then ...``            |
++----------------------------------+----------------------------------------------------------------------+
+| onInputAction(id)                | | `Game control <openmw_input.html##(ACTION)>`_ is pressed.          |
+|                                  | | Usage example: ``if id == input.ACTION.ToggleWeapon then ...``     |
 +----------------------------------+----------------------------------------------------------------------+
-
 
diff --git a/docs/source/reference/lua-scripting/openmw_input.rst b/docs/source/reference/lua-scripting/openmw_input.rst
new file mode 100644
index 0000000000..39136dc4c2
--- /dev/null
+++ b/docs/source/reference/lua-scripting/openmw_input.rst
@@ -0,0 +1,6 @@
+Package openmw.input
+====================
+
+.. raw:: html
+   :file: generated_html/openmw_input.html
+
diff --git a/docs/source/reference/lua-scripting/overview.rst b/docs/source/reference/lua-scripting/overview.rst
index c193886340..44c79c35d8 100644
--- a/docs/source/reference/lua-scripting/overview.rst
+++ b/docs/source/reference/lua-scripting/overview.rst
@@ -314,6 +314,8 @@ Player scripts are local scripts that are attached to a player.
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.nearby <Package openmw.nearby>`             | by local scripts   | | Read-only access to the nearest area of the game world.     |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.input <Package openmw.input>`               | by player scripts  | | User input                                                  |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.ui <Package openmw.ui>`                     | by player scripts  | | Controls user interface                                     |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |openmw.camera                                            | by player scripts  | | Controls camera (not implemented)                           |
diff --git a/files/lua_api/openmw/core.lua b/files/lua_api/openmw/core.lua
index affd052700..eed2005cfa 100644
--- a/files/lua_api/openmw/core.lua
+++ b/files/lua_api/openmw/core.lua
@@ -318,15 +318,5 @@
 -- @return #ObjectList
 
 
--------------------------------------------------------------------------------
--- Argument of `onKeyPress` engine handler
--- @type KeyboardEvent
--- @field [parent=#KeyboardEvent] #string symbol The pressed symbol (1-symbol string).
--- @field [parent=#KeyboardEvent] #string code Key code.
--- @field [parent=#KeyboardEvent] #boolean withShift Is `Shift` key pressed.
--- @field [parent=#KeyboardEvent] #boolean withCtrl Is `Control` key pressed.
--- @field [parent=#KeyboardEvent] #boolean withAlt Is `Alt` key pressed.
--- @field [parent=#KeyboardEvent] #boolean withSuper Is `Super`/`Win` key pressed.
-
 return nil
 
diff --git a/files/lua_api/openmw/input.lua b/files/lua_api/openmw/input.lua
new file mode 100644
index 0000000000..0975ce6e6a
--- /dev/null
+++ b/files/lua_api/openmw/input.lua
@@ -0,0 +1,170 @@
+-------------------------------------------------------------------------------
+-- `openmw.input` can be used only in scripts attached to a player.
+-- @module input
+-- @usage local input = require('openmw.input')
+
+
+
+-------------------------------------------------------------------------------
+-- Is player idle.
+-- @function [parent=#input] isIdle
+-- @return #boolean
+
+-------------------------------------------------------------------------------
+-- Is a specific control currently pressed.
+-- Input bindings can be changed ingame using Options/Controls menu.
+-- @function [parent=#input] isActionPressed
+-- @param #number actionId One of @{openmw.input#ACTION}
+-- @return #boolean
+
+-------------------------------------------------------------------------------
+-- Is a mouse button currently pressed.
+-- @function [parent=#input] isMouseButtonPressed
+-- @param #number buttonId Button index (1 - left, 2 - middle, 3 - right, 4 - X1, 5 - X2)
+-- @return #boolean
+
+-------------------------------------------------------------------------------
+-- Horizontal mouse movement during the last frame.
+-- @function [parent=#input] getMouseMoveX
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Vertical mouse movement during the last frame.
+-- @function [parent=#input] getMouseMoveY
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Get value of an axis of a game controller.
+-- @function [parent=#input] getAxisValue
+-- @param #number axisId Index of a controller axis, one of @{openmw.input#CONTROLLER_AXIS}.
+-- @return #number Value in range [-1, 1].
+
+-------------------------------------------------------------------------------
+-- Get state of a control switch. I.e. is player able to move/fight/jump/etc.
+-- @function [parent=#input] getControlSwitch
+-- @param #string key Control type (see @{openmw.input#CONTROL_SWITCH})
+-- @return #boolean
+
+-------------------------------------------------------------------------------
+-- Set state of a control switch. I.e. forbid or allow player to move/fight/jump/etc.
+-- @function [parent=#input] setControlSwitch
+-- @param #string key Control type (see @{openmw.input#CONTROL_SWITCH})
+-- @param #boolean value
+
+-------------------------------------------------------------------------------
+-- @type CONTROL_SWITCH
+-- @field [parent=#CONTROL_SWITCH] #string Controls Ability to move
+-- @field [parent=#CONTROL_SWITCH] #string Fighting Ability to attack
+-- @field [parent=#CONTROL_SWITCH] #string Jumping Ability to jump
+-- @field [parent=#CONTROL_SWITCH] #string Looking Ability to change view direction
+-- @field [parent=#CONTROL_SWITCH] #string Magic Ability to use magic
+-- @field [parent=#CONTROL_SWITCH] #string ViewMode Ability to toggle 1st/3rd person view
+-- @field [parent=#CONTROL_SWITCH] #string VanityMode Vanity view if player doesn't touch controls for a long time
+
+-------------------------------------------------------------------------------
+-- Values that can be used with getControlSwitch/setControlSwitch.
+-- @field [parent=#input] #CONTROL_SWITCH CONTROL_SWITCH
+
+-------------------------------------------------------------------------------
+-- @type ACTION
+-- @field [parent=#ACTION] #number GameMenu
+-- @field [parent=#ACTION] #number Screenshot
+-- @field [parent=#ACTION] #number Inventory
+-- @field [parent=#ACTION] #number Console
+-- @field [parent=#ACTION] #number MoveLeft
+-- @field [parent=#ACTION] #number MoveRight
+-- @field [parent=#ACTION] #number MoveForward
+-- @field [parent=#ACTION] #number MoveBackward
+-- @field [parent=#ACTION] #number Activate
+-- @field [parent=#ACTION] #number Use
+-- @field [parent=#ACTION] #number Jump
+-- @field [parent=#ACTION] #number AutoMove
+-- @field [parent=#ACTION] #number Journal
+-- @field [parent=#ACTION] #number Weapon
+-- @field [parent=#ACTION] #number Spell
+-- @field [parent=#ACTION] #number Run
+-- @field [parent=#ACTION] #number CycleSpellLeft
+-- @field [parent=#ACTION] #number CycleSpellRight
+-- @field [parent=#ACTION] #number CycleWeaponLeft
+-- @field [parent=#ACTION] #number CycleWeaponRight
+-- @field [parent=#ACTION] #number ToggleSneak
+-- @field [parent=#ACTION] #number AlwaysRun
+-- @field [parent=#ACTION] #number Sneak
+-- @field [parent=#ACTION] #number QuickSave
+-- @field [parent=#ACTION] #number QuickLoad
+-- @field [parent=#ACTION] #number QuickMenu
+-- @field [parent=#ACTION] #number ToggleWeapon
+-- @field [parent=#ACTION] #number ToggleSpell
+-- @field [parent=#ACTION] #number TogglePOV
+-- @field [parent=#ACTION] #number QuickKey1
+-- @field [parent=#ACTION] #number QuickKey2
+-- @field [parent=#ACTION] #number QuickKey3
+-- @field [parent=#ACTION] #number QuickKey4
+-- @field [parent=#ACTION] #number QuickKey5
+-- @field [parent=#ACTION] #number QuickKey6
+-- @field [parent=#ACTION] #number QuickKey7
+-- @field [parent=#ACTION] #number QuickKey8
+-- @field [parent=#ACTION] #number QuickKey9
+-- @field [parent=#ACTION] #number QuickKey10
+-- @field [parent=#ACTION] #number QuickKeysMenu
+-- @field [parent=#ACTION] #number ToggleHUD
+-- @field [parent=#ACTION] #number ToggleDebug
+-- @field [parent=#ACTION] #number ZoomIn
+-- @field [parent=#ACTION] #number ZoomOut
+
+-------------------------------------------------------------------------------
+-- Values that can be used with isActionPressed.
+-- @field [parent=#input] #ACTION ACTION
+
+-------------------------------------------------------------------------------
+-- @type CONTROLLER_BUTTON
+-- @field [parent=#CONTROLLER_BUTTON] #number A
+-- @field [parent=#CONTROLLER_BUTTON] #number B
+-- @field [parent=#CONTROLLER_BUTTON] #number X
+-- @field [parent=#CONTROLLER_BUTTON] #number Y
+-- @field [parent=#CONTROLLER_BUTTON] #number Back
+-- @field [parent=#CONTROLLER_BUTTON] #number Guide
+-- @field [parent=#CONTROLLER_BUTTON] #number Start
+-- @field [parent=#CONTROLLER_BUTTON] #number LeftStick
+-- @field [parent=#CONTROLLER_BUTTON] #number RightStick
+-- @field [parent=#CONTROLLER_BUTTON] #number LeftShoulder
+-- @field [parent=#CONTROLLER_BUTTON] #number RightShoulder
+-- @field [parent=#CONTROLLER_BUTTON] #number DPadUp
+-- @field [parent=#CONTROLLER_BUTTON] #number DPadDown
+-- @field [parent=#CONTROLLER_BUTTON] #number DPadLeft
+-- @field [parent=#CONTROLLER_BUTTON] #number DPadRight
+
+-------------------------------------------------------------------------------
+-- Values that can be passed to onControllerButtonPress/onControllerButtonRelease engine handlers.
+-- @field [parent=#input] #CONTROLLER_BUTTON CONTROLLER_BUTTON
+
+-------------------------------------------------------------------------------
+-- Ids of game controller axises. Used as an argument in getAxisValue.
+-- @type CONTROLLER_AXIS
+-- @field [parent=#CONTROLLER_AXIS] #number LeftX Left stick horizontal axis (from -1 to 1)
+-- @field [parent=#CONTROLLER_AXIS] #number LeftY Left stick vertical axis (from -1 to 1)
+-- @field [parent=#CONTROLLER_AXIS] #number RightX Right stick horizontal axis (from -1 to 1)
+-- @field [parent=#CONTROLLER_AXIS] #number RightY Right stick vertical axis (from -1 to 1)
+-- @field [parent=#CONTROLLER_AXIS] #number TriggerLeft Left trigger (from 0 to 1)
+-- @field [parent=#CONTROLLER_AXIS] #number TriggerRight Right trigger (from 0 to 1)
+-- @field [parent=#CONTROLLER_AXIS] #number LookUpDown View direction vertical axis (RightY by default, can be mapped to another axis in Options/Controls menu)
+-- @field [parent=#CONTROLLER_AXIS] #number LookLeftRight View direction horizontal axis (RightX by default, can be mapped to another axis in Options/Controls menu)
+-- @field [parent=#CONTROLLER_AXIS] #number MoveForwardBackward Movement forward/backward (LeftY by default, can be mapped to another axis in Options/Controls menu)
+-- @field [parent=#CONTROLLER_AXIS] #number MoveLeftRight Side movement (LeftX by default, can be mapped to another axis in Options/Controls menu)
+
+-------------------------------------------------------------------------------
+-- Values that can be used with getAxisValue.
+-- @field [parent=#input] #CONTROLLER_AXIS CONTROLLER_AXIS
+
+-------------------------------------------------------------------------------
+-- The argument of `onKeyPress`/`onKeyRelease` engine handlers.
+-- @type KeyboardEvent
+-- @field [parent=#KeyboardEvent] #string symbol The pressed symbol (1-symbol string).
+-- @field [parent=#KeyboardEvent] #string code Key code.
+-- @field [parent=#KeyboardEvent] #boolean withShift Is `Shift` key pressed.
+-- @field [parent=#KeyboardEvent] #boolean withCtrl Is `Control` key pressed.
+-- @field [parent=#KeyboardEvent] #boolean withAlt Is `Alt` key pressed.
+-- @field [parent=#KeyboardEvent] #boolean withSuper Is `Super`/`Win` key pressed.
+
+return nil
+

From de9ee2f196574952cfa2c5f10365d8af854c843b Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Wed, 11 Aug 2021 21:53:04 +0200
Subject: [PATCH 1188/2859] Revert "Calls directly MovementSolver::traceDown
 instead of"

This reverts commit c1e50f530b6b7c229864b20ab26be284e3edec42.
---
 apps/openmw/mwphysics/physicssystem.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index bec273daaf..846f80ec64 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -713,7 +713,8 @@ namespace MWPhysics
         auto actor = std::make_shared<Actor>(ptr, shape, mTaskScheduler.get(), canWaterWalk);
         
         // check if Actor is on the ground or in the air
-        MovementSolver::traceDown(ptr, ptr.getRefData().getPosition().asVec3(), actor.get(), mCollisionWorld.get(), 10);
+        traceDown(ptr, ptr.getRefData().getPosition().asVec3(), 10.f);
+
         mActors.emplace(ptr, std::move(actor));
     }
 

From e84a177a917fca82c7d61adc5ecc355f2349f0f0 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 12 Aug 2021 02:02:22 +0200
Subject: [PATCH 1189/2859] Always print object refnum

Also print content file index even when it's negative. To be able to identify
the object unambiguously.
---
 apps/openmw/mwscript/miscextensions.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index b34a359dc4..869a1d540a 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -1363,18 +1363,19 @@ namespace MWScript
                 std::time_t currentTime = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
                 msg << std::put_time(std::gmtime(&currentTime), "%Y.%m.%d %T UTC") << std::endl;
 
-                msg << "Content file: ";
+                msg << "Content file: " << ptr.getCellRef().getRefNum().mContentFile;
 
                 if (!ptr.getCellRef().hasContentFile())
-                    msg << "[None]" << std::endl;
+                    msg << " [None]" << std::endl;
                 else
                 {
                     std::vector<std::string> contentFiles = MWBase::Environment::get().getWorld()->getContentFiles();
 
-                    msg << contentFiles.at (ptr.getCellRef().getRefNum().mContentFile) << std::endl;
-                    msg << "RefNum: " << ptr.getCellRef().getRefNum().mIndex << std::endl;
+                    msg << " [" << contentFiles.at (ptr.getCellRef().getRefNum().mContentFile) << "]" << std::endl;
                 }
 
+                msg << "RefNum: " << ptr.getCellRef().getRefNum().mIndex << std::endl;
+
                 if (ptr.getRefData().isDeletedByContentFile())
                     msg << "[Deleted by content file]" << std::endl;
                 if (!ptr.getRefData().getCount())

From f9c3e1272b0730fa3794048fa81021126d261178 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 12 Aug 2021 12:43:52 +0200
Subject: [PATCH 1190/2859] Add #4595 to changelog

Resolved by https://gitlab.com/OpenMW/openmw/-/merge_requests/430
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f735bd5a13..c53c8401f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
     Feature #2780: A way to see current OpenMW version in the console
     Feature #3616: Allow Zoom levels on the World Map
+    Feature #4595: Unique object identifier
     Feature #4737: Handle instance move from one cell to another
     Feature #5489: MCP: Telekinesis fix for activators
     Feature #5996: Support Lua scripts in OpenMW

From b49f51cbfce92a8448454d10b9aff6f3f10a2786 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Thu, 12 Aug 2021 18:33:06 +0300
Subject: [PATCH 1191/2859] Serialize NifOsg::MatrixTransform children properly

---
 components/sceneutil/serialize.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/sceneutil/serialize.cpp b/components/sceneutil/serialize.cpp
index 1b5c1feed8..703b63af7d 100644
--- a/components/sceneutil/serialize.cpp
+++ b/components/sceneutil/serialize.cpp
@@ -80,7 +80,7 @@ class MatrixTransformSerializer : public osgDB::ObjectWrapper
 {
 public:
     MatrixTransformSerializer()
-        : osgDB::ObjectWrapper(createInstanceFunc<NifOsg::MatrixTransform>, "NifOsg::MatrixTransform", "osg::Object osg::Node osg::Transform osg::MatrixTransform NifOsg::MatrixTransform")
+        : osgDB::ObjectWrapper(createInstanceFunc<NifOsg::MatrixTransform>, "NifOsg::MatrixTransform", "osg::Object osg::Node osg::Group osg::Transform osg::MatrixTransform NifOsg::MatrixTransform")
     {
     }
 };

From 8287c5ee4e8ce0cb68d92bcbe638d7fc4e732a9b Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Thu, 12 Aug 2021 17:38:09 +0000
Subject: [PATCH 1192/2859] Remove incremental link files from the artefacts

They make the files people download much bigger.
---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a727fce684..5ed6c97da0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -217,6 +217,7 @@ variables: &tests-targets
     - 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
+    - Get-ChildItem -Recurse *.ilk | Remove-Item
     - |
       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
@@ -318,6 +319,7 @@ Windows_Ninja_Tests_RelWithDebInfo:
     - 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
+    - Get-ChildItem -Recurse *.ilk | Remove-Item
     - |
       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

From 9460a8760e5617e60234a0f9a1bb5fcc643c7bc8 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 7 Aug 2021 11:48:37 +0200
Subject: [PATCH 1193/2859] Move operator<< for UpdateNavMeshStatus to header

---
 .../detournavigator/asyncnavmeshupdater.cpp   | 26 ------------------
 .../detournavigator/navmeshcacheitem.hpp      | 27 +++++++++++++++++++
 2 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index a0c9cba613..8d43449f87 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -48,32 +48,6 @@ namespace
 
 namespace DetourNavigator
 {
-    static std::ostream& operator <<(std::ostream& stream, UpdateNavMeshStatus value)
-    {
-        switch (value)
-        {
-            case UpdateNavMeshStatus::ignored:
-                return stream << "ignore";
-            case UpdateNavMeshStatus::removed:
-                return stream << "removed";
-            case UpdateNavMeshStatus::added:
-                return stream << "add";
-            case UpdateNavMeshStatus::replaced:
-                return stream << "replaced";
-            case UpdateNavMeshStatus::failed:
-                return stream << "failed";
-            case UpdateNavMeshStatus::lost:
-                return stream << "lost";
-            case UpdateNavMeshStatus::cached:
-                return stream << "cached";
-            case UpdateNavMeshStatus::unchanged:
-                return stream << "unchanged";
-            case UpdateNavMeshStatus::restored:
-                return stream << "restored";
-        }
-        return stream << "unknown(" << static_cast<unsigned>(value) << ")";
-    }
-
     AsyncNavMeshUpdater::AsyncNavMeshUpdater(const Settings& settings, TileCachedRecastMeshManager& recastMeshManager,
             OffMeshConnectionsManager& offMeshConnectionsManager)
         : mSettings(settings)
diff --git a/components/detournavigator/navmeshcacheitem.hpp b/components/detournavigator/navmeshcacheitem.hpp
index 5558f4e1f5..ac68caedb3 100644
--- a/components/detournavigator/navmeshcacheitem.hpp
+++ b/components/detournavigator/navmeshcacheitem.hpp
@@ -10,6 +10,7 @@
 #include <components/misc/guarded.hpp>
 
 #include <map>
+#include <ostream>
 
 struct dtMeshTile;
 
@@ -33,6 +34,32 @@ namespace DetourNavigator
         return (static_cast<unsigned>(value) & static_cast<unsigned>(UpdateNavMeshStatus::failed)) == 0;
     }
 
+    inline std::ostream& operator <<(std::ostream& stream, UpdateNavMeshStatus value)
+    {
+        switch (value)
+        {
+            case UpdateNavMeshStatus::ignored:
+                return stream << "ignore";
+            case UpdateNavMeshStatus::removed:
+                return stream << "removed";
+            case UpdateNavMeshStatus::added:
+                return stream << "add";
+            case UpdateNavMeshStatus::replaced:
+                return stream << "replaced";
+            case UpdateNavMeshStatus::failed:
+                return stream << "failed";
+            case UpdateNavMeshStatus::lost:
+                return stream << "lost";
+            case UpdateNavMeshStatus::cached:
+                return stream << "cached";
+            case UpdateNavMeshStatus::unchanged:
+                return stream << "unchanged";
+            case UpdateNavMeshStatus::restored:
+                return stream << "restored";
+        }
+        return stream << "unknown(" << static_cast<unsigned>(value) << ")";
+    }
+
     class UpdateNavMeshStatusBuilder
     {
     public:

From f1d05a93bf38a283f5ff9f9883d4aec1fb96fd3b Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Thu, 12 Aug 2021 22:28:16 +0300
Subject: [PATCH 1194/2859] Get index and model from proxy

---
 apps/opencs/model/world/commanddispatcher.cpp | 15 ++++++++++++++-
 apps/opencs/model/world/commanddispatcher.hpp |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/model/world/commanddispatcher.cpp b/apps/opencs/model/world/commanddispatcher.cpp
index b517fed0fb..f753ec2e31 100644
--- a/apps/opencs/model/world/commanddispatcher.cpp
+++ b/apps/opencs/model/world/commanddispatcher.cpp
@@ -3,6 +3,9 @@
 #include <algorithm>
 #include <memory>
 
+#include <QAbstractItemModel>
+#include <QAbstractProxyModel>
+
 #include <components/misc/stringops.hpp>
 #include <components/misc/constants.hpp>
 
@@ -134,7 +137,7 @@ std::vector<CSMWorld::UniversalId> CSMWorld::CommandDispatcher::getExtendedTypes
     return tables;
 }
 
-void CSMWorld::CommandDispatcher::executeModify (QAbstractItemModel *model, const QModelIndex& index, const QVariant& new_)
+void CSMWorld::CommandDispatcher::executeModify (QAbstractItemModel *sourceModel, const QModelIndex& sourceIndex, const QVariant& new_)
 {
     if (mLocked)
         return;
@@ -147,6 +150,16 @@ void CSMWorld::CommandDispatcher::executeModify (QAbstractItemModel *model, cons
     std::unique_ptr<CSMWorld::ModifyCommand> modifyData;
     std::unique_ptr<CSMWorld::UpdateCellCommand> modifyCell;
 
+    QAbstractItemModel *model;
+    QModelIndex index;
+
+    if (QAbstractProxyModel *proxy = dynamic_cast<QAbstractProxyModel *> (sourceModel))
+    {
+        // Replace proxy with actual model
+        index = proxy->mapToSource (sourceIndex);
+        model = proxy->sourceModel();
+    }
+
     int columnId = model->data (index, ColumnBase::Role_ColumnId).toInt();
 
     int stateColumn = dynamic_cast<CSMWorld::IdTable&>(*model).findColumnIndex(Columns::ColumnId_Modification);
diff --git a/apps/opencs/model/world/commanddispatcher.hpp b/apps/opencs/model/world/commanddispatcher.hpp
index 538fd7f188..13724f5dbd 100644
--- a/apps/opencs/model/world/commanddispatcher.hpp
+++ b/apps/opencs/model/world/commanddispatcher.hpp
@@ -60,7 +60,7 @@ namespace CSMWorld
             ///
             /// \attention model must either be a model for the table operated on by this
             /// dispatcher or a proxy of it.
-            void executeModify (QAbstractItemModel *model, const QModelIndex& index, const QVariant& new_);
+            void executeModify (QAbstractItemModel *sourceModel, const QModelIndex& sourceIndex, const QVariant& new_);
 
         public slots:
 

From 298db2ef76e6ea8a8f9b251b100e66c602db45fa Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Thu, 12 Aug 2021 22:31:37 +0300
Subject: [PATCH 1195/2859] Initialize and check pointer.

---
 apps/opencs/model/world/commanddispatcher.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/opencs/model/world/commanddispatcher.cpp b/apps/opencs/model/world/commanddispatcher.cpp
index f753ec2e31..13e66fd5cd 100644
--- a/apps/opencs/model/world/commanddispatcher.cpp
+++ b/apps/opencs/model/world/commanddispatcher.cpp
@@ -150,7 +150,7 @@ void CSMWorld::CommandDispatcher::executeModify (QAbstractItemModel *sourceModel
     std::unique_ptr<CSMWorld::ModifyCommand> modifyData;
     std::unique_ptr<CSMWorld::UpdateCellCommand> modifyCell;
 
-    QAbstractItemModel *model;
+    QAbstractItemModel *model(nullptr);
     QModelIndex index;
 
     if (QAbstractProxyModel *proxy = dynamic_cast<QAbstractProxyModel *> (sourceModel))
@@ -160,6 +160,8 @@ void CSMWorld::CommandDispatcher::executeModify (QAbstractItemModel *sourceModel
         model = proxy->sourceModel();
     }
 
+    if (!model) return;
+
     int columnId = model->data (index, ColumnBase::Role_ColumnId).toInt();
 
     int stateColumn = dynamic_cast<CSMWorld::IdTable&>(*model).findColumnIndex(Columns::ColumnId_Modification);

From a99266a60e5478609a7f2ecc1ed77e3847c2ec58 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 12 Aug 2021 21:44:07 +0200
Subject: [PATCH 1196/2859] Do not measure total navmesh generation duration

This is not a useful thing anymore.
---
 components/detournavigator/asyncnavmeshupdater.cpp | 12 ------------
 components/detournavigator/asyncnavmeshupdater.hpp |  3 ---
 2 files changed, 15 deletions(-)

diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index 8d43449f87..a62734e926 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -253,8 +253,6 @@ namespace DetourNavigator
 
         const auto start = std::chrono::steady_clock::now();
 
-        const auto firstStart = setFirstStart(start);
-
         const auto navMeshCacheItem = job.mNavMeshCacheItem.lock();
 
         if (!navMeshCacheItem)
@@ -305,7 +303,6 @@ namespace DetourNavigator
             " generation=" << locked->getGeneration() <<
             " revision=" << locked->getNavMeshRevision() <<
             " time=" << std::chrono::duration_cast<FloatMs>(finish - start).count() << "ms" <<
-            " total_time=" << std::chrono::duration_cast<FloatMs>(finish - firstStart).count() << "ms"
             " thread=" << std::this_thread::get_id();
 
         return isSuccess(status);
@@ -327,7 +324,6 @@ namespace DetourNavigator
 
             if (!mHasJob.wait_for(lock, std::chrono::milliseconds(10), hasJob))
             {
-                mFirstStart.lock()->reset();
                 if (mJobs.empty() && getTotalThreadJobsUnsafe() == 0)
                     mDone.notify_all();
                 return std::nullopt;
@@ -396,14 +392,6 @@ namespace DetourNavigator
                 writeToFile(shared->lockConst()->getImpl(), mSettings.get().mNavMeshPathPrefix, navMeshRevision);
     }
 
-    std::chrono::steady_clock::time_point AsyncNavMeshUpdater::setFirstStart(const std::chrono::steady_clock::time_point& value)
-    {
-        const auto locked = mFirstStart.lock();
-        if (!*locked)
-            *locked = value;
-        return *locked.get();
-    }
-
     void AsyncNavMeshUpdater::repost(Job&& job)
     {
         if (mShouldStop || job.mTryNumber > 2)
diff --git a/components/detournavigator/asyncnavmeshupdater.hpp b/components/detournavigator/asyncnavmeshupdater.hpp
index e8b2611e97..5743bc8f9c 100644
--- a/components/detournavigator/asyncnavmeshupdater.hpp
+++ b/components/detournavigator/asyncnavmeshupdater.hpp
@@ -111,7 +111,6 @@ namespace DetourNavigator
         Jobs mJobs;
         std::map<osg::Vec3f, std::set<TilePosition>> mPushed;
         Misc::ScopeGuarded<TilePosition> mPlayerTile;
-        Misc::ScopeGuarded<std::optional<std::chrono::steady_clock::time_point>> mFirstStart;
         NavMeshTilesCache mNavMeshTilesCache;
         Misc::ScopeGuarded<std::map<osg::Vec3f, std::map<TilePosition, std::thread::id>>> mProcessingTiles;
         std::map<osg::Vec3f, std::map<TilePosition, std::chrono::steady_clock::time_point>> mLastUpdates;
@@ -131,8 +130,6 @@ namespace DetourNavigator
 
         void writeDebugFiles(const Job& job, const RecastMesh* recastMesh) const;
 
-        std::chrono::steady_clock::time_point setFirstStart(const std::chrono::steady_clock::time_point& value);
-
         void repost(Job&& job);
 
         std::thread::id lockTile(const osg::Vec3f& agentHalfExtents, const TilePosition& changedTile);

From 8db640289c864ab129cf1d1a2200eb7e481f3ba2 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 12 Aug 2021 22:05:44 +0200
Subject: [PATCH 1197/2859] Use single set to store pushed jobs for tiles

---
 .../detournavigator/asyncnavmeshupdater.cpp   | 39 +++++++++----------
 .../detournavigator/asyncnavmeshupdater.hpp   | 14 ++-----
 2 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index a62734e926..dda4268571 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -173,8 +173,6 @@ namespace DetourNavigator
                 return true;
             }
             minDistanceToPlayer = getMinDistanceTo(playerPosition, maxDistanceToPlayer, mPushed, mPresentTiles);
-            for (const auto& [threadId, queue] : mThreadsQueues)
-                minDistanceToPlayer = getMinDistanceTo(playerPosition, minDistanceToPlayer, queue.mPushed, mPresentTiles);
             return minDistanceToPlayer >= maxDistanceToPlayer;
         };
         std::unique_lock<std::mutex> lock(mMutex);
@@ -319,7 +317,7 @@ namespace DetourNavigator
         {
             const auto hasJob = [&] {
                 return (!mJobs.empty() && mJobs.front().mProcessTime <= std::chrono::steady_clock::now())
-                    || !threadQueue.mJobs.empty();
+                    || !threadQueue.empty();
             };
 
             if (!mHasJob.wait_for(lock, std::chrono::milliseconds(10), hasJob))
@@ -330,11 +328,11 @@ namespace DetourNavigator
             }
 
             Log(Debug::Debug) << "Got " << mJobs.size() << " navigator jobs and "
-                << threadQueue.mJobs.size() << " thread jobs by thread=" << std::this_thread::get_id();
+                << threadQueue.size() << " thread jobs by thread=" << std::this_thread::get_id();
 
-            auto job = threadQueue.mJobs.empty()
-                ? getJob(mJobs, mPushed, true)
-                : getJob(threadQueue.mJobs, threadQueue.mPushed, false);
+            auto job = threadQueue.empty()
+                ? getJob(mJobs, true)
+                : getJob(threadQueue, false);
 
             if (!job)
                 continue;
@@ -342,13 +340,22 @@ namespace DetourNavigator
             const auto owner = lockTile(job->mAgentHalfExtents, job->mChangedTile);
 
             if (owner == threadId)
+            {
+                const auto it = mPushed.find(job->mAgentHalfExtents);
+                if (it != mPushed.end())
+                {
+                    it->second.erase(job->mChangedTile);
+                    if (it->second.empty())
+                        mPushed.erase(it);
+                }
                 return job;
+            }
 
             postThreadJob(std::move(*job), mThreadsQueues[owner]);
         }
     }
 
-    std::optional<AsyncNavMeshUpdater::Job> AsyncNavMeshUpdater::getJob(Jobs& jobs, Pushed& pushed, bool changeLastUpdate)
+    std::optional<AsyncNavMeshUpdater::Job> AsyncNavMeshUpdater::getJob(Jobs& jobs, bool changeLastUpdate)
     {
         const auto now = std::chrono::steady_clock::now();
 
@@ -361,11 +368,6 @@ namespace DetourNavigator
         if (changeLastUpdate && job.mChangeType == ChangeType::update)
             mLastUpdates[job.mAgentHalfExtents][job.mChangedTile] = now;
 
-        const auto it = pushed.find(job.mAgentHalfExtents);
-        it->second.erase(job.mChangedTile);
-        if (it->second.empty())
-            pushed.erase(it);
-
         return job;
     }
 
@@ -407,13 +409,10 @@ namespace DetourNavigator
         }
     }
 
-    void AsyncNavMeshUpdater::postThreadJob(Job&& job, Queue& queue)
+    void AsyncNavMeshUpdater::postThreadJob(Job&& job, Jobs& queue)
     {
-        if (queue.mPushed[job.mAgentHalfExtents].insert(job.mChangedTile).second)
-        {
-            queue.mJobs.push_back(std::move(job));
-            mHasJob.notify_all();
-        }
+        queue.push_back(std::move(job));
+        mHasJob.notify_all();
     }
 
     std::thread::id AsyncNavMeshUpdater::lockTile(const osg::Vec3f& agentHalfExtents, const TilePosition& changedTile)
@@ -475,7 +474,7 @@ namespace DetourNavigator
     std::size_t AsyncNavMeshUpdater::getTotalThreadJobsUnsafe() const
     {
         return std::accumulate(mThreadsQueues.begin(), mThreadsQueues.end(), std::size_t(0),
-            [] (auto r, const auto& v) { return r + v.second.mJobs.size(); });
+            [] (auto r, const auto& v) { return r + v.second.size(); });
     }
 
     void AsyncNavMeshUpdater::cleanupLastUpdates()
diff --git a/components/detournavigator/asyncnavmeshupdater.hpp b/components/detournavigator/asyncnavmeshupdater.hpp
index 5743bc8f9c..cc6ae26833 100644
--- a/components/detournavigator/asyncnavmeshupdater.hpp
+++ b/components/detournavigator/asyncnavmeshupdater.hpp
@@ -92,14 +92,6 @@ namespace DetourNavigator
         using Jobs = std::deque<Job>;
         using Pushed = std::map<osg::Vec3f, std::set<TilePosition>>;
 
-        struct Queue
-        {
-            Jobs mJobs;
-            Pushed mPushed;
-
-            Queue() = default;
-        };
-
         std::reference_wrapper<const Settings> mSettings;
         std::reference_wrapper<TileCachedRecastMeshManager> mRecastMeshManager;
         std::reference_wrapper<OffMeshConnectionsManager> mOffMeshConnectionsManager;
@@ -115,7 +107,7 @@ namespace DetourNavigator
         Misc::ScopeGuarded<std::map<osg::Vec3f, std::map<TilePosition, std::thread::id>>> mProcessingTiles;
         std::map<osg::Vec3f, std::map<TilePosition, std::chrono::steady_clock::time_point>> mLastUpdates;
         std::set<std::tuple<osg::Vec3f, TilePosition>> mPresentTiles;
-        std::map<std::thread::id, Queue> mThreadsQueues;
+        std::map<std::thread::id, Jobs> mThreadsQueues;
         std::vector<std::thread> mThreads;
 
         void process() noexcept;
@@ -124,9 +116,9 @@ namespace DetourNavigator
 
         std::optional<Job> getNextJob();
 
-        std::optional<Job> getJob(Jobs& jobs, Pushed& pushed, bool changeLastUpdate);
+        std::optional<Job> getJob(Jobs& jobs, bool changeLastUpdate);
 
-        void postThreadJob(Job&& job, Queue& queue);
+        void postThreadJob(Job&& job, Jobs& queue);
 
         void writeDebugFiles(const Job& job, const RecastMesh* recastMesh) const;
 

From b0b60b05b81d0b3fd1b050b9a91908dd67d8dec4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Mocquillon?= <cedric.mocquillon@gmail.com>
Date: Thu, 12 Aug 2021 22:06:21 +0200
Subject: [PATCH 1198/2859] Do not update doors markers at each frame, only
 when needed

---
 apps/openmw/mwgui/mapwindow.cpp | 17 ++++++++++++++++-
 apps/openmw/mwgui/mapwindow.hpp |  2 ++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index 485e7f7ed0..e42808776c 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -192,6 +192,7 @@ namespace MWGui
         , mMarkerUpdateTimer(0.0f)
         , mLastDirectionX(0.0f)
         , mLastDirectionY(0.0f)
+        , mNeedDoorMarkersUpdate(false)
     {
         mCustomMarkers.eventMarkersChanged += MyGUI::newDelegate(this, &LocalMapBase::updateCustomMarkers);
     }
@@ -440,6 +441,10 @@ namespace MWGui
             }
         }
 
+        // Delay the door markers update until scripts have been given a chance to run.
+        // If we don't do this, door markers that should be disabled will still appear on the map.
+        mNeedDoorMarkersUpdate = true;
+
         for (MyGUI::Widget* widget : currentDoorMarkersWidgets())
             widget->setCoord(getMarkerCoordinates(widget, 8));
 
@@ -544,7 +549,11 @@ namespace MWGui
 
     void LocalMapBase::onFrame(float dt)
     {
-        updateDoorMarkers();
+        if (mNeedDoorMarkersUpdate)
+        {
+            updateDoorMarkers();
+            mNeedDoorMarkersUpdate = false;
+        }
 
         mMarkerUpdateTimer += dt;
 
@@ -950,6 +959,9 @@ namespace MWGui
                 zoomOnCursor(zoomRatio);
                 return; //the zoom out is too big, we switch to the global map
             }
+
+            if (zoomOut)
+                mNeedDoorMarkersUpdate = true;
         }
         zoomOnCursor(speedDiff);
     }
@@ -1172,7 +1184,10 @@ namespace MWGui
         MyGUI::IntPoint diff = MyGUI::IntPoint(_left, _top) - mLastDragPos;
 
         if (!mGlobal)
+        {
+            mNeedDoorMarkersUpdate = true;
             mLocalMap->setViewOffset( mLocalMap->getViewOffset() + diff );
+        }
         else
             mGlobalMap->setViewOffset( mGlobalMap->getViewOffset() + diff );
 
diff --git a/apps/openmw/mwgui/mapwindow.hpp b/apps/openmw/mwgui/mapwindow.hpp
index cb0d368b30..d3cd626475 100644
--- a/apps/openmw/mwgui/mapwindow.hpp
+++ b/apps/openmw/mwgui/mapwindow.hpp
@@ -187,6 +187,8 @@ namespace MWGui
         float mLastDirectionX;
         float mLastDirectionY;
 
+        bool mNeedDoorMarkersUpdate;
+
     private:
         void updateDoorMarkers();
     };

From 902b0f9f84344a00a55b089c0cba8236671b44dd Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 5 Aug 2021 23:18:03 +0200
Subject: [PATCH 1199/2859] Store jobs in the same container until they are
 processed

Push to queue and reorder only iterators.
---
 .../detournavigator/asyncnavmeshupdater.cpp   | 116 +++++++++++-------
 .../detournavigator/asyncnavmeshupdater.hpp   |  57 ++++-----
 2 files changed, 94 insertions(+), 79 deletions(-)

diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index dda4268571..1f7134dcea 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -20,6 +20,8 @@ namespace
     using DetourNavigator::TilePosition;
     using DetourNavigator::UpdateType;
     using DetourNavigator::ChangeType;
+    using DetourNavigator::Job;
+    using DetourNavigator::JobIt;
 
     int getManhattanDistance(const TilePosition& lhs, const TilePosition& rhs)
     {
@@ -44,6 +46,25 @@ namespace
             return UpdateType::Temporary;
         return UpdateType::Persistent;
     }
+
+    auto getPriority(const Job& job) noexcept
+    {
+        return std::make_tuple(job.mProcessTime, job.mTryNumber, job.mChangeType, job.mDistanceToPlayer, job.mDistanceToOrigin);
+    }
+
+    struct LessByJobPriority
+    {
+        bool operator()(JobIt lhs, JobIt rhs) const noexcept
+        {
+            return getPriority(*lhs) < getPriority(*rhs);
+        }
+    };
+
+    void insertPrioritizedJob(JobIt job, std::deque<JobIt>& queue)
+    {
+        const auto it = std::upper_bound(queue.begin(), queue.end(), job, LessByJobPriority {});
+        queue.insert(it, job);
+    }
 }
 
 namespace DetourNavigator
@@ -64,7 +85,8 @@ namespace DetourNavigator
     {
         mShouldStop = true;
         std::unique_lock<std::mutex> lock(mMutex);
-        mJobs = decltype(mJobs)();
+        mThreadsQueues.clear();
+        mWaiting.clear();
         mHasJob.notify_all();
         lock.unlock();
         for (auto& thread : mThreads)
@@ -88,8 +110,8 @@ namespace DetourNavigator
         const std::lock_guard<std::mutex> lock(mMutex);
 
         if (playerTileChanged)
-            for (auto& job : mJobs)
-                job.mDistanceToPlayer = getManhattanDistance(job.mChangedTile, playerTile);
+            for (JobIt job : mWaiting)
+                job->mDistanceToPlayer = getManhattanDistance(job->mChangedTile, playerTile);
 
         for (const auto& changedTile : changedTiles)
         {
@@ -108,24 +130,21 @@ namespace DetourNavigator
                     ? mLastUpdates[job.mAgentHalfExtents][job.mChangedTile] + mSettings.get().mMinUpdateInterval
                     : std::chrono::steady_clock::time_point();
 
+                const JobIt it = mJobs.insert(mJobs.end(), std::move(job));
+
                 if (playerTileChanged)
-                {
-                    mJobs.push_back(std::move(job));
-                }
+                    mWaiting.push_back(it);
                 else
-                {
-                    const auto it = std::upper_bound(mJobs.begin(), mJobs.end(), job);
-                    mJobs.insert(it, std::move(job));
-                }
+                    insertPrioritizedJob(it, mWaiting);
             }
         }
 
         if (playerTileChanged)
-            std::sort(mJobs.begin(), mJobs.end());
+            std::sort(mWaiting.begin(), mWaiting.end(), LessByJobPriority {});
 
         Log(Debug::Debug) << "Posted " << mJobs.size() << " navigator jobs";
 
-        if (!mJobs.empty())
+        if (!mWaiting.empty())
             mHasJob.notify_all();
     }
 
@@ -166,7 +185,7 @@ namespace DetourNavigator
         int minDistanceToPlayer = 0;
         const auto isDone = [&]
         {
-            jobsLeft = mJobs.size() + getTotalThreadJobsUnsafe();
+            jobsLeft = mJobs.size();
             if (jobsLeft == 0)
             {
                 minDistanceToPlayer = 0;
@@ -199,7 +218,7 @@ namespace DetourNavigator
     {
         {
             std::unique_lock<std::mutex> lock(mMutex);
-            mDone.wait(lock, [this] { return mJobs.size() + getTotalThreadJobsUnsafe() == 0; });
+            mDone.wait(lock, [this] { return mJobs.size() == 0; });
         }
         mProcessingTiles.wait(mProcessed, [] (const auto& v) { return v.empty(); });
     }
@@ -210,7 +229,7 @@ namespace DetourNavigator
 
         {
             const std::lock_guard<std::mutex> lock(mMutex);
-            jobs = mJobs.size() + getTotalThreadJobsUnsafe();
+            jobs = mJobs.size();
         }
 
         stats.setAttribute(frameNumber, "NavMesh UpdateJobs", jobs);
@@ -226,12 +245,14 @@ namespace DetourNavigator
         {
             try
             {
-                if (auto job = getNextJob())
+                if (JobIt job = getNextJob(); job != mJobs.end())
                 {
                     const auto processed = processJob(*job);
                     unlockTile(job->mAgentHalfExtents, job->mChangedTile);
-                    if (!processed)
-                        repost(std::move(*job));
+                    if (processed)
+                        removeJob(job);
+                    else
+                        repost(job);
                 }
                 else
                     cleanupLastUpdates();
@@ -306,7 +327,7 @@ namespace DetourNavigator
         return isSuccess(status);
     }
 
-    std::optional<AsyncNavMeshUpdater::Job> AsyncNavMeshUpdater::getNextJob()
+    JobIt AsyncNavMeshUpdater::getNextJob()
     {
         std::unique_lock<std::mutex> lock(mMutex);
 
@@ -316,25 +337,25 @@ namespace DetourNavigator
         while (true)
         {
             const auto hasJob = [&] {
-                return (!mJobs.empty() && mJobs.front().mProcessTime <= std::chrono::steady_clock::now())
+                return (!mWaiting.empty() && mWaiting.front()->mProcessTime <= std::chrono::steady_clock::now())
                     || !threadQueue.empty();
             };
 
             if (!mHasJob.wait_for(lock, std::chrono::milliseconds(10), hasJob))
             {
-                if (mJobs.empty() && getTotalThreadJobsUnsafe() == 0)
+                if (mJobs.empty())
                     mDone.notify_all();
-                return std::nullopt;
+                return mJobs.end();
             }
 
             Log(Debug::Debug) << "Got " << mJobs.size() << " navigator jobs and "
                 << threadQueue.size() << " thread jobs by thread=" << std::this_thread::get_id();
 
-            auto job = threadQueue.empty()
-                ? getJob(mJobs, true)
+            const JobIt job = threadQueue.empty()
+                ? getJob(mWaiting, true)
                 : getJob(threadQueue, false);
 
-            if (!job)
+            if (job == mJobs.end())
                 continue;
 
             const auto owner = lockTile(job->mAgentHalfExtents, job->mChangedTile);
@@ -351,22 +372,22 @@ namespace DetourNavigator
                 return job;
             }
 
-            postThreadJob(std::move(*job), mThreadsQueues[owner]);
+            postThreadJob(job, mThreadsQueues[owner]);
         }
     }
 
-    std::optional<AsyncNavMeshUpdater::Job> AsyncNavMeshUpdater::getJob(Jobs& jobs, bool changeLastUpdate)
+    JobIt AsyncNavMeshUpdater::getJob(std::deque<JobIt>& jobs, bool changeLastUpdate)
     {
         const auto now = std::chrono::steady_clock::now();
+        JobIt job = jobs.front();
 
-        if (jobs.front().mProcessTime > now)
-            return {};
+        if (job->mProcessTime > now)
+            return mJobs.end();
 
-        Job job = jobs.front();
         jobs.pop_front();
 
-        if (changeLastUpdate && job.mChangeType == ChangeType::update)
-            mLastUpdates[job.mAgentHalfExtents][job.mChangedTile] = now;
+        if (changeLastUpdate && job->mChangeType == ChangeType::update)
+            mLastUpdates[job->mAgentHalfExtents][job->mChangedTile] = now;
 
         return job;
     }
@@ -394,24 +415,27 @@ namespace DetourNavigator
                 writeToFile(shared->lockConst()->getImpl(), mSettings.get().mNavMeshPathPrefix, navMeshRevision);
     }
 
-    void AsyncNavMeshUpdater::repost(Job&& job)
+    void AsyncNavMeshUpdater::repost(JobIt job)
     {
-        if (mShouldStop || job.mTryNumber > 2)
+        if (mShouldStop || job->mTryNumber > 2)
             return;
 
         const std::lock_guard<std::mutex> lock(mMutex);
 
-        if (mPushed[job.mAgentHalfExtents].insert(job.mChangedTile).second)
+        if (mPushed[job->mAgentHalfExtents].insert(job->mChangedTile).second)
         {
-            ++job.mTryNumber;
-            mJobs.push_back(std::move(job));
+            ++job->mTryNumber;
+            mWaiting.push_back(job);
             mHasJob.notify_all();
+            return;
         }
+
+        mJobs.erase(job);
     }
 
-    void AsyncNavMeshUpdater::postThreadJob(Job&& job, Jobs& queue)
+    void AsyncNavMeshUpdater::postThreadJob(JobIt job, std::deque<JobIt>& queue)
     {
-        queue.push_back(std::move(job));
+        queue.push_back(job);
         mHasJob.notify_all();
     }
 
@@ -468,13 +492,7 @@ namespace DetourNavigator
     std::size_t AsyncNavMeshUpdater::getTotalJobs() const
     {
         const std::scoped_lock lock(mMutex);
-        return mJobs.size() + getTotalThreadJobsUnsafe();
-    }
-
-    std::size_t AsyncNavMeshUpdater::getTotalThreadJobsUnsafe() const
-    {
-        return std::accumulate(mThreadsQueues.begin(), mThreadsQueues.end(), std::size_t(0),
-            [] (auto r, const auto& v) { return r + v.second.size(); });
+        return mJobs.size();
     }
 
     void AsyncNavMeshUpdater::cleanupLastUpdates()
@@ -499,4 +517,10 @@ namespace DetourNavigator
                 ++agent;
         }
     }
+
+    void AsyncNavMeshUpdater::removeJob(JobIt job)
+    {
+        const std::lock_guard lock(mMutex);
+        mJobs.erase(job);
+    }
 }
diff --git a/components/detournavigator/asyncnavmeshupdater.hpp b/components/detournavigator/asyncnavmeshupdater.hpp
index cc6ae26833..ab4be0b8d1 100644
--- a/components/detournavigator/asyncnavmeshupdater.hpp
+++ b/components/detournavigator/asyncnavmeshupdater.hpp
@@ -19,6 +19,7 @@
 #include <set>
 #include <thread>
 #include <tuple>
+#include <list>
 
 class dtNavMesh;
 
@@ -52,6 +53,20 @@ namespace DetourNavigator
         return stream << "ChangeType::" << static_cast<int>(value);
     }
 
+    struct Job
+    {
+        osg::Vec3f mAgentHalfExtents;
+        std::weak_ptr<GuardedNavMeshCacheItem> mNavMeshCacheItem;
+        TilePosition mChangedTile;
+        unsigned mTryNumber;
+        ChangeType mChangeType;
+        int mDistanceToPlayer;
+        int mDistanceToOrigin;
+        std::chrono::steady_clock::time_point mProcessTime;
+    };
+
+    using JobIt = std::list<Job>::iterator;
+
     class AsyncNavMeshUpdater
     {
     public:
@@ -67,31 +82,6 @@ namespace DetourNavigator
         void reportStats(unsigned int frameNumber, osg::Stats& stats) const;
 
     private:
-        struct Job
-        {
-            osg::Vec3f mAgentHalfExtents;
-            std::weak_ptr<GuardedNavMeshCacheItem> mNavMeshCacheItem;
-            TilePosition mChangedTile;
-            unsigned mTryNumber;
-            ChangeType mChangeType;
-            int mDistanceToPlayer;
-            int mDistanceToOrigin;
-            std::chrono::steady_clock::time_point mProcessTime;
-
-            std::tuple<std::chrono::steady_clock::time_point, unsigned, ChangeType, int, int> getPriority() const
-            {
-                return std::make_tuple(mProcessTime, mTryNumber, mChangeType, mDistanceToPlayer, mDistanceToOrigin);
-            }
-
-            friend inline bool operator <(const Job& lhs, const Job& rhs)
-            {
-                return lhs.getPriority() < rhs.getPriority();
-            }
-        };
-
-        using Jobs = std::deque<Job>;
-        using Pushed = std::map<osg::Vec3f, std::set<TilePosition>>;
-
         std::reference_wrapper<const Settings> mSettings;
         std::reference_wrapper<TileCachedRecastMeshManager> mRecastMeshManager;
         std::reference_wrapper<OffMeshConnectionsManager> mOffMeshConnectionsManager;
@@ -100,29 +90,30 @@ namespace DetourNavigator
         std::condition_variable mHasJob;
         std::condition_variable mDone;
         std::condition_variable mProcessed;
-        Jobs mJobs;
+        std::list<Job> mJobs;
+        std::deque<JobIt> mWaiting;
         std::map<osg::Vec3f, std::set<TilePosition>> mPushed;
         Misc::ScopeGuarded<TilePosition> mPlayerTile;
         NavMeshTilesCache mNavMeshTilesCache;
         Misc::ScopeGuarded<std::map<osg::Vec3f, std::map<TilePosition, std::thread::id>>> mProcessingTiles;
         std::map<osg::Vec3f, std::map<TilePosition, std::chrono::steady_clock::time_point>> mLastUpdates;
         std::set<std::tuple<osg::Vec3f, TilePosition>> mPresentTiles;
-        std::map<std::thread::id, Jobs> mThreadsQueues;
+        std::map<std::thread::id, std::deque<JobIt>> mThreadsQueues;
         std::vector<std::thread> mThreads;
 
         void process() noexcept;
 
         bool processJob(const Job& job);
 
-        std::optional<Job> getNextJob();
+        JobIt getNextJob();
 
-        std::optional<Job> getJob(Jobs& jobs, bool changeLastUpdate);
+        JobIt getJob(std::deque<JobIt>& jobs, bool changeLastUpdate);
 
-        void postThreadJob(Job&& job, Jobs& queue);
+        void postThreadJob(JobIt job, std::deque<JobIt>& queue);
 
         void writeDebugFiles(const Job& job, const RecastMesh* recastMesh) const;
 
-        void repost(Job&& job);
+        void repost(JobIt job);
 
         std::thread::id lockTile(const osg::Vec3f& agentHalfExtents, const TilePosition& changedTile);
 
@@ -130,13 +121,13 @@ namespace DetourNavigator
 
         inline std::size_t getTotalJobs() const;
 
-        inline std::size_t getTotalThreadJobsUnsafe() const;
-
         void cleanupLastUpdates();
 
         int waitUntilJobsDoneForNotPresentTiles(const std::size_t initialJobsLeft, std::size_t& maxJobsLeft, Loading::Listener& listener);
 
         void waitUntilAllJobsDone();
+
+        inline void removeJob(JobIt job);
     };
 }
 

From bfcc430822a1dbfc46dbba072ddde04b9eaa3599 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 6 Aug 2021 19:18:46 +0200
Subject: [PATCH 1200/2859] Use single map to store processing tiles

---
 .../detournavigator/asyncnavmeshupdater.cpp   | 32 +++----------------
 .../detournavigator/asyncnavmeshupdater.hpp   |  2 +-
 2 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index 1f7134dcea..5e785ea56f 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -445,23 +445,13 @@ namespace DetourNavigator
             return std::this_thread::get_id();
 
         auto locked = mProcessingTiles.lock();
-
-        auto agent = locked->find(agentHalfExtents);
-        if (agent == locked->end())
-        {
-            const auto threadId = std::this_thread::get_id();
-            locked->emplace(agentHalfExtents, std::map<TilePosition, std::thread::id>({{changedTile, threadId}}));
-            return threadId;
-        }
-
-        auto tile = agent->second.find(changedTile);
-        if (tile == agent->second.end())
+        const auto tile = locked->find(std::make_tuple(agentHalfExtents, changedTile));
+        if (tile == locked->end())
         {
             const auto threadId = std::this_thread::get_id();
-            agent->second.emplace(changedTile, threadId);
+            locked->emplace(std::tie(agentHalfExtents, changedTile), threadId);
             return threadId;
         }
-
         return tile->second;
     }
 
@@ -469,22 +459,8 @@ namespace DetourNavigator
     {
         if (mSettings.get().mAsyncNavMeshUpdaterThreads <= 1)
             return;
-
         auto locked = mProcessingTiles.lock();
-
-        auto agent = locked->find(agentHalfExtents);
-        if (agent == locked->end())
-            return;
-
-        auto tile = agent->second.find(changedTile);
-        if (tile == agent->second.end())
-            return;
-
-        agent->second.erase(tile);
-
-        if (agent->second.empty())
-            locked->erase(agent);
-
+        locked->erase(std::tie(agentHalfExtents, changedTile));
         if (locked->empty())
             mProcessed.notify_all();
     }
diff --git a/components/detournavigator/asyncnavmeshupdater.hpp b/components/detournavigator/asyncnavmeshupdater.hpp
index ab4be0b8d1..3ad5acfb13 100644
--- a/components/detournavigator/asyncnavmeshupdater.hpp
+++ b/components/detournavigator/asyncnavmeshupdater.hpp
@@ -95,7 +95,7 @@ namespace DetourNavigator
         std::map<osg::Vec3f, std::set<TilePosition>> mPushed;
         Misc::ScopeGuarded<TilePosition> mPlayerTile;
         NavMeshTilesCache mNavMeshTilesCache;
-        Misc::ScopeGuarded<std::map<osg::Vec3f, std::map<TilePosition, std::thread::id>>> mProcessingTiles;
+        Misc::ScopeGuarded<std::map<std::tuple<osg::Vec3f, TilePosition>, std::thread::id>> mProcessingTiles;
         std::map<osg::Vec3f, std::map<TilePosition, std::chrono::steady_clock::time_point>> mLastUpdates;
         std::set<std::tuple<osg::Vec3f, TilePosition>> mPresentTiles;
         std::map<std::thread::id, std::deque<JobIt>> mThreadsQueues;

From a97b2ced27ecdf9bb774633d501c5528bd4b8765 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 6 Aug 2021 19:21:52 +0200
Subject: [PATCH 1201/2859] Use single map to store last updates

---
 .../detournavigator/asyncnavmeshupdater.cpp   | 25 ++++++++-----------
 .../detournavigator/asyncnavmeshupdater.hpp   |  2 +-
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index 5e785ea56f..ce5a3ea2e6 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -65,6 +65,11 @@ namespace
         const auto it = std::upper_bound(queue.begin(), queue.end(), job, LessByJobPriority {});
         queue.insert(it, job);
     }
+
+    auto getAgentAndTile(const Job& job) noexcept
+    {
+        return std::make_tuple(job.mAgentHalfExtents, job.mChangedTile);
+    }
 }
 
 namespace DetourNavigator
@@ -127,7 +132,7 @@ namespace DetourNavigator
                 job.mDistanceToPlayer = getManhattanDistance(changedTile.first, playerTile);
                 job.mDistanceToOrigin = getManhattanDistance(changedTile.first, TilePosition {0, 0});
                 job.mProcessTime = job.mChangeType == ChangeType::update
-                    ? mLastUpdates[job.mAgentHalfExtents][job.mChangedTile] + mSettings.get().mMinUpdateInterval
+                    ? mLastUpdates[getAgentAndTile(job)] + mSettings.get().mMinUpdateInterval
                     : std::chrono::steady_clock::time_point();
 
                 const JobIt it = mJobs.insert(mJobs.end(), std::move(job));
@@ -387,7 +392,7 @@ namespace DetourNavigator
         jobs.pop_front();
 
         if (changeLastUpdate && job->mChangeType == ChangeType::update)
-            mLastUpdates[job->mAgentHalfExtents][job->mChangedTile] = now;
+            mLastUpdates[getAgentAndTile(*job)] = now;
 
         return job;
     }
@@ -477,20 +482,12 @@ namespace DetourNavigator
 
         const std::lock_guard<std::mutex> lock(mMutex);
 
-        for (auto agent = mLastUpdates.begin(); agent != mLastUpdates.end();)
+        for (auto it = mLastUpdates.begin(); it != mLastUpdates.end();)
         {
-            for (auto tile = agent->second.begin(); tile != agent->second.end();)
-            {
-                if (now - tile->second > mSettings.get().mMinUpdateInterval)
-                    tile = agent->second.erase(tile);
-                else
-                    ++tile;
-            }
-
-            if (agent->second.empty())
-                agent = mLastUpdates.erase(agent);
+            if (now - it->second > mSettings.get().mMinUpdateInterval)
+                it = mLastUpdates.erase(it);
             else
-                ++agent;
+                ++it;
         }
     }
 
diff --git a/components/detournavigator/asyncnavmeshupdater.hpp b/components/detournavigator/asyncnavmeshupdater.hpp
index 3ad5acfb13..501212bd46 100644
--- a/components/detournavigator/asyncnavmeshupdater.hpp
+++ b/components/detournavigator/asyncnavmeshupdater.hpp
@@ -96,7 +96,7 @@ namespace DetourNavigator
         Misc::ScopeGuarded<TilePosition> mPlayerTile;
         NavMeshTilesCache mNavMeshTilesCache;
         Misc::ScopeGuarded<std::map<std::tuple<osg::Vec3f, TilePosition>, std::thread::id>> mProcessingTiles;
-        std::map<osg::Vec3f, std::map<TilePosition, std::chrono::steady_clock::time_point>> mLastUpdates;
+        std::map<std::tuple<osg::Vec3f, TilePosition>, std::chrono::steady_clock::time_point> mLastUpdates;
         std::set<std::tuple<osg::Vec3f, TilePosition>> mPresentTiles;
         std::map<std::thread::id, std::deque<JobIt>> mThreadsQueues;
         std::vector<std::thread> mThreads;

From 8bca9eec80d5c7416448e5c47c0891cd73d05c6c Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 6 Aug 2021 19:55:34 +0200
Subject: [PATCH 1202/2859] Use single set to store pushed tiles

---
 .../detournavigator/asyncnavmeshupdater.cpp   | 21 +++++++------------
 .../detournavigator/asyncnavmeshupdater.hpp   |  2 +-
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index ce5a3ea2e6..a82f8f7db2 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -29,14 +29,13 @@ namespace
     }
 
     int getMinDistanceTo(const TilePosition& position, int maxDistance,
-                         const std::map<osg::Vec3f, std::set<TilePosition>>& tilesPerHalfExtents,
+                         const std::set<std::tuple<osg::Vec3f, TilePosition>>& pushedTiles,
                          const std::set<std::tuple<osg::Vec3f, TilePosition>>& presentTiles)
     {
         int result = maxDistance;
-        for (const auto& [halfExtents, tiles] : tilesPerHalfExtents)
-            for (const TilePosition& tile : tiles)
-                if (presentTiles.find(std::make_tuple(halfExtents, tile)) == presentTiles.end())
-                    result = std::min(result, getManhattanDistance(position, tile));
+        for (const auto& [halfExtents, tile] : pushedTiles)
+            if (presentTiles.find(std::tie(halfExtents, tile)) == presentTiles.end())
+                result = std::min(result, getManhattanDistance(position, tile));
         return result;
     }
 
@@ -120,7 +119,7 @@ namespace DetourNavigator
 
         for (const auto& changedTile : changedTiles)
         {
-            if (mPushed[agentHalfExtents].insert(changedTile.first).second)
+            if (mPushed.emplace(agentHalfExtents, changedTile.first).second)
             {
                 Job job;
 
@@ -367,13 +366,7 @@ namespace DetourNavigator
 
             if (owner == threadId)
             {
-                const auto it = mPushed.find(job->mAgentHalfExtents);
-                if (it != mPushed.end())
-                {
-                    it->second.erase(job->mChangedTile);
-                    if (it->second.empty())
-                        mPushed.erase(it);
-                }
+                mPushed.erase(getAgentAndTile(*job));
                 return job;
             }
 
@@ -427,7 +420,7 @@ namespace DetourNavigator
 
         const std::lock_guard<std::mutex> lock(mMutex);
 
-        if (mPushed[job->mAgentHalfExtents].insert(job->mChangedTile).second)
+        if (mPushed.emplace(job->mAgentHalfExtents, job->mChangedTile).second)
         {
             ++job->mTryNumber;
             mWaiting.push_back(job);
diff --git a/components/detournavigator/asyncnavmeshupdater.hpp b/components/detournavigator/asyncnavmeshupdater.hpp
index 501212bd46..ac6a82a49d 100644
--- a/components/detournavigator/asyncnavmeshupdater.hpp
+++ b/components/detournavigator/asyncnavmeshupdater.hpp
@@ -92,7 +92,7 @@ namespace DetourNavigator
         std::condition_variable mProcessed;
         std::list<Job> mJobs;
         std::deque<JobIt> mWaiting;
-        std::map<osg::Vec3f, std::set<TilePosition>> mPushed;
+        std::set<std::tuple<osg::Vec3f, TilePosition>> mPushed;
         Misc::ScopeGuarded<TilePosition> mPlayerTile;
         NavMeshTilesCache mNavMeshTilesCache;
         Misc::ScopeGuarded<std::map<std::tuple<osg::Vec3f, TilePosition>, std::thread::id>> mProcessingTiles;

From 21ce4fe63726670c7be807e1dc693f3a2d3219b2 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 6 Aug 2021 22:26:53 +0200
Subject: [PATCH 1203/2859] Use structured binding

---
 components/detournavigator/asyncnavmeshupdater.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index a82f8f7db2..3e9c81678a 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -117,19 +117,19 @@ namespace DetourNavigator
             for (JobIt job : mWaiting)
                 job->mDistanceToPlayer = getManhattanDistance(job->mChangedTile, playerTile);
 
-        for (const auto& changedTile : changedTiles)
+        for (const auto& [changedTile, changeType] : changedTiles)
         {
-            if (mPushed.emplace(agentHalfExtents, changedTile.first).second)
+            if (mPushed.emplace(agentHalfExtents, changedTile).second)
             {
                 Job job;
 
                 job.mAgentHalfExtents = agentHalfExtents;
                 job.mNavMeshCacheItem = navMeshCacheItem;
-                job.mChangedTile = changedTile.first;
+                job.mChangedTile = changedTile;
                 job.mTryNumber = 0;
-                job.mChangeType = changedTile.second;
-                job.mDistanceToPlayer = getManhattanDistance(changedTile.first, playerTile);
-                job.mDistanceToOrigin = getManhattanDistance(changedTile.first, TilePosition {0, 0});
+                job.mChangeType = changeType;
+                job.mDistanceToPlayer = getManhattanDistance(changedTile, playerTile);
+                job.mDistanceToOrigin = getManhattanDistance(changedTile, TilePosition {0, 0});
                 job.mProcessTime = job.mChangeType == ChangeType::update
                     ? mLastUpdates[getAgentAndTile(job)] + mSettings.get().mMinUpdateInterval
                     : std::chrono::steady_clock::time_point();

From 09b1a2e3c67eaf2721782ba77c0fad978bad990b Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 7 Aug 2021 02:23:43 +0200
Subject: [PATCH 1204/2859] Make unchanging Job fields const

---
 .../detournavigator/asyncnavmeshupdater.cpp   | 29 +++++++++++--------
 .../detournavigator/asyncnavmeshupdater.hpp   | 18 +++++++-----
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index 3e9c81678a..7fcfdf98c5 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -73,6 +73,19 @@ namespace
 
 namespace DetourNavigator
 {
+    Job::Job(const osg::Vec3f& agentHalfExtents, std::weak_ptr<GuardedNavMeshCacheItem> navMeshCacheItem,
+        const TilePosition& changedTile, ChangeType changeType, int distanceToPlayer,
+        std::chrono::steady_clock::time_point processTime)
+        : mAgentHalfExtents(agentHalfExtents)
+        , mNavMeshCacheItem(std::move(navMeshCacheItem))
+        , mChangedTile(changedTile)
+        , mProcessTime(processTime)
+        , mChangeType(changeType)
+        , mDistanceToPlayer(distanceToPlayer)
+        , mDistanceToOrigin(getManhattanDistance(changedTile, TilePosition {0, 0}))
+    {
+    }
+
     AsyncNavMeshUpdater::AsyncNavMeshUpdater(const Settings& settings, TileCachedRecastMeshManager& recastMeshManager,
             OffMeshConnectionsManager& offMeshConnectionsManager)
         : mSettings(settings)
@@ -121,20 +134,12 @@ namespace DetourNavigator
         {
             if (mPushed.emplace(agentHalfExtents, changedTile).second)
             {
-                Job job;
-
-                job.mAgentHalfExtents = agentHalfExtents;
-                job.mNavMeshCacheItem = navMeshCacheItem;
-                job.mChangedTile = changedTile;
-                job.mTryNumber = 0;
-                job.mChangeType = changeType;
-                job.mDistanceToPlayer = getManhattanDistance(changedTile, playerTile);
-                job.mDistanceToOrigin = getManhattanDistance(changedTile, TilePosition {0, 0});
-                job.mProcessTime = job.mChangeType == ChangeType::update
-                    ? mLastUpdates[getAgentAndTile(job)] + mSettings.get().mMinUpdateInterval
+                const auto processTime = changeType == ChangeType::update
+                    ? mLastUpdates[std::tie(agentHalfExtents, changedTile)] + mSettings.get().mMinUpdateInterval
                     : std::chrono::steady_clock::time_point();
 
-                const JobIt it = mJobs.insert(mJobs.end(), std::move(job));
+                const JobIt it = mJobs.emplace(mJobs.end(), agentHalfExtents, navMeshCacheItem, changedTile,
+                    changeType, getManhattanDistance(changedTile, playerTile), processTime);
 
                 if (playerTileChanged)
                     mWaiting.push_back(it);
diff --git a/components/detournavigator/asyncnavmeshupdater.hpp b/components/detournavigator/asyncnavmeshupdater.hpp
index ac6a82a49d..b770230673 100644
--- a/components/detournavigator/asyncnavmeshupdater.hpp
+++ b/components/detournavigator/asyncnavmeshupdater.hpp
@@ -55,14 +55,18 @@ namespace DetourNavigator
 
     struct Job
     {
-        osg::Vec3f mAgentHalfExtents;
-        std::weak_ptr<GuardedNavMeshCacheItem> mNavMeshCacheItem;
-        TilePosition mChangedTile;
-        unsigned mTryNumber;
-        ChangeType mChangeType;
+        const osg::Vec3f mAgentHalfExtents;
+        const std::weak_ptr<GuardedNavMeshCacheItem> mNavMeshCacheItem;
+        const TilePosition mChangedTile;
+        const std::chrono::steady_clock::time_point mProcessTime;
+        unsigned mTryNumber = 0;
+        const ChangeType mChangeType;
         int mDistanceToPlayer;
-        int mDistanceToOrigin;
-        std::chrono::steady_clock::time_point mProcessTime;
+        const int mDistanceToOrigin;
+
+        Job(const osg::Vec3f& agentHalfExtents, std::weak_ptr<GuardedNavMeshCacheItem> navMeshCacheItem,
+            const TilePosition& changedTile, ChangeType changeType, int distanceToPlayer,
+            std::chrono::steady_clock::time_point processTime);
     };
 
     using JobIt = std::list<Job>::iterator;

From 3caf45807f571c44138211593a1f0461db22c139 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 29 Jun 2021 03:47:23 +0200
Subject: [PATCH 1205/2859] Use common implementation to filter hidden markers

---
 apps/openmw/mwrender/objectpaging.cpp | 4 ++--
 apps/openmw/mwworld/scene.cpp         | 6 ++----
 components/misc/resourcehelpers.cpp   | 6 ++++++
 components/misc/resourcehelpers.hpp   | 4 ++++
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index db81027d9b..b23f079888 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -510,8 +510,8 @@ namespace MWRender
                     continue;
             }
 
-            if (ref.mRefID == "prisonmarker" || ref.mRefID == "divinemarker" || ref.mRefID == "templemarker" || ref.mRefID == "northmarker")
-                continue; // marker objects that have a hardcoded function in the game logic, should be hidden from the player
+            if (Misc::ResourceHelpers::isHiddenMarker(ref.mRefID))
+                continue;
 
             int type = store.findStatic(ref.mRefID);
             std::string model = getModel(type, ref.mRefID, store);
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 3de4940a37..d1b06131b9 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -94,14 +94,12 @@ namespace
 
     std::string getModel(const MWWorld::Ptr &ptr, const VFS::Manager *vfs)
     {
+        if (Misc::ResourceHelpers::isHiddenMarker(ptr.getCellRef().getRefId()))
+            return {};
         bool useAnim = ptr.getClass().useAnim();
         std::string model = ptr.getClass().getModel(ptr);
         if (useAnim)
             model = Misc::ResourceHelpers::correctActorModelPath(model, vfs);
-
-        const std::string &id = ptr.getCellRef().getRefId();
-        if (id == "prisonmarker" || id == "divinemarker" || id == "templemarker" || id == "northmarker")
-            model = ""; // marker objects that have a hardcoded function in the game logic, should be hidden from the player
         return model;
     }
 
diff --git a/components/misc/resourcehelpers.cpp b/components/misc/resourcehelpers.cpp
index 5cf4378b85..4d54baafc6 100644
--- a/components/misc/resourcehelpers.cpp
+++ b/components/misc/resourcehelpers.cpp
@@ -1,6 +1,7 @@
 #include "resourcehelpers.hpp"
 
 #include <sstream>
+#include <string_view>
 
 #include <components/misc/stringops.hpp>
 
@@ -138,3 +139,8 @@ std::string Misc::ResourceHelpers::correctActorModelPath(const std::string &resP
     }
     return mdlname;
 }
+
+bool Misc::ResourceHelpers::isHiddenMarker(std::string_view id)
+{
+    return id == "prisonmarker" || id == "divinemarker" || id == "templemarker" || id == "northmarker";
+}
diff --git a/components/misc/resourcehelpers.hpp b/components/misc/resourcehelpers.hpp
index fa50cce228..9e87954e9d 100644
--- a/components/misc/resourcehelpers.hpp
+++ b/components/misc/resourcehelpers.hpp
@@ -2,6 +2,7 @@
 #define MISC_RESOURCEHELPERS_H
 
 #include <string>
+#include <string_view>
 
 namespace VFS
 {
@@ -23,6 +24,9 @@ namespace Misc
         std::string correctBookartPath(const std::string &resPath, int width, int height, const VFS::Manager* vfs);
         /// Use "xfoo.nif" instead of "foo.nif" if available
         std::string correctActorModelPath(const std::string &resPath, const VFS::Manager* vfs);
+
+        /// marker objects that have a hardcoded function in the game logic, should be hidden from the player
+        bool isHiddenMarker(std::string_view id);
     }
 }
 

From 8ac8d56e8c7f190b9f4f2ddbd5b659d3785d0864 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 8 Aug 2021 16:58:47 +0200
Subject: [PATCH 1206/2859] Mark TileCachedRecastMeshManager member functions
 as const where possible

---
 components/detournavigator/recastmeshmanager.cpp       |  2 +-
 components/detournavigator/recastmeshmanager.hpp       |  2 +-
 .../detournavigator/tilecachedrecastmeshmanager.cpp    | 10 +++++-----
 .../detournavigator/tilecachedrecastmeshmanager.hpp    | 10 +++++-----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/components/detournavigator/recastmeshmanager.cpp b/components/detournavigator/recastmeshmanager.cpp
index e4e5b76449..2eeb90a9b5 100644
--- a/components/detournavigator/recastmeshmanager.cpp
+++ b/components/detournavigator/recastmeshmanager.cpp
@@ -117,7 +117,7 @@ namespace DetourNavigator
         return result;
     }
 
-    std::shared_ptr<RecastMesh> RecastMeshManager::getMesh()
+    std::shared_ptr<RecastMesh> RecastMeshManager::getMesh() const
     {
         TileBounds tileBounds = mTileBounds;
         tileBounds.mMin /= mSettings.mRecastScaleFactor;
diff --git a/components/detournavigator/recastmeshmanager.hpp b/components/detournavigator/recastmeshmanager.hpp
index 1cd35ca467..e1c1567cb3 100644
--- a/components/detournavigator/recastmeshmanager.hpp
+++ b/components/detournavigator/recastmeshmanager.hpp
@@ -52,7 +52,7 @@ namespace DetourNavigator
 
         std::optional<Cell> removeHeightfield(const osg::Vec2i& cellPosition);
 
-        std::shared_ptr<RecastMesh> getMesh();
+        std::shared_ptr<RecastMesh> getMesh() const;
 
         bool isEmpty() const;
 
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.cpp b/components/detournavigator/tilecachedrecastmeshmanager.cpp
index 2b8c85b8a3..8033ca89ac 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -190,11 +190,11 @@ namespace DetourNavigator
         return result;
     }
 
-    std::shared_ptr<RecastMesh> TileCachedRecastMeshManager::getMesh(const TilePosition& tilePosition)
+    std::shared_ptr<RecastMesh> TileCachedRecastMeshManager::getMesh(const TilePosition& tilePosition) const
     {
         const auto manager = [&] () -> std::shared_ptr<CachedRecastMeshManager>
         {
-            const auto tiles = mTiles.lock();
+            const auto tiles = mTiles.lockConst();
             const auto it = tiles->find(tilePosition);
             if (it == tiles->end())
                 return nullptr;
@@ -205,7 +205,7 @@ namespace DetourNavigator
         return manager->getMesh();
     }
 
-    bool TileCachedRecastMeshManager::hasTile(const TilePosition& tilePosition)
+    bool TileCachedRecastMeshManager::hasTile(const TilePosition& tilePosition) const
     {
         return mTiles.lockConst()->count(tilePosition);
     }
@@ -215,9 +215,9 @@ namespace DetourNavigator
         return mRevision;
     }
 
-    void TileCachedRecastMeshManager::reportNavMeshChange(const TilePosition& tilePosition, Version recastMeshVersion, Version navMeshVersion)
+    void TileCachedRecastMeshManager::reportNavMeshChange(const TilePosition& tilePosition, Version recastMeshVersion, Version navMeshVersion) const
     {
-        const auto tiles = mTiles.lock();
+        const auto tiles = mTiles.lockConst();
         const auto it = tiles->find(tilePosition);
         if (it == tiles->end())
             return;
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.hpp b/components/detournavigator/tilecachedrecastmeshmanager.hpp
index f8cb5a8b0e..f10260a4dd 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.hpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.hpp
@@ -86,20 +86,20 @@ namespace DetourNavigator
 
         std::optional<Cell> removeHeightfield(const osg::Vec2i& cellPosition);
 
-        std::shared_ptr<RecastMesh> getMesh(const TilePosition& tilePosition);
+        std::shared_ptr<RecastMesh> getMesh(const TilePosition& tilePosition) const;
 
-        bool hasTile(const TilePosition& tilePosition);
+        bool hasTile(const TilePosition& tilePosition) const;
 
         template <class Function>
-        void forEachTile(Function&& function)
+        void forEachTile(Function&& function) const
         {
-            for (auto& [tilePosition, recastMeshManager] : *mTiles.lock())
+            for (auto& [tilePosition, recastMeshManager] : *mTiles.lockConst())
                 function(tilePosition, *recastMeshManager);
         }
 
         std::size_t getRevision() const;
 
-        void reportNavMeshChange(const TilePosition& tilePosition, Version recastMeshVersion, Version navMeshVersion);
+        void reportNavMeshChange(const TilePosition& tilePosition, Version recastMeshVersion, Version navMeshVersion) const;
 
     private:
         using TilesMap = std::map<TilePosition, std::shared_ptr<CachedRecastMeshManager>>;

From 05258ed644dbf8f9466fb3ea2e399781d8c85755 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 8 Aug 2021 17:59:34 +0200
Subject: [PATCH 1207/2859] Remove redundant
 TileCachedRecastMeshManager::hasTile function

It's used only for tests. getMesh is a valid replacement.
---
 .../tilecachedrecastmeshmanager.cpp            | 18 ++++++------------
 .../tilecachedrecastmeshmanager.cpp            |  5 -----
 .../tilecachedrecastmeshmanager.hpp            |  2 --
 3 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
index 51580906ce..6209ec9c2a 100644
--- a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -38,12 +38,6 @@ namespace
         EXPECT_EQ(manager.getMesh(TilePosition(0, 0)), nullptr);
     }
 
-    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, has_tile_for_empty_should_return_false)
-    {
-        TileCachedRecastMeshManager manager(mSettings);
-        EXPECT_FALSE(manager.hasTile(TilePosition(0, 0)));
-    }
-
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, get_revision_for_empty_should_return_zero)
     {
         const TileCachedRecastMeshManager manager(mSettings);
@@ -83,7 +77,7 @@ namespace
         ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground));
         for (int x = -1; x < 1; ++x)
             for (int y = -1; y < 1; ++y)
-                ASSERT_TRUE(manager.hasTile(TilePosition(x, y)));
+                ASSERT_NE(manager.getMesh(TilePosition(x, y)), nullptr);
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, update_object_for_changed_object_should_return_changed_tiles)
@@ -281,7 +275,7 @@ namespace
         ASSERT_TRUE(manager.addWater(cellPosition, cellSize, osg::Vec3f()));
         for (int x = -6; x < 6; ++x)
             for (int y = -6; y < 6; ++y)
-                ASSERT_TRUE(manager.hasTile(TilePosition(x, y)));
+                ASSERT_NE(manager.getMesh(TilePosition(x, y)), nullptr);
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, add_water_for_max_int_should_not_add_new_tiles)
@@ -295,7 +289,7 @@ namespace
         ASSERT_TRUE(manager.addWater(cellPosition, cellSize, osg::Vec3f()));
         for (int x = -6; x < 6; ++x)
             for (int y = -6; y < 6; ++y)
-                ASSERT_EQ(manager.hasTile(TilePosition(x, y)), -1 <= x && x <= 0 && -1 <= y && y <= 0);
+                ASSERT_EQ(manager.getMesh(TilePosition(x, y)) != nullptr, -1 <= x && x <= 0 && -1 <= y && y <= 0);
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, remove_water_for_absent_cell_should_return_nullopt)
@@ -324,7 +318,7 @@ namespace
         ASSERT_TRUE(manager.removeWater(cellPosition));
         for (int x = -6; x < 6; ++x)
             for (int y = -6; y < 6; ++y)
-                ASSERT_FALSE(manager.hasTile(TilePosition(x, y)));
+                ASSERT_EQ(manager.getMesh(TilePosition(x, y)), nullptr);
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, remove_water_for_existing_cell_should_leave_not_empty_tiles)
@@ -339,7 +333,7 @@ namespace
         ASSERT_TRUE(manager.removeWater(cellPosition));
         for (int x = -6; x < 6; ++x)
             for (int y = -6; y < 6; ++y)
-                ASSERT_EQ(manager.hasTile(TilePosition(x, y)), -1 <= x && x <= 0 && -1 <= y && y <= 0);
+                ASSERT_EQ(manager.getMesh(TilePosition(x, y)) != nullptr, -1 <= x && x <= 0 && -1 <= y && y <= 0);
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, remove_object_should_not_remove_tile_with_water)
@@ -354,6 +348,6 @@ namespace
         ASSERT_TRUE(manager.removeObject(ObjectId(&boxShape)));
         for (int x = -6; x < 6; ++x)
             for (int y = -6; y < 6; ++y)
-                ASSERT_TRUE(manager.hasTile(TilePosition(x, y)));
+                ASSERT_NE(manager.getMesh(TilePosition(x, y)), nullptr);
     }
 }
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.cpp b/components/detournavigator/tilecachedrecastmeshmanager.cpp
index 8033ca89ac..38314f08a5 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -205,11 +205,6 @@ namespace DetourNavigator
         return manager->getMesh();
     }
 
-    bool TileCachedRecastMeshManager::hasTile(const TilePosition& tilePosition) const
-    {
-        return mTiles.lockConst()->count(tilePosition);
-    }
-
     std::size_t TileCachedRecastMeshManager::getRevision() const
     {
         return mRevision;
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.hpp b/components/detournavigator/tilecachedrecastmeshmanager.hpp
index f10260a4dd..f6bc40d668 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.hpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.hpp
@@ -88,8 +88,6 @@ namespace DetourNavigator
 
         std::shared_ptr<RecastMesh> getMesh(const TilePosition& tilePosition) const;
 
-        bool hasTile(const TilePosition& tilePosition) const;
-
         template <class Function>
         void forEachTile(Function&& function) const
         {

From 54a676f2e35f9e15a2418eeeb8e5e0e6ec04c2c2 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 26 Jul 2021 20:18:01 +0200
Subject: [PATCH 1208/2859] Add functions to get length of recast type arrays

To avoid duplicating same formulas in multiple places.
---
 .../detournavigator/navmeshtilescache.cpp     | 39 +++++++-------
 .../detournavigator/preparednavmeshdata.hpp   | 18 ++++---
 .../preparednavmeshdatatuple.hpp              | 17 ++++---
 components/detournavigator/recast.hpp         | 51 +++++++++++++++++++
 4 files changed, 90 insertions(+), 35 deletions(-)
 create mode 100644 components/detournavigator/recast.hpp

diff --git a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
index 9405bd7739..309266142f 100644
--- a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
+++ b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
@@ -6,6 +6,7 @@
 #include <components/detournavigator/preparednavmeshdata.hpp>
 #include <components/detournavigator/ref.hpp>
 #include <components/detournavigator/preparednavmeshdatatuple.hpp>
+#include <components/detournavigator/recast.hpp>
 
 #include <osg/Vec3f>
 
@@ -48,11 +49,11 @@ namespace
         value.ch = 1.0f / (std::rand() % 999 + 1);
         value.borderSize = std::rand();
         value.maxEdgeError = 1.0f / (std::rand() % 999 + 1);
-        generate(value.verts, 3 * value.nverts);
-        generate(value.polys, value.maxpolys * 2 * value.nvp);
-        generate(value.regs, value.maxpolys);
-        generate(value.flags, value.maxpolys);
-        generate(value.areas, value.maxpolys);
+        generate(value.verts, getVertsLength(value));
+        generate(value.polys, getPolysLength(value));
+        generate(value.regs, getRegsLength(value));
+        generate(value.flags, getFlagsLength(value));
+        generate(value.areas, getAreasLength(value));
     }
 
     void generate(rcPolyMeshDetail& value, int size)
@@ -60,9 +61,9 @@ namespace
         value.nmeshes = size;
         value.nverts = size;
         value.ntris = size;
-        generate(value.meshes, 4 * value.nmeshes);
-        generate(value.verts, 3 * value.nverts);
-        generate(value.tris, 4 * value.ntris);
+        generate(value.meshes, getMeshesLength(value));
+        generate(value.verts, getVertsLength(value));
+        generate(value.tris, getTrisLength(value));
     }
 
     void generate(PreparedNavMeshData& value, int size)
@@ -82,10 +83,10 @@ namespace
     }
 
     template <class T>
-    void clone(const T* src, T*& dst, int size)
+    void clone(const T* src, T*& dst, std::size_t size)
     {
-        dst = static_cast<T*>(permRecastAlloc(size * sizeof(T)));
-        std::memcpy(dst, src, static_cast<std::size_t>(size) * sizeof(T));
+        dst = static_cast<T*>(permRecastAlloc(static_cast<int>(size) * sizeof(T)));
+        std::memcpy(dst, src, size * sizeof(T));
     }
 
     void clone(const rcPolyMesh& src, rcPolyMesh& dst)
@@ -100,11 +101,11 @@ namespace
         dst.ch = src.ch;
         dst.borderSize = src.borderSize;
         dst.maxEdgeError = src.maxEdgeError;
-        clone(src.verts, dst.verts, 3 * dst.nverts);
-        clone(src.polys, dst.polys, dst.maxpolys * 2 * dst.nvp);
-        clone(src.regs, dst.regs, dst.maxpolys);
-        clone(src.flags, dst.flags, dst.maxpolys);
-        clone(src.areas, dst.areas, dst.maxpolys);
+        clone(src.verts, dst.verts, getVertsLength(dst));
+        clone(src.polys, dst.polys, getPolysLength(dst));
+        clone(src.regs, dst.regs, getRegsLength(dst));
+        clone(src.flags, dst.flags, getFlagsLength(dst));
+        clone(src.areas, dst.areas, getAreasLength(dst));
     }
 
     void clone(const rcPolyMeshDetail& src, rcPolyMeshDetail& dst)
@@ -112,9 +113,9 @@ namespace
         dst.nmeshes = src.nmeshes;
         dst.nverts = src.nverts;
         dst.ntris = src.ntris;
-        clone(src.meshes, dst.meshes, 4 * dst.nmeshes);
-        clone(src.verts, dst.verts, 3 * dst.nverts);
-        clone(src.tris, dst.tris, 4 * dst.ntris);
+        clone(src.meshes, dst.meshes, getMeshesLength(dst));
+        clone(src.verts, dst.verts, getVertsLength(dst));
+        clone(src.tris, dst.tris, getTrisLength(dst));
     }
 
     std::unique_ptr<PreparedNavMeshData> clone(const PreparedNavMeshData& value)
diff --git a/components/detournavigator/preparednavmeshdata.hpp b/components/detournavigator/preparednavmeshdata.hpp
index 4a92265231..3566cfc71b 100644
--- a/components/detournavigator/preparednavmeshdata.hpp
+++ b/components/detournavigator/preparednavmeshdata.hpp
@@ -1,6 +1,8 @@
 #ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_PREPAREDNAVMESHDATA_H
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_PREPAREDNAVMESHDATA_H
 
+#include "recast.hpp"
+
 #include <Recast.h>
 
 #include <cstddef>
@@ -25,18 +27,18 @@ namespace DetourNavigator
 
     inline constexpr std::size_t getSize(const rcPolyMesh& value) noexcept
     {
-        return static_cast<std::size_t>(3 * value.nverts) * sizeof(*value.verts)
-            + static_cast<std::size_t>(value.maxpolys * 2 * value.nvp) * sizeof(*value.polys)
-            + static_cast<std::size_t>(value.maxpolys) * sizeof(*value.regs)
-            + static_cast<std::size_t>(value.maxpolys) * sizeof(*value.flags)
-            + static_cast<std::size_t>(value.maxpolys) * sizeof(*value.areas);
+        return getVertsLength(value) * sizeof(*value.verts)
+            + getPolysLength(value) * sizeof(*value.polys)
+            + getRegsLength(value) * sizeof(*value.regs)
+            + getFlagsLength(value) * sizeof(*value.flags)
+            + getAreasLength(value) * sizeof(*value.areas);
     }
 
     inline constexpr std::size_t getSize(const rcPolyMeshDetail& value) noexcept
     {
-        return static_cast<std::size_t>(4 * value.nmeshes) * sizeof(*value.meshes)
-            + static_cast<std::size_t>(4 * value.ntris) * sizeof(*value.tris)
-            + static_cast<std::size_t>(3 * value.nverts) * sizeof(*value.verts);
+        return getMeshesLength(value) * sizeof(*value.meshes)
+            + getVertsLength(value) * sizeof(*value.verts)
+            + getTrisLength(value) * sizeof(*value.tris);
     }
 
     inline constexpr std::size_t getSize(const PreparedNavMeshData& value) noexcept
diff --git a/components/detournavigator/preparednavmeshdatatuple.hpp b/components/detournavigator/preparednavmeshdatatuple.hpp
index 5b5a72f629..8ff1267370 100644
--- a/components/detournavigator/preparednavmeshdatatuple.hpp
+++ b/components/detournavigator/preparednavmeshdatatuple.hpp
@@ -3,6 +3,7 @@
 
 #include "preparednavmeshdata.hpp"
 #include "ref.hpp"
+#include "recast.hpp"
 
 #include <Recast.h>
 
@@ -13,11 +14,11 @@ namespace DetourNavigator
     constexpr auto makeTuple(const rcPolyMesh& v) noexcept
     {
         return std::tuple(
-            Span(v.verts, 3 * v.nverts),
-            Span(v.polys, v.maxpolys * 2 * v.nvp),
-            Span(v.regs, v.maxpolys),
-            Span(v.flags, v.maxpolys),
-            Span(v.areas, v.maxpolys),
+            Span(v.verts, getVertsLength(v)),
+            Span(v.polys, getPolysLength(v)),
+            Span(v.regs, getRegsLength(v)),
+            Span(v.flags, getFlagsLength(v)),
+            Span(v.areas, getAreasLength(v)),
             ArrayRef(v.bmin),
             ArrayRef(v.bmax),
             v.cs,
@@ -30,9 +31,9 @@ namespace DetourNavigator
     constexpr auto makeTuple(const rcPolyMeshDetail& v) noexcept
     {
         return std::tuple(
-            Span(v.meshes, 4 * v.nmeshes),
-            Span(v.verts, 3 * v.nverts),
-            Span(v.tris, 4 * v.ntris)
+            Span(v.meshes, getMeshesLength(v)),
+            Span(v.verts, getVertsLength(v)),
+            Span(v.tris, getTrisLength(v))
         );
     }
 
diff --git a/components/detournavigator/recast.hpp b/components/detournavigator/recast.hpp
new file mode 100644
index 0000000000..c51f4b9279
--- /dev/null
+++ b/components/detournavigator/recast.hpp
@@ -0,0 +1,51 @@
+#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_RECAST_H
+#define OPENMW_COMPONENTS_DETOURNAVIGATOR_RECAST_H
+
+#include <Recast.h>
+
+#include <cstddef>
+
+namespace DetourNavigator
+{
+    constexpr std::size_t getVertsLength(const rcPolyMesh& value) noexcept
+    {
+        return 3 * static_cast<std::size_t>(value.nverts);
+    }
+
+    constexpr std::size_t getPolysLength(const rcPolyMesh& value) noexcept
+    {
+        return 2 * static_cast<std::size_t>(value.maxpolys * value.nvp);
+    }
+
+    constexpr std::size_t getRegsLength(const rcPolyMesh& value) noexcept
+    {
+        return static_cast<std::size_t>(value.maxpolys);
+    }
+
+    constexpr std::size_t getFlagsLength(const rcPolyMesh& value) noexcept
+    {
+        return static_cast<std::size_t>(value.maxpolys);
+    }
+
+    constexpr std::size_t getAreasLength(const rcPolyMesh& value) noexcept
+    {
+        return static_cast<std::size_t>(value.maxpolys);
+    }
+
+    constexpr std::size_t getMeshesLength(const rcPolyMeshDetail& value) noexcept
+    {
+        return 4 * static_cast<std::size_t>(value.nmeshes);
+    }
+
+    constexpr std::size_t getVertsLength(const rcPolyMeshDetail& value) noexcept
+    {
+        return 3 * static_cast<std::size_t>(value.nverts);
+    }
+
+    constexpr std::size_t getTrisLength(const rcPolyMeshDetail& value) noexcept
+    {
+        return 4 * static_cast<std::size_t>(value.ntris);
+    }
+}
+
+#endif

From 46fa3ce083f2f79ae5ba01439bffee9139113c23 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 10 Aug 2021 23:26:31 +0200
Subject: [PATCH 1209/2859] Fix flags length for rcPolyMesh

recastnavigation documentation of rcPolyMesh is misleading. It says flags field
length is maxpolys when actually it's allocated as npolys.
---
 components/detournavigator/recast.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/detournavigator/recast.hpp b/components/detournavigator/recast.hpp
index c51f4b9279..4e9ab329b7 100644
--- a/components/detournavigator/recast.hpp
+++ b/components/detournavigator/recast.hpp
@@ -24,7 +24,7 @@ namespace DetourNavigator
 
     constexpr std::size_t getFlagsLength(const rcPolyMesh& value) noexcept
     {
-        return static_cast<std::size_t>(value.maxpolys);
+        return static_cast<std::size_t>(value.npolys);
     }
 
     constexpr std::size_t getAreasLength(const rcPolyMesh& value) noexcept

From baf62f4922100edae3690b9f1543b803ab7b4bd4 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Fri, 13 Aug 2021 13:53:37 +0200
Subject: [PATCH 1210/2859] Don't save artifacts when using coverity

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5ed6c97da0..b756b97875 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -53,7 +53,7 @@ Coverity:
   variables:
     CC: gcc
     CXX: g++
-  timeout: 8h
+  artifacts:
 
 Debian_GCC:
   extends: .Debian

From b01ef2629c30c93a36590e45b29454c7dfdcda07 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Fri, 13 Aug 2021 13:59:57 +0200
Subject: [PATCH 1211/2859] Fix two Wreorder clang warnings

---
 apps/openmw/mwphysics/physicssystem.cpp | 2 +-
 components/resource/scenemanager.cpp    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 846f80ec64..9f0208f1dc 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -991,13 +991,13 @@ namespace MWPhysics
         , mHalfExtentsZ(actor.getHalfExtents().z())
         , mOldHeight(0)
         , mFallHeight(0)
+        , mStuckFrames(0)
         , mFlying(MWBase::Environment::get().getWorld()->isFlying(actor.getPtr()))
         , mWasOnGround(actor.getOnGround())
         , mIsAquatic(actor.getPtr().getClass().isPureWaterCreature(actor.getPtr()))
         , mWaterCollision(waterCollision)
         , mSkipCollisionDetection(actor.skipCollisions() || !actor.getCollisionMode())
         , mNeedLand(false)
-        , mStuckFrames(0)
     {
     }
 
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 974ae6a7fd..33a9ab99a1 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -228,6 +228,7 @@ namespace Resource
         , mApplyLightingToEnvMaps(false)
         , mLightingMethod(SceneUtil::LightingMethod::FFP)
         , mConvertAlphaTestToAlphaToCoverage(false)
+        , mDepthFormat(0)
         , mInstanceCache(new MultiObjectCache)
         , mSharedStateManager(new SharedStateManager)
         , mImageManager(imageManager)
@@ -237,7 +238,6 @@ namespace Resource
         , mMaxAnisotropy(1)
         , mUnRefImageDataAfterApply(false)
         , mParticleSystemMask(~0u)
-        , mDepthFormat(0)
     {
     }
 

From 713f612bdb7c2141256fcb5c5036cad545c05f08 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Fri, 13 Aug 2021 18:01:16 +0200
Subject: [PATCH 1212/2859] Partially revert !1046: the player is added before
 the scene exists, so we need to check again the grounded state, as it
 correctly was.

---
 apps/openmw/mwphysics/physicssystem.cpp | 3 ---
 apps/openmw/mwworld/scene.cpp           | 6 ++++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 846f80ec64..abd4c79e7b 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -712,9 +712,6 @@ namespace MWPhysics
 
         auto actor = std::make_shared<Actor>(ptr, shape, mTaskScheduler.get(), canWaterWalk);
         
-        // check if Actor is on the ground or in the air
-        traceDown(ptr, ptr.getRefData().getPosition().asVec3(), 10.f);
-
         mActors.emplace(ptr, std::move(actor));
     }
 
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 3de4940a37..2b7877938f 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -504,6 +504,12 @@ namespace MWWorld
 
             const auto player = MWBase::Environment::get().getWorld()->getPlayerPtr();
 
+            // The player is loaded before the scene and by default it is grounded, with the scene fully loaded, we validate and correct this.
+            if (player.mCell == cell) // Only run once, during initial cell load.
+            {
+                mPhysics->traceDown(player, player.getRefData().getPosition().asVec3(), 10.f);
+            }
+
             mNavigator.update(player.getRefData().getPosition().asVec3());
 
             if (!cell->isExterior() && !(cell->getCell()->mData.mFlags & ESM::Cell::QuasiEx))

From d40c18234a83a76005d27bded5b4de69973cdc07 Mon Sep 17 00:00:00 2001
From: Mads Buvik Sandvei <madssandvei@protonmail.com>
Date: Sat, 14 Aug 2021 17:41:58 +0000
Subject: [PATCH 1213/2859] Double buffering the water's node position uniform

---
 apps/openmw/mwrender/water.cpp | 12 +++++++-----
 apps/openmw/mwrender/water.hpp |  2 ++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index da26595c8c..7a8677e43a 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -544,6 +544,11 @@ osg::Node* Water::getRefractionNode()
     return mRefraction;
 }
 
+osg::Vec3d Water::getPosition() const
+{
+    return mWaterNode->getPosition();
+}
+
 void Water::createSimpleWaterStateSet(osg::Node* node, float alpha)
 {
     osg::ref_ptr<osg::StateSet> stateset = SceneUtil::createSimpleWaterStateSet(alpha, MWRender::RenderBin_Water);
@@ -620,6 +625,7 @@ public:
             depth->setWriteMask(false);
             stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
         }
+        stateset->addUniform(new osg::Uniform("nodePosition", osg::Vec3f(mWater->getPosition())));
     }
 
     void apply(osg::StateSet* stateset, osg::NodeVisitor* nv) override
@@ -632,6 +638,7 @@ public:
             stateset->setTextureAttributeAndModes(2, mRefraction->getColorTexture(cv), osg::StateAttribute::ON);
             stateset->setTextureAttributeAndModes(3, mRefraction->getDepthTexture(cv), osg::StateAttribute::ON);
         }
+        stateset->getUniform("nodePosition")->set(osg::Vec3f(mWater->getPosition()));
     }
 
 private:
@@ -728,11 +735,6 @@ void Water::changeCell(const MWWorld::CellStore* store)
     }
     if(mInterior != wasInterior && mReflection)
         mReflection->setInterior(mInterior);
-
-    // create a new StateSet to prevent threading issues
-    osg::ref_ptr<osg::StateSet> nodeStateSet (new osg::StateSet);
-    nodeStateSet->addUniform(new osg::Uniform("nodePosition", osg::Vec3f(mWaterNode->getPosition())));
-    mWaterNode->setStateSet(nodeStateSet);
 }
 
 void Water::setHeight(const float height)
diff --git a/apps/openmw/mwrender/water.hpp b/apps/openmw/mwrender/water.hpp
index 8b6c5c83e5..870b8949c7 100644
--- a/apps/openmw/mwrender/water.hpp
+++ b/apps/openmw/mwrender/water.hpp
@@ -120,6 +120,8 @@ namespace MWRender
         osg::Node* getReflectionNode();
         osg::Node* getRefractionNode();
 
+        osg::Vec3d getPosition() const;
+
         void processChangedSettings(const Settings::CategorySettingVector& settings);
     };
 

From 6cc71745acbb355ec9ad014391e31dc6539194f3 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Sat, 14 Aug 2021 14:50:33 -0700
Subject: [PATCH 1214/2859] ensure character preview is using standard depth

---
 apps/openmw/mwrender/characterpreview.cpp | 26 +++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index 580451ff8f..5c805ca856 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -131,6 +131,29 @@ namespace MWRender
                     newStateSet->setTextureMode(7, GL_TEXTURE_2D, osg::StateAttribute::OFF);
                     newStateSet->addUniform(mNoAlphaUniform);
                 }
+                if (SceneUtil::getReverseZ() && stateset->getAttribute(osg::StateAttribute::DEPTH))
+                {
+                    if (!newStateSet)
+                    {
+                        newStateSet = new osg::StateSet(*stateset, osg::CopyOp::SHALLOW_COPY);
+                        node.setStateSet(newStateSet);
+                    }
+                    // Setup standard depth ranges
+                    osg::Depth* depth = static_cast<osg::Depth*>(stateset->getAttribute(osg::StateAttribute::DEPTH));
+                    osg::ref_ptr<osg::Depth> newDepth = new osg::Depth(*depth);
+                    switch (newDepth->getFunction())
+                    {
+                        case osg::Depth::LESS:
+                            newDepth->setFunction(osg::Depth::GREATER);
+                        case osg::Depth::LEQUAL:
+                            newDepth->setFunction(osg::Depth::GEQUAL);
+                        case osg::Depth::GREATER:
+                            newDepth->setFunction(osg::Depth::LESS);
+                        case osg::Depth::GEQUAL:
+                            newDepth->setFunction(osg::Depth::LEQUAL);
+                    }
+                    newStateSet->setAttribute(newDepth, osg::StateAttribute::ON);
+                }
             }
             traverse(node);
         }
@@ -189,8 +212,7 @@ namespace MWRender
         stateset->setAttribute(defaultMat);
         stateset->addUniform(new osg::Uniform("projectionMatrix", static_cast<osg::Matrixf>(mCamera->getProjectionMatrix())));
 
-        osg::ref_ptr<osg::Depth> depth = new osg::Depth;
-        stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
+        stateset->setAttributeAndModes(new osg::Depth, osg::StateAttribute::ON);
 
         SceneUtil::ShadowManager::disableShadowsForStateSet(stateset);
 

From ec871e6bf7d9feb2f5e99a25320e69c720464835 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sat, 14 Aug 2021 23:15:11 +0200
Subject: [PATCH 1215/2859] Use shared_ptr instead of weak_ptr for actors
 handle inside the simulation

The purpose of weak_ptr is to avoid performing the simulation on deleted
Actor by promoting it to a shared_ptr via a lock() call. This clutter
the code with a lot of branches, whereas the overwhelmingly common case is for the call to succeed.
Since the simulation is decoupled from the engine state, we can use a shared_ptr instead of a weak_ptr.
This allow us to ignore (ie not handle) the rarer case where the actor is delete from the scene. This means that the simulation
will run for one frame more than before for each actor, whereas the rest of the engine
will be ignorant of this.
---
 apps/openmw/mwphysics/mtphysics.cpp     | 106 ++++++++++--------------
 apps/openmw/mwphysics/mtphysics.hpp     |  14 ++--
 apps/openmw/mwphysics/physicssystem.cpp |  18 ++--
 apps/openmw/mwphysics/physicssystem.hpp |   2 +-
 4 files changed, 61 insertions(+), 79 deletions(-)

diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index e9bedcbc75..7363b9964a 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -207,12 +207,13 @@ namespace MWPhysics
         return std::make_tuple(numSteps, actualDelta);
     }
 
-    void PhysicsTaskScheduler::applyQueuedMovements(float & timeAccum, std::vector<std::weak_ptr<Actor>>&& actors, std::vector<ActorFrameData>&& actorsData, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
+    void PhysicsTaskScheduler::applyQueuedMovements(float & timeAccum, std::vector<std::shared_ptr<Actor>>&& actors, std::vector<ActorFrameData>&& actorsData, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
     {
         // This function run in the main thread.
         // While the mSimulationMutex is held, background physics threads can't run.
 
         std::unique_lock lock(mSimulationMutex);
+        assert(actors.size() == actorsData.size());
 
         double timeStart = mTimer->tick();
 
@@ -221,11 +222,8 @@ namespace MWPhysics
         {
             for (size_t i = 0; i < mActors.size(); ++i)
             {
-                if (auto actor = mActors[i].lock())
-                {
-                    updateMechanics(*actor, mActorsFrameData[i]);
-                    updateActor(*actor, mActorsFrameData[i], mAdvanceSimulation, mTimeAccum, mPhysicsDt);
-                }
+                updateMechanics(*mActors[i], mActorsFrameData[i]);
+                updateActor(*mActors[i], mActorsFrameData[i], mAdvanceSimulation, mTimeAccum, mPhysicsDt);
             }
             if(mAdvanceSimulation)
                 mAsyncBudget.update(mTimer->delta_s(mAsyncStartTime, mTimeEnd), mPrevStepCount, mBudgetCursor);
@@ -238,8 +236,7 @@ namespace MWPhysics
         // init
         for (size_t i = 0; i < actors.size(); ++i)
         {
-            assert(actors[i].lock());
-            actorsData[i].updatePosition(*actors[i].lock(), mCollisionWorld);
+            actorsData[i].updatePosition(*actors[i], mCollisionWorld);
         }
         mPrevStepCount = numSteps;
         mRemainingSteps = numSteps;
@@ -355,7 +352,7 @@ namespace MWPhysics
         mCollisionWorld->removeCollisionObject(collisionObject);
     }
 
-    void PhysicsTaskScheduler::updateSingleAabb(std::weak_ptr<PtrHolder> ptr, bool immediate)
+    void PhysicsTaskScheduler::updateSingleAabb(std::shared_ptr<PtrHolder> ptr, bool immediate)
     {
         if (immediate || mNumThreads == 0)
         {
@@ -368,20 +365,15 @@ namespace MWPhysics
         }
     }
 
-    bool PhysicsTaskScheduler::getLineOfSight(const std::weak_ptr<Actor>& actor1, const std::weak_ptr<Actor>& actor2)
+    bool PhysicsTaskScheduler::getLineOfSight(const std::shared_ptr<Actor>& actor1, const std::shared_ptr<Actor>& actor2)
     {
         std::unique_lock lock(mLOSCacheMutex);
 
-        auto actorPtr1 = actor1.lock();
-        auto actorPtr2 = actor2.lock();
-        if (!actorPtr1 || !actorPtr2)
-            return false;
-
         auto req = LOSRequest(actor1, actor2);
         auto result = std::find(mLOSCache.begin(), mLOSCache.end(), req);
         if (result == mLOSCache.end())
         {
-            req.mResult = hasLineOfSight(actorPtr1.get(), actorPtr2.get());
+            req.mResult = hasLineOfSight(actor1.get(), actor2.get());
             mLOSCache.push_back(req);
             return req.mResult;
         }
@@ -412,31 +404,28 @@ namespace MWPhysics
     {
         std::scoped_lock lock(mUpdateAabbMutex);
         std::for_each(mUpdateAabb.begin(), mUpdateAabb.end(),
-            [this](const std::weak_ptr<PtrHolder>& ptr) { updatePtrAabb(ptr); });
+            [this](const std::shared_ptr<PtrHolder>& ptr) { updatePtrAabb(ptr); });
         mUpdateAabb.clear();
     }
 
-    void PhysicsTaskScheduler::updatePtrAabb(const std::weak_ptr<PtrHolder>& ptr)
+    void PhysicsTaskScheduler::updatePtrAabb(const std::shared_ptr<PtrHolder>& ptr)
     {
-        if (const auto p = ptr.lock())
+        std::scoped_lock lock(mCollisionWorldMutex);
+        if (const auto actor = std::dynamic_pointer_cast<Actor>(ptr))
         {
-            std::scoped_lock lock(mCollisionWorldMutex);
-            if (const auto actor = std::dynamic_pointer_cast<Actor>(p))
-            {
-                actor->updateCollisionObjectPosition();
-                mCollisionWorld->updateSingleAabb(actor->getCollisionObject());
-            }
-            else if (const auto object = std::dynamic_pointer_cast<Object>(p))
-            {
-                object->commitPositionChange();
-                mCollisionWorld->updateSingleAabb(object->getCollisionObject());
-            }
-            else if (const auto projectile = std::dynamic_pointer_cast<Projectile>(p))
-            {
-                projectile->commitPositionChange();
-                mCollisionWorld->updateSingleAabb(projectile->getCollisionObject());
-            }
-        };
+            actor->updateCollisionObjectPosition();
+            mCollisionWorld->updateSingleAabb(actor->getCollisionObject());
+        }
+        else if (const auto object = std::dynamic_pointer_cast<Object>(ptr))
+        {
+            object->commitPositionChange();
+            mCollisionWorld->updateSingleAabb(object->getCollisionObject());
+        }
+        else if (const auto projectile = std::dynamic_pointer_cast<Projectile>(ptr))
+        {
+            projectile->commitPositionChange();
+            mCollisionWorld->updateSingleAabb(projectile->getCollisionObject());
+        }
     }
 
     void PhysicsTaskScheduler::worker()
@@ -452,11 +441,8 @@ namespace MWPhysics
             int job = 0;
             while (mRemainingSteps && (job = mNextJob.fetch_add(1, std::memory_order_relaxed)) < mNumJobs)
             {
-                if(const auto actor = mActors[job].lock())
-                {
-                    MaybeSharedLock lockColWorld(mCollisionWorldMutex, mThreadSafeBullet);
-                    MovementSolver::move(mActorsFrameData[job], mPhysicsDt, mCollisionWorld, *mWorldFrameData);
-                }
+                MaybeSharedLock lockColWorld(mCollisionWorldMutex, mThreadSafeBullet);
+                MovementSolver::move(mActorsFrameData[job], mPhysicsDt, mCollisionWorld, *mWorldFrameData);
             }
 
             mPostStepBarrier->wait([this] { afterPostStep(); });
@@ -465,10 +451,7 @@ namespace MWPhysics
             {
                 while ((job = mNextJob.fetch_add(1, std::memory_order_relaxed)) < mNumJobs)
                 {
-                    if(const auto actor = mActors[job].lock())
-                    {
-                        handleFall(mActorsFrameData[job], mAdvanceSimulation);
-                    }
+                    handleFall(mActorsFrameData[job], mAdvanceSimulation);
                 }
 
                 refreshLOSCache();
@@ -481,15 +464,12 @@ namespace MWPhysics
     {
         for (size_t i = 0; i < mActors.size(); ++i)
         {
-            if(const auto actor = mActors[i].lock())
+            if (mActors[i]->setPosition(mActorsFrameData[i].mPosition))
             {
-                if (actor->setPosition(mActorsFrameData[i].mPosition))
-                {
-                    std::scoped_lock lock(mCollisionWorldMutex);
-                    mActorsFrameData[i].mPosition = actor->getPosition(); // account for potential position change made by script
-                    actor->updateCollisionObjectPosition();
-                    mCollisionWorld->updateSingleAabb(actor->getCollisionObject());
-                }
+                std::scoped_lock lock(mCollisionWorldMutex);
+                mActorsFrameData[i].mPosition = mActors[i]->getPosition(); // account for potential position change made by script
+                mActors[i]->updateCollisionObjectPosition();
+                mCollisionWorld->updateSingleAabb(mActors[i]->getCollisionObject());
             }
         }
     }
@@ -545,11 +525,9 @@ namespace MWPhysics
 
         for (size_t i = 0; i < mActors.size(); ++i)
         {
-            auto actor = mActors[i].lock();
-            assert(actor);
             handleFall(mActorsFrameData[i], mAdvanceSimulation);
-            updateMechanics(*actor, mActorsFrameData[i]);
-            updateActor(*actor, mActorsFrameData[i], mAdvanceSimulation, mTimeAccum, mPhysicsDt);
+            updateMechanics(*mActors[i], mActorsFrameData[i]);
+            updateActor(*mActors[i], mActorsFrameData[i], mAdvanceSimulation, mTimeAccum, mPhysicsDt);
         }
         refreshLOSCache();
     }
@@ -583,6 +561,13 @@ namespace MWPhysics
         return (*it)->getUserPointer();
     }
 
+    void PhysicsTaskScheduler::releaseSharedStates()
+    {
+        std::scoped_lock lock(mSimulationMutex, mUpdateAabbMutex);
+        mActors.clear();
+        mUpdateAabb.clear();
+    }
+
     void PhysicsTaskScheduler::afterPreStep()
     {
         updateAabbs();
@@ -590,11 +575,8 @@ namespace MWPhysics
             return;
         for (size_t i = 0; i < mActors.size(); ++i)
         {
-            if (auto actor = mActors[i].lock())
-            {
-                std::unique_lock lock(mCollisionWorldMutex);
-                MovementSolver::unstuck(mActorsFrameData[i], mCollisionWorld);
-            }
+            std::unique_lock lock(mCollisionWorldMutex);
+            MovementSolver::unstuck(mActorsFrameData[i], mCollisionWorld);
         }
     }
 
diff --git a/apps/openmw/mwphysics/mtphysics.hpp b/apps/openmw/mwphysics/mtphysics.hpp
index e758c557e2..e2cfccffb0 100644
--- a/apps/openmw/mwphysics/mtphysics.hpp
+++ b/apps/openmw/mwphysics/mtphysics.hpp
@@ -39,7 +39,7 @@ namespace MWPhysics
             /// @param timeAccum accumulated time from previous run to interpolate movements
             /// @param actorsData per actor data needed to compute new positions
             /// @return new position of each actor
-            void applyQueuedMovements(float & timeAccum, std::vector<std::weak_ptr<Actor>>&& actors, std::vector<ActorFrameData>&& actorsData, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
+            void applyQueuedMovements(float & timeAccum, std::vector<std::shared_ptr<Actor>>&& actors, std::vector<ActorFrameData>&& actorsData, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
 
             void resetSimulation(const ActorMap& actors);
 
@@ -53,11 +53,13 @@ namespace MWPhysics
             void setCollisionFilterMask(btCollisionObject* collisionObject, int collisionFilterMask);
             void addCollisionObject(btCollisionObject* collisionObject, int collisionFilterGroup, int collisionFilterMask);
             void removeCollisionObject(btCollisionObject* collisionObject);
-            void updateSingleAabb(std::weak_ptr<PtrHolder> ptr, bool immediate=false);
-            bool getLineOfSight(const std::weak_ptr<Actor>& actor1, const std::weak_ptr<Actor>& actor2);
+            void updateSingleAabb(std::shared_ptr<PtrHolder> ptr, bool immediate=false);
+            bool getLineOfSight(const std::shared_ptr<Actor>& actor1, const std::shared_ptr<Actor>& actor2);
             void debugDraw();
             void* getUserPointer(const btCollisionObject* object) const;
 
+            void releaseSharedStates(); // destroy all objects whose destructor can't be safely called from ~PhysicsTaskScheduler()
+
         private:
             void syncComputation();
             void worker();
@@ -66,7 +68,7 @@ namespace MWPhysics
             bool hasLineOfSight(const Actor* actor1, const Actor* actor2);
             void refreshLOSCache();
             void updateAabbs();
-            void updatePtrAabb(const std::weak_ptr<PtrHolder>& ptr);
+            void updatePtrAabb(const std::shared_ptr<PtrHolder>& ptr);
             void updateStats(osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
             std::tuple<int, float> calculateStepConfig(float timeAccum) const;
             void afterPreStep();
@@ -74,7 +76,7 @@ namespace MWPhysics
             void afterPostSim();
 
             std::unique_ptr<WorldFrameData> mWorldFrameData;
-            std::vector<std::weak_ptr<Actor>> mActors;
+            std::vector<std::shared_ptr<Actor>> mActors;
             std::vector<ActorFrameData> mActorsFrameData;
             std::unordered_set<const btCollisionObject*> mCollisionObjects;
             float mDefaultPhysicsDt;
@@ -83,7 +85,7 @@ namespace MWPhysics
             btCollisionWorld* mCollisionWorld;
             MWRender::DebugDrawer* mDebugDrawer;
             std::vector<LOSRequest> mLOSCache;
-            std::set<std::weak_ptr<PtrHolder>, std::owner_less<std::weak_ptr<PtrHolder>>> mUpdateAabb;
+            std::set<std::shared_ptr<PtrHolder>> mUpdateAabb;
 
             // TODO: use std::experimental::flex_barrier or std::barrier once it becomes a thing
             std::unique_ptr<Misc::Barrier> mPreStepBarrier;
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 846f80ec64..d881285e64 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -153,6 +153,7 @@ namespace MWPhysics
         if (mWaterCollisionObject)
             mTaskScheduler->removeCollisionObject(mWaterCollisionObject.get());
 
+        mTaskScheduler->releaseSharedStates();
         mHeightFields.clear();
         mObjects.clear();
         mActors.clear();
@@ -373,15 +374,12 @@ namespace MWPhysics
 
     bool PhysicsSystem::getLineOfSight(const MWWorld::ConstPtr &actor1, const MWWorld::ConstPtr &actor2) const
     {
-        const auto getWeakPtr = [&](const MWWorld::ConstPtr &ptr) -> std::weak_ptr<Actor>
-        {
-            const auto found = mActors.find(ptr);
-            if (found != mActors.end())
-                return { found->second };
-            return {};
-        };
+        const auto it1 = mActors.find(actor1);
+        const auto it2 = mActors.find(actor2);
+        if (it1 == mActors.end() || it2 == mActors.end())
+            return false;
 
-        return mTaskScheduler->getLineOfSight(getWeakPtr(actor1), getWeakPtr(actor2));
+        return mTaskScheduler->getLineOfSight(it1->second, it2->second);
     }
 
     bool PhysicsSystem::isOnGround(const MWWorld::Ptr &actor)
@@ -769,9 +767,9 @@ namespace MWPhysics
             actor->setVelocity(osg::Vec3f());
     }
 
-    std::pair<std::vector<std::weak_ptr<Actor>>, std::vector<ActorFrameData>> PhysicsSystem::prepareFrameData(bool willSimulate)
+    std::pair<std::vector<std::shared_ptr<Actor>>, std::vector<ActorFrameData>> PhysicsSystem::prepareFrameData(bool willSimulate)
     {
-        std::pair<std::vector<std::weak_ptr<Actor>>, std::vector<ActorFrameData>> framedata;
+        std::pair<std::vector<std::shared_ptr<Actor>>, std::vector<ActorFrameData>> framedata;
         framedata.first.reserve(mActors.size());
         framedata.second.reserve(mActors.size());
         const MWBase::World *world = MWBase::Environment::get().getWorld();
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index f1b6bc147a..b20c8f88e1 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -259,7 +259,7 @@ namespace MWPhysics
 
             void updateWater();
 
-            std::pair<std::vector<std::weak_ptr<Actor>>, std::vector<ActorFrameData>> prepareFrameData(bool willSimulate);
+            std::pair<std::vector<std::shared_ptr<Actor>>, std::vector<ActorFrameData>> prepareFrameData(bool willSimulate);
 
             osg::ref_ptr<SceneUtil::UnrefQueue> mUnrefQueue;
 

From ed72f3335be61cdec9d3ecb2559607b60df37e65 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Sun, 15 Aug 2021 08:02:00 -0700
Subject: [PATCH 1216/2859] silence compiler warning

---
 apps/openmw/mwrender/characterpreview.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index 5c805ca856..9db1330923 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -145,12 +145,18 @@ namespace MWRender
                     {
                         case osg::Depth::LESS:
                             newDepth->setFunction(osg::Depth::GREATER);
+                            break;
                         case osg::Depth::LEQUAL:
                             newDepth->setFunction(osg::Depth::GEQUAL);
+                            break;
                         case osg::Depth::GREATER:
                             newDepth->setFunction(osg::Depth::LESS);
+                            break;
                         case osg::Depth::GEQUAL:
                             newDepth->setFunction(osg::Depth::LEQUAL);
+                            break;
+                        default:
+                            break;
                     }
                     newStateSet->setAttribute(newDepth, osg::StateAttribute::ON);
                 }

From 0792bb212a9d3b53164379c319119aec7f6cf843 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sun, 15 Aug 2021 18:57:33 +0200
Subject: [PATCH 1217/2859] Use an emplace instead of an insert

---
 apps/openmw/mwmechanics/actors.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index c5b46c3764..083b67640c 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1609,7 +1609,7 @@ namespace MWMechanics
         MWRender::Animation *anim = MWBase::Environment::get().getWorld()->getAnimation(ptr);
         if (!anim)
             return;
-        mActors.insert(std::make_pair(ptr, new Actor(ptr, anim)));
+        mActors.emplace(ptr, new Actor(ptr, anim));
 
         CharacterController* ctrl = mActors[ptr]->getCharacterController();
         if (updateImmediately)

From 7a015d24c66c3328b4e896f03d4623c3611761fb Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sun, 15 Aug 2021 19:50:28 +0200
Subject: [PATCH 1218/2859] Sprinkle some const-ref

---
 apps/openmw/mwbase/world.hpp               | 6 +++---
 apps/openmw/mwgui/bookpage.cpp             | 2 +-
 apps/openmw/mwgui/containeritemmodel.cpp   | 2 +-
 apps/openmw/mwgui/containeritemmodel.hpp   | 2 +-
 apps/openmw/mwgui/hud.cpp                  | 2 +-
 apps/openmw/mwgui/inventoryitemmodel.cpp   | 2 +-
 apps/openmw/mwgui/inventoryitemmodel.hpp   | 2 +-
 apps/openmw/mwgui/itemmodel.cpp            | 2 +-
 apps/openmw/mwgui/itemmodel.hpp            | 4 ++--
 apps/openmw/mwgui/travelwindow.cpp         | 2 +-
 apps/openmw/mwgui/travelwindow.hpp         | 2 +-
 apps/openmw/mwrender/actoranimation.cpp    | 2 +-
 apps/openmw/mwrender/actoranimation.hpp    | 2 +-
 apps/openmw/mwrender/animation.cpp         | 2 +-
 apps/openmw/mwrender/animation.hpp         | 2 +-
 apps/openmw/mwrender/npcanimation.cpp      | 2 +-
 apps/openmw/mwrender/npcanimation.hpp      | 2 +-
 apps/openmw/mwrender/screenshotmanager.cpp | 2 +-
 apps/openmw/mwrender/screenshotmanager.hpp | 2 +-
 apps/openmw/mwrender/weaponanimation.cpp   | 2 +-
 apps/openmw/mwrender/weaponanimation.hpp   | 2 +-
 apps/openmw/mwworld/cellvisitors.hpp       | 2 +-
 apps/openmw/mwworld/scene.cpp              | 2 +-
 apps/openmw/mwworld/worldimp.cpp           | 6 +++---
 apps/openmw/mwworld/worldimp.hpp           | 6 +++---
 components/shader/shadervisitor.cpp        | 2 +-
 components/widgets/sharedstatebutton.cpp   | 2 +-
 components/widgets/sharedstatebutton.hpp   | 2 +-
 28 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index bd806c7cac..1dbb2b96f6 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -289,14 +289,14 @@ namespace MWBase
             virtual MWWorld::Ptr moveObject(const MWWorld::Ptr &ptr, MWWorld::CellStore* newCell, const osg::Vec3f& position, bool movePhysics=true) = 0;
             ///< @return an updated Ptr
 
-            virtual MWWorld::Ptr moveObjectBy(const MWWorld::Ptr &ptr, osg::Vec3f vec, bool moveToActive, bool ignoreCollisions) = 0;
+            virtual MWWorld::Ptr moveObjectBy(const MWWorld::Ptr &ptr, const osg::Vec3f& vec, bool moveToActive, bool ignoreCollisions) = 0;
             ///< @return an updated Ptr
 
             virtual void scaleObject (const MWWorld::Ptr& ptr, float scale) = 0;
 
             virtual void rotateObject(const MWWorld::Ptr& ptr, const osg::Vec3f& rot, RotationFlags flags = RotationFlag_inverseOrder) = 0;
 
-            virtual MWWorld::Ptr placeObject(const MWWorld::ConstPtr& ptr, MWWorld::CellStore* cell, ESM::Position pos) = 0;
+            virtual MWWorld::Ptr placeObject(const MWWorld::ConstPtr& ptr, MWWorld::CellStore* cell, const ESM::Position& pos) = 0;
             ///< Place an object. Makes a copy of the Ptr.
 
             virtual MWWorld::Ptr safePlaceObject (const MWWorld::ConstPtr& ptr, const MWWorld::ConstPtr& referenceObject, MWWorld::CellStore* referenceCell, int direction, float distance) = 0;
@@ -624,7 +624,7 @@ namespace MWBase
             virtual void setPlayerTraveling(bool traveling) = 0;
             virtual bool isPlayerTraveling() const = 0;
 
-            virtual void rotateWorldObject (const MWWorld::Ptr& ptr, osg::Quat rotate) = 0;
+            virtual void rotateWorldObject (const MWWorld::Ptr& ptr, const osg::Quat& rotate) = 0;
 
             /// Return terrain height at \a worldPos position.
             virtual float getTerrainHeightAt(const osg::Vec3f& worldPos) const = 0;
diff --git a/apps/openmw/mwgui/bookpage.cpp b/apps/openmw/mwgui/bookpage.cpp
index 2f12b83572..2bfec8105b 100644
--- a/apps/openmw/mwgui/bookpage.cpp
+++ b/apps/openmw/mwgui/bookpage.cpp
@@ -108,7 +108,7 @@ struct TypesetBookImpl : TypesetBook
 
     virtual ~TypesetBookImpl () {}
 
-    Range addContent (BookTypesetter::Utf8Span text)
+    Range addContent (const BookTypesetter::Utf8Span &text)
     {
         Contents::iterator i = mContents.insert (mContents.end (), Content (text.first, text.second));
 
diff --git a/apps/openmw/mwgui/containeritemmodel.cpp b/apps/openmw/mwgui/containeritemmodel.cpp
index a1e42ba45f..81dde1c059 100644
--- a/apps/openmw/mwgui/containeritemmodel.cpp
+++ b/apps/openmw/mwgui/containeritemmodel.cpp
@@ -86,7 +86,7 @@ size_t ContainerItemModel::getItemCount()
     return mItems.size();
 }
 
-ItemModel::ModelIndex ContainerItemModel::getIndex (ItemStack item)
+ItemModel::ModelIndex ContainerItemModel::getIndex (const ItemStack& item)
 {
     size_t i = 0;
     for (ItemStack& itemStack : mItems)
diff --git a/apps/openmw/mwgui/containeritemmodel.hpp b/apps/openmw/mwgui/containeritemmodel.hpp
index df2eebea22..11fed06913 100644
--- a/apps/openmw/mwgui/containeritemmodel.hpp
+++ b/apps/openmw/mwgui/containeritemmodel.hpp
@@ -28,7 +28,7 @@ namespace MWGui
         bool onTakeItem(const MWWorld::Ptr &item, int count) override;
 
         ItemStack getItem (ModelIndex index) override;
-        ModelIndex getIndex (ItemStack item) override;
+        ModelIndex getIndex (const ItemStack &item) override;
         size_t getItemCount() override;
 
         MWWorld::Ptr copyItem (const ItemStack& item, size_t count, bool allowAutoEquip = true) override;
diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp
index 7e999bd582..5a7b5a9590 100644
--- a/apps/openmw/mwgui/hud.cpp
+++ b/apps/openmw/mwgui/hud.cpp
@@ -53,7 +53,7 @@ namespace MWGui
         }
 
         void removeItem (const ItemStack& item, size_t count) override { throw std::runtime_error("removeItem not implemented"); }
-        ModelIndex getIndex (ItemStack item) override { throw std::runtime_error("getIndex not implemented"); }
+        ModelIndex getIndex (const ItemStack &item) override { throw std::runtime_error("getIndex not implemented"); }
         void update() override {}
         size_t getItemCount() override { return 0; }
         ItemStack getItem (ModelIndex index) override { throw std::runtime_error("getItem not implemented"); }
diff --git a/apps/openmw/mwgui/inventoryitemmodel.cpp b/apps/openmw/mwgui/inventoryitemmodel.cpp
index 91d2fdbf76..f96cfd865e 100644
--- a/apps/openmw/mwgui/inventoryitemmodel.cpp
+++ b/apps/openmw/mwgui/inventoryitemmodel.cpp
@@ -34,7 +34,7 @@ size_t InventoryItemModel::getItemCount()
     return mItems.size();
 }
 
-ItemModel::ModelIndex InventoryItemModel::getIndex (ItemStack item)
+ItemModel::ModelIndex InventoryItemModel::getIndex (const ItemStack& item)
 {
     size_t i = 0;
     for (ItemStack& itemStack : mItems)
diff --git a/apps/openmw/mwgui/inventoryitemmodel.hpp b/apps/openmw/mwgui/inventoryitemmodel.hpp
index 85e2a5a8d2..87d874c946 100644
--- a/apps/openmw/mwgui/inventoryitemmodel.hpp
+++ b/apps/openmw/mwgui/inventoryitemmodel.hpp
@@ -12,7 +12,7 @@ namespace MWGui
         InventoryItemModel (const MWWorld::Ptr& actor);
 
         ItemStack getItem (ModelIndex index) override;
-        ModelIndex getIndex (ItemStack item) override;
+        ModelIndex getIndex (const ItemStack &item) override;
         size_t getItemCount() override;
 
         bool onTakeItem(const MWWorld::Ptr &item, int count) override;
diff --git a/apps/openmw/mwgui/itemmodel.cpp b/apps/openmw/mwgui/itemmodel.cpp
index 3db74916e5..7f74d3fb5a 100644
--- a/apps/openmw/mwgui/itemmodel.cpp
+++ b/apps/openmw/mwgui/itemmodel.cpp
@@ -129,7 +129,7 @@ namespace MWGui
         return -1;
     }
 
-    ItemModel::ModelIndex ProxyItemModel::getIndex (ItemStack item)
+    ItemModel::ModelIndex ProxyItemModel::getIndex (const ItemStack& item)
     {
         return mSourceModel->getIndex(item);
     }
diff --git a/apps/openmw/mwgui/itemmodel.hpp b/apps/openmw/mwgui/itemmodel.hpp
index 6ead0f8d1f..d538a040db 100644
--- a/apps/openmw/mwgui/itemmodel.hpp
+++ b/apps/openmw/mwgui/itemmodel.hpp
@@ -55,7 +55,7 @@ namespace MWGui
         virtual size_t getItemCount() = 0;
 
         /// Returns an invalid index if the item was not found
-        virtual ModelIndex getIndex (ItemStack item) = 0;
+        virtual ModelIndex getIndex (const ItemStack &item) = 0;
 
         /// Rebuild the item model, this will invalidate existing model indices
         virtual void update() = 0;
@@ -98,7 +98,7 @@ namespace MWGui
 
         MWWorld::Ptr copyItem (const ItemStack& item, size_t count, bool allowAutoEquip = true) override;
         void removeItem (const ItemStack& item, size_t count) override;
-        ModelIndex getIndex (ItemStack item) override;
+        ModelIndex getIndex (const ItemStack &item) override;
 
         /// @note Takes ownership of the passed pointer.
         void setSourceModel(ItemModel* sourceModel);
diff --git a/apps/openmw/mwgui/travelwindow.cpp b/apps/openmw/mwgui/travelwindow.cpp
index ed7a74b95f..22e3a55566 100644
--- a/apps/openmw/mwgui/travelwindow.cpp
+++ b/apps/openmw/mwgui/travelwindow.cpp
@@ -44,7 +44,7 @@ namespace MWGui
                           mSelect->getHeight());
     }
 
-    void TravelWindow::addDestination(const std::string& name, ESM::Position pos, bool interior)
+    void TravelWindow::addDestination(const std::string& name, const ESM::Position &pos, bool interior)
     {
         int price;
 
diff --git a/apps/openmw/mwgui/travelwindow.hpp b/apps/openmw/mwgui/travelwindow.hpp
index 00b7db7305..dd970ee10e 100644
--- a/apps/openmw/mwgui/travelwindow.hpp
+++ b/apps/openmw/mwgui/travelwindow.hpp
@@ -31,7 +31,7 @@ namespace MWGui
             void onCancelButtonClicked(MyGUI::Widget* _sender);
             void onTravelButtonClick(MyGUI::Widget* _sender);
             void onMouseWheel(MyGUI::Widget* _sender, int _rel);
-            void addDestination(const std::string& name, ESM::Position pos, bool interior);
+            void addDestination(const std::string& name, const ESM::Position& pos, bool interior);
             void clearDestinations();
             int mCurrentY;
 
diff --git a/apps/openmw/mwrender/actoranimation.cpp b/apps/openmw/mwrender/actoranimation.cpp
index 59bc327656..4109d61e8c 100644
--- a/apps/openmw/mwrender/actoranimation.cpp
+++ b/apps/openmw/mwrender/actoranimation.cpp
@@ -84,7 +84,7 @@ PartHolderPtr ActorAnimation::attachMesh(const std::string& model, const std::st
     return PartHolderPtr(new PartHolder(instance));
 }
 
-std::string ActorAnimation::getShieldMesh(MWWorld::ConstPtr shield) const
+std::string ActorAnimation::getShieldMesh(const MWWorld::ConstPtr& shield) const
 {
     std::string mesh = shield.getClass().getModel(shield);
     const ESM::Armor *armor = shield.get<ESM::Armor>()->mBase;
diff --git a/apps/openmw/mwrender/actoranimation.hpp b/apps/openmw/mwrender/actoranimation.hpp
index e149e44148..e6bba48d56 100644
--- a/apps/openmw/mwrender/actoranimation.hpp
+++ b/apps/openmw/mwrender/actoranimation.hpp
@@ -45,7 +45,7 @@ class ActorAnimation : public Animation, public MWWorld::ContainerStoreListener
         virtual void updateHolsteredWeapon(bool showHolsteredWeapons);
         virtual void updateHolsteredShield(bool showCarriedLeft);
         virtual void updateQuiver();
-        virtual std::string getShieldMesh(MWWorld::ConstPtr shield) const;
+        virtual std::string getShieldMesh(const MWWorld::ConstPtr& shield) const;
         virtual std::string getHolsteredWeaponBoneName(const MWWorld::ConstPtr& weapon);
         virtual PartHolderPtr attachMesh(const std::string& model, const std::string& bonename, bool enchantedGlow, osg::Vec4f* glowColor);
         virtual PartHolderPtr attachMesh(const std::string& model, const std::string& bonename)
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 07b1deeff3..591e666d01 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -1839,7 +1839,7 @@ namespace MWRender
         mRootController = addRotateController("bip01");
     }
 
-    RotateController* Animation::addRotateController(std::string bone)
+    RotateController* Animation::addRotateController(const std::string &bone)
     {
         auto iter = getNodeMap().find(bone);
         if (iter == getNodeMap().end())
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index 24478439c1..ffcd9b3260 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -271,7 +271,7 @@ protected:
     float mLegsYawRadians;
     float mBodyPitchRadians;
 
-    RotateController* addRotateController(std::string bone);
+    RotateController* addRotateController(const std::string& bone);
 
     bool mHasMagicEffects;
 
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 12ed88e55d..d142996f40 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -551,7 +551,7 @@ void NpcAnimation::updateNpcBase()
     mWeaponAnimationTime->updateStartTime();
 }
 
-std::string NpcAnimation::getShieldMesh(MWWorld::ConstPtr shield) const
+std::string NpcAnimation::getShieldMesh(const MWWorld::ConstPtr& shield) const
 {
     std::string mesh = shield.getClass().getModel(shield);
     const ESM::Armor *armor = shield.get<ESM::Armor>()->mBase;
diff --git a/apps/openmw/mwrender/npcanimation.hpp b/apps/openmw/mwrender/npcanimation.hpp
index 7e55001daf..768ac01622 100644
--- a/apps/openmw/mwrender/npcanimation.hpp
+++ b/apps/openmw/mwrender/npcanimation.hpp
@@ -106,7 +106,7 @@ private:
 protected:
     void addControllers() override;
     bool isArrowAttached() const override;
-    std::string getShieldMesh(MWWorld::ConstPtr shield) const override;
+    std::string getShieldMesh(const MWWorld::ConstPtr& shield) const override;
 
 public:
     /**
diff --git a/apps/openmw/mwrender/screenshotmanager.cpp b/apps/openmw/mwrender/screenshotmanager.cpp
index 96a8a9450a..b9ea5daacf 100644
--- a/apps/openmw/mwrender/screenshotmanager.cpp
+++ b/apps/openmw/mwrender/screenshotmanager.cpp
@@ -328,7 +328,7 @@ namespace MWRender
         mRootNode->removeChild(camera);
     }
 
-    void ScreenshotManager::makeCubemapScreenshot(osg::Image *image, int w, int h, osg::Matrixd cameraTransform)
+    void ScreenshotManager::makeCubemapScreenshot(osg::Image *image, int w, int h, const osg::Matrixd& cameraTransform)
     {
         osg::ref_ptr<osg::Camera> rttCamera (new osg::Camera);
         float nearClip = Settings::Manager::getFloat("near clip", "Camera");
diff --git a/apps/openmw/mwrender/screenshotmanager.hpp b/apps/openmw/mwrender/screenshotmanager.hpp
index 373fe3be84..094a4a20f4 100644
--- a/apps/openmw/mwrender/screenshotmanager.hpp
+++ b/apps/openmw/mwrender/screenshotmanager.hpp
@@ -37,7 +37,7 @@ namespace MWRender
 
         void traversalsAndWait(unsigned int frame);
         void renderCameraToImage(osg::Camera *camera, osg::Image *image, int w, int h);
-        void makeCubemapScreenshot(osg::Image* image, int w, int h, osg::Matrixd cameraTransform=osg::Matrixd());
+        void makeCubemapScreenshot(osg::Image* image, int w, int h, const osg::Matrixd &cameraTransform=osg::Matrixd());
     };
 }
 
diff --git a/apps/openmw/mwrender/weaponanimation.cpp b/apps/openmw/mwrender/weaponanimation.cpp
index 0c2a11466b..fb92a4980a 100644
--- a/apps/openmw/mwrender/weaponanimation.cpp
+++ b/apps/openmw/mwrender/weaponanimation.cpp
@@ -60,7 +60,7 @@ WeaponAnimation::~WeaponAnimation()
 
 }
 
-void WeaponAnimation::attachArrow(MWWorld::Ptr actor)
+void WeaponAnimation::attachArrow(const MWWorld::Ptr& actor)
 {
     const MWWorld::InventoryStore& inv = actor.getClass().getInventoryStore(actor);
     MWWorld::ConstContainerStoreIterator weaponSlot = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
diff --git a/apps/openmw/mwrender/weaponanimation.hpp b/apps/openmw/mwrender/weaponanimation.hpp
index d02107333e..333dccc915 100644
--- a/apps/openmw/mwrender/weaponanimation.hpp
+++ b/apps/openmw/mwrender/weaponanimation.hpp
@@ -34,7 +34,7 @@ namespace MWRender
         virtual ~WeaponAnimation();
 
         /// @note If no weapon (or an invalid weapon) is equipped, this function is a no-op.
-        void attachArrow(MWWorld::Ptr actor);
+        void attachArrow(const MWWorld::Ptr &actor);
 
         void detachArrow(MWWorld::Ptr actor);
 
diff --git a/apps/openmw/mwworld/cellvisitors.hpp b/apps/openmw/mwworld/cellvisitors.hpp
index fec8ca77b0..81e1248e6d 100644
--- a/apps/openmw/mwworld/cellvisitors.hpp
+++ b/apps/openmw/mwworld/cellvisitors.hpp
@@ -29,7 +29,7 @@ namespace MWWorld
     {
         std::vector<MWWorld::Ptr> mObjects;
 
-        bool operator() (MWWorld::Ptr ptr)
+        bool operator() (const MWWorld::Ptr& ptr)
         {
             mObjects.push_back (ptr);
             return true;
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index d1b06131b9..aac69bab80 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -86,7 +86,7 @@ namespace
         return rot;
     }
 
-    void setNodeRotation(const MWWorld::Ptr& ptr, MWRender::RenderingManager& rendering, osg::Quat rotation)
+    void setNodeRotation(const MWWorld::Ptr& ptr, MWRender::RenderingManager& rendering, const osg::Quat &rotation)
     {
         if (ptr.getRefData().getBaseNode())
             rendering.rotateObject(ptr, rotation);
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 54b15e4412..bc28c2eb7b 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1256,7 +1256,7 @@ namespace MWWorld
         return moveObject(ptr, cell, position, movePhysics);
     }
 
-    MWWorld::Ptr World::moveObjectBy(const Ptr& ptr, osg::Vec3f vec, bool moveToActive, bool ignoreCollisions)
+    MWWorld::Ptr World::moveObjectBy(const Ptr& ptr, const osg::Vec3f& vec, bool moveToActive, bool ignoreCollisions)
     {
         auto* actor = mPhysics->getActor(ptr);
         osg::Vec3f newpos = ptr.getRefData().getPosition().asVec3() + vec;
@@ -1410,7 +1410,7 @@ namespace MWWorld
         }
     }
 
-    void World::rotateWorldObject (const Ptr& ptr, osg::Quat rotate)
+    void World::rotateWorldObject (const Ptr& ptr, const osg::Quat& rotate)
     {
         if(ptr.getRefData().getBaseNode() != nullptr)
         {
@@ -1425,7 +1425,7 @@ namespace MWWorld
         }
     }
 
-    MWWorld::Ptr World::placeObject(const MWWorld::ConstPtr& ptr, MWWorld::CellStore* cell, ESM::Position pos)
+    MWWorld::Ptr World::placeObject(const MWWorld::ConstPtr& ptr, MWWorld::CellStore* cell, const ESM::Position& pos)
     {
         return copyObjectToCell(ptr,cell,pos,ptr.getRefData().getCount(),false);
     }
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 11769372f8..32fc9b101a 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -224,7 +224,7 @@ namespace MWWorld
 
             void setWaterHeight(const float height) override;
 
-            void rotateWorldObject (const MWWorld::Ptr& ptr, osg::Quat rotate) override;
+            void rotateWorldObject (const MWWorld::Ptr& ptr, const osg::Quat& rotate) override;
 
             bool toggleWater() override;
             bool toggleWorld() override;
@@ -376,7 +376,7 @@ namespace MWWorld
             MWWorld::Ptr moveObject (const Ptr& ptr, CellStore* newCell, const osg::Vec3f& position, bool movePhysics=true) override;
             ///< @return an updated Ptr
 
-            MWWorld::Ptr moveObjectBy(const Ptr& ptr, osg::Vec3f vec, bool moveToActive, bool ignoreCollisions) override;
+            MWWorld::Ptr moveObjectBy(const Ptr& ptr, const osg::Vec3f& vec, bool moveToActive, bool ignoreCollisions) override;
             ///< @return an updated Ptr
 
             void scaleObject (const Ptr& ptr, float scale) override;
@@ -387,7 +387,7 @@ namespace MWWorld
             /// \param adjust indicates rotation should be set or adjusted
             void rotateObject (const Ptr& ptr, const osg::Vec3f& rot, MWBase::RotationFlags flags = MWBase::RotationFlag_inverseOrder) override;
 
-            MWWorld::Ptr placeObject(const MWWorld::ConstPtr& ptr, MWWorld::CellStore* cell, ESM::Position pos) override;
+            MWWorld::Ptr placeObject(const MWWorld::ConstPtr& ptr, MWWorld::CellStore* cell, const ESM::Position& pos) override;
             ///< Place an object. Makes a copy of the Ptr.
 
             MWWorld::Ptr safePlaceObject (const MWWorld::ConstPtr& ptr, const MWWorld::ConstPtr& referenceObject, MWWorld::CellStore* referenceCell, int direction, float distance) override;
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 67a8ec86ad..26511d4654 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -56,7 +56,7 @@ namespace Shader
 
         bool hasUniform(const std::string& name) { return mUniforms.count(name); }
         bool hasMode(osg::StateAttribute::GLMode mode) { return mModes.count(mode); }
-        bool hasAttribute(osg::StateAttribute::TypeMemberPair typeMemberPair) { return mAttributes.count(typeMemberPair); }
+        bool hasAttribute(const osg::StateAttribute::TypeMemberPair &typeMemberPair) { return mAttributes.count(typeMemberPair); }
         bool hasAttribute(osg::StateAttribute::Type type, unsigned int member) { return hasAttribute(osg::StateAttribute::TypeMemberPair(type, member)); }
 
         const std::set<osg::StateAttribute::TypeMemberPair>& getAttributes() { return mAttributes; }
diff --git a/components/widgets/sharedstatebutton.cpp b/components/widgets/sharedstatebutton.cpp
index f4456275bd..91436a1b96 100644
--- a/components/widgets/sharedstatebutton.cpp
+++ b/components/widgets/sharedstatebutton.cpp
@@ -18,7 +18,7 @@ namespace Gui
         }
     }
 
-    void SharedStateButton::shareStateWith(ButtonGroup shared)
+    void SharedStateButton::shareStateWith(const ButtonGroup &shared)
     {
         mSharedWith = shared;
     }
diff --git a/components/widgets/sharedstatebutton.hpp b/components/widgets/sharedstatebutton.hpp
index 42c6424b2c..d643bf2430 100644
--- a/components/widgets/sharedstatebutton.hpp
+++ b/components/widgets/sharedstatebutton.hpp
@@ -34,7 +34,7 @@ namespace Gui
         bool _setState(const std::string &_value);
 
     public:
-        void shareStateWith(ButtonGroup shared);
+        void shareStateWith(const ButtonGroup &shared);
 
         /// @note The ButtonGroup connection will be destroyed when any widget in the group gets destroyed.
         static void createButtonGroup(ButtonGroup group);

From ff2a51a484a4e99edb0ae76658ed4e9438d89cce Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sun, 15 Aug 2021 19:57:20 +0200
Subject: [PATCH 1219/2859] Use an initialization list in WrapAroundOperator's
 constructor

---
 apps/openmw/mwrender/sky.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index 05ce0f1560..c1b79843a7 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -1350,11 +1350,9 @@ void SkyManager::setCamera(osg::Camera *camera)
 class WrapAroundOperator : public osgParticle::Operator
 {
 public:
-    WrapAroundOperator(osg::Camera *camera, const osg::Vec3 &wrapRange): osgParticle::Operator()
+    WrapAroundOperator(osg::Camera *camera, const osg::Vec3 &wrapRange): osgParticle::Operator(),
+        mCamera(camera), mWrapRange(wrapRange), mHalfWrapRange(mWrapRange / 2.0)
     {
-        mCamera = camera;
-        mWrapRange = wrapRange;
-        mHalfWrapRange = mWrapRange / 2.0;
         mPreviousCameraPosition = getCameraPosition();
     }
 

From 9622def79c058b6d3da3ef80fc759d7abe4b0535 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Mon, 16 Aug 2021 12:10:45 +0200
Subject: [PATCH 1220/2859] Don't build everything in clang-tidy

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 059716fe29..8d82d6ed79 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,7 +41,7 @@ Clang_Tidy:
   script:
     - CI/before_script.linux.sh
     - cd build
-    - cmake --build . -- -j $(nproc)
+    - cmake --build . -- -j $(nproc) openmw esmtool bsatool niftest openmw-wizard openmw-launcher openmw-iniimporter openmw-essimporter
   variables:
     CC: clang
     CXX: clang++

From 5793f5cf187fb67baf7f23c17ddd93b703164b97 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sun, 15 Aug 2021 20:11:55 +0200
Subject: [PATCH 1221/2859] Sprinkle a couple of std::move and a const

---
 components/resource/keyframemanager.cpp    | 2 +-
 components/sceneutil/mwshadowtechnique.cpp | 2 +-
 components/sceneutil/shadowsbin.cpp        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/resource/keyframemanager.cpp b/components/resource/keyframemanager.cpp
index 69986fbcd9..77c31d9ad7 100644
--- a/components/resource/keyframemanager.cpp
+++ b/components/resource/keyframemanager.cpp
@@ -40,7 +40,7 @@ namespace Resource
                         }
 
                         osg::ref_ptr<Resource::Animation> mergedAnimationTrack = new Resource::Animation;
-                        std::string animationName = animation->getName();
+                        const std::string animationName = animation->getName();
                         mergedAnimationTrack->setName(animationName);
 
                         const osgAnimation::ChannelList& channels = animation->getChannels();
diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
index 19222eda23..95ff8f2b01 100644
--- a/components/sceneutil/mwshadowtechnique.cpp
+++ b/components/sceneutil/mwshadowtechnique.cpp
@@ -2141,7 +2141,7 @@ struct ConvexHull
                 finalEdges.push_back(edge);
         }
 
-        _edges = finalEdges;
+        _edges = std::move(finalEdges);
     }
 
     void transform(const osg::Matrixd& m)
diff --git a/components/sceneutil/shadowsbin.cpp b/components/sceneutil/shadowsbin.cpp
index abc1fa8b44..14dbc14178 100644
--- a/components/sceneutil/shadowsbin.cpp
+++ b/components/sceneutil/shadowsbin.cpp
@@ -221,7 +221,7 @@ void ShadowsBin::sortImplementation()
     }
     if (!noTestRoot->_leaves.empty())
         newList.push_back(noTestRoot);
-    _stateGraphList = newList;
+    _stateGraphList = std::move(newList);
 }
 
 }

From 39cd679ca96128f057f65f4b9df53a708133c58e Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sun, 15 Aug 2021 18:18:32 +0200
Subject: [PATCH 1222/2859] Minor factorisation in
 apps/openmw/mwmechanics/actors.cpp

---
 apps/openmw/mwmechanics/actors.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index c5b46c3764..78ec6ed55c 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -60,22 +60,24 @@ int getBoundItemSlot (const std::string& itemId)
     static std::map<std::string, int> boundItemsMap;
     if (boundItemsMap.empty())
     {
-        std::string boundId = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("sMagicBoundBootsID")->mValue.getString();
+        const auto& store = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+
+        std::string boundId = store.find("sMagicBoundBootsID")->mValue.getString();
         boundItemsMap[boundId] = MWWorld::InventoryStore::Slot_Boots;
 
-        boundId = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("sMagicBoundCuirassID")->mValue.getString();
+        boundId = store.find("sMagicBoundCuirassID")->mValue.getString();
         boundItemsMap[boundId] = MWWorld::InventoryStore::Slot_Cuirass;
 
-        boundId = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("sMagicBoundLeftGauntletID")->mValue.getString();
+        boundId = store.find("sMagicBoundLeftGauntletID")->mValue.getString();
         boundItemsMap[boundId] = MWWorld::InventoryStore::Slot_LeftGauntlet;
 
-        boundId = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("sMagicBoundRightGauntletID")->mValue.getString();
+        boundId = store.find("sMagicBoundRightGauntletID")->mValue.getString();
         boundItemsMap[boundId] = MWWorld::InventoryStore::Slot_RightGauntlet;
 
-        boundId = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("sMagicBoundHelmID")->mValue.getString();
+        boundId = store.find("sMagicBoundHelmID")->mValue.getString();
         boundItemsMap[boundId] = MWWorld::InventoryStore::Slot_Helmet;
 
-        boundId = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("sMagicBoundShieldID")->mValue.getString();
+        boundId = store.find("sMagicBoundShieldID")->mValue.getString();
         boundItemsMap[boundId] = MWWorld::InventoryStore::Slot_CarriedLeft;
     }
 

From 47a841d3b7fb700fc254150f73b378b166e0cb69 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Tue, 17 Aug 2021 12:29:28 +1000
Subject: [PATCH 1223/2859] Fix/workaround for Issue #3246

OpenMW save file assumes the presence of NPC/Creature data but the vanilla save file provides only the delta changes in most situations.  The base data are not available without loading all the relevant dependency content files.  Duplicating that code in the ESSImporter is not desirable.

Ideally a flag should be set but that will mean a change in the save file format.  For a minor change such as this doing so seems like an overkill.  So a temporary workaround is introduced where the gold carried by the NPC/Creature is used as an indicator as the lack of ACDT data.
---
 apps/essimporter/converter.cpp            |  5 +++++
 apps/openmw/mwclass/creature.cpp          | 25 +++++++++++++++--------
 apps/openmw/mwclass/npc.cpp               | 13 +++++++++---
 apps/openmw/mwmechanics/creaturestats.cpp | 20 +++++++++++-------
 apps/openmw/mwmechanics/creaturestats.hpp |  2 ++
 5 files changed, 47 insertions(+), 18 deletions(-)

diff --git a/apps/essimporter/converter.cpp b/apps/essimporter/converter.cpp
index 320f7224bc..874b936baf 100644
--- a/apps/essimporter/converter.cpp
+++ b/apps/essimporter/converter.cpp
@@ -2,6 +2,7 @@
 
 #include <stdexcept>
 #include <algorithm>
+#include <climits> // INT_MIN
 
 #include <osgDB/WriteFile>
 
@@ -369,6 +370,8 @@ namespace ESSImport
                     // from the ESM with default values
                     if (cellref.mHasACDT)
                         convertACDT(cellref.mACDT, objstate.mCreatureStats);
+                    else
+                        objstate.mCreatureStats.mGoldPool = INT_MIN; // HACK: indicates no ACDT
                     if (cellref.mHasACSC)
                         convertACSC(cellref.mACSC, objstate.mCreatureStats);
                     convertNpcData(cellref, objstate.mNpcStats);
@@ -410,6 +413,8 @@ namespace ESSImport
                     // from the ESM with default values
                     if (cellref.mHasACDT)
                         convertACDT(cellref.mACDT, objstate.mCreatureStats);
+                    else
+                        objstate.mCreatureStats.mGoldPool = INT_MIN; // HACK: indicates no ACDT
                     if (cellref.mHasACSC)
                         convertACSC(cellref.mACSC, objstate.mCreatureStats);
                     convertCREC(crecIt->second, objstate);
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index d03ea70a87..8a9f33e1bd 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -748,26 +748,35 @@ namespace MWClass
         if (!state.mHasCustomState)
             return;
 
+        const ESM::CreatureState& creatureState = state.asCreatureState();
+
         if (state.mVersion > 0)
         {
             if (!ptr.getRefData().getCustomData())
             {
-                // Create a CustomData, but don't fill it from ESM records (not needed)
-                std::unique_ptr<CreatureCustomData> data (new CreatureCustomData);
-
-                if (hasInventoryStore(ptr))
-                    data->mContainerStore = std::make_unique<MWWorld::InventoryStore>();
+                // FIXME: the use of mGoldPool can be replaced with another flag the next time
+                // the save file format is changed
+                if (creatureState.mCreatureStats.mGoldPool == INT_MIN)
+                    ensureCustomData(ptr);
                 else
-                    data->mContainerStore = std::make_unique<MWWorld::ContainerStore>();
+                {
+                    // Create a CustomData, but don't fill it from ESM records (not needed)
+                    std::unique_ptr<CreatureCustomData> data (new CreatureCustomData);
 
-                ptr.getRefData().setCustomData (std::move(data));
+                    if (hasInventoryStore(ptr))
+                        data->mContainerStore = std::make_unique<MWWorld::InventoryStore>();
+                    else
+                        data->mContainerStore = std::make_unique<MWWorld::ContainerStore>();
+
+                    ptr.getRefData().setCustomData (std::move(data));
+                }
             }
         }
         else
             ensureCustomData(ptr); // in openmw 0.30 savegames not all state was saved yet, so need to load it regardless.
 
         CreatureCustomData& customData = ptr.getRefData().getCustomData()->asCreatureCustomData();
-        const ESM::CreatureState& creatureState = state.asCreatureState();
+
         customData.mContainerStore->readState (creatureState.mInventory);
         bool spellsInitialised = customData.mCreatureStats.getSpells().setSpells(ptr.get<ESM::Creature>()->mBase->mId);
         if(spellsInitialised)
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 736ae537fe..030c533b23 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -1291,19 +1291,26 @@ namespace MWClass
         if (!state.mHasCustomState)
             return;
 
+        const ESM::NpcState& npcState = state.asNpcState();
+
         if (state.mVersion > 0)
         {
             if (!ptr.getRefData().getCustomData())
             {
-                // Create a CustomData, but don't fill it from ESM records (not needed)
-                ptr.getRefData().setCustomData(std::make_unique<NpcCustomData>());
+                // FIXME: the use of mGoldPool can be replaced with another flag the next time
+                // the save file format is changed
+                if (npcState.mCreatureStats.mGoldPool == INT_MIN)
+                    ensureCustomData(ptr);
+                else
+                    // Create a CustomData, but don't fill it from ESM records (not needed)
+                    ptr.getRefData().setCustomData(std::make_unique<NpcCustomData>());
             }
         }
         else
             ensureCustomData(ptr); // in openmw 0.30 savegames not all state was saved yet, so need to load it regardless.
 
         NpcCustomData& customData = ptr.getRefData().getCustomData()->asNpcCustomData();
-        const ESM::NpcState& npcState = state.asNpcState();
+
         customData.mInventoryStore.readState (npcState.mInventory);
         customData.mNpcStats.readState (npcState.mNpcStats);
         bool spellsInitialised = customData.mNpcStats.getSpells().setSpells(ptr.get<ESM::NPC>()->mBase->mId);
diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index 1ff44fcbb0..8d99664f27 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -1,6 +1,7 @@
 #include "creaturestats.hpp"
 
 #include <algorithm>
+#include <climits>
 
 #include <components/esm/creaturestats.hpp>
 #include <components/esm/esmreader.hpp>
@@ -562,22 +563,27 @@ namespace MWMechanics
 
     void CreatureStats::readState (const ESM::CreatureStats& state)
     {
-        for (int i=0; i<ESM::Attribute::Length; ++i)
-            mAttributes[i].readState (state.mAttributes[i]);
+        // HACK: using mGoldPool as an indicator for lack of ACDT during .ess import
+        if (state.mGoldPool != INT_MIN)
+        {
+            for (int i=0; i<ESM::Attribute::Length; ++i)
+                mAttributes[i].readState (state.mAttributes[i]);
 
-        for (int i=0; i<3; ++i)
-            mDynamic[i].readState (state.mDynamic[i]);
+            for (int i=0; i<3; ++i)
+                mDynamic[i].readState (state.mDynamic[i]);
+
+            mGoldPool = state.mGoldPool;
+            mTalkedTo = state.mTalkedTo;
+            mAttacked = state.mAttacked;
+        }
 
         mLastRestock = MWWorld::TimeStamp(state.mTradeTime);
-        mGoldPool = state.mGoldPool;
 
         mDead = state.mDead;
         mDeathAnimationFinished = state.mDeathAnimationFinished;
         mDied = state.mDied;
         mMurdered = state.mMurdered;
-        mTalkedTo = state.mTalkedTo;
         mAlarmed = state.mAlarmed;
-        mAttacked = state.mAttacked;
         // TODO: rewrite. does this really need 3 separate bools?
         mKnockdown = state.mKnockdown;
         mKnockdownOneFrame = state.mKnockdownOneFrame;
diff --git a/apps/openmw/mwmechanics/creaturestats.hpp b/apps/openmw/mwmechanics/creaturestats.hpp
index e09f5197e1..06d526cc5a 100644
--- a/apps/openmw/mwmechanics/creaturestats.hpp
+++ b/apps/openmw/mwmechanics/creaturestats.hpp
@@ -70,6 +70,8 @@ namespace MWMechanics
         MWWorld::TimeStamp mLastRestock;
 
         // The pool of merchant gold (not in inventory)
+        // HACK: value of INT_MIN has a special meaning: indicates a converted .ess file
+        //       (this is a workaround to avoid changing the save file format)
         int mGoldPool;
 
         int mActorId;

From 59a92de9777d9aed1bb1c5141aa15589c2629064 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Tue, 17 Aug 2021 12:31:06 +1000
Subject: [PATCH 1224/2859] update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c53c8401f3..cb461154d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 0.48.0
 ------
 
+    Bug #3246: ESSImporter: Most NPCs are dead on save load
     Bug #3514: Editing a reference's position after loading an esp file makes the reference disappear
     Bug #3737: Scripts from The Underground 2 .esp do not play (all patched versions)
     Bug #3846: Strings starting with "-" fail to compile if not enclosed in quotes

From b1fb3e2313f8fcd99de15c193e8eba1c9ab7a7d2 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Tue, 17 Aug 2021 13:53:14 +1000
Subject: [PATCH 1225/2859] Add missing includes.

---
 apps/openmw/mwclass/creature.cpp | 2 ++
 apps/openmw/mwclass/npc.cpp      | 1 +
 2 files changed, 3 insertions(+)

diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 8a9f33e1bd..50dafba39b 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -1,5 +1,7 @@
 #include "creature.hpp"
 
+#include <climits> // INT_MIN
+
 #include <components/misc/rng.hpp>
 #include <components/debug/debuglog.hpp>
 #include <components/esm/loadcrea.hpp>
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 030c533b23..41cf3beed5 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -1,6 +1,7 @@
 #include "npc.hpp"
 
 #include <memory>
+#include <climits> // INT_MIN
 
 #include <components/misc/constants.hpp>
 #include <components/misc/rng.hpp>

From d63eb3325f990a6745ec33477d7c114e0f202ab0 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Tue, 17 Aug 2021 17:45:50 -0700
Subject: [PATCH 1226/2859] fix coverity warning and build on some osg

---
 apps/openmw/mwrender/postprocessor.cpp    | 20 ++++++++++----------
 apps/openmw/mwrender/postprocessor.hpp    |  2 +-
 apps/openmw/mwrender/renderingmanager.cpp | 12 ++++++------
 components/sceneutil/util.cpp             |  2 +-
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/apps/openmw/mwrender/postprocessor.cpp b/apps/openmw/mwrender/postprocessor.cpp
index eff7d46892..f846a05872 100644
--- a/apps/openmw/mwrender/postprocessor.cpp
+++ b/apps/openmw/mwrender/postprocessor.cpp
@@ -43,14 +43,15 @@ namespace
 
         void operator()(osg::Node* node, osg::NodeVisitor* nv) override
         {
-            osgUtil::RenderStage* renderStage = nv->asCullVisitor()->getCurrentRenderStage();
+            osgUtil::CullVisitor* cv = static_cast<osgUtil::CullVisitor*>(nv);
+            osgUtil::RenderStage* renderStage = cv->getCurrentRenderStage();
 
             unsigned int frame = nv->getTraversalNumber();
             if (frame != mLastFrameNumber)
             {
                 mLastFrameNumber = frame;
 
-                MWRender::PostProcessor* postProcessor = dynamic_cast<MWRender::PostProcessor*>(nv->asCullVisitor()->getCurrentCamera()->getUserData());
+                MWRender::PostProcessor* postProcessor = dynamic_cast<MWRender::PostProcessor*>(cv->getCurrentCamera()->getUserData());
 
                 if (!postProcessor)
                 {
@@ -99,8 +100,12 @@ namespace MWRender
     PostProcessor::PostProcessor(RenderingManager& rendering, osgViewer::Viewer* viewer, osg::Group* rootNode)
         : mViewer(viewer)
         , mRootNode(new osg::Group)
+        , mDepthFormat(GL_DEPTH_COMPONENT24)
         , mRendering(rendering)
     {
+        if (!SceneUtil::getReverseZ())
+            return;
+
         osg::GraphicsContext* gc = viewer->getCamera()->getGraphicsContext();
         unsigned int contextID = gc->getState()->getContextID();
         osg::GLExtensions* ext = gc->getState()->get<osg::GLExtensions>();
@@ -128,7 +133,6 @@ namespace MWRender
             // TODO: Once we have post-processing implemented we want to skip this return and continue with setup.
             // Rendering to a FBO to fullscreen geometry has overhead (especially when MSAA is enabled) and there are no
             // benefits if no floating point depth formats are supported.
-            mDepthFormat = GL_DEPTH_COMPONENT24;
             Log(Debug::Warning) << errPreamble << "'GL_ARB_depth_buffer_float' and 'GL_NV_depth_buffer_float' unsupported.";
             return;
         }
@@ -137,7 +141,7 @@ namespace MWRender
         int height = viewer->getCamera()->getViewport()->height();
 
         createTexturesAndCamera(width, height);
-        resize(width, height, true);
+        resize(width, height);
 
         mRootNode->addChild(mHUDCamera);
         mRootNode->addChild(rootNode);
@@ -154,7 +158,7 @@ namespace MWRender
         mViewer->getCamera()->setUserData(this);
     }
 
-    void PostProcessor::resize(int width, int height, bool init)
+    void PostProcessor::resize(int width, int height)
     {
         mDepthTex->setTextureSize(width, height);
         mSceneTex->setTextureSize(width, height);
@@ -170,7 +174,7 @@ namespace MWRender
         // When MSAA is enabled we must first render to a render buffer, then
         // blit the result to the FBO which is either passed to the main frame
         // buffer for display or used as the entry point for a post process chain.
-        if (samples > 0)
+        if (samples > 1)
         {
             mMsaaFbo = new osg::FrameBufferObject;
             osg::ref_ptr<osg::RenderBuffer> colorRB = new osg::RenderBuffer(width, height, mSceneTex->getInternalFormat(), samples);
@@ -179,12 +183,8 @@ namespace MWRender
             mMsaaFbo->setAttachment(osg::Camera::DEPTH_BUFFER, osg::FrameBufferAttachment(depthRB));
         }
 
-        if (init)
-            return;
-
         mViewer->getCamera()->resize(width, height);
         mHUDCamera->resize(width, height);
-
         mRendering.updateProjectionMatrix();
     }
 
diff --git a/apps/openmw/mwrender/postprocessor.hpp b/apps/openmw/mwrender/postprocessor.hpp
index ad922c1cbc..f93f3a5b66 100644
--- a/apps/openmw/mwrender/postprocessor.hpp
+++ b/apps/openmw/mwrender/postprocessor.hpp
@@ -26,7 +26,7 @@ namespace MWRender
 
         int getDepthFormat() { return mDepthFormat; }
 
-        void resize(int width, int height, bool init=false);
+        void resize(int width, int height);
 
     private:
         void createTexturesAndCamera(int width, int height);
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 5ffc54f3f8..381a2e5f62 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -431,6 +431,12 @@ namespace MWRender
             mGroundcoverWorld->setActiveGrid(osg::Vec4i(0, 0, 0, 0));
         }
 
+        mStateUpdater = new StateUpdater;
+        sceneRoot->addUpdateCallback(mStateUpdater);
+
+        mSharedUniformStateUpdater = new SharedUniformStateUpdater;
+        rootNode->addUpdateCallback(mSharedUniformStateUpdater);
+
         mPostProcessor = new PostProcessor(*this, viewer, mRootNode);
         resourceSystem->getSceneManager()->setDepthFormat(mPostProcessor->getDepthFormat());
 
@@ -476,12 +482,6 @@ namespace MWRender
 
         source->setStateSetModes(*mRootNode->getOrCreateStateSet(), osg::StateAttribute::ON);
 
-        mStateUpdater = new StateUpdater;
-        sceneRoot->addUpdateCallback(mStateUpdater);
-
-        mSharedUniformStateUpdater = new SharedUniformStateUpdater;
-        rootNode->addUpdateCallback(mSharedUniformStateUpdater);
-
         osg::Camera::CullingMode cullingMode = osg::Camera::DEFAULT_CULLING|osg::Camera::FAR_PLANE_CULLING;
 
         if (!Settings::Manager::getBool("small feature culling", "Camera"))
diff --git a/components/sceneutil/util.cpp b/components/sceneutil/util.cpp
index 14bfd35cb4..007a6637a8 100644
--- a/components/sceneutil/util.cpp
+++ b/components/sceneutil/util.cpp
@@ -194,7 +194,7 @@ public:
 
     void operator()(osg::Node* node, osg::NodeVisitor* nv) override
     {
-        osgUtil::RenderStage* renderStage = nv->asCullVisitor()->getCurrentRenderStage();
+        osgUtil::RenderStage* renderStage = static_cast<osgUtil::CullVisitor*>(nv)->getCurrentRenderStage();
 
         renderStage->setMultisampleResolveFramebufferObject(mFbo);
         renderStage->setFrameBufferObject(mMsaaFbo);

From 9112c65afcfb8c9826a6a285ae72941fa94f14a7 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 18 Aug 2021 19:52:08 +0200
Subject: [PATCH 1227/2859] Use pathgrid path when destination is closer to
 different graph component node

Partially revert d863267d5cb5f4062937f86c37af3b0c8f9479cf to restore 0.46
behaviour for pathgrid based pathfinding.
---
 apps/openmw/mwmechanics/pathfinding.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp
index 2f8e830434..0e704cd466 100644
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@@ -206,9 +206,6 @@ namespace MWMechanics
             endPointInLocalCoords,
                 startNode);
 
-        if (!endNode.second)
-            return;
-
         // if it's shorter for actor to travel from start to end, than to travel from either
         // start or end to nearest pathgrid point, just travel from start to end.
         float startToEndLength2 = (endPointInLocalCoords - startPointInLocalCoords).length2();
@@ -279,7 +276,8 @@ namespace MWMechanics
         // unreachable pathgrid point.
         //
         // The AI routines will have to deal with such situations.
-        *out++ = endPoint;
+        if (endNode.second)
+            *out++ = endPoint;
     }
 
     float PathFinder::getZAngleToNext(float x, float y) const

From fea4fb6e692ddeb76e357a282414c3c5523a4ae9 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 18 Aug 2021 22:46:14 +0200
Subject: [PATCH 1228/2859] Make AiPursue path destination to be as close as
 possible to target

Even when target is not reachable actor will try to run there either because
target navmesh polygon is selected within extended area or because partial path
is built to the closest possible polygon.
---
 apps/openmw/mwmechanics/aicombat.cpp          |   6 +-
 apps/openmw/mwmechanics/aipackage.cpp         |   5 +-
 apps/openmw/mwmechanics/aipackage.hpp         |   3 +-
 apps/openmw/mwmechanics/aipursue.cpp          |   2 +-
 apps/openmw/mwmechanics/aiwander.cpp          |   8 +-
 apps/openmw/mwmechanics/pathfinding.cpp       |  32 ++--
 apps/openmw/mwmechanics/pathfinding.hpp       |  16 +-
 .../detournavigator/navigator.cpp             | 144 +++++++++++++++---
 components/detournavigator/debug.hpp          |   1 +
 .../findrandompointaroundcircle.cpp           |   2 +-
 components/detournavigator/findsmoothpath.cpp |  11 +-
 components/detournavigator/findsmoothpath.hpp |  24 ++-
 components/detournavigator/navigator.hpp      |   5 +-
 components/detournavigator/status.hpp         |   3 +
 14 files changed, 204 insertions(+), 58 deletions(-)

diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index f6123c12c0..4b490d7bc8 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -269,7 +269,8 @@ namespace MWMechanics
             const auto navigatorFlags = getNavigatorFlags(actor);
             const auto areaCosts = getAreaCosts(actor);
             const auto pathGridGraph = getPathGridGraph(actor.getCell());
-            mPathFinder.buildPath(actor, vActorPos, vTargetPos, actor.getCell(), pathGridGraph, halfExtents, navigatorFlags, areaCosts);
+            mPathFinder.buildPath(actor, vActorPos, vTargetPos, actor.getCell(), pathGridGraph, halfExtents,
+                                  navigatorFlags, areaCosts, storage.mAttackRange, PathType::Full);
 
             if (!mPathFinder.isPathConstructed())
             {
@@ -281,7 +282,8 @@ namespace MWMechanics
                 if (hit.has_value() && (*hit - vTargetPos).length() <= rangeAttack)
                 {
                     // If the point is close enough, try to find a path to that point.
-                    mPathFinder.buildPath(actor, vActorPos, *hit, actor.getCell(), pathGridGraph, halfExtents, navigatorFlags, areaCosts);
+                    mPathFinder.buildPath(actor, vActorPos, *hit, actor.getCell(), pathGridGraph, halfExtents,
+                                          navigatorFlags, areaCosts, storage.mAttackRange, PathType::Full);
                     if (mPathFinder.isPathConstructed())
                     {
                         // If path to that point is found use it as custom destination.
diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index 8ad9447514..46e4729a8a 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -88,7 +88,8 @@ void MWMechanics::AiPackage::reset()
     mObstacleCheck.clear();
 }
 
-bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f& dest, float duration, float destTolerance)
+bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f& dest, float duration,
+                                    float destTolerance, float endTolerance, PathType pathType)
 {
     const Misc::TimerStatus timerStatus = mReaction.update(duration);
 
@@ -133,7 +134,7 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
             {
                 const auto pathfindingHalfExtents = world->getPathfindingHalfExtents(actor);
                 mPathFinder.buildLimitedPath(actor, position, dest, actor.getCell(), getPathGridGraph(actor.getCell()),
-                    pathfindingHalfExtents, getNavigatorFlags(actor), getAreaCosts(actor));
+                    pathfindingHalfExtents, getNavigatorFlags(actor), getAreaCosts(actor), endTolerance, pathType);
                 mRotateOnTheRunChecks = 3;
 
                 // give priority to go directly on target if there is minimal opportunity
diff --git a/apps/openmw/mwmechanics/aipackage.hpp b/apps/openmw/mwmechanics/aipackage.hpp
index 6d8af0d92b..5270b74166 100644
--- a/apps/openmw/mwmechanics/aipackage.hpp
+++ b/apps/openmw/mwmechanics/aipackage.hpp
@@ -129,7 +129,8 @@ namespace MWMechanics
         protected:
             /// Handles path building and shortcutting with obstacles avoiding
             /** \return If the actor has arrived at his destination **/
-            bool pathTo(const MWWorld::Ptr& actor, const osg::Vec3f& dest, float duration, float destTolerance = 0.0f);
+            bool pathTo(const MWWorld::Ptr& actor, const osg::Vec3f& dest, float duration,
+                        float destTolerance = 0.0f, float endTolerance = 0.0f, PathType pathType = PathType::Full);
 
             /// Check if there aren't any obstacles along the path to make shortcut possible
             /// If a shortcut is possible then path will be cleared and filled with the destination point.
diff --git a/apps/openmw/mwmechanics/aipursue.cpp b/apps/openmw/mwmechanics/aipursue.cpp
index 05605529ad..2d896ddbdc 100644
--- a/apps/openmw/mwmechanics/aipursue.cpp
+++ b/apps/openmw/mwmechanics/aipursue.cpp
@@ -53,7 +53,7 @@ bool AiPursue::execute (const MWWorld::Ptr& actor, CharacterController& characte
     const float pathTolerance = 100.f;
 
     // check the true distance in case the target is far away in Z-direction
-    bool reached = pathTo(actor, dest, duration, pathTolerance) &&
+    bool reached = pathTo(actor, dest, duration, pathTolerance, (actorPos - dest).length(), PathType::Partial) &&
                    std::abs(dest.z() - actorPos.z()) < pathTolerance;
 
     if (reached)
diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 24fdff7065..19365bcb08 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -201,8 +201,10 @@ namespace MWMechanics
             else
             {
                 const osg::Vec3f halfExtents = MWBase::Environment::get().getWorld()->getPathfindingHalfExtents(actor);
+                constexpr float endTolerance = 0;
                 mPathFinder.buildPath(actor, pos.asVec3(), mDestination, actor.getCell(),
-                    getPathGridGraph(actor.getCell()), halfExtents, getNavigatorFlags(actor), getAreaCosts(actor));
+                    getPathGridGraph(actor.getCell()), halfExtents, getNavigatorFlags(actor), getAreaCosts(actor),
+                    endTolerance, PathType::Full);
             }
 
             if (mPathFinder.isPathConstructed())
@@ -361,11 +363,13 @@ namespace MWMechanics
             if (isAreaOccupiedByOtherActor(actor, mDestination))
                 continue;
 
+            constexpr float endTolerance = 0;
+
             if (isWaterCreature || isFlyingCreature)
                 mPathFinder.buildStraightPath(mDestination);
             else
                 mPathFinder.buildPathByNavMesh(actor, currentPosition, mDestination, halfExtents, navigatorFlags,
-                                               areaCosts);
+                                               areaCosts, endTolerance, PathType::Full);
 
             if (mPathFinder.isPathConstructed())
             {
diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp
index 2f8e830434..c61b64f411 100644
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@@ -364,13 +364,13 @@ namespace MWMechanics
 
     void PathFinder::buildPathByNavMesh(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint,
         const osg::Vec3f& endPoint, const osg::Vec3f& halfExtents, const DetourNavigator::Flags flags,
-        const DetourNavigator::AreaCosts& areaCosts)
+        const DetourNavigator::AreaCosts& areaCosts, float endTolerance, PathType pathType)
     {
         mPath.clear();
 
         // If it's not possible to build path over navmesh due to disabled navmesh generation fallback to straight path
         DetourNavigator::Status status = buildPathByNavigatorImpl(actor, startPoint, endPoint, halfExtents, flags,
-                                                                  areaCosts, std::back_inserter(mPath));
+            areaCosts, endTolerance, pathType, std::back_inserter(mPath));
 
         if (status != DetourNavigator::Status::Success)
             mPath.clear();
@@ -383,7 +383,8 @@ namespace MWMechanics
 
     void PathFinder::buildPath(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint, const osg::Vec3f& endPoint,
         const MWWorld::CellStore* cell, const PathgridGraph& pathgridGraph, const osg::Vec3f& halfExtents,
-        const DetourNavigator::Flags flags, const DetourNavigator::AreaCosts& areaCosts)
+        const DetourNavigator::Flags flags, const DetourNavigator::AreaCosts& areaCosts, float endTolerance,
+        PathType pathType)
     {
         mPath.clear();
         mCell = cell;
@@ -392,7 +393,8 @@ namespace MWMechanics
 
         if (!actor.getClass().isPureWaterCreature(actor) && !actor.getClass().isPureFlyingCreature(actor))
         {
-            status = buildPathByNavigatorImpl(actor, startPoint, endPoint, halfExtents, flags, areaCosts, std::back_inserter(mPath));
+            status = buildPathByNavigatorImpl(actor, startPoint, endPoint, halfExtents, flags, areaCosts,
+                                              endTolerance, pathType, std::back_inserter(mPath));
             if (status != DetourNavigator::Status::Success)
                 mPath.clear();
         }
@@ -400,7 +402,7 @@ namespace MWMechanics
         if (status != DetourNavigator::Status::NavMeshNotFound && mPath.empty())
         {
             status = buildPathByNavigatorImpl(actor, startPoint, endPoint, halfExtents,
-                                     flags | DetourNavigator::Flag_usePathgrid, areaCosts, std::back_inserter(mPath));
+                flags | DetourNavigator::Flag_usePathgrid, areaCosts, endTolerance, pathType, std::back_inserter(mPath));
             if (status != DetourNavigator::Status::Success)
                 mPath.clear();
         }
@@ -416,12 +418,17 @@ namespace MWMechanics
 
     DetourNavigator::Status PathFinder::buildPathByNavigatorImpl(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint,
         const osg::Vec3f& endPoint, const osg::Vec3f& halfExtents, const DetourNavigator::Flags flags,
-        const DetourNavigator::AreaCosts& areaCosts, std::back_insert_iterator<std::deque<osg::Vec3f>> out)
+        const DetourNavigator::AreaCosts& areaCosts, float endTolerance, PathType pathType,
+        std::back_insert_iterator<std::deque<osg::Vec3f>> out)
     {
         const auto world = MWBase::Environment::get().getWorld();
         const auto stepSize = getPathStepSize(actor);
         const auto navigator = world->getNavigator();
-        const auto status = navigator->findPath(halfExtents, stepSize, startPoint, endPoint, flags, areaCosts, out);
+        const auto status = navigator->findPath(halfExtents, stepSize, startPoint, endPoint, flags, areaCosts,
+                                                endTolerance, out);
+
+        if (pathType == PathType::Partial && status == DetourNavigator::Status::PartialPath)
+            return DetourNavigator::Status::Success;
 
         if (status != DetourNavigator::Status::Success)
         {
@@ -449,8 +456,9 @@ namespace MWMechanics
         const auto navigator = MWBase::Environment::get().getWorld()->getNavigator();
         std::deque<osg::Vec3f> prePath;
         auto prePathInserter = std::back_inserter(prePath);
+        const float endTolerance = 0;
         const auto status = navigator->findPath(halfExtents, stepSize, startPoint, mPath.front(), flags, areaCosts,
-                                                prePathInserter);
+                                                endTolerance, prePathInserter);
 
         if (status == DetourNavigator::Status::NavMeshNotFound)
             return;
@@ -475,7 +483,8 @@ namespace MWMechanics
 
     void PathFinder::buildLimitedPath(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint, const osg::Vec3f& endPoint,
         const MWWorld::CellStore* cell, const PathgridGraph& pathgridGraph, const osg::Vec3f& halfExtents,
-        const DetourNavigator::Flags flags, const DetourNavigator::AreaCosts& areaCosts)
+        const DetourNavigator::Flags flags, const DetourNavigator::AreaCosts& areaCosts, float endTolerance,
+        PathType pathType)
     {
         const auto navigator = MWBase::Environment::get().getWorld()->getNavigator();
         const auto maxDistance = std::min(
@@ -485,8 +494,9 @@ namespace MWMechanics
         const auto startToEnd = endPoint - startPoint;
         const auto distance = startToEnd.length();
         if (distance <= maxDistance)
-            return buildPath(actor, startPoint, endPoint, cell, pathgridGraph, halfExtents, flags, areaCosts);
+            return buildPath(actor, startPoint, endPoint, cell, pathgridGraph, halfExtents, flags, areaCosts,
+                             endTolerance, pathType);
         const auto end = startPoint + startToEnd * maxDistance / distance;
-        buildPath(actor, startPoint, end, cell, pathgridGraph, halfExtents, flags, areaCosts);
+        buildPath(actor, startPoint, end, cell, pathgridGraph, halfExtents, flags, areaCosts, endTolerance, pathType);
     }
 }
diff --git a/apps/openmw/mwmechanics/pathfinding.hpp b/apps/openmw/mwmechanics/pathfinding.hpp
index 0ada08d3fb..f0a5040334 100644
--- a/apps/openmw/mwmechanics/pathfinding.hpp
+++ b/apps/openmw/mwmechanics/pathfinding.hpp
@@ -70,6 +70,12 @@ namespace MWMechanics
     // magnitude of pits/obstacles is defined by PATHFIND_Z_REACH
     bool checkWayIsClear(const osg::Vec3f& from, const osg::Vec3f& to, float offsetXY);
 
+    enum class PathType
+    {
+        Full,
+        Partial,
+    };
+
     class PathFinder
     {
         public:
@@ -93,18 +99,20 @@ namespace MWMechanics
 
             void buildPathByNavMesh(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint,
                 const osg::Vec3f& endPoint, const osg::Vec3f& halfExtents, const DetourNavigator::Flags flags,
-                const DetourNavigator::AreaCosts& areaCosts);
+                const DetourNavigator::AreaCosts& areaCosts, float endTolerance, PathType pathType);
 
             void buildPath(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint, const osg::Vec3f& endPoint,
                 const MWWorld::CellStore* cell, const PathgridGraph& pathgridGraph, const osg::Vec3f& halfExtents,
-                const DetourNavigator::Flags flags, const DetourNavigator::AreaCosts& areaCosts);
+                const DetourNavigator::Flags flags, const DetourNavigator::AreaCosts& areaCosts, float endTolerance,
+                PathType pathType);
 
             void buildPathByNavMeshToNextPoint(const MWWorld::ConstPtr& actor, const osg::Vec3f& halfExtents,
                 const DetourNavigator::Flags flags, const DetourNavigator::AreaCosts& areaCosts);
 
             void buildLimitedPath(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint, const osg::Vec3f& endPoint,
                 const MWWorld::CellStore* cell, const PathgridGraph& pathgridGraph, const osg::Vec3f& halfExtents,
-                const DetourNavigator::Flags flags, const DetourNavigator::AreaCosts& areaCosts);
+                const DetourNavigator::Flags flags, const DetourNavigator::AreaCosts& areaCosts, float endTolerance,
+                PathType pathType);
 
             /// Remove front point if exist and within tolerance
             void update(const osg::Vec3f& position, float pointTolerance, float destinationTolerance,
@@ -212,7 +220,7 @@ namespace MWMechanics
 
             [[nodiscard]] DetourNavigator::Status buildPathByNavigatorImpl(const MWWorld::ConstPtr& actor,
                 const osg::Vec3f& startPoint, const osg::Vec3f& endPoint, const osg::Vec3f& halfExtents,
-                const DetourNavigator::Flags flags, const DetourNavigator::AreaCosts& areaCosts,
+                const DetourNavigator::Flags flags, const DetourNavigator::AreaCosts& areaCosts, float endTolerance, PathType pathType,
                 std::back_insert_iterator<std::deque<osg::Vec3f>> out);
     };
 }
diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index 35fde5b657..62d3f9de04 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -46,6 +46,7 @@ namespace
         const osg::Vec2i mCellPosition {0, 0};
         const int mHeightfieldTileSize = ESM::Land::REAL_SIZE / (ESM::Land::LAND_SIZE - 1);
         const osg::Vec3f mShift {0, 0, 0};
+        const float mEndTolerance = 0;
 
         DetourNavigatorNavigatorTest()
             : mPlayerPosition(0, 0, 0)
@@ -135,7 +136,7 @@ namespace
 
     TEST_F(DetourNavigatorNavigatorTest, find_path_for_empty_should_return_empty)
     {
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut),
+        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::NavMeshNotFound);
         EXPECT_EQ(mPath, std::deque<osg::Vec3f>());
     }
@@ -143,7 +144,7 @@ namespace
     TEST_F(DetourNavigatorNavigatorTest, find_path_for_existing_agent_with_no_navmesh_should_throw_exception)
     {
         mNavigator->addAgent(mAgentHalfExtents);
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut),
+        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::StartPolygonNotFound);
     }
 
@@ -152,7 +153,7 @@ namespace
         mNavigator->addAgent(mAgentHalfExtents);
         mNavigator->addAgent(mAgentHalfExtents);
         mNavigator->removeAgent(mAgentHalfExtents);
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut),
+        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::StartPolygonNotFound);
     }
 
@@ -172,7 +173,8 @@ namespace
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::requiredTilesPresent);
 
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
+        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+                  Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
             Vec3fEq(-204.0000152587890625, 204, 1.99998295307159423828125),
@@ -219,7 +221,8 @@ namespace
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
+        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+                  Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
             Vec3fEq(-204, 204, 1.99998295307159423828125),
@@ -252,7 +255,8 @@ namespace
 
         mPath.clear();
         mOut = std::back_inserter(mPath);
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
+        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+                  Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
             Vec3fEq(-204, 204, 1.99998295307159423828125),
@@ -301,7 +305,8 @@ namespace
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
+        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+                  Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
             Vec3fEq(-204, 204, 1.99998295307159423828125),
@@ -337,7 +342,8 @@ namespace
 
         mPath.clear();
         mOut = std::back_inserter(mPath);
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
+        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+                  Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
             Vec3fEq(-204, 204, 1.99998295307159423828125),
@@ -393,7 +399,8 @@ namespace
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
+        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+                  Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
             Vec3fEq(-204, 204, 1.999981403350830078125),
@@ -479,7 +486,8 @@ namespace
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
+        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+                  Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
             Vec3fEq(-204, 204, 1.99997997283935546875),
@@ -530,7 +538,8 @@ namespace
         mEnd.x() = 0;
         mEnd.z() = 300;
 
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_swim, mAreaCosts, mOut), Status::Success);
+        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_swim, mAreaCosts, mEndTolerance, mOut),
+                  Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
             Vec3fEq(0, 204, 185.33331298828125),
@@ -574,7 +583,7 @@ namespace
         mStart.x() = 0;
         mEnd.x() = 0;
 
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_swim | Flag_walk, mAreaCosts, mOut),
+        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_swim | Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
@@ -619,7 +628,7 @@ namespace
         mStart.x() = 0;
         mEnd.x() = 0;
 
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_swim | Flag_walk, mAreaCosts, mOut),
+        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_swim | Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
@@ -664,7 +673,8 @@ namespace
         mStart.x() = 0;
         mEnd.x() = 0;
 
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
+        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+                  Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
             Vec3fEq(0, 204, -98.000030517578125),
@@ -712,7 +722,8 @@ namespace
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
+        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+                  Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
             Vec3fEq(-204, 204, 1.99998295307159423828125),
@@ -764,7 +775,8 @@ namespace
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
+        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+                  Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
             Vec3fEq(-204, 204, 1.99998295307159423828125),
@@ -858,7 +870,8 @@ namespace
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
+        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+                  Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
             Vec3fEq(-204, 204, 1.99998295307159423828125),
@@ -1006,7 +1019,8 @@ namespace
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::requiredTilesPresent);
 
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mOut), Status::Success);
+        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+                  Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
             Vec3fEq(-204, 204, 101.99999237060546875),
@@ -1033,4 +1047,98 @@ namespace
             Vec3fEq(204, -204, 101.99999237060546875)
         )) << mPath;
     }
+
+    TEST_F(DetourNavigatorNavigatorTest, for_not_reachable_destination_find_path_should_provide_partial_path)
+    {
+        const std::array<float, 5 * 5> heightfieldData {{
+            0,   0,    0,    0,    0,
+            0, -25,  -25,  -25,  -25,
+            0, -25, -100, -100, -100,
+            0, -25, -100, -100, -100,
+            0, -25, -100, -100, -100,
+        }};
+        const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
+
+        CollisionShapeInstance compound(std::make_unique<btCompoundShape>());
+        compound.shape().addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(204, -204, 0)),
+                                       new btBoxShape(btVector3(200, 200, 1000)));
+
+        mNavigator->addAgent(mAgentHalfExtents);
+        mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
+        mNavigator->addObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance()), btTransform::getIdentity());
+        mNavigator->update(mPlayerPosition);
+        mNavigator->wait(mListener, WaitConditionType::allJobsDone);
+
+        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+                  Status::PartialPath);
+
+        EXPECT_THAT(mPath, ElementsAre(
+            Vec3fEq(-204, 204, -2.666739940643310546875),
+            Vec3fEq(-193.730682373046875, 177.59320068359375, -3.9535934925079345703125),
+            Vec3fEq(-183.4613800048828125, 151.1864166259765625, -5.240451335906982421875),
+            Vec3fEq(-173.1920623779296875, 124.77962493896484375, -6.527309417724609375),
+            Vec3fEq(-162.922760009765625, 98.37282562255859375, -7.814167022705078125),
+            Vec3fEq(-152.6534423828125, 71.96602630615234375, -9.898590087890625),
+            Vec3fEq(-142.384124755859375, 45.559230804443359375, -17.641445159912109375),
+            Vec3fEq(-132.1148223876953125, 19.152431488037109375, -25.3843059539794921875),
+            Vec3fEq(-121.8455047607421875, -7.254369258880615234375, -27.97742462158203125),
+            Vec3fEq(-111.57619476318359375, -33.66117095947265625, -16.974590301513671875),
+            Vec3fEq(-101.30689239501953125, -60.06797027587890625, -5.9717559814453125),
+            Vec3fEq(-91.0375823974609375, -86.47476959228515625, -2.6667339801788330078125),
+            Vec3fEq(-80.76827239990234375, -112.88156890869140625, -2.6667339801788330078125),
+            Vec3fEq(-70.49897003173828125, -139.2883758544921875, -2.6667339801788330078125),
+            Vec3fEq(-60.229663848876953125, -165.6951751708984375, -2.6667339801788330078125),
+            Vec3fEq(-49.96035003662109375, -192.1019744873046875, -2.6667339801788330078125),
+            Vec3fEq(-45.333343505859375, -204, -2.6667339801788330078125)
+        )) << mPath;
+    }
+
+    TEST_F(DetourNavigatorNavigatorTest, end_tolerance_should_extent_available_destinations)
+    {
+        const std::array<float, 5 * 5> heightfieldData {{
+            0,   0,    0,    0,    0,
+            0, -25,  -25,  -25,  -25,
+            0, -25, -100, -100, -100,
+            0, -25, -100, -100, -100,
+            0, -25, -100, -100, -100,
+        }};
+        const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
+
+        CollisionShapeInstance compound(std::make_unique<btCompoundShape>());
+        compound.shape().addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(204, -204, 0)),
+                                       new btBoxShape(btVector3(100, 100, 1000)));
+
+        mNavigator->addAgent(mAgentHalfExtents);
+        mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
+        mNavigator->addObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance()), btTransform::getIdentity());
+        mNavigator->update(mPlayerPosition);
+        mNavigator->wait(mListener, WaitConditionType::allJobsDone);
+
+        const float endTolerance = 1000.0f;
+
+        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, endTolerance, mOut),
+                  Status::Success);
+
+        EXPECT_THAT(mPath, ElementsAre(
+            Vec3fEq(-204, 204, -2.666739940643310546875),
+            Vec3fEq(-188.745635986328125, 180.1236114501953125, -4.578275203704833984375),
+            Vec3fEq(-173.49127197265625, 156.247222900390625, -6.489814281463623046875),
+            Vec3fEq(-158.2369232177734375, 132.370819091796875, -8.4013538360595703125),
+            Vec3fEq(-142.9825592041015625, 108.49443817138671875, -10.31289386749267578125),
+            Vec3fEq(-127.7281951904296875, 84.6180419921875, -17.4810466766357421875),
+            Vec3fEq(-112.47383880615234375, 60.7416534423828125, -27.6026020050048828125),
+            Vec3fEq(-97.21947479248046875, 36.865261077880859375, -37.724163055419921875),
+            Vec3fEq(-81.965118408203125, 12.98886966705322265625, -47.84572601318359375),
+            Vec3fEq(-66.71075439453125, -10.887523651123046875, -46.691577911376953125),
+            Vec3fEq(-51.45639801025390625, -34.763916015625, -32.085445404052734375),
+            Vec3fEq(-36.202037811279296875, -58.640308380126953125, -28.5217914581298828125),
+            Vec3fEq(-20.947673797607421875, -82.5167083740234375, -32.16143035888671875),
+            Vec3fEq(-5.693310260772705078125, -106.393096923828125, -35.8010711669921875),
+            Vec3fEq(9.56105327606201171875, -130.2694854736328125, -29.6399688720703125),
+            Vec3fEq(24.8154163360595703125, -154.1458740234375, -17.6428318023681640625),
+            Vec3fEq(40.0697784423828125, -178.0222625732421875, -10.46006107330322265625),
+            Vec3fEq(55.3241424560546875, -201.8986663818359375, -3.297139644622802734375),
+            Vec3fEq(56.66666412353515625, -204, -2.6667373180389404296875)
+        )) << mPath;
+    }
 }
diff --git a/components/detournavigator/debug.hpp b/components/detournavigator/debug.hpp
index a17eec16a7..2128f96be4 100644
--- a/components/detournavigator/debug.hpp
+++ b/components/detournavigator/debug.hpp
@@ -34,6 +34,7 @@ namespace DetourNavigator
         switch (value)
         {
             OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE(Success)
+            OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE(PartialPath)
             OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE(NavMeshNotFound)
             OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE(StartPolygonNotFound)
             OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE(EndPolygonNotFound)
diff --git a/components/detournavigator/findrandompointaroundcircle.cpp b/components/detournavigator/findrandompointaroundcircle.cpp
index ed73dca61a..a3407a61c3 100644
--- a/components/detournavigator/findrandompointaroundcircle.cpp
+++ b/components/detournavigator/findrandompointaroundcircle.cpp
@@ -19,7 +19,7 @@ namespace DetourNavigator
         dtQueryFilter queryFilter;
         queryFilter.setIncludeFlags(includeFlags);
 
-        dtPolyRef startRef = findNearestPolyExpanding(navMeshQuery, queryFilter, start, halfExtents);
+        dtPolyRef startRef = findNearestPoly(navMeshQuery, queryFilter, start, halfExtents * 4);
         if (startRef == 0)
             return std::optional<osg::Vec3f>();
 
diff --git a/components/detournavigator/findsmoothpath.cpp b/components/detournavigator/findsmoothpath.cpp
index 6598263398..14fe696f10 100644
--- a/components/detournavigator/findsmoothpath.cpp
+++ b/components/detournavigator/findsmoothpath.cpp
@@ -146,16 +146,13 @@ namespace DetourNavigator
         return result;
     }
 
-    dtPolyRef findNearestPolyExpanding(const dtNavMeshQuery& query, const dtQueryFilter& filter,
+    dtPolyRef findNearestPoly(const dtNavMeshQuery& query, const dtQueryFilter& filter,
             const osg::Vec3f& center, const osg::Vec3f& halfExtents)
     {
         dtPolyRef ref = 0;
-        for (int i = 0; i < 3; ++i)
-        {
-            const dtStatus status = query.findNearestPoly(center.ptr(), (halfExtents * (1 << i)).ptr(), &filter, &ref, nullptr);
-            if (!dtStatusFailed(status) && ref != 0)
-                break;
-        }
+        const dtStatus status = query.findNearestPoly(center.ptr(), halfExtents.ptr(), &filter, &ref, nullptr);
+        if (!dtStatusSucceed(status))
+            return 0;
         return ref;
     }
 }
diff --git a/components/detournavigator/findsmoothpath.hpp b/components/detournavigator/findsmoothpath.hpp
index db2219b2cd..8eb0bf9f34 100644
--- a/components/detournavigator/findsmoothpath.hpp
+++ b/components/detournavigator/findsmoothpath.hpp
@@ -99,7 +99,7 @@ namespace DetourNavigator
         return dtStatusSucceed(status);
     }
 
-    dtPolyRef findNearestPolyExpanding(const dtNavMeshQuery& query, const dtQueryFilter& filter,
+    dtPolyRef findNearestPoly(const dtNavMeshQuery& query, const dtQueryFilter& filter,
             const osg::Vec3f& center, const osg::Vec3f& halfExtents);
 
     struct MoveAlongSurfaceResult
@@ -256,7 +256,7 @@ namespace DetourNavigator
     template <class OutputIterator>
     Status findSmoothPath(const dtNavMesh& navMesh, const osg::Vec3f& halfExtents, const float stepSize,
             const osg::Vec3f& start, const osg::Vec3f& end, const Flags includeFlags, const AreaCosts& areaCosts,
-            const Settings& settings, OutputIterator& out)
+            const Settings& settings, float endTolerance, OutputIterator& out)
     {
         dtNavMeshQuery navMeshQuery;
         if (!initNavMeshQuery(navMeshQuery, navMesh, settings.mMaxNavMeshQueryNodes))
@@ -269,11 +269,15 @@ namespace DetourNavigator
         queryFilter.setAreaCost(AreaType_pathgrid, areaCosts.mPathgrid);
         queryFilter.setAreaCost(AreaType_ground, areaCosts.mGround);
 
-        dtPolyRef startRef = findNearestPolyExpanding(navMeshQuery, queryFilter, start, halfExtents);
+        constexpr float polyDistanceFactor = 4;
+        const osg::Vec3f polyHalfExtents = halfExtents * polyDistanceFactor;
+
+        const dtPolyRef startRef = findNearestPoly(navMeshQuery, queryFilter, start, polyHalfExtents);
         if (startRef == 0)
             return Status::StartPolygonNotFound;
 
-        dtPolyRef endRef = findNearestPolyExpanding(navMeshQuery, queryFilter, end, halfExtents);
+        const dtPolyRef endRef = findNearestPoly(navMeshQuery, queryFilter, end,
+            polyHalfExtents + osg::Vec3f(endTolerance, endTolerance, endTolerance));
         if (endRef == 0)
             return Status::EndPolygonNotFound;
 
@@ -283,12 +287,18 @@ namespace DetourNavigator
         if (!polygonPath)
             return Status::FindPathOverPolygonsFailed;
 
-        if (polygonPath->empty() || polygonPath->back() != endRef)
+        if (polygonPath->empty())
             return Status::Success;
 
+        const bool partialPath = polygonPath->back() != endRef;
         auto outTransform = OutputTransformIterator<OutputIterator>(out, settings);
-        return makeSmoothPath(navMesh, navMeshQuery, queryFilter, start, end, stepSize, std::move(*polygonPath),
-            settings.mMaxSmoothPathSize, outTransform);
+        const Status smoothStatus = makeSmoothPath(navMesh, navMeshQuery, queryFilter, start, end, stepSize,
+                                                   std::move(*polygonPath), settings.mMaxSmoothPathSize, outTransform);
+
+        if (smoothStatus != Status::Success)
+            return smoothStatus;
+
+        return partialPath ? Status::PartialPath : Status::Success;
     }
 }
 
diff --git a/components/detournavigator/navigator.hpp b/components/detournavigator/navigator.hpp
index 1a78b602cd..d2e77892b9 100644
--- a/components/detournavigator/navigator.hpp
+++ b/components/detournavigator/navigator.hpp
@@ -173,13 +173,14 @@ namespace DetourNavigator
          * @param end path at given point.
          * @param includeFlags setup allowed surfaces for actor to walk.
          * @param out the beginning of the destination range.
+         * @param endTolerance defines maximum allowed distance to end path point in addition to agentHalfExtents
          * @return Output iterator to the element in the destination range, one past the last element of found path.
          * Equal to out if no path is found.
          */
         template <class OutputIterator>
         Status findPath(const osg::Vec3f& agentHalfExtents, const float stepSize, const osg::Vec3f& start,
             const osg::Vec3f& end, const Flags includeFlags, const DetourNavigator::AreaCosts& areaCosts,
-            OutputIterator& out) const
+            float endTolerance, OutputIterator& out) const
         {
             static_assert(
                 std::is_same<
@@ -194,7 +195,7 @@ namespace DetourNavigator
             const auto settings = getSettings();
             return findSmoothPath(navMesh->lockConst()->getImpl(), toNavMeshCoordinates(settings, agentHalfExtents),
                 toNavMeshCoordinates(settings, stepSize), toNavMeshCoordinates(settings, start),
-                toNavMeshCoordinates(settings, end), includeFlags, areaCosts, settings, out);
+                toNavMeshCoordinates(settings, end), includeFlags, areaCosts, settings, endTolerance, out);
         }
 
         /**
diff --git a/components/detournavigator/status.hpp b/components/detournavigator/status.hpp
index 3715489acc..5f01f04758 100644
--- a/components/detournavigator/status.hpp
+++ b/components/detournavigator/status.hpp
@@ -6,6 +6,7 @@ namespace DetourNavigator
     enum class Status
     {
         Success,
+        PartialPath,
         NavMeshNotFound,
         StartPolygonNotFound,
         EndPolygonNotFound,
@@ -21,6 +22,8 @@ namespace DetourNavigator
         {
             case Status::Success:
                 return "success";
+            case Status::PartialPath:
+                return "partial path is found";
             case Status::NavMeshNotFound:
                 return "navmesh is not found";
             case Status::StartPolygonNotFound:

From a6c7fcd43691d8bec1138a489db00b0e512409c2 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Wed, 18 Aug 2021 15:46:25 -0700
Subject: [PATCH 1229/2859] don't pingpong depth function on character preview
 update

---
 apps/openmw/mwrender/characterpreview.cpp | 54 +++++++++++++----------
 1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index 9db1330923..44b7b2f457 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -133,32 +133,40 @@ namespace MWRender
                 }
                 if (SceneUtil::getReverseZ() && stateset->getAttribute(osg::StateAttribute::DEPTH))
                 {
-                    if (!newStateSet)
-                    {
-                        newStateSet = new osg::StateSet(*stateset, osg::CopyOp::SHALLOW_COPY);
-                        node.setStateSet(newStateSet);
-                    }
-                    // Setup standard depth ranges
+                    bool depthModified = false;
                     osg::Depth* depth = static_cast<osg::Depth*>(stateset->getAttribute(osg::StateAttribute::DEPTH));
-                    osg::ref_ptr<osg::Depth> newDepth = new osg::Depth(*depth);
-                    switch (newDepth->getFunction())
+                    depth->getUserValue("depthModified", depthModified);
+
+                    if (!depthModified)
                     {
-                        case osg::Depth::LESS:
-                            newDepth->setFunction(osg::Depth::GREATER);
-                            break;
-                        case osg::Depth::LEQUAL:
-                            newDepth->setFunction(osg::Depth::GEQUAL);
-                            break;
-                        case osg::Depth::GREATER:
-                            newDepth->setFunction(osg::Depth::LESS);
-                            break;
-                        case osg::Depth::GEQUAL:
-                            newDepth->setFunction(osg::Depth::LEQUAL);
-                            break;
-                        default:
-                            break;
+                        if (!newStateSet)
+                        {
+                            newStateSet = new osg::StateSet(*stateset, osg::CopyOp::SHALLOW_COPY);
+                            node.setStateSet(newStateSet);
+                        }
+                        // Setup standard depth ranges
+                        osg::ref_ptr<osg::Depth> newDepth = new osg::Depth(*depth);
+
+                        switch (newDepth->getFunction())
+                        {
+                            case osg::Depth::LESS:
+                                newDepth->setFunction(osg::Depth::GREATER);
+                                break;
+                            case osg::Depth::LEQUAL:
+                                newDepth->setFunction(osg::Depth::GEQUAL);
+                                break;
+                            case osg::Depth::GREATER:
+                                newDepth->setFunction(osg::Depth::LESS);
+                                break;
+                            case osg::Depth::GEQUAL:
+                                newDepth->setFunction(osg::Depth::LEQUAL);
+                                break;
+                            default:
+                                break;
+                        }
+                        newStateSet->setAttribute(newDepth, osg::StateAttribute::ON);
+                        newDepth->setUserValue("depthModified", true);
                     }
-                    newStateSet->setAttribute(newDepth, osg::StateAttribute::ON);
                 }
             }
             traverse(node);

From 1d925154f256c09276b1e0b9247f3d385b713c73 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Tue, 10 Aug 2021 18:00:49 +1000
Subject: [PATCH 1230/2859] Do not store (or worse, overwrite) empty PGRD
 records.  Should resolve Issue #6209.

---
 apps/openmw/mwworld/store.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index 125239e9a3..5b223544b0 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -866,6 +866,10 @@ namespace MWWorld
 
         pathgrid.load(esm, isDeleted);
 
+        // deal with MODs that have empty pathgrid records (Issue #6209)
+        if (pathgrid.mPoints.empty() || pathgrid.mEdges.empty())
+            return RecordId("", isDeleted);
+
         // Unfortunately the Pathgrid record model does not specify whether the pathgrid belongs to an interior or exterior cell.
         // For interior cells, mCell is the cell name, but for exterior cells it is either the cell name or if that doesn't exist, the cell's region name.
         // mX and mY will be (0,0) for interior cells, but there is also an exterior cell with the coordinates of (0,0), so that doesn't help.

From 8244ba8957403c6a6b0e0981b97547f9a8fbadc8 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Tue, 10 Aug 2021 19:39:46 +1000
Subject: [PATCH 1231/2859] Erase old record instead (i.e. assume an empty
 Pathgrid record was placed in purpose)

---
 apps/openmw/mwworld/store.cpp | 38 +++++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index 5b223544b0..957a01faf6 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -866,10 +866,6 @@ namespace MWWorld
 
         pathgrid.load(esm, isDeleted);
 
-        // deal with MODs that have empty pathgrid records (Issue #6209)
-        if (pathgrid.mPoints.empty() || pathgrid.mEdges.empty())
-            return RecordId("", isDeleted);
-
         // Unfortunately the Pathgrid record model does not specify whether the pathgrid belongs to an interior or exterior cell.
         // For interior cells, mCell is the cell name, but for exterior cells it is either the cell name or if that doesn't exist, the cell's region name.
         // mX and mY will be (0,0) for interior cells, but there is also an exterior cell with the coordinates of (0,0), so that doesn't help.
@@ -877,6 +873,40 @@ namespace MWWorld
         // A proper fix should be made for future versions of the file format.
         bool interior = pathgrid.mData.mX == 0 && pathgrid.mData.mY == 0 && mCells->search(pathgrid.mCell) != nullptr;
 
+        // deal with MODs that have empty pathgrid records (Issue #6209)
+        // we assume that these records are empty on purpose (i.e. to remove old pathgrid on an updated cell)
+        if (pathgrid.mPoints.empty() || pathgrid.mEdges.empty())
+        {
+            std::string contentfile = esm.getContext().filename;
+            size_t pos = contentfile.find_last_of("/\\");
+            if (pos != std::string::npos)
+                contentfile = contentfile.substr(pos+1);
+
+            if (interior)
+            {
+                Interior::iterator it = mInt.find(pathgrid.mCell);
+                if (it != mInt.end())
+                {
+                    mInt.erase(it);
+
+                    Log(Debug::Warning) << "Warning: Empty pathgrid overwriting cell '"
+                        << pathgrid.mCell << "' : " << contentfile;
+                }
+            }
+            else
+            {
+                Exterior::iterator it = mExt.find(std::make_pair(pathgrid.mData.mX, pathgrid.mData.mY));
+                if (it != mExt.end())
+                {
+                    mExt.erase(it);
+                    Log(Debug::Warning) << "Warning: Empty pathgrid overwriting cell ("
+                        << pathgrid.mData.mX << ", " << pathgrid.mData.mY << ") : " << contentfile;
+                }
+            }
+
+            return RecordId("", isDeleted);
+        }
+
         // Try to overwrite existing record
         if (interior)
         {

From 802a202455487d878156dbc89a7cb9df34a19676 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Thu, 19 Aug 2021 12:45:09 +1000
Subject: [PATCH 1232/2859] Remove warning log messages as they are more
 suitable for OpenCS.

---
 apps/openmw/mwworld/store.cpp | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index 957a01faf6..8faa86597f 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -873,35 +873,21 @@ namespace MWWorld
         // A proper fix should be made for future versions of the file format.
         bool interior = pathgrid.mData.mX == 0 && pathgrid.mData.mY == 0 && mCells->search(pathgrid.mCell) != nullptr;
 
-        // deal with MODs that have empty pathgrid records (Issue #6209)
+        // deal with mods that have empty pathgrid records (Issue #6209)
         // we assume that these records are empty on purpose (i.e. to remove old pathgrid on an updated cell)
         if (pathgrid.mPoints.empty() || pathgrid.mEdges.empty())
         {
-            std::string contentfile = esm.getContext().filename;
-            size_t pos = contentfile.find_last_of("/\\");
-            if (pos != std::string::npos)
-                contentfile = contentfile.substr(pos+1);
-
             if (interior)
             {
                 Interior::iterator it = mInt.find(pathgrid.mCell);
                 if (it != mInt.end())
-                {
                     mInt.erase(it);
-
-                    Log(Debug::Warning) << "Warning: Empty pathgrid overwriting cell '"
-                        << pathgrid.mCell << "' : " << contentfile;
-                }
             }
             else
             {
                 Exterior::iterator it = mExt.find(std::make_pair(pathgrid.mData.mX, pathgrid.mData.mY));
                 if (it != mExt.end())
-                {
                     mExt.erase(it);
-                    Log(Debug::Warning) << "Warning: Empty pathgrid overwriting cell ("
-                        << pathgrid.mData.mX << ", " << pathgrid.mData.mY << ") : " << contentfile;
-                }
             }
 
             return RecordId("", isDeleted);

From bd3ef506cd65f34c9a75024c92b2b205377473c6 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Thu, 19 Aug 2021 19:30:01 +1000
Subject: [PATCH 1233/2859] Empty Pathgrid record is considered as the modder's
 intention to delete any existing record.

---
 apps/opencs/CMakeLists.txt               |  2 +-
 apps/opencs/model/world/idcollection.cpp | 43 ++++++++++++++++++++++++
 apps/opencs/model/world/idcollection.hpp |  4 +++
 apps/opencs/model/world/pathgrid.hpp     |  2 +-
 4 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 apps/opencs/model/world/idcollection.cpp

diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 88c4233c9c..4265490afb 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -19,7 +19,7 @@ opencs_hdrs_noqt (model/doc
 
 opencs_units (model/world
     idtable idtableproxymodel regionmap data commanddispatcher idtablebase resourcetable nestedtableproxymodel idtree infotableproxymodel landtexturetableproxymodel
-    actoradapter
+    actoradapter idcollection
     )
 
 
diff --git a/apps/opencs/model/world/idcollection.cpp b/apps/opencs/model/world/idcollection.cpp
new file mode 100644
index 0000000000..d06a47e32b
--- /dev/null
+++ b/apps/opencs/model/world/idcollection.cpp
@@ -0,0 +1,43 @@
+#include "idcollection.hpp"
+
+namespace CSMWorld
+{
+    template<>
+    int IdCollection<Pathgrid, IdAccessor<Pathgrid> >::load (ESM::ESMReader& reader, bool base)
+    {
+        Pathgrid record;
+        bool isDeleted = false;
+
+        loadRecord (record, reader, isDeleted);
+
+        std::string id = IdAccessor<Pathgrid>().getId (record);
+        int index = this->searchId (id);
+
+        if (record.mPoints.empty() || record.mEdges.empty())
+            isDeleted = true;
+
+        if (isDeleted)
+        {
+            if (index==-1)
+            {
+                // deleting a record that does not exist
+                // ignore it for now
+                /// \todo report the problem to the user
+                return -1;
+            }
+
+            if (base)
+            {
+                this->removeRows (index, 1);
+                return -1;
+            }
+
+            std::unique_ptr<Record<Pathgrid> > baseRecord(new Record<Pathgrid>(this->getRecord(index)));
+            baseRecord->mState = RecordBase::State_Deleted;
+            this->setRecord(index, std::move(baseRecord));
+            return index;
+        }
+
+        return load (record, base, index);
+    }
+}
diff --git a/apps/opencs/model/world/idcollection.hpp b/apps/opencs/model/world/idcollection.hpp
index 9f834d8fae..bbc49f18c1 100644
--- a/apps/opencs/model/world/idcollection.hpp
+++ b/apps/opencs/model/world/idcollection.hpp
@@ -5,6 +5,7 @@
 
 #include "collection.hpp"
 #include "land.hpp"
+#include "pathgrid.hpp"
 
 namespace CSMWorld
 {
@@ -153,6 +154,9 @@ namespace CSMWorld
 
         return true;
     }
+
+    template<>
+    int IdCollection<Pathgrid, IdAccessor<Pathgrid> >::load(ESM::ESMReader& reader, bool base);
 }
 
 #endif
diff --git a/apps/opencs/model/world/pathgrid.hpp b/apps/opencs/model/world/pathgrid.hpp
index 22d01b0710..ce74d419e4 100644
--- a/apps/opencs/model/world/pathgrid.hpp
+++ b/apps/opencs/model/world/pathgrid.hpp
@@ -20,7 +20,7 @@ namespace CSMWorld
     {
         std::string mId;
 
-        void load (ESM::ESMReader &esm, bool &isDeleted, const IdCollection<Cell>& cells);
+        void load (ESM::ESMReader &esm, bool &isDeleted, const IdCollection<Cell, IdAccessor<Cell> >& cells);
         void load (ESM::ESMReader &esm, bool &isDeleted);
     };
 }

From 277a1268c0b6f5979dcfbcc199e28160fbb2b6a8 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 19 Aug 2021 23:23:57 +0200
Subject: [PATCH 1234/2859] Avoid access to removed map item

To fix ASAN warning:
=11799==ERROR: AddressSanitizer: heap-use-after-free on address 0x60c000436058 at pc 0x55c90acccaa8 bp 0x7f787eeac830 sp 0x7f787eeac820
READ of size 8 at 0x60c000436058 thread T18
    #0 0x55c90acccaa7 in std::operator==(std::_Deque_iterator<std::_List_iterator<DetourNavigator::Job>, std::_List_iterator<DetourNavigator::Job>&, std::_List_iterator<DetourNavigator::Job>*> const&, std::_Deque_iterator<std::_List_iterator<DetourNavigator::Job>, std::_List_iterator<DetourNavigator::Job>&, std::_List_iterator<DetourNavigator::Job>*> const&) /usr/include/c++/11.1.0/bits/stl_deque.h:269
    #1 0x55c90acccaa7 in std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > >::empty() const /usr/include/c++/11.1.0/bits/stl_deque.h:1311
    #2 0x55c90acccaa7 in operator() /home/elsid/dev/openmw/components/detournavigator/asyncnavmeshupdater.cpp:350
    #3 0x55c90acccaa7 in wait_until<std::chrono::_V2::steady_clock, std::chrono::duration<long int, std::ratio<1, 1000000000> >, DetourNavigator::AsyncNavMeshUpdater::getNextJob()::<lambda()> > /usr/include/c++/11.1.0/condition_variable:151
    #4 0x55c90acccaa7 in wait_for<long int, std::ratio<1, 1000>, DetourNavigator::AsyncNavMeshUpdater::getNextJob()::<lambda()> > /usr/include/c++/11.1.0/condition_variable:175
    #5 0x55c90acccaa7 in DetourNavigator::AsyncNavMeshUpdater::getNextJob() /home/elsid/dev/openmw/components/detournavigator/asyncnavmeshupdater.cpp:353
    #6 0x55c90accdb2d in DetourNavigator::AsyncNavMeshUpdater::process() /home/elsid/dev/openmw/components/detournavigator/asyncnavmeshupdater.cpp:257
    #7 0x55c90acce464 in operator() /home/elsid/dev/openmw/components/detournavigator/asyncnavmeshupdater.cpp:98
    #8 0x55c90acce464 in __invoke_impl<void, DetourNavigator::AsyncNavMeshUpdater::AsyncNavMeshUpdater(const DetourNavigator::Settings&, DetourNavigator::TileCachedRecastMeshManager&, DetourNavigator::OffMeshConnectionsManager&)::<lambda()> > /usr/include/c++/11.1.0/bits/invoke.h:61
    #9 0x55c90acce464 in __invoke<DetourNavigator::AsyncNavMeshUpdater::AsyncNavMeshUpdater(const DetourNavigator::Settings&, DetourNavigator::TileCachedRecastMeshManager&, DetourNavigator::OffMeshConnectionsManager&)::<lambda()> > /usr/include/c++/11.1.0/bits/invoke.h:96
    #10 0x55c90acce464 in _M_invoke<0> /usr/include/c++/11.1.0/bits/std_thread.h:253
    #11 0x55c90acce464 in operator() /usr/include/c++/11.1.0/bits/std_thread.h:260
    #12 0x55c90acce464 in _M_run /usr/include/c++/11.1.0/bits/std_thread.h:211
    #13 0x7f78c38fd3c3 in execute_native_thread_routine /build/gcc/src/gcc/libstdc++-v3/src/c++11/thread.cc:82
    #14 0x7f78c36b1258 in start_thread (/usr/lib/libpthread.so.0+0x9258)
    #15 0x7f78c35da5e2 in __GI___clone (/usr/lib/libc.so.6+0xfe5e2)

0x60c000436058 is located 88 bytes inside of 120-byte region [0x60c000436000,0x60c000436078)
freed by thread T0 here:
    #0 0x7f78c688cd69 in operator delete(void*, unsigned long) /build/gcc/src/gcc/libsanitizer/asan/asan_new_delete.cpp:172
    #1 0x55c90acdbe20 in __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > > > >::deallocate(std::_Rb_tree_node<std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > > >*, unsigned long) /usr/include/c++/11.1.0/ext/new_allocator.h:139
    #2 0x55c90acdbe20 in std::allocator_traits<std::allocator<std::_Rb_tree_node<std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > > > > >::deallocate(std::allocator<std::_Rb_tree_node<std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > > > >&, std::_Rb_tree_node<std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > > >*, unsigned long) /usr/include/c++/11.1.0/bits/alloc_traits.h:492
    #3 0x55c90acdbe20 in std::_Rb_tree<std::thread::id, std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > >, std::_Select1st<std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > > >, std::less<std::thread::id>, std::allocator<std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > > > >::_M_put_node(std::_Rb_tree_node<std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > > >*) /usr/include/c++/11.1.0/bits/stl_tree.h:565
    #4 0x55c90acdbe20 in std::_Rb_tree<std::thread::id, std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > >, std::_Select1st<std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > > >, std::less<std::thread::id>, std::allocator<std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > > > >::_M_drop_node(std::_Rb_tree_node<std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > > >*) /usr/include/c++/11.1.0/bits/stl_tree.h:632
    #5 0x55c90acdbe20 in std::_Rb_tree<std::thread::id, std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > >, std::_Select1st<std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > > >, std::less<std::thread::id>, std::allocator<std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > > > >::_M_erase(std::_Rb_tree_node<std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > > >*) /usr/include/c++/11.1.0/bits/stl_tree.h:1889
    #6 0x55c90acc0569 in std::_Rb_tree<std::thread::id, std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > >, std::_Select1st<std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > > >, std::less<std::thread::id>, std::allocator<std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > > > >::clear() /usr/include/c++/11.1.0/bits/stl_tree.h:1254
    #7 0x55c90acc0569 in std::map<std::thread::id, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > >, std::less<std::thread::id>, std::allocator<std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > > > >::clear() /usr/include/c++/11.1.0/bits/stl_map.h:1134
    #8 0x55c90acc0569 in DetourNavigator::AsyncNavMeshUpdater::~AsyncNavMeshUpdater() /home/elsid/dev/openmw/components/detournavigator/asyncnavmeshupdater.cpp:105
    #9 0x55c90acab2dc in DetourNavigator::NavigatorImpl::~NavigatorImpl() (/home/elsid/dev/openmw/build/gcc/asan/openmw+0x2d152dc)
    #10 0x55c9097db4b5 in std::default_delete<DetourNavigator::Navigator>::operator()(DetourNavigator::Navigator*) const /usr/include/c++/11.1.0/bits/unique_ptr.h:85
    #11 0x55c9097db4b5 in std::unique_ptr<DetourNavigator::Navigator, std::default_delete<DetourNavigator::Navigator> >::~unique_ptr() /usr/include/c++/11.1.0/bits/unique_ptr.h:361
    #12 0x55c9097db4b5 in MWWorld::World::~World() /home/elsid/dev/openmw/apps/openmw/mwworld/worldimp.cpp:534
    #13 0x55c9097dc3a4 in MWWorld::World::~World() /home/elsid/dev/openmw/apps/openmw/mwworld/worldimp.cpp:534
    #14 0x55c90a1925e4 in MWBase::Environment::cleanup() /home/elsid/dev/openmw/apps/openmw/mwbase/environment.cpp:192
    #15 0x55c90a1f544d in OMW::Engine::~Engine() /home/elsid/dev/openmw/apps/openmw/engine.cpp:434
    #16 0x55c90a1f6700 in OMW::Engine::~Engine() /home/elsid/dev/openmw/apps/openmw/engine.cpp:455
    #17 0x55c90a19d523 in std::default_delete<OMW::Engine>::operator()(OMW::Engine*) const /usr/include/c++/11.1.0/bits/unique_ptr.h:85
    #18 0x55c90a19d523 in std::unique_ptr<OMW::Engine, std::default_delete<OMW::Engine> >::~unique_ptr() /usr/include/c++/11.1.0/bits/unique_ptr.h:361
    #19 0x55c90a19d523 in runApplication(int, char**) /home/elsid/dev/openmw/apps/openmw/main.cpp:320
    #20 0x55c90a955634 in wrapApplication(int (*)(int, char**), int, char**, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) /home/elsid/dev/openmw/components/debug/debugging.cpp:205
    #21 0x55c90a193be0 in main /home/elsid/dev/openmw/apps/openmw/main.cpp:328
    #22 0x7f78c3503b24 in __libc_start_main (/usr/lib/libc.so.6+0x27b24)

previously allocated by thread T18 here:
    #0 0x7f78c688bca1 in operator new(unsigned long) /build/gcc/src/gcc/libsanitizer/asan/asan_new_delete.cpp:99
    #1 0x55c90ace8c73 in __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > > > >::allocate(unsigned long, void const*) /usr/include/c++/11.1.0/ext/new_allocator.h:121
    #2 0x55c90ace8c73 in std::allocator_traits<std::allocator<std::_Rb_tree_node<std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > > > > >::allocate(std::allocator<std::_Rb_tree_node<std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > > > >&, unsigned long) /usr/include/c++/11.1.0/bits/alloc_traits.h:460
    #3 0x55c90ace8c73 in std::_Rb_tree<std::thread::id, std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > >, std::_Select1st<std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > > >, std::less<std::thread::id>, std::allocator<std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > > > >::_M_get_node() /usr/include/c++/11.1.0/bits/stl_tree.h:561
    #4 0x55c90ace8c73 in std::_Rb_tree_node<std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > > >* std::_Rb_tree<std::thread::id, std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > >, std::_Select1st<std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > > >, std::less<std::thread::id>, std::allocator<std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > > > >::_M_create_node<std::piecewise_construct_t const&, std::tuple<std::thread::id const&>, std::tuple<> >(std::piecewise_construct_t const&, std::tuple<std::thread::id const&>&&, std::tuple<>&&) /usr/include/c++/11.1.0/bits/stl_tree.h:611
    #5 0x55c90ace8c73 in std::_Rb_tree_iterator<std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > > > std::_Rb_tree<std::thread::id, std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > >, std::_Select1st<std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > > >, std::less<std::thread::id>, std::allocator<std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > > > >::_M_emplace_hint_unique<std::piecewise_construct_t const&, std::tuple<std::thread::id const&>, std::tuple<> >(std::_Rb_tree_const_iterator<std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > > >, std::piecewise_construct_t const&, std::tuple<std::thread::id const&>&&, std::tuple<>&&) /usr/include/c++/11.1.0/bits/stl_tree.h:2429
    #6 0x55c90accc5fb in std::map<std::thread::id, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > >, std::less<std::thread::id>, std::allocator<std::pair<std::thread::id const, std::deque<std::_List_iterator<DetourNavigator::Job>, std::allocator<std::_List_iterator<DetourNavigator::Job> > > > > >::operator[](std::thread::id const&) /usr/include/c++/11.1.0/bits/stl_map.h:501
    #7 0x55c90accc5fb in DetourNavigator::AsyncNavMeshUpdater::getNextJob() /home/elsid/dev/openmw/components/detournavigator/asyncnavmeshupdater.cpp:344
    #8 0x55c90accdb2d in DetourNavigator::AsyncNavMeshUpdater::process() /home/elsid/dev/openmw/components/detournavigator/asyncnavmeshupdater.cpp:257
    #9 0x55c90acce464 in operator() /home/elsid/dev/openmw/components/detournavigator/asyncnavmeshupdater.cpp:98
    #10 0x55c90acce464 in __invoke_impl<void, DetourNavigator::AsyncNavMeshUpdater::AsyncNavMeshUpdater(const DetourNavigator::Settings&, DetourNavigator::TileCachedRecastMeshManager&, DetourNavigator::OffMeshConnectionsManager&)::<lambda()> > /usr/include/c++/11.1.0/bits/invoke.h:61
    #11 0x55c90acce464 in __invoke<DetourNavigator::AsyncNavMeshUpdater::AsyncNavMeshUpdater(const DetourNavigator::Settings&, DetourNavigator::TileCachedRecastMeshManager&, DetourNavigator::OffMeshConnectionsManager&)::<lambda()> > /usr/include/c++/11.1.0/bits/invoke.h:96
    #12 0x55c90acce464 in _M_invoke<0> /usr/include/c++/11.1.0/bits/std_thread.h:253
    #13 0x55c90acce464 in operator() /usr/include/c++/11.1.0/bits/std_thread.h:260
    #14 0x55c90acce464 in _M_run /usr/include/c++/11.1.0/bits/std_thread.h:211
    #15 0x7f78c38fd3c3 in execute_native_thread_routine /build/gcc/src/gcc/libstdc++-v3/src/c++11/thread.cc:82

Thread T18 created by T0 here:
    #0 0x7f78c682bfa7 in __interceptor_pthread_create /build/gcc/src/gcc/libsanitizer/asan/asan_interceptors.cpp:216
    #1 0x7f78c38fd6aa in std::thread::_M_start_thread(std::unique_ptr<std::thread::_State, std::default_delete<std::thread::_State> >, void (*)()) /build/gcc/src/gcc-build/x86_64-pc-linux-gnu/libstdc++-v3/include/x86_64-pc-linux-gnu/bits/gthr-default.h:663
    #2 0x55c90ae008d1 in DetourNavigator::NavMeshManager::NavMeshManager(DetourNavigator::Settings const&) /home/elsid/dev/openmw/components/detournavigator/navmeshmanager.cpp:47
    #3 0x55c90aca3bfe in DetourNavigator::NavigatorImpl::NavigatorImpl(DetourNavigator::Settings const&) /home/elsid/dev/openmw/components/detournavigator/navigatorimpl.cpp:13
    #4 0x55c9097d9e6f in MWWorld::World::World(osgViewer::Viewer*, osg::ref_ptr<osg::Group>, Resource::ResourceSystem*, SceneUtil::WorkQueue*, Files::Collections const&, std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&, std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&, ToUTF8::Utf8Encoder*, int, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) /home/elsid/dev/openmw/apps/openmw/mwworld/worldimp.cpp:196
    #5 0x55c90a1e9992 in OMW::Engine::prepareEngine(Settings::Manager&) /home/elsid/dev/openmw/apps/openmw/engine.cpp:789
    #6 0x55c90a1ed138 in OMW::Engine::go() /home/elsid/dev/openmw/apps/openmw/engine.cpp:949
    #7 0x55c90a19d4cb in runApplication(int, char**) /home/elsid/dev/openmw/apps/openmw/main.cpp:316
    #8 0x55c90a955634 in wrapApplication(int (*)(int, char**), int, char**, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) /home/elsid/dev/openmw/components/debug/debugging.cpp:205
    #9 0x55c90a193be0 in main /home/elsid/dev/openmw/apps/openmw/main.cpp:328
    #10 0x7f78c3503b24 in __libc_start_main (/usr/lib/libc.so.6+0x27b24)

SUMMARY: AddressSanitizer: heap-use-after-free /usr/include/c++/11.1.0/bits/stl_deque.h:269 in std::operator==(std::_Deque_iterator<std::_List_iterator<DetourNavigator::Job>, std::_List_iterator<DetourNavigator::Job>&, std::_List_iterator<DetourNavigator::Job>*> const&, std::_Deque_iterator<std::_List_iterator<DetourNavigator::Job>, std::_List_iterator<DetourNavigator::Job>&, std::_List_iterator<DetourNavigator::Job>*> const&)
Shadow bytes around the buggy address:
  0x0c188007ebb0: fa fa fa fa fa fa fa fa fd fd fd fd fd fd fd fd
  0x0c188007ebc0: fd fd fd fd fd fd fd fd fa fa fa fa fa fa fa fa
  0x0c188007ebd0: fd fd fd fd fd fd fd fd fd fd fd fd fd fd fd fd
  0x0c188007ebe0: fa fa fa fa fa fa fa fa 00 00 00 00 00 00 00 00
  0x0c188007ebf0: 00 00 00 00 00 00 07 fa fa fa fa fa fa fa fa fa
=>0x0c188007ec00: fd fd fd fd fd fd fd fd fd fd fd[fd]fd fd fd fa
  0x0c188007ec10: fa fa fa fa fa fa fa fa 00 00 00 00 00 00 00 00
  0x0c188007ec20: 00 00 00 00 00 00 02 fa fa fa fa fa fa fa fa fa
  0x0c188007ec30: fd fd fd fd fd fd fd fd fd fd fd fd fd fd fd fd
  0x0c188007ec40: fa fa fa fa fa fa fa fa 00 00 00 00 00 00 00 00
  0x0c188007ec50: 00 00 00 00 00 00 00 fa fa fa fa fa fa fa fa fa
Shadow byte legend (one shadow byte represents 8 application bytes):
  Addressable:           00
  Partially addressable: 01 02 03 04 05 06 07
  Heap left redzone:       fa
  Freed heap region:       fd
  Stack left redzone:      f1
  Stack mid redzone:       f2
  Stack right redzone:     f3
  Stack after return:      f5
  Stack use after scope:   f8
  Global redzone:          f9
  Global init order:       f6
  Poisoned by user:        f7
  Container overflow:      fc
  Array cookie:            ac
  Intra object redzone:    bb
  ASan internal:           fe
  Left alloca redzone:     ca
  Right alloca redzone:    cb
  Shadow gap:              cc
==11799==ABORTING
---
 components/detournavigator/asyncnavmeshupdater.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index 7fcfdf98c5..562420955d 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -345,8 +345,12 @@ namespace DetourNavigator
 
         while (true)
         {
+            bool shouldStop = false;
+
             const auto hasJob = [&] {
-                return (!mWaiting.empty() && mWaiting.front()->mProcessTime <= std::chrono::steady_clock::now())
+                shouldStop = mShouldStop;
+                return shouldStop
+                    || (!mWaiting.empty() && mWaiting.front()->mProcessTime <= std::chrono::steady_clock::now())
                     || !threadQueue.empty();
             };
 
@@ -357,6 +361,9 @@ namespace DetourNavigator
                 return mJobs.end();
             }
 
+            if (shouldStop)
+                return mJobs.end();
+
             Log(Debug::Debug) << "Got " << mJobs.size() << " navigator jobs and "
                 << threadQueue.size() << " thread jobs by thread=" << std::this_thread::get_id();
 

From e9b8933b2fbee645130bf33cf18521457b8ee722 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 19 Aug 2021 01:37:31 +0200
Subject: [PATCH 1235/2859] Do no link binaries with Qt where it's not used

Define components_qt static library with all qt dependent components that also
depends on other components. Link only cs, wizard and launcher with qt
dependent components.
---
 CHANGELOG.md                 | 1 +
 CMakeLists.txt               | 1 -
 apps/launcher/CMakeLists.txt | 2 +-
 apps/opencs/CMakeLists.txt   | 2 +-
 apps/wizard/CMakeLists.txt   | 2 +-
 cmake/OpenMWMacros.cmake     | 2 +-
 components/CMakeLists.txt    | 8 +++++---
 7 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb461154d3..e61acf9568 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
     Bug #5379: Wandering NPCs falling through cantons
     Bug #5453: Magic effect VFX are offset for creatures
     Bug #5483: AutoCalc flag is not used to calculate spells cost
+    Bug #5508: Engine binary links to Qt without using it
     Bug #5755: Active grid object paging - disappearing textures
     Bug #5788: Texture editing parses the selected indexes wrongly
     Bug #5842: GetDisposition adds temporary disposition change from different actors
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b69cb5b71f..c733c22ff5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -542,7 +542,6 @@ endif()
 
 # Components
 add_subdirectory (components)
-target_compile_definitions(components PRIVATE OPENMW_DOC_BASEURL="${OPENMW_DOC_BASEURL}")
 
 # Apps and tools
 if (BUILD_OPENMW)
diff --git a/apps/launcher/CMakeLists.txt b/apps/launcher/CMakeLists.txt
index 3018237705..e9ec906e6a 100644
--- a/apps/launcher/CMakeLists.txt
+++ b/apps/launcher/CMakeLists.txt
@@ -99,7 +99,7 @@ endif (WIN32)
 target_link_libraries(openmw-launcher
     ${SDL2_LIBRARY_ONLY}
     ${OPENAL_LIBRARY}
-    components
+    components_qt
 )
 
 target_link_libraries(openmw-launcher Qt5::Widgets Qt5::Core)
diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 88c4233c9c..c76e322055 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -229,7 +229,7 @@ target_link_libraries(openmw-cs
     ${Boost_SYSTEM_LIBRARY}
     ${Boost_FILESYSTEM_LIBRARY}
     ${Boost_PROGRAM_OPTIONS_LIBRARY}
-    components
+    components_qt
 )
 
 if(OSG_STATIC)
diff --git a/apps/wizard/CMakeLists.txt b/apps/wizard/CMakeLists.txt
index 10e06d1ff0..2558ec81de 100644
--- a/apps/wizard/CMakeLists.txt
+++ b/apps/wizard/CMakeLists.txt
@@ -99,7 +99,7 @@ openmw_add_executable(openmw-wizard
 )
 
 target_link_libraries(openmw-wizard
-    components
+    components_qt
 )
 
 target_link_libraries(openmw-wizard Qt5::Widgets Qt5::Core)
diff --git a/cmake/OpenMWMacros.cmake b/cmake/OpenMWMacros.cmake
index 1621a08cfd..176a02d507 100644
--- a/cmake/OpenMWMacros.cmake
+++ b/cmake/OpenMWMacros.cmake
@@ -78,7 +78,7 @@ foreach (u ${ARGN})
 file (GLOB ALL "${dir}/${u}.[ch]pp")
 foreach (f ${ALL})
 list (APPEND files "${f}")
-list (APPEND COMPONENT_FILES "${f}")
+list (APPEND COMPONENT_QT_FILES "${f}")
 endforeach (f)
 file (GLOB MOC_H "${dir}/${u}.hpp")
 foreach (fi ${MOC_H})
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 3388d34a09..3de864ea52 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -217,7 +217,7 @@ if (USE_QT)
         processinvoker
         )
 
-    add_component_dir (misc
+    add_component_qt_dir (misc
         helpviewer
         )
 
@@ -233,7 +233,7 @@ endif ()
 
 include_directories(${BULLET_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR})
 
-add_library(components STATIC ${COMPONENT_FILES} ${MOC_SRCS} ${ESM_UI_HDR})
+add_library(components STATIC ${COMPONENT_FILES})
 
 target_link_libraries(components
     # CMake's built-in OSG finder does not use pkgconfig, so we have to
@@ -276,7 +276,9 @@ if (WIN32)
 endif()
 
 if (USE_QT)
-    target_link_libraries(components Qt5::Widgets Qt5::Core)
+    add_library(components_qt STATIC ${COMPONENT_QT_FILES} ${MOC_SRCS} ${ESM_UI_HDR})
+    target_link_libraries(components_qt components Qt5::Widgets Qt5::Core)
+    target_compile_definitions(components_qt PRIVATE OPENMW_DOC_BASEURL="${OPENMW_DOC_BASEURL}")
 endif()
 
 if (GIT_CHECKOUT)

From 431501e23a3b144edeb5b9dab936c88d56599d1f Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 7 Aug 2021 11:25:01 +0200
Subject: [PATCH 1236/2859] Remove redundant job distribution between threads

Instead don't take jobs from queue until job for the same tile is processing.
---
 .../detournavigator/asyncnavmeshupdater.cpp   | 98 ++++++-------------
 .../detournavigator/asyncnavmeshupdater.hpp   |  5 +-
 2 files changed, 30 insertions(+), 73 deletions(-)

diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index 562420955d..20105aba06 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -102,7 +102,6 @@ namespace DetourNavigator
     {
         mShouldStop = true;
         std::unique_lock<std::mutex> lock(mMutex);
-        mThreadsQueues.clear();
         mWaiting.clear();
         mHasJob.notify_all();
         lock.unlock();
@@ -340,64 +339,38 @@ namespace DetourNavigator
     {
         std::unique_lock<std::mutex> lock(mMutex);
 
-        const auto threadId = std::this_thread::get_id();
-        auto& threadQueue = mThreadsQueues[threadId];
-
-        while (true)
+        bool shouldStop = false;
+        const auto hasJob = [&]
         {
-            bool shouldStop = false;
-
-            const auto hasJob = [&] {
-                shouldStop = mShouldStop;
-                return shouldStop
-                    || (!mWaiting.empty() && mWaiting.front()->mProcessTime <= std::chrono::steady_clock::now())
-                    || !threadQueue.empty();
-            };
-
-            if (!mHasJob.wait_for(lock, std::chrono::milliseconds(10), hasJob))
-            {
-                if (mJobs.empty())
-                    mDone.notify_all();
-                return mJobs.end();
-            }
-
-            if (shouldStop)
-                return mJobs.end();
-
-            Log(Debug::Debug) << "Got " << mJobs.size() << " navigator jobs and "
-                << threadQueue.size() << " thread jobs by thread=" << std::this_thread::get_id();
-
-            const JobIt job = threadQueue.empty()
-                ? getJob(mWaiting, true)
-                : getJob(threadQueue, false);
+            shouldStop = mShouldStop;
+            return shouldStop
+                || (!mWaiting.empty() && mWaiting.front()->mProcessTime <= std::chrono::steady_clock::now());
+        };
 
-            if (job == mJobs.end())
-                continue;
+        if (!mHasJob.wait_for(lock, std::chrono::milliseconds(10), hasJob))
+        {
+            if (mJobs.empty())
+                mDone.notify_all();
+            return mJobs.end();
+        }
 
-            const auto owner = lockTile(job->mAgentHalfExtents, job->mChangedTile);
+        if (shouldStop)
+            return mJobs.end();
 
-            if (owner == threadId)
-            {
-                mPushed.erase(getAgentAndTile(*job));
-                return job;
-            }
+        const JobIt job = mWaiting.front();
 
-            postThreadJob(job, mThreadsQueues[owner]);
-        }
-    }
+        mWaiting.pop_front();
 
-    JobIt AsyncNavMeshUpdater::getJob(std::deque<JobIt>& jobs, bool changeLastUpdate)
-    {
-        const auto now = std::chrono::steady_clock::now();
-        JobIt job = jobs.front();
-
-        if (job->mProcessTime > now)
+        if (!lockTile(job->mAgentHalfExtents, job->mChangedTile))
+        {
+            ++job->mTryNumber;
+            insertPrioritizedJob(job, mWaiting);
             return mJobs.end();
+        }
 
-        jobs.pop_front();
-
-        if (changeLastUpdate && job->mChangeType == ChangeType::update)
-            mLastUpdates[getAgentAndTile(*job)] = now;
+        if (job->mChangeType == ChangeType::update)
+            mLastUpdates[getAgentAndTile(*job)] = std::chrono::steady_clock::now();
+        mPushed.erase(getAgentAndTile(*job));
 
         return job;
     }
@@ -435,7 +408,7 @@ namespace DetourNavigator
         if (mPushed.emplace(job->mAgentHalfExtents, job->mChangedTile).second)
         {
             ++job->mTryNumber;
-            mWaiting.push_back(job);
+            insertPrioritizedJob(job, mWaiting);
             mHasJob.notify_all();
             return;
         }
@@ -443,26 +416,11 @@ namespace DetourNavigator
         mJobs.erase(job);
     }
 
-    void AsyncNavMeshUpdater::postThreadJob(JobIt job, std::deque<JobIt>& queue)
-    {
-        queue.push_back(job);
-        mHasJob.notify_all();
-    }
-
-    std::thread::id AsyncNavMeshUpdater::lockTile(const osg::Vec3f& agentHalfExtents, const TilePosition& changedTile)
+    bool AsyncNavMeshUpdater::lockTile(const osg::Vec3f& agentHalfExtents, const TilePosition& changedTile)
     {
         if (mSettings.get().mAsyncNavMeshUpdaterThreads <= 1)
-            return std::this_thread::get_id();
-
-        auto locked = mProcessingTiles.lock();
-        const auto tile = locked->find(std::make_tuple(agentHalfExtents, changedTile));
-        if (tile == locked->end())
-        {
-            const auto threadId = std::this_thread::get_id();
-            locked->emplace(std::tie(agentHalfExtents, changedTile), threadId);
-            return threadId;
-        }
-        return tile->second;
+            return true;
+        return mProcessingTiles.lock()->emplace(agentHalfExtents, changedTile).second;
     }
 
     void AsyncNavMeshUpdater::unlockTile(const osg::Vec3f& agentHalfExtents, const TilePosition& changedTile)
diff --git a/components/detournavigator/asyncnavmeshupdater.hpp b/components/detournavigator/asyncnavmeshupdater.hpp
index b770230673..9e521ad509 100644
--- a/components/detournavigator/asyncnavmeshupdater.hpp
+++ b/components/detournavigator/asyncnavmeshupdater.hpp
@@ -99,10 +99,9 @@ namespace DetourNavigator
         std::set<std::tuple<osg::Vec3f, TilePosition>> mPushed;
         Misc::ScopeGuarded<TilePosition> mPlayerTile;
         NavMeshTilesCache mNavMeshTilesCache;
-        Misc::ScopeGuarded<std::map<std::tuple<osg::Vec3f, TilePosition>, std::thread::id>> mProcessingTiles;
+        Misc::ScopeGuarded<std::set<std::tuple<osg::Vec3f, TilePosition>>> mProcessingTiles;
         std::map<std::tuple<osg::Vec3f, TilePosition>, std::chrono::steady_clock::time_point> mLastUpdates;
         std::set<std::tuple<osg::Vec3f, TilePosition>> mPresentTiles;
-        std::map<std::thread::id, std::deque<JobIt>> mThreadsQueues;
         std::vector<std::thread> mThreads;
 
         void process() noexcept;
@@ -119,7 +118,7 @@ namespace DetourNavigator
 
         void repost(JobIt job);
 
-        std::thread::id lockTile(const osg::Vec3f& agentHalfExtents, const TilePosition& changedTile);
+        bool lockTile(const osg::Vec3f& agentHalfExtents, const TilePosition& changedTile);
 
         void unlockTile(const osg::Vec3f& agentHalfExtents, const TilePosition& changedTile);
 

From 0f11acf709643fd829683e1ef4f6d0906950f349 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 6 Aug 2021 19:50:29 +0200
Subject: [PATCH 1237/2859] Report more stats from AsyncNavMeshUpdater

---
 components/detournavigator/asyncnavmeshupdater.cpp | 9 ++++++++-
 components/resource/stats.cpp                      | 5 ++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index 20105aba06..c6db079ce8 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -234,13 +234,20 @@ namespace DetourNavigator
     void AsyncNavMeshUpdater::reportStats(unsigned int frameNumber, osg::Stats& stats) const
     {
         std::size_t jobs = 0;
+        std::size_t waiting = 0;
+        std::size_t pushed = 0;
 
         {
             const std::lock_guard<std::mutex> lock(mMutex);
             jobs = mJobs.size();
+            waiting = mWaiting.size();
+            pushed = mPushed.size();
         }
 
-        stats.setAttribute(frameNumber, "NavMesh UpdateJobs", jobs);
+        stats.setAttribute(frameNumber, "NavMesh Jobs", jobs);
+        stats.setAttribute(frameNumber, "NavMesh Waiting", waiting);
+        stats.setAttribute(frameNumber, "NavMesh Pushed", pushed);
+        stats.setAttribute(frameNumber, "NavMesh Processing", mProcessingTiles.lockConst()->size());
 
         mNavMeshTilesCache.reportStats(frameNumber, stats);
     }
diff --git a/components/resource/stats.cpp b/components/resource/stats.cpp
index b5975e28e3..9881d0458b 100644
--- a/components/resource/stats.cpp
+++ b/components/resource/stats.cpp
@@ -390,7 +390,10 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase *viewer)
             "Land",
             "Composite",
             "",
-            "NavMesh UpdateJobs",
+            "NavMesh Jobs",
+            "NavMesh Waiting",
+            "NavMesh Pushed",
+            "NavMesh Processing",
             "NavMesh CacheSize",
             "NavMesh UsedTiles",
             "NavMesh CachedTiles",

From 0066c446f828570e029aa4267bbdb29fb9aa1642 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 17 Aug 2021 12:10:22 +0200
Subject: [PATCH 1238/2859] Remove navmesh tiles outside allowed range first

* Change job change type to remove when tile is outside allowed range.
* Swap try number and change type in job priority. To make sure remove jobs
  always processed before any other.
---
 components/detournavigator/asyncnavmeshupdater.cpp | 12 +++++++++++-
 components/detournavigator/asyncnavmeshupdater.hpp |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index c6db079ce8..5c88d0cfa2 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -8,6 +8,8 @@
 #include <components/misc/thread.hpp>
 #include <components/loadinglistener/loadinglistener.hpp>
 
+#include <DetourNavMesh.h>
+
 #include <osg/Stats>
 
 #include <algorithm>
@@ -48,7 +50,7 @@ namespace
 
     auto getPriority(const Job& job) noexcept
     {
-        return std::make_tuple(job.mProcessTime, job.mTryNumber, job.mChangeType, job.mDistanceToPlayer, job.mDistanceToOrigin);
+        return std::make_tuple(job.mProcessTime, job.mChangeType, job.mTryNumber, job.mDistanceToPlayer, job.mDistanceToOrigin);
     }
 
     struct LessByJobPriority
@@ -123,11 +125,19 @@ namespace DetourNavigator
         if (!playerTileChanged && changedTiles.empty())
             return;
 
+        const dtNavMeshParams params = *navMeshCacheItem->lockConst()->getImpl().getParams();
+
         const std::lock_guard<std::mutex> lock(mMutex);
 
         if (playerTileChanged)
+        {
             for (JobIt job : mWaiting)
+            {
                 job->mDistanceToPlayer = getManhattanDistance(job->mChangedTile, playerTile);
+                if (!shouldAddTile(job->mChangedTile, playerTile, std::min(mSettings.get().mMaxTilesNumber, params.maxTiles)))
+                    job->mChangeType = ChangeType::remove;
+            }
+        }
 
         for (const auto& [changedTile, changeType] : changedTiles)
         {
diff --git a/components/detournavigator/asyncnavmeshupdater.hpp b/components/detournavigator/asyncnavmeshupdater.hpp
index 9e521ad509..2d915ad434 100644
--- a/components/detournavigator/asyncnavmeshupdater.hpp
+++ b/components/detournavigator/asyncnavmeshupdater.hpp
@@ -60,7 +60,7 @@ namespace DetourNavigator
         const TilePosition mChangedTile;
         const std::chrono::steady_clock::time_point mProcessTime;
         unsigned mTryNumber = 0;
-        const ChangeType mChangeType;
+        ChangeType mChangeType;
         int mDistanceToPlayer;
         const int mDistanceToOrigin;
 

From 7801f420059ad4540dbda554acaaa343ff0f1919 Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Fri, 20 Aug 2021 22:32:41 +0300
Subject: [PATCH 1239/2859] Don't do mapToSource at executeModify

---
 apps/opencs/model/world/commanddispatcher.cpp | 25 ++++++-------------
 apps/opencs/model/world/commanddispatcher.hpp |  2 +-
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/apps/opencs/model/world/commanddispatcher.cpp b/apps/opencs/model/world/commanddispatcher.cpp
index 13e66fd5cd..3da3e3d22c 100644
--- a/apps/opencs/model/world/commanddispatcher.cpp
+++ b/apps/opencs/model/world/commanddispatcher.cpp
@@ -137,7 +137,7 @@ std::vector<CSMWorld::UniversalId> CSMWorld::CommandDispatcher::getExtendedTypes
     return tables;
 }
 
-void CSMWorld::CommandDispatcher::executeModify (QAbstractItemModel *sourceModel, const QModelIndex& sourceIndex, const QVariant& new_)
+void CSMWorld::CommandDispatcher::executeModify (QAbstractItemModel *model, const QModelIndex& index, const QVariant& new_)
 {
     if (mLocked)
         return;
@@ -150,26 +150,17 @@ void CSMWorld::CommandDispatcher::executeModify (QAbstractItemModel *sourceModel
     std::unique_ptr<CSMWorld::ModifyCommand> modifyData;
     std::unique_ptr<CSMWorld::UpdateCellCommand> modifyCell;
 
-    QAbstractItemModel *model(nullptr);
-    QModelIndex index;
+    QAbstractItemModel* sourceModel = model;
+    if (IdTableProxyModel* proxy = dynamic_cast<IdTableProxyModel*> (model))
+        sourceModel = proxy->sourceModel();
 
-    if (QAbstractProxyModel *proxy = dynamic_cast<QAbstractProxyModel *> (sourceModel))
-    {
-        // Replace proxy with actual model
-        index = proxy->mapToSource (sourceIndex);
-        model = proxy->sourceModel();
-    }
-
-    if (!model) return;
+    CSMWorld::IdTable& table = dynamic_cast<CSMWorld::IdTable&>(*sourceModel); // for getId()
+    int stateColumn = table.findColumnIndex(Columns::ColumnId_Modification);
+    QModelIndex stateIndex = table.getModelIndex(table.getId(index.row()), stateColumn);
+    RecordBase::State state = static_cast<RecordBase::State> (sourceModel->data(stateIndex).toInt());
 
     int columnId = model->data (index, ColumnBase::Role_ColumnId).toInt();
 
-    int stateColumn = dynamic_cast<CSMWorld::IdTable&>(*model).findColumnIndex(Columns::ColumnId_Modification);
-
-    CSMWorld::IdTable& table = dynamic_cast<CSMWorld::IdTable&>(*model); // for getId()
-    QModelIndex stateIndex = table.getModelIndex(table.getId(index.row()), stateColumn);
-    RecordBase::State state = static_cast<RecordBase::State> (model->data(stateIndex).toInt());
-
     // This is not guaranteed to be the same as \a model, since a proxy could be used.
     IdTable& model2 = dynamic_cast<IdTable&> (*mDocument.getData().getTableModel(mId));
 
diff --git a/apps/opencs/model/world/commanddispatcher.hpp b/apps/opencs/model/world/commanddispatcher.hpp
index 13724f5dbd..538fd7f188 100644
--- a/apps/opencs/model/world/commanddispatcher.hpp
+++ b/apps/opencs/model/world/commanddispatcher.hpp
@@ -60,7 +60,7 @@ namespace CSMWorld
             ///
             /// \attention model must either be a model for the table operated on by this
             /// dispatcher or a proxy of it.
-            void executeModify (QAbstractItemModel *sourceModel, const QModelIndex& sourceIndex, const QVariant& new_);
+            void executeModify (QAbstractItemModel *model, const QModelIndex& index, const QVariant& new_);
 
         public slots:
 

From 28ad139464b5d08c5d213e6fda128a2906d74345 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Sat, 21 Aug 2021 07:20:10 +1000
Subject: [PATCH 1240/2859] Check if deleted, just in case.

---
 apps/openmw/mwworld/store.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index 8faa86597f..f6de1d485b 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -875,7 +875,7 @@ namespace MWWorld
 
         // deal with mods that have empty pathgrid records (Issue #6209)
         // we assume that these records are empty on purpose (i.e. to remove old pathgrid on an updated cell)
-        if (pathgrid.mPoints.empty() || pathgrid.mEdges.empty())
+        if (isDeleted || pathgrid.mPoints.empty() || pathgrid.mEdges.empty())
         {
             if (interior)
             {

From 3771e523f1a778c38a0301b2454fae91c1461f89 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Fri, 9 Jul 2021 00:31:57 +0200
Subject: [PATCH 1241/2859] More object bindings

---
 apps/openmw/mwlua/luabindings.cpp    |  2 +-
 apps/openmw/mwlua/objectbindings.cpp | 26 ++++++++++++++++++++++++
 files/lua_api/openmw/core.lua        | 30 ++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index e50af836b5..ed788eb525 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -25,7 +25,7 @@ namespace MWLua
     {
         auto* lua = context.mLua;
         sol::table api(lua->sol(), sol::create);
-        api["API_REVISION"] = 4;
+        api["API_REVISION"] = 5;
         api["quit"] = [lua]()
         {
             std::string traceback = lua->sol()["debug"]["traceback"]().get<std::string>();
diff --git a/apps/openmw/mwlua/objectbindings.cpp b/apps/openmw/mwlua/objectbindings.cpp
index d4ae041549..b7607c8b2c 100644
--- a/apps/openmw/mwlua/objectbindings.cpp
+++ b/apps/openmw/mwlua/objectbindings.cpp
@@ -158,6 +158,32 @@ namespace MWLua
                     luaManager->addAction(std::move(action));
             };
         }
+        else
+        {  // Only for local scripts
+            objectT["isOnGround"] = [](const ObjectT& o)
+            {
+                return MWBase::Environment::get().getWorld()->isOnGround(o.ptr());
+            };
+            objectT["isSwimming"] = [](const ObjectT& o)
+            {
+                return MWBase::Environment::get().getWorld()->isSwimming(o.ptr());
+            };
+            objectT["isInWeaponStance"] = [](const ObjectT& o)
+            {
+                const MWWorld::Class& cls = o.ptr().getClass();
+                return cls.isActor() && cls.getCreatureStats(o.ptr()).getDrawState() == MWMechanics::DrawState_Weapon;
+            };
+            objectT["isInMagicStance"] = [](const ObjectT& o)
+            {
+                const MWWorld::Class& cls = o.ptr().getClass();
+                return cls.isActor() && cls.getCreatureStats(o.ptr()).getDrawState() == MWMechanics::DrawState_Spell;
+            };
+            objectT["getCurrentSpeed"] = [](const ObjectT& o)
+            {
+                const MWWorld::Class& cls = o.ptr().getClass();
+                return cls.getCurrentSpeed(o.ptr());
+            };
+        }
     }
 
     template <class ObjectT>
diff --git a/files/lua_api/openmw/core.lua b/files/lua_api/openmw/core.lua
index eed2005cfa..50706b9770 100644
--- a/files/lua_api/openmw/core.lua
+++ b/files/lua_api/openmw/core.lua
@@ -127,6 +127,36 @@
 -- @param self
 -- @return #number
 
+-------------------------------------------------------------------------------
+-- Current speed. Can be called only from a local script.
+-- @function [parent=#GameObject] getCurrentSpeed
+-- @param self
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Is the actor standing on ground. Can be called only from a local script.
+-- @function [parent=#GameObject] isOnGround
+-- @param self
+-- @return #boolean
+
+-------------------------------------------------------------------------------
+-- Is the actor in water. Can be called only from a local script.
+-- @function [parent=#GameObject] isSwimming
+-- @param self
+-- @return #boolean
+
+-------------------------------------------------------------------------------
+-- Is the actor in weapon stance. Can be called only from a local script.
+-- @function [parent=#GameObject] isInWeaponStance
+-- @param self
+-- @return #boolean
+
+-------------------------------------------------------------------------------
+-- Is the actor in magic stance. Can be called only from a local script.
+-- @function [parent=#GameObject] isInMagicStance
+-- @param self
+-- @return #boolean
+
 -------------------------------------------------------------------------------
 -- Send local event to the object.
 -- @function [parent=#GameObject] sendEvent

From 0922d0b105e0461052a829de99407f538cadf40d Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sun, 22 Aug 2021 05:46:46 +0300
Subject: [PATCH 1242/2859] Clean up text key extraction

---
 apps/openmw/mwmechanics/character.cpp | 11 ++-------
 components/nifosg/nifloader.cpp       | 35 +++++----------------------
 2 files changed, 8 insertions(+), 38 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index aee94f15b7..62c130b36e 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -23,6 +23,7 @@
 
 #include <components/misc/mathutil.hpp>
 #include <components/misc/rng.hpp>
+#include <components/misc/stringops.hpp>
 
 #include <components/settings/settings.hpp>
 
@@ -942,14 +943,6 @@ CharacterController::~CharacterController()
     }
 }
 
-void split(const std::string &s, char delim, std::vector<std::string> &elems) {
-    std::stringstream ss(s);
-    std::string item;
-    while (std::getline(ss, item, delim)) {
-        elems.push_back(item);
-    }
-}
-
 void CharacterController::handleTextKey(const std::string &groupname, SceneUtil::TextKeyMap::ConstIterator key, const SceneUtil::TextKeyMap& map)
 {
     const std::string &evt = key->second;
@@ -969,7 +962,7 @@ void CharacterController::handleTextKey(const std::string &groupname, SceneUtil:
         if (soundgen.find(' ') != std::string::npos)
         {
             std::vector<std::string> tokens;
-            split(soundgen, ' ', tokens);
+            Misc::StringUtils::split(soundgen, tokens);
             soundgen = tokens[0];
             if (tokens.size() >= 2)
             {
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 81c3d24dcc..0432aef5b4 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -153,37 +153,14 @@ namespace
     {
         for(size_t i = 0;i < tk->list.size();i++)
         {
-            const std::string &str = tk->list[i].text;
-            std::string::size_type pos = 0;
-            while(pos < str.length())
+            std::vector<std::string> results;
+            Misc::StringUtils::split(tk->list[i].text, results, "\r\n");
+            for (std::string &result : results)
             {
-                if(::isspace(str[pos]))
-                {
-                    pos++;
-                    continue;
-                }
-
-                std::string::size_type nextpos = std::min(str.find('\r', pos), str.find('\n', pos));
-                if(nextpos != std::string::npos)
-                {
-                    do {
-                        nextpos--;
-                    } while(nextpos > pos && ::isspace(str[nextpos]));
-                    nextpos++;
-                }
-                else if(::isspace(*str.rbegin()))
-                {
-                    std::string::const_iterator last = str.end();
-                    do {
-                        --last;
-                    } while(last != str.begin() && ::isspace(*last));
-                    nextpos = std::distance(str.begin(), ++last);
-                }
-                std::string result = str.substr(pos, nextpos-pos);
+                Misc::StringUtils::trim(result);
                 Misc::StringUtils::lowerCaseInPlace(result);
-                textkeys.emplace(tk->list[i].time, std::move(result));
-
-                pos = nextpos;
+                if (!result.empty())
+                    textkeys.emplace(tk->list[i].time, std::move(result));
             }
         }
     }

From 716eebe61628ba7a6a96de239388fba0c61dd5f9 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Sun, 22 Aug 2021 19:22:13 +0000
Subject: [PATCH 1243/2859] Merge branch 'terrainselectioncrashfix' into
 'openmw-47'

Fix terrain selection crash

See merge request OpenMW/openmw!1165

(cherry picked from commit ec4e3b04a7b394acaaa8319b89ce1237e9d4d6e6)

b84e41bd Avoid storing ref, dynamic cast worldspacewidget for safety
d62ddc00 Use QPointer to detect object existence, less verbose debug messages
cb42b528 Remove friend, make getEditMode public to allow editmode testing.
4b148180 Restucture code
08f7c73e Fix text
---
 apps/opencs/view/render/commands.cpp          | 33 ++++++++++++++++---
 apps/opencs/view/render/commands.hpp          | 11 +++++--
 apps/opencs/view/render/terrainshapemode.cpp  | 13 +++++---
 apps/opencs/view/render/terrainshapemode.hpp  |  4 ++-
 .../opencs/view/render/terraintexturemode.cpp |  5 +++
 .../opencs/view/render/terraintexturemode.hpp |  4 ++-
 apps/opencs/view/render/worldspacewidget.cpp  | 10 +++---
 apps/opencs/view/render/worldspacewidget.hpp  |  4 +--
 8 files changed, 65 insertions(+), 19 deletions(-)

diff --git a/apps/opencs/view/render/commands.cpp b/apps/opencs/view/render/commands.cpp
index 7b37602961..699bf5d016 100644
--- a/apps/opencs/view/render/commands.cpp
+++ b/apps/opencs/view/render/commands.cpp
@@ -1,19 +1,44 @@
 #include "commands.hpp"
 
+#include <QPointer>
+
+#include <components/debug/debuglog.hpp>
 #include <components/esm/loadland.hpp>
 
+#include "editmode.hpp"
 #include "terrainselection.hpp"
+#include "terrainshapemode.hpp"
+#include "terraintexturemode.hpp"
+#include "worldspacewidget.hpp"
 
-CSVRender::DrawTerrainSelectionCommand::DrawTerrainSelectionCommand(TerrainSelection& terrainSelection, QUndoCommand* parent)
-    : mTerrainSelection(terrainSelection)
+CSVRender::DrawTerrainSelectionCommand::DrawTerrainSelectionCommand(WorldspaceWidget* worldspaceWidget, QUndoCommand* parent)
+    : mWorldspaceWidget(worldspaceWidget)
 { }
 
 void CSVRender::DrawTerrainSelectionCommand::redo()
 {
-    mTerrainSelection.update();
+    tryUpdate();
 }
 
 void CSVRender::DrawTerrainSelectionCommand::undo()
 {
-    mTerrainSelection.update();
+    tryUpdate();
+}
+
+void CSVRender::DrawTerrainSelectionCommand::tryUpdate()
+{
+    if (!mWorldspaceWidget)
+    {
+        Log(Debug::Verbose) << "Can't update terrain selection, no WorldspaceWidget found!";
+        return;
+    }
+
+    auto terrainMode = dynamic_cast<CSVRender::TerrainShapeMode*>(mWorldspaceWidget->getEditMode());
+    if (!terrainMode)
+    {
+        Log(Debug::Verbose) << "Can't update terrain selection in current EditMode";
+        return;
+    }
+
+    terrainMode->getTerrainSelection()->update();
 }
diff --git a/apps/opencs/view/render/commands.hpp b/apps/opencs/view/render/commands.hpp
index cdc389e33a..62b7fbfdcd 100644
--- a/apps/opencs/view/render/commands.hpp
+++ b/apps/opencs/view/render/commands.hpp
@@ -1,8 +1,12 @@
 #ifndef CSV_RENDER_COMMANDS_HPP
 #define CSV_RENDER_COMMANDS_HPP
 
+#include <QPointer>
+
 #include <QUndoCommand>
 
+#include "worldspacewidget.hpp"
+
 namespace CSVRender
 {
     class TerrainSelection;
@@ -21,14 +25,17 @@ namespace CSVRender
     */
     class DrawTerrainSelectionCommand : public QUndoCommand
     {
+
     private:
-        TerrainSelection& mTerrainSelection;
+        QPointer<WorldspaceWidget> mWorldspaceWidget;
 
     public:
-        DrawTerrainSelectionCommand(TerrainSelection& terrainSelection, QUndoCommand* parent = nullptr);
+        DrawTerrainSelectionCommand(WorldspaceWidget* worldspaceWidget, QUndoCommand* parent = nullptr);
 
         void redo() override;
         void undo() override;
+
+        void tryUpdate();
     };
 }
 
diff --git a/apps/opencs/view/render/terrainshapemode.cpp b/apps/opencs/view/render/terrainshapemode.cpp
index 866ff69cde..0504944954 100644
--- a/apps/opencs/view/render/terrainshapemode.cpp
+++ b/apps/opencs/view/render/terrainshapemode.cpp
@@ -287,7 +287,7 @@ void CSVRender::TerrainShapeMode::applyTerrainEditChanges()
     undoStack.beginMacro ("Edit shape and normal records");
 
     // One command at the beginning of the macro for redrawing the terrain-selection grid when undoing the changes.
-    undoStack.push(new DrawTerrainSelectionCommand(*mTerrainShapeSelection));
+    undoStack.push(new DrawTerrainSelectionCommand(&getWorldspaceWidget()));
 
     for(CSMWorld::CellCoordinates cellCoordinates: mAlteredCells)
     {
@@ -358,7 +358,7 @@ void CSVRender::TerrainShapeMode::applyTerrainEditChanges()
         pushNormalsEditToCommand(landNormalsNew, document, landTable, cellId);
     }
     // One command at the end of the macro for redrawing the terrain-selection grid when redoing the changes.
-    undoStack.push(new DrawTerrainSelectionCommand(*mTerrainShapeSelection));
+    undoStack.push(new DrawTerrainSelectionCommand(&getWorldspaceWidget()));
 
     undoStack.endMacro();
     clearTransientEdits();
@@ -1049,7 +1049,7 @@ void CSVRender::TerrainShapeMode::handleSelection(int globalSelectionX, int glob
         */
         if (xIsAtCellBorder && yIsAtCellBorder)
         {
-            /* 
+            /*
                 Handle the NW, NE, and SE corner vertices.
                 NW corner: (+1, -1) offset to reach current cell.
                 NE corner: (-1, -1) offset to reach current cell.
@@ -1132,7 +1132,7 @@ void CSVRender::TerrainShapeMode::selectTerrainShapes(const std::pair<int, int>&
         selectAction = CSMPrefs::get()["3D Scene Editing"]["primary-select-action"].toString();
     else
         selectAction = CSMPrefs::get()["3D Scene Editing"]["secondary-select-action"].toString();
-        
+
     if (selectAction == "Select only")
         mTerrainShapeSelection->onlySelect(selections);
     else if (selectAction == "Add to selection")
@@ -1444,6 +1444,11 @@ void CSVRender::TerrainShapeMode::mouseMoveEvent (QMouseEvent *event)
         mBrushDraw->hide();
 }
 
+std::shared_ptr<CSVRender::TerrainSelection> CSVRender::TerrainShapeMode::getTerrainSelection()
+{
+    return mTerrainShapeSelection;
+}
+
 void CSVRender::TerrainShapeMode::setBrushSize(int brushSize)
 {
     mBrushSize = brushSize;
diff --git a/apps/opencs/view/render/terrainshapemode.hpp b/apps/opencs/view/render/terrainshapemode.hpp
index a88e60c9c4..abc4b8aba8 100644
--- a/apps/opencs/view/render/terrainshapemode.hpp
+++ b/apps/opencs/view/render/terrainshapemode.hpp
@@ -92,6 +92,8 @@ namespace CSVRender
             void dragMoveEvent (QDragMoveEvent *event) override;
             void mouseMoveEvent (QMouseEvent *event) override;
 
+            std::shared_ptr<TerrainSelection> getTerrainSelection();
+
         private:
 
             /// Remove duplicates and sort mAlteredCells, then limitAlteredHeights forward and reverse
@@ -176,7 +178,7 @@ namespace CSVRender
             int mDragMode = InteractionType_None;
             osg::Group* mParentNode;
             bool mIsEditing = false;
-            std::unique_ptr<TerrainSelection> mTerrainShapeSelection;
+            std::shared_ptr<TerrainSelection> mTerrainShapeSelection;
             int mTotalDiffY = 0;
             std::vector<CSMWorld::CellCoordinates> mAlteredCells;
             osg::Vec3d mEditingPos;
diff --git a/apps/opencs/view/render/terraintexturemode.cpp b/apps/opencs/view/render/terraintexturemode.cpp
index 4e267e9426..dfcc29ae01 100644
--- a/apps/opencs/view/render/terraintexturemode.cpp
+++ b/apps/opencs/view/render/terraintexturemode.cpp
@@ -712,6 +712,11 @@ void CSVRender::TerrainTextureMode::mouseMoveEvent (QMouseEvent *event)
         mBrushDraw->hide();
 }
 
+std::shared_ptr<CSVRender::TerrainSelection> CSVRender::TerrainTextureMode::getTerrainSelection()
+{
+    return mTerrainTextureSelection;
+}
+
 
 void CSVRender::TerrainTextureMode::setBrushSize(int brushSize)
 {
diff --git a/apps/opencs/view/render/terraintexturemode.hpp b/apps/opencs/view/render/terraintexturemode.hpp
index 31932df217..e0c6e4b40f 100644
--- a/apps/opencs/view/render/terraintexturemode.hpp
+++ b/apps/opencs/view/render/terraintexturemode.hpp
@@ -85,6 +85,8 @@ namespace CSVRender
 
             void mouseMoveEvent (QMouseEvent *event) override;
 
+            std::shared_ptr<TerrainSelection> getTerrainSelection();
+
         private:
             /// \brief Handle brush mechanics, maths regarding worldspace hit etc.
             void editTerrainTextureGrid (const WorldspaceHitResult& hit);
@@ -115,7 +117,7 @@ namespace CSVRender
             int mDragMode;
             osg::Group* mParentNode;
             bool mIsEditing;
-            std::unique_ptr<TerrainSelection> mTerrainTextureSelection;
+            std::shared_ptr<TerrainSelection> mTerrainTextureSelection;
 
             const int cellSize {ESM::Land::REAL_SIZE};
             const int landTextureSize {ESM::Land::LAND_TEXTURE_SIZE};
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index b14b7953ab..c51479f897 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -452,6 +452,11 @@ CSVRender::WorldspaceHitResult CSVRender::WorldspaceWidget::mousePick (const QPo
     return hit;
 }
 
+CSVRender::EditMode *CSVRender::WorldspaceWidget::getEditMode()
+{
+    return dynamic_cast<CSVRender::EditMode *> (mEditMode->getCurrent());
+}
+
 void CSVRender::WorldspaceWidget::abortDrag()
 {
     if (mDragging)
@@ -697,11 +702,6 @@ void CSVRender::WorldspaceWidget::handleInteractionPress (const WorldspaceHitRes
         editMode.primaryOpenPressed (hit);
 }
 
-CSVRender::EditMode *CSVRender::WorldspaceWidget::getEditMode()
-{
-    return dynamic_cast<CSVRender::EditMode *> (mEditMode->getCurrent());
-}
-
 void CSVRender::WorldspaceWidget::primaryOpen(bool activate)
 {
     handleInteraction(InteractionType_PrimaryOpen, activate);
diff --git a/apps/opencs/view/render/worldspacewidget.hpp b/apps/opencs/view/render/worldspacewidget.hpp
index 5e224b3803..cf244ce712 100644
--- a/apps/opencs/view/render/worldspacewidget.hpp
+++ b/apps/opencs/view/render/worldspacewidget.hpp
@@ -189,6 +189,8 @@ namespace CSVRender
             /// Erase all overrides and restore the visual representation to its true state.
             virtual void reset (unsigned int elementMask) = 0;
 
+            EditMode *getEditMode();
+
         protected:
 
             /// Visual elements in a scene
@@ -215,8 +217,6 @@ namespace CSVRender
 
             void settingChanged (const CSMPrefs::Setting *setting) override;
 
-            EditMode *getEditMode();
-
             bool getSpeedMode();
 
         private:

From 45549da0f5d9e0414ad293a9f5d62350c22e6599 Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Tue, 10 Aug 2021 11:47:58 +0300
Subject: [PATCH 1244/2859] For most commands, set mOld in redo, not in
 constructor

---
 apps/opencs/model/world/commands.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/opencs/model/world/commands.cpp b/apps/opencs/model/world/commands.cpp
index 7c5bafb52f..a8410b1304 100644
--- a/apps/opencs/model/world/commands.cpp
+++ b/apps/opencs/model/world/commands.cpp
@@ -24,11 +24,11 @@ CSMWorld::TouchCommand::TouchCommand(IdTable& table, const std::string& id, QUnd
     , mChanged(false)
 {
     setText(("Touch " + mId).c_str());
-    mOld.reset(mTable.getRecord(mId).clone().get());
 }
 
 void CSMWorld::TouchCommand::redo()
 {
+    mOld.reset(mTable.getRecord(mId).clone().get());
     mChanged = mTable.touchRecord(mId);
 }
 
@@ -159,7 +159,6 @@ CSMWorld::TouchLandCommand::TouchLandCommand(IdTable& landTable, IdTable& ltexTa
     , mChanged(false)
 {
     setText(("Touch " + mId).c_str());
-    mOld.reset(mLands.getRecord(mId).clone().get());
 }
 
 const std::string& CSMWorld::TouchLandCommand::getOriginId() const
@@ -174,6 +173,7 @@ const std::string& CSMWorld::TouchLandCommand::getDestinationId() const
 
 void CSMWorld::TouchLandCommand::onRedo()
 {
+    mOld.reset(mLands.getRecord(mId).clone().get());
     mChanged = mLands.touchRecord(mId);
 }
 
@@ -291,11 +291,9 @@ void CSMWorld::CreateCommand::undo()
 }
 
 CSMWorld::RevertCommand::RevertCommand (IdTable& model, const std::string& id, QUndoCommand* parent)
-: QUndoCommand (parent), mModel (model), mId (id)
+: QUndoCommand (parent), mModel (model), mId (id), mOld(nullptr)
 {
     setText (("Revert record " + id).c_str());
-
-    mOld = model.getRecord (id).clone();
 }
 
 CSMWorld::RevertCommand::~RevertCommand()
@@ -304,6 +302,8 @@ CSMWorld::RevertCommand::~RevertCommand()
 
 void CSMWorld::RevertCommand::redo()
 {
+    mOld = mModel.getRecord (mId).clone();
+
     int column = mModel.findColumnIndex (Columns::ColumnId_Modification);
 
     QModelIndex index = mModel.getModelIndex (mId, column);
@@ -326,11 +326,9 @@ void CSMWorld::RevertCommand::undo()
 
 CSMWorld::DeleteCommand::DeleteCommand (IdTable& model,
         const std::string& id, CSMWorld::UniversalId::Type type, QUndoCommand* parent)
-: QUndoCommand (parent), mModel (model), mId (id), mType(type)
+: QUndoCommand (parent), mModel (model), mId (id), mOld(nullptr), mType(type)
 {
     setText (("Delete record " + id).c_str());
-
-    mOld = model.getRecord (id).clone();
 }
 
 CSMWorld::DeleteCommand::~DeleteCommand()
@@ -339,6 +337,8 @@ CSMWorld::DeleteCommand::~DeleteCommand()
 
 void CSMWorld::DeleteCommand::redo()
 {
+    mOld = mModel.getRecord (mId).clone();
+
     int column = mModel.findColumnIndex (Columns::ColumnId_Modification);
 
     QModelIndex index = mModel.getModelIndex (mId, column);

From b2fe5915900c0435354fa3920f5c1ca845936a3d Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Thu, 12 Aug 2021 15:24:00 +0300
Subject: [PATCH 1245/2859] Don't do any storing in the constructor

---
 apps/opencs/model/world/commands.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/opencs/model/world/commands.cpp b/apps/opencs/model/world/commands.cpp
index a8410b1304..cdb4663390 100644
--- a/apps/opencs/model/world/commands.cpp
+++ b/apps/opencs/model/world/commands.cpp
@@ -190,10 +190,14 @@ CSMWorld::ModifyCommand::ModifyCommand (QAbstractItemModel& model, const QModelI
                                         const QVariant& new_, QUndoCommand* parent)
     : QUndoCommand (parent), mModel (&model), mIndex (index), mNew (new_), mHasRecordState(false), mOldRecordState(CSMWorld::RecordBase::State_BaseOnly)
 {
-    if (QAbstractProxyModel *proxy = dynamic_cast<QAbstractProxyModel *> (&model))
+}
+
+void CSMWorld::ModifyCommand::redo()
+{
+    if (QAbstractProxyModel *proxy = dynamic_cast<QAbstractProxyModel *> (mModel))
     {
         // Replace proxy with actual model
-        mIndex = proxy->mapToSource (index);
+        mIndex = proxy->mapToSource (mIndex);
         mModel = proxy->sourceModel();
     }
 
@@ -223,10 +227,7 @@ CSMWorld::ModifyCommand::ModifyCommand (QAbstractItemModel& model, const QModelI
         mRecordStateIndex = table->index(rowIndex, stateColumnIndex);
         mOldRecordState = static_cast<CSMWorld::RecordBase::State>(table->data(mRecordStateIndex).toInt());
     }
-}
 
-void CSMWorld::ModifyCommand::redo()
-{
     mOld = mModel->data (mIndex, Qt::EditRole);
     mModel->setData (mIndex, mNew);
 }

From 11ec96e1e76eb7d54ff58a2d4887e3b0932396d6 Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Thu, 12 Aug 2021 22:35:19 +0300
Subject: [PATCH 1246/2859] Add changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e61acf9568..17337f7346 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
     Bug #3846: Strings starting with "-" fail to compile if not enclosed in quotes
     Bug #3905: Great House Dagoth issues
     Bug #4203: Resurrecting an actor should close the loot GUI
+    Bug #4700: Editor: Incorrect command implementation
     Bug #4744: Invisible particles must still be processed
     Bug #4752: UpdateCellCommand doesn't undo properly
     Bug #5100: Persuasion doesn't always clamp the resulting disposition

From 0cfabd6f3b49ed90373975289acf48e15ce83bb5 Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Sat, 21 Aug 2021 13:42:55 +0300
Subject: [PATCH 1247/2859] Move mapToSource back to constructor

---
 apps/opencs/model/world/commands.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/opencs/model/world/commands.cpp b/apps/opencs/model/world/commands.cpp
index cdb4663390..12c8fa767f 100644
--- a/apps/opencs/model/world/commands.cpp
+++ b/apps/opencs/model/world/commands.cpp
@@ -189,10 +189,6 @@ void CSMWorld::TouchLandCommand::onUndo()
 CSMWorld::ModifyCommand::ModifyCommand (QAbstractItemModel& model, const QModelIndex& index,
                                         const QVariant& new_, QUndoCommand* parent)
     : QUndoCommand (parent), mModel (&model), mIndex (index), mNew (new_), mHasRecordState(false), mOldRecordState(CSMWorld::RecordBase::State_BaseOnly)
-{
-}
-
-void CSMWorld::ModifyCommand::redo()
 {
     if (QAbstractProxyModel *proxy = dynamic_cast<QAbstractProxyModel *> (mModel))
     {
@@ -200,7 +196,10 @@ void CSMWorld::ModifyCommand::redo()
         mIndex = proxy->mapToSource (mIndex);
         mModel = proxy->sourceModel();
     }
+}
 
+void CSMWorld::ModifyCommand::redo()
+{
     if (mIndex.parent().isValid())
     {
         CSMWorld::IdTree* tree = &dynamic_cast<CSMWorld::IdTree&>(*mModel);

From 890ce1eefbb33d38a478eb49fc17a5eb4efa21a4 Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Sat, 21 Aug 2021 14:14:00 +0300
Subject: [PATCH 1248/2859] Reverse action order for redo and undo

---
 apps/opencs/model/world/commands.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/model/world/commands.cpp b/apps/opencs/model/world/commands.cpp
index 12c8fa767f..c7b62312ca 100644
--- a/apps/opencs/model/world/commands.cpp
+++ b/apps/opencs/model/world/commands.cpp
@@ -498,8 +498,8 @@ CSMWorld::DeleteNestedCommand::DeleteNestedCommand (IdTree& model,
 void CSMWorld::DeleteNestedCommand::redo()
 {
     QModelIndex parentIndex = mModel.getModelIndex(mId, mParentColumn);
-    mModel.removeRows (mNestedRow, 1, parentIndex);
     mModifyParentCommand->redo();
+    mModel.removeRows (mNestedRow, 1, parentIndex);
 }
 
 
@@ -529,8 +529,8 @@ CSMWorld::AddNestedCommand::AddNestedCommand(IdTree& model, const std::string& i
 void CSMWorld::AddNestedCommand::redo()
 {
     QModelIndex parentIndex = mModel.getModelIndex(mId, mParentColumn);
-    mModel.addNestedRow (parentIndex, mNewRow);
     mModifyParentCommand->redo();
+    mModel.addNestedRow (parentIndex, mNewRow);
 }
 
 void CSMWorld::AddNestedCommand::undo()

From de3497d2911fbcfc5b0a01c823f19955f1b10e39 Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Sun, 22 Aug 2021 23:41:46 +0300
Subject: [PATCH 1249/2859] Fix undo-redo crash

---
 apps/opencs/model/world/commands.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/opencs/model/world/commands.cpp b/apps/opencs/model/world/commands.cpp
index c7b62312ca..a264ebef7f 100644
--- a/apps/opencs/model/world/commands.cpp
+++ b/apps/opencs/model/world/commands.cpp
@@ -173,8 +173,8 @@ const std::string& CSMWorld::TouchLandCommand::getDestinationId() const
 
 void CSMWorld::TouchLandCommand::onRedo()
 {
-    mOld.reset(mLands.getRecord(mId).clone().get());
     mChanged = mLands.touchRecord(mId);
+    if (mChanged) mOld.reset(mLands.getRecord(mId).clone().get());
 }
 
 void CSMWorld::TouchLandCommand::onUndo()

From 42ce22f568526153a24bd6ebaa6f27e62f6e335c Mon Sep 17 00:00:00 2001
From: Thunderforge <wjherrmann@gmail.com>
Date: Mon, 23 Aug 2021 18:31:52 -0500
Subject: [PATCH 1250/2859] Adding saveSettingInt() and loadSettingInt()

Convenience methods for saving and loading integer settings. Versions for QSpinBox and QComboBox are included. Right now, only simple settings are used for it; we have some additional settings that include validation that aren't using these new methods.
---
 apps/launcher/advancedpage.cpp | 46 +++++++++++++++++++++++-----------
 apps/launcher/advancedpage.hpp |  8 ++++--
 2 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index 2c33992ac3..97c2870b30 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -207,7 +207,7 @@ bool Launcher::AdvancedPage::loadSettings()
     {
         // Saves
         loadSettingBool(timePlayedCheckbox, "timeplayed", "Saves");
-        maximumQuicksavesComboBox->setValue(Settings::Manager::getInt("max quicksaves", "Saves"));
+        loadSettingInt(maximumQuicksavesComboBox,"max quicksaves", "Saves");
 
         // Other Settings
         QString screenshotFormatString = QString::fromStdString(Settings::Manager::getString("screenshot format", "General")).toUpper();
@@ -252,14 +252,10 @@ void Launcher::AdvancedPage::saveSettings()
         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);
+        saveSettingInt(unarmedFactorsStrengthComboBox, "strength influences hand to hand", "Game");
         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);
+        saveSettingInt(physicsThreadsSpinBox, "async num threads", "Physics");
     }
 
     // Visuals
@@ -349,9 +345,7 @@ void Launcher::AdvancedPage::saveSettings()
         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);
+        saveSettingInt(showOwnedComboBox,"show owned", "Game");
         saveSettingBool(stretchBackgroundCheckBox, "stretch menu background", "GUI");
         saveSettingBool(useZoomOnMapCheckBox, "allow zooming", "Map");
         saveSettingBool(graphicHerbalismCheckBox, "graphic herbalism", "Game");
@@ -370,11 +364,7 @@ void Launcher::AdvancedPage::saveSettings()
     {
         // 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);
-        }
+        saveSettingInt(maximumQuicksavesComboBox, "max quicksaves", "Saves");
 
         // Other Settings
         std::string screenshotFormatString = screenshotFormatComboBox->currentText().toLower().toStdString();
@@ -416,6 +406,32 @@ void Launcher::AdvancedPage::saveSettingBool(QCheckBox *checkbox, const std::str
         Settings::Manager::setBool(setting, group, cValue);
 }
 
+void Launcher::AdvancedPage::loadSettingInt(QComboBox *comboBox, const std::string &setting, const std::string &group)
+{
+    int currentIndex = Settings::Manager::getInt(setting, group);
+    comboBox->setCurrentIndex(currentIndex);
+}
+
+void Launcher::AdvancedPage::saveSettingInt(QComboBox *comboBox, const std::string &setting, const std::string &group)
+{
+    int currentIndex = comboBox->currentIndex();
+    if (currentIndex != Settings::Manager::getInt(setting, group))
+        Settings::Manager::setInt(setting, group, currentIndex);
+}
+
+void Launcher::AdvancedPage::loadSettingInt(QSpinBox *spinBox, const std::string &setting, const std::string &group)
+{
+    int value = Settings::Manager::getInt(setting, group);
+    spinBox->setValue(value);
+}
+
+void Launcher::AdvancedPage::saveSettingInt(QSpinBox *spinBox, const std::string &setting, const std::string &group)
+{
+    int value = spinBox->value();
+    if (value != Settings::Manager::getInt(setting, group))
+        Settings::Manager::setInt(setting, group, value);
+}
+
 void Launcher::AdvancedPage::slotLoadedCellsChanged(QStringList cellNames)
 {
     loadCellsForAutocomplete(cellNames);
diff --git a/apps/launcher/advancedpage.hpp b/apps/launcher/advancedpage.hpp
index 9685dcefeb..1d16fae706 100644
--- a/apps/launcher/advancedpage.hpp
+++ b/apps/launcher/advancedpage.hpp
@@ -41,8 +41,12 @@ namespace Launcher
          * @param filePaths the file paths of the content files to be examined
          */
         void loadCellsForAutocomplete(QStringList filePaths);
-        void loadSettingBool(QCheckBox *checkbox, const std::string& setting, const std::string& group);
-        void saveSettingBool(QCheckBox *checkbox, const std::string& setting, const std::string& group);
+        static void loadSettingBool(QCheckBox *checkbox, const std::string& setting, const std::string& group);
+        static void saveSettingBool(QCheckBox *checkbox, const std::string& setting, const std::string& group);
+        static void loadSettingInt(QComboBox *comboBox, const std::string& setting, const std::string& group);
+        static void saveSettingInt(QComboBox *comboBox, const std::string& setting, const std::string& group);
+        static void loadSettingInt(QSpinBox *spinBox, const std::string& setting, const std::string& group);
+        static void saveSettingInt(QSpinBox *spinBox, const std::string& setting, const std::string& group);
     };
 }
 #endif

From ee63ee9d93e4a044069446d71cbd666300784b5a Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 25 Aug 2021 18:34:42 +0200
Subject: [PATCH 1251/2859] Fix coverity warning

CID 332936 (#1 of 1): Result is not floating-point (UNINTENDED_INTEGER_DIVISION)
integer_division: Dividing integer expressions size and 2, and then converting
the integer quotient to type float. Any remainder, or fractional part of the
quotient, is ignored.
---
 components/detournavigator/recastmeshbuilder.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/detournavigator/recastmeshbuilder.cpp b/components/detournavigator/recastmeshbuilder.cpp
index 6ee16cdc6c..19125e0a9b 100644
--- a/components/detournavigator/recastmeshbuilder.cpp
+++ b/components/detournavigator/recastmeshbuilder.cpp
@@ -36,7 +36,7 @@ namespace DetourNavigator
 
         TileBounds maxCellTileBounds(int size, const osg::Vec3f& shift)
         {
-            const float halfCellSize = size / 2;
+            const float halfCellSize = static_cast<float>(size) / 2;
             return TileBounds {
                 osg::Vec2f(shift.x() - halfCellSize, shift.y() - halfCellSize),
                 osg::Vec2f(shift.x() + halfCellSize, shift.y() + halfCellSize)

From 7227a83e60153cd05e9d4ef299a4f0ddd8d3d0c7 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Sun, 25 Jul 2021 19:53:41 +1000
Subject: [PATCH 1252/2859] Preserve "blocked" record flags when saving with
 OpenCS.  This will help outputs of OpenCS to be used with vanilla Morrowind.

Sample use case: users are using the Morrowind Code Patch feature that allows modders to enable this flag to differentiate editor-made potions from player crafted potions for tooltips.
---
 apps/opencs/model/doc/savingstages.hpp | 2 +-
 components/esm/debugprofile.cpp        | 1 +
 components/esm/debugprofile.hpp        | 1 +
 components/esm/filter.cpp              | 1 +
 components/esm/filter.hpp              | 1 +
 components/esm/loadbody.cpp            | 1 +
 components/esm/loadbody.hpp            | 1 +
 components/esm/loadbsgn.cpp            | 1 +
 components/esm/loadbsgn.hpp            | 1 +
 components/esm/loadclas.cpp            | 1 +
 components/esm/loadclas.hpp            | 1 +
 components/esm/loadench.cpp            | 1 +
 components/esm/loadench.hpp            | 1 +
 components/esm/loadfact.cpp            | 1 +
 components/esm/loadfact.hpp            | 1 +
 components/esm/loadglob.cpp            | 1 +
 components/esm/loadglob.hpp            | 1 +
 components/esm/loadgmst.cpp            | 1 +
 components/esm/loadgmst.hpp            | 1 +
 components/esm/loadmgef.cpp            | 1 +
 components/esm/loadmgef.hpp            | 1 +
 components/esm/loadrace.cpp            | 1 +
 components/esm/loadrace.hpp            | 1 +
 components/esm/loadregn.cpp            | 1 +
 components/esm/loadregn.hpp            | 1 +
 components/esm/loadscpt.cpp            | 1 +
 components/esm/loadscpt.hpp            | 1 +
 components/esm/loadskil.cpp            | 1 +
 components/esm/loadskil.hpp            | 1 +
 components/esm/loadsndg.cpp            | 1 +
 components/esm/loadsndg.hpp            | 1 +
 components/esm/loadsoun.cpp            | 1 +
 components/esm/loadsoun.hpp            | 1 +
 components/esm/loadspel.cpp            | 1 +
 components/esm/loadspel.hpp            | 1 +
 components/esm/loadsscr.cpp            | 1 +
 components/esm/loadsscr.hpp            | 1 +
 37 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/apps/opencs/model/doc/savingstages.hpp b/apps/opencs/model/doc/savingstages.hpp
index d59a1efe5e..9ccd1772e1 100644
--- a/apps/opencs/model/doc/savingstages.hpp
+++ b/apps/opencs/model/doc/savingstages.hpp
@@ -108,7 +108,7 @@ namespace CSMDoc
             state == CSMWorld::RecordBase::State_ModifiedOnly ||
             state == CSMWorld::RecordBase::State_Deleted)
         {
-            writer.startRecord (record.sRecordId);
+            writer.startRecord (record.sRecordId, record.mRecordFlags);
             record.save (writer, state == CSMWorld::RecordBase::State_Deleted);
             writer.endRecord (record.sRecordId);
         }
diff --git a/components/esm/debugprofile.cpp b/components/esm/debugprofile.cpp
index 1dcf661fc9..6276258c48 100644
--- a/components/esm/debugprofile.cpp
+++ b/components/esm/debugprofile.cpp
@@ -9,6 +9,7 @@ unsigned int ESM::DebugProfile::sRecordId = REC_DBGP;
 void ESM::DebugProfile::load (ESMReader& esm, bool &isDeleted)
 {
     isDeleted = false;
+    mRecordFlags = esm.getRecordFlags();
 
     while (esm.hasMoreSubs())
     {
diff --git a/components/esm/debugprofile.hpp b/components/esm/debugprofile.hpp
index c056750a88..8340404c23 100644
--- a/components/esm/debugprofile.hpp
+++ b/components/esm/debugprofile.hpp
@@ -19,6 +19,7 @@ namespace ESM
             Flag_Global = 4         // make available from main menu (i.e. not location specific)
         };
 
+        unsigned int mRecordFlags;
         std::string mId;
 
         std::string mDescription;
diff --git a/components/esm/filter.cpp b/components/esm/filter.cpp
index 5bae1ed03e..8d1b755055 100644
--- a/components/esm/filter.cpp
+++ b/components/esm/filter.cpp
@@ -9,6 +9,7 @@ unsigned int ESM::Filter::sRecordId = REC_FILT;
 void ESM::Filter::load (ESMReader& esm, bool &isDeleted)
 {
     isDeleted = false;
+    mRecordFlags = esm.getRecordFlags();
 
     while (esm.hasMoreSubs())
     {
diff --git a/components/esm/filter.hpp b/components/esm/filter.hpp
index b1c511ebba..78d51cec00 100644
--- a/components/esm/filter.hpp
+++ b/components/esm/filter.hpp
@@ -12,6 +12,7 @@ namespace ESM
     {
         static unsigned int sRecordId;
 
+        unsigned int mRecordFlags;
         std::string mId;
 
         std::string mDescription;
diff --git a/components/esm/loadbody.cpp b/components/esm/loadbody.cpp
index 4ddefc92c7..239cff7c8b 100644
--- a/components/esm/loadbody.cpp
+++ b/components/esm/loadbody.cpp
@@ -11,6 +11,7 @@ namespace ESM
     void BodyPart::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
+        mRecordFlags = esm.getRecordFlags();
 
         bool hasName = false;
         bool hasData = false;
diff --git a/components/esm/loadbody.hpp b/components/esm/loadbody.hpp
index bf320330ff..1be775ffec 100644
--- a/components/esm/loadbody.hpp
+++ b/components/esm/loadbody.hpp
@@ -58,6 +58,7 @@ struct BodyPart
     };
 
     BYDTstruct mData;
+    unsigned int mRecordFlags;
     std::string mId, mModel, mRace;
 
     void load(ESMReader &esm, bool &isDeleted);
diff --git a/components/esm/loadbsgn.cpp b/components/esm/loadbsgn.cpp
index 1f679af39a..7514f1f85b 100644
--- a/components/esm/loadbsgn.cpp
+++ b/components/esm/loadbsgn.cpp
@@ -11,6 +11,7 @@ namespace ESM
     void BirthSign::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
+        mRecordFlags = esm.getRecordFlags();
 
         mPowers.mList.clear();
 
diff --git a/components/esm/loadbsgn.hpp b/components/esm/loadbsgn.hpp
index 24d27a7f85..806323bf35 100644
--- a/components/esm/loadbsgn.hpp
+++ b/components/esm/loadbsgn.hpp
@@ -17,6 +17,7 @@ struct BirthSign
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string getRecordType() { return "BirthSign"; }
 
+    unsigned int mRecordFlags;
     std::string mId, mName, mDescription, mTexture;
 
     // List of powers and abilities that come with this birth sign.
diff --git a/components/esm/loadclas.cpp b/components/esm/loadclas.cpp
index b76fc57067..7526fe4f52 100644
--- a/components/esm/loadclas.cpp
+++ b/components/esm/loadclas.cpp
@@ -41,6 +41,7 @@ namespace ESM
     void Class::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
+        mRecordFlags = esm.getRecordFlags();
 
         bool hasName = false;
         bool hasData = false;
diff --git a/components/esm/loadclas.hpp b/components/esm/loadclas.hpp
index 833dd6757d..1000879c4c 100644
--- a/components/esm/loadclas.hpp
+++ b/components/esm/loadclas.hpp
@@ -70,6 +70,7 @@ struct Class
         ///< Throws an exception for invalid values of \a index.
     }; // 60 bytes
 
+    unsigned int mRecordFlags;
     std::string mId, mName, mDescription;
     CLDTstruct mData;
 
diff --git a/components/esm/loadench.cpp b/components/esm/loadench.cpp
index 3c1a2f1eda..ed3de90b50 100644
--- a/components/esm/loadench.cpp
+++ b/components/esm/loadench.cpp
@@ -11,6 +11,7 @@ namespace ESM
     void Enchantment::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
+        mRecordFlags = esm.getRecordFlags();
         mEffects.mList.clear();
 
         bool hasName = false;
diff --git a/components/esm/loadench.hpp b/components/esm/loadench.hpp
index b98549ef35..a4e1e8362c 100644
--- a/components/esm/loadench.hpp
+++ b/components/esm/loadench.hpp
@@ -42,6 +42,7 @@ struct Enchantment
         int mFlags;
     };
 
+    unsigned int mRecordFlags;
     std::string mId;
     ENDTstruct mData;
     EffectList mEffects;
diff --git a/components/esm/loadfact.cpp b/components/esm/loadfact.cpp
index bd0962721b..b71348de44 100644
--- a/components/esm/loadfact.cpp
+++ b/components/esm/loadfact.cpp
@@ -29,6 +29,7 @@ namespace ESM
     void Faction::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
+        mRecordFlags = esm.getRecordFlags();
 
         mReactions.clear();
         for (int i=0;i<10;++i)
diff --git a/components/esm/loadfact.hpp b/components/esm/loadfact.hpp
index 098ed43096..6a42377901 100644
--- a/components/esm/loadfact.hpp
+++ b/components/esm/loadfact.hpp
@@ -34,6 +34,7 @@ struct Faction
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string getRecordType() { return "Faction"; }
 
+    unsigned int mRecordFlags;
     std::string mId, mName;
 
     struct FADTstruct
diff --git a/components/esm/loadglob.cpp b/components/esm/loadglob.cpp
index 72ecce503c..d2226d1738 100644
--- a/components/esm/loadglob.cpp
+++ b/components/esm/loadglob.cpp
@@ -11,6 +11,7 @@ namespace ESM
     void Global::load (ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
+        mRecordFlags = esm.getRecordFlags();
 
         mId = esm.getHNString ("NAME");
 
diff --git a/components/esm/loadglob.hpp b/components/esm/loadglob.hpp
index 0533cc95ea..9dd58e6c67 100644
--- a/components/esm/loadglob.hpp
+++ b/components/esm/loadglob.hpp
@@ -21,6 +21,7 @@ struct Global
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string getRecordType() { return "Global"; }
 
+    unsigned int mRecordFlags;
     std::string mId;
     Variant mValue;
 
diff --git a/components/esm/loadgmst.cpp b/components/esm/loadgmst.cpp
index da8d256e7d..6d4ac1b202 100644
--- a/components/esm/loadgmst.cpp
+++ b/components/esm/loadgmst.cpp
@@ -11,6 +11,7 @@ namespace ESM
     void GameSetting::load (ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false; // GameSetting record can't be deleted now (may be changed in the future)
+        mRecordFlags = esm.getRecordFlags();
 
         mId = esm.getHNString("NAME");
         mValue.read (esm, ESM::Variant::Format_Gmst);
diff --git a/components/esm/loadgmst.hpp b/components/esm/loadgmst.hpp
index c40d348fe4..931ee286a4 100644
--- a/components/esm/loadgmst.hpp
+++ b/components/esm/loadgmst.hpp
@@ -22,6 +22,7 @@ struct GameSetting
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string getRecordType() { return "GameSetting"; }
 
+    unsigned int mRecordFlags;
     std::string mId;
 
     Variant mValue;
diff --git a/components/esm/loadmgef.cpp b/components/esm/loadmgef.cpp
index 75a94f828a..4bc09920e9 100644
--- a/components/esm/loadmgef.cpp
+++ b/components/esm/loadmgef.cpp
@@ -189,6 +189,7 @@ namespace ESM
 void MagicEffect::load(ESMReader &esm, bool &isDeleted)
 {
     isDeleted = false; // MagicEffect record can't be deleted now (may be changed in the future)
+    mRecordFlags = esm.getRecordFlags();
 
     esm.getHNT(mIndex, "INDX");
 
diff --git a/components/esm/loadmgef.hpp b/components/esm/loadmgef.hpp
index d718aaccf5..480478d81e 100644
--- a/components/esm/loadmgef.hpp
+++ b/components/esm/loadmgef.hpp
@@ -16,6 +16,7 @@ struct MagicEffect
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string getRecordType() { return "MagicEffect"; }
 
+    unsigned int mRecordFlags;
     std::string mId;
 
     enum Flags
diff --git a/components/esm/loadrace.cpp b/components/esm/loadrace.cpp
index ce3cc95bf8..44dbde7742 100644
--- a/components/esm/loadrace.cpp
+++ b/components/esm/loadrace.cpp
@@ -21,6 +21,7 @@ namespace ESM
     void Race::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
+        mRecordFlags = esm.getRecordFlags();
 
         mPowers.mList.clear();
 
diff --git a/components/esm/loadrace.hpp b/components/esm/loadrace.hpp
index d014744472..50fa73ad74 100644
--- a/components/esm/loadrace.hpp
+++ b/components/esm/loadrace.hpp
@@ -65,6 +65,7 @@ struct Race
 
     RADTstruct mData;
 
+    unsigned int mRecordFlags;
     std::string mId, mName, mDescription;
     SpellList mPowers;
 
diff --git a/components/esm/loadregn.cpp b/components/esm/loadregn.cpp
index 91ea92e305..e39887a1b1 100644
--- a/components/esm/loadregn.cpp
+++ b/components/esm/loadregn.cpp
@@ -11,6 +11,7 @@ namespace ESM
     void Region::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
+        mRecordFlags = esm.getRecordFlags();
 
         bool hasName = false;
         while (esm.hasMoreSubs())
diff --git a/components/esm/loadregn.hpp b/components/esm/loadregn.hpp
index 6f39dc0bff..74f6b123ec 100644
--- a/components/esm/loadregn.hpp
+++ b/components/esm/loadregn.hpp
@@ -45,6 +45,7 @@ struct Region
     WEATstruct mData;
     int mMapColor; // RGBA
 
+    unsigned int mRecordFlags;
     // sleepList refers to a leveled list of creatures you can meet if
     // you sleep outside in this region.
     std::string mId, mName, mSleepList;
diff --git a/components/esm/loadscpt.cpp b/components/esm/loadscpt.cpp
index 19602fef62..8715c83dcb 100644
--- a/components/esm/loadscpt.cpp
+++ b/components/esm/loadscpt.cpp
@@ -83,6 +83,7 @@ namespace ESM
     void Script::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
+        mRecordFlags = esm.getRecordFlags();
 
         mVarNames.clear();
 
diff --git a/components/esm/loadscpt.hpp b/components/esm/loadscpt.hpp
index e1ffe1b864..d518a048ff 100644
--- a/components/esm/loadscpt.hpp
+++ b/components/esm/loadscpt.hpp
@@ -35,6 +35,7 @@ public:
         Script::SCHDstruct  mData;
     };
 
+    unsigned int mRecordFlags;
     std::string mId;
 
     SCHDstruct mData;
diff --git a/components/esm/loadskil.cpp b/components/esm/loadskil.cpp
index 61cca7d0d7..9f58176f35 100644
--- a/components/esm/loadskil.cpp
+++ b/components/esm/loadskil.cpp
@@ -130,6 +130,7 @@ namespace ESM
     void Skill::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false; // Skill record can't be deleted now (may be changed in the future)
+        mRecordFlags = esm.getRecordFlags();
 
         bool hasIndex = false;
         bool hasData = false;
diff --git a/components/esm/loadskil.hpp b/components/esm/loadskil.hpp
index 099264fab7..ae44a51045 100644
--- a/components/esm/loadskil.hpp
+++ b/components/esm/loadskil.hpp
@@ -22,6 +22,7 @@ struct Skill
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string getRecordType() { return "Skill"; }
 
+    unsigned int mRecordFlags;
     std::string mId;
 
   struct SKDTstruct
diff --git a/components/esm/loadsndg.cpp b/components/esm/loadsndg.cpp
index c6ea930a20..c439d0ca66 100644
--- a/components/esm/loadsndg.cpp
+++ b/components/esm/loadsndg.cpp
@@ -11,6 +11,7 @@ namespace ESM
     void SoundGenerator::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
+        mRecordFlags = esm.getRecordFlags();
 
         bool hasName = false;
         bool hasData = false;
diff --git a/components/esm/loadsndg.hpp b/components/esm/loadsndg.hpp
index 70b221e98c..99aae06e0e 100644
--- a/components/esm/loadsndg.hpp
+++ b/components/esm/loadsndg.hpp
@@ -34,6 +34,7 @@ struct SoundGenerator
     // Type
     int mType;
 
+    unsigned int mRecordFlags;
     std::string mId, mCreature, mSound;
 
     void load(ESMReader &esm, bool &isDeleted);
diff --git a/components/esm/loadsoun.cpp b/components/esm/loadsoun.cpp
index ccb5f6fdce..ed8fc519a6 100644
--- a/components/esm/loadsoun.cpp
+++ b/components/esm/loadsoun.cpp
@@ -11,6 +11,7 @@ namespace ESM
     void Sound::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
+        mRecordFlags = esm.getRecordFlags();
 
         bool hasName = false;
         bool hasData = false;
diff --git a/components/esm/loadsoun.hpp b/components/esm/loadsoun.hpp
index 937e22be88..14f1178650 100644
--- a/components/esm/loadsoun.hpp
+++ b/components/esm/loadsoun.hpp
@@ -21,6 +21,7 @@ struct Sound
     static std::string getRecordType() { return "Sound"; }
 
     SOUNstruct mData;
+    unsigned int mRecordFlags;
     std::string mId, mSound;
 
     void load(ESMReader &esm, bool &isDeleted);
diff --git a/components/esm/loadspel.cpp b/components/esm/loadspel.cpp
index 34e146501c..5983cdcdf5 100644
--- a/components/esm/loadspel.cpp
+++ b/components/esm/loadspel.cpp
@@ -11,6 +11,7 @@ namespace ESM
     void Spell::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
+        mRecordFlags = esm.getRecordFlags();
 
         mEffects.mList.clear();
 
diff --git a/components/esm/loadspel.hpp b/components/esm/loadspel.hpp
index 1763d0991c..ef74c2c312 100644
--- a/components/esm/loadspel.hpp
+++ b/components/esm/loadspel.hpp
@@ -42,6 +42,7 @@ struct Spell
     };
 
     SPDTstruct mData;
+    unsigned int mRecordFlags;
     std::string mId, mName;
     EffectList mEffects;
 
diff --git a/components/esm/loadsscr.cpp b/components/esm/loadsscr.cpp
index f436c32a1c..9e060ab1a7 100644
--- a/components/esm/loadsscr.cpp
+++ b/components/esm/loadsscr.cpp
@@ -11,6 +11,7 @@ namespace ESM
     void StartScript::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
+        mRecordFlags = esm.getRecordFlags();
 
         bool hasData = false;
         bool hasName = false;
diff --git a/components/esm/loadsscr.hpp b/components/esm/loadsscr.hpp
index ce2ff49e77..3e84027076 100644
--- a/components/esm/loadsscr.hpp
+++ b/components/esm/loadsscr.hpp
@@ -24,6 +24,7 @@ struct StartScript
     static std::string getRecordType() { return "StartScript"; }
 
     std::string mData;
+    unsigned int mRecordFlags;
     std::string mId;
 
     // Load a record and add it to the list

From 7264a10c072a9abdb9674de275848d5fd8b5109d Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Sat, 28 Aug 2021 09:49:45 +1000
Subject: [PATCH 1253/2859] Partially revert commit
 dab1a9e7fbf8c6926405dd09c64e6a309140f92a

---
 apps/opencs/model/doc/savingstages.cpp        |  3 +-
 apps/opencs/model/world/commanddispatcher.cpp | 73 +++++--------------
 2 files changed, 21 insertions(+), 55 deletions(-)

diff --git a/apps/opencs/model/doc/savingstages.cpp b/apps/opencs/model/doc/savingstages.cpp
index 9da2c2c144..a410d34b2a 100644
--- a/apps/opencs/model/doc/savingstages.cpp
+++ b/apps/opencs/model/doc/savingstages.cpp
@@ -285,8 +285,7 @@ void CSMDoc::WriteCellCollectionStage::writeReferences (const std::deque<int>& r
             {
                 refRecord.mRefNum.mIndex = newRefNum++;
             }
-
-            if ((refRecord.mOriginalCell.empty() ? refRecord.mCell : refRecord.mOriginalCell)
+            else if ((refRecord.mOriginalCell.empty() ? refRecord.mCell : refRecord.mOriginalCell)
                     != stream.str() && !interior)
             {
                 // An empty mOriginalCell is meant to indicate that it is the same as
diff --git a/apps/opencs/model/world/commanddispatcher.cpp b/apps/opencs/model/world/commanddispatcher.cpp
index 3da3e3d22c..36b3ba2e00 100644
--- a/apps/opencs/model/world/commanddispatcher.cpp
+++ b/apps/opencs/model/world/commanddispatcher.cpp
@@ -3,9 +3,6 @@
 #include <algorithm>
 #include <memory>
 
-#include <QAbstractItemModel>
-#include <QAbstractProxyModel>
-
 #include <components/misc/stringops.hpp>
 #include <components/misc/constants.hpp>
 
@@ -142,31 +139,13 @@ void CSMWorld::CommandDispatcher::executeModify (QAbstractItemModel *model, cons
     if (mLocked)
         return;
 
-    std::unique_ptr<CSMWorld::CloneCommand> clonedData;
-    std::unique_ptr<CSMWorld::DeleteCommand> deleteData;
-
-    std::string newId;
-
-    std::unique_ptr<CSMWorld::ModifyCommand> modifyData;
     std::unique_ptr<CSMWorld::UpdateCellCommand> modifyCell;
 
-    QAbstractItemModel* sourceModel = model;
-    if (IdTableProxyModel* proxy = dynamic_cast<IdTableProxyModel*> (model))
-        sourceModel = proxy->sourceModel();
-
-    CSMWorld::IdTable& table = dynamic_cast<CSMWorld::IdTable&>(*sourceModel); // for getId()
-    int stateColumn = table.findColumnIndex(Columns::ColumnId_Modification);
-    QModelIndex stateIndex = table.getModelIndex(table.getId(index.row()), stateColumn);
-    RecordBase::State state = static_cast<RecordBase::State> (sourceModel->data(stateIndex).toInt());
+    std::unique_ptr<CSMWorld::ModifyCommand> modifyDataRefNum;
 
     int columnId = model->data (index, ColumnBase::Role_ColumnId).toInt();
 
-    // This is not guaranteed to be the same as \a model, since a proxy could be used.
-    IdTable& model2 = dynamic_cast<IdTable&> (*mDocument.getData().getTableModel(mId));
-
-    // DeleteCommand triggers a signal to the whole row from IdTable::setData(), so ignore the second call
-    if (state != RecordBase::State_Deleted &&
-        (columnId==Columns::ColumnId_PositionXPos || columnId==Columns::ColumnId_PositionYPos))
+    if (columnId==Columns::ColumnId_PositionXPos || columnId==Columns::ColumnId_PositionYPos)
     {
         const float oldPosition = model->data (index).toFloat();
 
@@ -178,9 +157,12 @@ void CSMWorld::CommandDispatcher::executeModify (QAbstractItemModel *model, cons
 
             int row = proxy ? proxy->mapToSource (index).row() : index.row();
 
+            // This is not guaranteed to be the same as \a model, since a proxy could be used.
+            IdTable& model2 = dynamic_cast<IdTable&> (*mDocument.getData().getTableModel (mId));
+
             int cellColumn = model2.searchColumnIndex (Columns::ColumnId_Cell);
 
-            if (cellColumn != -1)
+            if (cellColumn!=-1)
             {
                 QModelIndex cellIndex = model2.index (row, cellColumn);
 
@@ -188,46 +170,31 @@ void CSMWorld::CommandDispatcher::executeModify (QAbstractItemModel *model, cons
 
                 if (cellId.find ('#')!=std::string::npos)
                 {
-                    RefCollection& collection = mDocument.getData().getReferences();
-                    newId = collection.getNewId();
+                    // Need to recalculate the cell and (if necessary) clear the instance's refNum
+                    modifyCell.reset (new UpdateCellCommand (model2, row));
 
-                    clonedData.reset(new CloneCommand(table,
-                                table.getId(row),
-                                newId,
-                                CSMWorld::UniversalId::Type_Reference));
+                    // Not sure which model this should be applied to
+                    int refNumColumn = model2.searchColumnIndex (Columns::ColumnId_RefNum);
 
-                    deleteData.reset(new DeleteCommand(table,
-                                table.getId(row),
-                                CSMWorld::UniversalId::Type_Reference));
+                    if (refNumColumn!=-1)
+                        modifyDataRefNum.reset (new ModifyCommand(*model, model->index(row, refNumColumn), 0));
                 }
             }
         }
     }
 
-    if (!clonedData.get())
-    {
-        // DeleteCommand will trigger executeModify after setting the state to State_Deleted
-        // from CommandDelegate::setModelDataImp() - ignore
-        if (state != RecordBase::State_Deleted)
-            modifyData.reset(new CSMWorld::ModifyCommand(*model, index, new_));
-    }
+    std::unique_ptr<CSMWorld::ModifyCommand> modifyData (
+        new CSMWorld::ModifyCommand (*model, index, new_));
 
-    if (clonedData.get())
+    if (modifyCell.get())
     {
         CommandMacro macro (mDocument.getUndoStack());
-        macro.push(clonedData.release());
-        macro.push(deleteData.release());
-
-        // cannot do these earlier because newIndex is not available until CloneCommand is executed
-        QModelIndex newIndex = model2.getModelIndex (newId, index.column());
-        modifyData.reset (new CSMWorld::ModifyCommand (*model, newIndex, new_));
-        macro.push(modifyData.release());
-
-        // once the data is updated update the cell location
-        modifyCell.reset(new UpdateCellCommand(model2, newIndex.row()));
-        macro.push(modifyCell.release());
+        macro.push (modifyData.release());
+        macro.push (modifyCell.release());
+        if (modifyDataRefNum.get())
+            macro.push (modifyDataRefNum.release());
     }
-    else if (!clonedData.get() && modifyData.get())
+    else
         mDocument.getUndoStack().push (modifyData.release());
 }
 

From b2bd97f283884cc446fa8fbb28df327b3a66b261 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Sat, 28 Aug 2021 14:09:55 +1000
Subject: [PATCH 1254/2859] A different implementation to MR 1051 to fix Issue
 #6067.

This MR doesn't delete the original record, but instead the original record is updated with the moved record when loading.

Issue #4752 is no longer addressed in this MR.
---
 CHANGELOG.md                              |  1 -
 apps/opencs/model/world/refcollection.cpp | 38 ++++++++++++++++++++++-
 apps/opencs/model/world/refcollection.hpp |  2 +-
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17337f7346..296f7d8d52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,6 @@
     Bug #4203: Resurrecting an actor should close the loot GUI
     Bug #4700: Editor: Incorrect command implementation
     Bug #4744: Invisible particles must still be processed
-    Bug #4752: UpdateCellCommand doesn't undo properly
     Bug #5100: Persuasion doesn't always clamp the resulting disposition
     Bug #5120: Scripted object spawning updates physics system
     Bug #5379: Wandering NPCs falling through cantons
diff --git a/apps/opencs/model/world/refcollection.cpp b/apps/opencs/model/world/refcollection.cpp
index 4782bde6b9..f70e9c9fa2 100644
--- a/apps/opencs/model/world/refcollection.cpp
+++ b/apps/opencs/model/world/refcollection.cpp
@@ -89,12 +89,48 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
         else
             ref.mCell = cell2.mId;
 
+        if (ref.mRefNum.mContentFile != -1 && !base)
+        {
+            ref.mRefNum.mContentFile = ref.mRefNum.mIndex >> 24;
+            ref.mRefNum.mIndex &= 0x00ffffff;
+        }
+
         unsigned int  refNum = (ref.mRefNum.mIndex & 0x00ffffff) |
             (ref.mRefNum.hasContentFile() ? ref.mRefNum.mContentFile : 0xff) << 24;
 
         std::map<unsigned int, unsigned int>::iterator iter = cache.find(refNum);
 
-        if (ref.mRefNum.mContentFile != -1 && !base) ref.mRefNum.mContentFile = ref.mRefNum.mIndex >> 24;
+        if (isMoved)
+        {
+            if (iter == cache.end())
+            {
+                CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Cell,
+                    mCells.getId(cellIndex));
+
+                messages.add(id, "Attempt to move a non-existent reference - RefNum index "
+                    + std::to_string(ref.mRefNum.mIndex) + ", refID " + ref.mRefID + ", content file index "
+                    + std::to_string(ref.mRefNum.mContentFile),
+                    /*hint*/"",
+                    CSMDoc::Message::Severity_Warning);
+                continue;
+            }
+
+            int index = getIntIndex(iter->second);
+
+            // ensure we have the same record id for setRecord()
+            ref.mId = getRecord(index).get().mId;
+            ref.mIdNum = extractIdNum(ref.mId);
+
+            std::unique_ptr<Record<CellRef> > record(new Record<CellRef>);
+            // TODO: check whether a base record be moved
+            record->mState = base ? RecordBase::State_BaseOnly : RecordBase::State_ModifiedOnly;
+            (base ? record->mBase : record->mModified) = std::move(ref);
+
+            // overwrite original record
+            setRecord(index, std::move(record));
+
+            continue; // NOTE: assumed moved references are not deleted at the same time
+        }
 
         if (isDeleted)
         {
diff --git a/apps/opencs/model/world/refcollection.hpp b/apps/opencs/model/world/refcollection.hpp
index e0e88d721f..2031d2be63 100644
--- a/apps/opencs/model/world/refcollection.hpp
+++ b/apps/opencs/model/world/refcollection.hpp
@@ -25,7 +25,7 @@ namespace CSMWorld
     class RefCollection : public Collection<CellRef>
     {
             Collection<Cell>& mCells;
-            std::map<unsigned int, int> mRefIndex;
+            std::map<unsigned int, int> mRefIndex; // CellRef index keyed by CSMWorld::CellRef::mIdNum
 
             int mNextId;
 

From 2eb210f31a29689393aeda67c1dc913ba31e499b Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Sat, 28 Aug 2021 14:33:47 +1000
Subject: [PATCH 1255/2859] Partially undo commit
 71be4cdd20657b616c772e1f074f157c65e24c45 so that moved references retain the
 original refnum.  This is consistent with vanilla CS's behaviour.

---
 apps/opencs/model/world/commanddispatcher.cpp | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/apps/opencs/model/world/commanddispatcher.cpp b/apps/opencs/model/world/commanddispatcher.cpp
index 36b3ba2e00..c5d78b6586 100644
--- a/apps/opencs/model/world/commanddispatcher.cpp
+++ b/apps/opencs/model/world/commanddispatcher.cpp
@@ -141,7 +141,6 @@ void CSMWorld::CommandDispatcher::executeModify (QAbstractItemModel *model, cons
 
     std::unique_ptr<CSMWorld::UpdateCellCommand> modifyCell;
 
-    std::unique_ptr<CSMWorld::ModifyCommand> modifyDataRefNum;
 
     int columnId = model->data (index, ColumnBase::Role_ColumnId).toInt();
 
@@ -170,14 +169,8 @@ void CSMWorld::CommandDispatcher::executeModify (QAbstractItemModel *model, cons
 
                 if (cellId.find ('#')!=std::string::npos)
                 {
-                    // Need to recalculate the cell and (if necessary) clear the instance's refNum
+                    // Need to recalculate the cell
                     modifyCell.reset (new UpdateCellCommand (model2, row));
-
-                    // Not sure which model this should be applied to
-                    int refNumColumn = model2.searchColumnIndex (Columns::ColumnId_RefNum);
-
-                    if (refNumColumn!=-1)
-                        modifyDataRefNum.reset (new ModifyCommand(*model, model->index(row, refNumColumn), 0));
                 }
             }
         }
@@ -191,8 +184,6 @@ void CSMWorld::CommandDispatcher::executeModify (QAbstractItemModel *model, cons
         CommandMacro macro (mDocument.getUndoStack());
         macro.push (modifyData.release());
         macro.push (modifyCell.release());
-        if (modifyDataRefNum.get())
-            macro.push (modifyDataRefNum.release());
     }
     else
         mDocument.getUndoStack().push (modifyData.release());

From b0d5ca386d043297aa6a1786b2a8610d34ab7cc9 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Sat, 28 Aug 2021 16:11:47 +1000
Subject: [PATCH 1256/2859] Update original cell column and do not modify the
 refnum when moving a reference to another cell with 3D editing.

---
 apps/opencs/view/render/object.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/apps/opencs/view/render/object.cpp b/apps/opencs/view/render/object.cpp
index d0e4dbe04a..789fad0587 100644
--- a/apps/opencs/view/render/object.cpp
+++ b/apps/opencs/view/render/object.cpp
@@ -682,18 +682,20 @@ void CSVRender::Object::apply (CSMWorld::CommandMacro& commands)
 
             int cellColumn = collection.findColumnIndex (static_cast<CSMWorld::Columns::ColumnId> (
                 CSMWorld::Columns::ColumnId_Cell));
-            int refNumColumn = collection.findColumnIndex (static_cast<CSMWorld::Columns::ColumnId> (
-                CSMWorld::Columns::ColumnId_RefNum));
+            int origCellColumn = collection.findColumnIndex(static_cast<CSMWorld::Columns::ColumnId> (
+                CSMWorld::Columns::ColumnId_OriginalCell));
 
             if (cellIndex != originalIndex)
             {
                 /// \todo figure out worldspace (not important until multiple worldspaces are supported)
+                std::string origCellId = CSMWorld::CellCoordinates(originalIndex).getId("");
                 std::string cellId = CSMWorld::CellCoordinates (cellIndex).getId ("");
 
                 commands.push (new CSMWorld::ModifyCommand (*model,
-                    model->index (recordIndex, cellColumn), QString::fromUtf8 (cellId.c_str())));
-                commands.push (new CSMWorld::ModifyCommand( *model,
-                    model->index (recordIndex, refNumColumn), 0));
+                    model->index (recordIndex, origCellColumn), QString::fromUtf8 (origCellId.c_str())));
+                commands.push(new CSMWorld::ModifyCommand(*model,
+                    model->index(recordIndex, cellColumn), QString::fromUtf8(cellId.c_str())));
+                // NOTE: refnum is not modified for moving a reference to another cell
             }
         }
 

From b4486992f02757b871a3a469c1ba0b04485803bd Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 28 Aug 2021 10:45:00 +0200
Subject: [PATCH 1257/2859] Allow Rieklings and Goblins to attack again

---
 apps/openmw/mwmechanics/character.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 62c130b36e..ed26e2b9a4 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -1653,7 +1653,7 @@ bool CharacterController::updateWeaponState(CharacterState& idle)
                                  MWRender::Animation::BlendMask_All, false,
                                  weapSpeed, startKey, stopKey,
                                  0.0f, 0);
-                if(mAnimation->isPlaying(mCurrentWeapon))
+                if(mAnimation->getCurrentTime(mCurrentWeapon) != -1.f)
                     mUpperBodyState = UpperCharState_StartToMinAttack;
             }
         }

From 0a5571f19ee88a6f2c3e4905dd46af59433771ba Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Sun, 29 Aug 2021 15:27:59 +1000
Subject: [PATCH 1258/2859] Disable editing for blocked records in both table
 and dialogue edit widget.

---
 apps/opencs/model/world/columns.cpp         |  1 +
 apps/opencs/model/world/columns.hpp         |  1 +
 apps/opencs/model/world/idtable.cpp         |  8 +++++++
 apps/opencs/model/world/refidadapterimp.hpp | 25 +++++++++++++++++++++
 apps/opencs/model/world/refidcollection.cpp |  7 ++++--
 apps/opencs/view/world/dialoguesubview.cpp  | 16 ++++++++++---
 6 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/apps/opencs/model/world/columns.cpp b/apps/opencs/model/world/columns.cpp
index cf04d96753..fc39fa8f7d 100644
--- a/apps/opencs/model/world/columns.cpp
+++ b/apps/opencs/model/world/columns.cpp
@@ -371,6 +371,7 @@ namespace CSMWorld
             { ColumnId_Skill7, "Skill 7" },
 
             { ColumnId_Persistent, "Persistent" },
+            { ColumnId_Blocked, "Blocked" },
 
             { -1, 0 } // end marker
         };
diff --git a/apps/opencs/model/world/columns.hpp b/apps/opencs/model/world/columns.hpp
index 16482d4898..8cf02b46ac 100644
--- a/apps/opencs/model/world/columns.hpp
+++ b/apps/opencs/model/world/columns.hpp
@@ -344,6 +344,7 @@ namespace CSMWorld
             ColumnId_FactionAttrib2 = 312,
 
             ColumnId_Persistent = 313,
+            ColumnId_Blocked = 314,
 
             // Allocated to a separate value range, so we don't get a collision should we ever need
             // to extend the number of use values.
diff --git a/apps/opencs/model/world/idtable.cpp b/apps/opencs/model/world/idtable.cpp
index 6d3882c015..5b4a9b31bc 100644
--- a/apps/opencs/model/world/idtable.cpp
+++ b/apps/opencs/model/world/idtable.cpp
@@ -123,6 +123,14 @@ Qt::ItemFlags CSMWorld::IdTable::flags (const QModelIndex & index) const
     if (mIdCollection->getColumn (index.column()).isUserEditable())
         flags |= Qt::ItemIsEditable;
 
+    int blockedColumn = searchColumnIndex(Columns::ColumnId_Blocked);
+    if (blockedColumn != -1 && blockedColumn != index.column())
+    {
+        bool isBlocked = mIdCollection->getData(index.row(), blockedColumn).toInt();
+        if (isBlocked)
+            flags = Qt::ItemIsSelectable; // not enabled (to grey out)
+    }
+
     return flags;
 }
 
diff --git a/apps/opencs/model/world/refidadapterimp.hpp b/apps/opencs/model/world/refidadapterimp.hpp
index 1d1b5a94a6..84fec5bed0 100644
--- a/apps/opencs/model/world/refidadapterimp.hpp
+++ b/apps/opencs/model/world/refidadapterimp.hpp
@@ -25,6 +25,9 @@ namespace CSMWorld
         const RefIdColumn *mId;
         const RefIdColumn *mModified;
         const RefIdColumn *mType;
+        const RefIdColumn *mBlocked;
+
+        BaseColumns () : mBlocked(nullptr) {}
     };
 
     /// \brief Base adapter for all refereceable record types
@@ -90,6 +93,9 @@ namespace CSMWorld
         if (column==mBase.mType)
             return static_cast<int> (mType);
 
+        if (column==mBase.mBlocked)
+            return (record.get().mRecordFlags & ESM::FLAG_Blocked) != 0;
+
         return QVariant();
     }
 
@@ -102,6 +108,17 @@ namespace CSMWorld
 
         if (column==mBase.mModified)
             record.mState = static_cast<RecordBase::State> (value.toInt());
+        else if (column==mBase.mBlocked)
+        {
+            RecordT record2 = record.get();
+
+            if (value.toInt() != 0)
+                record2.mRecordFlags |= ESM::FLAG_Blocked;
+            else
+                record2.mRecordFlags &= ~ESM::FLAG_Blocked;
+
+            record.setModified(record2);
+        }
     }
 
     template<typename RecordT>
@@ -110,6 +127,14 @@ namespace CSMWorld
         return mType;
     }
 
+    // NOTE: Body Part should not have persistence (but BodyPart is not listed in the Objects
+    //       table at the moment).
+    //
+    //       Spellmaking - not persistent - currently not part of objects table
+    //       Enchanting  - not persistent - currently not part of objects table
+    //
+    //       Leveled Creature - no model, so not persistent
+    //       Leveled Item     - no model, so not persistent
 
     struct ModelColumns : public BaseColumns
     {
diff --git a/apps/opencs/model/world/refidcollection.cpp b/apps/opencs/model/world/refidcollection.cpp
index 177844a31d..6ffb7969a8 100644
--- a/apps/opencs/model/world/refidcollection.cpp
+++ b/apps/opencs/model/world/refidcollection.cpp
@@ -49,13 +49,16 @@ CSMWorld::RefIdCollection::RefIdCollection()
     mColumns.emplace_back(Columns::ColumnId_RecordType, ColumnBase::Display_RefRecordType,
         ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue, false, false);
     baseColumns.mType = &mColumns.back();
+    mColumns.emplace_back(Columns::ColumnId_Blocked, ColumnBase::Display_Boolean,
+            ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue | ColumnBase::Flag_Dialogue_Refresh);
+    baseColumns.mBlocked = &mColumns.back();
 
     ModelColumns modelColumns (baseColumns);
 
-    mColumns.emplace_back(Columns::ColumnId_Model, ColumnBase::Display_Mesh);
-    modelColumns.mModel = &mColumns.back();
     mColumns.emplace_back(Columns::ColumnId_Persistent, ColumnBase::Display_Boolean);
     modelColumns.mPersistence = &mColumns.back();
+    mColumns.emplace_back(Columns::ColumnId_Model, ColumnBase::Display_Mesh);
+    modelColumns.mModel = &mColumns.back();
 
     NameColumns nameColumns (modelColumns);
 
diff --git a/apps/opencs/view/world/dialoguesubview.cpp b/apps/opencs/view/world/dialoguesubview.cpp
index f2360b1378..152472f504 100644
--- a/apps/opencs/view/world/dialoguesubview.cpp
+++ b/apps/opencs/view/world/dialoguesubview.cpp
@@ -538,6 +538,9 @@ void CSVWorld::EditWidget::remake(int row)
     mainLayout->addLayout(tablesLayout, QSizePolicy::Preferred);
     mainLayout->addStretch(1);
 
+    int blockedColumn = mTable->searchColumnIndex(CSMWorld::Columns::ColumnId_Blocked);
+    bool isBlocked = mTable->data(mTable->index(row, blockedColumn)).toInt();
+
     int unlocked = 0;
     int locked = 0;
     const int columns = mTable->columnCount();
@@ -583,6 +586,8 @@ void CSVWorld::EditWidget::remake(int row)
                     NestedTable* table =
                         new NestedTable(mDocument, id, mNestedModels.back(), this, editable, fixedRows);
                     table->resizeColumnsToContents();
+                    if (isBlocked)
+                        table->setEditTriggers(QAbstractItemView::NoEditTriggers);
 
                     int rows = mTable->rowCount(mTable->index(row, i));
                     int rowHeight = (rows == 0) ? table->horizontalHeader()->height() : table->rowHeight(0);
@@ -617,7 +622,9 @@ void CSVWorld::EditWidget::remake(int row)
                     label->setSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed);
                     editor->setSizePolicy (QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
 
-                    if (! (mTable->flags (mTable->index (row, i)) & Qt::ItemIsEditable))
+                    // HACK: the blocked checkbox needs to keep the same position
+                    // FIXME: unfortunately blocked record displays a little differently to unblocked one
+                    if (!(mTable->flags (mTable->index (row, i)) & Qt::ItemIsEditable) || i == blockedColumn)
                     {
                         lockedLayout->addWidget (label, locked, 0);
                         lockedLayout->addWidget (editor, locked, 1);
@@ -639,7 +646,7 @@ void CSVWorld::EditWidget::remake(int row)
                     createEditorContextMenu(editor, display, row);
                 }
             }
-            else
+            else // Flag_Dialogue_List
             {
                 CSMWorld::IdTree *tree = static_cast<CSMWorld::IdTree *>(mTable);
                 mNestedTableMapper = new QDataWidgetMapper (this);
@@ -686,7 +693,10 @@ void CSVWorld::EditWidget::remake(int row)
                             label->setEnabled(false);
                         }
 
-                        createEditorContextMenu(editor, display, row);
+                        if (!isBlocked)
+                            createEditorContextMenu(editor, display, row);
+                        else
+                            editor->setEnabled(false);
                     }
                 }
                 mNestedTableMapper->setCurrentModelIndex(tree->index(0, 0, tree->index(row, i)));

From 0ada3fa1d85ec4f3c4d0bbdf5a503555dde8409f Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Sun, 29 Aug 2021 15:32:45 +1000
Subject: [PATCH 1259/2859] Update changelog.

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17337f7346..ef07fe4eee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,6 +47,7 @@
     Feature #6032: Reverse-z depth buffer
     Feature #6162: Refactor GUI to use shaders and to be GLES and GL3+ friendly
     Feature #6199: Support FBO Rendering
+    Editor: Preserve the "blocked" record flag for referenceable objects.
 
 0.47.0
 ------

From a6b1e38eab0fe9e96975834d26b68cfc70294b5e Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sun, 29 Aug 2021 14:12:14 +0200
Subject: [PATCH 1260/2859] Don't use comma where there is no need to.

---
 apps/openmw/mwgui/bookpage.cpp          | 7 +++++--
 apps/openmw/mwgui/mapwindow.cpp         | 6 ++++--
 apps/openmw/mwrender/terrainstorage.cpp | 5 ++++-
 apps/openmw/mwworld/store.cpp           | 6 ++++--
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwgui/bookpage.cpp b/apps/openmw/mwgui/bookpage.cpp
index 2bfec8105b..874d1d866b 100644
--- a/apps/openmw/mwgui/bookpage.cpp
+++ b/apps/openmw/mwgui/bookpage.cpp
@@ -491,7 +491,8 @@ struct TypesetBookImpl::Typesetter : BookTypesetter
             {
                 add_partial_text();
                 stream.consume ();
-                mLine = nullptr, mRun = nullptr;
+                mLine = nullptr;
+                mRun = nullptr;
                 continue;
             }
 
@@ -551,7 +552,9 @@ struct TypesetBookImpl::Typesetter : BookTypesetter
 
         if (left + space_width + word_width > mPageWidth)
         {
-            mLine = nullptr, mRun = nullptr, left = 0;
+            mLine = nullptr;
+            mRun = nullptr;
+            left = 0;
         }
         else
         {
diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index e42808776c..388bbc7d48 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -988,7 +988,8 @@ namespace MWGui
         if (mInterior)
         {
             auto pos = MWBase::Environment::get().getWorld()->getPlayer().getLastKnownExteriorPosition();
-            x = pos.x(), y = pos.y();
+            x = pos.x();
+            y = pos.y();
         }
         setGlobalMapPlayerPosition(x, y);
 
@@ -1160,7 +1161,8 @@ namespace MWGui
     void MapWindow::worldPosToGlobalMapImageSpace(float x, float y, float& imageX, float& imageY) const
     {
         mGlobalMapRender->worldPosToImageSpace(x, y, imageX, imageY);
-        imageX *= mGlobalMapZoom, imageY *= mGlobalMapZoom;
+        imageX *= mGlobalMapZoom;
+        imageY *= mGlobalMapZoom;
     }
 
     void MapWindow::updateCustomMarkers()
diff --git a/apps/openmw/mwrender/terrainstorage.cpp b/apps/openmw/mwrender/terrainstorage.cpp
index 528ce70ea3..879a2ef68b 100644
--- a/apps/openmw/mwrender/terrainstorage.cpp
+++ b/apps/openmw/mwrender/terrainstorage.cpp
@@ -33,7 +33,10 @@ namespace MWRender
 
     void TerrainStorage::getBounds(float& minX, float& maxX, float& minY, float& maxY)
     {
-        minX = 0, minY = 0, maxX = 0, maxY = 0;
+        minX = 0;
+        minY = 0;
+        maxX = 0;
+        maxY = 0;
 
         const MWWorld::ESMStore &esmStore =
             MWBase::Environment::get().getWorld()->getStore();
diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index f6de1d485b..718cebd790 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -520,7 +520,8 @@ namespace MWWorld
     const ESM::Cell *Store<ESM::Cell>::search(int x, int y) const
     {
         ESM::Cell cell;
-        cell.mData.mX = x, cell.mData.mY = y;
+        cell.mData.mX = x;
+        cell.mData.mY = y;
 
         std::pair<int, int> key(x, y);
         DynamicExt::const_iterator it = mExt.find(key);
@@ -538,7 +539,8 @@ namespace MWWorld
     const ESM::Cell *Store<ESM::Cell>::searchStatic(int x, int y) const
     {
         ESM::Cell cell;
-        cell.mData.mX = x, cell.mData.mY = y;
+        cell.mData.mX = x;
+        cell.mData.mY = y;
 
         std::pair<int, int> key(x, y);
         DynamicExt::const_iterator it = mExt.find(key);

From a15cca5763fa32c3d1b66f288c3ebae196f72d5c Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sun, 29 Aug 2021 19:20:49 +0200
Subject: [PATCH 1261/2859] Use `reserve` on vectors for fixed loops

This is a bit useless, but has the merit of appeasing clang-tiday
---
 apps/openmw/mwgui/class.cpp                | 2 ++
 apps/openmw/mwrender/screenshotmanager.cpp | 1 +
 2 files changed, 3 insertions(+)

diff --git a/apps/openmw/mwgui/class.cpp b/apps/openmw/mwgui/class.cpp
index ee5fe59399..1732bc24ea 100644
--- a/apps/openmw/mwgui/class.cpp
+++ b/apps/openmw/mwgui/class.cpp
@@ -517,6 +517,7 @@ namespace MWGui
     std::vector<ESM::Skill::SkillEnum> CreateClassDialog::getMajorSkills() const
     {
         std::vector<ESM::Skill::SkillEnum> v;
+        v.reserve(5);
         for(int i = 0; i < 5; i++)
         {
             v.push_back(mMajorSkill[i]->getSkillId());
@@ -527,6 +528,7 @@ namespace MWGui
     std::vector<ESM::Skill::SkillEnum> CreateClassDialog::getMinorSkills() const
     {
         std::vector<ESM::Skill::SkillEnum> v;
+        v.reserve(5);
         for(int i=0; i < 5; i++)
         {
             v.push_back(mMinorSkill[i]->getSkillId());
diff --git a/apps/openmw/mwrender/screenshotmanager.cpp b/apps/openmw/mwrender/screenshotmanager.cpp
index b9ea5daacf..5a047a1566 100644
--- a/apps/openmw/mwrender/screenshotmanager.cpp
+++ b/apps/openmw/mwrender/screenshotmanager.cpp
@@ -191,6 +191,7 @@ namespace MWRender
             screenshotH = screenshotW;   // use square resolution for planet mapping
 
         std::vector<osg::ref_ptr<osg::Image>> images;
+        images.reserve(6);
 
         for (int i = 0; i < 6; ++i)
             images.push_back(new osg::Image);

From deb2af6accb3d6c8063f618703a24f03e7681612 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sun, 29 Aug 2021 20:22:34 +0200
Subject: [PATCH 1262/2859] Dont copy-construct from a const-ref when used only
 as a const-ref

This also makes clang-tiny a bit happier
---
 apps/opencs/view/tools/searchsubview.cpp | 2 +-
 apps/openmw/mwgui/inventorywindow.cpp    | 2 +-
 apps/openmw/mwworld/inventorystore.cpp   | 4 ++--
 components/resource/bulletshape.cpp      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/opencs/view/tools/searchsubview.cpp b/apps/opencs/view/tools/searchsubview.cpp
index 07ba7907e7..d687cbeb3f 100644
--- a/apps/opencs/view/tools/searchsubview.cpp
+++ b/apps/opencs/view/tools/searchsubview.cpp
@@ -36,7 +36,7 @@ void CSVTools::SearchSubView::replace (bool selection)
     // in a single string.
     for (std::vector<int>::const_reverse_iterator iter (indices.rbegin()); iter!=indices.rend(); ++iter)
     {
-        CSMWorld::UniversalId id = model.getUniversalId (*iter);
+        const CSMWorld::UniversalId& id = model.getUniversalId (*iter);
 
         CSMWorld::UniversalId::Type type = CSMWorld::UniversalId::getParentType (id.getType());
 
diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index eead3919e0..f53ba21f9f 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -704,7 +704,7 @@ namespace MWGui
         if (!MWBase::Environment::get().getWindowManager()->isAllowed(GW_Inventory))
             return;
         // make sure the object is of a type that can be picked up
-        std::string type = object.getTypeName();
+        const std::string& type = object.getTypeName();
         if ( (type != typeid(ESM::Apparatus).name())
             && (type != typeid(ESM::Armor).name())
             && (type != typeid(ESM::Book).name())
diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp
index d96447f87d..0b8af4463c 100644
--- a/apps/openmw/mwworld/inventorystore.cpp
+++ b/apps/openmw/mwworld/inventorystore.cpp
@@ -143,7 +143,7 @@ MWWorld::ContainerStoreIterator MWWorld::InventoryStore::add(const Ptr& itemPtr,
     if (allowAutoEquip && actorPtr != MWMechanics::getPlayer()
             && actorPtr.getClass().isNpc() && !actorPtr.getClass().getNpcStats(actorPtr).isWerewolf())
     {
-        std::string type = itemPtr.getTypeName();
+        const std::string& type = itemPtr.getTypeName();
         if (type == typeid(ESM::Armor).name() || type == typeid(ESM::Clothing).name())
             autoEquip(actorPtr);
     }
@@ -748,7 +748,7 @@ int MWWorld::InventoryStore::remove(const Ptr& item, int count, const Ptr& actor
     if (equipReplacement && wasEquipped && (actor != MWMechanics::getPlayer())
             && actor.getClass().isNpc() && !actor.getClass().getNpcStats(actor).isWerewolf())
     {
-        std::string type = item.getTypeName();
+        const std::string& type = item.getTypeName();
         if (type == typeid(ESM::Armor).name() || type == typeid(ESM::Clothing).name())
             autoEquip(actor);
     }
diff --git a/components/resource/bulletshape.cpp b/components/resource/bulletshape.cpp
index ce896610a9..798a6778e6 100644
--- a/components/resource/bulletshape.cpp
+++ b/components/resource/bulletshape.cpp
@@ -58,7 +58,7 @@ btCollisionShape* BulletShape::duplicateCollisionShape(const btCollisionShape *s
         for(int i = 0;i < numShapes;++i)
         {
             btCollisionShape *child = duplicateCollisionShape(comp->getChildShape(i));
-            btTransform trans = comp->getChildTransform(i);
+            const btTransform& trans = comp->getChildTransform(i);
             newShape->addChildShape(trans, child);
         }
 

From db4fe11a44cd4ddd232cf22c296dd7d83863f075 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sun, 29 Aug 2021 14:47:08 +0200
Subject: [PATCH 1263/2859] Don't pass a nullptr to a std::string constructor

This is undefined behaviour.
---
 apps/openmw/mwworld/store.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/store.hpp b/apps/openmw/mwworld/store.hpp
index 88edb71ddf..4b1d648703 100644
--- a/apps/openmw/mwworld/store.hpp
+++ b/apps/openmw/mwworld/store.hpp
@@ -428,7 +428,7 @@ namespace MWWorld
         const ESM::WeaponType *search(const int id) const;
         const ESM::WeaponType *find(const int id) const;
 
-        RecordId load(ESM::ESMReader &esm) override { return RecordId(nullptr, false); }
+        RecordId load(ESM::ESMReader &esm) override { return RecordId({}, false); }
 
         ESM::WeaponType* insert(const ESM::WeaponType &weaponType);
 

From 33d4d884474d83951445283c58e094cb6043dd3a Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Tue, 31 Aug 2021 09:37:27 +0200
Subject: [PATCH 1264/2859] Function LuaUtil::toString

---
 apps/openmw_test_suite/lua/test_lua.cpp         |  8 ++++++++
 apps/openmw_test_suite/lua/test_utilpackage.cpp |  2 ++
 components/lua/luastate.cpp                     | 10 ++++++++++
 components/lua/luastate.hpp                     |  3 +++
 4 files changed, 23 insertions(+)

diff --git a/apps/openmw_test_suite/lua/test_lua.cpp b/apps/openmw_test_suite/lua/test_lua.cpp
index 69a326060c..9405dba4b2 100644
--- a/apps/openmw_test_suite/lua/test_lua.cpp
+++ b/apps/openmw_test_suite/lua/test_lua.cpp
@@ -77,6 +77,14 @@ return {
         EXPECT_EQ(LuaUtil::call(script1["get"]).get<int>(), 45);
     }
 
+    TEST_F(LuaStateTest, ToString)
+    {
+        EXPECT_EQ(LuaUtil::toString(sol::make_object(mLua.sol(), 3.14)), "3.14");
+        EXPECT_EQ(LuaUtil::toString(sol::make_object(mLua.sol(), true)), "true");
+        EXPECT_EQ(LuaUtil::toString(sol::nil), "nil");
+        EXPECT_EQ(LuaUtil::toString(sol::make_object(mLua.sol(), "something")), "\"something\"");
+    }
+
     TEST_F(LuaStateTest, ErrorHandling)
     {
         EXPECT_ERROR(mLua.runInNewSandbox("invalid.lua"), "[string \"invalid.lua\"]:1:");
diff --git a/apps/openmw_test_suite/lua/test_utilpackage.cpp b/apps/openmw_test_suite/lua/test_utilpackage.cpp
index afd9fa2d3c..fb8e48e461 100644
--- a/apps/openmw_test_suite/lua/test_utilpackage.cpp
+++ b/apps/openmw_test_suite/lua/test_utilpackage.cpp
@@ -1,6 +1,7 @@
 #include "gmock/gmock.h"
 #include <gtest/gtest.h>
 
+#include <components/lua/luastate.hpp>
 #include <components/lua/utilpackage.hpp>
 
 #include "testing_util.hpp"
@@ -45,6 +46,7 @@ namespace
         EXPECT_FLOAT_EQ(lua.safe_script("return v.y").get<float>(), 12);
         EXPECT_FLOAT_EQ(lua.safe_script("return v.z").get<float>(), 13);
         EXPECT_EQ(lua.safe_script("return tostring(v)").get<std::string>(), "(5, 12, 13)");
+        EXPECT_EQ(LuaUtil::toString(lua.safe_script("return v")), "(5, 12, 13)");
         EXPECT_FLOAT_EQ(lua.safe_script("return util.vector3(4, 0, 3):length()").get<float>(), 5);
         EXPECT_FLOAT_EQ(lua.safe_script("return util.vector3(4, 0, 3):length2()").get<float>(), 25);
         EXPECT_FALSE(lua.safe_script("return util.vector3(1, 2, 3) == util.vector3(1, 3, 2)").get<bool>());
diff --git a/components/lua/luastate.cpp b/components/lua/luastate.cpp
index 1b52db11ad..fd42aa7fb2 100644
--- a/components/lua/luastate.cpp
+++ b/components/lua/luastate.cpp
@@ -167,4 +167,14 @@ namespace LuaUtil
         #endif
     }
 
+    std::string toString(const sol::object& obj)
+    {
+        if (obj == sol::nil)
+            return "nil";
+        else if (obj.get_type() == sol::type::string)
+            return "\"" + obj.as<std::string>() + "\"";
+        else
+            return call(sol::state_view(obj.lua_state())["tostring"], obj);
+    }
+
 }
diff --git a/components/lua/luastate.hpp b/components/lua/luastate.hpp
index 6bac1612e7..acaaadea76 100644
--- a/components/lua/luastate.hpp
+++ b/components/lua/luastate.hpp
@@ -103,6 +103,9 @@ namespace LuaUtil
             return getFieldOrNil(table.as<sol::table>()[first], str...);
     }
 
+    // String representation of a Lua object. Should be used for debugging/logging purposes only.
+    std::string toString(const sol::object&);
+
 }
 
 #endif // COMPONENTS_LUA_LUASTATE_H

From d1a5bc207b5d1a63d30bf3e3d5baf23f5b529155 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Tue, 31 Aug 2021 16:53:52 +0200
Subject: [PATCH 1265/2859] Iterate over mInactiveCells when unloading cells in
 TestCells / TestInteriorCells. Otherwise we dereference an invalid iterator
 after deactiveCell().

---
 apps/openmw/mwworld/scene.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 5fa9be1be5..90e5bc265e 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -742,14 +742,12 @@ namespace MWWorld
         {
             loadingListener->setLabel("Testing exterior cells ("+std::to_string(i)+"/"+std::to_string(cells.getExtSize())+")...");
 
-            CellStoreCollection::iterator iter = mActiveCells.begin();
-
             CellStore *cell = MWBase::Environment::get().getWorld()->getExterior(it->mData.mX, it->mData.mY);
             loadInactiveCell (cell, loadingListener, true);
             activateCell (cell, loadingListener, false, true);
 
-            iter = mActiveCells.begin();
-            while (iter != mActiveCells.end())
+            auto iter = mInactiveCells.begin();
+            while (iter != mInactiveCells.end())
             {
                 if (it->isExterior() && it->mData.mX == (*iter)->getCell()->getGridX() &&
                     it->mData.mY == (*iter)->getCell()->getGridY())
@@ -796,8 +794,8 @@ namespace MWWorld
             loadInactiveCell (cell, loadingListener, true);
             activateCell (cell, loadingListener, false, true);
 
-            CellStoreCollection::iterator iter = mActiveCells.begin();
-            while (iter != mActiveCells.end())
+            auto iter = mInactiveCells.begin();
+            while (iter != mInactiveCells.end())
             {
                 assert (!(*iter)->getCell()->isExterior());
 

From 0d511da615991a332edc574763f9639fe1dfaaa2 Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Mon, 30 Aug 2021 00:26:26 +0300
Subject: [PATCH 1266/2859] Test of basic mouse-plane use

---
 apps/opencs/view/render/instancemode.cpp | 35 ++++++------------------
 apps/opencs/view/render/instancemode.hpp |  1 +
 2 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index 99ddce7f7d..d511523574 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -305,6 +305,9 @@ bool CSVRender::InstanceMode::primaryEditStartDrag (const QPoint& pos)
             if (mSubModeId == "move")
             {
                 objectTag->mObject->setEdited (Object::Override_Position);
+                mDragStart.x() = objectTag->mObject->getPosition().pos[0];
+                mDragStart.y() = objectTag->mObject->getPosition().pos[1];
+                mDragStart.z() = objectTag->mObject->getPosition().pos[2];
                 mDragMode = DragMode_Move;
             }
             else if (mSubModeId == "rotate")
@@ -392,29 +395,7 @@ void CSVRender::InstanceMode::drag (const QPoint& pos, int diffX, int diffY, dou
 
     std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getEdited (Mask_Reference);
 
-    if (mDragMode == DragMode_Move)
-    {
-        osg::Vec3f eye, centre, up;
-        getWorldspaceWidget().getCamera()->getViewMatrix().getLookAt (eye, centre, up);
-
-        if (diffY)
-        {
-            offset += up * diffY * speedFactor;
-        }
-        if (diffX)
-        {
-            offset += ((centre-eye) ^ up) * diffX * speedFactor;
-        }
-
-        if (mDragAxis!=-1)
-        {
-            for (int i=0; i<3; ++i)
-            {
-                if (i!=mDragAxis)
-                    offset[i] = 0;
-            }
-        }
-    }
+    if (mDragMode == DragMode_Move) {}
     else if (mDragMode == DragMode_Rotate)
     {
         osg::Vec3f eye, centre, up;
@@ -522,10 +503,10 @@ void CSVRender::InstanceMode::drag (const QPoint& pos, int diffX, int diffY, dou
             if (mDragMode == DragMode_Move)
             {
                 ESM::Position position = objectTag->mObject->getPosition();
-                for (int i=0; i<3; ++i)
-                {
-                    position.pos[i] += offset[i];
-                }
+                osg::Vec3d mousePos = getMousePlaneCoords(pos, getProjectionSpaceCoords(mDragStart));
+                position.pos[0] = mousePos.x();
+                position.pos[1] = mousePos.y();
+                position.pos[2] = mousePos.z();
 
                 objectTag->mObject->setPosition(position.pos);
             }
diff --git a/apps/opencs/view/render/instancemode.hpp b/apps/opencs/view/render/instancemode.hpp
index 73b7fff12a..3eb140a9af 100644
--- a/apps/opencs/view/render/instancemode.hpp
+++ b/apps/opencs/view/render/instancemode.hpp
@@ -45,6 +45,7 @@ namespace CSVRender
             bool mLocked;
             float mUnitScaleDist;
             osg::ref_ptr<osg::Group> mParentNode;
+            osg::Vec3d mDragStart;
 
             int getSubModeFromId (const std::string& id) const;
 

From 840e7615f5eaa27e1beb2d1b0f9e137e16dca1b7 Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Wed, 1 Sep 2021 00:15:10 +0300
Subject: [PATCH 1267/2859] Store object origins and move difference

---
 apps/opencs/view/render/instancemode.cpp | 24 +++++++++++++++++-------
 apps/opencs/view/render/instancemode.hpp |  1 +
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index d511523574..5d07bf1422 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -297,6 +297,8 @@ bool CSVRender::InstanceMode::primaryEditStartDrag (const QPoint& pos)
             return false;
     }
 
+    mObjectsAtDragStart.clear();
+
     for (std::vector<osg::ref_ptr<TagBase> >::iterator iter (selection.begin());
         iter!=selection.end(); ++iter)
     {
@@ -305,9 +307,12 @@ bool CSVRender::InstanceMode::primaryEditStartDrag (const QPoint& pos)
             if (mSubModeId == "move")
             {
                 objectTag->mObject->setEdited (Object::Override_Position);
-                mDragStart.x() = objectTag->mObject->getPosition().pos[0];
-                mDragStart.y() = objectTag->mObject->getPosition().pos[1];
-                mDragStart.z() = objectTag->mObject->getPosition().pos[2];
+                double x = objectTag->mObject->getPosition().pos[0];
+                double y = objectTag->mObject->getPosition().pos[1];
+                double z = objectTag->mObject->getPosition().pos[2];
+                osg::Vec3d thisPoint(x, y, z);
+                mDragStart = getMousePlaneCoords(pos, getProjectionSpaceCoords(thisPoint));
+                mObjectsAtDragStart.emplace_back(thisPoint);
                 mDragMode = DragMode_Move;
             }
             else if (mSubModeId == "rotate")
@@ -495,8 +500,10 @@ void CSVRender::InstanceMode::drag (const QPoint& pos, int diffX, int diffY, dou
         return;
     }
 
+    int i = 0;
+
     // Apply
-    for (std::vector<osg::ref_ptr<TagBase> >::iterator iter (selection.begin()); iter!=selection.end(); ++iter)
+    for (std::vector<osg::ref_ptr<TagBase> >::iterator iter (selection.begin()); iter!=selection.end(); ++iter, i++)
     {
         if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (iter->get()))
         {
@@ -504,9 +511,12 @@ void CSVRender::InstanceMode::drag (const QPoint& pos, int diffX, int diffY, dou
             {
                 ESM::Position position = objectTag->mObject->getPosition();
                 osg::Vec3d mousePos = getMousePlaneCoords(pos, getProjectionSpaceCoords(mDragStart));
-                position.pos[0] = mousePos.x();
-                position.pos[1] = mousePos.y();
-                position.pos[2] = mousePos.z();
+                float addToX = mousePos.x() - mDragStart.x();
+                float addToY = mousePos.y() - mDragStart.y();
+                float addToZ = mousePos.z() - mDragStart.z();
+                position.pos[0] = mObjectsAtDragStart[i].x() + addToX;
+                position.pos[1] = mObjectsAtDragStart[i].y() + addToY;
+                position.pos[2] = mObjectsAtDragStart[i].z() + addToZ;
 
                 objectTag->mObject->setPosition(position.pos);
             }
diff --git a/apps/opencs/view/render/instancemode.hpp b/apps/opencs/view/render/instancemode.hpp
index 3eb140a9af..5ddc5f7c27 100644
--- a/apps/opencs/view/render/instancemode.hpp
+++ b/apps/opencs/view/render/instancemode.hpp
@@ -46,6 +46,7 @@ namespace CSVRender
             float mUnitScaleDist;
             osg::ref_ptr<osg::Group> mParentNode;
             osg::Vec3d mDragStart;
+            std::vector<osg::Vec3d> mObjectsAtDragStart;
 
             int getSubModeFromId (const std::string& id) const;
 

From 23fe3d74ab9b66f060b684d0509895485c1c5787 Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Wed, 1 Sep 2021 00:24:50 +0300
Subject: [PATCH 1268/2859] Use floats, not doubles

---
 apps/opencs/view/render/instancemode.cpp | 10 +++++-----
 apps/opencs/view/render/instancemode.hpp |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index 5d07bf1422..535179b61f 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -307,10 +307,10 @@ bool CSVRender::InstanceMode::primaryEditStartDrag (const QPoint& pos)
             if (mSubModeId == "move")
             {
                 objectTag->mObject->setEdited (Object::Override_Position);
-                double x = objectTag->mObject->getPosition().pos[0];
-                double y = objectTag->mObject->getPosition().pos[1];
-                double z = objectTag->mObject->getPosition().pos[2];
-                osg::Vec3d thisPoint(x, y, z);
+                float x = objectTag->mObject->getPosition().pos[0];
+                float y = objectTag->mObject->getPosition().pos[1];
+                float z = objectTag->mObject->getPosition().pos[2];
+                osg::Vec3f thisPoint(x, y, z);
                 mDragStart = getMousePlaneCoords(pos, getProjectionSpaceCoords(thisPoint));
                 mObjectsAtDragStart.emplace_back(thisPoint);
                 mDragMode = DragMode_Move;
@@ -510,7 +510,7 @@ void CSVRender::InstanceMode::drag (const QPoint& pos, int diffX, int diffY, dou
             if (mDragMode == DragMode_Move)
             {
                 ESM::Position position = objectTag->mObject->getPosition();
-                osg::Vec3d mousePos = getMousePlaneCoords(pos, getProjectionSpaceCoords(mDragStart));
+                osg::Vec3f mousePos = getMousePlaneCoords(pos, getProjectionSpaceCoords(mDragStart));
                 float addToX = mousePos.x() - mDragStart.x();
                 float addToY = mousePos.y() - mDragStart.y();
                 float addToZ = mousePos.z() - mDragStart.z();
diff --git a/apps/opencs/view/render/instancemode.hpp b/apps/opencs/view/render/instancemode.hpp
index 5ddc5f7c27..4ece934e93 100644
--- a/apps/opencs/view/render/instancemode.hpp
+++ b/apps/opencs/view/render/instancemode.hpp
@@ -45,8 +45,8 @@ namespace CSVRender
             bool mLocked;
             float mUnitScaleDist;
             osg::ref_ptr<osg::Group> mParentNode;
-            osg::Vec3d mDragStart;
-            std::vector<osg::Vec3d> mObjectsAtDragStart;
+            osg::Vec3f mDragStart;
+            std::vector<osg::Vec3f> mObjectsAtDragStart;
 
             int getSubModeFromId (const std::string& id) const;
 

From 53d315c862f75121865fbfacb33a1bdee9ebf543 Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Wed, 1 Sep 2021 01:37:17 +0300
Subject: [PATCH 1269/2859] XYZ-locking, mouse wheel move fix

---
 apps/opencs/view/render/instancemode.cpp | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index 535179b61f..ead1a8fdba 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -518,6 +518,16 @@ void CSVRender::InstanceMode::drag (const QPoint& pos, int diffX, int diffY, dou
                 position.pos[1] = mObjectsAtDragStart[i].y() + addToY;
                 position.pos[2] = mObjectsAtDragStart[i].z() + addToZ;
 
+                // XYZ-locking
+                if (mDragAxis != -1)
+                {
+                    for (int j = 0; j < 3; ++j)
+                    {
+                        if (j != mDragAxis)
+                            position.pos[j] = mObjectsAtDragStart[i][j];
+                    }
+                }
+
                 objectTag->mObject->setPosition(position.pos);
             }
             else if (mDragMode == DragMode_Rotate)
@@ -625,8 +635,10 @@ void CSVRender::InstanceMode::dragWheel (int diff, double speedFactor)
         std::vector<osg::ref_ptr<TagBase> > selection =
             getWorldspaceWidget().getEdited (Mask_Reference);
 
+        int j = 0;
+
         for (std::vector<osg::ref_ptr<TagBase> >::iterator iter (selection.begin());
-            iter!=selection.end(); ++iter)
+            iter!=selection.end(); ++iter, j++)
         {
             if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (iter->get()))
             {
@@ -634,6 +646,9 @@ void CSVRender::InstanceMode::dragWheel (int diff, double speedFactor)
                 for (int i=0; i<3; ++i)
                     position.pos[i] += offset[i];
                 objectTag->mObject->setPosition (position.pos);
+                osg::Vec3f thisPoint(position.pos[0], position.pos[1], position.pos[2]);
+                mDragStart = getMousePlaneCoords(getWorldspaceWidget().mapFromGlobal(QCursor::pos()), getProjectionSpaceCoords(thisPoint));
+                mObjectsAtDragStart[j] = thisPoint;
             }
         }
     }

From f876ff2c14de2204e4dbda30c73d0cc898f5fd26 Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Wed, 1 Sep 2021 01:56:11 +0300
Subject: [PATCH 1270/2859] Clear temporary movement data at the end of the
 drag

---
 apps/opencs/view/render/instancemode.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index ead1a8fdba..ebb7f46fa5 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -609,6 +609,7 @@ void CSVRender::InstanceMode::dragCompleted(const QPoint& pos)
         }
     }
 
+    mObjectsAtDragStart.clear();
     mDragMode = DragMode_None;
 }
 

From 8edcaeb323fb4395537e1ca414a0aa262aea10a5 Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Wed, 1 Sep 2021 02:03:03 +0300
Subject: [PATCH 1271/2859] Add changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17337f7346..bc9c79411b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,6 +47,7 @@
     Feature #6032: Reverse-z depth buffer
     Feature #6162: Refactor GUI to use shaders and to be GLES and GL3+ friendly
     Feature #6199: Support FBO Rendering
+    Feature #6251: OpenMW-CS: Set instance movement based on camera zoom
 
 0.47.0
 ------

From d4e3575f1d5b091ec47c55002c6ca0b947cb506f Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sun, 29 Aug 2021 20:13:32 +0200
Subject: [PATCH 1272/2859] Don't use `const` for objects returned by value.

This prevents the usage of std::move semantics,
and makes clang-tidy sad.
---
 apps/opencs/model/world/actoradapter.cpp                   | 4 ++--
 apps/opencs/model/world/actoradapter.hpp                   | 2 +-
 apps/openmw/engine.cpp                                     | 2 +-
 components/detournavigator/cachedrecastmeshmanager.cpp     | 2 +-
 components/detournavigator/tilecachedrecastmeshmanager.cpp | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/opencs/model/world/actoradapter.cpp b/apps/opencs/model/world/actoradapter.cpp
index 8558aa9bc9..86a621970c 100644
--- a/apps/opencs/model/world/actoradapter.cpp
+++ b/apps/opencs/model/world/actoradapter.cpp
@@ -121,7 +121,7 @@ namespace CSMWorld
         return SceneUtil::getActorSkeleton(firstPerson, mFemale, beast, werewolf);
     }
 
-    const std::string ActorAdapter::ActorData::getPart(ESM::PartReferenceType index) const
+    const std::string& ActorAdapter::ActorData::getPart(ESM::PartReferenceType index) const
     {
         auto it = mParts.find(index);
         if (it == mParts.end())
@@ -131,7 +131,7 @@ namespace CSMWorld
                 if (mFemale)
                 {
                     // Note: we should use male parts for females as fallback
-                    const std::string femalePart = mRaceData->getFemalePart(index);
+                    const std::string& femalePart = mRaceData->getFemalePart(index);
                     if (!femalePart.empty())
                         return femalePart;
                 }
diff --git a/apps/opencs/model/world/actoradapter.hpp b/apps/opencs/model/world/actoradapter.hpp
index 912a6bcb38..df3eeff64e 100644
--- a/apps/opencs/model/world/actoradapter.hpp
+++ b/apps/opencs/model/world/actoradapter.hpp
@@ -93,7 +93,7 @@ namespace CSMWorld
             /// Returns the skeleton the actor should use for attaching parts to
             std::string getSkeleton() const;
             /// Retrieves the associated actor part
-            const std::string getPart(ESM::PartReferenceType index) const;
+            const std::string& getPart(ESM::PartReferenceType index) const;
             /// Checks if the actor has a data dependency
             bool hasDependency(const std::string& id) const;
 
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index f968bbfac7..772af3759e 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -521,7 +521,7 @@ std::string OMW::Engine::loadSettings (Settings::Manager & settings)
         throw std::runtime_error ("No default settings file found! Make sure the file \"defaults.bin\" was properly installed.");
 
     // load user settings if they exist
-    const std::string settingspath = (mCfgMgr.getUserConfigPath() / "settings.cfg").string();
+    std::string settingspath = (mCfgMgr.getUserConfigPath() / "settings.cfg").string();
     if (boost::filesystem::exists(settingspath))
         settings.loadUser(settingspath);
 
diff --git a/components/detournavigator/cachedrecastmeshmanager.cpp b/components/detournavigator/cachedrecastmeshmanager.cpp
index e7e5886589..19b87aa820 100644
--- a/components/detournavigator/cachedrecastmeshmanager.cpp
+++ b/components/detournavigator/cachedrecastmeshmanager.cpp
@@ -27,7 +27,7 @@ namespace DetourNavigator
 
     std::optional<RemovedRecastMeshObject> CachedRecastMeshManager::removeObject(const ObjectId id)
     {
-        const auto object = mImpl.removeObject(id);
+        auto object = mImpl.removeObject(id);
         if (object)
             mCached.lock()->reset();
         return object;
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.cpp b/components/detournavigator/tilecachedrecastmeshmanager.cpp
index 38314f08a5..63d7e13f6b 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -248,7 +248,7 @@ namespace DetourNavigator
         const auto tile = tiles.find(tilePosition);
         if (tile == tiles.end())
             return std::optional<RemovedRecastMeshObject>();
-        const auto tileResult = tile->second->removeObject(id);
+        auto tileResult = tile->second->removeObject(id);
         if (tile->second->isEmpty())
         {
             tiles.erase(tile);

From 0bce6c09e1a74e1cd77a8602300201b571af3ee1 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Tue, 31 Aug 2021 16:25:45 +0200
Subject: [PATCH 1273/2859] Change projectile behaviour to be like in vanilla
 wrt. water plane: - enchanted arrow explode upon hit the water plane - non
 enchanted arrow disappear (or more accurately, they hit nothingness) -
 enchanted arrow shot underwater explode immediately - non enchanted arrow
 disappear immediately

Also, solve a bug that occured previously and could theoritically still happens where we use the last tested collision position for instead of the last registered hit:
Use the hit position as saved inside Projectile::hit() instead of the last position saved inside the callback.
If a projectile collides with several objects (bottom of the sea and water surface for instance), the last collision tested won't necessarily be the impact position as we have no control over the order in which the tests are performed.
---
 apps/openmw/mwphysics/physicssystem.cpp       |  6 ++---
 apps/openmw/mwphysics/physicssystem.hpp       |  2 +-
 apps/openmw/mwphysics/projectile.cpp          | 24 ++-----------------
 apps/openmw/mwphysics/projectile.hpp          | 23 +++++++++++-------
 .../mwphysics/projectileconvexcallback.cpp    |  4 +---
 apps/openmw/mwworld/projectilemanager.cpp     | 13 +++++-----
 apps/openmw/mwworld/worldimp.cpp              |  1 +
 7 files changed, 29 insertions(+), 44 deletions(-)

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 5b50962be9..e9ab3864fd 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -643,7 +643,7 @@ namespace MWPhysics
 
         mTaskScheduler->convexSweepTest(projectile->getConvexShape(), from_, to_, resultCallback);
 
-        const auto newpos = projectile->isActive() ? position : Misc::Convert::toOsg(resultCallback.m_hitPointWorld);
+        const auto newpos = projectile->isActive() ? position : Misc::Convert::toOsg(projectile->getHitPosition());
         projectile->setPosition(newpos);
         mTaskScheduler->updateSingleAabb(foundProjectile->second);
     }
@@ -713,7 +713,7 @@ namespace MWPhysics
         mActors.emplace(ptr, std::move(actor));
     }
 
-    int PhysicsSystem::addProjectile (const MWWorld::Ptr& caster, const osg::Vec3f& position, const std::string& mesh, bool computeRadius, bool canTraverseWater)
+    int PhysicsSystem::addProjectile (const MWWorld::Ptr& caster, const osg::Vec3f& position, const std::string& mesh, bool computeRadius)
     {
         osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance = mShapeManager->getInstance(mesh);
         assert(shapeInstance);
@@ -721,7 +721,7 @@ namespace MWPhysics
 
         mProjectileId++;
 
-        auto projectile = std::make_shared<Projectile>(caster, position, radius, canTraverseWater, mTaskScheduler.get(), this);
+        auto projectile = std::make_shared<Projectile>(caster, position, radius, mTaskScheduler.get(), this);
         mProjectiles.emplace(mProjectileId, std::move(projectile));
 
         return mProjectileId;
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index b20c8f88e1..14e4b678c5 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -130,7 +130,7 @@ namespace MWPhysics
             void addObject (const MWWorld::Ptr& ptr, const std::string& mesh, osg::Quat rotation, int collisionType = CollisionType_World, bool skipAnimated = false);
             void addActor (const MWWorld::Ptr& ptr, const std::string& mesh);
 
-            int addProjectile(const MWWorld::Ptr& caster, const osg::Vec3f& position, const std::string& mesh, bool computeRadius, bool canTraverseWater);
+            int addProjectile(const MWWorld::Ptr& caster, const osg::Vec3f& position, const std::string& mesh, bool computeRadius);
             void setCaster(int projectileId, const MWWorld::Ptr& caster);
             void updateProjectile(const int projectileId, const osg::Vec3f &position) const;
             void removeProjectile(const int projectileId);
diff --git a/apps/openmw/mwphysics/projectile.cpp b/apps/openmw/mwphysics/projectile.cpp
index a8bb444956..4efb245149 100644
--- a/apps/openmw/mwphysics/projectile.cpp
+++ b/apps/openmw/mwphysics/projectile.cpp
@@ -15,12 +15,10 @@
 
 namespace MWPhysics
 {
-Projectile::Projectile(const MWWorld::Ptr& caster, const osg::Vec3f& position, float radius, bool canCrossWaterSurface, PhysicsTaskScheduler* scheduler, PhysicsSystem* physicssystem)
-    : mCanCrossWaterSurface(canCrossWaterSurface)
-    , mCrossedWaterSurface(false)
+Projectile::Projectile(const MWWorld::Ptr& caster, const osg::Vec3f& position, float radius, PhysicsTaskScheduler* scheduler, PhysicsSystem* physicssystem)
+    : mHitWater(false)
     , mActive(true)
     , mHitTarget(nullptr)
-    , mWaterHitPosition(std::nullopt)
     , mPhysics(physicssystem)
     , mTaskScheduler(scheduler)
 {
@@ -75,11 +73,6 @@ osg::Vec3f Projectile::getPosition() const
     return mPosition;
 }
 
-bool Projectile::canTraverseWater() const
-{
-    return mCanCrossWaterSurface;
-}
-
 void Projectile::hit(const btCollisionObject* target, btVector3 pos, btVector3 normal)
 {
     bool active = true;
@@ -143,17 +136,4 @@ bool Projectile::isValidTarget(const btCollisionObject* target) const
             [target](const btCollisionObject* actor) { return target == actor; });
 }
 
-std::optional<btVector3> Projectile::getWaterHitPosition()
-{
-    return std::exchange(mWaterHitPosition, std::nullopt);
-}
-
-void Projectile::setWaterHitPosition(btVector3 pos)
-{
-    if (mCrossedWaterSurface)
-        return;
-    mCrossedWaterSurface = true;
-    mWaterHitPosition = pos;
-}
-
 }
diff --git a/apps/openmw/mwphysics/projectile.hpp b/apps/openmw/mwphysics/projectile.hpp
index dd659b6581..5e4e487c03 100644
--- a/apps/openmw/mwphysics/projectile.hpp
+++ b/apps/openmw/mwphysics/projectile.hpp
@@ -4,7 +4,6 @@
 #include <atomic>
 #include <memory>
 #include <mutex>
-#include <optional>
 
 #include <LinearMath/btVector3.h>
 
@@ -32,7 +31,7 @@ namespace MWPhysics
     class Projectile final : public PtrHolder
     {
     public:
-        Projectile(const MWWorld::Ptr& caster, const osg::Vec3f& position, float radius, bool canCrossWaterSurface, PhysicsTaskScheduler* scheduler, PhysicsSystem* physicssystem);
+        Projectile(const MWWorld::Ptr& caster, const osg::Vec3f& position, float radius, PhysicsTaskScheduler* scheduler, PhysicsSystem* physicssystem);
         ~Projectile() override;
 
         btConvexShape* getConvexShape() const { return mConvexShape; }
@@ -56,15 +55,25 @@ namespace MWPhysics
             return mCasterColObj;
         }
 
-        bool canTraverseWater() const;
+        void setHitWater()
+        {
+            mHitWater = true;
+        }
+
+        bool getHitWater() const
+        {
+            return mHitWater;
+        }
 
         void hit(const btCollisionObject* target, btVector3 pos, btVector3 normal);
 
         void setValidTargets(const std::vector<MWWorld::Ptr>& targets);
         bool isValidTarget(const btCollisionObject* target) const;
 
-        std::optional<btVector3> getWaterHitPosition();
-        void setWaterHitPosition(btVector3 pos);
+        btVector3 getHitPosition() const
+        {
+            return mHitPosition;
+        }
 
     private:
 
@@ -72,13 +81,11 @@ namespace MWPhysics
         btConvexShape* mConvexShape;
 
         bool mTransformUpdatePending;
-        bool mCanCrossWaterSurface;
-        bool mCrossedWaterSurface;
+        bool mHitWater;
         std::atomic<bool> mActive;
         MWWorld::Ptr mCaster;
         const btCollisionObject* mCasterColObj;
         const btCollisionObject* mHitTarget;
-        std::optional<btVector3> mWaterHitPosition;
         osg::Vec3f mPosition;
         btVector3 mHitPosition;
         btVector3 mHitNormal;
diff --git a/apps/openmw/mwphysics/projectileconvexcallback.cpp b/apps/openmw/mwphysics/projectileconvexcallback.cpp
index 687253e1cc..6520be787d 100644
--- a/apps/openmw/mwphysics/projectileconvexcallback.cpp
+++ b/apps/openmw/mwphysics/projectileconvexcallback.cpp
@@ -49,9 +49,7 @@ namespace MWPhysics
                 }
             case CollisionType_Water:
                 {
-                    mProjectile->setWaterHitPosition(m_hitPointWorld);
-                    if (mProjectile->canTraverseWater())
-                        return 1.f;
+                    mProjectile->setHitWater();
                     break;
                 }
         }
diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index 76c6ca7548..25e7f0c7de 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -317,7 +317,7 @@ namespace MWWorld
         // in case there are multiple effects, the model is a dummy without geometry. Use the second effect for physics shape
         if (state.mIdMagic.size() > 1)
             model = "meshes\\" + MWBase::Environment::get().getWorld()->getStore().get<ESM::Weapon>().find(state.mIdMagic[1])->mModel;
-        state.mProjectileId = mPhysics->addProjectile(caster, pos, model, true, false);
+        state.mProjectileId = mPhysics->addProjectile(caster, pos, model, true);
         state.mToDelete = false;
         mMagicBolts.push_back(state);
     }
@@ -342,7 +342,7 @@ namespace MWWorld
         if (!ptr.getClass().getEnchantment(ptr).empty())
             SceneUtil::addEnchantedGlow(state.mNode, mResourceSystem, ptr.getClass().getEnchantmentColor(ptr));
 
-        state.mProjectileId = mPhysics->addProjectile(actor, pos, model, false, true);
+        state.mProjectileId = mPhysics->addProjectile(actor, pos, model, false);
         state.mToDelete = false;
         mProjectiles.push_back(state);
     }
@@ -493,9 +493,6 @@ namespace MWWorld
 
             auto* projectile = mPhysics->getProjectile(projectileState.mProjectileId);
 
-            if (const auto hitWaterPos = projectile->getWaterHitPosition())
-                mRendering->emitWaterRipple(Misc::Convert::toOsg(*hitWaterPos));
-
             const auto pos = projectile->getPosition();
             projectileState.mNode->setPosition(pos);
 
@@ -519,6 +516,8 @@ namespace MWWorld
                 if (invIt != inv.end() && Misc::StringUtils::ciEqual(invIt->getCellRef().getRefId(), projectileState.mBowId))
                     bow = *invIt;
             }
+            if (projectile->getHitWater())
+                mRendering->emitWaterRipple(pos);
 
             MWMechanics::projectileHit(caster, target, bow, projectileRef.getPtr(), pos, projectileState.mAttackStrength);
             projectileState.mToDelete = true;
@@ -663,7 +662,7 @@ namespace MWWorld
                 int weaponType = ptr.get<ESM::Weapon>()->mBase->mData.mType;
                 state.mThrown = MWMechanics::getWeaponType(weaponType)->mWeaponClass == ESM::WeaponType::Thrown;
 
-                state.mProjectileId = mPhysics->addProjectile(state.getCaster(), osg::Vec3f(esm.mPosition), model, false, true);
+                state.mProjectileId = mPhysics->addProjectile(state.getCaster(), osg::Vec3f(esm.mPosition), model, false);
             }
             catch(...)
             {
@@ -716,7 +715,7 @@ namespace MWWorld
 
             osg::Vec4 lightDiffuseColor = getMagicBoltLightDiffuseColor(state.mEffects);
             createModel(state, model, osg::Vec3f(esm.mPosition), osg::Quat(esm.mOrientation), true, true, lightDiffuseColor, texture);
-            state.mProjectileId = mPhysics->addProjectile(state.getCaster(), osg::Vec3f(esm.mPosition), model, true, false);
+            state.mProjectileId = mPhysics->addProjectile(state.getCaster(), osg::Vec3f(esm.mPosition), model, true);
 
             MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
             for (const std::string &soundid : state.mSoundIds)
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index bc28c2eb7b..3f93aa033a 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -3145,6 +3145,7 @@ namespace MWWorld
         bool underwater = MWBase::Environment::get().getWorld()->isUnderwater(MWMechanics::getPlayer().getCell(), worldPos);
         if (underwater)
         {
+            MWMechanics::projectileHit(actor, Ptr(), bow, projectile, worldPos, attackStrength);
             mRendering->emitWaterRipple(worldPos);
             return;
         }

From d20730458db884ef0f05c06ab8497772ca15312b Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Thu, 12 Aug 2021 20:54:42 +0200
Subject: [PATCH 1274/2859] Replace std::map with std::unordered_map for
 mActors and mObjects. Use Ptr.mRef as a key instead of Ptr: it is constant
 for the lifetime of the object.

---
 apps/openmw/mwphysics/physicssystem.cpp | 109 +++++++++---------------
 apps/openmw/mwphysics/physicssystem.hpp |   5 +-
 2 files changed, 44 insertions(+), 70 deletions(-)

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 5b50962be9..d248b599ee 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -181,7 +181,7 @@ namespace MWPhysics
 
     void PhysicsSystem::markAsNonSolid(const MWWorld::ConstPtr &ptr)
     {
-        ObjectMap::iterator found = mObjects.find(ptr);
+        ObjectMap::iterator found = mObjects.find(ptr.mRef);
         if (found == mObjects.end())
             return;
 
@@ -198,7 +198,7 @@ namespace MWPhysics
         if (obj.isEmpty())
             return true; // assume standing on terrain (which is a non-object, so not collision tracked)
 
-        ObjectMap::const_iterator foundObj = mObjects.find(obj);
+        ObjectMap::const_iterator foundObj = mObjects.find(obj.mRef);
         if (foundObj == mObjects.end())
             return false;
 
@@ -374,8 +374,8 @@ namespace MWPhysics
 
     bool PhysicsSystem::getLineOfSight(const MWWorld::ConstPtr &actor1, const MWWorld::ConstPtr &actor2) const
     {
-        const auto it1 = mActors.find(actor1);
-        const auto it2 = mActors.find(actor2);
+        const auto it1 = mActors.find(actor1.mRef);
+        const auto it2 = mActors.find(actor2.mRef);
         if (it1 == mActors.end() || it2 == mActors.end())
             return false;
 
@@ -441,7 +441,7 @@ namespace MWPhysics
     {
         btCollisionObject* me = nullptr;
 
-        auto found = mObjects.find(ptr);
+        auto found = mObjects.find(ptr.mRef);
         if (found != mObjects.end())
             me = found->second->getCollisionObject();
         else
@@ -464,7 +464,7 @@ namespace MWPhysics
 
     osg::Vec3f PhysicsSystem::traceDown(const MWWorld::Ptr &ptr, const osg::Vec3f& position, float maxHeight)
     {
-        ActorMap::iterator found = mActors.find(ptr);
+        ActorMap::iterator found = mActors.find(ptr.mRef);
         if (found ==  mActors.end())
             return ptr.getRefData().getPosition().asVec3();
         return MovementSolver::traceDown(ptr, position, found->second.get(), mCollisionWorld.get(), maxHeight);
@@ -504,7 +504,7 @@ namespace MWPhysics
         assert(!getObject(ptr));
 
         auto obj = std::make_shared<Object>(ptr, shapeInstance, rotation, collisionType, mTaskScheduler.get());
-        mObjects.emplace(ptr, obj);
+        mObjects.emplace(ptr.mRef, obj);
 
         if (obj->isAnimated())
             mAnimatedObjects.insert(obj.get());
@@ -512,8 +512,7 @@ namespace MWPhysics
 
     void PhysicsSystem::remove(const MWWorld::Ptr &ptr)
     {
-        ObjectMap::iterator found = mObjects.find(ptr);
-        if (found != mObjects.end())
+        if (auto found = mObjects.find(ptr.mRef); found != mObjects.end())
         {
             if (mUnrefQueue.get())
                 mUnrefQueue->push(found->second->getShapeInstance());
@@ -522,11 +521,9 @@ namespace MWPhysics
 
             mObjects.erase(found);
         }
-
-        ActorMap::iterator foundActor = mActors.find(ptr);
-        if (foundActor != mActors.end())
+        else if (auto found = mActors.find(ptr.mRef); found != mActors.end())
         {
-            mActors.erase(foundActor);
+            mActors.erase(found);
         }
     }
 
@@ -539,22 +536,10 @@ namespace MWPhysics
 
     void PhysicsSystem::updatePtr(const MWWorld::Ptr &old, const MWWorld::Ptr &updated)
     {
-        ObjectMap::iterator found = mObjects.find(old);
-        if (found != mObjects.end())
-        {
-            auto obj = found->second;
-            obj->updatePtr(updated);
-            mObjects.erase(found);
-            mObjects.emplace(updated, std::move(obj));
-        }
-
-        auto actorNode = mActors.extract(old);
-        if (!actorNode.empty())
-        {
-            actorNode.key() = updated;
-            actorNode.mapped()->updatePtr(updated);
-            mActors.insert(std::move(actorNode));
-        }
+        if (auto found = mObjects.find(old.mRef); found != mObjects.end())
+            found->second->updatePtr(updated);
+        else if (auto found = mActors.find(old.mRef); found != mActors.end())
+            found->second->updatePtr(updated);
 
         for (auto& [_, actor] : mActors)
         {
@@ -572,7 +557,7 @@ namespace MWPhysics
 
     Actor *PhysicsSystem::getActor(const MWWorld::Ptr &ptr)
     {
-        ActorMap::iterator found = mActors.find(ptr);
+        ActorMap::iterator found = mActors.find(ptr.mRef);
         if (found != mActors.end())
             return found->second.get();
         return nullptr;
@@ -580,7 +565,7 @@ namespace MWPhysics
 
     const Actor *PhysicsSystem::getActor(const MWWorld::ConstPtr &ptr) const
     {
-        ActorMap::const_iterator found = mActors.find(ptr);
+        ActorMap::const_iterator found = mActors.find(ptr.mRef);
         if (found != mActors.end())
             return found->second.get();
         return nullptr;
@@ -588,7 +573,7 @@ namespace MWPhysics
 
     const Object* PhysicsSystem::getObject(const MWWorld::ConstPtr &ptr) const
     {
-        ObjectMap::const_iterator found = mObjects.find(ptr);
+        ObjectMap::const_iterator found = mObjects.find(ptr.mRef);
         if (found != mObjects.end())
             return found->second.get();
         return nullptr;
@@ -604,20 +589,16 @@ namespace MWPhysics
 
     void PhysicsSystem::updateScale(const MWWorld::Ptr &ptr)
     {
-        ObjectMap::iterator found = mObjects.find(ptr);
-        if (found != mObjects.end())
+        if (auto found = mObjects.find(ptr.mRef); found != mObjects.end())
         {
             float scale = ptr.getCellRef().getScale();
             found->second->setScale(scale);
             mTaskScheduler->updateSingleAabb(found->second);
-            return;
         }
-        ActorMap::iterator foundActor = mActors.find(ptr);
-        if (foundActor != mActors.end())
+        else if (auto found = mActors.find(ptr.mRef); found != mActors.end())
         {
-            foundActor->second->updateScale();
-            mTaskScheduler->updateSingleAabb(foundActor->second);
-            return;
+            found->second->updateScale();
+            mTaskScheduler->updateSingleAabb(found->second);
         }
     }
 
@@ -650,40 +631,32 @@ namespace MWPhysics
 
     void PhysicsSystem::updateRotation(const MWWorld::Ptr &ptr, osg::Quat rotate)
     {
-        ObjectMap::iterator found = mObjects.find(ptr);
-        if (found != mObjects.end())
+        if (auto found = mObjects.find(ptr.mRef); found != mObjects.end())
         {
             found->second->setRotation(rotate);
             mTaskScheduler->updateSingleAabb(found->second);
-            return;
         }
-        ActorMap::iterator foundActor = mActors.find(ptr);
-        if (foundActor != mActors.end())
+        else if (auto found = mActors.find(ptr.mRef); found != mActors.end())
         {
-            if (!foundActor->second->isRotationallyInvariant())
+            if (!found->second->isRotationallyInvariant())
             {
-                foundActor->second->setRotation(rotate);
-                mTaskScheduler->updateSingleAabb(foundActor->second);
+                found->second->setRotation(rotate);
+                mTaskScheduler->updateSingleAabb(found->second);
             }
-            return;
         }
     }
 
     void PhysicsSystem::updatePosition(const MWWorld::Ptr &ptr)
     {
-        ObjectMap::iterator found = mObjects.find(ptr);
-        if (found != mObjects.end())
+        if (auto found = mObjects.find(ptr.mRef); found != mObjects.end())
         {
             found->second->updatePosition();
             mTaskScheduler->updateSingleAabb(found->second);
-            return;
         }
-        ActorMap::iterator foundActor = mActors.find(ptr);
-        if (foundActor != mActors.end())
+        else if (auto found = mActors.find(ptr.mRef); found != mActors.end())
         {
-            foundActor->second->updatePosition();
-            mTaskScheduler->updateSingleAabb(foundActor->second, true);
-            return;
+            found->second->updatePosition();
+            mTaskScheduler->updateSingleAabb(found->second, true);
         }
     }
 
@@ -710,7 +683,7 @@ namespace MWPhysics
 
         auto actor = std::make_shared<Actor>(ptr, shape, mTaskScheduler.get(), canWaterWalk);
         
-        mActors.emplace(ptr, std::move(actor));
+        mActors.emplace(ptr.mRef, std::move(actor));
     }
 
     int PhysicsSystem::addProjectile (const MWWorld::Ptr& caster, const osg::Vec3f& position, const std::string& mesh, bool computeRadius, bool canTraverseWater)
@@ -738,7 +711,7 @@ namespace MWPhysics
 
     bool PhysicsSystem::toggleCollisionMode()
     {
-        ActorMap::iterator found = mActors.find(MWMechanics::getPlayer());
+        ActorMap::iterator found = mActors.find(MWMechanics::getPlayer().mRef);
         if (found != mActors.end())
         {
             bool cmode = found->second->getCollisionMode();
@@ -753,7 +726,7 @@ namespace MWPhysics
 
     void PhysicsSystem::queueObjectMovement(const MWWorld::Ptr &ptr, const osg::Vec3f &velocity)
     {
-        ActorMap::iterator found = mActors.find(ptr);
+        ActorMap::iterator found = mActors.find(ptr.mRef);
         if (found != mActors.end())
             found->second->setVelocity(velocity);
     }
@@ -770,13 +743,13 @@ namespace MWPhysics
         framedata.first.reserve(mActors.size());
         framedata.second.reserve(mActors.size());
         const MWBase::World *world = MWBase::Environment::get().getWorld();
-        for (const auto& [actor, physicActor] : mActors)
+        for (const auto& [ref, physicActor] : mActors)
         {
             auto ptr = physicActor->getPtr();
-            if (!actor.getClass().isMobile(ptr))
+            if (!ptr.getClass().isMobile(ptr))
                 continue;
             float waterlevel = -std::numeric_limits<float>::max();
-            const MWWorld::CellStore *cell = actor.getCell();
+            const MWWorld::CellStore *cell = ptr.getCell();
             if(cell->getCell()->hasWater())
                 waterlevel = cell->getWaterLevel();
 
@@ -786,7 +759,7 @@ namespace MWPhysics
             bool waterCollision = false;
             if (cell->getCell()->hasWater() && effects.get(ESM::MagicEffect::WaterWalking).getMagnitude())
             {
-                if (physicActor->getCollisionMode() || !world->isUnderwater(actor.getCell(), actor.getRefData().getPosition().asVec3()))
+                if (physicActor->getCollisionMode() || !world->isUnderwater(ptr.getCell(), ptr.getRefData().getPosition().asVec3()))
                     waterCollision = true;
             }
 
@@ -813,7 +786,7 @@ namespace MWPhysics
         {
             if (animatedObject->animateCollisionShapes())
             {
-                auto obj = mObjects.find(animatedObject->getPtr());
+                auto obj = mObjects.find(animatedObject->getPtr().mRef);
                 assert(obj != mObjects.end());
                 mTaskScheduler->updateSingleAabb(obj->second);
             }
@@ -851,7 +824,7 @@ namespace MWPhysics
 
     void PhysicsSystem::updateAnimatedCollisionShape(const MWWorld::Ptr& object)
     {
-        ObjectMap::iterator found = mObjects.find(object);
+        ObjectMap::iterator found = mObjects.find(object.mRef);
         if (found != mObjects.end())
             if (found->second->animateCollisionShapes())
                 mTaskScheduler->updateSingleAabb(found->second);
@@ -865,7 +838,7 @@ namespace MWPhysics
 
     bool PhysicsSystem::isActorStandingOn(const MWWorld::Ptr &actor, const MWWorld::ConstPtr &object) const
     {
-        const auto physActor = mActors.find(actor);
+        const auto physActor = mActors.find(actor.mRef);
         if (physActor != mActors.end())
             return physActor->second->getStandingOnPtr() == object;
         return false;
@@ -943,7 +916,7 @@ namespace MWPhysics
     bool PhysicsSystem::isAreaOccupiedByOtherActor(const osg::Vec3f& position, const float radius, const MWWorld::ConstPtr& ignore) const
     {
         btCollisionObject* object = nullptr;
-        const auto it = mActors.find(ignore);
+        const auto it = mActors.find(ignore.mRef);
         if (it != mActors.end())
             object = it->second->getCollisionObject();
         const auto bulletPosition = Misc::Convert::toBullet(position);
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index b20c8f88e1..78569bb0c3 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -5,6 +5,7 @@
 #include <memory>
 #include <map>
 #include <set>
+#include <unordered_map>
 #include <algorithm>
 
 #include <osg/Quat>
@@ -56,7 +57,7 @@ namespace MWPhysics
     class PhysicsTaskScheduler;
     class Projectile;
 
-    using ActorMap = std::map<MWWorld::ConstPtr, std::shared_ptr<Actor>>;
+    using ActorMap = std::unordered_map<const MWWorld::LiveCellRefBase*, std::shared_ptr<Actor>>;
 
     struct ContactPoint
     {
@@ -272,7 +273,7 @@ namespace MWPhysics
             std::unique_ptr<Resource::BulletShapeManager> mShapeManager;
             Resource::ResourceSystem* mResourceSystem;
 
-            using ObjectMap = std::map<MWWorld::ConstPtr, std::shared_ptr<Object>>;
+            using ObjectMap = std::unordered_map<const MWWorld::LiveCellRefBase*, std::shared_ptr<Object>>;
             ObjectMap mObjects;
 
             std::set<Object*> mAnimatedObjects; // stores pointers to elements in mObjects

From a8c16071dc8977aabf258578bbfd912f91c51701 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 4 Sep 2021 18:04:43 +0200
Subject: [PATCH 1275/2859] Fix -Wreturn-local-addr warning
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

/home/elsid/dev/openmw/apps/opencs/model/world/actoradapter.cpp: In member function ‘const string& CSMWorld::ActorAdapter::ActorData::getPart(ESM::PartReferenceType) const’:
/home/elsid/dev/openmw/apps/opencs/model/world/actoradapter.cpp:142:20: error: returning reference to temporary [-Werror=return-local-addr]
  142 |             return "";
      |                    ^~
---
 apps/opencs/model/world/actoradapter.cpp | 7 +++++--
 apps/opencs/model/world/actoradapter.hpp | 4 +++-
 apps/opencs/view/render/actor.cpp        | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/apps/opencs/model/world/actoradapter.cpp b/apps/opencs/model/world/actoradapter.cpp
index 86a621970c..7882dd4535 100644
--- a/apps/opencs/model/world/actoradapter.cpp
+++ b/apps/opencs/model/world/actoradapter.cpp
@@ -9,6 +9,9 @@
 
 #include "data.hpp"
 
+#include <string>
+#include <string_view>
+
 namespace CSMWorld
 {
     const std::string& ActorAdapter::RaceData::getId() const
@@ -121,7 +124,7 @@ namespace CSMWorld
         return SceneUtil::getActorSkeleton(firstPerson, mFemale, beast, werewolf);
     }
 
-    const std::string& ActorAdapter::ActorData::getPart(ESM::PartReferenceType index) const
+    std::string_view ActorAdapter::ActorData::getPart(ESM::PartReferenceType index) const
     {
         auto it = mParts.find(index);
         if (it == mParts.end())
@@ -139,7 +142,7 @@ namespace CSMWorld
                 return mRaceData->getMalePart(index);
             }
 
-            return "";
+            return {};
         }
 
         const std::string& partName = it->second.first;
diff --git a/apps/opencs/model/world/actoradapter.hpp b/apps/opencs/model/world/actoradapter.hpp
index df3eeff64e..826e3b9179 100644
--- a/apps/opencs/model/world/actoradapter.hpp
+++ b/apps/opencs/model/world/actoradapter.hpp
@@ -4,6 +4,8 @@
 #include <array>
 #include <map>
 #include <unordered_set>
+#include <string>
+#include <string_view>
 
 #include <QObject>
 #include <QModelIndex>
@@ -93,7 +95,7 @@ namespace CSMWorld
             /// Returns the skeleton the actor should use for attaching parts to
             std::string getSkeleton() const;
             /// Retrieves the associated actor part
-            const std::string& getPart(ESM::PartReferenceType index) const;
+            std::string_view getPart(ESM::PartReferenceType index) const;
             /// Checks if the actor has a data dependency
             bool hasDependency(const std::string& id) const;
 
diff --git a/apps/opencs/view/render/actor.cpp b/apps/opencs/view/render/actor.cpp
index d6077a65a5..10f7330d1c 100644
--- a/apps/opencs/view/render/actor.cpp
+++ b/apps/opencs/view/render/actor.cpp
@@ -96,7 +96,7 @@ namespace CSVRender
         for (int i = 0; i < ESM::PRT_Count; ++i)
         {
             auto type = (ESM::PartReferenceType) i;
-            std::string partId = mActorData->getPart(type);
+            const std::string partId(mActorData->getPart(type));
             attachBodyPart(type, getBodyPartMesh(partId));
         }
     }

From cb08f490d7efb9d4cede6edbfadec1f2af650aca Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sun, 29 Aug 2021 15:15:45 +0200
Subject: [PATCH 1276/2859] Sprinkle some const-ref in loop

This was done on the good advices of clang-tidy
---
 components/resource/keyframemanager.cpp |  2 +-
 components/shader/shadermanager.cpp     | 17 ++++++++---------
 components/terrain/buffercache.cpp      |  8 ++++----
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/components/resource/keyframemanager.cpp b/components/resource/keyframemanager.cpp
index 77c31d9ad7..444d2bd7aa 100644
--- a/components/resource/keyframemanager.cpp
+++ b/components/resource/keyframemanager.cpp
@@ -30,7 +30,7 @@ namespace Resource
 
                 std::vector<SceneUtil::EmulatedAnimation> emulatedAnimations;
 
-                for (auto animation : mAnimationManager->getAnimationList())
+                for (const auto& animation : mAnimationManager->getAnimationList())
                 {
                     if (animation)
                     {
diff --git a/components/shader/shadermanager.cpp b/components/shader/shadermanager.cpp
index 9b057cdfc6..33f79415f1 100644
--- a/components/shader/shadermanager.cpp
+++ b/components/shader/shadermanager.cpp
@@ -371,11 +371,10 @@ namespace Shader
     void ShaderManager::setGlobalDefines(DefineMap & globalDefines)
     {
         mGlobalDefines = globalDefines;
-        for (auto shaderMapElement: mShaders)
+        for (const auto& [key, shader]: mShaders)
         {
-            std::string templateId = shaderMapElement.first.first;
-            ShaderManager::DefineMap defines = shaderMapElement.first.second;
-            osg::ref_ptr<osg::Shader> shader = shaderMapElement.second;
+            std::string templateId = key.first;
+            ShaderManager::DefineMap defines = key.second;
             if (shader == nullptr)
                 // I'm not sure how to handle a shader that was already broken as there's no way to get a potential replacement to the nodes that need it.
                 continue;
@@ -391,13 +390,13 @@ namespace Shader
     void ShaderManager::releaseGLObjects(osg::State *state)
     {
         std::lock_guard<std::mutex> lock(mMutex);
-        for (auto shader : mShaders)
+        for (const auto& [_, shader] : mShaders)
         {
-            if (shader.second != nullptr)
-                shader.second->releaseGLObjects(state);
+            if (shader != nullptr)
+                shader->releaseGLObjects(state);
         }
-        for (auto program : mPrograms)
-            program.second->releaseGLObjects(state);
+        for (const auto& [_, program] : mPrograms)
+            program->releaseGLObjects(state);
     }
 
 }
diff --git a/components/terrain/buffercache.cpp b/components/terrain/buffercache.cpp
index f9eb7ae635..399df16d34 100644
--- a/components/terrain/buffercache.cpp
+++ b/components/terrain/buffercache.cpp
@@ -245,13 +245,13 @@ namespace Terrain
     {
         {
             std::lock_guard<std::mutex> lock(mIndexBufferMutex);
-            for (auto indexbuffer : mIndexBufferMap)
-                indexbuffer.second->releaseGLObjects(state);
+            for (const auto& [_, indexbuffer] : mIndexBufferMap)
+                indexbuffer->releaseGLObjects(state);
         }
         {
             std::lock_guard<std::mutex> lock(mUvBufferMutex);
-            for (auto uvbuffer : mUvBufferMap)
-                uvbuffer.second->releaseGLObjects(state);
+            for (const auto& [_, uvbuffer] : mUvBufferMap)
+                uvbuffer->releaseGLObjects(state);
         }
     }
 

From 1b1deeb59b56738c62dee2fe99aab51cadd8531c Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 4 Sep 2021 16:39:06 +0200
Subject: [PATCH 1277/2859] Fail CI build when not allowed warnings are present

Put -Wno-error after -Wall to make it work properly for clang.
---
 CI/before_script.linux.sh | 8 ++++++++
 CMakeLists.txt            | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CI/before_script.linux.sh b/CI/before_script.linux.sh
index 2687946f41..bc0eb0013d 100755
--- a/CI/before_script.linux.sh
+++ b/CI/before_script.linux.sh
@@ -14,6 +14,12 @@ if [[ "${BUILD_TESTS_ONLY}" ]]; then
     BUILD_BENCHMARKS=ON
 fi
 
+CXX_FLAGS='-Werror -Wno-error=deprecated-declarations -Wno-error=nonnull -Wno-error=deprecated-copy'
+
+if [[ "${CXX}" == 'clang++' ]]; then
+    CXX_FLAGS="${CXX_FLAGS} -Wno-error=unused-lambda-capture -Wno-error=gnu-zero-variadic-macro-arguments"
+fi
+
 declare -a CMAKE_CONF_OPTS=(
     -DCMAKE_C_COMPILER="${CC:-/usr/bin/cc}"
     -DCMAKE_CXX_COMPILER="${CXX:-/usr/bin/c++}"
@@ -24,6 +30,8 @@ declare -a CMAKE_CONF_OPTS=(
     -DBUILD_SHARED_LIBS=OFF
     -DUSE_SYSTEM_TINYXML=ON
     -DCMAKE_INSTALL_PREFIX=install
+    -DCMAKE_C_FLAGS='-Werror'
+    -DCMAKE_CXX_FLAGS="${CXX_FLAGS}"
 )
 
 if [[ $CI_OPENMW_USE_STATIC_DEPS ]]; then
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c733c22ff5..52a824d4e9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -512,7 +512,7 @@ endif()
 
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wundef -Wno-unused-parameter -pedantic -Wno-long-long")
+    set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wundef -Wno-unused-parameter -pedantic -Wno-long-long ${CMAKE_CXX_FLAGS}")
     add_definitions( -DBOOST_NO_CXX11_SCOPED_ENUMS=ON )
 
     if (APPLE)

From 43538a5ca56955e7466237fa4d5610f5e41efad8 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 6 Sep 2021 00:00:56 +0200
Subject: [PATCH 1278/2859] Support commulative timeseries graph for osg stats

---
 scripts/osg_stats.py | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/scripts/osg_stats.py b/scripts/osg_stats.py
index 140a911fea..3397b58f26 100755
--- a/scripts/osg_stats.py
+++ b/scripts/osg_stats.py
@@ -13,11 +13,14 @@ import statistics
 import sys
 import termtables
 
+
 @click.command()
 @click.option('--print_keys', is_flag=True,
               help='Print a list of all present keys in the input file.')
 @click.option('--timeseries', type=str, multiple=True,
               help='Show a graph for given metric over time.')
+@click.option('--commulative_timeseries', type=str, multiple=True,
+              help='Show a graph for commulative sum of a given metric over time.')
 @click.option('--hist', type=str, multiple=True,
               help='Show a histogram for all values of given metric.')
 @click.option('--hist_ratio', nargs=2, type=str, multiple=True,
@@ -34,6 +37,8 @@ import termtables
               help='Print table with stats for a given metric containing min, max, mean, median etc.')
 @click.option('--timeseries_sum', is_flag=True,
               help='Add a graph to timeseries for a sum per frame of all given timeseries metrics.')
+@click.option('--commulative_timeseries_sum', is_flag=True,
+            help='Add a graph to timeseries for a sum per frame of all given commulative timeseries.')
 @click.option('--stats_sum', is_flag=True,
               help='Add a row to stats table for a sum per frame of all given stats metrics.')
 @click.option('--begin_frame', type=int, default=0,
@@ -42,7 +47,8 @@ import termtables
               help='End processing at this frame.')
 @click.argument('path', default='', type=click.Path())
 def main(print_keys, timeseries, hist, hist_ratio, stdev_hist, plot, stats,
-         timeseries_sum, stats_sum, begin_frame, end_frame, path):
+         timeseries_sum, stats_sum, begin_frame, end_frame, path,
+         commulative_timeseries, commulative_timeseries_sum):
     data = list(read_data(path))
     keys = collect_unique_keys(data)
     frames = collect_per_frame(data=data, keys=keys, begin_frame=begin_frame, end_frame=end_frame)
@@ -50,7 +56,9 @@ def main(print_keys, timeseries, hist, hist_ratio, stdev_hist, plot, stats,
         for v in keys:
             print(v)
     if timeseries:
-        draw_timeseries(frames=frames, keys=timeseries, timeseries_sum=timeseries_sum)
+        draw_timeseries(frames=frames, keys=timeseries, add_sum=timeseries_sum)
+    if commulative_timeseries:
+        draw_commulative_timeseries(frames=frames, keys=commulative_timeseries, add_sum=commulative_timeseries_sum)
     if hist:
         draw_hists(frames=frames, keys=hist)
     if hist_ratio:
@@ -105,18 +113,30 @@ def collect_unique_keys(frames):
     return sorted(result)
 
 
-def draw_timeseries(frames, keys, timeseries_sum):
+def draw_timeseries(frames, keys, add_sum):
     fig, ax = matplotlib.pyplot.subplots()
     x = numpy.array(range(max(len(v) for k, v in frames.items() if k in keys)))
     for key in keys:
         ax.plot(x, frames[key], label=key)
-    if timeseries_sum:
+    if add_sum:
         ax.plot(x, numpy.sum(list(frames[k] for k in keys), axis=0), label='sum')
     ax.grid(True)
     ax.legend()
     fig.canvas.set_window_title('timeseries')
 
 
+def draw_commulative_timeseries(frames, keys, add_sum):
+    fig, ax = matplotlib.pyplot.subplots()
+    x = numpy.array(range(max(len(v) for k, v in frames.items() if k in keys)))
+    for key in keys:
+        ax.plot(x, numpy.cumsum(frames[key]), label=key)
+    if add_sum:
+        ax.plot(x, numpy.cumsum(numpy.sum(list(frames[k] for k in keys), axis=0)), label='sum')
+    ax.grid(True)
+    ax.legend()
+    fig.canvas.set_window_title('commulative_timeseries')
+
+
 def draw_hists(frames, keys):
     fig, ax = matplotlib.pyplot.subplots()
     bins = numpy.linspace(

From 7b26058fa51fc1db24d8583b094d20add4b1a0a1 Mon Sep 17 00:00:00 2001
From: Frederic Chardon <chardon.frederic@gmail.com>
Date: Mon, 6 Sep 2021 11:47:21 +0200
Subject: [PATCH 1279/2859] moveObject() has side effects that might invalidate
 iterators from mActors. Instead of iterating over mActors, make a copy of
 needed data and iterate over the copies.

---
 apps/openmw/mwphysics/physicssystem.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index d248b599ee..b3c4ef6168 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -813,12 +813,20 @@ namespace MWPhysics
     {
         auto* player = getActor(MWMechanics::getPlayer());
         auto* world = MWBase::Environment::get().getWorld();
-        for (auto& [ptr, physicActor] : mActors)
+
+        // copy new ptr position in temporary vector. player is handled separately as its movement might change active cell.
+        std::vector<std::pair<MWWorld::Ptr, osg::Vec3f>> newPositions;
+        newPositions.reserve(mActors.size() - 1);
+        for (const auto& [ptr, physicActor] : mActors)
         {
             if (physicActor.get() == player)
                 continue;
-            world->moveObject(physicActor->getPtr(), physicActor->getSimulationPosition(), false, false);
+            newPositions.emplace_back(physicActor->getPtr(), physicActor->getSimulationPosition());
         }
+
+        for (auto& [ptr, pos] : newPositions)
+            world->moveObject(ptr, pos, false, false);
+
         world->moveObject(player->getPtr(), player->getSimulationPosition(), false, false);
     }
 

From b0f772af405c60f74fd98279ef509e4d32495e81 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 25 Aug 2021 20:49:22 +0200
Subject: [PATCH 1280/2859] Define dependency to OSG plugins in one place

Each binary depending on components library requires OSG plugins to be linked.
Duplicating dependecies for each binary does not give benefits and brings
problems when new binary is added.
---
 apps/opencs/CMakeLists.txt | 25 -------------------------
 apps/openmw/CMakeLists.txt | 25 -------------------------
 components/CMakeLists.txt  | 25 +++++++++++++++++++++++++
 3 files changed, 25 insertions(+), 50 deletions(-)

diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 5435de07e2..4b3b8030e6 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -232,31 +232,6 @@ target_link_libraries(openmw-cs
     components_qt
 )
 
-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()
-endif(OSG_STATIC)
-
 target_link_libraries(openmw-cs Qt5::Widgets Qt5::Core Qt5::Network Qt5::OpenGL)
 
 if (WIN32)
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 53e35f3310..5605ff229e 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -155,31 +155,6 @@ target_link_libraries(openmw
     ${LUA_LIBRARIES}
 )
 
-if(OSG_STATIC)
-    unset(_osg_plugins_static_files)
-    add_library(openmw_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_osg_plugins INTERFACE $<TARGET_PROPERTY:${${_plugin_uc}_LIBRARY},LINK_LIBRARIES>)
-            add_dependencies(openmw_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_osg_plugins INTERFACE ${_opts})
-    target_link_libraries(openmw openmw_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()
-endif(OSG_STATIC)
-
 if (ANDROID)
     target_link_libraries(openmw EGL android log z)
 endif (ANDROID)
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 3de864ea52..6e7d6e379d 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -304,3 +304,28 @@ endif()
 set(COMPONENT_FILES ${COMPONENT_FILES} PARENT_SCOPE)
 
 target_compile_definitions(components PUBLIC BT_USE_DOUBLE_PRECISION)
+
+if(OSG_STATIC)
+    unset(_osg_plugins_static_files)
+    add_library(components_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(components_osg_plugins INTERFACE $<TARGET_PROPERTY:${${_plugin_uc}_LIBRARY},LINK_LIBRARIES>)
+            add_dependencies(components_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(components_osg_plugins INTERFACE ${_opts})
+    target_link_libraries(components components_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(components freetype jpeg png)
+    endif()
+endif(OSG_STATIC)

From e910dd7a25833e69098c08531efa5dcedcf61e01 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 20 Aug 2021 00:09:31 +0200
Subject: [PATCH 1281/2859] Rename CellRef::getRefIdPtr -> getRefIdRef and
 return reference

Return value can't be nullptr. Pointer complicates the code because has to be
dereferenced.

Also move function definition to hpp to make it easier for compiler to optimize
calls.
---
 apps/openmw/mwlua/actions.cpp       | 2 +-
 apps/openmw/mwlua/luamanagerimp.cpp | 2 +-
 apps/openmw/mwlua/object.cpp        | 6 +++---
 apps/openmw/mwworld/cellref.cpp     | 5 -----
 apps/openmw/mwworld/cellref.hpp     | 4 ++--
 apps/openmw/mwworld/cells.cpp       | 2 +-
 apps/openmw/mwworld/cellstore.cpp   | 4 ++--
 7 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/apps/openmw/mwlua/actions.cpp b/apps/openmw/mwlua/actions.cpp
index 500ad98490..1f75760f7c 100644
--- a/apps/openmw/mwlua/actions.cpp
+++ b/apps/openmw/mwlua/actions.cpp
@@ -71,7 +71,7 @@ namespace MWLua
             else
             {
                 const std::string& recordId = std::get<std::string>(item);
-                if (old_it != store.end() && *old_it->getCellRef().getRefIdPtr() == recordId)
+                if (old_it != store.end() && old_it->getCellRef().getRefIdRef() == recordId)
                     return true;  // already equipped
                 itemPtr = store.search(recordId);
                 if (itemPtr.isEmpty() || itemPtr.getRefData().getCount() == 0)
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index d358979aec..1e009081ff 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -284,7 +284,7 @@ namespace MWLua
         std::shared_ptr<LocalScripts> scripts;
         // When loading a game, it can be called before LuaManager::setPlayer,
         // so we can't just check ptr == mPlayer here.
-        if (*ptr.getCellRef().getRefIdPtr() == "player")
+        if (ptr.getCellRef().getRefIdRef() == "player")
         {
             scripts = std::make_shared<PlayerScripts>(&mLua, LObject(getId(ptr), mWorldView.getObjectRegistry()));
             scripts->addPackage("openmw.ui", mUserInterfacePackage);
diff --git a/apps/openmw/mwlua/object.cpp b/apps/openmw/mwlua/object.cpp
index 696179d003..d94ce1f49d 100644
--- a/apps/openmw/mwlua/object.cpp
+++ b/apps/openmw/mwlua/object.cpp
@@ -51,13 +51,13 @@ namespace MWLua
 
     bool isMarker(const MWWorld::Ptr& ptr)
     {
-        std::string_view id = *ptr.getCellRef().getRefIdPtr();
+        std::string_view id = ptr.getCellRef().getRefIdRef();
         return id == "prisonmarker" || id == "divinemarker" || id == "templemarker" || id == "northmarker";
     }
 
     std::string_view getMWClassName(const MWWorld::Ptr& ptr)
     {
-        if (*ptr.getCellRef().getRefIdPtr() == "player")
+        if (ptr.getCellRef().getRefIdRef() == "player")
             return "Player";
         if (isMarker(ptr))
             return "Marker";
@@ -71,7 +71,7 @@ namespace MWLua
         res.append(" (");
         res.append(getMWClassName(ptr));
         res.append(", ");
-        res.append(*ptr.getCellRef().getRefIdPtr());
+        res.append(ptr.getCellRef().getRefIdRef());
         res.append(")");
         return res;
     }
diff --git a/apps/openmw/mwworld/cellref.cpp b/apps/openmw/mwworld/cellref.cpp
index 5e91ddcc67..0b16964043 100644
--- a/apps/openmw/mwworld/cellref.cpp
+++ b/apps/openmw/mwworld/cellref.cpp
@@ -48,11 +48,6 @@ namespace MWWorld
         return mCellRef.mRefID;
     }
 
-    const std::string* CellRef::getRefIdPtr() const
-    {
-        return &mCellRef.mRefID;
-    }
-
     bool CellRef::getTeleport() const
     {
         return mCellRef.mTeleport;
diff --git a/apps/openmw/mwworld/cellref.hpp b/apps/openmw/mwworld/cellref.hpp
index 6a6ac69c57..78170a766f 100644
--- a/apps/openmw/mwworld/cellref.hpp
+++ b/apps/openmw/mwworld/cellref.hpp
@@ -38,8 +38,8 @@ namespace MWWorld
         // Id of object being referenced
         std::string getRefId() const;
 
-        // Pointer to ID of the object being referenced
-        const std::string* getRefIdPtr() const;
+        // Reference to ID of the object being referenced
+        const std::string& getRefIdRef() const { return mCellRef.mRefID; }
 
         // For doors - true if this door teleports to somewhere else, false
         // if it should open through animation.
diff --git a/apps/openmw/mwworld/cells.cpp b/apps/openmw/mwworld/cells.cpp
index ad4dfcfb90..d020eace45 100644
--- a/apps/openmw/mwworld/cells.cpp
+++ b/apps/openmw/mwworld/cells.cpp
@@ -36,7 +36,7 @@ namespace
             }
             bool cont = cell.second.forEach([&] (MWWorld::Ptr ptr)
             {
-                if(*ptr.getCellRef().getRefIdPtr() == id)
+                if (ptr.getCellRef().getRefIdRef() == id)
                 {
                     return visitor(ptr);
                 }
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 37c4e178ad..3d82a30c29 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -181,7 +181,7 @@ namespace
         {
             for (typename MWWorld::CellRefList<T>::List::iterator iter (collection.mList.begin());
                 iter!=collection.mList.end(); ++iter)
-                if (iter->mRef.getRefNum()==state.mRef.mRefNum && *iter->mRef.getRefIdPtr() == state.mRef.mRefID)
+                if (iter->mRef.getRefNum()==state.mRef.mRefNum && iter->mRef.getRefIdRef() == state.mRef.mRefID)
                 {
                     // overwrite existing reference
                     float oldscale = iter->mRef.getScale();
@@ -417,7 +417,7 @@ namespace MWWorld
         const std::string *mIdToFind;
         bool operator()(const PtrType& ptr)
         {
-            if (*ptr.getCellRef().getRefIdPtr() == *mIdToFind)
+            if (ptr.getCellRef().getRefIdRef() == *mIdToFind)
             {
                 mFound = ptr;
                 return false;

From 403f0a72f0b1ace7647f3b2421bc156604bbd16e Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 20 Aug 2021 00:13:39 +0200
Subject: [PATCH 1282/2859] Do not copy RefId when need to compare

Makes ContainerStore::stacks ~4x times faster when adding 4k different items
in a single frame.
---
 apps/openmw/mwworld/containerstore.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index cced17688d..b02c2bb407 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -184,7 +184,7 @@ int MWWorld::ContainerStore::count(const std::string &id) const
 {
     int total=0;
     for (const auto&& iter : *this)
-        if (Misc::StringUtils::ciEqual(iter.getCellRef().getRefId(), id))
+        if (Misc::StringUtils::ciEqual(iter.getCellRef().getRefIdRef(), id))
             total += iter.getRefData().getCount();
     return total;
 }
@@ -249,7 +249,7 @@ bool MWWorld::ContainerStore::stacks(const ConstPtr& ptr1, const ConstPtr& ptr2)
     const MWWorld::Class& cls1 = ptr1.getClass();
     const MWWorld::Class& cls2 = ptr2.getClass();
 
-    if (!Misc::StringUtils::ciEqual(ptr1.getCellRef().getRefId(), ptr2.getCellRef().getRefId()))
+    if (!Misc::StringUtils::ciEqual(ptr1.getCellRef().getRefIdRef(), ptr2.getCellRef().getRefIdRef()))
         return false;
 
     // If it has an enchantment, don't stack when some of the charge is already used
@@ -364,7 +364,7 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::addImp (const Ptr& ptr,
 
         for (MWWorld::ContainerStoreIterator iter (begin(type)); iter!=end(); ++iter)
         {
-            if (Misc::StringUtils::ciEqual((*iter).getCellRef().getRefId(), MWWorld::ContainerStore::sGoldId))
+            if (Misc::StringUtils::ciEqual(iter->getCellRef().getRefIdRef(), MWWorld::ContainerStore::sGoldId))
             {
                 iter->getRefData().setCount(addItems(iter->getRefData().getCount(false), realCount));
                 flagAsModified();
@@ -465,7 +465,7 @@ int MWWorld::ContainerStore::remove(const std::string& itemId, int count, const
     int toRemove = count;
 
     for (ContainerStoreIterator iter(begin()); iter != end() && toRemove > 0; ++iter)
-        if (Misc::StringUtils::ciEqual(iter->getCellRef().getRefId(), itemId))
+        if (Misc::StringUtils::ciEqual(iter->getCellRef().getRefIdRef(), itemId))
             toRemove -= remove(*iter, toRemove, actor, equipReplacement, resolveFirst);
 
     flagAsModified();
@@ -740,7 +740,7 @@ MWWorld::Ptr MWWorld::ContainerStore::findReplacement(const std::string& id)
     for (auto&& iter : *this)
     {
         int iterHealth = iter.getClass().hasItemHealth(iter) ? iter.getClass().getItemHealth(iter) : 1;
-        if (Misc::StringUtils::ciEqual(iter.getCellRef().getRefId(), id))
+        if (Misc::StringUtils::ciEqual(iter.getCellRef().getRefIdRef(), id))
         {
             // Prefer the stack with the lowest remaining uses
             // Try to get item with zero durability only if there are no other items found

From e30709170d10644a6d64e63f54972925ec6cfb33 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 7 Sep 2021 00:04:44 +0200
Subject: [PATCH 1283/2859] Add script to find missing merge requests

---
 scripts/find_missing_merge_requests.py | 82 ++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100755 scripts/find_missing_merge_requests.py

diff --git a/scripts/find_missing_merge_requests.py b/scripts/find_missing_merge_requests.py
new file mode 100755
index 0000000000..09d3e9a581
--- /dev/null
+++ b/scripts/find_missing_merge_requests.py
@@ -0,0 +1,82 @@
+#!/usr/bin/env python3
+
+import click
+import multiprocessing
+import pathlib
+import requests
+import urllib.parse
+
+
+@click.command()
+@click.option('--token_path', type=str, default=pathlib.Path.home() / '.gitlab_token',
+              help='Path to text file with Gitlab token.')
+@click.option('--project_id', type=int, default=7107382,
+              help='Gitlab project id.')
+@click.option('--host', type=str, default='gitlab.com',
+              help='Gitlab host.')
+@click.option('--workers', type=int, default=10,
+              help='Number of parallel workers.')
+@click.option('--target_branch', type=str, default='master',
+              help='Merge request target branch.')
+@click.option('--begin_page', type=int, default=1,
+              help='Begin with given /merge_requests page.')
+@click.option('--end_page', type=int, default=4,
+              help='End before given /merge_requests page.')
+@click.option('--per_page', type=int, default=100,
+              help='Number of merge requests per page.')
+def main(token_path, project_id, host, workers, target_branch, begin_page, end_page, per_page):
+    token = read_token(token_path)
+    base_url = f'https://{host}/api/v4/projects/{project_id}/'
+    checked = 0
+    filtered = 0
+    missing = 0
+    for page in range(begin_page, end_page):
+        merge_requests = requests.get(
+            url=urllib.parse.urljoin(base_url, 'merge_requests'),
+            headers={'PRIVATE-TOKEN': token},
+            params=dict(state='merged', per_page=per_page, page=page),
+        ).json()
+        if not merge_requests:
+            break
+        checked += len(merge_requests)
+        merge_requests = [v for v in merge_requests if v['target_branch'] == target_branch]
+        if not merge_requests:
+            continue
+        filtered += len(merge_requests)
+        with multiprocessing.Pool(workers) as pool:
+            missing_merge_requests = pool.map(FilterMissingMergeRequest(token, base_url), merge_requests)
+            for mr in missing_merge_requests:
+                if mr is not None:
+                    missing += 1
+                    print(f"MR {mr['reference']} ({mr['id']}) is missing from branch {mr['target_branch']},"
+                          f" previously was merged as {mr['merge_commit_sha']}")
+    print(f'Checked {checked} MRs ({filtered} with {target_branch} target branch), {missing} are missing')
+
+
+class FilterMissingMergeRequest:
+    def __init__(self, token, base_url):
+        self.token = token
+        self.base_url = base_url
+
+    def __call__(self, merge_request):
+        commit_refs = requests.get(
+            url=urllib.parse.urljoin(self.base_url, f"repository/commits/{merge_request['merge_commit_sha']}/refs"),
+            headers={'PRIVATE-TOKEN': self.token},
+        ).json()
+        if 'message' in commit_refs and commit_refs['message'] == '404 Commit Not Found':
+            return merge_request
+        if not present_in_branch(commit_refs, branch=merge_request['target_branch']):
+            return merge_request
+
+
+def present_in_branch(commit_refs, branch):
+    return bool(next((v for v in commit_refs if v['type'] == 'branch' and v['name'] == branch), None))
+
+
+def read_token(path):
+    with open(path) as stream:
+        return stream.readline().strip()
+
+
+if __name__ == '__main__':
+    main()

From 605cb8db7c2f6fa8f9fea4e5ac5641867ba7a20e Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 5 Sep 2021 17:43:46 +0200
Subject: [PATCH 1284/2859] Make sync terrain preloading sleep free

This reduces average time spent on in. 5 milliseconds as a base precision is
quite a lot considering that for 60 FPS frame time is 1000/16 = ~16.67 ms
when it's a cell loading frame and there is more important work to do rather
than sleeping.
---
 apps/openmw/mwworld/cellpreloader.cpp   | 22 ++++++-------
 apps/openmw/mwworld/cellpreloader.hpp   |  7 ++++-
 apps/openmw/mwworld/scene.cpp           | 21 +++----------
 components/CMakeLists.txt               |  4 +++
 components/loadinglistener/reporter.cpp | 41 +++++++++++++++++++++++++
 components/loadinglistener/reporter.hpp | 32 +++++++++++++++++++
 components/terrain/quadtreeworld.cpp    | 13 +++++---
 components/terrain/quadtreeworld.hpp    |  2 +-
 components/terrain/world.hpp            |  7 ++++-
 9 files changed, 113 insertions(+), 36 deletions(-)
 create mode 100644 components/loadinglistener/reporter.cpp
 create mode 100644 components/loadinglistener/reporter.hpp

diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index a2167c562f..7b6f640373 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -14,6 +14,7 @@
 #include <components/terrain/world.hpp>
 #include <components/sceneutil/unrefqueue.hpp>
 #include <components/esm/loadcell.hpp>
+#include <components/loadinglistener/reporter.hpp>
 
 #include "../mwrender/landmanager.hpp"
 
@@ -157,8 +158,6 @@ namespace MWWorld
     public:
         TerrainPreloadItem(const std::vector<osg::ref_ptr<Terrain::View> >& views, Terrain::World* world, const std::vector<CellPreloader::PositionCellGrid>& preloadPositions)
             : mAbort(false)
-            , mProgress(views.size())
-            , mProgressRange(0)
             , mTerrainViews(views)
             , mWorld(world)
             , mPreloadPositions(preloadPositions)
@@ -178,8 +177,9 @@ namespace MWWorld
             for (unsigned int i=0; i<mTerrainViews.size() && i<mPreloadPositions.size() && !mAbort; ++i)
             {
                 mTerrainViews[i]->reset();
-                mWorld->preload(mTerrainViews[i], mPreloadPositions[i].first, mPreloadPositions[i].second, mAbort, mProgress[i], mProgressRange);
+                mWorld->preload(mTerrainViews[i], mPreloadPositions[i].first, mPreloadPositions[i].second, mAbort, mLoadingReporter);
             }
+            mLoadingReporter.complete();
         }
 
         void abort() override
@@ -187,16 +187,17 @@ namespace MWWorld
             mAbort = true;
         }
 
-        int getProgress() const { return !mProgress.empty() ? mProgress[0].load() : 0; }
-        int getProgressRange() const { return !mProgress.empty() && mProgress[0].load() ? mProgressRange : 0; }
+        void wait(Loading::Listener& listener) const
+        {
+            mLoadingReporter.wait(listener);
+        }
 
     private:
         std::atomic<bool> mAbort;
-        std::vector<std::atomic<int>> mProgress;
-        int mProgressRange;
         std::vector<osg::ref_ptr<Terrain::View> > mTerrainViews;
         Terrain::World* mWorld;
         std::vector<CellPreloader::PositionCellGrid> mPreloadPositions;
+        Loading::Reporter mLoadingReporter;
     };
 
     /// Worker thread item: update the resource system's cache, effectively deleting unused entries.
@@ -415,7 +416,7 @@ namespace MWWorld
         mUnrefQueue = unrefQueue;
     }
 
-    bool CellPreloader::syncTerrainLoad(const std::vector<CellPreloader::PositionCellGrid> &positions, int& progress, int& progressRange, double timestamp)
+    bool CellPreloader::syncTerrainLoad(const std::vector<CellPreloader::PositionCellGrid> &positions, double timestamp, Loading::Listener& listener)
     {
         if (!mTerrainPreloadItem)
             return true;
@@ -435,9 +436,8 @@ namespace MWWorld
         }
         else
         {
-            progress = mTerrainPreloadItem->getProgress();
-            progressRange = mTerrainPreloadItem->getProgressRange();
-            return false;
+            mTerrainPreloadItem->wait(listener);
+            return true;
         }
     }
 
diff --git a/apps/openmw/mwworld/cellpreloader.hpp b/apps/openmw/mwworld/cellpreloader.hpp
index e719f2e606..e2eea33146 100644
--- a/apps/openmw/mwworld/cellpreloader.hpp
+++ b/apps/openmw/mwworld/cellpreloader.hpp
@@ -29,6 +29,11 @@ namespace MWRender
     class LandManager;
 }
 
+namespace Loading
+{
+    class Listener;
+}
+
 namespace MWWorld
 {
     class CellStore;
@@ -72,7 +77,7 @@ namespace MWWorld
         typedef std::pair<osg::Vec3f, osg::Vec4i> PositionCellGrid;
         void setTerrainPreloadPositions(const std::vector<PositionCellGrid>& positions);
 
-        bool syncTerrainLoad(const std::vector<CellPreloader::PositionCellGrid> &positions, int& progress, int& progressRange, double timestamp);
+        bool syncTerrainLoad(const std::vector<CellPreloader::PositionCellGrid> &positions, double timestamp, Loading::Listener& listener);
         void abortTerrainPreloadExcept(const PositionCellGrid *exceptPos);
 
     private:
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 90e5bc265e..399d0e6d7f 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -1250,23 +1250,10 @@ namespace MWWorld
 
         Loading::Listener* loadingListener = MWBase::Environment::get().getWindowManager()->getLoadingScreen();
         Loading::ScopedLoad load(loadingListener);
-        int progress = 0, initialProgress = -1, progressRange = 0;
-        while (!mPreloader->syncTerrainLoad(vec, progress, progressRange, mRendering.getReferenceTime()))
-        {
-            if (initialProgress == -1)
-            {
-                loadingListener->setLabel("#{sLoadingMessage4}");
-                initialProgress = progress;
-            }
-            if (progress)
-            {
-                loadingListener->setProgressRange(std::max(0, progressRange-initialProgress));
-                loadingListener->setProgress(progress-initialProgress);
-            }
-            else
-                loadingListener->setProgress(0);
-            std::this_thread::sleep_for(std::chrono::milliseconds(5));
-        }
+
+        loadingListener->setLabel("#{sLoadingMessage4}");
+
+        while (!mPreloader->syncTerrainLoad(vec, mRendering.getReferenceTime(), *loadingListener)) {}
     }
 
     void Scene::reloadTerrain()
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 6e7d6e379d..7983de6190 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -197,6 +197,10 @@ add_component_dir(detournavigator
     navmeshcacheitem
     )
 
+add_component_dir(loadinglistener
+    reporter
+    )
+
 set (ESM_UI ${CMAKE_SOURCE_DIR}/files/ui/contentselector.ui
     )
 
diff --git a/components/loadinglistener/reporter.cpp b/components/loadinglistener/reporter.cpp
new file mode 100644
index 0000000000..0ad04fded1
--- /dev/null
+++ b/components/loadinglistener/reporter.cpp
@@ -0,0 +1,41 @@
+#include "reporter.hpp"
+#include "loadinglistener.hpp"
+
+#include <condition_variable>
+#include <cstddef>
+#include <mutex>
+
+namespace Loading
+{
+    void Reporter::addTotal(std::size_t value)
+    {
+        const std::lock_guard lock(mMutex);
+        mTotal += value;
+        mUpdated.notify_all();
+    }
+
+    void Reporter::addProgress(std::size_t value)
+    {
+        const std::lock_guard lock(mMutex);
+        mProgress += value;
+        mUpdated.notify_all();
+    }
+
+    void Reporter::complete()
+    {
+        const std::lock_guard lock(mMutex);
+        mDone = true;
+        mUpdated.notify_all();
+    }
+
+    void Reporter::wait(Listener& listener) const
+    {
+        std::unique_lock lock(mMutex);
+        while (!mDone)
+        {
+            listener.setProgressRange(mTotal);
+            listener.setProgress(mProgress);
+            mUpdated.wait(lock);
+        }
+    }
+}
diff --git a/components/loadinglistener/reporter.hpp b/components/loadinglistener/reporter.hpp
new file mode 100644
index 0000000000..b59c519082
--- /dev/null
+++ b/components/loadinglistener/reporter.hpp
@@ -0,0 +1,32 @@
+#ifndef COMPONENTS_LOADINGLISTENER_REPORTER_H
+#define COMPONENTS_LOADINGLISTENER_REPORTER_H
+
+#include <condition_variable>
+#include <cstddef>
+#include <mutex>
+
+namespace Loading
+{
+    class Listener;
+
+    class Reporter
+    {
+    public:
+        void addTotal(std::size_t value);
+
+        void addProgress(std::size_t value);
+
+        void complete();
+
+        void wait(Listener& listener) const;
+
+    private:
+        std::size_t mProgress = 0;
+        std::size_t mTotal = 0;
+        bool mDone = false;
+        mutable std::mutex mMutex;
+        mutable std::condition_variable mUpdated;
+    };
+}
+
+#endif
diff --git a/components/terrain/quadtreeworld.cpp b/components/terrain/quadtreeworld.cpp
index e26fc1b617..9ca504ebeb 100644
--- a/components/terrain/quadtreeworld.cpp
+++ b/components/terrain/quadtreeworld.cpp
@@ -10,6 +10,7 @@
 #include <components/misc/constants.hpp>
 #include <components/sceneutil/mwshadowtechnique.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
+#include <components/loadinglistener/reporter.hpp>
 
 #include "quadtreenode.hpp"
 #include "storage.hpp"
@@ -496,7 +497,7 @@ View* QuadTreeWorld::createView()
     return mViewDataMap->createIndependentView();
 }
 
-void QuadTreeWorld::preload(View *view, const osg::Vec3f &viewPoint, const osg::Vec4i &grid, std::atomic<bool> &abort, std::atomic<int> &progress, int& progressTotal)
+void QuadTreeWorld::preload(View *view, const osg::Vec3f &viewPoint, const osg::Vec4i &grid, std::atomic<bool> &abort, Loading::Reporter& reporter)
 {
     ensureQuadTreeBuilt();
 
@@ -506,16 +507,18 @@ void QuadTreeWorld::preload(View *view, const osg::Vec3f &viewPoint, const osg::
     DefaultLodCallback lodCallback(mLodFactor, mMinSize, mViewDistance, grid);
     mRootNode->traverseNodes(vd, viewPoint, &lodCallback);
 
-    if (!progressTotal)
-        for (unsigned int i=0; i<vd->getNumEntries(); ++i)
-            progressTotal += vd->getEntry(i).mNode->getSize();
+    std::size_t progressTotal = 0;
+    for (unsigned int i = 0, n = vd->getNumEntries(); i < n; ++i)
+        progressTotal += vd->getEntry(i).mNode->getSize();
+
+    reporter.addTotal(progressTotal);
 
     const float cellWorldSize = mStorage->getCellWorldSize();
     for (unsigned int i=0; i<vd->getNumEntries() && !abort; ++i)
     {
         ViewData::Entry& entry = vd->getEntry(i);
         loadRenderingNode(entry, vd, mVertexLodMod, cellWorldSize, grid, mChunkManagers, true);
-        progress += entry.mNode->getSize();
+        reporter.addProgress(entry.mNode->getSize());
     }
     vd->markUnchanged();
 }
diff --git a/components/terrain/quadtreeworld.hpp b/components/terrain/quadtreeworld.hpp
index 2ddea42049..3a2aa8349d 100644
--- a/components/terrain/quadtreeworld.hpp
+++ b/components/terrain/quadtreeworld.hpp
@@ -39,7 +39,7 @@ namespace Terrain
         void unloadCell(int x, int y) override;
 
         View* createView() override;
-        void preload(View* view, const osg::Vec3f& eyePoint, const osg::Vec4i &cellgrid, std::atomic<bool>& abort, std::atomic<int>& progress, int& progressRange) override;
+        void preload(View* view, const osg::Vec3f& eyePoint, const osg::Vec4i &cellgrid, std::atomic<bool>& abort, Loading::Reporter& reporter) override;
         bool storeView(const View* view, double referenceTime) override;
         void rebuildViews() override;
 
diff --git a/components/terrain/world.hpp b/components/terrain/world.hpp
index 5797d894ef..b62a1cb568 100644
--- a/components/terrain/world.hpp
+++ b/components/terrain/world.hpp
@@ -32,6 +32,11 @@ namespace SceneUtil
     class WorkQueue;
 }
 
+namespace Loading
+{
+    class Reporter;
+}
+
 namespace Terrain
 {
     class Storage;
@@ -148,7 +153,7 @@ namespace Terrain
 
         /// @note Thread safe, as long as you do not attempt to load into the same view from multiple threads.
 
-        virtual void preload(View* view, const osg::Vec3f& viewPoint, const osg::Vec4i &cellgrid, std::atomic<bool>& abort, std::atomic<int>& progress, int& progressRange) {}
+        virtual void preload(View* view, const osg::Vec3f& viewPoint, const osg::Vec4i &cellgrid, std::atomic<bool>& abort, Loading::Reporter& reporter) {}
 
         /// Store a preloaded view into the cache with the intent that the next rendering traversal can use it.
         /// @note Not thread safe.

From b19da7f6505a334d5ed33af20be9620de8947aa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matja=C5=BE=20Lamut?= <matjaz.lamut@gmail.com>
Date: Tue, 7 Sep 2021 18:57:03 +0000
Subject: [PATCH 1285/2859] Update an obsolete link pointing to teh old wiki. 
 The information is moved to the new wiki at gitlab and the link now points
 there.

---
 docs/source/manuals/installation/install-openmw.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/manuals/installation/install-openmw.rst b/docs/source/manuals/installation/install-openmw.rst
index fab00ab9b7..362637746d 100644
--- a/docs/source/manuals/installation/install-openmw.rst
+++ b/docs/source/manuals/installation/install-openmw.rst
@@ -18,7 +18,7 @@ and run the install package once downloaded. It's now installed!
 The (bleeding edge) Source Way
 ==============================
 
-Visit the `Development Environment Setup <https://wiki.openmw.org/index.php?title=Development_Environment_Setup>`_
+Visit the `Development Environment Setup <https://gitlab.com/OpenMW/openmw/-/wikis/development/development_environment_setup>`_
 section of the Wiki for detailed instructions on how to build the engine.
 
 The Ubuntu Way

From bdbc6c0cbae128f0e65b0698ffc4fff0a18c7f99 Mon Sep 17 00:00:00 2001
From: JanuarySnow <bobfordiscord12@gmail.com>
Date: Wed, 8 Sep 2021 10:07:54 +0000
Subject: [PATCH 1286/2859] Dead animation code removal

---
 AUTHORS.md                         |   1 +
 CHANGELOG.md                       |   1 +
 apps/openmw/mwrender/animation.cpp | 114 +----------------------------
 3 files changed, 4 insertions(+), 112 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index beb2b490f2..abc3f1a8d1 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -99,6 +99,7 @@ Programmers
     James Stephens (james-h-stephens)
     Jan-Peter Nilsson (peppe)
     Jan Borsodi (am0s)
+    JanuarySnow
     Jason Hooks (jhooks)
     jeaye
     jefetienne
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc9c79411b..3ad818bd25 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,6 +48,7 @@
     Feature #6162: Refactor GUI to use shaders and to be GLES and GL3+ friendly
     Feature #6199: Support FBO Rendering
     Feature #6251: OpenMW-CS: Set instance movement based on camera zoom
+    Task #6264: Remove the old classes in animation.cpp
 
 0.47.0
 ------
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 591e666d01..a04724c70a 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -196,32 +196,6 @@ namespace
         return 0.0f;
     }
 
-    /// @brief Base class for visitors that remove nodes from a scene graph.
-    /// Subclasses need to fill the mToRemove vector.
-    /// To use, node->accept(removeVisitor); removeVisitor.remove();
-    class RemoveVisitor : public osg::NodeVisitor
-    {
-    public:
-        RemoveVisitor()
-            : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
-        {
-        }
-
-        void remove()
-        {
-            for (RemoveVec::iterator it = mToRemove.begin(); it != mToRemove.end(); ++it)
-            {
-                if (!it->second->removeChild(it->first))
-                    Log(Debug::Error) << "Error removing " << it->first->getName();
-            }
-        }
-
-    protected:
-        // <node to remove, parent node to remove it from>
-        typedef std::vector<std::pair<osg::Node*, osg::Group*> > RemoveVec;
-        std::vector<std::pair<osg::Node*, osg::Group*> > mToRemove;
-    };
-
     class GetExtendedBonesVisitor : public osg::NodeVisitor
     {
     public:
@@ -244,7 +218,7 @@ namespace
         std::vector<std::pair<osg::Node*, osg::Group*> > mFoundBones;
     };
 
-    class RemoveFinishedCallbackVisitor : public RemoveVisitor
+    class RemoveFinishedCallbackVisitor : public SceneUtil::RemoveVisitor
     {
     public:
         bool mHasMagicEffects;
@@ -289,7 +263,7 @@ namespace
         }
     };
 
-    class RemoveCallbackVisitor : public RemoveVisitor
+    class RemoveCallbackVisitor : public SceneUtil::RemoveVisitor
     {
     public:
         bool mHasMagicEffects;
@@ -397,90 +371,6 @@ namespace
     private:
         int mEffectId;
     };
-
-    // Removes all drawables from a graph.
-    class CleanObjectRootVisitor : public RemoveVisitor
-    {
-    public:
-        void apply(osg::Drawable& drw) override
-        {
-            applyDrawable(drw);
-        }
-
-        void apply(osg::Group& node) override
-        {
-            applyNode(node);
-        }
-        void apply(osg::MatrixTransform& node) override
-        {
-            applyNode(node);
-        }
-        void apply(osg::Node& node) override
-        {
-            applyNode(node);
-        }
-
-        void applyNode(osg::Node& node)
-        {
-            if (node.getStateSet())
-                node.setStateSet(nullptr);
-
-            if (node.getNodeMask() == 0x1 && node.getNumParents() == 1)
-                mToRemove.emplace_back(&node, node.getParent(0));
-            else
-                traverse(node);
-        }
-        void applyDrawable(osg::Node& node)
-        {
-            osg::NodePath::iterator parent = getNodePath().end()-2;
-            // We know that the parent is a Group because only Groups can have children.
-            osg::Group* parentGroup = static_cast<osg::Group*>(*parent);
-
-            // Try to prune nodes that would be empty after the removal
-            if (parent != getNodePath().begin())
-            {
-                // This could be extended to remove the parent's parent, and so on if they are empty as well.
-                // But for NIF files, there won't be a benefit since only TriShapes can be set to STATIC dataVariance.
-                osg::Group* parentParent = static_cast<osg::Group*>(*(parent - 1));
-                if (parentGroup->getNumChildren() == 1 && parentGroup->getDataVariance() == osg::Object::STATIC)
-                {
-                    mToRemove.emplace_back(parentGroup, parentParent);
-                    return;
-                }
-            }
-
-            mToRemove.emplace_back(&node, parentGroup);
-        }
-    };
-
-    class RemoveTriBipVisitor : public RemoveVisitor
-    {
-    public:
-        void apply(osg::Drawable& drw) override
-        {
-            applyImpl(drw);
-        }
-
-        void apply(osg::Group& node) override
-        {
-            traverse(node);
-        }
-        void apply(osg::MatrixTransform& node) override
-        {
-            traverse(node);
-        }
-
-        void applyImpl(osg::Node& node)
-        {
-            const std::string toFind = "tri bip";
-            if (Misc::StringUtils::ciCompareLen(node.getName(), toFind, toFind.size()) == 0)
-            {
-                osg::Group* parent = static_cast<osg::Group*>(*(getNodePath().end()-2));
-                // Not safe to remove in apply(), since the visitor is still iterating the child list
-                mToRemove.emplace_back(&node, parent);
-            }
-        }
-    };
 }
 
 namespace MWRender

From d36c373cc71b907cdeb598690718f682524d88db Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Wed, 8 Sep 2021 17:23:35 +0000
Subject: [PATCH 1287/2859] visitor.cpp early out

---
 components/sceneutil/visitor.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/sceneutil/visitor.cpp b/components/sceneutil/visitor.cpp
index f1f15f786f..3fc1898959 100644
--- a/components/sceneutil/visitor.cpp
+++ b/components/sceneutil/visitor.cpp
@@ -32,13 +32,13 @@ namespace SceneUtil
 
     void FindByNameVisitor::apply(osg::Group &group)
     {
-        if (!checkGroup(group))
+        if (!mFoundNode && !checkGroup(group))
             traverse(group);
     }
 
     void FindByNameVisitor::apply(osg::MatrixTransform &node)
     {
-        if (!checkGroup(node))
+        if (!mFoundNode && !checkGroup(node))
             traverse(node);
     }
 

From 5ab5419f7bc68653f7eb928c4831c19278d533bb Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Wed, 8 Sep 2021 21:08:04 +0000
Subject: [PATCH 1288/2859] Remove unsafe characters from zip filenames on
 Windows

---
 .gitlab-ci.yml | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8d82d6ed79..c9b8cf9341 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -223,6 +223,18 @@ variables: &tests-targets
   - choco install ninja -y
   - choco install python -y
   - refreshenv
+  - |
+    function Make-SafeFileName {
+      param(
+        [Parameter(Mandatory=$true)]
+        [String]
+        $FileName
+      )
+      [IO.Path]::GetInvalidFileNameChars() | ForEach-Object {
+        $FileName = $FileName.Replace($_, '_')
+      }
+      return $FileName
+    }
   stage: build
   script:
     - $time = (Get-Date -Format "HH:mm:ss")
@@ -237,10 +249,10 @@ variables: &tests-targets
     - Get-ChildItem -Recurse *.ilk | Remove-Item
     - |
       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
+        7z a -tzip "..\..\$(Make-SafeFileName("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 '*'
+    - 7z a -tzip "..\..\$(Make-SafeFileName("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
@@ -326,6 +338,18 @@ Windows_Ninja_Tests_RelWithDebInfo:
   - choco install vswhere -y
   - choco install python -y
   - refreshenv
+  - |
+    function Make-SafeFileName {
+      param(
+        [Parameter(Mandatory=$true)]
+        [String]
+        $FileName
+      )
+      [IO.Path]::GetInvalidFileNameChars() | ForEach-Object {
+        $FileName = $FileName.Replace($_, '_')
+      }
+      return $FileName
+    }
   stage: build
   script:
     - $time = (Get-Date -Format "HH:mm:ss")
@@ -339,10 +363,10 @@ Windows_Ninja_Tests_RelWithDebInfo:
     - Get-ChildItem -Recurse *.ilk | Remove-Item
     - |
       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
+        7z a -tzip "..\..\$(Make-SafeFileName("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 '*'
+    - 7z a -tzip "..\..\$(Make-SafeFileName("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

From dc623597b4155459bfad0b32f8f3d805dcc13e92 Mon Sep 17 00:00:00 2001
From: "Hristos N. Triantafillou" <me@hristos.triantafillou.us>
Date: Wed, 8 Sep 2021 19:19:40 -0500
Subject: [PATCH 1289/2859] This is the right path for saves

---
 docs/source/reference/modding/paths.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/reference/modding/paths.rst b/docs/source/reference/modding/paths.rst
index 97cfe37a5c..bc955b703d 100644
--- a/docs/source/reference/modding/paths.rst
+++ b/docs/source/reference/modding/paths.rst
@@ -29,7 +29,7 @@ Savegames
 +--------------+-----------------------------------------------------------------------------------------------------+
 | OS           | Location                                                                                            |
 +==============+=====================================================================================================+
-| Linux        | ``$HOME/.config/openmw/saves``                                                                      |
+| Linux        | ``$HOME/.local/share/openmw/saves``                                                                      |
 +--------------+-----------------------------------------------------------------------------------------------------+
 | Mac          | ``$HOME/Library/Application\ Support/openmw/saves``                                                 |
 +--------------+---------------+-------------------------------------------------------------------------------------+

From 6b7434ca696d59f5c0400b25a0efb7511aab6121 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 4 Sep 2021 18:07:23 +0200
Subject: [PATCH 1290/2859] Pass std::string_view instead of const std::string&

* Starting with Actor::getBodyPartMesh and ending with
  Misc::StringUtils::ciEqual.
* Add tests for Misc::StringUtils::ciEqual.
---
 apps/opencs/model/world/actoradapter.cpp      |   3 +-
 apps/opencs/model/world/collection.hpp        |   5 +-
 apps/opencs/model/world/collectionbase.hpp    |   3 +-
 apps/opencs/model/world/columns.cpp           |   2 +-
 apps/opencs/model/world/infocollection.cpp    |   6 +-
 apps/opencs/model/world/infocollection.hpp    |   5 +-
 apps/opencs/model/world/refcollection.cpp     |   4 +-
 apps/opencs/model/world/refcollection.hpp     |   3 +-
 apps/opencs/model/world/refidcollection.cpp   |   3 +-
 apps/opencs/model/world/refidcollection.hpp   |   3 +-
 apps/opencs/model/world/refiddata.cpp         |   4 +-
 apps/opencs/model/world/refiddata.hpp         |   3 +-
 apps/opencs/model/world/resources.cpp         |   3 +-
 apps/opencs/model/world/resources.hpp         |   3 +-
 apps/opencs/view/render/actor.cpp             |   4 +-
 apps/opencs/view/render/actor.hpp             |   3 +-
 apps/openmw/mwgui/messagebox.cpp              |   4 +-
 .../openmw_test_suite/misc/test_stringops.cpp | 102 +++++++++++++++++-
 components/misc/stringops.hpp                 |  44 +++++---
 components/sceneutil/visitor.cpp              |   5 +-
 20 files changed, 170 insertions(+), 42 deletions(-)

diff --git a/apps/opencs/model/world/actoradapter.cpp b/apps/opencs/model/world/actoradapter.cpp
index 7882dd4535..7e7f926384 100644
--- a/apps/opencs/model/world/actoradapter.cpp
+++ b/apps/opencs/model/world/actoradapter.cpp
@@ -145,8 +145,7 @@ namespace CSMWorld
             return {};
         }
 
-        const std::string& partName = it->second.first;
-        return partName;
+        return it->second.first;
     }
 
     bool ActorAdapter::ActorData::hasDependency(const std::string& id) const
diff --git a/apps/opencs/model/world/collection.hpp b/apps/opencs/model/world/collection.hpp
index 9d9c69a5da..6ab9d7ff9d 100644
--- a/apps/opencs/model/world/collection.hpp
+++ b/apps/opencs/model/world/collection.hpp
@@ -9,6 +9,7 @@
 #include <string>
 #include <functional>
 #include <memory>
+#include <string_view>
 
 #include <QVariant>
 
@@ -153,7 +154,7 @@ namespace CSMWorld
             ///< Change the state of a record from base to modified, if it is not already.
             ///  \return True if the record was changed.
 
-            int searchId (const std::string& id) const override;
+            int searchId(std::string_view id) const override;
             ////< Search record with \a id.
             /// \return index of record (if found) or -1 (not found)
 
@@ -476,7 +477,7 @@ namespace CSMWorld
     }
 
     template<typename ESXRecordT, typename IdAccessorT>
-    int Collection<ESXRecordT, IdAccessorT>::searchId (const std::string& id) const
+    int Collection<ESXRecordT, IdAccessorT>::searchId(std::string_view id) const
     {
         std::string id2 = Misc::StringUtils::lowerCase(id);
 
diff --git a/apps/opencs/model/world/collectionbase.hpp b/apps/opencs/model/world/collectionbase.hpp
index 13471b9886..be6131ee52 100644
--- a/apps/opencs/model/world/collectionbase.hpp
+++ b/apps/opencs/model/world/collectionbase.hpp
@@ -4,6 +4,7 @@
 #include <string>
 #include <vector>
 #include <memory>
+#include <string_view>
 
 #include "universalid.hpp"
 #include "columns.hpp"
@@ -61,7 +62,7 @@ namespace CSMWorld
                 UniversalId::Type type = UniversalId::Type_None) = 0;
             ///< \param type Will be ignored, unless the collection supports multiple record types
 
-            virtual int searchId (const std::string& id) const = 0;
+            virtual int searchId(std::string_view id) const = 0;
             ////< Search record with \a id.
             /// \return index of record (if found) or -1 (not found)
 
diff --git a/apps/opencs/model/world/columns.cpp b/apps/opencs/model/world/columns.cpp
index cf04d96753..d6066aa04d 100644
--- a/apps/opencs/model/world/columns.cpp
+++ b/apps/opencs/model/world/columns.cpp
@@ -391,7 +391,7 @@ int CSMWorld::Columns::getId (const std::string& name)
     std::string name2 = Misc::StringUtils::lowerCase (name);
 
     for (int i=0; sNames[i].mName; ++i)
-        if (Misc::StringUtils::ciEqual(sNames[i].mName, name2))
+        if (Misc::StringUtils::ciEqual(std::string_view(sNames[i].mName), name2))
             return sNames[i].mId;
 
     return -1;
diff --git a/apps/opencs/model/world/infocollection.cpp b/apps/opencs/model/world/infocollection.cpp
index 978ce3595d..d58a8327f2 100644
--- a/apps/opencs/model/world/infocollection.cpp
+++ b/apps/opencs/model/world/infocollection.cpp
@@ -97,7 +97,7 @@ void CSMWorld::InfoCollection::load (const Info& record, bool base)
     }
 }
 
-int CSMWorld::InfoCollection::getInfoIndex (const std::string& id, const std::string& topic) const
+int CSMWorld::InfoCollection::getInfoIndex(std::string_view id, std::string_view topic) const
 {
     // find the topic first
     std::unordered_map<std::string, std::vector<std::pair<std::string, int> > >::const_iterator iter
@@ -345,12 +345,12 @@ void  CSMWorld::InfoCollection::appendBlankRecord (const std::string& id, Univer
     insertRecord(std::move(record2), getInsertIndex(id, type, nullptr), type); // call InfoCollection::insertRecord()
 }
 
-int CSMWorld::InfoCollection::searchId (const std::string& id) const
+int CSMWorld::InfoCollection::searchId(std::string_view id) const
 {
     std::string::size_type separator = id.find_last_of('#');
 
     if (separator == std::string::npos)
-        throw std::runtime_error("invalid info ID: " + id);
+        throw std::runtime_error("invalid info ID: " + std::string(id));
 
     return getInfoIndex(id.substr(separator+1), id.substr(0, separator));
 }
diff --git a/apps/opencs/model/world/infocollection.hpp b/apps/opencs/model/world/infocollection.hpp
index 3e8455c399..96061fb03c 100644
--- a/apps/opencs/model/world/infocollection.hpp
+++ b/apps/opencs/model/world/infocollection.hpp
@@ -2,6 +2,7 @@
 #define CSM_WOLRD_INFOCOLLECTION_H
 
 #include <unordered_map>
+#include <string_view>
 
 #include "collection.hpp"
 #include "info.hpp"
@@ -43,7 +44,7 @@ namespace CSMWorld
 
             void load (const Info& record, bool base);
 
-            int getInfoIndex (const std::string& id, const std::string& topic) const;
+            int getInfoIndex(std::string_view id, std::string_view topic) const;
             ///< Return index for record \a id or -1 (if not present; deleted records are considered)
             ///
             /// \param id info ID without topic prefix
@@ -79,7 +80,7 @@ namespace CSMWorld
             void appendBlankRecord (const std::string& id,
                                             UniversalId::Type type = UniversalId::Type_None) override;
 
-            int searchId (const std::string& id) const override;
+            int searchId(std::string_view id) const override;
 
             void appendRecord (std::unique_ptr<RecordBase> record,
                 UniversalId::Type type = UniversalId::Type_None) override;
diff --git a/apps/opencs/model/world/refcollection.cpp b/apps/opencs/model/world/refcollection.cpp
index 4782bde6b9..4f56bbb463 100644
--- a/apps/opencs/model/world/refcollection.cpp
+++ b/apps/opencs/model/world/refcollection.cpp
@@ -7,6 +7,8 @@
 #include "universalid.hpp"
 #include "record.hpp"
 
+#include <string_view>
+
 namespace CSMWorld
 {
     template<>
@@ -261,7 +263,7 @@ void CSMWorld::RefCollection::cloneRecord (const std::string& origin,
    insertRecord(std::move(copy), getAppendIndex(destination, type)); // call RefCollection::insertRecord()
 }
 
-int CSMWorld::RefCollection::searchId (const std::string& id) const
+int CSMWorld::RefCollection::searchId(std::string_view id) const
 {
     return searchId(extractIdNum(id));
 }
diff --git a/apps/opencs/model/world/refcollection.hpp b/apps/opencs/model/world/refcollection.hpp
index e0e88d721f..34e258c11b 100644
--- a/apps/opencs/model/world/refcollection.hpp
+++ b/apps/opencs/model/world/refcollection.hpp
@@ -2,6 +2,7 @@
 #define CSM_WOLRD_REFCOLLECTION_H
 
 #include <map>
+#include <string_view>
 
 #include "../doc/stage.hpp"
 
@@ -56,7 +57,7 @@ namespace CSMWorld
                                       const std::string& destination,
                                       const UniversalId::Type type);
 
-            virtual int searchId (const std::string& id) const;
+            virtual int searchId(std::string_view id) const;
 
             virtual void appendRecord (std::unique_ptr<RecordBase> record,
                                        UniversalId::Type type = UniversalId::Type_None);
diff --git a/apps/opencs/model/world/refidcollection.cpp b/apps/opencs/model/world/refidcollection.cpp
index 177844a31d..71629694c0 100644
--- a/apps/opencs/model/world/refidcollection.cpp
+++ b/apps/opencs/model/world/refidcollection.cpp
@@ -2,6 +2,7 @@
 
 #include <stdexcept>
 #include <memory>
+#include <string_view>
 
 #include <components/esm/esmreader.hpp>
 
@@ -787,7 +788,7 @@ void CSMWorld::RefIdCollection::appendBlankRecord (const std::string& id, Univer
     mData.appendRecord (type, id, false);
 }
 
-int CSMWorld::RefIdCollection::searchId (const std::string& id) const
+int CSMWorld::RefIdCollection::searchId(std::string_view id) const
 {
     RefIdData::LocalIndex localIndex = mData.searchId (id);
 
diff --git a/apps/opencs/model/world/refidcollection.hpp b/apps/opencs/model/world/refidcollection.hpp
index dc722055ff..ee17bb3214 100644
--- a/apps/opencs/model/world/refidcollection.hpp
+++ b/apps/opencs/model/world/refidcollection.hpp
@@ -4,6 +4,7 @@
 #include <vector>
 #include <map>
 #include <deque>
+#include <string_view>
 
 #include "columnbase.hpp"
 #include "collectionbase.hpp"
@@ -85,7 +86,7 @@ namespace CSMWorld
             void appendBlankRecord (const std::string& id, UniversalId::Type type) override;
             ///< \param type Will be ignored, unless the collection supports multiple record types
 
-            int searchId (const std::string& id) const override;
+            int searchId(std::string_view id) const override;
             ////< Search record with \a id.
             /// \return index of record (if found) or -1 (not found)
 
diff --git a/apps/opencs/model/world/refiddata.cpp b/apps/opencs/model/world/refiddata.cpp
index df8e06c251..3bd8bfd5fc 100644
--- a/apps/opencs/model/world/refiddata.cpp
+++ b/apps/opencs/model/world/refiddata.cpp
@@ -2,6 +2,7 @@
 
 #include <cassert>
 #include <memory>
+#include <string_view>
 
 CSMWorld::RefIdDataContainerBase::~RefIdDataContainerBase() {}
 
@@ -74,8 +75,7 @@ int CSMWorld::RefIdData::localToGlobalIndex (const LocalIndex& index)
     return globalIndex;
 }
 
-CSMWorld::RefIdData::LocalIndex CSMWorld::RefIdData::searchId (
-    const std::string& id) const
+CSMWorld::RefIdData::LocalIndex CSMWorld::RefIdData::searchId(std::string_view id) const
 {
     std::string id2 = Misc::StringUtils::lowerCase (id);
 
diff --git a/apps/opencs/model/world/refiddata.hpp b/apps/opencs/model/world/refiddata.hpp
index 175aaef410..b9dee80638 100644
--- a/apps/opencs/model/world/refiddata.hpp
+++ b/apps/opencs/model/world/refiddata.hpp
@@ -5,6 +5,7 @@
 #include <map>
 #include <memory>
 #include <cassert>
+#include <string_view>
 
 #include <components/esm/loadacti.hpp>
 #include <components/esm/loadalch.hpp>
@@ -277,7 +278,7 @@ namespace CSMWorld
 
             int localToGlobalIndex (const LocalIndex& index) const;
 
-            LocalIndex searchId (const std::string& id) const;
+            LocalIndex searchId(std::string_view id) const;
 
             void erase (int index, int count);
 
diff --git a/apps/opencs/model/world/resources.cpp b/apps/opencs/model/world/resources.cpp
index c3eb9762e7..2544886f3e 100644
--- a/apps/opencs/model/world/resources.cpp
+++ b/apps/opencs/model/world/resources.cpp
@@ -3,6 +3,7 @@
 #include <sstream>
 #include <stdexcept>
 #include <algorithm>
+#include <string_view>
 
 #include <components/vfs/manager.hpp>
 
@@ -83,7 +84,7 @@ int CSMWorld::Resources::getIndex (const std::string& id) const
     return index;
 }
 
-int CSMWorld::Resources::searchId (const std::string& id) const
+int CSMWorld::Resources::searchId(std::string_view id) const
 {
     std::string id2 = Misc::StringUtils::lowerCase (id);
 
diff --git a/apps/opencs/model/world/resources.hpp b/apps/opencs/model/world/resources.hpp
index c217b793d3..2de13a259e 100644
--- a/apps/opencs/model/world/resources.hpp
+++ b/apps/opencs/model/world/resources.hpp
@@ -4,6 +4,7 @@
 #include <string>
 #include <map>
 #include <vector>
+#include <string_view>
 
 #include "universalid.hpp"
 
@@ -35,7 +36,7 @@ namespace CSMWorld
 
             int getIndex (const std::string& id) const;
 
-            int searchId (const std::string& id) const;
+            int searchId(std::string_view id) const;
 
             UniversalId::Type getType() const;
     };
diff --git a/apps/opencs/view/render/actor.cpp b/apps/opencs/view/render/actor.cpp
index 10f7330d1c..271ca2365a 100644
--- a/apps/opencs/view/render/actor.cpp
+++ b/apps/opencs/view/render/actor.cpp
@@ -96,7 +96,7 @@ namespace CSVRender
         for (int i = 0; i < ESM::PRT_Count; ++i)
         {
             auto type = (ESM::PartReferenceType) i;
-            const std::string partId(mActorData->getPart(type));
+            const std::string_view partId = mActorData->getPart(type);
             attachBodyPart(type, getBodyPartMesh(partId));
         }
     }
@@ -115,7 +115,7 @@ namespace CSVRender
         }
     }
 
-    std::string Actor::getBodyPartMesh(const std::string& bodyPartId)
+    std::string Actor::getBodyPartMesh(std::string_view bodyPartId)
     {
         const auto& bodyParts = mData.getBodyParts();
 
diff --git a/apps/opencs/view/render/actor.hpp b/apps/opencs/view/render/actor.hpp
index 2f19454f78..8172e6fff7 100644
--- a/apps/opencs/view/render/actor.hpp
+++ b/apps/opencs/view/render/actor.hpp
@@ -2,6 +2,7 @@
 #define OPENCS_VIEW_RENDER_ACTOR_H
 
 #include <string>
+#include <string_view>
 
 #include <osg/ref_ptr>
 
@@ -54,7 +55,7 @@ namespace CSVRender
         void loadBodyParts();
         void attachBodyPart(ESM::PartReferenceType, const std::string& mesh);
 
-        std::string getBodyPartMesh(const std::string& bodyPartId);
+        std::string getBodyPartMesh(std::string_view bodyPartId);
 
         static const std::string MeshPrefix;
 
diff --git a/apps/openmw/mwgui/messagebox.cpp b/apps/openmw/mwgui/messagebox.cpp
index 4907a247ff..ed6633c983 100644
--- a/apps/openmw/mwgui/messagebox.cpp
+++ b/apps/openmw/mwgui/messagebox.cpp
@@ -376,7 +376,9 @@ namespace MWGui
         {
             for (const std::string& keyword : keywords)
             {
-                if(Misc::StringUtils::ciEqual(MyGUI::LanguageManager::getInstance().replaceTags("#{" + keyword + "}"), button->getCaption()))
+                if (Misc::StringUtils::ciEqual(
+                        MyGUI::LanguageManager::getInstance().replaceTags("#{" + keyword + "}").asUTF8(),
+                        button->getCaption().asUTF8()))
                 {
                     return button;
                 }
diff --git a/apps/openmw_test_suite/misc/test_stringops.cpp b/apps/openmw_test_suite/misc/test_stringops.cpp
index 086908692d..173cfa4447 100644
--- a/apps/openmw_test_suite/misc/test_stringops.cpp
+++ b/apps/openmw_test_suite/misc/test_stringops.cpp
@@ -1,6 +1,10 @@
 #include <gtest/gtest.h>
 #include "components/misc/stringops.hpp"
 
+#include <string>
+#include <string_view>
+#include <type_traits>
+
 struct PartialBinarySearchTest : public ::testing::Test
 {
   protected:
@@ -12,10 +16,6 @@ struct PartialBinarySearchTest : public ::testing::Test
         std::sort(mDataVec.begin(), mDataVec.end(), Misc::StringUtils::ciLess);
     }
 
-    void TearDown() override
-    {
-    }
-
     bool matches(const std::string& keyword)
     {
         return Misc::StringUtils::partialBinarySearch(mDataVec.begin(), mDataVec.end(), keyword) != mDataVec.end();
@@ -51,3 +51,97 @@ TEST_F (PartialBinarySearchTest, ci_test)
     std::string unicode1 = "\u04151 \u0418"; // CYRILLIC CAPITAL LETTER IE, CYRILLIC CAPITAL LETTER I
     EXPECT_TRUE( Misc::StringUtils::lowerCase(unicode1) == unicode1 );
 }
+
+namespace
+{
+    using ::Misc::StringUtils;
+    using namespace ::testing;
+
+    template <class T>
+    struct MiscStringUtilsCiEqualEmptyTest : Test {};
+
+    TYPED_TEST_SUITE_P(MiscStringUtilsCiEqualEmptyTest);
+
+    TYPED_TEST_P(MiscStringUtilsCiEqualEmptyTest, empty_strings_should_be_equal)
+    {
+        EXPECT_TRUE(StringUtils::ciEqual(typename TypeParam::first_type {}, typename TypeParam::second_type {}));
+    }
+
+    REGISTER_TYPED_TEST_SUITE_P(MiscStringUtilsCiEqualEmptyTest,
+        empty_strings_should_be_equal
+    );
+
+    using EmptyStringTypePairsTypes = Types<
+        std::pair<std::string, std::string>,
+        std::pair<std::string, std::string_view>,
+        std::pair<std::string, const char[1]>,
+        std::pair<std::string_view, std::string>,
+        std::pair<std::string_view, std::string_view>,
+        std::pair<std::string_view, const char[1]>,
+        std::pair<const char[1], std::string>,
+        std::pair<const char[1], std::string_view>,
+        std::pair<const char[1], const char[1]>
+    >;
+
+    INSTANTIATE_TYPED_TEST_SUITE_P(EmptyStringTypePairs, MiscStringUtilsCiEqualEmptyTest, EmptyStringTypePairsTypes);
+
+    template <class T>
+    struct MiscStringUtilsCiEqualNotEmptyTest : Test {};
+
+    TYPED_TEST_SUITE_P(MiscStringUtilsCiEqualNotEmptyTest);
+
+    using RawValue = const char[4];
+
+    constexpr RawValue foo = "foo";
+    constexpr RawValue fooUpper = "FOO";
+    constexpr RawValue bar = "bar";
+
+    template <typename T>
+    using Value = std::conditional_t<std::is_same_v<T, RawValue>, RawValue&, T>;
+
+    TYPED_TEST_P(MiscStringUtilsCiEqualNotEmptyTest, same_strings_should_be_equal)
+    {
+        const Value<typename TypeParam::first_type> a {foo};
+        const Value<typename TypeParam::second_type> b {foo};
+        EXPECT_TRUE(StringUtils::ciEqual(a, b)) << a << "\n" << b;
+    }
+
+    TYPED_TEST_P(MiscStringUtilsCiEqualNotEmptyTest, same_strings_with_different_case_sensetivity_should_be_equal)
+    {
+        const Value<typename TypeParam::first_type> a {foo};
+        const Value<typename TypeParam::second_type> b {fooUpper};
+        EXPECT_TRUE(StringUtils::ciEqual(a, b)) << a << "\n" << b;
+    }
+
+    TYPED_TEST_P(MiscStringUtilsCiEqualNotEmptyTest, different_strings_content_should_not_be_equal)
+    {
+        const Value<typename TypeParam::first_type> a {foo};
+        const Value<typename TypeParam::second_type> b {bar};
+        EXPECT_FALSE(StringUtils::ciEqual(a, b)) << a << "\n" << b;
+    }
+
+    REGISTER_TYPED_TEST_SUITE_P(MiscStringUtilsCiEqualNotEmptyTest,
+        same_strings_should_be_equal,
+        same_strings_with_different_case_sensetivity_should_be_equal,
+        different_strings_content_should_not_be_equal
+    );
+
+    using NotEmptyStringTypePairsTypes = Types<
+        std::pair<std::string, std::string>,
+        std::pair<std::string, std::string_view>,
+        std::pair<std::string, const char[4]>,
+        std::pair<std::string_view, std::string>,
+        std::pair<std::string_view, std::string_view>,
+        std::pair<std::string_view, const char[4]>,
+        std::pair<const char[4], std::string>,
+        std::pair<const char[4], std::string_view>,
+        std::pair<const char[4], const char[4]>
+    >;
+
+    INSTANTIATE_TYPED_TEST_SUITE_P(NotEmptyStringTypePairs, MiscStringUtilsCiEqualNotEmptyTest, NotEmptyStringTypePairsTypes);
+
+    TEST(MiscStringUtilsCiEqualTest, string_with_different_length_should_not_be_equal)
+    {
+        EXPECT_FALSE(StringUtils::ciEqual(std::string("a"), std::string("aa")));
+    }
+}
diff --git a/components/misc/stringops.hpp b/components/misc/stringops.hpp
index 2a865606fd..0863522356 100644
--- a/components/misc/stringops.hpp
+++ b/components/misc/stringops.hpp
@@ -4,6 +4,8 @@
 #include <cctype>
 #include <string>
 #include <algorithm>
+#include <string_view>
+#include <iterator>
 
 #include "utf8stream.hpp"
 
@@ -109,18 +111,34 @@ public:
         return std::lexicographical_compare(x.begin(), x.end(), y.begin(), y.end(), ci());
     }
 
-    static bool ciEqual(const std::string &x, const std::string &y) {
-        if (x.size() != y.size()) {
+    template <class X, class Y>
+    static bool ciEqual(const X& x, const Y& y)
+    {
+        if (std::size(x) != std::size(y))
             return false;
-        }
-        std::string::const_iterator xit = x.begin();
-        std::string::const_iterator yit = y.begin();
-        for (; xit != x.end(); ++xit, ++yit) {
-            if (toLower(*xit) != toLower(*yit)) {
-                return false;
-            }
-        }
-        return true;
+        return std::equal(std::begin(x), std::end(x), std::begin(y),
+                          [] (char l, char r) { return toLower(l) == toLower(r); });
+    }
+
+    template <std::size_t n>
+    static auto ciEqual(const char(& x)[n], const char(& y)[n])
+    {
+        static_assert(n > 0);
+        return ciEqual(std::string_view(x, n - 1), std::string_view(y, n - 1));
+    }
+
+    template <std::size_t n, class T>
+    static auto ciEqual(const char(& x)[n], const T& y)
+    {
+        static_assert(n > 0);
+        return ciEqual(std::string_view(x, n - 1), y);
+    }
+
+    template <std::size_t n, class T>
+    static auto ciEqual(const T& x, const char(& y)[n])
+    {
+        static_assert(n > 0);
+        return ciEqual(x, std::string_view(y, n - 1));
     }
 
     static int ciCompareLen(const std::string &x, const std::string &y, size_t len)
@@ -157,9 +175,9 @@ public:
     }
 
     /// Returns lower case copy of input string
-    static std::string lowerCase(const std::string &in)
+    static std::string lowerCase(std::string_view in)
     {
-        std::string out = in;
+        std::string out(in);
         lowerCaseInPlace(out);
         return out;
     }
diff --git a/components/sceneutil/visitor.cpp b/components/sceneutil/visitor.cpp
index f1f15f786f..2d990c1b9e 100644
--- a/components/sceneutil/visitor.cpp
+++ b/components/sceneutil/visitor.cpp
@@ -9,6 +9,9 @@
 
 #include <components/misc/stringops.hpp>
 
+#include <cstring>
+#include <string_view>
+
 namespace SceneUtil
 {
 
@@ -24,7 +27,7 @@ namespace SceneUtil
 
     void FindByClassVisitor::apply(osg::Node &node)
     {
-        if (Misc::StringUtils::ciEqual(node.className(), mNameToFind))
+        if (Misc::StringUtils::ciEqual(std::string_view(node.className()), mNameToFind))
             mFoundNodes.push_back(&node);
 
         traverse(node);

From 6e6214bc43ec3dc3c98a7a1aa423d2d24e77fd1e Mon Sep 17 00:00:00 2001
From: Lamoot <matjaz.lamut@gmail.com>
Date: Thu, 9 Sep 2021 20:46:27 +0200
Subject: [PATCH 1291/2859] In OpenMW-CS, when creating a new object, sort the
 entries in the drop-down menu alphabetically. Also have the menu be tall
 enough to show all of them at once (without scroll bars).

---
 apps/opencs/view/world/referenceablecreator.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/view/world/referenceablecreator.cpp b/apps/opencs/view/world/referenceablecreator.cpp
index 1a2f2bbaa3..6bc0126b3e 100644
--- a/apps/opencs/view/world/referenceablecreator.cpp
+++ b/apps/opencs/view/world/referenceablecreator.cpp
@@ -22,7 +22,8 @@ CSVWorld::ReferenceableCreator::ReferenceableCreator (CSMWorld::Data& data, QUnd
     std::vector<CSMWorld::UniversalId::Type> types = CSMWorld::UniversalId::listReferenceableTypes();
 
     mType = new QComboBox (this);
-
+    mType->setMaxVisibleItems(20);
+    
     for (std::vector<CSMWorld::UniversalId::Type>::const_iterator iter (types.begin());
          iter!=types.end(); ++iter)
     {
@@ -31,7 +32,9 @@ CSVWorld::ReferenceableCreator::ReferenceableCreator (CSMWorld::Data& data, QUnd
         mType->addItem (QIcon (id2.getIcon().c_str()), id2.getTypeName().c_str(),
             static_cast<int> (id2.getType()));
     }
-
+    
+    mType->model()->sort(0);
+    
     insertBeforeButtons (mType, false);
 
     connect (mType, SIGNAL (currentIndexChanged (int)), this, SLOT (setType (int)));

From 147ed39900645a8e9ac46aacce53ea79a8391712 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Thu, 9 Sep 2021 20:56:57 +0000
Subject: [PATCH 1292/2859] This PR solves a crash with Robert's bodies logged
 on your bugtracker. (#3095)

* attach.cpp [ci skip]

* attach.cpp [ci skip]

* attach.cpp [ci skip]

* npcanimation.cpp [ci skip]

* attach.hpp [ci skip]

* attach.cpp [ci skip]

* creatureanimation.cpp [ci skip]

* creatureanimation.cpp [ci skip]

* cellpreloader.cpp

* npcanimation.cpp

* attach.cpp

* make android adk happy

* make android adk happy

* changelog.md [ci skip]

* authors.md [ci skip]
---
 AUTHORS.md                                 |  1 +
 CHANGELOG.md                               |  1 +
 apps/openmw/mwrender/creatureanimation.cpp |  2 +-
 apps/openmw/mwrender/npcanimation.cpp      |  4 +--
 apps/openmw/mwworld/cellpreloader.cpp      |  5 +--
 components/sceneutil/attach.cpp            | 38 ++++++++++------------
 components/sceneutil/attach.hpp            |  4 +--
 7 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index abc3f1a8d1..62121a797b 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -44,6 +44,7 @@ Programmers
     Austin Salgat (Salgat)
     Ben Shealy (bentsherman)
     Berulacks
+    Bo Svensson
     Britt Mathis (galdor557)
     Capostrophic
     Carl Maxwell
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ad818bd25..b1132a9e68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
     Bug #3846: Strings starting with "-" fail to compile if not enclosed in quotes
     Bug #3905: Great House Dagoth issues
     Bug #4203: Resurrecting an actor should close the loot GUI
+    Bug #4602: Robert's Bodies: crash inside createInstance()
     Bug #4700: Editor: Incorrect command implementation
     Bug #4744: Invisible particles must still be processed
     Bug #4752: UpdateCellCommand doesn't undo properly
diff --git a/apps/openmw/mwrender/creatureanimation.cpp b/apps/openmw/mwrender/creatureanimation.cpp
index 2987111621..f1d28b0634 100644
--- a/apps/openmw/mwrender/creatureanimation.cpp
+++ b/apps/openmw/mwrender/creatureanimation.cpp
@@ -158,7 +158,7 @@ void CreatureWeaponAnimation::updatePart(PartHolderPtr& scene, int slot)
 
     try
     {
-        osg::ref_ptr<osg::Node> node = mResourceSystem->getSceneManager()->getInstance(itemModel);
+        osg::ref_ptr<const osg::Node> node = mResourceSystem->getSceneManager()->getTemplate(itemModel);
 
         const NodeMap& nodeMap = getNodeMap();
         NodeMap::const_iterator found = nodeMap.find(Misc::StringUtils::lowerCase(bonename));
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index d142996f40..7fc488020c 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -714,14 +714,14 @@ void NpcAnimation::updateParts()
 
 PartHolderPtr NpcAnimation::insertBoundedPart(const std::string& model, const std::string& bonename, const std::string& bonefilter, bool enchantedGlow, osg::Vec4f* glowColor)
 {
-    osg::ref_ptr<osg::Node> instance = mResourceSystem->getSceneManager()->getInstance(model);
+    osg::ref_ptr<const osg::Node> templateNode = mResourceSystem->getSceneManager()->getTemplate(model);
 
     const NodeMap& nodeMap = getNodeMap();
     NodeMap::const_iterator found = nodeMap.find(Misc::StringUtils::lowerCase(bonename));
     if (found == nodeMap.end())
         throw std::runtime_error("Can't find attachment node " + bonename);
 
-    osg::ref_ptr<osg::Node> attached = SceneUtil::attach(instance, mObjectRoot, bonefilter, found->second);
+    osg::ref_ptr<osg::Node> attached = SceneUtil::attach(templateNode, mObjectRoot, bonefilter, found->second);
     if (enchantedGlow)
         mGlowUpdater = SceneUtil::addEnchantedGlow(attached, mResourceSystem, *glowColor);
 
diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index 7b6f640373..b2dba1d452 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -114,10 +114,7 @@ namespace MWWorld
                             }
                         }
                     }
-                    if (mPreloadInstances && animated)
-                        mPreloadedObjects.insert(mSceneManager->cacheInstance(mesh));
-                    else
-                        mPreloadedObjects.insert(mSceneManager->getTemplate(mesh));
+                    mPreloadedObjects.insert(mSceneManager->getTemplate(mesh));
                     if (mPreloadInstances)
                         mPreloadedObjects.insert(mBulletShapeManager->cacheInstance(mesh));
                     else
diff --git a/components/sceneutil/attach.cpp b/components/sceneutil/attach.cpp
index 597c7adf48..fe8aad0879 100644
--- a/components/sceneutil/attach.cpp
+++ b/components/sceneutil/attach.cpp
@@ -15,6 +15,7 @@
 #include <components/sceneutil/skeleton.hpp>
 
 #include "visitor.hpp"
+#include "clone.hpp"
 
 namespace SceneUtil
 {
@@ -49,10 +50,10 @@ namespace SceneUtil
                 return;
 
             osg::Node* node = &drawable;
-            while (node->getNumParents())
+            for (auto it = getNodePath().rbegin()+1; it != getNodePath().rend(); ++it)
             {
-                osg::Group* parent = node->getParent(0);
-                if (!parent || !filterMatches(parent->getName()))
+                osg::Node* parent = *it;
+                if (!filterMatches(parent->getName()))
                     break;
                 node = parent;
             }
@@ -63,12 +64,7 @@ namespace SceneUtil
         {
             for (const osg::ref_ptr<osg::Node>& node : mToCopy)
             {
-                if (node->getNumParents() > 1)
-                    Log(Debug::Error) << "Error CopyRigVisitor: node has " << node->getNumParents() << " parents";
-                while (node->getNumParents())
-                    node->getParent(0)->removeChild(node);
-
-                mParent->addChild(node);
+                mParent->addChild(static_cast<osg::Node*>(node->clone(SceneUtil::CopyOp())));
             }
             mToCopy.clear();
         }
@@ -90,25 +86,25 @@ namespace SceneUtil
         std::string mFilter2;
     };
 
-    void mergeUserData(osg::UserDataContainer* source, osg::Object* target)
+    void mergeUserData(const osg::UserDataContainer* source, osg::Object* target)
     {
         if (!target->getUserDataContainer())
-            target->setUserDataContainer(source);
+            target->setUserDataContainer(osg::clone(source, osg::CopyOp::SHALLOW_COPY));
         else
         {
             for (unsigned int i=0; i<source->getNumUserObjects(); ++i)
-                target->getUserDataContainer()->addUserObject(source->getUserObject(i));
+                target->getUserDataContainer()->addUserObject(osg::clone(source->getUserObject(i), osg::CopyOp::SHALLOW_COPY));
         }
     }
 
-    osg::ref_ptr<osg::Node> attach(osg::ref_ptr<osg::Node> toAttach, osg::Node *master, const std::string &filter, osg::Group* attachNode)
+    osg::ref_ptr<osg::Node> attach(osg::ref_ptr<const osg::Node> toAttach, osg::Node *master, const std::string &filter, osg::Group* attachNode)
     {
-        if (dynamic_cast<SceneUtil::Skeleton*>(toAttach.get()))
+        if (dynamic_cast<const SceneUtil::Skeleton*>(toAttach.get()))
         {
             osg::ref_ptr<osg::Group> handle = new osg::Group;
 
             CopyRigVisitor copyVisitor(handle, filter);
-            toAttach->accept(copyVisitor);
+            const_cast<osg::Node*>(toAttach.get())->accept(copyVisitor);
             copyVisitor.doCopy();
 
             if (handle->getNumChildren() == 1)
@@ -122,14 +118,16 @@ namespace SceneUtil
             else
             {
                 master->asGroup()->addChild(handle);
-                handle->setUserDataContainer(toAttach->getUserDataContainer());
+                mergeUserData(toAttach->getUserDataContainer(), handle);
                 return handle;
             }
         }
         else
         {
+            osg::ref_ptr<osg::Node> clonedToAttach = static_cast<osg::Node*>(toAttach->clone(SceneUtil::CopyOp()));
+
             FindByNameVisitor findBoneOffset("BoneOffset");
-            toAttach->accept(findBoneOffset);
+            clonedToAttach->accept(findBoneOffset);
 
             osg::ref_ptr<osg::PositionAttitudeTransform> trans;
 
@@ -172,13 +170,13 @@ namespace SceneUtil
             if (trans)
             {
                 attachNode->addChild(trans);
-                trans->addChild(toAttach);
+                trans->addChild(clonedToAttach);
                 return trans;
             }
             else
             {
-                attachNode->addChild(toAttach);
-                return toAttach;
+                attachNode->addChild(clonedToAttach);
+                return clonedToAttach;
             }
         }
     }
diff --git a/components/sceneutil/attach.hpp b/components/sceneutil/attach.hpp
index a8a2239a84..806fc53488 100644
--- a/components/sceneutil/attach.hpp
+++ b/components/sceneutil/attach.hpp
@@ -14,12 +14,12 @@ namespace osg
 namespace SceneUtil
 {
 
-    /// Attach parts of the \a toAttach scenegraph to the \a master scenegraph, using the specified filter and attachment node.
+    /// Clone and attach parts of the \a toAttach scenegraph to the \a master scenegraph, using the specified filter and attachment node.
     /// If the \a toAttach scene graph contains skinned objects, we will attach only those (filtered by the \a filter).
     /// Otherwise, just attach all of the toAttach scenegraph to the attachment node on the master scenegraph, with no filtering.
     /// @note The master scene graph is expected to include a skeleton.
     /// @return A newly created node that is directly attached to the master scene graph
-    osg::ref_ptr<osg::Node> attach(osg::ref_ptr<osg::Node> toAttach, osg::Node* master, const std::string& filter, osg::Group* attachNode);
+    osg::ref_ptr<osg::Node> attach(osg::ref_ptr<const osg::Node> toAttach, osg::Node* master, const std::string& filter, osg::Group* attachNode);
 
 }
 

From afba1884ab1977556e56055547e1c6c17704b0ac Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Thu, 9 Sep 2021 21:04:11 +0000
Subject: [PATCH 1293/2859] clone.cpp remove dynamic_cast (#3097)

---
 components/sceneutil/clone.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/components/sceneutil/clone.cpp b/components/sceneutil/clone.cpp
index 07a6e691ad..eaf5668c4a 100644
--- a/components/sceneutil/clone.cpp
+++ b/components/sceneutil/clone.cpp
@@ -2,8 +2,6 @@
 
 #include <osg/StateSet>
 
-#include <osgAnimation/Bone>
-#include <osgAnimation/Skeleton>
 #include <osgAnimation/MorphGeometry>
 #include <osgAnimation/RigGeometry>
 
@@ -35,11 +33,6 @@ namespace SceneUtil
             mUpdaterToOldPs[cloned] = updater->getParticleSystem(0);
             return cloned;
         }
-
-        if (dynamic_cast<const osgAnimation::Bone*>(node) || dynamic_cast<const osgAnimation::Skeleton*>(node))
-        {
-            return osg::clone(node, *this);
-        }
         return osg::CopyOp::operator()(node);
     }
 

From c284d0cf5c6ca0a6a55e92f9de7351469946628d Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Thu, 9 Sep 2021 21:04:38 +0000
Subject: [PATCH 1294/2859] actoranimation.cpp faster getbonebyname (#3099)

---
 apps/openmw/mwrender/actoranimation.cpp | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/apps/openmw/mwrender/actoranimation.cpp b/apps/openmw/mwrender/actoranimation.cpp
index 4109d61e8c..8b0c09068a 100644
--- a/apps/openmw/mwrender/actoranimation.cpp
+++ b/apps/openmw/mwrender/actoranimation.cpp
@@ -67,17 +67,14 @@ ActorAnimation::~ActorAnimation()
 
 PartHolderPtr ActorAnimation::attachMesh(const std::string& model, const std::string& bonename, bool enchantedGlow, osg::Vec4f* glowColor)
 {
-    osg::Group* parent = getBoneByName(bonename);
-    if (!parent)
-        return nullptr;
-
-    osg::ref_ptr<osg::Node> instance = mResourceSystem->getSceneManager()->getInstance(model, parent);
-
     const NodeMap& nodeMap = getNodeMap();
     NodeMap::const_iterator found = nodeMap.find(Misc::StringUtils::lowerCase(bonename));
     if (found == nodeMap.end())
         return PartHolderPtr();
 
+    osg::Group* parent = found->second;
+    osg::ref_ptr<osg::Node> instance = mResourceSystem->getSceneManager()->getInstance(model, parent);
+
     if (enchantedGlow)
         mGlowUpdater = SceneUtil::addEnchantedGlow(instance, mResourceSystem, *glowColor);
 
@@ -136,9 +133,9 @@ bool ActorAnimation::updateCarriedLeftVisible(const int weaptype) const
         MWMechanics::CreatureStats &stats = cls.getCreatureStats(mPtr);
         if (cls.hasInventoryStore(mPtr) && weaptype != ESM::Weapon::Spell)
         {
-            SceneUtil::FindByNameVisitor findVisitor ("Bip01 AttachShield");
-            mObjectRoot->accept(findVisitor);
-            if (findVisitor.mFoundNode || (mPtr == MWMechanics::getPlayer() && mPtr.isInCell() && MWBase::Environment::get().getWorld()->isFirstPerson()))
+            osg::Group* foundNode = getBoneByName ("Bip01 AttachShield");
+
+            if (foundNode || (mPtr == MWMechanics::getPlayer() && mPtr.isInCell() && MWBase::Environment::get().getWorld()->isFirstPerson()))
             {
                 const MWWorld::InventoryStore& inv = cls.getInventoryStore(mPtr);
                 const MWWorld::ConstContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
@@ -276,10 +273,11 @@ osg::Group* ActorAnimation::getBoneByName(const std::string& boneName)
     if (!mObjectRoot)
         return nullptr;
 
-    SceneUtil::FindByNameVisitor findVisitor (boneName);
-    mObjectRoot->accept(findVisitor);
-
-    return findVisitor.mFoundNode;
+    const NodeMap& nodeMap = getNodeMap();
+    NodeMap::const_iterator found = nodeMap.find(Misc::StringUtils::lowerCase(boneName));
+    if (found == nodeMap.end())
+        return nullptr;
+    return found->second;
 }
 
 std::string ActorAnimation::getHolsteredWeaponBoneName(const MWWorld::ConstPtr& weapon)

From 9d661359a160c3fb265c71cbcacbd08945407e4c Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Thu, 9 Sep 2021 21:10:22 +0000
Subject: [PATCH 1295/2859] Groundcover consolidation (#3096)

* chunkmanager.hpp viewdistance

* chunkmanager.cpp viewdistance

* chunkmanager.hpp viewdistance

* quadtreeworld.cpp viewdistance

* quadtreeworld.cpp consolidate

* quadtreeworld.hpp consolidate

* renderingmanager.cpp groundcover consolidate

* renderingmanager.hpp groundcover consolidate

* renderingmanager.cpp updater move

* renderingmanager.hpp updater move

* groundcover.hpp activegrid consolidation

* groundcover.cpp activegrid consolidation

* settings-default.cfg dead settings remove

* viewdata.cpp revert

* wrong file paste mistake

* wrong file paste mistake

* wrong file paste mistake

* renderingmanager.cpp updatecallback fix

* renderingmanager.cpp namespace fix

* groundcover.hpp redefinition fix

* groundcover.cpp redefinition fix

* renderingmanager.cpp crash fix

* renderingmanager.cpp euclidean groundcover distance

* viewdata.hpp getreusedistance

* quadtreeworld.cpp reusedistance

* groundcover.rst [ci skip]
---
 apps/openmw/mwrender/groundcover.cpp          |  4 +-
 apps/openmw/mwrender/groundcover.hpp          |  4 +-
 apps/openmw/mwrender/renderingmanager.cpp     | 52 +++++--------------
 apps/openmw/mwrender/renderingmanager.hpp     |  4 +-
 components/terrain/quadtreeworld.cpp          | 26 +++++-----
 components/terrain/quadtreeworld.hpp          |  7 ++-
 components/terrain/viewdata.cpp               |  9 +---
 components/terrain/viewdata.hpp               |  2 +
 .../modding/settings/groundcover.rst          | 14 -----
 files/settings-default.cfg                    |  3 --
 10 files changed, 40 insertions(+), 85 deletions(-)

diff --git a/apps/openmw/mwrender/groundcover.cpp b/apps/openmw/mwrender/groundcover.cpp
index 947bdad202..a00d21bc97 100644
--- a/apps/openmw/mwrender/groundcover.cpp
+++ b/apps/openmw/mwrender/groundcover.cpp
@@ -180,7 +180,7 @@ namespace MWRender
 
     osg::ref_ptr<osg::Node> Groundcover::getChunk(float size, const osg::Vec2f& center, unsigned char lod, unsigned int lodFlags, bool activeGrid, const osg::Vec3f& viewPoint, bool compile)
     {
-        ChunkId id = std::make_tuple(center, size, activeGrid);
+        GroundcoverChunkId id = std::make_tuple(center, size);
 
         osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(id);
         if (obj)
@@ -196,7 +196,7 @@ namespace MWRender
     }
 
     Groundcover::Groundcover(Resource::SceneManager* sceneManager, float density)
-         : GenericResourceManager<ChunkId>(nullptr)
+         : GenericResourceManager<GroundcoverChunkId>(nullptr)
          , mSceneManager(sceneManager)
          , mDensity(density)
     {
diff --git a/apps/openmw/mwrender/groundcover.hpp b/apps/openmw/mwrender/groundcover.hpp
index b92ab97c95..10874b7e8b 100644
--- a/apps/openmw/mwrender/groundcover.hpp
+++ b/apps/openmw/mwrender/groundcover.hpp
@@ -29,8 +29,8 @@ namespace MWRender
         osg::Vec3f mPlayerPos;
     };
 
-    typedef std::tuple<osg::Vec2f, float, bool> ChunkId; // Center, Size, ActiveGrid
-    class Groundcover : public Resource::GenericResourceManager<ChunkId>, public Terrain::QuadTreeWorld::ChunkManager
+    typedef std::tuple<osg::Vec2f, float> GroundcoverChunkId; // Center, Size
+    class Groundcover : public Resource::GenericResourceManager<GroundcoverChunkId>, public Terrain::QuadTreeWorld::ChunkManager
     {
     public:
         Groundcover(Resource::SceneManager* sceneManager, float density);
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 381a2e5f62..56d3ba4a43 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -373,7 +373,9 @@ namespace MWRender
         mTerrainStorage.reset(new TerrainStorage(mResourceSystem, normalMapPattern, heightMapPattern, useTerrainNormalMaps, specularMapPattern, useTerrainSpecularMaps));
         const float lodFactor = Settings::Manager::getFloat("lod factor", "Terrain");
 
-        if (Settings::Manager::getBool("distant terrain", "Terrain"))
+        bool groundcover = Settings::Manager::getBool("enabled", "Groundcover");
+        bool distantTerrain = Settings::Manager::getBool("distant terrain", "Terrain");
+        if (distantTerrain || groundcover)
         {
             const int compMapResolution = Settings::Manager::getInt("composite map resolution", "Terrain");
             int compMapPower = Settings::Manager::getInt("composite map level", "Terrain");
@@ -398,41 +400,27 @@ namespace MWRender
         mTerrain->setTargetFrameRate(Settings::Manager::getFloat("target framerate", "Cells"));
         mTerrain->setWorkQueue(mWorkQueue.get());
 
-        if (Settings::Manager::getBool("enabled", "Groundcover"))
-        {
-            osg::ref_ptr<osg::Group> groundcoverRoot = new osg::Group;
-            groundcoverRoot->setNodeMask(Mask_Groundcover);
-            groundcoverRoot->setName("Groundcover Root");
-            sceneRoot->addChild(groundcoverRoot);
-
-            mGroundcoverUpdater = new GroundcoverUpdater;
-            groundcoverRoot->addUpdateCallback(mGroundcoverUpdater);
-
-            float chunkSize = Settings::Manager::getFloat("min chunk size", "Groundcover");
-            if (chunkSize >= 1.0f)
-                chunkSize = 1.0f;
-            else if (chunkSize >= 0.5f)
-                chunkSize = 0.5f;
-            else if (chunkSize >= 0.25f)
-                chunkSize = 0.25f;
-            else if (chunkSize != 0.125f)
-                chunkSize = 0.125f;
+       osg::ref_ptr<SceneUtil::CompositeStateSetUpdater> composite = new SceneUtil::CompositeStateSetUpdater;
 
+        if (groundcover)
+        {
             float density = Settings::Manager::getFloat("density", "Groundcover");
             density = std::clamp(density, 0.f, 1.f);
 
-            mGroundcoverWorld.reset(new Terrain::QuadTreeWorld(groundcoverRoot, mTerrainStorage.get(), Mask_Groundcover, lodFactor, chunkSize));
+            mGroundcoverUpdater = new GroundcoverUpdater;
+            composite->addController(mGroundcoverUpdater);
+
             mGroundcover.reset(new Groundcover(mResourceSystem->getSceneManager(), density));
-            static_cast<Terrain::QuadTreeWorld*>(mGroundcoverWorld.get())->addChunkManager(mGroundcover.get());
+            static_cast<Terrain::QuadTreeWorld*>(mTerrain.get())->addChunkManager(mGroundcover.get());
             mResourceSystem->addResourceManager(mGroundcover.get());
 
-            // Groundcover it is handled in the same way indifferently from if it is from active grid or from distant cell.
-            // Use a stub grid to avoid splitting between chunks for active grid and chunks for distant cells.
-            mGroundcoverWorld->setActiveGrid(osg::Vec4i(0, 0, 0, 0));
+            float groundcoverDistance = std::max(0.f, Settings::Manager::getFloat("rendering distance", "Groundcover"));
+            mGroundcover->setViewDistance(groundcoverDistance);
         }
 
         mStateUpdater = new StateUpdater;
-        sceneRoot->addUpdateCallback(mStateUpdater);
+        composite->addController(mStateUpdater);
+        sceneRoot->addUpdateCallback(composite);
 
         mSharedUniformStateUpdater = new SharedUniformStateUpdater;
         rootNode->addUpdateCallback(mSharedUniformStateUpdater);
@@ -693,8 +681,6 @@ namespace MWRender
         if (store->getCell()->isExterior())
         {
             mTerrain->loadCell(store->getCell()->getGridX(), store->getCell()->getGridY());
-            if (mGroundcoverWorld)
-                mGroundcoverWorld->loadCell(store->getCell()->getGridX(), store->getCell()->getGridY());
         }
     }
     void RenderingManager::removeCell(const MWWorld::CellStore *store)
@@ -706,8 +692,6 @@ namespace MWRender
         if (store->getCell()->isExterior())
         {
             mTerrain->unloadCell(store->getCell()->getGridX(), store->getCell()->getGridY());
-            if (mGroundcoverWorld)
-                mGroundcoverWorld->unloadCell(store->getCell()->getGridX(), store->getCell()->getGridY());
         }
 
         mWater->removeCell(store);
@@ -718,8 +702,6 @@ namespace MWRender
         if (!enable)
             mWater->setCullCallback(nullptr);
         mTerrain->enable(enable);
-        if (mGroundcoverWorld)
-            mGroundcoverWorld->enable(enable);
     }
 
     void RenderingManager::setSkyEnabled(bool enabled)
@@ -1179,12 +1161,6 @@ namespace MWRender
         fov = std::min(mFieldOfView, 140.f);
         float distanceMult = std::cos(osg::DegreesToRadians(fov)/2.f);
         mTerrain->setViewDistance(mViewDistance * (distanceMult ? 1.f/distanceMult : 1.f));
-
-        if (mGroundcoverWorld)
-        {
-            float groundcoverDistance = std::max(0.f, Settings::Manager::getFloat("rendering distance", "Groundcover"));
-            mGroundcoverWorld->setViewDistance(groundcoverDistance * (distanceMult ? 1.f/distanceMult : 1.f));
-        }
     }
 
     void RenderingManager::updateTextureFiltering()
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index d6d7e74634..b991b08efa 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -262,8 +262,6 @@ namespace MWRender
         osg::ref_ptr<osg::Group> mSceneRoot;
         Resource::ResourceSystem* mResourceSystem;
 
-        osg::ref_ptr<GroundcoverUpdater> mGroundcoverUpdater;
-
         osg::ref_ptr<SceneUtil::WorkQueue> mWorkQueue;
         osg::ref_ptr<SceneUtil::UnrefQueue> mUnrefQueue;
 
@@ -278,10 +276,10 @@ namespace MWRender
         std::unique_ptr<Objects> mObjects;
         std::unique_ptr<Water> mWater;
         std::unique_ptr<Terrain::World> mTerrain;
-        std::unique_ptr<Terrain::World> mGroundcoverWorld;
         std::unique_ptr<TerrainStorage> mTerrainStorage;
         std::unique_ptr<ObjectPaging> mObjectPaging;
         std::unique_ptr<Groundcover> mGroundcover;
+        osg::ref_ptr<GroundcoverUpdater> mGroundcoverUpdater;
         std::unique_ptr<SkyManager> mSky;
         std::unique_ptr<FogManager> mFog;
         std::unique_ptr<ScreenshotManager> mScreenshotManager;
diff --git a/components/terrain/quadtreeworld.cpp b/components/terrain/quadtreeworld.cpp
index 9ca504ebeb..6a228a75af 100644
--- a/components/terrain/quadtreeworld.cpp
+++ b/components/terrain/quadtreeworld.cpp
@@ -259,17 +259,6 @@ QuadTreeWorld::QuadTreeWorld(osg::Group *parent, osg::Group *compileRoot, Resour
     mChunkManagers.push_back(mChunkManager.get());
 }
 
-QuadTreeWorld::QuadTreeWorld(osg::Group *parent, Storage *storage, unsigned int nodeMask, float lodFactor, float chunkSize)
-    : TerrainGrid(parent, storage, nodeMask)
-    , mViewDataMap(new ViewDataMap)
-    , mQuadTreeBuilt(false)
-    , mLodFactor(lodFactor)
-    , mVertexLodMod(0)
-    , mViewDistance(std::numeric_limits<float>::max())
-    , mMinSize(chunkSize)
-{
-}
-
 QuadTreeWorld::~QuadTreeWorld()
 {
 }
@@ -325,7 +314,7 @@ unsigned int getLodFlags(QuadTreeNode* node, int ourLod, int vertexLodMod, const
     return lodFlags;
 }
 
-void loadRenderingNode(ViewData::Entry& entry, ViewData* vd, int vertexLodMod, float cellWorldSize, const osg::Vec4i &gridbounds, const std::vector<QuadTreeWorld::ChunkManager*>& chunkManagers, bool compile)
+void loadRenderingNode(ViewData::Entry& entry, ViewData* vd, int vertexLodMod, float cellWorldSize, const osg::Vec4i &gridbounds, const std::vector<QuadTreeWorld::ChunkManager*>& chunkManagers, bool compile, float reuseDistance)
 {
     if (!vd->hasChanged() && entry.mRenderingNode)
         return;
@@ -353,6 +342,8 @@ void loadRenderingNode(ViewData::Entry& entry, ViewData* vd, int vertexLodMod, f
 
         for (QuadTreeWorld::ChunkManager* m : chunkManagers)
         {
+            if (m->getViewDistance() && entry.mNode->distance(vd->getViewPoint()) > m->getViewDistance() + reuseDistance*10)
+                continue;
             osg::ref_ptr<osg::Node> n = m->getChunk(entry.mNode->getSize(), entry.mNode->getCenter(), ourLod, entry.mLodFlags, activeGrid, vd->getViewPoint(), compile);
             if (n) pat->addChild(n);
         }
@@ -447,7 +438,7 @@ void QuadTreeWorld::accept(osg::NodeVisitor &nv)
     for (unsigned int i=0; i<vd->getNumEntries(); ++i)
     {
         ViewData::Entry& entry = vd->getEntry(i);
-        loadRenderingNode(entry, vd, mVertexLodMod, cellWorldSize, mActiveGrid, mChunkManagers, false);
+        loadRenderingNode(entry, vd, mVertexLodMod, cellWorldSize, mActiveGrid, mChunkManagers, false, mViewDataMap->getReuseDistance());
         entry.mRenderingNode->accept(nv);
     }
 
@@ -517,8 +508,15 @@ void QuadTreeWorld::preload(View *view, const osg::Vec3f &viewPoint, const osg::
     for (unsigned int i=0; i<vd->getNumEntries() && !abort; ++i)
     {
         ViewData::Entry& entry = vd->getEntry(i);
-        loadRenderingNode(entry, vd, mVertexLodMod, cellWorldSize, grid, mChunkManagers, true);
+
+
+
+        loadRenderingNode(entry, vd, mVertexLodMod, cellWorldSize, grid, mChunkManagers, true, mViewDataMap->getReuseDistance());
         reporter.addProgress(entry.mNode->getSize());
+
+
+
+
     }
     vd->markUnchanged();
 }
diff --git a/components/terrain/quadtreeworld.hpp b/components/terrain/quadtreeworld.hpp
index 3a2aa8349d..3dd96a0b84 100644
--- a/components/terrain/quadtreeworld.hpp
+++ b/components/terrain/quadtreeworld.hpp
@@ -22,8 +22,6 @@ namespace Terrain
     public:
         QuadTreeWorld(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem, Storage* storage, unsigned int nodeMask, unsigned int preCompileMask, unsigned int borderMask, int compMapResolution, float comMapLevel, float lodFactor, int vertexLodMod, float maxCompGeometrySize);
 
-        QuadTreeWorld(osg::Group *parent, Storage *storage, unsigned int nodeMask, float lodFactor, float chunkSize);
-
         ~QuadTreeWorld();
 
         void accept(osg::NodeVisitor& nv);
@@ -51,6 +49,11 @@ namespace Terrain
             virtual ~ChunkManager(){}
             virtual osg::ref_ptr<osg::Node> getChunk(float size, const osg::Vec2f& center, unsigned char lod, unsigned int lodFlags, bool activeGrid, const osg::Vec3f& viewPoint, bool compile) = 0;
             virtual unsigned int getNodeMask() { return 0; }
+
+            void setViewDistance(float viewDistance) { mViewDistance = viewDistance; }
+            float getViewDistance() const { return mViewDistance; }
+        private:
+            float mViewDistance = 0.f;
         };
         void addChunkManager(ChunkManager*);
 
diff --git a/components/terrain/viewdata.cpp b/components/terrain/viewdata.cpp
index 996bf909c8..e4d043ffc4 100644
--- a/components/terrain/viewdata.cpp
+++ b/components/terrain/viewdata.cpp
@@ -141,9 +141,9 @@ ViewData *ViewDataMap::getViewData(osg::Object *viewer, const osg::Vec3f& viewPo
         vd = found->second;
     needsUpdate = false;
 
-    if (!vd->suitableToUse(activeGrid) || (vd->getViewPoint()-viewPoint).length2() >= mReuseDistance*mReuseDistance || vd->getWorldUpdateRevision() < mWorldUpdateRevision)
+    if (!(vd->suitableToUse(activeGrid) && (vd->getViewPoint()-viewPoint).length2() < mReuseDistance*mReuseDistance && vd->getWorldUpdateRevision() >= mWorldUpdateRevision))
     {
-        float shortestDist = viewer ? mReuseDistance*mReuseDistance : std::numeric_limits<float>::max();
+        float shortestDist = std::numeric_limits<float>::max();
         const ViewData* mostSuitableView = nullptr;
         for (const ViewData* other : mUsedViews)
         {
@@ -162,11 +162,6 @@ ViewData *ViewDataMap::getViewData(osg::Object *viewer, const osg::Vec3f& viewPo
             vd->copyFrom(*mostSuitableView);
             return vd;
         }
-        else if (!mostSuitableView)
-        {
-            vd->setViewPoint(viewPoint);
-            needsUpdate = true;
-        }
     }
     if (!vd->suitableToUse(activeGrid))
     {
diff --git a/components/terrain/viewdata.hpp b/components/terrain/viewdata.hpp
index 0289352585..378d07663c 100644
--- a/components/terrain/viewdata.hpp
+++ b/components/terrain/viewdata.hpp
@@ -95,6 +95,8 @@ namespace Terrain
         void rebuildViews();
         bool storeView(const ViewData* view, double referenceTime);
 
+        float getReuseDistance() const { return mReuseDistance; }
+
     private:
         std::list<ViewData> mViewVector;
 
diff --git a/docs/source/reference/modding/settings/groundcover.rst b/docs/source/reference/modding/settings/groundcover.rst
index 7c5a965e01..3e943e4284 100644
--- a/docs/source/reference/modding/settings/groundcover.rst
+++ b/docs/source/reference/modding/settings/groundcover.rst
@@ -40,20 +40,6 @@ May affect performance a lot.
 
 This setting can only be configured by editing the settings configuration file.
 
-min chunk size
---------------
-
-:Type:		floating point
-:Range:		0.125, 0.25, 0.5, 1.0
-:Default:	0.5
-
-Determines a minimum size of groundcover chunks in cells. For example, with 0.5 value
-chunks near player will have size 4096x4096 game units. Larger chunks reduce CPU usage
-(Draw and Cull bars), but can increase GPU usage (GPU bar) since culling becomes less efficient.
-Smaller values do an opposite.
-
-This setting can only be configured by editing the settings configuration file.
-
 stomp mode
 ----------
 
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 4737fcf5ee..7f57ba529d 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -1087,9 +1087,6 @@ density = 1.0
 # A maximum distance in game units on which groundcover is rendered.
 rendering distance = 6144.0
 
-# A minimum size of groundcover chunk in cells (0.125, 0.25, 0.5, 1.0)
-min chunk size = 0.5
-
 # Whether grass should respond to the player treading on it.
 # 0 - Grass cannot be trampled.
 # 1 - The player's XY position is taken into account.

From 1edeffbafca621dce1888b75c0d6564f04d48390 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Thu, 9 Sep 2021 23:57:20 +0200
Subject: [PATCH 1296/2859] constify getBoneByName

---
 apps/openmw/mwrender/actoranimation.cpp | 2 +-
 apps/openmw/mwrender/actoranimation.hpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwrender/actoranimation.cpp b/apps/openmw/mwrender/actoranimation.cpp
index 8b0c09068a..cb46354590 100644
--- a/apps/openmw/mwrender/actoranimation.cpp
+++ b/apps/openmw/mwrender/actoranimation.cpp
@@ -268,7 +268,7 @@ bool ActorAnimation::useShieldAnimations() const
     return false;
 }
 
-osg::Group* ActorAnimation::getBoneByName(const std::string& boneName)
+osg::Group* ActorAnimation::getBoneByName(const std::string& boneName) const
 {
     if (!mObjectRoot)
         return nullptr;
diff --git a/apps/openmw/mwrender/actoranimation.hpp b/apps/openmw/mwrender/actoranimation.hpp
index e6bba48d56..61ad1ca235 100644
--- a/apps/openmw/mwrender/actoranimation.hpp
+++ b/apps/openmw/mwrender/actoranimation.hpp
@@ -41,7 +41,7 @@ class ActorAnimation : public Animation, public MWWorld::ContainerStoreListener
         bool updateCarriedLeftVisible(const int weaptype) const override;
 
     protected:
-        osg::Group* getBoneByName(const std::string& boneName);
+        osg::Group* getBoneByName(const std::string& boneName) const;
         virtual void updateHolsteredWeapon(bool showHolsteredWeapons);
         virtual void updateHolsteredShield(bool showCarriedLeft);
         virtual void updateQuiver();

From 01a8998e3bca50cce6b749a510a4b3ee8cc3c9fb Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Fri, 10 Sep 2021 14:04:11 +0000
Subject: [PATCH 1297/2859] return if source is null in mergeUserData

---
 components/sceneutil/attach.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/components/sceneutil/attach.cpp b/components/sceneutil/attach.cpp
index fe8aad0879..6690148c74 100644
--- a/components/sceneutil/attach.cpp
+++ b/components/sceneutil/attach.cpp
@@ -88,6 +88,9 @@ namespace SceneUtil
 
     void mergeUserData(const osg::UserDataContainer* source, osg::Object* target)
     {
+        if (!source)
+            return;
+    
         if (!target->getUserDataContainer())
             target->setUserDataContainer(osg::clone(source, osg::CopyOp::SHALLOW_COPY));
         else

From ac72f3d636fedae5fbb5491bd785652fe8e33688 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Fri, 10 Sep 2021 15:58:57 +0000
Subject: [PATCH 1298/2859] reduces virtual function calls in a hotspot of
 cache retrieval (#3100)

* chunkmanager.cpp static_cast [ci skip]

* groundcover.cpp static_cast [ci skip]

* Update objectpaging.cpp

objectpaging.cpp static_cast [ci skip]
---
 apps/openmw/mwrender/groundcover.cpp  | 2 +-
 apps/openmw/mwrender/objectpaging.cpp | 2 +-
 components/terrain/chunkmanager.cpp   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwrender/groundcover.cpp b/apps/openmw/mwrender/groundcover.cpp
index a00d21bc97..39022709fb 100644
--- a/apps/openmw/mwrender/groundcover.cpp
+++ b/apps/openmw/mwrender/groundcover.cpp
@@ -184,7 +184,7 @@ namespace MWRender
 
         osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(id);
         if (obj)
-            return obj->asNode();
+            return static_cast<osg::Node*>(obj.get());
         else
         {
             InstanceMap instances;
diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index b23f079888..907631436f 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -77,7 +77,7 @@ namespace MWRender
 
         osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(id);
         if (obj)
-            return obj->asNode();
+            return static_cast<osg::Node*>(obj.get());
         else
         {
             osg::ref_ptr<osg::Node> node = createChunk(size, center, activeGrid, viewPoint, compile);
diff --git a/components/terrain/chunkmanager.cpp b/components/terrain/chunkmanager.cpp
index a744471de5..8809a75bb9 100644
--- a/components/terrain/chunkmanager.cpp
+++ b/components/terrain/chunkmanager.cpp
@@ -45,7 +45,7 @@ osg::ref_ptr<osg::Node> ChunkManager::getChunk(float size, const osg::Vec2f& cen
     ChunkId id = std::make_tuple(center, lod, lodFlags);
     osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(id);
     if (obj)
-        return obj->asNode();
+        return static_cast<osg::Node*>(obj.get());
     else
     {
         osg::ref_ptr<osg::Node> node = createChunk(size, center, lod, lodFlags, compile);

From 36ba56a5137b598f824b867e4c93a9fa9772df6c Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 11 Sep 2021 13:49:00 +0200
Subject: [PATCH 1299/2859] Support multiple file sources for osg stats

---
 scripts/osg_stats.py | 167 +++++++++++++++++++++++--------------------
 1 file changed, 91 insertions(+), 76 deletions(-)

diff --git a/scripts/osg_stats.py b/scripts/osg_stats.py
index 3397b58f26..f0e6ce4010 100755
--- a/scripts/osg_stats.py
+++ b/scripts/osg_stats.py
@@ -45,30 +45,30 @@ import termtables
               help='Start processing from this frame.')
 @click.option('--end_frame', type=int, default=sys.maxsize,
               help='End processing at this frame.')
-@click.argument('path', default='', type=click.Path())
+@click.argument('path', type=click.Path(), nargs=-1)
 def main(print_keys, timeseries, hist, hist_ratio, stdev_hist, plot, stats,
          timeseries_sum, stats_sum, begin_frame, end_frame, path,
          commulative_timeseries, commulative_timeseries_sum):
-    data = list(read_data(path))
-    keys = collect_unique_keys(data)
-    frames = collect_per_frame(data=data, keys=keys, begin_frame=begin_frame, end_frame=end_frame)
+    sources = {v: list(read_data(v)) for v in path} if path else {'stdin': list(read_data(None))}
+    keys = collect_unique_keys(sources)
+    frames = collect_per_frame(sources=sources, keys=keys, begin_frame=begin_frame, end_frame=end_frame)
     if print_keys:
         for v in keys:
             print(v)
     if timeseries:
-        draw_timeseries(frames=frames, keys=timeseries, add_sum=timeseries_sum)
+        draw_timeseries(sources=frames, keys=timeseries, add_sum=timeseries_sum)
     if commulative_timeseries:
-        draw_commulative_timeseries(frames=frames, keys=commulative_timeseries, add_sum=commulative_timeseries_sum)
+        draw_commulative_timeseries(sources=frames, keys=commulative_timeseries, add_sum=commulative_timeseries_sum)
     if hist:
-        draw_hists(frames=frames, keys=hist)
+        draw_hists(sources=frames, keys=hist)
     if hist_ratio:
-        draw_hist_ratio(frames=frames, pairs=hist_ratio)
+        draw_hist_ratio(sources=frames, pairs=hist_ratio)
     if stdev_hist:
-        draw_stdev_hists(frames=frames, stdev_hists=stdev_hist)
+        draw_stdev_hists(sources=frames, stdev_hists=stdev_hist)
     if plot:
-        draw_plots(frames=frames, plots=plot)
+        draw_plots(sources=frames, plots=plot)
     if stats:
-        print_stats(frames=frames, keys=stats, stats_sum=stats_sum)
+        print_stats(sources=frames, keys=stats, stats_sum=stats_sum)
     matplotlib.pyplot.show()
 
 
@@ -92,126 +92,140 @@ def read_data(path):
                 frame[key] = to_number(value)
 
 
-def collect_per_frame(data, keys, begin_frame, end_frame):
-    result = collections.defaultdict(list)
-    for frame in data:
-        for key in keys:
-            if key in frame:
-                result[key].append(frame[key])
-            else:
-                result[key].append(None)
-    for key, values in result.items():
-        result[key] = numpy.array(values[begin_frame:end_frame])
+def collect_per_frame(sources, keys, begin_frame, end_frame):
+    result = collections.defaultdict(lambda: collections.defaultdict(list))
+    for name, frames in sources.items():
+        for frame in frames:
+            for key in keys:
+                if key in frame:
+                    result[name][key].append(frame[key])
+                else:
+                    result[name][key].append(None)
+    for name, sources in result.items():
+        for key, values in sources.items():
+            result[name][key] = numpy.array(values[begin_frame:end_frame])
     return result
 
 
-def collect_unique_keys(frames):
+def collect_unique_keys(sources):
     result = set()
-    for frame in frames:
-        for key in frame.keys():
-            result.add(key)
+    for frames in sources.values():
+        for frame in frames:
+            for key in frame.keys():
+                result.add(key)
     return sorted(result)
 
 
-def draw_timeseries(frames, keys, add_sum):
+def draw_timeseries(sources, keys, add_sum):
     fig, ax = matplotlib.pyplot.subplots()
-    x = numpy.array(range(max(len(v) for k, v in frames.items() if k in keys)))
-    for key in keys:
-        ax.plot(x, frames[key], label=key)
-    if add_sum:
-        ax.plot(x, numpy.sum(list(frames[k] for k in keys), axis=0), label='sum')
+    for name, frames in sources.items():
+        x = numpy.array(range(max(len(v) for k, v in frames.items() if k in keys)))
+        for key in keys:
+            print(key, name)
+            ax.plot(x, frames[key], label=f'{key}:{name}')
+        if add_sum:
+            ax.plot(x, numpy.sum(list(frames[k] for k in keys), axis=0), label=f'sum:{name}')
     ax.grid(True)
     ax.legend()
     fig.canvas.set_window_title('timeseries')
 
 
-def draw_commulative_timeseries(frames, keys, add_sum):
+def draw_commulative_timeseries(sources, keys, add_sum):
     fig, ax = matplotlib.pyplot.subplots()
-    x = numpy.array(range(max(len(v) for k, v in frames.items() if k in keys)))
-    for key in keys:
-        ax.plot(x, numpy.cumsum(frames[key]), label=key)
-    if add_sum:
-        ax.plot(x, numpy.cumsum(numpy.sum(list(frames[k] for k in keys), axis=0)), label='sum')
+    for name, frames in sources.items():
+        x = numpy.array(range(max(len(v) for k, v in frames.items() if k in keys)))
+        for key in keys:
+            ax.plot(x, numpy.cumsum(frames[key]), label=f'{key}:{name}')
+        if add_sum:
+            ax.plot(x, numpy.cumsum(numpy.sum(list(frames[k] for k in keys), axis=0)), label=f'sum:{name}')
     ax.grid(True)
     ax.legend()
     fig.canvas.set_window_title('commulative_timeseries')
 
 
-def draw_hists(frames, keys):
+def draw_hists(sources, keys):
     fig, ax = matplotlib.pyplot.subplots()
     bins = numpy.linspace(
-        start=min(min(v) for k, v in frames.items() if k in keys),
-        stop=max(max(v) for k, v in frames.items() if k in keys),
+        start=min(min(min(v) for k, v in f.items() if k in keys) for f in sources.values()),
+        stop=max(max(max(v) for k, v in f.items() if k in keys) for f in sources.values()),
         num=20,
     )
-    for key in keys:
-        ax.hist(frames[key], bins=bins, label=key, alpha=1 / len(keys))
+    for name, frames in sources.items():
+        for key in keys:
+            ax.hist(frames[key], bins=bins, label=f'{key}:{name}', alpha=1 / (len(keys) * len(sources)))
     ax.set_xticks(bins)
     ax.grid(True)
     ax.legend()
     fig.canvas.set_window_title('hists')
 
 
-def draw_hist_ratio(frames, pairs):
+def draw_hist_ratio(sources, pairs):
     fig, ax = matplotlib.pyplot.subplots()
     bins = numpy.linspace(
-        start=min(min(a / b for a, b in zip(frames[a], frames[b])) for a, b in pairs),
-        stop=max(max(a / b for a, b in zip(frames[a], frames[b])) for a, b in pairs),
+        start=min(min(min(a / b for a, b in zip(f[a], f[b])) for a, b in pairs) for f in sources.values()),
+        stop=max(max(max(a / b for a, b in zip(f[a], f[b])) for a, b in pairs) for f in sources.values()),
         num=20,
     )
-    for a, b in pairs:
-        ax.hist(frames[a] / frames[b], bins=bins, label=f'{a} / {b}', alpha=1 / len(pairs))
+    for name, frames in sources.items():
+        for a, b in pairs:
+            ax.hist(frames[a] / frames[b], bins=bins, label=f'{a} / {b}:{name}', alpha=1 / (len(pairs) * len(sources)))
     ax.set_xticks(bins)
     ax.grid(True)
     ax.legend()
-    fig.canvas.set_window_title('hists')
+    fig.canvas.set_window_title('hists_ratio')
 
 
-def draw_stdev_hists(frames, stdev_hists):
+def draw_stdev_hists(sources, stdev_hists):
     for key, scale in stdev_hists:
         scale = float(scale)
         fig, ax = matplotlib.pyplot.subplots()
-        median = statistics.median(frames[key])
-        stdev = statistics.stdev(frames[key])
+        first_frames = next(v for v in sources.values())
+        median = statistics.median(first_frames[key])
+        stdev = statistics.stdev(first_frames[key])
         start = median - stdev / 2 * scale
         stop = median + stdev / 2 * scale
         bins = numpy.linspace(start=start, stop=stop, num=9)
-        values = [v for v in frames[key] if start <= v <= stop]
-        ax.hist(values, bins=bins, label=key, alpha=1 / len(stdev_hists))
+        for name, frames in sources.items():
+            values = [v for v in frames[key] if start <= v <= stop]
+            ax.hist(values, bins=bins, label=f'{key}:{name}', alpha=1 / (len(stdev_hists) * len(sources)))
         ax.set_xticks(bins)
         ax.grid(True)
         ax.legend()
         fig.canvas.set_window_title('stdev_hists')
 
 
-def draw_plots(frames, plots):
+def draw_plots(sources, plots):
     fig, ax = matplotlib.pyplot.subplots()
-    for x_key, y_key, agg in plots:
-        if agg is None:
-            ax.plot(frames[x_key], frames[y_key], label=f'x={x_key}, y={y_key}')
-        elif agg:
-            agg_f = dict(
-                mean=statistics.mean,
-                median=statistics.median,
-            )[agg]
-            grouped = collections.defaultdict(list)
-            for x, y in zip(frames[x_key], frames[y_key]):
-                grouped[x].append(y)
-            aggregated = sorted((k, agg_f(v)) for k, v in grouped.items())
-            ax.plot(
-                numpy.array([v[0] for v in aggregated]),
-                numpy.array([v[1] for v in aggregated]),
-                label=f'x={x_key}, y={y_key}, agg={agg}',
-            )
+    for name, frames in sources.items():
+        for x_key, y_key, agg in plots:
+            if agg is None:
+                ax.plot(frames[x_key], frames[y_key], label=f'x={x_key}, y={y_key}:{name}')
+            elif agg:
+                agg_f = dict(
+                    mean=statistics.mean,
+                    median=statistics.median,
+                )[agg]
+                grouped = collections.defaultdict(list)
+                for x, y in zip(frames[x_key], frames[y_key]):
+                    grouped[x].append(y)
+                aggregated = sorted((k, agg_f(v)) for k, v in grouped.items())
+                ax.plot(
+                    numpy.array([v[0] for v in aggregated]),
+                    numpy.array([v[1] for v in aggregated]),
+                    label=f'x={x_key}, y={y_key}, agg={agg}:{name}',
+                )
     ax.grid(True)
     ax.legend()
     fig.canvas.set_window_title('plots')
 
 
-def print_stats(frames, keys, stats_sum):
-    stats = [make_stats(key=key, values=filter_not_none(frames[key])) for key in keys]
-    if stats_sum:
-        stats.append(make_stats(key='sum', values=sum_multiple(frames, keys)))
+def print_stats(sources, keys, stats_sum):
+    stats = list()
+    for name, frames in sources.items():
+        for key in keys:
+            stats.append(make_stats(source=name, key=key, values=filter_not_none(frames[key])))
+        if stats_sum:
+            stats.append(make_stats(source=name, key='sum', values=sum_multiple(frames, keys)))
     metrics = list(stats[0].keys())
     max_key_size = max(len(tuple(v.values())[0]) for v in stats)
     termtables.print(
@@ -235,8 +249,9 @@ def sum_multiple(frames, keys):
     return numpy.array([result[k] for k in sorted(result.keys())])
 
 
-def make_stats(key, values):
+def make_stats(source, key, values):
     return collections.OrderedDict(
+        source=source,
         key=key,
         number=len(values),
         min=min(values),

From 7b482bc2e27bd11c6d143149aaf556a5ae882764 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Mon, 18 Jan 2021 18:13:57 +0000
Subject: [PATCH 1300/2859] Maybe force dedicated GPU on dual-AMD machines

---
 apps/openmw/main.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index de0fb0df03..8ac725ee86 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -15,6 +15,8 @@
 #include <windows.h>
 // makes __argc and __argv available on windows
 #include <cstdlib>
+
+extern "C" __declspec(dllexport) DWORD AmdPowerXpressRequestHighPerformance = 0x00000001;
 #endif
 
 #if (defined(__APPLE__) || defined(__linux) || defined(__unix) || defined(__posix))

From e2d0e860208b6f82f9b7e3d3529597a6e7520e7f Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Sat, 11 Sep 2021 18:58:42 +0000
Subject: [PATCH 1301/2859] cellpreloader.cpp unused variable (#3102)

---
 apps/openmw/mwworld/cellpreloader.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index b2dba1d452..c29d975c24 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -95,7 +95,6 @@ namespace MWWorld
                 {
                     mesh = Misc::ResourceHelpers::correctActorModelPath(mesh, mSceneManager->getVFS());
 
-                    bool animated = false;
                     size_t slashpos = mesh.find_last_of("/\\");
                     if (slashpos != std::string::npos && slashpos != mesh.size()-1)
                     {
@@ -107,10 +106,7 @@ namespace MWWorld
                             {
                                 kfname.replace(kfname.size()-4, 4, ".kf");
                                 if (mSceneManager->getVFS()->exists(kfname))
-                                {
                                     mPreloadedObjects.insert(mKeyframeManager->get(kfname));
-                                    animated = true;
-                                }
                             }
                         }
                     }

From 98a0819d523e1cf7ba40ac8df279e2579896e284 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Mocquillon?= <cedric.mocquillon@gmail.com>
Date: Thu, 29 Jul 2021 15:33:58 +0200
Subject: [PATCH 1302/2859] Debug terrain chunks

---
 components/terrain/cellborder.cpp             | 19 +++++++++++++------
 components/terrain/cellborder.hpp             |  3 +++
 components/terrain/chunkmanager.cpp           | 18 +++++++++++++++++-
 components/terrain/chunkmanager.hpp           |  1 +
 components/terrain/quadtreeworld.cpp          |  2 +-
 .../reference/modding/settings/terrain.rst    |  9 +++++++++
 files/settings-default.cfg                    |  3 +++
 7 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/components/terrain/cellborder.cpp b/components/terrain/cellborder.cpp
index c34ed9ab0a..e391036902 100644
--- a/components/terrain/cellborder.cpp
+++ b/components/terrain/cellborder.cpp
@@ -9,6 +9,7 @@
 #include "../esm/loadland.hpp"
 
 #include <components/resource/scenemanager.hpp>
+#include <components/terrain/storage.hpp>
 
 namespace Terrain
 {
@@ -21,13 +22,14 @@ CellBorder::CellBorder(Terrain::World *world, osg::Group *root, int borderMask,
 {
 }
 
-void CellBorder::createCellBorderGeometry(int x, int y)
+osg::ref_ptr<osg::Geode> CellBorder::createBorderGeometry(float x, float y, float size, Terrain::Storage* terrain, Resource::SceneManager* sceneManager, int mask)
 {
     const int cellSize = ESM::Land::REAL_SIZE;
     const int borderSegments = 40;
     const float offset = 10.0;
 
     osg::Vec3 cellCorner = osg::Vec3(x * cellSize,y * cellSize,0);
+    size *= cellSize;
 
     osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array;
     osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array;
@@ -35,16 +37,16 @@ void CellBorder::createCellBorderGeometry(int x, int y)
 
     normals->push_back(osg::Vec3(0.0f,-1.0f, 0.0f));
 
-    float borderStep = cellSize / ((float) borderSegments);
+    float borderStep = size / ((float)borderSegments);
 
     for (int i = 0; i <= 2 * borderSegments; ++i)
     {
         osg::Vec3f pos = i < borderSegments ?
             osg::Vec3(i * borderStep,0.0f,0.0f) :
-            osg::Vec3(cellSize,(i - borderSegments) * borderStep,0.0f);
+            osg::Vec3(size, (i - borderSegments) * borderStep,0.0f);
 
         pos += cellCorner;
-        pos += osg::Vec3f(0,0,mWorld->getHeightAt(pos) + offset);
+        pos += osg::Vec3f(0,0, terrain->getHeightAt(pos) + offset);
 
         vertices->push_back(pos);
 
@@ -76,10 +78,15 @@ void CellBorder::createCellBorderGeometry(int x, int y)
     polygonmode->setMode(osg::PolygonMode::FRONT_AND_BACK, osg::PolygonMode::LINE);
     stateSet->setAttributeAndModes(polygonmode,osg::StateAttribute::ON);
 
-    mSceneManager->recreateShaders(borderGeode, "debug");
+    sceneManager->recreateShaders(borderGeode, "debug");
+    borderGeode->setNodeMask(mask);
 
-    borderGeode->setNodeMask(mBorderMask);
+    return borderGeode;
+}
 
+void CellBorder::createCellBorderGeometry(int x, int y)
+{
+    auto borderGeode = createBorderGeometry(x, y, 1.f, mWorld->getStorage(), mSceneManager, mBorderMask);
     mRoot->addChild(borderGeode);
 
     mCellBorderNodes[std::make_pair(x,y)] = borderGeode;
diff --git a/components/terrain/cellborder.hpp b/components/terrain/cellborder.hpp
index ee8fd72593..d72241e3dc 100644
--- a/components/terrain/cellborder.hpp
+++ b/components/terrain/cellborder.hpp
@@ -11,6 +11,7 @@ namespace Resource
 
 namespace Terrain
 {
+    class Storage;
     class World;
 
     /**
@@ -31,6 +32,8 @@ namespace Terrain
         */
         void destroyCellBorderGeometry();
 
+        static osg::ref_ptr<osg::Geode> createBorderGeometry(float x, float y, float size, Storage* terrain, Resource::SceneManager* sceneManager, int mask);
+
     protected:
         Terrain::World *mWorld;
         Resource::SceneManager* mSceneManager;
diff --git a/components/terrain/chunkmanager.cpp b/components/terrain/chunkmanager.cpp
index 8809a75bb9..53b743c03a 100644
--- a/components/terrain/chunkmanager.cpp
+++ b/components/terrain/chunkmanager.cpp
@@ -5,6 +5,7 @@
 #include <osg/Texture2D>
 #include <osg/ClusterCullingCallback>
 #include <osg/Material>
+#include <osg/MatrixTransform>
 
 #include <osgUtil/IncrementalCompileOperation>
 
@@ -12,12 +13,14 @@
 #include <components/resource/scenemanager.hpp>
 
 #include <components/sceneutil/lightmanager.hpp>
+#include <components/settings/settings.hpp>
 
 #include "terraindrawable.hpp"
 #include "material.hpp"
 #include "storage.hpp"
 #include "texturemanager.hpp"
 #include "compositemaprenderer.hpp"
+#include <components/misc/constants.hpp>
 
 namespace Terrain
 {
@@ -32,6 +35,7 @@ ChunkManager::ChunkManager(Storage *storage, Resource::SceneManager *sceneMgr, T
     , mCompositeMapSize(512)
     , mCompositeMapLevel(1.f)
     , mMaxCompGeometrySize(1.f)
+    , mDebugChunks(Settings::Manager::getBool("debug chunks", "Terrain"))
 {
     mMultiPassRoot = new osg::StateSet;
     mMultiPassRoot->setRenderingHint(osg::StateSet::OPAQUE_BIN);
@@ -234,7 +238,19 @@ osg::ref_ptr<osg::Node> ChunkManager::createChunk(float chunkSize, const osg::Ve
     }
     geometry->setNodeMask(mNodeMask);
 
-    return geometry;
+    osg::ref_ptr<osg::Group> result(new osg::Group);
+    result->addChild(geometry);
+    if (mDebugChunks)
+    {
+        auto chunkBorder = CellBorder::createBorderGeometry(chunkCenter.x() - chunkSize / 2.f, chunkCenter.y() - chunkSize / 2.f, chunkSize, mStorage, mSceneManager, getNodeMask());
+        osg::Vec3f center = { chunkCenter.x(), chunkCenter.y(), 0 };
+        osg::ref_ptr<osg::MatrixTransform> trans = new osg::MatrixTransform(osg::Matrixf::translate(-center*Constants::CellSizeInUnits));
+        trans->setDataVariance(osg::Object::STATIC);
+        trans->addChild(chunkBorder);
+        result->addChild(trans);
+    }
+
+    return result;
 }
 
 }
diff --git a/components/terrain/chunkmanager.hpp b/components/terrain/chunkmanager.hpp
index 9b7dbf3ee1..4e030e018c 100644
--- a/components/terrain/chunkmanager.hpp
+++ b/components/terrain/chunkmanager.hpp
@@ -72,6 +72,7 @@ namespace Terrain
         unsigned int mCompositeMapSize;
         float mCompositeMapLevel;
         float mMaxCompGeometrySize;
+        bool mDebugChunks = false;
     };
 
 }
diff --git a/components/terrain/quadtreeworld.cpp b/components/terrain/quadtreeworld.cpp
index 6a228a75af..ca28e1cc05 100644
--- a/components/terrain/quadtreeworld.cpp
+++ b/components/terrain/quadtreeworld.cpp
@@ -367,7 +367,7 @@ void updateWaterCullingView(HeightCullCallback* callback, ViewData* vd, osgUtil:
     for (unsigned int i=0; i<vd->getNumEntries(); ++i)
     {
         ViewData::Entry& entry = vd->getEntry(i);
-        osg::BoundingBox bb = static_cast<TerrainDrawable*>(entry.mRenderingNode->asGroup()->getChild(0))->getWaterBoundingBox();
+        osg::BoundingBox bb = static_cast<TerrainDrawable*>(entry.mRenderingNode->asGroup()->getChild(0)->asGroup()->getChild(0))->getWaterBoundingBox();
         if (!bb.valid())
             continue;
         osg::Vec3f ofs (entry.mNode->getCenter().x()*cellworldsize, entry.mNode->getCenter().y()*cellworldsize, 0.f);
diff --git a/docs/source/reference/modding/settings/terrain.rst b/docs/source/reference/modding/settings/terrain.rst
index e6018a8655..80c085f4c9 100644
--- a/docs/source/reference/modding/settings/terrain.rst
+++ b/docs/source/reference/modding/settings/terrain.rst
@@ -100,6 +100,15 @@ max composite geometry size
 Controls the maximum size of simple composite geometry chunk in cell units. With small values there will more draw calls and small textures,
 but higher values create more overdraw (not every texture layer is used everywhere).
 
+debug chunks
+------------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	False
+
+This debug setting allows you to see the borders of each chunks of the world by drawing lines arround them (as with toggleborder).
+
 object paging
 -------------
 
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 7f57ba529d..08039f5fbe 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -139,6 +139,9 @@ composite map resolution = 512
 # Controls the maximum size of composite geometry, should be >= 1.0. With low values there will be many small chunks, with high values - lesser count of bigger chunks.
 max composite geometry size = 4.0
 
+# Draw lines arround chunks.
+debug chunks = false
+
 # Use object paging for non active cells
 object paging = true
 

From 4b7d0bba53cb3d4f84da72b53828afce9ce6e80e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Mocquillon?= <cedric.mocquillon@gmail.com>
Date: Mon, 6 Sep 2021 21:10:03 +0200
Subject: [PATCH 1303/2859] Avoid adding redundant osg;;Group in non debug mode

---
 components/terrain/chunkmanager.cpp  |  7 ++++---
 components/terrain/quadtreeworld.cpp | 11 ++++++++---
 components/terrain/quadtreeworld.hpp |  1 +
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/components/terrain/chunkmanager.cpp b/components/terrain/chunkmanager.cpp
index 53b743c03a..1f3279e5c5 100644
--- a/components/terrain/chunkmanager.cpp
+++ b/components/terrain/chunkmanager.cpp
@@ -238,19 +238,20 @@ osg::ref_ptr<osg::Node> ChunkManager::createChunk(float chunkSize, const osg::Ve
     }
     geometry->setNodeMask(mNodeMask);
 
-    osg::ref_ptr<osg::Group> result(new osg::Group);
-    result->addChild(geometry);
     if (mDebugChunks)
     {
+        osg::ref_ptr<osg::Group> result(new osg::Group);
+        result->addChild(geometry);
         auto chunkBorder = CellBorder::createBorderGeometry(chunkCenter.x() - chunkSize / 2.f, chunkCenter.y() - chunkSize / 2.f, chunkSize, mStorage, mSceneManager, getNodeMask());
         osg::Vec3f center = { chunkCenter.x(), chunkCenter.y(), 0 };
         osg::ref_ptr<osg::MatrixTransform> trans = new osg::MatrixTransform(osg::Matrixf::translate(-center*Constants::CellSizeInUnits));
         trans->setDataVariance(osg::Object::STATIC);
         trans->addChild(chunkBorder);
         result->addChild(trans);
+        return result;
     }
 
-    return result;
+    return geometry;
 }
 
 }
diff --git a/components/terrain/quadtreeworld.cpp b/components/terrain/quadtreeworld.cpp
index ca28e1cc05..bbf212942e 100644
--- a/components/terrain/quadtreeworld.cpp
+++ b/components/terrain/quadtreeworld.cpp
@@ -252,6 +252,7 @@ QuadTreeWorld::QuadTreeWorld(osg::Group *parent, osg::Group *compileRoot, Resour
     , mVertexLodMod(vertexLodMod)
     , mViewDistance(std::numeric_limits<float>::max())
     , mMinSize(1/8.f)
+    , mDebugTerrainChunks(Settings::Manager::getBool("debug chunks", "Terrain"))
 {
     mChunkManager->setCompositeMapSize(compMapResolution);
     mChunkManager->setCompositeMapLevel(compMapLevel);
@@ -351,7 +352,7 @@ void loadRenderingNode(ViewData::Entry& entry, ViewData* vd, int vertexLodMod, f
     }
 }
 
-void updateWaterCullingView(HeightCullCallback* callback, ViewData* vd, osgUtil::CullVisitor* cv, float cellworldsize, bool outofworld)
+void updateWaterCullingView(HeightCullCallback* callback, ViewData* vd, osgUtil::CullVisitor* cv, float cellworldsize, bool outofworld, bool debugTerrainChunk)
 {
     if (!(cv->getTraversalMask() & callback->getCullMask()))
         return;
@@ -367,7 +368,11 @@ void updateWaterCullingView(HeightCullCallback* callback, ViewData* vd, osgUtil:
     for (unsigned int i=0; i<vd->getNumEntries(); ++i)
     {
         ViewData::Entry& entry = vd->getEntry(i);
-        osg::BoundingBox bb = static_cast<TerrainDrawable*>(entry.mRenderingNode->asGroup()->getChild(0)->asGroup()->getChild(0))->getWaterBoundingBox();
+        osg::BoundingBox bb;
+        if(debugTerrainChunk)
+            bb = static_cast<TerrainDrawable*>(entry.mRenderingNode->asGroup()->getChild(0)->asGroup()->getChild(0))->getWaterBoundingBox();
+        else
+            bb = static_cast<TerrainDrawable*>(entry.mRenderingNode->asGroup()->getChild(0))->getWaterBoundingBox();
         if (!bb.valid())
             continue;
         osg::Vec3f ofs (entry.mNode->getCenter().x()*cellworldsize, entry.mNode->getCenter().y()*cellworldsize, 0.f);
@@ -443,7 +448,7 @@ void QuadTreeWorld::accept(osg::NodeVisitor &nv)
     }
 
     if (mHeightCullCallback && isCullVisitor)
-        updateWaterCullingView(mHeightCullCallback, vd, static_cast<osgUtil::CullVisitor*>(&nv), mStorage->getCellWorldSize(), !isGridEmpty());
+        updateWaterCullingView(mHeightCullCallback, vd, static_cast<osgUtil::CullVisitor*>(&nv), mStorage->getCellWorldSize(), !isGridEmpty(), mDebugTerrainChunks);
 
     vd->markUnchanged();
 
diff --git a/components/terrain/quadtreeworld.hpp b/components/terrain/quadtreeworld.hpp
index 3dd96a0b84..f7cbf8097a 100644
--- a/components/terrain/quadtreeworld.hpp
+++ b/components/terrain/quadtreeworld.hpp
@@ -72,6 +72,7 @@ namespace Terrain
         int mVertexLodMod;
         float mViewDistance;
         float mMinSize;
+        bool mDebugTerrainChunks;
     };
 
 }

From 080c909c285a3719f1804517ab831005fc47131d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Mocquillon?= <cedric.mocquillon@gmail.com>
Date: Wed, 8 Sep 2021 19:59:53 +0200
Subject: [PATCH 1304/2859] Merge the 'debug chunks' and 'object paging debug
 batches' settings into a single one

---
 apps/openmw/mwrender/objectpaging.cpp              |  2 +-
 docs/source/reference/modding/settings/terrain.rst | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index 907631436f..376c517d59 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -390,7 +390,7 @@ namespace MWRender
          , mRefTrackerLocked(false)
     {
         mActiveGrid = Settings::Manager::getBool("object paging active grid", "Terrain");
-        mDebugBatches = Settings::Manager::getBool("object paging debug batches", "Terrain");
+        mDebugBatches = Settings::Manager::getBool("debug chunks", "Terrain");
         mMergeFactor = Settings::Manager::getFloat("object paging merge factor", "Terrain");
         mMinSize = Settings::Manager::getFloat("object paging min size", "Terrain");
         mMinSizeMergeFactor = Settings::Manager::getFloat("object paging min size merge factor", "Terrain");
diff --git a/docs/source/reference/modding/settings/terrain.rst b/docs/source/reference/modding/settings/terrain.rst
index 80c085f4c9..752260fd48 100644
--- a/docs/source/reference/modding/settings/terrain.rst
+++ b/docs/source/reference/modding/settings/terrain.rst
@@ -107,7 +107,10 @@ debug chunks
 :Range:		True/False
 :Default:	False
 
-This debug setting allows you to see the borders of each chunks of the world by drawing lines arround them (as with toggleborder).
+This debug setting allows you to see the borders of each chunks of the world by drawing lines arround them (as with toggleborder). 
+If object paging is set to true then this debug setting will allows you to see what objects have been merged in the scene
+by making them colored randomly.
+
 
 object paging
 -------------
@@ -203,12 +206,3 @@ object paging min size cost multiplier
 This setting adjusts the calculated cost of merging an object used in the mentioned functionality.
 The larger this value is, the less expensive objects can be before they are discarded.
 See the formula above to figure out the math.
-
-object paging debug batches
----------------------------
-:Type:		boolean
-:Range:		True/False
-:Default:	False
-
-This debug setting allows you to see what objects have been merged in the scene
-by making them colored randomly.

From d7352ded36f05330df2c392b06edc3411a762eee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Mocquillon?= <cedric.mocquillon@gmail.com>
Date: Sat, 11 Sep 2021 08:25:41 +0200
Subject: [PATCH 1305/2859] Add configurable color and offset

---
 components/terrain/cellborder.cpp   | 6 +++---
 components/terrain/cellborder.hpp   | 2 +-
 components/terrain/chunkmanager.cpp | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/terrain/cellborder.cpp b/components/terrain/cellborder.cpp
index e391036902..280a55faca 100644
--- a/components/terrain/cellborder.cpp
+++ b/components/terrain/cellborder.cpp
@@ -22,11 +22,11 @@ CellBorder::CellBorder(Terrain::World *world, osg::Group *root, int borderMask,
 {
 }
 
-osg::ref_ptr<osg::Geode> CellBorder::createBorderGeometry(float x, float y, float size, Terrain::Storage* terrain, Resource::SceneManager* sceneManager, int mask)
+osg::ref_ptr<osg::Geode> CellBorder::createBorderGeometry(float x, float y, float size, Terrain::Storage* terrain, Resource::SceneManager* sceneManager, int mask,
+    float offset, osg::Vec4f color)
 {
     const int cellSize = ESM::Land::REAL_SIZE;
     const int borderSegments = 40;
-    const float offset = 10.0;
 
     osg::Vec3 cellCorner = osg::Vec3(x * cellSize,y * cellSize,0);
     size *= cellSize;
@@ -52,7 +52,7 @@ osg::ref_ptr<osg::Geode> CellBorder::createBorderGeometry(float x, float y, floa
 
         osg::Vec4f col = i % 2 == 0 ?
             osg::Vec4f(0,0,0,1) :
-            osg::Vec4f(1,1,0,1);
+            color;
 
         colors->push_back(col);
     }
diff --git a/components/terrain/cellborder.hpp b/components/terrain/cellborder.hpp
index d72241e3dc..785c441b86 100644
--- a/components/terrain/cellborder.hpp
+++ b/components/terrain/cellborder.hpp
@@ -32,7 +32,7 @@ namespace Terrain
         */
         void destroyCellBorderGeometry();
 
-        static osg::ref_ptr<osg::Geode> createBorderGeometry(float x, float y, float size, Storage* terrain, Resource::SceneManager* sceneManager, int mask);
+        static osg::ref_ptr<osg::Geode> createBorderGeometry(float x, float y, float size, Storage* terrain, Resource::SceneManager* sceneManager, int mask, float offset = 10.0, osg::Vec4f color = { 1,1,0,0 });
 
     protected:
         Terrain::World *mWorld;
diff --git a/components/terrain/chunkmanager.cpp b/components/terrain/chunkmanager.cpp
index 1f3279e5c5..7a6d4fdb0a 100644
--- a/components/terrain/chunkmanager.cpp
+++ b/components/terrain/chunkmanager.cpp
@@ -242,7 +242,7 @@ osg::ref_ptr<osg::Node> ChunkManager::createChunk(float chunkSize, const osg::Ve
     {
         osg::ref_ptr<osg::Group> result(new osg::Group);
         result->addChild(geometry);
-        auto chunkBorder = CellBorder::createBorderGeometry(chunkCenter.x() - chunkSize / 2.f, chunkCenter.y() - chunkSize / 2.f, chunkSize, mStorage, mSceneManager, getNodeMask());
+        auto chunkBorder = CellBorder::createBorderGeometry(chunkCenter.x() - chunkSize / 2.f, chunkCenter.y() - chunkSize / 2.f, chunkSize, mStorage, mSceneManager, getNodeMask(), 5.f, { 1, 0, 0, 0 });
         osg::Vec3f center = { chunkCenter.x(), chunkCenter.y(), 0 };
         osg::ref_ptr<osg::MatrixTransform> trans = new osg::MatrixTransform(osg::Matrixf::translate(-center*Constants::CellSizeInUnits));
         trans->setDataVariance(osg::Object::STATIC);

From c40f921396927eacbadb24c198692fe4e416acb5 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Sun, 12 Sep 2021 07:56:20 +0000
Subject: [PATCH 1306/2859] Revert "actoranimation.cpp faster getbonebyname
 (#3099)"

This reverts commit c284d0cf5c6ca0a6a55e92f9de7351469946628d
---
 apps/openmw/mwrender/actoranimation.cpp | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/apps/openmw/mwrender/actoranimation.cpp b/apps/openmw/mwrender/actoranimation.cpp
index cb46354590..f556e6891a 100644
--- a/apps/openmw/mwrender/actoranimation.cpp
+++ b/apps/openmw/mwrender/actoranimation.cpp
@@ -67,14 +67,17 @@ ActorAnimation::~ActorAnimation()
 
 PartHolderPtr ActorAnimation::attachMesh(const std::string& model, const std::string& bonename, bool enchantedGlow, osg::Vec4f* glowColor)
 {
+    osg::Group* parent = getBoneByName(bonename);
+    if (!parent)
+        return nullptr;
+
+    osg::ref_ptr<osg::Node> instance = mResourceSystem->getSceneManager()->getInstance(model, parent);
+
     const NodeMap& nodeMap = getNodeMap();
     NodeMap::const_iterator found = nodeMap.find(Misc::StringUtils::lowerCase(bonename));
     if (found == nodeMap.end())
         return PartHolderPtr();
 
-    osg::Group* parent = found->second;
-    osg::ref_ptr<osg::Node> instance = mResourceSystem->getSceneManager()->getInstance(model, parent);
-
     if (enchantedGlow)
         mGlowUpdater = SceneUtil::addEnchantedGlow(instance, mResourceSystem, *glowColor);
 
@@ -133,9 +136,9 @@ bool ActorAnimation::updateCarriedLeftVisible(const int weaptype) const
         MWMechanics::CreatureStats &stats = cls.getCreatureStats(mPtr);
         if (cls.hasInventoryStore(mPtr) && weaptype != ESM::Weapon::Spell)
         {
-            osg::Group* foundNode = getBoneByName ("Bip01 AttachShield");
-
-            if (foundNode || (mPtr == MWMechanics::getPlayer() && mPtr.isInCell() && MWBase::Environment::get().getWorld()->isFirstPerson()))
+            SceneUtil::FindByNameVisitor findVisitor ("Bip01 AttachShield");
+            mObjectRoot->accept(findVisitor);
+            if (findVisitor.mFoundNode || (mPtr == MWMechanics::getPlayer() && mPtr.isInCell() && MWBase::Environment::get().getWorld()->isFirstPerson()))
             {
                 const MWWorld::InventoryStore& inv = cls.getInventoryStore(mPtr);
                 const MWWorld::ConstContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
@@ -273,11 +276,10 @@ osg::Group* ActorAnimation::getBoneByName(const std::string& boneName) const
     if (!mObjectRoot)
         return nullptr;
 
-    const NodeMap& nodeMap = getNodeMap();
-    NodeMap::const_iterator found = nodeMap.find(Misc::StringUtils::lowerCase(boneName));
-    if (found == nodeMap.end())
-        return nullptr;
-    return found->second;
+    SceneUtil::FindByNameVisitor findVisitor (boneName);
+    mObjectRoot->accept(findVisitor);
+
+    return findVisitor.mFoundNode;
 }
 
 std::string ActorAnimation::getHolsteredWeaponBoneName(const MWWorld::ConstPtr& weapon)

From 52a9b4d989d3489e2238ce538516904574edb04d Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Sun, 12 Sep 2021 09:21:10 +0000
Subject: [PATCH 1307/2859] shadowsbin.cpp uniform

---
 components/sceneutil/shadowsbin.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/sceneutil/shadowsbin.cpp b/components/sceneutil/shadowsbin.cpp
index 14dbc14178..af62b581c9 100644
--- a/components/sceneutil/shadowsbin.cpp
+++ b/components/sceneutil/shadowsbin.cpp
@@ -54,6 +54,7 @@ ShadowsBin::ShadowsBin()
 
     mShaderAlphaTestStateSet = new osg::StateSet;
     mShaderAlphaTestStateSet->addUniform(new osg::Uniform("alphaTestShadows", true));
+    mShaderAlphaTestStateSet->addUniform(new osg::Uniform("useDiffuseMapForShadowAlpha", true));
     mShaderAlphaTestStateSet->setMode(GL_BLEND, osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED | osg::StateAttribute::OVERRIDE);
 
     for (size_t i = 0; i < sCastingPrograms.size(); ++i)

From 6d12a240a39492f9ea7f3a94709cb641b9697ced Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Sun, 12 Sep 2021 09:23:36 +0000
Subject: [PATCH 1308/2859] shadervisitor.cpp uniform

---
 components/shader/shadervisitor.cpp | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 26511d4654..a72d772afe 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -340,15 +340,6 @@ namespace Shader
                     mRequirements.back().mShaderRequired = true;
                 }
             }
-
-            if (diffuseMap)
-            {
-                if (!writableStateSet)
-                    writableStateSet = getWritableStateSet(node);
-                // We probably shouldn't construct a new version of this each time as Uniforms use pointer comparison for early-out.
-                // Also it should probably belong to the shader manager or be applied by the shadows bin
-                writableStateSet->addUniform(new osg::Uniform("useDiffuseMapForShadowAlpha", true));
-            }
         }
 
         const osg::StateSet::AttributeList& attributes = stateset->getAttributeList();

From b6f572578e04cf2e7a6fa2b9d09c2ea27e6e42e7 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Mon, 13 Sep 2021 10:20:00 +0000
Subject: [PATCH 1309/2859] Groundcover optimisation (#3101)

* groundcover.cpp share state

* groundcover.hpp share state
---
 apps/openmw/mwrender/groundcover.cpp | 54 ++++++++--------------------
 apps/openmw/mwrender/groundcover.hpp |  1 +
 2 files changed, 16 insertions(+), 39 deletions(-)

diff --git a/apps/openmw/mwrender/groundcover.cpp b/apps/openmw/mwrender/groundcover.cpp
index 39022709fb..a199201d41 100644
--- a/apps/openmw/mwrender/groundcover.cpp
+++ b/apps/openmw/mwrender/groundcover.cpp
@@ -1,6 +1,7 @@
 #include "groundcover.hpp"
 
 #include <osg/AlphaFunc>
+#include <osg/BlendFunc>
 #include <osg/Geometry>
 #include <osg/VertexAttribDivisor>
 
@@ -66,18 +67,6 @@ namespace MWRender
         {
         }
 
-        void apply(osg::Node& node) override
-        {
-            osg::ref_ptr<osg::StateSet> ss = node.getStateSet();
-            if (ss != nullptr)
-            {
-                ss->removeAttribute(osg::StateAttribute::MATERIAL);
-                removeAlpha(ss);
-            }
-
-            traverse(node);
-        }
-
         void apply(osg::Geometry& geom) override
         {
             for (unsigned int i = 0; i < geom.getNumPrimitiveSets(); ++i)
@@ -110,32 +99,14 @@ namespace MWRender
 
             // Display lists do not support instancing in OSG 3.4
             geom.setUseDisplayList(false);
+            geom.setUseVertexBufferObjects(true);
 
             geom.setVertexAttribArray(6, transforms.get(), osg::Array::BIND_PER_VERTEX);
             geom.setVertexAttribArray(7, rotations.get(), osg::Array::BIND_PER_VERTEX);
-
-            osg::ref_ptr<osg::StateSet> ss = geom.getOrCreateStateSet();
-            ss->setAttribute(new osg::VertexAttribDivisor(6, 1));
-            ss->setAttribute(new osg::VertexAttribDivisor(7, 1));
-
-            ss->removeAttribute(osg::StateAttribute::MATERIAL);
-            removeAlpha(ss);
-
-            traverse(geom);
         }
     private:
         std::vector<Groundcover::GroundcoverEntry> mInstances;
         osg::Vec3f mChunkPosition;
-
-        void removeAlpha(osg::StateSet* stateset)
-        {
-            // MGE uses default alpha settings for groundcover, so we can not rely on alpha properties
-            stateset->removeAttribute(osg::StateAttribute::ALPHAFUNC);
-            stateset->removeMode(GL_ALPHA_TEST);
-            stateset->removeAttribute(osg::StateAttribute::BLENDFUNC);
-            stateset->removeMode(GL_BLEND);
-            stateset->setRenderBinToInherit();
-        }
     };
 
     class DensityCalculator
@@ -199,7 +170,16 @@ namespace MWRender
          : GenericResourceManager<GroundcoverChunkId>(nullptr)
          , mSceneManager(sceneManager)
          , mDensity(density)
+         , mStateset(new osg::StateSet)
     {
+         // MGE uses default alpha settings for groundcover, so we can not rely on alpha properties
+         // Force a unified alpha handling instead of data from meshes
+         osg::ref_ptr<osg::AlphaFunc> alpha = new osg::AlphaFunc(osg::AlphaFunc::GEQUAL, 128.f / 255.f);
+         mStateset->setAttributeAndModes(alpha.get(), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+         mStateset->setAttributeAndModes(new osg::BlendFunc, osg::StateAttribute::OFF|osg::StateAttribute::OVERRIDE);
+         mStateset->setRenderBinDetails(0, "RenderBin", osg::StateSet::OVERRIDE_RENDERBIN_DETAILS);
+         mStateset->setAttribute(new osg::VertexAttribDivisor(6, 1));
+         mStateset->setAttribute(new osg::VertexAttribDivisor(7, 1));
     }
 
     void Groundcover::collectInstances(InstanceMap& instances, float size, const osg::Vec2f& center)
@@ -255,27 +235,23 @@ namespace MWRender
         for (auto& pair : instances)
         {
             const osg::Node* temp = mSceneManager->getTemplate(pair.first);
-            osg::ref_ptr<osg::Node> node = static_cast<osg::Node*>(temp->clone(osg::CopyOp::DEEP_COPY_ALL&(~osg::CopyOp::DEEP_COPY_TEXTURES)));
+            osg::ref_ptr<osg::Node> node = static_cast<osg::Node*>(temp->clone(osg::CopyOp::DEEP_COPY_NODES|osg::CopyOp::DEEP_COPY_DRAWABLES|osg::CopyOp::DEEP_COPY_USERDATA|osg::CopyOp::DEEP_COPY_ARRAYS|osg::CopyOp::DEEP_COPY_PRIMITIVES));
 
             // Keep link to original mesh to keep it in cache
             group->getOrCreateUserDataContainer()->addUserObject(new Resource::TemplateRef(temp));
 
-            mSceneManager->reinstateRemovedState(node);
-
             InstancingVisitor visitor(pair.second, worldCenter);
             node->accept(visitor);
             group->addChild(node);
         }
 
-        // Force a unified alpha handling instead of data from meshes
-        osg::ref_ptr<osg::AlphaFunc> alpha = new osg::AlphaFunc(osg::AlphaFunc::GEQUAL, 128.f / 255.f);
-        group->getOrCreateStateSet()->setAttributeAndModes(alpha.get(), osg::StateAttribute::ON);
-        group->getBound();
+        group->setStateSet(mStateset);
         group->setNodeMask(Mask_Groundcover);
         if (mSceneManager->getLightingMethod() != SceneUtil::LightingMethod::FFP)
             group->setCullCallback(new SceneUtil::LightListCallback);
         mSceneManager->recreateShaders(group, "groundcover", false, true);
-
+        mSceneManager->shareState(group);
+        group->getBound();
         return group;
     }
 
diff --git a/apps/openmw/mwrender/groundcover.hpp b/apps/openmw/mwrender/groundcover.hpp
index 10874b7e8b..4874bea899 100644
--- a/apps/openmw/mwrender/groundcover.hpp
+++ b/apps/openmw/mwrender/groundcover.hpp
@@ -56,6 +56,7 @@ namespace MWRender
     private:
         Resource::SceneManager* mSceneManager;
         float mDensity;
+        osg::ref_ptr<osg::StateSet> mStateset;
 
         typedef std::map<std::string, std::vector<GroundcoverEntry>> InstanceMap;
         osg::ref_ptr<osg::Node> createChunk(InstanceMap& instances, const osg::Vec2f& center);

From e4eeb9cce9b29702bfde7dc9fdd3b983a8d69249 Mon Sep 17 00:00:00 2001
From: pi03k <pi03k87@gmail.com>
Date: Tue, 7 Sep 2021 23:10:18 +0200
Subject: [PATCH 1310/2859] Remove 'no relevant classes' moc warning

---
 CHANGELOG.md                     |  1 +
 CMakeLists.txt                   |  2 --
 apps/launcher/CMakeLists.txt     | 21 +++------------------
 apps/opencs/CMakeLists.txt       |  5 ++++-
 apps/opencs/view/tools/merge.hpp |  4 ++--
 apps/wizard/CMakeLists.txt       | 23 ++++-------------------
 cmake/OpenMWMacros.cmake         |  6 ------
 components/CMakeLists.txt        |  7 +++++--
 8 files changed, 19 insertions(+), 50 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1132a9e68..ffabc0b037 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,6 +49,7 @@
     Feature #6162: Refactor GUI to use shaders and to be GLES and GL3+ friendly
     Feature #6199: Support FBO Rendering
     Feature #6251: OpenMW-CS: Set instance movement based on camera zoom
+    Task #6201: Remove the "Note: No relevant classes found. No output generated" warnings
     Task #6264: Remove the old classes in animation.cpp
 
 0.47.0
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52a824d4e9..d14762ef5f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -202,8 +202,6 @@ if (USE_QT)
     find_package(Qt5Widgets REQUIRED)
     find_package(Qt5Network REQUIRED)
     find_package(Qt5OpenGL REQUIRED)
-    # Instruct CMake to run moc automatically when needed.
-    #set(CMAKE_AUTOMOC ON)
 endif()
 
 set(USED_OSG_COMPONENTS
diff --git a/apps/launcher/CMakeLists.txt b/apps/launcher/CMakeLists.txt
index e9ec906e6a..7e8bd67e94 100644
--- a/apps/launcher/CMakeLists.txt
+++ b/apps/launcher/CMakeLists.txt
@@ -36,23 +36,6 @@ set(LAUNCHER_HEADER
 )
 
 # Headers that must be pre-processed
-set(LAUNCHER_HEADER_MOC
-    datafilespage.hpp
-    graphicspage.hpp
-    maindialog.hpp
-    playpage.hpp
-    textslotmsgbox.hpp
-    settingspage.hpp
-    advancedpage.hpp
-
-    utils/cellnameloader.hpp
-    utils/textinputdialog.hpp
-    utils/profilescombobox.hpp
-    utils/lineedit.hpp
-    utils/openalutil.hpp
-
-)
-
 set(LAUNCHER_UI
     ${CMAKE_SOURCE_DIR}/files/ui/datafilespage.ui
     ${CMAKE_SOURCE_DIR}/files/ui/graphicspage.ui
@@ -74,7 +57,6 @@ if(WIN32)
 endif(WIN32)
 
 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})
@@ -109,4 +91,7 @@ if (BUILD_WITH_CODE_COVERAGE)
   target_link_libraries(openmw-launcher gcov)
 endif()
 
+if(USE_QT)
+    set_property(TARGET openmw-launcher PROPERTY AUTOMOC ON)
+endif(USE_QT)
 
diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 4b3b8030e6..60bd0f4ded 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -150,7 +150,6 @@ if(WIN32)
 endif(WIN32)
 
 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
@@ -259,3 +258,7 @@ endif (MSVC)
 if(APPLE)
     INSTALL(TARGETS openmw-cs BUNDLE DESTINATION "." COMPONENT Bundle)
 endif()
+
+if(USE_QT)
+    set_property(TARGET openmw-cs PROPERTY AUTOMOC ON)
+endif(USE_QT)
diff --git a/apps/opencs/view/tools/merge.hpp b/apps/opencs/view/tools/merge.hpp
index d394a431ed..c7c4585979 100644
--- a/apps/opencs/view/tools/merge.hpp
+++ b/apps/opencs/view/tools/merge.hpp
@@ -1,5 +1,5 @@
-#ifndef CSV_TOOLS_REPORTTABLE_H
-#define CSV_TOOLS_REPORTTABLE_H
+#ifndef CSV_TOOLS_MERGE_H
+#define CSV_TOOLS_MERGE_H
 
 #include <QWidget>
 
diff --git a/apps/wizard/CMakeLists.txt b/apps/wizard/CMakeLists.txt
index 2558ec81de..03cd63480a 100644
--- a/apps/wizard/CMakeLists.txt
+++ b/apps/wizard/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 set(WIZARD
     componentselectionpage.cpp
     conclusionpage.cpp
@@ -34,21 +33,6 @@ set(WIZARD_HEADER
     utils/componentlistwidget.hpp
 )
 
-# Headers that must be pre-processed
-set(WIZARD_HEADER_MOC
-    componentselectionpage.hpp
-    conclusionpage.hpp
-    existinginstallationpage.hpp
-    importpage.hpp
-    installationtargetpage.hpp
-    intropage.hpp
-    languageselectionpage.hpp
-    mainwizard.hpp
-    methodselectionpage.hpp
-
-    utils/componentlistwidget.hpp
-)
-
 set(WIZARD_UI
     ${CMAKE_SOURCE_DIR}/files/ui/wizard/componentselectionpage.ui
     ${CMAKE_SOURCE_DIR}/files/ui/wizard/conclusionpage.ui
@@ -63,7 +47,6 @@ set(WIZARD_UI
 if (OPENMW_USE_UNSHIELD)
     set (WIZARD ${WIZARD} installationpage.cpp unshield/unshieldworker.cpp)
     set (WIZARD_HEADER ${WIZARD_HEADER} installationpage.hpp unshield/unshieldworker.hpp)
-    set (WIZARD_HEADER_MOC ${WIZARD_HEADER_MOC} installationpage.hpp unshield/unshieldworker.hpp)
     set (WIZARD_UI ${WIZARD_UI} ${CMAKE_SOURCE_DIR}/files/ui/wizard/installationpage.ui)
     add_definitions(-DOPENMW_USE_UNSHIELD)
 endif (OPENMW_USE_UNSHIELD)
@@ -80,7 +63,6 @@ if(WIN32)
 endif(WIN32)
 
 QT5_ADD_RESOURCES(RCC_SRCS ${CMAKE_SOURCE_DIR}/files/wizard/wizard.qrc)
-QT5_WRAP_CPP(MOC_SRCS ${WIZARD_HEADER_MOC})
 QT5_WRAP_UI(UI_HDRS ${WIZARD_UI})
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
@@ -94,7 +76,6 @@ openmw_add_executable(openmw-wizard
     ${WIZARD}
     ${WIZARD_HEADER}
     ${RCC_SRCS}
-    ${MOC_SRCS}
     ${UI_HDRS}
 )
 
@@ -125,3 +106,7 @@ endif()
 if (WIN32)
     INSTALL(TARGETS openmw-wizard RUNTIME DESTINATION ".")
 endif(WIN32)
+
+if(USE_QT)
+    set_property(TARGET openmw-wizard PROPERTY AUTOMOC ON)
+endif(USE_QT)
diff --git a/cmake/OpenMWMacros.cmake b/cmake/OpenMWMacros.cmake
index 176a02d507..5bee345344 100644
--- a/cmake/OpenMWMacros.cmake
+++ b/cmake/OpenMWMacros.cmake
@@ -80,10 +80,6 @@ foreach (f ${ALL})
 list (APPEND files "${f}")
 list (APPEND COMPONENT_QT_FILES "${f}")
 endforeach (f)
-file (GLOB MOC_H "${dir}/${u}.hpp")
-foreach (fi ${MOC_H})
-list (APPEND COMPONENT_MOC_FILES "${fi}")
-endforeach (fi)
 endforeach (u)
 source_group ("components\\${dir}" FILES ${files})
 endmacro (add_component_qt_dir)
@@ -99,7 +95,6 @@ endmacro (add_unit)
 
 macro (add_qt_unit project dir unit)
 add_file (${project} _HDR ${comp} "${dir}/${unit}.hpp")
-add_file (${project} _HDR_QT ${comp} "${dir}/${unit}.hpp")
 add_file (${project} _SRC ${comp} "${dir}/${unit}.cpp")
 endmacro (add_qt_unit)
 
@@ -109,7 +104,6 @@ endmacro (add_hdr)
 
 macro (add_qt_hdr project dir unit)
 add_file (${project} _HDR ${comp} "${dir}/${unit}.hpp")
-add_file (${project} _HDR_QT ${comp} "${dir}/${unit}.hpp")
 endmacro (add_qt_hdr)
 
 macro (opencs_units dir)
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 7983de6190..5b79a096cd 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -226,7 +226,6 @@ if (USE_QT)
         )
 
     QT5_WRAP_UI(ESM_UI_HDR ${ESM_UI})
-    QT5_WRAP_CPP(MOC_SRCS ${COMPONENT_MOC_FILES})
 endif()
 
 if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
@@ -280,7 +279,7 @@ if (WIN32)
 endif()
 
 if (USE_QT)
-    add_library(components_qt STATIC ${COMPONENT_QT_FILES} ${MOC_SRCS} ${ESM_UI_HDR})
+    add_library(components_qt STATIC ${COMPONENT_QT_FILES} ${ESM_UI_HDR})
     target_link_libraries(components_qt components Qt5::Widgets Qt5::Core)
     target_compile_definitions(components_qt PRIVATE OPENMW_DOC_BASEURL="${OPENMW_DOC_BASEURL}")
 endif()
@@ -333,3 +332,7 @@ if(OSG_STATIC)
         target_link_libraries(components freetype jpeg png)
     endif()
 endif(OSG_STATIC)
+
+if(USE_QT)
+    set_property(TARGET components_qt PROPERTY AUTOMOC ON)
+endif(USE_QT)

From 3415f12e128a2de023872d8cfb277de1fa2af275 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Tue, 14 Sep 2021 11:30:07 +0000
Subject: [PATCH 1311/2859] shadervisitor.cpp

---
 components/shader/shadervisitor.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index a72d772afe..cb0173c648 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -458,6 +458,9 @@ namespace Shader
             defineMap[texIt->second + std::string("UV")] = std::to_string(texIt->first);
         }
 
+        if (defineMap["diffuseMap"] == 0)
+            writableStateSet->addUniform(new osg::Uniform("useDiffuseMapForShadowAlpha", false));
+
         defineMap["parallax"] = reqs.mNormalHeight ? "1" : "0";
 
         writableStateSet->addUniform(new osg::Uniform("colorMode", reqs.mColorMode));

From 2cebd194327b285b8a151b81b9f95dd8fbdd03ce Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Tue, 14 Sep 2021 11:37:23 +0000
Subject: [PATCH 1312/2859] shadervisitor.cpp

---
 components/shader/shadervisitor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index cb0173c648..cbd2863e46 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -458,7 +458,7 @@ namespace Shader
             defineMap[texIt->second + std::string("UV")] = std::to_string(texIt->first);
         }
 
-        if (defineMap["diffuseMap"] == 0)
+        if (defineMap["diffuseMap"] == "0")
             writableStateSet->addUniform(new osg::Uniform("useDiffuseMapForShadowAlpha", false));
 
         defineMap["parallax"] = reqs.mNormalHeight ? "1" : "0";

From 60298cd66de1bc9a1fefd1cec23218a64c21678b Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Tue, 14 Sep 2021 16:53:57 +0200
Subject: [PATCH 1313/2859] Reset rotation when respawning actors

---
 CHANGELOG.md                     | 1 +
 apps/openmw/mwclass/creature.cpp | 1 +
 apps/openmw/mwclass/npc.cpp      | 1 +
 3 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1132a9e68..91602e5408 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,7 @@
     Bug #6174: Spellmaking and Enchanting sliders differences from vanilla
     Bug #6184: Command and Calm and Demoralize and Frenzy and Rally magic effects inconsistencies with vanilla
     Bug #6197: Infinite Casting Loop
+    Bug #6273: Respawning NPCs rotation is inconsistent
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
     Feature #2780: A way to see current OpenMW version in the console
     Feature #3616: Allow Zoom levels on the World Map
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 50dafba39b..54623e6699 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -846,6 +846,7 @@ namespace MWClass
 
                 // Reset to original position
                 MWBase::Environment::get().getWorld()->moveObject(ptr, ptr.getCellRef().getPosition().asVec3());
+                MWBase::Environment::get().getWorld()->rotateObject(ptr, ptr.getCellRef().getPosition().asRotationVec3(), MWBase::RotationFlag_none);
             }
         }
     }
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 41cf3beed5..718b4d972d 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -1397,6 +1397,7 @@ namespace MWClass
 
                 // Reset to original position
                 MWBase::Environment::get().getWorld()->moveObject(ptr, ptr.getCellRef().getPosition().asVec3());
+                MWBase::Environment::get().getWorld()->rotateObject(ptr, ptr.getCellRef().getPosition().asRotationVec3(), MWBase::RotationFlag_none);
             }
         }
     }

From d4e26746a32404d620c8e847335ba096668fee17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Mocquillon?= <cedric.mocquillon@gmail.com>
Date: Mon, 6 Sep 2021 21:56:32 +0200
Subject: [PATCH 1314/2859] Use recurse subdirectory iterator to iterate over
 the VFS without exposing internal details

---
 apps/niftest/niftest.cpp                |  5 +--
 apps/opencs/model/world/resources.cpp   |  4 +-
 apps/openmw/mwgui/loadingscreen.cpp     | 23 ++++------
 apps/openmw/mwrender/animation.cpp      | 36 ++++------------
 apps/openmw/mwsound/soundmanagerimp.cpp | 18 ++------
 components/fontloader/fontloader.cpp    | 18 ++------
 components/vfs/manager.cpp              | 10 ++---
 components/vfs/manager.hpp              | 56 +++++++++++++++++++++++--
 8 files changed, 82 insertions(+), 88 deletions(-)

diff --git a/apps/niftest/niftest.cpp b/apps/niftest/niftest.cpp
index 2e81885c75..cb6205ef5c 100644
--- a/apps/niftest/niftest.cpp
+++ b/apps/niftest/niftest.cpp
@@ -52,11 +52,8 @@ void readVFS(VFS::Archive* anArchive,std::string archivePath = "")
     myManager.addArchive(anArchive);
     myManager.buildIndex();
 
-    std::map<std::string, VFS::File*> files=myManager.getIndex();
-    for(auto it=files.begin(); it!=files.end(); ++it)
+    for(const auto& name : myManager.getRecursiveDirectoryIterator(""))
     {
-        std::string name = it->first;
-
         try{
             if(isNIF(name))
             {
diff --git a/apps/opencs/model/world/resources.cpp b/apps/opencs/model/world/resources.cpp
index 2544886f3e..cd9f58e848 100644
--- a/apps/opencs/model/world/resources.cpp
+++ b/apps/opencs/model/world/resources.cpp
@@ -23,10 +23,8 @@ void CSMWorld::Resources::recreate(const VFS::Manager* vfs, const char * const *
 
     size_t baseSize = mBaseDirectory.size();
 
-    const std::map<std::string, VFS::File*>& index = vfs->getIndex();
-    for (std::map<std::string, VFS::File*>::const_iterator it = index.begin(); it != index.end(); ++it)
+    for (const auto& filepath : vfs->getRecursiveDirectoryIterator(""))
     {
-        std::string filepath = it->first;
         if (filepath.size()<baseSize+1 ||
             filepath.substr (0, baseSize)!=mBaseDirectory ||
             (filepath[baseSize]!='/' && filepath[baseSize]!='\\'))
diff --git a/apps/openmw/mwgui/loadingscreen.cpp b/apps/openmw/mwgui/loadingscreen.cpp
index 61fcacca46..2d65e4e508 100644
--- a/apps/openmw/mwgui/loadingscreen.cpp
+++ b/apps/openmw/mwgui/loadingscreen.cpp
@@ -66,35 +66,26 @@ namespace MWGui
 
     void LoadingScreen::findSplashScreens()
     {
-        const std::map<std::string, VFS::File*>& index = mResourceSystem->getVFS()->getIndex();
         std::string pattern = "Splash/";
         mResourceSystem->getVFS()->normalizeFilename(pattern);
 
         /* priority given to the left */
         const std::array<std::string, 7> supported_extensions {{".tga", ".dds", ".ktx", ".png", ".bmp", ".jpeg", ".jpg"}};
 
-        auto found = index.lower_bound(pattern);
-        while (found != index.end())
+        for (const auto& name : mResourceSystem->getVFS()->getRecursiveDirectoryIterator(pattern))
         {
-            const std::string& name = found->first;
-            if (name.size() >= pattern.size() && name.substr(0, pattern.size()) == pattern)
+            size_t pos = name.find_last_of('.');
+            if (pos != std::string::npos)
             {
-                size_t pos = name.find_last_of('.');
-                if (pos != std::string::npos)
+                for (auto const& extension : supported_extensions)
                 {
-                    for(auto const& extension: supported_extensions)
+                    if (name.compare(pos, name.size() - pos, extension) == 0)
                     {
-                        if (name.compare(pos, name.size() - pos, extension) == 0)
-                        {
-                            mSplashScreens.push_back(found->first);
-                            break;  /* based on priority */
-                        }
+                        mSplashScreens.push_back(name);
+                        break;  /* based on priority */
                     }
                 }
             }
-            else
-                break;
-            ++found;
         }
         if (mSplashScreens.empty())
             Log(Debug::Warning) << "Warning: no splash screens found!";
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index a04724c70a..4eafd05f5f 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -591,8 +591,6 @@ namespace MWRender
 
     void Animation::loadAllAnimationsInFolder(const std::string &model, const std::string &baseModel)
     {
-        const std::map<std::string, VFS::File*>& index = mResourceSystem->getVFS()->getIndex();
-
         std::string animationPath = model;
         if (animationPath.find("meshes") == 0)
         {
@@ -602,19 +600,11 @@ namespace MWRender
 
         mResourceSystem->getVFS()->normalizeFilename(animationPath);
 
-        std::map<std::string, VFS::File*>::const_iterator found = index.lower_bound(animationPath);
-        while (found != index.end())
+        for (const auto& name : mResourceSystem->getVFS()->getRecursiveDirectoryIterator(animationPath))
         {
-            const std::string& name = found->first;
-            if (name.size() >= animationPath.size() && name.substr(0, animationPath.size()) == animationPath)
-            {
-                size_t pos = name.find_last_of('.');
-                if (pos != std::string::npos && name.compare(pos, name.size()-pos, ".kf") == 0)
-                    addSingleAnimSource(name, baseModel);
-            }
-            else
-                break;
-            ++found;
+            size_t pos = name.find_last_of('.');
+            if (pos != std::string::npos && name.compare(pos, name.size() - pos, ".kf") == 0)
+                addSingleAnimSource(name, baseModel);
         }
     }
 
@@ -1295,8 +1285,6 @@ namespace MWRender
         if (model.empty())
             return;
 
-        const std::map<std::string, VFS::File*>& index = resourceSystem->getVFS()->getIndex();
-
         std::string animationPath = model;
         if (animationPath.find("meshes") == 0)
         {
@@ -1306,19 +1294,11 @@ namespace MWRender
 
         resourceSystem->getVFS()->normalizeFilename(animationPath);
 
-        std::map<std::string, VFS::File*>::const_iterator found = index.lower_bound(animationPath);
-        while (found != index.end())
+        for (const auto& name : resourceSystem->getVFS()->getRecursiveDirectoryIterator(animationPath))
         {
-            const std::string& name = found->first;
-            if (name.size() >= animationPath.size() && name.substr(0, animationPath.size()) == animationPath)
-            {
-                size_t pos = name.find_last_of('.');
-                if (pos != std::string::npos && name.compare(pos, name.size()-pos, ".nif") == 0)
-                    loadBonesFromFile(node, name, resourceSystem);
-            }
-            else
-                break;
-            ++found;
+            size_t pos = name.find_last_of('.');
+            if (pos != std::string::npos && name.compare(pos, name.size() - pos, ".nif") == 0)
+                loadBonesFromFile(node, name, resourceSystem);
         }
     }
 
diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index fc9735d576..f5c3231c99 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -294,20 +294,12 @@ namespace MWSound
         if (mMusicFiles.find(playlist) == mMusicFiles.end())
         {
             std::vector<std::string> filelist;
-            const std::map<std::string, VFS::File*>& index = mVFS->getIndex();
 
             std::string pattern = "Music/" + playlist;
             mVFS->normalizeFilename(pattern);
 
-            std::map<std::string, VFS::File*>::const_iterator found = index.lower_bound(pattern);
-            while (found != index.end())
-            {
-                if (found->first.size() >= pattern.size() && found->first.substr(0, pattern.size()) == pattern)
-                    filelist.push_back(found->first);
-                else
-                    break;
-                ++found;
-            }
+            for (const auto& name : mVFS->getRecursiveDirectoryIterator(pattern))
+                filelist.push_back(name);
 
             mMusicFiles[playlist] = filelist;
         }
@@ -327,13 +319,11 @@ namespace MWSound
         if (mMusicFiles.find("Title") == mMusicFiles.end())
         {
             std::vector<std::string> filelist;
-            const std::map<std::string, VFS::File*>& index = mVFS->getIndex();
             // Is there an ini setting for this filename or something?
             std::string filename = "music/special/morrowind title.mp3";
-            auto found = index.find(filename);
-            if (found != index.end())
+            if (mVFS->exists(filename))
             {
-                filelist.emplace_back(found->first);
+                filelist.emplace_back(filename);
                 mMusicFiles["Title"] = filelist;
             }
             else
diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index 487b7bd70b..998e9c0c64 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -191,24 +191,14 @@ namespace Gui
 
     void FontLoader::loadBitmapFonts(bool exportToFile)
     {
-        const std::map<std::string, VFS::File*>& index = mVFS->getIndex();
-
         std::string pattern = "Fonts/";
         mVFS->normalizeFilename(pattern);
 
-        std::map<std::string, VFS::File*>::const_iterator found = index.lower_bound(pattern);
-        while (found != index.end())
+        for (const auto& name : mVFS->getRecursiveDirectoryIterator(pattern))
         {
-            const std::string& name = found->first;
-            if (name.size() >= pattern.size() && name.substr(0, pattern.size()) == pattern)
-            {
-                size_t pos = name.find_last_of('.');
-                if (pos != std::string::npos && name.compare(pos, name.size()-pos, ".fnt") == 0)
-                    loadBitmapFont(name, exportToFile);
-            }
-            else
-                break;
-            ++found;
+            size_t pos = name.find_last_of('.');
+            if (pos != std::string::npos && name.compare(pos, name.size() - pos, ".fnt") == 0)
+                loadBitmapFont(name, exportToFile);
         }
     }
 
diff --git a/components/vfs/manager.cpp b/components/vfs/manager.cpp
index 045fe3cf5c..f799719e31 100644
--- a/components/vfs/manager.cpp
+++ b/components/vfs/manager.cpp
@@ -86,11 +86,6 @@ namespace VFS
         return mIndex.find(normalized) != mIndex.end();
     }
 
-    const std::map<std::string, File*>& Manager::getIndex() const
-    {
-        return mIndex;
-    }
-
     void Manager::normalizeFilename(std::string &name) const
     {
         normalize_path(name, mStrict);
@@ -107,4 +102,9 @@ namespace VFS
         }
         return {};
     }
+
+    RecursiveDirectoryIterator Manager::getRecursiveDirectoryIterator(const std::string& path) const
+    {
+        return RecursiveDirectoryIterator(mIndex, path);
+    }
 }
diff --git a/components/vfs/manager.hpp b/components/vfs/manager.hpp
index 5a09a995eb..8656f3bf10 100644
--- a/components/vfs/manager.hpp
+++ b/components/vfs/manager.hpp
@@ -12,6 +12,51 @@ namespace VFS
     class Archive;
     class File;
 
+    class RecursiveDirectoryIterator;
+    RecursiveDirectoryIterator end(const RecursiveDirectoryIterator& iter);
+
+    class RecursiveDirectoryIterator
+    {
+    public:
+        RecursiveDirectoryIterator(const std::map<std::string, File*>& index, const std::string& path)
+            : mPath(path)
+            , mIndex(&index)
+            , mIt(index.lower_bound(path))
+        {}
+
+        RecursiveDirectoryIterator(const RecursiveDirectoryIterator&) = default;
+
+        const std::string& operator*() const { return mIt->first; }
+        const std::string* operator->() const { return &mIt->first; }
+
+        bool operator!=(const RecursiveDirectoryIterator& other) { return mPath != other.mPath || mIt != other.mIt; }
+
+        RecursiveDirectoryIterator& operator++()
+        {
+            if (++mIt == mIndex->end() || !starts_with(mIt->first, mPath))
+                *this = end(*this);
+            return *this;
+        }
+
+        friend RecursiveDirectoryIterator end(const RecursiveDirectoryIterator& iter);
+
+    private:
+        static bool starts_with(const std::string& text, const std::string& start) { return text.rfind(start, 0) == 0; }
+
+        std::string mPath;
+        const std::map<std::string, File*>* mIndex;
+        std::map<std::string, File*>::const_iterator mIt;
+    };
+
+    inline RecursiveDirectoryIterator begin(RecursiveDirectoryIterator iter) { return iter; }
+
+    inline RecursiveDirectoryIterator end(const RecursiveDirectoryIterator& iter)
+    {
+        RecursiveDirectoryIterator result(iter);
+        result.mIt = result.mIndex->end();
+        return result;
+    }
+
     /// @brief The main class responsible for loading files from a virtual file system.
     /// @par Various archive types (e.g. directories on the filesystem, or compressed archives)
     /// can be registered, and will be merged into a single file tree. If the same filename is
@@ -40,10 +85,6 @@ namespace VFS
         /// @note May be called from any thread once the index has been built.
         bool exists(const std::string& name) const;
 
-        /// Get a complete list of files from all archives
-        /// @note May be called from any thread once the index has been built.
-        const std::map<std::string, File*>& getIndex() const;
-
         /// Normalize the given filename, making slashes/backslashes consistent, and lower-casing if mStrict is false.
         /// @note May be called from any thread once the index has been built.
         void normalizeFilename(std::string& name) const;
@@ -59,6 +100,13 @@ namespace VFS
         Files::IStreamPtr getNormalized(const std::string& normalizedName) const;
 
         std::string getArchive(const std::string& name) const;
+
+        /// Recursivly iterate over the elements of the given path
+        /// In practice it return all files of the VFS starting with the given path
+        /// @note the path is normalized
+        /// @note May be called from any thread once the index has been built.
+        RecursiveDirectoryIterator getRecursiveDirectoryIterator(const std::string& path) const;
+
     private:
         bool mStrict;
 

From c2df0949e2d739830bf3c3838f644cfdd9bb3371 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Mocquillon?= <cedric.mocquillon@gmail.com>
Date: Mon, 6 Sep 2021 22:01:41 +0200
Subject: [PATCH 1315/2859] Change normalizeFilename signature

---
 apps/openmw/mwgui/loadingscreen.cpp        |  5 +----
 apps/openmw/mwrender/animation.cpp         |  4 ----
 apps/openmw/mwsound/sound_buffer.cpp       |  2 +-
 apps/openmw/mwsound/soundmanagerimp.cpp    | 15 +++------------
 components/fontloader/fontloader.cpp       |  5 +----
 components/resource/bulletshapemanager.cpp |  9 +++------
 components/resource/imagemanager.cpp       |  3 +--
 components/resource/keyframemanager.cpp    |  3 +--
 components/resource/scenemanager.cpp       | 14 ++++----------
 components/vfs/manager.cpp                 |  8 +++++---
 components/vfs/manager.hpp                 |  2 +-
 11 files changed, 21 insertions(+), 49 deletions(-)

diff --git a/apps/openmw/mwgui/loadingscreen.cpp b/apps/openmw/mwgui/loadingscreen.cpp
index 2d65e4e508..7f454925fd 100644
--- a/apps/openmw/mwgui/loadingscreen.cpp
+++ b/apps/openmw/mwgui/loadingscreen.cpp
@@ -66,13 +66,10 @@ namespace MWGui
 
     void LoadingScreen::findSplashScreens()
     {
-        std::string pattern = "Splash/";
-        mResourceSystem->getVFS()->normalizeFilename(pattern);
-
         /* priority given to the left */
         const std::array<std::string, 7> supported_extensions {{".tga", ".dds", ".ktx", ".png", ".bmp", ".jpeg", ".jpg"}};
 
-        for (const auto& name : mResourceSystem->getVFS()->getRecursiveDirectoryIterator(pattern))
+        for (const auto& name : mResourceSystem->getVFS()->getRecursiveDirectoryIterator("Splash/"))
         {
             size_t pos = name.find_last_of('.');
             if (pos != std::string::npos)
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 4eafd05f5f..3df902e469 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -598,8 +598,6 @@ namespace MWRender
         }
         animationPath.replace(animationPath.size()-3, 3, "/");
 
-        mResourceSystem->getVFS()->normalizeFilename(animationPath);
-
         for (const auto& name : mResourceSystem->getVFS()->getRecursiveDirectoryIterator(animationPath))
         {
             size_t pos = name.find_last_of('.');
@@ -1292,8 +1290,6 @@ namespace MWRender
         }
         animationPath.replace(animationPath.size()-4, 4, "/");
 
-        resourceSystem->getVFS()->normalizeFilename(animationPath);
-
         for (const auto& name : resourceSystem->getVFS()->getRecursiveDirectoryIterator(animationPath))
         {
             size_t pos = name.find_last_of('.');
diff --git a/apps/openmw/mwsound/sound_buffer.cpp b/apps/openmw/mwsound/sound_buffer.cpp
index cb71cb56d2..e64e89d775 100644
--- a/apps/openmw/mwsound/sound_buffer.cpp
+++ b/apps/openmw/mwsound/sound_buffer.cpp
@@ -131,7 +131,7 @@ namespace MWSound
         max = std::max(min, max);
 
         Sound_Buffer& sfx = mSoundBuffers.emplace_back("Sound/" + sound.mSound, volume, min, max);
-        mVfs->normalizeFilename(sfx.mResourceName);
+        sfx.mResourceName = mVfs->normalizeFilename(sfx.mResourceName);
 
         mBufferNameMap.emplace(soundId, &sfx);
         return &sfx;
diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index f5c3231c99..d2422870d7 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -295,10 +295,7 @@ namespace MWSound
         {
             std::vector<std::string> filelist;
 
-            std::string pattern = "Music/" + playlist;
-            mVFS->normalizeFilename(pattern);
-
-            for (const auto& name : mVFS->getRecursiveDirectoryIterator(pattern))
+            for (const auto& name : mVFS->getRecursiveDirectoryIterator("Music/" + playlist))
                 filelist.push_back(name);
 
             mMusicFiles[playlist] = filelist;
@@ -345,10 +342,7 @@ namespace MWSound
         if(!mOutput->isInitialized())
             return;
 
-        std::string voicefile = "Sound/"+filename;
-
-        mVFS->normalizeFilename(voicefile);
-        DecoderPtr decoder = loadVoice(voicefile);
+        DecoderPtr decoder = loadVoice(mVFS->normalizeFilename("Sound/" + filename));
         if (!decoder)
             return;
 
@@ -379,10 +373,7 @@ namespace MWSound
         if(!mOutput->isInitialized())
             return;
 
-        std::string voicefile = "Sound/"+filename;
-
-        mVFS->normalizeFilename(voicefile);
-        DecoderPtr decoder = loadVoice(voicefile);
+        DecoderPtr decoder = loadVoice(mVFS->normalizeFilename("Sound/" + filename));
         if (!decoder)
             return;
 
diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index 998e9c0c64..9ba62f7694 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -191,10 +191,7 @@ namespace Gui
 
     void FontLoader::loadBitmapFonts(bool exportToFile)
     {
-        std::string pattern = "Fonts/";
-        mVFS->normalizeFilename(pattern);
-
-        for (const auto& name : mVFS->getRecursiveDirectoryIterator(pattern))
+        for (const auto& name : mVFS->getRecursiveDirectoryIterator("Fonts/"))
         {
             size_t pos = name.find_last_of('.');
             if (pos != std::string::npos && name.compare(pos, name.size() - pos, ".fnt") == 0)
diff --git a/components/resource/bulletshapemanager.cpp b/components/resource/bulletshapemanager.cpp
index b1b0f74176..98878df152 100644
--- a/components/resource/bulletshapemanager.cpp
+++ b/components/resource/bulletshapemanager.cpp
@@ -121,8 +121,7 @@ BulletShapeManager::~BulletShapeManager()
 
 osg::ref_ptr<const BulletShape> BulletShapeManager::getShape(const std::string &name)
 {
-    std::string normalized = name;
-    mVFS->normalizeFilename(normalized);
+    const std::string normalized = mVFS->normalizeFilename(name);
 
     osg::ref_ptr<BulletShape> shape;
     osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(normalized);
@@ -180,8 +179,7 @@ osg::ref_ptr<const BulletShape> BulletShapeManager::getShape(const std::string &
 
 osg::ref_ptr<BulletShapeInstance> BulletShapeManager::cacheInstance(const std::string &name)
 {
-    std::string normalized = name;
-    mVFS->normalizeFilename(normalized);
+    const std::string normalized = mVFS->normalizeFilename(name);
 
     osg::ref_ptr<BulletShapeInstance> instance = createInstance(normalized);
     if (instance)
@@ -191,8 +189,7 @@ osg::ref_ptr<BulletShapeInstance> BulletShapeManager::cacheInstance(const std::s
 
 osg::ref_ptr<BulletShapeInstance> BulletShapeManager::getInstance(const std::string &name)
 {
-    std::string normalized = name;
-    mVFS->normalizeFilename(normalized);
+    const std::string normalized = mVFS->normalizeFilename(name);
 
     osg::ref_ptr<osg::Object> obj = mInstanceCache->takeFromObjectCache(normalized);
     if (obj.get())
diff --git a/components/resource/imagemanager.cpp b/components/resource/imagemanager.cpp
index 37e76359ff..ba46b5cce9 100644
--- a/components/resource/imagemanager.cpp
+++ b/components/resource/imagemanager.cpp
@@ -83,8 +83,7 @@ namespace Resource
 
     osg::ref_ptr<osg::Image> ImageManager::getImage(const std::string &filename)
     {
-        std::string normalized = filename;
-        mVFS->normalizeFilename(normalized);
+        const std::string normalized = mVFS->normalizeFilename(filename);
 
         osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(normalized);
         if (obj)
diff --git a/components/resource/keyframemanager.cpp b/components/resource/keyframemanager.cpp
index 444d2bd7aa..6d431fb3a5 100644
--- a/components/resource/keyframemanager.cpp
+++ b/components/resource/keyframemanager.cpp
@@ -133,8 +133,7 @@ namespace Resource
 
     osg::ref_ptr<const SceneUtil::KeyframeHolder> KeyframeManager::get(const std::string &name)
     {
-        std::string normalized = name;
-        mVFS->normalizeFilename(normalized);
+        const std::string normalized = mVFS->normalizeFilename(name);
 
         osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(normalized);
         if (obj)
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 33a9ab99a1..ec6bea02d7 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -358,10 +358,7 @@ namespace Resource
 
     bool SceneManager::checkLoaded(const std::string &name, double timeStamp)
     {
-        std::string normalized = name;
-        mVFS->normalizeFilename(normalized);
-
-        return mCache->checkInObjectCache(normalized, timeStamp);
+        return mCache->checkInObjectCache(mVFS->normalizeFilename(name), timeStamp);
     }
 
     /// @brief Callback to read image files from the VFS.
@@ -533,8 +530,7 @@ namespace Resource
 
     osg::ref_ptr<const osg::Node> SceneManager::getTemplate(const std::string &name, bool compile)
     {
-        std::string normalized = name;
-        mVFS->normalizeFilename(normalized);
+        std::string normalized = mVFS->normalizeFilename(name);
 
         osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(normalized);
         if (obj)
@@ -603,8 +599,7 @@ namespace Resource
 
     osg::ref_ptr<osg::Node> SceneManager::cacheInstance(const std::string &name)
     {
-        std::string normalized = name;
-        mVFS->normalizeFilename(normalized);
+        const std::string normalized = mVFS->normalizeFilename(name);
 
         osg::ref_ptr<osg::Node> node = createInstance(normalized);
 
@@ -642,8 +637,7 @@ namespace Resource
 
     osg::ref_ptr<osg::Node> SceneManager::getInstance(const std::string &name)
     {
-        std::string normalized = name;
-        mVFS->normalizeFilename(normalized);
+        const std::string normalized = mVFS->normalizeFilename(name);
 
         osg::ref_ptr<osg::Object> obj = mInstanceCache->takeFromObjectCache(normalized);
         if (obj.get())
diff --git a/components/vfs/manager.cpp b/components/vfs/manager.cpp
index f799719e31..1cb8745497 100644
--- a/components/vfs/manager.cpp
+++ b/components/vfs/manager.cpp
@@ -86,9 +86,11 @@ namespace VFS
         return mIndex.find(normalized) != mIndex.end();
     }
 
-    void Manager::normalizeFilename(std::string &name) const
+    std::string Manager::normalizeFilename(const std::string& name) const
     {
-        normalize_path(name, mStrict);
+        std::string result = name;
+        normalize_path(result, mStrict);
+        return result;
     }
 
     std::string Manager::getArchive(const std::string& name) const
@@ -105,6 +107,6 @@ namespace VFS
 
     RecursiveDirectoryIterator Manager::getRecursiveDirectoryIterator(const std::string& path) const
     {
-        return RecursiveDirectoryIterator(mIndex, path);
+        return RecursiveDirectoryIterator(mIndex, normalizeFilename(path));
     }
 }
diff --git a/components/vfs/manager.hpp b/components/vfs/manager.hpp
index 8656f3bf10..b98d8021d4 100644
--- a/components/vfs/manager.hpp
+++ b/components/vfs/manager.hpp
@@ -87,7 +87,7 @@ namespace VFS
 
         /// Normalize the given filename, making slashes/backslashes consistent, and lower-casing if mStrict is false.
         /// @note May be called from any thread once the index has been built.
-        void normalizeFilename(std::string& name) const;
+        [[nodiscard]] std::string normalizeFilename(const std::string& name) const;
 
         /// Retrieve a file by name.
         /// @note Throws an exception if the file can not be found.

From 681728209735520de5daf3657cc5c754783c5028 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Mocquillon?= <cedric.mocquillon@gmail.com>
Date: Sat, 11 Sep 2021 15:49:47 +0200
Subject: [PATCH 1316/2859] Move getFileExtension to common header and use
 instead of repeating same code

---
 apps/openmw/mwgui/loadingscreen.cpp        | 21 +++++++--------------
 apps/openmw/mwrender/animation.cpp         |  7 +++----
 components/fontloader/fontloader.cpp       |  4 ++--
 components/misc/pathhelpers.hpp            | 19 +++++++++++++++++++
 components/resource/bulletshapemanager.cpp |  8 ++------
 components/resource/imagemanager.cpp       |  6 ++----
 components/resource/keyframemanager.cpp    |  4 ++--
 components/resource/scenemanager.cpp       | 13 +++----------
 8 files changed, 40 insertions(+), 42 deletions(-)
 create mode 100644 components/misc/pathhelpers.hpp

diff --git a/apps/openmw/mwgui/loadingscreen.cpp b/apps/openmw/mwgui/loadingscreen.cpp
index 7f454925fd..ef8eea0104 100644
--- a/apps/openmw/mwgui/loadingscreen.cpp
+++ b/apps/openmw/mwgui/loadingscreen.cpp
@@ -13,6 +13,7 @@
 #include <MyGUI_Gui.h>
 #include <MyGUI_TextBox.h>
 
+#include <components/misc/pathhelpers.hpp>
 #include <components/misc/rng.hpp>
 #include <components/debug/debuglog.hpp>
 #include <components/myguiplatform/myguitexture.hpp>
@@ -66,23 +67,15 @@ namespace MWGui
 
     void LoadingScreen::findSplashScreens()
     {
-        /* priority given to the left */
-        const std::array<std::string, 7> supported_extensions {{".tga", ".dds", ".ktx", ".png", ".bmp", ".jpeg", ".jpg"}};
+        auto isSupportedExtension = [](const std::string_view& ext) {
+            static const std::array<std::string, 7> supported_extensions{ {"tga", "dds", "ktx", "png", "bmp", "jpeg", "jpg"} };
+            return !ext.empty() && std::find(supported_extensions.begin(), supported_extensions.end(), ext) != supported_extensions.end();
+        };
 
         for (const auto& name : mResourceSystem->getVFS()->getRecursiveDirectoryIterator("Splash/"))
         {
-            size_t pos = name.find_last_of('.');
-            if (pos != std::string::npos)
-            {
-                for (auto const& extension : supported_extensions)
-                {
-                    if (name.compare(pos, name.size() - pos, extension) == 0)
-                    {
-                        mSplashScreens.push_back(name);
-                        break;  /* based on priority */
-                    }
-                }
-            }
+            if (isSupportedExtension(Misc::getFileExtension(name)))
+                mSplashScreens.push_back(name);
         }
         if (mSplashScreens.empty())
             Log(Debug::Warning) << "Warning: no splash screens found!";
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 3df902e469..1dc42db47c 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -17,6 +17,7 @@
 #include <components/resource/keyframemanager.hpp>
 
 #include <components/misc/constants.hpp>
+#include <components/misc/pathhelpers.hpp>
 #include <components/misc/resourcehelpers.hpp>
 
 #include <components/sceneutil/keyframe.hpp>
@@ -600,8 +601,7 @@ namespace MWRender
 
         for (const auto& name : mResourceSystem->getVFS()->getRecursiveDirectoryIterator(animationPath))
         {
-            size_t pos = name.find_last_of('.');
-            if (pos != std::string::npos && name.compare(pos, name.size() - pos, ".kf") == 0)
+            if (Misc::getFileExtension(name) == "kf")
                 addSingleAnimSource(name, baseModel);
         }
     }
@@ -1292,8 +1292,7 @@ namespace MWRender
 
         for (const auto& name : resourceSystem->getVFS()->getRecursiveDirectoryIterator(animationPath))
         {
-            size_t pos = name.find_last_of('.');
-            if (pos != std::string::npos && name.compare(pos, name.size() - pos, ".nif") == 0)
+            if (Misc::getFileExtension(name) == "nif")
                 loadBonesFromFile(node, name, resourceSystem);
         }
     }
diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index 9ba62f7694..da43cc38ec 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -17,6 +17,7 @@
 
 #include <components/vfs/manager.hpp>
 
+#include <components/misc/pathhelpers.hpp>
 #include <components/misc/stringops.hpp>
 
 #include <components/myguiplatform/myguitexture.hpp>
@@ -193,8 +194,7 @@ namespace Gui
     {
         for (const auto& name : mVFS->getRecursiveDirectoryIterator("Fonts/"))
         {
-            size_t pos = name.find_last_of('.');
-            if (pos != std::string::npos && name.compare(pos, name.size() - pos, ".fnt") == 0)
+            if (Misc::getFileExtension(name) == "fnt")
                 loadBitmapFont(name, exportToFile);
         }
     }
diff --git a/components/misc/pathhelpers.hpp b/components/misc/pathhelpers.hpp
new file mode 100644
index 0000000000..88913a1f7b
--- /dev/null
+++ b/components/misc/pathhelpers.hpp
@@ -0,0 +1,19 @@
+#ifndef OPENMW_COMPONENTS_MISC_PATHHELPERS_H
+#define OPENMW_COMPONENTS_MISC_PATHHELPERS_H
+
+#include <string>
+
+namespace Misc
+{
+    inline std::string_view getFileExtension(std::string_view file)
+    {
+        if (auto extPos = file.find_last_of('.'); extPos != std::string::npos)
+        {
+            file.remove_prefix(extPos + 1);
+            return file;
+        }
+        return {};
+    }
+}
+
+#endif
diff --git a/components/resource/bulletshapemanager.cpp b/components/resource/bulletshapemanager.cpp
index 98878df152..0d0f81962b 100644
--- a/components/resource/bulletshapemanager.cpp
+++ b/components/resource/bulletshapemanager.cpp
@@ -8,6 +8,7 @@
 
 #include <BulletCollision/CollisionShapes/btTriangleMesh.h>
 
+#include <components/misc/pathhelpers.hpp>
 #include <components/sceneutil/visitor.hpp>
 #include <components/vfs/manager.hpp>
 
@@ -129,12 +130,7 @@ osg::ref_ptr<const BulletShape> BulletShapeManager::getShape(const std::string &
         shape = osg::ref_ptr<BulletShape>(static_cast<BulletShape*>(obj.get()));
     else
     {
-        size_t extPos = normalized.find_last_of('.');
-        std::string ext;
-        if (extPos != std::string::npos && extPos+1 < normalized.size())
-            ext = normalized.substr(extPos+1);
-
-        if (ext == "nif")
+        if (Misc::getFileExtension(normalized) == "nif")
         {
             NifBullet::BulletNifLoader loader;
             shape = loader.load(*mNifFileManager->get(normalized));
diff --git a/components/resource/imagemanager.cpp b/components/resource/imagemanager.cpp
index ba46b5cce9..a544b7b621 100644
--- a/components/resource/imagemanager.cpp
+++ b/components/resource/imagemanager.cpp
@@ -4,6 +4,7 @@
 #include <osgDB/Registry>
 
 #include <components/debug/debuglog.hpp>
+#include <components/misc/pathhelpers.hpp>
 #include <components/vfs/manager.hpp>
 
 #include "objectcache.hpp"
@@ -102,10 +103,7 @@ namespace Resource
                 return mWarningImage;
             }
 
-            size_t extPos = normalized.find_last_of('.');
-            std::string ext;
-            if (extPos != std::string::npos && extPos+1 < normalized.size())
-                ext = normalized.substr(extPos+1);
+            const std::string ext(Misc::getFileExtension(normalized));
             osgDB::ReaderWriter* reader = osgDB::Registry::instance()->getReaderWriterForExtension(ext);
             if (!reader)
             {
diff --git a/components/resource/keyframemanager.cpp b/components/resource/keyframemanager.cpp
index 6d431fb3a5..01a8639aa2 100644
--- a/components/resource/keyframemanager.cpp
+++ b/components/resource/keyframemanager.cpp
@@ -9,6 +9,7 @@
 #include <components/nifosg/nifloader.hpp>
 #include <components/sceneutil/keyframe.hpp>
 #include <components/sceneutil/osgacontroller.hpp>
+#include <components/misc/pathhelpers.hpp>
 #include <components/misc/stringops.hpp>
 
 #include "animation.hpp"
@@ -141,8 +142,7 @@ namespace Resource
         else
         {
             osg::ref_ptr<SceneUtil::KeyframeHolder> loaded (new SceneUtil::KeyframeHolder);
-            std::string ext = Resource::getFileExtension(normalized);
-            if (ext == "kf")
+            if (Misc::getFileExtension(normalized) == "kf")
             {
                 NifOsg::Loader::loadKf(Nif::NIFFilePtr(new Nif::NIFFile(mVFS->getNormalized(normalized), normalized)), *loaded.get());
             }
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index ec6bea02d7..76e73da384 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -17,6 +17,7 @@
 #include <components/nifosg/nifloader.hpp>
 #include <components/nif/niffile.hpp>
 
+#include <components/misc/pathhelpers.hpp>
 #include <components/misc/stringops.hpp>
 
 #include <components/vfs/manager.hpp>
@@ -388,12 +389,12 @@ namespace Resource
 
     osg::ref_ptr<osg::Node> load (const std::string& normalizedFilename, const VFS::Manager* vfs, Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager)
     {
-        std::string ext = Resource::getFileExtension(normalizedFilename);
+        auto ext = Misc::getFileExtension(normalizedFilename);
         if (ext == "nif")
             return NifOsg::Loader::load(nifFileManager->get(normalizedFilename), imageManager);
         else
         {
-            osgDB::ReaderWriter* reader = osgDB::Registry::instance()->getReaderWriterForExtension(ext);
+            osgDB::ReaderWriter* reader = osgDB::Registry::instance()->getReaderWriterForExtension(std::string(ext));
             if (!reader)
             {
                 std::stringstream errormsg;
@@ -816,12 +817,4 @@ namespace Resource
         shaderVisitor->setTranslucentFramebuffer(translucentFramebuffer);
         return shaderVisitor;
     }
-
-    std::string getFileExtension(const std::string& file)
-    {
-        size_t extPos = file.find_last_of('.');
-        if (extPos != std::string::npos && extPos+1 < file.size())
-            return file.substr(extPos+1);
-        return std::string();
-    }
 }

From dd6649d519939b157d2f9b2089aa0c1defc2f356 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Tue, 14 Sep 2021 22:59:04 +0200
Subject: [PATCH 1317/2859] Create cmake.yml (#3107)

* Create cmake.yml

* Update cmake.yml

* Update cmake.yml

* Update cmake.yml

* Update cmake.yml
---
 .github/workflows/cmake.yml | 53 +++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 .github/workflows/cmake.yml

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
new file mode 100644
index 0000000000..18221b3cb6
--- /dev/null
+++ b/.github/workflows/cmake.yml
@@ -0,0 +1,53 @@
+name: CMake
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+env:
+  BUILD_TYPE: RelWithDebInfo
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    
+    - name: Add OpenMW PPA Dependancies
+      run: sudo add-apt-repository ppa:openmw/openmw; sudo apt-get update
+    
+    - name: Install Building Dependancies
+      run: sudo CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic
+
+    - name: Configure CMake
+      run: |
+        mkdir build
+        mkdir instdir
+        cmake -S . -B . -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX:PATH=instdir
+
+    - name: Build
+      run: cmake --build . --config ${{env.BUILD_TYPE}} --parallel 3
+
+    - name: Test
+      working-directory: ${{github.workspace}}/build
+      run: ctest -C ${{env.BUILD_TYPE}}
+ 
+    - name: Install OpenMW
+      shell: bash
+      run: cmake --install .
+      
+    - name: Upload OpenMW Artifact
+      shell: bash
+      working-directory: instdir
+      run: |
+        ls -laR
+        7z a ../build_artifact.7z .
+        
+    - name: Upload
+      uses: actions/upload-artifact@v1
+      with:
+        path: ./build_artifact.7z
+        name: build_artifact.7z

From c658acc2b311bb6676597845fe4464d2409314c4 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 15 Sep 2021 16:50:19 +0200
Subject: [PATCH 1318/2859] pipeline only on pull_requests (#3109)

* Create debs

* Update cmake.yml

* give ccache a try

* ccache round 2

* Update cmake.yml
---
 .github/workflows/cmake.yml | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 18221b3cb6..c220030050 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -1,8 +1,6 @@
 name: CMake
 
 on:
-  push:
-    branches: [ master ]
   pull_request:
     branches: [ master ]
 
@@ -22,31 +20,30 @@ jobs:
     - name: Install Building Dependancies
       run: sudo CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic
 
-    - name: Configure CMake
-      run: |
-        mkdir build
-        mkdir instdir
-        cmake -S . -B . -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX:PATH=instdir
+    - name: Prime ccache
+      uses: hendrikmuhs/ccache-action@v1
+      with:
+        key: ${{ matrix.os }}-${{ env.BUILD_TYPE }}
+        max-size: 1000M
 
-    - name: Build
-      run: cmake --build . --config ${{env.BUILD_TYPE}} --parallel 3
+    - name: Configure
+      run: cmake -S . -B . -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=./install -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
 
-    - name: Test
-      working-directory: ${{github.workspace}}/build
-      run: ctest -C ${{env.BUILD_TYPE}}
+    - name: Buil
+      run: cmake --build . --config ${{env.BUILD_TYPE}} --parallel 3
  
-    - name: Install OpenMW
+    - name: Install
       shell: bash
       run: cmake --install .
       
-    - name: Upload OpenMW Artifact
+    - name: Create Artifact
       shell: bash
-      working-directory: instdir
+      working-directory: install
       run: |
         ls -laR
         7z a ../build_artifact.7z .
         
-    - name: Upload
+    - name: Upload Artifact
       uses: actions/upload-artifact@v1
       with:
         path: ./build_artifact.7z

From f62adab43a821a75beb9eed0f68ae7af82af81ce Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Thu, 16 Sep 2021 20:11:19 +0000
Subject: [PATCH 1319/2859] Avoid the terrain sync completely in most cases
 (#3103)

We can take elsid's commit 605cb8d further by avoiding the terrain sync completely in most cases. Currently in changeCellGrid we wait for a new preloading task to ensure the getPagedRefnums for the new active cells have been filled in by object paging. This is usually not necessary because we have already completed a preload in the past containing these active cells. With this PR we remember what we preloaded and skip the terrain sync if it is not needed.
---
 apps/openmw/mwworld/cellpreloader.cpp   | 60 ++++++++++++++++---------
 apps/openmw/mwworld/cellpreloader.hpp   |  4 ++
 apps/openmw/mwworld/scene.cpp           | 10 ++---
 components/resource/resourcemanager.hpp |  1 +
 4 files changed, 48 insertions(+), 27 deletions(-)

diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index c29d975c24..f2f2ebc5a6 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -21,6 +21,29 @@
 #include "cellstore.hpp"
 #include "class.hpp"
 
+namespace
+{
+    template <class Contained>
+    bool contains(const std::vector<MWWorld::CellPreloader::PositionCellGrid>& container,
+           const Contained& contained, float tolerance=1.f)
+    {
+        for (const auto& pos : contained)
+        {
+            bool found = false;
+            for (const auto& pos2 : container)
+            {
+                if ((pos.first-pos2.first).length2() < tolerance*tolerance && pos.second == pos2.second)
+                {
+                    found = true;
+                    break;
+                }
+            }
+            if (!found) return false;
+        }
+        return true;
+    }
+}
+
 namespace MWWorld
 {
 
@@ -224,6 +247,7 @@ namespace MWWorld
         , mPreloadInstances(true)
         , mLastResourceCacheUpdate(0.0)
         , mStoreViewsFailCount(0)
+        , mLoadedTerrainTimestamp(0.0)
     {
     }
 
@@ -369,7 +393,11 @@ namespace MWWorld
                 setTerrainPreloadPositions(std::vector<PositionCellGrid>());
             }
             else
+            {
                 mStoreViewsFailCount = 0;
+                mLoadedTerrainPositions = mTerrainPreloadPositions;
+                mLoadedTerrainTimestamp = timestamp;
+            }
             mTerrainPreloadItem = nullptr;
         }
     }
@@ -436,10 +464,8 @@ namespace MWWorld
 
     void CellPreloader::abortTerrainPreloadExcept(const CellPreloader::PositionCellGrid *exceptPos)
     {
-        const float resetThreshold = ESM::Land::REAL_SIZE;
-        for (const auto& pos : mTerrainPreloadPositions)
-            if (exceptPos && (pos.first-exceptPos->first).length2() < resetThreshold*resetThreshold && pos.second == exceptPos->second)
-                return;
+        if (exceptPos && contains(mTerrainPreloadPositions, std::array {*exceptPos}, ESM::Land::REAL_SIZE))
+            return;
         if (mTerrainPreloadItem && !mTerrainPreloadItem->isDone())
         {
             mTerrainPreloadItem->abort();
@@ -448,28 +474,13 @@ namespace MWWorld
         setTerrainPreloadPositions(std::vector<CellPreloader::PositionCellGrid>());
     }
 
-    bool contains(const std::vector<CellPreloader::PositionCellGrid>& container, const std::vector<CellPreloader::PositionCellGrid>& contained)
-    {
-        for (const auto& pos : contained)
-        {
-            bool found = false;
-            for (const auto& pos2 : container)
-            {
-                if ((pos.first-pos2.first).length2() < 1 && pos.second == pos2.second)
-                {
-                    found = true;
-                    break;
-                }
-            }
-            if (!found) return false;
-        }
-        return true;
-    }
-
     void CellPreloader::setTerrainPreloadPositions(const std::vector<CellPreloader::PositionCellGrid> &positions)
     {
         if (positions.empty())
+        {
             mTerrainPreloadPositions.clear();
+            mLoadedTerrainPositions.clear();
+        }
         else if (contains(mTerrainPreloadPositions, positions))
             return;
         if (mTerrainPreloadItem && !mTerrainPreloadItem->isDone())
@@ -496,5 +507,10 @@ namespace MWWorld
             }
         }
     }
+    
+    bool CellPreloader::isTerrainLoaded(const CellPreloader::PositionCellGrid &position, double referenceTime) const
+    {
+        return mLoadedTerrainTimestamp + mResourceSystem->getSceneManager()->getExpiryDelay() > referenceTime && contains(mLoadedTerrainPositions, std::array {position}, ESM::Land::REAL_SIZE);
+    }
 
 }
diff --git a/apps/openmw/mwworld/cellpreloader.hpp b/apps/openmw/mwworld/cellpreloader.hpp
index e2eea33146..39436dc5ad 100644
--- a/apps/openmw/mwworld/cellpreloader.hpp
+++ b/apps/openmw/mwworld/cellpreloader.hpp
@@ -79,6 +79,7 @@ namespace MWWorld
 
         bool syncTerrainLoad(const std::vector<CellPreloader::PositionCellGrid> &positions, double timestamp, Loading::Listener& listener);
         void abortTerrainPreloadExcept(const PositionCellGrid *exceptPos);
+        bool isTerrainLoaded(const CellPreloader::PositionCellGrid &position, double referenceTime) const;
 
     private:
         Resource::ResourceSystem* mResourceSystem;
@@ -119,6 +120,9 @@ namespace MWWorld
         std::vector<PositionCellGrid> mTerrainPreloadPositions;
         osg::ref_ptr<TerrainPreloadItem> mTerrainPreloadItem;
         osg::ref_ptr<SceneUtil::WorkItem> mUpdateCacheItem;
+
+        std::vector<PositionCellGrid> mLoadedTerrainPositions;
+        double mLoadedTerrainTimestamp;
     };
 
 }
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 399d0e6d7f..89349d329a 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -628,7 +628,10 @@ namespace MWWorld
         osg::Vec4i newGrid = gridCenterToBounds(mCurrentGridCenter);
         mRendering.setActiveGrid(newGrid);
 
-        preloadTerrain(pos, true);
+        if (mRendering.pagingUnlockCache())
+            mPreloader->abortTerrainPreloadExcept(nullptr);
+        if (!mPreloader->isTerrainLoaded(std::make_pair(pos, newGrid), mRendering.getReferenceTime()))
+            preloadTerrain(pos, true);
         mPagedRefs.clear();
         mRendering.getPagedRefnums(newGrid, mPagedRefs);
 
@@ -1241,10 +1244,7 @@ namespace MWWorld
     {
         std::vector<PositionCellGrid> vec;
         vec.emplace_back(pos, gridCenterToBounds(getNewGridCenter(pos)));
-        if (sync && mRendering.pagingUnlockCache())
-            mPreloader->abortTerrainPreloadExcept(nullptr);
-        else
-            mPreloader->abortTerrainPreloadExcept(&vec[0]);
+        mPreloader->abortTerrainPreloadExcept(&vec[0]);
         mPreloader->setTerrainPreloadPositions(vec);
         if (!sync) return;
 
diff --git a/components/resource/resourcemanager.hpp b/components/resource/resourcemanager.hpp
index ccb065e3bf..b2b71f4635 100644
--- a/components/resource/resourcemanager.hpp
+++ b/components/resource/resourcemanager.hpp
@@ -59,6 +59,7 @@ namespace Resource
 
         /// How long to keep objects in cache after no longer being referenced.
         void setExpiryDelay (double expiryDelay) override { mExpiryDelay = expiryDelay; }
+        float getExpiryDelay() const { return mExpiryDelay; }
 
         const VFS::Manager* getVFS() const { return mVFS; }
 

From 4ff5a04e9b3470847dd77efe3261e43c047c2b4f Mon Sep 17 00:00:00 2001
From: Pi03k <pi03k87@gmail.com>
Date: Thu, 16 Sep 2021 20:45:23 +0200
Subject: [PATCH 1320/2859] Remove redundant qt-related cmake macros

---
 apps/opencs/CMakeLists.txt | 28 ++++++++++++++--------------
 cmake/OpenMWMacros.cmake   | 25 ++-----------------------
 2 files changed, 16 insertions(+), 37 deletions(-)

diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 60bd0f4ded..0ffa3da559 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -8,11 +8,11 @@ opencs_units (model/doc
     document operation saving documentmanager loader runner operationholder
     )
 
-opencs_units_noqt (model/doc
+opencs_units (model/doc
     stage savingstate savingstages blacklist messages
     )
 
-opencs_hdrs_noqt (model/doc
+opencs_hdrs (model/doc
     state
     )
 
@@ -23,14 +23,14 @@ opencs_units (model/world
     )
 
 
-opencs_units_noqt (model/world
+opencs_units (model/world
     universalid record commands columnbase columnimp scriptcontext cell refidcollection
     refidadapter refiddata refidadapterimp ref collectionbase refcollection columns infocollection tablemimedata cellcoordinates cellselection resources resourcesmanager scope
     pathgrid landtexture land nestedtablewrapper nestedcollection nestedcoladapterimp nestedinfocollection
     idcompletionmanager metadata defaultgmsts infoselectwrapper commandmacro
     )
 
-opencs_hdrs_noqt (model/world
+opencs_hdrs (model/world
     columnimp idcollection collection info subcellcollection
     )
 
@@ -39,14 +39,14 @@ opencs_units (model/tools
     tools reportmodel mergeoperation
     )
 
-opencs_units_noqt (model/tools
+opencs_units (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 enchantmentcheck
     )
 
-opencs_hdrs_noqt (model/tools
+opencs_hdrs (model/tools
     mergestate
     )
 
@@ -57,11 +57,11 @@ opencs_units (view/doc
     )
 
 
-opencs_units_noqt (view/doc
+opencs_units (view/doc
     subviewfactory
     )
 
-opencs_hdrs_noqt (view/doc
+opencs_hdrs (view/doc
     subviewfactoryimp
     )
 
@@ -74,7 +74,7 @@ opencs_units (view/world
     bodypartcreator landtexturecreator landcreator
     )
 
-opencs_units_noqt (view/world
+opencs_units (view/world
     subviews enumdelegate vartypedelegate recordstatusdelegate idtypedelegate datadisplaydelegate
     scripthighlighter idvalidator dialoguecreator idcompletiondelegate
     colordelegate dragdroputils
@@ -92,12 +92,12 @@ opencs_units (view/render
     cellwater terraintexturemode actor terrainselection terrainshapemode brushdraw commands
     )
 
-opencs_units_noqt (view/render
+opencs_units (view/render
     lighting lightingday lightingnight lightingbright object cell terrainstorage tagbase
     cellarrow cellmarker cellborder pathgrid
     )
 
-opencs_hdrs_noqt (view/render
+opencs_hdrs (view/render
     mask
     )
 
@@ -106,7 +106,7 @@ opencs_units (view/tools
     reportsubview reporttable searchsubview searchbox merge
     )
 
-opencs_units_noqt (view/tools
+opencs_units (view/tools
     subviews
     )
 
@@ -119,11 +119,11 @@ opencs_units (model/prefs
     shortcuteventhandler shortcutmanager shortcutsetting modifiersetting stringsetting
     )
 
-opencs_units_noqt (model/prefs
+opencs_units (model/prefs
     category
     )
 
-opencs_units_noqt (model/filter
+opencs_units (model/filter
     node unarynode narynode leafnode booleannode parser andnode ornode notnode textnode valuenode
     )
 
diff --git a/cmake/OpenMWMacros.cmake b/cmake/OpenMWMacros.cmake
index 5bee345344..0adc185b38 100644
--- a/cmake/OpenMWMacros.cmake
+++ b/cmake/OpenMWMacros.cmake
@@ -93,42 +93,21 @@ add_file (${project} _HDR ${comp} "${dir}/${unit}.hpp")
 add_file (${project} _SRC ${comp} "${dir}/${unit}.cpp")
 endmacro (add_unit)
 
-macro (add_qt_unit project dir unit)
-add_file (${project} _HDR ${comp} "${dir}/${unit}.hpp")
-add_file (${project} _SRC ${comp} "${dir}/${unit}.cpp")
-endmacro (add_qt_unit)
-
 macro (add_hdr project dir unit)
 add_file (${project} _HDR ${comp} "${dir}/${unit}.hpp")
 endmacro (add_hdr)
 
-macro (add_qt_hdr project dir unit)
-add_file (${project} _HDR ${comp} "${dir}/${unit}.hpp")
-endmacro (add_qt_hdr)
-
 macro (opencs_units dir)
 foreach (u ${ARGN})
-add_qt_unit (OPENCS ${dir} ${u})
-endforeach (u)
-endmacro (opencs_units)
-
-macro (opencs_units_noqt dir)
-foreach (u ${ARGN})
 add_unit (OPENCS ${dir} ${u})
 endforeach (u)
-endmacro (opencs_units_noqt)
+endmacro (opencs_units)
 
 macro (opencs_hdrs dir)
 foreach (u ${ARGN})
-add_qt_hdr (OPENCS ${dir} ${u})
-endforeach (u)
-endmacro (opencs_hdrs)
-
-macro (opencs_hdrs_noqt dir)
-foreach (u ${ARGN})
 add_hdr (OPENCS ${dir} ${u})
 endforeach (u)
-endmacro (opencs_hdrs_noqt)
+endmacro (opencs_hdrs)
 
 include(CMakeParseArguments)
 

From e4648cec48ba9b28e8907b23ffa68d63c9f1e6e8 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Fri, 17 Sep 2021 17:24:11 +0000
Subject: [PATCH 1321/2859] kill buil (#3118)

He was a great fellow. We will forever be in debt for his services. Time to say good-bye.
---
 .github/workflows/cmake.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index c220030050..f9375a3ba5 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -29,7 +29,7 @@ jobs:
     - name: Configure
       run: cmake -S . -B . -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=./install -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
 
-    - name: Buil
+    - name: Build
       run: cmake --build . --config ${{env.BUILD_TYPE}} --parallel 3
  
     - name: Install

From b9825afb8a8c97085560f58febd2a9175a14971b Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 2 Sep 2021 01:06:27 +0200
Subject: [PATCH 1322/2859] Fix build with system static OpenSceneGraph

* Add dependency to libraries required by OSG but missing when linking with OSG
  system library.
* Use find_package for already defined dependencies.
---
 CMakeLists.txt            |  5 +++++
 components/CMakeLists.txt | 14 +++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d14762ef5f..1b8350a04b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,6 +13,11 @@ if(POLICY CMP0083)
   cmake_policy(SET CMP0083 NEW)
 endif()
 
+# to link with freetype library
+if(POLICY CMP0079)
+  cmake_policy(SET CMP0079 NEW)
+endif()
+
 option(OPENMW_GL4ES_MANUAL_INIT "Manually initialize gl4es. This is more reliable on platforms without a windowing system. Requires gl4es to be configured with -DNOEGL=ON -DNO_LOADER=ON -DNO_INIT_CONSTRUCTOR=ON." OFF)
 if(OPENMW_GL4ES_MANUAL_INIT)
     add_definitions(-DOPENMW_GL4ES_MANUAL_INIT)
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 5b79a096cd..7ee3d184d8 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -288,6 +288,15 @@ if (GIT_CHECKOUT)
     add_dependencies (components git-version)
 endif (GIT_CHECKOUT)
 
+if (OSG_STATIC AND CMAKE_SYSTEM_NAME MATCHES "Linux")
+    find_package(X11 REQUIRED COMPONENTS Xinerama Xrandr)
+    target_link_libraries(components ${CMAKE_DL_LIBS} X11::X11 X11::Xinerama X11::Xrandr)
+    find_package(Fontconfig MODULE)
+    if(Fontconfig_FOUND)
+        target_link_libraries(components Fontconfig::Fontconfig)
+    endif()
+endif()
+
 if (WIN32)
     target_link_libraries(components shlwapi)
 endif()
@@ -329,7 +338,10 @@ if(OSG_STATIC)
     if(OPENMW_USE_SYSTEM_OSG)
         # OSG plugin pkgconfig files are missing these dependencies.
         # https://github.com/openscenegraph/OpenSceneGraph/issues/1052
-        target_link_libraries(components freetype jpeg png)
+        find_package(Freetype REQUIRED)
+        find_package(JPEG REQUIRED)
+        find_package(PNG REQUIRED)
+        target_link_libraries(components Freetype::Freetype JPEG::JPEG PNG::PNG)
     endif()
 endif(OSG_STATIC)
 

From 70e210735af9b355f64b3b8cb749b579b1cfc0e5 Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Sat, 18 Sep 2021 15:57:00 +0300
Subject: [PATCH 1323/2859] Optimize terrain editing brush drawing performance

---
 apps/opencs/view/render/brushdraw.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/view/render/brushdraw.cpp b/apps/opencs/view/render/brushdraw.cpp
index 255a13a12e..6b33e336ea 100644
--- a/apps/opencs/view/render/brushdraw.cpp
+++ b/apps/opencs/view/render/brushdraw.cpp
@@ -18,6 +18,8 @@ CSVRender::BrushDraw::BrushDraw(osg::ref_ptr<osg::Group> parentNode, bool textur
     mBrushDrawNode = new osg::Group();
     mGeometry = new osg::Geometry();
     mBrushDrawNode->addChild(mGeometry);
+    mBrushDrawNode->getOrCreateStateSet()->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
+    mBrushDrawNode->getOrCreateStateSet()->setRenderBinDetails(11, "RenderBin");
     mParentNode->addChild(mBrushDrawNode);
     if (mTextureMode)
         mLandSizeFactor = static_cast<float>(ESM::Land::REAL_SIZE) / static_cast<float>(ESM::Land::LAND_TEXTURE_SIZE);
@@ -122,7 +124,14 @@ void CSVRender::BrushDraw::buildSquareGeometry(const float& radius, const osg::V
     const float brushOutlineHeight (1.0f);
     float diameter = radius * 2;
     int resolution = static_cast<int>(2.f * diameter / mLandSizeFactor); //half a vertex resolution
-    float resAdjustedLandSizeFactor = mLandSizeFactor / 2;
+    float resAdjustedLandSizeFactor = mLandSizeFactor / 2; //128
+
+    if (resolution > 128) // limit accuracy for performance
+    {
+        resolution = 128;
+        resAdjustedLandSizeFactor = diameter / resolution;
+    }
+
     osg::Vec4f lineColor(1.0f, 1.0f, 1.0f, 0.6f);
 
     for (int i = 0; i < resolution; i++)
@@ -215,7 +224,8 @@ void CSVRender::BrushDraw::buildCircleGeometry(const float& radius, const osg::V
     osg::ref_ptr<osg::Geometry> geom (new osg::Geometry());
     osg::ref_ptr<osg::Vec3Array> vertices (new osg::Vec3Array());
     osg::ref_ptr<osg::Vec4Array> colors (new osg::Vec4Array());
-    const int amountOfPoints = (osg::PI * 2.0f) * radius / 20;
+
+    const int amountOfPoints = 128;
     const float step ((osg::PI * 2.0f) / static_cast<float>(amountOfPoints));
     const float brushOutlineHeight (1.0f);
     osg::Vec4f lineColor(1.0f, 1.0f, 1.0f, 0.6f);

From 179f91276af6b766c168900ae5ccc718b6b25e64 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Sat, 18 Sep 2021 16:21:11 +0000
Subject: [PATCH 1324/2859] lightmanager.cpp (#3121)

---
 components/sceneutil/lightmanager.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 63a475566b..50d57fd471 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -1204,7 +1204,6 @@ namespace SceneUtil
 
     const std::vector<LightManager::LightSourceViewBound>& LightManager::getLightsInViewSpace(osg::Camera *camera, const osg::RefMatrix* viewMatrix, size_t frameNum)
     {
-        bool isReflection = isReflectionCamera(camera);
         osg::observer_ptr<osg::Camera> camPtr (camera);
         auto it = mLightsInViewSpace.find(camPtr);
 
@@ -1212,6 +1211,8 @@ namespace SceneUtil
         {
             it = mLightsInViewSpace.insert(std::make_pair(camPtr, LightSourceViewBoundCollection())).first;
 
+            bool isReflection = isReflectionCamera(camera);
+        
             for (const auto& transform : mLights)
             {
                 osg::Matrixf worldViewMat = transform.mWorldMatrix * (*viewMatrix);

From 76be2e91e5f69b61077c8287331319097529492c Mon Sep 17 00:00:00 2001
From: "florent.teppe" <florent.teppe@nadeo.com>
Date: Sat, 18 Sep 2021 18:25:04 +0200
Subject: [PATCH 1325/2859] Fixed an issue where keyword search expected the
 text to be all ASCII characters

---
 apps/openmw/mwdialogue/keywordsearch.hpp | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwdialogue/keywordsearch.hpp b/apps/openmw/mwdialogue/keywordsearch.hpp
index f296f223fb..3cd8517651 100644
--- a/apps/openmw/mwdialogue/keywordsearch.hpp
+++ b/apps/openmw/mwdialogue/keywordsearch.hpp
@@ -68,6 +68,19 @@ public:
         return false;
     }
 
+    static bool isWhitespaceUTF8(const int utf8Char)
+    {
+        if (utf8Char >= 0 && utf8Char <= UCHAR_MAX)
+        {
+            //That function has undefined behavior if the character doesn't fit in unsigned char
+            return std::isspace(utf8Char);
+        }
+        else
+        {
+            return false;
+        }
+    }
+
     static bool sortMatches(const Match& left, const Match& right)
     {
         return left.mBeg < right.mBeg;
@@ -83,7 +96,7 @@ public:
             {
                 Point prev = i;
                 --prev;
-                if(isalpha(*prev))
+                if(!isWhitespaceUTF8(*prev))
                     continue;
             }
 

From 8d86d90782b495fa6366641b5ad139f278bb780a Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Sat, 18 Sep 2021 22:00:26 +0200
Subject: [PATCH 1326/2859] remove whitespace

---
 components/sceneutil/lightmanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 50d57fd471..1f7d9d2db2 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -1212,7 +1212,7 @@ namespace SceneUtil
             it = mLightsInViewSpace.insert(std::make_pair(camPtr, LightSourceViewBoundCollection())).first;
 
             bool isReflection = isReflectionCamera(camera);
-        
+
             for (const auto& transform : mLights)
             {
                 osg::Matrixf worldViewMat = transform.mWorldMatrix * (*viewMatrix);

From f1e3c55ea3fbab43ae6268b1e2332048fd34b61f Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 19 Sep 2021 10:27:48 +0200
Subject: [PATCH 1327/2859] Fix deadlock in Lua worker thread (#6286)

---
 apps/openmw/engine.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 772af3759e..bbe4f25f69 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -875,7 +875,14 @@ public:
     void join()
     {
         if (mThread)
+        {
+            {
+                std::lock_guard<std::mutex> lk(mMutex);
+                mJoinRequest = true;
+            }
+            mCV.notify_one();
             mThread->join();
+        }
     }
 
 private:
@@ -891,10 +898,12 @@ private:
 
     void threadBody()
     {
-        while (!mEngine->mViewer->done() && !mEngine->mEnvironment.getStateManager()->hasQuitRequest())
+        while (true)
         {
             std::unique_lock<std::mutex> lk(mMutex);
-            mCV.wait(lk, [&]{ return mUpdateRequest; });
+            mCV.wait(lk, [&]{ return mUpdateRequest || mJoinRequest; });
+            if (mJoinRequest)
+                break;
 
             update();
 
@@ -908,6 +917,7 @@ private:
     std::mutex mMutex;
     std::condition_variable mCV;
     bool mUpdateRequest = false;
+    bool mJoinRequest = false;
     double mDt = 0;
     bool mIsGuiMode = false;
     std::optional<std::thread> mThread;

From 095f4b2ed58584e77bdbdcb9202e3359bb02b9ba Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Sun, 19 Sep 2021 11:13:28 +0000
Subject: [PATCH 1328/2859] material.cpp (#3117)

---
 components/terrain/material.cpp | 59 +++++++++++++++++++++------------
 1 file changed, 37 insertions(+), 22 deletions(-)

diff --git a/components/terrain/material.cpp b/components/terrain/material.cpp
index 2fbd0a7fc0..28297fb456 100644
--- a/components/terrain/material.cpp
+++ b/components/terrain/material.cpp
@@ -166,6 +166,29 @@ namespace
             mValue->setSource0_RGB(osg::TexEnvCombine::PREVIOUS);
         }
     };
+
+    class UniformCollection
+    {
+    public:
+        static const UniformCollection& value()
+        {
+            static UniformCollection instance;
+            return instance;
+        }
+
+        osg::ref_ptr<osg::Uniform> mDiffuseMap;
+        osg::ref_ptr<osg::Uniform> mBlendMap;
+        osg::ref_ptr<osg::Uniform> mNormalMap;
+        osg::ref_ptr<osg::Uniform> mColorMode;
+
+        UniformCollection()
+            : mDiffuseMap(new osg::Uniform("diffuseMap", 0))
+            , mBlendMap(new osg::Uniform("blendMap", 1))
+            , mNormalMap(new osg::Uniform("normalMap", 2))
+            , mColorMode(new osg::Uniform("colorMode", 2))
+        {
+        }
+    };
 }
 
 namespace Terrain
@@ -199,32 +222,28 @@ namespace Terrain
                 }
             }
 
-            int texunit = 0;
-
             if (useShaders)
             {
-                stateset->setTextureAttributeAndModes(texunit, it->mDiffuseMap);
+                stateset->setTextureAttributeAndModes(0, it->mDiffuseMap);
 
                 if (layerTileSize != 1.f)
-                    stateset->setTextureAttributeAndModes(texunit, LayerTexMat::value(layerTileSize), osg::StateAttribute::ON);
+                    stateset->setTextureAttributeAndModes(0, LayerTexMat::value(layerTileSize), osg::StateAttribute::ON);
 
-                stateset->addUniform(new osg::Uniform("diffuseMap", texunit));
+                stateset->addUniform(UniformCollection::value().mDiffuseMap);
 
                 if (!blendmaps.empty())
                 {
-                    ++texunit;
                     osg::ref_ptr<osg::Texture2D> blendmap = blendmaps.at(blendmapIndex++);
 
-                    stateset->setTextureAttributeAndModes(texunit, blendmap.get());
-                    stateset->setTextureAttributeAndModes(texunit, BlendmapTexMat::value(blendmapScale));
-                    stateset->addUniform(new osg::Uniform("blendMap", texunit));
+                    stateset->setTextureAttributeAndModes(1, blendmap.get());
+                    stateset->setTextureAttributeAndModes(1, BlendmapTexMat::value(blendmapScale));
+                    stateset->addUniform(UniformCollection::value().mBlendMap);
                 }
 
                 if (it->mNormalMap)
                 {
-                    ++texunit;
-                    stateset->setTextureAttributeAndModes(texunit, it->mNormalMap);
-                    stateset->addUniform(new osg::Uniform("normalMap", texunit));
+                    stateset->setTextureAttributeAndModes(2, it->mNormalMap);
+                    stateset->addUniform(UniformCollection::value().mNormalMap);
                 }
 
                 Shader::ShaderManager::DefineMap defineMap;
@@ -242,31 +261,27 @@ namespace Terrain
                 }
 
                 stateset->setAttributeAndModes(shaderManager->getProgram(vertexShader, fragmentShader));
-                stateset->addUniform(new osg::Uniform("colorMode", 2));
+                stateset->addUniform(UniformCollection::value().mColorMode);
             }
             else
             {
                 // Add the actual layer texture
                 osg::ref_ptr<osg::Texture2D> tex = it->mDiffuseMap;
-                stateset->setTextureAttributeAndModes(texunit, tex.get());
+                stateset->setTextureAttributeAndModes(0, tex.get());
 
                 if (layerTileSize != 1.f)
-                    stateset->setTextureAttributeAndModes(texunit, LayerTexMat::value(layerTileSize), osg::StateAttribute::ON);
-
-                ++texunit;
+                    stateset->setTextureAttributeAndModes(0, LayerTexMat::value(layerTileSize), osg::StateAttribute::ON);
 
                 // Multiply by the alpha map
                 if (!blendmaps.empty())
                 {
                     osg::ref_ptr<osg::Texture2D> blendmap = blendmaps.at(blendmapIndex++);
 
-                    stateset->setTextureAttributeAndModes(texunit, blendmap.get());
+                    stateset->setTextureAttributeAndModes(1, blendmap.get());
 
                     // This is to map corner vertices directly to the center of a blendmap texel.
-                    stateset->setTextureAttributeAndModes(texunit, BlendmapTexMat::value(blendmapScale));
-                    stateset->setTextureAttributeAndModes(texunit, TexEnvCombine::value(), osg::StateAttribute::ON);
-
-                    ++texunit;
+                    stateset->setTextureAttributeAndModes(1, BlendmapTexMat::value(blendmapScale));
+                    stateset->setTextureAttributeAndModes(1, TexEnvCombine::value(), osg::StateAttribute::ON);
                 }
 
             }

From 2f25257a3e1ed8a91328bd1e33cdb30710865628 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 19 Sep 2021 14:38:27 +0200
Subject: [PATCH 1329/2859] Move LuaState::makeReadOnly(sol::table) out of the
 class because it doesn't need to access LuaState internals.

---
 apps/openmw/mwlua/camerabindings.cpp    |  2 +-
 apps/openmw/mwlua/inputbindings.cpp     | 10 +++++-----
 apps/openmw/mwlua/luabindings.cpp       | 18 ++++++++---------
 apps/openmw/mwlua/settingsbindings.cpp  |  2 +-
 apps/openmw/mwlua/uibindings.cpp        |  2 +-
 apps/openmw_test_suite/lua/test_lua.cpp |  6 +++---
 components/lua/luastate.cpp             | 26 ++++++++++++++-----------
 components/lua/luastate.hpp             | 11 +++++------
 components/lua/scriptscontainer.cpp     |  6 +++---
 components/lua/scriptscontainer.hpp     |  2 +-
 10 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/apps/openmw/mwlua/camerabindings.cpp b/apps/openmw/mwlua/camerabindings.cpp
index 68f2331b9e..46bf079d65 100644
--- a/apps/openmw/mwlua/camerabindings.cpp
+++ b/apps/openmw/mwlua/camerabindings.cpp
@@ -7,7 +7,7 @@ namespace MWLua
     {
         sol::table api(context.mLua->sol(), sol::create);
         // TODO
-        return context.mLua->makeReadOnly(api);
+        return LuaUtil::makeReadOnly(api);
     }
 
 }
diff --git a/apps/openmw/mwlua/inputbindings.cpp b/apps/openmw/mwlua/inputbindings.cpp
index f815d9c344..aaa00f3da9 100644
--- a/apps/openmw/mwlua/inputbindings.cpp
+++ b/apps/openmw/mwlua/inputbindings.cpp
@@ -48,7 +48,7 @@ namespace MWLua
         api["getControlSwitch"] = [input](const std::string& key) { return input->getControlSwitch(key); };
         api["setControlSwitch"] = [input](const std::string& key, bool v) { input->toggleControlSwitch(key, v); };
 
-        api["ACTION"] = context.mLua->makeReadOnly(context.mLua->sol().create_table_with(
+        api["ACTION"] = LuaUtil::makeReadOnly(context.mLua->sol().create_table_with(
             "GameMenu", MWInput::A_GameMenu,
             "Screenshot", MWInput::A_Screenshot,
             "Inventory", MWInput::A_Inventory,
@@ -102,7 +102,7 @@ namespace MWLua
             "ZoomOut", MWInput::A_ZoomOut
         ));
 
-        api["CONTROL_SWITCH"] = context.mLua->makeReadOnly(context.mLua->sol().create_table_with(
+        api["CONTROL_SWITCH"] = LuaUtil::makeReadOnly(context.mLua->sol().create_table_with(
             "Controls", "playercontrols",
             "Fighting", "playerfighting",
             "Jumping", "playerjumping",
@@ -112,7 +112,7 @@ namespace MWLua
             "VanityMode", "vanitymode"
         ));
 
-        api["CONTROLLER_BUTTON"] = context.mLua->makeReadOnly(context.mLua->sol().create_table_with(
+        api["CONTROLLER_BUTTON"] = LuaUtil::makeReadOnly(context.mLua->sol().create_table_with(
             "A", SDL_CONTROLLER_BUTTON_A,
             "B", SDL_CONTROLLER_BUTTON_B,
             "X", SDL_CONTROLLER_BUTTON_X,
@@ -130,7 +130,7 @@ namespace MWLua
             "DPadRight", SDL_CONTROLLER_BUTTON_DPAD_RIGHT
         ));
 
-        api["CONTROLLER_AXIS"] = context.mLua->makeReadOnly(context.mLua->sol().create_table_with(
+        api["CONTROLLER_AXIS"] = LuaUtil::makeReadOnly(context.mLua->sol().create_table_with(
             "LeftX", SDL_CONTROLLER_AXIS_LEFTX,
             "LeftY", SDL_CONTROLLER_AXIS_LEFTY,
             "RightX", SDL_CONTROLLER_AXIS_RIGHTX,
@@ -144,7 +144,7 @@ namespace MWLua
             "MoveLeftRight", SDL_CONTROLLER_AXIS_MAX + MWInput::A_MoveLeftRight
         ));
 
-        return context.mLua->makeReadOnly(api);
+        return LuaUtil::makeReadOnly(api);
     }
 
 }
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index ed788eb525..e37241d692 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -18,7 +18,7 @@ namespace MWLua
         sol::table res(lua.sol(), sol::create);
         for (const std::string& v : values)
             res[v] = v;
-        return lua.makeReadOnly(res);
+        return LuaUtil::makeReadOnly(res);
     }
 
     sol::table initCorePackage(const Context& context)
@@ -43,7 +43,7 @@ namespace MWLua
             "Activator", "Armor", "Book", "Clothing", "Creature", "Door", "Ingredient",
             "Light", "Miscellaneous", "NPC", "Player", "Potion", "Static", "Weapon"
         });
-        api["EQUIPMENT_SLOT"] = lua->makeReadOnly(lua->sol().create_table_with(
+        api["EQUIPMENT_SLOT"] = LuaUtil::makeReadOnly(lua->sol().create_table_with(
             "Helmet", MWWorld::InventoryStore::Slot_Helmet,
             "Cuirass", MWWorld::InventoryStore::Slot_Cuirass,
             "Greaves", MWWorld::InventoryStore::Slot_Greaves,
@@ -64,7 +64,7 @@ namespace MWLua
             "CarriedLeft", MWWorld::InventoryStore::Slot_CarriedLeft,
             "Ammunition", MWWorld::InventoryStore::Slot_Ammunition
         ));
-        return lua->makeReadOnly(api);
+        return LuaUtil::makeReadOnly(api);
     }
 
     sol::table initWorldPackage(const Context& context)
@@ -107,7 +107,7 @@ namespace MWLua
             // return GObjectList{worldView->selectObjects(query, false)};
         };
         // TODO: add world.placeNewObject(recordId, cell, pos, [rot])
-        return context.mLua->makeReadOnly(api);
+        return LuaUtil::makeReadOnly(api);
     }
 
     sol::table initNearbyPackage(const Context& context)
@@ -137,7 +137,7 @@ namespace MWLua
             // TODO: Maybe use sqlite
             // return LObjectList{worldView->selectObjects(query, true)};
         };
-        return context.mLua->makeReadOnly(api);
+        return LuaUtil::makeReadOnly(api);
     }
 
     sol::table initQueryPackage(const Context& context)
@@ -148,7 +148,7 @@ namespace MWLua
             query[t] = Queries::Query(std::string(t));
         for (const QueryFieldGroup& group : getBasicQueryFieldGroups())
             query[group.mName] = initFieldGroup(context, group);
-        return query;  // makeReadonly is applied by LuaState::addCommonPackage
+        return query;  // makeReadOnly is applied by LuaState::addCommonPackage
     }
 
     sol::table initFieldGroup(const Context& context, const QueryFieldGroup& group)
@@ -163,12 +163,12 @@ namespace MWLua
             {
                 const std::string& name = field->path()[i];
                 if (subgroup[name] == sol::nil)
-                    subgroup[name] = context.mLua->makeReadOnly(context.mLua->newTable());
-                subgroup = context.mLua->getMutableFromReadOnly(subgroup[name]);
+                    subgroup[name] = LuaUtil::makeReadOnly(context.mLua->newTable());
+                subgroup = LuaUtil::getMutableFromReadOnly(subgroup[name]);
             }
             subgroup[field->path().back()] = field;
         }
-        return context.mLua->makeReadOnly(res);
+        return LuaUtil::makeReadOnly(res);
     }
 
 }
diff --git a/apps/openmw/mwlua/settingsbindings.cpp b/apps/openmw/mwlua/settingsbindings.cpp
index 0e267182ac..12dd69f73a 100644
--- a/apps/openmw/mwlua/settingsbindings.cpp
+++ b/apps/openmw/mwlua/settingsbindings.cpp
@@ -62,7 +62,7 @@ namespace MWLua
             else
                 return sol::make_object<float>(lua->sol(), value.getFloat());
         };
-        return lua->makeReadOnly(config);
+        return LuaUtil::makeReadOnly(config);
     }
 
     sol::table initGlobalSettingsPackage(const Context& context) { return initSettingsPackage(context, true, false); }
diff --git a/apps/openmw/mwlua/uibindings.cpp b/apps/openmw/mwlua/uibindings.cpp
index cb14c41621..4fae84cd40 100644
--- a/apps/openmw/mwlua/uibindings.cpp
+++ b/apps/openmw/mwlua/uibindings.cpp
@@ -12,7 +12,7 @@ namespace MWLua
         {
             luaManager->addUIMessage(message);
         };
-        return context.mLua->makeReadOnly(api);
+        return LuaUtil::makeReadOnly(api);
     }
     
 }
diff --git a/apps/openmw_test_suite/lua/test_lua.cpp b/apps/openmw_test_suite/lua/test_lua.cpp
index 9405dba4b2..32d4ea49b8 100644
--- a/apps/openmw_test_suite/lua/test_lua.cpp
+++ b/apps/openmw_test_suite/lua/test_lua.cpp
@@ -119,7 +119,7 @@ return {
         EXPECT_ERROR(LuaUtil::call(script["rawsetSystemLib"]), "bad argument #1 to 'rawset' (table expected, got userdata)");
         EXPECT_ERROR(LuaUtil::call(script["modifySystemLib"]), "a userdata value");
 
-        EXPECT_EQ(mLua.getMutableFromReadOnly(mLua.makeReadOnly(script)), script);
+        EXPECT_EQ(LuaUtil::getMutableFromReadOnly(LuaUtil::makeReadOnly(script)), script);
     }
 
     TEST_F(LuaStateTest, Print)
@@ -150,8 +150,8 @@ return {
     {
         LuaUtil::LuaState lua(mVFS.get());
 
-        sol::table api1 = lua.makeReadOnly(lua.sol().create_table_with("name", "api1"));
-        sol::table api2 = lua.makeReadOnly(lua.sol().create_table_with("name", "api2"));
+        sol::table api1 = LuaUtil::makeReadOnly(lua.sol().create_table_with("name", "api1"));
+        sol::table api2 = LuaUtil::makeReadOnly(lua.sol().create_table_with("name", "api2"));
 
         sol::table script1 = lua.runInNewSandbox("bbb/tests.lua", "", {{"test.api", api1}});
 
diff --git a/components/lua/luastate.cpp b/components/lua/luastate.cpp
index fd42aa7fb2..8e4719dba4 100644
--- a/components/lua/luastate.cpp
+++ b/components/lua/luastate.cpp
@@ -67,27 +67,31 @@ namespace LuaUtil
         mSandboxEnv = sol::nil;
     }
 
-    sol::table LuaState::makeReadOnly(sol::table table)
+    sol::table makeReadOnly(sol::table table)
     {
+        if (table == sol::nil)
+            return table;
         if (table.is<sol::userdata>())
             return table;  // it is already userdata, no sense to wrap it again
 
+        lua_State* lua = table.lua_state();
         table[sol::meta_function::index] = table;
-        sol::stack::push(mLua, std::move(table));
-        lua_newuserdata(mLua, 0);
-        lua_pushvalue(mLua, -2);
-        lua_setmetatable(mLua, -2);
-        return sol::stack::pop<sol::table>(mLua);
+        sol::stack::push(lua, std::move(table));
+        lua_newuserdata(lua, 0);
+        lua_pushvalue(lua, -2);
+        lua_setmetatable(lua, -2);
+        return sol::stack::pop<sol::table>(lua);
     }
 
-    sol::table LuaState::getMutableFromReadOnly(const sol::userdata& ro)
+    sol::table getMutableFromReadOnly(const sol::userdata& ro)
     {
-        sol::stack::push(mLua, ro);
-        int ok = lua_getmetatable(mLua, -1);
+        lua_State* lua = ro.lua_state();
+        sol::stack::push(lua, ro);
+        int ok = lua_getmetatable(lua, -1);
         assert(ok);
         (void)ok;
-        sol::table res = sol::stack::pop<sol::table>(mLua);
-        lua_pop(mLua, 1);
+        sol::table res = sol::stack::pop<sol::table>(lua);
+        lua_pop(lua, 1);
         return res;
     }
 
diff --git a/components/lua/luastate.hpp b/components/lua/luastate.hpp
index acaaadea76..8982b49b36 100644
--- a/components/lua/luastate.hpp
+++ b/components/lua/luastate.hpp
@@ -3,7 +3,6 @@
 
 #include <map>
 
-#include <limits> // missing from sol/sol.hpp
 #include <sol/sol.hpp>
 
 #include <components/vfs/manager.hpp>
@@ -37,11 +36,6 @@ namespace LuaUtil
         // A shortcut to create a new Lua table.
         sol::table newTable() { return sol::table(mLua, sol::create); }
 
-        // Makes a table read only (when accessed from Lua) by wrapping it with an empty userdata.
-        // Needed to forbid any changes in common resources that can accessed from different sandboxes.
-        sol::table makeReadOnly(sol::table);
-        sol::table getMutableFromReadOnly(const sol::userdata&);
-
         // Registers a package that will be available from every sandbox via `require(name)`.
         // The package can be either a sol::table with an API or a sol::function. If it is a function,
         // it will be evaluated (once per sandbox) the first time when requested. If the package
@@ -106,6 +100,11 @@ namespace LuaUtil
     // String representation of a Lua object. Should be used for debugging/logging purposes only.
     std::string toString(const sol::object&);
 
+    // Makes a table read only (when accessed from Lua) by wrapping it with an empty userdata.
+    // Needed to forbid any changes in common resources that can accessed from different sandboxes.
+    sol::table makeReadOnly(sol::table);
+    sol::table getMutableFromReadOnly(const sol::userdata&);
+
 }
 
 #endif // COMPONENTS_LUA_LUASTATE_H
diff --git a/components/lua/scriptscontainer.cpp b/components/lua/scriptscontainer.cpp
index a53b1d0404..6e0a19b120 100644
--- a/components/lua/scriptscontainer.cpp
+++ b/components/lua/scriptscontainer.cpp
@@ -25,7 +25,7 @@ namespace LuaUtil
 
     void ScriptsContainer::addPackage(const std::string& packageName, sol::object package)
     {
-        API[packageName] = mLua.makeReadOnly(std::move(package));
+        API[packageName] = makeReadOnly(std::move(package));
     }
 
     bool ScriptsContainer::addNewScript(const std::string& path)
@@ -63,7 +63,7 @@ namespace LuaUtil
             if (interfaceName.empty() != (publicInterface == sol::nil))
                 Log(Debug::Error) << mNamePrefix << "[" << path << "]: 'interfaceName' should always be used together with 'interface'";
             else if (!interfaceName.empty())
-                script.as<sol::table>()[INTERFACE] = mPublicInterfaces[interfaceName] = mLua.makeReadOnly(publicInterface);
+                script.as<sol::table>()[INTERFACE] = mPublicInterfaces[interfaceName] = makeReadOnly(publicInterface);
             mScriptOrder.push_back(path);
             mScripts[path].mInterface = std::move(script);
             return true;
@@ -329,7 +329,7 @@ namespace LuaUtil
         mHoursTimersQueue.clear();
 
         mPublicInterfaces.clear();
-        // Assigned by mLua.makeReadOnly, but `clear` removes it, so we need to assign it again.
+        // Assigned by LuaUtil::makeReadOnly, but `clear` removes it, so we need to assign it again.
         mPublicInterfaces[sol::meta_function::index] = mPublicInterfaces;
     }
 
diff --git a/components/lua/scriptscontainer.hpp b/components/lua/scriptscontainer.hpp
index 7b2b2a7aa9..d3141a2ca3 100644
--- a/components/lua/scriptscontainer.hpp
+++ b/components/lua/scriptscontainer.hpp
@@ -76,7 +76,7 @@ namespace LuaUtil
         virtual ~ScriptsContainer() {}
 
         // Adds package that will be available (via `require`) for all scripts in the container.
-        // Automatically applies LuaState::makeReadOnly to the package.
+        // Automatically applies LuaUtil::makeReadOnly to the package.
         void addPackage(const std::string& packageName, sol::object package);
 
         // Finds a file with given path in the virtual file system, starts as a new script, and adds it to the container.

From bcb0526268ad529fe51929f4b21af12357b823a7 Mon Sep 17 00:00:00 2001
From: "florent.teppe" <florent.teppe@nadeo.com>
Date: Sun, 19 Sep 2021 15:00:51 +0200
Subject: [PATCH 1330/2859] Added climits, it compiled on VS2019, but not with
 g++

---
 apps/openmw/mwdialogue/keywordsearch.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/openmw/mwdialogue/keywordsearch.hpp b/apps/openmw/mwdialogue/keywordsearch.hpp
index 3cd8517651..fc6f2a91e8 100644
--- a/apps/openmw/mwdialogue/keywordsearch.hpp
+++ b/apps/openmw/mwdialogue/keywordsearch.hpp
@@ -2,6 +2,7 @@
 #define GAME_MWDIALOGUE_KEYWORDSEARCH_H
 
 #include <map>
+#include <climits>
 #include <cctype>
 #include <stdexcept>
 #include <vector>

From c1c501ca3559571c8292cd0f684274e09f07f9ff Mon Sep 17 00:00:00 2001
From: "florent.teppe" <florent.teppe@nadeo.com>
Date: Sun, 19 Sep 2021 15:05:48 +0200
Subject: [PATCH 1331/2859] Added test to make sure keyword search works even
 with non ascii characters

---
 .../mwdialogue/test_keywordsearch.cpp         | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/apps/openmw_test_suite/mwdialogue/test_keywordsearch.cpp b/apps/openmw_test_suite/mwdialogue/test_keywordsearch.cpp
index 431725be2c..25ea566165 100644
--- a/apps/openmw_test_suite/mwdialogue/test_keywordsearch.cpp
+++ b/apps/openmw_test_suite/mwdialogue/test_keywordsearch.cpp
@@ -65,3 +65,26 @@ TEST_F(KeywordSearchTest, keyword_test_conflict_resolution3)
     ASSERT_TRUE (matches.size() == 1);
     ASSERT_TRUE (std::string(matches.front().mBeg, matches.front().mEnd) == "bar lock");
 }
+
+
+TEST_F(KeywordSearchTest, keyword_test_utf8_word_begin)
+{
+    // We make sure that the search works well even if the character is not ASCII
+    MWDialogue::KeywordSearch<std::string, int> search;
+    search.seed("�tats", 0);
+    search.seed("�rradi�s", 0);
+    search.seed("�a nous d��ois", 0);
+
+
+    std::string text = "les nations unis ont r�unis le monde entier, �tats units inclus pour parler du probl�me des gens �rradi�s et �a nous d��ois";
+
+    std::vector<MWDialogue::KeywordSearch<std::string, int>::Match> matches;
+    search.highlightKeywords(text.begin(), text.end(), matches);
+
+    ASSERT_TRUE (matches.size() == 3);
+    ASSERT_TRUE(std::string( matches[0].mBeg, matches[0].mEnd) == "�tats");
+    ASSERT_TRUE(std::string( matches[1].mBeg, matches[1].mEnd) == "�rradi�s");
+    ASSERT_TRUE(std::string( matches[2].mBeg, matches[2].mEnd) == "�a nous d��ois");
+
+    //ASSERT_TRUE (std::string(matches.front().mBeg, matches.front().mEnd) == "bar lock");
+}

From d879e4aba5db6c13e4a6c10d36dbee1670b374d6 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 19 Sep 2021 19:11:27 +0200
Subject: [PATCH 1332/2859] Use real frame number for axis x

---
 scripts/osg_stats.py | 51 +++++++++++++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 19 deletions(-)

diff --git a/scripts/osg_stats.py b/scripts/osg_stats.py
index f0e6ce4010..8a36eb5963 100755
--- a/scripts/osg_stats.py
+++ b/scripts/osg_stats.py
@@ -45,20 +45,27 @@ import termtables
               help='Start processing from this frame.')
 @click.option('--end_frame', type=int, default=sys.maxsize,
               help='End processing at this frame.')
+@click.option('--frame_number_name', type=str, default='FrameNumber',
+              help='Frame number metric name.')
 @click.argument('path', type=click.Path(), nargs=-1)
 def main(print_keys, timeseries, hist, hist_ratio, stdev_hist, plot, stats,
          timeseries_sum, stats_sum, begin_frame, end_frame, path,
-         commulative_timeseries, commulative_timeseries_sum):
+         commulative_timeseries, commulative_timeseries_sum, frame_number_name):
     sources = {v: list(read_data(v)) for v in path} if path else {'stdin': list(read_data(None))}
     keys = collect_unique_keys(sources)
-    frames = collect_per_frame(sources=sources, keys=keys, begin_frame=begin_frame, end_frame=end_frame)
+    frames, begin_frame, end_frame = collect_per_frame(
+        sources=sources, keys=keys, begin_frame=begin_frame,
+        end_frame=end_frame, frame_number_name=frame_number_name,
+    )
     if print_keys:
         for v in keys:
             print(v)
     if timeseries:
-        draw_timeseries(sources=frames, keys=timeseries, add_sum=timeseries_sum)
+        draw_timeseries(sources=frames, keys=timeseries, add_sum=timeseries_sum,
+                        begin_frame=begin_frame, end_frame=end_frame)
     if commulative_timeseries:
-        draw_commulative_timeseries(sources=frames, keys=commulative_timeseries, add_sum=commulative_timeseries_sum)
+        draw_commulative_timeseries(sources=frames, keys=commulative_timeseries, add_sum=commulative_timeseries_sum,
+                                    begin_frame=begin_frame, end_frame=end_frame)
     if hist:
         draw_hists(sources=frames, keys=hist)
     if hist_ratio:
@@ -92,19 +99,26 @@ def read_data(path):
                 frame[key] = to_number(value)
 
 
-def collect_per_frame(sources, keys, begin_frame, end_frame):
+def collect_per_frame(sources, keys, begin_frame, end_frame, frame_number_name):
+    assert begin_frame < end_frame
     result = collections.defaultdict(lambda: collections.defaultdict(list))
+    begin_frame = max(begin_frame, min(v[0][frame_number_name] for v in sources.values()))
+    end_frame = min(end_frame, begin_frame + max(len(v) for v in sources.values()))
+    for name in sources.keys():
+        for key in keys:
+            result[name][key] = [0] * (end_frame - begin_frame)
     for name, frames in sources.items():
         for frame in frames:
-            for key in keys:
-                if key in frame:
-                    result[name][key].append(frame[key])
-                else:
-                    result[name][key].append(None)
-    for name, sources in result.items():
-        for key, values in sources.items():
-            result[name][key] = numpy.array(values[begin_frame:end_frame])
-    return result
+            number = frame[frame_number_name]
+            if begin_frame <= number < end_frame:
+                index = number - begin_frame
+                for key in keys:
+                    if key in frame:
+                        result[name][key][index] = frame[key]
+    for name in result.keys():
+        for key in keys:
+            result[name][key] = numpy.array(result[name][key])
+    return result, begin_frame, end_frame
 
 
 def collect_unique_keys(sources):
@@ -116,12 +130,11 @@ def collect_unique_keys(sources):
     return sorted(result)
 
 
-def draw_timeseries(sources, keys, add_sum):
+def draw_timeseries(sources, keys, add_sum, begin_frame, end_frame):
     fig, ax = matplotlib.pyplot.subplots()
+    x = numpy.array(range(begin_frame, end_frame))
     for name, frames in sources.items():
-        x = numpy.array(range(max(len(v) for k, v in frames.items() if k in keys)))
         for key in keys:
-            print(key, name)
             ax.plot(x, frames[key], label=f'{key}:{name}')
         if add_sum:
             ax.plot(x, numpy.sum(list(frames[k] for k in keys), axis=0), label=f'sum:{name}')
@@ -130,10 +143,10 @@ def draw_timeseries(sources, keys, add_sum):
     fig.canvas.set_window_title('timeseries')
 
 
-def draw_commulative_timeseries(sources, keys, add_sum):
+def draw_commulative_timeseries(sources, keys, add_sum, begin_frame, end_frame):
     fig, ax = matplotlib.pyplot.subplots()
+    x = numpy.array(range(begin_frame, end_frame))
     for name, frames in sources.items():
-        x = numpy.array(range(max(len(v) for k, v in frames.items() if k in keys)))
         for key in keys:
             ax.plot(x, numpy.cumsum(frames[key]), label=f'{key}:{name}')
         if add_sum:

From 6d7cb3883480d43c3870be757289fa54727ef5df Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 19 Sep 2021 19:53:38 +0200
Subject: [PATCH 1333/2859] Remove duplicate GetSquareRoot implementation

---
 apps/openmw/mwscript/miscextensions.cpp   |  3 ++
 components/compiler/exprparser.cpp        | 40 +++++++----------------
 components/compiler/generator.cpp         | 10 ------
 components/compiler/generator.hpp         |  2 --
 components/compiler/scanner.cpp           |  1 -
 components/compiler/scanner.hpp           |  3 +-
 components/compiler/stringparser.cpp      |  2 +-
 components/interpreter/docs/vmformat.txt  |  2 +-
 components/interpreter/installopcodes.cpp |  1 -
 components/interpreter/mathopcodes.hpp    | 20 +-----------
 10 files changed, 19 insertions(+), 65 deletions(-)

diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index 869a1d540a..149f9f3f3f 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -864,6 +864,9 @@ namespace MWScript
                     float param = runtime[0].mFloat;
                     runtime.pop();
 
+                    if (param < 0)
+                        throw std::runtime_error("square root of negative number (we aren't that imaginary)");
+
                     runtime.push(std::sqrt (param));
                 }
         };
diff --git a/components/compiler/exprparser.cpp b/components/compiler/exprparser.cpp
index fb7ca7aac4..23f15c8bf5 100644
--- a/components/compiler/exprparser.cpp
+++ b/components/compiler/exprparser.cpp
@@ -421,42 +421,26 @@ namespace Compiler
 
         if (mNextOperand)
         {
-            if (keyword==Scanner::K_getsquareroot)
+            // check for custom extensions
+            if (const Extensions *extensions = getContext().getExtensions())
             {
                 start();
 
-                mTokenLoc = loc;
-                parseArguments ("f", scanner);
+                char returnType;
+                std::string argumentType;
 
-                Generator::squareRoot (mCode);
-                mOperands.push_back ('f');
+                bool hasExplicit = false;
 
-                mNextOperand = false;
-                return true;
-            }
-            else
-            {
-                // check for custom extensions
-                if (const Extensions *extensions = getContext().getExtensions())
+                if (extensions->isFunction (keyword, returnType, argumentType, hasExplicit))
                 {
-                    start();
-
-                    char returnType;
-                    std::string argumentType;
+                    mTokenLoc = loc;
+                    int optionals = parseArguments (argumentType, scanner);
 
-                    bool hasExplicit = false;
+                    extensions->generateFunctionCode (keyword, mCode, mLiterals, "", optionals);
+                    mOperands.push_back (returnType);
 
-                    if (extensions->isFunction (keyword, returnType, argumentType, hasExplicit))
-                    {
-                        mTokenLoc = loc;
-                        int optionals = parseArguments (argumentType, scanner);
-
-                        extensions->generateFunctionCode (keyword, mCode, mLiterals, "", optionals);
-                        mOperands.push_back (returnType);
-
-                        mNextOperand = false;
-                        return true;
-                    }
+                    mNextOperand = false;
+                    return true;
                 }
             }
         }
diff --git a/components/compiler/generator.cpp b/components/compiler/generator.cpp
index 34da1c4120..3d8b87e69e 100644
--- a/components/compiler/generator.cpp
+++ b/components/compiler/generator.cpp
@@ -104,11 +104,6 @@ namespace
         code.push_back (Compiler::Generator::segment5 (17));
     }
 
-    void opSquareRoot (Compiler::Generator::CodeContainer& code)
-    {
-        code.push_back (Compiler::Generator::segment5 (19));
-    }
-
     void opReturn (Compiler::Generator::CodeContainer& code)
     {
         code.push_back (Compiler::Generator::segment5 (20));
@@ -452,11 +447,6 @@ namespace Compiler::Generator
             }
         }
 
-        void squareRoot (CodeContainer& code)
-        {
-            opSquareRoot (code);
-        }
-
         void exit (CodeContainer& code)
         {
             opReturn (code);
diff --git a/components/compiler/generator.hpp b/components/compiler/generator.hpp
index 55bba2a75c..00c6e56825 100644
--- a/components/compiler/generator.hpp
+++ b/components/compiler/generator.hpp
@@ -74,8 +74,6 @@ namespace Compiler
 
         void convert (CodeContainer& code, char fromType, char toType);
 
-        void squareRoot (CodeContainer& code);
-
         void exit (CodeContainer& code);
 
         void message (CodeContainer& code, Literals& literals, const std::string& message,
diff --git a/components/compiler/scanner.cpp b/components/compiler/scanner.cpp
index 829df35be5..cd607b2e73 100644
--- a/components/compiler/scanner.cpp
+++ b/components/compiler/scanner.cpp
@@ -265,7 +265,6 @@ namespace Compiler
         "return",
         "messagebox",
         "set", "to",
-        "getsquareroot",
         nullptr
     };
 
diff --git a/components/compiler/scanner.hpp b/components/compiler/scanner.hpp
index 15781f9240..7901297325 100644
--- a/components/compiler/scanner.hpp
+++ b/components/compiler/scanner.hpp
@@ -205,8 +205,7 @@ namespace Compiler
                 K_while, K_endwhile,
                 K_return,
                 K_messagebox,
-                K_set, K_to,
-                K_getsquareroot
+                K_set, K_to
             };
 
             enum special
diff --git a/components/compiler/stringparser.cpp b/components/compiler/stringparser.cpp
index 8b20377e1f..d9c3c04947 100644
--- a/components/compiler/stringparser.cpp
+++ b/components/compiler/stringparser.cpp
@@ -63,7 +63,7 @@ namespace Compiler
             keyword==Scanner::K_elseif || keyword==Scanner::K_while ||
             keyword==Scanner::K_endwhile || keyword==Scanner::K_return ||
             keyword==Scanner::K_messagebox || keyword==Scanner::K_set ||
-            keyword==Scanner::K_to || keyword==Scanner::K_getsquareroot)
+            keyword==Scanner::K_to)
         {
             // pretend this is not a keyword
             std::string name = loc.mLiteral;
diff --git a/components/interpreter/docs/vmformat.txt b/components/interpreter/docs/vmformat.txt
index b5c9cf0ae0..7eac8b26e0 100644
--- a/components/interpreter/docs/vmformat.txt
+++ b/components/interpreter/docs/vmformat.txt
@@ -77,7 +77,7 @@ op  15: div (integer) stack[1] by stack[0], pop twice, push result
 op  16: div (float) stack[1] by stack[0], pop twice, push result
 op  17: convert stack[1] from integer to float
 op  18: convert stack[1] from float to integer
-op  19: take square root of stack[0] (float)
+opcode 19 unused
 op  20: return
 op  21: replace stack[0] with local short stack[0]
 op  22: replace stack[0] with local long stack[0]
diff --git a/components/interpreter/installopcodes.cpp b/components/interpreter/installopcodes.cpp
index afee36bc28..b5cb229e84 100644
--- a/components/interpreter/installopcodes.cpp
+++ b/components/interpreter/installopcodes.cpp
@@ -59,7 +59,6 @@ namespace Interpreter
         interpreter.installSegment5 (14, new OpMulInt<Type_Float>);
         interpreter.installSegment5 (15, new OpDivInt<Type_Integer>);
         interpreter.installSegment5 (16, new OpDivInt<Type_Float>);
-        interpreter.installSegment5 (19, new OpSquareRoot);
         interpreter.installSegment5 (26,
             new OpCompare<Type_Integer, std::equal_to<Type_Integer> >);
         interpreter.installSegment5 (27,
diff --git a/components/interpreter/mathopcodes.hpp b/components/interpreter/mathopcodes.hpp
index 42cb486b9c..bf580c6c2e 100644
--- a/components/interpreter/mathopcodes.hpp
+++ b/components/interpreter/mathopcodes.hpp
@@ -74,24 +74,6 @@ namespace Interpreter
             }           
     };
     
-    class OpSquareRoot : public Opcode0
-    {
-        public:
-        
-            void execute (Runtime& runtime) override
-            {
-                Type_Float value = runtime[0].mFloat;
-                
-                if (value<0)
-                    throw std::runtime_error (
-                        "square root of negative number (we aren't that imaginary)");
-                
-                value = std::sqrt (value);
-                
-                runtime[0].mFloat = value;
-            }           
-    };    
-    
     template<typename T, typename C>
     class OpCompare : public Opcode0
     {
@@ -105,7 +87,7 @@ namespace Interpreter
                 
                 runtime[0].mInteger = result;
             }           
-    };    
+    };
 }
 
 #endif

From 0e06e9b22188e7f23feacd0ddef1cdc286a3f732 Mon Sep 17 00:00:00 2001
From: "florent.teppe" <florent.teppe@nadeo.com>
Date: Sun, 19 Sep 2021 20:29:32 +0200
Subject: [PATCH 1334/2859] Removed useless comment and converted the file to
 UTF8 to keep special characters

---
 .../mwdialogue/test_keywordsearch.cpp            | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/apps/openmw_test_suite/mwdialogue/test_keywordsearch.cpp b/apps/openmw_test_suite/mwdialogue/test_keywordsearch.cpp
index 25ea566165..d633feecd9 100644
--- a/apps/openmw_test_suite/mwdialogue/test_keywordsearch.cpp
+++ b/apps/openmw_test_suite/mwdialogue/test_keywordsearch.cpp
@@ -71,20 +71,18 @@ TEST_F(KeywordSearchTest, keyword_test_utf8_word_begin)
 {
     // We make sure that the search works well even if the character is not ASCII
     MWDialogue::KeywordSearch<std::string, int> search;
-    search.seed("�tats", 0);
-    search.seed("�rradi�s", 0);
-    search.seed("�a nous d��ois", 0);
+    search.seed("états", 0);
+    search.seed("ïrradiés", 0);
+    search.seed("ça nous déçois", 0);
 
 
-    std::string text = "les nations unis ont r�unis le monde entier, �tats units inclus pour parler du probl�me des gens �rradi�s et �a nous d��ois";
+    std::string text = "les nations unis ont réunis le monde entier, états units inclus pour parler du problème des gens ïrradiés et ça nous déçois";
 
     std::vector<MWDialogue::KeywordSearch<std::string, int>::Match> matches;
     search.highlightKeywords(text.begin(), text.end(), matches);
 
     ASSERT_TRUE (matches.size() == 3);
-    ASSERT_TRUE(std::string( matches[0].mBeg, matches[0].mEnd) == "�tats");
-    ASSERT_TRUE(std::string( matches[1].mBeg, matches[1].mEnd) == "�rradi�s");
-    ASSERT_TRUE(std::string( matches[2].mBeg, matches[2].mEnd) == "�a nous d��ois");
-
-    //ASSERT_TRUE (std::string(matches.front().mBeg, matches.front().mEnd) == "bar lock");
+    ASSERT_TRUE(std::string( matches[0].mBeg, matches[0].mEnd) == "états");
+    ASSERT_TRUE(std::string( matches[1].mBeg, matches[1].mEnd) == "ïrradiés");
+    ASSERT_TRUE(std::string( matches[2].mBeg, matches[2].mEnd) == "ça nous déçois");
 }

From b3d1d106af76e748f695d50e621d57c28f0091a1 Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Sun, 29 Aug 2021 14:26:17 +0300
Subject: [PATCH 1335/2859] Collada alpha testing and uniforms

---
 components/resource/scenemanager.cpp | 58 ++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 76e73da384..8056e6911b 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -2,6 +2,7 @@
 
 #include <cstdlib>
 
+#include <osg/AlphaFunc>
 #include <osg/Node>
 #include <osg/UserDataContainer>
 
@@ -217,7 +218,52 @@ namespace Resource
         int mMaxAnisotropy;
     };
 
+    // Check Collada extra descriptions
+    class ColladaAlphaTrickVisitor : public osg::NodeVisitor
+    {
+    public:
+        ColladaAlphaTrickVisitor()
+            : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+        {
+        }
+
+        osg::AlphaFunc::ComparisonFunction getTestMode(std::string mode)
+        {
+            if (mode == "ALWAYS") return osg::AlphaFunc::ALWAYS;
+            if (mode == "LESS") return osg::AlphaFunc::LESS;
+            if (mode == "EQUAL") return osg::AlphaFunc::EQUAL;
+            if (mode == "LEQUAL") return osg::AlphaFunc::LEQUAL;
+            if (mode == "GREATER") return osg::AlphaFunc::GREATER;
+            if (mode == "NOTEQUAL") return osg::AlphaFunc::NOTEQUAL;
+            if (mode == "GEQUAL") return osg::AlphaFunc::GEQUAL;
+            if (mode == "NEVER") return osg::AlphaFunc::NEVER;
+
+            Log(Debug::Info) << "Unexpected alpha testing mode: " << mode;
+            return osg::AlphaFunc::LEQUAL;
+        }
+
+        void apply(osg::Node& node) override
+        {
+            std::vector<std::string> descriptions = node.getDescriptions();
+            for (auto description : descriptions)
+            {
+                std::vector<std::string> descriptionParts;
 
+                std::istringstream descriptionStringStream(description);
+                for (std::string part; std::getline(descriptionStringStream, part, ' ');)
+                    descriptionParts.emplace_back(part);
+
+                if (descriptionParts.at(0) == "alphatest")
+                {
+                    osg::AlphaFunc::ComparisonFunction mode = getTestMode(descriptionParts.at(1));
+                    osg::ref_ptr<osg::AlphaFunc> alphaFunc (new osg::AlphaFunc(mode, std::stod(descriptionParts.back())));
+                    node.getOrCreateStateSet()->setAttributeAndModes(alphaFunc, osg::StateAttribute::ON);
+                    Log(Debug::Info) << "Setting collada alpha test " << description << " for " << node.getName();
+                }
+            }
+            traverse(node);
+        }
+    };
 
     SceneManager::SceneManager(const VFS::Manager *vfs, Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager)
         : ResourceManager(vfs)
@@ -424,6 +470,18 @@ namespace Resource
             if (nameFinder.mFoundNode)
                 nameFinder.mFoundNode->setNodeMask(hiddenNodeMask);
 
+            if (ext == "dae")
+            {
+                // Collada alpha testing
+                Resource::ColladaAlphaTrickVisitor colladaAlphaTrickVisitor;
+                result.getNode()->accept(colladaAlphaTrickVisitor);
+
+                result.getNode()->getOrCreateStateSet()->addUniform(new osg::Uniform("emissiveMult", 1.f));
+                result.getNode()->getOrCreateStateSet()->addUniform(new osg::Uniform("envMapColor", osg::Vec4f(1,1,1,1)));
+                result.getNode()->getOrCreateStateSet()->addUniform(new osg::Uniform("useFalloff", false));
+            }
+
+
             return result.getNode();
         }
     }

From 89982eb9e333d74ed69f57a313096da486b18262 Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Sun, 29 Aug 2021 14:31:11 +0300
Subject: [PATCH 1336/2859] Add changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 917de55fe2..8a92127dca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,6 +48,7 @@
     Feature #6032: Reverse-z depth buffer
     Feature #6162: Refactor GUI to use shaders and to be GLES and GL3+ friendly
     Feature #6199: Support FBO Rendering
+    Feature #6249: Alpha testing support for Collada
     Feature #6251: OpenMW-CS: Set instance movement based on camera zoom
     Task #6201: Remove the "Note: No relevant classes found. No output generated" warnings
     Task #6264: Remove the old classes in animation.cpp

From 40497d6fe55b68f708cd1063e7a36f7a75ab7389 Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Sat, 11 Sep 2021 13:55:17 +0300
Subject: [PATCH 1337/2859] Set depth testing for alpha blend & test, depth
 writes off for blend.

---
 components/resource/scenemanager.cpp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 8056e6911b..b4a26f0f35 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -244,6 +244,17 @@ namespace Resource
 
         void apply(osg::Node& node) override
         {
+            bool osgDepthCreated(false);
+
+            if (node.getOrCreateStateSet()->getRenderingHint() == osg::StateSet::TRANSPARENT_BIN)
+            {
+                osg::ref_ptr<osg::Depth> depth = SceneUtil::createDepth();
+                depth->setWriteMask(false);
+                osgDepthCreated = true;
+
+                node.getOrCreateStateSet()->setAttributeAndModes(depth, osg::StateAttribute::ON);
+            }
+
             std::vector<std::string> descriptions = node.getDescriptions();
             for (auto description : descriptions)
             {
@@ -255,6 +266,12 @@ namespace Resource
 
                 if (descriptionParts.at(0) == "alphatest")
                 {
+                    if (!osgDepthCreated)
+                    {
+                        osg::ref_ptr<osg::Depth> depth = SceneUtil::createDepth();
+                        node.getOrCreateStateSet()->setAttributeAndModes(depth, osg::StateAttribute::ON);
+                    }
+
                     osg::AlphaFunc::ComparisonFunction mode = getTestMode(descriptionParts.at(1));
                     osg::ref_ptr<osg::AlphaFunc> alphaFunc (new osg::AlphaFunc(mode, std::stod(descriptionParts.back())));
                     node.getOrCreateStateSet()->setAttributeAndModes(alphaFunc, osg::StateAttribute::ON);

From 96f02ab32c4d2fb329f4c382499154673bb56dbb Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Sat, 11 Sep 2021 17:03:16 +0300
Subject: [PATCH 1338/2859] Per-material alpha testing for collada

---
 components/resource/scenemanager.cpp | 36 ++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index b4a26f0f35..80d8f1ecdc 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -255,31 +255,47 @@ namespace Resource
                 node.getOrCreateStateSet()->setAttributeAndModes(depth, osg::StateAttribute::ON);
             }
 
+            /* Check if the <node> has <extra type="Node"> <technique profile="OpenSceneGraph"> <Descriptions> <Description>
+               correct format for OpenMW: <Description>alphatest mode value MaterialName</Description>
+                                      e.g <Description>alphatest GEQUAL 0.8 MyAlphaTestedMaterial</Description> */
             std::vector<std::string> descriptions = node.getDescriptions();
             for (auto description : descriptions)
             {
-                std::vector<std::string> descriptionParts;
+                mDescriptions.emplace_back(description);
+            }
 
+            // Iterate each description, and see if the current node uses the specified material for alpha testing
+            for (auto description : mDescriptions)
+            {
+                std::vector<std::string> descriptionParts;
                 std::istringstream descriptionStringStream(description);
                 for (std::string part; std::getline(descriptionStringStream, part, ' ');)
+                {
                     descriptionParts.emplace_back(part);
+                }
 
-                if (descriptionParts.at(0) == "alphatest")
+                if (descriptionParts.size() > (3) && descriptionParts.at(3) == node.getOrCreateStateSet()->getName())
                 {
-                    if (!osgDepthCreated)
+                    if (descriptionParts.at(0) == "alphatest")
                     {
-                        osg::ref_ptr<osg::Depth> depth = SceneUtil::createDepth();
-                        node.getOrCreateStateSet()->setAttributeAndModes(depth, osg::StateAttribute::ON);
+                        if (!osgDepthCreated)
+                        {
+                            osg::ref_ptr<osg::Depth> depth = SceneUtil::createDepth();
+                            node.getOrCreateStateSet()->setAttributeAndModes(depth, osg::StateAttribute::ON);
+                        }
+
+                        osg::AlphaFunc::ComparisonFunction mode = getTestMode(descriptionParts.at(1));
+                        osg::ref_ptr<osg::AlphaFunc> alphaFunc (new osg::AlphaFunc(mode, std::stod(descriptionParts.at(2))));
+                        node.getOrCreateStateSet()->setAttributeAndModes(alphaFunc, osg::StateAttribute::ON);
+                        Log(Debug::Info) << "Setting collada alpha test for " << node.getName();
                     }
-
-                    osg::AlphaFunc::ComparisonFunction mode = getTestMode(descriptionParts.at(1));
-                    osg::ref_ptr<osg::AlphaFunc> alphaFunc (new osg::AlphaFunc(mode, std::stod(descriptionParts.back())));
-                    node.getOrCreateStateSet()->setAttributeAndModes(alphaFunc, osg::StateAttribute::ON);
-                    Log(Debug::Info) << "Setting collada alpha test " << description << " for " << node.getName();
                 }
             }
+
             traverse(node);
         }
+        private:
+            std::vector<std::string> mDescriptions;
     };
 
     SceneManager::SceneManager(const VFS::Manager *vfs, Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager)

From ec0b36d21d4035e7a4fbe7b3c222a15f04248523 Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Sun, 12 Sep 2021 20:31:34 +0300
Subject: [PATCH 1339/2859] Don't make a new osg::depth to alpha tested node

---
 components/resource/scenemanager.cpp | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 80d8f1ecdc..b9bab66faa 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -244,13 +244,10 @@ namespace Resource
 
         void apply(osg::Node& node) override
         {
-            bool osgDepthCreated(false);
-
             if (node.getOrCreateStateSet()->getRenderingHint() == osg::StateSet::TRANSPARENT_BIN)
             {
                 osg::ref_ptr<osg::Depth> depth = SceneUtil::createDepth();
                 depth->setWriteMask(false);
-                osgDepthCreated = true;
 
                 node.getOrCreateStateSet()->setAttributeAndModes(depth, osg::StateAttribute::ON);
             }
@@ -278,12 +275,6 @@ namespace Resource
                 {
                     if (descriptionParts.at(0) == "alphatest")
                     {
-                        if (!osgDepthCreated)
-                        {
-                            osg::ref_ptr<osg::Depth> depth = SceneUtil::createDepth();
-                            node.getOrCreateStateSet()->setAttributeAndModes(depth, osg::StateAttribute::ON);
-                        }
-
                         osg::AlphaFunc::ComparisonFunction mode = getTestMode(descriptionParts.at(1));
                         osg::ref_ptr<osg::AlphaFunc> alphaFunc (new osg::AlphaFunc(mode, std::stod(descriptionParts.at(2))));
                         node.getOrCreateStateSet()->setAttributeAndModes(alphaFunc, osg::StateAttribute::ON);

From f2a894024a646204c283c969b8acb33db0de255e Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Sun, 12 Sep 2021 21:08:59 +0300
Subject: [PATCH 1340/2859] Change debug levels

---
 components/resource/scenemanager.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index b9bab66faa..3112e3c837 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -238,7 +238,7 @@ namespace Resource
             if (mode == "GEQUAL") return osg::AlphaFunc::GEQUAL;
             if (mode == "NEVER") return osg::AlphaFunc::NEVER;
 
-            Log(Debug::Info) << "Unexpected alpha testing mode: " << mode;
+            Log(Debug::Warning) << "Unexpected alpha testing mode: " << mode;
             return osg::AlphaFunc::LEQUAL;
         }
 
@@ -278,7 +278,6 @@ namespace Resource
                         osg::AlphaFunc::ComparisonFunction mode = getTestMode(descriptionParts.at(1));
                         osg::ref_ptr<osg::AlphaFunc> alphaFunc (new osg::AlphaFunc(mode, std::stod(descriptionParts.at(2))));
                         node.getOrCreateStateSet()->setAttributeAndModes(alphaFunc, osg::StateAttribute::ON);
-                        Log(Debug::Info) << "Setting collada alpha test for " << node.getName();
                     }
                 }
             }

From 67894349a97e9949b2057055fd06933538cfa2e9 Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Sat, 18 Sep 2021 14:02:28 +0300
Subject: [PATCH 1341/2859] Add a check for OPAQUE_BIN

---
 components/resource/scenemanager.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 3112e3c837..b468b430ff 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -251,6 +251,13 @@ namespace Resource
 
                 node.getOrCreateStateSet()->setAttributeAndModes(depth, osg::StateAttribute::ON);
             }
+            else if (node.getOrCreateStateSet()->getRenderingHint() == osg::StateSet::OPAQUE_BIN)
+            {
+                osg::ref_ptr<osg::Depth> depth = SceneUtil::createDepth();
+                depth->setWriteMask(true);
+
+                node.getOrCreateStateSet()->setAttributeAndModes(depth, osg::StateAttribute::ON);
+            }
 
             /* Check if the <node> has <extra type="Node"> <technique profile="OpenSceneGraph"> <Descriptions> <Description>
                correct format for OpenMW: <Description>alphatest mode value MaterialName</Description>

From 2d329548887ff91b38a2b757bf216ac1065b20ee Mon Sep 17 00:00:00 2001
From: "florent.teppe" <florent.teppe@nadeo.com>
Date: Mon, 20 Sep 2021 19:56:47 +0200
Subject: [PATCH 1342/2859] Replaced Assert_true with expect_eq

---
 .../mwdialogue/test_keywordsearch.cpp         | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/apps/openmw_test_suite/mwdialogue/test_keywordsearch.cpp b/apps/openmw_test_suite/mwdialogue/test_keywordsearch.cpp
index d633feecd9..62b6f67aae 100644
--- a/apps/openmw_test_suite/mwdialogue/test_keywordsearch.cpp
+++ b/apps/openmw_test_suite/mwdialogue/test_keywordsearch.cpp
@@ -27,9 +27,9 @@ TEST_F(KeywordSearchTest, keyword_test_conflict_resolution)
     search.highlightKeywords(text.begin(), text.end(), matches);
 
     // Should contain: "foo bar", "lock switch"
-    ASSERT_TRUE (matches.size() == 2);
-    ASSERT_TRUE (std::string(matches.front().mBeg, matches.front().mEnd) == "foo bar");
-    ASSERT_TRUE (std::string(matches.rbegin()->mBeg, matches.rbegin()->mEnd) == "lock switch");
+    EXPECT_EQ (matches.size() , 2);
+    EXPECT_EQ (std::string(matches.front().mBeg, matches.front().mEnd) , "foo bar");
+    EXPECT_EQ (std::string(matches.rbegin()->mBeg, matches.rbegin()->mEnd) , "lock switch");
 }
 
 TEST_F(KeywordSearchTest, keyword_test_conflict_resolution2)
@@ -43,8 +43,8 @@ TEST_F(KeywordSearchTest, keyword_test_conflict_resolution2)
     std::vector<MWDialogue::KeywordSearch<std::string, int>::Match> matches;
     search.highlightKeywords(text.begin(), text.end(), matches);
 
-    ASSERT_TRUE (matches.size() == 1);
-    ASSERT_TRUE (std::string(matches.front().mBeg, matches.front().mEnd) == "dwemer language");
+    EXPECT_EQ (matches.size() , 1);
+    EXPECT_EQ (std::string(matches.front().mBeg, matches.front().mEnd) , "dwemer language");
 }
 
 
@@ -62,8 +62,8 @@ TEST_F(KeywordSearchTest, keyword_test_conflict_resolution3)
     std::vector<MWDialogue::KeywordSearch<std::string, int>::Match> matches;
     search.highlightKeywords(text.begin(), text.end(), matches);
 
-    ASSERT_TRUE (matches.size() == 1);
-    ASSERT_TRUE (std::string(matches.front().mBeg, matches.front().mEnd) == "bar lock");
+    EXPECT_EQ (matches.size() , 1);
+    EXPECT_EQ (std::string(matches.front().mBeg, matches.front().mEnd) , "bar lock");
 }
 
 
@@ -81,8 +81,8 @@ TEST_F(KeywordSearchTest, keyword_test_utf8_word_begin)
     std::vector<MWDialogue::KeywordSearch<std::string, int>::Match> matches;
     search.highlightKeywords(text.begin(), text.end(), matches);
 
-    ASSERT_TRUE (matches.size() == 3);
-    ASSERT_TRUE(std::string( matches[0].mBeg, matches[0].mEnd) == "états");
-    ASSERT_TRUE(std::string( matches[1].mBeg, matches[1].mEnd) == "ïrradiés");
-    ASSERT_TRUE(std::string( matches[2].mBeg, matches[2].mEnd) == "ça nous déçois");
+    EXPECT_EQ (matches.size() , 3);
+    EXPECT_EQ (std::string( matches[0].mBeg, matches[0].mEnd) , "états");
+    EXPECT_EQ (std::string( matches[1].mBeg, matches[1].mEnd) , "ïrradiés");
+    EXPECT_EQ (std::string( matches[2].mBeg, matches[2].mEnd) , "ça nous déçois");
 }

From 99df1c695c32ad4bb636501554e2430d3ce87b40 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Mon, 20 Sep 2021 18:17:55 +0000
Subject: [PATCH 1343/2859] fixes wireframe is broken (#3123)

* renderingmanager.cpp [ci skip]

* groundcover.hpp [ci skip]

* groundcover.cpp

* renderingmanager.cpp [ci skip]

* renderingmanager.hpp
---
 apps/openmw/mwrender/groundcover.cpp      | 30 ------------
 apps/openmw/mwrender/groundcover.hpp      | 22 ---------
 apps/openmw/mwrender/renderingmanager.cpp | 56 ++++++++++++++++-------
 apps/openmw/mwrender/renderingmanager.hpp |  2 -
 4 files changed, 39 insertions(+), 71 deletions(-)

diff --git a/apps/openmw/mwrender/groundcover.cpp b/apps/openmw/mwrender/groundcover.cpp
index a199201d41..94bd900aea 100644
--- a/apps/openmw/mwrender/groundcover.cpp
+++ b/apps/openmw/mwrender/groundcover.cpp
@@ -27,36 +27,6 @@ namespace MWRender
         }
     }
 
-    void GroundcoverUpdater::setWindSpeed(float windSpeed)
-    {
-        mWindSpeed = windSpeed;
-    }
-
-    void GroundcoverUpdater::setPlayerPos(osg::Vec3f playerPos)
-    {
-        mPlayerPos = playerPos;
-    }
-
-    void GroundcoverUpdater::setDefaults(osg::StateSet *stateset)
-    {
-        osg::ref_ptr<osg::Uniform> windUniform = new osg::Uniform("windSpeed", 0.0f);
-        stateset->addUniform(windUniform.get());
-
-        osg::ref_ptr<osg::Uniform> playerPosUniform = new osg::Uniform("playerPos", osg::Vec3f(0.f, 0.f, 0.f));
-        stateset->addUniform(playerPosUniform.get());
-    }
-
-    void GroundcoverUpdater::apply(osg::StateSet *stateset, osg::NodeVisitor *nv)
-    {
-        osg::ref_ptr<osg::Uniform> windUniform = stateset->getUniform("windSpeed");
-        if (windUniform != nullptr)
-            windUniform->set(mWindSpeed);
-
-        osg::ref_ptr<osg::Uniform> playerPosUniform = stateset->getUniform("playerPos");
-        if (playerPosUniform != nullptr)
-            playerPosUniform->set(mPlayerPos);
-    }
-
     class InstancingVisitor : public osg::NodeVisitor
     {
     public:
diff --git a/apps/openmw/mwrender/groundcover.hpp b/apps/openmw/mwrender/groundcover.hpp
index 4874bea899..0a83976441 100644
--- a/apps/openmw/mwrender/groundcover.hpp
+++ b/apps/openmw/mwrender/groundcover.hpp
@@ -3,32 +3,10 @@
 
 #include <components/terrain/quadtreeworld.hpp>
 #include <components/resource/scenemanager.hpp>
-#include <components/sceneutil/statesetupdater.hpp>
 #include <components/esm/loadcell.hpp>
 
 namespace MWRender
 {
-    class GroundcoverUpdater : public SceneUtil::StateSetUpdater
-    {
-    public:
-        GroundcoverUpdater()
-            : mWindSpeed(0.f)
-            , mPlayerPos(osg::Vec3f())
-        {
-        }
-
-        void setWindSpeed(float windSpeed);
-        void setPlayerPos(osg::Vec3f playerPos);
-
-    protected:
-        void setDefaults(osg::StateSet *stateset) override;
-        void apply(osg::StateSet *stateset, osg::NodeVisitor *nv) override;
-
-    private:
-        float mWindSpeed;
-        osg::Vec3f mPlayerPos;
-    };
-
     typedef std::tuple<osg::Vec2f, float> GroundcoverChunkId; // Center, Size
     class Groundcover : public Resource::GenericResourceManager<GroundcoverChunkId>, public Terrain::QuadTreeWorld::ChunkManager
     {
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 56d3ba4a43..19a887fe2e 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -77,10 +77,12 @@ namespace MWRender
     class SharedUniformStateUpdater : public SceneUtil::StateSetUpdater
     {
     public:
-        SharedUniformStateUpdater()
+        SharedUniformStateUpdater(bool usePlayerUniforms)
             : mLinearFac(0.f)
             , mNear(0.f)
             , mFar(0.f)
+            , mUsePlayerUniforms(usePlayerUniforms)
+            , mWindSpeed(0.f)
         {
         }
 
@@ -90,6 +92,11 @@ namespace MWRender
             stateset->addUniform(new osg::Uniform("linearFac", 0.f));
             stateset->addUniform(new osg::Uniform("near", 0.f));
             stateset->addUniform(new osg::Uniform("far", 0.f));
+            if (mUsePlayerUniforms)
+            {
+                stateset->addUniform(new osg::Uniform("windSpeed", 0.0f));
+                stateset->addUniform(new osg::Uniform("playerPos", osg::Vec3f(0.f, 0.f, 0.f)));
+            }
         }
 
         void apply(osg::StateSet* stateset, osg::NodeVisitor* nv) override
@@ -110,6 +117,16 @@ namespace MWRender
             if (uFar)
                 uFar->set(mFar);
 
+            if (mUsePlayerUniforms)
+            {
+                auto* windSpeed = stateset->getUniform("windSpeed");
+                if (windSpeed)
+                    windSpeed->set(mWindSpeed);
+
+                auto* playerPos = stateset->getUniform("playerPos");
+                if (playerPos)
+                    playerPos->set(mPlayerPos);
+            }
         }
 
         void setProjectionMatrix(const osg::Matrixf& projectionMatrix)
@@ -132,11 +149,25 @@ namespace MWRender
             mFar = far;
         }
 
+        void setWindSpeed(float windSpeed)
+        {
+            mWindSpeed = windSpeed;
+        }
+
+        void setPlayerPos(osg::Vec3f playerPos)
+        {
+            mPlayerPos = playerPos;
+        }
+
+
     private:
         osg::Matrixf mProjectionMatrix;
         float mLinearFac;
         float mNear;
         float mFar;
+        bool mUsePlayerUniforms;
+        float mWindSpeed;
+        osg::Vec3f mPlayerPos;
     };
 
     class StateUpdater : public SceneUtil::StateSetUpdater
@@ -400,16 +431,11 @@ namespace MWRender
         mTerrain->setTargetFrameRate(Settings::Manager::getFloat("target framerate", "Cells"));
         mTerrain->setWorkQueue(mWorkQueue.get());
 
-       osg::ref_ptr<SceneUtil::CompositeStateSetUpdater> composite = new SceneUtil::CompositeStateSetUpdater;
-
         if (groundcover)
         {
             float density = Settings::Manager::getFloat("density", "Groundcover");
             density = std::clamp(density, 0.f, 1.f);
 
-            mGroundcoverUpdater = new GroundcoverUpdater;
-            composite->addController(mGroundcoverUpdater);
-
             mGroundcover.reset(new Groundcover(mResourceSystem->getSceneManager(), density));
             static_cast<Terrain::QuadTreeWorld*>(mTerrain.get())->addChunkManager(mGroundcover.get());
             mResourceSystem->addResourceManager(mGroundcover.get());
@@ -419,10 +445,9 @@ namespace MWRender
         }
 
         mStateUpdater = new StateUpdater;
-        composite->addController(mStateUpdater);
-        sceneRoot->addUpdateCallback(composite);
+        sceneRoot->addUpdateCallback(mStateUpdater);
 
-        mSharedUniformStateUpdater = new SharedUniformStateUpdater;
+        mSharedUniformStateUpdater = new SharedUniformStateUpdater(groundcover);
         rootNode->addUpdateCallback(mSharedUniformStateUpdater);
 
         mPostProcessor = new PostProcessor(*this, viewer, mRootNode);
@@ -791,15 +816,12 @@ namespace MWRender
             mSky->update(dt);
             mWater->update(dt);
 
-            if (mGroundcoverUpdater)
-            {
-                const MWWorld::Ptr& player = mPlayerAnimation->getPtr();
-                osg::Vec3f playerPos(player.getRefData().getPosition().asVec3());
+            const MWWorld::Ptr& player = mPlayerAnimation->getPtr();
+            osg::Vec3f playerPos(player.getRefData().getPosition().asVec3());
 
-                float windSpeed = mSky->getBaseWindSpeed();
-                mGroundcoverUpdater->setWindSpeed(windSpeed);
-                mGroundcoverUpdater->setPlayerPos(playerPos);
-            }
+            float windSpeed = mSky->getBaseWindSpeed();
+            mSharedUniformStateUpdater->setWindSpeed(windSpeed);
+            mSharedUniformStateUpdater->setPlayerPos(playerPos);
         }
 
         updateNavMesh();
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index b991b08efa..bd8bbe4694 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -70,7 +70,6 @@ namespace DetourNavigator
 
 namespace MWRender
 {
-    class GroundcoverUpdater;
     class StateUpdater;
     class SharedUniformStateUpdater;
 
@@ -279,7 +278,6 @@ namespace MWRender
         std::unique_ptr<TerrainStorage> mTerrainStorage;
         std::unique_ptr<ObjectPaging> mObjectPaging;
         std::unique_ptr<Groundcover> mGroundcover;
-        osg::ref_ptr<GroundcoverUpdater> mGroundcoverUpdater;
         std::unique_ptr<SkyManager> mSky;
         std::unique_ptr<FogManager> mFog;
         std::unique_ptr<ScreenshotManager> mScreenshotManager;

From d9c3ba03f4e846128d318bd09d94a8a900d52899 Mon Sep 17 00:00:00 2001
From: "florent.teppe" <florent.teppe@nadeo.com>
Date: Mon, 20 Sep 2021 21:01:28 +0200
Subject: [PATCH 1344/2859] Uses limits instead of climits

---
 apps/openmw/mwdialogue/keywordsearch.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwdialogue/keywordsearch.hpp b/apps/openmw/mwdialogue/keywordsearch.hpp
index fc6f2a91e8..8ba3349bc8 100644
--- a/apps/openmw/mwdialogue/keywordsearch.hpp
+++ b/apps/openmw/mwdialogue/keywordsearch.hpp
@@ -1,9 +1,9 @@
 #ifndef GAME_MWDIALOGUE_KEYWORDSEARCH_H
 #define GAME_MWDIALOGUE_KEYWORDSEARCH_H
 
-#include <map>
-#include <climits>
 #include <cctype>
+#include <map>
+#include <limits>
 #include <stdexcept>
 #include <vector>
 #include <algorithm>    // std::reverse
@@ -71,7 +71,7 @@ public:
 
     static bool isWhitespaceUTF8(const int utf8Char)
     {
-        if (utf8Char >= 0 && utf8Char <= UCHAR_MAX)
+        if (utf8Char >= 0 && utf8Char <= static_cast<int>( std::numeric_limits<unsigned char>::max()))
         {
             //That function has undefined behavior if the character doesn't fit in unsigned char
             return std::isspace(utf8Char);

From b22fb7a7bf8e7a3e198d1d40bdc12b15f4fc049a Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Tue, 21 Sep 2021 20:39:31 +0000
Subject: [PATCH 1345/2859] consolidate node mask checks (#3125)

* consolidate node mask checks

This PR simplifies a few checks against node masks in object paging by using the osg provided `setTraversalMask`.

* objectpaging.cpp
---
 apps/openmw/mwrender/objectpaging.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index 376c517d59..47eacbe1a2 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -272,7 +272,7 @@ namespace MWRender
          : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
          , mCurrentStateSet(nullptr)
          , mCurrentDistance(0.f)
-         , mAnalyzeMask(analyzeMask) {}
+        { setTraversalMask(analyzeMask); }
 
         typedef std::unordered_map<osg::StateSet*, unsigned int> StateSetCounter;
         struct Result
@@ -283,9 +283,6 @@ namespace MWRender
 
         void apply(osg::Node& node) override
         {
-            if (!(node.getNodeMask() & mAnalyzeMask))
-                return;
-
             if (node.getStateSet())
                 mCurrentStateSet = node.getStateSet();
 
@@ -308,9 +305,6 @@ namespace MWRender
         }
         void apply(osg::Geometry& geom) override
         {
-            if (!(geom.getNodeMask() & mAnalyzeMask))
-                return;
-
             if (osg::Array* array = geom.getVertexArray())
                 mResult.mNumVerts += array->getNumElements();
 
@@ -345,7 +339,6 @@ namespace MWRender
         osg::StateSet* mCurrentStateSet;
         StateSetCounter mGlobalStateSetCounter;
         float mCurrentDistance;
-        osg::Node::NodeMask mAnalyzeMask;
     };
 
     class DebugVisitor : public osg::NodeVisitor

From d38c8c6dcbe76b88ed7b1d8b267d0d10734deec8 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Tue, 21 Sep 2021 20:41:07 +0000
Subject: [PATCH 1346/2859] optimise chunk drawing order (#3116)

* material.cpp

* material.cpp
---
 components/terrain/material.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/components/terrain/material.cpp b/components/terrain/material.cpp
index 28297fb456..22f507b3a2 100644
--- a/components/terrain/material.cpp
+++ b/components/terrain/material.cpp
@@ -199,7 +199,6 @@ namespace Terrain
         std::vector<osg::ref_ptr<osg::StateSet> > passes;
 
         unsigned int blendmapIndex = 0;
-        unsigned int passIndex = 0;
         for (std::vector<TextureLayer>::const_iterator it = layers.begin(); it != layers.end(); ++it)
         {
             bool firstLayer = (it == layers.begin());
@@ -209,7 +208,7 @@ namespace Terrain
             if (!blendmaps.empty())
             {
                 stateset->setMode(GL_BLEND, osg::StateAttribute::ON);
-                stateset->setRenderBinDetails(passIndex++, "RenderBin");
+                stateset->setRenderBinDetails(firstLayer ? 0 : 1, "RenderBin");
                 if (!firstLayer)
                 {
                     stateset->setAttributeAndModes(BlendFunc::value(), osg::StateAttribute::ON);

From 5893b8840935b86843066cf82d7dd9e7fee469aa Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Wed, 22 Sep 2021 01:46:04 +0200
Subject: [PATCH 1347/2859] Ignore time to destination when giving way (#6296)

---
 apps/openmw/mwmechanics/actors.cpp | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 37b438aefa..f4cb40c2f5 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1807,6 +1807,7 @@ namespace MWMechanics
             // Standing NPCs give way to moving ones if they are not in combat (or pursue) mode and either
             // follow player or have a AIWander package with non-empty wander area.
             bool shouldAvoidCollision = isMoving;
+            bool shouldGiveWay = false;
             bool shouldTurnToApproachingActor = !isMoving;
             MWWorld::Ptr currentTarget; // Combat or pursue target (NPCs should not avoid collision with their targets).
             const auto& aiSequence = ptr.getClass().getCreatureStats(ptr).getAiSequence();
@@ -1817,7 +1818,7 @@ namespace MWMechanics
                 else if (package->getTypeId() == AiPackageTypeId::Wander && giveWayWhenIdle)
                 {
                     if (!static_cast<const AiWander*>(package.get())->isStationary())
-                        shouldAvoidCollision = true;
+                        shouldGiveWay = true;
                 }
                 else if (package->getTypeId() == AiPackageTypeId::Combat || package->getTypeId() == AiPackageTypeId::Pursue)
                 {
@@ -1827,7 +1828,7 @@ namespace MWMechanics
                     break;
                 }
             }
-            if (!shouldAvoidCollision)
+            if (!shouldAvoidCollision && !shouldGiveWay)
                 continue;
 
             osg::Vec2f baseSpeed = origMovement * maxSpeed;
@@ -1836,14 +1837,14 @@ namespace MWMechanics
             const osg::Vec3f halfExtents = world->getHalfExtents(ptr);
             float maxDistToCheck = isMoving ? maxDistForPartialAvoiding : maxDistForStrictAvoiding;
 
-            float timeToCollision = maxTimeToCheck;
+            float timeToCheck = maxTimeToCheck;
+            if (!shouldGiveWay && !aiSequence.isEmpty())
+                timeToCheck = std::min(timeToCheck, getTimeToDestination(**aiSequence.begin(), basePos, maxSpeed, duration, halfExtents));
+
+            float timeToCollision = timeToCheck;
             osg::Vec2f movementCorrection(0, 0);
             float angleToApproachingActor = 0;
 
-            const float timeToDestination = aiSequence.isEmpty()
-                    ? std::numeric_limits<float>::max()
-                    : getTimeToDestination(**aiSequence.begin(), basePos, maxSpeed, duration, halfExtents);
-
             // Iterate through all other actors and predict collisions.
             for(PtrActorMap::iterator otherIter(mActors.begin()); otherIter != mActors.end(); ++otherIter)
             {
@@ -1880,7 +1881,7 @@ namespace MWMechanics
                     continue; // No solution; distance is always >= collisionDist.
                 float t = (-vr - std::sqrt(Dh)) / v2;
 
-                if (t < 0 || t > timeToCollision || t > timeToDestination)
+                if (t < 0 || t > timeToCollision)
                     continue;
 
                 // Check visibility and awareness last as it's expensive.
@@ -1900,7 +1901,7 @@ namespace MWMechanics
                     movementCorrection.y() *= 0.5f;
             }
 
-            if (timeToCollision < maxTimeToCheck)
+            if (timeToCollision < timeToCheck)
             {
                 // Try to evade the nearest collision.
                 osg::Vec2f newMovement = origMovement + movementCorrection;

From e641bea606171542ab52f5c7e099b030d2ed4aac Mon Sep 17 00:00:00 2001
From: Pi03k <pi03k87@gmail.com>
Date: Sun, 19 Sep 2021 19:07:54 +0200
Subject: [PATCH 1348/2859] Toggling table columns visibility

---
 apps/opencs/CMakeLists.txt                    |  2 +-
 apps/opencs/view/world/scenesubview.hpp       |  1 -
 apps/opencs/view/world/table.cpp              |  3 +
 .../world/tableheadermouseeventhandler.cpp    | 64 +++++++++++++++++++
 .../world/tableheadermouseeventhandler.hpp    | 25 ++++++++
 5 files changed, 93 insertions(+), 2 deletions(-)
 create mode 100644 apps/opencs/view/world/tableheadermouseeventhandler.cpp
 create mode 100644 apps/opencs/view/world/tableheadermouseeventhandler.hpp

diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 0ffa3da559..952bbbdbda 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -71,7 +71,7 @@ opencs_units (view/world
     cellcreator pathgridcreator referenceablecreator startscriptcreator referencecreator scenesubview
     infocreator scriptedit dialoguesubview previewsubview regionmap dragrecordtable nestedtable
     dialoguespinbox recordbuttonbar tableeditidaction scripterrortable extendedcommandconfigurator
-    bodypartcreator landtexturecreator landcreator
+    bodypartcreator landtexturecreator landcreator tableheadermouseeventhandler
     )
 
 opencs_units (view/world
diff --git a/apps/opencs/view/world/scenesubview.hpp b/apps/opencs/view/world/scenesubview.hpp
index aabb7ca2a7..53cd54e7ac 100644
--- a/apps/opencs/view/world/scenesubview.hpp
+++ b/apps/opencs/view/world/scenesubview.hpp
@@ -32,7 +32,6 @@ namespace CSVWidget
 
 namespace CSVWorld
 {
-    class Table;
     class TableBottomBox;
     class CreatorFactoryBase;
 
diff --git a/apps/opencs/view/world/table.cpp b/apps/opencs/view/world/table.cpp
index 2834159b7f..643396a057 100644
--- a/apps/opencs/view/world/table.cpp
+++ b/apps/opencs/view/world/table.cpp
@@ -28,6 +28,7 @@
 #include "../../model/prefs/shortcut.hpp"
 
 #include "tableeditidaction.hpp"
+#include "tableheadermouseeventhandler.hpp"
 #include "util.hpp"
 
 void CSVWorld::Table::contextMenuEvent (QContextMenuEvent *event)
@@ -422,6 +423,8 @@ CSVWorld::Table::Table (const CSMWorld::UniversalId& id,
     connect (&CSMPrefs::State::get(), SIGNAL (settingChanged (const CSMPrefs::Setting *)),
         this, SLOT (settingChanged (const CSMPrefs::Setting *)));
     CSMPrefs::get()["ID Tables"].update();
+
+    new TableHeaderMouseEventHandler(this);
 }
 
 void CSVWorld::Table::setEditLock (bool locked)
diff --git a/apps/opencs/view/world/tableheadermouseeventhandler.cpp b/apps/opencs/view/world/tableheadermouseeventhandler.cpp
new file mode 100644
index 0000000000..866c6149db
--- /dev/null
+++ b/apps/opencs/view/world/tableheadermouseeventhandler.cpp
@@ -0,0 +1,64 @@
+#include "tableheadermouseeventhandler.hpp"
+#include "dragrecordtable.hpp"
+
+#include <QMenu>
+#include <QPoint>
+
+namespace CSVWorld
+{
+
+TableHeaderMouseEventHandler::TableHeaderMouseEventHandler(DragRecordTable * parent)
+    : QWidget(parent)
+    , table(*parent)
+    , header(*table.horizontalHeader())
+{
+    header.setContextMenuPolicy(Qt::ContextMenuPolicy::CustomContextMenu);
+    connect(
+        &header, &QHeaderView::customContextMenuRequested, [=](const QPoint & position) { showContextMenu(position); });
+
+    header.viewport()->installEventFilter(this);
+}
+
+bool TableHeaderMouseEventHandler::eventFilter(QObject * tableWatched, QEvent * event)
+{
+    if (event->type() == QEvent::Type::MouseButtonPress)
+    {
+        auto & clickEvent = static_cast<QMouseEvent &>(*event);
+        if ((clickEvent.button() == Qt::MiddleButton))
+        {
+            const auto & index = table.indexAt(clickEvent.pos());
+            table.setColumnHidden(index.column(), true);
+            clickEvent.accept();
+            return true;
+        }
+    }
+    return false;
+}
+
+void TableHeaderMouseEventHandler::showContextMenu(const QPoint & position)
+{
+    auto & menu{createContextMenu()};
+    menu.popup(header.viewport()->mapToGlobal(position));
+}
+
+QMenu & TableHeaderMouseEventHandler::createContextMenu()
+{
+    auto * menu = new QMenu(this);
+    for (int i = 0; i < table.model()->columnCount(); ++i)
+    {
+        const auto & name = table.model()->headerData(i, Qt::Horizontal, Qt::DisplayRole);
+        QAction * action{new QAction(name.toString(), this)};
+        action->setCheckable(true);
+        action->setChecked(!table.isColumnHidden(i));
+        menu->addAction(action);
+
+        connect(action, &QAction::triggered, [=]() {
+            table.setColumnHidden(i, !action->isChecked());
+            action->setChecked(!action->isChecked());
+            action->toggle();
+        });
+    }
+    return *menu;
+}
+
+} // namespace CSVWorld
diff --git a/apps/opencs/view/world/tableheadermouseeventhandler.hpp b/apps/opencs/view/world/tableheadermouseeventhandler.hpp
new file mode 100644
index 0000000000..934bc1dbb7
--- /dev/null
+++ b/apps/opencs/view/world/tableheadermouseeventhandler.hpp
@@ -0,0 +1,25 @@
+#pragma once
+
+#include <QHeaderView>
+#include <QtGui>
+
+namespace CSVWorld
+{
+class DragRecordTable;
+
+class TableHeaderMouseEventHandler : public QWidget
+{
+public:
+    explicit TableHeaderMouseEventHandler(DragRecordTable * parent);
+
+    void showContextMenu(const QPoint &);
+
+private:
+    DragRecordTable & table;
+    QHeaderView & header;
+
+    QMenu & createContextMenu();
+    bool eventFilter(QObject *, QEvent *) override;
+
+}; // class TableHeaderMouseEventHandler
+} // namespace CSVWorld

From d36595e09efd85bf9d419b97bc50d9e4c37533c2 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 23 Sep 2021 01:47:19 +0200
Subject: [PATCH 1349/2859] Make sure PathFinder::getClosestPoint is not called
 with failing precondition

Pathgrid should be not nullptr and points should be not empty.
---
 apps/openmw/mwmechanics/aicombat.cpp | 2 +-
 apps/openmw/mwmechanics/aiwander.cpp | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index 4b490d7bc8..eb139c918d 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -348,7 +348,7 @@ namespace MWMechanics
 
                         bool runFallback = true;
 
-                        if (pathgrid && !actor.getClass().isPureWaterCreature(actor))
+                        if (pathgrid != nullptr && !pathgrid->mPoints.empty() && !actor.getClass().isPureWaterCreature(actor))
                         {
                             ESM::Pathgrid::PointList points;
                             Misc::CoordinateConverter coords(storage.mCell->getCell());
diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 19365bcb08..624abe10f9 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -758,6 +758,9 @@ namespace MWMechanics
         const ESM::Pathgrid *pathgrid =
             MWBase::Environment::get().getWorld()->getStore().get<ESM::Pathgrid>().search(*currentCell->getCell());
 
+        if (pathgrid == nullptr || pathgrid->mPoints.empty())
+            return;
+
         int index = PathFinder::getClosestPoint(pathgrid, PathFinder::makeOsgVec3(dest));
 
         getPathGridGraph(currentCell).getNeighbouringPoints(index, points);

From b676d93e03f52645d827da19d87659f6343c6650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Mocquillon?= <cedric.mocquillon@gmail.com>
Date: Thu, 23 Sep 2021 18:47:59 +0200
Subject: [PATCH 1350/2859] Use a pair of iterator to represents a range for
 directory listing

---
 components/vfs/manager.cpp | 19 ++++++++++--
 components/vfs/manager.hpp | 63 ++++++++++++++------------------------
 2 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/components/vfs/manager.cpp b/components/vfs/manager.cpp
index 1cb8745497..faebc782aa 100644
--- a/components/vfs/manager.cpp
+++ b/components/vfs/manager.cpp
@@ -105,8 +105,23 @@ namespace VFS
         return {};
     }
 
-    RecursiveDirectoryIterator Manager::getRecursiveDirectoryIterator(const std::string& path) const
+    namespace
     {
-        return RecursiveDirectoryIterator(mIndex, normalizeFilename(path));
+        bool startsWith(std::string_view text, std::string_view start)
+        {
+            return text.rfind(start, 0) == 0;
+        }
+    }
+
+    Manager::RecursiveDirectoryRange Manager::getRecursiveDirectoryIterator(const std::string& path) const
+    {
+        if (path.empty())
+            return { mIndex.begin(), mIndex.end() };
+        auto normalized = normalizeFilename(path);
+        const auto it = mIndex.lower_bound(normalized);
+        if (it == mIndex.end() || !startsWith(it->first, normalized))
+            return { it, it };
+        ++normalized.back();
+        return { it, mIndex.lower_bound(normalized) };
     }
 }
diff --git a/components/vfs/manager.hpp b/components/vfs/manager.hpp
index b98d8021d4..8568e8e784 100644
--- a/components/vfs/manager.hpp
+++ b/components/vfs/manager.hpp
@@ -12,51 +12,19 @@ namespace VFS
     class Archive;
     class File;
 
-    class RecursiveDirectoryIterator;
-    RecursiveDirectoryIterator end(const RecursiveDirectoryIterator& iter);
-
-    class RecursiveDirectoryIterator
+    template <typename Iterator>
+    class IteratorPair
     {
     public:
-        RecursiveDirectoryIterator(const std::map<std::string, File*>& index, const std::string& path)
-            : mPath(path)
-            , mIndex(&index)
-            , mIt(index.lower_bound(path))
-        {}
-
-        RecursiveDirectoryIterator(const RecursiveDirectoryIterator&) = default;
-
-        const std::string& operator*() const { return mIt->first; }
-        const std::string* operator->() const { return &mIt->first; }
-
-        bool operator!=(const RecursiveDirectoryIterator& other) { return mPath != other.mPath || mIt != other.mIt; }
-
-        RecursiveDirectoryIterator& operator++()
-        {
-            if (++mIt == mIndex->end() || !starts_with(mIt->first, mPath))
-                *this = end(*this);
-            return *this;
-        }
-
-        friend RecursiveDirectoryIterator end(const RecursiveDirectoryIterator& iter);
+        IteratorPair(Iterator first, Iterator last) : mFirst(first), mLast(last) {}
+        Iterator begin() const { return mFirst; }
+        Iterator end() const { return mLast; }
 
     private:
-        static bool starts_with(const std::string& text, const std::string& start) { return text.rfind(start, 0) == 0; }
-
-        std::string mPath;
-        const std::map<std::string, File*>* mIndex;
-        std::map<std::string, File*>::const_iterator mIt;
+        Iterator mFirst;
+        Iterator mLast;
     };
 
-    inline RecursiveDirectoryIterator begin(RecursiveDirectoryIterator iter) { return iter; }
-
-    inline RecursiveDirectoryIterator end(const RecursiveDirectoryIterator& iter)
-    {
-        RecursiveDirectoryIterator result(iter);
-        result.mIt = result.mIndex->end();
-        return result;
-    }
-
     /// @brief The main class responsible for loading files from a virtual file system.
     /// @par Various archive types (e.g. directories on the filesystem, or compressed archives)
     /// can be registered, and will be merged into a single file tree. If the same filename is
@@ -64,6 +32,21 @@ namespace VFS
     /// @par Most of the methods in this class are considered thread-safe, see each method documentation for details.
     class Manager
     {
+        class RecursiveDirectoryIterator
+        {
+        public:
+            RecursiveDirectoryIterator(std::map<std::string, File*>::const_iterator it) : mIt(it) {}
+            const std::string& operator*() const { return mIt->first; }
+            const std::string* operator->() const { return &mIt->first; }
+            bool operator!=(const RecursiveDirectoryIterator& other) { return mIt != other.mIt; }
+            RecursiveDirectoryIterator& operator++() { ++mIt; return *this; }
+
+        private:
+            std::map<std::string, File*>::const_iterator mIt;
+        };
+
+        using RecursiveDirectoryRange = IteratorPair<RecursiveDirectoryIterator>;
+
     public:
         /// @param strict Use strict path handling? If enabled, no case folding will
         /// be done, but slash/backslash conversions are always done.
@@ -105,7 +88,7 @@ namespace VFS
         /// In practice it return all files of the VFS starting with the given path
         /// @note the path is normalized
         /// @note May be called from any thread once the index has been built.
-        RecursiveDirectoryIterator getRecursiveDirectoryIterator(const std::string& path) const;
+        RecursiveDirectoryRange getRecursiveDirectoryIterator(const std::string& path) const;
 
     private:
         bool mStrict;

From 98a7d90ee258ceef9c70b0b2955d0458ec46f048 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 24 Sep 2021 19:40:29 +0200
Subject: [PATCH 1351/2859] Assume SIGSTKSZ is not a constant

SIGSTKSZ is not defined as constant since glibc 2.34:
https://sourceware.org/git/?p=glibc.git;a=commit;h=6c57d320484988e87e446e2e60ce42816bf51d53
---
 components/crashcatcher/crashcatcher.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/components/crashcatcher/crashcatcher.cpp b/components/crashcatcher/crashcatcher.cpp
index 86571e1e3a..c828e1ca81 100644
--- a/components/crashcatcher/crashcatcher.cpp
+++ b/components/crashcatcher/crashcatcher.cpp
@@ -56,8 +56,6 @@ static const char exec_err[] = "!!! Failed to exec debug process\n";
 
 static char argv0[PATH_MAX];
 
-static char altstack[SIGSTKSZ];
-
 
 static struct {
     int signum;
@@ -475,9 +473,10 @@ int crashCatcherInstallHandlers(int argc, char **argv, int num_signals, int *sig
 
     /* Set an alternate signal stack so SIGSEGVs caused by stack overflows
      * still run */
+    static char* altstack = new char [SIGSTKSZ];
     altss.ss_sp = altstack;
     altss.ss_flags = 0;
-    altss.ss_size = sizeof(altstack);
+    altss.ss_size = SIGSTKSZ;
     sigaltstack(&altss, nullptr);
 
     memset(&sa, 0, sizeof(sa));

From 5878b1fce6487206dbabc0dc50ed904ebe33893c Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 24 Sep 2021 22:23:55 +0200
Subject: [PATCH 1352/2859] Use same logic for testing cell as for loading cell

Having different branches makes testing less useful. If something fails in
regular executing it should fail in testing. To make it possible there should
be none differences in the execution paths.
---
 apps/openmw/mwworld/scene.cpp | 131 ++++++++++++++++------------------
 apps/openmw/mwworld/scene.hpp |  10 +--
 2 files changed, 66 insertions(+), 75 deletions(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 89349d329a..e52f5532b4 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -200,13 +200,12 @@ namespace
     struct InsertVisitor
     {
         MWWorld::CellStore& mCell;
-        Loading::Listener& mLoadingListener;
+        Loading::Listener* mLoadingListener;
         bool mOnlyObjects;
-        bool mTest;
 
         std::vector<MWWorld::Ptr> mToInsert;
 
-        InsertVisitor (MWWorld::CellStore& cell, Loading::Listener& loadingListener, bool onlyObjects, bool test);
+        InsertVisitor (MWWorld::CellStore& cell, Loading::Listener* loadingListener, bool onlyObjects);
 
         bool operator() (const MWWorld::Ptr& ptr);
 
@@ -214,8 +213,8 @@ namespace
         void insert(AddObject&& addObject);
     };
 
-    InsertVisitor::InsertVisitor (MWWorld::CellStore& cell, Loading::Listener& loadingListener, bool onlyObjects, bool test)
-    : mCell (cell), mLoadingListener (loadingListener), mOnlyObjects(onlyObjects), mTest(test)
+    InsertVisitor::InsertVisitor (MWWorld::CellStore& cell, Loading::Listener* loadingListener, bool onlyObjects)
+        : mCell(cell), mLoadingListener(loadingListener), mOnlyObjects(onlyObjects)
     {}
 
     bool InsertVisitor::operator() (const MWWorld::Ptr& ptr)
@@ -244,8 +243,8 @@ namespace
                 }
             }
 
-            if (!mTest)
-                mLoadingListener.increaseProgress (1);
+            if (mLoadingListener != nullptr)
+                mLoadingListener->increaseProgress(1);
         }
     }
 
@@ -325,12 +324,12 @@ namespace MWWorld
         mRendering.update (duration, paused);
     }
 
-    void Scene::unloadInactiveCell (CellStore* cell, bool test)
+    void Scene::unloadInactiveCell (CellStore* cell)
     {
         assert(mActiveCells.find(cell) == mActiveCells.end());
         assert(mInactiveCells.find(cell) != mInactiveCells.end());
-        if (!test)
-            Log(Debug::Info) << "Unloading cell " << cell->getCell()->getDescription();
+
+        Log(Debug::Info) << "Unloading cell " << cell->getCell()->getDescription();
 
         ListObjectsVisitor visitor;
 
@@ -351,13 +350,13 @@ namespace MWWorld
         mInactiveCells.erase(cell);
     }
 
-    void Scene::deactivateCell(CellStore* cell, bool test)
+    void Scene::deactivateCell(CellStore* cell)
     {
         assert(mInactiveCells.find(cell) != mInactiveCells.end());
         if (mActiveCells.find(cell) == mActiveCells.end())
             return;
-        if (!test)
-            Log(Debug::Info) << "Deactivate cell " << cell->getCell()->getDescription();
+
+        Log(Debug::Info) << "Deactivate cell " << cell->getCell()->getDescription();
 
         ListAndResetObjectsVisitor visitor;
 
@@ -409,7 +408,7 @@ namespace MWWorld
         mActiveCells.erase(cell);
     }
 
-    void Scene::activateCell (CellStore *cell, Loading::Listener* loadingListener, bool respawn, bool test)
+    void Scene::activateCell(CellStore *cell, Loading::Listener* loadingListener, bool respawn)
     {
         using DetourNavigator::HeightfieldShape;
 
@@ -417,17 +416,14 @@ namespace MWWorld
         assert(mInactiveCells.find(cell) != mInactiveCells.end());
         mActiveCells.insert(cell);
 
-        if (test)
-            Log(Debug::Info) << "Testing cell " << cell->getCell()->getDescription();
-        else
-            Log(Debug::Info) << "Loading cell " << cell->getCell()->getDescription();
+        Log(Debug::Info) << "Loading cell " << cell->getCell()->getDescription();
 
         const auto world = MWBase::Environment::get().getWorld();
 
         const int cellX = cell->getCell()->getGridX();
         const int cellY = cell->getCell()->getGridY();
 
-        if (!test && cell->getCell()->isExterior())
+        if (cell->getCell()->isExterior())
         {
             if (const auto heightField = mPhysics->getHeightField(cellX, cellY))
             {
@@ -466,69 +462,64 @@ namespace MWWorld
         if (respawn)
             cell->respawn();
 
-        insertCell (*cell, loadingListener, false, test);
+        insertCell(*cell, loadingListener, false);
 
         mRendering.addCell(cell);
-        if (!test)
+
+        MWBase::Environment::get().getWindowManager()->addCell(cell);
+        bool waterEnabled = cell->getCell()->hasWater() || cell->isExterior();
+        float waterLevel = cell->getWaterLevel();
+        mRendering.setWaterEnabled(waterEnabled);
+        if (waterEnabled)
         {
-            MWBase::Environment::get().getWindowManager()->addCell(cell);
-            bool waterEnabled = cell->getCell()->hasWater() || cell->isExterior();
-            float waterLevel = cell->getWaterLevel();
-            mRendering.setWaterEnabled(waterEnabled);
-            if (waterEnabled)
-            {
-                mPhysics->enableWater(waterLevel);
-                mRendering.setWaterHeight(waterLevel);
+            mPhysics->enableWater(waterLevel);
+            mRendering.setWaterHeight(waterLevel);
 
-                if (cell->getCell()->isExterior())
-                {
-                    if (const auto heightField = mPhysics->getHeightField(cellX, cellY))
-                    {
-                        const btTransform& transform =heightField->getCollisionObject()->getWorldTransform();
-                        mNavigator.addWater(osg::Vec2i(cellX, cellY), ESM::Land::REAL_SIZE,
-                                            osg::Vec3f(static_cast<float>(transform.getOrigin().x()),
-                                                       static_cast<float>(transform.getOrigin().y()),
-                                                       waterLevel));
-                    }
-                }
-                else
+            if (cell->getCell()->isExterior())
+            {
+                if (const auto heightField = mPhysics->getHeightField(cellX, cellY))
                 {
-                    mNavigator.addWater(osg::Vec2i(cellX, cellY), std::numeric_limits<int>::max(),
-                                        osg::Vec3f(0, 0, waterLevel));
+                    const btTransform& transform =heightField->getCollisionObject()->getWorldTransform();
+                    mNavigator.addWater(osg::Vec2i(cellX, cellY), ESM::Land::REAL_SIZE,
+                                        osg::Vec3f(static_cast<float>(transform.getOrigin().x()),
+                                                   static_cast<float>(transform.getOrigin().y()),
+                                                   waterLevel));
                 }
             }
             else
-                mPhysics->disableWater();
-
-            const auto player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-
-            // The player is loaded before the scene and by default it is grounded, with the scene fully loaded, we validate and correct this.
-            if (player.mCell == cell) // Only run once, during initial cell load.
             {
-                mPhysics->traceDown(player, player.getRefData().getPosition().asVec3(), 10.f);
+                mNavigator.addWater(osg::Vec2i(cellX, cellY), std::numeric_limits<int>::max(),
+                                    osg::Vec3f(0, 0, waterLevel));
             }
+        }
+        else
+            mPhysics->disableWater();
 
-            mNavigator.update(player.getRefData().getPosition().asVec3());
+        const auto player = MWBase::Environment::get().getWorld()->getPlayerPtr();
 
-            if (!cell->isExterior() && !(cell->getCell()->mData.mFlags & ESM::Cell::QuasiEx))
-                mRendering.configureAmbient(cell->getCell());
+        // The player is loaded before the scene and by default it is grounded, with the scene fully loaded, we validate and correct this.
+        if (player.mCell == cell) // Only run once, during initial cell load.
+        {
+            mPhysics->traceDown(player, player.getRefData().getPosition().asVec3(), 10.f);
         }
 
+        mNavigator.update(player.getRefData().getPosition().asVec3());
+
+        if (!cell->isExterior() && !(cell->getCell()->mData.mFlags & ESM::Cell::QuasiEx))
+            mRendering.configureAmbient(cell->getCell());
+
         mPreloader->notifyLoaded(cell);
     }
 
-    void Scene::loadInactiveCell (CellStore *cell, Loading::Listener* loadingListener, bool test)
+    void Scene::loadInactiveCell(CellStore *cell, Loading::Listener* loadingListener)
     {
         assert(mActiveCells.find(cell) == mActiveCells.end());
         assert(mInactiveCells.find(cell) == mInactiveCells.end());
         mInactiveCells.insert(cell);
 
-        if (test)
-            Log(Debug::Info) << "Testing inactive cell " << cell->getCell()->getDescription();
-        else
-            Log(Debug::Info) << "Loading inactive cell " << cell->getCell()->getDescription();
+        Log(Debug::Info) << "Loading inactive cell " << cell->getCell()->getDescription();
 
-        if (!test && cell->getCell()->isExterior())
+        if (cell->getCell()->isExterior())
         {
             float verts = ESM::Land::LAND_SIZE;
             float worldsize = ESM::Land::REAL_SIZE;
@@ -550,7 +541,7 @@ namespace MWWorld
             }
         }
 
-        insertCell (*cell, loadingListener, true, test);
+        insertCell(*cell, loadingListener, true);
     }
 
     void Scene::clear()
@@ -746,8 +737,8 @@ namespace MWWorld
             loadingListener->setLabel("Testing exterior cells ("+std::to_string(i)+"/"+std::to_string(cells.getExtSize())+")...");
 
             CellStore *cell = MWBase::Environment::get().getWorld()->getExterior(it->mData.mX, it->mData.mY);
-            loadInactiveCell (cell, loadingListener, true);
-            activateCell (cell, loadingListener, false, true);
+            loadInactiveCell(cell, nullptr);
+            activateCell(cell, nullptr, false);
 
             auto iter = mInactiveCells.begin();
             while (iter != mInactiveCells.end())
@@ -755,8 +746,8 @@ namespace MWWorld
                 if (it->isExterior() && it->mData.mX == (*iter)->getCell()->getGridX() &&
                     it->mData.mY == (*iter)->getCell()->getGridY())
                 {
-                    deactivateCell(*iter, true);
-                    unloadInactiveCell (*iter, true);
+                    deactivateCell(*iter);
+                    unloadInactiveCell(*iter);
                     break;
                 }
 
@@ -794,8 +785,8 @@ namespace MWWorld
             loadingListener->setLabel("Testing interior cells ("+std::to_string(i)+"/"+std::to_string(cells.getIntSize())+")...");
 
             CellStore *cell = MWBase::Environment::get().getWorld()->getInterior(it->mName);
-            loadInactiveCell (cell, loadingListener, true);
-            activateCell (cell, loadingListener, false, true);
+            loadInactiveCell(cell, nullptr);
+            activateCell(cell, nullptr, false);
 
             auto iter = mInactiveCells.begin();
             while (iter != mInactiveCells.end())
@@ -804,8 +795,8 @@ namespace MWWorld
 
                 if (it->mName == (*iter)->getCell()->mName)
                 {
-                    deactivateCell(*iter, true);
-                    unloadInactiveCell (*iter, true);
+                    deactivateCell(*iter);
+                    unloadInactiveCell(*iter);
                     break;
                 }
 
@@ -988,9 +979,9 @@ namespace MWWorld
         mCellChanged = false;
     }
 
-    void Scene::insertCell (CellStore &cell, Loading::Listener* loadingListener, bool onlyObjects, bool test)
+    void Scene::insertCell (CellStore &cell, Loading::Listener* loadingListener, bool onlyObjects)
     {
-        InsertVisitor insertVisitor (cell, *loadingListener, onlyObjects, test);
+        InsertVisitor insertVisitor(cell, loadingListener, onlyObjects);
         cell.forEach (insertVisitor);
         insertVisitor.insert([&] (const MWWorld::Ptr& ptr) { addObject(ptr, *mPhysics, mRendering, mPagedRefs, onlyObjects); });
         if (!onlyObjects)
diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp
index 75c070dd1e..3f5d7bf2f5 100644
--- a/apps/openmw/mwworld/scene.hpp
+++ b/apps/openmw/mwworld/scene.hpp
@@ -100,7 +100,7 @@ namespace MWWorld
 
             std::vector<osg::ref_ptr<SceneUtil::WorkItem>> mWorkItems;
 
-            void insertCell (CellStore &cell, Loading::Listener* loadingListener, bool onlyObjects, bool test = false);
+            void insertCell(CellStore &cell, Loading::Listener* loadingListener, bool onlyObjects);
             osg::Vec2i mCurrentGridCenter;
 
             // Load and unload cells as necessary to create a cell grid with "X" and "Y" in the center
@@ -116,10 +116,10 @@ namespace MWWorld
             osg::Vec4i gridCenterToBounds(const osg::Vec2i &centerCell) const;
             osg::Vec2i getNewGridCenter(const osg::Vec3f &pos, const osg::Vec2i *currentGridCenter = nullptr) const;
 
-            void unloadInactiveCell (CellStore* cell, bool test = false);
-            void deactivateCell (CellStore* cell, bool test = false);
-            void activateCell (CellStore *cell, Loading::Listener* loadingListener, bool respawn, bool test = false);
-            void loadInactiveCell (CellStore *cell, Loading::Listener* loadingListener, bool test = false);
+            void unloadInactiveCell(CellStore* cell);
+            void deactivateCell(CellStore* cell);
+            void activateCell(CellStore *cell, Loading::Listener* loadingListener, bool respawn);
+            void loadInactiveCell(CellStore *cell, Loading::Listener* loadingListener);
 
         public:
 

From e9f253c473e2343f903e325aa26038568a2eed87 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 19 Sep 2021 19:16:39 +0200
Subject: [PATCH 1353/2859] Support stacked histogram for frames with duration
 over given threshold

---
 scripts/osg_stats.py | 37 ++++++++++++++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/scripts/osg_stats.py b/scripts/osg_stats.py
index 8a36eb5963..037aafea00 100755
--- a/scripts/osg_stats.py
+++ b/scripts/osg_stats.py
@@ -38,7 +38,7 @@ import termtables
 @click.option('--timeseries_sum', is_flag=True,
               help='Add a graph to timeseries for a sum per frame of all given timeseries metrics.')
 @click.option('--commulative_timeseries_sum', is_flag=True,
-            help='Add a graph to timeseries for a sum per frame of all given commulative timeseries.')
+              help='Add a graph to timeseries for a sum per frame of all given commulative timeseries.')
 @click.option('--stats_sum', is_flag=True,
               help='Add a row to stats table for a sum per frame of all given stats metrics.')
 @click.option('--begin_frame', type=int, default=0,
@@ -47,10 +47,17 @@ import termtables
               help='End processing at this frame.')
 @click.option('--frame_number_name', type=str, default='FrameNumber',
               help='Frame number metric name.')
+@click.option('--hist_threshold', type=str, multiple=True,
+              help='Show a histogram for given metric only for frames with threshold_name metric over threshold_value.')
+@click.option('--threshold_name', type=str, default='Frame duration',
+              help='Frame duration metric name.')
+@click.option('--threshold_value', type=float, default=1.05/60,
+              help='Threshold for hist_over.')
 @click.argument('path', type=click.Path(), nargs=-1)
 def main(print_keys, timeseries, hist, hist_ratio, stdev_hist, plot, stats,
          timeseries_sum, stats_sum, begin_frame, end_frame, path,
-         commulative_timeseries, commulative_timeseries_sum, frame_number_name):
+         commulative_timeseries, commulative_timeseries_sum, frame_number_name,
+         hist_threshold, threshold_name, threshold_value):
     sources = {v: list(read_data(v)) for v in path} if path else {'stdin': list(read_data(None))}
     keys = collect_unique_keys(sources)
     frames, begin_frame, end_frame = collect_per_frame(
@@ -76,6 +83,9 @@ def main(print_keys, timeseries, hist, hist_ratio, stdev_hist, plot, stats,
         draw_plots(sources=frames, plots=plot)
     if stats:
         print_stats(sources=frames, keys=stats, stats_sum=stats_sum)
+    if hist_threshold:
+        draw_hist_threshold(sources=frames, keys=hist_threshold, begin_frame=begin_frame,
+                            threshold_name=threshold_name, threshold_value=threshold_value)
     matplotlib.pyplot.show()
 
 
@@ -240,7 +250,6 @@ def print_stats(sources, keys, stats_sum):
         if stats_sum:
             stats.append(make_stats(source=name, key='sum', values=sum_multiple(frames, keys)))
     metrics = list(stats[0].keys())
-    max_key_size = max(len(tuple(v.values())[0]) for v in stats)
     termtables.print(
         [list(v.values()) for v in stats],
         header=metrics,
@@ -248,6 +257,27 @@ def print_stats(sources, keys, stats_sum):
     )
 
 
+def draw_hist_threshold(sources, keys, begin_frame, threshold_name, threshold_value):
+    for name, frames in sources.items():
+        indices = [n for n, v in enumerate(frames[threshold_name]) if v > threshold_value]
+        numbers = [v + begin_frame for v in indices]
+        x = [v for v in range(0, len(indices))]
+        fig, ax = matplotlib.pyplot.subplots()
+        ax.set_title(f'Frames with "{threshold_name}" > {threshold_value} ({len(indices)})')
+        ax.bar(x, [frames[threshold_name][v] for v in indices], label=threshold_name, color='black', alpha=0.2)
+        prev = 0
+        for key in keys:
+            values = [frames[key][v] for v in indices]
+            ax.bar(x, values, bottom=prev, label=key)
+            prev = values
+        ax.hlines(threshold_value, x[0] - 1, x[-1] + 1, color='black', label='threshold', linestyles='dashed')
+        ax.xaxis.set_major_locator(matplotlib.pyplot.FixedLocator(x))
+        ax.xaxis.set_major_formatter(matplotlib.pyplot.FixedFormatter(numbers))
+        ax.grid(True)
+        ax.legend()
+        fig.canvas.set_window_title(f'hist_threshold:{name}')
+
+
 def filter_not_none(values):
     return [v for v in values if v is not None]
 
@@ -282,5 +312,6 @@ def to_number(value):
     except ValueError:
         return float(value)
 
+
 if __name__ == '__main__':
     main()

From 83e0d9aeefd70413d4a04882eed0a8bda03cd19d Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 26 Sep 2021 17:28:51 +0200
Subject: [PATCH 1354/2859] Minor refactoring: use Misc::normalizeAngle in
 worldimp.cpp

---
 apps/openmw/mwworld/worldimp.cpp | 28 ++++------------------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index bc28c2eb7b..9d52d7ee77 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -15,6 +15,7 @@
 #include <components/esm/cellref.hpp>
 
 #include <components/misc/constants.hpp>
+#include <components/misc/mathutil.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/misc/rng.hpp>
 #include <components/misc/convert.hpp>
@@ -76,21 +77,6 @@
 #include "contentloader.hpp"
 #include "esmloader.hpp"
 
-namespace
-{
-
-// Wraps a value to (-PI, PI]
-void wrap(float& rad)
-{
-    const float pi = static_cast<float>(osg::PI);
-    if (rad>0)
-        rad = std::fmod(rad+pi, 2.0f*pi)-pi;
-    else
-        rad = std::fmod(rad-pi, 2.0f*pi)+pi;
-}
-
-}
-
 namespace MWWorld
 {
     struct GameContentLoader : public ContentLoader
@@ -1290,8 +1276,6 @@ namespace MWWorld
 
     void World::rotateObject(const Ptr& ptr, const osg::Vec3f& rot, MWBase::RotationFlags flags)
     {
-        const float pi = static_cast<float>(osg::PI);
-
         ESM::Position pos = ptr.getRefData().getPosition();
         float *objRot = pos.rot;
         if (flags & MWBase::RotationFlag_adjust)
@@ -1313,13 +1297,9 @@ namespace MWWorld
              * currently it's done so for rotating the camera, which needs
              * clamping.
              */
-            const float half_pi = pi/2.f;
-
-            if(objRot[0] < -half_pi)     objRot[0] = -half_pi;
-            else if(objRot[0] > half_pi) objRot[0] =  half_pi;
-
-            wrap(objRot[1]);
-            wrap(objRot[2]);
+            objRot[0] = osg::clampBetween(objRot[0], -osg::PIf / 2, osg::PIf / 2);
+            objRot[1] = Misc::normalizeAngle(objRot[1]);
+            objRot[2] = Misc::normalizeAngle(objRot[2]);
         }
 
         ptr.getRefData().setPosition(pos);

From 413ac067ec8ecc0430b19c275b6ea30589bff435 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Wed, 1 Sep 2021 01:53:23 +0200
Subject: [PATCH 1355/2859] Allow creating omwaddons without a dependency on an
 omwgame

---
 apps/opencs/view/doc/filedialog.cpp           |  2 +-
 .../contentselector/model/contentmodel.cpp    | 24 +++++++------------
 .../contentselector/view/contentselector.cpp  | 15 ++++++------
 .../contentselector/view/contentselector.hpp  |  2 +-
 4 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/apps/opencs/view/doc/filedialog.cpp b/apps/opencs/view/doc/filedialog.cpp
index 69490edca2..8ff063ed31 100644
--- a/apps/opencs/view/doc/filedialog.cpp
+++ b/apps/opencs/view/doc/filedialog.cpp
@@ -161,7 +161,7 @@ void CSVDoc::FileDialog::slotUpdateAcceptButton(const QString &name, bool)
     bool isNew = (mAction == ContentAction_New);
 
     if (isNew)
-        success = success && !(name.isEmpty());
+        success = !name.isEmpty();
     else if (success)
     {
         ContentSelectorModel::EsmFile *file = mSelector->selectedFiles().back();
diff --git a/components/contentselector/model/contentmodel.cpp b/components/contentselector/model/contentmodel.cpp
index 141ad13517..690f968142 100644
--- a/components/contentselector/model/contentmodel.cpp
+++ b/components/contentselector/model/contentmodel.cpp
@@ -107,34 +107,28 @@ Qt::ItemFlags ContentSelectorModel::ContentModel::flags(const QModelIndex &index
 
     // addon can be checked if its gamefile is
     // ... special case, addon with no dependency can be used with any gamefile.
-    bool gamefileChecked = (file->gameFiles().count() == 0);
+    bool gamefileChecked = false;
+    bool noGameFiles = true;
     for (const QString &fileName : file->gameFiles())
     {
         for (QListIterator<EsmFile *> dependencyIter(mFiles); dependencyIter.hasNext(); dependencyIter.next())
         {
             //compare filenames only.  Multiple instances
             //of the filename (with different paths) is not relevant here.
-            bool depFound = (dependencyIter.peekNext()->fileName().compare(fileName, Qt::CaseInsensitive) == 0);
-
-            if (!depFound)
+            EsmFile* depFile = dependencyIter.peekNext();
+            if (!depFile->isGameFile() || depFile->fileName().compare(fileName, Qt::CaseInsensitive) != 0)
                 continue;
 
-            if (!gamefileChecked)
+            noGameFiles = false;
+            if (isChecked(depFile->filePath()))
             {
-                if (isChecked (dependencyIter.peekNext()->filePath()))
-                    gamefileChecked = (dependencyIter.peekNext()->isGameFile());
-            }
-
-            // force it to iterate all files in cases where the current
-            // dependency is a game file to ensure that a later duplicate
-            // game file is / is not checked.
-            // (i.e., break only if it's not a gamefile or the game file has been checked previously)
-            if (gamefileChecked || !(dependencyIter.peekNext()->isGameFile()))
+                gamefileChecked = true;
                 break;
+            }
         }
     }
 
-    if (gamefileChecked)
+    if (gamefileChecked || noGameFiles)
     {
         returnFlags = Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable | Qt::ItemIsDragEnabled;
     }
diff --git a/components/contentselector/view/contentselector.cpp b/components/contentselector/view/contentselector.cpp
index 6bb8e6e2c7..d7996dfae3 100644
--- a/components/contentselector/view/contentselector.cpp
+++ b/components/contentselector/view/contentselector.cpp
@@ -29,14 +29,12 @@ void ContentSelectorView::ContentSelector::buildContentModel()
 
 void ContentSelectorView::ContentSelector::buildGameFileView()
 {
-    ui.gameFileView->setVisible (true);
-
-    ui.gameFileView->setPlaceholderText(QString("Select a game file..."));
+    ui.gameFileView->addItem("<No game file>");
+    ui.gameFileView->setVisible(true);
 
     connect (ui.gameFileView, SIGNAL (currentIndexChanged(int)),
              this, SLOT (slotCurrentGameFileIndexChanged(int)));
 
-    ui.gameFileView->setCurrentIndex(-1);
     ui.gameFileView->setCurrentIndex(0);
 }
 
@@ -108,7 +106,7 @@ void ContentSelectorView::ContentSelector::setProfileContent(const QStringList &
 
 void ContentSelectorView::ContentSelector::setGameFile(const QString &filename)
 {
-    int index = -1;
+    int index = 0;
 
     if (!filename.isEmpty())
     {
@@ -168,10 +166,11 @@ void ContentSelectorView::ContentSelector::addFiles(const QString &path)
         }
     }
 
-    if (ui.gameFileView->currentIndex() != -1)
-        ui.gameFileView->setCurrentIndex(-1);
+    if (ui.gameFileView->currentIndex() != 0)
+        ui.gameFileView->setCurrentIndex(0);
 
     mContentModel->uncheckAll();
+    mContentModel->checkForLoadOrderErrors();
 }
 
 void ContentSelectorView::ContentSelector::clearFiles()
@@ -183,7 +182,7 @@ QString ContentSelectorView::ContentSelector::currentFile() const
 {
     QModelIndex currentIdx = ui.addonView->currentIndex();
 
-    if (!currentIdx.isValid())
+    if (!currentIdx.isValid() && ui.gameFileView->currentIndex() > 0)
         return ui.gameFileView->currentText();
 
     QModelIndex idx = mContentModel->index(mAddonProxyModel->mapToSource(currentIdx).row(), 0, QModelIndex());
diff --git a/components/contentselector/view/contentselector.hpp b/components/contentselector/view/contentselector.hpp
index 1b50f1e5e8..cda68fa1b7 100644
--- a/components/contentselector/view/contentselector.hpp
+++ b/components/contentselector/view/contentselector.hpp
@@ -40,7 +40,7 @@ namespace ContentSelectorView
         void setGameFile (const QString &filename = QString(""));
 
         bool isGamefileSelected() const
-            { return ui.gameFileView->currentIndex() != -1; }
+            { return ui.gameFileView->currentIndex() > 0; }
 
         QWidget *uiWidget() const
             { return ui.contentGroupBox; }

From 5620e8f0e275db5b6b91d8b3d9bbf3fe8621b1b7 Mon Sep 17 00:00:00 2001
From: "florent.teppe" <florent.teppe@nadeo.com>
Date: Sun, 26 Sep 2021 20:40:11 +0200
Subject: [PATCH 1356/2859] Added the fix to the changelog, and my name to the
 authors

---
 AUTHORS.md   | 1 +
 CHANGELOG.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/AUTHORS.md b/AUTHORS.md
index 62121a797b..a1f00bca10 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -80,6 +80,7 @@ Programmers
     Federico Guerra (FedeWar)
     Fil Krynicki (filkry)
     Finbar Crago (finbar-crago)
+    Florent Teppe (Tetramir)
     Florian Weber (Florianjw)
     Frédéric Chardon (fr3dz10)
     Gaëtan Dezeiraud (Brouilles)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f81a490b49..80fc4aac02 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,7 @@
     Bug #6184: Command and Calm and Demoralize and Frenzy and Rally magic effects inconsistencies with vanilla
     Bug #6197: Infinite Casting Loop
     Bug #6273: Respawning NPCs rotation is inconsistent
+    Bug #6289: Keyword search in dialogues expected the text to be all ASCII characters 
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
     Feature #2780: A way to see current OpenMW version in the console
     Feature #3616: Allow Zoom levels on the World Map

From c679565893f1480205eb4438cf60aca1514f5cdc Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 16 Sep 2021 18:06:46 +0200
Subject: [PATCH 1357/2859] Make names starting with digits use normal name
 parsing code

---
 CHANGELOG.md                    |  1 +
 components/compiler/scanner.cpp | 25 +++----------------------
 components/compiler/scanner.hpp |  2 +-
 3 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b9ea47c56..73588cb749 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,7 @@
     Bug #6184: Command and Calm and Demoralize and Frenzy and Rally magic effects inconsistencies with vanilla
     Bug #6197: Infinite Casting Loop
     Bug #6273: Respawning NPCs rotation is inconsistent
+    Bug #6282: Laura craft doesn't follow the player character
     Bug #6289: Keyword search in dialogues expected the text to be all ASCII characters 
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
     Feature #2780: A way to see current OpenMW version in the console
diff --git a/components/compiler/scanner.cpp b/components/compiler/scanner.cpp
index cd607b2e73..1054e2e269 100644
--- a/components/compiler/scanner.cpp
+++ b/components/compiler/scanner.cpp
@@ -164,8 +164,6 @@ namespace Compiler
         std::string value;
         c.appendTo(value);
 
-        bool error = false;
-
         while (get (c))
         {
             if (c.isDigit())
@@ -174,16 +172,11 @@ namespace Compiler
             }
             else if (!c.isMinusSign() && isStringCharacter (c))
             {
-                error = true;
-                c.appendTo(value);
+                /// workaround that allows names to begin with digits
+                return scanName(c, parser, cont, value);
             }
             else if (c=='.')
             {
-                if (error)
-                {
-                    putback (c);
-                    break;
-                }
                 return scanFloat (value, parser, cont);
             }
             else
@@ -193,17 +186,6 @@ namespace Compiler
             }
         }
 
-        if (error)
-        {
-            /// workaround that allows names to begin with digits
-            /// \todo disable
-            TokenLoc loc (mLoc);
-            mLoc.mLiteral.clear();
-            cont = parser.parseName (value, loc, *this);
-            return true;
-//            return false;
-        }
-
         TokenLoc loc (mLoc);
         mLoc.mLiteral.clear();
 
@@ -268,9 +250,8 @@ namespace Compiler
         nullptr
     };
 
-    bool Scanner::scanName (MultiChar& c, Parser& parser, bool& cont)
+    bool Scanner::scanName (MultiChar& c, Parser& parser, bool& cont, std::string name)
     {
-        std::string name;
         c.appendTo(name);
 
         if (!scanName (name))
diff --git a/components/compiler/scanner.hpp b/components/compiler/scanner.hpp
index 7901297325..8ee2672132 100644
--- a/components/compiler/scanner.hpp
+++ b/components/compiler/scanner.hpp
@@ -236,7 +236,7 @@ namespace Compiler
 
             bool scanFloat (const std::string& intValue, Parser& parser, bool& cont);
 
-            bool scanName (MultiChar& c, Parser& parser, bool& cont);
+            bool scanName (MultiChar& c, Parser& parser, bool& cont, std::string name = {});
 
             /// \param name May contain the start of the name (one or more characters)
             bool scanName (std::string& name);

From 34cf66139ab2ef9313bf5f9df31943b2a801eb60 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 16 Sep 2021 16:56:13 +0200
Subject: [PATCH 1358/2859] Make GetCurrentAIPackage return -1 for non-actors
 and dead actors

---
 CHANGELOG.md                          |  1 +
 apps/openmw/mwscript/aiextensions.cpp | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b9ea47c56..aa117463dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,7 @@
     Bug #6184: Command and Calm and Demoralize and Frenzy and Rally magic effects inconsistencies with vanilla
     Bug #6197: Infinite Casting Loop
     Bug #6273: Respawning NPCs rotation is inconsistent
+    Bug #6283: Avis Dorsey follows you after her death
     Bug #6289: Keyword search in dialogues expected the text to be all ASCII characters 
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
     Feature #2780: A way to see current OpenMW version in the console
diff --git a/apps/openmw/mwscript/aiextensions.cpp b/apps/openmw/mwscript/aiextensions.cpp
index d4de8ded5d..c5a4bb6dfc 100644
--- a/apps/openmw/mwscript/aiextensions.cpp
+++ b/apps/openmw/mwscript/aiextensions.cpp
@@ -362,7 +362,15 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    const auto value = static_cast<Interpreter::Type_Integer>(ptr.getClass().getCreatureStats (ptr).getAiSequence().getLastRunTypeId());
+                    Interpreter::Type_Integer value = -1;
+                    if(ptr.getClass().isActor())
+                    {
+                        const auto& stats = ptr.getClass().getCreatureStats(ptr);
+                        if(!stats.isDead() || !stats.isDeathAnimationFinished())
+                        {
+                            value = static_cast<Interpreter::Type_Integer>(stats.getAiSequence().getLastRunTypeId());
+                        }
+                    }
 
                     runtime.push (value);
                 }

From c6f7137ee1da615f602c18f365373d5d324481ac Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Mon, 27 Sep 2021 18:41:24 +0000
Subject: [PATCH 1359/2859] fixes bugs with share state (#3111)

* optimizer.cpp merge fix

* objectpaging.cpp

* optimizer.hpp setSharedStateManager

* optimizer.cpp shareState

* scenemanager.cpp shareState

* scenemanager.cpp

* optimizer.cpp

* optimizer.cpp

* scenemanager.cpp

* optimizer.cpp
---
 apps/openmw/mwrender/objectpaging.cpp |  2 +-
 components/resource/scenemanager.cpp  | 12 ++++--------
 components/sceneutil/optimizer.cpp    | 12 +++++++++++-
 components/sceneutil/optimizer.hpp    | 13 ++++++++++++-
 4 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index 47eacbe1a2..88c3d4ba02 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -651,7 +651,7 @@ namespace MWRender
             }
             optimizer.setIsOperationPermissibleForObjectCallback(new CanOptimizeCallback);
             unsigned int options = SceneUtil::Optimizer::FLATTEN_STATIC_TRANSFORMS|SceneUtil::Optimizer::REMOVE_REDUNDANT_NODES|SceneUtil::Optimizer::MERGE_GEOMETRY;
-            mSceneManager->shareState(mergeGroup);
+
             optimizer.optimize(mergeGroup, options);
 
             group->addChild(mergeGroup);
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index b468b430ff..cc38144794 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -659,22 +659,18 @@ namespace Resource
             osg::ref_ptr<Shader::ShaderVisitor> shaderVisitor (createShaderVisitor());
             loaded->accept(*shaderVisitor);
 
-            // share state
-            // do this before optimizing so the optimizer will be able to combine nodes more aggressively
-            // note, because StateSets will be shared at this point, StateSets can not be modified inside the optimizer
-            mSharedStateMutex.lock();
-            mSharedStateManager->share(loaded.get());
-            mSharedStateMutex.unlock();
-
             if (canOptimize(normalized))
             {
                 SceneUtil::Optimizer optimizer;
+                optimizer.setSharedStateManager(mSharedStateManager, &mSharedStateMutex);
                 optimizer.setIsOperationPermissibleForObjectCallback(new CanOptimizeCallback);
 
-                static const unsigned int options = getOptimizationOptions();
+                static const unsigned int options = getOptimizationOptions()|SceneUtil::Optimizer::SHARE_DUPLICATE_STATE;
 
                 optimizer.optimize(loaded, options);
             }
+            else
+                shareState(loaded);
 
             if (compile && mIncrementalCompileOperation)
                 mIncrementalCompileOperation->add(loaded);
diff --git a/components/sceneutil/optimizer.cpp b/components/sceneutil/optimizer.cpp
index 5fbeb681fc..dffbe62ec7 100644
--- a/components/sceneutil/optimizer.cpp
+++ b/components/sceneutil/optimizer.cpp
@@ -30,6 +30,8 @@
 #include <osg/io_utils>
 #include <osg/Depth>
 
+#include <osgDB/SharedStateManager>
+
 #include <osgUtil/TransformAttributeFunctor>
 #include <osgUtil/Statistics>
 #include <osgUtil/MeshOptimizers>
@@ -84,6 +86,13 @@ void Optimizer::optimize(osg::Node* node, unsigned int options)
         cstv.removeTransforms(node);
     }
 
+    if (options & SHARE_DUPLICATE_STATE && _sharedStateManager)
+    {
+        if (_sharedStateMutex) _sharedStateMutex->lock();
+        _sharedStateManager->share(node);
+        if (_sharedStateMutex) _sharedStateMutex->unlock();
+    }
+
     if (options & REMOVE_REDUNDANT_NODES)
     {
         OSG_INFO<<"Optimizer::optimize() doing REMOVE_REDUNDANT_NODES"<<std::endl;
@@ -741,7 +750,8 @@ bool Optimizer::CombineStaticTransformsVisitor::removeTransforms(osg::Node* node
         if (transform->getNumChildren()==1 &&
             transform->getChild(0)->asTransform()!=0 &&
             transform->getChild(0)->asTransform()->asMatrixTransform()!=0 &&
-            transform->getChild(0)->asTransform()->getDataVariance()==osg::Object::STATIC)
+            (!transform->getChild(0)->getStateSet() || transform->getChild(0)->getStateSet()->referenceCount()==1) &&
+            transform->getChild(0)->getDataVariance()==osg::Object::STATIC)
         {
             // now combine with its child.
             osg::MatrixTransform* child = transform->getChild(0)->asTransform()->asMatrixTransform();
diff --git a/components/sceneutil/optimizer.hpp b/components/sceneutil/optimizer.hpp
index 2d6293e231..7b32bafee2 100644
--- a/components/sceneutil/optimizer.hpp
+++ b/components/sceneutil/optimizer.hpp
@@ -25,6 +25,12 @@
 //#include <osgUtil/Export>
 
 #include <set>
+#include <mutex>
+
+namespace osgDB
+{
+    class SharedStateManager;
+}
 
 //namespace osgUtil {
 namespace SceneUtil {
@@ -65,7 +71,7 @@ class Optimizer
 
     public:
 
-        Optimizer() : _mergeAlphaBlending(false) {}
+        Optimizer() : _mergeAlphaBlending(false), _sharedStateManager(nullptr), _sharedStateMutex(nullptr) {}
         virtual ~Optimizer() {}
 
         enum OptimizationOptions
@@ -121,6 +127,8 @@ class Optimizer
         void setMergeAlphaBlending(bool merge) { _mergeAlphaBlending = merge; }
         void setViewPoint(const osg::Vec3f& viewPoint) { _viewPoint = viewPoint; }
 
+        void setSharedStateManager(osgDB::SharedStateManager* sharedStateManager, std::mutex* sharedStateMutex) { _sharedStateMutex = sharedStateMutex; _sharedStateManager = sharedStateManager; }
+
         /** Reset internal data to initial state - the getPermissibleOptionsMap is cleared.*/
         void reset();
 
@@ -258,6 +266,9 @@ class Optimizer
         osg::Vec3f _viewPoint;
         bool _mergeAlphaBlending;
 
+        osgDB::SharedStateManager* _sharedStateManager;
+        mutable std::mutex* _sharedStateMutex;
+
     public:
 
         /** Flatten Static Transform nodes by applying their transform to the

From 449539c0ed66484c9837a2d752de8c9905943bb7 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Mon, 27 Sep 2021 19:04:38 +0000
Subject: [PATCH 1360/2859] Update CHANGELOG.md

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b9ea47c56..cc824b7540 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,7 +37,8 @@
     Bug #6184: Command and Calm and Demoralize and Frenzy and Rally magic effects inconsistencies with vanilla
     Bug #6197: Infinite Casting Loop
     Bug #6273: Respawning NPCs rotation is inconsistent
-    Bug #6289: Keyword search in dialogues expected the text to be all ASCII characters 
+    Bug #6289: Keyword search in dialogues expected the text to be all ASCII characters
+    Feature #890: OpenMW-CS: Column filtering
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
     Feature #2780: A way to see current OpenMW version in the console
     Feature #3616: Allow Zoom levels on the World Map

From 3f68ddd8f4b44be062e122c7ef73a3f558274a6f Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Mon, 27 Sep 2021 19:25:39 +0000
Subject: [PATCH 1361/2859] alternate debug chunks (#3127)

* quadtreeworld.cpp

* chunkmanager.cpp

* chunkmanager.hpp

* quadtreeworld.hpp

* chunkmanager.cpp

* quadtreeworld.cpp

* quadtreeworld.cpp

* quadtreeworld.cpp [ci skip]

* quadtreeworld.hpp

* quadtreeworld.cpp

* quadtreeworld.cpp

* quadtreeworld.cpp

* chunkmanager.cpp

* chunkmanager.cpp
---
 components/terrain/chunkmanager.cpp  | 18 --------------
 components/terrain/chunkmanager.hpp  |  1 -
 components/terrain/quadtreeworld.cpp | 37 ++++++++++++++++++++++------
 components/terrain/quadtreeworld.hpp |  3 +++
 4 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/components/terrain/chunkmanager.cpp b/components/terrain/chunkmanager.cpp
index 7a6d4fdb0a..476805aa3c 100644
--- a/components/terrain/chunkmanager.cpp
+++ b/components/terrain/chunkmanager.cpp
@@ -3,9 +3,7 @@
 #include <sstream>
 
 #include <osg/Texture2D>
-#include <osg/ClusterCullingCallback>
 #include <osg/Material>
-#include <osg/MatrixTransform>
 
 #include <osgUtil/IncrementalCompileOperation>
 
@@ -13,14 +11,12 @@
 #include <components/resource/scenemanager.hpp>
 
 #include <components/sceneutil/lightmanager.hpp>
-#include <components/settings/settings.hpp>
 
 #include "terraindrawable.hpp"
 #include "material.hpp"
 #include "storage.hpp"
 #include "texturemanager.hpp"
 #include "compositemaprenderer.hpp"
-#include <components/misc/constants.hpp>
 
 namespace Terrain
 {
@@ -35,7 +31,6 @@ ChunkManager::ChunkManager(Storage *storage, Resource::SceneManager *sceneMgr, T
     , mCompositeMapSize(512)
     , mCompositeMapLevel(1.f)
     , mMaxCompGeometrySize(1.f)
-    , mDebugChunks(Settings::Manager::getBool("debug chunks", "Terrain"))
 {
     mMultiPassRoot = new osg::StateSet;
     mMultiPassRoot->setRenderingHint(osg::StateSet::OPAQUE_BIN);
@@ -238,19 +233,6 @@ osg::ref_ptr<osg::Node> ChunkManager::createChunk(float chunkSize, const osg::Ve
     }
     geometry->setNodeMask(mNodeMask);
 
-    if (mDebugChunks)
-    {
-        osg::ref_ptr<osg::Group> result(new osg::Group);
-        result->addChild(geometry);
-        auto chunkBorder = CellBorder::createBorderGeometry(chunkCenter.x() - chunkSize / 2.f, chunkCenter.y() - chunkSize / 2.f, chunkSize, mStorage, mSceneManager, getNodeMask(), 5.f, { 1, 0, 0, 0 });
-        osg::Vec3f center = { chunkCenter.x(), chunkCenter.y(), 0 };
-        osg::ref_ptr<osg::MatrixTransform> trans = new osg::MatrixTransform(osg::Matrixf::translate(-center*Constants::CellSizeInUnits));
-        trans->setDataVariance(osg::Object::STATIC);
-        trans->addChild(chunkBorder);
-        result->addChild(trans);
-        return result;
-    }
-
     return geometry;
 }
 
diff --git a/components/terrain/chunkmanager.hpp b/components/terrain/chunkmanager.hpp
index 4e030e018c..9b7dbf3ee1 100644
--- a/components/terrain/chunkmanager.hpp
+++ b/components/terrain/chunkmanager.hpp
@@ -72,7 +72,6 @@ namespace Terrain
         unsigned int mCompositeMapSize;
         float mCompositeMapLevel;
         float mMaxCompGeometrySize;
-        bool mDebugChunks = false;
     };
 
 }
diff --git a/components/terrain/quadtreeworld.cpp b/components/terrain/quadtreeworld.cpp
index bbf212942e..ef37b63ef6 100644
--- a/components/terrain/quadtreeworld.cpp
+++ b/components/terrain/quadtreeworld.cpp
@@ -11,6 +11,7 @@
 #include <components/sceneutil/mwshadowtechnique.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/loadinglistener/reporter.hpp>
+#include <components/resource/resourcesystem.hpp>
 
 #include "quadtreenode.hpp"
 #include "storage.hpp"
@@ -244,6 +245,26 @@ private:
     osg::ref_ptr<RootNode> mRootNode;
 };
 
+class DebugChunkManager : public QuadTreeWorld::ChunkManager
+{
+public:
+    DebugChunkManager(Resource::SceneManager* sceneManager, Storage* storage, unsigned int nodeMask) : mSceneManager(sceneManager), mStorage(storage), mNodeMask(nodeMask) {}
+    osg::ref_ptr<osg::Node> getChunk(float size, const osg::Vec2f& chunkCenter, unsigned char lod, unsigned int lodFlags, bool activeGrid, const osg::Vec3f& viewPoint, bool compile)
+    {
+        osg::Vec3f center = { chunkCenter.x(), chunkCenter.y(), 0 };
+        auto chunkBorder = CellBorder::createBorderGeometry(center.x() - size / 2.f, center.y() - size / 2.f, size, mStorage, mSceneManager, mNodeMask, 5.f, { 1, 0, 0, 0 });
+        osg::ref_ptr<osg::MatrixTransform> trans = new osg::MatrixTransform(osg::Matrixf::translate(-center*Constants::CellSizeInUnits));
+        trans->setDataVariance(osg::Object::STATIC);
+        trans->addChild(chunkBorder);
+        return trans;
+    }
+    unsigned int getNodeMask() { return mNodeMask; }
+private:
+    Resource::SceneManager* mSceneManager;
+    Storage* mStorage;
+    unsigned int mNodeMask;
+};
+
 QuadTreeWorld::QuadTreeWorld(osg::Group *parent, osg::Group *compileRoot, Resource::ResourceSystem *resourceSystem, Storage *storage, unsigned int nodeMask, unsigned int preCompileMask, unsigned int borderMask, int compMapResolution, float compMapLevel, float lodFactor, int vertexLodMod, float maxCompGeometrySize)
     : TerrainGrid(parent, compileRoot, resourceSystem, storage, nodeMask, preCompileMask, borderMask)
     , mViewDataMap(new ViewDataMap)
@@ -258,6 +279,12 @@ QuadTreeWorld::QuadTreeWorld(osg::Group *parent, osg::Group *compileRoot, Resour
     mChunkManager->setCompositeMapLevel(compMapLevel);
     mChunkManager->setMaxCompositeGeometrySize(maxCompGeometrySize);
     mChunkManagers.push_back(mChunkManager.get());
+
+    if (mDebugTerrainChunks)
+    {
+        mDebugChunkManager = std::unique_ptr<DebugChunkManager>(new DebugChunkManager(mResourceSystem->getSceneManager(), mStorage, borderMask));
+        addChunkManager(mDebugChunkManager.get());
+    }
 }
 
 QuadTreeWorld::~QuadTreeWorld()
@@ -352,7 +379,7 @@ void loadRenderingNode(ViewData::Entry& entry, ViewData* vd, int vertexLodMod, f
     }
 }
 
-void updateWaterCullingView(HeightCullCallback* callback, ViewData* vd, osgUtil::CullVisitor* cv, float cellworldsize, bool outofworld, bool debugTerrainChunk)
+void updateWaterCullingView(HeightCullCallback* callback, ViewData* vd, osgUtil::CullVisitor* cv, float cellworldsize, bool outofworld)
 {
     if (!(cv->getTraversalMask() & callback->getCullMask()))
         return;
@@ -368,11 +395,7 @@ void updateWaterCullingView(HeightCullCallback* callback, ViewData* vd, osgUtil:
     for (unsigned int i=0; i<vd->getNumEntries(); ++i)
     {
         ViewData::Entry& entry = vd->getEntry(i);
-        osg::BoundingBox bb;
-        if(debugTerrainChunk)
-            bb = static_cast<TerrainDrawable*>(entry.mRenderingNode->asGroup()->getChild(0)->asGroup()->getChild(0))->getWaterBoundingBox();
-        else
-            bb = static_cast<TerrainDrawable*>(entry.mRenderingNode->asGroup()->getChild(0))->getWaterBoundingBox();
+        osg::BoundingBox bb = static_cast<TerrainDrawable*>(entry.mRenderingNode->asGroup()->getChild(0))->getWaterBoundingBox();
         if (!bb.valid())
             continue;
         osg::Vec3f ofs (entry.mNode->getCenter().x()*cellworldsize, entry.mNode->getCenter().y()*cellworldsize, 0.f);
@@ -448,7 +471,7 @@ void QuadTreeWorld::accept(osg::NodeVisitor &nv)
     }
 
     if (mHeightCullCallback && isCullVisitor)
-        updateWaterCullingView(mHeightCullCallback, vd, static_cast<osgUtil::CullVisitor*>(&nv), mStorage->getCellWorldSize(), !isGridEmpty(), mDebugTerrainChunks);
+        updateWaterCullingView(mHeightCullCallback, vd, static_cast<osgUtil::CullVisitor*>(&nv), mStorage->getCellWorldSize(), !isGridEmpty());
 
     vd->markUnchanged();
 
diff --git a/components/terrain/quadtreeworld.hpp b/components/terrain/quadtreeworld.hpp
index f7cbf8097a..cedb0ae9e4 100644
--- a/components/terrain/quadtreeworld.hpp
+++ b/components/terrain/quadtreeworld.hpp
@@ -5,6 +5,7 @@
 #include "terraingrid.hpp"
 
 #include <mutex>
+#include <memory>
 
 namespace osg
 {
@@ -15,6 +16,7 @@ namespace Terrain
 {
     class RootNode;
     class ViewDataMap;
+    class DebugChunkManager;
 
     /// @brief Terrain implementation that loads cells into a Quad Tree, with geometry LOD and texture LOD.
     class QuadTreeWorld : public TerrainGrid // note: derived from TerrainGrid is only to render default cells (see loadCell)
@@ -73,6 +75,7 @@ namespace Terrain
         float mViewDistance;
         float mMinSize;
         bool mDebugTerrainChunks;
+        std::unique_ptr<DebugChunkManager> mDebugChunkManager;
     };
 
 }

From 01cc61087b2f8cb23d73699bb76e796a749e63ab Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Mon, 27 Sep 2021 19:32:18 +0000
Subject: [PATCH 1362/2859] improves paging preloader (#3126)

* Return check for distance when we try to reuse data

* [ci skip]

* [ci skip]

* [ci skip]

* [ci skip]

* [ci skip]

* cellpreloader.cpp

* [ci skip]

* [ci skip]

* [ci skip]

* [ci skip]

* [ci skip]

* [ci skip]

* [ci skip]

* [ci skip]

* quadtreeworld.cpp

* chunkmanager.cpp

* chunkmanager.cpp

* cellpreloader.cpp

* jvoisin

* whitespace

* whitespace
---
 apps/openmw/mwworld/cellpreloader.cpp  |  43 ++-------
 components/terrain/chunkmanager.cpp    | 116 +++++++++++++++++--------
 components/terrain/chunkmanager.hpp    |   3 +-
 components/terrain/quadtreeworld.cpp   |  54 +++++++-----
 components/terrain/quadtreeworld.hpp   |   1 -
 components/terrain/terraindrawable.cpp |   4 +-
 components/terrain/terraindrawable.hpp |   2 +
 components/terrain/viewdata.cpp        |  27 ++----
 components/terrain/viewdata.hpp        |   1 -
 components/terrain/world.hpp           |   4 -
 10 files changed, 133 insertions(+), 122 deletions(-)

diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index f2f2ebc5a6..590e1e9c00 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -25,7 +25,7 @@ namespace
 {
     template <class Contained>
     bool contains(const std::vector<MWWorld::CellPreloader::PositionCellGrid>& container,
-           const Contained& contained, float tolerance=1.f)
+           const Contained& contained, float tolerance)
     {
         for (const auto& pos : contained)
         {
@@ -180,14 +180,6 @@ namespace MWWorld
         {
         }
 
-        bool storeViews(double referenceTime)
-        {
-            for (unsigned int i=0; i<mTerrainViews.size() && i<mPreloadPositions.size(); ++i)
-                if (!mWorld->storeView(mTerrainViews[i], referenceTime))
-                    return false;
-            return true;
-        }
-
         void doWork() override
         {
             for (unsigned int i=0; i<mTerrainViews.size() && i<mPreloadPositions.size() && !mAbort; ++i)
@@ -246,7 +238,6 @@ namespace MWWorld
         , mMaxCacheSize(0)
         , mPreloadInstances(true)
         , mLastResourceCacheUpdate(0.0)
-        , mStoreViewsFailCount(0)
         , mLoadedTerrainTimestamp(0.0)
     {
     }
@@ -383,22 +374,8 @@ namespace MWWorld
 
         if (mTerrainPreloadItem && mTerrainPreloadItem->isDone())
         {
-            if (!mTerrainPreloadItem->storeViews(timestamp))
-            {
-                if (++mStoreViewsFailCount > 100)
-                {
-                    OSG_ALWAYS << "paging views are rebuilt every frame, please check for faulty enable/disable scripts." << std::endl;
-                    mStoreViewsFailCount = 0;
-                }
-                setTerrainPreloadPositions(std::vector<PositionCellGrid>());
-            }
-            else
-            {
-                mStoreViewsFailCount = 0;
-                mLoadedTerrainPositions = mTerrainPreloadPositions;
-                mLoadedTerrainTimestamp = timestamp;
-            }
-            mTerrainPreloadItem = nullptr;
+            mLoadedTerrainPositions = mTerrainPreloadPositions;
+            mLoadedTerrainTimestamp = timestamp;
         }
     }
 
@@ -443,17 +420,7 @@ namespace MWWorld
             return true;
         else if (mTerrainPreloadItem->isDone())
         {
-            if (mTerrainPreloadItem->storeViews(timestamp))
-            {
-                mTerrainPreloadItem = nullptr;
-                return true;
-            }
-            else
-            {
-                setTerrainPreloadPositions(std::vector<CellPreloader::PositionCellGrid>());
-                setTerrainPreloadPositions(positions);
-                return false;
-            }
+            return true;
         }
         else
         {
@@ -481,7 +448,7 @@ namespace MWWorld
             mTerrainPreloadPositions.clear();
             mLoadedTerrainPositions.clear();
         }
-        else if (contains(mTerrainPreloadPositions, positions))
+        else if (contains(mTerrainPreloadPositions, positions, 128.f))
             return;
         if (mTerrainPreloadItem && !mTerrainPreloadItem->isDone())
             return;
diff --git a/components/terrain/chunkmanager.cpp b/components/terrain/chunkmanager.cpp
index 476805aa3c..0c84ddd9b9 100644
--- a/components/terrain/chunkmanager.cpp
+++ b/components/terrain/chunkmanager.cpp
@@ -39,6 +39,17 @@ ChunkManager::ChunkManager(Storage *storage, Resource::SceneManager *sceneMgr, T
     mMultiPassRoot->setAttributeAndModes(material, osg::StateAttribute::ON);
 }
 
+struct FindChunkTemplate
+{
+    void operator() (ChunkId id, osg::Object* obj)
+    {
+        if (std::get<0>(id) == std::get<0>(mId) && std::get<1>(id) == std::get<1>(mId))
+            mFoundTemplate = obj;
+    }
+    ChunkId mId;
+    osg::ref_ptr<osg::Object> mFoundTemplate;
+};
+
 osg::ref_ptr<osg::Node> ChunkManager::getChunk(float size, const osg::Vec2f& center, unsigned char lod, unsigned int lodFlags, bool activeGrid, const osg::Vec3f& viewPoint, bool compile)
 {
     ChunkId id = std::make_tuple(center, lod, lodFlags);
@@ -47,7 +58,11 @@ osg::ref_ptr<osg::Node> ChunkManager::getChunk(float size, const osg::Vec2f& cen
         return static_cast<osg::Node*>(obj.get());
     else
     {
-        osg::ref_ptr<osg::Node> node = createChunk(size, center, lod, lodFlags, compile);
+        FindChunkTemplate find;
+        find.mId = id;
+        mCache->call(find);
+        TerrainDrawable* templateGeometry = (find.mFoundTemplate && !mDebugChunks) ? static_cast<TerrainDrawable*>(find.mFoundTemplate.get()) : nullptr;
+        osg::ref_ptr<osg::Node> node = createChunk(size, center, lod, lodFlags, compile, templateGeometry);
         mCache->addEntryToObjectCache(id, node.get());
         return node;
     }
@@ -165,24 +180,45 @@ std::vector<osg::ref_ptr<osg::StateSet> > ChunkManager::createPasses(float chunk
     return ::Terrain::createPasses(useShaders, &mSceneManager->getShaderManager(), layers, blendmapTextures, blendmapScale, blendmapScale);
 }
 
-osg::ref_ptr<osg::Node> ChunkManager::createChunk(float chunkSize, const osg::Vec2f &chunkCenter, unsigned char lod, unsigned int lodFlags, bool compile)
+osg::ref_ptr<osg::Node> ChunkManager::createChunk(float chunkSize, const osg::Vec2f &chunkCenter, unsigned char lod, unsigned int lodFlags, bool compile, TerrainDrawable* templateGeometry)
 {
-    osg::ref_ptr<osg::Vec3Array> positions (new osg::Vec3Array);
-    osg::ref_ptr<osg::Vec3Array> normals (new osg::Vec3Array);
-    osg::ref_ptr<osg::Vec4ubArray> colors (new osg::Vec4ubArray);
-    colors->setNormalize(true);
-
-    osg::ref_ptr<osg::VertexBufferObject> vbo (new osg::VertexBufferObject);
-    positions->setVertexBufferObject(vbo);
-    normals->setVertexBufferObject(vbo);
-    colors->setVertexBufferObject(vbo);
-
-    mStorage->fillVertexBuffers(lod, chunkSize, chunkCenter, positions, normals, colors);
-
     osg::ref_ptr<TerrainDrawable> geometry (new TerrainDrawable);
-    geometry->setVertexArray(positions);
-    geometry->setNormalArray(normals, osg::Array::BIND_PER_VERTEX);
-    geometry->setColorArray(colors, osg::Array::BIND_PER_VERTEX);
+
+    if (!templateGeometry)
+    {
+        osg::ref_ptr<osg::Vec3Array> positions (new osg::Vec3Array);
+        osg::ref_ptr<osg::Vec3Array> normals (new osg::Vec3Array);
+        osg::ref_ptr<osg::Vec4ubArray> colors (new osg::Vec4ubArray);
+        colors->setNormalize(true);
+
+        mStorage->fillVertexBuffers(lod, chunkSize, chunkCenter, positions, normals, colors);
+
+        osg::ref_ptr<osg::VertexBufferObject> vbo (new osg::VertexBufferObject);
+        positions->setVertexBufferObject(vbo);
+        normals->setVertexBufferObject(vbo);
+        colors->setVertexBufferObject(vbo);
+    
+        geometry->setVertexArray(positions);
+        geometry->setNormalArray(normals, osg::Array::BIND_PER_VERTEX);
+        geometry->setColorArray(colors, osg::Array::BIND_PER_VERTEX);
+    }
+    else
+    {
+        // Unfortunately we need to copy vertex data because of poor coupling with VertexBufferObject.
+        osg::ref_ptr<osg::Array> positions = static_cast<osg::Array*>(templateGeometry->getVertexArray()->clone(osg::CopyOp::DEEP_COPY_ALL));
+        osg::ref_ptr<osg::Array> normals = static_cast<osg::Array*>(templateGeometry->getNormalArray()->clone(osg::CopyOp::DEEP_COPY_ALL));
+        osg::ref_ptr<osg::Array> colors = static_cast<osg::Array*>(templateGeometry->getColorArray()->clone(osg::CopyOp::DEEP_COPY_ALL));
+
+        osg::ref_ptr<osg::VertexBufferObject> vbo (new osg::VertexBufferObject);
+        positions->setVertexBufferObject(vbo);
+        normals->setVertexBufferObject(vbo);
+        colors->setVertexBufferObject(vbo);
+    
+        geometry->setVertexArray(positions);
+        geometry->setNormalArray(normals, osg::Array::BIND_PER_VERTEX);
+        geometry->setColorArray(colors, osg::Array::BIND_PER_VERTEX);
+    }
+    
     geometry->setUseDisplayList(false);
     geometry->setUseVertexBufferObjects(true);
 
@@ -202,32 +238,44 @@ osg::ref_ptr<osg::Node> ChunkManager::createChunk(float chunkSize, const osg::Ve
 
     geometry->setStateSet(mMultiPassRoot);
 
-    if (useCompositeMap)
+    if (templateGeometry)
     {
-        osg::ref_ptr<CompositeMap> compositeMap = new CompositeMap;
-        compositeMap->mTexture = createCompositeMapRTT();
+        if (templateGeometry->getCompositeMap())
+        {
+            geometry->setCompositeMap(templateGeometry->getCompositeMap());
+            geometry->setCompositeMapRenderer(mCompositeMapRenderer);
+        }
+        geometry->setPasses(templateGeometry->getPasses());
+    }
+    else
+    {
+        if (useCompositeMap)
+        {
+            osg::ref_ptr<CompositeMap> compositeMap = new CompositeMap;
+            compositeMap->mTexture = createCompositeMapRTT();
 
-        createCompositeMapGeometry(chunkSize, chunkCenter, osg::Vec4f(0,0,1,1), *compositeMap);
+            createCompositeMapGeometry(chunkSize, chunkCenter, osg::Vec4f(0,0,1,1), *compositeMap);
 
-        mCompositeMapRenderer->addCompositeMap(compositeMap.get(), false);
+            mCompositeMapRenderer->addCompositeMap(compositeMap.get(), false);
 
-        geometry->setCompositeMap(compositeMap);
-        geometry->setCompositeMapRenderer(mCompositeMapRenderer);
+            geometry->setCompositeMap(compositeMap);
+            geometry->setCompositeMapRenderer(mCompositeMapRenderer);
 
-        TextureLayer layer;
-        layer.mDiffuseMap = compositeMap->mTexture;
-        layer.mParallax = false;
-        layer.mSpecular = false;
-        geometry->setPasses(::Terrain::createPasses(mSceneManager->getForceShaders() || !mSceneManager->getClampLighting(), &mSceneManager->getShaderManager(), std::vector<TextureLayer>(1, layer), std::vector<osg::ref_ptr<osg::Texture2D> >(), 1.f, 1.f));
-    }
-    else
-    {
-        geometry->setPasses(createPasses(chunkSize, chunkCenter, false));
+            TextureLayer layer;
+            layer.mDiffuseMap = compositeMap->mTexture;
+            layer.mParallax = false;
+            layer.mSpecular = false;
+            geometry->setPasses(::Terrain::createPasses(mSceneManager->getForceShaders() || !mSceneManager->getClampLighting(), &mSceneManager->getShaderManager(), std::vector<TextureLayer>(1, layer), std::vector<osg::ref_ptr<osg::Texture2D> >(), 1.f, 1.f));
+        }
+        else
+        {
+            geometry->setPasses(createPasses(chunkSize, chunkCenter, false));
+        }
     }
 
     geometry->setupWaterBoundingBox(-1, chunkSize * mStorage->getCellWorldSize() / numVerts);
 
-    if (compile && mSceneManager->getIncrementalCompileOperation())
+    if (!templateGeometry && compile && mSceneManager->getIncrementalCompileOperation())
     {
         mSceneManager->getIncrementalCompileOperation()->add(geometry);
     }
diff --git a/components/terrain/chunkmanager.hpp b/components/terrain/chunkmanager.hpp
index 9b7dbf3ee1..9b85e81330 100644
--- a/components/terrain/chunkmanager.hpp
+++ b/components/terrain/chunkmanager.hpp
@@ -26,6 +26,7 @@ namespace Terrain
     class CompositeMapRenderer;
     class Storage;
     class CompositeMap;
+    class TerrainDrawable;
 
     typedef std::tuple<osg::Vec2f, unsigned char, unsigned int> ChunkId; // Center, Lod, Lod Flags
 
@@ -51,7 +52,7 @@ namespace Terrain
         void releaseGLObjects(osg::State* state) override;
 
     private:
-        osg::ref_ptr<osg::Node> createChunk(float size, const osg::Vec2f& center, unsigned char lod, unsigned int lodFlags, bool compile);
+        osg::ref_ptr<osg::Node> createChunk(float size, const osg::Vec2f& center, unsigned char lod, unsigned int lodFlags, bool compile, TerrainDrawable* templateGeometry);
 
         osg::ref_ptr<osg::Texture2D> createCompositeMapRTT();
 
diff --git a/components/terrain/quadtreeworld.cpp b/components/terrain/quadtreeworld.cpp
index ef37b63ef6..24f042b941 100644
--- a/components/terrain/quadtreeworld.cpp
+++ b/components/terrain/quadtreeworld.cpp
@@ -55,11 +55,12 @@ namespace Terrain
 class DefaultLodCallback : public LodCallback
 {
 public:
-    DefaultLodCallback(float factor, float minSize, float viewDistance, const osg::Vec4i& grid)
+    DefaultLodCallback(float factor, float minSize, float viewDistance, const osg::Vec4i& grid, float distanceModifier=0.f)
         : mFactor(factor)
         , mMinSize(minSize)
         , mViewDistance(viewDistance)
         , mActiveGrid(grid)
+        , mDistanceModifier(distanceModifier)
     {
     }
 
@@ -78,6 +79,8 @@ public:
                 return Deeper;
         }
 
+        dist = std::max(0.f, dist + mDistanceModifier);
+
         if (dist > mViewDistance && !activeGrid) // for Scene<->ObjectPaging sync the activegrid must remain loaded
             return StopTraversal;
 
@@ -92,6 +95,7 @@ private:
     float mMinSize;
     float mViewDistance;
     osg::Vec4i mActiveGrid;
+    float mDistanceModifier;
 };
 
 class RootNode : public QuadTreeNode
@@ -370,7 +374,7 @@ void loadRenderingNode(ViewData::Entry& entry, ViewData* vd, int vertexLodMod, f
 
         for (QuadTreeWorld::ChunkManager* m : chunkManagers)
         {
-            if (m->getViewDistance() && entry.mNode->distance(vd->getViewPoint()) > m->getViewDistance() + reuseDistance*10)
+            if (m->getViewDistance() && entry.mNode->distance(vd->getViewPoint()) > m->getViewDistance() + reuseDistance)
                 continue;
             osg::ref_ptr<osg::Node> n = m->getChunk(entry.mNode->getSize(), entry.mNode->getCenter(), ourLod, entry.mLodFlags, activeGrid, vd->getViewPoint(), compile);
             if (n) pat->addChild(n);
@@ -519,39 +523,43 @@ View* QuadTreeWorld::createView()
 void QuadTreeWorld::preload(View *view, const osg::Vec3f &viewPoint, const osg::Vec4i &grid, std::atomic<bool> &abort, Loading::Reporter& reporter)
 {
     ensureQuadTreeBuilt();
+    const float cellWorldSize = mStorage->getCellWorldSize();
 
     ViewData* vd = static_cast<ViewData*>(view);
     vd->setViewPoint(viewPoint);
     vd->setActiveGrid(grid);
-    DefaultLodCallback lodCallback(mLodFactor, mMinSize, mViewDistance, grid);
-    mRootNode->traverseNodes(vd, viewPoint, &lodCallback);
-
-    std::size_t progressTotal = 0;
-    for (unsigned int i = 0, n = vd->getNumEntries(); i < n; ++i)
-        progressTotal += vd->getEntry(i).mNode->getSize();
-
-    reporter.addTotal(progressTotal);
 
-    const float cellWorldSize = mStorage->getCellWorldSize();
-    for (unsigned int i=0; i<vd->getNumEntries() && !abort; ++i)
+    for (unsigned int pass=0; pass<3; ++pass)
     {
-        ViewData::Entry& entry = vd->getEntry(i);
-
-
+        unsigned int startEntry = vd->getNumEntries();
 
-        loadRenderingNode(entry, vd, mVertexLodMod, cellWorldSize, grid, mChunkManagers, true, mViewDataMap->getReuseDistance());
-        reporter.addProgress(entry.mNode->getSize());
+        float distanceModifier=0.f;
+        if (pass == 1)
+            distanceModifier = 1024;
+        else if (pass == 2)
+            distanceModifier = -1024;
+        DefaultLodCallback lodCallback(mLodFactor, mMinSize, mViewDistance, grid, distanceModifier);
+        mRootNode->traverseNodes(vd, viewPoint, &lodCallback);
 
+        if (pass==0)
+        {
+            std::size_t progressTotal = 0;
+            for (unsigned int i = 0, n = vd->getNumEntries(); i < n; ++i)
+                 progressTotal += vd->getEntry(i).mNode->getSize();
 
+            reporter.addTotal(progressTotal);
+        }
 
+        const float reuseDistance = std::max(mViewDataMap->getReuseDistance(), std::abs(distanceModifier));
+        for (unsigned int i=startEntry; i<vd->getNumEntries() && !abort; ++i)
+        {
+            ViewData::Entry& entry = vd->getEntry(i);
 
+            loadRenderingNode(entry, vd, mVertexLodMod, cellWorldSize, grid, mChunkManagers, true, reuseDistance);
+            if (pass==0) reporter.addProgress(entry.mNode->getSize());
+            entry.mNode = nullptr; // Clear node lest we break the neighbours search for the next pass
+        }
     }
-    vd->markUnchanged();
-}
-
-bool QuadTreeWorld::storeView(const View* view, double referenceTime)
-{
-    return mViewDataMap->storeView(static_cast<const ViewData*>(view), referenceTime);
 }
 
 void QuadTreeWorld::reportStats(unsigned int frameNumber, osg::Stats *stats)
diff --git a/components/terrain/quadtreeworld.hpp b/components/terrain/quadtreeworld.hpp
index cedb0ae9e4..3aabc7233e 100644
--- a/components/terrain/quadtreeworld.hpp
+++ b/components/terrain/quadtreeworld.hpp
@@ -40,7 +40,6 @@ namespace Terrain
 
         View* createView() override;
         void preload(View* view, const osg::Vec3f& eyePoint, const osg::Vec4i &cellgrid, std::atomic<bool>& abort, Loading::Reporter& reporter) override;
-        bool storeView(const View* view, double referenceTime) override;
         void rebuildViews() override;
 
         void reportStats(unsigned int frameNumber, osg::Stats* stats) override;
diff --git a/components/terrain/terraindrawable.cpp b/components/terrain/terraindrawable.cpp
index 746534abb4..231b6f4fed 100644
--- a/components/terrain/terraindrawable.cpp
+++ b/components/terrain/terraindrawable.cpp
@@ -94,10 +94,10 @@ void TerrainDrawable::cull(osgUtil::CullVisitor *cv)
         return;
     }
 
-    if (mCompositeMap)
+    if (mCompositeMap && mCompositeMapRenderer)
     {
         mCompositeMapRenderer->setImmediate(mCompositeMap);
-        mCompositeMap = nullptr;
+        mCompositeMapRenderer = nullptr;
     }
 
     bool pushedLight = mLightListCallback && mLightListCallback->pushLightState(this, cv);
diff --git a/components/terrain/terraindrawable.hpp b/components/terrain/terraindrawable.hpp
index dbfdd3c80a..721abe7481 100644
--- a/components/terrain/terraindrawable.hpp
+++ b/components/terrain/terraindrawable.hpp
@@ -45,6 +45,7 @@ namespace Terrain
 
         typedef std::vector<osg::ref_ptr<osg::StateSet> > PassVector;
         void setPasses (const PassVector& passes);
+        const PassVector& getPasses() const {  return mPasses; }
 
         void setLightListCallback(SceneUtil::LightListCallback* lightListCallback);
 
@@ -56,6 +57,7 @@ namespace Terrain
         const osg::BoundingBox& getWaterBoundingBox() const { return mWaterBoundingBox; }
 
         void setCompositeMap(CompositeMap* map) { mCompositeMap = map; }
+        CompositeMap* getCompositeMap() { return mCompositeMap; }
         void setCompositeMapRenderer(CompositeMapRenderer* renderer) { mCompositeMapRenderer = renderer; }
 
     private:
diff --git a/components/terrain/viewdata.cpp b/components/terrain/viewdata.cpp
index e4d043ffc4..c5070fdf0d 100644
--- a/components/terrain/viewdata.cpp
+++ b/components/terrain/viewdata.cpp
@@ -143,7 +143,7 @@ ViewData *ViewDataMap::getViewData(osg::Object *viewer, const osg::Vec3f& viewPo
 
     if (!(vd->suitableToUse(activeGrid) && (vd->getViewPoint()-viewPoint).length2() < mReuseDistance*mReuseDistance && vd->getWorldUpdateRevision() >= mWorldUpdateRevision))
     {
-        float shortestDist = std::numeric_limits<float>::max();
+        float shortestDist = mReuseDistance*mReuseDistance;
         const ViewData* mostSuitableView = nullptr;
         for (const ViewData* other : mUsedViews)
         {
@@ -157,31 +157,22 @@ ViewData *ViewDataMap::getViewData(osg::Object *viewer, const osg::Vec3f& viewPo
                 }
             }
         }
-        if (mostSuitableView && mostSuitableView != vd)
+        if (mostSuitableView)
         {
             vd->copyFrom(*mostSuitableView);
             return vd;
         }
-    }
-    if (!vd->suitableToUse(activeGrid))
-    {
-        vd->setViewPoint(viewPoint);
-        vd->setActiveGrid(activeGrid);
-        needsUpdate = true;
+        else
+        {
+            vd->setViewPoint(viewPoint);
+            vd->setActiveGrid(activeGrid);
+            vd->setWorldUpdateRevision(mWorldUpdateRevision);
+            needsUpdate = true;
+        }
     }
     return vd;
 }
 
-bool ViewDataMap::storeView(const ViewData* view, double referenceTime)
-{
-    if (view->getWorldUpdateRevision() < mWorldUpdateRevision)
-        return false;
-    ViewData* store = createOrReuseView();
-    store->copyFrom(*view);
-    store->setLastUsageTimeStamp(referenceTime);
-    return true;
-}
-
 ViewData *ViewDataMap::createOrReuseView()
 {
     ViewData* vd = nullptr;
diff --git a/components/terrain/viewdata.hpp b/components/terrain/viewdata.hpp
index 378d07663c..5d814251ea 100644
--- a/components/terrain/viewdata.hpp
+++ b/components/terrain/viewdata.hpp
@@ -93,7 +93,6 @@ namespace Terrain
 
         void clearUnusedViews(double referenceTime);
         void rebuildViews();
-        bool storeView(const ViewData* view, double referenceTime);
 
         float getReuseDistance() const { return mReuseDistance; }
 
diff --git a/components/terrain/world.hpp b/components/terrain/world.hpp
index b62a1cb568..8d60e4c5b6 100644
--- a/components/terrain/world.hpp
+++ b/components/terrain/world.hpp
@@ -155,10 +155,6 @@ namespace Terrain
 
         virtual void preload(View* view, const osg::Vec3f& viewPoint, const osg::Vec4i &cellgrid, std::atomic<bool>& abort, Loading::Reporter& reporter) {}
 
-        /// Store a preloaded view into the cache with the intent that the next rendering traversal can use it.
-        /// @note Not thread safe.
-        virtual bool storeView(const View* view, double referenceTime) {return true;}
-
         virtual void rebuildViews() {}
 
         virtual void reportStats(unsigned int frameNumber, osg::Stats* stats) {}

From 9fabf9925057071502d7054e2bd8264d53fcd8af Mon Sep 17 00:00:00 2001
From: Bret Curtis <bret.curtis@gmail.com>
Date: Mon, 27 Sep 2021 21:38:12 +0200
Subject: [PATCH 1363/2859] remove mDebugChunks from chunkManager

---
 components/terrain/chunkmanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/terrain/chunkmanager.cpp b/components/terrain/chunkmanager.cpp
index 0c84ddd9b9..e040cbdd93 100644
--- a/components/terrain/chunkmanager.cpp
+++ b/components/terrain/chunkmanager.cpp
@@ -61,7 +61,7 @@ osg::ref_ptr<osg::Node> ChunkManager::getChunk(float size, const osg::Vec2f& cen
         FindChunkTemplate find;
         find.mId = id;
         mCache->call(find);
-        TerrainDrawable* templateGeometry = (find.mFoundTemplate && !mDebugChunks) ? static_cast<TerrainDrawable*>(find.mFoundTemplate.get()) : nullptr;
+        TerrainDrawable* templateGeometry = find.mFoundTemplate ? static_cast<TerrainDrawable*>(find.mFoundTemplate.get()) : nullptr;
         osg::ref_ptr<osg::Node> node = createChunk(size, center, lod, lodFlags, compile, templateGeometry);
         mCache->addEntryToObjectCache(id, node.get());
         return node;

From e760a6c7e64dd9a4692a957aa5663ac21b58864b Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Mon, 27 Sep 2021 19:34:26 +0000
Subject: [PATCH 1364/2859] Merge branch 'forlua' into 'master'

Simple Physics API modification for Lua

See merge request OpenMW/openmw!1216

(cherry picked from commit d88494c90b501d0832ae0330a0ca81d8b8e5aa50)

02dd055a Save hitObject in castSphere() just like in castRay()
0793d0bf Allow to override collision mask and group for castSphere() as for castRay()
---
 apps/openmw/mwphysics/collisiontype.hpp | 3 ++-
 apps/openmw/mwphysics/physicssystem.cpp | 8 +++++---
 apps/openmw/mwphysics/physicssystem.hpp | 5 +++--
 apps/openmw/mwphysics/raycasting.hpp    | 5 +++--
 apps/openmw/mwrender/camera.cpp         | 5 +++--
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwphysics/collisiontype.hpp b/apps/openmw/mwphysics/collisiontype.hpp
index 0d6a32fc09..e69534cf68 100644
--- a/apps/openmw/mwphysics/collisiontype.hpp
+++ b/apps/openmw/mwphysics/collisiontype.hpp
@@ -10,7 +10,8 @@ enum CollisionType {
     CollisionType_Actor = 1<<2,
     CollisionType_HeightMap = 1<<3,
     CollisionType_Projectile = 1<<4,
-    CollisionType_Water = 1<<5
+    CollisionType_Water = 1<<5,
+    CollisionType_Default = CollisionType_World|CollisionType_HeightMap|CollisionType_Actor|CollisionType_Door
 };
 
 }
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 5b0a180354..8499dc74c1 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -348,11 +348,11 @@ namespace MWPhysics
         return result;
     }
 
-    RayCastingResult PhysicsSystem::castSphere(const osg::Vec3f &from, const osg::Vec3f &to, float radius) const
+    RayCastingResult PhysicsSystem::castSphere(const osg::Vec3f &from, const osg::Vec3f &to, float radius, int mask, int group) const
     {
         btCollisionWorld::ClosestConvexResultCallback callback(Misc::Convert::toBullet(from), Misc::Convert::toBullet(to));
-        callback.m_collisionFilterGroup = 0xff;
-        callback.m_collisionFilterMask = CollisionType_World|CollisionType_HeightMap|CollisionType_Door;
+        callback.m_collisionFilterGroup = group;
+        callback.m_collisionFilterMask = mask;
 
         btSphereShape shape(radius);
         const btQuaternion btrot = btQuaternion::getIdentity();
@@ -368,6 +368,8 @@ namespace MWPhysics
         {
             result.mHitPos = Misc::Convert::toOsg(callback.m_hitPointWorld);
             result.mHitNormal = Misc::Convert::toOsg(callback.m_hitNormalWorld);
+            if (auto* ptrHolder = static_cast<PtrHolder*>(callback.m_hitCollisionObject->getUserPointer()))
+                result.mHitObject = ptrHolder->getPtr();
         }
         return result;
     }
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 5ee99d2d15..52515b563f 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -186,9 +186,10 @@ namespace MWPhysics
             /// @param me Optional, a Ptr to ignore in the list of results. targets are actors to filter for, ignoring all other actors.
             RayCastingResult castRay(const osg::Vec3f &from, const osg::Vec3f &to, const MWWorld::ConstPtr& ignore = MWWorld::ConstPtr(),
                     const std::vector<MWWorld::Ptr>& targets = std::vector<MWWorld::Ptr>(),
-                    int mask = CollisionType_World|CollisionType_HeightMap|CollisionType_Actor|CollisionType_Door, int group=0xff) const override;
+                    int mask = CollisionType_Default, int group=0xff) const override;
 
-            RayCastingResult castSphere(const osg::Vec3f& from, const osg::Vec3f& to, float radius) const override;
+            RayCastingResult castSphere(const osg::Vec3f& from, const osg::Vec3f& to, float radius,
+                    int mask = CollisionType_Default, int group=0xff) const override;
 
             /// Return true if actor1 can see actor2.
             bool getLineOfSight(const MWWorld::ConstPtr& actor1, const MWWorld::ConstPtr& actor2) const override;
diff --git a/apps/openmw/mwphysics/raycasting.hpp b/apps/openmw/mwphysics/raycasting.hpp
index e13e745fec..d00f23e2c4 100644
--- a/apps/openmw/mwphysics/raycasting.hpp
+++ b/apps/openmw/mwphysics/raycasting.hpp
@@ -29,9 +29,10 @@ namespace MWPhysics
             /// @param me Optional, a Ptr to ignore in the list of results. targets are actors to filter for, ignoring all other actors.
             virtual RayCastingResult castRay(const osg::Vec3f &from, const osg::Vec3f &to, const MWWorld::ConstPtr& ignore = MWWorld::ConstPtr(),
                     const std::vector<MWWorld::Ptr>& targets = std::vector<MWWorld::Ptr>(),
-                    int mask = CollisionType_World|CollisionType_HeightMap|CollisionType_Actor|CollisionType_Door, int group=0xff) const = 0;
+                    int mask = CollisionType_Default, int group=0xff) const = 0;
 
-            virtual RayCastingResult castSphere(const osg::Vec3f& from, const osg::Vec3f& to, float radius) const = 0;
+            virtual RayCastingResult castSphere(const osg::Vec3f& from, const osg::Vec3f& to, float radius,
+                    int mask = CollisionType_Default, int group=0xff) const = 0;
 
             /// Return true if actor1 can see actor2.
             virtual bool getLineOfSight(const MWWorld::ConstPtr& actor1, const MWWorld::ConstPtr& actor2) const = 0;
diff --git a/apps/openmw/mwrender/camera.cpp b/apps/openmw/mwrender/camera.cpp
index 3e5d1d0b31..edb017c2a2 100644
--- a/apps/openmw/mwrender/camera.cpp
+++ b/apps/openmw/mwrender/camera.cpp
@@ -251,6 +251,7 @@ namespace MWRender
 
         const float cameraObstacleLimit = 5.0f;
         const float focalObstacleLimit = 10.f;
+        const int collisionType = (MWPhysics::CollisionType::CollisionType_Default & ~MWPhysics::CollisionType::CollisionType_Actor);
 
         const auto* rayCasting = MWBase::Environment::get().getWorld()->getRayCasting();
 
@@ -260,7 +261,7 @@ namespace MWRender
         float offsetLen = focalOffset.length();
         if (offsetLen > 0)
         {
-            MWPhysics::RayCastingResult result = rayCasting->castSphere(focal - focalOffset, focal, focalObstacleLimit);
+            MWPhysics::RayCastingResult result = rayCasting->castSphere(focal - focalOffset, focal, focalObstacleLimit, collisionType);
             if (result.mHit)
             {
                 double adjustmentCoef = -(result.mHitPos + result.mHitNormal * focalObstacleLimit - focal).length() / offsetLen;
@@ -274,7 +275,7 @@ namespace MWRender
             mCameraDistance = std::min(mCameraDistance, mMaxNextCameraDistance);
         osg::Vec3d cameraPos;
         getPosition(focal, cameraPos);
-        MWPhysics::RayCastingResult result = rayCasting->castSphere(focal, cameraPos, cameraObstacleLimit);
+        MWPhysics::RayCastingResult result = rayCasting->castSphere(focal, cameraPos, cameraObstacleLimit, collisionType);
         if (result.mHit)
             mCameraDistance = (result.mHitPos + result.mHitNormal * cameraObstacleLimit - focal).length();
     }

From 77a23dab099ba69ae0c208e179a981ec4c6d4fcf Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 27 Sep 2021 22:23:00 +0200
Subject: [PATCH 1365/2859] Only add enabled objects to the scene

---
 CHANGELOG.md                     | 1 +
 apps/openmw/mwworld/worldimp.cpp | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d98a802a4f..8dc9510f6e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,7 @@
     Bug #6282: Laura craft doesn't follow the player character
     Bug #6283: Avis Dorsey follows you after her death
     Bug #6289: Keyword search in dialogues expected the text to be all ASCII characters
+    Bug #6302: Teleporting disabled actor breaks its disabled state
     Feature #890: OpenMW-CS: Column filtering
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
     Feature #2780: A way to see current OpenMW version in the console
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 5e93aadf4d..da5daed295 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1159,7 +1159,8 @@ namespace MWWorld
                 if (!currCellActive && newCellActive)
                 {
                     newPtr = currCell->moveTo(ptr, newCell);
-                    mWorldScene->addObjectToScene(newPtr);
+                    if(newPtr.getRefData().isEnabled())
+                        mWorldScene->addObjectToScene(newPtr);
 
                     std::string script = newPtr.getClass().getScript(newPtr);
                     if (!script.empty())

From d854e247b82373524a50f17c916546d8c127dd15 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Tue, 28 Sep 2021 06:25:12 +0000
Subject: [PATCH 1366/2859] reword warning in settings-default.cfg (#3124)

* reword warning in settings-default.cfg

The warning at the head of settings-default.cfg is somewhat confusing for users, overly verbose and lacking the most crucial piece of information in its first sentence. Hence, it is unsurprising some users fail to heed the warning, as observed through user support requests on Matrix.

* settings-default.cfg
---
 files/settings-default.cfg | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 08039f5fbe..5ed8109465 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -1,15 +1,7 @@
-# WARNING: If this file is named settings-default.cfg or was generated
-# from defaults.bin, then editing this file might have no effect, as
-# these settings may be overwritten by your user settings.cfg file
-# (see documentation for its location).
+# WARNING: Users should NOT edit this file. Users should add their personal preferences to the settings.cfg file overriding this file.
+# For the location of the settings.cfg file, as well as more detailed settings documentation, refer to:
 #
-# This file provides minimal documentation for each setting, and
-# ranges of recommended values.  For detailed explanations of the
-# significance of each setting, interaction with other settings, hard
-# limits on value ranges and more information in general, please read
-# the detailed documentation at:
-#
-#   https://openmw.readthedocs.io/en/master/reference/modding/settings/index.html
+#   https://openmw.readthedocs.io/en/latest/reference/modding/settings/index.html
 #
 
 [Camera]

From 5fde6867a2b72d90bdfb5cb888c10cf6be79bc60 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Tue, 28 Sep 2021 07:07:49 +0000
Subject: [PATCH 1367/2859] removes unused code (#3129)

* scenemanager.cpp

* scenemanager.hpp

* scenemanager.cpp

* stats.cpp

* renderingmanager.cpp
---
 apps/openmw/mwrender/renderingmanager.cpp |  2 +-
 components/resource/scenemanager.cpp      | 31 +----------------------
 components/resource/scenemanager.hpp      | 10 --------
 components/resource/stats.cpp             |  1 -
 4 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 19a887fe2e..74e183693c 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -262,7 +262,7 @@ namespace MWRender
             try
             {
                 for (std::vector<std::string>::const_iterator it = mModels.begin(); it != mModels.end(); ++it)
-                    mResourceSystem->getSceneManager()->cacheInstance(*it);
+                    mResourceSystem->getSceneManager()->getTemplate(*it);
                 for (std::vector<std::string>::const_iterator it = mTextures.begin(); it != mTextures.end(); ++it)
                     mResourceSystem->getImageManager()->getImage(*it);
                 for (std::vector<std::string>::const_iterator it = mKeyframes.begin(); it != mKeyframes.end(); ++it)
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index cc38144794..68596985ce 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -35,7 +35,6 @@
 #include "imagemanager.hpp"
 #include "niffilemanager.hpp"
 #include "objectcache.hpp"
-#include "multiobjectcache.hpp"
 
 namespace
 {
@@ -306,7 +305,6 @@ namespace Resource
         , mLightingMethod(SceneUtil::LightingMethod::FFP)
         , mConvertAlphaTestToAlphaToCoverage(false)
         , mDepthFormat(0)
-        , mInstanceCache(new MultiObjectCache)
         , mSharedStateManager(new SharedStateManager)
         , mImageManager(imageManager)
         , mNifFileManager(nifFileManager)
@@ -682,21 +680,6 @@ namespace Resource
         }
     }
 
-    osg::ref_ptr<osg::Node> SceneManager::cacheInstance(const std::string &name)
-    {
-        const std::string normalized = mVFS->normalizeFilename(name);
-
-        osg::ref_ptr<osg::Node> node = createInstance(normalized);
-
-        // Note: osg::clone() does not calculate bound volumes.
-        // Do it immediately, otherwise we will need to update them for all objects
-        // during first update traversal, what may lead to stuttering during cell transitions
-        node->getBound();
-
-        mInstanceCache->addEntryToObjectCache(normalized, node.get());
-        return node;
-    }
-
     osg::ref_ptr<osg::Node> SceneManager::createInstance(const std::string& name)
     {
         osg::ref_ptr<const osg::Node> scene = getTemplate(name);
@@ -722,14 +705,7 @@ namespace Resource
 
     osg::ref_ptr<osg::Node> SceneManager::getInstance(const std::string &name)
     {
-        const std::string normalized = mVFS->normalizeFilename(name);
-
-        osg::ref_ptr<osg::Object> obj = mInstanceCache->takeFromObjectCache(normalized);
-        if (obj.get())
-            return static_cast<osg::Node*>(obj.get());
-
-        return createInstance(normalized);
-
+        return createInstance(name);
     }
 
     osg::ref_ptr<osg::Node> SceneManager::getInstance(const std::string &name, osg::Group* parentNode)
@@ -747,7 +723,6 @@ namespace Resource
     void SceneManager::releaseGLObjects(osg::State *state)
     {
         mCache->releaseGLObjects(state);
-        mInstanceCache->releaseGLObjects(state);
 
         mShaderManager->releaseGLObjects(state);
 
@@ -835,8 +810,6 @@ namespace Resource
     {
         ResourceManager::updateCache(referenceTime);
 
-        mInstanceCache->removeUnreferencedObjectsInCache();
-
         mSharedStateMutex.lock();
         mSharedStateManager->prune();
         mSharedStateMutex.unlock();
@@ -866,7 +839,6 @@ namespace Resource
 
         std::lock_guard<std::mutex> lock(mSharedStateMutex);
         mSharedStateManager->clearCache();
-        mInstanceCache->clear();
     }
 
     void SceneManager::reportStats(unsigned int frameNumber, osg::Stats *stats) const
@@ -884,7 +856,6 @@ namespace Resource
         }
 
         stats->setAttribute(frameNumber, "Node", mCache->getCacheSize());
-        stats->setAttribute(frameNumber, "Node Instance", mInstanceCache->getCacheSize());
     }
 
     Shader::ShaderVisitor *SceneManager::createShaderVisitor(const std::string& shaderPrefix, bool translucentFramebuffer)
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index 9d798177a1..7434a25309 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -65,8 +65,6 @@ namespace Resource
         std::vector<osg::ref_ptr<const Object>> mObjects;
     };
 
-    class MultiObjectCache;
-
     /// @brief Handles loading and caching of scenes, e.g. .nif files or .osg files
     /// @note Some methods of the scene manager can be used from any thread, see the methods documentation for more details.
     class SceneManager : public ResourceManager
@@ -129,12 +127,6 @@ namespace Resource
         /// @note Thread safe.
         osg::ref_ptr<const osg::Node> getTemplate(const std::string& name, bool compile=true);
 
-        /// Create an instance of the given scene template and cache it for later use, so that future calls to getInstance() can simply
-        /// return this cached object instead of creating a new one.
-        /// @note The returned ref_ptr may be kept around by the caller to ensure that the object stays in cache for as long as needed.
-        /// @note Thread safe.
-        osg::ref_ptr<osg::Node> cacheInstance(const std::string& name);
-
         osg::ref_ptr<osg::Node> createInstance(const std::string& name);
 
         osg::ref_ptr<osg::Node> createInstance(const osg::Node* base);
@@ -207,8 +199,6 @@ namespace Resource
         bool mConvertAlphaTestToAlphaToCoverage;
         GLenum mDepthFormat;
 
-        osg::ref_ptr<MultiObjectCache> mInstanceCache;
-
         osg::ref_ptr<Resource::SharedStateManager> mSharedStateManager;
         mutable std::mutex mSharedStateMutex;
 
diff --git a/components/resource/stats.cpp b/components/resource/stats.cpp
index 9881d0458b..b3705f69cc 100644
--- a/components/resource/stats.cpp
+++ b/components/resource/stats.cpp
@@ -376,7 +376,6 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase *viewer)
             "Texture",
             "StateSet",
             "Node",
-            "Node Instance",
             "Shape",
             "Shape Instance",
             "Image",

From fd251dfe55611ee11d3d082822eaa70527ca3e45 Mon Sep 17 00:00:00 2001
From: Bret Curtis <bret.curtis@gmail.com>
Date: Tue, 28 Sep 2021 09:19:48 +0200
Subject: [PATCH 1368/2859] remove unused member variable

---
 apps/openmw/mwworld/cellpreloader.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/openmw/mwworld/cellpreloader.hpp b/apps/openmw/mwworld/cellpreloader.hpp
index 39436dc5ad..0c3bcb4f99 100644
--- a/apps/openmw/mwworld/cellpreloader.hpp
+++ b/apps/openmw/mwworld/cellpreloader.hpp
@@ -94,7 +94,6 @@ namespace MWWorld
         bool mPreloadInstances;
 
         double mLastResourceCacheUpdate;
-        int mStoreViewsFailCount;
 
         struct PreloadEntry
         {

From 0bd1c22e241f78d529019558bb544eb5deaf576b Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sat, 28 Aug 2021 10:47:57 +0200
Subject: [PATCH 1369/2859] Raycasting in Lua

---
 apps/openmw/CMakeLists.txt           |   2 +-
 apps/openmw/mwlua/luabindings.cpp    |  32 +-------
 apps/openmw/mwlua/luabindings.hpp    |   4 +-
 apps/openmw/mwlua/nearbybindings.cpp | 108 +++++++++++++++++++++++++++
 files/lua_api/openmw/nearby.lua      |  42 +++++++++++
 5 files changed, 155 insertions(+), 33 deletions(-)
 create mode 100644 apps/openmw/mwlua/nearbybindings.cpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 5605ff229e..82a91699a9 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -58,7 +58,7 @@ add_openmw_dir (mwscript
 add_openmw_dir (mwlua
     luamanagerimp actions object worldview userdataserializer eventqueue query
     luabindings localscripts objectbindings cellbindings asyncbindings settingsbindings
-    camerabindings uibindings inputbindings
+    camerabindings uibindings inputbindings nearbybindings
     )
 
 add_openmw_dir (mwsound
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index e37241d692..6526a18367 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -25,7 +25,7 @@ namespace MWLua
     {
         auto* lua = context.mLua;
         sol::table api(lua->sol(), sol::create);
-        api["API_REVISION"] = 5;
+        api["API_REVISION"] = 6;
         api["quit"] = [lua]()
         {
             std::string traceback = lua->sol()["debug"]["traceback"]().get<std::string>();
@@ -110,36 +110,6 @@ namespace MWLua
         return LuaUtil::makeReadOnly(api);
     }
 
-    sol::table initNearbyPackage(const Context& context)
-    {
-        sol::table api(context.mLua->sol(), sol::create);
-        WorldView* worldView = context.mWorldView;
-        api["activators"] = LObjectList{worldView->getActivatorsInScene()};
-        api["actors"] = LObjectList{worldView->getActorsInScene()};
-        api["containers"] = LObjectList{worldView->getContainersInScene()};
-        api["doors"] = LObjectList{worldView->getDoorsInScene()};
-        api["items"] = LObjectList{worldView->getItemsInScene()};
-        api["selectObjects"] = [context](const Queries::Query& query)
-        {
-            ObjectIdList list;
-            WorldView* worldView = context.mWorldView;
-            if (query.mQueryType == "activators")
-                list = worldView->getActivatorsInScene();
-            else if (query.mQueryType == "actors")
-                list = worldView->getActorsInScene();
-            else if (query.mQueryType == "containers")
-                list = worldView->getContainersInScene();
-            else if (query.mQueryType == "doors")
-                list = worldView->getDoorsInScene();
-            else if (query.mQueryType == "items")
-                list = worldView->getItemsInScene();
-            return LObjectList{selectObjectsFromList(query, list, context)};
-            // TODO: Maybe use sqlite
-            // return LObjectList{worldView->selectObjects(query, true)};
-        };
-        return LuaUtil::makeReadOnly(api);
-    }
-
     sol::table initQueryPackage(const Context& context)
     {
         Queries::registerQueryBindings(context.mLua->sol());
diff --git a/apps/openmw/mwlua/luabindings.hpp b/apps/openmw/mwlua/luabindings.hpp
index c58b556a3d..d34ff3d727 100644
--- a/apps/openmw/mwlua/luabindings.hpp
+++ b/apps/openmw/mwlua/luabindings.hpp
@@ -21,11 +21,13 @@ namespace MWLua
 
     sol::table initCorePackage(const Context&);
     sol::table initWorldPackage(const Context&);
-    sol::table initNearbyPackage(const Context&);
     sol::table initQueryPackage(const Context&);
 
     sol::table initFieldGroup(const Context&, const QueryFieldGroup&);
 
+    // Implemented in nearbybindings.cpp
+    sol::table initNearbyPackage(const Context&);
+
     // Implemented in objectbindings.cpp
     void initObjectBindingsForLocalScripts(const Context&);
     void initObjectBindingsForGlobalScripts(const Context&);
diff --git a/apps/openmw/mwlua/nearbybindings.cpp b/apps/openmw/mwlua/nearbybindings.cpp
new file mode 100644
index 0000000000..16e55bd6b1
--- /dev/null
+++ b/apps/openmw/mwlua/nearbybindings.cpp
@@ -0,0 +1,108 @@
+#include "luabindings.hpp"
+
+#include <components/lua/luastate.hpp>
+#include <components/queries/luabindings.hpp>
+
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+#include "../mwphysics/raycasting.hpp"
+
+#include "worldview.hpp"
+
+namespace sol
+{
+    template <>
+    struct is_automagical<MWPhysics::RayCastingResult> : std::false_type {};
+}
+
+namespace MWLua
+{
+    sol::table initNearbyPackage(const Context& context)
+    {
+        sol::table api(context.mLua->sol(), sol::create);
+        WorldView* worldView = context.mWorldView;
+
+        sol::usertype<MWPhysics::RayCastingResult> rayResult =
+            context.mLua->sol().new_usertype<MWPhysics::RayCastingResult>("RayCastingResult");
+        rayResult["hit"] = sol::readonly_property([](const MWPhysics::RayCastingResult& r) { return r.mHit; });
+        rayResult["hitPos"] = sol::readonly_property([](const MWPhysics::RayCastingResult& r) -> sol::optional<osg::Vec3f>
+        {
+            if (r.mHit)
+                return r.mHitPos;
+            else
+                return sol::nullopt;
+        });
+        rayResult["hitNormal"] = sol::readonly_property([](const MWPhysics::RayCastingResult& r) -> sol::optional<osg::Vec3f>
+        {
+            if (r.mHit)
+                return r.mHitNormal;
+            else
+                return sol::nullopt;
+        });
+        rayResult["hitObject"] = sol::readonly_property([worldView](const MWPhysics::RayCastingResult& r) -> sol::optional<LObject>
+        {
+            if (r.mHitObject.isEmpty())
+                return sol::nullopt;
+            else
+                return LObject(getId(r.mHitObject), worldView->getObjectRegistry());
+        });
+
+        constexpr int defaultCollisionType = MWPhysics::CollisionType_World | MWPhysics::CollisionType_HeightMap |
+                                             MWPhysics::CollisionType_Actor | MWPhysics::CollisionType_Door;
+        api["COLLISION_TYPE"] = LuaUtil::makeReadOnly(context.mLua->sol().create_table_with(
+            "World", MWPhysics::CollisionType_World,
+            "Door", MWPhysics::CollisionType_Door,
+            "Actor", MWPhysics::CollisionType_Actor,
+            "HeightMap", MWPhysics::CollisionType_HeightMap,
+            "Projectile", MWPhysics::CollisionType_Projectile,
+            "Water", MWPhysics::CollisionType_Water,
+            "Default", defaultCollisionType));
+
+        api["castRay"] = [defaultCollisionType](const osg::Vec3f& from, const osg::Vec3f& to, sol::optional<sol::table> options)
+        {
+            MWWorld::Ptr ignore;
+            int collisionType = defaultCollisionType;
+            float radius = 0;
+            if (options)
+            {
+                sol::optional<LObject> ignoreObj = options->get<sol::optional<LObject>>("ignore");
+                if (ignoreObj) ignore = ignoreObj->ptr();
+                collisionType = options->get<sol::optional<int>>("collisionType").value_or(collisionType);
+                radius = options->get<sol::optional<float>>("radius").value_or(0);
+            }
+            const MWPhysics::RayCastingInterface* rayCasting = MWBase::Environment::get().getWorld()->getRayCasting();
+            if (radius <= 0)
+                return rayCasting->castRay(from, to, ignore, std::vector<MWWorld::Ptr>(), collisionType);
+            else
+            {
+                if (!ignore.isEmpty()) throw std::logic_error("Currently castRay doesn't support `ignore` when radius > 0");
+                return rayCasting->castSphere(from, to, radius, collisionType);
+            }
+        };
+
+        api["activators"] = LObjectList{worldView->getActivatorsInScene()};
+        api["actors"] = LObjectList{worldView->getActorsInScene()};
+        api["containers"] = LObjectList{worldView->getContainersInScene()};
+        api["doors"] = LObjectList{worldView->getDoorsInScene()};
+        api["items"] = LObjectList{worldView->getItemsInScene()};
+        api["selectObjects"] = [context](const Queries::Query& query)
+        {
+            ObjectIdList list;
+            WorldView* worldView = context.mWorldView;
+            if (query.mQueryType == "activators")
+                list = worldView->getActivatorsInScene();
+            else if (query.mQueryType == "actors")
+                list = worldView->getActorsInScene();
+            else if (query.mQueryType == "containers")
+                list = worldView->getContainersInScene();
+            else if (query.mQueryType == "doors")
+                list = worldView->getDoorsInScene();
+            else if (query.mQueryType == "items")
+                list = worldView->getItemsInScene();
+            return LObjectList{selectObjectsFromList(query, list, context)};
+            // TODO: Maybe use sqlite
+            // return LObjectList{worldView->selectObjects(query, true)};
+        };
+        return LuaUtil::makeReadOnly(api);
+    }
+}
diff --git a/files/lua_api/openmw/nearby.lua b/files/lua_api/openmw/nearby.lua
index c24d5e3d10..f1aeb07b24 100644
--- a/files/lua_api/openmw/nearby.lua
+++ b/files/lua_api/openmw/nearby.lua
@@ -32,5 +32,47 @@
 -- @param openmw.query#Query query
 -- @return openmw.core#ObjectList
 
+-------------------------------------------------------------------------------
+-- @type COLLISION_TYPE
+-- @field [parent=#COLLISION_TYPE] #number World
+-- @field [parent=#COLLISION_TYPE] #number Door
+-- @field [parent=#COLLISION_TYPE] #number Actor
+-- @field [parent=#COLLISION_TYPE] #number HeightMap
+-- @field [parent=#COLLISION_TYPE] #number Projectile
+-- @field [parent=#COLLISION_TYPE] #number Water
+-- @field [parent=#COLLISION_TYPE] #number Default Used by deafult: World+Door+Actor+HeightMap
+
+-------------------------------------------------------------------------------
+-- Collision types that are used in `castRay`.
+-- Several types can be combined with '+'.
+-- @field [parent=#nearby] #COLLISION_TYPE COLLISION_TYPE
+
+-------------------------------------------------------------------------------
+-- Result of raycasing
+-- @type RayCastingResult
+-- @field [parent=#RayCastingResult] #boolean hit Is there a collision? (true/false)
+-- @field [parent=#RayCastingResult] openmw.util#Vector3 hitPos Position of the collision point (nil if no collision)
+-- @field [parent=#RayCastingResult] openmw.util#Vector3 hitNormal Normal to the surface in the collision point (nil if no collision)
+-- @field [parent=#RayCastingResult] openmw.core#GameObject hitObject The object the ray has collided with (can be nil)
+
+-------------------------------------------------------------------------------
+-- Cast ray from one point to another and return the first collision.
+-- @function [parent=#nearby] castRay
+-- @param openmw.util#Vector3 from Start point of the ray.
+-- @param openmw.util#Vector3 to End point of the ray.
+-- @param #table options An optional table with additional optional arguments. Can contain:  
+-- `ignore` - an object to ignore (specify here the source of the ray);  
+-- `collisionType` - object types to work with (see @{openmw.nearby#COLLISION_TYPE}), several types can be combined with '+';  
+-- `radius` - the radius of the ray (zero by default). If not zero then castRay actually casts a sphere with given radius.  
+-- NOTE: currently `ignore` is not supported if `radius>0`.
+-- @return #RayCastingResult
+-- @usage if nearby.castRay(pointA, pointB).hit then print('obstacle between A and B') end
+-- @usage local res = nearby.castRay(self.position, enemy.position, {ignore=self})
+-- if res.hitObject and res.hitObject ~= enemy then obstacle = res.hitObject end
+-- @usage local res = nearby.castRay(self.position, targetPos, {
+--     collisionType=nearby.COLLISION_TYPE.HeightMap + nearby.COLLISION_TYPE.Water,
+--     radius = 10,
+-- })
+
 return nil
 

From fb3917fc1ae00e2deb3dd5a3c85c6ed22c344172 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Fri, 27 Aug 2021 09:26:38 +0200
Subject: [PATCH 1370/2859] Lua callbacks

---
 apps/openmw/mwlua/asyncbindings.cpp  |  9 +++++++-
 apps/openmw/mwlua/luabindings.hpp    |  2 +-
 apps/openmw/mwlua/luamanagerimp.cpp  | 15 +++++++++++++
 apps/openmw/mwlua/luamanagerimp.hpp  | 32 ++++++++++++++++++++++++++++
 apps/openmw/mwlua/nearbybindings.cpp | 14 ++++++++++++
 components/lua/scriptscontainer.cpp  | 12 +++++++++++
 components/lua/scriptscontainer.hpp  |  4 +++-
 files/lua_api/openmw/async.lua       |  7 ++++++
 8 files changed, 92 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwlua/asyncbindings.cpp b/apps/openmw/mwlua/asyncbindings.cpp
index fee6788b89..9fdda53d9d 100644
--- a/apps/openmw/mwlua/asyncbindings.cpp
+++ b/apps/openmw/mwlua/asyncbindings.cpp
@@ -1,5 +1,7 @@
 #include "luabindings.hpp"
 
+#include "luamanagerimp.hpp"
+
 namespace sol
 {
     template <>
@@ -48,11 +50,16 @@ namespace MWLua
             asyncId.mContainer->setupUnsavableTimer(
                 TimeUnit::HOURS, world->getGameTimeInHours() + delay, asyncId.mScript, std::move(callback));
         };
+        api["callback"] = [](const AsyncPackageId& asyncId, sol::function fn)
+        {
+            return Callback{std::move(fn), asyncId.mHiddenData};
+        };
 
         auto initializer = [](sol::table hiddenData)
         {
             LuaUtil::ScriptsContainer::ScriptId id = hiddenData[LuaUtil::ScriptsContainer::ScriptId::KEY];
-            return AsyncPackageId{id.mContainer, id.mPath};
+            hiddenData[Callback::SCRIPT_NAME_KEY] = id.toString();
+            return AsyncPackageId{id.mContainer, id.mPath, hiddenData};
         };
         return sol::make_object(context.mLua->sol(), initializer);
     }
diff --git a/apps/openmw/mwlua/luabindings.hpp b/apps/openmw/mwlua/luabindings.hpp
index d34ff3d727..d1c62e43e3 100644
--- a/apps/openmw/mwlua/luabindings.hpp
+++ b/apps/openmw/mwlua/luabindings.hpp
@@ -47,9 +47,9 @@ namespace MWLua
     // Implemented in asyncbindings.cpp
     struct AsyncPackageId
     {
-        // TODO: add ObjectId mLocalObject;
         LuaUtil::ScriptsContainer* mContainer;
         std::string mScript;
+        sol::table mHiddenData;
     };
     sol::function getAsyncPackageInitializer(const Context&);
 
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 1e009081ff..38055c99b7 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -74,6 +74,16 @@ namespace MWLua
         mInitialized = true;
     }
 
+    void Callback::operator()(sol::object arg) const
+    {
+        if (mHiddenData[LuaUtil::ScriptsContainer::ScriptId::KEY] != sol::nil)
+            LuaUtil::call(mFunc, std::move(arg));
+        else
+        {
+            Log(Debug::Debug) << "Ignored callback to removed script " << mHiddenData.get<std::string>(SCRIPT_NAME_KEY);
+        }
+    }
+
     void LuaManager::update(bool paused, float dt)
     {
         ObjectRegistry* objectRegistry = mWorldView.getObjectRegistry();
@@ -126,6 +136,11 @@ namespace MWLua
                                   << ". Object not found or has no attached scripts";
         }
 
+        // Run queued callbacks
+        for (CallbackWithData& c : mQueuedCallbacks)
+            c.mCallback(c.mArg);
+        mQueuedCallbacks.clear();
+
         // Engine handlers in local scripts
         PlayerScripts* playerScripts = dynamic_cast<PlayerScripts*>(mPlayer.getRefData().getLuaScripts());
         if (playerScripts)
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index 8fdfb02701..91f48171f3 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -19,6 +19,19 @@
 namespace MWLua
 {
 
+    // Wrapper for a single-argument Lua function.
+    // Holds information about the script the function belongs to.
+    // Needed to prevent callback calls if the script was removed.
+    struct Callback
+    {
+        static constexpr std::string_view SCRIPT_NAME_KEY = "name";
+
+        sol::function mFunc;
+        sol::table mHiddenData;
+
+        void operator()(sol::object arg) const;
+    };
+
     class LuaManager : public MWBase::LuaManager
     {
     public:
@@ -67,6 +80,18 @@ namespace MWLua
         // Drops script cache and reloads all scripts. Calls `onSave` and `onLoad` for every script.
         void reloadAllScripts() override;
 
+        // Used to call Lua callbacks from C++
+        void queueCallback(Callback callback, sol::object arg) { mQueuedCallbacks.push_back({std::move(callback), std::move(arg)}); }
+
+        // Wraps Lua callback into an std::function.
+        // NOTE: Resulted function is not thread safe. Can not be used while LuaManager::update() or
+        //       any other Lua-related function is running.
+        template <class Arg>
+        std::function<void(Arg)> wrapLuaCallback(const Callback& c)
+        {
+            return [this, c](Arg arg) { this->queueCallback(c, sol::make_object(c.mFunc.lua_state(), arg)); };
+        }
+
     private:
         LocalScripts* createLocalScripts(const MWWorld::Ptr& ptr);
 
@@ -100,6 +125,13 @@ namespace MWLua
         std::vector<MWBase::LuaManager::InputEvent> mInputEvents;
         std::vector<ObjectId> mActorAddedEvents;
 
+        struct CallbackWithData
+        {
+            Callback mCallback;
+            sol::object mArg;
+        };
+        std::vector<CallbackWithData> mQueuedCallbacks;
+
         struct LocalEngineEvent
         {
             ObjectId mDest;
diff --git a/apps/openmw/mwlua/nearbybindings.cpp b/apps/openmw/mwlua/nearbybindings.cpp
index 16e55bd6b1..8eae46a9b7 100644
--- a/apps/openmw/mwlua/nearbybindings.cpp
+++ b/apps/openmw/mwlua/nearbybindings.cpp
@@ -79,6 +79,20 @@ namespace MWLua
                 return rayCasting->castSphere(from, to, radius, collisionType);
             }
         };
+        // TODO: async raycasting
+        /*api["asyncCastRay"] = [luaManager = context.mLuaManager, defaultCollisionType](
+            const Callback& luaCallback, const osg::Vec3f& from, const osg::Vec3f& to, sol::optional<sol::table> options)
+        {
+            std::function<void(MWPhysics::RayCastingResult)> callback =
+                luaManager->wrapLuaCallback<MWPhysics::RayCastingResult>(luaCallback);
+            MWPhysics::RayCastingInterface* rayCasting = MWBase::Environment::get().getWorld()->getRayCasting();
+
+            // Handle options the same way as in `castRay`.
+
+            // NOTE: `callback` is not thread safe. If MWPhysics works in separate thread, it must put results to a queue
+            //       and use this callback from the main thread at the beginning of the next frame processing.
+            rayCasting->asyncCastRay(callback, from, to, ignore, std::vector<MWWorld::Ptr>(), collisionType);
+        };*/
 
         api["activators"] = LObjectList{worldView->getActivatorsInScene()};
         api["actors"] = LObjectList{worldView->getActorsInScene()};
diff --git a/components/lua/scriptscontainer.cpp b/components/lua/scriptscontainer.cpp
index 6e0a19b120..b6882b0988 100644
--- a/components/lua/scriptscontainer.cpp
+++ b/components/lua/scriptscontainer.cpp
@@ -16,6 +16,15 @@ namespace LuaUtil
     static constexpr std::string_view REGISTERED_TIMER_CALLBACKS = "_timers";
     static constexpr std::string_view TEMPORARY_TIMER_CALLBACKS = "_temp_timers";
 
+    std::string ScriptsContainer::ScriptId::toString() const
+    {
+        std::string res = mContainer->mNamePrefix;
+        res.push_back('[');
+        res.append(mPath);
+        res.push_back(']');
+        return res;
+    }
+
     ScriptsContainer::ScriptsContainer(LuaUtil::LuaState* lua, std::string_view namePrefix) : mNamePrefix(namePrefix), mLua(*lua)
     {
         registerEngineHandlers({&mUpdateHandlers});
@@ -81,6 +90,7 @@ namespace LuaUtil
         auto scriptIter = mScripts.find(path);
         if (scriptIter == mScripts.end())
             return false;  // no such script
+        scriptIter->second.mHiddenData[ScriptId::KEY] = sol::nil;
         sol::object& script = scriptIter->second.mInterface;
         if (getFieldOrNil(script, INTERFACE_NAME) != sol::nil)
         {
@@ -320,6 +330,8 @@ namespace LuaUtil
 
     void ScriptsContainer::removeAllScripts()
     {
+        for (auto& [_, script] : mScripts)
+            script.mHiddenData[ScriptId::KEY] = sol::nil;
         mScripts.clear();
         mScriptOrder.clear();
         for (auto& [_, handlers] : mEngineHandlers)
diff --git a/components/lua/scriptscontainer.hpp b/components/lua/scriptscontainer.hpp
index d3141a2ca3..0bf50b8793 100644
--- a/components/lua/scriptscontainer.hpp
+++ b/components/lua/scriptscontainer.hpp
@@ -66,6 +66,8 @@ namespace LuaUtil
 
             ScriptsContainer* mContainer;
             std::string mPath;
+
+            std::string toString() const;
         };
         using TimeUnit = ESM::LuaTimer::TimeUnit;
 
@@ -73,7 +75,7 @@ namespace LuaUtil
         ScriptsContainer(LuaUtil::LuaState* lua, std::string_view namePrefix);
         ScriptsContainer(const ScriptsContainer&) = delete;
         ScriptsContainer(ScriptsContainer&&) = delete;
-        virtual ~ScriptsContainer() {}
+        virtual ~ScriptsContainer() { removeAllScripts(); }
 
         // Adds package that will be available (via `require`) for all scripts in the container.
         // Automatically applies LuaUtil::makeReadOnly to the package.
diff --git a/files/lua_api/openmw/async.lua b/files/lua_api/openmw/async.lua
index 68f63b5193..cc3a233f8a 100644
--- a/files/lua_api/openmw/async.lua
+++ b/files/lua_api/openmw/async.lua
@@ -48,5 +48,12 @@
 -- @param #number delay
 -- @param #function func
 
+-------------------------------------------------------------------------------
+-- Wraps Lua function with `Callback` object that can be used in async API calls.
+-- @function [parent=#async] callback
+-- @param self
+-- @param #function func
+-- @return #Callback
+
 return nil
 

From e41fe7573a90ac649ec6d4c8775c39956103d3da Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Tue, 28 Sep 2021 08:17:12 +0000
Subject: [PATCH 1371/2859] avoids creating empty statesets for collada nodes
 (#3128)

* avoids creating empty statesets for collada nodes

With this PR we avoid creating empty statesets for collada nodes which will be detrimental to osg's draw performance.

* scenemanager.cpp
---
 components/resource/scenemanager.cpp | 50 ++++++++++++++++------------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 68596985ce..2099d514f7 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -243,19 +243,22 @@ namespace Resource
 
         void apply(osg::Node& node) override
         {
-            if (node.getOrCreateStateSet()->getRenderingHint() == osg::StateSet::TRANSPARENT_BIN)
+            if (osg::StateSet* stateset = node.getStateSet())
             {
-                osg::ref_ptr<osg::Depth> depth = SceneUtil::createDepth();
-                depth->setWriteMask(false);
+                if (stateset->getRenderingHint() == osg::StateSet::TRANSPARENT_BIN)
+                {
+                    osg::ref_ptr<osg::Depth> depth = SceneUtil::createDepth();
+                    depth->setWriteMask(false);
 
-                node.getOrCreateStateSet()->setAttributeAndModes(depth, osg::StateAttribute::ON);
-            }
-            else if (node.getOrCreateStateSet()->getRenderingHint() == osg::StateSet::OPAQUE_BIN)
-            {
-                osg::ref_ptr<osg::Depth> depth = SceneUtil::createDepth();
-                depth->setWriteMask(true);
+                    stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
+                }
+                else if (stateset->getRenderingHint() == osg::StateSet::OPAQUE_BIN)
+                {
+                    osg::ref_ptr<osg::Depth> depth = SceneUtil::createDepth();
+                    depth->setWriteMask(true);
 
-                node.getOrCreateStateSet()->setAttributeAndModes(depth, osg::StateAttribute::ON);
+                    stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
+                }
             }
 
             /* Check if the <node> has <extra type="Node"> <technique profile="OpenSceneGraph"> <Descriptions> <Description>
@@ -268,22 +271,25 @@ namespace Resource
             }
 
             // Iterate each description, and see if the current node uses the specified material for alpha testing
-            for (auto description : mDescriptions)
+            if (node.getStateSet())
             {
-                std::vector<std::string> descriptionParts;
-                std::istringstream descriptionStringStream(description);
-                for (std::string part; std::getline(descriptionStringStream, part, ' ');)
+                for (auto description : mDescriptions)
                 {
-                    descriptionParts.emplace_back(part);
-                }
+                    std::vector<std::string> descriptionParts;
+                    std::istringstream descriptionStringStream(description);
+                    for (std::string part; std::getline(descriptionStringStream, part, ' ');)
+                    {
+                        descriptionParts.emplace_back(part);
+                    }
 
-                if (descriptionParts.size() > (3) && descriptionParts.at(3) == node.getOrCreateStateSet()->getName())
-                {
-                    if (descriptionParts.at(0) == "alphatest")
+                    if (descriptionParts.size() > (3) && descriptionParts.at(3) == node.getStateSet()->getName())
                     {
-                        osg::AlphaFunc::ComparisonFunction mode = getTestMode(descriptionParts.at(1));
-                        osg::ref_ptr<osg::AlphaFunc> alphaFunc (new osg::AlphaFunc(mode, std::stod(descriptionParts.at(2))));
-                        node.getOrCreateStateSet()->setAttributeAndModes(alphaFunc, osg::StateAttribute::ON);
+                        if (descriptionParts.at(0) == "alphatest")
+                        {
+                            osg::AlphaFunc::ComparisonFunction mode = getTestMode(descriptionParts.at(1));
+                            osg::ref_ptr<osg::AlphaFunc> alphaFunc (new osg::AlphaFunc(mode, std::stod(descriptionParts.at(2))));
+                            node.getStateSet()->setAttributeAndModes(alphaFunc, osg::StateAttribute::ON);
+                        }
                     }
                 }
             }

From eb2f863b7d6ff5e1340e31ed6430693ce3d939db Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Tue, 28 Sep 2021 12:25:37 +0200
Subject: [PATCH 1372/2859] Resolve `unused-lambda-capture` warnings

---
 apps/openmw/mwlua/actions.cpp        |  4 ++--
 apps/openmw/mwlua/nearbybindings.cpp | 10 ++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwlua/actions.cpp b/apps/openmw/mwlua/actions.cpp
index 1f75760f7c..aad70d1a57 100644
--- a/apps/openmw/mwlua/actions.cpp
+++ b/apps/openmw/mwlua/actions.cpp
@@ -51,8 +51,8 @@ namespace MWLua
         std::array<bool, MWWorld::InventoryStore::Slots> usedSlots;
         std::fill(usedSlots.begin(), usedSlots.end(), false);
 
-        constexpr int anySlot = -1;
-        auto tryEquipToSlot = [&actor, &store, &usedSlots, &worldView, anySlot](int slot, const Item& item) -> bool
+        static constexpr int anySlot = -1;
+        auto tryEquipToSlot = [&actor, &store, &usedSlots, &worldView](int slot, const Item& item) -> bool
         {
             auto old_it = slot != anySlot ? store.getSlot(slot) : store.end();
             MWWorld::Ptr itemPtr;
diff --git a/apps/openmw/mwlua/nearbybindings.cpp b/apps/openmw/mwlua/nearbybindings.cpp
index 8eae46a9b7..011d0ae9f3 100644
--- a/apps/openmw/mwlua/nearbybindings.cpp
+++ b/apps/openmw/mwlua/nearbybindings.cpp
@@ -47,8 +47,6 @@ namespace MWLua
                 return LObject(getId(r.mHitObject), worldView->getObjectRegistry());
         });
 
-        constexpr int defaultCollisionType = MWPhysics::CollisionType_World | MWPhysics::CollisionType_HeightMap |
-                                             MWPhysics::CollisionType_Actor | MWPhysics::CollisionType_Door;
         api["COLLISION_TYPE"] = LuaUtil::makeReadOnly(context.mLua->sol().create_table_with(
             "World", MWPhysics::CollisionType_World,
             "Door", MWPhysics::CollisionType_Door,
@@ -56,12 +54,12 @@ namespace MWLua
             "HeightMap", MWPhysics::CollisionType_HeightMap,
             "Projectile", MWPhysics::CollisionType_Projectile,
             "Water", MWPhysics::CollisionType_Water,
-            "Default", defaultCollisionType));
+            "Default", MWPhysics::CollisionType_Default));
 
-        api["castRay"] = [defaultCollisionType](const osg::Vec3f& from, const osg::Vec3f& to, sol::optional<sol::table> options)
+        api["castRay"] = [](const osg::Vec3f& from, const osg::Vec3f& to, sol::optional<sol::table> options)
         {
             MWWorld::Ptr ignore;
-            int collisionType = defaultCollisionType;
+            int collisionType = MWPhysics::CollisionType_Default;
             float radius = 0;
             if (options)
             {
@@ -80,7 +78,7 @@ namespace MWLua
             }
         };
         // TODO: async raycasting
-        /*api["asyncCastRay"] = [luaManager = context.mLuaManager, defaultCollisionType](
+        /*api["asyncCastRay"] = [luaManager = context.mLuaManager](
             const Callback& luaCallback, const osg::Vec3f& from, const osg::Vec3f& to, sol::optional<sol::table> options)
         {
             std::function<void(MWPhysics::RayCastingResult)> callback =

From 48538d5ceff0ca4d809e4606d2cecc94903a1dcf Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 19 Sep 2021 14:43:15 +0200
Subject: [PATCH 1373/2859] 3D transforms in Lua

---
 apps/openmw/mwlua/luabindings.cpp             |   2 +-
 .../lua/test_utilpackage.cpp                  | 121 ++++++++----
 components/lua/utilpackage.cpp                | 174 +++++++++++++-----
 components/lua/utilpackage.hpp                |  15 +-
 files/lua_api/openmw/util.lua                 |  87 ++++++++-
 5 files changed, 309 insertions(+), 90 deletions(-)

diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index 6526a18367..aceffc24db 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -25,7 +25,7 @@ namespace MWLua
     {
         auto* lua = context.mLua;
         sol::table api(lua->sol(), sol::create);
-        api["API_REVISION"] = 6;
+        api["API_REVISION"] = 7;
         api["quit"] = [lua]()
         {
             std::string traceback = lua->sol()["debug"]["traceback"]().get<std::string>();
diff --git a/apps/openmw_test_suite/lua/test_utilpackage.cpp b/apps/openmw_test_suite/lua/test_utilpackage.cpp
index fb8e48e461..934cbf761a 100644
--- a/apps/openmw_test_suite/lua/test_utilpackage.cpp
+++ b/apps/openmw_test_suite/lua/test_utilpackage.cpp
@@ -10,30 +10,41 @@ namespace
 {
     using namespace testing;
 
+    template <typename T>
+    T get(sol::state& lua, std::string luaCode)
+    {
+        return lua.safe_script("return " + luaCode).get<T>();
+    }
+
+    std::string getAsString(sol::state& lua, std::string luaCode)
+    {
+        return LuaUtil::toString(lua.safe_script("return " + luaCode));
+    }
+
     TEST(LuaUtilPackageTest, Vector2)
     {
         sol::state lua;
         lua.open_libraries(sol::lib::base, sol::lib::math, sol::lib::string);
         lua["util"] = LuaUtil::initUtilPackage(lua);
         lua.safe_script("v = util.vector2(3, 4)");
-        EXPECT_FLOAT_EQ(lua.safe_script("return v.x").get<float>(), 3);
-        EXPECT_FLOAT_EQ(lua.safe_script("return v.y").get<float>(), 4);
-        EXPECT_EQ(lua.safe_script("return tostring(v)").get<std::string>(), "(3, 4)");
-        EXPECT_FLOAT_EQ(lua.safe_script("return v:length()").get<float>(), 5);
-        EXPECT_FLOAT_EQ(lua.safe_script("return v:length2()").get<float>(), 25);
-        EXPECT_FALSE(lua.safe_script("return util.vector2(1, 2) == util.vector2(1, 3)").get<bool>());
-        EXPECT_TRUE(lua.safe_script("return util.vector2(1, 2) + util.vector2(2, 5) == util.vector2(3, 7)").get<bool>());
-        EXPECT_TRUE(lua.safe_script("return util.vector2(1, 2) - util.vector2(2, 5) == -util.vector2(1, 3)").get<bool>());
-        EXPECT_TRUE(lua.safe_script("return util.vector2(1, 2) == util.vector2(2, 4) / 2").get<bool>());
-        EXPECT_TRUE(lua.safe_script("return util.vector2(1, 2) * 2 == util.vector2(2, 4)").get<bool>());
-        EXPECT_FLOAT_EQ(lua.safe_script("return util.vector2(3, 2) * v").get<float>(), 17);
-        EXPECT_FLOAT_EQ(lua.safe_script("return util.vector2(3, 2):dot(v)").get<float>(), 17);
+        EXPECT_FLOAT_EQ(get<float>(lua, "v.x"), 3);
+        EXPECT_FLOAT_EQ(get<float>(lua, "v.y"), 4);
+        EXPECT_EQ(get<std::string>(lua, "tostring(v)"), "(3, 4)");
+        EXPECT_FLOAT_EQ(get<float>(lua, "v:length()"), 5);
+        EXPECT_FLOAT_EQ(get<float>(lua, "v:length2()"), 25);
+        EXPECT_FALSE(get<bool>(lua, "util.vector2(1, 2) == util.vector2(1, 3)"));
+        EXPECT_TRUE(get<bool>(lua, "util.vector2(1, 2) + util.vector2(2, 5) == util.vector2(3, 7)"));
+        EXPECT_TRUE(get<bool>(lua, "util.vector2(1, 2) - util.vector2(2, 5) == -util.vector2(1, 3)"));
+        EXPECT_TRUE(get<bool>(lua, "util.vector2(1, 2) == util.vector2(2, 4) / 2"));
+        EXPECT_TRUE(get<bool>(lua, "util.vector2(1, 2) * 2 == util.vector2(2, 4)"));
+        EXPECT_FLOAT_EQ(get<float>(lua, "util.vector2(3, 2) * v"), 17);
+        EXPECT_FLOAT_EQ(get<float>(lua, "util.vector2(3, 2):dot(v)"), 17);
         EXPECT_ERROR(lua.safe_script("v2, len = v.normalize()"), "value is not a valid userdata");  // checks that it doesn't segfault
         lua.safe_script("v2, len = v:normalize()");
-        EXPECT_FLOAT_EQ(lua.safe_script("return len").get<float>(), 5);
-        EXPECT_TRUE(lua.safe_script("return v2 == util.vector2(3/5, 4/5)").get<bool>());
+        EXPECT_FLOAT_EQ(get<float>(lua, "len"), 5);
+        EXPECT_TRUE(get<bool>(lua, "v2 == util.vector2(3/5, 4/5)"));
         lua.safe_script("_, len = util.vector2(0, 0):normalize()");
-        EXPECT_FLOAT_EQ(lua.safe_script("return len").get<float>(), 0);
+        EXPECT_FLOAT_EQ(get<float>(lua, "len"), 0);
     }
 
     TEST(LuaUtilPackageTest, Vector3)
@@ -42,27 +53,59 @@ namespace
         lua.open_libraries(sol::lib::base, sol::lib::math, sol::lib::string);
         lua["util"] = LuaUtil::initUtilPackage(lua);
         lua.safe_script("v = util.vector3(5, 12, 13)");
-        EXPECT_FLOAT_EQ(lua.safe_script("return v.x").get<float>(), 5);
-        EXPECT_FLOAT_EQ(lua.safe_script("return v.y").get<float>(), 12);
-        EXPECT_FLOAT_EQ(lua.safe_script("return v.z").get<float>(), 13);
-        EXPECT_EQ(lua.safe_script("return tostring(v)").get<std::string>(), "(5, 12, 13)");
-        EXPECT_EQ(LuaUtil::toString(lua.safe_script("return v")), "(5, 12, 13)");
-        EXPECT_FLOAT_EQ(lua.safe_script("return util.vector3(4, 0, 3):length()").get<float>(), 5);
-        EXPECT_FLOAT_EQ(lua.safe_script("return util.vector3(4, 0, 3):length2()").get<float>(), 25);
-        EXPECT_FALSE(lua.safe_script("return util.vector3(1, 2, 3) == util.vector3(1, 3, 2)").get<bool>());
-        EXPECT_TRUE(lua.safe_script("return util.vector3(1, 2, 3) + util.vector3(2, 5, 1) == util.vector3(3, 7, 4)").get<bool>());
-        EXPECT_TRUE(lua.safe_script("return util.vector3(1, 2, 3) - util.vector3(2, 5, 1) == -util.vector3(1, 3, -2)").get<bool>());
-        EXPECT_TRUE(lua.safe_script("return util.vector3(1, 2, 3) == util.vector3(2, 4, 6) / 2").get<bool>());
-        EXPECT_TRUE(lua.safe_script("return util.vector3(1, 2, 3) * 2 == util.vector3(2, 4, 6)").get<bool>());
-        EXPECT_FLOAT_EQ(lua.safe_script("return util.vector3(3, 2, 1) * v").get<float>(), 5*3 + 12*2 + 13*1);
-        EXPECT_FLOAT_EQ(lua.safe_script("return util.vector3(3, 2, 1):dot(v)").get<float>(), 5*3 + 12*2 + 13*1);
-        EXPECT_TRUE(lua.safe_script("return util.vector3(1, 0, 0) ^ util.vector3(0, 1, 0) == util.vector3(0, 0, 1)").get<bool>());
+        EXPECT_FLOAT_EQ(get<float>(lua, "v.x"), 5);
+        EXPECT_FLOAT_EQ(get<float>(lua, "v.y"), 12);
+        EXPECT_FLOAT_EQ(get<float>(lua, "v.z"), 13);
+        EXPECT_EQ(get<std::string>(lua, "tostring(v)"), "(5, 12, 13)");
+        EXPECT_EQ(getAsString(lua, "v"), "(5, 12, 13)");
+        EXPECT_FLOAT_EQ(get<float>(lua, "util.vector3(4, 0, 3):length()"), 5);
+        EXPECT_FLOAT_EQ(get<float>(lua, "util.vector3(4, 0, 3):length2()"), 25);
+        EXPECT_FALSE(get<bool>(lua, "util.vector3(1, 2, 3) == util.vector3(1, 3, 2)"));
+        EXPECT_TRUE(get<bool>(lua, "util.vector3(1, 2, 3) + util.vector3(2, 5, 1) == util.vector3(3, 7, 4)"));
+        EXPECT_TRUE(get<bool>(lua, "util.vector3(1, 2, 3) - util.vector3(2, 5, 1) == -util.vector3(1, 3, -2)"));
+        EXPECT_TRUE(get<bool>(lua, "util.vector3(1, 2, 3) == util.vector3(2, 4, 6) / 2"));
+        EXPECT_TRUE(get<bool>(lua, "util.vector3(1, 2, 3) * 2 == util.vector3(2, 4, 6)"));
+        EXPECT_FLOAT_EQ(get<float>(lua, "util.vector3(3, 2, 1) * v"), 5*3 + 12*2 + 13*1);
+        EXPECT_FLOAT_EQ(get<float>(lua, "util.vector3(3, 2, 1):dot(v)"), 5*3 + 12*2 + 13*1);
+        EXPECT_TRUE(get<bool>(lua, "util.vector3(1, 0, 0) ^ util.vector3(0, 1, 0) == util.vector3(0, 0, 1)"));
         EXPECT_ERROR(lua.safe_script("v2, len = util.vector3(3, 4, 0).normalize()"), "value is not a valid userdata");
         lua.safe_script("v2, len = util.vector3(3, 4, 0):normalize()");
-        EXPECT_FLOAT_EQ(lua.safe_script("return len").get<float>(), 5);
-        EXPECT_TRUE(lua.safe_script("return v2 == util.vector3(3/5, 4/5, 0)").get<bool>());
+        EXPECT_FLOAT_EQ(get<float>(lua, "len"), 5);
+        EXPECT_TRUE(get<bool>(lua, "v2 == util.vector3(3/5, 4/5, 0)"));
         lua.safe_script("_, len = util.vector3(0, 0, 0):normalize()");
-        EXPECT_FLOAT_EQ(lua.safe_script("return len").get<float>(), 0);
+        EXPECT_FLOAT_EQ(get<float>(lua, "len"), 0);
+    }
+
+    TEST(LuaUtilPackageTest, Transform)
+    {
+        sol::state lua;
+        lua.open_libraries(sol::lib::base, sol::lib::math, sol::lib::string);
+        lua["util"] = LuaUtil::initUtilPackage(lua);
+        lua["T"] = lua["util"]["transform"];
+        lua["v"] = lua["util"]["vector3"];
+        EXPECT_ERROR(lua.safe_script("T.identity = nil"), "attempt to index");
+        EXPECT_EQ(getAsString(lua, "T.identity * v(3, 4, 5)"), "(3, 4, 5)");
+        EXPECT_EQ(getAsString(lua, "T.move(1, 2, 3) * v(3, 4, 5)"), "(4, 6, 8)");
+        EXPECT_EQ(getAsString(lua, "T.scale(1, -2, 3) * v(3, 4, 5)"), "(3, -8, 15)");
+        EXPECT_EQ(getAsString(lua, "T.scale(v(1, 2, 3)) * v(3, 4, 5)"), "(3, 8, 15)");
+        lua.safe_script("moveAndScale = T.move(v(1, 2, 3)) * T.scale(0.5, 1, 0.5) * T.move(10, 20, 30)");
+        EXPECT_EQ(getAsString(lua, "moveAndScale * v(0, 0, 0)"), "(6, 22, 18)");
+        EXPECT_EQ(getAsString(lua, "moveAndScale * v(300, 200, 100)"), "(156, 222, 68)");
+        EXPECT_EQ(getAsString(lua, "moveAndScale"), "TransformM{ move(6, 22, 18) scale(0.5, 1, 0.5) }");
+        EXPECT_EQ(getAsString(lua, "T.identity"), "TransformM{ }");
+        lua.safe_script("rx = T.rotateX(math.pi / 2)");
+        lua.safe_script("ry = T.rotateY(math.pi / 2)");
+        lua.safe_script("rz = T.rotateZ(math.pi / 2)");
+        EXPECT_LT(get<float>(lua, "(rx * v(1, 2, 3) - v(1, -3, 2)):length()"), 1e-6);
+        EXPECT_LT(get<float>(lua, "(ry * v(1, 2, 3) - v(3, 2, -1)):length()"), 1e-6);
+        EXPECT_LT(get<float>(lua, "(rz * v(1, 2, 3) - v(-2, 1, 3)):length()"), 1e-6);
+        lua.safe_script("rot = T.rotate(math.pi / 2, v(-1, -1, 0)) * T.rotateZ(-math.pi / 4)");
+        EXPECT_THAT(getAsString(lua, "rot"), HasSubstr("TransformQ"));
+        EXPECT_LT(get<float>(lua, "(rot * v(1, 0, 0) - v(0, 0, 1)):length()"), 1e-6);
+        EXPECT_LT(get<float>(lua, "(rot * rot:inverse() * v(1, 0, 0) - v(1, 0, 0)):length()"), 1e-6);
+        lua.safe_script("rz_move_rx = rz * T.move(0, 3, 0) * rx");
+        EXPECT_LT(get<float>(lua, "(rz_move_rx * v(1, 2, 3) - v(0, 1, 2)):length()"), 1e-6);
+        EXPECT_LT(get<float>(lua, "(rz_move_rx:inverse() * v(0, 1, 2) - v(1, 2, 3)):length()"), 1e-6);
     }
 
     TEST(LuaUtilPackageTest, UtilityFunctions)
@@ -71,12 +114,12 @@ namespace
         lua.open_libraries(sol::lib::base, sol::lib::math, sol::lib::string);
         lua["util"] = LuaUtil::initUtilPackage(lua);
         lua.safe_script("v = util.vector2(1, 0):rotate(math.rad(120))");
-        EXPECT_FLOAT_EQ(lua.safe_script("return v.x").get<float>(), -0.5);
-        EXPECT_FLOAT_EQ(lua.safe_script("return v.y").get<float>(), 0.86602539);
-        EXPECT_FLOAT_EQ(lua.safe_script("return util.normalizeAngle(math.pi * 10 + 0.1)").get<float>(), 0.1);
-        EXPECT_FLOAT_EQ(lua.safe_script("return util.clamp(0.1, 0, 1.5)").get<float>(), 0.1);
-        EXPECT_FLOAT_EQ(lua.safe_script("return util.clamp(-0.1, 0, 1.5)").get<float>(), 0);
-        EXPECT_FLOAT_EQ(lua.safe_script("return util.clamp(2.1, 0, 1.5)").get<float>(), 1.5);
+        EXPECT_FLOAT_EQ(get<float>(lua, "v.x"), -0.5);
+        EXPECT_FLOAT_EQ(get<float>(lua, "v.y"), 0.86602539);
+        EXPECT_FLOAT_EQ(get<float>(lua, "util.normalizeAngle(math.pi * 10 + 0.1)"), 0.1);
+        EXPECT_FLOAT_EQ(get<float>(lua, "util.clamp(0.1, 0, 1.5)"), 0.1);
+        EXPECT_FLOAT_EQ(get<float>(lua, "util.clamp(-0.1, 0, 1.5)"), 0);
+        EXPECT_FLOAT_EQ(get<float>(lua, "util.clamp(2.1, 0, 1.5)"), 1.5);
     }
 
 }
diff --git a/components/lua/utilpackage.cpp b/components/lua/utilpackage.cpp
index abcc6d424e..17cb64461a 100644
--- a/components/lua/utilpackage.cpp
+++ b/components/lua/utilpackage.cpp
@@ -3,17 +3,23 @@
 #include <algorithm>
 #include <sstream>
 
-#include <osg/Vec3f>
-
 #include <components/misc/mathutil.hpp>
 
+#include "luastate.hpp"
+
 namespace sol
 {
     template <>
-    struct is_automagical<osg::Vec2f> : std::false_type {};
+    struct is_automagical<LuaUtil::Vec2> : std::false_type {};
 
     template <>
-    struct is_automagical<osg::Vec3f> : std::false_type {};
+    struct is_automagical<LuaUtil::Vec3> : std::false_type {};
+
+    template <>
+    struct is_automagical<LuaUtil::TransformM> : std::false_type {};
+
+    template <>
+    struct is_automagical<LuaUtil::TransformQ> : std::false_type {};
 }
 
 namespace LuaUtil
@@ -23,70 +29,148 @@ namespace LuaUtil
     {
         sol::table util(lua, sol::create);
 
-        // TODO: Add bindings for osg::Matrix
-
-        // Lua bindings for osg::Vec2f
-        util["vector2"] = [](float x, float y) { return osg::Vec2f(x, y); };
-        sol::usertype<osg::Vec2f> vec2Type = lua.new_usertype<osg::Vec2f>("Vec2");
-        vec2Type["x"] = sol::readonly_property([](const osg::Vec2f& v) -> float { return v.x(); } );
-        vec2Type["y"] = sol::readonly_property([](const osg::Vec2f& v) -> float { return v.y(); } );
-        vec2Type[sol::meta_function::to_string] = [](const osg::Vec2f& v) {
+        // Lua bindings for Vec2
+        util["vector2"] = [](float x, float y) { return Vec2(x, y); };
+        sol::usertype<Vec2> vec2Type = lua.new_usertype<Vec2>("Vec2");
+        vec2Type["x"] = sol::readonly_property([](const Vec2& v) -> float { return v.x(); } );
+        vec2Type["y"] = sol::readonly_property([](const Vec2& v) -> float { return v.y(); } );
+        vec2Type[sol::meta_function::to_string] = [](const Vec2& v) {
             std::stringstream ss;
             ss << "(" << v.x() << ", " << v.y() << ")";
             return ss.str();
         };
-        vec2Type[sol::meta_function::unary_minus] = [](const osg::Vec2f& a) { return -a; };
-        vec2Type[sol::meta_function::addition] = [](const osg::Vec2f& a, const osg::Vec2f& b) { return a + b; };
-        vec2Type[sol::meta_function::subtraction] = [](const osg::Vec2f& a, const osg::Vec2f& b) { return a - b; };
-        vec2Type[sol::meta_function::equal_to] = [](const osg::Vec2f& a, const osg::Vec2f& b) { return a == b; };
+        vec2Type[sol::meta_function::unary_minus] = [](const Vec2& a) { return -a; };
+        vec2Type[sol::meta_function::addition] = [](const Vec2& a, const Vec2& b) { return a + b; };
+        vec2Type[sol::meta_function::subtraction] = [](const Vec2& a, const Vec2& b) { return a - b; };
+        vec2Type[sol::meta_function::equal_to] = [](const Vec2& a, const Vec2& b) { return a == b; };
         vec2Type[sol::meta_function::multiplication] = sol::overload(
-            [](const osg::Vec2f& a, float c) { return a * c; },
-            [](const osg::Vec2f& a, const osg::Vec2f& b) { return a * b; });
-        vec2Type[sol::meta_function::division] = [](const osg::Vec2f& a, float c) { return a / c; };
-        vec2Type["dot"] = [](const osg::Vec2f& a, const osg::Vec2f& b) { return a * b; };
-        vec2Type["length"] = &osg::Vec2f::length;
-        vec2Type["length2"] = &osg::Vec2f::length2;
-        vec2Type["normalize"] = [](const osg::Vec2f& v) {
+            [](const Vec2& a, float c) { return a * c; },
+            [](const Vec2& a, const Vec2& b) { return a * b; });
+        vec2Type[sol::meta_function::division] = [](const Vec2& a, float c) { return a / c; };
+        vec2Type["dot"] = [](const Vec2& a, const Vec2& b) { return a * b; };
+        vec2Type["length"] = &Vec2::length;
+        vec2Type["length2"] = &Vec2::length2;
+        vec2Type["normalize"] = [](const Vec2& v) {
             float len = v.length();
             if (len == 0)
-                return std::make_tuple(osg::Vec2f(), 0.f);
+                return std::make_tuple(Vec2(), 0.f);
             else
                 return std::make_tuple(v * (1.f / len), len);
         };
         vec2Type["rotate"] = &Misc::rotateVec2f;
 
-        // Lua bindings for osg::Vec3f
-        util["vector3"] = [](float x, float y, float z) { return osg::Vec3f(x, y, z); };
-        sol::usertype<osg::Vec3f> vec3Type = lua.new_usertype<osg::Vec3f>("Vec3");
-        vec3Type["x"] = sol::readonly_property([](const osg::Vec3f& v) -> float { return v.x(); } );
-        vec3Type["y"] = sol::readonly_property([](const osg::Vec3f& v) -> float { return v.y(); } );
-        vec3Type["z"] = sol::readonly_property([](const osg::Vec3f& v) -> float { return v.z(); } );
-        vec3Type[sol::meta_function::to_string] = [](const osg::Vec3f& v) {
+        // Lua bindings for Vec3
+        util["vector3"] = [](float x, float y, float z) { return Vec3(x, y, z); };
+        sol::usertype<Vec3> vec3Type = lua.new_usertype<Vec3>("Vec3");
+        vec3Type["x"] = sol::readonly_property([](const Vec3& v) -> float { return v.x(); } );
+        vec3Type["y"] = sol::readonly_property([](const Vec3& v) -> float { return v.y(); } );
+        vec3Type["z"] = sol::readonly_property([](const Vec3& v) -> float { return v.z(); } );
+        vec3Type[sol::meta_function::to_string] = [](const Vec3& v) {
             std::stringstream ss;
             ss << "(" << v.x() << ", " << v.y() << ", " << v.z() << ")";
             return ss.str();
         };
-        vec3Type[sol::meta_function::unary_minus] = [](const osg::Vec3f& a) { return -a; };
-        vec3Type[sol::meta_function::addition] = [](const osg::Vec3f& a, const osg::Vec3f& b) { return a + b; };
-        vec3Type[sol::meta_function::subtraction] = [](const osg::Vec3f& a, const osg::Vec3f& b) { return a - b; };
-        vec3Type[sol::meta_function::equal_to] = [](const osg::Vec3f& a, const osg::Vec3f& b) { return a == b; };
+        vec3Type[sol::meta_function::unary_minus] = [](const Vec3& a) { return -a; };
+        vec3Type[sol::meta_function::addition] = [](const Vec3& a, const Vec3& b) { return a + b; };
+        vec3Type[sol::meta_function::subtraction] = [](const Vec3& a, const Vec3& b) { return a - b; };
+        vec3Type[sol::meta_function::equal_to] = [](const Vec3& a, const Vec3& b) { return a == b; };
         vec3Type[sol::meta_function::multiplication] = sol::overload(
-            [](const osg::Vec3f& a, float c) { return a * c; },
-            [](const osg::Vec3f& a, const osg::Vec3f& b) { return a * b; });
-        vec3Type[sol::meta_function::division] = [](const osg::Vec3f& a, float c) { return a / c; };
-        vec3Type[sol::meta_function::involution] = [](const osg::Vec3f& a, const osg::Vec3f& b) { return a ^ b; };
-        vec3Type["dot"] = [](const osg::Vec3f& a, const osg::Vec3f& b) { return a * b; };
-        vec3Type["cross"] = [](const osg::Vec3f& a, const osg::Vec3f& b) { return a ^ b; };
-        vec3Type["length"] = &osg::Vec3f::length;
-        vec3Type["length2"] = &osg::Vec3f::length2;
-        vec3Type["normalize"] = [](const osg::Vec3f& v) {
+            [](const Vec3& a, float c) { return a * c; },
+            [](const Vec3& a, const Vec3& b) { return a * b; });
+        vec3Type[sol::meta_function::division] = [](const Vec3& a, float c) { return a / c; };
+        vec3Type[sol::meta_function::involution] = [](const Vec3& a, const Vec3& b) { return a ^ b; };
+        vec3Type["dot"] = [](const Vec3& a, const Vec3& b) { return a * b; };
+        vec3Type["cross"] = [](const Vec3& a, const Vec3& b) { return a ^ b; };
+        vec3Type["length"] = &Vec3::length;
+        vec3Type["length2"] = &Vec3::length2;
+        vec3Type["normalize"] = [](const Vec3& v) {
             float len = v.length();
             if (len == 0)
-                return std::make_tuple(osg::Vec3f(), 0.f);
+                return std::make_tuple(Vec3(), 0.f);
             else
                 return std::make_tuple(v * (1.f / len), len);
         };
 
+        // Lua bindings for Transform
+        sol::usertype<TransformM> transMType = lua.new_usertype<TransformM>("TransformM");
+        sol::usertype<TransformQ> transQType = lua.new_usertype<TransformQ>("TransformQ");
+        sol::table transforms(lua, sol::create);
+        util["transform"] = LuaUtil::makeReadOnly(transforms);
+
+        transforms["identity"] = sol::make_object(lua, TransformM{osg::Matrixf::identity()});
+        transforms["move"] = sol::overload(
+            [](const Vec3& v) { return TransformM{osg::Matrixf::translate(v)}; },
+            [](float x, float y, float z) { return TransformM{osg::Matrixf::translate(x, y, z)}; });
+        transforms["scale"] = sol::overload(
+            [](const Vec3& v) { return TransformM{osg::Matrixf::scale(v)}; },
+            [](float x, float y, float z) { return TransformM{osg::Matrixf::scale(x, y, z)}; });
+        transforms["rotate"] = [](float angle, const Vec3& axis) { return TransformQ{osg::Quat(angle, axis)}; };
+        transforms["rotateX"] = [](float angle) { return TransformQ{osg::Quat(angle, Vec3(1, 0, 0))}; };
+        transforms["rotateY"] = [](float angle) { return TransformQ{osg::Quat(angle, Vec3(0, 1, 0))}; };
+        transforms["rotateZ"] = [](float angle) { return TransformQ{osg::Quat(angle, Vec3(0, 0, 1))}; };
+
+        transMType[sol::meta_function::multiplication] = sol::overload(
+            [](const TransformM& a, const Vec3& b) { return a.mM.preMult(b); },
+            [](const TransformM& a, const TransformM& b) { return TransformM{b.mM * a.mM}; },
+            [](const TransformM& a, const TransformQ& b)
+            {
+                TransformM res{a.mM};
+                res.mM.preMultRotate(b.mQ);
+                return res;
+            });
+        transMType[sol::meta_function::to_string] = [](const TransformM& m)
+        {
+            osg::Vec3f trans, scale;
+            osg::Quat rotation, so;
+            m.mM.decompose(trans, rotation, scale, so);
+            osg::Quat::value_type rot_angle, so_angle;
+            osg::Vec3f rot_axis, so_axis;
+            rotation.getRotate(rot_angle, rot_axis);
+            so.getRotate(so_angle, so_axis);
+            std::stringstream ss;
+            ss << "TransformM{ ";
+            if (trans.length2() > 0)
+                ss << "move(" << trans.x() << ", " << trans.y() << ", " << trans.z() << ") ";
+            if (rot_angle != 0)
+                ss << "rotation(angle=" << rot_angle << ", axis=("
+                    << rot_axis.x() << ", " << rot_axis.y() << ", " << rot_axis.z() << ")) ";
+            if (scale.x() != 1 || scale.y() != 1 || scale.z() != 1)
+                ss << "scale(" << scale.x() << ", " << scale.y() << ", " << scale.z() << ") ";
+            if (so_angle != 0)
+                ss << "rotation(angle=" << so_angle << ", axis=("
+                    << so_axis.x() << ", " << so_axis.y() << ", " << so_axis.z() << ")) ";
+            ss << "}";
+            return ss.str();
+        };
+        transMType["inverse"] = [](const TransformM& m)
+        {
+            TransformM res;
+            if (!res.mM.invert_4x3(m.mM))
+                throw std::runtime_error("This Transform is not invertible");
+            return res;
+        };
+
+        transQType[sol::meta_function::multiplication] = sol::overload(
+            [](const TransformQ& a, const Vec3& b) { return a.mQ * b; },
+            [](const TransformQ& a, const TransformQ& b) { return TransformQ{b.mQ * a.mQ}; },
+            [](const TransformQ& a, const TransformM& b)
+            {
+                TransformM res{b};
+                res.mM.postMultRotate(a.mQ);
+                return res;
+            });
+        transQType[sol::meta_function::to_string] = [](const TransformQ& q)
+        {
+            osg::Quat::value_type angle;
+            osg::Vec3f axis;
+            q.mQ.getRotate(angle, axis);
+            std::stringstream ss;
+            ss << "TransformQ{ rotation(angle=" << angle << ", axis=("
+                << axis.x() << ", " << axis.y() << ", " << axis.z() << ")) }";
+            return ss.str();
+        };
+        transQType["inverse"] = [](const TransformQ& q) { return TransformQ{q.mQ.inverse()}; };
+
         // Utility functions
         util["clamp"] = [](float value, float from, float to) { return std::clamp(value, from, to); };
         // NOTE: `util["clamp"] = std::clamp<float>` causes error 'AddressSanitizer: stack-use-after-scope'
diff --git a/components/lua/utilpackage.hpp b/components/lua/utilpackage.hpp
index 9e73723561..d26bfdb027 100644
--- a/components/lua/utilpackage.hpp
+++ b/components/lua/utilpackage.hpp
@@ -1,11 +1,24 @@
 #ifndef COMPONENTS_LUA_UTILPACKAGE_H
 #define COMPONENTS_LUA_UTILPACKAGE_H
 
-#include <limits> // missing from sol/sol.hpp
+#include <osg/Vec2>
+#include <osg/Vec3>
+#include <osg/Matrix>
+
 #include <sol/sol.hpp>
 
 namespace LuaUtil
 {
+    using Vec2 = osg::Vec2f;
+    using Vec3 = osg::Vec3f;
+
+    // For performance reasons "Transform" is implemented as 2 types with the same interface.
+    // Transform supports only composition, inversion, and applying to a 3d vector.
+    struct TransformM { osg::Matrixf mM; };
+    struct TransformQ { osg::Quat mQ; };
+
+    inline TransformM asTransform(const osg::Matrixf& m) { return {m}; }
+    inline TransformQ asTransform(const osg::Quat& q) { return {q}; }
 
     sol::table initUtilPackage(sol::state&);
 
diff --git a/files/lua_api/openmw/util.lua b/files/lua_api/openmw/util.lua
index 7d31ced408..84e640ff40 100644
--- a/files/lua_api/openmw/util.lua
+++ b/files/lua_api/openmw/util.lua
@@ -6,7 +6,7 @@
 
 
 -------------------------------------------------------------------------------
--- Limits given value to the interval [`from`, `to`]
+-- Limits given value to the interval [`from`, `to`].
 -- @function [parent=#util] clamp
 -- @param #number value
 -- @param #number from
@@ -14,7 +14,7 @@
 -- @return #number min(max(value, from), to)
 
 -------------------------------------------------------------------------------
--- Adds `2pi*k` and puts the angle in range `[-pi, pi]`
+-- Adds `2pi*k` and puts the angle in range `[-pi, pi]`.
 -- @function [parent=#util] normalizeAngle
 -- @param #number angle Angle in radians
 -- @return #number Angle in range `[-pi, pi]`
@@ -48,13 +48,13 @@
 -- @return #Vector2.
 
 -------------------------------------------------------------------------------
--- Length of the vector
+-- Length of the vector.
 -- @function [parent=#Vector2] length
 -- @param self
 -- @return #number
 
 -------------------------------------------------------------------------------
--- Square of the length of the vector
+-- Square of the length of the vector.
 -- @function [parent=#Vector2] length2
 -- @param self
 -- @return #number
@@ -146,5 +146,84 @@
 -- @param #Vector3 v
 -- @return #Vector3
 
+-------------------------------------------------------------------------------
+-- @type Transform
+
+-------------------------------------------------------------------------------
+-- Returns the inverse transform.
+-- @function [parent=#Transform] inverse
+-- @param self
+-- @return #Transform.
+
+-------------------------------------------------------------------------------
+-- @type TRANSFORM
+-- @field [parent=#TRANSFORM] #Transform identity Empty transform.
+
+-------------------------------------------------------------------------------
+-- Movement by given vector.
+-- @function [parent=#TRANSFORM] move
+-- @param #Vector3 offset.
+-- @return #Transform.
+-- @usage
+-- -- Accepts either 3 numbers or a 3D vector
+-- util.transform.move(x, y, z)
+-- util.transform.move(util.vector3(x, y, z))
+
+-------------------------------------------------------------------------------
+-- Scale transform.
+-- @function [parent=#TRANSFORM] scale
+-- @param #number scaleX.
+-- @param #number scaleY.
+-- @param #number scaleZ.
+-- @return #Transform.
+-- @usage
+-- -- Accepts either 3 numbers or a 3D vector
+-- util.transform.scale(x, y, z)
+-- util.transform.scale(util.vector3(x, y, z))
+
+
+-------------------------------------------------------------------------------
+-- Rotation (any axis).
+-- @function [parent=#TRANSFORM] rotate
+-- @param #number angle
+-- @param #Vector3 axis.
+-- @return #Transform.
+
+-------------------------------------------------------------------------------
+-- X-axis rotation.
+-- @function [parent=#TRANSFORM] rotateX
+-- @param #number angle
+-- @return #Transform.
+
+-------------------------------------------------------------------------------
+-- Y-axis rotation.
+-- @function [parent=#TRANSFORM] rotateY
+-- @param #number angle
+-- @return #Transform.
+
+-------------------------------------------------------------------------------
+-- Z-axis rotation.
+-- @function [parent=#TRANSFORM] rotateZ
+-- @param #number angle
+-- @return #Transform.
+
+-------------------------------------------------------------------------------
+-- 3D transforms (scale/move/rotate) that can be applied to 3D vectors.
+-- Several transforms can be combined and applied to a vector using multiplication.
+-- Combined transforms apply in reverse order (from right to left).
+-- @field [parent=#util] #TRANSFORM transform
+-- @usage
+-- local util = require('openmw.util')
+-- local trans = util.transform
+-- local fromActorSpace = trans.move(actor.position) * trans.rotateZ(actor.rotation.z)
+--
+-- -- rotation is applied first, movement is second
+-- local posBehindActor = fromActorSpace * util.vector3(0, -100, 0)
+--
+-- -- equivalent to trans.rotateZ(-actor.rotation.z) * trans.move(-actor.position)
+-- local toActorSpace = fromActorSpace:inverse()
+-- local relativeTargetPos = toActorSpace * target.position
+-- local deltaAngle = math.atan2(relativeTargetPos.y, relativeTargetPos.x)
+
 return nil
 

From 163968f578e3a764596cc90b8ad99f18f9bcdd3e Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 28 Sep 2021 22:42:44 +0200
Subject: [PATCH 1374/2859] Normalize area cost factor

Recastnavigation uses path cost and heuristic based on distance to find
shortest path by A* algorithm. Using raw speed values makes cost much lower
value than heuristic (1000 times less at maximum). Heuristic is defined as
distance from node to target * 0.999 that means area cost should never be less
than 0.999 or 1 for simplicity.

Use max speed to make lowest possible cost factor equal to 1.
---
 apps/openmw/mwmechanics/aipackage.cpp | 33 ++++++++++++++++++---------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index 46e4729a8a..c358a75b55 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -457,20 +457,31 @@ DetourNavigator::AreaCosts MWMechanics::AiPackage::getAreaCosts(const MWWorld::P
     const DetourNavigator::Flags flags = getNavigatorFlags(actor);
     const MWWorld::Class& actorClass = actor.getClass();
 
-    if (flags & DetourNavigator::Flag_swim)
-        costs.mWater = divOrMax(costs.mWater, actorClass.getSwimSpeed(actor));
+    const float swimSpeed = (flags & DetourNavigator::Flag_swim) == 0
+            ? 0.0f
+            : actorClass.getSwimSpeed(actor);
 
-    if (flags & DetourNavigator::Flag_walk)
+    const float walkSpeed = [&]
     {
-        float walkCost;
+        if ((flags & DetourNavigator::Flag_walk) == 0)
+            return 0.0f;
         if (getTypeId() == AiPackageTypeId::Wander)
-            walkCost = divOrMax(1.0, actorClass.getWalkSpeed(actor));
-        else
-            walkCost = divOrMax(1.0, actorClass.getRunSpeed(actor));
-        costs.mDoor = costs.mDoor * walkCost;
-        costs.mPathgrid = costs.mPathgrid * walkCost;
-        costs.mGround = costs.mGround * walkCost;
-    }
+            return actorClass.getWalkSpeed(actor);
+        return actorClass.getRunSpeed(actor);
+    } ();
+
+    const float maxSpeed = std::max(swimSpeed, walkSpeed);
+
+    if (maxSpeed == 0)
+        return costs;
+
+    const float swimFactor = swimSpeed / maxSpeed;
+    const float walkFactor = walkSpeed / maxSpeed;
+
+    costs.mWater = divOrMax(costs.mWater, swimFactor);
+    costs.mDoor = divOrMax(costs.mDoor, walkFactor);
+    costs.mPathgrid = divOrMax(costs.mPathgrid, walkFactor);
+    costs.mGround = divOrMax(costs.mGround, walkFactor);
 
     return costs;
 }

From 9950132a5f3dd750fb357665834820212fae91a1 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 28 Sep 2021 23:16:56 +0200
Subject: [PATCH 1375/2859] Allow travelling actors find path over pathgrid
 navmesh area type

In addition to other navmesh areas. This makes actors behaviour closer to
vanilla when pathgrid is correct.
---
 apps/openmw/mwmechanics/aipackage.cpp   | 4 ++++
 apps/openmw/mwmechanics/pathfinding.cpp | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index c358a75b55..3e37a4612d 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -443,7 +443,11 @@ DetourNavigator::Flags MWMechanics::AiPackage::getNavigatorFlags(const MWWorld::
         result |= DetourNavigator::Flag_swim;
 
     if (actorClass.canWalk(actor) && actor.getClass().getWalkSpeed(actor) > 0)
+    {
         result |= DetourNavigator::Flag_walk;
+        if (getTypeId() == AiPackageTypeId::Travel)
+            result |= DetourNavigator::Flag_usePathgrid;
+    }
 
     if (actorClass.isBipedal(actor) && getTypeId() != AiPackageTypeId::Wander)
         result |= DetourNavigator::Flag_openDoor;
diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp
index 7e63190edb..4b06993a49 100644
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@@ -397,7 +397,7 @@ namespace MWMechanics
                 mPath.clear();
         }
 
-        if (status != DetourNavigator::Status::NavMeshNotFound && mPath.empty())
+        if (status != DetourNavigator::Status::NavMeshNotFound && mPath.empty() && (flags & DetourNavigator::Flag_usePathgrid) == 0)
         {
             status = buildPathByNavigatorImpl(actor, startPoint, endPoint, halfExtents,
                 flags | DetourNavigator::Flag_usePathgrid, areaCosts, endTolerance, pathType, std::back_inserter(mPath));

From c0ef4417c3bf42fea006efbb4655015953bc4319 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 29 Sep 2021 00:42:29 +0200
Subject: [PATCH 1376/2859] Check AiTravel destination for other actors
 presence

Use faster aabbTest but without destance filter. To avoid dependency on a
specific constant and correctly handle situations when there is a big
difference between actors sizes.
---
 CHANGELOG.md                                  |  1 +
 apps/openmw/mwbase/world.hpp                  |  3 +-
 apps/openmw/mwmechanics/aitravel.cpp          | 31 ++++++++++++++-----
 apps/openmw/mwmechanics/aitravel.hpp          |  2 ++
 apps/openmw/mwmechanics/aiwander.cpp          |  8 -----
 apps/openmw/mwmechanics/obstacle.cpp          | 11 +++++++
 apps/openmw/mwmechanics/obstacle.hpp          |  6 ++++
 .../mwphysics/hasspherecollisioncallback.hpp  | 21 +++++++++----
 apps/openmw/mwphysics/physicssystem.cpp       | 17 ++++++++--
 apps/openmw/mwphysics/physicssystem.hpp       |  3 +-
 apps/openmw/mwworld/worldimp.cpp              |  5 +--
 apps/openmw/mwworld/worldimp.hpp              |  3 +-
 12 files changed, 82 insertions(+), 29 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8dc9510f6e..5bd70b9407 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,7 @@
     Bug #6283: Avis Dorsey follows you after her death
     Bug #6289: Keyword search in dialogues expected the text to be all ASCII characters
     Bug #6302: Teleporting disabled actor breaks its disabled state
+    Bug #6307: Pathfinding in Infidelities quest from Tribunal addon is broken
     Feature #890: OpenMW-CS: Column filtering
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
     Feature #2780: A way to see current OpenMW version in the console
diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 1dbb2b96f6..c8036385db 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -653,7 +653,8 @@ namespace MWBase
 
             virtual bool hasCollisionWithDoor(const MWWorld::ConstPtr& door, const osg::Vec3f& position, const osg::Vec3f& destination) const = 0;
 
-            virtual bool isAreaOccupiedByOtherActor(const osg::Vec3f& position, const float radius, const MWWorld::ConstPtr& ignore) const = 0;
+            virtual bool isAreaOccupiedByOtherActor(const osg::Vec3f& position, const float radius,
+                const MWWorld::ConstPtr& ignore, std::vector<MWWorld::Ptr>* occupyingActors = nullptr) const = 0;
 
             virtual void reportStats(unsigned int frameNumber, osg::Stats& stats) const = 0;
 
diff --git a/apps/openmw/mwmechanics/aitravel.cpp b/apps/openmw/mwmechanics/aitravel.cpp
index 91fe96a2aa..2594adcb34 100644
--- a/apps/openmw/mwmechanics/aitravel.cpp
+++ b/apps/openmw/mwmechanics/aitravel.cpp
@@ -1,5 +1,7 @@
 #include "aitravel.hpp"
 
+#include <algorithm>
+
 #include <components/esm/aisequence.hpp>
 
 #include "../mwbase/environment.hpp"
@@ -23,6 +25,11 @@ bool isWithinMaxRange(const osg::Vec3f& pos1, const osg::Vec3f& pos2)
     return (pos1 - pos2).length2() <= 7168*7168;
 }
 
+    float getActorRadius(const MWWorld::ConstPtr& actor)
+    {
+        const osg::Vec3f halfExtents = MWBase::Environment::get().getWorld()->getPathfindingHalfExtents(actor);
+        return std::max(halfExtents.x(), std::max(halfExtents.y(), halfExtents.z()));
+    }
 }
 
 namespace MWMechanics
@@ -70,16 +77,24 @@ namespace MWMechanics
 
         // Unfortunately, with vanilla assets destination is sometimes blocked by other actor.
         // If we got close to target, check for actors nearby. If they are, finish AI package.
-        int destinationTolerance = 64;
-        if (distance(actorPos, targetPos) <= destinationTolerance)
+        if (mDestinationCheck.update(duration) == Misc::TimerStatus::Elapsed)
         {
-            std::vector<MWWorld::Ptr> targetActors;
-            std::pair<MWWorld::Ptr, osg::Vec3f> result = MWBase::Environment::get().getWorld()->getHitContact(actor, destinationTolerance, targetActors);
-
-            if (!result.first.isEmpty())
+            std::vector<MWWorld::Ptr> occupyingActors;
+            if (isAreaOccupiedByOtherActor(actor, targetPos, &occupyingActors))
             {
-                actor.getClass().getMovementSettings(actor).mPosition[1] = 0;
-                return true;
+                const float actorRadius = getActorRadius(actor);
+                const float distanceToTarget = distance(actorPos, targetPos);
+                for (const MWWorld::Ptr& other : occupyingActors)
+                {
+                    const float otherRadius = getActorRadius(other);
+                    const auto [minRadius, maxRadius] = std::minmax(actorRadius, otherRadius);
+                    constexpr float toleranceFactor = 1.25;
+                    if (minRadius * toleranceFactor + maxRadius > distanceToTarget)
+                    {
+                        actor.getClass().getMovementSettings(actor).mPosition[1] = 0;
+                        return true;
+                    }
+                }
             }
         }
 
diff --git a/apps/openmw/mwmechanics/aitravel.hpp b/apps/openmw/mwmechanics/aitravel.hpp
index 2ea2a8f717..ee4ff9ad4d 100644
--- a/apps/openmw/mwmechanics/aitravel.hpp
+++ b/apps/openmw/mwmechanics/aitravel.hpp
@@ -52,6 +52,8 @@ namespace MWMechanics
             const float mZ;
 
             const bool mHidden;
+
+            AiReactionTimer mDestinationCheck;
     };
 
     struct AiInternalTravel final : public AiTravel
diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 624abe10f9..9c84555404 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -85,14 +85,6 @@ namespace MWMechanics
             return MWBase::Environment::get().getWorld()->castRay(position, visibleDestination, mask, actor);
         }
 
-        bool isAreaOccupiedByOtherActor(const MWWorld::ConstPtr &actor, const osg::Vec3f& destination)
-        {
-            const auto world = MWBase::Environment::get().getWorld();
-            const osg::Vec3f halfExtents = world->getPathfindingHalfExtents(actor);
-            const auto maxHalfExtent = std::max(halfExtents.x(), std::max(halfExtents.y(), halfExtents.z()));
-            return world->isAreaOccupiedByOtherActor(destination, 2 * maxHalfExtent, actor);
-        }
-
         void stopMovement(const MWWorld::Ptr& actor)
         {
             actor.getClass().getMovementSettings(actor).mPosition[0] = 0;
diff --git a/apps/openmw/mwmechanics/obstacle.cpp b/apps/openmw/mwmechanics/obstacle.cpp
index 88325ee7c7..344cc82058 100644
--- a/apps/openmw/mwmechanics/obstacle.cpp
+++ b/apps/openmw/mwmechanics/obstacle.cpp
@@ -4,6 +4,8 @@
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
 
 #include "movement.hpp"
 
@@ -72,6 +74,15 @@ namespace MWMechanics
         return MWWorld::Ptr(); // none found
     }
 
+    bool isAreaOccupiedByOtherActor(const MWWorld::ConstPtr& actor, const osg::Vec3f& destination,
+        std::vector<MWWorld::Ptr>* occupyingActors)
+    {
+        const auto world = MWBase::Environment::get().getWorld();
+        const osg::Vec3f halfExtents = world->getPathfindingHalfExtents(actor);
+        const auto maxHalfExtent = std::max(halfExtents.x(), std::max(halfExtents.y(), halfExtents.z()));
+        return world->isAreaOccupiedByOtherActor(destination, 2 * maxHalfExtent, actor, occupyingActors);
+    }
+
     ObstacleCheck::ObstacleCheck()
       : mWalkState(WalkState::Initial)
       , mStateDuration(0)
diff --git a/apps/openmw/mwmechanics/obstacle.hpp b/apps/openmw/mwmechanics/obstacle.hpp
index b574bab67f..24bd5ed1c1 100644
--- a/apps/openmw/mwmechanics/obstacle.hpp
+++ b/apps/openmw/mwmechanics/obstacle.hpp
@@ -3,9 +3,12 @@
 
 #include <osg/Vec3f>
 
+#include <vector>
+
 namespace MWWorld
 {
     class Ptr;
+    class ConstPtr;
 }
 
 namespace MWMechanics
@@ -21,6 +24,9 @@ namespace MWMechanics
     /** \return Pointer to the door, or empty pointer if none exists **/
     const MWWorld::Ptr getNearbyDoor(const MWWorld::Ptr& actor, float minDist);
 
+    bool isAreaOccupiedByOtherActor(const MWWorld::ConstPtr& actor, const osg::Vec3f& destination,
+        std::vector<MWWorld::Ptr>* occupyingActors = nullptr);
+
     class ObstacleCheck
     {
         public:
diff --git a/apps/openmw/mwphysics/hasspherecollisioncallback.hpp b/apps/openmw/mwphysics/hasspherecollisioncallback.hpp
index 275325cf67..fc8725f5f4 100644
--- a/apps/openmw/mwphysics/hasspherecollisioncallback.hpp
+++ b/apps/openmw/mwphysics/hasspherecollisioncallback.hpp
@@ -22,28 +22,36 @@ namespace MWPhysics
         return nearest.distance(position) < radius;
     }
 
+    template <class OnCollision>
     class HasSphereCollisionCallback final : public btBroadphaseAabbCallback
     {
     public:
         HasSphereCollisionCallback(const btVector3& position, const btScalar radius, btCollisionObject* object,
-                const int mask, const int group)
+                const int mask, const int group, OnCollision* onCollision)
             : mPosition(position),
               mRadius(radius),
               mCollisionObject(object),
               mCollisionFilterMask(mask),
-              mCollisionFilterGroup(group)
+              mCollisionFilterGroup(group),
+              mOnCollision(onCollision)
         {
         }
 
         bool process(const btBroadphaseProxy* proxy) override
         {
-            if (mResult)
+            if (mResult && mOnCollision == nullptr)
                 return false;
             const auto collisionObject = static_cast<btCollisionObject*>(proxy->m_clientObject);
-            if (collisionObject == mCollisionObject)
+            if (collisionObject == mCollisionObject
+                || !needsCollision(*proxy)
+                || !testAabbAgainstSphere(proxy->m_aabbMin, proxy->m_aabbMax, mPosition, mRadius))
                 return true;
-            if (needsCollision(*proxy))
-                mResult = testAabbAgainstSphere(proxy->m_aabbMin, proxy->m_aabbMax, mPosition, mRadius);
+            mResult = true;
+            if (mOnCollision != nullptr)
+            {
+                (*mOnCollision)(collisionObject);
+                return true;
+            }
             return !mResult;
         }
 
@@ -58,6 +66,7 @@ namespace MWPhysics
         btCollisionObject* mCollisionObject;
         int mCollisionFilterMask;
         int mCollisionFilterGroup;
+        OnCollision* mOnCollision;
         bool mResult = false;
 
         bool needsCollision(const btBroadphaseProxy& proxy) const
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 8499dc74c1..fb363bdac0 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -923,7 +923,8 @@ namespace MWPhysics
                                                     CollisionType_Actor|CollisionType_Projectile);
     }
 
-    bool PhysicsSystem::isAreaOccupiedByOtherActor(const osg::Vec3f& position, const float radius, const MWWorld::ConstPtr& ignore) const
+    bool PhysicsSystem::isAreaOccupiedByOtherActor(const osg::Vec3f& position, const float radius,
+        const MWWorld::ConstPtr& ignore, std::vector<MWWorld::Ptr>* occupyingActors) const
     {
         btCollisionObject* object = nullptr;
         const auto it = mActors.find(ignore.mRef);
@@ -934,7 +935,19 @@ namespace MWPhysics
         const auto aabbMax = bulletPosition + btVector3(radius, radius, radius);
         const int mask = MWPhysics::CollisionType_Actor;
         const int group = 0xff;
-        HasSphereCollisionCallback callback(bulletPosition, radius, object, mask, group);
+        if (occupyingActors == nullptr)
+        {
+            HasSphereCollisionCallback callback(bulletPosition, radius, object, mask, group,
+                                                static_cast<void (*)(const btCollisionObject*)>(nullptr));
+            mTaskScheduler->aabbTest(aabbMin, aabbMax, callback);
+            return callback.getResult();
+        }
+        const auto onCollision = [&] (const btCollisionObject* object)
+        {
+            if (PtrHolder* holder = static_cast<PtrHolder*>(object->getUserPointer()))
+                occupyingActors->push_back(holder->getPtr());
+        };
+        HasSphereCollisionCallback callback(bulletPosition, radius, object, mask, group, &onCollision);
         mTaskScheduler->aabbTest(aabbMin, aabbMax, callback);
         return callback.getResult();
     }
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 52515b563f..06cfee8e38 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -252,7 +252,8 @@ namespace MWPhysics
                 std::for_each(mAnimatedObjects.begin(), mAnimatedObjects.end(), function);
             }
 
-            bool isAreaOccupiedByOtherActor(const osg::Vec3f& position, const float radius, const MWWorld::ConstPtr& ignore) const;
+            bool isAreaOccupiedByOtherActor(const osg::Vec3f& position, const float radius,
+                const MWWorld::ConstPtr& ignore, std::vector<MWWorld::Ptr>* occupyingActors) const;
 
             void reportStats(unsigned int frameNumber, osg::Stats& stats) const;
             void reportCollision(const btVector3& position, const btVector3& normal);
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index da5daed295..df7357da27 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -3935,9 +3935,10 @@ namespace MWWorld
         return btRayAabb(localFrom, localTo, aabbMin, aabbMax, hitDistance, hitNormal);
     }
 
-    bool World::isAreaOccupiedByOtherActor(const osg::Vec3f& position, const float radius, const MWWorld::ConstPtr& ignore) const
+    bool World::isAreaOccupiedByOtherActor(const osg::Vec3f& position, const float radius,
+        const MWWorld::ConstPtr& ignore, std::vector<MWWorld::Ptr>* occupyingActors) const
     {
-        return mPhysics->isAreaOccupiedByOtherActor(position, radius, ignore);
+        return mPhysics->isAreaOccupiedByOtherActor(position, radius, ignore, occupyingActors);
     }
 
     void World::reportStats(unsigned int frameNumber, osg::Stats& stats) const
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 32fc9b101a..4d9841a79a 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -735,7 +735,8 @@ namespace MWWorld
 
             bool hasCollisionWithDoor(const MWWorld::ConstPtr& door, const osg::Vec3f& position, const osg::Vec3f& destination) const override;
 
-            bool isAreaOccupiedByOtherActor(const osg::Vec3f& position, const float radius, const MWWorld::ConstPtr& ignore) const override;
+            bool isAreaOccupiedByOtherActor(const osg::Vec3f& position, const float radius,
+                const MWWorld::ConstPtr& ignore, std::vector<MWWorld::Ptr>* occupyingActors) const override;
 
             void reportStats(unsigned int frameNumber, osg::Stats& stats) const override;
 

From fc2076db1a3bc57f031f6680a0aad31295530669 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Wed, 29 Sep 2021 11:36:05 +0400
Subject: [PATCH 1377/2859] Fix MSVC warnings about local variables
 redeclaration (#3130)

---
 apps/openmw/mwmechanics/actors.cpp            |  2 +-
 apps/openmw/mwphysics/physicssystem.cpp       | 50 +++++++++----------
 apps/openmw/mwrender/renderingmanager.cpp     |  1 -
 apps/openmw/mwworld/scene.cpp                 |  6 +--
 components/detournavigator/navigatorimpl.cpp  |  4 +-
 .../detournavigator/recastmeshbuilder.cpp     | 24 ++++-----
 components/sceneutil/recastmesh.cpp           |  6 +--
 7 files changed, 46 insertions(+), 47 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index f4cb40c2f5..542f185854 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1171,7 +1171,7 @@ namespace MWMechanics
         creatureStats.setAiSetting(CreatureStats::AI_Flee, stat);
         if (creature && ptr.get<ESM::Creature>()->mBase->mData.mType == ESM::Creature::Undead)
         {
-            Stat<int> stat = creatureStats.getAiSetting(CreatureStats::AI_Flee);
+            stat = creatureStats.getAiSetting(CreatureStats::AI_Flee);
             stat.setModifier(static_cast<int>(effects.get(ESM::MagicEffect::TurnUndead).getMagnitude()));
             creatureStats.setAiSetting(CreatureStats::AI_Flee, stat);
         }
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 8499dc74c1..903e383370 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -514,18 +514,18 @@ namespace MWPhysics
 
     void PhysicsSystem::remove(const MWWorld::Ptr &ptr)
     {
-        if (auto found = mObjects.find(ptr.mRef); found != mObjects.end())
+        if (auto foundObject = mObjects.find(ptr.mRef); foundObject != mObjects.end())
         {
             if (mUnrefQueue.get())
-                mUnrefQueue->push(found->second->getShapeInstance());
+                mUnrefQueue->push(foundObject->second->getShapeInstance());
 
-            mAnimatedObjects.erase(found->second.get());
+            mAnimatedObjects.erase(foundObject->second.get());
 
-            mObjects.erase(found);
+            mObjects.erase(foundObject);
         }
-        else if (auto found = mActors.find(ptr.mRef); found != mActors.end())
+        else if (auto foundActor = mActors.find(ptr.mRef); foundActor != mActors.end())
         {
-            mActors.erase(found);
+            mActors.erase(foundActor);
         }
     }
 
@@ -591,16 +591,16 @@ namespace MWPhysics
 
     void PhysicsSystem::updateScale(const MWWorld::Ptr &ptr)
     {
-        if (auto found = mObjects.find(ptr.mRef); found != mObjects.end())
+        if (auto foundObject = mObjects.find(ptr.mRef); foundObject != mObjects.end())
         {
             float scale = ptr.getCellRef().getScale();
-            found->second->setScale(scale);
-            mTaskScheduler->updateSingleAabb(found->second);
+            foundObject->second->setScale(scale);
+            mTaskScheduler->updateSingleAabb(foundObject->second);
         }
-        else if (auto found = mActors.find(ptr.mRef); found != mActors.end())
+        else if (auto foundActor = mActors.find(ptr.mRef); foundActor != mActors.end())
         {
-            found->second->updateScale();
-            mTaskScheduler->updateSingleAabb(found->second);
+            foundActor->second->updateScale();
+            mTaskScheduler->updateSingleAabb(foundActor->second);
         }
     }
 
@@ -633,32 +633,32 @@ namespace MWPhysics
 
     void PhysicsSystem::updateRotation(const MWWorld::Ptr &ptr, osg::Quat rotate)
     {
-        if (auto found = mObjects.find(ptr.mRef); found != mObjects.end())
+        if (auto foundObject = mObjects.find(ptr.mRef); foundObject != mObjects.end())
         {
-            found->second->setRotation(rotate);
-            mTaskScheduler->updateSingleAabb(found->second);
+            foundObject->second->setRotation(rotate);
+            mTaskScheduler->updateSingleAabb(foundObject->second);
         }
-        else if (auto found = mActors.find(ptr.mRef); found != mActors.end())
+        else if (auto foundActor = mActors.find(ptr.mRef); foundActor != mActors.end())
         {
-            if (!found->second->isRotationallyInvariant())
+            if (!foundActor->second->isRotationallyInvariant())
             {
-                found->second->setRotation(rotate);
-                mTaskScheduler->updateSingleAabb(found->second);
+                foundActor->second->setRotation(rotate);
+                mTaskScheduler->updateSingleAabb(foundActor->second);
             }
         }
     }
 
     void PhysicsSystem::updatePosition(const MWWorld::Ptr &ptr)
     {
-        if (auto found = mObjects.find(ptr.mRef); found != mObjects.end())
+        if (auto foundObject = mObjects.find(ptr.mRef); foundObject != mObjects.end())
         {
-            found->second->updatePosition();
-            mTaskScheduler->updateSingleAabb(found->second);
+            foundObject->second->updatePosition();
+            mTaskScheduler->updateSingleAabb(foundObject->second);
         }
-        else if (auto found = mActors.find(ptr.mRef); found != mActors.end())
+        else if (auto foundActor = mActors.find(ptr.mRef); foundActor != mActors.end())
         {
-            found->second->updatePosition();
-            mTaskScheduler->updateSingleAabb(found->second, true);
+            foundActor->second->updatePosition();
+            mTaskScheduler->updateSingleAabb(foundActor->second, true);
         }
     }
 
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 74e183693c..5661ecfbe7 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -440,7 +440,6 @@ namespace MWRender
             static_cast<Terrain::QuadTreeWorld*>(mTerrain.get())->addChunkManager(mGroundcover.get());
             mResourceSystem->addResourceManager(mGroundcover.get());
 
-            float groundcoverDistance = std::max(0.f, Settings::Manager::getFloat("rendering distance", "Groundcover"));
             mGroundcover->setViewDistance(groundcoverDistance);
         }
 
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index e52f5532b4..559ab4aef4 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -917,9 +917,9 @@ namespace MWWorld
         // unload
         for (auto iter = mInactiveCells.begin(); iter!=mInactiveCells.end(); )
         {
-            auto* cell = *iter++;
-            deactivateCell(cell);
-            unloadInactiveCell(cell);
+            auto* cellToUnload = *iter++;
+            deactivateCell(cellToUnload);
+            unloadInactiveCell(cellToUnload);
         }
         assert(mActiveCells.empty());
         assert(mInactiveCells.empty());
diff --git a/components/detournavigator/navigatorimpl.cpp b/components/detournavigator/navigatorimpl.cpp
index 5a8488c8d0..750901c73e 100644
--- a/components/detournavigator/navigatorimpl.cpp
+++ b/components/detournavigator/navigatorimpl.cpp
@@ -39,8 +39,8 @@ namespace DetourNavigator
         if (const btCollisionShape* const avoidShape = shapes.mShapeInstance->getAvoidCollisionShape())
         {
             const ObjectId avoidId(avoidShape);
-            CollisionShape collisionShape {shapes.mShapeInstance, *avoidShape};
-            if (mNavMeshManager.addObject(avoidId, collisionShape, transform, AreaType_null))
+            CollisionShape avoidCollisionShape {shapes.mShapeInstance, *avoidShape};
+            if (mNavMeshManager.addObject(avoidId, avoidCollisionShape, transform, AreaType_null))
             {
                 updateAvoidShapeId(id, avoidId);
                 result = true;
diff --git a/components/detournavigator/recastmeshbuilder.cpp b/components/detournavigator/recastmeshbuilder.cpp
index 19125e0a9b..73b731c247 100644
--- a/components/detournavigator/recastmeshbuilder.cpp
+++ b/components/detournavigator/recastmeshbuilder.cpp
@@ -49,9 +49,9 @@ namespace DetourNavigator
         std::vector<osg::Vec3f> uniqueVertices;
         uniqueVertices.reserve(3 * triangles.size());
 
-        for (const RecastMeshTriangle& v : triangles)
-            for (const osg::Vec3f& v : v.mVertices)
-                uniqueVertices.push_back(v);
+        for (const RecastMeshTriangle& triangle : triangles)
+            for (const osg::Vec3f& vertex : triangle.mVertices)
+                uniqueVertices.push_back(vertex);
 
         std::sort(uniqueVertices.begin(), uniqueVertices.end());
         uniqueVertices.erase(std::unique(uniqueVertices.begin(), uniqueVertices.end()), uniqueVertices.end());
@@ -61,15 +61,15 @@ namespace DetourNavigator
         std::vector<AreaType> areaTypes;
         areaTypes.reserve(triangles.size());
 
-        for (const RecastMeshTriangle& v : triangles)
+        for (const RecastMeshTriangle& triangle : triangles)
         {
-            areaTypes.push_back(v.mAreaType);
+            areaTypes.push_back(triangle.mAreaType);
 
-            for (const osg::Vec3f& v : v.mVertices)
+            for (const osg::Vec3f& vertex : triangle.mVertices)
             {
-                const auto it = std::lower_bound(uniqueVertices.begin(), uniqueVertices.end(), v);
+                const auto it = std::lower_bound(uniqueVertices.begin(), uniqueVertices.end(), vertex);
                 assert(it != uniqueVertices.end());
-                assert(*it == v);
+                assert(*it == vertex);
                 indices.push_back(static_cast<int>(it - uniqueVertices.begin()));
             }
         }
@@ -79,11 +79,11 @@ namespace DetourNavigator
         std::vector<float> vertices;
         vertices.reserve(3 * uniqueVertices.size());
 
-        for (const osg::Vec3f& v : uniqueVertices)
+        for (const osg::Vec3f& vertex : uniqueVertices)
         {
-            vertices.push_back(v.x() + shift.x());
-            vertices.push_back(v.y() + shift.y());
-            vertices.push_back(v.z() + shift.z());
+            vertices.push_back(vertex.x() + shift.x());
+            vertices.push_back(vertex.y() + shift.y());
+            vertices.push_back(vertex.z() + shift.z());
         }
 
         return Mesh(std::move(indices), std::move(vertices), std::move(areaTypes));
diff --git a/components/sceneutil/recastmesh.cpp b/components/sceneutil/recastmesh.cpp
index 8d6d47c2b6..97efe010df 100644
--- a/components/sceneutil/recastmesh.cpp
+++ b/components/sceneutil/recastmesh.cpp
@@ -52,10 +52,10 @@ namespace SceneUtil
 
         for (const Heightfield& heightfield : recastMesh.getHeightfields())
         {
-            const Mesh mesh = makeMesh(heightfield);
+            const Mesh heightfieldMesh = makeMesh(heightfield);
             const int indexShift = static_cast<int>(vertices.size() / 3);
-            std::copy(mesh.getVertices().begin(), mesh.getVertices().end(), std::back_inserter(vertices));
-            std::transform(mesh.getIndices().begin(), mesh.getIndices().end(), std::back_inserter(indices),
+            std::copy(heightfieldMesh.getVertices().begin(), heightfieldMesh.getVertices().end(), std::back_inserter(vertices));
+            std::transform(heightfieldMesh.getIndices().begin(), heightfieldMesh.getIndices().end(), std::back_inserter(indices),
                            [&] (int index) { return index + indexShift; });
         }
 

From 957c25a491b86772b02ab9057679ad1fc970f353 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Wed, 29 Sep 2021 07:58:19 +0000
Subject: [PATCH 1378/2859] avoids creating empty statesets on drawables
 (#3132)

* avoids creating empty statesets on drawables

Currently, we attempt to skip creating state on drawable nodes when this state matches the default state. This attempt is incomplete because we still create an avoidable empty stateset in the default case.

* renderingmanager.cpp

* nifloader.cpp
---
 apps/openmw/mwrender/renderingmanager.cpp |  1 +
 components/nifosg/nifloader.cpp           | 20 +++++++++-----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 5661ecfbe7..c749d6aa78 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -486,6 +486,7 @@ namespace MWRender
         defaultMat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
         defaultMat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 0.f));
         sceneRoot->getOrCreateStateSet()->setAttribute(defaultMat);
+        sceneRoot->getOrCreateStateSet()->addUniform(new osg::Uniform("emissiveMult", 1.f));
 
         mFog.reset(new FogManager());
 
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 0432aef5b4..f05f906c8f 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -1134,8 +1134,6 @@ namespace NifOsg
                 trans->addChild(toAttach);
                 parentNode->addChild(trans);
             }
-            // create partsys stateset in order to pass in ShaderVisitor like all other Drawables
-            partsys->getOrCreateStateSet();
         }
 
         void handleNiGeometryData(osg::Geometry *geometry, const Nif::NiGeometryData* data, const std::vector<unsigned int>& boundTextures, const std::string& name)
@@ -1923,8 +1921,6 @@ namespace NifOsg
         void applyDrawableProperties(osg::Node* node, const std::vector<const Nif::Property*>& properties, SceneUtil::CompositeStateSetUpdater* composite,
                                              bool hasVertexColors, int animflags)
         {
-            osg::StateSet* stateset = node->getOrCreateStateSet();
-
             // Specular lighting is enabled by default, but there's a quirk...
             bool specEnabled = true;
             osg::ref_ptr<osg::Material> mat (new osg::Material);
@@ -2006,15 +2002,15 @@ namespace NifOsg
                         if (blendFunc->getDestination() == GL_DST_ALPHA)
                             blendFunc->setDestination(GL_ONE);
                         blendFunc = shareAttribute(blendFunc);
-                        stateset->setAttributeAndModes(blendFunc, osg::StateAttribute::ON);
+                        node->getOrCreateStateSet()->setAttributeAndModes(blendFunc, osg::StateAttribute::ON);
 
                         bool noSort = (alphaprop->flags>>13)&1;
                         if (!noSort)
-                            stateset->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
+                            node->getOrCreateStateSet()->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
                         else
-                            stateset->setRenderBinToInherit();
+                            node->getOrCreateStateSet()->setRenderBinToInherit();
                     }
-                    else
+                    else if (osg::StateSet* stateset = node->getStateSet())
                     {
                         stateset->removeAttribute(osg::StateAttribute::BLENDFUNC);
                         stateset->removeMode(GL_BLEND);
@@ -2025,9 +2021,9 @@ namespace NifOsg
                     {
                         osg::ref_ptr<osg::AlphaFunc> alphaFunc (new osg::AlphaFunc(getTestMode((alphaprop->flags>>10)&0x7), alphaprop->data.threshold/255.f));
                         alphaFunc = shareAttribute(alphaFunc);
-                        stateset->setAttributeAndModes(alphaFunc, osg::StateAttribute::ON);
+                        node->getOrCreateStateSet()->setAttributeAndModes(alphaFunc, osg::StateAttribute::ON);
                     }
-                    else
+                    else if (osg::StateSet* stateset = node->getStateSet())
                     {
                         stateset->removeAttribute(osg::StateAttribute::ALPHAFUNC);
                         stateset->removeMode(GL_ALPHA_TEST);
@@ -2083,8 +2079,10 @@ namespace NifOsg
 
             mat = shareAttribute(mat);
 
+            osg::StateSet* stateset = node->getStateSet();
             stateset->setAttributeAndModes(mat, osg::StateAttribute::ON);
-            stateset->addUniform(new osg::Uniform("emissiveMult", emissiveMult));
+            if (emissiveMult != 1.f)
+                stateset->addUniform(new osg::Uniform("emissiveMult", emissiveMult));
         }
 
     };

From 1109cc3ac7fa77ed1e057d893f9b5e5c4f437e8b Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Wed, 29 Sep 2021 14:08:51 +0400
Subject: [PATCH 1379/2859] Remove unused data field (#3133)

---
 apps/openmw/mwrender/groundcover.cpp | 2 +-
 apps/openmw/mwrender/groundcover.hpp | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwrender/groundcover.cpp b/apps/openmw/mwrender/groundcover.cpp
index 94bd900aea..c7113f5193 100644
--- a/apps/openmw/mwrender/groundcover.cpp
+++ b/apps/openmw/mwrender/groundcover.cpp
@@ -191,7 +191,7 @@ namespace MWRender
                         if (model.empty()) continue;
                         model = "meshes/" + model;
 
-                        instances[model].emplace_back(std::move(ref), std::move(model));
+                        instances[model].emplace_back(std::move(ref));
                     }
                 }
             }
diff --git a/apps/openmw/mwrender/groundcover.hpp b/apps/openmw/mwrender/groundcover.hpp
index 0a83976441..f2693d6c24 100644
--- a/apps/openmw/mwrender/groundcover.hpp
+++ b/apps/openmw/mwrender/groundcover.hpp
@@ -24,10 +24,8 @@ namespace MWRender
         {
             ESM::Position mPos;
             float mScale;
-            std::string mModel;
 
-            GroundcoverEntry(const ESM::CellRef& ref, const std::string& model):
-                mPos(ref.mPos), mScale(ref.mScale), mModel(model)
+            GroundcoverEntry(const ESM::CellRef& ref) : mPos(ref.mPos), mScale(ref.mScale)
             {}
         };
 

From 83584185556c7cef7071a65dd9c2dcffda781243 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Wed, 29 Sep 2021 13:40:37 +0000
Subject: [PATCH 1380/2859] set the correct program link parameters (#3110)

* shadermanager.hpp setProgramTemplate

* shadermanager.hpp

* shadermanager.cpp setProgramTemplate

* shadervisitor.hpp setProgramTemplate

* shadervisitor.cpp setProgramTemplate

* scenemanager.cpp setProgramTemplate

* scenemanager.hpp setProgramTemplate

* renderingmanager.cpp

* groundcover.cpp setProgramTemplate

* groundcover.hpp

* groundcover.cpp

* shadervisitor.cpp

* util.cpp

* lightmanager.cpp

* scenemanager.cpp

* scenemanager.hpp

* lightmanager.cpp

* lightmanager.cpp

* lightmanager.cpp

* scenemanager.hpp [ci skip]

* water.cpp

* groundcover.cpp

* shadermanager.hpp
---
 apps/openmw/mwrender/groundcover.cpp      |  7 ++++-
 apps/openmw/mwrender/groundcover.hpp      |  2 ++
 apps/openmw/mwrender/renderingmanager.cpp |  1 -
 apps/openmw/mwrender/water.cpp            |  3 ---
 components/resource/scenemanager.cpp      | 11 +++++++-
 components/resource/scenemanager.hpp      |  7 ++++-
 components/sceneutil/lightmanager.cpp     | 13 +++++-----
 components/sceneutil/util.cpp             |  3 +++
 components/shader/shadermanager.cpp       | 16 +++---------
 components/shader/shadermanager.hpp       | 31 +++++------------------
 components/shader/shadervisitor.cpp       |  5 +++-
 components/shader/shadervisitor.hpp       |  5 ++++
 12 files changed, 53 insertions(+), 51 deletions(-)

diff --git a/apps/openmw/mwrender/groundcover.cpp b/apps/openmw/mwrender/groundcover.cpp
index c7113f5193..3691c6270b 100644
--- a/apps/openmw/mwrender/groundcover.cpp
+++ b/apps/openmw/mwrender/groundcover.cpp
@@ -7,6 +7,7 @@
 
 #include <components/esm/esmreader.hpp>
 #include <components/sceneutil/lightmanager.hpp>
+#include <components/shader/shadermanager.hpp>
 
 #include "apps/openmw/mwworld/esmstore.hpp"
 #include "apps/openmw/mwbase/environment.hpp"
@@ -150,6 +151,10 @@ namespace MWRender
          mStateset->setRenderBinDetails(0, "RenderBin", osg::StateSet::OVERRIDE_RENDERBIN_DETAILS);
          mStateset->setAttribute(new osg::VertexAttribDivisor(6, 1));
          mStateset->setAttribute(new osg::VertexAttribDivisor(7, 1));
+    
+         mProgramTemplate = mSceneManager->getShaderManager().getProgramTemplate() ? static_cast<osg::Program*>(mSceneManager->getShaderManager().getProgramTemplate()->clone(osg::CopyOp::SHALLOW_COPY)) : new osg::Program;
+         mProgramTemplate->addBindAttribLocation("aOffset", 6);
+         mProgramTemplate->addBindAttribLocation("aRotation", 7);
     }
 
     void Groundcover::collectInstances(InstanceMap& instances, float size, const osg::Vec2f& center)
@@ -219,7 +224,7 @@ namespace MWRender
         group->setNodeMask(Mask_Groundcover);
         if (mSceneManager->getLightingMethod() != SceneUtil::LightingMethod::FFP)
             group->setCullCallback(new SceneUtil::LightListCallback);
-        mSceneManager->recreateShaders(group, "groundcover", false, true);
+        mSceneManager->recreateShaders(group, "groundcover", false, true, mProgramTemplate);
         mSceneManager->shareState(group);
         group->getBound();
         return group;
diff --git a/apps/openmw/mwrender/groundcover.hpp b/apps/openmw/mwrender/groundcover.hpp
index f2693d6c24..ed88f7fe24 100644
--- a/apps/openmw/mwrender/groundcover.hpp
+++ b/apps/openmw/mwrender/groundcover.hpp
@@ -4,6 +4,7 @@
 #include <components/terrain/quadtreeworld.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/esm/loadcell.hpp>
+#include <osg/Program>
 
 namespace MWRender
 {
@@ -33,6 +34,7 @@ namespace MWRender
         Resource::SceneManager* mSceneManager;
         float mDensity;
         osg::ref_ptr<osg::StateSet> mStateset;
+        osg::ref_ptr<osg::Program> mProgramTemplate;
 
         typedef std::map<std::string, std::vector<GroundcoverEntry>> InstanceMap;
         osg::ref_ptr<osg::Node> createChunk(InstanceMap& instances, const osg::Vec2f& center);
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index c749d6aa78..fad2c25e20 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -325,7 +325,6 @@ namespace MWRender
 
         // Let LightManager choose which backend to use based on our hint. For methods besides legacy lighting, this depends on support for various OpenGL extensions.
         osg::ref_ptr<SceneUtil::LightManager> sceneRoot = new SceneUtil::LightManager(lightingMethod == SceneUtil::LightingMethod::FFP);
-        resourceSystem->getSceneManager()->getShaderManager().setLightingMethod(sceneRoot->getLightingMethod());
         resourceSystem->getSceneManager()->setLightingMethod(sceneRoot->getLightingMethod());
         resourceSystem->getSceneManager()->setSupportedLightingMethods(sceneRoot->getSupportedLightingMethods());
         mMinimumAmbientLuminance = std::clamp(Settings::Manager::getFloat("minimum interior brightness", "Shaders"), 0.f, 1.f);
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index 7a8677e43a..88e422fcf3 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -670,9 +670,6 @@ void Water::createShaderWaterStateSet(osg::Node* node, Reflection* reflection, R
     normalMap->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR_MIPMAP_LINEAR);
     normalMap->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
 
-    auto method = mResourceSystem->getSceneManager()->getLightingMethod();
-    if (method == SceneUtil::LightingMethod::SingleUBO)
-        program->addBindUniformBlock("LightBufferBinding", static_cast<int>(Shader::UBOBinding::LightBuffer));
     mRainIntensityUpdater = new RainIntensityUpdater();
     node->setUpdateCallback(mRainIntensityUpdater);
 
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 2099d514f7..be32539d40 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -28,6 +28,7 @@
 #include <components/sceneutil/controller.hpp>
 #include <components/sceneutil/optimizer.hpp>
 #include <components/sceneutil/visitor.hpp>
+#include <components/sceneutil/lightmanager.hpp>
 
 #include <components/shader/shadervisitor.hpp>
 #include <components/shader/shadermanager.hpp>
@@ -332,10 +333,11 @@ namespace Resource
         return mForceShaders;
     }
 
-    void SceneManager::recreateShaders(osg::ref_ptr<osg::Node> node, const std::string& shaderPrefix, bool translucentFramebuffer, bool forceShadersForNode)
+    void SceneManager::recreateShaders(osg::ref_ptr<osg::Node> node, const std::string& shaderPrefix, bool translucentFramebuffer, bool forceShadersForNode, const osg::Program* programTemplate)
     {
         osg::ref_ptr<Shader::ShaderVisitor> shaderVisitor(createShaderVisitor(shaderPrefix, translucentFramebuffer));
         shaderVisitor->setAllowedToModifyStateSets(false);
+        shaderVisitor->setProgramTemplate(programTemplate);
         if (forceShadersForNode)
             shaderVisitor->setForceShaders(true);
         node->accept(*shaderVisitor);
@@ -410,6 +412,13 @@ namespace Resource
     void SceneManager::setLightingMethod(SceneUtil::LightingMethod method)
     {
         mLightingMethod = method;
+
+        if (mLightingMethod == SceneUtil::LightingMethod::SingleUBO)
+        {
+            osg::ref_ptr<osg::Program> program = new osg::Program;
+            program->addBindUniformBlock("LightBufferBinding", static_cast<int>(UBOBinding::LightBuffer));
+            mShaderManager->setProgramTemplate(program);
+        }
     }
 
     SceneUtil::LightingMethod SceneManager::getLightingMethod() const
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index 7434a25309..1443476fd5 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -76,7 +76,7 @@ namespace Resource
         Shader::ShaderManager& getShaderManager();
 
         /// Re-create shaders for this node, need to call this if alpha testing, texture stages or vertex color mode have changed.
-        void recreateShaders(osg::ref_ptr<osg::Node> node, const std::string& shaderPrefix = "objects", bool translucentFramebuffer = false, bool forceShadersForNode = false);
+        void recreateShaders(osg::ref_ptr<osg::Node> node, const std::string& shaderPrefix = "objects", bool translucentFramebuffer = false, bool forceShadersForNode = false, const osg::Program* programTemplate = nullptr);
 
         /// Applying shaders to a node may replace some fixed-function state.
         /// This restores it.
@@ -111,6 +111,11 @@ namespace Resource
         void setSupportedLightingMethods(const SceneUtil::LightManager::SupportedMethods& supported);
         bool isSupportedLightingMethod(SceneUtil::LightingMethod method) const;
 
+        enum class UBOBinding
+        {
+            // If we add more UBO's, we should probably assign their bindings dynamically according to the current count of UBO's in the programTemplate
+            LightBuffer
+        };
         void setLightingMethod(SceneUtil::LightingMethod method);
         SceneUtil::LightingMethod getLightingMethod() const;
         
diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 1f7d9d2db2..ba60cb3185 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -11,6 +11,7 @@
 #include <osgUtil/CullVisitor>
 
 #include <components/sceneutil/util.hpp>
+#include <components/resource/scenemanager.hpp>
 
 #include <components/misc/hash.hpp>
 #include <components/misc/stringops.hpp>
@@ -294,9 +295,9 @@ namespace SceneUtil
                 osg::ref_ptr<osg::UniformBufferObject> ubo = new osg::UniformBufferObject;
                 buffer->getData()->setBufferObject(ubo);
 #if OSG_VERSION_GREATER_OR_EQUAL(3,5,7)
-                osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(static_cast<int>(Shader::UBOBinding::LightBuffer), buffer->getData(), 0, buffer->getData()->getTotalDataSize());
+                osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(static_cast<int>(Resource::SceneManager::UBOBinding::LightBuffer), buffer->getData(), 0, buffer->getData()->getTotalDataSize());
 #else
-                osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(static_cast<int>(Shader::UBOBinding::LightBuffer), ubo, 0, buffer->getData()->getTotalDataSize());
+                osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(static_cast<int>(Resource::SceneManager::UBOBinding::LightBuffer), ubo, 0, buffer->getData()->getTotalDataSize());
 #endif
                 stateset->setAttributeAndModes(ubb, mode);
 
@@ -676,9 +677,9 @@ namespace SceneUtil
                     auto bo = mLightManager->getLightBuffer(mLastFrameNumber);
 
 #if OSG_VERSION_GREATER_OR_EQUAL(3,5,7)
-                    osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(static_cast<int>(Shader::UBOBinding::LightBuffer), bo->getData(), 0, bo->getData()->getTotalDataSize());
+                    osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(static_cast<int>(Resource::SceneManager::UBOBinding::LightBuffer), bo->getData(), 0, bo->getData()->getTotalDataSize());
 #else
-                    osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(static_cast<int>(Shader::UBOBinding::LightBuffer), bo->getData()->getBufferObject(), 0, bo->getData()->getTotalDataSize());
+                    osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(static_cast<int>(Resource::SceneManager::UBOBinding::LightBuffer), bo->getData()->getBufferObject(), 0, bo->getData()->getTotalDataSize());
 #endif
                     stateset->setAttributeAndModes(ubb, osg::StateAttribute::ON);
                 }
@@ -736,7 +737,7 @@ namespace SceneUtil
             // Needed to query the layout of the buffer object. The layout specifier needed to use the std140 layout is not reliably
             // available, regardless of extensions, until GLSL 140.
             mDummyProgram->addShader(new osg::Shader(osg::Shader::VERTEX, dummyVertSource));
-            mDummyProgram->addBindUniformBlock("LightBufferBinding", static_cast<int>(Shader::UBOBinding::LightBuffer));
+            mDummyProgram->addBindUniformBlock("LightBufferBinding", static_cast<int>(Resource::SceneManager::UBOBinding::LightBuffer));
         }
 
         LightManagerStateAttribute(const LightManagerStateAttribute& copy, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY)
@@ -751,7 +752,7 @@ namespace SceneUtil
 
         void initSharedLayout(osg::GLExtensions* ext, int handle) const
         {
-            constexpr std::array<unsigned int, 1> index = { static_cast<unsigned int>(Shader::UBOBinding::LightBuffer) };
+            constexpr std::array<unsigned int, 1> index = { static_cast<unsigned int>(Resource::SceneManager::UBOBinding::LightBuffer) };
             int totalBlockSize = -1;
             int stride = -1;
 
diff --git a/components/sceneutil/util.cpp b/components/sceneutil/util.cpp
index 007a6637a8..442b164981 100644
--- a/components/sceneutil/util.cpp
+++ b/components/sceneutil/util.cpp
@@ -11,6 +11,9 @@
 #include <osg/TexGen>
 #include <osg/TexEnvCombine>
 #include <osg/Version>
+#include <osg/FrameBufferObject>
+#include <osgUtil/RenderStage>
+#include <osgUtil/CullVisitor>
 
 #include <components/resource/imagemanager.hpp>
 #include <components/resource/scenemanager.hpp>
diff --git a/components/shader/shadermanager.cpp b/components/shader/shadermanager.cpp
index 33f79415f1..e057cfac02 100644
--- a/components/shader/shadermanager.cpp
+++ b/components/shader/shadermanager.cpp
@@ -9,7 +9,6 @@
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/fstream.hpp>
 
-#include <components/sceneutil/lightmanager.hpp>
 #include <components/debug/debuglog.hpp>
 #include <components/misc/stringops.hpp>
 
@@ -17,7 +16,6 @@ namespace Shader
 {
 
     ShaderManager::ShaderManager()
-        : mLightingMethod(SceneUtil::LightingMethod::FFP)
     {
     }
 
@@ -26,11 +24,6 @@ namespace Shader
         mPath = path;
     }
 
-    void ShaderManager::setLightingMethod(SceneUtil::LightingMethod method)
-    {
-        mLightingMethod = method;
-    }
-
     bool addLineDirectivesAfterConditionalBlocks(std::string& source)
     {
         for (size_t position = 0; position < source.length(); )
@@ -345,19 +338,16 @@ namespace Shader
         return shaderIt->second;
     }
 
-    osg::ref_ptr<osg::Program> ShaderManager::getProgram(osg::ref_ptr<osg::Shader> vertexShader, osg::ref_ptr<osg::Shader> fragmentShader)
+    osg::ref_ptr<osg::Program> ShaderManager::getProgram(osg::ref_ptr<osg::Shader> vertexShader, osg::ref_ptr<osg::Shader> fragmentShader, const osg::Program* programTemplate)
     {
         std::lock_guard<std::mutex> lock(mMutex);
         ProgramMap::iterator found = mPrograms.find(std::make_pair(vertexShader, fragmentShader));
         if (found == mPrograms.end())
         {
-            osg::ref_ptr<osg::Program> program (new osg::Program);
+            if (!programTemplate) programTemplate = mProgramTemplate;
+            osg::ref_ptr<osg::Program> program = programTemplate ? static_cast<osg::Program*>(programTemplate->clone(osg::CopyOp::SHALLOW_COPY)) : new osg::Program;
             program->addShader(vertexShader);
             program->addShader(fragmentShader);
-            program->addBindAttribLocation("aOffset", 6);
-            program->addBindAttribLocation("aRotation", 7);
-            if (mLightingMethod == SceneUtil::LightingMethod::SingleUBO)
-                program->addBindUniformBlock("LightBufferBinding", static_cast<int>(UBOBinding::LightBuffer));
             found = mPrograms.insert(std::make_pair(std::make_pair(vertexShader, fragmentShader), program)).first;
         }
         return found->second;
diff --git a/components/shader/shadermanager.hpp b/components/shader/shadermanager.hpp
index 2450f0d6dc..d0ee069b10 100644
--- a/components/shader/shadermanager.hpp
+++ b/components/shader/shadermanager.hpp
@@ -8,29 +8,11 @@
 #include <osg/ref_ptr>
 
 #include <osg/Shader>
-
-#include <osgViewer/Viewer>
-
-#include <components/sceneutil/lightmanager.hpp>
-
-namespace Resource
-{
-    class SceneManager;
-}
-
-namespace SceneUtil
-{
-    enum class LightingMethod;
-}
+#include <osg/Program>
 
 namespace Shader
 {
 
-    enum class UBOBinding
-    {
-        LightBuffer
-    };
-
     /// @brief Reads shader template files and turns them into a concrete shader, based on a list of define's.
     /// @par Shader templates can get the value of a define with the syntax @define.
     class ShaderManager
@@ -41,8 +23,6 @@ namespace Shader
 
         void setShaderPath(const std::string& path);
 
-        void setLightingMethod(SceneUtil::LightingMethod method);
-
         typedef std::map<std::string, std::string> DefineMap;
 
         /// Create or retrieve a shader instance.
@@ -53,7 +33,10 @@ namespace Shader
         /// @note Thread safe.
         osg::ref_ptr<osg::Shader> getShader(const std::string& templateName, const DefineMap& defines, osg::Shader::Type shaderType);
 
-        osg::ref_ptr<osg::Program> getProgram(osg::ref_ptr<osg::Shader> vertexShader, osg::ref_ptr<osg::Shader> fragmentShader);
+        osg::ref_ptr<osg::Program> getProgram(osg::ref_ptr<osg::Shader> vertexShader, osg::ref_ptr<osg::Shader> fragmentShader, const osg::Program* programTemplate=nullptr);
+
+        const osg::Program* getProgramTemplate() const { return mProgramTemplate; }
+        void setProgramTemplate(const osg::Program* program) { mProgramTemplate = program; }
 
         /// Get (a copy of) the DefineMap used to construct all shaders
         DefineMap getGlobalDefines();
@@ -81,9 +64,9 @@ namespace Shader
         typedef std::map<std::pair<osg::ref_ptr<osg::Shader>, osg::ref_ptr<osg::Shader> >, osg::ref_ptr<osg::Program> > ProgramMap;
         ProgramMap mPrograms;
 
-        SceneUtil::LightingMethod mLightingMethod;
-
         std::mutex mMutex;
+
+        osg::ref_ptr<const osg::Program> mProgramTemplate;
     };
 
     bool parseFors(std::string& source, const std::string& templateName);
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index cbd2863e46..0d0710853f 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -1,5 +1,8 @@
 #include "shadervisitor.hpp"
 
+#include <unordered_set>
+#include <set>
+
 #include <osg/AlphaFunc>
 #include <osg/Geometry>
 #include <osg/GLExtensions>
@@ -553,7 +556,7 @@ namespace Shader
 
         if (vertexShader && fragmentShader)
         {
-            auto program = mShaderManager.getProgram(vertexShader, fragmentShader);
+            auto program = mShaderManager.getProgram(vertexShader, fragmentShader, mProgramTemplate);
             writableStateSet->setAttributeAndModes(program, osg::StateAttribute::ON);
             addedState->setAttributeAndModes(program);
 
diff --git a/components/shader/shadervisitor.hpp b/components/shader/shadervisitor.hpp
index a5add473a6..3cd8b5d85a 100644
--- a/components/shader/shadervisitor.hpp
+++ b/components/shader/shadervisitor.hpp
@@ -2,6 +2,7 @@
 #define OPENMW_COMPONENTS_SHADERVISITOR_H
 
 #include <osg/NodeVisitor>
+#include <osg/Program>
 
 namespace Resource
 {
@@ -19,6 +20,8 @@ namespace Shader
     public:
         ShaderVisitor(ShaderManager& shaderManager, Resource::ImageManager& imageManager, const std::string& defaultShaderPrefix);
 
+        void setProgramTemplate(const osg::Program* programTemplate) { mProgramTemplate = programTemplate; }
+
         /// By default, only bump mapped objects will have a shader added to them.
         /// Setting force = true will cause all objects to render using shaders, regardless of having a bump map.
         void setForceShaders(bool force);
@@ -109,6 +112,8 @@ namespace Shader
         void createProgram(const ShaderRequirements& reqs);
         void ensureFFP(osg::Node& node);
         bool adjustGeometry(osg::Geometry& sourceGeometry, const ShaderRequirements& reqs);
+    
+        osg::ref_ptr<const osg::Program> mProgramTemplate;
     };
 
     class ReinstateRemovedStateVisitor : public osg::NodeVisitor

From 803195a05fc87b06385fbf4619faa9de51426c95 Mon Sep 17 00:00:00 2001
From: Bret Curtis <bret.curtis@gmail.com>
Date: Wed, 29 Sep 2021 16:29:10 +0200
Subject: [PATCH 1381/2859] add back some explicit includes

---
 apps/openmw/mwrender/groundcover.cpp | 2 +-
 components/shader/shadervisitor.hpp  | 2 +-
 components/terrain/quadtreeworld.cpp | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwrender/groundcover.cpp b/apps/openmw/mwrender/groundcover.cpp
index 3691c6270b..71bddb1f9d 100644
--- a/apps/openmw/mwrender/groundcover.cpp
+++ b/apps/openmw/mwrender/groundcover.cpp
@@ -151,7 +151,7 @@ namespace MWRender
          mStateset->setRenderBinDetails(0, "RenderBin", osg::StateSet::OVERRIDE_RENDERBIN_DETAILS);
          mStateset->setAttribute(new osg::VertexAttribDivisor(6, 1));
          mStateset->setAttribute(new osg::VertexAttribDivisor(7, 1));
-    
+
          mProgramTemplate = mSceneManager->getShaderManager().getProgramTemplate() ? static_cast<osg::Program*>(mSceneManager->getShaderManager().getProgramTemplate()->clone(osg::CopyOp::SHALLOW_COPY)) : new osg::Program;
          mProgramTemplate->addBindAttribLocation("aOffset", 6);
          mProgramTemplate->addBindAttribLocation("aRotation", 7);
diff --git a/components/shader/shadervisitor.hpp b/components/shader/shadervisitor.hpp
index 3cd8b5d85a..3380a66cca 100644
--- a/components/shader/shadervisitor.hpp
+++ b/components/shader/shadervisitor.hpp
@@ -112,7 +112,7 @@ namespace Shader
         void createProgram(const ShaderRequirements& reqs);
         void ensureFFP(osg::Node& node);
         bool adjustGeometry(osg::Geometry& sourceGeometry, const ShaderRequirements& reqs);
-    
+
         osg::ref_ptr<const osg::Program> mProgramTemplate;
     };
 
diff --git a/components/terrain/quadtreeworld.cpp b/components/terrain/quadtreeworld.cpp
index 24f042b941..c05a964209 100644
--- a/components/terrain/quadtreeworld.cpp
+++ b/components/terrain/quadtreeworld.cpp
@@ -3,6 +3,7 @@
 #include <osgUtil/CullVisitor>
 #include <osg/ShapeDrawable>
 #include <osg/PolygonMode>
+#include <osg/Geode>
 
 #include <limits>
 #include <sstream>
@@ -12,6 +13,7 @@
 #include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/loadinglistener/reporter.hpp>
 #include <components/resource/resourcesystem.hpp>
+#include <components/settings/settings.hpp>
 
 #include "quadtreenode.hpp"
 #include "storage.hpp"

From d8707a763fa79dcfd0576b5754bfe31eaf0163c9 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Wed, 29 Sep 2021 15:10:58 +0000
Subject: [PATCH 1382/2859] fixes build (#3134)

* quadtreeworld.cpp

* renderingmanager.cpp [ci skip]

* quadtreeworld.hpp

* cellborder.hpp

* cellborder.cpp
---
 apps/openmw/mwrender/renderingmanager.cpp | 3 ++-
 components/terrain/cellborder.cpp         | 7 +++----
 components/terrain/cellborder.hpp         | 2 +-
 components/terrain/quadtreeworld.cpp      | 4 ++--
 components/terrain/quadtreeworld.hpp      | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index fad2c25e20..be143510b2 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -414,9 +414,10 @@ namespace MWRender
             const int vertexLodMod = Settings::Manager::getInt("vertex lod mod", "Terrain");
             float maxCompGeometrySize = Settings::Manager::getFloat("max composite geometry size", "Terrain");
             maxCompGeometrySize = std::max(maxCompGeometrySize, 1.f);
+            bool debugChunks = Settings::Manager::getBool("debug chunks", "Terrain");
             mTerrain.reset(new Terrain::QuadTreeWorld(
                 sceneRoot, mRootNode, mResourceSystem, mTerrainStorage.get(), Mask_Terrain, Mask_PreCompile, Mask_Debug,
-                compMapResolution, compMapLevel, lodFactor, vertexLodMod, maxCompGeometrySize));
+                compMapResolution, compMapLevel, lodFactor, vertexLodMod, maxCompGeometrySize, debugChunks));
             if (Settings::Manager::getBool("object paging", "Terrain"))
             {
                 mObjectPaging.reset(new ObjectPaging(mResourceSystem->getSceneManager()));
diff --git a/components/terrain/cellborder.cpp b/components/terrain/cellborder.cpp
index 280a55faca..927530660e 100644
--- a/components/terrain/cellborder.cpp
+++ b/components/terrain/cellborder.cpp
@@ -3,7 +3,6 @@
 #include <osg/Material>
 #include <osg/PolygonMode>
 #include <osg/Geometry>
-#include <osg/Geode>
 
 #include "world.hpp"
 #include "../esm/loadland.hpp"
@@ -22,7 +21,7 @@ CellBorder::CellBorder(Terrain::World *world, osg::Group *root, int borderMask,
 {
 }
 
-osg::ref_ptr<osg::Geode> CellBorder::createBorderGeometry(float x, float y, float size, Terrain::Storage* terrain, Resource::SceneManager* sceneManager, int mask,
+osg::ref_ptr<osg::Group> CellBorder::createBorderGeometry(float x, float y, float size, Terrain::Storage* terrain, Resource::SceneManager* sceneManager, int mask,
     float offset, osg::Vec4f color)
 {
     const int cellSize = ESM::Land::REAL_SIZE;
@@ -66,8 +65,8 @@ osg::ref_ptr<osg::Geode> CellBorder::createBorderGeometry(float x, float y, floa
 
     border->addPrimitiveSet(new osg::DrawArrays(GL_LINE_STRIP,0,vertices->size()));
 
-    osg::ref_ptr<osg::Geode> borderGeode = new osg::Geode;
-    borderGeode->addDrawable(border.get());
+    osg::ref_ptr<osg::Group> borderGeode = new osg::Group;
+    borderGeode->addChild(border.get());
 
     osg::StateSet *stateSet = borderGeode->getOrCreateStateSet();
     osg::ref_ptr<osg::Material> material (new osg::Material);
diff --git a/components/terrain/cellborder.hpp b/components/terrain/cellborder.hpp
index 785c441b86..4481816a55 100644
--- a/components/terrain/cellborder.hpp
+++ b/components/terrain/cellborder.hpp
@@ -32,7 +32,7 @@ namespace Terrain
         */
         void destroyCellBorderGeometry();
 
-        static osg::ref_ptr<osg::Geode> createBorderGeometry(float x, float y, float size, Storage* terrain, Resource::SceneManager* sceneManager, int mask, float offset = 10.0, osg::Vec4f color = { 1,1,0,0 });
+        static osg::ref_ptr<osg::Group> createBorderGeometry(float x, float y, float size, Storage* terrain, Resource::SceneManager* sceneManager, int mask, float offset = 10.0, osg::Vec4f color = { 1,1,0,0 });
 
     protected:
         Terrain::World *mWorld;
diff --git a/components/terrain/quadtreeworld.cpp b/components/terrain/quadtreeworld.cpp
index c05a964209..b47896d775 100644
--- a/components/terrain/quadtreeworld.cpp
+++ b/components/terrain/quadtreeworld.cpp
@@ -271,7 +271,7 @@ private:
     unsigned int mNodeMask;
 };
 
-QuadTreeWorld::QuadTreeWorld(osg::Group *parent, osg::Group *compileRoot, Resource::ResourceSystem *resourceSystem, Storage *storage, unsigned int nodeMask, unsigned int preCompileMask, unsigned int borderMask, int compMapResolution, float compMapLevel, float lodFactor, int vertexLodMod, float maxCompGeometrySize)
+QuadTreeWorld::QuadTreeWorld(osg::Group *parent, osg::Group *compileRoot, Resource::ResourceSystem *resourceSystem, Storage *storage, unsigned int nodeMask, unsigned int preCompileMask, unsigned int borderMask, int compMapResolution, float compMapLevel, float lodFactor, int vertexLodMod, float maxCompGeometrySize, bool debugChunks)
     : TerrainGrid(parent, compileRoot, resourceSystem, storage, nodeMask, preCompileMask, borderMask)
     , mViewDataMap(new ViewDataMap)
     , mQuadTreeBuilt(false)
@@ -279,7 +279,7 @@ QuadTreeWorld::QuadTreeWorld(osg::Group *parent, osg::Group *compileRoot, Resour
     , mVertexLodMod(vertexLodMod)
     , mViewDistance(std::numeric_limits<float>::max())
     , mMinSize(1/8.f)
-    , mDebugTerrainChunks(Settings::Manager::getBool("debug chunks", "Terrain"))
+    , mDebugTerrainChunks(debugChunks)
 {
     mChunkManager->setCompositeMapSize(compMapResolution);
     mChunkManager->setCompositeMapLevel(compMapLevel);
diff --git a/components/terrain/quadtreeworld.hpp b/components/terrain/quadtreeworld.hpp
index 3aabc7233e..3bd606d6c6 100644
--- a/components/terrain/quadtreeworld.hpp
+++ b/components/terrain/quadtreeworld.hpp
@@ -22,7 +22,7 @@ namespace Terrain
     class QuadTreeWorld : public TerrainGrid // note: derived from TerrainGrid is only to render default cells (see loadCell)
     {
     public:
-        QuadTreeWorld(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem, Storage* storage, unsigned int nodeMask, unsigned int preCompileMask, unsigned int borderMask, int compMapResolution, float comMapLevel, float lodFactor, int vertexLodMod, float maxCompGeometrySize);
+        QuadTreeWorld(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem, Storage* storage, unsigned int nodeMask, unsigned int preCompileMask, unsigned int borderMask, int compMapResolution, float comMapLevel, float lodFactor, int vertexLodMod, float maxCompGeometrySize, bool debugChunks);
 
         ~QuadTreeWorld();
 

From b7c1d9edb0c8a1cea73d52ba79e588f40d8846cd Mon Sep 17 00:00:00 2001
From: Bret Curtis <bret.curtis@gmail.com>
Date: Wed, 29 Sep 2021 17:13:40 +0200
Subject: [PATCH 1383/2859] remove unnecessary includes

---
 components/terrain/quadtreeworld.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/components/terrain/quadtreeworld.cpp b/components/terrain/quadtreeworld.cpp
index b47896d775..4baf08149d 100644
--- a/components/terrain/quadtreeworld.cpp
+++ b/components/terrain/quadtreeworld.cpp
@@ -3,7 +3,6 @@
 #include <osgUtil/CullVisitor>
 #include <osg/ShapeDrawable>
 #include <osg/PolygonMode>
-#include <osg/Geode>
 
 #include <limits>
 #include <sstream>
@@ -13,7 +12,6 @@
 #include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/loadinglistener/reporter.hpp>
 #include <components/resource/resourcesystem.hpp>
-#include <components/settings/settings.hpp>
 
 #include "quadtreenode.hpp"
 #include "storage.hpp"

From bec04c66133380d8f36e08193369dd0c485dbe0f Mon Sep 17 00:00:00 2001
From: "Hristos N. Triantafillou" <me@hristos.triantafillou.us>
Date: Wed, 29 Sep 2021 11:13:38 -0500
Subject: [PATCH 1384/2859] Unbreak the formatting broken by !1208

---
 docs/source/reference/modding/paths.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/reference/modding/paths.rst b/docs/source/reference/modding/paths.rst
index bc955b703d..db5000527b 100644
--- a/docs/source/reference/modding/paths.rst
+++ b/docs/source/reference/modding/paths.rst
@@ -29,7 +29,7 @@ Savegames
 +--------------+-----------------------------------------------------------------------------------------------------+
 | OS           | Location                                                                                            |
 +==============+=====================================================================================================+
-| Linux        | ``$HOME/.local/share/openmw/saves``                                                                      |
+| Linux        | ``$HOME/.local/share/openmw/saves``                                                                 |
 +--------------+-----------------------------------------------------------------------------------------------------+
 | Mac          | ``$HOME/Library/Application\ Support/openmw/saves``                                                 |
 +--------------+---------------+-------------------------------------------------------------------------------------+

From e109d864895e472c805fcb090ca03f08ac952562 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Wed, 29 Sep 2021 21:01:22 +0400
Subject: [PATCH 1385/2859] Revert "avoids creating empty statesets on
 drawables (#3132)"

This reverts commit 957c25a491b86772b02ab9057679ad1fc970f353.
---
 apps/openmw/mwrender/renderingmanager.cpp |  1 -
 components/nifosg/nifloader.cpp           | 20 +++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index be143510b2..07b0418f2b 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -486,7 +486,6 @@ namespace MWRender
         defaultMat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
         defaultMat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 0.f));
         sceneRoot->getOrCreateStateSet()->setAttribute(defaultMat);
-        sceneRoot->getOrCreateStateSet()->addUniform(new osg::Uniform("emissiveMult", 1.f));
 
         mFog.reset(new FogManager());
 
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index f05f906c8f..0432aef5b4 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -1134,6 +1134,8 @@ namespace NifOsg
                 trans->addChild(toAttach);
                 parentNode->addChild(trans);
             }
+            // create partsys stateset in order to pass in ShaderVisitor like all other Drawables
+            partsys->getOrCreateStateSet();
         }
 
         void handleNiGeometryData(osg::Geometry *geometry, const Nif::NiGeometryData* data, const std::vector<unsigned int>& boundTextures, const std::string& name)
@@ -1921,6 +1923,8 @@ namespace NifOsg
         void applyDrawableProperties(osg::Node* node, const std::vector<const Nif::Property*>& properties, SceneUtil::CompositeStateSetUpdater* composite,
                                              bool hasVertexColors, int animflags)
         {
+            osg::StateSet* stateset = node->getOrCreateStateSet();
+
             // Specular lighting is enabled by default, but there's a quirk...
             bool specEnabled = true;
             osg::ref_ptr<osg::Material> mat (new osg::Material);
@@ -2002,15 +2006,15 @@ namespace NifOsg
                         if (blendFunc->getDestination() == GL_DST_ALPHA)
                             blendFunc->setDestination(GL_ONE);
                         blendFunc = shareAttribute(blendFunc);
-                        node->getOrCreateStateSet()->setAttributeAndModes(blendFunc, osg::StateAttribute::ON);
+                        stateset->setAttributeAndModes(blendFunc, osg::StateAttribute::ON);
 
                         bool noSort = (alphaprop->flags>>13)&1;
                         if (!noSort)
-                            node->getOrCreateStateSet()->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
+                            stateset->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
                         else
-                            node->getOrCreateStateSet()->setRenderBinToInherit();
+                            stateset->setRenderBinToInherit();
                     }
-                    else if (osg::StateSet* stateset = node->getStateSet())
+                    else
                     {
                         stateset->removeAttribute(osg::StateAttribute::BLENDFUNC);
                         stateset->removeMode(GL_BLEND);
@@ -2021,9 +2025,9 @@ namespace NifOsg
                     {
                         osg::ref_ptr<osg::AlphaFunc> alphaFunc (new osg::AlphaFunc(getTestMode((alphaprop->flags>>10)&0x7), alphaprop->data.threshold/255.f));
                         alphaFunc = shareAttribute(alphaFunc);
-                        node->getOrCreateStateSet()->setAttributeAndModes(alphaFunc, osg::StateAttribute::ON);
+                        stateset->setAttributeAndModes(alphaFunc, osg::StateAttribute::ON);
                     }
-                    else if (osg::StateSet* stateset = node->getStateSet())
+                    else
                     {
                         stateset->removeAttribute(osg::StateAttribute::ALPHAFUNC);
                         stateset->removeMode(GL_ALPHA_TEST);
@@ -2079,10 +2083,8 @@ namespace NifOsg
 
             mat = shareAttribute(mat);
 
-            osg::StateSet* stateset = node->getStateSet();
             stateset->setAttributeAndModes(mat, osg::StateAttribute::ON);
-            if (emissiveMult != 1.f)
-                stateset->addUniform(new osg::Uniform("emissiveMult", emissiveMult));
+            stateset->addUniform(new osg::Uniform("emissiveMult", emissiveMult));
         }
 
     };

From dc1fe62dded40110fefb3f26f86e8b0e70b614b9 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Fri, 27 Aug 2021 20:07:50 +0200
Subject: [PATCH 1386/2859] Overhaul magic effects to work with onApply and
 onEnd events

---
 CHANGELOG.md                                  |    9 +
 apps/essimporter/converter.hpp                |    4 +-
 apps/openmw/CMakeLists.txt                    |    4 +-
 apps/openmw/mwbase/mechanicsmanager.hpp       |    2 -
 apps/openmw/mwbase/world.hpp                  |    4 +-
 apps/openmw/mwgui/charactercreation.cpp       |   16 -
 apps/openmw/mwgui/container.cpp               |    2 +-
 apps/openmw/mwgui/jailscreen.cpp              |    5 +-
 apps/openmw/mwgui/spellbuyingwindow.cpp       |    8 +-
 apps/openmw/mwgui/spellcreationdialog.cpp     |    4 +-
 apps/openmw/mwgui/spellicons.cpp              |   54 +-
 apps/openmw/mwgui/spellicons.hpp              |   14 -
 apps/openmw/mwgui/spellmodel.cpp              |    3 +-
 apps/openmw/mwmechanics/activespells.cpp      |  569 +++++----
 apps/openmw/mwmechanics/activespells.hpp      |  129 ++-
 apps/openmw/mwmechanics/actors.cpp            |  824 ++-----------
 apps/openmw/mwmechanics/actors.hpp            |    7 +-
 apps/openmw/mwmechanics/aicombataction.cpp    |   12 +-
 apps/openmw/mwmechanics/creaturestats.cpp     |   44 +-
 apps/openmw/mwmechanics/creaturestats.hpp     |   13 +-
 apps/openmw/mwmechanics/disease.hpp           |    7 +-
 apps/openmw/mwmechanics/linkedeffects.cpp     |   75 --
 apps/openmw/mwmechanics/linkedeffects.hpp     |   32 -
 apps/openmw/mwmechanics/magiceffects.cpp      |   12 +-
 apps/openmw/mwmechanics/magiceffects.hpp      |   10 -
 .../mwmechanics/mechanicsmanagerimp.cpp       |   22 +-
 .../mwmechanics/mechanicsmanagerimp.hpp       |    2 -
 apps/openmw/mwmechanics/spellabsorption.cpp   |   45 +-
 apps/openmw/mwmechanics/spellcasting.cpp      |  401 ++-----
 apps/openmw/mwmechanics/spellcasting.hpp      |   13 +-
 apps/openmw/mwmechanics/spelleffects.cpp      | 1032 +++++++++++++++++
 apps/openmw/mwmechanics/spelleffects.hpp      |   20 +
 apps/openmw/mwmechanics/spelllist.hpp         |    6 -
 apps/openmw/mwmechanics/spellpriority.cpp     |   22 +-
 apps/openmw/mwmechanics/spells.cpp            |  234 +---
 apps/openmw/mwmechanics/spells.hpp            |   26 +-
 apps/openmw/mwmechanics/summoning.cpp         |  112 +-
 apps/openmw/mwmechanics/summoning.hpp         |   23 +-
 apps/openmw/mwmechanics/tickableeffects.cpp   |  216 ----
 apps/openmw/mwmechanics/tickableeffects.hpp   |   20 -
 apps/openmw/mwrender/npcanimation.cpp         |   28 -
 apps/openmw/mwrender/npcanimation.hpp         |    1 -
 apps/openmw/mwscript/miscextensions.cpp       |   10 +-
 apps/openmw/mwscript/statsextensions.cpp      |   18 +-
 apps/openmw/mwworld/cellstore.cpp             |    8 +
 apps/openmw/mwworld/esmloader.cpp             |  203 ++++
 apps/openmw/mwworld/esmloader.hpp             |    5 +
 apps/openmw/mwworld/inventorystore.cpp        |  271 +----
 apps/openmw/mwworld/inventorystore.hpp        |   43 +-
 apps/openmw/mwworld/player.cpp                |   11 +-
 apps/openmw/mwworld/projectilemanager.cpp     |   10 +-
 apps/openmw/mwworld/projectilemanager.hpp     |    3 +-
 apps/openmw/mwworld/worldimp.cpp              |   78 +-
 apps/openmw/mwworld/worldimp.hpp              |    4 +-
 components/esm/activespells.cpp               |   97 +-
 components/esm/activespells.hpp               |   35 +-
 components/esm/creaturestats.cpp              |   52 +-
 components/esm/creaturestats.hpp              |    1 +
 components/esm/magiceffects.cpp               |   18 +-
 components/esm/magiceffects.hpp               |    4 +-
 components/esm/projectilestate.cpp            |    5 +
 components/esm/projectilestate.hpp            |    1 +
 components/esm/savedgame.cpp                  |    2 +-
 components/esm/spellstate.cpp                 |   69 +-
 components/esm/spellstate.hpp                 |    8 +-
 65 files changed, 2334 insertions(+), 2708 deletions(-)
 delete mode 100644 apps/openmw/mwmechanics/linkedeffects.cpp
 delete mode 100644 apps/openmw/mwmechanics/linkedeffects.hpp
 create mode 100644 apps/openmw/mwmechanics/spelleffects.cpp
 create mode 100644 apps/openmw/mwmechanics/spelleffects.hpp
 delete mode 100644 apps/openmw/mwmechanics/tickableeffects.cpp
 delete mode 100644 apps/openmw/mwmechanics/tickableeffects.hpp

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8dc9510f6e..ffe687a04c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 0.48.0
 ------
 
+    Bug #1751: Birthsign abilities increase modified attribute values instead of base ones
     Bug #3246: ESSImporter: Most NPCs are dead on save load
     Bug #3514: Editing a reference's position after loading an esp file makes the reference disappear
     Bug #3737: Scripts from The Underground 2 .esp do not play (all patched versions)
@@ -16,13 +17,18 @@
     Bug #5453: Magic effect VFX are offset for creatures
     Bug #5483: AutoCalc flag is not used to calculate spells cost
     Bug #5508: Engine binary links to Qt without using it
+    Bug #5596: Effects in constant spells should not be merged
+    Bug #5621: Drained stats cannot be restored
     Bug #5755: Active grid object paging - disappearing textures
     Bug #5788: Texture editing parses the selected indexes wrongly
+    Bug #5801: A multi-effect spell with the intervention effects and recall always favors Almsivi intervention
     Bug #5842: GetDisposition adds temporary disposition change from different actors
+    Bug #5863: GetEffect should return true after the player has teleported
     Bug #6037: Morrowind Content Language Cannot be Set to English in OpenMW Launcher
     Bug #6051: NaN water height in ESM file is not handled gracefully
     Bug #6066: addtopic "return" does not work from within script. No errors thrown
     Bug #6067: esp loader fails in for certain subrecord orders
+    Bug #6087: Bound items added directly to the inventory disappear if their corresponding spell effect ends
     Bug #6101: Disarming trapped unlocked owned objects isn't considered a crime
     Bug #6107: Fatigue is incorrectly recalculated when fortify effect is applied or removed
     Bug #6115: Showmap overzealous matching
@@ -36,6 +42,7 @@
     Bug #6174: Spellmaking and Enchanting sliders differences from vanilla
     Bug #6184: Command and Calm and Demoralize and Frenzy and Rally magic effects inconsistencies with vanilla
     Bug #6197: Infinite Casting Loop
+    Bug #6223: Some Constant Effect Bound Items inconsistencies
     Bug #6273: Respawning NPCs rotation is inconsistent
     Bug #6282: Laura craft doesn't follow the player character
     Bug #6283: Avis Dorsey follows you after her death
@@ -45,8 +52,10 @@
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
     Feature #2780: A way to see current OpenMW version in the console
     Feature #3616: Allow Zoom levels on the World Map
+    Feature #4297: Implement APPLIED_ONCE flag for magic effects
     Feature #4595: Unique object identifier
     Feature #4737: Handle instance move from one cell to another
+    Feature #5198: Implement "Magic effect expired" event
     Feature #5489: MCP: Telekinesis fix for activators
     Feature #5996: Support Lua scripts in OpenMW
     Feature #6017: Separate persistent and temporary cell references when saving
diff --git a/apps/essimporter/converter.hpp b/apps/essimporter/converter.hpp
index 46e4426dc5..81b9711bbf 100644
--- a/apps/essimporter/converter.hpp
+++ b/apps/essimporter/converter.hpp
@@ -124,11 +124,9 @@ public:
         {
             mContext->mPlayer.mObject.mCreatureStats.mLevel = npc.mNpdt.mLevel;
             mContext->mPlayerBase = npc;
-            ESM::SpellState::SpellParams empty;
             // FIXME: player start spells and birthsign spells aren't listed here,
             // need to fix openmw to account for this
-            for (const auto & spell : npc.mSpells.mList)
-                mContext->mPlayer.mObject.mCreatureStats.mSpells.mSpells[spell] = empty;
+            mContext->mPlayer.mObject.mCreatureStats.mSpells.mSpells = npc.mSpells.mList;
 
             // 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.
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 82a91699a9..7ad9856a77 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -92,8 +92,8 @@ add_openmw_dir (mwmechanics
     drawstate spells activespells npcstats aipackage aisequence aipursue alchemy aiwander aitravel aifollow aiavoiddoor aibreathe
     aicast aiescort aiface aiactivate aicombat recharge repair enchanting pathfinding pathgrid security spellcasting spellresistance
     disease pickpocket levelledlist combat steering obstacle autocalcspell difficultyscaling aicombataction actor summoning
-    character actors objects aistate trading weaponpriority spellpriority weapontype spellutil tickableeffects
-    spellabsorption linkedeffects
+    character actors objects aistate trading weaponpriority spellpriority weapontype spellutil
+    spellabsorption spelleffects
     )
 
 add_openmw_dir (mwstate
diff --git a/apps/openmw/mwbase/mechanicsmanager.hpp b/apps/openmw/mwbase/mechanicsmanager.hpp
index b638ecade9..ccc60afc27 100644
--- a/apps/openmw/mwbase/mechanicsmanager.hpp
+++ b/apps/openmw/mwbase/mechanicsmanager.hpp
@@ -277,8 +277,6 @@ namespace MWBase
             virtual float getAngleToPlayer(const MWWorld::Ptr& ptr) const  = 0;
             virtual MWMechanics::GreetingState getGreetingState(const MWWorld::Ptr& ptr) const = 0;
             virtual bool isTurningToPlayer(const MWWorld::Ptr& ptr) const = 0;
-
-            virtual void restoreStatsAfterCorprus(const MWWorld::Ptr& actor, const std::string& sourceId) = 0;
     };
 }
 
diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 1dbb2b96f6..e9fc6e5c7a 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -539,7 +539,7 @@ namespace MWBase
 
             virtual void castSpell (const MWWorld::Ptr& actor, bool manualSpell=false) = 0;
 
-            virtual void launchMagicBolt (const std::string& spellId, const MWWorld::Ptr& caster, const osg::Vec3f& fallbackDirection) = 0;
+            virtual void launchMagicBolt (const std::string& spellId, const MWWorld::Ptr& caster, const osg::Vec3f& fallbackDirection, int slot) = 0;
             virtual void launchProjectile (MWWorld::Ptr& actor, MWWorld::Ptr& projectile,
                                            const osg::Vec3f& worldPos, const osg::Quat& orient, MWWorld::Ptr& bow, float speed, float attackStrength) = 0;
             virtual void updateProjectilesCasters() = 0;
@@ -591,7 +591,7 @@ namespace MWBase
 
             virtual void explodeSpell(const osg::Vec3f& origin, const ESM::EffectList& effects, const MWWorld::Ptr& caster,
                                       const MWWorld::Ptr& ignore, ESM::RangeType rangeType, const std::string& id,
-                                      const std::string& sourceName, const bool fromProjectile=false) = 0;
+                                      const std::string& sourceName, const bool fromProjectile=false, int slot = 0) = 0;
 
             virtual void activate (const MWWorld::Ptr& object, const MWWorld::Ptr& actor) = 0;
 
diff --git a/apps/openmw/mwgui/charactercreation.cpp b/apps/openmw/mwgui/charactercreation.cpp
index 827f87c7d6..43da1ef83f 100644
--- a/apps/openmw/mwgui/charactercreation.cpp
+++ b/apps/openmw/mwgui/charactercreation.cpp
@@ -72,13 +72,6 @@ namespace
                 return {question, {r2, r1, r0}, sound};
         }
     }
-
-    void updatePlayerHealth()
-    {
-        MWWorld::Ptr player = MWMechanics::getPlayer();
-        MWMechanics::NpcStats& npcStats = player.getClass().getNpcStats(player);
-        npcStats.updateHealth();
-    }
 }
 
 namespace MWGui
@@ -372,8 +365,6 @@ namespace MWGui
             MWBase::Environment::get().getWindowManager()->removeDialog(mPickClassDialog);
             mPickClassDialog = nullptr;
         }
-
-        updatePlayerHealth();
     }
 
     void CharacterCreation::onPickClassDialogDone(WindowBase* parWindow)
@@ -448,8 +439,6 @@ namespace MWGui
             MWBase::Environment::get().getWindowManager()->removeDialog(mRaceDialog);
             mRaceDialog = nullptr;
         }
-
-        updatePlayerHealth();
     }
 
     void CharacterCreation::onRaceDialogBack()
@@ -477,8 +466,6 @@ namespace MWGui
             MWBase::Environment::get().getWindowManager()->removeDialog(mBirthSignDialog);
             mBirthSignDialog = nullptr;
         }
-
-        updatePlayerHealth();
     }
 
     void CharacterCreation::onBirthSignDialogDone(WindowBase* parWindow)
@@ -527,7 +514,6 @@ namespace MWGui
             // Do not delete dialog, so that choices are remembered in case we want to go back and adjust them later
             mCreateClassDialog->setVisible(false);
         }
-        updatePlayerHealth();
     }
 
     void CharacterCreation::onCreateClassDialogDone(WindowBase* parWindow)
@@ -719,8 +705,6 @@ namespace MWGui
             MWBase::Environment::get().getWorld()->getStore().get<ESM::Class>().find(mGenerateClass);
 
         mPlayerClass = *klass;
-
-        updatePlayerHealth();
     }
 
     void CharacterCreation::onGenerateClassBack()
diff --git a/apps/openmw/mwgui/container.cpp b/apps/openmw/mwgui/container.cpp
index b649e41b0f..df490943d2 100644
--- a/apps/openmw/mwgui/container.cpp
+++ b/apps/openmw/mwgui/container.cpp
@@ -262,7 +262,7 @@ namespace MWGui
                     }
 
                     // Clean up summoned creatures as well
-                    std::map<ESM::SummonKey, int>& creatureMap = creatureStats.getSummonedCreatureMap();
+                    auto& creatureMap = creatureStats.getSummonedCreatureMap();
                     for (const auto& creature : creatureMap)
                         MWBase::Environment::get().getMechanicsManager()->cleanupSummonedCreature(ptr, creature.second);
                     creatureMap.clear();
diff --git a/apps/openmw/mwgui/jailscreen.cpp b/apps/openmw/mwgui/jailscreen.cpp
index cc793073e3..a029fe54b6 100644
--- a/apps/openmw/mwgui/jailscreen.cpp
+++ b/apps/openmw/mwgui/jailscreen.cpp
@@ -82,10 +82,7 @@ namespace MWGui
         MWBase::Environment::get().getWorld()->advanceTime(mDays * 24);
 
         // We should not worsen corprus when in prison
-        for (auto& spell : player.getClass().getCreatureStats(player).getCorprusSpells())
-        {
-            spell.second.mNextWorsening += mDays * 24;
-        }
+        player.getClass().getCreatureStats(player).getActiveSpells().skipWorsenings(mDays * 24);
 
         std::set<int> skills;
         for (int day=0; day<mDays; ++day)
diff --git a/apps/openmw/mwgui/spellbuyingwindow.cpp b/apps/openmw/mwgui/spellbuyingwindow.cpp
index eb51f560be..49870a9ddf 100644
--- a/apps/openmw/mwgui/spellbuyingwindow.cpp
+++ b/apps/openmw/mwgui/spellbuyingwindow.cpp
@@ -99,10 +99,8 @@ namespace MWGui
 
         std::vector<const ESM::Spell*> spellsToSort;
 
-        for (MWMechanics::Spells::TIterator iter = merchantSpells.begin(); iter!=merchantSpells.end(); ++iter)
+        for (const ESM::Spell* spell : merchantSpells)
         {
-            const ESM::Spell* spell = iter->first;
-
             if (spell->mData.mType!=ESM::Spell::ST_Spell)
                 continue; // don't try to sell diseases, curses or powers
 
@@ -115,10 +113,10 @@ namespace MWGui
                     continue;
             }
 
-            if (playerHasSpell(iter->first->mId))
+            if (playerHasSpell(spell->mId))
                 continue;
 
-            spellsToSort.push_back(iter->first);
+            spellsToSort.push_back(spell);
         }
 
         std::stable_sort(spellsToSort.begin(), spellsToSort.end(), sortSpells);
diff --git a/apps/openmw/mwgui/spellcreationdialog.cpp b/apps/openmw/mwgui/spellcreationdialog.cpp
index 01653d9e6f..8c0ea865a8 100644
--- a/apps/openmw/mwgui/spellcreationdialog.cpp
+++ b/apps/openmw/mwgui/spellcreationdialog.cpp
@@ -520,10 +520,8 @@ namespace MWGui
 
         std::vector<short> knownEffects;
 
-        for (MWMechanics::Spells::TIterator it = spells.begin(); it != spells.end(); ++it)
+        for (const ESM::Spell* spell : spells)
         {
-            const ESM::Spell* spell = it->first;
-
             // only normal spells count
             if (spell->mData.mType != ESM::Spell::ST_Spell)
                 continue;
diff --git a/apps/openmw/mwgui/spellicons.cpp b/apps/openmw/mwgui/spellicons.cpp
index 405abfbae7..4a86503f46 100644
--- a/apps/openmw/mwgui/spellicons.cpp
+++ b/apps/openmw/mwgui/spellicons.cpp
@@ -24,50 +24,33 @@
 
 namespace MWGui
 {
-
-    void EffectSourceVisitor::visit (MWMechanics::EffectKey key, int effectIndex,
-                                     const std::string& sourceName, const std::string& sourceId, int casterActorId,
-                                     float magnitude, float remainingTime, float totalTime)
-    {
-        MagicEffectInfo newEffectSource;
-        newEffectSource.mKey = key;
-        newEffectSource.mMagnitude = static_cast<int>(magnitude);
-        newEffectSource.mPermanent = mIsPermanent;
-        newEffectSource.mRemainingTime = remainingTime;
-        newEffectSource.mSource = sourceName;
-        newEffectSource.mTotalTime = totalTime;
-
-        mEffectSources[key.mId].push_back(newEffectSource);
-    }
-
-
     void SpellIcons::updateWidgets(MyGUI::Widget *parent, bool adjustSize)
     {
-        // TODO: Tracking add/remove/expire would be better than force updating every frame
-
         MWWorld::Ptr player = MWMechanics::getPlayer();
         const MWMechanics::CreatureStats& stats = player.getClass().getCreatureStats(player);
 
-
-        EffectSourceVisitor visitor;
-
-        // permanent item enchantments & permanent spells
-        visitor.mIsPermanent = true;
-        MWWorld::InventoryStore& store = player.getClass().getInventoryStore(player);
-        store.visitEffectSources(visitor);
-        stats.getSpells().visitEffectSources(visitor);
-
-        // now add lasting effects
-        visitor.mIsPermanent = false;
-        stats.getActiveSpells().visitEffectSources(visitor);
-
-        std::map <int, std::vector<MagicEffectInfo> >& effects = visitor.mEffectSources;
+        std::map<int, std::vector<MagicEffectInfo>> effects;
+        for(const auto& params : stats.getActiveSpells())
+        {
+            for(const auto& effect : params.getEffects())
+            {
+                if(!effect.mMagnitude)
+                    continue;
+                MagicEffectInfo newEffectSource;
+                newEffectSource.mKey = MWMechanics::EffectKey(effect.mEffectId, effect.mArg);
+                newEffectSource.mMagnitude = static_cast<int>(effect.mMagnitude);
+                newEffectSource.mPermanent = effect.mDuration == -1.f;
+                newEffectSource.mRemainingTime = effect.mTimeLeft;
+                newEffectSource.mSource = params.getDisplayName();
+                newEffectSource.mTotalTime = effect.mDuration;
+                effects[effect.mEffectId].push_back(newEffectSource);
+            }
+        }
 
         int w=2;
 
-        for (auto& effectInfoPair : effects)
+        for (const auto& [effectId, effectInfos] : effects)
         {
-            const int effectId = effectInfoPair.first;
             const ESM::MagicEffect* effect =
                 MWBase::Environment::get().getWorld ()->getStore ().get<ESM::MagicEffect>().find(effectId);
 
@@ -78,7 +61,6 @@ namespace MWGui
 
             static const float fadeTime = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fMagicStartIconBlink")->mValue.getFloat();
 
-            std::vector<MagicEffectInfo>& effectInfos = effectInfoPair.second;
             bool addNewLine = false;
             for (const MagicEffectInfo& effectInfo : effectInfos)
             {
diff --git a/apps/openmw/mwgui/spellicons.hpp b/apps/openmw/mwgui/spellicons.hpp
index b6aa49e69e..9825162a33 100644
--- a/apps/openmw/mwgui/spellicons.hpp
+++ b/apps/openmw/mwgui/spellicons.hpp
@@ -37,20 +37,6 @@ namespace MWGui
         bool mPermanent; // the effect is permanent
     };
 
-    class EffectSourceVisitor : public MWMechanics::EffectSourceVisitor
-    {
-    public:
-        bool mIsPermanent;
-
-        std::map <int, std::vector<MagicEffectInfo> > mEffectSources;
-
-        virtual ~EffectSourceVisitor() {}
-
-        void visit (MWMechanics::EffectKey key, int effectIndex,
-                            const std::string& sourceName, const std::string& sourceId, int casterActorId,
-                            float magnitude, float remainingTime = -1, float totalTime = -1) override;
-    };
-
     class SpellIcons
     {
     public:
diff --git a/apps/openmw/mwgui/spellmodel.cpp b/apps/openmw/mwgui/spellmodel.cpp
index fe18b0f082..61ea9ce93a 100644
--- a/apps/openmw/mwgui/spellmodel.cpp
+++ b/apps/openmw/mwgui/spellmodel.cpp
@@ -92,9 +92,8 @@ namespace MWGui
 
         std::string filter = Misc::StringUtils::lowerCaseUtf8(mFilter);
 
-        for (MWMechanics::Spells::TIterator it = spells.begin(); it != spells.end(); ++it)
+        for (const ESM::Spell* spell : spells)
         {
-            const ESM::Spell* spell = it->first;
             if (spell->mData.mType != ESM::Spell::ST_Power && spell->mData.mType != ESM::Spell::ST_Spell)
                 continue;
 
diff --git a/apps/openmw/mwmechanics/activespells.cpp b/apps/openmw/mwmechanics/activespells.cpp
index 319d797257..6ad6ef369e 100644
--- a/apps/openmw/mwmechanics/activespells.cpp
+++ b/apps/openmw/mwmechanics/activespells.cpp
@@ -5,347 +5,442 @@
 
 #include <components/esm/loadmgef.hpp>
 
+#include "creaturestats.hpp"
+#include "spellcasting.hpp"
+#include "spelleffects.hpp"
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
 #include "../mwworld/esmstore.hpp"
+#include "../mwworld/class.hpp"
+#include "../mwworld/inventorystore.hpp"
 
-namespace MWMechanics
+namespace
 {
-    void ActiveSpells::update(float duration) const
+    bool merge(std::vector<ESM::ActiveEffect>& present, const std::vector<ESM::ActiveEffect>& queued)
     {
-        bool rebuild = false;
-
-        // Erase no longer active spells and effects
-        if (duration > 0)
+        // Can't merge if we already have an effect with the same effect index
+        auto problem = std::find_if(queued.begin(), queued.end(), [&] (const auto& qEffect)
         {
-            TContainer::iterator iter (mSpells.begin());
-            while (iter!=mSpells.end())
-            {
-                if (!timeToExpire (iter))
-                {
-                    mSpells.erase (iter++);
-                    rebuild = true;
-                }
-                else
-                {
-                    bool interrupt = false;
-                    std::vector<ActiveEffect>& effects = iter->second.mEffects;
-                    for (std::vector<ActiveEffect>::iterator effectIt = effects.begin(); effectIt != effects.end();)
-                    {
-                        if (effectIt->mTimeLeft <= 0)
-                        {
-                            rebuild = true;
-
-                            // Note: it we expire a Corprus effect, we should remove the whole spell.
-                            if (effectIt->mEffectId == ESM::MagicEffect::Corprus)
-                            {
-                                iter = mSpells.erase (iter);
-                                interrupt = true;
-                                break;
-                            }
-
-                            effectIt = effects.erase(effectIt);
-                        }
-                        else
-                        {
-                            effectIt->mTimeLeft -= duration;
-                            ++effectIt;
-                        }
-                    }
-
-                    if (!interrupt)
-                        ++iter;
-                }
-            }
-        }
-
-        if (mSpellsChanged)
-        {
-            mSpellsChanged = false;
-            rebuild = true;
-        }
-
-        if (rebuild)
-            rebuildEffects();
+            return std::find_if(present.begin(), present.end(), [&] (const auto& pEffect) { return pEffect.mEffectIndex == qEffect.mEffectIndex; }) != present.end();
+        });
+        if(problem != queued.end())
+            return false;
+        present.insert(present.end(), queued.begin(), queued.end());
+        return true;
     }
 
-    void ActiveSpells::rebuildEffects() const
+    void addEffects(std::vector<ESM::ActiveEffect>& effects, const ESM::EffectList& list, bool ignoreResistances = false)
     {
-        mEffects = MagicEffects();
-
-        for (TIterator iter (begin()); iter!=end(); ++iter)
+        int currentEffectIndex = 0;
+        for(const auto& enam : list.mList)
         {
-            const std::vector<ActiveEffect>& effects = iter->second.mEffects;
-
-            for (std::vector<ActiveEffect>::const_iterator effectIt = effects.begin(); effectIt != effects.end(); ++effectIt)
-            {
-                if (effectIt->mTimeLeft > 0)
-                    mEffects.add(MWMechanics::EffectKey(effectIt->mEffectId, effectIt->mArg), MWMechanics::EffectParam(effectIt->mMagnitude));
-            }
+            ESM::ActiveEffect effect;
+            effect.mEffectId = enam.mEffectID;
+            effect.mArg = MWMechanics::EffectKey(enam).mArg;
+            effect.mMagnitude = 0.f;
+            effect.mMinMagnitude = enam.mMagnMin;
+            effect.mMaxMagnitude = enam.mMagnMax;
+            effect.mEffectIndex = currentEffectIndex++;
+            effect.mFlags = ESM::ActiveEffect::Flag_None;
+            if(ignoreResistances)
+                effect.mFlags |= ESM::ActiveEffect::Flag_Ignore_Resistances;
+            effect.mDuration = -1;
+            effect.mTimeLeft = -1;
+            effects.emplace_back(effect);
         }
     }
+}
 
-    ActiveSpells::ActiveSpells()
-        : mSpellsChanged (false)
-    {}
+namespace MWMechanics
+{
+    ActiveSpells::IterationGuard::IterationGuard(ActiveSpells& spells) : mActiveSpells(spells)
+    {
+        mActiveSpells.mIterating = true;
+    }
 
-    const MagicEffects& ActiveSpells::getMagicEffects() const
+    ActiveSpells::IterationGuard::~IterationGuard()
     {
-        update(0.f);
-        return mEffects;
+        mActiveSpells.mIterating = false;
     }
 
-    ActiveSpells::TIterator ActiveSpells::begin() const
+    ActiveSpells::ActiveSpellParams::ActiveSpellParams(const CastSpell& cast, const MWWorld::Ptr& caster)
+    : mId(cast.mId), mDisplayName(cast.mSourceName), mCasterActorId(-1), mSlot(cast.mSlot), mType(cast.mType), mWorsenings(-1)
     {
-        return mSpells.begin();
+        if(!caster.isEmpty() && caster.getClass().isActor())
+            mCasterActorId = caster.getClass().getCreatureStats(caster).getActorId();
     }
 
-    ActiveSpells::TIterator ActiveSpells::end() const
+    ActiveSpells::ActiveSpellParams::ActiveSpellParams(const ESM::Spell* spell, const MWWorld::Ptr& actor, bool ignoreResistances)
+    : mId(spell->mId), mDisplayName(spell->mName), mCasterActorId(actor.getClass().getCreatureStats(actor).getActorId()), mSlot(0)
+    , mType(spell->mData.mType == ESM::Spell::ST_Ability ? ESM::ActiveSpells::Type_Ability : ESM::ActiveSpells::Type_Permanent), mWorsenings(-1)
     {
-        return mSpells.end();
+        assert(spell->mData.mType != ESM::Spell::ST_Spell && spell->mData.mType != ESM::Spell::ST_Power);
+        addEffects(mEffects, spell->mEffects, ignoreResistances);
     }
 
-    double ActiveSpells::timeToExpire (const TIterator& iterator) const
+    ActiveSpells::ActiveSpellParams::ActiveSpellParams(const MWWorld::ConstPtr& item, const ESM::Enchantment* enchantment, int slotIndex, const MWWorld::Ptr& actor)
+    : mId(item.getCellRef().getRefId()), mDisplayName(item.getClass().getName(item)), mCasterActorId(actor.getClass().getCreatureStats(actor).getActorId())
+    , mSlot(slotIndex), mType(ESM::ActiveSpells::Type_Enchantment), mWorsenings(-1)
     {
-        const std::vector<ActiveEffect>& effects = iterator->second.mEffects;
+        assert(enchantment->mData.mType == ESM::Enchantment::ConstantEffect);
+        addEffects(mEffects, enchantment->mEffects);
+    }
 
-        float duration = 0;
+    ActiveSpells::ActiveSpellParams::ActiveSpellParams(const ESM::ActiveSpells::ActiveSpellParams& params)
+    : mId(params.mId), mEffects(params.mEffects), mDisplayName(params.mDisplayName), mCasterActorId(params.mCasterActorId)
+    , mSlot(params.mItem.isSet() ? params.mItem.mIndex : 0)
+    , mType(params.mType), mWorsenings(params.mWorsenings), mNextWorsening({params.mNextWorsening})
+    {}
 
-        for (std::vector<ActiveEffect>::const_iterator iter (effects.begin());
-            iter!=effects.end(); ++iter)
+    ESM::ActiveSpells::ActiveSpellParams ActiveSpells::ActiveSpellParams::toEsm() const
+    {
+        ESM::ActiveSpells::ActiveSpellParams params;
+        params.mId = mId;
+        params.mEffects = mEffects;
+        params.mDisplayName = mDisplayName;
+        params.mCasterActorId = mCasterActorId;
+        params.mItem.unset();
+        if(mSlot)
         {
-            if (iter->mTimeLeft > duration)
-                duration = iter->mTimeLeft;
+            // Note that we're storing the inventory slot as a RefNum instead of an int as a matter of future proofing
+            // mSlot needs to be replaced with a RefNum once inventory items get persistent RefNum (#4508 #6148)
+            params.mItem = { static_cast<unsigned int>(mSlot), 0 };
         }
+        params.mType = mType;
+        params.mWorsenings = mWorsenings;
+        params.mNextWorsening = mNextWorsening.toEsm();
+        return params;
+    }
 
-        if (duration < 0)
-            return 0;
-
-        return duration;
+    void ActiveSpells::ActiveSpellParams::worsen()
+    {
+        ++mWorsenings;
+        if(!mWorsenings)
+            mNextWorsening = MWBase::Environment::get().getWorld()->getTimeStamp();
+        mNextWorsening += CorprusStats::sWorseningPeriod;
     }
 
-    bool ActiveSpells::isSpellActive(const std::string& id) const
+    bool ActiveSpells::ActiveSpellParams::shouldWorsen() const
     {
-        for (TContainer::iterator iter = mSpells.begin(); iter != mSpells.end(); ++iter)
-        {
-            if (Misc::StringUtils::ciEqual(iter->first, id))
-                return true;
-        }
-        return false;
+        return mWorsenings >= 0 && MWBase::Environment::get().getWorld()->getTimeStamp() >= mNextWorsening;
     }
 
-    const ActiveSpells::TContainer& ActiveSpells::getActiveSpells() const
+    void ActiveSpells::ActiveSpellParams::resetWorsenings()
     {
-        return mSpells;
+        mWorsenings = -1;
     }
 
-    void ActiveSpells::addSpell(const std::string &id, bool stack, const std::vector<ActiveEffect>& effects,
-                                const std::string &displayName, int casterActorId)
+    void ActiveSpells::update(const MWWorld::Ptr& ptr, float duration)
     {
-        TContainer::iterator it(mSpells.find(id));
+        const auto& creatureStats = ptr.getClass().getCreatureStats(ptr);
+        assert(&creatureStats.getActiveSpells() == this);
+        IterationGuard guard{*this};
+        // Erase no longer active spells and effects
+        for(auto spellIt = mSpells.begin(); spellIt != mSpells.end();)
+        {
+            if(spellIt->mType != ESM::ActiveSpells::Type_Temporary && spellIt->mType != ESM::ActiveSpells::Type_Consumable)
+            {
+                ++spellIt;
+                continue;
+            }
+            bool removedSpell = false;
+            for(auto effectIt = spellIt->mEffects.begin(); effectIt != spellIt->mEffects.end();)
+            {
+                if(effectIt->mFlags & ESM::ActiveEffect::Flag_Remove && effectIt->mTimeLeft <= 0.f)
+                {
+                    auto effect = *effectIt;
+                    effectIt = spellIt->mEffects.erase(effectIt);
+                    onMagicEffectRemoved(ptr, *spellIt, effect);
+                    removedSpell = applyPurges(ptr, &spellIt, &effectIt);
+                    if(removedSpell)
+                        break;
+                }
+                else
+                {
+                    ++effectIt;
+                }
+            }
+            if(removedSpell)
+                continue;
+            if(spellIt->mEffects.empty())
+                spellIt = mSpells.erase(spellIt);
+            else
+                ++spellIt;
+        }
 
-        ActiveSpellParams params;
-        params.mEffects = effects;
-        params.mDisplayName = displayName;
-        params.mCasterActorId = casterActorId;
+        for(const auto& spell : mQueue)
+            addToSpells(ptr, spell);
+        mQueue.clear();
 
-        if (it == end() || stack)
+        // Vanilla only does this on cell change I think
+        const auto& spells = creatureStats.getSpells();
+        for(const ESM::Spell* spell : spells)
         {
-            mSpells.insert(std::make_pair(id, params));
+            if(spell->mData.mType != ESM::Spell::ST_Spell && spell->mData.mType != ESM::Spell::ST_Power && !isSpellActive(spell->mId))
+                mSpells.emplace_back(ActiveSpellParams{spell, ptr});
         }
-        else
+
+        if(ptr.getClass().hasInventoryStore(ptr) && !(creatureStats.isDead() && !creatureStats.isDeathAnimationFinished()))
         {
-            // addSpell() is called with effects for a range.
-            // but a spell may have effects with different ranges (e.g. Touch & Target)
-            // so, if we see new effects for same spell assume additional 
-            // spell effects and add to existing effects of spell
-            mergeEffects(params.mEffects, it->second.mEffects);
-            it->second = params;
+            auto& store = ptr.getClass().getInventoryStore(ptr);
+            if(store.getInvListener() != nullptr)
+            {
+                bool playNonLooping = !store.isFirstEquip();
+                const auto world = MWBase::Environment::get().getWorld();
+                for(int slotIndex = 0; slotIndex < MWWorld::InventoryStore::Slots; slotIndex++)
+                {
+                    auto slot = store.getSlot(slotIndex);
+                    if(slot == store.end())
+                        continue;
+                    const auto& enchantmentId = slot->getClass().getEnchantment(*slot);
+                    if(enchantmentId.empty())
+                        continue;
+                    const ESM::Enchantment* enchantment = world->getStore().get<ESM::Enchantment>().find(enchantmentId);
+                    if(enchantment->mData.mType != ESM::Enchantment::ConstantEffect)
+                        continue;
+                    if(std::find_if(mSpells.begin(), mSpells.end(), [&] (const ActiveSpellParams& params)
+                    {
+                        return params.mSlot == slotIndex && params.mType == ESM::ActiveSpells::Type_Enchantment && params.mId == slot->getCellRef().getRefId();
+                    }) != mSpells.end())
+                        continue;
+                    ActiveSpellParams params(*slot, enchantment, slotIndex, ptr);
+                    mSpells.emplace_back(params);
+                    for(const auto& effect : params.mEffects)
+                        MWMechanics::playEffects(ptr, *world->getStore().get<ESM::MagicEffect>().find(effect.mEffectId), playNonLooping);
+                }
+            }
         }
 
-        mSpellsChanged = true;
-    }
-
-    void ActiveSpells::mergeEffects(std::vector<ActiveEffect>& addTo, const std::vector<ActiveEffect>& from)
-    {
-        for (std::vector<ActiveEffect>::const_iterator effect(from.begin()); effect != from.end(); ++effect)
+        // Update effects
+        for(auto spellIt = mSpells.begin(); spellIt != mSpells.end();)
         {
-            // if effect is not in addTo, add it
-            bool missing = true;
-            for (std::vector<ActiveEffect>::const_iterator iter(addTo.begin()); iter != addTo.end(); ++iter)
+            const auto caster = MWBase::Environment::get().getWorld()->searchPtrViaActorId(spellIt->mCasterActorId); //Maybe make this search outside active grid?
+            bool removedSpell = false;
+            for(auto it = spellIt->mEffects.begin(); it != spellIt->mEffects.end();)
             {
-                if ((effect->mEffectId == iter->mEffectId) && (effect->mArg == iter->mArg))
-                {
-                    missing = false;
+                bool remove = applyMagicEffect(ptr, caster, *spellIt, *it, duration);
+                if(remove)
+                    it = spellIt->mEffects.erase(it);
+                else
+                    ++it;
+                removedSpell = applyPurges(ptr, &spellIt, &it);
+                if(removedSpell)
                     break;
-                }
             }
-            if (missing)
+            if(removedSpell)
+                continue;
+
+            bool remove = false;
+            if(spellIt->mType == ESM::ActiveSpells::Type_Ability || spellIt->mType == ESM::ActiveSpells::Type_Permanent)
+                remove = !spells.hasSpell(spellIt->mId);
+            else if(spellIt->mType == ESM::ActiveSpells::Type_Enchantment)
             {
-                addTo.push_back(*effect);
+                const auto& store = ptr.getClass().getInventoryStore(ptr);
+                auto slot = store.getSlot(spellIt->mSlot);
+                remove = slot == store.end() || slot->getCellRef().getRefId() != spellIt->mId;
             }
+            if(remove)
+            {
+                auto params = *spellIt;
+                spellIt = mSpells.erase(spellIt);
+                for(const auto& effect : params.mEffects)
+                    onMagicEffectRemoved(ptr, params, effect);
+                applyPurges(ptr, &spellIt);
+                continue;
+            }
+            ++spellIt;
         }
     }
 
-    void ActiveSpells::removeEffects(const std::string &id)
+    void ActiveSpells::addToSpells(const MWWorld::Ptr& ptr, const ActiveSpellParams& spell)
     {
-        for (TContainer::iterator spell = mSpells.begin(); spell != mSpells.end(); ++spell)
+        if(spell.mType != ESM::ActiveSpells::Type_Consumable)
         {
-            if (spell->first == id)
+            auto found = std::find_if(mSpells.begin(), mSpells.end(), [&] (const auto& existing)
+            {
+                return spell.mId == existing.mId && spell.mCasterActorId == existing.mCasterActorId && spell.mSlot == existing.mSlot;
+            });
+            if(found != mSpells.end())
             {
-                spell->second.mEffects.clear();
-                mSpellsChanged = true;
+                if(merge(found->mEffects, spell.mEffects))
+                    return;
+                auto params = *found;
+                mSpells.erase(found);
+                for(const auto& effect : params.mEffects)
+                    onMagicEffectRemoved(ptr, params, effect);
             }
         }
+        mSpells.emplace_back(spell);
     }
 
-    void ActiveSpells::visitEffectSources(EffectSourceVisitor &visitor) const
+    ActiveSpells::ActiveSpells() : mIterating(false)
+    {}
+
+    ActiveSpells::TIterator ActiveSpells::begin() const
     {
-        for (TContainer::const_iterator it = begin(); it != end(); ++it)
-        {
-            for (std::vector<ActiveEffect>::const_iterator effectIt = it->second.mEffects.begin();
-                 effectIt != it->second.mEffects.end(); ++effectIt)
-            {
-                std::string name = it->second.mDisplayName;
+        return mSpells.begin();
+    }
 
-                float magnitude = effectIt->mMagnitude;
-                if (magnitude)
-                    visitor.visit(MWMechanics::EffectKey(effectIt->mEffectId, effectIt->mArg), effectIt->mEffectIndex, name, it->first, it->second.mCasterActorId, magnitude, effectIt->mTimeLeft, effectIt->mDuration);
-            }
-        }
+    ActiveSpells::TIterator ActiveSpells::end() const
+    {
+        return mSpells.end();
     }
 
-    void ActiveSpells::purgeAll(float chance, bool spellOnly)
+    bool ActiveSpells::isSpellActive(const std::string& id) const
     {
-        for (TContainer::iterator it = mSpells.begin(); it != mSpells.end(); )
+        return std::find_if(mSpells.begin(), mSpells.end(), [&] (const auto& spell)
         {
-            const std::string spellId = it->first;
+            return Misc::StringUtils::ciEqual(spell.mId, id);
+        }) != mSpells.end();
+    }
 
-            // if spellOnly is true, dispell only spells. Leave potions, enchanted items etc.
-            if (spellOnly)
-            {
-                const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(spellId);
-                if (!spell || spell->mData.mType != ESM::Spell::ST_Spell)
-                {
-                    ++it;
-                    continue;
-                }
-            }
+    void ActiveSpells::addSpell(const ActiveSpellParams& params)
+    {
+        mQueue.emplace_back(params);
+    }
 
-            if (Misc::Rng::roll0to99() < chance)
-                mSpells.erase(it++);
-            else
-                ++it;
-        }
-        mSpellsChanged = true;
+    void ActiveSpells::addSpell(const ESM::Spell* spell, const MWWorld::Ptr& actor)
+    {
+        mQueue.emplace_back(ActiveSpellParams{spell, actor, true});
     }
 
-    void ActiveSpells::purgeEffect(short effectId)
+    void ActiveSpells::purge(ParamsPredicate predicate, const MWWorld::Ptr& ptr)
     {
-        for (TContainer::iterator it = mSpells.begin(); it != mSpells.end(); ++it)
+        assert(&ptr.getClass().getCreatureStats(ptr).getActiveSpells() == this);
+        mPurges.emplace(predicate);
+        if(!mIterating)
         {
-            for (std::vector<ActiveEffect>::iterator effectIt = it->second.mEffects.begin();
-                 effectIt != it->second.mEffects.end();)
-            {
-                if (effectIt->mEffectId == effectId)
-                    effectIt = it->second.mEffects.erase(effectIt);
-                else
-                    ++effectIt;
-            }
+            IterationGuard guard{*this};
+            applyPurges(ptr);
         }
-        mSpellsChanged = true;
     }
 
-    void ActiveSpells::purgeEffect(short effectId, const std::string& sourceId, int effectIndex)
+    void ActiveSpells::purge(EffectPredicate predicate, const MWWorld::Ptr& ptr)
     {
-        for (TContainer::iterator it = mSpells.begin(); it != mSpells.end(); ++it)
+        assert(&ptr.getClass().getCreatureStats(ptr).getActiveSpells() == this);
+        mPurges.emplace(predicate);
+        if(!mIterating)
         {
-            for (std::vector<ActiveEffect>::iterator effectIt = it->second.mEffects.begin();
-                 effectIt != it->second.mEffects.end();)
-            {
-                if (effectIt->mEffectId == effectId && it->first == sourceId && (effectIndex < 0 || effectIndex == effectIt->mEffectIndex))
-                    effectIt = it->second.mEffects.erase(effectIt);
-                else
-                    ++effectIt;
-            }
+            IterationGuard guard{*this};
+            applyPurges(ptr);
         }
-        mSpellsChanged = true;
     }
 
-    void ActiveSpells::purge(int casterActorId)
+    bool ActiveSpells::applyPurges(const MWWorld::Ptr& ptr, std::list<ActiveSpellParams>::iterator* currentSpell, std::vector<ActiveEffect>::iterator* currentEffect)
     {
-        for (TContainer::iterator it = mSpells.begin(); it != mSpells.end(); ++it)
+        bool removedCurrentSpell = false;
+        while(!mPurges.empty())
         {
-            for (std::vector<ActiveEffect>::iterator effectIt = it->second.mEffects.begin();
-                 effectIt != it->second.mEffects.end();)
+            auto predicate = mPurges.front();
+            mPurges.pop();
+            for(auto spellIt = mSpells.begin(); spellIt != mSpells.end();)
             {
-                if (it->second.mCasterActorId == casterActorId)
-                    effectIt = it->second.mEffects.erase(effectIt);
-                else
-                    ++effectIt;
+                bool isCurrentSpell = currentSpell && *currentSpell == spellIt;
+                std::visit([&] (auto&& variant)
+                {
+                    using T = std::decay_t<decltype(variant)>;
+                    if constexpr (std::is_same_v<T, ParamsPredicate>)
+                    {
+                        if(variant(*spellIt))
+                        {
+                            auto params = *spellIt;
+                            spellIt = mSpells.erase(spellIt);
+                            if(isCurrentSpell)
+                            {
+                                *currentSpell = spellIt;
+                                removedCurrentSpell = true;
+                            }
+                            for(const auto& effect : params.mEffects)
+                                onMagicEffectRemoved(ptr, params, effect);
+                        }
+                        else
+                            ++spellIt;
+                    }
+                    else
+                    {
+                        static_assert(std::is_same_v<T, EffectPredicate>, "Non-exhaustive visitor");
+                        for(auto effectIt = spellIt->mEffects.begin(); effectIt != spellIt->mEffects.end();)
+                        {
+                            if(variant(*spellIt, *effectIt))
+                            {
+                                auto effect = *effectIt;
+                                if(isCurrentSpell && currentEffect)
+                                {
+                                    auto distance = std::distance(spellIt->mEffects.begin(), *currentEffect);
+                                    if(effectIt <= *currentEffect)
+                                        distance--;
+                                    effectIt = spellIt->mEffects.erase(effectIt);
+                                    *currentEffect = spellIt->mEffects.begin() + distance;
+                                }
+                                else
+                                    effectIt = spellIt->mEffects.erase(effectIt);
+                                onMagicEffectRemoved(ptr, *spellIt, effect);
+                            }
+                            else
+                                ++effectIt;
+                        }
+                        ++spellIt;
+                    }
+                }, predicate);
             }
         }
-        mSpellsChanged = true;
+        return removedCurrentSpell;
     }
 
-    void ActiveSpells::purgeCorprusDisease()
+    void ActiveSpells::removeEffects(const MWWorld::Ptr& ptr, const std::string &id)
     {
-        for (TContainer::iterator iter = mSpells.begin(); iter!=mSpells.end();)
+        purge([=] (const ActiveSpellParams& params)
         {
-            bool hasCorprusEffect = false;
-            for (std::vector<ActiveEffect>::iterator effectIt = iter->second.mEffects.begin();
-                 effectIt != iter->second.mEffects.end();++effectIt)
-            {
-                if (effectIt->mEffectId == ESM::MagicEffect::Corprus)
-                {
-                    hasCorprusEffect = true;
-                    break;
-                }
-            }
-
-            if (hasCorprusEffect)
-            {
-                mSpells.erase(iter++);
-                mSpellsChanged = true;
-            }
-            else
-                ++iter;
-        }
+            return params.mId == id;
+        }, ptr);
     }
 
-    void ActiveSpells::clear()
+    void ActiveSpells::purgeEffect(const MWWorld::Ptr& ptr, short effectId)
     {
-        mSpells.clear();
-        mSpellsChanged = true;
+        purge([=] (const ActiveSpellParams&, const ESM::ActiveEffect& effect)
+        {
+            return effect.mEffectId == effectId;
+        }, ptr);
     }
 
-    void ActiveSpells::writeState(ESM::ActiveSpells &state) const
+    void ActiveSpells::purge(const MWWorld::Ptr& ptr, int casterActorId)
     {
-        for (TContainer::const_iterator it = mSpells.begin(); it != mSpells.end(); ++it)
+        purge([=] (const ActiveSpellParams& params)
         {
-            // Stupid copying of almost identical structures. ESM::TimeStamp <-> MWWorld::TimeStamp
-            ESM::ActiveSpells::ActiveSpellParams params;
-            params.mEffects = it->second.mEffects;
-            params.mCasterActorId = it->second.mCasterActorId;
-            params.mDisplayName = it->second.mDisplayName;
+            return params.mCasterActorId == casterActorId;
+        }, ptr);
+    }
 
-            state.mSpells.insert (std::make_pair(it->first, params));
-        }
+    void ActiveSpells::clear(const MWWorld::Ptr& ptr)
+    {
+        mQueue.clear();
+        purge([] (const ActiveSpellParams& params) { return true; }, ptr);
     }
 
-    void ActiveSpells::readState(const ESM::ActiveSpells &state)
+    void ActiveSpells::skipWorsenings(double hours)
     {
-        for (ESM::ActiveSpells::TContainer::const_iterator it = state.mSpells.begin(); it != state.mSpells.end(); ++it)
+        for(auto& spell : mSpells)
         {
-            // Stupid copying of almost identical structures. ESM::TimeStamp <-> MWWorld::TimeStamp
-            ActiveSpellParams params;
-            params.mEffects = it->second.mEffects;
-            params.mCasterActorId = it->second.mCasterActorId;
-            params.mDisplayName = it->second.mDisplayName;
-
-            mSpells.insert (std::make_pair(it->first, params));
-            mSpellsChanged = true;
+            if(spell.mWorsenings >= 0)
+                spell.mNextWorsening += hours;
         }
     }
+
+    void ActiveSpells::writeState(ESM::ActiveSpells &state) const
+    {
+        for(const auto& spell : mSpells)
+            state.mSpells.emplace_back(spell.toEsm());
+        for(const auto& spell : mQueue)
+            state.mQueue.emplace_back(spell.toEsm());
+    }
+
+    void ActiveSpells::readState(const ESM::ActiveSpells &state)
+    {
+        for(const ESM::ActiveSpells::ActiveSpellParams& spell : state.mSpells)
+            mSpells.emplace_back(ActiveSpellParams{spell});
+        for(const ESM::ActiveSpells::ActiveSpellParams& spell : state.mQueue)
+            mQueue.emplace_back(ActiveSpellParams{spell});
+    }
 }
diff --git a/apps/openmw/mwmechanics/activespells.hpp b/apps/openmw/mwmechanics/activespells.hpp
index 8bc29aa444..0538d7a8b7 100644
--- a/apps/openmw/mwmechanics/activespells.hpp
+++ b/apps/openmw/mwmechanics/activespells.hpp
@@ -1,40 +1,83 @@
 #ifndef GAME_MWMECHANICS_ACTIVESPELLS_H
 #define GAME_MWMECHANICS_ACTIVESPELLS_H
 
-#include <map>
-#include <vector>
+#include <functional>
+#include <list>
+#include <queue>
 #include <string>
+#include <variant>
+#include <vector>
 
 #include <components/esm/activespells.hpp>
 
 #include "../mwworld/timestamp.hpp"
+#include "../mwworld/ptr.hpp"
 
 #include "magiceffects.hpp"
+#include "spellcasting.hpp"
+
+namespace ESM
+{
+    struct Enchantment;
+    struct Spell;
+}
 
 namespace MWMechanics
 {
     /// \brief Lasting spell effects
     ///
-    /// \note The name of this class is slightly misleading, since it also handels lasting potion
+    /// \note The name of this class is slightly misleading, since it also handles lasting potion
     /// effects.
     class ActiveSpells
     {
         public:
 
-            typedef ESM::ActiveEffect ActiveEffect;
-
-            struct ActiveSpellParams
+            using ActiveEffect = ESM::ActiveEffect;
+            class ActiveSpellParams
             {
-                std::vector<ActiveEffect> mEffects;
-                MWWorld::TimeStamp mTimeStamp;
-                std::string mDisplayName;
+                    std::string mId;
+                    std::vector<ActiveEffect> mEffects;
+                    std::string mDisplayName;
+                    int mCasterActorId;
+                    int mSlot;
+                    ESM::ActiveSpells::EffectType mType;
+                    int mWorsenings;
+                    MWWorld::TimeStamp mNextWorsening;
+
+                    ActiveSpellParams(const ESM::ActiveSpells::ActiveSpellParams& params);
+
+                    ActiveSpellParams(const ESM::Spell* spell, const MWWorld::Ptr& actor, bool ignoreResistances = false);
+
+                    ActiveSpellParams(const MWWorld::ConstPtr& item, const ESM::Enchantment* enchantment, int slotIndex, const MWWorld::Ptr& actor);
+
+                    ESM::ActiveSpells::ActiveSpellParams toEsm() const;
+
+                    friend class ActiveSpells;
+                public:
+                    ActiveSpellParams(const CastSpell& cast, const MWWorld::Ptr& caster);
+
+                    const std::string& getId() const { return mId; }
+
+                    const std::vector<ActiveEffect>& getEffects() const { return mEffects; }
+                    std::vector<ActiveEffect>& getEffects() { return mEffects; }
 
-                // The caster that inflicted this spell on us
-                int mCasterActorId;
+                    ESM::ActiveSpells::EffectType getType() const { return mType; }
+
+                    int getCasterActorId() const { return mCasterActorId; }
+
+                    int getWorsenings() const { return mWorsenings; }
+
+                    const std::string& getDisplayName() const { return mDisplayName; }
+
+                    // Increments worsenings count and sets the next timestamp
+                    void worsen();
+
+                    bool shouldWorsen() const;
+
+                    void resetWorsenings();
             };
 
-            typedef std::multimap<std::string, ActiveSpellParams > TContainer;
-            typedef TContainer::const_iterator TIterator;
+            typedef std::list<ActiveSpellParams>::const_iterator TIterator;
 
             void readState (const ESM::ActiveSpells& state);
             void writeState (ESM::ActiveSpells& state) const;
@@ -43,24 +86,29 @@ namespace MWMechanics
 
             TIterator end() const;
 
-            void update(float duration) const;
+            void update(const MWWorld::Ptr& ptr, float duration);
 
         private:
+            using ParamsPredicate = std::function<bool(const ActiveSpellParams&)>;
+            using EffectPredicate = std::function<bool(const ActiveSpellParams&, const ESM::ActiveEffect&)>;
+            using Predicate = std::variant<ParamsPredicate, EffectPredicate>;
 
-            mutable TContainer mSpells;
-            mutable MagicEffects mEffects;
-            mutable bool mSpellsChanged;
+            struct IterationGuard
+            {
+                ActiveSpells& mActiveSpells;
 
-            void rebuildEffects() const;
+                IterationGuard(ActiveSpells& spells);
+                ~IterationGuard();
+            };
 
-            /// Add any effects that are in "from" and not in "addTo" to "addTo"
-            void mergeEffects(std::vector<ActiveEffect>& addTo, const std::vector<ActiveEffect>& from);
+            std::list<ActiveSpellParams> mSpells;
+            std::vector<ActiveSpellParams> mQueue;
+            std::queue<Predicate> mPurges;
+            bool mIterating;
 
-            double timeToExpire (const TIterator& iterator) const;
-            ///< Returns time (in in-game hours) until the spell pointed to by \a iterator
-            /// expires.
+            void addToSpells(const MWWorld::Ptr& ptr, const ActiveSpellParams& spell);
 
-            const TContainer& getActiveSpells() const;
+            bool applyPurges(const MWWorld::Ptr& ptr, std::list<ActiveSpellParams>::iterator* currentSpell = nullptr, std::vector<ActiveEffect>::iterator* currentEffect = nullptr);
 
         public:
 
@@ -70,40 +118,31 @@ namespace MWMechanics
             ///
             /// \brief addSpell
             /// \param id ID for stacking purposes.
-            /// \param stack If false, the spell is not added if one with the same ID exists already.
-            /// \param effects
-            /// \param displayName Name for display in magic menu.
             ///
-            void addSpell (const std::string& id, bool stack, const std::vector<ActiveEffect>& effects,
-                           const std::string& displayName, int casterActorId);
+            void addSpell (const ActiveSpellParams& params);
+
+            /// Bypasses resistances
+            void addSpell(const ESM::Spell* spell, const MWWorld::Ptr& actor);
 
             /// Removes the active effects from this spell/potion/.. with \a id
-            void removeEffects (const std::string& id);
+            void removeEffects (const MWWorld::Ptr& ptr, const std::string& id);
 
             /// Remove all active effects with this effect id
-            void purgeEffect (short effectId);
-
-            /// Remove all active effects with this effect id and source id
-            void purgeEffect (short effectId, const std::string& sourceId, int effectIndex=-1);
+            void purgeEffect (const MWWorld::Ptr& ptr, short effectId);
 
-            /// Remove all active effects, if roll succeeds (for each effect)
-            void purgeAll(float chance, bool spellOnly = false);
+            void purge(EffectPredicate predicate, const MWWorld::Ptr& ptr);
+            void purge(ParamsPredicate predicate, const MWWorld::Ptr& ptr);
 
-            /// Remove all effects with CASTER_LINKED flag that were cast by \a casterActorId
-            void purge (int casterActorId);
+            /// Remove all effects that were cast by \a casterActorId
+            void purge (const MWWorld::Ptr& ptr, int casterActorId);
 
             /// Remove all spells
-            void clear();
+            void clear(const MWWorld::Ptr& ptr);
 
             bool isSpellActive (const std::string& id) const;
             ///< case insensitive
 
-            void purgeCorprusDisease();
-
-            const MagicEffects& getMagicEffects() const;
-
-            void visitEffectSources (MWMechanics::EffectSourceVisitor& visitor) const;
-
+            void skipWorsenings(double hours);
     };
 }
 
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 542f185854..b1aa246385 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -44,7 +44,6 @@
 #include "actor.hpp"
 #include "summoning.hpp"
 #include "actorutil.hpp"
-#include "tickableeffects.hpp"
 
 namespace
 {
@@ -55,67 +54,26 @@ bool isConscious(const MWWorld::Ptr& ptr)
     return !stats.isDead() && !stats.getKnockedDown();
 }
 
-int getBoundItemSlot (const std::string& itemId)
+bool isCommanded(const MWWorld::Ptr& actor)
 {
-    static std::map<std::string, int> boundItemsMap;
-    if (boundItemsMap.empty())
+    const auto& stats = actor.getClass().getCreatureStats(actor);
+    for(const auto& params : stats.getActiveSpells())
     {
-        const auto& store = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
-
-        std::string boundId = store.find("sMagicBoundBootsID")->mValue.getString();
-        boundItemsMap[boundId] = MWWorld::InventoryStore::Slot_Boots;
-
-        boundId = store.find("sMagicBoundCuirassID")->mValue.getString();
-        boundItemsMap[boundId] = MWWorld::InventoryStore::Slot_Cuirass;
-
-        boundId = store.find("sMagicBoundLeftGauntletID")->mValue.getString();
-        boundItemsMap[boundId] = MWWorld::InventoryStore::Slot_LeftGauntlet;
-
-        boundId = store.find("sMagicBoundRightGauntletID")->mValue.getString();
-        boundItemsMap[boundId] = MWWorld::InventoryStore::Slot_RightGauntlet;
-
-        boundId = store.find("sMagicBoundHelmID")->mValue.getString();
-        boundItemsMap[boundId] = MWWorld::InventoryStore::Slot_Helmet;
-
-        boundId = store.find("sMagicBoundShieldID")->mValue.getString();
-        boundItemsMap[boundId] = MWWorld::InventoryStore::Slot_CarriedLeft;
+        for(const auto& effect : params.getEffects())
+        {
+            if(((effect.mEffectId == ESM::MagicEffect::CommandHumanoid && actor.getClass().isNpc())
+                || (effect.mEffectId == ESM::MagicEffect::CommandCreature && !actor.getClass().isNpc()))
+                && effect.mMagnitude >= stats.getLevel())
+                return true;
+        }
     }
-
-    int slot = MWWorld::InventoryStore::Slot_CarriedRight;
-    std::map<std::string, int>::iterator it = boundItemsMap.find(itemId);
-    if (it != boundItemsMap.end())
-        slot = it->second;
-
-    return slot;
+    return false;
 }
 
-class CheckActorCommanded : public MWMechanics::EffectSourceVisitor
-{
-    MWWorld::Ptr mActor;
-public:
-    bool mCommanded;
-
-    CheckActorCommanded(const MWWorld::Ptr& actor)
-        : mActor(actor)
-        , mCommanded(false){}
-
-    void visit (MWMechanics::EffectKey key, int effectIndex,
-                        const std::string& sourceName, const std::string& sourceId, int casterActorId,
-                        float magnitude, float remainingTime = -1, float totalTime = -1) override
-    {
-        if (((key.mId == ESM::MagicEffect::CommandHumanoid && mActor.getClass().isNpc())
-            || (key.mId == ESM::MagicEffect::CommandCreature && mActor.getTypeName() == typeid(ESM::Creature).name()))
-            && magnitude >= mActor.getClass().getCreatureStats(mActor).getLevel())
-                mCommanded = true;
-    }
-};
-
 // Check for command effects having ended and remove package if necessary
 void adjustCommandedActor (const MWWorld::Ptr& actor)
 {
-    CheckActorCommanded check(actor);
     MWMechanics::CreatureStats& stats = actor.getClass().getCreatureStats(actor);
-    stats.getActiveSpells().visitEffectSources(check);
 
     bool hasCommandPackage = false;
 
@@ -130,7 +88,7 @@ void adjustCommandedActor (const MWWorld::Ptr& actor)
         }
     }
 
-    if (!check.mCommanded && hasCommandPackage)
+    if (!isCommanded(actor) && hasCommandPackage)
         stats.getAiSequence().erase(it);
 }
 
@@ -169,129 +127,43 @@ void forEachFollowingPackage(MWMechanics::Actors::PtrActorMap& actors, const MWW
     }
 }
 
-}
-
-namespace MWMechanics
+float getStuntedMagickaDuration(const MWWorld::Ptr& actor)
 {
-    static const int GREETING_SHOULD_START = 4; // how many updates should pass before NPC can greet player
-    static const int GREETING_SHOULD_END = 20;  // how many updates should pass before NPC stops turning to player
-    static const int GREETING_COOLDOWN = 40;    // how many updates should pass before NPC can continue movement
-    static const float DECELERATE_DISTANCE = 512.f;
-
-    namespace
+    float remainingTime = 0.f;
+    for(const auto& params : actor.getClass().getCreatureStats(actor).getActiveSpells())
     {
-        float getTimeToDestination(const AiPackage& package, const osg::Vec3f& position, float speed, float duration, const osg::Vec3f& halfExtents)
+        for(const auto& effect : params.getEffects())
         {
-            const auto distanceToNextPathPoint = (package.getNextPathPoint(package.getDestination()) - position).length();
-            return (distanceToNextPathPoint - package.getNextPathPointTolerance(speed, duration, halfExtents)) / speed;
-        }
-    }
-
-    class GetStuntedMagickaDuration : public MWMechanics::EffectSourceVisitor
-    {
-    public:
-        float mRemainingTime;
-
-        GetStuntedMagickaDuration(const MWWorld::Ptr& actor)
-            : mRemainingTime(0.f){}
-
-        void visit (MWMechanics::EffectKey key, int effectIndex,
-                            const std::string& sourceName, const std::string& sourceId, int casterActorId,
-                            float magnitude, float remainingTime = -1, float totalTime = -1) override
-        {
-            if (mRemainingTime == -1) return;
-
-            if (key.mId == ESM::MagicEffect::StuntedMagicka)
+            if(effect.mEffectId == ESM::MagicEffect::StuntedMagicka)
             {
-                if (totalTime == -1)
-                {
-                    mRemainingTime = -1;
-                    return;
-                }
-
-                if (remainingTime > mRemainingTime)
-                    mRemainingTime = remainingTime;
+                if(effect.mDuration == -1.f)
+                    return -1.f;
+                remainingTime = std::max(remainingTime, effect.mTimeLeft);
             }
         }
-    };
-
-    class GetCurrentMagnitudes : public MWMechanics::EffectSourceVisitor
-    {
-        std::string mSpellId;
-
-    public:
-        GetCurrentMagnitudes(const std::string& spellId)
-            : mSpellId(spellId)
-        {
-        }
-
-        void visit (MWMechanics::EffectKey key, int effectIndex,
-                            const std::string& sourceName, const std::string& sourceId, int casterActorId,
-                            float magnitude, float remainingTime = -1, float totalTime = -1) override
-        {
-            if (magnitude <= 0)
-                return;
-
-            if (sourceId != mSpellId)
-                return;
-
-            mMagnitudes.emplace_back(key, magnitude);
-        }
-
-        std::vector<std::pair<MWMechanics::EffectKey, float>> mMagnitudes;
-    };
-
-    class GetCorprusSpells : public MWMechanics::EffectSourceVisitor
-    {
-
-    public:
-        void visit (MWMechanics::EffectKey key, int effectIndex,
-                            const std::string& sourceName, const std::string& sourceId, int casterActorId,
-                            float magnitude, float remainingTime = -1, float totalTime = -1) override
-        {
-            if (key.mId != ESM::MagicEffect::Corprus)
-                return;
-
-            mSpells.push_back(sourceId);
-        }
-
-        std::vector<std::string> mSpells;
-    };
-
-    class SoulTrap : public MWMechanics::EffectSourceVisitor
-    {
-        MWWorld::Ptr mCreature;
-        MWWorld::Ptr mActor;
-        bool mTrapped;
-    public:
-        SoulTrap(const MWWorld::Ptr& trappedCreature)
-            : mCreature(trappedCreature)
-            , mTrapped(false)
-        {
-        }
-
-        void visit (MWMechanics::EffectKey key, int effectIndex,
-                            const std::string& sourceName, const std::string& sourceId, int casterActorId,
-                            float magnitude, float remainingTime = -1, float totalTime = -1) override
-        {
-            if (mTrapped)
-                return;
-            if (key.mId != ESM::MagicEffect::Soultrap)
-                return;
-            if (magnitude <= 0)
-                return;
-
-            MWBase::World* world = MWBase::Environment::get().getWorld();
+    }
+    return remainingTime;
+}
 
-            MWWorld::Ptr caster = world->searchPtrViaActorId(casterActorId);
+void soulTrap(const MWWorld::Ptr& creature)
+{
+    const auto& stats = creature.getClass().getCreatureStats(creature);
+    if(!stats.getMagicEffects().get(ESM::MagicEffect::Soultrap).getMagnitude())
+        return;
+    int creatureSoulValue = creature.get<ESM::Creature>()->mBase->mData.mSoul;
+    if (creatureSoulValue == 0)
+        return;
+    MWBase::World* world = MWBase::Environment::get().getWorld();
+    static const float fSoulgemMult = world->getStore().get<ESM::GameSetting>().find("fSoulgemMult")->mValue.getFloat();
+    for(const auto& params : stats.getActiveSpells())
+    {
+        for(const auto& effect : params.getEffects())
+        {
+            if(effect.mEffectId != ESM::MagicEffect::Soultrap || effect.mMagnitude <= 0.f)
+                continue;
+            MWWorld::Ptr caster = world->searchPtrViaActorId(params.getCasterActorId());
             if (caster.isEmpty() || !caster.getClass().isActor())
-                return;
-
-            static const float fSoulgemMult = world->getStore().get<ESM::GameSetting>().find("fSoulgemMult")->mValue.getFloat();
-
-            int creatureSoulValue = mCreature.get<ESM::Creature>()->mBase->mData.mSoul;
-            if (creatureSoulValue == 0)
-                return;
+                continue;
 
             // Use the smallest soulgem that is large enough to hold the soul
             MWWorld::ContainerStore& container = caster.getClass().getContainerStore(caster);
@@ -316,126 +188,50 @@ namespace MWMechanics
             }
 
             if (gem == container.end())
-                return;
+                continue;
 
             // Set the soul on just one of the gems, not the whole stack
             gem->getContainerStore()->unstack(*gem, caster);
-            gem->getCellRef().setSoul(mCreature.getCellRef().getRefId());
+            gem->getCellRef().setSoul(creature.getCellRef().getRefId());
 
             // Restack the gem with other gems with the same soul
             gem->getContainerStore()->restack(*gem);
 
-            mTrapped = true;
-
-            if (caster == getPlayer())
+            if (caster == MWMechanics::getPlayer())
                 MWBase::Environment::get().getWindowManager()->messageBox("#{sSoultrapSuccess}");
 
-            const ESM::Static* fx = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>()
+            const ESM::Static* fx = world->getStore().get<ESM::Static>()
                     .search("VFX_Soul_Trap");
             if (fx)
-                MWBase::Environment::get().getWorld()->spawnEffect("meshes\\" + fx->mModel,
-                    "", mCreature.getRefData().getPosition().asVec3());
+                world->spawnEffect("meshes\\" + fx->mModel, "", creature.getRefData().getPosition().asVec3());
 
-            MWBase::Environment::get().getSoundManager()->playSound3D(
-                mCreature.getRefData().getPosition().asVec3(), "conjuration hit", 1.f, 1.f
-            );
+            MWBase::Environment::get().getSoundManager()->playSound3D(creature.getRefData().getPosition().asVec3(), "conjuration hit", 1.f, 1.f);
+            return; //remove to get vanilla behaviour
         }
-    };
-
-    void Actors::addBoundItem (const std::string& itemId, const MWWorld::Ptr& actor)
-    {
-        MWWorld::InventoryStore& store = actor.getClass().getInventoryStore(actor);
-        int slot = getBoundItemSlot(itemId);
-
-        if (actor.getClass().getContainerStore(actor).count(itemId) != 0)
-            return;
-
-        MWWorld::ContainerStoreIterator prevItem = store.getSlot(slot);
-
-        MWWorld::Ptr boundPtr = *store.MWWorld::ContainerStore::add(itemId, 1, actor);
-        MWWorld::ActionEquip action(boundPtr);
-        action.execute(actor);
-
-        if (actor != MWMechanics::getPlayer())
-            return;
-
-        MWWorld::Ptr newItem;
-        auto it = store.getSlot(slot);
-        // Equip can fail because beast races cannot equip boots/helmets
-        if(it != store.end())
-            newItem = *it;
-
-        if (newItem.isEmpty() || boundPtr != newItem)
-            return;
-
-        MWWorld::Player& player = MWBase::Environment::get().getWorld()->getPlayer();
-
-        // change draw state only if the item is in player's right hand
-        if (slot == MWWorld::InventoryStore::Slot_CarriedRight)
-            player.setDrawState(MWMechanics::DrawState_Weapon);
-
-        if (prevItem != store.end())
-            player.setPreviousItem(itemId, prevItem->getCellRef().getRefId());
     }
+}
+}
 
-    void Actors::removeBoundItem (const std::string& itemId, const MWWorld::Ptr& actor)
-    {
-        MWWorld::InventoryStore& store = actor.getClass().getInventoryStore(actor);
-        int slot = getBoundItemSlot(itemId);
-
-        MWWorld::ContainerStoreIterator currentItem = store.getSlot(slot);
-
-        bool wasEquipped = currentItem != store.end() && Misc::StringUtils::ciEqual(currentItem->getCellRef().getRefId(), itemId);
-
-        if (actor != MWMechanics::getPlayer())
-        {
-            store.remove(itemId, 1, actor);
-
-            // Equip a replacement
-            if (!wasEquipped)
-                return;
-
-            std::string type = currentItem->getTypeName();
-            if (type != typeid(ESM::Weapon).name() && type != typeid(ESM::Armor).name() && type != typeid(ESM::Clothing).name())
-                return;
-
-            if (actor.getClass().getCreatureStats(actor).isDead())
-                return;
-
-            if (!actor.getClass().hasInventoryStore(actor))
-                return;
-
-            if (actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
-                return;
-
-            actor.getClass().getInventoryStore(actor).autoEquip(actor);
-
-            return;
-        }
-
-        MWWorld::Player& player = MWBase::Environment::get().getWorld()->getPlayer();
-        std::string prevItemId = player.getPreviousItem(itemId);
-        player.erasePreviousItem(itemId);
+namespace MWMechanics
+{
+    static const int GREETING_SHOULD_START = 4; // how many updates should pass before NPC can greet player
+    static const int GREETING_SHOULD_END = 20;  // how many updates should pass before NPC stops turning to player
+    static const int GREETING_COOLDOWN = 40;    // how many updates should pass before NPC can continue movement
+    static const float DECELERATE_DISTANCE = 512.f;
 
-        if (!prevItemId.empty())
+    namespace
+    {
+        float getTimeToDestination(const AiPackage& package, const osg::Vec3f& position, float speed, float duration, const osg::Vec3f& halfExtents)
         {
-            // Find previous item (or its replacement) by id.
-            // we should equip previous item only if expired bound item was equipped.
-            MWWorld::Ptr item = store.findReplacement(prevItemId);
-            if (!item.isEmpty() && wasEquipped)
-            {
-                MWWorld::ActionEquip action(item);
-                action.execute(actor);
-            }
+            const auto distanceToNextPathPoint = (package.getNextPathPoint(package.getDestination()) - position).length();
+            return (distanceToNextPathPoint - package.getNextPathPointTolerance(speed, duration, halfExtents)) / speed;
         }
-
-        store.remove(itemId, 1, actor);
     }
 
     void Actors::updateActor (const MWWorld::Ptr& ptr, float duration)
     {
         // magic effects
-        adjustMagicEffects (ptr);
+        adjustMagicEffects (ptr, duration);
         if (ptr.getClass().getCreatureStats(ptr).needToRecalcDynamicStats())
             calculateDynamicStats (ptr);
 
@@ -793,23 +589,61 @@ namespace MWMechanics
         }
     }
 
-    void Actors::adjustMagicEffects (const MWWorld::Ptr& creature)
+    void Actors::adjustMagicEffects (const MWWorld::Ptr& creature, float duration)
     {
-        CreatureStats& creatureStats =  creature.getClass().getCreatureStats (creature);
-        if (creatureStats.isDeathAnimationFinished())
-            return;
+        CreatureStats& creatureStats = creature.getClass().getCreatureStats (creature);
+        bool wasDead = creatureStats.isDead();
 
-        MagicEffects now = creatureStats.getSpells().getMagicEffects();
+        creatureStats.getActiveSpells().update(creature, duration);
 
-        if (creature.getClass().hasInventoryStore(creature))
+        if (!wasDead && creatureStats.isDead())
         {
-            MWWorld::InventoryStore& store = creature.getClass().getInventoryStore (creature);
-            now += store.getMagicEffects();
+            // The actor was killed by a magic effect. Figure out if the player was responsible for it.
+            const ActiveSpells& spells = creatureStats.getActiveSpells();
+            MWWorld::Ptr player = getPlayer();
+            std::set<MWWorld::Ptr> playerFollowers;
+            getActorsSidingWith(player, playerFollowers);
+
+            for (ActiveSpells::TIterator it = spells.begin(); it != spells.end(); ++it)
+            {
+                bool actorKilled = false;
+
+                const ActiveSpells::ActiveSpellParams& spell = *it;
+                MWWorld::Ptr caster = MWBase::Environment::get().getWorld()->searchPtrViaActorId(spell.getCasterActorId());
+                for (const auto& effect : spell.getEffects())
+                {
+                    static const std::array<int, 7> damageEffects{
+                        ESM::MagicEffect::FireDamage, ESM::MagicEffect::ShockDamage, ESM::MagicEffect::FrostDamage, ESM::MagicEffect::Poison,
+                        ESM::MagicEffect::SunDamage, ESM::MagicEffect::DamageHealth, ESM::MagicEffect::AbsorbHealth
+                    };
+
+                    bool isDamageEffect = std::find(damageEffects.begin(), damageEffects.end(), effect.mEffectId) != damageEffects.end();
+
+                    if (isDamageEffect)
+                    {
+                        if (caster.getClass().isNpc() && caster.getClass().getNpcStats(caster).isWerewolf())
+                            caster.getClass().getNpcStats(caster).addWerewolfKill();
+                        if (caster == player || playerFollowers.find(caster) != playerFollowers.end())
+                        {
+                            MWBase::Environment::get().getMechanicsManager()->actorKilled(creature, player);
+                            actorKilled = true;
+                            break;
+                        }
+                    }
+                }
+
+                if (actorKilled)
+                    break;
+            }
         }
 
-        now += creatureStats.getActiveSpells().getMagicEffects();
+        // updateSummons assumes the actor belongs to a cell.
+        // This assumption isn't always valid for the player character.
+        if (!creature.isInCell())
+            return;
 
-        creatureStats.modifyMagicEffects(now);
+        if (!creatureStats.getSummonedCreatureMap().empty() || !creatureStats.getSummonedCreatureGraveyard().empty())
+            updateSummons(creature, mTimerDisposeSummonsCorpses == 0.f);
     }
 
     void Actors::calculateDynamicStats (const MWWorld::Ptr& ptr)
@@ -857,22 +691,18 @@ namespace MWMechanics
             if (stunted)
             {
                 // Stunted Magicka effect should be taken into account.
-                GetStuntedMagickaDuration visitor(ptr);
-                stats.getActiveSpells().visitEffectSources(visitor);
-                stats.getSpells().visitEffectSources(visitor);
-                if (ptr.getClass().hasInventoryStore(ptr))
-                    ptr.getClass().getInventoryStore(ptr).visitEffectSources(visitor);
+                float remainingTime = getStuntedMagickaDuration(ptr);
 
                 // Take a maximum remaining duration of Stunted Magicka effects (-1 is a constant one) in game hours.
-                if (visitor.mRemainingTime > 0)
+                if (remainingTime > 0)
                 {
                     double timeScale = MWBase::Environment::get().getWorld()->getTimeScaleFactor();
                     if(timeScale == 0.0)
                         timeScale = 1;
 
-                    restoreHours = std::max(0.0, hours - visitor.mRemainingTime * timeScale / 3600.f);
+                    restoreHours = std::max(0.0, hours - remainingTime * timeScale / 3600.f);
                 }
-                else if (visitor.mRemainingTime == -1)
+                else if (remainingTime == -1)
                     restoreHours = 0;
             }
 
@@ -933,398 +763,12 @@ namespace MWMechanics
         stats.setFatigue (fatigue);
     }
 
-    class ExpiryVisitor : public EffectSourceVisitor
-    {
-        private:
-            MWWorld::Ptr mActor;
-            float mDuration;
-
-        public:
-            ExpiryVisitor(const MWWorld::Ptr& actor, float duration)
-                : mActor(actor), mDuration(duration)
-            {
-            }
-
-            void visit (MWMechanics::EffectKey key, int /*effectIndex*/,
-                                const std::string& /*sourceName*/, const std::string& /*sourceId*/, int /*casterActorId*/,
-                                float magnitude, float remainingTime = -1, float /*totalTime*/ = -1) override
-            {
-                if (magnitude > 0 && remainingTime > 0 && remainingTime < mDuration)
-                {
-                    CreatureStats& creatureStats = mActor.getClass().getCreatureStats(mActor);
-                    if (effectTick(creatureStats, mActor, key, magnitude * remainingTime))
-                        creatureStats.getMagicEffects().add(key, -magnitude);
-                }
-            }
-    };
-
-    void Actors::applyCureEffects(const MWWorld::Ptr& actor)
-    {
-        CreatureStats &creatureStats = actor.getClass().getCreatureStats(actor);
-        const MagicEffects &effects = creatureStats.getMagicEffects();
-
-        if (effects.get(ESM::MagicEffect::CurePoison).getModifier() > 0)
-        {
-            creatureStats.getActiveSpells().purgeEffect(ESM::MagicEffect::Poison);
-            creatureStats.getSpells().purgeEffect(ESM::MagicEffect::Poison);
-            if (actor.getClass().hasInventoryStore(actor))
-                actor.getClass().getInventoryStore(actor).purgeEffect(ESM::MagicEffect::Poison);
-        }
-        if (effects.get(ESM::MagicEffect::CureParalyzation).getModifier() > 0)
-        {
-            creatureStats.getActiveSpells().purgeEffect(ESM::MagicEffect::Paralyze);
-            creatureStats.getSpells().purgeEffect(ESM::MagicEffect::Paralyze);
-            if (actor.getClass().hasInventoryStore(actor))
-                actor.getClass().getInventoryStore(actor).purgeEffect(ESM::MagicEffect::Paralyze);
-        }
-        if (effects.get(ESM::MagicEffect::CureCommonDisease).getModifier() > 0)
-        {
-            creatureStats.getSpells().purgeCommonDisease();
-        }
-        if (effects.get(ESM::MagicEffect::CureBlightDisease).getModifier() > 0)
-        {
-            creatureStats.getSpells().purgeBlightDisease();
-        }
-        if (effects.get(ESM::MagicEffect::CureCorprusDisease).getModifier() > 0)
-        {
-            creatureStats.getActiveSpells().purgeCorprusDisease();
-            creatureStats.getSpells().purgeCorprusDisease();
-            if (actor.getClass().hasInventoryStore(actor))
-                actor.getClass().getInventoryStore(actor).purgeEffect(ESM::MagicEffect::Corprus, true);
-        }
-        if (effects.get(ESM::MagicEffect::RemoveCurse).getModifier() > 0)
-        {
-            creatureStats.getSpells().purgeCurses();
-        }
-    }
-
     void Actors::calculateCreatureStatModifiers (const MWWorld::Ptr& ptr, float duration)
     {
         CreatureStats &creatureStats = ptr.getClass().getCreatureStats(ptr);
-        const MagicEffects &effects = creatureStats.getMagicEffects();
-        bool godmode = ptr == getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState();
-
-        applyCureEffects(ptr);
-
-        bool wasDead = creatureStats.isDead();
-
-        if (duration > 0)
-        {
-            // Apply correct magnitude for tickable effects that have just expired,
-            // in case duration > remaining time of effect.
-            // One case where this will happen is when the player uses the rest/wait command
-            // while there is a tickable effect active that should expire before the end of the rest/wait.
-            ExpiryVisitor visitor(ptr, duration);
-            creatureStats.getActiveSpells().visitEffectSources(visitor);
-
-            for (MagicEffects::Collection::const_iterator it = effects.begin(); it != effects.end(); ++it)
-            {
-                // tickable effects (i.e. effects having a lasting impact after expiry)
-                effectTick(creatureStats, ptr, it->first, it->second.getMagnitude() * duration);
-
-                // instant effects are already applied on spell impact in spellcasting.cpp, but may also come from permanent abilities
-                if (it->second.getMagnitude() > 0)
-                {
-                    CastSpell cast(ptr, ptr);
-                    if (cast.applyInstantEffect(ptr, ptr, it->first, it->second.getMagnitude()))
-                    {
-                        creatureStats.getSpells().purgeEffect(it->first.mId);
-                        creatureStats.getActiveSpells().purgeEffect(it->first.mId);
-                        if (ptr.getClass().hasInventoryStore(ptr))
-                            ptr.getClass().getInventoryStore(ptr).purgeEffect(it->first.mId);
-                    }
-                }
-            }
-        }
-
-        // purge levitate effect if levitation is disabled
-        // check only modifier, because base value can be setted from SetFlying console command.
-        if (MWBase::Environment::get().getWorld()->isLevitationEnabled() == false && effects.get(ESM::MagicEffect::Levitate).getModifier() > 0)
-        {
-            creatureStats.getSpells().purgeEffect(ESM::MagicEffect::Levitate);
-            creatureStats.getActiveSpells().purgeEffect(ESM::MagicEffect::Levitate);
-            if (ptr.getClass().hasInventoryStore(ptr))
-                ptr.getClass().getInventoryStore(ptr).purgeEffect(ESM::MagicEffect::Levitate);
-
-            if (ptr == getPlayer())
-            {
-                MWBase::Environment::get().getWindowManager()->messageBox ("#{sLevitateDisabled}");
-            }
-        }
-
-        // dynamic stats
-        for (int i = 0; i < 3; ++i)
-        {
-            DynamicStat<float> stat = creatureStats.getDynamic(i);
-            float fortify = effects.get(ESM::MagicEffect::FortifyHealth + i).getMagnitude();
-            float drain = 0.f;
-            if (!godmode)
-                drain = effects.get(ESM::MagicEffect::DrainHealth + i).getMagnitude();
-            stat.setCurrentModifier(fortify - drain,
-                // Magicka can be decreased below zero due to a fortify effect wearing off
-                // Fatigue can be decreased below zero meaning the actor will be knocked out
-                i == 1 || i == 2);
-
-            creatureStats.setDynamic(i, stat);
-        }
-
-        // attributes
-        for(int i = 0;i < ESM::Attribute::Length;++i)
-        {
-            AttributeValue stat = creatureStats.getAttribute(i);
-            float fortify = effects.get(EffectKey(ESM::MagicEffect::FortifyAttribute, i)).getMagnitude();
-            float drain = 0.f, absorb = 0.f;
-            if (!godmode)
-            {
-                drain = effects.get(EffectKey(ESM::MagicEffect::DrainAttribute, i)).getMagnitude();
-                absorb = effects.get(EffectKey(ESM::MagicEffect::AbsorbAttribute, i)).getMagnitude();
-            }
-            stat.setModifier(static_cast<int>(fortify - drain - absorb));
-
-            creatureStats.setAttribute(i, stat);
-        }
 
         if (creatureStats.needToRecalcDynamicStats())
             calculateDynamicStats(ptr);
-
-        if (ptr == getPlayer())
-        {
-            GetCorprusSpells getCorprusSpellsVisitor;
-            creatureStats.getSpells().visitEffectSources(getCorprusSpellsVisitor);
-            creatureStats.getActiveSpells().visitEffectSources(getCorprusSpellsVisitor);
-            ptr.getClass().getInventoryStore(ptr).visitEffectSources(getCorprusSpellsVisitor);
-            std::vector<std::string> corprusSpells = getCorprusSpellsVisitor.mSpells;
-            std::vector<std::string> corprusSpellsToRemove;
-
-            for (auto it = creatureStats.getCorprusSpells().begin(); it != creatureStats.getCorprusSpells().end(); ++it)
-            {
-                if(std::find(corprusSpells.begin(), corprusSpells.end(), it->first) == corprusSpells.end())
-                {
-                    // Corprus effect expired, remove entry and restore stats.
-                    MWBase::Environment::get().getMechanicsManager()->restoreStatsAfterCorprus(ptr, it->first);
-                    corprusSpellsToRemove.push_back(it->first);
-                    corprusSpells.erase(std::remove(corprusSpells.begin(), corprusSpells.end(), it->first), corprusSpells.end());
-                    continue;
-                }
-
-                corprusSpells.erase(std::remove(corprusSpells.begin(), corprusSpells.end(), it->first), corprusSpells.end());
-
-                if (MWBase::Environment::get().getWorld()->getTimeStamp() >= it->second.mNextWorsening)
-                {
-                    it->second.mNextWorsening += CorprusStats::sWorseningPeriod;
-                    GetCurrentMagnitudes getMagnitudesVisitor (it->first);
-                    creatureStats.getSpells().visitEffectSources(getMagnitudesVisitor);
-                    creatureStats.getActiveSpells().visitEffectSources(getMagnitudesVisitor);
-                    ptr.getClass().getInventoryStore(ptr).visitEffectSources(getMagnitudesVisitor);
-                    for (auto& effectMagnitude : getMagnitudesVisitor.mMagnitudes)
-                    {
-                        if (effectMagnitude.first.mId == ESM::MagicEffect::FortifyAttribute)
-                        {
-                            AttributeValue attr = creatureStats.getAttribute(effectMagnitude.first.mArg);
-                            attr.damage(-effectMagnitude.second);
-                            creatureStats.setAttribute(effectMagnitude.first.mArg, attr);
-                            it->second.mWorsenings[effectMagnitude.first.mArg] = 0;
-                        }
-                        else if (effectMagnitude.first.mId == ESM::MagicEffect::DrainAttribute)
-                        {
-                            AttributeValue attr = creatureStats.getAttribute(effectMagnitude.first.mArg);
-                            int currentDamage = attr.getDamage();
-                            if (currentDamage >= 0)
-                                it->second.mWorsenings[effectMagnitude.first.mArg] = std::min(it->second.mWorsenings[effectMagnitude.first.mArg], currentDamage);
-
-                            it->second.mWorsenings[effectMagnitude.first.mArg] += effectMagnitude.second;
-                            attr.damage(effectMagnitude.second);
-                            creatureStats.setAttribute(effectMagnitude.first.mArg, attr);
-                        }
-                    }
-
-                    MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicCorprusWorsens}");
-                }
-            }
-
-            for (std::string& oldCorprusSpell : corprusSpellsToRemove)
-            {
-                 creatureStats.removeCorprusSpell(oldCorprusSpell);
-            }
-
-            for (std::string& newCorprusSpell : corprusSpells)
-            {
-                CorprusStats corprus;
-                for (int i=0; i<ESM::Attribute::Length; ++i)
-                    corprus.mWorsenings[i] = 0;
-                corprus.mNextWorsening = MWBase::Environment::get().getWorld()->getTimeStamp() + CorprusStats::sWorseningPeriod;
-
-                creatureStats.addCorprusSpell(newCorprusSpell, corprus);
-            }
-        }
-
-        // AI setting modifiers
-        int creature = !ptr.getClass().isNpc();
-        Stat<int> stat = creatureStats.getAiSetting(CreatureStats::AI_Fight);
-        stat.setModifier(static_cast<int>(effects.get(ESM::MagicEffect::FrenzyHumanoid + creature).getMagnitude()
-            - effects.get(ESM::MagicEffect::CalmHumanoid+creature).getMagnitude()));
-        creatureStats.setAiSetting(CreatureStats::AI_Fight, stat);
-
-        stat = creatureStats.getAiSetting(CreatureStats::AI_Flee);
-        stat.setModifier(static_cast<int>(effects.get(ESM::MagicEffect::DemoralizeHumanoid + creature).getMagnitude()
-            - effects.get(ESM::MagicEffect::RallyHumanoid+creature).getMagnitude()));
-        creatureStats.setAiSetting(CreatureStats::AI_Flee, stat);
-        if (creature && ptr.get<ESM::Creature>()->mBase->mData.mType == ESM::Creature::Undead)
-        {
-            stat = creatureStats.getAiSetting(CreatureStats::AI_Flee);
-            stat.setModifier(static_cast<int>(effects.get(ESM::MagicEffect::TurnUndead).getMagnitude()));
-            creatureStats.setAiSetting(CreatureStats::AI_Flee, stat);
-        }
-
-        if (!wasDead && creatureStats.isDead())
-        {
-            // The actor was killed by a magic effect. Figure out if the player was responsible for it.
-            const ActiveSpells& spells = creatureStats.getActiveSpells();
-            MWWorld::Ptr player = getPlayer();
-            std::set<MWWorld::Ptr> playerFollowers;
-            getActorsSidingWith(player, playerFollowers);
-
-            for (ActiveSpells::TIterator it = spells.begin(); it != spells.end(); ++it)
-            {
-                bool actorKilled = false;
-
-                const ActiveSpells::ActiveSpellParams& spell = it->second;
-                MWWorld::Ptr caster = MWBase::Environment::get().getWorld()->searchPtrViaActorId(spell.mCasterActorId);
-                for (std::vector<ActiveSpells::ActiveEffect>::const_iterator effectIt = spell.mEffects.begin();
-                     effectIt != spell.mEffects.end(); ++effectIt)
-                {
-                    int effectId = effectIt->mEffectId;
-                    bool isDamageEffect = false;
-
-                    int damageEffects[] = {
-                        ESM::MagicEffect::FireDamage, ESM::MagicEffect::ShockDamage, ESM::MagicEffect::FrostDamage, ESM::MagicEffect::Poison,
-                        ESM::MagicEffect::SunDamage, ESM::MagicEffect::DamageHealth, ESM::MagicEffect::AbsorbHealth
-                    };
-
-                    for (unsigned int i=0; i<sizeof(damageEffects)/sizeof(int); ++i)
-                    {
-                        if (damageEffects[i] == effectId)
-                            isDamageEffect = true;
-                    }
-
-                    if (isDamageEffect)
-                    {
-                        if (caster == player || playerFollowers.find(caster) != playerFollowers.end())
-                        {
-                            if (caster.getClass().isNpc() && caster.getClass().getNpcStats(caster).isWerewolf())
-                                caster.getClass().getNpcStats(caster).addWerewolfKill();
-
-                            MWBase::Environment::get().getMechanicsManager()->actorKilled(ptr, player);
-                            actorKilled = true;
-                            break;
-                        }
-                    }
-                }
-
-                if (actorKilled)
-                    break;
-            }
-        }
-
-        // TODO: dirty flag for magic effects to avoid some unnecessary work below?
-
-        // any value of calm > 0 will stop the actor from fighting
-        if ((effects.get(ESM::MagicEffect::CalmHumanoid).getMagnitude() > 0 && ptr.getClass().isNpc())
-            || (effects.get(ESM::MagicEffect::CalmCreature).getMagnitude() > 0 && !ptr.getClass().isNpc()))
-            creatureStats.getAiSequence().stopCombat();
-
-        // Update bound effects
-        // Note: in vanilla MW multiple bound items of the same type can be created by different spells.
-        // As these extra copies are kinda useless this may or may not be important.
-        static std::map<ESM::MagicEffect::Effects, std::string> boundItemsMap;
-        if (boundItemsMap.empty())
-        {
-            boundItemsMap[ESM::MagicEffect::BoundBattleAxe] = "sMagicBoundBattleAxeID";
-            boundItemsMap[ESM::MagicEffect::BoundBoots] = "sMagicBoundBootsID";
-            boundItemsMap[ESM::MagicEffect::BoundCuirass] = "sMagicBoundCuirassID";
-            boundItemsMap[ESM::MagicEffect::BoundDagger] = "sMagicBoundDaggerID";
-            boundItemsMap[ESM::MagicEffect::BoundGloves] = "sMagicBoundLeftGauntletID"; // Note: needs RightGauntlet variant too (see below)
-            boundItemsMap[ESM::MagicEffect::BoundHelm] = "sMagicBoundHelmID";
-            boundItemsMap[ESM::MagicEffect::BoundLongbow] = "sMagicBoundLongbowID";
-            boundItemsMap[ESM::MagicEffect::BoundLongsword] = "sMagicBoundLongswordID";
-            boundItemsMap[ESM::MagicEffect::BoundMace] = "sMagicBoundMaceID";
-            boundItemsMap[ESM::MagicEffect::BoundShield] = "sMagicBoundShieldID";
-            boundItemsMap[ESM::MagicEffect::BoundSpear] = "sMagicBoundSpearID";
-        }
-
-        if(ptr.getClass().hasInventoryStore(ptr))
-        {
-            for (const auto& [effect, itemGmst] : boundItemsMap)
-            {
-                bool found = creatureStats.mBoundItems.find(effect) != creatureStats.mBoundItems.end();
-                float magnitude = effects.get(effect).getMagnitude();
-                if (found != (magnitude > 0))
-                {
-                    if (magnitude > 0)
-                        creatureStats.mBoundItems.insert(effect);
-                    else
-                        creatureStats.mBoundItems.erase(effect);
-
-                    std::string item = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(
-                                itemGmst)->mValue.getString();
-
-                    magnitude > 0 ? addBoundItem(item, ptr) : removeBoundItem(item, ptr);
-
-                    if (effect == ESM::MagicEffect::BoundGloves)
-                    {
-                        item = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(
-                                    "sMagicBoundRightGauntletID")->mValue.getString();
-                        magnitude > 0 ? addBoundItem(item, ptr) : removeBoundItem(item, ptr);
-                    }
-                }
-            }
-        }
-
-        // Summoned creature update visitor assumes the actor belongs to a cell.
-        // This assumption isn't always valid for the player character.
-        if (!ptr.isInCell())
-            return;
-
-        bool hasSummonEffect = false;
-        for (MagicEffects::Collection::const_iterator it = effects.begin(); it != effects.end(); ++it)
-        {
-            if (isSummoningEffect(it->first.mId))
-            {
-                hasSummonEffect = true;
-                break;
-            }
-        }
-
-        if (!creatureStats.getSummonedCreatureMap().empty() || !creatureStats.getSummonedCreatureGraveyard().empty() || hasSummonEffect)
-        {
-            UpdateSummonedCreatures updateSummonedCreatures(ptr);
-            creatureStats.getActiveSpells().visitEffectSources(updateSummonedCreatures);
-            creatureStats.getSpells().visitEffectSources(updateSummonedCreatures);
-            if (ptr.getClass().hasInventoryStore(ptr))
-                ptr.getClass().getInventoryStore(ptr).visitEffectSources(updateSummonedCreatures);
-            updateSummonedCreatures.process(mTimerDisposeSummonsCorpses == 0.f);
-        }
-    }
-
-    void Actors::calculateNpcStatModifiers (const MWWorld::Ptr& ptr, float duration)
-    {
-        NpcStats &npcStats = ptr.getClass().getNpcStats(ptr);
-        const MagicEffects &effects = npcStats.getMagicEffects();
-        bool godmode = ptr == getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState();
-
-        // skills
-        for(int i = 0;i < ESM::Skill::Length;++i)
-        {
-            SkillValue& skill = npcStats.getSkill(i);
-            float fortify = effects.get(EffectKey(ESM::MagicEffect::FortifySkill, i)).getMagnitude();
-            float drain = 0.f, absorb = 0.f;
-            if (!godmode)
-            {
-                drain = effects.get(EffectKey(ESM::MagicEffect::DrainSkill, i)).getMagnitude();
-                absorb = effects.get(EffectKey(ESM::MagicEffect::AbsorbSkill, i)).getMagnitude();
-            }
-            skill.setModifier(static_cast<int>(fortify - drain - absorb));
-        }
     }
 
     bool Actors::isAttackPreparing(const MWWorld::Ptr& ptr)
@@ -1979,8 +1423,6 @@ namespace MWMechanics
                         player.getClass().getCreatureStats(player).setHitAttemptActorId(-1);
                 }
 
-                iter->first.getClass().getCreatureStats(iter->first).getActiveSpells().update(duration);
-
                 const Misc::TimerStatus engageCombatTimerStatus = iter->second->updateEngageCombatTimer(duration);
 
                 // For dead actors we need to update looping spell particles
@@ -1988,7 +1430,7 @@ namespace MWMechanics
                 {
                     // They can be added during the death animation
                     if (!iter->first.getClass().getCreatureStats(iter->first).isDeathAnimationFinished())
-                        adjustMagicEffects(iter->first);
+                        adjustMagicEffects(iter->first, duration);
                     ctrl->updateContinuousVfx();
                 }
                 else
@@ -2083,8 +1525,6 @@ namespace MWMechanics
                         if (inProcessingRange)
                             updateDrowning(iter->first, duration, ctrl->isKnockedOut(), isPlayer);
 
-                        calculateNpcStatModifiers(iter->first, duration);
-
                         if (timerUpdateEquippedLight == 0)
                             updateEquippedLight(iter->first, updateEquippedLightInterval, showTorches);
                     }
@@ -2251,10 +1691,7 @@ namespace MWMechanics
 
                 // Apply soultrap
                 if (iter->first.getTypeName() == typeid(ESM::Creature).name())
-                {
-                    SoulTrap soulTrap (iter->first);
-                    stats.getActiveSpells().visitEffectSources(soulTrap);
-                }
+                    soulTrap(iter->first);
 
                 // Magic effects will be reset later, and the magic effect that could kill the actor
                 // needs to be determined now
@@ -2270,30 +1707,27 @@ namespace MWMechanics
 
                 // Reset magic effects and recalculate derived effects
                 // One case where we need this is to make sure bound items are removed upon death
-                stats.modifyMagicEffects(MWMechanics::MagicEffects());
-                stats.getActiveSpells().clear();
+                float vampirism = stats.getMagicEffects().get(ESM::MagicEffect::Vampirism).getMagnitude();
+                stats.getActiveSpells().clear(iter->first);
                 // Make sure spell effects are removed
                 purgeSpellEffects(stats.getActorId());
 
                 // Reset dynamic stats, attributes and skills
                 calculateCreatureStatModifiers(iter->first, 0);
-                if (iter->first.getClass().isNpc())
-                    calculateNpcStatModifiers(iter->first, 0);
+                stats.getMagicEffects().add(ESM::MagicEffect::Vampirism, vampirism);
 
                 if (isPlayer)
                 {
                     //player's death animation is over
                     MWBase::Environment::get().getStateManager()->askLoadRecent();
+                    // Play Death Music if it was the player dying
+                    MWBase::Environment::get().getSoundManager()->streamMusic("Special/MW_Death.mp3");
                 }
                 else
                 {
                     // NPC death animation is over, disable actor collision
                     MWBase::Environment::get().getWorld()->enableActorCollision(iter->first, false);
                 }
-
-                // Play Death Music if it was the player dying
-                if(iter->first == getPlayer())
-                    MWBase::Environment::get().getSoundManager()->streamMusic("Special/MW_Death.mp3");
             }
         }
     }
@@ -2313,7 +1747,7 @@ namespace MWMechanics
 
             // Remove the summoned creature's summoned creatures as well
             MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
-            std::map<ESM::SummonKey, int>& creatureMap = stats.getSummonedCreatureMap();
+            auto& creatureMap = stats.getSummonedCreatureMap();
             for (const auto& creature : creatureMap)
                 cleanupSummonedCreature(stats, creature.second);
             creatureMap.clear();
@@ -2334,7 +1768,7 @@ namespace MWMechanics
         for (PtrActorMap::iterator iter(mActors.begin());iter != mActors.end();++iter)
         {
             MWMechanics::ActiveSpells& spells = iter->first.getClass().getCreatureStats(iter->first).getActiveSpells();
-            spells.purge(casterActorId);
+            spells.purge(iter->first, casterActorId);
         }
     }
 
@@ -2352,7 +1786,7 @@ namespace MWMechanics
         {
             if (iter->first.getClass().getCreatureStats(iter->first).isDead())
             {
-                iter->first.getClass().getCreatureStats(iter->first).getActiveSpells().update(duration);
+                adjustMagicEffects (iter->first, duration);
                 continue;
             }
 
@@ -2363,15 +1797,11 @@ namespace MWMechanics
                     (playerPos - iter->first.getRefData().getPosition().asVec3()).length2() > mActorsProcessingRange*mActorsProcessingRange)
                 continue;
 
-            adjustMagicEffects (iter->first);
+            adjustMagicEffects (iter->first, duration);
             if (iter->first.getClass().getCreatureStats(iter->first).needToRecalcDynamicStats())
                 calculateDynamicStats (iter->first);
 
             calculateCreatureStatModifiers (iter->first, duration);
-            if (iter->first.getClass().isNpc())
-                calculateNpcStatModifiers(iter->first, duration);
-
-            iter->first.getClass().getCreatureStats(iter->first).getActiveSpells().update(duration);
 
             MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(iter->first);
             if (animation)
@@ -2760,10 +2190,8 @@ namespace MWMechanics
 
     void Actors::updateMagicEffects(const MWWorld::Ptr &ptr)
     {
-        adjustMagicEffects(ptr);
+        adjustMagicEffects(ptr, 0.f);
         calculateCreatureStatModifiers(ptr, 0.f);
-        if (ptr.getClass().isNpc())
-            calculateNpcStatModifiers(ptr, 0.f);
     }
 
     bool Actors::isReadyToBlock(const MWWorld::Ptr &ptr) const
diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index 171b45e270..3efe28204d 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -41,15 +41,11 @@ namespace MWMechanics
     {
             std::map<std::string, int> mDeathCount;
 
-            void addBoundItem (const std::string& itemId, const MWWorld::Ptr& actor);
-            void removeBoundItem (const std::string& itemId, const MWWorld::Ptr& actor);
-
-            void adjustMagicEffects (const MWWorld::Ptr& creature);
+            void adjustMagicEffects (const MWWorld::Ptr& creature, float duration);
 
             void calculateDynamicStats (const MWWorld::Ptr& ptr);
 
             void calculateCreatureStatModifiers (const MWWorld::Ptr& ptr, float duration);
-            void calculateNpcStatModifiers (const MWWorld::Ptr& ptr, float duration);
 
             void calculateRestoration (const MWWorld::Ptr& ptr, float duration);
 
@@ -208,7 +204,6 @@ namespace MWMechanics
 
     private:
         void updateVisibility (const MWWorld::Ptr& ptr, CharacterController* ctrl);
-        void applyCureEffects (const MWWorld::Ptr& actor);
 
         PtrActorMap mActors;
         float mTimerDisposeSummonsCorpses;
diff --git a/apps/openmw/mwmechanics/aicombataction.cpp b/apps/openmw/mwmechanics/aicombataction.cpp
index c26454aab5..e6176c869c 100644
--- a/apps/openmw/mwmechanics/aicombataction.cpp
+++ b/apps/openmw/mwmechanics/aicombataction.cpp
@@ -208,14 +208,14 @@ namespace MWMechanics
             }
         }
 
-        for (Spells::TIterator it = spells.begin(); it != spells.end(); ++it)
+        for (const ESM::Spell* spell : spells)
         {
-            float rating = rateSpell(it->first, actor, enemy);
+            float rating = rateSpell(spell, actor, enemy);
             if (rating > bestActionRating)
             {
                 bestActionRating = rating;
-                bestAction.reset(new ActionSpell(it->first->mId));
-                antiFleeRating = vanillaRateSpell(it->first, actor, enemy);
+                bestAction.reset(new ActionSpell(spell->mId));
+                antiFleeRating = vanillaRateSpell(spell, actor, enemy);
             }
         }
 
@@ -266,9 +266,9 @@ namespace MWMechanics
             }
         }
 
-        for (Spells::TIterator it = spells.begin(); it != spells.end(); ++it)
+        for (const ESM::Spell* spell : spells)
         {
-            float rating = rateSpell(it->first, actor, enemy);
+            float rating = rateSpell(spell, actor, enemy);
             if (rating > bestActionRating)
             {
                 bestActionRating = rating;
diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index 8d99664f27..8ca6e8b766 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -545,20 +545,12 @@ namespace MWMechanics
         mAiSequence.writeState(state.mAiSequence);
         mMagicEffects.writeState(state.mMagicEffects);
 
-        state.mSummonedCreatureMap = mSummonedCreatures;
+        state.mSummonedCreatures = mSummonedCreatures;
         state.mSummonGraveyard = mSummonGraveyard;
 
         state.mHasAiSettings = true;
         for (int i=0; i<4; ++i)
             mAiSettings[i].writeState (state.mAiSettings[i]);
-
-        for (auto it = mCorprusSpells.begin(); it != mCorprusSpells.end(); ++it)
-        {
-            for (int i=0; i<ESM::Attribute::Length; ++i)
-                state.mCorprusSpells[it->first].mWorsenings[i] = mCorprusSpells.at(it->first).mWorsenings[i];
-
-            state.mCorprusSpells[it->first].mNextWorsening = mCorprusSpells.at(it->first).mNextWorsening.toEsm();
-        }
     }
 
     void CreatureStats::readState (const ESM::CreatureStats& state)
@@ -618,7 +610,7 @@ namespace MWMechanics
                 // We can't use mActiveSpells::getMagicEffects here because it doesn't include expired effects
                 auto spell = std::find_if(mActiveSpells.begin(), mActiveSpells.end(), [&] (const auto& spell)
                 {
-                    const auto& effects = spell.second.mEffects;
+                    const auto& effects = spell.getEffects();
                     return std::find_if(effects.begin(), effects.end(), [&] (const auto& effect)
                     {
                         return effect.mEffectId == effectId;
@@ -629,21 +621,12 @@ namespace MWMechanics
             }
         }
 
-        mSummonedCreatures = state.mSummonedCreatureMap;
+        mSummonedCreatures = state.mSummonedCreatures;
         mSummonGraveyard = state.mSummonGraveyard;
 
         if (state.mHasAiSettings)
             for (int i=0; i<4; ++i)
                 mAiSettings[i].readState(state.mAiSettings[i]);
-
-        mCorprusSpells.clear();
-        for (auto it = state.mCorprusSpells.begin(); it != state.mCorprusSpells.end(); ++it)
-        {
-            for (int i=0; i<ESM::Attribute::Length; ++i)
-                mCorprusSpells[it->first].mWorsenings[i] = state.mCorprusSpells.at(it->first).mWorsenings[i];
-
-            mCorprusSpells[it->first].mNextWorsening = MWWorld::TimeStamp(state.mCorprusSpells.at(it->first).mNextWorsening);
-        }
     }
 
     void CreatureStats::setLastRestockTime(MWWorld::TimeStamp tradeTime)
@@ -710,7 +693,7 @@ namespace MWMechanics
         return mTimeOfDeath;
     }
 
-    std::map<ESM::SummonKey, int>& CreatureStats::getSummonedCreatureMap()
+    std::multimap<int, int>& CreatureStats::getSummonedCreatureMap()
     {
         return mSummonedCreatures;
     }
@@ -719,23 +702,4 @@ namespace MWMechanics
     {
         return mSummonGraveyard;
     }
-
-    std::map<std::string, CorprusStats> &CreatureStats::getCorprusSpells()
-    {
-        return mCorprusSpells;
-    }
-
-    void CreatureStats::addCorprusSpell(const std::string& sourceId, CorprusStats& stats)
-    {
-        mCorprusSpells[sourceId] = stats;
-    }
-
-    void CreatureStats::removeCorprusSpell(const std::string& sourceId)
-    {
-        auto corprusIt = mCorprusSpells.find(sourceId);
-        if (corprusIt != mCorprusSpells.end())
-        {
-            mCorprusSpells.erase(corprusIt);
-        }
-    }
 }
diff --git a/apps/openmw/mwmechanics/creaturestats.hpp b/apps/openmw/mwmechanics/creaturestats.hpp
index 06d526cc5a..d234d14486 100644
--- a/apps/openmw/mwmechanics/creaturestats.hpp
+++ b/apps/openmw/mwmechanics/creaturestats.hpp
@@ -1,6 +1,7 @@
 #ifndef GAME_MWMECHANICS_CREATURESTATS_H
 #define GAME_MWMECHANICS_CREATURESTATS_H
 
+#include <map>
 #include <set>
 #include <string>
 #include <stdexcept>
@@ -87,14 +88,12 @@ namespace MWMechanics
         float mSideMovementAngle;
 
     private:
-        std::map<ESM::SummonKey, int> mSummonedCreatures; // <SummonKey, ActorId>
+        std::multimap<int, int> mSummonedCreatures; // <Effect, ActorId>
 
         // Contains ActorIds of summoned creatures with an expired lifetime that have not been deleted yet.
         // This may be necessary when the creature is in an inactive cell.
         std::vector<int> mSummonGraveyard;
 
-        std::map<std::string, CorprusStats> mCorprusSpells;
-
     protected:
         int mLevel;
 
@@ -236,7 +235,7 @@ namespace MWMechanics
         void setBlock(bool value);
         bool getBlock() const;
 
-        std::map<ESM::SummonKey, int>& getSummonedCreatureMap(); // <SummonKey, ActorId of summoned creature>
+        std::multimap<int, int>& getSummonedCreatureMap(); // <Effect, ActorId of summoned creature>
         std::vector<int>& getSummonedCreatureGraveyard(); // ActorIds
 
         enum Flag
@@ -297,12 +296,6 @@ namespace MWMechanics
 
         static void cleanup();
 
-        std::map<std::string, CorprusStats> & getCorprusSpells();
-
-        void addCorprusSpell(const std::string& sourceId, CorprusStats& stats);
-
-        void removeCorprusSpell(const std::string& sourceId);
-
         float getSideMovementAngle() const { return mSideMovementAngle; }
         void setSideMovementAngle(float angle) { mSideMovementAngle = angle; }
     };
diff --git a/apps/openmw/mwmechanics/disease.hpp b/apps/openmw/mwmechanics/disease.hpp
index 5d4bfb682f..426a66ecf2 100644
--- a/apps/openmw/mwmechanics/disease.hpp
+++ b/apps/openmw/mwmechanics/disease.hpp
@@ -30,12 +30,11 @@ namespace MWMechanics
                 MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(
                     "fDiseaseXferChance")->mValue.getFloat();
 
-        MagicEffects& actorEffects = actor.getClass().getCreatureStats(actor).getMagicEffects();
+        const MagicEffects& actorEffects = actor.getClass().getCreatureStats(actor).getMagicEffects();
 
         Spells& spells = carrier.getClass().getCreatureStats(carrier).getSpells();
-        for (Spells::TIterator it = spells.begin(); it != spells.end(); ++it)
+        for (const ESM::Spell* spell : spells)
         {
-            const ESM::Spell* spell = it->first;
             if (actor.getClass().getCreatureStats(actor).getSpells().hasSpell(spell->mId))
                 continue;
 
@@ -56,7 +55,7 @@ namespace MWMechanics
             if (Misc::Rng::rollDice(10000) < x)
             {
                 // Contracted disease!
-                actor.getClass().getCreatureStats(actor).getSpells().add(it->first);
+                actor.getClass().getCreatureStats(actor).getSpells().add(spell);
                 MWBase::Environment::get().getWorld()->applyLoopingParticles(actor);
 
                 std::string msg = "sMagicContractDisease";
diff --git a/apps/openmw/mwmechanics/linkedeffects.cpp b/apps/openmw/mwmechanics/linkedeffects.cpp
deleted file mode 100644
index b0defac7d2..0000000000
--- a/apps/openmw/mwmechanics/linkedeffects.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-#include "linkedeffects.hpp"
-
-#include <components/misc/rng.hpp>
-#include <components/settings/settings.hpp>
-
-#include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
-
-#include "../mwrender/animation.hpp"
-
-#include "../mwworld/class.hpp"
-#include "../mwworld/esmstore.hpp"
-
-#include "creaturestats.hpp"
-
-namespace MWMechanics
-{
-
-    bool reflectEffect(const ESM::ENAMstruct& effect, const ESM::MagicEffect* magicEffect,
-                       const MWWorld::Ptr& caster, const MWWorld::Ptr& target, ESM::EffectList& reflectedEffects)
-    {
-        if (caster.isEmpty() || caster == target || !target.getClass().isActor())
-            return false;
-
-        bool isHarmful = magicEffect->mData.mFlags & ESM::MagicEffect::Harmful;
-        bool isUnreflectable = magicEffect->mData.mFlags & ESM::MagicEffect::Unreflectable;
-        if (!isHarmful || isUnreflectable)
-            return false;
-
-        float reflect = target.getClass().getCreatureStats(target).getMagicEffects().get(ESM::MagicEffect::Reflect).getMagnitude();
-        if (Misc::Rng::roll0to99() >= reflect)
-            return false;
-
-        const ESM::Static* reflectStatic = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>().find ("VFX_Reflect");
-        MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(target);
-        if (animation && !reflectStatic->mModel.empty())
-            animation->addEffect("meshes\\" + reflectStatic->mModel, ESM::MagicEffect::Reflect, false, std::string());
-        reflectedEffects.mList.emplace_back(effect);
-        return true;
-    }
-
-    void absorbStat(const ESM::ENAMstruct& effect, const ESM::ActiveEffect& appliedEffect,
-                    const MWWorld::Ptr& caster, const MWWorld::Ptr& target, bool reflected, const std::string& source)
-    {
-        if (caster.isEmpty() || caster == target)
-            return;
-
-        if (!target.getClass().isActor() || !caster.getClass().isActor())
-            return;
-
-        // Make sure callers don't do something weird
-        if (effect.mEffectID < ESM::MagicEffect::AbsorbAttribute || effect.mEffectID > ESM::MagicEffect::AbsorbSkill)
-            throw std::runtime_error("invalid absorb stat effect");
-
-        if (appliedEffect.mMagnitude == 0)
-            return;
-
-        std::vector<ActiveSpells::ActiveEffect> absorbEffects;
-        ActiveSpells::ActiveEffect absorbEffect = appliedEffect;
-        absorbEffect.mMagnitude *= -1;
-        absorbEffect.mEffectIndex = appliedEffect.mEffectIndex;
-        absorbEffects.emplace_back(absorbEffect);
-
-        // Morrowind negates reflected Absorb spells so the original caster won't be harmed.
-        if (reflected && Settings::Manager::getBool("classic reflected absorb spells behavior", "Game"))
-        {
-            target.getClass().getCreatureStats(target).getActiveSpells().addSpell(std::string(), true,
-                            absorbEffects, source, caster.getClass().getCreatureStats(caster).getActorId());
-            return;
-        }
-
-        caster.getClass().getCreatureStats(caster).getActiveSpells().addSpell(std::string(), true,
-                        absorbEffects, source, target.getClass().getCreatureStats(target).getActorId());
-    }
-}
diff --git a/apps/openmw/mwmechanics/linkedeffects.hpp b/apps/openmw/mwmechanics/linkedeffects.hpp
deleted file mode 100644
index a6dea2a3a2..0000000000
--- a/apps/openmw/mwmechanics/linkedeffects.hpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef MWMECHANICS_LINKEDEFFECTS_H
-#define MWMECHANICS_LINKEDEFFECTS_H
-
-#include <string>
-
-namespace ESM
-{
-    struct ActiveEffect;
-    struct EffectList;
-    struct ENAMstruct;
-    struct MagicEffect;
-    struct Spell;
-}
-
-namespace MWWorld
-{
-    class Ptr;
-}
-
-namespace MWMechanics
-{
-
-    // Try to reflect a spell effect. If it's reflected, it's also put into the passed reflected effects list.
-    bool reflectEffect(const ESM::ENAMstruct& effect, const ESM::MagicEffect* magicEffect,
-                       const MWWorld::Ptr& caster, const MWWorld::Ptr& target, ESM::EffectList& reflectedEffects);
-
-    // Try to absorb a stat (skill, attribute, etc.) from the target and transfer it to the caster.
-    void absorbStat(const ESM::ENAMstruct& effect, const ESM::ActiveEffect& appliedEffect,
-                    const MWWorld::Ptr& caster, const MWWorld::Ptr& target, bool reflected, const std::string& source);
-}
-
-#endif
diff --git a/apps/openmw/mwmechanics/magiceffects.cpp b/apps/openmw/mwmechanics/magiceffects.cpp
index 1a1a44f638..e75361628b 100644
--- a/apps/openmw/mwmechanics/magiceffects.cpp
+++ b/apps/openmw/mwmechanics/magiceffects.cpp
@@ -193,22 +193,22 @@ namespace MWMechanics
 
     void MagicEffects::writeState(ESM::MagicEffects &state) const
     {
-        // Don't need to save Modifiers, they are recalculated every frame anyway.
-        for (Collection::const_iterator iter (begin()); iter!=end(); ++iter)
+        for (const auto& [key, params] : mCollection)
         {
-            if (iter->second.getBase() != 0)
+            if (params.getBase() != 0 || params.getModifier() != 0.f)
             {
                 // Don't worry about mArg, never used by magic effect script instructions
-                state.mEffects.insert(std::make_pair(iter->first.mId, iter->second.getBase()));
+                state.mEffects[key.mId] = {params.getBase(), params.getModifier()};
             }
         }
     }
 
     void MagicEffects::readState(const ESM::MagicEffects &state)
     {
-        for (std::map<int, int>::const_iterator it = state.mEffects.begin(); it != state.mEffects.end(); ++it)
+        for (const auto& [key, params] : state.mEffects)
         {
-            mCollection[EffectKey(it->first)].setBase(it->second);
+            mCollection[EffectKey(key)].setBase(params.first);
+            mCollection[EffectKey(key)].setModifier(params.second);
         }
     }
 }
diff --git a/apps/openmw/mwmechanics/magiceffects.hpp b/apps/openmw/mwmechanics/magiceffects.hpp
index 12735a87fc..50f4dab050 100644
--- a/apps/openmw/mwmechanics/magiceffects.hpp
+++ b/apps/openmw/mwmechanics/magiceffects.hpp
@@ -69,16 +69,6 @@ namespace MWMechanics
         return param -= right;
     }
 
-    // Used by effect management classes (ActiveSpells, InventoryStore, Spells) to list active effect sources for GUI display
-    struct EffectSourceVisitor
-    {
-        virtual ~EffectSourceVisitor() { }
-
-        virtual void visit (EffectKey key, int effectIndex,
-                            const std::string& sourceName, const std::string& sourceId, int casterActorId,
-                            float magnitude, float remainingTime = -1, float totalTime = -1) = 0;
-    };
-
     /// \brief Effects currently affecting a NPC or creature
     class MagicEffects
     {
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 24601d79c8..fb8b3fa2b0 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -84,7 +84,7 @@ namespace MWMechanics
         // reset
         creatureStats.setLevel(player->mNpdt.mLevel);
         creatureStats.getSpells().clear(true);
-        creatureStats.modifyMagicEffects(MagicEffects());
+        creatureStats.getActiveSpells().clear(ptr);
 
         for (int i=0; i<27; ++i)
             npcStats.getSkill (i).setBase (player->mNpdt.mSkills[i]);
@@ -213,6 +213,7 @@ namespace MWMechanics
         int attributes[ESM::Attribute::Length];
         for (int i=0; i<ESM::Attribute::Length; ++i)
             attributes[i] = npcStats.getAttribute(i).getBase();
+        npcStats.updateHealth();
 
         std::vector<std::string> selectedSpells = autoCalcPlayerSpells(skills, attributes, race);
 
@@ -221,6 +222,7 @@ namespace MWMechanics
 
         // forced update and current value adjustments
         mActors.updateActor (ptr, 0);
+        mActors.updateActor (ptr, 0);
 
         for (int i=0; i<3; ++i)
         {
@@ -282,24 +284,6 @@ namespace MWMechanics
         mObjects.dropObjects(cellStore);
     }
 
-    void MechanicsManager::restoreStatsAfterCorprus(const MWWorld::Ptr& actor, const std::string& sourceId)
-    {
-        auto& stats = actor.getClass().getCreatureStats (actor);
-        auto& corprusSpells = stats.getCorprusSpells();
-
-        auto corprusIt = corprusSpells.find(sourceId);
-
-        if (corprusIt != corprusSpells.end())
-        {
-            for (int i = 0; i < ESM::Attribute::Length; ++i)
-            {
-                MWMechanics::AttributeValue attr = stats.getAttribute(i);
-                attr.restore(corprusIt->second.mWorsenings[i]);
-                actor.getClass().getCreatureStats(actor).setAttribute(i, attr);
-            }
-        }
-    }
-
     void MechanicsManager::update(float duration, bool paused)
     {
         // Note: we should do it here since game mechanics and world updates use these values
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
index 0aaeb23435..206b5c5420 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
@@ -230,8 +230,6 @@ namespace MWMechanics
             GreetingState getGreetingState(const MWWorld::Ptr& ptr) const override;
             bool isTurningToPlayer(const MWWorld::Ptr& ptr) const override;
 
-            void restoreStatsAfterCorprus(const MWWorld::Ptr& actor, const std::string& sourceId) override;
-
         private:
             bool canCommitCrimeAgainst(const MWWorld::Ptr& victim, const MWWorld::Ptr& attacker);
             bool canReportCrime(const MWWorld::Ptr &actor, const MWWorld::Ptr &victim, std::set<MWWorld::Ptr> &playerFollowers);
diff --git a/apps/openmw/mwmechanics/spellabsorption.cpp b/apps/openmw/mwmechanics/spellabsorption.cpp
index cb80921b33..82531132ca 100644
--- a/apps/openmw/mwmechanics/spellabsorption.cpp
+++ b/apps/openmw/mwmechanics/spellabsorption.cpp
@@ -16,33 +16,30 @@
 
 namespace MWMechanics
 {
-
-    class GetAbsorptionProbability : public MWMechanics::EffectSourceVisitor
+    float getProbability(const MWMechanics::ActiveSpells& activeSpells)
     {
-    public:
-        float mProbability{0.f};
-
-        GetAbsorptionProbability() = default;
-
-        void visit (MWMechanics::EffectKey key, int /*effectIndex*/,
-                            const std::string& /*sourceName*/, const std::string& /*sourceId*/, int /*casterActorId*/,
-                            float magnitude, float /*remainingTime*/, float /*totalTime*/) override
+        float probability = 0.f;
+        for(const auto& params : activeSpells)
         {
-            if (key.mId == ESM::MagicEffect::SpellAbsorption)
+            for(const auto& effect : params.getEffects())
             {
-                if (mProbability == 0.f)
-                    mProbability = magnitude / 100;
-                else
+                if(effect.mEffectId == ESM::MagicEffect::SpellAbsorption)
                 {
-                    // If there are different sources of SpellAbsorption effect, multiply failing probability for all effects.
-                    // Real absorption probability will be the (1 - total fail chance) in this case.
-                    float failProbability = 1.f - mProbability;
-                    failProbability *= 1.f - magnitude / 100;
-                    mProbability = 1.f - failProbability;
+                    if(probability == 0.f)
+                        probability = effect.mMagnitude / 100;
+                    else
+                    {
+                        // If there are different sources of SpellAbsorption effect, multiply failing probability for all effects.
+                        // Real absorption probability will be the (1 - total fail chance) in this case.
+                        float failProbability = 1.f - probability;
+                        failProbability *= 1.f - effect.mMagnitude / 100;
+                        probability = 1.f - failProbability;
+                    }
                 }
             }
         }
-    };
+        return static_cast<int>(probability * 100);
+    }
 
     bool absorbSpell (const std::string& spellId, const MWWorld::Ptr& caster, const MWWorld::Ptr& target)
     {
@@ -53,13 +50,7 @@ namespace MWMechanics
         if (stats.getMagicEffects().get(ESM::MagicEffect::SpellAbsorption).getMagnitude() <= 0.f)
             return false;
 
-        GetAbsorptionProbability check;
-        stats.getActiveSpells().visitEffectSources(check);
-        stats.getSpells().visitEffectSources(check);
-        if (target.getClass().hasInventoryStore(target))
-            target.getClass().getInventoryStore(target).visitEffectSources(check);
-
-        int chance = check.mProbability * 100;
+        int chance = getProbability(stats.getActiveSpells());
         if (Misc::Rng::roll0to99() >= chance)
             return false;
 
diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index 502e56edf7..53fbe69ab3 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -22,14 +22,38 @@
 #include "actorutil.hpp"
 #include "aifollow.hpp"
 #include "creaturestats.hpp"
-#include "linkedeffects.hpp"
 #include "spellabsorption.hpp"
-#include "spellresistance.hpp"
+#include "spelleffects.hpp"
 #include "spellutil.hpp"
 #include "summoning.hpp"
-#include "tickableeffects.hpp"
 #include "weapontype.hpp"
 
+namespace
+{
+    bool reflectEffect(const ESM::ENAMstruct& effect, const ESM::MagicEffect* magicEffect,
+                       const MWWorld::Ptr& caster, const MWWorld::Ptr& target, ESM::EffectList& reflectedEffects)
+    {
+        if (caster.isEmpty() || caster == target || !target.getClass().isActor())
+            return false;
+
+        bool isHarmful = magicEffect->mData.mFlags & ESM::MagicEffect::Harmful;
+        bool isUnreflectable = magicEffect->mData.mFlags & ESM::MagicEffect::Unreflectable;
+        if (!isHarmful || isUnreflectable)
+            return false;
+
+        float reflect = target.getClass().getCreatureStats(target).getMagicEffects().get(ESM::MagicEffect::Reflect).getMagnitude();
+        if (Misc::Rng::roll0to99() >= reflect)
+            return false;
+
+        const ESM::Static* reflectStatic = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>().find ("VFX_Reflect");
+        MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(target);
+        if (animation && !reflectStatic->mModel.empty())
+            animation->addEffect("meshes\\" + reflectStatic->mModel, ESM::MagicEffect::Reflect, false, std::string());
+        reflectedEffects.mList.emplace_back(effect);
+        return true;
+    }
+}
+
 namespace MWMechanics
 {
     CastSpell::CastSpell(const MWWorld::Ptr &caster, const MWWorld::Ptr &target, const bool fromProjectile, const bool manualSpell)
@@ -54,7 +78,7 @@ namespace MWMechanics
                 (mTarget.getRefData().getPosition().asVec3() + offset) -
                 (mCaster.getRefData().getPosition().asVec3());
 
-        MWBase::Environment::get().getWorld()->launchMagicBolt(mId, mCaster, fallbackDirection);
+        MWBase::Environment::get().getWorld()->launchMagicBolt(mId, mCaster, fallbackDirection, mSlot);
     }
 
     void CastSpell::inflict(const MWWorld::Ptr &target, const MWWorld::Ptr &caster,
@@ -100,20 +124,13 @@ namespace MWMechanics
         }
 
         ESM::EffectList reflectedEffects;
-        std::vector<ActiveSpells::ActiveEffect> appliedLastingEffects;
-
-        // HACK: cache target's magic effects here, and add any applied effects to it. Use the cached effects for determining resistance.
-        // This is required for Weakness effects in a spell to apply to any subsequent effects in the spell.
-        // Otherwise, they'd only apply after the whole spell was added.
-        MagicEffects targetEffects;
-        if (targetIsActor)
-            targetEffects += target.getClass().getCreatureStats(target).getMagicEffects();
+        ActiveSpells::ActiveSpellParams params(*this, caster);
 
         bool castByPlayer = (!caster.isEmpty() && caster == getPlayer());
 
-        ActiveSpells targetSpells;
+        const ActiveSpells* targetSpells = nullptr;
         if (targetIsActor)
-            targetSpells = target.getClass().getCreatureStats(target).getActiveSpells();
+            targetSpells = &target.getClass().getCreatureStats(target).getActiveSpells();
 
         bool canCastAnEffect = false;    // For bound equipment.If this remains false
                                          // throughout the iteration of this spell's 
@@ -134,7 +151,7 @@ namespace MWMechanics
                 effectIt->mEffectID);
 
             // Re-casting a bound equipment effect has no effect if the spell is still active
-            if (magicEffect->mData.mFlags & ESM::MagicEffect::NonRecastable && targetSpells.isSpellActive(mId))
+            if (magicEffect->mData.mFlags & ESM::MagicEffect::NonRecastable && targetSpells && targetSpells->isSpellActive(mId))
             {
                 if (effectIt == (effects.mList.end() - 1) && !canCastAnEffect && castByPlayer)
                     MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicCannotRecast}");
@@ -163,307 +180,70 @@ namespace MWMechanics
             if (!reflected && reflectEffect(*effectIt, magicEffect, caster, target, reflectedEffects))
                 continue;
 
-            // Try resisting.
-            float magnitudeMult = getEffectMultiplier(effectIt->mEffectID, target, caster, spell, &targetEffects);
-            if (magnitudeMult == 0)
+            ActiveSpells::ActiveEffect effect;
+            effect.mEffectId = effectIt->mEffectID;
+            effect.mArg = MWMechanics::EffectKey(*effectIt).mArg;
+            effect.mMagnitude = 0.f;
+            effect.mMinMagnitude = effectIt->mMagnMin;
+            effect.mMaxMagnitude = effectIt->mMagnMax;
+            effect.mTimeLeft = 0.f;
+            effect.mEffectIndex = currentEffectIndex;
+            effect.mFlags = ESM::ActiveEffect::Flag_None;
+
+            // Avoid applying harmful effects to the player in god mode
+            if (target == getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState() && isHarmful)
             {
-                // Fully resisted, show message
-                if (target == getPlayer())
-                    MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicPCResisted}");
-                else if (castByPlayer)
-                    MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicTargetResisted}");
+                effect.mMinMagnitude = 0;
+                effect.mMaxMagnitude = 0;
             }
-            else
-            {
-                float magnitude = effectIt->mMagnMin + Misc::Rng::rollDice(effectIt->mMagnMax - effectIt->mMagnMin + 1);
-                magnitude *= magnitudeMult;
 
-                if (!target.getClass().isActor())
-                {
-                    // non-actor objects have no list of active magic effects, so have to apply instantly
-                    if (!applyInstantEffect(target, caster, EffectKey(*effectIt), magnitude))
-                        continue;
-                }
-                else // target.getClass().isActor() == true
-                {
-                    ActiveSpells::ActiveEffect effect;
-                    effect.mEffectId = effectIt->mEffectID;
-                    effect.mArg = MWMechanics::EffectKey(*effectIt).mArg;
-                    effect.mMagnitude = magnitude;
-                    effect.mTimeLeft = 0.f;
-                    effect.mEffectIndex = currentEffectIndex;
-
-                    // Avoid applying absorb effects if the caster is the target
-                    // We still need the spell to be added
-                    if (caster == target
-                        && effectIt->mEffectID >= ESM::MagicEffect::AbsorbAttribute
-                        && effectIt->mEffectID <= ESM::MagicEffect::AbsorbSkill)
-                    {
-                        effect.mMagnitude = 0;
-                    }
+            bool hasDuration = !(magicEffect->mData.mFlags & ESM::MagicEffect::NoDuration);
+            effect.mDuration = hasDuration ? static_cast<float>(effectIt->mDuration) : 1.f;
 
-                    // Avoid applying harmful effects to the player in god mode
-                    if (target == getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState() && isHarmful)
-                    {
-                        effect.mMagnitude = 0;
-                    }
+            bool appliedOnce = magicEffect->mData.mFlags & ESM::MagicEffect::AppliedOnce;
+            if (!appliedOnce)
+                effect.mDuration = std::max(1.f, effect.mDuration);
 
-                    bool effectAffectsHealth = isHarmful || effectIt->mEffectID == ESM::MagicEffect::RestoreHealth;
-                    if (castByPlayer && target != caster && !target.getClass().getCreatureStats(target).isDead() && effectAffectsHealth)
-                    {
-                        // If player is attempting to cast a harmful spell on or is healing a living target, show the target's HP bar.
-                        MWBase::Environment::get().getWindowManager()->setEnemy(target);
-                    }
-
-                    bool hasDuration = !(magicEffect->mData.mFlags & ESM::MagicEffect::NoDuration);
-                    effect.mDuration = hasDuration ? static_cast<float>(effectIt->mDuration) : 1.f;
+            effect.mTimeLeft = effect.mDuration;
 
-                    bool appliedOnce = magicEffect->mData.mFlags & ESM::MagicEffect::AppliedOnce;
-                    if (!appliedOnce)
-                        effect.mDuration = std::max(1.f, effect.mDuration);
+            // add to list of active effects, to apply in next frame
+            params.getEffects().emplace_back(effect);
 
-                    if (effect.mDuration == 0)
-                    {
-                        // We still should add effect to list to allow GetSpellEffects to detect this spell
-                        appliedLastingEffects.push_back(effect);
-
-                        // duration 0 means apply full magnitude instantly
-                        bool wasDead = target.getClass().getCreatureStats(target).isDead();
-                        effectTick(target.getClass().getCreatureStats(target), target, EffectKey(*effectIt), effect.mMagnitude);
-                        bool isDead = target.getClass().getCreatureStats(target).isDead();
-
-                        if (!wasDead && isDead)
-                            MWBase::Environment::get().getMechanicsManager()->actorKilled(target, caster);
-                    }
-                    else
-                    {
-                        effect.mTimeLeft = effect.mDuration;
-
-                        targetEffects.add(MWMechanics::EffectKey(*effectIt), MWMechanics::EffectParam(effect.mMagnitude));
-
-                        // add to list of active effects, to apply in next frame
-                        appliedLastingEffects.push_back(effect);
-
-                        // Unequip all items, if a spell with the ExtraSpell effect was casted
-                        if (effectIt->mEffectID == ESM::MagicEffect::ExtraSpell && target.getClass().hasInventoryStore(target))
-                        {
-                            MWWorld::InventoryStore& store = target.getClass().getInventoryStore(target);
-                            store.unequipAll(target);
-                        }
-
-                        // Command spells should have their effect, including taking the target out of combat, each time the spell successfully affects the target
-                        if (((effectIt->mEffectID == ESM::MagicEffect::CommandHumanoid && target.getClass().isNpc())
-                        || (effectIt->mEffectID == ESM::MagicEffect::CommandCreature && target.getTypeName() == typeid(ESM::Creature).name()))
-                        && !caster.isEmpty() && caster.getClass().isActor() && target != getPlayer() && effect.mMagnitude >= target.getClass().getCreatureStats(target).getLevel())
-                        {
-                            MWMechanics::AiFollow package(caster, true);
-                            target.getClass().getCreatureStats(target).getAiSequence().stack(package, target);
-                        }
-
-                        // For absorb effects, also apply the effect to the caster - but with a negative
-                        // magnitude, since we're transferring stats from the target to the caster
-                        if (effectIt->mEffectID >= ESM::MagicEffect::AbsorbAttribute && effectIt->mEffectID <= ESM::MagicEffect::AbsorbSkill)
-                            absorbStat(*effectIt, effect, caster, target, reflected, mSourceName);
-                    }
-                }
-
-                // Re-casting a summon effect will remove the creature from previous castings of that effect.
-                if (isSummoningEffect(effectIt->mEffectID) && targetIsActor)
-                {
-                    CreatureStats& targetStats = target.getClass().getCreatureStats(target);
-                    ESM::SummonKey key(effectIt->mEffectID, mId, currentEffectIndex);
-                    auto findCreature = targetStats.getSummonedCreatureMap().find(key);
-                    if (findCreature != targetStats.getSummonedCreatureMap().end())
-                    {
-                        MWBase::Environment::get().getMechanicsManager()->cleanupSummonedCreature(target, findCreature->second);
-                        targetStats.getSummonedCreatureMap().erase(findCreature);
-                    }
-                }
-
-                if (target.getClass().isActor() || magicEffect->mData.mFlags & ESM::MagicEffect::NoDuration)
-                {
-                    static const std::string schools[] = {
-                        "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration"
-                    };
+            bool effectAffectsHealth = isHarmful || effectIt->mEffectID == ESM::MagicEffect::RestoreHealth;
+            if (castByPlayer && target != caster && targetIsActor && effectAffectsHealth)
+            {
+                // If player is attempting to cast a harmful spell on or is healing a living target, show the target's HP bar.
+                MWBase::Environment::get().getWindowManager()->setEnemy(target);
+            }
 
-                    MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
-                    if(!magicEffect->mHitSound.empty())
-                        sndMgr->playSound3D(target, magicEffect->mHitSound, 1.0f, 1.0f);
-                    else
-                        sndMgr->playSound3D(target, schools[magicEffect->mData.mSchool]+" hit", 1.0f, 1.0f);
-
-                    // Add VFX
-                    const ESM::Static* castStatic;
-                    if (!magicEffect->mHit.empty())
-                        castStatic = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>().find (magicEffect->mHit);
-                    else
-                        castStatic = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>().find ("VFX_DefaultHit");
-
-                    bool loop = (magicEffect->mData.mFlags & ESM::MagicEffect::ContinuousVfx) != 0;
-                    // Note: in case of non actor, a free effect should be fine as well
-                    MWRender::Animation* anim = MWBase::Environment::get().getWorld()->getAnimation(target);
-                    if (anim && !castStatic->mModel.empty())
-                        anim->addEffect("meshes\\" + castStatic->mModel, magicEffect->mIndex, loop, "", magicEffect->mParticle);
-                }
+            if (targetIsActor || magicEffect->mData.mFlags & ESM::MagicEffect::NoDuration)
+            {
+                playEffects(target, *magicEffect);
             }
         }
 
         if (!exploded)
-            MWBase::Environment::get().getWorld()->explodeSpell(mHitPosition, effects, caster, target, range, mId, mSourceName, mFromProjectile);
+            MWBase::Environment::get().getWorld()->explodeSpell(mHitPosition, effects, caster, target, range, mId, mSourceName, mFromProjectile, mSlot);
 
         if (!target.isEmpty())
         {
             if (!reflectedEffects.mList.empty())
                 inflict(caster, target, reflectedEffects, range, true, exploded);
 
-            if (!appliedLastingEffects.empty())
-            {
-                int casterActorId = -1;
-                if (!caster.isEmpty() && caster.getClass().isActor())
-                    casterActorId = caster.getClass().getCreatureStats(caster).getActorId();
-                target.getClass().getCreatureStats(target).getActiveSpells().addSpell(mId, mStack, appliedLastingEffects,
-                        mSourceName, casterActorId);
-            }
-        }
-    }
-
-    bool CastSpell::applyInstantEffect(const MWWorld::Ptr &target, const MWWorld::Ptr &caster, const MWMechanics::EffectKey& effect, float magnitude)
-    {
-        short effectId = effect.mId;
-        if (target.getClass().canLock(target))
-        {
-            if (effectId == ESM::MagicEffect::Lock)
-            {
-                const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
-                const ESM::MagicEffect *magiceffect = store.get<ESM::MagicEffect>().find(effectId);
-                MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(target);
-                if (animation)
-                    animation->addSpellCastGlow(magiceffect);
-                if (target.getCellRef().getLockLevel() < magnitude) //If the door is not already locked to a higher value, lock it to spell magnitude
-                {
-                    if (caster == getPlayer())
-                        MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicLockSuccess}");
-                    target.getCellRef().lock(static_cast<int>(magnitude));
-                }
-                return true;
-            }
-            else if (effectId == ESM::MagicEffect::Open)
+            if (!params.getEffects().empty())
             {
-                if (!caster.isEmpty())
-                {
-                    MWBase::Environment::get().getMechanicsManager()->unlockAttempted(getPlayer(), target);
-                    // Use the player instead of the caster for vanilla crime compatibility
-                }
-                const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
-                const ESM::MagicEffect *magiceffect = store.get<ESM::MagicEffect>().find(effectId);
-                MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(target);
-                if (animation)
-                    animation->addSpellCastGlow(magiceffect);
-                if (target.getCellRef().getLockLevel() <= magnitude)
-                {
-                    if (target.getCellRef().getLockLevel() > 0)
-                    {
-                        MWBase::Environment::get().getSoundManager()->playSound3D(target, "Open Lock", 1.f, 1.f);
-
-                        if (caster == getPlayer())
-                            MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicOpenSuccess}");
-                    }
-                    target.getCellRef().unlock();
-                }
+                if(targetIsActor)
+                    target.getClass().getCreatureStats(target).getActiveSpells().addSpell(params);
                 else
                 {
-                    MWBase::Environment::get().getSoundManager()->playSound3D(target, "Open Lock Fail", 1.f, 1.f);
+                    // Apply effects instantly. We can ignore effect deletion since the entire params object gets deleted afterwards anyway
+                    for(auto& effect : params.getEffects())
+                        applyMagicEffect(target, caster, params, effect, 0.f);
                 }
-
-                return true;
-            }
-        }
-        else if (target.getClass().isActor() && effectId == ESM::MagicEffect::Dispel)
-        {
-            target.getClass().getCreatureStats(target).getActiveSpells().purgeAll(magnitude, true);
-            return true;
-        }
-        else if(target.getClass().isActor() && effectId >= ESM::MagicEffect::CalmHumanoid && effectId <= ESM::MagicEffect::RallyCreature)
-        {
-            // Treat X Humanoid spells on creatures and X Creature spells on NPCs as instant effects and remove their VFX
-            bool affectsCreatures = (effectId - ESM::MagicEffect::CalmHumanoid) & 1;
-            if(affectsCreatures == target.getClass().isNpc())
-            {
-                MWBase::Environment::get().getWorld()->getAnimation(target)->removeEffect(effectId);
-                return true;
-            }
-        }
-        else if(target.getClass().isActor() && effectId == ESM::MagicEffect::TurnUndead)
-        {
-            // Diverge from vanilla by giving scripts a chance to detect Turn Undead on non-undead, but still remove the effect and VFX
-            if(target.getClass().isNpc() || target.get<ESM::Creature>()->mBase->mData.mType != ESM::Creature::Undead)
-            {
-                MWBase::Environment::get().getWorld()->getAnimation(target)->removeEffect(effectId);
-                return true;
             }
         }
-        else if (target.getClass().isActor() && target == getPlayer())
-        {
-            MWRender::Animation* anim = MWBase::Environment::get().getWorld()->getAnimation(mCaster);
-            bool teleportingEnabled = MWBase::Environment::get().getWorld()->isTeleportingEnabled();
-
-            if (effectId == ESM::MagicEffect::DivineIntervention || effectId == ESM::MagicEffect::AlmsiviIntervention)
-            {
-                if (!teleportingEnabled)
-                {
-                    if (caster == getPlayer())
-                        MWBase::Environment::get().getWindowManager()->messageBox("#{sTeleportDisabled}");
-                    return true;
-                }
-                std::string marker = (effectId == ESM::MagicEffect::DivineIntervention) ? "divinemarker" : "templemarker";
-                MWBase::Environment::get().getWorld()->teleportToClosestMarker(target, marker);
-                anim->removeEffect(effectId);
-                const ESM::Static* fx = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>()
-                    .search("VFX_Summon_end");
-                if (fx)
-                    anim->addEffect("meshes\\" + fx->mModel, -1);
-                return true;
-            }
-            else if (effectId == ESM::MagicEffect::Mark)
-            {
-                if (teleportingEnabled)
-                {
-                    MWBase::Environment::get().getWorld()->getPlayer().markPosition(
-                                target.getCell(), target.getRefData().getPosition());
-                }
-                else if (caster == getPlayer())
-                {
-                    MWBase::Environment::get().getWindowManager()->messageBox("#{sTeleportDisabled}");
-                }
-                return true;
-            }
-            else if (effectId == ESM::MagicEffect::Recall)
-            {
-                if (!teleportingEnabled)
-                {
-                    if (caster == getPlayer())
-                        MWBase::Environment::get().getWindowManager()->messageBox("#{sTeleportDisabled}");
-                    return true;
-                }
-
-                MWWorld::CellStore* markedCell = nullptr;
-                ESM::Position markedPosition;
-
-                MWBase::Environment::get().getWorld()->getPlayer().getMarkedPosition(markedCell, markedPosition);
-                if (markedCell)
-                {
-                    MWWorld::ActionTeleport action(markedCell->isExterior() ? "" : markedCell->getCell()->mName,
-                                            markedPosition, false);
-                    action.execute(target);
-                    anim->removeEffect(effectId);
-                }
-                return true;
-            }
-        }
-        return false;
     }
 
-
     bool CastSpell::cast(const std::string &id)
     {
         const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
@@ -479,7 +259,7 @@ namespace MWMechanics
         throw std::runtime_error("ID type cannot be casted");
     }
 
-    bool CastSpell::cast(const MWWorld::Ptr &item, bool launchProjectile)
+    bool CastSpell::cast(const MWWorld::Ptr &item, int slot, bool launchProjectile)
     {
         std::string enchantmentName = item.getClass().getEnchantment(item);
         if (enchantmentName.empty())
@@ -490,7 +270,7 @@ namespace MWMechanics
 
         const ESM::Enchantment* enchantment = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().find(enchantmentName);
 
-        mStack = false;
+        mSlot = slot;
 
         bool godmode = mCaster == MWMechanics::getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState();
         bool isProjectile = false;
@@ -570,7 +350,7 @@ namespace MWMechanics
     {
         mSourceName = potion->mName;
         mId = potion->mId;
-        mStack = true;
+        mType = ESM::ActiveSpells::Type_Consumable;
 
         inflict(mCaster, mCaster, potion->mEffects, ESM::RT_Self);
 
@@ -581,7 +361,6 @@ namespace MWMechanics
     {
         mSourceName = spell->mName;
         mId = spell->mId;
-        mStack = false;
 
         const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
 
@@ -656,7 +435,7 @@ namespace MWMechanics
     bool CastSpell::cast (const ESM::Ingredient* ingredient)
     {
         mId = ingredient->mId;
-        mStack = true;
+        mType = ESM::ActiveSpells::Type_Consumable;
         mSourceName = ingredient->mName;
 
         ESM::ENAMstruct effect;
@@ -799,4 +578,36 @@ namespace MWMechanics
                 sndMgr->playSound3D(mCaster, schools[effect->mData.mSchool]+" cast", 1.0f, 1.0f);
         }
     }
+
+    void playEffects(const MWWorld::Ptr& target, const ESM::MagicEffect& magicEffect, bool playNonLooping)
+    {
+        if (playNonLooping)
+        {
+            static const std::string schools[] = {
+                "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration"
+            };
+
+            MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
+            if(!magicEffect.mHitSound.empty())
+                sndMgr->playSound3D(target, magicEffect.mHitSound, 1.0f, 1.0f);
+            else
+                sndMgr->playSound3D(target, schools[magicEffect.mData.mSchool]+" hit", 1.0f, 1.0f);
+        }
+
+        // Add VFX
+        const ESM::Static* castStatic;
+        if (!magicEffect.mHit.empty())
+            castStatic = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>().find (magicEffect.mHit);
+        else
+            castStatic = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>().find ("VFX_DefaultHit");
+
+        bool loop = (magicEffect.mData.mFlags & ESM::MagicEffect::ContinuousVfx) != 0;
+        MWRender::Animation* anim = MWBase::Environment::get().getWorld()->getAnimation(target);
+        if(anim && !castStatic->mModel.empty())
+        {
+            // Don't play particle VFX unless the effect is new or it should be looping.
+            if (playNonLooping || loop)
+                anim->addEffect("meshes\\" + castStatic->mModel, magicEffect.mIndex, loop, "", magicEffect.mParticle);
+        }
+    }
 }
diff --git a/apps/openmw/mwmechanics/spellcasting.hpp b/apps/openmw/mwmechanics/spellcasting.hpp
index cc525d2db6..a21ea33e0b 100644
--- a/apps/openmw/mwmechanics/spellcasting.hpp
+++ b/apps/openmw/mwmechanics/spellcasting.hpp
@@ -1,6 +1,7 @@
 #ifndef MWMECHANICS_SPELLCASTING_H
 #define MWMECHANICS_SPELLCASTING_H
 
+#include <components/esm/activespells.hpp>
 #include <components/esm/effectlist.hpp>
 
 #include "../mwworld/ptr.hpp"
@@ -11,6 +12,7 @@ namespace ESM
     struct Ingredient;
     struct Potion;
     struct EffectList;
+    struct MagicEffect;
 }
 
 namespace MWMechanics
@@ -26,13 +28,14 @@ namespace MWMechanics
         void playSpellCastingEffects(const std::vector<ESM::ENAMstruct>& effects);
 
     public:
-        bool mStack{false};
         std::string mId; // ID of spell, potion, item etc
         std::string mSourceName; // Display name for spell, potion, etc
         osg::Vec3f mHitPosition{0,0,0}; // Used for spawning area orb
         bool mAlwaysSucceed{false}; // Always succeed spells casted by NPCs/creatures regardless of their chance (default: false)
         bool mFromProjectile; // True if spell is cast by enchantment of some projectile (arrow, bolt or thrown weapon)
         bool mManualSpell; // True if spell is casted from script and ignores some checks (mana level, success chance, etc.)
+        int mSlot{0};
+        ESM::ActiveSpells::EffectType mType{ESM::ActiveSpells::Type_Temporary};
 
     public:
         CastSpell(const MWWorld::Ptr& caster, const MWWorld::Ptr& target, const bool fromProjectile=false, const bool manualSpell=false);
@@ -41,7 +44,7 @@ namespace MWMechanics
 
         /// @note mCaster must be an actor
         /// @param launchProjectile If set to false, "on target" effects are directly applied instead of being launched as projectile originating from the caster.
-        bool cast (const MWWorld::Ptr& item, bool launchProjectile=true);
+        bool cast (const MWWorld::Ptr& item, int slot, bool launchProjectile=true);
 
         /// @note mCaster must be an NPC
         bool cast (const ESM::Ingredient* ingredient);
@@ -60,11 +63,9 @@ namespace MWMechanics
         /// @note \a caster can be any type of object, or even an empty object.
         void inflict (const MWWorld::Ptr& target, const MWWorld::Ptr& caster,
                       const ESM::EffectList& effects, ESM::RangeType range, bool reflected=false, bool exploded=false);
-
-        /// @note \a caster can be any type of object, or even an empty object.
-        /// @return was the target suitable for the effect?
-        bool applyInstantEffect (const MWWorld::Ptr& target, const MWWorld::Ptr& caster, const MWMechanics::EffectKey& effect, float magnitude);
     };
+
+    void playEffects(const MWWorld::Ptr& target, const ESM::MagicEffect& magicEffect, bool playNonLooping = true);
 }
 
 #endif
diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp
new file mode 100644
index 0000000000..895e908bd2
--- /dev/null
+++ b/apps/openmw/mwmechanics/spelleffects.cpp
@@ -0,0 +1,1032 @@
+#include "spelleffects.hpp"
+
+#include <algorithm>
+
+#include <components/esm/loadmgef.hpp>
+#include <components/misc/rng.hpp>
+#include <components/settings/settings.hpp>
+
+#include "../mwbase/environment.hpp"
+#include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/soundmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
+
+#include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/aifollow.hpp"
+#include "../mwmechanics/npcstats.hpp"
+#include "../mwmechanics/spellresistance.hpp"
+#include "../mwmechanics/summoning.hpp"
+
+#include "../mwrender/animation.hpp"
+
+#include "../mwworld/actionequip.hpp"
+#include "../mwworld/actionteleport.hpp"
+#include "../mwworld/cellstore.hpp"
+#include "../mwworld/class.hpp"
+#include "../mwworld/esmstore.hpp"
+#include "../mwworld/inventorystore.hpp"
+#include "../mwworld/player.hpp"
+
+namespace
+{
+    float roll(const ESM::ActiveEffect& effect)
+    {
+        if(effect.mMinMagnitude == effect.mMaxMagnitude)
+            return effect.mMinMagnitude;
+        return effect.mMinMagnitude + Misc::Rng::rollDice(effect.mMaxMagnitude - effect.mMinMagnitude + 1);
+    }
+
+    void modifyAiSetting(const MWWorld::Ptr& target, const ESM::ActiveEffect& effect, ESM::MagicEffect::Effects creatureEffect, MWMechanics::CreatureStats::AiSetting setting, float magnitude, bool& invalid)
+    {
+        if(target == MWMechanics::getPlayer() || (effect.mEffectId == creatureEffect) == target.getClass().isNpc())
+            invalid = true;
+        else
+        {
+            auto& creatureStats = target.getClass().getCreatureStats(target);
+            auto stat = creatureStats.getAiSetting(setting);
+            stat.setModifier(static_cast<int>(stat.getModifier() - magnitude));
+            creatureStats.setAiSetting(setting, stat);
+        }
+    }
+
+    void adjustDynamicStat(const MWWorld::Ptr& target, int index, float magnitude, bool allowDecreaseBelowZero = false, bool allowIncreaseAboveModified = false)
+    {
+        auto& creatureStats = target.getClass().getCreatureStats(target);
+        auto stat = creatureStats.getDynamic(index);
+        stat.setCurrent(stat.getCurrent() + magnitude, allowDecreaseBelowZero, allowIncreaseAboveModified);
+        creatureStats.setDynamic(index, stat);
+    }
+
+    void modDynamicStat(const MWWorld::Ptr& target, int index, float magnitude)
+    {
+        auto& creatureStats = target.getClass().getCreatureStats(target);
+        auto stat = creatureStats.getDynamic(index);
+        float current = stat.getCurrent();
+        stat.setModified(stat.getModified() - magnitude, 0);
+        stat.setCurrentModified(stat.getCurrentModified() - magnitude);
+        stat.setCurrent(current - magnitude);
+        creatureStats.setDynamic(index, stat);
+    }
+
+    void damageAttribute(const MWWorld::Ptr& target, const ESM::ActiveEffect& effect, float magnitude)
+    {
+        auto& creatureStats = target.getClass().getCreatureStats(target);
+        auto attr = creatureStats.getAttribute(effect.mArg);
+        attr.damage(magnitude);
+        creatureStats.setAttribute(effect.mArg, attr);
+    }
+
+    void restoreAttribute(const MWWorld::Ptr& target, const ESM::ActiveEffect& effect, float magnitude)
+    {
+        auto& creatureStats = target.getClass().getCreatureStats(target);
+        auto attr = creatureStats.getAttribute(effect.mArg);
+        attr.restore(magnitude);
+        creatureStats.setAttribute(effect.mArg, attr);
+    }
+
+    void fortifyAttribute(const MWWorld::Ptr& target, const ESM::ActiveEffect& effect, float magnitude)
+    {
+        auto& creatureStats = target.getClass().getCreatureStats(target);
+        auto attr = creatureStats.getAttribute(effect.mArg);
+        attr.setModifier(attr.getModifier() + magnitude);
+        creatureStats.setAttribute(effect.mArg, attr);
+    }
+
+    void damageSkill(const MWWorld::Ptr& target, const ESM::ActiveEffect& effect, float magnitude)
+    {
+        auto& npcStats = target.getClass().getNpcStats(target);
+        auto& skill = npcStats.getSkill(effect.mArg);
+        skill.damage(magnitude);
+    }
+
+    void restoreSkill(const MWWorld::Ptr& target, const ESM::ActiveEffect& effect, float magnitude)
+    {
+        auto& npcStats = target.getClass().getNpcStats(target);
+        auto& skill = npcStats.getSkill(effect.mArg);
+        skill.restore(magnitude);
+    }
+
+    void fortifySkill(const MWWorld::Ptr& target, const ESM::ActiveEffect& effect, float magnitude)
+    {
+        auto& npcStats = target.getClass().getNpcStats(target);
+        auto& skill = npcStats.getSkill(effect.mArg);
+        skill.setModifier(skill.getModifier() + magnitude);
+    }
+
+    bool disintegrateSlot(const MWWorld::Ptr& ptr, int slot, float disintegrate)
+    {
+        MWWorld::InventoryStore& inv = ptr.getClass().getInventoryStore(ptr);
+        MWWorld::ContainerStoreIterator item = inv.getSlot(slot);
+
+        if (item != inv.end() && (item.getType() == MWWorld::ContainerStore::Type_Armor || item.getType() == MWWorld::ContainerStore::Type_Weapon))
+        {
+            if (!item->getClass().hasItemHealth(*item))
+                return false;
+            int charge = item->getClass().getItemHealth(*item);
+            if (charge == 0)
+                return false;
+
+            // Store remainder of disintegrate amount (automatically subtracted if > 1)
+            item->getCellRef().applyChargeRemainderToBeSubtracted(disintegrate - std::floor(disintegrate));
+
+            charge = item->getClass().getItemHealth(*item);
+            charge -= std::min(static_cast<int>(disintegrate), charge);
+            item->getCellRef().setCharge(charge);
+
+            if (charge == 0)
+            {
+                // Will unequip the broken item and try to find a replacement
+                if (ptr != MWMechanics::getPlayer())
+                    inv.autoEquip(ptr);
+                else
+                    inv.unequipItem(*item, ptr);
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    int getBoundItemSlot(const MWWorld::Ptr& boundPtr)
+    {
+        const auto [slots, _] = boundPtr.getClass().getEquipmentSlots(boundPtr);
+        if(!slots.empty())
+            return slots[0];
+        return -1;
+    }
+
+    void addBoundItem(const std::string& itemId, const MWWorld::Ptr& actor)
+    {
+        MWWorld::InventoryStore& store = actor.getClass().getInventoryStore(actor);
+        MWWorld::Ptr boundPtr = *store.MWWorld::ContainerStore::add(itemId, 1, actor);
+
+        int slot = getBoundItemSlot(boundPtr);
+        auto prevItem = slot >= 0 ? store.getSlot(slot) : store.end();
+
+        MWWorld::ActionEquip action(boundPtr);
+        action.execute(actor);
+
+        if (actor != MWMechanics::getPlayer())
+            return;
+
+        MWWorld::Ptr newItem;
+        auto it = slot >= 0 ? store.getSlot(slot) : store.end();
+        // Equip can fail because beast races cannot equip boots/helmets
+        if(it != store.end())
+            newItem = *it;
+
+        if (newItem.isEmpty() || boundPtr != newItem)
+            return;
+
+        MWWorld::Player& player = MWBase::Environment::get().getWorld()->getPlayer();
+
+        // change draw state only if the item is in player's right hand
+        if (slot == MWWorld::InventoryStore::Slot_CarriedRight)
+            player.setDrawState(MWMechanics::DrawState_Weapon);
+
+        if (prevItem != store.end())
+            player.setPreviousItem(itemId, prevItem->getCellRef().getRefId());
+    }
+
+    void removeBoundItem(const std::string& itemId, const MWWorld::Ptr& actor)
+    {
+        MWWorld::InventoryStore& store = actor.getClass().getInventoryStore(actor);
+        auto item = std::find_if(store.begin(), store.end(), [&] (const auto& it)
+        {
+            return Misc::StringUtils::ciEqual(it.getCellRef().getRefId(), itemId);
+        });
+        if(item == store.end())
+            return;
+        int slot = getBoundItemSlot(*item);
+
+        auto currentItem = store.getSlot(slot);
+
+        bool wasEquipped = currentItem != store.end() && Misc::StringUtils::ciEqual(currentItem->getCellRef().getRefId(), itemId);
+
+        if (actor != MWMechanics::getPlayer())
+        {
+            store.remove(itemId, 1, actor);
+
+            // Equip a replacement
+            if (!wasEquipped)
+                return;
+
+            std::string type = currentItem->getTypeName();
+            if (type != typeid(ESM::Weapon).name() && type != typeid(ESM::Armor).name() && type != typeid(ESM::Clothing).name())
+                return;
+
+            if (actor.getClass().getCreatureStats(actor).isDead())
+                return;
+
+            if (!actor.getClass().hasInventoryStore(actor))
+                return;
+
+            if (actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
+                return;
+
+            actor.getClass().getInventoryStore(actor).autoEquip(actor);
+
+            return;
+        }
+
+        MWWorld::Player& player = MWBase::Environment::get().getWorld()->getPlayer();
+        std::string prevItemId = player.getPreviousItem(itemId);
+        player.erasePreviousItem(itemId);
+
+        if (!prevItemId.empty() && wasEquipped)
+        {
+            // Find previous item (or its replacement) by id.
+            // we should equip previous item only if expired bound item was equipped.
+            MWWorld::Ptr prevItem = store.findReplacement(prevItemId);
+            if (!prevItem.isEmpty())
+            {
+                MWWorld::ActionEquip action(prevItem);
+                action.execute(actor);
+            }
+        }
+
+        store.remove(itemId, 1, actor);
+    }
+
+    bool isCorprusEffect(const MWMechanics::ActiveSpells::ActiveEffect& effect, bool harmfulOnly = false)
+    {
+        if(effect.mFlags & ESM::ActiveEffect::Flag_Applied && effect.mEffectId != ESM::MagicEffect::Corprus)
+        {
+            const auto* magicEffect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effect.mEffectId);
+            if(magicEffect->mData.mFlags & ESM::MagicEffect::Flags::AppliedOnce && (!harmfulOnly || magicEffect->mData.mFlags & ESM::MagicEffect::Flags::Harmful))
+                return true;
+        }
+        return false;
+    }
+
+    static const std::map<int, std::string> sBoundItemsMap{
+        {ESM::MagicEffect::BoundBattleAxe, "sMagicBoundBattleAxeID"},
+        {ESM::MagicEffect::BoundBoots, "sMagicBoundBootsID"},
+        {ESM::MagicEffect::BoundCuirass, "sMagicBoundCuirassID"},
+        {ESM::MagicEffect::BoundDagger, "sMagicBoundDaggerID"},
+        {ESM::MagicEffect::BoundGloves, "sMagicBoundLeftGauntletID"},
+        {ESM::MagicEffect::BoundHelm, "sMagicBoundHelmID"},
+        {ESM::MagicEffect::BoundLongbow, "sMagicBoundLongbowID"},
+        {ESM::MagicEffect::BoundLongsword, "sMagicBoundLongswordID"},
+        {ESM::MagicEffect::BoundMace, "sMagicBoundMaceID"},
+        {ESM::MagicEffect::BoundShield, "sMagicBoundShieldID"},
+        {ESM::MagicEffect::BoundSpear, "sMagicBoundSpearID"}
+    };
+}
+
+namespace MWMechanics
+{
+
+void applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, const ActiveSpells::ActiveSpellParams& spellParams, ESM::ActiveEffect& effect, bool& invalid, bool& receivedMagicDamage)
+{
+    const auto world = MWBase::Environment::get().getWorld();
+    bool godmode = target == getPlayer() && world->getGodModeState();
+    switch(effect.mEffectId)
+    {
+        case ESM::MagicEffect::CureCommonDisease:
+            target.getClass().getCreatureStats(target).getSpells().purgeCommonDisease();
+            break;
+        case ESM::MagicEffect::CureBlightDisease:
+            target.getClass().getCreatureStats(target).getSpells().purgeBlightDisease();
+            break;
+        case ESM::MagicEffect::RemoveCurse:
+            target.getClass().getCreatureStats(target).getSpells().purgeCurses();
+            break;
+        case ESM::MagicEffect::CureCorprusDisease:
+            target.getClass().getCreatureStats(target).getActiveSpells().purgeEffect(target, ESM::MagicEffect::Corprus);
+            break;
+        case ESM::MagicEffect::CurePoison:
+            target.getClass().getCreatureStats(target).getActiveSpells().purgeEffect(target, ESM::MagicEffect::Poison);
+            break;
+        case ESM::MagicEffect::CureParalyzation:
+            target.getClass().getCreatureStats(target).getActiveSpells().purgeEffect(target, ESM::MagicEffect::Paralyze);
+            break;
+        case ESM::MagicEffect::Dispel:
+            // Dispel removes entire spells at once
+            target.getClass().getCreatureStats(target).getActiveSpells().purge([magnitude=effect.mMagnitude] (const ActiveSpells::ActiveSpellParams& params)
+            {
+                if(params.getType() == ESM::ActiveSpells::Type_Temporary)
+                {
+                    const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(params.getId());
+                    if(spell && spell->mData.mType == ESM::Spell::ST_Spell)
+                        return Misc::Rng::roll0to99() < magnitude;
+                }
+                return false;
+            }, target);
+            break;
+        case ESM::MagicEffect::AlmsiviIntervention:
+        case ESM::MagicEffect::DivineIntervention:
+            if (target != getPlayer())
+                invalid = true;
+            else if (world->isTeleportingEnabled())
+            {
+                auto marker = (effect.mEffectId == ESM::MagicEffect::DivineIntervention) ? "divinemarker" : "templemarker";
+                world->teleportToClosestMarker(target, marker);
+                if(!caster.isEmpty())
+                {
+                    MWRender::Animation* anim = world->getAnimation(caster);
+                    anim->removeEffect(effect.mEffectId);
+                    const ESM::Static* fx = world->getStore().get<ESM::Static>().search("VFX_Summon_end");
+                    if (fx)
+                        anim->addEffect("meshes\\" + fx->mModel, -1);
+                }
+            }
+            else if (caster == getPlayer())
+                MWBase::Environment::get().getWindowManager()->messageBox("#{sTeleportDisabled}");
+            break;
+        case ESM::MagicEffect::Mark:
+            if (target != getPlayer())
+                invalid = true;
+            else if (world->isTeleportingEnabled())
+                world->getPlayer().markPosition(target.getCell(), target.getRefData().getPosition());
+            else if (caster == getPlayer())
+                MWBase::Environment::get().getWindowManager()->messageBox("#{sTeleportDisabled}");
+            break;
+        case ESM::MagicEffect::Recall:
+            if (target != getPlayer())
+                invalid = true;
+            else if (world->isTeleportingEnabled())
+            {
+                MWWorld::CellStore* markedCell = nullptr;
+                ESM::Position markedPosition;
+
+                world->getPlayer().getMarkedPosition(markedCell, markedPosition);
+                if (markedCell)
+                {
+                    MWWorld::ActionTeleport action(markedCell->isExterior() ? "" : markedCell->getCell()->mName, markedPosition, false);
+                    action.execute(target);
+                    if(!caster.isEmpty())
+                    {
+                        MWRender::Animation* anim = world->getAnimation(caster);
+                        anim->removeEffect(effect.mEffectId);
+                    }
+                }
+            }
+            else if (caster == getPlayer())
+                MWBase::Environment::get().getWindowManager()->messageBox("#{sTeleportDisabled}");
+            break;
+        case ESM::MagicEffect::CommandCreature:
+        case ESM::MagicEffect::CommandHumanoid:
+            if(caster.isEmpty() || !caster.getClass().isActor() || target == getPlayer() || (effect.mEffectId == ESM::MagicEffect::CommandCreature) == target.getClass().isNpc())
+                invalid = true;
+            else if(effect.mMagnitude >= target.getClass().getCreatureStats(target).getLevel())
+            {
+                MWMechanics::AiFollow package(caster, true);
+                target.getClass().getCreatureStats(target).getAiSequence().stack(package, target);
+            }
+            break;
+        case ESM::MagicEffect::ExtraSpell:
+            if(target.getClass().hasInventoryStore(target))
+            {
+                auto& store = target.getClass().getInventoryStore(target);
+                store.unequipAll(target);
+            }
+            else
+                invalid = true;
+            break;
+        case ESM::MagicEffect::TurnUndead:
+            if(target.getClass().isNpc() || target.get<ESM::Creature>()->mBase->mData.mType != ESM::Creature::Undead)
+                invalid = true;
+            else
+            {
+                auto& creatureStats = target.getClass().getCreatureStats(target);
+                Stat<int> stat = creatureStats.getAiSetting(CreatureStats::AI_Flee);
+                stat.setModifier(static_cast<int>(stat.getModifier() + effect.mMagnitude));
+                creatureStats.setAiSetting(CreatureStats::AI_Flee, stat);
+            }
+            break;
+        case ESM::MagicEffect::FrenzyCreature:
+        case ESM::MagicEffect::FrenzyHumanoid:
+            modifyAiSetting(target, effect, ESM::MagicEffect::FrenzyCreature, CreatureStats::AI_Fight, -effect.mMagnitude, invalid);
+            break;
+        case ESM::MagicEffect::CalmCreature:
+        case ESM::MagicEffect::CalmHumanoid:
+            modifyAiSetting(target, effect, ESM::MagicEffect::CalmCreature, CreatureStats::AI_Fight, effect.mMagnitude, invalid);
+            if(!invalid && effect.mMagnitude > 0)
+            {
+                auto& creatureStats = target.getClass().getCreatureStats(target);
+                creatureStats.getAiSequence().stopCombat();
+            }
+            break;
+        case ESM::MagicEffect::DemoralizeCreature:
+        case ESM::MagicEffect::DemoralizeHumanoid:
+            modifyAiSetting(target, effect, ESM::MagicEffect::DemoralizeCreature, CreatureStats::AI_Flee, effect.mMagnitude, invalid);
+            break;
+        case ESM::MagicEffect::RallyCreature:
+        case ESM::MagicEffect::RallyHumanoid:
+            modifyAiSetting(target, effect, ESM::MagicEffect::RallyCreature, CreatureStats::AI_Flee, -effect.mMagnitude, invalid);
+            break;
+        case ESM::MagicEffect::SummonScamp:
+        case ESM::MagicEffect::SummonClannfear:
+        case ESM::MagicEffect::SummonDaedroth:
+        case ESM::MagicEffect::SummonDremora:
+        case ESM::MagicEffect::SummonAncestralGhost:
+        case ESM::MagicEffect::SummonSkeletalMinion:
+        case ESM::MagicEffect::SummonBonewalker:
+        case ESM::MagicEffect::SummonGreaterBonewalker:
+        case ESM::MagicEffect::SummonBonelord:
+        case ESM::MagicEffect::SummonWingedTwilight:
+        case ESM::MagicEffect::SummonHunger:
+        case ESM::MagicEffect::SummonGoldenSaint:
+        case ESM::MagicEffect::SummonFlameAtronach:
+        case ESM::MagicEffect::SummonFrostAtronach:
+        case ESM::MagicEffect::SummonStormAtronach:
+        case ESM::MagicEffect::SummonCenturionSphere:
+        case ESM::MagicEffect::SummonFabricant:
+        case ESM::MagicEffect::SummonWolf:
+        case ESM::MagicEffect::SummonBear:
+        case ESM::MagicEffect::SummonBonewolf:
+        case ESM::MagicEffect::SummonCreature04:
+        case ESM::MagicEffect::SummonCreature05:
+            if(!target.isInCell())
+                invalid = true;
+            else
+                effect.mArg = summonCreature(effect.mEffectId, target);
+            break;
+        case ESM::MagicEffect::BoundGloves:
+            if(!target.getClass().hasInventoryStore(target))
+            {
+                invalid = true;
+                break;
+            }
+            addBoundItem(world->getStore().get<ESM::GameSetting>().find("sMagicBoundRightGauntletID")->mValue.getString(), target);
+            // left gauntlet added below
+        case ESM::MagicEffect::BoundDagger:
+        case ESM::MagicEffect::BoundLongsword:
+        case ESM::MagicEffect::BoundMace:
+        case ESM::MagicEffect::BoundBattleAxe:
+        case ESM::MagicEffect::BoundSpear:
+        case ESM::MagicEffect::BoundLongbow:
+        case ESM::MagicEffect::BoundCuirass:
+        case ESM::MagicEffect::BoundHelm:
+        case ESM::MagicEffect::BoundBoots:
+        case ESM::MagicEffect::BoundShield:
+            if(!target.getClass().hasInventoryStore(target))
+                invalid = true;
+            else
+            {
+                const std::string& item = sBoundItemsMap.at(effect.mEffectId);
+                addBoundItem(world->getStore().get<ESM::GameSetting>().find(item)->mValue.getString(), target);
+            }
+            break;
+        case ESM::MagicEffect::FireDamage:
+        case ESM::MagicEffect::ShockDamage:
+        case ESM::MagicEffect::FrostDamage:
+        case ESM::MagicEffect::DamageHealth:
+        case ESM::MagicEffect::Poison:
+        case ESM::MagicEffect::DamageMagicka:
+        case ESM::MagicEffect::DamageFatigue:
+            if(!godmode)
+            {
+                int index = 0;
+                if(effect.mEffectId == ESM::MagicEffect::DamageMagicka)
+                    index = 1;
+                else if(effect.mEffectId == ESM::MagicEffect::DamageFatigue)
+                    index = 2;
+                // Damage "Dynamic" abilities reduce the base value
+                if(spellParams.getType() == ESM::ActiveSpells::Type_Ability)
+                    modDynamicStat(target, index, effect.mMagnitude);
+                else
+                {
+                    static const bool uncappedDamageFatigue = Settings::Manager::getBool("uncapped damage fatigue", "Game");
+                    adjustDynamicStat(target, index, -effect.mMagnitude, index == 2 && uncappedDamageFatigue);
+                    if(index == 0)
+                        receivedMagicDamage = true;
+                }
+            }
+            break;
+        case ESM::MagicEffect::DamageAttribute:
+            if(!godmode)
+                damageAttribute(target, effect, effect.mMagnitude);
+            break;
+        case ESM::MagicEffect::DamageSkill:
+            if(!target.getClass().isNpc())
+                invalid = true;
+            else if(!godmode)
+            {
+                // Damage Skill abilities reduce base skill :todd:
+                if(spellParams.getType() == ESM::ActiveSpells::Type_Ability)
+                {
+                    auto& npcStats = target.getClass().getNpcStats(target);
+                    SkillValue& skill = npcStats.getSkill(effect.mArg);
+                    // Damage Skill abilities reduce base skill :todd:
+                    skill.setBase(std::max(skill.getBase() - effect.mMagnitude, 0.f));
+                }
+                else
+                    damageSkill(target, effect, effect.mMagnitude);
+            }
+            break;
+        case ESM::MagicEffect::RestoreAttribute:
+            restoreAttribute(target, effect, effect.mMagnitude);
+            break;
+        case ESM::MagicEffect::RestoreSkill:
+            if(!target.getClass().isNpc())
+                invalid = true;
+            else
+                restoreSkill(target, effect, effect.mMagnitude);
+            break;
+        case ESM::MagicEffect::RestoreHealth:
+        case ESM::MagicEffect::RestoreMagicka:
+        case ESM::MagicEffect::RestoreFatigue:
+            adjustDynamicStat(target, effect.mEffectId - ESM::MagicEffect::RestoreHealth, effect.mMagnitude);
+            break;
+        case ESM::MagicEffect::SunDamage:
+            {
+                // isInCell shouldn't be needed, but updateActor called during game start
+                if (!target.isInCell() || !target.getCell()->isExterior() || godmode)
+                    break;
+                float time = world->getTimeStamp().getHour();
+                float timeDiff = std::min(7.f, std::max(0.f, std::abs(time - 13)));
+                float damageScale = 1.f - timeDiff / 7.f;
+                // When cloudy, the sun damage effect is halved
+                static float fMagicSunBlockedMult = world->getStore().get<ESM::GameSetting>().find("fMagicSunBlockedMult")->mValue.getFloat();
+
+                int weather = world->getCurrentWeather();
+                if (weather > 1)
+                    damageScale *= fMagicSunBlockedMult;
+                float damage = effect.mMagnitude * damageScale;
+                adjustDynamicStat(target, 0, -damage);
+                if (damage > 0.f)
+                    receivedMagicDamage = true;
+            }
+            break;
+        case ESM::MagicEffect::DrainHealth:
+        case ESM::MagicEffect::DrainMagicka:
+        case ESM::MagicEffect::DrainFatigue:
+            if(!godmode)
+            {
+                static const bool uncappedDamageFatigue = Settings::Manager::getBool("uncapped damage fatigue", "Game");
+                int index = effect.mEffectId - ESM::MagicEffect::DrainHealth;
+                adjustDynamicStat(target, index, -effect.mMagnitude, uncappedDamageFatigue && index == 2);
+                if(index == 0)
+                    receivedMagicDamage = true;
+            }
+            break;
+        case ESM::MagicEffect::FortifyHealth:
+        case ESM::MagicEffect::FortifyMagicka:
+        case ESM::MagicEffect::FortifyFatigue:
+            if(spellParams.getType() == ESM::ActiveSpells::Type_Ability)
+                modDynamicStat(target, effect.mEffectId - ESM::MagicEffect::FortifyHealth, effect.mMagnitude);
+            else
+                adjustDynamicStat(target, effect.mEffectId - ESM::MagicEffect::FortifyHealth, effect.mMagnitude, false, true);
+            break;
+        case ESM::MagicEffect::DrainAttribute:
+            if(!godmode)
+                damageAttribute(target, effect, effect.mMagnitude);
+            break;
+        case ESM::MagicEffect::FortifyAttribute:
+            // Abilities affect base stats, but not for drain
+            if(spellParams.getType() == ESM::ActiveSpells::Type_Ability)
+            {
+                auto& creatureStats = target.getClass().getCreatureStats(target);
+                AttributeValue attr = creatureStats.getAttribute(effect.mArg);
+                attr.setBase(attr.getBase() + effect.mMagnitude);
+                creatureStats.setAttribute(effect.mArg, attr);
+            }
+            else
+                fortifyAttribute(target, effect, effect.mMagnitude);
+            break;
+        case ESM::MagicEffect::DrainSkill:
+            if(!target.getClass().isNpc())
+                invalid = true;
+            else if(!godmode)
+                damageSkill(target, effect, effect.mMagnitude);
+            break;
+        case ESM::MagicEffect::FortifySkill:
+            if(!target.getClass().isNpc())
+                invalid = true;
+            else if(spellParams.getType() == ESM::ActiveSpells::Type_Ability)
+            {
+                // Abilities affect base stats, but not for drain
+                auto& npcStats = target.getClass().getNpcStats(target);
+                auto& skill = npcStats.getSkill(effect.mArg);
+                skill.setBase(skill.getBase() + effect.mMagnitude);
+            }
+            else
+                fortifySkill(target, effect, effect.mMagnitude);
+            break;
+        case ESM::MagicEffect::FortifyMaximumMagicka:
+            target.getClass().getCreatureStats(target).setNeedRecalcDynamicStats(true);
+            break;
+        case ESM::MagicEffect::AbsorbHealth:
+        case ESM::MagicEffect::AbsorbMagicka:
+        case ESM::MagicEffect::AbsorbFatigue:
+            if(!godmode)
+            {
+                int index = effect.mEffectId - ESM::MagicEffect::AbsorbHealth;
+                adjustDynamicStat(target, index, -effect.mMagnitude);
+                if(!caster.isEmpty())
+                    adjustDynamicStat(caster, index, effect.mMagnitude);
+                if(index == 0)
+                    receivedMagicDamage = true;
+            }
+            break;
+        case ESM::MagicEffect::AbsorbAttribute:
+            if(!godmode)
+            {
+                damageAttribute(target, effect, effect.mMagnitude);
+                if(!caster.isEmpty())
+                    fortifyAttribute(caster, effect, effect.mMagnitude);
+            }
+            break;
+        case ESM::MagicEffect::AbsorbSkill:
+            if(!target.getClass().isNpc())
+                invalid = true;
+            else if(!godmode)
+            {
+                damageSkill(target, effect, effect.mMagnitude);
+                if(!caster.isEmpty())
+                    fortifySkill(caster, effect, effect.mMagnitude);
+            }
+            break;
+        case ESM::MagicEffect::DisintegrateArmor:
+        {
+            if (!target.getClass().hasInventoryStore(target))
+            {
+                invalid = true;
+                break;
+            }
+            if (godmode)
+                break;
+            static const std::array<int, 9>  priorities
+            {
+                MWWorld::InventoryStore::Slot_CarriedLeft,
+                MWWorld::InventoryStore::Slot_Cuirass,
+                MWWorld::InventoryStore::Slot_LeftPauldron,
+                MWWorld::InventoryStore::Slot_RightPauldron,
+                MWWorld::InventoryStore::Slot_LeftGauntlet,
+                MWWorld::InventoryStore::Slot_RightGauntlet,
+                MWWorld::InventoryStore::Slot_Helmet,
+                MWWorld::InventoryStore::Slot_Greaves,
+                MWWorld::InventoryStore::Slot_Boots
+            };
+            for (const int priority : priorities)
+            {
+                if (disintegrateSlot(target, priority, effect.mMagnitude))
+                    break;
+            }
+            break;
+        }
+        case ESM::MagicEffect::DisintegrateWeapon:
+            if (!target.getClass().hasInventoryStore(target))
+            {
+                invalid = true;
+                break;
+            }
+            if (!godmode)
+                disintegrateSlot(target, MWWorld::InventoryStore::Slot_CarriedRight, effect.mMagnitude);
+            break;
+    }
+}
+
+bool applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, ActiveSpells::ActiveSpellParams& spellParams, ESM::ActiveEffect& effect, float dt)
+{
+    const auto world = MWBase::Environment::get().getWorld();
+    bool invalid = false;
+    bool receivedMagicDamage = false;
+    if(effect.mEffectId == ESM::MagicEffect::Corprus && spellParams.shouldWorsen())
+    {
+        spellParams.worsen();
+        for(auto& otherEffect : spellParams.getEffects())
+        {
+            if(isCorprusEffect(otherEffect))
+                applyMagicEffect(target, caster, spellParams, otherEffect, invalid, receivedMagicDamage);
+        }
+        if(target == getPlayer())
+            MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicCorprusWorsens}");
+        return false;
+    }
+    else if(effect.mEffectId == ESM::MagicEffect::Levitate && !world->isLevitationEnabled())
+    {
+        if(target == getPlayer())
+            MWBase::Environment::get().getWindowManager()->messageBox ("#{sLevitateDisabled}");
+        return true;
+    }
+    const auto* magicEffect = world->getStore().get<ESM::MagicEffect>().find(effect.mEffectId);
+    if(effect.mFlags & ESM::ActiveEffect::Flag_Applied && magicEffect->mData.mFlags & ESM::MagicEffect::Flags::AppliedOnce)
+    {
+        effect.mTimeLeft -= dt;
+        return false;
+    }
+    if(effect.mEffectId == ESM::MagicEffect::Lock)
+    {
+        if(target.getClass().canLock(target))
+        {
+            MWRender::Animation* animation = world->getAnimation(target);
+            if(animation)
+                animation->addSpellCastGlow(magicEffect);
+            int magnitude = static_cast<int>(roll(effect));
+            if(target.getCellRef().getLockLevel() < magnitude) //If the door is not already locked to a higher value, lock it to spell magnitude
+            {
+                if(caster == getPlayer())
+                    MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicLockSuccess}");
+                target.getCellRef().lock(magnitude);
+            }
+        }
+        else
+            invalid = true;
+    }
+    else if(effect.mEffectId == ESM::MagicEffect::Open)
+    {
+        if(target.getClass().canLock(target))
+        {
+            // Use the player instead of the caster for vanilla crime compatibility
+            MWBase::Environment::get().getMechanicsManager()->unlockAttempted(getPlayer(), target);
+
+            MWRender::Animation* animation = world->getAnimation(target);
+            if(animation)
+                animation->addSpellCastGlow(magicEffect);
+            int magnitude = static_cast<int>(roll(effect));
+            if(target.getCellRef().getLockLevel() <= magnitude)
+            {
+                if(target.getCellRef().getLockLevel() > 0)
+                {
+                    MWBase::Environment::get().getSoundManager()->playSound3D(target, "Open Lock", 1.f, 1.f);
+
+                    if(caster == getPlayer())
+                        MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicOpenSuccess}");
+                }
+                target.getCellRef().unlock();
+            }
+            else
+            {
+                MWBase::Environment::get().getSoundManager()->playSound3D(target, "Open Lock Fail", 1.f, 1.f);
+            }
+        }
+        else
+            invalid = true;
+    }
+    else if(!target.getClass().isActor())
+    {
+        invalid = true;
+    }
+    else
+    {
+        auto& magnitudes = target.getClass().getCreatureStats(target).getMagicEffects();
+        if(spellParams.getType() != ESM::ActiveSpells::Type_Ability && !(effect.mFlags & (ESM::ActiveEffect::Flag_Applied | ESM::ActiveEffect::Flag_Ignore_Resistances)))
+        {
+            const ESM::Spell* spell = nullptr;
+            if(spellParams.getType() == ESM::ActiveSpells::Type_Temporary)
+                spell = world->getStore().get<ESM::Spell>().search(spellParams.getId());
+            float magnitudeMult = getEffectMultiplier(effect.mEffectId, target, caster, spell, &magnitudes);
+            if (magnitudeMult == 0)
+            {
+                // Fully resisted, show message
+                if (target == getPlayer())
+                    MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicPCResisted}");
+                else if (caster == getPlayer())
+                    MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicTargetResisted}");
+                return true;
+            }
+            effect.mMinMagnitude *= magnitudeMult;
+            effect.mMaxMagnitude *= magnitudeMult;
+        }
+        float oldMagnitude = 0.f;
+        if(effect.mFlags & ESM::ActiveEffect::Flag_Applied)
+            oldMagnitude = effect.mMagnitude;
+        //Note that there's an early out for Flag_Applied AppliedOnce effects so we don't have to exclude them here
+        effect.mMagnitude = roll(effect);
+        if(!(magicEffect->mData.mFlags & (ESM::MagicEffect::Flags::NoMagnitude | ESM::MagicEffect::Flags::AppliedOnce)))
+        {
+            if(effect.mDuration != 0)
+            {
+                float mult = dt;
+                if(spellParams.getType() == ESM::ActiveSpells::Type_Consumable || spellParams.getType() == ESM::ActiveSpells::Type_Temporary)
+                    mult = std::min(effect.mTimeLeft, dt);
+                effect.mMagnitude *= mult;
+            }
+            if(effect.mMagnitude == 0)
+            {
+                effect.mFlags |= ESM::ActiveEffect::Flag_Applied | ESM::ActiveEffect::Flag_Remove;
+                effect.mTimeLeft -= dt;
+                return false;
+            }
+        }
+        if(effect.mEffectId == ESM::MagicEffect::Corprus)
+            spellParams.worsen();
+        else
+            applyMagicEffect(target, caster, spellParams, effect, invalid, receivedMagicDamage);
+        magnitudes.add(EffectKey(effect.mEffectId, effect.mArg), EffectParam(effect.mMagnitude - oldMagnitude));
+    }
+    effect.mTimeLeft -= dt;
+    if(invalid)
+    {
+        effect.mTimeLeft = 0;
+        effect.mFlags |= ESM::ActiveEffect::Flag_Remove;
+        auto anim = world->getAnimation(target);
+        if(anim)
+            anim->removeEffect(effect.mEffectId);
+    }
+    else
+        effect.mFlags |= ESM::ActiveEffect::Flag_Applied | ESM::ActiveEffect::Flag_Remove;
+    if (receivedMagicDamage && target == getPlayer())
+        MWBase::Environment::get().getWindowManager()->activateHitOverlay(false);
+    return false;
+}
+
+void removeMagicEffect(const MWWorld::Ptr& target, ActiveSpells::ActiveSpellParams& spellParams, const ESM::ActiveEffect& effect)
+{
+    const auto world = MWBase::Environment::get().getWorld();
+    auto& magnitudes = target.getClass().getCreatureStats(target).getMagicEffects();
+    bool invalid;
+    switch(effect.mEffectId)
+    {
+        case ESM::MagicEffect::CommandCreature:
+        case ESM::MagicEffect::CommandHumanoid:
+            if(magnitudes.get(effect.mEffectId).getMagnitude() <= 0.f)
+            {
+                auto& seq = target.getClass().getCreatureStats(target).getAiSequence();
+                auto it = std::find_if(seq.begin(), seq.end(), [&](const auto& package)
+                {
+                    return package->getTypeId() == MWMechanics::AiPackageTypeId::Follow && static_cast<const MWMechanics::AiFollow*>(package.get())->isCommanded();
+                });
+                if(it != seq.end())
+                    seq.erase(it);
+            }
+            break;
+        case ESM::MagicEffect::ExtraSpell:
+            if(magnitudes.get(effect.mEffectId).getMagnitude() <= 0.f)
+                target.getClass().getInventoryStore(target).autoEquip(target);
+            break;
+        case ESM::MagicEffect::TurnUndead:
+            {
+                auto& creatureStats = target.getClass().getCreatureStats(target);
+                Stat<int> stat = creatureStats.getAiSetting(CreatureStats::AI_Flee);
+                stat.setModifier(static_cast<int>(stat.getModifier() - effect.mMagnitude));
+                creatureStats.setAiSetting(CreatureStats::AI_Flee, stat);
+            }
+            break;
+        case ESM::MagicEffect::FrenzyCreature:
+        case ESM::MagicEffect::FrenzyHumanoid:
+            modifyAiSetting(target, effect, ESM::MagicEffect::FrenzyCreature, CreatureStats::AI_Fight, effect.mMagnitude, invalid);
+            break;
+        case ESM::MagicEffect::CalmCreature:
+        case ESM::MagicEffect::CalmHumanoid:
+            modifyAiSetting(target, effect, ESM::MagicEffect::CalmCreature, CreatureStats::AI_Fight, -effect.mMagnitude, invalid);
+            break;
+        case ESM::MagicEffect::DemoralizeCreature:
+        case ESM::MagicEffect::DemoralizeHumanoid:
+            modifyAiSetting(target, effect, ESM::MagicEffect::DemoralizeCreature, CreatureStats::AI_Flee, -effect.mMagnitude, invalid);
+            break;
+        case ESM::MagicEffect::RallyCreature:
+        case ESM::MagicEffect::RallyHumanoid:
+            modifyAiSetting(target, effect, ESM::MagicEffect::RallyCreature, CreatureStats::AI_Flee, effect.mMagnitude, invalid);
+            break;
+        case ESM::MagicEffect::SummonScamp:
+        case ESM::MagicEffect::SummonClannfear:
+        case ESM::MagicEffect::SummonDaedroth:
+        case ESM::MagicEffect::SummonDremora:
+        case ESM::MagicEffect::SummonAncestralGhost:
+        case ESM::MagicEffect::SummonSkeletalMinion:
+        case ESM::MagicEffect::SummonBonewalker:
+        case ESM::MagicEffect::SummonGreaterBonewalker:
+        case ESM::MagicEffect::SummonBonelord:
+        case ESM::MagicEffect::SummonWingedTwilight:
+        case ESM::MagicEffect::SummonHunger:
+        case ESM::MagicEffect::SummonGoldenSaint:
+        case ESM::MagicEffect::SummonFlameAtronach:
+        case ESM::MagicEffect::SummonFrostAtronach:
+        case ESM::MagicEffect::SummonStormAtronach:
+        case ESM::MagicEffect::SummonCenturionSphere:
+        case ESM::MagicEffect::SummonFabricant:
+        case ESM::MagicEffect::SummonWolf:
+        case ESM::MagicEffect::SummonBear:
+        case ESM::MagicEffect::SummonBonewolf:
+        case ESM::MagicEffect::SummonCreature04:
+        case ESM::MagicEffect::SummonCreature05:
+            {
+                if(effect.mArg != -1)
+                    MWBase::Environment::get().getMechanicsManager()->cleanupSummonedCreature(target, effect.mArg);
+                auto& summons = target.getClass().getCreatureStats(target).getSummonedCreatureMap();
+                auto [begin, end] = summons.equal_range(effect.mEffectId);
+                for(auto it = begin; it != end; ++it)
+                {
+                    if(it->second == effect.mArg)
+                    {
+                        summons.erase(it);
+                        break;
+                    }
+                }
+            }
+            break;
+        case ESM::MagicEffect::BoundGloves:
+            removeBoundItem(world->getStore().get<ESM::GameSetting>().find("sMagicBoundRightGauntletID")->mValue.getString(), target);
+        case ESM::MagicEffect::BoundDagger:
+        case ESM::MagicEffect::BoundLongsword:
+        case ESM::MagicEffect::BoundMace:
+        case ESM::MagicEffect::BoundBattleAxe:
+        case ESM::MagicEffect::BoundSpear:
+        case ESM::MagicEffect::BoundLongbow:
+        case ESM::MagicEffect::BoundCuirass:
+        case ESM::MagicEffect::BoundHelm:
+        case ESM::MagicEffect::BoundBoots:
+        case ESM::MagicEffect::BoundShield:
+            {
+                const std::string& item = sBoundItemsMap.at(effect.mEffectId);
+                removeBoundItem(world->getStore().get<ESM::GameSetting>().find(item)->mValue.getString(), target);
+            }
+            break;
+        case ESM::MagicEffect::DrainHealth:
+        case ESM::MagicEffect::DrainMagicka:
+        case ESM::MagicEffect::DrainFatigue:
+            adjustDynamicStat(target, effect.mEffectId - ESM::MagicEffect::DrainHealth, effect.mMagnitude);
+            break;
+        case ESM::MagicEffect::FortifyHealth:
+        case ESM::MagicEffect::FortifyMagicka:
+        case ESM::MagicEffect::FortifyFatigue:
+            if(spellParams.getType() == ESM::ActiveSpells::Type_Ability)
+                modDynamicStat(target, effect.mEffectId - ESM::MagicEffect::FortifyHealth, -effect.mMagnitude);
+            else
+                adjustDynamicStat(target, effect.mEffectId - ESM::MagicEffect::FortifyHealth, -effect.mMagnitude, true);
+            break;
+        case ESM::MagicEffect::DrainAttribute:
+            restoreAttribute(target, effect, effect.mMagnitude);
+            break;
+        case ESM::MagicEffect::FortifyAttribute:
+            // Abilities affect base stats, but not for drain
+            if(spellParams.getType() == ESM::ActiveSpells::Type_Ability)
+            {
+                auto& creatureStats = target.getClass().getCreatureStats(target);
+                AttributeValue attr = creatureStats.getAttribute(effect.mArg);
+                attr.setBase(attr.getBase() - effect.mMagnitude);
+                creatureStats.setAttribute(effect.mArg, attr);
+            }
+            else
+                fortifyAttribute(target, effect, -effect.mMagnitude);
+            break;
+        case ESM::MagicEffect::DrainSkill:
+            restoreSkill(target, effect, effect.mMagnitude);
+            break;
+        case ESM::MagicEffect::FortifySkill:
+            // Abilities affect base stats, but not for drain
+            if(spellParams.getType() == ESM::ActiveSpells::Type_Ability)
+            {
+                auto& npcStats = target.getClass().getNpcStats(target);
+                auto& skill = npcStats.getSkill(effect.mArg);
+                skill.setBase(skill.getBase() - effect.mMagnitude);
+            }
+            else
+                fortifySkill(target, effect, -effect.mMagnitude);
+            break;
+        case ESM::MagicEffect::FortifyMaximumMagicka:
+            target.getClass().getCreatureStats(target).setNeedRecalcDynamicStats(true);
+            break;
+        case ESM::MagicEffect::AbsorbAttribute:
+            {
+                const auto caster = world->searchPtrViaActorId(spellParams.getCasterActorId());
+                restoreAttribute(target, effect, effect.mMagnitude);
+                if(!caster.isEmpty())
+                    fortifyAttribute(caster, effect, -effect.mMagnitude);
+            }
+            break;
+        case ESM::MagicEffect::AbsorbSkill:
+            {
+                const auto caster = world->searchPtrViaActorId(spellParams.getCasterActorId());
+                restoreSkill(target, effect, effect.mMagnitude);
+                if(!caster.isEmpty())
+                    fortifySkill(caster, effect, -effect.mMagnitude);
+            }
+            break;
+        case ESM::MagicEffect::Corprus:
+            {
+                int worsenings = spellParams.getWorsenings();
+                spellParams.resetWorsenings();
+                if(worsenings > 0)
+                {
+                    for(const auto& otherEffect : spellParams.getEffects())
+                    {
+                        if(isCorprusEffect(otherEffect, true))
+                        {
+                            for(int i = 0; i < worsenings; i++)
+                                removeMagicEffect(target, spellParams, otherEffect);
+                        }
+                    }
+                }
+                //Note that we remove the effects, but keep the params
+                target.getClass().getCreatureStats(target).getActiveSpells().purge([&spellParams] (const ActiveSpells::ActiveSpellParams& params, const auto&)
+                {
+                    return &spellParams == &params;
+                }, target);
+            }
+            break;
+    }
+}
+
+void onMagicEffectRemoved(const MWWorld::Ptr& target, ActiveSpells::ActiveSpellParams& spellParams, const ESM::ActiveEffect& effect)
+{
+    if(!(effect.mFlags & ESM::ActiveEffect::Flag_Applied))
+        return;
+    const auto world = MWBase::Environment::get().getWorld();
+    auto& magnitudes = target.getClass().getCreatureStats(target).getMagicEffects();
+    const auto* magicEffect = world->getStore().get<ESM::MagicEffect>().find(effect.mEffectId);
+    if(magicEffect->mData.mFlags & ESM::MagicEffect::Flags::AppliedOnce)
+        magnitudes.add(EffectKey(effect.mEffectId, effect.mArg), EffectParam(-effect.mMinMagnitude));
+    removeMagicEffect(target, spellParams, effect);
+    auto anim = world->getAnimation(target);
+    if(anim)
+        anim->removeEffect(effect.mEffectId);
+}
+
+}
\ No newline at end of file
diff --git a/apps/openmw/mwmechanics/spelleffects.hpp b/apps/openmw/mwmechanics/spelleffects.hpp
new file mode 100644
index 0000000000..a9e7b066f3
--- /dev/null
+++ b/apps/openmw/mwmechanics/spelleffects.hpp
@@ -0,0 +1,20 @@
+#ifndef GAME_MWMECHANICS_SPELLEFFECTS_H
+#define GAME_MWMECHANICS_SPELLEFFECTS_H
+
+#include "activespells.hpp"
+
+#include "../mwworld/ptr.hpp"
+
+// These functions should probably be split up into separate Lua functions for each magic effect when magic is dehardcoded.
+// That way ESM::MGEF could point to two Lua scripts for each effect. Needs discussion.
+
+namespace MWMechanics
+{
+    // Applies a tick of a single effect. Returns true if the effect should be removed immediately
+    bool applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, ActiveSpells::ActiveSpellParams& spellParams, ESM::ActiveEffect& effect, float dt);
+
+    // Undoes permanent effects created by ESM::MagicEffect::AppliedOnce
+    void onMagicEffectRemoved(const MWWorld::Ptr& target, ActiveSpells::ActiveSpellParams& spell, const ESM::ActiveEffect& effect);
+}
+
+#endif
diff --git a/apps/openmw/mwmechanics/spelllist.hpp b/apps/openmw/mwmechanics/spelllist.hpp
index 5920949d65..f5759fd7ee 100644
--- a/apps/openmw/mwmechanics/spelllist.hpp
+++ b/apps/openmw/mwmechanics/spelllist.hpp
@@ -16,12 +16,6 @@ namespace ESM
 
 namespace MWMechanics
 {
-    struct SpellParams
-    {
-        std::map<int, float> mEffectRands; // <effect index, normalised random magnitude>
-        std::set<int> mPurgedEffects; // indices of purged effects
-    };
-
     class Spells;
 
     /// Multiple instances of the same actor share the same spell list in Morrowind.
diff --git a/apps/openmw/mwmechanics/spellpriority.cpp b/apps/openmw/mwmechanics/spellpriority.cpp
index bd9c5f7cb3..974d297f10 100644
--- a/apps/openmw/mwmechanics/spellpriority.cpp
+++ b/apps/openmw/mwmechanics/spellpriority.cpp
@@ -31,21 +31,20 @@ namespace
             // if the effect filter is not specified, take in account only spells effects. Leave potions, enchanted items etc.
             if (effectFilter == -1)
             {
-                const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(it->first);
+                const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(it->getId());
                 if (!spell || spell->mData.mType != ESM::Spell::ST_Spell)
                     continue;
             }
 
-            const MWMechanics::ActiveSpells::ActiveSpellParams& params = it->second;
-            for (std::vector<MWMechanics::ActiveSpells::ActiveEffect>::const_iterator effectIt = params.mEffects.begin();
-                effectIt != params.mEffects.end(); ++effectIt)
+            const MWMechanics::ActiveSpells::ActiveSpellParams& params = *it;
+            for (const auto& effect : params.getEffects())
             {
-                int effectId = effectIt->mEffectId;
+                int effectId = effect.mEffectId;
                 if (effectFilter != -1 && effectId != effectFilter)
                     continue;
                 const ESM::MagicEffect* magicEffect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effectId);
 
-                if (effectIt->mDuration <= 3) // Don't attempt to dispel if effect runs out shortly anyway
+                if (effect.mDuration <= 3) // Don't attempt to dispel if effect runs out shortly anyway
                     continue;
 
                 if (negative && magicEffect->mData.mFlags & ESM::MagicEffect::Harmful)
@@ -64,15 +63,14 @@ namespace
         const MWMechanics::ActiveSpells& activeSpells = actor.getClass().getCreatureStats(actor).getActiveSpells();
         for (MWMechanics::ActiveSpells::TIterator it = activeSpells.begin(); it != activeSpells.end(); ++it)
         {
-            if (it->first != spellId)
+            if (it->getId() != spellId)
                 continue;
 
-            const MWMechanics::ActiveSpells::ActiveSpellParams& params = it->second;
-            for (std::vector<MWMechanics::ActiveSpells::ActiveEffect>::const_iterator effectIt = params.mEffects.begin();
-                effectIt != params.mEffects.end(); ++effectIt)
+            const MWMechanics::ActiveSpells::ActiveSpellParams& params = *it;
+            for (const auto& effect : params.getEffects())
             {
-                if (effectIt->mDuration > duration)
-                    duration = effectIt->mDuration;
+                if (effect.mDuration > duration)
+                    duration = effect.mDuration;
             }
         }
         return duration;
diff --git a/apps/openmw/mwmechanics/spells.cpp b/apps/openmw/mwmechanics/spells.cpp
index b871376003..743eacfe2c 100644
--- a/apps/openmw/mwmechanics/spells.cpp
+++ b/apps/openmw/mwmechanics/spells.cpp
@@ -20,72 +20,33 @@
 namespace MWMechanics
 {
     Spells::Spells()
-        : mSpellsChanged(false)
     {
     }
 
     Spells::Spells(const Spells& spells) : mSpellList(spells.mSpellList), mSpells(spells.mSpells),
-        mSelectedSpell(spells.mSelectedSpell), mUsedPowers(spells.mUsedPowers),
-        mSpellsChanged(spells.mSpellsChanged), mEffects(spells.mEffects), mSourcedEffects(spells.mSourcedEffects)
+        mSelectedSpell(spells.mSelectedSpell), mUsedPowers(spells.mUsedPowers)
     {
         if(mSpellList)
             mSpellList->addListener(this);
     }
 
     Spells::Spells(Spells&& spells) : mSpellList(std::move(spells.mSpellList)), mSpells(std::move(spells.mSpells)),
-        mSelectedSpell(std::move(spells.mSelectedSpell)), mUsedPowers(std::move(spells.mUsedPowers)),
-        mSpellsChanged(std::move(spells.mSpellsChanged)), mEffects(std::move(spells.mEffects)),
-        mSourcedEffects(std::move(spells.mSourcedEffects))
+        mSelectedSpell(std::move(spells.mSelectedSpell)), mUsedPowers(std::move(spells.mUsedPowers))
     {
         if (mSpellList)
             mSpellList->updateListener(&spells, this);
     }
 
-    std::map<const ESM::Spell*, SpellParams>::const_iterator Spells::begin() const
+    std::vector<const ESM::Spell*>::const_iterator Spells::begin() const
     {
         return mSpells.begin();
     }
 
-    std::map<const ESM::Spell*, SpellParams>::const_iterator Spells::end() const
+    std::vector<const ESM::Spell*>::const_iterator Spells::end() const
     {
         return mSpells.end();
     }
 
-    void Spells::rebuildEffects() const
-    {
-        mEffects = MagicEffects();
-        mSourcedEffects.clear();
-
-        for (const auto& iter : mSpells)
-        {
-            const ESM::Spell *spell = iter.first;
-
-            if (spell->mData.mType==ESM::Spell::ST_Ability || spell->mData.mType==ESM::Spell::ST_Blight ||
-                spell->mData.mType==ESM::Spell::ST_Disease || spell->mData.mType==ESM::Spell::ST_Curse)
-            {
-                int i=0;
-                for (const auto& effect : spell->mEffects.mList)
-                {
-                    if (iter.second.mPurgedEffects.find(i) != iter.second.mPurgedEffects.end())
-                    {
-                        ++i;
-                        continue; // effect was purged
-                    }
-
-                    float random = 1.f;
-                    if (iter.second.mEffectRands.find(i) != iter.second.mEffectRands.end())
-                        random = iter.second.mEffectRands.at(i);
-
-                    float magnitude = effect.mMagnMin + (effect.mMagnMax - effect.mMagnMin) * random;
-                    mEffects.add (effect, magnitude);
-                    mSourcedEffects[spell].add(MWMechanics::EffectKey(effect), magnitude);
-
-                    ++i;
-                }
-            }
-        }
-    }
-
     bool Spells::hasSpell(const std::string &spell) const
     {
         return hasSpell(SpellList::getSpell(spell));
@@ -93,7 +54,7 @@ namespace MWMechanics
 
     bool Spells::hasSpell(const ESM::Spell *spell) const
     {
-        return mSpells.find(spell) != mSpells.end();
+        return std::find(mSpells.begin(), mSpells.end(), spell) != mSpells.end();
     }
 
     void Spells::add (const ESM::Spell* spell)
@@ -108,29 +69,8 @@ namespace MWMechanics
 
     void Spells::addSpell(const ESM::Spell* spell)
     {
-        if (mSpells.find (spell)==mSpells.end())
-        {
-            std::map<int, float> random;
-
-            // Determine the random magnitudes (unless this is a castable spell, in which case
-            // they will be determined when the spell is cast)
-            if (spell->mData.mType != ESM::Spell::ST_Power && spell->mData.mType != ESM::Spell::ST_Spell)
-            {
-                for (unsigned int i=0; i<spell->mEffects.mList.size();++i)
-                {
-                    if (spell->mEffects.mList[i].mMagnMin != spell->mEffects.mList[i].mMagnMax)
-                    {
-                        int delta = spell->mEffects.mList[i].mMagnMax - spell->mEffects.mList[i].mMagnMin;
-                        random[i] = Misc::Rng::rollDice(delta + 1) / static_cast<float>(delta);
-                    }
-                }
-            }
-
-            SpellParams params;
-            params.mEffectRands = random;
-            mSpells.emplace(spell, params);
-            mSpellsChanged = true;
-        }
+        if (!hasSpell(spell))
+            mSpells.emplace_back(spell);
     }
 
     void Spells::remove (const std::string& spellId)
@@ -145,27 +85,14 @@ namespace MWMechanics
 
     void Spells::removeSpell(const ESM::Spell* spell)
     {
-        const auto it = mSpells.find(spell);
+        const auto it = std::find(mSpells.begin(), mSpells.end(), spell);
         if(it != mSpells.end())
-        {
             mSpells.erase(it);
-            mSpellsChanged = true;
-        }
-    }
-
-    MagicEffects Spells::getMagicEffects() const
-    {
-        if (mSpellsChanged) {
-            rebuildEffects();
-            mSpellsChanged = false;
-        }
-        return mEffects;
     }
 
     void Spells::removeAllSpells()
     {
         mSpells.clear();
-        mSpellsChanged = true;
     }
 
     void Spells::clear(bool modifyBase)
@@ -185,26 +112,10 @@ namespace MWMechanics
         return mSelectedSpell;
     }
 
-    bool Spells::isSpellActive(const std::string &id) const
-    {
-        if (id.empty())
-            return false;
-
-        const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(id);
-        if (spell && hasSpell(spell))
-        {
-            auto type = spell->mData.mType;
-            return (type==ESM::Spell::ST_Ability || type==ESM::Spell::ST_Blight || type==ESM::Spell::ST_Disease || type==ESM::Spell::ST_Curse);
-        }
-
-        return false;
-    }
-
     bool Spells::hasDisease(const ESM::Spell::SpellType type) const
     {
-        for (const auto& iter : mSpells)
+        for (const auto spell : mSpells)
         {
-            const ESM::Spell *spell = iter.first;
             if (spell->mData.mType == type)
                 return true;
         }
@@ -227,12 +138,11 @@ namespace MWMechanics
         std::vector<std::string> purged;
         for (auto iter = mSpells.begin(); iter!=mSpells.end();)
         {
-            const ESM::Spell *spell = iter->first;
+            const ESM::Spell *spell = *iter;
             if (filter(spell))
             {
                 mSpells.erase(iter++);
                 purged.push_back(spell->mId);
-                mSpellsChanged = true;
             }
             else
                 ++iter;
@@ -261,43 +171,6 @@ namespace MWMechanics
         purge([](auto spell) { return spell->mData.mType == ESM::Spell::ST_Curse; });
     }
 
-    void Spells::removeEffects(const std::string &id)
-    {
-        if (isSpellActive(id))
-        {
-            for (auto& spell : mSpells)
-            {
-                if (spell.first == SpellList::getSpell(id))
-                {
-                    for (long unsigned int i = 0; i != spell.first->mEffects.mList.size(); i++)
-                    {
-                        spell.second.mPurgedEffects.insert(i);
-                    }
-                }
-            }
-
-            mSpellsChanged = true;
-        }
-    }
-
-    void Spells::visitEffectSources(EffectSourceVisitor &visitor) const
-    {
-        if (mSpellsChanged) {
-            rebuildEffects();
-            mSpellsChanged = false;
-        }
-
-        for (const auto& it : mSourcedEffects)
-        {
-            const ESM::Spell * spell = it.first;
-            for (const auto& effectIt : it.second)
-            {
-                // FIXME: since Spells merges effects with the same ID, there is no sense to use multiple effects with same ID here
-                visitor.visit(effectIt.first, -1, spell->mName, spell->mId, -1, effectIt.second.getMagnitude());
-            }
-        }
-    }
-
     bool Spells::hasCorprusEffect(const ESM::Spell *spell)
     {
         for (const auto& effectIt : spell->mEffects.mList)
@@ -310,46 +183,6 @@ namespace MWMechanics
         return false;
     }
 
-    void Spells::purgeEffect(int effectId)
-    {
-        for (auto& spellIt : mSpells)
-        {
-            int i = 0;
-            for (auto& effectIt : spellIt.first->mEffects.mList)
-            {
-                if (effectIt.mEffectID == effectId)
-                {
-                    spellIt.second.mPurgedEffects.insert(i);
-                    mSpellsChanged = true;
-                }
-                ++i;
-            }
-        }
-    }
-
-    void Spells::purgeEffect(int effectId, const std::string & sourceId)
-    {
-        // Effect source may be not a spell
-        const ESM::Spell * spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(sourceId);
-        if (spell == nullptr)
-            return;
-
-        auto spellIt = mSpells.find(spell);
-        if (spellIt == mSpells.end())
-            return;
-
-        int index = 0;
-        for (auto& effectIt : spellIt->first->mEffects.mList)
-        {
-            if (effectIt.mEffectID == effectId)
-            {
-                spellIt->second.mPurgedEffects.insert(index);
-                mSpellsChanged = true;
-            }
-            ++index;
-        }
-    }
-
     bool Spells::canUsePower(const ESM::Spell* spell) const
     {
         const auto it = mUsedPowers.find(spell);
@@ -365,17 +198,16 @@ namespace MWMechanics
     {
         const auto& baseSpells = mSpellList->getSpells();
 
-        for (ESM::SpellState::TContainer::const_iterator it = state.mSpells.begin(); it != state.mSpells.end(); ++it)
+        for (const std::string& id : state.mSpells)
         {
             // Discard spells that are no longer available due to changed content files
-            const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(it->first);
+            const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(id);
             if (spell)
             {
-                mSpells[spell].mEffectRands = it->second.mEffectRands;
-                mSpells[spell].mPurgedEffects = it->second.mPurgedEffects;
+                mSpells.emplace_back(spell);
 
-                if (it->first == state.mSelectedSpell)
-                    mSelectedSpell = it->first;
+                if (id == state.mSelectedSpell)
+                    mSelectedSpell = id;
             }
         }
         // Add spells from the base record
@@ -394,31 +226,6 @@ namespace MWMechanics
             mUsedPowers[spell] = MWWorld::TimeStamp(it->second);
         }
 
-        for (std::map<std::string, ESM::SpellState::CorprusStats>::const_iterator it = state.mCorprusSpells.begin(); it != state.mCorprusSpells.end(); ++it)
-        {
-            const ESM::Spell * spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(it->first);
-            if (!spell)
-                continue;
-
-            CorprusStats stats;
-
-            int worsening = state.mCorprusSpells.at(it->first).mWorsenings;
-
-            for (int i=0; i<ESM::Attribute::Length; ++i)
-                stats.mWorsenings[i] = 0;
-
-            for (auto& effect : spell->mEffects.mList)
-            {
-                if (effect.mEffectID == ESM::MagicEffect::DrainAttribute)
-                    stats.mWorsenings[effect.mAttribute] = worsening;
-            }
-            stats.mNextWorsening = MWWorld::TimeStamp(state.mCorprusSpells.at(it->first).mNextWorsening);
-
-            creatureStats->addCorprusSpell(it->first, stats);
-        }
-
-        mSpellsChanged = true;
-
         // Permanent effects are used only to keep the custom magnitude of corprus spells effects (after cure too), and only in old saves. Convert data to the new approach.
         for (std::map<std::string, std::vector<ESM::SpellState::PermanentSpellEffectInfo> >::const_iterator it =
             state.mPermanentSpellEffects.begin(); it != state.mPermanentSpellEffects.end(); ++it)
@@ -457,16 +264,13 @@ namespace MWMechanics
     void Spells::writeState(ESM::SpellState &state) const
     {
         const auto& baseSpells = mSpellList->getSpells();
-        for (const auto& it : mSpells)
+        for (const auto spell : mSpells)
         {
             // Don't save spells and powers stored in the base record
-            if((it.first->mData.mType != ESM::Spell::ST_Spell && it.first->mData.mType != ESM::Spell::ST_Power) ||
-                std::find(baseSpells.begin(), baseSpells.end(), it.first->mId) == baseSpells.end())
+            if((spell->mData.mType != ESM::Spell::ST_Spell && spell->mData.mType != ESM::Spell::ST_Power) ||
+                std::find(baseSpells.begin(), baseSpells.end(), spell->mId) == baseSpells.end())
             {
-                ESM::SpellState::SpellParams params;
-                params.mEffectRands = it.second.mEffectRands;
-                params.mPurgedEffects = it.second.mPurgedEffects;
-                state.mSpells.emplace(it.first->mId, params);
+                state.mSpells.emplace_back(spell->mId);
             }
         }
 
diff --git a/apps/openmw/mwmechanics/spells.hpp b/apps/openmw/mwmechanics/spells.hpp
index 9737b72cd0..29f505d369 100644
--- a/apps/openmw/mwmechanics/spells.hpp
+++ b/apps/openmw/mwmechanics/spells.hpp
@@ -29,18 +29,13 @@ namespace MWMechanics
     class Spells
     {
             std::shared_ptr<SpellList> mSpellList;
-            std::map<const ESM::Spell*, SpellParams> mSpells;
+            std::vector<const ESM::Spell*> mSpells;
 
             // Note: this is the spell that's about to be cast, *not* the spell selected in the GUI (which may be different)
             std::string mSelectedSpell;
 
             std::map<const ESM::Spell*, MWWorld::TimeStamp> mUsedPowers;
 
-            mutable bool mSpellsChanged;
-            mutable MagicEffects mEffects;
-            mutable std::map<const ESM::Spell*, MagicEffects> mSourcedEffects;
-            void rebuildEffects() const;
-
             bool hasDisease(const ESM::Spell::SpellType type) const;
 
             using SpellFilter = bool (*)(const ESM::Spell*);
@@ -52,8 +47,6 @@ namespace MWMechanics
 
             friend class SpellList;
         public:
-            using TIterator = std::map<const ESM::Spell*, SpellParams>::const_iterator;
-
             Spells();
 
             Spells(const Spells&);
@@ -64,9 +57,6 @@ namespace MWMechanics
 
             static bool hasCorprusEffect(const ESM::Spell *spell);
 
-            void purgeEffect(int effectId);
-            void purgeEffect(int effectId, const std::string & sourceId);
-
             bool canUsePower (const ESM::Spell* spell) const;
             void usePower (const ESM::Spell* spell);
 
@@ -75,9 +65,9 @@ namespace MWMechanics
             void purgeCorprusDisease();
             void purgeCurses();
 
-            TIterator begin() const;
+            std::vector<const ESM::Spell*>::const_iterator begin() const;
 
-            TIterator end() const;
+            std::vector<const ESM::Spell*>::const_iterator end() const;
 
             bool hasSpell(const std::string& spell) const;
             bool hasSpell(const ESM::Spell* spell) const;
@@ -92,9 +82,6 @@ namespace MWMechanics
             ///< If the spell to be removed is the selected spell, the selected spell will be changed to
             /// no spell (empty string).
 
-            MagicEffects getMagicEffects() const;
-            ///< Return sum of magic effects resulting from abilities, blights, deseases and curses.
-
             void clear(bool modifyBase = false);
             ///< Remove all spells of al types.
 
@@ -104,17 +91,10 @@ namespace MWMechanics
             const std::string getSelectedSpell() const;
             ///< May return an empty string.
 
-            bool isSpellActive(const std::string& id) const;
-            ///< Are we under the effects of the given spell ID?
-
             bool hasCommonDisease() const;
 
             bool hasBlightDisease() const;
 
-            void removeEffects(const std::string& id);
-
-            void visitEffectSources (MWMechanics::EffectSourceVisitor& visitor) const;
-
             void readState (const ESM::SpellState& state, CreatureStats* creatureStats);
             void writeState (ESM::SpellState& state) const;
 
diff --git a/apps/openmw/mwmechanics/summoning.cpp b/apps/openmw/mwmechanics/summoning.cpp
index d90545fc60..953db077fb 100644
--- a/apps/openmw/mwmechanics/summoning.cpp
+++ b/apps/openmw/mwmechanics/summoning.cpp
@@ -60,90 +60,60 @@ namespace MWMechanics
         return std::string();
     }
 
-    UpdateSummonedCreatures::UpdateSummonedCreatures(const MWWorld::Ptr &actor)
-        : mActor(actor)
+    int summonCreature(int effectId, const MWWorld::Ptr& summoner)
     {
-    }
-
-    void UpdateSummonedCreatures::visit(EffectKey key, int effectIndex, const std::string &sourceName, const std::string &sourceId, int casterActorId, float magnitude, float remainingTime, float totalTime)
-    {
-        if (isSummoningEffect(key.mId) && magnitude > 0)
+        std::string creatureID = getSummonedCreature(effectId);
+        int creatureActorId = -1;
+        if (!creatureID.empty())
         {
-            mActiveEffects.insert(ESM::SummonKey(key.mId, sourceId, effectIndex));
-        }
-    }
+            try
+            {
+                auto world = MWBase::Environment::get().getWorld();
+                MWWorld::ManualRef ref(world->getStore(), creatureID, 1);
 
-    void UpdateSummonedCreatures::process(bool cleanup)
-    {
-        MWMechanics::CreatureStats& creatureStats = mActor.getClass().getCreatureStats(mActor);
-        std::map<ESM::SummonKey, int>& creatureMap = creatureStats.getSummonedCreatureMap();
+                MWMechanics::CreatureStats& summonedCreatureStats = ref.getPtr().getClass().getCreatureStats(ref.getPtr());
 
-        for (std::set<ESM::SummonKey>::iterator it = mActiveEffects.begin(); it != mActiveEffects.end(); ++it)
-        {
-            bool found = creatureMap.find(*it) != creatureMap.end();
-            if (!found)
-            {
-                std::string creatureID = getSummonedCreature(it->mEffectId);
-                if (!creatureID.empty())
+                // Make the summoned creature follow its master and help in fights
+                AiFollow package(summoner);
+                summonedCreatureStats.getAiSequence().stack(package, ref.getPtr());
+                creatureActorId = summonedCreatureStats.getActorId();
+
+                MWWorld::Ptr placed = world->safePlaceObject(ref.getPtr(), summoner, summoner.getCell(), 0, 120.f);
+
+                MWRender::Animation* anim = world->getAnimation(placed);
+                if (anim)
                 {
-                    int creatureActorId = -1;
-                    try
-                    {
-                        MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), creatureID, 1);
-
-                        MWMechanics::CreatureStats& summonedCreatureStats = ref.getPtr().getClass().getCreatureStats(ref.getPtr());
-
-                        // Make the summoned creature follow its master and help in fights
-                        AiFollow package(mActor);
-                        summonedCreatureStats.getAiSequence().stack(package, ref.getPtr());
-                        creatureActorId = summonedCreatureStats.getActorId();
-
-                        MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->safePlaceObject(ref.getPtr(), mActor, mActor.getCell(), 0, 120.f);
-
-                        MWRender::Animation* anim = MWBase::Environment::get().getWorld()->getAnimation(placed);
-                        if (anim)
-                        {
-                            const ESM::Static* fx = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>()
-                                    .search("VFX_Summon_Start");
-                            if (fx)
-                                anim->addEffect("meshes\\" + fx->mModel, -1, false);
-                        }
-                    }
-                    catch (std::exception& e)
-                    {
-                        Log(Debug::Error) << "Failed to spawn summoned creature: " << e.what();
-                        // still insert into creatureMap so we don't try to spawn again every frame, that would spam the warning log
-                    }
-
-                    creatureMap.emplace(*it, creatureActorId);
+                    const ESM::Static* fx = world->getStore().get<ESM::Static>().search("VFX_Summon_Start");
+                    if (fx)
+                        anim->addEffect("meshes\\" + fx->mModel, -1, false);
                 }
             }
-        }
-
-        // Update summon effects
-        for (std::map<ESM::SummonKey, int>::iterator it = creatureMap.begin(); it != creatureMap.end(); )
-        {
-            bool found = mActiveEffects.find(it->first) != mActiveEffects.end();
-            if (!found)
+            catch (std::exception& e)
             {
-                // Effect has ended
-                MWBase::Environment::get().getMechanicsManager()->cleanupSummonedCreature(mActor, it->second);
-                creatureMap.erase(it++);
-                continue;
+                Log(Debug::Error) << "Failed to spawn summoned creature: " << e.what();
+                // still insert into creatureMap so we don't try to spawn again every frame, that would spam the warning log
             }
-            ++it;
+
+            summoner.getClass().getCreatureStats(summoner).getSummonedCreatureMap().emplace(effectId, creatureActorId);
         }
+        return creatureActorId;
+    }
+
+    void updateSummons(const MWWorld::Ptr& summoner, bool cleanup)
+    {
+        MWMechanics::CreatureStats& creatureStats = summoner.getClass().getCreatureStats(summoner);
+        auto& creatureMap = creatureStats.getSummonedCreatureMap();
 
         std::vector<int> graveyard = creatureStats.getSummonedCreatureGraveyard();
         creatureStats.getSummonedCreatureGraveyard().clear();
 
         for (const int creature : graveyard)
-            MWBase::Environment::get().getMechanicsManager()->cleanupSummonedCreature(mActor, creature);
+            MWBase::Environment::get().getMechanicsManager()->cleanupSummonedCreature(summoner, creature);
 
         if (!cleanup)
             return;
 
-        for (std::map<ESM::SummonKey, int>::iterator it = creatureMap.begin(); it != creatureMap.end(); )
+        for (auto it = creatureMap.begin(); it != creatureMap.end(); )
         {
             if(it->second == -1)
             {
@@ -155,7 +125,7 @@ namespace MWMechanics
             if (!ptr.isEmpty() && ptr.getClass().getCreatureStats(ptr).isDead() && ptr.getClass().getCreatureStats(ptr).isDeathAnimationFinished())
             {
                 // Purge the magic effect so a new creature can be summoned if desired
-                purgeSummonEffect(mActor, *it);
+                purgeSummonEffect(summoner, *it);
                 creatureMap.erase(it++);
             }
             else
@@ -163,13 +133,13 @@ namespace MWMechanics
         }
     }
 
-    void purgeSummonEffect(const MWWorld::Ptr& summoner, const std::pair<const ESM::SummonKey, int>& summon)
+    void purgeSummonEffect(const MWWorld::Ptr& summoner, const std::pair<int, int>& summon)
     {
         auto& creatureStats = summoner.getClass().getCreatureStats(summoner);
-        creatureStats.getActiveSpells().purgeEffect(summon.first.mEffectId, summon.first.mSourceId, summon.first.mEffectIndex);
-        creatureStats.getSpells().purgeEffect(summon.first.mEffectId, summon.first.mSourceId);
-        if (summoner.getClass().hasInventoryStore(summoner))
-            summoner.getClass().getInventoryStore(summoner).purgeEffect(summon.first.mEffectId, summon.first.mSourceId, false, summon.first.mEffectIndex);
+        creatureStats.getActiveSpells().purge([summon] (const auto& spell, const auto& effect)
+        {
+            return effect.mEffectId == summon.first && effect.mArg == summon.second;
+        }, summoner);
 
         MWBase::Environment::get().getMechanicsManager()->cleanupSummonedCreature(summoner, summon.second);
     }
diff --git a/apps/openmw/mwmechanics/summoning.hpp b/apps/openmw/mwmechanics/summoning.hpp
index 3c3e18a96b..3186eef986 100644
--- a/apps/openmw/mwmechanics/summoning.hpp
+++ b/apps/openmw/mwmechanics/summoning.hpp
@@ -11,32 +11,15 @@
 
 namespace MWMechanics
 {
-    class CreatureStats;
-
     bool isSummoningEffect(int effectId);
 
     std::string getSummonedCreature(int effectId);
 
-    void purgeSummonEffect(const MWWorld::Ptr& summoner, const std::pair<const ESM::SummonKey, int>& summon);
-
-    struct UpdateSummonedCreatures : public EffectSourceVisitor
-    {
-        UpdateSummonedCreatures(const MWWorld::Ptr& actor);
-        virtual ~UpdateSummonedCreatures() = default;
-
-        void visit (MWMechanics::EffectKey key, int effectIndex,
-                            const std::string& sourceName, const std::string& sourceId, int casterActorId,
-                            float magnitude, float remainingTime = -1, float totalTime = -1) override;
-
-        /// To call after all effect sources have been visited
-        void process(bool cleanup);
-
-    private:
-        MWWorld::Ptr mActor;
+    void purgeSummonEffect(const MWWorld::Ptr& summoner, const std::pair<int, int>& summon);
 
-        std::set<ESM::SummonKey> mActiveEffects;
-    };
+    int summonCreature(int effectId, const MWWorld::Ptr& summoner);
 
+    void updateSummons(const MWWorld::Ptr& summoner, bool cleanup);
 }
 
 #endif
diff --git a/apps/openmw/mwmechanics/tickableeffects.cpp b/apps/openmw/mwmechanics/tickableeffects.cpp
deleted file mode 100644
index 5056179f8f..0000000000
--- a/apps/openmw/mwmechanics/tickableeffects.cpp
+++ /dev/null
@@ -1,216 +0,0 @@
-#include "tickableeffects.hpp"
-
-#include <components/settings/settings.hpp>
-
-#include "../mwbase/environment.hpp"
-#include "../mwbase/windowmanager.hpp"
-#include "../mwbase/world.hpp"
-
-#include "../mwworld/cellstore.hpp"
-#include "../mwworld/class.hpp"
-#include "../mwworld/containerstore.hpp"
-#include "../mwworld/esmstore.hpp"
-#include "../mwworld/inventorystore.hpp"
-
-#include "actorutil.hpp"
-#include "npcstats.hpp"
-
-namespace MWMechanics
-{
-    void adjustDynamicStat(CreatureStats& creatureStats, int index, float magnitude, bool allowDecreaseBelowZero = false)
-    {
-        DynamicStat<float> stat = creatureStats.getDynamic(index);
-        stat.setCurrent(stat.getCurrent() + magnitude, allowDecreaseBelowZero);
-        creatureStats.setDynamic(index, stat);
-    }
-
-    bool disintegrateSlot (const MWWorld::Ptr& ptr, int slot, float disintegrate)
-    {
-        if (!ptr.getClass().hasInventoryStore(ptr))
-            return false;
-
-        MWWorld::InventoryStore& inv = ptr.getClass().getInventoryStore(ptr);
-        MWWorld::ContainerStoreIterator item = inv.getSlot(slot);
-
-        if (item != inv.end() && (item.getType() == MWWorld::ContainerStore::Type_Armor || item.getType() == MWWorld::ContainerStore::Type_Weapon))
-        {
-            if (!item->getClass().hasItemHealth(*item))
-                return false;
-            int charge = item->getClass().getItemHealth(*item);
-            if (charge == 0)
-                return false;
-
-            // Store remainder of disintegrate amount (automatically subtracted if > 1)
-            item->getCellRef().applyChargeRemainderToBeSubtracted(disintegrate - std::floor(disintegrate));
-
-            charge = item->getClass().getItemHealth(*item);
-            charge -= std::min(static_cast<int>(disintegrate), charge);
-            item->getCellRef().setCharge(charge);
-
-            if (charge == 0)
-            {
-                // Will unequip the broken item and try to find a replacement
-                if (ptr != getPlayer())
-                    inv.autoEquip(ptr);
-                else
-                    inv.unequipItem(*item, ptr);
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
-    bool effectTick(CreatureStats& creatureStats, const MWWorld::Ptr& actor, const EffectKey &effectKey, float magnitude)
-    {
-        if (magnitude == 0.f)
-            return false;
-
-        bool receivedMagicDamage = false;
-        bool godmode = actor == getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState();
-
-        switch (effectKey.mId)
-        {
-        case ESM::MagicEffect::DamageAttribute:
-        {
-            if (godmode)
-                break;
-            AttributeValue attr = creatureStats.getAttribute(effectKey.mArg);
-            attr.damage(magnitude);
-            creatureStats.setAttribute(effectKey.mArg, attr);
-            break;
-        }
-        case ESM::MagicEffect::RestoreAttribute:
-        {
-            AttributeValue attr = creatureStats.getAttribute(effectKey.mArg);
-            attr.restore(magnitude);
-            creatureStats.setAttribute(effectKey.mArg, attr);
-            break;
-        }
-        case ESM::MagicEffect::RestoreHealth:
-        case ESM::MagicEffect::RestoreMagicka:
-        case ESM::MagicEffect::RestoreFatigue:
-            adjustDynamicStat(creatureStats, effectKey.mId-ESM::MagicEffect::RestoreHealth, magnitude);
-            break;
-        case ESM::MagicEffect::DamageHealth:
-            if (godmode)
-                break;
-            receivedMagicDamage = true;
-            adjustDynamicStat(creatureStats, effectKey.mId-ESM::MagicEffect::DamageHealth, -magnitude);
-            break;
-
-        case ESM::MagicEffect::DamageMagicka:
-        case ESM::MagicEffect::DamageFatigue:
-        {
-            if (godmode)
-                break;
-            int index = effectKey.mId-ESM::MagicEffect::DamageHealth;
-            static const bool uncappedDamageFatigue = Settings::Manager::getBool("uncapped damage fatigue", "Game");
-            adjustDynamicStat(creatureStats, index, -magnitude, index == 2 && uncappedDamageFatigue);
-            break;
-        }
-        case ESM::MagicEffect::AbsorbHealth:
-            if (!godmode || magnitude <= 0)
-            {
-                if (magnitude > 0.f)
-                    receivedMagicDamage = true;
-                adjustDynamicStat(creatureStats, effectKey.mId-ESM::MagicEffect::AbsorbHealth, -magnitude);
-            }
-            break;
-
-        case ESM::MagicEffect::AbsorbMagicka:
-        case ESM::MagicEffect::AbsorbFatigue:
-            if (!godmode || magnitude <= 0)
-                adjustDynamicStat(creatureStats, effectKey.mId-ESM::MagicEffect::AbsorbHealth, -magnitude);
-            break;
-
-        case ESM::MagicEffect::DisintegrateArmor:
-        {
-            if (godmode)
-                break;
-            static const std::array<int, 9>  priorities
-            {
-                MWWorld::InventoryStore::Slot_CarriedLeft,
-                MWWorld::InventoryStore::Slot_Cuirass,
-                MWWorld::InventoryStore::Slot_LeftPauldron,
-                MWWorld::InventoryStore::Slot_RightPauldron,
-                MWWorld::InventoryStore::Slot_LeftGauntlet,
-                MWWorld::InventoryStore::Slot_RightGauntlet,
-                MWWorld::InventoryStore::Slot_Helmet,
-                MWWorld::InventoryStore::Slot_Greaves,
-                MWWorld::InventoryStore::Slot_Boots
-            };
-            for (const int priority : priorities)
-            {
-                if (disintegrateSlot(actor, priority, magnitude))
-                    break;
-            }
-
-            break;
-        }
-        case ESM::MagicEffect::DisintegrateWeapon:
-            if (!godmode)
-                disintegrateSlot(actor, MWWorld::InventoryStore::Slot_CarriedRight, magnitude);
-            break;
-
-        case ESM::MagicEffect::SunDamage:
-        {
-            // isInCell shouldn't be needed, but updateActor called during game start
-            if (!actor.isInCell() || !actor.getCell()->isExterior() || godmode)
-                break;
-            float time = MWBase::Environment::get().getWorld()->getTimeStamp().getHour();
-            float timeDiff = std::min(7.f, std::max(0.f, std::abs(time - 13)));
-            float damageScale = 1.f - timeDiff / 7.f;
-            // When cloudy, the sun damage effect is halved
-            static float fMagicSunBlockedMult = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(
-                        "fMagicSunBlockedMult")->mValue.getFloat();
-
-            int weather = MWBase::Environment::get().getWorld()->getCurrentWeather();
-            if (weather > 1)
-                damageScale *= fMagicSunBlockedMult;
-
-            adjustDynamicStat(creatureStats, 0, -magnitude * damageScale);
-            if (magnitude * damageScale > 0.f)
-                receivedMagicDamage = true;
-
-            break;
-        }
-
-        case ESM::MagicEffect::FireDamage:
-        case ESM::MagicEffect::ShockDamage:
-        case ESM::MagicEffect::FrostDamage:
-        case ESM::MagicEffect::Poison:
-        {
-            if (godmode)
-                break;
-            adjustDynamicStat(creatureStats, 0, -magnitude);
-            receivedMagicDamage = true;
-            break;
-        }
-
-        case ESM::MagicEffect::DamageSkill:
-        case ESM::MagicEffect::RestoreSkill:
-        {
-            if (!actor.getClass().isNpc())
-                break;
-            if (godmode && effectKey.mId == ESM::MagicEffect::DamageSkill)
-                break;
-            NpcStats &npcStats = actor.getClass().getNpcStats(actor);
-            SkillValue& skill = npcStats.getSkill(effectKey.mArg);
-            if (effectKey.mId == ESM::MagicEffect::RestoreSkill)
-                skill.restore(magnitude);
-            else
-                skill.damage(magnitude);
-            break;
-        }
-
-        default:
-            return false;
-        }
-
-        if (receivedMagicDamage && actor == getPlayer())
-            MWBase::Environment::get().getWindowManager()->activateHitOverlay(false);
-        return true;
-    }
-}
diff --git a/apps/openmw/mwmechanics/tickableeffects.hpp b/apps/openmw/mwmechanics/tickableeffects.hpp
deleted file mode 100644
index ccd42ca19b..0000000000
--- a/apps/openmw/mwmechanics/tickableeffects.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef MWMECHANICS_TICKABLEEFFECTS_H
-#define MWMECHANICS_TICKABLEEFFECTS_H
-
-namespace MWWorld
-{
-    class Ptr;
-}
-
-namespace MWMechanics
-{
-    class CreatureStats;
-    struct EffectKey;
-
-    /// Apply a magic effect that is applied in tick intervals until its remaining time ends or it is removed
-    /// Note: this function works in loop, so magic effects should not be removed here to avoid iterator invalidation.
-    /// @return Was the effect a tickable effect with a magnitude?
-    bool effectTick(CreatureStats& creatureStats, const MWWorld::Ptr& actor, const EffectKey& effectKey, float magnitude);
-}
-
-#endif
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 7fc488020c..bcb2d36f5d 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -1101,34 +1101,6 @@ Resource::ResourceSystem* NpcAnimation::getResourceSystem()
     return mResourceSystem;
 }
 
-void NpcAnimation::permanentEffectAdded(const ESM::MagicEffect *magicEffect, bool isNew)
-{
-    // During first auto equip, we don't play any sounds.
-    // Basically we don't want sounds when the actor is first loaded,
-    // the items should appear as if they'd always been equipped.
-    if (isNew)
-    {
-        static const std::string schools[] = {
-            "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration"
-        };
-
-        MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
-        if(!magicEffect->mHitSound.empty())
-            sndMgr->playSound3D(mPtr, magicEffect->mHitSound, 1.0f, 1.0f);
-        else
-            sndMgr->playSound3D(mPtr, schools[magicEffect->mData.mSchool]+" hit", 1.0f, 1.0f);
-    }
-
-    if (!magicEffect->mHit.empty())
-    {
-        const ESM::Static* castStatic = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>().find (magicEffect->mHit);
-        bool loop = (magicEffect->mData.mFlags & ESM::MagicEffect::ContinuousVfx) != 0;
-        // Don't play particle VFX unless the effect is new or it should be looping.
-        if (isNew || loop)
-            addEffect("meshes\\" + castStatic->mModel, magicEffect->mIndex, loop, "", magicEffect->mParticle);
-    }
-}
-
 void NpcAnimation::enableHeadAnimation(bool enable)
 {
     mHeadAnimationTime->setEnabled(enable);
diff --git a/apps/openmw/mwrender/npcanimation.hpp b/apps/openmw/mwrender/npcanimation.hpp
index 768ac01622..9f7a186c5e 100644
--- a/apps/openmw/mwrender/npcanimation.hpp
+++ b/apps/openmw/mwrender/npcanimation.hpp
@@ -31,7 +31,6 @@ class NpcAnimation : public ActorAnimation, public WeaponAnimation, public MWWor
 {
 public:
     void equipmentChanged() override;
-    void permanentEffectAdded(const ESM::MagicEffect *magicEffect, bool isNew) override;
 
 public:
     typedef std::map<ESM::PartReferenceType,std::string> PartBoneMap;
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index 149f9f3f3f..3642f68dc2 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -563,13 +563,7 @@ namespace MWScript
 
                     const MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
 
-                    MWMechanics::MagicEffects effects = stats.getSpells().getMagicEffects();
-                    effects += stats.getActiveSpells().getMagicEffects();
-                    if (ptr.getClass().hasInventoryStore(ptr) && !stats.isDeathAnimationFinished())
-                    {
-                        MWWorld::InventoryStore& store = ptr.getClass().getInventoryStore(ptr);
-                        effects += store.getMagicEffects();
-                    }
+                    const MWMechanics::MagicEffects& effects = stats.getMagicEffects();
 
                     for (const auto& activeEffect : effects)
                     {
@@ -821,7 +815,7 @@ namespace MWScript
                     }
 
                     const MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
-                    runtime.push(stats.getActiveSpells().isSpellActive(id) || stats.getSpells().isSpellActive(id));
+                    runtime.push(stats.getActiveSpells().isSpellActive(id));
                 }
         };
 
diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp
index fe2df68473..ccad186a0d 100644
--- a/apps/openmw/mwscript/statsextensions.cpp
+++ b/apps/openmw/mwscript/statsextensions.cpp
@@ -473,6 +473,8 @@ namespace MWScript
                     ESM::Spell::SpellType type = static_cast<ESM::Spell::SpellType>(spell->mData.mType);
                     if (type != ESM::Spell::ST_Spell && type != ESM::Spell::ST_Power)
                     {
+                        // Add spell effect to *this actor's* queue immediately
+                        creatureStats.getActiveSpells().addSpell(spell, ptr);
                         // Apply looping particles immediately for constant effects
                         MWBase::Environment::get().getWorld()->applyLoopingParticles(ptr);
                     }
@@ -492,17 +494,6 @@ namespace MWScript
                     runtime.pop();
 
                     MWMechanics::CreatureStats& creatureStats = ptr.getClass().getCreatureStats(ptr);
-                    // The spell may have an instant effect which must be handled before the spell's removal.
-                    for (const auto& effect : creatureStats.getSpells().getMagicEffects())
-                    {
-                        if (effect.second.getMagnitude() <= 0)
-                            continue;
-                        MWMechanics::CastSpell cast(ptr, ptr);
-                        if (cast.applyInstantEffect(ptr, ptr, effect.first, effect.second.getMagnitude()))
-                            creatureStats.getSpells().purgeEffect(effect.first.mId);
-                    }
-
-                    MWBase::Environment::get().getMechanicsManager()->restoreStatsAfterCorprus(ptr, id);
                     creatureStats.getSpells().remove (id);
 
                     MWBase::WindowManager *wm = MWBase::Environment::get().getWindowManager();
@@ -527,8 +518,7 @@ namespace MWScript
                     std::string spellid = runtime.getStringLiteral (runtime[0].mInteger);
                     runtime.pop();
 
-                    ptr.getClass().getCreatureStats (ptr).getActiveSpells().removeEffects(spellid);
-                    ptr.getClass().getCreatureStats (ptr).getSpells().removeEffects(spellid);
+                    ptr.getClass().getCreatureStats (ptr).getActiveSpells().removeEffects(ptr, spellid);
                 }
         };
 
@@ -544,7 +534,7 @@ namespace MWScript
                     Interpreter::Type_Integer effectId = runtime[0].mInteger;
                     runtime.pop();
 
-                    ptr.getClass().getCreatureStats (ptr).getActiveSpells().purgeEffect(effectId);
+                    ptr.getClass().getCreatureStats (ptr).getActiveSpells().purgeEffect(ptr, effectId);
                 }
         };
 
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 3d82a30c29..b2ac511509 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -26,6 +26,7 @@
 #include "../mwmechanics/recharge.hpp"
 
 #include "ptr.hpp"
+#include "esmloader.hpp"
 #include "esmstore.hpp"
 #include "class.hpp"
 #include "containerstore.hpp"
@@ -176,6 +177,13 @@ namespace
 
         if (state.mVersion < 15)
             fixRestocking(record, state);
+        if (state.mVersion < 17)
+        {
+            if constexpr (std::is_same_v<T, ESM::Creature>)
+                MWWorld::convertMagicEffects(state.mCreatureStats, state.mInventory);
+            else if constexpr (std::is_same_v<T, ESM::NPC>)
+                MWWorld::convertMagicEffects(state.mCreatureStats, state.mInventory, &state.mNpcStats);
+        }
 
         if (state.mRef.mRefNum.hasContentFile())
         {
diff --git a/apps/openmw/mwworld/esmloader.cpp b/apps/openmw/mwworld/esmloader.cpp
index b12d646e70..a01128fe36 100644
--- a/apps/openmw/mwworld/esmloader.cpp
+++ b/apps/openmw/mwworld/esmloader.cpp
@@ -2,6 +2,26 @@
 #include "esmstore.hpp"
 
 #include <components/esm/esmreader.hpp>
+#include <components/esm/npcstate.hpp>
+
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+
+#include "../mwmechanics/magiceffects.hpp"
+
+namespace
+{
+    template<class T>
+    void getEnchantedItem(const std::string& id, std::string& enchantment, std::string& itemName)
+    {
+        const T* item = MWBase::Environment::get().getWorld()->getStore().get<T>().search(id);
+        if(item)
+        {
+            enchantment = item->mEnchant;
+            itemName = item->mName;
+        }
+    }
+}
 
 namespace MWWorld
 {
@@ -28,4 +48,187 @@ void EsmLoader::load(const boost::filesystem::path& filepath, int& index)
   mStore.load(mEsm[index], &mListener);
 }
 
+    void convertMagicEffects(ESM::CreatureStats& creatureStats, ESM::InventoryState& inventory, ESM::NpcStats* npcStats)
+    {
+        const auto& store = MWBase::Environment::get().getWorld()->getStore();
+        // Convert corprus to format 10
+        for (const auto& [id, oldStats] : creatureStats.mSpells.mCorprusSpells)
+        {
+            const ESM::Spell* spell = store.get<ESM::Spell>().search(id);
+            if (!spell)
+                continue;
+
+            ESM::CreatureStats::CorprusStats stats;
+            stats.mNextWorsening = oldStats.mNextWorsening;
+            for (int i=0; i<ESM::Attribute::Length; ++i)
+                stats.mWorsenings[i] = 0;
+
+            for (auto& effect : spell->mEffects.mList)
+            {
+                if (effect.mEffectID == ESM::MagicEffect::DrainAttribute)
+                    stats.mWorsenings[effect.mAttribute] = oldStats.mWorsenings;
+            }
+            creatureStats.mCorprusSpells[id] = stats;
+        }
+        // Convert to format 17
+        for(const auto& [id, oldParams] : creatureStats.mSpells.mSpellParams)
+        {
+            const ESM::Spell* spell = store.get<ESM::Spell>().search(id);
+            if (!spell || spell->mData.mType == ESM::Spell::ST_Spell || spell->mData.mType == ESM::Spell::ST_Power)
+                continue;
+            ESM::ActiveSpells::ActiveSpellParams params;
+            params.mId = id;
+            params.mDisplayName = spell->mName;
+            params.mItem.unset();
+            params.mCasterActorId = creatureStats.mActorId;
+            if(spell->mData.mType == ESM::Spell::ST_Ability)
+                params.mType = ESM::ActiveSpells::Type_Ability;
+            else
+                params.mType = ESM::ActiveSpells::Type_Permanent;
+            params.mWorsenings = -1;
+            int effectIndex = 0;
+            for(const auto& enam : spell->mEffects.mList)
+            {
+                if(oldParams.mPurgedEffects.find(effectIndex) == oldParams.mPurgedEffects.end())
+                {
+                    ESM::ActiveEffect effect;
+                    effect.mEffectId = enam.mEffectID;
+                    effect.mArg = MWMechanics::EffectKey(enam).mArg;
+                    effect.mDuration = -1;
+                    effect.mTimeLeft = -1;
+                    effect.mEffectIndex = effectIndex;
+                    auto rand = oldParams.mEffectRands.find(effectIndex);
+                    if(rand != oldParams.mEffectRands.end())
+                    {
+                        float magnitude = (enam.mMagnMax - enam.mMagnMin) * rand->second + enam.mMagnMin;
+                        effect.mMagnitude = magnitude;
+                        effect.mMinMagnitude = magnitude;
+                        effect.mMaxMagnitude = magnitude;
+                        // Prevent recalculation of resistances
+                        effect.mFlags = ESM::ActiveEffect::Flag_Ignore_Resistances;
+                    }
+                    else
+                    {
+                        effect.mMagnitude = 0.f;
+                        effect.mMinMagnitude = enam.mMagnMin;
+                        effect.mMaxMagnitude = enam.mMagnMax;
+                        effect.mFlags = ESM::ActiveEffect::Flag_None;
+                    }
+                    params.mEffects.emplace_back(effect);
+                }
+                effectIndex++;
+            }
+            creatureStats.mActiveSpells.mSpells.emplace_back(params);
+        }
+        std::multimap<std::string, int> equippedItems;
+        for(std::size_t i = 0; i < inventory.mItems.size(); ++i)
+        {
+            const ESM::ObjectState& item = inventory.mItems[i];
+            auto slot = inventory.mEquipmentSlots.find(i);
+            if(slot != inventory.mEquipmentSlots.end())
+                equippedItems.emplace(item.mRef.mRefID, slot->second);
+        }
+        for(const auto& [id, oldMagnitudes] : inventory.mPermanentMagicEffectMagnitudes)
+        {
+            std::string eId;
+            std::string name;
+            switch(store.find(id))
+            {
+                case ESM::REC_ARMO:
+                    getEnchantedItem<ESM::Armor>(id, eId, name);
+                    break;
+                case ESM::REC_CLOT:
+                    getEnchantedItem<ESM::Clothing>(id, eId, name);
+                    break;
+                case ESM::REC_WEAP:
+                    getEnchantedItem<ESM::Weapon>(id, eId, name);
+                    break;
+            }
+            if(eId.empty())
+                continue;
+            const ESM::Enchantment* enchantment = store.get<ESM::Enchantment>().search(eId);
+            if(!enchantment)
+                continue;
+            ESM::ActiveSpells::ActiveSpellParams params;
+            params.mId = id;
+            params.mDisplayName = name;
+            params.mCasterActorId = creatureStats.mActorId;
+            params.mType = ESM::ActiveSpells::Type_Enchantment;
+            params.mWorsenings = -1;
+            for(std::size_t effectIndex = 0; effectIndex < oldMagnitudes.size() && effectIndex < enchantment->mEffects.mList.size(); ++effectIndex)
+            {
+                const auto& enam = enchantment->mEffects.mList[effectIndex];
+                auto [random, multiplier] = oldMagnitudes[effectIndex];
+                float magnitude = (enam.mMagnMax - enam.mMagnMin) * random + enam.mMagnMin;
+                magnitude *= multiplier;
+                if(magnitude <= 0)
+                    continue;
+                ESM::ActiveEffect effect;
+                effect.mEffectId = enam.mEffectID;
+                effect.mMagnitude = magnitude;
+                effect.mMinMagnitude = magnitude;
+                effect.mMaxMagnitude = magnitude;
+                effect.mArg = MWMechanics::EffectKey(enam).mArg;
+                effect.mDuration = -1;
+                effect.mTimeLeft = -1;
+                effect.mEffectIndex = static_cast<int>(effectIndex);
+                // Prevent recalculation of resistances
+                effect.mFlags = ESM::ActiveEffect::Flag_Ignore_Resistances;
+                params.mEffects.emplace_back(effect);
+            }
+            auto [begin, end] = equippedItems.equal_range(id);
+            for(auto it = begin; it != end; ++it)
+            {
+                params.mItem = { static_cast<unsigned int>(it->second), 0 };
+                creatureStats.mActiveSpells.mSpells.emplace_back(params);
+            }
+        }
+        for(const auto& spell : creatureStats.mCorprusSpells)
+        {
+            auto it = std::find_if(creatureStats.mActiveSpells.mSpells.begin(), creatureStats.mActiveSpells.mSpells.end(), [&] (const auto& params) { return params.mId == spell.first; });
+            if(it != creatureStats.mActiveSpells.mSpells.end())
+            {
+                it->mNextWorsening = spell.second.mNextWorsening;
+                int worsenings = 0;
+                for(int i = 0; i < ESM::Attribute::Length; ++i)
+                    worsenings = std::max(spell.second.mWorsenings[i], worsenings);
+                it->mWorsenings = worsenings;
+            }
+        }
+        for(const auto& [key, actorId] : creatureStats.mSummonedCreatureMap)
+        {
+            if(actorId == -1)
+                continue;
+            for(auto& params : creatureStats.mActiveSpells.mSpells)
+            {
+                if(params.mId == key.mSourceId)
+                {
+                    bool found = false;
+                    for(auto& effect : params.mEffects)
+                    {
+                        if(effect.mEffectId == key.mEffectId && effect.mEffectIndex == key.mEffectIndex)
+                        {
+                            effect.mArg = actorId;
+                            found = true;
+                            break;
+                        }
+                    }
+                    if(found)
+                        break;
+                }
+            }
+        }
+        // Reset modifiers that were previously recalculated each frame
+        for(std::size_t i = 0; i < ESM::Attribute::Length; ++i)
+            creatureStats.mAttributes[i].mMod = 0.f;
+        for(std::size_t i = 0; i < 3; ++i)
+            creatureStats.mDynamic[i].mMod = 0.f;
+        for(std::size_t i = 0; i < 4; ++i)
+            creatureStats.mAiSettings[i].mMod = 0.f;
+        if(npcStats)
+        {
+            for(std::size_t i = 0; i < ESM::Skill::Length; ++i)
+                npcStats->mSkills[i].mMod = 0.f;
+        }
+    }
 } /* namespace MWWorld */
diff --git a/apps/openmw/mwworld/esmloader.hpp b/apps/openmw/mwworld/esmloader.hpp
index 506105bebb..50631603de 100644
--- a/apps/openmw/mwworld/esmloader.hpp
+++ b/apps/openmw/mwworld/esmloader.hpp
@@ -13,6 +13,9 @@ namespace ToUTF8
 namespace ESM
 {
     class ESMReader;
+    struct CreatureStats;
+    struct InventoryState;
+    struct NpcStats;
 }
 
 namespace MWWorld
@@ -33,6 +36,8 @@ struct EsmLoader : public ContentLoader
       ToUTF8::Utf8Encoder* mEncoder;
 };
 
+void convertMagicEffects(ESM::CreatureStats& creatureStats, ESM::InventoryState& inventory, ESM::NpcStats* npcStats = nullptr);
+
 } /* namespace MWWorld */
 
 #endif // ESMLOADER_HPP
diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp
index 0b8af4463c..49e60af1fd 100644
--- a/apps/openmw/mwworld/inventorystore.cpp
+++ b/apps/openmw/mwworld/inventorystore.cpp
@@ -108,11 +108,9 @@ MWWorld::InventoryStore::InventoryStore()
 
 MWWorld::InventoryStore::InventoryStore (const InventoryStore& store)
  : ContainerStore (store)
- , mMagicEffects(store.mMagicEffects)
  , mInventoryListener(store.mInventoryListener)
  , mUpdatesEnabled(store.mUpdatesEnabled)
  , mFirstAutoEquip(store.mFirstAutoEquip)
- , mPermanentMagicEffectMagnitudes(store.mPermanentMagicEffectMagnitudes)
  , mSelectedEnchantItem(end())
 {
     copySlots (store);
@@ -125,9 +123,7 @@ MWWorld::InventoryStore& MWWorld::InventoryStore::operator= (const InventoryStor
 
     mListener = store.mListener;
     mInventoryListener = store.mInventoryListener;
-    mMagicEffects = store.mMagicEffects;
     mFirstAutoEquip = store.mFirstAutoEquip;
-    mPermanentMagicEffectMagnitudes = store.mPermanentMagicEffectMagnitudes;
     mRechargingItemsUpToDate = false;
     ContainerStore::operator= (store);
     mSlots.clear();
@@ -186,8 +182,6 @@ void MWWorld::InventoryStore::equip (int slot, const ContainerStoreIterator& ite
     flagAsModified();
 
     fireEquipmentChangedEvent(actor);
-
-    updateMagicEffects(actor);
 }
 
 void MWWorld::InventoryStore::unequipAll(const MWWorld::Ptr& actor)
@@ -199,7 +193,6 @@ void MWWorld::InventoryStore::unequipAll(const MWWorld::Ptr& actor)
     mUpdatesEnabled = true;
 
     fireEquipmentChangedEvent(actor);
-    updateMagicEffects(actor);
 }
 
 MWWorld::ContainerStoreIterator MWWorld::InventoryStore::getSlot (int slot)
@@ -554,7 +547,6 @@ void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& actor)
     {
         mSlots.swap (slots_);
         fireEquipmentChangedEvent(actor);
-        updateMagicEffects(actor);
         flagAsModified();
     }
 }
@@ -567,129 +559,6 @@ MWWorld::ContainerStoreIterator MWWorld::InventoryStore::getPreferredShield(cons
     return slots[Slot_CarriedLeft];
 }
 
-const MWMechanics::MagicEffects& MWWorld::InventoryStore::getMagicEffects() const
-{
-    return mMagicEffects;
-}
-
-void MWWorld::InventoryStore::updateMagicEffects(const Ptr& actor)
-{
-    // To avoid excessive updates during auto-equip
-    if (!mUpdatesEnabled)
-        return;
-
-    // Delay update until the listener is set up
-    if (!mInventoryListener)
-        return;
-
-    mMagicEffects = MWMechanics::MagicEffects();
-
-    const auto& stats = actor.getClass().getCreatureStats(actor);
-    if (stats.isDead() && stats.isDeathAnimationFinished())
-        return;
-
-    for (TSlots::const_iterator iter (mSlots.begin()); iter!=mSlots.end(); ++iter)
-    {
-        if (*iter==end())
-            continue;
-
-        std::string enchantmentId = (*iter)->getClass().getEnchantment (**iter);
-
-        if (!enchantmentId.empty())
-        {
-            const ESM::Enchantment& enchantment =
-                *MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().find (enchantmentId);
-
-            if (enchantment.mData.mType != ESM::Enchantment::ConstantEffect)
-                continue;
-
-            std::vector<EffectParams> params;
-
-            bool existed = (mPermanentMagicEffectMagnitudes.find((**iter).getCellRef().getRefId()) != mPermanentMagicEffectMagnitudes.end());
-            if (!existed)
-            {
-                params.resize(enchantment.mEffects.mList.size());
-
-                int i=0;
-                for (const ESM::ENAMstruct& effect : enchantment.mEffects.mList)
-                {
-                    int delta = effect.mMagnMax - effect.mMagnMin;
-                    // Roll some dice, one for each effect
-                    if (delta)
-                        params[i].mRandom = Misc::Rng::rollDice(delta + 1) / static_cast<float>(delta);
-                    // Try resisting each effect
-                    params[i].mMultiplier = MWMechanics::getEffectMultiplier(effect.mEffectID, actor, actor);
-                    ++i;
-                }
-
-                // Note that using the RefID as a key here is not entirely correct.
-                // Consider equipping the same item twice (e.g. a ring)
-                // However, permanent enchantments with a random magnitude are kind of an exploit anyway,
-                // so it doesn't really matter if both items will get the same magnitude. *Extreme* edge case.
-                mPermanentMagicEffectMagnitudes[(**iter).getCellRef().getRefId()] = params;
-            }
-            else
-                params = mPermanentMagicEffectMagnitudes[(**iter).getCellRef().getRefId()];
-
-            int i=0;
-            for (const ESM::ENAMstruct& effect : enchantment.mEffects.mList)
-            {
-                const ESM::MagicEffect *magicEffect =
-                    MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find (
-                    effect.mEffectID);
-
-                // Fully resisted or can't be applied to target?
-                if (params[i].mMultiplier == 0 || !MWMechanics::checkEffectTarget(effect.mEffectID, actor, actor, actor == MWMechanics::getPlayer()))
-                {
-                    i++;
-                    continue;
-                }
-
-                float magnitude = effect.mMagnMin + (effect.mMagnMax - effect.mMagnMin) * params[i].mRandom;
-                magnitude *= params[i].mMultiplier;
-
-                if (!existed)
-                {
-                    // During first auto equip, we don't play any sounds.
-                    // Basically we don't want sounds when the actor is first loaded,
-                    // the items should appear as if they'd always been equipped.
-                    mInventoryListener->permanentEffectAdded(magicEffect, !mFirstAutoEquip);
-                }
-
-                if (magnitude)
-                    mMagicEffects.add (effect, magnitude);
-
-                i++;
-            }
-        }
-    }
-
-    // Now drop expired effects
-    for (TEffectMagnitudes::iterator it = mPermanentMagicEffectMagnitudes.begin();
-         it != mPermanentMagicEffectMagnitudes.end();)
-    {
-        bool found = false;
-        for (TSlots::const_iterator iter (mSlots.begin()); iter!=mSlots.end(); ++iter)
-        {
-            if (*iter == end())
-                continue;
-            if ((**iter).getCellRef().getRefId() == it->first)
-            {
-                found = true;
-            }
-        }
-        if (!found)
-            mPermanentMagicEffectMagnitudes.erase(it++);
-        else
-            ++it;
-    }
-
-    // Magic effects are normally not updated when paused, but we need this to make resistances work immediately after equipping
-    MWBase::Environment::get().getMechanicsManager()->updateMagicEffects(actor);
-
-    mFirstAutoEquip = false;
-}
-
 bool MWWorld::InventoryStore::stacks(const ConstPtr& ptr1, const ConstPtr& ptr2) const
 {
     bool canStack = MWWorld::ContainerStore::stacks(ptr1, ptr2);
@@ -800,7 +669,6 @@ MWWorld::ContainerStoreIterator MWWorld::InventoryStore::unequipSlot(int slot, c
         if (applyUpdates)
         {
             fireEquipmentChangedEvent(actor);
-            updateMagicEffects(actor);
         }
 
         return retval;
@@ -848,7 +716,7 @@ MWWorld::ContainerStoreIterator MWWorld::InventoryStore::unequipItemQuantity(con
     return unstack(item, actor, item.getRefData().getCount() - count);
 }
 
-MWWorld::InventoryStoreListener* MWWorld::InventoryStore::getInvListener()
+MWWorld::InventoryStoreListener* MWWorld::InventoryStore::getInvListener() const
 {
     return mInventoryListener;
 }
@@ -856,7 +724,6 @@ MWWorld::InventoryStoreListener* MWWorld::InventoryStore::getInvListener()
 void MWWorld::InventoryStore::setInvListener(InventoryStoreListener *listener, const Ptr& actor)
 {
     mInventoryListener = listener;
-    updateMagicEffects(actor);
 }
 
 void MWWorld::InventoryStore::fireEquipmentChangedEvent(const Ptr& actor)
@@ -875,105 +742,6 @@ void MWWorld::InventoryStore::fireEquipmentChangedEvent(const Ptr& actor)
     */
 }
 
-void MWWorld::InventoryStore::visitEffectSources(MWMechanics::EffectSourceVisitor &visitor)
-{
-    for (TSlots::const_iterator iter (mSlots.begin()); iter!=mSlots.end(); ++iter)
-    {
-        if (*iter==end())
-            continue;
-
-        std::string enchantmentId = (*iter)->getClass().getEnchantment (**iter);
-        if (enchantmentId.empty())
-            continue;
-
-        const ESM::Enchantment& enchantment =
-            *MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().find (enchantmentId);
-
-        if (enchantment.mData.mType != ESM::Enchantment::ConstantEffect)
-            continue;
-
-        if (mPermanentMagicEffectMagnitudes.find((**iter).getCellRef().getRefId()) == mPermanentMagicEffectMagnitudes.end())
-            continue;
-
-        int i=0;
-        for (const ESM::ENAMstruct& effect : enchantment.mEffects.mList)
-        {
-            i++;
-            // Don't get spell icon display information for enchantments that weren't actually applied
-            if (mMagicEffects.get(MWMechanics::EffectKey(effect)).getMagnitude() == 0)
-                continue;
-            const EffectParams& params = mPermanentMagicEffectMagnitudes[(**iter).getCellRef().getRefId()][i-1];
-            float magnitude = effect.mMagnMin + (effect.mMagnMax - effect.mMagnMin) * params.mRandom;
-            magnitude *= params.mMultiplier;
-            if (magnitude > 0)
-                visitor.visit(MWMechanics::EffectKey(effect), i-1, (**iter).getClass().getName(**iter), (**iter).getCellRef().getRefId(), -1, magnitude);
-        }
-    }
-}
-
-void MWWorld::InventoryStore::purgeEffect(short effectId, bool wholeSpell)
-{
-    for (TSlots::const_iterator it = mSlots.begin(); it != mSlots.end(); ++it)
-    {
-        if (*it != end())
-            purgeEffect(effectId, (*it)->getCellRef().getRefId(), wholeSpell);
-    }
-}
-
-void MWWorld::InventoryStore::purgeEffect(short effectId, const std::string &sourceId, bool wholeSpell, int effectIndex)
-{
-    TEffectMagnitudes::iterator effectMagnitudeIt = mPermanentMagicEffectMagnitudes.find(sourceId);
-    if (effectMagnitudeIt == mPermanentMagicEffectMagnitudes.end())
-        return;
-
-    for (TSlots::const_iterator iter (mSlots.begin()); iter!=mSlots.end(); ++iter)
-    {
-        if (*iter==end())
-            continue;
-
-        if ((*iter)->getCellRef().getRefId() != sourceId)
-            continue;
-
-        std::string enchantmentId = (*iter)->getClass().getEnchantment (**iter);
-
-        if (!enchantmentId.empty())
-        {
-            const ESM::Enchantment& enchantment =
-                *MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().find (enchantmentId);
-
-            if (enchantment.mData.mType != ESM::Enchantment::ConstantEffect)
-                continue;
-
-            std::vector<EffectParams>& params = effectMagnitudeIt->second;
-
-            int i=0;
-            for (std::vector<ESM::ENAMstruct>::const_iterator effectIt (enchantment.mEffects.mList.begin());
-                effectIt!=enchantment.mEffects.mList.end(); ++effectIt, ++i)
-            {
-                if (effectIt->mEffectID != effectId)
-                    continue;
-
-                if (effectIndex >= 0 && effectIndex != i)
-                    continue;
-
-                if (wholeSpell)
-                {
-                    mPermanentMagicEffectMagnitudes.erase(sourceId);
-                    return;
-                }
-
-                float magnitude = effectIt->mMagnMin + (effectIt->mMagnMax - effectIt->mMagnMin) * params[i].mRandom;
-                magnitude *= params[i].mMultiplier;
-
-                if (magnitude)
-                    mMagicEffects.add (*effectIt, -magnitude);
-
-                params[i].mMultiplier = 0;
-            }
-        }
-    }
-}
-
 void MWWorld::InventoryStore::clear()
 {
     mSlots.clear();
@@ -991,38 +759,9 @@ bool MWWorld::InventoryStore::isEquipped(const MWWorld::ConstPtr &item)
     return false;
 }
 
-void MWWorld::InventoryStore::writeState(ESM::InventoryState &state) const
-{
-    MWWorld::ContainerStore::writeState(state);
-
-    for (TEffectMagnitudes::const_iterator it = mPermanentMagicEffectMagnitudes.begin(); it != mPermanentMagicEffectMagnitudes.end(); ++it)
-    {
-        std::vector<std::pair<float, float> > params;
-        for (std::vector<EffectParams>::const_iterator pIt = it->second.begin(); pIt != it->second.end(); ++pIt)
-        {
-            params.emplace_back(pIt->mRandom, pIt->mMultiplier);
-        }
-
-        state.mPermanentMagicEffectMagnitudes[it->first] = params;
-    }
-}
-
-void MWWorld::InventoryStore::readState(const ESM::InventoryState &state)
+bool MWWorld::InventoryStore::isFirstEquip()
 {
-    MWWorld::ContainerStore::readState(state);
-
-    for (ESM::InventoryState::TEffectMagnitudes::const_iterator it = state.mPermanentMagicEffectMagnitudes.begin();
-         it != state.mPermanentMagicEffectMagnitudes.end(); ++it)
-    {
-        std::vector<EffectParams> params;
-        for (std::vector<std::pair<float, float> >::const_iterator pIt = it->second.begin(); pIt != it->second.end(); ++pIt)
-        {
-            EffectParams p;
-            p.mRandom = pIt->first;
-            p.mMultiplier = pIt->second;
-            params.push_back(p);
-        }
-
-        mPermanentMagicEffectMagnitudes[it->first] = params;
-    }
+    bool first = mFirstAutoEquip;
+    mFirstAutoEquip = false;
+    return first;
 }
diff --git a/apps/openmw/mwworld/inventorystore.hpp b/apps/openmw/mwworld/inventorystore.hpp
index 32dc0d2e91..01c53d7028 100644
--- a/apps/openmw/mwworld/inventorystore.hpp
+++ b/apps/openmw/mwworld/inventorystore.hpp
@@ -25,15 +25,6 @@ namespace MWWorld
          */
         virtual void equipmentChanged () {}
 
-        /**
-         * @param effect
-         * @param isNew Is this effect new (e.g. the item for it was just now manually equipped)
-         *              or was it loaded from a savegame / initial game state? \n
-         *              If it isn't new, non-looping VFX should not be played.
-         * @param playSound Play effect sound?
-         */
-        virtual void permanentEffectAdded (const ESM::MagicEffect *magicEffect, bool isNew) {}
-
         virtual ~InventoryStoreListener() = default;
     };
 
@@ -68,8 +59,6 @@ namespace MWWorld
 
         private:
 
-            MWMechanics::MagicEffects mMagicEffects;
-
             InventoryStoreListener* mInventoryListener;
 
             // Enables updates of magic effects and actor model whenever items are equipped or unequipped.
@@ -78,19 +67,6 @@ namespace MWWorld
 
             bool mFirstAutoEquip;
 
-            // Vanilla allows permanent effects with a random magnitude, so it needs to be stored here.
-            // We also need this to only play sounds and particle effects when the item is equipped, rather than on every update.
-            struct EffectParams
-            {
-                // Modifier to scale between min and max magnitude
-                float mRandom;
-                // Multiplier for when an effect was fully or partially resisted
-                float mMultiplier;
-            };
-
-            typedef std::map<std::string, std::vector<EffectParams> > TEffectMagnitudes;
-            TEffectMagnitudes mPermanentMagicEffectMagnitudes;
-
             typedef std::vector<ContainerStoreIterator> TSlots;
 
             TSlots mSlots;
@@ -106,8 +82,6 @@ namespace MWWorld
 
             void initSlots (TSlots& slots_);
 
-            void updateMagicEffects(const Ptr& actor);
-
             void fireEquipmentChangedEvent(const Ptr& actor);
 
             void storeEquipmentState (const MWWorld::LiveCellRefBase& ref, int index, ESM::InventoryState& inventory) const override;
@@ -161,9 +135,6 @@ namespace MWWorld
             void autoEquip (const MWWorld::Ptr& actor);
             ///< Auto equip items according to stats and item value.
 
-            const MWMechanics::MagicEffects& getMagicEffects() const;
-            ///< Return magic effects from worn items.
-
             bool stacks (const ConstPtr& ptr1, const ConstPtr& ptr2) const override;
             ///< @return true if the two specified objects can stack with each other
 
@@ -198,22 +169,12 @@ namespace MWWorld
             void setInvListener (InventoryStoreListener* listener, const Ptr& actor);
             ///< Set a listener for various events, see \a InventoryStoreListener
 
-            InventoryStoreListener* getInvListener();
-
-            void visitEffectSources (MWMechanics::EffectSourceVisitor& visitor);
-
-            void purgeEffect (short effectId, bool wholeSpell = false);
-            ///< Remove a magic effect
-
-            void purgeEffect (short effectId, const std::string& sourceId, bool wholeSpell = false, int effectIndex=-1);
-            ///< Remove a magic effect
+            InventoryStoreListener* getInvListener() const;
 
             void clear() override;
             ///< Empty container.
 
-            void writeState (ESM::InventoryState& state) const override;
-
-            void readState (const ESM::InventoryState& state) override;
+            bool isFirstEquip();
     };
 }
 
diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp
index d8e2fb2f0d..caa0600f7c 100644
--- a/apps/openmw/mwworld/player.cpp
+++ b/apps/openmw/mwworld/player.cpp
@@ -22,9 +22,10 @@
 #include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/spellutil.hpp"
 
+#include "cellstore.hpp"
 #include "class.hpp"
+#include "esmloader.hpp"
 #include "ptr.hpp"
-#include "cellstore.hpp"
 
 namespace MWWorld
 {
@@ -381,6 +382,14 @@ namespace MWWorld
                 // this is the one object we can not silently drop.
                 throw std::runtime_error ("invalid player state record (object state)");
             }
+            if (reader.getFormat() < 17)
+            {
+                convertMagicEffects(player.mObject.mCreatureStats, player.mObject.mInventory, &player.mObject.mNpcStats);
+                for(std::size_t i = 0; i < ESM::Attribute::Length; ++i)
+                    player.mSaveAttributes[i].mMod = 0.f;
+                for(std::size_t i = 0; i < ESM::Skill::Length; ++i)
+                    player.mSaveSkills[i].mMod = 0.f;
+            }
 
             if (!player.mObject.mEnabled)
             {
diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index 25e7f0c7de..3b7be64ad1 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -256,7 +256,7 @@ namespace MWWorld
         state.mEffectAnimationTime->addTime(duration);
     }
 
-    void ProjectileManager::launchMagicBolt(const std::string &spellId, const Ptr &caster, const osg::Vec3f& fallbackDirection)
+    void ProjectileManager::launchMagicBolt(const std::string &spellId, const Ptr &caster, const osg::Vec3f& fallbackDirection, int slot)
     {
         osg::Vec3f pos = caster.getRefData().getPosition().asVec3();
         if (caster.getClass().isActor())
@@ -278,6 +278,7 @@ namespace MWWorld
         MagicBoltState state;
         state.mSpellId = spellId;
         state.mCasterHandle = caster;
+        state.mSlot = slot;
         if (caster.getClass().isActor())
             state.mActorId = caster.getClass().getCreatureStats(caster).getActorId();
         else
@@ -545,10 +546,10 @@ namespace MWWorld
             cast.mHitPosition = pos;
             cast.mId = magicBoltState.mSpellId;
             cast.mSourceName = magicBoltState.mSourceName;
-            cast.mStack = false;
+            cast.mSlot = magicBoltState.mSlot;
             cast.inflict(target, caster, magicBoltState.mEffects, ESM::RT_Target, false, true);
 
-            MWBase::Environment::get().getWorld()->explodeSpell(pos, magicBoltState.mEffects, caster, target, ESM::RT_Target, magicBoltState.mSpellId, magicBoltState.mSourceName);
+            MWBase::Environment::get().getWorld()->explodeSpell(pos, magicBoltState.mEffects, caster, target, ESM::RT_Target, magicBoltState.mSpellId, magicBoltState.mSourceName, false, magicBoltState.mSlot);
             magicBoltState.mToDelete = true;
         }
 
@@ -628,7 +629,7 @@ namespace MWWorld
             state.mPosition = ESM::Vector3(osg::Vec3f(it->mNode->getPosition()));
             state.mOrientation = ESM::Quaternion(osg::Quat(it->mNode->getAttitude()));
             state.mActorId = it->mActorId;
-
+            state.mSlot = it->mSlot;
             state.mSpellId = it->mSpellId;
             state.mSpeed = it->mSpeed;
 
@@ -684,6 +685,7 @@ namespace MWWorld
             state.mSpellId = esm.mSpellId;
             state.mActorId = esm.mActorId;
             state.mToDelete = false;
+            state.mSlot = esm.mSlot;
             std::string texture;
 
             try
diff --git a/apps/openmw/mwworld/projectilemanager.hpp b/apps/openmw/mwworld/projectilemanager.hpp
index 4dc250dc5f..f889250e1d 100644
--- a/apps/openmw/mwworld/projectilemanager.hpp
+++ b/apps/openmw/mwworld/projectilemanager.hpp
@@ -49,7 +49,7 @@ namespace MWWorld
                 MWRender::RenderingManager* rendering, MWPhysics::PhysicsSystem* physics);
 
         /// If caster is an actor, the actor's facing orientation is used. Otherwise fallbackDirection is used.
-        void launchMagicBolt (const std::string &spellId, const MWWorld::Ptr& caster, const osg::Vec3f& fallbackDirection);
+        void launchMagicBolt (const std::string &spellId, const MWWorld::Ptr& caster, const osg::Vec3f& fallbackDirection, int slot);
 
         void launchProjectile (const MWWorld::Ptr& actor, const MWWorld::ConstPtr& projectile,
                                        const osg::Vec3f& pos, const osg::Quat& orient, const MWWorld::Ptr& bow, float speed, float attackStrength);
@@ -107,6 +107,7 @@ namespace MWWorld
             ESM::EffectList mEffects;
 
             float mSpeed;
+            int mSlot;
 
             std::vector<MWBase::Sound*> mSounds;
             std::set<std::string> mSoundIds;
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index da5daed295..ea455a31cf 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1862,7 +1862,7 @@ namespace MWWorld
             mRendering->getCamera()->setSneakOffset(0.f);
 
         int blind = 0;
-        auto& magicEffects = player.getClass().getCreatureStats(player).getMagicEffects();
+        const auto& magicEffects = player.getClass().getCreatureStats(player).getMagicEffects();
         if (!mGodMode)
             blind = static_cast<int>(magicEffects.get(ESM::MagicEffect::Blind).getMagnitude());
         MWBase::Environment::get().getWindowManager()->setBlindness(std::max(0, std::min(100, blind)));
@@ -3109,7 +3109,20 @@ namespace MWWorld
         {
             MWWorld::InventoryStore& inv = actor.getClass().getInventoryStore(actor);
             if (inv.getSelectedEnchantItem() != inv.end())
-                cast.cast(*inv.getSelectedEnchantItem());
+            {
+                const auto& itemPtr = *inv.getSelectedEnchantItem();
+                auto [slots, _] = itemPtr.getClass().getEquipmentSlots(itemPtr);
+                int slot = 0;
+                for(std::size_t i = 0; i < slots.size(); ++i)
+                {
+                    if(inv.getSlot(slots[i]) == inv.getSelectedEnchantItem())
+                    {
+                        slot = slots[i];
+                        break;
+                    }
+                }
+                cast.cast(itemPtr, slot);
+            }
         }
     }
 
@@ -3144,9 +3157,9 @@ namespace MWWorld
             mProjectileManager->launchProjectile(actor, projectile, worldPos, orient, bow, speed, attackStrength);
     }
 
-    void World::launchMagicBolt (const std::string &spellId, const MWWorld::Ptr& caster, const osg::Vec3f& fallbackDirection)
+    void World::launchMagicBolt (const std::string &spellId, const MWWorld::Ptr& caster, const osg::Vec3f& fallbackDirection, int slot)
     {
-        mProjectileManager->launchMagicBolt(spellId, caster, fallbackDirection);
+        mProjectileManager->launchMagicBolt(spellId, caster, fallbackDirection, slot);
     }
 
     void World::updateProjectilesCasters()
@@ -3154,46 +3167,24 @@ namespace MWWorld
         mProjectileManager->updateCasters();
     }
 
-    class ApplyLoopingParticlesVisitor : public MWMechanics::EffectSourceVisitor
-    {
-    private:
-        MWWorld::Ptr mActor;
-
-    public:
-        ApplyLoopingParticlesVisitor(const MWWorld::Ptr& actor)
-            : mActor(actor)
-        {
-        }
-
-        void visit (MWMechanics::EffectKey key, int /*effectIndex*/,
-                            const std::string& /*sourceName*/, const std::string& /*sourceId*/, int /*casterActorId*/,
-                            float /*magnitude*/, float /*remainingTime*/ = -1, float /*totalTime*/ = -1) override
-        {
-            const ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
-            const auto magicEffect = store.get<ESM::MagicEffect>().find(key.mId);
-            if ((magicEffect->mData.mFlags & ESM::MagicEffect::ContinuousVfx) == 0)
-                return;
-            const ESM::Static* castStatic;
-            if (!magicEffect->mHit.empty())
-                castStatic = store.get<ESM::Static>().find (magicEffect->mHit);
-            else
-                castStatic = store.get<ESM::Static>().find ("VFX_DefaultHit");
-            MWRender::Animation* anim = MWBase::Environment::get().getWorld()->getAnimation(mActor);
-            if (anim && !castStatic->mModel.empty())
-                anim->addEffect("meshes\\" + castStatic->mModel, magicEffect->mIndex, /*loop*/true, "", magicEffect->mParticle);
-        }
-    };
-
     void World::applyLoopingParticles(const MWWorld::Ptr& ptr)
     {
         const MWWorld::Class &cls = ptr.getClass();
         if (cls.isActor())
         {
-            ApplyLoopingParticlesVisitor visitor(ptr);
-            cls.getCreatureStats(ptr).getActiveSpells().visitEffectSources(visitor);
-            cls.getCreatureStats(ptr).getSpells().visitEffectSources(visitor);
-            if (cls.hasInventoryStore(ptr))
-                cls.getInventoryStore(ptr).visitEffectSources(visitor);
+            std::set<int> playing;
+            for(const auto& params : cls.getCreatureStats(ptr).getActiveSpells())
+            {
+                for(const auto& effect : params.getEffects())
+                {
+                    if(playing.insert(effect.mEffectId).second)
+                    {
+                        const auto magicEffect = getStore().get<ESM::MagicEffect>().find(effect.mEffectId);
+                        if(magicEffect->mData.mFlags & ESM::MagicEffect::ContinuousVfx)
+                            MWMechanics::playEffects(ptr, *magicEffect, false);
+                    }
+                }
+            }
         }
     }
 
@@ -3204,10 +3195,7 @@ namespace MWWorld
 
     void World::breakInvisibility(const Ptr &actor)
     {
-        actor.getClass().getCreatureStats(actor).getSpells().purgeEffect(ESM::MagicEffect::Invisibility);
-        actor.getClass().getCreatureStats(actor).getActiveSpells().purgeEffect(ESM::MagicEffect::Invisibility);
-        if (actor.getClass().hasInventoryStore(actor))
-            actor.getClass().getInventoryStore(actor).purgeEffect(ESM::MagicEffect::Invisibility);
+        actor.getClass().getCreatureStats(actor).getActiveSpells().purgeEffect(actor, ESM::MagicEffect::Invisibility);
 
         // Normally updated once per frame, but here it is kinda important to do it right away.
         MWBase::Environment::get().getMechanicsManager()->updateMagicEffects(actor);
@@ -3700,7 +3688,7 @@ namespace MWWorld
     }
 
     void World::explodeSpell(const osg::Vec3f& origin, const ESM::EffectList& effects, const Ptr& caster, const Ptr& ignore, ESM::RangeType rangeType,
-                             const std::string& id, const std::string& sourceName, const bool fromProjectile)
+                             const std::string& id, const std::string& sourceName, const bool fromProjectile, int slot)
     {
         std::map<MWWorld::Ptr, std::vector<ESM::ENAMstruct> > toApply;
         for (const ESM::ENAMstruct& effectInfo : effects.mList)
@@ -3778,7 +3766,7 @@ namespace MWWorld
             cast.mHitPosition = origin;
             cast.mId = id;
             cast.mSourceName = sourceName;
-            cast.mStack = false;
+            cast.mSlot = slot;
             ESM::EffectList effectsToApply;
             effectsToApply.mList = applyPair.second;
             cast.inflict(applyPair.first, caster, effectsToApply, rangeType, false, true);
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 32fc9b101a..9ead6926c2 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -636,7 +636,7 @@ namespace MWWorld
              */
             void castSpell (const MWWorld::Ptr& actor, bool manualSpell=false) override;
 
-            void launchMagicBolt (const std::string& spellId, const MWWorld::Ptr& caster, const osg::Vec3f& fallbackDirection) override;
+            void launchMagicBolt (const std::string& spellId, const MWWorld::Ptr& caster, const osg::Vec3f& fallbackDirection, int slot) override;
             void launchProjectile (MWWorld::Ptr& actor, MWWorld::Ptr& projectile,
                                            const osg::Vec3f& worldPos, const osg::Quat& orient, MWWorld::Ptr& bow, float speed, float attackStrength) override;
             void updateProjectilesCasters() override;
@@ -681,7 +681,7 @@ namespace MWWorld
 
             void explodeSpell(const osg::Vec3f& origin, const ESM::EffectList& effects, const MWWorld::Ptr& caster, const MWWorld::Ptr& ignore,
                                       ESM::RangeType rangeType, const std::string& id, const std::string& sourceName,
-                                      const bool fromProjectile=false) override;
+                                      const bool fromProjectile=false, int slot = 0) override;
 
             void activate (const MWWorld::Ptr& object, const MWWorld::Ptr& actor) override;
 
diff --git a/components/esm/activespells.cpp b/components/esm/activespells.cpp
index 4017a4933e..22f862b6e4 100644
--- a/components/esm/activespells.cpp
+++ b/components/esm/activespells.cpp
@@ -3,44 +3,67 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
-namespace ESM
+namespace
 {
-
-    void ActiveSpells::save(ESMWriter &esm) const
+    void save(ESM::ESMWriter& esm, const std::vector<ESM::ActiveSpells::ActiveSpellParams>& spells, const std::string& tag)
     {
-        for (TContainer::const_iterator it = mSpells.begin(); it != mSpells.end(); ++it)
+        for (const auto& params : spells)
         {
-            esm.writeHNString ("ID__", it->first);
-
-            const ActiveSpellParams& params = it->second;
+            esm.writeHNString (tag, params.mId);
 
             esm.writeHNT ("CAST", params.mCasterActorId);
             esm.writeHNString ("DISP", params.mDisplayName);
+            esm.writeHNT ("TYPE", params.mType);
+            if(params.mItem.isSet())
+                params.mItem.save(esm, true, "ITEM");
+            if(params.mWorsenings >= 0)
+            {
+                esm.writeHNT ("WORS", params.mWorsenings);
+                esm.writeHNT ("TIME", params.mNextWorsening);
+            }
 
-            for (std::vector<ActiveEffect>::const_iterator effectIt = params.mEffects.begin(); effectIt != params.mEffects.end(); ++effectIt)
+            for (auto effect : params.mEffects)
             {
-                esm.writeHNT ("MGEF", effectIt->mEffectId);
-                if (effectIt->mArg != -1)
-                    esm.writeHNT ("ARG_", effectIt->mArg);
-                esm.writeHNT ("MAGN", effectIt->mMagnitude);
-                esm.writeHNT ("DURA", effectIt->mDuration);
-                esm.writeHNT ("EIND", effectIt->mEffectIndex);
-                esm.writeHNT ("LEFT", effectIt->mTimeLeft);
+                esm.writeHNT ("MGEF", effect.mEffectId);
+                if (effect.mArg != -1)
+                    esm.writeHNT ("ARG_", effect.mArg);
+                esm.writeHNT ("MAGN", effect.mMagnitude);
+                esm.writeHNT ("MAGN", effect.mMinMagnitude);
+                esm.writeHNT ("MAGN", effect.mMaxMagnitude);
+                esm.writeHNT ("DURA", effect.mDuration);
+                esm.writeHNT ("EIND", effect.mEffectIndex);
+                esm.writeHNT ("LEFT", effect.mTimeLeft);
+                esm.writeHNT ("FLAG", effect.mFlags);
             }
         }
     }
 
-    void ActiveSpells::load(ESMReader &esm)
+    void load(ESM::ESMReader& esm, std::vector<ESM::ActiveSpells::ActiveSpellParams>& spells, const char* tag)
     {
         int format = esm.getFormat();
 
-        while (esm.isNextSub("ID__"))
+        while (esm.isNextSub(tag))
         {
-            std::string spellId = esm.getHString();
-
-            ActiveSpellParams params;
+            ESM::ActiveSpells::ActiveSpellParams params;
+            params.mId = esm.getHString();
             esm.getHNT (params.mCasterActorId, "CAST");
             params.mDisplayName = esm.getHNString ("DISP");
+            params.mItem.unset();
+            if (format < 17)
+                params.mType = ESM::ActiveSpells::Type_Temporary;
+            else
+            {
+                esm.getHNT (params.mType, "TYPE");
+                if(esm.peekNextSub("ITEM"))
+                    params.mItem.load(esm, true, "ITEM");
+            }
+            if(esm.isNextSub("WORS"))
+            {
+                esm.getHT(params.mWorsenings);
+                esm.getHNT(params.mNextWorsening, "TIME");
+            }
+            else
+                params.mWorsenings = -1;
 
             // spell casting timestamp, no longer used
             if (esm.isNextSub("TIME"))
@@ -48,11 +71,21 @@ namespace ESM
 
             while (esm.isNextSub("MGEF"))
             {
-                ActiveEffect effect;
+                ESM::ActiveEffect effect;
                 esm.getHT(effect.mEffectId);
                 effect.mArg = -1;
                 esm.getHNOT(effect.mArg, "ARG_");
                 esm.getHNT (effect.mMagnitude, "MAGN");
+                if (format < 17)
+                {
+                    effect.mMinMagnitude = effect.mMagnitude;
+                    effect.mMaxMagnitude = effect.mMagnitude;
+                }
+                else
+                {
+                    esm.getHNT (effect.mMinMagnitude, "MAGN");
+                    esm.getHNT (effect.mMaxMagnitude, "MAGN");
+                }
                 esm.getHNT (effect.mDuration, "DURA");
                 effect.mEffectIndex = -1;
                 esm.getHNOT (effect.mEffectIndex, "EIND");
@@ -60,10 +93,30 @@ namespace ESM
                     effect.mTimeLeft = effect.mDuration;
                 else
                     esm.getHNT (effect.mTimeLeft, "LEFT");
+                if (format < 17)
+                    effect.mFlags = ESM::ActiveEffect::Flag_None;
+                else
+                    esm.getHNT (effect.mFlags, "FLAG");
 
                 params.mEffects.push_back(effect);
             }
-            mSpells.insert(std::make_pair(spellId, params));
+            spells.emplace_back(params);
         }
     }
 }
+
+namespace ESM
+{
+
+    void ActiveSpells::save(ESMWriter &esm) const
+    {
+        ::save(esm, mSpells, "ID__");
+        ::save(esm, mQueue, "QID_");
+    }
+
+    void ActiveSpells::load(ESMReader &esm)
+    {
+        ::load(esm, mSpells, "ID__");
+        ::load(esm, mQueue, "QID_");
+    }
+}
diff --git a/components/esm/activespells.hpp b/components/esm/activespells.hpp
index 1b7f8b319c..8b5f1f1946 100644
--- a/components/esm/activespells.hpp
+++ b/components/esm/activespells.hpp
@@ -1,11 +1,12 @@
 #ifndef OPENMW_ESM_ACTIVESPELLS_H
 #define OPENMW_ESM_ACTIVESPELLS_H
 
-#include "effectlist.hpp"
+#include "cellref.hpp"
 #include "defs.hpp"
+#include "effectlist.hpp"
 
 #include <string>
-#include <map>
+#include <vector>
 
 namespace ESM
 {
@@ -14,29 +15,53 @@ namespace ESM
 
     // Parameters of an effect concerning lasting effects.
     // Note we are not using ENAMstruct since the magnitude may be modified by magic resistance, etc.
-    // It could also be a negative magnitude, in case of inversing an effect, e.g. Absorb spell causes damage on target, but heals the caster.
     struct ActiveEffect
     {
+        enum Flags
+        {
+            Flag_None = 0,
+            Flag_Applied = 1 << 0,
+            Flag_Remove = 1 << 1,
+            Flag_Ignore_Resistances = 1 << 2
+        };
+
         int mEffectId;
         float mMagnitude;
+        float mMinMagnitude;
+        float mMaxMagnitude;
         int mArg; // skill or attribute
         float mDuration;
         float mTimeLeft;
         int mEffectIndex;
+        int mFlags;
     };
 
     // format 0, saved games only
     struct ActiveSpells
     {
+        enum EffectType
+        {
+            Type_Temporary,
+            Type_Ability,
+            Type_Enchantment,
+            Type_Permanent,
+            Type_Consumable
+        };
+
         struct ActiveSpellParams
         {
+            std::string mId;
             std::vector<ActiveEffect> mEffects;
             std::string mDisplayName;
             int mCasterActorId;
+            RefNum mItem;
+            EffectType mType;
+            int mWorsenings;
+            TimeStamp mNextWorsening;
         };
 
-        typedef std::multimap<std::string, ActiveSpellParams > TContainer;
-        TContainer mSpells;
+        std::vector<ActiveSpellParams> mSpells;
+        std::vector<ActiveSpellParams> mQueue;
 
         void load (ESMReader &esm);
         void save (ESMWriter &esm) const;
diff --git a/components/esm/creaturestats.cpp b/components/esm/creaturestats.cpp
index cb383992c6..d5030a6580 100644
--- a/components/esm/creaturestats.cpp
+++ b/components/esm/creaturestats.cpp
@@ -110,16 +110,31 @@ void ESM::CreatureStats::load (ESMReader &esm)
     mAiSequence.load(esm);
     mMagicEffects.load(esm);
 
-    while (esm.isNextSub("SUMM"))
+    if (esm.getFormat() < 17)
     {
-        int magicEffect;
-        esm.getHT(magicEffect);
-        std::string source = esm.getHNOString("SOUR");
-        int effectIndex = -1;
-        esm.getHNOT (effectIndex, "EIND");
-        int actorId;
-        esm.getHNT (actorId, "ACID");
-        mSummonedCreatureMap[SummonKey(magicEffect, source, effectIndex)] = actorId;
+        while (esm.isNextSub("SUMM"))
+        {
+            int magicEffect;
+            esm.getHT(magicEffect);
+            std::string source = esm.getHNOString("SOUR");
+            int effectIndex = -1;
+            esm.getHNOT (effectIndex, "EIND");
+            int actorId;
+            esm.getHNT (actorId, "ACID");
+            mSummonedCreatureMap[SummonKey(magicEffect, source, effectIndex)] = actorId;
+            mSummonedCreatures.emplace(magicEffect, actorId);
+        }
+    }
+    else
+    {
+        while (esm.isNextSub("SUMM"))
+        {
+            int magicEffect;
+            esm.getHT(magicEffect);
+            int actorId;
+            esm.getHNT (actorId, "ACID");
+            mSummonedCreatures.emplace(magicEffect, actorId);
+        }
     }
 
     while (esm.isNextSub("GRAV"))
@@ -214,14 +229,10 @@ void ESM::CreatureStats::save (ESMWriter &esm) const
     mAiSequence.save(esm);
     mMagicEffects.save(esm);
 
-    for (const auto& summon : mSummonedCreatureMap)
+    for (const auto& [effectId, actorId] : mSummonedCreatures)
     {
-        esm.writeHNT ("SUMM", summon.first.mEffectId);
-        esm.writeHNString ("SOUR", summon.first.mSourceId);
-        int effectIndex = summon.first.mEffectIndex;
-        if (effectIndex != -1)
-            esm.writeHNT ("EIND", effectIndex);
-        esm.writeHNT ("ACID", summon.second);
+        esm.writeHNT ("SUMM", effectId);
+        esm.writeHNT ("ACID", actorId);
     }
 
     for (int key : mSummonGraveyard)
@@ -235,15 +246,6 @@ void ESM::CreatureStats::save (ESMWriter &esm) const
         for (int i=0; i<4; ++i)
             mAiSettings[i].save(esm);
     }
-
-    for (const auto& corprusSpell : mCorprusSpells)
-    {
-        esm.writeHNString("CORP", corprusSpell.first);
-
-        const CorprusStats & stats = corprusSpell.second;
-        esm.writeHNT("WORS", stats.mWorsenings);
-        esm.writeHNT("TIME", stats.mNextWorsening);
-    }
 }
 
 void ESM::CreatureStats::blank()
diff --git a/components/esm/creaturestats.hpp b/components/esm/creaturestats.hpp
index 13bc50008c..651b126d0e 100644
--- a/components/esm/creaturestats.hpp
+++ b/components/esm/creaturestats.hpp
@@ -40,6 +40,7 @@ namespace ESM
         StatState<int> mAiSettings[4];
 
         std::map<SummonKey, int> mSummonedCreatureMap;
+        std::multimap<int, int> mSummonedCreatures;
         std::vector<int> mSummonGraveyard;
 
         ESM::TimeStamp mTradeTime;
diff --git a/components/esm/magiceffects.cpp b/components/esm/magiceffects.cpp
index 898e7e4b18..a1f943a93d 100644
--- a/components/esm/magiceffects.cpp
+++ b/components/esm/magiceffects.cpp
@@ -8,10 +8,11 @@ namespace ESM
 
 void MagicEffects::save(ESMWriter &esm) const
 {
-    for (std::map<int, int>::const_iterator it = mEffects.begin(); it != mEffects.end(); ++it)
+    for (const auto& [key, params] : mEffects)
     {
-        esm.writeHNT("EFID", it->first);
-        esm.writeHNT("BASE", it->second);
+        esm.writeHNT("EFID", key);
+        esm.writeHNT("BASE", params.first);
+        esm.writeHNT("MODI", params.second);
     }
 }
 
@@ -19,10 +20,15 @@ void MagicEffects::load(ESMReader &esm)
 {
     while (esm.isNextSub("EFID"))
     {
-        int id, base;
+        int id;
+        std::pair<int, float> params;
         esm.getHT(id);
-        esm.getHNT(base, "BASE");
-        mEffects.insert(std::make_pair(id, base));
+        esm.getHNT(params.first, "BASE");
+        if(esm.getFormat() < 17)
+            params.second = 0.f;
+        else
+            esm.getHNT(params.second, "MODI");
+        mEffects.emplace(id, params);
     }
 }
 
diff --git a/components/esm/magiceffects.hpp b/components/esm/magiceffects.hpp
index 5b8b0c924a..4b54692c5f 100644
--- a/components/esm/magiceffects.hpp
+++ b/components/esm/magiceffects.hpp
@@ -12,8 +12,8 @@ namespace ESM
     // format 0, saved games only
     struct MagicEffects
     {
-        // <Effect Id, Base value>
-        std::map<int, int> mEffects;
+        // <Effect Id, Base value, Modifier>
+        std::map<int, std::pair<int, float>> mEffects;
 
         void load (ESMReader &esm);
         void save (ESMWriter &esm) const;
diff --git a/components/esm/projectilestate.cpp b/components/esm/projectilestate.cpp
index 8ade9d5b2e..3421c19526 100644
--- a/components/esm/projectilestate.cpp
+++ b/components/esm/projectilestate.cpp
@@ -28,6 +28,7 @@ namespace ESM
 
         esm.writeHNString ("SPEL", mSpellId);
         esm.writeHNT ("SPED", mSpeed);
+        esm.writeHNT ("SLOT", mSlot);
     }
 
     void MagicBoltState::load(ESMReader &esm)
@@ -39,6 +40,10 @@ namespace ESM
             esm.skipHSub();
         ESM::EffectList().load(esm); // for backwards compatibility
         esm.getHNT (mSpeed, "SPED");
+        if(esm.getFormat() < 17)
+            mSlot = 0;
+        else
+            esm.getHNT(mSlot, "SLOT");
         if (esm.isNextSub("STCK")) // for backwards compatibility
             esm.skipHSub();
         if (esm.isNextSub("SOUN")) // for backwards compatibility
diff --git a/components/esm/projectilestate.hpp b/components/esm/projectilestate.hpp
index 67ec89bb6d..84292813ce 100644
--- a/components/esm/projectilestate.hpp
+++ b/components/esm/projectilestate.hpp
@@ -32,6 +32,7 @@ namespace ESM
     {
         std::string mSpellId;
         float mSpeed;
+        int mSlot;
 
         void load (ESMReader &esm);
         void save (ESMWriter &esm) const;
diff --git a/components/esm/savedgame.cpp b/components/esm/savedgame.cpp
index 3f8bf10c56..8a98a63419 100644
--- a/components/esm/savedgame.cpp
+++ b/components/esm/savedgame.cpp
@@ -4,7 +4,7 @@
 #include "esmwriter.hpp"
 
 unsigned int ESM::SavedGame::sRecordId = ESM::REC_SAVE;
-int ESM::SavedGame::sCurrentFormat = 16;
+int ESM::SavedGame::sCurrentFormat = 17;
 
 void ESM::SavedGame::load (ESMReader &esm)
 {
diff --git a/components/esm/spellstate.cpp b/components/esm/spellstate.cpp
index 2eb1e78679..b1ddb6523c 100644
--- a/components/esm/spellstate.cpp
+++ b/components/esm/spellstate.cpp
@@ -8,29 +8,38 @@ namespace ESM
 
     void SpellState::load(ESMReader &esm)
     {
-        while (esm.isNextSub("SPEL"))
+        if(esm.getFormat() < 17)
         {
-            std::string id = esm.getHString();
-
-            SpellParams state;
-            while (esm.isNextSub("INDX"))
+            while (esm.isNextSub("SPEL"))
             {
-                int index;
-                esm.getHT(index);
+                std::string id = esm.getHString();
 
-                float magnitude;
-                esm.getHNT(magnitude, "RAND");
+                SpellParams state;
+                while (esm.isNextSub("INDX"))
+                {
+                    int index;
+                    esm.getHT(index);
 
-                state.mEffectRands[index] = magnitude;
-            }
+                    float magnitude;
+                    esm.getHNT(magnitude, "RAND");
 
-            while (esm.isNextSub("PURG")) {
-                int index;
-                esm.getHT(index);
-                state.mPurgedEffects.insert(index);
-            }
+                    state.mEffectRands[index] = magnitude;
+                }
 
-            mSpells[id] = state;
+                while (esm.isNextSub("PURG")) {
+                    int index;
+                    esm.getHT(index);
+                    state.mPurgedEffects.insert(index);
+                }
+
+                mSpellParams[id] = state;
+                mSpells.emplace_back(id);
+            }
+        }
+        else
+        {
+            while (esm.isNextSub("SPEL"))
+                mSpells.emplace_back(esm.getHString());
         }
 
         // Obsolete
@@ -88,30 +97,8 @@ namespace ESM
 
     void SpellState::save(ESMWriter &esm) const
     {
-        for (TContainer::const_iterator it = mSpells.begin(); it != mSpells.end(); ++it)
-        {
-            esm.writeHNString("SPEL", it->first);
-
-            const std::map<int, float>& random = it->second.mEffectRands;
-            for (std::map<int, float>::const_iterator rIt = random.begin(); rIt != random.end(); ++rIt)
-            {
-                esm.writeHNT("INDX", rIt->first);
-                esm.writeHNT("RAND", rIt->second);
-            }
-
-            const std::set<int>& purges = it->second.mPurgedEffects;
-            for (std::set<int>::const_iterator pIt = purges.begin(); pIt != purges.end(); ++pIt)
-                esm.writeHNT("PURG", *pIt);
-        }
-
-        for (std::map<std::string, CorprusStats>::const_iterator it = mCorprusSpells.begin(); it != mCorprusSpells.end(); ++it)
-        {
-            esm.writeHNString("CORP", it->first);
-
-            const CorprusStats & stats = it->second;
-            esm.writeHNT("WORS", stats.mWorsenings);
-            esm.writeHNT("TIME", stats.mNextWorsening);
-        }
+        for (const std::string& spell : mSpells)
+            esm.writeHNString("SPEL", spell);
 
         for (std::map<std::string, TimeStamp>::const_iterator it = mUsedPowers.begin(); it != mUsedPowers.end(); ++it)
         {
diff --git a/components/esm/spellstate.hpp b/components/esm/spellstate.hpp
index 55c57611a2..e7067dae8c 100644
--- a/components/esm/spellstate.hpp
+++ b/components/esm/spellstate.hpp
@@ -31,13 +31,13 @@ namespace ESM
 
         struct SpellParams
         {
-            std::map<int, float> mEffectRands;
-            std::set<int> mPurgedEffects;
+            std::map<int, float> mEffectRands; // <effect index, normalised random magnitude>
+            std::set<int> mPurgedEffects; // indices of purged effects
         };
-        typedef std::map<std::string, SpellParams> TContainer;
-        TContainer mSpells;
+        std::vector<std::string> mSpells;
 
         // FIXME: obsolete, used only for old saves
+        std::map<std::string, SpellParams> mSpellParams;
         std::map<std::string, std::vector<PermanentSpellEffectInfo> > mPermanentSpellEffects;
         std::map<std::string, CorprusStats> mCorprusSpells;
 

From 161e042e2ac72c84280bdb7005190fc3b53b2cad Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 28 Aug 2021 11:06:47 +0200
Subject: [PATCH 1387/2859] Prevent iterator invalidation when cleaning up
 summons

---
 apps/openmw/mwgui/container.cpp       | 3 ++-
 apps/openmw/mwmechanics/summoning.cpp | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwgui/container.cpp b/apps/openmw/mwgui/container.cpp
index df490943d2..de771051ef 100644
--- a/apps/openmw/mwgui/container.cpp
+++ b/apps/openmw/mwgui/container.cpp
@@ -277,8 +277,9 @@ namespace MWGui
                             auto it = std::find_if(summons.begin(), summons.end(), [&] (const auto& entry) { return entry.second == creatureStats.getActorId(); });
                             if(it != summons.end())
                             {
-                                MWMechanics::purgeSummonEffect(summoner, *it);
+                                auto summon = *it;
                                 summons.erase(it);
+                                MWMechanics::purgeSummonEffect(summoner, summon);
                                 break;
                             }
                         }
diff --git a/apps/openmw/mwmechanics/summoning.cpp b/apps/openmw/mwmechanics/summoning.cpp
index 953db077fb..c1923d4337 100644
--- a/apps/openmw/mwmechanics/summoning.cpp
+++ b/apps/openmw/mwmechanics/summoning.cpp
@@ -125,8 +125,9 @@ namespace MWMechanics
             if (!ptr.isEmpty() && ptr.getClass().getCreatureStats(ptr).isDead() && ptr.getClass().getCreatureStats(ptr).isDeathAnimationFinished())
             {
                 // Purge the magic effect so a new creature can be summoned if desired
-                purgeSummonEffect(summoner, *it);
+                auto summon = *it;
                 creatureMap.erase(it++);
+                purgeSummonEffect(summoner, summon);
             }
             else
                 ++it;

From b8e4f1875197621ce4587d8f42081b260ab90ddd Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 28 Aug 2021 14:36:30 +0200
Subject: [PATCH 1388/2859] Clear temporary effects before unloading actors to
 prevent absorb effects becoming permanent

---
 CHANGELOG.md                                    |  1 +
 apps/openmw/mwbase/mechanicsmanager.hpp         |  2 +-
 apps/openmw/mwbase/world.hpp                    |  2 +-
 apps/openmw/mwmechanics/actors.cpp              | 15 +++++++++++++--
 apps/openmw/mwmechanics/actors.hpp              |  2 +-
 apps/openmw/mwmechanics/mechanicsmanagerimp.cpp |  6 +++---
 apps/openmw/mwmechanics/mechanicsmanagerimp.hpp |  2 +-
 apps/openmw/mwworld/actionteleport.cpp          |  4 ++--
 apps/openmw/mwworld/scene.cpp                   |  4 ++--
 apps/openmw/mwworld/scene.hpp                   |  2 +-
 apps/openmw/mwworld/worldimp.cpp                |  8 ++++----
 apps/openmw/mwworld/worldimp.hpp                |  2 +-
 12 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ffe687a04c..34e7829274 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,6 +56,7 @@
     Feature #4595: Unique object identifier
     Feature #4737: Handle instance move from one cell to another
     Feature #5198: Implement "Magic effect expired" event
+    Feature #5454: Clear active spells from actor when he disappears from scene
     Feature #5489: MCP: Telekinesis fix for activators
     Feature #5996: Support Lua scripts in OpenMW
     Feature #6017: Separate persistent and temporary cell references when saving
diff --git a/apps/openmw/mwbase/mechanicsmanager.hpp b/apps/openmw/mwbase/mechanicsmanager.hpp
index ccc60afc27..6bedbb5b4d 100644
--- a/apps/openmw/mwbase/mechanicsmanager.hpp
+++ b/apps/openmw/mwbase/mechanicsmanager.hpp
@@ -58,7 +58,7 @@ namespace MWBase
             virtual void add (const MWWorld::Ptr& ptr) = 0;
             ///< Register an object for management
 
-            virtual void remove (const MWWorld::Ptr& ptr) = 0;
+            virtual void remove (const MWWorld::Ptr& ptr, bool keepActive) = 0;
             ///< Deregister an object for management
 
             virtual void updateCell(const MWWorld::Ptr &old, const MWWorld::Ptr &ptr) = 0;
diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index e9fc6e5c7a..22fe42c5ed 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -286,7 +286,7 @@ namespace MWBase
             virtual MWWorld::Ptr moveObject (const MWWorld::Ptr& ptr, const osg::Vec3f& position, bool movePhysics=true, bool moveToActive=false) = 0;
             ///< @return an updated Ptr in case the Ptr's cell changes
 
-            virtual MWWorld::Ptr moveObject(const MWWorld::Ptr &ptr, MWWorld::CellStore* newCell, const osg::Vec3f& position, bool movePhysics=true) = 0;
+            virtual MWWorld::Ptr moveObject(const MWWorld::Ptr &ptr, MWWorld::CellStore* newCell, const osg::Vec3f& position, bool movePhysics=true, bool keepActive=false) = 0;
             ///< @return an updated Ptr
 
             virtual MWWorld::Ptr moveObjectBy(const MWWorld::Ptr &ptr, const osg::Vec3f& vec, bool moveToActive, bool ignoreCollisions) = 0;
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index b1aa246385..d71a8f53ee 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -210,6 +210,14 @@ void soulTrap(const MWWorld::Ptr& creature)
         }
     }
 }
+
+void removeTemporaryEffects(const MWWorld::Ptr& ptr)
+{
+    ptr.getClass().getCreatureStats(ptr).getActiveSpells().purge([] (const auto& spell)
+    {
+        return spell.getType() == ESM::ActiveSpells::Type_Consumable || spell.getType() == ESM::ActiveSpells::Type_Temporary;
+    }, ptr);
+}
 }
 
 namespace MWMechanics
@@ -1050,7 +1058,7 @@ namespace MWMechanics
 
     void Actors::addActor (const MWWorld::Ptr& ptr, bool updateImmediately)
     {
-        removeActor(ptr);
+        removeActor(ptr, true);
 
         MWRender::Animation *anim = MWBase::Environment::get().getWorld()->getAnimation(ptr);
         if (!anim)
@@ -1098,11 +1106,13 @@ namespace MWMechanics
         ctrl->setVisibility(visibilityRatio);
     }
 
-    void Actors::removeActor (const MWWorld::Ptr& ptr)
+    void Actors::removeActor (const MWWorld::Ptr& ptr, bool keepActive)
     {
         PtrActorMap::iterator iter = mActors.find(ptr);
         if(iter != mActors.end())
         {
+            if(!keepActive)
+                removeTemporaryEffects(iter->first);
             delete iter->second;
             mActors.erase(iter);
         }
@@ -1167,6 +1177,7 @@ namespace MWMechanics
         {
             if((iter->first.isInCell() && iter->first.getCell()==cellStore) && iter->first != ignore)
             {
+                removeTemporaryEffects(iter->first);
                 delete iter->second;
                 mActors.erase(iter++);
             }
diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index 3efe28204d..9950a591ab 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -90,7 +90,7 @@ namespace MWMechanics
             ///
             /// \note Dead actors are ignored.
 
-            void removeActor (const MWWorld::Ptr& ptr);
+            void removeActor (const MWWorld::Ptr& ptr, bool keepActive);
             ///< Deregister an actor for stats management
             ///
             /// \note Ignored, if \a ptr is not a registered actor.
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index fb8b3fa2b0..5e18e737df 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -259,11 +259,11 @@ namespace MWMechanics
             mActors.castSpell(ptr, spellId, manualSpell);
     }
 
-    void MechanicsManager::remove(const MWWorld::Ptr& ptr)
+    void MechanicsManager::remove(const MWWorld::Ptr& ptr, bool keepActive)
     {
         if(ptr == MWBase::Environment::get().getWindowManager()->getWatchedActor())
             MWBase::Environment::get().getWindowManager()->watchActor(MWWorld::Ptr());
-        mActors.removeActor(ptr);
+        mActors.removeActor(ptr, keepActive);
         mObjects.removeObject(ptr);
     }
 
@@ -317,7 +317,7 @@ namespace MWMechanics
 
             // HACK? The player has been changed, so a new Animation object may
             // have been made for them. Make sure they're properly updated.
-            mActors.removeActor(ptr);
+            mActors.removeActor(ptr, true);
             mActors.addActor(ptr, true);
         }
 
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
index 206b5c5420..06da2fde51 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
@@ -45,7 +45,7 @@ namespace MWMechanics
             void add (const MWWorld::Ptr& ptr) override;
             ///< Register an object for management
 
-            void remove (const MWWorld::Ptr& ptr) override;
+            void remove (const MWWorld::Ptr& ptr, bool keepActive) override;
             ///< Deregister an object for management
 
             void updateCell(const MWWorld::Ptr &old, const MWWorld::Ptr &ptr) override;
diff --git a/apps/openmw/mwworld/actionteleport.cpp b/apps/openmw/mwworld/actionteleport.cpp
index fcfafc5f4f..56274eb9a0 100644
--- a/apps/openmw/mwworld/actionteleport.cpp
+++ b/apps/openmw/mwworld/actionteleport.cpp
@@ -55,10 +55,10 @@ namespace MWWorld
                 int cellY;
                 world->positionToIndex(mPosition.pos[0],mPosition.pos[1],cellX,cellY);
                 world->moveObject(actor,world->getExterior(cellX,cellY),
-                    mPosition.asVec3());
+                    mPosition.asVec3(), true, true);
             }
             else
-                world->moveObject(actor,world->getInterior(mCellName),mPosition.asVec3());
+                world->moveObject(actor,world->getInterior(mCellName),mPosition.asVec3(), true, true);
         }
     }
 
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 559ab4aef4..57a5bd18f7 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -1010,9 +1010,9 @@ namespace MWWorld
         }
     }
 
-    void Scene::removeObjectFromScene (const Ptr& ptr)
+    void Scene::removeObjectFromScene (const Ptr& ptr, bool keepActive)
     {
-        MWBase::Environment::get().getMechanicsManager()->remove (ptr);
+        MWBase::Environment::get().getMechanicsManager()->remove (ptr, keepActive);
         MWBase::Environment::get().getSoundManager()->stopSound3D (ptr);
         MWBase::Environment::get().getLuaManager()->objectRemovedFromScene(ptr);
         if (const auto object = mPhysics->getObject(ptr))
diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp
index 3f5d7bf2f5..86cb1ee5b7 100644
--- a/apps/openmw/mwworld/scene.hpp
+++ b/apps/openmw/mwworld/scene.hpp
@@ -161,7 +161,7 @@ namespace MWWorld
             void addObjectToScene (const Ptr& ptr);
             ///< Add an object that already exists in the world model to the scene.
 
-            void removeObjectFromScene (const Ptr& ptr);
+            void removeObjectFromScene (const Ptr& ptr, bool keepActive = false);
             ///< Remove an object from the scene, but not from the world model.
 
             void removeFromPagedRefs(const Ptr &ptr);
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index ea455a31cf..b9b8af0987 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1114,7 +1114,7 @@ namespace MWWorld
         }
     }
 
-    MWWorld::Ptr World::moveObject(const Ptr &ptr, CellStore* newCell, const osg::Vec3f& position, bool movePhysics)
+    MWWorld::Ptr World::moveObject(const Ptr &ptr, CellStore* newCell, const osg::Vec3f& position, bool movePhysics, bool keepActive)
     {
         ESM::Position pos = ptr.getRefData().getPosition();
         std::memcpy(pos.pos, &position, sizeof(osg::Vec3f));
@@ -1171,7 +1171,7 @@ namespace MWWorld
                 }
                 else if (!newCellActive && currCellActive)
                 {
-                    mWorldScene->removeObjectFromScene(ptr);
+                    mWorldScene->removeObjectFromScene(ptr, keepActive);
                     mLocalScripts.remove(ptr);
                     removeContainerScripts (ptr);
                     haveToMove = false;
@@ -2433,7 +2433,7 @@ namespace MWWorld
         else
         {
             // Remove the old CharacterController
-            MWBase::Environment::get().getMechanicsManager()->remove(getPlayerPtr());
+            MWBase::Environment::get().getMechanicsManager()->remove(getPlayerPtr(), true);
             mNavigator->removeAgent(getPathfindingHalfExtents(getPlayerConstPtr()));
             mPhysics->remove(getPlayerPtr());
             mRendering->removePlayer(getPlayerPtr());
@@ -2449,7 +2449,7 @@ namespace MWWorld
 
     void World::renderPlayer()
     {
-        MWBase::Environment::get().getMechanicsManager()->remove(getPlayerPtr());
+        MWBase::Environment::get().getMechanicsManager()->remove(getPlayerPtr(), true);
 
         MWWorld::Ptr player = getPlayerPtr();
 
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 9ead6926c2..d6b7eb3fbf 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -373,7 +373,7 @@ namespace MWWorld
             MWWorld::Ptr moveObject (const Ptr& ptr, const osg::Vec3f& position, bool movePhysics=true, bool moveToActive=false) override;
             ///< @return an updated Ptr in case the Ptr's cell changes
 
-            MWWorld::Ptr moveObject (const Ptr& ptr, CellStore* newCell, const osg::Vec3f& position, bool movePhysics=true) override;
+            MWWorld::Ptr moveObject (const Ptr& ptr, CellStore* newCell, const osg::Vec3f& position, bool movePhysics=true, bool keepActive=false) override;
             ///< @return an updated Ptr
 
             MWWorld::Ptr moveObjectBy(const Ptr& ptr, const osg::Vec3f& vec, bool moveToActive, bool ignoreCollisions) override;

From 43074347e82066c3601edf195e959a0e14d7f9f9 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Tue, 31 Aug 2021 19:59:55 +0200
Subject: [PATCH 1389/2859] Prevent spell duplication

---
 apps/openmw/mwmechanics/spells.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwmechanics/spells.cpp b/apps/openmw/mwmechanics/spells.cpp
index 743eacfe2c..6520ae3ab3 100644
--- a/apps/openmw/mwmechanics/spells.cpp
+++ b/apps/openmw/mwmechanics/spells.cpp
@@ -141,7 +141,7 @@ namespace MWMechanics
             const ESM::Spell *spell = *iter;
             if (filter(spell))
             {
-                mSpells.erase(iter++);
+                iter = mSpells.erase(iter);
                 purged.push_back(spell->mId);
             }
             else
@@ -204,7 +204,7 @@ namespace MWMechanics
             const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(id);
             if (spell)
             {
-                mSpells.emplace_back(spell);
+                addSpell(spell);
 
                 if (id == state.mSelectedSpell)
                     mSelectedSpell = id;

From 63a9203dde6cd4cccc64fa81fb33ae6b3af1a4e5 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Tue, 31 Aug 2021 20:07:30 +0200
Subject: [PATCH 1390/2859] Fix icon magnitude

---
 apps/openmw/mwgui/spellicons.cpp         |  2 +-
 apps/openmw/mwmechanics/spelleffects.cpp | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwgui/spellicons.cpp b/apps/openmw/mwgui/spellicons.cpp
index 4a86503f46..0673446fe7 100644
--- a/apps/openmw/mwgui/spellicons.cpp
+++ b/apps/openmw/mwgui/spellicons.cpp
@@ -34,7 +34,7 @@ namespace MWGui
         {
             for(const auto& effect : params.getEffects())
             {
-                if(!effect.mMagnitude)
+                if(!(effect.mFlags & ESM::ActiveEffect::Flag_Applied))
                     continue;
                 MagicEffectInfo newEffectSource;
                 newEffectSource.mKey = MWMechanics::EffectKey(effect.mEffectId, effect.mArg);
diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp
index 895e908bd2..96416f00c0 100644
--- a/apps/openmw/mwmechanics/spelleffects.cpp
+++ b/apps/openmw/mwmechanics/spelleffects.cpp
@@ -705,10 +705,15 @@ bool applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, Ac
         return true;
     }
     const auto* magicEffect = world->getStore().get<ESM::MagicEffect>().find(effect.mEffectId);
-    if(effect.mFlags & ESM::ActiveEffect::Flag_Applied && magicEffect->mData.mFlags & ESM::MagicEffect::Flags::AppliedOnce)
+    if(effect.mFlags & ESM::ActiveEffect::Flag_Applied)
     {
-        effect.mTimeLeft -= dt;
-        return false;
+        if(magicEffect->mData.mFlags & ESM::MagicEffect::Flags::AppliedOnce)
+        {
+            effect.mTimeLeft -= dt;
+            return false;
+        }
+        else if(!dt)
+            return false;
     }
     if(effect.mEffectId == ESM::MagicEffect::Lock)
     {
@@ -786,8 +791,9 @@ bool applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, Ac
         float oldMagnitude = 0.f;
         if(effect.mFlags & ESM::ActiveEffect::Flag_Applied)
             oldMagnitude = effect.mMagnitude;
+        float magnitude = roll(effect);
         //Note that there's an early out for Flag_Applied AppliedOnce effects so we don't have to exclude them here
-        effect.mMagnitude = roll(effect);
+        effect.mMagnitude = magnitude;
         if(!(magicEffect->mData.mFlags & (ESM::MagicEffect::Flags::NoMagnitude | ESM::MagicEffect::Flags::AppliedOnce)))
         {
             if(effect.mDuration != 0)
@@ -808,6 +814,7 @@ bool applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, Ac
             spellParams.worsen();
         else
             applyMagicEffect(target, caster, spellParams, effect, invalid, receivedMagicDamage);
+        effect.mMagnitude = magnitude;
         magnitudes.add(EffectKey(effect.mEffectId, effect.mArg), EffectParam(effect.mMagnitude - oldMagnitude));
     }
     effect.mTimeLeft -= dt;

From 46ce2ff10cab2ad3a41306b254ca69e68b25aed7 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Tue, 31 Aug 2021 20:12:11 +0200
Subject: [PATCH 1391/2859] Add #4414 to the changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34e7829274..0550725bc8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -53,6 +53,7 @@
     Feature #2780: A way to see current OpenMW version in the console
     Feature #3616: Allow Zoom levels on the World Map
     Feature #4297: Implement APPLIED_ONCE flag for magic effects
+    Feature #4414: Handle duration of EXTRA SPELL magic effect
     Feature #4595: Unique object identifier
     Feature #4737: Handle instance move from one cell to another
     Feature #5198: Implement "Magic effect expired" event

From 4abcb0d7b960c79e5990e5893654512a22f9f20e Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 8 Sep 2021 19:25:22 +0200
Subject: [PATCH 1392/2859] Remove applied magnitude instead of min magnitude

---
 apps/openmw/mwmechanics/spelleffects.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp
index 96416f00c0..24816b9ed1 100644
--- a/apps/openmw/mwmechanics/spelleffects.cpp
+++ b/apps/openmw/mwmechanics/spelleffects.cpp
@@ -1029,7 +1029,7 @@ void onMagicEffectRemoved(const MWWorld::Ptr& target, ActiveSpells::ActiveSpellP
     auto& magnitudes = target.getClass().getCreatureStats(target).getMagicEffects();
     const auto* magicEffect = world->getStore().get<ESM::MagicEffect>().find(effect.mEffectId);
     if(magicEffect->mData.mFlags & ESM::MagicEffect::Flags::AppliedOnce)
-        magnitudes.add(EffectKey(effect.mEffectId, effect.mArg), EffectParam(-effect.mMinMagnitude));
+        magnitudes.add(EffectKey(effect.mEffectId, effect.mArg), EffectParam(-effect.mMagnitude));
     removeMagicEffect(target, spellParams, effect);
     auto anim = world->getAnimation(target);
     if(anim)

From e4994054ecabbd5eb5199e62ec84ff82ad57f258 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Tue, 21 Sep 2021 18:07:39 +0200
Subject: [PATCH 1393/2859] Add #5207 to the changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0550725bc8..25df64c65c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
     Bug #4744: Invisible particles must still be processed
     Bug #5100: Persuasion doesn't always clamp the resulting disposition
     Bug #5120: Scripted object spawning updates physics system
+    Bug #5207: Loose summons can be present in scene
     Bug #5379: Wandering NPCs falling through cantons
     Bug #5453: Magic effect VFX are offset for creatures
     Bug #5483: AutoCalc flag is not used to calculate spells cost

From 2de7b8e2fba5daaedb76ef567b6e12d73fa0b349 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 29 Sep 2021 21:21:52 +0200
Subject: [PATCH 1394/2859] Allow non-biped creatures using weapons to open
 doors

---
 CHANGELOG.md                          |  1 +
 apps/openmw/mwmechanics/aipackage.cpp | 11 ++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8dc9510f6e..9b78cdfa81 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@
     Bug #6133: Cannot reliably sneak or steal in the sight of the NPCs siding with player
     Bug #6143: Capturing a screenshot makes engine to be a temporary unresponsive
     Bug #6165: Paralyzed player character can pickup items when the inventory is open
+    Bug #6172: Some creatures can't open doors
     Bug #6174: Spellmaking and Enchanting sliders differences from vanilla
     Bug #6184: Command and Calm and Demoralize and Frenzy and Rally magic effects inconsistencies with vanilla
     Bug #6197: Infinite Casting Loop
diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index 46e4729a8a..ad0a3943ad 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -34,6 +34,11 @@ namespace
         const float actorTolerance = 2 * speed * duration + 1.2 * std::max(halfExtents.x(), halfExtents.y());
         return std::max(MWMechanics::MIN_TOLERANCE, actorTolerance);
     }
+
+    bool canOpenDoors(const MWWorld::Ptr& ptr)
+    {
+        return ptr.getClass().isBipedal(ptr) || ptr.getClass().hasInventoryStore(ptr);
+    }
 }
 
 MWMechanics::AiPackage::AiPackage(AiPackageTypeId typeId, const Options& options) :
@@ -118,7 +123,7 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
 
     if (!isDestReached && timerStatus == Misc::TimerStatus::Elapsed)
     {
-        if (actor.getClass().isBipedal(actor))
+        if (canOpenDoors(actor))
             openDoors(actor);
 
         const bool wasShortcutting = mIsShortcutting;
@@ -232,7 +237,7 @@ void MWMechanics::AiPackage::evadeObstacles(const MWWorld::Ptr& actor)
     static float distance = MWBase::Environment::get().getWorld()->getMaxActivationDistance();
 
     const MWWorld::Ptr door = getNearbyDoor(actor, distance);
-    if (!door.isEmpty() && actor.getClass().isBipedal(actor))
+    if (!door.isEmpty() && canOpenDoors(actor))
     {
         openDoors(actor);
     }
@@ -445,7 +450,7 @@ DetourNavigator::Flags MWMechanics::AiPackage::getNavigatorFlags(const MWWorld::
     if (actorClass.canWalk(actor) && actor.getClass().getWalkSpeed(actor) > 0)
         result |= DetourNavigator::Flag_walk;
 
-    if (actorClass.isBipedal(actor) && getTypeId() != AiPackageTypeId::Wander)
+    if (canOpenDoors(actor) && getTypeId() != AiPackageTypeId::Wander)
         result |= DetourNavigator::Flag_openDoor;
 
     return result;

From 24ecdc37a78384c365b2bb643310a68b8e4d2eed Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Thu, 30 Sep 2021 02:59:38 +0200
Subject: [PATCH 1395/2859] Fix crash in
 LuaUtil::ScriptsContainer::~ScriptsContainer()

---
 components/lua/scriptscontainer.cpp | 6 ++++++
 components/lua/scriptscontainer.hpp | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/components/lua/scriptscontainer.cpp b/components/lua/scriptscontainer.cpp
index b6882b0988..703381a453 100644
--- a/components/lua/scriptscontainer.cpp
+++ b/components/lua/scriptscontainer.cpp
@@ -328,6 +328,12 @@ namespace LuaUtil
         std::make_heap(mHoursTimersQueue.begin(), mHoursTimersQueue.end());
     }
 
+    ScriptsContainer::~ScriptsContainer()
+    {
+        for (auto& [_, script] : mScripts)
+            script.mHiddenData[ScriptId::KEY] = sol::nil;
+    }
+
     void ScriptsContainer::removeAllScripts()
     {
         for (auto& [_, script] : mScripts)
diff --git a/components/lua/scriptscontainer.hpp b/components/lua/scriptscontainer.hpp
index 0bf50b8793..69aa18e940 100644
--- a/components/lua/scriptscontainer.hpp
+++ b/components/lua/scriptscontainer.hpp
@@ -75,7 +75,7 @@ namespace LuaUtil
         ScriptsContainer(LuaUtil::LuaState* lua, std::string_view namePrefix);
         ScriptsContainer(const ScriptsContainer&) = delete;
         ScriptsContainer(ScriptsContainer&&) = delete;
-        virtual ~ScriptsContainer() { removeAllScripts(); }
+        virtual ~ScriptsContainer();
 
         // Adds package that will be available (via `require`) for all scripts in the container.
         // Automatically applies LuaUtil::makeReadOnly to the package.

From f6c39b9f19ea0758427d4aaf10073daf528a928a Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 30 Sep 2021 22:24:25 +0200
Subject: [PATCH 1396/2859] Fix issue numbers

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b78cdfa81..b21639d144 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,7 @@
     Bug #5453: Magic effect VFX are offset for creatures
     Bug #5483: AutoCalc flag is not used to calculate spells cost
     Bug #5508: Engine binary links to Qt without using it
-    Bug #5755: Active grid object paging - disappearing textures
+    Bug #5766: Active grid object paging - disappearing textures
     Bug #5788: Texture editing parses the selected indexes wrongly
     Bug #5842: GetDisposition adds temporary disposition change from different actors
     Bug #6037: Morrowind Content Language Cannot be Set to English in OpenMW Launcher
@@ -47,8 +47,8 @@
     Feature #2780: A way to see current OpenMW version in the console
     Feature #3616: Allow Zoom levels on the World Map
     Feature #4595: Unique object identifier
-    Feature #4737: Handle instance move from one cell to another
     Feature #5489: MCP: Telekinesis fix for activators
+    Feature #5737: Handle instance move from one cell to another
     Feature #5996: Support Lua scripts in OpenMW
     Feature #6017: Separate persistent and temporary cell references when saving
     Feature #6032: Reverse-z depth buffer

From 8309910d9de491f3a10c56708aa070e434f9b018 Mon Sep 17 00:00:00 2001
From: Bret Curtis <bret.curtis@gmail.com>
Date: Thu, 30 Sep 2021 22:58:16 +0200
Subject: [PATCH 1397/2859] Restore the cell grid to its former non-exorbitant
 size, reducing stutter and also threw in a simple alternative fix for the
 actor position adjustment issue.

---
 apps/openmw/mwclass/activator.cpp       |   8 +-
 apps/openmw/mwclass/activator.hpp       |   4 +-
 apps/openmw/mwclass/actor.cpp           |   2 +-
 apps/openmw/mwclass/actor.hpp           |   2 +-
 apps/openmw/mwclass/container.cpp       |   8 +-
 apps/openmw/mwclass/container.hpp       |   4 +-
 apps/openmw/mwclass/door.cpp            |   8 +-
 apps/openmw/mwclass/door.hpp            |   4 +-
 apps/openmw/mwclass/light.cpp           |   8 +-
 apps/openmw/mwclass/light.hpp           |   4 +-
 apps/openmw/mwclass/static.cpp          |   8 +-
 apps/openmw/mwclass/static.hpp          |   4 +-
 apps/openmw/mwmechanics/actor.cpp       |  11 ++
 apps/openmw/mwmechanics/actor.hpp       |   4 +
 apps/openmw/mwmechanics/actors.cpp      |   7 +
 apps/openmw/mwphysics/physicssystem.cpp |   5 +-
 apps/openmw/mwphysics/physicssystem.hpp |   2 +-
 apps/openmw/mwworld/cellvisitors.hpp    |  10 --
 apps/openmw/mwworld/class.cpp           |   4 +-
 apps/openmw/mwworld/class.hpp           |   4 +-
 apps/openmw/mwworld/scene.cpp           | 201 ++++++------------------
 apps/openmw/mwworld/scene.hpp           |   9 +-
 22 files changed, 113 insertions(+), 208 deletions(-)

diff --git a/apps/openmw/mwclass/activator.cpp b/apps/openmw/mwclass/activator.cpp
index e4ba7af4f0..6285bdbf7e 100644
--- a/apps/openmw/mwclass/activator.cpp
+++ b/apps/openmw/mwclass/activator.cpp
@@ -38,15 +38,15 @@ namespace MWClass
         }
     }
 
-    void Activator::insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
+    void Activator::insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const
     {
-        insertObjectPhysics(ptr, model, rotation, physics, skipAnimated);
+        insertObjectPhysics(ptr, model, rotation, physics);
     }
 
-    void Activator::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
+    void Activator::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const
     {
         if(!model.empty())
-            physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World, skipAnimated);
+            physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World);
     }
 
     std::string Activator::getModel(const MWWorld::ConstPtr &ptr) const
diff --git a/apps/openmw/mwclass/activator.hpp b/apps/openmw/mwclass/activator.hpp
index 32bf1564c9..48a679e0b7 100644
--- a/apps/openmw/mwclass/activator.hpp
+++ b/apps/openmw/mwclass/activator.hpp
@@ -17,9 +17,9 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const override;
 
-            void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const override;
+            void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const override;
 
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
diff --git a/apps/openmw/mwclass/actor.cpp b/apps/openmw/mwclass/actor.cpp
index b142fd2643..ad43bd6e5f 100644
--- a/apps/openmw/mwclass/actor.cpp
+++ b/apps/openmw/mwclass/actor.cpp
@@ -22,7 +22,7 @@ namespace MWClass
         MWBase::Environment::get().getWorld()->adjustPosition(ptr, force);
     }
 
-    void Actor::insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
+    void Actor::insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const
     {
         if (!model.empty())
         {
diff --git a/apps/openmw/mwclass/actor.hpp b/apps/openmw/mwclass/actor.hpp
index 6a5d4c5150..886ffe4771 100644
--- a/apps/openmw/mwclass/actor.hpp
+++ b/apps/openmw/mwclass/actor.hpp
@@ -24,7 +24,7 @@ namespace MWClass
         ///< Adjust position to stand on ground. Must be called post model load
         /// @param force do this even if the ptr is flying
 
-        void insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
+        void insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const override;
 
         bool useAnim() const override;
 
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index 051fbafeb5..06980f55da 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -106,15 +106,15 @@ namespace MWClass
         }
     }
 
-    void Container::insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
+    void Container::insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const
     {
-        insertObjectPhysics(ptr, model, rotation, physics, skipAnimated);
+        insertObjectPhysics(ptr, model, rotation, physics);
     }
 
-    void Container::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
+    void Container::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const
     {
         if(!model.empty())
-            physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World, skipAnimated);
+            physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World);
     }
 
     std::string Container::getModel(const MWWorld::ConstPtr &ptr) const
diff --git a/apps/openmw/mwclass/container.hpp b/apps/openmw/mwclass/container.hpp
index 9407dab243..0b290a73e1 100644
--- a/apps/openmw/mwclass/container.hpp
+++ b/apps/openmw/mwclass/container.hpp
@@ -42,8 +42,8 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
-            void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const override;
+            void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const override;
 
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index 70c4a27582..b5fe705ca6 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -55,9 +55,9 @@ namespace MWClass
         }
     }
 
-    void Door::insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
+    void Door::insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const
     {
-        insertObjectPhysics(ptr, model, rotation, physics, skipAnimated);
+        insertObjectPhysics(ptr, model, rotation, physics);
 
         // Resume the door's opening/closing animation if it wasn't finished
         if (ptr.getRefData().getCustomData())
@@ -70,10 +70,10 @@ namespace MWClass
         }
     }
 
-    void Door::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
+    void Door::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const
     {
         if(!model.empty())
-            physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_Door, skipAnimated);
+            physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_Door);
     }
 
     bool Door::isDoor() const
diff --git a/apps/openmw/mwclass/door.hpp b/apps/openmw/mwclass/door.hpp
index 1fd59f8f52..f9288a88ce 100644
--- a/apps/openmw/mwclass/door.hpp
+++ b/apps/openmw/mwclass/door.hpp
@@ -18,8 +18,8 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
-            void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const override;
+            void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const override;
 
             bool isDoor() const override;
 
diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index 0281861980..69cc1a09bf 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -33,13 +33,13 @@ namespace MWClass
         renderingInterface.getObjects().insertModel(ptr, model, true, !(ref->mBase->mData.mFlags & ESM::Light::OffDefault));
     }
 
-    void Light::insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
+    void Light::insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const
     {
         MWWorld::LiveCellRef<ESM::Light> *ref =
             ptr.get<ESM::Light>();
         assert (ref->mBase != nullptr);
 
-        insertObjectPhysics(ptr, model, rotation, physics, skipAnimated);
+        insertObjectPhysics(ptr, model, rotation, physics);
 
         if (!ref->mBase->mSound.empty() && !(ref->mBase->mData.mFlags & ESM::Light::OffDefault))
             MWBase::Environment::get().getSoundManager()->playSound3D(ptr, ref->mBase->mSound, 1.0, 1.0,
@@ -47,11 +47,11 @@ namespace MWClass
                                                                       MWSound::PlayMode::Loop);
     }
 
-    void Light::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
+    void Light::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const
     {
         // TODO: add option somewhere to enable collision for placeable objects
         if (!model.empty() && (ptr.get<ESM::Light>()->mBase->mData.mFlags & ESM::Light::Carry) == 0)
-            physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World, skipAnimated);
+            physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World);
     }
 
     bool Light::useAnim() const
diff --git a/apps/openmw/mwclass/light.hpp b/apps/openmw/mwclass/light.hpp
index 206abede43..e8aa4e5878 100644
--- a/apps/openmw/mwclass/light.hpp
+++ b/apps/openmw/mwclass/light.hpp
@@ -14,8 +14,8 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
-            void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const override;
+            void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const override;
 
             bool useAnim() const override;
 
diff --git a/apps/openmw/mwclass/static.cpp b/apps/openmw/mwclass/static.cpp
index 5cbe219580..0805ca3dd1 100644
--- a/apps/openmw/mwclass/static.cpp
+++ b/apps/openmw/mwclass/static.cpp
@@ -23,15 +23,15 @@ namespace MWClass
         }
     }
 
-    void Static::insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
+    void Static::insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const
     {
-        insertObjectPhysics(ptr, model, rotation, physics, skipAnimated);
+        insertObjectPhysics(ptr, model, rotation, physics);
     }
 
-    void Static::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
+    void Static::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const
     {
         if(!model.empty())
-            physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World, skipAnimated);
+            physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World);
     }
 
     std::string Static::getModel(const MWWorld::ConstPtr &ptr) const
diff --git a/apps/openmw/mwclass/static.hpp b/apps/openmw/mwclass/static.hpp
index 7c326987a8..c747eebf2f 100644
--- a/apps/openmw/mwclass/static.hpp
+++ b/apps/openmw/mwclass/static.hpp
@@ -14,8 +14,8 @@ namespace MWClass
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
-            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
-            void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const override;
+            void insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const override;
+            void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const override;
 
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
diff --git a/apps/openmw/mwmechanics/actor.cpp b/apps/openmw/mwmechanics/actor.cpp
index a5c55633ac..5801ea751d 100644
--- a/apps/openmw/mwmechanics/actor.cpp
+++ b/apps/openmw/mwmechanics/actor.cpp
@@ -5,6 +5,7 @@
 namespace MWMechanics
 {
     Actor::Actor(const MWWorld::Ptr &ptr, MWRender::Animation *animation)
+     : mPositionAdjusted(false)
     {
         mCharacterController.reset(new CharacterController(ptr, animation));
     }
@@ -58,4 +59,14 @@ namespace MWMechanics
     {
         mIsTurningToPlayer = turning;
     }
+
+    void Actor::setPositionAdjusted(bool adjusted)
+    {
+        mPositionAdjusted = adjusted;
+    }
+
+    bool Actor::getPositionAdjusted() const
+    {
+        return mPositionAdjusted;
+    }
 }
diff --git a/apps/openmw/mwmechanics/actor.hpp b/apps/openmw/mwmechanics/actor.hpp
index be4f425378..c25fc1cb73 100644
--- a/apps/openmw/mwmechanics/actor.hpp
+++ b/apps/openmw/mwmechanics/actor.hpp
@@ -48,6 +48,9 @@ namespace MWMechanics
             return mEngageCombat.update(duration);
         }
 
+        void setPositionAdjusted(bool adjusted);
+        bool getPositionAdjusted() const;
+
     private:
         std::unique_ptr<CharacterController> mCharacterController;
         int mGreetingTimer{0};
@@ -55,6 +58,7 @@ namespace MWMechanics
         GreetingState mGreetingState{Greet_None};
         bool mIsTurningToPlayer{false};
         Misc::DeviatingPeriodicTimer mEngageCombat{1.0f, 0.25f, Misc::Rng::deviate(0, 0.25f)};
+        bool mPositionAdjusted;
     };
 
 }
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 542f185854..1cd66291f0 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -2157,7 +2157,14 @@ namespace MWMechanics
                     continue;
                 }
                 else if (!isPlayer)
+                {
                     iter->first.getRefData().getBaseNode()->setNodeMask(MWRender::Mask_Actor);
+                    if (!iter->second->getPositionAdjusted())
+                    {
+                        iter->first.getClass().adjustPosition(iter->first, false);
+                        iter->second->setPositionAdjusted(true);
+                    }
+                }
 
                 const bool isDead = iter->first.getClass().getCreatureStats(iter->first).isDead();
                 if (!isDead && (!godmode || !isPlayer) && iter->first.getClass().getCreatureStats(iter->first).isParalyzed())
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 903e383370..23ece987ef 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -492,7 +492,7 @@ namespace MWPhysics
         return heightField->second.get();
     }
 
-    void PhysicsSystem::addObject (const MWWorld::Ptr& ptr, const std::string& mesh, osg::Quat rotation, int collisionType, bool skipAnimated)
+    void PhysicsSystem::addObject (const MWWorld::Ptr& ptr, const std::string& mesh, osg::Quat rotation, int collisionType)
     {
         if (ptr.mRef->mData.mPhysicsPostponed)
             return;
@@ -500,9 +500,6 @@ namespace MWPhysics
         if (!shapeInstance || !shapeInstance->getCollisionShape())
             return;
 
-        if (skipAnimated && shapeInstance->isAnimated())
-            return;
-
         assert(!getObject(ptr));
 
         auto obj = std::make_shared<Object>(ptr, shapeInstance, rotation, collisionType, mTaskScheduler.get());
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 52515b563f..bc358cb3c4 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -128,7 +128,7 @@ namespace MWPhysics
             void setWaterHeight(float height);
             void disableWater();
 
-            void addObject (const MWWorld::Ptr& ptr, const std::string& mesh, osg::Quat rotation, int collisionType = CollisionType_World, bool skipAnimated = false);
+            void addObject (const MWWorld::Ptr& ptr, const std::string& mesh, osg::Quat rotation, int collisionType = CollisionType_World);
             void addActor (const MWWorld::Ptr& ptr, const std::string& mesh);
 
             int addProjectile(const MWWorld::Ptr& caster, const osg::Vec3f& position, const std::string& mesh, bool computeRadius);
diff --git a/apps/openmw/mwworld/cellvisitors.hpp b/apps/openmw/mwworld/cellvisitors.hpp
index 81e1248e6d..77f33fa84b 100644
--- a/apps/openmw/mwworld/cellvisitors.hpp
+++ b/apps/openmw/mwworld/cellvisitors.hpp
@@ -25,16 +25,6 @@ namespace MWWorld
         }
     };
 
-    struct ListObjectsVisitor
-    {
-        std::vector<MWWorld::Ptr> mObjects;
-
-        bool operator() (const MWWorld::Ptr& ptr)
-        {
-            mObjects.push_back (ptr);
-            return true;
-        }
-    };
 }
 
 #endif
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index 55e39de55e..da4dd9d99e 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -30,12 +30,12 @@ namespace MWWorld
 
     }
 
-    void Class::insertObject(const Ptr& ptr, const std::string& mesh, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
+    void Class::insertObject(const Ptr& ptr, const std::string& mesh, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const
     {
 
     }
 
-    void Class::insertObjectPhysics(const Ptr& ptr, const std::string& mesh, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated) const
+    void Class::insertObjectPhysics(const Ptr& ptr, const std::string& mesh, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const
     {}
 
     bool Class::apply (const MWWorld::Ptr& ptr, const std::string& id,  const MWWorld::Ptr& actor) const
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index 4779a3065b..8e451ea580 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -78,9 +78,9 @@ namespace MWWorld
             }
 
             virtual void insertObjectRendering (const Ptr& ptr, const std::string& mesh, MWRender::RenderingInterface& renderingInterface) const;
-            virtual void insertObject(const Ptr& ptr, const std::string& mesh, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const;
+            virtual void insertObject(const Ptr& ptr, const std::string& mesh, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const;
             ///< Add reference into a cell for rendering (default implementation: don't render anything).
-            virtual void insertObjectPhysics(const Ptr& ptr, const std::string& mesh, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics, bool skipAnimated = false) const;
+            virtual void insertObjectPhysics(const Ptr& ptr, const std::string& mesh, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const;
 
             virtual std::string getName (const ConstPtr& ptr) const = 0;
             ///< \return name or ID; can return an empty string.
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 559ab4aef4..765464c8de 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -104,7 +104,7 @@ namespace
     }
 
     void addObject(const MWWorld::Ptr& ptr, MWPhysics::PhysicsSystem& physics,
-                   MWRender::RenderingManager& rendering, std::set<ESM::RefNum>& pagedRefs, bool onlyPhysics)
+                   MWRender::RenderingManager& rendering, std::set<ESM::RefNum>& pagedRefs)
     {
         if (ptr.getRefData().getBaseNode() || physics.getActor(ptr))
         {
@@ -114,12 +114,6 @@ namespace
 
         std::string model = getModel(ptr, rendering.getResourceSystem()->getVFS());
         const auto rotation = makeNodeRotation(ptr, RotationOrder::direct);
-        if (onlyPhysics && !physics.getObject(ptr) && !ptr.getClass().isActor())
-        {
-            // When we preload physics object we need to skip animated objects. They are dependant on the scene graph which doesn't yet exist.
-            ptr.getClass().insertObject (ptr, model, rotation, physics, true);
-            return;
-        }
 
         const ESM::RefNum& refnum = ptr.getCellRef().getRefNum();
         if (!refnum.hasContentFile() || pagedRefs.find(refnum) == pagedRefs.end())
@@ -137,8 +131,7 @@ namespace
         // Restore effect particles
         MWBase::Environment::get().getWorld()->applyLoopingParticles(ptr);
 
-        if (!physics.getObject(ptr))
-            ptr.getClass().insertObject (ptr, model, rotation, physics);
+        ptr.getClass().insertObject (ptr, model, rotation, physics);
 
         MWBase::Environment::get().getLuaManager()->objectAddedToScene(ptr);
     }
@@ -201,11 +194,10 @@ namespace
     {
         MWWorld::CellStore& mCell;
         Loading::Listener* mLoadingListener;
-        bool mOnlyObjects;
 
         std::vector<MWWorld::Ptr> mToInsert;
 
-        InsertVisitor (MWWorld::CellStore& cell, Loading::Listener* loadingListener, bool onlyObjects);
+        InsertVisitor (MWWorld::CellStore& cell, Loading::Listener* loadingListener);
 
         bool operator() (const MWWorld::Ptr& ptr);
 
@@ -213,8 +205,8 @@ namespace
         void insert(AddObject&& addObject);
     };
 
-    InsertVisitor::InsertVisitor (MWWorld::CellStore& cell, Loading::Listener* loadingListener, bool onlyObjects)
-        : mCell(cell), mLoadingListener(loadingListener), mOnlyObjects(onlyObjects)
+    InsertVisitor::InsertVisitor (MWWorld::CellStore& cell, Loading::Listener* loadingListener)
+        : mCell(cell), mLoadingListener(loadingListener)
     {}
 
     bool InsertVisitor::operator() (const MWWorld::Ptr& ptr)
@@ -230,7 +222,7 @@ namespace
     {
         for (MWWorld::Ptr& ptr : mToInsert)
         {
-            if (!ptr.getRefData().isDeleted() && ptr.getRefData().isEnabled() && (!mOnlyObjects || !ptr.getClass().isActor()))
+            if (!ptr.getRefData().isDeleted() && ptr.getRefData().isEnabled())
             {
                 try
                 {
@@ -248,16 +240,6 @@ namespace
         }
     }
 
-    struct PositionVisitor
-    {
-        bool operator() (const MWWorld::Ptr& ptr)
-        {
-            if (!ptr.getRefData().isDeleted() && ptr.getRefData().isEnabled())
-                ptr.getClass().adjustPosition (ptr, false);
-            return true;
-        }
-    };
-
     int getCellPositionDistanceToOrigin(const std::pair<int, int>& cellPosition)
     {
         return std::abs(cellPosition.first) + std::abs(cellPosition.second);
@@ -324,39 +306,12 @@ namespace MWWorld
         mRendering.update (duration, paused);
     }
 
-    void Scene::unloadInactiveCell (CellStore* cell)
+    void Scene::unloadCell(CellStore* cell)
     {
-        assert(mActiveCells.find(cell) == mActiveCells.end());
-        assert(mInactiveCells.find(cell) != mInactiveCells.end());
-
-        Log(Debug::Info) << "Unloading cell " << cell->getCell()->getDescription();
-
-        ListObjectsVisitor visitor;
-
-        cell->forEach(visitor);
-        for (const auto& ptr : visitor.mObjects)
-        {
-            mPhysics->remove(ptr);
-            ptr.mRef->mData.mPhysicsPostponed = false;
-        }
-
-        if (cell->getCell()->isExterior())
-        {
-            const auto cellX = cell->getCell()->getGridX();
-            const auto cellY = cell->getCell()->getGridY();
-            mPhysics->removeHeightField(cellX, cellY);
-        }
-
-        mInactiveCells.erase(cell);
-    }
-
-    void Scene::deactivateCell(CellStore* cell)
-    {
-        assert(mInactiveCells.find(cell) != mInactiveCells.end());
         if (mActiveCells.find(cell) == mActiveCells.end())
             return;
 
-        Log(Debug::Info) << "Deactivate cell " << cell->getCell()->getDescription();
+        Log(Debug::Info) << "Unloading cell " << cell->getCell()->getDescription();
 
         ListAndResetObjectsVisitor visitor;
 
@@ -367,8 +322,8 @@ namespace MWWorld
             if (const auto object = mPhysics->getObject(ptr))
             {
                 mNavigator.removeObject(DetourNavigator::ObjectId(object));
-                if (object->isAnimated())
-                    mPhysics->remove(ptr);
+                mPhysics->remove(ptr);
+                ptr.mRef->mData.mPhysicsPostponed = false;
             }
             else if (mPhysics->getActor(ptr))
             {
@@ -386,6 +341,8 @@ namespace MWWorld
         {
             if (mPhysics->getHeightField(cellX, cellY) != nullptr)
                 mNavigator.removeHeightfield(osg::Vec2i(cellX, cellY));
+
+            mPhysics->removeHeightField(cellX, cellY);
         }
 
         if (cell->getCell()->hasWater())
@@ -408,12 +365,11 @@ namespace MWWorld
         mActiveCells.erase(cell);
     }
 
-    void Scene::activateCell(CellStore *cell, Loading::Listener* loadingListener, bool respawn)
+    void Scene::loadCell(CellStore *cell, Loading::Listener* loadingListener, bool respawn)
     {
         using DetourNavigator::HeightfieldShape;
 
         assert(mActiveCells.find(cell) == mActiveCells.end());
-        assert(mInactiveCells.find(cell) != mInactiveCells.end());
         mActiveCells.insert(cell);
 
         Log(Debug::Info) << "Loading cell " << cell->getCell()->getDescription();
@@ -425,13 +381,25 @@ namespace MWWorld
 
         if (cell->getCell()->isExterior())
         {
+            osg::ref_ptr<const ESMTerrain::LandObject> land = mRendering.getLandManager()->getLand(cellX, cellY);
+            const ESM::Land::LandData* data = land ? land->getData(ESM::Land::DATA_VHGT) : nullptr;
+            const float verts = ESM::Land::LAND_SIZE;
+            const float worldsize = ESM::Land::REAL_SIZE;
+            if (data)
+            {
+                mPhysics->addHeightField (data->mHeights, cellX, cellY, worldsize / (verts-1), verts, data->mMinHeight, data->mMaxHeight, land.get());
+            }
+            else
+            {
+                static std::vector<float> defaultHeight;
+                defaultHeight.resize(verts*verts, ESM::Land::DEFAULT_HEIGHT);
+                mPhysics->addHeightField (&defaultHeight[0], cellX, cellY, worldsize / (verts-1), verts, ESM::Land::DEFAULT_HEIGHT, ESM::Land::DEFAULT_HEIGHT, land.get());
+            }
             if (const auto heightField = mPhysics->getHeightField(cellX, cellY))
             {
                 const osg::Vec2i cellPosition(cellX, cellY);
                 const btVector3& origin = heightField->getCollisionObject()->getWorldTransform().getOrigin();
                 const osg::Vec3f shift(origin.x(), origin.y(), origin.z());
-                const osg::ref_ptr<const ESMTerrain::LandObject> land = mRendering.getLandManager()->getLand(cellX, cellY);
-                const ESM::Land::LandData* const data = land == nullptr ? nullptr : land->getData(ESM::Land::DATA_VHGT);
                 const HeightfieldShape shape = [&] () -> HeightfieldShape
                 {
                     if (data == nullptr)
@@ -462,7 +430,7 @@ namespace MWWorld
         if (respawn)
             cell->respawn();
 
-        insertCell(*cell, loadingListener, false);
+        insertCell(*cell, loadingListener);
 
         mRendering.addCell(cell);
 
@@ -511,49 +479,14 @@ namespace MWWorld
         mPreloader->notifyLoaded(cell);
     }
 
-    void Scene::loadInactiveCell(CellStore *cell, Loading::Listener* loadingListener)
-    {
-        assert(mActiveCells.find(cell) == mActiveCells.end());
-        assert(mInactiveCells.find(cell) == mInactiveCells.end());
-        mInactiveCells.insert(cell);
-
-        Log(Debug::Info) << "Loading inactive cell " << cell->getCell()->getDescription();
-
-        if (cell->getCell()->isExterior())
-        {
-            float verts = ESM::Land::LAND_SIZE;
-            float worldsize = ESM::Land::REAL_SIZE;
-
-            const int cellX = cell->getCell()->getGridX();
-            const int cellY = cell->getCell()->getGridY();
-
-            osg::ref_ptr<const ESMTerrain::LandObject> land = mRendering.getLandManager()->getLand(cellX, cellY);
-            const ESM::Land::LandData* data = land ? land->getData(ESM::Land::DATA_VHGT) : nullptr;
-            if (data)
-            {
-                mPhysics->addHeightField (data->mHeights, cellX, cellY, worldsize / (verts-1), verts, data->mMinHeight, data->mMaxHeight, land.get());
-            }
-            else
-            {
-                static std::vector<float> defaultHeight;
-                defaultHeight.resize(verts*verts, ESM::Land::DEFAULT_HEIGHT);
-                mPhysics->addHeightField (&defaultHeight[0], cellX, cellY, worldsize / (verts-1), verts, ESM::Land::DEFAULT_HEIGHT, ESM::Land::DEFAULT_HEIGHT, land.get());
-            }
-        }
-
-        insertCell(*cell, loadingListener, true);
-    }
-
     void Scene::clear()
     {
-        for (auto iter = mInactiveCells.begin(); iter!=mInactiveCells.end(); )
+        for (auto iter = mActiveCells.begin(); iter!=mActiveCells.end(); )
         {
             auto* cell = *iter++;
-            deactivateCell(cell);
-            unloadInactiveCell (cell);
+            unloadCell (cell);
         }
         assert(mActiveCells.empty());
-        assert(mInactiveCells.empty());
         mCurrentCell = nullptr;
 
         mPreloader->clear();
@@ -595,7 +528,7 @@ namespace MWWorld
 
     void Scene::changeCellGrid (const osg::Vec3f &pos, int playerCellX, int playerCellY, bool changeEvent)
     {
-        for (auto iter = mInactiveCells.begin(); iter != mInactiveCells.end(); )
+        for (auto iter = mActiveCells.begin(); iter != mActiveCells.end(); )
         {
             auto* cell = *iter++;
             if (cell->getCell()->isExterior())
@@ -603,16 +536,10 @@ namespace MWWorld
                 const auto dx = std::abs(playerCellX - cell->getCell()->getGridX());
                 const auto dy = std::abs(playerCellY - cell->getCell()->getGridY());
                 if (dx > mHalfGridSize || dy > mHalfGridSize)
-                    deactivateCell(cell);
-
-                if (dx > mHalfGridSize+1 || dy > mHalfGridSize+1)
-                    unloadInactiveCell(cell);
+                    unloadCell(cell);
             }
             else
-            {
-                deactivateCell(cell);
-                unloadInactiveCell(cell);
-            }
+                unloadCell (cell);
         }
 
         mCurrentGridCenter = osg::Vec2i(playerCellX, playerCellY);
@@ -662,7 +589,6 @@ namespace MWWorld
         }
 
         auto cellsPositionsToLoad = cellsToLoad(mActiveCells,mHalfGridSize);
-        auto cellsPositionsToLoadInactive = cellsToLoad(mInactiveCells,mHalfGridSize+1);
 
         Loading::Listener* loadingListener = MWBase::Environment::get().getWindowManager()->getLoadingScreen();
         Loading::ScopedLoad load(loadingListener);
@@ -685,26 +611,12 @@ namespace MWWorld
                 return getCellPositionPriority(lhs) < getCellPositionPriority(rhs);
             });
 
-        std::sort(cellsPositionsToLoadInactive.begin(), cellsPositionsToLoadInactive.end(),
-            [&] (const std::pair<int, int>& lhs, const std::pair<int, int>& rhs) {
-                return getCellPositionPriority(lhs) < getCellPositionPriority(rhs);
-            });
-
-        // Load cells
-        for (const auto& [x,y] : cellsPositionsToLoadInactive)
-        {
-            if (!isCellInCollection(x, y, mInactiveCells))
-            {
-                CellStore *cell = MWBase::Environment::get().getWorld()->getExterior(x, y);
-                loadInactiveCell (cell, loadingListener);
-            }
-        }
         for (const auto& [x,y] : cellsPositionsToLoad)
         {
             if (!isCellInCollection(x, y, mActiveCells))
             {
                 CellStore *cell = MWBase::Environment::get().getWorld()->getExterior(x, y);
-                activateCell (cell, loadingListener, changeEvent);
+                loadCell (cell, loadingListener, changeEvent);
             }
         }
 
@@ -737,17 +649,15 @@ namespace MWWorld
             loadingListener->setLabel("Testing exterior cells ("+std::to_string(i)+"/"+std::to_string(cells.getExtSize())+")...");
 
             CellStore *cell = MWBase::Environment::get().getWorld()->getExterior(it->mData.mX, it->mData.mY);
-            loadInactiveCell(cell, nullptr);
-            activateCell(cell, nullptr, false);
+            loadCell(cell, nullptr, false);
 
-            auto iter = mInactiveCells.begin();
-            while (iter != mInactiveCells.end())
+            auto iter = mActiveCells.begin();
+            while (iter != mActiveCells.end())
             {
                 if (it->isExterior() && it->mData.mX == (*iter)->getCell()->getGridX() &&
                     it->mData.mY == (*iter)->getCell()->getGridY())
                 {
-                    deactivateCell(*iter);
-                    unloadInactiveCell(*iter);
+                    unloadCell(*iter);
                     break;
                 }
 
@@ -785,18 +695,16 @@ namespace MWWorld
             loadingListener->setLabel("Testing interior cells ("+std::to_string(i)+"/"+std::to_string(cells.getIntSize())+")...");
 
             CellStore *cell = MWBase::Environment::get().getWorld()->getInterior(it->mName);
-            loadInactiveCell(cell, nullptr);
-            activateCell(cell, nullptr, false);
+            loadCell(cell, nullptr, false);
 
-            auto iter = mInactiveCells.begin();
-            while (iter != mInactiveCells.end())
+            auto iter = mActiveCells.begin();
+            while (iter != mActiveCells.end())
             {
                 assert (!(*iter)->getCell()->isExterior());
 
                 if (it->mName == (*iter)->getCell()->mName)
                 {
-                    deactivateCell(*iter);
-                    unloadInactiveCell(*iter);
+                    unloadCell(*iter);
                     break;
                 }
 
@@ -915,11 +823,10 @@ namespace MWWorld
         Log(Debug::Info) << "Changing to interior";
 
         // unload
-        for (auto iter = mInactiveCells.begin(); iter!=mInactiveCells.end(); )
+        for (auto iter = mActiveCells.begin(); iter!=mActiveCells.end(); )
         {
             auto* cellToUnload = *iter++;
-            deactivateCell(cellToUnload);
-            unloadInactiveCell(cellToUnload);
+            unloadCell(cellToUnload);
         }
         assert(mActiveCells.empty());
         assert(mInactiveCells.empty());
@@ -928,8 +835,7 @@ namespace MWWorld
 
         // Load cell.
         mPagedRefs.clear();
-        loadInactiveCell (cell, loadingListener);
-        activateCell (cell, loadingListener, changeEvent);
+        loadCell(cell, loadingListener, changeEvent);
 
         changePlayerCell(cell, position, adjustPlayerPos);
 
@@ -979,26 +885,19 @@ namespace MWWorld
         mCellChanged = false;
     }
 
-    void Scene::insertCell (CellStore &cell, Loading::Listener* loadingListener, bool onlyObjects)
+    void Scene::insertCell (CellStore &cell, Loading::Listener* loadingListener)
     {
-        InsertVisitor insertVisitor(cell, loadingListener, onlyObjects);
+        InsertVisitor insertVisitor(cell, loadingListener);
         cell.forEach (insertVisitor);
-        insertVisitor.insert([&] (const MWWorld::Ptr& ptr) { addObject(ptr, *mPhysics, mRendering, mPagedRefs, onlyObjects); });
-        if (!onlyObjects)
-        {
-            insertVisitor.insert([&] (const MWWorld::Ptr& ptr) { addObject(ptr, *mPhysics, mNavigator); });
-
-            // do adjustPosition (snapping actors to ground) after objects are loaded, so we don't depend on the loading order
-            PositionVisitor posVisitor;
-            cell.forEach (posVisitor);
-        }
+        insertVisitor.insert([&] (const MWWorld::Ptr& ptr) { addObject(ptr, *mPhysics, mRendering, mPagedRefs); });
+        insertVisitor.insert([&] (const MWWorld::Ptr& ptr) { addObject(ptr, *mPhysics, mNavigator); });
     }
 
     void Scene::addObjectToScene (const Ptr& ptr)
     {
         try
         {
-            addObject(ptr, *mPhysics, mRendering, mPagedRefs, false);
+            addObject(ptr, *mPhysics, mRendering, mPagedRefs);
             addObject(ptr, *mPhysics, mNavigator);
             MWBase::Environment::get().getWorld()->scaleObject(ptr, ptr.getCellRef().getScale());
             const auto player = MWBase::Environment::get().getWorld()->getPlayerPtr();
diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp
index 3f5d7bf2f5..12d79d3d11 100644
--- a/apps/openmw/mwworld/scene.hpp
+++ b/apps/openmw/mwworld/scene.hpp
@@ -77,7 +77,6 @@ namespace MWWorld
 
             CellStore* mCurrentCell; // the cell the player is in
             CellStoreCollection mActiveCells;
-            CellStoreCollection mInactiveCells;
             bool mCellChanged;
             MWPhysics::PhysicsSystem *mPhysics;
             MWRender::RenderingManager& mRendering;
@@ -100,7 +99,7 @@ namespace MWWorld
 
             std::vector<osg::ref_ptr<SceneUtil::WorkItem>> mWorkItems;
 
-            void insertCell(CellStore &cell, Loading::Listener* loadingListener, bool onlyObjects);
+            void insertCell(CellStore &cell, Loading::Listener* loadingListener);
             osg::Vec2i mCurrentGridCenter;
 
             // Load and unload cells as necessary to create a cell grid with "X" and "Y" in the center
@@ -116,10 +115,8 @@ namespace MWWorld
             osg::Vec4i gridCenterToBounds(const osg::Vec2i &centerCell) const;
             osg::Vec2i getNewGridCenter(const osg::Vec3f &pos, const osg::Vec2i *currentGridCenter = nullptr) const;
 
-            void unloadInactiveCell(CellStore* cell);
-            void deactivateCell(CellStore* cell);
-            void activateCell(CellStore *cell, Loading::Listener* loadingListener, bool respawn);
-            void loadInactiveCell(CellStore *cell, Loading::Listener* loadingListener);
+            void unloadCell(CellStore* cell);
+            void loadCell(CellStore *cell, Loading::Listener* loadingListener, bool respawn);
 
         public:
 

From b5af192888c8f38a2f04f77e0cffce61cf683f5b Mon Sep 17 00:00:00 2001
From: andrewapp <andrew.appuhamy@gmail.com>
Date: Fri, 1 Oct 2021 09:19:26 +1000
Subject: [PATCH 1398/2859] gamepad cursor speed fix

---
 AUTHORS.md                                | 1 +
 apps/openmw/mwinput/controllermanager.cpp | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index a1f00bca10..2080f12a99 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -229,6 +229,7 @@ Programmers
     Yuri Krupenin
     zelurker
     Noah Gooder
+    Andrew Appuhamy (andrew-app)
 
 Documentation
 -------------
diff --git a/apps/openmw/mwinput/controllermanager.cpp b/apps/openmw/mwinput/controllermanager.cpp
index 7a91f8643b..fa10ce03cd 100644
--- a/apps/openmw/mwinput/controllermanager.cpp
+++ b/apps/openmw/mwinput/controllermanager.cpp
@@ -99,8 +99,8 @@ namespace MWInput
             // We keep track of our own mouse position, so that moving the mouse while in
             // game mode does not move the position of the GUI cursor
             float uiScale = MWBase::Environment::get().getWindowManager()->getScalingFactor();
-            float xMove = xAxis * dt * 1500.0f / uiScale;
-            float yMove = yAxis * dt * 1500.0f / uiScale;
+            float xMove = xAxis * dt * 1500.0f / uiScale * mGamepadCursorSpeed;
+            float yMove = yAxis * dt * 1500.0f / uiScale * mGamepadCursorSpeed;
 
             float mouseWheelMove = -zAxis * dt * 1500.0f;
             if (xMove != 0 || yMove != 0 || mouseWheelMove != 0)

From 2568f119a4e31ed192e54e3fecb8bd62f33194f3 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Fri, 1 Oct 2021 08:11:00 +0000
Subject: [PATCH 1399/2859] reapplies PR without npe (#3137)

* avoids creating empty statesets on drawables

Currently, we attempt to skip creating state on drawable nodes when this state matches the default state. This attempt is incomplete because we still create an avoidable empty stateset in the default case.

* renderingmanager.cpp

* nifloader.cpp

* nifloader.cpp

* shadervisitor.cpp
---
 apps/openmw/mwrender/renderingmanager.cpp |  1 +
 components/nifosg/nifloader.cpp           | 20 +++++++++-----------
 components/shader/shadervisitor.cpp       |  6 ++++--
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 07b0418f2b..be143510b2 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -486,6 +486,7 @@ namespace MWRender
         defaultMat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
         defaultMat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 0.f));
         sceneRoot->getOrCreateStateSet()->setAttribute(defaultMat);
+        sceneRoot->getOrCreateStateSet()->addUniform(new osg::Uniform("emissiveMult", 1.f));
 
         mFog.reset(new FogManager());
 
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 0432aef5b4..a564844ce6 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -1134,8 +1134,6 @@ namespace NifOsg
                 trans->addChild(toAttach);
                 parentNode->addChild(trans);
             }
-            // create partsys stateset in order to pass in ShaderVisitor like all other Drawables
-            partsys->getOrCreateStateSet();
         }
 
         void handleNiGeometryData(osg::Geometry *geometry, const Nif::NiGeometryData* data, const std::vector<unsigned int>& boundTextures, const std::string& name)
@@ -1923,8 +1921,6 @@ namespace NifOsg
         void applyDrawableProperties(osg::Node* node, const std::vector<const Nif::Property*>& properties, SceneUtil::CompositeStateSetUpdater* composite,
                                              bool hasVertexColors, int animflags)
         {
-            osg::StateSet* stateset = node->getOrCreateStateSet();
-
             // Specular lighting is enabled by default, but there's a quirk...
             bool specEnabled = true;
             osg::ref_ptr<osg::Material> mat (new osg::Material);
@@ -2006,15 +2002,15 @@ namespace NifOsg
                         if (blendFunc->getDestination() == GL_DST_ALPHA)
                             blendFunc->setDestination(GL_ONE);
                         blendFunc = shareAttribute(blendFunc);
-                        stateset->setAttributeAndModes(blendFunc, osg::StateAttribute::ON);
+                        node->getOrCreateStateSet()->setAttributeAndModes(blendFunc, osg::StateAttribute::ON);
 
                         bool noSort = (alphaprop->flags>>13)&1;
                         if (!noSort)
-                            stateset->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
+                            node->getOrCreateStateSet()->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
                         else
-                            stateset->setRenderBinToInherit();
+                            node->getOrCreateStateSet()->setRenderBinToInherit();
                     }
-                    else
+                    else if (osg::StateSet* stateset = node->getStateSet())
                     {
                         stateset->removeAttribute(osg::StateAttribute::BLENDFUNC);
                         stateset->removeMode(GL_BLEND);
@@ -2025,9 +2021,9 @@ namespace NifOsg
                     {
                         osg::ref_ptr<osg::AlphaFunc> alphaFunc (new osg::AlphaFunc(getTestMode((alphaprop->flags>>10)&0x7), alphaprop->data.threshold/255.f));
                         alphaFunc = shareAttribute(alphaFunc);
-                        stateset->setAttributeAndModes(alphaFunc, osg::StateAttribute::ON);
+                        node->getOrCreateStateSet()->setAttributeAndModes(alphaFunc, osg::StateAttribute::ON);
                     }
-                    else
+                    else if (osg::StateSet* stateset = node->getStateSet())
                     {
                         stateset->removeAttribute(osg::StateAttribute::ALPHAFUNC);
                         stateset->removeMode(GL_ALPHA_TEST);
@@ -2083,8 +2079,10 @@ namespace NifOsg
 
             mat = shareAttribute(mat);
 
+            osg::StateSet* stateset = node->getOrCreateStateSet();
             stateset->setAttributeAndModes(mat, osg::StateAttribute::ON);
-            stateset->addUniform(new osg::Uniform("emissiveMult", emissiveMult));
+            if (emissiveMult != 1.f)
+                stateset->addUniform(new osg::Uniform("emissiveMult", emissiveMult));
         }
 
     };
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 0d0710853f..cc2b781cfd 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -116,7 +116,6 @@ namespace Shader
         , mImageManager(imageManager)
         , mDefaultShaderPrefix(defaultShaderPrefix)
     {
-        mRequirements.emplace_back();
     }
 
     void ShaderVisitor::setForceShaders(bool force)
@@ -421,7 +420,10 @@ namespace Shader
 
     void ShaderVisitor::pushRequirements(osg::Node& node)
     {
-        mRequirements.push_back(mRequirements.back());
+        if (mRequirements.empty())
+            mRequirements.emplace_back();
+        else
+            mRequirements.push_back(mRequirements.back());
         mRequirements.back().mNode = &node;
     }
 

From 52a10a4bc076d0235a5f382ed3980d34e1059cf9 Mon Sep 17 00:00:00 2001
From: Bret Curtis <bret.curtis@gmail.com>
Date: Fri, 1 Oct 2021 12:24:29 +0200
Subject: [PATCH 1400/2859] remove one last assert

---
 apps/openmw/mwworld/scene.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 765464c8de..1e21dc2f57 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -829,7 +829,6 @@ namespace MWWorld
             unloadCell(cellToUnload);
         }
         assert(mActiveCells.empty());
-        assert(mInactiveCells.empty());
 
         loadingListener->setProgressRange(cell->count());
 

From 1c9f06f74208eeb28b12a917c84ff94a53babc7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matja=C5=BE=20Lamut?= <matjaz.lamut@gmail.com>
Date: Sun, 3 Oct 2021 19:13:51 +0000
Subject: [PATCH 1401/2859] Minor UI tweaks all around OpenMW-CS

---
 apps/opencs/view/doc/view.cpp           | 50 +++++++++++++++----------
 apps/opencs/view/render/cellarrow.cpp   |  8 ++--
 apps/opencs/view/world/enumdelegate.cpp |  2 +
 3 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/apps/opencs/view/doc/view.cpp b/apps/opencs/view/doc/view.cpp
index 4514cfb585..c89437d70d 100644
--- a/apps/opencs/view/doc/view.cpp
+++ b/apps/opencs/view/doc/view.cpp
@@ -65,6 +65,8 @@ void CSVDoc::View::setupFileMenu()
     QAction* save = createMenuEntry("Save", ":./menu-save.png", file, "document-file-save");
     connect (save, SIGNAL (triggered()), this, SLOT (save()));
     mSave = save;
+    
+    file->addSeparator();
 
     QAction* verify = createMenuEntry("Verify", ":./menu-verify.png", file, "document-file-verify");
     connect (verify, SIGNAL (triggered()), this, SLOT (verify()));
@@ -80,6 +82,8 @@ void CSVDoc::View::setupFileMenu()
     QAction* meta = createMenuEntry(CSMWorld::UniversalId::Type_MetaDatas, file, "document-file-metadata");
     connect (meta, SIGNAL (triggered()), this, SLOT (addMetaDataSubView()));
 
+    file->addSeparator();
+    
     QAction* close = createMenuEntry("Close", ":./menu-close.png", file, "document-file-close");
     connect (close, SIGNAL (triggered()), this, SLOT (close()));
 
@@ -156,17 +160,16 @@ void CSVDoc::View::setupWorldMenu()
 {
     QMenu *world = menuBar()->addMenu (tr ("World"));
 
-    QAction* regions = createMenuEntry(CSMWorld::UniversalId::Type_Regions, world, "document-world-regions");
-    connect (regions, SIGNAL (triggered()), this, SLOT (addRegionsSubView()));
-
-    QAction* cells = createMenuEntry(CSMWorld::UniversalId::Type_Cells, world, "document-world-cells");
-    connect (cells, SIGNAL (triggered()), this, SLOT (addCellsSubView()));
-
     QAction* referenceables = createMenuEntry(CSMWorld::UniversalId::Type_Referenceables, world, "document-world-referencables");
     connect (referenceables, SIGNAL (triggered()), this, SLOT (addReferenceablesSubView()));
 
     QAction* references = createMenuEntry(CSMWorld::UniversalId::Type_References, world, "document-world-references");
     connect (references, SIGNAL (triggered()), this, SLOT (addReferencesSubView()));
+    
+    world->addSeparator();
+
+    QAction* cells = createMenuEntry(CSMWorld::UniversalId::Type_Cells, world, "document-world-cells");
+    connect (cells, SIGNAL (triggered()), this, SLOT (addCellsSubView()));
 
     QAction *lands = createMenuEntry(CSMWorld::UniversalId::Type_Lands, world, "document-world-lands");
     connect (lands, SIGNAL (triggered()), this, SLOT (addLandsSubView()));
@@ -177,7 +180,10 @@ void CSVDoc::View::setupWorldMenu()
     QAction *grid = createMenuEntry(CSMWorld::UniversalId::Type_Pathgrids, world, "document-world-pathgrid");
     connect (grid, SIGNAL (triggered()), this, SLOT (addPathgridSubView()));
 
-    world->addSeparator(); // items that don't represent single record lists follow here
+    world->addSeparator();
+
+    QAction* regions = createMenuEntry(CSMWorld::UniversalId::Type_Regions, world, "document-world-regions");
+    connect (regions, SIGNAL (triggered()), this, SLOT (addRegionsSubView()));
 
     QAction *regionMap = createMenuEntry(CSMWorld::UniversalId::Type_RegionMap, world, "document-world-regionmap");
     connect (regionMap, SIGNAL (triggered()), this, SLOT (addRegionMapSubView()));
@@ -187,14 +193,19 @@ void CSVDoc::View::setupMechanicsMenu()
 {
     QMenu *mechanics = menuBar()->addMenu (tr ("Mechanics"));
 
+    QAction* scripts = createMenuEntry(CSMWorld::UniversalId::Type_Scripts, mechanics, "document-mechanics-scripts");
+    connect (scripts, SIGNAL (triggered()), this, SLOT (addScriptsSubView()));
+
+    QAction* startScripts = createMenuEntry(CSMWorld::UniversalId::Type_StartScripts, mechanics, "document-mechanics-startscripts");
+    connect (startScripts, SIGNAL (triggered()), this, SLOT (addStartScriptsSubView()));
+
     QAction* globals = createMenuEntry(CSMWorld::UniversalId::Type_Globals, mechanics, "document-mechanics-globals");
     connect (globals, SIGNAL (triggered()), this, SLOT (addGlobalsSubView()));
 
     QAction* gmsts = createMenuEntry(CSMWorld::UniversalId::Type_Gmsts, mechanics, "document-mechanics-gamesettings");
     connect (gmsts, SIGNAL (triggered()), this, SLOT (addGmstsSubView()));
-
-    QAction* scripts = createMenuEntry(CSMWorld::UniversalId::Type_Scripts, mechanics, "document-mechanics-scripts");
-    connect (scripts, SIGNAL (triggered()), this, SLOT (addScriptsSubView()));
+    
+    mechanics->addSeparator();
 
     QAction* spells = createMenuEntry(CSMWorld::UniversalId::Type_Spells, mechanics, "document-mechanics-spells");
     connect (spells, SIGNAL (triggered()), this, SLOT (addSpellsSubView()));
@@ -204,9 +215,6 @@ void CSVDoc::View::setupMechanicsMenu()
 
     QAction* magicEffects = createMenuEntry(CSMWorld::UniversalId::Type_MagicEffects, mechanics, "document-mechanics-magiceffects");
     connect (magicEffects, SIGNAL (triggered()), this, SLOT (addMagicEffectsSubView()));
-
-    QAction* startScripts = createMenuEntry(CSMWorld::UniversalId::Type_StartScripts, mechanics, "document-mechanics-startscripts");
-    connect (startScripts, SIGNAL (triggered()), this, SLOT (addStartScriptsSubView()));
 }
 
 void CSVDoc::View::setupCharacterMenu()
@@ -227,21 +235,25 @@ void CSVDoc::View::setupCharacterMenu()
 
     QAction* birthsigns = createMenuEntry(CSMWorld::UniversalId::Type_Birthsigns, characters, "document-character-birthsigns");
     connect (birthsigns, SIGNAL (triggered()), this, SLOT (addBirthsignsSubView()));
+    
+    QAction* bodyParts = createMenuEntry(CSMWorld::UniversalId::Type_BodyParts, characters, "document-character-bodyparts");
+    connect (bodyParts, SIGNAL (triggered()), this, SLOT (addBodyPartsSubView()));
 
+    characters->addSeparator();
+    
     QAction* topics = createMenuEntry(CSMWorld::UniversalId::Type_Topics, characters, "document-character-topics");
     connect (topics, SIGNAL (triggered()), this, SLOT (addTopicsSubView()));
 
-    QAction* journals = createMenuEntry(CSMWorld::UniversalId::Type_Journals, characters, "document-character-journals");
-    connect (journals, SIGNAL (triggered()), this, SLOT (addJournalsSubView()));
-
     QAction* topicInfos = createMenuEntry(CSMWorld::UniversalId::Type_TopicInfos, characters, "document-character-topicinfos");
     connect (topicInfos, SIGNAL (triggered()), this, SLOT (addTopicInfosSubView()));
+    
+    characters->addSeparator();
+    
+    QAction* journals = createMenuEntry(CSMWorld::UniversalId::Type_Journals, characters, "document-character-journals");
+    connect (journals, SIGNAL (triggered()), this, SLOT (addJournalsSubView()));
 
     QAction* journalInfos = createMenuEntry(CSMWorld::UniversalId::Type_JournalInfos, characters, "document-character-journalinfos");
     connect (journalInfos, SIGNAL (triggered()), this, SLOT (addJournalInfosSubView()));
-
-    QAction* bodyParts = createMenuEntry(CSMWorld::UniversalId::Type_BodyParts, characters, "document-character-bodyparts");
-    connect (bodyParts, SIGNAL (triggered()), this, SLOT (addBodyPartsSubView()));
 }
 
 void CSVDoc::View::setupAssetsMenu()
diff --git a/apps/opencs/view/render/cellarrow.cpp b/apps/opencs/view/render/cellarrow.cpp
index a654171fce..776dbf7890 100644
--- a/apps/opencs/view/render/cellarrow.cpp
+++ b/apps/opencs/view/render/cellarrow.cpp
@@ -60,7 +60,7 @@ void CSVRender::CellArrow::adjustTransform()
 {
     // position
     const int cellSize = Constants::CellSizeInUnits;
-    const int offset = cellSize / 2 + 800;
+    const int offset = cellSize / 2 + 600;
 
     int x = mCoordinates.getX()*cellSize + cellSize/2;
     int y = mCoordinates.getY()*cellSize + cellSize/2;
@@ -92,9 +92,9 @@ void CSVRender::CellArrow::buildShape()
 {
     osg::ref_ptr<osg::Geometry> geometry (new osg::Geometry);
 
-    const int arrowWidth = 4000;
-    const int arrowLength = 1500;
-    const int arrowHeight = 500;
+    const int arrowWidth = 2700;
+    const int arrowLength = 1350;
+    const int arrowHeight = 300;
 
     osg::Vec3Array *vertices = new osg::Vec3Array;
     for (int i2=0; i2<2; ++i2)
diff --git a/apps/opencs/view/world/enumdelegate.cpp b/apps/opencs/view/world/enumdelegate.cpp
index 65ded46c7f..2681a398b2 100644
--- a/apps/opencs/view/world/enumdelegate.cpp
+++ b/apps/opencs/view/world/enumdelegate.cpp
@@ -78,6 +78,8 @@ QWidget *CSVWorld::EnumDelegate::createEditor(QWidget *parent, const QStyleOptio
     for (std::vector<std::pair<int, QString> >::const_iterator iter (mValues.begin());
          iter!=mValues.end(); ++iter)
          comboBox->addItem (iter->second);
+    
+    comboBox->setMaxVisibleItems(20);
 
     return comboBox;
 }

From 686268b2f90de54a39000b5424fe02c125d6c034 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 3 Oct 2021 21:39:43 +0200
Subject: [PATCH 1402/2859] Remove incorrect changelog entries

---
 CHANGELOG.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b7ef5b62a..9a813d704f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,7 +20,6 @@
     Bug #5508: Engine binary links to Qt without using it
     Bug #5596: Effects in constant spells should not be merged
     Bug #5621: Drained stats cannot be restored
-    Bug #5755: Active grid object paging - disappearing textures
     Bug #5766: Active grid object paging - disappearing textures
     Bug #5788: Texture editing parses the selected indexes wrongly
     Bug #5801: A multi-effect spell with the intervention effects and recall always favors Almsivi intervention
@@ -45,7 +44,6 @@
     Bug #6174: Spellmaking and Enchanting sliders differences from vanilla
     Bug #6184: Command and Calm and Demoralize and Frenzy and Rally magic effects inconsistencies with vanilla
     Bug #6197: Infinite Casting Loop
-    Bug #6223: Some Constant Effect Bound Items inconsistencies
     Bug #6273: Respawning NPCs rotation is inconsistent
     Bug #6282: Laura craft doesn't follow the player character
     Bug #6283: Avis Dorsey follows you after her death
@@ -59,7 +57,6 @@
     Feature #4297: Implement APPLIED_ONCE flag for magic effects
     Feature #4414: Handle duration of EXTRA SPELL magic effect
     Feature #4595: Unique object identifier
-    Feature #4737: Handle instance move from one cell to another
     Feature #5198: Implement "Magic effect expired" event
     Feature #5454: Clear active spells from actor when he disappears from scene
     Feature #5489: MCP: Telekinesis fix for activators

From d680aa26e9033615befede2e915dc0b67a69869c Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 3 Oct 2021 21:58:10 +0200
Subject: [PATCH 1403/2859] Disallow switch fallthrough

---
 CMakeLists.txt                              | 4 ++++
 apps/opencs/model/world/refidadapterimp.hpp | 1 +
 apps/openmw/mwmechanics/spelleffects.cpp    | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b8350a04b..ae4584a4cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -543,6 +543,10 @@ if (BUILD_OPENCS)
     add_subdirectory (extern/osgQt)
 endif()
 
+if (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=implicit-fallthrough")
+endif()
+
 # Components
 add_subdirectory (components)
 
diff --git a/apps/opencs/model/world/refidadapterimp.hpp b/apps/opencs/model/world/refidadapterimp.hpp
index 84fec5bed0..c35d3c5a7c 100644
--- a/apps/opencs/model/world/refidadapterimp.hpp
+++ b/apps/opencs/model/world/refidadapterimp.hpp
@@ -1870,6 +1870,7 @@ namespace CSMWorld
                         content.mWander.mDuration = static_cast<short>(value.toInt());
                     else
                         return; // return without saving
+                    break;
                 case 3:
                     if (content.mType == ESM::AI_Wander)
                         content.mWander.mTimeOfDay = static_cast<unsigned char>(value.toInt());
diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp
index 24816b9ed1..fa2733d837 100644
--- a/apps/openmw/mwmechanics/spelleffects.cpp
+++ b/apps/openmw/mwmechanics/spelleffects.cpp
@@ -453,6 +453,7 @@ void applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, co
             }
             addBoundItem(world->getStore().get<ESM::GameSetting>().find("sMagicBoundRightGauntletID")->mValue.getString(), target);
             // left gauntlet added below
+            [[fallthrough]];
         case ESM::MagicEffect::BoundDagger:
         case ESM::MagicEffect::BoundLongsword:
         case ESM::MagicEffect::BoundMace:
@@ -920,6 +921,7 @@ void removeMagicEffect(const MWWorld::Ptr& target, ActiveSpells::ActiveSpellPara
             break;
         case ESM::MagicEffect::BoundGloves:
             removeBoundItem(world->getStore().get<ESM::GameSetting>().find("sMagicBoundRightGauntletID")->mValue.getString(), target);
+            [[fallthrough]];
         case ESM::MagicEffect::BoundDagger:
         case ESM::MagicEffect::BoundLongsword:
         case ESM::MagicEffect::BoundMace:

From 49da33a12981b1af7a91c5d1bd5e91fdc97537b6 Mon Sep 17 00:00:00 2001
From: kuyondo <rdja.kyd@gmail.com>
Date: Mon, 4 Oct 2021 08:12:15 +0800
Subject: [PATCH 1404/2859] comiit

---
 apps/openmw/mwgui/tradewindow.cpp | 23 +++++++++++++++++++++--
 apps/openmw/mwgui/tradewindow.hpp |  1 +
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwgui/tradewindow.cpp b/apps/openmw/mwgui/tradewindow.cpp
index 19ea383483..d236305f37 100644
--- a/apps/openmw/mwgui/tradewindow.cpp
+++ b/apps/openmw/mwgui/tradewindow.cpp
@@ -52,6 +52,7 @@ namespace MWGui
         , mItemToSell(-1)
         , mCurrentBalance(0)
         , mCurrentMerchantOffer(0)
+        , mReceiveMoney(false)
     {
         getWidget(mFilterAll, "AllButton");
         getWidget(mFilterWeapon, "WeaponButton");
@@ -405,10 +406,15 @@ namespace MWGui
 
     void TradeWindow::onBalanceValueChanged(int value)
     {
+        int previousBalance = mCurrentBalance;
+
         // Entering a "-" sign inverts the buying/selling state
         mCurrentBalance = (mCurrentBalance >= 0 ? 1 : -1) * value;
         updateLabels();
 
+        if (mReceiveMoney && mCurrentBalance == 0)
+            mCurrentBalance = previousBalance;
+
         if (value != std::abs(value))
             mTotalBalance->setValue(std::abs(value));
     }
@@ -434,10 +440,23 @@ namespace MWGui
     {
         MWWorld::Ptr player = MWMechanics::getPlayer();
         int playerGold = player.getClass().getContainerStore(player).count(MWWorld::ContainerStore::sGoldId);
-
         mPlayerGold->setCaptionWithReplacing("#{sYourGold} " + MyGUI::utility::toString(playerGold));
 
-        if (mCurrentBalance < 0)
+        TradeItemModel* playerTradeModel = MWBase::Environment::get().getWindowManager()->getInventoryWindow()->getTradeModel();
+        const std::vector<ItemStack>& playerBorrowed = playerTradeModel->getItemsBorrowedToUs();
+        const std::vector<ItemStack>& merchantBorrowed = mTradeModel->getItemsBorrowedToUs();
+
+        if (playerBorrowed.empty() && merchantBorrowed.empty()) {
+            mCurrentBalance = 0;
+        }
+        else if (playerBorrowed.empty()) {
+            mReceiveMoney = false;
+        }
+        else if (merchantBorrowed.empty()) {
+            mReceiveMoney = true;
+        }
+
+        if (mCurrentBalance < 0 || mReceiveMoney)
         {
             mTotalBalanceLabel->setCaptionWithReplacing("#{sTotalCost}");
         }
diff --git a/apps/openmw/mwgui/tradewindow.hpp b/apps/openmw/mwgui/tradewindow.hpp
index f82d7b0f72..523cb84098 100644
--- a/apps/openmw/mwgui/tradewindow.hpp
+++ b/apps/openmw/mwgui/tradewindow.hpp
@@ -79,6 +79,7 @@ namespace MWGui
 
             int mCurrentBalance;
             int mCurrentMerchantOffer;
+            bool mReceiveMoney;
 
             void sellToNpc(const MWWorld::Ptr& item, int count, bool boughtItem); ///< only used for adjusting the gold balance
             void buyFromNpc(const MWWorld::Ptr& item, int count, bool soldItem); ///< only used for adjusting the gold balance

From 0c1b78c42a3d4a93471fdd70db4492e76d9cb305 Mon Sep 17 00:00:00 2001
From: Kindi <2538602-Kuyondo@users.noreply.gitlab.com>
Date: Mon, 4 Oct 2021 02:16:01 +0000
Subject: [PATCH 1405/2859] Update tradewindow.cpp curly

---
 apps/openmw/mwgui/tradewindow.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwgui/tradewindow.cpp b/apps/openmw/mwgui/tradewindow.cpp
index 4b8279065c..35466059a2 100644
--- a/apps/openmw/mwgui/tradewindow.cpp
+++ b/apps/openmw/mwgui/tradewindow.cpp
@@ -446,13 +446,16 @@ namespace MWGui
         const std::vector<ItemStack>& playerBorrowed = playerTradeModel->getItemsBorrowedToUs();
         const std::vector<ItemStack>& merchantBorrowed = mTradeModel->getItemsBorrowedToUs();
 
-        if (playerBorrowed.empty() && merchantBorrowed.empty()) {
+        if (playerBorrowed.empty() && merchantBorrowed.empty())
+        {
             mCurrentBalance = 0;
         }
-        else if (playerBorrowed.empty()) {
+        else if (playerBorrowed.empty())
+        {
             mReceiveMoney = false;
         }
-        else if (merchantBorrowed.empty()) {
+        else if (merchantBorrowed.empty())
+        {
             mReceiveMoney = true;
         }
 

From aaf7b423d6796169f382883a669ebfb9c248dc96 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Mon, 4 Oct 2021 08:56:55 +0000
Subject: [PATCH 1406/2859] adds a replacement for osg::NodeCallback (#3144)

* nodecallback.hpp

* lightmanager.hpp

* lightmanager.cpp

* lightmanager.hpp

* nodecallback.hpp

* nodecallback.hpp

* [ci skip]

* lightmanager.hpp

* nodecallback.hpp

* nodecallback.hpp

* lightmanager.cpp

* lightmanager.cpp

* nodecallback.hpp

* [ci skip]

* [ci skip]

* controller.cpp

* [ci skip]

* osgacontroller.cpp

* keyframe.hpp

* controller.hpp

* keyframe.hpp

* [ci skip]

* keyframe.hpp

* animation.hpp

* [ci skip]

* weaponanimation.cpp

* nodecallback.hpp
---
 apps/openmw/mwrender/animation.hpp       |  2 +-
 apps/openmw/mwrender/weaponanimation.cpp |  2 +-
 apps/openmw/mwrender/weaponanimation.hpp |  2 +-
 components/nifosg/controller.cpp         |  1 +
 components/nifosg/controller.hpp         |  5 +--
 components/sceneutil/keyframe.hpp        |  8 ++---
 components/sceneutil/lightmanager.cpp    | 24 ++++----------
 components/sceneutil/lightmanager.hpp    |  7 ++--
 components/sceneutil/nodecallback.hpp    | 41 ++++++++++++++++++++++++
 components/sceneutil/osgacontroller.cpp  |  2 +-
 components/sceneutil/osgacontroller.hpp  |  5 +--
 11 files changed, 66 insertions(+), 33 deletions(-)
 create mode 100644 components/sceneutil/nodecallback.hpp

diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index ffcd9b3260..c2f0f351f3 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -245,7 +245,7 @@ protected:
 
     // Keep track of controllers that we added to our scene graph.
     // We may need to rebuild these controllers when the active animation groups / sources change.
-    std::vector<std::pair<osg::ref_ptr<osg::Node>, osg::ref_ptr<osg::NodeCallback>>> mActiveControllers;
+    std::vector<std::pair<osg::ref_ptr<osg::Node>, osg::ref_ptr<osg::Callback>>> mActiveControllers;
 
     std::shared_ptr<AnimationTime> mAnimationTimePtr[sNumBlendMasks];
 
diff --git a/apps/openmw/mwrender/weaponanimation.cpp b/apps/openmw/mwrender/weaponanimation.cpp
index fb92a4980a..b89cfd8df1 100644
--- a/apps/openmw/mwrender/weaponanimation.cpp
+++ b/apps/openmw/mwrender/weaponanimation.cpp
@@ -173,7 +173,7 @@ void WeaponAnimation::releaseArrow(MWWorld::Ptr actor, float attackStrength)
 }
 
 void WeaponAnimation::addControllers(const std::map<std::string, osg::ref_ptr<osg::MatrixTransform> >& nodes,
-    std::vector<std::pair<osg::ref_ptr<osg::Node>, osg::ref_ptr<osg::NodeCallback>>> &map, osg::Node* objectRoot)
+    std::vector<std::pair<osg::ref_ptr<osg::Node>, osg::ref_ptr<osg::Callback>>> &map, osg::Node* objectRoot)
 {
     for (int i=0; i<2; ++i)
     {
diff --git a/apps/openmw/mwrender/weaponanimation.hpp b/apps/openmw/mwrender/weaponanimation.hpp
index 333dccc915..1f614463a6 100644
--- a/apps/openmw/mwrender/weaponanimation.hpp
+++ b/apps/openmw/mwrender/weaponanimation.hpp
@@ -43,7 +43,7 @@ namespace MWRender
 
         /// Add WeaponAnimation-related controllers to \a nodes and store the added controllers in \a map.
         void addControllers(const std::map<std::string, osg::ref_ptr<osg::MatrixTransform> >& nodes,
-                std::vector<std::pair<osg::ref_ptr<osg::Node>, osg::ref_ptr<osg::NodeCallback>>>& map, osg::Node* objectRoot);
+                std::vector<std::pair<osg::ref_ptr<osg::Node>, osg::ref_ptr<osg::Callback>>>& map, osg::Node* objectRoot);
 
         void deleteControllers();
 
diff --git a/components/nifosg/controller.cpp b/components/nifosg/controller.cpp
index d48c55ad7d..c8a6ef74ab 100644
--- a/components/nifosg/controller.cpp
+++ b/components/nifosg/controller.cpp
@@ -72,6 +72,7 @@ KeyframeController::KeyframeController()
 
 KeyframeController::KeyframeController(const KeyframeController &copy, const osg::CopyOp &copyop)
     : SceneUtil::KeyframeController(copy, copyop)
+    , SceneUtil::NodeCallback<KeyframeController>(copy, copyop)
     , mRotations(copy.mRotations)
     , mXRotations(copy.mXRotations)
     , mYRotations(copy.mYRotations)
diff --git a/components/nifosg/controller.hpp b/components/nifosg/controller.hpp
index b459166931..078b7e14ce 100644
--- a/components/nifosg/controller.hpp
+++ b/components/nifosg/controller.hpp
@@ -7,6 +7,7 @@
 #include <components/nif/data.hpp>
 
 #include <components/sceneutil/keyframe.hpp>
+#include <components/sceneutil/nodecallback.hpp>
 #include <components/sceneutil/statesetupdater.hpp>
 
 #include <set>
@@ -223,7 +224,7 @@ namespace NifOsg
         std::vector<FloatInterpolator> mKeyFrames;
     };
 
-    class KeyframeController : public SceneUtil::KeyframeController
+    class KeyframeController : public SceneUtil::KeyframeController, public SceneUtil::NodeCallback<KeyframeController>
     {
     public:
         // This is used if there's no interpolator but there is data (Morrowind meshes).
@@ -241,7 +242,7 @@ namespace NifOsg
 
         osg::Vec3f getTranslation(float time) const override;
 
-        void operator() (osg::Node*, osg::NodeVisitor*) override;
+        void operator() (osg::Node*, osg::NodeVisitor*);
 
     private:
         QuaternionInterpolator mRotations;
diff --git a/components/sceneutil/keyframe.hpp b/components/sceneutil/keyframe.hpp
index e09541cb9a..5be6924a09 100644
--- a/components/sceneutil/keyframe.hpp
+++ b/components/sceneutil/keyframe.hpp
@@ -3,7 +3,7 @@
 
 #include <map>
 
-#include <osg/Node>
+#include <osg/Callback>
 
 #include <components/sceneutil/controller.hpp>
 #include <components/sceneutil/textkeymap.hpp>
@@ -11,20 +11,18 @@
 
 namespace SceneUtil
 {
-    class KeyframeController : public osg::NodeCallback, public SceneUtil::Controller
+    class KeyframeController : public SceneUtil::Controller, public virtual osg::Callback
     {
     public:
         KeyframeController() {}
 
         KeyframeController(const KeyframeController& copy, const osg::CopyOp& copyop)
-            : osg::NodeCallback(copy, copyop)
+            : osg::Callback(copy, copyop)
             , SceneUtil::Controller(copy)
         {}
         META_Object(SceneUtil, KeyframeController)
 
         virtual osg::Vec3f getTranslation(float time) const  { return osg::Vec3f(); }
-
-        virtual void operator() (osg::Node* node, osg::NodeVisitor* nodeVisitor) override { traverse(node, nodeVisitor); }
     };
 
     /// Wrapper object containing an animation track as a ref-countable osg::Object.
diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index ba60cb3185..09fa302457 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -605,19 +605,19 @@ namespace SceneUtil
 
     // Set on a LightSource. Adds the light source to its light manager for the current frame.
     // This allows us to keep track of the current lights in the scene graph without tying creation & destruction to the manager.
-    class CollectLightCallback : public osg::NodeCallback
+    class CollectLightCallback : public SceneUtil::NodeCallback<CollectLightCallback>
     {
     public:
         CollectLightCallback()
             : mLightManager(nullptr) { }
 
         CollectLightCallback(const CollectLightCallback& copy, const osg::CopyOp& copyop)
-            : osg::NodeCallback(copy, copyop)
+            : SceneUtil::NodeCallback<CollectLightCallback>(copy, copyop)
             , mLightManager(nullptr) { }
 
         META_Object(SceneUtil, SceneUtil::CollectLightCallback)
 
-        void operator()(osg::Node* node, osg::NodeVisitor* nv) override
+        void operator()(osg::Node* node, osg::NodeVisitor* nv)
         {
             if (!mLightManager)
             {
@@ -637,19 +637,11 @@ namespace SceneUtil
     };
 
     // Set on a LightManager. Clears the data from the previous frame.
-    class LightManagerUpdateCallback : public osg::NodeCallback
+    class LightManagerUpdateCallback : public SceneUtil::NodeCallback<LightManagerUpdateCallback>
     {
     public:
-        LightManagerUpdateCallback()
-            { }
-
-        LightManagerUpdateCallback(const LightManagerUpdateCallback& copy, const osg::CopyOp& copyop)
-            : osg::NodeCallback(copy, copyop)
-            { }
-
-        META_Object(SceneUtil, LightManagerUpdateCallback)
 
-        void operator()(osg::Node* node, osg::NodeVisitor* nv) override
+        void operator()(osg::Node* node, osg::NodeVisitor* nv)
         {
             LightManager* lightManager = static_cast<LightManager*>(node);
             lightManager->update(nv->getTraversalNumber());
@@ -1285,12 +1277,10 @@ namespace SceneUtil
             mLight[i] = new osg::Light(*copy.mLight[i].get(), copyop);
     }
 
-    void LightListCallback::operator()(osg::Node *node, osg::NodeVisitor *nv)
+    void LightListCallback::operator()(osg::Node *node, osgUtil::CullVisitor *cv)
     {
-        osgUtil::CullVisitor* cv = static_cast<osgUtil::CullVisitor*>(nv);
-
         bool pushedState = pushLightState(node, cv);
-        traverse(node, nv);
+        traverse(node, cv);
         if (pushedState)
             cv->popStateSet();
     }
diff --git a/components/sceneutil/lightmanager.hpp b/components/sceneutil/lightmanager.hpp
index 6dbe7a3f75..4048bf9b09 100644
--- a/components/sceneutil/lightmanager.hpp
+++ b/components/sceneutil/lightmanager.hpp
@@ -16,6 +16,7 @@
 #include <components/shader/shadermanager.hpp>
 
 #include <components/settings/settings.hpp>
+#include <components/sceneutil/nodecallback.hpp>
 
 namespace osgUtil
 {
@@ -254,7 +255,7 @@ namespace SceneUtil
     /// starting point is to attach a LightListCallback to each game object's base node.
     /// @note Not thread safe for CullThreadPerCamera threading mode.
     /// @note Due to lack of OSG support, the callback does not work on Drawables.
-    class LightListCallback : public osg::NodeCallback
+    class LightListCallback : public SceneUtil::NodeCallback<LightListCallback, osg::Node*, osgUtil::CullVisitor*>
     {
     public:
         LightListCallback()
@@ -262,7 +263,7 @@ namespace SceneUtil
             , mLastFrameNumber(0)
         {}
         LightListCallback(const LightListCallback& copy, const osg::CopyOp& copyop)
-            : osg::Object(copy, copyop), osg::NodeCallback(copy, copyop)
+            : osg::Object(copy, copyop), SceneUtil::NodeCallback<LightListCallback, osg::Node*, osgUtil::CullVisitor*>(copy, copyop)
             , mLightManager(copy.mLightManager)
             , mLastFrameNumber(0)
             , mIgnoredLightSources(copy.mIgnoredLightSources)
@@ -270,7 +271,7 @@ namespace SceneUtil
 
         META_Object(SceneUtil, LightListCallback)
 
-        void operator()(osg::Node* node, osg::NodeVisitor* nv) override;
+        void operator()(osg::Node* node, osgUtil::CullVisitor* nv);
 
         bool pushLightState(osg::Node* node, osgUtil::CullVisitor* nv);
 
diff --git a/components/sceneutil/nodecallback.hpp b/components/sceneutil/nodecallback.hpp
new file mode 100644
index 0000000000..6f0140d64c
--- /dev/null
+++ b/components/sceneutil/nodecallback.hpp
@@ -0,0 +1,41 @@
+#ifndef SCENEUTIL_NODECALLBACK_H
+#define SCENEUTIL_NODECALLBACK_H
+
+#include <osg/Callback>
+
+namespace osg
+{
+    class Node;
+    class NodeVisitor;
+}
+
+namespace SceneUtil
+{
+
+template <class Derived, typename NodeType=osg::Node*, typename VisitorType=osg::NodeVisitor*>
+class NodeCallback : public virtual osg::Callback
+{
+public:
+    NodeCallback(){}
+    NodeCallback(const NodeCallback& nc,const osg::CopyOp& copyop):
+            osg::Callback(nc, copyop) {}
+    META_Object(SceneUtil, NodeCallback)
+
+    bool run(osg::Object* object, osg::Object* data) override
+    {
+        static_cast<Derived*>(this)->operator()((NodeType)object, (VisitorType)data->asNodeVisitor());
+        return true;
+    }
+
+    template <typename VT>
+    void traverse(NodeType object, VT data)
+    {
+        if (_nestedCallback.valid())
+            _nestedCallback->run(object, data);
+        else
+            data->traverse(*object);
+    }
+};
+
+}
+#endif
diff --git a/components/sceneutil/osgacontroller.cpp b/components/sceneutil/osgacontroller.cpp
index 02c9558ab3..b986c92884 100644
--- a/components/sceneutil/osgacontroller.cpp
+++ b/components/sceneutil/osgacontroller.cpp
@@ -102,7 +102,7 @@ namespace SceneUtil
         apply(static_cast<osg::Node&>(node));
     }
 
-    OsgAnimationController::OsgAnimationController(const OsgAnimationController &copy, const osg::CopyOp &copyop) : SceneUtil::KeyframeController(copy, copyop)
+    OsgAnimationController::OsgAnimationController(const OsgAnimationController &copy, const osg::CopyOp &copyop) : SceneUtil::KeyframeController(copy, copyop), SceneUtil::NodeCallback<OsgAnimationController>(copy, copyop)
     , mEmulatedAnimations(copy.mEmulatedAnimations)
     {
         mLinker = nullptr;
diff --git a/components/sceneutil/osgacontroller.hpp b/components/sceneutil/osgacontroller.hpp
index 46538fa813..427a79ca97 100644
--- a/components/sceneutil/osgacontroller.hpp
+++ b/components/sceneutil/osgacontroller.hpp
@@ -13,6 +13,7 @@
 #include <osgAnimation/UpdateMatrixTransform>
 
 #include <components/sceneutil/controller.hpp>
+#include <components/sceneutil/nodecallback.hpp>
 #include <components/sceneutil/keyframe.hpp>
 #include <components/resource/animation.hpp>
 
@@ -44,7 +45,7 @@ namespace SceneUtil
             Resource::Animation* mAnimation;
     };
 
-    class OsgAnimationController : public SceneUtil::KeyframeController
+    class OsgAnimationController : public SceneUtil::KeyframeController, public SceneUtil::NodeCallback<OsgAnimationController>
     {
     public:
         /// @brief Handles the animation for osgAnimation formats
@@ -61,7 +62,7 @@ namespace SceneUtil
         void update(float time, const std::string& animationName);
 
         /// @brief Called every frame for osgAnimation
-        void operator() (osg::Node*, osg::NodeVisitor*) override;
+        void operator() (osg::Node*, osg::NodeVisitor*);
 
         /// @brief Sets details of the animations
         void setEmulatedAnimations(const std::vector<EmulatedAnimation>& emulatedAnimations);

From 61168c3583870cc0fc6c8d91a9839e3b9489c086 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 4 Oct 2021 13:12:54 +0400
Subject: [PATCH 1407/2859] Add missing changelog entries for 0.47 (#3145)

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b7ef5b62a..cfa8c2e79f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -209,6 +209,7 @@
     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
@@ -238,6 +239,7 @@
     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
@@ -252,6 +254,7 @@
     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

From e4a9eefc2aceb75d491f98e9b36985f70f93e7ee Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Mon, 4 Oct 2021 10:12:00 +0000
Subject: [PATCH 1408/2859] uses a bitfield in refdata.hpp (#3143)

* uses a bitfield in refdata.hpp

With this simple change we pack boolean values to reduce the memory requirements of game objects.

* refdata.hpp [ci skip]

* refdata.cpp
---
 apps/openmw/mwworld/refdata.cpp |  8 ++++----
 apps/openmw/mwworld/refdata.hpp | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwworld/refdata.cpp b/apps/openmw/mwworld/refdata.cpp
index 7398aef77e..f4c4beb7e8 100644
--- a/apps/openmw/mwworld/refdata.cpp
+++ b/apps/openmw/mwworld/refdata.cpp
@@ -65,21 +65,21 @@ namespace MWWorld
     }
 
     RefData::RefData (const ESM::CellRef& cellRef)
-    : mBaseNode(nullptr), mDeletedByContentFile(false), mEnabled (true),
+    : mBaseNode(nullptr), mDeletedByContentFile(false), mEnabled (true), mPhysicsPostponed(false), 
       mCount (1), mPosition (cellRef.mPos),
       mCustomData (nullptr),
-      mChanged(false), mFlags(0), mPhysicsPostponed(false) // Loading from ESM/ESP files -> assume unchanged
+      mChanged(false), mFlags(0) // Loading from ESM/ESP files -> assume unchanged
     {
     }
 
     RefData::RefData (const ESM::ObjectState& objectState, bool deletedByContentFile)
     : mBaseNode(nullptr), mDeletedByContentFile(deletedByContentFile),
-      mEnabled (objectState.mEnabled != 0),
+      mEnabled (objectState.mEnabled != 0), mPhysicsPostponed(false),
       mCount (objectState.mCount),
       mPosition (objectState.mPosition),
       mAnimationState(objectState.mAnimationState),
       mCustomData (nullptr),
-      mChanged(true), mFlags(objectState.mFlags), mPhysicsPostponed(false) // Loading from a savegame -> assume changed
+      mChanged(true), mFlags(objectState.mFlags) // Loading from a savegame -> assume changed
     {
         // "Note that the ActivationFlag_UseEnabled is saved to the reference,
         // which will result in permanently suppressed activation if the reference script is removed.
diff --git a/apps/openmw/mwworld/refdata.hpp b/apps/openmw/mwworld/refdata.hpp
index d90224b9bb..c98eb0f2af 100644
--- a/apps/openmw/mwworld/refdata.hpp
+++ b/apps/openmw/mwworld/refdata.hpp
@@ -41,9 +41,12 @@ namespace MWWorld
 
             /// separate delete flag used for deletion by a content file
             /// @note not stored in the save game file.
-            bool mDeletedByContentFile;
+            bool mDeletedByContentFile:1;
 
-            bool mEnabled;
+            bool mEnabled:1;
+        public:
+            bool mPhysicsPostponed:1;
+        private:
 
             /// 0: deleted
             int mCount;
@@ -63,9 +66,6 @@ namespace MWWorld
             unsigned int mFlags;
 
         public:
-
-            bool mPhysicsPostponed;
-
             RefData();
 
             /// @param cellRef Used to copy constant data such as position into this class where it can

From 14d15dcfac77647450e30561153cce3c2aac1f74 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Mon, 4 Oct 2021 10:20:33 +0000
Subject: [PATCH 1409/2859] cleans up osgacontroller.cpp (#3142)

`handle_stateset` is not needed because `UpdateMatrixTransform` is a `NodeCallback` only allowed to be set on a `Node`. `Geode` and `Drawable` do not need explicit logic because they are both derived from `Node`.
---
 components/sceneutil/osgacontroller.cpp | 38 ++-----------------------
 components/sceneutil/osgacontroller.hpp | 10 -------
 2 files changed, 2 insertions(+), 46 deletions(-)

diff --git a/components/sceneutil/osgacontroller.cpp b/components/sceneutil/osgacontroller.cpp
index b986c92884..520b2d177b 100644
--- a/components/sceneutil/osgacontroller.cpp
+++ b/components/sceneutil/osgacontroller.cpp
@@ -1,19 +1,12 @@
 #include <components/sceneutil/osgacontroller.hpp>
 
-#include <osg/Geode>
 #include <osg/Node>
 #include <osg/NodeVisitor>
 #include <osg/ref_ptr>
-#include <osg/StateSet>
 
 #include <osgAnimation/Animation>
-#include <osgAnimation/AnimationUpdateCallback>
 #include <osgAnimation/Channel>
-#include <osgAnimation/BasicAnimationManager>
-#include <osgAnimation/Bone>
 #include <osgAnimation/Sampler>
-#include <osgAnimation/Skeleton>
-#include <osgAnimation/RigGeometry>
 #include <osgAnimation/UpdateMatrixTransform>
 
 #include <components/debug/debuglog.hpp>
@@ -55,19 +48,6 @@ namespace SceneUtil
         }
     }
 
-    void LinkVisitor::handle_stateset(osg::StateSet* stateset)
-    {
-        if (!stateset)
-            return;
-        const osg::StateSet::AttributeList& attributeList = stateset->getAttributeList();
-        for (auto attribute : attributeList)
-        {
-            osg::StateAttribute* sattr = attribute.second.first.get();
-            osgAnimation::UpdateMatrixTransform* umt = dynamic_cast<osgAnimation::UpdateMatrixTransform*>(sattr->getUpdateCallback()); //Can this even be in sa?
-            if (umt) link(umt);
-        }
-    }
-
     void LinkVisitor::setAnimation(Resource::Animation* animation)
     {
         mAnimation = animation;
@@ -75,10 +55,6 @@ namespace SceneUtil
 
     void LinkVisitor::apply(osg::Node& node)
     {
-        osg::StateSet* st = node.getStateSet();
-        if (st)
-        handle_stateset(st);
-
         osg::Callback* cb = node.getUpdateCallback();
         while (cb)
         {
@@ -88,18 +64,8 @@ namespace SceneUtil
             cb = cb->getNestedCallback();
         }
 
-        traverse( node );
-    }
-
-    void LinkVisitor::apply(osg::Geode& node)
-    {
-        for (unsigned int i = 0; i < node.getNumDrawables(); i++)
-        {
-            osg::Drawable* drawable = node.getDrawable(i);
-            if (drawable && drawable->getStateSet())
-                handle_stateset(drawable->getStateSet());
-        }
-        apply(static_cast<osg::Node&>(node));
+        if (node.getNumChildrenRequiringUpdateTraversal())
+            traverse( node );
     }
 
     OsgAnimationController::OsgAnimationController(const OsgAnimationController &copy, const osg::CopyOp &copyop) : SceneUtil::KeyframeController(copy, copyop), SceneUtil::NodeCallback<OsgAnimationController>(copy, copyop)
diff --git a/components/sceneutil/osgacontroller.hpp b/components/sceneutil/osgacontroller.hpp
index 427a79ca97..26212a3b99 100644
--- a/components/sceneutil/osgacontroller.hpp
+++ b/components/sceneutil/osgacontroller.hpp
@@ -3,13 +3,7 @@
 
 #include <osg/Node>
 #include <osg/NodeVisitor>
-#include <osg/StateSet>
 #include <osg/ref_ptr>
-#include <osgAnimation/Animation>
-#include <osgAnimation/AnimationUpdateCallback>
-#include <osgAnimation/Channel>
-#include <osgAnimation/BasicAnimationManager>
-#include <osgAnimation/StackedTransform>
 #include <osgAnimation/UpdateMatrixTransform>
 
 #include <components/sceneutil/controller.hpp>
@@ -33,14 +27,10 @@ namespace SceneUtil
 
             virtual void link(osgAnimation::UpdateMatrixTransform* umt);
 
-            virtual void handle_stateset(osg::StateSet* stateset);
-
             virtual void setAnimation(Resource::Animation* animation);
 
             virtual void apply(osg::Node& node) override;
 
-            virtual void apply(osg::Geode& node) override;
-
         protected:
             Resource::Animation* mAnimation;
     };

From 3f731cd102cefe246ad897bc9c5ec8c2d720c6e5 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Mon, 4 Oct 2021 20:00:31 +0000
Subject: [PATCH 1410/2859] attempts to fix spellcasting freezes (#3146)

Firstly, this PR reintroduces commit "Recreate a special case for IntersectionVisitor on QuadTreeWorld" we forgot to reapply while reverting a revert commit. Secondly, in cases we still need to build a view for an intersection visitor, we now use the available `osgUtil::IntersectionVisitor::getReferenceEyePoint` instead of falling back to the origin position that was previously causing long rebuild times.
---
 components/terrain/quadtreeworld.cpp | 6 +++---
 components/terrain/viewdata.cpp      | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/terrain/quadtreeworld.cpp b/components/terrain/quadtreeworld.cpp
index 4baf08149d..7e5cd001ba 100644
--- a/components/terrain/quadtreeworld.cpp
+++ b/components/terrain/quadtreeworld.cpp
@@ -456,13 +456,13 @@ void QuadTreeWorld::accept(osg::NodeVisitor &nv)
 
     osg::Object * viewer = isCullVisitor ? static_cast<osgUtil::CullVisitor*>(&nv)->getCurrentCamera() : nullptr;
     bool needsUpdate = true;
-    ViewData *vd = mViewDataMap->getViewData(viewer, nv.getViewPoint(), mActiveGrid, needsUpdate);
-
+    osg::Vec3f viewPoint = viewer ? nv.getViewPoint() : nv.getEyePoint();
+    ViewData *vd = mViewDataMap->getViewData(viewer, viewPoint, mActiveGrid, needsUpdate);
     if (needsUpdate)
     {
         vd->reset();
         DefaultLodCallback lodCallback(mLodFactor, mMinSize, mViewDistance, mActiveGrid);
-        mRootNode->traverseNodes(vd, nv.getViewPoint(), &lodCallback);
+        mRootNode->traverseNodes(vd, viewPoint, &lodCallback);
     }
 
     const float cellWorldSize = mStorage->getCellWorldSize();
diff --git a/components/terrain/viewdata.cpp b/components/terrain/viewdata.cpp
index c5070fdf0d..3ebc99f1df 100644
--- a/components/terrain/viewdata.cpp
+++ b/components/terrain/viewdata.cpp
@@ -143,7 +143,7 @@ ViewData *ViewDataMap::getViewData(osg::Object *viewer, const osg::Vec3f& viewPo
 
     if (!(vd->suitableToUse(activeGrid) && (vd->getViewPoint()-viewPoint).length2() < mReuseDistance*mReuseDistance && vd->getWorldUpdateRevision() >= mWorldUpdateRevision))
     {
-        float shortestDist = mReuseDistance*mReuseDistance;
+        float shortestDist = viewer ? mReuseDistance*mReuseDistance : std::numeric_limits<float>::max();
         const ViewData* mostSuitableView = nullptr;
         for (const ViewData* other : mUsedViews)
         {
@@ -157,12 +157,12 @@ ViewData *ViewDataMap::getViewData(osg::Object *viewer, const osg::Vec3f& viewPo
                 }
             }
         }
-        if (mostSuitableView)
+        if (mostSuitableView && mostSuitableView != vd)
         {
             vd->copyFrom(*mostSuitableView);
             return vd;
         }
-        else
+        else if (!mostSuitableView)
         {
             vd->setViewPoint(viewPoint);
             vd->setActiveGrid(activeGrid);

From f28d6738bf5c946e8b3789342d0922f39458f537 Mon Sep 17 00:00:00 2001
From: Kindi <2538602-Kuyondo@users.noreply.gitlab.com>
Date: Mon, 4 Oct 2021 20:44:56 +0000
Subject: [PATCH 1411/2859] Update tradewindow.cpp

---
 apps/openmw/mwgui/tradewindow.cpp | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/apps/openmw/mwgui/tradewindow.cpp b/apps/openmw/mwgui/tradewindow.cpp
index 35466059a2..48457ee6d9 100644
--- a/apps/openmw/mwgui/tradewindow.cpp
+++ b/apps/openmw/mwgui/tradewindow.cpp
@@ -52,7 +52,6 @@ namespace MWGui
         , mItemToSell(-1)
         , mCurrentBalance(0)
         , mCurrentMerchantOffer(0)
-        , mReceiveMoney(false)
     {
         getWidget(mFilterAll, "AllButton");
         getWidget(mFilterWeapon, "WeaponButton");
@@ -412,7 +411,7 @@ namespace MWGui
         mCurrentBalance = (mCurrentBalance >= 0 ? 1 : -1) * value;
         updateLabels();
 
-        if (mReceiveMoney && mCurrentBalance == 0)
+        if (mCurrentBalance == 0)
             mCurrentBalance = previousBalance;
 
         if (value != std::abs(value))
@@ -424,6 +423,7 @@ namespace MWGui
         // prevent overflows, and prevent entering INT_MIN since abs(INT_MIN) is undefined
         if (mCurrentBalance == std::numeric_limits<int>::max() || mCurrentBalance == std::numeric_limits<int>::min()+1)
             return;
+        if (mTotalBalance->getValue() == 0) mCurrentBalance = 0;
         if (mCurrentBalance < 0) mCurrentBalance -= 1;
         else mCurrentBalance += 1;
         updateLabels();
@@ -431,6 +431,7 @@ namespace MWGui
 
     void TradeWindow::onDecreaseButtonTriggered()
     {
+        if (mTotalBalance->getValue() == 0) mCurrentBalance = 0;
         if (mCurrentBalance < 0) mCurrentBalance += 1;
         else mCurrentBalance -= 1;
         updateLabels();
@@ -450,16 +451,8 @@ namespace MWGui
         {
             mCurrentBalance = 0;
         }
-        else if (playerBorrowed.empty())
-        {
-            mReceiveMoney = false;
-        }
-        else if (merchantBorrowed.empty())
-        {
-            mReceiveMoney = true;
-        }
 
-        if (mCurrentBalance < 0 || mReceiveMoney)
+        if (mCurrentBalance < 0)
         {
             mTotalBalanceLabel->setCaptionWithReplacing("#{sTotalCost}");
         }

From d9b254178f6ee2da388d95bb6ab1d04b3c73bc07 Mon Sep 17 00:00:00 2001
From: Kindi <2538602-Kuyondo@users.noreply.gitlab.com>
Date: Mon, 4 Oct 2021 20:47:45 +0000
Subject: [PATCH 1412/2859] Update tradewindow.hpp remover redundant

---
 apps/openmw/mwgui/tradewindow.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/openmw/mwgui/tradewindow.hpp b/apps/openmw/mwgui/tradewindow.hpp
index e39d1ebd8e..5ace09e8e2 100644
--- a/apps/openmw/mwgui/tradewindow.hpp
+++ b/apps/openmw/mwgui/tradewindow.hpp
@@ -81,7 +81,6 @@ namespace MWGui
 
             int mCurrentBalance;
             int mCurrentMerchantOffer;
-            bool mReceiveMoney;
 
             void sellToNpc(const MWWorld::Ptr& item, int count, bool boughtItem); ///< only used for adjusting the gold balance
             void buyFromNpc(const MWWorld::Ptr& item, int count, bool soldItem); ///< only used for adjusting the gold balance

From 2a1cb939baadc0a0ad3c015a202099055ff83f16 Mon Sep 17 00:00:00 2001
From: Kindi <2538602-Kuyondo@users.noreply.gitlab.com>
Date: Mon, 4 Oct 2021 20:50:40 +0000
Subject: [PATCH 1413/2859] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b7ef5b62a..44b7634ebb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,12 +46,14 @@
     Bug #6184: Command and Calm and Demoralize and Frenzy and Rally magic effects inconsistencies with vanilla
     Bug #6197: Infinite Casting Loop
     Bug #6223: Some Constant Effect Bound Items inconsistencies
+    Bug #6258: Barter menu glitches out when modifying prices
     Bug #6273: Respawning NPCs rotation is inconsistent
     Bug #6282: Laura craft doesn't follow the player character
     Bug #6283: Avis Dorsey follows you after her death
     Bug #6289: Keyword search in dialogues expected the text to be all ASCII characters
     Bug #6302: Teleporting disabled actor breaks its disabled state
     Bug #6307: Pathfinding in Infidelities quest from Tribunal addon is broken
+    Bug #6322: Total sold/cost should reset to 0 when there are no items offered
     Feature #890: OpenMW-CS: Column filtering
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
     Feature #2780: A way to see current OpenMW version in the console

From 4ce8c1e1ab4797126cf1ac59e9df9ce51ac50152 Mon Sep 17 00:00:00 2001
From: Kindi <2538602-Kuyondo@users.noreply.gitlab.com>
Date: Mon, 4 Oct 2021 20:54:28 +0000
Subject: [PATCH 1414/2859] Update AUTHORS.md

---
 AUTHORS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS.md b/AUTHORS.md
index 2080f12a99..8ca9db90b9 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -177,6 +177,7 @@ Programmers
     PlutonicOverkill
     Radu-Marius Popovici (rpopovici)
     Rafael Moura (dhustkoder)
+    Randy Davin (Kindi)
     rdimesio
     rexelion
     riothamus

From 8e9851c97c43596b269fbb9d739ff28999b06729 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Tue, 5 Oct 2021 11:52:19 +0000
Subject: [PATCH 1415/2859] npcanimation.cpp (#3148)

---
 apps/openmw/mwrender/npcanimation.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index bcb2d36f5d..f430432659 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -403,7 +403,7 @@ public:
     {
         osgUtil::CullVisitor* cv = static_cast<osgUtil::CullVisitor*>(nv);
         float fov, aspect, zNear, zFar;
-        if (cv->getProjectionMatrix()->getPerspective(fov, aspect, zNear, zFar))
+        if (cv->getProjectionMatrix()->getPerspective(fov, aspect, zNear, zFar) && std::abs(fov-mFov) > 0.001)
         {
             fov = mFov;
             osg::ref_ptr<osg::RefMatrix> newProjectionMatrix = new osg::RefMatrix();

From 9f58616aa032a716013d543788ba26b0727c7209 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Tue, 5 Oct 2021 12:02:49 +0000
Subject: [PATCH 1416/2859] fixes -Wreorder warning

---
 apps/openmw/mwworld/refdata.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/refdata.cpp b/apps/openmw/mwworld/refdata.cpp
index f4c4beb7e8..e8c5ba35e4 100644
--- a/apps/openmw/mwworld/refdata.cpp
+++ b/apps/openmw/mwworld/refdata.cpp
@@ -55,7 +55,7 @@ namespace MWWorld
     }
 
     RefData::RefData()
-    : mBaseNode(nullptr), mDeletedByContentFile(false), mEnabled (true), mCount (1), mCustomData (nullptr), mChanged(false), mFlags(0), mPhysicsPostponed(false)
+    : mBaseNode(nullptr), mDeletedByContentFile(false), mEnabled (true), mPhysicsPostponed(false), mCount (1), mCustomData (nullptr), mChanged(false), mFlags(0)
     {
         for (int i=0; i<3; ++i)
         {

From b2af81bc18bc66f00551731d59a2699ebacc3a4e Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Tue, 5 Oct 2021 12:21:12 +0000
Subject: [PATCH 1417/2859] converts remaining osg::NodeCallback (#3147)

With this PR we convert remaining instantiations of the deprecated osg::NodeCallback in Open MW to SceneUtil::NodeCallback.
---
 apps/openmw/mwrender/animation.cpp            | 16 +++---
 apps/openmw/mwrender/animation.hpp            |  5 +-
 apps/openmw/mwrender/camera.cpp               |  9 ++-
 apps/openmw/mwrender/camera.hpp               |  4 +-
 apps/openmw/mwrender/characterpreview.cpp     | 13 ++---
 apps/openmw/mwrender/globalmap.cpp            |  9 +--
 apps/openmw/mwrender/localmap.cpp             |  8 +--
 apps/openmw/mwrender/npcanimation.cpp         | 40 +-------------
 apps/openmw/mwrender/npcanimation.hpp         |  4 +-
 apps/openmw/mwrender/postprocessor.cpp        | 12 ++--
 apps/openmw/mwrender/rotatecontroller.cpp     | 16 ++++--
 apps/openmw/mwrender/rotatecontroller.hpp     | 15 +++--
 apps/openmw/mwrender/sky.cpp                  | 31 +++++------
 apps/openmw/mwrender/water.cpp                | 37 +++++--------
 apps/openmw/mwrender/water.hpp                |  5 +-
 apps/openmw/mwworld/projectilemanager.cpp     |  9 ++-
 .../myguiplatform/myguirendermanager.cpp      | 16 ++----
 components/nifosg/controller.cpp              | 55 +++++++++----------
 components/nifosg/controller.hpp              | 43 +++++++++------
 components/nifosg/nifloader.cpp               | 11 ++--
 components/nifosg/particle.cpp                |  6 +-
 components/nifosg/particle.hpp                | 10 ++--
 components/resource/keyframemanager.cpp       |  1 +
 components/resource/scenemanager.cpp          | 10 ++--
 components/sceneutil/lightcontroller.cpp      |  7 +--
 components/sceneutil/lightcontroller.hpp      |  9 +--
 components/sceneutil/lightmanager.cpp         | 27 ++++-----
 components/sceneutil/rtt.cpp                  | 14 ++---
 components/sceneutil/statesetupdater.cpp      |  2 +-
 components/sceneutil/statesetupdater.hpp      |  6 +-
 components/sceneutil/util.cpp                 | 10 ++--
 components/sceneutil/util.hpp                 |  1 -
 components/terrain/world.hpp                  |  7 ++-
 33 files changed, 206 insertions(+), 262 deletions(-)

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 1dc42db47c..475c656cc9 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -87,22 +87,22 @@ namespace
         std::vector<osg::ref_ptr<osg::Node> > mToRemove;
     };
 
-    class DayNightCallback : public osg::NodeCallback
+    class DayNightCallback : public SceneUtil::NodeCallback<DayNightCallback, osg::Switch*>
     {
     public:
         DayNightCallback() : mCurrentState(0)
         {
         }
 
-        void operator()(osg::Node* node, osg::NodeVisitor* nv) override
+        void operator()(osg::Switch* node, osg::NodeVisitor* nv)
         {
             unsigned int state = MWBase::Environment::get().getWorld()->getNightDayMode();
-            const unsigned int newState = node->asGroup()->getNumChildren() > state ? state : 0;
+            const unsigned int newState = node->getNumChildren() > state ? state : 0;
 
             if (newState != mCurrentState)
             {
                 mCurrentState = newState;
-                node->asSwitch()->setSingleChildOn(mCurrentState);
+                node->setSingleChildOn(mCurrentState);
             }
 
             traverse(node, nv);
@@ -472,20 +472,18 @@ namespace MWRender
         }
     }
 
-    class ResetAccumRootCallback : public osg::NodeCallback
+    class ResetAccumRootCallback : public SceneUtil::NodeCallback<ResetAccumRootCallback, osg::MatrixTransform*>
     {
     public:
-        void operator()(osg::Node* node, osg::NodeVisitor* nv) override
+        void operator()(osg::MatrixTransform* transform, osg::NodeVisitor* nv)
         {
-            osg::MatrixTransform* transform = static_cast<osg::MatrixTransform*>(node);
-
             osg::Matrix mat = transform->getMatrix();
             osg::Vec3f position = mat.getTrans();
             position = osg::componentMultiply(mResetAxes, position);
             mat.setTrans(position);
             transform->setMatrix(mat);
 
-            traverse(node, nv);
+            traverse(transform, nv);
         }
 
         void setAccumulate(const osg::Vec3f& accumulate)
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index c2f0f351f3..84788c1e2d 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -6,6 +6,7 @@
 #include <components/sceneutil/controller.hpp>
 #include <components/sceneutil/textkeymap.hpp>
 #include <components/sceneutil/util.hpp>
+#include <components/sceneutil/nodecallback.hpp>
 
 #include <vector>
 
@@ -506,7 +507,7 @@ public:
     bool canBeHarvested() const override;
 };
 
-class UpdateVfxCallback : public osg::NodeCallback
+class UpdateVfxCallback : public SceneUtil::NodeCallback<UpdateVfxCallback>
 {
 public:
     UpdateVfxCallback(EffectParams& params)
@@ -519,7 +520,7 @@ public:
     bool mFinished;
     EffectParams mParams;
 
-    void operator()(osg::Node* node, osg::NodeVisitor* nv) override;
+    void operator()(osg::Node* node, osg::NodeVisitor* nv);
 
 private:
     double mStartingTime;
diff --git a/apps/openmw/mwrender/camera.cpp b/apps/openmw/mwrender/camera.cpp
index edb017c2a2..e750fcad46 100644
--- a/apps/openmw/mwrender/camera.cpp
+++ b/apps/openmw/mwrender/camera.cpp
@@ -5,6 +5,7 @@
 #include <components/misc/mathutil.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/settings/settings.hpp>
+#include <components/sceneutil/nodecallback.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
@@ -25,7 +26,7 @@
 namespace
 {
 
-class UpdateRenderCameraCallback : public osg::NodeCallback
+class UpdateRenderCameraCallback : public SceneUtil::NodeCallback<UpdateRenderCameraCallback, osg::Camera*>
 {
 public:
     UpdateRenderCameraCallback(MWRender::Camera* cam)
@@ -33,12 +34,10 @@ public:
     {
     }
 
-    void operator()(osg::Node* node, osg::NodeVisitor* nv) override
+    void operator()(osg::Camera* cam, osg::NodeVisitor* nv)
     {
-        osg::Camera* cam = static_cast<osg::Camera*>(node);
-
         // traverse first to update animations, in case the camera is attached to an animated node
-        traverse(node, nv);
+        traverse(cam, nv);
 
         mCamera->updateCamera(cam);
     }
diff --git a/apps/openmw/mwrender/camera.hpp b/apps/openmw/mwrender/camera.hpp
index 9e2b608dfd..1a5477e89c 100644
--- a/apps/openmw/mwrender/camera.hpp
+++ b/apps/openmw/mwrender/camera.hpp
@@ -12,7 +12,7 @@
 namespace osg
 {
     class Camera;
-    class NodeCallback;
+    class Callback;
     class Node;
 }
 
@@ -82,7 +82,7 @@ namespace MWRender
         void updatePosition();
         float getCameraDistanceCorrection() const;
 
-        osg::ref_ptr<osg::NodeCallback> mUpdateCallback;
+        osg::ref_ptr<osg::Callback> mUpdateCallback;
 
         // Used to rotate player to the direction of view after exiting preview or vanity mode.
         osg::Vec3f mDeferredRotation;
diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index 44b7b2f457..51e5a536f7 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -22,6 +22,7 @@
 #include <components/sceneutil/lightmanager.hpp>
 #include <components/sceneutil/shadow.hpp>
 #include <components/settings/settings.hpp>
+#include <components/sceneutil/nodecallback.hpp>
 
 #include "../mwbase/world.hpp"
 #include "../mwworld/class.hpp"
@@ -36,7 +37,7 @@
 namespace MWRender
 {
 
-    class DrawOnceCallback : public osg::NodeCallback
+    class DrawOnceCallback : public SceneUtil::NodeCallback<DrawOnceCallback>
     {
     public:
         DrawOnceCallback ()
@@ -45,7 +46,7 @@ namespace MWRender
         {
         }
 
-        void operator () (osg::Node* node, osg::NodeVisitor* nv) override
+        void operator () (osg::Node* node, osg::NodeVisitor* nv)
         {
             if (!mRendered)
             {
@@ -523,7 +524,7 @@ namespace MWRender
         rebuild();
     }
 
-    class UpdateCameraCallback : public osg::NodeCallback
+    class UpdateCameraCallback : public SceneUtil::NodeCallback<UpdateCameraCallback, osg::Camera*>
     {
     public:
         UpdateCameraCallback(osg::ref_ptr<const osg::Node> nodeToFollow, const osg::Vec3& posOffset, const osg::Vec3& lookAtOffset)
@@ -533,12 +534,10 @@ namespace MWRender
         {
         }
 
-        void operator()(osg::Node* node, osg::NodeVisitor* nv) override
+        void operator()(osg::Camera* cam, osg::NodeVisitor* nv)
         {
-            osg::Camera* cam = static_cast<osg::Camera*>(node);
-
             // Update keyframe controllers in the scene graph first...
-            traverse(node, nv);
+            traverse(cam, nv);
 
             // Now update camera utilizing the updated head position
             osg::NodePathList nodepaths = mNodeToFollow->getParentalNodePaths();
diff --git a/apps/openmw/mwrender/globalmap.cpp b/apps/openmw/mwrender/globalmap.cpp
index 7d7c6e45df..b248efad4e 100644
--- a/apps/openmw/mwrender/globalmap.cpp
+++ b/apps/openmw/mwrender/globalmap.cpp
@@ -16,6 +16,7 @@
 
 #include <components/sceneutil/workqueue.hpp>
 #include <components/sceneutil/util.hpp>
+#include <components/sceneutil/nodecallback.hpp>
 
 #include <components/esm/globalmap.hpp>
 
@@ -62,7 +63,7 @@ namespace
     }
 
 
-    class CameraUpdateGlobalCallback : public osg::NodeCallback
+    class CameraUpdateGlobalCallback : public SceneUtil::NodeCallback<CameraUpdateGlobalCallback, osg::Camera*>
     {
     public:
         CameraUpdateGlobalCallback(MWRender::GlobalMap* parent)
@@ -71,14 +72,14 @@ namespace
         {
         }
 
-        void operator()(osg::Node* node, osg::NodeVisitor* nv) override
+        void operator()(osg::Camera* node, osg::NodeVisitor* nv)
         {
             if (mRendered)
             {
-                if (mParent->copyResult(static_cast<osg::Camera*>(node), nv->getTraversalNumber()))
+                if (mParent->copyResult(node, nv->getTraversalNumber()))
                 {
                     node->setNodeMask(0);
-                    mParent->markForRemoval(static_cast<osg::Camera*>(node));
+                    mParent->markForRemoval(node);
                 }
                 return;
             }
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index 02f59e0ed0..0560d1485a 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -20,6 +20,7 @@
 #include <components/sceneutil/shadow.hpp>
 #include <components/sceneutil/util.hpp>
 #include <components/sceneutil/lightmanager.hpp>
+#include <components/sceneutil/nodecallback.hpp>
 #include <components/files/memorystream.hpp>
 #include <components/resource/scenemanager.hpp>
 
@@ -35,7 +36,7 @@
 namespace
 {
 
-    class CameraLocalUpdateCallback : public osg::NodeCallback
+    class CameraLocalUpdateCallback : public SceneUtil::NodeCallback<CameraLocalUpdateCallback, osg::Camera*>
     {
     public:
         CameraLocalUpdateCallback(MWRender::LocalMap* parent)
@@ -44,7 +45,7 @@ namespace
         {
         }
 
-        void operator()(osg::Node* node, osg::NodeVisitor*) override
+        void operator()(osg::Camera* node, osg::NodeVisitor*)
         {
             if (mRendered)
                 node->setNodeMask(0);
@@ -52,12 +53,11 @@ namespace
             if (!mRendered)
             {
                 mRendered = true;
-                mParent->markForRemoval(static_cast<osg::Camera*>(node));
+                mParent->markForRemoval(node);
             }
 
             // Note, we intentionally do not traverse children here. The map camera's scene data is the same as the master camera's,
             // so it has been updated already.
-            //traverse(node, nv);
         }
 
     private:
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index f430432659..7c6d82d83d 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -148,44 +148,6 @@ public:
     float getValue(osg::NodeVisitor* nv) override;
 };
 
-// --------------------------------------------------------------------------------
-
-/// Subclass RotateController to add a Z-offset for sneaking in first person mode.
-/// @note We use inheritance instead of adding another controller, so that we do not have to compute the worldOrient twice.
-/// @note Must be set on a MatrixTransform.
-class NeckController : public RotateController
-{
-public:
-    NeckController(osg::Node* relativeTo)
-        : RotateController(relativeTo)
-    {
-    }
-
-    void setOffset(const osg::Vec3f& offset)
-    {
-        mOffset = offset;
-    }
-
-    void operator()(osg::Node* node, osg::NodeVisitor* nv) override
-    {
-        osg::MatrixTransform* transform = static_cast<osg::MatrixTransform*>(node);
-        osg::Matrix matrix = transform->getMatrix();
-
-        osg::Quat worldOrient = getWorldOrientation(node);
-        osg::Quat orient = worldOrient * mRotate * worldOrient.inverse() * matrix.getRotate();
-
-        matrix.setRotate(orient);
-        matrix.setTrans(matrix.getTrans() + worldOrient.inverse() * mOffset);
-
-        transform->setMatrix(matrix);
-
-        traverse(node,nv);
-    }
-
-private:
-    osg::Vec3f mOffset;
-};
-
 // --------------------------------------------------------------------------------------------------------------
 
 HeadAnimationTime::HeadAnimationTime(const MWWorld::Ptr& reference)
@@ -954,7 +916,7 @@ void NpcAnimation::addControllers()
         if (found != mNodeMap.end())
         {
             osg::MatrixTransform* node = found->second.get();
-            mFirstPersonNeckController = new NeckController(mObjectRoot.get());
+            mFirstPersonNeckController = new RotateController(mObjectRoot.get());
             node->addUpdateCallback(mFirstPersonNeckController);
             mActiveControllers.emplace_back(node, mFirstPersonNeckController);
         }
diff --git a/apps/openmw/mwrender/npcanimation.hpp b/apps/openmw/mwrender/npcanimation.hpp
index 9f7a186c5e..b511a52f37 100644
--- a/apps/openmw/mwrender/npcanimation.hpp
+++ b/apps/openmw/mwrender/npcanimation.hpp
@@ -24,7 +24,7 @@ namespace MWSound
 namespace MWRender
 {
 
-class NeckController;
+class RotateController;
 class HeadAnimationTime;
 
 class NpcAnimation : public ActorAnimation, public WeaponAnimation, public MWWorld::InventoryStoreListener
@@ -96,7 +96,7 @@ private:
 
     void setRenderBin();
 
-    osg::ref_ptr<NeckController> mFirstPersonNeckController;
+    osg::ref_ptr<RotateController> mFirstPersonNeckController;
 
     static bool isFirstPersonPart(const ESM::BodyPart* bodypart);
     static bool isFemalePart(const ESM::BodyPart* bodypart);
diff --git a/apps/openmw/mwrender/postprocessor.cpp b/apps/openmw/mwrender/postprocessor.cpp
index f846a05872..bc00676d7b 100644
--- a/apps/openmw/mwrender/postprocessor.cpp
+++ b/apps/openmw/mwrender/postprocessor.cpp
@@ -10,6 +10,7 @@
 
 #include <components/settings/settings.hpp>
 #include <components/sceneutil/util.hpp>
+#include <components/sceneutil/nodecallback.hpp>
 #include <components/debug/debuglog.hpp>
 
 #include "vismask.hpp"
@@ -33,7 +34,7 @@ namespace
         return geom;
     }
 
-    class CullCallback : public osg::NodeCallback
+    class CullCallback : public SceneUtil::NodeCallback<CullCallback, osg::Node*, osgUtil::CullVisitor*>
     {
     public:
         CullCallback()
@@ -41,12 +42,11 @@ namespace
         {
         }
 
-        void operator()(osg::Node* node, osg::NodeVisitor* nv) override
+        void operator()(osg::Node* node, osgUtil::CullVisitor* cv)
         {
-            osgUtil::CullVisitor* cv = static_cast<osgUtil::CullVisitor*>(nv);
             osgUtil::RenderStage* renderStage = cv->getCurrentRenderStage();
 
-            unsigned int frame = nv->getTraversalNumber();
+            unsigned int frame = cv->getTraversalNumber();
             if (frame != mLastFrameNumber)
             {
                 mLastFrameNumber = frame;
@@ -56,7 +56,7 @@ namespace
                 if (!postProcessor)
                 {
                     Log(Debug::Error) << "Failed retrieving user data for master camera: FBO setup failed";
-                    traverse(node, nv);
+                    traverse(node, cv);
                     return;
                 }
 
@@ -71,7 +71,7 @@ namespace
                 }
             }
 
-            traverse(node, nv);
+            traverse(node, cv);
         }
 
     private:
diff --git a/apps/openmw/mwrender/rotatecontroller.cpp b/apps/openmw/mwrender/rotatecontroller.cpp
index 534cc74906..d3df4364d0 100644
--- a/apps/openmw/mwrender/rotatecontroller.cpp
+++ b/apps/openmw/mwrender/rotatecontroller.cpp
@@ -22,21 +22,27 @@ void RotateController::setRotate(const osg::Quat &rotate)
     mRotate = rotate;
 }
 
-void RotateController::operator()(osg::Node *node, osg::NodeVisitor *nv)
+void RotateController::setOffset(const osg::Vec3f& offset)
+{
+    mOffset = offset;
+}
+
+void RotateController::operator()(osg::MatrixTransform *node, osg::NodeVisitor *nv)
 {
     if (!mEnabled)
     {
         traverse(node, nv);
         return;
     }
-    osg::MatrixTransform* transform = static_cast<osg::MatrixTransform*>(node);
-    osg::Matrix matrix = transform->getMatrix();
+    osg::Matrix matrix = node->getMatrix();
     osg::Quat worldOrient = getWorldOrientation(node);
+    osg::Quat worldOrientInverse = worldOrient.inverse();
 
-    osg::Quat orient = worldOrient * mRotate * worldOrient.inverse() * matrix.getRotate();
+    osg::Quat orient = worldOrient * mRotate * worldOrientInverse * matrix.getRotate();
     matrix.setRotate(orient);
+    matrix.setTrans(matrix.getTrans() + worldOrientInverse * mOffset);
 
-    transform->setMatrix(matrix);
+    node->setMatrix(matrix);
 
     traverse(node,nv);
 }
diff --git a/apps/openmw/mwrender/rotatecontroller.hpp b/apps/openmw/mwrender/rotatecontroller.hpp
index 9d4080ac6e..1f3ee0f845 100644
--- a/apps/openmw/mwrender/rotatecontroller.hpp
+++ b/apps/openmw/mwrender/rotatecontroller.hpp
@@ -1,31 +1,36 @@
 #ifndef OPENMW_MWRENDER_ROTATECONTROLLER_H
 #define OPENMW_MWRENDER_ROTATECONTROLLER_H
 
-#include <osg/NodeCallback>
+#include <components/sceneutil/nodecallback.hpp>
 #include <osg/Quat>
 
+namespace osg
+{
+    class MatrixTransform;
+}
+
 namespace MWRender
 {
 
 /// Applies a rotation in \a relativeTo's space.
 /// @note Assumes that the node being rotated has its "original" orientation set every frame by a different controller.
 /// The rotation is then applied on top of that orientation.
-/// @note Must be set on a MatrixTransform.
-class RotateController : public osg::NodeCallback
+class RotateController : public SceneUtil::NodeCallback<RotateController, osg::MatrixTransform*>
 {
 public:
     RotateController(osg::Node* relativeTo);
 
     void setEnabled(bool enabled);
-
+    void setOffset(const osg::Vec3f& offset);
     void setRotate(const osg::Quat& rotate);
 
-    void operator()(osg::Node* node, osg::NodeVisitor* nv) override;
+    void operator()(osg::MatrixTransform* node, osg::NodeVisitor* nv);
 
 protected:
     osg::Quat getWorldOrientation(osg::Node* node);
 
     bool mEnabled;
+    osg::Vec3f mOffset;
     osg::Quat mRotate;
     osg::Node* mRelativeTo;
 };
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index c1b79843a7..c2ed62ef87 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -44,6 +44,7 @@
 #include <components/sceneutil/controller.hpp>
 #include <components/sceneutil/visitor.hpp>
 #include <components/sceneutil/shadow.hpp>
+#include <components/sceneutil/nodecallback.hpp>
 
 #include <components/settings/settings.hpp>
 
@@ -301,13 +302,11 @@ public:
         return osg::BoundingSphere(osg::Vec3f(0,0,0), 0);
     }
 
-    class CullCallback : public osg::NodeCallback
+    class CullCallback : public SceneUtil::NodeCallback<CullCallback, osg::Node*, osgUtil::CullVisitor*>
     {
     public:
-        void operator() (osg::Node* node, osg::NodeVisitor* nv) override
+        void operator() (osg::Node* node, osgUtil::CullVisitor* cv)
         {
-            osgUtil::CullVisitor* cv = static_cast<osgUtil::CullVisitor*>(nv);
-
             // XXX have to remove unwanted culling plane of the water reflection camera
 
             // Remove all planes that aren't from the standard frustum
@@ -336,7 +335,7 @@ public:
             cv->getProjectionCullingStack().back().pushCurrentMask();
             cv->getCurrentCullingSet().pushCurrentMask();
 
-            traverse(node, nv);
+            traverse(node, cv);
 
             cv->getProjectionCullingStack().back().popCurrentMask();
             cv->getCurrentCullingSet().popCurrentMask();
@@ -398,7 +397,7 @@ private:
 /// @note Must be added as cull callback.
 /// @note Meant to be used on a node that is child of a CameraRelativeTransform.
 /// The current view point must be retrieved by the CameraRelativeTransform since we can't get it anymore once we are in camera-relative space.
-class UnderwaterSwitchCallback : public osg::NodeCallback
+class UnderwaterSwitchCallback : public SceneUtil::NodeCallback<UnderwaterSwitchCallback>
 {
 public:
     UnderwaterSwitchCallback(CameraRelativeTransform* cameraRelativeTransform)
@@ -414,7 +413,7 @@ public:
         return mEnabled && viewPoint.z() < mWaterLevel;
     }
 
-    void operator()(osg::Node* node, osg::NodeVisitor* nv) override
+    void operator()(osg::Node* node, osg::NodeVisitor* nv)
     {
         if (isUnderwater())
             return;
@@ -717,7 +716,7 @@ private:
         }
     };
 
-    class OcclusionCallback : public osg::NodeCallback
+    class OcclusionCallback
     {
     public:
         OcclusionCallback(osg::ref_ptr<osg::OcclusionQueryNode> oqnVisible, osg::ref_ptr<osg::OcclusionQueryNode> oqnTotal)
@@ -760,7 +759,7 @@ private:
     };
 
     /// SunFlashCallback handles fading/scaling of a node depending on occlusion query result. Must be attached as a cull callback.
-    class SunFlashCallback : public OcclusionCallback
+    class SunFlashCallback : public OcclusionCallback, public SceneUtil::NodeCallback<SunFlashCallback, osg::Node*, osgUtil::CullVisitor*>
     {
     public:
         SunFlashCallback(osg::ref_ptr<osg::OcclusionQueryNode> oqnVisible, osg::ref_ptr<osg::OcclusionQueryNode> oqnTotal)
@@ -769,10 +768,8 @@ private:
         {
         }
 
-        void operator()(osg::Node* node, osg::NodeVisitor* nv) override
+        void operator()(osg::Node* node, osgUtil::CullVisitor* cv)
         {
-            osgUtil::CullVisitor* cv = static_cast<osgUtil::CullVisitor*>(nv);
-
             float visibleRatio = getVisibleRatio(cv->getCurrentCamera());
 
             osg::ref_ptr<osg::StateSet> stateset;
@@ -811,7 +808,7 @@ private:
 
                 cv->pushModelViewMatrix(new osg::RefMatrix(modelView), osg::Transform::RELATIVE_RF);
 
-                traverse(node, nv);
+                traverse(node, cv);
 
                 cv->popModelViewMatrix();
 
@@ -832,7 +829,7 @@ private:
 
     /// SunGlareCallback controls a full-screen glare effect depending on occlusion query result and the angle between sun and camera.
     /// Must be attached as a cull callback to the node above the glare node.
-    class SunGlareCallback : public OcclusionCallback
+    class SunGlareCallback : public OcclusionCallback, public SceneUtil::NodeCallback<SunGlareCallback, osg::Node*, osgUtil::CullVisitor*>
     {
     public:
         SunGlareCallback(osg::ref_ptr<osg::OcclusionQueryNode> oqnVisible, osg::ref_ptr<osg::OcclusionQueryNode> oqnTotal,
@@ -854,10 +851,8 @@ private:
                 mColor[i] = std::min(1.f, mColor[i]);
         }
 
-        void operator ()(osg::Node* node, osg::NodeVisitor* nv) override
+        void operator ()(osg::Node* node, osgUtil::CullVisitor* cv)
         {
-            osgUtil::CullVisitor* cv = static_cast<osgUtil::CullVisitor*>(nv);
-
             float angleRadians = getAngleToSunInRadians(*cv->getCurrentRenderStage()->getInitialViewMatrix());
             float visibleRatio = getVisibleRatio(cv->getCurrentCamera());
 
@@ -885,7 +880,7 @@ private:
                 stateset->setAttributeAndModes(mat, osg::StateAttribute::ON);
 
                 cv->pushStateSet(stateset);
-                traverse(node, nv);
+                traverse(node, cv);
                 cv->popStateSet();
             }
         }
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index 88e422fcf3..37368b8e7a 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -58,20 +58,17 @@ namespace MWRender
 /// To use, simply create the scene as subgraph of this node, then do setPlane(const osg::Plane& plane);
 class ClipCullNode : public osg::Group
 {
-    class PlaneCullCallback : public osg::NodeCallback
+    class PlaneCullCallback : public SceneUtil::NodeCallback<PlaneCullCallback, osg::Node*, osgUtil::CullVisitor*>
     {
     public:
         /// @param cullPlane The culling plane (in world space).
         PlaneCullCallback(const osg::Plane* cullPlane)
-            : osg::NodeCallback()
-            , mCullPlane(cullPlane)
+            : mCullPlane(cullPlane)
         {
         }
 
-        void operator()(osg::Node* node, osg::NodeVisitor* nv) override
+        void operator()(osg::Node* node, osgUtil::CullVisitor* cv)
         {
-            osgUtil::CullVisitor* cv = static_cast<osgUtil::CullVisitor*>(nv);
-
             osg::Polytope::PlaneList origPlaneList = cv->getProjectionCullingStack().back().getFrustum().getPlaneList();
 
             osg::Plane plane = *mCullPlane;
@@ -83,7 +80,7 @@ class ClipCullNode : public osg::Group
 
             cv->getProjectionCullingStack().back().getFrustum().add(plane);
 
-            traverse(node, nv);
+            traverse(node, cv);
 
             // undo
             cv->getProjectionCullingStack().back().getFrustum().set(origPlaneList);
@@ -93,7 +90,7 @@ class ClipCullNode : public osg::Group
         const osg::Plane* mCullPlane;
     };
 
-    class FlipCallback : public osg::NodeCallback
+    class FlipCallback : public SceneUtil::NodeCallback<FlipCallback, osg::Node*, osgUtil::CullVisitor*>
     {
     public:
         FlipCallback(const osg::Plane* cullPlane)
@@ -101,9 +98,8 @@ class ClipCullNode : public osg::Group
         {
         }
 
-        void operator()(osg::Node* node, osg::NodeVisitor* nv) override
+        void operator()(osg::Node* node, osgUtil::CullVisitor* cv)
         {
-            osgUtil::CullVisitor* cv = static_cast<osgUtil::CullVisitor*>(nv);
             osg::Vec3d eyePoint = cv->getEyePoint();
 
             osg::RefMatrix* modelViewMatrix = new osg::RefMatrix(*cv->getModelViewMatrix());
@@ -123,7 +119,7 @@ class ClipCullNode : public osg::Group
             modelViewMatrix->preMultTranslate(mCullPlane->getNormal() * clipFudge);
 
             cv->pushModelViewMatrix(modelViewMatrix, osg::Transform::RELATIVE_RF);
-            traverse(node, nv);
+            traverse(node, cv);
             cv->popModelViewMatrix();
         }
 
@@ -166,31 +162,28 @@ private:
 
 /// This callback on the Camera has the effect of a RELATIVE_RF_INHERIT_VIEWPOINT transform mode (which does not exist in OSG).
 /// We want to keep the View Point of the parent camera so we will not have to recreate LODs.
-class InheritViewPointCallback : public osg::NodeCallback
+class InheritViewPointCallback : public SceneUtil::NodeCallback<InheritViewPointCallback, osg::Node*, osgUtil::CullVisitor*>
 {
 public:
-        InheritViewPointCallback() {}
+    InheritViewPointCallback() {}
 
-    void operator()(osg::Node* node, osg::NodeVisitor* nv) override
+    void operator()(osg::Node* node, osgUtil::CullVisitor* cv)
     {
-        osgUtil::CullVisitor* cv = static_cast<osgUtil::CullVisitor*>(nv);
         osg::ref_ptr<osg::RefMatrix> modelViewMatrix = new osg::RefMatrix(*cv->getModelViewMatrix());
         cv->popModelViewMatrix();
         cv->pushModelViewMatrix(modelViewMatrix, osg::Transform::ABSOLUTE_RF_INHERIT_VIEWPOINT);
-        traverse(node, nv);
+        traverse(node, cv);
     }
 };
 
 /// Moves water mesh away from the camera slightly if the camera gets too close on the Z axis.
 /// The offset works around graphics artifacts that occurred with the GL_DEPTH_CLAMP when the camera gets extremely close to the mesh (seen on NVIDIA at least).
 /// Must be added as a Cull callback.
-class FudgeCallback : public osg::NodeCallback
+class FudgeCallback : public SceneUtil::NodeCallback<FudgeCallback, osg::Node*, osgUtil::CullVisitor*>
 {
 public:
-    void operator()(osg::Node* node, osg::NodeVisitor* nv) override
+    void operator()(osg::Node* node, osgUtil::CullVisitor* cv)
     {
-        osgUtil::CullVisitor* cv = static_cast<osgUtil::CullVisitor*>(nv);
-
         const float fudge = 0.2;
         if (std::abs(cv->getEyeLocal().z()) < fudge)
         {
@@ -203,11 +196,11 @@ public:
                 modelViewMatrix->preMultTranslate(osg::Vec3f(0,0,diff));
 
             cv->pushModelViewMatrix(modelViewMatrix, osg::Transform::RELATIVE_RF);
-            traverse(node, nv);
+            traverse(node, cv);
             cv->popModelViewMatrix();
         }
         else
-            traverse(node, nv);
+            traverse(node, cv);
     }
 };
 
diff --git a/apps/openmw/mwrender/water.hpp b/apps/openmw/mwrender/water.hpp
index 870b8949c7..719e4fdc2b 100644
--- a/apps/openmw/mwrender/water.hpp
+++ b/apps/openmw/mwrender/water.hpp
@@ -6,7 +6,7 @@
 
 #include <osg/ref_ptr>
 #include <osg/Vec3f>
-#include <osg/Camera>
+#include <osg/Vec3d>
 
 #include <components/settings/settings.hpp>
 
@@ -16,6 +16,7 @@ namespace osg
     class PositionAttitudeTransform;
     class Geometry;
     class Node;
+    class Callback;
 }
 
 namespace osgUtil
@@ -72,7 +73,7 @@ namespace MWRender
         bool mInterior;
 
         osg::Callback* mCullCallback;
-        osg::ref_ptr<osg::NodeCallback> mShaderWaterStateSetUpdater;
+        osg::ref_ptr<osg::Callback> mShaderWaterStateSetUpdater;
 
         osg::Vec3f getSceneNodeCoordinates(int gridX, int gridY);
         void updateVisible();
diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index 3b7be64ad1..9ee137fab6 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -20,6 +20,7 @@
 #include <components/sceneutil/controller.hpp>
 #include <components/sceneutil/visitor.hpp>
 #include <components/sceneutil/lightmanager.hpp>
+#include <components/sceneutil/nodecallback.hpp>
 
 #include "../mwworld/manualref.hpp"
 #include "../mwworld/class.hpp"
@@ -161,7 +162,7 @@ namespace MWWorld
     }
 
     /// Rotates an osg::PositionAttitudeTransform over time.
-    class RotateCallback : public osg::NodeCallback
+    class RotateCallback : public SceneUtil::NodeCallback<RotateCallback, osg::PositionAttitudeTransform*>
     {
     public:
         RotateCallback(const osg::Vec3f& axis = osg::Vec3f(0,-1,0), float rotateSpeed = osg::PI*2)
@@ -170,14 +171,12 @@ namespace MWWorld
         {
         }
 
-        void operator()(osg::Node* node, osg::NodeVisitor* nv) override
+        void operator()(osg::PositionAttitudeTransform* node, osg::NodeVisitor* nv)
         {
-            osg::PositionAttitudeTransform* transform = static_cast<osg::PositionAttitudeTransform*>(node);
-
             double time = nv->getFrameStamp()->getSimulationTime();
 
             osg::Quat orient = osg::Quat(time * mRotateSpeed, mAxis);
-            transform->setAttitude(orient);
+            node->setAttitude(orient);
 
             traverse(node, nv);
         }
diff --git a/components/myguiplatform/myguirendermanager.cpp b/components/myguiplatform/myguirendermanager.cpp
index abc170c02e..3061b329c2 100644
--- a/components/myguiplatform/myguirendermanager.cpp
+++ b/components/myguiplatform/myguirendermanager.cpp
@@ -15,6 +15,7 @@
 
 #include <components/resource/imagemanager.hpp>
 #include <components/shader/shadermanager.hpp>
+#include <components/sceneutil/nodecallback.hpp>
 
 #include <components/debug/debuglog.hpp>
 
@@ -51,7 +52,7 @@ class Drawable : public osg::Drawable {
 public:
 
     // Stage 0: update widget animations and controllers. Run during the Update traversal.
-    class FrameUpdate : public osg::Drawable::UpdateCallback
+    class FrameUpdate : public SceneUtil::NodeCallback<FrameUpdate>
     {
     public:
         FrameUpdate()
@@ -64,10 +65,9 @@ public:
             mRenderManager = renderManager;
         }
 
-        void update(osg::NodeVisitor*, osg::Drawable*) override
+        void operator()(osg::Node*, osg::NodeVisitor*)
         {
-            if (mRenderManager)
-                mRenderManager->update();
+            mRenderManager->update();
         }
 
     private:
@@ -75,7 +75,7 @@ public:
     };
 
     // Stage 1: collect draw calls. Run during the Cull traversal.
-    class CollectDrawCalls : public osg::Drawable::CullCallback
+    class CollectDrawCalls : public SceneUtil::NodeCallback<CollectDrawCalls>
     {
     public:
         CollectDrawCalls()
@@ -88,13 +88,9 @@ public:
             mRenderManager = renderManager;
         }
 
-        bool cull(osg::NodeVisitor*, osg::Drawable*, osg::State*) const override
+        void operator()(osg::Node*, osg::NodeVisitor*)
         {
-            if (!mRenderManager)
-                return false;
-
             mRenderManager->collectDrawCalls();
-            return false;
         }
 
     private:
diff --git a/components/nifosg/controller.cpp b/components/nifosg/controller.cpp
index c8a6ef74ab..ddded82156 100644
--- a/components/nifosg/controller.cpp
+++ b/components/nifosg/controller.cpp
@@ -72,7 +72,7 @@ KeyframeController::KeyframeController()
 
 KeyframeController::KeyframeController(const KeyframeController &copy, const osg::CopyOp &copyop)
     : SceneUtil::KeyframeController(copy, copyop)
-    , SceneUtil::NodeCallback<KeyframeController>(copy, copyop)
+    , SceneUtil::NodeCallback<KeyframeController, NifOsg::MatrixTransform*>(copy, copyop)
     , mRotations(copy.mRotations)
     , mXRotations(copy.mXRotations)
     , mYRotations(copy.mYRotations)
@@ -134,16 +134,15 @@ osg::Vec3f KeyframeController::getTranslation(float time) const
     return osg::Vec3f();
 }
 
-void KeyframeController::operator() (osg::Node* node, osg::NodeVisitor* nv)
+void KeyframeController::operator() (NifOsg::MatrixTransform* node, osg::NodeVisitor* nv)
 {
     if (hasInput())
     {
-        NifOsg::MatrixTransform* trans = static_cast<NifOsg::MatrixTransform*>(node);
-        osg::Matrix mat = trans->getMatrix();
+        osg::Matrix mat = node->getMatrix();
 
         float time = getInputValue(nv);
 
-        Nif::Matrix3& rot = trans->mRotationScale;
+        Nif::Matrix3& rot = node->mRotationScale;
 
         bool setRot = false;
         if(!mRotations.empty())
@@ -169,7 +168,7 @@ void KeyframeController::operator() (osg::Node* node, osg::NodeVisitor* nv)
                 for (int j=0;j<3;++j)
                     rot.mValues[i][j] = mat(j,i); // NB column/row major difference
 
-        float& scale = trans->mScale;
+        float& scale = node->mScale;
         if(!mScales.empty())
             scale = mScales.interpKey(time);
 
@@ -180,7 +179,7 @@ void KeyframeController::operator() (osg::Node* node, osg::NodeVisitor* nv)
         if(!mTranslations.empty())
             mat.setTrans(mTranslations.interpKey(time));
 
-        trans->setMatrix(mat);
+        node->setMatrix(mat);
     }
 
     traverse(node, nv);
@@ -191,8 +190,8 @@ GeomMorpherController::GeomMorpherController()
 }
 
 GeomMorpherController::GeomMorpherController(const GeomMorpherController &copy, const osg::CopyOp &copyop)
-    : osg::Drawable::UpdateCallback(copy, copyop)
-    , Controller(copy)
+    : Controller(copy)
+    , SceneUtil::NodeCallback<GeomMorpherController, SceneUtil::MorphGeometry*>(copy, copyop)
     , mKeyFrames(copy.mKeyFrames)
 {
 }
@@ -218,9 +217,8 @@ GeomMorpherController::GeomMorpherController(const Nif::NiGeomMorpherController*
     }
 }
 
-void GeomMorpherController::update(osg::NodeVisitor *nv, osg::Drawable *drawable)
+void GeomMorpherController::operator()(SceneUtil::MorphGeometry* node, osg::NodeVisitor *nv)
 {
-    SceneUtil::MorphGeometry* morphGeom = static_cast<SceneUtil::MorphGeometry*>(drawable);
     if (hasInput())
     {
         if (mKeyFrames.size() <= 1)
@@ -233,11 +231,11 @@ void GeomMorpherController::update(osg::NodeVisitor *nv, osg::Drawable *drawable
             if (!(*it).empty())
                 val = it->interpKey(input);
 
-            SceneUtil::MorphGeometry::MorphTarget& target = morphGeom->getMorphTarget(i);
+            SceneUtil::MorphGeometry::MorphTarget& target = node->getMorphTarget(i);
             if (target.getWeight() != val)
             {
                 target.setWeight(val);
-                morphGeom->dirty();
+                node->dirty();
             }
         }
     }
@@ -312,7 +310,7 @@ VisController::VisController()
 }
 
 VisController::VisController(const VisController &copy, const osg::CopyOp &copyop)
-    : osg::NodeCallback(copy, copyop)
+    : SceneUtil::NodeCallback<VisController>(copy, copyop)
     , Controller(copy)
     , mData(copy.mData)
     , mMask(copy.mMask)
@@ -353,14 +351,14 @@ RollController::RollController(const Nif::NiFloatInterpolator* interpolator)
 }
 
 RollController::RollController(const RollController &copy, const osg::CopyOp &copyop)
-    : osg::NodeCallback(copy, copyop)
+    : SceneUtil::NodeCallback<RollController, osg::MatrixTransform*>(copy, copyop)
     , Controller(copy)
     , mData(copy.mData)
     , mStartingTime(copy.mStartingTime)
 {
 }
 
-void RollController::operator() (osg::Node* node, osg::NodeVisitor* nv)
+void RollController::operator() (osg::MatrixTransform* node, osg::NodeVisitor* nv)
 {
     traverse(node, nv);
 
@@ -371,15 +369,14 @@ void RollController::operator() (osg::Node* node, osg::NodeVisitor* nv)
         mStartingTime = newTime;
 
         float value = mData.interpKey(getInputValue(nv));
-        osg::MatrixTransform* transform = static_cast<osg::MatrixTransform*>(node);
-        osg::Matrix matrix = transform->getMatrix();
+        osg::Matrix matrix = node->getMatrix();
 
         // Rotate around "roll" axis.
         // Note: in original game rotation speed is the framerate-dependent in a very tricky way.
         // Do not replicate this behaviour until we will really need it.
         // For now consider controller's current value as an angular speed in radians per 1/60 seconds.
         matrix = osg::Matrix::rotate(value * duration * 60.f, 0, 0, 1) * matrix;
-        transform->setMatrix(matrix);
+        node->setMatrix(matrix);
     }
 }
 
@@ -545,29 +542,28 @@ ParticleSystemController::ParticleSystemController()
 }
 
 ParticleSystemController::ParticleSystemController(const ParticleSystemController &copy, const osg::CopyOp &copyop)
-    : osg::NodeCallback(copy, copyop)
+    : SceneUtil::NodeCallback<ParticleSystemController, osgParticle::ParticleProcessor*>(copy, copyop)
     , Controller(copy)
     , mEmitStart(copy.mEmitStart)
     , mEmitStop(copy.mEmitStop)
 {
 }
 
-void ParticleSystemController::operator() (osg::Node* node, osg::NodeVisitor* nv)
+void ParticleSystemController::operator() (osgParticle::ParticleProcessor* node, osg::NodeVisitor* nv)
 {
-    osgParticle::ParticleProcessor* emitter = static_cast<osgParticle::ParticleProcessor*>(node);
     if (hasInput())
     {
         float time = getInputValue(nv);
-        emitter->getParticleSystem()->setFrozen(false);
-        emitter->setEnabled(time >= mEmitStart && time < mEmitStop);
+        node->getParticleSystem()->setFrozen(false);
+        node->setEnabled(time >= mEmitStart && time < mEmitStop);
     }
     else
-        emitter->getParticleSystem()->setFrozen(true);
+        node->getParticleSystem()->setFrozen(true);
     traverse(node, nv);
 }
 
 PathController::PathController(const PathController &copy, const osg::CopyOp &copyop)
-    : osg::NodeCallback(copy, copyop)
+    : SceneUtil::NodeCallback<PathController, osg::MatrixTransform*>(copy, copyop)
     , Controller(copy)
     , mPath(copy.mPath)
     , mPercent(copy.mPercent)
@@ -592,7 +588,7 @@ float PathController::getPercent(float time) const
     return percent;
 }
 
-void PathController::operator() (osg::Node* node, osg::NodeVisitor* nv)
+void PathController::operator() (osg::MatrixTransform* node, osg::NodeVisitor* nv)
 {
     if (mPath.empty() || mPercent.empty() || !hasInput())
     {
@@ -600,14 +596,13 @@ void PathController::operator() (osg::Node* node, osg::NodeVisitor* nv)
         return;
     }
 
-    osg::MatrixTransform* trans = static_cast<osg::MatrixTransform*>(node);
-    osg::Matrix mat = trans->getMatrix();
+    osg::Matrix mat = node->getMatrix();
 
     float time = getInputValue(nv);
     float percent = getPercent(time);
     osg::Vec3f pos(mPath.interpKey(percent));
     mat.setTrans(pos);
-    trans->setMatrix(mat);
+    node->setMatrix(mat);
 
     traverse(node, nv);
 }
diff --git a/components/nifosg/controller.hpp b/components/nifosg/controller.hpp
index 078b7e14ce..c6311fd5fc 100644
--- a/components/nifosg/controller.hpp
+++ b/components/nifosg/controller.hpp
@@ -15,19 +15,27 @@
 
 #include <osg/Texture2D>
 
-#include <osg/StateSet>
-#include <osg/NodeCallback>
-#include <osg/Drawable>
-
-
 namespace osg
 {
     class Material;
+    class MatrixTransform;
+}
+
+namespace osgParticle
+{
+    class ParticleProcessor;
+}
+
+namespace SceneUtil
+{
+    class MorphGeometry;
 }
 
 namespace NifOsg
 {
 
+    class MatrixTransform;
+
     // interpolation of keyframes
     template <typename MapT>
     class ValueInterpolator
@@ -208,8 +216,7 @@ namespace NifOsg
         float getMaximum() const override;
     };
 
-    /// Must be set on a SceneUtil::MorphGeometry.
-    class GeomMorpherController : public osg::Drawable::UpdateCallback, public SceneUtil::Controller
+    class GeomMorpherController : public SceneUtil::Controller, public SceneUtil::NodeCallback<GeomMorpherController, SceneUtil::MorphGeometry*>
     {
     public:
         GeomMorpherController(const Nif::NiGeomMorpherController* ctrl);
@@ -218,13 +225,13 @@ namespace NifOsg
 
         META_Object(NifOsg, GeomMorpherController)
 
-        void update(osg::NodeVisitor* nv, osg::Drawable* drawable) override;
+        void operator()(SceneUtil::MorphGeometry*, osg::NodeVisitor*);
 
     private:
         std::vector<FloatInterpolator> mKeyFrames;
     };
 
-    class KeyframeController : public SceneUtil::KeyframeController, public SceneUtil::NodeCallback<KeyframeController>
+    class KeyframeController : public SceneUtil::KeyframeController, public SceneUtil::NodeCallback<KeyframeController, NifOsg::MatrixTransform*>
     {
     public:
         // This is used if there's no interpolator but there is data (Morrowind meshes).
@@ -242,7 +249,7 @@ namespace NifOsg
 
         osg::Vec3f getTranslation(float time) const override;
 
-        void operator() (osg::Node*, osg::NodeVisitor*);
+        void operator() (NifOsg::MatrixTransform*, osg::NodeVisitor*);
 
     private:
         QuaternionInterpolator mRotations;
@@ -277,7 +284,7 @@ namespace NifOsg
         std::set<int> mTextureUnits;
     };
 
-    class VisController : public osg::NodeCallback, public SceneUtil::Controller
+    class VisController : public SceneUtil::NodeCallback<VisController>, public SceneUtil::Controller
     {
     private:
         std::vector<Nif::NiVisData::VisData> mData;
@@ -292,10 +299,10 @@ namespace NifOsg
 
         META_Object(NifOsg, VisController)
 
-        void operator() (osg::Node* node, osg::NodeVisitor* nv) override;
+        void operator() (osg::Node* node, osg::NodeVisitor* nv);
     };
 
-    class RollController : public osg::NodeCallback, public SceneUtil::Controller
+    class RollController : public SceneUtil::NodeCallback<RollController, osg::MatrixTransform*>, public SceneUtil::Controller
     {
     private:
         FloatInterpolator mData;
@@ -307,7 +314,7 @@ namespace NifOsg
         RollController() = default;
         RollController(const RollController& copy, const osg::CopyOp& copyop);
 
-        void operator() (osg::Node* node, osg::NodeVisitor* nv) override;
+        void operator() (osg::MatrixTransform* node, osg::NodeVisitor* nv);
 
         META_Object(NifOsg, RollController)
     };
@@ -378,7 +385,7 @@ namespace NifOsg
         void apply(osg::StateSet *stateset, osg::NodeVisitor *nv) override;
     };
 
-    class ParticleSystemController : public osg::NodeCallback, public SceneUtil::Controller
+    class ParticleSystemController : public SceneUtil::NodeCallback<ParticleSystemController, osgParticle::ParticleProcessor*>, public SceneUtil::Controller
     {
     public:
         ParticleSystemController(const Nif::NiParticleSystemController* ctrl);
@@ -387,14 +394,14 @@ namespace NifOsg
 
         META_Object(NifOsg, ParticleSystemController)
 
-        void operator() (osg::Node* node, osg::NodeVisitor* nv) override;
+        void operator() (osgParticle::ParticleProcessor* node, osg::NodeVisitor* nv);
 
     private:
         float mEmitStart;
         float mEmitStop;
     };
 
-    class PathController : public osg::NodeCallback, public SceneUtil::Controller
+    class PathController : public SceneUtil::NodeCallback<PathController, osg::MatrixTransform*>, public SceneUtil::Controller
     {
     public:
         PathController(const Nif::NiPathController* ctrl);
@@ -403,7 +410,7 @@ namespace NifOsg
 
         META_Object(NifOsg, PathController)
 
-        void operator() (osg::Node*, osg::NodeVisitor*) override;
+        void operator() (osg::MatrixTransform*, osg::NodeVisitor*);
 
     private:
         Vec3Interpolator mPath;
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index a564844ce6..838895eb47 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -109,24 +109,21 @@ namespace
 
     // NodeCallback used to have a node always oriented towards the camera. The node can have translation and scale
     // set just like a regular MatrixTransform, but the rotation set will be overridden in order to face the camera.
-    // Must be set as a cull callback.
-    class BillboardCallback : public osg::NodeCallback
+    class BillboardCallback : public SceneUtil::NodeCallback<BillboardCallback, osg::Node*, osgUtil::CullVisitor*>
     {
     public:
         BillboardCallback()
         {
         }
         BillboardCallback(const BillboardCallback& copy, const osg::CopyOp& copyop)
-            : osg::NodeCallback(copy, copyop)
+            : SceneUtil::NodeCallback<BillboardCallback, osg::Node*, osgUtil::CullVisitor*>(copy, copyop)
         {
         }
 
         META_Object(NifOsg, BillboardCallback)
 
-        void operator()(osg::Node* node, osg::NodeVisitor* nv) override
+        void operator()(osg::Node* node, osgUtil::CullVisitor* cv)
         {
-            osgUtil::CullVisitor* cv = static_cast<osgUtil::CullVisitor*>(nv);
-
             osg::Matrix modelView = *cv->getModelViewMatrix();
 
             // attempt to preserve scale
@@ -143,7 +140,7 @@ namespace
 
             cv->pushModelViewMatrix(new osg::RefMatrix(modelView), osg::Transform::RELATIVE_RF);
 
-            traverse(node, nv);
+            traverse(node, cv);
 
             cv->popModelViewMatrix();
         }
diff --git a/components/nifosg/particle.cpp b/components/nifosg/particle.cpp
index e2e1f92cf3..0f103588e8 100644
--- a/components/nifosg/particle.cpp
+++ b/components/nifosg/particle.cpp
@@ -68,19 +68,17 @@ void ParticleSystem::drawImplementation(osg::RenderInfo& renderInfo) const
      osgParticle::ParticleSystem::drawImplementation(renderInfo);
 }
 
-void InverseWorldMatrix::operator()(osg::Node *node, osg::NodeVisitor *nv)
+void InverseWorldMatrix::operator()(osg::MatrixTransform *node, osg::NodeVisitor *nv)
 {
     if (nv && nv->getVisitorType() == osg::NodeVisitor::UPDATE_VISITOR)
     {
         osg::NodePath path = nv->getNodePath();
         path.pop_back();
 
-        osg::MatrixTransform* trans = static_cast<osg::MatrixTransform*>(node);
-
         osg::Matrix mat = osg::computeLocalToWorld( path );
         mat.orthoNormalize(mat); // don't undo the scale
         mat.invert(mat);
-        trans->setMatrix(mat);
+        node->setMatrix(mat);
     }
     traverse(node,nv);
 }
diff --git a/components/nifosg/particle.hpp b/components/nifosg/particle.hpp
index b0a46f0ca5..8b724545f4 100644
--- a/components/nifosg/particle.hpp
+++ b/components/nifosg/particle.hpp
@@ -8,7 +8,7 @@
 #include <osgParticle/Placer>
 #include <osgParticle/Counter>
 
-#include <osg/NodeCallback>
+#include <components/sceneutil/nodecallback.hpp>
 
 #include "controller.hpp" // ValueInterpolator
 
@@ -57,20 +57,20 @@ namespace NifOsg
     // Node callback used to set the inverse of the parent's world matrix on the MatrixTransform
     // that the callback is attached to. Used for certain particle systems,
     // so that the particles do not move with the node they are attached to.
-    class InverseWorldMatrix : public osg::NodeCallback
+    class InverseWorldMatrix : public SceneUtil::NodeCallback<InverseWorldMatrix, osg::MatrixTransform*>
     {
     public:
         InverseWorldMatrix()
         {
         }
-        InverseWorldMatrix(const InverseWorldMatrix& copy, const osg::CopyOp& op)
-            : osg::Object(), osg::NodeCallback()
+        InverseWorldMatrix(const InverseWorldMatrix& copy, const osg::CopyOp& copyop)
+            : osg::Object(copy, copyop), SceneUtil::NodeCallback<InverseWorldMatrix, osg::MatrixTransform*>(copy, copyop)
         {
         }
 
         META_Object(NifOsg, InverseWorldMatrix)
 
-        void operator()(osg::Node* node, osg::NodeVisitor* nv) override;
+        void operator()(osg::MatrixTransform* node, osg::NodeVisitor* nv);
     };
 
     class ParticleShooter : public osgParticle::Shooter
diff --git a/components/resource/keyframemanager.cpp b/components/resource/keyframemanager.cpp
index 01a8639aa2..8aa32a28bc 100644
--- a/components/resource/keyframemanager.cpp
+++ b/components/resource/keyframemanager.cpp
@@ -2,6 +2,7 @@
 
 #include <components/vfs/manager.hpp>
 
+#include <osg/Stats>
 #include <osgAnimation/Animation>
 #include <osgAnimation/BasicAnimationManager>
 #include <osgAnimation/Channel>
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index be32539d40..7c730b24a7 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -40,16 +40,14 @@
 namespace
 {
 
-    class InitWorldSpaceParticlesCallback : public osg::NodeCallback
+    class InitWorldSpaceParticlesCallback : public SceneUtil::NodeCallback<InitWorldSpaceParticlesCallback, osgParticle::ParticleSystem*>
     {
     public:
-        void operator()(osg::Node* node, osg::NodeVisitor* nv) override
+        void operator()(osgParticle::ParticleSystem* node, osg::NodeVisitor* nv)
         {
-            osgParticle::ParticleSystem* partsys = static_cast<osgParticle::ParticleSystem*>(node);
-
             // HACK: Ignore the InverseWorldMatrix transform the particle system is attached to
-            if (partsys->getNumParents() && partsys->getParent(0)->getNumParents())
-                transformInitialParticles(partsys, partsys->getParent(0)->getParent(0));
+            if (node->getNumParents() && node->getParent(0)->getNumParents())
+                transformInitialParticles(node, node->getParent(0)->getParent(0));
 
             node->removeUpdateCallback(this);
         }
diff --git a/components/sceneutil/lightcontroller.cpp b/components/sceneutil/lightcontroller.cpp
index cc320aecf8..13e367baa4 100644
--- a/components/sceneutil/lightcontroller.cpp
+++ b/components/sceneutil/lightcontroller.cpp
@@ -26,7 +26,7 @@ namespace SceneUtil
         mType = type;
     }
 
-    void LightController::operator ()(osg::Node* node, osg::NodeVisitor* nv)
+    void LightController::operator ()(SceneUtil::LightSource* node, osg::NodeVisitor* nv)
     {
         double time = nv->getFrameStamp()->getSimulationTime();
         if (mStartTime == 0)
@@ -38,7 +38,7 @@ namespace SceneUtil
 
         if (mType == LT_Normal)
         {
-            static_cast<SceneUtil::LightSource*>(node)->getLight(nv->getTraversalNumber())->setDiffuse(mDiffuseColor);
+            node->getLight(nv->getTraversalNumber())->setDiffuse(mDiffuseColor);
             traverse(node, nv);
             return;
         }
@@ -62,8 +62,7 @@ namespace SceneUtil
                 mPhase = mPhase <= 0.5f ? 1.f : 0.25f;
         }
 
-        auto* lightSource = static_cast<SceneUtil::LightSource*>(node);
-        lightSource->getLight(nv->getTraversalNumber())->setDiffuse(mDiffuseColor * mBrightness * lightSource->getActorFade());
+        node->getLight(nv->getTraversalNumber())->setDiffuse(mDiffuseColor * mBrightness * node->getActorFade());
 
         traverse(node, nv);
     }
diff --git a/components/sceneutil/lightcontroller.hpp b/components/sceneutil/lightcontroller.hpp
index 36b2e868e5..b67cd59472 100644
--- a/components/sceneutil/lightcontroller.hpp
+++ b/components/sceneutil/lightcontroller.hpp
@@ -1,15 +1,16 @@
 #ifndef OPENMW_COMPONENTS_SCENEUTIL_LIGHTCONTROLLER_H
 #define OPENMW_COMPONENTS_SCENEUTIL_LIGHTCONTROLLER_H
 
-#include <osg/NodeCallback>
+#include <components/sceneutil/nodecallback.hpp>
 #include <osg/Vec4f>
 
 namespace SceneUtil
 {
 
+    class LightSource;
+
     /// @brief Controller class to handle a pulsing and/or flickering light
-    /// @note Must be set on a SceneUtil::LightSource.
-    class LightController : public osg::NodeCallback
+    class LightController : public SceneUtil::NodeCallback<LightController, SceneUtil::LightSource*>
     {
     public:
         enum LightType {
@@ -26,7 +27,7 @@ namespace SceneUtil
 
         void setDiffuse(const osg::Vec4f& color);
 
-        void operator()(osg::Node* node, osg::NodeVisitor* nv) override;
+        void operator()(SceneUtil::LightSource* node, osg::NodeVisitor* nv);
 
     private:
         LightType mType;
diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 09fa302457..0abebd4884 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -650,23 +650,21 @@ namespace SceneUtil
         }
     };
 
-    class LightManagerCullCallback : public osg::NodeCallback
+    class LightManagerCullCallback : public SceneUtil::NodeCallback<LightManagerCullCallback, LightManager*, osgUtil::CullVisitor*>
     {
     public:
-        LightManagerCullCallback(LightManager* lightManager) : mLightManager(lightManager), mLastFrameNumber(0) {}
+        LightManagerCullCallback() : mLastFrameNumber(0) {}
 
-        void operator()(osg::Node* node, osg::NodeVisitor* nv) override
+        void operator()(LightManager* node, osgUtil::CullVisitor* cv)
         {
-            osgUtil::CullVisitor* cv = static_cast<osgUtil::CullVisitor*>(nv);
-
             if (mLastFrameNumber != cv->getTraversalNumber())
             {
                 mLastFrameNumber = cv->getTraversalNumber();
 
-                if (mLightManager->getLightingMethod() == LightingMethod::SingleUBO)
+                if (node->getLightingMethod() == LightingMethod::SingleUBO)
                 {
-                    auto stateset = mLightManager->getStateSet();
-                    auto bo = mLightManager->getLightBuffer(mLastFrameNumber);
+                    auto stateset = node->getStateSet();
+                    auto bo = node->getLightBuffer(mLastFrameNumber);
 
 #if OSG_VERSION_GREATER_OR_EQUAL(3,5,7)
                     osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(static_cast<int>(Resource::SceneManager::UBOBinding::LightBuffer), bo->getData(), 0, bo->getData()->getTotalDataSize());
@@ -676,23 +674,23 @@ namespace SceneUtil
                     stateset->setAttributeAndModes(ubb, osg::StateAttribute::ON);
                 }
 
-                auto sun = mLightManager->getSunlight();
+                auto sun = node->getSunlight();
 
                 if (sun)
                 {
                     // we must defer uploading the transformation to view-space position to deal with different cameras (e.g. reflection RTT).
-                    if (mLightManager->getLightingMethod() == LightingMethod::PerObjectUniform)
+                    if (node->getLightingMethod() == LightingMethod::PerObjectUniform)
                     {
                         osg::Matrixf lightMat;
                         configurePosition(lightMat, sun->getPosition());
                         configureAmbient(lightMat, sun->getAmbient());
                         configureDiffuse(lightMat, sun->getDiffuse());
                         configureSpecular(lightMat, sun->getSpecular());
-                        mLightManager->setSunlightBuffer(lightMat, mLastFrameNumber);
+                        node->setSunlightBuffer(lightMat, mLastFrameNumber);
                     }
                     else
                     {
-                        auto buf = mLightManager->getLightBuffer(mLastFrameNumber);
+                        auto buf = node->getLightBuffer(mLastFrameNumber);
 
                         buf->setCachedSunPos(sun->getPosition());
                         buf->setAmbient(0, sun->getAmbient());
@@ -702,11 +700,10 @@ namespace SceneUtil
                 }
             }
 
-            traverse(node, nv);
+            traverse(node, cv);
         }
 
     private:
-        LightManager* mLightManager;
         size_t mLastFrameNumber;
     };
 
@@ -899,7 +896,7 @@ namespace SceneUtil
 
         getOrCreateStateSet()->addUniform(new osg::Uniform("PointLightCount", 0));
 
-        addCullCallback(new LightManagerCullCallback(this));
+        addCullCallback(new LightManagerCullCallback());
     }
 
     LightManager::LightManager(const LightManager &copy, const osg::CopyOp &copyop)
diff --git a/components/sceneutil/rtt.cpp b/components/sceneutil/rtt.cpp
index a661a90279..3b60c80afd 100644
--- a/components/sceneutil/rtt.cpp
+++ b/components/sceneutil/rtt.cpp
@@ -6,23 +6,19 @@
 #include <osg/Texture2D>
 #include <osgUtil/CullVisitor>
 
+#include <components/sceneutil/nodecallback.hpp>
 #include <components/settings/settings.hpp>
 
 namespace SceneUtil
 {
-    // RTTNode's cull callback
-    class CullCallback : public osg::NodeCallback
+    class CullCallback : public SceneUtil::NodeCallback<CullCallback, RTTNode*, osgUtil::CullVisitor*>
     {
     public:
-        CullCallback(RTTNode* group)
-            : mGroup(group) {}
 
-        void operator()(osg::Node* node, osg::NodeVisitor* nv) override
+        void operator()(RTTNode* node, osgUtil::CullVisitor* cv)
         {
-            osgUtil::CullVisitor* cv = static_cast<osgUtil::CullVisitor*>(nv);
-            mGroup->cull(cv);
+            node->cull(cv);
         }
-        RTTNode* mGroup;
     };
 
     RTTNode::RTTNode(uint32_t textureWidth, uint32_t textureHeight, int renderOrderNum, bool doPerViewMapping)
@@ -31,7 +27,7 @@ namespace SceneUtil
         , mRenderOrderNum(renderOrderNum)
         , mDoPerViewMapping(doPerViewMapping)
     {
-        addCullCallback(new CullCallback(this));
+        addCullCallback(new CullCallback);
         setCullingActive(false);
     }
 
diff --git a/components/sceneutil/statesetupdater.cpp b/components/sceneutil/statesetupdater.cpp
index a8232f938e..9ef82b9271 100644
--- a/components/sceneutil/statesetupdater.cpp
+++ b/components/sceneutil/statesetupdater.cpp
@@ -68,7 +68,7 @@ namespace SceneUtil
     }
 
     StateSetUpdater::StateSetUpdater(const StateSetUpdater &copy, const osg::CopyOp &copyop)
-        : osg::NodeCallback(copy, copyop)
+        : SceneUtil::NodeCallback<StateSetUpdater>(copy, copyop)
     {
     }
 
diff --git a/components/sceneutil/statesetupdater.hpp b/components/sceneutil/statesetupdater.hpp
index 263f76ae54..ab091fd39f 100644
--- a/components/sceneutil/statesetupdater.hpp
+++ b/components/sceneutil/statesetupdater.hpp
@@ -1,7 +1,7 @@
 #ifndef OPENMW_COMPONENTS_SCENEUTIL_STATESETCONTROLLER_H
 #define OPENMW_COMPONENTS_SCENEUTIL_STATESETCONTROLLER_H
 
-#include <osg/NodeCallback>
+#include <components/sceneutil/nodecallback.hpp>
 
 #include <map>
 #include <array>
@@ -28,7 +28,7 @@ namespace SceneUtil
     /// @note When used as a CullCallback, StateSetUpdater will have no effect on leaf nodes such as osg::Geometry and must be used on branch nodes only.
     /// @note Do not add the same StateSetUpdater to multiple nodes.
     /// @note Do not add multiple StateSetUpdaters on the same Node as they will conflict - instead use the CompositeStateSetUpdater.
-    class StateSetUpdater : public osg::NodeCallback
+    class StateSetUpdater : public SceneUtil::NodeCallback<StateSetUpdater>
     {
     public:
         StateSetUpdater();
@@ -36,7 +36,7 @@ namespace SceneUtil
 
         META_Object(SceneUtil, StateSetUpdater)
 
-        void operator()(osg::Node* node, osg::NodeVisitor* nv) override;
+        void operator()(osg::Node* node, osg::NodeVisitor* nv);
 
         /// Apply state - to override in derived classes
         /// @note Due to the double buffering approach you *have* to apply all state
diff --git a/components/sceneutil/util.cpp b/components/sceneutil/util.cpp
index 442b164981..5c2f8c2934 100644
--- a/components/sceneutil/util.cpp
+++ b/components/sceneutil/util.cpp
@@ -19,6 +19,7 @@
 #include <components/resource/scenemanager.hpp>
 #include <components/settings/settings.hpp>
 #include <components/debug/debuglog.hpp>
+#include <components/sceneutil/nodecallback.hpp>
 
 #ifndef GL_DEPTH32F_STENCIL8_NV
 #define GL_DEPTH32F_STENCIL8_NV 0x8DAC
@@ -174,8 +175,7 @@ void GlowUpdater::setDuration(float duration)
 }
 
 // Allows camera to render to a color and floating point depth texture with a multisampled framebuffer.
-// Must be set on a camera's cull callback.
-class AttachMultisampledDepthColorCallback : public osg::NodeCallback
+class AttachMultisampledDepthColorCallback : public SceneUtil::NodeCallback<AttachMultisampledDepthColorCallback, osg::Node*, osgUtil::CullVisitor*>
 {
 public:
     AttachMultisampledDepthColorCallback(osg::Texture2D* colorTex, osg::Texture2D* depthTex, int samples, int colorSamples)
@@ -195,14 +195,14 @@ public:
         mFbo->setAttachment(osg::Camera::DEPTH_BUFFER, osg::FrameBufferAttachment(depthTex));
     }
 
-    void operator()(osg::Node* node, osg::NodeVisitor* nv) override
+    void operator()(osg::Node* node, osgUtil::CullVisitor* cv)
     {
-        osgUtil::RenderStage* renderStage = static_cast<osgUtil::CullVisitor*>(nv)->getCurrentRenderStage();
+        osgUtil::RenderStage* renderStage = cv->getCurrentRenderStage();
 
         renderStage->setMultisampleResolveFramebufferObject(mFbo);
         renderStage->setFrameBufferObject(mMsaaFbo);
 
-        traverse(node, nv);
+        traverse(node, cv);
     }
 
 private:
diff --git a/components/sceneutil/util.hpp b/components/sceneutil/util.hpp
index 0bca32c325..4d19714d66 100644
--- a/components/sceneutil/util.hpp
+++ b/components/sceneutil/util.hpp
@@ -4,7 +4,6 @@
 #include <osg/Matrix>
 #include <osg/BoundingSphere>
 #include <osg/Camera>
-#include <osg/NodeCallback>
 #include <osg/Texture2D>
 #include <osg/Vec4f>
 #include <osg/Depth>
diff --git a/components/terrain/world.hpp b/components/terrain/world.hpp
index 8d60e4c5b6..def7a2eccf 100644
--- a/components/terrain/world.hpp
+++ b/components/terrain/world.hpp
@@ -4,13 +4,14 @@
 #include <osg/ref_ptr>
 #include <osg/Referenced>
 #include <osg/Vec3f>
-#include <osg/NodeCallback>
 
 #include <atomic>
 #include <limits>
 #include <memory>
 #include <set>
 
+#include <components/sceneutil/nodecallback.hpp>
+
 #include "defs.hpp"
 #include "cellborder.hpp"
 
@@ -45,7 +46,7 @@ namespace Terrain
     class ChunkManager;
     class CompositeMapRenderer;
 
-    class HeightCullCallback : public osg::NodeCallback
+    class HeightCullCallback : public SceneUtil::NodeCallback<HeightCullCallback>
     {
     public:
         void setLowZ(float z)
@@ -75,7 +76,7 @@ namespace Terrain
             return mMask;
         }
 
-        void operator()(osg::Node* node, osg::NodeVisitor* nv) override
+        void operator()(osg::Node* node, osg::NodeVisitor* nv)
         {
             if (mLowZ <= mHighZ)
                 traverse(node, nv);

From 4b1c009ffd5ed0d0698b967c29edf0d6c912ea92 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Tue, 5 Oct 2021 12:37:08 +0000
Subject: [PATCH 1418/2859] use StateSet define for translucentFramebuffer
 (#3138)

With this PR we test out osg's shader define system for a somewhat harmless feature. As we can see, our code becomes more concise and efficient in this case. Most importantly, we no longer create unneeded vertex shader objects.
---
 apps/openmw/mwrender/characterpreview.cpp |  9 +++------
 apps/openmw/mwrender/groundcover.cpp      |  2 +-
 components/resource/scenemanager.cpp      |  7 +++----
 components/resource/scenemanager.hpp      |  4 ++--
 components/shader/shadervisitor.cpp       | 10 +---------
 components/shader/shadervisitor.hpp       |  4 ----
 files/shaders/nv_default_fragment.glsl    |  9 ++++-----
 files/shaders/nv_nolighting_fragment.glsl |  8 +++-----
 files/shaders/objects_fragment.glsl       |  7 +++----
 9 files changed, 20 insertions(+), 40 deletions(-)

diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index 51e5a536f7..a9733cddf8 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -91,7 +91,7 @@ namespace MWRender
     class SetUpBlendVisitor : public osg::NodeVisitor
     {
     public:
-        SetUpBlendVisitor(): osg::NodeVisitor(TRAVERSE_ALL_CHILDREN), mNoAlphaUniform(new osg::Uniform("noAlpha", false))
+        SetUpBlendVisitor(): osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
         {
         }
 
@@ -130,7 +130,7 @@ namespace MWRender
                     }
                     // Disable noBlendAlphaEnv
                     newStateSet->setTextureMode(7, GL_TEXTURE_2D, osg::StateAttribute::OFF);
-                    newStateSet->addUniform(mNoAlphaUniform);
+                    newStateSet->setDefine("FORCE_OPAQUE", "0", osg::StateAttribute::ON);
                 }
                 if (SceneUtil::getReverseZ() && stateset->getAttribute(osg::StateAttribute::DEPTH))
                 {
@@ -172,8 +172,6 @@ namespace MWRender
             }
             traverse(node);
         }
-    private:
-        osg::ref_ptr<osg::Uniform> mNoAlphaUniform;
     };
 
     CharacterPreview::CharacterPreview(osg::Group* parent, Resource::ResourceSystem* resourceSystem,
@@ -216,6 +214,7 @@ namespace MWRender
         osg::ref_ptr<SceneUtil::LightManager> lightManager = new SceneUtil::LightManager(ffp);
         lightManager->setStartLight(1);
         osg::ref_ptr<osg::StateSet> stateset = lightManager->getOrCreateStateSet();
+        stateset->setDefine("FORCE_OPAQUE", "1", osg::StateAttribute::ON);
         stateset->setMode(GL_LIGHTING, osg::StateAttribute::ON);
         stateset->setMode(GL_NORMALIZE, osg::StateAttribute::ON);
         stateset->setMode(GL_CULL_FACE, osg::StateAttribute::ON);
@@ -253,7 +252,6 @@ namespace MWRender
         dummyTexture->setShadowCompareFunc(osg::Texture::ShadowCompareFunc::ALWAYS);
         stateset->setTextureAttributeAndModes(7, dummyTexture, osg::StateAttribute::ON);
         stateset->setTextureAttribute(7, noBlendAlphaEnv, osg::StateAttribute::ON);
-        stateset->addUniform(new osg::Uniform("noAlpha", true));
 
         osg::ref_ptr<osg::LightModel> lightmodel = new osg::LightModel;
         lightmodel->setAmbientIntensity(osg::Vec4(0.0, 0.0, 0.0, 1.0));
@@ -328,7 +326,6 @@ namespace MWRender
 
     void CharacterPreview::setBlendMode()
     {
-        mResourceSystem->getSceneManager()->recreateShaders(mNode, "objects", true);
         SetUpBlendVisitor visitor;
         mNode->accept(visitor);
     }
diff --git a/apps/openmw/mwrender/groundcover.cpp b/apps/openmw/mwrender/groundcover.cpp
index 71bddb1f9d..77c4f0fab5 100644
--- a/apps/openmw/mwrender/groundcover.cpp
+++ b/apps/openmw/mwrender/groundcover.cpp
@@ -224,7 +224,7 @@ namespace MWRender
         group->setNodeMask(Mask_Groundcover);
         if (mSceneManager->getLightingMethod() != SceneUtil::LightingMethod::FFP)
             group->setCullCallback(new SceneUtil::LightListCallback);
-        mSceneManager->recreateShaders(group, "groundcover", false, true, mProgramTemplate);
+        mSceneManager->recreateShaders(group, "groundcover", true, mProgramTemplate);
         mSceneManager->shareState(group);
         group->getBound();
         return group;
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 7c730b24a7..c5ef957c3e 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -331,9 +331,9 @@ namespace Resource
         return mForceShaders;
     }
 
-    void SceneManager::recreateShaders(osg::ref_ptr<osg::Node> node, const std::string& shaderPrefix, bool translucentFramebuffer, bool forceShadersForNode, const osg::Program* programTemplate)
+    void SceneManager::recreateShaders(osg::ref_ptr<osg::Node> node, const std::string& shaderPrefix, bool forceShadersForNode, const osg::Program* programTemplate)
     {
-        osg::ref_ptr<Shader::ShaderVisitor> shaderVisitor(createShaderVisitor(shaderPrefix, translucentFramebuffer));
+        osg::ref_ptr<Shader::ShaderVisitor> shaderVisitor(createShaderVisitor(shaderPrefix));
         shaderVisitor->setAllowedToModifyStateSets(false);
         shaderVisitor->setProgramTemplate(programTemplate);
         if (forceShadersForNode)
@@ -871,7 +871,7 @@ namespace Resource
         stats->setAttribute(frameNumber, "Node", mCache->getCacheSize());
     }
 
-    Shader::ShaderVisitor *SceneManager::createShaderVisitor(const std::string& shaderPrefix, bool translucentFramebuffer)
+    Shader::ShaderVisitor *SceneManager::createShaderVisitor(const std::string& shaderPrefix)
     {
         Shader::ShaderVisitor* shaderVisitor = new Shader::ShaderVisitor(*mShaderManager.get(), *mImageManager, shaderPrefix);
         shaderVisitor->setForceShaders(mForceShaders);
@@ -882,7 +882,6 @@ namespace Resource
         shaderVisitor->setSpecularMapPattern(mSpecularMapPattern);
         shaderVisitor->setApplyLightingToEnvMaps(mApplyLightingToEnvMaps);
         shaderVisitor->setConvertAlphaTestToAlphaToCoverage(mConvertAlphaTestToAlphaToCoverage);
-        shaderVisitor->setTranslucentFramebuffer(translucentFramebuffer);
         return shaderVisitor;
     }
 }
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index 1443476fd5..b5d3e453a0 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -76,7 +76,7 @@ namespace Resource
         Shader::ShaderManager& getShaderManager();
 
         /// Re-create shaders for this node, need to call this if alpha testing, texture stages or vertex color mode have changed.
-        void recreateShaders(osg::ref_ptr<osg::Node> node, const std::string& shaderPrefix = "objects", bool translucentFramebuffer = false, bool forceShadersForNode = false, const osg::Program* programTemplate = nullptr);
+        void recreateShaders(osg::ref_ptr<osg::Node> node, const std::string& shaderPrefix = "objects", bool forceShadersForNode = false, const osg::Program* programTemplate = nullptr);
 
         /// Applying shaders to a node may replace some fixed-function state.
         /// This restores it.
@@ -188,7 +188,7 @@ namespace Resource
 
     private:
 
-        Shader::ShaderVisitor* createShaderVisitor(const std::string& shaderPrefix = "objects", bool translucentFramebuffer = false);
+        Shader::ShaderVisitor* createShaderVisitor(const std::string& shaderPrefix = "objects");
 
         std::unique_ptr<Shader::ShaderManager> mShaderManager;
         bool mForceShaders;
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index cc2b781cfd..6709ee842e 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -111,7 +111,6 @@ namespace Shader
         , mAutoUseSpecularMaps(false)
         , mApplyLightingToEnvMaps(false)
         , mConvertAlphaTestToAlphaToCoverage(false)
-        , mTranslucentFramebuffer(false)
         , mShaderManager(shaderManager)
         , mImageManager(imageManager)
         , mDefaultShaderPrefix(defaultShaderPrefix)
@@ -266,7 +265,7 @@ namespace Shader
                                 mRequirements.back().mShaderRequired = true;
                             }
                         }
-                        else if (!mTranslucentFramebuffer)
+                        else
                             Log(Debug::Error) << "ShaderVisitor encountered unknown texture " << texture;
                     }
                 }
@@ -547,8 +546,6 @@ namespace Shader
             updateAddedState(*writableUserData, addedState);
         }
 
-        defineMap["translucentFramebuffer"] = mTranslucentFramebuffer ? "1" : "0";
-
         std::string shaderPrefix;
         if (!node.getUserValue("shaderPrefix", shaderPrefix))
             shaderPrefix = mDefaultShaderPrefix;
@@ -764,11 +761,6 @@ namespace Shader
         mConvertAlphaTestToAlphaToCoverage = convert;
     }
 
-    void ShaderVisitor::setTranslucentFramebuffer(bool translucent)
-    {
-        mTranslucentFramebuffer = translucent;
-    }
-
     ReinstateRemovedStateVisitor::ReinstateRemovedStateVisitor(bool allowedToModifyStateSets)
         : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
         , mAllowedToModifyStateSets(allowedToModifyStateSets)
diff --git a/components/shader/shadervisitor.hpp b/components/shader/shadervisitor.hpp
index 3380a66cca..5f9739ea90 100644
--- a/components/shader/shadervisitor.hpp
+++ b/components/shader/shadervisitor.hpp
@@ -45,8 +45,6 @@ namespace Shader
 
         void setConvertAlphaTestToAlphaToCoverage(bool convert);
 
-        void setTranslucentFramebuffer(bool translucent);
-
         void apply(osg::Node& node) override;
 
         void apply(osg::Drawable& drawable) override;
@@ -72,8 +70,6 @@ namespace Shader
 
         bool mConvertAlphaTestToAlphaToCoverage;
 
-        bool mTranslucentFramebuffer;
-
         ShaderManager& mShaderManager;
         Resource::ImageManager& mImageManager;
 
diff --git a/files/shaders/nv_default_fragment.glsl b/files/shaders/nv_default_fragment.glsl
index 1bd0f4e310..38dca66c40 100644
--- a/files/shaders/nv_default_fragment.glsl
+++ b/files/shaders/nv_default_fragment.glsl
@@ -1,4 +1,5 @@
 #version 120
+#pragma import_defines(FORCE_OPAQUE)
 
 #if @useUBO
     #extension GL_ARB_uniform_buffer_object : require
@@ -24,8 +25,6 @@ varying vec2 normalMapUV;
 varying vec4 passTangent;
 #endif
 
-uniform bool noAlpha;
-
 varying float euclideanDepth;
 varying float linearDepth;
 
@@ -95,9 +94,9 @@ void main()
 #endif
     gl_FragData[0].xyz = mix(gl_FragData[0].xyz, gl_Fog.color.xyz, fogValue);
 
-#if @translucentFramebuffer
-    if (noAlpha)
-        gl_FragData[0].a = 1.0;
+#if FORCE_OPAQUE
+    // having testing & blending isn't enough - we need to write an opaque pixel to be opaque
+    gl_FragData[0].a = 1.0;
 #endif
 
     applyShadowDebugOverlay();
diff --git a/files/shaders/nv_nolighting_fragment.glsl b/files/shaders/nv_nolighting_fragment.glsl
index 27679a069f..76b01828d6 100644
--- a/files/shaders/nv_nolighting_fragment.glsl
+++ b/files/shaders/nv_nolighting_fragment.glsl
@@ -1,4 +1,5 @@
 #version 120
+#pragma import_defines(FORCE_OPAQUE)
 
 #if @useGPUShader4
     #extension GL_EXT_gpu_shader4: require
@@ -9,8 +10,6 @@ uniform sampler2D diffuseMap;
 varying vec2 diffuseMapUV;
 #endif
 
-uniform bool noAlpha;
-
 #if @radialFog
 varying float euclideanDepth;
 #else
@@ -46,9 +45,8 @@ void main()
     float fogValue = clamp((linearDepth - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);
 #endif
 
-#if @translucentFramebuffer
-    if (noAlpha)
-        gl_FragData[0].a = 1.0;
+#if FORCE_OPAQUE
+    gl_FragData[0].a = 1.0;
 #endif
 
     gl_FragData[0].xyz = mix(gl_FragData[0].xyz, gl_Fog.color.xyz, fogValue);
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index d304b2abe8..c343b6a189 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -1,4 +1,5 @@
 #version 120
+#pragma import_defines(FORCE_OPAQUE)
 
 #if @useUBO
     #extension GL_ARB_uniform_buffer_object : require
@@ -58,7 +59,6 @@ uniform mat2 bumpMapMatrix;
 #endif
 
 uniform bool simpleWater;
-uniform bool noAlpha;
 
 varying float euclideanDepth;
 varying float linearDepth;
@@ -220,10 +220,9 @@ void main()
 #endif
     gl_FragData[0].xyz = mix(gl_FragData[0].xyz, gl_Fog.color.xyz, fogValue);
 
-#if @translucentFramebuffer
+#if FORCE_OPAQUE
     // having testing & blending isn't enough - we need to write an opaque pixel to be opaque
-    if (noAlpha)
-        gl_FragData[0].a = 1.0;
+    gl_FragData[0].a = 1.0;
 #endif
 
     applyShadowDebugOverlay();

From 499b161e7bab9f11857e7bd347546ba1963c3fb1 Mon Sep 17 00:00:00 2001
From: Frederic Chardon <chardon.frederic@gmail.com>
Date: Sat, 25 Sep 2021 16:06:30 +0200
Subject: [PATCH 1419/2859] Merge handleFall() and updateMechanics() into
 updateActor(). It remove gratuitious differences between sync and async
 cases. Also, it will make the after simulation update logic easier to follow
 when projectiles move into the simulation thread.

---
 apps/openmw/mwphysics/mtphysics.cpp     | 48 +++++++------------------
 apps/openmw/mwphysics/physicssystem.cpp |  2 --
 apps/openmw/mwphysics/physicssystem.hpp |  2 --
 3 files changed, 13 insertions(+), 39 deletions(-)

diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 7363b9964a..bb5447341b 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -54,29 +54,6 @@ namespace
         return actorData.mPosition.z() < actorData.mSwimLevel;
     }
 
-    void handleFall(MWPhysics::ActorFrameData& actorData, bool simulationPerformed)
-    {
-        const float heightDiff = actorData.mPosition.z() - actorData.mOldHeight;
-
-        const bool isStillOnGround = (simulationPerformed && actorData.mWasOnGround && actorData.mIsOnGround);
-
-        if (isStillOnGround || actorData.mFlying || isUnderWater(actorData) || actorData.mSlowFall < 1)
-            actorData.mNeedLand = true;
-        else if (heightDiff < 0)
-            actorData.mFallHeight += heightDiff;
-    }
-
-    void updateMechanics(MWPhysics::Actor& actor, MWPhysics::ActorFrameData& actorData)
-    {
-        auto ptr = actor.getPtr();
-
-        MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
-        if (actorData.mNeedLand)
-            stats.land(ptr == MWMechanics::getPlayer() && (actorData.mFlying || isUnderWater(actorData)));
-        else if (actorData.mFallHeight < 0)
-            stats.addToFallHeight(-actorData.mFallHeight);
-    }
-
     osg::Vec3f interpolateMovements(MWPhysics::Actor& actor, MWPhysics::ActorFrameData& actorData, float timeAccum, float physicsDt)
     {
         const float interpolationFactor = std::clamp(timeAccum / physicsDt, 0.0f, 1.0f);
@@ -221,10 +198,8 @@ namespace MWPhysics
         if (mNumThreads != 0)
         {
             for (size_t i = 0; i < mActors.size(); ++i)
-            {
-                updateMechanics(*mActors[i], mActorsFrameData[i]);
                 updateActor(*mActors[i], mActorsFrameData[i], mAdvanceSimulation, mTimeAccum, mPhysicsDt);
-            }
+
             if(mAdvanceSimulation)
                 mAsyncBudget.update(mTimer->delta_s(mAsyncStartTime, mTimeEnd), mPrevStepCount, mBudgetCursor);
             updateStats(frameStart, frameNumber, stats);
@@ -449,11 +424,6 @@ namespace MWPhysics
 
             if (!mRemainingSteps)
             {
-                while ((job = mNextJob.fetch_add(1, std::memory_order_relaxed)) < mNumJobs)
-                {
-                    handleFall(mActorsFrameData[job], mAdvanceSimulation);
-                }
-
                 refreshLOSCache();
                 mPostSimBarrier->wait([this] { afterPostSim(); });
             }
@@ -476,6 +446,17 @@ namespace MWPhysics
 
     void PhysicsTaskScheduler::updateActor(Actor& actor, ActorFrameData& actorData, bool simulationPerformed, float timeAccum, float dt) const
     {
+        auto ptr = actor.getPtr();
+
+        MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
+        const float heightDiff = actorData.mPosition.z() - actorData.mOldHeight;
+        const bool isStillOnGround = (simulationPerformed && actorData.mWasOnGround && actorData.mIsOnGround);
+
+        if (isStillOnGround || actorData.mFlying || isUnderWater(actorData) || actorData.mSlowFall < 1)
+            stats.land(ptr == MWMechanics::getPlayer() && (actorData.mFlying || isUnderWater(actorData)));
+        else if (heightDiff < 0)
+            stats.addToFallHeight(-heightDiff);
+
         actor.setSimulationPosition(interpolateMovements(actor, actorData, timeAccum, dt));
         actor.setLastStuckPosition(actorData.mLastStuckPosition);
         actor.setStuckFrames(actorData.mStuckFrames);
@@ -524,11 +505,8 @@ namespace MWPhysics
         }
 
         for (size_t i = 0; i < mActors.size(); ++i)
-        {
-            handleFall(mActorsFrameData[i], mAdvanceSimulation);
-            updateMechanics(*mActors[i], mActorsFrameData[i]);
             updateActor(*mActors[i], mActorsFrameData[i], mAdvanceSimulation, mTimeAccum, mPhysicsDt);
-        }
+
         refreshLOSCache();
     }
 
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index a8c39efee2..6b2600069a 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -978,14 +978,12 @@ namespace MWPhysics
         , mWaterlevel(waterlevel)
         , mHalfExtentsZ(actor.getHalfExtents().z())
         , mOldHeight(0)
-        , mFallHeight(0)
         , mStuckFrames(0)
         , mFlying(MWBase::Environment::get().getWorld()->isFlying(actor.getPtr()))
         , mWasOnGround(actor.getOnGround())
         , mIsAquatic(actor.getPtr().getClass().isPureWaterCreature(actor.getPtr()))
         , mWaterCollision(waterCollision)
         , mSkipCollisionDetection(actor.skipCollisions() || !actor.getCollisionMode())
-        , mNeedLand(false)
     {
     }
 
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 4fb7a3518f..cf4ca40a54 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -97,14 +97,12 @@ namespace MWPhysics
         const float mWaterlevel;
         const float mHalfExtentsZ;
         float mOldHeight;
-        float mFallHeight;
         unsigned int mStuckFrames;
         const bool mFlying;
         const bool mWasOnGround;
         const bool mIsAquatic;
         const bool mWaterCollision;
         const bool mSkipCollisionDetection;
-        bool mNeedLand;
     };
 
     struct WorldFrameData

From 21dbe314bf3e487975becd35e6ae8ae3af7916b3 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Wed, 29 Sep 2021 10:17:31 +0200
Subject: [PATCH 1420/2859] Use common function for sync and async case. Now
 both cases follow the same flow, synchronous simulation is just a special
 case.

---
 apps/openmw/mwphysics/mtphysics.cpp | 80 +++++++++++++----------------
 apps/openmw/mwphysics/mtphysics.hpp |  4 +-
 components/misc/barrier.hpp         | 15 +++---
 3 files changed, 46 insertions(+), 53 deletions(-)

diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index bb5447341b..ecf1e6dadd 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -22,31 +22,31 @@
 
 namespace
 {
-    /// @brief A scoped lock that is either shared or exclusive depending on configuration
+    /// @brief A scoped lock that is either shared, exclusive or inexistent depending on configuration
     template<class Mutex>
     class MaybeSharedLock
     {
         public:
             /// @param mutex a shared mutex
-            /// @param canBeSharedLock decide wether the lock will be shared or exclusive
-            MaybeSharedLock(Mutex& mutex, bool canBeSharedLock) : mMutex(mutex), mCanBeSharedLock(canBeSharedLock)
+            /// @param threadCount decide wether the lock will be shared, exclusive or inexistent
+            MaybeSharedLock(Mutex& mutex, int threadCount) : mMutex(mutex), mThreadCount(threadCount)
             {
-                if (mCanBeSharedLock)
+                if (mThreadCount > 1)
                     mMutex.lock_shared();
-                else
+                else if(mThreadCount == 1)
                     mMutex.lock();
             }
 
             ~MaybeSharedLock()
             {
-                if (mCanBeSharedLock)
+                if (mThreadCount > 1)
                     mMutex.unlock_shared();
-                else
+                else if(mThreadCount == 1)
                     mMutex.unlock();
             }
         private:
             Mutex& mMutex;
-            bool mCanBeSharedLock;
+            int mThreadCount;
     };
 
     bool isUnderWater(const MWPhysics::ActorFrameData& actorData)
@@ -62,14 +62,14 @@ namespace
 
     namespace Config
     {
-        /// @return either the number of thread as configured by the user, or 1 if Bullet doesn't support multithreading
-        int computeNumThreads(bool& threadSafeBullet)
+        /// @return either the number of thread as configured by the user, or 1 if Bullet doesn't support multithreading and user requested more than 1 background threads
+        int computeNumThreads()
         {
             int wantedThread = Settings::Manager::getInt("async num threads", "Physics");
 
             auto broad = std::make_unique<btDbvtBroadphase>();
             auto maxSupportedThreads = broad->m_rayTestStacks.size();
-            threadSafeBullet = (maxSupportedThreads > 1);
+            auto threadSafeBullet = (maxSupportedThreads > 1);
             if (!threadSafeBullet && wantedThread > 1)
             {
                 Log(Debug::Warning) << "Bullet was not compiled with multithreading support, 1 async thread will be used";
@@ -88,6 +88,7 @@ namespace MWPhysics
           , mTimeAccum(0.f)
           , mCollisionWorld(collisionWorld)
           , mDebugDrawer(debugDrawer)
+          , mNumThreads(Config::computeNumThreads())
           , mNumJobs(0)
           , mRemainingSteps(0)
           , mLOSCacheExpiry(Settings::Manager::getInt("lineofsight keep inactive cache", "Physics"))
@@ -107,8 +108,6 @@ namespace MWPhysics
           , mTimeEnd(0)
           , mFrameStart(0)
     {
-        mNumThreads = Config::computeNumThreads(mThreadSafeBullet);
-
         if (mNumThreads >= 1)
         {
             for (int i = 0; i < mNumThreads; ++i)
@@ -197,8 +196,7 @@ namespace MWPhysics
         // start by finishing previous background computation
         if (mNumThreads != 0)
         {
-            for (size_t i = 0; i < mActors.size(); ++i)
-                updateActor(*mActors[i], mActorsFrameData[i], mAdvanceSimulation, mTimeAccum, mPhysicsDt);
+            syncWithMainThread();
 
             if(mAdvanceSimulation)
                 mAsyncBudget.update(mTimer->delta_s(mAsyncStartTime, mTimeEnd), mPrevStepCount, mBudgetCursor);
@@ -233,7 +231,8 @@ namespace MWPhysics
 
         if (mNumThreads == 0)
         {
-            syncComputation();
+            doSimulation();
+            syncWithMainThread();
             if(mAdvanceSimulation)
                 mBudget.update(mTimer->delta_s(timeStart, mTimer->tick()), numSteps, mBudgetCursor);
             return;
@@ -262,13 +261,13 @@ namespace MWPhysics
 
     void PhysicsTaskScheduler::rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, btCollisionWorld::RayResultCallback& resultCallback) const
     {
-        MaybeSharedLock lock(mCollisionWorldMutex, mThreadSafeBullet);
+        MaybeSharedLock lock(mCollisionWorldMutex, mNumThreads);
         mCollisionWorld->rayTest(rayFromWorld, rayToWorld, resultCallback);
     }
 
     void PhysicsTaskScheduler::convexSweepTest(const btConvexShape* castShape, const btTransform& from, const btTransform& to, btCollisionWorld::ConvexResultCallback& resultCallback) const
     {
-        MaybeSharedLock lock(mCollisionWorldMutex, mThreadSafeBullet);
+        MaybeSharedLock lock(mCollisionWorldMutex, mNumThreads);
         mCollisionWorld->convexSweepTest(castShape, from, to, resultCallback);
     }
 
@@ -280,7 +279,7 @@ namespace MWPhysics
 
     std::optional<btVector3> PhysicsTaskScheduler::getHitPoint(const btTransform& from, btCollisionObject* target)
     {
-        MaybeSharedLock lock(mCollisionWorldMutex, mThreadSafeBullet);
+        MaybeSharedLock lock(mCollisionWorldMutex, mNumThreads);
         // target the collision object's world origin, this should be the center of the collision object
         btTransform rayTo;
         rayTo.setIdentity();
@@ -411,22 +410,7 @@ namespace MWPhysics
             if (!mNewFrame)
                 mHasJob.wait(lock, [&]() { return mQuit || mNewFrame; });
 
-            mPreStepBarrier->wait([this] { afterPreStep(); });
-
-            int job = 0;
-            while (mRemainingSteps && (job = mNextJob.fetch_add(1, std::memory_order_relaxed)) < mNumJobs)
-            {
-                MaybeSharedLock lockColWorld(mCollisionWorldMutex, mThreadSafeBullet);
-                MovementSolver::move(mActorsFrameData[job], mPhysicsDt, mCollisionWorld, *mWorldFrameData);
-            }
-
-            mPostStepBarrier->wait([this] { afterPostStep(); });
-
-            if (!mRemainingSteps)
-            {
-                refreshLOSCache();
-                mPostSimBarrier->wait([this] { afterPostSim(); });
-            }
+            doSimulation();
         }
     }
 
@@ -485,29 +469,29 @@ namespace MWPhysics
         resultCallback.m_collisionFilterGroup = 0xFF;
         resultCallback.m_collisionFilterMask = CollisionType_World|CollisionType_HeightMap|CollisionType_Door;
 
-        MaybeSharedLock lockColWorld(mCollisionWorldMutex, mThreadSafeBullet);
+        MaybeSharedLock lockColWorld(mCollisionWorldMutex, mNumThreads);
         mCollisionWorld->rayTest(pos1, pos2, resultCallback);
 
         return !resultCallback.hasHit();
     }
 
-    void PhysicsTaskScheduler::syncComputation()
+    void PhysicsTaskScheduler::doSimulation()
     {
-        while (mRemainingSteps--)
+        while (mRemainingSteps)
         {
-            for (auto& actorData : mActorsFrameData)
+            mPreStepBarrier->wait([this] { afterPreStep(); });
+            int job = 0;
+            while ((job = mNextJob.fetch_add(1, std::memory_order_relaxed)) < mNumJobs)
             {
-                MovementSolver::unstuck(actorData, mCollisionWorld);
-                MovementSolver::move(actorData, mPhysicsDt, mCollisionWorld, *mWorldFrameData);
+                MaybeSharedLock lockColWorld(mCollisionWorldMutex, mNumThreads);
+                MovementSolver::move(mActorsFrameData[job], mPhysicsDt, mCollisionWorld, *mWorldFrameData);
             }
 
-            updateActorsPositions();
+            mPostStepBarrier->wait([this] { afterPostStep(); });
         }
 
-        for (size_t i = 0; i < mActors.size(); ++i)
-            updateActor(*mActors[i], mActorsFrameData[i], mAdvanceSimulation, mTimeAccum, mPhysicsDt);
-
         refreshLOSCache();
+        mPostSimBarrier->wait([this] { afterPostSim(); });
     }
 
     void PhysicsTaskScheduler::updateStats(osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
@@ -580,4 +564,10 @@ namespace MWPhysics
         }
         mTimeEnd = mTimer->tick();
     }
+
+    void PhysicsTaskScheduler::syncWithMainThread()
+    {
+        for (size_t i = 0; i < mActors.size(); ++i)
+            updateActor(*mActors[i], mActorsFrameData[i], mAdvanceSimulation, mTimeAccum, mPhysicsDt);
+    }
 }
diff --git a/apps/openmw/mwphysics/mtphysics.hpp b/apps/openmw/mwphysics/mtphysics.hpp
index e2cfccffb0..08997947e4 100644
--- a/apps/openmw/mwphysics/mtphysics.hpp
+++ b/apps/openmw/mwphysics/mtphysics.hpp
@@ -61,7 +61,7 @@ namespace MWPhysics
             void releaseSharedStates(); // destroy all objects whose destructor can't be safely called from ~PhysicsTaskScheduler()
 
         private:
-            void syncComputation();
+            void doSimulation();
             void worker();
             void updateActorsPositions();
             void updateActor(Actor& actor, ActorFrameData& actorData, bool simulationPerformed, float timeAccum, float dt) const;
@@ -74,6 +74,7 @@ namespace MWPhysics
             void afterPreStep();
             void afterPostStep();
             void afterPostSim();
+            void syncWithMainThread();
 
             std::unique_ptr<WorldFrameData> mWorldFrameData;
             std::vector<std::shared_ptr<Actor>> mActors;
@@ -98,7 +99,6 @@ namespace MWPhysics
             int mLOSCacheExpiry;
             bool mNewFrame;
             bool mAdvanceSimulation;
-            bool mThreadSafeBullet;
             bool mQuit;
             std::atomic<int> mNextJob;
             std::atomic<int> mNextLOS;
diff --git a/components/misc/barrier.hpp b/components/misc/barrier.hpp
index b3fe944b04..277e40814a 100644
--- a/components/misc/barrier.hpp
+++ b/components/misc/barrier.hpp
@@ -1,6 +1,7 @@
 #ifndef OPENMW_BARRIER_H
 #define OPENMW_BARRIER_H
 
+#include <cassert>
 #include <condition_variable>
 #include <mutex>
 
@@ -12,7 +13,9 @@ namespace Misc
         public:
             /// @param count number of threads to wait on
             explicit Barrier(int count) : mThreadCount(count), mRendezvousCount(0), mGeneration(0)
-            {}
+            {
+                assert(count >= 0);
+            }
 
             /// @brief stop execution of threads until count distinct threads reach this point
             /// @param func callable to be executed once after all threads have met
@@ -22,8 +25,8 @@ namespace Misc
                 std::unique_lock lock(mMutex);
 
                 ++mRendezvousCount;
-                const int currentGeneration = mGeneration;
-                if (mRendezvousCount == mThreadCount)
+                const unsigned int currentGeneration = mGeneration;
+                if (mRendezvousCount == mThreadCount || mThreadCount == 0)
                 {
                     ++mGeneration;
                     mRendezvousCount = 0;
@@ -37,9 +40,9 @@ namespace Misc
             }
 
         private:
-            int mThreadCount;
-            int mRendezvousCount;
-            int mGeneration;
+            unsigned int mThreadCount;
+            unsigned int mRendezvousCount;
+            unsigned int mGeneration;
             mutable std::mutex mMutex;
             std::condition_variable mRendezvous;
     };

From 3b174d72d85688fa7355ca5ae2cadc5af09378b3 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Tue, 5 Oct 2021 15:43:21 +0200
Subject: [PATCH 1421/2859] Introduce 3 scoped mutex wrappers to allow to
 conditionally skip taking mutexes in synchronous case.

---
 apps/openmw/mwphysics/mtphysics.cpp | 115 ++++++++++++++++++++--------
 1 file changed, 83 insertions(+), 32 deletions(-)

diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index ecf1e6dadd..a0dde67c2e 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -22,22 +22,73 @@
 
 namespace
 {
-    /// @brief A scoped lock that is either shared, exclusive or inexistent depending on configuration
+    /// @brief A scoped lock that is either exclusive or inexistent depending on configuration
+    template<class Mutex>
+    class MaybeExclusiveLock
+    {
+        public:
+            /// @param mutex a mutex
+            /// @param threadCount decide wether the excluse lock will be taken
+            MaybeExclusiveLock(Mutex& mutex, int threadCount) : mMutex(mutex), mThreadCount(threadCount)
+            {
+                assert(threadCount >= 0);
+                if (mThreadCount > 0)
+                    mMutex.lock();
+            }
+
+            ~MaybeExclusiveLock()
+            {
+                if (mThreadCount > 0)
+                    mMutex.unlock();
+            }
+
+        private:
+            Mutex& mMutex;
+            unsigned int mThreadCount;
+    };
+
+    /// @brief A scoped lock that is either shared or inexistent depending on configuration
     template<class Mutex>
     class MaybeSharedLock
     {
         public:
             /// @param mutex a shared mutex
-            /// @param threadCount decide wether the lock will be shared, exclusive or inexistent
+            /// @param threadCount decide wether the shared lock will be taken
             MaybeSharedLock(Mutex& mutex, int threadCount) : mMutex(mutex), mThreadCount(threadCount)
             {
+                assert(threadCount >= 0);
+                if (mThreadCount > 0)
+                    mMutex.lock_shared();
+            }
+
+            ~MaybeSharedLock()
+            {
+                if (mThreadCount > 0)
+                    mMutex.unlock_shared();
+            }
+
+        private:
+            Mutex& mMutex;
+            unsigned int mThreadCount;
+    };
+
+    /// @brief A scoped lock that is either shared, exclusive or inexistent depending on configuration
+    template<class Mutex>
+    class MaybeLock
+    {
+        public:
+            /// @param mutex a shared mutex
+            /// @param threadCount decide wether the lock will be shared, exclusive or inexistent
+            MaybeLock(Mutex& mutex, int threadCount) : mMutex(mutex), mThreadCount(threadCount)
+            {
+                assert(threadCount >= 0);
                 if (mThreadCount > 1)
                     mMutex.lock_shared();
                 else if(mThreadCount == 1)
                     mMutex.lock();
             }
 
-            ~MaybeSharedLock()
+            ~MaybeLock()
             {
                 if (mThreadCount > 1)
                     mMutex.unlock_shared();
@@ -46,7 +97,7 @@ namespace
             }
         private:
             Mutex& mMutex;
-            int mThreadCount;
+            unsigned int mThreadCount;
     };
 
     bool isUnderWater(const MWPhysics::ActorFrameData& actorData)
@@ -127,11 +178,12 @@ namespace MWPhysics
 
     PhysicsTaskScheduler::~PhysicsTaskScheduler()
     {
-        std::unique_lock lock(mSimulationMutex);
-        mQuit = true;
-        mNumJobs = 0;
-        mRemainingSteps = 0;
-        lock.unlock();
+        {
+            MaybeExclusiveLock lock(mSimulationMutex, mNumThreads);
+            mQuit = true;
+            mNumJobs = 0;
+            mRemainingSteps = 0;
+        }
         mHasJob.notify_all();
         for (auto& thread : mThreads)
             thread.join();
@@ -188,7 +240,7 @@ namespace MWPhysics
         // This function run in the main thread.
         // While the mSimulationMutex is held, background physics threads can't run.
 
-        std::unique_lock lock(mSimulationMutex);
+        MaybeExclusiveLock lock(mSimulationMutex, mNumThreads);
         assert(actors.size() == actorsData.size());
 
         double timeStart = mTimer->tick();
@@ -239,7 +291,6 @@ namespace MWPhysics
         }
 
         mAsyncStartTime = mTimer->tick();
-        lock.unlock();
         mHasJob.notify_all();
         if (mAdvanceSimulation)
             mBudget.update(mTimer->delta_s(timeStart, mTimer->tick()), 1, mBudgetCursor);
@@ -247,7 +298,7 @@ namespace MWPhysics
 
     void PhysicsTaskScheduler::resetSimulation(const ActorMap& actors)
     {
-        std::unique_lock lock(mSimulationMutex);
+        MaybeExclusiveLock lock(mSimulationMutex, mNumThreads);
         mBudget.reset(mDefaultPhysicsDt);
         mAsyncBudget.reset(0.0f);
         mActors.clear();
@@ -261,25 +312,25 @@ namespace MWPhysics
 
     void PhysicsTaskScheduler::rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, btCollisionWorld::RayResultCallback& resultCallback) const
     {
-        MaybeSharedLock lock(mCollisionWorldMutex, mNumThreads);
+        MaybeLock lock(mCollisionWorldMutex, mNumThreads);
         mCollisionWorld->rayTest(rayFromWorld, rayToWorld, resultCallback);
     }
 
     void PhysicsTaskScheduler::convexSweepTest(const btConvexShape* castShape, const btTransform& from, const btTransform& to, btCollisionWorld::ConvexResultCallback& resultCallback) const
     {
-        MaybeSharedLock lock(mCollisionWorldMutex, mNumThreads);
+        MaybeLock lock(mCollisionWorldMutex, mNumThreads);
         mCollisionWorld->convexSweepTest(castShape, from, to, resultCallback);
     }
 
     void PhysicsTaskScheduler::contactTest(btCollisionObject* colObj, btCollisionWorld::ContactResultCallback& resultCallback)
     {
-        std::shared_lock lock(mCollisionWorldMutex);
+        MaybeSharedLock lock(mCollisionWorldMutex, mNumThreads);
         ContactTestWrapper::contactTest(mCollisionWorld, colObj, resultCallback);
     }
 
     std::optional<btVector3> PhysicsTaskScheduler::getHitPoint(const btTransform& from, btCollisionObject* target)
     {
-        MaybeSharedLock lock(mCollisionWorldMutex, mNumThreads);
+        MaybeLock lock(mCollisionWorldMutex, mNumThreads);
         // target the collision object's world origin, this should be the center of the collision object
         btTransform rayTo;
         rayTo.setIdentity();
@@ -296,33 +347,33 @@ namespace MWPhysics
 
     void PhysicsTaskScheduler::aabbTest(const btVector3& aabbMin, const btVector3& aabbMax, btBroadphaseAabbCallback& callback)
     {
-        std::shared_lock lock(mCollisionWorldMutex);
+        MaybeSharedLock lock(mCollisionWorldMutex, mNumThreads);
         mCollisionWorld->getBroadphase()->aabbTest(aabbMin, aabbMax, callback);
     }
 
     void PhysicsTaskScheduler::getAabb(const btCollisionObject* obj, btVector3& min, btVector3& max)
     {
-        std::shared_lock lock(mCollisionWorldMutex);
+        MaybeSharedLock lock(mCollisionWorldMutex, mNumThreads);
         obj->getCollisionShape()->getAabb(obj->getWorldTransform(), min, max);
     }
 
     void PhysicsTaskScheduler::setCollisionFilterMask(btCollisionObject* collisionObject, int collisionFilterMask)
     {
-        std::unique_lock lock(mCollisionWorldMutex);
+        MaybeExclusiveLock lock(mCollisionWorldMutex, mNumThreads);
         collisionObject->getBroadphaseHandle()->m_collisionFilterMask = collisionFilterMask;
     }
 
     void PhysicsTaskScheduler::addCollisionObject(btCollisionObject* collisionObject, int collisionFilterGroup, int collisionFilterMask)
     {
         mCollisionObjects.insert(collisionObject);
-        std::unique_lock lock(mCollisionWorldMutex);
+        MaybeExclusiveLock lock(mCollisionWorldMutex, mNumThreads);
         mCollisionWorld->addCollisionObject(collisionObject, collisionFilterGroup, collisionFilterMask);
     }
 
     void PhysicsTaskScheduler::removeCollisionObject(btCollisionObject* collisionObject)
     {
         mCollisionObjects.erase(collisionObject);
-        std::unique_lock lock(mCollisionWorldMutex);
+        MaybeExclusiveLock lock(mCollisionWorldMutex, mNumThreads);
         mCollisionWorld->removeCollisionObject(collisionObject);
     }
 
@@ -334,14 +385,14 @@ namespace MWPhysics
         }
         else
         {
-            std::unique_lock lock(mUpdateAabbMutex);
+            MaybeExclusiveLock lock(mUpdateAabbMutex, mNumThreads);
             mUpdateAabb.insert(std::move(ptr));
         }
     }
 
     bool PhysicsTaskScheduler::getLineOfSight(const std::shared_ptr<Actor>& actor1, const std::shared_ptr<Actor>& actor2)
     {
-        std::unique_lock lock(mLOSCacheMutex);
+        MaybeExclusiveLock lock(mLOSCacheMutex, mNumThreads);
 
         auto req = LOSRequest(actor1, actor2);
         auto result = std::find(mLOSCache.begin(), mLOSCache.end(), req);
@@ -357,7 +408,7 @@ namespace MWPhysics
 
     void PhysicsTaskScheduler::refreshLOSCache()
     {
-        std::shared_lock lock(mLOSCacheMutex);
+        MaybeSharedLock lock(mLOSCacheMutex, mNumThreads);
         int job = 0;
         int numLOS = mLOSCache.size();
         while ((job = mNextLOS.fetch_add(1, std::memory_order_relaxed)) < numLOS)
@@ -376,7 +427,7 @@ namespace MWPhysics
 
     void PhysicsTaskScheduler::updateAabbs()
     {
-        std::scoped_lock lock(mUpdateAabbMutex);
+        MaybeExclusiveLock lock(mUpdateAabbMutex, mNumThreads);
         std::for_each(mUpdateAabb.begin(), mUpdateAabb.end(),
             [this](const std::shared_ptr<PtrHolder>& ptr) { updatePtrAabb(ptr); });
         mUpdateAabb.clear();
@@ -384,7 +435,7 @@ namespace MWPhysics
 
     void PhysicsTaskScheduler::updatePtrAabb(const std::shared_ptr<PtrHolder>& ptr)
     {
-        std::scoped_lock lock(mCollisionWorldMutex);
+        MaybeExclusiveLock lock(mCollisionWorldMutex, mNumThreads);
         if (const auto actor = std::dynamic_pointer_cast<Actor>(ptr))
         {
             actor->updateCollisionObjectPosition();
@@ -420,7 +471,7 @@ namespace MWPhysics
         {
             if (mActors[i]->setPosition(mActorsFrameData[i].mPosition))
             {
-                std::scoped_lock lock(mCollisionWorldMutex);
+                MaybeExclusiveLock lock(mCollisionWorldMutex, mNumThreads);
                 mActorsFrameData[i].mPosition = mActors[i]->getPosition(); // account for potential position change made by script
                 mActors[i]->updateCollisionObjectPosition();
                 mCollisionWorld->updateSingleAabb(mActors[i]->getCollisionObject());
@@ -469,7 +520,7 @@ namespace MWPhysics
         resultCallback.m_collisionFilterGroup = 0xFF;
         resultCallback.m_collisionFilterMask = CollisionType_World|CollisionType_HeightMap|CollisionType_Door;
 
-        MaybeSharedLock lockColWorld(mCollisionWorldMutex, mNumThreads);
+        MaybeLock lockColWorld(mCollisionWorldMutex, mNumThreads);
         mCollisionWorld->rayTest(pos1, pos2, resultCallback);
 
         return !resultCallback.hasHit();
@@ -483,7 +534,7 @@ namespace MWPhysics
             int job = 0;
             while ((job = mNextJob.fetch_add(1, std::memory_order_relaxed)) < mNumJobs)
             {
-                MaybeSharedLock lockColWorld(mCollisionWorldMutex, mNumThreads);
+                MaybeLock lockColWorld(mCollisionWorldMutex, mNumThreads);
                 MovementSolver::move(mActorsFrameData[job], mPhysicsDt, mCollisionWorld, *mWorldFrameData);
             }
 
@@ -511,7 +562,7 @@ namespace MWPhysics
 
     void PhysicsTaskScheduler::debugDraw()
     {
-        std::shared_lock lock(mCollisionWorldMutex);
+        MaybeSharedLock lock(mCollisionWorldMutex, mNumThreads);
         mDebugDrawer->step();
     }
 
@@ -537,7 +588,7 @@ namespace MWPhysics
             return;
         for (size_t i = 0; i < mActors.size(); ++i)
         {
-            std::unique_lock lock(mCollisionWorldMutex);
+            MaybeExclusiveLock lock(mCollisionWorldMutex, mNumThreads);
             MovementSolver::unstuck(mActorsFrameData[i], mCollisionWorld);
         }
     }
@@ -556,7 +607,7 @@ namespace MWPhysics
     {
         mNewFrame = false;
         {
-            std::unique_lock lock(mLOSCacheMutex);
+            MaybeExclusiveLock lock(mLOSCacheMutex, mNumThreads);
             mLOSCache.erase(
                     std::remove_if(mLOSCache.begin(), mLOSCache.end(),
                         [](const LOSRequest& req) { return req.mStale; }),

From 442a0e84345bd30a332ba257d778064d213c4cc7 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Tue, 5 Oct 2021 14:00:30 +0000
Subject: [PATCH 1422/2859] avoids two transforms in sky.cpp (#3150)

As we discovered in #3148, `Transform` nodes and their low level equivalence `pushModelViewMatrix` are somewhat costly involving a `Matrix::invert` operation per frame.

With this PR we avoid one `Transform` node for sun flashes and avoid another `pushModelViewMatrix` call in case the sun is fully visible.
---
 apps/openmw/mwrender/sky.cpp | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index c2ed62ef87..dd62d6678b 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -81,15 +81,15 @@ namespace
         return mat;
     }
 
-    osg::ref_ptr<osg::Geometry> createTexturedQuad(int numUvSets=1)
+    osg::ref_ptr<osg::Geometry> createTexturedQuad(int numUvSets=1, float scale=1.f)
     {
         osg::ref_ptr<osg::Geometry> geom = new osg::Geometry;
 
         osg::ref_ptr<osg::Vec3Array> verts = new osg::Vec3Array;
-        verts->push_back(osg::Vec3f(-0.5, -0.5, 0));
-        verts->push_back(osg::Vec3f(-0.5, 0.5, 0));
-        verts->push_back(osg::Vec3f(0.5, 0.5, 0));
-        verts->push_back(osg::Vec3f(0.5, -0.5, 0));
+        verts->push_back(osg::Vec3f(-0.5*scale, -0.5*scale, 0));
+        verts->push_back(osg::Vec3f(-0.5*scale, 0.5*scale, 0));
+        verts->push_back(osg::Vec3f(0.5*scale, 0.5*scale, 0));
+        verts->push_back(osg::Vec3f(0.5*scale, -0.5*scale, 0));
 
         geom->setVertexArray(verts);
 
@@ -621,14 +621,13 @@ private:
         tex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
         tex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
 
-        osg::ref_ptr<osg::PositionAttitudeTransform> transform (new osg::PositionAttitudeTransform);
-        const float scale = 2.6f;
-        transform->setScale(osg::Vec3f(scale,scale,scale));
+        osg::ref_ptr<osg::Group> group (new osg::Group);
 
-        mTransform->addChild(transform);
+        mTransform->addChild(group);
 
-        osg::ref_ptr<osg::Geometry> geom = createTexturedQuad();
-        transform->addChild(geom);
+        const float scale = 2.6f;
+        osg::ref_ptr<osg::Geometry> geom = createTexturedQuad(1, scale);
+        group->addChild(geom);
 
         osg::StateSet* stateset = geom->getOrCreateStateSet();
 
@@ -637,7 +636,7 @@ private:
         stateset->setRenderBinDetails(RenderBin_SunGlare, "RenderBin");
         stateset->setNestRenderBins(false);
 
-        mSunFlashNode = transform;
+        mSunFlashNode = group;
 
         mSunFlashCallback = new SunFlashCallback(mOcclusionQueryVisiblePixels, mOcclusionQueryTotalPixels);
         mSunFlashNode->addCullCallback(mSunFlashCallback);
@@ -785,9 +784,11 @@ private:
                     stateset = new osg::StateSet;
                     stateset->setAttributeAndModes(mat, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
                 }
-
-                const float threshold = 0.6;
-                visibleRatio = visibleRatio * (1.f - threshold) + threshold;
+                else if (visibleRatio < 1.f)
+                {
+                    const float threshold = 0.6;
+                    visibleRatio = visibleRatio * (1.f - threshold) + threshold;
+                }
             }
 
             float scale = visibleRatio;
@@ -797,11 +798,13 @@ private:
                 // no traverse
                 return;
             }
+            else if (scale == 1.f)
+                traverse(node, cv);
             else
             {
                 osg::Matrix modelView = *cv->getModelViewMatrix();
 
-                modelView.preMultScale(osg::Vec3f(visibleRatio, visibleRatio, visibleRatio));
+                modelView.preMultScale(osg::Vec3f(scale, scale, scale));
 
                 if (stateset)
                     cv->pushStateSet(stateset);

From 40f18d6a8bdbf913be35d9ce1479a9712254ff77 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Tue, 5 Oct 2021 16:39:50 +0200
Subject: [PATCH 1423/2859] Update cmake.yml to modify cxxflags (#3151)

Use the same CXXFLAGS in Github Pipelines as we do in Gitlab Pipelines
---
 .github/workflows/cmake.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index f9375a3ba5..54966fdfb0 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -27,7 +27,7 @@ jobs:
         max-size: 1000M
 
     - name: Configure
-      run: cmake -S . -B . -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=./install -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+      run: cmake -S . -B . -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=./install -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_FLAGS='-Werror' -DCMAKE_CXX_FLAGS="-Werror -Wno-error=deprecated-declarations -Wno-error=nonnull -Wno-error=deprecated-copy"
 
     - name: Build
       run: cmake --build . --config ${{env.BUILD_TYPE}} --parallel 3

From ce54edf011c7a36f7a0fee5736d5593021f26472 Mon Sep 17 00:00:00 2001
From: Kindi <2538602-Kuyondo@users.noreply.gitlab.com>
Date: Tue, 5 Oct 2021 18:00:53 +0000
Subject: [PATCH 1424/2859] Update tradewindow.cpp Additional check

---
 apps/openmw/mwgui/tradewindow.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/openmw/mwgui/tradewindow.cpp b/apps/openmw/mwgui/tradewindow.cpp
index 48457ee6d9..8e08a417f8 100644
--- a/apps/openmw/mwgui/tradewindow.cpp
+++ b/apps/openmw/mwgui/tradewindow.cpp
@@ -265,6 +265,8 @@ namespace MWGui
         const MWWorld::Store<ESM::GameSetting> &gmst =
             MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
+        if (mTotalBalance->getValue() == 0) mCurrentBalance = 0;
+        
         // were there any items traded at all?
         const std::vector<ItemStack>& playerBought = playerItemModel->getItemsBorrowedToUs();
         const std::vector<ItemStack>& merchantBought = mTradeModel->getItemsBorrowedToUs();

From 035307b012f151260b98aa9de62f5d26da26bd4d Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 30 Sep 2021 03:48:47 +0200
Subject: [PATCH 1425/2859] Add tests for openmw options

In attempt to document current behaviour. Add commented out checks as desired
behaviour.
---
 apps/openmw/CMakeLists.txt                |   1 +
 apps/openmw/main.cpp                      | 106 +-----
 apps/openmw/options.cpp                   | 115 +++++++
 apps/openmw/options.hpp                   |  11 +
 apps/openmw_test_suite/CMakeLists.txt     |   3 +
 apps/openmw_test_suite/openmw/options.cpp | 379 ++++++++++++++++++++++
 components/files/configurationmanager.cpp |  35 +-
 components/files/configurationmanager.hpp |  17 +-
 8 files changed, 555 insertions(+), 112 deletions(-)
 create mode 100644 apps/openmw/options.cpp
 create mode 100644 apps/openmw/options.hpp
 create mode 100644 apps/openmw_test_suite/openmw/options.cpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 82a91699a9..ff89b2af7c 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -2,6 +2,7 @@
 set(GAME
     main.cpp
     engine.cpp
+    options.cpp
 
     ${CMAKE_SOURCE_DIR}/files/windows/openmw.rc
     ${CMAKE_SOURCE_DIR}/files/windows/openmw.exe.manifest
diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index de0fb0df03..d1f9fd1787 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -7,6 +7,7 @@
 #include <components/misc/rng.hpp>
 
 #include "engine.hpp"
+#include "options.hpp"
 
 #if defined(_WIN32)
 #ifndef WIN32_LEAN_AND_MEAN
@@ -39,108 +40,11 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     namespace bpo = boost::program_options;
     typedef std::vector<std::string> StringsVector;
 
-    bpo::options_description desc("Syntax: openmw <options>\nAllowed options");
-
-    desc.add_options()
-        ("help", "print help message")
-        ("version", "print version information and quit")
-
-        ("replace", bpo::value<Files::EscapeStringVector>()->default_value(Files::EscapeStringVector(), "")
-            ->multitoken()->composing(), "settings where the values from the current source should replace those from lower-priority sources instead of being appended")
-
-        ("data", bpo::value<Files::EscapePathContainer>()->default_value(Files::EscapePathContainer(), "data")
-            ->multitoken()->composing(), "set data directories (later directories have higher priority)")
-
-        ("data-local", bpo::value<Files::EscapePath>()->default_value(Files::EscapePath(), ""),
-            "set local data directory (highest priority)")
-
-        ("fallback-archive", bpo::value<Files::EscapeStringVector>()->default_value(Files::EscapeStringVector(), "fallback-archive")
-            ->multitoken()->composing(), "set fallback BSA archives (later archives have higher priority)")
-
-        ("resources", bpo::value<Files::EscapePath>()->default_value(Files::EscapePath(), "resources"),
-            "set resources directory")
-
-        ("start", bpo::value<Files::EscapeHashString>()->default_value(""),
-            "set initial cell")
-
-        ("content", bpo::value<Files::EscapeStringVector>()->default_value(Files::EscapeStringVector(), "")
-            ->multitoken()->composing(), "content file(s): esm/esp, or omwgame/omwaddon")
-
-        ("groundcover", bpo::value<Files::EscapeStringVector>()->default_value(Files::EscapeStringVector(), "")
-            ->multitoken()->composing(), "groundcover content file(s): esm/esp, or omwgame/omwaddon")
-
-        ("lua-scripts", bpo::value<Files::EscapeStringVector>()->default_value(Files::EscapeStringVector(), "")
-            ->multitoken()->composing(), "file(s) with a list of global Lua scripts: omwscripts")
-
-        ("no-sound", bpo::value<bool>()->implicit_value(true)
-            ->default_value(false), "disable all sounds")
-
-        ("script-all", bpo::value<bool>()->implicit_value(true)
-            ->default_value(false), "compile all scripts (excluding dialogue scripts) at startup")
-
-        ("script-all-dialogue", bpo::value<bool>()->implicit_value(true)
-            ->default_value(false), "compile all dialogue scripts at startup")
-
-        ("script-console", bpo::value<bool>()->implicit_value(true)
-            ->default_value(false), "enable console-only script functionality")
-
-        ("script-run", bpo::value<Files::EscapeHashString>()->default_value(""),
-            "select a file containing a list of console commands that is executed on startup")
-
-        ("script-warn", bpo::value<int>()->implicit_value (1)
-            ->default_value (1),
-            "handling of warnings when compiling scripts\n"
-            "\t0 - ignore warning\n"
-            "\t1 - show warning but consider script as correctly compiled anyway\n"
-            "\t2 - treat warnings as errors")
-
-        ("script-blacklist", bpo::value<Files::EscapeStringVector>()->default_value(Files::EscapeStringVector(), "")
-            ->multitoken()->composing(), "ignore the specified script (if the use of the blacklist is enabled)")
-
-        ("script-blacklist-use", bpo::value<bool>()->implicit_value(true)
-            ->default_value(true), "enable script blacklisting")
-
-        ("load-savegame", bpo::value<Files::EscapePath>()->default_value(Files::EscapePath(), ""),
-            "load a save game file on game startup (specify an absolute filename or a filename relative to the current working directory)")
-
-        ("skip-menu", bpo::value<bool>()->implicit_value(true)
-            ->default_value(false), "skip main menu on game startup")
-
-        ("new-game", bpo::value<bool>()->implicit_value(true)
-            ->default_value(false), "run new game sequence (ignored if skip-menu=0)")
-
-        ("fs-strict", bpo::value<bool>()->implicit_value(true)
-            ->default_value(false), "strict file system handling (no case folding)")
-
-        ("encoding", bpo::value<Files::EscapeHashString>()->
-            default_value("win1252"),
-            "Character encoding used in OpenMW game messages:\n"
-            "\n\twin1250 - Central and Eastern European such as Polish, Czech, Slovak, Hungarian, Slovene, Bosnian, Croatian, Serbian (Latin script), Romanian and Albanian languages\n"
-            "\n\twin1251 - Cyrillic alphabet such as Russian, Bulgarian, Serbian Cyrillic and other languages\n"
-            "\n\twin1252 - Western European (Latin) alphabet, used by default")
-
-        ("fallback", bpo::value<FallbackMap>()->default_value(FallbackMap(), "")
-            ->multitoken()->composing(), "fallback values")
-
-        ("no-grab", bpo::value<bool>()->implicit_value(true)->default_value(false), "Don't grab mouse cursor")
-
-        ("export-fonts", bpo::value<bool>()->implicit_value(true)
-            ->default_value(false), "Export Morrowind .fnt fonts to PNG image and XML file in current directory")
-
-        ("activate-dist", bpo::value <int> ()->default_value (-1), "activation distance override")
-
-        ("random-seed", bpo::value <unsigned int> ()
-            ->default_value(Misc::Rng::generateDefaultSeed()),
-            "seed value for random number generator")
-    ;
-
-    bpo::parsed_options valid_opts = bpo::command_line_parser(argc, argv)
-        .options(desc).allow_unregistered().run();
+    bpo::options_description desc = OpenMW::makeOptionsDescription();
 
     bpo::variables_map variables;
 
-    // Runtime options override settings from all configs
-    bpo::store(valid_opts, variables);
+    Files::parseArgs(argc, argv, variables, desc);
     bpo::notify(variables);
 
     if (variables.count ("help"))
@@ -158,9 +62,9 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
         return false;
     }
 
-    bpo::variables_map composingVariables = cfgMgr.separateComposingVariables(variables, desc);
+    bpo::variables_map composingVariables = Files::separateComposingVariables(variables, desc);
     cfgMgr.readConfiguration(variables, desc);
-    cfgMgr.mergeComposingVariables(variables, composingVariables, desc);
+    Files::mergeComposingVariables(variables, composingVariables, desc);
 
     Version::Version v = Version::getOpenmwVersion(variables["resources"].as<Files::EscapePath>().mPath.string());
     Log(Debug::Info) << v.describe();
diff --git a/apps/openmw/options.cpp b/apps/openmw/options.cpp
new file mode 100644
index 0000000000..62ea0910dd
--- /dev/null
+++ b/apps/openmw/options.cpp
@@ -0,0 +1,115 @@
+#include "options.hpp"
+
+#include <components/fallback/validate.hpp>
+#include <components/files/escape.hpp>
+#include <components/misc/rng.hpp>
+
+#include <boost/program_options.hpp>
+
+namespace
+{
+    namespace bpo = boost::program_options;
+}
+
+namespace OpenMW
+{
+    bpo::options_description makeOptionsDescription()
+    {
+        bpo::options_description desc("Syntax: openmw <options>\nAllowed options");
+
+        desc.add_options()
+            ("help", "print help message")
+            ("version", "print version information and quit")
+
+            ("replace", bpo::value<Files::EscapeStringVector>()->default_value(Files::EscapeStringVector(), "")
+                ->multitoken()->composing(), "settings where the values from the current source should replace those from lower-priority sources instead of being appended")
+
+            ("data", bpo::value<Files::EscapePathContainer>()->default_value(Files::EscapePathContainer(), "data")
+                ->multitoken()->composing(), "set data directories (later directories have higher priority)")
+
+            ("data-local", bpo::value<Files::EscapePath>()->default_value(Files::EscapePath(), ""),
+                "set local data directory (highest priority)")
+
+            ("fallback-archive", bpo::value<Files::EscapeStringVector>()->default_value(Files::EscapeStringVector(), "fallback-archive")
+                ->multitoken()->composing(), "set fallback BSA archives (later archives have higher priority)")
+
+            ("resources", bpo::value<Files::EscapePath>()->default_value(Files::EscapePath(), "resources"),
+                "set resources directory")
+
+            ("start", bpo::value<Files::EscapeHashString>()->default_value(""),
+                "set initial cell")
+
+            ("content", bpo::value<Files::EscapeStringVector>()->default_value(Files::EscapeStringVector(), "")
+                ->multitoken()->composing(), "content file(s): esm/esp, or omwgame/omwaddon")
+
+            ("groundcover", bpo::value<Files::EscapeStringVector>()->default_value(Files::EscapeStringVector(), "")
+                ->multitoken()->composing(), "groundcover content file(s): esm/esp, or omwgame/omwaddon")
+
+            ("lua-scripts", bpo::value<Files::EscapeStringVector>()->default_value(Files::EscapeStringVector(), "")
+                ->multitoken()->composing(), "file(s) with a list of global Lua scripts: omwscripts")
+
+            ("no-sound", bpo::value<bool>()->implicit_value(true)
+                ->default_value(false), "disable all sounds")
+
+            ("script-all", bpo::value<bool>()->implicit_value(true)
+                ->default_value(false), "compile all scripts (excluding dialogue scripts) at startup")
+
+            ("script-all-dialogue", bpo::value<bool>()->implicit_value(true)
+                ->default_value(false), "compile all dialogue scripts at startup")
+
+            ("script-console", bpo::value<bool>()->implicit_value(true)
+                ->default_value(false), "enable console-only script functionality")
+
+            ("script-run", bpo::value<Files::EscapeHashString>()->default_value(""),
+                "select a file containing a list of console commands that is executed on startup")
+
+            ("script-warn", bpo::value<int>()->implicit_value (1)
+                ->default_value (1),
+                "handling of warnings when compiling scripts\n"
+                "\t0 - ignore warning\n"
+                "\t1 - show warning but consider script as correctly compiled anyway\n"
+                "\t2 - treat warnings as errors")
+
+            ("script-blacklist", bpo::value<Files::EscapeStringVector>()->default_value(Files::EscapeStringVector(), "")
+                ->multitoken()->composing(), "ignore the specified script (if the use of the blacklist is enabled)")
+
+            ("script-blacklist-use", bpo::value<bool>()->implicit_value(true)
+                ->default_value(true), "enable script blacklisting")
+
+            ("load-savegame", bpo::value<Files::EscapePath>()->default_value(Files::EscapePath(), ""),
+                "load a save game file on game startup (specify an absolute filename or a filename relative to the current working directory)")
+
+            ("skip-menu", bpo::value<bool>()->implicit_value(true)
+                ->default_value(false), "skip main menu on game startup")
+
+            ("new-game", bpo::value<bool>()->implicit_value(true)
+                ->default_value(false), "run new game sequence (ignored if skip-menu=0)")
+
+            ("fs-strict", bpo::value<bool>()->implicit_value(true)
+                ->default_value(false), "strict file system handling (no case folding)")
+
+            ("encoding", bpo::value<Files::EscapeHashString>()->
+                default_value("win1252"),
+                "Character encoding used in OpenMW game messages:\n"
+                "\n\twin1250 - Central and Eastern European such as Polish, Czech, Slovak, Hungarian, Slovene, Bosnian, Croatian, Serbian (Latin script), Romanian and Albanian languages\n"
+                "\n\twin1251 - Cyrillic alphabet such as Russian, Bulgarian, Serbian Cyrillic and other languages\n"
+                "\n\twin1252 - Western European (Latin) alphabet, used by default")
+
+            ("fallback", bpo::value<Fallback::FallbackMap>()->default_value(Fallback::FallbackMap(), "")
+                ->multitoken()->composing(), "fallback values")
+
+            ("no-grab", bpo::value<bool>()->implicit_value(true)->default_value(false), "Don't grab mouse cursor")
+
+            ("export-fonts", bpo::value<bool>()->implicit_value(true)
+                ->default_value(false), "Export Morrowind .fnt fonts to PNG image and XML file in current directory")
+
+            ("activate-dist", bpo::value <int> ()->default_value (-1), "activation distance override")
+
+            ("random-seed", bpo::value <unsigned int> ()
+                ->default_value(Misc::Rng::generateDefaultSeed()),
+                "seed value for random number generator")
+        ;
+
+        return desc;
+    }
+}
diff --git a/apps/openmw/options.hpp b/apps/openmw/options.hpp
new file mode 100644
index 0000000000..246999eb19
--- /dev/null
+++ b/apps/openmw/options.hpp
@@ -0,0 +1,11 @@
+#ifndef APPS_OPENMW_OPTIONS_H
+#define APPS_OPENMW_OPTIONS_H
+
+#include <boost/program_options/options_description.hpp>
+
+namespace OpenMW
+{
+    boost::program_options::options_description makeOptionsDescription();
+}
+
+#endif
diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index 7800efac3d..5665f59508 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -40,6 +40,9 @@ if (GTEST_FOUND AND GMOCK_FOUND)
         shader/parsedefines.cpp
         shader/parsefors.cpp
         shader/shadermanager.cpp
+
+        ../openmw/options.cpp
+        openmw/options.cpp
     )
 
     source_group(apps\\openmw_test_suite FILES openmw_test_suite.cpp ${UNITTEST_SRC_FILES})
diff --git a/apps/openmw_test_suite/openmw/options.cpp b/apps/openmw_test_suite/openmw/options.cpp
new file mode 100644
index 0000000000..ebb956b10c
--- /dev/null
+++ b/apps/openmw_test_suite/openmw/options.cpp
@@ -0,0 +1,379 @@
+#include <apps/openmw/options.hpp>
+#include <components/files/configurationmanager.hpp>
+#include <components/files/escape.hpp>
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+#include <array>
+#include <algorithm>
+#include <string>
+#include <utility>
+#include <vector>
+
+namespace
+{
+    using namespace testing;
+    using namespace OpenMW;
+
+    namespace bpo = boost::program_options;
+
+    std::vector<std::string> generateSupportedCharacters(std::vector<std::string>&& base = {})
+    {
+        std::vector<std::string> result = std::move(base);
+        for (int i = 1; i <= std::numeric_limits<char>::max(); ++i)
+            if (i != '&' && i != '"' && i != ' ' && i != '@' && i != '\n')
+                result.push_back(std::string(1, i));
+        return result;
+    }
+
+    constexpr std::array supportedAtSignEscapings {
+        std::pair {'a', '@'},
+        std::pair {'h', '#'},
+    };
+
+    MATCHER_P(IsEscapePath, v, "") { return arg.mPath.string() == v; }
+
+    template <class T>
+    void parseArgs(const T& arguments, bpo::variables_map& variables, bpo::options_description& description)
+    {
+        Files::parseArgs(static_cast<int>(arguments.size()), arguments.data(), variables, description);
+    }
+
+    TEST(OpenMWOptionsFromArguments, should_support_equality_to_separate_flag_and_value)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        const std::array arguments {"openmw", "--load-savegame=save.omwsave"};
+        bpo::variables_map variables;
+        parseArgs(arguments, variables, description);
+        EXPECT_EQ(variables["load-savegame"].as<Files::EscapePath>().mPath.string(), "save.omwsave");
+    }
+
+    TEST(OpenMWOptionsFromArguments, should_support_single_word_load_savegame_path)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        const std::array arguments {"openmw", "--load-savegame", "save.omwsave"};
+        bpo::variables_map variables;
+        parseArgs(arguments, variables, description);
+        EXPECT_EQ(variables["load-savegame"].as<Files::EscapePath>().mPath.string(), "save.omwsave");
+    }
+
+    TEST(OpenMWOptionsFromArguments, should_support_multi_component_load_savegame_path)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        const std::array arguments {"openmw", "--load-savegame", "/home/user/openmw/save.omwsave"};
+        bpo::variables_map variables;
+        parseArgs(arguments, variables, description);
+        EXPECT_EQ(variables["load-savegame"].as<Files::EscapePath>().mPath.string(), "/home/user/openmw/save.omwsave");
+    }
+
+    TEST(OpenMWOptionsFromArguments, should_support_windows_multi_component_load_savegame_path)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        const std::array arguments {"openmw", "--load-savegame", R"(C:\OpenMW\save.omwsave)"};
+        bpo::variables_map variables;
+        parseArgs(arguments, variables, description);
+        EXPECT_EQ(variables["load-savegame"].as<Files::EscapePath>().mPath.string(), R"(C:\OpenMW\save.omwsave)");
+    }
+
+    TEST(OpenMWOptionsFromArguments, should_support_load_savegame_path_with_spaces)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        const std::array arguments {"openmw", "--load-savegame", "my save.omwsave"};
+        bpo::variables_map variables;
+        parseArgs(arguments, variables, description);
+        EXPECT_EQ(variables["load-savegame"].as<Files::EscapePath>().mPath.string(), "my");
+//        EXPECT_EQ(variables["load-savegame"].as<Files::EscapePath>().mPath.string(), "my save.omwsave");
+    }
+
+    TEST(OpenMWOptionsFromArguments, should_support_load_savegame_path_with_number_sign)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        const std::array arguments {"openmw", "--load-savegame", "my#save.omwsave"};
+        bpo::variables_map variables;
+        parseArgs(arguments, variables, description);
+        EXPECT_EQ(variables["load-savegame"].as<Files::EscapePath>().mPath.string(), "my#save.omwsave");
+    }
+
+    TEST(OpenMWOptionsFromArguments, should_support_load_savegame_path_with_at_sign)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        const std::array arguments {"openmw", "--load-savegame", "my@save.omwsave"};
+        bpo::variables_map variables;
+        parseArgs(arguments, variables, description);
+        EXPECT_EQ(variables["load-savegame"].as<Files::EscapePath>().mPath.string(), "my?ave.omwsave");
+//        EXPECT_EQ(variables["load-savegame"].as<Files::EscapePath>().mPath.string(), "my@save.omwsave");
+    }
+
+    TEST(OpenMWOptionsFromArguments, should_support_load_savegame_path_with_quote)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        const std::array arguments {"openmw", "--load-savegame", R"(my"save.omwsave)"};
+        bpo::variables_map variables;
+        parseArgs(arguments, variables, description);
+        EXPECT_EQ(variables["load-savegame"].as<Files::EscapePath>().mPath.string(), R"(my"save.omwsave)");
+    }
+
+    TEST(OpenMWOptionsFromArguments, should_support_quted_load_savegame_path)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        const std::array arguments {"openmw", "--load-savegame", R"("save".omwsave)"};
+        bpo::variables_map variables;
+        parseArgs(arguments, variables, description);
+        EXPECT_EQ(variables["load-savegame"].as<Files::EscapePath>().mPath.string(), R"(save)");
+//        EXPECT_EQ(variables["load-savegame"].as<Files::EscapePath>().mPath.string(), R"("save".omwsave)");
+    }
+
+    TEST(OpenMWOptionsFromArguments, should_support_quoted_load_savegame_path_with_escaped_quote_by_ampersand)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        const std::array arguments {"openmw", "--load-savegame", R"("save&".omwsave")"};
+        bpo::variables_map variables;
+        parseArgs(arguments, variables, description);
+        EXPECT_EQ(variables["load-savegame"].as<Files::EscapePath>().mPath.string(), R"(save".omwsave)");
+    }
+
+    TEST(OpenMWOptionsFromArguments, should_support_quoted_load_savegame_path_with_escaped_ampersand)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        const std::array arguments {"openmw", "--load-savegame", R"("save.omwsave&&")"};
+        bpo::variables_map variables;
+        parseArgs(arguments, variables, description);
+        EXPECT_EQ(variables["load-savegame"].as<Files::EscapePath>().mPath.string(), "save.omwsave&");
+    }
+
+    TEST(OpenMWOptionsFromArguments, should_support_load_savegame_path_with_ampersand)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        const std::array arguments {"openmw", "--load-savegame", "save&.omwsave"};
+        bpo::variables_map variables;
+        parseArgs(arguments, variables, description);
+        EXPECT_EQ(variables["load-savegame"].as<Files::EscapePath>().mPath.string(), "save&.omwsave");
+    }
+
+    TEST(OpenMWOptionsFromArguments, should_support_load_savegame_path_with_multiple_quotes)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        const std::array arguments {"openmw", "--load-savegame", R"(my"save".omwsave)"};
+        bpo::variables_map variables;
+        parseArgs(arguments, variables, description);
+        EXPECT_EQ(variables["load-savegame"].as<Files::EscapePath>().mPath.string(), R"(my"save".omwsave)");
+    }
+
+    TEST(OpenMWOptionsFromArguments, should_compose_data)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        const std::array arguments {"openmw", "--data", "1", "--data", "2"};
+        bpo::variables_map variables;
+        parseArgs(arguments, variables, description);
+        EXPECT_THAT(variables["data"].as<Files::EscapePathContainer>(), ElementsAre(IsEscapePath("1"), IsEscapePath("2")));
+    }
+
+    TEST(OpenMWOptionsFromArguments, should_compose_data_from_single_flag)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        const std::array arguments {"openmw", "--data", "1", "2"};
+        bpo::variables_map variables;
+        parseArgs(arguments, variables, description);
+        EXPECT_THAT(variables["data"].as<Files::EscapePathContainer>(), ElementsAre(IsEscapePath("1"), IsEscapePath("2")));
+    }
+
+    TEST(OpenMWOptionsFromArguments, should_throw_on_multiple_load_savegame)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        const std::array arguments {"openmw", "--load-savegame", "1.omwsave", "--load-savegame", "2.omwsave"};
+        bpo::variables_map variables;
+        EXPECT_THROW(parseArgs(arguments, variables, description), std::exception);
+    }
+
+    struct OpenMWOptionsFromArgumentsStrings : TestWithParam<std::string> {};
+
+    TEST_P(OpenMWOptionsFromArgumentsStrings, should_support_paths_with_certain_characters_in_load_savegame_path)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        const std::string path = "save_" + std::string(GetParam()) + ".omwsave";
+        const std::string pathArgument = "\"" + path + "\"";
+        const std::array arguments {"openmw", "--load-savegame", pathArgument.c_str()};
+        bpo::variables_map variables;
+        parseArgs(arguments, variables, description);
+        EXPECT_EQ(variables["load-savegame"].as<Files::EscapePath>().mPath.string(), path);
+    }
+
+    INSTANTIATE_TEST_SUITE_P(
+        SupportedCharacters,
+        OpenMWOptionsFromArgumentsStrings,
+        ValuesIn(generateSupportedCharacters({u8"👍", u8"Ъ", u8"Ǽ", "\n"}))
+    );
+
+    struct OpenMWOptionsFromArgumentsEscapings : TestWithParam<std::pair<char, char>> {};
+
+    TEST_P(OpenMWOptionsFromArgumentsEscapings, should_support_escaping_with_at_sign_in_load_savegame_path)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        const std::string path = "save_@" + std::string(1, GetParam().first) + ".omwsave";
+        const std::array arguments {"openmw", "--load-savegame", path.c_str()};
+        bpo::variables_map variables;
+        parseArgs(arguments, variables, description);
+        EXPECT_EQ(variables["load-savegame"].as<Files::EscapePath>().mPath.string(),
+                  "save_" + std::string(1, GetParam().second) + ".omwsave");
+    }
+
+    INSTANTIATE_TEST_SUITE_P(
+        SupportedEscapingsWithAtSign,
+        OpenMWOptionsFromArgumentsEscapings,
+        ValuesIn(supportedAtSignEscapings)
+    );
+
+    TEST(OpenMWOptionsFromConfig, should_support_single_word_load_savegame_path)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        std::istringstream stream("load-savegame=save.omwsave");
+        bpo::variables_map variables;
+        Files::parseConfig(stream, variables, description);
+        EXPECT_EQ(variables["load-savegame"].as<Files::EscapePath>().mPath.string(), "save.omwsave");
+    }
+
+    TEST(OpenMWOptionsFromConfig, should_strip_quotes_from_load_savegame_path)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        std::istringstream stream(R"(load-savegame="save.omwsave")");
+        bpo::variables_map variables;
+        Files::parseConfig(stream, variables, description);
+        EXPECT_EQ(variables["load-savegame"].as<Files::EscapePath>().mPath.string(), "save.omwsave");
+    }
+
+    TEST(OpenMWOptionsFromConfig, should_strip_outer_quotes_from_load_savegame_path)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        std::istringstream stream(R"(load-savegame=""save".omwsave")");
+        bpo::variables_map variables;
+        Files::parseConfig(stream, variables, description);
+        EXPECT_EQ(variables["load-savegame"].as<Files::EscapePath>().mPath.string(), "");
+//        EXPECT_EQ(variables["load-savegame"].as<Files::EscapePath>().mPath.string(), R"(""save".omwsave")");
+    }
+
+    TEST(OpenMWOptionsFromConfig, should_strip_quotes_from_load_savegame_path_with_space)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        std::istringstream stream(R"(load-savegame="my save.omwsave")");
+        bpo::variables_map variables;
+        Files::parseConfig(stream, variables, description);
+        EXPECT_EQ(variables["load-savegame"].as<Files::EscapePath>().mPath.string(), "my save.omwsave");
+    }
+
+    TEST(OpenMWOptionsFromConfig, should_support_quoted_load_savegame_path_with_number_sign)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        std::istringstream stream("load-savegame=save#.omwsave");
+        bpo::variables_map variables;
+        Files::parseConfig(stream, variables, description);
+        EXPECT_EQ(variables["load-savegame"].as<Files::EscapePath>().mPath.string(), "save#.omwsave");
+    }
+
+    TEST(OpenMWOptionsFromConfig, should_support_quoted_load_savegame_path_with_at_sign)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        std::istringstream stream("load-savegame=save@.omwsave");
+        bpo::variables_map variables;
+        Files::parseConfig(stream, variables, description);
+        EXPECT_EQ(variables["load-savegame"].as<Files::EscapePath>().mPath.string(), "save@.omwsave");
+    }
+
+    TEST(OpenMWOptionsFromConfig, should_support_quoted_load_savegame_path_with_quote)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        std::istringstream stream(R"(load-savegame=save".omwsave)");
+        bpo::variables_map variables;
+        Files::parseConfig(stream, variables, description);
+        EXPECT_EQ(variables["load-savegame"].as<Files::EscapePath>().mPath.string(), R"(save".omwsave)");
+    }
+
+    TEST(OpenMWOptionsFromConfig, should_ignore_commented_option)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        std::istringstream stream("#load-savegame=save.omwsave");
+        bpo::variables_map variables;
+        Files::parseConfig(stream, variables, description);
+        EXPECT_EQ(variables["load-savegame"].as<Files::EscapePath>().mPath.string(), "");
+    }
+
+    TEST(OpenMWOptionsFromConfig, should_throw_on_multiple_load_savegame)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        std::istringstream stream("load-savegame=1.omwsave\nload-savegame=2.omwsave");
+        bpo::variables_map variables;
+        EXPECT_THROW(Files::parseConfig(stream, variables, description), std::exception);
+    }
+
+    TEST(OpenMWOptionsFromConfig, should_support_multi_component_load_savegame_path)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        std::istringstream stream("load-savegame=/home/user/openmw/save.omwsave");
+        bpo::variables_map variables;
+        Files::parseConfig(stream, variables, description);
+        EXPECT_EQ(variables["load-savegame"].as<Files::EscapePath>().mPath.string(), "/home/user/openmw/save.omwsave");
+    }
+
+    TEST(OpenMWOptionsFromConfig, should_support_windows_multi_component_load_savegame_path)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        std::istringstream stream(R"(load-savegame=C:\OpenMW\save.omwsave)");
+        bpo::variables_map variables;
+        Files::parseConfig(stream, variables, description);
+        EXPECT_EQ(variables["load-savegame"].as<Files::EscapePath>().mPath.string(), R"(C:\OpenMW\save.omwsave)");
+    }
+
+    TEST(OpenMWOptionsFromConfig, should_compose_data)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        std::istringstream stream("data=1\ndata=2");
+        bpo::variables_map variables;
+        Files::parseConfig(stream, variables, description);
+        EXPECT_THAT(variables["data"].as<Files::EscapePathContainer>(), ElementsAre(IsEscapePath("1"), IsEscapePath("2")));
+    }
+
+    TEST(OpenMWOptionsFromConfig, should_support_quoted_load_savegame_path_with_escaped_quote_by_ampersand)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        std::istringstream stream(R"(load-savegame="save&".omwsave")");
+        bpo::variables_map variables;
+        Files::parseConfig(stream, variables, description);
+        EXPECT_EQ(variables["load-savegame"].as<Files::EscapePath>().mPath.string(), R"(save".omwsave)");
+    }
+
+    TEST(OpenMWOptionsFromConfig, should_support_quoted_load_savegame_path_with_escaped_ampersand)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        std::istringstream stream(R"(load-savegame="save.omwsave&&")");
+        bpo::variables_map variables;
+        Files::parseConfig(stream, variables, description);
+        EXPECT_EQ(variables["load-savegame"].as<Files::EscapePath>().mPath.string(), "save.omwsave&");
+    }
+
+    TEST(OpenMWOptionsFromConfig, should_support_load_savegame_path_with_ampersand)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        std::istringstream stream("load-savegame=save&.omwsave");
+        bpo::variables_map variables;
+        Files::parseConfig(stream, variables, description);
+        EXPECT_EQ(variables["load-savegame"].as<Files::EscapePath>().mPath.string(), "save&.omwsave");
+    }
+
+    struct OpenMWOptionsFromConfigStrings : TestWithParam<std::string> {};
+
+    TEST_P(OpenMWOptionsFromConfigStrings, should_support_paths_with_certain_characters_in_load_savegame_path)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        const std::string path = "save_" + std::string(GetParam()) + ".omwsave";
+        std::istringstream stream("load-savegame=\"" + path + "\"");
+        bpo::variables_map variables;
+        Files::parseConfig(stream, variables, description);
+        EXPECT_EQ(variables["load-savegame"].as<Files::EscapePath>().mPath.string(), path);
+    }
+
+    INSTANTIATE_TEST_SUITE_P(
+        SupportedCharacters,
+        OpenMWOptionsFromConfigStrings,
+        ValuesIn(generateSupportedCharacters({u8"👍", u8"Ъ", u8"Ǽ"}))
+    );
+}
diff --git a/components/files/configurationmanager.cpp b/components/files/configurationmanager.cpp
index 35679ef293..b5d8b415f5 100644
--- a/components/files/configurationmanager.cpp
+++ b/components/files/configurationmanager.cpp
@@ -82,7 +82,8 @@ void ConfigurationManager::readConfiguration(boost::program_options::variables_m
     mSilent = silent;
 }
 
-boost::program_options::variables_map ConfigurationManager::separateComposingVariables(boost::program_options::variables_map & variables, boost::program_options::options_description& description)
+boost::program_options::variables_map separateComposingVariables(boost::program_options::variables_map & variables,
+    boost::program_options::options_description& description)
 {
     boost::program_options::variables_map composingVariables;
     for (auto itr = variables.begin(); itr != variables.end();)
@@ -98,7 +99,8 @@ boost::program_options::variables_map ConfigurationManager::separateComposingVar
     return composingVariables;
 }
 
-void ConfigurationManager::mergeComposingVariables(boost::program_options::variables_map & first, boost::program_options::variables_map & second, boost::program_options::options_description& description)
+void mergeComposingVariables(boost::program_options::variables_map& first, boost::program_options::variables_map& second,
+    boost::program_options::options_description& description)
 {
     // There are a few places this assumes all variables are present in second, but it's never crashed in the wild, so it looks like that's guaranteed.
     std::set<std::string> replacedVariables;
@@ -234,13 +236,10 @@ bool ConfigurationManager::loadConfig(const boost::filesystem::path& path,
             Log(Debug::Info) << "Loading config file: " << cfgFile.string();
 
         boost::filesystem::ifstream configFileStreamUnfiltered(cfgFile);
-        boost::iostreams::filtering_istream configFileStream;
-        configFileStream.push(escape_hash_filter());
-        configFileStream.push(configFileStreamUnfiltered);
+
         if (configFileStreamUnfiltered.is_open())
         {
-            boost::program_options::store(boost::program_options::parse_config_file(
-                configFileStream, description, true), variables);
+            parseConfig(configFileStreamUnfiltered, variables, description);
 
             return true;
         }
@@ -300,4 +299,26 @@ const boost::filesystem::path& ConfigurationManager::getScreenshotPath() const
     return mScreenshotPath;
 }
 
+void parseArgs(int argc, const char* const argv[], boost::program_options::variables_map& variables,
+    boost::program_options::options_description& description)
+{
+    boost::program_options::store(
+        boost::program_options::command_line_parser(argc, argv).options(description).allow_unregistered().run(),
+        variables
+    );
+}
+
+void parseConfig(std::istream& stream, boost::program_options::variables_map& variables,
+    boost::program_options::options_description& description)
+{
+    boost::iostreams::filtering_istream configFileStream;
+    configFileStream.push(escape_hash_filter());
+    configFileStream.push(stream);
+
+    boost::program_options::store(
+        boost::program_options::parse_config_file(configFileStream, description, true),
+        variables
+    );
+}
+
 } /* namespace Cfg */
diff --git a/components/files/configurationmanager.hpp b/components/files/configurationmanager.hpp
index 0ec0a1f67d..99e65a7658 100644
--- a/components/files/configurationmanager.hpp
+++ b/components/files/configurationmanager.hpp
@@ -25,10 +25,6 @@ struct ConfigurationManager
     void readConfiguration(boost::program_options::variables_map& variables,
         boost::program_options::options_description& description, bool quiet=false);
 
-    boost::program_options::variables_map separateComposingVariables(boost::program_options::variables_map& variables, boost::program_options::options_description& description);
-
-    void mergeComposingVariables(boost::program_options::variables_map& first, boost::program_options::variables_map& second, boost::program_options::options_description& description);
-
     void processPaths(Files::PathContainer& dataDirs, bool create = false);
     ///< \param create Try creating the directory, if it does not exist.
 
@@ -68,6 +64,19 @@ struct ConfigurationManager
 
         bool mSilent;
 };
+
+boost::program_options::variables_map separateComposingVariables(boost::program_options::variables_map& variables,
+    boost::program_options::options_description& description);
+
+void mergeComposingVariables(boost::program_options::variables_map& first, boost::program_options::variables_map& second,
+    boost::program_options::options_description& description);
+
+void parseArgs(int argc, const char* const argv[], boost::program_options::variables_map& variables,
+    boost::program_options::options_description& description);
+
+void parseConfig(std::istream& stream, boost::program_options::variables_map& variables,
+    boost::program_options::options_description& description);
+
 } /* namespace Cfg */
 
 #endif /* COMPONENTS_FILES_CONFIGURATIONMANAGER_HPP */

From e581b61ecb758e7d2c6141c18699710817a964ff Mon Sep 17 00:00:00 2001
From: Bret Curtis <bret.curtis@gmail.com>
Date: Wed, 6 Oct 2021 08:05:10 +0200
Subject: [PATCH 1426/2859] check if FORCE_OPAQUE is available before using it.

---
 files/shaders/nv_default_fragment.glsl    | 2 +-
 files/shaders/nv_nolighting_fragment.glsl | 2 +-
 files/shaders/objects_fragment.glsl       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/files/shaders/nv_default_fragment.glsl b/files/shaders/nv_default_fragment.glsl
index 38dca66c40..245f83b620 100644
--- a/files/shaders/nv_default_fragment.glsl
+++ b/files/shaders/nv_default_fragment.glsl
@@ -94,7 +94,7 @@ void main()
 #endif
     gl_FragData[0].xyz = mix(gl_FragData[0].xyz, gl_Fog.color.xyz, fogValue);
 
-#if FORCE_OPAQUE
+#if defined(FORCE_OPAQUE) && FORCE_OPAQUE
     // having testing & blending isn't enough - we need to write an opaque pixel to be opaque
     gl_FragData[0].a = 1.0;
 #endif
diff --git a/files/shaders/nv_nolighting_fragment.glsl b/files/shaders/nv_nolighting_fragment.glsl
index 76b01828d6..7c4f4737e0 100644
--- a/files/shaders/nv_nolighting_fragment.glsl
+++ b/files/shaders/nv_nolighting_fragment.glsl
@@ -45,7 +45,7 @@ void main()
     float fogValue = clamp((linearDepth - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);
 #endif
 
-#if FORCE_OPAQUE
+#if defined(FORCE_OPAQUE) && FORCE_OPAQUE
     gl_FragData[0].a = 1.0;
 #endif
 
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index c343b6a189..6f6cede4e4 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -220,7 +220,7 @@ void main()
 #endif
     gl_FragData[0].xyz = mix(gl_FragData[0].xyz, gl_Fog.color.xyz, fogValue);
 
-#if FORCE_OPAQUE
+#if defined(FORCE_OPAQUE) && FORCE_OPAQUE
     // having testing & blending isn't enough - we need to write an opaque pixel to be opaque
     gl_FragData[0].a = 1.0;
 #endif

From 787f91211d100d2ecbab8eb16becb6a1e22fb625 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Wed, 6 Oct 2021 09:15:47 +0000
Subject: [PATCH 1427/2859] resets state updater to apply light settings
 (#3141)

resets state updater to apply light settings

With this PR we achieve the same effect with fewer lines of code.
---
 apps/openmw/mwrender/renderingmanager.cpp | 6 +-----
 components/sceneutil/statesetupdater.hpp  | 3 +--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index be143510b2..331ddeca7b 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -1281,11 +1281,7 @@ namespace MWRender
                         defines[name] = key;
                     mResourceSystem->getSceneManager()->getShaderManager().setGlobalDefines(defines);
 
-                    mSceneRoot->removeUpdateCallback(mStateUpdater);
-                    mStateUpdater = new StateUpdater;
-                    mSceneRoot->addUpdateCallback(mStateUpdater);
-                    mStateUpdater->setFogEnd(mViewDistance);
-                    updateAmbient();
+                    mStateUpdater->reset();
 
                     mViewer->startThreading();
                 }
diff --git a/components/sceneutil/statesetupdater.hpp b/components/sceneutil/statesetupdater.hpp
index ab091fd39f..35be9cb434 100644
--- a/components/sceneutil/statesetupdater.hpp
+++ b/components/sceneutil/statesetupdater.hpp
@@ -46,8 +46,7 @@ namespace SceneUtil
         /// Set default state - optionally override in derived classes
         /// @par May be used e.g. to allocate StateAttributes.
         virtual void setDefaults(osg::StateSet* stateset) {}
-
-    protected:
+    
         /// Reset mStateSets, forcing a setDefaults() on the next frame. Can be used to change the defaults if needed.
         void reset();
 

From cd4d76f8c5121575b711cc7e19a46f1acf49014b Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Wed, 6 Oct 2021 09:53:24 +0000
Subject: [PATCH 1428/2859] discard off-screen lights (#3120)

Currently, we run culling tests against all lights in the scene during LightListCallback::pushLightState. We can avoid most of these tests by removing off-screen lights at an earlier stage. We should benchmark the cumulative time spent within LightListCallback::pushLightState before and after this PR.
---
 components/sceneutil/lightmanager.cpp | 104 +++++++++++++-------------
 components/sceneutil/lightmanager.hpp |   2 +-
 2 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 0abebd4884..f38fd80d26 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -1192,8 +1192,10 @@ namespace SceneUtil
         return stateset;
     }
 
-    const std::vector<LightManager::LightSourceViewBound>& LightManager::getLightsInViewSpace(osg::Camera *camera, const osg::RefMatrix* viewMatrix, size_t frameNum)
+    const std::vector<LightManager::LightSourceViewBound>& LightManager::getLightsInViewSpace(osgUtil::CullVisitor *cv, const osg::RefMatrix* viewMatrix, size_t frameNum)
     {
+        osg::Camera* camera = cv->getCurrentCamera();
+
         osg::observer_ptr<osg::Camera> camPtr (camera);
         auto it = mLightsInViewSpace.find(camPtr);
 
@@ -1209,7 +1211,7 @@ namespace SceneUtil
 
                 float radius = transform.mLightSource->getRadius();
 
-                osg::BoundingSphere viewBound = osg::BoundingSphere(osg::Vec3f(0,0,0), radius * mPointLightRadiusMultiplier);
+                osg::BoundingSphere viewBound = osg::BoundingSphere(osg::Vec3f(0,0,0), radius);
                 transformBoundingSphere(worldViewMat, viewBound);
 
                 if (!isReflection && mPointLightFadeEnd != 0.f)
@@ -1223,6 +1225,15 @@ namespace SceneUtil
                     light->setDiffuse(light->getDiffuse() * fade);
                 }
 
+                // remove lights culled by this camera
+                if (!usingFFP())
+                {
+                    viewBound._radius *= 2.f;
+                    if (cv->getModelViewCullingStack().front().isCulled(viewBound))
+                        continue;
+                    viewBound._radius /= 2.f;
+                }
+                viewBound._radius *= mPointLightRadiusMultiplier;
                 LightSourceViewBound l;
                 l.mLightSource = transform.mLightSource;
                 l.mViewBound = viewBound;
@@ -1295,46 +1306,41 @@ namespace SceneUtil
             return false;
 
         // Possible optimizations:
-        // - cull list of lights by the camera frustum
         // - organize lights in a quad tree
 
 
-        // update light list if necessary
-        // makes sure we don't update it more than once per frame when rendering with multiple cameras
-        if (mLastFrameNumber != cv->getTraversalNumber())
-        {
-            mLastFrameNumber = cv->getTraversalNumber();
+        mLastFrameNumber = cv->getTraversalNumber();
 
-            // Don't use Camera::getViewMatrix, that one might be relative to another camera!
-            const osg::RefMatrix* viewMatrix = cv->getCurrentRenderStage()->getInitialViewMatrix();
-            const std::vector<LightManager::LightSourceViewBound>& lights = mLightManager->getLightsInViewSpace(cv->getCurrentCamera(), viewMatrix, mLastFrameNumber);
+        // Don't use Camera::getViewMatrix, that one might be relative to another camera!
+        const osg::RefMatrix* viewMatrix = cv->getCurrentRenderStage()->getInitialViewMatrix();
+        const std::vector<LightManager::LightSourceViewBound>& lights = mLightManager->getLightsInViewSpace(cv, viewMatrix, mLastFrameNumber);
 
-            // get the node bounds in view space
-            // NB do not node->getBound() * modelView, that would apply the node's transformation twice
-            osg::BoundingSphere nodeBound;
-            osg::Transform* transform = node->asTransform();
-            if (transform)
-            {
-                for (size_t i = 0; i < transform->getNumChildren(); ++i)
-                    nodeBound.expandBy(transform->getChild(i)->getBound());
-            }
-            else
-                nodeBound = node->getBound();
-            osg::Matrixf mat = *cv->getModelViewMatrix();
-            transformBoundingSphere(mat, nodeBound);
+        // get the node bounds in view space
+        // NB do not node->getBound() * modelView, that would apply the node's transformation twice
+        osg::BoundingSphere nodeBound;
+        osg::Transform* transform = node->asTransform();
+        if (transform)
+        {
+            for (size_t i = 0; i < transform->getNumChildren(); ++i)
+                nodeBound.expandBy(transform->getChild(i)->getBound());
+        }
+        else
+            nodeBound = node->getBound();
+        osg::Matrixf mat = *cv->getModelViewMatrix();
+        transformBoundingSphere(mat, nodeBound);
 
-            mLightList.clear();
-            for (size_t i = 0; i < lights.size(); ++i)
-            {
-                const LightManager::LightSourceViewBound& l = lights[i];
+        mLightList.clear();
+        for (size_t i = 0; i < lights.size(); ++i)
+        {
+            const LightManager::LightSourceViewBound& l = lights[i];
 
-                if (mIgnoredLightSources.count(l.mLightSource))
-                    continue;
+            if (mIgnoredLightSources.count(l.mLightSource))
+                continue;
 
-                if (l.mViewBound.intersects(nodeBound))
-                    mLightList.push_back(&l);
-            }
+            if (l.mViewBound.intersects(nodeBound))
+                mLightList.push_back(&l);
         }
+
         if (!mLightList.empty())
         {
             size_t maxLights = mLightManager->getMaxLights() - mLightManager->getStartLight();
@@ -1343,31 +1349,25 @@ namespace SceneUtil
 
             if (mLightList.size() > maxLights)
             {
-                // remove lights culled by this camera
                 LightManager::LightList lightList = mLightList;
-                for (auto it = lightList.begin(); it != lightList.end() && lightList.size() > maxLights;)
-                {
-                    osg::CullStack::CullingStack& stack = cv->getModelViewCullingStack();
 
-                    osg::BoundingSphere bs = (*it)->mViewBound;
-                    bs._radius = bs._radius * 2.0;
-                    osg::CullingSet& cullingSet = stack.front();
-                    if (cullingSet.isCulled(bs))
+                if (mLightManager->usingFFP())
+                {
+                    for (auto it = lightList.begin(); it != lightList.end() && lightList.size() > maxLights;)
                     {
-                        it = lightList.erase(it);
-                        continue;
+                        osg::BoundingSphere bs = (*it)->mViewBound;
+                        bs._radius = bs._radius * 2.0;
+                        if (cv->getModelViewCullingStack().front().isCulled(bs))
+                            it = lightList.erase(it);
+                        else
+                            ++it;
                     }
-                    else
-                        ++it;
                 }
 
-                if (lightList.size() > maxLights)
-                {
-                    // sort by proximity to camera, then get rid of furthest away lights
-                    std::sort(lightList.begin(), lightList.end(), sortLights);
-                    while (lightList.size() > maxLights)
-                        lightList.pop_back();
-                }
+                // sort by proximity to camera, then get rid of furthest away lights
+                std::sort(lightList.begin(), lightList.end(), sortLights);
+                while (lightList.size() > maxLights)
+                    lightList.pop_back();
                 stateset = mLightManager->getLightListStateSet(lightList, cv->getTraversalNumber(), cv->getCurrentRenderStage()->getInitialViewMatrix());
             }
             else
diff --git a/components/sceneutil/lightmanager.hpp b/components/sceneutil/lightmanager.hpp
index 4048bf9b09..b518a4723c 100644
--- a/components/sceneutil/lightmanager.hpp
+++ b/components/sceneutil/lightmanager.hpp
@@ -157,7 +157,7 @@ namespace SceneUtil
         /// Internal use only, called automatically by the LightSource's UpdateCallback
         void addLight(LightSource* lightSource, const osg::Matrixf& worldMat, size_t frameNum);
 
-        const std::vector<LightSourceViewBound>& getLightsInViewSpace(osg::Camera* camera, const osg::RefMatrix* viewMatrix, size_t frameNum);
+        const std::vector<LightSourceViewBound>& getLightsInViewSpace(osgUtil::CullVisitor* cv, const osg::RefMatrix* viewMatrix, size_t frameNum);
 
         osg::ref_ptr<osg::StateSet> getLightListStateSet(const LightList& lightList, size_t frameNum, const osg::RefMatrix* viewMatrix);
 

From 87d52dc1fd106b659424cca5fbbc3610d30888fc Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Wed, 6 Oct 2021 10:04:03 +0000
Subject: [PATCH 1429/2859] fixes coverity-ci warning

---
 components/nifosg/particle.cpp | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/components/nifosg/particle.cpp b/components/nifosg/particle.cpp
index 0f103588e8..7821b9c2b8 100644
--- a/components/nifosg/particle.cpp
+++ b/components/nifosg/particle.cpp
@@ -70,16 +70,14 @@ void ParticleSystem::drawImplementation(osg::RenderInfo& renderInfo) const
 
 void InverseWorldMatrix::operator()(osg::MatrixTransform *node, osg::NodeVisitor *nv)
 {
-    if (nv && nv->getVisitorType() == osg::NodeVisitor::UPDATE_VISITOR)
-    {
-        osg::NodePath path = nv->getNodePath();
-        path.pop_back();
+    osg::NodePath path = nv->getNodePath();
+    path.pop_back();
+
+    osg::Matrix mat = osg::computeLocalToWorld( path );
+    mat.orthoNormalize(mat); // don't undo the scale
+    mat.invert(mat);
+    node->setMatrix(mat);
 
-        osg::Matrix mat = osg::computeLocalToWorld( path );
-        mat.orthoNormalize(mat); // don't undo the scale
-        mat.invert(mat);
-        node->setMatrix(mat);
-    }
     traverse(node,nv);
 }
 

From 75402654320dfd3dc810e41fc432a68b66ec2259 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 6 Oct 2021 17:14:00 +0200
Subject: [PATCH 1430/2859] Fix regression #6328

---
 apps/openmw/mwmechanics/spelleffects.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp
index 24816b9ed1..e8795b8bc4 100644
--- a/apps/openmw/mwmechanics/spelleffects.cpp
+++ b/apps/openmw/mwmechanics/spelleffects.cpp
@@ -63,9 +63,9 @@ namespace
         auto& creatureStats = target.getClass().getCreatureStats(target);
         auto stat = creatureStats.getDynamic(index);
         float current = stat.getCurrent();
-        stat.setModified(stat.getModified() - magnitude, 0);
-        stat.setCurrentModified(stat.getCurrentModified() - magnitude);
-        stat.setCurrent(current - magnitude);
+        stat.setModified(stat.getModified() + magnitude, 0);
+        stat.setCurrentModified(stat.getCurrentModified() + magnitude);
+        stat.setCurrent(current + magnitude);
         creatureStats.setDynamic(index, stat);
     }
 
@@ -487,7 +487,7 @@ void applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, co
                     index = 2;
                 // Damage "Dynamic" abilities reduce the base value
                 if(spellParams.getType() == ESM::ActiveSpells::Type_Ability)
-                    modDynamicStat(target, index, effect.mMagnitude);
+                    modDynamicStat(target, index, -effect.mMagnitude);
                 else
                 {
                     static const bool uncappedDamageFatigue = Settings::Manager::getBool("uncapped damage fatigue", "Game");

From a1825980c496eb100e719a918ab2cc9f96389f52 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 6 Oct 2021 17:28:48 +0200
Subject: [PATCH 1431/2859] Define OpenMW specific C++ flags

---
 CI/before_script.linux.sh | 1 +
 CMakeLists.txt            | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CI/before_script.linux.sh b/CI/before_script.linux.sh
index bc0eb0013d..5d20fa75ce 100755
--- a/CI/before_script.linux.sh
+++ b/CI/before_script.linux.sh
@@ -32,6 +32,7 @@ declare -a CMAKE_CONF_OPTS=(
     -DCMAKE_INSTALL_PREFIX=install
     -DCMAKE_C_FLAGS='-Werror'
     -DCMAKE_CXX_FLAGS="${CXX_FLAGS}"
+    -DOPENMW_CXX_FLAGS="-Werror=implicit-fallthrough"
 )
 
 if [[ $CI_OPENMW_USE_STATIC_DEPS ]]; then
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae4584a4cd..2564379847 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -543,8 +543,8 @@ if (BUILD_OPENCS)
     add_subdirectory (extern/osgQt)
 endif()
 
-if (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=implicit-fallthrough")
+if (OPENMW_CXX_FLAGS)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OPENMW_CXX_FLAGS}")
 endif()
 
 # Components

From dfc72e9b7e7a78176d2ab38348a2dc608131617f Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 6 Oct 2021 18:25:28 +0200
Subject: [PATCH 1432/2859] Make StayOutside only block teleportation from
 exteriors to interiors

---
 CHANGELOG.md                           | 1 +
 apps/openmw/mwgui/travelwindow.cpp     | 2 +-
 apps/openmw/mwworld/actionteleport.cpp | 7 ++++---
 apps/openmw/mwworld/actionteleport.hpp | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cfa8c2e79f..7fd364bfe2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,6 +52,7 @@
     Bug #6289: Keyword search in dialogues expected the text to be all ASCII characters
     Bug #6302: Teleporting disabled actor breaks its disabled state
     Bug #6307: Pathfinding in Infidelities quest from Tribunal addon is broken
+    Bug #6323: Wyrmhaven: Alboin doesn't follower the player character out of his house
     Feature #890: OpenMW-CS: Column filtering
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
     Feature #2780: A way to see current OpenMW version in the console
diff --git a/apps/openmw/mwgui/travelwindow.cpp b/apps/openmw/mwgui/travelwindow.cpp
index 22e3a55566..3fc0673735 100644
--- a/apps/openmw/mwgui/travelwindow.cpp
+++ b/apps/openmw/mwgui/travelwindow.cpp
@@ -74,7 +74,7 @@ namespace MWGui
 
         // Add price for the travelling followers
         std::set<MWWorld::Ptr> followers;
-        MWWorld::ActionTeleport::getFollowers(player, followers);
+        MWWorld::ActionTeleport::getFollowers(player, followers, !interior);
 
         // Apply followers cost, unlike vanilla the first follower doesn't travel for free
         price *= 1 + static_cast<int>(followers.size());
diff --git a/apps/openmw/mwworld/actionteleport.cpp b/apps/openmw/mwworld/actionteleport.cpp
index 56274eb9a0..d74dcd82f7 100644
--- a/apps/openmw/mwworld/actionteleport.cpp
+++ b/apps/openmw/mwworld/actionteleport.cpp
@@ -6,6 +6,7 @@
 
 #include "../mwmechanics/creaturestats.hpp"
 
+#include "../mwworld/cellstore.hpp"
 #include "../mwworld/class.hpp"
 
 #include "player.hpp"
@@ -24,7 +25,7 @@ namespace MWWorld
         {
             // Find any NPCs that are following the actor and teleport them with him
             std::set<MWWorld::Ptr> followers;
-            getFollowers(actor, followers, true);
+            getFollowers(actor, followers, mCellName.empty(), true);
 
             for (std::set<MWWorld::Ptr>::iterator it = followers.begin(); it != followers.end(); ++it)
                 teleport(*it);
@@ -62,7 +63,7 @@ namespace MWWorld
         }
     }
 
-    void ActionTeleport::getFollowers(const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out, bool includeHostiles) {
+    void ActionTeleport::getFollowers(const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out, bool toExterior, bool includeHostiles) {
         std::set<MWWorld::Ptr> followers;
         MWBase::Environment::get().getMechanicsManager()->getActorsFollowing(actor, followers);
 
@@ -75,7 +76,7 @@ namespace MWWorld
             if (!includeHostiles && follower.getClass().getCreatureStats(follower).getAiSequence().isInCombat(actor))
                 continue;
 
-            if (!script.empty() && follower.getRefData().getLocals().getIntVar(script, "stayoutside") == 1)
+            if (!toExterior && !script.empty() && follower.getRefData().getLocals().getIntVar(script, "stayoutside") == 1 && follower.getCell()->getCell()->isExterior())
                 continue;
 
             if ((follower.getRefData().getPosition().asVec3() - actor.getRefData().getPosition().asVec3()).length2() > 800 * 800)
diff --git a/apps/openmw/mwworld/actionteleport.hpp b/apps/openmw/mwworld/actionteleport.hpp
index 0a981a418e..fcbf59a203 100644
--- a/apps/openmw/mwworld/actionteleport.hpp
+++ b/apps/openmw/mwworld/actionteleport.hpp
@@ -30,7 +30,7 @@ namespace MWWorld
 
             /// @param includeHostiles If true, include hostile followers (which won't actually be teleported) in the output,
             ///                        e.g. so that the teleport action can calm them.
-            static void getFollowers(const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out, bool includeHostiles = false);
+            static void getFollowers(const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out, bool toExterior, bool includeHostiles = false);
     };
 }
 

From 5037def3b32654b2bdad94ab353d44e851aeab81 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 6 Oct 2021 21:27:08 +0200
Subject: [PATCH 1433/2859] Parse local variables sharing a name with a
 function as variables

---
 CHANGELOG.md                       |  1 +
 components/compiler/exprparser.cpp | 12 +++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cfa8c2e79f..65736756bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,7 @@
     Bug #6282: Laura craft doesn't follow the player character
     Bug #6283: Avis Dorsey follows you after her death
     Bug #6289: Keyword search in dialogues expected the text to be all ASCII characters
+    Bug #6291: Can't pickup the dead mage's journal from the mysterious hunter mod
     Bug #6302: Teleporting disabled actor breaks its disabled state
     Bug #6307: Pathfinding in Infidelities quest from Tribunal addon is broken
     Feature #890: OpenMW-CS: Column filtering
diff --git a/components/compiler/exprparser.cpp b/components/compiler/exprparser.cpp
index 23f15c8bf5..2d525e6f8c 100644
--- a/components/compiler/exprparser.cpp
+++ b/components/compiler/exprparser.cpp
@@ -353,15 +353,21 @@ namespace Compiler
     {
         if (const Extensions *extensions = getContext().getExtensions())
         {
+            char returnType; // ignored
             std::string argumentType; // ignored
             bool hasExplicit = false; // ignored
-            if (extensions->isInstruction (keyword, argumentType, hasExplicit))
+            bool isInstruction = extensions->isInstruction (keyword, argumentType, hasExplicit);
+
+            if(isInstruction || (mExplicit.empty() && extensions->isFunction(keyword, returnType, argumentType, hasExplicit)))
             {
-                // pretend this is not a keyword
                 std::string name = loc.mLiteral;
                 if (name.size()>=2 && name[0]=='"' && name[name.size()-1]=='"')
                     name = name.substr (1, name.size()-2);
-                return parseName (name, loc, scanner);
+                if(isInstruction || mLocals.getType(Misc::StringUtils::lowerCase(name)) != ' ')
+                {
+                    // pretend this is not a keyword
+                    return parseName (name, loc, scanner);
+                }
             }
         }
 

From e382f71aea92d05578a41bd6469601549f64561b Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Thu, 7 Oct 2021 00:39:23 +0100
Subject: [PATCH 1434/2859] Add implementation of config file parser lifted
 from Boost

---
 components/CMakeLists.txt                 |   2 +-
 components/files/configfileparser.cpp     | 289 ++++++++++++++++++++++
 components/files/configfileparser.hpp     |  17 ++
 components/files/configurationmanager.cpp |   3 +-
 4 files changed, 309 insertions(+), 2 deletions(-)
 create mode 100644 components/files/configfileparser.cpp
 create mode 100644 components/files/configfileparser.hpp

diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 7983de6190..ccac8f8cb7 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -105,7 +105,7 @@ IF(NOT WIN32 AND NOT APPLE)
 ENDIF()
 add_component_dir (files
     linuxpath androidpath windowspath macospath fixedpath multidircollection collections configurationmanager escape
-    lowlevelfile constrainedfilestream memorystream
+    lowlevelfile constrainedfilestream memorystream configfileparser
     )
 
 add_component_dir (compiler
diff --git a/components/files/configfileparser.cpp b/components/files/configfileparser.cpp
new file mode 100644
index 0000000000..7c43e1f67c
--- /dev/null
+++ b/components/files/configfileparser.cpp
@@ -0,0 +1,289 @@
+#include "configfileparser.hpp"
+
+#include <boost/program_options/detail/config_file.hpp>
+#include <boost/program_options/detail/convert.hpp>
+
+namespace Files
+{
+    namespace
+    {
+        /** Standalone parser for config files in ini-line format.
+            The parser is a model of single-pass lvalue iterator, and
+            default constructor creates past-the-end-iterator. The typical usage is:
+            config_file_iterator i(is, ... set of options ...), e;
+            for(; i !=e; ++i) {
+                *i;
+            }
+            
+            Syntax conventions:
+
+            - config file can not contain positional options
+            - '#' is comment character: it is ignored together with
+            the rest of the line.
+            - variable assignments are in the form
+            name '=' value.
+            spaces around '=' are trimmed.
+            - Section names are given in brackets. 
+
+            The actual option name is constructed by combining current section
+            name and specified option name, with dot between. If section_name 
+            already contains dot at the end, new dot is not inserted. For example:
+            @verbatim
+            [gui.accessibility]
+            visual_bell=yes
+            @endverbatim
+            will result in option "gui.accessibility.visual_bell" with value
+            "yes" been returned.
+
+            TODO: maybe, we should just accept a pointer to options_description
+            class.
+        */ 
+        class common_config_file_iterator
+            : public boost::eof_iterator<common_config_file_iterator, bpo::option>
+        {
+        public:
+            common_config_file_iterator() { found_eof(); }
+            common_config_file_iterator(
+                const std::set<std::string>& allowed_options,
+                bool allow_unregistered = false);
+
+            virtual ~common_config_file_iterator() {}
+
+        public: // Method required by eof_iterator
+
+            void get();
+
+#if BOOST_WORKAROUND(_MSC_VER, <= 1900)
+            void decrement() {}
+            void advance(difference_type) {}
+#endif
+
+        protected: // Stubs for derived classes
+
+            // Obtains next line from the config file
+            // Note: really, this design is a bit ugly
+            // The most clean thing would be to pass 'line_iterator' to
+            // constructor of this class, but to avoid templating this class
+            // we'd need polymorphic iterator, which does not exist yet.
+            virtual bool getline(std::string&) { return false; }
+
+        protected:
+            /** Adds another allowed option. If the 'name' ends with
+                '*', then all options with the same prefix are
+                allowed. For example, if 'name' is 'foo*', then 'foo1' and
+                'foo_bar' are allowed. */
+            void add_option(const char* name);
+
+            // Returns true if 's' is a registered option name.
+            bool allowed_option(const std::string& s) const;
+
+            // That's probably too much data for iterator, since
+            // it will be copied, but let's not bother for now.
+            std::set<std::string> allowed_options;
+            // Invariant: no element is prefix of other element.
+            std::set<std::string> allowed_prefixes;
+            std::string m_prefix;
+            bool m_allow_unregistered;
+        };
+
+        common_config_file_iterator::common_config_file_iterator(
+            const std::set<std::string>& allowed_options,
+            bool allow_unregistered)
+            : allowed_options(allowed_options),
+              m_allow_unregistered(allow_unregistered)
+        {
+            for (std::set<std::string>::const_iterator i = allowed_options.begin();
+                i != allowed_options.end();
+                ++i)
+            {
+                add_option(i->c_str());
+            }
+        }
+
+        void common_config_file_iterator::add_option(const char* name)
+        {
+            std::string s(name);
+            assert(!s.empty());
+            if (*s.rbegin() == '*') {
+                s.resize(s.size() - 1);
+                bool bad_prefixes(false);
+                // If 's' is a prefix of one of allowed suffix, then
+                // lower_bound will return that element.
+                // If some element is prefix of 's', then lower_bound will
+                // return the next element.
+                std::set<std::string>::iterator i = allowed_prefixes.lower_bound(s);
+                if (i != allowed_prefixes.end()) {
+                    if (i->find(s) == 0)
+                        bad_prefixes = true;
+                }
+                if (i != allowed_prefixes.begin()) {
+                    --i;
+                    if (s.find(*i) == 0)
+                        bad_prefixes = true;
+                }
+                if (bad_prefixes)
+                    boost::throw_exception(bpo::error("options '" + std::string(name) + "' and '" +
+                                                      *i + "*' will both match the same "
+                                                      "arguments from the configuration file"));
+                allowed_prefixes.insert(s);
+            }
+        }
+
+        std::string trim_ws(const std::string& s)
+        {
+            std::string::size_type n, n2;
+            n = s.find_first_not_of(" \t\r\n");
+            if (n == std::string::npos)
+                return std::string();
+            else {
+                n2 = s.find_last_not_of(" \t\r\n");
+                return s.substr(n, n2 - n + 1);
+            }
+        }
+
+        void common_config_file_iterator::get()
+        {
+            std::string s;
+            std::string::size_type n;
+            bool found = false;
+
+            while (this->getline(s)) {
+
+                // strip '#' comments and whitespace
+                if ((n = s.find('#')) != std::string::npos)
+                    s = s.substr(0, n);
+                s = trim_ws(s);
+
+                if (!s.empty()) {
+                    // Handle section name
+                    if (*s.begin() == '[' && *s.rbegin() == ']') {
+                        m_prefix = s.substr(1, s.size() - 2);
+                        if (*m_prefix.rbegin() != '.')
+                            m_prefix += '.';
+                    }
+                    else if ((n = s.find('=')) != std::string::npos) {
+
+                        std::string name = m_prefix + trim_ws(s.substr(0, n));
+                        std::string value = trim_ws(s.substr(n + 1));
+
+                        bool registered = allowed_option(name);
+                        if (!registered && !m_allow_unregistered)
+                            boost::throw_exception(bpo::unknown_option(name));
+
+                        found = true;
+                        this->value().string_key = name;
+                        this->value().value.clear();
+                        this->value().value.push_back(value);
+                        this->value().unregistered = !registered;
+                        this->value().original_tokens.clear();
+                        this->value().original_tokens.push_back(name);
+                        this->value().original_tokens.push_back(value);
+                        break;
+
+                    } else {
+                        boost::throw_exception(bpo::invalid_config_file_syntax(s, bpo::invalid_syntax::unrecognized_line));
+                    }
+                }
+            }
+            if (!found)
+                found_eof();
+        }
+
+        bool common_config_file_iterator::allowed_option(const std::string& s) const
+        {
+            std::set<std::string>::const_iterator i = allowed_options.find(s);
+            if (i != allowed_options.end())
+                return true;
+            // If s is "pa" where "p" is allowed prefix then
+            // lower_bound should find the element after "p". 
+            // This depends on 'allowed_prefixes' invariant.
+            i = allowed_prefixes.lower_bound(s);
+            if (i != allowed_prefixes.begin() && s.find(*--i) == 0)
+                return true;
+            return false;
+        }
+
+
+
+        template<class charT>
+        class basic_config_file_iterator : public Files::common_config_file_iterator {
+        public:
+            basic_config_file_iterator()
+            {
+                found_eof();
+            }
+
+            /** Creates a config file parser for the specified stream.            
+            */
+            basic_config_file_iterator(std::basic_istream<charT>& is, 
+                                       const std::set<std::string>& allowed_options,
+                                       bool allow_unregistered = false); 
+
+        private: // base overrides
+
+            bool getline(std::string&);
+
+        private: // internal data
+            std::shared_ptr<std::basic_istream<charT> > is;
+        };
+
+        template<class charT>
+        basic_config_file_iterator<charT>::
+        basic_config_file_iterator(std::basic_istream<charT>& is, 
+                                   const std::set<std::string>& allowed_options,
+                                   bool allow_unregistered)
+        : common_config_file_iterator(allowed_options, allow_unregistered)
+        {
+            this->is.reset(&is, bpo::detail::null_deleter());                 
+            get();
+        }
+
+        template<class charT>
+        bool basic_config_file_iterator<charT>::getline(std::string& s)
+        {
+            std::basic_string<charT> in;
+            if (std::getline(*is, in)) {
+                s = bpo::to_internal(in);
+                return true;
+            } else {
+                return false;
+            }
+        }
+    }
+
+    template<class charT>
+    bpo::basic_parsed_options<charT>
+    parse_config_file(std::basic_istream<charT>& is, 
+                      const bpo::options_description& desc,
+                      bool allow_unregistered)
+    {    
+        std::set<std::string> allowed_options;
+
+        const std::vector<boost::shared_ptr<bpo::option_description> >& options = desc.options();
+        for (unsigned i = 0; i < options.size(); ++i)
+        {
+            const bpo::option_description& d = *options[i];
+
+            if (d.long_name().empty())
+                boost::throw_exception(
+                    bpo::error("abbreviated option names are not permitted in options configuration files"));
+
+            allowed_options.insert(d.long_name());
+        }
+
+        // Parser return char strings
+        bpo::parsed_options result(&desc);        
+        copy(basic_config_file_iterator<charT>(
+                 is, allowed_options, allow_unregistered), 
+             basic_config_file_iterator<charT>(), 
+             back_inserter(result.options));
+        // Convert char strings into desired type.
+        return bpo::basic_parsed_options<charT>(result);
+    }
+
+    template
+    bpo::basic_parsed_options<char>
+    parse_config_file(std::basic_istream<char>& is, 
+                      const bpo::options_description& desc,
+                      bool allow_unregistered);
+}
diff --git a/components/files/configfileparser.hpp b/components/files/configfileparser.hpp
new file mode 100644
index 0000000000..60ab27a6d4
--- /dev/null
+++ b/components/files/configfileparser.hpp
@@ -0,0 +1,17 @@
+#ifndef COMPONENTS_FILES_CONFIGFILEPARSER_HPP
+#define COMPONENTS_FILES_CONFIGFILEPARSER_HPP
+
+#include <boost/program_options/parsers.hpp>
+
+namespace Files
+{
+
+namespace bpo = boost::program_options;
+
+template<class charT>
+bpo::basic_parsed_options<charT> parse_config_file(std::basic_istream<charT>&, const bpo::options_description&,
+                                                   bool allow_unregistered = false);
+
+}
+
+#endif // COMPONENTS_FILES_CONFIGFILEPARSER_HPP
\ No newline at end of file
diff --git a/components/files/configurationmanager.cpp b/components/files/configurationmanager.cpp
index 35679ef293..7fd134cf0f 100644
--- a/components/files/configurationmanager.cpp
+++ b/components/files/configurationmanager.cpp
@@ -1,6 +1,7 @@
 #include "configurationmanager.hpp"
 
 #include <components/debug/debuglog.hpp>
+#include <components/files/configfileparser.hpp>
 #include <components/files/escape.hpp>
 #include <components/fallback/validate.hpp>
 
@@ -239,7 +240,7 @@ bool ConfigurationManager::loadConfig(const boost::filesystem::path& path,
         configFileStream.push(configFileStreamUnfiltered);
         if (configFileStreamUnfiltered.is_open())
         {
-            boost::program_options::store(boost::program_options::parse_config_file(
+            boost::program_options::store(Files::parse_config_file(
                 configFileStream, description, true), variables);
 
             return true;

From cf3596fbb4bd05f30c586f5a0a4111c038f313d4 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Thu, 7 Oct 2021 00:44:50 +0100
Subject: [PATCH 1435/2859] Add copyright preamble

---
 components/files/configfileparser.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/components/files/configfileparser.cpp b/components/files/configfileparser.cpp
index 7c43e1f67c..fe98ea11d2 100644
--- a/components/files/configfileparser.cpp
+++ b/components/files/configfileparser.cpp
@@ -1,3 +1,11 @@
+// This file's contents is largely lifted from boost::program_options with only minor modification.
+// Its original preamble (without updated dates) from those source files is below:
+
+// Copyright Vladimir Prus 2002-2004.
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt
+// or copy at http://www.boost.org/LICENSE_1_0.txt)
+
 #include "configfileparser.hpp"
 
 #include <boost/program_options/detail/config_file.hpp>

From 08608da62cd7b941dff11110b95e49ce39cda999 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Thu, 7 Oct 2021 08:29:38 +0000
Subject: [PATCH 1436/2859] optimizer.cpp

---
 components/sceneutil/optimizer.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/sceneutil/optimizer.cpp b/components/sceneutil/optimizer.cpp
index dffbe62ec7..2cfabbfe19 100644
--- a/components/sceneutil/optimizer.cpp
+++ b/components/sceneutil/optimizer.cpp
@@ -913,11 +913,11 @@ void Optimizer::RemoveRedundantNodesVisitor::removeRedundantNodes()
                 unsigned int childIndex = (*pitr)->getChildIndex(group);
                 for (unsigned int i=0; i<group->getNumChildren(); ++i)
                 {
-                    osg::Node* child = group->getChild(i);
-                    (*pitr)->insertChild(childIndex++, child);
+                    if (i==0)
+                        (*pitr)->setChild(childIndex, group->getChild(i));
+                    else
+                        (*pitr)->insertChild(childIndex+i, group->getChild(i));
                 }
-
-                (*pitr)->removeChild(group);
             }
 
             group->removeChildren(0, group->getNumChildren());

From e5abadc234517beb421a84f410cbc8607e1848dd Mon Sep 17 00:00:00 2001
From: florent teppe <teppe.florent@hotmail.fr>
Date: Thu, 7 Oct 2021 13:26:40 +0000
Subject: [PATCH 1437/2859] Fix keyword search when the keyword is preceded by
 a non whitespace non alpha character

---
 apps/openmw/mwdialogue/keywordsearch.hpp      | 23 ---------
 .../mwdialogue/test_keywordsearch.cpp         | 50 ++++++++++++++++++-
 2 files changed, 49 insertions(+), 24 deletions(-)

diff --git a/apps/openmw/mwdialogue/keywordsearch.hpp b/apps/openmw/mwdialogue/keywordsearch.hpp
index 8ba3349bc8..0c14ea8f8d 100644
--- a/apps/openmw/mwdialogue/keywordsearch.hpp
+++ b/apps/openmw/mwdialogue/keywordsearch.hpp
@@ -3,7 +3,6 @@
 
 #include <cctype>
 #include <map>
-#include <limits>
 #include <stdexcept>
 #include <vector>
 #include <algorithm>    // std::reverse
@@ -69,18 +68,6 @@ public:
         return false;
     }
 
-    static bool isWhitespaceUTF8(const int utf8Char)
-    {
-        if (utf8Char >= 0 && utf8Char <= static_cast<int>( std::numeric_limits<unsigned char>::max()))
-        {
-            //That function has undefined behavior if the character doesn't fit in unsigned char
-            return std::isspace(utf8Char);
-        }
-        else
-        {
-            return false;
-        }
-    }
 
     static bool sortMatches(const Match& left, const Match& right)
     {
@@ -92,16 +79,6 @@ public:
         std::vector<Match> matches;
         for (Point i = beg; i != end; ++i)
         {
-            // check if previous character marked start of new word
-            if (i != beg)
-            {
-                Point prev = i;
-                --prev;
-                if(!isWhitespaceUTF8(*prev))
-                    continue;
-            }
-
-
             // check first character
             typename Entry::childen_t::iterator candidate = mRoot.mChildren.find (Misc::StringUtils::toLower (*i));
 
diff --git a/apps/openmw_test_suite/mwdialogue/test_keywordsearch.cpp b/apps/openmw_test_suite/mwdialogue/test_keywordsearch.cpp
index 62b6f67aae..6128c7e5dd 100644
--- a/apps/openmw_test_suite/mwdialogue/test_keywordsearch.cpp
+++ b/apps/openmw_test_suite/mwdialogue/test_keywordsearch.cpp
@@ -74,7 +74,7 @@ TEST_F(KeywordSearchTest, keyword_test_utf8_word_begin)
     search.seed("états", 0);
     search.seed("ïrradiés", 0);
     search.seed("ça nous déçois", 0);
-
+    search.seed("ois", 0);
 
     std::string text = "les nations unis ont réunis le monde entier, états units inclus pour parler du problème des gens ïrradiés et ça nous déçois";
 
@@ -86,3 +86,51 @@ TEST_F(KeywordSearchTest, keyword_test_utf8_word_begin)
     EXPECT_EQ (std::string( matches[1].mBeg, matches[1].mEnd) , "ïrradiés");
     EXPECT_EQ (std::string( matches[2].mBeg, matches[2].mEnd) , "ça nous déçois");
 }
+
+TEST_F(KeywordSearchTest, keyword_test_non_alpha_non_whitespace_word_begin)
+{
+    // We make sure that the search works well even if the separator is not a whitespace
+    MWDialogue::KeywordSearch<std::string, int> search;
+    search.seed("Report to caius cosades", 0);
+
+
+
+    std::string text = "I was told to \"Report to caius cosades\"";
+
+    std::vector<MWDialogue::KeywordSearch<std::string, int>::Match> matches;
+    search.highlightKeywords(text.begin(), text.end(), matches);
+
+    EXPECT_EQ(matches.size(), 1);
+    EXPECT_EQ(std::string(matches[0].mBeg, matches[0].mEnd), "Report to caius cosades");
+}
+
+TEST_F(KeywordSearchTest, keyword_test_russian_non_ascii_before)
+{
+    // We make sure that the search works well even if the separator is not a whitespace with russian chars
+    MWDialogue::KeywordSearch<std::string, int> search;
+    search.seed("Доложить Каю Косадесу", 0);
+
+    std::string text = "Что? Да. Я Кай Косадес. То есть как это, вам велели «Доложить Каю Косадесу»? О чем вы говорите?";
+
+    std::vector<MWDialogue::KeywordSearch<std::string, int>::Match> matches;
+    search.highlightKeywords(text.begin(), text.end(), matches);
+
+    EXPECT_EQ(matches.size(), 1);
+    EXPECT_EQ(std::string(matches[0].mBeg, matches[0].mEnd), "Доложить Каю Косадесу");
+}
+
+TEST_F(KeywordSearchTest, keyword_test_russian_ascii_before)
+{
+    // We make sure that the search works well even if the separator is not a whitespace with russian chars
+    MWDialogue::KeywordSearch<std::string, int> search;
+    search.seed("Доложить Каю Косадесу", 0);
+
+    std::string text = "Что? Да. Я Кай Косадес. То есть как это, вам велели 'Доложить Каю Косадесу'? О чем вы говорите?";
+
+    std::vector<MWDialogue::KeywordSearch<std::string, int>::Match> matches;
+    search.highlightKeywords(text.begin(), text.end(), matches);
+
+    EXPECT_EQ(matches.size(), 1);
+    EXPECT_EQ(std::string(matches[0].mBeg, matches[0].mEnd), "Доложить Каю Косадесу");
+}
+

From caafd0c66736638d22d93a6f9b3bac4a1b020120 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 7 Oct 2021 21:09:43 +0200
Subject: [PATCH 1438/2859] Remove CE enchantments before saving stats when
 turning into a werewolf

---
 apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 5e18e737df..e7ae900086 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -1761,17 +1761,6 @@ namespace MWMechanics
 
         MWWorld::Player* player = &MWBase::Environment::get().getWorld()->getPlayer();
 
-        if (actor == player->getPlayer())
-        {
-            if (werewolf)
-            {
-                player->saveStats();
-                player->setWerewolfStats();
-            }
-            else
-                player->restoreStats();
-        }
-
         // Werewolfs can not cast spells, so we need to unset the prepared spell if there is one.
         if (npcStats.getDrawState() == MWMechanics::DrawState_Spell)
             npcStats.setDrawState(MWMechanics::DrawState_Nothing);
@@ -1800,11 +1789,16 @@ namespace MWMechanics
 
             if (werewolf)
             {
+                // Remove CE enchantments before saving stats
+                mActors.updateActor(actor, 0.f);
+                player->saveStats();
+                player->setWerewolfStats();
                 windowManager->forceHide(MWGui::GW_Inventory);
                 windowManager->forceHide(MWGui::GW_Magic);
             }
             else
             {
+                player->restoreStats();
                 windowManager->unsetForceHide(MWGui::GW_Inventory);
                 windowManager->unsetForceHide(MWGui::GW_Magic);
             }

From 5242e2695c3cf908820607bd28b50c42355421f2 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Fri, 8 Oct 2021 07:56:55 +0000
Subject: [PATCH 1439/2859] avoids memory allocations within
 ComputeLightSpaceBounds (#3156)

Currently, we create a new ComputeLightSpaceBounds visitor per frame. Within this visitor, we require excessive memory allocations, mainly a new osg::RefMatrix per encountered Transform node.

With this PR we reuse a single ComputeLightSpaceBounds visitor across frames and enable the createOrReuseMatrix functionality to avoid allocating new matrices every frame. osgUtil::CullVisitor internally uses the same approach.
---
 components/sceneutil/mwshadowtechnique.cpp | 29 ++++++++++++++++------
 components/sceneutil/mwshadowtechnique.hpp |  6 ++++-
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
index 95ff8f2b01..db7aef7cb1 100644
--- a/components/sceneutil/mwshadowtechnique.cpp
+++ b/components/sceneutil/mwshadowtechnique.cpp
@@ -353,18 +353,20 @@ void VDSMCameraCullCallback::operator()(osg::Node* node, osg::NodeVisitor* nv)
 
 } // namespace
 
-MWShadowTechnique::ComputeLightSpaceBounds::ComputeLightSpaceBounds(osg::Viewport* viewport, const osg::Matrixd& projectionMatrix, osg::Matrixd& viewMatrix) :
+MWShadowTechnique::ComputeLightSpaceBounds::ComputeLightSpaceBounds() :
     osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ACTIVE_CHILDREN)
 {
     setCullingMode(osg::CullSettings::VIEW_FRUSTUM_CULLING);
 
-    pushViewport(viewport);
-    pushProjectionMatrix(new osg::RefMatrix(projectionMatrix));
-    pushModelViewMatrix(new osg::RefMatrix(viewMatrix), osg::Transform::ABSOLUTE_RF);
-
     setName("SceneUtil::MWShadowTechnique::ComputeLightSpaceBounds,AcceptedByComponentsTerrainQuadTreeWorld");
 }
 
+void MWShadowTechnique::ComputeLightSpaceBounds::reset()
+{
+    osg::CullStack::reset();
+    _bb = osg::BoundingBox();
+}
+
 void MWShadowTechnique::ComputeLightSpaceBounds::apply(osg::Node& node)
 {
     if (isCulled(node)) return;
@@ -421,9 +423,9 @@ void MWShadowTechnique::ComputeLightSpaceBounds::apply(osg::Transform& transform
     // absolute transforms won't affect a shadow map so their subgraphs should be ignored.
     if (transform.getReferenceFrame() == osg::Transform::RELATIVE_RF)
     {
-        osg::ref_ptr<osg::RefMatrix> matrix = new osg::RefMatrix(*getModelViewMatrix());
+        osg::RefMatrix* matrix = createOrReuseMatrix(*getModelViewMatrix());
         transform.computeLocalToWorldMatrix(*matrix, this);
-        pushModelViewMatrix(matrix.get(), transform.getReferenceFrame());
+        pushModelViewMatrix(matrix, transform.getReferenceFrame());
 
         traverse(transform);
 
@@ -1125,7 +1127,12 @@ void MWShadowTechnique::cull(osgUtil::CullVisitor& cv)
             // osg::ElapsedTime timer;
 
             osg::ref_ptr<osg::Viewport> viewport = new osg::Viewport(0,0,2048,2048);
-            ComputeLightSpaceBounds clsb(viewport.get(), projectionMatrix, viewMatrix);
+            if (!_clsb) _clsb = new ComputeLightSpaceBounds;
+            ComputeLightSpaceBounds& clsb = *_clsb;
+            clsb.reset();
+            clsb.pushViewport(viewport);
+            clsb.pushProjectionMatrix(new osg::RefMatrix(projectionMatrix));
+            clsb.pushModelViewMatrix(new osg::RefMatrix(viewMatrix), osg::Transform::ABSOLUTE_RF);
             clsb.setTraversalMask(_shadowedScene->getCastsShadowTraversalMask());
 
             osg::Matrixd invertModelView;
@@ -1139,6 +1146,12 @@ void MWShadowTechnique::cull(osgUtil::CullVisitor& cv)
 
             _shadowedScene->accept(clsb);
 
+            clsb.popCullingSet();
+
+            clsb.popModelViewMatrix();
+            clsb.popProjectionMatrix();
+            clsb.popViewport();
+
             // OSG_NOTICE<<"Extents of LightSpace "<<clsb._bb.xMin()<<", "<<clsb._bb.xMax()<<", "<<clsb._bb.yMin()<<", "<<clsb._bb.yMax()<<", "<<clsb._bb.zMin()<<", "<<clsb._bb.zMax()<<std::endl;
             // OSG_NOTICE<<"  time "<<timer.elapsedTime_m()<<"ms, mask = "<<std::hex<<_shadowedScene->getCastsShadowTraversalMask()<<std::endl;
 
diff --git a/components/sceneutil/mwshadowtechnique.hpp b/components/sceneutil/mwshadowtechnique.hpp
index de57bf1fdc..229d444c2b 100644
--- a/components/sceneutil/mwshadowtechnique.hpp
+++ b/components/sceneutil/mwshadowtechnique.hpp
@@ -90,7 +90,7 @@ namespace SceneUtil {
         class ComputeLightSpaceBounds : public osg::NodeVisitor, public osg::CullStack
         {
         public:
-            ComputeLightSpaceBounds(osg::Viewport* viewport, const osg::Matrixd& projectionMatrix, osg::Matrixd& viewMatrix);
+            ComputeLightSpaceBounds();
 
             void apply(osg::Node& node) override;
 
@@ -112,6 +112,8 @@ namespace SceneUtil {
 
             void update(const osg::Vec3& v);
 
+            void reset() override;
+
             osg::BoundingBox _bb;
         };
 
@@ -238,6 +240,8 @@ namespace SceneUtil {
     protected:
         virtual ~MWShadowTechnique();
 
+        osg::ref_ptr<ComputeLightSpaceBounds>   _clsb;
+
         typedef std::map< osgUtil::CullVisitor*, osg::ref_ptr<ViewDependentData> >  ViewDependentDataMap;
         mutable std::mutex                      _viewDependentDataMapMutex;
         ViewDependentDataMap                    _viewDependentDataMap;

From f6eeee3ad5810635b27a8f2df53cf7a499ecd1ff Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Tue, 5 Oct 2021 21:48:47 +0200
Subject: [PATCH 1440/2859] Detect keys and enchanted items in containers
 without custom data

---
 CHANGELOG.md                     |  1 +
 apps/openmw/mwworld/worldimp.cpp | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 54ded2a9bf..b84dfd7e80 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,6 +52,7 @@
     Bug #6302: Teleporting disabled actor breaks its disabled state
     Bug #6307: Pathfinding in Infidelities quest from Tribunal addon is broken
     Bug #6323: Wyrmhaven: Alboin doesn't follower the player character out of his house
+    Bug #6326: Detect Enchantment/Key should detect items in unresolved containers
     Feature #890: OpenMW-CS: Column filtering
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
     Feature #2780: A way to see current OpenMW version in the console
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 299cc8676b..5218dfe249 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -3420,7 +3420,29 @@ namespace MWWorld
             {
                 // but ignore containers without resolved content
                 if (isContainer && ptr.getRefData().getCustomData() == nullptr)
+                {
+                    const auto& store = MWBase::Environment::get().getWorld()->getStore();
+                    for(const auto& containerItem :  ptr.get<ESM::Container>()->mBase->mInventory.mList)
+                    {
+                        if(containerItem.mCount)
+                        {
+                            try
+                            {
+                                ManualRef ref(store, containerItem.mItem, containerItem.mCount);
+                                if(needToAdd(ref.getPtr(), mDetector))
+                                {
+                                    mOut.push_back(ptr);
+                                    return true;
+                                }
+                            }
+                            catch (const std::exception&)
+                            {
+                                // Ignore invalid item id
+                            }
+                        }
+                    }
                     return true;
+                }
 
                 MWWorld::ContainerStore& store = ptr.getClass().getContainerStore(ptr);
                 {

From ec735529dab2db23ead2fe1f212d9ff52f67a11e Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Fri, 8 Oct 2021 17:32:41 +0200
Subject: [PATCH 1441/2859] Remove active effects from the player when
 transforming

---
 apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index e7ae900086..5245e09f36 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -1787,10 +1787,15 @@ namespace MWMechanics
             // Update the GUI only when called on the player
             MWBase::WindowManager* windowManager = MWBase::Environment::get().getWindowManager();
 
+            // Transforming removes all temporary effects
+            actor.getClass().getCreatureStats(actor).getActiveSpells().purge([] (const auto& params)
+            {
+                return params.getType() == ESM::ActiveSpells::Type_Consumable || params.getType() == ESM::ActiveSpells::Type_Temporary;
+            }, actor);
+            mActors.updateActor(actor, 0.f);
+
             if (werewolf)
             {
-                // Remove CE enchantments before saving stats
-                mActors.updateActor(actor, 0.f);
                 player->saveStats();
                 player->setWerewolfStats();
                 windowManager->forceHide(MWGui::GW_Inventory);

From af0d399103e86964862286f9248589f140874f08 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Sat, 9 Oct 2021 01:49:08 +0100
Subject: [PATCH 1442/2859] Purge all uses of Escape Hash types

---
 apps/opencs/editor.cpp                        | 26 ++++-----
 apps/openmw/main.cpp                          | 54 +++++++++----------
 apps/openmw_test_suite/mwworld/test_store.cpp | 12 ++---
 components/files/configfileparser.cpp         |  4 +-
 components/files/configurationmanager.cpp     | 23 ++++----
 5 files changed, 58 insertions(+), 61 deletions(-)

diff --git a/apps/opencs/editor.cpp b/apps/opencs/editor.cpp
index 3f53a523f4..b437a36201 100644
--- a/apps/opencs/editor.cpp
+++ b/apps/opencs/editor.cpp
@@ -88,16 +88,16 @@ std::pair<Files::PathContainer, std::vector<std::string> > CS::Editor::readConfi
     boost::program_options::options_description desc("Syntax: openmw-cs <options>\nAllowed options");
 
     desc.add_options()
-    ("data", boost::program_options::value<Files::EscapePathContainer>()->default_value(Files::EscapePathContainer(), "data")->multitoken()->composing())
-    ("data-local", boost::program_options::value<Files::EscapePath>()->default_value(Files::EscapePath(), ""))
+    ("data", boost::program_options::value<Files::PathContainer>()->default_value(Files::PathContainer(), "data")->multitoken()->composing())
+    ("data-local", boost::program_options::value<Files::PathContainer::value_type>()->default_value(Files::PathContainer::value_type(), ""))
     ("fs-strict", boost::program_options::value<bool>()->implicit_value(true)->default_value(false))
-    ("encoding", boost::program_options::value<Files::EscapeHashString>()->default_value("win1252"))
-    ("resources", boost::program_options::value<Files::EscapePath>()->default_value(Files::EscapePath(), "resources"))
-    ("fallback-archive", boost::program_options::value<Files::EscapeStringVector>()->
-        default_value(Files::EscapeStringVector(), "fallback-archive")->multitoken())
+    ("encoding", boost::program_options::value<std::string>()->default_value("win1252"))
+    ("resources", boost::program_options::value<boost::filesystem::path>()->default_value(boost::filesystem::path(), "resources"))
+    ("fallback-archive", boost::program_options::value<std::vector<std::string>>()->
+        default_value(std::vector<std::string>(), "fallback-archive")->multitoken())
     ("fallback", boost::program_options::value<FallbackMap>()->default_value(FallbackMap(), "")
         ->multitoken()->composing(), "fallback values")
-    ("script-blacklist", boost::program_options::value<Files::EscapeStringVector>()->default_value(Files::EscapeStringVector(), "")
+    ("script-blacklist", boost::program_options::value<std::vector<std::string>>()->default_value(std::vector<std::string>(), "")
         ->multitoken(), "exclude specified script from the verifier (if the use of the blacklist is enabled)")
     ("script-blacklist-use", boost::program_options::value<bool>()->implicit_value(true)
         ->default_value(true), "enable script blacklisting");
@@ -108,24 +108,24 @@ std::pair<Files::PathContainer, std::vector<std::string> > CS::Editor::readConfi
 
     Fallback::Map::init(variables["fallback"].as<FallbackMap>().mMap);
 
-    mEncodingName = variables["encoding"].as<Files::EscapeHashString>().toStdString();
+    mEncodingName = variables["encoding"].as<std::string>();
     mDocumentManager.setEncoding(ToUTF8::calculateEncoding(mEncodingName));
     mFileDialog.setEncoding (QString::fromUtf8(mEncodingName.c_str()));
 
-    mDocumentManager.setResourceDir (mResources = variables["resources"].as<Files::EscapePath>().mPath);
+    mDocumentManager.setResourceDir (mResources = variables["resources"].as<boost::filesystem::path>());
 
     if (variables["script-blacklist-use"].as<bool>())
         mDocumentManager.setBlacklistedScripts (
-            variables["script-blacklist"].as<Files::EscapeStringVector>().toStdStringVector());
+            variables["script-blacklist"].as<std::vector<std::string>>());
 
     mFsStrict = variables["fs-strict"].as<bool>();
 
     Files::PathContainer dataDirs, dataLocal;
     if (!variables["data"].empty()) {
-        dataDirs = Files::PathContainer(Files::EscapePath::toPathContainer(variables["data"].as<Files::EscapePathContainer>()));
+        dataDirs = variables["data"].as<Files::PathContainer>();
     }
 
-    Files::PathContainer::value_type local(variables["data-local"].as<Files::EscapePath>().mPath);
+    Files::PathContainer::value_type local(variables["data-local"].as<Files::PathContainer::value_type>());
     if (!local.empty())
         dataLocal.push_back(local);
 
@@ -155,7 +155,7 @@ std::pair<Files::PathContainer, std::vector<std::string> > CS::Editor::readConfi
         mFileDialog.addFiles(path);
     }
 
-    return std::make_pair (dataDirs, variables["fallback-archive"].as<Files::EscapeStringVector>().toStdStringVector());
+    return std::make_pair (dataDirs, variables["fallback-archive"].as<std::vector<std::string>>());
 }
 
 void CS::Editor::createGame()
diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index de0fb0df03..5de177a907 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -45,31 +45,31 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
         ("help", "print help message")
         ("version", "print version information and quit")
 
-        ("replace", bpo::value<Files::EscapeStringVector>()->default_value(Files::EscapeStringVector(), "")
+        ("replace", bpo::value<StringsVector>()->default_value(StringsVector(), "")
             ->multitoken()->composing(), "settings where the values from the current source should replace those from lower-priority sources instead of being appended")
 
-        ("data", bpo::value<Files::EscapePathContainer>()->default_value(Files::EscapePathContainer(), "data")
+        ("data", bpo::value<Files::PathContainer>()->default_value(Files::PathContainer(), "data")
             ->multitoken()->composing(), "set data directories (later directories have higher priority)")
 
-        ("data-local", bpo::value<Files::EscapePath>()->default_value(Files::EscapePath(), ""),
+        ("data-local", bpo::value<Files::PathContainer::value_type>()->default_value(Files::PathContainer::value_type(), ""),
             "set local data directory (highest priority)")
 
-        ("fallback-archive", bpo::value<Files::EscapeStringVector>()->default_value(Files::EscapeStringVector(), "fallback-archive")
+        ("fallback-archive", bpo::value<StringsVector>()->default_value(StringsVector(), "fallback-archive")
             ->multitoken()->composing(), "set fallback BSA archives (later archives have higher priority)")
 
-        ("resources", bpo::value<Files::EscapePath>()->default_value(Files::EscapePath(), "resources"),
+        ("resources", bpo::value<boost::filesystem::path>()->default_value(boost::filesystem::path(), "resources"),
             "set resources directory")
 
-        ("start", bpo::value<Files::EscapeHashString>()->default_value(""),
+        ("start", bpo::value<std::string>()->default_value(""),
             "set initial cell")
 
-        ("content", bpo::value<Files::EscapeStringVector>()->default_value(Files::EscapeStringVector(), "")
+        ("content", bpo::value<StringsVector>()->default_value(StringsVector(), "")
             ->multitoken()->composing(), "content file(s): esm/esp, or omwgame/omwaddon")
 
-        ("groundcover", bpo::value<Files::EscapeStringVector>()->default_value(Files::EscapeStringVector(), "")
+        ("groundcover", bpo::value<StringsVector>()->default_value(StringsVector(), "")
             ->multitoken()->composing(), "groundcover content file(s): esm/esp, or omwgame/omwaddon")
 
-        ("lua-scripts", bpo::value<Files::EscapeStringVector>()->default_value(Files::EscapeStringVector(), "")
+        ("lua-scripts", bpo::value<StringsVector>()->default_value(StringsVector(), "")
             ->multitoken()->composing(), "file(s) with a list of global Lua scripts: omwscripts")
 
         ("no-sound", bpo::value<bool>()->implicit_value(true)
@@ -84,7 +84,7 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
         ("script-console", bpo::value<bool>()->implicit_value(true)
             ->default_value(false), "enable console-only script functionality")
 
-        ("script-run", bpo::value<Files::EscapeHashString>()->default_value(""),
+        ("script-run", bpo::value<std::string>()->default_value(""),
             "select a file containing a list of console commands that is executed on startup")
 
         ("script-warn", bpo::value<int>()->implicit_value (1)
@@ -94,13 +94,13 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
             "\t1 - show warning but consider script as correctly compiled anyway\n"
             "\t2 - treat warnings as errors")
 
-        ("script-blacklist", bpo::value<Files::EscapeStringVector>()->default_value(Files::EscapeStringVector(), "")
+        ("script-blacklist", bpo::value<StringsVector>()->default_value(StringsVector(), "")
             ->multitoken()->composing(), "ignore the specified script (if the use of the blacklist is enabled)")
 
         ("script-blacklist-use", bpo::value<bool>()->implicit_value(true)
             ->default_value(true), "enable script blacklisting")
 
-        ("load-savegame", bpo::value<Files::EscapePath>()->default_value(Files::EscapePath(), ""),
+        ("load-savegame", bpo::value<boost::filesystem::path>()->default_value(boost::filesystem::path(), ""),
             "load a save game file on game startup (specify an absolute filename or a filename relative to the current working directory)")
 
         ("skip-menu", bpo::value<bool>()->implicit_value(true)
@@ -112,7 +112,7 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
         ("fs-strict", bpo::value<bool>()->implicit_value(true)
             ->default_value(false), "strict file system handling (no case folding)")
 
-        ("encoding", bpo::value<Files::EscapeHashString>()->
+        ("encoding", bpo::value<std::string>()->
             default_value("win1252"),
             "Character encoding used in OpenMW game messages:\n"
             "\n\twin1250 - Central and Eastern European such as Polish, Czech, Slovak, Hungarian, Slovene, Bosnian, Croatian, Serbian (Latin script), Romanian and Albanian languages\n"
@@ -153,7 +153,7 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     {
         cfgMgr.readConfiguration(variables, desc, true);
 
-        Version::Version v = Version::getOpenmwVersion(variables["resources"].as<Files::EscapePath>().mPath.string());
+        Version::Version v = Version::getOpenmwVersion(variables["resources"].as<boost::filesystem::path>().string());
         getRawStdout() << v.describe() << std::endl;
         return false;
     }
@@ -162,38 +162,38 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     cfgMgr.readConfiguration(variables, desc);
     cfgMgr.mergeComposingVariables(variables, composingVariables, desc);
 
-    Version::Version v = Version::getOpenmwVersion(variables["resources"].as<Files::EscapePath>().mPath.string());
+    Version::Version v = Version::getOpenmwVersion(variables["resources"].as<boost::filesystem::path>().string());
     Log(Debug::Info) << v.describe();
 
     engine.setGrabMouse(!variables["no-grab"].as<bool>());
 
     // Font encoding settings
-    std::string encoding(variables["encoding"].as<Files::EscapeHashString>().toStdString());
+    std::string encoding(variables["encoding"].as<std::string>());
     Log(Debug::Info) << ToUTF8::encodingUsingMessage(encoding);
     engine.setEncoding(ToUTF8::calculateEncoding(encoding));
 
     // directory settings
     engine.enableFSStrict(variables["fs-strict"].as<bool>());
 
-    Files::PathContainer dataDirs(Files::EscapePath::toPathContainer(variables["data"].as<Files::EscapePathContainer>()));
+    Files::PathContainer dataDirs(variables["data"].as<Files::PathContainer>());
 
-    Files::PathContainer::value_type local(variables["data-local"].as<Files::EscapePath>().mPath);
+    Files::PathContainer::value_type local(variables["data-local"].as<Files::PathContainer::value_type>());
     if (!local.empty())
         dataDirs.push_back(local);
 
     cfgMgr.processPaths(dataDirs);
 
-    engine.setResourceDir(variables["resources"].as<Files::EscapePath>().mPath);
+    engine.setResourceDir(variables["resources"].as<boost::filesystem::path>());
     engine.setDataDirs(dataDirs);
 
     // fallback archives
-    StringsVector archives = variables["fallback-archive"].as<Files::EscapeStringVector>().toStdStringVector();
+    StringsVector archives = variables["fallback-archive"].as<StringsVector>();
     for (StringsVector::const_iterator it = archives.begin(); it != archives.end(); ++it)
     {
         engine.addArchive(*it);
     }
 
-    StringsVector content = variables["content"].as<Files::EscapeStringVector>().toStdStringVector();
+    StringsVector content = variables["content"].as<StringsVector>();
     if (content.empty())
     {
         Log(Debug::Error) << "No content file given (esm/esp, nor omwgame/omwaddon). Aborting...";
@@ -214,18 +214,18 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
         engine.addContentFile(file);
     }
 
-    StringsVector groundcover = variables["groundcover"].as<Files::EscapeStringVector>().toStdStringVector();
+    StringsVector groundcover = variables["groundcover"].as<StringsVector>();
     for (auto& file : groundcover)
     {
         engine.addGroundcoverFile(file);
     }
 
-    StringsVector luaScriptLists = variables["lua-scripts"].as<Files::EscapeStringVector>().toStdStringVector();
+    StringsVector luaScriptLists = variables["lua-scripts"].as<StringsVector>();
     for (const auto& file : luaScriptLists)
         engine.addLuaScriptListFile(file);
 
     // startup-settings
-    engine.setCell(variables["start"].as<Files::EscapeHashString>().toStdString());
+    engine.setCell(variables["start"].as<std::string>());
     engine.setSkipMenu (variables["skip-menu"].as<bool>(), variables["new-game"].as<bool>());
     if (!variables["skip-menu"].as<bool>() && variables["new-game"].as<bool>())
         Log(Debug::Warning) << "Warning: new-game used without skip-menu -> ignoring it";
@@ -234,11 +234,11 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     engine.setCompileAll(variables["script-all"].as<bool>());
     engine.setCompileAllDialogue(variables["script-all-dialogue"].as<bool>());
     engine.setScriptConsoleMode (variables["script-console"].as<bool>());
-    engine.setStartupScript (variables["script-run"].as<Files::EscapeHashString>().toStdString());
+    engine.setStartupScript (variables["script-run"].as<std::string>());
     engine.setWarningsMode (variables["script-warn"].as<int>());
-    engine.setScriptBlacklist (variables["script-blacklist"].as<Files::EscapeStringVector>().toStdStringVector());
+    engine.setScriptBlacklist (variables["script-blacklist"].as<StringsVector>());
     engine.setScriptBlacklistUse (variables["script-blacklist-use"].as<bool>());
-    engine.setSaveGameFile (variables["load-savegame"].as<Files::EscapePath>().mPath.string());
+    engine.setSaveGameFile (variables["load-savegame"].as<boost::filesystem::path>().string());
 
     // other settings
     Fallback::Map::init(variables["fallback"].as<FallbackMap>().mMap);
diff --git a/apps/openmw_test_suite/mwworld/test_store.cpp b/apps/openmw_test_suite/mwworld/test_store.cpp
index f3b2bb3dcb..13a9ebee9c 100644
--- a/apps/openmw_test_suite/mwworld/test_store.cpp
+++ b/apps/openmw_test_suite/mwworld/test_store.cpp
@@ -59,10 +59,10 @@ struct ContentFileTest : public ::testing::Test
 
         boost::program_options::options_description desc("Allowed options");
         desc.add_options()
-        ("data", boost::program_options::value<Files::EscapePathContainer>()->default_value(Files::EscapePathContainer(), "data")->multitoken()->composing())
-        ("content", boost::program_options::value<Files::EscapeStringVector>()->default_value(Files::EscapeStringVector(), "")
+        ("data", boost::program_options::value<Files::PathContainer>()->default_value(Files::PathContainer(), "data")->multitoken()->composing())
+        ("content", boost::program_options::value<std::vector<std::string>>()->default_value(std::vector<std::string>(), "")
             ->multitoken()->composing(), "content file(s): esm/esp, or omwgame/omwaddon")
-        ("data-local", boost::program_options::value<Files::EscapePath>()->default_value(Files::EscapePath(), ""));
+        ("data-local", boost::program_options::value<Files::PathContainer::value_type>()->default_value(Files::PathContainer::value_type(), ""));
 
         boost::program_options::notify(variables);
 
@@ -70,10 +70,10 @@ struct ContentFileTest : public ::testing::Test
 
         Files::PathContainer dataDirs, dataLocal;
         if (!variables["data"].empty()) {
-            dataDirs = Files::EscapePath::toPathContainer(variables["data"].as<Files::EscapePathContainer>());
+            dataDirs = variables["data"].as<Files::PathContainer>();
         }
 
-        Files::PathContainer::value_type local(variables["data-local"].as<Files::EscapePath>().mPath);
+        Files::PathContainer::value_type local(variables["data-local"].as<Files::PathContainer::value_type>());
         if (!local.empty()) {
             dataLocal.push_back(local);
         }
@@ -86,7 +86,7 @@ struct ContentFileTest : public ::testing::Test
 
         Files::Collections collections (dataDirs, true);
 
-        std::vector<std::string> contentFiles = variables["content"].as<Files::EscapeStringVector>().toStdStringVector();
+        std::vector<std::string> contentFiles = variables["content"].as<std::vector<std::string>>();
         for (auto & contentFile : contentFiles)
             mContentFiles.push_back(collections.getPath(contentFile));
     }
diff --git a/components/files/configfileparser.cpp b/components/files/configfileparser.cpp
index fe98ea11d2..7fcc033157 100644
--- a/components/files/configfileparser.cpp
+++ b/components/files/configfileparser.cpp
@@ -158,8 +158,8 @@ namespace Files
             while (this->getline(s)) {
 
                 // strip '#' comments and whitespace
-                if ((n = s.find('#')) != std::string::npos)
-                    s = s.substr(0, n);
+                if (s.find('#') == s.find_first_not_of(" \t\r\n"))
+                    continue;
                 s = trim_ws(s);
 
                 if (!s.empty()) {
diff --git a/components/files/configurationmanager.cpp b/components/files/configurationmanager.cpp
index 7fd134cf0f..8aa6853237 100644
--- a/components/files/configurationmanager.cpp
+++ b/components/files/configurationmanager.cpp
@@ -108,7 +108,7 @@ void ConfigurationManager::mergeComposingVariables(boost::program_options::varia
         auto replace = second["replace"];
         if (!replace.defaulted() && !replace.empty())
         {
-            std::vector<std::string> replaceVector = replace.as<Files::EscapeStringVector>().toStdStringVector();
+            std::vector<std::string> replaceVector = replace.as<std::vector<std::string>>();
             replacedVariables.insert(replaceVector.begin(), replaceVector.end());
         }
     }
@@ -137,19 +137,19 @@ void ConfigurationManager::mergeComposingVariables(boost::program_options::varia
             boost::any& firstValue = firstPosition->second.value();
             const boost::any& secondValue = second[name].value();
             
-            if (firstValue.type() == typeid(Files::EscapePathContainer))
+            if (firstValue.type() == typeid(Files::PathContainer))
             {
-                auto& firstPathContainer = boost::any_cast<Files::EscapePathContainer&>(firstValue);
-                const auto& secondPathContainer = boost::any_cast<const Files::EscapePathContainer&>(secondValue);
+                auto& firstPathContainer = boost::any_cast<Files::PathContainer&>(firstValue);
+                const auto& secondPathContainer = boost::any_cast<const Files::PathContainer&>(secondValue);
 
                 firstPathContainer.insert(firstPathContainer.end(), secondPathContainer.begin(), secondPathContainer.end());
             }
-            else if (firstValue.type() == typeid(Files::EscapeStringVector))
+            else if (firstValue.type() == typeid(std::vector<std::string>))
             {
-                auto& firstVector = boost::any_cast<Files::EscapeStringVector&>(firstValue);
-                const auto& secondVector = boost::any_cast<const Files::EscapeStringVector&>(secondValue);
+                auto& firstVector = boost::any_cast<std::vector<std::string>&>(firstValue);
+                const auto& secondVector = boost::any_cast<const std::vector<std::string>&>(secondValue);
 
-                firstVector.mVector.insert(firstVector.mVector.end(), secondVector.mVector.begin(), secondVector.mVector.end());
+                firstVector.insert(firstVector.end(), secondVector.begin(), secondVector.end());
             }
             else if (firstValue.type() == typeid(Fallback::FallbackMap))
             {
@@ -234,11 +234,8 @@ bool ConfigurationManager::loadConfig(const boost::filesystem::path& path,
         if (!mSilent)
             Log(Debug::Info) << "Loading config file: " << cfgFile.string();
 
-        boost::filesystem::ifstream configFileStreamUnfiltered(cfgFile);
-        boost::iostreams::filtering_istream configFileStream;
-        configFileStream.push(escape_hash_filter());
-        configFileStream.push(configFileStreamUnfiltered);
-        if (configFileStreamUnfiltered.is_open())
+        boost::filesystem::ifstream configFileStream(cfgFile);
+        if (configFileStream.is_open())
         {
             boost::program_options::store(Files::parse_config_file(
                 configFileStream, description, true), variables);

From b61140b8ba930ecfdf8d9523c62e28e257fb555f Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Sat, 9 Oct 2021 09:14:22 +0000
Subject: [PATCH 1443/2859] optimises skeleton.cpp (#3158)

With this PR we optimise a function that is called quite often when loading new cells.

We remove avoidable dynamic_casts.
We remove an unused pair.second element.
We convert a map to an unordered_map because its ordering is irrelevant in this case.
We avoid adding the root Skeleton node to the bones' node path.
---
 components/sceneutil/skeleton.cpp | 28 +++++++++++-----------------
 components/sceneutil/skeleton.hpp |  3 ++-
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/components/sceneutil/skeleton.cpp b/components/sceneutil/skeleton.cpp
index 40f524e0a2..c465333fb4 100644
--- a/components/sceneutil/skeleton.cpp
+++ b/components/sceneutil/skeleton.cpp
@@ -1,6 +1,5 @@
 #include "skeleton.hpp"
 
-#include <osg/Transform>
 #include <osg/MatrixTransform>
 
 #include <components/debug/debuglog.hpp>
@@ -12,24 +11,24 @@ namespace SceneUtil
 class InitBoneCacheVisitor : public osg::NodeVisitor
 {
 public:
-    InitBoneCacheVisitor(std::map<std::string, std::pair<osg::NodePath, osg::MatrixTransform*> >& cache)
+    typedef std::vector<osg::MatrixTransform*> TransformPath;
+    InitBoneCacheVisitor(std::unordered_map<std::string, TransformPath>& cache)
         : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
         , mCache(cache)
     {
     }
 
-    void apply(osg::Transform &node) override
+    void apply(osg::MatrixTransform &node) override
     {
-        osg::MatrixTransform* bone = node.asMatrixTransform();
-        if (!bone)
-            return;
-
-        mCache[Misc::StringUtils::lowerCase(bone->getName())] = std::make_pair(getNodePath(), bone);
-
+        mPath.push_back(&node);
+        mCache[Misc::StringUtils::lowerCase(node.getName())] = mPath;
         traverse(node);
+        mPath.pop_back();
     }
+
 private:
-    std::map<std::string, std::pair<osg::NodePath, osg::MatrixTransform*> >& mCache;
+    TransformPath mPath;
+    std::unordered_map<std::string, TransformPath>& mCache;
 };
 
 Skeleton::Skeleton()
@@ -73,18 +72,13 @@ Bone* Skeleton::getBone(const std::string &name)
         mRootBone.reset(new Bone);
     }
 
-    const osg::NodePath& path = found->second.first;
     Bone* bone = mRootBone.get();
-    for (osg::NodePath::const_iterator it = path.begin(); it != path.end(); ++it)
+    for (osg::MatrixTransform* matrixTransform : found->second)
     {
-        osg::MatrixTransform* matrixTransform = dynamic_cast<osg::MatrixTransform*>(*it);
-        if (!matrixTransform)
-            continue;
-
         Bone* child = nullptr;
         for (unsigned int i=0; i<bone->mChildren.size(); ++i)
         {
-            if (bone->mChildren[i]->mNode == *it)
+            if (bone->mChildren[i]->mNode == matrixTransform)
             {
                 child = bone->mChildren[i];
                 break;
diff --git a/components/sceneutil/skeleton.hpp b/components/sceneutil/skeleton.hpp
index 22988dfd5f..10f4640249 100644
--- a/components/sceneutil/skeleton.hpp
+++ b/components/sceneutil/skeleton.hpp
@@ -4,6 +4,7 @@
 #include <osg/Group>
 
 #include <memory>
+#include <unordered_map>
 
 namespace SceneUtil
 {
@@ -72,7 +73,7 @@ namespace SceneUtil
         // As far as the scene graph goes we support multiple root bones.
         std::unique_ptr<Bone> mRootBone;
 
-        typedef std::map<std::string, std::pair<osg::NodePath, osg::MatrixTransform*> > BoneCache;
+        typedef std::unordered_map<std::string, std::vector<osg::MatrixTransform*> > BoneCache;
         BoneCache mBoneCache;
         bool mBoneCacheInit;
 

From 3d5950f790dd5e6baf59e00f1cf6fe3143acde70 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 9 Oct 2021 12:27:17 +0200
Subject: [PATCH 1444/2859] Remove active effects from spells that no longer
 exist

---
 apps/openmw/mwmechanics/activespells.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/activespells.cpp b/apps/openmw/mwmechanics/activespells.cpp
index 6ad6ef369e..fc35e40b74 100644
--- a/apps/openmw/mwmechanics/activespells.cpp
+++ b/apps/openmw/mwmechanics/activespells.cpp
@@ -1,5 +1,7 @@
 #include "activespells.hpp"
 
+#include <components/debug/debuglog.hpp>
+
 #include <components/misc/rng.hpp>
 #include <components/misc/stringops.hpp>
 
@@ -234,7 +236,17 @@ namespace MWMechanics
 
             bool remove = false;
             if(spellIt->mType == ESM::ActiveSpells::Type_Ability || spellIt->mType == ESM::ActiveSpells::Type_Permanent)
-                remove = !spells.hasSpell(spellIt->mId);
+            {
+                try
+                {
+                    remove = !spells.hasSpell(spellIt->mId);
+                }
+                catch(const std::runtime_error& e)
+                {
+                    remove = true;
+                    Log(Debug::Error) << "Removing active effect: " << e.what();
+                }
+            }
             else if(spellIt->mType == ESM::ActiveSpells::Type_Enchantment)
             {
                 const auto& store = ptr.getClass().getInventoryStore(ptr);

From 88ac77df1f4aa1241ea9fe5d0c4ab01de91d0159 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 6 Oct 2021 17:36:05 +0200
Subject: [PATCH 1445/2859] Fix writing to file for RecastMesh

Add missing scaling and y, z coordinates swap.
---
 .../detournavigator/asyncnavmeshupdater.cpp   |  2 +-
 components/detournavigator/debug.cpp          | 22 ++++++++-----------
 components/detournavigator/debug.hpp          |  3 ++-
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index 5c88d0cfa2..966e07bc5a 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -409,7 +409,7 @@ namespace DetourNavigator
         }
         if (recastMesh && mSettings.get().mEnableWriteRecastMeshToFile)
             writeToFile(*recastMesh, mSettings.get().mRecastMeshPathPrefix + std::to_string(job.mChangedTile.x())
-                        + "_" + std::to_string(job.mChangedTile.y()) + "_", recastMeshRevision);
+                        + "_" + std::to_string(job.mChangedTile.y()) + "_", recastMeshRevision, mSettings);
         if (mSettings.get().mEnableWriteNavMeshToFile)
             if (const auto shared = job.mNavMeshCacheItem.lock())
                 writeToFile(shared->lockConst()->getImpl(), mSettings.get().mNavMeshPathPrefix, navMeshRevision);
diff --git a/components/detournavigator/debug.cpp b/components/detournavigator/debug.cpp
index 4cb5b248b0..07832d748f 100644
--- a/components/detournavigator/debug.cpp
+++ b/components/detournavigator/debug.cpp
@@ -1,6 +1,8 @@
 #include "debug.hpp"
 #include "exceptions.hpp"
 #include "recastmesh.hpp"
+#include "settings.hpp"
+#include "settingsutils.hpp"
 
 #include <DetourNavMesh.h>
 
@@ -9,7 +11,7 @@
 
 namespace DetourNavigator
 {
-    void writeToFile(const RecastMesh& recastMesh, const std::string& pathPrefix, const std::string& revision)
+    void writeToFile(const RecastMesh& recastMesh, const std::string& pathPrefix, const std::string& revision, const Settings& settings)
     {
         const auto path = pathPrefix + "recastmesh" + revision + ".obj";
         boost::filesystem::ofstream file(boost::filesystem::path(path), std::ios::out);
@@ -17,20 +19,14 @@ namespace DetourNavigator
             throw NavigatorException("Open file failed: " + path);
         file.exceptions(std::ios::failbit | std::ios::badbit);
         file.precision(std::numeric_limits<float>::max_exponent10);
-        std::size_t count = 0;
-        for (float v : recastMesh.getMesh().getVertices())
+        std::vector<float> vertices = recastMesh.getMesh().getVertices();
+        for (std::size_t i = 0; i < vertices.size(); i += 3)
         {
-            if (count % 3 == 0)
-            {
-                if (count != 0)
-                    file << '\n';
-                file << 'v';
-            }
-            file << ' ' << v;
-            ++count;
+            file << "v " << toNavMeshCoordinates(settings, vertices[i]) << ' '
+                 << toNavMeshCoordinates(settings, vertices[i + 2]) << ' '
+                 << toNavMeshCoordinates(settings, vertices[i + 1]) << '\n';
         }
-        file << '\n';
-        count = 0;
+        std::size_t count = 0;
         for (int v : recastMesh.getMesh().getIndices())
         {
             if (count % 3 == 0)
diff --git a/components/detournavigator/debug.hpp b/components/detournavigator/debug.hpp
index 2128f96be4..d86d923a41 100644
--- a/components/detournavigator/debug.hpp
+++ b/components/detournavigator/debug.hpp
@@ -48,8 +48,9 @@ namespace DetourNavigator
     }
 
     class RecastMesh;
+    struct Settings;
 
-    void writeToFile(const RecastMesh& recastMesh, const std::string& pathPrefix, const std::string& revision);
+    void writeToFile(const RecastMesh& recastMesh, const std::string& pathPrefix, const std::string& revision, const Settings& settings);
     void writeToFile(const dtNavMesh& navMesh, const std::string& pathPrefix, const std::string& revision);
 }
 

From daff7aba012dd91f8db1496eb304bbbeabf61002 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 9 Oct 2021 17:44:25 +0200
Subject: [PATCH 1446/2859] Use different colors for walkable and non-walkable
 triangles

---
 components/sceneutil/recastmesh.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/sceneutil/recastmesh.cpp b/components/sceneutil/recastmesh.cpp
index 97efe010df..18cec022ff 100644
--- a/components/sceneutil/recastmesh.cpp
+++ b/components/sceneutil/recastmesh.cpp
@@ -64,8 +64,8 @@ namespace SceneUtil
 
         const auto normals = calculateNormals(vertices, indices);
         const auto texScale = 1.0f / (settings.mCellSize * 10.0f);
-        duDebugDrawTriMesh(&debugDraw, vertices.data(), static_cast<int>(vertices.size() / 3),
-            indices.data(), normals.data(), static_cast<int>(indices.size() / 3), nullptr, texScale);
+        duDebugDrawTriMeshSlope(&debugDraw, vertices.data(), static_cast<int>(vertices.size() / 3),
+            indices.data(), normals.data(), static_cast<int>(indices.size() / 3), settings.mMaxSlope, texScale);
 
         osg::ref_ptr<osg::Material> material = new osg::Material;
         material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);

From 0c8a811ad5f4bf382155595fced2133612e6f009 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 9 Oct 2021 18:36:37 +0200
Subject: [PATCH 1447/2859] Render only cached recast mesh

To avoid waiting while recast mesh is generating.

Remove redundant continue.
---
 apps/openmw/mwrender/recastmesh.cpp           |  1 -
 .../cachedrecastmeshmanager.cpp               | 35 ++++++++++++-------
 .../cachedrecastmeshmanager.hpp               |  5 +++
 components/detournavigator/navigator.hpp      |  2 +-
 components/detournavigator/navigatorimpl.cpp  |  2 +-
 components/detournavigator/navigatorimpl.hpp  |  2 +-
 components/detournavigator/navigatorstub.hpp  |  2 +-
 components/detournavigator/navmeshmanager.cpp |  7 ++--
 components/detournavigator/navmeshmanager.hpp |  2 +-
 .../tilecachedrecastmeshmanager.cpp           | 30 ++++++++++------
 .../tilecachedrecastmeshmanager.hpp           |  4 +++
 11 files changed, 59 insertions(+), 33 deletions(-)

diff --git a/apps/openmw/mwrender/recastmesh.cpp b/apps/openmw/mwrender/recastmesh.cpp
index 5afa78cd93..91035907e9 100644
--- a/apps/openmw/mwrender/recastmesh.cpp
+++ b/apps/openmw/mwrender/recastmesh.cpp
@@ -60,7 +60,6 @@ namespace MWRender
                 it->second.mValue = group;
                 it->second.mGeneration = tile->second->getGeneration();
                 it->second.mRevision = tile->second->getRevision();
-                continue;
             }
 
             ++it;
diff --git a/components/detournavigator/cachedrecastmeshmanager.cpp b/components/detournavigator/cachedrecastmeshmanager.cpp
index 19b87aa820..d82310dc38 100644
--- a/components/detournavigator/cachedrecastmeshmanager.cpp
+++ b/components/detournavigator/cachedrecastmeshmanager.cpp
@@ -13,7 +13,7 @@ namespace DetourNavigator
     {
         if (!mImpl.addObject(id, shape, transform, areaType))
             return false;
-        mCached.lock()->reset();
+        mOutdatedCache = true;
         return true;
     }
 
@@ -21,7 +21,7 @@ namespace DetourNavigator
     {
         if (!mImpl.updateObject(id, transform, areaType))
             return false;
-        mCached.lock()->reset();
+        mOutdatedCache = true;
         return true;
     }
 
@@ -29,7 +29,7 @@ namespace DetourNavigator
     {
         auto object = mImpl.removeObject(id);
         if (object)
-            mCached.lock()->reset();
+            mOutdatedCache = true;
         return object;
     }
 
@@ -38,7 +38,7 @@ namespace DetourNavigator
     {
         if (!mImpl.addWater(cellPosition, cellSize, shift))
             return false;
-        mCached.lock()->reset();
+        mOutdatedCache = true;
         return true;
     }
 
@@ -46,7 +46,7 @@ namespace DetourNavigator
     {
         const auto water = mImpl.removeWater(cellPosition);
         if (water)
-            mCached.lock()->reset();
+            mOutdatedCache = true;
         return water;
     }
 
@@ -55,7 +55,7 @@ namespace DetourNavigator
     {
         if (!mImpl.addHeightfield(cellPosition, cellSize, shift, shape))
             return false;
-        mCached.lock()->reset();
+        mOutdatedCache = true;
         return true;
     }
 
@@ -63,18 +63,27 @@ namespace DetourNavigator
     {
         const auto cell = mImpl.removeHeightfield(cellPosition);
         if (cell)
-            mCached.lock()->reset();
+            mOutdatedCache = true;
         return cell;
     }
 
     std::shared_ptr<RecastMesh> CachedRecastMeshManager::getMesh()
     {
-        std::shared_ptr<RecastMesh> cached = *mCached.lock();
-        if (cached != nullptr)
-            return cached;
-        cached = mImpl.getMesh();
-        *mCached.lock() = cached;
-        return cached;
+        bool outdated = true;
+        if (!mOutdatedCache.compare_exchange_strong(outdated, false))
+        {
+            std::shared_ptr<RecastMesh> cached = getCachedMesh();
+            if (cached != nullptr)
+                return cached;
+        }
+        std::shared_ptr<RecastMesh> mesh = mImpl.getMesh();
+        *mCached.lock() = mesh;
+        return mesh;
+    }
+
+    std::shared_ptr<RecastMesh> CachedRecastMeshManager::getCachedMesh() const
+    {
+        return *mCached.lockConst();
     }
 
     bool CachedRecastMeshManager::isEmpty() const
diff --git a/components/detournavigator/cachedrecastmeshmanager.hpp b/components/detournavigator/cachedrecastmeshmanager.hpp
index b506f807fa..b1e2570b0a 100644
--- a/components/detournavigator/cachedrecastmeshmanager.hpp
+++ b/components/detournavigator/cachedrecastmeshmanager.hpp
@@ -7,6 +7,8 @@
 
 #include <components/misc/guarded.hpp>
 
+#include <atomic>
+
 namespace DetourNavigator
 {
     class CachedRecastMeshManager
@@ -32,6 +34,8 @@ namespace DetourNavigator
 
         std::shared_ptr<RecastMesh> getMesh();
 
+        std::shared_ptr<RecastMesh> getCachedMesh() const;
+
         bool isEmpty() const;
 
         void reportNavMeshChange(const Version& recastMeshVersion, const Version& navMeshVersion);
@@ -41,6 +45,7 @@ namespace DetourNavigator
     private:
         RecastMeshManager mImpl;
         Misc::ScopeGuarded<std::shared_ptr<RecastMesh>> mCached;
+        std::atomic_bool mOutdatedCache {true};
     };
 }
 
diff --git a/components/detournavigator/navigator.hpp b/components/detournavigator/navigator.hpp
index d2e77892b9..265d69b6e1 100644
--- a/components/detournavigator/navigator.hpp
+++ b/components/detournavigator/navigator.hpp
@@ -236,7 +236,7 @@ namespace DetourNavigator
         std::optional<osg::Vec3f> raycast(const osg::Vec3f& agentHalfExtents, const osg::Vec3f& start,
             const osg::Vec3f& end, const Flags includeFlags) const;
 
-        virtual RecastMeshTiles getRecastMeshTiles() = 0;
+        virtual RecastMeshTiles getRecastMeshTiles() const = 0;
 
         virtual float getMaxNavmeshAreaRealRadius() const = 0;
     };
diff --git a/components/detournavigator/navigatorimpl.cpp b/components/detournavigator/navigatorimpl.cpp
index 750901c73e..f29ae1bb95 100644
--- a/components/detournavigator/navigatorimpl.cpp
+++ b/components/detournavigator/navigatorimpl.cpp
@@ -187,7 +187,7 @@ namespace DetourNavigator
         mNavMeshManager.reportStats(frameNumber, stats);
     }
 
-    RecastMeshTiles NavigatorImpl::getRecastMeshTiles()
+    RecastMeshTiles NavigatorImpl::getRecastMeshTiles() const
     {
         return mNavMeshManager.getRecastMeshTiles();
     }
diff --git a/components/detournavigator/navigatorimpl.hpp b/components/detournavigator/navigatorimpl.hpp
index cda6158958..8ed16b9a5b 100644
--- a/components/detournavigator/navigatorimpl.hpp
+++ b/components/detournavigator/navigatorimpl.hpp
@@ -60,7 +60,7 @@ namespace DetourNavigator
 
         void reportStats(unsigned int frameNumber, osg::Stats& stats) const override;
 
-        RecastMeshTiles getRecastMeshTiles() override;
+        RecastMeshTiles getRecastMeshTiles() const override;
 
         float getMaxNavmeshAreaRealRadius() const override;
 
diff --git a/components/detournavigator/navigatorstub.hpp b/components/detournavigator/navigatorstub.hpp
index 40de90f256..758519769b 100644
--- a/components/detournavigator/navigatorstub.hpp
+++ b/components/detournavigator/navigatorstub.hpp
@@ -94,7 +94,7 @@ namespace DetourNavigator
 
         void reportStats(unsigned int /*frameNumber*/, osg::Stats& /*stats*/) const override {}
 
-        RecastMeshTiles getRecastMeshTiles() override
+        RecastMeshTiles getRecastMeshTiles() const override
         {
             return {};
         }
diff --git a/components/detournavigator/navmeshmanager.cpp b/components/detournavigator/navmeshmanager.cpp
index c378230845..362c6938c0 100644
--- a/components/detournavigator/navmeshmanager.cpp
+++ b/components/detournavigator/navmeshmanager.cpp
@@ -232,14 +232,15 @@ namespace DetourNavigator
         mAsyncNavMeshUpdater.reportStats(frameNumber, stats);
     }
 
-    RecastMeshTiles NavMeshManager::getRecastMeshTiles()
+    RecastMeshTiles NavMeshManager::getRecastMeshTiles() const
     {
         std::vector<TilePosition> tiles;
         mRecastMeshManager.forEachTile(
             [&tiles] (const TilePosition& tile, const CachedRecastMeshManager&) { tiles.push_back(tile); });
         RecastMeshTiles result;
-        std::transform(tiles.begin(), tiles.end(), std::inserter(result, result.end()),
-            [this] (const TilePosition& tile) { return std::make_pair(tile, mRecastMeshManager.getMesh(tile)); });
+        for (const TilePosition& tile : tiles)
+            if (auto mesh = mRecastMeshManager.getCachedMesh(tile))
+                result.emplace(tile, std::move(mesh));
         return result;
     }
 
diff --git a/components/detournavigator/navmeshmanager.hpp b/components/detournavigator/navmeshmanager.hpp
index 76c9b1e0b9..b1496dc817 100644
--- a/components/detournavigator/navmeshmanager.hpp
+++ b/components/detournavigator/navmeshmanager.hpp
@@ -59,7 +59,7 @@ namespace DetourNavigator
 
         void reportStats(unsigned int frameNumber, osg::Stats& stats) const;
 
-        RecastMeshTiles getRecastMeshTiles();
+        RecastMeshTiles getRecastMeshTiles() const;
 
     private:
         const Settings& mSettings;
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.cpp b/components/detournavigator/tilecachedrecastmeshmanager.cpp
index 63d7e13f6b..d6e3e55005 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -192,17 +192,16 @@ namespace DetourNavigator
 
     std::shared_ptr<RecastMesh> TileCachedRecastMeshManager::getMesh(const TilePosition& tilePosition) const
     {
-        const auto manager = [&] () -> std::shared_ptr<CachedRecastMeshManager>
-        {
-            const auto tiles = mTiles.lockConst();
-            const auto it = tiles->find(tilePosition);
-            if (it == tiles->end())
-                return nullptr;
-            return it->second;
-        } ();
-        if (manager == nullptr)
-            return nullptr;
-        return manager->getMesh();
+        if (const auto manager = getManager(tilePosition))
+            return manager->getMesh();
+        return nullptr;
+    }
+
+    std::shared_ptr<RecastMesh> TileCachedRecastMeshManager::getCachedMesh(const TilePosition& tilePosition) const
+    {
+        if (const auto manager = getManager(tilePosition))
+            return manager->getCachedMesh();
+        return nullptr;
     }
 
     std::size_t TileCachedRecastMeshManager::getRevision() const
@@ -256,4 +255,13 @@ namespace DetourNavigator
         }
         return tileResult;
     }
+
+    std::shared_ptr<CachedRecastMeshManager> TileCachedRecastMeshManager::getManager(const TilePosition& tilePosition) const
+    {
+        const auto tiles = mTiles.lockConst();
+        const auto it = tiles->find(tilePosition);
+        if (it == tiles->end())
+            return nullptr;
+        return it->second;
+    }
 }
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.hpp b/components/detournavigator/tilecachedrecastmeshmanager.hpp
index f6bc40d668..7b5480e006 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.hpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.hpp
@@ -88,6 +88,8 @@ namespace DetourNavigator
 
         std::shared_ptr<RecastMesh> getMesh(const TilePosition& tilePosition) const;
 
+        std::shared_ptr<RecastMesh> getCachedMesh(const TilePosition& tilePosition) const;
+
         template <class Function>
         void forEachTile(Function&& function) const
         {
@@ -118,6 +120,8 @@ namespace DetourNavigator
 
         std::optional<RemovedRecastMeshObject> removeTile(const ObjectId id, const TilePosition& tilePosition,
                 TilesMap& tiles);
+
+        inline std::shared_ptr<CachedRecastMeshManager> getManager(const TilePosition& tilePosition) const;
     };
 }
 

From 031871cd480b729498d9574bf7636428620169bc Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Sun, 10 Oct 2021 16:09:15 +0000
Subject: [PATCH 1448/2859] speeds up optimizer (#3162)

We can expect marginally improved loading times with this PR. Drawable, Transform and Node counts in stats panels are expected to remain unchanged - this PR does not add new scene graph optimisations, it just increases the speed with which we apply existing ones.

1. We add explicit `NodeVisitor::apply` overrides for commonly encountered node types to avoid additional virtual function calls per node associated with the default `apply` implementation.
2. We skip pushing `StateSet`s when  `_mergeAlphaBlending` is enabled or the `StateSet` contains no relevant state.
3. We add a specialised variant of `CollectLowestTransformsVisitor::addTransform` accepting `MatrixTransform` to avoid matrix copies and multiplications.
---
 components/sceneutil/optimizer.cpp | 77 ++++++++++++++++++++----------
 components/sceneutil/optimizer.hpp | 12 +++--
 2 files changed, 60 insertions(+), 29 deletions(-)

diff --git a/components/sceneutil/optimizer.cpp b/components/sceneutil/optimizer.cpp
index 2cfabbfe19..b9d2f5bac7 100644
--- a/components/sceneutil/optimizer.cpp
+++ b/components/sceneutil/optimizer.cpp
@@ -171,7 +171,7 @@ class CollectLowestTransformsVisitor : public BaseOptimizerVisitor
             setTraversalMode(osg::NodeVisitor::TRAVERSE_PARENTS);
         }
 
-        void apply(osg::Node& node) override
+        void apply(osg::Group& node) override
         {
             if (node.getNumParents())
             {
@@ -180,7 +180,7 @@ class CollectLowestTransformsVisitor : public BaseOptimizerVisitor
             else
             {
                 // for all current objects mark a nullptr transform for them.
-                registerWithCurrentObjects(0);
+                registerWithCurrentObjects(static_cast<osg::Transform*>(nullptr));
             }
         }
 
@@ -198,15 +198,19 @@ class CollectLowestTransformsVisitor : public BaseOptimizerVisitor
             // for all current objects associated this transform with them.
             registerWithCurrentObjects(&transform);
         }
+        void apply(osg::MatrixTransform& transform) override
+        {
+            // for all current objects associated this transform with them.
+            registerWithCurrentObjects(&transform);
+        }
 
-        void apply(osg::Geode& geode) override
+        void apply(osg::Node& node) override
         {
-            traverse(geode);
+            traverse(node);
         }
 
-        void apply(osg::Billboard& geode) override
+        void apply(osg::Geometry& geode) override
         {
-            traverse(geode);
         }
 
         void collectDataFor(osg::Node* node)
@@ -293,7 +297,19 @@ class CollectLowestTransformsVisitor : public BaseOptimizerVisitor
 
             ObjectStruct():_canBeApplied(true),_moreThanOneMatrixRequired(false) {}
 
-            void add(osg::Transform* transform, bool canOptimize)
+            inline const osg::Matrix& getMatrix(osg::MatrixTransform* transform)
+            {
+                return transform->getMatrix();
+            }
+            osg::Matrix getMatrix(osg::Transform* transform)
+            {
+                osg::Matrix matrix;
+                transform->computeLocalToWorldMatrix(matrix, 0);
+                return matrix;
+            }
+            
+            template<typename T>
+            void add(T* transform, bool canOptimize)
             {
                 if (transform)
                 {
@@ -301,12 +317,10 @@ class CollectLowestTransformsVisitor : public BaseOptimizerVisitor
                     else if (transform->getReferenceFrame()!=osg::Transform::RELATIVE_RF) _moreThanOneMatrixRequired=true;
                     else
                     {
-                        if (_transformSet.empty()) transform->computeLocalToWorldMatrix(_firstMatrix,0);
+                        if (_transformSet.empty()) _firstMatrix = getMatrix(transform);
                         else
                         {
-                            osg::Matrix matrix;
-                            transform->computeLocalToWorldMatrix(matrix,0);
-                            if (_firstMatrix!=matrix) _moreThanOneMatrixRequired=true;
+                            if (_firstMatrix!=getMatrix(transform)) _moreThanOneMatrixRequired=true;
                         }
                     }
                 }
@@ -327,8 +341,8 @@ class CollectLowestTransformsVisitor : public BaseOptimizerVisitor
             TransformSet    _transformSet;
         };
 
-
-        void registerWithCurrentObjects(osg::Transform* transform)
+        template <typename T>
+        void registerWithCurrentObjects(T* transform)
         {
             for(ObjectList::iterator itr=_currentObjectList.begin();
                 itr!=_currentObjectList.end();
@@ -633,19 +647,23 @@ osg::Array* cloneArray(osg::Array* array, osg::VertexBufferObject*& vbo, const o
     return array;
 }
 
-void Optimizer::FlattenStaticTransformsVisitor::apply(osg::Drawable& drawable)
+void Optimizer::FlattenStaticTransformsVisitor::apply(osg::Geometry& geometry)
 {
-    osg::Geometry *geometry = drawable.asGeometry();
-    if((geometry) && (isOperationPermissibleForObject(&drawable)))
+    if(isOperationPermissibleForObject(&geometry))
     {
         osg::VertexBufferObject* vbo = nullptr;
-        if(geometry->getVertexArray() && geometry->getVertexArray()->referenceCount() > 1)
-            geometry->setVertexArray(cloneArray(geometry->getVertexArray(), vbo, geometry));
-        if(geometry->getNormalArray() && geometry->getNormalArray()->referenceCount() > 1)
-            geometry->setNormalArray(cloneArray(geometry->getNormalArray(), vbo, geometry));
-        if(geometry->getTexCoordArray(7) && geometry->getTexCoordArray(7)->referenceCount() > 1) // tangents
-            geometry->setTexCoordArray(7, cloneArray(geometry->getTexCoordArray(7), vbo, geometry));
+        if(geometry.getVertexArray() && geometry.getVertexArray()->referenceCount() > 1)
+            geometry.setVertexArray(cloneArray(geometry.getVertexArray(), vbo, &geometry));
+        if(geometry.getNormalArray() && geometry.getNormalArray()->referenceCount() > 1)
+            geometry.setNormalArray(cloneArray(geometry.getNormalArray(), vbo, &geometry));
+        if(geometry.getTexCoordArray(7) && geometry.getTexCoordArray(7)->referenceCount() > 1) // tangents
+            geometry.setTexCoordArray(7, cloneArray(geometry.getTexCoordArray(7), vbo, &geometry));
     }
+    _drawableSet.insert(&geometry);
+}
+
+void Optimizer::FlattenStaticTransformsVisitor::apply(osg::Drawable& drawable)
+{
     _drawableSet.insert(&drawable);
 }
 
@@ -673,6 +691,11 @@ void Optimizer::FlattenStaticTransformsVisitor::apply(osg::Transform& transform)
     _transformStack.pop_back();
 }
 
+void Optimizer::FlattenStaticTransformsVisitor::apply(osg::MatrixTransform& transform)
+{
+    apply(static_cast<osg::Transform&>(transform));
+}
+
 bool Optimizer::FlattenStaticTransformsVisitor::removeTransforms(osg::Node* nodeWeCannotRemove)
 {
     CollectLowestTransformsVisitor cltv(_optimizer);
@@ -1112,10 +1135,13 @@ bool isAbleToMerge(const osg::Geometry& g1, const osg::Geometry& g2)
 }
 
 
-void Optimizer::MergeGeometryVisitor::pushStateSet(osg::StateSet *stateSet)
+bool Optimizer::MergeGeometryVisitor::pushStateSet(osg::StateSet *stateSet)
 {
+    if (_mergeAlphaBlending || !stateSet || stateSet->getRenderBinMode() & osg::StateSet::INHERIT_RENDERBIN_DETAILS)
+        return false;
     _stateSetStack.push_back(stateSet);
     checkAlphaBlendingActive();
+    return true;
 }
 
 void Optimizer::MergeGeometryVisitor::popStateSet()
@@ -1145,15 +1171,14 @@ void Optimizer::MergeGeometryVisitor::checkAlphaBlendingActive()
 
 void Optimizer::MergeGeometryVisitor::apply(osg::Group &group)
 {
-    if (group.getStateSet())
-        pushStateSet(group.getStateSet());
+    bool pushed = pushStateSet(group.getStateSet());
 
     if (!_alphaBlendingActive || _mergeAlphaBlending)
         mergeGroup(group);
 
     traverse(group);
 
-    if (group.getStateSet())
+    if (pushed)
         popStateSet();
 }
 
diff --git a/components/sceneutil/optimizer.hpp b/components/sceneutil/optimizer.hpp
index 7b32bafee2..5191bcf322 100644
--- a/components/sceneutil/optimizer.hpp
+++ b/components/sceneutil/optimizer.hpp
@@ -285,9 +285,11 @@ class Optimizer
                     BaseOptimizerVisitor(optimizer, FLATTEN_STATIC_TRANSFORMS) {}
 
                 void apply(osg::Node& geode) override;
+                void apply(osg::Geometry& drawable) override;
                 void apply(osg::Drawable& drawable) override;
                 void apply(osg::Billboard& geode) override;
-                void apply(osg::Transform& transform) override;
+                void apply(osg::Transform& transform) override final;
+                void apply(osg::MatrixTransform& transform) override;
 
                 bool removeTransforms(osg::Node* nodeWeCannotRemove);
 
@@ -316,6 +318,7 @@ class Optimizer
                     BaseOptimizerVisitor(optimizer, FLATTEN_STATIC_TRANSFORMS) {}
 
                 void apply(osg::MatrixTransform& transform) override;
+                void apply(osg::Geometry&) override { }
 
                 bool removeTransforms(osg::Node* nodeWeCannotRemove);
 
@@ -338,6 +341,7 @@ class Optimizer
                     BaseOptimizerVisitor(optimizer, REMOVE_REDUNDANT_NODES) {}
 
                 void apply(osg::Group& group) override;
+                void apply(osg::Geometry&) override { }
 
                 void removeEmptyNodes();
 
@@ -358,6 +362,7 @@ class Optimizer
                 void apply(osg::Transform& transform) override;
                 void apply(osg::LOD& lod) override;
                 void apply(osg::Switch& switchNode) override;
+                void apply(osg::Geometry&) override { }
 
                 bool isOperationPermissible(osg::Node& node);
 
@@ -376,6 +381,7 @@ class Optimizer
 
             bool isOperationPermissible(osg::Group& node);
 
+            void apply(osg::Geometry&) override { }
             void apply(osg::Group& group) override;
             void apply(osg::LOD& lod) override;
             void apply(osg::Switch& switchNode) override;
@@ -409,10 +415,10 @@ class Optimizer
                     return _targetMaximumNumberOfVertices;
                 }
 
-                void pushStateSet(osg::StateSet* stateSet);
+                bool pushStateSet(osg::StateSet* stateSet);
                 void popStateSet();
                 void checkAlphaBlendingActive();
-
+                void apply(osg::Geometry&) override { }
                 void apply(osg::Group& group) override;
                 void apply(osg::Billboard&) override { /* don't do anything*/ }
 

From af759683b863b8513704b67ed2c782da5e940582 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Sun, 10 Oct 2021 16:15:40 +0000
Subject: [PATCH 1449/2859] enables std::move in keywordsearch.hpp (#3163)

For some reason we have commented std::move keywords in keywordsearch.hpp while they are quite beneficial. openmw_test_suite for keywordsearch.hpp takes 30% less time with these changes.
---
 apps/openmw/mwdialogue/keywordsearch.hpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwdialogue/keywordsearch.hpp b/apps/openmw/mwdialogue/keywordsearch.hpp
index 0c14ea8f8d..39599457ef 100644
--- a/apps/openmw/mwdialogue/keywordsearch.hpp
+++ b/apps/openmw/mwdialogue/keywordsearch.hpp
@@ -30,7 +30,7 @@ public:
     {
         if (keyword.empty())
             return;
-        seed_impl  (/*std::move*/ (keyword), /*std::move*/ (value), 0, mRoot);
+        seed_impl  (std::move(keyword), std::move (value), 0, mRoot);
     }
 
     void clear ()
@@ -39,7 +39,7 @@ public:
         mRoot.mKeyword.clear ();
     }
 
-    bool containsKeyword (string_t keyword, value_t& value)
+    bool containsKeyword (const string_t& keyword, value_t& value)
     {
         typename Entry::childen_t::iterator current;
         typename Entry::childen_t::iterator next;
@@ -209,8 +209,8 @@ private:
 
         if (j == entry.mChildren.end ())
         {
-            entry.mChildren [ch].mValue = /*std::move*/ (value);
-            entry.mChildren [ch].mKeyword = /*std::move*/ (keyword);
+            entry.mChildren [ch].mValue = std::move (value);
+            entry.mChildren [ch].mKeyword = std::move (keyword);
         }
         else
         {
@@ -219,22 +219,22 @@ private:
                 if (keyword == j->second.mKeyword)
                     throw std::runtime_error ("duplicate keyword inserted");
 
-                value_t pushValue = /*std::move*/ (j->second.mValue);
-                string_t pushKeyword = /*std::move*/ (j->second.mKeyword);
+                value_t pushValue = j->second.mValue;
+                string_t pushKeyword = j->second.mKeyword;
 
                 if (depth >= pushKeyword.size ())
                     throw std::runtime_error ("unexpected");
 
                 if (depth+1 < pushKeyword.size())
                 {
-                    seed_impl (/*std::move*/ (pushKeyword), /*std::move*/ (pushValue), depth+1, j->second);
+                    seed_impl (std::move (pushKeyword), std::move (pushValue), depth+1, j->second);
                     j->second.mKeyword.clear ();
                 }
             }
             if (depth+1 == keyword.size())
                 j->second.mKeyword = value;
             else // depth+1 < keyword.size()
-                seed_impl (/*std::move*/ (keyword), /*std::move*/ (value), depth+1, j->second);
+                seed_impl (std::move (keyword), std::move (value), depth+1, j->second);
         }
 
     }

From ff9aabafd15008b2514aad23696888d1147afa64 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 10 Oct 2021 14:48:00 +0200
Subject: [PATCH 1450/2859] Change max walkable slope angle to 46 degrees

This is the value used by vanilla Morrowind engine. At this angle player
character starts sliding down the slope.

This fixes navigation and movement issue in Mournhold, Godsreach.
---
 apps/openmw/mwphysics/constants.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwphysics/constants.hpp b/apps/openmw/mwphysics/constants.hpp
index eaeb308d58..2d7cd53d38 100644
--- a/apps/openmw/mwphysics/constants.hpp
+++ b/apps/openmw/mwphysics/constants.hpp
@@ -12,7 +12,7 @@ namespace MWPhysics
     static constexpr bool sDoExtraStairHacks = true;
 
     static constexpr float sGroundOffset = 1.0f;
-    static constexpr float sMaxSlope = 49.0f;
+    static constexpr float sMaxSlope = 46.0f;
 
     // Arbitrary number. To prevent infinite loops. They shouldn't happen but it's good to be prepared.
     static constexpr int sMaxIterations = 8;

From c2d836c6c4b06cf1ba638d5a73f9ea9dfafa163a Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Sun, 10 Oct 2021 16:37:34 +0000
Subject: [PATCH 1451/2859] optimises riggeometry.cpp (#3165)

We skip this during node path iterations. this is not a node we are interested in.
We avoid allocating a new mGeomToSkelMatrix per frame and avoid a ref_ptr associated with its update.
We speed up a search for the Skeleton node by adding a continue; condition prior to an expensive dynamic_cast.
---
 components/sceneutil/riggeometry.cpp | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp
index b9201fdf66..2c1efb9f36 100644
--- a/components/sceneutil/riggeometry.cpp
+++ b/components/sceneutil/riggeometry.cpp
@@ -3,6 +3,7 @@
 #include <osg/Version>
 
 #include <components/debug/debuglog.hpp>
+#include <osg/MatrixTransform>
 
 #include "skeleton.hpp"
 #include "util.hpp"
@@ -114,9 +115,11 @@ osg::ref_ptr<osg::Geometry> RigGeometry::getSourceGeometry() const
 bool RigGeometry::initFromParentSkeleton(osg::NodeVisitor* nv)
 {
     const osg::NodePath& path = nv->getNodePath();
-    for (osg::NodePath::const_reverse_iterator it = path.rbegin(); it != path.rend(); ++it)
+    for (osg::NodePath::const_reverse_iterator it = path.rbegin()+1; it != path.rend(); ++it)
     {
         osg::Node* node = *it;
+        if (node->asTransform())
+            continue;
         if (Skeleton* skel = dynamic_cast<Skeleton*>(node))
         {
             mSkeleton = skel;
@@ -310,8 +313,10 @@ void RigGeometry::updateBounds(osg::NodeVisitor *nv)
 void RigGeometry::updateGeomToSkelMatrix(const osg::NodePath& nodePath)
 {
     bool foundSkel = false;
-    osg::ref_ptr<osg::RefMatrix> geomToSkelMatrix;
-    for (osg::NodePath::const_iterator it = nodePath.begin(); it != nodePath.end(); ++it)
+    osg::RefMatrix* geomToSkelMatrix = mGeomToSkelMatrix;
+    if (geomToSkelMatrix)
+        geomToSkelMatrix->makeIdentity();
+    for (osg::NodePath::const_iterator it = nodePath.begin(); it != nodePath.end()-1; ++it)
     {
         osg::Node* node = *it;
         if (!foundSkel)
@@ -323,14 +328,15 @@ void RigGeometry::updateGeomToSkelMatrix(const osg::NodePath& nodePath)
         {
             if (osg::Transform* trans = node->asTransform())
             {
+                osg::MatrixTransform* matrixTrans = trans->asMatrixTransform();
+                if (matrixTrans && matrixTrans->getMatrix().isIdentity())
+                    continue;
                 if (!geomToSkelMatrix)
-                    geomToSkelMatrix = new osg::RefMatrix;
+                    geomToSkelMatrix = mGeomToSkelMatrix = new osg::RefMatrix;
                 trans->computeWorldToLocalMatrix(*geomToSkelMatrix, nullptr);
             }
         }
     }
-    if (geomToSkelMatrix && !geomToSkelMatrix->isIdentity())
-        mGeomToSkelMatrix = geomToSkelMatrix;
 }
 
 void RigGeometry::setInfluenceMap(osg::ref_ptr<InfluenceMap> influenceMap)

From 7fb5b773dde512986d964138eada0e606f87555b Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Mon, 11 Oct 2021 00:01:58 +0100
Subject: [PATCH 1452/2859] Remove obsolete tests

The old behaviour was basically a bug and @ doesn't mean anything special now
---
 apps/openmw_test_suite/openmw/options.cpp | 27 +----------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/apps/openmw_test_suite/openmw/options.cpp b/apps/openmw_test_suite/openmw/options.cpp
index 9de7613d19..0f9ad39053 100644
--- a/apps/openmw_test_suite/openmw/options.cpp
+++ b/apps/openmw_test_suite/openmw/options.cpp
@@ -22,16 +22,11 @@ namespace
     {
         std::vector<std::string> result = std::move(base);
         for (int i = 1; i <= std::numeric_limits<char>::max(); ++i)
-            if (i != '&' && i != '"' && i != ' ' && i != '@' && i != '\n')
+            if (i != '&' && i != '"' && i != ' ' && i != '\n')
                 result.push_back(std::string(1, i));
         return result;
     }
 
-    constexpr std::array supportedAtSignEscapings {
-        std::pair {'a', '@'},
-        std::pair {'h', '#'},
-    };
-
     MATCHER_P(IsPath, v, "") { return arg.string() == v; }
 
     template <class T>
@@ -101,7 +96,6 @@ namespace
         const std::array arguments {"openmw", "--load-savegame", "my@save.omwsave"};
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-//        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), "my?ave.omwsave");
         EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), "my@save.omwsave");
     }
 
@@ -205,25 +199,6 @@ namespace
         ValuesIn(generateSupportedCharacters({u8"👍", u8"Ъ", u8"Ǽ", "\n"}))
     );
 
-    struct OpenMWOptionsFromArgumentsEscapings : TestWithParam<std::pair<char, char>> {};
-
-/*    TEST_P(OpenMWOptionsFromArgumentsEscapings, should_support_escaping_with_at_sign_in_load_savegame_path)
-    {
-        bpo::options_description description = makeOptionsDescription();
-        const std::string path = "save_@" + std::string(1, GetParam().first) + ".omwsave";
-        const std::array arguments {"openmw", "--load-savegame", path.c_str()};
-        bpo::variables_map variables;
-        parseArgs(arguments, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(),
-                  "save_" + std::string(1, GetParam().second) + ".omwsave");
-    }
-
-    INSTANTIATE_TEST_SUITE_P(
-        SupportedEscapingsWithAtSign,
-        OpenMWOptionsFromArgumentsEscapings,
-        ValuesIn(supportedAtSignEscapings)
-    );*/
-
     TEST(OpenMWOptionsFromConfig, should_support_single_word_load_savegame_path)
     {
         bpo::options_description description = makeOptionsDescription();

From 18869c2c7505d5fe80b38351be8b0edf74f9ed6e Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Mon, 11 Oct 2021 00:02:33 +0100
Subject: [PATCH 1453/2859] Add some extra tests

The behaviour here is unchanged, but was previously untested.
---
 apps/openmw_test_suite/openmw/options.cpp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/apps/openmw_test_suite/openmw/options.cpp b/apps/openmw_test_suite/openmw/options.cpp
index 0f9ad39053..b087fd03fb 100644
--- a/apps/openmw_test_suite/openmw/options.cpp
+++ b/apps/openmw_test_suite/openmw/options.cpp
@@ -272,6 +272,24 @@ namespace
         EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), "");
     }
 
+    TEST(OpenMWOptionsFromConfig, should_ignore_whitespace_prefixed_commented_option)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        std::istringstream stream(" \t#load-savegame=save.omwsave");
+        bpo::variables_map variables;
+        Files::parseConfig(stream, variables, description);
+        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), "");
+    }
+
+    TEST(OpenMWOptionsFromConfig, should_support_whitespace_around_option)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        std::istringstream stream(" load-savegame = save.omwsave ");
+        bpo::variables_map variables;
+        Files::parseConfig(stream, variables, description);
+        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), "save.omwsave");
+    }
+
     TEST(OpenMWOptionsFromConfig, should_throw_on_multiple_load_savegame)
     {
         bpo::options_description description = makeOptionsDescription();

From cbcdd705ee2b169259d0a15b25ba2da02cca8567 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Mon, 11 Oct 2021 08:09:01 +0000
Subject: [PATCH 1454/2859] minor objectpaging.cpp scene graph optimisations
 (#3155)

We now use PositionAttitudeTransform for unmerged nodes because I have been informed PositionAttitudeTransform's scene graph performance is measurably faster than MatrixTransform's. We still need to use MatrixTransform for merged nodes because the Optimizer has limited support for non-MatrixTransform nodes. These MatrixTransforms will be removed in the merging process anyway.
---
 apps/openmw/mwrender/objectpaging.cpp | 32 +++++++++++++++++++++------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index 88c3d4ba02..5c22c3fc8d 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -13,6 +13,7 @@
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/optimizer.hpp>
+#include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/sceneutil/clone.hpp>
 #include <components/sceneutil/util.hpp>
 #include <components/vfs/manager.hpp>
@@ -590,14 +591,31 @@ namespace MWRender
                 if (!activeGrid && minSizeMerged != minSize && cnode->getBound().radius2() * cref->mScale*cref->mScale < (viewPoint-pos).length2()*minSizeMerged*minSizeMerged)
                     continue;
 
-                osg::Matrixf matrix;
-                matrix.preMultTranslate(pos - worldCenter);
-                matrix.preMultRotate( osg::Quat(ref.mPos.rot[2], osg::Vec3f(0,0,-1)) *
+                osg::Vec3f nodePos = pos - worldCenter;
+                osg::Quat nodeAttitude = osg::Quat(ref.mPos.rot[2], osg::Vec3f(0,0,-1)) *
                                         osg::Quat(ref.mPos.rot[1], osg::Vec3f(0,-1,0)) *
-                                        osg::Quat(ref.mPos.rot[0], osg::Vec3f(-1,0,0)) );
-                matrix.preMultScale(osg::Vec3f(ref.mScale, ref.mScale, ref.mScale));
-                osg::ref_ptr<osg::MatrixTransform> trans = new osg::MatrixTransform(matrix);
-                trans->setDataVariance(osg::Object::STATIC);
+                                        osg::Quat(ref.mPos.rot[0], osg::Vec3f(-1,0,0));
+                osg::Vec3f nodeScale = osg::Vec3f(ref.mScale, ref.mScale, ref.mScale);
+
+                osg::ref_ptr<osg::Group> trans;
+                if (merge)
+                {
+                    // Optimizer currently supports only MatrixTransforms.
+                    osg::Matrixf matrix;
+                    matrix.preMultTranslate(nodePos);
+                    matrix.preMultRotate(nodeAttitude);
+                    matrix.preMultScale(nodeScale);
+                    trans = new osg::MatrixTransform(matrix);
+                    trans->setDataVariance(osg::Object::STATIC);
+                }
+                else
+                {
+                    trans = new SceneUtil::PositionAttitudeTransform;
+                    SceneUtil::PositionAttitudeTransform* pat = static_cast<SceneUtil::PositionAttitudeTransform*>(trans.get());
+                    pat->setPosition(nodePos);
+                    pat->setScale(nodeScale);
+                    pat->setAttitude(nodeAttitude);
+                }
 
                 copyop.setCopyFlags(merge ? osg::CopyOp::DEEP_COPY_NODES|osg::CopyOp::DEEP_COPY_DRAWABLES : osg::CopyOp::DEEP_COPY_NODES);
                 copyop.mOptimizeBillboards = (size > 1/4.f);

From 7c50f823d83460a605008877eed0be74bdc2a268 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Mon, 11 Oct 2021 08:09:48 +0000
Subject: [PATCH 1455/2859] devirtualises BSAFile (#3161)

Currently, Open MW's basic file access speed is limited by a peculiar layer of virtualisation in BSAFile's interface. This PR removes such virtualisation by properly separating BSAFile from CompressedBSAFile in low level contexts.
---
 components/bsa/bsa_file.cpp          |  5 ---
 components/bsa/bsa_file.hpp          |  5 ++-
 components/bsa/compressedbsafile.hpp |  2 +-
 components/vfs/bsaarchive.cpp        | 53 ++++++++++++++++++++++------
 components/vfs/bsaarchive.hpp        | 27 +++++++++++++-
 components/vfs/registerarchives.cpp  |  6 +++-
 6 files changed, 79 insertions(+), 19 deletions(-)

diff --git a/components/bsa/bsa_file.cpp b/components/bsa/bsa_file.cpp
index ecbea5e7d9..d5610bddae 100644
--- a/components/bsa/bsa_file.cpp
+++ b/components/bsa/bsa_file.cpp
@@ -290,11 +290,6 @@ Files::IStreamPtr BSAFile::getFile(const char *file)
     return Files::openConstrainedFileStream (mFilename.c_str (), fs.offset, fs.fileSize);
 }
 
-Files::IStreamPtr BSAFile::getFile(const FileStruct *file)
-{
-    return Files::openConstrainedFileStream (mFilename.c_str (), file->offset, file->fileSize);
-}
-
 void Bsa::BSAFile::addFile(const std::string& filename, std::istream& file)
 {
     if (!mIsLoaded)
diff --git a/components/bsa/bsa_file.hpp b/components/bsa/bsa_file.hpp
index d30fc2feb0..9a76e1bd23 100644
--- a/components/bsa/bsa_file.hpp
+++ b/components/bsa/bsa_file.hpp
@@ -154,7 +154,10 @@ public:
     /** Open a file contained in the archive.
      * @note Thread safe.
     */
-    virtual Files::IStreamPtr getFile(const FileStruct* file);
+    Files::IStreamPtr getFile(const FileStruct *file)
+    {
+        return Files::openConstrainedFileStream (mFilename.c_str (), file->offset, file->fileSize);
+    }
 
     virtual void addFile(const std::string& filename, std::istream& file);
 
diff --git a/components/bsa/compressedbsafile.hpp b/components/bsa/compressedbsafile.hpp
index ac6e6fdf78..ffd88fe044 100644
--- a/components/bsa/compressedbsafile.hpp
+++ b/components/bsa/compressedbsafile.hpp
@@ -93,7 +93,7 @@ namespace Bsa
         void readHeader() override;
        
         Files::IStreamPtr getFile(const char* filePath) override;
-        Files::IStreamPtr getFile(const FileStruct* fileStruct) override;
+        Files::IStreamPtr getFile(const FileStruct* fileStruct);
         void addFile(const std::string& filename, std::istream& file) override;
     };
 }
diff --git a/components/vfs/bsaarchive.cpp b/components/vfs/bsaarchive.cpp
index 90899ac612..86d21060c0 100644
--- a/components/vfs/bsaarchive.cpp
+++ b/components/vfs/bsaarchive.cpp
@@ -1,5 +1,5 @@
 #include "bsaarchive.hpp"
-#include <components/bsa/compressedbsafile.hpp>
+
 #include <memory>
 
 namespace VFS
@@ -7,15 +7,7 @@ namespace VFS
 
 BsaArchive::BsaArchive(const std::string &filename)
 {
-    Bsa::BsaVersion bsaVersion = Bsa::CompressedBSAFile::detectVersion(filename);
-
-    if (bsaVersion == Bsa::BSAVER_COMPRESSED) {
-        mFile = std::make_unique<Bsa::CompressedBSAFile>(Bsa::CompressedBSAFile());
-    }
-    else {
-        mFile = std::make_unique<Bsa::BSAFile>(Bsa::BSAFile());
-    }
-
+    mFile = std::make_unique<Bsa::BSAFile>(Bsa::BSAFile());
     mFile->open(filename);
 
     const Bsa::BSAFile::FileList &filelist = mFile->getList();
@@ -25,6 +17,10 @@ BsaArchive::BsaArchive(const std::string &filename)
     }
 }
 
+BsaArchive::BsaArchive()
+{
+}
+
 BsaArchive::~BsaArchive() {
 }
 
@@ -56,6 +52,31 @@ std::string BsaArchive::getDescription() const
     return std::string{"BSA: "} + mFile->getFilename();
 }
 
+CompressedBsaArchive::CompressedBsaArchive(const std::string &filename)
+    : BsaArchive()
+{
+    mFile = std::make_unique<Bsa::BSAFile>(Bsa::CompressedBSAFile());
+    mFile->open(filename);
+
+    const Bsa::BSAFile::FileList &filelist = mFile->getList();
+    for(Bsa::BSAFile::FileList::const_iterator it = filelist.begin();it != filelist.end();++it)
+    {
+        mResources.emplace_back(&*it, mFile.get());
+        mCompressedResources.emplace_back(&*it, static_cast<Bsa::CompressedBSAFile*>(mFile.get()));
+    }
+}
+
+void CompressedBsaArchive::listResources(std::map<std::string, File *> &out, char (*normalize_function)(char))
+{
+    for (std::vector<CompressedBsaArchiveFile>::iterator it = mCompressedResources.begin(); it != mCompressedResources.end(); ++it)
+    {
+        std::string ent = it->mInfo->name();
+        std::transform(ent.begin(), ent.end(), ent.begin(), normalize_function);
+
+        out[ent] = &*it;
+    }
+}
+
 // ------------------------------------------------------------------------------
 
 BsaArchiveFile::BsaArchiveFile(const Bsa::BSAFile::FileStruct *info, Bsa::BSAFile* bsa)
@@ -70,4 +91,16 @@ Files::IStreamPtr BsaArchiveFile::open()
     return mFile->getFile(mInfo);
 }
 
+CompressedBsaArchiveFile::CompressedBsaArchiveFile(const Bsa::BSAFile::FileStruct *info, Bsa::CompressedBSAFile* bsa)
+    : BsaArchiveFile(info, bsa)
+    , mCompressedFile(bsa)
+{
+
+}
+
+Files::IStreamPtr CompressedBsaArchiveFile::open()
+{
+    return mCompressedFile->getFile(mInfo);
+}
+
 }
diff --git a/components/vfs/bsaarchive.hpp b/components/vfs/bsaarchive.hpp
index c979b5ce7e..1015f8d220 100644
--- a/components/vfs/bsaarchive.hpp
+++ b/components/vfs/bsaarchive.hpp
@@ -4,6 +4,7 @@
 #include "archive.hpp"
 
 #include <components/bsa/bsa_file.hpp>
+#include <components/bsa/compressedbsafile.hpp>
 
 namespace VFS
 {
@@ -18,19 +19,43 @@ namespace VFS
         Bsa::BSAFile* mFile;
     };
 
+    class CompressedBsaArchiveFile : public BsaArchiveFile
+    {
+    public:
+        CompressedBsaArchiveFile(const Bsa::BSAFile::FileStruct* info, Bsa::CompressedBSAFile* bsa);
+
+        Files::IStreamPtr open() override;
+        Bsa::CompressedBSAFile* mCompressedFile;
+    };
+
+
     class BsaArchive : public Archive
     {
     public:
         BsaArchive(const std::string& filename);
+        BsaArchive();
         virtual ~BsaArchive();
         void listResources(std::map<std::string, File*>& out, char (*normalize_function) (char)) override;
         bool contains(const std::string& file, char (*normalize_function) (char)) const override;
         std::string getDescription() const override;
 
-    private:
+    protected:
         std::unique_ptr<Bsa::BSAFile> mFile;
         std::vector<BsaArchiveFile> mResources;
     };
+
+    class CompressedBsaArchive : public BsaArchive
+    {
+    public:
+        CompressedBsaArchive(const std::string& filename);
+        void listResources(std::map<std::string, File*>& out, char (*normalize_function) (char)) override;
+        virtual ~CompressedBsaArchive() {}
+
+    private:
+        std::unique_ptr<Bsa::CompressedBSAFile> mCompressedFile;
+        std::vector<CompressedBsaArchiveFile> mCompressedResources;
+    };
+
 }
 
 #endif
diff --git a/components/vfs/registerarchives.cpp b/components/vfs/registerarchives.cpp
index 80e639f350..4dc44fb25e 100644
--- a/components/vfs/registerarchives.cpp
+++ b/components/vfs/registerarchives.cpp
@@ -23,8 +23,12 @@ namespace VFS
                 // Last BSA has the highest priority
                 const std::string archivePath = collections.getPath(*archive).string();
                 Log(Debug::Info) << "Adding BSA archive " << archivePath;
+                Bsa::BsaVersion bsaVersion = Bsa::CompressedBSAFile::detectVersion(archivePath);
 
-                vfs->addArchive(new BsaArchive(archivePath));
+                if (bsaVersion == Bsa::BSAVER_COMPRESSED)
+                    vfs->addArchive(new CompressedBsaArchive(archivePath));
+                else
+                    vfs->addArchive(new BsaArchive(archivePath));
             }
             else
             {

From 98f8295765fe52e381a770375d5efcde2e173c5a Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Mon, 11 Oct 2021 09:27:50 +0000
Subject: [PATCH 1456/2859] allows to skip ComputeLightSpaceBounds traversal
 (#3152)

Currently, we always traverse the scene graph an additional time with a ComputeLightSpaceBounds visitor during shadow casting. ComputeLightSpaceBounds is only useful when the shadow casting mask allows us to shrink the bounds of the rendered scene, so we guard its traversal with a check against getCastsShadowTraversalMask. In practice, this guard never works because we build the traversal mask inclusively.

With this PR we limit the getCastsShadowTraversalMask check to relevant masks. This new check allows us to skip a superfluous ComputeLightSpaceBounds traversal with most settings.
---
 apps/openmw/mwrender/localmap.cpp          |  2 +-
 apps/openmw/mwrender/renderingmanager.cpp  |  6 +++---
 components/sceneutil/mwshadowtechnique.cpp | 12 +-----------
 components/sceneutil/mwshadowtechnique.hpp |  7 ++++---
 components/sceneutil/shadow.cpp            | 10 +++++++++-
 components/sceneutil/shadow.hpp            | 18 +++++++++++++-----
 components/terrain/quadtreeworld.cpp       | 22 +++++-----------------
 7 files changed, 36 insertions(+), 41 deletions(-)

diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index 0560d1485a..70f0ff02bb 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -195,7 +195,7 @@ osg::ref_ptr<osg::Camera> LocalMap::createOrthographicCamera(float x, float y, f
     camera->setNodeMask(Mask_RenderToTexture);
 
     // Disable small feature culling, it's not going to be reliable for this camera
-    osg::Camera::CullingMode cullingMode = (osg::Camera::DEFAULT_CULLING|osg::Camera::FAR_PLANE_CULLING) & ~(osg::CullStack::SMALL_FEATURE_CULLING);
+    osg::Camera::CullingMode cullingMode = (osg::Camera::DEFAULT_CULLING|osg::Camera::FAR_PLANE_CULLING) & ~(osg::Camera::SMALL_FEATURE_CULLING);
     camera->setCullingMode(cullingMode);
 
     osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 331ddeca7b..120f97e892 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -340,14 +340,14 @@ namespace MWRender
             shadowCastingTraversalMask |= Mask_Actor;
         if (Settings::Manager::getBool("player shadows", "Shadows"))
             shadowCastingTraversalMask |= Mask_Player;
-        if (Settings::Manager::getBool("terrain shadows", "Shadows"))
-            shadowCastingTraversalMask |= Mask_Terrain;
 
         int indoorShadowCastingTraversalMask = shadowCastingTraversalMask;
         if (Settings::Manager::getBool("object shadows", "Shadows"))
             shadowCastingTraversalMask |= (Mask_Object|Mask_Static);
+        if (Settings::Manager::getBool("terrain shadows", "Shadows"))
+            shadowCastingTraversalMask |= Mask_Terrain;
 
-        mShadowManager.reset(new SceneUtil::ShadowManager(sceneRoot, mRootNode, shadowCastingTraversalMask, indoorShadowCastingTraversalMask, mResourceSystem->getSceneManager()->getShaderManager()));
+        mShadowManager.reset(new SceneUtil::ShadowManager(sceneRoot, mRootNode, shadowCastingTraversalMask, indoorShadowCastingTraversalMask, Mask_Terrain|Mask_Object|Mask_Static, mResourceSystem->getSceneManager()->getShaderManager()));
 
         Shader::ShaderManager::DefineMap shadowDefines = mShadowManager->getShadowDefines();
         Shader::ShaderManager::DefineMap lightDefines = sceneRoot->getLightDefines();
diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
index db7aef7cb1..89d872dbfe 100644
--- a/components/sceneutil/mwshadowtechnique.cpp
+++ b/components/sceneutil/mwshadowtechnique.cpp
@@ -357,8 +357,6 @@ MWShadowTechnique::ComputeLightSpaceBounds::ComputeLightSpaceBounds() :
     osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ACTIVE_CHILDREN)
 {
     setCullingMode(osg::CullSettings::VIEW_FRUSTUM_CULLING);
-
-    setName("SceneUtil::MWShadowTechnique::ComputeLightSpaceBounds,AcceptedByComponentsTerrainQuadTreeWorld");
 }
 
 void MWShadowTechnique::ComputeLightSpaceBounds::reset()
@@ -393,14 +391,6 @@ void MWShadowTechnique::ComputeLightSpaceBounds::apply(osg::Drawable& drawable)
     popCurrentMask();
 }
 
-void MWShadowTechnique::ComputeLightSpaceBounds::apply(Terrain::QuadTreeWorld & quadTreeWorld)
-{
-    // For now, just expand the bounds fully as terrain will fill them up and possible ways to detect which terrain definitely won't cast shadows aren't implemented.
-
-    update(osg::Vec3(-1.0, -1.0, 0.0));
-    update(osg::Vec3(1.0, 1.0, 0.0));
-}
-
 void MWShadowTechnique::ComputeLightSpaceBounds::apply(osg::Billboard&)
 {
     OSG_INFO << "Warning Billboards not yet supported" << std::endl;
@@ -1122,7 +1112,7 @@ void MWShadowTechnique::cull(osgUtil::CullVisitor& cv)
 
         // if we are using multiple shadow maps and CastShadowTraversalMask is being used
         // traverse the scene to compute the extents of the objects
-        if (/*numShadowMapsPerLight>1 &&*/ _shadowedScene->getCastsShadowTraversalMask()!=0xffffffff)
+        if (/*numShadowMapsPerLight>1 &&*/ (_shadowedScene->getCastsShadowTraversalMask() & _worldMask) == 0)
         {
             // osg::ElapsedTime timer;
 
diff --git a/components/sceneutil/mwshadowtechnique.hpp b/components/sceneutil/mwshadowtechnique.hpp
index 229d444c2b..fd562184e0 100644
--- a/components/sceneutil/mwshadowtechnique.hpp
+++ b/components/sceneutil/mwshadowtechnique.hpp
@@ -31,7 +31,6 @@
 #include <osgShadow/ShadowTechnique>
 
 #include <components/shader/shadermanager.hpp>
-#include <components/terrain/quadtreeworld.hpp>
 
 namespace SceneUtil {
 
@@ -96,8 +95,6 @@ namespace SceneUtil {
 
             void apply(osg::Drawable& drawable) override;
 
-            void apply(Terrain::QuadTreeWorld& quadTreeWorld);
-
             void apply(osg::Billboard&) override;
 
             void apply(osg::Projection&) override;
@@ -237,6 +234,8 @@ namespace SceneUtil {
 
         virtual osg::StateSet* prepareStateSetForRenderingShadow(ViewDependentData& vdd, unsigned int traversalNumber) const;
 
+        void setWorldMask(unsigned int worldMask) { _worldMask = worldMask; }
+
     protected:
         virtual ~MWShadowTechnique();
 
@@ -270,6 +269,8 @@ namespace SceneUtil {
 
         float                                   _shadowFadeStart = 0.0;
 
+        unsigned int                            _worldMask = ~0u;
+
         class DebugHUD final : public osg::Referenced
         {
         public:
diff --git a/components/sceneutil/shadow.cpp b/components/sceneutil/shadow.cpp
index 3244dc672a..8c3758e980 100644
--- a/components/sceneutil/shadow.cpp
+++ b/components/sceneutil/shadow.cpp
@@ -1,10 +1,13 @@
 #include "shadow.hpp"
 
 #include <osgShadow/ShadowedScene>
+#include <osgShadow/ShadowSettings>
 
 #include <components/misc/stringops.hpp>
 #include <components/settings/settings.hpp>
 
+#include "mwshadowtechnique.hpp"
+
 namespace SceneUtil
 {
     using namespace osgShadow;
@@ -94,7 +97,7 @@ namespace SceneUtil
         }
     }
 
-    ShadowManager::ShadowManager(osg::ref_ptr<osg::Group> sceneRoot, osg::ref_ptr<osg::Group> rootNode, unsigned int outdoorShadowCastingMask, unsigned int indoorShadowCastingMask, Shader::ShaderManager &shaderManager) : mShadowedScene(new osgShadow::ShadowedScene),
+    ShadowManager::ShadowManager(osg::ref_ptr<osg::Group> sceneRoot, osg::ref_ptr<osg::Group> rootNode, unsigned int outdoorShadowCastingMask, unsigned int indoorShadowCastingMask, unsigned int worldMask, Shader::ShaderManager &shaderManager) : mShadowedScene(new osgShadow::ShadowedScene),
         mShadowTechnique(new MWShadowTechnique),
         mOutdoorShadowCastingMask(outdoorShadowCastingMask),
         mIndoorShadowCastingMask(indoorShadowCastingMask)
@@ -109,10 +112,15 @@ namespace SceneUtil
         setupShadowSettings();
 
         mShadowTechnique->setupCastingShader(shaderManager);
+        mShadowTechnique->setWorldMask(worldMask);
 
         enableOutdoorMode();
     }
 
+    ShadowManager::~ShadowManager()
+    {
+    }
+
     Shader::ShaderManager::DefineMap ShadowManager::getShadowDefines()
     {
         if (!mEnableShadows)
diff --git a/components/sceneutil/shadow.hpp b/components/sceneutil/shadow.hpp
index c823ecf860..4c34944f4a 100644
--- a/components/sceneutil/shadow.hpp
+++ b/components/sceneutil/shadow.hpp
@@ -1,15 +1,22 @@
 #ifndef COMPONENTS_SCENEUTIL_SHADOW_H
 #define COMPONENTS_SCENEUTIL_SHADOW_H
 
-#include <osgShadow/ShadowSettings>
-#include <osgShadow/ShadowedScene>
-
 #include <components/shader/shadermanager.hpp>
 
-#include "mwshadowtechnique.hpp"
+namespace osg
+{
+    class StateSet;
+    class Group;
+}
+namespace osgShadow
+{
+    class ShadowSettings;
+    class ShadowedScene;
+}
 
 namespace SceneUtil
 {
+    class MWShadowTechnique;
     class ShadowManager
     {
     public:
@@ -17,7 +24,8 @@ namespace SceneUtil
 
         static Shader::ShaderManager::DefineMap getShadowsDisabledDefines();
 
-        ShadowManager(osg::ref_ptr<osg::Group> sceneRoot, osg::ref_ptr<osg::Group> rootNode, unsigned int outdoorShadowCastingMask, unsigned int indoorShadowCastingMask, Shader::ShaderManager &shaderManager);
+        ShadowManager(osg::ref_ptr<osg::Group> sceneRoot, osg::ref_ptr<osg::Group> rootNode, unsigned int outdoorShadowCastingMask, unsigned int indoorShadowCastingMask, unsigned int worldMask, Shader::ShaderManager &shaderManager);
+        ~ShadowManager();
 
         void setupShadowSettings();
 
diff --git a/components/terrain/quadtreeworld.cpp b/components/terrain/quadtreeworld.cpp
index 7e5cd001ba..c2d212f8a5 100644
--- a/components/terrain/quadtreeworld.cpp
+++ b/components/terrain/quadtreeworld.cpp
@@ -3,12 +3,12 @@
 #include <osgUtil/CullVisitor>
 #include <osg/ShapeDrawable>
 #include <osg/PolygonMode>
+#include <osg/Material>
 
 #include <limits>
 #include <sstream>
 
 #include <components/misc/constants.hpp>
-#include <components/sceneutil/mwshadowtechnique.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/loadinglistener/reporter.hpp>
 #include <components/resource/resourcesystem.hpp>
@@ -257,10 +257,10 @@ public:
     {
         osg::Vec3f center = { chunkCenter.x(), chunkCenter.y(), 0 };
         auto chunkBorder = CellBorder::createBorderGeometry(center.x() - size / 2.f, center.y() - size / 2.f, size, mStorage, mSceneManager, mNodeMask, 5.f, { 1, 0, 0, 0 });
-        osg::ref_ptr<osg::MatrixTransform> trans = new osg::MatrixTransform(osg::Matrixf::translate(-center*Constants::CellSizeInUnits));
-        trans->setDataVariance(osg::Object::STATIC);
-        trans->addChild(chunkBorder);
-        return trans;
+        osg::ref_ptr<SceneUtil::PositionAttitudeTransform> pat = new SceneUtil::PositionAttitudeTransform;
+        pat->setPosition(-center*Constants::CellSizeInUnits);
+        pat->addChild(chunkBorder);
+        return pat;
     }
     unsigned int getNodeMask() { return mNodeMask; }
 private:
@@ -440,19 +440,7 @@ void QuadTreeWorld::accept(osg::NodeVisitor &nv)
 {
     bool isCullVisitor = nv.getVisitorType() == osg::NodeVisitor::CULL_VISITOR;
     if (!isCullVisitor && nv.getVisitorType() != osg::NodeVisitor::INTERSECTION_VISITOR)
-    {
-        if (nv.getName().find("AcceptedByComponentsTerrainQuadTreeWorld") != std::string::npos)
-        {
-            if (nv.getName().find("SceneUtil::MWShadowTechnique::ComputeLightSpaceBounds") != std::string::npos)
-            {
-                SceneUtil::MWShadowTechnique::ComputeLightSpaceBounds* clsb = static_cast<SceneUtil::MWShadowTechnique::ComputeLightSpaceBounds*>(&nv);
-                clsb->apply(*this);
-            }
-            else
-                nv.apply(*mRootNode);
-        }
         return;
-    }
 
     osg::Object * viewer = isCullVisitor ? static_cast<osgUtil::CullVisitor*>(&nv)->getCurrentCamera() : nullptr;
     bool needsUpdate = true;

From ef906cbfa89b9c9dc680db035778f7a80f92f65b Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Mon, 11 Oct 2021 11:46:21 +0000
Subject: [PATCH 1457/2859] improves MWClass mapping (#3166)

Currently, we use a peculiar mapping of ESM classes by their std::type_info::name. This mapping is an undefined behaviour because std::type_info::name is strictly implementation defined. It could return a non-unique value on some platforms. With this PR we use the unsigned int sRecordId of the ESM class as a more efficient lookup type that does not build on undefined behaviour. We can expect marginally faster save-game loading with these changes as well.
---
 apps/openmw/mwclass/activator.cpp             |  2 +-
 apps/openmw/mwclass/apparatus.cpp             |  2 +-
 apps/openmw/mwclass/armor.cpp                 |  4 +-
 apps/openmw/mwclass/bodypart.cpp              |  2 +-
 apps/openmw/mwclass/book.cpp                  |  2 +-
 apps/openmw/mwclass/clothing.cpp              |  2 +-
 apps/openmw/mwclass/container.cpp             |  2 +-
 apps/openmw/mwclass/creature.cpp              |  4 +-
 apps/openmw/mwclass/creaturelevlist.cpp       |  2 +-
 apps/openmw/mwclass/door.cpp                  |  2 +-
 apps/openmw/mwclass/ingredient.cpp            |  2 +-
 apps/openmw/mwclass/itemlevlist.cpp           |  2 +-
 apps/openmw/mwclass/light.cpp                 |  2 +-
 apps/openmw/mwclass/lockpick.cpp              |  2 +-
 apps/openmw/mwclass/misc.cpp                  |  2 +-
 apps/openmw/mwclass/npc.cpp                   | 16 ++--
 apps/openmw/mwclass/potion.cpp                |  2 +-
 apps/openmw/mwclass/probe.cpp                 |  2 +-
 apps/openmw/mwclass/repair.cpp                |  2 +-
 apps/openmw/mwclass/static.cpp                |  2 +-
 apps/openmw/mwclass/weapon.cpp                |  2 +-
 apps/openmw/mwdialogue/filter.cpp             |  8 +-
 apps/openmw/mwgui/alchemywindow.cpp           |  2 +-
 apps/openmw/mwgui/containeritemmodel.cpp      |  2 +-
 apps/openmw/mwgui/dialogue.cpp                |  6 +-
 apps/openmw/mwgui/inventorywindow.cpp         | 42 ++++-----
 apps/openmw/mwgui/quickkeysmenu.cpp           |  6 +-
 apps/openmw/mwgui/sortfilteritemmodel.cpp     | 86 +++++++++----------
 apps/openmw/mwgui/travelwindow.cpp            |  2 +-
 apps/openmw/mwlua/object.cpp                  |  8 +-
 apps/openmw/mwlua/object.hpp                  |  4 +-
 apps/openmw/mwmechanics/actors.cpp            | 10 +--
 apps/openmw/mwmechanics/character.cpp         | 16 ++--
 apps/openmw/mwmechanics/combat.cpp            |  2 +-
 apps/openmw/mwmechanics/enchanting.cpp        | 10 +--
 apps/openmw/mwmechanics/enchanting.hpp        |  2 +-
 apps/openmw/mwmechanics/levelledlist.hpp      |  6 +-
 .../mwmechanics/mechanicsmanagerimp.cpp       |  2 +-
 apps/openmw/mwmechanics/objects.cpp           |  2 +-
 apps/openmw/mwmechanics/spellcasting.cpp      |  2 +-
 apps/openmw/mwmechanics/spelleffects.cpp      |  6 +-
 apps/openmw/mwmechanics/spellpriority.cpp     |  2 +-
 apps/openmw/mwmechanics/spellutil.cpp         |  2 +-
 apps/openmw/mwmechanics/trading.cpp           |  2 +-
 apps/openmw/mwmechanics/weaponpriority.cpp    |  2 +-
 apps/openmw/mwmechanics/weapontype.cpp        |  6 +-
 apps/openmw/mwrender/actoranimation.cpp       | 38 ++++----
 apps/openmw/mwrender/animation.cpp            |  4 +-
 apps/openmw/mwrender/characterpreview.cpp     |  4 +-
 apps/openmw/mwrender/creatureanimation.cpp    |  8 +-
 apps/openmw/mwrender/npcanimation.cpp         | 16 ++--
 apps/openmw/mwrender/weaponanimation.cpp      |  4 +-
 apps/openmw/mwscript/containerextensions.cpp  | 16 ++--
 apps/openmw/mwscript/miscextensions.cpp       |  2 +-
 apps/openmw/mwworld/class.cpp                 | 15 ++--
 apps/openmw/mwworld/class.hpp                 | 13 ++-
 apps/openmw/mwworld/containerstore.cpp        | 29 +++----
 apps/openmw/mwworld/inventorystore.cpp        | 12 +--
 apps/openmw/mwworld/livecellref.cpp           |  2 +-
 apps/openmw/mwworld/livecellref.hpp           | 12 +--
 apps/openmw/mwworld/localscripts.cpp          |  2 +-
 apps/openmw/mwworld/ptr.cpp                   |  8 +-
 apps/openmw/mwworld/ptr.hpp                   | 22 +++--
 apps/openmw/mwworld/worldimp.cpp              | 18 ++--
 64 files changed, 265 insertions(+), 258 deletions(-)

diff --git a/apps/openmw/mwclass/activator.cpp b/apps/openmw/mwclass/activator.cpp
index 6285bdbf7e..6c53ba72f3 100644
--- a/apps/openmw/mwclass/activator.cpp
+++ b/apps/openmw/mwclass/activator.cpp
@@ -89,7 +89,7 @@ namespace MWClass
     {
         std::shared_ptr<Class> instance (new Activator);
 
-        registerClass (typeid (ESM::Activator).name(), instance);
+        registerClass (ESM::Activator::sRecordId, instance);
     }
 
     bool Activator::hasToolTip (const MWWorld::ConstPtr& ptr) const
diff --git a/apps/openmw/mwclass/apparatus.cpp b/apps/openmw/mwclass/apparatus.cpp
index e09e4804ce..6e9d8b3779 100644
--- a/apps/openmw/mwclass/apparatus.cpp
+++ b/apps/openmw/mwclass/apparatus.cpp
@@ -69,7 +69,7 @@ namespace MWClass
     {
         std::shared_ptr<Class> instance (new Apparatus);
 
-        registerClass (typeid (ESM::Apparatus).name(), instance);
+        registerClass (ESM::Apparatus::sRecordId, instance);
     }
 
     std::string Apparatus::getUpSoundId (const MWWorld::ConstPtr& ptr) const
diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index 817adbc1f5..bc2d788b5b 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -163,7 +163,7 @@ namespace MWClass
     {
         std::shared_ptr<Class> instance (new Armor);
 
-        registerClass (typeid (ESM::Armor).name(), instance);
+        registerClass (ESM::Armor::sRecordId, instance);
     }
 
     std::string Armor::getUpSoundId (const MWWorld::ConstPtr& ptr) const
@@ -322,7 +322,7 @@ namespace MWClass
             if(*slot == MWWorld::InventoryStore::Slot_CarriedLeft)
             {
                 MWWorld::ConstContainerStoreIterator weapon = invStore.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
-                if(weapon != invStore.end() && weapon->getTypeName() == typeid(ESM::Weapon).name())
+                if(weapon != invStore.end() && weapon->getType() == ESM::Weapon::sRecordId)
                 {
                     const MWWorld::LiveCellRef<ESM::Weapon> *ref = weapon->get<ESM::Weapon>();
                     if (MWMechanics::getWeaponType(ref->mBase->mData.mType)->mFlags & ESM::WeaponType::TwoHanded)
diff --git a/apps/openmw/mwclass/bodypart.cpp b/apps/openmw/mwclass/bodypart.cpp
index 7fe798e27d..06b460f75c 100644
--- a/apps/openmw/mwclass/bodypart.cpp
+++ b/apps/openmw/mwclass/bodypart.cpp
@@ -36,7 +36,7 @@ namespace MWClass
     {
         std::shared_ptr<MWWorld::Class> instance (new BodyPart);
 
-        registerClass (typeid (ESM::BodyPart).name(), instance);
+        registerClass (ESM::BodyPart::sRecordId, instance);
     }
 
     std::string BodyPart::getModel(const MWWorld::ConstPtr &ptr) const
diff --git a/apps/openmw/mwclass/book.cpp b/apps/openmw/mwclass/book.cpp
index 51b9e39d7a..eef8e02808 100644
--- a/apps/openmw/mwclass/book.cpp
+++ b/apps/openmw/mwclass/book.cpp
@@ -85,7 +85,7 @@ namespace MWClass
     {
         std::shared_ptr<Class> instance (new Book);
 
-        registerClass (typeid (ESM::Book).name(), instance);
+        registerClass (ESM::Book::sRecordId, instance);
     }
 
     std::string Book::getUpSoundId (const MWWorld::ConstPtr& ptr) const
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index 400cd97e41..ce8c79d02e 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -121,7 +121,7 @@ namespace MWClass
     {
         std::shared_ptr<Class> instance (new Clothing);
 
-        registerClass (typeid (ESM::Clothing).name(), instance);
+        registerClass (ESM::Clothing::sRecordId, instance);
     }
 
     std::string Clothing::getUpSoundId (const MWWorld::ConstPtr& ptr) const
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index 06980f55da..0f45c25744 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -242,7 +242,7 @@ namespace MWClass
     {
         std::shared_ptr<Class> instance (new Container);
 
-        registerClass (typeid (ESM::Container).name(), instance);
+        registerClass (ESM::Container::sRecordId, instance);
     }
 
     bool Container::hasToolTip (const MWWorld::ConstPtr& ptr) const
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 54623e6699..c20a005724 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -238,7 +238,7 @@ namespace MWClass
         {
             MWWorld::InventoryStore &inv = getInventoryStore(ptr);
             MWWorld::ContainerStoreIterator weaponslot = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
-            if (weaponslot != inv.end() && weaponslot->getTypeName() == typeid(ESM::Weapon).name())
+            if (weaponslot != inv.end() && weaponslot->getType() == ESM::Weapon::sRecordId)
                 weapon = *weaponslot;
         }
 
@@ -497,7 +497,7 @@ namespace MWClass
     {
         std::shared_ptr<Class> instance (new Creature);
 
-        registerClass (typeid (ESM::Creature).name(), instance);
+        registerClass (ESM::Creature::sRecordId, instance);
     }
 
     float Creature::getMaxSpeed(const MWWorld::Ptr &ptr) const
diff --git a/apps/openmw/mwclass/creaturelevlist.cpp b/apps/openmw/mwclass/creaturelevlist.cpp
index f86004c619..e8023ce26b 100644
--- a/apps/openmw/mwclass/creaturelevlist.cpp
+++ b/apps/openmw/mwclass/creaturelevlist.cpp
@@ -70,7 +70,7 @@ namespace MWClass
     {
         std::shared_ptr<Class> instance (new CreatureLevList);
 
-        registerClass (typeid (ESM::CreatureLevList).name(), instance);
+        registerClass (ESM::CreatureLevList::sRecordId, instance);
     }
 
     void CreatureLevList::getModelsToPreload(const MWWorld::Ptr &ptr, std::vector<std::string> &models) const
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index b5fe705ca6..01ff2aa440 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -264,7 +264,7 @@ namespace MWClass
     {
         std::shared_ptr<Class> instance (new Door);
 
-        registerClass (typeid (ESM::Door).name(), instance);
+        registerClass (ESM::Door::sRecordId, instance);
     }
 
     MWGui::ToolTipInfo Door::getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const
diff --git a/apps/openmw/mwclass/ingredient.cpp b/apps/openmw/mwclass/ingredient.cpp
index 20f9576dff..f582812934 100644
--- a/apps/openmw/mwclass/ingredient.cpp
+++ b/apps/openmw/mwclass/ingredient.cpp
@@ -81,7 +81,7 @@ namespace MWClass
     {
         std::shared_ptr<Class> instance (new Ingredient);
 
-        registerClass (typeid (ESM::Ingredient).name(), instance);
+        registerClass (ESM::Ingredient::sRecordId, instance);
     }
 
     std::string Ingredient::getUpSoundId (const MWWorld::ConstPtr& ptr) const
diff --git a/apps/openmw/mwclass/itemlevlist.cpp b/apps/openmw/mwclass/itemlevlist.cpp
index 5608a8d233..4ca45152a1 100644
--- a/apps/openmw/mwclass/itemlevlist.cpp
+++ b/apps/openmw/mwclass/itemlevlist.cpp
@@ -19,6 +19,6 @@ namespace MWClass
     {
         std::shared_ptr<Class> instance (new ItemLevList);
 
-        registerClass (typeid (ESM::ItemLevList).name(), instance);
+        registerClass (ESM::ItemLevList::sRecordId, instance);
     }
 }
diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index 69cc1a09bf..dbd4e8a184 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -124,7 +124,7 @@ namespace MWClass
     {
         std::shared_ptr<Class> instance (new Light);
 
-        registerClass (typeid (ESM::Light).name(), instance);
+        registerClass (ESM::Light::sRecordId, instance);
     }
 
     std::string Light::getUpSoundId (const MWWorld::ConstPtr& ptr) const
diff --git a/apps/openmw/mwclass/lockpick.cpp b/apps/openmw/mwclass/lockpick.cpp
index 985b087711..ccb5bbbd58 100644
--- a/apps/openmw/mwclass/lockpick.cpp
+++ b/apps/openmw/mwclass/lockpick.cpp
@@ -80,7 +80,7 @@ namespace MWClass
     {
         std::shared_ptr<Class> instance (new Lockpick);
 
-        registerClass (typeid (ESM::Lockpick).name(), instance);
+        registerClass (ESM::Lockpick::sRecordId, instance);
     }
 
     std::string Lockpick::getUpSoundId (const MWWorld::ConstPtr& ptr) const
diff --git a/apps/openmw/mwclass/misc.cpp b/apps/openmw/mwclass/misc.cpp
index facab9d51c..30e68d2377 100644
--- a/apps/openmw/mwclass/misc.cpp
+++ b/apps/openmw/mwclass/misc.cpp
@@ -106,7 +106,7 @@ namespace MWClass
     {
         std::shared_ptr<Class> instance (new Miscellaneous);
 
-        registerClass (typeid (ESM::Miscellaneous).name(), instance);
+        registerClass (ESM::Miscellaneous::sRecordId, instance);
     }
 
     std::string Miscellaneous::getUpSoundId (const MWWorld::ConstPtr& ptr) const
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 718b4d972d..59280a0f02 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -459,12 +459,12 @@ namespace MWClass
             if (equipped != invStore.end())
             {
                 std::vector<ESM::PartReference> parts;
-                if(equipped->getTypeName() == typeid(ESM::Clothing).name())
+                if(equipped->getType() == ESM::Clothing::sRecordId)
                 {
                     const ESM::Clothing *clothes = equipped->get<ESM::Clothing>()->mBase;
                     parts = clothes->mParts.mParts;
                 }
-                else if(equipped->getTypeName() == typeid(ESM::Armor).name())
+                else if(equipped->getType() == ESM::Armor::sRecordId)
                 {
                     const ESM::Armor *armor = equipped->get<ESM::Armor>()->mBase;
                     parts = armor->mParts.mParts;
@@ -543,7 +543,7 @@ namespace MWClass
         MWWorld::InventoryStore &inv = getInventoryStore(ptr);
         MWWorld::ContainerStoreIterator weaponslot = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
         MWWorld::Ptr weapon = ((weaponslot != inv.end()) ? *weaponslot : MWWorld::Ptr());
-        if(!weapon.isEmpty() && weapon.getTypeName() != typeid(ESM::Weapon).name())
+        if(!weapon.isEmpty() && weapon.getType() != ESM::Weapon::sRecordId)
             weapon = MWWorld::Ptr();
 
         MWMechanics::applyFatigueLoss(ptr, weapon, attackStrength);
@@ -766,7 +766,7 @@ namespace MWClass
                 MWWorld::InventoryStore &inv = getInventoryStore(ptr);
                 MWWorld::ContainerStoreIterator armorslot = inv.getSlot(hitslot);
                 MWWorld::Ptr armor = ((armorslot != inv.end()) ? *armorslot : MWWorld::Ptr());
-                bool hasArmor = !armor.isEmpty() && armor.getTypeName() == typeid(ESM::Armor).name();
+                bool hasArmor = !armor.isEmpty() && armor.getType() == ESM::Armor::sRecordId;
                 // If there's no item in the carried left slot or if it is not a shield redistribute the hit.
                 if (!hasArmor && hitslot == MWWorld::InventoryStore::Slot_CarriedLeft)
                 {
@@ -778,7 +778,7 @@ namespace MWClass
                     if (armorslot != inv.end())
                     {
                         armor = *armorslot;
-                        hasArmor = !armor.isEmpty() && armor.getTypeName() == typeid(ESM::Armor).name();
+                        hasArmor = !armor.isEmpty() && armor.getType() == ESM::Armor::sRecordId;
                     }
                 }
                 if (hasArmor)
@@ -1036,7 +1036,7 @@ namespace MWClass
     void Npc::registerSelf()
     {
         std::shared_ptr<Class> instance (new Npc);
-        registerClass (typeid (ESM::NPC).name(), instance);
+        registerClass (ESM::NPC::sRecordId, instance);
     }
 
     bool Npc::hasToolTip(const MWWorld::ConstPtr& ptr) const
@@ -1135,7 +1135,7 @@ namespace MWClass
         for(int i = 0;i < MWWorld::InventoryStore::Slots;i++)
         {
             MWWorld::ConstContainerStoreIterator it = invStore.getSlot(i);
-            if (it == invStore.end() || it->getTypeName() != typeid(ESM::Armor).name())
+            if (it == invStore.end() || it->getType() != ESM::Armor::sRecordId)
             {
                 // unarmored
                 ratings[i] = (fUnarmoredBase1 * unarmoredSkill) * (fUnarmoredBase2 * unarmoredSkill);
@@ -1232,7 +1232,7 @@ namespace MWClass
 
                 const MWWorld::InventoryStore &inv = Npc::getInventoryStore(ptr);
                 MWWorld::ConstContainerStoreIterator boots = inv.getSlot(MWWorld::InventoryStore::Slot_Boots);
-                if(boots == inv.end() || boots->getTypeName() != typeid(ESM::Armor).name())
+                if(boots == inv.end() || boots->getType() != ESM::Armor::sRecordId)
                     return (name == "left") ? "FootBareLeft" : "FootBareRight";
 
                 switch(boots->getClass().getEquipmentSkill(*boots))
diff --git a/apps/openmw/mwclass/potion.cpp b/apps/openmw/mwclass/potion.cpp
index 56d9dff279..e0f8cf8397 100644
--- a/apps/openmw/mwclass/potion.cpp
+++ b/apps/openmw/mwclass/potion.cpp
@@ -74,7 +74,7 @@ namespace MWClass
     {
         std::shared_ptr<Class> instance (new Potion);
 
-        registerClass (typeid (ESM::Potion).name(), instance);
+        registerClass (ESM::Potion::sRecordId, instance);
     }
 
     std::string Potion::getUpSoundId (const MWWorld::ConstPtr& ptr) const
diff --git a/apps/openmw/mwclass/probe.cpp b/apps/openmw/mwclass/probe.cpp
index 51273337a6..8291fb8f3c 100644
--- a/apps/openmw/mwclass/probe.cpp
+++ b/apps/openmw/mwclass/probe.cpp
@@ -80,7 +80,7 @@ namespace MWClass
     {
         std::shared_ptr<Class> instance (new Probe);
 
-        registerClass (typeid (ESM::Probe).name(), instance);
+        registerClass (ESM::Probe::sRecordId, instance);
     }
 
     std::string Probe::getUpSoundId (const MWWorld::ConstPtr& ptr) const
diff --git a/apps/openmw/mwclass/repair.cpp b/apps/openmw/mwclass/repair.cpp
index f1b88e422b..42581a8b6b 100644
--- a/apps/openmw/mwclass/repair.cpp
+++ b/apps/openmw/mwclass/repair.cpp
@@ -69,7 +69,7 @@ namespace MWClass
     {
         std::shared_ptr<Class> instance (new Repair);
 
-        registerClass (typeid (ESM::Repair).name(), instance);
+        registerClass (ESM::Repair::sRecordId, instance);
     }
 
     std::string Repair::getUpSoundId (const MWWorld::ConstPtr& ptr) const
diff --git a/apps/openmw/mwclass/static.cpp b/apps/openmw/mwclass/static.cpp
index 0805ca3dd1..fc350c8351 100644
--- a/apps/openmw/mwclass/static.cpp
+++ b/apps/openmw/mwclass/static.cpp
@@ -59,7 +59,7 @@ namespace MWClass
     {
         std::shared_ptr<Class> instance (new Static);
 
-        registerClass (typeid (ESM::Static).name(), instance);
+        registerClass (ESM::Static::sRecordId, instance);
     }
 
     MWWorld::Ptr Static::copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index 6246c8fb09..e7337c83b7 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -125,7 +125,7 @@ namespace MWClass
     {
         std::shared_ptr<Class> instance (new Weapon);
 
-        registerClass (typeid (ESM::Weapon).name(), instance);
+        registerClass (ESM::Weapon::sRecordId, instance);
     }
 
     std::string Weapon::getUpSoundId (const MWWorld::ConstPtr& ptr) const
diff --git a/apps/openmw/mwdialogue/filter.cpp b/apps/openmw/mwdialogue/filter.cpp
index 334a9db39f..a47334a2dd 100644
--- a/apps/openmw/mwdialogue/filter.cpp
+++ b/apps/openmw/mwdialogue/filter.cpp
@@ -23,7 +23,7 @@
 
 bool MWDialogue::Filter::testActor (const ESM::DialInfo& info) const
 {
-    bool isCreature = (mActor.getTypeName() != typeid (ESM::NPC).name());
+    bool isCreature = (mActor.getType() != ESM::NPC::sRecordId);
 
     // actor id
     if (!info.mActor.empty())
@@ -160,7 +160,7 @@ bool MWDialogue::Filter::testSelectStructs (const ESM::DialInfo& info) const
 
 bool MWDialogue::Filter::testDisposition (const ESM::DialInfo& info, bool invert) const
 {
-    bool isCreature = (mActor.getTypeName() != typeid (ESM::NPC).name());
+    bool isCreature = (mActor.getType() != ESM::NPC::sRecordId);
 
     if (isCreature)
         return true;
@@ -207,7 +207,7 @@ bool MWDialogue::Filter::testFunctionLocal(const MWDialogue::SelectWrapper& sele
 
 bool MWDialogue::Filter::testSelectStruct (const SelectWrapper& select) const
 {
-    if (select.isNpcOnly() && (mActor.getTypeName() != typeid (ESM::NPC).name()))
+    if (select.isNpcOnly() && (mActor.getType() != ESM::NPC::sRecordId))
         // If the actor is a creature, we pass all conditions only applicable to NPCs.
         return true;
 
@@ -452,7 +452,7 @@ int MWDialogue::Filter::getSelectStructInteger (const SelectWrapper& select) con
                 {
                     if (target.getClass().isNpc() && target.getClass().getNpcStats(target).isWerewolf())
                         return 2;
-                    if (target.getTypeName() == typeid(ESM::Creature).name())
+                    if (target.getType() == ESM::Creature::sRecordId)
                         return 1;
                 }
             }
diff --git a/apps/openmw/mwgui/alchemywindow.cpp b/apps/openmw/mwgui/alchemywindow.cpp
index bacd1c7695..fd4a21cf10 100644
--- a/apps/openmw/mwgui/alchemywindow.cpp
+++ b/apps/openmw/mwgui/alchemywindow.cpp
@@ -194,7 +194,7 @@ namespace MWGui
         for (size_t i = 0; i < mModel->getItemCount(); ++i)
         {
             MWWorld::Ptr item = mModel->getItem(i).mBase;
-            if (item.getTypeName() != typeid(ESM::Ingredient).name())
+            if (item.getType() != ESM::Ingredient::sRecordId)
                 continue;
 
             itemNames.insert(item.getClass().getName(item));
diff --git a/apps/openmw/mwgui/containeritemmodel.cpp b/apps/openmw/mwgui/containeritemmodel.cpp
index 81dde1c059..9f202108a2 100644
--- a/apps/openmw/mwgui/containeritemmodel.cpp
+++ b/apps/openmw/mwgui/containeritemmodel.cpp
@@ -209,7 +209,7 @@ bool ContainerItemModel::onDropItem(const MWWorld::Ptr &item, int count)
 
     MWWorld::Ptr target = mItemSources[0].first;
 
-    if (target.getTypeName() != typeid(ESM::Container).name())
+    if (target.getType() != ESM::Container::sRecordId)
         return true;
 
     // check container organic flag
diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp
index 93180adad2..1da77f5d06 100644
--- a/apps/openmw/mwgui/dialogue.cpp
+++ b/apps/openmw/mwgui/dialogue.cpp
@@ -508,13 +508,13 @@ namespace MWGui
 
         int services = mPtr.getClass().getServices(mPtr);
 
-        bool travel = (mPtr.getTypeName() == typeid(ESM::NPC).name() && !mPtr.get<ESM::NPC>()->mBase->getTransport().empty())
-                || (mPtr.getTypeName() == typeid(ESM::Creature).name() && !mPtr.get<ESM::Creature>()->mBase->getTransport().empty());
+        bool travel = (mPtr.getType() == ESM::NPC::sRecordId && !mPtr.get<ESM::NPC>()->mBase->getTransport().empty())
+                || (mPtr.getType() == ESM::Creature::sRecordId && !mPtr.get<ESM::Creature>()->mBase->getTransport().empty());
 
         const MWWorld::Store<ESM::GameSetting> &gmst =
             MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
-        if (mPtr.getTypeName() == typeid(ESM::NPC).name())
+        if (mPtr.getType() == ESM::NPC::sRecordId)
             mTopicsList->addItem(gmst.find("sPersuasion")->mValue.getString());
 
         if (services & ESM::NPC::AllItems)
diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index f53ba21f9f..a586991888 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -46,7 +46,7 @@ namespace
 
     bool isRightHandWeapon(const MWWorld::Ptr& item)
     {
-        if (item.getClass().getTypeName() != typeid(ESM::Weapon).name())
+        if (item.getClass().getType() != ESM::Weapon::sRecordId)
             return false;
         std::vector<int> equipmentSlots = item.getClass().getEquipmentSlots(item).first;
         return (!equipmentSlots.empty() && equipmentSlots.front() == MWWorld::InventoryStore::Slot_CarriedRight);
@@ -281,7 +281,7 @@ namespace MWGui
         // If we unequip weapon during attack, it can lead to unexpected behaviour
         if (MWBase::Environment::get().getMechanicsManager()->isAttackingOrSpell(mPtr))
         {
-            bool isWeapon = item.mBase.getTypeName() == typeid(ESM::Weapon).name();
+            bool isWeapon = item.mBase.getType() == ESM::Weapon::sRecordId;
             MWWorld::InventoryStore& invStore = mPtr.getClass().getInventoryStore(mPtr);
 
             if (isWeapon && invStore.isEquipped(item.mBase))
@@ -555,9 +555,9 @@ namespace MWGui
         if (!script.empty())
         {
             // Ingredients, books and repair hammers must not have OnPCEquip set to 1 here
-            const std::string& type = ptr.getTypeName();
-            bool isBook = type == typeid(ESM::Book).name();
-            if (!isBook && type != typeid(ESM::Ingredient).name() && type != typeid(ESM::Repair).name())
+            auto type = ptr.getType();
+            bool isBook = type == ESM::Book::sRecordId;
+            if (!isBook && type != ESM::Ingredient::sRecordId && type != ESM::Repair::sRecordId)
                 ptr.getRefData().getLocals().setVarByInt(script, "onpcequip", 1);
             // Books must have PCSkipEquip set to 1 instead
             else if (isBook)
@@ -593,8 +593,8 @@ namespace MWGui
             useItem(ptr);
 
             // If item is ingredient or potion don't stop drag and drop to simplify action of taking more than one 1 item
-            if ((ptr.getTypeName() == typeid(ESM::Potion).name() ||
-                 ptr.getTypeName() == typeid(ESM::Ingredient).name())
+            if ((ptr.getType() == ESM::Potion::sRecordId ||
+                 ptr.getType() == ESM::Ingredient::sRecordId)
                 && mDragAndDrop->mDraggedCount > 1)
             {
                 // Item can be provided from other window for example container.
@@ -704,19 +704,19 @@ namespace MWGui
         if (!MWBase::Environment::get().getWindowManager()->isAllowed(GW_Inventory))
             return;
         // make sure the object is of a type that can be picked up
-        const std::string& type = object.getTypeName();
-        if ( (type != typeid(ESM::Apparatus).name())
-            && (type != typeid(ESM::Armor).name())
-            && (type != typeid(ESM::Book).name())
-            && (type != typeid(ESM::Clothing).name())
-            && (type != typeid(ESM::Ingredient).name())
-            && (type != typeid(ESM::Light).name())
-            && (type != typeid(ESM::Miscellaneous).name())
-            && (type != typeid(ESM::Lockpick).name())
-            && (type != typeid(ESM::Probe).name())
-            && (type != typeid(ESM::Repair).name())
-            && (type != typeid(ESM::Weapon).name())
-            && (type != typeid(ESM::Potion).name()))
+        auto type = object.getType();
+        if ( (type != ESM::Apparatus::sRecordId)
+            && (type != ESM::Armor::sRecordId)
+            && (type != ESM::Book::sRecordId)
+            && (type != ESM::Clothing::sRecordId)
+            && (type != ESM::Ingredient::sRecordId)
+            && (type != ESM::Light::sRecordId)
+            && (type != ESM::Miscellaneous::sRecordId)
+            && (type != ESM::Lockpick::sRecordId)
+            && (type != ESM::Probe::sRecordId)
+            && (type != ESM::Repair::sRecordId)
+            && (type != ESM::Weapon::sRecordId)
+            && (type != ESM::Potion::sRecordId))
             return;
 
         // An object that can be picked up must have a tooltip.
@@ -809,7 +809,7 @@ namespace MWGui
 
             lastId = item.getCellRef().getRefId();
 
-            if (item.getClass().getTypeName() == typeid(ESM::Weapon).name() &&
+            if (item.getClass().getType() == ESM::Weapon::sRecordId &&
                 isRightHandWeapon(item) &&
                 item.getClass().canBeEquipped(item, player).first)
             {
diff --git a/apps/openmw/mwgui/quickkeysmenu.cpp b/apps/openmw/mwgui/quickkeysmenu.cpp
index a6bfac2a45..ad61f63b90 100644
--- a/apps/openmw/mwgui/quickkeysmenu.cpp
+++ b/apps/openmw/mwgui/quickkeysmenu.cpp
@@ -387,9 +387,9 @@ namespace MWGui
 
             if (key->type == Type_Item)
             {
-                bool isWeapon = item.getTypeName() == typeid(ESM::Weapon).name();
-                bool isTool = item.getTypeName() == typeid(ESM::Probe).name() ||
-                    item.getTypeName() == typeid(ESM::Lockpick).name();
+                bool isWeapon = item.getType() == ESM::Weapon::sRecordId;
+                bool isTool = item.getType() == ESM::Probe::sRecordId ||
+                    item.getType() == ESM::Lockpick::sRecordId;
 
                 // delay weapon switching if player is busy
                 if (isDelayNeeded && (isWeapon || isTool))
diff --git a/apps/openmw/mwgui/sortfilteritemmodel.cpp b/apps/openmw/mwgui/sortfilteritemmodel.cpp
index 28b13cdf0d..eb7ebd0e43 100644
--- a/apps/openmw/mwgui/sortfilteritemmodel.cpp
+++ b/apps/openmw/mwgui/sortfilteritemmodel.cpp
@@ -27,22 +27,22 @@
 
 namespace
 {
-    bool compareType(const std::string& type1, const std::string& type2)
+    bool compareType(unsigned int type1, unsigned int type2)
     {
         // this defines the sorting order of types. types that are first in the vector appear before other types.
-        std::vector<std::string> mapping;
-        mapping.emplace_back(typeid(ESM::Weapon).name() );
-        mapping.emplace_back(typeid(ESM::Armor).name() );
-        mapping.emplace_back(typeid(ESM::Clothing).name() );
-        mapping.emplace_back(typeid(ESM::Potion).name() );
-        mapping.emplace_back(typeid(ESM::Ingredient).name() );
-        mapping.emplace_back(typeid(ESM::Apparatus).name() );
-        mapping.emplace_back(typeid(ESM::Book).name() );
-        mapping.emplace_back(typeid(ESM::Light).name() );
-        mapping.emplace_back(typeid(ESM::Miscellaneous).name() );
-        mapping.emplace_back(typeid(ESM::Lockpick).name() );
-        mapping.emplace_back(typeid(ESM::Repair).name() );
-        mapping.emplace_back(typeid(ESM::Probe).name() );
+        std::vector<unsigned int> mapping;
+        mapping.emplace_back(ESM::Weapon::sRecordId );
+        mapping.emplace_back(ESM::Armor::sRecordId );
+        mapping.emplace_back(ESM::Clothing::sRecordId );
+        mapping.emplace_back(ESM::Potion::sRecordId );
+        mapping.emplace_back(ESM::Ingredient::sRecordId );
+        mapping.emplace_back(ESM::Apparatus::sRecordId );
+        mapping.emplace_back(ESM::Book::sRecordId );
+        mapping.emplace_back(ESM::Light::sRecordId );
+        mapping.emplace_back(ESM::Miscellaneous::sRecordId );
+        mapping.emplace_back(ESM::Lockpick::sRecordId );
+        mapping.emplace_back(ESM::Repair::sRecordId );
+        mapping.emplace_back(ESM::Probe::sRecordId );
 
         assert( std::find(mapping.begin(), mapping.end(), type1) != mapping.end() );
         assert( std::find(mapping.begin(), mapping.end(), type2) != mapping.end() );
@@ -62,15 +62,15 @@ namespace
             float result = 0;
 
             // compare items by type
-            std::string leftName = left.mBase.getTypeName();
-            std::string rightName = right.mBase.getTypeName();
+            auto leftType = left.mBase.getType();
+            auto rightType = right.mBase.getType();
 
-            if (leftName != rightName)
-                return compareType(leftName, rightName);
+            if (leftType != rightType)
+                return compareType(leftType, rightType);
 
             // compare items by name
-            leftName = Misc::StringUtils::lowerCaseUtf8(left.mBase.getClass().getName(left.mBase));
-            rightName = Misc::StringUtils::lowerCaseUtf8(right.mBase.getClass().getName(right.mBase));
+            std::string leftName = Misc::StringUtils::lowerCaseUtf8(left.mBase.getClass().getName(left.mBase));
+            std::string rightName = Misc::StringUtils::lowerCaseUtf8(right.mBase.getClass().getName(right.mBase));
 
             result = leftName.compare(rightName);
             if (result != 0)
@@ -179,22 +179,22 @@ namespace MWGui
         MWWorld::Ptr base = item.mBase;
 
         int category = 0;
-        if (base.getTypeName() == typeid(ESM::Armor).name()
-                || base.getTypeName() == typeid(ESM::Clothing).name())
+        if (base.getType() == ESM::Armor::sRecordId
+                || base.getType() == ESM::Clothing::sRecordId)
             category = Category_Apparel;
-        else if (base.getTypeName() == typeid(ESM::Weapon).name())
+        else if (base.getType() == ESM::Weapon::sRecordId)
             category = Category_Weapon;
-        else if (base.getTypeName() == typeid(ESM::Ingredient).name()
-                     || base.getTypeName() == typeid(ESM::Potion).name())
+        else if (base.getType() == ESM::Ingredient::sRecordId
+                     || base.getType() == ESM::Potion::sRecordId)
             category = Category_Magic;
-        else if (base.getTypeName() == typeid(ESM::Miscellaneous).name()
-                 || base.getTypeName() == typeid(ESM::Ingredient).name()
-                 || base.getTypeName() == typeid(ESM::Repair).name()
-                 || base.getTypeName() == typeid(ESM::Lockpick).name()
-                 || base.getTypeName() == typeid(ESM::Light).name()
-                 || base.getTypeName() == typeid(ESM::Apparatus).name()
-                 || base.getTypeName() == typeid(ESM::Book).name()
-                 || base.getTypeName() == typeid(ESM::Probe).name())
+        else if (base.getType() == ESM::Miscellaneous::sRecordId
+                 || base.getType() == ESM::Ingredient::sRecordId
+                 || base.getType() == ESM::Repair::sRecordId
+                 || base.getType() == ESM::Lockpick::sRecordId
+                 || base.getType() == ESM::Light::sRecordId
+                 || base.getType() == ESM::Apparatus::sRecordId
+                 || base.getType() == ESM::Book::sRecordId
+                 || base.getType() == ESM::Probe::sRecordId)
             category = Category_Misc;
 
         if (item.mFlags & ItemStack::Flag_Enchanted)
@@ -205,7 +205,7 @@ namespace MWGui
 
         if (mFilter & Filter_OnlyIngredients)
         {
-            if (base.getTypeName() != typeid(ESM::Ingredient).name())
+            if (base.getType() != ESM::Ingredient::sRecordId)
                 return false;
 
             if (!mNameFilter.empty() && !mEffectFilter.empty())
@@ -238,18 +238,18 @@ namespace MWGui
 
         if ((mFilter & Filter_OnlyEnchanted) && !(item.mFlags & ItemStack::Flag_Enchanted))
             return false;
-        if ((mFilter & Filter_OnlyChargedSoulstones) && (base.getTypeName() != typeid(ESM::Miscellaneous).name()
+        if ((mFilter & Filter_OnlyChargedSoulstones) && (base.getType() != ESM::Miscellaneous::sRecordId
                                                      || base.getCellRef().getSoul() == "" || !MWBase::Environment::get().getWorld()->getStore().get<ESM::Creature>().search(base.getCellRef().getSoul())))
             return false;
-        if ((mFilter & Filter_OnlyRepairTools) && (base.getTypeName() != typeid(ESM::Repair).name()))
+        if ((mFilter & Filter_OnlyRepairTools) && (base.getType() != ESM::Repair::sRecordId))
             return false;
         if ((mFilter & Filter_OnlyEnchantable) && (item.mFlags & ItemStack::Flag_Enchanted
-                                               || (base.getTypeName() != typeid(ESM::Armor).name()
-                                                   && base.getTypeName() != typeid(ESM::Clothing).name()
-                                                   && base.getTypeName() != typeid(ESM::Weapon).name()
-                                                   && base.getTypeName() != typeid(ESM::Book).name())))
+                                               || (base.getType() != ESM::Armor::sRecordId
+                                                   && base.getType() != ESM::Clothing::sRecordId
+                                                   && base.getType() != ESM::Weapon::sRecordId
+                                                   && base.getType() != ESM::Book::sRecordId)))
             return false;
-        if ((mFilter & Filter_OnlyEnchantable) && base.getTypeName() == typeid(ESM::Book).name()
+        if ((mFilter & Filter_OnlyEnchantable) && base.getType() == ESM::Book::sRecordId
                 && !base.get<ESM::Book>()->mBase->mData.mIsScroll)
             return false;
 
@@ -263,8 +263,8 @@ namespace MWGui
         if ((mFilter & Filter_OnlyRepairable) && (
                     !base.getClass().hasItemHealth(base)
                     || (base.getClass().getItemHealth(base) == base.getClass().getItemMaxHealth(base))
-                    || (base.getTypeName() != typeid(ESM::Weapon).name()
-                        && base.getTypeName() != typeid(ESM::Armor).name())))
+                    || (base.getType() != ESM::Weapon::sRecordId
+                        && base.getType() != ESM::Armor::sRecordId)))
             return false;
 
         if (mFilter & Filter_OnlyRechargable)
diff --git a/apps/openmw/mwgui/travelwindow.cpp b/apps/openmw/mwgui/travelwindow.cpp
index 3fc0673735..a42028ee87 100644
--- a/apps/openmw/mwgui/travelwindow.cpp
+++ b/apps/openmw/mwgui/travelwindow.cpp
@@ -115,7 +115,7 @@ namespace MWGui
         std::vector<ESM::Transport::Dest> transport;
         if (mPtr.getClass().isNpc())
             transport = mPtr.get<ESM::NPC>()->mBase->getTransport();
-        else if (mPtr.getTypeName() == typeid(ESM::Creature).name())
+        else if (mPtr.getType() == ESM::Creature::sRecordId)
             transport = mPtr.get<ESM::Creature>()->mBase->getTransport();
 
         for(unsigned int i = 0;i<transport.size();i++)
diff --git a/apps/openmw/mwlua/object.cpp b/apps/openmw/mwlua/object.cpp
index d94ce1f49d..eb88ab69d0 100644
--- a/apps/openmw/mwlua/object.cpp
+++ b/apps/openmw/mwlua/object.cpp
@@ -23,7 +23,7 @@ namespace MWLua
         return std::to_string(id.mIndex) + "_" + std::to_string(id.mContentFile);
     }
 
-    const static std::map<std::type_index, std::string_view> classNames = {
+    const static std::map<std::type_index, std::string> classNames = {
         {typeid(MWClass::Activator), "Activator"},
         {typeid(MWClass::Armor), "Armor"},
         {typeid(MWClass::Book), "Book"},
@@ -40,7 +40,7 @@ namespace MWLua
         {typeid(MWClass::Weapon), "Weapon"},
     };
 
-    std::string_view getMWClassName(const std::type_index& cls_type, std::string_view fallback)
+    std::string getMWClassName(const std::type_index& cls_type, std::string fallback)
     {
         auto it = classNames.find(cls_type);
         if (it != classNames.end())
@@ -55,13 +55,13 @@ namespace MWLua
         return id == "prisonmarker" || id == "divinemarker" || id == "templemarker" || id == "northmarker";
     }
 
-    std::string_view getMWClassName(const MWWorld::Ptr& ptr)
+    std::string getMWClassName(const MWWorld::Ptr& ptr)
     {
         if (ptr.getCellRef().getRefIdRef() == "player")
             return "Player";
         if (isMarker(ptr))
             return "Marker";
-        return getMWClassName(typeid(ptr.getClass()), ptr.getTypeName());
+        return ptr.getTypeDescription();
     }
 
     std::string ptrToString(const MWWorld::Ptr& ptr)
diff --git a/apps/openmw/mwlua/object.hpp b/apps/openmw/mwlua/object.hpp
index c0b6bf1919..5cd8f399d7 100644
--- a/apps/openmw/mwlua/object.hpp
+++ b/apps/openmw/mwlua/object.hpp
@@ -19,8 +19,8 @@ namespace MWLua
     std::string idToString(const ObjectId& id);
     std::string ptrToString(const MWWorld::Ptr& ptr);
     bool isMarker(const MWWorld::Ptr& ptr);
-    std::string_view getMWClassName(const std::type_index& cls_type, std::string_view fallback = "Unknown");
-    std::string_view getMWClassName(const MWWorld::Ptr& ptr);
+    std::string getMWClassName(const std::type_index& cls_type, std::string fallback = "Unknown");
+    std::string getMWClassName(const MWWorld::Ptr& ptr);
 
     // Holds a mapping ObjectId -> MWWord::Ptr.
     class ObjectRegistry
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index bde18aa584..d85946dbd5 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -879,7 +879,7 @@ namespace MWMechanics
             MWWorld::ContainerStoreIterator torch = inventoryStore.end();
             for (MWWorld::ContainerStoreIterator it = inventoryStore.begin(); it != inventoryStore.end(); ++it)
             {
-                if (it->getTypeName() == typeid(ESM::Light).name() &&
+                if (it->getType() == ESM::Light::sRecordId &&
                     it->getClass().canBeEquipped(*it, ptr).first)
                 {
                     torch = it;
@@ -894,10 +894,10 @@ namespace MWMechanics
                     if (!ptr.getClass().getCreatureStats (ptr).getAiSequence().isInCombat())
                     {
                         // For non-hostile NPCs, unequip whatever is in the left slot in favor of a light.
-                        if (heldIter != inventoryStore.end() && heldIter->getTypeName() != typeid(ESM::Light).name())
+                        if (heldIter != inventoryStore.end() && heldIter->getType() != ESM::Light::sRecordId)
                             inventoryStore.unequipItem(*heldIter, ptr);
                     }
-                    else if (heldIter == inventoryStore.end() || heldIter->getTypeName() == typeid(ESM::Light).name())
+                    else if (heldIter == inventoryStore.end() || heldIter->getType() == ESM::Light::sRecordId)
                     {
                         // For hostile NPCs, see if they have anything better to equip first
                         auto shield = inventoryStore.getPreferredShield(ptr);
@@ -916,7 +916,7 @@ namespace MWMechanics
             }
             else
             {
-                if (heldIter != inventoryStore.end() && heldIter->getTypeName() == typeid(ESM::Light).name())
+                if (heldIter != inventoryStore.end() && heldIter->getType() == ESM::Light::sRecordId)
                 {
                     // At day, unequip lights and auto equip shields or other suitable items
                     // (Note: autoEquip will ignore lights)
@@ -1708,7 +1708,7 @@ namespace MWMechanics
                 MWBase::Environment::get().getDialogueManager()->say(iter->first, "hit");
 
                 // Apply soultrap
-                if (iter->first.getTypeName() == typeid(ESM::Creature).name())
+                if (iter->first.getType() == ESM::Creature::sRecordId)
                     soulTrap(iter->first);
 
                 // Magic effects will be reset later, and the magic effect that could kill the actor
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index ed26e2b9a4..58339d0228 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -383,7 +383,7 @@ void CharacterController::refreshJumpAnims(const std::string& weapShortGroup, Ju
 
 bool CharacterController::onOpen()
 {
-    if (mPtr.getTypeName() == typeid(ESM::Container).name())
+    if (mPtr.getType() == ESM::Container::sRecordId)
     {
         if (!mAnimation->hasAnimation("containeropen"))
             return true;
@@ -404,7 +404,7 @@ bool CharacterController::onOpen()
 
 void CharacterController::onClose()
 {
-    if (mPtr.getTypeName() == typeid(ESM::Container).name())
+    if (mPtr.getType() == ESM::Container::sRecordId)
     {
         if (!mAnimation->hasAnimation("containerclose"))
             return;
@@ -591,7 +591,7 @@ void CharacterController::refreshMovementAnims(const std::string& weapShortGroup
             // even if we are running. This must be replicated, otherwise the observed speed would differ drastically.
             std::string anim = mCurrentMovement;
             mAdjustMovementAnimSpeed = true;
-            if (mPtr.getClass().getTypeName() == typeid(ESM::Creature).name()
+            if (mPtr.getClass().getType() == ESM::Creature::sRecordId
                     && !(mPtr.get<ESM::Creature>()->mBase->mFlags & ESM::Creature::Flies))
             {
                 CharacterState walkState = runStateToWalkState(mMovementState);
@@ -1432,7 +1432,7 @@ bool CharacterController::updateWeaponState(CharacterState& idle)
     {
         MWWorld::InventoryStore &inv = cls.getInventoryStore(mPtr);
         MWWorld::ConstContainerStoreIterator weapon = getActiveWeapon(mPtr, &weaptype);
-        isWeapon = (weapon != inv.end() && weapon->getTypeName() == typeid(ESM::Weapon).name());
+        isWeapon = (weapon != inv.end() && weapon->getType() == ESM::Weapon::sRecordId);
         if (isWeapon)
         {
             weapSpeed = weapon->get<ESM::Weapon>()->mBase->mData.mSpeed;
@@ -1467,7 +1467,7 @@ bool CharacterController::updateWeaponState(CharacterState& idle)
             mAttackStrength = 0;
 
             // Randomize attacks for non-bipedal creatures with Weapon flag
-            if (mPtr.getClass().getTypeName() == typeid(ESM::Creature).name() &&
+            if (mPtr.getClass().getType() == ESM::Creature::sRecordId &&
                 !mPtr.getClass().isBipedal(mPtr) &&
                 (!mAnimation->hasAnimation(mCurrentWeapon) || isRandomAttackAnimation(mCurrentWeapon)))
             {
@@ -1590,9 +1590,9 @@ bool CharacterController::updateWeaponState(CharacterState& idle)
 
                 if(!target.isEmpty())
                 {
-                    if(item.getTypeName() == typeid(ESM::Lockpick).name())
+                    if(item.getType() == ESM::Lockpick::sRecordId)
                         Security(mPtr).pickLock(target, item, resultMessage, resultSound);
-                    else if(item.getTypeName() == typeid(ESM::Probe).name())
+                    else if(item.getType() == ESM::Probe::sRecordId)
                         Security(mPtr).probeTrap(target, item, resultMessage, resultSound);
                 }
                 mAnimation->play(mCurrentWeapon, priorityWeapon,
@@ -1867,7 +1867,7 @@ bool CharacterController::updateWeaponState(CharacterState& idle)
     {
         const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
         MWWorld::ConstContainerStoreIterator torch = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
-        if(torch != inv.end() && torch->getTypeName() == typeid(ESM::Light).name()
+        if(torch != inv.end() && torch->getType() == ESM::Light::sRecordId
                 && updateCarriedLeftVisible(mWeaponType))
         {
             if (mAnimation->isPlaying("shield"))
diff --git a/apps/openmw/mwmechanics/combat.cpp b/apps/openmw/mwmechanics/combat.cpp
index 9e5774ea9e..994b2b015a 100644
--- a/apps/openmw/mwmechanics/combat.cpp
+++ b/apps/openmw/mwmechanics/combat.cpp
@@ -71,7 +71,7 @@ namespace MWMechanics
 
         MWWorld::InventoryStore& inv = blocker.getClass().getInventoryStore(blocker);
         MWWorld::ContainerStoreIterator shield = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
-        if (shield == inv.end() || shield->getTypeName() != typeid(ESM::Armor).name())
+        if (shield == inv.end() || shield->getType() != ESM::Armor::sRecordId)
             return false;
 
         if (!blocker.getRefData().getBaseNode())
diff --git a/apps/openmw/mwmechanics/enchanting.cpp b/apps/openmw/mwmechanics/enchanting.cpp
index 1717ba06fe..0410dd02dd 100644
--- a/apps/openmw/mwmechanics/enchanting.cpp
+++ b/apps/openmw/mwmechanics/enchanting.cpp
@@ -29,11 +29,11 @@ namespace MWMechanics
     {
         mOldItemPtr=oldItem;
         mWeaponType = -1;
-        mObjectType.clear();
+        mObjectType = 0;
         if(!itemEmpty())
         {
-            mObjectType = mOldItemPtr.getTypeName();
-            if (mObjectType == typeid(ESM::Weapon).name())
+            mObjectType = mOldItemPtr.getType();
+            if (mObjectType == ESM::Weapon::sRecordId)
                 mWeaponType = mOldItemPtr.get<ESM::Weapon>()->mBase->mData.mType;
         }
     }
@@ -115,7 +115,7 @@ namespace MWMechanics
 
         const bool powerfulSoul = getGemCharge() >= \
                 MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find ("iSoulAmountForConstantEffect")->mValue.getInteger();
-        if ((mObjectType == typeid(ESM::Armor).name()) || (mObjectType == typeid(ESM::Clothing).name()))
+        if ((mObjectType == ESM::Armor::sRecordId) || (mObjectType == ESM::Clothing::sRecordId))
         { // Armor or Clothing
             switch(mCastStyle)
             {
@@ -150,7 +150,7 @@ namespace MWMechanics
                     return;
             }
         }
-        else if(mObjectType == typeid(ESM::Book).name())
+        else if(mObjectType == ESM::Book::sRecordId)
         { // Scroll or Book
             mCastStyle = ESM::Enchantment::CastOnce;
             return;
diff --git a/apps/openmw/mwmechanics/enchanting.hpp b/apps/openmw/mwmechanics/enchanting.hpp
index 33a2820938..256c5dad48 100644
--- a/apps/openmw/mwmechanics/enchanting.hpp
+++ b/apps/openmw/mwmechanics/enchanting.hpp
@@ -23,7 +23,7 @@ namespace MWMechanics
             ESM::EffectList mEffectList;
 
             std::string mNewItemName;
-            std::string mObjectType;
+            unsigned int mObjectType;
             int mWeaponType;
 
             const ESM::Enchantment* getRecord(const ESM::Enchantment& newEnchantment) const;
diff --git a/apps/openmw/mwmechanics/levelledlist.hpp b/apps/openmw/mwmechanics/levelledlist.hpp
index c8368101a7..25064123ce 100644
--- a/apps/openmw/mwmechanics/levelledlist.hpp
+++ b/apps/openmw/mwmechanics/levelledlist.hpp
@@ -66,14 +66,14 @@ namespace MWMechanics
 
         // Is this another levelled item or a real item?
         MWWorld::ManualRef ref (MWBase::Environment::get().getWorld()->getStore(), item, 1);
-        if (ref.getPtr().getTypeName() != typeid(ESM::ItemLevList).name()
-                && ref.getPtr().getTypeName() != typeid(ESM::CreatureLevList).name())
+        if (ref.getPtr().getType() != ESM::ItemLevList::sRecordId
+                && ref.getPtr().getType() != ESM::CreatureLevList::sRecordId)
         {
             return item;
         }
         else
         {
-            if (ref.getPtr().getTypeName() == typeid(ESM::ItemLevList).name())
+            if (ref.getPtr().getType() == ESM::ItemLevList::sRecordId)
                 return getLevelledItem(ref.getPtr().get<ESM::ItemLevList>()->mBase, false, seed);
             else
                 return getLevelledItem(ref.getPtr().get<ESM::CreatureLevList>()->mBase, true, seed);
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 5245e09f36..149056e605 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -555,7 +555,7 @@ namespace MWMechanics
     {
         // Make sure zero base price items/services can't be bought/sold for 1 gold
         // and return the intended base price for creature merchants
-        if (basePrice == 0 || ptr.getTypeName() == typeid(ESM::Creature).name())
+        if (basePrice == 0 || ptr.getType() == ESM::Creature::sRecordId)
             return basePrice;
 
         const MWMechanics::NpcStats &sellerStats = ptr.getClass().getNpcStats(ptr);
diff --git a/apps/openmw/mwmechanics/objects.cpp b/apps/openmw/mwmechanics/objects.cpp
index eea0655dd8..9125eb527b 100644
--- a/apps/openmw/mwmechanics/objects.cpp
+++ b/apps/openmw/mwmechanics/objects.cpp
@@ -84,7 +84,7 @@ void Objects::update(float duration, bool paused)
 
         for(auto& object : mObjects)
         {
-            if (object.first.getTypeName() != typeid(ESM::Container).name())
+            if (object.first.getType() != ESM::Container::sRecordId)
                 continue;
 
             if (object.second->isAnimPlaying("containeropen"))
diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index 53fbe69ab3..adbaa30c15 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -274,7 +274,7 @@ namespace MWMechanics
 
         bool godmode = mCaster == MWMechanics::getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState();
         bool isProjectile = false;
-        if (item.getTypeName() == typeid(ESM::Weapon).name())
+        if (item.getType() == ESM::Weapon::sRecordId)
         {
             int type = item.get<ESM::Weapon>()->mBase->mData.mType;
             ESM::WeaponType::Class weapclass = MWMechanics::getWeaponType(type)->mWeaponClass;
diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp
index d9e72ee43b..bc84a1df5e 100644
--- a/apps/openmw/mwmechanics/spelleffects.cpp
+++ b/apps/openmw/mwmechanics/spelleffects.cpp
@@ -213,8 +213,8 @@ namespace
             if (!wasEquipped)
                 return;
 
-            std::string type = currentItem->getTypeName();
-            if (type != typeid(ESM::Weapon).name() && type != typeid(ESM::Armor).name() && type != typeid(ESM::Clothing).name())
+            auto type = currentItem->getType();
+            if (type != ESM::Weapon::sRecordId && type != ESM::Armor::sRecordId && type != ESM::Clothing::sRecordId)
                 return;
 
             if (actor.getClass().getCreatureStats(actor).isDead())
@@ -1038,4 +1038,4 @@ void onMagicEffectRemoved(const MWWorld::Ptr& target, ActiveSpells::ActiveSpellP
         anim->removeEffect(effect.mEffectId);
 }
 
-}
\ No newline at end of file
+}
diff --git a/apps/openmw/mwmechanics/spellpriority.cpp b/apps/openmw/mwmechanics/spellpriority.cpp
index 974d297f10..eb276deb78 100644
--- a/apps/openmw/mwmechanics/spellpriority.cpp
+++ b/apps/openmw/mwmechanics/spellpriority.cpp
@@ -96,7 +96,7 @@ namespace MWMechanics
 
     float ratePotion (const MWWorld::Ptr &item, const MWWorld::Ptr& actor)
     {
-        if (item.getTypeName() != typeid(ESM::Potion).name())
+        if (item.getType() != ESM::Potion::sRecordId)
             return 0.f;
 
         const ESM::Potion* potion = item.get<ESM::Potion>()->mBase;
diff --git a/apps/openmw/mwmechanics/spellutil.cpp b/apps/openmw/mwmechanics/spellutil.cpp
index 18a1c0004e..b18ad288ad 100644
--- a/apps/openmw/mwmechanics/spellutil.cpp
+++ b/apps/openmw/mwmechanics/spellutil.cpp
@@ -214,7 +214,7 @@ namespace MWMechanics
             case ESM::MagicEffect::Soultrap:
             {
                 if (!target.getClass().isNpc() // no messagebox for NPCs
-                     && (target.getTypeName() == typeid(ESM::Creature).name() && target.get<ESM::Creature>()->mBase->mData.mSoul == 0))
+                     && (target.getType() == ESM::Creature::sRecordId && target.get<ESM::Creature>()->mBase->mData.mSoul == 0))
                 {
                     if (castByPlayer)
                         MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicInvalidTarget}");
diff --git a/apps/openmw/mwmechanics/trading.cpp b/apps/openmw/mwmechanics/trading.cpp
index b824d7c450..750fd803d4 100644
--- a/apps/openmw/mwmechanics/trading.cpp
+++ b/apps/openmw/mwmechanics/trading.cpp
@@ -23,7 +23,7 @@ namespace MWMechanics
         }
 
         // reject if npc is a creature
-        if ( merchant.getTypeName() != typeid(ESM::NPC).name() ) {
+        if ( merchant.getType() != ESM::NPC::sRecordId ) {
             return false;
         }
 
diff --git a/apps/openmw/mwmechanics/weaponpriority.cpp b/apps/openmw/mwmechanics/weaponpriority.cpp
index 8480dc208e..570e89a17d 100644
--- a/apps/openmw/mwmechanics/weaponpriority.cpp
+++ b/apps/openmw/mwmechanics/weaponpriority.cpp
@@ -20,7 +20,7 @@ namespace MWMechanics
     float rateWeapon (const MWWorld::Ptr &item, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy, int type,
                       float arrowRating, float boltRating)
     {
-        if (enemy.isEmpty() || item.getTypeName() != typeid(ESM::Weapon).name())
+        if (enemy.isEmpty() || item.getType() != ESM::Weapon::sRecordId)
             return 0.f;
 
         if (item.getClass().hasItemHealth(item) && item.getClass().getItemHealth(item) == 0)
diff --git a/apps/openmw/mwmechanics/weapontype.cpp b/apps/openmw/mwmechanics/weapontype.cpp
index feecd468ad..30f554f80b 100644
--- a/apps/openmw/mwmechanics/weapontype.cpp
+++ b/apps/openmw/mwmechanics/weapontype.cpp
@@ -21,13 +21,13 @@ namespace MWMechanics
                 *weaptype = ESM::Weapon::HandToHand;
             else
             {
-                const std::string &type = weapon->getTypeName();
-                if(type == typeid(ESM::Weapon).name())
+                auto type = weapon->getType();
+                if(type == ESM::Weapon::sRecordId)
                 {
                     const MWWorld::LiveCellRef<ESM::Weapon> *ref = weapon->get<ESM::Weapon>();
                     *weaptype = ref->mBase->mData.mType;
                 }
-                else if (type == typeid(ESM::Lockpick).name() || type == typeid(ESM::Probe).name())
+                else if (type == ESM::Lockpick::sRecordId || type == ESM::Probe::sRecordId)
                     *weaptype = ESM::Weapon::PickProbe;
             }
 
diff --git a/apps/openmw/mwrender/actoranimation.cpp b/apps/openmw/mwrender/actoranimation.cpp
index f556e6891a..b346d4ac6c 100644
--- a/apps/openmw/mwrender/actoranimation.cpp
+++ b/apps/openmw/mwrender/actoranimation.cpp
@@ -143,21 +143,21 @@ bool ActorAnimation::updateCarriedLeftVisible(const int weaptype) const
                 const MWWorld::InventoryStore& inv = cls.getInventoryStore(mPtr);
                 const MWWorld::ConstContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
                 const MWWorld::ConstContainerStoreIterator shield = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
-                if (shield != inv.end() && shield->getTypeName() == typeid(ESM::Armor).name() && !getShieldMesh(*shield).empty())
+                if (shield != inv.end() && shield->getType() == ESM::Armor::sRecordId && !getShieldMesh(*shield).empty())
                 {
                     if(stats.getDrawState() != MWMechanics::DrawState_Weapon)
                         return false;
 
                     if (weapon != inv.end())
                     {
-                        const std::string &type = weapon->getTypeName();
-                        if(type == typeid(ESM::Weapon).name())
+                        auto type = weapon->getType();
+                        if(type == ESM::Weapon::sRecordId)
                         {
                             const MWWorld::LiveCellRef<ESM::Weapon> *ref = weapon->get<ESM::Weapon>();
                             ESM::Weapon::Type weaponType = (ESM::Weapon::Type)ref->mBase->mData.mType;
                             return !(MWMechanics::getWeaponType(weaponType)->mFlags & ESM::WeaponType::TwoHanded);
                         }
-                        else if (type == typeid(ESM::Lockpick).name() || type == typeid(ESM::Probe).name())
+                        else if (type == ESM::Lockpick::sRecordId || type == ESM::Probe::sRecordId)
                             return true;
                     }
                 }
@@ -184,7 +184,7 @@ void ActorAnimation::updateHolsteredShield(bool showCarriedLeft)
 
     const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
     MWWorld::ConstContainerStoreIterator shield = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
-    if (shield == inv.end() || shield->getTypeName() != typeid(ESM::Armor).name())
+    if (shield == inv.end() || shield->getType() != ESM::Armor::sRecordId)
         return;
 
     // Can not show holdstered shields with two-handed weapons at all
@@ -192,8 +192,8 @@ void ActorAnimation::updateHolsteredShield(bool showCarriedLeft)
     if(weapon == inv.end())
         return;
 
-    const std::string &type = weapon->getTypeName();
-    if(type == typeid(ESM::Weapon).name())
+    auto type = weapon->getType();
+    if(type == ESM::Weapon::sRecordId)
     {
         const MWWorld::LiveCellRef<ESM::Weapon> *ref = weapon->get<ESM::Weapon>();
         ESM::Weapon::Type weaponType = (ESM::Weapon::Type)ref->mBase->mData.mType;
@@ -254,17 +254,17 @@ bool ActorAnimation::useShieldAnimations() const
     const MWWorld::ConstContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
     const MWWorld::ConstContainerStoreIterator shield = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
     if (weapon != inv.end() && shield != inv.end() &&
-        shield->getTypeName() == typeid(ESM::Armor).name() &&
+        shield->getType() == ESM::Armor::sRecordId &&
         !getShieldMesh(*shield).empty())
     {
-        const std::string &type = weapon->getTypeName();
-        if(type == typeid(ESM::Weapon).name())
+        auto type = weapon->getType();
+        if(type == ESM::Weapon::sRecordId)
         {
             const MWWorld::LiveCellRef<ESM::Weapon> *ref = weapon->get<ESM::Weapon>();
             ESM::Weapon::Type weaponType = (ESM::Weapon::Type)ref->mBase->mData.mType;
             return !(MWMechanics::getWeaponType(weaponType)->mFlags & ESM::WeaponType::TwoHanded);
         }
-        else if (type == typeid(ESM::Lockpick).name() || type == typeid(ESM::Probe).name())
+        else if (type == ESM::Lockpick::sRecordId || type == ESM::Probe::sRecordId)
             return true;
     }
 
@@ -288,8 +288,8 @@ std::string ActorAnimation::getHolsteredWeaponBoneName(const MWWorld::ConstPtr&
     if(weapon.isEmpty())
         return boneName;
 
-    const std::string &type = weapon.getClass().getTypeName();
-    if(type == typeid(ESM::Weapon).name())
+    auto type = weapon.getClass().getType();
+    if(type == ESM::Weapon::sRecordId)
     {
         const MWWorld::LiveCellRef<ESM::Weapon> *ref = weapon.get<ESM::Weapon>();
         int weaponType = ref->mBase->mData.mType;
@@ -323,7 +323,7 @@ void ActorAnimation::updateHolsteredWeapon(bool showHolsteredWeapons)
 
     const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
     MWWorld::ConstContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
-    if (weapon == inv.end() || weapon->getTypeName() != typeid(ESM::Weapon).name())
+    if (weapon == inv.end() || weapon->getType() != ESM::Weapon::sRecordId)
         return;
 
     // Since throwing weapons stack themselves, do not show such weapon itself
@@ -399,7 +399,7 @@ void ActorAnimation::updateQuiver()
 
     const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
     MWWorld::ConstContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
-    if(weapon == inv.end() || weapon->getTypeName() != typeid(ESM::Weapon).name())
+    if(weapon == inv.end() || weapon->getType() != ESM::Weapon::sRecordId)
         return;
 
     std::string mesh = weapon->getClass().getModel(*weapon);
@@ -471,7 +471,7 @@ void ActorAnimation::updateQuiver()
 
 void ActorAnimation::itemAdded(const MWWorld::ConstPtr& item, int /*count*/)
 {
-    if (item.getTypeName() == typeid(ESM::Light).name())
+    if (item.getType() == ESM::Light::sRecordId)
     {
         const ESM::Light* light = item.get<ESM::Light>()->mBase;
         if (!(light->mData.mFlags & ESM::Light::Carry))
@@ -486,7 +486,7 @@ void ActorAnimation::itemAdded(const MWWorld::ConstPtr& item, int /*count*/)
     // If the count of equipped ammo or throwing weapon was changed, we should update quiver
     const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
     MWWorld::ConstContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
-    if(weapon == inv.end() || weapon->getTypeName() != typeid(ESM::Weapon).name())
+    if(weapon == inv.end() || weapon->getType() != ESM::Weapon::sRecordId)
         return;
 
     MWWorld::ConstContainerStoreIterator ammo = inv.end();
@@ -502,7 +502,7 @@ void ActorAnimation::itemAdded(const MWWorld::ConstPtr& item, int /*count*/)
 
 void ActorAnimation::itemRemoved(const MWWorld::ConstPtr& item, int /*count*/)
 {
-    if (item.getTypeName() == typeid(ESM::Light).name())
+    if (item.getType() == ESM::Light::sRecordId)
     {
         ItemLightMap::iterator iter = mItemLights.find(item);
         if (iter != mItemLights.end())
@@ -520,7 +520,7 @@ void ActorAnimation::itemRemoved(const MWWorld::ConstPtr& item, int /*count*/)
     // If the count of equipped ammo or throwing weapon was changed, we should update quiver
     const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
     MWWorld::ConstContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
-    if(weapon == inv.end() || weapon->getTypeName() != typeid(ESM::Weapon).name())
+    if(weapon == inv.end() || weapon->getType() != ESM::Weapon::sRecordId)
         return;
 
     MWWorld::ConstContainerStoreIterator ammo = inv.end();
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 475c656cc9..10624c8bca 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -1794,7 +1794,7 @@ namespace MWRender
             if (!ptr.getClass().getEnchantment(ptr).empty())
                 mGlowUpdater = SceneUtil::addEnchantedGlow(mObjectRoot, mResourceSystem, ptr.getClass().getEnchantmentColor(ptr));
         }
-        if (ptr.getTypeName() == typeid(ESM::Light).name() && allowLight)
+        if (ptr.getType() == ESM::Light::sRecordId && allowLight)
             addExtraLight(getOrCreateObjectRoot(), ptr.get<ESM::Light>()->mBase);
 
         if (!allowLight && mObjectRoot)
@@ -1823,7 +1823,7 @@ namespace MWRender
 
     bool ObjectAnimation::canBeHarvested() const
     {
-        if (mPtr.getTypeName() != typeid(ESM::Container).name())
+        if (mPtr.getType() != ESM::Container::sRecordId)
             return false;
 
         const MWWorld::LiveCellRef<ESM::Container>* ref = mPtr.get<ESM::Container>();
diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index a9733cddf8..4a84bf4f23 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -395,7 +395,7 @@ namespace MWRender
         if(iter != inv.end())
         {
             groupname = "inventoryweapononehand";
-            if(iter->getTypeName() == typeid(ESM::Weapon).name())
+            if(iter->getType() == ESM::Weapon::sRecordId)
             {
                 MWWorld::LiveCellRef<ESM::Weapon> *ref = iter->get<ESM::Weapon>();
                 int type = ref->mBase->mData.mType;
@@ -428,7 +428,7 @@ namespace MWRender
         mAnimation->play(mCurrentAnimGroup, 1, Animation::BlendMask_All, false, 1.0f, "start", "stop", 0.0f, 0);
 
         MWWorld::ConstContainerStoreIterator torch = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
-        if(torch != inv.end() && torch->getTypeName() == typeid(ESM::Light).name() && showCarriedLeft)
+        if(torch != inv.end() && torch->getType() == ESM::Light::sRecordId && showCarriedLeft)
         {
             if(!mAnimation->getInfo("torch"))
                 mAnimation->play("torch", 2, Animation::BlendMask_LeftArm, false,
diff --git a/apps/openmw/mwrender/creatureanimation.cpp b/apps/openmw/mwrender/creatureanimation.cpp
index f1d28b0634..502340d4b9 100644
--- a/apps/openmw/mwrender/creatureanimation.cpp
+++ b/apps/openmw/mwrender/creatureanimation.cpp
@@ -119,7 +119,7 @@ void CreatureWeaponAnimation::updatePart(PartHolderPtr& scene, int slot)
     std::string itemModel = item.getClass().getModel(item);
     if (slot == MWWorld::InventoryStore::Slot_CarriedRight)
     {
-        if(item.getTypeName() == typeid(ESM::Weapon).name())
+        if(item.getType() == ESM::Weapon::sRecordId)
         {
             int type = item.get<ESM::Weapon>()->mBase->mData.mType;
             bonename = MWMechanics::getWeaponType(type)->mAttachBone;
@@ -137,7 +137,7 @@ void CreatureWeaponAnimation::updatePart(PartHolderPtr& scene, int slot)
     else
     {
         bonename = "Shield Bone";
-        if (item.getTypeName() == typeid(ESM::Armor).name())
+        if (item.getType() == ESM::Armor::sRecordId)
         {
             // Shield body part model should be used if possible.
             const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
@@ -174,7 +174,7 @@ void CreatureWeaponAnimation::updatePart(PartHolderPtr& scene, int slot)
         // Crossbows start out with a bolt attached
         // FIXME: code duplicated from NpcAnimation
         if (slot == MWWorld::InventoryStore::Slot_CarriedRight &&
-                item.getTypeName() == typeid(ESM::Weapon).name() &&
+                item.getType() == ESM::Weapon::sRecordId &&
                 item.get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::MarksmanCrossbow)
         {
             const ESM::WeaponType* weaponInfo = MWMechanics::getWeaponType(ESM::Weapon::MarksmanCrossbow);
@@ -246,7 +246,7 @@ osg::Group *CreatureWeaponAnimation::getArrowBone()
 
     const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
     MWWorld::ConstContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
-    if(weapon == inv.end() || weapon->getTypeName() != typeid(ESM::Weapon).name())
+    if(weapon == inv.end() || weapon->getType() != ESM::Weapon::sRecordId)
         return nullptr;
 
     int type = weapon->get<ESM::Weapon>()->mBase->mData.mType;
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 7c6d82d83d..28987064f3 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -594,13 +594,13 @@ void NpcAnimation::updateParts()
         int prio = 1;
         bool enchantedGlow = !store->getClass().getEnchantment(*store).empty();
         osg::Vec4f glowColor = store->getClass().getEnchantmentColor(*store);
-        if(store->getTypeName() == typeid(ESM::Clothing).name())
+        if(store->getType() == ESM::Clothing::sRecordId)
         {
             prio = ((slotlist[i].mBasePriority+1)<<1) + 0;
             const ESM::Clothing *clothes = store->get<ESM::Clothing>()->mBase;
             addPartGroup(slotlist[i].mSlot, prio, clothes->mParts.mParts, enchantedGlow, &glowColor);
         }
-        else if(store->getTypeName() == typeid(ESM::Armor).name())
+        else if(store->getType() == ESM::Armor::sRecordId)
         {
             prio = ((slotlist[i].mBasePriority+1)<<1) + 1;
             const ESM::Armor *armor = store->get<ESM::Armor>()->mBase;
@@ -640,7 +640,7 @@ void NpcAnimation::updateParts()
     {
         MWWorld::ConstContainerStoreIterator store = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
         MWWorld::ConstPtr part;
-        if(store != inv.end() && (part=*store).getTypeName() == typeid(ESM::Light).name())
+        if(store != inv.end() && (part=*store).getType() == ESM::Light::sRecordId)
         {
             const ESM::Light *light = part.get<ESM::Light>()->mBase;
             addOrReplaceIndividualPart(ESM::PRT_Shield, MWWorld::InventoryStore::Slot_CarriedLeft,
@@ -771,7 +771,7 @@ bool NpcAnimation::addOrReplaceIndividualPart(ESM::PartReferenceType type, int g
         {
             const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
             MWWorld::ConstContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
-            if(weapon != inv.end() && weapon->getTypeName() == typeid(ESM::Weapon).name())
+            if(weapon != inv.end() && weapon->getType() == ESM::Weapon::sRecordId)
             {
                 int weaponType = weapon->get<ESM::Weapon>()->mBase->mData.mType;
                 const std::string weaponBonename = MWMechanics::getWeaponType(weaponType)->mAttachBone;
@@ -943,7 +943,7 @@ void NpcAnimation::showWeapons(bool showWeapon)
                                        mesh, !weapon->getClass().getEnchantment(*weapon).empty(), &glowColor);
 
             // Crossbows start out with a bolt attached
-            if (weapon->getTypeName() == typeid(ESM::Weapon).name() &&
+            if (weapon->getType() == ESM::Weapon::sRecordId &&
                     weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::MarksmanCrossbow)
             {
                 int ammotype = MWMechanics::getWeaponType(ESM::Weapon::MarksmanCrossbow)->mAmmoType;
@@ -975,7 +975,7 @@ void NpcAnimation::showCarriedLeft(bool show)
         osg::Vec4f glowColor = iter->getClass().getEnchantmentColor(*iter);
         std::string mesh = iter->getClass().getModel(*iter);
         // For shields we must try to use the body part model
-        if (iter->getTypeName() == typeid(ESM::Armor).name())
+        if (iter->getType() == ESM::Armor::sRecordId)
         {
             const ESM::Armor *armor = iter->get<ESM::Armor>()->mBase;
             const std::vector<ESM::PartReference>& bodyparts = armor->mParts.mParts;
@@ -987,7 +987,7 @@ void NpcAnimation::showCarriedLeft(bool show)
         {
             if (mesh.empty())
                 reserveIndividualPart(ESM::PRT_Shield, MWWorld::InventoryStore::Slot_CarriedLeft, 1);
-            if (iter->getTypeName() == typeid(ESM::Light).name() && mObjectParts[ESM::PRT_Shield])
+            if (iter->getType() == ESM::Light::sRecordId && mObjectParts[ESM::PRT_Shield])
                 addExtraLight(mObjectParts[ESM::PRT_Shield]->getNode()->asGroup(), iter->get<ESM::Light>()->mBase);
         }
     }
@@ -1033,7 +1033,7 @@ osg::Group* NpcAnimation::getArrowBone()
 
     const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
     MWWorld::ConstContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
-    if(weapon == inv.end() || weapon->getTypeName() != typeid(ESM::Weapon).name())
+    if(weapon == inv.end() || weapon->getType() != ESM::Weapon::sRecordId)
         return nullptr;
 
     int type = weapon->get<ESM::Weapon>()->mBase->mData.mType;
diff --git a/apps/openmw/mwrender/weaponanimation.cpp b/apps/openmw/mwrender/weaponanimation.cpp
index b89cfd8df1..3db415126b 100644
--- a/apps/openmw/mwrender/weaponanimation.cpp
+++ b/apps/openmw/mwrender/weaponanimation.cpp
@@ -66,7 +66,7 @@ void WeaponAnimation::attachArrow(const MWWorld::Ptr& actor)
     MWWorld::ConstContainerStoreIterator weaponSlot = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
     if (weaponSlot == inv.end())
         return;
-    if (weaponSlot->getTypeName() != typeid(ESM::Weapon).name())
+    if (weaponSlot->getType() != ESM::Weapon::sRecordId)
         return;
 
     int type = weaponSlot->get<ESM::Weapon>()->mBase->mData.mType;
@@ -109,7 +109,7 @@ void WeaponAnimation::releaseArrow(MWWorld::Ptr actor, float attackStrength)
     MWWorld::ContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
     if (weapon == inv.end())
         return;
-    if (weapon->getTypeName() != typeid(ESM::Weapon).name())
+    if (weapon->getType() != ESM::Weapon::sRecordId)
         return;
 
     // The orientation of the launched projectile. Always the same as the actor orientation, even if the ArrowBone's orientation dictates otherwise.
diff --git a/apps/openmw/mwscript/containerextensions.cpp b/apps/openmw/mwscript/containerextensions.cpp
index 7eeb3bfaba..501404e958 100644
--- a/apps/openmw/mwscript/containerextensions.cpp
+++ b/apps/openmw/mwscript/containerextensions.cpp
@@ -50,7 +50,7 @@ namespace
 
     void addRandomToStore(const MWWorld::Ptr& itemPtr, int count, MWWorld::Ptr& owner, MWWorld::ContainerStore& store, bool topLevel = true)
     {
-        if(itemPtr.getTypeName() == typeid(ESM::ItemLevList).name())
+        if(itemPtr.getType() == ESM::ItemLevList::sRecordId)
         {
             const ESM::ItemLevList* levItemList = itemPtr.get<ESM::ItemLevList>()->mBase;
 
@@ -108,7 +108,7 @@ namespace MWScript
                     // Check if "item" can be placed in a container
                     MWWorld::ManualRef manualRef(MWBase::Environment::get().getWorld()->getStore(), item, 1);
                     MWWorld::Ptr itemPtr = manualRef.getPtr();
-                    bool isLevelledList = itemPtr.getClass().getTypeName() == typeid(ESM::ItemLevList).name();
+                    bool isLevelledList = itemPtr.getClass().getType() == ESM::ItemLevList::sRecordId;
                     if(!isLevelledList)
                         MWWorld::ContainerStore::getType(itemPtr);
 
@@ -120,7 +120,7 @@ namespace MWScript
                     }
 
                     // Calls to unresolved containers affect the base record
-                    if(ptr.getClass().getTypeName() == typeid(ESM::Container).name() && (!ptr.getRefData().getCustomData() ||
+                    if(ptr.getClass().getType() == ESM::Container::sRecordId && (!ptr.getRefData().getCustomData() ||
                     !ptr.getClass().getContainerStore(ptr).isResolved()))
                     {
                         ptr.getClass().modifyBaseInventory(ptr.getCellRef().getRefId(), item, count);
@@ -232,7 +232,7 @@ namespace MWScript
                         return;
                     }
                     // Calls to unresolved containers affect the base record instead
-                    else if(ptr.getClass().getTypeName() == typeid(ESM::Container).name() &&
+                    else if(ptr.getClass().getType() == ESM::Container::sRecordId &&
                         (!ptr.getRefData().getCustomData() || !ptr.getClass().getContainerStore(ptr).isResolved()))
                     {
                         ptr.getClass().modifyBaseInventory(ptr.getCellRef().getRefId(), item, -count);
@@ -380,7 +380,7 @@ namespace MWScript
                     const MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore (ptr);
                     MWWorld::ConstContainerStoreIterator it = invStore.getSlot (slot);
                     
-                    if (it == invStore.end() || it->getTypeName () != typeid(ESM::Armor).name())
+                    if (it == invStore.end() || it->getType () != ESM::Armor::sRecordId)
                     {
                         runtime.push(-1);
                         return;
@@ -464,13 +464,13 @@ namespace MWScript
                         runtime.push(-1);
                         return;
                     }
-                    else if (it->getTypeName() != typeid(ESM::Weapon).name())
+                    else if (it->getType() != ESM::Weapon::sRecordId)
                     {
-                        if (it->getTypeName() == typeid(ESM::Lockpick).name())
+                        if (it->getType() == ESM::Lockpick::sRecordId)
                         {
                             runtime.push(-2);
                         }
-                        else if (it->getTypeName() == typeid(ESM::Probe).name())
+                        else if (it->getType() == ESM::Probe::sRecordId)
                         {
                             runtime.push(-3);
                         }
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index 3642f68dc2..5d9f037357 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -310,7 +310,7 @@ namespace MWScript
 
                     // Instantly reset door to closed state
                     // This is done when using Lock in scripts, but not when using Lock spells.
-                    if (ptr.getTypeName() == typeid(ESM::Door).name() && !ptr.getCellRef().getTeleport())
+                    if (ptr.getType() == ESM::Door::sRecordId && !ptr.getCellRef().getTeleport())
                     {
                         MWBase::Environment::get().getWorld()->activateDoor(ptr, MWWorld::DoorState::Idle);
                     }
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index da4dd9d99e..24cd09ad37 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -23,7 +23,7 @@
 
 namespace MWWorld
 {
-    std::map<std::string, std::shared_ptr<Class> > Class::sClasses;
+    std::map<unsigned int, std::shared_ptr<Class> > Class::sClasses;
 
     void Class::insertObjectRendering (const Ptr& ptr, const std::string& mesh, MWRender::RenderingInterface& renderingInterface) const
     {
@@ -228,15 +228,12 @@ namespace MWWorld
         throw std::runtime_error("Class does not support armor rating");
     }
 
-    const Class& Class::get (const std::string& key)
+    const Class& Class::get (unsigned int key)
     {
-        if (key.empty())
-            throw std::logic_error ("Class::get(): attempting to get an empty key");
-
-        std::map<std::string, std::shared_ptr<Class> >::const_iterator iter = sClasses.find (key);
+        auto iter = sClasses.find (key);
 
         if (iter==sClasses.end())
-            throw std::logic_error ("Class::get(): unknown class key: " + key);
+            throw std::logic_error ("Class::get(): unknown class key: " + std::to_string(key));
 
         return *iter->second;
     }
@@ -246,9 +243,9 @@ namespace MWWorld
         throw std::runtime_error ("class does not support persistence");
     }
 
-    void Class::registerClass(const std::string& key,  std::shared_ptr<Class> instance)
+    void Class::registerClass(unsigned int key, std::shared_ptr<Class> instance)
     {
-        instance->mTypeName = key;
+        instance->mType = key;
         sClasses.insert(std::make_pair(key, instance));
     }
 
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index 8e451ea580..64ac873960 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -54,9 +54,8 @@ namespace MWWorld
     /// \brief Base class for referenceable esm records
     class Class
     {
-            static std::map<std::string, std::shared_ptr<Class> > sClasses;
-
-            std::string mTypeName;
+            static std::map<unsigned int, std::shared_ptr<Class> > sClasses;
+            unsigned int mType;
 
         protected:
 
@@ -73,8 +72,8 @@ namespace MWWorld
             Class (const Class&) = delete;
             Class& operator= (const Class&) = delete;
 
-            const std::string& getTypeName() const {
-                return mTypeName;
+            unsigned int getType() const {
+                return mType;
             }
 
             virtual void insertObjectRendering (const Ptr& ptr, const std::string& mesh, MWRender::RenderingInterface& renderingInterface) const;
@@ -338,10 +337,10 @@ namespace MWWorld
                 const;
             ///< Write additional state from \a ptr into \a state.
 
-            static const Class& get (const std::string& key);
+            static const Class& get (unsigned int key);
             ///< If there is no class for this \a key, an exception is thrown.
 
-            static void registerClass (const std::string& key,  std::shared_ptr<Class> instance);
+            static void registerClass (unsigned int key,  std::shared_ptr<Class> instance);
 
             virtual int getBaseGold(const MWWorld::ConstPtr& ptr) const;
 
diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index b02c2bb407..58f215932e 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -1,7 +1,6 @@
 #include "containerstore.hpp"
 
 #include <cassert>
-#include <typeinfo>
 #include <stdexcept>
 
 #include <components/debug/debuglog.hpp>
@@ -567,7 +566,7 @@ void MWWorld::ContainerStore::addInitialItem (const std::string& id, const std::
 void MWWorld::ContainerStore::addInitialItemImp(const MWWorld::Ptr& ptr, const std::string& owner, int count,
                                                Misc::Rng::Seed* seed, bool topLevel)
 {
-    if (ptr.getTypeName()==typeid (ESM::ItemLevList).name())
+    if (ptr.getType()==ESM::ItemLevList::sRecordId)
     {
         if(!seed)
             return;
@@ -693,44 +692,44 @@ int MWWorld::ContainerStore::getType (const ConstPtr& ptr)
     if (ptr.isEmpty())
         throw std::runtime_error ("can't put a non-existent object into a container");
 
-    if (ptr.getTypeName()==typeid (ESM::Potion).name())
+    if (ptr.getType()==ESM::Potion::sRecordId)
         return Type_Potion;
 
-    if (ptr.getTypeName()==typeid (ESM::Apparatus).name())
+    if (ptr.getType()==ESM::Apparatus::sRecordId)
         return Type_Apparatus;
 
-    if (ptr.getTypeName()==typeid (ESM::Armor).name())
+    if (ptr.getType()==ESM::Armor::sRecordId)
         return Type_Armor;
 
-    if (ptr.getTypeName()==typeid (ESM::Book).name())
+    if (ptr.getType()==ESM::Book::sRecordId)
         return Type_Book;
 
-    if (ptr.getTypeName()==typeid (ESM::Clothing).name())
+    if (ptr.getType()==ESM::Clothing::sRecordId)
         return Type_Clothing;
 
-    if (ptr.getTypeName()==typeid (ESM::Ingredient).name())
+    if (ptr.getType()==ESM::Ingredient::sRecordId)
         return Type_Ingredient;
 
-    if (ptr.getTypeName()==typeid (ESM::Light).name())
+    if (ptr.getType()==ESM::Light::sRecordId)
         return Type_Light;
 
-    if (ptr.getTypeName()==typeid (ESM::Lockpick).name())
+    if (ptr.getType()==ESM::Lockpick::sRecordId)
         return Type_Lockpick;
 
-    if (ptr.getTypeName()==typeid (ESM::Miscellaneous).name())
+    if (ptr.getType()==ESM::Miscellaneous::sRecordId)
         return Type_Miscellaneous;
 
-    if (ptr.getTypeName()==typeid (ESM::Probe).name())
+    if (ptr.getType()==ESM::Probe::sRecordId)
         return Type_Probe;
 
-    if (ptr.getTypeName()==typeid (ESM::Repair).name())
+    if (ptr.getType()==ESM::Repair::sRecordId)
         return Type_Repair;
 
-    if (ptr.getTypeName()==typeid (ESM::Weapon).name())
+    if (ptr.getType()==ESM::Weapon::sRecordId)
         return Type_Weapon;
 
     throw std::runtime_error (
-        "Object '" + ptr.getCellRef().getRefId() + "' of type " + ptr.getTypeName() + " can not be placed into a container");
+        "Object '" + ptr.getCellRef().getRefId() + "' of type " + ptr.getTypeDescription() + " can not be placed into a container");
 }
 
 MWWorld::Ptr MWWorld::ContainerStore::findReplacement(const std::string& id)
diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp
index 49e60af1fd..8cb0b9b012 100644
--- a/apps/openmw/mwworld/inventorystore.cpp
+++ b/apps/openmw/mwworld/inventorystore.cpp
@@ -139,8 +139,8 @@ MWWorld::ContainerStoreIterator MWWorld::InventoryStore::add(const Ptr& itemPtr,
     if (allowAutoEquip && actorPtr != MWMechanics::getPlayer()
             && actorPtr.getClass().isNpc() && !actorPtr.getClass().getNpcStats(actorPtr).isWerewolf())
     {
-        const std::string& type = itemPtr.getTypeName();
-        if (type == typeid(ESM::Armor).name() || type == typeid(ESM::Clothing).name())
+        auto type = itemPtr.getType();
+        if (type == ESM::Armor::sRecordId || type == ESM::Clothing::sRecordId)
             autoEquip(actorPtr);
     }
 
@@ -431,7 +431,7 @@ void MWWorld::InventoryStore::autoEquipArmor (const MWWorld::Ptr& actor, TSlots&
 
                 if (iter.getType() == ContainerStore::Type_Armor)
                 {
-                    if (old.getTypeName() == typeid(ESM::Armor).name())
+                    if (old.getType() == ESM::Armor::sRecordId)
                     {
                         if (old.get<ESM::Armor>()->mBase->mData.mType < test.get<ESM::Armor>()->mBase->mData.mType)
                             continue;
@@ -465,7 +465,7 @@ void MWWorld::InventoryStore::autoEquipArmor (const MWWorld::Ptr& actor, TSlots&
                         }
                     }
 
-                    if (old.getTypeName() == typeid(ESM::Clothing).name())
+                    if (old.getType() == ESM::Clothing::sRecordId)
                     {
                         // check value
                         if (old.getClass().getValue (old) >= test.getClass().getValue (test))
@@ -617,8 +617,8 @@ int MWWorld::InventoryStore::remove(const Ptr& item, int count, const Ptr& actor
     if (equipReplacement && wasEquipped && (actor != MWMechanics::getPlayer())
             && actor.getClass().isNpc() && !actor.getClass().getNpcStats(actor).isWerewolf())
     {
-        const std::string& type = item.getTypeName();
-        if (type == typeid(ESM::Armor).name() || type == typeid(ESM::Clothing).name())
+        auto type = item.getType();
+        if (type == ESM::Armor::sRecordId || type == ESM::Clothing::sRecordId)
             autoEquip(actor);
     }
 
diff --git a/apps/openmw/mwworld/livecellref.cpp b/apps/openmw/mwworld/livecellref.cpp
index 4203e1ac55..c74817911e 100644
--- a/apps/openmw/mwworld/livecellref.cpp
+++ b/apps/openmw/mwworld/livecellref.cpp
@@ -11,7 +11,7 @@
 #include "class.hpp"
 #include "esmstore.hpp"
 
-MWWorld::LiveCellRefBase::LiveCellRefBase(const std::string& type, const ESM::CellRef &cref)
+MWWorld::LiveCellRefBase::LiveCellRefBase(unsigned int type, const ESM::CellRef &cref)
   : mClass(&Class::get(type)), mRef(cref), mData(cref)
 {
 }
diff --git a/apps/openmw/mwworld/livecellref.hpp b/apps/openmw/mwworld/livecellref.hpp
index 414fde42bd..af0f84dc8d 100644
--- a/apps/openmw/mwworld/livecellref.hpp
+++ b/apps/openmw/mwworld/livecellref.hpp
@@ -1,8 +1,6 @@
 #ifndef GAME_MWWORLD_LIVECELLREF_H
 #define GAME_MWWORLD_LIVECELLREF_H
 
-#include <typeinfo>
-
 #include "cellref.hpp"
 
 #include "refdata.hpp"
@@ -31,7 +29,7 @@ namespace MWWorld
         /** runtime-data */
         RefData mData;
 
-        LiveCellRefBase(const std::string& type, const ESM::CellRef &cref=ESM::CellRef());
+        LiveCellRefBase(unsigned int type, const ESM::CellRef &cref=ESM::CellRef());
         /* Need this for the class to be recognized as polymorphic */
         virtual ~LiveCellRefBase() { }
 
@@ -43,6 +41,8 @@ namespace MWWorld
         virtual void save (ESM::ObjectState& state) const = 0;
         ///< Save LiveCellRef state into \a state.
 
+        virtual std::string getTypeDescription() const { return ""; }
+
         protected:
 
             void loadImp (const ESM::ObjectState& state);
@@ -77,11 +77,11 @@ namespace MWWorld
     struct LiveCellRef : public LiveCellRefBase
     {
         LiveCellRef(const ESM::CellRef& cref, const X* b = nullptr)
-            : LiveCellRefBase(typeid(X).name(), cref), mBase(b)
+            : LiveCellRefBase(X::sRecordId, cref), mBase(b)
         {}
 
         LiveCellRef(const X* b = nullptr)
-            : LiveCellRefBase(typeid(X).name()), mBase(b)
+            : LiveCellRefBase(X::sRecordId), mBase(b)
         {}
 
         // The object that this instance is based on.
@@ -95,6 +95,8 @@ namespace MWWorld
         void save (ESM::ObjectState& state) const override;
         ///< Save LiveCellRef state into \a state.
 
+        std::string getTypeDescription() const override { return X::getRecordType(); }
+
         static bool checkState (const ESM::ObjectState& state);
         ///< Check if state is valid and report errors.
         ///
diff --git a/apps/openmw/mwworld/localscripts.cpp b/apps/openmw/mwworld/localscripts.cpp
index 1661d6b9f7..0e7dd0771f 100644
--- a/apps/openmw/mwworld/localscripts.cpp
+++ b/apps/openmw/mwworld/localscripts.cpp
@@ -43,7 +43,7 @@ namespace
         bool operator()(const MWWorld::Ptr& containerPtr)
         {
             // Ignore containers without generated content
-            if (containerPtr.getTypeName() == typeid(ESM::Container).name() &&
+            if (containerPtr.getType() == ESM::Container::sRecordId &&
                 containerPtr.getRefData().getCustomData() == nullptr)
                 return true;
 
diff --git a/apps/openmw/mwworld/ptr.cpp b/apps/openmw/mwworld/ptr.cpp
index e16a196297..b18e3b1689 100644
--- a/apps/openmw/mwworld/ptr.cpp
+++ b/apps/openmw/mwworld/ptr.cpp
@@ -6,10 +6,10 @@
 #include "class.hpp"
 #include "livecellref.hpp"
 
-const std::string& MWWorld::Ptr::getTypeName() const
+unsigned int MWWorld::Ptr::getType() const
 {
     if(mRef != nullptr)
-        return mRef->mClass->getTypeName();
+        return mRef->mClass->getType();
     throw std::runtime_error("Can't get type name from an empty object.");
 }
 
@@ -55,10 +55,10 @@ MWWorld::Ptr::operator const void *()
 
 // -------------------------------------------------------------------------------
 
-const std::string &MWWorld::ConstPtr::getTypeName() const
+unsigned int MWWorld::ConstPtr::getType() const
 {
     if(mRef != nullptr)
-        return mRef->mClass->getTypeName();
+        return mRef->mClass->getType();
     throw std::runtime_error("Can't get type name from an empty object.");
 }
 
diff --git a/apps/openmw/mwworld/ptr.hpp b/apps/openmw/mwworld/ptr.hpp
index 9ab18d7f48..6813b7d124 100644
--- a/apps/openmw/mwworld/ptr.hpp
+++ b/apps/openmw/mwworld/ptr.hpp
@@ -35,7 +35,12 @@ namespace MWWorld
                 return mRef == nullptr;
             }
 
-            const std::string& getTypeName() const;
+            unsigned int getType() const;
+
+            std::string getTypeDescription() const
+            {
+                return mRef ? mRef->getTypeDescription() : "nullptr";
+            }
 
             const Class& getClass() const
             {
@@ -51,8 +56,8 @@ namespace MWWorld
                 if(ref) return ref;
 
                 std::stringstream str;
-                str<< "Bad LiveCellRef cast to "<<typeid(T).name()<<" from ";
-                if(mRef != nullptr) str<< getTypeName();
+                str<< "Bad LiveCellRef cast to "<<T::getRecordType()<<" from ";
+                if(mRef != nullptr) str<< getTypeDescription();
                 else str<< "an empty object";
 
                 throw std::runtime_error(str.str());
@@ -111,7 +116,12 @@ namespace MWWorld
             return mRef == nullptr;
         }
 
-        const std::string& getTypeName() const;
+        unsigned int getType() const;
+
+        std::string getTypeDescription() const
+        {
+            return mRef ? mRef->getTypeDescription() : "nullptr";
+        }
 
         const Class& getClass() const
         {
@@ -127,8 +137,8 @@ namespace MWWorld
             if(ref) return ref;
 
             std::stringstream str;
-            str<< "Bad LiveCellRef cast to "<<typeid(T).name()<<" from ";
-            if(mRef != nullptr) str<< getTypeName();
+            str<< "Bad LiveCellRef cast to "<<T::getRecordType()<<" from ";
+            if(mRef != nullptr) str<< getTypeDescription();
             else str<< "an empty object";
 
             throw std::runtime_error(str.str());
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 5218dfe249..4fd9235586 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -784,9 +784,9 @@ namespace MWWorld
 
     void World::addContainerScripts(const Ptr& reference, CellStore * cell)
     {
-        if( reference.getTypeName()==typeid (ESM::Container).name() ||
-            reference.getTypeName()==typeid (ESM::NPC).name() ||
-            reference.getTypeName()==typeid (ESM::Creature).name())
+        if( reference.getType()==ESM::Container::sRecordId ||
+            reference.getType()==ESM::NPC::sRecordId ||
+            reference.getType()==ESM::Creature::sRecordId)
         {
             MWWorld::ContainerStore& container = reference.getClass().getContainerStore(reference);
             for(MWWorld::ContainerStoreIterator it = container.begin(); it != container.end(); ++it)
@@ -827,9 +827,9 @@ namespace MWWorld
 
     void World::removeContainerScripts(const Ptr& reference)
     {
-        if( reference.getTypeName()==typeid (ESM::Container).name() ||
-            reference.getTypeName()==typeid (ESM::NPC).name() ||
-            reference.getTypeName()==typeid (ESM::Creature).name())
+        if( reference.getType()==ESM::Container::sRecordId ||
+            reference.getType()==ESM::NPC::sRecordId ||
+            reference.getType()==ESM::Creature::sRecordId)
         {
             MWWorld::ContainerStore& container = reference.getClass().getContainerStore(reference);
             for(MWWorld::ContainerStoreIterator it = container.begin(); it != container.end(); ++it)
@@ -3415,7 +3415,7 @@ namespace MWWorld
                 return true;
 
             // Consider references inside containers as well (except if we are looking for a Creature, they cannot be in containers)
-            bool isContainer = ptr.getClass().getTypeName() == typeid(ESM::Container).name();
+            bool isContainer = ptr.getClass().getType() == ESM::Container::sRecordId;
             if (mType != World::Detect_Creature && (ptr.getClass().isActor() || isContainer))
             {
                 // but ignore containers without resolved content
@@ -3470,10 +3470,10 @@ namespace MWWorld
                 // If in werewolf form, this detects only NPCs, otherwise only creatures
                 if (detector.getClass().isNpc() && detector.getClass().getNpcStats(detector).isWerewolf())
                 {
-                    if (ptr.getClass().getTypeName() != typeid(ESM::NPC).name())
+                    if (ptr.getClass().getType() != ESM::NPC::sRecordId)
                         return false;
                 }
-                else if (ptr.getClass().getTypeName() != typeid(ESM::Creature).name())
+                else if (ptr.getClass().getType() != ESM::Creature::sRecordId)
                     return false;
 
                 if (ptr.getClass().getCreatureStats(ptr).isDead())

From 93848ef01cefa61a0dd69af29a55319bd611e3bb Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Mon, 11 Oct 2021 13:11:59 +0000
Subject: [PATCH 1458/2859] avoids virtual function calls in
 ComputeLightSpaceBounds (#3167)

osg::NodeVisitor is designed to recursively call virtual apply signatures until we find an implemented signature. Encountered nodes that we do not explicitely handle will trigger additional virtual function calls. With this PR we avoid these additional virtual function calls in the particularly costly ComputeLightSpaceBounds by adding some explicit signatures.
---
 components/sceneutil/mwshadowtechnique.cpp | 14 ++++++++++++++
 components/sceneutil/mwshadowtechnique.hpp | 11 ++++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
index 89d872dbfe..024123b3e1 100644
--- a/components/sceneutil/mwshadowtechnique.cpp
+++ b/components/sceneutil/mwshadowtechnique.cpp
@@ -378,6 +378,11 @@ void MWShadowTechnique::ComputeLightSpaceBounds::apply(osg::Node& node)
     popCurrentMask();
 }
 
+void MWShadowTechnique::ComputeLightSpaceBounds::apply(osg::Group& node)
+{
+    apply(static_cast<osg::Node&>(node));
+}
+
 void MWShadowTechnique::ComputeLightSpaceBounds::apply(osg::Drawable& drawable)
 {
     if (isCulled(drawable)) return;
@@ -391,6 +396,11 @@ void MWShadowTechnique::ComputeLightSpaceBounds::apply(osg::Drawable& drawable)
     popCurrentMask();
 }
 
+void MWShadowTechnique::ComputeLightSpaceBounds::apply(osg::Geometry& drawable)
+{
+    apply(static_cast<osg::Drawable&>(drawable));
+}
+
 void MWShadowTechnique::ComputeLightSpaceBounds::apply(osg::Billboard&)
 {
     OSG_INFO << "Warning Billboards not yet supported" << std::endl;
@@ -424,7 +434,11 @@ void MWShadowTechnique::ComputeLightSpaceBounds::apply(osg::Transform& transform
 
     // pop the culling mode.
     popCurrentMask();
+}
 
+void MWShadowTechnique::ComputeLightSpaceBounds::apply(osg::MatrixTransform& transform)
+{
+    apply(static_cast<osg::Transform&>(transform));
 }
 
 void MWShadowTechnique::ComputeLightSpaceBounds::apply(osg::Camera&)
diff --git a/components/sceneutil/mwshadowtechnique.hpp b/components/sceneutil/mwshadowtechnique.hpp
index fd562184e0..3f6c0fb765 100644
--- a/components/sceneutil/mwshadowtechnique.hpp
+++ b/components/sceneutil/mwshadowtechnique.hpp
@@ -91,20 +91,21 @@ namespace SceneUtil {
         public:
             ComputeLightSpaceBounds();
 
-            void apply(osg::Node& node) override;
+            void apply(osg::Node& node) override final;
+            void apply(osg::Group& node) override;
 
-            void apply(osg::Drawable& drawable) override;
+            void apply(osg::Drawable& drawable) override final;
+            void apply(osg::Geometry& drawable) override;
 
             void apply(osg::Billboard&) override;
 
             void apply(osg::Projection&) override;
 
-            void apply(osg::Transform& transform) override;
+            void apply(osg::Transform& transform) override final;
+            void apply(osg::MatrixTransform& transform) override;
 
             void apply(osg::Camera&) override;
 
-            using osg::NodeVisitor::apply;
-
             void updateBound(const osg::BoundingBox& bb);
 
             void update(const osg::Vec3& v);

From 5cf9995a3128c26bfd89af8d53e395f3f0dafdcf Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Mon, 11 Oct 2021 13:28:37 +0000
Subject: [PATCH 1459/2859] fixes windows build

---
 apps/openmw/mwworld/player.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/player.hpp b/apps/openmw/mwworld/player.hpp
index 1e4b0ffdf5..a7e42d95e1 100644
--- a/apps/openmw/mwworld/player.hpp
+++ b/apps/openmw/mwworld/player.hpp
@@ -11,10 +11,10 @@
 
 #include <components/esm/loadskil.hpp>
 #include <components/esm/attr.hpp>
+#include <components/esm/loadnpc.hpp>
 
 namespace ESM
 {
-    struct NPC;
     class ESMWriter;
     class ESMReader;
 }

From d6613d3677adf5a921a4d93a9e7afafe17aff7d7 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Mon, 11 Oct 2021 14:56:26 +0000
Subject: [PATCH 1460/2859] mostly reverts MWLua changes (#3170)

We just can no longer use the former ptr.getTypeName() as a fallback, but I do not suppose it matters. This value was an implementation defined string that usually contained a garbled mess.
Probably we should additionally refactor Lua types completely now that we have Ptr::getType(). I will leave this up to MWLua developers.
---
 apps/openmw/mwlua/object.cpp | 8 ++++----
 apps/openmw/mwlua/object.hpp | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwlua/object.cpp b/apps/openmw/mwlua/object.cpp
index eb88ab69d0..266e628dd6 100644
--- a/apps/openmw/mwlua/object.cpp
+++ b/apps/openmw/mwlua/object.cpp
@@ -23,7 +23,7 @@ namespace MWLua
         return std::to_string(id.mIndex) + "_" + std::to_string(id.mContentFile);
     }
 
-    const static std::map<std::type_index, std::string> classNames = {
+    const static std::map<std::type_index, std::string_view> classNames = {
         {typeid(MWClass::Activator), "Activator"},
         {typeid(MWClass::Armor), "Armor"},
         {typeid(MWClass::Book), "Book"},
@@ -40,7 +40,7 @@ namespace MWLua
         {typeid(MWClass::Weapon), "Weapon"},
     };
 
-    std::string getMWClassName(const std::type_index& cls_type, std::string fallback)
+    std::string_view getMWClassName(const std::type_index& cls_type, std::string_view fallback)
     {
         auto it = classNames.find(cls_type);
         if (it != classNames.end())
@@ -55,13 +55,13 @@ namespace MWLua
         return id == "prisonmarker" || id == "divinemarker" || id == "templemarker" || id == "northmarker";
     }
 
-    std::string getMWClassName(const MWWorld::Ptr& ptr)
+    std::string_view getMWClassName(const MWWorld::Ptr& ptr)
     {
         if (ptr.getCellRef().getRefIdRef() == "player")
             return "Player";
         if (isMarker(ptr))
             return "Marker";
-        return ptr.getTypeDescription();
+        return getMWClassName(typeid(ptr.getClass()));
     }
 
     std::string ptrToString(const MWWorld::Ptr& ptr)
diff --git a/apps/openmw/mwlua/object.hpp b/apps/openmw/mwlua/object.hpp
index 5cd8f399d7..c0b6bf1919 100644
--- a/apps/openmw/mwlua/object.hpp
+++ b/apps/openmw/mwlua/object.hpp
@@ -19,8 +19,8 @@ namespace MWLua
     std::string idToString(const ObjectId& id);
     std::string ptrToString(const MWWorld::Ptr& ptr);
     bool isMarker(const MWWorld::Ptr& ptr);
-    std::string getMWClassName(const std::type_index& cls_type, std::string fallback = "Unknown");
-    std::string getMWClassName(const MWWorld::Ptr& ptr);
+    std::string_view getMWClassName(const std::type_index& cls_type, std::string_view fallback = "Unknown");
+    std::string_view getMWClassName(const MWWorld::Ptr& ptr);
 
     // Holds a mapping ObjectId -> MWWord::Ptr.
     class ObjectRegistry

From 6986feb81b3a5a0154fafe415b5fa68fa6cdd223 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 3 Jul 2021 04:09:55 +0200
Subject: [PATCH 1461/2859] Initialize navigator max climb and max slope
 settings in makeSettingsFromSettingsManager

To avoid having multiple places to initialize them when they will be required
by multiple binaries.
---
 apps/openmw/mwphysics/constants.hpp      |  2 --
 apps/openmw/mwphysics/movementsolver.cpp |  2 +-
 apps/openmw/mwphysics/movementsolver.hpp |  5 +++--
 apps/openmw/mwphysics/stepper.cpp        | 16 +++++++++-------
 apps/openmw/mwworld/worldimp.cpp         |  9 ++++-----
 components/detournavigator/settings.cpp  | 10 ++++------
 components/detournavigator/settings.hpp  |  2 +-
 components/misc/constants.hpp            |  3 +++
 8 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/apps/openmw/mwphysics/constants.hpp b/apps/openmw/mwphysics/constants.hpp
index 2d7cd53d38..c275b63c7b 100644
--- a/apps/openmw/mwphysics/constants.hpp
+++ b/apps/openmw/mwphysics/constants.hpp
@@ -3,7 +3,6 @@
 
 namespace MWPhysics
 {
-    static constexpr float sStepSizeUp = 34.0f;
     static constexpr float sStepSizeDown = 62.0f;
 
     static constexpr float sMinStep = 10.0f; // hack to skip over tiny unwalkable slopes
@@ -12,7 +11,6 @@ namespace MWPhysics
     static constexpr bool sDoExtraStairHacks = true;
 
     static constexpr float sGroundOffset = 1.0f;
-    static constexpr float sMaxSlope = 46.0f;
 
     // Arbitrary number. To prevent infinite loops. They shouldn't happen but it's good to be prepared.
     static constexpr int sMaxIterations = 8;
diff --git a/apps/openmw/mwphysics/movementsolver.cpp b/apps/openmw/mwphysics/movementsolver.cpp
index df9239dd83..44a5391f0d 100644
--- a/apps/openmw/mwphysics/movementsolver.cpp
+++ b/apps/openmw/mwphysics/movementsolver.cpp
@@ -230,7 +230,7 @@ namespace MWPhysics
             float hitHeight = tracer.mHitPoint.z() - tracer.mEndPos.z() + actor.mHalfExtentsZ;
             osg::Vec3f oldPosition = newPosition;
             bool usedStepLogic = false;
-            if (hitHeight < sStepSizeUp && !isActor(tracer.mHitObject))
+            if (hitHeight < Constants::sStepSizeUp && !isActor(tracer.mHitObject))
             {
                 // Try to step up onto it.
                 // NOTE: this modifies newPosition and velocity on its own if successful
diff --git a/apps/openmw/mwphysics/movementsolver.hpp b/apps/openmw/mwphysics/movementsolver.hpp
index 90b10c275e..30733eeec8 100644
--- a/apps/openmw/mwphysics/movementsolver.hpp
+++ b/apps/openmw/mwphysics/movementsolver.hpp
@@ -3,7 +3,8 @@
 
 #include <osg/Vec3f>
 
-#include "constants.hpp"
+#include <components/misc/constants.hpp>
+
 #include "../mwworld/ptr.hpp"
 
 class btCollisionWorld;
@@ -30,7 +31,7 @@ namespace MWPhysics
     template <class Vec3>
     static bool isWalkableSlope(const Vec3 &normal)
     {
-        static const float sMaxSlopeCos = std::cos(osg::DegreesToRadians(sMaxSlope));
+        static const float sMaxSlopeCos = std::cos(osg::DegreesToRadians(Constants::sMaxSlope));
         return (normal.z() > sMaxSlopeCos);
     }
 
diff --git a/apps/openmw/mwphysics/stepper.cpp b/apps/openmw/mwphysics/stepper.cpp
index 1f53c1ac51..af85658910 100644
--- a/apps/openmw/mwphysics/stepper.cpp
+++ b/apps/openmw/mwphysics/stepper.cpp
@@ -3,6 +3,8 @@
 #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 
+#include <components/misc/constants.hpp>
+
 #include "collisiontype.hpp"
 #include "constants.hpp"
 #include "movementsolver.hpp"
@@ -13,7 +15,7 @@ namespace MWPhysics
     {
         if (!stepper.mHitObject)
             return false;
-        static const float sMaxSlopeCos = std::cos(osg::DegreesToRadians(sMaxSlope));
+        static const float sMaxSlopeCos = std::cos(osg::DegreesToRadians(Constants::sMaxSlope));
         if (stepper.mPlaneNormal.z() <= sMaxSlopeCos)
             return false;
 
@@ -34,13 +36,13 @@ namespace MWPhysics
         // Stairstepping algorithms work by moving up to avoid the step, moving forwards, then moving back down onto the ground.
         // This algorithm has a couple of minor problems, but they don't cause problems for sane geometry, and just prevent stepping on insane geometry.
 
-        mUpStepper.doTrace(mColObj, position, position+osg::Vec3f(0.0f,0.0f,sStepSizeUp), mColWorld);
+        mUpStepper.doTrace(mColObj, position, position + osg::Vec3f(0.0f, 0.0f, Constants::sStepSizeUp), mColWorld);
 
         float upDistance = 0;
         if(!mUpStepper.mHitObject)
-            upDistance = sStepSizeUp;
-        else if(mUpStepper.mFraction*sStepSizeUp > sCollisionMargin)
-            upDistance = mUpStepper.mFraction*sStepSizeUp - sCollisionMargin;
+            upDistance = Constants::sStepSizeUp;
+        else if(mUpStepper.mFraction * Constants::sStepSizeUp > sCollisionMargin)
+            upDistance = mUpStepper.mFraction * Constants::sStepSizeUp - sCollisionMargin;
         else
         {
             return false;
@@ -76,9 +78,9 @@ namespace MWPhysics
             }
             else if(attempt == 3)
             {
-                if(upDistance > sStepSizeUp)
+                if(upDistance > Constants::sStepSizeUp)
                 {
-                    upDistance = sStepSizeUp;
+                    upDistance = Constants::sStepSizeUp;
                     tracerPos = position + osg::Vec3f(0.0f, 0.0f, upDistance);
                 }
                 moveDistance = sMinStep2;
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 4fd9235586..57ad8fc149 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -173,13 +173,12 @@ namespace MWWorld
 
         mPhysics.reset(new MWPhysics::PhysicsSystem(resourceSystem, rootNode));
 
-        if (auto navigatorSettings = DetourNavigator::makeSettingsFromSettingsManager())
+        if (Settings::Manager::getBool("enable", "Navigator"))
         {
-            navigatorSettings->mMaxClimb = MWPhysics::sStepSizeUp;
-            navigatorSettings->mMaxSlope = MWPhysics::sMaxSlope;
-            navigatorSettings->mSwimHeightScale = mSwimHeightScale;
+            auto navigatorSettings = DetourNavigator::makeSettingsFromSettingsManager();
+            navigatorSettings.mSwimHeightScale = mSwimHeightScale;
             DetourNavigator::RecastGlobalAllocator::init();
-            mNavigator.reset(new DetourNavigator::NavigatorImpl(*navigatorSettings));
+            mNavigator.reset(new DetourNavigator::NavigatorImpl(navigatorSettings));
         }
         else
         {
diff --git a/components/detournavigator/settings.cpp b/components/detournavigator/settings.cpp
index ff99fae20c..e428f3695a 100644
--- a/components/detournavigator/settings.cpp
+++ b/components/detournavigator/settings.cpp
@@ -1,14 +1,12 @@
 #include "settings.hpp"
 
 #include <components/settings/settings.hpp>
+#include <components/misc/constants.hpp>
 
 namespace DetourNavigator
 {
-    std::optional<Settings> makeSettingsFromSettingsManager()
+    Settings makeSettingsFromSettingsManager()
     {
-        if (!::Settings::Manager::getBool("enable", "Navigator"))
-            return std::optional<Settings>();
-
         Settings navigatorSettings;
 
         navigatorSettings.mBorderSize = ::Settings::Manager::getInt("border size", "Navigator");
@@ -16,9 +14,9 @@ namespace DetourNavigator
         navigatorSettings.mCellSize = ::Settings::Manager::getFloat("cell size", "Navigator");
         navigatorSettings.mDetailSampleDist = ::Settings::Manager::getFloat("detail sample dist", "Navigator");
         navigatorSettings.mDetailSampleMaxError = ::Settings::Manager::getFloat("detail sample max error", "Navigator");
-        navigatorSettings.mMaxClimb = 0;
+        navigatorSettings.mMaxClimb = Constants::sStepSizeUp;
         navigatorSettings.mMaxSimplificationError = ::Settings::Manager::getFloat("max simplification error", "Navigator");
-        navigatorSettings.mMaxSlope = 0;
+        navigatorSettings.mMaxSlope = Constants::sMaxSlope;
         navigatorSettings.mRecastScaleFactor = ::Settings::Manager::getFloat("recast scale factor", "Navigator");
         navigatorSettings.mSwimHeightScale = 0;
         navigatorSettings.mMaxEdgeLen = ::Settings::Manager::getInt("max edge len", "Navigator");
diff --git a/components/detournavigator/settings.hpp b/components/detournavigator/settings.hpp
index 39f5815b8e..800ad6b2bb 100644
--- a/components/detournavigator/settings.hpp
+++ b/components/detournavigator/settings.hpp
@@ -41,7 +41,7 @@ namespace DetourNavigator
         std::chrono::milliseconds mMinUpdateInterval;
     };
 
-    std::optional<Settings> makeSettingsFromSettingsManager();
+    Settings makeSettingsFromSettingsManager();
 }
 
 #endif
diff --git a/components/misc/constants.hpp b/components/misc/constants.hpp
index bfd3933fc7..01d783a4fc 100644
--- a/components/misc/constants.hpp
+++ b/components/misc/constants.hpp
@@ -36,6 +36,9 @@ const std::string HerbalismLabel = "HerbalismSwitch";
 // Percentage height at which projectiles are spawned from an actor
 const float TorsoHeight = 0.75f;
 
+static constexpr float sStepSizeUp = 34.0f;
+static constexpr float sMaxSlope = 46.0f;
+
 }
 
 #endif

From 7c5a590890f9c0404cca74a931c131a48b1cfda6 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 11 Oct 2021 19:23:08 +0200
Subject: [PATCH 1462/2859] Replace float type for arguments to create
 heightfield with int

To reduce amount of computations on the caller side and restrict possible
values.

* verts can't be non-int because it's a number of things.
* worldsize is initially defined as int by ESM::Land::REAL_SIZE.
* Put function to calculate heightfied shift into components to be able to
  reuse by other binaries.
---
 apps/openmw/mwphysics/heightfield.cpp    | 27 +++++++++++++-----------
 apps/openmw/mwphysics/heightfield.hpp    |  3 ++-
 apps/openmw/mwphysics/physicssystem.cpp  |  4 ++--
 apps/openmw/mwphysics/physicssystem.hpp  |  2 +-
 apps/openmw/mwworld/scene.cpp            |  8 +++----
 components/bullethelpers/heightfield.hpp | 14 ++++++++++++
 6 files changed, 38 insertions(+), 20 deletions(-)
 create mode 100644 components/bullethelpers/heightfield.hpp

diff --git a/apps/openmw/mwphysics/heightfield.cpp b/apps/openmw/mwphysics/heightfield.cpp
index e210bc3903..d363ddef11 100644
--- a/apps/openmw/mwphysics/heightfield.cpp
+++ b/apps/openmw/mwphysics/heightfield.cpp
@@ -1,6 +1,8 @@
 #include "heightfield.hpp"
 #include "mtphysics.hpp"
 
+#include <components/bullethelpers/heightfield.hpp>
+
 #include <osg/Object>
 
 #include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
@@ -19,17 +21,17 @@
 namespace
 {
     template <class T>
-    auto makeHeights(const T* heights, float sqrtVerts)
+    auto makeHeights(const T* heights, int verts)
         -> std::enable_if_t<std::is_same<btScalar, T>::value, std::vector<btScalar>>
     {
         return {};
     }
 
     template <class T>
-    auto makeHeights(const T* heights, float sqrtVerts)
+    auto makeHeights(const T* heights, int verts)
         -> std::enable_if_t<!std::is_same<btScalar, T>::value, std::vector<btScalar>>
     {
-        return std::vector<btScalar>(heights, heights + static_cast<std::ptrdiff_t>(sqrtVerts * sqrtVerts));
+        return std::vector<btScalar>(heights, heights + static_cast<std::ptrdiff_t>(verts * verts));
     }
 
     template <class T>
@@ -50,16 +52,17 @@ namespace
 
 namespace MWPhysics
 {
-    HeightField::HeightField(const float* heights, int x, int y, float triSize, float sqrtVerts, float minH, float maxH, const osg::Object* holdObject, PhysicsTaskScheduler* scheduler)
+    HeightField::HeightField(const float* heights, int x, int y, int size, int verts, float minH, float maxH,
+                             const osg::Object* holdObject, PhysicsTaskScheduler* scheduler)
         : mHoldObject(holdObject)
 #if BT_BULLET_VERSION < 310
-        , mHeights(makeHeights(heights, sqrtVerts))
+        , mHeights(makeHeights(heights, verts))
 #endif
         , mTaskScheduler(scheduler)
     {
 #if BT_BULLET_VERSION < 310
         mShape = std::make_unique<btHeightfieldTerrainShape>(
-            sqrtVerts, sqrtVerts,
+            verts, verts,
             getHeights(heights, mHeights),
             1,
             minH, maxH, 2,
@@ -67,10 +70,12 @@ namespace MWPhysics
         );
 #else
         mShape = std::make_unique<btHeightfieldTerrainShape>(
-            sqrtVerts, sqrtVerts, heights, minH, maxH, 2, false);
+            verts, verts, heights, minH, maxH, 2, false);
 #endif
         mShape->setUseDiamondSubdivision(true);
-        mShape->setLocalScaling(btVector3(triSize, triSize, 1));
+
+        const float scaling = static_cast<float>(size) / static_cast<float>(verts - 1);
+        mShape->setLocalScaling(btVector3(scaling, scaling, 1));
 
 #if BT_BULLET_VERSION >= 289
         // Accelerates some collision tests.
@@ -81,10 +86,8 @@ namespace MWPhysics
         mShape->buildAccelerator();
 #endif
 
-        btTransform transform(btQuaternion::getIdentity(),
-                                btVector3((x+0.5f) * triSize * (sqrtVerts-1),
-                                          (y+0.5f) * triSize * (sqrtVerts-1),
-                                          (maxH+minH)*0.5f));
+        const btTransform transform(btQuaternion::getIdentity(),
+                                    BulletHelpers::getHeightfieldShift(x, y, size, minH, maxH));
 
         mCollisionObject = std::make_unique<btCollisionObject>();
         mCollisionObject->setCollisionShape(mShape.get());
diff --git a/apps/openmw/mwphysics/heightfield.hpp b/apps/openmw/mwphysics/heightfield.hpp
index 93b2733f31..c320225258 100644
--- a/apps/openmw/mwphysics/heightfield.hpp
+++ b/apps/openmw/mwphysics/heightfield.hpp
@@ -23,7 +23,8 @@ namespace MWPhysics
     class HeightField
     {
     public:
-        HeightField(const float* heights, int x, int y, float triSize, float sqrtVerts, float minH, float maxH, const osg::Object* holdObject, PhysicsTaskScheduler* scheduler);
+        HeightField(const float* heights, int x, int y, int size, int verts, float minH, float maxH,
+                    const osg::Object* holdObject, PhysicsTaskScheduler* scheduler);
         ~HeightField();
 
         btCollisionObject* getCollisionObject();
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 6b2600069a..5f7ee0523a 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -472,9 +472,9 @@ namespace MWPhysics
         return MovementSolver::traceDown(ptr, position, found->second.get(), mCollisionWorld.get(), maxHeight);
     }
 
-    void PhysicsSystem::addHeightField (const float* heights, int x, int y, float triSize, float sqrtVerts, float minH, float maxH, const osg::Object* holdObject)
+    void PhysicsSystem::addHeightField(const float* heights, int x, int y, int size, int verts, float minH, float maxH, const osg::Object* holdObject)
     {
-        mHeightFields[std::make_pair(x,y)] = std::make_unique<HeightField>(heights, x, y, triSize, sqrtVerts, minH, maxH, holdObject, mTaskScheduler.get());
+        mHeightFields[std::make_pair(x,y)] = std::make_unique<HeightField>(heights, x, y, size, verts, minH, maxH, holdObject, mTaskScheduler.get());
     }
 
     void PhysicsSystem::removeHeightField (int x, int y)
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index cf4ca40a54..30fdbcc122 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -150,7 +150,7 @@ namespace MWPhysics
             void updateRotation (const MWWorld::Ptr& ptr, osg::Quat rotate);
             void updatePosition (const MWWorld::Ptr& ptr);
 
-            void addHeightField (const float* heights, int x, int y, float triSize, float sqrtVerts, float minH, float maxH, const osg::Object* holdObject);
+            void addHeightField(const float* heights, int x, int y, int size, int verts, float minH, float maxH, const osg::Object* holdObject);
 
             void removeHeightField (int x, int y);
 
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index ed68a46059..b94a729faf 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -383,17 +383,17 @@ namespace MWWorld
         {
             osg::ref_ptr<const ESMTerrain::LandObject> land = mRendering.getLandManager()->getLand(cellX, cellY);
             const ESM::Land::LandData* data = land ? land->getData(ESM::Land::DATA_VHGT) : nullptr;
-            const float verts = ESM::Land::LAND_SIZE;
-            const float worldsize = ESM::Land::REAL_SIZE;
+            const int verts = ESM::Land::LAND_SIZE;
+            const int worldsize = ESM::Land::REAL_SIZE;
             if (data)
             {
-                mPhysics->addHeightField (data->mHeights, cellX, cellY, worldsize / (verts-1), verts, data->mMinHeight, data->mMaxHeight, land.get());
+                mPhysics->addHeightField(data->mHeights, cellX, cellY, worldsize, verts, data->mMinHeight, data->mMaxHeight, land.get());
             }
             else
             {
                 static std::vector<float> defaultHeight;
                 defaultHeight.resize(verts*verts, ESM::Land::DEFAULT_HEIGHT);
-                mPhysics->addHeightField (&defaultHeight[0], cellX, cellY, worldsize / (verts-1), verts, ESM::Land::DEFAULT_HEIGHT, ESM::Land::DEFAULT_HEIGHT, land.get());
+                mPhysics->addHeightField(defaultHeight.data(), cellX, cellY, worldsize, verts, ESM::Land::DEFAULT_HEIGHT, ESM::Land::DEFAULT_HEIGHT, land.get());
             }
             if (const auto heightField = mPhysics->getHeightField(cellX, cellY))
             {
diff --git a/components/bullethelpers/heightfield.hpp b/components/bullethelpers/heightfield.hpp
new file mode 100644
index 0000000000..6b1f0ccc2e
--- /dev/null
+++ b/components/bullethelpers/heightfield.hpp
@@ -0,0 +1,14 @@
+#ifndef OPENMW_COMPONENTS_BULLETHELPERS_HEIGHTFIELD_H
+#define OPENMW_COMPONENTS_BULLETHELPERS_HEIGHTFIELD_H
+
+#include <LinearMath/btVector3.h>
+
+namespace BulletHelpers
+{
+    inline btVector3 getHeightfieldShift(int x, int y, int size, float minHeight, float maxHeight)
+    {
+        return btVector3((x + 0.5f) * size, (y + 0.5f) * size, (maxHeight + minHeight) * 0.5f);
+    }
+}
+
+#endif

From 2bace703d55a06defb1bd133ac3266f3914b866d Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 11 Oct 2021 19:34:03 +0200
Subject: [PATCH 1463/2859] Add dependency to SQLite3

This will be required by navmeshtool.
---
 CI/before_script.android.sh |  1 +
 CI/before_script.linux.sh   |  1 +
 CI/before_script.msvc.sh    |  1 +
 CI/before_script.osx.sh     |  1 +
 CI/install_debian_deps.sh   |  2 +-
 CMakeLists.txt              |  2 ++
 extern/CMakeLists.txt       | 20 ++++++++++++++++++++
 7 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/CI/before_script.android.sh b/CI/before_script.android.sh
index 3ea429f1bb..3219f3a4ba 100755
--- a/CI/before_script.android.sh
+++ b/CI/before_script.android.sh
@@ -24,4 +24,5 @@ cmake \
 -DOPENMW_USE_SYSTEM_MYGUI=OFF \
 -DOPENMW_USE_SYSTEM_OSG=OFF \
 -DOPENMW_USE_SYSTEM_BULLET=OFF \
+-DOPENMW_USE_SYSTEM_SQLITE3=OFF \
 ..
diff --git a/CI/before_script.linux.sh b/CI/before_script.linux.sh
index 5d20fa75ce..b9fed204e3 100755
--- a/CI/before_script.linux.sh
+++ b/CI/before_script.linux.sh
@@ -40,6 +40,7 @@ if [[ $CI_OPENMW_USE_STATIC_DEPS ]]; then
         -DOPENMW_USE_SYSTEM_MYGUI=OFF
         -DOPENMW_USE_SYSTEM_OSG=OFF
         -DOPENMW_USE_SYSTEM_BULLET=OFF
+        -DOPENMW_USE_SYSTEM_SQLITE3=OFF
     )
 fi
 
diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 0a6123505e..1341289335 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -1018,6 +1018,7 @@ echo
 echo "Setting up OpenMW build..."
 add_cmake_opts -DOPENMW_MP_BUILD=on
 add_cmake_opts -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}"
+add_cmake_opts -DOPENMW_USE_SYSTEM_SQLITE3=OFF
 if [ ! -z $CI ]; then
 	case $STEP in
 		components )
diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh
index 265e05b8ee..6d0fe8c99e 100755
--- a/CI/before_script.osx.sh
+++ b/CI/before_script.osx.sh
@@ -19,6 +19,7 @@ cmake \
 -D CMAKE_OSX_DEPLOYMENT_TARGET="10.14" \
 -D CMAKE_BUILD_TYPE=RELEASE \
 -D OPENMW_OSX_DEPLOYMENT=TRUE \
+-D OPENMW_USE_SYSTEM_SQLITE3=OFF \
 -D BUILD_OPENMW=TRUE \
 -D BUILD_OPENCS=TRUE \
 -D BUILD_ESMTOOL=TRUE \
diff --git a/CI/install_debian_deps.sh b/CI/install_debian_deps.sh
index 4b47c937da..a8843207d9 100755
--- a/CI/install_debian_deps.sh
+++ b/CI/install_debian_deps.sh
@@ -27,7 +27,7 @@ declare -rA GROUPED_DEPS=(
   # TODO: add librecastnavigation-dev when debian is ready
 
   # These dependencies can alternatively be built and linked statically.
-  [openmw-deps-dynamic]="libmygui-dev libopenscenegraph-dev"
+  [openmw-deps-dynamic]="libmygui-dev libopenscenegraph-dev libsqlite3-dev"
   [coverity]="curl"
   [clang-tidy]="clang-tidy"
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2564379847..0451b639e5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -149,6 +149,8 @@ else()
 endif()
 option(RECASTNAVIGATION_STATIC "Build recastnavigation static libraries" ${_recastnavigation_static_default})
 
+option(OPENMW_USE_SYSTEM_SQLITE3 "Use system provided SQLite3 library" ON)
+
 option(OPENMW_UNITY_BUILD "Use fewer compilation units to speed up compile time" FALSE)
 option(OPENMW_LTO_BUILD "Build OpenMW with Link-Time Optimization (Needs ~2GB of RAM)" OFF)
 
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 6ed0bffa6b..59d3d15176 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -188,3 +188,23 @@ if(NOT OPENMW_USE_SYSTEM_RECASTNAVIGATION)
     )
     FetchContent_MakeAvailableExcludeFromAll(recastnavigation)
 endif()
+
+if (NOT OPENMW_USE_SYSTEM_SQLITE3)
+    include(FetchContent)
+    FetchContent_Declare(sqlite3
+        URL https://www.sqlite.org/2021/sqlite-amalgamation-3360000.zip
+        URL_HASH MD5=c5d360c74111bafae1b704721ff18fe6
+        SOURCE_DIR fetched/sqlite3
+    )
+    FetchContent_MakeAvailableExcludeFromAll(sqlite3)
+
+    add_library(sqlite3 STATIC ${sqlite3_SOURCE_DIR}/sqlite3.c)
+    target_include_directories(sqlite3 INTERFACE ${sqlite3_SOURCE_DIR}/)
+    if (UNIX)
+        target_link_libraries(sqlite3 ${CMAKE_DL_LIBS})
+    endif()
+    add_library(SQLite::SQLite3 ALIAS sqlite3)
+
+    set(SQLite3_INCLUDE_DIR ${sqlite3_SOURCE_DIR}/ PARENT_SCOPE)
+    set(SQLite3_LIBRARY sqlite3 PARENT_SCOPE)
+endif()

From 144862aa35333c3854bcf7bec135df71b9ab1984 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 29 Jun 2021 21:41:15 +0200
Subject: [PATCH 1464/2859] Define default actor half extents in settings

Player's half extents may change over time when wolfskin model is used for
example. Having it in settings is a more presistent approach.
---
 apps/openmw/mwworld/worldimp.cpp                | 5 +++--
 docs/source/reference/modding/settings/game.rst | 9 +++++++++
 files/settings-default.cfg                      | 3 +++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 4fd9235586..b9ef635263 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -135,7 +135,9 @@ namespace MWWorld
     : mResourceSystem(resourceSystem), mLocalScripts (mStore),
       mCells (mStore, mEsm), mSky (true),
       mGodMode(false), mScriptsEnabled(true), mDiscardMovements(true), mContentFiles (contentFiles),
-      mUserDataPath(userDataPath), mShouldUpdateNavigator(false),
+      mUserDataPath(userDataPath),
+      mDefaultHalfExtents(Settings::Manager::getVector3("default actor pathfind half extents", "Game")),
+      mShouldUpdateNavigator(false),
       mActivationDistanceOverride (activationDistanceOverride),
       mStartCell(startCell), mDistanceToFacedObject(-1.f), mTeleportEnabled(true),
       mLevitationEnabled(true), mGoToJail(false), mDaysInPrison(0),
@@ -2471,7 +2473,6 @@ namespace MWWorld
 
         applyLoopingParticles(player);
 
-        mDefaultHalfExtents = mPhysics->getOriginalHalfExtents(getPlayerPtr());
         mNavigator->addAgent(getPathfindingHalfExtents(getPlayerConstPtr()));
     }
 
diff --git a/docs/source/reference/modding/settings/game.rst b/docs/source/reference/modding/settings/game.rst
index 878485b3b3..fb7b537701 100644
--- a/docs/source/reference/modding/settings/game.rst
+++ b/docs/source/reference/modding/settings/game.rst
@@ -455,3 +455,12 @@ If disabled actors without the ability to swim will not follow other actors to t
     Has effect only when Navigator is enabled.
 
 This setting can be controlled in Advanced tab of the launcher.
+
+default actor pathfind half extents
+-----------------------------------
+
+:Type:		3D vector floating point
+:Range:		All components > 0
+:Default:	29.27999496459961 28.479997634887695 66.5
+
+Actor half extents used for exterior cells to generate navmesh.
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 5ed8109465..27a9544ea6 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -373,6 +373,9 @@ graphic herbalism = true
 # (true, false)
 allow actors to follow over water surface = true
 
+# Default size of actor for navmesh generation
+default actor pathfind half extents = 29.27999496459961 28.479997634887695 66.5
+
 [General]
 
 # Anisotropy reduces distortion in textures at low angles (e.g. 0 to 16).

From fec65acd18bf18293fb3cef339c1ff49fc12f309 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Mon, 11 Oct 2021 21:33:35 +0200
Subject: [PATCH 1465/2859] Move getters to header in order to allow inlining

---
 apps/openmw/mwworld/cellref.cpp | 105 --------------------------------
 apps/openmw/mwworld/cellref.hpp |  44 ++++++-------
 2 files changed, 22 insertions(+), 127 deletions(-)

diff --git a/apps/openmw/mwworld/cellref.cpp b/apps/openmw/mwworld/cellref.cpp
index 0b16964043..2f4702b1eb 100644
--- a/apps/openmw/mwworld/cellref.cpp
+++ b/apps/openmw/mwworld/cellref.cpp
@@ -8,11 +8,6 @@
 namespace MWWorld
 {
 
-    const ESM::RefNum& CellRef::getRefNum() const
-    {
-        return mCellRef.mRefNum;
-    }
-
     const ESM::RefNum& CellRef::getOrAssignRefNum(ESM::RefNum& lastAssignedRefNum)
     {
         if (!mCellRef.mRefNum.isSet())
@@ -33,41 +28,11 @@ namespace MWWorld
         return mCellRef.mRefNum;
     }
 
-    bool CellRef::hasContentFile() const
-    {
-        return mCellRef.mRefNum.hasContentFile();
-    }
-
     void CellRef::unsetRefNum()
     {
         mCellRef.mRefNum.unset();
     }
 
-    std::string CellRef::getRefId() const
-    {
-        return mCellRef.mRefID;
-    }
-
-    bool CellRef::getTeleport() const
-    {
-        return mCellRef.mTeleport;
-    }
-
-    ESM::Position CellRef::getDoorDest() const
-    {
-        return mCellRef.mDoorDest;
-    }
-
-    std::string CellRef::getDestCell() const
-    {
-        return mCellRef.mDestCell;
-    }
-
-    float CellRef::getScale() const
-    {
-        return mCellRef.mScale;
-    }
-
     void CellRef::setScale(float scale)
     {
         if (scale != mCellRef.mScale)
@@ -77,22 +42,12 @@ namespace MWWorld
         }
     }
 
-    ESM::Position CellRef::getPosition() const
-    {
-        return mCellRef.mPos;
-    }
-
     void CellRef::setPosition(const ESM::Position &position)
     {
         mChanged = true;
         mCellRef.mPos = position;
     }
 
-    float CellRef::getEnchantmentCharge() const
-    {
-        return mCellRef.mEnchantmentCharge;
-    }
-
     float CellRef::getNormalizedEnchantmentCharge(int maxCharge) const
     {
         if (maxCharge == 0)
@@ -118,11 +73,6 @@ namespace MWWorld
         }
     }
 
-    int CellRef::getCharge() const
-    {
-        return mCellRef.mChargeInt;
-    }
-
     void CellRef::setCharge(int charge)
     {
         if (charge != mCellRef.mChargeInt)
@@ -150,11 +100,6 @@ namespace MWWorld
         }
     }
 
-    float CellRef::getChargeFloat() const
-    {
-        return mCellRef.mChargeFloat;
-    }
-
     void CellRef::setChargeFloat(float charge)
     {
         if (charge != mCellRef.mChargeFloat)
@@ -164,16 +109,6 @@ namespace MWWorld
         }
     }
 
-    std::string CellRef::getOwner() const
-    {
-        return mCellRef.mOwner;
-    }
-
-    std::string CellRef::getGlobalVariable() const
-    {
-        return mCellRef.mGlobalVariable;
-    }
-
     void CellRef::resetGlobalVariable()
     {
         if (!mCellRef.mGlobalVariable.empty())
@@ -192,11 +127,6 @@ namespace MWWorld
         }
     }
 
-    int CellRef::getFactionRank() const
-    {
-        return mCellRef.mFactionRank;
-    }
-
     void CellRef::setOwner(const std::string &owner)
     {
         if (owner != mCellRef.mOwner)
@@ -206,11 +136,6 @@ namespace MWWorld
         }
     }
 
-    std::string CellRef::getSoul() const
-    {
-        return mCellRef.mSoul;
-    }
-
     void CellRef::setSoul(const std::string &soul)
     {
         if (soul != mCellRef.mSoul)
@@ -220,11 +145,6 @@ namespace MWWorld
         }
     }
 
-    std::string CellRef::getFaction() const
-    {
-        return mCellRef.mFaction;
-    }
-
     void CellRef::setFaction(const std::string &faction)
     {
         if (faction != mCellRef.mFaction)
@@ -234,11 +154,6 @@ namespace MWWorld
         }
     }
 
-    int CellRef::getLockLevel() const
-    {
-        return mCellRef.mLockLevel;
-    }
-
     void CellRef::setLockLevel(int lockLevel)
     {
         if (lockLevel != mCellRef.mLockLevel)
@@ -261,16 +176,6 @@ namespace MWWorld
         setLockLevel(-abs(mCellRef.mLockLevel)); //Makes lockLevel negative
     }
 
-    std::string CellRef::getKey() const
-    {
-        return mCellRef.mKey;
-    }
-
-    std::string CellRef::getTrap() const
-    {
-        return mCellRef.mTrap;
-    }
-
     void CellRef::setTrap(const std::string& trap)
     {
         if (trap != mCellRef.mTrap)
@@ -280,11 +185,6 @@ namespace MWWorld
         }
     }
 
-    int CellRef::getGoldValue() const
-    {
-        return mCellRef.mGoldValue;
-    }
-
     void CellRef::setGoldValue(int value)
     {
         if (value != mCellRef.mGoldValue)
@@ -299,9 +199,4 @@ namespace MWWorld
         state.mRef = mCellRef;
     }
 
-    bool CellRef::hasChanged() const
-    {
-        return mChanged;
-    }
-
 }
diff --git a/apps/openmw/mwworld/cellref.hpp b/apps/openmw/mwworld/cellref.hpp
index 78170a766f..b5e80930ed 100644
--- a/apps/openmw/mwworld/cellref.hpp
+++ b/apps/openmw/mwworld/cellref.hpp
@@ -23,7 +23,7 @@ namespace MWWorld
         }
 
         // Note: Currently unused for items in containers
-        const ESM::RefNum& getRefNum() const;
+        const ESM::RefNum& getRefNum() const { return mCellRef.mRefNum; }
 
         // Returns RefNum.
         // If RefNum is not set, assigns a generated one and changes the "lastAssignedRefNum" counter.
@@ -33,35 +33,35 @@ namespace MWWorld
         void unsetRefNum();
 
         /// Does the RefNum have a content file?
-        bool hasContentFile() const;
+        bool hasContentFile() const { return mCellRef.mRefNum.hasContentFile(); }
 
         // Id of object being referenced
-        std::string getRefId() const;
+        const std::string& getRefId() const { return mCellRef.mRefID; }
 
         // Reference to ID of the object being referenced
-        const std::string& getRefIdRef() const { return mCellRef.mRefID; }
+        const std::string& getRefIdRef() const { return mCellRef.mRefID; }  // TODO replace with getRefId
 
         // For doors - true if this door teleports to somewhere else, false
         // if it should open through animation.
-        bool getTeleport() const;
+        bool getTeleport() const { return mCellRef.mTeleport; }
 
         // Teleport location for the door, if this is a teleporting door.
-        ESM::Position getDoorDest() const;
+        const ESM::Position& getDoorDest() const { return mCellRef.mDoorDest; }
 
         // Destination cell for doors (optional)
-        std::string getDestCell() const;
+        const std::string& getDestCell() const { return mCellRef.mDestCell; }
 
         // Scale applied to mesh
-        float getScale() const;
+        float getScale() const { return mCellRef.mScale; }
         void setScale(float scale);
 
         // The *original* position and rotation as it was given in the Construction Set.
         // Current position and rotation of the object is stored in RefData.
-        ESM::Position getPosition() const;
+        const ESM::Position& getPosition() const { return mCellRef.mPos; }
         void setPosition (const ESM::Position& position);
 
         // Remaining enchantment charge. This could be -1 if the charge was not touched yet (i.e. full).
-        float getEnchantmentCharge() const;
+        float getEnchantmentCharge() const { return mCellRef.mEnchantmentCharge; }
 
         // Remaining enchantment charge rescaled to the supplied maximum charge (such as one of the enchantment).
         float getNormalizedEnchantmentCharge(int maxCharge) const;
@@ -71,57 +71,57 @@ namespace MWWorld
         // For weapon or armor, this is the remaining item health.
         // For tools (lockpicks, probes, repair hammer) it is the remaining uses.
         // If this returns int(-1) it means full health.
-        int getCharge() const;
-        float getChargeFloat() const; // Implemented as union with int charge
+        int getCharge() const { return mCellRef.mChargeInt; }
+        float getChargeFloat() const { return mCellRef.mChargeFloat; } // Implemented as union with int charge
         void setCharge(int charge);
         void setChargeFloat(float charge);
         void applyChargeRemainderToBeSubtracted(float chargeRemainder); // Stores remainders and applies if > 1
 
         // The NPC that owns this object (and will get angry if you steal it)
-        std::string getOwner() const;
+        const std::string& getOwner() const { return mCellRef.mOwner; }
         void setOwner(const std::string& owner);
 
         // Name of a global variable. If the global variable is set to '1', using the object is temporarily allowed
         // even if it has an Owner field.
         // Used by bed rent scripts to allow the player to use the bed for the duration of the rent.
-        std::string getGlobalVariable() const;
+        const std::string& getGlobalVariable() const { return mCellRef.mGlobalVariable; }
 
         void resetGlobalVariable();
 
         // ID of creature trapped in this soul gem
-        std::string getSoul() const;
+        const std::string& getSoul() const { return mCellRef.mSoul; }
         void setSoul(const std::string& soul);
 
         // The faction that owns this object (and will get angry if
         // you take it and are not a faction member)
-        std::string getFaction() const;
+        const std::string& getFaction() const { return mCellRef.mFaction; }
         void setFaction (const std::string& faction);
 
         // PC faction rank required to use the item. Sometimes is -1, which means "any rank".
         void setFactionRank(int factionRank);
-        int getFactionRank() const;
+        int getFactionRank() const { return mCellRef.mFactionRank; }
 
         // Lock level for doors and containers
         // Positive for a locked door. 0 for a door that was never locked.
         // For an unlocked door, it is set to -(previous locklevel)
-        int getLockLevel() const;
+        int getLockLevel() const { return mCellRef.mLockLevel; }
         void setLockLevel(int lockLevel);
         void lock(int lockLevel);
         void unlock();
          // Key and trap ID names, if any
-        std::string getKey() const;
-        std::string getTrap() const;
+        const std::string& getKey() const { return mCellRef.mKey; }
+        const std::string& getTrap() const { return mCellRef.mTrap; }
         void setTrap(const std::string& trap);
 
         // This is 5 for Gold_005 references, 100 for Gold_100 and so on.
-        int getGoldValue() const;
+        int getGoldValue() const { return mCellRef.mGoldValue; }
         void setGoldValue(int value);
 
         // Write the content of this CellRef into the given ObjectState
         void writeState (ESM::ObjectState& state) const;
 
         // Has this CellRef changed since it was originally loaded?
-        bool hasChanged() const;
+        bool hasChanged() const { return mChanged; }
 
     private:
         bool mChanged;

From ae4578f566b04f0786e1804c4ac0160a45effbcf Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 11 Oct 2021 21:46:15 +0200
Subject: [PATCH 1466/2859] Fix soul trapping for one shot kills

---
 apps/openmw/mwmechanics/combat.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/openmw/mwmechanics/combat.cpp b/apps/openmw/mwmechanics/combat.cpp
index 994b2b015a..7ae26c82b8 100644
--- a/apps/openmw/mwmechanics/combat.cpp
+++ b/apps/openmw/mwmechanics/combat.cpp
@@ -48,6 +48,8 @@ namespace MWMechanics
                 MWMechanics::CastSpell cast(attacker, victim, fromProjectile);
                 cast.mHitPosition = hitPosition;
                 cast.cast(object, false);
+                // Apply magic effects directly instead of waiting a frame to allow soul trap to work on one-hit kills
+                MWBase::Environment::get().getMechanicsManager()->updateMagicEffects(victim);
                 return true;
             }
         }

From c9279d413780096404f4785b99e6471c410c8e62 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sat, 9 Oct 2021 17:54:51 +0200
Subject: [PATCH 1467/2859] Add a simple HOWTO for the builtin tracing
 functionality.

---
 scripts/HOWTO-benchmark.md | 112 +++++++++++++++++++++++++++++++++++++
 1 file changed, 112 insertions(+)
 create mode 100644 scripts/HOWTO-benchmark.md

diff --git a/scripts/HOWTO-benchmark.md b/scripts/HOWTO-benchmark.md
new file mode 100644
index 0000000000..9641bfcd66
--- /dev/null
+++ b/scripts/HOWTO-benchmark.md
@@ -0,0 +1,112 @@
+OpenMW ships with its own benchmarking tool. This document describes how to collect performance data and vizualise it.
+
+Collecting data
+===============
+
+The data collected is the same as displayed by repeatedly pressing F3 and/or F4 while in the game (correspondance is shown below).
+We can select what should be collected by setting the `OPENMW_OSG_STATS_LIST` environment variables to a semi-colon separated list of metrics to collect. There can be any combination and order doesn't matter. Note that data collection can **significantly reduce** performance
+
+| Metric to collect | Equivalent in-game profiler                                       |
+|-------------------|-------------------------------------------------------------------|
+| `frame_rate`      | Frame rate                                                        |
+| `engine`          | OpenMW specifics metric (white bars)                              |
+| `event`           | Event traversal bar                                               |
+| `update`          | Update traversal bar                                              |
+| `rendering`       | Draw bar                                                          |
+| `gpu`             | GPU bar                                                           |
+| `times`           | Alias for `event;update;rendering;engine;gpu`, that is all graphs |
+| `cameraobjects`   | Table shown when pressing F3 3 times                              |
+| `viewerobjects`   | Table shown when pressing F3 4 times                              |
+| `resource`        | Table shown when pressing F4                                      |
+
+It is necessary to write the collected metrics to a file which needs to be defined by the `OPENMW_OSG_STATS_FILE` environment variable.
+
+Example
+-------
+
+Posix shell
+```sh
+OPENMW_OSG_STATS_FILE=/tmp/stats OPENMW_OSG_STATS_LIST="resource;engine" /usr/local/bin/openmw
+```
+
+Windows PowerShell
+```powershell
+$env:OPENMW_OSG_STATS_FILE="c:\stats"
+$env:OPENMW_OSG_STATS_LIST="resource;engine"
+openmw
+```
+
+
+Analyzing results
+=================
+
+`scripts/osg_stats.py` is a python script that can perform statistical analysis and generate graphs from a trace. It doesn't need to be run on the same machine as the trace was taken.
+
+`osg_stats.py --help` list the available options.
+
+Examples
+--------
+
+### Print the available metrics in a given trace file
+
+`osg_stats.py --print_keys /tmp/stats`
+
+Sample output
+>>>
+gui_time_begin
+gui_time_end
+gui_time_taken
+input_time_begin
+input_time_end
+input_time_taken
+lua_time_begin
+lua_time_end
+lua_time_taken
+mechanics_time_begin
+mechanics_time_end
+mechanics_time_taken
+physics_time_begin
+physics_time_end
+physics_time_taken
+physicsworker_time_begin
+physicsworker_time_end
+physicsworker_time_taken
+script_time_begin
+script_time_end
+script_time_taken
+sound_time_begin
+sound_time_end
+sound_time_taken
+state_time_begin
+state_time_end
+state_time_taken
+world_time_begin
+world_time_end
+world_time_taken
+>>>
+
+### Print a table with statistics data for some metrics
+
+`osg_stats.py --stats physicsworker_time_taken --stats mechanics_time_taken --stats world_time_taken --stats physics_time_taken /tmp/stats`
+
+Sample output
+
+> | source     | key                      | number | min | max      | mean                   | median   | stdev                  | q95                  |
+> |------------|--------------------------|--------|-----|----------|------------------------|----------|------------------------|----------------------|
+> | /tmp/stats | physicsworker_time_taken | 56245  | 0.0 | 0.01526  | 0.0018826463330073784  | 7.7e-05  | 0.003210274653689913   | 0.009509799999999995 |
+> | /tmp/stats | mechanics_time_taken     | 56245  | 0.0 | 0.015808 | 0.0030202102942483776  | 0.002177 | 0.002565895193458489   | 0.008489799999999995 |
+> | /tmp/stats | world_time_taken         | 56245  | 0.0 | 0.003643 | 5.230777846919726e-05  | 5.1e-05  | 1.7322475294417906e-05 | 6.6e-05              |
+> | /tmp/stats | physics_time_taken       | 56245  | 0.0 | 0.004407 | 0.00019985403146946396 | 0.000129 | 0.0002106166003676915  | 0.000697             |
+
+
+### Plot a timeserie of aforementioned metrics, ignoring first 1000 frames
+
+`osg_stats.py --begin_frame 1000 --end_frame 1200 --timeseries physicsworker_time_taken --timeseries mechanics_time_taken --timeseries world_time_taken --timeseries physics_time_taken /tmp/stats`
+
+### Plot time spent in physics and mechanics depending on number of actors in the scene
+
+`osg_stats.py --plot 'Physics Actors' physicsworker_time_taken mean --plot 'Physics Actors' mechanics_time_taken mean --plot 'Physics Actors' physics_time_taken mean /tmp/stats`
+
+### Plot timeserie from 2 traces
+
+`osg_stats.py --timeseries 'Frame Duration' /tmp/shadowson /tmp/shadowsoff`

From 405e81419073218c81664a6bfb5d5cab22775f65 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 28 Jun 2021 23:35:34 +0200
Subject: [PATCH 1468/2859] Move btCollisionObject creation for
 MWPhysics::Object into components

---
 apps/openmw/mwphysics/object.cpp             | 19 +++++++--------
 apps/openmw/mwworld/scene.cpp                | 15 ++----------
 components/bullethelpers/collisionobject.hpp | 24 +++++++++++++++++++
 components/misc/convert.hpp                  | 25 ++++++++++++++++++++
 4 files changed, 59 insertions(+), 24 deletions(-)
 create mode 100644 components/bullethelpers/collisionobject.hpp

diff --git a/apps/openmw/mwphysics/object.cpp b/apps/openmw/mwphysics/object.cpp
index a95672f8cf..879c12124e 100644
--- a/apps/openmw/mwphysics/object.cpp
+++ b/apps/openmw/mwphysics/object.cpp
@@ -6,6 +6,7 @@
 #include <components/resource/bulletshape.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/misc/convert.hpp>
+#include <components/bullethelpers/collisionobject.hpp>
 
 #include <BulletCollision/CollisionShapes/btCompoundShape.h>
 #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
@@ -15,22 +16,18 @@
 namespace MWPhysics
 {
     Object::Object(const MWWorld::Ptr& ptr, osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance, osg::Quat rotation, int collisionType, PhysicsTaskScheduler* scheduler)
-        : mShapeInstance(shapeInstance)
+        : mShapeInstance(std::move(shapeInstance))
         , mSolid(true)
+        , mScale(ptr.getCellRef().getScale(), ptr.getCellRef().getScale(), ptr.getCellRef().getScale())
+        , mPosition(ptr.getRefData().getPosition().asVec3())
+        , mRotation(rotation)
         , mTaskScheduler(scheduler)
     {
         mPtr = ptr;
-
-        mCollisionObject = std::make_unique<btCollisionObject>();
-        mCollisionObject->setCollisionShape(shapeInstance->getCollisionShape());
-
+        mCollisionObject = BulletHelpers::makeCollisionObject(mShapeInstance->getCollisionShape(),
+            Misc::Convert::toBullet(mPosition), Misc::Convert::toBullet(rotation));
         mCollisionObject->setUserPointer(this);
-
-        setScale(ptr.getCellRef().getScale());
-        setRotation(rotation);
-        updatePosition();
-        commitPositionChange();
-
+        mShapeInstance->setLocalScaling(mScale);
         mTaskScheduler->addCollisionObject(mCollisionObject.get(), collisionType, CollisionType_Actor|CollisionType_HeightMap|CollisionType_Projectile);
     }
 
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index ed68a46059..bb0f7437bd 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -65,23 +65,12 @@ namespace
                 * osg::Quat(zr, osg::Vec3(0, 0, -1));
     }
 
-    osg::Quat makeObjectOsgQuat(const ESM::Position& position)
-    {
-        const float xr = position.rot[0];
-        const float yr = position.rot[1];
-        const float zr = position.rot[2];
-
-        return osg::Quat(zr, osg::Vec3(0, 0, -1))
-            * osg::Quat(yr, osg::Vec3(0, -1, 0))
-            * osg::Quat(xr, osg::Vec3(-1, 0, 0));
-    }
-
     osg::Quat makeNodeRotation(const MWWorld::Ptr& ptr, RotationOrder order)
     {
         const auto pos = ptr.getRefData().getPosition();
 
         const auto rot = ptr.getClass().isActor() ? makeActorOsgQuat(pos)
-            : (order == RotationOrder::inverse ? makeInversedOrderObjectOsgQuat(pos) : makeObjectOsgQuat(pos));
+            : (order == RotationOrder::inverse ? makeInversedOrderObjectOsgQuat(pos) : Misc::Convert::makeOsgQuat(pos));
 
         return rot;
     }
@@ -155,7 +144,7 @@ namespace
 
                 const auto transform = object->getTransform();
                 const btTransform closedDoorTransform(
-                    Misc::Convert::toBullet(makeObjectOsgQuat(ptr.getCellRef().getPosition())),
+                    Misc::Convert::makeBulletQuaternion(ptr.getCellRef().getPosition()),
                     transform.getOrigin()
                 );
 
diff --git a/components/bullethelpers/collisionobject.hpp b/components/bullethelpers/collisionobject.hpp
new file mode 100644
index 0000000000..0951c2af38
--- /dev/null
+++ b/components/bullethelpers/collisionobject.hpp
@@ -0,0 +1,24 @@
+#ifndef OPENMW_COMPONENTS_BULLETHELPERS_COLLISIONOBJECT_H
+#define OPENMW_COMPONENTS_BULLETHELPERS_COLLISIONOBJECT_H
+
+#include <components/misc/convert.hpp>
+
+#include <BulletCollision/CollisionDispatch/btCollisionObject.h>
+#include <LinearMath/btQuaternion.h>
+#include <LinearMath/btTransform.h>
+
+#include <memory>
+
+namespace BulletHelpers
+{
+    inline std::unique_ptr<btCollisionObject> makeCollisionObject(btCollisionShape* shape,
+        const btVector3& position, const btQuaternion& rotation)
+    {
+        std::unique_ptr<btCollisionObject> result = std::make_unique<btCollisionObject>();
+        result->setCollisionShape(shape);
+        result->setWorldTransform(btTransform(rotation, position));
+        return result;
+    }
+}
+
+#endif
diff --git a/components/misc/convert.hpp b/components/misc/convert.hpp
index c5784d33ae..81270c0c0b 100644
--- a/components/misc/convert.hpp
+++ b/components/misc/convert.hpp
@@ -1,6 +1,7 @@
 #ifndef OPENMW_COMPONENTS_MISC_CONVERT_H
 #define OPENMW_COMPONENTS_MISC_CONVERT_H
 
+#include <components/esm/defs.hpp>
 #include <components/esm/loadpgrd.hpp>
 
 #include <LinearMath/btTransform.h>
@@ -47,6 +48,30 @@ namespace Convert
     {
         return osg::Quat(quat.x(), quat.y(), quat.z(), quat.w());
     }
+
+    inline osg::Quat makeOsgQuat(const float (&rotation)[3])
+    {
+        return osg::Quat(rotation[2], osg::Vec3f(0, 0, -1))
+            * osg::Quat(rotation[1], osg::Vec3f(0, -1, 0))
+            * osg::Quat(rotation[0], osg::Vec3f(-1, 0, 0));
+    }
+
+    inline osg::Quat makeOsgQuat(const ESM::Position& position)
+    {
+        return makeOsgQuat(position.rot);
+    }
+
+    inline btQuaternion makeBulletQuaternion(const float (&rotation)[3])
+    {
+        return btQuaternion(btVector3(0, 0, -1), rotation[2])
+            * btQuaternion(btVector3(0, -1, 0), rotation[1])
+            * btQuaternion(btVector3(-1, 0, 0), rotation[0]);
+    }
+
+    inline btQuaternion makeBulletQuaternion(const ESM::Position& position)
+    {
+        return makeBulletQuaternion(position.rot);
+    }
 }
 }
 

From a8acc19988e3cb9095669e15846cf276f6fd9d69 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Tue, 12 Oct 2021 00:18:23 +0200
Subject: [PATCH 1469/2859] Avoid copying std::string in
 MWWorld::Ptr::getTypeDescription()

---
 apps/opencs/model/tools/topicinfocheck.cpp |  4 ++--
 apps/openmw/mwworld/containerstore.cpp     |  4 ++--
 apps/openmw/mwworld/livecellref.hpp        |  4 ++--
 apps/openmw/mwworld/ptr.hpp                |  4 ++--
 apps/openmw/mwworld/store.cpp              | 10 ++++++----
 components/esm/loadacti.hpp                |  2 +-
 components/esm/loadalch.hpp                |  2 +-
 components/esm/loadappa.hpp                |  2 +-
 components/esm/loadarmo.hpp                |  2 +-
 components/esm/loadbody.hpp                |  2 +-
 components/esm/loadbook.hpp                |  2 +-
 components/esm/loadbsgn.hpp                |  2 +-
 components/esm/loadcell.hpp                |  2 +-
 components/esm/loadclas.hpp                |  2 +-
 components/esm/loadclot.hpp                |  2 +-
 components/esm/loadcont.hpp                |  2 +-
 components/esm/loadcrea.hpp                |  2 +-
 components/esm/loaddial.hpp                |  2 +-
 components/esm/loaddoor.hpp                |  2 +-
 components/esm/loadench.hpp                |  2 +-
 components/esm/loadfact.hpp                |  2 +-
 components/esm/loadglob.hpp                |  2 +-
 components/esm/loadgmst.hpp                |  2 +-
 components/esm/loadinfo.hpp                |  2 +-
 components/esm/loadingr.hpp                |  2 +-
 components/esm/loadland.hpp                |  2 +-
 components/esm/loadlevlist.hpp             |  4 ++--
 components/esm/loadligh.hpp                |  2 +-
 components/esm/loadlock.hpp                |  2 +-
 components/esm/loadltex.hpp                |  2 +-
 components/esm/loadmgef.hpp                |  2 +-
 components/esm/loadmisc.hpp                |  2 +-
 components/esm/loadnpc.hpp                 |  2 +-
 components/esm/loadpgrd.hpp                |  2 +-
 components/esm/loadprob.hpp                |  2 +-
 components/esm/loadrace.hpp                |  2 +-
 components/esm/loadregn.hpp                |  2 +-
 components/esm/loadrepa.hpp                |  2 +-
 components/esm/loadscpt.hpp                |  2 +-
 components/esm/loadskil.hpp                |  2 +-
 components/esm/loadsndg.hpp                |  2 +-
 components/esm/loadsoun.hpp                |  2 +-
 components/esm/loadspel.hpp                |  2 +-
 components/esm/loadsscr.hpp                |  2 +-
 components/esm/loadstat.hpp                |  2 +-
 components/esm/loadweap.hpp                |  2 +-
 46 files changed, 56 insertions(+), 54 deletions(-)

diff --git a/apps/opencs/model/tools/topicinfocheck.cpp b/apps/opencs/model/tools/topicinfocheck.cpp
index fe9bc991d4..74643a46ee 100644
--- a/apps/opencs/model/tools/topicinfocheck.cpp
+++ b/apps/opencs/model/tools/topicinfocheck.cpp
@@ -395,12 +395,12 @@ bool CSMTools::TopicInfoCheckStage::verifyId(const std::string& name, const CSMW
 
     if (index == -1)
     {
-        messages.add(id, T::getRecordType() + " '" + name + "' does not exist", "", CSMDoc::Message::Severity_Error);
+        messages.add(id, std::string(T::getRecordType()) + " '" + name + "' does not exist", "", CSMDoc::Message::Severity_Error);
         return false;
     }
     else if (collection.getRecord(index).isDeleted())
     {
-        messages.add(id, "Deleted " + T::getRecordType() + " record '" + name + "' is being referenced", "", CSMDoc::Message::Severity_Error);
+        messages.add(id, "Deleted " + std::string(T::getRecordType()) + " record '" + name + "' is being referenced", "", CSMDoc::Message::Severity_Error);
         return false;
     }
 
diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index 58f215932e..112f56abfc 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -728,8 +728,8 @@ int MWWorld::ContainerStore::getType (const ConstPtr& ptr)
     if (ptr.getType()==ESM::Weapon::sRecordId)
         return Type_Weapon;
 
-    throw std::runtime_error (
-        "Object '" + ptr.getCellRef().getRefId() + "' of type " + ptr.getTypeDescription() + " can not be placed into a container");
+    throw std::runtime_error("Object '" + ptr.getCellRef().getRefId() + "' of type " +
+                             std::string(ptr.getTypeDescription()) + " can not be placed into a container");
 }
 
 MWWorld::Ptr MWWorld::ContainerStore::findReplacement(const std::string& id)
diff --git a/apps/openmw/mwworld/livecellref.hpp b/apps/openmw/mwworld/livecellref.hpp
index af0f84dc8d..48e237bce4 100644
--- a/apps/openmw/mwworld/livecellref.hpp
+++ b/apps/openmw/mwworld/livecellref.hpp
@@ -41,7 +41,7 @@ namespace MWWorld
         virtual void save (ESM::ObjectState& state) const = 0;
         ///< Save LiveCellRef state into \a state.
 
-        virtual std::string getTypeDescription() const { return ""; }
+        virtual std::string_view getTypeDescription() const = 0;
 
         protected:
 
@@ -95,7 +95,7 @@ namespace MWWorld
         void save (ESM::ObjectState& state) const override;
         ///< Save LiveCellRef state into \a state.
 
-        std::string getTypeDescription() const override { return X::getRecordType(); }
+        std::string_view getTypeDescription() const override { return X::getRecordType(); }
 
         static bool checkState (const ESM::ObjectState& state);
         ///< Check if state is valid and report errors.
diff --git a/apps/openmw/mwworld/ptr.hpp b/apps/openmw/mwworld/ptr.hpp
index 6813b7d124..611eeefe16 100644
--- a/apps/openmw/mwworld/ptr.hpp
+++ b/apps/openmw/mwworld/ptr.hpp
@@ -37,7 +37,7 @@ namespace MWWorld
 
             unsigned int getType() const;
 
-            std::string getTypeDescription() const
+            std::string_view getTypeDescription() const
             {
                 return mRef ? mRef->getTypeDescription() : "nullptr";
             }
@@ -118,7 +118,7 @@ namespace MWWorld
 
         unsigned int getType() const;
 
-        std::string getTypeDescription() const
+        std::string_view getTypeDescription() const
         {
             return mRef ? mRef->getTypeDescription() : "nullptr";
         }
diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index 718cebd790..963e3b78cd 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -64,8 +64,9 @@ namespace MWWorld
         const T *ptr = search(index);
         if (ptr == nullptr)
         {
-            const std::string msg = T::getRecordType() + " with index " + std::to_string(index) + " not found";
-            throw std::runtime_error(msg);
+            std::stringstream msg;
+            msg << T::getRecordType() << " with index " << index << " not found";
+            throw std::runtime_error(msg.str());
         }
         return ptr;
     }
@@ -145,8 +146,9 @@ namespace MWWorld
         const T *ptr = search(id);
         if (ptr == nullptr)
         {
-            const std::string msg = T::getRecordType() + " '" + id + "' not found";
-            throw std::runtime_error(msg);
+            std::stringstream msg;
+            msg << T::getRecordType() << " '" << id << "' not found";
+            throw std::runtime_error(msg.str());
         }
         return ptr;
     }
diff --git a/components/esm/loadacti.hpp b/components/esm/loadacti.hpp
index 5b88ad379f..c0cf274ed9 100644
--- a/components/esm/loadacti.hpp
+++ b/components/esm/loadacti.hpp
@@ -13,7 +13,7 @@ struct Activator
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Activator"; }
+    static std::string_view getRecordType() { return "Activator"; }
 
     unsigned int mRecordFlags;
     std::string mId, mName, mScript, mModel;
diff --git a/components/esm/loadalch.hpp b/components/esm/loadalch.hpp
index d573531134..e032464abe 100644
--- a/components/esm/loadalch.hpp
+++ b/components/esm/loadalch.hpp
@@ -20,7 +20,7 @@ struct Potion
     static unsigned int sRecordId;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Potion"; }
+    static std::string_view getRecordType() { return "Potion"; }
 
     struct ALDTstruct
     {
diff --git a/components/esm/loadappa.hpp b/components/esm/loadappa.hpp
index fcd9100be4..026a471f5b 100644
--- a/components/esm/loadappa.hpp
+++ b/components/esm/loadappa.hpp
@@ -17,7 +17,7 @@ struct Apparatus
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Apparatus"; }
+    static std::string_view getRecordType() { return "Apparatus"; }
 
     enum AppaType
     {
diff --git a/components/esm/loadarmo.hpp b/components/esm/loadarmo.hpp
index 195230fbf2..f11e3509d5 100644
--- a/components/esm/loadarmo.hpp
+++ b/components/esm/loadarmo.hpp
@@ -67,7 +67,7 @@ struct Armor
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Armor"; }
+    static std::string_view getRecordType() { return "Armor"; }
 
     enum Type
     {
diff --git a/components/esm/loadbody.hpp b/components/esm/loadbody.hpp
index 1be775ffec..145fe4b6f6 100644
--- a/components/esm/loadbody.hpp
+++ b/components/esm/loadbody.hpp
@@ -13,7 +13,7 @@ struct BodyPart
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "BodyPart"; }
+    static std::string_view getRecordType() { return "BodyPart"; }
 
     enum MeshPart
     {
diff --git a/components/esm/loadbook.hpp b/components/esm/loadbook.hpp
index 60b03f7a36..e46bec6272 100644
--- a/components/esm/loadbook.hpp
+++ b/components/esm/loadbook.hpp
@@ -16,7 +16,7 @@ struct Book
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Book"; }
+    static std::string_view getRecordType() { return "Book"; }
 
     struct BKDTstruct
     {
diff --git a/components/esm/loadbsgn.hpp b/components/esm/loadbsgn.hpp
index 806323bf35..a199503a76 100644
--- a/components/esm/loadbsgn.hpp
+++ b/components/esm/loadbsgn.hpp
@@ -15,7 +15,7 @@ struct BirthSign
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "BirthSign"; }
+    static std::string_view getRecordType() { return "BirthSign"; }
 
     unsigned int mRecordFlags;
     std::string mId, mName, mDescription, mTexture;
diff --git a/components/esm/loadcell.hpp b/components/esm/loadcell.hpp
index 18e929e13b..c2a694b744 100644
--- a/components/esm/loadcell.hpp
+++ b/components/esm/loadcell.hpp
@@ -65,7 +65,7 @@ struct Cell
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Cell"; }
+    static std::string_view getRecordType() { return "Cell"; }
 
   enum Flags
     {
diff --git a/components/esm/loadclas.hpp b/components/esm/loadclas.hpp
index 1000879c4c..e1e8b2ff0f 100644
--- a/components/esm/loadclas.hpp
+++ b/components/esm/loadclas.hpp
@@ -19,7 +19,7 @@ struct Class
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Class"; }
+    static std::string_view getRecordType() { return "Class"; }
 
     enum AutoCalc
     {
diff --git a/components/esm/loadclot.hpp b/components/esm/loadclot.hpp
index bbc8449a95..26e82254ab 100644
--- a/components/esm/loadclot.hpp
+++ b/components/esm/loadclot.hpp
@@ -19,7 +19,7 @@ struct Clothing
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Clothing"; }
+    static std::string_view getRecordType() { return "Clothing"; }
 
     enum Type
     {
diff --git a/components/esm/loadcont.hpp b/components/esm/loadcont.hpp
index ade9004214..eac791e3f3 100644
--- a/components/esm/loadcont.hpp
+++ b/components/esm/loadcont.hpp
@@ -37,7 +37,7 @@ struct Container
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Container"; }
+    static std::string_view getRecordType() { return "Container"; }
 
     enum Flags
     {
diff --git a/components/esm/loadcrea.hpp b/components/esm/loadcrea.hpp
index f6b188d96e..9d664d440e 100644
--- a/components/esm/loadcrea.hpp
+++ b/components/esm/loadcrea.hpp
@@ -23,7 +23,7 @@ struct Creature
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Creature"; }
+    static std::string_view getRecordType() { return "Creature"; }
 
     // Default is 0x48?
     enum Flags
diff --git a/components/esm/loaddial.hpp b/components/esm/loaddial.hpp
index b80cbd74c3..7adc8b1cf8 100644
--- a/components/esm/loaddial.hpp
+++ b/components/esm/loaddial.hpp
@@ -22,7 +22,7 @@ struct Dialogue
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Dialogue"; }
+    static std::string_view getRecordType() { return "Dialogue"; }
 
     enum Type
     {
diff --git a/components/esm/loaddoor.hpp b/components/esm/loaddoor.hpp
index 167eda20f5..84dbcbfa56 100644
--- a/components/esm/loaddoor.hpp
+++ b/components/esm/loaddoor.hpp
@@ -13,7 +13,7 @@ struct Door
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Door"; }
+    static std::string_view getRecordType() { return "Door"; }
 
     unsigned int mRecordFlags;
     std::string mId, mName, mModel, mScript, mOpenSound, mCloseSound;
diff --git a/components/esm/loadench.hpp b/components/esm/loadench.hpp
index a4e1e8362c..3f094f754c 100644
--- a/components/esm/loadench.hpp
+++ b/components/esm/loadench.hpp
@@ -19,7 +19,7 @@ struct Enchantment
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Enchantment"; }
+    static std::string_view getRecordType() { return "Enchantment"; }
 
     enum Type
     {
diff --git a/components/esm/loadfact.hpp b/components/esm/loadfact.hpp
index 6a42377901..da01c004e9 100644
--- a/components/esm/loadfact.hpp
+++ b/components/esm/loadfact.hpp
@@ -32,7 +32,7 @@ struct Faction
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Faction"; }
+    static std::string_view getRecordType() { return "Faction"; }
 
     unsigned int mRecordFlags;
     std::string mId, mName;
diff --git a/components/esm/loadglob.hpp b/components/esm/loadglob.hpp
index 9dd58e6c67..7fcbe4b8e6 100644
--- a/components/esm/loadglob.hpp
+++ b/components/esm/loadglob.hpp
@@ -19,7 +19,7 @@ struct Global
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Global"; }
+    static std::string_view getRecordType() { return "Global"; }
 
     unsigned int mRecordFlags;
     std::string mId;
diff --git a/components/esm/loadgmst.hpp b/components/esm/loadgmst.hpp
index 931ee286a4..a3981736f1 100644
--- a/components/esm/loadgmst.hpp
+++ b/components/esm/loadgmst.hpp
@@ -20,7 +20,7 @@ struct GameSetting
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "GameSetting"; }
+    static std::string_view getRecordType() { return "GameSetting"; }
 
     unsigned int mRecordFlags;
     std::string mId;
diff --git a/components/esm/loadinfo.hpp b/components/esm/loadinfo.hpp
index 2fbc782ec9..d68301c91b 100644
--- a/components/esm/loadinfo.hpp
+++ b/components/esm/loadinfo.hpp
@@ -22,7 +22,7 @@ struct DialInfo
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "DialInfo"; }
+    static std::string_view getRecordType() { return "DialInfo"; }
 
     enum Gender
     {
diff --git a/components/esm/loadingr.hpp b/components/esm/loadingr.hpp
index 34e05da2c1..2ee572123d 100644
--- a/components/esm/loadingr.hpp
+++ b/components/esm/loadingr.hpp
@@ -17,7 +17,7 @@ struct Ingredient
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Ingredient"; }
+    static std::string_view getRecordType() { return "Ingredient"; }
 
     struct IRDTstruct
     {
diff --git a/components/esm/loadland.hpp b/components/esm/loadland.hpp
index 9cba41b160..67dd2e76a2 100644
--- a/components/esm/loadland.hpp
+++ b/components/esm/loadland.hpp
@@ -21,7 +21,7 @@ struct Land
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Land"; }
+    static std::string_view getRecordType() { return "Land"; }
 
     Land();
     ~Land();
diff --git a/components/esm/loadlevlist.hpp b/components/esm/loadlevlist.hpp
index d3451b70ae..0ebd7a64cb 100644
--- a/components/esm/loadlevlist.hpp
+++ b/components/esm/loadlevlist.hpp
@@ -48,7 +48,7 @@ struct CreatureLevList: LevelledListBase
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "CreatureLevList"; }
+    static std::string_view getRecordType() { return "CreatureLevList"; }
 
     enum Flags
     {
@@ -68,7 +68,7 @@ struct ItemLevList: LevelledListBase
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "ItemLevList"; }
+    static std::string_view getRecordType() { return "ItemLevList"; }
 
     enum Flags
     {
diff --git a/components/esm/loadligh.hpp b/components/esm/loadligh.hpp
index 901fe6ec85..9bd608e4d9 100644
--- a/components/esm/loadligh.hpp
+++ b/components/esm/loadligh.hpp
@@ -18,7 +18,7 @@ struct Light
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Light"; }
+    static std::string_view getRecordType() { return "Light"; }
 
     enum Flags
     {
diff --git a/components/esm/loadlock.hpp b/components/esm/loadlock.hpp
index 9cd40c0d4f..4f8a3575fc 100644
--- a/components/esm/loadlock.hpp
+++ b/components/esm/loadlock.hpp
@@ -13,7 +13,7 @@ struct Lockpick
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Lockpick"; }
+    static std::string_view getRecordType() { return "Lockpick"; }
 
     struct Data
     {
diff --git a/components/esm/loadltex.hpp b/components/esm/loadltex.hpp
index e3e2582462..b2e937c01a 100644
--- a/components/esm/loadltex.hpp
+++ b/components/esm/loadltex.hpp
@@ -20,7 +20,7 @@ struct LandTexture
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "LandTexture"; }
+    static std::string_view getRecordType() { return "LandTexture"; }
 
     // mId is merely a user friendly name for the texture in the editor.
     std::string mId, mTexture;
diff --git a/components/esm/loadmgef.hpp b/components/esm/loadmgef.hpp
index 480478d81e..00cadf99c0 100644
--- a/components/esm/loadmgef.hpp
+++ b/components/esm/loadmgef.hpp
@@ -14,7 +14,7 @@ struct MagicEffect
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "MagicEffect"; }
+    static std::string_view getRecordType() { return "MagicEffect"; }
 
     unsigned int mRecordFlags;
     std::string mId;
diff --git a/components/esm/loadmisc.hpp b/components/esm/loadmisc.hpp
index 72aaa5de3b..a0f46349a8 100644
--- a/components/esm/loadmisc.hpp
+++ b/components/esm/loadmisc.hpp
@@ -18,7 +18,7 @@ struct Miscellaneous
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Miscellaneous"; }
+    static std::string_view getRecordType() { return "Miscellaneous"; }
 
     struct MCDTstruct
     {
diff --git a/components/esm/loadnpc.hpp b/components/esm/loadnpc.hpp
index ba9f415760..f0354cb603 100644
--- a/components/esm/loadnpc.hpp
+++ b/components/esm/loadnpc.hpp
@@ -24,7 +24,7 @@ struct NPC
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "NPC"; }
+    static std::string_view getRecordType() { return "NPC"; }
 
   // Services
   enum Services
diff --git a/components/esm/loadpgrd.hpp b/components/esm/loadpgrd.hpp
index 4e74c9a24d..02ce231fe3 100644
--- a/components/esm/loadpgrd.hpp
+++ b/components/esm/loadpgrd.hpp
@@ -17,7 +17,7 @@ struct Pathgrid
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Pathgrid"; }
+    static std::string_view getRecordType() { return "Pathgrid"; }
 
     struct DATAstruct
     {
diff --git a/components/esm/loadprob.hpp b/components/esm/loadprob.hpp
index 930e31a971..583aa24523 100644
--- a/components/esm/loadprob.hpp
+++ b/components/esm/loadprob.hpp
@@ -13,7 +13,7 @@ struct Probe
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Probe"; }
+    static std::string_view getRecordType() { return "Probe"; }
 
     struct Data
     {
diff --git a/components/esm/loadrace.hpp b/components/esm/loadrace.hpp
index 50fa73ad74..ba42261e73 100644
--- a/components/esm/loadrace.hpp
+++ b/components/esm/loadrace.hpp
@@ -19,7 +19,7 @@ struct Race
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Race"; }
+    static std::string_view getRecordType() { return "Race"; }
 
     struct SkillBonus
     {
diff --git a/components/esm/loadregn.hpp b/components/esm/loadregn.hpp
index 74f6b123ec..64991c9b3a 100644
--- a/components/esm/loadregn.hpp
+++ b/components/esm/loadregn.hpp
@@ -20,7 +20,7 @@ struct Region
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Region"; }
+    static std::string_view getRecordType() { return "Region"; }
 
 #pragma pack(push)
 #pragma pack(1)
diff --git a/components/esm/loadrepa.hpp b/components/esm/loadrepa.hpp
index 312c87b7b4..c3b2a076af 100644
--- a/components/esm/loadrepa.hpp
+++ b/components/esm/loadrepa.hpp
@@ -13,7 +13,7 @@ struct Repair
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Repair"; }
+    static std::string_view getRecordType() { return "Repair"; }
 
     struct Data
     {
diff --git a/components/esm/loadscpt.hpp b/components/esm/loadscpt.hpp
index d518a048ff..f737698184 100644
--- a/components/esm/loadscpt.hpp
+++ b/components/esm/loadscpt.hpp
@@ -21,7 +21,7 @@ class Script
 public:
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Script"; }
+    static std::string_view getRecordType() { return "Script"; }
 
     struct SCHDstruct
     {
diff --git a/components/esm/loadskil.hpp b/components/esm/loadskil.hpp
index ae44a51045..404ef06692 100644
--- a/components/esm/loadskil.hpp
+++ b/components/esm/loadskil.hpp
@@ -20,7 +20,7 @@ struct Skill
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Skill"; }
+    static std::string_view getRecordType() { return "Skill"; }
 
     unsigned int mRecordFlags;
     std::string mId;
diff --git a/components/esm/loadsndg.hpp b/components/esm/loadsndg.hpp
index 99aae06e0e..565a29b156 100644
--- a/components/esm/loadsndg.hpp
+++ b/components/esm/loadsndg.hpp
@@ -17,7 +17,7 @@ struct SoundGenerator
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "SoundGenerator"; }
+    static std::string_view getRecordType() { return "SoundGenerator"; }
 
     enum Type
     {
diff --git a/components/esm/loadsoun.hpp b/components/esm/loadsoun.hpp
index 14f1178650..4149a34b7d 100644
--- a/components/esm/loadsoun.hpp
+++ b/components/esm/loadsoun.hpp
@@ -18,7 +18,7 @@ struct Sound
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Sound"; }
+    static std::string_view getRecordType() { return "Sound"; }
 
     SOUNstruct mData;
     unsigned int mRecordFlags;
diff --git a/components/esm/loadspel.hpp b/components/esm/loadspel.hpp
index ef74c2c312..6a2d02d286 100644
--- a/components/esm/loadspel.hpp
+++ b/components/esm/loadspel.hpp
@@ -15,7 +15,7 @@ struct Spell
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Spell"; }
+    static std::string_view getRecordType() { return "Spell"; }
 
     enum SpellType
     {
diff --git a/components/esm/loadsscr.hpp b/components/esm/loadsscr.hpp
index 3e84027076..277c4eb731 100644
--- a/components/esm/loadsscr.hpp
+++ b/components/esm/loadsscr.hpp
@@ -21,7 +21,7 @@ struct StartScript
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "StartScript"; }
+    static std::string_view getRecordType() { return "StartScript"; }
 
     std::string mData;
     unsigned int mRecordFlags;
diff --git a/components/esm/loadstat.hpp b/components/esm/loadstat.hpp
index 038fb9f52b..26d8fda3a8 100644
--- a/components/esm/loadstat.hpp
+++ b/components/esm/loadstat.hpp
@@ -24,7 +24,7 @@ struct Static
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Static"; }
+    static std::string_view getRecordType() { return "Static"; }
 
     unsigned int mRecordFlags;
     std::string mId, mModel;
diff --git a/components/esm/loadweap.hpp b/components/esm/loadweap.hpp
index 8d1591854b..98ba57b8b8 100644
--- a/components/esm/loadweap.hpp
+++ b/components/esm/loadweap.hpp
@@ -19,7 +19,7 @@ struct Weapon
 {
     static unsigned int sRecordId;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
-    static std::string getRecordType() { return "Weapon"; }
+    static std::string_view getRecordType() { return "Weapon"; }
 
     enum Type
     {

From b0132be53fcdb93da7f0b1e37b20e9931dd5801a Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Tue, 12 Oct 2021 11:47:42 +0000
Subject: [PATCH 1470/2859] do not dirty unchanged arrays (#3164)

This PR proposes a simple change to `RigGeometry` `dirtyGLObjects` logic.

1. We will avoid dirtying unmodified arrays.
2. We can drop an osg version guard since `Drawable::dirtyGLObjects` is not nearly as harmful as `Geometry::dirtyGLObjects`.
3. We will avoid crashes in an as yet unfinished future PR concerning `Array` sharing improvements.
---
 components/sceneutil/morphgeometry.cpp | 6 +-----
 components/sceneutil/riggeometry.cpp   | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/components/sceneutil/morphgeometry.cpp b/components/sceneutil/morphgeometry.cpp
index 04fd6fb365..355403b066 100644
--- a/components/sceneutil/morphgeometry.cpp
+++ b/components/sceneutil/morphgeometry.cpp
@@ -2,8 +2,6 @@
 
 #include <cassert>
 
-#include <osg/Version>
-
 namespace SceneUtil
 {
 
@@ -178,9 +176,7 @@ void MorphGeometry::cull(osg::NodeVisitor *nv)
 
     positionDst->dirty();
 
-#if OSG_MIN_VERSION_REQUIRED(3, 5, 6)
-    geom.dirtyGLObjects();
-#endif
+    geom.osg::Drawable::dirtyGLObjects();
 
     nv->pushOntoNodePath(&geom);
     nv->apply(geom);
diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp
index 2c1efb9f36..2ca90d2c78 100644
--- a/components/sceneutil/riggeometry.cpp
+++ b/components/sceneutil/riggeometry.cpp
@@ -1,7 +1,5 @@
 #include "riggeometry.hpp"
 
-#include <osg/Version>
-
 #include <components/debug/debuglog.hpp>
 #include <osg/MatrixTransform>
 
@@ -249,9 +247,7 @@ void RigGeometry::cull(osg::NodeVisitor* nv)
     if (tangentDst)
         tangentDst->dirty();
 
-#if OSG_MIN_VERSION_REQUIRED(3, 5, 6)
-    geom.dirtyGLObjects();
-#endif
+    geom.osg::Drawable::dirtyGLObjects();
 
     nv->pushOntoNodePath(&geom);
     nv->apply(geom);

From 4e9d691715ccf40c73f396baba194a2438c1017c Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Tue, 12 Oct 2021 21:25:34 +0200
Subject: [PATCH 1471/2859] Add comment for MWWorld::Ptr::getType() because it
 is not obvious.

---
 apps/openmw/mwworld/ptr.hpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/openmw/mwworld/ptr.hpp b/apps/openmw/mwworld/ptr.hpp
index 6813b7d124..3474f0c79d 100644
--- a/apps/openmw/mwworld/ptr.hpp
+++ b/apps/openmw/mwworld/ptr.hpp
@@ -35,6 +35,11 @@ namespace MWWorld
                 return mRef == nullptr;
             }
 
+            // Returns a 32-bit id of the ESM record this object is based on.
+            // Specific values of ids are defined in ESM::RecNameInts.
+            // Note 1: ids are not sequential. E.g. for a creature `getType` returns 0x41455243.
+            // Note 2: Life is not easy and full of surprises. For example
+            //         prison marker reuses ESM::Door record. Player is ESM::NPC.
             unsigned int getType() const;
 
             std::string getTypeDescription() const

From fc9ab9795012b7f2f59d5c323b7bf28a53d1ca50 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Wed, 13 Oct 2021 10:08:28 +0000
Subject: [PATCH 1472/2859] sky.cpp

---
 apps/openmw/mwrender/sky.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index dd62d6678b..ebf901b5ab 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -299,7 +299,7 @@ public:
 
     osg::BoundingSphere computeBound() const override
     {
-        return osg::BoundingSphere(osg::Vec3f(0,0,0), 0);
+        return osg::BoundingSphere();
     }
 
     class CullCallback : public SceneUtil::NodeCallback<CullCallback, osg::Node*, osgUtil::CullVisitor*>

From 617eec338a9cc3813309a4c1c78cad0f1ab7680b Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Wed, 13 Oct 2021 14:12:47 +0000
Subject: [PATCH 1473/2859] removes version guard (#3173)

We currently use a version guard to adapt to a change in the number of parameters supplied to osg::TriangleFunctor's operator() template functor. The differing parameter is unused in our code. Crucially, operator() is not an override, so we can just add a default value for the differing parameter. Such a default allows us to apply identical code to both versions of the library without regressing functionality.
---
 components/resource/bulletshapemanager.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/components/resource/bulletshapemanager.cpp b/components/resource/bulletshapemanager.cpp
index 0d0f81962b..5b6dce067c 100644
--- a/components/resource/bulletshapemanager.cpp
+++ b/components/resource/bulletshapemanager.cpp
@@ -4,7 +4,6 @@
 #include <osg/TriangleFunctor>
 #include <osg/Transform>
 #include <osg/Drawable>
-#include <osg/Version>
 
 #include <BulletCollision/CollisionShapes/btTriangleMesh.h>
 
@@ -45,11 +44,7 @@ struct GetTriangleFunctor
         return btVector3(vec.x(), vec.y(), vec.z());
     }
 
-#if OSG_MIN_VERSION_REQUIRED(3,5,6)
-    void inline operator()( const osg::Vec3& v1, const osg::Vec3& v2, const osg::Vec3& v3 )
-#else
-    void inline operator()( const osg::Vec3& v1, const osg::Vec3& v2, const osg::Vec3& v3, bool _temp )
-#endif
+    void inline operator()( const osg::Vec3& v1, const osg::Vec3& v2, const osg::Vec3& v3, bool _temp=false ) // Note: unused temp argument left here for OSG versions less than 3.5.6 
     {
         if (mTriMesh)
             mTriMesh->addTriangle( toBullet(mMatrix.preMult(v1)), toBullet(mMatrix.preMult(v2)), toBullet(mMatrix.preMult(v3)));

From 42bd10f3560902387db13f71501db29e1200b946 Mon Sep 17 00:00:00 2001
From: Dan Church <amphetamachine@gmail.com>
Date: Wed, 13 Oct 2021 13:46:08 -0500
Subject: [PATCH 1474/2859] Fix FTBFS against older versions of osg

Bring back osg version guard.

Drawable::dirtyGLObjects wasn't available until OpenSceneGraph-3.5.10.
---
 components/sceneutil/morphgeometry.cpp | 4 ++++
 components/sceneutil/riggeometry.cpp   | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/components/sceneutil/morphgeometry.cpp b/components/sceneutil/morphgeometry.cpp
index 355403b066..78be559989 100644
--- a/components/sceneutil/morphgeometry.cpp
+++ b/components/sceneutil/morphgeometry.cpp
@@ -2,6 +2,8 @@
 
 #include <cassert>
 
+#include <osg/Version>
+
 namespace SceneUtil
 {
 
@@ -176,7 +178,9 @@ void MorphGeometry::cull(osg::NodeVisitor *nv)
 
     positionDst->dirty();
 
+#if OSG_MIN_VERSION_REQUIRED(3, 5, 10)
     geom.osg::Drawable::dirtyGLObjects();
+#endif
 
     nv->pushOntoNodePath(&geom);
     nv->apply(geom);
diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp
index 2ca90d2c78..ec00efa535 100644
--- a/components/sceneutil/riggeometry.cpp
+++ b/components/sceneutil/riggeometry.cpp
@@ -1,5 +1,7 @@
 #include "riggeometry.hpp"
 
+#include <osg/Version>
+
 #include <components/debug/debuglog.hpp>
 #include <osg/MatrixTransform>
 
@@ -247,7 +249,9 @@ void RigGeometry::cull(osg::NodeVisitor* nv)
     if (tangentDst)
         tangentDst->dirty();
 
+#if OSG_MIN_VERSION_REQUIRED(3, 5, 10)
     geom.osg::Drawable::dirtyGLObjects();
+#endif
 
     nv->pushOntoNodePath(&geom);
     nv->apply(geom);

From 4a6464ea676de573fe9b189931f2a403aea88eca Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 13 Oct 2021 22:40:07 +0200
Subject: [PATCH 1475/2859] Stop trying to play non-existent music files
 started by scripts

---
 apps/openmw/mwsound/soundmanagerimp.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index d2422870d7..96bfc27951 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -224,7 +224,16 @@ namespace MWSound
         stopMusic();
 
         DecoderPtr decoder = getDecoder();
-        decoder->open(filename);
+        try
+        {
+            decoder->open(filename);
+        }
+        catch(std::exception &e)
+        {
+            Log(Debug::Error) << "Failed to load audio from " << filename << ": " << e.what();
+            return;
+        }
+
 
         mMusic = getStreamRef();
         mMusic->init([&] {

From db3d938ee95a79387b68fd70c7bc69d7bf42d231 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Thu, 14 Oct 2021 12:46:44 +0000
Subject: [PATCH 1476/2859] cleans up BSAFile (#3177)

We currently build a large map of a BSAFile's contents unused by Open MW. We already map archive contents in VFS. With this PR we remove the map from BSAFile and reimplement its only current use in BSATool.
---
 apps/bsatool/bsatool.cpp             | 18 ++++++++++-----
 components/bsa/bsa_file.cpp          | 34 ----------------------------
 components/bsa/bsa_file.hpp          | 31 -------------------------
 components/bsa/compressedbsafile.cpp |  2 +-
 components/bsa/compressedbsafile.hpp |  4 +++-
 components/vfs/bsaarchive.cpp        |  1 +
 6 files changed, 17 insertions(+), 73 deletions(-)

diff --git a/apps/bsatool/bsatool.cpp b/apps/bsatool/bsatool.cpp
index 8e8cf89186..4057d627c4 100644
--- a/apps/bsatool/bsatool.cpp
+++ b/apps/bsatool/bsatool.cpp
@@ -233,7 +233,17 @@ int extract(std::unique_ptr<Bsa::BSAFile>& bsa, Arguments& info)
     std::string extractPath = info.extractfile;
     Misc::StringUtils::replaceAll(extractPath, "\\", "/");
 
-    if (!bsa->exists(archivePath.c_str()))
+    Files::IStreamPtr stream;
+    // Get a stream for the file to extract
+    for (auto it = bsa->getList().rbegin(); it != bsa->getList().rend(); ++it)
+    {
+        if (Misc::StringUtils::ciEqual(std::string(it->name()), archivePath))
+        {
+            stream = bsa->getFile(&*it);
+            break;
+        }
+    }
+    if (!stream)
     {
         std::cout << "ERROR: file '" << archivePath << "' not found\n";
         std::cout << "In archive: " << info.filename << std::endl;
@@ -260,9 +270,6 @@ int extract(std::unique_ptr<Bsa::BSAFile>& bsa, Arguments& info)
         return 3;
     }
 
-    // Get a stream for the file to extract
-    Files::IStreamPtr stream = bsa->getFile(archivePath.c_str());
-
     bfs::ofstream out(target, std::ios::binary);
 
     // Write the file to disk
@@ -296,8 +303,7 @@ int extractAll(std::unique_ptr<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(file.name());
+        Files::IStreamPtr data = bsa->getFile(&file);
         bfs::ofstream out(target, std::ios::binary);
 
         // Write the file to disk
diff --git a/components/bsa/bsa_file.cpp b/components/bsa/bsa_file.cpp
index d5610bddae..e5b730b4c4 100644
--- a/components/bsa/bsa_file.cpp
+++ b/components/bsa/bsa_file.cpp
@@ -189,13 +189,6 @@ void BSAFile::readHeader()
         return left.offset < right.offset;
     });
 
-    for (size_t i = 0; i < filenum; i++)
-    {
-        FileStruct& fs = mFiles[i];
-        // Add the file name to the lookup
-        mLookup[fs.name()] = i;
-    }
-
     mIsLoaded = true;
 }
 
@@ -237,18 +230,6 @@ void Bsa::BSAFile::writeHeader()
     output.write(reinterpret_cast<char*>(hashes.data()), sizeof(Hash)*hashes.size());
 }
 
-/// Get the index of a given file name, or -1 if not found
-int BSAFile::getIndex(const char *str) const
-{
-    auto it = mLookup.find(str);
-    if(it == mLookup.end())
-        return -1;
-
-    size_t res = it->second;
-    assert(res < mFiles.size());
-    return static_cast<int>(res);
-}
-
 /// Open an archive file.
 void BSAFile::open(const std::string &file)
 {
@@ -274,22 +255,9 @@ void Bsa::BSAFile::close()
 
     mFiles.clear();
     mStringBuf.clear();
-    mLookup.clear();
     mIsLoaded = false;
 }
 
-Files::IStreamPtr BSAFile::getFile(const char *file)
-{
-    assert(file);
-    int i = getIndex(file);
-    if(i == -1)
-        fail("File not found: " + std::string(file));
-
-    const FileStruct &fs = mFiles[i];
-
-    return Files::openConstrainedFileStream (mFilename.c_str (), fs.offset, fs.fileSize);
-}
-
 void Bsa::BSAFile::addFile(const std::string& filename, std::istream& file)
 {
     if (!mIsLoaded)
@@ -338,8 +306,6 @@ void Bsa::BSAFile::addFile(const std::string& filename, std::istream& file)
 
     mHasChanged = true;
 
-    mLookup[filename.c_str()] = mFiles.size() - 1;
-
     stream.seekp(0, std::ios::end);
     file.seekg(0, std::ios::beg);
     stream << file.rdbuf();
diff --git a/components/bsa/bsa_file.hpp b/components/bsa/bsa_file.hpp
index 9a76e1bd23..f6c5d03139 100644
--- a/components/bsa/bsa_file.hpp
+++ b/components/bsa/bsa_file.hpp
@@ -27,9 +27,6 @@
 #include <cstdint>
 #include <string>
 #include <vector>
-#include <map>
-
-#include <components/misc/stringops.hpp>
 
 #include <components/files/constrainedfilestream.hpp>
 
@@ -91,20 +88,6 @@ protected:
     /// Used for error messages
     std::string mFilename;
 
-    /// Case insensitive string comparison
-    struct iltstr
-    {
-        bool operator()(const std::string& s1, const std::string& s2) const
-        { return Misc::StringUtils::ciLess(s1, s2); }
-    };
-
-    /** A map used for fast file name lookup. The value is the index into
-        the files[] vector above. The iltstr ensures that file name
-        checks are case insensitive.
-    */
-    typedef std::map<std::string, size_t, iltstr> Lookup;
-    Lookup mLookup;
-
     /// Error handling
     [[noreturn]] void fail(const std::string &msg);
 
@@ -112,10 +95,6 @@ protected:
     virtual void readHeader();
     virtual void writeHeader();
 
-    /// Get the index of a given file name, or -1 if not found
-    /// @note Thread safe.
-    int getIndex(const char *str) const;
-
 public:
     /* -----------------------------------
      * BSA management methods
@@ -141,16 +120,6 @@ public:
      * -----------------------------------
      */
 
-    /// Check if a file exists
-    virtual bool exists(const char *file) const
-    { return getIndex(file) != -1; }
-
-    /** Open a file contained in the archive. Throws an exception if the
-        file doesn't exist.
-     * @note Thread safe.
-    */
-    virtual Files::IStreamPtr getFile(const char *file);
-
     /** Open a file contained in the archive.
      * @note Thread safe.
     */
diff --git a/components/bsa/compressedbsafile.cpp b/components/bsa/compressedbsafile.cpp
index f066489184..ae8209a39a 100644
--- a/components/bsa/compressedbsafile.cpp
+++ b/components/bsa/compressedbsafile.cpp
@@ -47,6 +47,7 @@
 
 #include <boost/iostreams/device/array.hpp>
 #include <components/bsa/memorystream.hpp>
+#include <components/misc/stringops.hpp>
 
 namespace Bsa
 {
@@ -286,7 +287,6 @@ void CompressedBSAFile::readHeader()
 
         mFiles[fileIndex].setNameInfos(mStringBuffOffset, &mStringBuf);
 
-        mLookup[reinterpret_cast<char*>(mStringBuf.data() + mStringBuffOffset)] = fileIndex;
         mStringBuffOffset += stringLength + 1u;
     }
 
diff --git a/components/bsa/compressedbsafile.hpp b/components/bsa/compressedbsafile.hpp
index ffd88fe044..f19815dcf3 100644
--- a/components/bsa/compressedbsafile.hpp
+++ b/components/bsa/compressedbsafile.hpp
@@ -26,6 +26,8 @@
 #ifndef BSA_COMPRESSED_BSA_FILE_H
 #define BSA_COMPRESSED_BSA_FILE_H
 
+#include <map>
+
 #include <components/bsa/bsa_file.hpp>
 
 namespace Bsa
@@ -92,7 +94,7 @@ namespace Bsa
         /// Read header information from the input source
         void readHeader() override;
        
-        Files::IStreamPtr getFile(const char* filePath) override;
+        Files::IStreamPtr getFile(const char* filePath);
         Files::IStreamPtr getFile(const FileStruct* fileStruct);
         void addFile(const std::string& filename, std::istream& file) override;
     };
diff --git a/components/vfs/bsaarchive.cpp b/components/vfs/bsaarchive.cpp
index 86d21060c0..b0caa5c305 100644
--- a/components/vfs/bsaarchive.cpp
+++ b/components/vfs/bsaarchive.cpp
@@ -1,6 +1,7 @@
 #include "bsaarchive.hpp"
 
 #include <memory>
+#include <algorithm>
 
 namespace VFS
 {

From bba80b07a2c68051e37137ca0820b525ee02eef8 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 14 Oct 2021 16:49:30 +0200
Subject: [PATCH 1477/2859] Check if the target is an actor

---
 apps/openmw/mwmechanics/combat.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/combat.cpp b/apps/openmw/mwmechanics/combat.cpp
index 7ae26c82b8..3ed1a8678c 100644
--- a/apps/openmw/mwmechanics/combat.cpp
+++ b/apps/openmw/mwmechanics/combat.cpp
@@ -49,7 +49,8 @@ namespace MWMechanics
                 cast.mHitPosition = hitPosition;
                 cast.cast(object, false);
                 // Apply magic effects directly instead of waiting a frame to allow soul trap to work on one-hit kills
-                MWBase::Environment::get().getMechanicsManager()->updateMagicEffects(victim);
+                if(victim.getClass().isActor())
+                    MWBase::Environment::get().getMechanicsManager()->updateMagicEffects(victim);
                 return true;
             }
         }

From 5805c0114a46f1fe23a415dd63a161c498107797 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 14 Oct 2021 17:40:03 +0200
Subject: [PATCH 1478/2859] Don't hit the ground

---
 apps/openmw/mwmechanics/combat.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/combat.cpp b/apps/openmw/mwmechanics/combat.cpp
index 3ed1a8678c..6407d03f23 100644
--- a/apps/openmw/mwmechanics/combat.cpp
+++ b/apps/openmw/mwmechanics/combat.cpp
@@ -49,7 +49,7 @@ namespace MWMechanics
                 cast.mHitPosition = hitPosition;
                 cast.cast(object, false);
                 // Apply magic effects directly instead of waiting a frame to allow soul trap to work on one-hit kills
-                if(victim.getClass().isActor())
+                if(!victim.isEmpty() && victim.getClass().isActor())
                     MWBase::Environment::get().getMechanicsManager()->updateMagicEffects(victim);
                 return true;
             }

From 79665cea6685930c06fa823e197e326d2506da05 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 14 Oct 2021 23:30:37 +0200
Subject: [PATCH 1479/2859] Avoid access to the path vector element out of
 range

polygonPath.front() in some cases might reference to a first element of empty
vector. Copy the value into a local variable to be able to access later.
---
 components/detournavigator/findsmoothpath.hpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/components/detournavigator/findsmoothpath.hpp b/components/detournavigator/findsmoothpath.hpp
index 8eb0bf9f34..c3a33c42a6 100644
--- a/components/detournavigator/findsmoothpath.hpp
+++ b/components/detournavigator/findsmoothpath.hpp
@@ -199,11 +199,14 @@ namespace DetourNavigator
                 ++smoothPathSize;
                 break;
             }
-            else if (offMeshConnection && inRange(result->mResultPos, steerTarget->steerPos, slop))
+
+            dtPolyRef polyRef = polygonPath.front();
+            osg::Vec3f polyPos = result->mResultPos;
+
+            if (offMeshConnection && inRange(polyPos, steerTarget->steerPos, slop))
             {
                 // Advance the path up to and over the off-mesh connection.
                 dtPolyRef prevRef = 0;
-                dtPolyRef polyRef = polygonPath.front();
                 std::size_t npos = 0;
                 while (npos < polygonPath.size() && polyRef != steerTarget->steerPosRef)
                 {
@@ -233,14 +236,11 @@ namespace DetourNavigator
                     }
 
                     // Move position at the other side of the off-mesh link.
-                    if (dtStatusFailed(navMeshQuery.getPolyHeight(polygonPath.front(), endPos.ptr(), &iterPos.y())))
-                        return Status::GetPolyHeightFailed;
-                    iterPos.x() = endPos.x();
-                    iterPos.z() = endPos.z();
+                    polyPos = endPos;
                 }
             }
 
-            if (dtStatusFailed(navMeshQuery.getPolyHeight(polygonPath.front(), result->mResultPos.ptr(), &iterPos.y())))
+            if (dtStatusFailed(navMeshQuery.getPolyHeight(polyRef, polyPos.ptr(), &iterPos.y())))
                 return Status::GetPolyHeightFailed;
             iterPos.x() = result->mResultPos.x();
             iterPos.z() = result->mResultPos.z();

From f6d1689bb9d69ec0d66680d7fe4e88c4b4d0577b Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 14 Oct 2021 23:42:53 +0200
Subject: [PATCH 1480/2859] Avoid redundant polygon path reallocations

Use separate variable to store size and make all operations in-place.
---
 components/detournavigator/findsmoothpath.cpp | 67 ++++++++-----------
 components/detournavigator/findsmoothpath.hpp | 40 ++++++-----
 2 files changed, 49 insertions(+), 58 deletions(-)

diff --git a/components/detournavigator/findsmoothpath.cpp b/components/detournavigator/findsmoothpath.cpp
index 14fe696f10..e166ff90e9 100644
--- a/components/detournavigator/findsmoothpath.cpp
+++ b/components/detournavigator/findsmoothpath.cpp
@@ -7,12 +7,16 @@
 
 namespace DetourNavigator
 {
-    std::vector<dtPolyRef> fixupCorridor(const std::vector<dtPolyRef>& path, const std::vector<dtPolyRef>& visited)
+    std::size_t fixupCorridor(dtPolyRef* path, std::size_t pathSize, const std::vector<dtPolyRef>& visited)
     {
         std::vector<dtPolyRef>::const_reverse_iterator furthestVisited;
 
         // Find furthest common polygon.
-        const auto it = std::find_if(path.rbegin(), path.rend(), [&] (dtPolyRef pathValue)
+        const auto begin = path;
+        const auto end = path + pathSize;
+        const std::reverse_iterator rbegin(end);
+        const std::reverse_iterator rend(begin);
+        const auto it = std::find_if(rbegin, rend, [&] (dtPolyRef pathValue)
         {
             const auto it = std::find(visited.rbegin(), visited.rend(), pathValue);
             if (it == visited.rend())
@@ -22,8 +26,8 @@ namespace DetourNavigator
         });
 
         // If no intersection found just return current path.
-        if (it == path.rend())
-            return path;
+        if (it == rend)
+            return pathSize;
         const auto furthestPath = it.base() - 1;
 
         // Concatenate paths.
@@ -34,36 +38,22 @@ namespace DetourNavigator
         //            ^ furthestPath
         //  result: x b_n ... b_1 D
 
-        std::vector<dtPolyRef> result;
-        result.reserve(static_cast<std::size_t>(furthestVisited - visited.rbegin())
-                       + static_cast<std::size_t>(path.end() - furthestPath) - 1);
-        std::copy(visited.rbegin(), furthestVisited + 1, std::back_inserter(result));
-        std::copy(furthestPath + 1, path.end(), std::back_inserter(result));
+        auto newEnd = std::copy(visited.rbegin(), furthestVisited + 1, begin);
+        newEnd = std::copy(furthestPath + 1, end, newEnd);
 
-        return result;
+        return static_cast<std::size_t>(newEnd - begin);
     }
 
-    // This function checks if the path has a small U-turn, that is,
-    // a polygon further in the path is adjacent to the first polygon
-    // in the path. If that happens, a shortcut is taken.
-    // This can happen if the target (T) location is at tile boundary,
-    // and we're (S) approaching it parallel to the tile edge.
-    // The choice at the vertex can be arbitrary,
-    //  +---+---+
-    //  |:::|:::|
-    //  +-S-+-T-+
-    //  |:::|   | <-- the step can end up in here, resulting U-turn path.
-    //  +---+---+
-    std::vector<dtPolyRef> fixupShortcuts(const std::vector<dtPolyRef>& path, const dtNavMeshQuery& navQuery)
+    std::size_t fixupShortcuts(dtPolyRef* path, std::size_t pathSize, const dtNavMeshQuery& navQuery)
     {
-        if (path.size() < 3)
-            return path;
+        if (pathSize < 3)
+            return pathSize;
 
         // Get connected polygons
         const dtMeshTile* tile = nullptr;
         const dtPoly* poly = nullptr;
         if (dtStatusFailed(navQuery.getAttachedNavMesh()->getTileAndPolyByRef(path[0], &tile, &poly)))
-            return path;
+            return pathSize;
 
         const std::size_t maxNeis = 16;
         std::array<dtPolyRef, maxNeis> neis;
@@ -83,7 +73,7 @@ namespace DetourNavigator
         // in the path, short cut to that polygon directly.
         const std::size_t maxLookAhead = 6;
         std::size_t cut = 0;
-        for (std::size_t i = std::min(maxLookAhead, path.size()) - 1; i > 1 && cut == 0; i--)
+        for (std::size_t i = std::min(maxLookAhead, pathSize) - 1; i > 1 && cut == 0; i--)
         {
             for (std::size_t j = 0; j < nneis; j++)
             {
@@ -95,18 +85,15 @@ namespace DetourNavigator
             }
         }
         if (cut <= 1)
-            return path;
+            return pathSize;
 
-        std::vector<dtPolyRef> result;
-        const auto offset = cut - 1;
-        result.reserve(1 + path.size() - offset);
-        result.push_back(path.front());
-        std::copy(path.begin() + std::ptrdiff_t(offset), path.end(), std::back_inserter(result));
-        return result;
+        const std::ptrdiff_t offset = static_cast<std::ptrdiff_t>(cut) - 1;
+        std::copy(path + offset, path + pathSize, path);
+        return pathSize - offset;
     }
 
     std::optional<SteerTarget> getSteerTarget(const dtNavMeshQuery& navMeshQuery, const osg::Vec3f& startPos,
-            const osg::Vec3f& endPos, const float minTargetDist, const std::vector<dtPolyRef>& path)
+            const osg::Vec3f& endPos, const float minTargetDist, const dtPolyRef* path, const std::size_t pathSize)
     {
         // Find steer target.
         SteerTarget result;
@@ -115,8 +102,8 @@ namespace DetourNavigator
         std::array<unsigned char, maxSteerPoints> steerPathFlags;
         std::array<dtPolyRef, maxSteerPoints> steerPathPolys;
         int nsteerPath = 0;
-        const dtStatus status = navMeshQuery.findStraightPath(startPos.ptr(), endPos.ptr(), path.data(),
-            static_cast<int>(path.size()), steerPath.data(), steerPathFlags.data(), steerPathPolys.data(),
+        const dtStatus status = navMeshQuery.findStraightPath(startPos.ptr(), endPos.ptr(), path,
+            static_cast<int>(pathSize), steerPath.data(), steerPathFlags.data(), steerPathPolys.data(),
             &nsteerPath, maxSteerPoints);
         if (dtStatusFailed(status))
             return std::nullopt;
@@ -138,10 +125,10 @@ namespace DetourNavigator
         if (ns >= static_cast<std::size_t>(nsteerPath))
             return std::nullopt;
 
-        dtVcopy(result.steerPos.ptr(), &steerPath[ns * 3]);
-        result.steerPos.y() = startPos[1];
-        result.steerPosFlag = steerPathFlags[ns];
-        result.steerPosRef = steerPathPolys[ns];
+        dtVcopy(result.mSteerPos.ptr(), &steerPath[ns * 3]);
+        result.mSteerPos.y() = startPos[1];
+        result.mSteerPosFlag = steerPathFlags[ns];
+        result.mSteerPosRef = steerPathPolys[ns];
 
         return result;
     }
diff --git a/components/detournavigator/findsmoothpath.hpp b/components/detournavigator/findsmoothpath.hpp
index c3a33c42a6..71e8a1df88 100644
--- a/components/detournavigator/findsmoothpath.hpp
+++ b/components/detournavigator/findsmoothpath.hpp
@@ -30,7 +30,7 @@ namespace DetourNavigator
         return (osg::Vec2f(v1.x(), v1.z()) - osg::Vec2f(v2.x(), v2.z())).length() < r;
     }
 
-    std::vector<dtPolyRef> fixupCorridor(const std::vector<dtPolyRef>& path, const std::vector<dtPolyRef>& visited);
+    std::size_t fixupCorridor(dtPolyRef* path, std::size_t pathSize, const std::vector<dtPolyRef>& visited);
 
     // This function checks if the path has a small U-turn, that is,
     // a polygon further in the path is adjacent to the first polygon
@@ -43,17 +43,17 @@ namespace DetourNavigator
     //  +-S-+-T-+
     //  |:::|   | <-- the step can end up in here, resulting U-turn path.
     //  +---+---+
-    std::vector<dtPolyRef> fixupShortcuts(const std::vector<dtPolyRef>& path, const dtNavMeshQuery& navQuery);
+    std::size_t fixupShortcuts(dtPolyRef* path, std::size_t pathSize, const dtNavMeshQuery& navQuery);
 
     struct SteerTarget
     {
-        osg::Vec3f steerPos;
-        unsigned char steerPosFlag;
-        dtPolyRef steerPosRef;
+        osg::Vec3f mSteerPos;
+        unsigned char mSteerPosFlag;
+        dtPolyRef mSteerPosRef;
     };
 
     std::optional<SteerTarget> getSteerTarget(const dtNavMeshQuery& navQuery, const osg::Vec3f& startPos,
-            const osg::Vec3f& endPos, const float minTargetDist, const std::vector<dtPolyRef>& path);
+            const osg::Vec3f& endPos, const float minTargetDist, const dtPolyRef* path, const std::size_t pathSize);
 
     template <class OutputIterator>
     class OutputTransformIterator
@@ -158,22 +158,23 @@ namespace DetourNavigator
         *out++ = iterPos;
 
         std::size_t smoothPathSize = 1;
+        std::size_t polygonPathSize = polygonPath.size();
 
         // Move towards target a small advancement at a time until target reached or
         // when ran out of memory to store the path.
-        while (!polygonPath.empty() && smoothPathSize < maxSmoothPathSize)
+        while (polygonPathSize > 0 && smoothPathSize < maxSmoothPathSize)
         {
             // Find location to steer towards.
-            const auto steerTarget = getSteerTarget(navMeshQuery, iterPos, targetPos, slop, polygonPath);
+            const auto steerTarget = getSteerTarget(navMeshQuery, iterPos, targetPos, slop, polygonPath.data(), polygonPathSize);
 
             if (!steerTarget)
                 break;
 
-            const bool endOfPath = bool(steerTarget->steerPosFlag & DT_STRAIGHTPATH_END);
-            const bool offMeshConnection = bool(steerTarget->steerPosFlag & DT_STRAIGHTPATH_OFFMESH_CONNECTION);
+            const bool endOfPath = bool(steerTarget->mSteerPosFlag & DT_STRAIGHTPATH_END);
+            const bool offMeshConnection = bool(steerTarget->mSteerPosFlag & DT_STRAIGHTPATH_OFFMESH_CONNECTION);
 
             // Find movement delta.
-            const osg::Vec3f delta = steerTarget->steerPos - iterPos;
+            const osg::Vec3f delta = steerTarget->mSteerPos - iterPos;
             float len = delta.length();
             // If the steer target is end of path or off-mesh link, do not move past the location.
             if ((endOfPath || offMeshConnection) && len < stepSize)
@@ -187,11 +188,11 @@ namespace DetourNavigator
             if (!result)
                 return Status::MoveAlongSurfaceFailed;
 
-            polygonPath = fixupCorridor(polygonPath, result->mVisited);
-            polygonPath = fixupShortcuts(polygonPath, navMeshQuery);
+            polygonPathSize = fixupCorridor(polygonPath.data(), polygonPathSize, result->mVisited);
+            polygonPathSize = fixupShortcuts(polygonPath.data(), polygonPathSize, navMeshQuery);
 
             // Handle end of path and off-mesh links when close enough.
-            if (endOfPath && inRange(result->mResultPos, steerTarget->steerPos, slop))
+            if (endOfPath && inRange(result->mResultPos, steerTarget->mSteerPos, slop))
             {
                 // Reached end of path.
                 iterPos = targetPos;
@@ -203,19 +204,22 @@ namespace DetourNavigator
             dtPolyRef polyRef = polygonPath.front();
             osg::Vec3f polyPos = result->mResultPos;
 
-            if (offMeshConnection && inRange(polyPos, steerTarget->steerPos, slop))
+            if (offMeshConnection && inRange(polyPos, steerTarget->mSteerPos, slop))
             {
                 // Advance the path up to and over the off-mesh connection.
                 dtPolyRef prevRef = 0;
                 std::size_t npos = 0;
-                while (npos < polygonPath.size() && polyRef != steerTarget->steerPosRef)
+                while (npos < polygonPathSize && polyRef != steerTarget->mSteerPosRef)
                 {
                     prevRef = polyRef;
                     polyRef = polygonPath[npos];
                     ++npos;
                 }
-                std::copy(polygonPath.begin() + std::ptrdiff_t(npos), polygonPath.end(), polygonPath.begin());
-                polygonPath.resize(polygonPath.size() - npos);
+                if (npos > 0)
+                {
+                    std::copy(polygonPath.begin() + npos, polygonPath.begin() + polygonPathSize, polygonPath.begin());
+                    polygonPathSize -= npos;
+                }
 
                 // Reached off-mesh connection.
                 osg::Vec3f startPos;

From 7602d677fa3b0ccecee3134fbded53563ee05a01 Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Sat, 2 Oct 2021 14:23:43 +0300
Subject: [PATCH 1481/2859] Terrain selection optimizations, measurements,
 renderBin change

---
 apps/opencs/view/render/terrainselection.cpp | 96 +++++++++++++++++---
 apps/opencs/view/render/terrainselection.hpp | 10 +-
 apps/opencs/view/render/terrainstorage.cpp   | 15 ++-
 3 files changed, 98 insertions(+), 23 deletions(-)

diff --git a/apps/opencs/view/render/terrainselection.cpp b/apps/opencs/view/render/terrainselection.cpp
index 0593917e0a..dd1b982337 100644
--- a/apps/opencs/view/render/terrainselection.cpp
+++ b/apps/opencs/view/render/terrainselection.cpp
@@ -1,12 +1,14 @@
 #include "terrainselection.hpp"
 
 #include <algorithm>
+#include <chrono>
 
 #include <osg/Group>
 #include <osg/Geometry>
 #include <osg/PositionAttitudeTransform>
 
 #include <components/esm/loadland.hpp>
+#include <components/debug/debuglog.hpp>
 
 #include "../../model/world/cellcoordinates.hpp"
 #include "../../model/world/columnimp.hpp"
@@ -21,6 +23,8 @@ mParentNode(parentNode), mWorldspaceWidget (worldspaceWidget), mDraggedOperation
     mGeometry = new osg::Geometry();
 
     mSelectionNode = new osg::Group();
+    mSelectionNode->getOrCreateStateSet()->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
+    mSelectionNode->getOrCreateStateSet()->setRenderBinDetails(11, "RenderBin");
     mSelectionNode->addChild(mGeometry);
 
     activate();
@@ -92,6 +96,7 @@ void CSVRender::TerrainSelection::update()
 
 void CSVRender::TerrainSelection::drawShapeSelection(const osg::ref_ptr<osg::Vec3Array> vertices)
 {
+    resetMeasurements();
     if (!mSelection.empty())
     {
         for (std::pair<int, int> &localPos : mSelection)
@@ -102,32 +107,34 @@ void CSVRender::TerrainSelection::drawShapeSelection(const osg::ref_ptr<osg::Vec
             float xWorldCoord(CSMWorld::CellCoordinates::vertexGlobalToWorldCoords(x));
             float yWorldCoord(CSMWorld::CellCoordinates::vertexGlobalToWorldCoords(y));
 
-            osg::Vec3f pointXY(xWorldCoord, yWorldCoord, calculateLandHeight(x, y) + 2);
+            osg::Vec3f pointXY(xWorldCoord, yWorldCoord, calculateLandHeight(x, y));
 
             vertices->push_back(pointXY);
-            vertices->push_back(osg::Vec3f(xWorldCoord, CSMWorld::CellCoordinates::vertexGlobalToWorldCoords(y - 1), calculateLandHeight(x, y - 1) + 2));
+            vertices->push_back(osg::Vec3f(xWorldCoord, CSMWorld::CellCoordinates::vertexGlobalToWorldCoords(y - 1), calculateLandHeight(x, y - 1)));
             vertices->push_back(pointXY);
-            vertices->push_back(osg::Vec3f(CSMWorld::CellCoordinates::vertexGlobalToWorldCoords(x - 1), yWorldCoord, calculateLandHeight(x - 1, y) + 2));
+            vertices->push_back(osg::Vec3f(CSMWorld::CellCoordinates::vertexGlobalToWorldCoords(x - 1), yWorldCoord, calculateLandHeight(x - 1, y)));
 
             const auto north = std::find(mSelection.begin(), mSelection.end(), std::make_pair(x, y + 1));
             if (north == mSelection.end())
             {
                 vertices->push_back(pointXY);
-                vertices->push_back(osg::Vec3f(xWorldCoord, CSMWorld::CellCoordinates::vertexGlobalToWorldCoords(y + 1), calculateLandHeight(x, y + 1) + 2));
+                vertices->push_back(osg::Vec3f(xWorldCoord, CSMWorld::CellCoordinates::vertexGlobalToWorldCoords(y + 1), calculateLandHeight(x, y + 1)));
             }
 
             const auto east = std::find(mSelection.begin(), mSelection.end(), std::make_pair(x + 1, y));
             if (east == mSelection.end())
             {
                 vertices->push_back(pointXY);
-                vertices->push_back(osg::Vec3f(CSMWorld::CellCoordinates::vertexGlobalToWorldCoords(x + 1), yWorldCoord, calculateLandHeight(x + 1, y) + 2));
+                vertices->push_back(osg::Vec3f(CSMWorld::CellCoordinates::vertexGlobalToWorldCoords(x + 1), yWorldCoord, calculateLandHeight(x + 1, y)));
             }
         }
     }
+    printMeasurements();
 }
 
 void CSVRender::TerrainSelection::drawTextureSelection(const osg::ref_ptr<osg::Vec3Array> vertices)
 {
+    resetMeasurements();
     if (!mSelection.empty())
     {
         const int landHeightsNudge = (ESM::Land::REAL_SIZE / ESM::Land::LAND_SIZE) / (ESM::Land::LAND_SIZE - 1); // Does this work with all land size configurations?
@@ -154,8 +161,8 @@ void CSVRender::TerrainSelection::drawTextureSelection(const osg::ref_ptr<osg::V
                 {
                     float drawPreviousX = CSMWorld::CellCoordinates::textureGlobalXToWorldCoords(x) + (i - 1) * (ESM::Land::REAL_SIZE / (ESM::Land::LAND_SIZE - 1));
                     float drawCurrentX = CSMWorld::CellCoordinates::textureGlobalXToWorldCoords(x) + i * (ESM::Land::REAL_SIZE / (ESM::Land::LAND_SIZE - 1));
-                    vertices->push_back(osg::Vec3f(drawPreviousX, CSMWorld::CellCoordinates::textureGlobalYToWorldCoords(y + 1), calculateLandHeight(x1+(i-1), y2)+2));
-                    vertices->push_back(osg::Vec3f(drawCurrentX, CSMWorld::CellCoordinates::textureGlobalYToWorldCoords(y + 1), calculateLandHeight(x1+i, y2)+2));
+                    vertices->push_back(osg::Vec3f(drawPreviousX, CSMWorld::CellCoordinates::textureGlobalYToWorldCoords(y + 1), calculateLandHeight(x1+(i-1), y2)));
+                    vertices->push_back(osg::Vec3f(drawCurrentX, CSMWorld::CellCoordinates::textureGlobalYToWorldCoords(y + 1), calculateLandHeight(x1+i, y2)));
                 }
             }
 
@@ -166,8 +173,8 @@ void CSVRender::TerrainSelection::drawTextureSelection(const osg::ref_ptr<osg::V
                 {
                     float drawPreviousX = CSMWorld::CellCoordinates::textureGlobalXToWorldCoords(x) + (i - 1) *(ESM::Land::REAL_SIZE / (ESM::Land::LAND_SIZE - 1));
                     float drawCurrentX = CSMWorld::CellCoordinates::textureGlobalXToWorldCoords(x) + i * (ESM::Land::REAL_SIZE / (ESM::Land::LAND_SIZE - 1));
-                    vertices->push_back(osg::Vec3f(drawPreviousX, CSMWorld::CellCoordinates::textureGlobalYToWorldCoords(y), calculateLandHeight(x1+(i-1), y1)+2));
-                    vertices->push_back(osg::Vec3f(drawCurrentX, CSMWorld::CellCoordinates::textureGlobalYToWorldCoords(y), calculateLandHeight(x1+i, y1)+2));
+                    vertices->push_back(osg::Vec3f(drawPreviousX, CSMWorld::CellCoordinates::textureGlobalYToWorldCoords(y), calculateLandHeight(x1+(i-1), y1)));
+                    vertices->push_back(osg::Vec3f(drawCurrentX, CSMWorld::CellCoordinates::textureGlobalYToWorldCoords(y), calculateLandHeight(x1+i, y1)));
                 }
             }
 
@@ -178,8 +185,8 @@ void CSVRender::TerrainSelection::drawTextureSelection(const osg::ref_ptr<osg::V
                 {
                     float drawPreviousY = CSMWorld::CellCoordinates::textureGlobalYToWorldCoords(y) + (i - 1) * (ESM::Land::REAL_SIZE / (ESM::Land::LAND_SIZE - 1));
                     float drawCurrentY = CSMWorld::CellCoordinates::textureGlobalYToWorldCoords(y) + i * (ESM::Land::REAL_SIZE / (ESM::Land::LAND_SIZE - 1));
-                    vertices->push_back(osg::Vec3f(CSMWorld::CellCoordinates::textureGlobalXToWorldCoords(x + 1), drawPreviousY, calculateLandHeight(x2, y1+(i-1))+2));
-                    vertices->push_back(osg::Vec3f(CSMWorld::CellCoordinates::textureGlobalXToWorldCoords(x + 1), drawCurrentY, calculateLandHeight(x2, y1+i)+2));
+                    vertices->push_back(osg::Vec3f(CSMWorld::CellCoordinates::textureGlobalXToWorldCoords(x + 1), drawPreviousY, calculateLandHeight(x2, y1+(i-1))));
+                    vertices->push_back(osg::Vec3f(CSMWorld::CellCoordinates::textureGlobalXToWorldCoords(x + 1), drawCurrentY, calculateLandHeight(x2, y1+i)));
                 }
             }
 
@@ -190,12 +197,13 @@ void CSVRender::TerrainSelection::drawTextureSelection(const osg::ref_ptr<osg::V
                 {
                     float drawPreviousY = CSMWorld::CellCoordinates::textureGlobalYToWorldCoords(y) + (i - 1) * (ESM::Land::REAL_SIZE / (ESM::Land::LAND_SIZE - 1));
                     float drawCurrentY = CSMWorld::CellCoordinates::textureGlobalYToWorldCoords(y) + i * (ESM::Land::REAL_SIZE / (ESM::Land::LAND_SIZE - 1));
-                    vertices->push_back(osg::Vec3f(CSMWorld::CellCoordinates::textureGlobalXToWorldCoords(x), drawPreviousY, calculateLandHeight(x1, y1+(i-1))+2));
-                    vertices->push_back(osg::Vec3f(CSMWorld::CellCoordinates::textureGlobalXToWorldCoords(x), drawCurrentY, calculateLandHeight(x1, y1+i)+2));
+                    vertices->push_back(osg::Vec3f(CSMWorld::CellCoordinates::textureGlobalXToWorldCoords(x), drawPreviousY, calculateLandHeight(x1, y1+(i-1))));
+                    vertices->push_back(osg::Vec3f(CSMWorld::CellCoordinates::textureGlobalXToWorldCoords(x), drawCurrentY, calculateLandHeight(x1, y1+i)));
                 }
             }
         }
     }
+    printMeasurements();
 }
 
 void CSVRender::TerrainSelection::handleSelection(const std::vector<std::pair<int, int>>& localPositions, bool toggleInProgress, SelectionMethod selectionMethod)
@@ -321,6 +329,41 @@ bool CSVRender::TerrainSelection::isLandLoaded(const std::string& cellId)
 
 int CSVRender::TerrainSelection::calculateLandHeight(int x, int y) // global vertex coordinates
 {
+    auto start = std::chrono::high_resolution_clock::now();
+    int cellX = std::floor(static_cast<float>(x) / (ESM::Land::LAND_SIZE - 1));
+    int cellY = std::floor(static_cast<float>(y) / (ESM::Land::LAND_SIZE - 1));
+    int localX = x - cellX * (ESM::Land::LAND_SIZE - 1);
+    int localY = y - cellY * (ESM::Land::LAND_SIZE - 1);
+
+    CSMWorld::CellCoordinates coords (cellX, cellY);
+
+    float landHeight = 0.f;
+    if (CSVRender::Cell* cell = dynamic_cast<CSVRender::Cell*>(mWorldspaceWidget->getCell(coords)))
+    {
+        landHeight = cell->getSumOfAlteredAndTrueHeight(cellX, cellY, localX, localY);
+    }
+    else if (isLandLoaded(CSMWorld::CellCoordinates::generateId(cellX, cellY)))
+    {
+        CSMDoc::Document& document = mWorldspaceWidget->getDocument();
+        std::string cellId = CSMWorld::CellCoordinates::generateId(cellX, cellY);
+        const ESM::Land::LandData* landData = document.getData().getLand().getRecord(cellId).get().getLandData(ESM::Land::DATA_VHGT);
+        auto stop = std::chrono::high_resolution_clock::now();
+        int duration = std::chrono::duration_cast<std::chrono::microseconds>(stop - start).count();
+        mDurationsA += duration;
+        mDurationsAMeasurements++;
+        return landData->mHeights[localY*ESM::Land::LAND_SIZE + localX];
+    }
+
+    auto stop = std::chrono::high_resolution_clock::now();
+    int duration = std::chrono::duration_cast<std::chrono::microseconds>(stop - start).count();
+    mDurationsB += duration;
+    mDurationsBMeasurements++;
+    return landHeight;
+}
+
+/*int CSVRender::TerrainSelection::OldCalculateLandHeight(int x, int y) // global vertex coordinates
+{
+    auto start = std::chrono::high_resolution_clock::now();
     int cellX = std::floor(static_cast<float>(x) / (ESM::Land::LAND_SIZE - 1));
     int cellY = std::floor(static_cast<float>(y) / (ESM::Land::LAND_SIZE - 1));
     int localX = x - cellX * (ESM::Land::LAND_SIZE - 1);
@@ -340,8 +383,33 @@ int CSVRender::TerrainSelection::calculateLandHeight(int x, int y) // global ver
         std::string cellId = CSMWorld::CellCoordinates::generateId(cellX, cellY);
         int landshapeColumn = landTable.findColumnIndex(CSMWorld::Columns::ColumnId_LandHeightsIndex);
         const CSMWorld::LandHeightsColumn::DataType mPointer = landTable.data(landTable.getModelIndex(cellId, landshapeColumn)).value<CSMWorld::LandHeightsColumn::DataType>();
+        auto stop = std::chrono::high_resolution_clock::now();
+        int duration = std::chrono::duration_cast<std::chrono::microseconds>(stop - start).count();
+        mDurationsA += duration;
+        mDurationsAMeasurements++;
         return mPointer[localY*ESM::Land::LAND_SIZE + localX];
     }
-
+    auto stop = std::chrono::high_resolution_clock::now();
+    int duration = std::chrono::duration_cast<std::chrono::microseconds>(stop - start).count();
+    mDurationsB += duration;
+    mDurationsBMeasurements++;
     return landHeight;
+}*/
+
+
+void CSVRender::TerrainSelection::resetMeasurements()
+{
+    mDurationsA = 0;
+    mDurationsB = 0;
+    mDurationsAMeasurements = 0;
+    mDurationsBMeasurements = 0;
+}
+
+void CSVRender::TerrainSelection::printMeasurements()
+{
+    if (mDurationsAMeasurements != 0)
+        Log(Debug::Warning) << "A (total) " << mDurationsA << "(avg) " << mDurationsA / mDurationsAMeasurements << "(meas.) " << mDurationsAMeasurements;
+
+    if (mDurationsBMeasurements != 0)
+        Log(Debug::Warning) << "B (total) " << mDurationsB << "(avg) " << mDurationsB / mDurationsBMeasurements << "(meas.) " << mDurationsBMeasurements;
 }
diff --git a/apps/opencs/view/render/terrainselection.hpp b/apps/opencs/view/render/terrainselection.hpp
index 18622ad13a..c8c7bc7aab 100644
--- a/apps/opencs/view/render/terrainselection.hpp
+++ b/apps/opencs/view/render/terrainselection.hpp
@@ -64,6 +64,10 @@ namespace CSVRender
 
         private:
 
+            void resetMeasurements();
+
+            void printMeasurements();
+
             void handleSelection(const std::vector<std::pair<int, int>>& localPositions, bool toggleInProgress, SelectionMethod selectionMethod);
 
             bool noCell(const std::string& cellId);
@@ -73,7 +77,7 @@ namespace CSVRender
             bool noLandLoaded(const std::string& cellId);
 
             bool isLandLoaded(const std::string& cellId);
-            
+
             osg::Group* mParentNode;
             WorldspaceWidget *mWorldspaceWidget;
             osg::ref_ptr<osg::PositionAttitudeTransform> mBaseNode;
@@ -83,6 +87,10 @@ namespace CSVRender
             std::vector<std::pair<int, int>> mTemporarySelection; // Used during toggle to compare the most recent drag operation
             bool mDraggedOperationFlag; //true during drag operation, false when click-operation
             TerrainSelectionType mSelectionType;
+            int mDurationsA;
+            int mDurationsB;
+            int mDurationsAMeasurements;
+            int mDurationsBMeasurements;
     };
 }
 
diff --git a/apps/opencs/view/render/terrainstorage.cpp b/apps/opencs/view/render/terrainstorage.cpp
index d9cc3015e1..035c073567 100644
--- a/apps/opencs/view/render/terrainstorage.cpp
+++ b/apps/opencs/view/render/terrainstorage.cpp
@@ -48,15 +48,14 @@ namespace CSVRender
     float TerrainStorage::getSumOfAlteredAndTrueHeight(int cellX, int cellY, int inCellX, int inCellY)
     {
         float height = 0.f;
-        osg::ref_ptr<const ESMTerrain::LandObject> land = getLand (cellX, cellY);
-        if (land)
-        {
-            const ESM::Land::LandData* data = land ? land->getData(ESM::Land::DATA_VHGT) : nullptr;
-            if (data) height = getVertexHeight(data, inCellX, inCellY);
-        }
-        else return height;
-        return mAlteredHeight[inCellY*ESM::Land::LAND_SIZE + inCellX] + height;
 
+        int index = mData.getLand().searchId(CSMWorld::Land::createUniqueRecordId(cellX, cellY));
+        if (index == -1) // no land!
+            return height;
+
+        const ESM::Land::LandData* landData = mData.getLand().getRecord(index).get().getLandData(ESM::Land::DATA_VHGT);
+        height = landData->mHeights[inCellY*ESM::Land::LAND_SIZE + inCellX];
+        return mAlteredHeight[inCellY*ESM::Land::LAND_SIZE + inCellX] + height;
     }
 
     float* TerrainStorage::getAlteredHeight(int inCellX, int inCellY)

From 3df9ceda032f50400327ac9c42d016bf2a2743e4 Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Sat, 2 Oct 2021 14:58:47 +0300
Subject: [PATCH 1482/2859] Remove measurement code

---
 apps/opencs/view/render/terrainselection.cpp | 66 --------------------
 apps/opencs/view/render/terrainselection.hpp |  8 ---
 2 files changed, 74 deletions(-)

diff --git a/apps/opencs/view/render/terrainselection.cpp b/apps/opencs/view/render/terrainselection.cpp
index dd1b982337..8b855fc91b 100644
--- a/apps/opencs/view/render/terrainselection.cpp
+++ b/apps/opencs/view/render/terrainselection.cpp
@@ -96,7 +96,6 @@ void CSVRender::TerrainSelection::update()
 
 void CSVRender::TerrainSelection::drawShapeSelection(const osg::ref_ptr<osg::Vec3Array> vertices)
 {
-    resetMeasurements();
     if (!mSelection.empty())
     {
         for (std::pair<int, int> &localPos : mSelection)
@@ -129,12 +128,10 @@ void CSVRender::TerrainSelection::drawShapeSelection(const osg::ref_ptr<osg::Vec
             }
         }
     }
-    printMeasurements();
 }
 
 void CSVRender::TerrainSelection::drawTextureSelection(const osg::ref_ptr<osg::Vec3Array> vertices)
 {
-    resetMeasurements();
     if (!mSelection.empty())
     {
         const int landHeightsNudge = (ESM::Land::REAL_SIZE / ESM::Land::LAND_SIZE) / (ESM::Land::LAND_SIZE - 1); // Does this work with all land size configurations?
@@ -203,7 +200,6 @@ void CSVRender::TerrainSelection::drawTextureSelection(const osg::ref_ptr<osg::V
             }
         }
     }
-    printMeasurements();
 }
 
 void CSVRender::TerrainSelection::handleSelection(const std::vector<std::pair<int, int>>& localPositions, bool toggleInProgress, SelectionMethod selectionMethod)
@@ -329,7 +325,6 @@ bool CSVRender::TerrainSelection::isLandLoaded(const std::string& cellId)
 
 int CSVRender::TerrainSelection::calculateLandHeight(int x, int y) // global vertex coordinates
 {
-    auto start = std::chrono::high_resolution_clock::now();
     int cellX = std::floor(static_cast<float>(x) / (ESM::Land::LAND_SIZE - 1));
     int cellY = std::floor(static_cast<float>(y) / (ESM::Land::LAND_SIZE - 1));
     int localX = x - cellX * (ESM::Land::LAND_SIZE - 1);
@@ -347,69 +342,8 @@ int CSVRender::TerrainSelection::calculateLandHeight(int x, int y) // global ver
         CSMDoc::Document& document = mWorldspaceWidget->getDocument();
         std::string cellId = CSMWorld::CellCoordinates::generateId(cellX, cellY);
         const ESM::Land::LandData* landData = document.getData().getLand().getRecord(cellId).get().getLandData(ESM::Land::DATA_VHGT);
-        auto stop = std::chrono::high_resolution_clock::now();
-        int duration = std::chrono::duration_cast<std::chrono::microseconds>(stop - start).count();
-        mDurationsA += duration;
-        mDurationsAMeasurements++;
         return landData->mHeights[localY*ESM::Land::LAND_SIZE + localX];
     }
 
-    auto stop = std::chrono::high_resolution_clock::now();
-    int duration = std::chrono::duration_cast<std::chrono::microseconds>(stop - start).count();
-    mDurationsB += duration;
-    mDurationsBMeasurements++;
     return landHeight;
 }
-
-/*int CSVRender::TerrainSelection::OldCalculateLandHeight(int x, int y) // global vertex coordinates
-{
-    auto start = std::chrono::high_resolution_clock::now();
-    int cellX = std::floor(static_cast<float>(x) / (ESM::Land::LAND_SIZE - 1));
-    int cellY = std::floor(static_cast<float>(y) / (ESM::Land::LAND_SIZE - 1));
-    int localX = x - cellX * (ESM::Land::LAND_SIZE - 1);
-    int localY = y - cellY * (ESM::Land::LAND_SIZE - 1);
-
-    CSMWorld::CellCoordinates coords (cellX, cellY);
-
-    float landHeight = 0.f;
-    if (CSVRender::Cell* cell = dynamic_cast<CSVRender::Cell*>(mWorldspaceWidget->getCell(coords)))
-    {
-        landHeight = cell->getSumOfAlteredAndTrueHeight(cellX, cellY, localX, localY);
-    }
-    else if (isLandLoaded(CSMWorld::CellCoordinates::generateId(cellX, cellY)))
-    {
-        CSMDoc::Document& document = mWorldspaceWidget->getDocument();
-        CSMWorld::IdTable& landTable = dynamic_cast<CSMWorld::IdTable&> ( *document.getData().getTableModel (CSMWorld::UniversalId::Type_Land));
-        std::string cellId = CSMWorld::CellCoordinates::generateId(cellX, cellY);
-        int landshapeColumn = landTable.findColumnIndex(CSMWorld::Columns::ColumnId_LandHeightsIndex);
-        const CSMWorld::LandHeightsColumn::DataType mPointer = landTable.data(landTable.getModelIndex(cellId, landshapeColumn)).value<CSMWorld::LandHeightsColumn::DataType>();
-        auto stop = std::chrono::high_resolution_clock::now();
-        int duration = std::chrono::duration_cast<std::chrono::microseconds>(stop - start).count();
-        mDurationsA += duration;
-        mDurationsAMeasurements++;
-        return mPointer[localY*ESM::Land::LAND_SIZE + localX];
-    }
-    auto stop = std::chrono::high_resolution_clock::now();
-    int duration = std::chrono::duration_cast<std::chrono::microseconds>(stop - start).count();
-    mDurationsB += duration;
-    mDurationsBMeasurements++;
-    return landHeight;
-}*/
-
-
-void CSVRender::TerrainSelection::resetMeasurements()
-{
-    mDurationsA = 0;
-    mDurationsB = 0;
-    mDurationsAMeasurements = 0;
-    mDurationsBMeasurements = 0;
-}
-
-void CSVRender::TerrainSelection::printMeasurements()
-{
-    if (mDurationsAMeasurements != 0)
-        Log(Debug::Warning) << "A (total) " << mDurationsA << "(avg) " << mDurationsA / mDurationsAMeasurements << "(meas.) " << mDurationsAMeasurements;
-
-    if (mDurationsBMeasurements != 0)
-        Log(Debug::Warning) << "B (total) " << mDurationsB << "(avg) " << mDurationsB / mDurationsBMeasurements << "(meas.) " << mDurationsBMeasurements;
-}
diff --git a/apps/opencs/view/render/terrainselection.hpp b/apps/opencs/view/render/terrainselection.hpp
index c8c7bc7aab..868c3aea42 100644
--- a/apps/opencs/view/render/terrainselection.hpp
+++ b/apps/opencs/view/render/terrainselection.hpp
@@ -64,10 +64,6 @@ namespace CSVRender
 
         private:
 
-            void resetMeasurements();
-
-            void printMeasurements();
-
             void handleSelection(const std::vector<std::pair<int, int>>& localPositions, bool toggleInProgress, SelectionMethod selectionMethod);
 
             bool noCell(const std::string& cellId);
@@ -87,10 +83,6 @@ namespace CSVRender
             std::vector<std::pair<int, int>> mTemporarySelection; // Used during toggle to compare the most recent drag operation
             bool mDraggedOperationFlag; //true during drag operation, false when click-operation
             TerrainSelectionType mSelectionType;
-            int mDurationsA;
-            int mDurationsB;
-            int mDurationsAMeasurements;
-            int mDurationsBMeasurements;
     };
 }
 

From 89a20b6ea5e8677d2c9139201aea41cc2bb58a93 Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Sun, 3 Oct 2021 23:50:42 +0300
Subject: [PATCH 1483/2859] Call dragEnded instead of pressed also after
 aborted operation

---
 apps/opencs/view/render/worldspacewidget.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index c51479f897..d3bf1fcf0c 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -464,7 +464,6 @@ void CSVRender::WorldspaceWidget::abortDrag()
         EditMode& editMode = dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent());
 
         editMode.dragAborted();
-        mDragging = false;
         mDragMode = InteractionType_None;
     }
 }

From 46960825ef8c3ba1d722e92353f5c08cbdf2c5f8 Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Mon, 4 Oct 2021 00:20:39 +0300
Subject: [PATCH 1484/2859] Various terrain selection and editmode dragging
 fixes

---
 apps/opencs/view/render/terrainselection.cpp  | 79 +++++--------------
 apps/opencs/view/render/terrainselection.hpp  | 10 +--
 apps/opencs/view/render/terrainshapemode.cpp  | 39 ++++-----
 apps/opencs/view/render/terrainshapemode.hpp  |  2 +-
 .../opencs/view/render/terraintexturemode.cpp | 37 ++++++---
 .../opencs/view/render/terraintexturemode.hpp |  2 +-
 6 files changed, 68 insertions(+), 101 deletions(-)

diff --git a/apps/opencs/view/render/terrainselection.cpp b/apps/opencs/view/render/terrainselection.cpp
index 8b855fc91b..03009e8701 100644
--- a/apps/opencs/view/render/terrainselection.cpp
+++ b/apps/opencs/view/render/terrainselection.cpp
@@ -8,7 +8,6 @@
 #include <osg/PositionAttitudeTransform>
 
 #include <components/esm/loadland.hpp>
-#include <components/debug/debuglog.hpp>
 
 #include "../../model/world/cellcoordinates.hpp"
 #include "../../model/world/columnimp.hpp"
@@ -18,7 +17,7 @@
 #include "worldspacewidget.hpp"
 
 CSVRender::TerrainSelection::TerrainSelection(osg::Group* parentNode, WorldspaceWidget *worldspaceWidget, TerrainSelectionType type):
-mParentNode(parentNode), mWorldspaceWidget (worldspaceWidget), mDraggedOperationFlag(false), mSelectionType(type)
+mParentNode(parentNode), mWorldspaceWidget (worldspaceWidget), mSelectionType(type)
 {
     mGeometry = new osg::Geometry();
 
@@ -47,19 +46,25 @@ void CSVRender::TerrainSelection::onlySelect(const std::vector<std::pair<int, in
     update();
 }
 
-void CSVRender::TerrainSelection::addSelect(const std::vector<std::pair<int, int>>& localPositions, bool toggleInProgress)
+void CSVRender::TerrainSelection::addSelect(const std::vector<std::pair<int, int>>& localPositions)
 {
-    handleSelection(localPositions, toggleInProgress, SelectionMethod::AddSelect);
+    handleSelection(localPositions, SelectionMethod::AddSelect);
 }
 
-void CSVRender::TerrainSelection::removeSelect(const std::vector<std::pair<int, int>>& localPositions, bool toggleInProgress)
+void CSVRender::TerrainSelection::removeSelect(const std::vector<std::pair<int, int>>& localPositions)
 {
-    handleSelection(localPositions, toggleInProgress, SelectionMethod::RemoveSelect);
+    handleSelection(localPositions, SelectionMethod::RemoveSelect);
 }
 
-void CSVRender::TerrainSelection::toggleSelect(const std::vector<std::pair<int, int>>& localPositions, bool toggleInProgress)
+void CSVRender::TerrainSelection::toggleSelect(const std::vector<std::pair<int, int>>& localPositions)
 {
-    handleSelection(localPositions, toggleInProgress, SelectionMethod::ToggleSelect);
+    handleSelection(localPositions, SelectionMethod::ToggleSelect);
+}
+
+void CSVRender::TerrainSelection::clearTemporarySelection()
+{
+    mTemporarySelection.clear();
+    update();
 }
 
 void CSVRender::TerrainSelection::activate()
@@ -202,56 +207,13 @@ void CSVRender::TerrainSelection::drawTextureSelection(const osg::ref_ptr<osg::V
     }
 }
 
-void CSVRender::TerrainSelection::handleSelection(const std::vector<std::pair<int, int>>& localPositions, bool toggleInProgress, SelectionMethod selectionMethod)
+void CSVRender::TerrainSelection::handleSelection(const std::vector<std::pair<int, int>>& localPositions, SelectionMethod selectionMethod)
 {
-    if (toggleInProgress)
+    for (auto const& localPos : localPositions)
     {
-        for (auto const& localPos : localPositions)
-        {
-            auto iterTemp = std::find(mTemporarySelection.begin(), mTemporarySelection.end(), localPos);
-            mDraggedOperationFlag = true;
+        auto iterTemp = std::find(mTemporarySelection.begin(), mTemporarySelection.end(), localPos);
 
-            if (iterTemp == mTemporarySelection.end())
-            {
-                auto iter = std::find(mSelection.begin(), mSelection.end(), localPos);
-
-                switch (selectionMethod)
-                {
-                case SelectionMethod::AddSelect:
-                    if (iter == mSelection.end())
-                    {
-                        mSelection.emplace_back(localPos);
-                    }
-
-                    break;
-                case SelectionMethod::RemoveSelect:
-                    if (iter != mSelection.end())
-                    {
-                        mSelection.erase(iter);
-                    }
-
-                    break;
-                case SelectionMethod::ToggleSelect:
-                    if (iter == mSelection.end())
-                    {
-                        mSelection.emplace_back(localPos);
-                    }
-                    else
-                    {
-                        mSelection.erase(iter);
-                    }
-
-                    break;
-                default: break;
-                }
-            }
-
-            mTemporarySelection.push_back(localPos);
-        }
-    }
-    else if (mDraggedOperationFlag == false)
-    {
-        for (auto const& localPos : localPositions)
+        if (iterTemp == mTemporarySelection.end())
         {
             const auto iter = std::find(mSelection.begin(), mSelection.end(), localPos);
 
@@ -285,14 +247,9 @@ void CSVRender::TerrainSelection::handleSelection(const std::vector<std::pair<in
             default: break;
             }
         }
-    }
-    else
-    {
-        mDraggedOperationFlag = false;
 
-        mTemporarySelection.clear();
+        mTemporarySelection.emplace_back(localPos);
     }
-
     update();
 }
 
diff --git a/apps/opencs/view/render/terrainselection.hpp b/apps/opencs/view/render/terrainselection.hpp
index 868c3aea42..1d0da7bb59 100644
--- a/apps/opencs/view/render/terrainselection.hpp
+++ b/apps/opencs/view/render/terrainselection.hpp
@@ -44,9 +44,10 @@ namespace CSVRender
             ~TerrainSelection();
 
             void onlySelect(const std::vector<std::pair<int, int>> &localPositions);
-            void addSelect(const std::vector<std::pair<int, int>>& localPositions, bool toggleInProgress);
-            void removeSelect(const std::vector<std::pair<int, int>>& localPositions, bool toggleInProgress);
-            void toggleSelect(const std::vector<std::pair<int, int>> &localPositions, bool toggleInProgress);
+            void addSelect(const std::vector<std::pair<int, int>>& localPositions);
+            void removeSelect(const std::vector<std::pair<int, int>>& localPositions);
+            void toggleSelect(const std::vector<std::pair<int, int>> &localPositions);
+            void clearTemporarySelection();
 
             void activate();
             void deactivate();
@@ -64,7 +65,7 @@ namespace CSVRender
 
         private:
 
-            void handleSelection(const std::vector<std::pair<int, int>>& localPositions, bool toggleInProgress, SelectionMethod selectionMethod);
+            void handleSelection(const std::vector<std::pair<int, int>>& localPositions, SelectionMethod selectionMethod);
 
             bool noCell(const std::string& cellId);
 
@@ -81,7 +82,6 @@ namespace CSVRender
             osg::ref_ptr<osg::Group> mSelectionNode;
             std::vector<std::pair<int, int>> mSelection; // Global terrain selection coordinate in either vertex or texture units
             std::vector<std::pair<int, int>> mTemporarySelection; // Used during toggle to compare the most recent drag operation
-            bool mDraggedOperationFlag; //true during drag operation, false when click-operation
             TerrainSelectionType mSelectionType;
     };
 }
diff --git a/apps/opencs/view/render/terrainshapemode.cpp b/apps/opencs/view/render/terrainshapemode.cpp
index 0504944954..21359a8684 100644
--- a/apps/opencs/view/render/terrainshapemode.cpp
+++ b/apps/opencs/view/render/terrainshapemode.cpp
@@ -106,16 +106,6 @@ void CSVRender::TerrainShapeMode::primaryEditPressed(const WorldspaceHitResult&
             editTerrainShapeGrid(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), true);
             applyTerrainEditChanges();
         }
-
-        if (mDragMode == InteractionType_PrimarySelect)
-        {
-            selectTerrainShapes(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), 0, true);
-        }
-
-        if (mDragMode == InteractionType_SecondarySelect)
-        {
-            selectTerrainShapes(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), 1, true);
-        }
     }
     clearTransientEdits();
 }
@@ -124,7 +114,7 @@ void CSVRender::TerrainShapeMode::primarySelectPressed(const WorldspaceHitResult
 {
     if(hit.hit && hit.tag == nullptr)
     {
-        selectTerrainShapes(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), 0, false);
+        selectTerrainShapes(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), 0);
     }
 }
 
@@ -132,7 +122,7 @@ void CSVRender::TerrainShapeMode::secondarySelectPressed(const WorldspaceHitResu
 {
     if(hit.hit && hit.tag == nullptr)
     {
-        selectTerrainShapes(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), 1, false);
+        selectTerrainShapes(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), 1);
     }
 }
 
@@ -167,8 +157,8 @@ bool CSVRender::TerrainShapeMode::primarySelectStartDrag (const QPoint& pos)
         mDragMode = InteractionType_None;
         return false;
     }
-    selectTerrainShapes(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), 0, true);
-    return false;
+    selectTerrainShapes(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), 0);
+    return true;
 }
 
 bool CSVRender::TerrainShapeMode::secondarySelectStartDrag (const QPoint& pos)
@@ -180,8 +170,8 @@ bool CSVRender::TerrainShapeMode::secondarySelectStartDrag (const QPoint& pos)
         mDragMode = InteractionType_None;
         return false;
     }
-    selectTerrainShapes(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), 1, true);
-    return false;
+    selectTerrainShapes(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), 1);
+    return true;
 }
 
 void CSVRender::TerrainShapeMode::drag (const QPoint& pos, int diffX, int diffY, double speedFactor)
@@ -200,13 +190,13 @@ void CSVRender::TerrainShapeMode::drag (const QPoint& pos, int diffX, int diffY,
     if (mDragMode == InteractionType_PrimarySelect)
     {
         WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
-        if (hit.hit && hit.tag == nullptr) selectTerrainShapes(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), 0, true);
+        if (hit.hit && hit.tag == nullptr) selectTerrainShapes(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), 0);
     }
 
     if (mDragMode == InteractionType_SecondarySelect)
     {
         WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
-        if (hit.hit && hit.tag == nullptr) selectTerrainShapes(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), 1, true);
+        if (hit.hit && hit.tag == nullptr) selectTerrainShapes(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), 1);
     }
 }
 
@@ -217,12 +207,17 @@ void CSVRender::TerrainShapeMode::dragCompleted(const QPoint& pos)
         applyTerrainEditChanges();
         clearTransientEdits();
     }
+    if (mDragMode == InteractionType_PrimarySelect || mDragMode == InteractionType_SecondarySelect)
+    {
+        mTerrainShapeSelection->clearTemporarySelection();
+    }
 }
 
 
 void CSVRender::TerrainShapeMode::dragAborted()
 {
      clearTransientEdits();
+     mDragMode = InteractionType_None;
 }
 
 void CSVRender::TerrainShapeMode::dragWheel (int diff, double speedFactor)
@@ -1076,7 +1071,7 @@ void CSVRender::TerrainShapeMode::handleSelection(int globalSelectionX, int glob
     }
 }
 
-void CSVRender::TerrainShapeMode::selectTerrainShapes(const std::pair<int, int>& vertexCoords, unsigned char selectMode, bool dragOperation)
+void CSVRender::TerrainShapeMode::selectTerrainShapes(const std::pair<int, int>& vertexCoords, unsigned char selectMode)
 {
     int r = mBrushSize / 2;
     std::vector<std::pair<int, int>> selections;
@@ -1136,11 +1131,11 @@ void CSVRender::TerrainShapeMode::selectTerrainShapes(const std::pair<int, int>&
     if (selectAction == "Select only")
         mTerrainShapeSelection->onlySelect(selections);
     else if (selectAction == "Add to selection")
-        mTerrainShapeSelection->addSelect(selections, dragOperation);
+        mTerrainShapeSelection->addSelect(selections);
     else if (selectAction == "Remove from selection")
-        mTerrainShapeSelection->removeSelect(selections, dragOperation);
+        mTerrainShapeSelection->removeSelect(selections);
     else if (selectAction == "Invert selection")
-        mTerrainShapeSelection->toggleSelect(selections, dragOperation);
+        mTerrainShapeSelection->toggleSelect(selections);
 }
 
 void CSVRender::TerrainShapeMode::pushEditToCommand(const CSMWorld::LandHeightsColumn::DataType& newLandGrid, CSMDoc::Document& document,
diff --git a/apps/opencs/view/render/terrainshapemode.hpp b/apps/opencs/view/render/terrainshapemode.hpp
index abc4b8aba8..8b40483be4 100644
--- a/apps/opencs/view/render/terrainshapemode.hpp
+++ b/apps/opencs/view/render/terrainshapemode.hpp
@@ -142,7 +142,7 @@ namespace CSVRender
             void handleSelection(int globalSelectionX, int globalSelectionY, std::vector<std::pair<int, int>>* selections);
 
             /// Handle brush mechanics for terrain shape selection
-            void selectTerrainShapes (const std::pair<int, int>& vertexCoords, unsigned char selectMode, bool dragOperation);
+            void selectTerrainShapes (const std::pair<int, int>& vertexCoords, unsigned char selectMode);
 
             /// Push terrain shape edits to command macro
             void pushEditToCommand (const CSMWorld::LandHeightsColumn::DataType& newLandGrid, CSMDoc::Document& document,
diff --git a/apps/opencs/view/render/terraintexturemode.cpp b/apps/opencs/view/render/terraintexturemode.cpp
index dfcc29ae01..5f1cc354f6 100644
--- a/apps/opencs/view/render/terraintexturemode.cpp
+++ b/apps/opencs/view/render/terraintexturemode.cpp
@@ -129,7 +129,7 @@ void CSVRender::TerrainTextureMode::primarySelectPressed(const WorldspaceHitResu
 {
     if(hit.hit && hit.tag == nullptr)
     {
-        selectTerrainTextures(CSMWorld::CellCoordinates::toTextureCoords(hit.worldPos), 0, false);
+        selectTerrainTextures(CSMWorld::CellCoordinates::toTextureCoords(hit.worldPos), 0);
     }
 }
 
@@ -137,7 +137,7 @@ void CSVRender::TerrainTextureMode::secondarySelectPressed(const WorldspaceHitRe
 {
     if(hit.hit && hit.tag == nullptr)
     {
-        selectTerrainTextures(CSMWorld::CellCoordinates::toTextureCoords(hit.worldPos), 1, false);
+        selectTerrainTextures(CSMWorld::CellCoordinates::toTextureCoords(hit.worldPos), 1);
     }
 }
 
@@ -188,8 +188,8 @@ bool CSVRender::TerrainTextureMode::primarySelectStartDrag (const QPoint& pos)
         mDragMode = InteractionType_None;
         return false;
     }
-    selectTerrainTextures(CSMWorld::CellCoordinates::toTextureCoords(hit.worldPos), 0, true);
-    return false;
+    selectTerrainTextures(CSMWorld::CellCoordinates::toTextureCoords(hit.worldPos), 0);
+    return true;
 }
 
 bool CSVRender::TerrainTextureMode::secondarySelectStartDrag (const QPoint& pos)
@@ -201,8 +201,8 @@ bool CSVRender::TerrainTextureMode::secondarySelectStartDrag (const QPoint& pos)
         mDragMode = InteractionType_None;
         return false;
     }
-    selectTerrainTextures(CSMWorld::CellCoordinates::toTextureCoords(hit.worldPos), 1, true);
-    return false;
+    selectTerrainTextures(CSMWorld::CellCoordinates::toTextureCoords(hit.worldPos), 1);
+    return true;
 }
 
 void CSVRender::TerrainTextureMode::drag (const QPoint& pos, int diffX, int diffY, double speedFactor)
@@ -225,13 +225,13 @@ void CSVRender::TerrainTextureMode::drag (const QPoint& pos, int diffX, int diff
     if (mDragMode == InteractionType_PrimarySelect)
     {
         WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
-        if (hit.hit && hit.tag == nullptr) selectTerrainTextures(CSMWorld::CellCoordinates::toTextureCoords(hit.worldPos), 0, true);
+        if (hit.hit && hit.tag == nullptr) selectTerrainTextures(CSMWorld::CellCoordinates::toTextureCoords(hit.worldPos), 0);
     }
 
     if (mDragMode == InteractionType_SecondarySelect)
     {
         WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
-        if (hit.hit && hit.tag == nullptr) selectTerrainTextures(CSMWorld::CellCoordinates::toTextureCoords(hit.worldPos), 1, true);
+        if (hit.hit && hit.tag == nullptr) selectTerrainTextures(CSMWorld::CellCoordinates::toTextureCoords(hit.worldPos), 1);
     }
 }
 
@@ -251,6 +251,8 @@ void CSVRender::TerrainTextureMode::dragCompleted(const QPoint& pos)
              mIsEditing = false;
         }
     }
+
+    mTerrainTextureSelection->clearTemporarySelection();
 }
 
 void CSVRender::TerrainTextureMode::dragAborted()
@@ -496,7 +498,7 @@ bool CSVRender::TerrainTextureMode::isInCellSelection(int globalSelectionX, int
 }
 
 
-void CSVRender::TerrainTextureMode::selectTerrainTextures(const std::pair<int, int>& texCoords, unsigned char selectMode, bool dragOperation)
+void CSVRender::TerrainTextureMode::selectTerrainTextures(const std::pair<int, int>& texCoords, unsigned char selectMode)
 {
     int r = mBrushSize / 2;
     std::vector<std::pair<int, int>> selections;
@@ -559,8 +561,21 @@ void CSVRender::TerrainTextureMode::selectTerrainTextures(const std::pair<int, i
         }
     }
 
-    if(selectMode == 0) mTerrainTextureSelection->onlySelect(selections);
-    if(selectMode == 1) mTerrainTextureSelection->toggleSelect(selections, dragOperation);
+    std::string selectAction;
+
+    if (selectMode == 0)
+        selectAction = CSMPrefs::get()["3D Scene Editing"]["primary-select-action"].toString();
+    else
+        selectAction = CSMPrefs::get()["3D Scene Editing"]["secondary-select-action"].toString();
+
+    if (selectAction == "Select only")
+        mTerrainTextureSelection->onlySelect(selections);
+    else if (selectAction == "Add to selection")
+        mTerrainTextureSelection->addSelect(selections);
+    else if (selectAction == "Remove from selection")
+        mTerrainTextureSelection->removeSelect(selections);
+    else if (selectAction == "Invert selection")
+        mTerrainTextureSelection->toggleSelect(selections);
 }
 
 void CSVRender::TerrainTextureMode::pushEditToCommand(CSMWorld::LandTexturesColumn::DataType& newLandGrid, CSMDoc::Document& document,
diff --git a/apps/opencs/view/render/terraintexturemode.hpp b/apps/opencs/view/render/terraintexturemode.hpp
index e0c6e4b40f..06c95e3d79 100644
--- a/apps/opencs/view/render/terraintexturemode.hpp
+++ b/apps/opencs/view/render/terraintexturemode.hpp
@@ -95,7 +95,7 @@ namespace CSVRender
             bool isInCellSelection(int globalSelectionX, int globalSelectionY);
 
             /// \brief Handle brush mechanics for texture selection
-            void selectTerrainTextures (const std::pair<int, int>& texCoords, unsigned char selectMode, bool dragOperation);
+            void selectTerrainTextures (const std::pair<int, int>& texCoords, unsigned char selectMode);
 
             /// \brief Push texture edits to command macro
             void pushEditToCommand (CSMWorld::LandTexturesColumn::DataType& newLandGrid, CSMDoc::Document& document,

From 55456a19fc179893ba86ea2311dce45979dad019 Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Mon, 4 Oct 2021 01:03:01 +0300
Subject: [PATCH 1485/2859] Only iterate through temporary selection when using
 toggle

---
 apps/opencs/view/render/terrainselection.cpp  | 40 ++++++++++---------
 apps/opencs/view/render/terrainshapemode.cpp  |  2 +
 .../opencs/view/render/terraintexturemode.cpp |  2 +
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/apps/opencs/view/render/terrainselection.cpp b/apps/opencs/view/render/terrainselection.cpp
index 03009e8701..9c052c9d5a 100644
--- a/apps/opencs/view/render/terrainselection.cpp
+++ b/apps/opencs/view/render/terrainselection.cpp
@@ -64,7 +64,6 @@ void CSVRender::TerrainSelection::toggleSelect(const std::vector<std::pair<int,
 void CSVRender::TerrainSelection::clearTemporarySelection()
 {
     mTemporarySelection.clear();
-    update();
 }
 
 void CSVRender::TerrainSelection::activate()
@@ -211,45 +210,50 @@ void CSVRender::TerrainSelection::handleSelection(const std::vector<std::pair<in
 {
     for (auto const& localPos : localPositions)
     {
-        auto iterTemp = std::find(mTemporarySelection.begin(), mTemporarySelection.end(), localPos);
+        const auto iter = std::find(mSelection.begin(), mSelection.end(), localPos);
 
-        if (iterTemp == mTemporarySelection.end())
+        switch (selectionMethod)
         {
-            const auto iter = std::find(mSelection.begin(), mSelection.end(), localPos);
+            case SelectionMethod::OnlySelect:
+                break;
 
-            switch (selectionMethod)
-            {
             case SelectionMethod::AddSelect:
                 if (iter == mSelection.end())
                 {
                     mSelection.emplace_back(localPos);
                 }
-
                 break;
+
             case SelectionMethod::RemoveSelect:
                 if (iter != mSelection.end())
                 {
                     mSelection.erase(iter);
                 }
-
                 break;
+
             case SelectionMethod::ToggleSelect:
-                if (iter == mSelection.end())
-                {
-                    mSelection.emplace_back(localPos);
-                }
-                else
+            {
+                const auto iterTemp = std::find(mTemporarySelection.begin(), mTemporarySelection.end(), localPos);
+                if (iterTemp == mTemporarySelection.end())
                 {
-                    mSelection.erase(iter);
+                    if (iter == mSelection.end())
+                    {
+                        mSelection.emplace_back(localPos);
+                    }
+                    else
+                    {
+                        mSelection.erase(iter);
+                    }
                 }
-
+                mTemporarySelection.emplace_back(localPos);
                 break;
-            default: break;
             }
-        }
 
-        mTemporarySelection.emplace_back(localPos);
+            default:
+                break;
+        }
     }
+
     update();
 }
 
diff --git a/apps/opencs/view/render/terrainshapemode.cpp b/apps/opencs/view/render/terrainshapemode.cpp
index 21359a8684..936e8d6778 100644
--- a/apps/opencs/view/render/terrainshapemode.cpp
+++ b/apps/opencs/view/render/terrainshapemode.cpp
@@ -115,6 +115,7 @@ void CSVRender::TerrainShapeMode::primarySelectPressed(const WorldspaceHitResult
     if(hit.hit && hit.tag == nullptr)
     {
         selectTerrainShapes(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), 0);
+        mTerrainShapeSelection->clearTemporarySelection();
     }
 }
 
@@ -123,6 +124,7 @@ void CSVRender::TerrainShapeMode::secondarySelectPressed(const WorldspaceHitResu
     if(hit.hit && hit.tag == nullptr)
     {
         selectTerrainShapes(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), 1);
+        mTerrainShapeSelection->clearTemporarySelection();
     }
 }
 
diff --git a/apps/opencs/view/render/terraintexturemode.cpp b/apps/opencs/view/render/terraintexturemode.cpp
index 5f1cc354f6..113acd2a21 100644
--- a/apps/opencs/view/render/terraintexturemode.cpp
+++ b/apps/opencs/view/render/terraintexturemode.cpp
@@ -130,6 +130,7 @@ void CSVRender::TerrainTextureMode::primarySelectPressed(const WorldspaceHitResu
     if(hit.hit && hit.tag == nullptr)
     {
         selectTerrainTextures(CSMWorld::CellCoordinates::toTextureCoords(hit.worldPos), 0);
+        mTerrainTextureSelection->clearTemporarySelection();
     }
 }
 
@@ -138,6 +139,7 @@ void CSVRender::TerrainTextureMode::secondarySelectPressed(const WorldspaceHitRe
     if(hit.hit && hit.tag == nullptr)
     {
         selectTerrainTextures(CSMWorld::CellCoordinates::toTextureCoords(hit.worldPos), 1);
+        mTerrainTextureSelection->clearTemporarySelection();
     }
 }
 

From 28278e9a826f20e7d4d62d0c5a4b2c7d63b2f40b Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Mon, 4 Oct 2021 01:27:57 +0300
Subject: [PATCH 1486/2859] Drawing duplicate lines is faster than iterating
 through big containers

---
 apps/opencs/view/render/terrainselection.cpp | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/apps/opencs/view/render/terrainselection.cpp b/apps/opencs/view/render/terrainselection.cpp
index 9c052c9d5a..5a8448e1d6 100644
--- a/apps/opencs/view/render/terrainselection.cpp
+++ b/apps/opencs/view/render/terrainselection.cpp
@@ -116,20 +116,10 @@ void CSVRender::TerrainSelection::drawShapeSelection(const osg::ref_ptr<osg::Vec
             vertices->push_back(osg::Vec3f(xWorldCoord, CSMWorld::CellCoordinates::vertexGlobalToWorldCoords(y - 1), calculateLandHeight(x, y - 1)));
             vertices->push_back(pointXY);
             vertices->push_back(osg::Vec3f(CSMWorld::CellCoordinates::vertexGlobalToWorldCoords(x - 1), yWorldCoord, calculateLandHeight(x - 1, y)));
-
-            const auto north = std::find(mSelection.begin(), mSelection.end(), std::make_pair(x, y + 1));
-            if (north == mSelection.end())
-            {
-                vertices->push_back(pointXY);
-                vertices->push_back(osg::Vec3f(xWorldCoord, CSMWorld::CellCoordinates::vertexGlobalToWorldCoords(y + 1), calculateLandHeight(x, y + 1)));
-            }
-
-            const auto east = std::find(mSelection.begin(), mSelection.end(), std::make_pair(x + 1, y));
-            if (east == mSelection.end())
-            {
-                vertices->push_back(pointXY);
-                vertices->push_back(osg::Vec3f(CSMWorld::CellCoordinates::vertexGlobalToWorldCoords(x + 1), yWorldCoord, calculateLandHeight(x + 1, y)));
-            }
+            vertices->push_back(pointXY);
+            vertices->push_back(osg::Vec3f(xWorldCoord, CSMWorld::CellCoordinates::vertexGlobalToWorldCoords(y + 1), calculateLandHeight(x, y + 1)));
+            vertices->push_back(pointXY);
+            vertices->push_back(osg::Vec3f(CSMWorld::CellCoordinates::vertexGlobalToWorldCoords(x + 1), yWorldCoord, calculateLandHeight(x + 1, y)));
         }
     }
 }

From 14c4bba4a3230b468eeeca61dc472c3c26a191f8 Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Fri, 15 Oct 2021 21:53:15 +0300
Subject: [PATCH 1487/2859] Remove unused include

---
 apps/opencs/view/render/terrainselection.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/opencs/view/render/terrainselection.cpp b/apps/opencs/view/render/terrainselection.cpp
index 5a8448e1d6..1fc183ba47 100644
--- a/apps/opencs/view/render/terrainselection.cpp
+++ b/apps/opencs/view/render/terrainselection.cpp
@@ -1,7 +1,6 @@
 #include "terrainselection.hpp"
 
 #include <algorithm>
-#include <chrono>
 
 #include <osg/Group>
 #include <osg/Geometry>

From e65a7f10e7d2e619ae7327eb6f5088455711fe70 Mon Sep 17 00:00:00 2001
From: unelsson <unelsson@gmail.com>
Date: Fri, 15 Oct 2021 21:55:09 +0300
Subject: [PATCH 1488/2859] Add changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe6dc8db19..22a48cd510 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,6 +48,7 @@
     Bug #6273: Respawning NPCs rotation is inconsistent
     Bug #6282: Laura craft doesn't follow the player character
     Bug #6283: Avis Dorsey follows you after her death
+    Bug #6285: Brush template drawing and terrain selection drawing performance is very bad
     Bug #6289: Keyword search in dialogues expected the text to be all ASCII characters
     Bug #6291: Can't pickup the dead mage's journal from the mysterious hunter mod
     Bug #6302: Teleporting disabled actor breaks its disabled state

From 5f8e4870129809351911628a739d67d24c26dbd4 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 15 Oct 2021 22:40:26 +0200
Subject: [PATCH 1489/2859] Let's get testy! (#3172)

Let's try to get testing happening.
We also disable artefact building for now.
---
 .github/workflows/cmake.yml | 42 ++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 54966fdfb0..d53d2380d4 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -26,25 +26,37 @@ jobs:
         key: ${{ matrix.os }}-${{ env.BUILD_TYPE }}
         max-size: 1000M
 
+    - name: Install gtest
+      run: |
+        export CONFIGURATION="Release"
+        export GOOGLETEST_DIR="."
+        export GENERATOR="Unix Makefiles"
+        export CC="gcc"
+        export CXX="g++"
+        sudo -E CI/build_googletest.sh
+
     - name: Configure
-      run: cmake -S . -B . -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=./install -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_FLAGS='-Werror' -DCMAKE_CXX_FLAGS="-Werror -Wno-error=deprecated-declarations -Wno-error=nonnull -Wno-error=deprecated-copy"
+      run: cmake -S . -B . -DGTEST_ROOT="$(pwd)/googletest/build" -DGMOCK_ROOT="$(pwd)/googletest/build" -DBUILD_UNITTESTS=ON -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=./install -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_FLAGS='-Werror' -DCMAKE_CXX_FLAGS="-Werror -Wno-error=deprecated-declarations -Wno-error=nonnull -Wno-error=deprecated-copy"
 
     - name: Build
       run: cmake --build . --config ${{env.BUILD_TYPE}} --parallel 3
  
-    - name: Install
-      shell: bash
-      run: cmake --install .
+    - name: Test
+      run: ./openmw_test_suite
+
+#    - name: Install
+#      shell: bash
+#      run: cmake --install .
       
-    - name: Create Artifact
-      shell: bash
-      working-directory: install
-      run: |
-        ls -laR
-        7z a ../build_artifact.7z .
+#    - name: Create Artifact
+#      shell: bash
+#      working-directory: install
+#      run: |
+#        ls -laR
+#        7z a ../build_artifact.7z .
         
-    - name: Upload Artifact
-      uses: actions/upload-artifact@v1
-      with:
-        path: ./build_artifact.7z
-        name: build_artifact.7z
+#    - name: Upload Artifact
+#      uses: actions/upload-artifact@v1
+#      with:
+#        path: ./build_artifact.7z
+#        name: build_artifact.7z

From d06e69735694afdb96a68a9842260c6691cac35b Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 16 Oct 2021 00:22:40 +0200
Subject: [PATCH 1490/2859] Initialize RenderingManager fields before use

PostProcessor is constructed before mNearClip, mViewDistance, mFieldOfView are
initialized and the constructor calls updateProjectionMatrix that uses these
fields.

==16218== Conditional jump or move depends on uninitialised value(s)
==16218==    at 0x722EBE: min<float> (stl_algobase.h:235)
==16218==    by 0x722EBE: MWRender::RenderingManager::updateProjectionMatrix() (renderingmanager.cpp:1183)
==16218==    by 0x7D022F: MWRender::PostProcessor::PostProcessor(MWRender::RenderingManager&, osgViewer::Viewer*, osg::Group*) (postprocessor.cpp:144)
==16218==    by 0x728B41: MWRender::RenderingManager::RenderingManager(osgViewer::Viewer*, osg::ref_ptr<osg::Group>, Resource::ResourceSystem*, SceneUtil::WorkQueue*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, DetourNavigator::Navigator&) (renderingmanager.cpp:452)
==16218==    by 0xBB5E65: MWWorld::World::World(osgViewer::Viewer*, osg::ref_ptr<osg::Group>, Resource::ResourceSystem*, SceneUtil::WorkQueue*, Files::Collections const&, std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&, std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&, ToUTF8::Utf8Encoder*, int, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) (worldimp.cpp:190)
==16218==    by 0xDEEA6F: OMW::Engine::prepareEngine(Settings::Manager&) (engine.cpp:789)
==16218==    by 0xDF2068: OMW::Engine::go() (engine.cpp:959)
==16218==    by 0xDE7B8F: runApplication(int, char**) (main.cpp:220)
==16218==    by 0x1006593: wrapApplication(int (*)(int, char**), int, char**, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) (debugging.cpp:205)
==16218==    by 0x7152C3: main (main.cpp:232)
==16218==

==17455== Conditional jump or move depends on uninitialised value(s)
==17455==    at 0x4F8613F: osg::Matrixd::makeFrustum(double, double, double, double, double, double) (Matrix_implementation.cpp:916)
==17455==    by 0x4EC0E11: osg::Camera::setProjectionMatrixAsPerspective(double, double, double, double) (Matrixd:580)
==17455==    by 0x722DDA: MWRender::RenderingManager::updateProjectionMatrix() (renderingmanager.cpp:1167)
==17455==    by 0x7D01EF: MWRender::PostProcessor::PostProcessor(MWRender::RenderingManager&, osgViewer::Viewer*, osg::Group*) (postprocessor.cpp:144)
==17455==    by 0x728BA1: MWRender::RenderingManager::RenderingManager(osgViewer::Viewer*, osg::ref_ptr<osg::Group>, Resource::ResourceSystem*, SceneUtil::WorkQueue*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, DetourNavigator::Navigator&) (renderingmanager.cpp:453)
==17455==    by 0xBB5E25: MWWorld::World::World(osgViewer::Viewer*, osg::ref_ptr<osg::Group>, Resource::ResourceSystem*, SceneUtil::WorkQueue*, Files::Collections const&, std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&, std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&, ToUTF8::Utf8Encoder*, int, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) (worldimp.cpp:190)
==17455==    by 0xDEEA3F: OMW::Engine::prepareEngine(Settings::Manager&) (engine.cpp:789)
==17455==    by 0xDF2038: OMW::Engine::go() (engine.cpp:959)
==17455==    by 0xDE7B5F: runApplication(int, char**) (main.cpp:220)
==17455==    by 0x1006563: wrapApplication(int (*)(int, char**), int, char**, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) (debugging.cpp:205)
==17455==    by 0x7152C3: main (main.cpp:232)
==17455==
---
 apps/openmw/mwrender/renderingmanager.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 120f97e892..14000273db 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -293,8 +293,13 @@ namespace MWRender
         , mNavigator(navigator)
         , mMinimumAmbientLuminance(0.f)
         , mNightEyeFactor(0.f)
+        // TODO: Near clip should not need to be bounded like this, but too small values break OSG shadow calculations CPU-side.
+        // See issue: #6072
+        , mNearClip(std::max(0.005f, Settings::Manager::getFloat("near clip", "Camera")))
+        , mViewDistance(Settings::Manager::getFloat("viewing distance", "Camera"))
         , mFieldOfViewOverridden(false)
         , mFieldOfViewOverride(0.f)
+        , mFieldOfView(std::min(std::max(1.f, Settings::Manager::getFloat("field of view", "Camera")), 179.f))
     {
         bool reverseZ = SceneUtil::getReverseZ();
 
@@ -515,12 +520,6 @@ namespace MWRender
         NifOsg::Loader::setIntersectionDisabledNodeMask(Mask_Effect);
         Nif::NIFFile::setLoadUnsupportedFiles(Settings::Manager::getBool("load unsupported nif files", "Models"));
 
-        // TODO: Near clip should not need to be bounded like this, but too small values break OSG shadow calculations CPU-side.
-        // See issue: #6072
-        mNearClip = std::max(0.005f, Settings::Manager::getFloat("near clip", "Camera"));
-        mViewDistance = Settings::Manager::getFloat("viewing distance", "Camera");
-        float fov = Settings::Manager::getFloat("field of view", "Camera");
-        mFieldOfView = std::min(std::max(1.f, fov), 179.f);
         float firstPersonFov = Settings::Manager::getFloat("first person field of view", "Camera");
         mFirstPersonFieldOfView = std::min(std::max(1.f, firstPersonFov), 179.f);
         mStateUpdater->setFogEnd(mViewDistance);

From 501316a9f73c5702b0d6d3ea650773f128eaf0b5 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 16 Oct 2021 00:25:14 +0200
Subject: [PATCH 1491/2859] Add missing initialization in MWPhysics::Object

==16218== Conditional jump or move depends on uninitialised value(s)
==16218==    at 0xCDBC27: MWPhysics::Object::commitPositionChange() (object.cpp:68)
==16218==    by 0xCE5B64: MWPhysics::PhysicsTaskScheduler::updatePtrAabb(std::shared_ptr<MWPhysics::PtrHolder> const&) (mtphysics.cpp:446)
==16218==    by 0xCE5CC3: operator() (mtphysics.cpp:432)
==16218==    by 0xCE5CC3: for_each<std::_Rb_tree_const_iterator<std::shared_ptr<MWPhysics::PtrHolder> >, MWPhysics::PhysicsTaskScheduler::updateAabbs()::<lambda(const std::shared_ptr<MWPhysics::PtrHolder>&)> > (stl_algo.h:3820)
==16218==    by 0xCE5CC3: MWPhysics::PhysicsTaskScheduler::updateAabbs() (mtphysics.cpp:431)
==16218==    by 0xCE5E35: MWPhysics::PhysicsTaskScheduler::afterPreStep() (mtphysics.cpp:586)
==16218==    by 0xCE6238: operator() (mtphysics.cpp:533)
==16218==    by 0xCE6238: wait<MWPhysics::PhysicsTaskScheduler::doSimulation()::<lambda()> > (barrier.hpp:33)
==16218==    by 0xCE6238: MWPhysics::PhysicsTaskScheduler::doSimulation() (mtphysics.cpp:533)
==16218==    by 0xCE6377: MWPhysics::PhysicsTaskScheduler::worker() (mtphysics.cpp:464)
==16218==    by 0x74523C3: execute_native_thread_routine (thread.cc:82)
==16218==    by 0x76FF258: start_thread (in /usr/lib/libpthread-2.33.so)
==16218==    by 0x78155E2: clone (in /usr/lib/libc-2.33.so)
==16218==

==16218== Conditional jump or move depends on uninitialised value(s)
==16218==    at 0xCDBC30: MWPhysics::Object::commitPositionChange() (object.cpp:73)
==16218==    by 0xCE5B64: MWPhysics::PhysicsTaskScheduler::updatePtrAabb(std::shared_ptr<MWPhysics::PtrHolder> const&) (mtphysics.cpp:446)
==16218==    by 0xCE5CC3: operator() (mtphysics.cpp:432)
==16218==    by 0xCE5CC3: for_each<std::_Rb_tree_const_iterator<std::shared_ptr<MWPhysics::PtrHolder> >, MWPhysics::PhysicsTaskScheduler::updateAabbs()::<lambda(const std::shared_ptr<MWPhysics::PtrHolder>&)> > (stl_algo.h:3820)
==16218==    by 0xCE5CC3: MWPhysics::PhysicsTaskScheduler::updateAabbs() (mtphysics.cpp:431)
==16218==    by 0xCE5E35: MWPhysics::PhysicsTaskScheduler::afterPreStep() (mtphysics.cpp:586)
==16218==    by 0xCE6238: operator() (mtphysics.cpp:533)
==16218==    by 0xCE6238: wait<MWPhysics::PhysicsTaskScheduler::doSimulation()::<lambda()> > (barrier.hpp:33)
==16218==    by 0xCE6238: MWPhysics::PhysicsTaskScheduler::doSimulation() (mtphysics.cpp:533)
==16218==    by 0xCE6377: MWPhysics::PhysicsTaskScheduler::worker() (mtphysics.cpp:464)
==16218==    by 0x74523C3: execute_native_thread_routine (thread.cc:82)
==16218==    by 0x76FF258: start_thread (in /usr/lib/libpthread-2.33.so)
==16218==    by 0x78155E2: clone (in /usr/lib/libc-2.33.so)
==16218==
---
 apps/openmw/mwphysics/object.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwphysics/object.hpp b/apps/openmw/mwphysics/object.hpp
index 1484c1472c..520a57a4e8 100644
--- a/apps/openmw/mwphysics/object.hpp
+++ b/apps/openmw/mwphysics/object.hpp
@@ -49,8 +49,8 @@ namespace MWPhysics
         btVector3 mScale;
         osg::Vec3f mPosition;
         osg::Quat mRotation;
-        bool mScaleUpdatePending;
-        bool mTransformUpdatePending;
+        bool mScaleUpdatePending = false;
+        bool mTransformUpdatePending = false;
         mutable std::mutex mPositionMutex;
         PhysicsTaskScheduler* mTaskScheduler;
     };

From c88367b6a6d517eb543bd05cc8b7968d5d0d6168 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 16 Oct 2021 13:03:15 +0200
Subject: [PATCH 1492/2859] Add sqlite3 helpers

---
 apps/openmw_test_suite/CMakeLists.txt         |   5 +
 apps/openmw_test_suite/sqlite3/db.cpp         |  15 +
 apps/openmw_test_suite/sqlite3/request.cpp    | 270 +++++++++++++++++
 apps/openmw_test_suite/sqlite3/statement.cpp  |  25 ++
 .../openmw_test_suite/sqlite3/transaction.cpp |  67 +++++
 components/CMakeLists.txt                     |   9 +
 components/sqlite3/db.cpp                     |  31 ++
 components/sqlite3/db.hpp                     |  21 ++
 components/sqlite3/request.hpp                | 275 ++++++++++++++++++
 components/sqlite3/statement.cpp              |  24 ++
 components/sqlite3/statement.hpp              |  35 +++
 components/sqlite3/transaction.cpp            |  33 +++
 components/sqlite3/transaction.hpp            |  27 ++
 13 files changed, 837 insertions(+)
 create mode 100644 apps/openmw_test_suite/sqlite3/db.cpp
 create mode 100644 apps/openmw_test_suite/sqlite3/request.cpp
 create mode 100644 apps/openmw_test_suite/sqlite3/statement.cpp
 create mode 100644 apps/openmw_test_suite/sqlite3/transaction.cpp
 create mode 100644 components/sqlite3/db.cpp
 create mode 100644 components/sqlite3/db.hpp
 create mode 100644 components/sqlite3/request.hpp
 create mode 100644 components/sqlite3/statement.cpp
 create mode 100644 components/sqlite3/statement.hpp
 create mode 100644 components/sqlite3/transaction.cpp
 create mode 100644 components/sqlite3/transaction.hpp

diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index 5665f59508..056a8d0a63 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -43,6 +43,11 @@ if (GTEST_FOUND AND GMOCK_FOUND)
 
         ../openmw/options.cpp
         openmw/options.cpp
+
+        sqlite3/db.cpp
+        sqlite3/request.cpp
+        sqlite3/statement.cpp
+        sqlite3/transaction.cpp
     )
 
     source_group(apps\\openmw_test_suite FILES openmw_test_suite.cpp ${UNITTEST_SRC_FILES})
diff --git a/apps/openmw_test_suite/sqlite3/db.cpp b/apps/openmw_test_suite/sqlite3/db.cpp
new file mode 100644
index 0000000000..d2c0cd8674
--- /dev/null
+++ b/apps/openmw_test_suite/sqlite3/db.cpp
@@ -0,0 +1,15 @@
+#include <components/sqlite3/db.hpp>
+
+#include <gtest/gtest.h>
+
+namespace
+{
+    using namespace testing;
+    using namespace Sqlite3;
+
+    TEST(Sqlite3DbTest, makeDbShouldCreateInMemoryDbWithSchema)
+    {
+        const auto db = makeDb(":memory:", "CREATE TABLE test ( id INTEGER )");
+        EXPECT_NE(db, nullptr);
+    }
+}
diff --git a/apps/openmw_test_suite/sqlite3/request.cpp b/apps/openmw_test_suite/sqlite3/request.cpp
new file mode 100644
index 0000000000..e0094827d1
--- /dev/null
+++ b/apps/openmw_test_suite/sqlite3/request.cpp
@@ -0,0 +1,270 @@
+#include <components/sqlite3/db.hpp>
+#include <components/sqlite3/request.hpp>
+#include <components/sqlite3/statement.hpp>
+#include <components/sqlite3/transaction.hpp>
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+#include <limits>
+#include <tuple>
+#include <vector>
+
+namespace
+{
+    using namespace testing;
+    using namespace Sqlite3;
+
+    template <class T>
+    struct InsertInt
+    {
+        static std::string_view text() noexcept { return "INSERT INTO ints (value) VALUES (:value)"; }
+
+        static void bind(sqlite3& db, sqlite3_stmt& statement, T value)
+        {
+            bindParameter(db, statement, ":value", value);
+        }
+    };
+
+    struct InsertReal
+    {
+        static std::string_view text() noexcept { return "INSERT INTO reals (value) VALUES (:value)"; }
+
+        static void bind(sqlite3& db, sqlite3_stmt& statement, double value)
+        {
+            bindParameter(db, statement, ":value", value);
+        }
+    };
+
+    struct InsertText
+    {
+        static std::string_view text() noexcept { return "INSERT INTO texts (value) VALUES (:value)"; }
+
+        static void bind(sqlite3& db, sqlite3_stmt& statement, std::string_view value)
+        {
+            bindParameter(db, statement, ":value", value);
+        }
+    };
+
+    struct InsertBlob
+    {
+        static std::string_view text() noexcept { return "INSERT INTO blobs (value) VALUES (:value)"; }
+
+        static void bind(sqlite3& db, sqlite3_stmt& statement, const std::vector<std::byte>& value)
+        {
+            bindParameter(db, statement, ":value", value);
+        }
+    };
+
+    struct GetAll
+    {
+        std::string mQuery;
+
+        explicit GetAll(const std::string& table) : mQuery("SELECT value FROM " + table + " ORDER BY value") {}
+
+        std::string_view text() noexcept { return mQuery; }
+        static void bind(sqlite3&, sqlite3_stmt&) {}
+    };
+
+    template <class T>
+    struct GetExact
+    {
+        std::string mQuery;
+
+        explicit GetExact(const std::string& table) : mQuery("SELECT value FROM " + table + " WHERE value = :value") {}
+
+        std::string_view text() noexcept { return mQuery; }
+
+        static void bind(sqlite3& db, sqlite3_stmt& statement, const T& value)
+        {
+            bindParameter(db, statement, ":value", value);
+        }
+    };
+
+    struct GetInt64
+    {
+        static std::string_view text() noexcept { return "SELECT value FROM ints WHERE value = :value"; }
+
+        static void bind(sqlite3& db, sqlite3_stmt& statement, std::int64_t value)
+        {
+            bindParameter(db, statement, ":value", value);
+        }
+    };
+
+    struct GetNull
+    {
+        static std::string_view text() noexcept { return "SELECT NULL"; }
+        static void bind(sqlite3&, sqlite3_stmt&) {}
+    };
+
+    struct Int
+    {
+        int mValue = 0;
+
+        Int() = default;
+
+        explicit Int(int value) : mValue(value) {}
+
+        Int& operator=(int value)
+        {
+            mValue = value;
+            return *this;
+        }
+
+        friend bool operator==(const Int& l, const Int& r)
+        {
+            return l.mValue == r.mValue;
+        }
+    };
+
+    constexpr const char schema[] = R"(
+        CREATE TABLE ints ( value INTEGER );
+        CREATE TABLE reals ( value REAL );
+        CREATE TABLE texts ( value TEXT );
+        CREATE TABLE blobs ( value BLOB );
+    )";
+
+    struct Sqlite3RequestTest : Test
+    {
+        const Db mDb = makeDb(":memory:", schema);
+    };
+
+    TEST_F(Sqlite3RequestTest, executeShouldSupportInt)
+    {
+        Statement insert(*mDb, InsertInt<int> {});
+        EXPECT_EQ(execute(*mDb, insert, 13), 1);
+        EXPECT_EQ(execute(*mDb, insert, 42), 1);
+        Statement select(*mDb, GetAll("ints"));
+        std::vector<std::tuple<int>> result;
+        request(*mDb, select, std::back_inserter(result), std::numeric_limits<std::size_t>::max());
+        EXPECT_THAT(result, ElementsAre(std::tuple(13), std::tuple(42)));
+    }
+
+    TEST_F(Sqlite3RequestTest, executeShouldSupportInt64)
+    {
+        Statement insert(*mDb, InsertInt<std::int64_t> {});
+        const std::int64_t value = 1099511627776;
+        EXPECT_EQ(execute(*mDb, insert, value), 1);
+        Statement select(*mDb, GetAll("ints"));
+        std::vector<std::tuple<int>> result;
+        request(*mDb, select, std::back_inserter(result), std::numeric_limits<std::size_t>::max());
+        EXPECT_THAT(result, ElementsAre(std::tuple(value)));
+    }
+
+    TEST_F(Sqlite3RequestTest, executeShouldSupportReal)
+    {
+        Statement insert(*mDb, InsertReal {});
+        EXPECT_EQ(execute(*mDb, insert, 3.14), 1);
+        Statement select(*mDb, GetAll("reals"));
+        std::vector<std::tuple<double>> result;
+        request(*mDb, select, std::back_inserter(result), std::numeric_limits<std::size_t>::max());
+        EXPECT_THAT(result, ElementsAre(std::tuple(3.14)));
+    }
+
+    TEST_F(Sqlite3RequestTest, executeShouldSupportText)
+    {
+        Statement insert(*mDb, InsertText {});
+        const std::string text = "foo";
+        EXPECT_EQ(execute(*mDb, insert, text), 1);
+        Statement select(*mDb, GetAll("texts"));
+        std::vector<std::tuple<std::string>> result;
+        request(*mDb, select, std::back_inserter(result), std::numeric_limits<std::size_t>::max());
+        EXPECT_THAT(result, ElementsAre(std::tuple(text)));
+    }
+
+    TEST_F(Sqlite3RequestTest, executeShouldSupportBlob)
+    {
+        Statement insert(*mDb, InsertBlob {});
+        const std::vector<std::byte> blob({std::byte(42), std::byte(13)});
+        EXPECT_EQ(execute(*mDb, insert, blob), 1);
+        Statement select(*mDb, GetAll("blobs"));
+        std::vector<std::tuple<std::vector<std::byte>>> result;
+        request(*mDb, select, std::back_inserter(result), std::numeric_limits<std::size_t>::max());
+        EXPECT_THAT(result, ElementsAre(std::tuple(blob)));
+    }
+
+    TEST_F(Sqlite3RequestTest, requestShouldSupportInt)
+    {
+        Statement insert(*mDb, InsertInt<int> {});
+        const int value = 42;
+        EXPECT_EQ(execute(*mDb, insert, value), 1);
+        Statement select(*mDb, GetExact<int>("ints"));
+        std::vector<std::tuple<int>> result;
+        request(*mDb, select, std::back_inserter(result), std::numeric_limits<std::size_t>::max(), value);
+        EXPECT_THAT(result, ElementsAre(std::tuple(value)));
+    }
+
+    TEST_F(Sqlite3RequestTest, requestShouldSupportInt64)
+    {
+        Statement insert(*mDb, InsertInt<std::int64_t> {});
+        const std::int64_t value = 1099511627776;
+        EXPECT_EQ(execute(*mDb, insert, value), 1);
+        Statement select(*mDb, GetExact<std::int64_t>("ints"));
+        std::vector<std::tuple<int>> result;
+        request(*mDb, select, std::back_inserter(result), std::numeric_limits<std::size_t>::max(), value);
+        EXPECT_THAT(result, ElementsAre(std::tuple(value)));
+    }
+
+    TEST_F(Sqlite3RequestTest, requestShouldSupportReal)
+    {
+        Statement insert(*mDb, InsertReal {});
+        const double value = 3.14;
+        EXPECT_EQ(execute(*mDb, insert, value), 1);
+        Statement select(*mDb, GetExact<double>("reals"));
+        std::vector<std::tuple<double>> result;
+        request(*mDb, select, std::back_inserter(result), std::numeric_limits<std::size_t>::max(), value);
+        EXPECT_THAT(result, ElementsAre(std::tuple(value)));
+    }
+
+    TEST_F(Sqlite3RequestTest, requestShouldSupportText)
+    {
+        Statement insert(*mDb, InsertText {});
+        const std::string text = "foo";
+        EXPECT_EQ(execute(*mDb, insert, text), 1);
+        Statement select(*mDb, GetExact<std::string>("texts"));
+        std::vector<std::tuple<std::string>> result;
+        request(*mDb, select, std::back_inserter(result), std::numeric_limits<std::size_t>::max(), text);
+        EXPECT_THAT(result, ElementsAre(std::tuple(text)));
+    }
+
+    TEST_F(Sqlite3RequestTest, requestShouldSupportBlob)
+    {
+        Statement insert(*mDb, InsertBlob {});
+        const std::vector<std::byte> blob({std::byte(42), std::byte(13)});
+        EXPECT_EQ(execute(*mDb, insert, blob), 1);
+        Statement select(*mDb, GetExact<std::vector<std::byte>>("blobs"));
+        std::vector<std::tuple<std::vector<std::byte>>> result;
+        request(*mDb, select, std::back_inserter(result), std::numeric_limits<std::size_t>::max(), blob);
+        EXPECT_THAT(result, ElementsAre(std::tuple(blob)));
+    }
+
+    TEST_F(Sqlite3RequestTest, requestResultShouldSupportNull)
+    {
+        Statement select(*mDb, GetNull {});
+        std::vector<std::tuple<void*>> result;
+        request(*mDb, select, std::back_inserter(result), std::numeric_limits<std::size_t>::max());
+        EXPECT_THAT(result, ElementsAre(std::tuple(nullptr)));
+    }
+
+    TEST_F(Sqlite3RequestTest, requestResultShouldSupportConstructibleFromInt)
+    {
+        Statement insert(*mDb, InsertInt<int> {});
+        const int value = 42;
+        EXPECT_EQ(execute(*mDb, insert, value), 1);
+        Statement select(*mDb, GetExact<int>("ints"));
+        std::vector<std::tuple<Int>> result;
+        request(*mDb, select, std::back_inserter(result), std::numeric_limits<std::size_t>::max(), value);
+        EXPECT_THAT(result, ElementsAre(std::tuple(Int(value))));
+    }
+
+    TEST_F(Sqlite3RequestTest, requestShouldLimitOutput)
+    {
+        Statement insert(*mDb, InsertInt<int> {});
+        EXPECT_EQ(execute(*mDb, insert, 13), 1);
+        EXPECT_EQ(execute(*mDb, insert, 42), 1);
+        Statement select(*mDb, GetAll("ints"));
+        std::vector<std::tuple<int>> result;
+        request(*mDb, select, std::back_inserter(result), 1);
+        EXPECT_THAT(result, ElementsAre(std::tuple(13)));
+    }
+}
diff --git a/apps/openmw_test_suite/sqlite3/statement.cpp b/apps/openmw_test_suite/sqlite3/statement.cpp
new file mode 100644
index 0000000000..fb53ceebb2
--- /dev/null
+++ b/apps/openmw_test_suite/sqlite3/statement.cpp
@@ -0,0 +1,25 @@
+#include <components/sqlite3/db.hpp>
+#include <components/sqlite3/statement.hpp>
+
+#include <gtest/gtest.h>
+
+namespace
+{
+    using namespace testing;
+    using namespace Sqlite3;
+
+    struct Query
+    {
+        static std::string_view text() noexcept { return "SELECT 1"; }
+        static void bind(sqlite3&, sqlite3_stmt&) {}
+    };
+
+    TEST(Sqlite3StatementTest, makeStatementShouldCreateStatementWithPreparedQuery)
+    {
+        const auto db = makeDb(":memory:", "CREATE TABLE test ( id INTEGER )");
+        const Statement statement(*db, Query {});
+        EXPECT_FALSE(statement.mNeedReset);
+        EXPECT_NE(statement.mHandle, nullptr);
+        EXPECT_EQ(statement.mQuery.text(), "SELECT 1");
+    }
+}
diff --git a/apps/openmw_test_suite/sqlite3/transaction.cpp b/apps/openmw_test_suite/sqlite3/transaction.cpp
new file mode 100644
index 0000000000..913fd34bce
--- /dev/null
+++ b/apps/openmw_test_suite/sqlite3/transaction.cpp
@@ -0,0 +1,67 @@
+#include <components/sqlite3/db.hpp>
+#include <components/sqlite3/request.hpp>
+#include <components/sqlite3/statement.hpp>
+#include <components/sqlite3/transaction.hpp>
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+#include <limits>
+#include <tuple>
+#include <vector>
+
+namespace
+{
+    using namespace testing;
+    using namespace Sqlite3;
+
+    struct InsertId
+    {
+        static std::string_view text() noexcept { return "INSERT INTO test (id) VALUES (42)"; }
+        static void bind(sqlite3&, sqlite3_stmt&) {}
+    };
+
+    struct GetIds
+    {
+        static std::string_view text() noexcept { return "SELECT id FROM test"; }
+        static void bind(sqlite3&, sqlite3_stmt&) {}
+    };
+
+    struct Sqlite3TransactionTest : Test
+    {
+        const Db mDb = makeDb(":memory:", "CREATE TABLE test ( id INTEGER )");
+
+        void insertId() const
+        {
+            Statement insertId(*mDb, InsertId {});
+            EXPECT_EQ(execute(*mDb, insertId), 1);
+        }
+
+        std::vector<std::tuple<int>> getIds() const
+        {
+            Statement getIds(*mDb, GetIds {});
+            std::vector<std::tuple<int>> result;
+            request(*mDb, getIds, std::back_inserter(result), std::numeric_limits<std::size_t>::max());
+            return result;
+        }
+    };
+
+    TEST_F(Sqlite3TransactionTest, shouldRollbackOnDestruction)
+    {
+        {
+            const Transaction transaction(*mDb);
+            insertId();
+        }
+        EXPECT_THAT(getIds(), IsEmpty());
+    }
+
+    TEST_F(Sqlite3TransactionTest, commitShouldCommitTransaction)
+    {
+        {
+            Transaction transaction(*mDb);
+            insertId();
+            transaction.commit();
+        }
+        EXPECT_THAT(getIds(), ElementsAre(std::tuple(42)));
+    }
+}
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 7ee3d184d8..8fc8c2046b 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -201,6 +201,12 @@ add_component_dir(loadinglistener
     reporter
     )
 
+add_component_dir(sqlite3
+    db
+    statement
+    transaction
+)
+
 set (ESM_UI ${CMAKE_SOURCE_DIR}/files/ui/contentselector.ui
     )
 
@@ -236,6 +242,8 @@ endif ()
 
 include_directories(${BULLET_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR})
 
+find_package(SQLite3 REQUIRED)
+
 add_library(components STATIC ${COMPONENT_FILES})
 
 target_link_libraries(components
@@ -268,6 +276,7 @@ target_link_libraries(components
     RecastNavigation::Recast
 
     Base64
+    SQLite::SQLite3
     )
 
 target_link_libraries(components ${BULLET_LIBRARIES})
diff --git a/components/sqlite3/db.cpp b/components/sqlite3/db.cpp
new file mode 100644
index 0000000000..54a156057d
--- /dev/null
+++ b/components/sqlite3/db.cpp
@@ -0,0 +1,31 @@
+#include "db.hpp"
+
+#include <sqlite3.h>
+
+#include <stdexcept>
+#include <string>
+#include <string_view>
+
+namespace Sqlite3
+{
+    void CloseSqlite3::operator()(sqlite3* handle) const noexcept
+    {
+        sqlite3_close(handle);
+    }
+
+    Db makeDb(std::string_view path, const char* schema)
+    {
+        sqlite3* handle = nullptr;
+        const int flags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE;
+        if (const int ec = sqlite3_open_v2(std::string(path).c_str(), &handle, flags, nullptr); ec != SQLITE_OK)
+        {
+            const std::string message(sqlite3_errmsg(handle));
+            sqlite3_close(handle);
+            throw std::runtime_error("Failed to open database: " + message);
+        }
+        Db result(handle);
+        if (const int ec = sqlite3_exec(result.get(), schema, nullptr, nullptr, nullptr); ec != SQLITE_OK)
+            throw std::runtime_error("Failed create database schema: " + std::string(sqlite3_errmsg(handle)));
+        return result;
+    }
+}
diff --git a/components/sqlite3/db.hpp b/components/sqlite3/db.hpp
new file mode 100644
index 0000000000..293ace4375
--- /dev/null
+++ b/components/sqlite3/db.hpp
@@ -0,0 +1,21 @@
+#ifndef OPENMW_COMPONENTS_SQLITE3_DB_H
+#define OPENMW_COMPONENTS_SQLITE3_DB_H
+
+#include <memory>
+#include <string_view>
+
+struct sqlite3;
+
+namespace Sqlite3
+{
+    struct CloseSqlite3
+    {
+        void operator()(sqlite3* handle) const noexcept;
+    };
+
+    using Db = std::unique_ptr<sqlite3, CloseSqlite3>;
+
+    Db makeDb(std::string_view path, const char* schema);
+}
+
+#endif
diff --git a/components/sqlite3/request.hpp b/components/sqlite3/request.hpp
new file mode 100644
index 0000000000..378dd5fdf7
--- /dev/null
+++ b/components/sqlite3/request.hpp
@@ -0,0 +1,275 @@
+#ifndef OPENMW_COMPONENTS_SQLITE3_REQUEST_H
+#define OPENMW_COMPONENTS_SQLITE3_REQUEST_H
+
+#include "statement.hpp"
+
+#include <sqlite3.h>
+
+#include <cstddef>
+#include <cstdint>
+#include <memory>
+#include <stdexcept>
+#include <string>
+#include <string_view>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
+namespace Sqlite3
+{
+    inline void bindParameter(sqlite3& db, sqlite3_stmt& stmt, int index, int value)
+    {
+        if (const int ec = sqlite3_bind_int(&stmt, index, value); ec != SQLITE_OK)
+            throw std::runtime_error("Failed to bind int to parameter " + std::to_string(index)
+                                     + ": " + std::string(sqlite3_errmsg(&db)));
+    }
+
+    inline void bindParameter(sqlite3& db, sqlite3_stmt& stmt, int index, std::int64_t value)
+    {
+        if (const int ec = sqlite3_bind_int64(&stmt, index, value); ec != SQLITE_OK)
+            throw std::runtime_error("Failed to bind int64 to parameter " + std::to_string(index)
+                                     + ": " + std::string(sqlite3_errmsg(&db)));
+    }
+
+    inline void bindParameter(sqlite3& db, sqlite3_stmt& stmt, int index, double value)
+    {
+        if (const int ec = sqlite3_bind_double(&stmt, index, value); ec != SQLITE_OK)
+            throw std::runtime_error("Failed to bind double to parameter " + std::to_string(index)
+                                     + ": " + std::string(sqlite3_errmsg(&db)));
+    }
+
+    inline void bindParameter(sqlite3& db, sqlite3_stmt& stmt, int index, std::string_view value)
+    {
+        if (sqlite3_bind_text(&stmt, index, value.data(), static_cast<int>(value.size()), SQLITE_STATIC) != SQLITE_OK)
+            throw std::runtime_error("Failed to bind text to parameter " + std::to_string(index)
+                                     + ": " + std::string(sqlite3_errmsg(&db)));
+    }
+
+    inline void bindParameter(sqlite3& db, sqlite3_stmt& stmt, int index, const std::vector<std::byte>& value)
+    {
+        if (sqlite3_bind_blob(&stmt, index, value.data(), static_cast<int>(value.size()), SQLITE_STATIC) != SQLITE_OK)
+            throw std::runtime_error("Failed to bind blob to parameter " + std::to_string(index)
+                                     + ": " + std::string(sqlite3_errmsg(&db)));
+    }
+
+    template <typename T>
+    inline void bindParameter(sqlite3& db, sqlite3_stmt& stmt, const char* name, const T& value)
+    {
+        const int index = sqlite3_bind_parameter_index(&stmt, name);
+        if (index == 0)
+            throw std::logic_error("Parameter \"" + std::string(name) + "\" is not found");
+        bindParameter(db, stmt, index, value);
+    }
+
+    inline std::string sqliteTypeToString(int value)
+    {
+        switch (value)
+        {
+            case SQLITE_INTEGER: return "SQLITE_INTEGER";
+            case SQLITE_FLOAT: return "SQLITE_FLOAT";
+            case SQLITE_TEXT: return "SQLITE_TEXT";
+            case SQLITE_BLOB: return "SQLITE_BLOB";
+            case SQLITE_NULL: return "SQLITE_NULL";
+        }
+        return "unsupported(" + std::to_string(value) + ")";
+    }
+
+    template <class T>
+    inline auto copyColumn(sqlite3& /*db*/, sqlite3_stmt& /*statement*/, int index, int type, T*& value)
+    {
+        if (type != SQLITE_NULL)
+            throw std::logic_error("Type of column " + std::to_string(index) + " is " + sqliteTypeToString(type)
+                                   + " that does not match expected output type: SQLITE_INTEGER or SQLITE_FLOAT");
+        value = nullptr;
+    }
+
+    template <class T>
+    inline auto copyColumn(sqlite3& /*db*/, sqlite3_stmt& statement, int index, int type, T& value)
+    {
+        switch (type)
+        {
+            case SQLITE_INTEGER:
+                value = static_cast<T>(sqlite3_column_int64(&statement, index));
+                return;
+            case SQLITE_FLOAT:
+                value = static_cast<T>(sqlite3_column_double(&statement, index));
+                return;
+            case SQLITE_NULL:
+                value = std::decay_t<T>{};
+                return;
+        }
+        throw std::logic_error("Type of column " + std::to_string(index) + " is " + sqliteTypeToString(type)
+                               + " that does not match expected output type: SQLITE_INTEGER or SQLITE_FLOAT or SQLITE_NULL");
+    }
+
+    inline void copyColumn(sqlite3& db, sqlite3_stmt& statement, int index, int type, std::string& value)
+    {
+        if (type != SQLITE_TEXT)
+            throw std::logic_error("Type of column " + std::to_string(index) + " is " + sqliteTypeToString(type)
+                                   + " that does not match expected output type: SQLITE_TEXT");
+        const unsigned char* const text = sqlite3_column_text(&statement, index);
+        if (text == nullptr)
+        {
+            if (const int ec = sqlite3_errcode(&db); ec != SQLITE_OK)
+                throw std::runtime_error("Failed to read text from column " + std::to_string(index)
+                                         + ": " + sqlite3_errmsg(&db));
+            value.clear();
+            return;
+        }
+        const int size = sqlite3_column_bytes(&statement, index);
+        if (size <= 0)
+        {
+            if (const int ec = sqlite3_errcode(&db); ec != SQLITE_OK)
+                throw std::runtime_error("Failed to get column bytes " + std::to_string(index)
+                                         + ": " + sqlite3_errmsg(&db));
+            value.clear();
+            return;
+        }
+        value.reserve(static_cast<std::size_t>(size));
+        value.assign(reinterpret_cast<const char*>(text), reinterpret_cast<const char*>(text) + size);
+    }
+
+    inline void copyColumn(sqlite3& db, sqlite3_stmt& statement, int index, int type, std::vector<std::byte>& value)
+    {
+        if (type != SQLITE_BLOB)
+            throw std::logic_error("Type of column " + std::to_string(index) + " is " + sqliteTypeToString(type)
+                                   + " that does not match expected output type: SQLITE_BLOB");
+        const void* const blob = sqlite3_column_blob(&statement, index);
+        if (blob == nullptr)
+        {
+            if (const int ec = sqlite3_errcode(&db); ec != SQLITE_OK)
+                throw std::runtime_error("Failed to read blob from column " + std::to_string(index)
+                                         + ": " + sqlite3_errmsg(&db));
+            value.clear();
+            return;
+        }
+        const int size = sqlite3_column_bytes(&statement, index);
+        if (size <= 0)
+        {
+            if (const int ec = sqlite3_errcode(&db); ec != SQLITE_OK)
+                throw std::runtime_error("Failed to get column bytes " + std::to_string(index)
+                                         + ": " + sqlite3_errmsg(&db));
+            value.clear();
+            return;
+        }
+        value.reserve(static_cast<std::size_t>(size));
+        value.assign(static_cast<const std::byte*>(blob), static_cast<const std::byte*>(blob) + size);
+    }
+
+    template <int index, class T>
+    inline void getColumnsImpl(sqlite3& db, sqlite3_stmt& statement, T& row)
+    {
+        if constexpr (0 < index && index <= std::tuple_size_v<T>)
+        {
+            const int column = index - 1;
+            if (const int number = sqlite3_column_count(&statement); column >= number)
+                throw std::out_of_range("Column number is out of range: " + std::to_string(column)
+                                        + " >= " + std::to_string(number));
+            const int type = sqlite3_column_type(&statement, column);
+            switch (type)
+            {
+                case SQLITE_INTEGER:
+                case SQLITE_FLOAT:
+                case SQLITE_TEXT:
+                case SQLITE_BLOB:
+                case SQLITE_NULL:
+                    copyColumn(db, statement, column, type, std::get<index - 1>(row));
+                    break;
+                default:
+                    throw std::runtime_error("Column " + std::to_string(column)
+                                             + " has unnsupported column type: " + sqliteTypeToString(type));
+            }
+            getColumnsImpl<index - 1>(db, statement, row);
+        }
+    }
+
+    template <class T>
+    inline void getColumns(sqlite3& db, sqlite3_stmt& statement, T& row)
+    {
+        getColumnsImpl<std::tuple_size_v<T>>(db, statement, row);
+    }
+
+    template <class T>
+    inline void getRow(sqlite3& db, sqlite3_stmt& statement, T& row)
+    {
+        auto tuple = std::tie(row);
+        getColumns(db, statement, tuple);
+    }
+
+    template <class ... Args>
+    inline void getRow(sqlite3& db, sqlite3_stmt& statement, std::tuple<Args ...>& row)
+    {
+        getColumns(db, statement, row);
+    }
+
+    template <class T>
+    inline void getRow(sqlite3& db, sqlite3_stmt& statement, std::back_insert_iterator<T>& it)
+    {
+        typename T::value_type row;
+        getRow(db, statement, row);
+        it = std::move(row);
+    }
+
+    template <class T, class ... Args>
+    inline void prepare(sqlite3& db, Statement<T>& statement, Args&& ... args)
+    {
+        if (statement.mNeedReset)
+        {
+            if (sqlite3_reset(statement.mHandle.get()) == SQLITE_OK
+                    && sqlite3_clear_bindings(statement.mHandle.get()) == SQLITE_OK)
+                statement.mNeedReset = false;
+            else
+                statement.mHandle = makeStatementHandle(db, statement.mQuery.text());
+        }
+        statement.mQuery.bind(db, *statement.mHandle, std::forward<Args>(args) ...);
+    }
+
+    template <class T>
+    inline bool executeStep(sqlite3& db, const Statement<T>& statement)
+    {
+        switch (sqlite3_step(statement.mHandle.get()))
+        {
+            case SQLITE_ROW: return true;
+            case SQLITE_DONE: return false;
+        }
+        throw std::runtime_error("Failed to execute statement step: " + std::string(sqlite3_errmsg(&db)));
+    }
+
+    template <class T, class I, class ... Args>
+    inline I request(sqlite3& db, Statement<T>& statement, I out, std::size_t max, Args&& ... args)
+    {
+        try
+        {
+            statement.mNeedReset = true;
+            prepare(db, statement, std::forward<Args>(args) ...);
+            for (std::size_t i = 0; executeStep(db, statement) && i < max; ++i)
+                getRow(db, *statement.mHandle, *out++);
+            return out;
+        }
+        catch (const std::exception& e)
+        {
+            throw std::runtime_error("Failed perform request \"" + std::string(statement.mQuery.text())
+                                    + "\": " + std::string(e.what()));
+        }
+    }
+
+    template <class T, class ... Args>
+    inline int execute(sqlite3& db, Statement<T>& statement, Args&& ... args)
+    {
+        try
+        {
+            statement.mNeedReset = true;
+            prepare(db, statement, std::forward<Args>(args) ...);
+            if (executeStep(db, statement))
+                throw std::logic_error("Execute cannot return rows");
+            return sqlite3_changes(&db);
+        }
+        catch (const std::exception& e)
+        {
+            throw std::runtime_error("Failed to execute statement \"" + std::string(statement.mQuery.text())
+                                     + "\": " + std::string(e.what()));
+        }
+    }
+}
+
+#endif
diff --git a/components/sqlite3/statement.cpp b/components/sqlite3/statement.cpp
new file mode 100644
index 0000000000..07ca6b8ddf
--- /dev/null
+++ b/components/sqlite3/statement.cpp
@@ -0,0 +1,24 @@
+#include "statement.hpp"
+
+#include <sqlite3.h>
+
+#include <stdexcept>
+#include <string>
+#include <string_view>
+
+namespace Sqlite3
+{
+    void CloseSqlite3Stmt::operator()(sqlite3_stmt* handle) const noexcept
+    {
+         sqlite3_finalize(handle);
+    }
+
+    StatementHandle makeStatementHandle(sqlite3& db, std::string_view query)
+    {
+        sqlite3_stmt* stmt = nullptr;
+        if (const int ec = sqlite3_prepare_v2(&db, query.data(), static_cast<int>(query.size()), &stmt, nullptr); ec != SQLITE_OK)
+            throw std::runtime_error("Failed to prepare statement for query \"" + std::string(query) + "\": "
+                                     + std::string(sqlite3_errmsg(&db)));
+        return StatementHandle(stmt);
+    }
+}
diff --git a/components/sqlite3/statement.hpp b/components/sqlite3/statement.hpp
new file mode 100644
index 0000000000..469e63933c
--- /dev/null
+++ b/components/sqlite3/statement.hpp
@@ -0,0 +1,35 @@
+#ifndef OPENMW_COMPONENTS_SQLITE3_STATEMENT_H
+#define OPENMW_COMPONENTS_SQLITE3_STATEMENT_H
+
+#include <memory>
+#include <string_view>
+#include <utility>
+
+struct sqlite3;
+struct sqlite3_stmt;
+
+namespace Sqlite3
+{
+    struct CloseSqlite3Stmt
+    {
+        void operator()(sqlite3_stmt* handle) const noexcept;
+    };
+
+    using StatementHandle = std::unique_ptr<sqlite3_stmt, CloseSqlite3Stmt>;
+
+    StatementHandle makeStatementHandle(sqlite3& db, std::string_view query);
+
+    template <class Query>
+    struct Statement
+    {
+        bool mNeedReset = false;
+        StatementHandle mHandle;
+        Query mQuery;
+
+        explicit Statement(sqlite3& db, Query query = Query {})
+            : mHandle(makeStatementHandle(db, query.text())),
+              mQuery(std::move(query)) {}
+    };
+}
+
+#endif
diff --git a/components/sqlite3/transaction.cpp b/components/sqlite3/transaction.cpp
new file mode 100644
index 0000000000..3012538652
--- /dev/null
+++ b/components/sqlite3/transaction.cpp
@@ -0,0 +1,33 @@
+#include "transaction.hpp"
+
+#include <components/debug/debuglog.hpp>
+
+#include <sqlite3.h>
+
+#include <stdexcept>
+#include <string>
+
+namespace Sqlite3
+{
+    void Rollback::operator()(sqlite3* db) const
+    {
+        if (db == nullptr)
+            return;
+        if (const int ec = sqlite3_exec(db, "ROLLBACK", nullptr, nullptr, nullptr); ec != SQLITE_OK)
+            Log(Debug::Warning) << "Failed to rollback SQLite3 transaction: " << std::string(sqlite3_errmsg(db));
+    }
+
+    Transaction::Transaction(sqlite3& db)
+        : mDb(&db)
+    {
+        if (const int ec = sqlite3_exec(mDb.get(), "BEGIN", nullptr, nullptr, nullptr); ec != SQLITE_OK)
+            throw std::runtime_error("Failed to start transaction: " + std::string(sqlite3_errmsg(mDb.get())));
+    }
+
+    void Transaction::commit()
+    {
+        if (const int ec = sqlite3_exec(mDb.get(), "COMMIT", nullptr, nullptr, nullptr); ec != SQLITE_OK)
+            throw std::runtime_error("Failed to commit transaction: " + std::string(sqlite3_errmsg(mDb.get())));
+        (void) mDb.release();
+    }
+}
diff --git a/components/sqlite3/transaction.hpp b/components/sqlite3/transaction.hpp
new file mode 100644
index 0000000000..88b780a0a5
--- /dev/null
+++ b/components/sqlite3/transaction.hpp
@@ -0,0 +1,27 @@
+#ifndef OPENMW_COMPONENTS_SQLITE3_TRANSACTION_H
+#define OPENMW_COMPONENTS_SQLITE3_TRANSACTION_H
+
+#include <memory>
+
+struct sqlite3;
+
+namespace Sqlite3
+{
+    struct Rollback
+    {
+        void operator()(sqlite3* handle) const;
+    };
+
+    class Transaction
+    {
+    public:
+        Transaction(sqlite3& db);
+
+        void commit();
+
+    private:
+        std::unique_ptr<sqlite3, Rollback> mDb;
+    };
+}
+
+#endif

From add6eb9c95bcb4fea5cdb1e797cb5e78a57c3770 Mon Sep 17 00:00:00 2001
From: unknown <malusluminis@hotmail.com>
Date: Sat, 16 Oct 2021 21:40:41 +0200
Subject: [PATCH 1493/2859] Fix particles and magnitudes for (damage) over time
 effects

---
 apps/openmw/mwmechanics/spelleffects.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp
index bc84a1df5e..0e67f06ba2 100644
--- a/apps/openmw/mwmechanics/spelleffects.cpp
+++ b/apps/openmw/mwmechanics/spelleffects.cpp
@@ -806,6 +806,7 @@ bool applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, Ac
             }
             if(effect.mMagnitude == 0)
             {
+                effect.mMagnitude = oldMagnitude;
                 effect.mFlags |= ESM::ActiveEffect::Flag_Applied | ESM::ActiveEffect::Flag_Remove;
                 effect.mTimeLeft -= dt;
                 return false;
@@ -1027,15 +1028,15 @@ void onMagicEffectRemoved(const MWWorld::Ptr& target, ActiveSpells::ActiveSpellP
 {
     if(!(effect.mFlags & ESM::ActiveEffect::Flag_Applied))
         return;
-    const auto world = MWBase::Environment::get().getWorld();
     auto& magnitudes = target.getClass().getCreatureStats(target).getMagicEffects();
-    const auto* magicEffect = world->getStore().get<ESM::MagicEffect>().find(effect.mEffectId);
-    if(magicEffect->mData.mFlags & ESM::MagicEffect::Flags::AppliedOnce)
-        magnitudes.add(EffectKey(effect.mEffectId, effect.mArg), EffectParam(-effect.mMagnitude));
+    magnitudes.add(EffectKey(effect.mEffectId, effect.mArg), EffectParam(-effect.mMagnitude));
     removeMagicEffect(target, spellParams, effect);
-    auto anim = world->getAnimation(target);
-    if(anim)
-        anim->removeEffect(effect.mEffectId);
+    if(magnitudes.get(effect.mEffectId).getMagnitude() <= 0.f)
+    {
+        auto anim = MWBase::Environment::get().getWorld()->getAnimation(target);
+        if(anim)
+            anim->removeEffect(effect.mEffectId);
+    }
 }
 
 }

From 01605433cb6fc43928f1456ebe43105d2e6907c0 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Sat, 16 Oct 2021 19:48:13 +0000
Subject: [PATCH 1494/2859] quadtreeworld.cpp (#3174)

Currently, we disable a paging root node that we only need in exterior cells by setting its node mask to 0 when transitioning into an interior cell. Node masks are not ideal for this usage case because Node::getBound is unaware of masks. With this PR we just detach the unused node from the scene graph. _shadowedScene->getBound() in the MWShadowTechnique should return a much better value in interior cells with these changes.
---
 components/terrain/quadtreeworld.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/components/terrain/quadtreeworld.cpp b/components/terrain/quadtreeworld.cpp
index c2d212f8a5..0282eb8de1 100644
--- a/components/terrain/quadtreeworld.cpp
+++ b/components/terrain/quadtreeworld.cpp
@@ -498,9 +498,8 @@ void QuadTreeWorld::enable(bool enabled)
         if (!mRootNode->getNumParents())
             mTerrainRoot->addChild(mRootNode);
     }
-
-    if (mRootNode)
-        mRootNode->setNodeMask(enabled ? ~0 : 0);
+    else if (mRootNode)
+        mTerrainRoot->removeChild(mRootNode);
 }
 
 View* QuadTreeWorld::createView()

From cc009d246fb81cc4269950912eed445da3e0e9b3 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Sat, 16 Oct 2021 18:37:34 -0700
Subject: [PATCH 1495/2859] do not clear depth buffer in first person

---
 CHANGELOG.md                           |  1 +
 apps/openmw/mwrender/npcanimation.cpp  | 40 ++++++++++++++++++++++++--
 apps/openmw/mwrender/postprocessor.cpp |  3 ++
 apps/openmw/mwrender/postprocessor.hpp |  2 ++
 4 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b84dfd7e80..e2c57f1632 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -67,6 +67,7 @@
     Feature #5996: Support Lua scripts in OpenMW
     Feature #6017: Separate persistent and temporary cell references when saving
     Feature #6032: Reverse-z depth buffer
+    Feature #6078: First person should not clear depth buffer
     Feature #6162: Refactor GUI to use shaders and to be GLES and GL3+ friendly
     Feature #6199: Support FBO Rendering
     Feature #6249: Alpha testing support for Collada
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 28987064f3..0e100326dd 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -44,6 +44,7 @@
 #include "renderbin.hpp"
 #include "vismask.hpp"
 #include "util.hpp"
+#include "postprocessor.hpp"
 
 namespace
 {
@@ -330,6 +331,8 @@ void NpcAnimation::setViewMode(NpcAnimation::ViewMode viewMode)
 }
 
 /// @brief A RenderBin callback to clear the depth buffer before rendering.
+/// Switches depth attachments to a proxy renderbuffer, reattaches original depth then redraws first person root.
+/// This gives a complete depth buffer which can be used for postprocessing, buffer resolves as if depth was never cleared.
 class DepthClearCallback : public osgUtil::RenderBin::DrawCallback
 {
 public:
@@ -337,18 +340,49 @@ public:
     {
         mDepth = SceneUtil::createDepth();
         mDepth->setWriteMask(true);
+
+        mStateSet = new osg::StateSet;
+        mStateSet->setAttributeAndModes(new osg::ColorMask(false, false, false, false), osg::StateAttribute::ON);
+        mStateSet->setMode(GL_LIGHTING, osg::StateAttribute::OFF|osg::StateAttribute::OVERRIDE);
     }
 
     void drawImplementation(osgUtil::RenderBin* bin, osg::RenderInfo& renderInfo, osgUtil::RenderLeaf*& previous) override
     {
-        renderInfo.getState()->applyAttribute(mDepth);
+        osg::State* state = renderInfo.getState();
+
+        PostProcessor* postProcessor = dynamic_cast<PostProcessor*>(renderInfo.getCurrentCamera()->getUserData());
+
+        state->applyAttribute(mDepth);
+
+        if (postProcessor && postProcessor->getFirstPersonRBProxy())
+        {
+            osg::GLExtensions* ext = state->get<osg::GLExtensions>();
+
+            osg::FrameBufferAttachment(postProcessor->getFirstPersonRBProxy()).attach(*state, GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, ext);
 
-        glClear(GL_DEPTH_BUFFER_BIT);
+            glClear(GL_DEPTH_BUFFER_BIT);
+            // color accumulation pass
+            bin->drawImplementation(renderInfo, previous);
 
-        bin->drawImplementation(renderInfo, previous);
+            auto primaryFBO = postProcessor->getMsaaFbo() ? postProcessor->getMsaaFbo() : postProcessor->getFbo();
+            primaryFBO->getAttachment(osg::FrameBufferObject::BufferComponent::DEPTH_BUFFER).attach(*state, GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, ext);
+
+            state->pushStateSet(mStateSet);
+            state->apply();
+            // depth accumulation pass
+            bin->drawImplementation(renderInfo, previous);
+            state->popStateSet();
+        }
+        else
+        {
+            // fallback to standard depth clear when we are not rendering our main scene via an intermediate FBO
+            glClear(GL_DEPTH_BUFFER_BIT);
+            bin->drawImplementation(renderInfo, previous);
+        }
     }
 
     osg::ref_ptr<osg::Depth> mDepth;
+    osg::ref_ptr<osg::StateSet> mStateSet;
 };
 
 /// Overrides Field of View to given value for rendering the subgraph.
diff --git a/apps/openmw/mwrender/postprocessor.cpp b/apps/openmw/mwrender/postprocessor.cpp
index bc00676d7b..1ee5745cb4 100644
--- a/apps/openmw/mwrender/postprocessor.cpp
+++ b/apps/openmw/mwrender/postprocessor.cpp
@@ -183,6 +183,9 @@ namespace MWRender
             mMsaaFbo->setAttachment(osg::Camera::DEPTH_BUFFER, osg::FrameBufferAttachment(depthRB));
         }
 
+        if (const auto depthProxy = std::getenv("OPENMW_ENABLE_DEPTH_CLEAR_PROXY"))
+            mFirstPersonDepthRBProxy = new osg::RenderBuffer(width, height, mDepthTex->getInternalFormat(), samples);
+
         mViewer->getCamera()->resize(width, height);
         mHUDCamera->resize(width, height);
         mRendering.updateProjectionMatrix();
diff --git a/apps/openmw/mwrender/postprocessor.hpp b/apps/openmw/mwrender/postprocessor.hpp
index f93f3a5b66..0d03d4b500 100644
--- a/apps/openmw/mwrender/postprocessor.hpp
+++ b/apps/openmw/mwrender/postprocessor.hpp
@@ -23,6 +23,7 @@ namespace MWRender
 
         auto getMsaaFbo() { return mMsaaFbo; }
         auto getFbo() { return mFbo; }
+        auto getFirstPersonRBProxy() { return mFirstPersonDepthRBProxy; }
 
         int getDepthFormat() { return mDepthFormat; }
 
@@ -37,6 +38,7 @@ namespace MWRender
 
         osg::ref_ptr<osg::FrameBufferObject> mMsaaFbo;
         osg::ref_ptr<osg::FrameBufferObject> mFbo;
+        osg::ref_ptr<osg::RenderBuffer> mFirstPersonDepthRBProxy;
 
         osg::ref_ptr<osg::Texture2D> mSceneTex;
         osg::ref_ptr<osg::Texture2D> mDepthTex;

From 362c124e8fe6274c7f543c8ad8a43fe46de8c0f9 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sun, 17 Oct 2021 17:44:07 +0400
Subject: [PATCH 1496/2859] Allow to place levelled creatures to the game world
 (bug 6347)

---
 CHANGELOG.md                            |  2 +-
 apps/openmw/mwclass/creaturelevlist.cpp | 19 +++++++++++++++++++
 apps/openmw/mwclass/creaturelevlist.hpp |  4 ++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25ae0c45d0..d3c70897cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,6 +56,7 @@
     Bug #6322: Total sold/cost should reset to 0 when there are no items offered
     Bug #6323: Wyrmhaven: Alboin doesn't follower the player character out of his house
     Bug #6326: Detect Enchantment/Key should detect items in unresolved containers
+    Bug #6347: PlaceItem/PlaceItemCell/PlaceAt should work with levelled creatures
     Feature #890: OpenMW-CS: Column filtering
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
     Feature #2780: A way to see current OpenMW version in the console
@@ -79,7 +80,6 @@
     Task #6201: Remove the "Note: No relevant classes found. No output generated" warnings
     Task #6264: Remove the old classes in animation.cpp
 
-
 0.47.0
 ------
 
diff --git a/apps/openmw/mwclass/creaturelevlist.cpp b/apps/openmw/mwclass/creaturelevlist.cpp
index e8023ce26b..ddb5fd2b38 100644
--- a/apps/openmw/mwclass/creaturelevlist.cpp
+++ b/apps/openmw/mwclass/creaturelevlist.cpp
@@ -5,6 +5,7 @@
 
 #include "../mwmechanics/levelledlist.hpp"
 
+#include "../mwworld/cellstore.hpp"
 #include "../mwworld/customdata.hpp"
 #include "../mwmechanics/creaturestats.hpp"
 
@@ -27,6 +28,24 @@ namespace MWClass
         }
     };
 
+    MWWorld::Ptr CreatureLevList::copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const
+    {
+        const MWWorld::LiveCellRef<ESM::CreatureLevList> *ref = ptr.get<ESM::CreatureLevList>();
+
+        return MWWorld::Ptr(cell.insert(ref), &cell);
+    }
+
+    void CreatureLevList::adjustPosition(const MWWorld::Ptr& ptr, bool force) const
+    {
+        if (ptr.getRefData().getCustomData() == nullptr)
+            return;
+
+        CreatureLevListCustomData& customData = ptr.getRefData().getCustomData()->asCreatureLevListCustomData();
+        MWWorld::Ptr creature = (customData.mSpawnActorId == -1) ? MWWorld::Ptr() : MWBase::Environment::get().getWorld()->searchPtrViaActorId(customData.mSpawnActorId);
+        if (!creature.isEmpty())
+            MWBase::Environment::get().getWorld()->adjustPosition(creature, force);
+    }
+
     std::string CreatureLevList::getName (const MWWorld::ConstPtr& ptr) const
     {
         return "";
diff --git a/apps/openmw/mwclass/creaturelevlist.hpp b/apps/openmw/mwclass/creaturelevlist.hpp
index 35152a9422..b3a940682c 100644
--- a/apps/openmw/mwclass/creaturelevlist.hpp
+++ b/apps/openmw/mwclass/creaturelevlist.hpp
@@ -32,6 +32,10 @@ namespace MWClass
             ///< Write additional state from \a ptr into \a state.
 
             void respawn (const MWWorld::Ptr& ptr) const override;
+
+            MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
+
+            void adjustPosition(const MWWorld::Ptr& ptr, bool force) const override;
     };
 }
 

From 18d3102148bab1a74e48e467401100a3259da2e3 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 17 Oct 2021 02:52:22 +0200
Subject: [PATCH 1497/2859] Do not use union to access FIXED_STRING<4> as int

https://en.cppreference.com/w/cpp/language/union:
> It's undefined behavior to read from the member of the union that wasn't most recently written.
---
 apps/esmtool/esmtool.cpp                | 12 ++++++------
 apps/esmtool/record.cpp                 |  2 +-
 apps/essimporter/importer.cpp           |  4 ++--
 apps/launcher/utils/cellnameloader.cpp  |  2 +-
 apps/opencs/model/world/data.cpp        |  2 +-
 apps/openmw/mwstate/statemanagerimp.cpp | 18 +++++++++---------
 apps/openmw/mwworld/esmstore.cpp        | 12 ++++++------
 components/esm/cellref.cpp              |  2 +-
 components/esm/debugprofile.cpp         |  2 +-
 components/esm/esmcommon.hpp            | 24 +++++++++++++++++-------
 components/esm/filter.cpp               |  2 +-
 components/esm/loadacti.cpp             |  2 +-
 components/esm/loadalch.cpp             |  2 +-
 components/esm/loadappa.cpp             |  2 +-
 components/esm/loadarmo.cpp             |  2 +-
 components/esm/loadbody.cpp             |  2 +-
 components/esm/loadbook.cpp             |  2 +-
 components/esm/loadbsgn.cpp             |  2 +-
 components/esm/loadcell.cpp             |  4 ++--
 components/esm/loadclas.cpp             |  2 +-
 components/esm/loadclot.cpp             |  2 +-
 components/esm/loadcont.cpp             |  2 +-
 components/esm/loadcrea.cpp             |  2 +-
 components/esm/loaddial.cpp             |  2 +-
 components/esm/loaddoor.cpp             |  2 +-
 components/esm/loadench.cpp             |  2 +-
 components/esm/loadfact.cpp             |  2 +-
 components/esm/loadinfo.cpp             |  2 +-
 components/esm/loadingr.cpp             |  2 +-
 components/esm/loadland.cpp             |  4 ++--
 components/esm/loadlevlist.cpp          |  2 +-
 components/esm/loadligh.cpp             |  2 +-
 components/esm/loadlock.cpp             |  2 +-
 components/esm/loadltex.cpp             |  2 +-
 components/esm/loadmgef.cpp             |  2 +-
 components/esm/loadmisc.cpp             |  2 +-
 components/esm/loadnpc.cpp              |  2 +-
 components/esm/loadpgrd.cpp             |  2 +-
 components/esm/loadprob.cpp             |  2 +-
 components/esm/loadrace.cpp             |  2 +-
 components/esm/loadregn.cpp             |  2 +-
 components/esm/loadrepa.cpp             |  2 +-
 components/esm/loadscpt.cpp             |  2 +-
 components/esm/loadskil.cpp             |  2 +-
 components/esm/loadsndg.cpp             |  2 +-
 components/esm/loadsoun.cpp             |  2 +-
 components/esm/loadspel.cpp             |  2 +-
 components/esm/loadsscr.cpp             |  2 +-
 components/esm/loadstat.cpp             |  2 +-
 components/esm/loadweap.cpp             |  2 +-
 components/esm/transport.cpp            |  4 ++--
 51 files changed, 89 insertions(+), 79 deletions(-)

diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp
index bf5f47a76d..a0ee654da9 100644
--- a/apps/esmtool/esmtool.cpp
+++ b/apps/esmtool/esmtool.cpp
@@ -367,10 +367,10 @@ int load(Arguments& info)
             EsmTool::RecordBase *record = EsmTool::RecordBase::create(n);
             if (record == nullptr)
             {
-                if (skipped.count(n.intval) == 0)
+                if (skipped.count(n.toInt()) == 0)
                 {
                     std::cout << "Skipping " << n.toString() << " records.\n";
-                    skipped.emplace(n.intval);
+                    skipped.emplace(n.toInt());
                 }
 
                 esm.skipRecord();
@@ -402,7 +402,7 @@ int load(Arguments& info)
                 record->print();
             }
 
-            if (record->getType().intval == ESM::REC_CELL && loadCells && interested)
+            if (record->getType().toInt() == ESM::REC_CELL && loadCells && interested)
             {
                 loadCell(record->cast<ESM::Cell>()->get(), esm, info);
             }
@@ -415,7 +415,7 @@ int load(Arguments& info)
             {
                 delete record;
             }
-            ++info.data.mRecordStats[n.intval];
+            ++info.data.mRecordStats[n.toInt()];
         }
 
     } catch(std::exception &e) {
@@ -459,7 +459,7 @@ int clone(Arguments& info)
     for (std::pair<int, int> stat : info.data.mRecordStats)
     {
         ESM::NAME name;
-        name.intval = stat.first;
+        name = stat.first;
         int amount = stat.second;
         std::cout << std::setw(digitCount) << amount << " " << name.toString() << "  ";
         if (++i % 3 == 0)
@@ -496,7 +496,7 @@ int clone(Arguments& info)
         esm.startRecord(typeName.toString(), record->getFlags());
 
         record->save(esm);
-        if (typeName.intval == ESM::REC_CELL) {
+        if (typeName.toInt() == ESM::REC_CELL) {
             ESM::Cell *ptr = &record->cast<ESM::Cell>()->get();
             if (!info.data.mCellRefs[ptr].empty()) 
             {
diff --git a/apps/esmtool/record.cpp b/apps/esmtool/record.cpp
index 55170e232e..1de3288ad4 100644
--- a/apps/esmtool/record.cpp
+++ b/apps/esmtool/record.cpp
@@ -176,7 +176,7 @@ RecordBase::create(const ESM::NAME type)
 {
     RecordBase *record = nullptr;
 
-    switch (type.intval) {
+    switch (type.toInt()) {
     case ESM::REC_ACTI:
     {
         record = new EsmTool::Record<ESM::Activator>;
diff --git a/apps/essimporter/importer.cpp b/apps/essimporter/importer.cpp
index 27f77e40d1..84f13b8c91 100644
--- a/apps/essimporter/importer.cpp
+++ b/apps/essimporter/importer.cpp
@@ -324,14 +324,14 @@ namespace ESSImport
             ESM::NAME n = esm.getRecName();
             esm.getRecHeader();
 
-            auto it = converters.find(n.intval);
+            auto it = converters.find(n.toInt());
             if (it != converters.end())
             {
                 it->second->read(esm);
             }
             else
             {
-                if (unknownRecords.insert(n.intval).second)
+                if (unknownRecords.insert(n.toInt()).second)
                 {
                     std::ios::fmtflags f(std::cerr.flags());
                     std::cerr << "Error: unknown record " << n.toString() << " (0x" << std::hex << esm.getFileOffset() << ")" << std::endl;
diff --git a/apps/launcher/utils/cellnameloader.cpp b/apps/launcher/utils/cellnameloader.cpp
index e7f6e83e74..594946394c 100644
--- a/apps/launcher/utils/cellnameloader.cpp
+++ b/apps/launcher/utils/cellnameloader.cpp
@@ -35,7 +35,7 @@ QSet<QString> CellNameLoader::getCellNames(QStringList &contentPaths)
 
 bool CellNameLoader::isCellRecord(ESM::NAME &recordName)
 {
-    return recordName.intval == ESM::REC_CELL;
+    return recordName.toInt() == ESM::REC_CELL;
 }
 
 QString CellNameLoader::getCellName(ESM::ESMReader &esmReader)
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 3723dac46f..ec4c1f6a13 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -1086,7 +1086,7 @@ bool CSMWorld::Data::continueLoading (CSMDoc::Messages& messages)
 
     bool unhandledRecord = false;
 
-    switch (n.intval)
+    switch (n.toInt())
     {
         case ESM::REC_GLOB: mGlobals.load (*mReader, mBase); break;
         case ESM::REC_GMST: mGmsts.load (*mReader, mBase); break;
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index 4e4a8e95d6..4387d7faa7 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -406,7 +406,7 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
             ESM::NAME n = reader.getRecName();
             reader.getRecHeader();
 
-            switch (n.intval)
+            switch (n.toInt())
             {
                 case ESM::REC_SAVE:
                     {
@@ -427,12 +427,12 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
                 case ESM::REC_JOUR_LEGACY:
                 case ESM::REC_QUES:
 
-                    MWBase::Environment::get().getJournal()->readRecord (reader, n.intval);
+                    MWBase::Environment::get().getJournal()->readRecord (reader, n.toInt());
                     break;
 
                 case ESM::REC_DIAS:
 
-                    MWBase::Environment::get().getDialogueManager()->readRecord (reader, n.intval);
+                    MWBase::Environment::get().getDialogueManager()->readRecord (reader, n.toInt());
                     break;
 
                 case ESM::REC_ALCH:
@@ -457,7 +457,7 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
                 case ESM::REC_LEVI:
                 case ESM::REC_CREA:
                 case ESM::REC_CONT:
-                    MWBase::Environment::get().getWorld()->readRecord(reader, n.intval, contentFileMap);
+                    MWBase::Environment::get().getWorld()->readRecord(reader, n.toInt(), contentFileMap);
                     break;
 
                 case ESM::REC_CAM_:
@@ -466,7 +466,7 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
 
                 case ESM::REC_GSCR:
 
-                    MWBase::Environment::get().getScriptManager()->getGlobalScripts().readRecord (reader, n.intval, contentFileMap);
+                    MWBase::Environment::get().getScriptManager()->getGlobalScripts().readRecord (reader, n.toInt(), contentFileMap);
                     break;
 
                 case ESM::REC_GMAP:
@@ -474,21 +474,21 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
                 case ESM::REC_ASPL:
                 case ESM::REC_MARK:
 
-                    MWBase::Environment::get().getWindowManager()->readRecord(reader, n.intval);
+                    MWBase::Environment::get().getWindowManager()->readRecord(reader, n.toInt());
                     break;
 
                 case ESM::REC_DCOU:
                 case ESM::REC_STLN:
 
-                    MWBase::Environment::get().getMechanicsManager()->readRecord(reader, n.intval);
+                    MWBase::Environment::get().getMechanicsManager()->readRecord(reader, n.toInt());
                     break;
 
                 case ESM::REC_INPU:
-                    MWBase::Environment::get().getInputManager()->readRecord(reader, n.intval);
+                    MWBase::Environment::get().getInputManager()->readRecord(reader, n.toInt());
                     break;
 
                 case ESM::REC_LUAM:
-                    MWBase::Environment::get().getLuaManager()->readRecord(reader, n.intval);
+                    MWBase::Environment::get().getLuaManager()->readRecord(reader, n.toInt());
                     break;
 
                 default:
diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index befe65d641..c5b0fff00f 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -190,10 +190,10 @@ void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener)
         esm.getRecHeader();
 
         // Look up the record type.
-        std::map<int, StoreBase *>::iterator it = mStores.find(n.intval);
+        std::map<int, StoreBase *>::iterator it = mStores.find(n.toInt());
 
         if (it == mStores.end()) {
-            if (n.intval == ESM::REC_INFO) {
+            if (n.toInt() == ESM::REC_INFO) {
                 if (dialogue)
                 {
                     dialogue->readInfo(esm, esm.getIndex() != 0);
@@ -203,12 +203,12 @@ void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener)
                     Log(Debug::Error) << "Error: info record without dialog";
                     esm.skipRecord();
                 }
-            } else if (n.intval == ESM::REC_MGEF) {
+            } else if (n.toInt() == ESM::REC_MGEF) {
                 mMagicEffects.load (esm);
-            } else if (n.intval == ESM::REC_SKIL) {
+            } else if (n.toInt() == ESM::REC_SKIL) {
                 mSkills.load (esm);
             }
-            else if (n.intval==ESM::REC_FILT || n.intval == ESM::REC_DBGP)
+            else if (n.toInt() == ESM::REC_FILT || n.toInt() == ESM::REC_DBGP)
             {
                 // ignore project file only records
                 esm.skipRecord();
@@ -224,7 +224,7 @@ void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener)
                 continue;
             }
 
-            if (n.intval==ESM::REC_DIAL) {
+            if (n.toInt() == ESM::REC_DIAL) {
                 dialogue = const_cast<ESM::Dialogue*>(mDialogs.find(id.mId));
             } else {
                 dialogue = nullptr;
diff --git a/components/esm/cellref.cpp b/components/esm/cellref.cpp
index 81e0b9f557..7126459871 100644
--- a/components/esm/cellref.cpp
+++ b/components/esm/cellref.cpp
@@ -66,7 +66,7 @@ void ESM::CellRef::loadData(ESMReader &esm, bool &isDeleted)
     while (!isLoaded && esm.hasMoreSubs())
     {
         esm.getSubName();
-        switch (esm.retSubName().intval)
+        switch (esm.retSubName().toInt())
         {
             case ESM::FourCC<'U','N','A','M'>::value:
                 esm.getHT(mReferenceBlocked);
diff --git a/components/esm/debugprofile.cpp b/components/esm/debugprofile.cpp
index 6276258c48..090d2bfe6d 100644
--- a/components/esm/debugprofile.cpp
+++ b/components/esm/debugprofile.cpp
@@ -14,7 +14,7 @@ void ESM::DebugProfile::load (ESMReader& esm, bool &isDeleted)
     while (esm.hasMoreSubs())
     {
         esm.getSubName();
-        switch (esm.retSubName().intval)
+        switch (esm.retSubName().toInt())
         {
             case ESM::SREC_NAME:
                 mId = esm.getHString();
diff --git a/components/esm/esmcommon.hpp b/components/esm/esmcommon.hpp
index 10e05de905..7caaae2afb 100644
--- a/components/esm/esmcommon.hpp
+++ b/components/esm/esmcommon.hpp
@@ -102,25 +102,35 @@ struct FIXED_STRING : public FIXED_STRING_BASE<FIXED_STRING, SIZE>
 template <>
 struct FIXED_STRING<4> : public FIXED_STRING_BASE<FIXED_STRING, 4>
 {
-    union {
-        char data[4];
-        uint32_t intval;
-    };
+    char data[4];
 
     using FIXED_STRING_BASE::operator==;
     using FIXED_STRING_BASE::operator!=;
 
-    bool operator==(uint32_t v) const { return v == intval; }
-    bool operator!=(uint32_t v) const { return v != intval; }
+    bool operator==(uint32_t v) const { return v == toInt(); }
+    bool operator!=(uint32_t v) const { return v != toInt(); }
+
+    FIXED_STRING<4>& operator=(std::uint32_t value)
+    {
+        std::memcpy(data, &value, sizeof(data));
+        return *this;
+    }
 
     void assign(const std::string& value)
     {
-        intval = 0;
+        std::memset(data, 0, sizeof(data));
         std::memcpy(data, value.data(), std::min(value.size(), sizeof(data)));
     }
 
     char const* ro_data() const { return data; }
     char*       rw_data() { return data; }
+
+    std::uint32_t toInt() const
+    {
+        std::uint32_t value;
+        std::memcpy(&value, data, sizeof(data));
+        return value;
+    }
 };
 
 typedef FIXED_STRING<4> NAME;
diff --git a/components/esm/filter.cpp b/components/esm/filter.cpp
index 8d1b755055..76a518c63d 100644
--- a/components/esm/filter.cpp
+++ b/components/esm/filter.cpp
@@ -14,7 +14,7 @@ void ESM::Filter::load (ESMReader& esm, bool &isDeleted)
     while (esm.hasMoreSubs())
     {
         esm.getSubName();
-        uint32_t name = esm.retSubName().intval;
+        uint32_t name = esm.retSubName().toInt();
         switch (name)
         {
             case ESM::SREC_NAME:
diff --git a/components/esm/loadacti.cpp b/components/esm/loadacti.cpp
index 6a08bca749..fcb0954918 100644
--- a/components/esm/loadacti.cpp
+++ b/components/esm/loadacti.cpp
@@ -17,7 +17,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadalch.cpp b/components/esm/loadalch.cpp
index b7c81ebdb4..ad30570f74 100644
--- a/components/esm/loadalch.cpp
+++ b/components/esm/loadalch.cpp
@@ -20,7 +20,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadappa.cpp b/components/esm/loadappa.cpp
index e9ff3ea86c..1113870197 100644
--- a/components/esm/loadappa.cpp
+++ b/components/esm/loadappa.cpp
@@ -18,7 +18,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadarmo.cpp b/components/esm/loadarmo.cpp
index 902d4a4467..cab0d52a88 100644
--- a/components/esm/loadarmo.cpp
+++ b/components/esm/loadarmo.cpp
@@ -50,7 +50,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadbody.cpp b/components/esm/loadbody.cpp
index 239cff7c8b..c7f6bce40a 100644
--- a/components/esm/loadbody.cpp
+++ b/components/esm/loadbody.cpp
@@ -18,7 +18,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadbook.cpp b/components/esm/loadbook.cpp
index 756f01da9c..07b9a6b50f 100644
--- a/components/esm/loadbook.cpp
+++ b/components/esm/loadbook.cpp
@@ -18,7 +18,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadbsgn.cpp b/components/esm/loadbsgn.cpp
index 7514f1f85b..d767eb66e0 100644
--- a/components/esm/loadbsgn.cpp
+++ b/components/esm/loadbsgn.cpp
@@ -19,7 +19,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadcell.cpp b/components/esm/loadcell.cpp
index d2cb23146f..b2c95ad25f 100644
--- a/components/esm/loadcell.cpp
+++ b/components/esm/loadcell.cpp
@@ -70,7 +70,7 @@ namespace ESM
         while (!isLoaded && esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::SREC_NAME:
                     mName = esm.getHString();
@@ -117,7 +117,7 @@ namespace ESM
         while (!isLoaded && esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::FourCC<'I','N','T','V'>::value:
                     int waterl;
diff --git a/components/esm/loadclas.cpp b/components/esm/loadclas.cpp
index 7526fe4f52..c70f7dd0d3 100644
--- a/components/esm/loadclas.cpp
+++ b/components/esm/loadclas.cpp
@@ -48,7 +48,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadclot.cpp b/components/esm/loadclot.cpp
index cf03dbad36..8f2aff40fc 100644
--- a/components/esm/loadclot.cpp
+++ b/components/esm/loadclot.cpp
@@ -20,7 +20,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadcont.cpp b/components/esm/loadcont.cpp
index 03092571a4..b7757646a1 100644
--- a/components/esm/loadcont.cpp
+++ b/components/esm/loadcont.cpp
@@ -42,7 +42,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadcrea.cpp b/components/esm/loadcrea.cpp
index 02d664e1f2..590a68bc35 100644
--- a/components/esm/loadcrea.cpp
+++ b/components/esm/loadcrea.cpp
@@ -31,7 +31,7 @@ namespace ESM {
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loaddial.cpp b/components/esm/loaddial.cpp
index 59fb13484b..535ea23380 100644
--- a/components/esm/loaddial.cpp
+++ b/components/esm/loaddial.cpp
@@ -28,7 +28,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::FourCC<'D','A','T','A'>::value:
                 {
diff --git a/components/esm/loaddoor.cpp b/components/esm/loaddoor.cpp
index 3c446789b7..d5bf51b4da 100644
--- a/components/esm/loaddoor.cpp
+++ b/components/esm/loaddoor.cpp
@@ -17,7 +17,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadench.cpp b/components/esm/loadench.cpp
index ed3de90b50..db0727099c 100644
--- a/components/esm/loadench.cpp
+++ b/components/esm/loadench.cpp
@@ -19,7 +19,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadfact.cpp b/components/esm/loadfact.cpp
index b71348de44..61d0e1dcf4 100644
--- a/components/esm/loadfact.cpp
+++ b/components/esm/loadfact.cpp
@@ -41,7 +41,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadinfo.cpp b/components/esm/loadinfo.cpp
index 15921249f4..6c54b0b9ab 100644
--- a/components/esm/loadinfo.cpp
+++ b/components/esm/loadinfo.cpp
@@ -23,7 +23,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::FourCC<'D','A','T','A'>::value:
                     esm.getHT(mData, 12);
diff --git a/components/esm/loadingr.cpp b/components/esm/loadingr.cpp
index 26873a6eea..1aba000267 100644
--- a/components/esm/loadingr.cpp
+++ b/components/esm/loadingr.cpp
@@ -18,7 +18,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadland.cpp b/components/esm/loadland.cpp
index 1fac79082d..d7dcd47c69 100644
--- a/components/esm/loadland.cpp
+++ b/components/esm/loadland.cpp
@@ -47,7 +47,7 @@ namespace ESM
         while (!isLoaded && esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::FourCC<'I','N','T','V'>::value:
                     esm.getSubHeader();
@@ -83,7 +83,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::FourCC<'V','N','M','L'>::value:
                     esm.skipHSub();
diff --git a/components/esm/loadlevlist.cpp b/components/esm/loadlevlist.cpp
index 450bf06ecb..acf97f4259 100644
--- a/components/esm/loadlevlist.cpp
+++ b/components/esm/loadlevlist.cpp
@@ -16,7 +16,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadligh.cpp b/components/esm/loadligh.cpp
index e53c82cc3f..32c0b16243 100644
--- a/components/esm/loadligh.cpp
+++ b/components/esm/loadligh.cpp
@@ -18,7 +18,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadlock.cpp b/components/esm/loadlock.cpp
index 88ce77e34e..bea5c86773 100644
--- a/components/esm/loadlock.cpp
+++ b/components/esm/loadlock.cpp
@@ -18,7 +18,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadltex.cpp b/components/esm/loadltex.cpp
index 6bdc40e5fc..f2a1e17d49 100644
--- a/components/esm/loadltex.cpp
+++ b/components/esm/loadltex.cpp
@@ -17,7 +17,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadmgef.cpp b/components/esm/loadmgef.cpp
index 4bc09920e9..badbbb2133 100644
--- a/components/esm/loadmgef.cpp
+++ b/components/esm/loadmgef.cpp
@@ -209,7 +209,7 @@ void MagicEffect::load(ESMReader &esm, bool &isDeleted)
     while (esm.hasMoreSubs())
     {
         esm.getSubName();
-        switch (esm.retSubName().intval)
+        switch (esm.retSubName().toInt())
         {
             case ESM::FourCC<'I','T','E','X'>::value:
                 mIcon = esm.getHString();
diff --git a/components/esm/loadmisc.cpp b/components/esm/loadmisc.cpp
index 39d589eac8..a60012e74b 100644
--- a/components/esm/loadmisc.cpp
+++ b/components/esm/loadmisc.cpp
@@ -18,7 +18,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadnpc.cpp b/components/esm/loadnpc.cpp
index e1fb9b5931..b86ea6f8bc 100644
--- a/components/esm/loadnpc.cpp
+++ b/components/esm/loadnpc.cpp
@@ -26,7 +26,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadpgrd.cpp b/components/esm/loadpgrd.cpp
index 7bf60ca5fc..b10e3c453d 100644
--- a/components/esm/loadpgrd.cpp
+++ b/components/esm/loadpgrd.cpp
@@ -46,7 +46,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::SREC_NAME:
                     mCell = esm.getHString();
diff --git a/components/esm/loadprob.cpp b/components/esm/loadprob.cpp
index 8f03189686..edc6b89cd1 100644
--- a/components/esm/loadprob.cpp
+++ b/components/esm/loadprob.cpp
@@ -18,7 +18,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadrace.cpp b/components/esm/loadrace.cpp
index 44dbde7742..35ad4421f1 100644
--- a/components/esm/loadrace.cpp
+++ b/components/esm/loadrace.cpp
@@ -30,7 +30,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadregn.cpp b/components/esm/loadregn.cpp
index e39887a1b1..9cfdaaabc0 100644
--- a/components/esm/loadregn.cpp
+++ b/components/esm/loadregn.cpp
@@ -17,7 +17,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadrepa.cpp b/components/esm/loadrepa.cpp
index ecb693c0c5..3fe62e740a 100644
--- a/components/esm/loadrepa.cpp
+++ b/components/esm/loadrepa.cpp
@@ -18,7 +18,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadscpt.cpp b/components/esm/loadscpt.cpp
index 8715c83dcb..76cb3c0149 100644
--- a/components/esm/loadscpt.cpp
+++ b/components/esm/loadscpt.cpp
@@ -91,7 +91,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::FourCC<'S','C','H','D'>::value:
                 {
diff --git a/components/esm/loadskil.cpp b/components/esm/loadskil.cpp
index 9f58176f35..9236302dea 100644
--- a/components/esm/loadskil.cpp
+++ b/components/esm/loadskil.cpp
@@ -137,7 +137,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::FourCC<'I','N','D','X'>::value:
                     esm.getHT(mIndex);
diff --git a/components/esm/loadsndg.cpp b/components/esm/loadsndg.cpp
index c439d0ca66..c1170b36c7 100644
--- a/components/esm/loadsndg.cpp
+++ b/components/esm/loadsndg.cpp
@@ -18,7 +18,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadsoun.cpp b/components/esm/loadsoun.cpp
index ed8fc519a6..9d58e19e99 100644
--- a/components/esm/loadsoun.cpp
+++ b/components/esm/loadsoun.cpp
@@ -18,7 +18,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadspel.cpp b/components/esm/loadspel.cpp
index 5983cdcdf5..cc26024426 100644
--- a/components/esm/loadspel.cpp
+++ b/components/esm/loadspel.cpp
@@ -20,7 +20,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadsscr.cpp b/components/esm/loadsscr.cpp
index 9e060ab1a7..723fb3bf10 100644
--- a/components/esm/loadsscr.cpp
+++ b/components/esm/loadsscr.cpp
@@ -18,7 +18,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadstat.cpp b/components/esm/loadstat.cpp
index 1073ab48e2..e0c9eb2c7e 100644
--- a/components/esm/loadstat.cpp
+++ b/components/esm/loadstat.cpp
@@ -19,7 +19,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadweap.cpp b/components/esm/loadweap.cpp
index 78b9bb4073..08c5a3b641 100644
--- a/components/esm/loadweap.cpp
+++ b/components/esm/loadweap.cpp
@@ -18,7 +18,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().intval)
+            switch (esm.retSubName().toInt())
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/transport.cpp b/components/esm/transport.cpp
index 11676ea723..9d40debf73 100644
--- a/components/esm/transport.cpp
+++ b/components/esm/transport.cpp
@@ -10,13 +10,13 @@ namespace ESM
 
     void Transport::add(ESMReader &esm)
     {
-        if (esm.retSubName().intval == ESM::FourCC<'D','O','D','T'>::value)
+        if (esm.retSubName().toInt() == ESM::FourCC<'D','O','D','T'>::value)
         {
             Dest dodt;
             esm.getHExact(&dodt.mPos, 24);
             mList.push_back(dodt);
         }
-        else if (esm.retSubName().intval == ESM::FourCC<'D','N','A','M'>::value)
+        else if (esm.retSubName().toInt() == ESM::FourCC<'D','N','A','M'>::value)
         {
             const std::string name = esm.getHString();
             if (mList.empty())

From 046b5f83ee756169808ab55cd3d8dd5cebfe86ac Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 16 Oct 2021 19:07:55 +0200
Subject: [PATCH 1498/2859] Add ESM data loader

A component to load ESM content files with limited support for record types and
selection which of them to load. Supported record types are:
ACTI, CELL, CONT, DOOR, GMST, LAND, STAT.
---
 apps/openmw_test_suite/CMakeLists.txt         |  15 +
 apps/openmw_test_suite/esmloader/load.cpp     | 104 ++++++
 apps/openmw_test_suite/esmloader/settings.hpp |  20 ++
 apps/openmw_test_suite/openmw_test_suite.cpp  |   5 +
 components/CMakeLists.txt                     |   5 +
 components/esm/esmcommon.hpp                  |   7 +
 components/esmloader/esmdata.cpp              |  77 ++++
 components/esmloader/esmdata.hpp              |  52 +++
 components/esmloader/lessbyid.hpp             |  24 ++
 components/esmloader/load.cpp                 | 334 ++++++++++++++++++
 components/esmloader/load.hpp                 |  39 ++
 components/esmloader/record.hpp               |  44 +++
 12 files changed, 726 insertions(+)
 create mode 100644 apps/openmw_test_suite/esmloader/load.cpp
 create mode 100644 apps/openmw_test_suite/esmloader/settings.hpp
 create mode 100644 components/esmloader/esmdata.cpp
 create mode 100644 components/esmloader/esmdata.hpp
 create mode 100644 components/esmloader/lessbyid.hpp
 create mode 100644 components/esmloader/load.cpp
 create mode 100644 components/esmloader/load.hpp
 create mode 100644 components/esmloader/record.hpp

diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index 056a8d0a63..67001a7885 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -48,6 +48,8 @@ if (GTEST_FOUND AND GMOCK_FOUND)
         sqlite3/request.cpp
         sqlite3/statement.cpp
         sqlite3/transaction.cpp
+
+        esmloader/load.cpp
     )
 
     source_group(apps\\openmw_test_suite FILES openmw_test_suite.cpp ${UNITTEST_SRC_FILES})
@@ -73,4 +75,17 @@ if (GTEST_FOUND AND GMOCK_FOUND)
         endif (CMAKE_CL_64)
     endif (MSVC)
 
+    include(FetchContent)
+    FetchContent_Declare(example_suite_template_game
+        URL https://gitlab.com/OpenMW/example-suite/-/raw/8966dab24692555eec720c854fb0f73d108070cd/data/template.omwgame
+        URL_HASH MD5=bf3691034a38611534c74c3b89a7d2c3
+        SOURCE_DIR fetched/example_suite_template_game
+        DOWNLOAD_NO_EXTRACT ON
+    )
+    FetchContent_MakeAvailableExcludeFromAll(example_suite_template_game)
+
+    add_custom_target(example_suite_template_game SOURCES fetched/example_suite_template_game/template.omwgame)
+
+    add_dependencies(openmw_test_suite example_suite_template_game)
+
 endif()
diff --git a/apps/openmw_test_suite/esmloader/load.cpp b/apps/openmw_test_suite/esmloader/load.cpp
new file mode 100644
index 0000000000..71a8d2534a
--- /dev/null
+++ b/apps/openmw_test_suite/esmloader/load.cpp
@@ -0,0 +1,104 @@
+#include "settings.hpp"
+
+#include <components/esmloader/load.cpp>
+#include <components/files/collections.hpp>
+#include <components/files/multidircollection.hpp>
+#include <components/to_utf8/to_utf8.hpp>
+
+#include <gtest/gtest.h>
+
+namespace
+{
+    using namespace testing;
+    using namespace EsmLoader;
+    using EsmLoaderTests::Settings;
+
+    struct EsmLoaderTest : Test
+    {
+        const boost::filesystem::path mDataDir {Settings::impl().mBasePath / "apps/openmw_test_suite/fetched/example_suite_template_game"};
+        const Files::PathContainer mDataDirs {{mDataDir.string()}};
+        const Files::Collections mFileCollections {mDataDirs, true};
+        const std::vector<std::string> mContentFiles {{"template.omwgame"}};
+    };
+
+    TEST_F(EsmLoaderTest, loadEsmDataShouldSupportOmwgame)
+    {
+        Query query;
+        query.mLoadActivators = true;
+        query.mLoadCells = true;
+        query.mLoadContainers = true;
+        query.mLoadDoors = true;
+        query.mLoadGameSettings = true;
+        query.mLoadLands = true;
+        query.mLoadStatics = true;
+        std::vector<ESM::ESMReader> readers(mContentFiles.size());
+        ToUTF8::Utf8Encoder* const encoder = nullptr;
+        const EsmData esmData = loadEsmData(query, mContentFiles, mFileCollections, readers, encoder);
+        EXPECT_EQ(esmData.mActivators.size(), 0);
+        EXPECT_EQ(esmData.mCells.size(), 1);
+        EXPECT_EQ(esmData.mContainers.size(), 0);
+        EXPECT_EQ(esmData.mDoors.size(), 0);
+        EXPECT_EQ(esmData.mGameSettings.size(), 1521);
+        EXPECT_EQ(esmData.mLands.size(), 1);
+        EXPECT_EQ(esmData.mStatics.size(), 2);
+    }
+
+    TEST_F(EsmLoaderTest, shouldIgnoreCellsWhenQueryLoadCellsIsFalse)
+    {
+        Query query;
+        query.mLoadActivators = true;
+        query.mLoadCells = false;
+        query.mLoadContainers = true;
+        query.mLoadDoors = true;
+        query.mLoadGameSettings = true;
+        query.mLoadLands = true;
+        query.mLoadStatics = true;
+        std::vector<ESM::ESMReader> readers(mContentFiles.size());
+        ToUTF8::Utf8Encoder* const encoder = nullptr;
+        const EsmData esmData = loadEsmData(query, mContentFiles, mFileCollections, readers, encoder);
+        EXPECT_EQ(esmData.mActivators.size(), 0);
+        EXPECT_EQ(esmData.mCells.size(), 0);
+        EXPECT_EQ(esmData.mContainers.size(), 0);
+        EXPECT_EQ(esmData.mDoors.size(), 0);
+        EXPECT_EQ(esmData.mGameSettings.size(), 1521);
+        EXPECT_EQ(esmData.mLands.size(), 1);
+        EXPECT_EQ(esmData.mStatics.size(), 2);
+    }
+
+    TEST_F(EsmLoaderTest, shouldIgnoreCellsGameSettingsWhenQueryLoadGameSettingsIsFalse)
+    {
+        Query query;
+        query.mLoadActivators = true;
+        query.mLoadCells = true;
+        query.mLoadContainers = true;
+        query.mLoadDoors = true;
+        query.mLoadGameSettings = false;
+        query.mLoadLands = true;
+        query.mLoadStatics = true;
+        std::vector<ESM::ESMReader> readers(mContentFiles.size());
+        ToUTF8::Utf8Encoder* const encoder = nullptr;
+        const EsmData esmData = loadEsmData(query, mContentFiles, mFileCollections, readers, encoder);
+        EXPECT_EQ(esmData.mActivators.size(), 0);
+        EXPECT_EQ(esmData.mCells.size(), 1);
+        EXPECT_EQ(esmData.mContainers.size(), 0);
+        EXPECT_EQ(esmData.mDoors.size(), 0);
+        EXPECT_EQ(esmData.mGameSettings.size(), 0);
+        EXPECT_EQ(esmData.mLands.size(), 1);
+        EXPECT_EQ(esmData.mStatics.size(), 2);
+    }
+
+    TEST_F(EsmLoaderTest, shouldIgnoreAllWithDefaultQuery)
+    {
+        const Query query;
+        std::vector<ESM::ESMReader> readers(mContentFiles.size());
+        ToUTF8::Utf8Encoder* const encoder = nullptr;
+        const EsmData esmData = loadEsmData(query, mContentFiles, mFileCollections, readers, encoder);
+        EXPECT_EQ(esmData.mActivators.size(), 0);
+        EXPECT_EQ(esmData.mCells.size(), 0);
+        EXPECT_EQ(esmData.mContainers.size(), 0);
+        EXPECT_EQ(esmData.mDoors.size(), 0);
+        EXPECT_EQ(esmData.mGameSettings.size(), 0);
+        EXPECT_EQ(esmData.mLands.size(), 0);
+        EXPECT_EQ(esmData.mStatics.size(), 0);
+    }
+}
diff --git a/apps/openmw_test_suite/esmloader/settings.hpp b/apps/openmw_test_suite/esmloader/settings.hpp
new file mode 100644
index 0000000000..0f36310bc6
--- /dev/null
+++ b/apps/openmw_test_suite/esmloader/settings.hpp
@@ -0,0 +1,20 @@
+#ifndef OPENMW_TEST_SUITE_LOAD_SETTINGS_H
+#define OPENMW_TEST_SUITE_LOAD_SETTINGS_H
+
+#include <boost/filesystem/path.hpp>
+
+namespace EsmLoaderTests
+{
+    struct Settings
+    {
+        boost::filesystem::path mBasePath;
+
+        static Settings& impl()
+        {
+            static Settings value;
+            return value;
+        }
+    };
+}
+
+#endif
diff --git a/apps/openmw_test_suite/openmw_test_suite.cpp b/apps/openmw_test_suite/openmw_test_suite.cpp
index 7364b20fdb..5fb9bda901 100644
--- a/apps/openmw_test_suite/openmw_test_suite.cpp
+++ b/apps/openmw_test_suite/openmw_test_suite.cpp
@@ -1,5 +1,9 @@
+#include "esmloader/settings.hpp"
+
 #include <gtest/gtest.h>
 
+#include <boost/filesystem/path.hpp>
+
 #ifdef WIN32
 //we cannot use GTEST_API_ before main if we're building standalone exe application,
 //and we're linking GoogleTest / GoogleMock as DLLs and not linking gtest_main / gmock_main
@@ -7,6 +11,7 @@ int main(int argc, char **argv) {
 #else
 GTEST_API_ int main(int argc, char **argv) {
 #endif
+    EsmLoaderTests::Settings::impl().mBasePath = boost::filesystem::path(argv[0]).parent_path();
     testing::InitGoogleTest(&argc, argv);
     return RUN_ALL_TESTS();
 }
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 8fc8c2046b..e71aa88f3c 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -207,6 +207,11 @@ add_component_dir(sqlite3
     transaction
 )
 
+add_component_dir(esmloader
+    load
+    esmdata
+)
+
 set (ESM_UI ${CMAKE_SOURCE_DIR}/files/ui/contentselector.ui
     )
 
diff --git a/components/esm/esmcommon.hpp b/components/esm/esmcommon.hpp
index 10e05de905..2d6caffaba 100644
--- a/components/esm/esmcommon.hpp
+++ b/components/esm/esmcommon.hpp
@@ -121,6 +121,13 @@ struct FIXED_STRING<4> : public FIXED_STRING_BASE<FIXED_STRING, 4>
 
     char const* ro_data() const { return data; }
     char*       rw_data() { return data; }
+
+    std::uint32_t toInt() const
+    {
+        std::uint32_t value;
+        std::memcpy(&value, data, sizeof(data));
+        return value;
+    }
 };
 
 typedef FIXED_STRING<4> NAME;
diff --git a/components/esmloader/esmdata.cpp b/components/esmloader/esmdata.cpp
new file mode 100644
index 0000000000..06f358ea0f
--- /dev/null
+++ b/components/esmloader/esmdata.cpp
@@ -0,0 +1,77 @@
+#include "esmdata.hpp"
+#include "lessbyid.hpp"
+#include "record.hpp"
+
+#include <components/esm/defs.hpp>
+#include <components/esm/loadacti.hpp>
+#include <components/esm/loadcont.hpp>
+#include <components/esm/loaddoor.hpp>
+#include <components/esm/loadgmst.hpp>
+#include <components/esm/loadland.hpp>
+#include <components/esm/loadstat.hpp>
+#include <components/esm/variant.hpp>
+#include <components/misc/stringops.hpp>
+
+#include <algorithm>
+#include <stdexcept>
+#include <string>
+#include <string_view>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
+namespace EsmLoader
+{
+    namespace
+    {
+        template <class F>
+        auto returnAs(F&& f)
+        {
+            using Result = decltype(std::forward<F>(f)(ESM::Static {}));
+            if constexpr (!std::is_same_v<Result, void>)
+                return Result {};
+        }
+
+        template <class T, class F>
+        auto withStatic(std::string_view refId, const std::vector<T>& values, F&& f)
+        {
+            const auto it = std::lower_bound(values.begin(), values.end(), refId, LessById {});
+
+            if (it == values.end() && it->mId != refId)
+                return returnAs(std::forward<F>(f));
+
+            return std::forward<F>(f)(*it);
+        }
+
+        template <class F>
+        auto withStatic(std::string_view refId, ESM::RecNameInts type, const EsmData& content, F&& f)
+        {
+            switch (type)
+            {
+                case ESM::REC_ACTI: return withStatic(refId, content.mActivators, std::forward<F>(f));
+                case ESM::REC_CONT: return withStatic(refId, content.mContainers, std::forward<F>(f));
+                case ESM::REC_DOOR: return withStatic(refId, content.mDoors, std::forward<F>(f));
+                case ESM::REC_STAT: return withStatic(refId, content.mStatics, std::forward<F>(f));
+                default: break;
+            }
+
+            return returnAs(std::forward<F>(f));
+        }
+    }
+
+    EsmData::~EsmData() {}
+
+    std::string_view getModel(const EsmData& content, std::string_view refId, ESM::RecNameInts type)
+    {
+        return withStatic(refId, type, content, [] (const auto& v) { return std::string_view(v.mModel); });
+    }
+
+    ESM::Variant getGameSetting(const std::vector<ESM::GameSetting>& records, std::string_view id)
+    {
+        const std::string lower = Misc::StringUtils::lowerCase(id);
+        auto it = std::lower_bound(records.begin(), records.end(), lower, LessById {});
+        if (it == records.end() || it->mId != lower)
+            throw std::runtime_error("Game settings \"" + std::string(id) + "\" is not found");
+        return it->mValue;
+    }
+}
diff --git a/components/esmloader/esmdata.hpp b/components/esmloader/esmdata.hpp
new file mode 100644
index 0000000000..624f50a5e6
--- /dev/null
+++ b/components/esmloader/esmdata.hpp
@@ -0,0 +1,52 @@
+#ifndef OPENMW_COMPONENTS_ESMLOADER_ESMDATA_H
+#define OPENMW_COMPONENTS_ESMLOADER_ESMDATA_H
+
+#include <components/esm/defs.hpp>
+
+#include <string_view>
+#include <vector>
+
+namespace ESM
+{
+    struct Activator;
+    struct Cell;
+    struct Container;
+    struct Door;
+    struct GameSetting;
+    struct Land;
+    struct Static;
+    struct Variant;
+}
+
+namespace EsmLoader
+{
+    struct RefIdWithType
+    {
+        std::string_view mId;
+        ESM::RecNameInts mType;
+    };
+
+    struct EsmData
+    {
+        std::vector<ESM::Activator> mActivators;
+        std::vector<ESM::Cell> mCells;
+        std::vector<ESM::Container> mContainers;
+        std::vector<ESM::Door> mDoors;
+        std::vector<ESM::GameSetting> mGameSettings;
+        std::vector<ESM::Land> mLands;
+        std::vector<ESM::Static> mStatics;
+        std::vector<RefIdWithType> mRefIdTypes;
+
+        EsmData() = default;
+        EsmData(const EsmData&) = delete;
+        EsmData(EsmData&&) = default;
+
+        ~EsmData();
+    };
+
+    std::string_view getModel(const EsmData& content, std::string_view refId, ESM::RecNameInts type);
+
+    ESM::Variant getGameSetting(const std::vector<ESM::GameSetting>& records, std::string_view id);
+}
+
+#endif
diff --git a/components/esmloader/lessbyid.hpp b/components/esmloader/lessbyid.hpp
new file mode 100644
index 0000000000..da835c9e39
--- /dev/null
+++ b/components/esmloader/lessbyid.hpp
@@ -0,0 +1,24 @@
+#ifndef OPENMW_COMPONENTS_CONTENT_LESSBYID_H
+#define OPENMW_COMPONENTS_CONTENT_LESSBYID_H
+
+#include <string_view>
+
+namespace EsmLoader
+{
+    struct LessById
+    {
+        template <class T>
+        bool operator()(const T& lhs, const T& rhs) const
+        {
+            return lhs.mId < rhs.mId;
+        }
+
+        template <class T>
+        bool operator()(const T& lhs, std::string_view rhs) const
+        {
+            return lhs.mId < rhs;
+        }
+    };
+}
+
+#endif
diff --git a/components/esmloader/load.cpp b/components/esmloader/load.cpp
new file mode 100644
index 0000000000..789e7619b6
--- /dev/null
+++ b/components/esmloader/load.cpp
@@ -0,0 +1,334 @@
+#include "load.hpp"
+#include "esmdata.hpp"
+#include "lessbyid.hpp"
+#include "record.hpp"
+
+#include <components/debug/debuglog.hpp>
+#include <components/esm/cellref.hpp>
+#include <components/esm/defs.hpp>
+#include <components/esm/esmreader.hpp>
+#include <components/esm/loadacti.hpp>
+#include <components/esm/loadcell.hpp>
+#include <components/esm/loadcont.hpp>
+#include <components/esm/loaddoor.hpp>
+#include <components/esm/loadgmst.hpp>
+#include <components/esm/loadland.hpp>
+#include <components/esm/loadstat.hpp>
+#include <components/files/collections.hpp>
+#include <components/files/multidircollection.hpp>
+#include <components/misc/resourcehelpers.hpp>
+#include <components/misc/stringops.hpp>
+
+#include <algorithm>
+#include <cstddef>
+#include <map>
+#include <string>
+#include <string_view>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
+namespace EsmLoader
+{
+    namespace
+    {
+        struct GetKey
+        {
+            template <class T>
+            decltype(auto) operator()(const T& v) const
+            {
+                return (v.mId);
+            }
+
+            const ESM::CellId& operator()(const ESM::Cell& v) const
+            {
+                return v.mCellId;
+            }
+
+            std::pair<int, int> operator()(const ESM::Land& v) const
+            {
+                return std::pair(v.mX, v.mY);
+            }
+
+            template <class T>
+            decltype(auto) operator()(const Record<T>& v) const
+            {
+                return (*this)(v.mValue);
+            }
+        };
+
+        struct CellRecords
+        {
+            Records<ESM::Cell> mValues;
+            std::map<std::string, std::size_t> mByName;
+            std::map<std::pair<int, int>, std::size_t> mByPosition;
+        };
+
+        template <class T, class = std::void_t<>>
+        struct HasId : std::false_type {};
+
+        template <class T>
+        struct HasId<T, std::void_t<decltype(T::mId)>> : std::true_type {};
+
+        template <class T>
+        constexpr bool hasId = HasId<T>::value;
+
+        template <class T>
+        auto loadRecord(ESM::ESMReader& reader, Records<T>& records)
+            -> std::enable_if_t<hasId<T>>
+        {
+            T record;
+            bool deleted = false;
+            record.load(reader, deleted);
+            Misc::StringUtils::lowerCaseInPlace(record.mId);
+            if (Misc::ResourceHelpers::isHiddenMarker(record.mId))
+                return;
+            records.emplace_back(deleted, std::move(record));
+        }
+
+        template <class T>
+        auto loadRecord(ESM::ESMReader& reader, Records<T>& records)
+            -> std::enable_if_t<!hasId<T>>
+        {
+            T record;
+            bool deleted = false;
+            record.load(reader, deleted);
+            records.emplace_back(deleted, std::move(record));
+        }
+
+        void loadRecord(ESM::ESMReader& reader, CellRecords& records)
+        {
+            ESM::Cell record;
+            bool deleted = false;
+            record.loadNameAndData(reader, deleted);
+            Misc::StringUtils::lowerCaseInPlace(record.mName);
+
+            if ((record.mData.mFlags & ESM::Cell::Interior) != 0)
+            {
+                const auto it = records.mByName.find(record.mName);
+                if (it == records.mByName.end())
+                {
+                    record.loadCell(reader, true);
+                    records.mByName.emplace_hint(it, record.mName, records.mValues.size());
+                    records.mValues.emplace_back(deleted, std::move(record));
+                }
+                else
+                {
+                    Record<ESM::Cell>& old = records.mValues[it->second];
+                    old.mValue.mData = record.mData;
+                    old.mValue.loadCell(reader, true);
+                }
+            }
+            else
+            {
+                const std::pair<int, int> position(record.mData.mX, record.mData.mY);
+                const auto it = records.mByPosition.find(position);
+                if (it == records.mByPosition.end())
+                {
+                    record.loadCell(reader, true);
+                    records.mByPosition.emplace_hint(it, position, records.mValues.size());
+                    records.mValues.emplace_back(deleted, std::move(record));
+                }
+                else
+                {
+                    Record<ESM::Cell>& old = records.mValues[it->second];
+                    old.mValue.mData = record.mData;
+                    old.mValue.loadCell(reader, true);
+                }
+            }
+        }
+
+        struct ShallowContent
+        {
+            Records<ESM::Activator> mActivators;
+            CellRecords mCells;
+            Records<ESM::Container> mContainers;
+            Records<ESM::Door> mDoors;
+            Records<ESM::GameSetting> mGameSettings;
+            Records<ESM::Land> mLands;
+            Records<ESM::Static> mStatics;
+        };
+
+        void loadRecord(const Query& query, const ESM::NAME& name, ESM::ESMReader& reader, ShallowContent& content)
+        {
+            switch (name.toInt())
+            {
+                case ESM::REC_ACTI:
+                    if (query.mLoadActivators)
+                        return loadRecord(reader, content.mActivators);
+                    break;
+                case ESM::REC_CELL:
+                    if (query.mLoadCells)
+                        return loadRecord(reader, content.mCells);
+                    break;
+                case ESM::REC_CONT:
+                    if (query.mLoadContainers)
+                        return loadRecord(reader, content.mContainers);
+                    break;
+                case ESM::REC_DOOR:
+                    if (query.mLoadDoors)
+                        return loadRecord(reader, content.mDoors);
+                    break;
+                case ESM::REC_GMST:
+                    if (query.mLoadGameSettings)
+                        return loadRecord(reader, content.mGameSettings);
+                    break;
+                case ESM::REC_LAND:
+                    if (query.mLoadLands)
+                        return loadRecord(reader, content.mLands);
+                    break;
+                case ESM::REC_STAT:
+                    if (query.mLoadStatics)
+                        return loadRecord(reader, content.mStatics);
+                    break;
+            }
+
+            reader.skipRecord();
+        }
+
+        ESM::ESMReader loadEsm(const Query& query, ESM::ESMReader& reader, ShallowContent& content)
+        {
+            Log(Debug::Info) << "Loading ESM file " << reader.getName();
+
+            while (reader.hasMoreRecs())
+            {
+                const ESM::NAME recName = reader.getRecName();
+                reader.getRecHeader();
+                loadRecord(query, recName, reader, content);
+            }
+
+            return reader;
+        }
+
+        ShallowContent shallowLoad(const Query& query, const std::vector<std::string>& contentFiles,
+            const Files::Collections& fileCollections, std::vector<ESM::ESMReader>& readers,
+            ToUTF8::Utf8Encoder* encoder)
+        {
+            ShallowContent result;
+
+            for (std::size_t i = 0; i < contentFiles.size(); ++i)
+            {
+                const std::string &file = contentFiles[i];
+                const Files::MultiDirCollection& collection = fileCollections.getCollection(boost::filesystem::path(file).extension().string());
+
+                ESM::ESMReader& reader = readers[i];
+                reader.setEncoder(encoder);
+                reader.setIndex(static_cast<int>(i));
+                reader.setGlobalReaderList(&readers);
+                reader.open(collection.getPath(file).string());
+
+                loadEsm(query, readers[i], result);
+            }
+
+            return result;
+        }
+
+        struct WithType
+        {
+            ESM::RecNameInts mType;
+
+            template <class T>
+            RefIdWithType operator()(const T& v) const { return {v.mId, mType}; }
+        };
+
+        template <class T>
+        void addRefIdsTypes(const std::vector<T>& values, std::vector<RefIdWithType>& refIdsTypes)
+        {
+            std::transform(values.begin(), values.end(), std::back_inserter(refIdsTypes),
+                           WithType {static_cast<ESM::RecNameInts>(T::sRecordId)});
+        }
+
+        void addRefIdsTypes(EsmData& content)
+        {
+            content.mRefIdTypes.reserve(
+                content.mActivators.size()
+                + content.mContainers.size()
+                + content.mDoors.size()
+                + content.mStatics.size()
+            );
+
+            addRefIdsTypes(content.mActivators, content.mRefIdTypes);
+            addRefIdsTypes(content.mContainers, content.mRefIdTypes);
+            addRefIdsTypes(content.mDoors, content.mRefIdTypes);
+            addRefIdsTypes(content.mStatics, content.mRefIdTypes);
+
+            std::sort(content.mRefIdTypes.begin(), content.mRefIdTypes.end(), LessById {});
+        }
+
+        std::vector<ESM::Cell> prepareCellRecords(Records<ESM::Cell>& records)
+        {
+            std::vector<ESM::Cell> result;
+            for (Record<ESM::Cell>& v : records)
+                if (!v.mDeleted)
+                    result.emplace_back(std::move(v.mValue));
+            return result;
+        }
+    }
+
+    EsmData loadEsmData(const Query& query, const std::vector<std::string>& contentFiles,
+        const Files::Collections& fileCollections, std::vector<ESM::ESMReader>& readers, ToUTF8::Utf8Encoder* encoder)
+    {
+        Log(Debug::Info) << "Loading ESM data...";
+
+        ShallowContent content = shallowLoad(query, contentFiles, fileCollections, readers, encoder);
+
+        std::ostringstream loaded;
+
+        if (query.mLoadActivators)
+            loaded << ' ' << content.mActivators.size() << " activators,";
+        if (query.mLoadCells)
+            loaded << ' ' << content.mCells.mValues.size() << " cells,";
+        if (query.mLoadContainers)
+            loaded << ' ' << content.mContainers.size() << " containers,";
+        if (query.mLoadDoors)
+            loaded << ' ' << content.mDoors.size() << " doors,";
+        if (query.mLoadGameSettings)
+            loaded << ' ' << content.mGameSettings.size() << " game settings,";
+        if (query.mLoadLands)
+            loaded << ' ' << content.mLands.size() << " lands,";
+        if (query.mLoadStatics)
+            loaded << ' ' << content.mStatics.size() << " statics,";
+
+        Log(Debug::Info) << "Loaded" << loaded.str();
+
+        EsmData result;
+
+        if (query.mLoadActivators)
+            result.mActivators = prepareRecords(content.mActivators, GetKey {});
+        if (query.mLoadCells)
+            result.mCells = prepareCellRecords(content.mCells.mValues);
+        if (query.mLoadContainers)
+            result.mContainers = prepareRecords(content.mContainers, GetKey {});
+        if (query.mLoadDoors)
+            result.mDoors = prepareRecords(content.mDoors, GetKey {});
+        if (query.mLoadGameSettings)
+            result.mGameSettings = prepareRecords(content.mGameSettings, GetKey {});
+        if (query.mLoadLands)
+            result.mLands = prepareRecords(content.mLands, GetKey {});
+        if (query.mLoadStatics)
+            result.mStatics = prepareRecords(content.mStatics, GetKey {});
+
+        addRefIdsTypes(result);
+
+        std::ostringstream prepared;
+
+        if (query.mLoadActivators)
+            prepared << ' ' << result.mActivators.size() << " unique activators,";
+        if (query.mLoadCells)
+            prepared << ' ' << result.mCells.size() << " unique cells,";
+        if (query.mLoadContainers)
+            prepared << ' ' << result.mContainers.size() << " unique containers,";
+        if (query.mLoadDoors)
+            prepared << ' ' << result.mDoors.size() << " unique doors,";
+        if (query.mLoadGameSettings)
+            prepared << ' ' << result.mGameSettings.size() << " unique game settings,";
+        if (query.mLoadLands)
+            prepared << ' ' << result.mLands.size() << " unique lands,";
+        if (query.mLoadStatics)
+            prepared << ' ' << result.mStatics.size() << " unique statics,";
+
+        Log(Debug::Info) << "Prepared" << prepared.str();
+
+        return result;
+    }
+}
diff --git a/components/esmloader/load.hpp b/components/esmloader/load.hpp
new file mode 100644
index 0000000000..39d6f48b81
--- /dev/null
+++ b/components/esmloader/load.hpp
@@ -0,0 +1,39 @@
+#ifndef OPENMW_COMPONENTS_ESMLOADER_LOAD_H
+#define OPENMW_COMPONENTS_ESMLOADER_LOAD_H
+
+#include <components/esm/esmreader.hpp>
+
+#include <string>
+#include <vector>
+
+namespace ToUTF8
+{
+    class Utf8Encoder;
+}
+
+namespace Files
+{
+    class Collections;
+}
+
+namespace EsmLoader
+{
+    struct EsmData;
+
+    struct Query
+    {
+        bool mLoadActivators = false;
+        bool mLoadCells = false;
+        bool mLoadContainers = false;
+        bool mLoadDoors = false;
+        bool mLoadGameSettings = false;
+        bool mLoadLands = false;
+        bool mLoadStatics = false;
+    };
+
+    EsmData loadEsmData(const Query& query, const std::vector<std::string>& contentFiles,
+        const Files::Collections& fileCollections, std::vector<ESM::ESMReader>& readers,
+        ToUTF8::Utf8Encoder* encoder);
+}
+
+#endif
diff --git a/components/esmloader/record.hpp b/components/esmloader/record.hpp
new file mode 100644
index 0000000000..c076ee72c6
--- /dev/null
+++ b/components/esmloader/record.hpp
@@ -0,0 +1,44 @@
+#ifndef OPENMW_COMPONENTS_ESMLOADER_RECORD_H
+#define OPENMW_COMPONENTS_ESMLOADER_RECORD_H
+
+#include <components/esm/loadcell.hpp>
+
+#include <algorithm>
+#include <utility>
+#include <vector>
+
+namespace EsmLoader
+{
+    template <class T>
+    struct Record
+    {
+        bool mDeleted;
+        T mValue;
+
+        template <class ... Args>
+        explicit Record(bool deleted, Args&& ... args)
+            : mDeleted(deleted)
+            , mValue(std::forward<Args>(args) ...)
+        {}
+    };
+
+    template <class T>
+    using Records = std::vector<Record<T>>;
+
+    template <class T, class GetKey>
+    inline std::vector<T> prepareRecords(Records<T>& records, const GetKey& getKey)
+    {
+        const auto greaterByKey = [&] (const auto& l, const auto& r) { return getKey(r) < getKey(l); };
+        const auto equalByKey = [&] (const auto& l, const auto& r) { return getKey(l) == getKey(r); };
+        std::stable_sort(records.begin(), records.end(), greaterByKey);
+        records.erase(std::unique(records.begin(), records.end(), equalByKey), records.end());
+        std::reverse(records.begin(), records.end());
+        std::vector<T> result;
+        for (Record<T>& v : records)
+            if (!v.mDeleted)
+                result.emplace_back(std::move(v.mValue));
+        return result;
+    }
+}
+
+#endif

From 23026caacc40356f7ad2c13ee38a3f0fcf0b559f Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 17 Oct 2021 22:44:04 +0200
Subject: [PATCH 1499/2859] Fix LuaUtilPackageTest.Transform

It can fail due to float arithmetic precision with error:
Expected equality of these values:
  getAsString(lua, "moveAndScale")
    Which is: "TransformM{ move(6, 22, 18) scale(0.5, 1, 0.5) rotation(angle=8.53284e-17, axis=(1, 0, 0)) }"
  "TransformM{ move(6, 22, 18) scale(0.5, 1, 0.5) }"
---
 apps/openmw_test_suite/lua/test_utilpackage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw_test_suite/lua/test_utilpackage.cpp b/apps/openmw_test_suite/lua/test_utilpackage.cpp
index 934cbf761a..ead3cecc6f 100644
--- a/apps/openmw_test_suite/lua/test_utilpackage.cpp
+++ b/apps/openmw_test_suite/lua/test_utilpackage.cpp
@@ -91,7 +91,7 @@ namespace
         lua.safe_script("moveAndScale = T.move(v(1, 2, 3)) * T.scale(0.5, 1, 0.5) * T.move(10, 20, 30)");
         EXPECT_EQ(getAsString(lua, "moveAndScale * v(0, 0, 0)"), "(6, 22, 18)");
         EXPECT_EQ(getAsString(lua, "moveAndScale * v(300, 200, 100)"), "(156, 222, 68)");
-        EXPECT_EQ(getAsString(lua, "moveAndScale"), "TransformM{ move(6, 22, 18) scale(0.5, 1, 0.5) }");
+        EXPECT_THAT(getAsString(lua, "moveAndScale"), AllOf(StartsWith("TransformM{ move(6, 22, 18) scale(0.5, 1, 0.5) "), EndsWith(" }")));
         EXPECT_EQ(getAsString(lua, "T.identity"), "TransformM{ }");
         lua.safe_script("rx = T.rotateX(math.pi / 2)");
         lua.safe_script("ry = T.rotateY(math.pi / 2)");

From 9be606a40de19ea7636694beda2f8790f605774b Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Sun, 17 Oct 2021 23:40:34 +0100
Subject: [PATCH 1500/2859] Finish removing old Escape classes

---
 apps/openmw/main.cpp                          |   1 -
 apps/openmw/options.cpp                       |   2 +-
 apps/openmw_test_suite/mwworld/test_store.cpp |   1 -
 apps/openmw_test_suite/openmw/options.cpp     |   1 -
 components/CMakeLists.txt                     |   2 +-
 components/fallback/validate.cpp              |   9 +-
 components/fallback/validate.hpp              |   2 -
 components/files/configurationmanager.cpp     |   1 -
 components/files/escape.cpp                   | 145 -------------
 components/files/escape.hpp                   | 191 ------------------
 10 files changed, 6 insertions(+), 349 deletions(-)
 delete mode 100644 components/files/escape.cpp
 delete mode 100644 components/files/escape.hpp

diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index 18b1ab267f..7a3a21b149 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -1,6 +1,5 @@
 #include <components/version/version.hpp>
 #include <components/files/configurationmanager.hpp>
-#include <components/files/escape.hpp>
 #include <components/fallback/fallback.hpp>
 #include <components/fallback/validate.hpp>
 #include <components/debug/debugging.hpp>
diff --git a/apps/openmw/options.cpp b/apps/openmw/options.cpp
index 167c275598..dd94590f2a 100644
--- a/apps/openmw/options.cpp
+++ b/apps/openmw/options.cpp
@@ -1,7 +1,7 @@
 #include "options.hpp"
 
 #include <components/fallback/validate.hpp>
-#include <components/files/escape.hpp>
+#include <components/files/configurationmanager.hpp>
 #include <components/misc/rng.hpp>
 
 #include <boost/program_options.hpp>
diff --git a/apps/openmw_test_suite/mwworld/test_store.cpp b/apps/openmw_test_suite/mwworld/test_store.cpp
index 13a9ebee9c..9aa5a6758f 100644
--- a/apps/openmw_test_suite/mwworld/test_store.cpp
+++ b/apps/openmw_test_suite/mwworld/test_store.cpp
@@ -3,7 +3,6 @@
 #include <boost/filesystem/fstream.hpp>
 
 #include <components/files/configurationmanager.hpp>
-#include <components/files/escape.hpp>
 #include <components/esm/esmreader.hpp>
 #include <components/esm/esmwriter.hpp>
 #include <components/loadinglistener/loadinglistener.hpp>
diff --git a/apps/openmw_test_suite/openmw/options.cpp b/apps/openmw_test_suite/openmw/options.cpp
index b087fd03fb..7cf0df1066 100644
--- a/apps/openmw_test_suite/openmw/options.cpp
+++ b/apps/openmw_test_suite/openmw/options.cpp
@@ -1,6 +1,5 @@
 #include <apps/openmw/options.hpp>
 #include <components/files/configurationmanager.hpp>
-#include <components/files/escape.hpp>
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index b9db26dbc1..b61ba11466 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -104,7 +104,7 @@ IF(NOT WIN32 AND NOT APPLE)
     add_definitions(-DGLOBAL_CONFIG_PATH="${GLOBAL_CONFIG_PATH}")
 ENDIF()
 add_component_dir (files
-    linuxpath androidpath windowspath macospath fixedpath multidircollection collections configurationmanager escape
+    linuxpath androidpath windowspath macospath fixedpath multidircollection collections configurationmanager
     lowlevelfile constrainedfilestream memorystream configfileparser
     )
 
diff --git a/components/fallback/validate.cpp b/components/fallback/validate.cpp
index a482d40faf..6f5d529e05 100644
--- a/components/fallback/validate.cpp
+++ b/components/fallback/validate.cpp
@@ -11,13 +11,12 @@ void Fallback::validate(boost::any& v, std::vector<std::string> const& tokens, F
 
     for (const auto& token : tokens)
     {
-        std::string temp = Files::EscapeHashString::processString(token);
-        size_t sep = temp.find(',');
-        if (sep < 1 || sep == temp.length() - 1 || sep == std::string::npos)
+        size_t sep = token.find(',');
+        if (sep < 1 || sep == token.length() - 1 || sep == std::string::npos)
             throw boost::program_options::validation_error(boost::program_options::validation_error::invalid_option_value);
 
-        std::string key(temp.substr(0, sep));
-        std::string value(temp.substr(sep + 1));
+        std::string key(token.substr(0, sep));
+        std::string value(token.substr(sep + 1));
 
         map->mMap[key] = value;
     }
diff --git a/components/fallback/validate.hpp b/components/fallback/validate.hpp
index 96690f50a5..2b9af88da2 100644
--- a/components/fallback/validate.hpp
+++ b/components/fallback/validate.hpp
@@ -3,8 +3,6 @@
 
 #include <boost/program_options.hpp>
 
-#include <components/files/escape.hpp>
-
 // Parses and validates a fallback map from boost program_options.
 // Note: for boost to pick up the validate function, you need to pull in the namespace e.g.
 // by using namespace Fallback;
diff --git a/components/files/configurationmanager.cpp b/components/files/configurationmanager.cpp
index dad52a7ee4..23c25fd413 100644
--- a/components/files/configurationmanager.cpp
+++ b/components/files/configurationmanager.cpp
@@ -2,7 +2,6 @@
 
 #include <components/debug/debuglog.hpp>
 #include <components/files/configfileparser.hpp>
-#include <components/files/escape.hpp>
 #include <components/fallback/validate.hpp>
 
 #include <boost/filesystem/fstream.hpp>
diff --git a/components/files/escape.cpp b/components/files/escape.cpp
deleted file mode 100644
index 8b11504d34..0000000000
--- a/components/files/escape.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-#include "escape.hpp"
-
-#include <components/misc/stringops.hpp>
-
-namespace Files
-{
-    const int escape_hash_filter::sEscape = '@';
-    const int escape_hash_filter::sEscapeIdentifier = 'a';
-    const int escape_hash_filter::sHashIdentifier = 'h';
-
-    escape_hash_filter::escape_hash_filter() : mSeenNonWhitespace(false), mFinishLine(false)
-    {
-    }
-
-    escape_hash_filter::~escape_hash_filter()
-    {
-    }
-
-    unescape_hash_filter::unescape_hash_filter() : expectingIdentifier(false)
-    {
-    }
-
-    unescape_hash_filter::~unescape_hash_filter()
-    {
-    }
-
-    std::string EscapeHashString::processString(const std::string & str)
-    {
-        std::string temp = str;
-
-        static const char hash[] = { escape_hash_filter::sEscape,  escape_hash_filter::sHashIdentifier };
-        Misc::StringUtils::replaceAll(temp, hash, "#", 2, 1);
-
-        static const char escape[] = { escape_hash_filter::sEscape,  escape_hash_filter::sEscapeIdentifier };
-        Misc::StringUtils::replaceAll(temp, escape, "@", 2, 1);
-
-        return temp;
-    }
-
-    EscapeHashString::EscapeHashString() : mData()
-    {
-    }
-
-    EscapeHashString::EscapeHashString(const std::string & str) : mData(EscapeHashString::processString(str))
-    {
-    }
-
-    EscapeHashString::EscapeHashString(const std::string & str, size_t pos, size_t len) : mData(EscapeHashString::processString(str), pos, len)
-    {
-    }
-
-    EscapeHashString::EscapeHashString(const char * s) : mData(EscapeHashString::processString(std::string(s)))
-    {
-    }
-
-    EscapeHashString::EscapeHashString(const char * s, size_t n) : mData(EscapeHashString::processString(std::string(s)), 0, n)
-    {
-    }
-
-    EscapeHashString::EscapeHashString(size_t n, char c) : mData(n, c)
-    {
-    }
-
-    template <class InputIterator>
-    EscapeHashString::EscapeHashString(InputIterator first, InputIterator last) : mData(EscapeHashString::processString(std::string(first, last)))
-    {
-    }
-
-    std::string EscapeHashString::toStdString() const
-    {
-        return std::string(mData);
-    }
-
-    std::istream & operator>> (std::istream & is, EscapeHashString & eHS)
-    {
-        std::string temp;
-        is >> temp;
-        eHS = EscapeHashString(temp);
-        return is;
-    }
-
-    std::ostream & operator<< (std::ostream & os, const EscapeHashString & eHS)
-    {
-        os << eHS.mData;
-        return os;
-    }
-
-    EscapeStringVector::EscapeStringVector() : mVector()
-    {
-    }
-
-    EscapeStringVector::~EscapeStringVector()
-    {
-    }
-
-    std::vector<std::string> EscapeStringVector::toStdStringVector() const
-    {
-        std::vector<std::string> temp = std::vector<std::string>();
-        for (std::vector<EscapeHashString>::const_iterator it = mVector.begin(); it != mVector.end(); ++it)
-        {
-            temp.push_back(it->toStdString());
-        }
-        return temp;
-    }
-
-    // boost program options validation
-
-    void validate(boost::any &v, const std::vector<std::string> &tokens, Files::EscapeHashString * eHS, int a)
-    {
-        boost::program_options::validators::check_first_occurrence(v);
-
-        if (v.empty())
-            v = boost::any(EscapeHashString(boost::program_options::validators::get_single_string(tokens)));
-    }
-
-    void validate(boost::any &v, const std::vector<std::string> &tokens, EscapeStringVector *, int)
-    {
-        if (v.empty())
-            v = boost::any(EscapeStringVector());
-
-        EscapeStringVector * eSV = boost::any_cast<EscapeStringVector>(&v);
-
-        for (std::vector<std::string>::const_iterator it = tokens.begin(); it != tokens.end(); ++it)
-            eSV->mVector.emplace_back(*it);
-    }
-
-    PathContainer EscapePath::toPathContainer(const EscapePathContainer & escapePathContainer)
-    {
-        PathContainer temp;
-        for (EscapePathContainer::const_iterator it = escapePathContainer.begin(); it != escapePathContainer.end(); ++it)
-            temp.push_back(it->mPath);
-        return temp;
-    }
-
-    std::istream & operator>> (std::istream & istream, EscapePath & escapePath)
-    {
-        boost::iostreams::filtering_istream filteredStream;
-        filteredStream.push(unescape_hash_filter());
-        filteredStream.push(istream);
-
-        filteredStream >> escapePath.mPath;
-
-        return istream;
-    }
-}
diff --git a/components/files/escape.hpp b/components/files/escape.hpp
deleted file mode 100644
index d01bd8d980..0000000000
--- a/components/files/escape.hpp
+++ /dev/null
@@ -1,191 +0,0 @@
-#ifndef COMPONENTS_FILES_ESCAPE_HPP
-#define COMPONENTS_FILES_ESCAPE_HPP
-
-#include <queue>
-
-#include <components/files/multidircollection.hpp>
-
-#include <boost/iostreams/filtering_stream.hpp>
-#include <boost/filesystem/path.hpp>
-#include <boost/program_options.hpp>
-
-/**
- * \namespace Files
- */
-namespace Files
-{
-    /**
-    * \struct escape_hash_filter
-    */
-    struct escape_hash_filter : public boost::iostreams::input_filter
-    {
-        static const int sEscape;
-        static const int sHashIdentifier;
-        static const int sEscapeIdentifier;
-
-        escape_hash_filter();
-        virtual ~escape_hash_filter();
-
-        template <typename Source> int get(Source & src);
-
-    private:
-        std::queue<int> mNext;
-
-        bool mSeenNonWhitespace;
-        bool mFinishLine;
-    };
-
-    template <typename Source>
-    int escape_hash_filter::get(Source & src)
-    {
-        if (mNext.empty())
-        {
-            int character = boost::iostreams::get(src);
-            if (character == boost::iostreams::WOULD_BLOCK)
-            {
-                mNext.push(character);
-            }
-            else if (character == EOF)
-            {
-                mSeenNonWhitespace = false;
-                mFinishLine = false;
-                mNext.push(character);
-            }
-            else if (character == '\n')
-            {
-                mSeenNonWhitespace = false;
-                mFinishLine = false;
-                mNext.push(character);
-            }
-            else if (mFinishLine)
-            {
-                mNext.push(character);
-            }
-            else if (character == '#')
-            {
-                if (mSeenNonWhitespace)
-                {
-                    mNext.push(sEscape);
-                    mNext.push(sHashIdentifier);
-                }
-                else
-                {
-                    //it's fine being interpreted by Boost as a comment, and so is anything afterwards
-                    mNext.push(character);
-                    mFinishLine = true;
-                }
-            }
-            else if (character == sEscape)
-            {
-                mNext.push(sEscape);
-                mNext.push(sEscapeIdentifier);
-            }
-            else
-            {
-                mNext.push(character);
-            }
-            if (!mSeenNonWhitespace && !isspace(character))
-                mSeenNonWhitespace = true;
-        }
-        int retval = mNext.front();
-        mNext.pop();
-        return retval;
-    }
-
-    struct unescape_hash_filter : public boost::iostreams::input_filter
-    {
-        unescape_hash_filter();
-        virtual ~unescape_hash_filter();
-
-        template <typename Source> int get(Source & src);
-
-    private:
-        bool expectingIdentifier;
-    };
-
-    template <typename Source>
-    int unescape_hash_filter::get(Source & src)
-    {
-        int character;
-        if (!expectingIdentifier)
-            character = boost::iostreams::get(src);
-        else
-        {
-            character = escape_hash_filter::sEscape;
-            expectingIdentifier = false;
-        }
-        if (character == escape_hash_filter::sEscape)
-        {
-            int nextChar = boost::iostreams::get(src);
-            int intended;
-            if (nextChar == escape_hash_filter::sEscapeIdentifier)
-                intended = escape_hash_filter::sEscape;
-            else if (nextChar == escape_hash_filter::sHashIdentifier)
-                intended = '#';
-            else if (nextChar == boost::iostreams::WOULD_BLOCK)
-            {
-                expectingIdentifier = true;
-                intended = nextChar;
-            }
-            else
-                intended = '?';
-            return intended;
-        }
-        else
-            return character;
-    }
-
-    /**
-    * \class EscapeHashString
-    */
-    class EscapeHashString
-    {
-    private:
-        std::string mData;
-    public:
-        static std::string processString(const std::string & str);
-
-        EscapeHashString();
-        EscapeHashString(const std::string & str);
-        EscapeHashString(const std::string & str, size_t pos, size_t len = std::string::npos);
-        EscapeHashString(const char * s);
-        EscapeHashString(const char * s, size_t n);
-        EscapeHashString(size_t n, char c);
-        template <class InputIterator>
-        EscapeHashString(InputIterator first, InputIterator last);
-
-        std::string toStdString() const;
-
-        friend std::ostream & operator<< (std::ostream & os, const EscapeHashString & eHS);
-    };
-
-    std::istream & operator>> (std::istream & is, EscapeHashString & eHS);
-
-    struct EscapeStringVector
-    {
-        std::vector<Files::EscapeHashString> mVector;
-
-        EscapeStringVector();
-        virtual ~EscapeStringVector();
-
-        std::vector<std::string> toStdStringVector() const;
-    };
-
-    //boost program options validation
-
-    void validate(boost::any &v, const std::vector<std::string> &tokens, Files::EscapeHashString * eHS, int a);
-
-    void validate(boost::any &v, const std::vector<std::string> &tokens, EscapeStringVector *, int);
-
-    struct EscapePath
-    {
-        boost::filesystem::path mPath;
-
-        static PathContainer toPathContainer(const std::vector<EscapePath> & escapePathContainer);
-    };
-
-    typedef std::vector<EscapePath> EscapePathContainer;
-
-    std::istream & operator>> (std::istream & istream, EscapePath & escapePath);
-} /* namespace Files */
-#endif /* COMPONENTS_FILES_ESCAPE_HPP */

From bb26ba30b6d8e195a6b61d69b60d7543b32859ff Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 17 Oct 2021 22:12:33 +0200
Subject: [PATCH 1501/2859] Add progress reporter type

To log/report progress of long duration operations using given time period.
---
 apps/openmw_test_suite/CMakeLists.txt         |  1 +
 .../misc/progressreporter.cpp                 | 43 ++++++++++++++++
 components/misc/progressreporter.hpp          | 50 +++++++++++++++++++
 3 files changed, 94 insertions(+)
 create mode 100644 apps/openmw_test_suite/misc/progressreporter.cpp
 create mode 100644 components/misc/progressreporter.hpp

diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index 67001a7885..e8a296b563 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -24,6 +24,7 @@ if (GTEST_FOUND AND GMOCK_FOUND)
 
         misc/test_stringops.cpp
         misc/test_endianness.cpp
+        misc/progressreporter.cpp
 
         nifloader/testbulletnifloader.cpp
 
diff --git a/apps/openmw_test_suite/misc/progressreporter.cpp b/apps/openmw_test_suite/misc/progressreporter.cpp
new file mode 100644
index 0000000000..cd5449acf7
--- /dev/null
+++ b/apps/openmw_test_suite/misc/progressreporter.cpp
@@ -0,0 +1,43 @@
+#include <components/misc/progressreporter.hpp>
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+#include <chrono>
+
+namespace
+{
+    using namespace testing;
+    using namespace Misc;
+
+    struct ReportMock
+    {
+        MOCK_METHOD(void, call, (std::size_t, std::size_t), ());
+    };
+
+    struct Report
+    {
+        StrictMock<ReportMock>* mImpl;
+
+        void operator()(std::size_t provided, std::size_t expected)
+        {
+            mImpl->call(provided, expected);
+        }
+    };
+
+    TEST(MiscProgressReporterTest, shouldCallReportWhenPassedInterval)
+    {
+        StrictMock<ReportMock> report;
+        EXPECT_CALL(report, call(13, 42)).WillOnce(Return());
+        ProgressReporter reporter(std::chrono::steady_clock::duration(0), Report {&report});
+        reporter(13, 42);
+    }
+
+    TEST(MiscProgressReporterTest, shouldNotCallReportWhenIntervalIsNotPassed)
+    {
+        StrictMock<ReportMock> report;
+        EXPECT_CALL(report, call(13, 42)).Times(0);
+        ProgressReporter reporter(std::chrono::seconds(1000), Report {&report});
+        reporter(13, 42);
+    }
+}
diff --git a/components/misc/progressreporter.hpp b/components/misc/progressreporter.hpp
new file mode 100644
index 0000000000..733e36191e
--- /dev/null
+++ b/components/misc/progressreporter.hpp
@@ -0,0 +1,50 @@
+#ifndef OPENMW_COMPONENTS_MISC_PROGRESSREPORTER_H
+#define OPENMW_COMPONENTS_MISC_PROGRESSREPORTER_H
+
+#include <algorithm>
+#include <chrono>
+#include <mutex>
+#include <type_traits>
+#include <utility>
+
+namespace Misc
+{
+    template <class Report>
+    class ProgressReporter
+    {
+    public:
+        explicit ProgressReporter(Report&& report = Report {})
+            : mReport(std::forward<Report>(report))
+        {}
+
+        explicit ProgressReporter(std::chrono::steady_clock::duration interval, Report&& report = Report {})
+            : mInterval(interval)
+            , mReport(std::forward<Report>(report))
+        {}
+
+        void operator()(std::size_t provided, std::size_t expected)
+        {
+            expected = std::max(expected, provided);
+            const bool shouldReport = [&]
+            {
+                const std::lock_guard lock(mMutex);
+                const auto now = std::chrono::steady_clock::now();
+                const auto left = mNextReport - now;
+                if (left.count() > 0 || provided == expected)
+                    return false;
+                mNextReport += mInterval + left;
+                return true;
+            } ();
+            if (shouldReport)
+                mReport(provided, expected);
+        }
+
+    private:
+        const std::chrono::steady_clock::duration mInterval = std::chrono::seconds(1);
+        Report mReport;
+        std::mutex mMutex;
+        std::chrono::steady_clock::time_point mNextReport {std::chrono::steady_clock::now() + mInterval};
+    };
+}
+
+#endif

From e5413c066489a5ed388a78c789de9c347a4616bc Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 18 Oct 2021 01:43:33 +0200
Subject: [PATCH 1502/2859] Add functions to compress/decompress vector of
 bytes

---
 apps/openmw_test_suite/CMakeLists.txt       |  1 +
 apps/openmw_test_suite/misc/compression.cpp | 31 +++++++++++++
 components/CMakeLists.txt                   |  1 +
 components/misc/compression.cpp             | 48 +++++++++++++++++++++
 components/misc/compression.hpp             | 14 ++++++
 5 files changed, 95 insertions(+)
 create mode 100644 apps/openmw_test_suite/misc/compression.cpp
 create mode 100644 components/misc/compression.cpp
 create mode 100644 components/misc/compression.hpp

diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index e8a296b563..3d19834066 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -25,6 +25,7 @@ if (GTEST_FOUND AND GMOCK_FOUND)
         misc/test_stringops.cpp
         misc/test_endianness.cpp
         misc/progressreporter.cpp
+        misc/compression.cpp
 
         nifloader/testbulletnifloader.cpp
 
diff --git a/apps/openmw_test_suite/misc/compression.cpp b/apps/openmw_test_suite/misc/compression.cpp
new file mode 100644
index 0000000000..e062599f4a
--- /dev/null
+++ b/apps/openmw_test_suite/misc/compression.cpp
@@ -0,0 +1,31 @@
+#include <components/misc/compression.hpp>
+
+#include <gtest/gtest.h>
+
+#include <algorithm>
+#include <cstdlib>
+#include <cstring>
+
+namespace
+{
+    using namespace testing;
+    using namespace Misc;
+
+    TEST(MiscCompressionTest, compressShouldAddPrefixWithDataSize)
+    {
+        const std::vector<std::byte> data(1234);
+        const std::vector<std::byte> compressed = compress(data);
+        int size = 0;
+        std::memcpy(&size, compressed.data(), sizeof(size));
+        EXPECT_EQ(size, data.size());
+    }
+
+    TEST(MiscCompressionTest, decompressIsInverseToCompress)
+    {
+        const std::vector<std::byte> data(1024);
+        const std::vector<std::byte> compressed = compress(data);
+        EXPECT_LT(compressed.size(), data.size());
+        const std::vector<std::byte> decompressed = decompress(compressed);
+        EXPECT_EQ(decompressed, data);
+    }
+}
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index e71aa88f3c..7b06b6702d 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -93,6 +93,7 @@ add_component_dir (esmterrain
 
 add_component_dir (misc
     constants utf8stream stringops resourcehelpers rng messageformatparser weakcache thread
+    compression
     )
 
 add_component_dir (debug
diff --git a/components/misc/compression.cpp b/components/misc/compression.cpp
new file mode 100644
index 0000000000..7f76d0900c
--- /dev/null
+++ b/components/misc/compression.cpp
@@ -0,0 +1,48 @@
+#include "compression.hpp"
+
+#include <lz4.h>
+
+#include <cstddef>
+#include <cstring>
+#include <stdexcept>
+#include <string>
+#include <vector>
+
+namespace Misc
+{
+    std::vector<std::byte> compress(const std::vector<std::byte>& data)
+    {
+        const std::size_t originalSize = data.size();
+        std::vector<std::byte> result(static_cast<std::size_t>(LZ4_compressBound(static_cast<int>(originalSize)) + sizeof(originalSize)));
+        const int size = LZ4_compress_default(
+            reinterpret_cast<const char*>(data.data()),
+            reinterpret_cast<char*>(result.data()) + sizeof(originalSize),
+            static_cast<int>(data.size()),
+            static_cast<int>(result.size() - sizeof(originalSize))
+        );
+        if (size == 0)
+            throw std::runtime_error("Failed to compress");
+        std::memcpy(result.data(), &originalSize, sizeof(originalSize));
+        result.resize(static_cast<std::size_t>(size) + sizeof(originalSize));
+        return result;
+    }
+
+    std::vector<std::byte> decompress(const std::vector<std::byte>& data)
+    {
+        std::size_t originalSize;
+        std::memcpy(&originalSize, data.data(), sizeof(originalSize));
+        std::vector<std::byte> result(originalSize);
+        const int size = LZ4_decompress_safe(
+            reinterpret_cast<const char*>(data.data()) + sizeof(originalSize),
+            reinterpret_cast<char*>(result.data()),
+            static_cast<int>(data.size() - sizeof(originalSize)),
+            static_cast<int>(result.size())
+        );
+        if (size < 0)
+            throw std::runtime_error("Failed to decompress");
+        if (originalSize != static_cast<std::size_t>(size))
+            throw std::runtime_error("Size of decompressed data (" + std::to_string(size)
+                                     + ") doesn't match stored (" + std::to_string(originalSize) + ")");
+        return result;
+    }
+}
diff --git a/components/misc/compression.hpp b/components/misc/compression.hpp
new file mode 100644
index 0000000000..2b951ebed6
--- /dev/null
+++ b/components/misc/compression.hpp
@@ -0,0 +1,14 @@
+#ifndef OPENMW_COMPONENTS_MISC_COMPRESSION_H
+#define OPENMW_COMPONENTS_MISC_COMPRESSION_H
+
+#include <cstddef>
+#include <vector>
+
+namespace Misc
+{
+    std::vector<std::byte> compress(const std::vector<std::byte>& data);
+
+    std::vector<std::byte> decompress(const std::vector<std::byte>& data);
+}
+
+#endif

From 1da9c756926df0cbe01bd7b537aed34050c5fd6c Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 18 Oct 2021 22:11:48 +0200
Subject: [PATCH 1503/2859] Add missing initialization for
 Enchanting::mObjectType

---
 apps/openmw/mwmechanics/enchanting.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/openmw/mwmechanics/enchanting.cpp b/apps/openmw/mwmechanics/enchanting.cpp
index 0410dd02dd..078cbc5f43 100644
--- a/apps/openmw/mwmechanics/enchanting.cpp
+++ b/apps/openmw/mwmechanics/enchanting.cpp
@@ -22,6 +22,7 @@ namespace MWMechanics
     Enchanting::Enchanting()
         : mCastStyle(ESM::Enchantment::CastOnce)
         , mSelfEnchanting(false)
+        , mObjectType(0)
         , mWeaponType(-1)
     {}
 

From b1fdc0eb8a573e5001197c4aba83131661672912 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Tue, 19 Oct 2021 14:00:50 +0200
Subject: [PATCH 1504/2859] Make MacOS great again (#3178)

* Make MacOS great again

* Update cmake.yml
---
 .github/workflows/cmake.yml | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index d53d2380d4..1ce10fa6cd 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -8,7 +8,7 @@ env:
   BUILD_TYPE: RelWithDebInfo
 
 jobs:
-  build:
+  Ubuntu:
     runs-on: ubuntu-latest
 
     steps:
@@ -60,3 +60,28 @@ jobs:
 #      with:
 #        path: ./build_artifact.7z
 #        name: build_artifact.7z
+
+  MacOS:
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Install Building Dependancies
+      run: CI/before_install.osx.sh
+
+    - name: Prime ccache
+      uses: hendrikmuhs/ccache-action@v1
+      with:
+        key: ${{ matrix.os }}-${{ env.BUILD_TYPE }}
+        max-size: 1000M
+
+    - name: Configure
+      run: |
+        rm -fr build  # remove the build directory
+        CI/before_script.osx.sh
+
+    - name: Build
+      run: |
+        cd build 
+        make -j $(sysctl -n hw.logicalcpu) package

From dd4d8b26494ee1dd5bef2f3669f299f5a549bcb3 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Tue, 19 Oct 2021 21:38:07 +0200
Subject: [PATCH 1505/2859] Prevent floating point issues accumulating

---
 apps/openmw/mwmechanics/magiceffects.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/apps/openmw/mwmechanics/magiceffects.cpp b/apps/openmw/mwmechanics/magiceffects.cpp
index e75361628b..8e74d73d5d 100644
--- a/apps/openmw/mwmechanics/magiceffects.cpp
+++ b/apps/openmw/mwmechanics/magiceffects.cpp
@@ -1,10 +1,20 @@
 #include "magiceffects.hpp"
 
+#include <cmath>
 #include <stdexcept>
 
 #include <components/esm/effectlist.hpp>
 #include <components/esm/magiceffects.hpp>
 
+namespace
+{
+    // Round value to prevent precision issues
+    void truncate(float& value)
+    {
+        value = std::roundf(value * 1000.f) / 1000.f;
+    }
+}
+
 namespace MWMechanics
 {
     EffectKey::EffectKey() : mId (0), mArg (-1) {}
@@ -74,6 +84,7 @@ namespace MWMechanics
     {
         mModifier += param.mModifier;
         mBase += param.mBase;
+        truncate(mModifier);
         return *this;
     }
 
@@ -81,6 +92,7 @@ namespace MWMechanics
     {
         mModifier -= param.mModifier;
         mBase -= param.mBase;
+        truncate(mModifier);
         return *this;
     }
 

From 06ea47f74b0c26376907d3625859ef19fcf3752f Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 19 Oct 2021 22:54:42 +0200
Subject: [PATCH 1506/2859] Fix crash in DetourNavigator::fixupCorridor

Handle situation when resulting path does not fit into destination vector.
---
 components/detournavigator/findsmoothpath.cpp | 15 +++++----
 components/detournavigator/findsmoothpath.hpp | 32 +++++++++----------
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/components/detournavigator/findsmoothpath.cpp b/components/detournavigator/findsmoothpath.cpp
index e166ff90e9..cbaf12305c 100644
--- a/components/detournavigator/findsmoothpath.cpp
+++ b/components/detournavigator/findsmoothpath.cpp
@@ -7,13 +7,13 @@
 
 namespace DetourNavigator
 {
-    std::size_t fixupCorridor(dtPolyRef* path, std::size_t pathSize, const std::vector<dtPolyRef>& visited)
+    std::size_t fixupCorridor(std::vector<dtPolyRef>& path, std::size_t pathSize, const std::vector<dtPolyRef>& visited)
     {
         std::vector<dtPolyRef>::const_reverse_iterator furthestVisited;
 
         // Find furthest common polygon.
-        const auto begin = path;
-        const auto end = path + pathSize;
+        const auto begin = path.begin();
+        const auto end = path.begin() + pathSize;
         const std::reverse_iterator rbegin(end);
         const std::reverse_iterator rend(begin);
         const auto it = std::find_if(rbegin, rend, [&] (dtPolyRef pathValue)
@@ -34,12 +34,13 @@ namespace DetourNavigator
 
         // visited: a_1 ... a_n x b_1 ... b_n
         //      furthestVisited ^
-        //    path: C x D
-        //            ^ furthestPath
+        //    path: C x D            E
+        //            ^ furthestPath ^ path.size() - (furthestVisited + 1 - visited.rbegin())
         //  result: x b_n ... b_1 D
 
-        auto newEnd = std::copy(visited.rbegin(), furthestVisited + 1, begin);
-        newEnd = std::copy(furthestPath + 1, end, newEnd);
+        const std::size_t required = static_cast<std::size_t>(furthestVisited + 1 - visited.rbegin());
+        const auto newEnd = std::copy(furthestPath + 1, std::min(begin + path.size(), end), begin + required);
+        std::copy(visited.rbegin(), furthestVisited + 1, begin);
 
         return static_cast<std::size_t>(newEnd - begin);
     }
diff --git a/components/detournavigator/findsmoothpath.hpp b/components/detournavigator/findsmoothpath.hpp
index 71e8a1df88..07d3054e19 100644
--- a/components/detournavigator/findsmoothpath.hpp
+++ b/components/detournavigator/findsmoothpath.hpp
@@ -30,7 +30,7 @@ namespace DetourNavigator
         return (osg::Vec2f(v1.x(), v1.z()) - osg::Vec2f(v2.x(), v2.z())).length() < r;
     }
 
-    std::size_t fixupCorridor(dtPolyRef* path, std::size_t pathSize, const std::vector<dtPolyRef>& visited);
+    std::size_t fixupCorridor(std::vector<dtPolyRef>& path, std::size_t pathSize, const std::vector<dtPolyRef>& visited);
 
     // This function checks if the path has a small U-turn, that is,
     // a polygon further in the path is adjacent to the first polygon
@@ -125,40 +125,37 @@ namespace DetourNavigator
         return {std::move(result)};
     }
 
-    inline std::optional<std::vector<dtPolyRef>> findPath(const dtNavMeshQuery& navMeshQuery, const dtPolyRef startRef,
+    inline std::optional<std::size_t> findPath(const dtNavMeshQuery& navMeshQuery, const dtPolyRef startRef,
         const dtPolyRef endRef, const osg::Vec3f& startPos, const osg::Vec3f& endPos, const dtQueryFilter& queryFilter,
-        const std::size_t maxSize)
+        dtPolyRef* path, const std::size_t maxSize)
     {
         int pathLen = 0;
-        std::vector<dtPolyRef> result(maxSize);
         const auto status = navMeshQuery.findPath(startRef, endRef, startPos.ptr(), endPos.ptr(), &queryFilter,
-            result.data(), &pathLen, static_cast<int>(maxSize));
+            path, &pathLen, static_cast<int>(maxSize));
         if (!dtStatusSucceed(status))
             return {};
         assert(pathLen >= 0);
         assert(static_cast<std::size_t>(pathLen) <= maxSize);
-        result.resize(static_cast<std::size_t>(pathLen));
-        return {std::move(result)};
+        return static_cast<std::size_t>(pathLen);
     }
 
     template <class OutputIterator>
     Status makeSmoothPath(const dtNavMesh& navMesh, const dtNavMeshQuery& navMeshQuery,
             const dtQueryFilter& filter, const osg::Vec3f& start, const osg::Vec3f& end, const float stepSize,
-            std::vector<dtPolyRef> polygonPath, std::size_t maxSmoothPathSize, OutputIterator& out)
+            std::vector<dtPolyRef>& polygonPath, std::size_t polygonPathSize, std::size_t maxSmoothPathSize, OutputIterator& out)
     {
         // Iterate over the path to find smooth path on the detail mesh surface.
         osg::Vec3f iterPos;
         navMeshQuery.closestPointOnPoly(polygonPath.front(), start.ptr(), iterPos.ptr(), nullptr);
 
         osg::Vec3f targetPos;
-        navMeshQuery.closestPointOnPoly(polygonPath.back(), end.ptr(), targetPos.ptr(), nullptr);
+        navMeshQuery.closestPointOnPoly(polygonPath[polygonPathSize - 1], end.ptr(), targetPos.ptr(), nullptr);
 
         constexpr float slop = 0.01f;
 
         *out++ = iterPos;
 
         std::size_t smoothPathSize = 1;
-        std::size_t polygonPathSize = polygonPath.size();
 
         // Move towards target a small advancement at a time until target reached or
         // when ran out of memory to store the path.
@@ -188,7 +185,7 @@ namespace DetourNavigator
             if (!result)
                 return Status::MoveAlongSurfaceFailed;
 
-            polygonPathSize = fixupCorridor(polygonPath.data(), polygonPathSize, result->mVisited);
+            polygonPathSize = fixupCorridor(polygonPath, polygonPathSize, result->mVisited);
             polygonPathSize = fixupShortcuts(polygonPath.data(), polygonPathSize, navMeshQuery);
 
             // Handle end of path and off-mesh links when close enough.
@@ -285,19 +282,20 @@ namespace DetourNavigator
         if (endRef == 0)
             return Status::EndPolygonNotFound;
 
-        const auto polygonPath = findPath(navMeshQuery, startRef, endRef, start, end, queryFilter,
-                                          settings.mMaxPolygonPathSize);
+        std::vector<dtPolyRef> polygonPath(settings.mMaxPolygonPathSize);
+        const auto polygonPathSize = findPath(navMeshQuery, startRef, endRef, start, end, queryFilter,
+                                              polygonPath.data(), polygonPath.size());
 
-        if (!polygonPath)
+        if (!polygonPathSize.has_value())
             return Status::FindPathOverPolygonsFailed;
 
-        if (polygonPath->empty())
+        if (*polygonPathSize == 0)
             return Status::Success;
 
-        const bool partialPath = polygonPath->back() != endRef;
+        const bool partialPath = polygonPath[*polygonPathSize - 1] != endRef;
         auto outTransform = OutputTransformIterator<OutputIterator>(out, settings);
         const Status smoothStatus = makeSmoothPath(navMesh, navMeshQuery, queryFilter, start, end, stepSize,
-                                                   std::move(*polygonPath), settings.mMaxSmoothPathSize, outTransform);
+            polygonPath, *polygonPathSize, settings.mMaxSmoothPathSize, outTransform);
 
         if (smoothStatus != Status::Success)
             return smoothStatus;

From 6cfabe252d3789f72377f07431b704f71df9c6c9 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 2 Sep 2021 01:18:55 +0200
Subject: [PATCH 1507/2859] Remove redundant ShadowsBinAdder

---
 components/sceneutil/mwshadowtechnique.cpp | 2 +-
 components/sceneutil/shadowsbin.hpp        | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
index 024123b3e1..60f048b147 100644
--- a/components/sceneutil/mwshadowtechnique.cpp
+++ b/components/sceneutil/mwshadowtechnique.cpp
@@ -282,7 +282,7 @@ void VDSMCameraCullCallback::operator()(osg::Node* node, osg::NodeVisitor* nv)
     static osg::ref_ptr<osg::StateSet> ss;
     if (!ss)
     {
-        ShadowsBinAdder adder("ShadowsBin", _vdsm->getCastingPrograms());
+        ShadowsBin::addPrototype("ShadowsBin", _vdsm->getCastingPrograms());
         ss = new osg::StateSet;
         ss->setRenderBinDetails(osg::StateSet::OPAQUE_BIN, "ShadowsBin", osg::StateSet::OVERRIDE_PROTECTED_RENDERBIN_DETAILS);
     }
diff --git a/components/sceneutil/shadowsbin.hpp b/components/sceneutil/shadowsbin.hpp
index 1c63caf4bb..8775dc3139 100644
--- a/components/sceneutil/shadowsbin.hpp
+++ b/components/sceneutil/shadowsbin.hpp
@@ -67,13 +67,6 @@ namespace SceneUtil
 
         static void addPrototype(const std::string& name, const std::array<osg::ref_ptr<osg::Program>, GL_ALWAYS - GL_NEVER + 1>& castingPrograms);
     };
-
-    class ShadowsBinAdder
-    {
-        public:
-        ShadowsBinAdder(const std::string& name, const std::array<osg::ref_ptr<osg::Program>, GL_ALWAYS - GL_NEVER + 1>& castingPrograms){ ShadowsBin::addPrototype(name, castingPrograms); }
-    };
-
 }
 
 #endif

From 9d1b7c4a303bf5d6ba29f16cfdb15f761dddcbe7 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 2 Sep 2021 01:12:47 +0200
Subject: [PATCH 1508/2859] Use type alias to avoid long type names and length
 redefinition for array

---
 components/sceneutil/shadowsbin.cpp |  4 ++--
 components/sceneutil/shadowsbin.hpp | 21 +++++++++++++--------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/components/sceneutil/shadowsbin.cpp b/components/sceneutil/shadowsbin.cpp
index af62b581c9..a6275a60e2 100644
--- a/components/sceneutil/shadowsbin.cpp
+++ b/components/sceneutil/shadowsbin.cpp
@@ -42,7 +42,7 @@ namespace
 namespace SceneUtil
 {
 
-std::array<osg::ref_ptr<osg::Program>, GL_ALWAYS - GL_NEVER + 1> ShadowsBin::sCastingPrograms = {
+ShadowsBin::CastingPrograms ShadowsBin::sCastingPrograms = {
     nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr
 };
 
@@ -150,7 +150,7 @@ StateGraph* ShadowsBin::cullStateGraph(StateGraph* sg, StateGraph* root, std::un
     return sg;
 }
 
-void ShadowsBin::addPrototype(const std::string & name, const std::array<osg::ref_ptr<osg::Program>, GL_ALWAYS - GL_NEVER + 1>& castingPrograms)
+void ShadowsBin::addPrototype(const std::string & name, const CastingPrograms& castingPrograms)
 {
     sCastingPrograms = castingPrograms;
     osg::ref_ptr<osgUtil::RenderBin> bin(new ShadowsBin);
diff --git a/components/sceneutil/shadowsbin.hpp b/components/sceneutil/shadowsbin.hpp
index 8775dc3139..67343c67f5 100644
--- a/components/sceneutil/shadowsbin.hpp
+++ b/components/sceneutil/shadowsbin.hpp
@@ -12,18 +12,15 @@ namespace osg
 
 namespace SceneUtil
 {
-
     /// renderbin which culls redundant state for shadow map rendering
     class ShadowsBin : public osgUtil::RenderBin
     {
-    private:
-        static std::array<osg::ref_ptr<osg::Program>, GL_ALWAYS - GL_NEVER + 1> sCastingPrograms;
+    public:
+        template <class T>
+        using Array = std::array<T, GL_ALWAYS - GL_NEVER + 1>;
 
-        osg::ref_ptr<osg::StateSet> mNoTestStateSet;
-        osg::ref_ptr<osg::StateSet> mShaderAlphaTestStateSet;
+        using CastingPrograms = Array<osg::ref_ptr<osg::Program>>;
 
-        std::array<osg::ref_ptr<osg::StateSet>, GL_ALWAYS - GL_NEVER + 1> mAlphaFuncShaders;
-    public:
         META_Object(SceneUtil, ShadowsBin)
         ShadowsBin();
         ShadowsBin(const ShadowsBin& rhs, const osg::CopyOp& copyop)
@@ -65,7 +62,15 @@ namespace SceneUtil
 
         osgUtil::StateGraph* cullStateGraph(osgUtil::StateGraph* sg, osgUtil::StateGraph* root, std::unordered_set<osgUtil::StateGraph*>& uninteresting, bool cullFaceOverridden);
 
-        static void addPrototype(const std::string& name, const std::array<osg::ref_ptr<osg::Program>, GL_ALWAYS - GL_NEVER + 1>& castingPrograms);
+        static void addPrototype(const std::string& name, const CastingPrograms& castingPrograms);
+
+    private:
+        static CastingPrograms sCastingPrograms;
+
+        osg::ref_ptr<osg::StateSet> mNoTestStateSet;
+        osg::ref_ptr<osg::StateSet> mShaderAlphaTestStateSet;
+
+        Array<osg::ref_ptr<osg::StateSet>> mAlphaFuncShaders;
     };
 }
 

From 590a340e6e436ae25abeca773ca5ac1895bdfe0e Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 2 Sep 2021 21:31:11 +0200
Subject: [PATCH 1509/2859] Remove redundant ShadowsBin::sCastingPrograms

This variable is only used in ShadowsBin constructor and it's initialized each
time before constructor call so required value can be just passed into
ShadowsBin ctor.

Make ShadowsBin default constructor private because it is required by osg even
it's not actually called.
---
 components/sceneutil/shadowsbin.cpp | 13 ++++---------
 components/sceneutil/shadowsbin.hpp |  4 ++--
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/components/sceneutil/shadowsbin.cpp b/components/sceneutil/shadowsbin.cpp
index a6275a60e2..21f25dc4ad 100644
--- a/components/sceneutil/shadowsbin.cpp
+++ b/components/sceneutil/shadowsbin.cpp
@@ -42,11 +42,7 @@ namespace
 namespace SceneUtil
 {
 
-ShadowsBin::CastingPrograms ShadowsBin::sCastingPrograms = {
-    nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr
-};
-
-ShadowsBin::ShadowsBin()
+ShadowsBin::ShadowsBin(const CastingPrograms& castingPrograms)
 {
     mNoTestStateSet = new osg::StateSet;
     mNoTestStateSet->addUniform(new osg::Uniform("useDiffuseMapForShadowAlpha", false));
@@ -57,10 +53,10 @@ ShadowsBin::ShadowsBin()
     mShaderAlphaTestStateSet->addUniform(new osg::Uniform("useDiffuseMapForShadowAlpha", true));
     mShaderAlphaTestStateSet->setMode(GL_BLEND, osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED | osg::StateAttribute::OVERRIDE);
 
-    for (size_t i = 0; i < sCastingPrograms.size(); ++i)
+    for (size_t i = 0; i < castingPrograms.size(); ++i)
     {
         mAlphaFuncShaders[i] = new osg::StateSet;
-        mAlphaFuncShaders[i]->setAttribute(sCastingPrograms[i], osg::StateAttribute::ON | osg::StateAttribute::PROTECTED | osg::StateAttribute::OVERRIDE);
+        mAlphaFuncShaders[i]->setAttribute(castingPrograms[i], osg::StateAttribute::ON | osg::StateAttribute::PROTECTED | osg::StateAttribute::OVERRIDE);
     }
 }
 
@@ -152,8 +148,7 @@ StateGraph* ShadowsBin::cullStateGraph(StateGraph* sg, StateGraph* root, std::un
 
 void ShadowsBin::addPrototype(const std::string & name, const CastingPrograms& castingPrograms)
 {
-    sCastingPrograms = castingPrograms;
-    osg::ref_ptr<osgUtil::RenderBin> bin(new ShadowsBin);
+    osg::ref_ptr<osgUtil::RenderBin> bin(new ShadowsBin(castingPrograms));
     osgUtil::RenderBin::addRenderBinPrototype(name, bin);
 }
 
diff --git a/components/sceneutil/shadowsbin.hpp b/components/sceneutil/shadowsbin.hpp
index 67343c67f5..4b0d8cc544 100644
--- a/components/sceneutil/shadowsbin.hpp
+++ b/components/sceneutil/shadowsbin.hpp
@@ -22,7 +22,7 @@ namespace SceneUtil
         using CastingPrograms = Array<osg::ref_ptr<osg::Program>>;
 
         META_Object(SceneUtil, ShadowsBin)
-        ShadowsBin();
+        ShadowsBin(const CastingPrograms& castingPrograms);
         ShadowsBin(const ShadowsBin& rhs, const osg::CopyOp& copyop)
             : osgUtil::RenderBin(rhs, copyop)
             , mNoTestStateSet(rhs.mNoTestStateSet)
@@ -65,7 +65,7 @@ namespace SceneUtil
         static void addPrototype(const std::string& name, const CastingPrograms& castingPrograms);
 
     private:
-        static CastingPrograms sCastingPrograms;
+        ShadowsBin() {}
 
         osg::ref_ptr<osg::StateSet> mNoTestStateSet;
         osg::ref_ptr<osg::StateSet> mShaderAlphaTestStateSet;

From 562590720b4ebc1a758091b36d2be5d94c8edbb3 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 2 Sep 2021 22:01:20 +0200
Subject: [PATCH 1510/2859] Remove ShadowsBin prototype on MWShadowTechnique
 destruction

To prevent crash:
==7733==ERROR: AddressSanitizer: heap-use-after-free on address 0x6040000ca1b0 at pc 0x55fcfa8d1ee3 bp 0x7ffd1c464e00 sp 0x7ffd1c464df0
READ of size 4 at 0x6040000ca1b0 thread T0
    #0 0x55fcfa8d1ee2 in std::less<unsigned int>::operator()(unsigned int const&, unsigned int const&) const /usr/include/c++/11.1.0/bits/stl_function.h:386
    #1 0x55fcfa8d1ee2 in std::_Rb_tree<unsigned int, std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> >, std::_Select1st<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > >, std::less<unsigned int>, std::allocator<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > > >::_M_lower_bound(std::_Rb_tree_node<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > >*, std::_Rb_tree_node_base*, unsigned int const&) /usr/include/c++/11.1.0/bits/stl_tree.h:1903
    #2 0x55fcfa8ca76e in std::_Rb_tree<unsigned int, std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> >, std::_Select1st<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > >, std::less<unsigned int>, std::allocator<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > > >::lower_bound(unsigned int const&) /usr/include/c++/11.1.0/bits/stl_tree.h:1270
    #3 0x55fcfa8ca76e in std::map<unsigned int, osg::ref_ptr<osg::ContextData>, std::less<unsigned int>, std::allocator<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > > >::lower_bound(unsigned int const&) /usr/include/c++/11.1.0/bits/stl_map.h:1259
    #4 0x55fcfa8ca76e in std::map<unsigned int, osg::ref_ptr<osg::ContextData>, std::less<unsigned int>, std::allocator<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > > >::operator[](unsigned int const&) /usr/include/c++/11.1.0/bits/stl_map.h:497
    #5 0x55fcfa8ca76e in osg::getOrCreateContextData(unsigned int) /home/elsid/dev/OpenSceneGraph/src/osg/ContextData.cpp:142
    #6 0x55fcfab6848a in GLShaderManager* osg::get<GLShaderManager>(unsigned int) /home/elsid/dev/OpenSceneGraph/include/osg/ContextData:154
    #7 0x55fcfab6848a in osg::Shader::PerContextShader::~PerContextShader() /home/elsid/dev/OpenSceneGraph/src/osg/Shader.cpp:540
    #8 0x55fcfab68dc6 in osg::Shader::PerContextShader::~PerContextShader() /home/elsid/dev/OpenSceneGraph/src/osg/Shader.cpp:541
    #9 0x55fcfab4a3f3 in osg::Referenced::signalObserversAndDelete(bool, bool) const /home/elsid/dev/OpenSceneGraph/src/osg/Referenced.cpp:292
    #10 0x55fcfab6d0ce in osg::Referenced::unref() const /home/elsid/dev/OpenSceneGraph/include/osg/Referenced:201
    #11 0x55fcfab6d0ce in osg::ref_ptr<osg::Shader::PerContextShader>::~ref_ptr() /home/elsid/dev/OpenSceneGraph/include/osg/ref_ptr:44
    #12 0x55fcfab6d0ce in void std::_Destroy<osg::ref_ptr<osg::Shader::PerContextShader> >(osg::ref_ptr<osg::Shader::PerContextShader>*) /usr/include/c++/11.1.0/bits/stl_construct.h:140
    #13 0x55fcfab6d0ce in void std::_Destroy_aux<false>::__destroy<osg::ref_ptr<osg::Shader::PerContextShader>*>(osg::ref_ptr<osg::Shader::PerContextShader>*, osg::ref_ptr<osg::Shader::PerContextShader>*) /usr/include/c++/11.1.0/bits/stl_construct.h:152
    #14 0x55fcfab6d0ce in void std::_Destroy<osg::ref_ptr<osg::Shader::PerContextShader>*>(osg::ref_ptr<osg::Shader::PerContextShader>*, osg::ref_ptr<osg::Shader::PerContextShader>*) /usr/include/c++/11.1.0/bits/stl_construct.h:185
    #15 0x55fcfab6d0ce in void std::_Destroy<osg::ref_ptr<osg::Shader::PerContextShader>*, osg::ref_ptr<osg::Shader::PerContextShader> >(osg::ref_ptr<osg::Shader::PerContextShader>*, osg::ref_ptr<osg::Shader::PerContextShader>*, std::allocator<osg::ref_ptr<osg::Shader::PerContextShader> >&) /usr/include/c++/11.1.0/bits/alloc_traits.h:746
    #16 0x55fcfab6d0ce in std::vector<osg::ref_ptr<osg::Shader::PerContextShader>, std::allocator<osg::ref_ptr<osg::Shader::PerContextShader> > >::~vector() /usr/include/c++/11.1.0/bits/stl_vector.h:680
    #17 0x55fcfab6d0ce in osg::Shader::ShaderObjects::~ShaderObjects() /home/elsid/dev/OpenSceneGraph/include/osg/Shader:264
    #18 0x55fcfab6d0ce in osg::Shader::ShaderObjects::~ShaderObjects() /home/elsid/dev/OpenSceneGraph/include/osg/Shader:264
    #19 0x55fcfab4a3f3 in osg::Referenced::signalObserversAndDelete(bool, bool) const /home/elsid/dev/OpenSceneGraph/src/osg/Referenced.cpp:292
    #20 0x55fcfab6c532 in osg::Referenced::unref() const /home/elsid/dev/OpenSceneGraph/include/osg/Referenced:201
    #21 0x55fcfab6c532 in osg::ref_ptr<osg::Shader::ShaderObjects>::~ref_ptr() /home/elsid/dev/OpenSceneGraph/include/osg/ref_ptr:44
    #22 0x55fcfab6c532 in void std::_Destroy<osg::ref_ptr<osg::Shader::ShaderObjects> >(osg::ref_ptr<osg::Shader::ShaderObjects>*) /usr/include/c++/11.1.0/bits/stl_construct.h:140
    #23 0x55fcfab6c532 in void std::_Destroy_aux<false>::__destroy<osg::ref_ptr<osg::Shader::ShaderObjects>*>(osg::ref_ptr<osg::Shader::ShaderObjects>*, osg::ref_ptr<osg::Shader::ShaderObjects>*) /usr/include/c++/11.1.0/bits/stl_construct.h:152
    #24 0x55fcfab6c532 in void std::_Destroy<osg::ref_ptr<osg::Shader::ShaderObjects>*>(osg::ref_ptr<osg::Shader::ShaderObjects>*, osg::ref_ptr<osg::Shader::ShaderObjects>*) /usr/include/c++/11.1.0/bits/stl_construct.h:185
    #25 0x55fcfab6c532 in void std::_Destroy<osg::ref_ptr<osg::Shader::ShaderObjects>*, osg::ref_ptr<osg::Shader::ShaderObjects> >(osg::ref_ptr<osg::Shader::ShaderObjects>*, osg::ref_ptr<osg::Shader::ShaderObjects>*, std::allocator<osg::ref_ptr<osg::Shader::ShaderObjects> >&) /usr/include/c++/11.1.0/bits/alloc_traits.h:746
    #26 0x55fcfab6c532 in std::vector<osg::ref_ptr<osg::Shader::ShaderObjects>, std::allocator<osg::ref_ptr<osg::Shader::ShaderObjects> > >::~vector() /usr/include/c++/11.1.0/bits/stl_vector.h:680
    #27 0x55fcfab6c532 in osg::buffered_value<osg::ref_ptr<osg::Shader::ShaderObjects> >::~buffered_value() /home/elsid/dev/OpenSceneGraph/include/osg/buffered_value:26
    #28 0x55fcfab6c532 in osg::Shader::~Shader() /home/elsid/dev/OpenSceneGraph/src/osg/Shader.cpp:271
    #29 0x55fcfab6c80a in osg::Shader::~Shader() /home/elsid/dev/OpenSceneGraph/src/osg/Shader.cpp:271
    #30 0x55fcfab4a3f3 in osg::Referenced::signalObserversAndDelete(bool, bool) const /home/elsid/dev/OpenSceneGraph/src/osg/Referenced.cpp:292
    #31 0x55fcfab185bd in osg::Referenced::unref() const /home/elsid/dev/OpenSceneGraph/include/osg/Referenced:201
    #32 0x55fcfab185bd in osg::ref_ptr<osg::Shader>::~ref_ptr() /home/elsid/dev/OpenSceneGraph/include/osg/ref_ptr:44
    #33 0x55fcfab185bd in void std::_Destroy<osg::ref_ptr<osg::Shader> >(osg::ref_ptr<osg::Shader>*) /usr/include/c++/11.1.0/bits/stl_construct.h:140
    #34 0x55fcfab185bd in void std::_Destroy_aux<false>::__destroy<osg::ref_ptr<osg::Shader>*>(osg::ref_ptr<osg::Shader>*, osg::ref_ptr<osg::Shader>*) /usr/include/c++/11.1.0/bits/stl_construct.h:152
    #35 0x55fcfab185bd in void std::_Destroy<osg::ref_ptr<osg::Shader>*>(osg::ref_ptr<osg::Shader>*, osg::ref_ptr<osg::Shader>*) /usr/include/c++/11.1.0/bits/stl_construct.h:185
    #36 0x55fcfab185bd in void std::_Destroy<osg::ref_ptr<osg::Shader>*, osg::ref_ptr<osg::Shader> >(osg::ref_ptr<osg::Shader>*, osg::ref_ptr<osg::Shader>*, std::allocator<osg::ref_ptr<osg::Shader> >&) /usr/include/c++/11.1.0/bits/alloc_traits.h:746
    #37 0x55fcfab185bd in std::vector<osg::ref_ptr<osg::Shader>, std::allocator<osg::ref_ptr<osg::Shader> > >::~vector() /usr/include/c++/11.1.0/bits/stl_vector.h:680
    #38 0x55fcfab185bd in osg::Program::~Program() /home/elsid/dev/OpenSceneGraph/src/osg/Program.cpp:147
    #39 0x55fcfab18ae0 in osg::Program::~Program() /home/elsid/dev/OpenSceneGraph/src/osg/Program.cpp:147
    #40 0x55fcfab4a3f3 in osg::Referenced::signalObserversAndDelete(bool, bool) const /home/elsid/dev/OpenSceneGraph/src/osg/Referenced.cpp:292
    #41 0x55fcf8582cfa in osg::Referenced::unref() const /home/elsid/dev/OpenSceneGraph/build/gcc/asan/install/include/osg/Referenced:201
    #42 0x55fcf8582cfa in osg::ref_ptr<osg::StateAttribute>::~ref_ptr() /home/elsid/dev/OpenSceneGraph/build/gcc/asan/install/include/osg/ref_ptr:44
    #43 0x55fcf8582cfa in std::pair<osg::ref_ptr<osg::StateAttribute>, unsigned int>::~pair() /usr/include/c++/11.1.0/bits/stl_pair.h:211
    #44 0x55fcf8582cfa in std::pair<std::pair<osg::StateAttribute::Type, unsigned int> const, std::pair<osg::ref_ptr<osg::StateAttribute>, unsigned int> >::~pair() /usr/include/c++/11.1.0/bits/stl_pair.h:211
    #45 0x55fcf8582cfa in void __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<std::pair<osg::StateAttribute::Type, unsigned int> const, std::pair<osg::ref_ptr<osg::StateAttribute>, unsigned int> > > >::destroy<std::pair<std::pair<osg::StateAttribute::Type, unsigned int> const, std::pair<osg::ref_ptr<osg::StateAttribute>, unsigned int> > >(std::pair<std::pair<osg::StateAttribute::Type, unsigned int> const, std::pair<osg::ref_ptr<osg::StateAttribute>, unsigned int> >*) /usr/include/c++/11.1.0/ext/new_allocator.h:162
    #46 0x55fcf8582cfa in void std::allocator_traits<std::allocator<std::_Rb_tree_node<std::pair<std::pair<osg::StateAttribute::Type, unsigned int> const, std::pair<osg::ref_ptr<osg::StateAttribute>, unsigned int> > > > >::destroy<std::pair<std::pair<osg::StateAttribute::Type, unsigned int> const, std::pair<osg::ref_ptr<osg::StateAttribute>, unsigned int> > >(std::allocator<std::_Rb_tree_node<std::pair<std::pair<osg::StateAttribute::Type, unsigned int> const, std::pair<osg::ref_ptr<osg::StateAttribute>, unsigned int> > > >&, std::pair<std::pair<osg::StateAttribute::Type, unsigned int> const, std::pair<osg::ref_ptr<osg::StateAttribute>, unsigned int> >*) /usr/include/c++/11.1.0/bits/alloc_traits.h:531
    #47 0x55fcf8582cfa in std::_Rb_tree<std::pair<osg::StateAttribute::Type, unsigned int>, std::pair<std::pair<osg::StateAttribute::Type, unsigned int> const, std::pair<osg::ref_ptr<osg::StateAttribute>, unsigned int> >, std::_Select1st<std::pair<std::pair<osg::StateAttribute::Type, unsigned int> const, std::pair<osg::ref_ptr<osg::StateAttribute>, unsigned int> > >, std::less<std::pair<osg::StateAttribute::Type, unsigned int> >, std::allocator<std::pair<std::pair<osg::StateAttribute::Type, unsigned int> const, std::pair<osg::ref_ptr<osg::StateAttribute>, unsigned int> > > >::_M_destroy_node(std::_Rb_tree_node<std::pair<std::pair<osg::StateAttribute::Type, unsigned int> const, std::pair<osg::ref_ptr<osg::StateAttribute>, unsigned int> > >*) /usr/include/c++/11.1.0/bits/stl_tree.h:623
    #48 0x55fcf8582cfa in std::_Rb_tree<std::pair<osg::StateAttribute::Type, unsigned int>, std::pair<std::pair<osg::StateAttribute::Type, unsigned int> const, std::pair<osg::ref_ptr<osg::StateAttribute>, unsigned int> >, std::_Select1st<std::pair<std::pair<osg::StateAttribute::Type, unsigned int> const, std::pair<osg::ref_ptr<osg::StateAttribute>, unsigned int> > >, std::less<std::pair<osg::StateAttribute::Type, unsigned int> >, std::allocator<std::pair<std::pair<osg::StateAttribute::Type, unsigned int> const, std::pair<osg::ref_ptr<osg::StateAttribute>, unsigned int> > > >::_M_drop_node(std::_Rb_tree_node<std::pair<std::pair<osg::StateAttribute::Type, unsigned int> const, std::pair<osg::ref_ptr<osg::StateAttribute>, unsigned int> > >*) /usr/include/c++/11.1.0/bits/stl_tree.h:631
    #49 0x55fcf8582cfa in std::_Rb_tree<std::pair<osg::StateAttribute::Type, unsigned int>, std::pair<std::pair<osg::StateAttribute::Type, unsigned int> const, std::pair<osg::ref_ptr<osg::StateAttribute>, unsigned int> >, std::_Select1st<std::pair<std::pair<osg::StateAttribute::Type, unsigned int> const, std::pair<osg::ref_ptr<osg::StateAttribute>, unsigned int> > >, std::less<std::pair<osg::StateAttribute::Type, unsigned int> >, std::allocator<std::pair<std::pair<osg::StateAttribute::Type, unsigned int> const, std::pair<osg::ref_ptr<osg::StateAttribute>, unsigned int> > > >::_M_erase(std::_Rb_tree_node<std::pair<std::pair<osg::StateAttribute::Type, unsigned int> const, std::pair<osg::ref_ptr<osg::StateAttribute>, unsigned int> > >*) /usr/include/c++/11.1.0/bits/stl_tree.h:1889
    #50 0x55fcfac1f281 in std::_Rb_tree<std::pair<osg::StateAttribute::Type, unsigned int>, std::pair<std::pair<osg::StateAttribute::Type, unsigned int> const, std::pair<osg::ref_ptr<osg::StateAttribute>, unsigned int> >, std::_Select1st<std::pair<std::pair<osg::StateAttribute::Type, unsigned int> const, std::pair<osg::ref_ptr<osg::StateAttribute>, unsigned int> > >, std::less<std::pair<osg::StateAttribute::Type, unsigned int> >, std::allocator<std::pair<std::pair<osg::StateAttribute::Type, unsigned int> const, std::pair<osg::ref_ptr<osg::StateAttribute>, unsigned int> > > >::clear() /usr/include/c++/11.1.0/bits/stl_tree.h:1254
    #51 0x55fcfac1f281 in std::map<std::pair<osg::StateAttribute::Type, unsigned int>, std::pair<osg::ref_ptr<osg::StateAttribute>, unsigned int>, std::less<std::pair<osg::StateAttribute::Type, unsigned int> >, std::allocator<std::pair<std::pair<osg::StateAttribute::Type, unsigned int> const, std::pair<osg::ref_ptr<osg::StateAttribute>, unsigned int> > > >::clear() /usr/include/c++/11.1.0/bits/stl_map.h:1134
    #52 0x55fcfac1f281 in osg::StateSet::clear() /home/elsid/dev/OpenSceneGraph/src/osg/StateSet.cpp:738
    #53 0x55fcfac2079e in osg::StateSet::~StateSet() /home/elsid/dev/OpenSceneGraph/src/osg/StateSet.cpp:285
    #54 0x55fcfac20d3e in osg::StateSet::~StateSet() /home/elsid/dev/OpenSceneGraph/src/osg/StateSet.cpp:286
    #55 0x55fcfab4a3f3 in osg::Referenced::signalObserversAndDelete(bool, bool) const /home/elsid/dev/OpenSceneGraph/src/osg/Referenced.cpp:292
    #56 0x55fcfb20dcac in osg::Referenced::unref() const /home/elsid/dev/OpenSceneGraph/build/gcc/asan/install/include/osg/Referenced:201
    #57 0x55fcfb20dcac in osg::ref_ptr<osg::StateSet>::~ref_ptr() /home/elsid/dev/OpenSceneGraph/build/gcc/asan/install/include/osg/ref_ptr:44
    #58 0x55fcfb20dcac in std::array<osg::ref_ptr<osg::StateSet>, 8ul>::~array() /usr/include/c++/11.1.0/array:95
    #59 0x55fcfb20dcac in SceneUtil::ShadowsBin::~ShadowsBin() /home/elsid/dev/openmw/components/sceneutil/shadowsbin.hpp:16
    #60 0x55fcfb20dcac in SceneUtil::ShadowsBin::~ShadowsBin() /home/elsid/dev/openmw/components/sceneutil/shadowsbin.hpp:16
    #61 0x55fcfab4a3f3 in osg::Referenced::signalObserversAndDelete(bool, bool) const /home/elsid/dev/OpenSceneGraph/src/osg/Referenced.cpp:292
    #62 0x55fcfa6cc17f in osg::Referenced::unref() const /home/elsid/dev/OpenSceneGraph/include/osg/Referenced:201
    #63 0x55fcfa6cc17f in osg::ref_ptr<osgUtil::RenderBin>::~ref_ptr() /home/elsid/dev/OpenSceneGraph/include/osg/ref_ptr:44
    #64 0x55fcfa6cc17f in std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, osg::ref_ptr<osgUtil::RenderBin> >::~pair() /usr/include/c++/11.1.0/bits/stl_pair.h:211
    #65 0x55fcfa6cc17f in void __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, osg::ref_ptr<osgUtil::RenderBin> > > >::destroy<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, osg::ref_ptr<osgUtil::RenderBin> > >(std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, osg::ref_ptr<osgUtil::RenderBin> >*) /usr/include/c++/11.1.0/ext/new_allocator.h:162
    #66 0x55fcfa6cc17f in void std::allocator_traits<std::allocator<std::_Rb_tree_node<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, osg::ref_ptr<osgUtil::RenderBin> > > > >::destroy<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, osg::ref_ptr<osgUtil::RenderBin> > >(std::allocator<std::_Rb_tree_node<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, osg::ref_ptr<osgUtil::RenderBin> > > >&, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, osg::ref_ptr<osgUtil::RenderBin> >*) /usr/include/c++/11.1.0/bits/alloc_traits.h:531
    #67 0x55fcfa6cc17f in std::_Rb_tree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, osg::ref_ptr<osgUtil::RenderBin> >, std::_Select1st<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, osg::ref_ptr<osgUtil::RenderBin> > >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, osg::ref_ptr<osgUtil::RenderBin> > > >::_M_destroy_node(std::_Rb_tree_node<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, osg::ref_ptr<osgUtil::RenderBin> > >*) /usr/include/c++/11.1.0/bits/stl_tree.h:623
    #68 0x55fcfa6cc17f in std::_Rb_tree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, osg::ref_ptr<osgUtil::RenderBin> >, std::_Select1st<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, osg::ref_ptr<osgUtil::RenderBin> > >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, osg::ref_ptr<osgUtil::RenderBin> > > >::_M_drop_node(std::_Rb_tree_node<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, osg::ref_ptr<osgUtil::RenderBin> > >*) /usr/include/c++/11.1.0/bits/stl_tree.h:631
    #69 0x55fcfa6cc17f in std::_Rb_tree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, osg::ref_ptr<osgUtil::RenderBin> >, std::_Select1st<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, osg::ref_ptr<osgUtil::RenderBin> > >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, osg::ref_ptr<osgUtil::RenderBin> > > >::_M_erase(std::_Rb_tree_node<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, osg::ref_ptr<osgUtil::RenderBin> > >*) /usr/include/c++/11.1.0/bits/stl_tree.h:1889
    #70 0x55fcfa6cc122 in std::_Rb_tree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, osg::ref_ptr<osgUtil::RenderBin> >, std::_Select1st<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, osg::ref_ptr<osgUtil::RenderBin> > >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, osg::ref_ptr<osgUtil::RenderBin> > > >::_M_erase(std::_Rb_tree_node<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, osg::ref_ptr<osgUtil::RenderBin> > >*) /usr/include/c++/11.1.0/bits/stl_tree.h:1887
    #71 0x55fcfa6cc122 in std::_Rb_tree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, osg::ref_ptr<osgUtil::RenderBin> >, std::_Select1st<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, osg::ref_ptr<osgUtil::RenderBin> > >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, osg::ref_ptr<osgUtil::RenderBin> > > >::_M_erase(std::_Rb_tree_node<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, osg::ref_ptr<osgUtil::RenderBin> > >*) /usr/include/c++/11.1.0/bits/stl_tree.h:1887
    #72 0x55fcfa6cc245 in std::_Rb_tree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, osg::ref_ptr<osgUtil::RenderBin> >, std::_Select1st<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, osg::ref_ptr<osgUtil::RenderBin> > >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, osg::ref_ptr<osgUtil::RenderBin> > > >::~_Rb_tree() /usr/include/c++/11.1.0/bits/stl_tree.h:984
    #73 0x55fcfa6cc245 in std::map<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, osg::ref_ptr<osgUtil::RenderBin>, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, osg::ref_ptr<osgUtil::RenderBin> > > >::~map() /usr/include/c++/11.1.0/bits/stl_map.h:302
    #74 0x55fcfa6cc245 in RenderBinPrototypeList::~RenderBinPrototypeList() /home/elsid/dev/OpenSceneGraph/src/osgUtil/RenderBin.cpp:48
    #75 0x55fcfa6cc245 in RenderBinPrototypeList::~RenderBinPrototypeList() /home/elsid/dev/OpenSceneGraph/src/osgUtil/RenderBin.cpp:48
    #76 0x55fcfab4a3f3 in osg::Referenced::signalObserversAndDelete(bool, bool) const /home/elsid/dev/OpenSceneGraph/src/osg/Referenced.cpp:292
    #77 0x55fcfa6cbcc1 in osg::Referenced::unref() const /home/elsid/dev/OpenSceneGraph/include/osg/Referenced:201
    #78 0x55fcfa6cbcc1 in osg::ref_ptr<RenderBinPrototypeList>::~ref_ptr() /home/elsid/dev/OpenSceneGraph/include/osg/ref_ptr:44
    #79 0x7f3977bd04a6 in __run_exit_handlers (/usr/lib/libc.so.6+0x3f4a6)
    #80 0x7f3977bd064d in exit (/usr/lib/libc.so.6+0x3f64d)
    #81 0x7f3977bb8b2b in __libc_start_main (/usr/lib/libc.so.6+0x27b2b)
    #82 0x55fcf81ea12d in _start (/home/elsid/dev/openmw/build/gcc/asan/openmw+0xa4412d)

0x6040000ca1b0 is located 32 bytes inside of 48-byte region [0x6040000ca190,0x6040000ca1c0)
freed by thread T0 here:
    #0 0x7f397a633d69 in operator delete(void*, unsigned long) /build/gcc/src/gcc/libsanitizer/asan/asan_new_delete.cpp:172
    #1 0x55fcfa8d1824 in __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > > >::deallocate(std::_Rb_tree_node<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > >*, unsigned long) /usr/include/c++/11.1.0/ext/new_allocator.h:139
    #2 0x55fcfa8d1824 in std::allocator_traits<std::allocator<std::_Rb_tree_node<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > > > >::deallocate(std::allocator<std::_Rb_tree_node<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > > >&, std::_Rb_tree_node<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > >*, unsigned long) /usr/include/c++/11.1.0/bits/alloc_traits.h:492
    #3 0x55fcfa8d1824 in std::_Rb_tree<unsigned int, std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> >, std::_Select1st<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > >, std::less<unsigned int>, std::allocator<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > > >::_M_put_node(std::_Rb_tree_node<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > >*) /usr/include/c++/11.1.0/bits/stl_tree.h:565
    #4 0x55fcfa8d1824 in std::_Rb_tree<unsigned int, std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> >, std::_Select1st<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > >, std::less<unsigned int>, std::allocator<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > > >::_M_drop_node(std::_Rb_tree_node<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > >*) /usr/include/c++/11.1.0/bits/stl_tree.h:632
    #5 0x55fcfa8d1824 in std::_Rb_tree<unsigned int, std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> >, std::_Select1st<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > >, std::less<unsigned int>, std::allocator<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > > >::_M_erase(std::_Rb_tree_node<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > >*) /usr/include/c++/11.1.0/bits/stl_tree.h:1889
    #6 0x55fcfa8d18da in std::_Rb_tree<unsigned int, std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> >, std::_Select1st<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > >, std::less<unsigned int>, std::allocator<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > > >::~_Rb_tree() /usr/include/c++/11.1.0/bits/stl_tree.h:984
    #7 0x55fcfa8d18da in std::map<unsigned int, osg::ref_ptr<osg::ContextData>, std::less<unsigned int>, std::allocator<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > > >::~map() /usr/include/c++/11.1.0/bits/stl_map.h:302
    #8 0x7f3977bd04a6 in __run_exit_handlers (/usr/lib/libc.so.6+0x3f4a6)

previously allocated by thread T0 here:
    #0 0x7f397a632ca1 in operator new(unsigned long) /build/gcc/src/gcc/libsanitizer/asan/asan_new_delete.cpp:99
    #1 0x55fcfa8d3aa1 in __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > > >::allocate(unsigned long, void const*) /usr/include/c++/11.1.0/ext/new_allocator.h:121
    #2 0x55fcfa8d3aa1 in std::allocator_traits<std::allocator<std::_Rb_tree_node<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > > > >::allocate(std::allocator<std::_Rb_tree_node<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > > >&, unsigned long) /usr/include/c++/11.1.0/bits/alloc_traits.h:460
    #3 0x55fcfa8d3aa1 in std::_Rb_tree<unsigned int, std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> >, std::_Select1st<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > >, std::less<unsigned int>, std::allocator<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > > >::_M_get_node() /usr/include/c++/11.1.0/bits/stl_tree.h:561
    #4 0x55fcfa8d3aa1 in std::_Rb_tree_node<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > >* std::_Rb_tree<unsigned int, std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> >, std::_Select1st<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > >, std::less<unsigned int>, std::allocator<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > > >::_M_create_node<std::piecewise_construct_t const&, std::tuple<unsigned int const&>, std::tuple<> >(std::piecewise_construct_t const&, std::tuple<unsigned int const&>&&, std::tuple<>&&) /usr/include/c++/11.1.0/bits/stl_tree.h:611
    #5 0x55fcfa8d3aa1 in std::_Rb_tree_iterator<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > > std::_Rb_tree<unsigned int, std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> >, std::_Select1st<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > >, std::less<unsigned int>, std::allocator<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > > >::_M_emplace_hint_unique<std::piecewise_construct_t const&, std::tuple<unsigned int const&>, std::tuple<> >(std::_Rb_tree_const_iterator<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > >, std::piecewise_construct_t const&, std::tuple<unsigned int const&>&&, std::tuple<>&&) /usr/include/c++/11.1.0/bits/stl_tree.h:2429
    #6 0x55fcfa8cfd91 in std::map<unsigned int, osg::ref_ptr<osg::ContextData>, std::less<unsigned int>, std::allocator<std::pair<unsigned int const, osg::ref_ptr<osg::ContextData> > > >::operator[](unsigned int const&) /usr/include/c++/11.1.0/bits/stl_map.h:501
    #7 0x55fcfa8cfd91 in osg::ContextData::createNewContextID() /home/elsid/dev/OpenSceneGraph/src/osg/ContextData.cpp:171
    #8 0x55fcfa9be218 in osg::GraphicsContext::createNewContextID() /home/elsid/dev/OpenSceneGraph/src/osg/GraphicsContext.cpp:320
    #9 0x55fcfb68d1ef in SDLUtil::GraphicsWindowSDL2::GraphicsWindowSDL2(osg::GraphicsContext::Traits*) /home/elsid/dev/openmw/components/sdlutil/sdlgraphicswindow.cpp:39
    #10 0x55fcfa17f93a in OMW::Engine::createWindow(Settings::Manager&) /home/elsid/dev/openmw/apps/openmw/engine.cpp:611
    #11 0x55fcfa18398f in OMW::Engine::prepareEngine(Settings::Manager&) /home/elsid/dev/openmw/apps/openmw/engine.cpp:679
    #12 0x55fcfa18c4f2 in OMW::Engine::go() /home/elsid/dev/openmw/apps/openmw/engine.cpp:949
    #13 0x55fcfa13c9ff in runApplication(int, char**) /home/elsid/dev/openmw/apps/openmw/main.cpp:316
    #14 0x55fcfb49f562 in wrapApplication(int (*)(int, char**), int, char**, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) /home/elsid/dev/openmw/components/debug/debugging.cpp:205
    #15 0x55fcfa133114 in main /home/elsid/dev/openmw/apps/openmw/main.cpp:328
    #16 0x7f3977bb8b24 in __libc_start_main (/usr/lib/libc.so.6+0x27b24)

SUMMARY: AddressSanitizer: heap-use-after-free /usr/include/c++/11.1.0/bits/stl_function.h:386 in std::less<unsigned int>::operator()(unsigned int const&, unsigned int const&) const
Shadow bytes around the buggy address:
  0x0c08800113e0: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
  0x0c08800113f0: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
  0x0c0880011400: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
  0x0c0880011410: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
  0x0c0880011420: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
=>0x0c0880011430: fa fa fd fd fd fd[fd]fd fa fa fa fa fa fa fa fa
  0x0c0880011440: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
  0x0c0880011450: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
  0x0c0880011460: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
  0x0c0880011470: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
  0x0c0880011480: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
Shadow byte legend (one shadow byte represents 8 application bytes):
  Addressable:           00
  Partially addressable: 01 02 03 04 05 06 07
  Heap left redzone:       fa
  Freed heap region:       fd
  Stack left redzone:      f1
  Stack mid redzone:       f2
  Stack right redzone:     f3
  Stack after return:      f5
  Stack use after scope:   f8
  Global redzone:          f9
  Global init order:       f6
  Poisoned by user:        f7
  Container overflow:      fc
  Array cookie:            ac
  Intra object redzone:    bb
  ASan internal:           fe
  Left alloca redzone:     ca
  Right alloca redzone:    cb
  Shadow gap:              cc
==7733==ABORTING
---
 components/sceneutil/mwshadowtechnique.cpp | 26 +++++++++++++++-------
 components/sceneutil/mwshadowtechnique.hpp |  8 +++++--
 components/sceneutil/shadowsbin.cpp        |  6 -----
 components/sceneutil/shadowsbin.hpp        |  2 --
 4 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
index 60f048b147..770917eda7 100644
--- a/components/sceneutil/mwshadowtechnique.cpp
+++ b/components/sceneutil/mwshadowtechnique.cpp
@@ -279,14 +279,7 @@ void VDSMCameraCullCallback::operator()(osg::Node* node, osg::NodeVisitor* nv)
     }
 #endif
     // bin has to go inside camera cull or the rendertexture stage will override it
-    static osg::ref_ptr<osg::StateSet> ss;
-    if (!ss)
-    {
-        ShadowsBin::addPrototype("ShadowsBin", _vdsm->getCastingPrograms());
-        ss = new osg::StateSet;
-        ss->setRenderBinDetails(osg::StateSet::OPAQUE_BIN, "ShadowsBin", osg::StateSet::OVERRIDE_PROTECTED_RENDERBIN_DETAILS);
-    }
-    cv->pushStateSet(ss);
+    cv->pushStateSet(_vdsm->getOrCreateShadowsBinStateSet());
     if (_vdsm->getShadowedScene())
     {
         _vdsm->getShadowedScene()->osg::Group::traverse(*nv);
@@ -811,6 +804,8 @@ MWShadowTechnique::MWShadowTechnique(const MWShadowTechnique& vdsm, const osg::C
 
 MWShadowTechnique::~MWShadowTechnique()
 {
+    if (_shadowsBin != nullptr)
+        osgUtil::RenderBin::removeRenderBinPrototype(_shadowsBin);
 }
 
 
@@ -3282,3 +3277,18 @@ void SceneUtil::MWShadowTechnique::DebugHUD::addAnotherShadowMap()
     for(auto& uniformVector : mFrustumUniforms)
         uniformVector.push_back(new osg::Uniform(osg::Uniform::FLOAT_MAT4, "transform"));
 }
+
+osg::ref_ptr<osg::StateSet> SceneUtil::MWShadowTechnique::getOrCreateShadowsBinStateSet()
+{
+    if (_shadowsBinStateSet == nullptr)
+    {
+        if (_shadowsBin == nullptr)
+        {
+            _shadowsBin = new ShadowsBin(_castingPrograms);
+            osgUtil::RenderBin::addRenderBinPrototype(_shadowsBinName, _shadowsBin);
+        }
+        _shadowsBinStateSet = new osg::StateSet;
+        _shadowsBinStateSet->setRenderBinDetails(osg::StateSet::OPAQUE_BIN, _shadowsBinName, osg::StateSet::OVERRIDE_PROTECTED_RENDERBIN_DETAILS);
+    }
+    return _shadowsBinStateSet;
+}
diff --git a/components/sceneutil/mwshadowtechnique.hpp b/components/sceneutil/mwshadowtechnique.hpp
index 3f6c0fb765..574d054204 100644
--- a/components/sceneutil/mwshadowtechnique.hpp
+++ b/components/sceneutil/mwshadowtechnique.hpp
@@ -21,6 +21,7 @@
 
 #include <array>
 #include <mutex>
+#include <string>
 
 #include <osg/Camera>
 #include <osg/Material>
@@ -215,8 +216,6 @@ namespace SceneUtil {
 
         virtual void createShaders();
 
-        virtual std::array<osg::ref_ptr<osg::Program>, GL_ALWAYS - GL_NEVER + 1> getCastingPrograms() const { return _castingPrograms; }
-
         virtual bool selectActiveLights(osgUtil::CullVisitor* cv, ViewDependentData* vdd) const;
 
         virtual osg::Polytope computeLightViewFrustumPolytope(Frustum& frustum, LightData& positionedLight);
@@ -237,6 +236,8 @@ namespace SceneUtil {
 
         void setWorldMask(unsigned int worldMask) { _worldMask = worldMask; }
 
+        osg::ref_ptr<osg::StateSet> getOrCreateShadowsBinStateSet();
+
     protected:
         virtual ~MWShadowTechnique();
 
@@ -297,6 +298,9 @@ namespace SceneUtil {
 
         osg::ref_ptr<DebugHUD>                  _debugHud;
         std::array<osg::ref_ptr<osg::Program>, GL_ALWAYS - GL_NEVER + 1> _castingPrograms;
+        const std::string _shadowsBinName = "ShadowsBin_" + std::to_string(reinterpret_cast<std::uint64_t>(this));
+        osg::ref_ptr<osgUtil::RenderBin> _shadowsBin;
+        osg::ref_ptr<osg::StateSet> _shadowsBinStateSet;
     };
 
 }
diff --git a/components/sceneutil/shadowsbin.cpp b/components/sceneutil/shadowsbin.cpp
index 21f25dc4ad..3e933cbb98 100644
--- a/components/sceneutil/shadowsbin.cpp
+++ b/components/sceneutil/shadowsbin.cpp
@@ -146,12 +146,6 @@ StateGraph* ShadowsBin::cullStateGraph(StateGraph* sg, StateGraph* root, std::un
     return sg;
 }
 
-void ShadowsBin::addPrototype(const std::string & name, const CastingPrograms& castingPrograms)
-{
-    osg::ref_ptr<osgUtil::RenderBin> bin(new ShadowsBin(castingPrograms));
-    osgUtil::RenderBin::addRenderBinPrototype(name, bin);
-}
-
 inline bool ShadowsBin::State::needTexture() const
 {
     return mAlphaBlend || (mAlphaFunc && mAlphaFunc->getFunction() != GL_ALWAYS);
diff --git a/components/sceneutil/shadowsbin.hpp b/components/sceneutil/shadowsbin.hpp
index 4b0d8cc544..2c838d509e 100644
--- a/components/sceneutil/shadowsbin.hpp
+++ b/components/sceneutil/shadowsbin.hpp
@@ -62,8 +62,6 @@ namespace SceneUtil
 
         osgUtil::StateGraph* cullStateGraph(osgUtil::StateGraph* sg, osgUtil::StateGraph* root, std::unordered_set<osgUtil::StateGraph*>& uninteresting, bool cullFaceOverridden);
 
-        static void addPrototype(const std::string& name, const CastingPrograms& castingPrograms);
-
     private:
         ShadowsBin() {}
 

From a3b6bc7263946a988bacc4f1534997194d9da147 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 20 Oct 2021 16:28:18 +0200
Subject: [PATCH 1511/2859] Fix logic expression for not found value

---
 apps/openmw_test_suite/CMakeLists.txt        |   1 +
 apps/openmw_test_suite/esmloader/esmdata.cpp | 101 +++++++++++++++++++
 components/esmloader/esmdata.cpp             |   2 +-
 3 files changed, 103 insertions(+), 1 deletion(-)
 create mode 100644 apps/openmw_test_suite/esmloader/esmdata.cpp

diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index 3d19834066..9947f3e233 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -52,6 +52,7 @@ if (GTEST_FOUND AND GMOCK_FOUND)
         sqlite3/transaction.cpp
 
         esmloader/load.cpp
+        esmloader/esmdata.cpp
     )
 
     source_group(apps\\openmw_test_suite FILES openmw_test_suite.cpp ${UNITTEST_SRC_FILES})
diff --git a/apps/openmw_test_suite/esmloader/esmdata.cpp b/apps/openmw_test_suite/esmloader/esmdata.cpp
new file mode 100644
index 0000000000..da78aaa3a2
--- /dev/null
+++ b/apps/openmw_test_suite/esmloader/esmdata.cpp
@@ -0,0 +1,101 @@
+#include <components/esmloader/esmdata.cpp>
+
+#include <gtest/gtest.h>
+
+#include <array>
+#include <functional>
+#include <string>
+#include <vector>
+
+namespace
+{
+    using namespace testing;
+    using namespace EsmLoader;
+
+    struct Params
+    {
+        std::string mRefId;
+        ESM::RecNameInts mType;
+        std::string mResult;
+        std::function<void (EsmData&)> mPushBack;
+    };
+
+    struct EsmLoaderGetModelTest : TestWithParam<Params> {};
+
+    TEST_P(EsmLoaderGetModelTest, shouldReturnFoundModelName)
+    {
+        EsmData data;
+        GetParam().mPushBack(data);
+        EXPECT_EQ(EsmLoader::getModel(data, GetParam().mRefId, GetParam().mType), GetParam().mResult);
+    }
+
+    void pushBack(ESM::Activator&& value, EsmData& esmData)
+    {
+        esmData.mActivators.push_back(std::move(value));
+    }
+
+    void pushBack(ESM::Container&& value, EsmData& esmData)
+    {
+        esmData.mContainers.push_back(std::move(value));
+    }
+
+    void pushBack(ESM::Door&& value, EsmData& esmData)
+    {
+        esmData.mDoors.push_back(std::move(value));
+    }
+
+    void pushBack(ESM::Static&& value, EsmData& esmData)
+    {
+        esmData.mStatics.push_back(std::move(value));
+    }
+
+    template <class T>
+    struct PushBack
+    {
+        std::string mId;
+        std::string mModel;
+
+        void operator()(EsmData& esmData) const
+        {
+            T value;
+            value.mId = mId;
+            value.mModel = mModel;
+            pushBack(std::move(value), esmData);
+        }
+    };
+
+    const std::array params = {
+        Params {"acti_ref_id", ESM::REC_ACTI, "acti_model", PushBack<ESM::Activator> {"acti_ref_id", "acti_model"}},
+        Params {"cont_ref_id", ESM::REC_CONT, "cont_model", PushBack<ESM::Container> {"cont_ref_id", "cont_model"}},
+        Params {"door_ref_id", ESM::REC_DOOR, "door_model", PushBack<ESM::Door> {"door_ref_id", "door_model"}},
+        Params {"static_ref_id", ESM::REC_STAT, "static_model", PushBack<ESM::Static> {"static_ref_id", "static_model"}},
+        Params {"acti_ref_id_a", ESM::REC_ACTI, "", PushBack<ESM::Activator> {"acti_ref_id_z", "acti_model"}},
+        Params {"cont_ref_id_a", ESM::REC_CONT, "", PushBack<ESM::Container> {"cont_ref_id_z", "cont_model"}},
+        Params {"door_ref_id_a", ESM::REC_DOOR, "", PushBack<ESM::Door> {"door_ref_id_z", "door_model"}},
+        Params {"static_ref_id_a", ESM::REC_STAT, "", PushBack<ESM::Static> {"static_ref_id_z", "static_model"}},
+        Params {"acti_ref_id_z", ESM::REC_ACTI, "", PushBack<ESM::Activator> {"acti_ref_id_a", "acti_model"}},
+        Params {"cont_ref_id_z", ESM::REC_CONT, "", PushBack<ESM::Container> {"cont_ref_id_a", "cont_model"}},
+        Params {"door_ref_id_z", ESM::REC_DOOR, "", PushBack<ESM::Door> {"door_ref_id_a", "door_model"}},
+        Params {"static_ref_id_z", ESM::REC_STAT, "", PushBack<ESM::Static> {"static_ref_id_a", "static_model"}},
+        Params {"ref_id", ESM::REC_STAT, "", [] (EsmData&) {}},
+        Params {"ref_id", ESM::REC_BOOK, "", [] (EsmData&) {}},
+    };
+
+    INSTANTIATE_TEST_SUITE_P(Params, EsmLoaderGetModelTest, ValuesIn(params));
+
+    TEST(EsmLoaderGetGameSettingTest, shouldReturnFoundValue)
+    {
+        std::vector<ESM::GameSetting> settings;
+        ESM::GameSetting setting;
+        setting.mId = "setting";
+        setting.mValue = ESM::Variant(42);
+        settings.push_back(setting);
+        EXPECT_EQ(EsmLoader::getGameSetting(settings, "setting"), ESM::Variant(42));
+    }
+
+    TEST(EsmLoaderGetGameSettingTest, shouldThrowExceptionWhenNotFound)
+    {
+        const std::vector<ESM::GameSetting> settings;
+        EXPECT_THROW(EsmLoader::getGameSetting(settings, "setting"), std::runtime_error);
+    }
+}
diff --git a/components/esmloader/esmdata.cpp b/components/esmloader/esmdata.cpp
index 06f358ea0f..bf2a8675d2 100644
--- a/components/esmloader/esmdata.cpp
+++ b/components/esmloader/esmdata.cpp
@@ -37,7 +37,7 @@ namespace EsmLoader
         {
             const auto it = std::lower_bound(values.begin(), values.end(), refId, LessById {});
 
-            if (it == values.end() && it->mId != refId)
+            if (it == values.end() || it->mId != refId)
                 return returnAs(std::forward<F>(f));
 
             return std::forward<F>(f)(*it);

From a854a6e04a8437d74078906d1d1720c0649e4e6f Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Wed, 20 Oct 2021 21:02:15 +0000
Subject: [PATCH 1512/2859] removes UnrefQueue (#3181)

Currently, we use an `UnrefQueue` which supposedly aims to transfer destruction costs to another thread. The implications of this unusual pattern can not be well understood because some allocators might free resources more efficiently if they are freed by the same thread that allocated them. In addition, `UnrefQueue` complicates the validation of thread safety in our engine. Lastly, our current usage of `UnrefQueue` triggers `ref()`, `unref()` atomic operations as objects are passed into the queue. These operations could be more expensive than the actual destruction.

With this PR we thus remove `UnrefQueue`. We can expect these changes to have a minor impact at most because we free most resources elsewhere in `ResourceSystem::updateCache`.
---
 apps/openmw/mwphysics/physicssystem.cpp     |  9 -----
 apps/openmw/mwphysics/physicssystem.hpp     |  9 -----
 apps/openmw/mwrender/objects.cpp            | 12 +-----
 apps/openmw/mwrender/objects.hpp            |  9 +----
 apps/openmw/mwrender/renderingmanager.cpp   | 14 +------
 apps/openmw/mwrender/renderingmanager.hpp   |  3 --
 apps/openmw/mwworld/cellpreloader.cpp       | 17 ++------
 apps/openmw/mwworld/cellpreloader.hpp       |  8 ----
 apps/openmw/mwworld/scene.cpp               |  6 ---
 components/sceneutil/unrefqueue.cpp         | 39 ------------------
 components/sceneutil/unrefqueue.hpp         | 44 ---------------------
 components/terrain/compositemaprenderer.cpp | 17 --------
 components/terrain/compositemaprenderer.hpp | 12 ------
 components/terrain/world.cpp                |  5 ---
 components/terrain/world.hpp                |  8 ----
 15 files changed, 6 insertions(+), 206 deletions(-)
 delete mode 100644 components/sceneutil/unrefqueue.cpp
 delete mode 100644 components/sceneutil/unrefqueue.hpp

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 5f7ee0523a..6c46fd6d05 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -24,7 +24,6 @@
 #include <components/debug/debuglog.hpp>
 #include <components/esm/loadgmst.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
-#include <components/sceneutil/unrefqueue.hpp>
 #include <components/misc/convert.hpp>
 
 #include <components/nifosg/particle.hpp> // FindRecIndexVisitor
@@ -160,11 +159,6 @@ namespace MWPhysics
         mProjectiles.clear();
     }
 
-    void PhysicsSystem::setUnrefQueue(SceneUtil::UnrefQueue *unrefQueue)
-    {
-        mUnrefQueue = unrefQueue;
-    }
-
     Resource::BulletShapeManager *PhysicsSystem::getShapeManager()
     {
         return mShapeManager.get();
@@ -513,9 +507,6 @@ namespace MWPhysics
     {
         if (auto foundObject = mObjects.find(ptr.mRef); foundObject != mObjects.end())
         {
-            if (mUnrefQueue.get())
-                mUnrefQueue->push(foundObject->second->getShapeInstance());
-
             mAnimatedObjects.erase(foundObject->second.get());
 
             mObjects.erase(foundObject);
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 30fdbcc122..6ec4ebfda9 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -36,11 +36,6 @@ namespace Resource
     class ResourceSystem;
 }
 
-namespace SceneUtil
-{
-    class UnrefQueue;
-}
-
 class btCollisionWorld;
 class btBroadphaseInterface;
 class btDefaultCollisionConfiguration;
@@ -118,8 +113,6 @@ namespace MWPhysics
             PhysicsSystem (Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Group> parentNode);
             virtual ~PhysicsSystem ();
 
-            void setUnrefQueue(SceneUtil::UnrefQueue* unrefQueue);
-
             Resource::BulletShapeManager* getShapeManager();
 
             void enableWater(float height);
@@ -262,8 +255,6 @@ namespace MWPhysics
 
             std::pair<std::vector<std::shared_ptr<Actor>>, std::vector<ActorFrameData>> prepareFrameData(bool willSimulate);
 
-            osg::ref_ptr<SceneUtil::UnrefQueue> mUnrefQueue;
-
             std::unique_ptr<btBroadphaseInterface> mBroadphase;
             std::unique_ptr<btDefaultCollisionConfiguration> mCollisionConfiguration;
             std::unique_ptr<btCollisionDispatcher> mDispatcher;
diff --git a/apps/openmw/mwrender/objects.cpp b/apps/openmw/mwrender/objects.cpp
index ec1c4397bf..f51008fffa 100644
--- a/apps/openmw/mwrender/objects.cpp
+++ b/apps/openmw/mwrender/objects.cpp
@@ -4,7 +4,6 @@
 #include <osg/UserDataContainer>
 
 #include <components/sceneutil/positionattitudetransform.hpp>
-#include <components/sceneutil/unrefqueue.hpp>
 
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/class.hpp"
@@ -18,10 +17,9 @@
 namespace MWRender
 {
 
-Objects::Objects(Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Group> rootNode, SceneUtil::UnrefQueue* unrefQueue)
+Objects::Objects(Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Group> rootNode)
     : mRootNode(rootNode)
     , mResourceSystem(resourceSystem)
-    , mUnrefQueue(unrefQueue)
 {
 }
 
@@ -117,9 +115,6 @@ bool Objects::removeObject (const MWWorld::Ptr& ptr)
     PtrAnimationMap::iterator iter = mObjects.find(ptr);
     if(iter != mObjects.end())
     {
-        if (mUnrefQueue.get())
-            mUnrefQueue->push(iter->second);
-
         mObjects.erase(iter);
 
         if (ptr.getClass().isActor())
@@ -146,9 +141,6 @@ void Objects::removeCell(const MWWorld::CellStore* store)
         MWWorld::Ptr ptr = iter->second->getPtr();
         if(ptr.getCell() == store)
         {
-            if (mUnrefQueue.get())
-                mUnrefQueue->push(iter->second);
-
             if (ptr.getClass().isNpc() && ptr.getRefData().getCustomData())
             {
                 MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore(ptr);
@@ -166,8 +158,6 @@ void Objects::removeCell(const MWWorld::CellStore* store)
     if(cell != mCellSceneNodes.end())
     {
         cell->second->getParent(0)->removeChild(cell->second);
-        if (mUnrefQueue.get())
-            mUnrefQueue->push(cell->second);
         mCellSceneNodes.erase(cell);
     }
 }
diff --git a/apps/openmw/mwrender/objects.hpp b/apps/openmw/mwrender/objects.hpp
index 98ebb95d98..5f8b7dfc9e 100644
--- a/apps/openmw/mwrender/objects.hpp
+++ b/apps/openmw/mwrender/objects.hpp
@@ -24,11 +24,6 @@ namespace MWWorld
     class CellStore;
 }
 
-namespace SceneUtil
-{
-    class UnrefQueue;
-}
-
 namespace MWRender{
 
 class Animation;
@@ -66,12 +61,10 @@ class Objects{
 
     Resource::ResourceSystem* mResourceSystem;
 
-    osg::ref_ptr<SceneUtil::UnrefQueue> mUnrefQueue;
-
     void insertBegin(const MWWorld::Ptr& ptr);
 
 public:
-    Objects(Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Group> rootNode, SceneUtil::UnrefQueue* unrefQueue);
+    Objects(Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Group> rootNode);
     ~Objects();
 
     /// @param animated Attempt to load separate keyframes from a .kf file matching the model file?
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 14000273db..1f29c45182 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -37,7 +37,6 @@
 #include <components/sceneutil/statesetupdater.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/sceneutil/workqueue.hpp>
-#include <components/sceneutil/unrefqueue.hpp>
 #include <components/sceneutil/writescene.hpp>
 #include <components/sceneutil/shadow.hpp>
 
@@ -289,7 +288,6 @@ namespace MWRender
         , mRootNode(rootNode)
         , mResourceSystem(resourceSystem)
         , mWorkQueue(workQueue)
-        , mUnrefQueue(new SceneUtil::UnrefQueue)
         , mNavigator(navigator)
         , mMinimumAmbientLuminance(0.f)
         , mNightEyeFactor(0.f)
@@ -387,7 +385,7 @@ namespace MWRender
         mRecastMesh.reset(new RecastMesh(mRootNode, Settings::Manager::getBool("enable recast mesh render", "Navigator")));
         mPathgrid.reset(new Pathgrid(mRootNode));
 
-        mObjects.reset(new Objects(mResourceSystem, sceneRoot, mUnrefQueue.get()));
+        mObjects.reset(new Objects(mResourceSystem, sceneRoot));
 
         if (getenv("OPENMW_DONT_PRECOMPILE") == nullptr)
         {
@@ -434,7 +432,6 @@ namespace MWRender
             mTerrain.reset(new Terrain::TerrainGrid(sceneRoot, mRootNode, mResourceSystem, mTerrainStorage.get(), Mask_Terrain, Mask_PreCompile, Mask_Debug));
 
         mTerrain->setTargetFrameRate(Settings::Manager::getFloat("target framerate", "Cells"));
-        mTerrain->setWorkQueue(mWorkQueue.get());
 
         if (groundcover)
         {
@@ -569,11 +566,6 @@ namespace MWRender
         return mWorkQueue.get();
     }
 
-    SceneUtil::UnrefQueue* RenderingManager::getUnrefQueue()
-    {
-        return mUnrefQueue.get();
-    }
-
     Terrain::World* RenderingManager::getTerrain()
     {
         return mTerrain.get();
@@ -804,8 +796,6 @@ namespace MWRender
     {
         reportStats();
 
-        mUnrefQueue->flush(mWorkQueue.get());
-
         float rainIntensity = mSky->getPrecipitationAlpha();
         mWater->setRainIntensity(rainIntensity);
 
@@ -1223,8 +1213,6 @@ namespace MWRender
         unsigned int frameNumber = mViewer->getFrameStamp()->getFrameNumber();
         if (stats->collectStats("resource"))
         {
-            stats->setAttribute(frameNumber, "UnrefQueue", mUnrefQueue->getNumItems());
-
             mTerrain->reportStats(frameNumber, stats);
         }
     }
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index bd8bbe4694..b8d5d955c8 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -59,7 +59,6 @@ namespace SceneUtil
 {
     class ShadowManager;
     class WorkQueue;
-    class UnrefQueue;
 }
 
 namespace DetourNavigator
@@ -106,7 +105,6 @@ namespace MWRender
         Resource::ResourceSystem* getResourceSystem();
 
         SceneUtil::WorkQueue* getWorkQueue();
-        SceneUtil::UnrefQueue* getUnrefQueue();
         Terrain::World* getTerrain();
 
         void preloadCommonAssets();
@@ -262,7 +260,6 @@ namespace MWRender
         Resource::ResourceSystem* mResourceSystem;
 
         osg::ref_ptr<SceneUtil::WorkQueue> mWorkQueue;
-        osg::ref_ptr<SceneUtil::UnrefQueue> mUnrefQueue;
 
         osg::ref_ptr<osg::Light> mSunLight;
 
diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index 590e1e9c00..fc09a6e9a8 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -12,7 +12,6 @@
 #include <components/misc/resourcehelpers.hpp>
 #include <components/misc/stringops.hpp>
 #include <components/terrain/world.hpp>
-#include <components/sceneutil/unrefqueue.hpp>
 #include <components/esm/loadcell.hpp>
 #include <components/loadinglistener/reporter.hpp>
 
@@ -322,11 +321,10 @@ namespace MWWorld
         PreloadMap::iterator found = mPreloadCells.find(cell);
         if (found != mPreloadCells.end())
         {
-            // do the deletion in the background thread
             if (found->second.mWorkItem)
             {
                 found->second.mWorkItem->abort();
-                mUnrefQueue->push(std::move(found->second.mWorkItem));
+                found->second.mWorkItem = nullptr;
             }
 
             mPreloadCells.erase(found);
@@ -340,7 +338,7 @@ namespace MWWorld
             if (it->second.mWorkItem)
             {
                 it->second.mWorkItem->abort();
-                mUnrefQueue->push(it->second.mWorkItem);
+                it->second.mWorkItem = nullptr;
             }
 
             mPreloadCells.erase(it++);
@@ -356,7 +354,7 @@ namespace MWWorld
                 if (it->second.mWorkItem)
                 {
                     it->second.mWorkItem->abort();
-                    mUnrefQueue->push(it->second.mWorkItem);
+                    it->second.mWorkItem = nullptr;
                 }
                 mPreloadCells.erase(it++);
             }
@@ -409,11 +407,6 @@ namespace MWWorld
         mWorkQueue = workQueue;
     }
 
-    void CellPreloader::setUnrefQueue(SceneUtil::UnrefQueue* unrefQueue)
-    {
-        mUnrefQueue = unrefQueue;
-    }
-
     bool CellPreloader::syncTerrainLoad(const std::vector<CellPreloader::PositionCellGrid> &positions, double timestamp, Loading::Listener& listener)
     {
         if (!mTerrainPreloadItem)
@@ -455,11 +448,7 @@ namespace MWWorld
         else
         {
             if (mTerrainViews.size() > positions.size())
-            {
-                for (unsigned int i=positions.size(); i<mTerrainViews.size(); ++i)
-                    mUnrefQueue->push(mTerrainViews[i]);
                 mTerrainViews.resize(positions.size());
-            }
             else if (mTerrainViews.size() < positions.size())
             {
                 for (unsigned int i=mTerrainViews.size(); i<positions.size(); ++i)
diff --git a/apps/openmw/mwworld/cellpreloader.hpp b/apps/openmw/mwworld/cellpreloader.hpp
index 0c3bcb4f99..185a25276b 100644
--- a/apps/openmw/mwworld/cellpreloader.hpp
+++ b/apps/openmw/mwworld/cellpreloader.hpp
@@ -19,11 +19,6 @@ namespace Terrain
     class View;
 }
 
-namespace SceneUtil
-{
-    class UnrefQueue;
-}
-
 namespace MWRender
 {
     class LandManager;
@@ -72,8 +67,6 @@ namespace MWWorld
 
         void setWorkQueue(osg::ref_ptr<SceneUtil::WorkQueue> workQueue);
 
-        void setUnrefQueue(SceneUtil::UnrefQueue* unrefQueue);
-
         typedef std::pair<osg::Vec3f, osg::Vec4i> PositionCellGrid;
         void setTerrainPreloadPositions(const std::vector<PositionCellGrid>& positions);
 
@@ -87,7 +80,6 @@ namespace MWWorld
         Terrain::World* mTerrain;
         MWRender::LandManager* mLandManager;
         osg::ref_ptr<SceneUtil::WorkQueue> mWorkQueue;
-        osg::ref_ptr<SceneUtil::UnrefQueue> mUnrefQueue;
         double mExpiryDelay;
         unsigned int mMinCacheSize;
         unsigned int mMaxCacheSize;
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index e333e00623..d49e6c0e8b 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -15,7 +15,6 @@
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/resource/bulletshape.hpp>
-#include <components/sceneutil/unrefqueue.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/detournavigator/navigator.hpp>
 #include <components/detournavigator/debug.hpp>
@@ -654,7 +653,6 @@ namespace MWWorld
             }
 
             mRendering.getResourceSystem()->updateCache(mRendering.getReferenceTime());
-            mRendering.getUnrefQueue()->flush(mRendering.getWorkQueue());
 
             loadingListener->increaseProgress (1);
             i++;
@@ -701,7 +699,6 @@ namespace MWWorld
             }
 
             mRendering.getResourceSystem()->updateCache(mRendering.getReferenceTime());
-            mRendering.getUnrefQueue()->flush(mRendering.getWorkQueue());
 
             loadingListener->increaseProgress (1);
             i++;
@@ -755,9 +752,6 @@ namespace MWWorld
         mPreloader.reset(new CellPreloader(rendering.getResourceSystem(), physics->getShapeManager(), rendering.getTerrain(), rendering.getLandManager()));
         mPreloader->setWorkQueue(mRendering.getWorkQueue());
 
-        mPreloader->setUnrefQueue(rendering.getUnrefQueue());
-        mPhysics->setUnrefQueue(rendering.getUnrefQueue());
-
         rendering.getResourceSystem()->setExpiryDelay(Settings::Manager::getFloat("cache expiry delay", "Cells"));
 
         mPreloader->setExpiryDelay(Settings::Manager::getFloat("preload cell expiry delay", "Cells"));
diff --git a/components/sceneutil/unrefqueue.cpp b/components/sceneutil/unrefqueue.cpp
deleted file mode 100644
index 50b23cae92..0000000000
--- a/components/sceneutil/unrefqueue.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include "unrefqueue.hpp"
-
-//#include <osg/Timer>
-
-//#include <components/debug/debuglog.hpp>
-
-namespace SceneUtil
-{
-    void UnrefWorkItem::doWork()
-    {
-        mObjects.clear();
-    }
-
-    UnrefQueue::UnrefQueue()
-    {
-        mWorkItem = new UnrefWorkItem;
-    }
-
-    void UnrefQueue::push(const osg::Referenced *obj)
-    {
-        mWorkItem->mObjects.emplace_back(obj);
-    }
-
-    void UnrefQueue::flush(SceneUtil::WorkQueue *workQueue)
-    {
-        if (mWorkItem->mObjects.empty())
-            return;
-
-        workQueue->addWorkItem(mWorkItem, true);
-
-        mWorkItem = new UnrefWorkItem;
-    }
-
-    unsigned int UnrefQueue::getNumItems() const
-    {
-        return mWorkItem->mObjects.size();
-    }
-
-}
diff --git a/components/sceneutil/unrefqueue.hpp b/components/sceneutil/unrefqueue.hpp
deleted file mode 100644
index 84372d28c0..0000000000
--- a/components/sceneutil/unrefqueue.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef OPENMW_COMPONENTS_UNREFQUEUE_H
-#define OPENMW_COMPONENTS_UNREFQUEUE_H
-
-#include <deque>
-
-#include <osg/ref_ptr>
-#include <osg/Referenced>
-
-#include <components/sceneutil/workqueue.hpp>
-
-namespace SceneUtil
-{
-    class WorkQueue;
-    
-    class UnrefWorkItem : public SceneUtil::WorkItem
-    {
-    public:
-        std::deque<osg::ref_ptr<const osg::Referenced> > mObjects;
-        void doWork() override;
-    };
-
-    /// @brief Handles unreferencing of objects through the WorkQueue. Typical use scenario
-    /// would be the main thread pushing objects that are no longer needed, and the background thread deleting them.
-    class UnrefQueue : public osg::Referenced
-    {
-    public:
-        UnrefQueue();
-
-        /// Adds an object to the list of objects to be unreferenced. Call from the main thread.
-        void push(const osg::Referenced* obj);
-
-        /// Adds a WorkItem to the given WorkQueue that will clear the list of objects in a worker thread, thus unreferencing them.
-        /// Call from the main thread.
-        void flush(SceneUtil::WorkQueue* workQueue);
-
-        unsigned int getNumItems() const;
-
-    private:
-        osg::ref_ptr<UnrefWorkItem> mWorkItem;
-    };
-
-}
-
-#endif
diff --git a/components/terrain/compositemaprenderer.cpp b/components/terrain/compositemaprenderer.cpp
index 2a3fa47daa..55da3d347a 100644
--- a/components/terrain/compositemaprenderer.cpp
+++ b/components/terrain/compositemaprenderer.cpp
@@ -4,9 +4,6 @@
 #include <osg/Texture2D>
 #include <osg/RenderInfo>
 
-#include <components/sceneutil/unrefqueue.hpp>
-#include <components/sceneutil/workqueue.hpp>
-
 #include <algorithm>
 
 namespace Terrain
@@ -21,8 +18,6 @@ CompositeMapRenderer::CompositeMapRenderer()
 
     mFBO = new osg::FrameBufferObject;
 
-    mUnrefQueue = new SceneUtil::UnrefQueue;
-
     getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
 }
 
@@ -30,11 +25,6 @@ CompositeMapRenderer::~CompositeMapRenderer()
 {
 }
 
-void CompositeMapRenderer::setWorkQueue(SceneUtil::WorkQueue* workQueue)
-{
-    mWorkQueue = workQueue;
-}
-
 void CompositeMapRenderer::drawImplementation(osg::RenderInfo &renderInfo) const
 {
     double dt = mTimer.time_s();
@@ -45,9 +35,6 @@ void CompositeMapRenderer::drawImplementation(osg::RenderInfo &renderInfo) const
     double availableTime = std::max((targetFrameTime - dt)*conservativeTimeRatio,
                                     mMinimumTimeAvailable);
 
-    if (mWorkQueue)
-        mUnrefQueue->flush(mWorkQueue.get());
-
     std::lock_guard<std::mutex> lock(mMutex);
 
     if (mImmediateCompileSet.empty() && mCompileSet.empty())
@@ -139,10 +126,6 @@ void CompositeMapRenderer::compile(CompositeMap &compositeMap, osg::RenderInfo &
 
         ++compositeMap.mCompiled;
 
-        if (mWorkQueue)
-        {
-            mUnrefQueue->push(compositeMap.mDrawables[i]);
-        }
         compositeMap.mDrawables[i] = nullptr;
 
         if (timeLeft)
diff --git a/components/terrain/compositemaprenderer.hpp b/components/terrain/compositemaprenderer.hpp
index 257173af46..f0021c88fe 100644
--- a/components/terrain/compositemaprenderer.hpp
+++ b/components/terrain/compositemaprenderer.hpp
@@ -13,12 +13,6 @@ namespace osg
     class Texture2D;
 }
 
-namespace SceneUtil
-{
-    class UnrefQueue;
-    class WorkQueue;
-}
-
 namespace Terrain
 {
 
@@ -45,9 +39,6 @@ namespace Terrain
 
         void compile(CompositeMap& compositeMap, osg::RenderInfo& renderInfo, double* timeLeft) const;
 
-        /// Set a WorkQueue to delete compiled composite map layers in the background thread
-        void setWorkQueue(SceneUtil::WorkQueue* workQueue);
-
         /// Set the available time in seconds for compiling (non-immediate) composite maps each frame
         void setMinimumTimeAvailableForCompile(double time);
 
@@ -67,9 +58,6 @@ namespace Terrain
         double mMinimumTimeAvailable;
         mutable osg::Timer mTimer;
 
-        osg::ref_ptr<SceneUtil::UnrefQueue> mUnrefQueue;
-        osg::ref_ptr<SceneUtil::WorkQueue> mWorkQueue;
-
         typedef std::set<osg::ref_ptr<CompositeMap> > CompileSet;
 
         mutable CompileSet mCompileSet;
diff --git a/components/terrain/world.cpp b/components/terrain/world.cpp
index 17a51913e5..582cc68b1b 100644
--- a/components/terrain/world.cpp
+++ b/components/terrain/world.cpp
@@ -84,11 +84,6 @@ World::~World()
     }
 }
 
-void World::setWorkQueue(SceneUtil::WorkQueue* workQueue)
-{
-    mCompositeMapRenderer->setWorkQueue(workQueue);
-}
-
 void World::setBordersVisible(bool visible)
 {
     mBorderVisible = visible;
diff --git a/components/terrain/world.hpp b/components/terrain/world.hpp
index def7a2eccf..b9fa7c0160 100644
--- a/components/terrain/world.hpp
+++ b/components/terrain/world.hpp
@@ -28,11 +28,6 @@ namespace Resource
     class ResourceSystem;
 }
 
-namespace SceneUtil
-{
-    class WorkQueue;
-}
-
 namespace Loading
 {
     class Reporter;
@@ -115,9 +110,6 @@ namespace Terrain
         World(osg::Group* parent, Storage* storage, unsigned int nodeMask);
         virtual ~World();
 
-        /// Set a WorkQueue to delete objects in the background thread.
-        void setWorkQueue(SceneUtil::WorkQueue* workQueue);
-
         /// See CompositeMapRenderer::setTargetFrameRate
         void setTargetFrameRate(float rate);
 

From 2a0e1697b6634387daa3e9c12091744eec150bd5 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 14 Jun 2020 18:01:22 +0200
Subject: [PATCH 1513/2859] Deduplicate swim speed formula implementation

---
 apps/openmw/mwclass/actor.hpp    | 11 +++++++++++
 apps/openmw/mwclass/creature.cpp |  6 +-----
 apps/openmw/mwclass/npc.cpp      | 14 +-------------
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/apps/openmw/mwclass/actor.hpp b/apps/openmw/mwclass/actor.hpp
index 886ffe4771..596bdf26ec 100644
--- a/apps/openmw/mwclass/actor.hpp
+++ b/apps/openmw/mwclass/actor.hpp
@@ -3,6 +3,8 @@
 
 #include "../mwworld/class.hpp"
 
+#include <components/esm/loadmgef.hpp>
+
 namespace ESM
 {
     struct GameSetting;
@@ -17,6 +19,15 @@ namespace MWClass
 
         Actor() = default;
 
+        template <class GMST>
+        float getSwimSpeedImpl(const MWWorld::Ptr& ptr, const GMST& gmst, const MWMechanics::MagicEffects& mageffects, float baseSpeed) const
+        {
+            return baseSpeed
+                * (1.0f + 0.01f * mageffects.get(ESM::MagicEffect::SwiftSwim).getMagnitude())
+                * (gmst.fSwimRunBase->mValue.getFloat()
+                   + 0.01f * getSkill(ptr, ESM::Skill::Athletics) * gmst.fSwimRunAthleticsMult->mValue.getFloat());
+        }
+
     public:
          ~Actor() override = default;
 
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index c20a005724..dae2dedc54 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -891,12 +891,8 @@ namespace MWClass
     float Creature::getSwimSpeed(const MWWorld::Ptr& ptr) const
     {
         const MWMechanics::CreatureStats& stats = getCreatureStats(ptr);
-        const GMST& gmst = getGmst();
         const MWMechanics::MagicEffects& mageffects = stats.getMagicEffects();
 
-        return getWalkSpeed(ptr)
-            * (1.0f + 0.01f * mageffects.get(ESM::MagicEffect::SwiftSwim).getMagnitude())
-            * (gmst.fSwimRunBase->mValue.getFloat()
-               + 0.01f * getSkill(ptr, ESM::Skill::Athletics) * gmst.fSwimRunAthleticsMult->mValue.getFloat());
+        return getSwimSpeedImpl(ptr, getGmst(), mageffects, getWalkSpeed(ptr));
     }
 }
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 59280a0f02..78d2f1ebd5 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -1476,7 +1476,6 @@ namespace MWClass
 
     float Npc::getSwimSpeed(const MWWorld::Ptr& ptr) const
     {
-        const GMST& gmst = getGmst();
         const MWBase::World* world = MWBase::Environment::get().getWorld();
         const MWMechanics::CreatureStats& stats = getCreatureStats(ptr);
         const NpcCustomData* npcdata = static_cast<const NpcCustomData*>(ptr.getRefData().getCustomData());
@@ -1486,17 +1485,6 @@ namespace MWClass
         const bool running = stats.getStance(MWMechanics::CreatureStats::Stance_Run)
                 && (inair || MWBase::Environment::get().getMechanicsManager()->isRunning(ptr));
 
-        float swimSpeed;
-
-        if (running)
-            swimSpeed = getRunSpeed(ptr);
-        else
-            swimSpeed = getWalkSpeed(ptr);
-
-        swimSpeed *= 1.0f + 0.01f * mageffects.get(ESM::MagicEffect::SwiftSwim).getMagnitude();
-        swimSpeed *= gmst.fSwimRunBase->mValue.getFloat()
-                + 0.01f * getSkill(ptr, ESM::Skill::Athletics) * gmst.fSwimRunAthleticsMult->mValue.getFloat();
-
-        return swimSpeed;
+        return getSwimSpeedImpl(ptr, getGmst(), mageffects, running ? getRunSpeed(ptr) : getWalkSpeed(ptr));
     }
 }

From 68ed8487b591379a95ad9fa2d12f239657ecbbd7 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 14 Jun 2020 17:43:30 +0200
Subject: [PATCH 1514/2859] Use lambda instead of bool to make sure GMST
 initialized once

This is less expensive than having 2 static variables and thread-safe.
---
 apps/openmw/mwclass/creature.cpp | 12 +++++++-----
 apps/openmw/mwclass/npc.cpp      | 10 +++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index c20a005724..130b1967ae 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -82,12 +82,13 @@ namespace MWClass
 
     const Creature::GMST& Creature::getGmst()
     {
-        static GMST gmst;
-        static bool inited = false;
-        if (!inited)
+        static const GMST gmst = []
         {
+            GMST gmst;
+
             const MWBase::World *world = MWBase::Environment::get().getWorld();
             const MWWorld::Store<ESM::GameSetting> &store = world->getStore().get<ESM::GameSetting>();
+
             gmst.fMinWalkSpeedCreature = store.find("fMinWalkSpeedCreature");
             gmst.fMaxWalkSpeedCreature = store.find("fMaxWalkSpeedCreature");
             gmst.fEncumberedMoveEffect = store.find("fEncumberedMoveEffect");
@@ -101,8 +102,9 @@ namespace MWClass
             gmst.fKnockDownMult = store.find("fKnockDownMult");
             gmst.iKnockDownOddsMult = store.find("iKnockDownOddsMult");
             gmst.iKnockDownOddsBase = store.find("iKnockDownOddsBase");
-            inited = true;
-        }
+
+            return gmst;
+        } ();
         return gmst;
     }
 
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 59280a0f02..462e9442fd 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -266,10 +266,10 @@ namespace MWClass
 
     const Npc::GMST& Npc::getGmst()
     {
-        static GMST gmst;
-        static bool inited = false;
-        if(!inited)
+        static const GMST gmst = []
         {
+            GMST gmst;
+
             const MWBase::World *world = MWBase::Environment::get().getWorld();
             const MWWorld::Store<ESM::GameSetting> &store = world->getStore().get<ESM::GameSetting>();
 
@@ -294,8 +294,8 @@ namespace MWClass
             gmst.iKnockDownOddsBase = store.find("iKnockDownOddsBase");
             gmst.fCombatArmorMinMult = store.find("fCombatArmorMinMult");
 
-            inited = true;
-        }
+            return gmst;
+        } ();
         return gmst;
     }
 

From 31a7c83cc748028247ef1c247145433c5d8e0ff4 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 21 Oct 2021 17:22:15 +0200
Subject: [PATCH 1515/2859] Fix a regression involving default arguments

---
 apps/openmw/mwmechanics/combat.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/combat.cpp b/apps/openmw/mwmechanics/combat.cpp
index 6407d03f23..c1d5f711fc 100644
--- a/apps/openmw/mwmechanics/combat.cpp
+++ b/apps/openmw/mwmechanics/combat.cpp
@@ -47,7 +47,7 @@ namespace MWMechanics
             {
                 MWMechanics::CastSpell cast(attacker, victim, fromProjectile);
                 cast.mHitPosition = hitPosition;
-                cast.cast(object, false);
+                cast.cast(object, 0, false);
                 // Apply magic effects directly instead of waiting a frame to allow soul trap to work on one-hit kills
                 if(!victim.isEmpty() && victim.getClass().isActor())
                     MWBase::Environment::get().getMechanicsManager()->updateMagicEffects(victim);

From 63fa6d3b7c5b7221dcef7e8db45309116e45b904 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 21 Oct 2021 17:28:36 +0200
Subject: [PATCH 1516/2859] Apply on self effects on projectiles to the target
 instead

---
 CHANGELOG.md                             | 1 +
 apps/openmw/mwmechanics/spellcasting.cpp | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25ae0c45d0..d38729248e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -53,6 +53,7 @@
     Bug #6291: Can't pickup the dead mage's journal from the mysterious hunter mod
     Bug #6302: Teleporting disabled actor breaks its disabled state
     Bug #6307: Pathfinding in Infidelities quest from Tribunal addon is broken
+    Bug #6321: Arrow enchantments should always be applied to the target
     Bug #6322: Total sold/cost should reset to 0 when there are no items offered
     Bug #6323: Wyrmhaven: Alboin doesn't follower the player character out of his house
     Bug #6326: Detect Enchantment/Key should detect items in unresolved containers
diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index adbaa30c15..026f6b5f19 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -333,7 +333,10 @@ namespace MWMechanics
                 mCaster.getClass().skillUsageSucceeded (mCaster, ESM::Skill::Enchant, 3);
         }
 
-        inflict(mCaster, mCaster, enchantment->mEffects, ESM::RT_Self);
+        if (isProjectile)
+            inflict(mTarget, mCaster, enchantment->mEffects, ESM::RT_Self);
+        else
+            inflict(mCaster, mCaster, enchantment->mEffects, ESM::RT_Self);
 
         if (isProjectile || !mTarget.isEmpty())
             inflict(mTarget, mCaster, enchantment->mEffects, ESM::RT_Touch);

From b5f0057ac95db37dae17b8765396eb37ba9489a8 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 21 Oct 2021 19:48:31 +0200
Subject: [PATCH 1517/2859] Fix tests on windows

---
 apps/openmw_test_suite/CMakeLists.txt         | 15 +++++---------
 apps/openmw_test_suite/esmloader/load.cpp     | 10 +++++-----
 apps/openmw_test_suite/esmloader/settings.hpp | 20 -------------------
 apps/openmw_test_suite/openmw_test_suite.cpp  |  5 -----
 components/esmloader/esmdata.hpp              |  2 +-
 components/sqlite3/request.hpp                |  1 +
 6 files changed, 12 insertions(+), 41 deletions(-)
 delete mode 100644 apps/openmw_test_suite/esmloader/settings.hpp

diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index 3d19834066..e82efaa718 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -77,17 +77,12 @@ if (GTEST_FOUND AND GMOCK_FOUND)
         endif (CMAKE_CL_64)
     endif (MSVC)
 
-    include(FetchContent)
-    FetchContent_Declare(example_suite_template_game
-        URL https://gitlab.com/OpenMW/example-suite/-/raw/8966dab24692555eec720c854fb0f73d108070cd/data/template.omwgame
-        URL_HASH MD5=bf3691034a38611534c74c3b89a7d2c3
-        SOURCE_DIR fetched/example_suite_template_game
-        DOWNLOAD_NO_EXTRACT ON
+    file(DOWNLOAD
+        https://gitlab.com/OpenMW/example-suite/-/raw/8966dab24692555eec720c854fb0f73d108070cd/data/template.omwgame
+        ${CMAKE_CURRENT_BINARY_DIR}/data/template.omwgame
+        EXPECTED_MD5 bf3691034a38611534c74c3b89a7d2c3
     )
-    FetchContent_MakeAvailableExcludeFromAll(example_suite_template_game)
 
-    add_custom_target(example_suite_template_game SOURCES fetched/example_suite_template_game/template.omwgame)
-
-    add_dependencies(openmw_test_suite example_suite_template_game)
+    target_compile_definitions(openmw_test_suite PRIVATE OPENMW_DATA_DIR="${CMAKE_CURRENT_BINARY_DIR}/data")
 
 endif()
diff --git a/apps/openmw_test_suite/esmloader/load.cpp b/apps/openmw_test_suite/esmloader/load.cpp
index 71a8d2534a..0f00847226 100644
--- a/apps/openmw_test_suite/esmloader/load.cpp
+++ b/apps/openmw_test_suite/esmloader/load.cpp
@@ -1,5 +1,3 @@
-#include "settings.hpp"
-
 #include <components/esmloader/load.cpp>
 #include <components/files/collections.hpp>
 #include <components/files/multidircollection.hpp>
@@ -7,16 +5,18 @@
 
 #include <gtest/gtest.h>
 
+#ifndef OPENMW_DATA_DIR
+#error "OPENMW_DATA_DIR is not defined"
+#endif
+
 namespace
 {
     using namespace testing;
     using namespace EsmLoader;
-    using EsmLoaderTests::Settings;
 
     struct EsmLoaderTest : Test
     {
-        const boost::filesystem::path mDataDir {Settings::impl().mBasePath / "apps/openmw_test_suite/fetched/example_suite_template_game"};
-        const Files::PathContainer mDataDirs {{mDataDir.string()}};
+        const Files::PathContainer mDataDirs {{std::string(OPENMW_DATA_DIR)}};
         const Files::Collections mFileCollections {mDataDirs, true};
         const std::vector<std::string> mContentFiles {{"template.omwgame"}};
     };
diff --git a/apps/openmw_test_suite/esmloader/settings.hpp b/apps/openmw_test_suite/esmloader/settings.hpp
deleted file mode 100644
index 0f36310bc6..0000000000
--- a/apps/openmw_test_suite/esmloader/settings.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef OPENMW_TEST_SUITE_LOAD_SETTINGS_H
-#define OPENMW_TEST_SUITE_LOAD_SETTINGS_H
-
-#include <boost/filesystem/path.hpp>
-
-namespace EsmLoaderTests
-{
-    struct Settings
-    {
-        boost::filesystem::path mBasePath;
-
-        static Settings& impl()
-        {
-            static Settings value;
-            return value;
-        }
-    };
-}
-
-#endif
diff --git a/apps/openmw_test_suite/openmw_test_suite.cpp b/apps/openmw_test_suite/openmw_test_suite.cpp
index 5fb9bda901..7364b20fdb 100644
--- a/apps/openmw_test_suite/openmw_test_suite.cpp
+++ b/apps/openmw_test_suite/openmw_test_suite.cpp
@@ -1,9 +1,5 @@
-#include "esmloader/settings.hpp"
-
 #include <gtest/gtest.h>
 
-#include <boost/filesystem/path.hpp>
-
 #ifdef WIN32
 //we cannot use GTEST_API_ before main if we're building standalone exe application,
 //and we're linking GoogleTest / GoogleMock as DLLs and not linking gtest_main / gmock_main
@@ -11,7 +7,6 @@ int main(int argc, char **argv) {
 #else
 GTEST_API_ int main(int argc, char **argv) {
 #endif
-    EsmLoaderTests::Settings::impl().mBasePath = boost::filesystem::path(argv[0]).parent_path();
     testing::InitGoogleTest(&argc, argv);
     return RUN_ALL_TESTS();
 }
diff --git a/components/esmloader/esmdata.hpp b/components/esmloader/esmdata.hpp
index 624f50a5e6..afdcc1748d 100644
--- a/components/esmloader/esmdata.hpp
+++ b/components/esmloader/esmdata.hpp
@@ -15,7 +15,7 @@ namespace ESM
     struct GameSetting;
     struct Land;
     struct Static;
-    struct Variant;
+    class Variant;
 }
 
 namespace EsmLoader
diff --git a/components/sqlite3/request.hpp b/components/sqlite3/request.hpp
index 378dd5fdf7..339c7f7521 100644
--- a/components/sqlite3/request.hpp
+++ b/components/sqlite3/request.hpp
@@ -7,6 +7,7 @@
 
 #include <cstddef>
 #include <cstdint>
+#include <iterator>
 #include <memory>
 #include <stdexcept>
 #include <string>

From 07d505563e323a424f2f86c017c377d0c52ea9a2 Mon Sep 17 00:00:00 2001
From: Fanael Linithien <fanael4@gmail.com>
Date: Fri, 22 Oct 2021 23:33:10 +0000
Subject: [PATCH 1518/2859] Remove non-existent file from CMakeLists

---
 components/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 7b06b6702d..7e1abe0a4e 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -55,7 +55,7 @@ add_component_dir (shader
 
 add_component_dir (sceneutil
     clone attach visitor util statesetupdater controller skeleton riggeometry morphgeometry lightcontroller
-    lightmanager lightutil positionattitudetransform workqueue unrefqueue pathgridutil waterutil writescene serialize optimizer
+    lightmanager lightutil positionattitudetransform workqueue pathgridutil waterutil writescene serialize optimizer
     actorutil detourdebugdraw navmesh agentpath shadow mwshadowtechnique recastmesh shadowsbin osgacontroller rtt
     screencapture
     )

From 1848f7f9158aeb1a4cf90d25b2bd6c0f3619cd15 Mon Sep 17 00:00:00 2001
From: wareya <wareya@gmail.com>
Date: Fri, 22 Oct 2021 21:33:32 -0400
Subject: [PATCH 1519/2859] Overhaul raindrop water ripple effect

---
 files/shaders/water_fragment.glsl | 62 +++++++++++++++++++++----------
 1 file changed, 43 insertions(+), 19 deletions(-)

diff --git a/files/shaders/water_fragment.glsl b/files/shaders/water_fragment.glsl
index 26f83e052c..ac12b355ee 100644
--- a/files/shaders/water_fragment.glsl
+++ b/files/shaders/water_fragment.glsl
@@ -70,33 +70,56 @@ float randPhase(vec2 c)
   return fract((c.x * c.y) /  (c.x + c.y + 0.1));
 }
 
-vec4 circle(vec2 coords, vec2 i_part, float phase)
+float blip(float x)
 {
-  vec2 center = vec2(0.5,0.5) + (0.5 - RAIN_RIPPLE_RADIUS) * (2.0 * randOffset(i_part) - 1.0);
-  vec2 toCenter = coords - center;
-  float d = length(toCenter);
-
-  float r = RAIN_RIPPLE_RADIUS * phase;
-
-  if (d > r)
-    return vec4(0.0,0.0,1.0,0.0);
-
-  float sinValue = (sin(d / r * 1.2) + 0.7) / 2.0;
+  x = max(0.0, 1.0-x*x);
+  return x*x*x;
+}
 
-  float height = (1.0 - abs(phase)) * pow(sinValue,3.0);
+float blipDerivative(float x)
+{
+  x = clamp(x, -1.0, 1.0);
+  float n = x*x-1.0;
+  return -6.0*x*n*n;
+}
 
-  vec3 normal = normalize(mix(vec3(0.0,0.0,1.0),vec3(normalize(toCenter),0.0),height));
+vec2 randomize_center(vec2 i_part, float time)
+{
+  time = 1.0 + mod(time, 10000.0); // so things don't get out of hand after long runtimes
+  vec2 center = vec2(0.5,0.5) + (0.5 - RAIN_RIPPLE_RADIUS) * (2.0 * randOffset(i_part*time) - 1.0);
+  return center;
+}
 
-  return vec4(normal,height);
+vec4 circle(vec2 coords, vec2 uv, float adjusted_time)
+{
+  vec2 center = randomize_center(floor(uv * RAIN_RIPPLE_GAPS), floor(adjusted_time));
+  float phase = fract(adjusted_time);
+  vec2 toCenter = coords - center;
+  float r = RAIN_RIPPLE_RADIUS;
+  float d = length(toCenter);
+  float ringfollower = (phase-d/r)*6.0-1.0;
+  float energy = 1.0-phase;
+  energy = energy*energy;
+
+  vec2 normal = -toCenter*blipDerivative(ringfollower)*5.0;
+  float height = blip(ringfollower);
+  vec4 ret = vec4(normal.x, normal.y, height, height);
+  ret.xyw *= energy;
+  ret.xyz = normalize(ret.xyz);
+  return ret;
 }
 
+const float RAIN_RING_TIME_OFFSET = 1/6.0;
 vec4 rain(vec2 uv, float time)
 {
   vec2 i_part = floor(uv * RAIN_RIPPLE_GAPS);
+  float time_prog = time * 1.2 + randPhase(i_part);
   vec2 f_part = fract(uv * RAIN_RIPPLE_GAPS);
-  return circle(f_part,i_part,fract(time * 1.2 + randPhase(i_part)));
+  return circle(f_part, uv, time_prog)
+       - circle(f_part, uv, time_prog - RAIN_RING_TIME_OFFSET)     / 4.0
+       + circle(f_part, uv, time_prog - RAIN_RING_TIME_OFFSET*2.0) / 8.0
+       - circle(f_part, uv, time_prog - RAIN_RING_TIME_OFFSET*3.0) / 16.0;
 }
-
 vec4 rainCombined(vec2 uv, float time)     // returns ripple normal in xyz and ripple height in w
 {
   return
@@ -107,6 +130,7 @@ vec4 rainCombined(vec2 uv, float time)     // returns ripple normal in xyz and r
     rain(uv * 0.8 + vec2(1.2,3.0),time);
 }
 
+
 // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -
 
 float fresnel_dielectric(vec3 Incoming, vec3 Normal, float eta)
@@ -197,7 +221,7 @@ void main(void)
     else
       rainRipple = vec4(0.0);
 
-    vec3 rippleAdd = rainRipple.xyz * rainRipple.w * 10.0;
+    vec3 rippleAdd = rainRipple.xyz * abs(rainRipple.w) * 10.0;
 
     vec2 bigWaves = vec2(BIG_WAVES_X,BIG_WAVES_Y);
     vec2 midWaves = mix(vec2(MID_WAVES_X,MID_WAVES_Y),vec2(MID_WAVES_RAIN_X,MID_WAVES_RAIN_Y),rainIntensity);
@@ -265,7 +289,7 @@ void main(void)
     vec3 scatterColour = mix(SCATTER_COLOUR*vec3(1.0,0.4,0.0), SCATTER_COLOUR, clamp(1.0-exp(-sunHeight*SUN_EXT), 0.0, 1.0));
     vec3 lR = reflect(lVec, lNormal);
     float lightScatter = clamp(dot(lVec,lNormal)*0.7+0.3, 0.0, 1.0) * clamp(dot(lR, vVec)*2.0-1.2, 0.0, 1.0) * SCATTER_AMOUNT * sunFade * clamp(1.0-exp(-sunHeight), 0.0, 1.0);
-    gl_FragData[0].xyz = mix( mix(refraction,  scatterColour,  lightScatter),  reflection,  fresnel) + specular * sunSpec.xyz + vec3(rainRipple.w) * 0.2;
+    gl_FragData[0].xyz = mix( mix(refraction,  scatterColour,  lightScatter),  reflection,  fresnel) + specular * sunSpec.xyz + vec3(abs(rainRipple.w)) * 0.2;
     gl_FragData[0].w = 1.0;
 
     // wobbly water: hard-fade into refraction texture at extremely low depth, with a wobble based on normal mapping
@@ -278,7 +302,7 @@ void main(void)
     shoreOffset = clamp(mix(shoreOffset, 1.0, clamp(linearDepth / WOBBLY_SHORE_FADE_DISTANCE, 0.0, 1.0)), 0.0, 1.0);
     gl_FragData[0].xyz = mix(rawRefraction, gl_FragData[0].xyz, shoreOffset);
 #else
-    gl_FragData[0].xyz = mix(reflection,  waterColor,  (1.0-fresnel)*0.5) + specular * sunSpec.xyz + vec3(rainRipple.w) * 0.7;
+    gl_FragData[0].xyz = mix(reflection,  waterColor,  (1.0-fresnel)*0.5) + specular * sunSpec.xyz + vec3(abs(rainRipple.w)) * 0.7;
     gl_FragData[0].w = clamp(fresnel*6.0 + specular * sunSpec.w, 0.0, 1.0);     //clamp(fresnel*2.0 + specular * gl_LightSource[0].specular.w, 0.0, 1.0);
 #endif
 

From e23b0edda4a49296c56b29251fe3f00fd6b0adba Mon Sep 17 00:00:00 2001
From: wareya <wareya@gmail.com>
Date: Fri, 22 Oct 2021 23:11:23 -0400
Subject: [PATCH 1520/2859] Add pre-pass to collision trace function that
 traces over less distance if possible

---
 apps/openmw/mwphysics/trace.cpp | 74 +++++++++++++++++++++------------
 1 file changed, 47 insertions(+), 27 deletions(-)

diff --git a/apps/openmw/mwphysics/trace.cpp b/apps/openmw/mwphysics/trace.cpp
index 049d026e8e..b2c5410a62 100644
--- a/apps/openmw/mwphysics/trace.cpp
+++ b/apps/openmw/mwphysics/trace.cpp
@@ -12,31 +12,49 @@
 namespace MWPhysics
 {
 
-void ActorTracer::doTrace(const btCollisionObject *actor, const osg::Vec3f& start, const osg::Vec3f& end, const btCollisionWorld* world)
+ActorConvexCallback sweepHelper(const btCollisionObject *actor, const btVector3& from, const btVector3& to, const btCollisionWorld* world, bool actorFilter)
 {
-    const btVector3 btstart = Misc::Convert::toBullet(start);
-    const btVector3 btend = Misc::Convert::toBullet(end);
-
     const btTransform &trans = actor->getWorldTransform();
-    btTransform from(trans);
-    btTransform to(trans);
-    from.setOrigin(btstart);
-    to.setOrigin(btend);
+    btTransform transFrom(trans);
+    btTransform transTo(trans);
+    transFrom.setOrigin(from);
+    transTo.setOrigin(to);
+
+    const btCollisionShape *shape = actor->getCollisionShape();
+    assert(shape->isConvex());
 
-    const btVector3 motion = btstart-btend;
+    const btVector3 motion = from - to; // FIXME: this is backwards; means ActorConvexCallback is doing dot product tests backwards too
     ActorConvexCallback newTraceCallback(actor, motion, btScalar(0.0), world);
     // Inherit the actor's collision group and mask
     newTraceCallback.m_collisionFilterGroup = actor->getBroadphaseHandle()->m_collisionFilterGroup;
     newTraceCallback.m_collisionFilterMask = actor->getBroadphaseHandle()->m_collisionFilterMask;
+    if(actorFilter)
+        newTraceCallback.m_collisionFilterMask &= ~CollisionType_Actor;
 
-    const btCollisionShape *shape = actor->getCollisionShape();
-    assert(shape->isConvex());
-    world->convexSweepTest(static_cast<const btConvexShape*>(shape), from, to, newTraceCallback);
+    world->convexSweepTest(static_cast<const btConvexShape*>(shape), transFrom, transTo, newTraceCallback);
+    return newTraceCallback;
+}
+
+void ActorTracer::doTrace(const btCollisionObject *actor, const osg::Vec3f& start, const osg::Vec3f& end, const btCollisionWorld* world)
+{
+    const btVector3 btstart = Misc::Convert::toBullet(start);
+    btVector3 btend = Misc::Convert::toBullet(end);
+
+    bool do_fallback = false;
+    if((btend-btstart).length2() > 5.0*5.0)
+    {
+        btend = btstart + (btend-btstart).normalized()*5.0;
+        do_fallback = true;
+    }
+
+    auto newTraceCallback = sweepHelper(actor, btstart, btend, world, false);
 
     // Copy the hit data over to our trace results struct:
     if(newTraceCallback.hasHit())
     {
         mFraction = newTraceCallback.m_closestHitFraction;
+        if((end-start).length2() > 0.0)
+            mFraction *= (btend-btstart).length() / (end-start).length();
         mPlaneNormal = Misc::Convert::toOsg(newTraceCallback.m_hitNormalWorld);
         mEndPos = (end-start)*mFraction + start;
         mHitPoint = Misc::Convert::toOsg(newTraceCallback.m_hitPointWorld);
@@ -44,6 +62,22 @@ void ActorTracer::doTrace(const btCollisionObject *actor, const osg::Vec3f& star
     }
     else
     {
+        if(do_fallback)
+        {
+            btend = Misc::Convert::toBullet(end);
+            auto newTraceCallback = sweepHelper(actor, btstart, btend, world, false);
+
+            if(newTraceCallback.hasHit())
+            {
+                mFraction = newTraceCallback.m_closestHitFraction;
+                mPlaneNormal = Misc::Convert::toOsg(newTraceCallback.m_hitNormalWorld);
+                mEndPos = (end-start)*mFraction + start;
+                mHitPoint = Misc::Convert::toOsg(newTraceCallback.m_hitPointWorld);
+                mHitObject = newTraceCallback.m_hitCollisionObject;
+                return;
+            }
+        }
+        // fallthrough
         mEndPos = end;
         mPlaneNormal = osg::Vec3f(0.0f, 0.0f, 1.0f);
         mFraction = 1.0f;
@@ -54,21 +88,7 @@ void ActorTracer::doTrace(const btCollisionObject *actor, const osg::Vec3f& star
 
 void ActorTracer::findGround(const Actor* actor, const osg::Vec3f& start, const osg::Vec3f& end, const btCollisionWorld* world)
 {
-    const btVector3 btstart = Misc::Convert::toBullet(start);
-    const btVector3 btend = Misc::Convert::toBullet(end);
-
-    const btTransform &trans = actor->getCollisionObject()->getWorldTransform();
-    btTransform from(trans.getBasis(), btstart);
-    btTransform to(trans.getBasis(), btend);
-
-    const btVector3 motion = btstart-btend;
-    ActorConvexCallback newTraceCallback(actor->getCollisionObject(), motion, btScalar(0.0), world);
-    // Inherit the actor's collision group and mask
-    newTraceCallback.m_collisionFilterGroup = actor->getCollisionObject()->getBroadphaseHandle()->m_collisionFilterGroup;
-    newTraceCallback.m_collisionFilterMask = actor->getCollisionObject()->getBroadphaseHandle()->m_collisionFilterMask;
-    newTraceCallback.m_collisionFilterMask &= ~CollisionType_Actor;
-
-    world->convexSweepTest(actor->getConvexShape(), from, to, newTraceCallback);
+    auto newTraceCallback = sweepHelper(actor->getCollisionObject(), Misc::Convert::toBullet(start), Misc::Convert::toBullet(end), world, true);
     if(newTraceCallback.hasHit())
     {
         mFraction = newTraceCallback.m_closestHitFraction;

From b5c876299d4f7d7cefa57caba57bec28f8719670 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 23 Oct 2021 09:29:16 +0200
Subject: [PATCH 1521/2859] Round to a power of two

---
 apps/openmw/mwmechanics/magiceffects.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/magiceffects.cpp b/apps/openmw/mwmechanics/magiceffects.cpp
index 8e74d73d5d..b01c5446a7 100644
--- a/apps/openmw/mwmechanics/magiceffects.cpp
+++ b/apps/openmw/mwmechanics/magiceffects.cpp
@@ -11,7 +11,7 @@ namespace
     // Round value to prevent precision issues
     void truncate(float& value)
     {
-        value = std::roundf(value * 1000.f) / 1000.f;
+        value = std::roundf(value * 1024.f) / 1024.f;
     }
 }
 

From c9c8d02332ff334eddf20eeaf1670dbf0b15c861 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Sat, 23 Oct 2021 08:31:46 +0000
Subject: [PATCH 1522/2859] fixes a crash (#3183)

This PR fixes a crash caused by the improperly ensured lifetime of RigGeometry::mSourceGeometry. mSourceGeometry was not adequate to ensure mSourceGeometry would outlive mGeometry because we extend mGeometrys lifetime beyond this lifetime by passing mGeometry to the draw traversal instead of this.
In addition,

We add important comments.
We detect and prevent generally unsafe operations in high level code.
We add a sprinkling of const to help clarify intentions.
---
 apps/opencs/view/render/actor.cpp          |  2 +-
 apps/openmw/mwrender/animation.cpp         |  4 +--
 apps/openmw/mwrender/creatureanimation.cpp |  2 +-
 apps/openmw/mwrender/npcanimation.cpp      |  2 +-
 apps/openmw/mwrender/objectpaging.cpp      |  7 ++++-
 components/resource/scenemanager.cpp       | 31 ++++++++++++++--------
 components/resource/scenemanager.hpp       | 14 +++++++---
 components/sceneutil/attach.cpp            | 22 ++++++++-------
 components/sceneutil/attach.hpp            |  6 ++++-
 components/sceneutil/clone.hpp             |  1 +
 components/sceneutil/morphgeometry.cpp     |  9 +++++++
 components/sceneutil/riggeometry.cpp       | 11 ++++++++
 components/sceneutil/riggeometry.hpp       |  7 +++++
 13 files changed, 86 insertions(+), 32 deletions(-)

diff --git a/apps/opencs/view/render/actor.cpp b/apps/opencs/view/render/actor.cpp
index 271ca2365a..94b82c96cd 100644
--- a/apps/opencs/view/render/actor.cpp
+++ b/apps/opencs/view/render/actor.cpp
@@ -111,7 +111,7 @@ namespace CSVRender
         if (!mesh.empty() && node != mNodeMap.end())
         {
             auto instance = sceneMgr->getInstance(mesh);
-            SceneUtil::attach(instance, mSkeleton, boneName, node->second);
+            SceneUtil::attach(instance, mSkeleton, boneName, node->second, sceneMgr);
         }
     }
 
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 10624c8bca..ca76856d48 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -1319,10 +1319,10 @@ namespace MWRender
 
                 cache.insert(std::make_pair(model, created));
 
-                return sceneMgr->createInstance(created);
+                return sceneMgr->getInstance(created);
             }
             else
-                return sceneMgr->createInstance(found->second);
+                return sceneMgr->getInstance(found->second);
         }
         else
         {
diff --git a/apps/openmw/mwrender/creatureanimation.cpp b/apps/openmw/mwrender/creatureanimation.cpp
index 502340d4b9..b64b205961 100644
--- a/apps/openmw/mwrender/creatureanimation.cpp
+++ b/apps/openmw/mwrender/creatureanimation.cpp
@@ -164,7 +164,7 @@ void CreatureWeaponAnimation::updatePart(PartHolderPtr& scene, int slot)
         NodeMap::const_iterator found = nodeMap.find(Misc::StringUtils::lowerCase(bonename));
         if (found == nodeMap.end())
             throw std::runtime_error("Can't find attachment node " + bonename);
-        osg::ref_ptr<osg::Node> attached = SceneUtil::attach(node, mObjectRoot, bonename, found->second.get());
+        osg::ref_ptr<osg::Node> attached = SceneUtil::attach(node, mObjectRoot, bonename, found->second.get(), mResourceSystem->getSceneManager());
 
         scene.reset(new PartHolder(attached));
 
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 0e100326dd..42215c00bc 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -717,7 +717,7 @@ PartHolderPtr NpcAnimation::insertBoundedPart(const std::string& model, const st
     if (found == nodeMap.end())
         throw std::runtime_error("Can't find attachment node " + bonename);
 
-    osg::ref_ptr<osg::Node> attached = SceneUtil::attach(templateNode, mObjectRoot, bonefilter, found->second);
+    osg::ref_ptr<osg::Node> attached = SceneUtil::attach(templateNode, mObjectRoot, bonefilter, found->second, mResourceSystem->getSceneManager());
     if (enchantedGlow)
         mGlowUpdater = SceneUtil::addEnchantedGlow(attached, mResourceSystem, *glowColor);
 
diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index 5c22c3fc8d..947f23f781 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -617,6 +617,10 @@ namespace MWRender
                     pat->setAttitude(nodeAttitude);
                 }
 
+                // DO NOT COPY AND PASTE THIS CODE. Cloning osg::Geometry without also cloning its contained Arrays is generally unsafe.
+                // In this specific case the operation is safe under the following two assumptions:
+                // - When Arrays are removed or replaced in the cloned geometry, the original Arrays in their place must outlive the cloned geometry regardless. (ensured by TemplateMultiRef)
+                // - Arrays that we add or replace in the cloned geometry must be explicitely forbidden from reusing BufferObjects of the original geometry. (ensured by needvbo() in optimizer.cpp)
                 copyop.setCopyFlags(merge ? osg::CopyOp::DEEP_COPY_NODES|osg::CopyOp::DEEP_COPY_DRAWABLES : osg::CopyOp::DEEP_COPY_NODES);
                 copyop.mOptimizeBillboards = (size > 1/4.f);
                 copyop.mNodePath.push_back(trans);
@@ -645,7 +649,8 @@ namespace MWRender
             }
             if (numinstances > 0)
             {
-                // add a ref to the original template, to hint to the cache that it's still being used and should be kept in cache
+                // add a ref to the original template to help verify the safety of shallow cloning operations
+                // in addition, we hint to the cache that it's still being used and should be kept in cache
                 templateRefs->addRef(cnode);
 
                 if (pair.second.mNeedCompile)
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index c5ef957c3e..4184a77c54 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -693,19 +693,33 @@ namespace Resource
         }
     }
 
-    osg::ref_ptr<osg::Node> SceneManager::createInstance(const std::string& name)
+    osg::ref_ptr<osg::Node> SceneManager::getInstance(const std::string& name)
     {
         osg::ref_ptr<const osg::Node> scene = getTemplate(name);
-        return createInstance(scene);
+        return getInstance(scene);
     }
 
-    osg::ref_ptr<osg::Node> SceneManager::createInstance(const osg::Node *base)
+    osg::ref_ptr<osg::Node> SceneManager::cloneNode(const osg::Node* base)
     {
-        osg::ref_ptr<osg::Node> cloned = static_cast<osg::Node*>(base->clone(SceneUtil::CopyOp()));
-
-        // add a ref to the original template, to hint to the cache that it's still being used and should be kept in cache
+        SceneUtil::CopyOp copyop;
+        if (const osg::Drawable* drawable = base->asDrawable())
+        {
+            if (drawable->asGeometry())
+            {
+                Log(Debug::Warning) << "SceneManager::cloneNode: attempting to clone osg::Geometry. For safety reasons this will be expensive. Consider avoiding this call.";
+                copyop.setCopyFlags(copyop.getCopyFlags()|osg::CopyOp::DEEP_COPY_ARRAYS|osg::CopyOp::DEEP_COPY_PRIMITIVES);
+            }
+        }
+        osg::ref_ptr<osg::Node> cloned = static_cast<osg::Node*>(base->clone(copyop));
+        // add a ref to the original template to help verify the safety of shallow cloning operations
+        // in addition, if this node is managed by a cache, we hint to the cache that it's still being used and should be kept in cache
         cloned->getOrCreateUserDataContainer()->addUserObject(new TemplateRef(base));
+        return cloned;
+    }
 
+    osg::ref_ptr<osg::Node> SceneManager::getInstance(const osg::Node *base)
+    {
+        osg::ref_ptr<osg::Node> cloned = cloneNode(base);
         // we can skip any scene graphs without update callbacks since we know that particle emitters will have an update callback set
         if (cloned->getNumChildrenRequiringUpdateTraversal() > 0)
         {
@@ -716,11 +730,6 @@ namespace Resource
         return cloned;
     }
 
-    osg::ref_ptr<osg::Node> SceneManager::getInstance(const std::string &name)
-    {
-        return createInstance(name);
-    }
-
     osg::ref_ptr<osg::Node> SceneManager::getInstance(const std::string &name, osg::Group* parentNode)
     {
         osg::ref_ptr<osg::Node> cloned = getInstance(name);
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index b5d3e453a0..85e012071d 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -132,16 +132,22 @@ namespace Resource
         /// @note Thread safe.
         osg::ref_ptr<const osg::Node> getTemplate(const std::string& name, bool compile=true);
 
-        osg::ref_ptr<osg::Node> createInstance(const std::string& name);
+        /// Clone osg::Node safely.
+        /// @note Thread safe.
+        static osg::ref_ptr<osg::Node> cloneNode(const osg::Node* base);
 
-        osg::ref_ptr<osg::Node> createInstance(const osg::Node* base);
         void shareState(osg::ref_ptr<osg::Node> node);
-        /// Get an instance of the given scene template
+
+        /// Clone osg::Node and adjust it according to SceneManager's settings.
+        /// @note Thread safe.
+        osg::ref_ptr<osg::Node> getInstance(const osg::Node* base);
+
+        /// Instance the given scene template.
         /// @see getTemplate
         /// @note Thread safe.
         osg::ref_ptr<osg::Node> getInstance(const std::string& name);
 
-        /// Get an instance of the given scene template and immediately attach it to a parent node
+        /// Instance the given scene template and immediately attach it to a parent node
         /// @see getTemplate
         /// @note Not thread safe, unless parentNode is not part of the main scene graph yet.
         osg::ref_ptr<osg::Node> getInstance(const std::string& name, osg::Group* parentNode);
diff --git a/components/sceneutil/attach.cpp b/components/sceneutil/attach.cpp
index 6690148c74..9dabb282b0 100644
--- a/components/sceneutil/attach.cpp
+++ b/components/sceneutil/attach.cpp
@@ -13,9 +13,9 @@
 #include <components/misc/stringops.hpp>
 
 #include <components/sceneutil/skeleton.hpp>
+#include <components/resource/scenemanager.hpp>
 
 #include "visitor.hpp"
-#include "clone.hpp"
 
 namespace SceneUtil
 {
@@ -49,10 +49,10 @@ namespace SceneUtil
             if (!filterMatches(drawable.getName()))
                 return;
 
-            osg::Node* node = &drawable;
+            const osg::Node* node = &drawable;
             for (auto it = getNodePath().rbegin()+1; it != getNodePath().rend(); ++it)
             {
-                osg::Node* parent = *it;
+                const osg::Node* parent = *it;
                 if (!filterMatches(parent->getName()))
                     break;
                 node = parent;
@@ -60,11 +60,11 @@ namespace SceneUtil
             mToCopy.emplace(node);
         }
 
-        void doCopy()
+        void doCopy(Resource::SceneManager* sceneManager)
         {
-            for (const osg::ref_ptr<osg::Node>& node : mToCopy)
+            for (const osg::ref_ptr<const osg::Node>& node : mToCopy)
             {
-                mParent->addChild(static_cast<osg::Node*>(node->clone(SceneUtil::CopyOp())));
+                mParent->addChild(sceneManager->getInstance(node));
             }
             mToCopy.clear();
         }
@@ -78,7 +78,7 @@ namespace SceneUtil
                 || (lowerName.size() >= mFilter2.size() && lowerName.compare(0, mFilter2.size(), mFilter2) == 0);
         }
 
-        using NodeSet = std::set<osg::ref_ptr<osg::Node>>;
+        using NodeSet = std::set<osg::ref_ptr<const osg::Node>>;
         NodeSet mToCopy;
 
         osg::ref_ptr<osg::Group> mParent;
@@ -100,7 +100,7 @@ namespace SceneUtil
         }
     }
 
-    osg::ref_ptr<osg::Node> attach(osg::ref_ptr<const osg::Node> toAttach, osg::Node *master, const std::string &filter, osg::Group* attachNode)
+    osg::ref_ptr<osg::Node> attach(osg::ref_ptr<const osg::Node> toAttach, osg::Node *master, const std::string &filter, osg::Group* attachNode, Resource::SceneManager* sceneManager)
     {
         if (dynamic_cast<const SceneUtil::Skeleton*>(toAttach.get()))
         {
@@ -108,7 +108,9 @@ namespace SceneUtil
 
             CopyRigVisitor copyVisitor(handle, filter);
             const_cast<osg::Node*>(toAttach.get())->accept(copyVisitor);
-            copyVisitor.doCopy();
+            copyVisitor.doCopy(sceneManager);
+            // add a ref to the original template to hint to the cache that it is still being used and should be kept in cache.
+            handle->getOrCreateUserDataContainer()->addUserObject(new Resource::TemplateRef(toAttach));
 
             if (handle->getNumChildren() == 1)
             {
@@ -127,7 +129,7 @@ namespace SceneUtil
         }
         else
         {
-            osg::ref_ptr<osg::Node> clonedToAttach = static_cast<osg::Node*>(toAttach->clone(SceneUtil::CopyOp()));
+            osg::ref_ptr<osg::Node> clonedToAttach = sceneManager->getInstance(toAttach);
 
             FindByNameVisitor findBoneOffset("BoneOffset");
             clonedToAttach->accept(findBoneOffset);
diff --git a/components/sceneutil/attach.hpp b/components/sceneutil/attach.hpp
index 806fc53488..f5fc693724 100644
--- a/components/sceneutil/attach.hpp
+++ b/components/sceneutil/attach.hpp
@@ -10,6 +10,10 @@ namespace osg
     class Node;
     class Group;
 }
+namespace Resource
+{
+    class SceneManager;
+}
 
 namespace SceneUtil
 {
@@ -19,7 +23,7 @@ namespace SceneUtil
     /// Otherwise, just attach all of the toAttach scenegraph to the attachment node on the master scenegraph, with no filtering.
     /// @note The master scene graph is expected to include a skeleton.
     /// @return A newly created node that is directly attached to the master scene graph
-    osg::ref_ptr<osg::Node> attach(osg::ref_ptr<const osg::Node> toAttach, osg::Node* master, const std::string& filter, osg::Group* attachNode);
+    osg::ref_ptr<osg::Node> attach(osg::ref_ptr<const osg::Node> toAttach, osg::Node* master, const std::string& filter, osg::Group* attachNode, Resource::SceneManager *sceneManager);
 
 }
 
diff --git a/components/sceneutil/clone.hpp b/components/sceneutil/clone.hpp
index 1cf00c9e58..35240cbfba 100644
--- a/components/sceneutil/clone.hpp
+++ b/components/sceneutil/clone.hpp
@@ -18,6 +18,7 @@ namespace SceneUtil
     /// @par Defines the cloning behaviour we need:
     /// * Assigns updated ParticleSystem pointers on cloned emitters and programs.
     /// * Deep copies RigGeometry and MorphGeometry so they can animate without affecting clones.
+    /// @warning Avoid using this class directly. The safety of cloning operations depends on the copy flags and the objects involved. Consider using SceneManager::cloneNode for additional safety.
     /// @warning Do not use an object of this class for more than one copy operation.
     class CopyOp : public osg::CopyOp
     {
diff --git a/components/sceneutil/morphgeometry.cpp b/components/sceneutil/morphgeometry.cpp
index 78be559989..59adbffffe 100644
--- a/components/sceneutil/morphgeometry.cpp
+++ b/components/sceneutil/morphgeometry.cpp
@@ -1,6 +1,7 @@
 #include "morphgeometry.hpp"
 
 #include <cassert>
+#include <components/resource/scenemanager.hpp>
 
 #include <osg/Version>
 
@@ -27,11 +28,19 @@ MorphGeometry::MorphGeometry(const MorphGeometry &copy, const osg::CopyOp &copyo
 
 void MorphGeometry::setSourceGeometry(osg::ref_ptr<osg::Geometry> sourceGeom)
 {
+    for (unsigned int i=0; i<2; ++i)
+        mGeometry[i] = nullptr;
+
     mSourceGeometry = sourceGeom;
 
     for (unsigned int i=0; i<2; ++i)
     {
+        // DO NOT COPY AND PASTE THIS CODE. Cloning osg::Geometry without also cloning its contained Arrays is generally unsafe.
+        // In this specific case the operation is safe under the following two assumptions:
+        // - When Arrays are removed or replaced in the cloned geometry, the original Arrays in their place must outlive the cloned geometry regardless. (ensured by TemplateRef)
+        // - Arrays that we add or replace in the cloned geometry must be explicitely forbidden from reusing BufferObjects of the original geometry. (ensured by vbo below)
         mGeometry[i] = new osg::Geometry(*mSourceGeometry, osg::CopyOp::SHALLOW_COPY);
+        mGeometry[i]->getOrCreateUserDataContainer()->addUserObject(new Resource::TemplateRef(mSourceGeometry));
 
         const osg::Geometry& from = *mSourceGeometry;
         osg::Geometry& to = *mGeometry[i];
diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp
index ec00efa535..84b31f4afc 100644
--- a/components/sceneutil/riggeometry.cpp
+++ b/components/sceneutil/riggeometry.cpp
@@ -3,6 +3,7 @@
 #include <osg/Version>
 
 #include <components/debug/debuglog.hpp>
+#include <components/resource/scenemanager.hpp>
 #include <osg/MatrixTransform>
 
 #include "skeleton.hpp"
@@ -60,12 +61,22 @@ RigGeometry::RigGeometry(const RigGeometry &copy, const osg::CopyOp &copyop)
 
 void RigGeometry::setSourceGeometry(osg::ref_ptr<osg::Geometry> sourceGeometry)
 {
+    for (unsigned int i=0; i<2; ++i)
+        mGeometry[i] = nullptr;
+
     mSourceGeometry = sourceGeometry;
 
     for (unsigned int i=0; i<2; ++i)
     {
         const osg::Geometry& from = *sourceGeometry;
+
+        // DO NOT COPY AND PASTE THIS CODE. Cloning osg::Geometry without also cloning its contained Arrays is generally unsafe.
+        // In this specific case the operation is safe under the following two assumptions:
+        // - When Arrays are removed or replaced in the cloned geometry, the original Arrays in their place must outlive the cloned geometry regardless. (ensured by mSourceGeometry)
+        // - Arrays that we add or replace in the cloned geometry must be explicitely forbidden from reusing BufferObjects of the original geometry. (ensured by vbo below)
         mGeometry[i] = new osg::Geometry(from, osg::CopyOp::SHALLOW_COPY);
+        mGeometry[i]->getOrCreateUserDataContainer()->addUserObject(new Resource::TemplateRef(mSourceGeometry));
+
         osg::Geometry& to = *mGeometry[i];
         to.setSupportsDisplayList(false);
         to.setUseVertexBufferObjects(true);
diff --git a/components/sceneutil/riggeometry.hpp b/components/sceneutil/riggeometry.hpp
index e01583399e..25ae5a3243 100644
--- a/components/sceneutil/riggeometry.hpp
+++ b/components/sceneutil/riggeometry.hpp
@@ -9,6 +9,13 @@ namespace SceneUtil
     class Skeleton;
     class Bone;
 
+    // TODO: This class has a lot of issues.
+    // - We require too many workarounds to ensure safety.
+    // - mSourceGeometry should be const, but can not be const because of a use case in shadervisitor.cpp.
+    // - We create useless mGeometry clones in template RigGeometries.
+    // - We do not support compileGLObjects.
+    // - We duplicate some code in MorphGeometry. 
+
     /// @brief Mesh skinning implementation.
     /// @note A RigGeometry may be attached directly to a Skeleton, or somewhere below a Skeleton.
     /// Note though that the RigGeometry ignores any transforms below the Skeleton, so the attachment point is not that important.

From e65af0bf0678c925efafe0987608fa56d45893c9 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Sat, 23 Oct 2021 10:48:37 +0200
Subject: [PATCH 1523/2859] Silence all opengl deprecation warnings for MacOS

We know...
---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0451b639e5..1ae3841bdd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -707,6 +707,7 @@ endif()
 if (BUILD_OPENMW AND APPLE)
     # Without these flags LuaJit crashes on startup on OSX
     set_target_properties(openmw PROPERTIES LINK_FLAGS "-pagezero_size 10000 -image_base 100000000")
+    set_target_properties(components PROPERTIES COMPILE_DEFINITIONS "GL_SILENCE_DEPRECATION=1")
 endif()
 
 # Apple bundling

From dfb6bdf77ec3cc40126d37b9728160a22fd1bbe4 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 13 Oct 2021 22:44:18 +0200
Subject: [PATCH 1524/2859] Allow integer variable names

---
 components/compiler/declarationparser.cpp | 10 ++++++++++
 components/compiler/declarationparser.hpp |  4 ++++
 components/compiler/lineparser.cpp        |  5 +++++
 3 files changed, 19 insertions(+)

diff --git a/components/compiler/declarationparser.cpp b/components/compiler/declarationparser.cpp
index 1c64aaadee..f29fe820c1 100644
--- a/components/compiler/declarationparser.cpp
+++ b/components/compiler/declarationparser.cpp
@@ -90,6 +90,16 @@ bool Compiler::DeclarationParser::parseSpecial (int code, const TokenLoc& loc, S
     return Parser::parseSpecial (code, loc, scanner);
 }
 
+bool Compiler::DeclarationParser::parseInt(int value, const TokenLoc& loc, Scanner& scanner)
+{
+    if(mState == State_Name)
+    {
+        // Allow integers to be used as variable names
+        return parseName(loc.mLiteral, loc, scanner);
+    }
+    return Parser::parseInt(value, loc, scanner);
+}
+
 void Compiler::DeclarationParser::reset()
 {
     mState = State_Begin;
diff --git a/components/compiler/declarationparser.hpp b/components/compiler/declarationparser.hpp
index c04f1dc268..d08509fe50 100644
--- a/components/compiler/declarationparser.hpp
+++ b/components/compiler/declarationparser.hpp
@@ -35,6 +35,10 @@ namespace Compiler
             ///< Handle a special character token.
             /// \return fetch another token?
 
+            bool parseInt (int value, const TokenLoc& loc, Scanner& scanner) override;
+            ///< Handle an int token.
+            /// \return fetch another token?
+
             void reset() override;
 
     };
diff --git a/components/compiler/lineparser.cpp b/components/compiler/lineparser.cpp
index 77afaee8bd..943c052473 100644
--- a/components/compiler/lineparser.cpp
+++ b/components/compiler/lineparser.cpp
@@ -67,6 +67,11 @@ namespace Compiler
             parseExpression (scanner, loc);
             return true;
         }
+        else if (mState == SetState)
+        {
+            // Allow ints to be used as variable names
+            return parseName(loc.mLiteral, loc, scanner);
+        }
 
         return Parser::parseInt (value, loc, scanner);
     }

From 31aa19574b31a9bad3efd686ffd909ad976554e6 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 21 Oct 2021 16:54:32 +0200
Subject: [PATCH 1525/2859] Make PositionCell take additional junk arguments

---
 components/compiler/extensions0.cpp  | 2 +-
 components/compiler/stringparser.cpp | 6 ++++++
 components/compiler/stringparser.hpp | 4 ++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/components/compiler/extensions0.cpp b/components/compiler/extensions0.cpp
index 3dfcadab10..64133bee84 100644
--- a/components/compiler/extensions0.cpp
+++ b/components/compiler/extensions0.cpp
@@ -553,7 +553,7 @@ namespace Compiler
             extensions.registerFunction("getpos",'f',"c",opcodeGetPos,opcodeGetPosExplicit);
             extensions.registerFunction("getstartingpos",'f',"c",opcodeGetStartingPos,opcodeGetStartingPosExplicit);
             extensions.registerInstruction("position","ffffz",opcodePosition,opcodePositionExplicit);
-            extensions.registerInstruction("positioncell","ffffcX",opcodePositionCell,opcodePositionCellExplicit);
+            extensions.registerInstruction("positioncell","ffffczz",opcodePositionCell,opcodePositionCellExplicit);
             extensions.registerInstruction("placeitemcell","ccffffX",opcodePlaceItemCell);
             extensions.registerInstruction("placeitem","cffffX",opcodePlaceItem);
             extensions.registerInstruction("placeatpc","clflX",opcodePlaceAtPc);
diff --git a/components/compiler/stringparser.cpp b/components/compiler/stringparser.cpp
index d9c3c04947..4e0114e0a1 100644
--- a/components/compiler/stringparser.cpp
+++ b/components/compiler/stringparser.cpp
@@ -86,6 +86,12 @@ namespace Compiler
         return Parser::parseSpecial (code, loc, scanner);
     }
 
+    bool StringParser::parseInt (int value, const TokenLoc& loc, Scanner& scanner)
+    {
+        reportWarning("Treating integer argument as a string", loc);
+        return parseName(loc.mLiteral, loc, scanner);
+    }
+
     void StringParser::append (std::vector<Interpreter::Type_Code>& code)
     {
         std::copy (mCode.begin(), mCode.end(), std::back_inserter (code));
diff --git a/components/compiler/stringparser.hpp b/components/compiler/stringparser.hpp
index 1976628360..07b61d8fda 100644
--- a/components/compiler/stringparser.hpp
+++ b/components/compiler/stringparser.hpp
@@ -43,6 +43,10 @@ namespace Compiler
             ///< Handle a special character token.
             /// \return fetch another token?
 
+            bool parseInt (int value, const TokenLoc& loc, Scanner& scanner) override;
+            ///< Handle an int token.
+            /// \return fetch another token?
+
             void append (std::vector<Interpreter::Type_Code>& code);
             ///< Append code for parsed string.
 

From 41318a585fa19e34da86dff1b8fd5354d5163db1 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Sat, 23 Oct 2021 10:40:26 +0000
Subject: [PATCH 1526/2859] fixes enable and disable commands (#3186)

This PR fixes a recent regression concerning enable and disable commands with object paging. In addition, we add a necessary comment to avoid such issues in the future.
---
 components/terrain/viewdata.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/components/terrain/viewdata.cpp b/components/terrain/viewdata.cpp
index 3ebc99f1df..e517390b44 100644
--- a/components/terrain/viewdata.cpp
+++ b/components/terrain/viewdata.cpp
@@ -74,6 +74,8 @@ const osg::Vec3f& ViewData::getViewPoint() const
     return mViewPoint;
 }
 
+// NOTE: As a performance optimisation, we cache mRenderingNodes from previous frames here.
+// If this cache becomes invalid (e.g. through mWorldUpdateRevision), we need to use clear() instead of reset().
 void ViewData::reset()
 {
     // clear any unused entries
@@ -164,9 +166,13 @@ ViewData *ViewDataMap::getViewData(osg::Object *viewer, const osg::Vec3f& viewPo
         }
         else if (!mostSuitableView)
         {
+            if (vd->getWorldUpdateRevision() != mWorldUpdateRevision)
+            {
+                vd->setWorldUpdateRevision(mWorldUpdateRevision);
+                vd->clear();
+            }
             vd->setViewPoint(viewPoint);
             vd->setActiveGrid(activeGrid);
-            vd->setWorldUpdateRevision(mWorldUpdateRevision);
             needsUpdate = true;
         }
     }

From 62b59a3c001d43c5468b1e17b8a40fe8015d40d1 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Sat, 23 Oct 2021 12:56:02 +0200
Subject: [PATCH 1527/2859] Update CMakeLists.txt

---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ae3841bdd..537c90670d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -708,6 +708,7 @@ if (BUILD_OPENMW AND APPLE)
     # Without these flags LuaJit crashes on startup on OSX
     set_target_properties(openmw PROPERTIES LINK_FLAGS "-pagezero_size 10000 -image_base 100000000")
     set_target_properties(components PROPERTIES COMPILE_DEFINITIONS "GL_SILENCE_DEPRECATION=1")
+    set_target_properties(openmw PROPERTIES COMPILE_DEFINITIONS "GL_SILENCE_DEPRECATION=1")
 endif()
 
 # Apple bundling

From 1e40d27318de5aed3f1b148c441ed9ba44e6f6f1 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Sat, 23 Oct 2021 17:53:38 -0700
Subject: [PATCH 1528/2859] introduce sky shaders

---
 CHANGELOG.md                        |    4 +
 apps/openmw/CMakeLists.txt          |    2 +-
 apps/openmw/mwrender/sky.cpp        | 2312 +++++++--------------------
 apps/openmw/mwrender/sky.hpp        |   95 +-
 apps/openmw/mwrender/skyutil.cpp    | 1142 +++++++++++++
 apps/openmw/mwrender/skyutil.hpp    |  343 ++++
 apps/openmw/mwworld/weather.cpp     | 2043 +++++++++++------------
 apps/openmw/mwworld/weather.hpp     |    4 +
 components/shader/shadervisitor.cpp |    4 +
 files/shaders/CMakeLists.txt        |    3 +
 files/shaders/lighting.glsl         |   10 +
 files/shaders/objects_fragment.glsl |    8 +-
 files/shaders/objects_vertex.glsl   |    8 +-
 files/shaders/sky_fragment.glsl     |   84 +
 files/shaders/sky_vertex.glsl       |   20 +
 files/shaders/skypasses.glsl        |    7 +
 16 files changed, 3294 insertions(+), 2795 deletions(-)
 create mode 100644 apps/openmw/mwrender/skyutil.cpp
 create mode 100644 apps/openmw/mwrender/skyutil.hpp
 create mode 100644 files/shaders/sky_fragment.glsl
 create mode 100644 files/shaders/sky_vertex.glsl
 create mode 100644 files/shaders/skypasses.glsl

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b37fed31fd..188238f42f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@
     Bug #4602: Robert's Bodies: crash inside createInstance()
     Bug #4700: Editor: Incorrect command implementation
     Bug #4744: Invisible particles must still be processed
+    Bug #4752: UpdateCellCommand doesn't undo properly
+    Bug #5088: Sky abruptly changes direction during certain weather transitions
     Bug #5100: Persuasion doesn't always clamp the resulting disposition
     Bug #5120: Scripted object spawning updates physics system
     Bug #5207: Loose summons can be present in scene
@@ -40,6 +42,7 @@
     Bug #6133: Cannot reliably sneak or steal in the sight of the NPCs siding with player
     Bug #6143: Capturing a screenshot makes engine to be a temporary unresponsive
     Bug #6165: Paralyzed player character can pickup items when the inventory is open
+    Bug #6168: Weather particles flicker for a frame at start of storms
     Bug #6172: Some creatures can't open doors
     Bug #6174: Spellmaking and Enchanting sliders differences from vanilla
     Bug #6184: Command and Calm and Demoralize and Frenzy and Rally magic effects inconsistencies with vanilla
@@ -73,6 +76,7 @@
     Feature #6017: Separate persistent and temporary cell references when saving
     Feature #6032: Reverse-z depth buffer
     Feature #6078: First person should not clear depth buffer
+    Feature #6161: Refactor Sky to use shaders and GLES/GL3 friendly
     Feature #6162: Refactor GUI to use shaders and to be GLES and GL3+ friendly
     Feature #6199: Support FBO Rendering
     Feature #6249: Alpha testing support for Collada
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 7334d893db..425d859f31 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -19,7 +19,7 @@ set(GAME_HEADER
 source_group(game FILES ${GAME} ${GAME_HEADER})
 
 add_openmw_dir (mwrender
-    actors objects renderingmanager animation rotatecontroller sky npcanimation vismask
+    actors objects renderingmanager animation rotatecontroller sky skyutil npcanimation vismask
     creatureanimation effectmanager util renderinginterface pathgrid rendermode weaponanimation screenshotmanager
     bulletdebugdraw globalmap characterpreview camera viewovershoulder localmap water terrainstorage ripplesimulation
     renderbin actoranimation landmanager navmesh actorspaths recastmesh fogmanager objectpaging groundcover postprocessor
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index ebf901b5ab..217f10f294 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -1,1306 +1,185 @@
 #include "sky.hpp"
 
-#include <cmath>
-
-#include <osg/ClipPlane>
-#include <osg/Fog>
-#include <osg/Transform>
 #include <osg/Depth>
-#include <osg/Geometry>
-#include <osg/Material>
-#include <osg/TexEnvCombine>
-#include <osg/TexMat>
-#include <osg/OcclusionQueryNode>
-#include <osg/ColorMask>
 #include <osg/PositionAttitudeTransform>
-#include <osg/BlendFunc>
-#include <osg/AlphaFunc>
-#include <osg/PolygonOffset>
-#include <osg/Version>
-#include <osg/observer_ptr>
 
+#include <osgParticle/Operator>
 #include <osgParticle/BoxPlacer>
 #include <osgParticle/ModularEmitter>
-#include <osgParticle/ParticleSystem>
-#include <osgParticle/ParticleSystemUpdater>
-#include <osgParticle/ConstantRateCounter>
-#include <osgParticle/RadialShooter>
-
-#include <osgParticle/Operator>
 #include <osgParticle/ModularProgram>
+#include <osgParticle/ParticleSystemUpdater>
 
-#include <components/misc/rng.hpp>
+#include <components/settings/settings.hpp>
 
-#include <components/misc/resourcehelpers.hpp>
+#include <components/sceneutil/controller.hpp>
+#include <components/sceneutil/shadow.hpp>
+#include <components/sceneutil/visitor.hpp>
+#include <components/sceneutil/util.hpp>
 
 #include <components/resource/scenemanager.hpp>
 #include <components/resource/imagemanager.hpp>
 
 #include <components/vfs/manager.hpp>
-#include <components/fallback/fallback.hpp>
 
-#include <components/sceneutil/util.hpp>
-#include <components/sceneutil/statesetupdater.hpp>
-#include <components/sceneutil/controller.hpp>
-#include <components/sceneutil/visitor.hpp>
-#include <components/sceneutil/shadow.hpp>
-#include <components/sceneutil/nodecallback.hpp>
-
-#include <components/settings/settings.hpp>
+#include <components/misc/rng.hpp>
+#include <components/misc/resourcehelpers.hpp>
 
 #include <components/nifosg/particle.hpp>
 
+#include "../mwworld/weather.hpp"
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
 #include "vismask.hpp"
 #include "renderbin.hpp"
 #include "util.hpp"
+#include "skyutil.hpp"
 
 namespace
 {
-    osg::ref_ptr<osg::Material> createAlphaTrackingUnlitMaterial()
-    {
-        osg::ref_ptr<osg::Material> mat = new osg::Material;
-        mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 1.f));
-        mat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 1.f));
-        mat->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(1.f, 1.f, 1.f, 1.f));
-        mat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 0.f));
-        mat->setColorMode(osg::Material::DIFFUSE);
-        return mat;
-    }
-
-    osg::ref_ptr<osg::Material> createUnlitMaterial()
-    {
-        osg::ref_ptr<osg::Material> mat = new osg::Material;
-        mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 1.f));
-        mat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 1.f));
-        mat->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(1.f, 1.f, 1.f, 1.f));
-        mat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 0.f));
-        mat->setColorMode(osg::Material::OFF);
-        return mat;
-    }
-
-    osg::ref_ptr<osg::Geometry> createTexturedQuad(int numUvSets=1, float scale=1.f)
-    {
-        osg::ref_ptr<osg::Geometry> geom = new osg::Geometry;
-
-        osg::ref_ptr<osg::Vec3Array> verts = new osg::Vec3Array;
-        verts->push_back(osg::Vec3f(-0.5*scale, -0.5*scale, 0));
-        verts->push_back(osg::Vec3f(-0.5*scale, 0.5*scale, 0));
-        verts->push_back(osg::Vec3f(0.5*scale, 0.5*scale, 0));
-        verts->push_back(osg::Vec3f(0.5*scale, -0.5*scale, 0));
-
-        geom->setVertexArray(verts);
-
-        osg::ref_ptr<osg::Vec2Array> texcoords = new osg::Vec2Array;
-        texcoords->push_back(osg::Vec2f(0, 0));
-        texcoords->push_back(osg::Vec2f(0, 1));
-        texcoords->push_back(osg::Vec2f(1, 1));
-        texcoords->push_back(osg::Vec2f(1, 0));
-
-        osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array;
-        colors->push_back(osg::Vec4(1.f, 1.f, 1.f, 1.f));
-        geom->setColorArray(colors, osg::Array::BIND_OVERALL);
-
-        for (int i=0; i<numUvSets; ++i)
-            geom->setTexCoordArray(i, texcoords, osg::Array::BIND_PER_VERTEX);
-
-        geom->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::QUADS,0,4));
-
-        return geom;
-    }
-
-}
-
-namespace MWRender
-{
-
-class AtmosphereUpdater : public SceneUtil::StateSetUpdater
-{
-public:
-    void setEmissionColor(const osg::Vec4f& emissionColor)
-    {
-        mEmissionColor = emissionColor;
-    }
-
-protected:
-    void setDefaults(osg::StateSet* stateset) override
-    {
-        stateset->setAttributeAndModes(createAlphaTrackingUnlitMaterial(), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
-    }
-
-    void apply(osg::StateSet* stateset, osg::NodeVisitor* /*nv*/) override
-    {
-        osg::Material* mat = static_cast<osg::Material*>(stateset->getAttribute(osg::StateAttribute::MATERIAL));
-        mat->setEmission(osg::Material::FRONT_AND_BACK, mEmissionColor);
-    }
-
-private:
-    osg::Vec4f mEmissionColor;
-};
-
-class AtmosphereNightUpdater : public SceneUtil::StateSetUpdater
-{
-public:
-    AtmosphereNightUpdater(Resource::ImageManager* imageManager)
-    {
-        // we just need a texture, its contents don't really matter
-        mTexture = new osg::Texture2D(imageManager->getWarningImage());
-    }
-
-    void setFade(const float fade)
-    {
-        mColor.a() = fade;
-    }
-
-protected:
-    void setDefaults(osg::StateSet* stateset) override
-    {
-        osg::ref_ptr<osg::TexEnvCombine> texEnv (new osg::TexEnvCombine);
-        texEnv->setCombine_Alpha(osg::TexEnvCombine::MODULATE);
-        texEnv->setSource0_Alpha(osg::TexEnvCombine::PREVIOUS);
-        texEnv->setSource1_Alpha(osg::TexEnvCombine::CONSTANT);
-        texEnv->setCombine_RGB(osg::TexEnvCombine::REPLACE);
-        texEnv->setSource0_RGB(osg::TexEnvCombine::PREVIOUS);
-
-        stateset->setTextureAttributeAndModes(1, mTexture, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
-        stateset->setTextureAttributeAndModes(1, texEnv, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
-    }
-
-    void apply(osg::StateSet* stateset, osg::NodeVisitor* /*nv*/) override
-    {
-        osg::TexEnvCombine* texEnv = static_cast<osg::TexEnvCombine*>(stateset->getTextureAttribute(1, osg::StateAttribute::TEXENV));
-        texEnv->setConstantColor(mColor);
-    }
-
-    osg::ref_ptr<osg::Texture2D> mTexture;
-
-    osg::Vec4f mColor;
-};
-
-class CloudUpdater : public SceneUtil::StateSetUpdater
-{
-public:
-    CloudUpdater()
-        : mAnimationTimer(0.f)
-        , mOpacity(0.f)
-    {
-    }
-
-    void setAnimationTimer(float timer)
-    {
-        mAnimationTimer = timer;
-    }
-
-    void setTexture(osg::ref_ptr<osg::Texture2D> texture)
-    {
-        mTexture = texture;
-    }
-    void setEmissionColor(const osg::Vec4f& emissionColor)
-    {
-        mEmissionColor = emissionColor;
-    }
-    void setOpacity(float opacity)
-    {
-        mOpacity = opacity;
-    }
-
-protected:
-    void setDefaults(osg::StateSet *stateset) override
-    {
-        osg::ref_ptr<osg::TexMat> texmat (new osg::TexMat);
-        stateset->setTextureAttributeAndModes(0, texmat, osg::StateAttribute::ON);
-        stateset->setTextureAttributeAndModes(1, texmat, osg::StateAttribute::ON);
-        stateset->setAttribute(createAlphaTrackingUnlitMaterial(), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
-
-        // need to set opacity on a separate texture unit, diffuse alpha is used by the vertex colors already
-        osg::ref_ptr<osg::TexEnvCombine> texEnvCombine (new osg::TexEnvCombine);
-        texEnvCombine->setSource0_RGB(osg::TexEnvCombine::PREVIOUS);
-        texEnvCombine->setSource0_Alpha(osg::TexEnvCombine::PREVIOUS);
-        texEnvCombine->setSource1_Alpha(osg::TexEnvCombine::CONSTANT);
-        texEnvCombine->setConstantColor(osg::Vec4f(1,1,1,1));
-        texEnvCombine->setCombine_Alpha(osg::TexEnvCombine::MODULATE);
-        texEnvCombine->setCombine_RGB(osg::TexEnvCombine::REPLACE);
-
-        stateset->setTextureAttributeAndModes(1, texEnvCombine, osg::StateAttribute::ON);
-
-        stateset->setTextureMode(0, GL_TEXTURE_2D, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
-        stateset->setTextureMode(1, GL_TEXTURE_2D, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
-    }
-
-    void apply(osg::StateSet *stateset, osg::NodeVisitor *nv) override
-    {
-        osg::TexMat* texMat = static_cast<osg::TexMat*>(stateset->getTextureAttribute(0, osg::StateAttribute::TEXMAT));
-        texMat->setMatrix(osg::Matrix::translate(osg::Vec3f(0, -mAnimationTimer, 0.f)));
-
-        stateset->setTextureAttribute(0, mTexture, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
-        stateset->setTextureAttribute(1, mTexture, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
-
-        osg::Material* mat = static_cast<osg::Material*>(stateset->getAttribute(osg::StateAttribute::MATERIAL));
-        mat->setEmission(osg::Material::FRONT_AND_BACK, mEmissionColor);
-
-        osg::TexEnvCombine* texEnvCombine = static_cast<osg::TexEnvCombine*>(stateset->getTextureAttribute(1, osg::StateAttribute::TEXENV));
-        texEnvCombine->setConstantColor(osg::Vec4f(1,1,1,mOpacity));
-    }
-
-private:
-    float mAnimationTimer;
-    osg::ref_ptr<osg::Texture2D> mTexture;
-    osg::Vec4f mEmissionColor;
-    float mOpacity;
-};
-
-/// Transform that removes the eyepoint of the modelview matrix,
-/// i.e. its children are positioned relative to the camera.
-class CameraRelativeTransform : public osg::Transform
-{
-public:
-    CameraRelativeTransform()
-    {
-        // Culling works in node-local space, not in camera space, so we can't cull this node correctly
-        // That's not a problem though, children of this node can be culled just fine
-        // Just make sure you do not place a CameraRelativeTransform deep in the scene graph
-        setCullingActive(false);
-
-        addCullCallback(new CullCallback);
-    }
-
-    CameraRelativeTransform(const CameraRelativeTransform& copy, const osg::CopyOp& copyop)
-        : osg::Transform(copy, copyop)
-    {
-    }
-
-    META_Node(MWRender, CameraRelativeTransform)
-
-    const osg::Vec3f& getLastViewPoint() const
-    {
-        return mViewPoint;
-    }
-
-    bool computeLocalToWorldMatrix(osg::Matrix& matrix, osg::NodeVisitor* nv) const override
-    {
-        if (nv->getVisitorType() == osg::NodeVisitor::CULL_VISITOR)
-        {
-            mViewPoint = static_cast<osgUtil::CullVisitor*>(nv)->getViewPoint();
-        }
-
-        if (_referenceFrame==RELATIVE_RF)
-        {
-            matrix.setTrans(osg::Vec3f(0.f,0.f,0.f));
-            return false;
-        }
-        else // absolute
-        {
-            matrix.makeIdentity();
-            return true;
-        }
-    }
-
-    osg::BoundingSphere computeBound() const override
-    {
-        return osg::BoundingSphere();
-    }
-
-    class CullCallback : public SceneUtil::NodeCallback<CullCallback, osg::Node*, osgUtil::CullVisitor*>
-    {
-    public:
-        void operator() (osg::Node* node, osgUtil::CullVisitor* cv)
-        {
-            // XXX have to remove unwanted culling plane of the water reflection camera
-
-            // Remove all planes that aren't from the standard frustum
-            unsigned int numPlanes = 4;
-            if (cv->getCullingMode() & osg::CullSettings::NEAR_PLANE_CULLING)
-                ++numPlanes;
-            if (cv->getCullingMode() & osg::CullSettings::FAR_PLANE_CULLING)
-                ++numPlanes;
-
-            unsigned int mask = 0x1;
-            unsigned int resultMask = cv->getProjectionCullingStack().back().getFrustum().getResultMask();
-            for (unsigned int i=0; i<cv->getProjectionCullingStack().back().getFrustum().getPlaneList().size(); ++i)
-            {
-                if (i >= numPlanes)
-                {
-                    // turn off this culling plane
-                    resultMask &= (~mask);
-                }
-
-                mask <<= 1;
-            }
-
-            cv->getProjectionCullingStack().back().getFrustum().setResultMask(resultMask);
-            cv->getCurrentCullingSet().getFrustum().setResultMask(resultMask);
-
-            cv->getProjectionCullingStack().back().pushCurrentMask();
-            cv->getCurrentCullingSet().pushCurrentMask();
-
-            traverse(node, cv);
-
-            cv->getProjectionCullingStack().back().popCurrentMask();
-            cv->getCurrentCullingSet().popCurrentMask();
-        }
-    };
-private:
-    // viewPoint for the current frame
-    mutable osg::Vec3f mViewPoint;
-};
-
-class ModVertexAlphaVisitor : public osg::NodeVisitor
-{
-public:
-    ModVertexAlphaVisitor(int meshType)
-        : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
-        , mMeshType(meshType)
-    {
-    }
-
-    void apply(osg::Drawable& drw) override
-    {
-        osg::Geometry* geom = drw.asGeometry();
-        if (!geom)
-            return;
-
-        osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array(geom->getVertexArray()->getNumElements());
-        for (unsigned int i=0; i<colors->size(); ++i)
-        {
-            float alpha = 1.f;
-            if (mMeshType == 0) alpha = (i%2) ? 0.f : 1.f; // this is a cylinder, so every second vertex belongs to the bottom-most row
-            else if (mMeshType == 1)
-            {
-                if (i>= 49 && i <= 64) alpha = 0.f; // bottom-most row
-                else if (i>= 33 && i <= 48) alpha = 0.25098; // second row
-                else alpha = 1.f;
-            }
-            else if (mMeshType == 2)
-            {
-                if (geom->getColorArray())
-                {
-                    osg::Vec4Array* origColors = static_cast<osg::Vec4Array*>(geom->getColorArray());
-                    alpha = ((*origColors)[i].x() == 1.f) ? 1.f : 0.f;
-                }
-                else
-                    alpha = 1.f;
-            }
-
-            (*colors)[i] = osg::Vec4f(0.f, 0.f, 0.f, alpha);
-        }
-
-        geom->setColorArray(colors, osg::Array::BIND_PER_VERTEX);
-    }
-
-private:
-    int mMeshType;
-};
-
-/// @brief Hides the node subgraph if the eye point is below water.
-/// @note Must be added as cull callback.
-/// @note Meant to be used on a node that is child of a CameraRelativeTransform.
-/// The current view point must be retrieved by the CameraRelativeTransform since we can't get it anymore once we are in camera-relative space.
-class UnderwaterSwitchCallback : public SceneUtil::NodeCallback<UnderwaterSwitchCallback>
-{
-public:
-    UnderwaterSwitchCallback(CameraRelativeTransform* cameraRelativeTransform)
-        : mCameraRelativeTransform(cameraRelativeTransform)
-        , mEnabled(true)
-        , mWaterLevel(0.f)
-    {
-    }
-
-    bool isUnderwater()
-    {
-        osg::Vec3f viewPoint = mCameraRelativeTransform->getLastViewPoint();
-        return mEnabled && viewPoint.z() < mWaterLevel;
-    }
-
-    void operator()(osg::Node* node, osg::NodeVisitor* nv)
-    {
-        if (isUnderwater())
-            return;
-
-        traverse(node, nv);
-    }
-
-    void setEnabled(bool enabled)
-    {
-        mEnabled = enabled;
-    }
-    void setWaterLevel(float waterLevel)
-    {
-        mWaterLevel = waterLevel;
-    }
-
-private:
-    osg::ref_ptr<CameraRelativeTransform> mCameraRelativeTransform;
-    bool mEnabled;
-    float mWaterLevel;
-};
-
-/// A base class for the sun and moons.
-class CelestialBody
-{
-public:
-    CelestialBody(osg::Group* parentNode, float scaleFactor, int numUvSets, unsigned int visibleMask=~0u)
-        : mVisibleMask(visibleMask)
-    {
-        mGeom = createTexturedQuad(numUvSets);
-        mTransform = new osg::PositionAttitudeTransform;
-        mTransform->setNodeMask(mVisibleMask);
-        mTransform->setScale(osg::Vec3f(450,450,450) * scaleFactor);
-        mTransform->addChild(mGeom);
-
-        parentNode->addChild(mTransform);
-    }
-
-    virtual ~CelestialBody() {}
-
-    virtual void adjustTransparency(const float ratio) = 0;
-
-    void setVisible(bool visible)
-    {
-        mTransform->setNodeMask(visible ? mVisibleMask : 0);
-    }
-
-protected:
-    unsigned int mVisibleMask;
-    static const float mDistance;
-    osg::ref_ptr<osg::PositionAttitudeTransform> mTransform;
-    osg::ref_ptr<osg::Geometry> mGeom;
-};
-
-const float CelestialBody::mDistance = 1000.0f;
-
-class Sun : public CelestialBody
-{
-public:
-    Sun(osg::Group* parentNode, Resource::ImageManager& imageManager)
-        : CelestialBody(parentNode, 1.0f, 1, Mask_Sun)
-        , mUpdater(new Updater)
-    {
-        mTransform->addUpdateCallback(mUpdater);
-
-        osg::ref_ptr<osg::Texture2D> sunTex (new osg::Texture2D(imageManager.getImage("textures/tx_sun_05.dds")));
-        sunTex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
-        sunTex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
-
-        mGeom->getOrCreateStateSet()->setTextureAttributeAndModes(0, sunTex, osg::StateAttribute::ON);
-
-        osg::ref_ptr<osg::Group> queryNode (new osg::Group);
-        // Need to render after the world geometry so we can correctly test for occlusions
-        osg::StateSet* stateset = queryNode->getOrCreateStateSet();
-        stateset->setRenderBinDetails(RenderBin_OcclusionQuery, "RenderBin");
-        stateset->setNestRenderBins(false);
-        // Set up alpha testing on the occlusion testing subgraph, that way we can get the occlusion tested fragments to match the circular shape of the sun
-        osg::ref_ptr<osg::AlphaFunc> alphaFunc (new osg::AlphaFunc);
-        alphaFunc->setFunction(osg::AlphaFunc::GREATER, 0.8);
-        stateset->setAttributeAndModes(alphaFunc, osg::StateAttribute::ON);
-        stateset->setTextureAttributeAndModes(0, sunTex, osg::StateAttribute::ON);
-        stateset->setAttributeAndModes(createUnlitMaterial(), osg::StateAttribute::ON);
-        // Disable writing to the color buffer. We are using this geometry for visibility tests only.
-        osg::ref_ptr<osg::ColorMask> colormask (new osg::ColorMask(0, 0, 0, 0));
-        stateset->setAttributeAndModes(colormask, osg::StateAttribute::ON);
-
-        mTransform->addChild(queryNode);
-
-        mOcclusionQueryVisiblePixels = createOcclusionQueryNode(queryNode, true);
-        mOcclusionQueryTotalPixels = createOcclusionQueryNode(queryNode, false);
-
-        createSunFlash(imageManager);
-        createSunGlare();
-    }
-
-    ~Sun()
-    {
-        mTransform->removeUpdateCallback(mUpdater);
-        destroySunFlash();
-        destroySunGlare();
-    }
-
-    void setColor(const osg::Vec4f& color)
-    {
-        mUpdater->mColor.r() = color.r();
-        mUpdater->mColor.g() = color.g();
-        mUpdater->mColor.b() = color.b();
-    }
-
-    void adjustTransparency(const float ratio) override
-    {
-        mUpdater->mColor.a() = ratio;
-        if (mSunGlareCallback)
-            mSunGlareCallback->setGlareView(ratio);
-        if (mSunFlashCallback)
-            mSunFlashCallback->setGlareView(ratio);
-    }
-
-    void setDirection(const osg::Vec3f& direction)
-    {
-        osg::Vec3f normalizedDirection = direction / direction.length();
-        mTransform->setPosition(normalizedDirection * mDistance);
-
-        osg::Quat quat;
-        quat.makeRotate(osg::Vec3f(0.0f, 0.0f, 1.0f), normalizedDirection);
-        mTransform->setAttitude(quat);
-    }
-
-    void setGlareTimeOfDayFade(float val)
-    {
-        if (mSunGlareCallback)
-            mSunGlareCallback->setTimeOfDayFade(val);
-    }
-
-private:
-    class DummyComputeBoundCallback : public osg::Node::ComputeBoundingSphereCallback
-    {
-    public:
-        osg::BoundingSphere computeBound(const osg::Node& node) const override { return osg::BoundingSphere(); }
-    };
-
-    /// @param queryVisible If true, queries the amount of visible pixels. If false, queries the total amount of pixels.
-    osg::ref_ptr<osg::OcclusionQueryNode> createOcclusionQueryNode(osg::Group* parent, bool queryVisible)
-    {
-        osg::ref_ptr<osg::OcclusionQueryNode> oqn = new osg::OcclusionQueryNode;
-        oqn->setQueriesEnabled(true);
-
-#if OSG_VERSION_GREATER_OR_EQUAL(3, 6, 5)
-        // With OSG 3.6.5, the method of providing user defined query geometry has been completely replaced
-        osg::ref_ptr<osg::QueryGeometry> queryGeom = new osg::QueryGeometry(oqn->getName());
-#else
-        osg::ref_ptr<osg::QueryGeometry> queryGeom = oqn->getQueryGeometry();
-#endif
-
-        // Make it fast! A DYNAMIC query geometry means we can't break frame until the flare is rendered (which is rendered after all the other geometry,
-        // so that would be pretty bad). STATIC should be safe, since our node's local bounds are static, thus computeBounds() which modifies the queryGeometry
-        // is only called once.
-        // Note the debug geometry setDebugDisplay(true) is always DYNAMIC and that can't be changed, not a big deal.
-        queryGeom->setDataVariance(osg::Object::STATIC);
-
-        // Set up the query geometry to match the actual sun's rendering shape. osg::OcclusionQueryNode wasn't originally intended to allow this,
-        // normally it would automatically adjust the query geometry to match the sub graph's bounding box. The below hack is needed to
-        // circumvent this.
-        queryGeom->setVertexArray(mGeom->getVertexArray());
-        queryGeom->setTexCoordArray(0, mGeom->getTexCoordArray(0), osg::Array::BIND_PER_VERTEX);
-        queryGeom->removePrimitiveSet(0, queryGeom->getNumPrimitiveSets());
-        queryGeom->addPrimitiveSet(mGeom->getPrimitiveSet(0));
-
-        // Hack to disable unwanted awful code inside OcclusionQueryNode::computeBound.
-        oqn->setComputeBoundingSphereCallback(new DummyComputeBoundCallback);
-        // Still need a proper bounding sphere.
-        oqn->setInitialBound(queryGeom->getBound());
-
-#if OSG_VERSION_GREATER_OR_EQUAL(3, 6, 5)
-        oqn->setQueryGeometry(queryGeom.release());
-#endif
-
-        osg::StateSet* queryStateSet = new osg::StateSet;
-        if (queryVisible)
-        {
-            auto depth = SceneUtil::createDepth();
-            // This is a trick to make fragments written by the query always use the maximum depth value,
-            // without having to retrieve the current far clipping distance.
-            // We want the sun glare to be "infinitely" far away.
-            double far = SceneUtil::getReverseZ() ? 0.0 : 1.0;
-            depth->setZNear(far);
-            depth->setZFar(far);
-            depth->setWriteMask(false);
-            queryStateSet->setAttributeAndModes(depth, osg::StateAttribute::ON);
-        }
-        else
-        {
-            queryStateSet->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
-        }
-        oqn->setQueryStateSet(queryStateSet);
-
-        parent->addChild(oqn);
-
-        return oqn;
-    }
-
-    void createSunFlash(Resource::ImageManager& imageManager)
-    {
-        osg::ref_ptr<osg::Texture2D> tex (new osg::Texture2D(imageManager.getImage("textures/tx_sun_flash_grey_05.dds")));
-        tex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
-        tex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
-
-        osg::ref_ptr<osg::Group> group (new osg::Group);
-
-        mTransform->addChild(group);
-
-        const float scale = 2.6f;
-        osg::ref_ptr<osg::Geometry> geom = createTexturedQuad(1, scale);
-        group->addChild(geom);
-
-        osg::StateSet* stateset = geom->getOrCreateStateSet();
-
-        stateset->setTextureAttributeAndModes(0, tex, osg::StateAttribute::ON);
-        stateset->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
-        stateset->setRenderBinDetails(RenderBin_SunGlare, "RenderBin");
-        stateset->setNestRenderBins(false);
-
-        mSunFlashNode = group;
-
-        mSunFlashCallback = new SunFlashCallback(mOcclusionQueryVisiblePixels, mOcclusionQueryTotalPixels);
-        mSunFlashNode->addCullCallback(mSunFlashCallback);
-    }
-    void destroySunFlash()
-    {
-        if (mSunFlashNode)
-        {
-            mSunFlashNode->removeCullCallback(mSunFlashCallback);
-            mSunFlashCallback = nullptr;
-        }
-    }
-
-    void createSunGlare()
-    {
-        osg::ref_ptr<osg::Camera> camera (new osg::Camera);
-        camera->setProjectionMatrix(osg::Matrix::identity());
-        camera->setReferenceFrame(osg::Transform::ABSOLUTE_RF); // add to skyRoot instead?
-        camera->setViewMatrix(osg::Matrix::identity());
-        camera->setClearMask(0);
-        camera->setRenderOrder(osg::Camera::NESTED_RENDER);
-        camera->setAllowEventFocus(false);
-
-        osg::ref_ptr<osg::Geometry> geom = osg::createTexturedQuadGeometry(osg::Vec3f(-1,-1,0), osg::Vec3f(2,0,0), osg::Vec3f(0,2,0));
-
-        camera->addChild(geom);
-
-        osg::StateSet* stateset = geom->getOrCreateStateSet();
-
-        stateset->setRenderBinDetails(RenderBin_SunGlare, "RenderBin");
-        stateset->setNestRenderBins(false);
-        stateset->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
-
-        // set up additive blending
-        osg::ref_ptr<osg::BlendFunc> blendFunc (new osg::BlendFunc);
-        blendFunc->setSource(osg::BlendFunc::SRC_ALPHA);
-        blendFunc->setDestination(osg::BlendFunc::ONE);
-        stateset->setAttributeAndModes(blendFunc, osg::StateAttribute::ON);
-
-        mSunGlareCallback = new SunGlareCallback(mOcclusionQueryVisiblePixels, mOcclusionQueryTotalPixels, mTransform);
-        mSunGlareNode = camera;
-
-        mSunGlareNode->addCullCallback(mSunGlareCallback);
-
-        mTransform->addChild(camera);
-    }
-    void destroySunGlare()
-    {
-        if (mSunGlareNode)
-        {
-            mSunGlareNode->removeCullCallback(mSunGlareCallback);
-            mSunGlareCallback = nullptr;
-        }
-    }
-
-    class Updater : public SceneUtil::StateSetUpdater
+    class WrapAroundOperator : public osgParticle::Operator
     {
     public:
-        osg::Vec4f mColor;
-
-        Updater()
-            : mColor(1.f, 1.f, 1.f, 1.f)
+        WrapAroundOperator(osg::Camera *camera, const osg::Vec3 &wrapRange)
+            : osgParticle::Operator()
+            , mCamera(camera)
+            , mWrapRange(wrapRange)
+            , mHalfWrapRange(mWrapRange / 2.0)
         {
+            mPreviousCameraPosition = getCameraPosition();
         }
 
-        void setDefaults(osg::StateSet* stateset) override
+        osg::Object *cloneType() const override
         {
-            stateset->setAttributeAndModes(createUnlitMaterial(), osg::StateAttribute::ON);
+            return nullptr;
         }
 
-        void apply(osg::StateSet* stateset, osg::NodeVisitor*) override
+        osg::Object *clone(const osg::CopyOp &op) const override
         {
-            osg::Material* mat = static_cast<osg::Material*>(stateset->getAttribute(osg::StateAttribute::MATERIAL));
-            mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0,0,0,mColor.a()));
-            mat->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(mColor.r(), mColor.g(), mColor.b(), 1));
+            return nullptr;
         }
-    };
 
-    class OcclusionCallback
-    {
-    public:
-        OcclusionCallback(osg::ref_ptr<osg::OcclusionQueryNode> oqnVisible, osg::ref_ptr<osg::OcclusionQueryNode> oqnTotal)
-            : mOcclusionQueryVisiblePixels(oqnVisible)
-            , mOcclusionQueryTotalPixels(oqnTotal)
+        void operate(osgParticle::Particle *P, double dt) override
         {
         }
 
-    protected:
-        float getVisibleRatio (osg::Camera* camera)
+        void operateParticles(osgParticle::ParticleSystem *ps, double dt) override
         {
-            int visible = mOcclusionQueryVisiblePixels->getQueryGeometry()->getNumPixels(camera);
-            int total = mOcclusionQueryTotalPixels->getQueryGeometry()->getNumPixels(camera);
-
-            float visibleRatio = 0.f;
-            if (total > 0)
-                visibleRatio = static_cast<float>(visible) / static_cast<float>(total);
-
-            float dt = MWBase::Environment::get().getFrameDuration();
-
-            float lastRatio = mLastRatio[osg::observer_ptr<osg::Camera>(camera)];
-
-            float change = dt*10;
-
-            if (visibleRatio > lastRatio)
-                visibleRatio = std::min(visibleRatio, lastRatio + change);
-            else
-                visibleRatio = std::max(visibleRatio, lastRatio - change);
-
-            mLastRatio[osg::observer_ptr<osg::Camera>(camera)] = visibleRatio;
-
-            return visibleRatio;
-        }
+            osg::Vec3 position = getCameraPosition();
+            osg::Vec3 positionDifference = position - mPreviousCameraPosition;
 
-    private:
-        osg::ref_ptr<osg::OcclusionQueryNode> mOcclusionQueryVisiblePixels;
-        osg::ref_ptr<osg::OcclusionQueryNode> mOcclusionQueryTotalPixels;
-
-        std::map<osg::observer_ptr<osg::Camera>, float> mLastRatio;
-    };
+            osg::Matrix toWorld, toLocal;
 
-    /// SunFlashCallback handles fading/scaling of a node depending on occlusion query result. Must be attached as a cull callback.
-    class SunFlashCallback : public OcclusionCallback, public SceneUtil::NodeCallback<SunFlashCallback, osg::Node*, osgUtil::CullVisitor*>
-    {
-    public:
-        SunFlashCallback(osg::ref_ptr<osg::OcclusionQueryNode> oqnVisible, osg::ref_ptr<osg::OcclusionQueryNode> oqnTotal)
-            : OcclusionCallback(oqnVisible, oqnTotal)
-            , mGlareView(1.f)
-        {
-        }
-
-        void operator()(osg::Node* node, osgUtil::CullVisitor* cv)
-        {
-            float visibleRatio = getVisibleRatio(cv->getCurrentCamera());
+            std::vector<osg::Matrix> worldMatrices = ps->getWorldMatrices();
 
-            osg::ref_ptr<osg::StateSet> stateset;
 
-            if (visibleRatio > 0.f)
+            if (!worldMatrices.empty())
             {
-                const float fadeThreshold = 0.1;
-                if (visibleRatio < fadeThreshold)
-                {
-                    float fade = 1.f - (fadeThreshold - visibleRatio) / fadeThreshold;
-                    osg::ref_ptr<osg::Material> mat (createUnlitMaterial());
-                    mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0,0,0,fade*mGlareView));
-                    stateset = new osg::StateSet;
-                    stateset->setAttributeAndModes(mat, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
-                }
-                else if (visibleRatio < 1.f)
-                {
-                    const float threshold = 0.6;
-                    visibleRatio = visibleRatio * (1.f - threshold) + threshold;
-                }
+                toWorld = worldMatrices[0];
+                toLocal.invert(toWorld);
             }
 
-            float scale = visibleRatio;
-
-            if (scale == 0.f)
-            {
-                // no traverse
-                return;
-            }
-            else if (scale == 1.f)
-                traverse(node, cv);
-            else
-            {
-                osg::Matrix modelView = *cv->getModelViewMatrix();
-
-                modelView.preMultScale(osg::Vec3f(scale, scale, scale));
-
-                if (stateset)
-                    cv->pushStateSet(stateset);
-
-                cv->pushModelViewMatrix(new osg::RefMatrix(modelView), osg::Transform::RELATIVE_RF);
-
-                traverse(node, cv);
-
-                cv->popModelViewMatrix();
-
-                if (stateset)
-                    cv->popStateSet();
-            }
-        }
-
-        void setGlareView(float value)
-        {
-            mGlareView = value;
-        }
-
-    private:
-        float mGlareView;
-    };
-
-
-    /// SunGlareCallback controls a full-screen glare effect depending on occlusion query result and the angle between sun and camera.
-    /// Must be attached as a cull callback to the node above the glare node.
-    class SunGlareCallback : public OcclusionCallback, public SceneUtil::NodeCallback<SunGlareCallback, osg::Node*, osgUtil::CullVisitor*>
-    {
-    public:
-        SunGlareCallback(osg::ref_ptr<osg::OcclusionQueryNode> oqnVisible, osg::ref_ptr<osg::OcclusionQueryNode> oqnTotal,
-                         osg::ref_ptr<osg::PositionAttitudeTransform> sunTransform)
-            : OcclusionCallback(oqnVisible, oqnTotal)
-            , mSunTransform(sunTransform)
-            , mTimeOfDayFade(1.f)
-            , mGlareView(1.f)
-        {
-            mColor = Fallback::Map::getColour("Weather_Sun_Glare_Fader_Color");
-            mSunGlareFaderMax = Fallback::Map::getFloat("Weather_Sun_Glare_Fader_Max");
-            mSunGlareFaderAngleMax = Fallback::Map::getFloat("Weather_Sun_Glare_Fader_Angle_Max");
-
-            // Replicating a design flaw in MW. The color was being set on both ambient and emissive properties, which multiplies the result by two,
-            // then finally gets clamped by the fixed function pipeline. With the default INI settings, only the red component gets clamped,
-            // so the resulting color looks more orange than red.
-            mColor *= 2;
-            for (int i=0; i<3; ++i)
-                mColor[i] = std::min(1.f, mColor[i]);
-        }
-
-        void operator ()(osg::Node* node, osgUtil::CullVisitor* cv)
-        {
-            float angleRadians = getAngleToSunInRadians(*cv->getCurrentRenderStage()->getInitialViewMatrix());
-            float visibleRatio = getVisibleRatio(cv->getCurrentCamera());
-
-            const float angleMaxRadians = osg::DegreesToRadians(mSunGlareFaderAngleMax);
-
-            float value = 1.f - std::min(1.f, angleRadians / angleMaxRadians);
-            float fade = value * mSunGlareFaderMax;
-
-            fade *= mTimeOfDayFade * mGlareView * visibleRatio;
-
-            if (fade == 0.f)
-            {
-                // no traverse
-                return;
-            }
-            else
+            for (int i = 0; i < ps->numParticles(); ++i)
             {
-                osg::ref_ptr<osg::StateSet> stateset (new osg::StateSet);
+                osgParticle::Particle *p = ps->getParticle(i);
+                p->setPosition(toWorld.preMult(p->getPosition()));
+                p->setPosition(p->getPosition() - positionDifference);
 
-                osg::ref_ptr<osg::Material> mat (createUnlitMaterial());
+                for (int j = 0; j < 3; ++j)  // wrap-around in all 3 dimensions
+                {
+                    osg::Vec3 pos = p->getPosition();
 
-                mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0,0,0,fade));
-                mat->setEmission(osg::Material::FRONT_AND_BACK, mColor);
+                    if (pos[j] < -mHalfWrapRange[j])
+                        pos[j] = mHalfWrapRange[j] + fmod(pos[j] - mHalfWrapRange[j],mWrapRange[j]);
+                    else if (pos[j] > mHalfWrapRange[j])
+                        pos[j] = fmod(pos[j] + mHalfWrapRange[j],mWrapRange[j]) - mHalfWrapRange[j];
 
-                stateset->setAttributeAndModes(mat, osg::StateAttribute::ON);
+                    p->setPosition(pos);
+                }
 
-                cv->pushStateSet(stateset);
-                traverse(node, cv);
-                cv->popStateSet();
+                p->setPosition(toLocal.preMult(p->getPosition()));
             }
-        }
 
-        void setTimeOfDayFade(float val)
-        {
-            mTimeOfDayFade = val;
+            mPreviousCameraPosition = position;
         }
 
-        void setGlareView(float glareView)
-        {
-            mGlareView = glareView;
-        }
+    protected:
+        osg::Camera *mCamera;
+        osg::Vec3 mPreviousCameraPosition;
+        osg::Vec3 mWrapRange;
+        osg::Vec3 mHalfWrapRange;
 
-    private:
-        float getAngleToSunInRadians(const osg::Matrix& viewMatrix) const
+        osg::Vec3 getCameraPosition()
         {
-            osg::Vec3d eye, center, up;
-            viewMatrix.getLookAt(eye, center, up);
-
-            osg::Vec3d forward = center - eye;
-            osg::Vec3d sun = mSunTransform->getPosition();
-
-            forward.normalize();
-            sun.normalize();
-            float angleRadians = std::acos(forward * sun);
-            return angleRadians;
+            return mCamera->getInverseViewMatrix().getTrans();
         }
-
-        osg::ref_ptr<osg::PositionAttitudeTransform> mSunTransform;
-        float mTimeOfDayFade;
-        float mGlareView;
-        osg::Vec4f mColor;
-        float mSunGlareFaderMax;
-        float mSunGlareFaderAngleMax;
     };
 
-    osg::ref_ptr<Updater> mUpdater;
-    osg::ref_ptr<SunFlashCallback> mSunFlashCallback;
-    osg::ref_ptr<osg::Node> mSunFlashNode;
-    osg::ref_ptr<SunGlareCallback> mSunGlareCallback;
-    osg::ref_ptr<osg::Node> mSunGlareNode;
-    osg::ref_ptr<osg::OcclusionQueryNode> mOcclusionQueryVisiblePixels;
-    osg::ref_ptr<osg::OcclusionQueryNode> mOcclusionQueryTotalPixels;
-};
-
-class Moon : public CelestialBody
-{
-public:
-    enum Type
-    {
-        Type_Masser = 0,
-        Type_Secunda
-    };
-
-    Moon(osg::Group* parentNode, Resource::ImageManager& imageManager, float scaleFactor, Type type)
-        : CelestialBody(parentNode, scaleFactor, 2)
-        , mType(type)
-        , mPhase(MoonState::Phase::Unspecified)
-        , mUpdater(new Updater(imageManager))
-    {
-        setPhase(MoonState::Phase::Full);
-        setVisible(true);
-
-        mGeom->addUpdateCallback(mUpdater);
-    }
-
-    ~Moon()
-    {
-        mGeom->removeUpdateCallback(mUpdater);
-    }
-
-    void adjustTransparency(const float ratio) override
-    {
-        mUpdater->mTransparency *= ratio;
-    }
-
-    void setState(const MoonState& state)
-    {
-        float radsX = ((state.mRotationFromHorizon) * static_cast<float>(osg::PI)) / 180.0f;
-        float radsZ = ((state.mRotationFromNorth) * static_cast<float>(osg::PI)) / 180.0f;
-
-        osg::Quat rotX(radsX, osg::Vec3f(1.0f, 0.0f, 0.0f));
-        osg::Quat rotZ(radsZ, osg::Vec3f(0.0f, 0.0f, 1.0f));
-
-        osg::Vec3f direction = rotX * rotZ * osg::Vec3f(0.0f, 1.0f, 0.0f);
-        mTransform->setPosition(direction * mDistance);
-
-        // The moon quad is initially oriented facing down, so we need to offset its X-axis
-        // rotation to rotate it to face the camera when sitting at the horizon.
-        osg::Quat attX((-static_cast<float>(osg::PI) / 2.0f) + radsX, osg::Vec3f(1.0f, 0.0f, 0.0f));
-        mTransform->setAttitude(attX * rotZ);
-
-        setPhase(state.mPhase);
-        mUpdater->mTransparency = state.mMoonAlpha;
-        mUpdater->mShadowBlend = state.mShadowBlend;
-    }
-
-    void setAtmosphereColor(const osg::Vec4f& color)
-    {
-        mUpdater->mAtmosphereColor = color;
-    }
-
-    void setColor(const osg::Vec4f& color)
-    {
-        mUpdater->mMoonColor = color;
-    }
-
-    unsigned int getPhaseInt() const
-    {
-        if      (mPhase == MoonState::Phase::New)              return 0;
-        else if (mPhase == MoonState::Phase::WaxingCrescent)   return 1;
-        else if (mPhase == MoonState::Phase::WaningCrescent)   return 1;
-        else if (mPhase == MoonState::Phase::FirstQuarter)     return 2;
-        else if (mPhase == MoonState::Phase::ThirdQuarter)     return 2;
-        else if (mPhase == MoonState::Phase::WaxingGibbous)    return 3;
-        else if (mPhase == MoonState::Phase::WaningGibbous)    return 3;
-        else if (mPhase == MoonState::Phase::Full)             return 4;
-        return 0;
-    }
-
-private:
-    struct Updater : public SceneUtil::StateSetUpdater
+    class WeatherAlphaOperator : public osgParticle::Operator
     {
-        Resource::ImageManager& mImageManager;
-        osg::ref_ptr<osg::Texture2D> mPhaseTex;
-        osg::ref_ptr<osg::Texture2D> mCircleTex;
-        float mTransparency;
-        float mShadowBlend;
-        osg::Vec4f mAtmosphereColor;
-        osg::Vec4f mMoonColor;
-
-        Updater(Resource::ImageManager& imageManager)
-            : mImageManager(imageManager)
-            , mPhaseTex()
-            , mCircleTex()
-            , mTransparency(1.0f)
-            , mShadowBlend(1.0f)
-            , mAtmosphereColor(1.0f, 1.0f, 1.0f, 1.0f)
-            , mMoonColor(1.0f, 1.0f, 1.0f, 1.0f)
-        {
-        }
-
-        void setDefaults(osg::StateSet* stateset) override
-        {
-            stateset->setTextureAttributeAndModes(0, mPhaseTex, osg::StateAttribute::ON);
-            osg::ref_ptr<osg::TexEnvCombine> texEnv = new osg::TexEnvCombine;
-            texEnv->setCombine_RGB(osg::TexEnvCombine::MODULATE);
-            texEnv->setSource0_RGB(osg::TexEnvCombine::CONSTANT);
-            texEnv->setSource1_RGB(osg::TexEnvCombine::TEXTURE);
-            texEnv->setConstantColor(osg::Vec4f(1.f, 0.f, 0.f, 1.f)); // mShadowBlend * mMoonColor
-            stateset->setTextureAttributeAndModes(0, texEnv, osg::StateAttribute::ON);
-
-            stateset->setTextureAttributeAndModes(1, mCircleTex, osg::StateAttribute::ON);
-            osg::ref_ptr<osg::TexEnvCombine> texEnv2 = new osg::TexEnvCombine;
-            texEnv2->setCombine_RGB(osg::TexEnvCombine::ADD);
-            texEnv2->setCombine_Alpha(osg::TexEnvCombine::MODULATE);
-            texEnv2->setSource0_Alpha(osg::TexEnvCombine::TEXTURE);
-            texEnv2->setSource1_Alpha(osg::TexEnvCombine::CONSTANT);
-            texEnv2->setSource0_RGB(osg::TexEnvCombine::PREVIOUS);
-            texEnv2->setSource1_RGB(osg::TexEnvCombine::CONSTANT);
-            texEnv2->setConstantColor(osg::Vec4f(0.f, 0.f, 0.f, 1.f)); // mAtmosphereColor.rgb, mTransparency
-            stateset->setTextureAttributeAndModes(1, texEnv2, osg::StateAttribute::ON);
-
-            stateset->setAttributeAndModes(createUnlitMaterial(), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
-        }
-
-        void apply(osg::StateSet* stateset, osg::NodeVisitor*) override
-        {
-            osg::TexEnvCombine* texEnv = static_cast<osg::TexEnvCombine*>(stateset->getTextureAttribute(0, osg::StateAttribute::TEXENV));
-            texEnv->setConstantColor(mMoonColor * mShadowBlend);
-
-            osg::TexEnvCombine* texEnv2 = static_cast<osg::TexEnvCombine*>(stateset->getTextureAttribute(1, osg::StateAttribute::TEXENV));
-            texEnv2->setConstantColor(osg::Vec4f(mAtmosphereColor.x(), mAtmosphereColor.y(), mAtmosphereColor.z(), mTransparency));
-        }
+    public:
+        WeatherAlphaOperator(float& alpha, bool rain)
+            : mAlpha(alpha)
+            , mIsRain(rain)
+        { }
 
-        void setTextures(const std::string& phaseTex, const std::string& circleTex)
+        osg::Object *cloneType() const override
         {
-            mPhaseTex = new osg::Texture2D(mImageManager.getImage(phaseTex));
-            mPhaseTex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
-            mPhaseTex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
-            mCircleTex = new osg::Texture2D(mImageManager.getImage(circleTex));
-            mCircleTex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
-            mCircleTex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
-
-            reset();
+            return nullptr;
         }
-    };
-
-    Type mType;
-    MoonState::Phase mPhase;
-    osg::ref_ptr<Updater> mUpdater;
-
-    void setPhase(const MoonState::Phase& phase)
-    {
-        if(mPhase == phase)
-            return;
-
-        mPhase = phase;
-
-        std::string textureName = "textures/tx_";
-
-        if (mType == Moon::Type_Secunda)
-            textureName += "secunda_";
-        else
-            textureName += "masser_";
-
-        if     (phase == MoonState::Phase::New)            textureName += "new";
-        else if(phase == MoonState::Phase::WaxingCrescent) textureName += "one_wax";
-        else if(phase == MoonState::Phase::FirstQuarter)   textureName += "half_wax";
-        else if(phase == MoonState::Phase::WaxingGibbous)  textureName += "three_wax";
-        else if(phase == MoonState::Phase::WaningCrescent) textureName += "one_wan";
-        else if(phase == MoonState::Phase::ThirdQuarter)   textureName += "half_wan";
-        else if(phase == MoonState::Phase::WaningGibbous)  textureName += "three_wan";
-        else if(phase == MoonState::Phase::Full)           textureName += "full";
-
-        textureName += ".dds";
-
-        if (mType == Moon::Type_Secunda)
-            mUpdater->setTextures(textureName, "textures/tx_mooncircle_full_s.dds");
-        else
-            mUpdater->setTextures(textureName, "textures/tx_mooncircle_full_m.dds");
-    }
-};
-
-SkyManager::SkyManager(osg::Group* parentNode, Resource::SceneManager* sceneManager)
-    : mSceneManager(sceneManager)
-    , mCamera(nullptr)
-    , mAtmosphereNightRoll(0.f)
-    , mCreated(false)
-    , mIsStorm(false)
-    , mDay(0)
-    , mMonth(0)
-    , mCloudAnimationTimer(0.f)
-    , mRainTimer(0.f)
-    , mStormDirection(0,1,0)
-    , mClouds()
-    , mNextClouds()
-    , mCloudBlendFactor(0.0f)
-    , mCloudSpeed(0.0f)
-    , mStarsOpacity(0.0f)
-    , mRemainingTransitionTime(0.0f)
-    , mRainEnabled(false)
-    , mRainSpeed(0)
-    , mRainDiameter(0)
-    , mRainMinHeight(0)
-    , mRainMaxHeight(0)
-    , mRainEntranceSpeed(1)
-    , mRainMaxRaindrops(0)
-    , mWindSpeed(0.f)
-    , mBaseWindSpeed(0.f)
-    , mEnabled(true)
-    , mSunEnabled(true)
-    , mPrecipitationAlpha(0.f)
-{
-    osg::ref_ptr<CameraRelativeTransform> skyroot (new CameraRelativeTransform);
-    skyroot->setName("Sky Root");
-    // Assign empty program to specify we don't want shaders
-    // The shaders generated by the SceneManager can't handle everything we need
-    skyroot->getOrCreateStateSet()->setAttributeAndModes(new osg::Program(), osg::StateAttribute::OVERRIDE|osg::StateAttribute::PROTECTED|osg::StateAttribute::ON);
-    SceneUtil::ShadowManager::disableShadowsForStateSet(skyroot->getOrCreateStateSet());
-
-    skyroot->setNodeMask(Mask_Sky);
-    parentNode->addChild(skyroot);
-
-    mRootNode = skyroot;
-
-    mEarlyRenderBinRoot = new osg::Group;
-    // render before the world is rendered
-    mEarlyRenderBinRoot->getOrCreateStateSet()->setRenderBinDetails(RenderBin_Sky, "RenderBin");
-    // Prevent unwanted clipping by water reflection camera's clipping plane
-    mEarlyRenderBinRoot->getOrCreateStateSet()->setMode(GL_CLIP_PLANE0, osg::StateAttribute::OFF);
-    mRootNode->addChild(mEarlyRenderBinRoot);
-
-    mUnderwaterSwitch = new UnderwaterSwitchCallback(skyroot);
-}
-
-void SkyManager::create()
-{
-    assert(!mCreated);
-
-    mAtmosphereDay = mSceneManager->getInstance(Settings::Manager::getString("skyatmosphere", "Models"), mEarlyRenderBinRoot);
-    ModVertexAlphaVisitor modAtmosphere(0);
-    mAtmosphereDay->accept(modAtmosphere);
-
-    mAtmosphereUpdater = new AtmosphereUpdater;
-    mAtmosphereDay->addUpdateCallback(mAtmosphereUpdater);
-
-    mAtmosphereNightNode = new osg::PositionAttitudeTransform;
-    mAtmosphereNightNode->setNodeMask(0);
-    mEarlyRenderBinRoot->addChild(mAtmosphereNightNode);
-
-    osg::ref_ptr<osg::Node> atmosphereNight;
-    if (mSceneManager->getVFS()->exists(Settings::Manager::getString("skynight02", "Models")))
-        atmosphereNight = mSceneManager->getInstance(Settings::Manager::getString("skynight02", "Models"), mAtmosphereNightNode);
-    else
-        atmosphereNight = mSceneManager->getInstance(Settings::Manager::getString("skynight01", "Models"), mAtmosphereNightNode);
-    atmosphereNight->getOrCreateStateSet()->setAttributeAndModes(createAlphaTrackingUnlitMaterial(), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
-    ModVertexAlphaVisitor modStars(2);
-    atmosphereNight->accept(modStars);
-    mAtmosphereNightUpdater = new AtmosphereNightUpdater(mSceneManager->getImageManager());
-    atmosphereNight->addUpdateCallback(mAtmosphereNightUpdater);
-
-    mSun.reset(new Sun(mEarlyRenderBinRoot, *mSceneManager->getImageManager()));
-
-    mMasser.reset(new Moon(mEarlyRenderBinRoot, *mSceneManager->getImageManager(), Fallback::Map::getFloat("Moons_Masser_Size")/125, Moon::Type_Masser));
-    mSecunda.reset(new Moon(mEarlyRenderBinRoot, *mSceneManager->getImageManager(), Fallback::Map::getFloat("Moons_Secunda_Size")/125, Moon::Type_Secunda));
-
-    mCloudNode = new osg::PositionAttitudeTransform;
-    mEarlyRenderBinRoot->addChild(mCloudNode);
-    mCloudMesh = mSceneManager->getInstance(Settings::Manager::getString("skyclouds", "Models"), mCloudNode);
-    ModVertexAlphaVisitor modClouds(1);
-    mCloudMesh->accept(modClouds);
-    mCloudUpdater = new CloudUpdater;
-    mCloudUpdater->setOpacity(1.f);
-    mCloudMesh->addUpdateCallback(mCloudUpdater);
-
-    mCloudMesh2 = mSceneManager->getInstance(Settings::Manager::getString("skyclouds", "Models"), mCloudNode);
-    mCloudMesh2->accept(modClouds);
-    mCloudUpdater2 = new CloudUpdater;
-    mCloudUpdater2->setOpacity(0.f);
-    mCloudMesh2->addUpdateCallback(mCloudUpdater2);
-    mCloudMesh2->setNodeMask(0);
-
-    auto depth = SceneUtil::createDepth();
-    depth->setWriteMask(false);
-    mEarlyRenderBinRoot->getOrCreateStateSet()->setAttributeAndModes(depth, osg::StateAttribute::ON);
-    mEarlyRenderBinRoot->getOrCreateStateSet()->setMode(GL_BLEND, osg::StateAttribute::ON);
-    mEarlyRenderBinRoot->getOrCreateStateSet()->setMode(GL_FOG, osg::StateAttribute::OFF);
-
-    mMoonScriptColor = Fallback::Map::getColour("Moons_Script_Color");
-
-    mCreated = true;
-}
-
-class RainCounter : public osgParticle::ConstantRateCounter
-{
-public:
-    int numParticlesToCreate(double dt) const override
-    {
-        // limit dt to avoid large particle emissions if there are jumps in the simulation time
-        // 0.2 seconds is the same cap as used in Engine's frame loop
-        dt = std::min(dt, 0.2);
-        return ConstantRateCounter::numParticlesToCreate(dt);
-    }
-};
-
-class RainShooter : public osgParticle::Shooter
-{
-public:
-    RainShooter()
-        : mAngle(0.f)
-    {
-    }
-
-    void shoot(osgParticle::Particle* particle) const override
-    {
-        particle->setVelocity(mVelocity);
-        particle->setAngle(osg::Vec3f(-mAngle, 0, (Misc::Rng::rollProbability() * 2 - 1) * osg::PI));
-    }
-
-    void setVelocity(const osg::Vec3f& velocity)
-    {
-        mVelocity = velocity;
-    }
-
-    void setAngle(float angle)
-    {
-        mAngle = angle;
-    }
 
-    osg::Object* cloneType() const override
-    {
-        return new RainShooter;
-    }
-    osg::Object* clone(const osg::CopyOp &) const override
-    {
-        return new RainShooter(*this);
-    }
+        osg::Object *clone(const osg::CopyOp &op) const override
+        {
+            return nullptr;
+        }
 
-private:
-    osg::Vec3f mVelocity;
-    float mAngle;
-};
+        void operate(osgParticle::Particle *particle, double dt) override
+        {
+            constexpr float rainThreshold = 0.6f; // Rain_Threshold?
+            float alpha = mIsRain ? mAlpha * rainThreshold : mAlpha;
+            particle->setAlphaRange(osgParticle::rangef(alpha, alpha));
+        }
 
-// Updater for alpha value on a node's StateSet. Assumes the node has an existing Material StateAttribute.
-class AlphaFader : public SceneUtil::StateSetUpdater
-{
-public:
-    /// @param alpha the variable alpha value is recovered from
-    AlphaFader(float& alpha)
-        : mAlpha(alpha)
-    {
-    }
+    private:
+        float &mAlpha;
+        bool mIsRain;
+    };
 
-    void setDefaults(osg::StateSet* stateset) override
+    // Updater for alpha value on a node's StateSet. Assumes the node has an existing Material StateAttribute.
+    class AlphaFader : public SceneUtil::StateSetUpdater
     {
-        // need to create a deep copy of StateAttributes we will modify
-        osg::Material* mat = static_cast<osg::Material*>(stateset->getAttribute(osg::StateAttribute::MATERIAL));
-        stateset->setAttribute(osg::clone(mat, osg::CopyOp::DEEP_COPY_ALL), osg::StateAttribute::ON);
-    }
+    public:
+        /// @param alpha the variable alpha value is recovered from
+        AlphaFader(const float& alpha)
+            : mAlpha(alpha)
+        { }
 
-    void apply(osg::StateSet* stateset, osg::NodeVisitor* nv) override
-    {
-        osg::Material* mat = static_cast<osg::Material*>(stateset->getAttribute(osg::StateAttribute::MATERIAL));
-        mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0,0,0,mAlpha));
-    }
+        void setDefaults(osg::StateSet* stateset) override
+        {
+            // need to create a deep copy of StateAttributes we will modify
+            osg::Material* mat = static_cast<osg::Material*>(stateset->getAttribute(osg::StateAttribute::MATERIAL));
+            stateset->setAttribute(osg::clone(mat, osg::CopyOp::DEEP_COPY_ALL), osg::StateAttribute::ON);
+        }
+
+        void apply(osg::StateSet* stateset, osg::NodeVisitor* nv) override
+        {
+            osg::Material* mat = static_cast<osg::Material*>(stateset->getAttribute(osg::StateAttribute::MATERIAL));
+            mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, mAlpha));
+        }
+
+    protected:
+        const float &mAlpha;
+    };
 
     // Helper for adding AlphaFaders to a subgraph
     class SetupVisitor : public osg::NodeVisitor
     {
     public:
-        SetupVisitor(float &alpha)
+        SetupVisitor(const float &alpha)
             : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
             , mAlpha(alpha)
-        {
-        }
+        { }
 
         void apply(osg::Node &node) override
         {
@@ -1320,7 +199,7 @@ public:
                         callback = callback->getNestedCallback();
                     }
 
-                    osg::ref_ptr<AlphaFader> alphaFader (new AlphaFader(mAlpha));
+                    osg::ref_ptr<AlphaFader> alphaFader = new AlphaFader(mAlpha);
 
                     if (composite)
                         composite->addController(alphaFader);
@@ -1333,608 +212,659 @@ public:
         }
 
     private:
-        float &mAlpha;
+        const float &mAlpha;
     };
-
-protected:
-    float &mAlpha;
-};
-
-void SkyManager::setCamera(osg::Camera *camera)
-{
-    mCamera = camera;
 }
 
-class WrapAroundOperator : public osgParticle::Operator
+namespace MWRender
 {
-public:
-    WrapAroundOperator(osg::Camera *camera, const osg::Vec3 &wrapRange): osgParticle::Operator(),
-        mCamera(camera), mWrapRange(wrapRange), mHalfWrapRange(mWrapRange / 2.0)
+    SkyManager::SkyManager(osg::Group* parentNode, Resource::SceneManager* sceneManager)
+        : mSceneManager(sceneManager)
+        , mCamera(nullptr)
+        , mAtmosphereNightRoll(0.f)
+        , mCreated(false)
+        , mIsStorm(false)
+        , mDay(0)
+        , mMonth(0)
+        , mCloudAnimationTimer(0.f)
+        , mRainTimer(0.f)
+        , mStormParticleDirection(MWWorld::Weather::defaultDirection())
+        , mStormDirection(MWWorld::Weather::defaultDirection())
+        , mClouds()
+        , mNextClouds()
+        , mCloudBlendFactor(0.f)
+        , mCloudSpeed(0.f)
+        , mStarsOpacity(0.f)
+        , mRemainingTransitionTime(0.f)
+        , mRainEnabled(false)
+        , mRainSpeed(0.f)
+        , mRainDiameter(0.f)
+        , mRainMinHeight(0.f)
+        , mRainMaxHeight(0.f)
+        , mRainEntranceSpeed(1.f)
+        , mRainMaxRaindrops(0)
+        , mWindSpeed(0.f)
+        , mBaseWindSpeed(0.f)
+        , mEnabled(true)
+        , mSunEnabled(true)
+        , mPrecipitationAlpha(0.f)
     {
-        mPreviousCameraPosition = getCameraPosition();
-    }
+        osg::ref_ptr<CameraRelativeTransform> skyroot = new CameraRelativeTransform;
+        skyroot->setName("Sky Root");
+        // Assign empty program to specify we don't want shaders when we are rendering in FFP pipeline
+        if (!mSceneManager->getForceShaders())
+            skyroot->getOrCreateStateSet()->setAttributeAndModes(new osg::Program(), osg::StateAttribute::OVERRIDE|osg::StateAttribute::PROTECTED|osg::StateAttribute::ON);
+        SceneUtil::ShadowManager::disableShadowsForStateSet(skyroot->getOrCreateStateSet());
 
-    osg::Object *cloneType() const override
-    {
-        return nullptr;
+        skyroot->setNodeMask(Mask_Sky);
+        parentNode->addChild(skyroot);
+
+        mRootNode = skyroot;
+
+        mEarlyRenderBinRoot = new osg::Group;
+        // render before the world is rendered
+        mEarlyRenderBinRoot->getOrCreateStateSet()->setRenderBinDetails(RenderBin_Sky, "RenderBin");
+        // Prevent unwanted clipping by water reflection camera's clipping plane
+        mEarlyRenderBinRoot->getOrCreateStateSet()->setMode(GL_CLIP_PLANE0, osg::StateAttribute::OFF);
+        mRootNode->addChild(mEarlyRenderBinRoot);
+
+        mUnderwaterSwitch = new UnderwaterSwitchCallback(skyroot);
     }
 
-    osg::Object *clone(const osg::CopyOp &op) const override
+    void SkyManager::create()
     {
-        return nullptr;
+        assert(!mCreated);
+
+        bool forceShaders = mSceneManager->getForceShaders();
+
+        mAtmosphereDay = mSceneManager->getInstance(Settings::Manager::getString("skyatmosphere", "Models"), mEarlyRenderBinRoot);
+        ModVertexAlphaVisitor modAtmosphere(ModVertexAlphaVisitor::Atmosphere);
+        mAtmosphereDay->accept(modAtmosphere);
+
+        mAtmosphereUpdater = new AtmosphereUpdater;
+        mAtmosphereDay->addUpdateCallback(mAtmosphereUpdater);
+
+        mAtmosphereNightNode = new osg::PositionAttitudeTransform;
+        mAtmosphereNightNode->setNodeMask(0);
+        mEarlyRenderBinRoot->addChild(mAtmosphereNightNode);
+
+        osg::ref_ptr<osg::Node> atmosphereNight;
+        if (mSceneManager->getVFS()->exists(Settings::Manager::getString("skynight02", "Models")))
+            atmosphereNight = mSceneManager->getInstance(Settings::Manager::getString("skynight02", "Models"), mAtmosphereNightNode);
+        else
+            atmosphereNight = mSceneManager->getInstance(Settings::Manager::getString("skynight01", "Models"), mAtmosphereNightNode);
+        atmosphereNight->getOrCreateStateSet()->setAttributeAndModes(createAlphaTrackingUnlitMaterial(), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+
+        ModVertexAlphaVisitor modStars(ModVertexAlphaVisitor::Stars);
+        atmosphereNight->accept(modStars);
+        mAtmosphereNightUpdater = new AtmosphereNightUpdater(mSceneManager->getImageManager(), forceShaders);
+        atmosphereNight->addUpdateCallback(mAtmosphereNightUpdater);
+
+        mSun.reset(new Sun(mEarlyRenderBinRoot, *mSceneManager->getImageManager()));
+        mMasser.reset(new Moon(mEarlyRenderBinRoot, *mSceneManager, Fallback::Map::getFloat("Moons_Masser_Size")/125, Moon::Type_Masser));
+        mSecunda.reset(new Moon(mEarlyRenderBinRoot, *mSceneManager, Fallback::Map::getFloat("Moons_Secunda_Size")/125, Moon::Type_Secunda));
+
+        mCloudNode = new osg::Group;
+        mEarlyRenderBinRoot->addChild(mCloudNode);
+
+        mCloudMesh = new osg::PositionAttitudeTransform;
+        osg::ref_ptr<osg::Node> cloudMeshChild = mSceneManager->getInstance(Settings::Manager::getString("skyclouds", "Models"), mCloudMesh);
+        mCloudUpdater = new CloudUpdater(forceShaders);
+        mCloudUpdater->setOpacity(1.f);
+        cloudMeshChild->addUpdateCallback(mCloudUpdater);
+        mCloudMesh->addChild(cloudMeshChild);
+
+        mNextCloudMesh = new osg::PositionAttitudeTransform;
+        osg::ref_ptr<osg::Node> nextCloudMeshChild = mSceneManager->getInstance(Settings::Manager::getString("skyclouds", "Models"), mNextCloudMesh);
+        mNextCloudUpdater = new CloudUpdater(forceShaders);
+        mNextCloudUpdater->setOpacity(0.f);
+        nextCloudMeshChild->addUpdateCallback(mNextCloudUpdater);
+        mNextCloudMesh->setNodeMask(0);
+        mNextCloudMesh->addChild(nextCloudMeshChild);
+
+        mCloudNode->addChild(mCloudMesh);
+        mCloudNode->addChild(mNextCloudMesh);
+
+        ModVertexAlphaVisitor modClouds(ModVertexAlphaVisitor::Clouds);
+        mCloudMesh->accept(modClouds);
+        mNextCloudMesh->accept(modClouds);
+
+        if (mSceneManager->getForceShaders())
+        {
+            auto vertex = mSceneManager->getShaderManager().getShader("sky_vertex.glsl", {}, osg::Shader::VERTEX);
+            auto fragment = mSceneManager->getShaderManager().getShader("sky_fragment.glsl", {}, osg::Shader::FRAGMENT);
+            auto program = mSceneManager->getShaderManager().getProgram(vertex, fragment);
+            mEarlyRenderBinRoot->getOrCreateStateSet()->addUniform(new osg::Uniform("pass", -1));
+            mEarlyRenderBinRoot->getOrCreateStateSet()->setAttributeAndModes(program, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+        }
+
+        auto depth = SceneUtil::createDepth();
+        depth->setWriteMask(false);
+        mEarlyRenderBinRoot->getOrCreateStateSet()->setAttributeAndModes(depth, osg::StateAttribute::ON);
+        mEarlyRenderBinRoot->getOrCreateStateSet()->setMode(GL_BLEND, osg::StateAttribute::ON);
+        mEarlyRenderBinRoot->getOrCreateStateSet()->setMode(GL_FOG, osg::StateAttribute::OFF);
+
+        mMoonScriptColor = Fallback::Map::getColour("Moons_Script_Color");
+
+        mCreated = true;
     }
 
-    void operate(osgParticle::Particle *P, double dt) override
+    void SkyManager::setCamera(osg::Camera *camera)
     {
+        mCamera = camera;
     }
 
-    void operateParticles(osgParticle::ParticleSystem *ps, double dt) override
+    void SkyManager::createRain()
     {
-        osg::Vec3 position = getCameraPosition();
-        osg::Vec3 positionDifference = position - mPreviousCameraPosition;
+        if (mRainNode)
+            return;
 
-        osg::Matrix toWorld, toLocal;
+        mRainNode = new osg::Group;
 
-        std::vector<osg::Matrix> worldMatrices = ps->getWorldMatrices();
- 
-        if (!worldMatrices.empty())
-        {
-            toWorld = worldMatrices[0];
-            toLocal.invert(toWorld);
-        }
+        mRainParticleSystem = new NifOsg::ParticleSystem;
+        osg::Vec3 rainRange = osg::Vec3(mRainDiameter, mRainDiameter, (mRainMinHeight+mRainMaxHeight)/2.f);
 
-        for (int i = 0; i < ps->numParticles(); ++i)
-        {
-            osgParticle::Particle *p = ps->getParticle(i);
-            p->setPosition(toWorld.preMult(p->getPosition()));
-            p->setPosition(p->getPosition() - positionDifference);
+        mRainParticleSystem->setParticleAlignment(osgParticle::ParticleSystem::FIXED);
+        mRainParticleSystem->setAlignVectorX(osg::Vec3f(0.1,0,0));
+        mRainParticleSystem->setAlignVectorY(osg::Vec3f(0,0,1));
 
-            for (int j = 0; j < 3; ++j)  // wrap-around in all 3 dimensions
-            {
-                osg::Vec3 pos = p->getPosition();
+        osg::ref_ptr<osg::StateSet> stateset = mRainParticleSystem->getOrCreateStateSet();
 
-                if (pos[j] < -mHalfWrapRange[j])
-                    pos[j] = mHalfWrapRange[j] + fmod(pos[j] - mHalfWrapRange[j],mWrapRange[j]);
-                else if (pos[j] > mHalfWrapRange[j])
-                    pos[j] = fmod(pos[j] + mHalfWrapRange[j],mWrapRange[j]) - mHalfWrapRange[j];
+        osg::ref_ptr<osg::Texture2D> raindropTex = new osg::Texture2D(mSceneManager->getImageManager()->getImage("textures/tx_raindrop_01.dds"));
+        raindropTex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+        raindropTex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
 
-                p->setPosition(pos);
-            }
+        stateset->setTextureAttributeAndModes(0, raindropTex, osg::StateAttribute::ON);
+        stateset->setNestRenderBins(false);
+        stateset->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
+        stateset->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
+        stateset->setMode(GL_BLEND, osg::StateAttribute::ON);
 
-            p->setPosition(toLocal.preMult(p->getPosition()));
-        }
+        osg::ref_ptr<osg::Material> mat = new osg::Material;
+        mat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
+        mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
+        mat->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
+        stateset->setAttributeAndModes(mat, osg::StateAttribute::ON);
 
-        mPreviousCameraPosition = position;
-    }
+        osgParticle::Particle& particleTemplate = mRainParticleSystem->getDefaultParticleTemplate();
+        particleTemplate.setSizeRange(osgParticle::rangef(5.f, 15.f));
+        particleTemplate.setAlphaRange(osgParticle::rangef(1.f, 1.f));
+        particleTemplate.setLifeTime(1);
 
-protected:
-    osg::Camera *mCamera;
-    osg::Vec3 mPreviousCameraPosition;
-    osg::Vec3 mWrapRange;
-    osg::Vec3 mHalfWrapRange;
+        osg::ref_ptr<osgParticle::ModularEmitter> emitter = new osgParticle::ModularEmitter;
+        emitter->setParticleSystem(mRainParticleSystem);
 
-    osg::Vec3 getCameraPosition()
-    {
-        return mCamera->getInverseViewMatrix().getTrans();
+        osg::ref_ptr<osgParticle::BoxPlacer> placer = new osgParticle::BoxPlacer;
+        placer->setXRange(-rainRange.x() / 2, rainRange.x() / 2);
+        placer->setYRange(-rainRange.y() / 2, rainRange.y() / 2);
+        placer->setZRange(-rainRange.z() / 2, rainRange.z() / 2);
+        emitter->setPlacer(placer);
+        mPlacer = placer;
+
+        // FIXME: vanilla engine does not use a particle system to handle rain, it uses a NIF-file with 20 raindrops in it.
+        // It spawns the (maxRaindrops-getParticleSystem()->numParticles())*dt/rainEntranceSpeed batches every frame (near 1-2).
+        // Since the rain is a regular geometry, it produces water ripples, also in theory it can be removed if collides with something.
+        osg::ref_ptr<RainCounter> counter = new RainCounter;
+        counter->setNumberOfParticlesPerSecondToCreate(mRainMaxRaindrops/mRainEntranceSpeed*20);
+        emitter->setCounter(counter);
+        mCounter = counter;
+
+        osg::ref_ptr<RainShooter> shooter = new RainShooter;
+        mRainShooter = shooter;
+        emitter->setShooter(shooter);
+
+        osg::ref_ptr<osgParticle::ParticleSystemUpdater> updater = new osgParticle::ParticleSystemUpdater;
+        updater->addParticleSystem(mRainParticleSystem);
+
+        osg::ref_ptr<osgParticle::ModularProgram> program = new osgParticle::ModularProgram;
+        program->addOperator(new WrapAroundOperator(mCamera,rainRange));
+        program->addOperator(new WeatherAlphaOperator(mPrecipitationAlpha, true));
+        program->setParticleSystem(mRainParticleSystem);
+        mRainNode->addChild(program);
+
+        mRainNode->addChild(emitter);
+        mRainNode->addChild(mRainParticleSystem);
+        mRainNode->addChild(updater);
+
+        // Note: if we ever switch to regular geometry rain, it'll need to use an AlphaFader.
+        mRainNode->addCullCallback(mUnderwaterSwitch);
+        mRainNode->setNodeMask(Mask_WeatherParticles);
+
+        mRainParticleSystem->setUserValue("simpleLighting", true);
+        mSceneManager->recreateShaders(mRainNode);
+
+        mRootNode->addChild(mRainNode);
     }
-};
 
-class WeatherAlphaOperator : public osgParticle::Operator
-{
-public:
-    WeatherAlphaOperator(float& alpha, bool rain)
-        : mAlpha(alpha)
-        , mIsRain(rain)
+    void SkyManager::destroyRain()
     {
+        if (!mRainNode)
+            return;
+
+        mRootNode->removeChild(mRainNode);
+        mRainNode = nullptr;
+        mPlacer = nullptr;
+        mCounter = nullptr;
+        mRainParticleSystem = nullptr;
+        mRainShooter = nullptr;
     }
 
-    osg::Object *cloneType() const override
+    SkyManager::~SkyManager()
     {
-        return nullptr;
+        if (mRootNode)
+        {
+            mRootNode->getParent(0)->removeChild(mRootNode);
+            mRootNode = nullptr;
+        }
     }
 
-    osg::Object *clone(const osg::CopyOp &op) const override
+    int SkyManager::getMasserPhase() const
     {
-        return nullptr;
+        if (!mCreated) return 0;
+        return mMasser->getPhaseInt();
     }
 
-    void operate(osgParticle::Particle *particle, double dt) override
+    int SkyManager::getSecundaPhase() const
     {
-        constexpr float rainThreshold = 0.6f; // Rain_Threshold?
-        const float alpha = mIsRain ? mAlpha * rainThreshold : mAlpha;
-        particle->setAlphaRange(osgParticle::rangef(alpha, alpha));
+        if (!mCreated) return 0;
+        return mSecunda->getPhaseInt();
     }
 
-private:
-    float &mAlpha;
-    bool mIsRain;
-};
-
-void SkyManager::createRain()
-{
-    if (mRainNode)
-        return;
-
-    mRainNode = new osg::Group;
-
-    mRainParticleSystem = new NifOsg::ParticleSystem;
-    osg::Vec3 rainRange = osg::Vec3(mRainDiameter, mRainDiameter, (mRainMinHeight+mRainMaxHeight)/2.f);
-
-    mRainParticleSystem->setParticleAlignment(osgParticle::ParticleSystem::FIXED);
-    mRainParticleSystem->setAlignVectorX(osg::Vec3f(0.1,0,0));
-    mRainParticleSystem->setAlignVectorY(osg::Vec3f(0,0,1));
-
-    osg::ref_ptr<osg::StateSet> stateset (mRainParticleSystem->getOrCreateStateSet());
-
-    osg::ref_ptr<osg::Texture2D> raindropTex (new osg::Texture2D(mSceneManager->getImageManager()->getImage("textures/tx_raindrop_01.dds")));
-    raindropTex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
-    raindropTex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
-
-    stateset->setTextureAttributeAndModes(0, raindropTex, osg::StateAttribute::ON);
-    stateset->setNestRenderBins(false);
-    stateset->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
-    stateset->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
-    stateset->setMode(GL_BLEND, osg::StateAttribute::ON);
-
-    osg::ref_ptr<osg::Material> mat (new osg::Material);
-    mat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
-    mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
-    mat->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
-    stateset->setAttributeAndModes(mat, osg::StateAttribute::ON);
-
-    osgParticle::Particle& particleTemplate = mRainParticleSystem->getDefaultParticleTemplate();
-    particleTemplate.setSizeRange(osgParticle::rangef(5.f, 15.f));
-    particleTemplate.setAlphaRange(osgParticle::rangef(1.f, 1.f));
-    particleTemplate.setLifeTime(1);
-
-    osg::ref_ptr<osgParticle::ModularEmitter> emitter (new osgParticle::ModularEmitter);
-    emitter->setParticleSystem(mRainParticleSystem);
-
-    osg::ref_ptr<osgParticle::BoxPlacer> placer (new osgParticle::BoxPlacer);
-    placer->setXRange(-rainRange.x() / 2, rainRange.x() / 2);
-    placer->setYRange(-rainRange.y() / 2, rainRange.y() / 2);
-    placer->setZRange(-rainRange.z() / 2, rainRange.z() / 2);
-    emitter->setPlacer(placer);
-    mPlacer = placer;
-
-    // FIXME: vanilla engine does not use a particle system to handle rain, it uses a NIF-file with 20 raindrops in it.
-    // It spawns the (maxRaindrops-getParticleSystem()->numParticles())*dt/rainEntranceSpeed batches every frame (near 1-2).
-    // Since the rain is a regular geometry, it produces water ripples, also in theory it can be removed if collides with something.
-    osg::ref_ptr<RainCounter> counter (new RainCounter);
-    counter->setNumberOfParticlesPerSecondToCreate(mRainMaxRaindrops/mRainEntranceSpeed*20);
-    emitter->setCounter(counter);
-    mCounter = counter;
-
-    osg::ref_ptr<RainShooter> shooter (new RainShooter);
-    mRainShooter = shooter;
-    emitter->setShooter(shooter);
-
-    osg::ref_ptr<osgParticle::ParticleSystemUpdater> updater (new osgParticle::ParticleSystemUpdater);
-    updater->addParticleSystem(mRainParticleSystem);
-
-    osg::ref_ptr<osgParticle::ModularProgram> program (new osgParticle::ModularProgram);
-    program->addOperator(new WrapAroundOperator(mCamera,rainRange));
-    program->addOperator(new WeatherAlphaOperator(mPrecipitationAlpha, true));
-    program->setParticleSystem(mRainParticleSystem);
-    mRainNode->addChild(program);
-
-    mRainNode->addChild(emitter);
-    mRainNode->addChild(mRainParticleSystem);
-    mRainNode->addChild(updater);
-
-    // Note: if we ever switch to regular geometry rain, it'll need to use an AlphaFader.
-    mRainNode->addCullCallback(mUnderwaterSwitch);
-    mRainNode->setNodeMask(Mask_WeatherParticles);
-
-    mRootNode->addChild(mRainNode);
-}
-
-void SkyManager::destroyRain()
-{
-    if (!mRainNode)
-        return;
-
-    mRootNode->removeChild(mRainNode);
-    mRainNode = nullptr;
-    mPlacer = nullptr;
-    mCounter = nullptr;
-    mRainParticleSystem = nullptr;
-    mRainShooter = nullptr;
-}
-
-SkyManager::~SkyManager()
-{
-    if (mRootNode)
+    bool SkyManager::isEnabled()
     {
-        mRootNode->getParent(0)->removeChild(mRootNode);
-        mRootNode = nullptr;
+        return mEnabled;
     }
-}
-
-int SkyManager::getMasserPhase() const
-{
-    if (!mCreated) return 0;
-    return mMasser->getPhaseInt();
-}
-
-int SkyManager::getSecundaPhase() const
-{
-    if (!mCreated) return 0;
-    return mSecunda->getPhaseInt();
-}
-
-bool SkyManager::isEnabled()
-{
-    return mEnabled;
-}
 
-bool SkyManager::hasRain() const
-{
-    return mRainNode != nullptr;
-}
-
-float SkyManager::getPrecipitationAlpha() const
-{
-    if (mEnabled && !mIsStorm && (hasRain() || mParticleNode))
-        return mPrecipitationAlpha;
-
-    return 0.f;
-}
+    bool SkyManager::hasRain() const
+    {
+        return mRainNode != nullptr;
+    }
 
-void SkyManager::update(float duration)
-{
-    if (!mEnabled)
-        return;
+    float SkyManager::getPrecipitationAlpha() const
+    {
+        if (mEnabled && !mIsStorm && (hasRain() || mParticleNode))
+            return mPrecipitationAlpha;
 
-    switchUnderwaterRain();
+        return 0.f;
+    }
 
-    if (mIsStorm)
+    void SkyManager::update(float duration)
     {
-        osg::Quat quat;
-        quat.makeRotate(osg::Vec3f(0,1,0), mStormDirection);
+        if (!mEnabled)
+            return;
 
-        mCloudNode->setAttitude(quat);
-        if (mParticleNode)
+        switchUnderwaterRain();
+
+        if (mIsStorm && mParticleNode)
         {
+            osg::Quat quat;
+            quat.makeRotate(MWWorld::Weather::defaultDirection(), mStormParticleDirection);
             // Morrowind deliberately rotates the blizzard mesh, so so should we.
             if (mCurrentParticleEffect == Settings::Manager::getString("weatherblizzard", "Models"))
-                quat.makeRotate(osg::Vec3f(-1,0,0), mStormDirection);
+                quat.makeRotate(osg::Vec3f(-1,0,0), mStormParticleDirection);
             mParticleNode->setAttitude(quat);
         }
-    }
-    else
-        mCloudNode->setAttitude(osg::Quat());
-
-    // UV Scroll the clouds
-    mCloudAnimationTimer += duration * mCloudSpeed * 0.003;
-    mCloudUpdater->setAnimationTimer(mCloudAnimationTimer);
-    mCloudUpdater2->setAnimationTimer(mCloudAnimationTimer);
-
-    // rotate the stars by 360 degrees every 4 days
-    mAtmosphereNightRoll += MWBase::Environment::get().getWorld()->getTimeScaleFactor()*duration*osg::DegreesToRadians(360.f) / (3600*96.f);
-    if (mAtmosphereNightNode->getNodeMask() != 0)
-        mAtmosphereNightNode->setAttitude(osg::Quat(mAtmosphereNightRoll, osg::Vec3f(0,0,1)));
-}
 
-void SkyManager::setEnabled(bool enabled)
-{
-    if (enabled && !mCreated)
-        create();
+        // UV Scroll the clouds
+        mCloudAnimationTimer += duration * mCloudSpeed * 0.003;
+        mNextCloudUpdater->setTextureCoord(mCloudAnimationTimer);
+        mCloudUpdater->setTextureCoord(mCloudAnimationTimer);
 
-    mRootNode->setNodeMask(enabled ? Mask_Sky : 0u);
+        // morrowind rotates each cloud mesh independently
+        osg::Quat rotation;
+        rotation.makeRotate(MWWorld::Weather::defaultDirection(), mStormDirection);
+        mCloudMesh->setAttitude(rotation);
 
-    mEnabled = enabled;
-}
+        if (mNextCloudMesh->getNodeMask())
+        {
+            rotation.makeRotate(MWWorld::Weather::defaultDirection(), mNextStormDirection);
+            mNextCloudMesh->setAttitude(rotation);
+        }
 
-void SkyManager::setMoonColour (bool red)
-{
-    if (!mCreated) return;
-    mSecunda->setColor(red ? mMoonScriptColor : osg::Vec4f(1,1,1,1));
-}
+        // rotate the stars by 360 degrees every 4 days
+        mAtmosphereNightRoll += MWBase::Environment::get().getWorld()->getTimeScaleFactor()*duration*osg::DegreesToRadians(360.f) / (3600*96.f);
+        if (mAtmosphereNightNode->getNodeMask() != 0)
+            mAtmosphereNightNode->setAttitude(osg::Quat(mAtmosphereNightRoll, osg::Vec3f(0,0,1)));
+    }
 
-void SkyManager::updateRainParameters()
-{
-    if (mRainShooter)
+    void SkyManager::setEnabled(bool enabled)
     {
-        float angle = -std::atan(mWindSpeed/50.f);
-        mRainShooter->setVelocity(osg::Vec3f(0, mRainSpeed*std::sin(angle), -mRainSpeed/std::cos(angle)));
-        mRainShooter->setAngle(angle);
+        if (enabled && !mCreated)
+            create();
 
-        osg::Vec3 rainRange = osg::Vec3(mRainDiameter, mRainDiameter, (mRainMinHeight+mRainMaxHeight)/2.f);
+        mRootNode->setNodeMask(enabled ? Mask_Sky : 0u);
 
-        mPlacer->setXRange(-rainRange.x() / 2, rainRange.x() / 2);
-        mPlacer->setYRange(-rainRange.y() / 2, rainRange.y() / 2);
-        mPlacer->setZRange(-rainRange.z() / 2, rainRange.z() / 2);
+        if (!enabled && mParticleNode && mParticleEffect)
+            mCurrentParticleEffect = {};
 
-        mCounter->setNumberOfParticlesPerSecondToCreate(mRainMaxRaindrops/mRainEntranceSpeed*20);
+        mEnabled = enabled;
     }
-}
-
-void SkyManager::switchUnderwaterRain()
-{
-    if (!mRainParticleSystem)
-        return;
 
-    bool freeze = mUnderwaterSwitch->isUnderwater();
-    mRainParticleSystem->setFrozen(freeze);
-}
+    void SkyManager::setMoonColour (bool red)
+    {
+        if (!mCreated) return;
+        mSecunda->setColor(red ? mMoonScriptColor : osg::Vec4f(1,1,1,1));
+    }
 
-void SkyManager::setWeather(const WeatherResult& weather)
-{
-    if (!mCreated) return;
-
-    mRainEntranceSpeed = weather.mRainEntranceSpeed;
-    mRainMaxRaindrops = weather.mRainMaxRaindrops;
-    mRainDiameter = weather.mRainDiameter;
-    mRainMinHeight = weather.mRainMinHeight;
-    mRainMaxHeight = weather.mRainMaxHeight;
-    mRainSpeed = weather.mRainSpeed;
-    mWindSpeed = weather.mWindSpeed;
-    mBaseWindSpeed = weather.mBaseWindSpeed;
-
-    if (mRainEffect != weather.mRainEffect)
+    void SkyManager::updateRainParameters()
     {
-        mRainEffect = weather.mRainEffect;
-        if (!mRainEffect.empty())
+        if (mRainShooter)
         {
-            createRain();
-        }
-        else
-        {
-            destroyRain();
+            float angle = -std::atan(mWindSpeed/50.f);
+            mRainShooter->setVelocity(osg::Vec3f(0, mRainSpeed*std::sin(angle), -mRainSpeed/std::cos(angle)));
+            mRainShooter->setAngle(angle);
+
+            osg::Vec3 rainRange = osg::Vec3(mRainDiameter, mRainDiameter, (mRainMinHeight+mRainMaxHeight)/2.f);
+
+            mPlacer->setXRange(-rainRange.x() / 2, rainRange.x() / 2);
+            mPlacer->setYRange(-rainRange.y() / 2, rainRange.y() / 2);
+            mPlacer->setZRange(-rainRange.z() / 2, rainRange.z() / 2);
+
+            mCounter->setNumberOfParticlesPerSecondToCreate(mRainMaxRaindrops/mRainEntranceSpeed*20);
         }
     }
 
-    updateRainParameters();
+    void SkyManager::switchUnderwaterRain()
+    {
+        if (!mRainParticleSystem)
+            return;
 
-    mIsStorm = weather.mIsStorm;
+        bool freeze = mUnderwaterSwitch->isUnderwater();
+        mRainParticleSystem->setFrozen(freeze);
+    }
 
-    if (mCurrentParticleEffect != weather.mParticleEffect)
+    void SkyManager::setWeather(const WeatherResult& weather)
     {
-        mCurrentParticleEffect = weather.mParticleEffect;
+        if (!mCreated) return;
 
-        // cleanup old particles
-        if (mParticleEffect)
-        {
-            mParticleNode->removeChild(mParticleEffect);
-            mParticleEffect = nullptr;
-        }
+        mRainEntranceSpeed = weather.mRainEntranceSpeed;
+        mRainMaxRaindrops = weather.mRainMaxRaindrops;
+        mRainDiameter = weather.mRainDiameter;
+        mRainMinHeight = weather.mRainMinHeight;
+        mRainMaxHeight = weather.mRainMaxHeight;
+        mRainSpeed = weather.mRainSpeed;
+        mWindSpeed = weather.mWindSpeed;
+        mBaseWindSpeed = weather.mBaseWindSpeed;
 
-        if (mCurrentParticleEffect.empty())
+        if (mRainEffect != weather.mRainEffect)
         {
-            if (mParticleNode)
+            mRainEffect = weather.mRainEffect;
+            if (!mRainEffect.empty())
             {
-                mRootNode->removeChild(mParticleNode);
-                mParticleNode = nullptr;
+                createRain();
             }
-        }
-        else
-        {
-            if (!mParticleNode)
+            else
             {
-                mParticleNode = new osg::PositionAttitudeTransform;
-                mParticleNode->addCullCallback(mUnderwaterSwitch);
-                mParticleNode->setNodeMask(Mask_WeatherParticles);
-                mRootNode->addChild(mParticleNode);
+                destroyRain();
             }
+        }
 
-            mParticleEffect = mSceneManager->getInstance(mCurrentParticleEffect, mParticleNode);
+        updateRainParameters();
 
-            SceneUtil::AssignControllerSourcesVisitor assignVisitor(std::shared_ptr<SceneUtil::ControllerSource>(new SceneUtil::FrameTimeSource));
-            mParticleEffect->accept(assignVisitor);
+        mIsStorm = weather.mIsStorm;
 
-            AlphaFader::SetupVisitor alphaFaderSetupVisitor(mPrecipitationAlpha);
+        if (mIsStorm)
+            mStormDirection = weather.mStormDirection;
 
-            mParticleEffect->accept(alphaFaderSetupVisitor);
+        if (mCurrentParticleEffect != weather.mParticleEffect)
+        {
+            mCurrentParticleEffect = weather.mParticleEffect;
 
-            SceneUtil::FindByClassVisitor findPSVisitor(std::string("ParticleSystem"));
-            mParticleEffect->accept(findPSVisitor);
+            // cleanup old particles
+            if (mParticleEffect)
+            {
+                mParticleNode->removeChild(mParticleEffect);
+                mParticleEffect = nullptr;
+            }
 
-            for (unsigned int i = 0; i < findPSVisitor.mFoundNodes.size(); ++i)
+            if (mCurrentParticleEffect.empty())
             {
-                osgParticle::ParticleSystem *ps = static_cast<osgParticle::ParticleSystem *>(findPSVisitor.mFoundNodes[i]);
-                    
-                osg::ref_ptr<osgParticle::ModularProgram> program (new osgParticle::ModularProgram);
-                if (!mIsStorm)
-                    program->addOperator(new WrapAroundOperator(mCamera,osg::Vec3(1024,1024,800)));
-                program->addOperator(new WeatherAlphaOperator(mPrecipitationAlpha, false));
-                program->setParticleSystem(ps);
-                mParticleNode->addChild(program);
+                if (mParticleNode)
+                {
+                    mRootNode->removeChild(mParticleNode);
+                    mParticleNode = nullptr;
+                }
             }
-        }
-    }
+            else
+            {
+                if (!mParticleNode)
+                {
+                    mParticleNode = new osg::PositionAttitudeTransform;
+                    mParticleNode->addCullCallback(mUnderwaterSwitch);
+                    mParticleNode->setNodeMask(Mask_WeatherParticles);
+                    mParticleNode->getOrCreateStateSet();
+                    mRootNode->addChild(mParticleNode);
+                }
 
-    if (mClouds != weather.mCloudTexture)
-    {
-        mClouds = weather.mCloudTexture;
+                mParticleEffect = mSceneManager->getInstance(mCurrentParticleEffect, mParticleNode);
 
-        std::string texture = Misc::ResourceHelpers::correctTexturePath(mClouds, mSceneManager->getVFS());
+                SceneUtil::AssignControllerSourcesVisitor assignVisitor = std::shared_ptr<SceneUtil::ControllerSource>(new SceneUtil::FrameTimeSource);
+                mParticleEffect->accept(assignVisitor);
 
-        osg::ref_ptr<osg::Texture2D> cloudTex (new osg::Texture2D(mSceneManager->getImageManager()->getImage(texture)));
-        cloudTex->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
-        cloudTex->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
+                SetupVisitor alphaFaderSetupVisitor(mPrecipitationAlpha);
+                mParticleEffect->accept(alphaFaderSetupVisitor);
 
-        mCloudUpdater->setTexture(cloudTex);
-    }
+                SceneUtil::FindByClassVisitor findPSVisitor(std::string("ParticleSystem"));
+                mParticleEffect->accept(findPSVisitor);
 
-    if (mNextClouds != weather.mNextCloudTexture)
-    {
-        mNextClouds = weather.mNextCloudTexture;
+                for (unsigned int i = 0; i < findPSVisitor.mFoundNodes.size(); ++i)
+                {
+                    osgParticle::ParticleSystem *ps = static_cast<osgParticle::ParticleSystem *>(findPSVisitor.mFoundNodes[i]);
+
+                    osg::ref_ptr<osgParticle::ModularProgram> program = new osgParticle::ModularProgram;
+                    if (!mIsStorm)
+                        program->addOperator(new WrapAroundOperator(mCamera,osg::Vec3(1024,1024,800)));
+                    program->addOperator(new WeatherAlphaOperator(mPrecipitationAlpha, false));
+                    program->setParticleSystem(ps);
+                    mParticleNode->addChild(program);
 
-        if (!mNextClouds.empty())
+                    for (int particleIndex = 0; particleIndex < ps->numParticles(); ++particleIndex)
+                        ps->getParticle(particleIndex)->setAlphaRange(osgParticle::rangef(mPrecipitationAlpha, mPrecipitationAlpha));
+
+                    ps->getOrCreateStateSet();
+                    ps->setUserValue("simpleLighting", true);
+                }
+
+                mSceneManager->recreateShaders(mParticleNode);
+            }
+        }
+
+        if (mClouds != weather.mCloudTexture)
         {
-            std::string texture = Misc::ResourceHelpers::correctTexturePath(mNextClouds, mSceneManager->getVFS());
+            mClouds = weather.mCloudTexture;
 
-            osg::ref_ptr<osg::Texture2D> cloudTex (new osg::Texture2D(mSceneManager->getImageManager()->getImage(texture)));
+            std::string texture = Misc::ResourceHelpers::correctTexturePath(mClouds, mSceneManager->getVFS());
+
+            osg::ref_ptr<osg::Texture2D> cloudTex = new osg::Texture2D(mSceneManager->getImageManager()->getImage(texture));
             cloudTex->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
             cloudTex->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
 
-            mCloudUpdater2->setTexture(cloudTex);
+            mCloudUpdater->setTexture(cloudTex);
         }
-    }
 
-    if (mCloudBlendFactor != weather.mCloudBlendFactor)
-    {
-        mCloudBlendFactor = weather.mCloudBlendFactor;
+        if (mStormDirection != weather.mStormDirection)
+            mStormDirection = weather.mStormDirection;
 
-        mCloudUpdater->setOpacity((1.f-mCloudBlendFactor));
-        mCloudUpdater2->setOpacity(mCloudBlendFactor);
-        mCloudMesh2->setNodeMask(mCloudBlendFactor > 0.f ? ~0u : 0);
-    }
+        if (mNextStormDirection != weather.mNextStormDirection)
+            mNextStormDirection = weather.mNextStormDirection;
 
-    if (mCloudColour != weather.mFogColor)
-    {
-        osg::Vec4f clr (weather.mFogColor);
-        clr += osg::Vec4f(0.13f, 0.13f, 0.13f, 0.f);
+        if (mNextClouds != weather.mNextCloudTexture)
+        {
+            mNextClouds = weather.mNextCloudTexture;
 
-        mCloudUpdater->setEmissionColor(clr);
-        mCloudUpdater2->setEmissionColor(clr);
+            if (!mNextClouds.empty())
+            {
+                std::string texture = Misc::ResourceHelpers::correctTexturePath(mNextClouds, mSceneManager->getVFS());
 
-        mCloudColour = weather.mFogColor;
-    }
+                osg::ref_ptr<osg::Texture2D> cloudTex = new osg::Texture2D(mSceneManager->getImageManager()->getImage(texture));
+                cloudTex->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
+                cloudTex->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
 
-    if (mSkyColour != weather.mSkyColor)
-    {
-        mSkyColour = weather.mSkyColor;
+                mNextCloudUpdater->setTexture(cloudTex);
+                mNextStormDirection = weather.mStormDirection;
+            }
+        }
 
-        mAtmosphereUpdater->setEmissionColor(mSkyColour);
-        mMasser->setAtmosphereColor(mSkyColour);
-        mSecunda->setAtmosphereColor(mSkyColour);
-    }
+        if (mCloudBlendFactor != weather.mCloudBlendFactor)
+        {
+            mCloudBlendFactor = std::clamp(weather.mCloudBlendFactor, 0.f, 1.f);
 
-    if (mFogColour != weather.mFogColor)
-    {
-        mFogColour = weather.mFogColor;
-    }
+            mCloudUpdater->setOpacity(1.f - mCloudBlendFactor);
+            mNextCloudUpdater->setOpacity(mCloudBlendFactor);
+            mNextCloudMesh->setNodeMask(mCloudBlendFactor > 0.f ? ~0u : 0);
+        }
+
+        if (mCloudColour != weather.mFogColor)
+        {
+            osg::Vec4f clr (weather.mFogColor);
+            clr += osg::Vec4f(0.13f, 0.13f, 0.13f, 0.f);
 
-    mCloudSpeed = weather.mCloudSpeed;
+            mCloudUpdater->setEmissionColor(clr);
+            mNextCloudUpdater->setEmissionColor(clr);
 
-    mMasser->adjustTransparency(weather.mGlareView);
-    mSecunda->adjustTransparency(weather.mGlareView);
+            mCloudColour = weather.mFogColor;
+        }
+
+        if (mSkyColour != weather.mSkyColor)
+        {
+            mSkyColour = weather.mSkyColor;
+
+            mAtmosphereUpdater->setEmissionColor(mSkyColour);
+            mMasser->setAtmosphereColor(mSkyColour);
+            mSecunda->setAtmosphereColor(mSkyColour);
+        }
+
+        if (mFogColour != weather.mFogColor)
+        {
+            mFogColour = weather.mFogColor;
+        }
 
-    mSun->setColor(weather.mSunDiscColor);
-    mSun->adjustTransparency(weather.mGlareView * weather.mSunDiscColor.a());
+        mCloudSpeed = weather.mCloudSpeed;
 
-    float nextStarsOpacity = weather.mNightFade * weather.mGlareView;
+        mMasser->adjustTransparency(weather.mGlareView);
+        mSecunda->adjustTransparency(weather.mGlareView);
+
+        mSun->setColor(weather.mSunDiscColor);
+        mSun->adjustTransparency(weather.mGlareView * weather.mSunDiscColor.a());
+
+        float nextStarsOpacity = weather.mNightFade * weather.mGlareView;
+
+        if (weather.mNight && mStarsOpacity != nextStarsOpacity)
+        {
+            mStarsOpacity = nextStarsOpacity;
+
+            mAtmosphereNightUpdater->setFade(mStarsOpacity);
+        }
+
+        mAtmosphereNightNode->setNodeMask(weather.mNight ? ~0u : 0);
+        mPrecipitationAlpha = weather.mPrecipitationAlpha;
+    }
 
-    if (weather.mNight && mStarsOpacity != nextStarsOpacity)
+    float SkyManager::getBaseWindSpeed() const
     {
-        mStarsOpacity = nextStarsOpacity;
+        if (!mCreated) return 0.f;
 
-        mAtmosphereNightUpdater->setFade(mStarsOpacity);
+        return mBaseWindSpeed;
     }
 
-    mAtmosphereNightNode->setNodeMask(weather.mNight ? ~0u : 0);
+    void SkyManager::sunEnable()
+    {
+        if (!mCreated) return;
 
-    mPrecipitationAlpha = weather.mPrecipitationAlpha;
-}
+        mSun->setVisible(true);
+    }
 
-float SkyManager::getBaseWindSpeed() const
-{
-    if (!mCreated) return 0.f;
+    void SkyManager::sunDisable()
+    {
+        if (!mCreated) return;
 
-    return mBaseWindSpeed;
-}
+        mSun->setVisible(false);
+    }
 
-void SkyManager::sunEnable()
-{
-    if (!mCreated) return;
+    void SkyManager::setStormParticleDirection(const osg::Vec3f &direction)
+    {
+        mStormParticleDirection = direction;
+    }
 
-    mSun->setVisible(true);
-}
+    void SkyManager::setSunDirection(const osg::Vec3f& direction)
+    {
+        if (!mCreated) return;
 
-void SkyManager::sunDisable()
-{
-    if (!mCreated) return;
+        mSun->setDirection(direction);
+    }
 
-    mSun->setVisible(false);
-}
+    void SkyManager::setMasserState(const MoonState& state)
+    {
+        if(!mCreated) return;
 
-void SkyManager::setStormDirection(const osg::Vec3f &direction)
-{
-    mStormDirection = direction;
-}
+        mMasser->setState(state);
+    }
 
-void SkyManager::setSunDirection(const osg::Vec3f& direction)
-{
-    if (!mCreated) return;
+    void SkyManager::setSecundaState(const MoonState& state)
+    {
+        if(!mCreated) return;
 
-    mSun->setDirection(direction);
-}
+        mSecunda->setState(state);
+    }
 
-void SkyManager::setMasserState(const MoonState& state)
-{
-    if(!mCreated) return;
+    void SkyManager::setDate(int day, int month)
+    {
+        mDay = day;
+        mMonth = month;
+    }
 
-    mMasser->setState(state);
-}
+    void SkyManager::setGlareTimeOfDayFade(float val)
+    {
+        mSun->setGlareTimeOfDayFade(val);
+    }
 
-void SkyManager::setSecundaState(const MoonState& state)
-{
-    if(!mCreated) return;
+    void SkyManager::setWaterHeight(float height)
+    {
+        mUnderwaterSwitch->setWaterLevel(height);
+    }
 
-    mSecunda->setState(state);
-}
+    void SkyManager::listAssetsToPreload(std::vector<std::string>& models, std::vector<std::string>& textures)
+    {
+        models.emplace_back(Settings::Manager::getString("skyatmosphere", "Models"));
+        if (mSceneManager->getVFS()->exists(Settings::Manager::getString("skynight02", "Models")))
+            models.emplace_back(Settings::Manager::getString("skynight02", "Models"));
+        models.emplace_back(Settings::Manager::getString("skynight01", "Models"));
+        models.emplace_back(Settings::Manager::getString("skyclouds", "Models"));
 
-void SkyManager::setDate(int day, int month)
-{
-    mDay = day;
-    mMonth = month;
-}
+        models.emplace_back(Settings::Manager::getString("weatherashcloud", "Models"));
+        models.emplace_back(Settings::Manager::getString("weatherblightcloud", "Models"));
+        models.emplace_back(Settings::Manager::getString("weathersnow", "Models"));
+        models.emplace_back(Settings::Manager::getString("weatherblizzard", "Models"));
 
-void SkyManager::setGlareTimeOfDayFade(float val)
-{
-    mSun->setGlareTimeOfDayFade(val);
-}
+        textures.emplace_back("textures/tx_mooncircle_full_s.dds");
+        textures.emplace_back("textures/tx_mooncircle_full_m.dds");
 
-void SkyManager::setWaterHeight(float height)
-{
-    mUnderwaterSwitch->setWaterLevel(height);
-}
+        textures.emplace_back("textures/tx_masser_new.dds");
+        textures.emplace_back("textures/tx_masser_one_wax.dds");
+        textures.emplace_back("textures/tx_masser_half_wax.dds");
+        textures.emplace_back("textures/tx_masser_three_wax.dds");
+        textures.emplace_back("textures/tx_masser_one_wan.dds");
+        textures.emplace_back("textures/tx_masser_half_wan.dds");
+        textures.emplace_back("textures/tx_masser_three_wan.dds");
+        textures.emplace_back("textures/tx_masser_full.dds");
 
-void SkyManager::listAssetsToPreload(std::vector<std::string>& models, std::vector<std::string>& textures)
-{
-    models.emplace_back(Settings::Manager::getString("skyatmosphere", "Models"));
-    if (mSceneManager->getVFS()->exists(Settings::Manager::getString("skynight02", "Models")))
-        models.emplace_back(Settings::Manager::getString("skynight02", "Models"));
-    models.emplace_back(Settings::Manager::getString("skynight01", "Models"));
-    models.emplace_back(Settings::Manager::getString("skyclouds", "Models"));
-
-    models.emplace_back(Settings::Manager::getString("weatherashcloud", "Models"));
-    models.emplace_back(Settings::Manager::getString("weatherblightcloud", "Models"));
-    models.emplace_back(Settings::Manager::getString("weathersnow", "Models"));
-    models.emplace_back(Settings::Manager::getString("weatherblizzard", "Models"));
-
-    textures.emplace_back("textures/tx_mooncircle_full_s.dds");
-    textures.emplace_back("textures/tx_mooncircle_full_m.dds");
-
-    textures.emplace_back("textures/tx_masser_new.dds");
-    textures.emplace_back("textures/tx_masser_one_wax.dds");
-    textures.emplace_back("textures/tx_masser_half_wax.dds");
-    textures.emplace_back("textures/tx_masser_three_wax.dds");
-    textures.emplace_back("textures/tx_masser_one_wan.dds");
-    textures.emplace_back("textures/tx_masser_half_wan.dds");
-    textures.emplace_back("textures/tx_masser_three_wan.dds");
-    textures.emplace_back("textures/tx_masser_full.dds");
-
-    textures.emplace_back("textures/tx_secunda_new.dds");
-    textures.emplace_back("textures/tx_secunda_one_wax.dds");
-    textures.emplace_back("textures/tx_secunda_half_wax.dds");
-    textures.emplace_back("textures/tx_secunda_three_wax.dds");
-    textures.emplace_back("textures/tx_secunda_one_wan.dds");
-    textures.emplace_back("textures/tx_secunda_half_wan.dds");
-    textures.emplace_back("textures/tx_secunda_three_wan.dds");
-    textures.emplace_back("textures/tx_secunda_full.dds");
-
-    textures.emplace_back("textures/tx_sun_05.dds");
-    textures.emplace_back("textures/tx_sun_flash_grey_05.dds");
-
-    textures.emplace_back("textures/tx_raindrop_01.dds");
-}
+        textures.emplace_back("textures/tx_secunda_new.dds");
+        textures.emplace_back("textures/tx_secunda_one_wax.dds");
+        textures.emplace_back("textures/tx_secunda_half_wax.dds");
+        textures.emplace_back("textures/tx_secunda_three_wax.dds");
+        textures.emplace_back("textures/tx_secunda_one_wan.dds");
+        textures.emplace_back("textures/tx_secunda_half_wan.dds");
+        textures.emplace_back("textures/tx_secunda_three_wan.dds");
+        textures.emplace_back("textures/tx_secunda_full.dds");
 
-void SkyManager::setWaterEnabled(bool enabled)
-{
-    mUnderwaterSwitch->setEnabled(enabled);
-}
+        textures.emplace_back("textures/tx_sun_05.dds");
+        textures.emplace_back("textures/tx_sun_flash_grey_05.dds");
 
+        textures.emplace_back("textures/tx_raindrop_01.dds");
+    }
+
+    void SkyManager::setWaterEnabled(bool enabled)
+    {
+        mUnderwaterSwitch->setEnabled(enabled);
+    }
 }
diff --git a/apps/openmw/mwrender/sky.hpp b/apps/openmw/mwrender/sky.hpp
index f8c501dda6..227dee213b 100644
--- a/apps/openmw/mwrender/sky.hpp
+++ b/apps/openmw/mwrender/sky.hpp
@@ -8,10 +8,7 @@
 #include <osg/ref_ptr>
 #include <osg/Vec4f>
 
-namespace osg
-{
-    class Camera;
-}
+#include "skyutil.hpp"
 
 namespace osg
 {
@@ -19,6 +16,7 @@ namespace osg
     class Node;
     class Material;
     class PositionAttitudeTransform;
+    class Camera;
 }
 
 namespace osgParticle
@@ -45,80 +43,6 @@ namespace MWRender
     class AlphaFader;
     class UnderwaterSwitchCallback;
 
-    struct WeatherResult
-    {
-        std::string mCloudTexture;
-        std::string mNextCloudTexture;
-        float mCloudBlendFactor;
-
-        osg::Vec4f mFogColor;
-
-        osg::Vec4f mAmbientColor;
-
-        osg::Vec4f mSkyColor;
-
-        // sun light color
-        osg::Vec4f mSunColor;
-
-        // alpha is the sun transparency
-        osg::Vec4f mSunDiscColor;
-
-        float mFogDepth;
-
-        float mDLFogFactor;
-        float mDLFogOffset;
-
-        float mWindSpeed;
-        float mBaseWindSpeed;
-        float mCurrentWindSpeed;
-        float mNextWindSpeed;
-
-        float mCloudSpeed;
-
-        float mGlareView;
-
-        bool mNight; // use night skybox
-        float mNightFade; // fading factor for night skybox
-
-        bool mIsStorm;
-
-        std::string mAmbientLoopSoundID;
-        float mAmbientSoundVolume;
-
-        std::string mParticleEffect;
-        std::string mRainEffect;
-        float mPrecipitationAlpha;
-
-        float mRainDiameter;
-        float mRainMinHeight;
-        float mRainMaxHeight;
-        float mRainSpeed;
-        float mRainEntranceSpeed;
-        int mRainMaxRaindrops;
-    };
-
-    struct MoonState
-    {
-        enum class Phase
-        {
-            Full = 0,
-            WaningGibbous,
-            ThirdQuarter,
-            WaningCrescent,
-            New,
-            WaxingCrescent,
-            FirstQuarter,
-            WaxingGibbous,
-            Unspecified
-        };
-
-        float mRotationFromHorizon;
-        float mRotationFromNorth;
-        Phase mPhase;
-        float mShadowBlend;
-        float mMoonAlpha;
-    };
-
     ///@brief The SkyManager handles rendering of the sky domes, celestial bodies as well as other objects that need to be rendered
     /// relative to the camera (e.g. weather particle effects)
     class SkyManager
@@ -162,7 +86,7 @@ namespace MWRender
 
         void setRainSpeed(float speed);
 
-        void setStormDirection(const osg::Vec3f& direction);
+        void setStormParticleDirection(const osg::Vec3f& direction);
 
         void setSunDirection(const osg::Vec3f& direction);
 
@@ -203,12 +127,12 @@ namespace MWRender
         osg::ref_ptr<osg::Node> mParticleEffect;
         osg::ref_ptr<UnderwaterSwitchCallback> mUnderwaterSwitch;
 
-        osg::ref_ptr<osg::PositionAttitudeTransform> mCloudNode;
+        osg::ref_ptr<osg::Group> mCloudNode;
 
         osg::ref_ptr<CloudUpdater> mCloudUpdater;
-        osg::ref_ptr<CloudUpdater> mCloudUpdater2;
-        osg::ref_ptr<osg::Node> mCloudMesh;
-        osg::ref_ptr<osg::Node> mCloudMesh2;
+        osg::ref_ptr<CloudUpdater> mNextCloudUpdater;
+        osg::ref_ptr<osg::PositionAttitudeTransform> mCloudMesh;
+        osg::ref_ptr<osg::PositionAttitudeTransform> mNextCloudMesh;
 
         osg::ref_ptr<osg::Node> mAtmosphereDay;
 
@@ -239,7 +163,10 @@ namespace MWRender
 
         float mRainTimer;
 
+        // particle system rotation is independent of cloud rotation internally
+        osg::Vec3f mStormParticleDirection;
         osg::Vec3f mStormDirection;
+        osg::Vec3f mNextStormDirection;
 
         // remember some settings so we don't have to apply them again if they didn't change
         std::string mClouds;
@@ -275,4 +202,4 @@ namespace MWRender
     };
 }
 
-#endif // GAME_RENDER_SKY_H
+#endif
diff --git a/apps/openmw/mwrender/skyutil.cpp b/apps/openmw/mwrender/skyutil.cpp
new file mode 100644
index 0000000000..ae689547fd
--- /dev/null
+++ b/apps/openmw/mwrender/skyutil.cpp
@@ -0,0 +1,1142 @@
+#include "skyutil.hpp"
+
+#include <cmath>
+
+#include <osg/Transform>
+#include <osg/Depth>
+#include <osg/Geometry>
+#include <osg/Material>
+#include <osg/TexEnvCombine>
+#include <osg/TexMat>
+#include <osg/OcclusionQueryNode>
+#include <osg/ColorMask>
+#include <osg/BlendFunc>
+#include <osg/AlphaFunc>
+#include <osg/Version>
+#include <osg/observer_ptr>
+#include <osg/PositionAttitudeTransform>
+
+#include <osgUtil/CullVisitor>
+
+#include <osgParticle/Particle>
+
+#include <components/misc/rng.hpp>
+
+#include <components/resource/scenemanager.hpp>
+#include <components/resource/imagemanager.hpp>
+
+#include <components/sceneutil/util.hpp>
+
+#include <components/fallback/fallback.hpp>
+
+#include <components/sceneutil/statesetupdater.hpp>
+
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+
+#include "../mwworld/weather.hpp"
+
+#include "vismask.hpp"
+#include "renderbin.hpp"
+
+namespace
+{
+    enum class Pass
+    {
+        Atmosphere,
+        Atmosphere_Night,
+        Clouds,
+        Moon,
+        Sun,
+        Sunflash_Query,
+        Sunglare,
+    };
+
+    osg::ref_ptr<osg::Geometry> createTexturedQuad(int numUvSets = 1, float scale = 1.f)
+    {
+        osg::ref_ptr<osg::Geometry> geom = new osg::Geometry;
+
+        osg::ref_ptr<osg::Vec3Array> verts = new osg::Vec3Array;
+        verts->push_back(osg::Vec3f(-0.5 * scale, -0.5 * scale, 0));
+        verts->push_back(osg::Vec3f(-0.5 * scale, 0.5 * scale, 0));
+        verts->push_back(osg::Vec3f(0.5 * scale, 0.5 * scale, 0));
+        verts->push_back(osg::Vec3f(0.5 * scale, -0.5 * scale, 0));
+
+        geom->setVertexArray(verts);
+
+        osg::ref_ptr<osg::Vec2Array> texcoords = new osg::Vec2Array;
+        texcoords->push_back(osg::Vec2f(0, 1));
+        texcoords->push_back(osg::Vec2f(0, 0));
+        texcoords->push_back(osg::Vec2f(1, 0));
+        texcoords->push_back(osg::Vec2f(1, 1));
+
+        osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array;
+        colors->push_back(osg::Vec4(1.f, 1.f, 1.f, 1.f));
+        geom->setColorArray(colors, osg::Array::BIND_OVERALL);
+
+        for (int i=0; i<numUvSets; ++i)
+            geom->setTexCoordArray(i, texcoords, osg::Array::BIND_PER_VERTEX);
+
+        geom->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::QUADS,0,4));
+
+        return geom;
+    }
+
+    struct DummyComputeBoundCallback : osg::Node::ComputeBoundingSphereCallback
+    {
+        osg::BoundingSphere computeBound(const osg::Node& node) const override
+        {
+            return osg::BoundingSphere();
+        }
+    };
+}
+
+namespace MWRender
+{
+    osg::ref_ptr<osg::Material> createAlphaTrackingUnlitMaterial()
+    {
+        osg::ref_ptr<osg::Material> mat = new osg::Material;
+        mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 1.f));
+        mat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 1.f));
+        mat->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(1.f, 1.f, 1.f, 1.f));
+        mat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 0.f));
+        mat->setColorMode(osg::Material::DIFFUSE);
+        return mat;
+    }
+
+    osg::ref_ptr<osg::Material> createUnlitMaterial()
+    {
+        osg::ref_ptr<osg::Material> mat = new osg::Material;
+        mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 1.f));
+        mat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 1.f));
+        mat->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(1.f, 1.f, 1.f, 1.f));
+        mat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 0.f));
+        mat->setColorMode(osg::Material::OFF);
+        return mat;
+    }
+
+    class SunUpdater : public SceneUtil::StateSetUpdater
+    {
+    public:
+        osg::Vec4f mColor;
+
+        SunUpdater()
+            : mColor(1.f, 1.f, 1.f, 1.f)
+        { }
+
+        void setDefaults(osg::StateSet* stateset) override
+        {
+            stateset->setAttributeAndModes(MWRender::createUnlitMaterial(), osg::StateAttribute::ON);
+        }
+
+        void apply(osg::StateSet* stateset, osg::NodeVisitor*) override
+        {
+            osg::Material* mat = static_cast<osg::Material*>(stateset->getAttribute(osg::StateAttribute::MATERIAL));
+            mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0,0,0,mColor.a()));
+            mat->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(mColor.r(), mColor.g(), mColor.b(), 1));
+        }
+    };
+
+    OcclusionCallback::OcclusionCallback(osg::ref_ptr<osg::OcclusionQueryNode> oqnVisible, osg::ref_ptr<osg::OcclusionQueryNode> oqnTotal)
+        : mOcclusionQueryVisiblePixels(oqnVisible)
+        , mOcclusionQueryTotalPixels(oqnTotal)
+    { }
+
+    float OcclusionCallback::getVisibleRatio (osg::Camera* camera)
+    {
+        int visible = mOcclusionQueryVisiblePixels->getQueryGeometry()->getNumPixels(camera);
+        int total = mOcclusionQueryTotalPixels->getQueryGeometry()->getNumPixels(camera);
+
+        float visibleRatio = 0.f;
+        if (total > 0)
+            visibleRatio = static_cast<float>(visible) / static_cast<float>(total);
+
+        float dt = MWBase::Environment::get().getFrameDuration();
+
+        float lastRatio = mLastRatio[osg::observer_ptr<osg::Camera>(camera)];
+
+        float change = dt*10;
+
+        if (visibleRatio > lastRatio)
+            visibleRatio = std::min(visibleRatio, lastRatio + change);
+        else
+            visibleRatio = std::max(visibleRatio, lastRatio - change);
+
+        mLastRatio[osg::observer_ptr<osg::Camera>(camera)] = visibleRatio;
+
+        return visibleRatio;
+    }
+
+    /// SunFlashCallback handles fading/scaling of a node depending on occlusion query result. Must be attached as a cull callback.
+    class SunFlashCallback : public OcclusionCallback, public SceneUtil::NodeCallback<SunFlashCallback, osg::Node*, osgUtil::CullVisitor*>
+    {
+    public:
+        SunFlashCallback(osg::ref_ptr<osg::OcclusionQueryNode> oqnVisible, osg::ref_ptr<osg::OcclusionQueryNode> oqnTotal)
+            : OcclusionCallback(oqnVisible, oqnTotal)
+            , mGlareView(1.f)
+        { }
+
+        void operator()(osg::Node* node, osgUtil::CullVisitor* cv)
+        {
+            float visibleRatio = getVisibleRatio(cv->getCurrentCamera());
+
+            osg::ref_ptr<osg::StateSet> stateset;
+
+            if (visibleRatio > 0.f)
+            {
+                const float fadeThreshold = 0.1;
+                if (visibleRatio < fadeThreshold)
+                {
+                    float fade = 1.f - (fadeThreshold - visibleRatio) / fadeThreshold;
+                    osg::ref_ptr<osg::Material> mat (MWRender::createUnlitMaterial());
+                    mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0,0,0,fade*mGlareView));
+                    stateset = new osg::StateSet;
+                    stateset->setAttributeAndModes(mat, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+                }
+                else if (visibleRatio < 1.f)
+                {
+                    const float threshold = 0.6;
+                    visibleRatio = visibleRatio * (1.f - threshold) + threshold;
+                }
+            }
+
+            float scale = visibleRatio;
+
+            if (scale == 0.f)
+            {
+                // no traverse
+                return;
+            }
+            else if (scale == 1.f)
+                traverse(node, cv);
+            else
+            {
+                osg::Matrix modelView = *cv->getModelViewMatrix();
+
+                modelView.preMultScale(osg::Vec3f(scale, scale, scale));
+
+                if (stateset)
+                    cv->pushStateSet(stateset);
+
+                cv->pushModelViewMatrix(new osg::RefMatrix(modelView), osg::Transform::RELATIVE_RF);
+
+                traverse(node, cv);
+
+                cv->popModelViewMatrix();
+
+                if (stateset)
+                    cv->popStateSet();
+            }
+        }
+
+        void setGlareView(float value)
+        {
+            mGlareView = value;
+        }
+
+    private:
+        float mGlareView;
+    };
+
+    /// SunGlareCallback controls a full-screen glare effect depending on occlusion query result and the angle between sun and camera.
+    /// Must be attached as a cull callback to the node above the glare node.
+    class SunGlareCallback : public OcclusionCallback, public SceneUtil::NodeCallback<SunGlareCallback, osg::Node*, osgUtil::CullVisitor*>
+    {
+    public:
+        SunGlareCallback(osg::ref_ptr<osg::OcclusionQueryNode> oqnVisible, osg::ref_ptr<osg::OcclusionQueryNode> oqnTotal,
+                        osg::ref_ptr<osg::PositionAttitudeTransform> sunTransform)
+            : OcclusionCallback(oqnVisible, oqnTotal)
+            , mSunTransform(sunTransform)
+            , mTimeOfDayFade(1.f)
+            , mGlareView(1.f)
+        {
+            mColor = Fallback::Map::getColour("Weather_Sun_Glare_Fader_Color");
+            mSunGlareFaderMax = Fallback::Map::getFloat("Weather_Sun_Glare_Fader_Max");
+            mSunGlareFaderAngleMax = Fallback::Map::getFloat("Weather_Sun_Glare_Fader_Angle_Max");
+
+            // Replicating a design flaw in MW. The color was being set on both ambient and emissive properties, which multiplies the result by two,
+            // then finally gets clamped by the fixed function pipeline. With the default INI settings, only the red component gets clamped,
+            // so the resulting color looks more orange than red.
+            mColor *= 2;
+            for (int i=0; i<3; ++i)
+                mColor[i] = std::min(1.f, mColor[i]);
+        }
+
+        void operator ()(osg::Node* node, osgUtil::CullVisitor* cv)
+        {
+            float angleRadians = getAngleToSunInRadians(*cv->getCurrentRenderStage()->getInitialViewMatrix());
+            float visibleRatio = getVisibleRatio(cv->getCurrentCamera());
+
+            const float angleMaxRadians = osg::DegreesToRadians(mSunGlareFaderAngleMax);
+
+            float value = 1.f - std::min(1.f, angleRadians / angleMaxRadians);
+            float fade = value * mSunGlareFaderMax;
+
+            fade *= mTimeOfDayFade * mGlareView * visibleRatio;
+
+            if (fade == 0.f)
+            {
+                // no traverse
+                return;
+
+                osg::Vec4 v4;
+                osg::Vec4 v3;
+                v4 = v3;
+            }
+            else
+            {
+                osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
+
+                osg::ref_ptr<osg::Material> mat = MWRender::createUnlitMaterial();
+
+                mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0,0,0,fade));
+                mat->setEmission(osg::Material::FRONT_AND_BACK, mColor);
+
+                stateset->setAttributeAndModes(mat, osg::StateAttribute::ON);
+
+                cv->pushStateSet(stateset);
+                traverse(node, cv);
+                cv->popStateSet();
+            }
+        }
+
+        void setTimeOfDayFade(float val)
+        {
+            mTimeOfDayFade = val;
+        }
+
+        void setGlareView(float glareView)
+        {
+            mGlareView = glareView;
+        }
+
+    private:
+        float getAngleToSunInRadians(const osg::Matrix& viewMatrix) const
+        {
+            osg::Vec3d eye, center, up;
+            viewMatrix.getLookAt(eye, center, up);
+
+            osg::Vec3d forward = center - eye;
+            osg::Vec3d sun = mSunTransform->getPosition();
+
+            forward.normalize();
+            sun.normalize();
+            float angleRadians = std::acos(forward * sun);
+            return angleRadians;
+        }
+
+        osg::ref_ptr<osg::PositionAttitudeTransform> mSunTransform;
+        float mTimeOfDayFade;
+        float mGlareView;
+        osg::Vec4f mColor;
+        float mSunGlareFaderMax;
+        float mSunGlareFaderAngleMax;
+    };
+
+    struct MoonUpdater : SceneUtil::StateSetUpdater
+    {
+        Resource::ImageManager& mImageManager;
+        osg::ref_ptr<osg::Texture2D> mPhaseTex;
+        osg::ref_ptr<osg::Texture2D> mCircleTex;
+        float mTransparency;
+        float mShadowBlend;
+        osg::Vec4f mAtmosphereColor;
+        osg::Vec4f mMoonColor;
+        bool mForceShaders;
+
+        MoonUpdater(Resource::ImageManager& imageManager, bool forceShaders)
+            : mImageManager(imageManager)
+            , mPhaseTex()
+            , mCircleTex()
+            , mTransparency(1.0f)
+            , mShadowBlend(1.0f)
+            , mAtmosphereColor(1.0f, 1.0f, 1.0f, 1.0f)
+            , mMoonColor(1.0f, 1.0f, 1.0f, 1.0f)
+            , mForceShaders(forceShaders)
+        { }
+
+        void setDefaults(osg::StateSet* stateset) override
+        {
+            if (mForceShaders)
+            {
+                stateset->addUniform(new osg::Uniform("pass", static_cast<int>(Pass::Moon)), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+                stateset->setTextureAttributeAndModes(0, mPhaseTex, osg::StateAttribute::ON);
+                stateset->setTextureAttributeAndModes(1, mCircleTex, osg::StateAttribute::ON);
+                stateset->setTextureMode(0, GL_TEXTURE_2D, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+                stateset->setTextureMode(1, GL_TEXTURE_2D, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+                stateset->addUniform(new osg::Uniform("moonBlend", osg::Vec4f{}));
+                stateset->addUniform(new osg::Uniform("atmosphereFade", osg::Vec4f{}));
+                stateset->addUniform(new osg::Uniform("diffuseMap", 0));
+                stateset->addUniform(new osg::Uniform("maskMap", 1));
+                stateset->setAttributeAndModes(MWRender::createUnlitMaterial(), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+            }
+            else
+            {
+                stateset->setTextureAttributeAndModes(0, mPhaseTex, osg::StateAttribute::ON);
+                osg::ref_ptr<osg::TexEnvCombine> texEnv = new osg::TexEnvCombine;
+                texEnv->setCombine_RGB(osg::TexEnvCombine::MODULATE);
+                texEnv->setSource0_RGB(osg::TexEnvCombine::CONSTANT);
+                texEnv->setSource1_RGB(osg::TexEnvCombine::TEXTURE);
+                texEnv->setConstantColor(osg::Vec4f(1.f, 0.f, 0.f, 1.f)); // mShadowBlend * mMoonColor
+                stateset->setTextureAttributeAndModes(0, texEnv, osg::StateAttribute::ON);
+
+                stateset->setTextureAttributeAndModes(1, mCircleTex, osg::StateAttribute::ON);
+                osg::ref_ptr<osg::TexEnvCombine> texEnv2 = new osg::TexEnvCombine;
+                texEnv2->setCombine_RGB(osg::TexEnvCombine::ADD);
+                texEnv2->setCombine_Alpha(osg::TexEnvCombine::MODULATE);
+                texEnv2->setSource0_Alpha(osg::TexEnvCombine::TEXTURE);
+                texEnv2->setSource1_Alpha(osg::TexEnvCombine::CONSTANT);
+                texEnv2->setSource0_RGB(osg::TexEnvCombine::PREVIOUS);
+                texEnv2->setSource1_RGB(osg::TexEnvCombine::CONSTANT);
+                texEnv2->setConstantColor(osg::Vec4f(0.f, 0.f, 0.f, 1.f)); // mAtmosphereColor.rgb, mTransparency
+                stateset->setTextureAttributeAndModes(1, texEnv2, osg::StateAttribute::ON);
+                stateset->setAttributeAndModes(MWRender::createUnlitMaterial(), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+            }
+        }
+
+        void apply(osg::StateSet* stateset, osg::NodeVisitor*) override
+        {
+            if (mForceShaders)
+            {
+                stateset->setTextureAttribute(0, mPhaseTex, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+                stateset->setTextureAttribute(1, mCircleTex, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+
+                if (auto* uMoonBlend = stateset->getUniform("moonBlend"))
+                    uMoonBlend->set(mMoonColor * mShadowBlend);
+                if (auto* uAtmosphereFade = stateset->getUniform("atmosphereFade"))
+                    uAtmosphereFade->set(osg::Vec4f(mAtmosphereColor.x(), mAtmosphereColor.y(), mAtmosphereColor.z(), mTransparency));
+            }
+            else
+            {
+                osg::TexEnvCombine* texEnv = static_cast<osg::TexEnvCombine*>(stateset->getTextureAttribute(0, osg::StateAttribute::TEXENV));
+                texEnv->setConstantColor(mMoonColor * mShadowBlend);
+
+                osg::TexEnvCombine* texEnv2 = static_cast<osg::TexEnvCombine*>(stateset->getTextureAttribute(1, osg::StateAttribute::TEXENV));
+                texEnv2->setConstantColor(osg::Vec4f(mAtmosphereColor.x(), mAtmosphereColor.y(), mAtmosphereColor.z(), mTransparency));
+            }
+        }
+
+        void setTextures(const std::string& phaseTex, const std::string& circleTex)
+        {
+            mPhaseTex = new osg::Texture2D(mImageManager.getImage(phaseTex));
+            mPhaseTex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+            mPhaseTex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+            mCircleTex = new osg::Texture2D(mImageManager.getImage(circleTex));
+            mCircleTex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+            mCircleTex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+
+            reset();
+        }
+    };
+
+    class CameraRelativeTransformCullCallback : public SceneUtil::NodeCallback<CameraRelativeTransformCullCallback, osg::Node*, osgUtil::CullVisitor*>
+    {
+    public:
+        void operator() (osg::Node* node, osgUtil::CullVisitor* cv)
+        {
+            // XXX have to remove unwanted culling plane of the water reflection camera
+
+            // Remove all planes that aren't from the standard frustum
+            unsigned int numPlanes = 4;
+            if (cv->getCullingMode() & osg::CullSettings::NEAR_PLANE_CULLING)
+                ++numPlanes;
+            if (cv->getCullingMode() & osg::CullSettings::FAR_PLANE_CULLING)
+                ++numPlanes;
+
+            unsigned int mask = 0x1;
+            unsigned int resultMask = cv->getProjectionCullingStack().back().getFrustum().getResultMask();
+            for (unsigned int i=0; i<cv->getProjectionCullingStack().back().getFrustum().getPlaneList().size(); ++i)
+            {
+                if (i >= numPlanes)
+                {
+                    // turn off this culling plane
+                    resultMask &= (~mask);
+                }
+
+                mask <<= 1;
+            }
+
+            cv->getProjectionCullingStack().back().getFrustum().setResultMask(resultMask);
+            cv->getCurrentCullingSet().getFrustum().setResultMask(resultMask);
+
+            cv->getProjectionCullingStack().back().pushCurrentMask();
+            cv->getCurrentCullingSet().pushCurrentMask();
+
+            traverse(node, cv);
+
+            cv->getProjectionCullingStack().back().popCurrentMask();
+            cv->getCurrentCullingSet().popCurrentMask();
+        }
+    };
+
+    void AtmosphereUpdater::setEmissionColor(const osg::Vec4f& emissionColor)
+    {
+        mEmissionColor = emissionColor;
+    }
+
+    void AtmosphereUpdater::setDefaults(osg::StateSet* stateset)
+    {
+        stateset->setAttributeAndModes(createAlphaTrackingUnlitMaterial(), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+        stateset->addUniform(new osg::Uniform("pass", static_cast<int>(Pass::Atmosphere)), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+    }
+
+    void AtmosphereUpdater::apply(osg::StateSet* stateset, osg::NodeVisitor* /*nv*/)
+    {
+        osg::Material* mat = static_cast<osg::Material*>(stateset->getAttribute(osg::StateAttribute::MATERIAL));
+        mat->setEmission(osg::Material::FRONT_AND_BACK, mEmissionColor);
+    }
+
+    AtmosphereNightUpdater::AtmosphereNightUpdater(Resource::ImageManager* imageManager, bool forceShaders)
+        : mColor(osg::Vec4f(0,0,0,0))
+        , mTexture(new osg::Texture2D(imageManager->getWarningImage()))
+        , mForceShaders(forceShaders)
+    { }
+
+    void AtmosphereNightUpdater::setFade(float fade)
+    {
+        mColor.a() = fade;
+    }
+
+    void AtmosphereNightUpdater::setDefaults(osg::StateSet* stateset)
+    {
+        if (mForceShaders)
+        {
+            stateset->addUniform(new osg::Uniform("opacity", 0.f), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+            stateset->addUniform(new osg::Uniform("pass", static_cast<int>(Pass::Atmosphere_Night)), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+        }
+        else
+        {
+            osg::ref_ptr<osg::TexEnvCombine> texEnv = new osg::TexEnvCombine;
+            texEnv->setCombine_Alpha(osg::TexEnvCombine::MODULATE);
+            texEnv->setSource0_Alpha(osg::TexEnvCombine::PREVIOUS);
+            texEnv->setSource1_Alpha(osg::TexEnvCombine::CONSTANT);
+            texEnv->setCombine_RGB(osg::TexEnvCombine::REPLACE);
+            texEnv->setSource0_RGB(osg::TexEnvCombine::PREVIOUS);
+
+            stateset->setTextureAttributeAndModes(1, mTexture, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+            stateset->setTextureAttributeAndModes(1, texEnv, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+        }
+    }
+
+    void AtmosphereNightUpdater::apply(osg::StateSet* stateset, osg::NodeVisitor* /*nv*/)
+    {
+        if (mForceShaders)
+        {
+            stateset->getUniform("opacity")->set(mColor.a());
+        }
+        else
+        {
+            osg::TexEnvCombine* texEnv = static_cast<osg::TexEnvCombine*>(stateset->getTextureAttribute(1, osg::StateAttribute::TEXENV));
+            texEnv->setConstantColor(mColor);
+        }
+    }
+
+    CloudUpdater::CloudUpdater(bool forceShaders)
+        : mOpacity(0.f)
+        , mForceShaders(forceShaders)
+    { }
+
+    void CloudUpdater::setTexture(osg::ref_ptr<osg::Texture2D> texture)
+    {
+        mTexture = texture;
+    }
+
+    void CloudUpdater::setEmissionColor(const osg::Vec4f& emissionColor)
+    {
+        mEmissionColor = emissionColor;
+    }
+
+    void CloudUpdater::setOpacity(float opacity)
+    {
+        mOpacity = opacity;
+    }
+
+    void CloudUpdater::setTextureCoord(float timer)
+    {
+        mTexMat = osg::Matrixf::translate(osg::Vec3f(0.f, -timer, 0.f));
+    }
+
+    void CloudUpdater::setDefaults(osg::StateSet *stateset)
+    {
+        stateset->setAttribute(createAlphaTrackingUnlitMaterial(), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+
+        osg::ref_ptr<osg::TexMat> texmat = new osg::TexMat;
+        stateset->setTextureAttributeAndModes(0, texmat, osg::StateAttribute::ON);
+
+        if (mForceShaders)
+        {
+            stateset->setTextureAttribute(0, mTexture, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+
+            stateset->addUniform(new osg::Uniform("opacity", 1.f), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+            stateset->addUniform(new osg::Uniform("pass", static_cast<int>(Pass::Clouds)), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+        }
+        else
+        {
+            stateset->setTextureAttributeAndModes(1, texmat, osg::StateAttribute::ON);
+            // need to set opacity on a separate texture unit, diffuse alpha is used by the vertex colors already
+            osg::ref_ptr<osg::TexEnvCombine> texEnvCombine = new osg::TexEnvCombine;
+            texEnvCombine->setSource0_RGB(osg::TexEnvCombine::PREVIOUS);
+            texEnvCombine->setSource0_Alpha(osg::TexEnvCombine::PREVIOUS);
+            texEnvCombine->setSource1_Alpha(osg::TexEnvCombine::CONSTANT);
+            texEnvCombine->setConstantColor(osg::Vec4f(1,1,1,1));
+            texEnvCombine->setCombine_Alpha(osg::TexEnvCombine::MODULATE);
+            texEnvCombine->setCombine_RGB(osg::TexEnvCombine::REPLACE);
+
+            stateset->setTextureAttributeAndModes(1, texEnvCombine, osg::StateAttribute::ON);
+
+            stateset->setTextureMode(0, GL_TEXTURE_2D, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+            stateset->setTextureMode(1, GL_TEXTURE_2D, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+        }
+    }
+
+    void CloudUpdater::apply(osg::StateSet *stateset, osg::NodeVisitor *nv)
+    {
+        stateset->setTextureAttribute(0, mTexture, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+
+        osg::Material* mat = static_cast<osg::Material*>(stateset->getAttribute(osg::StateAttribute::MATERIAL));
+        mat->setEmission(osg::Material::FRONT_AND_BACK, mEmissionColor);
+
+        osg::TexMat* texMat = static_cast<osg::TexMat*>(stateset->getTextureAttribute(0, osg::StateAttribute::TEXMAT));
+        texMat->setMatrix(mTexMat);
+
+        if (mForceShaders)
+        {
+            stateset->getUniform("opacity")->set(mOpacity);
+        }
+        else
+        {
+            stateset->setTextureAttribute(1, mTexture, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+
+            osg::TexEnvCombine* texEnv = static_cast<osg::TexEnvCombine*>(stateset->getTextureAttribute(1, osg::StateAttribute::TEXENV));
+            texEnv->setConstantColor(osg::Vec4f(1,1,1,mOpacity));
+        }
+    }
+
+    CameraRelativeTransform::CameraRelativeTransform()
+    {
+        // Culling works in node-local space, not in camera space, so we can't cull this node correctly
+        // That's not a problem though, children of this node can be culled just fine
+        // Just make sure you do not place a CameraRelativeTransform deep in the scene graph
+        setCullingActive(false);
+
+        addCullCallback(new CameraRelativeTransformCullCallback);
+    }
+
+    CameraRelativeTransform::CameraRelativeTransform(const CameraRelativeTransform& copy, const osg::CopyOp& copyop)
+        : osg::Transform(copy, copyop)
+    { }
+
+    const osg::Vec3f& CameraRelativeTransform::getLastViewPoint() const
+    {
+        return mViewPoint;
+    }
+
+    bool CameraRelativeTransform::computeLocalToWorldMatrix(osg::Matrix& matrix, osg::NodeVisitor* nv) const
+    {
+        if (nv->getVisitorType() == osg::NodeVisitor::CULL_VISITOR)
+        {
+            mViewPoint = static_cast<osgUtil::CullVisitor*>(nv)->getViewPoint();
+        }
+
+        if (_referenceFrame==RELATIVE_RF)
+        {
+            matrix.setTrans(osg::Vec3f(0.f,0.f,0.f));
+            return false;
+        }
+        else // absolute
+        {
+            matrix.makeIdentity();
+            return true;
+        }
+    }
+
+    osg::BoundingSphere CameraRelativeTransform::computeBound() const
+    {
+        return osg::BoundingSphere();
+    }
+
+    UnderwaterSwitchCallback::UnderwaterSwitchCallback(CameraRelativeTransform* cameraRelativeTransform)
+        : mCameraRelativeTransform(cameraRelativeTransform)
+        , mEnabled(true)
+        , mWaterLevel(0.f)
+    { }
+
+    bool UnderwaterSwitchCallback::isUnderwater()
+    {
+        osg::Vec3f viewPoint = mCameraRelativeTransform->getLastViewPoint();
+        return mEnabled && viewPoint.z() < mWaterLevel;
+    }
+
+    void UnderwaterSwitchCallback::operator()(osg::Node* node, osg::NodeVisitor* nv)
+    {
+        if (isUnderwater())
+            return;
+
+        traverse(node, nv);
+    }
+
+    void UnderwaterSwitchCallback::setEnabled(bool enabled)
+    {
+        mEnabled = enabled;
+    }
+    void UnderwaterSwitchCallback::setWaterLevel(float waterLevel)
+    {
+        mWaterLevel = waterLevel;
+    }
+
+    const float CelestialBody::mDistance = 1000.0f;
+
+    CelestialBody::CelestialBody(osg::Group* parentNode, float scaleFactor, int numUvSets, unsigned int visibleMask)
+        : mVisibleMask(visibleMask)
+    {
+        mGeom = createTexturedQuad(numUvSets);
+        mGeom->getOrCreateStateSet();
+        mTransform = new osg::PositionAttitudeTransform;
+        mTransform->setNodeMask(mVisibleMask);
+        mTransform->setScale(osg::Vec3f(450,450,450) * scaleFactor);
+        mTransform->addChild(mGeom);
+
+        parentNode->addChild(mTransform);
+    }
+
+    void CelestialBody::setVisible(bool visible)
+    {
+        mTransform->setNodeMask(visible ? mVisibleMask : 0);
+    }
+
+    Sun::Sun(osg::Group* parentNode, Resource::ImageManager& imageManager)
+        : CelestialBody(parentNode, 1.0f, 1, Mask_Sun)
+        , mUpdater(new SunUpdater)
+    {
+        mTransform->addUpdateCallback(mUpdater);
+
+        osg::ref_ptr<osg::Texture2D> sunTex = new osg::Texture2D(imageManager.getImage("textures/tx_sun_05.dds"));
+        sunTex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+        sunTex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+        sunTex->setName("diffuseMap");
+
+        mGeom->getOrCreateStateSet()->setTextureAttributeAndModes(0, sunTex, osg::StateAttribute::ON);
+        mGeom->getOrCreateStateSet()->addUniform(new osg::Uniform("pass", static_cast<int>(Pass::Sun)), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+
+        osg::ref_ptr<osg::Group> queryNode = new osg::Group;
+        // Need to render after the world geometry so we can correctly test for occlusions
+        osg::StateSet* stateset = queryNode->getOrCreateStateSet();
+        stateset->setRenderBinDetails(RenderBin_OcclusionQuery, "RenderBin");
+        stateset->setNestRenderBins(false);
+        // Set up alpha testing on the occlusion testing subgraph, that way we can get the occlusion tested fragments to match the circular shape of the sun
+        osg::ref_ptr<osg::AlphaFunc> alphaFunc = new osg::AlphaFunc;
+        alphaFunc->setFunction(osg::AlphaFunc::GREATER, 0.8);
+        stateset->setAttributeAndModes(alphaFunc, osg::StateAttribute::ON);
+        stateset->setTextureAttributeAndModes(0, sunTex, osg::StateAttribute::ON);
+        stateset->setAttributeAndModes(createUnlitMaterial(), osg::StateAttribute::ON);
+        stateset->addUniform(new osg::Uniform("pass", static_cast<int>(Pass::Sunflash_Query)), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+
+        // Disable writing to the color buffer. We are using this geometry for visibility tests only.
+        osg::ref_ptr<osg::ColorMask> colormask = new osg::ColorMask(0, 0, 0, 0);
+        stateset->setAttributeAndModes(colormask, osg::StateAttribute::ON);
+
+        mTransform->addChild(queryNode);
+
+        mOcclusionQueryVisiblePixels = createOcclusionQueryNode(queryNode, true);
+        mOcclusionQueryTotalPixels = createOcclusionQueryNode(queryNode, false);
+
+        createSunFlash(imageManager);
+        createSunGlare();
+    }
+
+    Sun::~Sun()
+    {
+        mTransform->removeUpdateCallback(mUpdater);
+        destroySunFlash();
+        destroySunGlare();
+    }
+
+    void Sun::setColor(const osg::Vec4f& color)
+    {
+        mUpdater->mColor.r() = color.r();
+        mUpdater->mColor.g() = color.g();
+        mUpdater->mColor.b() = color.b();
+    }
+
+    void Sun::adjustTransparency(const float ratio)
+    {
+        mUpdater->mColor.a() = ratio;
+        if (mSunGlareCallback)
+            mSunGlareCallback->setGlareView(ratio);
+        if (mSunFlashCallback)
+            mSunFlashCallback->setGlareView(ratio);
+    }
+
+    void Sun::setDirection(const osg::Vec3f& direction)
+    {
+        osg::Vec3f normalizedDirection = direction / direction.length();
+        mTransform->setPosition(normalizedDirection * mDistance);
+
+        osg::Quat quat;
+        quat.makeRotate(osg::Vec3f(0.0f, 0.0f, 1.0f), normalizedDirection);
+        mTransform->setAttitude(quat);
+    }
+
+    void Sun::setGlareTimeOfDayFade(float val)
+    {
+        if (mSunGlareCallback)
+            mSunGlareCallback->setTimeOfDayFade(val);
+    }
+
+    osg::ref_ptr<osg::OcclusionQueryNode> Sun::createOcclusionQueryNode(osg::Group* parent, bool queryVisible)
+    {
+        osg::ref_ptr<osg::OcclusionQueryNode> oqn = new osg::OcclusionQueryNode;
+        oqn->setQueriesEnabled(true);
+
+#if OSG_VERSION_GREATER_OR_EQUAL(3, 6, 5)
+        // With OSG 3.6.5, the method of providing user defined query geometry has been completely replaced
+        osg::ref_ptr<osg::QueryGeometry> queryGeom = new osg::QueryGeometry(oqn->getName());
+#else
+        osg::ref_ptr<osg::QueryGeometry> queryGeom = oqn->getQueryGeometry();
+#endif
+
+        // Make it fast! A DYNAMIC query geometry means we can't break frame until the flare is rendered (which is rendered after all the other geometry,
+        // so that would be pretty bad). STATIC should be safe, since our node's local bounds are static, thus computeBounds() which modifies the queryGeometry
+        // is only called once.
+        // Note the debug geometry setDebugDisplay(true) is always DYNAMIC and that can't be changed, not a big deal.
+        queryGeom->setDataVariance(osg::Object::STATIC);
+
+        // Set up the query geometry to match the actual sun's rendering shape. osg::OcclusionQueryNode wasn't originally intended to allow this,
+        // normally it would automatically adjust the query geometry to match the sub graph's bounding box. The below hack is needed to
+        // circumvent this.
+        queryGeom->setVertexArray(mGeom->getVertexArray());
+        queryGeom->setTexCoordArray(0, mGeom->getTexCoordArray(0), osg::Array::BIND_PER_VERTEX);
+        queryGeom->removePrimitiveSet(0, queryGeom->getNumPrimitiveSets());
+        queryGeom->addPrimitiveSet(mGeom->getPrimitiveSet(0));
+
+        // Hack to disable unwanted awful code inside OcclusionQueryNode::computeBound.
+        oqn->setComputeBoundingSphereCallback(new DummyComputeBoundCallback);
+        // Still need a proper bounding sphere.
+        oqn->setInitialBound(queryGeom->getBound());
+
+#if OSG_VERSION_GREATER_OR_EQUAL(3, 6, 5)
+        oqn->setQueryGeometry(queryGeom.release());
+#endif
+
+        osg::StateSet* queryStateSet = new osg::StateSet;
+        if (queryVisible)
+        {
+            auto depth = SceneUtil::createDepth();
+            // This is a trick to make fragments written by the query always use the maximum depth value,
+            // without having to retrieve the current far clipping distance.
+            // We want the sun glare to be "infinitely" far away.
+            double far = SceneUtil::getReverseZ() ? 0.0 : 1.0;
+            depth->setZNear(far);
+            depth->setZFar(far);
+            depth->setWriteMask(false);
+            queryStateSet->setAttributeAndModes(depth, osg::StateAttribute::ON);
+        }
+        else
+        {
+            queryStateSet->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
+        }
+        oqn->setQueryStateSet(queryStateSet);
+
+        parent->addChild(oqn);
+
+        return oqn;
+    }
+
+    void Sun::createSunFlash(Resource::ImageManager& imageManager)
+    {
+        osg::ref_ptr<osg::Texture2D> tex = new osg::Texture2D(imageManager.getImage("textures/tx_sun_flash_grey_05.dds"));
+        tex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+        tex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+        tex->setName("diffuseMap");
+
+        osg::ref_ptr<osg::Group> group (new osg::Group);
+
+        mTransform->addChild(group);
+
+        const float scale = 2.6f;
+        osg::ref_ptr<osg::Geometry> geom = createTexturedQuad(1, scale);
+        group->addChild(geom);
+
+        osg::StateSet* stateset = geom->getOrCreateStateSet();
+
+        stateset->setTextureAttributeAndModes(0, tex, osg::StateAttribute::ON);
+        stateset->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
+        stateset->setRenderBinDetails(RenderBin_SunGlare, "RenderBin");
+        stateset->setNestRenderBins(false);
+        stateset->addUniform(new osg::Uniform("pass", static_cast<int>(Pass::Sun)), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+
+        mSunFlashNode = group;
+
+        mSunFlashCallback = new SunFlashCallback(mOcclusionQueryVisiblePixels, mOcclusionQueryTotalPixels);
+        mSunFlashNode->addCullCallback(mSunFlashCallback);
+    }
+
+    void Sun::destroySunFlash()
+    {
+        if (mSunFlashNode)
+        {
+            mSunFlashNode->removeCullCallback(mSunFlashCallback);
+            mSunFlashCallback = nullptr;
+        }
+    }
+
+    void Sun::createSunGlare()
+    {
+        osg::ref_ptr<osg::Camera> camera = new osg::Camera;
+        camera->setProjectionMatrix(osg::Matrix::identity());
+        camera->setReferenceFrame(osg::Transform::ABSOLUTE_RF); // add to skyRoot instead?
+        camera->setViewMatrix(osg::Matrix::identity());
+        camera->setClearMask(0);
+        camera->setRenderOrder(osg::Camera::NESTED_RENDER);
+        camera->setAllowEventFocus(false);
+
+        osg::ref_ptr<osg::Geometry> geom = osg::createTexturedQuadGeometry(osg::Vec3f(-1,-1,0), osg::Vec3f(2,0,0), osg::Vec3f(0,2,0));
+        camera->addChild(geom);
+
+        osg::StateSet* stateset = geom->getOrCreateStateSet();
+
+        stateset->setRenderBinDetails(RenderBin_SunGlare, "RenderBin");
+        stateset->setNestRenderBins(false);
+        stateset->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
+        stateset->addUniform(new osg::Uniform("pass", static_cast<int>(Pass::Sunglare)), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+
+        // set up additive blending
+        osg::ref_ptr<osg::BlendFunc> blendFunc = new osg::BlendFunc;
+        blendFunc->setSource(osg::BlendFunc::SRC_ALPHA);
+        blendFunc->setDestination(osg::BlendFunc::ONE);
+        stateset->setAttributeAndModes(blendFunc, osg::StateAttribute::ON);
+
+        mSunGlareCallback = new SunGlareCallback(mOcclusionQueryVisiblePixels, mOcclusionQueryTotalPixels, mTransform);
+        mSunGlareNode = camera;
+
+        mSunGlareNode->addCullCallback(mSunGlareCallback);
+
+        mTransform->addChild(camera);
+    }
+
+    void Sun::destroySunGlare()
+    {
+        if (mSunGlareNode)
+        {
+            mSunGlareNode->removeCullCallback(mSunGlareCallback);
+            mSunGlareCallback = nullptr;
+        }
+    }
+
+    Moon::Moon(osg::Group* parentNode, Resource::SceneManager& sceneManager, float scaleFactor, Type type)
+        : CelestialBody(parentNode, scaleFactor, 2)
+        , mType(type)
+        , mPhase(MoonState::Phase::Unspecified)
+        , mUpdater(new MoonUpdater(*sceneManager.getImageManager(), sceneManager.getForceShaders()))
+    {
+        setPhase(MoonState::Phase::Full);
+        setVisible(true);
+
+        mGeom->addUpdateCallback(mUpdater);
+    }
+
+    Moon::~Moon()
+    {
+        mGeom->removeUpdateCallback(mUpdater);
+    }
+
+    void Moon::adjustTransparency(const float ratio)
+    {
+        mUpdater->mTransparency *= ratio;
+    }
+
+    void Moon::setState(const MoonState state)
+    {
+        float radsX = ((state.mRotationFromHorizon) * static_cast<float>(osg::PI)) / 180.0f;
+        float radsZ = ((state.mRotationFromNorth) * static_cast<float>(osg::PI)) / 180.0f;
+
+        osg::Quat rotX(radsX, osg::Vec3f(1.0f, 0.0f, 0.0f));
+        osg::Quat rotZ(radsZ, osg::Vec3f(0.0f, 0.0f, 1.0f));
+
+        osg::Vec3f direction = rotX * rotZ * osg::Vec3f(0.0f, 1.0f, 0.0f);
+        mTransform->setPosition(direction * mDistance);
+
+        // The moon quad is initially oriented facing down, so we need to offset its X-axis
+        // rotation to rotate it to face the camera when sitting at the horizon.
+        osg::Quat attX((-static_cast<float>(osg::PI) / 2.0f) + radsX, osg::Vec3f(1.0f, 0.0f, 0.0f));
+        mTransform->setAttitude(attX * rotZ);
+
+        setPhase(state.mPhase);
+        mUpdater->mTransparency = state.mMoonAlpha;
+        mUpdater->mShadowBlend = state.mShadowBlend;
+    }
+
+    void Moon::setAtmosphereColor(const osg::Vec4f& color)
+    {
+        mUpdater->mAtmosphereColor = color;
+    }
+
+    void Moon::setColor(const osg::Vec4f& color)
+    {
+        mUpdater->mMoonColor = color;
+    }
+
+    unsigned int Moon::getPhaseInt() const
+    {
+        switch (mPhase)
+        {
+            case MoonState::Phase::New:
+                return 0;
+            case MoonState::Phase::WaxingCrescent:
+                return 1;
+            case MoonState::Phase::WaningCrescent:
+                return 1;
+            case MoonState::Phase::FirstQuarter:
+                return 2;
+            case MoonState::Phase::ThirdQuarter:
+                return 2;
+            case MoonState::Phase::WaxingGibbous:
+                return 3;
+            case MoonState::Phase::WaningGibbous:
+                return 3;
+            case MoonState::Phase::Full:
+                return 4;
+            default:
+                return 0;
+        }
+    }
+
+    void Moon::setPhase(const MoonState::Phase& phase)
+    {
+        if(mPhase == phase)
+            return;
+
+        mPhase = phase;
+
+        std::string textureName = "textures/tx_";
+
+        if (mType == Moon::Type_Secunda)
+            textureName += "secunda_";
+        else
+            textureName += "masser_";
+
+        switch (mPhase)
+        {
+            case MoonState::Phase::New:
+                textureName += "new";
+                break;
+            case MoonState::Phase::WaxingCrescent:
+                textureName += "one_wax";
+                break;
+            case MoonState::Phase::FirstQuarter:
+                textureName += "half_wax";
+                break;
+            case MoonState::Phase::WaxingGibbous:
+                textureName += "three_wax";
+                break;
+            case MoonState::Phase::WaningCrescent:
+                textureName += "one_wan";
+                break;
+            case MoonState::Phase::ThirdQuarter:
+                textureName += "half_wan";
+                break;
+            case MoonState::Phase::WaningGibbous:
+                textureName += "three_wan";
+                break;
+            case MoonState::Phase::Full:
+                textureName += "full";
+                break;
+            default:
+                break;
+        }
+
+        textureName += ".dds";
+
+        if (mType == Moon::Type_Secunda)
+            mUpdater->setTextures(textureName, "textures/tx_mooncircle_full_s.dds");
+        else
+            mUpdater->setTextures(textureName, "textures/tx_mooncircle_full_m.dds");
+    }
+
+    int RainCounter::numParticlesToCreate(double dt) const
+    {
+        // limit dt to avoid large particle emissions if there are jumps in the simulation time
+        // 0.2 seconds is the same cap as used in Engine's frame loop
+        dt = std::min(dt, 0.2);
+        return ConstantRateCounter::numParticlesToCreate(dt);
+    }
+
+    RainShooter::RainShooter()
+        : mAngle(0.f)
+    { }
+
+    void RainShooter::shoot(osgParticle::Particle* particle) const
+    {
+        particle->setVelocity(mVelocity);
+        particle->setAngle(osg::Vec3f(-mAngle, 0, (Misc::Rng::rollProbability() * 2 - 1) * osg::PI));
+    }
+
+    void RainShooter::setVelocity(const osg::Vec3f& velocity)
+    {
+        mVelocity = velocity;
+    }
+
+    void RainShooter::setAngle(float angle)
+    {
+        mAngle = angle;
+    }
+
+    osg::Object* RainShooter::cloneType() const
+    {
+        return new RainShooter;
+    }
+
+    osg::Object* RainShooter::clone(const osg::CopyOp &) const
+    {
+        return new RainShooter(*this);
+    }
+
+    ModVertexAlphaVisitor::ModVertexAlphaVisitor(ModVertexAlphaVisitor::MeshType type)
+        : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+        , mType(type)
+    { }
+
+    void ModVertexAlphaVisitor::apply(osg::Geometry& geometry)
+    {
+        osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array(geometry.getVertexArray()->getNumElements());
+        for (unsigned int i=0; i<colors->size(); ++i)
+        {
+            float alpha = 1.f;
+
+            switch (mType)
+            {
+                case ModVertexAlphaVisitor::Atmosphere:
+                {
+                    // this is a cylinder, so every second vertex belongs to the bottom-most row
+                    alpha = (i%2) ? 0.f : 1.f;
+                    break;
+                }
+                case ModVertexAlphaVisitor::Clouds:
+                {
+                    if (i>= 49 && i <= 64)
+                        alpha = 0.f; // bottom-most row
+                    else if (i>= 33 && i <= 48)
+                        alpha = 0.25098; // second row
+                    else
+                        alpha = 1.f;
+                    break;
+                }
+                case ModVertexAlphaVisitor::Stars:
+                {
+                    if (geometry.getColorArray())
+                    {
+                        osg::Vec4Array* origColors = static_cast<osg::Vec4Array*>(geometry.getColorArray());
+                        alpha = ((*origColors)[i].x() == 1.f) ? 1.f : 0.f;
+                    }
+                    else
+                        alpha = 1.f;
+                    break;
+                }
+            }
+
+            (*colors)[i] = osg::Vec4f(0.f, 0.f, 0.f, alpha);
+        }
+
+        geometry.setColorArray(colors, osg::Array::BIND_PER_VERTEX);
+    }
+}
diff --git a/apps/openmw/mwrender/skyutil.hpp b/apps/openmw/mwrender/skyutil.hpp
new file mode 100644
index 0000000000..ae04c88d23
--- /dev/null
+++ b/apps/openmw/mwrender/skyutil.hpp
@@ -0,0 +1,343 @@
+#ifndef OPENMW_MWRENDER_SKYUTIL_H
+#define OPENMW_MWRENDER_SKYUTIL_H
+
+#include <osg/Vec4f>
+#include <osg/Matrixf>
+#include <osg/Texture2D>
+#include <osg/Transform>
+#include <osg/Material>
+
+#include <osgParticle/Shooter>
+#include <osgParticle/ConstantRateCounter>
+
+#include <components/sceneutil/statesetupdater.hpp>
+#include <components/sceneutil/nodecallback.hpp>
+
+namespace Resource
+{
+    class ImageManager;
+    class SceneManager;
+}
+
+namespace MWRender
+{
+    struct MoonUpdater;
+    class SunUpdater;
+    class SunFlashCallback;
+    class SunGlareCallback;
+
+    struct WeatherResult
+    {
+        std::string mCloudTexture;
+        std::string mNextCloudTexture;
+        float mCloudBlendFactor;
+
+        osg::Vec4f mFogColor;
+
+        osg::Vec4f mAmbientColor;
+
+        osg::Vec4f mSkyColor;
+
+        // sun light color
+        osg::Vec4f mSunColor;
+
+        // alpha is the sun transparency
+        osg::Vec4f mSunDiscColor;
+
+        float mFogDepth;
+
+        float mDLFogFactor;
+        float mDLFogOffset;
+
+        float mWindSpeed;
+        float mBaseWindSpeed;
+        float mCurrentWindSpeed;
+        float mNextWindSpeed;
+
+        float mCloudSpeed;
+
+        float mGlareView;
+
+        bool mNight; // use night skybox
+        float mNightFade; // fading factor for night skybox
+
+        bool mIsStorm;
+
+        std::string mAmbientLoopSoundID;
+        float mAmbientSoundVolume;
+
+        std::string mParticleEffect;
+        std::string mRainEffect;
+        float mPrecipitationAlpha;
+
+        float mRainDiameter;
+        float mRainMinHeight;
+        float mRainMaxHeight;
+        float mRainSpeed;
+        float mRainEntranceSpeed;
+        int mRainMaxRaindrops;
+
+        osg::Vec3f mStormDirection;
+        osg::Vec3f mNextStormDirection;
+    };
+
+    struct MoonState
+    {
+        enum class Phase
+        {
+            Full,
+            WaningGibbous,
+            ThirdQuarter,
+            WaningCrescent,
+            New,
+            WaxingCrescent,
+            FirstQuarter,
+            WaxingGibbous,
+            Unspecified
+        };
+
+        float mRotationFromHorizon;
+        float mRotationFromNorth;
+        Phase mPhase;
+        float mShadowBlend;
+        float mMoonAlpha;
+    };
+
+    osg::ref_ptr<osg::Material> createAlphaTrackingUnlitMaterial();
+    osg::ref_ptr<osg::Material> createUnlitMaterial();
+
+    class OcclusionCallback
+    {
+    public:
+        OcclusionCallback(osg::ref_ptr<osg::OcclusionQueryNode> oqnVisible, osg::ref_ptr<osg::OcclusionQueryNode> oqnTotal);
+
+    protected:
+        float getVisibleRatio (osg::Camera* camera);
+
+    private:
+        osg::ref_ptr<osg::OcclusionQueryNode> mOcclusionQueryVisiblePixels;
+        osg::ref_ptr<osg::OcclusionQueryNode> mOcclusionQueryTotalPixels;
+
+        std::map<osg::observer_ptr<osg::Camera>, float> mLastRatio;
+    };
+
+    class AtmosphereUpdater : public SceneUtil::StateSetUpdater
+    {
+    public:
+        void setEmissionColor(const osg::Vec4f& emissionColor);
+
+    protected:
+        void setDefaults(osg::StateSet* stateset) override;
+        void apply(osg::StateSet* stateset, osg::NodeVisitor* /*nv*/) override;
+
+    private:
+        osg::Vec4f mEmissionColor;
+    };
+
+    class AtmosphereNightUpdater : public SceneUtil::StateSetUpdater
+    {
+    public:
+        AtmosphereNightUpdater(Resource::ImageManager* imageManager, bool forceShaders);
+
+        void setFade(float fade);
+
+    protected:
+        void setDefaults(osg::StateSet* stateset) override;
+
+        void apply(osg::StateSet* stateset, osg::NodeVisitor* /*nv*/) override;
+
+    private:
+        osg::Vec4f mColor;
+        osg::ref_ptr<osg::Texture2D> mTexture;
+        bool mForceShaders;
+    };
+
+    class CloudUpdater : public SceneUtil::StateSetUpdater
+    {
+    public:
+        CloudUpdater(bool forceShaders);
+
+        void setTexture(osg::ref_ptr<osg::Texture2D> texture);
+
+        void setEmissionColor(const osg::Vec4f& emissionColor);
+        void setOpacity(float opacity);
+        void setTextureCoord(float timer);
+
+    protected:
+        void setDefaults(osg::StateSet *stateset) override;
+        void apply(osg::StateSet *stateset, osg::NodeVisitor *nv) override;
+
+    private:
+        osg::ref_ptr<osg::Texture2D> mTexture;
+        osg::Vec4f mEmissionColor;
+        float mOpacity;
+        bool mForceShaders;
+        osg::Matrixf mTexMat;
+    };
+
+    /// Transform that removes the eyepoint of the modelview matrix,
+    /// i.e. its children are positioned relative to the camera.
+    class CameraRelativeTransform : public osg::Transform
+    {
+    public:
+        CameraRelativeTransform();
+
+        CameraRelativeTransform(const CameraRelativeTransform& copy, const osg::CopyOp& copyop);
+
+        META_Node(MWRender, CameraRelativeTransform)
+
+        const osg::Vec3f& getLastViewPoint() const;
+
+        bool computeLocalToWorldMatrix(osg::Matrix& matrix, osg::NodeVisitor* nv) const override;
+
+        osg::BoundingSphere computeBound() const override;
+
+    private:
+        // viewPoint for the current frame
+        mutable osg::Vec3f mViewPoint;
+    };
+
+    /// @brief Hides the node subgraph if the eye point is below water.
+    /// @note Must be added as cull callback.
+    /// @note Meant to be used on a node that is child of a CameraRelativeTransform.
+    /// The current view point must be retrieved by the CameraRelativeTransform since we can't get it anymore once we are in camera-relative space.
+    class UnderwaterSwitchCallback : public SceneUtil::NodeCallback<UnderwaterSwitchCallback>
+    {
+    public:
+        UnderwaterSwitchCallback(CameraRelativeTransform* cameraRelativeTransform);
+        bool isUnderwater();
+
+        void operator()(osg::Node* node, osg::NodeVisitor* nv);
+        void setEnabled(bool enabled);
+        void setWaterLevel(float waterLevel);
+
+    private:
+        osg::ref_ptr<CameraRelativeTransform> mCameraRelativeTransform;
+        bool mEnabled;
+        float mWaterLevel;
+    };
+
+    /// A base class for the sun and moons.
+    class CelestialBody
+    {
+    public:
+        CelestialBody(osg::Group* parentNode, float scaleFactor, int numUvSets, unsigned int visibleMask=~0u);
+
+        virtual ~CelestialBody() = default;
+
+        virtual void adjustTransparency(const float ratio) = 0;
+
+        void setVisible(bool visible);
+
+    protected:
+        unsigned int mVisibleMask;
+        static const float mDistance;
+        osg::ref_ptr<osg::PositionAttitudeTransform> mTransform;
+        osg::ref_ptr<osg::Geometry> mGeom;
+    };
+
+    class Sun : public CelestialBody
+    {
+    public:
+        Sun(osg::Group* parentNode, Resource::ImageManager& imageManager);
+
+        ~Sun();
+
+        void setColor(const osg::Vec4f& color);
+        void adjustTransparency(const float ratio) override;
+
+        void setDirection(const osg::Vec3f& direction);
+        void setGlareTimeOfDayFade(float val);
+
+    private:
+        /// @param queryVisible If true, queries the amount of visible pixels. If false, queries the total amount of pixels.
+        osg::ref_ptr<osg::OcclusionQueryNode> createOcclusionQueryNode(osg::Group* parent, bool queryVisible);
+
+        void createSunFlash(Resource::ImageManager& imageManager);
+        void destroySunFlash();
+
+        void createSunGlare();
+        void destroySunGlare();
+
+        osg::ref_ptr<SunUpdater> mUpdater;
+        osg::ref_ptr<osg::Node> mSunFlashNode;
+        osg::ref_ptr<osg::Node> mSunGlareNode;
+        osg::ref_ptr<SunFlashCallback> mSunFlashCallback;
+        osg::ref_ptr<SunGlareCallback> mSunGlareCallback;
+        osg::ref_ptr<osg::OcclusionQueryNode> mOcclusionQueryVisiblePixels;
+        osg::ref_ptr<osg::OcclusionQueryNode> mOcclusionQueryTotalPixels;
+    };
+
+    class Moon : public CelestialBody
+    {
+    public:
+        enum Type
+        {
+            Type_Masser = 0,
+            Type_Secunda
+        };
+
+        Moon(osg::Group* parentNode, Resource::SceneManager& sceneManager, float scaleFactor, Type type);
+
+        ~Moon();
+
+        void adjustTransparency(const float ratio) override;
+        void setState(const MoonState state);
+        void setAtmosphereColor(const osg::Vec4f& color);
+        void setColor(const osg::Vec4f& color);
+
+        unsigned int getPhaseInt() const;
+
+    private:
+        Type mType;
+        MoonState::Phase mPhase;
+        osg::ref_ptr<MoonUpdater> mUpdater;
+
+        void setPhase(const MoonState::Phase& phase);
+    };
+
+    class RainCounter : public osgParticle::ConstantRateCounter
+    {
+    public:
+        int numParticlesToCreate(double dt) const override;
+    };
+
+    class RainShooter : public osgParticle::Shooter
+    {
+    public:
+        RainShooter();
+
+        osg::Object* cloneType() const override;
+
+        osg::Object* clone(const osg::CopyOp &) const override;
+
+        void shoot(osgParticle::Particle* particle) const override;
+
+        void setVelocity(const osg::Vec3f& velocity);
+        void setAngle(float angle);
+
+    private:
+        osg::Vec3f mVelocity;
+        float mAngle;
+    };
+
+    class ModVertexAlphaVisitor : public osg::NodeVisitor
+    {
+    public:
+        enum MeshType
+        {
+            Atmosphere,
+            Stars,
+            Clouds
+        };
+
+        ModVertexAlphaVisitor(MeshType type);
+
+        void apply(osg::Geometry& geometry) override;
+
+    private:
+        MeshType mType;
+    };
+}
+
+#endif
diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index 4bdd784db1..9055b95ee1 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -22,8 +22,6 @@
 
 #include <cmath>
 
-using namespace MWWorld;
-
 namespace
 {
     static const int invalidWeatherID = -1;
@@ -38,1226 +36,1241 @@ namespace
     {
         return x * (1-factor) + y * factor;
     }
-}
 
-template <typename T>
-T TimeOfDayInterpolator<T>::getValue(const float gameHour, const TimeOfDaySettings& timeSettings, const std::string& prefix) const
-{
-    WeatherSetting setting = timeSettings.getSetting(prefix);
-    float preSunriseTime = setting.mPreSunriseTime;
-    float postSunriseTime = setting.mPostSunriseTime;
-    float preSunsetTime = setting.mPreSunsetTime;
-    float postSunsetTime = setting.mPostSunsetTime;
-
-    // night
-    if (gameHour < timeSettings.mNightEnd - preSunriseTime || gameHour > timeSettings.mNightStart + postSunsetTime)
-        return mNightValue;
-    // sunrise
-    else if (gameHour >= timeSettings.mNightEnd - preSunriseTime && gameHour <= timeSettings.mDayStart + postSunriseTime)
+    osg::Vec3f calculateStormDirection(const std::string& particleEffect)
     {
-        float duration = timeSettings.mDayStart + postSunriseTime - timeSettings.mNightEnd + preSunriseTime;
-        float middle = timeSettings.mNightEnd - preSunriseTime + duration / 2.f;
-
-        if (gameHour <= middle)
-        {
-            // fade in
-            float advance = middle - gameHour;
-            float factor = 0.f;
-            if (duration > 0)
-                factor = advance / duration * 2;
-            return lerp(mSunriseValue, mNightValue, factor);
-        }
-        else
+        osg::Vec3f stormDirection = MWWorld::Weather::defaultDirection();
+        if (particleEffect == "meshes\\ashcloud.nif" || particleEffect == "meshes\\blightcloud.nif")
         {
-            // fade out
-            float advance = gameHour - middle;
-            float factor = 1.f;
-            if (duration > 0)
-                factor = advance / duration * 2;
-            return lerp(mSunriseValue, mDayValue, factor);
+            osg::Vec3f playerPos = MWMechanics::getPlayer().getRefData().getPosition().asVec3();
+            playerPos.z() = 0;
+            osg::Vec3f redMountainPos = osg::Vec3f(25000.f, 70000.f, 0.f);
+            stormDirection = (playerPos - redMountainPos);
+            stormDirection.normalize();
         }
+        return stormDirection;
     }
-    // day
-    else if (gameHour > timeSettings.mDayStart + postSunriseTime && gameHour < timeSettings.mDayEnd - preSunsetTime)
-        return mDayValue;
-    // sunset
-    else if (gameHour >= timeSettings.mDayEnd - preSunsetTime && gameHour <= timeSettings.mNightStart + postSunsetTime)
-    {
-        float duration = timeSettings.mNightStart + postSunsetTime - timeSettings.mDayEnd + preSunsetTime;
-        float middle = timeSettings.mDayEnd - preSunsetTime + duration / 2.f;
+}
 
-        if (gameHour <= middle)
+namespace MWWorld
+{
+    template <typename T>
+    T TimeOfDayInterpolator<T>::getValue(const float gameHour, const TimeOfDaySettings& timeSettings, const std::string& prefix) const
+    {
+        WeatherSetting setting = timeSettings.getSetting(prefix);
+        float preSunriseTime = setting.mPreSunriseTime;
+        float postSunriseTime = setting.mPostSunriseTime;
+        float preSunsetTime = setting.mPreSunsetTime;
+        float postSunsetTime = setting.mPostSunsetTime;
+
+        // night
+        if (gameHour < timeSettings.mNightEnd - preSunriseTime || gameHour > timeSettings.mNightStart + postSunsetTime)
+            return mNightValue;
+        // sunrise
+        else if (gameHour >= timeSettings.mNightEnd - preSunriseTime && gameHour <= timeSettings.mDayStart + postSunriseTime)
         {
-            // fade in
-            float advance = middle - gameHour;
-            float factor = 0.f;
-            if (duration > 0)
-                factor = advance / duration * 2;
-            return lerp(mSunsetValue, mDayValue, factor);
+            float duration = timeSettings.mDayStart + postSunriseTime - timeSettings.mNightEnd + preSunriseTime;
+            float middle = timeSettings.mNightEnd - preSunriseTime + duration / 2.f;
+
+            if (gameHour <= middle)
+            {
+                // fade in
+                float advance = middle - gameHour;
+                float factor = 0.f;
+                if (duration > 0)
+                    factor = advance / duration * 2;
+                return lerp(mSunriseValue, mNightValue, factor);
+            }
+            else
+            {
+                // fade out
+                float advance = gameHour - middle;
+                float factor = 1.f;
+                if (duration > 0)
+                    factor = advance / duration * 2;
+                return lerp(mSunriseValue, mDayValue, factor);
+            }
         }
-        else
+        // day
+        else if (gameHour > timeSettings.mDayStart + postSunriseTime && gameHour < timeSettings.mDayEnd - preSunsetTime)
+            return mDayValue;
+        // sunset
+        else if (gameHour >= timeSettings.mDayEnd - preSunsetTime && gameHour <= timeSettings.mNightStart + postSunsetTime)
         {
-            // fade out
-            float advance = gameHour - middle;
-            float factor = 1.f;
-            if (duration > 0)
-                factor = advance / duration * 2;
-            return lerp(mSunsetValue, mNightValue, factor);
+            float duration = timeSettings.mNightStart + postSunsetTime - timeSettings.mDayEnd + preSunsetTime;
+            float middle = timeSettings.mDayEnd - preSunsetTime + duration / 2.f;
+
+            if (gameHour <= middle)
+            {
+                // fade in
+                float advance = middle - gameHour;
+                float factor = 0.f;
+                if (duration > 0)
+                    factor = advance / duration * 2;
+                return lerp(mSunsetValue, mDayValue, factor);
+            }
+            else
+            {
+                // fade out
+                float advance = gameHour - middle;
+                float factor = 1.f;
+                if (duration > 0)
+                    factor = advance / duration * 2;
+                return lerp(mSunsetValue, mNightValue, factor);
+            }
         }
+        // shut up compiler
+        return T();
     }
-    // shut up compiler
-    return T();
-}
-
-
 
-template class MWWorld::TimeOfDayInterpolator<float>;
-template class MWWorld::TimeOfDayInterpolator<osg::Vec4f>;
-
-Weather::Weather(const std::string& name,
-                 float stormWindSpeed,
-                 float rainSpeed,
-                 float dlFactor,
-                 float dlOffset,
-                 const std::string& particleEffect)
-    : mCloudTexture(Fallback::Map::getString("Weather_" + name + "_Cloud_Texture"))
-    , mSkyColor(Fallback::Map::getColour("Weather_" + name +"_Sky_Sunrise_Color"),
-                Fallback::Map::getColour("Weather_" + name + "_Sky_Day_Color"),
-                Fallback::Map::getColour("Weather_" + name + "_Sky_Sunset_Color"),
-                Fallback::Map::getColour("Weather_" + name + "_Sky_Night_Color"))
-    , mFogColor(Fallback::Map::getColour("Weather_" + name + "_Fog_Sunrise_Color"),
-                Fallback::Map::getColour("Weather_" + name + "_Fog_Day_Color"),
-                Fallback::Map::getColour("Weather_" + name + "_Fog_Sunset_Color"),
-                Fallback::Map::getColour("Weather_" + name + "_Fog_Night_Color"))
-    , mAmbientColor(Fallback::Map::getColour("Weather_" + name + "_Ambient_Sunrise_Color"),
-                    Fallback::Map::getColour("Weather_" + name + "_Ambient_Day_Color"),
-                    Fallback::Map::getColour("Weather_" + name + "_Ambient_Sunset_Color"),
-                    Fallback::Map::getColour("Weather_" + name + "_Ambient_Night_Color"))
-    , mSunColor(Fallback::Map::getColour("Weather_" + name + "_Sun_Sunrise_Color"),
-                Fallback::Map::getColour("Weather_" + name + "_Sun_Day_Color"),
-                Fallback::Map::getColour("Weather_" + name + "_Sun_Sunset_Color"),
-                Fallback::Map::getColour("Weather_" + name + "_Sun_Night_Color"))
-    , mLandFogDepth(Fallback::Map::getFloat("Weather_" + name + "_Land_Fog_Day_Depth"),
-                    Fallback::Map::getFloat("Weather_" + name + "_Land_Fog_Day_Depth"),
-                    Fallback::Map::getFloat("Weather_" + name + "_Land_Fog_Day_Depth"),
-                    Fallback::Map::getFloat("Weather_" + name + "_Land_Fog_Night_Depth"))
-    , mSunDiscSunsetColor(Fallback::Map::getColour("Weather_" + name + "_Sun_Disc_Sunset_Color"))
-    , mWindSpeed(Fallback::Map::getFloat("Weather_" + name + "_Wind_Speed"))
-    , mCloudSpeed(Fallback::Map::getFloat("Weather_" + name + "_Cloud_Speed"))
-    , mGlareView(Fallback::Map::getFloat("Weather_" + name + "_Glare_View"))
-    , mIsStorm(mWindSpeed > stormWindSpeed)
-    , mRainSpeed(rainSpeed)
-    , mRainEntranceSpeed(Fallback::Map::getFloat("Weather_" + name + "_Rain_Entrance_Speed"))
-    , mRainMaxRaindrops(Fallback::Map::getFloat("Weather_" + name + "_Max_Raindrops"))
-    , mRainDiameter(Fallback::Map::getFloat("Weather_" + name + "_Rain_Diameter"))
-    , mRainThreshold(Fallback::Map::getFloat("Weather_" + name + "_Rain_Threshold"))
-    , mRainMinHeight(Fallback::Map::getFloat("Weather_" + name + "_Rain_Height_Min"))
-    , mRainMaxHeight(Fallback::Map::getFloat("Weather_" + name + "_Rain_Height_Max"))
-    , mParticleEffect(particleEffect)
-    , mRainEffect(Fallback::Map::getBool("Weather_" + name + "_Using_Precip") ? "meshes\\raindrop.nif" : "")
-    , mTransitionDelta(Fallback::Map::getFloat("Weather_" + name + "_Transition_Delta"))
-    , mCloudsMaximumPercent(Fallback::Map::getFloat("Weather_" + name + "_Clouds_Maximum_Percent"))
-    , mThunderFrequency(Fallback::Map::getFloat("Weather_" + name + "_Thunder_Frequency"))
-    , mThunderThreshold(Fallback::Map::getFloat("Weather_" + name + "_Thunder_Threshold"))
-    , mThunderSoundID()
-    , mFlashDecrement(Fallback::Map::getFloat("Weather_" + name + "_Flash_Decrement"))
-    , mFlashBrightness(0.0f)
-{
-    mDL.FogFactor = dlFactor;
-    mDL.FogOffset = dlOffset;
-    mThunderSoundID[0] = Fallback::Map::getString("Weather_" + name + "_Thunder_Sound_ID_0");
-    mThunderSoundID[1] = Fallback::Map::getString("Weather_" + name + "_Thunder_Sound_ID_1");
-    mThunderSoundID[2] = Fallback::Map::getString("Weather_" + name + "_Thunder_Sound_ID_2");
-    mThunderSoundID[3] = Fallback::Map::getString("Weather_" + name + "_Thunder_Sound_ID_3");
-
-    // TODO: support weathers that have both "Ambient Loop Sound ID" and "Rain Loop Sound ID", need to play both sounds at the same time.
+    template class MWWorld::TimeOfDayInterpolator<float>;
+    template class MWWorld::TimeOfDayInterpolator<osg::Vec4f>;
 
-    if (!mRainEffect.empty()) // NOTE: in vanilla, the weathers with rain seem to be hardcoded; changing Using_Precip has no effect
+    osg::Vec3f Weather::defaultDirection()
     {
-        mAmbientLoopSoundID = Fallback::Map::getString("Weather_" + name + "_Rain_Loop_Sound_ID");
-        if (mAmbientLoopSoundID.empty()) // default to "rain" if not set
-            mAmbientLoopSoundID = "rain";
+        static const osg::Vec3f direction = osg::Vec3f(0.f, 1.f, 0.f);
+        return direction;
     }
-    else
-        mAmbientLoopSoundID = Fallback::Map::getString("Weather_" + name + "_Ambient_Loop_Sound_ID");
 
-    if (Misc::StringUtils::ciEqual(mAmbientLoopSoundID, "None"))
-        mAmbientLoopSoundID.clear();
-}
+    Weather::Weather(const std::string& name,
+                    float stormWindSpeed,
+                    float rainSpeed,
+                    float dlFactor,
+                    float dlOffset,
+                    const std::string& particleEffect)
+        : mCloudTexture(Fallback::Map::getString("Weather_" + name + "_Cloud_Texture"))
+        , mSkyColor(Fallback::Map::getColour("Weather_" + name +"_Sky_Sunrise_Color"),
+                    Fallback::Map::getColour("Weather_" + name + "_Sky_Day_Color"),
+                    Fallback::Map::getColour("Weather_" + name + "_Sky_Sunset_Color"),
+                    Fallback::Map::getColour("Weather_" + name + "_Sky_Night_Color"))
+        , mFogColor(Fallback::Map::getColour("Weather_" + name + "_Fog_Sunrise_Color"),
+                    Fallback::Map::getColour("Weather_" + name + "_Fog_Day_Color"),
+                    Fallback::Map::getColour("Weather_" + name + "_Fog_Sunset_Color"),
+                    Fallback::Map::getColour("Weather_" + name + "_Fog_Night_Color"))
+        , mAmbientColor(Fallback::Map::getColour("Weather_" + name + "_Ambient_Sunrise_Color"),
+                        Fallback::Map::getColour("Weather_" + name + "_Ambient_Day_Color"),
+                        Fallback::Map::getColour("Weather_" + name + "_Ambient_Sunset_Color"),
+                        Fallback::Map::getColour("Weather_" + name + "_Ambient_Night_Color"))
+        , mSunColor(Fallback::Map::getColour("Weather_" + name + "_Sun_Sunrise_Color"),
+                    Fallback::Map::getColour("Weather_" + name + "_Sun_Day_Color"),
+                    Fallback::Map::getColour("Weather_" + name + "_Sun_Sunset_Color"),
+                    Fallback::Map::getColour("Weather_" + name + "_Sun_Night_Color"))
+        , mLandFogDepth(Fallback::Map::getFloat("Weather_" + name + "_Land_Fog_Day_Depth"),
+                        Fallback::Map::getFloat("Weather_" + name + "_Land_Fog_Day_Depth"),
+                        Fallback::Map::getFloat("Weather_" + name + "_Land_Fog_Day_Depth"),
+                        Fallback::Map::getFloat("Weather_" + name + "_Land_Fog_Night_Depth"))
+        , mSunDiscSunsetColor(Fallback::Map::getColour("Weather_" + name + "_Sun_Disc_Sunset_Color"))
+        , mWindSpeed(Fallback::Map::getFloat("Weather_" + name + "_Wind_Speed"))
+        , mCloudSpeed(Fallback::Map::getFloat("Weather_" + name + "_Cloud_Speed"))
+        , mGlareView(Fallback::Map::getFloat("Weather_" + name + "_Glare_View"))
+        , mIsStorm(mWindSpeed > stormWindSpeed)
+        , mRainSpeed(rainSpeed)
+        , mRainEntranceSpeed(Fallback::Map::getFloat("Weather_" + name + "_Rain_Entrance_Speed"))
+        , mRainMaxRaindrops(Fallback::Map::getFloat("Weather_" + name + "_Max_Raindrops"))
+        , mRainDiameter(Fallback::Map::getFloat("Weather_" + name + "_Rain_Diameter"))
+        , mRainThreshold(Fallback::Map::getFloat("Weather_" + name + "_Rain_Threshold"))
+        , mRainMinHeight(Fallback::Map::getFloat("Weather_" + name + "_Rain_Height_Min"))
+        , mRainMaxHeight(Fallback::Map::getFloat("Weather_" + name + "_Rain_Height_Max"))
+        , mParticleEffect(particleEffect)
+        , mRainEffect(Fallback::Map::getBool("Weather_" + name + "_Using_Precip") ? "meshes\\raindrop.nif" : "")
+        , mStormDirection(Weather::defaultDirection())
+        , mTransitionDelta(Fallback::Map::getFloat("Weather_" + name + "_Transition_Delta"))
+        , mCloudsMaximumPercent(Fallback::Map::getFloat("Weather_" + name + "_Clouds_Maximum_Percent"))
+        , mThunderFrequency(Fallback::Map::getFloat("Weather_" + name + "_Thunder_Frequency"))
+        , mThunderThreshold(Fallback::Map::getFloat("Weather_" + name + "_Thunder_Threshold"))
+        , mThunderSoundID()
+        , mFlashDecrement(Fallback::Map::getFloat("Weather_" + name + "_Flash_Decrement"))
+        , mFlashBrightness(0.0f)
+    {
+        mDL.FogFactor = dlFactor;
+        mDL.FogOffset = dlOffset;
+        mThunderSoundID[0] = Fallback::Map::getString("Weather_" + name + "_Thunder_Sound_ID_0");
+        mThunderSoundID[1] = Fallback::Map::getString("Weather_" + name + "_Thunder_Sound_ID_1");
+        mThunderSoundID[2] = Fallback::Map::getString("Weather_" + name + "_Thunder_Sound_ID_2");
+        mThunderSoundID[3] = Fallback::Map::getString("Weather_" + name + "_Thunder_Sound_ID_3");
 
-float Weather::transitionDelta() const
-{
-    // Transition Delta describes how quickly transitioning to the weather in question will take, in Hz. Note that the
-    // measurement is in real time, not in-game time.
-    return mTransitionDelta;
-}
+        // TODO: support weathers that have both "Ambient Loop Sound ID" and "Rain Loop Sound ID", need to play both sounds at the same time.
 
-float Weather::cloudBlendFactor(const float transitionRatio) const
-{
-    // Clouds Maximum Percent affects how quickly the sky transitions from one sky texture to the next.
-    return transitionRatio / mCloudsMaximumPercent;
-}
-
-float Weather::calculateThunder(const float transitionRatio, const float elapsedSeconds, const bool isPaused)
-{
-    // When paused, the flash brightness remains the same and no new strikes can occur.
-    if(!isPaused)
-    {
-        // Morrowind doesn't appear to do any calculations unless the transition ratio is higher than the Thunder Threshold.
-        if(transitionRatio >= mThunderThreshold && mThunderFrequency > 0.0f)
+        if (!mRainEffect.empty()) // NOTE: in vanilla, the weathers with rain seem to be hardcoded; changing Using_Precip has no effect
         {
-            flashDecrement(elapsedSeconds);
-
-            if(Misc::Rng::rollProbability() <= thunderChance(transitionRatio, elapsedSeconds))
-            {
-                lightningAndThunder();
-            }
+            mAmbientLoopSoundID = Fallback::Map::getString("Weather_" + name + "_Rain_Loop_Sound_ID");
+            if (mAmbientLoopSoundID.empty()) // default to "rain" if not set
+                mAmbientLoopSoundID = "rain";
         }
         else
-        {
-            mFlashBrightness = 0.0f;
-        }
-    }
+            mAmbientLoopSoundID = Fallback::Map::getString("Weather_" + name + "_Ambient_Loop_Sound_ID");
 
-    return mFlashBrightness;
-}
-
-inline void Weather::flashDecrement(const float elapsedSeconds)
-{
-   // The Flash Decrement is measured in whole units per second. This means that if the flash brightness was
-   // currently 1.0, then it should take approximately 0.25 seconds to decay to 0.0 (the minimum).
-   float decrement = mFlashDecrement * elapsedSeconds;
-   mFlashBrightness = decrement > mFlashBrightness ? 0.0f : mFlashBrightness - decrement;
-}
-
-inline float Weather::thunderChance(const float transitionRatio, const float elapsedSeconds) const
-{
-   // This formula is reversed from the observation that with Thunder Frequency set to 1, there are roughly 10 strikes
-   // per minute. It doesn't appear to be tied to in game time as Timescale doesn't affect it. Various values of
-   // Thunder Frequency seem to change the average number of strikes in a linear fashion.. During a transition, it appears to
-   // scaled based on how far past it is past the Thunder Threshold.
-   float scaleFactor = (transitionRatio - mThunderThreshold) / (1.0f - mThunderThreshold);
-   return ((mThunderFrequency * 10.0f) / 60.0f) * elapsedSeconds * scaleFactor;
-}
-
-inline void Weather::lightningAndThunder(void)
-{
-    // Morrowind seems to vary the intensity of the brightness based on which of the four sound IDs it selects.
-    // They appear to go from 0 (brightest, closest) to 3 (faintest, farthest). The value of 0.25 per distance
-    // was derived by setting the Flash Decrement to 0.1 and measuring how long each value took to decay to 0.
-    // TODO: Determine the distribution of each distance to see if it's evenly weighted.
-    unsigned int distance = Misc::Rng::rollDice(4);
-    // Flash brightness appears additive, since if multiple strikes occur, it takes longer for it to decay to 0.
-    mFlashBrightness += 1 - (distance * 0.25f);
-    MWBase::Environment::get().getSoundManager()->playSound(mThunderSoundID[distance], 1.0, 1.0);
-}
+        if (Misc::StringUtils::ciEqual(mAmbientLoopSoundID, "None"))
+            mAmbientLoopSoundID.clear();
+    }
 
-RegionWeather::RegionWeather(const ESM::Region& region)
-    : mWeather(invalidWeatherID)
-    , mChances()
-{
-    mChances.reserve(10);
-    mChances.push_back(region.mData.mClear);
-    mChances.push_back(region.mData.mCloudy);
-    mChances.push_back(region.mData.mFoggy);
-    mChances.push_back(region.mData.mOvercast);
-    mChances.push_back(region.mData.mRain);
-    mChances.push_back(region.mData.mThunder);
-    mChances.push_back(region.mData.mAsh);
-    mChances.push_back(region.mData.mBlight);
-    mChances.push_back(region.mData.mA);
-    mChances.push_back(region.mData.mB);
-}
+    float Weather::transitionDelta() const
+    {
+        // Transition Delta describes how quickly transitioning to the weather in question will take, in Hz. Note that the
+        // measurement is in real time, not in-game time.
+        return mTransitionDelta;
+    }
 
-RegionWeather::RegionWeather(const ESM::RegionWeatherState& state)
-    : mWeather(state.mWeather)
-    , mChances(state.mChances)
-{
-}
+    float Weather::cloudBlendFactor(const float transitionRatio) const
+    {
+        // Clouds Maximum Percent affects how quickly the sky transitions from one sky texture to the next.
+        return transitionRatio / mCloudsMaximumPercent;
+    }
 
-RegionWeather::operator ESM::RegionWeatherState() const
-{
-    ESM::RegionWeatherState state =
+    float Weather::calculateThunder(const float transitionRatio, const float elapsedSeconds, const bool isPaused)
+    {
+        // When paused, the flash brightness remains the same and no new strikes can occur.
+        if(!isPaused)
         {
-            mWeather,
-            mChances
-        };
+            // Morrowind doesn't appear to do any calculations unless the transition ratio is higher than the Thunder Threshold.
+            if(transitionRatio >= mThunderThreshold && mThunderFrequency > 0.0f)
+            {
+                flashDecrement(elapsedSeconds);
 
-    return state;
-}
+                if(Misc::Rng::rollProbability() <= thunderChance(transitionRatio, elapsedSeconds))
+                {
+                    lightningAndThunder();
+                }
+            }
+            else
+            {
+                mFlashBrightness = 0.0f;
+            }
+        }
 
-void RegionWeather::setChances(const std::vector<char>& chances)
-{
-    if(mChances.size() < chances.size())
+        return mFlashBrightness;
+    }
+
+    inline void Weather::flashDecrement(const float elapsedSeconds)
     {
-        mChances.reserve(chances.size());
+        // The Flash Decrement is measured in whole units per second. This means that if the flash brightness was
+        // currently 1.0, then it should take approximately 0.25 seconds to decay to 0.0 (the minimum).
+        float decrement = mFlashDecrement * elapsedSeconds;
+        mFlashBrightness = decrement > mFlashBrightness ? 0.0f : mFlashBrightness - decrement;
     }
 
-    int i = 0;
-    for(char chance : chances)
+    inline float Weather::thunderChance(const float transitionRatio, const float elapsedSeconds) const
     {
-        mChances[i] = chance;
-        i++;
+        // This formula is reversed from the observation that with Thunder Frequency set to 1, there are roughly 10 strikes
+        // per minute. It doesn't appear to be tied to in game time as Timescale doesn't affect it. Various values of
+        // Thunder Frequency seem to change the average number of strikes in a linear fashion.. During a transition, it appears to
+        // scaled based on how far past it is past the Thunder Threshold.
+        float scaleFactor = (transitionRatio - mThunderThreshold) / (1.0f - mThunderThreshold);
+        return ((mThunderFrequency * 10.0f) / 60.0f) * elapsedSeconds * scaleFactor;
     }
 
-    // Regional weather no longer supports the current type, select a new weather pattern.
-    if((static_cast<size_t>(mWeather) >= mChances.size()) || (mChances[mWeather] == 0))
+    inline void Weather::lightningAndThunder(void)
     {
-        chooseNewWeather();
+        // Morrowind seems to vary the intensity of the brightness based on which of the four sound IDs it selects.
+        // They appear to go from 0 (brightest, closest) to 3 (faintest, farthest). The value of 0.25 per distance
+        // was derived by setting the Flash Decrement to 0.1 and measuring how long each value took to decay to 0.
+        // TODO: Determine the distribution of each distance to see if it's evenly weighted.
+        unsigned int distance = Misc::Rng::rollDice(4);
+        // Flash brightness appears additive, since if multiple strikes occur, it takes longer for it to decay to 0.
+        mFlashBrightness += 1 - (distance * 0.25f);
+        MWBase::Environment::get().getSoundManager()->playSound(mThunderSoundID[distance], 1.0, 1.0);
     }
-}
 
-void RegionWeather::setWeather(int weatherID)
-{
-    mWeather = weatherID;
-}
+    RegionWeather::RegionWeather(const ESM::Region& region)
+        : mWeather(invalidWeatherID)
+        , mChances()
+    {
+        mChances.reserve(10);
+        mChances.push_back(region.mData.mClear);
+        mChances.push_back(region.mData.mCloudy);
+        mChances.push_back(region.mData.mFoggy);
+        mChances.push_back(region.mData.mOvercast);
+        mChances.push_back(region.mData.mRain);
+        mChances.push_back(region.mData.mThunder);
+        mChances.push_back(region.mData.mAsh);
+        mChances.push_back(region.mData.mBlight);
+        mChances.push_back(region.mData.mA);
+        mChances.push_back(region.mData.mB);
+    }
 
-int RegionWeather::getWeather()
-{
-    // If the region weather was already set (by ChangeWeather, or by a previous call) then just return that value.
-    // Note that the region weather will be expired periodically when the weather update timer expires.
-    if(mWeather == invalidWeatherID)
+    RegionWeather::RegionWeather(const ESM::RegionWeatherState& state)
+        : mWeather(state.mWeather)
+        , mChances(state.mChances)
     {
-        chooseNewWeather();
     }
 
-    return mWeather;
-}
+    RegionWeather::operator ESM::RegionWeatherState() const
+    {
+        ESM::RegionWeatherState state =
+            {
+                mWeather,
+                mChances
+            };
 
-void RegionWeather::chooseNewWeather()
-{
-    // All probabilities must add to 100 (responsibility of the user).
-    // If chances A and B has values 30 and 70 then by generating 100 numbers 1..100, 30% will be lesser or equal 30
-    // and 70% will be greater than 30 (in theory).
-    int chance = Misc::Rng::rollDice(100) + 1; // 1..100
-    int sum = 0;
-    int i = 0;
-    for(; static_cast<size_t>(i) < mChances.size(); ++i)
+        return state;
+    }
+
+    void RegionWeather::setChances(const std::vector<char>& chances)
     {
-        sum += mChances[i];
-        if(chance <= sum)
+        if(mChances.size() < chances.size())
         {
-            mWeather = i;
-            return;
+            mChances.reserve(chances.size());
         }
-    }
-
-    // if we hit this path then the chances don't add to 100, choose a default weather instead
-    mWeather = 0;
-}
 
-MoonModel::MoonModel(const std::string& name)
-  : mFadeInStart(Fallback::Map::getFloat("Moons_" + name + "_Fade_In_Start"))
-  , mFadeInFinish(Fallback::Map::getFloat("Moons_" + name + "_Fade_In_Finish"))
-  , mFadeOutStart(Fallback::Map::getFloat("Moons_" + name + "_Fade_Out_Start"))
-  , mFadeOutFinish(Fallback::Map::getFloat("Moons_" + name + "_Fade_Out_Finish"))
-  , mAxisOffset(Fallback::Map::getFloat("Moons_" + name + "_Axis_Offset"))
-  , mSpeed(Fallback::Map::getFloat("Moons_" + name + "_Speed"))
-  , mDailyIncrement(Fallback::Map::getFloat("Moons_" + name + "_Daily_Increment"))
-  , mFadeStartAngle(Fallback::Map::getFloat("Moons_" + name + "_Fade_Start_Angle"))
-  , mFadeEndAngle(Fallback::Map::getFloat("Moons_" + name + "_Fade_End_Angle"))
-  , mMoonShadowEarlyFadeAngle(Fallback::Map::getFloat("Moons_" + name + "_Moon_Shadow_Early_Fade_Angle"))
-{
-    // Morrowind appears to have a minimum speed in order to avoid situations where the moon couldn't conceivably
-    // complete a rotation in a single 24 hour period. The value of 180/23 was deduced from reverse engineering.
-    mSpeed = std::min(mSpeed, 180.0f / 23.0f);
-}
+        int i = 0;
+        for(char chance : chances)
+        {
+            mChances[i] = chance;
+            i++;
+        }
 
-MWRender::MoonState MoonModel::calculateState(const TimeStamp& gameTime) const
-{
-    float rotationFromHorizon = angle(gameTime);
-    MWRender::MoonState state =
+        // Regional weather no longer supports the current type, select a new weather pattern.
+        if((static_cast<size_t>(mWeather) >= mChances.size()) || (mChances[mWeather] == 0))
         {
-            rotationFromHorizon,
-            mAxisOffset, // Reverse engineered from Morrowind's scene graph rotation matrices.
-            phase(gameTime),
-            shadowBlend(rotationFromHorizon),
-            earlyMoonShadowAlpha(rotationFromHorizon) * hourlyAlpha(gameTime.getHour())
-        };
+            chooseNewWeather();
+        }
+    }
 
-    return state;
-}
+    void RegionWeather::setWeather(int weatherID)
+    {
+        mWeather = weatherID;
+    }
 
-inline float MoonModel::angle(const TimeStamp& gameTime) const
-{
-    // Morrowind's moons start travel on one side of the horizon (let's call it H-rise) and travel 180 degrees to the
-    // opposite horizon (let's call it H-set). Upon reaching H-set, they reset to H-rise until the next moon rise.
+    int RegionWeather::getWeather()
+    {
+        // If the region weather was already set (by ChangeWeather, or by a previous call) then just return that value.
+        // Note that the region weather will be expired periodically when the weather update timer expires.
+        if(mWeather == invalidWeatherID)
+        {
+            chooseNewWeather();
+        }
 
-    // When calculating the angle of the moon, several cases have to be taken into account:
-    // 1. Moon rises and then sets in one day.
-    // 2. Moon sets and doesn't rise in one day (occurs when the moon rise hour is >= 24).
-    // 3. Moon sets and then rises in one day.
-    float moonRiseHourToday = moonRiseHour(gameTime.getDay());
-    float moonRiseAngleToday = 0;
+        return mWeather;
+    }
 
-    if(gameTime.getHour() < moonRiseHourToday)
+    void RegionWeather::chooseNewWeather()
     {
-        float moonRiseHourYesterday = moonRiseHour(gameTime.getDay() - 1);
-        if(moonRiseHourYesterday < 24)
+        // All probabilities must add to 100 (responsibility of the user).
+        // If chances A and B has values 30 and 70 then by generating 100 numbers 1..100, 30% will be lesser or equal 30
+        // and 70% will be greater than 30 (in theory).
+        int chance = Misc::Rng::rollDice(100) + 1; // 1..100
+        int sum = 0;
+        int i = 0;
+        for(; static_cast<size_t>(i) < mChances.size(); ++i)
         {
-            float moonRiseAngleYesterday = rotation(24 - moonRiseHourYesterday);
-            if(moonRiseAngleYesterday < 180)
+            sum += mChances[i];
+            if(chance <= sum)
             {
-                // The moon rose but did not set yesterday, so accumulate yesterday's angle with how much we've travelled today.
-                moonRiseAngleToday = rotation(gameTime.getHour()) + moonRiseAngleYesterday;
+                mWeather = i;
+                return;
             }
         }
+
+        // if we hit this path then the chances don't add to 100, choose a default weather instead
+        mWeather = 0;
     }
-    else
+
+    MoonModel::MoonModel(const std::string& name)
+    : mFadeInStart(Fallback::Map::getFloat("Moons_" + name + "_Fade_In_Start"))
+    , mFadeInFinish(Fallback::Map::getFloat("Moons_" + name + "_Fade_In_Finish"))
+    , mFadeOutStart(Fallback::Map::getFloat("Moons_" + name + "_Fade_Out_Start"))
+    , mFadeOutFinish(Fallback::Map::getFloat("Moons_" + name + "_Fade_Out_Finish"))
+    , mAxisOffset(Fallback::Map::getFloat("Moons_" + name + "_Axis_Offset"))
+    , mSpeed(Fallback::Map::getFloat("Moons_" + name + "_Speed"))
+    , mDailyIncrement(Fallback::Map::getFloat("Moons_" + name + "_Daily_Increment"))
+    , mFadeStartAngle(Fallback::Map::getFloat("Moons_" + name + "_Fade_Start_Angle"))
+    , mFadeEndAngle(Fallback::Map::getFloat("Moons_" + name + "_Fade_End_Angle"))
+    , mMoonShadowEarlyFadeAngle(Fallback::Map::getFloat("Moons_" + name + "_Moon_Shadow_Early_Fade_Angle"))
     {
-        moonRiseAngleToday = rotation(gameTime.getHour() - moonRiseHourToday);
+        // Morrowind appears to have a minimum speed in order to avoid situations where the moon couldn't conceivably
+        // complete a rotation in a single 24 hour period. The value of 180/23 was deduced from reverse engineering.
+        mSpeed = std::min(mSpeed, 180.0f / 23.0f);
     }
 
-    if(moonRiseAngleToday >= 180)
+    MWRender::MoonState MoonModel::calculateState(const TimeStamp& gameTime) const
     {
-        // The moon set today, reset the angle to the horizon.
-        moonRiseAngleToday = 0;
+        float rotationFromHorizon = angle(gameTime);
+        MWRender::MoonState state =
+            {
+                rotationFromHorizon,
+                mAxisOffset, // Reverse engineered from Morrowind's scene graph rotation matrices.
+                phase(gameTime),
+                shadowBlend(rotationFromHorizon),
+                earlyMoonShadowAlpha(rotationFromHorizon) * hourlyAlpha(gameTime.getHour())
+            };
+
+        return state;
     }
 
-    return moonRiseAngleToday;
-}
+    inline float MoonModel::angle(const TimeStamp& gameTime) const
+    {
+        // Morrowind's moons start travel on one side of the horizon (let's call it H-rise) and travel 180 degrees to the
+        // opposite horizon (let's call it H-set). Upon reaching H-set, they reset to H-rise until the next moon rise.
 
-inline float MoonModel::moonRiseHour(unsigned int daysPassed) const
-{
-    // This arises from the start date of 16 Last Seed, 427
-    // TODO: Find an alternate formula that doesn't rely on this day being fixed.
-    static const unsigned int startDay = 16;
-
-    // This odd formula arises from the fact that on 16 Last Seed, 17 increments have occurred, meaning
-    // that upon starting a new game, it must only calculate the moon phase as far back as 1 Last Seed.
-    // Note that we don't modulo after adding the latest daily increment because other calculations need to
-    // know if doing so would cause the moon rise to be postponed until the next day (which happens when
-    // the moon rise hour is >= 24 in Morrowind).
-    return mDailyIncrement + std::fmod((daysPassed - 1 + startDay) * mDailyIncrement, 24.0f);
-}
+        // When calculating the angle of the moon, several cases have to be taken into account:
+        // 1. Moon rises and then sets in one day.
+        // 2. Moon sets and doesn't rise in one day (occurs when the moon rise hour is >= 24).
+        // 3. Moon sets and then rises in one day.
+        float moonRiseHourToday = moonRiseHour(gameTime.getDay());
+        float moonRiseAngleToday = 0;
 
-inline float MoonModel::rotation(float hours) const
-{
-    // 15 degrees per hour was reverse engineered from the rotation matrices of the Morrowind scene graph.
-    // Note that this correlates to 360 / 24, which is a full rotation every 24 hours, so speed is a measure
-    // of whole rotations that could be completed in a day.
-    return 15.0f * mSpeed * hours;
-}
-
-MWRender::MoonState::Phase MoonModel::phase(const TimeStamp& gameTime) const
-{
-    // Morrowind starts with a full moon on 16 Last Seed and then begins to wane 17 Last Seed, working on 3 day phase cycle.
-
-    // If the moon didn't rise yet today, use yesterday's moon phase.
-    if(gameTime.getHour() < moonRiseHour(gameTime.getDay()))
-        return static_cast<MWRender::MoonState::Phase>((gameTime.getDay() / 3) % 8);
-    else
-        return static_cast<MWRender::MoonState::Phase>(((gameTime.getDay() + 1) / 3) % 8);
-}
+        if(gameTime.getHour() < moonRiseHourToday)
+        {
+            float moonRiseHourYesterday = moonRiseHour(gameTime.getDay() - 1);
+            if(moonRiseHourYesterday < 24)
+            {
+                float moonRiseAngleYesterday = rotation(24 - moonRiseHourYesterday);
+                if(moonRiseAngleYesterday < 180)
+                {
+                    // The moon rose but did not set yesterday, so accumulate yesterday's angle with how much we've travelled today.
+                    moonRiseAngleToday = rotation(gameTime.getHour()) + moonRiseAngleYesterday;
+                }
+            }
+        }
+        else
+        {
+            moonRiseAngleToday = rotation(gameTime.getHour() - moonRiseHourToday);
+        }
 
-inline float MoonModel::shadowBlend(float angle) const
-{
-    // The Fade End Angle and Fade Start Angle describe a region where the moon transitions from a solid disk
-    // that is roughly the color of the sky, to a textured surface.
-    // Depending on the current angle, the following values describe the ratio between the textured moon
-    // and the solid disk:
-    // 1. From Fade End Angle 1 to Fade Start Angle 1 (during moon rise): 0..1
-    // 2. From Fade Start Angle 1 to Fade Start Angle 2 (between moon rise and moon set): 1 (textured)
-    // 3. From Fade Start Angle 2 to Fade End Angle 2 (during moon set): 1..0
-    // 4. From Fade End Angle 2 to Fade End Angle 1 (between moon set and moon rise): 0 (solid disk)
-    float fadeAngle = mFadeStartAngle - mFadeEndAngle;
-    float fadeEndAngle2 = 180.0f - mFadeEndAngle;
-    float fadeStartAngle2 = 180.0f - mFadeStartAngle;
-    if((angle >= mFadeEndAngle) && (angle < mFadeStartAngle))
-        return (angle - mFadeEndAngle) / fadeAngle;
-    else if((angle >= mFadeStartAngle) && (angle < fadeStartAngle2))
-        return 1.0f;
-    else if((angle >= fadeStartAngle2) && (angle < fadeEndAngle2))
-        return (fadeEndAngle2 - angle) / fadeAngle;
-    else
-        return 0.0f;
-}
+        if(moonRiseAngleToday >= 180)
+        {
+            // The moon set today, reset the angle to the horizon.
+            moonRiseAngleToday = 0;
+        }
 
-inline float MoonModel::hourlyAlpha(float gameHour) const
-{
-    // The Fade Out Start / Finish and Fade In Start / Finish describe the hours at which the moon
-    // appears and disappears.
-    // Depending on the current hour, the following values describe how transparent the moon is.
-    // 1. From Fade Out Start to Fade Out Finish: 1..0
-    // 2. From Fade Out Finish to Fade In Start: 0 (transparent)
-    // 3. From Fade In Start to Fade In Finish: 0..1
-    // 4. From Fade In Finish to Fade Out Start: 1 (solid)
-    if((gameHour >= mFadeOutStart) && (gameHour < mFadeOutFinish))
-        return (mFadeOutFinish - gameHour) / (mFadeOutFinish - mFadeOutStart);
-    else if((gameHour >= mFadeOutFinish) && (gameHour < mFadeInStart))
-        return 0.0f;
-    else if((gameHour >= mFadeInStart) && (gameHour < mFadeInFinish))
-        return (gameHour - mFadeInStart) / (mFadeInFinish - mFadeInStart);
-    else
-        return 1.0f;
-}
+        return moonRiseAngleToday;
+    }
 
-inline float MoonModel::earlyMoonShadowAlpha(float angle) const
-{
-    // The Moon Shadow Early Fade Angle describes an arc relative to Fade End Angle.
-    // Depending on the current angle, the following values describe how transparent the moon is.
-    // 1. From Moon Shadow Early Fade Angle 1 to Fade End Angle 1 (during moon rise): 0..1
-    // 2. From Fade End Angle 1 to Fade End Angle 2 (between moon rise and moon set): 1 (solid)
-    // 3. From Fade End Angle 2 to Moon Shadow Early Fade Angle 2 (during moon set): 1..0
-    // 4. From Moon Shadow Early Fade Angle 2 to Moon Shadow Early Fade Angle 1: 0 (transparent)
-    float moonShadowEarlyFadeAngle1 = mFadeEndAngle - mMoonShadowEarlyFadeAngle;
-    float fadeEndAngle2 = 180.0f - mFadeEndAngle;
-    float moonShadowEarlyFadeAngle2 = fadeEndAngle2 + mMoonShadowEarlyFadeAngle;
-    if((angle >= moonShadowEarlyFadeAngle1) && (angle < mFadeEndAngle))
-        return (angle - moonShadowEarlyFadeAngle1) / mMoonShadowEarlyFadeAngle;
-    else if((angle >= mFadeEndAngle) && (angle < fadeEndAngle2))
-        return 1.0f;
-    else if((angle >= fadeEndAngle2) && (angle < moonShadowEarlyFadeAngle2))
-        return (moonShadowEarlyFadeAngle2 - angle) / mMoonShadowEarlyFadeAngle;
-    else
-        return 0.0f;
-}
+    inline float MoonModel::moonRiseHour(unsigned int daysPassed) const
+    {
+        // This arises from the start date of 16 Last Seed, 427
+        // TODO: Find an alternate formula that doesn't rely on this day being fixed.
+        static const unsigned int startDay = 16;
+
+        // This odd formula arises from the fact that on 16 Last Seed, 17 increments have occurred, meaning
+        // that upon starting a new game, it must only calculate the moon phase as far back as 1 Last Seed.
+        // Note that we don't modulo after adding the latest daily increment because other calculations need to
+        // know if doing so would cause the moon rise to be postponed until the next day (which happens when
+        // the moon rise hour is >= 24 in Morrowind).
+        return mDailyIncrement + std::fmod((daysPassed - 1 + startDay) * mDailyIncrement, 24.0f);
+    }
 
-WeatherManager::WeatherManager(MWRender::RenderingManager& rendering, MWWorld::ESMStore& store)
-    : mStore(store)
-    , mRendering(rendering)
-    , mSunriseTime(Fallback::Map::getFloat("Weather_Sunrise_Time"))
-    , mSunsetTime(Fallback::Map::getFloat("Weather_Sunset_Time"))
-    , mSunriseDuration(Fallback::Map::getFloat("Weather_Sunrise_Duration"))
-    , mSunsetDuration(Fallback::Map::getFloat("Weather_Sunset_Duration"))
-    , mSunPreSunsetTime(Fallback::Map::getFloat("Weather_Sun_Pre-Sunset_Time"))
-    , mNightFade(0, 0, 0, 1)
-    , mHoursBetweenWeatherChanges(Fallback::Map::getFloat("Weather_Hours_Between_Weather_Changes"))
-    , mRainSpeed(Fallback::Map::getFloat("Weather_Precip_Gravity"))
-    , mUnderwaterFog(Fallback::Map::getFloat("Water_UnderwaterSunriseFog"),
-                    Fallback::Map::getFloat("Water_UnderwaterDayFog"),
-                    Fallback::Map::getFloat("Water_UnderwaterSunsetFog"),
-                    Fallback::Map::getFloat("Water_UnderwaterNightFog"))
-    , mWeatherSettings()
-    , mMasser("Masser")
-    , mSecunda("Secunda")
-    , mWindSpeed(0.f)
-    , mCurrentWindSpeed(0.f)
-    , mNextWindSpeed(0.f)
-    , mIsStorm(false)
-    , mPrecipitation(false)
-    , mStormDirection(0,1,0)
-    , mCurrentRegion()
-    , mTimePassed(0)
-    , mFastForward(false)
-    , mWeatherUpdateTime(mHoursBetweenWeatherChanges)
-    , mTransitionFactor(0)
-    , mNightDayMode(Default)
-    , mCurrentWeather(0)
-    , mNextWeather(0)
-    , mQueuedWeather(0)
-    , mRegions()
-    , mResult()
-    , mAmbientSound(nullptr)
-    , mPlayingSoundID()
-{
-    mTimeSettings.mNightStart = mSunsetTime + mSunsetDuration;
-    mTimeSettings.mNightEnd = mSunriseTime;
-    mTimeSettings.mDayStart = mSunriseTime + mSunriseDuration;
-    mTimeSettings.mDayEnd = mSunsetTime;
-
-    mTimeSettings.addSetting("Sky");
-    mTimeSettings.addSetting("Ambient");
-    mTimeSettings.addSetting("Fog");
-    mTimeSettings.addSetting("Sun");
-
-    // Morrowind handles stars settings differently for other ones
-    mTimeSettings.mStarsPostSunsetStart = Fallback::Map::getFloat("Weather_Stars_Post-Sunset_Start");
-    mTimeSettings.mStarsPreSunriseFinish = Fallback::Map::getFloat("Weather_Stars_Pre-Sunrise_Finish");
-    mTimeSettings.mStarsFadingDuration = Fallback::Map::getFloat("Weather_Stars_Fading_Duration");
-
-    WeatherSetting starSetting = {
-        mTimeSettings.mStarsPreSunriseFinish,
-        mTimeSettings.mStarsFadingDuration - mTimeSettings.mStarsPreSunriseFinish,
-        mTimeSettings.mStarsPostSunsetStart,
-        mTimeSettings.mStarsFadingDuration - mTimeSettings.mStarsPostSunsetStart
-    };
-
-    mTimeSettings.mSunriseTransitions["Stars"] = starSetting;
-
-    mWeatherSettings.reserve(10);
-    // These distant land fog factor and offset values are the defaults MGE XE provides. Should be
-    // provided by settings somewhere?
-    addWeather("Clear", 1.0f, 0.0f); // 0
-    addWeather("Cloudy", 0.9f, 0.0f); // 1
-    addWeather("Foggy", 0.2f, 30.0f); // 2
-    addWeather("Overcast", 0.7f, 0.0f); // 3
-    addWeather("Rain", 0.5f, 10.0f); // 4
-    addWeather("Thunderstorm", 0.5f, 20.0f); // 5
-    addWeather("Ashstorm", 0.2f, 50.0f, "meshes\\ashcloud.nif"); // 6
-    addWeather("Blight", 0.2f, 60.0f, "meshes\\blightcloud.nif"); // 7
-    addWeather("Snow", 0.5f, 40.0f, "meshes\\snow.nif"); // 8
-    addWeather("Blizzard", 0.16f, 70.0f, "meshes\\blizzard.nif"); // 9
-
-    Store<ESM::Region>::iterator it = store.get<ESM::Region>().begin();
-    for(; it != store.get<ESM::Region>().end(); ++it)
+    inline float MoonModel::rotation(float hours) const
     {
-        std::string regionID = Misc::StringUtils::lowerCase(it->mId);
-        mRegions.insert(std::make_pair(regionID, RegionWeather(*it)));
+        // 15 degrees per hour was reverse engineered from the rotation matrices of the Morrowind scene graph.
+        // Note that this correlates to 360 / 24, which is a full rotation every 24 hours, so speed is a measure
+        // of whole rotations that could be completed in a day.
+        return 15.0f * mSpeed * hours;
     }
 
-    forceWeather(0);
-}
+    MWRender::MoonState::Phase MoonModel::phase(const TimeStamp& gameTime) const
+    {
+        // Morrowind starts with a full moon on 16 Last Seed and then begins to wane 17 Last Seed, working on 3 day phase cycle.
 
-WeatherManager::~WeatherManager()
-{
-    stopSounds();
-}
+        // If the moon didn't rise yet today, use yesterday's moon phase.
+        if(gameTime.getHour() < moonRiseHour(gameTime.getDay()))
+            return static_cast<MWRender::MoonState::Phase>((gameTime.getDay() / 3) % 8);
+        else
+            return static_cast<MWRender::MoonState::Phase>(((gameTime.getDay() + 1) / 3) % 8);
+    }
 
-void WeatherManager::changeWeather(const std::string& regionID, const unsigned int weatherID)
-{
-    // In Morrowind, this seems to have the following behavior, when applied to the current region:
-    // - When there is no transition in progress, start transitioning to the new weather.
-    // - If there is a transition in progress, queue up the transition and process it when the current one completes.
-    // - If there is a transition in progress, and a queued transition, overwrite the queued transition.
-    // - If multiple calls to ChangeWeather are made while paused (console up), only the last call will be used,
-    //   meaning that if there was no transition in progress, only the last ChangeWeather will be processed.
-    // If the region isn't current, Morrowind will store the new weather for the region in question.
-
-    if(weatherID < mWeatherSettings.size())
+    inline float MoonModel::shadowBlend(float angle) const
     {
-        std::string lowerCaseRegionID = Misc::StringUtils::lowerCase(regionID);
-        std::map<std::string, RegionWeather>::iterator it = mRegions.find(lowerCaseRegionID);
-        if(it != mRegions.end())
-        {
-            it->second.setWeather(weatherID);
-            regionalWeatherChanged(it->first, it->second);
-        }
+        // The Fade End Angle and Fade Start Angle describe a region where the moon transitions from a solid disk
+        // that is roughly the color of the sky, to a textured surface.
+        // Depending on the current angle, the following values describe the ratio between the textured moon
+        // and the solid disk:
+        // 1. From Fade End Angle 1 to Fade Start Angle 1 (during moon rise): 0..1
+        // 2. From Fade Start Angle 1 to Fade Start Angle 2 (between moon rise and moon set): 1 (textured)
+        // 3. From Fade Start Angle 2 to Fade End Angle 2 (during moon set): 1..0
+        // 4. From Fade End Angle 2 to Fade End Angle 1 (between moon set and moon rise): 0 (solid disk)
+        float fadeAngle = mFadeStartAngle - mFadeEndAngle;
+        float fadeEndAngle2 = 180.0f - mFadeEndAngle;
+        float fadeStartAngle2 = 180.0f - mFadeStartAngle;
+        if((angle >= mFadeEndAngle) && (angle < mFadeStartAngle))
+            return (angle - mFadeEndAngle) / fadeAngle;
+        else if((angle >= mFadeStartAngle) && (angle < fadeStartAngle2))
+            return 1.0f;
+        else if((angle >= fadeStartAngle2) && (angle < fadeEndAngle2))
+            return (fadeEndAngle2 - angle) / fadeAngle;
+        else
+            return 0.0f;
     }
-}
 
-void WeatherManager::modRegion(const std::string& regionID, const std::vector<char>& chances)
-{
-    // Sets the region's probability for various weather patterns. Note that this appears to be saved permanently.
-    // In Morrowind, this seems to have the following behavior when applied to the current region:
-    // - If the region supports the current weather, no change in current weather occurs.
-    // - If the region no longer supports the current weather, and there is no transition in progress, begin to
-    //   transition to a new supported weather type.
-    // - If the region no longer supports the current weather, and there is a transition in progress, queue a
-    //   transition to a new supported weather type.
-
-    std::string lowerCaseRegionID = Misc::StringUtils::lowerCase(regionID);
-    std::map<std::string, RegionWeather>::iterator it = mRegions.find(lowerCaseRegionID);
-    if(it != mRegions.end())
+    inline float MoonModel::hourlyAlpha(float gameHour) const
     {
-        it->second.setChances(chances);
-        regionalWeatherChanged(it->first, it->second);
+        // The Fade Out Start / Finish and Fade In Start / Finish describe the hours at which the moon
+        // appears and disappears.
+        // Depending on the current hour, the following values describe how transparent the moon is.
+        // 1. From Fade Out Start to Fade Out Finish: 1..0
+        // 2. From Fade Out Finish to Fade In Start: 0 (transparent)
+        // 3. From Fade In Start to Fade In Finish: 0..1
+        // 4. From Fade In Finish to Fade Out Start: 1 (solid)
+        if((gameHour >= mFadeOutStart) && (gameHour < mFadeOutFinish))
+            return (mFadeOutFinish - gameHour) / (mFadeOutFinish - mFadeOutStart);
+        else if((gameHour >= mFadeOutFinish) && (gameHour < mFadeInStart))
+            return 0.0f;
+        else if((gameHour >= mFadeInStart) && (gameHour < mFadeInFinish))
+            return (gameHour - mFadeInStart) / (mFadeInFinish - mFadeInStart);
+        else
+            return 1.0f;
     }
-}
 
-void WeatherManager::playerTeleported(const std::string& playerRegion, bool isExterior)
-{
-    // If the player teleports to an outdoors cell in a new region (for instance, by travelling), the weather needs to
-    // be changed immediately, and any transitions for the previous region discarded.
+    inline float MoonModel::earlyMoonShadowAlpha(float angle) const
     {
-        std::map<std::string, RegionWeather>::iterator it = mRegions.find(playerRegion);
-        if(it != mRegions.end() && playerRegion != mCurrentRegion)
-        {
-            mCurrentRegion = playerRegion;
-            forceWeather(it->second.getWeather());
-        }
+        // The Moon Shadow Early Fade Angle describes an arc relative to Fade End Angle.
+        // Depending on the current angle, the following values describe how transparent the moon is.
+        // 1. From Moon Shadow Early Fade Angle 1 to Fade End Angle 1 (during moon rise): 0..1
+        // 2. From Fade End Angle 1 to Fade End Angle 2 (between moon rise and moon set): 1 (solid)
+        // 3. From Fade End Angle 2 to Moon Shadow Early Fade Angle 2 (during moon set): 1..0
+        // 4. From Moon Shadow Early Fade Angle 2 to Moon Shadow Early Fade Angle 1: 0 (transparent)
+        float moonShadowEarlyFadeAngle1 = mFadeEndAngle - mMoonShadowEarlyFadeAngle;
+        float fadeEndAngle2 = 180.0f - mFadeEndAngle;
+        float moonShadowEarlyFadeAngle2 = fadeEndAngle2 + mMoonShadowEarlyFadeAngle;
+        if((angle >= moonShadowEarlyFadeAngle1) && (angle < mFadeEndAngle))
+            return (angle - moonShadowEarlyFadeAngle1) / mMoonShadowEarlyFadeAngle;
+        else if((angle >= mFadeEndAngle) && (angle < fadeEndAngle2))
+            return 1.0f;
+        else if((angle >= fadeEndAngle2) && (angle < moonShadowEarlyFadeAngle2))
+            return (moonShadowEarlyFadeAngle2 - angle) / mMoonShadowEarlyFadeAngle;
+        else
+            return 0.0f;
     }
-}
 
-float WeatherManager::calculateWindSpeed(int weatherId, float currentSpeed)
-{
-    float targetSpeed = std::min(8.0f * mWeatherSettings[weatherId].mWindSpeed, 70.f);
-    if (currentSpeed == 0.f)
-        currentSpeed = targetSpeed;
-
-    float multiplier = mWeatherSettings[weatherId].mRainEffect.empty() ? 1.f : 0.5f;
-    float updatedSpeed = (Misc::Rng::rollClosedProbability() - 0.5f) * multiplier * targetSpeed + currentSpeed;
+    WeatherManager::WeatherManager(MWRender::RenderingManager& rendering, MWWorld::ESMStore& store)
+        : mStore(store)
+        , mRendering(rendering)
+        , mSunriseTime(Fallback::Map::getFloat("Weather_Sunrise_Time"))
+        , mSunsetTime(Fallback::Map::getFloat("Weather_Sunset_Time"))
+        , mSunriseDuration(Fallback::Map::getFloat("Weather_Sunrise_Duration"))
+        , mSunsetDuration(Fallback::Map::getFloat("Weather_Sunset_Duration"))
+        , mSunPreSunsetTime(Fallback::Map::getFloat("Weather_Sun_Pre-Sunset_Time"))
+        , mNightFade(0, 0, 0, 1)
+        , mHoursBetweenWeatherChanges(Fallback::Map::getFloat("Weather_Hours_Between_Weather_Changes"))
+        , mRainSpeed(Fallback::Map::getFloat("Weather_Precip_Gravity"))
+        , mUnderwaterFog(Fallback::Map::getFloat("Water_UnderwaterSunriseFog"),
+                        Fallback::Map::getFloat("Water_UnderwaterDayFog"),
+                        Fallback::Map::getFloat("Water_UnderwaterSunsetFog"),
+                        Fallback::Map::getFloat("Water_UnderwaterNightFog"))
+        , mWeatherSettings()
+        , mMasser("Masser")
+        , mSecunda("Secunda")
+        , mWindSpeed(0.f)
+        , mCurrentWindSpeed(0.f)
+        , mNextWindSpeed(0.f)
+        , mIsStorm(false)
+        , mPrecipitation(false)
+        , mStormDirection(Weather::defaultDirection())
+        , mCurrentRegion()
+        , mTimePassed(0)
+        , mFastForward(false)
+        , mWeatherUpdateTime(mHoursBetweenWeatherChanges)
+        , mTransitionFactor(0)
+        , mNightDayMode(Default)
+        , mCurrentWeather(0)
+        , mNextWeather(0)
+        , mQueuedWeather(0)
+        , mRegions()
+        , mResult()
+        , mAmbientSound(nullptr)
+        , mPlayingSoundID()
+    {
+        mTimeSettings.mNightStart = mSunsetTime + mSunsetDuration;
+        mTimeSettings.mNightEnd = mSunriseTime;
+        mTimeSettings.mDayStart = mSunriseTime + mSunriseDuration;
+        mTimeSettings.mDayEnd = mSunsetTime;
+
+        mTimeSettings.addSetting("Sky");
+        mTimeSettings.addSetting("Ambient");
+        mTimeSettings.addSetting("Fog");
+        mTimeSettings.addSetting("Sun");
+
+        // Morrowind handles stars settings differently for other ones
+        mTimeSettings.mStarsPostSunsetStart = Fallback::Map::getFloat("Weather_Stars_Post-Sunset_Start");
+        mTimeSettings.mStarsPreSunriseFinish = Fallback::Map::getFloat("Weather_Stars_Pre-Sunrise_Finish");
+        mTimeSettings.mStarsFadingDuration = Fallback::Map::getFloat("Weather_Stars_Fading_Duration");
+
+        WeatherSetting starSetting = {
+            mTimeSettings.mStarsPreSunriseFinish,
+            mTimeSettings.mStarsFadingDuration - mTimeSettings.mStarsPreSunriseFinish,
+            mTimeSettings.mStarsPostSunsetStart,
+            mTimeSettings.mStarsFadingDuration - mTimeSettings.mStarsPostSunsetStart
+        };
 
-    if (updatedSpeed > 0.5f * targetSpeed && updatedSpeed < 2.f * targetSpeed)
-        currentSpeed = updatedSpeed;
+        mTimeSettings.mSunriseTransitions["Stars"] = starSetting;
+
+        mWeatherSettings.reserve(10);
+        // These distant land fog factor and offset values are the defaults MGE XE provides. Should be
+        // provided by settings somewhere?
+        addWeather("Clear", 1.0f, 0.0f); // 0
+        addWeather("Cloudy", 0.9f, 0.0f); // 1
+        addWeather("Foggy", 0.2f, 30.0f); // 2
+        addWeather("Overcast", 0.7f, 0.0f); // 3
+        addWeather("Rain", 0.5f, 10.0f); // 4
+        addWeather("Thunderstorm", 0.5f, 20.0f); // 5
+        addWeather("Ashstorm", 0.2f, 50.0f, "meshes\\ashcloud.nif"); // 6
+        addWeather("Blight", 0.2f, 60.0f, "meshes\\blightcloud.nif"); // 7
+        addWeather("Snow", 0.5f, 40.0f, "meshes\\snow.nif"); // 8
+        addWeather("Blizzard", 0.16f, 70.0f, "meshes\\blizzard.nif"); // 9
+
+        Store<ESM::Region>::iterator it = store.get<ESM::Region>().begin();
+        for(; it != store.get<ESM::Region>().end(); ++it)
+        {
+            std::string regionID = Misc::StringUtils::lowerCase(it->mId);
+            mRegions.insert(std::make_pair(regionID, RegionWeather(*it)));
+        }
 
-    return currentSpeed;
-}
+        forceWeather(0);
+    }
 
-void WeatherManager::update(float duration, bool paused, const TimeStamp& time, bool isExterior)
-{
-    MWWorld::ConstPtr player = MWMechanics::getPlayer();
+    WeatherManager::~WeatherManager()
+    {
+        stopSounds();
+    }
 
-    if(!paused || mFastForward)
+    void WeatherManager::changeWeather(const std::string& regionID, const unsigned int weatherID)
     {
-        // Add new transitions when either the player's current external region changes.
-        std::string playerRegion = Misc::StringUtils::lowerCase(player.getCell()->getCell()->mRegion);
-        if(updateWeatherTime() || updateWeatherRegion(playerRegion))
+        // In Morrowind, this seems to have the following behavior, when applied to the current region:
+        // - When there is no transition in progress, start transitioning to the new weather.
+        // - If there is a transition in progress, queue up the transition and process it when the current one completes.
+        // - If there is a transition in progress, and a queued transition, overwrite the queued transition.
+        // - If multiple calls to ChangeWeather are made while paused (console up), only the last call will be used,
+        //   meaning that if there was no transition in progress, only the last ChangeWeather will be processed.
+        // If the region isn't current, Morrowind will store the new weather for the region in question.
+
+        if(weatherID < mWeatherSettings.size())
         {
-            std::map<std::string, RegionWeather>::iterator it = mRegions.find(mCurrentRegion);
+            std::string lowerCaseRegionID = Misc::StringUtils::lowerCase(regionID);
+            std::map<std::string, RegionWeather>::iterator it = mRegions.find(lowerCaseRegionID);
             if(it != mRegions.end())
             {
-                addWeatherTransition(it->second.getWeather());
+                it->second.setWeather(weatherID);
+                regionalWeatherChanged(it->first, it->second);
             }
         }
-
-        updateWeatherTransitions(duration);
     }
 
-    bool isDay = time.getHour() >= mSunriseTime && time.getHour() <= mTimeSettings.mNightStart;
-    if (isExterior && !isDay)
-        mNightDayMode = ExteriorNight;
-    else if (!isExterior && isDay && mWeatherSettings[mCurrentWeather].mGlareView >= 0.5f)
-        mNightDayMode = InteriorDay;
-    else
-        mNightDayMode = Default;
-
-    if(!isExterior)
+    void WeatherManager::modRegion(const std::string& regionID, const std::vector<char>& chances)
     {
-        mRendering.setSkyEnabled(false);
-        stopSounds();
-        mWindSpeed = 0.f;
-        mCurrentWindSpeed = 0.f;
-        mNextWindSpeed = 0.f;
-        return;
-    }
+        // Sets the region's probability for various weather patterns. Note that this appears to be saved permanently.
+        // In Morrowind, this seems to have the following behavior when applied to the current region:
+        // - If the region supports the current weather, no change in current weather occurs.
+        // - If the region no longer supports the current weather, and there is no transition in progress, begin to
+        //   transition to a new supported weather type.
+        // - If the region no longer supports the current weather, and there is a transition in progress, queue a
+        //   transition to a new supported weather type.
 
-    calculateWeatherResult(time.getHour(), duration, paused);
+        std::string lowerCaseRegionID = Misc::StringUtils::lowerCase(regionID);
+        std::map<std::string, RegionWeather>::iterator it = mRegions.find(lowerCaseRegionID);
+        if(it != mRegions.end())
+        {
+            it->second.setChances(chances);
+            regionalWeatherChanged(it->first, it->second);
+        }
+    }
 
-    if (!paused)
+    void WeatherManager::playerTeleported(const std::string& playerRegion, bool isExterior)
     {
-        mWindSpeed = mResult.mWindSpeed;
-        mCurrentWindSpeed = mResult.mCurrentWindSpeed;
-        mNextWindSpeed = mResult.mNextWindSpeed;
+        // If the player teleports to an outdoors cell in a new region (for instance, by travelling), the weather needs to
+        // be changed immediately, and any transitions for the previous region discarded.
+        {
+            std::map<std::string, RegionWeather>::iterator it = mRegions.find(playerRegion);
+            if(it != mRegions.end() && playerRegion != mCurrentRegion)
+            {
+                mCurrentRegion = playerRegion;
+                forceWeather(it->second.getWeather());
+            }
+        }
     }
 
-    mIsStorm = mResult.mIsStorm;
+    float WeatherManager::calculateWindSpeed(int weatherId, float currentSpeed)
+    {
+        float targetSpeed = std::min(8.0f * mWeatherSettings[weatherId].mWindSpeed, 70.f);
+        if (currentSpeed == 0.f)
+            currentSpeed = targetSpeed;
+
+        float multiplier = mWeatherSettings[weatherId].mRainEffect.empty() ? 1.f : 0.5f;
+        float updatedSpeed = (Misc::Rng::rollClosedProbability() - 0.5f) * multiplier * targetSpeed + currentSpeed;
 
-    // For some reason Ash Storm is not considered as a precipitation weather in game
-    mPrecipitation = !(mResult.mParticleEffect.empty() && mResult.mRainEffect.empty())
-                                    && mResult.mParticleEffect != "meshes\\ashcloud.nif";
+        if (updatedSpeed > 0.5f * targetSpeed && updatedSpeed < 2.f * targetSpeed)
+            currentSpeed = updatedSpeed;
 
-    if (mIsStorm)
+        return currentSpeed;
+    }
+
+    void WeatherManager::update(float duration, bool paused, const TimeStamp& time, bool isExterior)
     {
-        osg::Vec3f stormDirection(0, 1, 0);
-        if (mResult.mParticleEffect == "meshes\\ashcloud.nif" || mResult.mParticleEffect == "meshes\\blightcloud.nif")
+        MWWorld::ConstPtr player = MWMechanics::getPlayer();
+
+        if(!paused || mFastForward)
         {
-            osg::Vec3f playerPos (MWMechanics::getPlayer().getRefData().getPosition().asVec3());
-            playerPos.z() = 0;
-            osg::Vec3f redMountainPos (25000, 70000, 0);
-            stormDirection = (playerPos - redMountainPos);
-            stormDirection.normalize();
+            // Add new transitions when either the player's current external region changes.
+            std::string playerRegion = Misc::StringUtils::lowerCase(player.getCell()->getCell()->mRegion);
+            if(updateWeatherTime() || updateWeatherRegion(playerRegion))
+            {
+                std::map<std::string, RegionWeather>::iterator it = mRegions.find(mCurrentRegion);
+                if(it != mRegions.end())
+                {
+                    addWeatherTransition(it->second.getWeather());
+                }
+            }
+
+            updateWeatherTransitions(duration);
         }
-        mStormDirection = stormDirection;
-        mRendering.getSkyManager()->setStormDirection(mStormDirection);
-    }
 
-    // disable sun during night
-    if (time.getHour() >= mTimeSettings.mNightStart || time.getHour() <= mSunriseTime)
-        mRendering.getSkyManager()->sunDisable();
-    else
-        mRendering.getSkyManager()->sunEnable();
+        bool isDay = time.getHour() >= mSunriseTime && time.getHour() <= mTimeSettings.mNightStart;
+        if (isExterior && !isDay)
+            mNightDayMode = ExteriorNight;
+        else if (!isExterior && isDay && mWeatherSettings[mCurrentWeather].mGlareView >= 0.5f)
+            mNightDayMode = InteriorDay;
+        else
+            mNightDayMode = Default;
 
-    // Update the sun direction.  Run it east to west at a fixed angle from overhead.
-    // The sun's speed at day and night may differ, since mSunriseTime and mNightStart
-    // mark when the sun is level with the horizon.
-    {
-        // Shift times into a 24-hour window beginning at mSunriseTime...
-        float adjustedHour = time.getHour();
-        float adjustedNightStart = mTimeSettings.mNightStart;
-        if ( time.getHour() < mSunriseTime )
-            adjustedHour += 24.f;
-        if ( mTimeSettings.mNightStart < mSunriseTime )
-            adjustedNightStart += 24.f;
-
-        const bool is_night = adjustedHour >= adjustedNightStart;
-        const float dayDuration = adjustedNightStart - mSunriseTime;
-        const float nightDuration = 24.f - dayDuration;
-
-        double theta;
-        if ( !is_night )
+        if(!isExterior)
         {
-            theta = static_cast<float>(osg::PI) * (adjustedHour - mSunriseTime) / dayDuration;
+            mRendering.setSkyEnabled(false);
+            stopSounds();
+            mWindSpeed = 0.f;
+            mCurrentWindSpeed = 0.f;
+            mNextWindSpeed = 0.f;
+            return;
         }
-        else
+
+        calculateWeatherResult(time.getHour(), duration, paused);
+
+        if (!paused)
         {
-            theta = static_cast<float>(osg::PI) - static_cast<float>(osg::PI) * (adjustedHour - adjustedNightStart) / nightDuration;
+            mWindSpeed = mResult.mWindSpeed;
+            mCurrentWindSpeed = mResult.mCurrentWindSpeed;
+            mNextWindSpeed = mResult.mNextWindSpeed;
         }
 
-        osg::Vec3f final(
-            static_cast<float>(cos(theta)),
-            -0.268f, // approx tan( -15 degrees )
-            static_cast<float>(sin(theta)));
-        mRendering.setSunDirection( final * -1 );
-    }
+        mIsStorm = mResult.mIsStorm;
 
-    float underwaterFog = mUnderwaterFog.getValue(time.getHour(), mTimeSettings, "Fog");
+        // For some reason Ash Storm is not considered as a precipitation weather in game
+        mPrecipitation = !(mResult.mParticleEffect.empty() && mResult.mRainEffect.empty())
+                                        && mResult.mParticleEffect != "meshes\\ashcloud.nif";
 
-    float peakHour = mSunriseTime + (mTimeSettings.mNightStart - mSunriseTime) / 2;
-    float glareFade = 1.f;
-    if (time.getHour() < mSunriseTime || time.getHour() > mTimeSettings.mNightStart)
-        glareFade = 0.f;
-    else if (time.getHour() < peakHour)
-        glareFade = 1.f - (peakHour - time.getHour()) / (peakHour - mSunriseTime);
-    else
-        glareFade = 1.f - (time.getHour() - peakHour) / (mTimeSettings.mNightStart - peakHour);
+        mStormDirection = calculateStormDirection(mResult.mParticleEffect);
+        mRendering.getSkyManager()->setStormParticleDirection(mStormDirection);
 
-    mRendering.getSkyManager()->setGlareTimeOfDayFade(glareFade);
+        // disable sun during night
+        if (time.getHour() >= mTimeSettings.mNightStart || time.getHour() <= mSunriseTime)
+            mRendering.getSkyManager()->sunDisable();
+        else
+            mRendering.getSkyManager()->sunEnable();
 
-    mRendering.getSkyManager()->setMasserState(mMasser.calculateState(time));
-    mRendering.getSkyManager()->setSecundaState(mSecunda.calculateState(time));
+        // Update the sun direction.  Run it east to west at a fixed angle from overhead.
+        // The sun's speed at day and night may differ, since mSunriseTime and mNightStart
+        // mark when the sun is level with the horizon.
+        {
+            // Shift times into a 24-hour window beginning at mSunriseTime...
+            float adjustedHour = time.getHour();
+            float adjustedNightStart = mTimeSettings.mNightStart;
+            if ( time.getHour() < mSunriseTime )
+                adjustedHour += 24.f;
+            if ( mTimeSettings.mNightStart < mSunriseTime )
+                adjustedNightStart += 24.f;
+
+            const bool is_night = adjustedHour >= adjustedNightStart;
+            const float dayDuration = adjustedNightStart - mSunriseTime;
+            const float nightDuration = 24.f - dayDuration;
+
+            double theta;
+            if ( !is_night )
+            {
+                theta = static_cast<float>(osg::PI) * (adjustedHour - mSunriseTime) / dayDuration;
+            }
+            else
+            {
+                theta = static_cast<float>(osg::PI) - static_cast<float>(osg::PI) * (adjustedHour - adjustedNightStart) / nightDuration;
+            }
 
-    mRendering.configureFog(mResult.mFogDepth, underwaterFog, mResult.mDLFogFactor,
-                            mResult.mDLFogOffset/100.0f, mResult.mFogColor);
-    mRendering.setAmbientColour(mResult.mAmbientColor);
-    mRendering.setSunColour(mResult.mSunColor, mResult.mSunColor * mResult.mGlareView * glareFade);
+            osg::Vec3f final(
+                static_cast<float>(cos(theta)),
+                -0.268f, // approx tan( -15 degrees )
+                static_cast<float>(sin(theta)));
+            mRendering.setSunDirection( final * -1 );
+        }
 
-    mRendering.getSkyManager()->setWeather(mResult);
+        float underwaterFog = mUnderwaterFog.getValue(time.getHour(), mTimeSettings, "Fog");
 
-    // Play sounds
-    if (mPlayingSoundID != mResult.mAmbientLoopSoundID)
-    {
-        stopSounds();
-        if (!mResult.mAmbientLoopSoundID.empty())
-            mAmbientSound = MWBase::Environment::get().getSoundManager()->playSound(
-                mResult.mAmbientLoopSoundID, mResult.mAmbientSoundVolume, 1.0,
-                MWSound::Type::Sfx, MWSound::PlayMode::Loop
-            );
-        mPlayingSoundID = mResult.mAmbientLoopSoundID;
-    }
-    else if (mAmbientSound)
-        mAmbientSound->setVolume(mResult.mAmbientSoundVolume);
-}
+        float peakHour = mSunriseTime + (mTimeSettings.mNightStart - mSunriseTime) / 2;
+        float glareFade = 1.f;
+        if (time.getHour() < mSunriseTime || time.getHour() > mTimeSettings.mNightStart)
+            glareFade = 0.f;
+        else if (time.getHour() < peakHour)
+            glareFade = 1.f - (peakHour - time.getHour()) / (peakHour - mSunriseTime);
+        else
+            glareFade = 1.f - (time.getHour() - peakHour) / (mTimeSettings.mNightStart - peakHour);
 
-void WeatherManager::stopSounds()
-{
-    if (mAmbientSound)
-        MWBase::Environment::get().getSoundManager()->stopSound(mAmbientSound);
-    mAmbientSound = nullptr;
-    mPlayingSoundID.clear();
-}
+        mRendering.getSkyManager()->setGlareTimeOfDayFade(glareFade);
 
-float WeatherManager::getWindSpeed() const
-{
-    return mWindSpeed;
-}
+        mRendering.getSkyManager()->setMasserState(mMasser.calculateState(time));
+        mRendering.getSkyManager()->setSecundaState(mSecunda.calculateState(time));
 
-bool WeatherManager::isInStorm() const
-{
-    return mIsStorm;
-}
+        mRendering.configureFog(mResult.mFogDepth, underwaterFog, mResult.mDLFogFactor,
+                                mResult.mDLFogOffset/100.0f, mResult.mFogColor);
+        mRendering.setAmbientColour(mResult.mAmbientColor);
+        mRendering.setSunColour(mResult.mSunColor, mResult.mSunColor * mResult.mGlareView * glareFade);
 
-osg::Vec3f WeatherManager::getStormDirection() const
-{
-    return mStormDirection;
-}
+        mRendering.getSkyManager()->setWeather(mResult);
 
-void WeatherManager::advanceTime(double hours, bool incremental)
-{
-    // In Morrowind, when the player sleeps/waits, serves jail time, travels, or trains, all weather transitions are
-    // immediately applied, regardless of whatever transition time might have been remaining.
-    mTimePassed += hours;
-    mFastForward = !incremental ? true : mFastForward;
-}
+        // Play sounds
+        if (mPlayingSoundID != mResult.mAmbientLoopSoundID)
+        {
+            stopSounds();
+            if (!mResult.mAmbientLoopSoundID.empty())
+                mAmbientSound = MWBase::Environment::get().getSoundManager()->playSound(
+                    mResult.mAmbientLoopSoundID, mResult.mAmbientSoundVolume, 1.0,
+                    MWSound::Type::Sfx, MWSound::PlayMode::Loop
+                );
+            mPlayingSoundID = mResult.mAmbientLoopSoundID;
+        }
+        else if (mAmbientSound)
+            mAmbientSound->setVolume(mResult.mAmbientSoundVolume);
+    }
 
-unsigned int WeatherManager::getWeatherID() const
-{
-    return mCurrentWeather;
-}
+    void WeatherManager::stopSounds()
+    {
+        if (mAmbientSound)
+            MWBase::Environment::get().getSoundManager()->stopSound(mAmbientSound);
+        mAmbientSound = nullptr;
+        mPlayingSoundID.clear();
+    }
 
-NightDayMode WeatherManager::getNightDayMode() const
-{
-    return mNightDayMode;
-}
+    float WeatherManager::getWindSpeed() const
+    {
+        return mWindSpeed;
+    }
 
-bool WeatherManager::useTorches(float hour) const
-{
-    bool isDark = hour < mSunriseTime || hour > mTimeSettings.mNightStart;
+    bool WeatherManager::isInStorm() const
+    {
+        return mIsStorm;
+    }
 
-    return isDark && !mPrecipitation;
-}
+    osg::Vec3f WeatherManager::getStormDirection() const
+    {
+        return mStormDirection;
+    }
 
-void WeatherManager::write(ESM::ESMWriter& writer, Loading::Listener& progress)
-{
-    ESM::WeatherState state;
-    state.mCurrentRegion = mCurrentRegion;
-    state.mTimePassed = mTimePassed;
-    state.mFastForward = mFastForward;
-    state.mWeatherUpdateTime = mWeatherUpdateTime;
-    state.mTransitionFactor = mTransitionFactor;
-    state.mCurrentWeather = mCurrentWeather;
-    state.mNextWeather = mNextWeather;
-    state.mQueuedWeather = mQueuedWeather;
-
-    std::map<std::string, RegionWeather>::iterator it = mRegions.begin();
-    for(; it != mRegions.end(); ++it)
+    void WeatherManager::advanceTime(double hours, bool incremental)
     {
-        state.mRegions.insert(std::make_pair(it->first, it->second));
+        // In Morrowind, when the player sleeps/waits, serves jail time, travels, or trains, all weather transitions are
+        // immediately applied, regardless of whatever transition time might have been remaining.
+        mTimePassed += hours;
+        mFastForward = !incremental ? true : mFastForward;
     }
 
-    writer.startRecord(ESM::REC_WTHR);
-    state.save(writer);
-    writer.endRecord(ESM::REC_WTHR);
-}
+    unsigned int WeatherManager::getWeatherID() const
+    {
+        return mCurrentWeather;
+    }
 
-bool WeatherManager::readRecord(ESM::ESMReader& reader, uint32_t type)
-{
-    if(ESM::REC_WTHR == type)
+    NightDayMode WeatherManager::getNightDayMode() const
     {
-        static const int oldestCompatibleSaveFormat = 2;
-        if(reader.getFormat() < oldestCompatibleSaveFormat)
+        return mNightDayMode;
+    }
+
+    bool WeatherManager::useTorches(float hour) const
+    {
+        bool isDark = hour < mSunriseTime || hour > mTimeSettings.mNightStart;
+
+        return isDark && !mPrecipitation;
+    }
+
+    void WeatherManager::write(ESM::ESMWriter& writer, Loading::Listener& progress)
+    {
+        ESM::WeatherState state;
+        state.mCurrentRegion = mCurrentRegion;
+        state.mTimePassed = mTimePassed;
+        state.mFastForward = mFastForward;
+        state.mWeatherUpdateTime = mWeatherUpdateTime;
+        state.mTransitionFactor = mTransitionFactor;
+        state.mCurrentWeather = mCurrentWeather;
+        state.mNextWeather = mNextWeather;
+        state.mQueuedWeather = mQueuedWeather;
+
+        std::map<std::string, RegionWeather>::iterator it = mRegions.begin();
+        for(; it != mRegions.end(); ++it)
         {
-            // Weather state isn't really all that important, so to preserve older save games, we'll just discard the
-            // older weather records, rather than fail to handle the record.
-            reader.skipRecord();
+            state.mRegions.insert(std::make_pair(it->first, it->second));
         }
-        else
+
+        writer.startRecord(ESM::REC_WTHR);
+        state.save(writer);
+        writer.endRecord(ESM::REC_WTHR);
+    }
+
+    bool WeatherManager::readRecord(ESM::ESMReader& reader, uint32_t type)
+    {
+        if(ESM::REC_WTHR == type)
         {
-            ESM::WeatherState state;
-            state.load(reader);
-
-            mCurrentRegion.swap(state.mCurrentRegion);
-            mTimePassed = state.mTimePassed;
-            mFastForward = state.mFastForward;
-            mWeatherUpdateTime = state.mWeatherUpdateTime;
-            mTransitionFactor = state.mTransitionFactor;
-            mCurrentWeather = state.mCurrentWeather;
-            mNextWeather = state.mNextWeather;
-            mQueuedWeather = state.mQueuedWeather;
-
-            mRegions.clear();
-            importRegions();
-
-            for(std::map<std::string, ESM::RegionWeatherState>::iterator it = state.mRegions.begin(); it != state.mRegions.end(); ++it)
+            static const int oldestCompatibleSaveFormat = 2;
+            if(reader.getFormat() < oldestCompatibleSaveFormat)
+            {
+                // Weather state isn't really all that important, so to preserve older save games, we'll just discard the
+                // older weather records, rather than fail to handle the record.
+                reader.skipRecord();
+            }
+            else
             {
-                std::map<std::string, RegionWeather>::iterator found = mRegions.find(it->first);
-                if (found != mRegions.end())
+                ESM::WeatherState state;
+                state.load(reader);
+
+                mCurrentRegion.swap(state.mCurrentRegion);
+                mTimePassed = state.mTimePassed;
+                mFastForward = state.mFastForward;
+                mWeatherUpdateTime = state.mWeatherUpdateTime;
+                mTransitionFactor = state.mTransitionFactor;
+                mCurrentWeather = state.mCurrentWeather;
+                mNextWeather = state.mNextWeather;
+                mQueuedWeather = state.mQueuedWeather;
+
+                mRegions.clear();
+                importRegions();
+
+                for(std::map<std::string, ESM::RegionWeatherState>::iterator it = state.mRegions.begin(); it != state.mRegions.end(); ++it)
                 {
-                    found->second = RegionWeather(it->second);
+                    std::map<std::string, RegionWeather>::iterator found = mRegions.find(it->first);
+                    if (found != mRegions.end())
+                    {
+                        found->second = RegionWeather(it->second);
+                    }
                 }
             }
+
+            return true;
         }
 
-        return true;
+        return false;
     }
 
-    return false;
-}
+    void WeatherManager::clear()
+    {
+        stopSounds();
 
-void WeatherManager::clear()
-{
-    stopSounds();
-
-    mCurrentRegion = "";
-    mTimePassed = 0.0f;
-    mWeatherUpdateTime = 0.0f;
-    forceWeather(0);
-    mRegions.clear();
-    importRegions();
-}
+        mCurrentRegion = "";
+        mTimePassed = 0.0f;
+        mWeatherUpdateTime = 0.0f;
+        forceWeather(0);
+        mRegions.clear();
+        importRegions();
+    }
 
-inline void WeatherManager::addWeather(const std::string& name,
-                                       float dlFactor, float dlOffset,
-                                       const std::string& particleEffect)
-{
-    static const float fStromWindSpeed = mStore.get<ESM::GameSetting>().find("fStromWindSpeed")->mValue.getFloat();
+    inline void WeatherManager::addWeather(const std::string& name,
+                                        float dlFactor, float dlOffset,
+                                        const std::string& particleEffect)
+    {
+        static const float fStromWindSpeed = mStore.get<ESM::GameSetting>().find("fStromWindSpeed")->mValue.getFloat();
 
-    Weather weather(name, fStromWindSpeed, mRainSpeed, dlFactor, dlOffset, particleEffect);
+        Weather weather(name, fStromWindSpeed, mRainSpeed, dlFactor, dlOffset, particleEffect);
 
-    mWeatherSettings.push_back(weather);
-}
+        mWeatherSettings.push_back(weather);
+    }
 
-inline void WeatherManager::importRegions()
-{
-    for(const ESM::Region& region : mStore.get<ESM::Region>())
+    inline void WeatherManager::importRegions()
     {
-        std::string regionID = Misc::StringUtils::lowerCase(region.mId);
-        mRegions.insert(std::make_pair(regionID, RegionWeather(region)));
+        for(const ESM::Region& region : mStore.get<ESM::Region>())
+        {
+            std::string regionID = Misc::StringUtils::lowerCase(region.mId);
+            mRegions.insert(std::make_pair(regionID, RegionWeather(region)));
+        }
     }
-}
 
-inline void WeatherManager::regionalWeatherChanged(const std::string& regionID, RegionWeather& region)
-{
-    // If the region is current, then add a weather transition for it.
-    MWWorld::ConstPtr player = MWMechanics::getPlayer();
-    if(player.isInCell())
+    inline void WeatherManager::regionalWeatherChanged(const std::string& regionID, RegionWeather& region)
     {
-        if(Misc::StringUtils::ciEqual(regionID, mCurrentRegion))
+        // If the region is current, then add a weather transition for it.
+        MWWorld::ConstPtr player = MWMechanics::getPlayer();
+        if(player.isInCell())
         {
-            addWeatherTransition(region.getWeather());
+            if(Misc::StringUtils::ciEqual(regionID, mCurrentRegion))
+            {
+                addWeatherTransition(region.getWeather());
+            }
         }
     }
-}
 
-inline bool WeatherManager::updateWeatherTime()
-{
-    mWeatherUpdateTime -= mTimePassed;
-    mTimePassed = 0.0f;
-    if(mWeatherUpdateTime <= 0.0f)
+    inline bool WeatherManager::updateWeatherTime()
     {
-        // Expire all regional weather, so that any call to getWeather() will return a new weather ID.
-        std::map<std::string, RegionWeather>::iterator it = mRegions.begin();
-        for(; it != mRegions.end(); ++it)
+        mWeatherUpdateTime -= mTimePassed;
+        mTimePassed = 0.0f;
+        if(mWeatherUpdateTime <= 0.0f)
         {
-            it->second.setWeather(invalidWeatherID);
-        }
+            // Expire all regional weather, so that any call to getWeather() will return a new weather ID.
+            std::map<std::string, RegionWeather>::iterator it = mRegions.begin();
+            for(; it != mRegions.end(); ++it)
+            {
+                it->second.setWeather(invalidWeatherID);
+            }
 
-        mWeatherUpdateTime += mHoursBetweenWeatherChanges;
+            mWeatherUpdateTime += mHoursBetweenWeatherChanges;
 
-        return true;
-    }
+            return true;
+        }
 
-    return false;
-}
+        return false;
+    }
 
-inline bool WeatherManager::updateWeatherRegion(const std::string& playerRegion)
-{
-    if(!playerRegion.empty() && playerRegion != mCurrentRegion)
+    inline bool WeatherManager::updateWeatherRegion(const std::string& playerRegion)
     {
-        mCurrentRegion = playerRegion;
+        if(!playerRegion.empty() && playerRegion != mCurrentRegion)
+        {
+            mCurrentRegion = playerRegion;
 
-        return true;
-    }
+            return true;
+        }
 
-    return false;
-}
+        return false;
+    }
 
-inline void WeatherManager::updateWeatherTransitions(const float elapsedRealSeconds)
-{
-    // When a player chooses to train, wait, or serves jail time, any transitions will be fast forwarded to the last
-    // weather type set, regardless of the remaining transition time.
-    if(!mFastForward && inTransition())
+    inline void WeatherManager::updateWeatherTransitions(const float elapsedRealSeconds)
     {
-        const float delta = mWeatherSettings[mNextWeather].transitionDelta();
-        mTransitionFactor -= elapsedRealSeconds * delta;
-        if(mTransitionFactor <= 0.0f)
+        // When a player chooses to train, wait, or serves jail time, any transitions will be fast forwarded to the last
+        // weather type set, regardless of the remaining transition time.
+        if(!mFastForward && inTransition())
         {
-            mCurrentWeather = mNextWeather;
-            mNextWeather = mQueuedWeather;
-            mQueuedWeather = invalidWeatherID;
+            const float delta = mWeatherSettings[mNextWeather].transitionDelta();
+            mTransitionFactor -= elapsedRealSeconds * delta;
+            if(mTransitionFactor <= 0.0f)
+            {
+                mCurrentWeather = mNextWeather;
+                mNextWeather = mQueuedWeather;
+                mQueuedWeather = invalidWeatherID;
 
-            // We may have begun processing the queued transition, so we need to apply the remaining time towards it.
-            if(inTransition())
+                // We may have begun processing the queued transition, so we need to apply the remaining time towards it.
+                if(inTransition())
+                {
+                    const float newDelta = mWeatherSettings[mNextWeather].transitionDelta();
+                    const float remainingSeconds = -(mTransitionFactor / delta);
+                    mTransitionFactor = 1.0f - (remainingSeconds * newDelta);
+                }
+                else
+                {
+                    mTransitionFactor = 0.0f;
+                }
+            }
+        }
+        else
+        {
+            if(mQueuedWeather != invalidWeatherID)
             {
-                const float newDelta = mWeatherSettings[mNextWeather].transitionDelta();
-                const float remainingSeconds = -(mTransitionFactor / delta);
-                mTransitionFactor = 1.0f - (remainingSeconds * newDelta);
+                mCurrentWeather = mQueuedWeather;
             }
-            else
+            else if(mNextWeather != invalidWeatherID)
             {
-                mTransitionFactor = 0.0f;
+                mCurrentWeather = mNextWeather;
             }
+
+            mNextWeather = invalidWeatherID;
+            mQueuedWeather = invalidWeatherID;
+            mFastForward = false;
         }
     }
-    else
-    {
-        if(mQueuedWeather != invalidWeatherID)
-        {
-            mCurrentWeather = mQueuedWeather;
-        }
-        else if(mNextWeather != invalidWeatherID)
-        {
-            mCurrentWeather = mNextWeather;
-        }
 
+    inline void WeatherManager::forceWeather(const int weatherID)
+    {
+        mTransitionFactor = 0.0f;
+        mCurrentWeather = weatherID;
         mNextWeather = invalidWeatherID;
         mQueuedWeather = invalidWeatherID;
-        mFastForward = false;
     }
-}
-
-inline void WeatherManager::forceWeather(const int weatherID)
-{
-    mTransitionFactor = 0.0f;
-    mCurrentWeather = weatherID;
-    mNextWeather = invalidWeatherID;
-    mQueuedWeather = invalidWeatherID;
-}
 
-inline bool WeatherManager::inTransition()
-{
-    return mNextWeather != invalidWeatherID;
-}
-
-inline void WeatherManager::addWeatherTransition(const int weatherID)
-{
-    // In order to work like ChangeWeather expects, this method begins transitioning to the new weather immediately if
-    // no transition is in progress, otherwise it queues it to be transitioned.
-
-    assert(weatherID >= 0 && static_cast<size_t>(weatherID) < mWeatherSettings.size());
-
-    if(!inTransition() && (weatherID != mCurrentWeather))
+    inline bool WeatherManager::inTransition()
     {
-        mNextWeather = weatherID;
-        mTransitionFactor = 1.0f;
+        return mNextWeather != invalidWeatherID;
     }
-    else if(inTransition() && (weatherID != mNextWeather))
-    {
-        mQueuedWeather = weatherID;
-    }
-}
 
-inline void WeatherManager::calculateWeatherResult(const float gameHour,
-                                                   const float elapsedSeconds,
-                                                   const bool isPaused)
-{
-    float flash = 0.0f;
-    if(!inTransition())
-    {
-        calculateResult(mCurrentWeather, gameHour);
-        flash = mWeatherSettings[mCurrentWeather].calculateThunder(1.0f, elapsedSeconds, isPaused);
-    }
-    else
+    inline void WeatherManager::addWeatherTransition(const int weatherID)
     {
-        calculateTransitionResult(1 - mTransitionFactor, gameHour);
-        float currentFlash = mWeatherSettings[mCurrentWeather].calculateThunder(mTransitionFactor,
-                                                                                elapsedSeconds,
-                                                                                isPaused);
-        float nextFlash = mWeatherSettings[mNextWeather].calculateThunder(1 - mTransitionFactor,
-                                                                          elapsedSeconds,
-                                                                          isPaused);
-        flash = currentFlash + nextFlash;
-    }
-    osg::Vec4f flashColor(flash, flash, flash, 0.0f);
+        // In order to work like ChangeWeather expects, this method begins transitioning to the new weather immediately if
+        // no transition is in progress, otherwise it queues it to be transitioned.
 
-    mResult.mFogColor += flashColor;
-    mResult.mAmbientColor += flashColor;
-    mResult.mSunColor += flashColor;
-}
+        assert(weatherID >= 0 && static_cast<size_t>(weatherID) < mWeatherSettings.size());
 
-inline void WeatherManager::calculateResult(const int weatherID, const float gameHour)
-{
-    const Weather& current = mWeatherSettings[weatherID];
-
-    mResult.mCloudTexture = current.mCloudTexture;
-    mResult.mCloudBlendFactor = 0;
-    mResult.mNextWindSpeed = 0;
-    mResult.mWindSpeed = mResult.mCurrentWindSpeed = calculateWindSpeed(weatherID, mWindSpeed);
-    mResult.mBaseWindSpeed = mWeatherSettings[weatherID].mWindSpeed;
-
-    mResult.mCloudSpeed = current.mCloudSpeed;
-    mResult.mGlareView = current.mGlareView;
-    mResult.mAmbientLoopSoundID = current.mAmbientLoopSoundID;
-    mResult.mAmbientSoundVolume = 1.f;
-    mResult.mPrecipitationAlpha = 1.f;
-
-    mResult.mIsStorm = current.mIsStorm;
-
-    mResult.mRainSpeed = current.mRainSpeed;
-    mResult.mRainEntranceSpeed = current.mRainEntranceSpeed;
-    mResult.mRainDiameter = current.mRainDiameter;
-    mResult.mRainMinHeight = current.mRainMinHeight;
-    mResult.mRainMaxHeight = current.mRainMaxHeight;
-    mResult.mRainMaxRaindrops = current.mRainMaxRaindrops;
-
-    mResult.mParticleEffect = current.mParticleEffect;
-    mResult.mRainEffect = current.mRainEffect;
-
-    mResult.mNight = (gameHour < mSunriseTime || gameHour > mTimeSettings.mNightStart + mTimeSettings.mStarsPostSunsetStart - mTimeSettings.mStarsFadingDuration);
-
-    mResult.mFogDepth = current.mLandFogDepth.getValue(gameHour, mTimeSettings, "Fog");
-    mResult.mFogColor = current.mFogColor.getValue(gameHour, mTimeSettings, "Fog");
-    mResult.mAmbientColor = current.mAmbientColor.getValue(gameHour, mTimeSettings, "Ambient");
-    mResult.mSunColor = current.mSunColor.getValue(gameHour, mTimeSettings, "Sun");
-    mResult.mSkyColor = current.mSkyColor.getValue(gameHour, mTimeSettings, "Sky");
-    mResult.mNightFade = mNightFade.getValue(gameHour, mTimeSettings, "Stars");
-    mResult.mDLFogFactor = current.mDL.FogFactor;
-    mResult.mDLFogOffset = current.mDL.FogOffset;
-
-    WeatherSetting setting = mTimeSettings.getSetting("Sun");
-    float preSunsetTime = setting.mPreSunsetTime;
-
-    if (gameHour >= mTimeSettings.mDayEnd - preSunsetTime)
-    {
-        float factor = 1.f;
-        if (preSunsetTime > 0)
-            factor = (gameHour - (mTimeSettings.mDayEnd - preSunsetTime)) / preSunsetTime;
-        factor = std::min(1.f, factor);
-        mResult.mSunDiscColor = lerp(osg::Vec4f(1,1,1,1), current.mSunDiscSunsetColor, factor);
-        // The SunDiscSunsetColor in the INI isn't exactly the resulting color on screen, most likely because
-        // MW applied the color to the ambient term as well. After the ambient and emissive terms are added together, the fixed pipeline
-        // would then clamp the total lighting to (1,1,1). A noticeable change in color tone can be observed when only one of the color components gets clamped.
-        // Unfortunately that means we can't use the INI color as is, have to replicate the above nonsense.
-        mResult.mSunDiscColor = mResult.mSunDiscColor + osg::componentMultiply(mResult.mSunDiscColor, mResult.mAmbientColor);
-        for (int i=0; i<3; ++i)
-            mResult.mSunDiscColor[i] = std::min(1.f, mResult.mSunDiscColor[i]);
+        if(!inTransition() && (weatherID != mCurrentWeather))
+        {
+            mNextWeather = weatherID;
+            mTransitionFactor = 1.0f;
+        }
+        else if(inTransition() && (weatherID != mNextWeather))
+        {
+            mQueuedWeather = weatherID;
+        }
     }
-    else
-        mResult.mSunDiscColor = osg::Vec4f(1,1,1,1);
 
-    if (gameHour >= mTimeSettings.mDayEnd)
+    inline void WeatherManager::calculateWeatherResult(const float gameHour,
+                                                    const float elapsedSeconds,
+                                                    const bool isPaused)
     {
-        // sunset
-        float fade = std::min(1.f, (gameHour - mTimeSettings.mDayEnd) / (mTimeSettings.mNightStart - mTimeSettings.mDayEnd));
-        fade = fade*fade;
-        mResult.mSunDiscColor.a() = 1.f - fade;
-    }
-    else if (gameHour >= mTimeSettings.mNightEnd && gameHour <= mTimeSettings.mNightEnd + mSunriseDuration / 2.f)
-    {
-        // sunrise
-        mResult.mSunDiscColor.a() = gameHour - mTimeSettings.mNightEnd;
-    }
-    else
-        mResult.mSunDiscColor.a() = 1;
-
-}
-
-inline void WeatherManager::calculateTransitionResult(const float factor, const float gameHour)
-{
-    calculateResult(mCurrentWeather, gameHour);
-    const MWRender::WeatherResult current = mResult;
-    calculateResult(mNextWeather, gameHour);
-    const MWRender::WeatherResult other = mResult;
-
-    mResult.mCloudTexture = current.mCloudTexture;
-    mResult.mNextCloudTexture = other.mCloudTexture;
-    mResult.mCloudBlendFactor = mWeatherSettings[mNextWeather].cloudBlendFactor(factor);
-
-    mResult.mFogColor = lerp(current.mFogColor, other.mFogColor, factor);
-    mResult.mSunColor = lerp(current.mSunColor, other.mSunColor, factor);
-    mResult.mSkyColor = lerp(current.mSkyColor, other.mSkyColor, factor);
-
-    mResult.mAmbientColor = lerp(current.mAmbientColor, other.mAmbientColor, factor);
-    mResult.mSunDiscColor = lerp(current.mSunDiscColor, other.mSunDiscColor, factor);
-    mResult.mFogDepth = lerp(current.mFogDepth, other.mFogDepth, factor);
-    mResult.mDLFogFactor = lerp(current.mDLFogFactor, other.mDLFogFactor, factor);
-    mResult.mDLFogOffset = lerp(current.mDLFogOffset, other.mDLFogOffset, factor);
+        float flash = 0.0f;
+        if(!inTransition())
+        {
+            calculateResult(mCurrentWeather, gameHour);
+            flash = mWeatherSettings[mCurrentWeather].calculateThunder(1.0f, elapsedSeconds, isPaused);
+        }
+        else
+        {
+            calculateTransitionResult(1 - mTransitionFactor, gameHour);
+            float currentFlash = mWeatherSettings[mCurrentWeather].calculateThunder(mTransitionFactor,
+                                                                                    elapsedSeconds,
+                                                                                    isPaused);
+            float nextFlash = mWeatherSettings[mNextWeather].calculateThunder(1 - mTransitionFactor,
+                                                                            elapsedSeconds,
+                                                                            isPaused);
+            flash = currentFlash + nextFlash;
+        }
+        osg::Vec4f flashColor(flash, flash, flash, 0.0f);
 
-    mResult.mCurrentWindSpeed = calculateWindSpeed(mCurrentWeather, mCurrentWindSpeed);
-    mResult.mNextWindSpeed = calculateWindSpeed(mNextWeather, mNextWindSpeed);
-    mResult.mBaseWindSpeed = lerp(current.mBaseWindSpeed, other.mBaseWindSpeed, factor);
+        mResult.mFogColor += flashColor;
+        mResult.mAmbientColor += flashColor;
+        mResult.mSunColor += flashColor;
+    }
 
-    mResult.mWindSpeed = lerp(mResult.mCurrentWindSpeed, mResult.mNextWindSpeed, factor);
-    mResult.mCloudSpeed = lerp(current.mCloudSpeed, other.mCloudSpeed, factor);
-    mResult.mGlareView = lerp(current.mGlareView, other.mGlareView, factor);
-    mResult.mNightFade = lerp(current.mNightFade, other.mNightFade, factor);
+    inline void WeatherManager::calculateResult(const int weatherID, const float gameHour)
+    {
+        const Weather& current = mWeatherSettings[weatherID];
 
-    mResult.mNight = current.mNight;
+        mResult.mCloudTexture = current.mCloudTexture;
+        mResult.mCloudBlendFactor = 0;
+        mResult.mNextWindSpeed = 0;
+        mResult.mWindSpeed = mResult.mCurrentWindSpeed = calculateWindSpeed(weatherID, mWindSpeed);
+        mResult.mBaseWindSpeed = mWeatherSettings[weatherID].mWindSpeed;
 
-    float threshold = mWeatherSettings[mNextWeather].mRainThreshold;
-    if (threshold <= 0)
-        threshold = 0.5f;
+        mResult.mCloudSpeed = current.mCloudSpeed;
+        mResult.mGlareView = current.mGlareView;
+        mResult.mAmbientLoopSoundID = current.mAmbientLoopSoundID;
+        mResult.mAmbientSoundVolume = 1.f;
+        mResult.mPrecipitationAlpha = 1.f;
 
-    if(factor < threshold)
-    {
         mResult.mIsStorm = current.mIsStorm;
-        mResult.mParticleEffect = current.mParticleEffect;
-        mResult.mRainEffect = current.mRainEffect;
+
         mResult.mRainSpeed = current.mRainSpeed;
         mResult.mRainEntranceSpeed = current.mRainEntranceSpeed;
-        mResult.mAmbientSoundVolume = 1 - factor / threshold;
-        mResult.mPrecipitationAlpha = mResult.mAmbientSoundVolume;
-        mResult.mAmbientLoopSoundID = current.mAmbientLoopSoundID;
         mResult.mRainDiameter = current.mRainDiameter;
         mResult.mRainMinHeight = current.mRainMinHeight;
         mResult.mRainMaxHeight = current.mRainMaxHeight;
         mResult.mRainMaxRaindrops = current.mRainMaxRaindrops;
+
+        mResult.mParticleEffect = current.mParticleEffect;
+        mResult.mRainEffect = current.mRainEffect;
+
+        mResult.mNight = (gameHour < mSunriseTime || gameHour > mTimeSettings.mNightStart + mTimeSettings.mStarsPostSunsetStart - mTimeSettings.mStarsFadingDuration);
+
+        mResult.mFogDepth = current.mLandFogDepth.getValue(gameHour, mTimeSettings, "Fog");
+        mResult.mFogColor = current.mFogColor.getValue(gameHour, mTimeSettings, "Fog");
+        mResult.mAmbientColor = current.mAmbientColor.getValue(gameHour, mTimeSettings, "Ambient");
+        mResult.mSunColor = current.mSunColor.getValue(gameHour, mTimeSettings, "Sun");
+        mResult.mSkyColor = current.mSkyColor.getValue(gameHour, mTimeSettings, "Sky");
+        mResult.mNightFade = mNightFade.getValue(gameHour, mTimeSettings, "Stars");
+        mResult.mDLFogFactor = current.mDL.FogFactor;
+        mResult.mDLFogOffset = current.mDL.FogOffset;
+
+        WeatherSetting setting = mTimeSettings.getSetting("Sun");
+        float preSunsetTime = setting.mPreSunsetTime;
+
+        if (gameHour >= mTimeSettings.mDayEnd - preSunsetTime)
+        {
+            float factor = 1.f;
+            if (preSunsetTime > 0)
+                factor = (gameHour - (mTimeSettings.mDayEnd - preSunsetTime)) / preSunsetTime;
+            factor = std::min(1.f, factor);
+            mResult.mSunDiscColor = lerp(osg::Vec4f(1,1,1,1), current.mSunDiscSunsetColor, factor);
+            // The SunDiscSunsetColor in the INI isn't exactly the resulting color on screen, most likely because
+            // MW applied the color to the ambient term as well. After the ambient and emissive terms are added together, the fixed pipeline
+            // would then clamp the total lighting to (1,1,1). A noticeable change in color tone can be observed when only one of the color components gets clamped.
+            // Unfortunately that means we can't use the INI color as is, have to replicate the above nonsense.
+            mResult.mSunDiscColor = mResult.mSunDiscColor + osg::componentMultiply(mResult.mSunDiscColor, mResult.mAmbientColor);
+            for (int i=0; i<3; ++i)
+                mResult.mSunDiscColor[i] = std::min(1.f, mResult.mSunDiscColor[i]);
+        }
+        else
+            mResult.mSunDiscColor = osg::Vec4f(1,1,1,1);
+
+        if (gameHour >= mTimeSettings.mDayEnd)
+        {
+            // sunset
+            float fade = std::min(1.f, (gameHour - mTimeSettings.mDayEnd) / (mTimeSettings.mNightStart - mTimeSettings.mDayEnd));
+            fade = fade*fade;
+            mResult.mSunDiscColor.a() = 1.f - fade;
+        }
+        else if (gameHour >= mTimeSettings.mNightEnd && gameHour <= mTimeSettings.mNightEnd + mSunriseDuration / 2.f)
+        {
+            // sunrise
+            mResult.mSunDiscColor.a() = gameHour - mTimeSettings.mNightEnd;
+        }
+        else
+            mResult.mSunDiscColor.a() = 1;
+
+        mResult.mStormDirection = calculateStormDirection(mResult.mParticleEffect);
     }
-    else
+
+    inline void WeatherManager::calculateTransitionResult(const float factor, const float gameHour)
     {
-        mResult.mIsStorm = other.mIsStorm;
-        mResult.mParticleEffect = other.mParticleEffect;
-        mResult.mRainEffect = other.mRainEffect;
-        mResult.mRainSpeed = other.mRainSpeed;
-        mResult.mRainEntranceSpeed = other.mRainEntranceSpeed;
-        mResult.mAmbientSoundVolume = (factor - threshold) / (1 - threshold);
-        mResult.mPrecipitationAlpha = mResult.mAmbientSoundVolume;
-        mResult.mAmbientLoopSoundID = other.mAmbientLoopSoundID;
-
-        mResult.mRainDiameter = other.mRainDiameter;
-        mResult.mRainMinHeight = other.mRainMinHeight;
-        mResult.mRainMaxHeight = other.mRainMaxHeight;
-        mResult.mRainMaxRaindrops = other.mRainMaxRaindrops;
+        calculateResult(mCurrentWeather, gameHour);
+        const MWRender::WeatherResult current = mResult;
+        calculateResult(mNextWeather, gameHour);
+        const MWRender::WeatherResult other = mResult;
+
+        mResult.mStormDirection = current.mStormDirection;
+        mResult.mNextStormDirection = other.mStormDirection;
+
+        mResult.mCloudTexture = current.mCloudTexture;
+        mResult.mNextCloudTexture = other.mCloudTexture;
+        mResult.mCloudBlendFactor = mWeatherSettings[mNextWeather].cloudBlendFactor(factor);
+
+        mResult.mFogColor = lerp(current.mFogColor, other.mFogColor, factor);
+        mResult.mSunColor = lerp(current.mSunColor, other.mSunColor, factor);
+        mResult.mSkyColor = lerp(current.mSkyColor, other.mSkyColor, factor);
+
+        mResult.mAmbientColor = lerp(current.mAmbientColor, other.mAmbientColor, factor);
+        mResult.mSunDiscColor = lerp(current.mSunDiscColor, other.mSunDiscColor, factor);
+        mResult.mFogDepth = lerp(current.mFogDepth, other.mFogDepth, factor);
+        mResult.mDLFogFactor = lerp(current.mDLFogFactor, other.mDLFogFactor, factor);
+        mResult.mDLFogOffset = lerp(current.mDLFogOffset, other.mDLFogOffset, factor);
+
+        mResult.mCurrentWindSpeed = calculateWindSpeed(mCurrentWeather, mCurrentWindSpeed);
+        mResult.mNextWindSpeed = calculateWindSpeed(mNextWeather, mNextWindSpeed);
+        mResult.mBaseWindSpeed = lerp(current.mBaseWindSpeed, other.mBaseWindSpeed, factor);
+
+        mResult.mWindSpeed = lerp(mResult.mCurrentWindSpeed, mResult.mNextWindSpeed, factor);
+        mResult.mCloudSpeed = lerp(current.mCloudSpeed, other.mCloudSpeed, factor);
+        mResult.mGlareView = lerp(current.mGlareView, other.mGlareView, factor);
+        mResult.mNightFade = lerp(current.mNightFade, other.mNightFade, factor);
+
+        mResult.mNight = current.mNight;
+
+        float threshold = mWeatherSettings[mNextWeather].mRainThreshold;
+        if (threshold <= 0.f)
+            threshold = 0.5f;
+
+        if(factor < threshold)
+        {
+            mResult.mIsStorm = current.mIsStorm;
+            mResult.mParticleEffect = current.mParticleEffect;
+            mResult.mRainEffect = current.mRainEffect;
+            mResult.mRainSpeed = current.mRainSpeed;
+            mResult.mRainEntranceSpeed = current.mRainEntranceSpeed;
+            mResult.mAmbientSoundVolume = 1.f - factor / threshold;
+            mResult.mPrecipitationAlpha = mResult.mAmbientSoundVolume;
+            mResult.mAmbientLoopSoundID = current.mAmbientLoopSoundID;
+            mResult.mRainDiameter = current.mRainDiameter;
+            mResult.mRainMinHeight = current.mRainMinHeight;
+            mResult.mRainMaxHeight = current.mRainMaxHeight;
+            mResult.mRainMaxRaindrops = current.mRainMaxRaindrops;
+        }
+        else
+        {
+            mResult.mIsStorm = other.mIsStorm;
+            mResult.mParticleEffect = other.mParticleEffect;
+            mResult.mRainEffect = other.mRainEffect;
+            mResult.mRainSpeed = other.mRainSpeed;
+            mResult.mRainEntranceSpeed = other.mRainEntranceSpeed;
+            mResult.mAmbientSoundVolume = (factor - threshold) / (1 - threshold);
+            mResult.mPrecipitationAlpha = mResult.mAmbientSoundVolume;
+            mResult.mAmbientLoopSoundID = other.mAmbientLoopSoundID;
+
+            mResult.mRainDiameter = other.mRainDiameter;
+            mResult.mRainMinHeight = other.mRainMinHeight;
+            mResult.mRainMaxHeight = other.mRainMaxHeight;
+            mResult.mRainMaxRaindrops = other.mRainMaxRaindrops;
+        }
     }
 }
 
+
diff --git a/apps/openmw/mwworld/weather.hpp b/apps/openmw/mwworld/weather.hpp
index a3928465c4..21b2fae9f8 100644
--- a/apps/openmw/mwworld/weather.hpp
+++ b/apps/openmw/mwworld/weather.hpp
@@ -115,6 +115,8 @@ namespace MWWorld
     class Weather
     {
     public:
+        static osg::Vec3f defaultDirection();
+
         Weather(const std::string& name,
                 float stormWindSpeed,
                 float rainSpeed,
@@ -189,6 +191,8 @@ namespace MWWorld
 
         std::string mRainEffect;
 
+        osg::Vec3f mStormDirection;
+
         // Note: For Weather Blight, there is a "Disease Chance" (=0.1) setting. But according to MWSFD this feature
         // is broken in the vanilla game and was disabled.
 
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 6709ee842e..dcd4874e90 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -516,6 +516,10 @@ namespace Shader
             // We could fall back to a texture size uniform if EXT_gpu_shader4 is missing
         }
 
+        bool simpleLighting = false;
+        node.getUserValue("simpleLighting", simpleLighting);
+        defineMap["simpleLighting"] = simpleLighting ? "1" : "0";
+
         if (writableStateSet->getMode(GL_ALPHA_TEST) != osg::StateAttribute::INHERIT && !previousAddedState->hasMode(GL_ALPHA_TEST))
             removedState->setMode(GL_ALPHA_TEST, writableStateSet->getMode(GL_ALPHA_TEST));
         // This disables the deprecated fixed-function alpha test
diff --git a/files/shaders/CMakeLists.txt b/files/shaders/CMakeLists.txt
index 04446d2982..d86719f318 100644
--- a/files/shaders/CMakeLists.txt
+++ b/files/shaders/CMakeLists.txt
@@ -36,6 +36,9 @@ set(SHADER_FILES
     gui_fragment.glsl
     debug_vertex.glsl
     debug_fragment.glsl
+    sky_vertex.glsl
+    sky_fragment.glsl
+    skypasses.glsl
 )
 
 copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_SHADERS_ROOT} ${DDIRRELATIVE} "${SHADER_FILES}")
diff --git a/files/shaders/lighting.glsl b/files/shaders/lighting.glsl
index 177017f822..dc9c297a2f 100644
--- a/files/shaders/lighting.glsl
+++ b/files/shaders/lighting.glsl
@@ -87,6 +87,16 @@ void doLighting(vec3 viewPos, vec3 viewNormal, out vec3 diffuseLight, out vec3 a
     }
 }
 
+// Simplest lighting which only takes into account sun and ambient. Currently used for our weather particle systems.
+void doSimpleLighting(vec3 viewPos, vec3 viewNormal, out vec3 diffuseLight, out vec3 ambientLight)
+{
+    vec3 ambientOut, diffuseOut;
+
+    perLightSun(diffuseOut, viewPos, viewNormal);
+    ambientLight = gl_LightModel.ambient.xyz;
+    diffuseLight = diffuseOut;
+}
+
 vec3 getSpecular(vec3 viewNormal, vec3 viewDirection, float shininess, vec3 matSpec)
 {
     vec3 lightDir = normalize(lcalcPosition(0));
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index 6f6cede4e4..26107abb10 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -63,7 +63,7 @@ uniform bool simpleWater;
 varying float euclideanDepth;
 varying float linearDepth;
 
-#define PER_PIXEL_LIGHTING (@normalMap || @forcePPL)
+#define PER_PIXEL_LIGHTING ((@normalMap || @forcePPL) && !@simpleLighting)
 
 #if !PER_PIXEL_LIGHTING
 centroid varying vec3 passLighting;
@@ -170,6 +170,9 @@ void main()
 #endif
 
     float shadowing = unshadowedLightRatio(linearDepth);
+#if @simpleLighting
+    gl_FragData[0].xyz *= passLighting;
+#else
     vec3 lighting;
 #if !PER_PIXEL_LIGHTING
     lighting = passLighting + shadowDiffuseLighting * shadowing;
@@ -180,8 +183,8 @@ void main()
     lighting = diffuseColor.xyz * diffuseLight + getAmbientColor().xyz * ambientLight + emission;
     clampLightingResult(lighting);
 #endif
-
     gl_FragData[0].xyz *= lighting;
+#endif
 
 #if @envMap && !@preLightEnv
     gl_FragData[0].xyz += texture2D(envMap, envTexCoordGen).xyz * envMapColor.xyz * envLuma;
@@ -207,6 +210,7 @@ void main()
 #endif
         gl_FragData[0].xyz += getSpecular(normalize(viewNormal), normalize(passViewPos.xyz), shininess, matSpec) * shadowing;
     }
+
 #if @radialFog
     float depth;
     // For the less detailed mesh of simple water we need to recalculate depth on per-pixel basis
diff --git a/files/shaders/objects_vertex.glsl b/files/shaders/objects_vertex.glsl
index 969fe5903e..5f208ffc25 100644
--- a/files/shaders/objects_vertex.glsl
+++ b/files/shaders/objects_vertex.glsl
@@ -50,7 +50,7 @@ varying vec2 specularMapUV;
 varying float euclideanDepth;
 varying float linearDepth;
 
-#define PER_PIXEL_LIGHTING (@normalMap || @forcePPL)
+#define PER_PIXEL_LIGHTING ((@normalMap || @forcePPL) && !@simpleLighting)
 
 #if !PER_PIXEL_LIGHTING
 centroid varying vec3 passLighting;
@@ -126,7 +126,11 @@ void main(void)
 
 #if !PER_PIXEL_LIGHTING
     vec3 diffuseLight, ambientLight;
-    doLighting(viewPos.xyz, viewNormal, diffuseLight, ambientLight, shadowDiffuseLighting);
+#if @simpleLighting
+    doSimpleLighting(passViewPos, viewNormal, diffuseLight, ambientLight);
+#else
+    doLighting(passViewPos, viewNormal, diffuseLight, ambientLight, shadowDiffuseLighting);
+#endif
     vec3 emission = getEmissionColor().xyz * emissiveMult;
     passLighting = getDiffuseColor().xyz * diffuseLight + getAmbientColor().xyz * ambientLight + emission;
     clampLightingResult(passLighting);
diff --git a/files/shaders/sky_fragment.glsl b/files/shaders/sky_fragment.glsl
new file mode 100644
index 0000000000..c064619579
--- /dev/null
+++ b/files/shaders/sky_fragment.glsl
@@ -0,0 +1,84 @@
+#version 120
+
+#include "skypasses.glsl"
+
+uniform int pass;
+uniform sampler2D diffuseMap;
+uniform sampler2D maskMap;      // PASS_MOON
+uniform float opacity;          // PASS_CLOUDS, PASS_ATMOSPHERE_NIGHT
+uniform vec4 moonBlend;         // PASS_MOON
+uniform vec4 atmosphereFade;    // PASS_MOON
+
+varying vec2 diffuseMapUV;
+varying vec4 passColor;
+
+void paintAtmosphere(inout vec4 color)
+{
+    color = gl_FrontMaterial.emission;
+    color.a *= passColor.a;
+}
+
+void paintAtmosphereNight(inout vec4 color)
+{
+    color = texture2D(diffuseMap, diffuseMapUV);
+    color.a *= passColor.a * opacity;
+}
+
+void paintClouds(inout vec4 color)
+{
+    color = texture2D(diffuseMap, diffuseMapUV);
+    color.a *= passColor.a * opacity;
+    color.xyz = clamp(color.xyz * gl_FrontMaterial.emission.xyz, 0.0, 1.0);
+}
+
+void paintMoon(inout vec4 color)
+{
+    vec4 phase = texture2D(diffuseMap, diffuseMapUV);
+    vec4 mask = texture2D(maskMap, diffuseMapUV);
+
+    vec4 blendedLayer = phase * moonBlend;
+    color = vec4(blendedLayer.xyz + atmosphereFade.xyz, atmosphereFade.a * mask.a);
+}
+
+void paintSun(inout vec4 color)
+{
+    color = texture2D(diffuseMap, diffuseMapUV);
+    color.a *= gl_FrontMaterial.diffuse.a;
+}
+
+void paintSunflashQuery(inout vec4 color)
+{
+    const float threshold = 0.8;
+
+    color = texture2D(diffuseMap, diffuseMapUV);
+    if (color.a <= threshold)
+        discard;
+}
+
+void paintSunglare(inout vec4 color)
+{
+    color = gl_FrontMaterial.emission;
+    color.a = gl_FrontMaterial.diffuse.a;
+}
+
+void main()
+{
+    vec4 color = vec4(0.0);
+
+    if (pass == PASS_ATMOSPHERE)
+        paintAtmosphere(color);
+    else if (pass == PASS_ATMOSPHERE_NIGHT)
+        paintAtmosphereNight(color);
+    else if (pass == PASS_CLOUDS)
+        paintClouds(color);
+    else if (pass == PASS_MOON)
+        paintMoon(color);
+    else if (pass == PASS_SUN)
+        paintSun(color);
+    else if (pass == PASS_SUNFLASH_QUERY)
+        paintSunflashQuery(color);
+    else if (pass == PASS_SUNGLARE)
+        paintSunglare(color);
+
+    gl_FragData[0] = color;
+}
diff --git a/files/shaders/sky_vertex.glsl b/files/shaders/sky_vertex.glsl
new file mode 100644
index 0000000000..9c676140ac
--- /dev/null
+++ b/files/shaders/sky_vertex.glsl
@@ -0,0 +1,20 @@
+#version 120
+
+#include "skypasses.glsl"
+
+uniform mat4 projectionMatrix;
+uniform int pass;
+
+varying vec4 passColor;
+varying vec2 diffuseMapUV;
+
+void main()
+{
+    gl_Position = projectionMatrix * (gl_ModelViewMatrix * gl_Vertex);
+    passColor = gl_Color;
+
+    if (pass == PASS_CLOUDS)
+        diffuseMapUV = (gl_TextureMatrix[0] * gl_MultiTexCoord0).xy;
+    else
+        diffuseMapUV = gl_MultiTexCoord0.xy;
+}
diff --git a/files/shaders/skypasses.glsl b/files/shaders/skypasses.glsl
new file mode 100644
index 0000000000..e80d4eb259
--- /dev/null
+++ b/files/shaders/skypasses.glsl
@@ -0,0 +1,7 @@
+#define PASS_ATMOSPHERE 0
+#define PASS_ATMOSPHERE_NIGHT 1
+#define PASS_CLOUDS 2
+#define PASS_MOON 3
+#define PASS_SUN 4
+#define PASS_SUNFLASH_QUERY 5
+#define PASS_SUNGLARE 6

From 566380c0d663b397b724c993f0b9dc11d23db36d Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sun, 24 Oct 2021 12:37:49 +0400
Subject: [PATCH 1529/2859] Fix showscenegraph warnings

---
 components/sceneutil/serialize.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/sceneutil/serialize.cpp b/components/sceneutil/serialize.cpp
index 703b63af7d..134f7c29dd 100644
--- a/components/sceneutil/serialize.cpp
+++ b/components/sceneutil/serialize.cpp
@@ -125,6 +125,7 @@ void registerSerializers()
             "SceneUtil::CompositeStateSetUpdater",
             "SceneUtil::LightListCallback",
             "SceneUtil::LightManagerUpdateCallback",
+            "SceneUtil::NodeCallback",
             "SceneUtil::UpdateRigBounds",
             "SceneUtil::UpdateRigGeometry",
             "SceneUtil::LightSource",
@@ -132,6 +133,7 @@ void registerSerializers()
             "SceneUtil::DisableLight",
             "SceneUtil::MWShadowTechnique",
             "SceneUtil::TextKeyMapHolder",
+            "Shader::AddedState",
             "Shader::RemovedAlphaFunc",
             "NifOsg::LightManagerStateAttribute",
             "NifOsg::FlipController",

From a58f1a94e3a960e39e4dd5227f7a26cf9b0ee02d Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 23 Oct 2021 00:06:10 +0200
Subject: [PATCH 1530/2859] Add helpers for binary serialization

To construct serializer from given entities:
* Data source/destination - any value that has to be serialized/deserialized,
  usually already existing type.
* Format - functional object to define high level serialization logic to
  define specific format and data schema. Like order of fields, allocation.
* Visitor - functional object to define low level serialization logic to
  operator on given data part.
  * BinaryWriter - copies given value into provided buffer.
  * BinaryReader - copies value into given destination from provided buffer.
  * SizeAccumulator - calculates required buffer size for given data.
---
 apps/openmw_test_suite/CMakeLists.txt         |  4 +
 .../serialization/binaryreader.cpp            | 67 ++++++++++++++++
 .../serialization/binarywriter.cpp            | 57 +++++++++++++
 .../detournavigator/serialization/format.hpp  | 75 +++++++++++++++++
 .../serialization/integration.cpp             | 56 +++++++++++++
 .../serialization/sizeaccumulator.cpp         | 43 ++++++++++
 .../serialization/binaryreader.hpp            | 62 ++++++++++++++
 .../serialization/binarywriter.hpp            | 62 ++++++++++++++
 .../detournavigator/serialization/format.hpp  | 80 +++++++++++++++++++
 .../serialization/sizeaccumulator.hpp         | 41 ++++++++++
 10 files changed, 547 insertions(+)
 create mode 100644 apps/openmw_test_suite/detournavigator/serialization/binaryreader.cpp
 create mode 100644 apps/openmw_test_suite/detournavigator/serialization/binarywriter.cpp
 create mode 100644 apps/openmw_test_suite/detournavigator/serialization/format.hpp
 create mode 100644 apps/openmw_test_suite/detournavigator/serialization/integration.cpp
 create mode 100644 apps/openmw_test_suite/detournavigator/serialization/sizeaccumulator.cpp
 create mode 100644 components/detournavigator/serialization/binaryreader.hpp
 create mode 100644 components/detournavigator/serialization/binarywriter.hpp
 create mode 100644 components/detournavigator/serialization/format.hpp
 create mode 100644 components/detournavigator/serialization/sizeaccumulator.hpp

diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index 0390b0a772..a2a35e3aab 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -36,6 +36,10 @@ if (GTEST_FOUND AND GMOCK_FOUND)
         detournavigator/recastmeshobject.cpp
         detournavigator/navmeshtilescache.cpp
         detournavigator/tilecachedrecastmeshmanager.cpp
+        detournavigator/serialization/binaryreader.cpp
+        detournavigator/serialization/binarywriter.cpp
+        detournavigator/serialization/sizeaccumulator.cpp
+        detournavigator/serialization/integration.cpp
 
         settings/parser.cpp
 
diff --git a/apps/openmw_test_suite/detournavigator/serialization/binaryreader.cpp b/apps/openmw_test_suite/detournavigator/serialization/binaryreader.cpp
new file mode 100644
index 0000000000..d071326cf5
--- /dev/null
+++ b/apps/openmw_test_suite/detournavigator/serialization/binaryreader.cpp
@@ -0,0 +1,67 @@
+#include "format.hpp"
+
+#include <components/detournavigator/serialization/binaryreader.hpp>
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+#include <cstdint>
+#include <cstring>
+#include <vector>
+
+namespace
+{
+    using namespace testing;
+    using namespace DetourNavigator::Serialization;
+    using namespace DetourNavigator::SerializationTesting;
+
+    TEST(DetourNavigatorSerializationBinaryReaderTest, shouldReadArithmeticTypeValue)
+    {
+        std::uint32_t value = 42;
+        std::vector<std::byte> data(sizeof(value));
+        std::memcpy(data.data(), &value, sizeof(value));
+        BinaryReader binaryReader(data.data(), data.data() + data.size());
+        std::uint32_t result = 0;
+        const TestFormat<Mode::Read> format;
+        binaryReader(format, result);
+        EXPECT_EQ(result, 42);
+    }
+
+    TEST(DetourNavigatorSerializationBinaryReaderTest, shouldReadArithmeticTypeRangeValue)
+    {
+        const std::size_t count = 3;
+        std::vector<std::byte> data(sizeof(std::size_t) + count * sizeof(std::uint32_t));
+        std::memcpy(data.data(), &count, sizeof(count));
+        const std::uint32_t value1 = 960900021;
+        std::memcpy(data.data() + sizeof(count), &value1, sizeof(std::uint32_t));
+        const std::uint32_t value2 = 1235496234;
+        std::memcpy(data.data() + sizeof(count) + sizeof(std::uint32_t), &value2, sizeof(std::uint32_t));
+        const std::uint32_t value3 = 2342038092;
+        std::memcpy(data.data() + sizeof(count) + 2 * sizeof(std::uint32_t), &value3, sizeof(std::uint32_t));
+        BinaryReader binaryReader(data.data(), data.data() + data.size());
+        std::size_t resultCount = 0;
+        const TestFormat<Mode::Read> format;
+        binaryReader(format, resultCount);
+        std::vector<std::uint32_t> result(resultCount);
+        binaryReader(format, result.data(), result.size());
+        EXPECT_THAT(result, ElementsAre(value1, value2, value3));
+    }
+
+    TEST(DetourNavigatorSerializationBinaryReaderTest, forNotEnoughDataForArithmeticTypeShouldThrowException)
+    {
+        std::vector<std::byte> data(3);
+        BinaryReader binaryReader(data.data(), data.data() + data.size());
+        std::uint32_t result = 0;
+        const TestFormat<Mode::Read> format;
+        EXPECT_THROW(binaryReader(format, result), std::runtime_error);
+    }
+
+    TEST(DetourNavigatorSerializationBinaryReaderTest, forNotEnoughDataForArithmeticTypeRangeShouldThrowException)
+    {
+        std::vector<std::byte> data(7);
+        BinaryReader binaryReader(data.data(), data.data() + data.size());
+        std::vector<std::uint32_t> values(2);
+        const TestFormat<Mode::Read> format;
+        EXPECT_THROW(binaryReader(format, values.data(), values.size()), std::runtime_error);
+    }
+}
diff --git a/apps/openmw_test_suite/detournavigator/serialization/binarywriter.cpp b/apps/openmw_test_suite/detournavigator/serialization/binarywriter.cpp
new file mode 100644
index 0000000000..fccc2be3da
--- /dev/null
+++ b/apps/openmw_test_suite/detournavigator/serialization/binarywriter.cpp
@@ -0,0 +1,57 @@
+#include "format.hpp"
+
+#include <components/detournavigator/serialization/binarywriter.hpp>
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+#include <array>
+#include <cstdint>
+#include <vector>
+
+namespace
+{
+    using namespace testing;
+    using namespace DetourNavigator::Serialization;
+    using namespace DetourNavigator::SerializationTesting;
+
+    TEST(DetourNavigatorSerializationBinaryWriterTest, shouldWriteArithmeticTypeValue)
+    {
+        std::vector<std::byte> result(4);
+        BinaryWriter binaryWriter(result.data(), result.data() + result.size());
+        const TestFormat<Mode::Write> format;
+        binaryWriter(format, std::uint32_t(42));
+        EXPECT_THAT(result, ElementsAre(std::byte(42), std::byte(0), std::byte(0), std::byte(0)));
+    }
+
+    TEST(DetourNavigatorSerializationBinaryWriterTest, shouldWriteArithmeticTypeRangeValue)
+    {
+        std::vector<std::byte> result(8);
+        BinaryWriter binaryWriter(result.data(), result.data() + result.size());
+        std::vector<std::uint32_t> values({42, 13});
+        const TestFormat<Mode::Write> format;
+        binaryWriter(format, values.data(), values.size());
+        constexpr std::array<std::byte, 8> expected {
+            std::byte(42), std::byte(0), std::byte(0), std::byte(0),
+            std::byte(13), std::byte(0), std::byte(0), std::byte(0),
+        };
+        EXPECT_THAT(result, ElementsAreArray(expected));
+    }
+
+    TEST(DetourNavigatorSerializationBinaryWriterTest, forNotEnoughSpaceForArithmeticTypeShouldThrowException)
+    {
+        std::vector<std::byte> result(3);
+        BinaryWriter binaryWriter(result.data(), result.data() + result.size());
+        const TestFormat<Mode::Write> format;
+        EXPECT_THROW(binaryWriter(format, std::uint32_t(42)), std::runtime_error);
+    }
+
+    TEST(DetourNavigatorSerializationBinaryWriterTest, forNotEnoughSpaceForArithmeticTypeRangeShouldThrowException)
+    {
+        std::vector<std::byte> result(7);
+        BinaryWriter binaryWriter(result.data(), result.data() + result.size());
+        std::vector<std::uint32_t> values({42, 13});
+        const TestFormat<Mode::Write> format;
+        EXPECT_THROW(binaryWriter(format, values.data(), values.size()), std::runtime_error);
+    }
+}
diff --git a/apps/openmw_test_suite/detournavigator/serialization/format.hpp b/apps/openmw_test_suite/detournavigator/serialization/format.hpp
new file mode 100644
index 0000000000..7c5e26a0be
--- /dev/null
+++ b/apps/openmw_test_suite/detournavigator/serialization/format.hpp
@@ -0,0 +1,75 @@
+#ifndef OPENMW_TEST_SUITE_DETOURNAVIGATOR_SERIALIZATION_FORMAT_H
+#define OPENMW_TEST_SUITE_DETOURNAVIGATOR_SERIALIZATION_FORMAT_H
+
+#include <components/detournavigator/serialization/format.hpp>
+
+#include <utility>
+#include <type_traits>
+
+namespace DetourNavigator::SerializationTesting
+{
+    struct Pod
+    {
+        int mInt = 42;
+        double mDouble = 3.14;
+
+        friend bool operator==(const Pod& l, const Pod& r)
+        {
+            const auto tuple = [] (const Pod& v) { return std::tuple(v.mInt, v.mDouble); };
+            return tuple(l) == tuple(r);
+        }
+    };
+
+    enum Enum
+    {
+        A,
+        B,
+        C,
+    };
+
+    struct Composite
+    {
+        short mFloatArray[3] = {0};
+        std::vector<int> mIntVector;
+        std::vector<Enum> mEnumVector;
+        std::vector<Pod> mPodVector;
+        std::size_t mPodDataSize = 0;
+        std::vector<Pod> mPodBuffer;
+        std::size_t mCharDataSize = 0;
+        std::vector<char> mCharBuffer;
+    };
+
+    template <Serialization::Mode mode>
+    struct TestFormat : Serialization::Format<mode, TestFormat<mode>>
+    {
+        using Serialization::Format<mode, TestFormat<mode>>::operator();
+
+        template <class Visitor, class T>
+        auto operator()(Visitor&& visitor, T& value) const
+            -> std::enable_if_t<std::is_same_v<std::decay_t<T>, Pod>>
+        {
+            visitor(*this, value.mInt);
+            visitor(*this, value.mDouble);
+        }
+
+        template <class Visitor, class T>
+        auto operator()(Visitor&& visitor, T& value) const
+            -> std::enable_if_t<std::is_same_v<std::decay_t<T>, Composite>>
+        {
+            visitor(*this, value.mFloatArray);
+            visitor(*this, value.mIntVector);
+            visitor(*this, value.mEnumVector);
+            visitor(*this, value.mPodVector);
+            visitor(*this, value.mPodDataSize);
+            if constexpr (mode == Serialization::Mode::Read)
+                value.mPodBuffer.resize(value.mPodDataSize);
+            visitor(*this, value.mPodBuffer.data(), value.mPodDataSize);
+            visitor(*this, value.mCharDataSize);
+            if constexpr (mode == Serialization::Mode::Read)
+                value.mCharBuffer.resize(value.mCharDataSize);
+            visitor(*this, value.mCharBuffer.data(), value.mCharDataSize);
+        }
+    };
+}
+
+#endif
diff --git a/apps/openmw_test_suite/detournavigator/serialization/integration.cpp b/apps/openmw_test_suite/detournavigator/serialization/integration.cpp
new file mode 100644
index 0000000000..e7e8eacc20
--- /dev/null
+++ b/apps/openmw_test_suite/detournavigator/serialization/integration.cpp
@@ -0,0 +1,56 @@
+#include "format.hpp"
+
+#include <components/detournavigator/serialization/sizeaccumulator.hpp>
+#include <components/detournavigator/serialization/binarywriter.hpp>
+#include <components/detournavigator/serialization/binaryreader.hpp>
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+#include <vector>
+
+namespace
+{
+    using namespace testing;
+    using namespace DetourNavigator::Serialization;
+    using namespace DetourNavigator::SerializationTesting;
+
+    struct DetourNavigatorSerializationIntegrationTest : Test
+    {
+        Composite mComposite;
+
+        DetourNavigatorSerializationIntegrationTest()
+        {
+            mComposite.mIntVector = {4, 5, 6};
+            mComposite.mEnumVector = {Enum::A, Enum::B, Enum::C};
+            mComposite.mPodVector = {Pod {4, 23.87}, Pod {5, -31.76}, Pod {6, 65.12}};
+            mComposite.mPodBuffer = {Pod {7, 456.123}, Pod {8, -628.346}};
+            mComposite.mPodDataSize = mComposite.mPodBuffer.size();
+            std::string charData = "serialization";
+            mComposite.mCharBuffer = {charData.begin(), charData.end()};
+            mComposite.mCharDataSize = charData.size();
+        }
+    };
+
+    TEST_F(DetourNavigatorSerializationIntegrationTest, sizeAccumulatorShouldSupportCustomSerializer)
+    {
+        SizeAccumulator sizeAccumulator;
+        TestFormat<Mode::Write>{}(sizeAccumulator, mComposite);
+        EXPECT_EQ(sizeAccumulator.value(), 143);
+    }
+
+    TEST_F(DetourNavigatorSerializationIntegrationTest, binaryReaderShouldDeserializeDataWrittenByBinaryWriter)
+    {
+        std::vector<std::byte> data(143);
+        TestFormat<Mode::Write>{}(BinaryWriter(data.data(), data.data() + data.size()), mComposite);
+        Composite result;
+        TestFormat<Mode::Read>{}(BinaryReader(data.data(), data.data() + data.size()), result);
+        EXPECT_EQ(result.mIntVector, mComposite.mIntVector);
+        EXPECT_EQ(result.mEnumVector, mComposite.mEnumVector);
+        EXPECT_EQ(result.mPodVector, mComposite.mPodVector);
+        EXPECT_EQ(result.mPodDataSize, mComposite.mPodDataSize);
+        EXPECT_EQ(result.mPodBuffer, mComposite.mPodBuffer);
+        EXPECT_EQ(result.mCharDataSize, mComposite.mCharDataSize);
+        EXPECT_EQ(result.mCharBuffer, mComposite.mCharBuffer);
+    }
+}
diff --git a/apps/openmw_test_suite/detournavigator/serialization/sizeaccumulator.cpp b/apps/openmw_test_suite/detournavigator/serialization/sizeaccumulator.cpp
new file mode 100644
index 0000000000..39b7ea8646
--- /dev/null
+++ b/apps/openmw_test_suite/detournavigator/serialization/sizeaccumulator.cpp
@@ -0,0 +1,43 @@
+#include "format.hpp"
+
+#include <components/detournavigator/serialization/sizeaccumulator.hpp>
+
+#include <gtest/gtest.h>
+
+#include <cstddef>
+#include <cstdint>
+#include <variant>
+#include <vector>
+
+namespace
+{
+    using namespace testing;
+    using namespace DetourNavigator::Serialization;
+    using namespace DetourNavigator::SerializationTesting;
+
+    TEST(DetourNavigatorSerializationSizeAccumulatorTest, shouldProvideSizeForArithmeticType)
+    {
+        SizeAccumulator sizeAccumulator;
+        constexpr std::monostate format;
+        sizeAccumulator(format, std::uint32_t());
+        EXPECT_EQ(sizeAccumulator.value(), 4);
+    }
+
+    TEST(DetourNavigatorSerializationSizeAccumulatorTest, shouldProvideSizeForArithmeticTypeRange)
+    {
+        SizeAccumulator sizeAccumulator;
+        const std::uint64_t* const data = nullptr;
+        const std::size_t count = 3;
+        const std::monostate format;
+        sizeAccumulator(format, data, count);
+        EXPECT_EQ(sizeAccumulator.value(), 24);
+    }
+
+    TEST(DetourNavigatorSerializationSizeAccumulatorTest, shouldSupportCustomSerializer)
+    {
+        SizeAccumulator sizeAccumulator;
+        const TestFormat<Mode::Write> format;
+        sizeAccumulator(format, Pod {});
+        EXPECT_EQ(sizeAccumulator.value(), 12);
+    }
+}
diff --git a/components/detournavigator/serialization/binaryreader.hpp b/components/detournavigator/serialization/binaryreader.hpp
new file mode 100644
index 0000000000..0d75c3ac99
--- /dev/null
+++ b/components/detournavigator/serialization/binaryreader.hpp
@@ -0,0 +1,62 @@
+#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_SERIALIZATION_BINARYREADER_H
+#define OPENMW_COMPONENTS_DETOURNAVIGATOR_SERIALIZATION_BINARYREADER_H
+
+#include <cassert>
+#include <cstddef>
+#include <cstring>
+#include <stdexcept>
+#include <type_traits>
+
+namespace DetourNavigator::Serialization
+{
+    class BinaryReader
+    {
+    public:
+        explicit BinaryReader(const std::byte* pos, const std::byte* end)
+            : mPos(pos), mEnd(end)
+        {
+            assert(mPos <= mEnd);
+        }
+
+        BinaryReader(const BinaryReader&) = delete;
+
+        template <class Format, class T>
+        void operator()(Format&& format, T& value)
+        {
+            if constexpr (std::is_arithmetic_v<T>)
+            {
+                if (mEnd - mPos < static_cast<std::ptrdiff_t>(sizeof(value)))
+                    throw std::runtime_error("Not enough data");
+                std::memcpy(&value, mPos, sizeof(value));
+                mPos += sizeof(value);
+            }
+            else
+            {
+                format(*this, value);
+            }
+        }
+
+        template <class Format, class T>
+        auto operator()(Format&& format, T* data, std::size_t count)
+        {
+            if constexpr (std::is_arithmetic_v<T>)
+            {
+                if (mEnd - mPos < static_cast<std::ptrdiff_t>(count * sizeof(T)))
+                    throw std::runtime_error("Not enough data");
+                const std::size_t size = sizeof(T) * count;
+                std::memcpy(data, mPos, size);
+                mPos += size;
+            }
+            else
+            {
+                format(*this, data, count);
+            }
+        }
+
+    private:
+        const std::byte* mPos;
+        const std::byte* const mEnd;
+    };
+}
+
+#endif
diff --git a/components/detournavigator/serialization/binarywriter.hpp b/components/detournavigator/serialization/binarywriter.hpp
new file mode 100644
index 0000000000..5e710d85d5
--- /dev/null
+++ b/components/detournavigator/serialization/binarywriter.hpp
@@ -0,0 +1,62 @@
+#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_SERIALIZATION_BINARYWRITER_H
+#define OPENMW_COMPONENTS_DETOURNAVIGATOR_SERIALIZATION_BINARYWRITER_H
+
+#include <cassert>
+#include <cstddef>
+#include <cstring>
+#include <stdexcept>
+#include <type_traits>
+
+namespace DetourNavigator::Serialization
+{
+    struct BinaryWriter
+    {
+    public:
+        explicit BinaryWriter(std::byte* dest, const std::byte* end)
+            : mDest(dest), mEnd(end)
+        {
+            assert(mDest <= mEnd);
+        }
+
+        BinaryWriter(const BinaryWriter&) = delete;
+
+        template <class Format, class T>
+        void operator()(Format&& format, const T& value)
+        {
+            if constexpr (std::is_arithmetic_v<T>)
+            {
+                if (mEnd - mDest < static_cast<std::ptrdiff_t>(sizeof(value)))
+                    throw std::runtime_error("Not enough space");
+                std::memcpy(mDest, &value, sizeof(value));
+                mDest += sizeof(value);
+            }
+            else
+            {
+                format(*this, value);
+            }
+        }
+
+        template <class Format, class T>
+        auto operator()(Format&& format, const T* data, std::size_t count)
+        {
+            if constexpr (std::is_arithmetic_v<T>)
+            {
+                const std::size_t size = sizeof(T) * count;
+                if (mEnd - mDest < static_cast<std::ptrdiff_t>(size))
+                    throw std::runtime_error("Not enough space");
+                std::memcpy(mDest, data, size);
+                mDest += size;
+            }
+            else
+            {
+                format(*this, data, count);
+            }
+        }
+
+    private:
+        std::byte* mDest;
+        const std::byte* const mEnd;
+    };
+}
+
+#endif
diff --git a/components/detournavigator/serialization/format.hpp b/components/detournavigator/serialization/format.hpp
new file mode 100644
index 0000000000..d07ab9da6f
--- /dev/null
+++ b/components/detournavigator/serialization/format.hpp
@@ -0,0 +1,80 @@
+#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_SERIALIZATION_FORMAT_H
+#define OPENMW_COMPONENTS_DETOURNAVIGATOR_SERIALIZATION_FORMAT_H
+
+#include <algorithm>
+#include <cstddef>
+#include <functional>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
+namespace DetourNavigator::Serialization
+{
+    enum class Mode
+    {
+        Read,
+        Write,
+    };
+
+    template <class>
+    struct IsContiguousContainer : std::false_type {};
+
+    template <class ... Args>
+    struct IsContiguousContainer<std::vector<Args ...>> : std::true_type {};
+
+    template <class T>
+    constexpr bool isContiguousContainer = IsContiguousContainer<std::decay_t<T>>::value;
+
+    template <Mode mode, class Derived>
+    struct Format
+    {
+        template <class Visitor, class T>
+        void operator()(Visitor&& visitor, T* data, std::size_t size) const
+        {
+            if constexpr (std::is_arithmetic_v<T>)
+            {
+                visitor(self(), data, size);
+            }
+            else if constexpr (std::is_enum_v<T>)
+            {
+                if constexpr (mode == Mode::Write)
+                    visitor(self(), reinterpret_cast<const std::underlying_type_t<T>*>(data), size);
+                else
+                {
+                    static_assert(mode == Mode::Read);
+                    visitor(self(), reinterpret_cast<std::underlying_type_t<T>*>(data), size);
+                }
+            }
+            else
+            {
+                std::for_each(data, data + size, [&] (auto& v) { visitor(self(), v); });
+            }
+        }
+
+        template <class Visitor, class T, std::size_t size>
+        void operator()(Visitor&& visitor, T(& data)[size]) const
+        {
+            self()(std::forward<Visitor>(visitor), data, size);
+        }
+
+        template <class Visitor, class T>
+        auto operator()(Visitor&& visitor, T&& value) const
+            -> std::enable_if_t<isContiguousContainer<T>>
+        {
+            if constexpr (mode == Mode::Write)
+                visitor(self(), value.size());
+            else
+            {
+                static_assert(mode == Mode::Read);
+                std::size_t size = 0;
+                visitor(self(), size);
+                value.resize(size);
+            }
+            self()(std::forward<Visitor>(visitor), value.data(), value.size());
+        }
+
+        const Derived& self() const { return static_cast<const Derived&>(*this); }
+    };
+}
+
+#endif
diff --git a/components/detournavigator/serialization/sizeaccumulator.hpp b/components/detournavigator/serialization/sizeaccumulator.hpp
new file mode 100644
index 0000000000..28bdb5c1cb
--- /dev/null
+++ b/components/detournavigator/serialization/sizeaccumulator.hpp
@@ -0,0 +1,41 @@
+#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_SERIALIZATION_SIZEACCUMULATOR_H
+#define OPENMW_COMPONENTS_DETOURNAVIGATOR_SERIALIZATION_SIZEACCUMULATOR_H
+
+#include <cstddef>
+#include <type_traits>
+
+namespace DetourNavigator::Serialization
+{
+    class SizeAccumulator
+    {
+    public:
+        SizeAccumulator() = default;
+
+        SizeAccumulator(const SizeAccumulator&) = delete;
+
+        std::size_t value() const { return mValue; }
+
+        template <class Format, class T>
+        void operator()(Format&& format, const T& value)
+        {
+            if constexpr (std::is_arithmetic_v<T>)
+                mValue += sizeof(T);
+            else
+                format(*this, value);
+        }
+
+        template <class Format, class T>
+        auto operator()(Format&& format, const T* data, std::size_t count)
+        {
+            if constexpr (std::is_arithmetic_v<T>)
+                mValue += count * sizeof(T);
+            else
+                format(*this, data, count);
+        }
+
+    private:
+        std::size_t mValue = 0;
+    };
+}
+
+#endif

From 107a9ecb1701c753804fd9fed04aafa3980f1aaa Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sun, 24 Oct 2021 18:45:04 +0400
Subject: [PATCH 1531/2859] Fix variables hiding

---
 apps/openmw/mwclass/creature.cpp             | 4 ++--
 apps/openmw/mwclass/npc.cpp                  | 4 ++--
 apps/openmw/mwphysics/physicssystem.cpp      | 8 ++++----
 components/detournavigator/navigatorimpl.cpp | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index a9b1f461ca..4eeab5a393 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -82,7 +82,7 @@ namespace MWClass
 
     const Creature::GMST& Creature::getGmst()
     {
-        static const GMST gmst = []
+        static const GMST staticGmst = []
         {
             GMST gmst;
 
@@ -105,7 +105,7 @@ namespace MWClass
 
             return gmst;
         } ();
-        return gmst;
+        return staticGmst;
     }
 
     void Creature::ensureCustomData (const MWWorld::Ptr& ptr) const
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index becfb8719f..ca07d99e3f 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -266,7 +266,7 @@ namespace MWClass
 
     const Npc::GMST& Npc::getGmst()
     {
-        static const GMST gmst = []
+        static const GMST staticGmst = []
         {
             GMST gmst;
 
@@ -296,7 +296,7 @@ namespace MWClass
 
             return gmst;
         } ();
-        return gmst;
+        return staticGmst;
     }
 
     void Npc::ensureCustomData (const MWWorld::Ptr& ptr) const
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 6c46fd6d05..2a5bcb58bd 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -526,10 +526,10 @@ namespace MWPhysics
 
     void PhysicsSystem::updatePtr(const MWWorld::Ptr &old, const MWWorld::Ptr &updated)
     {
-        if (auto found = mObjects.find(old.mRef); found != mObjects.end())
-            found->second->updatePtr(updated);
-        else if (auto found = mActors.find(old.mRef); found != mActors.end())
-            found->second->updatePtr(updated);
+        if (auto foundObject = mObjects.find(old.mRef); foundObject != mObjects.end())
+            foundObject->second->updatePtr(updated);
+        else if (auto foundActor = mActors.find(old.mRef); foundActor != mActors.end())
+            foundActor->second->updatePtr(updated);
 
         for (auto& [_, actor] : mActors)
         {
diff --git a/components/detournavigator/navigatorimpl.cpp b/components/detournavigator/navigatorimpl.cpp
index f29ae1bb95..9a59ecf6d7 100644
--- a/components/detournavigator/navigatorimpl.cpp
+++ b/components/detournavigator/navigatorimpl.cpp
@@ -69,8 +69,8 @@ namespace DetourNavigator
         if (const btCollisionShape* const avoidShape = shapes.mShapeInstance->getAvoidCollisionShape())
         {
             const ObjectId avoidId(avoidShape);
-            const CollisionShape collisionShape {shapes.mShapeInstance, *avoidShape};
-            if (mNavMeshManager.updateObject(avoidId, collisionShape, transform, AreaType_null))
+            const CollisionShape avoidCollisionShape {shapes.mShapeInstance, *avoidShape};
+            if (mNavMeshManager.updateObject(avoidId, avoidCollisionShape, transform, AreaType_null))
             {
                 updateAvoidShapeId(id, avoidId);
                 result = true;

From 0f3c0cb0a0dc637b329cab199932022071c01492 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sun, 24 Oct 2021 18:45:46 +0400
Subject: [PATCH 1532/2859] Fix argument types mismatch

---
 .../detournavigator/preparednavmeshdatatuple.hpp | 16 ++++++++--------
 components/esm/luascripts.cpp                    |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/components/detournavigator/preparednavmeshdatatuple.hpp b/components/detournavigator/preparednavmeshdatatuple.hpp
index 8ff1267370..bcca0ace37 100644
--- a/components/detournavigator/preparednavmeshdatatuple.hpp
+++ b/components/detournavigator/preparednavmeshdatatuple.hpp
@@ -14,11 +14,11 @@ namespace DetourNavigator
     constexpr auto makeTuple(const rcPolyMesh& v) noexcept
     {
         return std::tuple(
-            Span(v.verts, getVertsLength(v)),
-            Span(v.polys, getPolysLength(v)),
-            Span(v.regs, getRegsLength(v)),
-            Span(v.flags, getFlagsLength(v)),
-            Span(v.areas, getAreasLength(v)),
+            Span(v.verts, static_cast<int>(getVertsLength(v))),
+            Span(v.polys, static_cast<int>(getPolysLength(v))),
+            Span(v.regs, static_cast<int>(getRegsLength(v))),
+            Span(v.flags, static_cast<int>(getFlagsLength(v))),
+            Span(v.areas, static_cast<int>(getAreasLength(v))),
             ArrayRef(v.bmin),
             ArrayRef(v.bmax),
             v.cs,
@@ -31,9 +31,9 @@ namespace DetourNavigator
     constexpr auto makeTuple(const rcPolyMeshDetail& v) noexcept
     {
         return std::tuple(
-            Span(v.meshes, getMeshesLength(v)),
-            Span(v.verts, getVertsLength(v)),
-            Span(v.tris, getTrisLength(v))
+            Span(v.meshes, static_cast<int>(getMeshesLength(v))),
+            Span(v.verts, static_cast<int>(getVertsLength(v))),
+            Span(v.tris, static_cast<int>(getTrisLength(v)))
         );
     }
 
diff --git a/components/esm/luascripts.cpp b/components/esm/luascripts.cpp
index 1dd45ab2b1..7ff841312a 100644
--- a/components/esm/luascripts.cpp
+++ b/components/esm/luascripts.cpp
@@ -32,7 +32,7 @@ std::string ESM::loadLuaBinaryData(ESMReader& esm)
     {
         esm.getSubHeader();
         data.resize(esm.getSubSize());
-        esm.getExact(data.data(), data.size());
+        esm.getExact(data.data(), static_cast<int>(data.size()));
     }
     return data;
 }

From fef902617aed7271294ab40d377f66f1cc2b224b Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 24 Oct 2021 17:23:15 +0200
Subject: [PATCH 1533/2859] Parse integer format arguments as variable names

---
 CHANGELOG.md                       |  1 +
 components/compiler/exprparser.cpp |  4 +++-
 components/compiler/exprparser.hpp |  2 +-
 components/compiler/lineparser.cpp |  2 +-
 components/compiler/scanner.cpp    | 10 +++++++---
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b37fed31fd..81d3066dd8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -58,6 +58,7 @@
     Bug #6323: Wyrmhaven: Alboin doesn't follower the player character out of his house
     Bug #6326: Detect Enchantment/Key should detect items in unresolved containers
     Bug #6347: PlaceItem/PlaceItemCell/PlaceAt should work with levelled creatures
+    Bug #6363: Some scripts in Morrowland fail to work
     Feature #890: OpenMW-CS: Column filtering
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
     Feature #2780: A way to see current OpenMW version in the console
diff --git a/components/compiler/exprparser.cpp b/components/compiler/exprparser.cpp
index 2d525e6f8c..1aedc8dc59 100644
--- a/components/compiler/exprparser.cpp
+++ b/components/compiler/exprparser.cpp
@@ -632,7 +632,7 @@ namespace Compiler
     }
 
     int ExprParser::parseArguments (const std::string& arguments, Scanner& scanner,
-        std::vector<Interpreter::Type_Code>& code, int ignoreKeyword)
+        std::vector<Interpreter::Type_Code>& code, int ignoreKeyword, bool expectNames)
     {
         bool optional = false;
         int optionalCount = 0;
@@ -717,6 +717,8 @@ namespace Compiler
 
                 if (optional)
                     parser.setOptional (true);
+                if(expectNames)
+                    scanner.enableExpectName();
 
                 scanner.scan (parser);
 
diff --git a/components/compiler/exprparser.hpp b/components/compiler/exprparser.hpp
index 2f3eaa8a9f..42739658ec 100644
--- a/components/compiler/exprparser.hpp
+++ b/components/compiler/exprparser.hpp
@@ -96,7 +96,7 @@ namespace Compiler
             /// \return Type ('l': integer, 'f': float)
 
             int parseArguments (const std::string& arguments, Scanner& scanner,
-                std::vector<Interpreter::Type_Code>& code, int ignoreKeyword = -1);
+                std::vector<Interpreter::Type_Code>& code, int ignoreKeyword = -1, bool expectNames = false);
             ///< Parse sequence of arguments specified by \a arguments.
             /// \param arguments Uses ScriptArgs typedef
             /// \see Compiler::ScriptArgs
diff --git a/components/compiler/lineparser.cpp b/components/compiler/lineparser.cpp
index 943c052473..ec90812ec7 100644
--- a/components/compiler/lineparser.cpp
+++ b/components/compiler/lineparser.cpp
@@ -145,7 +145,7 @@ namespace Compiler
             if (!arguments.empty())
             {
                 mExprParser.reset();
-                mExprParser.parseArguments (arguments, scanner, mCode);
+                mExprParser.parseArguments (arguments, scanner, mCode, -1, true);
             }
 
             mName = name;
diff --git a/components/compiler/scanner.cpp b/components/compiler/scanner.cpp
index 1054e2e269..0e2b76cb23 100644
--- a/components/compiler/scanner.cpp
+++ b/components/compiler/scanner.cpp
@@ -130,7 +130,8 @@ namespace Compiler
         {
             bool cont = false;
 
-            if (scanInt (c, parser, cont))
+            bool scanned = mExpectName ? scanName(c, parser, cont) : scanInt(c, parser, cont);
+            if (scanned)
             {
                 mLoc.mLiteral.clear();
                 return cont;
@@ -387,6 +388,8 @@ namespace Compiler
 
     bool Scanner::scanSpecial (MultiChar& c, Parser& parser, bool& cont)
     {
+        bool expectName = mExpectName;
+        mExpectName = false;
         int special = -1;
 
         if (c=='\n')
@@ -541,15 +544,16 @@ namespace Compiler
 
         if (special==S_newline)
             mLoc.mLiteral = "<newline>";
-        else if (mExpectName && (special == S_member || special == S_minus))
+        else if (expectName && (special == S_member || special == S_minus))
         {
-            mExpectName = false;
             bool tolerant = mTolerantNames;
             mTolerantNames = true;
             bool out = scanName(c, parser, cont);
             mTolerantNames = tolerant;
             return out;
         }
+        else if (expectName && special == S_comma)
+            mExpectName = true;
 
         TokenLoc loc (mLoc);
         mLoc.mLiteral.clear();

From 9cbbd2fff56a69ea27091abbd687dc9e967f8b9b Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Sun, 24 Oct 2021 17:13:42 -0700
Subject: [PATCH 1534/2859] better transitions

---
 apps/openmw/mwrender/sky.cpp    | 3 +++
 files/shaders/sky_fragment.glsl | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index 217f10f294..9deb6968e3 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -659,7 +659,10 @@ namespace MWRender
                     mParticleNode->addChild(program);
 
                     for (int particleIndex = 0; particleIndex < ps->numParticles(); ++particleIndex)
+                    {
                         ps->getParticle(particleIndex)->setAlphaRange(osgParticle::rangef(mPrecipitationAlpha, mPrecipitationAlpha));
+                        ps->getParticle(particleIndex)->update(0, true);
+                    }
 
                     ps->getOrCreateStateSet();
                     ps->setUserValue("simpleLighting", true);
diff --git a/files/shaders/sky_fragment.glsl b/files/shaders/sky_fragment.glsl
index c064619579..1ef62ab2cf 100644
--- a/files/shaders/sky_fragment.glsl
+++ b/files/shaders/sky_fragment.glsl
@@ -29,6 +29,9 @@ void paintClouds(inout vec4 color)
     color = texture2D(diffuseMap, diffuseMapUV);
     color.a *= passColor.a * opacity;
     color.xyz = clamp(color.xyz * gl_FrontMaterial.emission.xyz, 0.0, 1.0);
+
+    // ease transition between clear color and atmosphere/clouds
+    color = mix(vec4(gl_Fog.color.xyz, color.a), color, passColor.a * passColor.a);
 }
 
 void paintMoon(inout vec4 color)

From 6fb376f1cf6102f5f0d17053f68c2105b16f9348 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Mon, 25 Oct 2021 07:08:50 +0000
Subject: [PATCH 1535/2859] templatise ptr.hpp (#3185)

With this PR we consolidate identical logic for Ptr and ConstPtr with the help of a template.
---
 apps/openmw/mwworld/livecellref.cpp |   5 +
 apps/openmw/mwworld/livecellref.hpp |   3 +
 apps/openmw/mwworld/ptr.cpp         |  89 -----------
 apps/openmw/mwworld/ptr.hpp         | 226 ++++++++--------------------
 4 files changed, 71 insertions(+), 252 deletions(-)
 delete mode 100644 apps/openmw/mwworld/ptr.cpp

diff --git a/apps/openmw/mwworld/livecellref.cpp b/apps/openmw/mwworld/livecellref.cpp
index c74817911e..62c9f3a2f0 100644
--- a/apps/openmw/mwworld/livecellref.cpp
+++ b/apps/openmw/mwworld/livecellref.cpp
@@ -73,3 +73,8 @@ bool MWWorld::LiveCellRefBase::checkStateImp (const ESM::ObjectState& state)
 {
     return true;
 }
+
+unsigned int MWWorld::LiveCellRefBase::getType() const
+{
+    return mClass->getType();
+}
diff --git a/apps/openmw/mwworld/livecellref.hpp b/apps/openmw/mwworld/livecellref.hpp
index 48e237bce4..1ead0395fd 100644
--- a/apps/openmw/mwworld/livecellref.hpp
+++ b/apps/openmw/mwworld/livecellref.hpp
@@ -43,6 +43,9 @@ namespace MWWorld
 
         virtual std::string_view getTypeDescription() const = 0;
 
+        unsigned int getType() const;
+        ///< @see MWWorld::Class::getType
+
         protected:
 
             void loadImp (const ESM::ObjectState& state);
diff --git a/apps/openmw/mwworld/ptr.cpp b/apps/openmw/mwworld/ptr.cpp
deleted file mode 100644
index b18e3b1689..0000000000
--- a/apps/openmw/mwworld/ptr.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-#include "ptr.hpp"
-
-#include <cassert>
-
-#include "containerstore.hpp"
-#include "class.hpp"
-#include "livecellref.hpp"
-
-unsigned int MWWorld::Ptr::getType() const
-{
-    if(mRef != nullptr)
-        return mRef->mClass->getType();
-    throw std::runtime_error("Can't get type name from an empty object.");
-}
-
-MWWorld::LiveCellRefBase *MWWorld::Ptr::getBase() const
-{
-    if (!mRef)
-        throw std::runtime_error ("Can't access cell ref pointed to by null Ptr");
-
-    return mRef;
-}
-
-MWWorld::CellRef& MWWorld::Ptr::getCellRef() const
-{
-    assert(mRef);
-
-    return mRef->mRef;
-}
-
-MWWorld::RefData& MWWorld::Ptr::getRefData() const
-{
-    assert(mRef);
-
-    return mRef->mData;
-}
-
-void MWWorld::Ptr::setContainerStore (ContainerStore *store)
-{
-    assert (store);
-    assert (!mCell);
-
-    mContainerStore = store;
-}
-
-MWWorld::ContainerStore *MWWorld::Ptr::getContainerStore() const
-{
-    return mContainerStore;
-}
-
-MWWorld::Ptr::operator const void *()
-{
-    return mRef;
-}
-
-// -------------------------------------------------------------------------------
-
-unsigned int MWWorld::ConstPtr::getType() const
-{
-    if(mRef != nullptr)
-        return mRef->mClass->getType();
-    throw std::runtime_error("Can't get type name from an empty object.");
-}
-
-const MWWorld::LiveCellRefBase *MWWorld::ConstPtr::getBase() const
-{
-    if (!mRef)
-        throw std::runtime_error ("Can't access cell ref pointed to by null Ptr");
-
-    return mRef;
-}
-
-void MWWorld::ConstPtr::setContainerStore (const ContainerStore *store)
-{
-    assert (store);
-    assert (!mCell);
-
-    mContainerStore = store;
-}
-
-const MWWorld::ContainerStore *MWWorld::ConstPtr::getContainerStore() const
-{
-    return mContainerStore;
-}
-
-MWWorld::ConstPtr::operator const void *()
-{
-    return mRef;
-}
diff --git a/apps/openmw/mwworld/ptr.hpp b/apps/openmw/mwworld/ptr.hpp
index a82abaa212..438b87c7af 100644
--- a/apps/openmw/mwworld/ptr.hpp
+++ b/apps/openmw/mwworld/ptr.hpp
@@ -2,7 +2,7 @@
 #define GAME_MWWORLD_PTR_H
 
 #include <cassert>
-
+#include <type_traits>
 #include <string>
 #include <sstream>
 
@@ -15,20 +15,19 @@ namespace MWWorld
     struct LiveCellRefBase;
 
     /// \brief Pointer to a LiveCellRef
-
-    class Ptr
+    /// @note PtrBase is never used directly and needed only to define Ptr and ConstPtr
+    template <template<class> class TypeTransform>
+    class PtrBase
     {
         public:
 
-            MWWorld::LiveCellRefBase *mRef;
-            CellStore *mCell;
-            ContainerStore *mContainerStore;
+            typedef TypeTransform<MWWorld::LiveCellRefBase> LiveCellRefBaseType;
+            typedef TypeTransform<CellStore> CellStoreType;
+            typedef TypeTransform<ContainerStore> ContainerStoreType;
 
-        public:
-            Ptr(MWWorld::LiveCellRefBase *liveCellRef=nullptr, CellStore *cell=nullptr)
-              : mRef(liveCellRef), mCell(cell), mContainerStore(nullptr)
-            {
-            }
+            LiveCellRefBaseType *mRef;
+            CellStoreType *mCell;
+            ContainerStoreType *mContainerStore;
 
             bool isEmpty() const
             {
@@ -40,7 +39,12 @@ namespace MWWorld
             // Note 1: ids are not sequential. E.g. for a creature `getType` returns 0x41455243.
             // Note 2: Life is not easy and full of surprises. For example
             //         prison marker reuses ESM::Door record. Player is ESM::NPC.
-            unsigned int getType() const;
+            unsigned int getType() const
+            {
+                if(mRef != nullptr)
+                    return mRef->getType();
+                throw std::runtime_error("Can't get type name from an empty object.");
+            }
 
             std::string_view getTypeDescription() const
             {
@@ -55,9 +59,9 @@ namespace MWWorld
             }
 
             template<typename T>
-            MWWorld::LiveCellRef<T> *get() const
+            TypeTransform<MWWorld::LiveCellRef<T>> *get() const
             {
-                MWWorld::LiveCellRef<T> *ref = dynamic_cast<MWWorld::LiveCellRef<T>*>(mRef);
+                TypeTransform<MWWorld::LiveCellRef<T>> *ref = dynamic_cast<TypeTransform<MWWorld::LiveCellRef<T>>*>(mRef);
                 if(ref) return ref;
 
                 std::stringstream str;
@@ -68,13 +72,26 @@ namespace MWWorld
                 throw std::runtime_error(str.str());
             }
 
-            MWWorld::LiveCellRefBase *getBase() const;
+            LiveCellRefBaseType *getBase() const
+            {
+                if (!mRef)
+                    throw std::runtime_error ("Can't access cell ref pointed to by null Ptr");
+                return mRef;
+            }
 
-            MWWorld::CellRef& getCellRef() const;
+            TypeTransform<MWWorld::CellRef>& getCellRef() const
+            {
+                assert(mRef);
+                return mRef->mRef;
+            }
 
-            RefData& getRefData() const;
+            TypeTransform<RefData>& getRefData() const
+            {
+                assert(mRef);
+                return mRef->mData;
+            }
 
-            CellStore *getCell() const
+            CellStoreType *getCell() const
             {
                 assert(mCell);
                 return mCell;
@@ -85,164 +102,47 @@ namespace MWWorld
                 return (mContainerStore == nullptr) && (mCell != nullptr);
             }
 
-            void setContainerStore (ContainerStore *store);
+            void setContainerStore (ContainerStoreType *store)
             ///< Must not be called on references that are in a cell.
+            {
+                assert (store);
+                assert (!mCell);
+                mContainerStore = store;
+            }
 
-            ContainerStore *getContainerStore() const;
+            ContainerStoreType *getContainerStore() const
             ///< May return a 0-pointer, if reference is not in a container.
+            {
+                return mContainerStore;
+            }
 
-            operator const void *();
+            operator const void *() const
             ///< Return a 0-pointer, if Ptr is empty; return a non-0-pointer, if Ptr is not empty
+            {
+                return mRef;
+            }
+
+        protected:
+            PtrBase(LiveCellRefBaseType *liveCellRef, CellStoreType *cell, ContainerStoreType* containerStore) : mRef(liveCellRef), mCell(cell), mContainerStore(containerStore) {}
     };
 
-    /// \brief Pointer to a const LiveCellRef
-    /// @note a Ptr can be implicitely converted to a ConstPtr, but you can not convert a ConstPtr to a Ptr.
-    class ConstPtr
+    /// @note It is possible to get mutable values from const Ptr. So if a function accepts const Ptr&, the object is still mutable.
+    /// To make it really const the argument should be const ConstPtr&.
+    class Ptr : public PtrBase<std::remove_const_t>
     {
     public:
-
-        const MWWorld::LiveCellRefBase *mRef;
-        const CellStore *mCell;
-        const ContainerStore *mContainerStore;
-
-    public:
-        ConstPtr(const MWWorld::LiveCellRefBase *liveCellRef=nullptr, const CellStore *cell=nullptr)
-          : mRef(liveCellRef), mCell(cell), mContainerStore(nullptr)
-        {
-        }
-
-        ConstPtr(const MWWorld::Ptr& ptr)
-            : mRef(ptr.mRef), mCell(ptr.mCell), mContainerStore(ptr.mContainerStore)
-        {
-        }
-
-        bool isEmpty() const
-        {
-            return mRef == nullptr;
-        }
-
-        unsigned int getType() const;
-
-        std::string_view getTypeDescription() const
-        {
-            return mRef ? mRef->getTypeDescription() : "nullptr";
-        }
-
-        const Class& getClass() const
-        {
-            if(mRef != nullptr)
-                return *(mRef->mClass);
-            throw std::runtime_error("Cannot get class of an empty object");
-        }
-
-        template<typename T>
-        const MWWorld::LiveCellRef<T> *get() const
-        {
-            const MWWorld::LiveCellRef<T> *ref = dynamic_cast<const MWWorld::LiveCellRef<T>*>(mRef);
-            if(ref) return ref;
-
-            std::stringstream str;
-            str<< "Bad LiveCellRef cast to "<<T::getRecordType()<<" from ";
-            if(mRef != nullptr) str<< getTypeDescription();
-            else str<< "an empty object";
-
-            throw std::runtime_error(str.str());
-        }
-
-        const MWWorld::LiveCellRefBase *getBase() const;
-
-        const MWWorld::CellRef& getCellRef() const
-        {
-            assert(mRef);
-            return mRef->mRef;
-        }
-
-        const RefData& getRefData() const
-        {
-            assert(mRef);
-            return mRef->mData;
-        }
-
-        const CellStore *getCell() const
-        {
-            assert(mCell);
-            return mCell;
-        }
-
-        bool isInCell() const
-        {
-            return (mContainerStore == nullptr) && (mCell != nullptr);
-        }
-        
-        void setContainerStore (const ContainerStore *store);
-        ///< Must not be called on references that are in a cell.
-        
-        const ContainerStore *getContainerStore() const;
-        ///< May return a 0-pointer, if reference is not in a container.
-
-        operator const void *();
-        ///< Return a 0-pointer, if Ptr is empty; return a non-0-pointer, if Ptr is not empty
+        Ptr(LiveCellRefBase *liveCellRef=nullptr, CellStoreType *cell=nullptr) : PtrBase(liveCellRef, cell, nullptr) {}
     };
 
-    inline bool operator== (const Ptr& left, const Ptr& right)
-    {
-        return left.mRef==right.mRef;
-    }
-
-    inline bool operator!= (const Ptr& left, const Ptr& right)
-    {
-        return !(left==right);
-    }
-
-    inline bool operator< (const Ptr& left, const Ptr& right)
-    {
-        return left.mRef<right.mRef;
-    }
-
-    inline bool operator>= (const Ptr& left, const Ptr& right)
-    {
-        return !(left<right);
-    }
-
-    inline bool operator> (const Ptr& left, const Ptr& right)
-    {
-        return right<left;
-    }
-
-    inline bool operator<= (const Ptr& left, const Ptr& right)
-    {
-        return !(left>right);
-    }
-
-    inline bool operator== (const ConstPtr& left, const ConstPtr& right)
-    {
-        return left.mRef==right.mRef;
-    }
-
-    inline bool operator!= (const ConstPtr& left, const ConstPtr& right)
-    {
-        return !(left==right);
-    }
-
-    inline bool operator< (const ConstPtr& left, const ConstPtr& right)
-    {
-        return left.mRef<right.mRef;
-    }
-
-    inline bool operator>= (const ConstPtr& left, const ConstPtr& right)
-    {
-        return !(left<right);
-    }
-
-    inline bool operator> (const ConstPtr& left, const ConstPtr& right)
+    /// @note The difference between Ptr and ConstPtr is that the second one adds const to the underlying pointers.
+    /// @note a Ptr can be implicitely converted to a ConstPtr, but you can not convert a ConstPtr to a Ptr.
+    class ConstPtr : public PtrBase<std::add_const_t>
     {
-        return right<left;
-    }
+    public:
+        ConstPtr(const Ptr& ptr) : PtrBase(ptr.mRef, ptr.mCell, ptr.mContainerStore) {}
+        ConstPtr(const LiveCellRefBase *liveCellRef=nullptr, const CellStoreType *cell=nullptr) : PtrBase(liveCellRef, cell, nullptr) {}
+    };
 
-    inline bool operator<= (const ConstPtr& left, const ConstPtr& right)
-    {
-        return !(left>right);
-    }
 }
 
 #endif

From 7f9beac3a75e8e6d8b3f657591db7f4ecdcbe450 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Mon, 25 Oct 2021 07:18:26 +0000
Subject: [PATCH 1536/2859] refactors a case insensitive map (#3184)

This PR aims to spark the retirement of a questionable pattern I have found all over our code base. I will illustrate how this pattern encourages code duplication, lacks type safety, requires documentation and can be prone to bugs.
```
std::map<std::string, Object> mMap; // Stored in all lowercase for a case-insensitive lookup

std::string lowerKey = Misc::StringUtils::lowerCase(key);
mMap.emplace(lowerKey, object);

std::string lowerKey = Misc::StringUtils::lowerCase(key);
mMap.find(lowerKey);

mMap.find(key); // Not found. Oops!
```
An alternative approach produces no such issues.
```
std::unordered_map<std::string, Object, Misc::StringUtils::CiHash, Misc::StringUtils::CiEqual> mMap;

mMap.emplace(key, object);

mMap.find(key);
```
Of course, such an alternative will work for a `map` as well, but an `unordered_map` is generally preferable over a `map` with these changes because we have moved `lowerCase` into the comparison operator.

In this PR I have refactored `Animation::mNodeMap` accordingly. I have reviewed and adapted all direct and indirect usage of `Animation::mNodeMap` to ensure we do not change behaviour with this PR.
---
 apps/openmw/mwrender/actoranimation.cpp    |  2 +-
 apps/openmw/mwrender/animation.cpp         |  5 ++---
 apps/openmw/mwrender/animation.hpp         |  6 ++++--
 apps/openmw/mwrender/creatureanimation.cpp |  4 ++--
 apps/openmw/mwrender/npcanimation.cpp      |  4 ++--
 apps/openmw/mwrender/weaponanimation.cpp   |  5 ++---
 apps/openmw/mwrender/weaponanimation.hpp   |  3 +--
 components/misc/stringops.hpp              | 16 ++++++++++++++++
 components/sceneutil/visitor.cpp           | 13 ++++++-------
 components/sceneutil/visitor.hpp           |  6 +++++-
 10 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/apps/openmw/mwrender/actoranimation.cpp b/apps/openmw/mwrender/actoranimation.cpp
index b346d4ac6c..24ca0aa4f3 100644
--- a/apps/openmw/mwrender/actoranimation.cpp
+++ b/apps/openmw/mwrender/actoranimation.cpp
@@ -74,7 +74,7 @@ PartHolderPtr ActorAnimation::attachMesh(const std::string& model, const std::st
     osg::ref_ptr<osg::Node> instance = mResourceSystem->getSceneManager()->getInstance(model, parent);
 
     const NodeMap& nodeMap = getNodeMap();
-    NodeMap::const_iterator found = nodeMap.find(Misc::StringUtils::lowerCase(bonename));
+    NodeMap::const_iterator found = nodeMap.find(bonename);
     if (found == nodeMap.end())
         return PartHolderPtr();
 
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index ca76856d48..cdc6c49ab2 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -1510,7 +1510,7 @@ namespace MWRender
             parentNode = mInsert;
         else
         {
-            NodeMap::const_iterator found = getNodeMap().find(Misc::StringUtils::lowerCase(bonename));
+            NodeMap::const_iterator found = getNodeMap().find(bonename);
             if (found == getNodeMap().end())
                 throw std::runtime_error("Can't find bone " + bonename);
 
@@ -1619,8 +1619,7 @@ namespace MWRender
 
     const osg::Node* Animation::getNode(const std::string &name) const
     {
-        std::string lowerName = Misc::StringUtils::lowerCase(name);
-        NodeMap::const_iterator found = getNodeMap().find(lowerName);
+        NodeMap::const_iterator found = getNodeMap().find(name);
         if (found == getNodeMap().end())
             return nullptr;
         else
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index 84788c1e2d..d37d548dd3 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -7,8 +7,10 @@
 #include <components/sceneutil/textkeymap.hpp>
 #include <components/sceneutil/util.hpp>
 #include <components/sceneutil/nodecallback.hpp>
+#include <components/misc/stringops.hpp>
 
 #include <vector>
+#include <unordered_map>
 
 namespace ESM
 {
@@ -157,6 +159,8 @@ public:
 
     virtual bool updateCarriedLeftVisible(const int weaptype) const { return false; };
 
+    typedef std::unordered_map<std::string, osg::ref_ptr<osg::MatrixTransform>, Misc::StringUtils::CiHash, Misc::StringUtils::CiEqual> NodeMap;
+
 protected:
     class AnimationTime : public SceneUtil::ControllerSource
     {
@@ -250,8 +254,6 @@ protected:
 
     std::shared_ptr<AnimationTime> mAnimationTimePtr[sNumBlendMasks];
 
-    // Stored in all lowercase for a case-insensitive lookup
-    typedef std::map<std::string, osg::ref_ptr<osg::MatrixTransform> > NodeMap;
     mutable NodeMap mNodeMap;
     mutable bool mNodeMapCreated;
 
diff --git a/apps/openmw/mwrender/creatureanimation.cpp b/apps/openmw/mwrender/creatureanimation.cpp
index b64b205961..657179db75 100644
--- a/apps/openmw/mwrender/creatureanimation.cpp
+++ b/apps/openmw/mwrender/creatureanimation.cpp
@@ -126,7 +126,7 @@ void CreatureWeaponAnimation::updatePart(PartHolderPtr& scene, int slot)
             if (bonename != "Weapon Bone")
             {
                 const NodeMap& nodeMap = getNodeMap();
-                NodeMap::const_iterator found = nodeMap.find(Misc::StringUtils::lowerCase(bonename));
+                NodeMap::const_iterator found = nodeMap.find(bonename);
                 if (found == nodeMap.end())
                     bonename = "Weapon Bone";
             }
@@ -161,7 +161,7 @@ void CreatureWeaponAnimation::updatePart(PartHolderPtr& scene, int slot)
         osg::ref_ptr<const osg::Node> node = mResourceSystem->getSceneManager()->getTemplate(itemModel);
 
         const NodeMap& nodeMap = getNodeMap();
-        NodeMap::const_iterator found = nodeMap.find(Misc::StringUtils::lowerCase(bonename));
+        NodeMap::const_iterator found = nodeMap.find(bonename);
         if (found == nodeMap.end())
             throw std::runtime_error("Can't find attachment node " + bonename);
         osg::ref_ptr<osg::Node> attached = SceneUtil::attach(node, mObjectRoot, bonename, found->second.get(), mResourceSystem->getSceneManager());
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 42215c00bc..f3d026ad3c 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -713,7 +713,7 @@ PartHolderPtr NpcAnimation::insertBoundedPart(const std::string& model, const st
     osg::ref_ptr<const osg::Node> templateNode = mResourceSystem->getSceneManager()->getTemplate(model);
 
     const NodeMap& nodeMap = getNodeMap();
-    NodeMap::const_iterator found = nodeMap.find(Misc::StringUtils::lowerCase(bonename));
+    NodeMap::const_iterator found = nodeMap.find(bonename);
     if (found == nodeMap.end())
         throw std::runtime_error("Can't find attachment node " + bonename);
 
@@ -813,7 +813,7 @@ bool NpcAnimation::addOrReplaceIndividualPart(ESM::PartReferenceType type, int g
                 if (weaponBonename != bonename)
                 {
                     const NodeMap& nodeMap = getNodeMap();
-                    NodeMap::const_iterator found = nodeMap.find(Misc::StringUtils::lowerCase(weaponBonename));
+                    NodeMap::const_iterator found = nodeMap.find(weaponBonename);
                     if (found != nodeMap.end())
                         bonename = weaponBonename;
                 }
diff --git a/apps/openmw/mwrender/weaponanimation.cpp b/apps/openmw/mwrender/weaponanimation.cpp
index 3db415126b..0572eae3be 100644
--- a/apps/openmw/mwrender/weaponanimation.cpp
+++ b/apps/openmw/mwrender/weaponanimation.cpp
@@ -172,14 +172,13 @@ void WeaponAnimation::releaseArrow(MWWorld::Ptr actor, float attackStrength)
     }
 }
 
-void WeaponAnimation::addControllers(const std::map<std::string, osg::ref_ptr<osg::MatrixTransform> >& nodes,
-    std::vector<std::pair<osg::ref_ptr<osg::Node>, osg::ref_ptr<osg::Callback>>> &map, osg::Node* objectRoot)
+void WeaponAnimation::addControllers(const Animation::NodeMap& nodes, std::vector<std::pair<osg::ref_ptr<osg::Node>, osg::ref_ptr<osg::Callback>>> &map, osg::Node* objectRoot)
 {
     for (int i=0; i<2; ++i)
     {
         mSpineControllers[i] = nullptr;
 
-        std::map<std::string, osg::ref_ptr<osg::MatrixTransform> >::const_iterator found = nodes.find(i == 0 ? "bip01 spine1" : "bip01 spine2");
+        Animation::NodeMap::const_iterator found = nodes.find(i == 0 ? "bip01 spine1" : "bip01 spine2");
         if (found != nodes.end())
         {
             osg::Node* node = found->second;
diff --git a/apps/openmw/mwrender/weaponanimation.hpp b/apps/openmw/mwrender/weaponanimation.hpp
index 1f614463a6..125587c1bd 100644
--- a/apps/openmw/mwrender/weaponanimation.hpp
+++ b/apps/openmw/mwrender/weaponanimation.hpp
@@ -42,8 +42,7 @@ namespace MWRender
         void releaseArrow(MWWorld::Ptr actor, float attackStrength);
 
         /// Add WeaponAnimation-related controllers to \a nodes and store the added controllers in \a map.
-        void addControllers(const std::map<std::string, osg::ref_ptr<osg::MatrixTransform> >& nodes,
-                std::vector<std::pair<osg::ref_ptr<osg::Node>, osg::ref_ptr<osg::Callback>>>& map, osg::Node* objectRoot);
+        void addControllers(const Animation::NodeMap& nodes, std::vector<std::pair<osg::ref_ptr<osg::Node>, osg::ref_ptr<osg::Callback>>>& map, osg::Node* objectRoot);
 
         void deleteControllers();
 
diff --git a/components/misc/stringops.hpp b/components/misc/stringops.hpp
index 0863522356..6c9c1eefa2 100644
--- a/components/misc/stringops.hpp
+++ b/components/misc/stringops.hpp
@@ -6,6 +6,7 @@
 #include <algorithm>
 #include <string_view>
 #include <iterator>
+#include <functional>
 
 #include "utf8stream.hpp"
 
@@ -182,6 +183,21 @@ public:
         return out;
     }
 
+    struct CiEqual
+    {
+        bool operator()(const std::string& left, const std::string& right) const
+        {
+            return ciEqual(left, right);
+        }
+    };
+    struct CiHash
+    {
+        std::size_t operator()(std::string str) const
+        {
+            lowerCaseInPlace(str);
+            return std::hash<std::string>{}(str);
+        }
+    };
     struct CiComp
     {
         bool operator()(const std::string& left, const std::string& right) const
diff --git a/components/sceneutil/visitor.cpp b/components/sceneutil/visitor.cpp
index fde87c66ba..ea09445678 100644
--- a/components/sceneutil/visitor.cpp
+++ b/components/sceneutil/visitor.cpp
@@ -51,18 +51,17 @@ namespace SceneUtil
 
     void NodeMapVisitor::apply(osg::MatrixTransform& trans)
     {
-        // Take transformation for first found node in file
-        std::string originalNodeName = Misc::StringUtils::lowerCase(trans.getName());
+        // Choose first found node in file
 
         if (trans.libraryName() == std::string("osgAnimation"))
         {
+            std::string nodeName = trans.getName();
             // Convert underscores to whitespaces as a workaround for Collada (OpenMW's animation system uses whitespace-separated names)
-            std::replace(originalNodeName.begin(), originalNodeName.end(), '_', ' ');
+            std::replace(nodeName.begin(), nodeName.end(), '_', ' ');
+            mMap.emplace(nodeName, &trans);
         }
-
-        const std::string nodeName = originalNodeName;
-
-        mMap.emplace(nodeName, &trans);
+        else
+            mMap.emplace(trans.getName(), &trans);
 
         traverse(trans);
     }
diff --git a/components/sceneutil/visitor.hpp b/components/sceneutil/visitor.hpp
index fcf3c1f944..45aa408b9e 100644
--- a/components/sceneutil/visitor.hpp
+++ b/components/sceneutil/visitor.hpp
@@ -4,6 +4,10 @@
 #include <osg/MatrixTransform>
 #include <osg/NodeVisitor>
 
+#include <unordered_map>
+
+#include <components/misc/stringops.hpp>
+
 // Commonly used scene graph visitors
 namespace SceneUtil
 {
@@ -49,7 +53,7 @@ namespace SceneUtil
     class NodeMapVisitor : public osg::NodeVisitor
     {
     public:
-        typedef std::map<std::string, osg::ref_ptr<osg::MatrixTransform> > NodeMap;
+        typedef std::unordered_map<std::string, osg::ref_ptr<osg::MatrixTransform>, Misc::StringUtils::CiHash, Misc::StringUtils::CiEqual> NodeMap;
 
         NodeMapVisitor(NodeMap& map)
             : osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN)

From 1ff8318a526fcfd68a5fe2e5670e01fb4309403f Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Mon, 25 Oct 2021 07:28:32 +0000
Subject: [PATCH 1537/2859] refactors premultiplied alpha (#3189)

With this PR we refactor a `premultiplied alpha` user string set by `characterpreview.cpp` into a more flexible mechanism allowing us to assign any state to GUI textures. We can consider these changes more future proof than the previous approach.
---
 apps/openmw/mwgui/inventorywindow.cpp         |  2 +-
 apps/openmw/mwgui/race.cpp                    |  2 +-
 apps/openmw/mwrender/characterpreview.cpp     |  4 +++-
 apps/openmw/mwrender/characterpreview.hpp     |  4 ++++
 .../myguiplatform/myguirendermanager.cpp      | 20 +++++--------------
 components/myguiplatform/myguitexture.cpp     |  4 +++-
 components/myguiplatform/myguitexture.hpp     |  6 +++++-
 7 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index a586991888..0e76c2429f 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -70,7 +70,7 @@ namespace MWGui
         , mTrading(false)
         , mUpdateTimer(0.f)
     {
-        mPreviewTexture.reset(new osgMyGUI::OSGTexture(mPreview->getTexture()));
+        mPreviewTexture.reset(new osgMyGUI::OSGTexture(mPreview->getTexture(), mPreview->getTextureStateSet()));
         mPreview->rebuild();
 
         mMainWidget->castType<MyGUI::Window>()->eventWindowChangeCoord += MyGUI::newDelegate(this, &InventoryWindow::onWindowResize);
diff --git a/apps/openmw/mwgui/race.cpp b/apps/openmw/mwgui/race.cpp
index 457594697d..d30eb65eb3 100644
--- a/apps/openmw/mwgui/race.cpp
+++ b/apps/openmw/mwgui/race.cpp
@@ -138,7 +138,7 @@ namespace MWGui
         mPreview->rebuild();
         mPreview->setAngle (mCurrentAngle);
 
-        mPreviewTexture.reset(new osgMyGUI::OSGTexture(mPreview->getTexture()));
+        mPreviewTexture.reset(new osgMyGUI::OSGTexture(mPreview->getTexture(), mPreview->getTextureStateSet()));
         mPreviewImage->setRenderItemTexture(mPreviewTexture.get());
         mPreviewImage->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 0.f, 1.f, 1.f));
 
diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index 4a84bf4f23..c717806e35 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -190,7 +190,9 @@ namespace MWRender
         mTexture->setInternalFormat(GL_RGBA);
         mTexture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
         mTexture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
-        mTexture->setUserValue("premultiplied alpha", true);
+
+        mTextureStateSet = new osg::StateSet;
+        mTextureStateSet->setAttribute(new osg::BlendFunc(osg::BlendFunc::ONE, osg::BlendFunc::ONE_MINUS_SRC_ALPHA));
 
         mCamera = new osg::Camera;
         // hints that the camera is not relative to the master camera
diff --git a/apps/openmw/mwrender/characterpreview.hpp b/apps/openmw/mwrender/characterpreview.hpp
index 3eb9688465..808ff0801d 100644
--- a/apps/openmw/mwrender/characterpreview.hpp
+++ b/apps/openmw/mwrender/characterpreview.hpp
@@ -18,6 +18,7 @@ namespace osg
     class Camera;
     class Group;
     class Viewport;
+    class StateSet;
 }
 
 namespace MWRender
@@ -41,6 +42,8 @@ namespace MWRender
         void rebuild();
 
         osg::ref_ptr<osg::Texture2D> getTexture();
+        /// Get the osg::StateSet required to render the texture correctly, if any.
+        osg::StateSet* getTextureStateSet() { return mTextureStateSet; }
 
     private:
         CharacterPreview(const CharacterPreview&);
@@ -54,6 +57,7 @@ namespace MWRender
         osg::ref_ptr<osg::Group> mParent;
         Resource::ResourceSystem* mResourceSystem;
         osg::ref_ptr<osg::Texture2D> mTexture;
+        osg::ref_ptr<osg::StateSet> mTextureStateSet;
         osg::ref_ptr<osg::Camera> mCamera;
         osg::ref_ptr<DrawOnceCallback> mDrawOnceCallback;
 
diff --git a/components/myguiplatform/myguirendermanager.cpp b/components/myguiplatform/myguirendermanager.cpp
index 3061b329c2..43b176c795 100644
--- a/components/myguiplatform/myguirendermanager.cpp
+++ b/components/myguiplatform/myguirendermanager.cpp
@@ -4,10 +4,8 @@
 #include <MyGUI_Timer.h>
 
 #include <osg/Drawable>
-#include <osg/BlendFunc>
 #include <osg/Texture2D>
 #include <osg/TexMat>
-#include <osg/ValueObject>
 
 #include <osgViewer/Viewer>
 
@@ -17,8 +15,6 @@
 #include <components/shader/shadermanager.hpp>
 #include <components/sceneutil/nodecallback.hpp>
 
-#include <components/debug/debuglog.hpp>
-
 #include "myguicompat.h"
 #include "myguitexture.hpp"
 
@@ -465,23 +461,17 @@ void RenderManager::doRender(MyGUI::IVertexBuffer *buffer, MyGUI::ITexture *text
     batch.mVertexBuffer = static_cast<OSGVertexBuffer*>(buffer)->getVertexBuffer();
     batch.mArray = static_cast<OSGVertexBuffer*>(buffer)->getVertexArray();
     static_cast<OSGVertexBuffer*>(buffer)->markUsed();
-    bool premultipliedAlpha = false;
-    if (texture)
+
+    if (OSGTexture* osgtexture = static_cast<OSGTexture*>(texture))
     {
-        batch.mTexture = static_cast<OSGTexture*>(texture)->getTexture();
+        batch.mTexture = osgtexture->getTexture();
         if (batch.mTexture->getDataVariance() == osg::Object::DYNAMIC)
             mDrawable->setDataVariance(osg::Object::DYNAMIC); // only for this frame, reset in begin()
-        batch.mTexture->getUserValue("premultiplied alpha", premultipliedAlpha);
+        if (!mInjectState && osgtexture->getInjectState())
+            batch.mStateSet = osgtexture->getInjectState();
     }
     if (mInjectState)
         batch.mStateSet = mInjectState;
-    else if (premultipliedAlpha)
-    {
-        // This is hacky, but MyGUI made it impossible to use a custom layer for a nested node, so state couldn't be injected 'properly'
-        osg::ref_ptr<osg::StateSet> stateSet = new osg::StateSet();
-        stateSet->setAttribute(new osg::BlendFunc(osg::BlendFunc::ONE, osg::BlendFunc::ONE_MINUS_SRC_ALPHA));
-        batch.mStateSet = stateSet;
-    }
 
     mDrawable->addBatch(batch);
 }
diff --git a/components/myguiplatform/myguitexture.cpp b/components/myguiplatform/myguitexture.cpp
index ce7332cc7e..d0e4e9a86e 100644
--- a/components/myguiplatform/myguitexture.cpp
+++ b/components/myguiplatform/myguitexture.cpp
@@ -3,6 +3,7 @@
 #include <stdexcept>
 
 #include <osg/Texture2D>
+#include <osg/StateSet>
 
 #include <components/debug/debuglog.hpp>
 #include <components/resource/imagemanager.hpp>
@@ -21,9 +22,10 @@ namespace osgMyGUI
     {
     }
 
-    OSGTexture::OSGTexture(osg::Texture2D *texture)
+    OSGTexture::OSGTexture(osg::Texture2D *texture, osg::StateSet *injectState)
         : mImageManager(nullptr)
         , mTexture(texture)
+        , mInjectState(injectState)
         , mFormat(MyGUI::PixelFormat::Unknow)
         , mUsage(MyGUI::TextureUsage::Default)
         , mNumElemBytes(0)
diff --git a/components/myguiplatform/myguitexture.hpp b/components/myguiplatform/myguitexture.hpp
index a34f1b7628..e8b49eab04 100644
--- a/components/myguiplatform/myguitexture.hpp
+++ b/components/myguiplatform/myguitexture.hpp
@@ -15,6 +15,7 @@ namespace osg
 {
     class Image;
     class Texture2D;
+    class StateSet;
 }
 
 namespace Resource
@@ -31,6 +32,7 @@ namespace osgMyGUI
 
         osg::ref_ptr<osg::Image> mLockedImage;
         osg::ref_ptr<osg::Texture2D> mTexture;
+        osg::ref_ptr<osg::StateSet> mInjectState;
         MyGUI::PixelFormat mFormat;
         MyGUI::TextureUsage mUsage;
         size_t mNumElemBytes;
@@ -40,9 +42,11 @@ namespace osgMyGUI
 
     public:
         OSGTexture(const std::string &name, Resource::ImageManager* imageManager);
-        OSGTexture(osg::Texture2D* texture);
+        OSGTexture(osg::Texture2D* texture, osg::StateSet* injectState = nullptr);
         virtual ~OSGTexture();
 
+        osg::StateSet* getInjectState() { return mInjectState; }
+
         const std::string& getName() const override { return mName; }
 
         void createManual(int width, int height, MyGUI::TextureUsage usage, MyGUI::PixelFormat format) override;

From 13b84ce798258fd4b1349c13904fe3feac292a46 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Mon, 25 Oct 2021 10:42:14 +0000
Subject: [PATCH 1538/2859] Fix MacOS failure for 10.15 by setting it to
 `allow_failure: true`

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c9b8cf9341..b69e930ae2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -184,7 +184,6 @@ Debian_Clang_tests_Debug:
 macOS11_Xcode12:
   extends: .MacOS
   image: macos-11-xcode-12
-  allow_failure: true
   cache:
     key: macOS11_Xcode12.v1
   variables:
@@ -193,6 +192,7 @@ macOS11_Xcode12:
 macOS10.15_Xcode11:
   extends: .MacOS
   image: macos-10.15-xcode-11
+  allow_failure: true
   cache:
     key: macOS10.15_Xcode11.v1
   variables:

From 289e1544d21f73ea9bf74c390ee46e35388d0814 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 25 Oct 2021 16:54:50 +0200
Subject: [PATCH 1539/2859] Don't wait a frame to recalculate magicka

---
 CHANGELOG.md                                  |  1 +
 apps/openmw/mwclass/creature.cpp              | 10 ++---
 apps/openmw/mwclass/npc.cpp                   | 14 +++---
 apps/openmw/mwmechanics/actors.cpp            | 45 -------------------
 apps/openmw/mwmechanics/actors.hpp            |  4 --
 apps/openmw/mwmechanics/actorutil.cpp         |  8 ++++
 apps/openmw/mwmechanics/actorutil.hpp         |  8 ++++
 apps/openmw/mwmechanics/creaturestats.cpp     | 45 +++++++++++--------
 apps/openmw/mwmechanics/creaturestats.hpp     |  5 +--
 .../mwmechanics/mechanicsmanagerimp.cpp       |  3 +-
 apps/openmw/mwmechanics/spelleffects.cpp      | 13 +++---
 11 files changed, 67 insertions(+), 89 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b37fed31fd..58d111dd01 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
     Bug #3246: ESSImporter: Most NPCs are dead on save load
     Bug #3514: Editing a reference's position after loading an esp file makes the reference disappear
     Bug #3737: Scripts from The Underground 2 .esp do not play (all patched versions)
+    Bug #3792: 1 frame late magicka recalc breaks early scripted magicka reactions to Intelligence change
     Bug #3846: Strings starting with "-" fail to compile if not enclosed in quotes
     Bug #3905: Great House Dagoth issues
     Bug #4203: Resurrecting an actor should close the loot GUI
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index a9b1f461ca..4ca5b37cf8 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -112,7 +112,10 @@ namespace MWClass
     {
         if (!ptr.getRefData().getCustomData())
         {
-            std::unique_ptr<CreatureCustomData> data (new CreatureCustomData);
+            auto tempData = std::make_unique<CreatureCustomData>();
+            CreatureCustomData* data = tempData.get();
+            MWMechanics::CreatureCustomDataResetter resetter(ptr);
+            ptr.getRefData().setCustomData(std::move(tempData));
 
             MWWorld::LiveCellRef<ESM::Creature> *ref = ptr.get<ESM::Creature>();
 
@@ -156,10 +159,7 @@ namespace MWClass
 
             data->mCreatureStats.setGoldPool(ref->mBase->mData.mGold);
 
-            data->mCreatureStats.setNeedRecalcDynamicStats(false);
-
-            // store
-            ptr.getRefData().setCustomData(std::move(data));
+            resetter.mPtr = {};
 
             getContainerStore(ptr).fill(ref->mBase->mInventory, ptr.getCellRef().getRefId());
 
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index becfb8719f..b8df6747b3 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -303,7 +303,11 @@ namespace MWClass
     {
         if (!ptr.getRefData().getCustomData())
         {
-            std::unique_ptr<NpcCustomData> data(new NpcCustomData);
+            bool recalculate = false;
+            auto tempData = std::make_unique<NpcCustomData>();
+            NpcCustomData* data = tempData.get();
+            MWMechanics::CreatureCustomDataResetter resetter(ptr);
+            ptr.getRefData().setCustomData(std::move(tempData));
 
             MWWorld::LiveCellRef<ESM::NPC> *ref = ptr.get<ESM::NPC>();
 
@@ -334,8 +338,6 @@ namespace MWClass
                 data->mNpcStats.setLevel(ref->mBase->mNpdt.mLevel);
                 data->mNpcStats.setBaseDisposition(ref->mBase->mNpdt.mDisposition);
                 data->mNpcStats.setReputation(ref->mBase->mNpdt.mReputation);
-
-                data->mNpcStats.setNeedRecalcDynamicStats(false);
             }
             else
             {
@@ -351,7 +353,7 @@ namespace MWClass
                 autoCalculateAttributes(ref->mBase, data->mNpcStats);
                 autoCalculateSkills(ref->mBase, data->mNpcStats, ptr, spellsInitialised);
 
-                data->mNpcStats.setNeedRecalcDynamicStats(true);
+                recalculate = true;
             }
 
             // Persistent actors with 0 health do not play death animation
@@ -387,7 +389,9 @@ namespace MWClass
             data->mNpcStats.setGoldPool(gold);
 
             // store
-            ptr.getRefData().setCustomData(std::move(data));
+            resetter.mPtr = {};
+            if(recalculate)
+                data->mNpcStats.recalculateMagicka();
 
             // inventory
             // setting ownership is used to make the NPC auto-equip his initial equipment only, and not bartered items
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index d85946dbd5..0af65844f9 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -240,10 +240,7 @@ namespace MWMechanics
     {
         // magic effects
         adjustMagicEffects (ptr, duration);
-        if (ptr.getClass().getCreatureStats(ptr).needToRecalcDynamicStats())
-            calculateDynamicStats (ptr);
 
-        calculateCreatureStatModifiers (ptr, duration);
         // fatigue restoration
         calculateRestoration(ptr, duration);
     }
@@ -654,29 +651,6 @@ namespace MWMechanics
             updateSummons(creature, mTimerDisposeSummonsCorpses == 0.f);
     }
 
-    void Actors::calculateDynamicStats (const MWWorld::Ptr& ptr)
-    {
-        CreatureStats& creatureStats = ptr.getClass().getCreatureStats (ptr);
-
-        float intelligence = creatureStats.getAttribute(ESM::Attribute::Intelligence).getModified();
-
-        float base = 1.f;
-        if (ptr == getPlayer())
-            base = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fPCbaseMagickaMult")->mValue.getFloat();
-        else
-            base = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fNPCbaseMagickaMult")->mValue.getFloat();
-
-        double magickaFactor = base +
-            creatureStats.getMagicEffects().get (EffectKey (ESM::MagicEffect::FortifyMaximumMagicka)).getMagnitude() * 0.1;
-
-        DynamicStat<float> magicka = creatureStats.getMagicka();
-        float diff = (static_cast<int>(magickaFactor*intelligence)) - magicka.getBase();
-        float currentToBaseRatio = magicka.getBase() > 0 ? magicka.getCurrent() / magicka.getBase() : 0;
-        magicka.setModified(magicka.getModified() + diff, 0);
-        magicka.setCurrent(magicka.getBase() * currentToBaseRatio, false, true);
-        creatureStats.setMagicka(magicka);
-    }
-
     void Actors::restoreDynamicStats (const MWWorld::Ptr& ptr, double hours, bool sleep)
     {
         MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats (ptr);
@@ -771,14 +745,6 @@ namespace MWMechanics
         stats.setFatigue (fatigue);
     }
 
-    void Actors::calculateCreatureStatModifiers (const MWWorld::Ptr& ptr, float duration)
-    {
-        CreatureStats &creatureStats = ptr.getClass().getCreatureStats(ptr);
-
-        if (creatureStats.needToRecalcDynamicStats())
-            calculateDynamicStats(ptr);
-    }
-
     bool Actors::isAttackPreparing(const MWWorld::Ptr& ptr)
     {
         PtrActorMap::iterator it = mActors.find(ptr);
@@ -1711,10 +1677,6 @@ namespace MWMechanics
                 if (iter->first.getType() == ESM::Creature::sRecordId)
                     soulTrap(iter->first);
 
-                // Magic effects will be reset later, and the magic effect that could kill the actor
-                // needs to be determined now
-                calculateCreatureStatModifiers(iter->first, 0);
-
                 if (cls.isEssential(iter->first))
                     MWBase::Environment::get().getWindowManager()->messageBox("#{sKilledEssential}");
             }
@@ -1730,8 +1692,6 @@ namespace MWMechanics
                 // Make sure spell effects are removed
                 purgeSpellEffects(stats.getActorId());
 
-                // Reset dynamic stats, attributes and skills
-                calculateCreatureStatModifiers(iter->first, 0);
                 stats.getMagicEffects().add(ESM::MagicEffect::Vampirism, vampirism);
 
                 if (isPlayer)
@@ -1816,10 +1776,6 @@ namespace MWMechanics
                 continue;
 
             adjustMagicEffects (iter->first, duration);
-            if (iter->first.getClass().getCreatureStats(iter->first).needToRecalcDynamicStats())
-                calculateDynamicStats (iter->first);
-
-            calculateCreatureStatModifiers (iter->first, duration);
 
             MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(iter->first);
             if (animation)
@@ -2209,7 +2165,6 @@ namespace MWMechanics
     void Actors::updateMagicEffects(const MWWorld::Ptr &ptr)
     {
         adjustMagicEffects(ptr, 0.f);
-        calculateCreatureStatModifiers(ptr, 0.f);
     }
 
     bool Actors::isReadyToBlock(const MWWorld::Ptr &ptr) const
diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index 9950a591ab..7d44fd06cd 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -43,10 +43,6 @@ namespace MWMechanics
 
             void adjustMagicEffects (const MWWorld::Ptr& creature, float duration);
 
-            void calculateDynamicStats (const MWWorld::Ptr& ptr);
-
-            void calculateCreatureStatModifiers (const MWWorld::Ptr& ptr, float duration);
-
             void calculateRestoration (const MWWorld::Ptr& ptr, float duration);
 
             void updateDrowning (const MWWorld::Ptr& ptr, float duration, bool isKnockedOut, bool isPlayer);
diff --git a/apps/openmw/mwmechanics/actorutil.cpp b/apps/openmw/mwmechanics/actorutil.cpp
index 04cbb8e9f5..4a587dd662 100644
--- a/apps/openmw/mwmechanics/actorutil.cpp
+++ b/apps/openmw/mwmechanics/actorutil.cpp
@@ -29,4 +29,12 @@ namespace MWMechanics
         const MWMechanics::MagicEffects& effects = actor.getClass().getCreatureStats(actor).getMagicEffects();
         return effects.get(ESM::MagicEffect::WaterWalking).getMagnitude() > 0;
     }
+
+    CreatureCustomDataResetter::CreatureCustomDataResetter(const MWWorld::Ptr& ptr) : mPtr(ptr) {}
+
+    CreatureCustomDataResetter::~CreatureCustomDataResetter()
+    {
+        if(!mPtr.isEmpty())
+            mPtr.getRefData().setCustomData({});
+    }
 }
diff --git a/apps/openmw/mwmechanics/actorutil.hpp b/apps/openmw/mwmechanics/actorutil.hpp
index a226fc9cb6..a66d8866bf 100644
--- a/apps/openmw/mwmechanics/actorutil.hpp
+++ b/apps/openmw/mwmechanics/actorutil.hpp
@@ -86,6 +86,14 @@ namespace MWMechanics
     template void modifyBaseInventory<ESM::Creature>(const std::string& actorId, const std::string& itemId, int amount);
     template void modifyBaseInventory<ESM::NPC>(const std::string& actorId, const std::string& itemId, int amount);
     template void modifyBaseInventory<ESM::Container>(const std::string& containerId, const std::string& itemId, int amount);
+
+    struct CreatureCustomDataResetter
+    {
+        MWWorld::Ptr mPtr;
+
+        CreatureCustomDataResetter(const MWWorld::Ptr& ptr);
+        ~CreatureCustomDataResetter();
+    };
 }
 
 #endif
diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index 8ca6e8b766..6710dcd734 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -7,6 +7,7 @@
 #include <components/esm/esmreader.hpp>
 #include <components/esm/esmwriter.hpp>
 
+#include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/player.hpp"
 
@@ -22,7 +23,7 @@ namespace MWMechanics
           mTalkedTo (false), mAlarmed (false), mAttacked (false),
           mKnockdown(false), mKnockdownOneFrame(false), mKnockdownOverOneFrame(false),
           mHitRecovery(false), mBlock(false), mMovementFlags(0),
-          mFallHeight(0), mRecalcMagicka(false), mLastRestock(0,0), mGoldPool(0), mActorId(-1), mHitAttemptActorId(-1),
+          mFallHeight(0), mLastRestock(0,0), mGoldPool(0), mActorId(-1), mHitAttemptActorId(-1),
           mDeathAnimation(-1), mTimeOfDeath(), mSideMovementAngle(0), mLevel (0)
     {
         for (int i=0; i<4; ++i)
@@ -146,7 +147,7 @@ namespace MWMechanics
             mAttributes[index] = value;
 
             if (index == ESM::Attribute::Intelligence)
-                mRecalcMagicka = true;
+                recalculateMagicka();
             else if (index == ESM::Attribute::Strength ||
                      index == ESM::Attribute::Willpower ||
                      index == ESM::Attribute::Agility ||
@@ -208,11 +209,10 @@ namespace MWMechanics
 
     void CreatureStats::modifyMagicEffects(const MagicEffects &effects)
     {
-        if (effects.get(ESM::MagicEffect::FortifyMaximumMagicka).getModifier()
-                != mMagicEffects.get(ESM::MagicEffect::FortifyMaximumMagicka).getModifier())
-            mRecalcMagicka = true;
-
+        bool recalc = effects.get(ESM::MagicEffect::FortifyMaximumMagicka).getModifier() != mMagicEffects.get(ESM::MagicEffect::FortifyMaximumMagicka).getModifier();
         mMagicEffects.setModifiers(effects);
+        if(recalc)
+            recalculateMagicka();
     }
 
     void CreatureStats::setAiSetting (AiSetting index, Stat<int> value)
@@ -400,19 +400,26 @@ namespace MWMechanics
         return height;
     }
 
-    bool CreatureStats::needToRecalcDynamicStats()
+    void CreatureStats::recalculateMagicka()
     {
-         if (mRecalcMagicka)
-         {
-             mRecalcMagicka = false;
-             return true;
-         }
-         return false;
-    }
+        auto world = MWBase::Environment::get().getWorld();
+        float intelligence = getAttribute(ESM::Attribute::Intelligence).getModified();
 
-    void CreatureStats::setNeedRecalcDynamicStats(bool val)
-    {
-        mRecalcMagicka = val;
+        float base = 1.f;
+        const auto& player = world->getPlayerPtr();
+        if (this == &player.getClass().getCreatureStats(player))
+            base = world->getStore().get<ESM::GameSetting>().find("fPCbaseMagickaMult")->mValue.getFloat();
+        else
+            base = world->getStore().get<ESM::GameSetting>().find("fNPCbaseMagickaMult")->mValue.getFloat();
+
+        double magickaFactor = base + mMagicEffects.get(EffectKey(ESM::MagicEffect::FortifyMaximumMagicka)).getMagnitude() * 0.1;
+
+        DynamicStat<float> magicka = getMagicka();
+        float diff = (static_cast<int>(magickaFactor*intelligence)) - magicka.getBase();
+        float currentToBaseRatio = magicka.getBase() > 0 ? magicka.getCurrent() / magicka.getBase() : 0;
+        magicka.setModified(magicka.getModified() + diff, 0);
+        magicka.setCurrent(magicka.getBase() * currentToBaseRatio, false, true);
+        setMagicka(magicka);
     }
 
     void CreatureStats::setKnockedDown(bool value)
@@ -532,7 +539,6 @@ namespace MWMechanics
         state.mFallHeight = mFallHeight; // TODO: vertical velocity (move from PhysicActor to CreatureStats?)
         state.mLastHitObject = mLastHitObject;
         state.mLastHitAttemptObject = mLastHitAttemptObject;
-        state.mRecalcDynamicStats = mRecalcMagicka;
         state.mDrawState = mDrawState;
         state.mLevel = mLevel;
         state.mActorId = mActorId;
@@ -586,7 +592,6 @@ namespace MWMechanics
         mFallHeight = state.mFallHeight;
         mLastHitObject = state.mLastHitObject;
         mLastHitAttemptObject = state.mLastHitAttemptObject;
-        mRecalcMagicka = state.mRecalcDynamicStats;
         mDrawState = DrawState_(state.mDrawState);
         mLevel = state.mLevel;
         mActorId = state.mActorId;
@@ -627,6 +632,8 @@ namespace MWMechanics
         if (state.mHasAiSettings)
             for (int i=0; i<4; ++i)
                 mAiSettings[i].readState(state.mAiSettings[i]);
+        if(state.mRecalcDynamicStats)
+            recalculateMagicka();
     }
 
     void CreatureStats::setLastRestockTime(MWWorld::TimeStamp tradeTime)
diff --git a/apps/openmw/mwmechanics/creaturestats.hpp b/apps/openmw/mwmechanics/creaturestats.hpp
index d234d14486..e5c4f6fa41 100644
--- a/apps/openmw/mwmechanics/creaturestats.hpp
+++ b/apps/openmw/mwmechanics/creaturestats.hpp
@@ -65,8 +65,6 @@ namespace MWMechanics
         std::string mLastHitObject; // The last object to hit this actor
         std::string mLastHitAttemptObject; // The last object to attempt to hit this actor
 
-        bool mRecalcMagicka;
-
         // For merchants: the last time items were restocked and gold pool refilled.
         MWWorld::TimeStamp mLastRestock;
 
@@ -103,8 +101,7 @@ namespace MWMechanics
         DrawState_ getDrawState() const;
         void setDrawState(DrawState_ state);
 
-        bool needToRecalcDynamicStats();
-        void setNeedRecalcDynamicStats(bool val);
+        void recalculateMagicka();
 
         float getFallHeight() const;
         void addToFallHeight(float height);
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 149056e605..e01ed3c425 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -77,7 +77,7 @@ namespace MWMechanics
         MWMechanics::CreatureStats& creatureStats = ptr.getClass().getCreatureStats (ptr);
         MWMechanics::NpcStats& npcStats = ptr.getClass().getNpcStats (ptr);
 
-        npcStats.setNeedRecalcDynamicStats(true);
+        npcStats.recalculateMagicka();
 
         const ESM::NPC *player = ptr.get<ESM::NPC>()->mBase;
 
@@ -222,7 +222,6 @@ namespace MWMechanics
 
         // forced update and current value adjustments
         mActors.updateActor (ptr, 0);
-        mActors.updateActor (ptr, 0);
 
         for (int i=0; i<3; ++i)
         {
diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp
index 0e67f06ba2..d9e32b8b9f 100644
--- a/apps/openmw/mwmechanics/spelleffects.cpp
+++ b/apps/openmw/mwmechanics/spelleffects.cpp
@@ -279,7 +279,7 @@ namespace
 namespace MWMechanics
 {
 
-void applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, const ActiveSpells::ActiveSpellParams& spellParams, ESM::ActiveEffect& effect, bool& invalid, bool& receivedMagicDamage)
+void applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, const ActiveSpells::ActiveSpellParams& spellParams, ESM::ActiveEffect& effect, bool& invalid, bool& receivedMagicDamage, bool& recalculateMagicka)
 {
     const auto world = MWBase::Environment::get().getWorld();
     bool godmode = target == getPlayer() && world->getGodModeState();
@@ -609,7 +609,7 @@ void applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, co
                 fortifySkill(target, effect, effect.mMagnitude);
             break;
         case ESM::MagicEffect::FortifyMaximumMagicka:
-            target.getClass().getCreatureStats(target).setNeedRecalcDynamicStats(true);
+            recalculateMagicka = true;
             break;
         case ESM::MagicEffect::AbsorbHealth:
         case ESM::MagicEffect::AbsorbMagicka:
@@ -687,13 +687,14 @@ bool applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, Ac
     const auto world = MWBase::Environment::get().getWorld();
     bool invalid = false;
     bool receivedMagicDamage = false;
+    bool recalculateMagicka = false;
     if(effect.mEffectId == ESM::MagicEffect::Corprus && spellParams.shouldWorsen())
     {
         spellParams.worsen();
         for(auto& otherEffect : spellParams.getEffects())
         {
             if(isCorprusEffect(otherEffect))
-                applyMagicEffect(target, caster, spellParams, otherEffect, invalid, receivedMagicDamage);
+                applyMagicEffect(target, caster, spellParams, otherEffect, invalid, receivedMagicDamage, recalculateMagicka);
         }
         if(target == getPlayer())
             MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicCorprusWorsens}");
@@ -815,7 +816,7 @@ bool applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, Ac
         if(effect.mEffectId == ESM::MagicEffect::Corprus)
             spellParams.worsen();
         else
-            applyMagicEffect(target, caster, spellParams, effect, invalid, receivedMagicDamage);
+            applyMagicEffect(target, caster, spellParams, effect, invalid, receivedMagicDamage, recalculateMagicka);
         effect.mMagnitude = magnitude;
         magnitudes.add(EffectKey(effect.mEffectId, effect.mArg), EffectParam(effect.mMagnitude - oldMagnitude));
     }
@@ -832,6 +833,8 @@ bool applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, Ac
         effect.mFlags |= ESM::ActiveEffect::Flag_Applied | ESM::ActiveEffect::Flag_Remove;
     if (receivedMagicDamage && target == getPlayer())
         MWBase::Environment::get().getWindowManager()->activateHitOverlay(false);
+    if(recalculateMagicka)
+        target.getClass().getCreatureStats(target).recalculateMagicka();
     return false;
 }
 
@@ -981,7 +984,7 @@ void removeMagicEffect(const MWWorld::Ptr& target, ActiveSpells::ActiveSpellPara
                 fortifySkill(target, effect, -effect.mMagnitude);
             break;
         case ESM::MagicEffect::FortifyMaximumMagicka:
-            target.getClass().getCreatureStats(target).setNeedRecalcDynamicStats(true);
+            target.getClass().getCreatureStats(target).recalculateMagicka();
             break;
         case ESM::MagicEffect::AbsorbAttribute:
             {

From 07e32c0fa6be9fa7129c1002b77deb469803d248 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Mon, 25 Oct 2021 10:23:16 -0700
Subject: [PATCH 1540/2859] remove object shader path

---
 apps/openmw/mwworld/weather.cpp     |  1 -
 components/shader/shadervisitor.cpp |  6 +++++-
 files/shaders/lighting.glsl         | 10 ----------
 files/shaders/objects_fragment.glsl |  8 ++------
 files/shaders/objects_vertex.glsl   |  8 ++------
 files/shaders/sky_fragment.glsl     |  2 +-
 6 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index 9055b95ee1..965c690238 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -1273,4 +1273,3 @@ namespace MWWorld
     }
 }
 
-
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index dcd4874e90..9877ab1863 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -518,7 +518,11 @@ namespace Shader
 
         bool simpleLighting = false;
         node.getUserValue("simpleLighting", simpleLighting);
-        defineMap["simpleLighting"] = simpleLighting ? "1" : "0";
+        if (simpleLighting)
+        {
+            defineMap["forcePPL"] = "1";
+            defineMap["endLight"] = "0";
+        }
 
         if (writableStateSet->getMode(GL_ALPHA_TEST) != osg::StateAttribute::INHERIT && !previousAddedState->hasMode(GL_ALPHA_TEST))
             removedState->setMode(GL_ALPHA_TEST, writableStateSet->getMode(GL_ALPHA_TEST));
diff --git a/files/shaders/lighting.glsl b/files/shaders/lighting.glsl
index dc9c297a2f..177017f822 100644
--- a/files/shaders/lighting.glsl
+++ b/files/shaders/lighting.glsl
@@ -87,16 +87,6 @@ void doLighting(vec3 viewPos, vec3 viewNormal, out vec3 diffuseLight, out vec3 a
     }
 }
 
-// Simplest lighting which only takes into account sun and ambient. Currently used for our weather particle systems.
-void doSimpleLighting(vec3 viewPos, vec3 viewNormal, out vec3 diffuseLight, out vec3 ambientLight)
-{
-    vec3 ambientOut, diffuseOut;
-
-    perLightSun(diffuseOut, viewPos, viewNormal);
-    ambientLight = gl_LightModel.ambient.xyz;
-    diffuseLight = diffuseOut;
-}
-
 vec3 getSpecular(vec3 viewNormal, vec3 viewDirection, float shininess, vec3 matSpec)
 {
     vec3 lightDir = normalize(lcalcPosition(0));
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index 26107abb10..6f6cede4e4 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -63,7 +63,7 @@ uniform bool simpleWater;
 varying float euclideanDepth;
 varying float linearDepth;
 
-#define PER_PIXEL_LIGHTING ((@normalMap || @forcePPL) && !@simpleLighting)
+#define PER_PIXEL_LIGHTING (@normalMap || @forcePPL)
 
 #if !PER_PIXEL_LIGHTING
 centroid varying vec3 passLighting;
@@ -170,9 +170,6 @@ void main()
 #endif
 
     float shadowing = unshadowedLightRatio(linearDepth);
-#if @simpleLighting
-    gl_FragData[0].xyz *= passLighting;
-#else
     vec3 lighting;
 #if !PER_PIXEL_LIGHTING
     lighting = passLighting + shadowDiffuseLighting * shadowing;
@@ -183,8 +180,8 @@ void main()
     lighting = diffuseColor.xyz * diffuseLight + getAmbientColor().xyz * ambientLight + emission;
     clampLightingResult(lighting);
 #endif
+
     gl_FragData[0].xyz *= lighting;
-#endif
 
 #if @envMap && !@preLightEnv
     gl_FragData[0].xyz += texture2D(envMap, envTexCoordGen).xyz * envMapColor.xyz * envLuma;
@@ -210,7 +207,6 @@ void main()
 #endif
         gl_FragData[0].xyz += getSpecular(normalize(viewNormal), normalize(passViewPos.xyz), shininess, matSpec) * shadowing;
     }
-
 #if @radialFog
     float depth;
     // For the less detailed mesh of simple water we need to recalculate depth on per-pixel basis
diff --git a/files/shaders/objects_vertex.glsl b/files/shaders/objects_vertex.glsl
index 5f208ffc25..969fe5903e 100644
--- a/files/shaders/objects_vertex.glsl
+++ b/files/shaders/objects_vertex.glsl
@@ -50,7 +50,7 @@ varying vec2 specularMapUV;
 varying float euclideanDepth;
 varying float linearDepth;
 
-#define PER_PIXEL_LIGHTING ((@normalMap || @forcePPL) && !@simpleLighting)
+#define PER_PIXEL_LIGHTING (@normalMap || @forcePPL)
 
 #if !PER_PIXEL_LIGHTING
 centroid varying vec3 passLighting;
@@ -126,11 +126,7 @@ void main(void)
 
 #if !PER_PIXEL_LIGHTING
     vec3 diffuseLight, ambientLight;
-#if @simpleLighting
-    doSimpleLighting(passViewPos, viewNormal, diffuseLight, ambientLight);
-#else
-    doLighting(passViewPos, viewNormal, diffuseLight, ambientLight, shadowDiffuseLighting);
-#endif
+    doLighting(viewPos.xyz, viewNormal, diffuseLight, ambientLight, shadowDiffuseLighting);
     vec3 emission = getEmissionColor().xyz * emissiveMult;
     passLighting = getDiffuseColor().xyz * diffuseLight + getAmbientColor().xyz * ambientLight + emission;
     clampLightingResult(passLighting);
diff --git a/files/shaders/sky_fragment.glsl b/files/shaders/sky_fragment.glsl
index 1ef62ab2cf..cfa3650c02 100644
--- a/files/shaders/sky_fragment.glsl
+++ b/files/shaders/sky_fragment.glsl
@@ -31,7 +31,7 @@ void paintClouds(inout vec4 color)
     color.xyz = clamp(color.xyz * gl_FrontMaterial.emission.xyz, 0.0, 1.0);
 
     // ease transition between clear color and atmosphere/clouds
-    color = mix(vec4(gl_Fog.color.xyz, color.a), color, passColor.a * passColor.a);
+    color = mix(vec4(gl_Fog.color.xyz, color.a), color, passColor.a);
 }
 
 void paintMoon(inout vec4 color)

From ba4f1921abf22c0b1af85b52c1eebbfb8c780d47 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Mon, 25 Oct 2021 15:04:55 -0700
Subject: [PATCH 1541/2859] overrides

---
 apps/openmw/mwrender/sky.cpp     |  6 ++--
 apps/openmw/mwrender/skyutil.cpp | 58 ++++++++++++++++----------------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index 9deb6968e3..eb7c4a3882 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -340,7 +340,7 @@ namespace MWRender
 
         auto depth = SceneUtil::createDepth();
         depth->setWriteMask(false);
-        mEarlyRenderBinRoot->getOrCreateStateSet()->setAttributeAndModes(depth, osg::StateAttribute::ON);
+        mEarlyRenderBinRoot->getOrCreateStateSet()->setAttributeAndModes(depth);
         mEarlyRenderBinRoot->getOrCreateStateSet()->setMode(GL_BLEND, osg::StateAttribute::ON);
         mEarlyRenderBinRoot->getOrCreateStateSet()->setMode(GL_FOG, osg::StateAttribute::OFF);
 
@@ -374,7 +374,7 @@ namespace MWRender
         raindropTex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
         raindropTex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
 
-        stateset->setTextureAttributeAndModes(0, raindropTex, osg::StateAttribute::ON);
+        stateset->setTextureAttributeAndModes(0, raindropTex);
         stateset->setNestRenderBins(false);
         stateset->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
         stateset->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
@@ -384,7 +384,7 @@ namespace MWRender
         mat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
         mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
         mat->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
-        stateset->setAttributeAndModes(mat, osg::StateAttribute::ON);
+        stateset->setAttributeAndModes(mat);
 
         osgParticle::Particle& particleTemplate = mRainParticleSystem->getDefaultParticleTemplate();
         particleTemplate.setSizeRange(osgParticle::rangef(5.f, 15.f));
diff --git a/apps/openmw/mwrender/skyutil.cpp b/apps/openmw/mwrender/skyutil.cpp
index ae689547fd..9932733fa1 100644
--- a/apps/openmw/mwrender/skyutil.cpp
+++ b/apps/openmw/mwrender/skyutil.cpp
@@ -126,7 +126,7 @@ namespace MWRender
 
         void setDefaults(osg::StateSet* stateset) override
         {
-            stateset->setAttributeAndModes(MWRender::createUnlitMaterial(), osg::StateAttribute::ON);
+            stateset->setAttributeAndModes(MWRender::createUnlitMaterial());
         }
 
         void apply(osg::StateSet* stateset, osg::NodeVisitor*) override
@@ -292,7 +292,7 @@ namespace MWRender
                 mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0,0,0,fade));
                 mat->setEmission(osg::Material::FRONT_AND_BACK, mColor);
 
-                stateset->setAttributeAndModes(mat, osg::StateAttribute::ON);
+                stateset->setAttributeAndModes(mat);
 
                 cv->pushStateSet(stateset);
                 traverse(node, cv);
@@ -359,9 +359,9 @@ namespace MWRender
         {
             if (mForceShaders)
             {
-                stateset->addUniform(new osg::Uniform("pass", static_cast<int>(Pass::Moon)), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
-                stateset->setTextureAttributeAndModes(0, mPhaseTex, osg::StateAttribute::ON);
-                stateset->setTextureAttributeAndModes(1, mCircleTex, osg::StateAttribute::ON);
+                stateset->addUniform(new osg::Uniform("pass", static_cast<int>(Pass::Moon)));
+                stateset->setTextureAttributeAndModes(0, mPhaseTex);
+                stateset->setTextureAttributeAndModes(1, mCircleTex);
                 stateset->setTextureMode(0, GL_TEXTURE_2D, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
                 stateset->setTextureMode(1, GL_TEXTURE_2D, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
                 stateset->addUniform(new osg::Uniform("moonBlend", osg::Vec4f{}));
@@ -372,15 +372,15 @@ namespace MWRender
             }
             else
             {
-                stateset->setTextureAttributeAndModes(0, mPhaseTex, osg::StateAttribute::ON);
+                stateset->setTextureAttributeAndModes(0, mPhaseTex);
                 osg::ref_ptr<osg::TexEnvCombine> texEnv = new osg::TexEnvCombine;
                 texEnv->setCombine_RGB(osg::TexEnvCombine::MODULATE);
                 texEnv->setSource0_RGB(osg::TexEnvCombine::CONSTANT);
                 texEnv->setSource1_RGB(osg::TexEnvCombine::TEXTURE);
                 texEnv->setConstantColor(osg::Vec4f(1.f, 0.f, 0.f, 1.f)); // mShadowBlend * mMoonColor
-                stateset->setTextureAttributeAndModes(0, texEnv, osg::StateAttribute::ON);
+                stateset->setTextureAttributeAndModes(0, texEnv);
 
-                stateset->setTextureAttributeAndModes(1, mCircleTex, osg::StateAttribute::ON);
+                stateset->setTextureAttributeAndModes(1, mCircleTex);
                 osg::ref_ptr<osg::TexEnvCombine> texEnv2 = new osg::TexEnvCombine;
                 texEnv2->setCombine_RGB(osg::TexEnvCombine::ADD);
                 texEnv2->setCombine_Alpha(osg::TexEnvCombine::MODULATE);
@@ -389,7 +389,7 @@ namespace MWRender
                 texEnv2->setSource0_RGB(osg::TexEnvCombine::PREVIOUS);
                 texEnv2->setSource1_RGB(osg::TexEnvCombine::CONSTANT);
                 texEnv2->setConstantColor(osg::Vec4f(0.f, 0.f, 0.f, 1.f)); // mAtmosphereColor.rgb, mTransparency
-                stateset->setTextureAttributeAndModes(1, texEnv2, osg::StateAttribute::ON);
+                stateset->setTextureAttributeAndModes(1, texEnv2);
                 stateset->setAttributeAndModes(MWRender::createUnlitMaterial(), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
             }
         }
@@ -477,7 +477,7 @@ namespace MWRender
     void AtmosphereUpdater::setDefaults(osg::StateSet* stateset)
     {
         stateset->setAttributeAndModes(createAlphaTrackingUnlitMaterial(), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
-        stateset->addUniform(new osg::Uniform("pass", static_cast<int>(Pass::Atmosphere)), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+        stateset->addUniform(new osg::Uniform("pass", static_cast<int>(Pass::Atmosphere)));
     }
 
     void AtmosphereUpdater::apply(osg::StateSet* stateset, osg::NodeVisitor* /*nv*/)
@@ -501,8 +501,8 @@ namespace MWRender
     {
         if (mForceShaders)
         {
-            stateset->addUniform(new osg::Uniform("opacity", 0.f), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
-            stateset->addUniform(new osg::Uniform("pass", static_cast<int>(Pass::Atmosphere_Night)), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+            stateset->addUniform(new osg::Uniform("opacity", 0.f));
+            stateset->addUniform(new osg::Uniform("pass", static_cast<int>(Pass::Atmosphere_Night)));
         }
         else
         {
@@ -561,18 +561,18 @@ namespace MWRender
         stateset->setAttribute(createAlphaTrackingUnlitMaterial(), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
 
         osg::ref_ptr<osg::TexMat> texmat = new osg::TexMat;
-        stateset->setTextureAttributeAndModes(0, texmat, osg::StateAttribute::ON);
+        stateset->setTextureAttributeAndModes(0, texmat);
 
         if (mForceShaders)
         {
             stateset->setTextureAttribute(0, mTexture, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
 
-            stateset->addUniform(new osg::Uniform("opacity", 1.f), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
-            stateset->addUniform(new osg::Uniform("pass", static_cast<int>(Pass::Clouds)), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+            stateset->addUniform(new osg::Uniform("opacity", 1.f));
+            stateset->addUniform(new osg::Uniform("pass", static_cast<int>(Pass::Clouds)));
         }
         else
         {
-            stateset->setTextureAttributeAndModes(1, texmat, osg::StateAttribute::ON);
+            stateset->setTextureAttributeAndModes(1, texmat);
             // need to set opacity on a separate texture unit, diffuse alpha is used by the vertex colors already
             osg::ref_ptr<osg::TexEnvCombine> texEnvCombine = new osg::TexEnvCombine;
             texEnvCombine->setSource0_RGB(osg::TexEnvCombine::PREVIOUS);
@@ -582,7 +582,7 @@ namespace MWRender
             texEnvCombine->setCombine_Alpha(osg::TexEnvCombine::MODULATE);
             texEnvCombine->setCombine_RGB(osg::TexEnvCombine::REPLACE);
 
-            stateset->setTextureAttributeAndModes(1, texEnvCombine, osg::StateAttribute::ON);
+            stateset->setTextureAttributeAndModes(1, texEnvCombine);
 
             stateset->setTextureMode(0, GL_TEXTURE_2D, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
             stateset->setTextureMode(1, GL_TEXTURE_2D, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
@@ -715,8 +715,8 @@ namespace MWRender
         sunTex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
         sunTex->setName("diffuseMap");
 
-        mGeom->getOrCreateStateSet()->setTextureAttributeAndModes(0, sunTex, osg::StateAttribute::ON);
-        mGeom->getOrCreateStateSet()->addUniform(new osg::Uniform("pass", static_cast<int>(Pass::Sun)), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+        mGeom->getOrCreateStateSet()->setTextureAttributeAndModes(0, sunTex);
+        mGeom->getOrCreateStateSet()->addUniform(new osg::Uniform("pass", static_cast<int>(Pass::Sun)));
 
         osg::ref_ptr<osg::Group> queryNode = new osg::Group;
         // Need to render after the world geometry so we can correctly test for occlusions
@@ -726,14 +726,14 @@ namespace MWRender
         // Set up alpha testing on the occlusion testing subgraph, that way we can get the occlusion tested fragments to match the circular shape of the sun
         osg::ref_ptr<osg::AlphaFunc> alphaFunc = new osg::AlphaFunc;
         alphaFunc->setFunction(osg::AlphaFunc::GREATER, 0.8);
-        stateset->setAttributeAndModes(alphaFunc, osg::StateAttribute::ON);
-        stateset->setTextureAttributeAndModes(0, sunTex, osg::StateAttribute::ON);
-        stateset->setAttributeAndModes(createUnlitMaterial(), osg::StateAttribute::ON);
-        stateset->addUniform(new osg::Uniform("pass", static_cast<int>(Pass::Sunflash_Query)), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+        stateset->setAttributeAndModes(alphaFunc);
+        stateset->setTextureAttributeAndModes(0, sunTex);
+        stateset->setAttributeAndModes(createUnlitMaterial());
+        stateset->addUniform(new osg::Uniform("pass", static_cast<int>(Pass::Sunflash_Query)));
 
         // Disable writing to the color buffer. We are using this geometry for visibility tests only.
         osg::ref_ptr<osg::ColorMask> colormask = new osg::ColorMask(0, 0, 0, 0);
-        stateset->setAttributeAndModes(colormask, osg::StateAttribute::ON);
+        stateset->setAttributeAndModes(colormask);
 
         mTransform->addChild(queryNode);
 
@@ -829,7 +829,7 @@ namespace MWRender
             depth->setZNear(far);
             depth->setZFar(far);
             depth->setWriteMask(false);
-            queryStateSet->setAttributeAndModes(depth, osg::StateAttribute::ON);
+            queryStateSet->setAttributeAndModes(depth);
         }
         else
         {
@@ -859,11 +859,11 @@ namespace MWRender
 
         osg::StateSet* stateset = geom->getOrCreateStateSet();
 
-        stateset->setTextureAttributeAndModes(0, tex, osg::StateAttribute::ON);
+        stateset->setTextureAttributeAndModes(0, tex);
         stateset->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
         stateset->setRenderBinDetails(RenderBin_SunGlare, "RenderBin");
         stateset->setNestRenderBins(false);
-        stateset->addUniform(new osg::Uniform("pass", static_cast<int>(Pass::Sun)), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+        stateset->addUniform(new osg::Uniform("pass", static_cast<int>(Pass::Sun)));
 
         mSunFlashNode = group;
 
@@ -898,13 +898,13 @@ namespace MWRender
         stateset->setRenderBinDetails(RenderBin_SunGlare, "RenderBin");
         stateset->setNestRenderBins(false);
         stateset->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
-        stateset->addUniform(new osg::Uniform("pass", static_cast<int>(Pass::Sunglare)), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+        stateset->addUniform(new osg::Uniform("pass", static_cast<int>(Pass::Sunglare)));
 
         // set up additive blending
         osg::ref_ptr<osg::BlendFunc> blendFunc = new osg::BlendFunc;
         blendFunc->setSource(osg::BlendFunc::SRC_ALPHA);
         blendFunc->setDestination(osg::BlendFunc::ONE);
-        stateset->setAttributeAndModes(blendFunc, osg::StateAttribute::ON);
+        stateset->setAttributeAndModes(blendFunc);
 
         mSunGlareCallback = new SunGlareCallback(mOcclusionQueryVisiblePixels, mOcclusionQueryTotalPixels, mTransform);
         mSunGlareNode = camera;

From 03733a30b0c45a704010b43d61bd4c0fa17f74b4 Mon Sep 17 00:00:00 2001
From: wareya <wareya@gmail.com>
Date: Tue, 26 Oct 2021 03:07:33 +0000
Subject: [PATCH 1542/2859] Update water_fragment.glsl

---
 files/shaders/water_fragment.glsl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/shaders/water_fragment.glsl b/files/shaders/water_fragment.glsl
index ac12b355ee..8d608e53c4 100644
--- a/files/shaders/water_fragment.glsl
+++ b/files/shaders/water_fragment.glsl
@@ -105,11 +105,11 @@ vec4 circle(vec2 coords, vec2 uv, float adjusted_time)
   float height = blip(ringfollower);
   vec4 ret = vec4(normal.x, normal.y, height, height);
   ret.xyw *= energy;
-  ret.xyz = normalize(ret.xyz);
+  ret.xyz = normalize(ret.x, ret.y, ret.z+0.001);
   return ret;
 }
 
-const float RAIN_RING_TIME_OFFSET = 1/6.0;
+const float RAIN_RING_TIME_OFFSET = 1.0/6.0;
 vec4 rain(vec2 uv, float time)
 {
   vec2 i_part = floor(uv * RAIN_RIPPLE_GAPS);

From 4ec927829f41a2b204feaf477bdc2cc402bbe47d Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 10 Oct 2021 16:28:45 +0200
Subject: [PATCH 1543/2859] Give each reflect and spell absorption effect a
 chance to apply

---
 CHANGELOG.md                                |   2 +
 apps/openmw/CMakeLists.txt                  |   2 +-
 apps/openmw/mwmechanics/activespells.cpp    |  30 ++++-
 apps/openmw/mwmechanics/activespells.hpp    |   2 +
 apps/openmw/mwmechanics/spellabsorption.cpp |  82 ------------
 apps/openmw/mwmechanics/spellabsorption.hpp |  17 ---
 apps/openmw/mwmechanics/spellcasting.cpp    |  63 +---------
 apps/openmw/mwmechanics/spellcasting.hpp    |   2 +-
 apps/openmw/mwmechanics/spelleffects.cpp    | 131 ++++++++++++++++----
 apps/openmw/mwmechanics/spelleffects.hpp    |   7 +-
 apps/openmw/mwworld/esmloader.cpp           |   8 +-
 apps/openmw/mwworld/projectilemanager.cpp   |   2 +-
 apps/openmw/mwworld/worldimp.cpp            |   2 +-
 components/esm/activespells.hpp             |   4 +-
 14 files changed, 162 insertions(+), 192 deletions(-)
 delete mode 100644 apps/openmw/mwmechanics/spellabsorption.cpp
 delete mode 100644 apps/openmw/mwmechanics/spellabsorption.hpp

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d609b0ae7f..d2968ae9d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,6 +45,8 @@
     Bug #6174: Spellmaking and Enchanting sliders differences from vanilla
     Bug #6184: Command and Calm and Demoralize and Frenzy and Rally magic effects inconsistencies with vanilla
     Bug #6197: Infinite Casting Loop
+    Bug #6253: Multiple instances of Reflect stack additively
+    Bug #6255: Reflect is different from vanilla
     Bug #6258: Barter menu glitches out when modifying prices
     Bug #6273: Respawning NPCs rotation is inconsistent
     Bug #6282: Laura craft doesn't follow the player character
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 7334d893db..89620d6dc1 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -94,7 +94,7 @@ add_openmw_dir (mwmechanics
     aicast aiescort aiface aiactivate aicombat recharge repair enchanting pathfinding pathgrid security spellcasting spellresistance
     disease pickpocket levelledlist combat steering obstacle autocalcspell difficultyscaling aicombataction actor summoning
     character actors objects aistate trading weaponpriority spellpriority weapontype spellutil
-    spellabsorption spelleffects
+    spelleffects
     )
 
 add_openmw_dir (mwstate
diff --git a/apps/openmw/mwmechanics/activespells.cpp b/apps/openmw/mwmechanics/activespells.cpp
index fc35e40b74..d435bd6c44 100644
--- a/apps/openmw/mwmechanics/activespells.cpp
+++ b/apps/openmw/mwmechanics/activespells.cpp
@@ -1,5 +1,7 @@
 #include "activespells.hpp"
 
+#include <optional>
+
 #include <components/debug/debuglog.hpp>
 
 #include <components/misc/rng.hpp>
@@ -14,6 +16,8 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
+#include "../mwrender/animation.hpp"
+
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/inventorystore.hpp"
@@ -96,6 +100,11 @@ namespace MWMechanics
     , mType(params.mType), mWorsenings(params.mWorsenings), mNextWorsening({params.mNextWorsening})
     {}
 
+    ActiveSpells::ActiveSpellParams::ActiveSpellParams(const ActiveSpellParams& params, const MWWorld::Ptr& actor)
+    : mId(params.mId), mDisplayName(params.mDisplayName), mCasterActorId(actor.getClass().getCreatureStats(actor).getActorId())
+    , mSlot(params.mSlot), mType(params.mType), mWorsenings(-1)
+    {}
+
     ESM::ActiveSpells::ActiveSpellParams ActiveSpells::ActiveSpellParams::toEsm() const
     {
         ESM::ActiveSpells::ActiveSpellParams params;
@@ -220,10 +229,19 @@ namespace MWMechanics
         {
             const auto caster = MWBase::Environment::get().getWorld()->searchPtrViaActorId(spellIt->mCasterActorId); //Maybe make this search outside active grid?
             bool removedSpell = false;
+            std::optional<ActiveSpellParams> reflected;
             for(auto it = spellIt->mEffects.begin(); it != spellIt->mEffects.end();)
             {
-                bool remove = applyMagicEffect(ptr, caster, *spellIt, *it, duration);
-                if(remove)
+                auto result = applyMagicEffect(ptr, caster, *spellIt, *it, duration);
+                if(result == MagicApplicationResult::REFLECTED)
+                {
+                    if(!reflected)
+                        reflected = {*spellIt, ptr};
+                    auto& reflectedEffect = reflected->mEffects.emplace_back(*it);
+                    reflectedEffect.mFlags = ESM::ActiveEffect::Flag_Ignore_Reflect | ESM::ActiveEffect::Flag_Ignore_SpellAbsorption;
+                    it = spellIt->mEffects.erase(it);
+                }
+                else if(result == MagicApplicationResult::REMOVED)
                     it = spellIt->mEffects.erase(it);
                 else
                     ++it;
@@ -231,6 +249,14 @@ namespace MWMechanics
                 if(removedSpell)
                     break;
             }
+            if(reflected)
+            {
+                const ESM::Static* reflectStatic = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>().find("VFX_Reflect");
+                MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(ptr);
+                if(animation && !reflectStatic->mModel.empty())
+                    animation->addEffect("meshes\\" + reflectStatic->mModel, ESM::MagicEffect::Reflect, false, std::string());
+                caster.getClass().getCreatureStats(caster).getActiveSpells().addSpell(*reflected);
+            }
             if(removedSpell)
                 continue;
 
diff --git a/apps/openmw/mwmechanics/activespells.hpp b/apps/openmw/mwmechanics/activespells.hpp
index 0538d7a8b7..524bdc0475 100644
--- a/apps/openmw/mwmechanics/activespells.hpp
+++ b/apps/openmw/mwmechanics/activespells.hpp
@@ -50,6 +50,8 @@ namespace MWMechanics
 
                     ActiveSpellParams(const MWWorld::ConstPtr& item, const ESM::Enchantment* enchantment, int slotIndex, const MWWorld::Ptr& actor);
 
+                    ActiveSpellParams(const ActiveSpellParams& params, const MWWorld::Ptr& actor);
+
                     ESM::ActiveSpells::ActiveSpellParams toEsm() const;
 
                     friend class ActiveSpells;
diff --git a/apps/openmw/mwmechanics/spellabsorption.cpp b/apps/openmw/mwmechanics/spellabsorption.cpp
deleted file mode 100644
index 82531132ca..0000000000
--- a/apps/openmw/mwmechanics/spellabsorption.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-#include "spellabsorption.hpp"
-
-#include <components/misc/rng.hpp>
-
-#include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
-
-#include "../mwrender/animation.hpp"
-
-#include "../mwworld/class.hpp"
-#include "../mwworld/esmstore.hpp"
-#include "../mwworld/inventorystore.hpp"
-
-#include "creaturestats.hpp"
-#include "spellutil.hpp"
-
-namespace MWMechanics
-{
-    float getProbability(const MWMechanics::ActiveSpells& activeSpells)
-    {
-        float probability = 0.f;
-        for(const auto& params : activeSpells)
-        {
-            for(const auto& effect : params.getEffects())
-            {
-                if(effect.mEffectId == ESM::MagicEffect::SpellAbsorption)
-                {
-                    if(probability == 0.f)
-                        probability = effect.mMagnitude / 100;
-                    else
-                    {
-                        // If there are different sources of SpellAbsorption effect, multiply failing probability for all effects.
-                        // Real absorption probability will be the (1 - total fail chance) in this case.
-                        float failProbability = 1.f - probability;
-                        failProbability *= 1.f - effect.mMagnitude / 100;
-                        probability = 1.f - failProbability;
-                    }
-                }
-            }
-        }
-        return static_cast<int>(probability * 100);
-    }
-
-    bool absorbSpell (const std::string& spellId, const MWWorld::Ptr& caster, const MWWorld::Ptr& target)
-    {
-        if (spellId.empty() || target.isEmpty() || caster == target || !target.getClass().isActor())
-            return false;
-
-        CreatureStats& stats = target.getClass().getCreatureStats(target);
-        if (stats.getMagicEffects().get(ESM::MagicEffect::SpellAbsorption).getMagnitude() <= 0.f)
-            return false;
-
-        int chance = getProbability(stats.getActiveSpells());
-        if (Misc::Rng::roll0to99() >= chance)
-            return false;
-
-        const auto& esmStore = MWBase::Environment::get().getWorld()->getStore();
-        const ESM::Static* absorbStatic = esmStore.get<ESM::Static>().find("VFX_Absorb");
-        MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(target);
-        if (animation && !absorbStatic->mModel.empty())
-            animation->addEffect( "meshes\\" + absorbStatic->mModel, ESM::MagicEffect::SpellAbsorption, false, std::string());
-        const ESM::Spell* spell = esmStore.get<ESM::Spell>().search(spellId);
-        int spellCost = 0;
-        if (spell)
-        {
-            spellCost = MWMechanics::calcSpellCost(*spell);
-        }
-        else
-        {
-            const ESM::Enchantment* enchantment = esmStore.get<ESM::Enchantment>().search(spellId);
-            if (enchantment)
-                spellCost = getEffectiveEnchantmentCastCost(static_cast<float>(enchantment->mData.mCost), caster);
-        }
-
-        // Magicka is increased by the cost of the spell
-        DynamicStat<float> magicka = stats.getMagicka();
-        magicka.setCurrent(magicka.getCurrent() + spellCost);
-        stats.setMagicka(magicka);
-        return true;
-    }
-
-}
diff --git a/apps/openmw/mwmechanics/spellabsorption.hpp b/apps/openmw/mwmechanics/spellabsorption.hpp
deleted file mode 100644
index 0fe501df91..0000000000
--- a/apps/openmw/mwmechanics/spellabsorption.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef MWMECHANICS_SPELLABSORPTION_H
-#define MWMECHANICS_SPELLABSORPTION_H
-
-#include <string>
-
-namespace MWWorld
-{
-    class Ptr;
-}
-
-namespace MWMechanics
-{
-    // Try to absorb a spell based on the magnitude of every Spell Absorption effect source on the target.
-    bool absorbSpell(const std::string& spellId, const MWWorld::Ptr& caster, const MWWorld::Ptr& target);
-}
-
-#endif
diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index 026f6b5f19..2edc437752 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -22,38 +22,11 @@
 #include "actorutil.hpp"
 #include "aifollow.hpp"
 #include "creaturestats.hpp"
-#include "spellabsorption.hpp"
 #include "spelleffects.hpp"
 #include "spellutil.hpp"
 #include "summoning.hpp"
 #include "weapontype.hpp"
 
-namespace
-{
-    bool reflectEffect(const ESM::ENAMstruct& effect, const ESM::MagicEffect* magicEffect,
-                       const MWWorld::Ptr& caster, const MWWorld::Ptr& target, ESM::EffectList& reflectedEffects)
-    {
-        if (caster.isEmpty() || caster == target || !target.getClass().isActor())
-            return false;
-
-        bool isHarmful = magicEffect->mData.mFlags & ESM::MagicEffect::Harmful;
-        bool isUnreflectable = magicEffect->mData.mFlags & ESM::MagicEffect::Unreflectable;
-        if (!isHarmful || isUnreflectable)
-            return false;
-
-        float reflect = target.getClass().getCreatureStats(target).getMagicEffects().get(ESM::MagicEffect::Reflect).getMagnitude();
-        if (Misc::Rng::roll0to99() >= reflect)
-            return false;
-
-        const ESM::Static* reflectStatic = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>().find ("VFX_Reflect");
-        MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(target);
-        if (animation && !reflectStatic->mModel.empty())
-            animation->addEffect("meshes\\" + reflectStatic->mModel, ESM::MagicEffect::Reflect, false, std::string());
-        reflectedEffects.mList.emplace_back(effect);
-        return true;
-    }
-}
-
 namespace MWMechanics
 {
     CastSpell::CastSpell(const MWWorld::Ptr &caster, const MWWorld::Ptr &target, const bool fromProjectile, const bool manualSpell)
@@ -82,7 +55,7 @@ namespace MWMechanics
     }
 
     void CastSpell::inflict(const MWWorld::Ptr &target, const MWWorld::Ptr &caster,
-                            const ESM::EffectList &effects, ESM::RangeType range, bool reflected, bool exploded)
+                            const ESM::EffectList &effects, ESM::RangeType range, bool exploded)
     {
         const bool targetIsActor = !target.isEmpty() && target.getClass().isActor();
         if (targetIsActor)
@@ -123,7 +96,6 @@ namespace MWMechanics
             }
         }
 
-        ESM::EffectList reflectedEffects;
         ActiveSpells::ActiveSpellParams params(*this, caster);
 
         bool castByPlayer = (!caster.isEmpty() && caster == getPlayer());
@@ -136,9 +108,6 @@ namespace MWMechanics
                                          // throughout the iteration of this spell's 
                                          // effects, we display a "can't re-cast" message
 
-        // Try absorbing the spell. Some handling must still happen for absorbed effects.
-        bool absorbed = absorbSpell(mId, caster, target);
-
         int currentEffectIndex = 0;
         for (std::vector<ESM::ENAMstruct>::const_iterator effectIt (effects.mList.begin());
              !target.isEmpty() && effectIt != effects.mList.end(); ++effectIt, ++currentEffectIndex)
@@ -167,19 +136,6 @@ namespace MWMechanics
                     && (caster.isEmpty() || !caster.getClass().isActor()))
                 continue;
 
-            // Notify the target actor they've been hit
-            bool isHarmful = magicEffect->mData.mFlags & ESM::MagicEffect::Harmful;
-            if (target.getClass().isActor() && target != caster && !caster.isEmpty() && isHarmful)
-                target.getClass().onHit(target, 0.0f, true, MWWorld::Ptr(), caster, osg::Vec3f(), true);
-
-            // Avoid proceeding further for absorbed spells.
-            if (absorbed)
-                continue;
-
-            // Reflect harmful effects
-            if (!reflected && reflectEffect(*effectIt, magicEffect, caster, target, reflectedEffects))
-                continue;
-
             ActiveSpells::ActiveEffect effect;
             effect.mEffectId = effectIt->mEffectID;
             effect.mArg = MWMechanics::EffectKey(*effectIt).mArg;
@@ -189,13 +145,8 @@ namespace MWMechanics
             effect.mTimeLeft = 0.f;
             effect.mEffectIndex = currentEffectIndex;
             effect.mFlags = ESM::ActiveEffect::Flag_None;
-
-            // Avoid applying harmful effects to the player in god mode
-            if (target == getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState() && isHarmful)
-            {
-                effect.mMinMagnitude = 0;
-                effect.mMaxMagnitude = 0;
-            }
+            if(mManualSpell)
+                effect.mFlags |= ESM::ActiveEffect::Flag_Ignore_Reflect;
 
             bool hasDuration = !(magicEffect->mData.mFlags & ESM::MagicEffect::NoDuration);
             effect.mDuration = hasDuration ? static_cast<float>(effectIt->mDuration) : 1.f;
@@ -209,14 +160,14 @@ namespace MWMechanics
             // add to list of active effects, to apply in next frame
             params.getEffects().emplace_back(effect);
 
-            bool effectAffectsHealth = isHarmful || effectIt->mEffectID == ESM::MagicEffect::RestoreHealth;
+            bool effectAffectsHealth = magicEffect->mData.mFlags & ESM::MagicEffect::Harmful || effectIt->mEffectID == ESM::MagicEffect::RestoreHealth;
             if (castByPlayer && target != caster && targetIsActor && effectAffectsHealth)
             {
                 // If player is attempting to cast a harmful spell on or is healing a living target, show the target's HP bar.
                 MWBase::Environment::get().getWindowManager()->setEnemy(target);
             }
 
-            if (targetIsActor || magicEffect->mData.mFlags & ESM::MagicEffect::NoDuration)
+            if (!targetIsActor && magicEffect->mData.mFlags & ESM::MagicEffect::NoDuration)
             {
                 playEffects(target, *magicEffect);
             }
@@ -227,9 +178,6 @@ namespace MWMechanics
 
         if (!target.isEmpty())
         {
-            if (!reflectedEffects.mList.empty())
-                inflict(caster, target, reflectedEffects, range, true, exploded);
-
             if (!params.getEffects().empty())
             {
                 if(targetIsActor)
@@ -237,6 +185,7 @@ namespace MWMechanics
                 else
                 {
                     // Apply effects instantly. We can ignore effect deletion since the entire params object gets deleted afterwards anyway
+                    // and we can ignore reflection since non-actors cannot reflect spells
                     for(auto& effect : params.getEffects())
                         applyMagicEffect(target, caster, params, effect, 0.f);
                 }
diff --git a/apps/openmw/mwmechanics/spellcasting.hpp b/apps/openmw/mwmechanics/spellcasting.hpp
index a21ea33e0b..4d9cc3a7de 100644
--- a/apps/openmw/mwmechanics/spellcasting.hpp
+++ b/apps/openmw/mwmechanics/spellcasting.hpp
@@ -62,7 +62,7 @@ namespace MWMechanics
         /// @note \a target can be any type of object, not just actors.
         /// @note \a caster can be any type of object, or even an empty object.
         void inflict (const MWWorld::Ptr& target, const MWWorld::Ptr& caster,
-                      const ESM::EffectList& effects, ESM::RangeType range, bool reflected=false, bool exploded=false);
+                      const ESM::EffectList& effects, ESM::RangeType range, bool exploded=false);
     };
 
     void playEffects(const MWWorld::Ptr& target, const ESM::MagicEffect& magicEffect, bool playNonLooping = true);
diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp
index d9e32b8b9f..7907642f5e 100644
--- a/apps/openmw/mwmechanics/spelleffects.cpp
+++ b/apps/openmw/mwmechanics/spelleffects.cpp
@@ -16,6 +16,7 @@
 #include "../mwmechanics/aifollow.hpp"
 #include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/spellresistance.hpp"
+#include "../mwmechanics/spellutil.hpp"
 #include "../mwmechanics/summoning.hpp"
 
 #include "../mwrender/animation.hpp"
@@ -261,6 +262,97 @@ namespace
         return false;
     }
 
+    void absorbSpell(const std::string& spellId, const MWWorld::Ptr& caster, const MWWorld::Ptr& target)
+    {
+        const auto& esmStore = MWBase::Environment::get().getWorld()->getStore();
+        const ESM::Static* absorbStatic = esmStore.get<ESM::Static>().find("VFX_Absorb");
+        MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(target);
+        if (animation && !absorbStatic->mModel.empty())
+            animation->addEffect( "meshes\\" + absorbStatic->mModel, ESM::MagicEffect::SpellAbsorption, false, std::string());
+        const ESM::Spell* spell = esmStore.get<ESM::Spell>().search(spellId);
+        int spellCost = 0;
+        if (spell)
+        {
+            spellCost = MWMechanics::calcSpellCost(*spell);
+        }
+        else
+        {
+            const ESM::Enchantment* enchantment = esmStore.get<ESM::Enchantment>().search(spellId);
+            if (enchantment)
+                spellCost = MWMechanics::getEffectiveEnchantmentCastCost(static_cast<float>(enchantment->mData.mCost), caster);
+        }
+
+        // Magicka is increased by the cost of the spell
+        auto& stats = target.getClass().getCreatureStats(target);
+        auto magicka = stats.getMagicka();
+        magicka.setCurrent(magicka.getCurrent() + spellCost);
+        stats.setMagicka(magicka);
+    }
+
+    MWMechanics::MagicApplicationResult applyProtections(const MWWorld::Ptr& target, const MWWorld::Ptr& caster,
+        const MWMechanics::ActiveSpells::ActiveSpellParams& spellParams, ESM::ActiveEffect& effect, const ESM::MagicEffect* magicEffect)
+    {
+        auto& stats = target.getClass().getCreatureStats(target);
+        auto& magnitudes = stats.getMagicEffects();
+        // Apply reflect and spell absorption
+        if(target != caster && spellParams.getType() != ESM::ActiveSpells::Type_Enchantment && spellParams.getType() != ESM::ActiveSpells::Type_Permanent)
+        {
+            bool canReflect = magicEffect->mData.mFlags & ESM::MagicEffect::Harmful && !(magicEffect->mData.mFlags & ESM::MagicEffect::Unreflectable) &&
+                !(effect.mFlags & ESM::ActiveEffect::Flag_Ignore_Reflect) && magnitudes.get(ESM::MagicEffect::Reflect).getMagnitude() > 0.f;
+            bool canAbsorb = !(effect.mFlags & ESM::ActiveEffect::Flag_Ignore_SpellAbsorption) && magnitudes.get(ESM::MagicEffect::SpellAbsorption).getMagnitude() > 0.f;
+            if(canReflect || canAbsorb)
+            {
+                for(const auto& activeParam : stats.getActiveSpells())
+                {
+                    for(const auto& activeEffect : activeParam.getEffects())
+                    {
+                        if(!(activeEffect.mFlags & ESM::ActiveEffect::Flag_Applied))
+                            continue;
+                        if(activeEffect.mEffectId == ESM::MagicEffect::Reflect)
+                        {
+                            if(canReflect && Misc::Rng::roll0to99() < activeEffect.mMagnitude)
+                            {
+                                return MWMechanics::MagicApplicationResult::REFLECTED;
+                            }
+                        }
+                        else if(activeEffect.mEffectId == ESM::MagicEffect::SpellAbsorption)
+                        {
+                            if(canAbsorb && Misc::Rng::roll0to99() < activeEffect.mMagnitude)
+                            {
+                                absorbSpell(spellParams.getId(), caster, target);
+                                return MWMechanics::MagicApplicationResult::REMOVED;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        // Notify the target actor they've been hit
+        bool isHarmful = magicEffect->mData.mFlags & ESM::MagicEffect::Harmful;
+        if (target.getClass().isActor() && target != caster && !caster.isEmpty() && isHarmful)
+            target.getClass().onHit(target, 0.0f, true, MWWorld::Ptr(), caster, osg::Vec3f(), true);
+        // Apply resistances
+        if(!(effect.mFlags & ESM::ActiveEffect::Flag_Ignore_Resistances))
+        {
+            const ESM::Spell* spell = nullptr;
+            if(spellParams.getType() == ESM::ActiveSpells::Type_Temporary)
+                spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(spellParams.getId());
+            float magnitudeMult = MWMechanics::getEffectMultiplier(effect.mEffectId, target, caster, spell, &magnitudes);
+            if (magnitudeMult == 0)
+            {
+                // Fully resisted, show message
+                if (target == MWMechanics::getPlayer())
+                    MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicPCResisted}");
+                else if (caster == MWMechanics::getPlayer())
+                    MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicTargetResisted}");
+                return MWMechanics::MagicApplicationResult::REMOVED;
+            }
+            effect.mMinMagnitude *= magnitudeMult;
+            effect.mMaxMagnitude *= magnitudeMult;
+        }
+        return MWMechanics::MagicApplicationResult::APPLIED;
+    }
+
     static const std::map<int, std::string> sBoundItemsMap{
         {ESM::MagicEffect::BoundBattleAxe, "sMagicBoundBattleAxeID"},
         {ESM::MagicEffect::BoundBoots, "sMagicBoundBootsID"},
@@ -682,7 +774,7 @@ void applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, co
     }
 }
 
-bool applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, ActiveSpells::ActiveSpellParams& spellParams, ESM::ActiveEffect& effect, float dt)
+MagicApplicationResult applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, ActiveSpells::ActiveSpellParams& spellParams, ESM::ActiveEffect& effect, float dt)
 {
     const auto world = MWBase::Environment::get().getWorld();
     bool invalid = false;
@@ -698,13 +790,13 @@ bool applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, Ac
         }
         if(target == getPlayer())
             MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicCorprusWorsens}");
-        return false;
+        return MagicApplicationResult::APPLIED;
     }
     else if(effect.mEffectId == ESM::MagicEffect::Levitate && !world->isLevitationEnabled())
     {
         if(target == getPlayer())
             MWBase::Environment::get().getWindowManager()->messageBox ("#{sLevitateDisabled}");
-        return true;
+        return MagicApplicationResult::REMOVED;
     }
     const auto* magicEffect = world->getStore().get<ESM::MagicEffect>().find(effect.mEffectId);
     if(effect.mFlags & ESM::ActiveEffect::Flag_Applied)
@@ -712,10 +804,10 @@ bool applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, Ac
         if(magicEffect->mData.mFlags & ESM::MagicEffect::Flags::AppliedOnce)
         {
             effect.mTimeLeft -= dt;
-            return false;
+            return MagicApplicationResult::APPLIED;
         }
         else if(!dt)
-            return false;
+            return MagicApplicationResult::APPLIED;
     }
     if(effect.mEffectId == ESM::MagicEffect::Lock)
     {
@@ -771,28 +863,19 @@ bool applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, Ac
     }
     else
     {
-        auto& magnitudes = target.getClass().getCreatureStats(target).getMagicEffects();
-        if(spellParams.getType() != ESM::ActiveSpells::Type_Ability && !(effect.mFlags & (ESM::ActiveEffect::Flag_Applied | ESM::ActiveEffect::Flag_Ignore_Resistances)))
+        auto& stats = target.getClass().getCreatureStats(target);
+        auto& magnitudes = stats.getMagicEffects();
+        if(spellParams.getType() != ESM::ActiveSpells::Type_Ability && !(effect.mFlags & ESM::ActiveEffect::Flag_Applied))
         {
-            const ESM::Spell* spell = nullptr;
-            if(spellParams.getType() == ESM::ActiveSpells::Type_Temporary)
-                spell = world->getStore().get<ESM::Spell>().search(spellParams.getId());
-            float magnitudeMult = getEffectMultiplier(effect.mEffectId, target, caster, spell, &magnitudes);
-            if (magnitudeMult == 0)
-            {
-                // Fully resisted, show message
-                if (target == getPlayer())
-                    MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicPCResisted}");
-                else if (caster == getPlayer())
-                    MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicTargetResisted}");
-                return true;
-            }
-            effect.mMinMagnitude *= magnitudeMult;
-            effect.mMaxMagnitude *= magnitudeMult;
+            MagicApplicationResult result = applyProtections(target, caster, spellParams, effect, magicEffect);
+            if(result != MagicApplicationResult::APPLIED)
+                return result;
         }
         float oldMagnitude = 0.f;
         if(effect.mFlags & ESM::ActiveEffect::Flag_Applied)
             oldMagnitude = effect.mMagnitude;
+        else if(spellParams.getType() == ESM::ActiveSpells::Type_Consumable || spellParams.getType() == ESM::ActiveSpells::Type_Temporary)
+            playEffects(target, *magicEffect);
         float magnitude = roll(effect);
         //Note that there's an early out for Flag_Applied AppliedOnce effects so we don't have to exclude them here
         effect.mMagnitude = magnitude;
@@ -810,7 +893,7 @@ bool applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, Ac
                 effect.mMagnitude = oldMagnitude;
                 effect.mFlags |= ESM::ActiveEffect::Flag_Applied | ESM::ActiveEffect::Flag_Remove;
                 effect.mTimeLeft -= dt;
-                return false;
+                return MagicApplicationResult::APPLIED;
             }
         }
         if(effect.mEffectId == ESM::MagicEffect::Corprus)
@@ -835,7 +918,7 @@ bool applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, Ac
         MWBase::Environment::get().getWindowManager()->activateHitOverlay(false);
     if(recalculateMagicka)
         target.getClass().getCreatureStats(target).recalculateMagicka();
-    return false;
+    return MagicApplicationResult::APPLIED;
 }
 
 void removeMagicEffect(const MWWorld::Ptr& target, ActiveSpells::ActiveSpellParams& spellParams, const ESM::ActiveEffect& effect)
diff --git a/apps/openmw/mwmechanics/spelleffects.hpp b/apps/openmw/mwmechanics/spelleffects.hpp
index a9e7b066f3..2861d0d64a 100644
--- a/apps/openmw/mwmechanics/spelleffects.hpp
+++ b/apps/openmw/mwmechanics/spelleffects.hpp
@@ -10,8 +10,13 @@
 
 namespace MWMechanics
 {
+    enum class MagicApplicationResult
+    {
+        APPLIED, REMOVED, REFLECTED
+    };
+
     // Applies a tick of a single effect. Returns true if the effect should be removed immediately
-    bool applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, ActiveSpells::ActiveSpellParams& spellParams, ESM::ActiveEffect& effect, float dt);
+    MagicApplicationResult applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, ActiveSpells::ActiveSpellParams& spellParams, ESM::ActiveEffect& effect, float dt);
 
     // Undoes permanent effects created by ESM::MagicEffect::AppliedOnce
     void onMagicEffectRemoved(const MWWorld::Ptr& target, ActiveSpells::ActiveSpellParams& spell, const ESM::ActiveEffect& effect);
diff --git a/apps/openmw/mwworld/esmloader.cpp b/apps/openmw/mwworld/esmloader.cpp
index a01128fe36..06debf4a97 100644
--- a/apps/openmw/mwworld/esmloader.cpp
+++ b/apps/openmw/mwworld/esmloader.cpp
@@ -104,8 +104,8 @@ void EsmLoader::load(const boost::filesystem::path& filepath, int& index)
                         effect.mMagnitude = magnitude;
                         effect.mMinMagnitude = magnitude;
                         effect.mMaxMagnitude = magnitude;
-                        // Prevent recalculation of resistances
-                        effect.mFlags = ESM::ActiveEffect::Flag_Ignore_Resistances;
+                        // Prevent recalculation of resistances and don't reflect or absorb the effect
+                        effect.mFlags = ESM::ActiveEffect::Flag_Ignore_Resistances | ESM::ActiveEffect::Flag_Ignore_Reflect | ESM::ActiveEffect::Flag_Ignore_SpellAbsorption;
                     }
                     else
                     {
@@ -172,8 +172,8 @@ void EsmLoader::load(const boost::filesystem::path& filepath, int& index)
                 effect.mDuration = -1;
                 effect.mTimeLeft = -1;
                 effect.mEffectIndex = static_cast<int>(effectIndex);
-                // Prevent recalculation of resistances
-                effect.mFlags = ESM::ActiveEffect::Flag_Ignore_Resistances;
+                // Prevent recalculation of resistances and don't reflect or absorb the effect
+                effect.mFlags = ESM::ActiveEffect::Flag_Ignore_Resistances | ESM::ActiveEffect::Flag_Ignore_Reflect | ESM::ActiveEffect::Flag_Ignore_SpellAbsorption;
                 params.mEffects.emplace_back(effect);
             }
             auto [begin, end] = equippedItems.equal_range(id);
diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index 9ee137fab6..1f07a7ecee 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -546,7 +546,7 @@ namespace MWWorld
             cast.mId = magicBoltState.mSpellId;
             cast.mSourceName = magicBoltState.mSourceName;
             cast.mSlot = magicBoltState.mSlot;
-            cast.inflict(target, caster, magicBoltState.mEffects, ESM::RT_Target, false, true);
+            cast.inflict(target, caster, magicBoltState.mEffects, ESM::RT_Target, true);
 
             MWBase::Environment::get().getWorld()->explodeSpell(pos, magicBoltState.mEffects, caster, target, ESM::RT_Target, magicBoltState.mSpellId, magicBoltState.mSourceName, false, magicBoltState.mSlot);
             magicBoltState.mToDelete = true;
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index ccd78170bb..a1501f1537 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -3791,7 +3791,7 @@ namespace MWWorld
             cast.mSlot = slot;
             ESM::EffectList effectsToApply;
             effectsToApply.mList = applyPair.second;
-            cast.inflict(applyPair.first, caster, effectsToApply, rangeType, false, true);
+            cast.inflict(applyPair.first, caster, effectsToApply, rangeType, true);
         }
     }
 
diff --git a/components/esm/activespells.hpp b/components/esm/activespells.hpp
index 8b5f1f1946..a79366f9c2 100644
--- a/components/esm/activespells.hpp
+++ b/components/esm/activespells.hpp
@@ -22,7 +22,9 @@ namespace ESM
             Flag_None = 0,
             Flag_Applied = 1 << 0,
             Flag_Remove = 1 << 1,
-            Flag_Ignore_Resistances = 1 << 2
+            Flag_Ignore_Resistances = 1 << 2,
+            Flag_Ignore_Reflect = 1 << 3,
+            Flag_Ignore_SpellAbsorption = 1 << 4
         };
 
         int mEffectId;

From 6aab2468790c456fe766b908f4fbdca0da617aec Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 26 Sep 2021 15:14:53 +0200
Subject: [PATCH 1544/2859] Add ESM records that are needed to store Lua
 scripts configuration; Use ptr.getType() (i.e. esm record names) instead of
 typeid(ptr.getClass()) in apps/openmw/mwlua.

---
 apps/openmw/mwlua/object.cpp         | 83 ++++++++++++++++------------
 apps/openmw/mwlua/object.hpp         | 12 +++-
 apps/openmw/mwlua/objectbindings.cpp |  9 ++-
 components/esm/luascripts.cpp        | 33 +++++++++--
 components/esm/luascripts.hpp        | 45 +++++++++++++--
 5 files changed, 129 insertions(+), 53 deletions(-)

diff --git a/apps/openmw/mwlua/object.cpp b/apps/openmw/mwlua/object.cpp
index 266e628dd6..69206e8c37 100644
--- a/apps/openmw/mwlua/object.cpp
+++ b/apps/openmw/mwlua/object.cpp
@@ -1,19 +1,6 @@
 #include "object.hpp"
 
-#include "../mwclass/activator.hpp"
-#include "../mwclass/armor.hpp"
-#include "../mwclass/book.hpp"
-#include "../mwclass/clothing.hpp"
-#include "../mwclass/container.hpp"
-#include "../mwclass/creature.hpp"
-#include "../mwclass/door.hpp"
-#include "../mwclass/ingredient.hpp"
-#include "../mwclass/light.hpp"
-#include "../mwclass/misc.hpp"
-#include "../mwclass/npc.hpp"
-#include "../mwclass/potion.hpp"
-#include "../mwclass/static.hpp"
-#include "../mwclass/weapon.hpp"
+#include <unordered_map>
 
 namespace MWLua
 {
@@ -23,28 +10,34 @@ namespace MWLua
         return std::to_string(id.mIndex) + "_" + std::to_string(id.mContentFile);
     }
 
-    const static std::map<std::type_index, std::string_view> classNames = {
-        {typeid(MWClass::Activator), "Activator"},
-        {typeid(MWClass::Armor), "Armor"},
-        {typeid(MWClass::Book), "Book"},
-        {typeid(MWClass::Clothing), "Clothing"},
-        {typeid(MWClass::Container), "Container"},
-        {typeid(MWClass::Creature), "Creature"},
-        {typeid(MWClass::Door), "Door"},
-        {typeid(MWClass::Ingredient), "Ingredient"},
-        {typeid(MWClass::Light), "Light"},
-        {typeid(MWClass::Miscellaneous), "Miscellaneous"},
-        {typeid(MWClass::Npc), "NPC"},
-        {typeid(MWClass::Potion), "Potion"},
-        {typeid(MWClass::Static), "Static"},
-        {typeid(MWClass::Weapon), "Weapon"},
+    struct LuaObjectTypeInfo
+    {
+        std::string_view mName;
+        ESM::LuaScriptCfg::Flags mFlag = 0;
+    };
+
+    const static std::unordered_map<ESM::RecNameInts, LuaObjectTypeInfo> luaObjectTypeInfo = {
+        {ESM::REC_ACTI, {"Activator", ESM::LuaScriptCfg::sActivator}},
+        {ESM::REC_ARMO, {"Armor", ESM::LuaScriptCfg::sArmor}},
+        {ESM::REC_BOOK, {"Book", ESM::LuaScriptCfg::sBook}},
+        {ESM::REC_CLOT, {"Clothing", ESM::LuaScriptCfg::sClothing}},
+        {ESM::REC_CONT, {"Container", ESM::LuaScriptCfg::sContainer}},
+        {ESM::REC_CREA, {"Creature", ESM::LuaScriptCfg::sCreature}},
+        {ESM::REC_DOOR, {"Door", ESM::LuaScriptCfg::sDoor}},
+        {ESM::REC_INGR, {"Ingredient", ESM::LuaScriptCfg::sIngredient}},
+        {ESM::REC_LIGH, {"Light", ESM::LuaScriptCfg::sLight}},
+        {ESM::REC_MISC, {"Miscellaneous", ESM::LuaScriptCfg::sMiscItem}},
+        {ESM::REC_NPC_, {"NPC", ESM::LuaScriptCfg::sNPC}},
+        {ESM::REC_ALCH, {"Potion", ESM::LuaScriptCfg::sPotion}},
+        {ESM::REC_STAT, {"Static"}},
+        {ESM::REC_WEAP, {"Weapon", ESM::LuaScriptCfg::sWeapon}},
     };
 
-    std::string_view getMWClassName(const std::type_index& cls_type, std::string_view fallback)
+    std::string_view getLuaObjectTypeName(ESM::RecNameInts type, std::string_view fallback)
     {
-        auto it = classNames.find(cls_type);
-        if (it != classNames.end())
-            return it->second;
+        auto it = luaObjectTypeInfo.find(type);
+        if (it != luaObjectTypeInfo.end())
+            return it->second.mName;
         else
             return fallback;
     }
@@ -55,13 +48,31 @@ namespace MWLua
         return id == "prisonmarker" || id == "divinemarker" || id == "templemarker" || id == "northmarker";
     }
 
-    std::string_view getMWClassName(const MWWorld::Ptr& ptr)
+    std::string_view getLuaObjectTypeName(const MWWorld::Ptr& ptr)
     {
+        // Behaviour of this function is a part of OpenMW Lua API. We can not just return
+        // `ptr.getTypeDescription()` because its implementation is distributed over many files
+        // and can be accidentally changed. We use `ptr.getTypeDescription()` only as a fallback
+        // for types that are not present in `luaObjectTypeInfo` (for such types result stability
+        // is not necessary because they are not listed in OpenMW Lua documentation).
         if (ptr.getCellRef().getRefIdRef() == "player")
             return "Player";
         if (isMarker(ptr))
             return "Marker";
-        return getMWClassName(typeid(ptr.getClass()));
+        return getLuaObjectTypeName(static_cast<ESM::RecNameInts>(ptr.getType()), /*fallback=*/ptr.getTypeDescription());
+    }
+
+    ESM::LuaScriptCfg::Flags getLuaScriptFlag(const MWWorld::Ptr& ptr)
+    {
+        if (ptr.getCellRef().getRefIdRef() == "player")
+            return ESM::LuaScriptCfg::sPlayer;
+        if (isMarker(ptr))
+            return 0;
+        auto it = luaObjectTypeInfo.find(static_cast<ESM::RecNameInts>(ptr.getType()));
+        if (it != luaObjectTypeInfo.end())
+            return it->second.mFlag;
+        else
+            return 0;
     }
 
     std::string ptrToString(const MWWorld::Ptr& ptr)
@@ -69,7 +80,7 @@ namespace MWLua
         std::string res = "object";
         res.append(idToString(getId(ptr)));
         res.append(" (");
-        res.append(getMWClassName(ptr));
+        res.append(getLuaObjectTypeName(ptr));
         res.append(", ");
         res.append(ptr.getCellRef().getRefIdRef());
         res.append(")");
diff --git a/apps/openmw/mwlua/object.hpp b/apps/openmw/mwlua/object.hpp
index c0b6bf1919..5b1b5df74e 100644
--- a/apps/openmw/mwlua/object.hpp
+++ b/apps/openmw/mwlua/object.hpp
@@ -4,6 +4,8 @@
 #include <typeindex>
 
 #include <components/esm/cellref.hpp>
+#include <components/esm/defs.hpp>
+#include <components/esm/luascripts.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
@@ -19,8 +21,12 @@ namespace MWLua
     std::string idToString(const ObjectId& id);
     std::string ptrToString(const MWWorld::Ptr& ptr);
     bool isMarker(const MWWorld::Ptr& ptr);
-    std::string_view getMWClassName(const std::type_index& cls_type, std::string_view fallback = "Unknown");
-    std::string_view getMWClassName(const MWWorld::Ptr& ptr);
+    std::string_view getLuaObjectTypeName(ESM::RecNameInts recordType, std::string_view fallback = "Unknown");
+    std::string_view getLuaObjectTypeName(const MWWorld::Ptr& ptr);
+
+    // Each script has a set of flags that controls to which objects the script should be
+    // automatically attached. This function maps each object types to one of the flags. 
+    ESM::LuaScriptCfg::Flags getLuaScriptFlag(const MWWorld::Ptr& ptr);
 
     // Holds a mapping ObjectId -> MWWord::Ptr.
     class ObjectRegistry
@@ -64,7 +70,7 @@ namespace MWLua
         ObjectId id() const { return mId; }
 
         std::string toString() const;
-        std::string_view type() const { return getMWClassName(ptr()); }
+        std::string_view type() const { return getLuaObjectTypeName(ptr()); }
 
         // Updates and returns the underlying Ptr. Throws an exception if object is not available.
         const MWWorld::Ptr& ptr() const;
diff --git a/apps/openmw/mwlua/objectbindings.cpp b/apps/openmw/mwlua/objectbindings.cpp
index b7607c8b2c..07b7921a09 100644
--- a/apps/openmw/mwlua/objectbindings.cpp
+++ b/apps/openmw/mwlua/objectbindings.cpp
@@ -42,13 +42,12 @@ namespace MWLua
     template <typename ObjT>
     using Cell = std::conditional_t<std::is_same_v<ObjT, LObject>, LCell, GCell>;
 
-    template <class Class>
-    static const MWWorld::Ptr& requireClass(const MWWorld::Ptr& ptr)
+    static const MWWorld::Ptr& requireRecord(ESM::RecNameInts recordType, const MWWorld::Ptr& ptr)
     {
-        if (typeid(Class) != typeid(ptr.getClass()))
+        if (ptr.getType() != recordType)
         {
             std::string msg = "Requires type '";
-            msg.append(getMWClassName(typeid(Class)));
+            msg.append(getLuaObjectTypeName(recordType));
             msg.append("', but applied to ");
             msg.append(ptrToString(ptr));
             throw std::runtime_error(msg);
@@ -189,7 +188,7 @@ namespace MWLua
     template <class ObjectT>
     static void addDoorBindings(sol::usertype<ObjectT>& objectT, const Context& context)
     {
-        auto ptr = [](const ObjectT& o) -> const MWWorld::Ptr& { return requireClass<MWClass::Door>(o.ptr()); };
+        auto ptr = [](const ObjectT& o) -> const MWWorld::Ptr& { return requireRecord(ESM::REC_DOOR, o.ptr()); };
 
         objectT["isTeleport"] = sol::readonly_property([ptr](const ObjectT& o)
         {
diff --git a/components/esm/luascripts.cpp b/components/esm/luascripts.cpp
index 7ff841312a..c831cbbbfc 100644
--- a/components/esm/luascripts.cpp
+++ b/components/esm/luascripts.cpp
@@ -5,13 +5,15 @@
 
 // List of all records, that are related to Lua.
 //
-// Record:
-// LUAM - MWLua::LuaManager
+// Records:
+// LUAL - LuaScriptsCfg - list of all scripts (in content files)
+// LUAM - MWLua::LuaManager (in saves)
 //
 // Subrecords:
+// LUAF - LuaScriptCfg::mFlags
 // LUAW - Start of MWLua::WorldView data
 // LUAE - Start of MWLua::LocalEvent or MWLua::GlobalEvent (eventName)
-// LUAS - Start LuaUtil::ScriptsContainer data (scriptName)
+// LUAS - VFS path to a Lua script
 // LUAD - Serialized Lua variable
 // LUAT - MWLua::ScriptsContainer::Timer
 // LUAC - Name of a timer callback (string)
@@ -37,6 +39,28 @@ std::string ESM::loadLuaBinaryData(ESMReader& esm)
     return data;
 }
 
+void ESM::LuaScriptsCfg::load(ESMReader& esm)
+{
+    while (esm.isNextSub("LUAS"))
+    {
+        std::string name = esm.getHString();
+        uint64_t flags;
+        esm.getHNT(flags, "LUAF");
+        std::string data = loadLuaBinaryData(esm);
+        mScripts.push_back({std::move(name), std::move(data), flags});
+    }
+}
+
+void ESM::LuaScriptsCfg::save(ESMWriter& esm) const
+{
+    for (const LuaScriptCfg& script : mScripts)
+    {
+        esm.writeHNString("LUAS", script.mScriptPath);
+        esm.writeHNT("LUAF", script.mFlags);
+        saveLuaBinaryData(esm, script.mInitializationData);
+    }
+}
+
 void ESM::LuaScripts::load(ESMReader& esm)
 {
     while (esm.isNextSub("LUAS"))
@@ -63,8 +87,7 @@ void ESM::LuaScripts::save(ESMWriter& esm) const
     for (const LuaScript& script : mScripts)
     {
         esm.writeHNString("LUAS", script.mScriptPath);
-        if (!script.mData.empty())
-            saveLuaBinaryData(esm, script.mData);
+        saveLuaBinaryData(esm, script.mData);
         for (const LuaTimer& timer : script.mTimers)
         {
             esm.startSubRecord("LUAT");
diff --git a/components/esm/luascripts.hpp b/components/esm/luascripts.hpp
index f268f41536..e6f7113c16 100644
--- a/components/esm/luascripts.hpp
+++ b/components/esm/luascripts.hpp
@@ -9,7 +9,44 @@ namespace ESM
     class ESMReader;
     class ESMWriter;
 
-    // Storage structure for LuaUtil::ScriptsContainer. This is not a top-level record.
+    // LuaScriptCfg, LuaScriptsCfg are used in content files.
+
+    struct LuaScriptCfg
+    {
+        using Flags = uint64_t;
+        static constexpr Flags sGlobal = 1ull << 0;
+        static constexpr Flags sCustom = 1ull << 1;  // local; can be attached/detached by a global script
+        static constexpr Flags sPlayer = 1ull << 2;  // auto attach to players
+        // auto attach for other classes:
+        static constexpr Flags sActivator = 1ull << 3;
+        static constexpr Flags sArmor = 1ull << 4;
+        static constexpr Flags sBook = 1ull << 5;
+        static constexpr Flags sClothing = 1ull << 6;
+        static constexpr Flags sContainer = 1ull << 7;
+        static constexpr Flags sCreature = 1ull << 8;
+        static constexpr Flags sDoor = 1ull << 9;
+        static constexpr Flags sIngredient = 1ull << 10;
+        static constexpr Flags sLight = 1ull << 11;
+        static constexpr Flags sMiscItem = 1ull << 12;
+        static constexpr Flags sNPC = 1ull << 13;
+        static constexpr Flags sPotion = 1ull << 14;
+        static constexpr Flags sWeapon = 1ull << 15;
+
+        std::string mScriptPath;
+        std::string mInitializationData;  // Serialized Lua table. It is a binary data. Can contain '\0'.
+        Flags mFlags;  // bitwise OR of Flags.
+    };
+
+    struct LuaScriptsCfg
+    {
+        std::vector<LuaScriptCfg> mScripts;
+
+        void load(ESMReader &esm);
+        void save(ESMWriter &esm) const;
+    };
+
+    // LuaTimer, LuaScript, LuaScripts are used in saved game files.
+    // Storage structure for LuaUtil::ScriptsContainer. These are not top-level records.
     // Used either for global scripts or for local scripts on a specific object.
 
     struct LuaTimer
@@ -37,11 +74,11 @@ namespace ESM
     {
         std::vector<LuaScript> mScripts;
 
-        void load (ESMReader &esm);
-        void save (ESMWriter &esm) const;
+        void load(ESMReader &esm);
+        void save(ESMWriter &esm) const;
     };
 
-    // Saves binary string `data` (can contain '\0') as record LUAD.
+    // Saves binary string `data` (can contain '\0') as LUAD record.
     void saveLuaBinaryData(ESM::ESMWriter& esm, const std::string& data);
 
     // Loads LUAD as binary string. If next subrecord is not LUAD, then returns an empty string.

From 33d71be81f8254c24de685eee3c0ba7cf93ca005 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Wed, 6 Oct 2021 20:59:48 +0200
Subject: [PATCH 1545/2859] Add LuaUtil::ScriptsConfiguration

---
 apps/openmw_test_suite/CMakeLists.txt         |   2 +-
 .../lua/test_configuration.cpp                |  58 ++++++
 apps/openmw_test_suite/lua/testing_util.hpp   |   2 +-
 components/lua/configuration.cpp              | 165 ++++++++++++++++++
 components/lua/configuration.hpp              |  37 ++++
 components/misc/stringops.hpp                 |  21 ++-
 6 files changed, 276 insertions(+), 9 deletions(-)
 create mode 100644 apps/openmw_test_suite/lua/test_configuration.cpp
 create mode 100644 components/lua/configuration.cpp
 create mode 100644 components/lua/configuration.hpp

diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index a2a35e3aab..2b96d4c633 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -20,7 +20,7 @@ if (GTEST_FOUND AND GMOCK_FOUND)
         lua/test_utilpackage.cpp
         lua/test_serialization.cpp
         lua/test_querypackage.cpp
-        lua/test_omwscriptsparser.cpp
+        lua/test_configuration.cpp
 
         misc/test_stringops.cpp
         misc/test_endianness.cpp
diff --git a/apps/openmw_test_suite/lua/test_configuration.cpp b/apps/openmw_test_suite/lua/test_configuration.cpp
new file mode 100644
index 0000000000..054ea8cbda
--- /dev/null
+++ b/apps/openmw_test_suite/lua/test_configuration.cpp
@@ -0,0 +1,58 @@
+#include "gmock/gmock.h"
+#include <gtest/gtest.h>
+
+#include <components/lua/configuration.hpp>
+
+#include "testing_util.hpp"
+
+namespace
+{
+
+    TEST(LuaConfigurationTest, ValidConfiguration)
+    {
+        ESM::LuaScriptsCfg cfg;
+        LuaUtil::parseOMWScripts(cfg, R"X(
+            # Lines starting with '#' are comments
+            GLOBAL:  my_mod/#some_global_script.lua
+
+            # Script that will be automatically attached to the player
+            PLAYER :my_mod/player.lua
+            CUSTOM : my_mod/some_other_script.lua
+            NPC , CREATURE PLAYER : my_mod/some_other_script.lua)X");
+        LuaUtil::parseOMWScripts(cfg, ":my_mod/player.LUA  \r\nCONTAINER,CUSTOM: my_mod/container.lua\r\n");
+
+        ASSERT_EQ(cfg.mScripts.size(), 6);
+        EXPECT_EQ(LuaUtil::scriptCfgToString(cfg.mScripts[0]), "GLOBAL : my_mod/#some_global_script.lua");
+        EXPECT_EQ(LuaUtil::scriptCfgToString(cfg.mScripts[1]), "PLAYER : my_mod/player.lua");
+        EXPECT_EQ(LuaUtil::scriptCfgToString(cfg.mScripts[2]), "CUSTOM : my_mod/some_other_script.lua");
+        EXPECT_EQ(LuaUtil::scriptCfgToString(cfg.mScripts[3]), "CREATURE NPC PLAYER : my_mod/some_other_script.lua");
+        EXPECT_EQ(LuaUtil::scriptCfgToString(cfg.mScripts[4]), ": my_mod/player.LUA");
+        EXPECT_EQ(LuaUtil::scriptCfgToString(cfg.mScripts[5]), "CONTAINER CUSTOM : my_mod/container.lua");
+
+        LuaUtil::ScriptsConfiguration conf;
+        conf.init(std::move(cfg));
+        ASSERT_EQ(conf.size(), 3);
+        EXPECT_EQ(LuaUtil::scriptCfgToString(conf[0]), "GLOBAL : my_mod/#some_global_script.lua");
+        // cfg.mScripts[1] is overridden by cfg.mScripts[4]
+        // cfg.mScripts[2] is overridden by cfg.mScripts[3]
+        EXPECT_EQ(LuaUtil::scriptCfgToString(conf[1]), "CREATURE NPC PLAYER : my_mod/some_other_script.lua");
+        // cfg.mScripts[4] is removed because there are no flags
+        EXPECT_EQ(LuaUtil::scriptCfgToString(conf[2]), "CONTAINER CUSTOM : my_mod/container.lua");
+
+        cfg = ESM::LuaScriptsCfg();
+        conf.init(std::move(cfg));
+        ASSERT_EQ(conf.size(), 0);
+    }
+
+    TEST(LuaConfigurationTest, Errors)
+    {
+        ESM::LuaScriptsCfg cfg;
+        EXPECT_ERROR(LuaUtil::parseOMWScripts(cfg, "GLOBAL: something"),
+                     "Lua script should have suffix '.lua', got: GLOBAL: something");
+        EXPECT_ERROR(LuaUtil::parseOMWScripts(cfg, "something.lua"),
+                     "No flags found in: something.lua");
+        EXPECT_ERROR(LuaUtil::parseOMWScripts(cfg, "GLOBAL, PLAYER: something.lua"),
+                     "Global script can not have local flags");
+    }
+
+}
diff --git a/apps/openmw_test_suite/lua/testing_util.hpp b/apps/openmw_test_suite/lua/testing_util.hpp
index 28c4d59930..2f6810350f 100644
--- a/apps/openmw_test_suite/lua/testing_util.hpp
+++ b/apps/openmw_test_suite/lua/testing_util.hpp
@@ -52,7 +52,7 @@ namespace
     }
 
     #define EXPECT_ERROR(X, ERR_SUBSTR) try { X; FAIL() << "Expected error"; } \
-        catch (std::exception& e) { EXPECT_THAT(e.what(), HasSubstr(ERR_SUBSTR)); }
+        catch (std::exception& e) { EXPECT_THAT(e.what(), ::testing::HasSubstr(ERR_SUBSTR)); }
 
 }
 
diff --git a/components/lua/configuration.cpp b/components/lua/configuration.cpp
new file mode 100644
index 0000000000..4598ed2508
--- /dev/null
+++ b/components/lua/configuration.cpp
@@ -0,0 +1,165 @@
+#include "configuration.hpp"
+
+#include <algorithm>
+#include <bitset>
+#include <cassert>
+#include <sstream>
+
+#include <components/misc/stringops.hpp>
+
+namespace LuaUtil
+{
+
+    namespace
+    {
+        const std::map<std::string, ESM::LuaScriptCfg::Flags, std::less<>> flagsByName{
+            {"GLOBAL", ESM::LuaScriptCfg::sGlobal},
+            {"CUSTOM", ESM::LuaScriptCfg::sCustom},
+            {"PLAYER", ESM::LuaScriptCfg::sPlayer},
+            {"ACTIVATOR", ESM::LuaScriptCfg::sActivator},
+            {"ARMOR", ESM::LuaScriptCfg::sArmor},
+            {"BOOK", ESM::LuaScriptCfg::sBook},
+            {"CLOTHING", ESM::LuaScriptCfg::sClothing},
+            {"CONTAINER", ESM::LuaScriptCfg::sContainer},
+            {"CREATURE", ESM::LuaScriptCfg::sCreature},
+            {"DOOR", ESM::LuaScriptCfg::sDoor},
+            {"INGREDIENT", ESM::LuaScriptCfg::sIngredient},
+            {"LIGHT", ESM::LuaScriptCfg::sLight},
+            {"MISC_ITEM", ESM::LuaScriptCfg::sMiscItem},
+            {"NPC", ESM::LuaScriptCfg::sNPC},
+            {"POTION", ESM::LuaScriptCfg::sPotion},
+            {"WEAPON", ESM::LuaScriptCfg::sWeapon},
+        };
+    }
+
+    const std::vector<int> ScriptsConfiguration::sEmpty;
+
+    void ScriptsConfiguration::init(ESM::LuaScriptsCfg cfg)
+    {
+        mScripts.clear();
+        mScriptsByFlag.clear();
+        mPathToIndex.clear();
+
+        // Find duplicates; only the last occurrence will be used.
+        // Search for duplicates is case insensitive.
+        std::vector<bool> skip(cfg.mScripts.size(), false);
+        for (int i = cfg.mScripts.size() - 1; i >= 0; --i)
+        {
+            auto [_, inserted] = mPathToIndex.insert_or_assign(
+                Misc::StringUtils::lowerCase(cfg.mScripts[i].mScriptPath), -1);
+            if (!inserted || cfg.mScripts[i].mFlags == 0)
+                skip[i] = true;
+        }
+        mPathToIndex.clear();
+        int index = 0;
+        for (size_t i = 0; i < cfg.mScripts.size(); ++i)
+        {
+            if (skip[i])
+                continue;
+            ESM::LuaScriptCfg& s = cfg.mScripts[i];
+            mPathToIndex[s.mScriptPath] = index;  // Stored paths are case sensitive.
+            ESM::LuaScriptCfg::Flags flags = s.mFlags;
+            ESM::LuaScriptCfg::Flags flag = 1;
+            while (flags != 0)
+            {
+                if (flags & flag)
+                    mScriptsByFlag[flag].push_back(index);
+                flags &= ~flag;
+                flag = flag << 1;
+            }
+            mScripts.push_back(std::move(s));
+            index++;
+        }
+    }
+
+    std::optional<int> ScriptsConfiguration::findId(std::string_view path) const
+    {
+        auto it = mPathToIndex.find(path);
+        if (it != mPathToIndex.end())
+            return it->second;
+        else
+            return std::nullopt;
+    }
+
+    const std::vector<int>& ScriptsConfiguration::getListByFlag(ESM::LuaScriptCfg::Flags type) const
+    {
+        assert(std::bitset<64>(type).count() <= 1);
+        auto it = mScriptsByFlag.find(type);
+        if (it != mScriptsByFlag.end())
+            return it->second;
+        else
+            return sEmpty;
+    }
+
+    void parseOMWScripts(ESM::LuaScriptsCfg& cfg, std::string_view data)
+    {
+        while (!data.empty())
+        {
+            // Get next line
+            std::string_view line = data.substr(0, data.find('\n'));
+            data = data.substr(std::min(line.size() + 1, data.size()));
+            if (!line.empty() && line.back() == '\r')
+                line = line.substr(0, line.size() - 1);
+
+            while (!line.empty() && std::isspace(line[0]))
+                line = line.substr(1);
+            if (line.empty() || line[0] == '#')  // Skip empty lines and comments
+                continue;
+            while (!line.empty() && std::isspace(line.back()))
+                line = line.substr(0, line.size() - 1);
+
+            if (!Misc::StringUtils::ciEndsWith(line, ".lua"))
+                throw std::runtime_error(Misc::StringUtils::format(
+                    "Lua script should have suffix '.lua', got: %s", std::string(line.substr(0, 300))));
+
+            // Split flags and script path
+            size_t semicolonPos = line.find(':');
+            if (semicolonPos == std::string::npos)
+                throw std::runtime_error(Misc::StringUtils::format("No flags found in: %s", std::string(line)));
+            std::string_view flagsStr = line.substr(0, semicolonPos);
+            std::string_view scriptPath = line.substr(semicolonPos + 1);
+            while (std::isspace(scriptPath[0]))
+                scriptPath = scriptPath.substr(1);
+
+            // Parse flags
+            ESM::LuaScriptCfg::Flags flags = 0;
+            size_t flagsPos = 0;
+            while (true)
+            {
+                while (flagsPos < flagsStr.size() && (std::isspace(flagsStr[flagsPos]) || flagsStr[flagsPos] == ','))
+                    flagsPos++;
+                size_t startPos = flagsPos;
+                while (flagsPos < flagsStr.size() && !std::isspace(flagsStr[flagsPos]) && flagsStr[flagsPos] != ',')
+                    flagsPos++;
+                if (startPos == flagsPos)
+                    break;
+                std::string_view flagName = flagsStr.substr(startPos, flagsPos - startPos);
+                auto it = flagsByName.find(flagName);
+                if (it != flagsByName.end())
+                    flags |= it->second;
+                else
+                    throw std::runtime_error(Misc::StringUtils::format("Unknown flag '%s' in: %s",
+                                                                       std::string(flagName), std::string(line)));
+            }
+            if ((flags & ESM::LuaScriptCfg::sGlobal) && flags != ESM::LuaScriptCfg::sGlobal)
+                throw std::runtime_error("Global script can not have local flags");
+
+            cfg.mScripts.push_back(ESM::LuaScriptCfg{std::string(scriptPath), "", flags});
+        }
+    }
+
+    std::string scriptCfgToString(const ESM::LuaScriptCfg& script)
+    {
+        std::stringstream ss;
+        for (const auto& [flagName, flag] : flagsByName)
+        {
+            if (script.mFlags & flag)
+                ss << flagName << " ";
+        }
+        ss << ": " << script.mScriptPath;
+        if (!script.mInitializationData.empty())
+            ss << " (with data, " << script.mInitializationData.size() << " bytes)";
+        return ss.str();
+    }
+
+}
diff --git a/components/lua/configuration.hpp b/components/lua/configuration.hpp
new file mode 100644
index 0000000000..32eddf399c
--- /dev/null
+++ b/components/lua/configuration.hpp
@@ -0,0 +1,37 @@
+#ifndef COMPONENTS_LUA_CONFIGURATION_H
+#define COMPONENTS_LUA_CONFIGURATION_H
+
+#include <map>
+#include <optional>
+
+#include <components/esm/luascripts.hpp>
+
+namespace LuaUtil
+{
+
+    class ScriptsConfiguration
+    {
+    public:
+        void init(ESM::LuaScriptsCfg);
+
+        size_t size() const { return mScripts.size(); }
+        const ESM::LuaScriptCfg& operator[](int id) const { return mScripts[id]; }
+
+        std::optional<int> findId(std::string_view path) const;
+        const std::vector<int>& getListByFlag(ESM::LuaScriptCfg::Flags type) const;
+
+    private:
+        std::vector<ESM::LuaScriptCfg> mScripts;
+        std::map<std::string, int, std::less<>> mPathToIndex;
+        std::map<ESM::LuaScriptCfg::Flags, std::vector<int>> mScriptsByFlag;
+        static const std::vector<int> sEmpty;
+    };
+
+    // Parse ESM::LuaScriptsCfg from text and add to `cfg`.
+    void parseOMWScripts(ESM::LuaScriptsCfg& cfg, std::string_view data);
+
+    std::string scriptCfgToString(const ESM::LuaScriptCfg& script);
+
+}
+
+#endif // COMPONENTS_LUA_CONFIGURATION_H
diff --git a/components/misc/stringops.hpp b/components/misc/stringops.hpp
index 6c9c1eefa2..dcffa7fdf3 100644
--- a/components/misc/stringops.hpp
+++ b/components/misc/stringops.hpp
@@ -25,6 +25,7 @@ class StringUtils
     template <typename T>
     static T argument(T value) noexcept
     {
+        static_assert(!std::is_same_v<T, std::string_view>, "std::string_view is not supported");
         return value;
     }
 
@@ -324,14 +325,20 @@ public:
         }
     }
 
-     static inline void replaceLast(std::string& str, const std::string& substr, const std::string& with)
-     {
-         size_t pos = str.rfind(substr);
-         if (pos == std::string::npos)
-             return;
+    static inline void replaceLast(std::string& str, const std::string& substr, const std::string& with)
+    {
+        size_t pos = str.rfind(substr);
+        if (pos == std::string::npos)
+            return;
+
+        str.replace(pos, substr.size(), with);
+    }
 
-         str.replace(pos, substr.size(), with);
-     }
+    static inline bool ciEndsWith(std::string_view s, std::string_view suffix)
+    {
+        return s.size() >= suffix.size() && std::equal(suffix.rbegin(), suffix.rend(), s.rbegin(),
+                                                       [](char l, char r) { return toLower(l) == toLower(r); });
+    };
 };
 
 }

From 9adc1902092f32b8dc79c193f3063f72c207cb09 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sat, 25 Sep 2021 10:46:47 +0200
Subject: [PATCH 1546/2859] Redesign LuaUtil::ScriptsContainer to work with
 ScriptsConfiguration

---
 apps/openmw/mwbase/luamanager.hpp             |   1 +
 apps/openmw/mwlua/asyncbindings.cpp           |  12 +-
 apps/openmw/mwlua/globalscripts.hpp           |   3 +-
 apps/openmw/mwlua/localscripts.cpp            |   6 +-
 apps/openmw/mwlua/localscripts.hpp            |   4 +-
 apps/openmw/mwlua/luabindings.cpp             |   2 +-
 apps/openmw/mwlua/luabindings.hpp             |   2 +-
 apps/openmw/mwlua/luamanagerimp.cpp           | 100 +++--
 apps/openmw/mwlua/luamanagerimp.hpp           |  21 +-
 apps/openmw/mwlua/objectbindings.cpp          |  38 +-
 apps/openmw/mwlua/playerscripts.hpp           |   2 +-
 apps/openmw/mwstate/statemanagerimp.cpp       |   2 +
 apps/openmw_test_suite/lua/test_lua.cpp       |   5 +-
 .../lua/test_omwscriptsparser.cpp             |  59 ---
 .../lua/test_scriptscontainer.cpp             | 193 +++++---
 components/CMakeLists.txt                     |   2 +-
 components/lua/luastate.cpp                   |  13 +-
 components/lua/luastate.hpp                   |  21 +-
 components/lua/omwscriptsparser.cpp           |  44 --
 components/lua/omwscriptsparser.hpp           |  14 -
 components/lua/scriptscontainer.cpp           | 421 +++++++++++-------
 components/lua/scriptscontainer.hpp           | 105 +++--
 22 files changed, 621 insertions(+), 449 deletions(-)
 delete mode 100644 apps/openmw_test_suite/lua/test_omwscriptsparser.cpp
 delete mode 100644 components/lua/omwscriptsparser.cpp
 delete mode 100644 components/lua/omwscriptsparser.hpp

diff --git a/apps/openmw/mwbase/luamanager.hpp b/apps/openmw/mwbase/luamanager.hpp
index ebcd8f50b3..cc479a2937 100644
--- a/apps/openmw/mwbase/luamanager.hpp
+++ b/apps/openmw/mwbase/luamanager.hpp
@@ -30,6 +30,7 @@ namespace MWBase
         virtual ~LuaManager() = default;
 
         virtual void newGameStarted() = 0;
+        virtual void gameLoaded() = 0;
         virtual void registerObject(const MWWorld::Ptr& ptr) = 0;
         virtual void deregisterObject(const MWWorld::Ptr& ptr) = 0;
         virtual void objectAddedToScene(const MWWorld::Ptr& ptr) = 0;
diff --git a/apps/openmw/mwlua/asyncbindings.cpp b/apps/openmw/mwlua/asyncbindings.cpp
index 9fdda53d9d..d438518452 100644
--- a/apps/openmw/mwlua/asyncbindings.cpp
+++ b/apps/openmw/mwlua/asyncbindings.cpp
@@ -23,7 +23,7 @@ namespace MWLua
         sol::usertype<AsyncPackageId> api = context.mLua->sol().new_usertype<AsyncPackageId>("AsyncPackage");
         api["registerTimerCallback"] = [](const AsyncPackageId& asyncId, std::string_view name, sol::function callback)
         {
-            asyncId.mContainer->registerTimerCallback(asyncId.mScript, name, std::move(callback));
+            asyncId.mContainer->registerTimerCallback(asyncId.mScriptId, name, std::move(callback));
             return TimerCallback{asyncId, std::string(name)};
         };
         api["newTimerInSeconds"] = [world=context.mWorldView](const AsyncPackageId&, double delay,
@@ -31,24 +31,24 @@ namespace MWLua
         {
             callback.mAsyncId.mContainer->setupSerializableTimer(
                 TimeUnit::SECONDS, world->getGameTimeInSeconds() + delay,
-                callback.mAsyncId.mScript, callback.mName, std::move(callbackArg));
+                callback.mAsyncId.mScriptId, callback.mName, std::move(callbackArg));
         };
         api["newTimerInHours"] = [world=context.mWorldView](const AsyncPackageId&, double delay,
                                                             const TimerCallback& callback, sol::object callbackArg)
         {
             callback.mAsyncId.mContainer->setupSerializableTimer(
                 TimeUnit::HOURS, world->getGameTimeInHours() + delay,
-                callback.mAsyncId.mScript, callback.mName, std::move(callbackArg));
+                callback.mAsyncId.mScriptId, callback.mName, std::move(callbackArg));
         };
         api["newUnsavableTimerInSeconds"] = [world=context.mWorldView](const AsyncPackageId& asyncId, double delay, sol::function callback)
         {
             asyncId.mContainer->setupUnsavableTimer(
-                TimeUnit::SECONDS, world->getGameTimeInSeconds() + delay, asyncId.mScript, std::move(callback));
+                TimeUnit::SECONDS, world->getGameTimeInSeconds() + delay, asyncId.mScriptId, std::move(callback));
         };
         api["newUnsavableTimerInHours"] = [world=context.mWorldView](const AsyncPackageId& asyncId, double delay, sol::function callback)
         {
             asyncId.mContainer->setupUnsavableTimer(
-                TimeUnit::HOURS, world->getGameTimeInHours() + delay, asyncId.mScript, std::move(callback));
+                TimeUnit::HOURS, world->getGameTimeInHours() + delay, asyncId.mScriptId, std::move(callback));
         };
         api["callback"] = [](const AsyncPackageId& asyncId, sol::function fn)
         {
@@ -59,7 +59,7 @@ namespace MWLua
         {
             LuaUtil::ScriptsContainer::ScriptId id = hiddenData[LuaUtil::ScriptsContainer::ScriptId::KEY];
             hiddenData[Callback::SCRIPT_NAME_KEY] = id.toString();
-            return AsyncPackageId{id.mContainer, id.mPath, hiddenData};
+            return AsyncPackageId{id.mContainer, id.mIndex, hiddenData};
         };
         return sol::make_object(context.mLua->sol(), initializer);
     }
diff --git a/apps/openmw/mwlua/globalscripts.hpp b/apps/openmw/mwlua/globalscripts.hpp
index 9a371809ac..2737dabaca 100644
--- a/apps/openmw/mwlua/globalscripts.hpp
+++ b/apps/openmw/mwlua/globalscripts.hpp
@@ -16,7 +16,8 @@ namespace MWLua
     class GlobalScripts : public LuaUtil::ScriptsContainer
     {
     public:
-        GlobalScripts(LuaUtil::LuaState* lua) : LuaUtil::ScriptsContainer(lua, "Global")
+        GlobalScripts(LuaUtil::LuaState* lua) :
+            LuaUtil::ScriptsContainer(lua, "Global", ESM::LuaScriptCfg::sGlobal)
         {
             registerEngineHandlers({&mActorActiveHandlers, &mNewGameHandlers, &mPlayerAddedHandlers});
         }
diff --git a/apps/openmw/mwlua/localscripts.cpp b/apps/openmw/mwlua/localscripts.cpp
index 8a1b76a8ce..ee23b4b90c 100644
--- a/apps/openmw/mwlua/localscripts.cpp
+++ b/apps/openmw/mwlua/localscripts.cpp
@@ -82,14 +82,14 @@ namespace MWLua
         };
     }
 
-    LocalScripts::LocalScripts(LuaUtil::LuaState* lua, const LObject& obj)
-        : LuaUtil::ScriptsContainer(lua, "L" + idToString(obj.id())), mData(obj)
+    LocalScripts::LocalScripts(LuaUtil::LuaState* lua, const LObject& obj, ESM::LuaScriptCfg::Flags autoStartMode)
+        : LuaUtil::ScriptsContainer(lua, "L" + idToString(obj.id()), autoStartMode), mData(obj)
     {
         this->addPackage("openmw.self", sol::make_object(lua->sol(), &mData));
         registerEngineHandlers({&mOnActiveHandlers, &mOnInactiveHandlers, &mOnConsumeHandlers});
     }
 
-    void LocalScripts::receiveEngineEvent(const EngineEvent& event, ObjectRegistry*)
+    void LocalScripts::receiveEngineEvent(const EngineEvent& event)
     {
         std::visit([this](auto&& arg)
         {
diff --git a/apps/openmw/mwlua/localscripts.hpp b/apps/openmw/mwlua/localscripts.hpp
index 80d04b7a40..68da0b8b03 100644
--- a/apps/openmw/mwlua/localscripts.hpp
+++ b/apps/openmw/mwlua/localscripts.hpp
@@ -20,7 +20,7 @@ namespace MWLua
     {
     public:
         static void initializeSelfPackage(const Context&);
-        LocalScripts(LuaUtil::LuaState* lua, const LObject& obj);
+        LocalScripts(LuaUtil::LuaState* lua, const LObject& obj, ESM::LuaScriptCfg::Flags autoStartMode);
 
         MWBase::LuaManager::ActorControls* getActorControls() { return &mData.mControls; }
 
@@ -39,7 +39,7 @@ namespace MWLua
         };
         using EngineEvent = std::variant<OnActive, OnInactive, OnConsume>;
 
-        void receiveEngineEvent(const EngineEvent&, ObjectRegistry*);
+        void receiveEngineEvent(const EngineEvent&);
 
     protected:
         SelfObject mData;
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index aceffc24db..1c05debc73 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -25,7 +25,7 @@ namespace MWLua
     {
         auto* lua = context.mLua;
         sol::table api(lua->sol(), sol::create);
-        api["API_REVISION"] = 7;
+        api["API_REVISION"] = 8;
         api["quit"] = [lua]()
         {
             std::string traceback = lua->sol()["debug"]["traceback"]().get<std::string>();
diff --git a/apps/openmw/mwlua/luabindings.hpp b/apps/openmw/mwlua/luabindings.hpp
index d1c62e43e3..aad3183734 100644
--- a/apps/openmw/mwlua/luabindings.hpp
+++ b/apps/openmw/mwlua/luabindings.hpp
@@ -48,7 +48,7 @@ namespace MWLua
     struct AsyncPackageId
     {
         LuaUtil::ScriptsContainer* mContainer;
-        std::string mScript;
+        int mScriptId;
         sol::table mHiddenData;
     };
     sol::function getAsyncPackageInitializer(const Context&);
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 38055c99b7..7a4b319f27 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -7,7 +7,6 @@
 #include <components/esm/luascripts.hpp>
 
 #include <components/lua/utilpackage.hpp>
-#include <components/lua/omwscriptsparser.hpp>
 
 #include "../mwbase/windowmanager.hpp"
 
@@ -20,10 +19,10 @@
 namespace MWLua
 {
 
-    LuaManager::LuaManager(const VFS::Manager* vfs, const std::vector<std::string>& scriptLists) : mLua(vfs)
+    LuaManager::LuaManager(const VFS::Manager* vfs, std::vector<std::string> OMWScriptsFiles) :
+        mVFS(vfs), mOMWScriptsFiles(std::move(OMWScriptsFiles)), mLua(vfs, &mConfiguration)
     {
         Log(Debug::Info) << "Lua version: " << LuaUtil::getLuaVersion();
-        mGlobalScriptList = LuaUtil::parseOMWScriptsFiles(vfs, scriptLists);
 
         mGlobalSerializer = createUserdataSerializer(false, mWorldView.getObjectRegistry());
         mLocalSerializer = createUserdataSerializer(true, mWorldView.getObjectRegistry());
@@ -33,6 +32,30 @@ namespace MWLua
         mGlobalScripts.setSerializer(mGlobalSerializer.get());
     }
 
+    void LuaManager::initConfiguration()
+    {
+        ESM::LuaScriptsCfg cfg;
+        for (const std::string& file : mOMWScriptsFiles)
+        {
+            if (!Misc::StringUtils::endsWith(file, ".omwscripts"))
+            {
+                Log(Debug::Error) << "Script list should have suffix '.omwscripts', got: '" << file << "'";
+                continue;
+            }
+            try
+            {
+                std::string content(std::istreambuf_iterator<char>(*mVFS->get(file)), {});
+                LuaUtil::parseOMWScripts(cfg, content);
+            }
+            catch (std::exception& e) { Log(Debug::Error) << e.what(); }
+        }
+        // TODO: Add data from content files
+        mConfiguration.init(cfg);
+        Log(Debug::Verbose) << "Lua scripts configuration (" << mConfiguration.size() << " scripts):";
+        for (size_t i = 0; i < mConfiguration.size(); ++i)
+            Log(Debug::Verbose) << "#" << i << " " << LuaUtil::scriptCfgToString(mConfiguration[i]);
+    }
+
     void LuaManager::init()
     {
         Context context;
@@ -67,10 +90,7 @@ namespace MWLua
         mLocalSettingsPackage = initLocalSettingsPackage(localContext);
         mPlayerSettingsPackage = initPlayerSettingsPackage(localContext);
 
-        mInputEvents.clear();
-        for (const std::string& path : mGlobalScriptList)
-            if (mGlobalScripts.addNewScript(path))
-                Log(Debug::Info) << "Global script started: " << path;
+        initConfiguration();
         mInitialized = true;
     }
 
@@ -160,7 +180,7 @@ namespace MWLua
             }
             LocalScripts* scripts = obj.ptr().getRefData().getLuaScripts();
             if (scripts)
-                scripts->receiveEngineEvent(e.mEvent, objectRegistry);
+                scripts->receiveEngineEvent(e.mEvent);
         }
         mLocalEngineEvents.clear();
 
@@ -173,6 +193,11 @@ namespace MWLua
             mPlayerChanged = false;
             mGlobalScripts.playerAdded(GObject(getId(mPlayer), objectRegistry));
         }
+        if (mNewGameStarted)
+        {
+            mNewGameStarted = false;
+            mGlobalScripts.newGameStarted();
+        }
 
         for (ObjectId id : mActorAddedEvents)
             mGlobalScripts.actorActive(GObject(id, objectRegistry));
@@ -205,8 +230,11 @@ namespace MWLua
         mInputEvents.clear();
         mActorAddedEvents.clear();
         mLocalEngineEvents.clear();
+        mNewGameStarted = false;
         mPlayerChanged = false;
         mWorldView.clear();
+        mGlobalScripts.removeAllScripts();
+        mGlobalScriptsStarted = false;
         if (!mPlayer.isEmpty())
         {
             mPlayer.getCellRef().unsetRefNum();
@@ -225,17 +253,38 @@ namespace MWLua
         mPlayer = ptr;
         LocalScripts* localScripts = ptr.getRefData().getLuaScripts();
         if (!localScripts)
-            localScripts = createLocalScripts(ptr);
+            localScripts = createLocalScripts(ptr, ESM::LuaScriptCfg::sPlayer);
         mActiveLocalScripts.insert(localScripts);
         mLocalEngineEvents.push_back({getId(ptr), LocalScripts::OnActive{}});
         mPlayerChanged = true;
     }
 
+    void LuaManager::newGameStarted()
+    {
+        mNewGameStarted = true;
+        mInputEvents.clear();
+        mGlobalScripts.addAutoStartedScripts();
+        mGlobalScriptsStarted = true;
+    }
+
+    void LuaManager::gameLoaded()
+    {
+        if (!mGlobalScriptsStarted)
+            mGlobalScripts.addAutoStartedScripts();
+        mGlobalScriptsStarted = true;
+    }
+
     void LuaManager::objectAddedToScene(const MWWorld::Ptr& ptr)
     {
         mWorldView.objectAddedToScene(ptr);  // assigns generated RefNum if it is not set yet.
 
         LocalScripts* localScripts = ptr.getRefData().getLuaScripts();
+        if (!localScripts)
+        {
+            ESM::LuaScriptCfg::Flags flag = getLuaScriptFlag(ptr);
+            if (!mConfiguration.getListByFlag(flag).empty())
+                localScripts = createLocalScripts(ptr, flag);  // TODO: put to a queue and apply on next `update()`
+        }
         if (localScripts)
         {
             mActiveLocalScripts.insert(localScripts);
@@ -281,26 +330,26 @@ namespace MWLua
         return localScripts->getActorControls();
     }
 
-    void LuaManager::addLocalScript(const MWWorld::Ptr& ptr, const std::string& scriptPath)
+    void LuaManager::addCustomLocalScript(const MWWorld::Ptr& ptr, int scriptId)
     {
         LocalScripts* localScripts = ptr.getRefData().getLuaScripts();
         if (!localScripts)
         {
-            localScripts = createLocalScripts(ptr);
+            localScripts = createLocalScripts(ptr, getLuaScriptFlag(ptr));
             if (ptr.isInCell() && MWBase::Environment::get().getWorld()->isCellActive(ptr.getCell()))
                 mActiveLocalScripts.insert(localScripts);
         }
-        localScripts->addNewScript(scriptPath);
+        localScripts->addCustomScript(scriptId);
     }
 
-    LocalScripts* LuaManager::createLocalScripts(const MWWorld::Ptr& ptr)
+    LocalScripts* LuaManager::createLocalScripts(const MWWorld::Ptr& ptr, ESM::LuaScriptCfg::Flags flag)
     {
         assert(mInitialized);
+        assert(flag != ESM::LuaScriptCfg::sGlobal);
         std::shared_ptr<LocalScripts> scripts;
-        // When loading a game, it can be called before LuaManager::setPlayer,
-        // so we can't just check ptr == mPlayer here.
-        if (ptr.getCellRef().getRefIdRef() == "player")
+        if (flag == ESM::LuaScriptCfg::sPlayer)
         {
+            assert(ptr.getCellRef().getRefIdRef() == "player");
             scripts = std::make_shared<PlayerScripts>(&mLua, LObject(getId(ptr), mWorldView.getObjectRegistry()));
             scripts->addPackage("openmw.ui", mUserInterfacePackage);
             scripts->addPackage("openmw.camera", mCameraPackage);
@@ -309,11 +358,12 @@ namespace MWLua
         }
         else
         {
-            scripts = std::make_shared<LocalScripts>(&mLua, LObject(getId(ptr), mWorldView.getObjectRegistry()));
+            scripts = std::make_shared<LocalScripts>(&mLua, LObject(getId(ptr), mWorldView.getObjectRegistry()), flag);
             scripts->addPackage("openmw.settings", mLocalSettingsPackage);
         }
         scripts->addPackage("openmw.nearby", mNearbyPackage);
         scripts->setSerializer(mLocalSerializer.get());
+        scripts->addAutoStartedScripts();
 
         MWWorld::RefData& refData = ptr.getRefData();
         refData.setLuaScripts(std::move(scripts));
@@ -344,8 +394,9 @@ namespace MWLua
         loadEvents(mLua.sol(), reader, mGlobalEvents, mLocalEvents, mContentFileMapping, mGlobalLoader.get());
 
         mGlobalScripts.setSerializer(mGlobalLoader.get());
-        mGlobalScripts.load(globalScripts, false);
+        mGlobalScripts.load(globalScripts);
         mGlobalScripts.setSerializer(mGlobalSerializer.get());
+        mGlobalScriptsStarted = true;
     }
 
     void LuaManager::saveLocalScripts(const MWWorld::Ptr& ptr, ESM::LuaScripts& data)
@@ -366,10 +417,10 @@ namespace MWLua
         }
 
         mWorldView.getObjectRegistry()->registerPtr(ptr);
-        LocalScripts* scripts = createLocalScripts(ptr);
+        LocalScripts* scripts = createLocalScripts(ptr, getLuaScriptFlag(ptr));
 
         scripts->setSerializer(mLocalLoader.get());
-        scripts->load(data, true);
+        scripts->load(data);
         scripts->setSerializer(mLocalSerializer.get());
 
         // LiveCellRef is usually copied after loading, so this Ptr will become invalid and should be deregistered.
@@ -380,15 +431,12 @@ namespace MWLua
     {
         Log(Debug::Info) << "Reload Lua";
         mLua.dropScriptCache();
+        initConfiguration();
 
         {  // Reload global scripts
             ESM::LuaScripts data;
             mGlobalScripts.save(data);
-            mGlobalScripts.removeAllScripts();
-            for (const std::string& path : mGlobalScriptList)
-                if (mGlobalScripts.addNewScript(path))
-                    Log(Debug::Info) << "Global script restarted: " << path;
-            mGlobalScripts.load(data, false);
+            mGlobalScripts.load(data);
         }
 
         for (const auto& [id, ptr] : mWorldView.getObjectRegistry()->mObjectMapping)
@@ -398,7 +446,7 @@ namespace MWLua
                 continue;
             ESM::LuaScripts data;
             scripts->save(data);
-            scripts->load(data, true);
+            scripts->load(data);
         }
     }
 
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index 91f48171f3..be80cfe2e7 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -35,9 +35,9 @@ namespace MWLua
     class LuaManager : public MWBase::LuaManager
     {
     public:
-        LuaManager(const VFS::Manager* vfs, const std::vector<std::string>& globalScriptLists);
+        LuaManager(const VFS::Manager* vfs, std::vector<std::string> OMWScriptsFiles);
 
-        // Called by engine.cpp when environment is fully initialized.
+        // Called by engine.cpp when the environment is fully initialized.
         void init();
 
         // Called by engine.cpp every frame. For performance reasons it works in a separate
@@ -49,7 +49,8 @@ namespace MWLua
 
         // Available everywhere through the MWBase::LuaManager interface.
         // LuaManager queues these events and propagates to scripts on the next `update` call.
-        void newGameStarted() override { mGlobalScripts.newGameStarted(); }
+        void newGameStarted() override;
+        void gameLoaded() override;
         void objectAddedToScene(const MWWorld::Ptr& ptr) override;
         void objectRemovedFromScene(const MWWorld::Ptr& ptr) override;
         void registerObject(const MWWorld::Ptr& ptr) override;
@@ -62,8 +63,8 @@ namespace MWLua
         void clear() override;  // should be called before loading game or starting a new game to reset internal state.
         void setupPlayer(const MWWorld::Ptr& ptr) override;  // Should be called once after each "clear".
 
-        // Used only in luabindings
-        void addLocalScript(const MWWorld::Ptr&, const std::string& scriptPath);
+        // Used only in Lua bindings
+        void addCustomLocalScript(const MWWorld::Ptr&, int scriptId);
         void addAction(std::unique_ptr<Action>&& action) { mActionQueue.push_back(std::move(action)); }
         void addTeleportPlayerAction(std::unique_ptr<TeleportAction>&& action) { mTeleportPlayerAction = std::move(action); }
         void addUIMessage(std::string_view message) { mUIMessages.emplace_back(message); }
@@ -93,9 +94,15 @@ namespace MWLua
         }
 
     private:
-        LocalScripts* createLocalScripts(const MWWorld::Ptr& ptr);
+        void initConfiguration();
+        LocalScripts* createLocalScripts(const MWWorld::Ptr& ptr, ESM::LuaScriptCfg::Flags);
+
+        const VFS::Manager* mVFS;
+        const std::vector<std::string> mOMWScriptsFiles;
 
         bool mInitialized = false;
+        bool mGlobalScriptsStarted = false;
+        LuaUtil::ScriptsConfiguration mConfiguration;
         LuaUtil::LuaState mLua;
         sol::table mNearbyPackage;
         sol::table mUserInterfacePackage;
@@ -104,12 +111,12 @@ namespace MWLua
         sol::table mLocalSettingsPackage;
         sol::table mPlayerSettingsPackage;
 
-        std::vector<std::string> mGlobalScriptList;
         GlobalScripts mGlobalScripts{&mLua};
         std::set<LocalScripts*> mActiveLocalScripts;
         WorldView mWorldView;
 
         bool mPlayerChanged = false;
+        bool mNewGameStarted = false;
         MWWorld::Ptr mPlayer;
 
         GlobalEventQueue mGlobalEvents;
diff --git a/apps/openmw/mwlua/objectbindings.cpp b/apps/openmw/mwlua/objectbindings.cpp
index 07b7921a09..2eceecc061 100644
--- a/apps/openmw/mwlua/objectbindings.cpp
+++ b/apps/openmw/mwlua/objectbindings.cpp
@@ -140,9 +140,43 @@ namespace MWLua
 
         if constexpr (std::is_same_v<ObjectT, GObject>)
         {  // Only for global scripts
-            objectT["addScript"] = [luaManager=context.mLuaManager](const GObject& object, const std::string& path)
+            objectT["addScript"] = [lua=context.mLua, luaManager=context.mLuaManager](const GObject& object, std::string_view path)
             {
-                luaManager->addLocalScript(object.ptr(), path);
+                const LuaUtil::ScriptsConfiguration& cfg = lua->getConfiguration();
+                std::optional<int> scriptId = cfg.findId(path);
+                if (!scriptId)
+                    throw std::runtime_error("Unknown script: " + std::string(path));
+                if (!(cfg[*scriptId].mFlags & ESM::LuaScriptCfg::sCustom))
+                    throw std::runtime_error("Script without CUSTOM tag can not be added dynamically: " + std::string(path));
+                luaManager->addCustomLocalScript(object.ptr(), *scriptId);
+            };
+            objectT["hasScript"] = [lua=context.mLua](const GObject& object, std::string_view path)
+            {
+                const LuaUtil::ScriptsConfiguration& cfg = lua->getConfiguration();
+                std::optional<int> scriptId = cfg.findId(path);
+                if (!scriptId)
+                    return false;
+                MWWorld::Ptr ptr = object.ptr();
+                LocalScripts* localScripts = ptr.getRefData().getLuaScripts();
+                if (localScripts)
+                    return localScripts->hasScript(*scriptId);
+                else
+                    return false;
+            };
+            objectT["removeScript"] = [lua=context.mLua](const GObject& object, std::string_view path)
+            {
+                const LuaUtil::ScriptsConfiguration& cfg = lua->getConfiguration();
+                std::optional<int> scriptId = cfg.findId(path);
+                if (!scriptId)
+                    throw std::runtime_error("Unknown script: " + std::string(path));
+                MWWorld::Ptr ptr = object.ptr();
+                LocalScripts* localScripts = ptr.getRefData().getLuaScripts();
+                if (!localScripts || !localScripts->hasScript(*scriptId))
+                    throw std::runtime_error("There is no script " + std::string(path) + " on " + ptrToString(ptr));
+                ESM::LuaScriptCfg::Flags flags = cfg[*scriptId].mFlags;
+                if ((flags & (localScripts->getAutoStartMode() | ESM::LuaScriptCfg::sCustom)) != ESM::LuaScriptCfg::sCustom)
+                    throw std::runtime_error("Autostarted script can not be removed: " + std::string(path));
+                localScripts->removeScript(*scriptId);
             };
 
             objectT["teleport"] = [luaManager=context.mLuaManager](const GObject& object, std::string_view cell,
diff --git a/apps/openmw/mwlua/playerscripts.hpp b/apps/openmw/mwlua/playerscripts.hpp
index ff0349b3c6..0393a1375d 100644
--- a/apps/openmw/mwlua/playerscripts.hpp
+++ b/apps/openmw/mwlua/playerscripts.hpp
@@ -13,7 +13,7 @@ namespace MWLua
     class PlayerScripts : public LocalScripts
     {
     public:
-        PlayerScripts(LuaUtil::LuaState* lua, const LObject& obj) : LocalScripts(lua, obj)
+        PlayerScripts(LuaUtil::LuaState* lua, const LObject& obj) : LocalScripts(lua, obj, ESM::LuaScriptCfg::sPlayer)
         {
             registerEngineHandlers({&mKeyPressHandlers, &mKeyReleaseHandlers,
                                     &mControllerButtonPressHandlers, &mControllerButtonReleaseHandlers,
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index 4387d7faa7..5e51e2f621 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -558,6 +558,8 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
         // Since we passed "changeEvent=false" to changeCell, we shouldn't have triggered the cell change flag.
         // But make sure the flag is cleared anyway in case it was set from an earlier game.
         MWBase::Environment::get().getWorld()->markCellAsUnchanged();
+
+        MWBase::Environment::get().getLuaManager()->gameLoaded();
     }
     catch (const std::exception& e)
     {
diff --git a/apps/openmw_test_suite/lua/test_lua.cpp b/apps/openmw_test_suite/lua/test_lua.cpp
index 32d4ea49b8..4b3ecdcb2b 100644
--- a/apps/openmw_test_suite/lua/test_lua.cpp
+++ b/apps/openmw_test_suite/lua/test_lua.cpp
@@ -58,7 +58,8 @@ return {
             {"invalid.lua", &invalidScriptFile}
         });
 
-        LuaUtil::LuaState mLua{mVFS.get()};
+        LuaUtil::ScriptsConfiguration mCfg;
+        LuaUtil::LuaState mLua{mVFS.get(), &mCfg};
     };
 
     TEST_F(LuaStateTest, Sandbox)
@@ -148,7 +149,7 @@ return {
 
     TEST_F(LuaStateTest, ProvideAPI)
     {
-        LuaUtil::LuaState lua(mVFS.get());
+        LuaUtil::LuaState lua(mVFS.get(), &mCfg);
 
         sol::table api1 = LuaUtil::makeReadOnly(lua.sol().create_table_with("name", "api1"));
         sol::table api2 = LuaUtil::makeReadOnly(lua.sol().create_table_with("name", "api2"));
diff --git a/apps/openmw_test_suite/lua/test_omwscriptsparser.cpp b/apps/openmw_test_suite/lua/test_omwscriptsparser.cpp
deleted file mode 100644
index b1526ef9b6..0000000000
--- a/apps/openmw_test_suite/lua/test_omwscriptsparser.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-#include "gmock/gmock.h"
-#include <gtest/gtest.h>
-
-#include <components/lua/omwscriptsparser.hpp>
-
-#include "testing_util.hpp"
-
-namespace
-{
-    using namespace testing;
-
-    TestFile file1(
-        "#comment.lua\n"
-        "\n"
-        "script1.lua\n"
-        "some mod/Some Script.lua"
-    );
-    TestFile file2(
-        "#comment.lua\r\n"
-        "\r\n"
-        "script2.lua\r\n"
-        "some other mod/Some Script.lua\r"
-    );
-    TestFile emptyFile("");
-    TestFile invalidFile("Invalid file");
-
-    struct OMWScriptsParserTest : Test
-    {
-        std::unique_ptr<VFS::Manager> mVFS = createTestVFS({
-            {"file1.omwscripts", &file1},
-            {"file2.omwscripts", &file2},
-            {"empty.omwscripts", &emptyFile},
-            {"invalid.lua", &file1},
-            {"invalid.omwscripts", &invalidFile},
-        });
-    };
-
-    TEST_F(OMWScriptsParserTest, Basic)
-    {
-        internal::CaptureStdout();
-        std::vector<std::string> res = LuaUtil::parseOMWScriptsFiles(
-            mVFS.get(), {"file2.omwscripts", "empty.omwscripts", "file1.omwscripts"});
-        EXPECT_EQ(internal::GetCapturedStdout(), "");
-        EXPECT_THAT(res, ElementsAre("script2.lua", "some other mod/Some Script.lua",
-                                     "script1.lua", "some mod/Some Script.lua"));
-    }
-
-    TEST_F(OMWScriptsParserTest, InvalidFiles)
-    {
-        internal::CaptureStdout();
-        std::vector<std::string> res = LuaUtil::parseOMWScriptsFiles(
-            mVFS.get(), {"invalid.lua", "invalid.omwscripts"});
-        EXPECT_EQ(internal::GetCapturedStdout(),
-                  "Script list should have suffix '.omwscripts', got: 'invalid.lua'\n"
-                  "Lua script should have suffix '.lua', got: 'Invalid file'\n");
-        EXPECT_THAT(res, ElementsAre());
-    }
-
-}
diff --git a/apps/openmw_test_suite/lua/test_scriptscontainer.cpp b/apps/openmw_test_suite/lua/test_scriptscontainer.cpp
index 8f05138782..344fbb3c78 100644
--- a/apps/openmw_test_suite/lua/test_scriptscontainer.cpp
+++ b/apps/openmw_test_suite/lua/test_scriptscontainer.cpp
@@ -18,7 +18,10 @@ namespace
     
     TestFile testScript(R"X(
 return {
-    engineHandlers = { onUpdate = function(dt) print(' update ' .. tostring(dt)) end },
+    engineHandlers = {
+        onUpdate = function(dt) print(' update ' .. tostring(dt)) end,
+        onLoad = function() print('load') end,
+    },
     eventHandlers = {
         Event1 = function(eventData) print(' event1 ' .. tostring(eventData.x)) end,
         Event2 = function(eventData) print(' event2 ' .. tostring(eventData.x)) end,
@@ -75,15 +78,25 @@ return {
 )X");
 
     TestFile overrideInterfaceScript(R"X(
-local old = require('openmw.interfaces').TestInterface
+local old = nil
+local interface = {
+    fn = function(x)
+        print('NEW FN', x)
+        old.fn(x)
+    end,
+    value,
+}
 return {
     interfaceName = "TestInterface",
-    interface = {
-        fn = function(x)
-            print('NEW FN', x)
-            old.fn(x)
-        end,
-        value = old.value + 1
+    interface = interface,
+    engineHandlers = {
+        onInit = function() print('init') end,
+        onLoad = function() print('load') end,
+        onInterfaceOverride = function(oldInterface)
+            print('override')
+            old = oldInterface
+            interface.value = oldInterface.value + 1
+        end
     },
 }
 )X");
@@ -115,7 +128,25 @@ return {
             {"useInterface.lua", &useInterfaceScript},
         });
 
-        LuaUtil::LuaState mLua{mVFS.get()};
+        LuaUtil::ScriptsConfiguration mCfg;
+        LuaUtil::LuaState mLua{mVFS.get(), &mCfg};
+
+        LuaScriptsContainerTest()
+        {
+            ESM::LuaScriptsCfg cfg;
+            cfg.mScripts.push_back({"invalid.lua", "", ESM::LuaScriptCfg::sCustom});
+            cfg.mScripts.push_back({"incorrect.lua", "", ESM::LuaScriptCfg::sCustom});
+            cfg.mScripts.push_back({"empty.lua", "", ESM::LuaScriptCfg::sCustom});
+            cfg.mScripts.push_back({"test1.lua", "", ESM::LuaScriptCfg::sCustom});
+            cfg.mScripts.push_back({"stopEvent.lua", "", ESM::LuaScriptCfg::sCustom});
+            cfg.mScripts.push_back({"test2.lua", "", ESM::LuaScriptCfg::sCustom});
+            cfg.mScripts.push_back({"loadSave1.lua", "", ESM::LuaScriptCfg::sNPC});
+            cfg.mScripts.push_back({"loadSave2.lua", "", ESM::LuaScriptCfg::sCustom | ESM::LuaScriptCfg::sNPC});
+            cfg.mScripts.push_back({"testInterface.lua", "", ESM::LuaScriptCfg::sCustom | ESM::LuaScriptCfg::sPlayer});
+            cfg.mScripts.push_back({"overrideInterface.lua", "", ESM::LuaScriptCfg::sCustom | ESM::LuaScriptCfg::sPlayer});
+            cfg.mScripts.push_back({"useInterface.lua", "", ESM::LuaScriptCfg::sCustom | ESM::LuaScriptCfg::sPlayer});
+            mCfg.init(std::move(cfg));
+        }
     };
 
     TEST_F(LuaScriptsContainerTest, VerifyStructure)
@@ -123,21 +154,21 @@ return {
         LuaUtil::ScriptsContainer scripts(&mLua, "Test");
         {
             testing::internal::CaptureStdout();
-            EXPECT_FALSE(scripts.addNewScript("invalid.lua"));
+            EXPECT_FALSE(scripts.addCustomScript(*mCfg.findId("invalid.lua")));
             std::string output = testing::internal::GetCapturedStdout();
             EXPECT_THAT(output, HasSubstr("Can't start Test[invalid.lua]"));
         }
         {
             testing::internal::CaptureStdout();
-            EXPECT_TRUE(scripts.addNewScript("incorrect.lua"));
+            EXPECT_TRUE(scripts.addCustomScript(*mCfg.findId("incorrect.lua")));
             std::string output = testing::internal::GetCapturedStdout();
             EXPECT_THAT(output, HasSubstr("Not supported handler 'incorrectHandler' in Test[incorrect.lua]"));
             EXPECT_THAT(output, HasSubstr("Not supported section 'incorrectSection' in Test[incorrect.lua]"));
         }
         {
             testing::internal::CaptureStdout();
-            EXPECT_TRUE(scripts.addNewScript("empty.lua"));
-            EXPECT_FALSE(scripts.addNewScript("empty.lua"));  // already present
+            EXPECT_TRUE(scripts.addCustomScript(*mCfg.findId("empty.lua")));
+            EXPECT_FALSE(scripts.addCustomScript(*mCfg.findId("empty.lua")));  // already present
             EXPECT_EQ(internal::GetCapturedStdout(), "");
         }
     }
@@ -146,9 +177,9 @@ return {
     {
         LuaUtil::ScriptsContainer scripts(&mLua, "Test");
         testing::internal::CaptureStdout();
-        EXPECT_TRUE(scripts.addNewScript("test1.lua"));
-        EXPECT_TRUE(scripts.addNewScript("stopEvent.lua"));
-        EXPECT_TRUE(scripts.addNewScript("test2.lua"));
+        EXPECT_TRUE(scripts.addCustomScript(*mCfg.findId("test1.lua")));
+        EXPECT_TRUE(scripts.addCustomScript(*mCfg.findId("stopEvent.lua")));
+        EXPECT_TRUE(scripts.addCustomScript(*mCfg.findId("test2.lua")));
         scripts.update(1.5f);
         EXPECT_EQ(internal::GetCapturedStdout(), "Test[test1.lua]:\t update 1.5\n"
                                                  "Test[test2.lua]:\t update 1.5\n");
@@ -157,9 +188,9 @@ return {
     TEST_F(LuaScriptsContainerTest, CallEvent)
     {
         LuaUtil::ScriptsContainer scripts(&mLua, "Test");
-        EXPECT_TRUE(scripts.addNewScript("test1.lua"));
-        EXPECT_TRUE(scripts.addNewScript("stopEvent.lua"));
-        EXPECT_TRUE(scripts.addNewScript("test2.lua"));
+        EXPECT_TRUE(scripts.addCustomScript(*mCfg.findId("test1.lua")));
+        EXPECT_TRUE(scripts.addCustomScript(*mCfg.findId("stopEvent.lua")));
+        EXPECT_TRUE(scripts.addCustomScript(*mCfg.findId("test2.lua")));
 
         std::string X0 = LuaUtil::serialize(mLua.sol().create_table_with("x", 0.5));
         std::string X1 = LuaUtil::serialize(mLua.sol().create_table_with("x", 1.5));
@@ -204,9 +235,9 @@ return {
     TEST_F(LuaScriptsContainerTest, RemoveScript)
     {
         LuaUtil::ScriptsContainer scripts(&mLua, "Test");
-        EXPECT_TRUE(scripts.addNewScript("test1.lua"));
-        EXPECT_TRUE(scripts.addNewScript("stopEvent.lua"));
-        EXPECT_TRUE(scripts.addNewScript("test2.lua"));
+        EXPECT_TRUE(scripts.addCustomScript(*mCfg.findId("test1.lua")));
+        EXPECT_TRUE(scripts.addCustomScript(*mCfg.findId("stopEvent.lua")));
+        EXPECT_TRUE(scripts.addCustomScript(*mCfg.findId("test2.lua")));
         std::string X = LuaUtil::serialize(mLua.sol().create_table_with("x", 0.5));
 
         {
@@ -221,8 +252,10 @@ return {
         }
         {
             testing::internal::CaptureStdout();
-            EXPECT_TRUE(scripts.removeScript("stopEvent.lua"));
-            EXPECT_FALSE(scripts.removeScript("stopEvent.lua"));  // already removed
+            int stopEventScriptId = *mCfg.findId("stopEvent.lua");
+            EXPECT_TRUE(scripts.hasScript(stopEventScriptId));
+            scripts.removeScript(stopEventScriptId);
+            EXPECT_FALSE(scripts.hasScript(stopEventScriptId));
             scripts.update(1.5f);
             scripts.receiveEvent("Event1", X);
             EXPECT_EQ(internal::GetCapturedStdout(),
@@ -233,7 +266,7 @@ return {
         }
         {
             testing::internal::CaptureStdout();
-            EXPECT_TRUE(scripts.removeScript("test1.lua"));
+            scripts.removeScript(*mCfg.findId("test1.lua"));
             scripts.update(1.5f);
             scripts.receiveEvent("Event1", X);
             EXPECT_EQ(internal::GetCapturedStdout(),
@@ -242,17 +275,41 @@ return {
         }
     }
 
+    TEST_F(LuaScriptsContainerTest, AutoStart)
+    {
+        LuaUtil::ScriptsContainer scripts(&mLua, "Test", ESM::LuaScriptCfg::sPlayer);
+        testing::internal::CaptureStdout();
+        scripts.addAutoStartedScripts();
+        scripts.update(1.5f);
+        EXPECT_EQ(internal::GetCapturedStdout(),
+            "Test[overrideInterface.lua]:\toverride\n"
+            "Test[overrideInterface.lua]:\tinit\n"
+            "Test[overrideInterface.lua]:\tNEW FN\t4.5\n"
+            "Test[testInterface.lua]:\tFN\t4.5\n");
+    }
+
     TEST_F(LuaScriptsContainerTest, Interface)
     {
-        LuaUtil::ScriptsContainer scripts(&mLua, "Test");
+        LuaUtil::ScriptsContainer scripts(&mLua, "Test", ESM::LuaScriptCfg::sCreature);
+        int addIfaceId = *mCfg.findId("testInterface.lua");
+        int overrideIfaceId = *mCfg.findId("overrideInterface.lua");
+        int useIfaceId = *mCfg.findId("useInterface.lua");
+
         testing::internal::CaptureStdout();
-        EXPECT_TRUE(scripts.addNewScript("testInterface.lua"));
-        EXPECT_TRUE(scripts.addNewScript("overrideInterface.lua"));
-        EXPECT_TRUE(scripts.addNewScript("useInterface.lua"));
+        scripts.addAutoStartedScripts();
         scripts.update(1.5f);
-        EXPECT_TRUE(scripts.removeScript("overrideInterface.lua"));
+        EXPECT_EQ(internal::GetCapturedStdout(), "");
+
+        testing::internal::CaptureStdout();
+        EXPECT_TRUE(scripts.addCustomScript(addIfaceId));
+        EXPECT_TRUE(scripts.addCustomScript(overrideIfaceId));
+        EXPECT_TRUE(scripts.addCustomScript(useIfaceId));
+        scripts.update(1.5f);
+        scripts.removeScript(overrideIfaceId);
         scripts.update(1.5f);
         EXPECT_EQ(internal::GetCapturedStdout(),
+            "Test[overrideInterface.lua]:\toverride\n"
+            "Test[overrideInterface.lua]:\tinit\n"
             "Test[overrideInterface.lua]:\tNEW FN\t4.5\n"
             "Test[testInterface.lua]:\tFN\t4.5\n"
             "Test[testInterface.lua]:\tFN\t3.5\n");
@@ -260,16 +317,12 @@ return {
 
     TEST_F(LuaScriptsContainerTest, LoadSave)
     {
-        LuaUtil::ScriptsContainer scripts1(&mLua, "Test");
-        LuaUtil::ScriptsContainer scripts2(&mLua, "Test");
-        LuaUtil::ScriptsContainer scripts3(&mLua, "Test");
-
-        EXPECT_TRUE(scripts1.addNewScript("loadSave1.lua"));
-        EXPECT_TRUE(scripts1.addNewScript("test1.lua"));
-        EXPECT_TRUE(scripts1.addNewScript("loadSave2.lua"));
+        LuaUtil::ScriptsContainer scripts1(&mLua, "Test", ESM::LuaScriptCfg::sNPC);
+        LuaUtil::ScriptsContainer scripts2(&mLua, "Test", ESM::LuaScriptCfg::sNPC);
+        LuaUtil::ScriptsContainer scripts3(&mLua, "Test", ESM::LuaScriptCfg::sPlayer);
 
-        EXPECT_TRUE(scripts3.addNewScript("test2.lua"));
-        EXPECT_TRUE(scripts3.addNewScript("loadSave2.lua"));
+        scripts1.addAutoStartedScripts();
+        EXPECT_TRUE(scripts1.addCustomScript(*mCfg.findId("test1.lua")));
 
         scripts1.receiveEvent("Set", LuaUtil::serialize(mLua.sol().create_table_with(
             "n", 1,
@@ -282,23 +335,30 @@ return {
 
         ESM::LuaScripts data;
         scripts1.save(data);
-        scripts2.load(data, true);
-        scripts3.load(data, false);
 
         {
             testing::internal::CaptureStdout();
+            scripts2.load(data);
             scripts2.receiveEvent("Print", "");
             EXPECT_EQ(internal::GetCapturedStdout(),
+                "Test[test1.lua]:\tload\n"
                 "Test[loadSave2.lua]:\t0.5\t3.5\n"
-                "Test[test1.lua]:\tprint\n"
-                "Test[loadSave1.lua]:\t2.5\t1.5\n");
+                "Test[loadSave1.lua]:\t2.5\t1.5\n"
+                "Test[test1.lua]:\tprint\n");
+            EXPECT_FALSE(scripts2.hasScript(*mCfg.findId("testInterface.lua")));
         }
         {
             testing::internal::CaptureStdout();
+            scripts3.load(data);
             scripts3.receiveEvent("Print", "");
             EXPECT_EQ(internal::GetCapturedStdout(),
+                "Ignoring Test[loadSave1.lua]; this script is not allowed here\n"
+                "Test[test1.lua]:\tload\n"
+                "Test[overrideInterface.lua]:\toverride\n"
+                "Test[overrideInterface.lua]:\tinit\n"
                 "Test[loadSave2.lua]:\t0.5\t3.5\n"
-                "Test[test2.lua]:\tprint\n");
+                "Test[test1.lua]:\tprint\n");
+            EXPECT_TRUE(scripts3.hasScript(*mCfg.findId("testInterface.lua")));
         }
     }
 
@@ -306,8 +366,13 @@ return {
     {
         using TimeUnit = LuaUtil::ScriptsContainer::TimeUnit;
         LuaUtil::ScriptsContainer scripts(&mLua, "Test");
-        EXPECT_TRUE(scripts.addNewScript("test1.lua"));
-        EXPECT_TRUE(scripts.addNewScript("test2.lua"));
+        int test1Id = *mCfg.findId("test1.lua");
+        int test2Id = *mCfg.findId("test2.lua");
+
+        testing::internal::CaptureStdout();
+        EXPECT_TRUE(scripts.addCustomScript(test1Id));
+        EXPECT_TRUE(scripts.addCustomScript(test2Id));
+        EXPECT_EQ(internal::GetCapturedStdout(), "");
 
         int counter1 = 0, counter2 = 0, counter3 = 0, counter4 = 0;
         sol::function fn1 = sol::make_object(mLua.sol(), [&]() { counter1++; });
@@ -315,25 +380,25 @@ return {
         sol::function fn3 = sol::make_object(mLua.sol(), [&](int d) { counter3 += d; });
         sol::function fn4 = sol::make_object(mLua.sol(), [&](int d) { counter4 += d; });
 
-        scripts.registerTimerCallback("test1.lua", "A", fn3);
-        scripts.registerTimerCallback("test1.lua", "B", fn4);
-        scripts.registerTimerCallback("test2.lua", "B", fn3);
-        scripts.registerTimerCallback("test2.lua", "A", fn4);
+        scripts.registerTimerCallback(test1Id, "A", fn3);
+        scripts.registerTimerCallback(test1Id, "B", fn4);
+        scripts.registerTimerCallback(test2Id, "B", fn3);
+        scripts.registerTimerCallback(test2Id, "A", fn4);
 
         scripts.processTimers(1, 2);
 
-        scripts.setupSerializableTimer(TimeUnit::SECONDS, 10, "test1.lua", "B", sol::make_object(mLua.sol(), 3));
-        scripts.setupSerializableTimer(TimeUnit::HOURS, 10, "test2.lua", "B", sol::make_object(mLua.sol(), 4));
-        scripts.setupSerializableTimer(TimeUnit::SECONDS, 5, "test1.lua", "A", sol::make_object(mLua.sol(), 1));
-        scripts.setupSerializableTimer(TimeUnit::HOURS, 5, "test2.lua", "A", sol::make_object(mLua.sol(), 2));
-        scripts.setupSerializableTimer(TimeUnit::SECONDS, 15, "test1.lua", "A", sol::make_object(mLua.sol(), 10));
-        scripts.setupSerializableTimer(TimeUnit::SECONDS, 15, "test1.lua", "B", sol::make_object(mLua.sol(), 20));
+        scripts.setupSerializableTimer(TimeUnit::SECONDS, 10, test1Id, "B", sol::make_object(mLua.sol(), 3));
+        scripts.setupSerializableTimer(TimeUnit::HOURS, 10, test2Id, "B", sol::make_object(mLua.sol(), 4));
+        scripts.setupSerializableTimer(TimeUnit::SECONDS, 5, test1Id, "A", sol::make_object(mLua.sol(), 1));
+        scripts.setupSerializableTimer(TimeUnit::HOURS, 5, test2Id, "A", sol::make_object(mLua.sol(), 2));
+        scripts.setupSerializableTimer(TimeUnit::SECONDS, 15, test1Id, "A", sol::make_object(mLua.sol(), 10));
+        scripts.setupSerializableTimer(TimeUnit::SECONDS, 15, test1Id, "B", sol::make_object(mLua.sol(), 20));
 
-        scripts.setupUnsavableTimer(TimeUnit::SECONDS, 10, "test2.lua", fn2);
-        scripts.setupUnsavableTimer(TimeUnit::HOURS, 10, "test1.lua", fn2);
-        scripts.setupUnsavableTimer(TimeUnit::SECONDS, 5, "test2.lua", fn1);
-        scripts.setupUnsavableTimer(TimeUnit::HOURS, 5, "test1.lua", fn1);
-        scripts.setupUnsavableTimer(TimeUnit::SECONDS, 15, "test2.lua", fn1);
+        scripts.setupUnsavableTimer(TimeUnit::SECONDS, 10, test2Id, fn2);
+        scripts.setupUnsavableTimer(TimeUnit::HOURS, 10, test1Id, fn2);
+        scripts.setupUnsavableTimer(TimeUnit::SECONDS, 5, test2Id, fn1);
+        scripts.setupUnsavableTimer(TimeUnit::HOURS, 5, test1Id, fn1);
+        scripts.setupUnsavableTimer(TimeUnit::SECONDS, 15, test2Id, fn1);
 
         EXPECT_EQ(counter1, 0);
         EXPECT_EQ(counter3, 0);
@@ -358,10 +423,12 @@ return {
         EXPECT_EQ(counter3, 5);
         EXPECT_EQ(counter4, 5);
 
+        testing::internal::CaptureStdout();
         ESM::LuaScripts data;
         scripts.save(data);
-        scripts.load(data, true);
-        scripts.registerTimerCallback("test1.lua", "B", fn4);
+        scripts.load(data);
+        scripts.registerTimerCallback(test1Id, "B", fn4);
+        EXPECT_EQ(internal::GetCapturedStdout(), "Test[test1.lua]:\tload\nTest[test2.lua]:\tload\n");
 
         testing::internal::CaptureStdout();
         scripts.processTimers(20, 20);
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 7e1abe0a4e..a3f77d86bf 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -29,7 +29,7 @@ endif (GIT_CHECKOUT)
 # source files
 
 add_component_dir (lua
-    luastate scriptscontainer utilpackage serialization omwscriptsparser
+    luastate scriptscontainer utilpackage serialization configuration
     )
 
 add_component_dir (settings
diff --git a/components/lua/luastate.cpp b/components/lua/luastate.cpp
index 8e4719dba4..e78f7bed06 100644
--- a/components/lua/luastate.cpp
+++ b/components/lua/luastate.cpp
@@ -22,7 +22,7 @@ namespace LuaUtil
         "type", "unpack", "xpcall", "rawequal", "rawget", "rawset", "getmetatable", "setmetatable"};
     static const std::string safePackages[] = {"coroutine", "math", "string", "table"};
 
-    LuaState::LuaState(const VFS::Manager* vfs) : mVFS(vfs)
+    LuaState::LuaState(const VFS::Manager* vfs, const ScriptsConfiguration* conf) : mConf(conf), mVFS(vfs)
     {
         mLua.open_libraries(sol::lib::base, sol::lib::coroutine, sol::lib::math,
                             sol::lib::string, sol::lib::table, sol::lib::debug);
@@ -95,12 +95,11 @@ namespace LuaUtil
         return res;
     }
 
-    void LuaState::addCommonPackage(const std::string& packageName, const sol::object& package)
+    void LuaState::addCommonPackage(std::string packageName, sol::object package)
     {
-        if (package.is<sol::function>())
-            mCommonPackages[packageName] = package;
-        else
-            mCommonPackages[packageName] = makeReadOnly(package);
+        if (!package.is<sol::function>())
+            package = makeReadOnly(std::move(package));
+        mCommonPackages.emplace(std::move(packageName), std::move(package));
     }
 
     sol::protected_function_result LuaState::runInNewSandbox(
@@ -148,7 +147,7 @@ namespace LuaUtil
             return std::move(res);
     }
 
-    sol::protected_function LuaState::loadScript(const std::string& path)
+    sol::function LuaState::loadScript(const std::string& path)
     {
         auto iter = mCompiledScripts.find(path);
         if (iter != mCompiledScripts.end())
diff --git a/components/lua/luastate.hpp b/components/lua/luastate.hpp
index 8982b49b36..7ac5af0b1b 100644
--- a/components/lua/luastate.hpp
+++ b/components/lua/luastate.hpp
@@ -7,6 +7,8 @@
 
 #include <components/vfs/manager.hpp>
 
+#include "configuration.hpp"
+
 namespace LuaUtil
 {
 
@@ -22,12 +24,12 @@ namespace LuaUtil
     //   - Access to common read-only resources from different sandboxes;
     //   - Replace standard `require` with a safe version that allows to search
     //         Lua libraries (only source, no dll's) in the virtual filesystem;
-    //   - Make `print` to add the script name to the every message and
-    //         write to Log rather than directly to stdout;
+    //   - Make `print` to add the script name to every message and
+    //         write to the Log rather than directly to stdout;
     class LuaState
     {
     public:
-        explicit LuaState(const VFS::Manager* vfs);
+        explicit LuaState(const VFS::Manager* vfs, const ScriptsConfiguration* conf);
         ~LuaState();
 
         // Returns underlying sol::state.
@@ -40,7 +42,7 @@ namespace LuaUtil
         // The package can be either a sol::table with an API or a sol::function. If it is a function,
         // it will be evaluated (once per sandbox) the first time when requested. If the package
         // is a table, then `makeReadOnly` is applied to it automatically (but not to other tables it contains).
-        void addCommonPackage(const std::string& packageName, const sol::object& package);
+        void addCommonPackage(std::string packageName, sol::object package);
 
         // Creates a new sandbox, runs a script, and returns the result
         // (the result is expected to be an interface of the script).
@@ -58,14 +60,17 @@ namespace LuaUtil
 
         void dropScriptCache() { mCompiledScripts.clear(); }
 
+        const ScriptsConfiguration& getConfiguration() const { return *mConf; }
+
     private:
         static sol::protected_function_result throwIfError(sol::protected_function_result&&);
         template <typename... Args>
-        friend sol::protected_function_result call(sol::protected_function fn, Args&&... args);
+        friend sol::protected_function_result call(const sol::protected_function& fn, Args&&... args);
 
-        sol::protected_function loadScript(const std::string& path);
+        sol::function loadScript(const std::string& path);
 
         sol::state mLua;
+        const ScriptsConfiguration* mConf;
         sol::table mSandboxEnv;
         std::map<std::string, sol::bytecode> mCompiledScripts;
         std::map<std::string, sol::object> mCommonPackages;
@@ -75,7 +80,7 @@ namespace LuaUtil
     // Should be used for every call of every Lua function.
     // It is a workaround for a bug in `sol`. See https://github.com/ThePhD/sol2/issues/1078
     template <typename... Args>
-    sol::protected_function_result call(sol::protected_function fn, Args&&... args)
+    sol::protected_function_result call(const sol::protected_function& fn, Args&&... args)
     {
         try
         {
@@ -101,7 +106,7 @@ namespace LuaUtil
     std::string toString(const sol::object&);
 
     // Makes a table read only (when accessed from Lua) by wrapping it with an empty userdata.
-    // Needed to forbid any changes in common resources that can accessed from different sandboxes.
+    // Needed to forbid any changes in common resources that can be accessed from different sandboxes.
     sol::table makeReadOnly(sol::table);
     sol::table getMutableFromReadOnly(const sol::userdata&);
 
diff --git a/components/lua/omwscriptsparser.cpp b/components/lua/omwscriptsparser.cpp
deleted file mode 100644
index bc73e013db..0000000000
--- a/components/lua/omwscriptsparser.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-#include "omwscriptsparser.hpp"
-
-#include <algorithm>
-
-#include <components/debug/debuglog.hpp>
-
-std::vector<std::string> LuaUtil::parseOMWScriptsFiles(const VFS::Manager* vfs, const std::vector<std::string>& scriptLists)
-{
-    auto endsWith = [](std::string_view s, std::string_view suffix)
-    {
-        return s.size() >= suffix.size() && std::equal(suffix.rbegin(), suffix.rend(), s.rbegin());
-    };
-    std::vector<std::string> res;
-    for (const std::string& scriptListFile : scriptLists)
-    {
-        if (!endsWith(scriptListFile, ".omwscripts"))
-        {
-            Log(Debug::Error) << "Script list should have suffix '.omwscripts', got: '" << scriptListFile << "'";
-            continue;
-        }
-        std::string content(std::istreambuf_iterator<char>(*vfs->get(scriptListFile)), {});
-        std::string_view view(content);
-        while (!view.empty())
-        {
-            size_t pos = 0;
-            while (pos < view.size() && view[pos] != '\n')
-                pos++;
-            std::string_view line = view.substr(0, pos);
-            view = view.substr(std::min(pos + 1, view.size()));
-            if (!line.empty() && line.back() == '\r')
-                line = line.substr(0, pos - 1);
-            // Lines starting with '#' are comments.
-            // TODO: Maybe make the parser more robust. It is a bit inconsistent that 'path/#to/file.lua'
-            //       is a valid path, but '#path/to/file.lua' is considered as a comment and ignored.
-            if (line.empty() || line[0] == '#')
-                continue;
-            if (endsWith(line, ".lua"))
-                res.push_back(std::string(line));
-            else
-                Log(Debug::Error) << "Lua script should have suffix '.lua', got: '" << line.substr(0, 300) << "'";
-        }
-    }
-    return res;
-}
diff --git a/components/lua/omwscriptsparser.hpp b/components/lua/omwscriptsparser.hpp
deleted file mode 100644
index 1da9f123b2..0000000000
--- a/components/lua/omwscriptsparser.hpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef COMPONENTS_LUA_OMWSCRIPTSPARSER_H
-#define COMPONENTS_LUA_OMWSCRIPTSPARSER_H
-
-#include <components/vfs/manager.hpp>
-
-namespace LuaUtil
-{
-
-    // Parses list of `*.omwscripts` files.
-    std::vector<std::string> parseOMWScriptsFiles(const VFS::Manager* vfs, const std::vector<std::string>& scriptLists);
-
-}
-
-#endif // COMPONENTS_LUA_OMWSCRIPTSPARSER_H
diff --git a/components/lua/scriptscontainer.cpp b/components/lua/scriptscontainer.cpp
index 703381a453..f4922a8b6b 100644
--- a/components/lua/scriptscontainer.cpp
+++ b/components/lua/scriptscontainer.cpp
@@ -10,8 +10,10 @@ namespace LuaUtil
     static constexpr std::string_view INTERFACE_NAME = "interfaceName";
     static constexpr std::string_view INTERFACE = "interface";
 
+    static constexpr std::string_view HANDLER_INIT = "onInit";
     static constexpr std::string_view HANDLER_SAVE = "onSave";
     static constexpr std::string_view HANDLER_LOAD = "onLoad";
+    static constexpr std::string_view HANDLER_INTERFACE_OVERRIDE = "onInterfaceOverride";
 
     static constexpr std::string_view REGISTERED_TIMER_CALLBACKS = "_timers";
     static constexpr std::string_view TEMPORARY_TIMER_CALLBACKS = "_temp_timers";
@@ -25,147 +27,238 @@ namespace LuaUtil
         return res;
     }
 
-    ScriptsContainer::ScriptsContainer(LuaUtil::LuaState* lua, std::string_view namePrefix) : mNamePrefix(namePrefix), mLua(*lua)
+    ScriptsContainer::ScriptsContainer(LuaUtil::LuaState* lua, std::string_view namePrefix, ESM::LuaScriptCfg::Flags autoStartMode)
+        : mNamePrefix(namePrefix), mLua(*lua), mAutoStartMode(autoStartMode)
     {
         registerEngineHandlers({&mUpdateHandlers});
         mPublicInterfaces = sol::table(lua->sol(), sol::create);
         addPackage("openmw.interfaces", mPublicInterfaces);
     }
 
-    void ScriptsContainer::addPackage(const std::string& packageName, sol::object package)
+    void ScriptsContainer::printError(int scriptId, std::string_view msg, const std::exception& e)
     {
-        API[packageName] = makeReadOnly(std::move(package));
+        Log(Debug::Error) << mNamePrefix << "[" << scriptPath(scriptId) << "] " << msg << ": " << e.what();
     }
 
-    bool ScriptsContainer::addNewScript(const std::string& path)
+    void ScriptsContainer::addPackage(std::string packageName, sol::object package)
     {
-        if (mScripts.count(path) != 0)
+        mAPI.emplace(std::move(packageName), makeReadOnly(std::move(package)));
+    }
+
+    bool ScriptsContainer::addCustomScript(int scriptId)
+    {
+        assert(mLua.getConfiguration()[scriptId].mFlags & ESM::LuaScriptCfg::sCustom);
+        std::optional<sol::function> onInit, onLoad;
+        bool ok = addScript(scriptId, onInit, onLoad);
+        if (ok && onInit)
+            callOnInit(scriptId, *onInit);
+        return ok;
+    }
+
+    void ScriptsContainer::addAutoStartedScripts()
+    {
+        for (int scriptId : mLua.getConfiguration().getListByFlag(mAutoStartMode))
+        {
+            std::optional<sol::function> onInit, onLoad;
+            bool ok = addScript(scriptId, onInit, onLoad);
+            if (ok && onInit)
+                callOnInit(scriptId, *onInit);
+        }
+    }
+
+    bool ScriptsContainer::addScript(int scriptId, std::optional<sol::function>& onInit, std::optional<sol::function>& onLoad)
+    {
+        assert(scriptId >= 0 && scriptId < static_cast<int>(mLua.getConfiguration().size()));
+        if (mScripts.count(scriptId) != 0)
             return false;  // already present
 
+        const std::string& path = scriptPath(scriptId);
         try
         {
-            sol::table hiddenData(mLua.sol(), sol::create);
-            hiddenData[ScriptId::KEY] = ScriptId{this, path};
-            hiddenData[REGISTERED_TIMER_CALLBACKS] = mLua.newTable();
-            hiddenData[TEMPORARY_TIMER_CALLBACKS] = mLua.newTable();
-            mScripts[path].mHiddenData = hiddenData;
-            sol::object script = mLua.runInNewSandbox(path, mNamePrefix, API, hiddenData);
-            std::string interfaceName = "";
-            sol::object publicInterface = sol::nil;
-            if (script != sol::nil)
+            Script& script = mScripts[scriptId];
+            script.mHiddenData = mLua.newTable();
+            script.mHiddenData[ScriptId::KEY] = ScriptId{this, scriptId, path};
+            script.mHiddenData[REGISTERED_TIMER_CALLBACKS] = mLua.newTable();
+            script.mHiddenData[TEMPORARY_TIMER_CALLBACKS] = mLua.newTable();
+            sol::object scriptOutput = mLua.runInNewSandbox(path, mNamePrefix, mAPI, script.mHiddenData);
+            if (scriptOutput == sol::nil)
+                return true;
+            sol::object engineHandlers = sol::nil, eventHandlers = sol::nil;
+            for (const auto& [key, value] : sol::table(scriptOutput))
             {
-                for (auto& [key, value] : sol::table(script))
+                std::string_view sectionName = key.as<std::string_view>();
+                if (sectionName == ENGINE_HANDLERS)
+                    engineHandlers = value;
+                else if (sectionName == EVENT_HANDLERS)
+                    eventHandlers = value;
+                else if (sectionName == INTERFACE_NAME)
+                    script.mInterfaceName = value.as<std::string>();
+                else if (sectionName == INTERFACE)
+                    script.mInterface = value.as<sol::table>();
+                else
+                    Log(Debug::Error) << "Not supported section '" << sectionName << "' in " << mNamePrefix << "[" << path << "]";
+            }
+            if (engineHandlers != sol::nil)
+            {
+                for (const auto& [key, fn] : sol::table(engineHandlers))
                 {
-                    std::string_view sectionName = key.as<std::string_view>();
-                    if (sectionName == ENGINE_HANDLERS)
-                        parseEngineHandlers(value, path);
-                    else if (sectionName == EVENT_HANDLERS)
-                        parseEventHandlers(value, path);
-                    else if (sectionName == INTERFACE_NAME)
-                        interfaceName = value.as<std::string>();
-                    else if (sectionName == INTERFACE)
-                        publicInterface = value.as<sol::table>();
+                    std::string_view handlerName = key.as<std::string_view>();
+                    if (handlerName == HANDLER_INIT)
+                        onInit = sol::function(fn);
+                    else if (handlerName == HANDLER_LOAD)
+                        onLoad = sol::function(fn);
+                    else if (handlerName == HANDLER_SAVE)
+                        script.mOnSave = sol::function(fn);
+                    else if (handlerName == HANDLER_INTERFACE_OVERRIDE)
+                        script.mOnOverride = sol::function(fn);
                     else
-                        Log(Debug::Error) << "Not supported section '" << sectionName << "' in " << mNamePrefix << "[" << path << "]";
+                    {
+                        auto it = mEngineHandlers.find(handlerName);
+                        if (it == mEngineHandlers.end())
+                            Log(Debug::Error) << "Not supported handler '" << handlerName
+                                              << "' in " << mNamePrefix << "[" << path << "]";
+                        else
+                            insertHandler(it->second->mList, scriptId, fn);
+                    }
                 }
             }
-            if (interfaceName.empty() != (publicInterface == sol::nil))
+            if (eventHandlers != sol::nil)
+            {
+                for (const auto& [key, fn] : sol::table(eventHandlers))
+                {
+                    std::string_view eventName = key.as<std::string_view>();
+                    auto it = mEventHandlers.find(eventName);
+                    if (it == mEventHandlers.end())
+                        it = mEventHandlers.emplace(std::string(eventName), EventHandlerList()).first;
+                    insertHandler(it->second, scriptId, fn);
+                }
+            }
+
+            if (script.mInterfaceName.empty() == script.mInterface.has_value())
+            {
                 Log(Debug::Error) << mNamePrefix << "[" << path << "]: 'interfaceName' should always be used together with 'interface'";
-            else if (!interfaceName.empty())
-                script.as<sol::table>()[INTERFACE] = mPublicInterfaces[interfaceName] = makeReadOnly(publicInterface);
-            mScriptOrder.push_back(path);
-            mScripts[path].mInterface = std::move(script);
+                script.mInterfaceName.clear();
+                script.mInterface = sol::nil;
+            }
+            else if (script.mInterface)
+            {
+                script.mInterface = makeReadOnly(*script.mInterface);
+                insertInterface(scriptId, script);
+            }
+
             return true;
         }
         catch (std::exception& e)
         {
-            mScripts.erase(path);
+            mScripts.erase(scriptId);
             Log(Debug::Error) << "Can't start " << mNamePrefix << "[" << path << "]; " << e.what();
             return false;
         }
     }
 
-    bool ScriptsContainer::removeScript(const std::string& path)
+    void ScriptsContainer::removeScript(int scriptId)
     {
-        auto scriptIter = mScripts.find(path);
+        auto scriptIter = mScripts.find(scriptId);
         if (scriptIter == mScripts.end())
-            return false;  // no such script
-        scriptIter->second.mHiddenData[ScriptId::KEY] = sol::nil;
-        sol::object& script = scriptIter->second.mInterface;
-        if (getFieldOrNil(script, INTERFACE_NAME) != sol::nil)
+            return;  // no such script
+        Script& script = scriptIter->second;
+        if (script.mInterface)
+            removeInterface(scriptId, script);
+        script.mHiddenData[ScriptId::KEY] = sol::nil;
+        mScripts.erase(scriptIter);
+        for (auto& [_, handlers] : mEngineHandlers)
+            removeHandler(handlers->mList, scriptId);
+        for (auto& [_, handlers] : mEventHandlers)
+            removeHandler(handlers, scriptId);
+    }
+
+    void ScriptsContainer::insertInterface(int scriptId, const Script& script)
+    {
+        assert(script.mInterface);
+        const Script* prev = nullptr;
+        const Script* next = nullptr;
+        int nextId = 0;
+        for (const auto& [otherId, otherScript] : mScripts)
         {
-            std::string_view interfaceName = getFieldOrNil(script, INTERFACE_NAME).as<std::string_view>();
-            if (mPublicInterfaces[interfaceName] == getFieldOrNil(script, INTERFACE))
+            if (scriptId == otherId || script.mInterfaceName != otherScript.mInterfaceName)
+                continue;
+            if (otherId < scriptId)
+                prev = &otherScript;
+            else
             {
-                mPublicInterfaces[interfaceName] = sol::nil;
-                auto prevIt = mScriptOrder.rbegin();
-                while (*prevIt != path)
-                    prevIt++;
-                prevIt++;
-                while (prevIt != mScriptOrder.rend())
-                {
-                    sol::object& prevScript = mScripts[*(prevIt++)].mInterface;
-                    sol::object prevInterfaceName = getFieldOrNil(prevScript, INTERFACE_NAME);
-                    if (prevInterfaceName != sol::nil && prevInterfaceName.as<std::string_view>() == interfaceName)
-                    {
-                        mPublicInterfaces[interfaceName] = getFieldOrNil(prevScript, INTERFACE);
-                        break;
-                    }
-                }
+                next = &otherScript;
+                nextId = otherId;
+                break;
             }
         }
-        sol::object engineHandlers = getFieldOrNil(script, ENGINE_HANDLERS);
-        if (engineHandlers != sol::nil)
+        if (prev && script.mOnOverride)
+        {
+            try { LuaUtil::call(*script.mOnOverride, *prev->mInterface); }
+            catch (std::exception& e) { printError(scriptId, "onInterfaceOverride failed", e); }
+        }
+        if (next && next->mOnOverride)
         {
-            for (auto& [key, value] : sol::table(engineHandlers))
+            try { LuaUtil::call(*next->mOnOverride, *script.mInterface); }
+            catch (std::exception& e) { printError(nextId, "onInterfaceOverride failed", e); }
+        }
+        if (next == nullptr)
+            mPublicInterfaces[script.mInterfaceName] = *script.mInterface;
+    }
+
+    void ScriptsContainer::removeInterface(int scriptId, const Script& script)
+    {
+        assert(script.mInterface);
+        const Script* prev = nullptr;
+        const Script* next = nullptr;
+        int nextId = 0;
+        for (const auto& [otherId, otherScript] : mScripts)
+        {
+            if (scriptId == otherId || script.mInterfaceName != otherScript.mInterfaceName)
+                continue;
+            if (otherId < scriptId)
+                prev = &otherScript;
+            else
             {
-                std::string_view handlerName = key.as<std::string_view>();
-                auto handlerIter = mEngineHandlers.find(handlerName);
-                if (handlerIter == mEngineHandlers.end())
-                    continue;
-                std::vector<sol::protected_function>& list = handlerIter->second->mList;
-                list.erase(std::find(list.begin(), list.end(), value.as<sol::protected_function>()));
+                next = &otherScript;
+                nextId = otherId;
+                break;
             }
         }
-        sol::object eventHandlers = getFieldOrNil(script, EVENT_HANDLERS);
-        if (eventHandlers != sol::nil)
+        if (next)
         {
-            for (auto& [key, value] : sol::table(eventHandlers))
+            if (next->mOnOverride)
             {
-                EventHandlerList& list = mEventHandlers.find(key.as<std::string_view>())->second;
-                list.erase(std::find(list.begin(), list.end(), value.as<sol::protected_function>()));
+                sol::object prevInterface = sol::nil;
+                if (prev)
+                    prevInterface = *prev->mInterface;
+                try { LuaUtil::call(*next->mOnOverride, prevInterface); }
+                catch (std::exception& e) { printError(nextId, "onInterfaceOverride failed", e); }
             }
         }
-        mScripts.erase(scriptIter);
-        mScriptOrder.erase(std::find(mScriptOrder.begin(), mScriptOrder.end(), path));
-        return true;
+        else if (prev)
+            mPublicInterfaces[script.mInterfaceName] = *prev->mInterface;
+        else
+            mPublicInterfaces[script.mInterfaceName] = sol::nil;
     }
 
-    void ScriptsContainer::parseEventHandlers(sol::table handlers, std::string_view scriptPath)
+    void ScriptsContainer::insertHandler(std::vector<Handler>& list, int scriptId, sol::function fn)
     {
-        for (auto& [key, value] : handlers)
+        list.emplace_back();
+        int pos = list.size() - 1;
+        while (pos > 0 && list[pos - 1].mScriptId > scriptId)
         {
-            std::string_view eventName = key.as<std::string_view>();
-            auto it = mEventHandlers.find(eventName);
-            if (it == mEventHandlers.end())
-                it = mEventHandlers.insert({std::string(eventName), EventHandlerList()}).first;
-            it->second.push_back(value);
+            list[pos] = std::move(list[pos - 1]);
+            pos--;
         }
+        list[pos].mScriptId = scriptId;
+        list[pos].mFn = std::move(fn);
     }
 
-    void ScriptsContainer::parseEngineHandlers(sol::table handlers, std::string_view scriptPath)
+    void ScriptsContainer::removeHandler(std::vector<Handler>& list, int scriptId)
     {
-        for (auto& [key, value] : handlers)
-        {
-            std::string_view handlerName = key.as<std::string_view>();
-            if (handlerName == HANDLER_LOAD || handlerName == HANDLER_SAVE)
-                continue;  // save and load are handled separately
-            auto it = mEngineHandlers.find(handlerName);
-            if (it == mEngineHandlers.end())
-                Log(Debug::Error) << "Not supported handler '" << handlerName << "' in " << mNamePrefix << "[" << scriptPath << "]";
-            else
-                it->second->mList.push_back(value);
-        }
+        list.erase(std::remove_if(list.begin(), list.end(),
+                                  [scriptId](const Handler& h){ return h.mScriptId == scriptId; }),
+                   list.end());
     }
 
     void ScriptsContainer::receiveEvent(std::string_view eventName, std::string_view eventData)
@@ -191,13 +284,14 @@ namespace LuaUtil
         {
             try
             {
-                sol::object res = LuaUtil::call(list[i], data);
+                sol::object res = LuaUtil::call(list[i].mFn, data);
                 if (res != sol::nil && !res.as<bool>())
                     break;  // Skip other handlers if 'false' was returned.
             }
             catch (std::exception& e)
             {
-                Log(Debug::Error) << mNamePrefix << " eventHandler[" << eventName << "] failed. " << e.what();
+                Log(Debug::Error) << mNamePrefix << "[" << scriptPath(list[i].mScriptId)
+                                  << "] eventHandler[" << eventName << "] failed. " << e.what();
             }
         }
     }
@@ -208,9 +302,19 @@ namespace LuaUtil
             mEngineHandlers[h->mName] = h;
     }
 
+    void ScriptsContainer::callOnInit(int scriptId, const sol::function& onInit)
+    {
+        try
+        {
+            const std::string& data = mLua.getConfiguration()[scriptId].mInitializationData;
+            LuaUtil::call(onInit, deserialize(mLua.sol(), data, mSerializer));
+        }
+        catch (std::exception& e) { printError(scriptId, "onInit failed", e); }
+    }
+
     void ScriptsContainer::save(ESM::LuaScripts& data)
     {
-        std::map<std::string, std::vector<ESM::LuaTimer>> timers;
+        std::map<int, std::vector<ESM::LuaTimer>> timers;
         auto saveTimerFn = [&](const Timer& timer, TimeUnit timeUnit)
         {
             if (!timer.mSerializable)
@@ -220,78 +324,85 @@ namespace LuaUtil
             savedTimer.mUnit = timeUnit;
             savedTimer.mCallbackName = std::get<std::string>(timer.mCallback);
             savedTimer.mCallbackArgument = timer.mSerializedArg;
-            if (timers.count(timer.mScript) == 0)
-                timers[timer.mScript] = {};
-            timers[timer.mScript].push_back(std::move(savedTimer));
+            timers[timer.mScriptId].push_back(std::move(savedTimer));
         };
         for (const Timer& timer : mSecondsTimersQueue)
             saveTimerFn(timer, TimeUnit::SECONDS);
         for (const Timer& timer : mHoursTimersQueue)
             saveTimerFn(timer, TimeUnit::HOURS);
         data.mScripts.clear();
-        for (const std::string& path : mScriptOrder)
+        for (auto& [scriptId, script] : mScripts)
         {
             ESM::LuaScript savedScript;
-            savedScript.mScriptPath = path;
-            sol::object handler = getFieldOrNil(mScripts[path].mInterface, ENGINE_HANDLERS, HANDLER_SAVE);
-            if (handler != sol::nil)
+            savedScript.mScriptPath = script.mHiddenData.get<ScriptId>(ScriptId::KEY).mPath;
+            if (script.mOnSave)
             {
                 try
                 {
-                    sol::object state = LuaUtil::call(handler);
+                    sol::object state = LuaUtil::call(*script.mOnSave);
                     savedScript.mData = serialize(state, mSerializer);
                 }
-                catch (std::exception& e)
-                {
-                    Log(Debug::Error) << mNamePrefix << "[" << path << "] onSave failed: " << e.what();
-                }
+                catch (std::exception& e) { printError(scriptId, "onSave failed", e); }
             }
-            auto timersIt = timers.find(path);
+            auto timersIt = timers.find(scriptId);
             if (timersIt != timers.end())
                 savedScript.mTimers = std::move(timersIt->second);
             data.mScripts.push_back(std::move(savedScript));
         }
     }
 
-    void ScriptsContainer::load(const ESM::LuaScripts& data, bool resetScriptList)
+    void ScriptsContainer::load(const ESM::LuaScripts& data)
     {
-        std::map<std::string, Script> scriptsWithoutSavedData;
-        if (resetScriptList)
+        removeAllScripts();
+        const ScriptsConfiguration& cfg = mLua.getConfiguration();
+
+        std::map<int, const ESM::LuaScript*> scripts;
+        for (int scriptId : mLua.getConfiguration().getListByFlag(mAutoStartMode))
+            scripts[scriptId] = nullptr;
+        for (const ESM::LuaScript& s : data.mScripts)
         {
-            removeAllScripts();
-            for (const ESM::LuaScript& script : data.mScripts)
-                addNewScript(script.mScriptPath);
+            std::optional<int> scriptId = cfg.findId(s.mScriptPath);
+            if (!scriptId)
+            {
+                Log(Debug::Verbose) << "Ignoring " << mNamePrefix << "[" << s.mScriptPath << "]; script not registered";
+                continue;
+            }
+            if (!(cfg[*scriptId].mFlags & (ESM::LuaScriptCfg::sCustom | mAutoStartMode)))
+            {
+                Log(Debug::Verbose) << "Ignoring " << mNamePrefix << "[" << s.mScriptPath << "]; this script is not allowed here";
+                continue;
+            }
+            scripts[*scriptId] = &s;
         }
-        else
-            scriptsWithoutSavedData = mScripts;
-        mSecondsTimersQueue.clear();
-        mHoursTimersQueue.clear();
-        for (const ESM::LuaScript& script : data.mScripts)
+
+        for (const auto& [scriptId, savedScript] : scripts)
         {
-            auto iter = mScripts.find(script.mScriptPath);
-            if (iter == mScripts.end())
+            std::optional<sol::function> onInit, onLoad;
+            if (!addScript(scriptId, onInit, onLoad))
                 continue;
-            scriptsWithoutSavedData.erase(iter->first);
-            iter->second.mHiddenData.get<sol::table>(TEMPORARY_TIMER_CALLBACKS).clear();
-            try
+            if (savedScript == nullptr)
             {
-                sol::object handler = getFieldOrNil(iter->second.mInterface, ENGINE_HANDLERS, HANDLER_LOAD);
-                if (handler != sol::nil)
-                {
-                    sol::object state = deserialize(mLua.sol(), script.mData, mSerializer);
-                    LuaUtil::call(handler, state);
-                }
+                if (onInit)
+                    callOnInit(scriptId, *onInit);
+                continue;
             }
-            catch (std::exception& e)
+            if (onLoad)
             {
-                Log(Debug::Error) << mNamePrefix << "[" << script.mScriptPath << "] onLoad failed: " << e.what();
+                try
+                {
+                    sol::object state = deserialize(mLua.sol(), savedScript->mData, mSerializer);
+                    sol::object initializationData =
+                        deserialize(mLua.sol(), mLua.getConfiguration()[scriptId].mInitializationData, mSerializer);
+                    LuaUtil::call(*onLoad, state, initializationData);
+                }
+                catch (std::exception& e) { printError(scriptId, "onLoad failed", e); }
             }
-            for (const ESM::LuaTimer& savedTimer : script.mTimers)
+            for (const ESM::LuaTimer& savedTimer : savedScript->mTimers)
             {
                 Timer timer;
                 timer.mCallback = savedTimer.mCallbackName;
                 timer.mSerializable = true;
-                timer.mScript = script.mScriptPath;
+                timer.mScriptId = scriptId;
                 timer.mTime = savedTimer.mTime;
 
                 try
@@ -306,24 +417,10 @@ namespace LuaUtil
                     else
                         mSecondsTimersQueue.push_back(std::move(timer));
                 }
-                catch (std::exception& e)
-                {
-                    Log(Debug::Error) << mNamePrefix << "[" << script.mScriptPath << "] can not load timer: " << e.what();
-                }
-            }
-        }
-        for (auto& [path, script] : scriptsWithoutSavedData)
-        {
-            script.mHiddenData.get<sol::table>(TEMPORARY_TIMER_CALLBACKS).clear();
-            sol::object handler = getFieldOrNil(script.mInterface, ENGINE_HANDLERS, HANDLER_LOAD);
-            if (handler == sol::nil)
-                continue;
-            try { LuaUtil::call(handler); }
-            catch (std::exception& e)
-            {
-                Log(Debug::Error) << mNamePrefix << "[" << path << "] onLoad failed: " << e.what();
+                catch (std::exception& e) { printError(scriptId, "can not load timer", e); }
             }
         }
+
         std::make_heap(mSecondsTimersQueue.begin(), mSecondsTimersQueue.end());
         std::make_heap(mHoursTimersQueue.begin(), mHoursTimersQueue.end());
     }
@@ -334,12 +431,13 @@ namespace LuaUtil
             script.mHiddenData[ScriptId::KEY] = sol::nil;
     }
 
+    // Note: shouldn't be called from destructor because mEngineHandlers has pointers on
+    // external objects that are already removed during child class destruction.
     void ScriptsContainer::removeAllScripts()
     {
         for (auto& [_, script] : mScripts)
             script.mHiddenData[ScriptId::KEY] = sol::nil;
         mScripts.clear();
-        mScriptOrder.clear();
         for (auto& [_, handlers] : mEngineHandlers)
             handlers->mList.clear();
         mEventHandlers.clear();
@@ -351,17 +449,17 @@ namespace LuaUtil
         mPublicInterfaces[sol::meta_function::index] = mPublicInterfaces;
     }
 
-    sol::table ScriptsContainer::getHiddenData(const std::string& scriptPath)
+    sol::table ScriptsContainer::getHiddenData(int scriptId)
     {
-        auto it = mScripts.find(scriptPath);
+        auto it = mScripts.find(scriptId);
         if (it == mScripts.end())
             throw std::logic_error("ScriptsContainer::getHiddenData: script doesn't exist");
         return it->second.mHiddenData;
     }
 
-    void ScriptsContainer::registerTimerCallback(const std::string& scriptPath, std::string_view callbackName, sol::function callback)
+    void ScriptsContainer::registerTimerCallback(int scriptId, std::string_view callbackName, sol::function callback)
     {
-        getHiddenData(scriptPath)[REGISTERED_TIMER_CALLBACKS][callbackName] = std::move(callback);
+        getHiddenData(scriptId)[REGISTERED_TIMER_CALLBACKS][callbackName] = std::move(callback);
     }
 
     void ScriptsContainer::insertTimer(std::vector<Timer>& timerQueue, Timer&& t)
@@ -370,12 +468,12 @@ namespace LuaUtil
         std::push_heap(timerQueue.begin(), timerQueue.end());
     }
 
-    void ScriptsContainer::setupSerializableTimer(TimeUnit timeUnit, double time, const std::string& scriptPath,
+    void ScriptsContainer::setupSerializableTimer(TimeUnit timeUnit, double time, int scriptId,
                                                   std::string_view callbackName, sol::object callbackArg)
     {
         Timer t;
         t.mCallback = std::string(callbackName);
-        t.mScript = scriptPath;
+        t.mScriptId = scriptId;
         t.mSerializable = true;
         t.mTime = time;
         t.mArg = callbackArg;
@@ -383,15 +481,15 @@ namespace LuaUtil
         insertTimer(timeUnit == TimeUnit::HOURS ? mHoursTimersQueue : mSecondsTimersQueue, std::move(t));
     }
 
-    void ScriptsContainer::setupUnsavableTimer(TimeUnit timeUnit, double time, const std::string& scriptPath, sol::function callback)
+    void ScriptsContainer::setupUnsavableTimer(TimeUnit timeUnit, double time, int scriptId, sol::function callback)
     {
         Timer t;
-        t.mScript = scriptPath;
+        t.mScriptId = scriptId;
         t.mSerializable = false;
         t.mTime = time;
 
         t.mCallback = mTemporaryCallbackCounter;
-        getHiddenData(scriptPath)[TEMPORARY_TIMER_CALLBACKS][mTemporaryCallbackCounter] = std::move(callback);
+        getHiddenData(scriptId)[TEMPORARY_TIMER_CALLBACKS][mTemporaryCallbackCounter] = std::move(callback);
         mTemporaryCallbackCounter++;
 
         insertTimer(timeUnit == TimeUnit::HOURS ? mHoursTimersQueue : mSecondsTimersQueue, std::move(t));
@@ -401,7 +499,7 @@ namespace LuaUtil
     {
         try
         {
-            sol::table data = getHiddenData(t.mScript);
+            sol::table data = getHiddenData(t.mScriptId);
             if (t.mSerializable)
             {
                 const std::string& callbackName = std::get<std::string>(t.mCallback);
@@ -421,10 +519,7 @@ namespace LuaUtil
                 callbacks[id] = sol::nil;
             }
         }
-        catch (std::exception& e)
-        {
-            Log(Debug::Error) << mNamePrefix << "[" << t.mScript << "] callTimer failed: " << e.what();
-        }
+        catch (std::exception& e) { printError(t.mScriptId, "callTimer failed", e); }
     }
 
     void ScriptsContainer::updateTimerQueue(std::vector<Timer>& timerQueue, double time)
diff --git a/components/lua/scriptscontainer.hpp b/components/lua/scriptscontainer.hpp
index 69aa18e940..184072eef1 100644
--- a/components/lua/scriptscontainer.hpp
+++ b/components/lua/scriptscontainer.hpp
@@ -17,7 +17,7 @@ namespace LuaUtil
 // ScriptsContainer is a base class for all scripts containers (LocalScripts,
 // GlobalScripts, PlayerScripts, etc). Each script runs in a separate sandbox.
 // Scripts from different containers can interact to each other only via events.
-// Scripts within one container can interact via interfaces (not implemented yet).
+// Scripts within one container can interact via interfaces.
 // All scripts from one container have the same set of API packages available.
 //
 // Each script should return a table in a specific format that describes its
@@ -42,11 +42,12 @@ namespace LuaUtil
 //         -- An error is printed if unknown handler is specified.
 //         engineHandlers = {
 //             onUpdate = update,
+//             onInit = function(initData) ... end,  -- used when the script is just created (not loaded)
 //             onSave = function() return ... end,
-//             onLoad = function(state) ... end,  -- "state" is the data that was earlier returned by onSave
+//             onLoad = function(state, initData) ... end,  -- "state" is the data that was earlier returned by onSave
 //
-//             -- Works only if ScriptsContainer::registerEngineHandler is overloaded in a child class
-//             -- and explicitly supports 'onSomethingElse'
+//             -- Works only if a child class has passed a EngineHandlerList
+//             -- for 'onSomethingElse' to ScriptsContainer::registerEngineHandlers.
 //             onSomethingElse = function() print("something else") end
 //         },
 //
@@ -65,30 +66,36 @@ namespace LuaUtil
             constexpr static std::string_view KEY = "_id";
 
             ScriptsContainer* mContainer;
-            std::string mPath;
+            int mIndex;  // index in LuaUtil::ScriptsConfiguration
+            std::string mPath;  // path to the script source in VFS
 
             std::string toString() const;
         };
         using TimeUnit = ESM::LuaTimer::TimeUnit;
 
         // `namePrefix` is a common prefix for all scripts in the container. Used in logs for error messages and `print` output.
-        ScriptsContainer(LuaUtil::LuaState* lua, std::string_view namePrefix);
+        // `autoStartMode` specifies the list of scripts that should be autostarted in this container; the list itself is
+        //     stored in ScriptsConfiguration: lua->getConfiguration().getListByFlag(autoStartMode).
+        ScriptsContainer(LuaState* lua, std::string_view namePrefix, ESM::LuaScriptCfg::Flags autoStartMode = 0);
+
         ScriptsContainer(const ScriptsContainer&) = delete;
         ScriptsContainer(ScriptsContainer&&) = delete;
         virtual ~ScriptsContainer();
 
+        ESM::LuaScriptCfg::Flags getAutoStartMode() const { return mAutoStartMode; }
+
         // Adds package that will be available (via `require`) for all scripts in the container.
         // Automatically applies LuaUtil::makeReadOnly to the package.
-        void addPackage(const std::string& packageName, sol::object package);
+        void addPackage(std::string packageName, sol::object package);
 
-        // Finds a file with given path in the virtual file system, starts as a new script, and adds it to the container.
-        // Returns `true` if the script was successfully added. Otherwise prints an error message and returns `false`.
-        // `false` can be returned if either file not found or has syntax errors or such script already exists in the container.
-        bool addNewScript(const std::string& path);
+        // Gets script with given id from ScriptsConfiguration, finds the source in the virtual file system, starts as a new script,
+        // adds it to the container, and calls onInit for this script. Returns `true` if the script was successfully added.
+        // The script should have CUSTOM flag. If the flag is not set, or file not found, or has syntax errors, returns false.
+        // If such script already exists in the container, then also returns false.
+        bool addCustomScript(int scriptId);
 
-        // Removes script. Returns `true` if it was successfully removed.
-        bool removeScript(const std::string& path);
-        void removeAllScripts();
+        bool hasScript(int scriptId) const { return mScripts.count(scriptId) != 0; }
+        void removeScript(int scriptId);
 
         // Processes timers. gameSeconds and gameHours are time (in seconds and in game hours) passed from the game start.
         void processTimers(double gameSeconds, double gameHours);
@@ -107,22 +114,22 @@ namespace LuaUtil
         // only built-in types and types from util package can be serialized.
         void setSerializer(const UserdataSerializer* serializer) { mSerializer = serializer; }
 
+        // Starts scripts according to `autoStartMode` and calls `onInit` for them. Not needed if `load` is used.
+        void addAutoStartedScripts();
+
+        // Removes all scripts including the auto started.
+        void removeAllScripts();
+
         // Calls engineHandler "onSave" for every script and saves the list of the scripts with serialized data to ESM::LuaScripts.
         void save(ESM::LuaScripts&);
 
-        // Calls engineHandler "onLoad" for every script with given data.
-        // If resetScriptList=true, then removes all currently active scripts and runs the scripts that were saved in ESM::LuaScripts.
-        // If resetScriptList=false, then list of running scripts is not changed, only engineHandlers "onLoad" are called.
-        void load(const ESM::LuaScripts&, bool resetScriptList);
-
-        // Returns the hidden data of a script.
-        // Each script has a corresponding "hidden data" - a lua table that is not accessible from the script itself,
-        // but can be used by built-in packages. It contains ScriptId and can contain any arbitrary data.
-        sol::table getHiddenData(const std::string& scriptPath);
+        // Removes all scripts; starts scripts according to `autoStartMode` and
+        // loads the savedScripts. Runs "onLoad" for each script.
+        void load(const ESM::LuaScripts& savedScripts);
 
         // Callbacks for serializable timers should be registered in advance.
         // The script with the given path should already present in the container.
-        void registerTimerCallback(const std::string& scriptPath, std::string_view callbackName, sol::function callback);
+        void registerTimerCallback(int scriptId, std::string_view callbackName, sol::function callback);
 
         // Sets up a timer, that can be automatically saved and loaded.
         //   timeUnit - game seconds (TimeUnit::Seconds) or game hours (TimeUnit::Hours).
@@ -130,18 +137,24 @@ namespace LuaUtil
         //   scriptPath - script path in VFS is used as script id. The script with the given path should already present in the container.
         //   callbackName - callback (should be registered in advance) for this timer.
         //   callbackArg - parameter for the callback (should be serializable).
-        void setupSerializableTimer(TimeUnit timeUnit, double time, const std::string& scriptPath,
+        void setupSerializableTimer(TimeUnit timeUnit, double time, int scriptId,
                                     std::string_view callbackName, sol::object callbackArg);
 
         // Creates a timer. `callback` is an arbitrary Lua function. This type of timers is called "unsavable"
         // because it can not be stored in saves. I.e. loading a saved game will not fully restore the state.
-        void setupUnsavableTimer(TimeUnit timeUnit, double time, const std::string& scriptPath, sol::function callback);
+        void setupUnsavableTimer(TimeUnit timeUnit, double time, int scriptId, sol::function callback);
 
     protected:
+        struct Handler
+        {
+            int mScriptId;
+            sol::function mFn;
+        };
+
         struct EngineHandlerList
         {
             std::string_view mName;
-            std::vector<sol::protected_function> mList;
+            std::vector<Handler> mList;
 
             // "name" must be string literal
             explicit EngineHandlerList(std::string_view name) : mName(name) {}
@@ -151,12 +164,13 @@ namespace LuaUtil
         template <typename... Args>
         void callEngineHandlers(EngineHandlerList& handlers, const Args&... args)
         {
-            for (sol::protected_function& handler : handlers.mList)
+            for (Handler& handler : handlers.mList)
             {
-                try { LuaUtil::call(handler, args...); }
+                try { LuaUtil::call(handler.mFn, args...); }
                 catch (std::exception& e)
                 {
-                    Log(Debug::Error) << mNamePrefix << " " << handlers.mName << " failed. " << e.what();
+                    Log(Debug::Error) << mNamePrefix << "[" << scriptPath(handler.mScriptId) << "] "
+                                      << handlers.mName << " failed. " << e.what();
                 }
             }
         }
@@ -171,34 +185,49 @@ namespace LuaUtil
     private:
         struct Script
         {
-            sol::object mInterface;  // returned value of the script (sol::table or nil)
+            std::optional<sol::function> mOnSave;
+            std::optional<sol::function> mOnOverride;
+            std::optional<sol::table> mInterface;
+            std::string mInterfaceName;
             sol::table mHiddenData;
         };
         struct Timer
         {
             double mTime;
             bool mSerializable;
-            std::string mScript;
+            int mScriptId;
             std::variant<std::string, int64_t> mCallback;  // string if serializable, integer otherwise
             sol::object mArg;
             std::string mSerializedArg;
 
             bool operator<(const Timer& t) const { return mTime > t.mTime; }
         };
-        using EventHandlerList = std::vector<sol::protected_function>;
+        using EventHandlerList = std::vector<Handler>;
 
-        void parseEngineHandlers(sol::table handlers, std::string_view scriptPath);
-        void parseEventHandlers(sol::table handlers, std::string_view scriptPath);
+        // Add to container without calling onInit/onLoad.
+        bool addScript(int scriptId, std::optional<sol::function>& onInit, std::optional<sol::function>& onLoad);
+
+        // Returns the hidden data of a script.
+        // Each script has a corresponding "hidden data" - a lua table that is not accessible from the script itself,
+        // but can be used by built-in packages. It contains ScriptId and can contain any arbitrary data.
+        sol::table getHiddenData(int scriptId);
 
+        void printError(int scriptId, std::string_view msg, const std::exception& e);
+        const std::string& scriptPath(int scriptId) const { return mLua.getConfiguration()[scriptId].mScriptPath; }
+        void callOnInit(int scriptId, const sol::function& onInit);
         void callTimer(const Timer& t);
         void updateTimerQueue(std::vector<Timer>& timerQueue, double time);
         static void insertTimer(std::vector<Timer>& timerQueue, Timer&& t);
+        static void insertHandler(std::vector<Handler>& list, int scriptId, sol::function fn);
+        static void removeHandler(std::vector<Handler>& list, int scriptId);
+        void insertInterface(int scriptId, const Script& script);
+        void removeInterface(int scriptId, const Script& script);
 
+        ESM::LuaScriptCfg::Flags mAutoStartMode;
         const UserdataSerializer* mSerializer = nullptr;
-        std::map<std::string, sol::object> API;
+        std::map<std::string, sol::object> mAPI;
 
-        std::vector<std::string> mScriptOrder;
-        std::map<std::string, Script> mScripts;
+        std::map<int, Script> mScripts;
         sol::table mPublicInterfaces;
 
         EngineHandlerList mUpdateHandlers{"onUpdate"};

From 4ec7f0625e08dad96ff016894d865ca8050098a0 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 10 Oct 2021 22:44:50 +0200
Subject: [PATCH 1547/2859] Store Lua timers in std::map rather than in
 sol::table.

---
 components/lua/scriptscontainer.cpp | 31 ++++++++++-------------------
 components/lua/scriptscontainer.hpp |  8 ++++----
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/components/lua/scriptscontainer.cpp b/components/lua/scriptscontainer.cpp
index f4922a8b6b..c92116f1d9 100644
--- a/components/lua/scriptscontainer.cpp
+++ b/components/lua/scriptscontainer.cpp
@@ -15,9 +15,6 @@ namespace LuaUtil
     static constexpr std::string_view HANDLER_LOAD = "onLoad";
     static constexpr std::string_view HANDLER_INTERFACE_OVERRIDE = "onInterfaceOverride";
 
-    static constexpr std::string_view REGISTERED_TIMER_CALLBACKS = "_timers";
-    static constexpr std::string_view TEMPORARY_TIMER_CALLBACKS = "_temp_timers";
-
     std::string ScriptsContainer::ScriptId::toString() const
     {
         std::string res = mContainer->mNamePrefix;
@@ -78,8 +75,6 @@ namespace LuaUtil
             Script& script = mScripts[scriptId];
             script.mHiddenData = mLua.newTable();
             script.mHiddenData[ScriptId::KEY] = ScriptId{this, scriptId, path};
-            script.mHiddenData[REGISTERED_TIMER_CALLBACKS] = mLua.newTable();
-            script.mHiddenData[TEMPORARY_TIMER_CALLBACKS] = mLua.newTable();
             sol::object scriptOutput = mLua.runInNewSandbox(path, mNamePrefix, mAPI, script.mHiddenData);
             if (scriptOutput == sol::nil)
                 return true;
@@ -449,17 +444,17 @@ namespace LuaUtil
         mPublicInterfaces[sol::meta_function::index] = mPublicInterfaces;
     }
 
-    sol::table ScriptsContainer::getHiddenData(int scriptId)
+    ScriptsContainer::Script& ScriptsContainer::getScript(int scriptId)
     {
         auto it = mScripts.find(scriptId);
         if (it == mScripts.end())
-            throw std::logic_error("ScriptsContainer::getHiddenData: script doesn't exist");
-        return it->second.mHiddenData;
+            throw std::logic_error("Script doesn't exist");
+        return it->second;
     }
 
     void ScriptsContainer::registerTimerCallback(int scriptId, std::string_view callbackName, sol::function callback)
     {
-        getHiddenData(scriptId)[REGISTERED_TIMER_CALLBACKS][callbackName] = std::move(callback);
+        getScript(scriptId).mRegisteredCallbacks.emplace(std::string(callbackName), std::move(callback));
     }
 
     void ScriptsContainer::insertTimer(std::vector<Timer>& timerQueue, Timer&& t)
@@ -489,7 +484,7 @@ namespace LuaUtil
         t.mTime = time;
 
         t.mCallback = mTemporaryCallbackCounter;
-        getHiddenData(scriptId)[TEMPORARY_TIMER_CALLBACKS][mTemporaryCallbackCounter] = std::move(callback);
+        getScript(t.mScriptId).mTemporaryCallbacks.emplace(mTemporaryCallbackCounter, std::move(callback));
         mTemporaryCallbackCounter++;
 
         insertTimer(timeUnit == TimeUnit::HOURS ? mHoursTimersQueue : mSecondsTimersQueue, std::move(t));
@@ -499,24 +494,20 @@ namespace LuaUtil
     {
         try
         {
-            sol::table data = getHiddenData(t.mScriptId);
+            Script& script = getScript(t.mScriptId);
             if (t.mSerializable)
             {
                 const std::string& callbackName = std::get<std::string>(t.mCallback);
-                sol::object callback = data[REGISTERED_TIMER_CALLBACKS][callbackName];
-                if (!callback.is<sol::function>())
+                auto it = script.mRegisteredCallbacks.find(callbackName);
+                if (it == script.mRegisteredCallbacks.end())
                     throw std::logic_error("Callback '" + callbackName + "' doesn't exist");
-                LuaUtil::call(callback, t.mArg);
+                LuaUtil::call(it->second, t.mArg);
             }
             else
             {
                 int64_t id = std::get<int64_t>(t.mCallback);
-                sol::table callbacks = data[TEMPORARY_TIMER_CALLBACKS];
-                sol::object callback = callbacks[id];
-                if (!callback.is<sol::function>())
-                    throw std::logic_error("Temporary timer callback doesn't exist");
-                LuaUtil::call(callback);
-                callbacks[id] = sol::nil;
+                LuaUtil::call(script.mTemporaryCallbacks.at(id));
+                script.mTemporaryCallbacks.erase(id);
             }
         }
         catch (std::exception& e) { printError(t.mScriptId, "callTimer failed", e); }
diff --git a/components/lua/scriptscontainer.hpp b/components/lua/scriptscontainer.hpp
index 184072eef1..b25c69b5b4 100644
--- a/components/lua/scriptscontainer.hpp
+++ b/components/lua/scriptscontainer.hpp
@@ -190,6 +190,8 @@ namespace LuaUtil
             std::optional<sol::table> mInterface;
             std::string mInterfaceName;
             sol::table mHiddenData;
+            std::map<std::string, sol::function> mRegisteredCallbacks;
+            std::map<int64_t, sol::function> mTemporaryCallbacks;
         };
         struct Timer
         {
@@ -207,10 +209,8 @@ namespace LuaUtil
         // Add to container without calling onInit/onLoad.
         bool addScript(int scriptId, std::optional<sol::function>& onInit, std::optional<sol::function>& onLoad);
 
-        // Returns the hidden data of a script.
-        // Each script has a corresponding "hidden data" - a lua table that is not accessible from the script itself,
-        // but can be used by built-in packages. It contains ScriptId and can contain any arbitrary data.
-        sol::table getHiddenData(int scriptId);
+        // Returns script by id (throws an exception if doesn't exist)
+        Script& getScript(int scriptId);
 
         void printError(int scriptId, std::string_view msg, const std::exception& e);
         const std::string& scriptPath(int scriptId) const { return mLua.getConfiguration()[scriptId].mScriptPath; }

From 47c89567fbfe95ebba2f2c501d29baa37be71772 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 26 Sep 2021 15:21:46 +0200
Subject: [PATCH 1548/2859] Load LuaScriptsCfg from both *.omwscripts and
 *.omwaddon files.

---
 apps/openmw/engine.cpp                        |  7 +---
 apps/openmw/engine.hpp                        |  2 -
 apps/openmw/main.cpp                          |  8 ++--
 apps/openmw/mwlua/luamanagerimp.cpp           | 22 ++--------
 apps/openmw/mwlua/luamanagerimp.hpp           |  5 +--
 apps/openmw/mwworld/esmstore.cpp              | 42 ++++++++++++++++++-
 apps/openmw/mwworld/esmstore.hpp              | 10 +++++
 apps/openmw/mwworld/worldimp.cpp              | 14 +++++++
 apps/openmw/options.cpp                       |  5 +--
 apps/openmw_test_suite/mwworld/test_store.cpp |  6 ++-
 components/esm/defs.hpp                       |  1 +
 11 files changed, 81 insertions(+), 41 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index bbe4f25f69..bc31243ffc 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -495,11 +495,6 @@ void OMW::Engine::addGroundcoverFile(const std::string& file)
     mGroundcoverFiles.emplace_back(file);
 }
 
-void OMW::Engine::addLuaScriptListFile(const std::string& file)
-{
-    mLuaScriptListFiles.push_back(file);
-}
-
 void OMW::Engine::setSkipMenu (bool skipMenu, bool newGame)
 {
     mSkipMenu = skipMenu;
@@ -714,7 +709,7 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
 
     mViewer->addEventHandler(mScreenCaptureHandler);
 
-    mLuaManager = new MWLua::LuaManager(mVFS.get(), mLuaScriptListFiles);
+    mLuaManager = new MWLua::LuaManager(mVFS.get());
     mEnvironment.setLuaManager(mLuaManager);
 
     // Create input and UI first to set up a bootstrapping environment for
diff --git a/apps/openmw/engine.hpp b/apps/openmw/engine.hpp
index 290fd890a6..5fe032d27e 100644
--- a/apps/openmw/engine.hpp
+++ b/apps/openmw/engine.hpp
@@ -72,7 +72,6 @@ namespace OMW
             std::string mCellName;
             std::vector<std::string> mContentFiles;
             std::vector<std::string> mGroundcoverFiles;
-            std::vector<std::string> mLuaScriptListFiles;
             bool mSkipMenu;
             bool mUseSound;
             bool mCompileAll;
@@ -146,7 +145,6 @@ namespace OMW
              */
             void addContentFile(const std::string& file);
             void addGroundcoverFile(const std::string& file);
-            void addLuaScriptListFile(const std::string& file);
 
             /// Disable or enable all sounds
             void setSoundUsage(bool soundUsage);
diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index d1f9fd1787..1cf7abe2f2 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -124,9 +124,11 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
         engine.addGroundcoverFile(file);
     }
 
-    StringsVector luaScriptLists = variables["lua-scripts"].as<Files::EscapeStringVector>().toStdStringVector();
-    for (const auto& file : luaScriptLists)
-        engine.addLuaScriptListFile(file);
+    if (variables.count("lua-scripts"))
+    {
+        Log(Debug::Warning) << "Lua scripts have been specified via the old lua-scripts option and will not be loaded. "
+                               "Please update them to a version which uses the new omwscripts format.";
+    }
 
     // startup-settings
     engine.setCell(variables["start"].as<Files::EscapeHashString>().toStdString());
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 7a4b319f27..30866faf56 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -11,6 +11,7 @@
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/class.hpp"
+#include "../mwworld/esmstore.hpp"
 #include "../mwworld/ptr.hpp"
 
 #include "luabindings.hpp"
@@ -19,8 +20,7 @@
 namespace MWLua
 {
 
-    LuaManager::LuaManager(const VFS::Manager* vfs, std::vector<std::string> OMWScriptsFiles) :
-        mVFS(vfs), mOMWScriptsFiles(std::move(OMWScriptsFiles)), mLua(vfs, &mConfiguration)
+    LuaManager::LuaManager(const VFS::Manager* vfs) : mLua(vfs, &mConfiguration)
     {
         Log(Debug::Info) << "Lua version: " << LuaUtil::getLuaVersion();
 
@@ -34,23 +34,7 @@ namespace MWLua
 
     void LuaManager::initConfiguration()
     {
-        ESM::LuaScriptsCfg cfg;
-        for (const std::string& file : mOMWScriptsFiles)
-        {
-            if (!Misc::StringUtils::endsWith(file, ".omwscripts"))
-            {
-                Log(Debug::Error) << "Script list should have suffix '.omwscripts', got: '" << file << "'";
-                continue;
-            }
-            try
-            {
-                std::string content(std::istreambuf_iterator<char>(*mVFS->get(file)), {});
-                LuaUtil::parseOMWScripts(cfg, content);
-            }
-            catch (std::exception& e) { Log(Debug::Error) << e.what(); }
-        }
-        // TODO: Add data from content files
-        mConfiguration.init(cfg);
+        mConfiguration.init(MWBase::Environment::get().getWorld()->getStore().getLuaScriptsCfg());
         Log(Debug::Verbose) << "Lua scripts configuration (" << mConfiguration.size() << " scripts):";
         for (size_t i = 0; i < mConfiguration.size(); ++i)
             Log(Debug::Verbose) << "#" << i << " " << LuaUtil::scriptCfgToString(mConfiguration[i]);
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index be80cfe2e7..b9151de685 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -35,7 +35,7 @@ namespace MWLua
     class LuaManager : public MWBase::LuaManager
     {
     public:
-        LuaManager(const VFS::Manager* vfs, std::vector<std::string> OMWScriptsFiles);
+        LuaManager(const VFS::Manager* vfs);
 
         // Called by engine.cpp when the environment is fully initialized.
         void init();
@@ -97,9 +97,6 @@ namespace MWLua
         void initConfiguration();
         LocalScripts* createLocalScripts(const MWWorld::Ptr& ptr, ESM::LuaScriptCfg::Flags);
 
-        const VFS::Manager* mVFS;
-        const std::vector<std::string> mOMWScriptsFiles;
-
         bool mInitialized = false;
         bool mGlobalScriptsStarted = false;
         LuaUtil::ScriptsConfiguration mConfiguration;
diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index c5b0fff00f..66aba9139e 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -1,14 +1,16 @@
 #include "esmstore.hpp"
 
 #include <algorithm>
+#include <fstream>
 #include <set>
 
 #include <boost/filesystem/operations.hpp>
 
 #include <components/debug/debuglog.hpp>
-#include <components/loadinglistener/loadinglistener.hpp>
 #include <components/esm/esmreader.hpp>
 #include <components/esm/esmwriter.hpp>
+#include <components/loadinglistener/loadinglistener.hpp>
+#include <components/lua/configuration.hpp>
 #include <components/misc/algorithm.hpp>
 
 #include "../mwmechanics/spelllist.hpp"
@@ -166,7 +168,10 @@ void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener)
         std::string fname = mast.name;
         int index = ~0;
         for (int i = 0; i < esm.getIndex(); i++) {
-            const std::string candidate = allPlugins->at(i).getContext().filename;
+            ESM::ESMReader& reader = allPlugins->at(i);
+            if (reader.getFileSize() == 0)
+                continue;  // Content file in non-ESM format
+            const std::string candidate = reader.getContext().filename;
             std::string fnamecandidate = boost::filesystem::path(candidate).filename().string();
             if (Misc::StringUtils::ciEqual(fname, fnamecandidate)) {
                 index = i;
@@ -213,6 +218,13 @@ void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener)
                 // ignore project file only records
                 esm.skipRecord();
             }
+            else if (n.toInt() == ESM::REC_LUAL)
+            {
+                ESM::LuaScriptsCfg cfg;
+                cfg.load(esm);
+                // TODO: update refnums in cfg.mScripts[].mInitializationData according to load order
+                mLuaContent.push_back(std::move(cfg));
+            }
             else {
                 throw std::runtime_error("Unknown record: " + n.toString());
             }
@@ -234,6 +246,32 @@ void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener)
     }
 }
 
+ESM::LuaScriptsCfg ESMStore::getLuaScriptsCfg() const
+{
+    ESM::LuaScriptsCfg cfg;
+    for (const LuaContent& c : mLuaContent)
+    {
+        if (std::holds_alternative<std::string>(c))
+        {
+            // *.omwscripts are intentionally reloaded every time when `getLuaScriptsCfg` is called.
+            // It is important for the `reloadlua` console command.
+            try
+            {
+                auto file = std::ifstream(std::get<std::string>(c));
+                std::string fileContent(std::istreambuf_iterator<char>(file), {});
+                LuaUtil::parseOMWScripts(cfg, fileContent);
+            }
+            catch (std::exception& e) { Log(Debug::Error) << e.what(); }
+        }
+        else
+        {
+            const ESM::LuaScriptsCfg& addition = std::get<ESM::LuaScriptsCfg>(c);
+            cfg.mScripts.insert(cfg.mScripts.end(), addition.mScripts.begin(), addition.mScripts.end());
+        }
+    }
+    return cfg;
+}
+
 void ESMStore::setUp(bool validateRecords)
 {
     mIds.clear();
diff --git a/apps/openmw/mwworld/esmstore.hpp b/apps/openmw/mwworld/esmstore.hpp
index 6ad479f8bf..22b58f77dd 100644
--- a/apps/openmw/mwworld/esmstore.hpp
+++ b/apps/openmw/mwworld/esmstore.hpp
@@ -6,6 +6,7 @@
 #include <stdexcept>
 #include <unordered_map>
 
+#include <components/esm/luascripts.hpp>
 #include <components/esm/records.hpp>
 #include "store.hpp"
 
@@ -92,7 +93,16 @@ namespace MWWorld
 
         template<class T>
         void removeMissingObjects(Store<T>& store);
+
+        using LuaContent = std::variant<
+            ESM::LuaScriptsCfg,  // data from an omwaddon
+            std::string>;  // path to an omwscripts file
+        std::vector<LuaContent> mLuaContent;
+
     public:
+        void addOMWScripts(std::string filePath) { mLuaContent.push_back(std::move(filePath)); }
+        ESM::LuaScriptsCfg getLuaScriptsCfg() const;
+
         /// \todo replace with SharedIterator<StoreBase>
         typedef std::map<int, StoreBase *>::const_iterator iterator;
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index ccd78170bb..21e2d8380a 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -111,6 +111,17 @@ namespace MWWorld
           LoadersContainer mLoaders;
     };
 
+    struct OMWScriptsLoader : public ContentLoader
+    {
+        ESMStore& mStore;
+        OMWScriptsLoader(Loading::Listener& listener, ESMStore& store) : ContentLoader(listener), mStore(store) {}
+        void load(const boost::filesystem::path& filepath, int& index) override
+        {
+            ContentLoader::load(filepath.filename(), index);
+            mStore.addOMWScripts(filepath.string());
+        }
+    };
+
     void World::adjustSky()
     {
         if (mSky && (isCellExterior() || isCellQuasiExterior()))
@@ -156,6 +167,9 @@ namespace MWWorld
         gameContentLoader.addLoader(".omwaddon", &esmLoader);
         gameContentLoader.addLoader(".project", &esmLoader);
 
+        OMWScriptsLoader omwScriptsLoader(*listener, mStore);
+        gameContentLoader.addLoader(".omwscripts", &omwScriptsLoader);
+
         loadContentFiles(fileCollections, contentFiles, groundcoverFiles, gameContentLoader);
 
         listener->loadingOff();
diff --git a/apps/openmw/options.cpp b/apps/openmw/options.cpp
index 62ea0910dd..d68809468c 100644
--- a/apps/openmw/options.cpp
+++ b/apps/openmw/options.cpp
@@ -40,14 +40,11 @@ namespace OpenMW
                 "set initial cell")
 
             ("content", bpo::value<Files::EscapeStringVector>()->default_value(Files::EscapeStringVector(), "")
-                ->multitoken()->composing(), "content file(s): esm/esp, or omwgame/omwaddon")
+                ->multitoken()->composing(), "content file(s): esm/esp, or omwgame/omwaddon/omwscripts")
 
             ("groundcover", bpo::value<Files::EscapeStringVector>()->default_value(Files::EscapeStringVector(), "")
                 ->multitoken()->composing(), "groundcover content file(s): esm/esp, or omwgame/omwaddon")
 
-            ("lua-scripts", bpo::value<Files::EscapeStringVector>()->default_value(Files::EscapeStringVector(), "")
-                ->multitoken()->composing(), "file(s) with a list of global Lua scripts: omwscripts")
-
             ("no-sound", bpo::value<bool>()->implicit_value(true)
                 ->default_value(false), "disable all sounds")
 
diff --git a/apps/openmw_test_suite/mwworld/test_store.cpp b/apps/openmw_test_suite/mwworld/test_store.cpp
index f3b2bb3dcb..3fe479587c 100644
--- a/apps/openmw_test_suite/mwworld/test_store.cpp
+++ b/apps/openmw_test_suite/mwworld/test_store.cpp
@@ -7,6 +7,7 @@
 #include <components/esm/esmreader.hpp>
 #include <components/esm/esmwriter.hpp>
 #include <components/loadinglistener/loadinglistener.hpp>
+#include <components/misc/stringops.hpp>
 
 #include "apps/openmw/mwworld/esmstore.hpp"
 #include "apps/openmw/mwmechanics/spelllist.hpp"
@@ -88,7 +89,10 @@ struct ContentFileTest : public ::testing::Test
 
         std::vector<std::string> contentFiles = variables["content"].as<Files::EscapeStringVector>().toStdStringVector();
         for (auto & contentFile : contentFiles)
-            mContentFiles.push_back(collections.getPath(contentFile));
+        {
+            if (!Misc::StringUtils::ciEndsWith(contentFile, ".omwscripts"))
+                mContentFiles.push_back(collections.getPath(contentFile));
+        }
     }
 
 protected:
diff --git a/components/esm/defs.hpp b/components/esm/defs.hpp
index 7f2fe19cc5..254e66ec3a 100644
--- a/components/esm/defs.hpp
+++ b/components/esm/defs.hpp
@@ -165,6 +165,7 @@ enum RecNameInts
     // format 1
     REC_FILT = FourCC<'F','I','L','T'>::value,
     REC_DBGP = FourCC<'D','B','G','P'>::value, ///< only used in project files
+    REC_LUAL = FourCC<'L','U','A','L'>::value,  // LuaScriptsCfg
 
     // format 16 - Lua scripts in saved games
     REC_LUAM = FourCC<'L','U','A','M'>::value,  // LuaManager data

From 19a0fde278b35609cff2ddf8c6a990f1cde062a2 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 17 Oct 2021 10:29:10 +0200
Subject: [PATCH 1549/2859] Filter saves by the first esm/omwgame rather than
 by the first content file (that can be a universal omwaddon/omwscripts)

---
 apps/openmw/engine.cpp                   |  2 +-
 apps/openmw/mwstate/character.cpp        | 12 ++++++++++--
 apps/openmw/mwstate/character.hpp        |  2 ++
 apps/openmw/mwstate/charactermanager.cpp |  4 ++--
 apps/openmw/mwstate/charactermanager.hpp |  2 +-
 apps/openmw/mwstate/statemanagerimp.cpp  |  4 ++--
 apps/openmw/mwstate/statemanagerimp.hpp  |  2 +-
 7 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index bc31243ffc..58dabd2cee 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -669,7 +669,7 @@ void OMW::Engine::setWindowIcon()
 void OMW::Engine::prepareEngine (Settings::Manager & settings)
 {
     mEnvironment.setStateManager (
-        new MWState::StateManager (mCfgMgr.getUserDataPath() / "saves", mContentFiles.at (0)));
+        new MWState::StateManager (mCfgMgr.getUserDataPath() / "saves", mContentFiles));
 
     createWindow(settings);
 
diff --git a/apps/openmw/mwstate/character.cpp b/apps/openmw/mwstate/character.cpp
index df1ab1bdfb..59ddd2cd10 100644
--- a/apps/openmw/mwstate/character.cpp
+++ b/apps/openmw/mwstate/character.cpp
@@ -13,6 +13,15 @@ bool MWState::operator< (const Slot& left, const Slot& right)
     return left.mTimeStamp<right.mTimeStamp;
 }
 
+std::string MWState::getFirstGameFile(const std::vector<std::string>& contentFiles)
+{
+    for (const std::string& c : contentFiles)
+    {
+        if (Misc::StringUtils::ciEndsWith(c, ".esm") || Misc::StringUtils::ciEndsWith(c, ".omwgame"))
+            return c;
+    }
+    return "";
+}
 
 void MWState::Character::addSlot (const boost::filesystem::path& path, const std::string& game)
 {
@@ -30,8 +39,7 @@ void MWState::Character::addSlot (const boost::filesystem::path& path, const std
 
     slot.mProfile.load (reader);
 
-    if (Misc::StringUtils::lowerCase (slot.mProfile.mContentFiles.at (0))!=
-        Misc::StringUtils::lowerCase (game))
+    if (!Misc::StringUtils::ciEqual(getFirstGameFile(slot.mProfile.mContentFiles), game))
         return; // this file is for a different game -> ignore
 
     mSlots.push_back (slot);
diff --git a/apps/openmw/mwstate/character.hpp b/apps/openmw/mwstate/character.hpp
index 32c79a183e..e12de9ca64 100644
--- a/apps/openmw/mwstate/character.hpp
+++ b/apps/openmw/mwstate/character.hpp
@@ -16,6 +16,8 @@ namespace MWState
 
     bool operator< (const Slot& left, const Slot& right);
 
+    std::string getFirstGameFile(const std::vector<std::string>& contentFiles);
+
     class Character
     {
         public:
diff --git a/apps/openmw/mwstate/charactermanager.cpp b/apps/openmw/mwstate/charactermanager.cpp
index a324dfe0f7..027a4f38a4 100644
--- a/apps/openmw/mwstate/charactermanager.cpp
+++ b/apps/openmw/mwstate/charactermanager.cpp
@@ -6,8 +6,8 @@
 #include <boost/filesystem.hpp>
 
 MWState::CharacterManager::CharacterManager (const boost::filesystem::path& saves,
-    const std::string& game)
-: mPath (saves), mCurrent (nullptr), mGame (game)
+    const std::vector<std::string>& contentFiles)
+: mPath (saves), mCurrent (nullptr), mGame (getFirstGameFile(contentFiles))
 {
     if (!boost::filesystem::is_directory (mPath))
     {
diff --git a/apps/openmw/mwstate/charactermanager.hpp b/apps/openmw/mwstate/charactermanager.hpp
index 2daf73401f..8b3f2b8f8f 100644
--- a/apps/openmw/mwstate/charactermanager.hpp
+++ b/apps/openmw/mwstate/charactermanager.hpp
@@ -29,7 +29,7 @@ namespace MWState
 
         public:
 
-            CharacterManager (const boost::filesystem::path& saves, const std::string& game);
+            CharacterManager (const boost::filesystem::path& saves, const std::vector<std::string>& contentFiles);
 
             Character *getCurrentCharacter ();
             ///< @note May return null
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index 5e51e2f621..b9825a0f90 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -88,8 +88,8 @@ std::map<int, int> MWState::StateManager::buildContentFileIndexMap (const ESM::E
     return map;
 }
 
-MWState::StateManager::StateManager (const boost::filesystem::path& saves, const std::string& game)
-: mQuitRequest (false), mAskLoadRecent(false), mState (State_NoGame), mCharacterManager (saves, game), mTimePlayed (0)
+MWState::StateManager::StateManager (const boost::filesystem::path& saves, const std::vector<std::string>& contentFiles)
+: mQuitRequest (false), mAskLoadRecent(false), mState (State_NoGame), mCharacterManager (saves, contentFiles), mTimePlayed (0)
 {
 
 }
diff --git a/apps/openmw/mwstate/statemanagerimp.hpp b/apps/openmw/mwstate/statemanagerimp.hpp
index 3534dabf2b..a29e72b3ad 100644
--- a/apps/openmw/mwstate/statemanagerimp.hpp
+++ b/apps/openmw/mwstate/statemanagerimp.hpp
@@ -31,7 +31,7 @@ namespace MWState
 
         public:
 
-            StateManager (const boost::filesystem::path& saves, const std::string& game);
+            StateManager (const boost::filesystem::path& saves, const std::vector<std::string>& contentFiles);
 
             void requestQuit() override;
 

From 95faeaa9c1e45a62c5ab4a35283224dcd9ae7338 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 17 Oct 2021 19:10:09 +0200
Subject: [PATCH 1550/2859] Fix: after reloadlua call onActive for all active
 scripts

---
 apps/openmw/mwlua/luamanagerimp.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 30866faf56..5695883691 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -432,6 +432,8 @@ namespace MWLua
             scripts->save(data);
             scripts->load(data);
         }
+        for (LocalScripts* scripts : mActiveLocalScripts)
+            scripts->receiveEngineEvent(LocalScripts::OnActive());
     }
 
 }

From dd96eba2b01a3430413532a63c2f9db9c675e109 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 10 Oct 2021 22:43:47 +0200
Subject: [PATCH 1551/2859] Update OpenMW Lua docs

---
 .../lua-scripting/engine_handlers.rst         |  14 +-
 .../reference/lua-scripting/overview.rst      | 122 ++++++++++++------
 docs/source/reference/modding/extended.rst    |  14 +-
 files/lua_api/openmw/core.lua                 |  20 ++-
 4 files changed, 111 insertions(+), 59 deletions(-)

diff --git a/docs/source/reference/lua-scripting/engine_handlers.rst b/docs/source/reference/lua-scripting/engine_handlers.rst
index bcbee4349e..ef74684182 100644
--- a/docs/source/reference/lua-scripting/engine_handlers.rst
+++ b/docs/source/reference/lua-scripting/engine_handlers.rst
@@ -6,14 +6,22 @@ Engine handler is a function defined by a script, that can be called by the engi
 +---------------------------------------------------------------------------------------------------------+
 | **Can be defined by any script**                                                                        |
 +----------------------------------+----------------------------------------------------------------------+
+| onInit(initData)                 | | Called once when the script is created (not loaded). `InitData can`|
+|                                  | | `be assigned to a script in openmw-cs (not yet implemented)`.      |
+|                                  | | ``onInterfaceOverride`` can be called before ``onInit``.           |
++----------------------------------+----------------------------------------------------------------------+
 | onUpdate(dt)                     | | Called every frame if game not paused. `dt` is the time            |
 |                                  | | from the last update in seconds.                                   |
 +----------------------------------+----------------------------------------------------------------------+
-| onSave() -> data                 | | Called when the game is saving. May be called in inactive          |
+| onSave() -> savedData            | | Called when the game is saving. May be called in inactive          |
 |                                  | | state, so it shouldn't use `openmw.nearby`.                        |
 +----------------------------------+----------------------------------------------------------------------+
-| onLoad(data)                     | | Called on loading with the data previosly returned by              |
-|                                  | | onSave. During loading the object is always inactive.              |
+| onLoad(savedData, initData)      | | Called on loading with the data previosly returned by              |
+|                                  | | onSave. During loading the object is always inactive. initData is  |
+|                                  | | the same as in onInit.                                             |
++----------------------------------+----------------------------------------------------------------------+
+| onInterfaceOverride(base)        | | Called if the current script has an interface and overrides an     |
+|                                  | | interface (``base``) of another script.                            |
 +----------------------------------+----------------------------------------------------------------------+
 | **Only for global scripts**                                                                             |
 +----------------------------------+----------------------------------------------------------------------+
diff --git a/docs/source/reference/lua-scripting/overview.rst b/docs/source/reference/lua-scripting/overview.rst
index 44c79c35d8..c32fc74fa5 100644
--- a/docs/source/reference/lua-scripting/overview.rst
+++ b/docs/source/reference/lua-scripting/overview.rst
@@ -73,7 +73,7 @@ Let's write a simple example of a `Player script`:
 
 .. code-block:: Lua
 
-    -- Saved to my_lua_mod/example/player.lua
+    -- Save to my_lua_mod/example/player.lua
 
     local ui = require('openmw.ui')
 
@@ -87,42 +87,82 @@ Let's write a simple example of a `Player script`:
         }
     }
 
-In order to attach it to the player we also need a global script:
+The script will be used only if it is specified in one of content files.
+OpenMW Lua is an inclusive OpenMW feature, so it can not be controlled by ESP/ESM.
+The options are:
 
-.. code-block:: Lua
 
-    -- Saved to my_lua_mod/example/global.lua
+1. Create text file "my_lua_mod.omwscripts" with the following line:
+::
 
-    return {
-        engineHandlers = {
-            onPlayerAdded = function(player) player:addScript('example/player.lua') end
-        }
-    }
+    PLAYER: example/player.lua
+
+2. (not implemented yet) Add the script in OpenMW CS on "Lua scripts" view and save as "my_lua_mod.omwaddon".
 
-And one more file -- to start the global script:
+
+Enable it in ``openmw.cfg`` the same way as any other mod:
 
 ::
 
-    # Saved to my_lua_mod/my_lua_mod.omwscripts
+    data=path/to/my_lua_mod
+    content=my_lua_mod.omwscripts  # or content=my_lua_mod.omwaddon
+
+Now every time the player presses "X" on a keyboard, a message is shown.
 
-    # It is just a list of global scripts to run. Each file is on a separate line.
-    example/global.lua
 
-Finally :ref:`register <Lua scripting>` it in ``openmw.cfg``:
+Format of ``.omwscripts``
+=========================
 
 ::
 
-    data=path/to/my_lua_mod
-    lua-scripts=my_lua_mod.omwscripts
+    # Lines starting with '#' are comments
 
-Now every time the player presses "X" on a keyboard, a message is shown.
+    GLOBAL: my_mod/some_global_script.lua
+
+    # Script that will be automatically attached to the player
+    PLAYER: my_mod/player.lua
+
+    # Local script that will be automatically attached to every NPC and every creature in the game
+    NPC, CREATURE: my_mod/some_other_script.lua
+
+    # Local script that can be attached to any object by a global script
+    CUSTOM: my_mod/something.lua
+
+    # Local script that will be automatically attached to any Container AND can be
+    # attached to any other object by a global script.
+    CONTAINER, CUSTOM: my_mod/container.lua
+
+Each script is described by one line:
+``<flags>: <path to .lua file in virtual file system>``.
+The order of lines determines the script load order (i.e. script priorities).
+
+Possible flags are:
+
+- ``GLOBAL`` - a global script; always active, can not by stopped;
+- ``CUSTOM`` - dynamic local script that can be started or stopped by a global script;
+- ``PLAYER`` - an auto started player script;
+- ``ACTIVATOR`` - a local script that will be automatically attached to any activator;
+- ``ARMOR`` - a local script that will be automatically attached to any armor;
+- ``BOOK`` - a local script that will be automatically attached to any book;
+- ``CLOTHING`` - a local script that will be automatically attached to any clothing;
+- ``CONTAINER`` - a local script that will be automatically attached to any container;
+- ``CREATURE`` - a local script that will be automatically attached to any creature;
+- ``DOOR`` - a local script that will be automatically attached to any door;
+- ``INGREDIENT`` - a local script that will be automatically attached to any ingredient;
+- ``LIGHT`` - a local script that will be automatically attached to any light;
+- ``MISC_ITEM`` - a local script that will be automatically attached to any miscellaneous item;
+- ``NPC`` - a local script that will be automatically attached to any NPC;
+- ``POTION`` - a local script that will be automatically attached to any potion;
+- ``WEAPON`` - a local script that will be automatically attached to any weapon.
+
+Several flags (except ``GLOBAL``) can be used with a single script. Use space or comma as a separator.
 
 Hot reloading
 =============
 
 It is possible to modify a script without restarting OpenMW. To apply changes, open the in-game console and run the command: ``reloadlua``.
 This will restart all Lua scripts using the `onSave and onLoad`_ handlers the same way as if the game was saved or loaded.
-It works only with existing ``*.lua`` files that are not packed to any archives. Adding new scripts or modifying ``*.omwscripts`` files always requires restarting the game.
+It reloads all ``.omwscripts`` files and ``.lua`` files that are not packed to any archives. ``.omwaddon`` files and scripts packed to BSA can not be changed without restarting the game.
 
 Script structure
 ================
@@ -196,7 +236,7 @@ Engine handlers
 
 An engine handler is a function defined by a script, that can be called by the engine. I.e. it is an engine-to-script interaction.
 Not visible to other scripts. If several scripts register an engine handler with the same name,
-the engine calls all of them in the same order as the scripts were started.
+the engine calls all of them according to the load order (i.e. the order of ``content=`` entries in ``openmw.cfg``) and the order of scripts in ``omwaddon/omwscripts``.
 
 Some engine handlers are allowed only for global, or only for local/player scripts. Some are universal.
 See :ref:`Engine handlers reference`.
@@ -210,12 +250,6 @@ The value that `onSave` returns will be passed to `onLoad` when the game is load
 It is the only way to save the internal state of a script. All other script variables will be lost after closing the game.
 The saved state must be :ref:`serializable <Serializable data>`.
 
-The list of active global scripts is controlled by ``*.omwscripts`` files. Loading a save doesn't synchronize
-the list of global scripts with those that were active previously, it only calls `onLoad` for those currently active.
-
-For local scripts the situation is different. When a save is loading, it tries to run all local scripts that were saved.
-So if ``lua-scripts=`` entries of some mod are removed, but ``data=`` entries are still enabled, then local scripts from the mod may still run.
-
 `onSave` and `onLoad` can be called even for objects in inactive state, so it shouldn't use `openmw.nearby`.
 
 An example:
@@ -366,26 +400,28 @@ Overriding the interface and adding a debug output:
 
 .. code-block:: Lua
 
-    local interfaces = require('openmw.interfaces')
-
-    -- it is important to save it before returning the new interface
-    local orig = interfaces.SomeUtils
+    local baseInterface = nil  -- will be assigned by `onInterfaceOverride`
+    interface = {
+        version = 1,
+        doSomething = function(x, y)
+            print(string.format('SomeUtils.doSomething(%d, %d)', x, y))
+            baseInterface.doSomething(x, y)  -- calls the original `doSomething`
+
+            -- WRONG! Would lead to an infinite recursion.
+            -- local interfaces = require('openmw.interfaces')
+            -- interfaces.SomeUtils.doSomething(x, y)
+        end,
+    }
 
     return {
-        interfaceName = "SomeUtils"
-        interface = {
-            version = orig.version,
-            doSomething = function(x, y)
-                print(string.format('SomeUtils.doSomething(%d, %d)', x, y))
-                orig.doSomething(x, y)  -- calls the original `doSomething`
-
-                -- WRONG! Would lead to an infinite recursion.
-                -- interfaces.SomeUtils.doSomething(x, y)
-            end,
-        }
+        interfaceName = "SomeUtils",
+        interface = interface,
+        engineHandlers = {
+            onInterfaceOverride = function(base) baseInterface = base end,
+        },
     }
 
-A general recomendation about overriding is that the new interface should be fully compatible with the old one.
+A general recommendation about overriding is that the new interface should be fully compatible with the old one.
 So it is fine to change the behaviour of `SomeUtils.doSomething`, but if you want to add a completely new function, it would be
 better to create a new interface for it. For example `SomeUtilsExtended` with an additional function `doSomethingElse`.
 
@@ -418,7 +454,7 @@ Events are the main way of interacting between local and global scripts.
 They are not recommended for interactions between two global scripts, because in this case interfaces are more convenient.
 
 If several scripts register handlers for the same event, the handlers will be called in reverse order (opposite to engine handlers).
-I.e. the handler from the last attached script will be called first.
+I.e. the handler from the last script in the load order will be called first.
 Return value 'false' means "skip all other handlers for this event".
 Any other return value (including nil) means nothing.
 
@@ -471,7 +507,7 @@ The protection mod attaches an additional local script to every actor. The scrip
         eventHandlers = { DamagedByDarkPower = reduceDarkDamage },
     }
 
-In order to be able to intercept the event, the protection script should be attached after the original script (i.e. below in the load order).
+In order to be able to intercept the event, the protection script should be placed in the load order below the original script.
 
 
 Timers
diff --git a/docs/source/reference/modding/extended.rst b/docs/source/reference/modding/extended.rst
index f107617b33..db7df2e916 100644
--- a/docs/source/reference/modding/extended.rst
+++ b/docs/source/reference/modding/extended.rst
@@ -333,17 +333,9 @@ Lua scripting
 OpenMW supports Lua scripts. See :ref:`Lua scripting documentation <OpenMW Lua scripting>`.
 It is not compatible with MWSE. A mod with Lua scripts will work only if it was developed specifically for OpenMW.
 
-Mods can contain ``*.omwscripts`` files. They should be registered in the ``openmw.cfg`` via "lua-scripts" entries. The order of the "lua-scripts" entries can be important. If "some_lua_mod" uses API provided by "another_lua_mod", then omwscripts from "another_lua_mod" should be registered first. For example:
-
-::
-
-    data="path/to/another_lua_mod"
-    content=another_lua_mod.omwaddon
-    lua-scripts=another_lua_mod.omwscripts
-
-    data="path/to/some_lua_mod"
-    content=some_lua_mod.omwaddon
-    lua-scripts=some_lua_mod.omwscripts
+Installation of a Lua mod is the same as of any other mod: add ``data=`` and ``content=`` entries to ``openmw.cfg``.
+Files with suffix ``.omwscripts`` are special type of content files and should also be enabled using ``content=`` entries.
+Note that for some mods load order can be important.
 
 .. _`Graphic Herbalism`: https://www.nexusmods.com/morrowind/mods/46599
 .. _`OpenMW Containers Animated`: https://www.nexusmods.com/morrowind/mods/46232
diff --git a/files/lua_api/openmw/core.lua b/files/lua_api/openmw/core.lua
index 50706b9770..35513bbb79 100644
--- a/files/lua_api/openmw/core.lua
+++ b/files/lua_api/openmw/core.lua
@@ -192,10 +192,26 @@
 
 -------------------------------------------------------------------------------
 -- Add new local script to the object.
--- Can be called only from a global script.
+-- Can be called only from a global script. Script should be specified in a content
+-- file (omwgame/omwaddon/omwscripts) with a CUSTOM flag.
 -- @function [parent=#GameObject] addScript
 -- @param self
--- @param #string scriptPath Path to the script in OpenMW virtual filesystem
+-- @param #string scriptPath Path to the script in OpenMW virtual filesystem.
+
+-------------------------------------------------------------------------------
+-- Whether a script with given path is attached to this object.
+-- Can be called only from a global script.
+-- @function [parent=#GameObject] hasScript
+-- @param self
+-- @param #string scriptPath Path to the script in OpenMW virtual filesystem.
+-- @return #boolean
+
+-------------------------------------------------------------------------------
+-- Removes script that was attached by `addScript`
+-- Can be called only from a global script.
+-- @function [parent=#GameObject] removeScript
+-- @param self
+-- @param #string scriptPath Path to the script in OpenMW virtual filesystem.
 
 -------------------------------------------------------------------------------
 -- Moves object to given cell and position.

From 3ee6657768b6af74489ac6c16d2eecceb64cd412 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Tue, 26 Oct 2021 22:23:24 +0400
Subject: [PATCH 1552/2859] Early out from LOS check when source and target is
 the same (bug 5913)

---
 CHANGELOG.md                            | 1 +
 apps/openmw/mwphysics/physicssystem.cpp | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d609b0ae7f..de0d4e17d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@
     Bug #5801: A multi-effect spell with the intervention effects and recall always favors Almsivi intervention
     Bug #5842: GetDisposition adds temporary disposition change from different actors
     Bug #5863: GetEffect should return true after the player has teleported
+    Bug #5913: Failed assertion during Ritual of Trees quest
     Bug #6037: Morrowind Content Language Cannot be Set to English in OpenMW Launcher
     Bug #6051: NaN water height in ESM file is not handled gracefully
     Bug #6066: addtopic "return" does not work from within script. No errors thrown
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 2a5bcb58bd..f7678bed27 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -370,6 +370,8 @@ namespace MWPhysics
 
     bool PhysicsSystem::getLineOfSight(const MWWorld::ConstPtr &actor1, const MWWorld::ConstPtr &actor2) const
     {
+        if (actor1 == actor2) return true;
+
         const auto it1 = mActors.find(actor1.mRef);
         const auto it2 = mActors.find(actor2.mRef);
         if (it1 == mActors.end() || it2 == mActors.end())

From cd358ce1f999c267e61eb57533379bcf8611ffa8 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 27 Oct 2021 11:48:17 +0200
Subject: [PATCH 1553/2859] Update CMakeLists.txt

---
 CMakeLists.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 537c90670d..13196a4aa6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -707,8 +707,7 @@ endif()
 if (BUILD_OPENMW AND APPLE)
     # Without these flags LuaJit crashes on startup on OSX
     set_target_properties(openmw PROPERTIES LINK_FLAGS "-pagezero_size 10000 -image_base 100000000")
-    set_target_properties(components PROPERTIES COMPILE_DEFINITIONS "GL_SILENCE_DEPRECATION=1")
-    set_target_properties(openmw PROPERTIES COMPILE_DEFINITIONS "GL_SILENCE_DEPRECATION=1")
+    set_target_properties(components openmw PROPERTIES COMPILE_DEFINITIONS "GL_SILENCE_DEPRECATION=1")
 endif()
 
 # Apple bundling

From 1ff2b105110451b63adab5f048a5aef6fa5afd0e Mon Sep 17 00:00:00 2001
From: wareya <wareya@gmail.com>
Date: Wed, 27 Oct 2021 15:09:50 +0000
Subject: [PATCH 1554/2859] Fix hard rain ripple seams and broken shader
 compilation

---
 files/shaders/water_fragment.glsl | 42 ++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/files/shaders/water_fragment.glsl b/files/shaders/water_fragment.glsl
index 8d608e53c4..929bdd603d 100644
--- a/files/shaders/water_fragment.glsl
+++ b/files/shaders/water_fragment.glsl
@@ -85,7 +85,7 @@ float blipDerivative(float x)
 
 vec2 randomize_center(vec2 i_part, float time)
 {
-  time = 1.0 + mod(time, 10000.0); // so things don't get out of hand after long runtimes
+  time = 0.5 + mod(time/1000.0, 1.0)*0.5;
   vec2 center = vec2(0.5,0.5) + (0.5 - RAIN_RIPPLE_RADIUS) * (2.0 * randOffset(i_part*time) - 1.0);
   return center;
 }
@@ -99,13 +99,15 @@ vec4 circle(vec2 coords, vec2 uv, float adjusted_time)
   float d = length(toCenter);
   float ringfollower = (phase-d/r)*6.0-1.0;
   float energy = 1.0-phase;
-  energy = energy*energy;
+  float range = blip(min(0.0, ringfollower));
 
   vec2 normal = -toCenter*blipDerivative(ringfollower)*5.0;
+  // for fake specularity
   float height = blip(ringfollower);
-  vec4 ret = vec4(normal.x, normal.y, height, height);
-  ret.xyw *= energy;
-  ret.xyz = normalize(ret.x, ret.y, ret.z+0.001);
+  vec4 ret = vec4(normal.x, normal.y, 0.5, height);
+  ret.xyw *= energy*energy*range;
+  // do energy adjustment here rather than later, so that we can use the w component for fake specularity
+  ret.xyz = normalize(ret.xyz) * energy*range;
   return ret;
 }
 
@@ -115,12 +117,18 @@ vec4 rain(vec2 uv, float time)
   vec2 i_part = floor(uv * RAIN_RIPPLE_GAPS);
   float time_prog = time * 1.2 + randPhase(i_part);
   vec2 f_part = fract(uv * RAIN_RIPPLE_GAPS);
-  return circle(f_part, uv, time_prog)
-       - circle(f_part, uv, time_prog - RAIN_RING_TIME_OFFSET)     / 4.0
-       + circle(f_part, uv, time_prog - RAIN_RING_TIME_OFFSET*2.0) / 8.0
-       - circle(f_part, uv, time_prog - RAIN_RING_TIME_OFFSET*3.0) / 16.0;
+  vec4 a = circle(f_part, uv, time_prog);
+  vec4 b = circle(f_part, uv, time_prog - RAIN_RING_TIME_OFFSET);
+  vec4 c = circle(f_part, uv, time_prog - RAIN_RING_TIME_OFFSET*2.0);
+  vec4 d = circle(f_part, uv, time_prog - RAIN_RING_TIME_OFFSET*3.0);
+  vec4 ret = a   - b  /2.0 + c  /4.0 - d  /8.0;
+  // z should always point up
+  ret.z    = a.z + b.z/2.0 + c.z/4.0 + d.z/8.0;
+  // fake specularity looks weird if we use every single ring, also if the inner rings are too bright
+  ret.w    = a.w + c.w/8.0;
+  return ret;
 }
-vec4 rainCombined(vec2 uv, float time)     // returns ripple normal in xyz and ripple height in w
+vec4 rainCombined(vec2 uv, float time)     // returns ripple normal in xyz and ripple energy in w
 {
   return
     rain(uv,time) +
@@ -217,11 +225,13 @@ void main(void)
     vec4 rainRipple;
 
     if (rainIntensity > 0.01)
-      rainRipple = rainCombined(position.xy / 1000.0,waterTimer) * clamp(rainIntensity,0.0,1.0);
+      rainRipple = rainCombined(position.xy/1000.0, waterTimer) * clamp(rainIntensity, 0.0, 1.0);
     else
       rainRipple = vec4(0.0);
 
-    vec3 rippleAdd = rainRipple.xyz * abs(rainRipple.w) * 10.0;
+    vec3 rippleAdd = rainRipple.xyz * 10.0;
+    // artificial specularity to make rain ripples more noticeable
+    float rainSpecular = abs(rainRipple.w);
 
     vec2 bigWaves = vec2(BIG_WAVES_X,BIG_WAVES_Y);
     vec2 midWaves = mix(vec2(MID_WAVES_X,MID_WAVES_Y),vec2(MID_WAVES_RAIN_X,MID_WAVES_RAIN_Y),rainIntensity);
@@ -289,7 +299,7 @@ void main(void)
     vec3 scatterColour = mix(SCATTER_COLOUR*vec3(1.0,0.4,0.0), SCATTER_COLOUR, clamp(1.0-exp(-sunHeight*SUN_EXT), 0.0, 1.0));
     vec3 lR = reflect(lVec, lNormal);
     float lightScatter = clamp(dot(lVec,lNormal)*0.7+0.3, 0.0, 1.0) * clamp(dot(lR, vVec)*2.0-1.2, 0.0, 1.0) * SCATTER_AMOUNT * sunFade * clamp(1.0-exp(-sunHeight), 0.0, 1.0);
-    gl_FragData[0].xyz = mix( mix(refraction,  scatterColour,  lightScatter),  reflection,  fresnel) + specular * sunSpec.xyz + vec3(abs(rainRipple.w)) * 0.2;
+    gl_FragData[0].xyz = mix( mix(refraction,  scatterColour,  lightScatter),  reflection,  fresnel) + specular * sunSpec.xyz + vec3(rainSpecular) * 0.3;
     gl_FragData[0].w = 1.0;
 
     // wobbly water: hard-fade into refraction texture at extremely low depth, with a wobble based on normal mapping
@@ -302,7 +312,7 @@ void main(void)
     shoreOffset = clamp(mix(shoreOffset, 1.0, clamp(linearDepth / WOBBLY_SHORE_FADE_DISTANCE, 0.0, 1.0)), 0.0, 1.0);
     gl_FragData[0].xyz = mix(rawRefraction, gl_FragData[0].xyz, shoreOffset);
 #else
-    gl_FragData[0].xyz = mix(reflection,  waterColor,  (1.0-fresnel)*0.5) + specular * sunSpec.xyz + vec3(abs(rainRipple.w)) * 0.7;
+    gl_FragData[0].xyz = mix(reflection,  waterColor,  (1.0-fresnel)*0.5) + specular * sunSpec.xyz + vec3(rainSpecular) * 0.7;
     gl_FragData[0].w = clamp(fresnel*6.0 + specular * sunSpec.w, 0.0, 1.0);     //clamp(fresnel*2.0 + specular * gl_LightSource[0].specular.w, 0.0, 1.0);
 #endif
 
@@ -312,7 +322,9 @@ void main(void)
 #else
     float fogValue = clamp((linearDepth - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);
 #endif
-    gl_FragData[0].xyz = mix(gl_FragData[0].xyz,  gl_Fog.color.xyz,  fogValue);
+    gl_FragData[0].xyz = mix(gl_FragData[0].xyz, gl_Fog.color.xyz, fogValue);
+    
+
 
     applyShadowDebugOverlay();
 }

From e436147c10f5ef164d42d4cf3ade8548f0f2e1bd Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Wed, 27 Oct 2021 09:16:01 -0700
Subject: [PATCH 1555/2859] improved toggle world

---
 apps/openmw/mwrender/renderingmanager.cpp |  8 +--
 apps/openmw/mwrender/vismask.hpp          |  3 ++
 apps/openmw/mwrender/water.cpp            | 62 +++++++++++++++++++----
 apps/openmw/mwrender/water.hpp            |  3 ++
 4 files changed, 61 insertions(+), 15 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 1f29c45182..7b8393f690 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -753,12 +753,12 @@ namespace MWRender
         else if (mode == Render_Scene)
         {
             unsigned int mask = mViewer->getCamera()->getCullMask();
-            bool enabled = mask&Mask_Scene;
-            enabled = !enabled;
+            bool enabled = !(mask&sToggleWorldMask);
             if (enabled)
-                mask |= Mask_Scene;
+                mask |= sToggleWorldMask;
             else
-                mask &= ~Mask_Scene;
+                mask &= ~sToggleWorldMask;
+            mWater->showWorld(enabled);
             mViewer->getCamera()->setCullMask(mask);
             return enabled;
         }
diff --git a/apps/openmw/mwrender/vismask.hpp b/apps/openmw/mwrender/vismask.hpp
index 87ca9415fa..a7a28614cb 100644
--- a/apps/openmw/mwrender/vismask.hpp
+++ b/apps/openmw/mwrender/vismask.hpp
@@ -58,6 +58,9 @@ namespace MWRender
         Mask_Groundcover = (1<<20),
     };
 
+    // Defines masks to remove when using ToggleWorld command
+    constexpr static unsigned int sToggleWorldMask = Mask_Debug | Mask_Actor | Mask_Terrain | Mask_Object | Mask_Static | Mask_Groundcover;
+
 }
 
 #endif
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index 37368b8e7a..d8f92d1d1f 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -260,6 +260,7 @@ class Refraction : public SceneUtil::RTTNode
 public:
     Refraction(uint32_t rttSize)
         : RTTNode(rttSize, rttSize, 1, false)
+        , mNodeMask(Refraction::sDefaultCullMask)
     {
         mClipCullNode = new ClipCullNode;
     }
@@ -273,8 +274,6 @@ public:
         camera->addCullCallback(new InheritViewPointCallback);
         camera->setComputeNearFarMode(osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR);
 
-        camera->setCullMask(Mask_Effect | Mask_Scene | Mask_Object | Mask_Static | Mask_Terrain | Mask_Actor | Mask_ParticleSystem | Mask_Sky | Mask_Sun | Mask_Player | Mask_Lighting | Mask_Groundcover);
-
         // No need for fog here, we are already applying fog on the water surface itself as well as underwater fog
         // assign large value to effectively turn off fog
         // shaders don't respect glDisable(GL_FOG)
@@ -293,6 +292,7 @@ public:
     void apply(osg::Camera* camera) override
     {
         camera->setViewMatrix(mViewMatrix);
+        camera->setCullMask(mNodeMask);
     }
 
     void setScene(osg::Node* scene)
@@ -314,10 +314,22 @@ public:
         mClipCullNode->setPlane(osg::Plane(osg::Vec3d(0, 0, -1), osg::Vec3d(0, 0, waterLevel)));
     }
 
+    void showWorld(bool show)
+    {
+        if (show)
+            mNodeMask = Refraction::sDefaultCullMask;
+        else
+            mNodeMask = Refraction::sDefaultCullMask & ~sToggleWorldMask;
+    }
+
 private:
     osg::ref_ptr<ClipCullNode> mClipCullNode;
     osg::ref_ptr<osg::Node> mScene;
     osg::Matrix mViewMatrix{ osg::Matrix::identity() };
+
+    unsigned int mNodeMask;
+
+    static constexpr unsigned int sDefaultCullMask = Mask_Effect | Mask_Scene | Mask_Object | Mask_Static | Mask_Terrain | Mask_Actor | Mask_ParticleSystem | Mask_Sky | Mask_Sun | Mask_Player | Mask_Lighting | Mask_Groundcover;
 };
 
 class Reflection : public SceneUtil::RTTNode
@@ -357,15 +369,8 @@ public:
 
     void setInterior(bool isInterior)
     {
-        int reflectionDetail = Settings::Manager::getInt("reflection detail", "Water");
-        reflectionDetail = std::min(5, std::max(isInterior ? 2 : 0, reflectionDetail));
-        unsigned int extraMask = 0;
-        if(reflectionDetail >= 1) extraMask |= Mask_Terrain;
-        if(reflectionDetail >= 2) extraMask |= Mask_Static;
-        if(reflectionDetail >= 3) extraMask |= Mask_Effect | Mask_ParticleSystem | Mask_Object;
-        if(reflectionDetail >= 4) extraMask |= Mask_Player | Mask_Actor;
-        if(reflectionDetail >= 5) extraMask |= Mask_Groundcover;
-        mNodeMask = Mask_Scene | Mask_Sky | Mask_Lighting | extraMask;
+        mInterior = isInterior;
+        mNodeMask = calcNodeMask();
     }
 
     void setWaterLevel(float waterLevel)
@@ -382,11 +387,34 @@ public:
         mClipCullNode->addChild(scene);
     }
 
+    void showWorld(bool show)
+    {
+        if (show)
+            mNodeMask = calcNodeMask();
+        else
+            mNodeMask = calcNodeMask() & ~sToggleWorldMask;
+    }
+
 private:
+
+    unsigned int calcNodeMask()
+    {
+        int reflectionDetail = Settings::Manager::getInt("reflection detail", "Water");
+        reflectionDetail = std::min(5, std::max(mInterior ? 2 : 0, reflectionDetail));
+        unsigned int extraMask = 0;
+        if(reflectionDetail >= 1) extraMask |= Mask_Terrain;
+        if(reflectionDetail >= 2) extraMask |= Mask_Static;
+        if(reflectionDetail >= 3) extraMask |= Mask_Effect | Mask_ParticleSystem | Mask_Object;
+        if(reflectionDetail >= 4) extraMask |= Mask_Player | Mask_Actor;
+        if(reflectionDetail >= 5) extraMask |= Mask_Groundcover;
+        return Mask_Scene | Mask_Sky | Mask_Lighting | extraMask;
+    }
+
     osg::ref_ptr<ClipCullNode> mClipCullNode;
     osg::ref_ptr<osg::Node> mScene;
     osg::Node::NodeMask mNodeMask;
     osg::Matrix mViewMatrix{ osg::Matrix::identity() };
+    bool mInterior;
 };
 
 /// DepthClampCallback enables GL_DEPTH_CLAMP for the current draw, if supported.
@@ -422,6 +450,7 @@ Water::Water(osg::Group *parent, osg::Group* sceneRoot, Resource::ResourceSystem
     , mToggled(true)
     , mTop(0)
     , mInterior(false)
+    , mShowWorld(true)
     , mCullCallback(nullptr)
     , mShaderWaterStateSetUpdater(nullptr)
 {
@@ -519,6 +548,8 @@ void Water::updateWaterMaterial()
             mParent->addChild(mRefraction);
         }
 
+        showWorld(mShowWorld);
+
         createShaderWaterStateSet(mWaterNode, mReflection, mRefraction);
     }
     else
@@ -812,4 +843,13 @@ void Water::clearRipples()
     mSimulation->clear();
 }
 
+void Water::showWorld(bool show)
+{
+    if (mReflection)
+        mReflection->showWorld(show);
+    if (mRefraction)
+        mRefraction->showWorld(show);
+    mShowWorld = show;
+}
+
 }
diff --git a/apps/openmw/mwrender/water.hpp b/apps/openmw/mwrender/water.hpp
index 719e4fdc2b..c7acbf708f 100644
--- a/apps/openmw/mwrender/water.hpp
+++ b/apps/openmw/mwrender/water.hpp
@@ -71,6 +71,7 @@ namespace MWRender
         bool mToggled;
         float mTop;
         bool mInterior;
+        bool mShowWorld;
 
         osg::Callback* mCullCallback;
         osg::ref_ptr<osg::Callback> mShaderWaterStateSetUpdater;
@@ -124,6 +125,8 @@ namespace MWRender
         osg::Vec3d getPosition() const;
 
         void processChangedSettings(const Settings::CategorySettingVector& settings);
+
+        void showWorld(bool show);
     };
 
 }

From 5009b66ef5bccc447603cc0d58592106cf0cd1a0 Mon Sep 17 00:00:00 2001
From: Frederic Chardon <chardon.frederic@gmail.com>
Date: Thu, 7 Oct 2021 21:47:05 +0200
Subject: [PATCH 1556/2859] Use std::variant in the physics simulation for the
 different types of objects. For now only support only for actors.

---
 apps/openmw/mwphysics/actor.cpp          |  12 ++
 apps/openmw/mwphysics/actor.hpp          |   3 +
 apps/openmw/mwphysics/movementsolver.cpp |   2 +-
 apps/openmw/mwphysics/movementsolver.hpp |   2 +-
 apps/openmw/mwphysics/mtphysics.cpp      | 175 ++++++++++++++++-------
 apps/openmw/mwphysics/mtphysics.hpp      |   8 +-
 apps/openmw/mwphysics/physicssystem.cpp  |  34 ++---
 apps/openmw/mwphysics/physicssystem.hpp  |   6 +-
 8 files changed, 155 insertions(+), 87 deletions(-)

diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index e140141e32..c7e2308e2f 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -12,6 +12,7 @@
 
 #include "collisiontype.hpp"
 #include "mtphysics.hpp"
+#include "trace.h"
 
 #include <cmath>
 
@@ -303,4 +304,15 @@ osg::Vec3f Actor::velocity()
     return std::exchange(mVelocity, osg::Vec3f());
 }
 
+bool Actor::canMoveToWaterSurface(float waterlevel, const btCollisionWorld* world) const
+{
+    const float halfZ = getHalfExtents().z();
+    const osg::Vec3f actorPosition = getPosition();
+    const osg::Vec3f startingPosition(actorPosition.x(), actorPosition.y(), actorPosition.z() + halfZ);
+    const osg::Vec3f destinationPosition(actorPosition.x(), actorPosition.y(), waterlevel + halfZ);
+    MWPhysics::ActorTracer tracer;
+    tracer.doTrace(getCollisionObject(), startingPosition, destinationPosition, world);
+    return (tracer.mFraction >= 1.0f);
+}
+
 }
diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index 0846401c1d..d2ebd78379 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -12,6 +12,7 @@
 
 class btCollisionShape;
 class btCollisionObject;
+class btCollisionWorld;
 class btConvexShape;
 
 namespace Resource
@@ -165,6 +166,8 @@ namespace MWPhysics
         void setVelocity(osg::Vec3f velocity);
         osg::Vec3f velocity();
 
+        bool canMoveToWaterSurface(float waterlevel, const btCollisionWorld* world) const;
+
     private:
         MWWorld::Ptr mStandingOnPtr;
         /// Removes then re-adds the collision object to the dynamics world
diff --git a/apps/openmw/mwphysics/movementsolver.cpp b/apps/openmw/mwphysics/movementsolver.cpp
index 44a5391f0d..29810e9085 100644
--- a/apps/openmw/mwphysics/movementsolver.cpp
+++ b/apps/openmw/mwphysics/movementsolver.cpp
@@ -116,7 +116,7 @@ namespace MWPhysics
     }
 
     void MovementSolver::move(ActorFrameData& actor, float time, const btCollisionWorld* collisionWorld,
-                                           WorldFrameData& worldData)
+                                           const WorldFrameData& worldData)
     {
         // Reset per-frame data
         actor.mWalkingOnWater = false;
diff --git a/apps/openmw/mwphysics/movementsolver.hpp b/apps/openmw/mwphysics/movementsolver.hpp
index 30733eeec8..837004f232 100644
--- a/apps/openmw/mwphysics/movementsolver.hpp
+++ b/apps/openmw/mwphysics/movementsolver.hpp
@@ -43,7 +43,7 @@ namespace MWPhysics
     {
     public:
         static osg::Vec3f traceDown(const MWWorld::Ptr &ptr, const osg::Vec3f& position, Actor* actor, btCollisionWorld* collisionWorld, float maxHeight);
-        static void move(ActorFrameData& actor, float time, const btCollisionWorld* collisionWorld, WorldFrameData& worldData);
+        static void move(ActorFrameData& actor, float time, const btCollisionWorld* collisionWorld, const WorldFrameData& worldData);
         static void unstuck(ActorFrameData& actor, const btCollisionWorld* collisionWorld);
     };
 }
diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index a0dde67c2e..ad11878369 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -111,6 +111,106 @@ namespace
         return actorData.mPosition * interpolationFactor + actor.getPreviousPosition() * (1.f - interpolationFactor);
     }
 
+    namespace Visitors
+    {
+        struct InitPosition
+        {
+            const btCollisionWorld* mCollisionWorld;
+            void operator()(MWPhysics::ActorSimulation& sim) const
+            {
+                auto& [actor, frameData] = sim;
+                actor->applyOffsetChange();
+                frameData.mPosition = actor->getPosition();
+                if (frameData.mWaterCollision && frameData.mPosition.z() < frameData.mWaterlevel && actor->canMoveToWaterSurface(frameData.mWaterlevel, mCollisionWorld))
+                {
+                    frameData.mPosition.z() = frameData.mWaterlevel;
+                    MWBase::Environment::get().getWorld()->moveObject(actor->getPtr(), frameData.mPosition, false);
+                }
+                frameData.mOldHeight = frameData.mPosition.z();
+                const auto rotation = actor->getPtr().getRefData().getPosition().asRotationVec3();
+                frameData.mRotation = osg::Vec2f(rotation.x(), rotation.z());
+                frameData.mInertia = actor->getInertialForce();
+                frameData.mStuckFrames = actor->getStuckFrames();
+                frameData.mLastStuckPosition = actor->getLastStuckPosition();
+            }
+        };
+
+        struct PreStep
+        {
+            btCollisionWorld* mCollisionWorld;
+            void operator()(MWPhysics::ActorSimulation& sim) const
+            {
+                MWPhysics::MovementSolver::unstuck(sim.second, mCollisionWorld);
+            }
+        };
+
+        struct UpdatePosition
+        {
+            btCollisionWorld* mCollisionWorld;
+            void operator()(MWPhysics::ActorSimulation& sim) const
+            {
+                auto& [actor, frameData] = sim;
+                if (actor->setPosition(frameData.mPosition))
+                {
+                    frameData.mPosition = actor->getPosition(); // account for potential position change made by script
+                    actor->updateCollisionObjectPosition();
+                    mCollisionWorld->updateSingleAabb(actor->getCollisionObject());
+                }
+            }
+        };
+
+        struct Move
+        {
+            const float mPhysicsDt;
+            const btCollisionWorld* mCollisionWorld;
+            const MWPhysics::WorldFrameData& mWorldFrameData;
+            void operator()(MWPhysics::ActorSimulation& sim) const
+            {
+                MWPhysics::MovementSolver::move(sim.second, mPhysicsDt, mCollisionWorld, mWorldFrameData);
+            }
+        };
+
+        struct Sync
+        {
+            const bool mAdvanceSimulation;
+            const float mTimeAccum;
+            const float mPhysicsDt;
+            const MWPhysics::PhysicsTaskScheduler* scheduler;
+            void operator()(MWPhysics::ActorSimulation& sim) const
+            {
+                auto& [actor, frameData] = sim;
+                auto ptr = actor->getPtr();
+
+                MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
+                const float heightDiff = frameData.mPosition.z() - frameData.mOldHeight;
+                const bool isStillOnGround = (mAdvanceSimulation && frameData.mWasOnGround && frameData.mIsOnGround);
+
+                if (isStillOnGround || frameData.mFlying || isUnderWater(frameData) || frameData.mSlowFall < 1)
+                    stats.land(ptr == MWMechanics::getPlayer() && (frameData.mFlying || isUnderWater(frameData)));
+                else if (heightDiff < 0)
+                    stats.addToFallHeight(-heightDiff);
+
+                actor->setSimulationPosition(::interpolateMovements(*actor, frameData, mTimeAccum, mPhysicsDt));
+                actor->setLastStuckPosition(frameData.mLastStuckPosition);
+                actor->setStuckFrames(frameData.mStuckFrames);
+                if (mAdvanceSimulation)
+                {
+                    MWWorld::Ptr standingOn;
+                    auto* ptrHolder = static_cast<MWPhysics::PtrHolder*>(scheduler->getUserPointer(frameData.mStandingOn));
+                    if (ptrHolder)
+                        standingOn = ptrHolder->getPtr();
+                    actor->setStandingOnPtr(standingOn);
+                    // the "on ground" state of an actor might have been updated by a traceDown, don't overwrite the change
+                    if (actor->getOnGround() == frameData.mWasOnGround)
+                        actor->setOnGround(frameData.mIsOnGround);
+                    actor->setOnSlope(frameData.mIsOnSlope);
+                    actor->setWalkingOnWater(frameData.mWalkingOnWater);
+                    actor->setInertialForce(frameData.mInertia);
+                }
+            }
+        };
+    }
+
     namespace Config
     {
         /// @return either the number of thread as configured by the user, or 1 if Bullet doesn't support multithreading and user requested more than 1 background threads
@@ -235,13 +335,12 @@ namespace MWPhysics
         return std::make_tuple(numSteps, actualDelta);
     }
 
-    void PhysicsTaskScheduler::applyQueuedMovements(float & timeAccum, std::vector<std::shared_ptr<Actor>>&& actors, std::vector<ActorFrameData>&& actorsData, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
+    void PhysicsTaskScheduler::applyQueuedMovements(float & timeAccum, std::vector<Simulation>&& simulations, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
     {
         // This function run in the main thread.
         // While the mSimulationMutex is held, background physics threads can't run.
 
         MaybeExclusiveLock lock(mSimulationMutex, mNumThreads);
-        assert(actors.size() == actorsData.size());
 
         double timeStart = mTimer->tick();
 
@@ -259,19 +358,19 @@ namespace MWPhysics
         timeAccum -= numSteps*newDelta;
 
         // init
-        for (size_t i = 0; i < actors.size(); ++i)
+        const Visitors::InitPosition vis{mCollisionWorld};
+        for (auto& sim : simulations)
         {
-            actorsData[i].updatePosition(*actors[i], mCollisionWorld);
+            std::visit(vis, sim);
         }
         mPrevStepCount = numSteps;
         mRemainingSteps = numSteps;
         mTimeAccum = timeAccum;
         mPhysicsDt = newDelta;
-        mActors = std::move(actors);
-        mActorsFrameData = std::move(actorsData);
+        mSimulations = std::move(simulations);
         mAdvanceSimulation = (mRemainingSteps != 0);
         mNewFrame = true;
-        mNumJobs = mActorsFrameData.size();
+        mNumJobs = mSimulations.size();
         mNextLOS.store(0, std::memory_order_relaxed);
         mNextJob.store(0, std::memory_order_release);
 
@@ -301,8 +400,7 @@ namespace MWPhysics
         MaybeExclusiveLock lock(mSimulationMutex, mNumThreads);
         mBudget.reset(mDefaultPhysicsDt);
         mAsyncBudget.reset(0.0f);
-        mActors.clear();
-        mActorsFrameData.clear();
+        mSimulations.clear();
         for (const auto& [_, actor] : actors)
         {
             actor->updatePosition();
@@ -467,47 +565,11 @@ namespace MWPhysics
 
     void PhysicsTaskScheduler::updateActorsPositions()
     {
-        for (size_t i = 0; i < mActors.size(); ++i)
-        {
-            if (mActors[i]->setPosition(mActorsFrameData[i].mPosition))
-            {
-                MaybeExclusiveLock lock(mCollisionWorldMutex, mNumThreads);
-                mActorsFrameData[i].mPosition = mActors[i]->getPosition(); // account for potential position change made by script
-                mActors[i]->updateCollisionObjectPosition();
-                mCollisionWorld->updateSingleAabb(mActors[i]->getCollisionObject());
-            }
-        }
-    }
-
-    void PhysicsTaskScheduler::updateActor(Actor& actor, ActorFrameData& actorData, bool simulationPerformed, float timeAccum, float dt) const
-    {
-        auto ptr = actor.getPtr();
-
-        MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
-        const float heightDiff = actorData.mPosition.z() - actorData.mOldHeight;
-        const bool isStillOnGround = (simulationPerformed && actorData.mWasOnGround && actorData.mIsOnGround);
-
-        if (isStillOnGround || actorData.mFlying || isUnderWater(actorData) || actorData.mSlowFall < 1)
-            stats.land(ptr == MWMechanics::getPlayer() && (actorData.mFlying || isUnderWater(actorData)));
-        else if (heightDiff < 0)
-            stats.addToFallHeight(-heightDiff);
-
-        actor.setSimulationPosition(interpolateMovements(actor, actorData, timeAccum, dt));
-        actor.setLastStuckPosition(actorData.mLastStuckPosition);
-        actor.setStuckFrames(actorData.mStuckFrames);
-        if (simulationPerformed)
+        const Visitors::UpdatePosition vis{mCollisionWorld};
+        for (auto& sim : mSimulations)
         {
-            MWWorld::Ptr standingOn;
-            auto* ptrHolder = static_cast<MWPhysics::PtrHolder*>(getUserPointer(actorData.mStandingOn));
-            if (ptrHolder)
-                standingOn = ptrHolder->getPtr();
-            actor.setStandingOnPtr(standingOn);
-            // the "on ground" state of an actor might have been updated by a traceDown, don't overwrite the change
-            if (actor.getOnGround() == actorData.mWasOnGround)
-                actor.setOnGround(actorData.mIsOnGround);
-            actor.setOnSlope(actorData.mIsOnSlope);
-            actor.setWalkingOnWater(actorData.mWalkingOnWater);
-            actor.setInertialForce(actorData.mInertia);
+            MaybeExclusiveLock lock(mCollisionWorldMutex, mNumThreads);
+            std::visit(vis, sim);
         }
     }
 
@@ -532,10 +594,11 @@ namespace MWPhysics
         {
             mPreStepBarrier->wait([this] { afterPreStep(); });
             int job = 0;
+            const Visitors::Move vis{mPhysicsDt, mCollisionWorld, *mWorldFrameData};
             while ((job = mNextJob.fetch_add(1, std::memory_order_relaxed)) < mNumJobs)
             {
                 MaybeLock lockColWorld(mCollisionWorldMutex, mNumThreads);
-                MovementSolver::move(mActorsFrameData[job], mPhysicsDt, mCollisionWorld, *mWorldFrameData);
+                std::visit(vis, mSimulations[job]);
             }
 
             mPostStepBarrier->wait([this] { afterPostStep(); });
@@ -577,7 +640,7 @@ namespace MWPhysics
     void PhysicsTaskScheduler::releaseSharedStates()
     {
         std::scoped_lock lock(mSimulationMutex, mUpdateAabbMutex);
-        mActors.clear();
+        mSimulations.clear();
         mUpdateAabb.clear();
     }
 
@@ -586,10 +649,11 @@ namespace MWPhysics
         updateAabbs();
         if (!mRemainingSteps)
             return;
-        for (size_t i = 0; i < mActors.size(); ++i)
+        const Visitors::PreStep vis{mCollisionWorld};
+        for (auto& sim : mSimulations)
         {
             MaybeExclusiveLock lock(mCollisionWorldMutex, mNumThreads);
-            MovementSolver::unstuck(mActorsFrameData[i], mCollisionWorld);
+            std::visit(vis, sim);
         }
     }
 
@@ -618,7 +682,8 @@ namespace MWPhysics
 
     void PhysicsTaskScheduler::syncWithMainThread()
     {
-        for (size_t i = 0; i < mActors.size(); ++i)
-            updateActor(*mActors[i], mActorsFrameData[i], mAdvanceSimulation, mTimeAccum, mPhysicsDt);
+        const Visitors::Sync vis{mAdvanceSimulation, mTimeAccum, mPhysicsDt, this};
+        for (auto& sim : mSimulations)
+            std::visit(vis, sim);
     }
 }
diff --git a/apps/openmw/mwphysics/mtphysics.hpp b/apps/openmw/mwphysics/mtphysics.hpp
index 08997947e4..44330b2cc6 100644
--- a/apps/openmw/mwphysics/mtphysics.hpp
+++ b/apps/openmw/mwphysics/mtphysics.hpp
@@ -7,6 +7,7 @@
 #include <shared_mutex>
 #include <thread>
 #include <unordered_set>
+#include <variant>
 
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 
@@ -39,7 +40,7 @@ namespace MWPhysics
             /// @param timeAccum accumulated time from previous run to interpolate movements
             /// @param actorsData per actor data needed to compute new positions
             /// @return new position of each actor
-            void applyQueuedMovements(float & timeAccum, std::vector<std::shared_ptr<Actor>>&& actors, std::vector<ActorFrameData>&& actorsData, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
+            void applyQueuedMovements(float & timeAccum, std::vector<Simulation>&& simulations, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
 
             void resetSimulation(const ActorMap& actors);
 
@@ -57,14 +58,12 @@ namespace MWPhysics
             bool getLineOfSight(const std::shared_ptr<Actor>& actor1, const std::shared_ptr<Actor>& actor2);
             void debugDraw();
             void* getUserPointer(const btCollisionObject* object) const;
-
             void releaseSharedStates(); // destroy all objects whose destructor can't be safely called from ~PhysicsTaskScheduler()
 
         private:
             void doSimulation();
             void worker();
             void updateActorsPositions();
-            void updateActor(Actor& actor, ActorFrameData& actorData, bool simulationPerformed, float timeAccum, float dt) const;
             bool hasLineOfSight(const Actor* actor1, const Actor* actor2);
             void refreshLOSCache();
             void updateAabbs();
@@ -77,8 +76,7 @@ namespace MWPhysics
             void syncWithMainThread();
 
             std::unique_ptr<WorldFrameData> mWorldFrameData;
-            std::vector<std::shared_ptr<Actor>> mActors;
-            std::vector<ActorFrameData> mActorsFrameData;
+            std::vector<Simulation> mSimulations;
             std::unordered_set<const btCollisionObject*> mCollisionObjects;
             float mDefaultPhysicsDt;
             float mPhysicsDt;
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 2a5bcb58bd..f6fc3902e7 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -60,19 +60,6 @@
 
 namespace
 {
-    bool canMoveToWaterSurface(const MWPhysics::Actor* physicActor, const float waterlevel, btCollisionWorld* world)
-    {
-        if (!physicActor)
-            return false;
-        const float halfZ = physicActor->getHalfExtents().z();
-        const osg::Vec3f actorPosition = physicActor->getPosition();
-        const osg::Vec3f startingPosition(actorPosition.x(), actorPosition.y(), actorPosition.z() + halfZ);
-        const osg::Vec3f destinationPosition(actorPosition.x(), actorPosition.y(), waterlevel + halfZ);
-        MWPhysics::ActorTracer tracer;
-        tracer.doTrace(physicActor->getCollisionObject(), startingPosition, destinationPosition, world);
-        return (tracer.mFraction >= 1.0f);
-    }
-
     void handleJump(const MWWorld::Ptr &ptr)
     {
         if (!ptr.getClass().isActor())
@@ -386,7 +373,8 @@ namespace MWPhysics
 
     bool PhysicsSystem::canMoveToWaterSurface(const MWWorld::ConstPtr &actor, const float waterlevel)
     {
-        return ::canMoveToWaterSurface(getActor(actor), waterlevel, mCollisionWorld.get());
+        const auto* physactor = getActor(actor);
+        return physactor && physactor->canMoveToWaterSurface(waterlevel, mCollisionWorld.get());
     }
 
     osg::Vec3f PhysicsSystem::getHalfExtents(const MWWorld::ConstPtr &actor) const
@@ -727,11 +715,10 @@ namespace MWPhysics
             actor->setVelocity(osg::Vec3f());
     }
 
-    std::pair<std::vector<std::shared_ptr<Actor>>, std::vector<ActorFrameData>> PhysicsSystem::prepareFrameData(bool willSimulate)
+    std::vector<Simulation> PhysicsSystem::prepareSimulation(bool willSimulate)
     {
-        std::pair<std::vector<std::shared_ptr<Actor>>, std::vector<ActorFrameData>> framedata;
-        framedata.first.reserve(mActors.size());
-        framedata.second.reserve(mActors.size());
+        std::vector<Simulation> simulations;
+        simulations.reserve(mActors.size());
         const MWBase::World *world = MWBase::Environment::get().getWorld();
         for (const auto& [ref, physicActor] : mActors)
         {
@@ -760,14 +747,13 @@ namespace MWPhysics
             const bool godmode = ptr == world->getPlayerConstPtr() && world->getGodModeState();
             const bool inert = stats.isDead() || (!godmode && stats.getMagicEffects().get(ESM::MagicEffect::Paralyze).getModifier() > 0);
 
-            framedata.first.emplace_back(physicActor);
-            framedata.second.emplace_back(*physicActor, inert, waterCollision, slowFall, waterlevel);
+            simulations.emplace_back(ActorSimulation{physicActor, ActorFrameData{*physicActor, inert, waterCollision, slowFall, waterlevel}});
 
             // if the simulation will run, a jump request will be fulfilled. Update mechanics accordingly.
             if (willSimulate)
                 handleJump(ptr);
         }
-        return framedata;
+        return simulations;
     }
 
     void PhysicsSystem::stepSimulation(float dt, bool skipSimulation, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
@@ -793,9 +779,9 @@ namespace MWPhysics
             mTaskScheduler->resetSimulation(mActors);
         else
         {
-            auto [actors, framedata] = prepareFrameData(mTimeAccum >= mPhysicsDt);
+            auto simulations = prepareSimulation(mTimeAccum >= mPhysicsDt);
             // modifies mTimeAccum
-            mTaskScheduler->applyQueuedMovements(mTimeAccum, std::move(actors), std::move(framedata), frameStart, frameNumber, stats);
+            mTaskScheduler->applyQueuedMovements(mTimeAccum, std::move(simulations), frameStart, frameNumber, stats);
         }
     }
 
@@ -982,7 +968,7 @@ namespace MWPhysics
     {
         actor.applyOffsetChange();
         mPosition = actor.getPosition();
-        if (mWaterCollision && mPosition.z() < mWaterlevel && canMoveToWaterSurface(&actor, mWaterlevel, world))
+        if (mWaterCollision && mPosition.z() < mWaterlevel && actor.canMoveToWaterSurface(mWaterlevel, world))
         {
             mPosition.z() = mWaterlevel;
             MWBase::Environment::get().getWorld()->moveObject(actor.getPtr(), mPosition, false);
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 6ec4ebfda9..be9fa10aa6 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -7,6 +7,7 @@
 #include <set>
 #include <unordered_map>
 #include <algorithm>
+#include <variant>
 
 #include <osg/Quat>
 #include <osg/BoundingBox>
@@ -107,6 +108,9 @@ namespace MWPhysics
         osg::Vec3f mStormDirection;
     };
 
+    using ActorSimulation = std::pair<std::shared_ptr<Actor>, ActorFrameData>;
+    using Simulation = std::variant<ActorSimulation>;
+
     class PhysicsSystem : public RayCastingInterface
     {
         public:
@@ -253,7 +257,7 @@ namespace MWPhysics
 
             void updateWater();
 
-            std::pair<std::vector<std::shared_ptr<Actor>>, std::vector<ActorFrameData>> prepareFrameData(bool willSimulate);
+            std::vector<Simulation> prepareSimulation(bool willSimulate);
 
             std::unique_ptr<btBroadphaseInterface> mBroadphase;
             std::unique_ptr<btDefaultCollisionConfiguration> mCollisionConfiguration;

From ad7a810a62f669f272ffa55b0609ac611bffcedc Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sat, 9 Oct 2021 18:13:54 +0200
Subject: [PATCH 1557/2859] Unify interface for Actor and Projectile

---
 apps/openmw/mwphysics/actor.cpp      | 27 +------------------
 apps/openmw/mwphysics/actor.hpp      | 12 ---------
 apps/openmw/mwphysics/mtphysics.cpp  |  2 +-
 apps/openmw/mwphysics/projectile.cpp | 30 +++++----------------
 apps/openmw/mwphysics/projectile.hpp |  7 +----
 apps/openmw/mwphysics/ptrholder.hpp  | 40 ++++++++++++++++++++++++++++
 6 files changed, 50 insertions(+), 68 deletions(-)

diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index c7e2308e2f..4857339228 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -23,7 +23,7 @@ namespace MWPhysics
 Actor::Actor(const MWWorld::Ptr& ptr, const Resource::BulletShape* shape, PhysicsTaskScheduler* scheduler, bool canWaterWalk)
   : mStandingOnPtr(nullptr), mCanWaterWalk(canWaterWalk), mWalkingOnWater(false)
   , mMeshTranslation(shape->mCollisionBox.center), mOriginalHalfExtents(shape->mCollisionBox.extents)
-  , mVelocity(0,0,0), mStuckFrames(0), mLastStuckPosition{0, 0, 0}
+  , mStuckFrames(0), mLastStuckPosition{0, 0, 0}
   , mForce(0.f, 0.f, 0.f), mOnGround(true), mOnSlope(false)
   , mInternalCollisionMode(true)
   , mExternalCollisionMode(true)
@@ -134,11 +134,6 @@ void Actor::setSimulationPosition(const osg::Vec3f& position)
         mSimulationPosition = position;
 }
 
-osg::Vec3f Actor::getSimulationPosition() const
-{
-    return mSimulationPosition;
-}
-
 osg::Vec3f Actor::getScaledMeshTranslation() const
 {
     return mRotation * osg::componentMultiply(mMeshTranslation, mScale);
@@ -192,16 +187,6 @@ void Actor::applyOffsetChange()
     mWorldPositionChanged = true;
 }
 
-osg::Vec3f Actor::getPosition() const
-{
-    return mPosition;
-}
-
-osg::Vec3f Actor::getPreviousPosition() const
-{
-    return mPreviousPosition;
-}
-
 void Actor::setRotation(osg::Quat quat)
 {
     std::scoped_lock lock(mPositionMutex);
@@ -294,16 +279,6 @@ bool Actor::skipCollisions()
     return std::exchange(mSkipCollisions, false);
 }
 
-void Actor::setVelocity(osg::Vec3f velocity)
-{
-    mVelocity = velocity;
-}
-
-osg::Vec3f Actor::velocity()
-{
-    return std::exchange(mVelocity, osg::Vec3f());
-}
-
 bool Actor::canMoveToWaterSurface(float waterlevel, const btCollisionWorld* world) const
 {
     const float halfZ = getHalfExtents().z();
diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index d2ebd78379..eb65928dec 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -60,7 +60,6 @@ namespace MWPhysics
         * to account for e.g. scripted movements
         */
         void setSimulationPosition(const osg::Vec3f& position);
-        osg::Vec3f getSimulationPosition() const;
 
         void updateCollisionObjectPosition();
 
@@ -95,10 +94,6 @@ namespace MWPhysics
         // apply position offset. Can't be called during simulation
         void applyOffsetChange();
 
-        osg::Vec3f getPosition() const;
-
-        osg::Vec3f getPreviousPosition() const;
-
         /**
          * Returns the half extents of the collision body (scaled according to rendering scale)
          * @note The reason we need this extra method is because of an inconsistency in MW - NPC race scales aren't applied to the collision shape,
@@ -163,9 +158,6 @@ namespace MWPhysics
 
         bool skipCollisions();
 
-        void setVelocity(osg::Vec3f velocity);
-        osg::Vec3f velocity();
-
         bool canMoveToWaterSurface(float waterlevel, const btCollisionWorld* world) const;
 
     private:
@@ -193,11 +185,7 @@ namespace MWPhysics
         osg::Quat mRotation;
 
         osg::Vec3f mScale;
-        osg::Vec3f mSimulationPosition;
-        osg::Vec3f mPosition;
-        osg::Vec3f mPreviousPosition;
         osg::Vec3f mPositionOffset;
-        osg::Vec3f mVelocity;
         bool mWorldPositionChanged;
         bool mSkipCollisions;
         bool mSkipSimulation;
diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index ad11878369..d3f8bad238 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -546,7 +546,7 @@ namespace MWPhysics
         }
         else if (const auto projectile = std::dynamic_pointer_cast<Projectile>(ptr))
         {
-            projectile->commitPositionChange();
+            projectile->updateCollisionObjectPosition();
             mCollisionWorld->updateSingleAabb(projectile->getCollisionObject());
         }
     }
diff --git a/apps/openmw/mwphysics/projectile.cpp b/apps/openmw/mwphysics/projectile.cpp
index 4efb245149..9f8962d5e6 100644
--- a/apps/openmw/mwphysics/projectile.cpp
+++ b/apps/openmw/mwphysics/projectile.cpp
@@ -31,14 +31,15 @@ Projectile::Projectile(const MWWorld::Ptr& caster, const osg::Vec3f& position, f
     mCollisionObject->setCollisionShape(mShape.get());
     mCollisionObject->setUserPointer(this);
 
-    setPosition(position);
+    mPosition = position;
+    mPreviousPosition = position;
     setCaster(caster);
 
     const int collisionMask = CollisionType_World | CollisionType_HeightMap |
         CollisionType_Actor | CollisionType_Door | CollisionType_Water | CollisionType_Projectile;
     mTaskScheduler->addCollisionObject(mCollisionObject.get(), CollisionType_Projectile, collisionMask);
 
-    commitPositionChange();
+    updateCollisionObjectPosition();
 }
 
 Projectile::~Projectile()
@@ -48,29 +49,12 @@ Projectile::~Projectile()
     mTaskScheduler->removeCollisionObject(mCollisionObject.get());
 }
 
-void Projectile::commitPositionChange()
-{
-    std::scoped_lock lock(mMutex);
-    if (mTransformUpdatePending)
-    {
-        auto& trans = mCollisionObject->getWorldTransform();
-        trans.setOrigin(Misc::Convert::toBullet(mPosition));
-        mCollisionObject->setWorldTransform(trans);
-        mTransformUpdatePending = false;
-    }
-}
-
-void Projectile::setPosition(const osg::Vec3f &position)
-{
-    std::scoped_lock lock(mMutex);
-    mPosition = position;
-    mTransformUpdatePending = true;
-}
-
-osg::Vec3f Projectile::getPosition() const
+void Projectile::updateCollisionObjectPosition()
 {
     std::scoped_lock lock(mMutex);
-    return mPosition;
+    auto& trans = mCollisionObject->getWorldTransform();
+    trans.setOrigin(Misc::Convert::toBullet(mPosition));
+    mCollisionObject->setWorldTransform(trans);
 }
 
 void Projectile::hit(const btCollisionObject* target, btVector3 pos, btVector3 normal)
diff --git a/apps/openmw/mwphysics/projectile.hpp b/apps/openmw/mwphysics/projectile.hpp
index 5e4e487c03..10ed2c9582 100644
--- a/apps/openmw/mwphysics/projectile.hpp
+++ b/apps/openmw/mwphysics/projectile.hpp
@@ -36,10 +36,7 @@ namespace MWPhysics
 
         btConvexShape* getConvexShape() const { return mConvexShape; }
 
-        void commitPositionChange();
-
-        void setPosition(const osg::Vec3f& position);
-        osg::Vec3f getPosition() const;
+        void updateCollisionObjectPosition();
 
         bool isActive() const
         {
@@ -80,13 +77,11 @@ namespace MWPhysics
         std::unique_ptr<btCollisionShape> mShape;
         btConvexShape* mConvexShape;
 
-        bool mTransformUpdatePending;
         bool mHitWater;
         std::atomic<bool> mActive;
         MWWorld::Ptr mCaster;
         const btCollisionObject* mCasterColObj;
         const btCollisionObject* mHitTarget;
-        osg::Vec3f mPosition;
         btVector3 mHitPosition;
         btVector3 mHitNormal;
 
diff --git a/apps/openmw/mwphysics/ptrholder.hpp b/apps/openmw/mwphysics/ptrholder.hpp
index e84f3d1cfe..fcd6ce203a 100644
--- a/apps/openmw/mwphysics/ptrholder.hpp
+++ b/apps/openmw/mwphysics/ptrholder.hpp
@@ -30,9 +30,49 @@ namespace MWPhysics
             return mCollisionObject.get();
         }
 
+        void setVelocity(osg::Vec3f velocity)
+        {
+            mVelocity = velocity;
+        }
+
+        osg::Vec3f velocity()
+        {
+            return std::exchange(mVelocity, osg::Vec3f());
+        }
+
+        void setSimulationPosition(const osg::Vec3f& position)
+        {
+            mSimulationPosition = position;
+        }
+
+        osg::Vec3f getSimulationPosition() const
+        {
+            return mSimulationPosition;
+        }
+
+        void setPosition(const osg::Vec3f& position)
+        {
+            mPreviousPosition = mPosition;
+            mPosition = position;
+        }
+
+        osg::Vec3f getPosition() const
+        {
+            return mPosition;
+        }
+
+        osg::Vec3f getPreviousPosition() const
+        {
+            return mPreviousPosition;
+        }
+
     protected:
         MWWorld::Ptr mPtr;
         std::unique_ptr<btCollisionObject> mCollisionObject;
+        osg::Vec3f mVelocity;
+        osg::Vec3f mSimulationPosition;
+        osg::Vec3f mPosition;
+        osg::Vec3f mPreviousPosition;
     };
 }
 

From a245981e4ec1975731838b2b0663ccead30b79c4 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sat, 9 Oct 2021 18:15:45 +0200
Subject: [PATCH 1558/2859] Make interpolateMovement works with PtrHolder
 instead of Actor

---
 apps/openmw/mwphysics/mtphysics.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index d3f8bad238..525647230f 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -105,10 +105,10 @@ namespace
         return actorData.mPosition.z() < actorData.mSwimLevel;
     }
 
-    osg::Vec3f interpolateMovements(MWPhysics::Actor& actor, MWPhysics::ActorFrameData& actorData, float timeAccum, float physicsDt)
+    osg::Vec3f interpolateMovements(const MWPhysics::PtrHolder& ptr, float timeAccum, float physicsDt)
     {
         const float interpolationFactor = std::clamp(timeAccum / physicsDt, 0.0f, 1.0f);
-        return actorData.mPosition * interpolationFactor + actor.getPreviousPosition() * (1.f - interpolationFactor);
+        return ptr.getPosition() * interpolationFactor + ptr.getPreviousPosition() * (1.f - interpolationFactor);
     }
 
     namespace Visitors
@@ -190,7 +190,7 @@ namespace
                 else if (heightDiff < 0)
                     stats.addToFallHeight(-heightDiff);
 
-                actor->setSimulationPosition(::interpolateMovements(*actor, frameData, mTimeAccum, mPhysicsDt));
+                actor->setSimulationPosition(::interpolateMovements(*actor, mTimeAccum, mPhysicsDt));
                 actor->setLastStuckPosition(frameData.mLastStuckPosition);
                 actor->setStuckFrames(frameData.mStuckFrames);
                 if (mAdvanceSimulation)

From 3750eb9cd85ca3cbaaa150bda8159d653833bf1d Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sat, 9 Oct 2021 18:16:29 +0200
Subject: [PATCH 1559/2859] Move Projectile simulation to the background
 thread.

---
 apps/openmw/mwphysics/movementsolver.cpp  | 26 ++++++++++++++
 apps/openmw/mwphysics/movementsolver.hpp  |  2 ++
 apps/openmw/mwphysics/mtphysics.cpp       | 22 ++++++++++++
 apps/openmw/mwphysics/physicssystem.cpp   | 44 +++++++++--------------
 apps/openmw/mwphysics/physicssystem.hpp   | 14 ++++++--
 apps/openmw/mwworld/projectilemanager.cpp | 12 +++----
 6 files changed, 82 insertions(+), 38 deletions(-)

diff --git a/apps/openmw/mwphysics/movementsolver.cpp b/apps/openmw/mwphysics/movementsolver.cpp
index 29810e9085..0585fe91f3 100644
--- a/apps/openmw/mwphysics/movementsolver.cpp
+++ b/apps/openmw/mwphysics/movementsolver.cpp
@@ -3,6 +3,7 @@
 #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 #include <BulletCollision/CollisionShapes/btCollisionShape.h>
+#include <BulletCollision/CollisionShapes/btConvexShape.h>
 
 #include <components/esm/loadgmst.hpp>
 #include <components/misc/convert.hpp>
@@ -19,6 +20,8 @@
 #include "constants.hpp"
 #include "contacttestwrapper.h"
 #include "physicssystem.hpp"
+#include "projectile.hpp"
+#include "projectileconvexcallback.hpp"
 #include "stepper.hpp"
 #include "trace.h"
 
@@ -398,6 +401,29 @@ namespace MWPhysics
         actor.mPosition.z() -= actor.mHalfExtentsZ; // vanilla-accurate
     }
 
+    void MovementSolver::move(ProjectileFrameData& projectile, float time, const btCollisionWorld* collisionWorld)
+    {
+        btVector3 btFrom = Misc::Convert::toBullet(projectile.mPosition);
+        btVector3 btTo = Misc::Convert::toBullet(projectile.mPosition + projectile.mMovement * time);
+
+        if (btFrom == btTo)
+            return;
+
+        ProjectileConvexCallback resultCallback(projectile.mCaster, projectile.mCollisionObject, btFrom, btTo, projectile.mProjectile);
+        resultCallback.m_collisionFilterMask = 0xff;
+        resultCallback.m_collisionFilterGroup = CollisionType_Projectile;
+
+        const btQuaternion btrot = btQuaternion::getIdentity();
+        btTransform from_ (btrot, btFrom);
+        btTransform to_ (btrot, btTo);
+
+        const btCollisionShape* shape = projectile.mCollisionObject->getCollisionShape();
+        assert(shape->isConvex());
+        collisionWorld->convexSweepTest(static_cast<const btConvexShape*>(shape), from_, to_, resultCallback);
+
+        projectile.mPosition = Misc::Convert::toOsg(projectile.mProjectile->isActive() ? btTo : resultCallback.m_hitPointWorld);
+    }
+
     btVector3 addMarginToDelta(btVector3 delta)
     {
         if(delta.length2() == 0.0)
diff --git a/apps/openmw/mwphysics/movementsolver.hpp b/apps/openmw/mwphysics/movementsolver.hpp
index 837004f232..1bbe76cbec 100644
--- a/apps/openmw/mwphysics/movementsolver.hpp
+++ b/apps/openmw/mwphysics/movementsolver.hpp
@@ -37,6 +37,7 @@ namespace MWPhysics
 
     class Actor;
     struct ActorFrameData;
+    struct ProjectileFrameData;
     struct WorldFrameData;
 
     class MovementSolver
@@ -44,6 +45,7 @@ namespace MWPhysics
     public:
         static osg::Vec3f traceDown(const MWWorld::Ptr &ptr, const osg::Vec3f& position, Actor* actor, btCollisionWorld* collisionWorld, float maxHeight);
         static void move(ActorFrameData& actor, float time, const btCollisionWorld* collisionWorld, const WorldFrameData& worldData);
+        static void move(ProjectileFrameData& projectile, float time, const btCollisionWorld* collisionWorld);
         static void unstuck(ActorFrameData& actor, const btCollisionWorld* collisionWorld);
     };
 }
diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 525647230f..a989493f4d 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -133,6 +133,9 @@ namespace
                 frameData.mStuckFrames = actor->getStuckFrames();
                 frameData.mLastStuckPosition = actor->getLastStuckPosition();
             }
+            void operator()(MWPhysics::ProjectileSimulation& sim) const
+            {
+            }
         };
 
         struct PreStep
@@ -142,6 +145,9 @@ namespace
             {
                 MWPhysics::MovementSolver::unstuck(sim.second, mCollisionWorld);
             }
+            void operator()(MWPhysics::ProjectileSimulation& sim) const
+            {
+            }
         };
 
         struct UpdatePosition
@@ -157,6 +163,13 @@ namespace
                     mCollisionWorld->updateSingleAabb(actor->getCollisionObject());
                 }
             }
+            void operator()(MWPhysics::ProjectileSimulation& sim) const
+            {
+                auto& [proj, frameData] = sim;
+                proj->setPosition(frameData.mPosition);
+                proj->updateCollisionObjectPosition();
+                mCollisionWorld->updateSingleAabb(proj->getCollisionObject());
+            }
         };
 
         struct Move
@@ -168,6 +181,10 @@ namespace
             {
                 MWPhysics::MovementSolver::move(sim.second, mPhysicsDt, mCollisionWorld, mWorldFrameData);
             }
+            void operator()(MWPhysics::ProjectileSimulation& sim) const
+            {
+                MWPhysics::MovementSolver::move(sim.second, mPhysicsDt, mCollisionWorld);
+            }
         };
 
         struct Sync
@@ -208,6 +225,11 @@ namespace
                     actor->setInertialForce(frameData.mInertia);
                 }
             }
+            void operator()(MWPhysics::ProjectileSimulation& sim) const
+            {
+                auto& [proj, frameData] = sim;
+                proj->setSimulationPosition(::interpolateMovements(*proj, mTimeAccum, mPhysicsDt));
+            }
         };
     }
 
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index f6fc3902e7..786378eb8c 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -580,33 +580,6 @@ namespace MWPhysics
         }
     }
 
-    void PhysicsSystem::updateProjectile(const int projectileId, const osg::Vec3f &position) const
-    {
-        const auto foundProjectile = mProjectiles.find(projectileId);
-        assert(foundProjectile != mProjectiles.end());
-        auto* projectile = foundProjectile->second.get();
-
-        btVector3 btFrom = Misc::Convert::toBullet(projectile->getPosition());
-        btVector3 btTo = Misc::Convert::toBullet(position);
-
-        if (btFrom == btTo)
-            return;
-
-        ProjectileConvexCallback resultCallback(projectile->getCasterCollisionObject(), projectile->getCollisionObject(), btFrom, btTo, projectile);
-        resultCallback.m_collisionFilterMask = 0xff;
-        resultCallback.m_collisionFilterGroup = CollisionType_Projectile;
-
-        const btQuaternion btrot = btQuaternion::getIdentity();
-        btTransform from_ (btrot, btFrom);
-        btTransform to_ (btrot, btTo);
-
-        mTaskScheduler->convexSweepTest(projectile->getConvexShape(), from_, to_, resultCallback);
-
-        const auto newpos = projectile->isActive() ? position : Misc::Convert::toOsg(projectile->getHitPosition());
-        projectile->setPosition(newpos);
-        mTaskScheduler->updateSingleAabb(foundProjectile->second);
-    }
-
     void PhysicsSystem::updateRotation(const MWWorld::Ptr &ptr, osg::Quat rotate)
     {
         if (auto foundObject = mObjects.find(ptr.mRef); foundObject != mObjects.end())
@@ -718,7 +691,7 @@ namespace MWPhysics
     std::vector<Simulation> PhysicsSystem::prepareSimulation(bool willSimulate)
     {
         std::vector<Simulation> simulations;
-        simulations.reserve(mActors.size());
+        simulations.reserve(mActors.size() + mProjectiles.size());
         const MWBase::World *world = MWBase::Environment::get().getWorld();
         for (const auto& [ref, physicActor] : mActors)
         {
@@ -753,6 +726,12 @@ namespace MWPhysics
             if (willSimulate)
                 handleJump(ptr);
         }
+
+        for (const auto& [id, projectile] : mProjectiles)
+        {
+            simulations.emplace_back(ProjectileSimulation{projectile, ProjectileFrameData{*projectile}});
+        }
+
         return simulations;
     }
 
@@ -981,6 +960,15 @@ namespace MWPhysics
         mLastStuckPosition = actor.getLastStuckPosition();
     }
 
+    ProjectileFrameData::ProjectileFrameData(Projectile& projectile)
+        : mPosition(projectile.getPosition())
+        , mMovement(projectile.velocity())
+        , mCaster(projectile.getCasterCollisionObject())
+        , mCollisionObject(projectile.getCollisionObject())
+        , mProjectile(&projectile)
+    {
+    }
+
     WorldFrameData::WorldFrameData()
         : mIsInStorm(MWBase::Environment::get().getWorld()->isInStorm())
         , mStormDirection(MWBase::Environment::get().getWorld()->getStormDirection())
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index be9fa10aa6..a025f1cc8b 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -101,6 +101,16 @@ namespace MWPhysics
         const bool mSkipCollisionDetection;
     };
 
+    struct ProjectileFrameData
+    {
+        explicit ProjectileFrameData(Projectile& projectile);
+        osg::Vec3f mPosition;
+        osg::Vec3f mMovement;
+        const btCollisionObject* mCaster;
+        const btCollisionObject* mCollisionObject;
+        Projectile* mProjectile;
+    };
+
     struct WorldFrameData
     {
         WorldFrameData();
@@ -109,7 +119,8 @@ namespace MWPhysics
     };
 
     using ActorSimulation = std::pair<std::shared_ptr<Actor>, ActorFrameData>;
-    using Simulation = std::variant<ActorSimulation>;
+    using ProjectileSimulation = std::pair<std::shared_ptr<Projectile>, ProjectileFrameData>;
+    using Simulation = std::variant<ActorSimulation, ProjectileSimulation>;
 
     class PhysicsSystem : public RayCastingInterface
     {
@@ -128,7 +139,6 @@ namespace MWPhysics
 
             int addProjectile(const MWWorld::Ptr& caster, const osg::Vec3f& position, const std::string& mesh, bool computeRadius);
             void setCaster(int projectileId, const MWWorld::Ptr& caster);
-            void updateProjectile(const int projectileId, const osg::Vec3f &position) const;
             void removeProjectile(const int projectileId);
 
             void updatePtr (const MWWorld::Ptr& old, const MWWorld::Ptr& updated);
diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index 9ee137fab6..ea1d6bde1a 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -432,7 +432,7 @@ namespace MWWorld
             float speed = fTargetSpellMaxSpeed * magicBoltState.mSpeed;
             osg::Vec3f direction = orient * osg::Vec3f(0,1,0);
             direction.normalize();
-            osg::Vec3f newPos = projectile->getPosition() + direction * duration * speed;
+            projectile->setVelocity(direction * speed);
 
             update(magicBoltState, duration);
 
@@ -441,8 +441,6 @@ namespace MWWorld
             if (!caster.isEmpty() && caster.getClass().isActor() && caster != MWMechanics::getPlayer())
                 caster.getClass().getCreatureStats(caster).getAiSequence().getCombatTargets(targetActors);
             projectile->setValidTargets(targetActors);
-
-            mPhysics->updateProjectile(magicBoltState.mProjectileId, newPos);
         }
     }
 
@@ -460,7 +458,7 @@ namespace MWWorld
             // simulating aerodynamics at all
             projectileState.mVelocity -= osg::Vec3f(0, 0, Constants::GravityConst * Constants::UnitsPerMeter * 0.1f) * duration;
 
-            osg::Vec3f newPos = projectile->getPosition() + projectileState.mVelocity * duration;
+            projectile->setVelocity(projectileState.mVelocity);
 
             // rotation does not work well for throwing projectiles - their roll angle will depend on shooting direction.
             if (!projectileState.mThrown)
@@ -479,8 +477,6 @@ namespace MWWorld
             if (!caster.isEmpty() && caster.getClass().isActor() && caster != MWMechanics::getPlayer())
                 caster.getClass().getCreatureStats(caster).getAiSequence().getCombatTargets(targetActors);
             projectile->setValidTargets(targetActors);
-
-            mPhysics->updateProjectile(projectileState.mProjectileId, newPos);
         }
     }
 
@@ -493,7 +489,7 @@ namespace MWWorld
 
             auto* projectile = mPhysics->getProjectile(projectileState.mProjectileId);
 
-            const auto pos = projectile->getPosition();
+            const auto pos = projectile->getSimulationPosition();
             projectileState.mNode->setPosition(pos);
 
             if (projectile->isActive())
@@ -529,7 +525,7 @@ namespace MWWorld
 
             auto* projectile = mPhysics->getProjectile(magicBoltState.mProjectileId);
 
-            const auto pos = projectile->getPosition();
+            const auto pos = projectile->getSimulationPosition();
             magicBoltState.mNode->setPosition(pos);
             for (const auto& sound : magicBoltState.mSounds)
                 sound->setPosition(pos);

From 1a51c6eb5dfe4e4a95fa9ec99a9a16ce9f0b6bd3 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 27 Oct 2021 23:40:54 +0200
Subject: [PATCH 1560/2859] Update CMakeLists.txt

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 13196a4aa6..49f3f4b3bf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -707,7 +707,7 @@ endif()
 if (BUILD_OPENMW AND APPLE)
     # Without these flags LuaJit crashes on startup on OSX
     set_target_properties(openmw PROPERTIES LINK_FLAGS "-pagezero_size 10000 -image_base 100000000")
-    set_target_properties(components openmw PROPERTIES COMPILE_DEFINITIONS "GL_SILENCE_DEPRECATION=1")
+    add_compile_definitions(GL_SILENCE_DEPRECATION=1)
 endif()
 
 # Apple bundling

From fa5581942eb5019f84b866f038741d4ff9b692ba Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 27 Oct 2021 23:54:04 +0200
Subject: [PATCH 1561/2859] Update CMakeLists.txt

---
 CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 49f3f4b3bf..1b4e5609ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -707,7 +707,8 @@ endif()
 if (BUILD_OPENMW AND APPLE)
     # Without these flags LuaJit crashes on startup on OSX
     set_target_properties(openmw PROPERTIES LINK_FLAGS "-pagezero_size 10000 -image_base 100000000")
-    add_compile_definitions(GL_SILENCE_DEPRECATION=1)
+    target_compile_definitions(components PRIVATE GL_SILENCE_DEPRECATION=1)
+    target_compile_definitions(openmw PRIVATE GL_SILENCE_DEPRECATION=1)
 endif()
 
 # Apple bundling

From 73e6df1fa3ebf68370151e31427623b861b76d22 Mon Sep 17 00:00:00 2001
From: wareya <wareya@gmail.com>
Date: Thu, 28 Oct 2021 11:51:22 +0000
Subject: [PATCH 1562/2859] Make random displacement more random and double
 raindrop density in each axis (4x the raindrops)

---
 files/shaders/water_fragment.glsl | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/files/shaders/water_fragment.glsl b/files/shaders/water_fragment.glsl
index 929bdd603d..b5d47437c2 100644
--- a/files/shaders/water_fragment.glsl
+++ b/files/shaders/water_fragment.glsl
@@ -55,11 +55,19 @@ const float WOBBLY_SHORE_FADE_DISTANCE = 6200.0;   // fade out wobbly shores to
 
 // ---------------- rain ripples related stuff ---------------------
 
-const float RAIN_RIPPLE_GAPS = 5.0;
-const float RAIN_RIPPLE_RADIUS = 0.1;
+const float RAIN_RIPPLE_GAPS = 10.0;
+const float RAIN_RIPPLE_RADIUS = 0.2;
 
-vec2 randOffset(vec2 c)
+float scramble(float x, float z)
 {
+    return mod(pow(x*3.0+1.0, z), 1.0);
+}
+
+vec2 randOffset(vec2 c, float time)
+{
+  time = mod(time/1000.0, 1.0);
+  c.x *= scramble(scramble(time + c.x/1000.0, 4.0), 3.0) + 1.0;
+  c.y *= scramble(scramble(time + c.y/1000.0, 3.5), 3.0) + 1.0;
   return fract(vec2(
           c.x * c.y / 8.0 + c.y * 0.3 + c.x * 0.2,
           c.x * c.y / 14.0 + c.y * 0.5 + c.x * 0.7));
@@ -85,8 +93,7 @@ float blipDerivative(float x)
 
 vec2 randomize_center(vec2 i_part, float time)
 {
-  time = 0.5 + mod(time/1000.0, 1.0)*0.5;
-  vec2 center = vec2(0.5,0.5) + (0.5 - RAIN_RIPPLE_RADIUS) * (2.0 * randOffset(i_part*time) - 1.0);
+  vec2 center = vec2(0.5,0.5) + (0.5 - RAIN_RIPPLE_RADIUS) * (2.0 * randOffset(i_part, time) - 1.0);
   return center;
 }
 
@@ -128,7 +135,7 @@ vec4 rain(vec2 uv, float time)
   ret.w    = a.w + c.w/8.0;
   return ret;
 }
-vec4 rainCombined(vec2 uv, float time)     // returns ripple normal in xyz and ripple energy in w
+vec4 rainCombined(vec2 uv, float time) // returns ripple normal in xyz and fake specularity in w
 {
   return
     rain(uv,time) +

From 9b565c4cf9413af744fb4224cd66e9ab8a3ad749 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 28 Oct 2021 22:16:43 +0200
Subject: [PATCH 1563/2859] Remove dead code

---
 apps/opencs/model/world/scriptcontext.cpp |  5 -----
 apps/opencs/model/world/scriptcontext.hpp |  3 ---
 apps/openmw/mwscript/compilercontext.cpp  | 10 ----------
 apps/openmw/mwscript/compilercontext.hpp  |  3 ---
 components/compiler/context.hpp           |  3 ---
 5 files changed, 24 deletions(-)

diff --git a/apps/opencs/model/world/scriptcontext.cpp b/apps/opencs/model/world/scriptcontext.cpp
index 344ae322e9..9b465d7ffb 100644
--- a/apps/opencs/model/world/scriptcontext.cpp
+++ b/apps/opencs/model/world/scriptcontext.cpp
@@ -102,11 +102,6 @@ bool CSMWorld::ScriptContext::isId (const std::string& name) const
     return std::binary_search (mIds.begin(), mIds.end(), Misc::StringUtils::lowerCase (name));
 }
 
-bool CSMWorld::ScriptContext::isJournalId (const std::string& name) const
-{
-    return mData.getJournals().searchId (name)!=-1;
-}
-
 void CSMWorld::ScriptContext::invalidateIds()
 {
     mIdsUpdated = false;
diff --git a/apps/opencs/model/world/scriptcontext.hpp b/apps/opencs/model/world/scriptcontext.hpp
index 8e1a5e57b8..cb08fc70bd 100644
--- a/apps/opencs/model/world/scriptcontext.hpp
+++ b/apps/opencs/model/world/scriptcontext.hpp
@@ -39,9 +39,6 @@ namespace CSMWorld
             bool isId (const std::string& name) const override;
             ///< Does \a name match an ID, that can be referenced?
 
-            bool isJournalId (const std::string& name) const override;
-            ///< Does \a name match a journal ID?
-
             void invalidateIds();
 
             void clear();
diff --git a/apps/openmw/mwscript/compilercontext.cpp b/apps/openmw/mwscript/compilercontext.cpp
index 4a7038e1cb..983365e06a 100644
--- a/apps/openmw/mwscript/compilercontext.cpp
+++ b/apps/openmw/mwscript/compilercontext.cpp
@@ -86,14 +86,4 @@ namespace MWScript
             store.get<ESM::Weapon>().search (name) ||
             store.get<ESM::Script>().search (name);
     }
-
-    bool CompilerContext::isJournalId (const std::string& name) const
-    {
-        const MWWorld::ESMStore &store =
-            MWBase::Environment::get().getWorld()->getStore();
-
-        const ESM::Dialogue *topic = store.get<ESM::Dialogue>().search (name);
-
-        return topic && topic->mType==ESM::Dialogue::Journal;
-    }
 }
diff --git a/apps/openmw/mwscript/compilercontext.hpp b/apps/openmw/mwscript/compilercontext.hpp
index 00b10ea06d..d800781fd8 100644
--- a/apps/openmw/mwscript/compilercontext.hpp
+++ b/apps/openmw/mwscript/compilercontext.hpp
@@ -39,9 +39,6 @@ namespace MWScript
 
             bool isId (const std::string& name) const override;
             ///< Does \a name match an ID, that can be referenced?
-
-            bool isJournalId (const std::string& name) const override;
-            ///< Does \a name match a journal ID?
     };
 }
 
diff --git a/components/compiler/context.hpp b/components/compiler/context.hpp
index 399e8125bb..d3caba7c53 100644
--- a/components/compiler/context.hpp
+++ b/components/compiler/context.hpp
@@ -42,9 +42,6 @@ namespace Compiler
 
             virtual bool isId (const std::string& name) const = 0;
             ///< Does \a name match an ID, that can be referenced?
-
-            virtual bool isJournalId (const std::string& name) const = 0;
-            ///< Does \a name match a journal ID?
     };
 }
 

From 37386f417ed481bc682ffa11359b073dc334f6d3 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Fri, 29 Oct 2021 20:09:47 +0200
Subject: [PATCH 1564/2859] Support *.omwscripts in openmw-launcher

---
 apps/launcher/datafilespage.cpp                    |  2 +-
 apps/launcher/utils/cellnameloader.cpp             |  2 ++
 apps/opencs/view/doc/filedialog.cpp                |  2 +-
 components/contentselector/model/contentmodel.cpp  | 14 +++++++++++++-
 components/contentselector/model/contentmodel.hpp  |  3 ++-
 .../contentselector/view/contentselector.cpp       |  8 ++++----
 .../contentselector/view/contentselector.hpp       |  4 ++--
 7 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index 24729d5096..4c66668e4a 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -32,7 +32,7 @@ Launcher::DataFilesPage::DataFilesPage(Files::ConfigurationManager &cfg, Config:
 {
     ui.setupUi (this);
     setObjectName ("DataFilesPage");
-    mSelector = new ContentSelectorView::ContentSelector (ui.contentSelectorWidget);
+    mSelector = new ContentSelectorView::ContentSelector (ui.contentSelectorWidget, /*showOMWScripts=*/true);
     const QString encoding = mGameSettings.value("encoding", "win1252");
     mSelector->setEncoding(encoding);
 
diff --git a/apps/launcher/utils/cellnameloader.cpp b/apps/launcher/utils/cellnameloader.cpp
index 594946394c..e8ba54651c 100644
--- a/apps/launcher/utils/cellnameloader.cpp
+++ b/apps/launcher/utils/cellnameloader.cpp
@@ -10,6 +10,8 @@ QSet<QString> CellNameLoader::getCellNames(QStringList &contentPaths)
 
     // Loop through all content files
     for (auto &contentPath : contentPaths) {
+        if (contentPath.endsWith(".omwscripts", Qt::CaseInsensitive))
+            continue;
         esmReader.open(contentPath.toStdString());
 
         // Loop through all records
diff --git a/apps/opencs/view/doc/filedialog.cpp b/apps/opencs/view/doc/filedialog.cpp
index 8ff063ed31..c3d0d8cc50 100644
--- a/apps/opencs/view/doc/filedialog.cpp
+++ b/apps/opencs/view/doc/filedialog.cpp
@@ -24,7 +24,7 @@ CSVDoc::FileDialog::FileDialog(QWidget *parent) :
     resize(400, 400);
 
     setObjectName ("FileDialog");
-    mSelector = new ContentSelectorView::ContentSelector (ui.contentSelectorWidget);
+    mSelector = new ContentSelectorView::ContentSelector (ui.contentSelectorWidget, /*showOMWScripts=*/false);
     mAdjusterWidget = new AdjusterWidget (this);
 }
 
diff --git a/components/contentselector/model/contentmodel.cpp b/components/contentselector/model/contentmodel.cpp
index 690f968142..208b1315f3 100644
--- a/components/contentselector/model/contentmodel.cpp
+++ b/components/contentselector/model/contentmodel.cpp
@@ -9,9 +9,10 @@
 
 #include <components/esm/esmreader.hpp>
 
-ContentSelectorModel::ContentModel::ContentModel(QObject *parent, QIcon warningIcon) :
+ContentSelectorModel::ContentModel::ContentModel(QObject *parent, QIcon warningIcon, bool showOMWScripts) :
     QAbstractTableModel(parent),
     mWarningIcon(warningIcon),
+    mShowOMWScripts(showOMWScripts),
     mMimeType ("application/omwcontent"),
     mMimeTypes (QStringList() << mMimeType),
     mColumnCount (1),
@@ -416,6 +417,8 @@ void ContentSelectorModel::ContentModel::addFiles(const QString &path)
     QDir dir(path);
     QStringList filters;
     filters << "*.esp" << "*.esm" << "*.omwgame" << "*.omwaddon";
+    if (mShowOMWScripts)
+        filters << "*.omwscripts";
     dir.setNameFilters(filters);
 
     for (const QString &path2 : dir.entryList())
@@ -425,6 +428,15 @@ void ContentSelectorModel::ContentModel::addFiles(const QString &path)
         if (item(info.fileName()))
             continue;
 
+        if (info.fileName().endsWith(".omwscripts", Qt::CaseInsensitive))
+        {
+            EsmFile *file = new EsmFile(path2);
+            file->setDate(info.lastModified());
+            file->setFilePath(info.absoluteFilePath());
+            addFile(file);
+            continue;
+        }
+
         try {
             ESM::ESMReader fileReader;
             ToUTF8::Utf8Encoder encoder =
diff --git a/components/contentselector/model/contentmodel.hpp b/components/contentselector/model/contentmodel.hpp
index d245a0dcbf..f8130e3649 100644
--- a/components/contentselector/model/contentmodel.hpp
+++ b/components/contentselector/model/contentmodel.hpp
@@ -23,7 +23,7 @@ namespace ContentSelectorModel
     {
         Q_OBJECT
     public:
-        explicit ContentModel(QObject *parent, QIcon warningIcon);
+        explicit ContentModel(QObject *parent, QIcon warningIcon, bool showOMWScripts);
         ~ContentModel();
 
         void setEncoding(const QString &encoding);
@@ -84,6 +84,7 @@ namespace ContentSelectorModel
         QSet<QString> mPluginsWithLoadOrderError;
         QString mEncoding;
         QIcon mWarningIcon;
+        bool mShowOMWScripts;
 
     public:
 
diff --git a/components/contentselector/view/contentselector.cpp b/components/contentselector/view/contentselector.cpp
index d7996dfae3..f18e80dd0a 100644
--- a/components/contentselector/view/contentselector.cpp
+++ b/components/contentselector/view/contentselector.cpp
@@ -10,21 +10,21 @@
 #include <QClipboard>
 #include <QModelIndex>
 
-ContentSelectorView::ContentSelector::ContentSelector(QWidget *parent) :
+ContentSelectorView::ContentSelector::ContentSelector(QWidget *parent, bool showOMWScripts) :
     QObject(parent)
 {
     ui.setupUi(parent);
     ui.addonView->setDragDropMode(QAbstractItemView::InternalMove);
 
-    buildContentModel();
+    buildContentModel(showOMWScripts);
     buildGameFileView();
     buildAddonView();
 }
 
-void ContentSelectorView::ContentSelector::buildContentModel()
+void ContentSelectorView::ContentSelector::buildContentModel(bool showOMWScripts)
 {
     QIcon warningIcon(ui.addonView->style()->standardIcon(QStyle::SP_MessageBoxWarning).pixmap(QSize(16, 15)));
-    mContentModel = new ContentSelectorModel::ContentModel(this, warningIcon);
+    mContentModel = new ContentSelectorModel::ContentModel(this, warningIcon, showOMWScripts);
 }
 
 void ContentSelectorView::ContentSelector::buildGameFileView()
diff --git a/components/contentselector/view/contentselector.hpp b/components/contentselector/view/contentselector.hpp
index cda68fa1b7..4a9983c1bf 100644
--- a/components/contentselector/view/contentselector.hpp
+++ b/components/contentselector/view/contentselector.hpp
@@ -23,7 +23,7 @@ namespace ContentSelectorView
 
     public:
 
-        explicit ContentSelector(QWidget *parent = nullptr);
+        explicit ContentSelector(QWidget *parent = nullptr, bool showOMWScripts = false);
 
         QString currentFile() const;
 
@@ -56,7 +56,7 @@ namespace ContentSelectorView
 
         Ui::ContentSelector ui;
 
-        void buildContentModel();
+        void buildContentModel(bool showOMWScripts);
         void buildGameFileView();
         void buildAddonView();
         void buildContextMenu();

From 29a772c33fcc3de36aaa1d0d9517ab1e38010a8b Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 28 Oct 2021 01:43:25 +0200
Subject: [PATCH 1565/2859] Rename Resource::BulletShape::CollisionBox fields
 according to styleguide

---
 apps/openmw/mwphysics/actor.cpp               |  2 +-
 apps/openmw/mwphysics/physicssystem.cpp       |  4 +--
 .../nifloader/testbulletnifloader.cpp         | 36 +++++++++----------
 components/nifbullet/bulletnifloader.cpp      |  8 ++---
 components/resource/bulletshape.hpp           |  4 +--
 components/resource/bulletshapemanager.cpp    |  8 ++---
 6 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index 4857339228..9d02d310b0 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -22,7 +22,7 @@ namespace MWPhysics
 
 Actor::Actor(const MWWorld::Ptr& ptr, const Resource::BulletShape* shape, PhysicsTaskScheduler* scheduler, bool canWaterWalk)
   : mStandingOnPtr(nullptr), mCanWaterWalk(canWaterWalk), mWalkingOnWater(false)
-  , mMeshTranslation(shape->mCollisionBox.center), mOriginalHalfExtents(shape->mCollisionBox.extents)
+  , mMeshTranslation(shape->mCollisionBox.mCenter), mOriginalHalfExtents(shape->mCollisionBox.mExtents)
   , mStuckFrames(0), mLastStuckPosition{0, 0, 0}
   , mForce(0.f, 0.f, 0.f), mOnGround(true), mOnSlope(false)
   , mInternalCollisionMode(true)
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 5b00677fce..636c3492f7 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -618,7 +618,7 @@ namespace MWPhysics
         osg::ref_ptr<const Resource::BulletShape> shape = mShapeManager->getShape(mesh);
 
         // Try to get shape from basic model as fallback for creatures
-        if (!ptr.getClass().isNpc() && shape && shape->mCollisionBox.extents.length2() == 0)
+        if (!ptr.getClass().isNpc() && shape && shape->mCollisionBox.mExtents.length2() == 0)
         {
             const std::string fallbackModel = ptr.getClass().getModel(ptr);
             if (fallbackModel != mesh)
@@ -643,7 +643,7 @@ namespace MWPhysics
     {
         osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance = mShapeManager->getInstance(mesh);
         assert(shapeInstance);
-        float radius = computeRadius ? shapeInstance->mCollisionBox.extents.length() / 2.f : 1.f;
+        float radius = computeRadius ? shapeInstance->mCollisionBox.mExtents.length() / 2.f : 1.f;
 
         mProjectileId++;
 
diff --git a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
index a1f5d6091d..d0a5b3d2e5 100644
--- a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
+++ b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
@@ -162,8 +162,8 @@ namespace Resource
     {
         return compareObjects(lhs.mCollisionShape, rhs.mCollisionShape)
             && compareObjects(lhs.mAvoidCollisionShape, rhs.mAvoidCollisionShape)
-            && lhs.mCollisionBox.extents == rhs.mCollisionBox.extents
-            && lhs.mCollisionBox.center == rhs.mCollisionBox.center
+            && lhs.mCollisionBox.mExtents == rhs.mCollisionBox.mExtents
+            && lhs.mCollisionBox.mCenter == rhs.mCollisionBox.mCenter
             && lhs.mAnimatedShapes == rhs.mAnimatedShapes;
     }
 
@@ -172,8 +172,8 @@ namespace Resource
         return stream << "Resource::BulletShape {"
             << value.mCollisionShape << ", "
             << value.mAvoidCollisionShape << ", "
-            << "osg::Vec3f {" << value.mCollisionBox.extents << "}" << ", "
-            << "osg::Vec3f {" << value.mCollisionBox.center << "}" << ", "
+            << "osg::Vec3f {" << value.mCollisionBox.mExtents << "}" << ", "
+            << "osg::Vec3f {" << value.mCollisionBox.mCenter << "}" << ", "
             << value.mAnimatedShapes
             << "}";
     }
@@ -441,8 +441,8 @@ namespace
         const auto result = mLoader.load(mNifFile);
 
         Resource::BulletShape expected;
-        expected.mCollisionBox.extents = osg::Vec3f(1, 2, 3);
-        expected.mCollisionBox.center = osg::Vec3f(-1, -2, -3);
+        expected.mCollisionBox.mExtents = osg::Vec3f(1, 2, 3);
+        expected.mCollisionBox.mCenter = osg::Vec3f(-1, -2, -3);
         std::unique_ptr<btBoxShape> box(new btBoxShape(btVector3(1, 2, 3)));
         std::unique_ptr<btCompoundShape> shape(new btCompoundShape);
         shape->addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(-1, -2, -3)), box.release());
@@ -466,8 +466,8 @@ namespace
         const auto result = mLoader.load(mNifFile);
 
         Resource::BulletShape expected;
-        expected.mCollisionBox.extents = osg::Vec3f(1, 2, 3);
-        expected.mCollisionBox.center = osg::Vec3f(-1, -2, -3);
+        expected.mCollisionBox.mExtents = osg::Vec3f(1, 2, 3);
+        expected.mCollisionBox.mCenter = osg::Vec3f(-1, -2, -3);
         std::unique_ptr<btBoxShape> box(new btBoxShape(btVector3(1, 2, 3)));
         std::unique_ptr<btCompoundShape> shape(new btCompoundShape);
         shape->addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(-1, -2, -3)), box.release());
@@ -496,8 +496,8 @@ namespace
         const auto result = mLoader.load(mNifFile);
 
         Resource::BulletShape expected;
-        expected.mCollisionBox.extents = osg::Vec3f(1, 2, 3);
-        expected.mCollisionBox.center = osg::Vec3f(-1, -2, -3);
+        expected.mCollisionBox.mExtents = osg::Vec3f(1, 2, 3);
+        expected.mCollisionBox.mCenter = osg::Vec3f(-1, -2, -3);
         std::unique_ptr<btBoxShape> box(new btBoxShape(btVector3(1, 2, 3)));
         std::unique_ptr<btCompoundShape> shape(new btCompoundShape);
         shape->addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(-1, -2, -3)), box.release());
@@ -531,8 +531,8 @@ namespace
         const auto result = mLoader.load(mNifFile);
 
         Resource::BulletShape expected;
-        expected.mCollisionBox.extents = osg::Vec3f(1, 2, 3);
-        expected.mCollisionBox.center = osg::Vec3f(-1, -2, -3);
+        expected.mCollisionBox.mExtents = osg::Vec3f(1, 2, 3);
+        expected.mCollisionBox.mCenter = osg::Vec3f(-1, -2, -3);
         std::unique_ptr<btBoxShape> box(new btBoxShape(btVector3(1, 2, 3)));
         std::unique_ptr<btCompoundShape> shape(new btCompoundShape);
         shape->addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(-1, -2, -3)), box.release());
@@ -566,8 +566,8 @@ namespace
         const auto result = mLoader.load(mNifFile);
 
         Resource::BulletShape expected;
-        expected.mCollisionBox.extents = osg::Vec3f(4, 5, 6);
-        expected.mCollisionBox.center = osg::Vec3f(-4, -5, -6);
+        expected.mCollisionBox.mExtents = osg::Vec3f(4, 5, 6);
+        expected.mCollisionBox.mCenter = osg::Vec3f(-4, -5, -6);
         std::unique_ptr<btBoxShape> box(new btBoxShape(btVector3(4, 5, 6)));
         std::unique_ptr<btCompoundShape> shape(new btCompoundShape);
         shape->addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(-4, -5, -6)), box.release());
@@ -589,8 +589,8 @@ namespace
         const auto result = mLoader.load(mNifFile);
 
         Resource::BulletShape expected;
-        expected.mCollisionBox.extents = osg::Vec3f(1, 2, 3);
-        expected.mCollisionBox.center = osg::Vec3f(-1, -2, -3);
+        expected.mCollisionBox.mExtents = osg::Vec3f(1, 2, 3);
+        expected.mCollisionBox.mCenter = osg::Vec3f(-1, -2, -3);
 
         EXPECT_EQ(*result, expected);
     }
@@ -623,8 +623,8 @@ namespace
         const auto result = mLoader.load(mNifFile);
 
         Resource::BulletShape expected;
-        expected.mCollisionBox.extents = osg::Vec3f(1, 2, 3);
-        expected.mCollisionBox.center = osg::Vec3f(-1, -2, -3);
+        expected.mCollisionBox.mExtents = osg::Vec3f(1, 2, 3);
+        expected.mCollisionBox.mCenter = osg::Vec3f(-1, -2, -3);
 
         EXPECT_EQ(*result, expected);
     }
diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index 6ae1759395..03ef63014b 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -143,8 +143,8 @@ osg::ref_ptr<Resource::BulletShape> BulletNifLoader::load(const Nif::File& nif)
     {
         if (findBoundingBox(node, filename))
         {
-            const btVector3 extents = Misc::Convert::toBullet(mShape->mCollisionBox.extents);
-            const btVector3 center = Misc::Convert::toBullet(mShape->mCollisionBox.center);
+            const btVector3 extents = Misc::Convert::toBullet(mShape->mCollisionBox.mExtents);
+            const btVector3 center = Misc::Convert::toBullet(mShape->mCollisionBox.mCenter);
             std::unique_ptr<btCompoundShape> compound (new btCompoundShape);
             std::unique_ptr<btBoxShape> boxShape(new btBoxShape(extents));
             btTransform transform = btTransform::getIdentity();
@@ -206,8 +206,8 @@ bool BulletNifLoader::findBoundingBox(const Nif::Node* node, const std::string&
         switch (type)
         {
             case Nif::NiBoundingVolume::Type::BOX_BV:
-                mShape->mCollisionBox.extents = node->bounds.box.extents;
-                mShape->mCollisionBox.center = node->bounds.box.center;
+                mShape->mCollisionBox.mExtents = node->bounds.box.extents;
+                mShape->mCollisionBox.mCenter = node->bounds.box.center;
                 break;
             default:
             {
diff --git a/components/resource/bulletshape.hpp b/components/resource/bulletshape.hpp
index 6ac8064cb3..b40ab6b6a7 100644
--- a/components/resource/bulletshape.hpp
+++ b/components/resource/bulletshape.hpp
@@ -29,8 +29,8 @@ namespace Resource
 
         struct CollisionBox
         {
-            osg::Vec3f extents;
-            osg::Vec3f center;
+            osg::Vec3f mExtents;
+            osg::Vec3f mCenter;
         };
         // Used for actors and projectiles. mCollisionShape is used for actors only when we need to autogenerate collision box for creatures.
         // For now, use one file <-> one resource for simplicity.
diff --git a/components/resource/bulletshapemanager.cpp b/components/resource/bulletshapemanager.cpp
index 5b6dce067c..d295265b5f 100644
--- a/components/resource/bulletshapemanager.cpp
+++ b/components/resource/bulletshapemanager.cpp
@@ -86,10 +86,10 @@ public:
         btBvhTriangleMeshShape* triangleMeshShape = new TriangleMeshShape(mTriangleMesh.release(), true);
         btVector3 aabbMin = triangleMeshShape->getLocalAabbMin();
         btVector3 aabbMax = triangleMeshShape->getLocalAabbMax();
-        shape->mCollisionBox.extents[0] = (aabbMax[0] - aabbMin[0]) / 2.0f;
-        shape->mCollisionBox.extents[1] = (aabbMax[1] - aabbMin[1]) / 2.0f;
-        shape->mCollisionBox.extents[2] = (aabbMax[2] - aabbMin[2]) / 2.0f;
-        shape->mCollisionBox.center = osg::Vec3f( (aabbMax[0] + aabbMin[0]) / 2.0f,
+        shape->mCollisionBox.mExtents[0] = (aabbMax[0] - aabbMin[0]) / 2.0f;
+        shape->mCollisionBox.mExtents[1] = (aabbMax[1] - aabbMin[1]) / 2.0f;
+        shape->mCollisionBox.mExtents[2] = (aabbMax[2] - aabbMin[2]) / 2.0f;
+        shape->mCollisionBox.mCenter = osg::Vec3f( (aabbMax[0] + aabbMin[0]) / 2.0f,
                                                   (aabbMax[1] + aabbMin[1]) / 2.0f,
                                                   (aabbMax[2] + aabbMin[2]) / 2.0f );
         shape->mCollisionShape = triangleMeshShape;

From 8c0102e1eeb1679f0a55df7683e3145f534fc27f Mon Sep 17 00:00:00 2001
From: wareya <wareya@gmail.com>
Date: Fri, 29 Oct 2021 15:11:08 -0400
Subject: [PATCH 1566/2859] Optimize short-trace test to only be done when
 particularly helpful

---
 apps/openmw/mwphysics/movementsolver.cpp |  4 +-
 apps/openmw/mwphysics/stepper.cpp        |  4 +-
 apps/openmw/mwphysics/trace.cpp          | 50 +++++++++++++++---------
 apps/openmw/mwphysics/trace.h            |  2 +-
 4 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/apps/openmw/mwphysics/movementsolver.cpp b/apps/openmw/mwphysics/movementsolver.cpp
index 44a5391f0d..28570e6687 100644
--- a/apps/openmw/mwphysics/movementsolver.cpp
+++ b/apps/openmw/mwphysics/movementsolver.cpp
@@ -203,7 +203,7 @@ namespace MWPhysics
             if((newPosition - nextpos).length2() > 0.0001)
             {
                 // trace to where character would go if there were no obstructions
-                tracer.doTrace(actor.mCollisionObject, newPosition, nextpos, collisionWorld);
+                tracer.doTrace(actor.mCollisionObject, newPosition, nextpos, collisionWorld, actor.mIsOnGround);
 
                 // check for obstructions
                 if(tracer.mFraction >= 1.0f)
@@ -338,7 +338,7 @@ namespace MWPhysics
             osg::Vec3f from = newPosition;
             auto dropDistance = 2*sGroundOffset + (actor.mIsOnGround ? sStepSizeDown : 0);
             osg::Vec3f to = newPosition - osg::Vec3f(0,0,dropDistance);
-            tracer.doTrace(actor.mCollisionObject, from, to, collisionWorld);
+            tracer.doTrace(actor.mCollisionObject, from, to, collisionWorld, actor.mIsOnGround);
             if(tracer.mFraction < 1.0f)
             {
                 if (!isActor(tracer.mHitObject))
diff --git a/apps/openmw/mwphysics/stepper.cpp b/apps/openmw/mwphysics/stepper.cpp
index af85658910..5ef6833701 100644
--- a/apps/openmw/mwphysics/stepper.cpp
+++ b/apps/openmw/mwphysics/stepper.cpp
@@ -36,7 +36,7 @@ namespace MWPhysics
         // Stairstepping algorithms work by moving up to avoid the step, moving forwards, then moving back down onto the ground.
         // This algorithm has a couple of minor problems, but they don't cause problems for sane geometry, and just prevent stepping on insane geometry.
 
-        mUpStepper.doTrace(mColObj, position, position + osg::Vec3f(0.0f, 0.0f, Constants::sStepSizeUp), mColWorld);
+        mUpStepper.doTrace(mColObj, position, position + osg::Vec3f(0.0f, 0.0f, Constants::sStepSizeUp), mColWorld, onGround);
 
         float upDistance = 0;
         if(!mUpStepper.mHitObject)
@@ -117,7 +117,7 @@ namespace MWPhysics
                 downStepSize = upDistance;
             else
                 downStepSize = moveDistance + upDistance + sStepSizeDown;
-            mDownStepper.doTrace(mColObj, tracerDest, tracerDest + osg::Vec3f(0.0f, 0.0f, -downStepSize), mColWorld);
+            mDownStepper.doTrace(mColObj, tracerDest, tracerDest + osg::Vec3f(0.0f, 0.0f, -downStepSize), mColWorld, onGround);
 
             // can't step down onto air, non-walkable-slopes, or actors
             // NOTE: using a capsule causes isWalkableSlope (used in canStepDown) to fail on certain geometry that were intended to be valid at the bottoms of stairs
diff --git a/apps/openmw/mwphysics/trace.cpp b/apps/openmw/mwphysics/trace.cpp
index b2c5410a62..e489ea0eb2 100644
--- a/apps/openmw/mwphysics/trace.cpp
+++ b/apps/openmw/mwphysics/trace.cpp
@@ -24,45 +24,57 @@ ActorConvexCallback sweepHelper(const btCollisionObject *actor, const btVector3&
     assert(shape->isConvex());
 
     const btVector3 motion = from - to; // FIXME: this is backwards; means ActorConvexCallback is doing dot product tests backwards too
-    ActorConvexCallback newTraceCallback(actor, motion, btScalar(0.0), world);
+    ActorConvexCallback traceCallback(actor, motion, btScalar(0.0), world);
     // Inherit the actor's collision group and mask
-    newTraceCallback.m_collisionFilterGroup = actor->getBroadphaseHandle()->m_collisionFilterGroup;
-    newTraceCallback.m_collisionFilterMask = actor->getBroadphaseHandle()->m_collisionFilterMask;
+    traceCallback.m_collisionFilterGroup = actor->getBroadphaseHandle()->m_collisionFilterGroup;
+    traceCallback.m_collisionFilterMask = actor->getBroadphaseHandle()->m_collisionFilterMask;
     if(actorFilter)
-        newTraceCallback.m_collisionFilterMask &= ~CollisionType_Actor;
+        traceCallback.m_collisionFilterMask &= ~CollisionType_Actor;
 
-    world->convexSweepTest(static_cast<const btConvexShape*>(shape), transFrom, transTo, newTraceCallback);
-    return newTraceCallback;
+    world->convexSweepTest(static_cast<const btConvexShape*>(shape), transFrom, transTo, traceCallback);
+    return traceCallback;
 }
 
-void ActorTracer::doTrace(const btCollisionObject *actor, const osg::Vec3f& start, const osg::Vec3f& end, const btCollisionWorld* world)
+void ActorTracer::doTrace(const btCollisionObject *actor, const osg::Vec3f& start, const osg::Vec3f& end, const btCollisionWorld* world, bool attempt_short_trace)
 {
     const btVector3 btstart = Misc::Convert::toBullet(start);
     btVector3 btend = Misc::Convert::toBullet(end);
 
-    bool do_fallback = false;
-    if((btend-btstart).length2() > 5.0*5.0)
+    // Because Bullet's collision trace tests touch *all* geometry in its path, a lot of long collision tests
+    // will unnecessarily test against complex meshes that are dozens of units away. This wouldn't normally be
+    // a problem, but bullet isn't the fastest in the world when it comes to doing tests against triangle meshes.
+    // Therefore, we try out a short trace first, then only fall back to the full length trace if needed.
+    // This trace needs to be at least a couple units long, but there's no one particular ideal length.
+    // The length of 2.1 chosen here is a "works well in practice after testing a few random lengths" value.
+    // (Also, we only do this short test if the intended collision trace is long enough for it to make sense.)
+    const float fallback_length = 2.1f;
+    bool doing_short_trace = false;
+    // For some reason, typical scenes perform a little better if we increase the threshold length for the length test.
+    // (Multiplying by 2 in 'square distance' units gives us about 1.4x the threshold length. In benchmarks this was
+    //  slightly better for the performance of normal scenes than 4.0, and just plain better than 1.0.)
+    if(attempt_short_trace && (btend-btstart).length2() > fallback_length*fallback_length*2.0)
     {
-        btend = btstart + (btend-btstart).normalized()*5.0;
-        do_fallback = true;
+        btend = btstart + (btend-btstart).normalized()*fallback_length;
+        doing_short_trace = true;
     }
 
-    auto newTraceCallback = sweepHelper(actor, btstart, btend, world, false);
+    auto traceCallback = sweepHelper(actor, btstart, btend, world, false);
 
     // Copy the hit data over to our trace results struct:
-    if(newTraceCallback.hasHit())
+    if(traceCallback.hasHit())
     {
-        mFraction = newTraceCallback.m_closestHitFraction;
-        if((end-start).length2() > 0.0)
+        mFraction = traceCallback.m_closestHitFraction;
+        // ensure fraction is correct (covers intended distance traveled instead of actual distance traveled)
+        if(doing_short_trace && (end-start).length2() > 0.0)
             mFraction *= (btend-btstart).length() / (end-start).length();
-        mPlaneNormal = Misc::Convert::toOsg(newTraceCallback.m_hitNormalWorld);
+        mPlaneNormal = Misc::Convert::toOsg(traceCallback.m_hitNormalWorld);
         mEndPos = (end-start)*mFraction + start;
-        mHitPoint = Misc::Convert::toOsg(newTraceCallback.m_hitPointWorld);
-        mHitObject = newTraceCallback.m_hitCollisionObject;
+        mHitPoint = Misc::Convert::toOsg(traceCallback.m_hitPointWorld);
+        mHitObject = traceCallback.m_hitCollisionObject;
     }
     else
     {
-        if(do_fallback)
+        if(doing_short_trace)
         {
             btend = Misc::Convert::toBullet(end);
             auto newTraceCallback = sweepHelper(actor, btstart, btend, world, false);
diff --git a/apps/openmw/mwphysics/trace.h b/apps/openmw/mwphysics/trace.h
index 0297c9e076..af38756b3e 100644
--- a/apps/openmw/mwphysics/trace.h
+++ b/apps/openmw/mwphysics/trace.h
@@ -20,7 +20,7 @@ namespace MWPhysics
 
         float mFraction;
 
-        void doTrace(const btCollisionObject *actor, const osg::Vec3f& start, const osg::Vec3f& end, const btCollisionWorld* world);
+        void doTrace(const btCollisionObject *actor, const osg::Vec3f& start, const osg::Vec3f& end, const btCollisionWorld* world, bool attempt_short_trace = false);
         void findGround(const Actor* actor, const osg::Vec3f& start, const osg::Vec3f& end, const btCollisionWorld* world);
     };
 }

From 68f4c336ce5db928efb7e09ee3c988a3eaba45f1 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Tue, 19 Oct 2021 18:36:30 +0200
Subject: [PATCH 1567/2859] Rework again SetPos command to make more mods work.
 Previous version skipped collision the frame immediately after a call to
 SetPos. It worked for one-off calls (teleports for instance) and continuous
 call along a pre-defined path (scenic travel). However, in the case of mod
 which uses SetPos to simulate a player-controlled movement, it is equivalent
 to using tcl. Solution: 1/ skip update of mPosition and  mPreviousPosition to
 avoid janky interpolation 2/ use back plain moveObject() instead of
 moveObjectBy() since we don't want physics simulation 3/ rework a little bit
 waterwalking influence on coordinate because of 1/

---
 apps/openmw/mwbase/world.hpp                   |  2 +-
 apps/openmw/mwphysics/actor.cpp                | 18 +++++++-----------
 apps/openmw/mwphysics/actor.hpp                |  5 +----
 apps/openmw/mwphysics/physicssystem.cpp        |  7 ++++---
 .../mwscript/transformationextensions.cpp      |  8 ++++----
 apps/openmw/mwworld/worldimp.cpp               |  6 +++---
 apps/openmw/mwworld/worldimp.hpp               |  2 +-
 7 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 8b33095fde..c1a8d09120 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -289,7 +289,7 @@ namespace MWBase
             virtual MWWorld::Ptr moveObject(const MWWorld::Ptr &ptr, MWWorld::CellStore* newCell, const osg::Vec3f& position, bool movePhysics=true, bool keepActive=false) = 0;
             ///< @return an updated Ptr
 
-            virtual MWWorld::Ptr moveObjectBy(const MWWorld::Ptr &ptr, const osg::Vec3f& vec, bool moveToActive, bool ignoreCollisions) = 0;
+            virtual MWWorld::Ptr moveObjectBy(const MWWorld::Ptr &ptr, const osg::Vec3f& vec) = 0;
             ///< @return an updated Ptr
 
             virtual void scaleObject (const MWWorld::Ptr& ptr, float scale) = 0;
diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index 4857339228..4e87f5384f 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -124,7 +124,6 @@ void Actor::updatePosition()
     mSimulationPosition = worldPosition;
     mPositionOffset = osg::Vec3f();
     mStandingOnPtr = nullptr;
-    mSkipCollisions = true;
     mSkipSimulation = true;
 }
 
@@ -163,17 +162,19 @@ bool Actor::setPosition(const osg::Vec3f& position)
 {
     std::scoped_lock lock(mPositionMutex);
     applyOffsetChange();
-    bool hasChanged = mPosition != position || mWorldPositionChanged;
-    mPreviousPosition = mPosition;
-    mPosition = position;
+    bool hasChanged = (mPosition != position && !mSkipSimulation) || mWorldPositionChanged;
+    if (!mSkipSimulation)
+    {
+        mPreviousPosition = mPosition;
+        mPosition = position;
+    }
     return hasChanged;
 }
 
-void Actor::adjustPosition(const osg::Vec3f& offset, bool ignoreCollisions)
+void Actor::adjustPosition(const osg::Vec3f& offset)
 {
     std::scoped_lock lock(mPositionMutex);
     mPositionOffset += offset;
-    mSkipCollisions = mSkipCollisions || ignoreCollisions;
 }
 
 void Actor::applyOffsetChange()
@@ -274,11 +275,6 @@ void Actor::setStandingOnPtr(const MWWorld::Ptr& ptr)
     mStandingOnPtr = ptr;
 }
 
-bool Actor::skipCollisions()
-{
-    return std::exchange(mSkipCollisions, false);
-}
-
 bool Actor::canMoveToWaterSurface(float waterlevel, const btCollisionWorld* world) const
 {
     const float halfZ = getHalfExtents().z();
diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index eb65928dec..01d8037f6b 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -89,7 +89,7 @@ namespace MWPhysics
         void updatePosition();
 
         // register a position offset that will be applied during simulation.
-        void adjustPosition(const osg::Vec3f& offset, bool ignoreCollisions);
+        void adjustPosition(const osg::Vec3f& offset);
 
         // apply position offset. Can't be called during simulation
         void applyOffsetChange();
@@ -156,8 +156,6 @@ namespace MWPhysics
             mLastStuckPosition = position;
         }
 
-        bool skipCollisions();
-
         bool canMoveToWaterSurface(float waterlevel, const btCollisionWorld* world) const;
 
     private:
@@ -187,7 +185,6 @@ namespace MWPhysics
         osg::Vec3f mScale;
         osg::Vec3f mPositionOffset;
         bool mWorldPositionChanged;
-        bool mSkipCollisions;
         bool mSkipSimulation;
         mutable std::mutex mPositionMutex;
 
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 5b00677fce..af6dc109ed 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -941,7 +941,7 @@ namespace MWPhysics
         , mWasOnGround(actor.getOnGround())
         , mIsAquatic(actor.getPtr().getClass().isPureWaterCreature(actor.getPtr()))
         , mWaterCollision(waterCollision)
-        , mSkipCollisionDetection(actor.skipCollisions() || !actor.getCollisionMode())
+        , mSkipCollisionDetection(!actor.getCollisionMode())
     {
     }
 
@@ -951,8 +951,9 @@ namespace MWPhysics
         mPosition = actor.getPosition();
         if (mWaterCollision && mPosition.z() < mWaterlevel && actor.canMoveToWaterSurface(mWaterlevel, world))
         {
-            mPosition.z() = mWaterlevel;
-            MWBase::Environment::get().getWorld()->moveObject(actor.getPtr(), mPosition, false);
+            MWBase::Environment::get().getWorld()->moveObjectBy(actor.getPtr(), osg::Vec3f(0, 0, mWaterlevel - mPosition.z()));
+            actor.applyOffsetChange();
+            mPosition = actor.getPosition();
         }
         mOldHeight = mPosition.z();
         const auto rotation = actor.getPtr().getRefData().getPosition().asRotationVec3();
diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index 3d00b24ef8..5cfb2b2989 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -32,7 +32,7 @@ namespace MWScript
             std::vector<MWWorld::Ptr> actors;
             MWBase::Environment::get().getWorld()->getActorsStandingOn (ptr, actors);
             for (auto& actor : actors)
-                MWBase::Environment::get().getWorld()->moveObjectBy(actor, diff, false, false);
+                MWBase::Environment::get().getWorld()->moveObjectBy(actor, diff);
         }
 
         template<class R>
@@ -312,7 +312,7 @@ namespace MWScript
                     }
 
                     dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(ptr,
-                        MWBase::Environment::get().getWorld()->moveObjectBy(ptr, newPos - curPos, true, true));
+                        MWBase::Environment::get().getWorld()->moveObject(ptr, newPos, true, true));
                 }
         };
 
@@ -731,7 +731,7 @@ namespace MWScript
                     // This approach can be used to create elevators.
                     moveStandingActors(ptr, diff);
                     dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(ptr,
-                        MWBase::Environment::get().getWorld()->moveObjectBy(ptr, diff, false, true));
+                        MWBase::Environment::get().getWorld()->moveObjectBy(ptr, diff));
                 }
         };
 
@@ -767,7 +767,7 @@ namespace MWScript
                     // This approach can be used to create elevators.
                     moveStandingActors(ptr, diff);
                     dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(ptr,
-                        MWBase::Environment::get().getWorld()->moveObjectBy(ptr, diff, false, true));
+                        MWBase::Environment::get().getWorld()->moveObjectBy(ptr, diff));
                 }
         };
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 21e2d8380a..e860a114c6 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1258,14 +1258,14 @@ namespace MWWorld
         return moveObject(ptr, cell, position, movePhysics);
     }
 
-    MWWorld::Ptr World::moveObjectBy(const Ptr& ptr, const osg::Vec3f& vec, bool moveToActive, bool ignoreCollisions)
+    MWWorld::Ptr World::moveObjectBy(const Ptr& ptr, const osg::Vec3f& vec)
     {
         auto* actor = mPhysics->getActor(ptr);
         osg::Vec3f newpos = ptr.getRefData().getPosition().asVec3() + vec;
         if (actor)
-            actor->adjustPosition(vec, ignoreCollisions);
+            actor->adjustPosition(vec);
         if (ptr.getClass().isActor())
-            return moveObject(ptr, newpos, false, moveToActive && ptr != getPlayerPtr());
+            return moveObject(ptr, newpos, false, ptr != getPlayerPtr());
         return moveObject(ptr, newpos);
     }
 
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 6e48f045c0..a795b4eafd 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -376,7 +376,7 @@ namespace MWWorld
             MWWorld::Ptr moveObject (const Ptr& ptr, CellStore* newCell, const osg::Vec3f& position, bool movePhysics=true, bool keepActive=false) override;
             ///< @return an updated Ptr
 
-            MWWorld::Ptr moveObjectBy(const Ptr& ptr, const osg::Vec3f& vec, bool moveToActive, bool ignoreCollisions) override;
+            MWWorld::Ptr moveObjectBy(const Ptr& ptr, const osg::Vec3f& vec) override;
             ///< @return an updated Ptr
 
             void scaleObject (const Ptr& ptr, float scale) override;

From ca8584f6f61ca277272000fad724506e55d7a45c Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 30 Oct 2021 02:58:40 +0200
Subject: [PATCH 1568/2859] Move functions independent from BulletShape into
 anonymous namespace

---
 components/resource/bulletshape.cpp | 112 +++++++++++++---------------
 components/resource/bulletshape.hpp |   6 --
 2 files changed, 53 insertions(+), 65 deletions(-)

diff --git a/components/resource/bulletshape.cpp b/components/resource/bulletshape.cpp
index 798a6778e6..5e0415e59e 100644
--- a/components/resource/bulletshape.cpp
+++ b/components/resource/bulletshape.cpp
@@ -10,6 +10,53 @@
 
 namespace Resource
 {
+namespace
+{
+    btCollisionShape* duplicateCollisionShape(const btCollisionShape *shape)
+    {
+        if (shape == nullptr)
+            return nullptr;
+
+        if (shape->isCompound())
+        {
+            const btCompoundShape *comp = static_cast<const btCompoundShape*>(shape);
+            btCompoundShape* newShape = new btCompoundShape;
+
+            for (int i = 0, n = comp->getNumChildShapes(); i < n; ++i)
+            {
+                btCollisionShape* child = duplicateCollisionShape(comp->getChildShape(i));
+                const btTransform& trans = comp->getChildTransform(i);
+                newShape->addChildShape(trans, child);
+            }
+
+            return newShape;
+        }
+
+        if (const btBvhTriangleMeshShape* trishape = dynamic_cast<const btBvhTriangleMeshShape*>(shape))
+            return new btScaledBvhTriangleMeshShape(const_cast<btBvhTriangleMeshShape*>(trishape), btVector3(1.f, 1.f, 1.f));
+
+        if (const btBoxShape* boxshape = dynamic_cast<const btBoxShape*>(shape))
+            return new btBoxShape(*boxshape);
+
+        if (shape->getShapeType() == TERRAIN_SHAPE_PROXYTYPE)
+            return new btHeightfieldTerrainShape(static_cast<const btHeightfieldTerrainShape&>(*shape));
+
+        throw std::logic_error(std::string("Unhandled Bullet shape duplication: ") + shape->getName());
+    }
+
+    void deleteShape(btCollisionShape* shape)
+    {
+        if (shape->isCompound())
+        {
+            btCompoundShape* compound = static_cast<btCompoundShape*>(shape);
+            for (int i = 0, n = compound->getNumChildShapes(); i < n; i++)
+                if (btCollisionShape* child = compound->getChildShape(i))
+                    deleteShape(child);
+        }
+
+        delete shape;
+    }
+}
 
 BulletShape::BulletShape()
     : mCollisionShape(nullptr)
@@ -28,58 +75,10 @@ BulletShape::BulletShape(const BulletShape &copy, const osg::CopyOp &copyop)
 
 BulletShape::~BulletShape()
 {
-    deleteShape(mAvoidCollisionShape);
-    deleteShape(mCollisionShape);
-}
-
-void BulletShape::deleteShape(btCollisionShape* shape)
-{
-    if(shape!=nullptr)
-    {
-        if(shape->isCompound())
-        {
-            btCompoundShape* ms = static_cast<btCompoundShape*>(shape);
-            int a = ms->getNumChildShapes();
-            for(int i=0; i <a;i++)
-                deleteShape(ms->getChildShape(i));
-        }
-        delete shape;
-    }
-}
-
-btCollisionShape* BulletShape::duplicateCollisionShape(const btCollisionShape *shape) const
-{
-    if(shape->isCompound())
-    {
-        const btCompoundShape *comp = static_cast<const btCompoundShape*>(shape);
-        btCompoundShape *newShape = new btCompoundShape;
-
-        int numShapes = comp->getNumChildShapes();
-        for(int i = 0;i < numShapes;++i)
-        {
-            btCollisionShape *child = duplicateCollisionShape(comp->getChildShape(i));
-            const btTransform& trans = comp->getChildTransform(i);
-            newShape->addChildShape(trans, child);
-        }
-
-        return newShape;
-    }
-
-    if(const btBvhTriangleMeshShape* trishape = dynamic_cast<const btBvhTriangleMeshShape*>(shape))
-    {
-        btScaledBvhTriangleMeshShape* newShape = new btScaledBvhTriangleMeshShape(const_cast<btBvhTriangleMeshShape*>(trishape), btVector3(1.f, 1.f, 1.f));
-        return newShape;
-    }
-
-    if (const btBoxShape* boxshape = dynamic_cast<const btBoxShape*>(shape))
-    {
-        return new btBoxShape(*boxshape);
-    }
-
-    if (shape->getShapeType() == TERRAIN_SHAPE_PROXYTYPE)
-        return new btHeightfieldTerrainShape(static_cast<const btHeightfieldTerrainShape&>(*shape));
-
-    throw std::logic_error(std::string("Unhandled Bullet shape duplication: ")+shape->getName());
+    if (mAvoidCollisionShape != nullptr)
+        deleteShape(mAvoidCollisionShape);
+    if (mCollisionShape != nullptr)
+        deleteShape(mCollisionShape);
 }
 
 btCollisionShape *BulletShape::getCollisionShape() const
@@ -115,14 +114,9 @@ BulletShapeInstance::BulletShapeInstance(osg::ref_ptr<const BulletShape> source)
     , mSource(source)
 {
     mCollisionBox = source->mCollisionBox;
-
     mAnimatedShapes = source->mAnimatedShapes;
-
-    if (source->mCollisionShape)
-        mCollisionShape = duplicateCollisionShape(source->mCollisionShape);
-
-    if (source->mAvoidCollisionShape)
-        mAvoidCollisionShape = duplicateCollisionShape(source->mAvoidCollisionShape);
+    mCollisionShape = duplicateCollisionShape(source->mCollisionShape);
+    mAvoidCollisionShape = duplicateCollisionShape(source->mAvoidCollisionShape);
 }
 
 }
diff --git a/components/resource/bulletshape.hpp b/components/resource/bulletshape.hpp
index b40ab6b6a7..8b30464fe2 100644
--- a/components/resource/bulletshape.hpp
+++ b/components/resource/bulletshape.hpp
@@ -44,8 +44,6 @@ namespace Resource
 
         osg::ref_ptr<BulletShapeInstance> makeInstance() const;
 
-        btCollisionShape* duplicateCollisionShape(const btCollisionShape* shape) const;
-
         btCollisionShape* getCollisionShape() const;
 
         btCollisionShape* getAvoidCollisionShape() const;
@@ -53,10 +51,6 @@ namespace Resource
         void setLocalScaling(const btVector3& scale);
 
         bool isAnimated() const;
-
-    private:
-
-        void deleteShape(btCollisionShape* shape);
     };
 
 

From 80e3623d9a3c77d6896e9c5787a49ad45256d450 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 30 Oct 2021 03:04:54 +0200
Subject: [PATCH 1569/2859] Avoid dynamic cast in duplicateCollisionShape

---
 components/resource/bulletshape.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/components/resource/bulletshape.cpp b/components/resource/bulletshape.cpp
index 5e0415e59e..3f599e5386 100644
--- a/components/resource/bulletshape.cpp
+++ b/components/resource/bulletshape.cpp
@@ -32,11 +32,17 @@ namespace
             return newShape;
         }
 
-        if (const btBvhTriangleMeshShape* trishape = dynamic_cast<const btBvhTriangleMeshShape*>(shape))
+        if (shape->getShapeType() == TRIANGLE_MESH_SHAPE_PROXYTYPE)
+        {
+            const btBvhTriangleMeshShape* trishape = static_cast<const btBvhTriangleMeshShape*>(shape);
             return new btScaledBvhTriangleMeshShape(const_cast<btBvhTriangleMeshShape*>(trishape), btVector3(1.f, 1.f, 1.f));
+        }
 
-        if (const btBoxShape* boxshape = dynamic_cast<const btBoxShape*>(shape))
+        if (shape->getShapeType() == BOX_SHAPE_PROXYTYPE)
+        {
+            const btBoxShape* boxshape = static_cast<const btBoxShape*>(shape);
             return new btBoxShape(*boxshape);
+        }
 
         if (shape->getShapeType() == TERRAIN_SHAPE_PROXYTYPE)
             return new btHeightfieldTerrainShape(static_cast<const btHeightfieldTerrainShape&>(*shape));

From b905dd17c3e27f9bee9143a27fafcfdf84e6902b Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 30 Oct 2021 03:06:22 +0200
Subject: [PATCH 1570/2859] Use unique_ptr to store btCollisionShape in
 BulletShape

---
 .../detournavigator/navigator.cpp             |  6 +--
 .../nifloader/testbulletnifloader.cpp         | 42 +++++++++---------
 components/nifbullet/bulletnifloader.cpp      |  8 ++--
 components/resource/bulletshape.cpp           | 43 +++++++------------
 components/resource/bulletshape.hpp           | 14 ++++--
 components/resource/bulletshapemanager.cpp    |  2 +-
 6 files changed, 55 insertions(+), 60 deletions(-)

diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index 62d3f9de04..6579076778 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -117,7 +117,7 @@ namespace
     osg::ref_ptr<const Resource::BulletShapeInstance> makeBulletShapeInstance(std::unique_ptr<T>&& shape)
     {
         osg::ref_ptr<Resource::BulletShape> bulletShape(new Resource::BulletShape);
-        bulletShape->mCollisionShape = std::move(shape).release();
+        bulletShape->mCollisionShape.reset(std::move(shape).release());
         return new Resource::BulletShapeInstance(bulletShape);
     }
 
@@ -466,7 +466,7 @@ namespace
         }};
         std::unique_ptr<btHeightfieldTerrainShape> shapePtr = makeSquareHeightfieldTerrainShape(heightfieldData);
         shapePtr->setLocalScaling(btVector3(128, 128, 1));
-        bulletShape->mCollisionShape = shapePtr.release();
+        bulletShape->mCollisionShape.reset(shapePtr.release());
 
         std::array<btScalar, 5 * 5> heightfieldDataAvoid {{
             -25, -25, -25, -25, -25,
@@ -477,7 +477,7 @@ namespace
         }};
         std::unique_ptr<btHeightfieldTerrainShape> shapeAvoidPtr = makeSquareHeightfieldTerrainShape(heightfieldDataAvoid);
         shapeAvoidPtr->setLocalScaling(btVector3(128, 128, 1));
-        bulletShape->mAvoidCollisionShape = shapeAvoidPtr.release();
+        bulletShape->mAvoidCollisionShape.reset(shapeAvoidPtr.release());
 
         osg::ref_ptr<const Resource::BulletShapeInstance> instance(new Resource::BulletShapeInstance(bulletShape));
 
diff --git a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
index d0a5b3d2e5..3d4628c267 100644
--- a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
+++ b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
@@ -160,8 +160,8 @@ namespace Resource
 {
     static bool operator ==(const Resource::BulletShape& lhs, const Resource::BulletShape& rhs)
     {
-        return compareObjects(lhs.mCollisionShape, rhs.mCollisionShape)
-            && compareObjects(lhs.mAvoidCollisionShape, rhs.mAvoidCollisionShape)
+        return compareObjects(lhs.mCollisionShape.get(), rhs.mCollisionShape.get())
+            && compareObjects(lhs.mAvoidCollisionShape.get(), rhs.mAvoidCollisionShape.get())
             && lhs.mCollisionBox.mExtents == rhs.mCollisionBox.mExtents
             && lhs.mCollisionBox.mCenter == rhs.mCollisionBox.mCenter
             && lhs.mAnimatedShapes == rhs.mAnimatedShapes;
@@ -170,8 +170,8 @@ namespace Resource
     static std::ostream& operator <<(std::ostream& stream, const Resource::BulletShape& value)
     {
         return stream << "Resource::BulletShape {"
-            << value.mCollisionShape << ", "
-            << value.mAvoidCollisionShape << ", "
+            << value.mCollisionShape.get() << ", "
+            << value.mAvoidCollisionShape.get() << ", "
             << "osg::Vec3f {" << value.mCollisionBox.mExtents << "}" << ", "
             << "osg::Vec3f {" << value.mCollisionBox.mCenter << "}" << ", "
             << value.mAnimatedShapes
@@ -446,7 +446,7 @@ namespace
         std::unique_ptr<btBoxShape> box(new btBoxShape(btVector3(1, 2, 3)));
         std::unique_ptr<btCompoundShape> shape(new btCompoundShape);
         shape->addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(-1, -2, -3)), box.release());
-        expected.mCollisionShape = shape.release();
+        expected.mCollisionShape.reset(shape.release());
 
         EXPECT_EQ(*result, expected);
     }
@@ -471,7 +471,7 @@ namespace
         std::unique_ptr<btBoxShape> box(new btBoxShape(btVector3(1, 2, 3)));
         std::unique_ptr<btCompoundShape> shape(new btCompoundShape);
         shape->addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(-1, -2, -3)), box.release());
-        expected.mCollisionShape = shape.release();
+        expected.mCollisionShape.reset(shape.release());
 
         EXPECT_EQ(*result, expected);
     }
@@ -501,7 +501,7 @@ namespace
         std::unique_ptr<btBoxShape> box(new btBoxShape(btVector3(1, 2, 3)));
         std::unique_ptr<btCompoundShape> shape(new btCompoundShape);
         shape->addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(-1, -2, -3)), box.release());
-        expected.mCollisionShape = shape.release();
+        expected.mCollisionShape.reset(shape.release());
 
         EXPECT_EQ(*result, expected);
     }
@@ -536,7 +536,7 @@ namespace
         std::unique_ptr<btBoxShape> box(new btBoxShape(btVector3(1, 2, 3)));
         std::unique_ptr<btCompoundShape> shape(new btCompoundShape);
         shape->addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(-1, -2, -3)), box.release());
-        expected.mCollisionShape = shape.release();
+        expected.mCollisionShape.reset(shape.release());
 
         EXPECT_EQ(*result, expected);
     }
@@ -571,7 +571,7 @@ namespace
         std::unique_ptr<btBoxShape> box(new btBoxShape(btVector3(4, 5, 6)));
         std::unique_ptr<btCompoundShape> shape(new btCompoundShape);
         shape->addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(-4, -5, -6)), box.release());
-        expected.mCollisionShape = shape.release();
+        expected.mCollisionShape.reset(shape.release());
 
         EXPECT_EQ(*result, expected);
     }
@@ -605,7 +605,7 @@ namespace
         std::unique_ptr<btTriangleMesh> triangles(new btTriangleMesh(false));
         triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
         Resource::BulletShape expected;
-        expected.mCollisionShape = new Resource::TriangleMeshShape(triangles.release(), true);
+        expected.mCollisionShape.reset(new Resource::TriangleMeshShape(triangles.release(), true));
 
         EXPECT_EQ(*result, expected);
     }
@@ -641,7 +641,7 @@ namespace
         std::unique_ptr<btTriangleMesh> triangles(new btTriangleMesh(false));
         triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
         Resource::BulletShape expected;
-        expected.mCollisionShape = new Resource::TriangleMeshShape(triangles.release(), true);
+        expected.mCollisionShape.reset(new Resource::TriangleMeshShape(triangles.release(), true));
 
         EXPECT_EQ(*result, expected);
     }
@@ -659,7 +659,7 @@ namespace
         std::unique_ptr<btTriangleMesh> triangles(new btTriangleMesh(false));
         triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
         Resource::BulletShape expected;
-        expected.mCollisionShape = new Resource::TriangleMeshShape(triangles.release(), true);
+        expected.mCollisionShape.reset(new Resource::TriangleMeshShape(triangles.release(), true));
 
         EXPECT_EQ(*result, expected);
     }
@@ -680,7 +680,7 @@ namespace
         triangles->addTriangle(btVector3(0, 0, 1), btVector3(1, 0, 1), btVector3(1, 1, 1));
         triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
         Resource::BulletShape expected;
-        expected.mCollisionShape = new Resource::TriangleMeshShape(triangles.release(), true);
+        expected.mCollisionShape.reset(new Resource::TriangleMeshShape(triangles.release(), true));
 
         EXPECT_EQ(*result, expected);
     }
@@ -698,7 +698,7 @@ namespace
         std::unique_ptr<btTriangleMesh> triangles(new btTriangleMesh(false));
         triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
         Resource::BulletShape expected;
-        expected.mCollisionShape = new Resource::TriangleMeshShape(triangles.release(), true);
+        expected.mCollisionShape.reset(new Resource::TriangleMeshShape(triangles.release(), true));
 
         EXPECT_EQ(*result, expected);
     }
@@ -720,7 +720,7 @@ namespace
         std::unique_ptr<btCompoundShape> shape(new btCompoundShape);
         shape->addChildShape(mResultTransform, mesh.release());
         Resource::BulletShape expected;
-        expected.mCollisionShape = shape.release();
+        expected.mCollisionShape.reset(shape.release());
         expected.mAnimatedShapes = {{-1, 0}};
 
         EXPECT_EQ(*result, expected);
@@ -746,7 +746,7 @@ namespace
         std::unique_ptr<btCompoundShape> shape(new btCompoundShape);
         shape->addChildShape(mResultTransform2, mesh.release());
         Resource::BulletShape expected;
-        expected.mCollisionShape = shape.release();
+        expected.mCollisionShape.reset(shape.release());
         expected.mAnimatedShapes = {{-1, 0}};
 
         EXPECT_EQ(*result, expected);
@@ -784,7 +784,7 @@ namespace
         shape->addChildShape(mResultTransform, mesh.release());
         shape->addChildShape(mResultTransform, mesh2.release());
         Resource::BulletShape expected;
-        expected.mCollisionShape = shape.release();
+        expected.mCollisionShape.reset(shape.release());
         expected.mAnimatedShapes = {{-1, 0}};
 
         EXPECT_EQ(*result, expected);
@@ -813,7 +813,7 @@ namespace
         std::unique_ptr<btCompoundShape> shape(new btCompoundShape);
         shape->addChildShape(mResultTransform2, mesh.release());
         Resource::BulletShape expected;
-        expected.mCollisionShape = shape.release();
+        expected.mCollisionShape.reset(shape.release());
         expected.mAnimatedShapes = {{-1, 0}};
 
         EXPECT_EQ(*result, expected);
@@ -854,7 +854,7 @@ namespace
         shape->addChildShape(mResultTransform2, mesh2.release());
         shape->addChildShape(btTransform::getIdentity(), mesh.release());
         Resource::BulletShape expected;
-        expected.mCollisionShape = shape.release();
+        expected.mCollisionShape.reset(shape.release());
         expected.mAnimatedShapes = {{-1, 0}};
 
         EXPECT_EQ(*result, expected);
@@ -873,7 +873,7 @@ namespace
         std::unique_ptr<btTriangleMesh> triangles(new btTriangleMesh(false));
         triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
         Resource::BulletShape expected;
-        expected.mAvoidCollisionShape = new Resource::TriangleMeshShape(triangles.release(), false);
+        expected.mAvoidCollisionShape.reset(new Resource::TriangleMeshShape(triangles.release(), false));
 
         EXPECT_EQ(*result, expected);
     }
@@ -979,7 +979,7 @@ namespace
         std::unique_ptr<btTriangleMesh> triangles(new btTriangleMesh(false));
         triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
         Resource::BulletShape expected;
-        expected.mCollisionShape = new Resource::TriangleMeshShape(triangles.release(), true);
+        expected.mCollisionShape.reset(new Resource::TriangleMeshShape(triangles.release(), true));
 
         EXPECT_EQ(*result, expected);
     }
diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index 03ef63014b..685a80951a 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -152,7 +152,7 @@ osg::ref_ptr<Resource::BulletShape> BulletNifLoader::load(const Nif::File& nif)
             compound->addChildShape(transform, boxShape.get());
             boxShape.release();
 
-            mShape->mCollisionShape = compound.release();
+            mShape->mCollisionShape.reset(compound.release());
             return mShape;
         }
     }
@@ -179,17 +179,17 @@ osg::ref_ptr<Resource::BulletShape> BulletNifLoader::load(const Nif::File& nif)
             child.release();
             mStaticMesh.release();
         }
-        mShape->mCollisionShape = mCompoundShape.release();
+        mShape->mCollisionShape.reset(mCompoundShape.release());
     }
     else if (mStaticMesh)
     {
-        mShape->mCollisionShape = new Resource::TriangleMeshShape(mStaticMesh.get(), true);
+        mShape->mCollisionShape.reset(new Resource::TriangleMeshShape(mStaticMesh.get(), true));
         mStaticMesh.release();
     }
 
     if (mAvoidStaticMesh)
     {
-        mShape->mAvoidCollisionShape = new Resource::TriangleMeshShape(mAvoidStaticMesh.get(), false);
+        mShape->mAvoidCollisionShape.reset(new Resource::TriangleMeshShape(mAvoidStaticMesh.get(), false));
         mAvoidStaticMesh.release();
     }
 
diff --git a/components/resource/bulletshape.cpp b/components/resource/bulletshape.cpp
index 3f599e5386..e52e68ca07 100644
--- a/components/resource/bulletshape.cpp
+++ b/components/resource/bulletshape.cpp
@@ -12,7 +12,7 @@ namespace Resource
 {
 namespace
 {
-    btCollisionShape* duplicateCollisionShape(const btCollisionShape *shape)
+    CollisionShapePtr duplicateCollisionShape(const btCollisionShape *shape)
     {
         if (shape == nullptr)
             return nullptr;
@@ -20,13 +20,13 @@ namespace
         if (shape->isCompound())
         {
             const btCompoundShape *comp = static_cast<const btCompoundShape*>(shape);
-            btCompoundShape* newShape = new btCompoundShape;
+            std::unique_ptr<btCompoundShape, DeleteCollisionShape> newShape(new btCompoundShape);
 
             for (int i = 0, n = comp->getNumChildShapes(); i < n; ++i)
             {
-                btCollisionShape* child = duplicateCollisionShape(comp->getChildShape(i));
+                auto child = duplicateCollisionShape(comp->getChildShape(i));
                 const btTransform& trans = comp->getChildTransform(i);
-                newShape->addChildShape(trans, child);
+                newShape->addChildShape(trans, child.release());
             }
 
             return newShape;
@@ -35,17 +35,17 @@ namespace
         if (shape->getShapeType() == TRIANGLE_MESH_SHAPE_PROXYTYPE)
         {
             const btBvhTriangleMeshShape* trishape = static_cast<const btBvhTriangleMeshShape*>(shape);
-            return new btScaledBvhTriangleMeshShape(const_cast<btBvhTriangleMeshShape*>(trishape), btVector3(1.f, 1.f, 1.f));
+            return CollisionShapePtr(new btScaledBvhTriangleMeshShape(const_cast<btBvhTriangleMeshShape*>(trishape), btVector3(1.f, 1.f, 1.f)));
         }
 
         if (shape->getShapeType() == BOX_SHAPE_PROXYTYPE)
         {
             const btBoxShape* boxshape = static_cast<const btBoxShape*>(shape);
-            return new btBoxShape(*boxshape);
+            return CollisionShapePtr(new btBoxShape(*boxshape));
         }
 
         if (shape->getShapeType() == TERRAIN_SHAPE_PROXYTYPE)
-            return new btHeightfieldTerrainShape(static_cast<const btHeightfieldTerrainShape&>(*shape));
+            return CollisionShapePtr(new btHeightfieldTerrainShape(static_cast<const btHeightfieldTerrainShape&>(*shape)));
 
         throw std::logic_error(std::string("Unhandled Bullet shape duplication: ") + shape->getName());
     }
@@ -64,37 +64,27 @@ namespace
     }
 }
 
-BulletShape::BulletShape()
-    : mCollisionShape(nullptr)
-    , mAvoidCollisionShape(nullptr)
+void DeleteCollisionShape::operator()(btCollisionShape* shape) const
 {
-
+    deleteShape(shape);
 }
 
 BulletShape::BulletShape(const BulletShape &copy, const osg::CopyOp &copyop)
-    : mCollisionShape(duplicateCollisionShape(copy.mCollisionShape))
-    , mAvoidCollisionShape(duplicateCollisionShape(copy.mAvoidCollisionShape))
+    : mCollisionShape(duplicateCollisionShape(copy.mCollisionShape.get()))
+    , mAvoidCollisionShape(duplicateCollisionShape(copy.mAvoidCollisionShape.get()))
     , mCollisionBox(copy.mCollisionBox)
     , mAnimatedShapes(copy.mAnimatedShapes)
 {
 }
 
-BulletShape::~BulletShape()
-{
-    if (mAvoidCollisionShape != nullptr)
-        deleteShape(mAvoidCollisionShape);
-    if (mCollisionShape != nullptr)
-        deleteShape(mCollisionShape);
-}
-
 btCollisionShape *BulletShape::getCollisionShape() const
 {
-    return mCollisionShape;
+    return mCollisionShape.get();
 }
 
 btCollisionShape *BulletShape::getAvoidCollisionShape() const
 {
-    return mAvoidCollisionShape;
+    return mAvoidCollisionShape.get();
 }
 
 void BulletShape::setLocalScaling(const btVector3& scale)
@@ -116,13 +106,12 @@ osg::ref_ptr<BulletShapeInstance> BulletShape::makeInstance() const
 }
 
 BulletShapeInstance::BulletShapeInstance(osg::ref_ptr<const BulletShape> source)
-    : BulletShape()
-    , mSource(source)
+    : mSource(source)
 {
     mCollisionBox = source->mCollisionBox;
     mAnimatedShapes = source->mAnimatedShapes;
-    mCollisionShape = duplicateCollisionShape(source->mCollisionShape);
-    mAvoidCollisionShape = duplicateCollisionShape(source->mAvoidCollisionShape);
+    mCollisionShape = duplicateCollisionShape(source->mCollisionShape.get());
+    mAvoidCollisionShape = duplicateCollisionShape(source->mAvoidCollisionShape.get());
 }
 
 }
diff --git a/components/resource/bulletshape.hpp b/components/resource/bulletshape.hpp
index 8b30464fe2..369aed18a0 100644
--- a/components/resource/bulletshape.hpp
+++ b/components/resource/bulletshape.hpp
@@ -2,6 +2,7 @@
 #define OPENMW_COMPONENTS_RESOURCE_BULLETSHAPE_H
 
 #include <map>
+#include <memory>
 
 #include <osg/Object>
 #include <osg/ref_ptr>
@@ -13,19 +14,24 @@ class btCollisionShape;
 
 namespace Resource
 {
+    struct DeleteCollisionShape
+    {
+        void operator()(btCollisionShape* shape) const;
+    };
+
+    using CollisionShapePtr = std::unique_ptr<btCollisionShape, DeleteCollisionShape>;
 
     class BulletShapeInstance;
     class BulletShape : public osg::Object
     {
     public:
-        BulletShape();
+        BulletShape() = default;
         BulletShape(const BulletShape& copy, const osg::CopyOp& copyop);
-        virtual ~BulletShape();
 
         META_Object(Resource, BulletShape)
 
-        btCollisionShape* mCollisionShape;
-        btCollisionShape* mAvoidCollisionShape;
+        CollisionShapePtr mCollisionShape;
+        CollisionShapePtr mAvoidCollisionShape;
 
         struct CollisionBox
         {
diff --git a/components/resource/bulletshapemanager.cpp b/components/resource/bulletshapemanager.cpp
index d295265b5f..cde069837a 100644
--- a/components/resource/bulletshapemanager.cpp
+++ b/components/resource/bulletshapemanager.cpp
@@ -92,7 +92,7 @@ public:
         shape->mCollisionBox.mCenter = osg::Vec3f( (aabbMax[0] + aabbMin[0]) / 2.0f,
                                                   (aabbMax[1] + aabbMin[1]) / 2.0f,
                                                   (aabbMax[2] + aabbMin[2]) / 2.0f );
-        shape->mCollisionShape = triangleMeshShape;
+        shape->mCollisionShape.reset(triangleMeshShape);
 
         return shape;
     }

From fc9a405dc5897f335c5317b36296cbffa2cf57b0 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 30 Oct 2021 03:16:21 +0200
Subject: [PATCH 1571/2859] Make BulletShape::makeInstance free function

---
 components/resource/bulletshape.cpp        | 5 ++---
 components/resource/bulletshape.hpp        | 5 ++---
 components/resource/bulletshapemanager.cpp | 5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/components/resource/bulletshape.cpp b/components/resource/bulletshape.cpp
index e52e68ca07..4b074ee146 100644
--- a/components/resource/bulletshape.cpp
+++ b/components/resource/bulletshape.cpp
@@ -99,10 +99,9 @@ bool BulletShape::isAnimated() const
     return !mAnimatedShapes.empty();
 }
 
-osg::ref_ptr<BulletShapeInstance> BulletShape::makeInstance() const
+osg::ref_ptr<BulletShapeInstance> makeInstance(osg::ref_ptr<const BulletShape> source)
 {
-    osg::ref_ptr<BulletShapeInstance> instance (new BulletShapeInstance(this));
-    return instance;
+    return {new BulletShapeInstance(std::move(source))};
 }
 
 BulletShapeInstance::BulletShapeInstance(osg::ref_ptr<const BulletShape> source)
diff --git a/components/resource/bulletshape.hpp b/components/resource/bulletshape.hpp
index 369aed18a0..bf249cb364 100644
--- a/components/resource/bulletshape.hpp
+++ b/components/resource/bulletshape.hpp
@@ -21,7 +21,6 @@ namespace Resource
 
     using CollisionShapePtr = std::unique_ptr<btCollisionShape, DeleteCollisionShape>;
 
-    class BulletShapeInstance;
     class BulletShape : public osg::Object
     {
     public:
@@ -48,8 +47,6 @@ namespace Resource
         // we store the node's record index mapped to the child index of the shape in the btCompoundShape.
         std::map<int, int> mAnimatedShapes;
 
-        osg::ref_ptr<BulletShapeInstance> makeInstance() const;
-
         btCollisionShape* getCollisionShape() const;
 
         btCollisionShape* getAvoidCollisionShape() const;
@@ -71,6 +68,8 @@ namespace Resource
         osg::ref_ptr<const BulletShape> mSource;
     };
 
+    osg::ref_ptr<BulletShapeInstance> makeInstance(osg::ref_ptr<const BulletShape> source);
+
     // Subclass btBhvTriangleMeshShape to auto-delete the meshInterface
     struct TriangleMeshShape : public btBvhTriangleMeshShape
     {
diff --git a/components/resource/bulletshapemanager.cpp b/components/resource/bulletshapemanager.cpp
index cde069837a..ae6f3659a5 100644
--- a/components/resource/bulletshapemanager.cpp
+++ b/components/resource/bulletshapemanager.cpp
@@ -193,9 +193,8 @@ osg::ref_ptr<BulletShapeInstance> BulletShapeManager::createInstance(const std::
 {
     osg::ref_ptr<const BulletShape> shape = getShape(name);
     if (shape)
-        return shape->makeInstance();
-    else
-        return osg::ref_ptr<BulletShapeInstance>();
+        return makeInstance(std::move(shape));
+    return osg::ref_ptr<BulletShapeInstance>();
 }
 
 void BulletShapeManager::updateCache(double referenceTime)

From 8e71c246bfcae5c44907c4a06702f2403082b4da Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 30 Oct 2021 03:30:38 +0200
Subject: [PATCH 1572/2859] Remove redundant BulletShape getters

---
 apps/openmw/mwphysics/object.cpp                     |  6 +++---
 apps/openmw/mwphysics/physicssystem.cpp              |  2 +-
 apps/openmw/mwworld/scene.cpp                        |  2 +-
 apps/openmw/mwworld/worldimp.cpp                     |  2 +-
 apps/openmw_test_suite/detournavigator/navigator.cpp |  2 +-
 components/detournavigator/navigatorimpl.cpp         |  8 ++++----
 components/resource/bulletshape.cpp                  | 10 ----------
 components/resource/bulletshape.hpp                  |  4 ----
 8 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/apps/openmw/mwphysics/object.cpp b/apps/openmw/mwphysics/object.cpp
index 879c12124e..08fcc7e47d 100644
--- a/apps/openmw/mwphysics/object.cpp
+++ b/apps/openmw/mwphysics/object.cpp
@@ -24,7 +24,7 @@ namespace MWPhysics
         , mTaskScheduler(scheduler)
     {
         mPtr = ptr;
-        mCollisionObject = BulletHelpers::makeCollisionObject(mShapeInstance->getCollisionShape(),
+        mCollisionObject = BulletHelpers::makeCollisionObject(mShapeInstance->mCollisionShape.get(),
             Misc::Convert::toBullet(mPosition), Misc::Convert::toBullet(rotation));
         mCollisionObject->setUserPointer(this);
         mShapeInstance->setLocalScaling(mScale);
@@ -109,9 +109,9 @@ namespace MWPhysics
         if (mShapeInstance->mAnimatedShapes.empty())
             return false;
 
-        assert (mShapeInstance->getCollisionShape()->isCompound());
+        assert (mShapeInstance->mCollisionShape->isCompound());
 
-        btCompoundShape* compound = static_cast<btCompoundShape*>(mShapeInstance->getCollisionShape());
+        btCompoundShape* compound = static_cast<btCompoundShape*>(mShapeInstance->mCollisionShape.get());
         for (const auto& [recIndex, shapeIndex] : mShapeInstance->mAnimatedShapes)
         {
             auto nodePathFound = mRecIndexToNodePath.find(recIndex);
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 636c3492f7..9b5f41a5fb 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -481,7 +481,7 @@ namespace MWPhysics
         if (ptr.mRef->mData.mPhysicsPostponed)
             return;
         osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance = mShapeManager->getInstance(mesh);
-        if (!shapeInstance || !shapeInstance->getCollisionShape())
+        if (!shapeInstance || !shapeInstance->mCollisionShape)
             return;
 
         assert(!getObject(ptr));
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index d49e6c0e8b..f9e792c7d2 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -132,7 +132,7 @@ namespace
             {
                 btVector3 aabbMin;
                 btVector3 aabbMax;
-                object->getShapeInstance()->getCollisionShape()->getAabb(btTransform::getIdentity(), aabbMin, aabbMax);
+                object->getShapeInstance()->mCollisionShape->getAabb(btTransform::getIdentity(), aabbMin, aabbMax);
 
                 const auto center = (aabbMax + aabbMin) * 0.5f;
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 21e2d8380a..efb8b7f370 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -3948,7 +3948,7 @@ namespace MWWorld
 
         btVector3 aabbMin;
         btVector3 aabbMax;
-        object->getShapeInstance()->getCollisionShape()->getAabb(btTransform::getIdentity(), aabbMin, aabbMax);
+        object->getShapeInstance()->mCollisionShape->getAabb(btTransform::getIdentity(), aabbMin, aabbMax);
 
         const auto toLocal = object->getTransform().inverse();
         const auto localFrom = toLocal(Misc::Convert::toBullet(position));
diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index 6579076778..d4bdcb13b8 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -482,7 +482,7 @@ namespace
         osg::ref_ptr<const Resource::BulletShapeInstance> instance(new Resource::BulletShapeInstance(bulletShape));
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addObject(ObjectId(instance->getCollisionShape()), ObjectShapes(instance), btTransform::getIdentity());
+        mNavigator->addObject(ObjectId(instance->mCollisionShape.get()), ObjectShapes(instance), btTransform::getIdentity());
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
diff --git a/components/detournavigator/navigatorimpl.cpp b/components/detournavigator/navigatorimpl.cpp
index 9a59ecf6d7..44b42b22c2 100644
--- a/components/detournavigator/navigatorimpl.cpp
+++ b/components/detournavigator/navigatorimpl.cpp
@@ -34,9 +34,9 @@ namespace DetourNavigator
 
     bool NavigatorImpl::addObject(const ObjectId id, const ObjectShapes& shapes, const btTransform& transform)
     {
-        CollisionShape collisionShape {shapes.mShapeInstance, *shapes.mShapeInstance->getCollisionShape()};
+        CollisionShape collisionShape {shapes.mShapeInstance, *shapes.mShapeInstance->mCollisionShape};
         bool result = mNavMeshManager.addObject(id, collisionShape, transform, AreaType_ground);
-        if (const btCollisionShape* const avoidShape = shapes.mShapeInstance->getAvoidCollisionShape())
+        if (const btCollisionShape* const avoidShape = shapes.mShapeInstance->mAvoidCollisionShape.get())
         {
             const ObjectId avoidId(avoidShape);
             CollisionShape avoidCollisionShape {shapes.mShapeInstance, *avoidShape};
@@ -64,9 +64,9 @@ namespace DetourNavigator
 
     bool NavigatorImpl::updateObject(const ObjectId id, const ObjectShapes& shapes, const btTransform& transform)
     {
-        const CollisionShape collisionShape {shapes.mShapeInstance, *shapes.mShapeInstance->getCollisionShape()};
+        const CollisionShape collisionShape {shapes.mShapeInstance, *shapes.mShapeInstance->mCollisionShape};
         bool result = mNavMeshManager.updateObject(id, collisionShape, transform, AreaType_ground);
-        if (const btCollisionShape* const avoidShape = shapes.mShapeInstance->getAvoidCollisionShape())
+        if (const btCollisionShape* const avoidShape = shapes.mShapeInstance->mAvoidCollisionShape.get())
         {
             const ObjectId avoidId(avoidShape);
             const CollisionShape avoidCollisionShape {shapes.mShapeInstance, *avoidShape};
diff --git a/components/resource/bulletshape.cpp b/components/resource/bulletshape.cpp
index 4b074ee146..d8315d08b6 100644
--- a/components/resource/bulletshape.cpp
+++ b/components/resource/bulletshape.cpp
@@ -77,16 +77,6 @@ BulletShape::BulletShape(const BulletShape &copy, const osg::CopyOp &copyop)
 {
 }
 
-btCollisionShape *BulletShape::getCollisionShape() const
-{
-    return mCollisionShape.get();
-}
-
-btCollisionShape *BulletShape::getAvoidCollisionShape() const
-{
-    return mAvoidCollisionShape.get();
-}
-
 void BulletShape::setLocalScaling(const btVector3& scale)
 {
     mCollisionShape->setLocalScaling(scale);
diff --git a/components/resource/bulletshape.hpp b/components/resource/bulletshape.hpp
index bf249cb364..1065f3893b 100644
--- a/components/resource/bulletshape.hpp
+++ b/components/resource/bulletshape.hpp
@@ -47,10 +47,6 @@ namespace Resource
         // we store the node's record index mapped to the child index of the shape in the btCompoundShape.
         std::map<int, int> mAnimatedShapes;
 
-        btCollisionShape* getCollisionShape() const;
-
-        btCollisionShape* getAvoidCollisionShape() const;
-
         void setLocalScaling(const btVector3& scale);
 
         bool isAnimated() const;

From ed5a4e195b1e4bb55c89444eaa5546d3dd5edc35 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 30 Oct 2021 03:38:38 +0200
Subject: [PATCH 1573/2859] Use unique_ptr to avoid possible memory leak

---
 components/resource/bulletshapemanager.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/resource/bulletshapemanager.cpp b/components/resource/bulletshapemanager.cpp
index ae6f3659a5..39ceb4fe7e 100644
--- a/components/resource/bulletshapemanager.cpp
+++ b/components/resource/bulletshapemanager.cpp
@@ -83,7 +83,8 @@ public:
             return osg::ref_ptr<BulletShape>();
 
         osg::ref_ptr<BulletShape> shape (new BulletShape);
-        btBvhTriangleMeshShape* triangleMeshShape = new TriangleMeshShape(mTriangleMesh.release(), true);
+
+        auto triangleMeshShape = std::make_unique<TriangleMeshShape>(mTriangleMesh.release(), true);
         btVector3 aabbMin = triangleMeshShape->getLocalAabbMin();
         btVector3 aabbMax = triangleMeshShape->getLocalAabbMax();
         shape->mCollisionBox.mExtents[0] = (aabbMax[0] - aabbMin[0]) / 2.0f;
@@ -92,7 +93,7 @@ public:
         shape->mCollisionBox.mCenter = osg::Vec3f( (aabbMax[0] + aabbMin[0]) / 2.0f,
                                                   (aabbMax[1] + aabbMin[1]) / 2.0f,
                                                   (aabbMax[2] + aabbMin[2]) / 2.0f );
-        shape->mCollisionShape.reset(triangleMeshShape);
+        shape->mCollisionShape.reset(triangleMeshShape.release());
 
         return shape;
     }

From c83facd9d3d21a19319157edff209499062ec0fc Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 30 Oct 2021 03:39:27 +0200
Subject: [PATCH 1574/2859] Avoid redundant osg::ref_ptr<const BulletShape>
 copy

---
 components/resource/bulletshape.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/resource/bulletshape.cpp b/components/resource/bulletshape.cpp
index d8315d08b6..1d4be1d14d 100644
--- a/components/resource/bulletshape.cpp
+++ b/components/resource/bulletshape.cpp
@@ -95,12 +95,12 @@ osg::ref_ptr<BulletShapeInstance> makeInstance(osg::ref_ptr<const BulletShape> s
 }
 
 BulletShapeInstance::BulletShapeInstance(osg::ref_ptr<const BulletShape> source)
-    : mSource(source)
+    : mSource(std::move(source))
 {
-    mCollisionBox = source->mCollisionBox;
-    mAnimatedShapes = source->mAnimatedShapes;
-    mCollisionShape = duplicateCollisionShape(source->mCollisionShape.get());
-    mAvoidCollisionShape = duplicateCollisionShape(source->mAvoidCollisionShape.get());
+    mCollisionBox = mSource->mCollisionBox;
+    mAnimatedShapes = mSource->mAnimatedShapes;
+    mCollisionShape = duplicateCollisionShape(mSource->mCollisionShape.get());
+    mAvoidCollisionShape = duplicateCollisionShape(mSource->mAvoidCollisionShape.get());
 }
 
 }

From b731a981c4267929f2e0fdf055bb1a3e1f27c6a6 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 30 Oct 2021 03:41:19 +0200
Subject: [PATCH 1575/2859] Make BulletShape::isAnimated inlined

---
 components/resource/bulletshape.cpp | 5 -----
 components/resource/bulletshape.hpp | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/components/resource/bulletshape.cpp b/components/resource/bulletshape.cpp
index 1d4be1d14d..52d639d272 100644
--- a/components/resource/bulletshape.cpp
+++ b/components/resource/bulletshape.cpp
@@ -84,11 +84,6 @@ void BulletShape::setLocalScaling(const btVector3& scale)
         mAvoidCollisionShape->setLocalScaling(scale);
 }
 
-bool BulletShape::isAnimated() const
-{
-    return !mAnimatedShapes.empty();
-}
-
 osg::ref_ptr<BulletShapeInstance> makeInstance(osg::ref_ptr<const BulletShape> source)
 {
     return {new BulletShapeInstance(std::move(source))};
diff --git a/components/resource/bulletshape.hpp b/components/resource/bulletshape.hpp
index 1065f3893b..7188165045 100644
--- a/components/resource/bulletshape.hpp
+++ b/components/resource/bulletshape.hpp
@@ -49,7 +49,7 @@ namespace Resource
 
         void setLocalScaling(const btVector3& scale);
 
-        bool isAnimated() const;
+        bool isAnimated() const { return !mAnimatedShapes.empty(); }
     };
 
 

From a851ac5fea0792f1ef6a4566d92afb16e9b971a9 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 30 Oct 2021 03:46:29 +0200
Subject: [PATCH 1576/2859] Use custom deleter for btCompoundShape to delete
 children shapes

---
 components/nifbullet/bulletnifloader.cpp | 2 +-
 components/nifbullet/bulletnifloader.hpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index 685a80951a..f808877a75 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -179,7 +179,7 @@ osg::ref_ptr<Resource::BulletShape> BulletNifLoader::load(const Nif::File& nif)
             child.release();
             mStaticMesh.release();
         }
-        mShape->mCollisionShape.reset(mCompoundShape.release());
+        mShape->mCollisionShape = std::move(mCompoundShape);
     }
     else if (mStaticMesh)
     {
diff --git a/components/nifbullet/bulletnifloader.hpp b/components/nifbullet/bulletnifloader.hpp
index 71c84566a0..3d6a95e09f 100644
--- a/components/nifbullet/bulletnifloader.hpp
+++ b/components/nifbullet/bulletnifloader.hpp
@@ -61,7 +61,7 @@ private:
 
     void handleNiTriShape(const Nif::Node *nifNode, int flags, const osg::Matrixf& transform, bool isAnimated, bool avoid);
 
-    std::unique_ptr<btCompoundShape> mCompoundShape;
+    std::unique_ptr<btCompoundShape, Resource::DeleteCollisionShape> mCompoundShape;
 
     std::unique_ptr<btTriangleMesh> mStaticMesh;
 

From f0eb068e4b99281b5d4b1843fd3135aaede7c457 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Fri, 29 Oct 2021 18:50:04 -0700
Subject: [PATCH 1577/2859] remove dead code and fix changelog entry

---
 CHANGELOG.md                     |  1 -
 apps/openmw/mwrender/sky.hpp     | 11 -----------
 apps/openmw/mwrender/skyutil.cpp |  4 ----
 3 files changed, 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ad6734f8c..7a486046e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,6 @@
     Bug #4602: Robert's Bodies: crash inside createInstance()
     Bug #4700: Editor: Incorrect command implementation
     Bug #4744: Invisible particles must still be processed
-    Bug #4752: UpdateCellCommand doesn't undo properly
     Bug #5088: Sky abruptly changes direction during certain weather transitions
     Bug #5100: Persuasion doesn't always clamp the resulting disposition
     Bug #5120: Scripted object spawning updates physics system
diff --git a/apps/openmw/mwrender/sky.hpp b/apps/openmw/mwrender/sky.hpp
index 227dee213b..1a30633886 100644
--- a/apps/openmw/mwrender/sky.hpp
+++ b/apps/openmw/mwrender/sky.hpp
@@ -32,17 +32,6 @@ namespace Resource
 
 namespace MWRender
 {
-    class AtmosphereUpdater;
-    class AtmosphereNightUpdater;
-    class CloudUpdater;
-    class Sun;
-    class Moon;
-    class RainCounter;
-    class RainShooter;
-    class RainFader;
-    class AlphaFader;
-    class UnderwaterSwitchCallback;
-
     ///@brief The SkyManager handles rendering of the sky domes, celestial bodies as well as other objects that need to be rendered
     /// relative to the camera (e.g. weather particle effects)
     class SkyManager
diff --git a/apps/openmw/mwrender/skyutil.cpp b/apps/openmw/mwrender/skyutil.cpp
index 9932733fa1..8229fa5925 100644
--- a/apps/openmw/mwrender/skyutil.cpp
+++ b/apps/openmw/mwrender/skyutil.cpp
@@ -278,10 +278,6 @@ namespace MWRender
             {
                 // no traverse
                 return;
-
-                osg::Vec4 v4;
-                osg::Vec4 v3;
-                v4 = v3;
             }
             else
             {

From 9c5f8b8719fbe9e89c929df46383c2a91aae43f9 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 30 Oct 2021 04:34:06 +0200
Subject: [PATCH 1578/2859] Store holder only in parent RecastMeshObject

---
 .../detournavigator/recastmeshobject.cpp      | 37 ++++++++-------
 .../detournavigator/recastmeshobject.hpp      | 47 ++++++++++---------
 2 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/components/detournavigator/recastmeshobject.cpp b/components/detournavigator/recastmeshobject.cpp
index 8b4bc2fd6f..31aa13a208 100644
--- a/components/detournavigator/recastmeshobject.cpp
+++ b/components/detournavigator/recastmeshobject.cpp
@@ -11,7 +11,7 @@ namespace DetourNavigator
     namespace
     {
         bool updateCompoundObject(const btCompoundShape& shape, const AreaType areaType,
-            std::vector<RecastMeshObject>& children)
+            std::vector<ChildRecastMeshObject>& children)
         {
             assert(static_cast<std::size_t>(shape.getNumChildShapes()) == children.size());
             bool result = false;
@@ -23,39 +23,33 @@ namespace DetourNavigator
             return result;
         }
 
-        std::vector<RecastMeshObject> makeChildrenObjects(const osg::ref_ptr<const osg::Referenced>& holder,
-                                                          const btCompoundShape& shape, const AreaType areaType)
+        std::vector<ChildRecastMeshObject> makeChildrenObjects(const btCompoundShape& shape, const AreaType areaType)
         {
-            std::vector<RecastMeshObject> result;
+            std::vector<ChildRecastMeshObject> result;
             for (int i = 0, num = shape.getNumChildShapes(); i < num; ++i)
-            {
-                const CollisionShape collisionShape {holder, *shape.getChildShape(i)};
-                result.emplace_back(collisionShape, shape.getChildTransform(i), areaType);
-            }
+                result.emplace_back(*shape.getChildShape(i), shape.getChildTransform(i), areaType);
             return result;
         }
 
-        std::vector<RecastMeshObject> makeChildrenObjects(const osg::ref_ptr<const osg::Referenced>& holder,
-                                                          const btCollisionShape& shape, const AreaType areaType)
+        std::vector<ChildRecastMeshObject> makeChildrenObjects(const btCollisionShape& shape, const AreaType areaType)
         {
             if (shape.isCompound())
-                return makeChildrenObjects(holder, static_cast<const btCompoundShape&>(shape), areaType);
-            return std::vector<RecastMeshObject>();
+                return makeChildrenObjects(static_cast<const btCompoundShape&>(shape), areaType);
+            return {};
         }
     }
 
-    RecastMeshObject::RecastMeshObject(const CollisionShape& shape, const btTransform& transform,
+    ChildRecastMeshObject::ChildRecastMeshObject(const btCollisionShape& shape, const btTransform& transform,
             const AreaType areaType)
-        : mHolder(shape.getHolder())
-        , mShape(shape.getShape())
+        : mShape(shape)
         , mTransform(transform)
         , mAreaType(areaType)
-        , mLocalScaling(mShape.get().getLocalScaling())
-        , mChildren(makeChildrenObjects(mHolder, mShape.get(), mAreaType))
+        , mLocalScaling(shape.getLocalScaling())
+        , mChildren(makeChildrenObjects(shape, mAreaType))
     {
     }
 
-    bool RecastMeshObject::update(const btTransform& transform, const AreaType areaType)
+    bool ChildRecastMeshObject::update(const btTransform& transform, const AreaType areaType)
     {
         bool result = false;
         if (!(mTransform == transform))
@@ -78,4 +72,11 @@ namespace DetourNavigator
                     || result;
         return result;
     }
+
+    RecastMeshObject::RecastMeshObject(const CollisionShape& shape, const btTransform& transform,
+            const AreaType areaType)
+        : mHolder(shape.getHolder())
+        , mImpl(shape.getShape(), transform, areaType)
+    {
+    }
 }
diff --git a/components/detournavigator/recastmeshobject.hpp b/components/detournavigator/recastmeshobject.hpp
index 0c50c2f346..e833ee37e3 100644
--- a/components/detournavigator/recastmeshobject.hpp
+++ b/components/detournavigator/recastmeshobject.hpp
@@ -32,40 +32,45 @@ namespace DetourNavigator
         std::reference_wrapper<const btCollisionShape> mShape;
     };
 
-    class RecastMeshObject
+    class ChildRecastMeshObject
     {
         public:
-            RecastMeshObject(const CollisionShape& shape, const btTransform& transform, const AreaType areaType);
+            ChildRecastMeshObject(const btCollisionShape& shape, const btTransform& transform, const AreaType areaType);
 
             bool update(const btTransform& transform, const AreaType areaType);
 
-            const osg::ref_ptr<const osg::Referenced>& getHolder() const
-            {
-                return mHolder;
-            }
-
-            const btCollisionShape& getShape() const
-            {
-                return mShape;
-            }
+            const btCollisionShape& getShape() const { return mShape; }
 
-            const btTransform& getTransform() const
-            {
-                return mTransform;
-            }
+            const btTransform& getTransform() const { return mTransform; }
 
-            AreaType getAreaType() const
-            {
-                return mAreaType;
-            }
+            AreaType getAreaType() const { return mAreaType; }
 
         private:
-            osg::ref_ptr<const osg::Referenced> mHolder;
             std::reference_wrapper<const btCollisionShape> mShape;
             btTransform mTransform;
             AreaType mAreaType;
             btVector3 mLocalScaling;
-            std::vector<RecastMeshObject> mChildren;
+            std::vector<ChildRecastMeshObject> mChildren;
+    };
+
+    class RecastMeshObject
+    {
+        public:
+            RecastMeshObject(const CollisionShape& shape, const btTransform& transform, const AreaType areaType);
+
+            bool update(const btTransform& transform, const AreaType areaType) { return mImpl.update(transform, areaType); }
+
+            const osg::ref_ptr<const osg::Referenced>& getHolder() const { return mHolder; }
+
+            const btCollisionShape& getShape() const { return mImpl.getShape(); }
+
+            const btTransform& getTransform() const { return mImpl.getTransform(); }
+
+            AreaType getAreaType() const { return mImpl.getAreaType(); }
+
+        private:
+            osg::ref_ptr<const osg::Referenced> mHolder;
+            ChildRecastMeshObject mImpl;
     };
 }
 

From e1ac871672ea179e97b4571ec02ddd54832ca82c Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 27 Oct 2021 18:30:26 +0200
Subject: [PATCH 1579/2859] Start adding compiler tests

---
 apps/openmw_test_suite/CMakeLists.txt         |   2 +
 .../mwscript/test_scripts.cpp                 | 140 ++++++++++++++++++
 2 files changed, 142 insertions(+)
 create mode 100644 apps/openmw_test_suite/mwscript/test_scripts.cpp

diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index 2b96d4c633..bf235331cf 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -12,6 +12,8 @@ if (GTEST_FOUND AND GMOCK_FOUND)
 
         mwdialogue/test_keywordsearch.cpp
 
+        mwscript/test_scripts.cpp
+
         esm/test_fixed_string.cpp
         esm/variant.cpp
 
diff --git a/apps/openmw_test_suite/mwscript/test_scripts.cpp b/apps/openmw_test_suite/mwscript/test_scripts.cpp
new file mode 100644
index 0000000000..d019244275
--- /dev/null
+++ b/apps/openmw_test_suite/mwscript/test_scripts.cpp
@@ -0,0 +1,140 @@
+#include <gtest/gtest.h>
+
+#include <optional>
+#include <sstream>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include <components/compiler/context.hpp>
+#include <components/compiler/errorhandler.hpp>
+#include <components/compiler/exception.hpp>
+#include <components/compiler/fileparser.hpp>
+#include <components/compiler/scanner.hpp>
+
+#include <components/interpreter/interpreter.hpp>
+
+namespace
+{
+    class TestCompilerContext : public Compiler::Context
+    {
+    public:
+        bool canDeclareLocals() const override { return true; }
+        char getGlobalType(const std::string& name) const override { return ' '; }
+        std::pair<char, bool> getMemberType(const std::string& name, const std::string& id) const override { return {' ', false}; }
+        bool isId(const std::string& name) const override { return false; }
+        bool isJournalId(const std::string& name) const override { return false; }
+    };
+
+    class TestErrorHandler : public Compiler::ErrorHandler
+    {
+        std::vector<std::pair<std::string, Compiler::TokenLoc>> mErrors;
+
+        void report(const std::string& message, const Compiler::TokenLoc& loc, Compiler::ErrorHandler::Type type) override
+        {
+            if(type == Compiler::ErrorHandler::ErrorMessage)
+                mErrors.emplace_back(message, loc);
+        }
+
+        void report(const std::string& message, Compiler::ErrorHandler::Type type) override
+        {
+            report(message, {}, type);
+        }
+
+    public:
+        void reset() override
+        {
+            Compiler::ErrorHandler::reset();
+            mErrors.clear();
+        }
+
+        const std::vector<std::pair<std::string, Compiler::TokenLoc>>& getErrors() const { return mErrors; }
+    };
+
+    struct CompiledScript
+    {
+        std::vector<Interpreter::Type_Code> mByteCode;
+        Compiler::Locals mLocals;
+
+        CompiledScript(const std::vector<Interpreter::Type_Code>& code, const Compiler::Locals& locals) : mByteCode(code), mLocals(locals) {}
+    };
+
+    struct MWScriptTest : public ::testing::Test
+    {
+        MWScriptTest() : mErrorHandler(), mParser(mErrorHandler, mCompilerContext) {}
+
+        std::optional<CompiledScript> compile(const std::string& scriptBody)
+        {
+            mParser.reset();
+            mErrorHandler.reset();
+            std::istringstream input(scriptBody);
+            Compiler::Scanner scanner(mErrorHandler, input, mCompilerContext.getExtensions());
+            scanner.scan(mParser);
+            if(mErrorHandler.isGood())
+            {
+                std::vector<Interpreter::Type_Code> code;
+                mParser.getCode(code);
+                return CompiledScript(code, mParser.getLocals());
+            }
+            return {};
+        }
+
+        void logErrors()
+        {
+            for(const auto& [error, loc] : mErrorHandler.getErrors())
+            {
+                std::cout << error;
+                if(loc.mLine)
+                    std::cout << " at line" << loc.mLine << " column " << loc.mColumn << " (" << loc.mLiteral << ")";
+                std::cout << "\n";
+            }
+        }
+
+        void run(const CompiledScript& script)
+        {
+            // mInterpreter.run(&script.mByteCode[0], script.mByteCode.size(), interpreterContext);
+        }
+    protected:
+        void SetUp() override {}
+
+        void TearDown() override {}
+    private:
+        TestErrorHandler mErrorHandler;
+        TestCompilerContext mCompilerContext;
+        Compiler::FileParser mParser;
+        Interpreter::Interpreter mInterpreter;
+    };
+
+    const std::string sScript1 = R"mwscript(Begin basic_logic
+; Comment
+short one
+short two
+
+set one to two
+
+if ( one == two )
+    set one to 1
+elseif ( two == 1 )
+    set one to 2
+else
+    set one to 3
+endif
+
+while ( one < two )
+    set one to ( one + 1 )
+endwhile
+
+End)mwscript";
+
+    TEST_F(MWScriptTest, mwscript_test_invalid)
+    {
+        EXPECT_THROW(compile("this is not a valid script"), Compiler::SourceException);
+    }
+
+    TEST_F(MWScriptTest, mwscript_test_compilation)
+    {
+        auto script = compile(sScript1);
+        logErrors();
+        EXPECT_FALSE(!script);
+    }
+}
\ No newline at end of file

From 6ad8549163f543049e739607a23c3981d9fbd6cd Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 27 Oct 2021 22:00:53 +0200
Subject: [PATCH 1580/2859] Allow validation of constant arguments

---
 .../mwscript/test_scripts.cpp                 | 508 +++++++++++++-----
 1 file changed, 369 insertions(+), 139 deletions(-)

diff --git a/apps/openmw_test_suite/mwscript/test_scripts.cpp b/apps/openmw_test_suite/mwscript/test_scripts.cpp
index d019244275..fcb4c3de5d 100644
--- a/apps/openmw_test_suite/mwscript/test_scripts.cpp
+++ b/apps/openmw_test_suite/mwscript/test_scripts.cpp
@@ -1,140 +1,370 @@
-#include <gtest/gtest.h>
-
-#include <optional>
-#include <sstream>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include <components/compiler/context.hpp>
-#include <components/compiler/errorhandler.hpp>
-#include <components/compiler/exception.hpp>
-#include <components/compiler/fileparser.hpp>
-#include <components/compiler/scanner.hpp>
-
-#include <components/interpreter/interpreter.hpp>
-
-namespace
-{
-    class TestCompilerContext : public Compiler::Context
-    {
-    public:
-        bool canDeclareLocals() const override { return true; }
-        char getGlobalType(const std::string& name) const override { return ' '; }
-        std::pair<char, bool> getMemberType(const std::string& name, const std::string& id) const override { return {' ', false}; }
-        bool isId(const std::string& name) const override { return false; }
-        bool isJournalId(const std::string& name) const override { return false; }
-    };
-
-    class TestErrorHandler : public Compiler::ErrorHandler
-    {
-        std::vector<std::pair<std::string, Compiler::TokenLoc>> mErrors;
-
-        void report(const std::string& message, const Compiler::TokenLoc& loc, Compiler::ErrorHandler::Type type) override
-        {
-            if(type == Compiler::ErrorHandler::ErrorMessage)
-                mErrors.emplace_back(message, loc);
-        }
-
-        void report(const std::string& message, Compiler::ErrorHandler::Type type) override
-        {
-            report(message, {}, type);
-        }
-
-    public:
-        void reset() override
-        {
-            Compiler::ErrorHandler::reset();
-            mErrors.clear();
-        }
-
-        const std::vector<std::pair<std::string, Compiler::TokenLoc>>& getErrors() const { return mErrors; }
-    };
-
-    struct CompiledScript
-    {
-        std::vector<Interpreter::Type_Code> mByteCode;
-        Compiler::Locals mLocals;
-
-        CompiledScript(const std::vector<Interpreter::Type_Code>& code, const Compiler::Locals& locals) : mByteCode(code), mLocals(locals) {}
-    };
-
-    struct MWScriptTest : public ::testing::Test
-    {
-        MWScriptTest() : mErrorHandler(), mParser(mErrorHandler, mCompilerContext) {}
-
-        std::optional<CompiledScript> compile(const std::string& scriptBody)
-        {
-            mParser.reset();
-            mErrorHandler.reset();
-            std::istringstream input(scriptBody);
-            Compiler::Scanner scanner(mErrorHandler, input, mCompilerContext.getExtensions());
-            scanner.scan(mParser);
-            if(mErrorHandler.isGood())
-            {
-                std::vector<Interpreter::Type_Code> code;
-                mParser.getCode(code);
-                return CompiledScript(code, mParser.getLocals());
-            }
-            return {};
-        }
-
-        void logErrors()
-        {
-            for(const auto& [error, loc] : mErrorHandler.getErrors())
-            {
-                std::cout << error;
-                if(loc.mLine)
-                    std::cout << " at line" << loc.mLine << " column " << loc.mColumn << " (" << loc.mLiteral << ")";
-                std::cout << "\n";
-            }
-        }
-
-        void run(const CompiledScript& script)
-        {
-            // mInterpreter.run(&script.mByteCode[0], script.mByteCode.size(), interpreterContext);
-        }
-    protected:
-        void SetUp() override {}
-
-        void TearDown() override {}
-    private:
-        TestErrorHandler mErrorHandler;
-        TestCompilerContext mCompilerContext;
-        Compiler::FileParser mParser;
-        Interpreter::Interpreter mInterpreter;
-    };
-
-    const std::string sScript1 = R"mwscript(Begin basic_logic
-; Comment
-short one
-short two
-
-set one to two
-
-if ( one == two )
-    set one to 1
-elseif ( two == 1 )
-    set one to 2
-else
-    set one to 3
-endif
-
-while ( one < two )
-    set one to ( one + 1 )
-endwhile
-
-End)mwscript";
-
-    TEST_F(MWScriptTest, mwscript_test_invalid)
-    {
-        EXPECT_THROW(compile("this is not a valid script"), Compiler::SourceException);
-    }
-
-    TEST_F(MWScriptTest, mwscript_test_compilation)
-    {
-        auto script = compile(sScript1);
-        logErrors();
-        EXPECT_FALSE(!script);
-    }
+#include <gtest/gtest.h>
+
+#include <optional>
+#include <sstream>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include <components/compiler/context.hpp>
+#include <components/compiler/errorhandler.hpp>
+#include <components/compiler/exception.hpp>
+#include <components/compiler/extensions.hpp>
+#include <components/compiler/extensions0.hpp>
+#include <components/compiler/fileparser.hpp>
+#include <components/compiler/opcodes.hpp>
+#include <components/compiler/scanner.hpp>
+
+#include <components/interpreter/context.hpp>
+#include <components/interpreter/installopcodes.hpp>
+#include <components/interpreter/interpreter.hpp>
+#include <components/interpreter/opcodes.hpp>
+
+namespace
+{
+    class TestCompilerContext : public Compiler::Context
+    {
+    public:
+        bool canDeclareLocals() const override { return true; }
+        char getGlobalType(const std::string& name) const override { return ' '; }
+        std::pair<char, bool> getMemberType(const std::string& name, const std::string& id) const override { return {' ', false}; }
+        bool isId(const std::string& name) const override { return false; }
+        bool isJournalId(const std::string& name) const override { return false; }
+    };
+
+    class TestErrorHandler : public Compiler::ErrorHandler
+    {
+        std::vector<std::pair<std::string, Compiler::TokenLoc>> mErrors;
+
+        void report(const std::string& message, const Compiler::TokenLoc& loc, Compiler::ErrorHandler::Type type) override
+        {
+            if(type == Compiler::ErrorHandler::ErrorMessage)
+                mErrors.emplace_back(message, loc);
+        }
+
+        void report(const std::string& message, Compiler::ErrorHandler::Type type) override
+        {
+            report(message, {}, type);
+        }
+
+    public:
+        void reset() override
+        {
+            Compiler::ErrorHandler::reset();
+            mErrors.clear();
+        }
+
+        const std::vector<std::pair<std::string, Compiler::TokenLoc>>& getErrors() const { return mErrors; }
+    };
+
+    class LocalVariables
+    {
+        std::vector<int> mShorts;
+        std::vector<int> mLongs;
+        std::vector<float> mFloats;
+
+        template<class T>
+        T getLocal(int index, const std::vector<T>& vector) const
+        {
+            if(index < vector.size())
+                return vector[index];
+            return {};
+        }
+
+        template<class T>
+        void setLocal(T value, int index, std::vector<T>& vector)
+        {
+            if(index >= vector.size())
+                vector.resize(index + 1);
+            vector[index] = value;
+        }
+    public:
+        void clear()
+        {
+            mShorts.clear();
+            mLongs.clear();
+            mFloats.clear();
+        }
+
+        int getShort(int index) const { return getLocal(index, mShorts); };
+
+        int getLong(int index) const { return getLocal(index, mLongs); };
+
+        float getFloat(int index) const { return getLocal(index, mFloats); };
+
+        void setShort(int index, int value) { setLocal(value, index, mShorts); };
+
+        void setLong(int index, int value) { setLocal(value, index, mLongs); };
+
+        void setFloat(int index, float value) { setLocal(value, index, mFloats); };
+    };
+
+    class GlobalVariables
+    {
+        std::map<std::string, int> mShorts;
+        std::map<std::string, int> mLongs;
+        std::map<std::string, float> mFloats;
+
+        template<class T>
+        T getGlobal(const std::string& name, const std::map<std::string, T>& map) const
+        {
+            auto it = map.find(name);
+            if(it != map.end())
+                return it->second;
+            return {};
+        }
+    public:
+        void clear()
+        {
+            mShorts.clear();
+            mLongs.clear();
+            mFloats.clear();
+        }
+
+        int getShort(const std::string& name) const { return getGlobal(name, mShorts); };
+
+        int getLong(const std::string& name) const { return getGlobal(name, mLongs); };
+
+        float getFloat(const std::string& name) const { return getGlobal(name, mFloats); };
+
+        void setShort(const std::string& name, int value) { mShorts[name] = value; };
+
+        void setLong(const std::string& name, int value) { mLongs[name] = value; };
+
+        void setFloat(const std::string& name, float value) { mFloats[name] = value; };
+    };
+
+    class TestInterpreterContext : public Interpreter::Context
+    {
+        LocalVariables mLocals;
+        std::map<std::string, GlobalVariables> mMembers;
+    public:
+        std::string getTarget() const override { return {}; };
+
+        int getLocalShort(int index) const override { return mLocals.getShort(index); };
+
+        int getLocalLong(int index) const override { return mLocals.getLong(index); };
+
+        float getLocalFloat(int index) const override { return mLocals.getFloat(index); };
+
+        void setLocalShort(int index, int value) override { mLocals.setShort(index, value); };
+
+        void setLocalLong(int index, int value) override { mLocals.setLong(index, value); };
+
+        void setLocalFloat(int index, float value) override { mLocals.setFloat(index, value); };
+
+        void messageBox(const std::string& message, const std::vector<std::string>& buttons) override {};
+
+        void report(const std::string& message) override { std::cout << message << "\n"; };
+
+        int getGlobalShort(const std::string& name) const override { return {}; };
+
+        int getGlobalLong(const std::string& name) const override { return {}; };
+
+        float getGlobalFloat(const std::string& name) const override { return {}; };
+
+        void setGlobalShort(const std::string& name, int value) override {};
+
+        void setGlobalLong(const std::string& name, int value) override {};
+
+        void setGlobalFloat(const std::string& name, float value) override {};
+
+        std::vector<std::string> getGlobals() const override { return {}; };
+
+        char getGlobalType(const std::string& name) const override { return ' '; };
+
+        std::string getActionBinding(const std::string& action) const override { return {}; };
+
+        std::string getActorName() const override { return {}; };
+
+        std::string getNPCRace() const override { return {}; };
+
+        std::string getNPCClass() const override { return {}; };
+
+        std::string getNPCFaction() const override { return {}; };
+
+        std::string getNPCRank() const override { return {}; };
+
+        std::string getPCName() const override { return {}; };
+
+        std::string getPCRace() const override { return {}; };
+
+        std::string getPCClass() const override { return {}; };
+
+        std::string getPCRank() const override { return {}; };
+
+        std::string getPCNextRank() const override { return {}; };
+
+        int getPCBounty() const override { return {}; };
+
+        std::string getCurrentCellName() const override { return {}; };
+
+        int getMemberShort(const std::string& id, const std::string& name, bool global) const override
+        {
+            auto it = mMembers.find(id);
+            if(it != mMembers.end())
+                return it->second.getShort(name);
+            return {};
+        };
+
+        int getMemberLong(const std::string& id, const std::string& name, bool global) const override
+        {
+            auto it = mMembers.find(id);
+            if(it != mMembers.end())
+                return it->second.getLong(name);
+            return {};
+        };
+
+        float getMemberFloat(const std::string& id, const std::string& name, bool global) const override
+        {
+            auto it = mMembers.find(id);
+            if(it != mMembers.end())
+                return it->second.getFloat(name);
+            return {};
+        };
+
+        void setMemberShort(const std::string& id, const std::string& name, int value, bool global) override { mMembers[id].setShort(name, value); };
+
+        void setMemberLong(const std::string& id, const std::string& name, int value, bool global) override { mMembers[id].setLong(name, value); };
+
+        void setMemberFloat(const std::string& id, const std::string& name, float value, bool global) override { mMembers[id].setFloat(name, value); };
+    };
+
+    struct CompiledScript
+    {
+        std::vector<Interpreter::Type_Code> mByteCode;
+        Compiler::Locals mLocals;
+
+        CompiledScript(const std::vector<Interpreter::Type_Code>& code, const Compiler::Locals& locals) : mByteCode(code), mLocals(locals) {}
+    };
+
+    struct MWScriptTest : public ::testing::Test
+    {
+        MWScriptTest() : mErrorHandler(), mParser(mErrorHandler, mCompilerContext) {}
+
+        std::optional<CompiledScript> compile(const std::string& scriptBody, bool shouldFail = false)
+        {
+            mParser.reset();
+            mErrorHandler.reset();
+            std::istringstream input(scriptBody);
+            Compiler::Scanner scanner(mErrorHandler, input, mCompilerContext.getExtensions());
+            scanner.scan(mParser);
+            if(mErrorHandler.isGood())
+            {
+                std::vector<Interpreter::Type_Code> code;
+                mParser.getCode(code);
+                return CompiledScript(code, mParser.getLocals());
+            }
+            else if(!shouldFail)
+                logErrors();
+            return {};
+        }
+
+        void logErrors()
+        {
+            for(const auto& [error, loc] : mErrorHandler.getErrors())
+            {
+                std::cout << error;
+                if(loc.mLine)
+                    std::cout << " at line" << loc.mLine << " column " << loc.mColumn << " (" << loc.mLiteral << ")";
+                std::cout << "\n";
+            }
+        }
+
+        void registerExtensions()
+        {
+            Compiler::registerExtensions(mExtensions);
+            mCompilerContext.setExtensions(&mExtensions);
+        }
+
+        void run(const CompiledScript& script, TestInterpreterContext& context)
+        {
+            mInterpreter.run(&script.mByteCode[0], script.mByteCode.size(), context);
+        }
+
+        void installOpcode(int code, Interpreter::Opcode0* opcode)
+        {
+            mInterpreter.installSegment5(code, opcode);
+        }
+    protected:
+        void SetUp() override
+        {
+            Interpreter::installOpcodes(mInterpreter);
+        }
+
+        void TearDown() override {}
+    private:
+        TestErrorHandler mErrorHandler;
+        TestCompilerContext mCompilerContext;
+        Compiler::FileParser mParser;
+        Compiler::Extensions mExtensions;
+        Interpreter::Interpreter mInterpreter;
+    };
+
+    const std::string sScript1 = R"mwscript(Begin basic_logic
+; Comment
+short one
+short two
+
+set one to two
+
+if ( one == two )
+    set one to 1
+elseif ( two == 1 )
+    set one to 2
+else
+    set one to 3
+endif
+
+while ( one < two )
+    set one to ( one + 1 )
+endwhile
+
+End)mwscript";
+
+    const std::string sScript2 = R"mwscript(Begin addtopic
+
+AddTopic "OpenMW Unit Test"
+
+End)mwscript";
+
+    TEST_F(MWScriptTest, mwscript_test_invalid)
+    {
+        EXPECT_THROW(compile("this is not a valid script", true), Compiler::SourceException);
+    }
+
+    TEST_F(MWScriptTest, mwscript_test_compilation)
+    {
+        EXPECT_FALSE(!compile(sScript1));
+    }
+
+    TEST_F(MWScriptTest, mwscript_test_no_extensions)
+    {
+        EXPECT_THROW(compile(sScript2, true), Compiler::SourceException);
+    }
+
+    TEST_F(MWScriptTest, mwscript_test_function)
+    {
+        registerExtensions();
+        if(auto script = compile(sScript2))
+        {
+            class AddTopic : public Interpreter::Opcode0
+            {
+            public:
+                void execute(Interpreter::Runtime& runtime)
+                {
+                    const auto topic = runtime.getStringLiteral(runtime[0].mInteger);
+                    runtime.pop();
+                    EXPECT_EQ(topic, "OpenMW Unit Test");
+                }
+            };
+            installOpcode(Compiler::Dialogue::opcodeAddTopic, new AddTopic);
+            TestInterpreterContext context;
+            run(*script, context);
+        }
+        else
+        {
+            FAIL();
+        }
+    }
 }
\ No newline at end of file

From be759e576a08806ef93ddcec622ab280facd7a82 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 27 Oct 2021 22:08:41 +0200
Subject: [PATCH 1581/2859] Be sure to verify the opcode got executed

---
 apps/openmw_test_suite/mwscript/test_scripts.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/openmw_test_suite/mwscript/test_scripts.cpp b/apps/openmw_test_suite/mwscript/test_scripts.cpp
index fcb4c3de5d..3c0cd477d5 100644
--- a/apps/openmw_test_suite/mwscript/test_scripts.cpp
+++ b/apps/openmw_test_suite/mwscript/test_scripts.cpp
@@ -346,23 +346,28 @@ End)mwscript";
     TEST_F(MWScriptTest, mwscript_test_function)
     {
         registerExtensions();
+        bool failed = true;
         if(auto script = compile(sScript2))
         {
             class AddTopic : public Interpreter::Opcode0
             {
+                bool& mFailed;
             public:
+                AddTopic(bool& failed) : mFailed(failed) {}
+
                 void execute(Interpreter::Runtime& runtime)
                 {
                     const auto topic = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
+                    mFailed = false;
                     EXPECT_EQ(topic, "OpenMW Unit Test");
                 }
             };
-            installOpcode(Compiler::Dialogue::opcodeAddTopic, new AddTopic);
+            installOpcode(Compiler::Dialogue::opcodeAddTopic, new AddTopic(failed));
             TestInterpreterContext context;
             run(*script, context);
         }
-        else
+        if(failed)
         {
             FAIL();
         }

From f027acf5751b8fa75ecce9251d5dd70eef9411aa Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 27 Oct 2021 22:13:56 +0200
Subject: [PATCH 1582/2859] Move boilerplate to separate file

---
 .../mwscript/test_scripts.cpp                 | 237 +----------------
 .../openmw_test_suite/mwscript/test_utils.hpp | 242 ++++++++++++++++++
 2 files changed, 244 insertions(+), 235 deletions(-)
 create mode 100644 apps/openmw_test_suite/mwscript/test_utils.hpp

diff --git a/apps/openmw_test_suite/mwscript/test_scripts.cpp b/apps/openmw_test_suite/mwscript/test_scripts.cpp
index 3c0cd477d5..90c7fb53c2 100644
--- a/apps/openmw_test_suite/mwscript/test_scripts.cpp
+++ b/apps/openmw_test_suite/mwscript/test_scripts.cpp
@@ -1,243 +1,10 @@
 #include <gtest/gtest.h>
-
-#include <optional>
 #include <sstream>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include <components/compiler/context.hpp>
-#include <components/compiler/errorhandler.hpp>
-#include <components/compiler/exception.hpp>
-#include <components/compiler/extensions.hpp>
-#include <components/compiler/extensions0.hpp>
-#include <components/compiler/fileparser.hpp>
-#include <components/compiler/opcodes.hpp>
-#include <components/compiler/scanner.hpp>
 
-#include <components/interpreter/context.hpp>
-#include <components/interpreter/installopcodes.hpp>
-#include <components/interpreter/interpreter.hpp>
-#include <components/interpreter/opcodes.hpp>
+#include "test_utils.hpp"
 
 namespace
 {
-    class TestCompilerContext : public Compiler::Context
-    {
-    public:
-        bool canDeclareLocals() const override { return true; }
-        char getGlobalType(const std::string& name) const override { return ' '; }
-        std::pair<char, bool> getMemberType(const std::string& name, const std::string& id) const override { return {' ', false}; }
-        bool isId(const std::string& name) const override { return false; }
-        bool isJournalId(const std::string& name) const override { return false; }
-    };
-
-    class TestErrorHandler : public Compiler::ErrorHandler
-    {
-        std::vector<std::pair<std::string, Compiler::TokenLoc>> mErrors;
-
-        void report(const std::string& message, const Compiler::TokenLoc& loc, Compiler::ErrorHandler::Type type) override
-        {
-            if(type == Compiler::ErrorHandler::ErrorMessage)
-                mErrors.emplace_back(message, loc);
-        }
-
-        void report(const std::string& message, Compiler::ErrorHandler::Type type) override
-        {
-            report(message, {}, type);
-        }
-
-    public:
-        void reset() override
-        {
-            Compiler::ErrorHandler::reset();
-            mErrors.clear();
-        }
-
-        const std::vector<std::pair<std::string, Compiler::TokenLoc>>& getErrors() const { return mErrors; }
-    };
-
-    class LocalVariables
-    {
-        std::vector<int> mShorts;
-        std::vector<int> mLongs;
-        std::vector<float> mFloats;
-
-        template<class T>
-        T getLocal(int index, const std::vector<T>& vector) const
-        {
-            if(index < vector.size())
-                return vector[index];
-            return {};
-        }
-
-        template<class T>
-        void setLocal(T value, int index, std::vector<T>& vector)
-        {
-            if(index >= vector.size())
-                vector.resize(index + 1);
-            vector[index] = value;
-        }
-    public:
-        void clear()
-        {
-            mShorts.clear();
-            mLongs.clear();
-            mFloats.clear();
-        }
-
-        int getShort(int index) const { return getLocal(index, mShorts); };
-
-        int getLong(int index) const { return getLocal(index, mLongs); };
-
-        float getFloat(int index) const { return getLocal(index, mFloats); };
-
-        void setShort(int index, int value) { setLocal(value, index, mShorts); };
-
-        void setLong(int index, int value) { setLocal(value, index, mLongs); };
-
-        void setFloat(int index, float value) { setLocal(value, index, mFloats); };
-    };
-
-    class GlobalVariables
-    {
-        std::map<std::string, int> mShorts;
-        std::map<std::string, int> mLongs;
-        std::map<std::string, float> mFloats;
-
-        template<class T>
-        T getGlobal(const std::string& name, const std::map<std::string, T>& map) const
-        {
-            auto it = map.find(name);
-            if(it != map.end())
-                return it->second;
-            return {};
-        }
-    public:
-        void clear()
-        {
-            mShorts.clear();
-            mLongs.clear();
-            mFloats.clear();
-        }
-
-        int getShort(const std::string& name) const { return getGlobal(name, mShorts); };
-
-        int getLong(const std::string& name) const { return getGlobal(name, mLongs); };
-
-        float getFloat(const std::string& name) const { return getGlobal(name, mFloats); };
-
-        void setShort(const std::string& name, int value) { mShorts[name] = value; };
-
-        void setLong(const std::string& name, int value) { mLongs[name] = value; };
-
-        void setFloat(const std::string& name, float value) { mFloats[name] = value; };
-    };
-
-    class TestInterpreterContext : public Interpreter::Context
-    {
-        LocalVariables mLocals;
-        std::map<std::string, GlobalVariables> mMembers;
-    public:
-        std::string getTarget() const override { return {}; };
-
-        int getLocalShort(int index) const override { return mLocals.getShort(index); };
-
-        int getLocalLong(int index) const override { return mLocals.getLong(index); };
-
-        float getLocalFloat(int index) const override { return mLocals.getFloat(index); };
-
-        void setLocalShort(int index, int value) override { mLocals.setShort(index, value); };
-
-        void setLocalLong(int index, int value) override { mLocals.setLong(index, value); };
-
-        void setLocalFloat(int index, float value) override { mLocals.setFloat(index, value); };
-
-        void messageBox(const std::string& message, const std::vector<std::string>& buttons) override {};
-
-        void report(const std::string& message) override { std::cout << message << "\n"; };
-
-        int getGlobalShort(const std::string& name) const override { return {}; };
-
-        int getGlobalLong(const std::string& name) const override { return {}; };
-
-        float getGlobalFloat(const std::string& name) const override { return {}; };
-
-        void setGlobalShort(const std::string& name, int value) override {};
-
-        void setGlobalLong(const std::string& name, int value) override {};
-
-        void setGlobalFloat(const std::string& name, float value) override {};
-
-        std::vector<std::string> getGlobals() const override { return {}; };
-
-        char getGlobalType(const std::string& name) const override { return ' '; };
-
-        std::string getActionBinding(const std::string& action) const override { return {}; };
-
-        std::string getActorName() const override { return {}; };
-
-        std::string getNPCRace() const override { return {}; };
-
-        std::string getNPCClass() const override { return {}; };
-
-        std::string getNPCFaction() const override { return {}; };
-
-        std::string getNPCRank() const override { return {}; };
-
-        std::string getPCName() const override { return {}; };
-
-        std::string getPCRace() const override { return {}; };
-
-        std::string getPCClass() const override { return {}; };
-
-        std::string getPCRank() const override { return {}; };
-
-        std::string getPCNextRank() const override { return {}; };
-
-        int getPCBounty() const override { return {}; };
-
-        std::string getCurrentCellName() const override { return {}; };
-
-        int getMemberShort(const std::string& id, const std::string& name, bool global) const override
-        {
-            auto it = mMembers.find(id);
-            if(it != mMembers.end())
-                return it->second.getShort(name);
-            return {};
-        };
-
-        int getMemberLong(const std::string& id, const std::string& name, bool global) const override
-        {
-            auto it = mMembers.find(id);
-            if(it != mMembers.end())
-                return it->second.getLong(name);
-            return {};
-        };
-
-        float getMemberFloat(const std::string& id, const std::string& name, bool global) const override
-        {
-            auto it = mMembers.find(id);
-            if(it != mMembers.end())
-                return it->second.getFloat(name);
-            return {};
-        };
-
-        void setMemberShort(const std::string& id, const std::string& name, int value, bool global) override { mMembers[id].setShort(name, value); };
-
-        void setMemberLong(const std::string& id, const std::string& name, int value, bool global) override { mMembers[id].setLong(name, value); };
-
-        void setMemberFloat(const std::string& id, const std::string& name, float value, bool global) override { mMembers[id].setFloat(name, value); };
-    };
-
-    struct CompiledScript
-    {
-        std::vector<Interpreter::Type_Code> mByteCode;
-        Compiler::Locals mLocals;
-
-        CompiledScript(const std::vector<Interpreter::Type_Code>& code, const Compiler::Locals& locals) : mByteCode(code), mLocals(locals) {}
-    };
-
     struct MWScriptTest : public ::testing::Test
     {
         MWScriptTest() : mErrorHandler(), mParser(mErrorHandler, mCompilerContext) {}
@@ -279,7 +46,7 @@ namespace
 
         void run(const CompiledScript& script, TestInterpreterContext& context)
         {
-            mInterpreter.run(&script.mByteCode[0], script.mByteCode.size(), context);
+            mInterpreter.run(&script.mByteCode[0], static_cast<int>(script.mByteCode.size()), context);
         }
 
         void installOpcode(int code, Interpreter::Opcode0* opcode)
diff --git a/apps/openmw_test_suite/mwscript/test_utils.hpp b/apps/openmw_test_suite/mwscript/test_utils.hpp
new file mode 100644
index 0000000000..58218b7000
--- /dev/null
+++ b/apps/openmw_test_suite/mwscript/test_utils.hpp
@@ -0,0 +1,242 @@
+#ifndef MWSCRIPT_TESTING_UTIL_H
+#define MWSCRIPT_TESTING_UTIL_H
+
+#include <optional>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include <components/compiler/context.hpp>
+#include <components/compiler/errorhandler.hpp>
+#include <components/compiler/exception.hpp>
+#include <components/compiler/extensions.hpp>
+#include <components/compiler/extensions0.hpp>
+#include <components/compiler/fileparser.hpp>
+#include <components/compiler/opcodes.hpp>
+#include <components/compiler/scanner.hpp>
+
+#include <components/interpreter/context.hpp>
+#include <components/interpreter/installopcodes.hpp>
+#include <components/interpreter/interpreter.hpp>
+#include <components/interpreter/opcodes.hpp>
+
+namespace
+{
+    class TestCompilerContext : public Compiler::Context
+    {
+    public:
+        bool canDeclareLocals() const override { return true; }
+        char getGlobalType(const std::string& name) const override { return ' '; }
+        std::pair<char, bool> getMemberType(const std::string& name, const std::string& id) const override { return {' ', false}; }
+        bool isId(const std::string& name) const override { return false; }
+        bool isJournalId(const std::string& name) const override { return false; }
+    };
+
+    class TestErrorHandler : public Compiler::ErrorHandler
+    {
+        std::vector<std::pair<std::string, Compiler::TokenLoc>> mErrors;
+
+        void report(const std::string& message, const Compiler::TokenLoc& loc, Compiler::ErrorHandler::Type type) override
+        {
+            if(type == Compiler::ErrorHandler::ErrorMessage)
+                mErrors.emplace_back(message, loc);
+        }
+
+        void report(const std::string& message, Compiler::ErrorHandler::Type type) override
+        {
+            report(message, {}, type);
+        }
+
+    public:
+        void reset() override
+        {
+            Compiler::ErrorHandler::reset();
+            mErrors.clear();
+        }
+
+        const std::vector<std::pair<std::string, Compiler::TokenLoc>>& getErrors() const { return mErrors; }
+    };
+
+    class LocalVariables
+    {
+        std::vector<int> mShorts;
+        std::vector<int> mLongs;
+        std::vector<float> mFloats;
+
+        template<class T>
+        T getLocal(int index, const std::vector<T>& vector) const
+        {
+            if(index < vector.size())
+                return vector[index];
+            return {};
+        }
+
+        template<class T>
+        void setLocal(T value, int index, std::vector<T>& vector)
+        {
+            if(index >= vector.size())
+                vector.resize(index + 1);
+            vector[index] = value;
+        }
+    public:
+        void clear()
+        {
+            mShorts.clear();
+            mLongs.clear();
+            mFloats.clear();
+        }
+
+        int getShort(int index) const { return getLocal(index, mShorts); };
+
+        int getLong(int index) const { return getLocal(index, mLongs); };
+
+        float getFloat(int index) const { return getLocal(index, mFloats); };
+
+        void setShort(int index, int value) { setLocal(value, index, mShorts); };
+
+        void setLong(int index, int value) { setLocal(value, index, mLongs); };
+
+        void setFloat(int index, float value) { setLocal(value, index, mFloats); };
+    };
+
+    class GlobalVariables
+    {
+        std::map<std::string, int> mShorts;
+        std::map<std::string, int> mLongs;
+        std::map<std::string, float> mFloats;
+
+        template<class T>
+        T getGlobal(const std::string& name, const std::map<std::string, T>& map) const
+        {
+            auto it = map.find(name);
+            if(it != map.end())
+                return it->second;
+            return {};
+        }
+    public:
+        void clear()
+        {
+            mShorts.clear();
+            mLongs.clear();
+            mFloats.clear();
+        }
+
+        int getShort(const std::string& name) const { return getGlobal(name, mShorts); };
+
+        int getLong(const std::string& name) const { return getGlobal(name, mLongs); };
+
+        float getFloat(const std::string& name) const { return getGlobal(name, mFloats); };
+
+        void setShort(const std::string& name, int value) { mShorts[name] = value; };
+
+        void setLong(const std::string& name, int value) { mLongs[name] = value; };
+
+        void setFloat(const std::string& name, float value) { mFloats[name] = value; };
+    };
+
+    class TestInterpreterContext : public Interpreter::Context
+    {
+        LocalVariables mLocals;
+        std::map<std::string, GlobalVariables> mMembers;
+    public:
+        std::string getTarget() const override { return {}; };
+
+        int getLocalShort(int index) const override { return mLocals.getShort(index); };
+
+        int getLocalLong(int index) const override { return mLocals.getLong(index); };
+
+        float getLocalFloat(int index) const override { return mLocals.getFloat(index); };
+
+        void setLocalShort(int index, int value) override { mLocals.setShort(index, value); };
+
+        void setLocalLong(int index, int value) override { mLocals.setLong(index, value); };
+
+        void setLocalFloat(int index, float value) override { mLocals.setFloat(index, value); };
+
+        void messageBox(const std::string& message, const std::vector<std::string>& buttons) override {};
+
+        void report(const std::string& message) override {};
+
+        int getGlobalShort(const std::string& name) const override { return {}; };
+
+        int getGlobalLong(const std::string& name) const override { return {}; };
+
+        float getGlobalFloat(const std::string& name) const override { return {}; };
+
+        void setGlobalShort(const std::string& name, int value) override {};
+
+        void setGlobalLong(const std::string& name, int value) override {};
+
+        void setGlobalFloat(const std::string& name, float value) override {};
+
+        std::vector<std::string> getGlobals() const override { return {}; };
+
+        char getGlobalType(const std::string& name) const override { return ' '; };
+
+        std::string getActionBinding(const std::string& action) const override { return {}; };
+
+        std::string getActorName() const override { return {}; };
+
+        std::string getNPCRace() const override { return {}; };
+
+        std::string getNPCClass() const override { return {}; };
+
+        std::string getNPCFaction() const override { return {}; };
+
+        std::string getNPCRank() const override { return {}; };
+
+        std::string getPCName() const override { return {}; };
+
+        std::string getPCRace() const override { return {}; };
+
+        std::string getPCClass() const override { return {}; };
+
+        std::string getPCRank() const override { return {}; };
+
+        std::string getPCNextRank() const override { return {}; };
+
+        int getPCBounty() const override { return {}; };
+
+        std::string getCurrentCellName() const override { return {}; };
+
+        int getMemberShort(const std::string& id, const std::string& name, bool global) const override
+        {
+            auto it = mMembers.find(id);
+            if(it != mMembers.end())
+                return it->second.getShort(name);
+            return {};
+        };
+
+        int getMemberLong(const std::string& id, const std::string& name, bool global) const override
+        {
+            auto it = mMembers.find(id);
+            if(it != mMembers.end())
+                return it->second.getLong(name);
+            return {};
+        };
+
+        float getMemberFloat(const std::string& id, const std::string& name, bool global) const override
+        {
+            auto it = mMembers.find(id);
+            if(it != mMembers.end())
+                return it->second.getFloat(name);
+            return {};
+        };
+
+        void setMemberShort(const std::string& id, const std::string& name, int value, bool global) override { mMembers[id].setShort(name, value); };
+
+        void setMemberLong(const std::string& id, const std::string& name, int value, bool global) override { mMembers[id].setLong(name, value); };
+
+        void setMemberFloat(const std::string& id, const std::string& name, float value, bool global) override { mMembers[id].setFloat(name, value); };
+    };
+
+    struct CompiledScript
+    {
+        std::vector<Interpreter::Type_Code> mByteCode;
+        Compiler::Locals mLocals;
+
+        CompiledScript(const std::vector<Interpreter::Type_Code>& code, const Compiler::Locals& locals) : mByteCode(code), mLocals(locals) {}
+    };
+}
+
+#endif
\ No newline at end of file

From 3dada0796ae288f8fb6ffc31dfae003aed3f994c Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 28 Oct 2021 17:34:31 +0200
Subject: [PATCH 1583/2859] Validate integer math

---
 .../mwscript/test_scripts.cpp                 | 60 +++++++++++++++++++
 .../openmw_test_suite/mwscript/test_utils.hpp | 16 ++---
 2 files changed, 68 insertions(+), 8 deletions(-)

diff --git a/apps/openmw_test_suite/mwscript/test_scripts.cpp b/apps/openmw_test_suite/mwscript/test_scripts.cpp
index 90c7fb53c2..b2e534a401 100644
--- a/apps/openmw_test_suite/mwscript/test_scripts.cpp
+++ b/apps/openmw_test_suite/mwscript/test_scripts.cpp
@@ -93,6 +93,21 @@ End)mwscript";
 
 AddTopic "OpenMW Unit Test"
 
+End)mwscript";
+
+    const std::string sScript3 = R"mwscript(Begin math
+
+short a
+short b
+short c
+short d
+short e
+
+set b to ( a + 1 )
+set c to ( a - 1 )
+set d to ( b * c )
+set e to ( d / a )
+
 End)mwscript";
 
     TEST_F(MWScriptTest, mwscript_test_invalid)
@@ -139,4 +154,49 @@ End)mwscript";
             FAIL();
         }
     }
+
+    TEST_F(MWScriptTest, mwscript_test_math)
+    {
+        if(auto script = compile(sScript3))
+        {
+            struct Algorithm
+            {
+                int a;
+                int b;
+                int c;
+                int d;
+                int e;
+
+                void run(int input)
+                {
+                    a = input;
+                    b = a + 1;
+                    c = a - 1;
+                    d = b * c;
+                    e = d / a;
+                }
+
+                void test(const TestInterpreterContext& context) const
+                {
+                    EXPECT_EQ(a, context.getLocalShort(0));
+                    EXPECT_EQ(b, context.getLocalShort(1));
+                    EXPECT_EQ(c, context.getLocalShort(2));
+                    EXPECT_EQ(d, context.getLocalShort(3));
+                    EXPECT_EQ(e, context.getLocalShort(4));
+                }
+            } algorithm;
+            TestInterpreterContext context;
+            for(int i = 1; i < 1000; ++i)
+            {
+                context.setLocalShort(0, i);
+                run(*script, context);
+                algorithm.run(i);
+                algorithm.test(context);
+            }
+        }
+        else
+        {
+            FAIL();
+        }
+    }
 }
\ No newline at end of file
diff --git a/apps/openmw_test_suite/mwscript/test_utils.hpp b/apps/openmw_test_suite/mwscript/test_utils.hpp
index 58218b7000..b1f4e04262 100644
--- a/apps/openmw_test_suite/mwscript/test_utils.hpp
+++ b/apps/openmw_test_suite/mwscript/test_utils.hpp
@@ -64,7 +64,7 @@ namespace
         std::vector<float> mFloats;
 
         template<class T>
-        T getLocal(int index, const std::vector<T>& vector) const
+        T getLocal(std::size_t index, const std::vector<T>& vector) const
         {
             if(index < vector.size())
                 return vector[index];
@@ -72,7 +72,7 @@ namespace
         }
 
         template<class T>
-        void setLocal(T value, int index, std::vector<T>& vector)
+        void setLocal(T value, std::size_t index, std::vector<T>& vector)
         {
             if(index >= vector.size())
                 vector.resize(index + 1);
@@ -86,17 +86,17 @@ namespace
             mFloats.clear();
         }
 
-        int getShort(int index) const { return getLocal(index, mShorts); };
+        int getShort(std::size_t index) const { return getLocal(index, mShorts); };
 
-        int getLong(int index) const { return getLocal(index, mLongs); };
+        int getLong(std::size_t index) const { return getLocal(index, mLongs); };
 
-        float getFloat(int index) const { return getLocal(index, mFloats); };
+        float getFloat(std::size_t index) const { return getLocal(index, mFloats); };
 
-        void setShort(int index, int value) { setLocal(value, index, mShorts); };
+        void setShort(std::size_t index, int value) { setLocal(value, index, mShorts); };
 
-        void setLong(int index, int value) { setLocal(value, index, mLongs); };
+        void setLong(std::size_t index, int value) { setLocal(value, index, mLongs); };
 
-        void setFloat(int index, float value) { setLocal(value, index, mFloats); };
+        void setFloat(std::size_t index, float value) { setLocal(value, index, mFloats); };
     };
 
     class GlobalVariables

From b2cdbe2e61f679bd6bfcf424a197ee2de6067990 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 28 Oct 2021 18:16:00 +0200
Subject: [PATCH 1584/2859] Add tests for certain issues

---
 .../mwscript/test_scripts.cpp                 | 179 ++++++++++++++++++
 .../openmw_test_suite/mwscript/test_utils.hpp |   2 +-
 2 files changed, 180 insertions(+), 1 deletion(-)

diff --git a/apps/openmw_test_suite/mwscript/test_scripts.cpp b/apps/openmw_test_suite/mwscript/test_scripts.cpp
index b2e534a401..b40fdd9b29 100644
--- a/apps/openmw_test_suite/mwscript/test_scripts.cpp
+++ b/apps/openmw_test_suite/mwscript/test_scripts.cpp
@@ -108,6 +108,98 @@ set c to ( a - 1 )
 set d to ( b * c )
 set e to ( d / a )
 
+End)mwscript";
+
+    const std::string sIssue3006 = R"mwscript(Begin issue3006
+
+short a
+
+if ( a == 1 )
+    set a to 2
+else set a to 3
+endif
+
+End)mwscript";
+
+    const std::string sIssue3725 = R"mwscript(Begin issue3725
+
+onactivate
+
+if onactivate
+    ; do something
+endif
+
+End)mwscript";
+
+    const std::string sIssue4451 = R"mwscript(Begin, GlassDisplayScript
+
+;[Script body]
+
+End, GlassDisplayScript)mwscript";
+
+    const std::string sIssue4597 = R"mwscript(Begin issue4597
+
+short a
+short b
+short c
+short d
+
+set c to 0
+set d to 0
+
+if ( a <> b )
+    set c to ( c + 1 )
+endif
+if ( a << b )
+    set c to ( c + 1 )
+endif
+if ( a < b )
+    set c to ( c + 1 )
+endif
+
+if ( a >< b )
+    set d to ( d + 1 )
+endif
+if ( a >> b )
+    set d to ( d + 1 )
+endif
+if ( a > b )
+    set d to ( d + 1 )
+endif
+
+End)mwscript";
+
+    const std::string sIssue4598 = R"mwscript(Begin issue4598
+
+StartScript kal_S_Pub_Jejubãr_Faraminos
+
+End)mwscript";
+
+    const std::string sIssue4867 = R"mwscript(Begin issue4867
+
+float PcMagickaMult :  The gameplay setting fPcBaseMagickaMult - 1.0000
+
+End)mwscript";
+
+    const std::string sIssue4888 = R"mwscript(Begin issue4888
+
+if (player->GameHour == 10)
+set player->GameHour to 20
+endif
+
+End)mwscript";
+
+    const std::string sIssue5087 = R"mwscript(Begin Begin
+
+player->sethealth 0
+stopscript Begin
+
+End Begin)mwscript";
+
+    const std::string sIssue5097 = R"mwscript(Begin issue5097
+
+setscale "0.3"
+
 End)mwscript";
 
     TEST_F(MWScriptTest, mwscript_test_invalid)
@@ -199,4 +291,91 @@ End)mwscript";
             FAIL();
         }
     }
+
+    TEST_F(MWScriptTest, mwscript_test_3006)
+    {
+        if(auto script = compile(sIssue3006))
+        {
+            TestInterpreterContext context;
+            context.setLocalShort(0, 0);
+            run(*script, context);
+            EXPECT_EQ(context.getLocalShort(0), 0);
+            context.setLocalShort(0, 1);
+            run(*script, context);
+            EXPECT_EQ(context.getLocalShort(0), 2);
+        }
+        else
+        {
+            FAIL();
+        }
+    }
+
+    TEST_F(MWScriptTest, mwscript_test_3725)
+    {
+        registerExtensions();
+        EXPECT_FALSE(!compile(sIssue3725));
+    }
+
+    TEST_F(MWScriptTest, mwscript_test_4451)
+    {
+        EXPECT_FALSE(!compile(sIssue4451));
+    }
+
+    TEST_F(MWScriptTest, mwscript_test_4597)
+    {
+        if(auto script = compile(sIssue4597))
+        {
+            TestInterpreterContext context;
+            for(int a = 0; a < 100; ++a)
+            {
+                for(int b = 0; b < 100; ++b)
+                {
+                    context.setLocalShort(0, a);
+                    context.setLocalShort(1, b);
+                    run(*script, context);
+                    if(a < b)
+                        EXPECT_EQ(context.getLocalShort(2), 3);
+                    else
+                        EXPECT_EQ(context.getLocalShort(2), 0);
+                    if(a > b)
+                        EXPECT_EQ(context.getLocalShort(3), 3);
+                    else
+                        EXPECT_EQ(context.getLocalShort(3), 0);
+
+                }
+            }
+        }
+        else
+        {
+            FAIL();
+        }
+    }
+
+    TEST_F(MWScriptTest, mwscript_test_4598)
+    {
+        registerExtensions();
+        EXPECT_FALSE(!compile(sIssue4598));
+    }
+
+    TEST_F(MWScriptTest, mwscript_test_4867)
+    {
+        EXPECT_FALSE(!compile(sIssue4867));
+    }
+
+    TEST_F(MWScriptTest, mwscript_test_4888)
+    {
+        EXPECT_FALSE(!compile(sIssue4888));
+    }
+
+    TEST_F(MWScriptTest, mwscript_test_5087)
+    {
+        registerExtensions();
+        EXPECT_FALSE(!compile(sIssue5087));
+    }
+
+    TEST_F(MWScriptTest, mwscript_test_5097)
+    {
+        registerExtensions();
+        EXPECT_FALSE(!compile(sIssue5097));
+    }
 }
\ No newline at end of file
diff --git a/apps/openmw_test_suite/mwscript/test_utils.hpp b/apps/openmw_test_suite/mwscript/test_utils.hpp
index b1f4e04262..53dfe93ad6 100644
--- a/apps/openmw_test_suite/mwscript/test_utils.hpp
+++ b/apps/openmw_test_suite/mwscript/test_utils.hpp
@@ -28,7 +28,7 @@ namespace
         bool canDeclareLocals() const override { return true; }
         char getGlobalType(const std::string& name) const override { return ' '; }
         std::pair<char, bool> getMemberType(const std::string& name, const std::string& id) const override { return {' ', false}; }
-        bool isId(const std::string& name) const override { return false; }
+        bool isId(const std::string& name) const override { return name == "player"; }
         bool isJournalId(const std::string& name) const override { return false; }
     };
 

From 8e0dfe3a8a11ec8a8221b5a818e9b5d5524e13c0 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 28 Oct 2021 18:28:13 +0200
Subject: [PATCH 1585/2859] Add tests for more issues

---
 .../mwscript/test_scripts.cpp                 | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/apps/openmw_test_suite/mwscript/test_scripts.cpp b/apps/openmw_test_suite/mwscript/test_scripts.cpp
index b40fdd9b29..258eef3ae7 100644
--- a/apps/openmw_test_suite/mwscript/test_scripts.cpp
+++ b/apps/openmw_test_suite/mwscript/test_scripts.cpp
@@ -129,6 +129,10 @@ if onactivate
     ; do something
 endif
 
+End)mwscript";
+
+    const std::string sIssue4061 = R"mwscript(Begin 01_Rz_neuvazhay-koryto2
+
 End)mwscript";
 
     const std::string sIssue4451 = R"mwscript(Begin, GlassDisplayScript
@@ -173,6 +177,12 @@ End)mwscript";
 
 StartScript kal_S_Pub_Jejubãr_Faraminos
 
+End)mwscript";
+
+    const std::string sIssue4803 = R"mwscript(
+--
++-Begin issue4803
+
 End)mwscript";
 
     const std::string sIssue4867 = R"mwscript(Begin issue4867
@@ -200,6 +210,21 @@ End Begin)mwscript";
 
 setscale "0.3"
 
+End)mwscript";
+
+    const std::string sIssue5345 = R"mwscript(Begin issue5345
+
+StartScript DN_MinionDrain_s"
+
+End)mwscript";
+
+    const std::string sIssue6066 = R"mwscript(Begin issue6066
+addtopic "return"
+
+End)mwscript";
+
+    const std::string sIssue6282 = R"mwscript(Begin 11AA_LauraScript7.5
+
 End)mwscript";
 
     TEST_F(MWScriptTest, mwscript_test_invalid)
@@ -316,6 +341,11 @@ End)mwscript";
         EXPECT_FALSE(!compile(sIssue3725));
     }
 
+    TEST_F(MWScriptTest, mwscript_test_4061)
+    {
+        EXPECT_FALSE(!compile(sIssue4061));
+    }
+
     TEST_F(MWScriptTest, mwscript_test_4451)
     {
         EXPECT_FALSE(!compile(sIssue4451));
@@ -357,6 +387,11 @@ End)mwscript";
         EXPECT_FALSE(!compile(sIssue4598));
     }
 
+    TEST_F(MWScriptTest, mwscript_test_4803)
+    {
+        EXPECT_FALSE(!compile(sIssue4803));
+    }
+
     TEST_F(MWScriptTest, mwscript_test_4867)
     {
         EXPECT_FALSE(!compile(sIssue4867));
@@ -378,4 +413,21 @@ End)mwscript";
         registerExtensions();
         EXPECT_FALSE(!compile(sIssue5097));
     }
+
+    TEST_F(MWScriptTest, mwscript_test_5345)
+    {
+        registerExtensions();
+        EXPECT_FALSE(!compile(sIssue5345));
+    }
+
+    TEST_F(MWScriptTest, mwscript_test_6066)
+    {
+        registerExtensions();
+        EXPECT_FALSE(!compile(sIssue6066));
+    }
+
+    TEST_F(MWScriptTest, mwscript_test_6282)
+    {
+        EXPECT_FALSE(!compile(sIssue6282));
+    }
 }
\ No newline at end of file

From b3208f4066b63acbfe30b40be4ab3b9f88ce669c Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 28 Oct 2021 21:44:08 +0200
Subject: [PATCH 1586/2859] Add more issues and a forum thread

---
 .../mwscript/test_scripts.cpp                 | 90 +++++++++++++++++++
 .../openmw_test_suite/mwscript/test_utils.hpp |  4 +-
 2 files changed, 93 insertions(+), 1 deletion(-)

diff --git a/apps/openmw_test_suite/mwscript/test_scripts.cpp b/apps/openmw_test_suite/mwscript/test_scripts.cpp
index 258eef3ae7..c7b7af6163 100644
--- a/apps/openmw_test_suite/mwscript/test_scripts.cpp
+++ b/apps/openmw_test_suite/mwscript/test_scripts.cpp
@@ -108,6 +108,33 @@ set c to ( a - 1 )
 set d to ( b * c )
 set e to ( d / a )
 
+End)mwscript";
+
+// https://forum.openmw.org/viewtopic.php?f=6&t=2262
+    const std::string sScript4 = R"mwscript(Begin scripting_once_again
+
+player -> addSpell "fire_bite", 645
+
+PositionCell "Rabenfels, Taverne" 4480.000 3968.000 15820.000 0
+
+End)mwscript";
+
+    const std::string sIssue1430 = R"mwscript(Begin issue1430
+
+short var
+If ( menumode == 1 )
+    Player->AddItem "fur_boots", 1
+    Player->Equip "iron battle axe", 1
+    player->addspell "fire bite", 645
+    player->additem "ring_keley", 1,
+endif
+
+End)mwscript";
+
+    const std::string sIssue1767 = R"mwscript(Begin issue1767
+
+player->GetPcRank "temple"
+
 End)mwscript";
 
     const std::string sIssue3006 = R"mwscript(Begin issue3006
@@ -225,6 +252,18 @@ End)mwscript";
 
     const std::string sIssue6282 = R"mwscript(Begin 11AA_LauraScript7.5
 
+End)mwscript";
+
+    const std::string sIssue6363 = R"mwscript(Begin issue6363
+
+short 1
+
+if ( "1" == 1 )
+    PositionCell 0 1 2 3 4 5 "Morrowland"
+endif
+
+set 1 to 42
+
 End)mwscript";
 
     TEST_F(MWScriptTest, mwscript_test_invalid)
@@ -317,6 +356,24 @@ End)mwscript";
         }
     }
 
+    TEST_F(MWScriptTest, mwscript_test_forum_thread)
+    {
+        registerExtensions();
+        EXPECT_FALSE(!compile(sScript4));
+    }
+
+    TEST_F(MWScriptTest, mwscript_test_1430)
+    {
+        registerExtensions();
+        EXPECT_FALSE(!compile(sIssue1430));
+    }
+
+    TEST_F(MWScriptTest, mwscript_test_1767)
+    {
+        registerExtensions();
+        EXPECT_FALSE(!compile(sIssue1767));
+    }
+
     TEST_F(MWScriptTest, mwscript_test_3006)
     {
         if(auto script = compile(sIssue3006))
@@ -430,4 +487,37 @@ End)mwscript";
     {
         EXPECT_FALSE(!compile(sIssue6282));
     }
+
+    TEST_F(MWScriptTest, mwscript_test_6363)
+    {
+        registerExtensions();
+        if(const auto script = compile(sIssue6363))
+        {
+            class PositionCell : public Interpreter::Opcode0
+            {
+                bool& mRan;
+            public:
+                PositionCell(bool& ran) : mRan(ran) {}
+
+                void execute(Interpreter::Runtime& runtime)
+                {
+                    mRan = true;
+                }
+            };
+            bool ran = false;
+            installOpcode(Compiler::Transformation::opcodePositionCell, new PositionCell(ran));
+            TestInterpreterContext context;
+            context.setLocalShort(0, 0);
+            run(*script, context);
+            EXPECT_FALSE(ran);
+            ran = false;
+            context.setLocalShort(0, 1);
+            run(*script, context);
+            EXPECT_TRUE(ran);
+        }
+        else
+        {
+            FAIL();
+        }
+    }
 }
\ No newline at end of file
diff --git a/apps/openmw_test_suite/mwscript/test_utils.hpp b/apps/openmw_test_suite/mwscript/test_utils.hpp
index 53dfe93ad6..1d0f39d2b0 100644
--- a/apps/openmw_test_suite/mwscript/test_utils.hpp
+++ b/apps/openmw_test_suite/mwscript/test_utils.hpp
@@ -20,6 +20,8 @@
 #include <components/interpreter/interpreter.hpp>
 #include <components/interpreter/opcodes.hpp>
 
+#include <components/misc/stringops.hpp>
+
 namespace
 {
     class TestCompilerContext : public Compiler::Context
@@ -28,7 +30,7 @@ namespace
         bool canDeclareLocals() const override { return true; }
         char getGlobalType(const std::string& name) const override { return ' '; }
         std::pair<char, bool> getMemberType(const std::string& name, const std::string& id) const override { return {' ', false}; }
-        bool isId(const std::string& name) const override { return name == "player"; }
+        bool isId(const std::string& name) const override { return Misc::StringUtils::ciEqual(name, "player"); }
         bool isJournalId(const std::string& name) const override { return false; }
     };
 

From 319d30fb85992cbd6610028fba5f587604f0a446 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 28 Oct 2021 22:02:58 +0200
Subject: [PATCH 1587/2859] Add AddTopic testing

---
 apps/openmw_test_suite/mwscript/test_scripts.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/apps/openmw_test_suite/mwscript/test_scripts.cpp b/apps/openmw_test_suite/mwscript/test_scripts.cpp
index c7b7af6163..f6ffe0def8 100644
--- a/apps/openmw_test_suite/mwscript/test_scripts.cpp
+++ b/apps/openmw_test_suite/mwscript/test_scripts.cpp
@@ -156,6 +156,13 @@ if onactivate
     ; do something
 endif
 
+End)mwscript";
+
+    const std::string sIssue3846 = R"mwscript(Begin issue3846
+
+Addtopic -spells...
+Addtopic -magicka...
+
 End)mwscript";
 
     const std::string sIssue4061 = R"mwscript(Begin 01_Rz_neuvazhay-koryto2
@@ -398,6 +405,12 @@ End)mwscript";
         EXPECT_FALSE(!compile(sIssue3725));
     }
 
+    TEST_F(MWScriptTest, mwscript_test_3846)
+    {
+        registerExtensions();
+        EXPECT_FALSE(!compile(sIssue3846));
+    }
+
     TEST_F(MWScriptTest, mwscript_test_4061)
     {
         EXPECT_FALSE(!compile(sIssue4061));

From 3c5a50cf904d1a1a9541b4daa423a23a28f4636e Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 30 Oct 2021 12:09:02 +0200
Subject: [PATCH 1588/2859] Add issues from Redmine

---
 .../mwscript/test_scripts.cpp                 | 202 +++++++++++++++++-
 .../openmw_test_suite/mwscript/test_utils.hpp |   1 -
 2 files changed, 197 insertions(+), 6 deletions(-)

diff --git a/apps/openmw_test_suite/mwscript/test_scripts.cpp b/apps/openmw_test_suite/mwscript/test_scripts.cpp
index f6ffe0def8..0facafbe87 100644
--- a/apps/openmw_test_suite/mwscript/test_scripts.cpp
+++ b/apps/openmw_test_suite/mwscript/test_scripts.cpp
@@ -117,6 +117,36 @@ player -> addSpell "fire_bite", 645
 
 PositionCell "Rabenfels, Taverne" 4480.000 3968.000 15820.000 0
 
+End)mwscript";
+
+    const std::string sIssue587 = R"mwscript(Begin stalresetScript
+
+End stalreset Script)mwscript";
+
+    const std::string sIssue677 = R"mwscript(Begin _ase_dtree_dtree-owls
+
+End)mwscript";
+
+    const std::string sIssue685 = R"mwscript(Begin issue685
+
+Choice: "Sicher. Hier, nehmt." 1 "Nein, ich denke nicht. Tut mir Leid." 2
+StartScript GetPCGold
+
+End)mwscript";
+
+    const std::string sIssue694 = R"mwscript(Begin issue694
+
+float timer
+
+if ( timer < .1 )
+endif
+
+End)mwscript";
+
+    const std::string sIssue1062 = R"mwscript(Begin issue1026
+
+short end
+
 End)mwscript";
 
     const std::string sIssue1430 = R"mwscript(Begin issue1430
@@ -129,12 +159,58 @@ If ( menumode == 1 )
     player->additem "ring_keley", 1,
 endif
 
+End)mwscript";
+
+    const std::string sIssue1593 = R"mwscript(Begin changeWater_-550_400
+
+End)mwscript";
+
+    const std::string sIssue1730 = R"mwscript(Begin 4LOM_Corprusarium_Guards
+
 End)mwscript";
 
     const std::string sIssue1767 = R"mwscript(Begin issue1767
 
 player->GetPcRank "temple"
 
+End)mwscript";
+
+    const std::string sIssue2206 = R"mwscript(Begin issue2206
+
+Choice ."Sklavin kaufen." 1 "Lebt wohl." 2
+Choice Choice "Insister pour qu’il vous réponde." 6 "Le prier de vous accorder un peu de son temps." 6 " Le menacer de révéler qu'il prélève sa part sur les bénéfices de la mine d’ébonite." 7
+
+End)mwscript";
+
+    const std::string sIssue2207 = R"mwscript(Begin issue2207
+
+PositionCell -35 –473 -248 0 "Skaal-Dorf, Die Große Halle"
+
+End)mwscript";
+
+    const std::string sIssue2794 = R"mwscript(Begin issue2794
+
+if ( player->"getlevel" == 1 )
+    ; do something
+endif
+
+End)mwscript";
+
+    const std::string sIssue2830 = R"mwscript(Begin issue2830
+
+AddItem "if" 1
+AddItem "endif" 1
+GetItemCount "begin"
+
+End)mwscript";
+
+    const std::string sIssue2991 = R"mwscript(Begin issue2991
+
+MessageBox "OnActivate"
+messagebox "messagebox"
+messagebox "if"
+messagebox "tcl"
+
 End)mwscript";
 
     const std::string sIssue3006 = R"mwscript(Begin issue3006
@@ -156,6 +232,18 @@ if onactivate
     ; do something
 endif
 
+End)mwscript";
+
+    const std::string sIssue3836 = R"mwscript(Begin issue3836
+
+MessageBox " Membership Level:         %.0f
+Account Balance:           %.0f
+Your Gold:                   %.0f
+Interest Rate:              %.3f
+Service Charge Rate:      %.3f
+Total Service Charges:    %.0f
+Total Interest Earned:     %.0f " Membership BankAccount YourGold InterestRate ServiceRate TotalServiceCharges TotalInterestEarned
+
 End)mwscript";
 
     const std::string sIssue3846 = R"mwscript(Begin issue3846
@@ -292,7 +380,7 @@ End)mwscript";
     {
         registerExtensions();
         bool failed = true;
-        if(auto script = compile(sScript2))
+        if(const auto script = compile(sScript2))
         {
             class AddTopic : public Interpreter::Opcode0
             {
@@ -320,7 +408,7 @@ End)mwscript";
 
     TEST_F(MWScriptTest, mwscript_test_math)
     {
-        if(auto script = compile(sScript3))
+        if(const auto script = compile(sScript3))
         {
             struct Algorithm
             {
@@ -369,21 +457,94 @@ End)mwscript";
         EXPECT_FALSE(!compile(sScript4));
     }
 
+    TEST_F(MWScriptTest, mwscript_test_587)
+    {
+        EXPECT_FALSE(!compile(sIssue587));
+    }
+
+    TEST_F(MWScriptTest, mwscript_test_677)
+    {
+        EXPECT_FALSE(!compile(sIssue677));
+    }
+
+    TEST_F(MWScriptTest, mwscript_test_685)
+    {
+        registerExtensions();
+        EXPECT_FALSE(!compile(sIssue685));
+    }
+
+    TEST_F(MWScriptTest, mwscript_test_694)
+    {
+        EXPECT_FALSE(!compile(sIssue694));
+    }
+
+    TEST_F(MWScriptTest, mwscript_test_1062)
+    {
+        if(const auto script = compile(sIssue1062))
+        {
+            EXPECT_EQ(script->mLocals.getIndex("end"), 0);
+        }
+        else
+        {
+            FAIL();
+        }
+    }
+
     TEST_F(MWScriptTest, mwscript_test_1430)
     {
         registerExtensions();
         EXPECT_FALSE(!compile(sIssue1430));
     }
 
+    TEST_F(MWScriptTest, mwscript_test_1593)
+    {
+        EXPECT_FALSE(!compile(sIssue1593));
+    }
+
+    TEST_F(MWScriptTest, mwscript_test_1730)
+    {
+        EXPECT_FALSE(!compile(sIssue1730));
+    }
+
     TEST_F(MWScriptTest, mwscript_test_1767)
     {
         registerExtensions();
         EXPECT_FALSE(!compile(sIssue1767));
     }
 
+    TEST_F(MWScriptTest, mwscript_test_2206)
+    {
+        registerExtensions();
+        EXPECT_FALSE(!compile(sIssue2206));
+    }
+
+    TEST_F(MWScriptTest, mwscript_test_2207)
+    {
+        registerExtensions();
+        EXPECT_FALSE(!compile(sIssue2207));
+    }
+
+    TEST_F(MWScriptTest, mwscript_test_2794)
+    {
+        registerExtensions();
+        EXPECT_FALSE(!compile(sIssue2794));
+    }
+
+    TEST_F(MWScriptTest, mwscript_test_2830)
+    {
+        registerExtensions();
+        EXPECT_FALSE(!compile(sIssue2830));
+    }
+
+    TEST_F(MWScriptTest, mwscript_test_2991)
+    {
+        registerExtensions();
+        EXPECT_FALSE(!compile(sIssue2991));
+    }
+
     TEST_F(MWScriptTest, mwscript_test_3006)
     {
-        if(auto script = compile(sIssue3006))
+        if(const auto script = compile(sIssue3006))
         {
             TestInterpreterContext context;
             context.setLocalShort(0, 0);
@@ -405,10 +566,41 @@ End)mwscript";
         EXPECT_FALSE(!compile(sIssue3725));
     }
 
+    TEST_F(MWScriptTest, mwscript_test_3836)
+    {
+        registerExtensions();
+        EXPECT_FALSE(!compile(sIssue3836));
+    }
+
     TEST_F(MWScriptTest, mwscript_test_3846)
     {
         registerExtensions();
-        EXPECT_FALSE(!compile(sIssue3846));
+        if(const auto script = compile(sIssue3846))
+        {
+            std::vector<std::string> topics = { "-spells...", "-magicka..." };
+            class AddTopic : public Interpreter::Opcode0
+            {
+                std::vector<std::string>& mTopics;
+            public:
+                AddTopic(std::vector<std::string>& topics) : mTopics(topics) {}
+
+                void execute(Interpreter::Runtime& runtime)
+                {
+                    const auto topic = runtime.getStringLiteral(runtime[0].mInteger);
+                    runtime.pop();
+                    EXPECT_EQ(topic, mTopics[0]);
+                    mTopics.erase(mTopics.begin());
+                }
+            };
+            installOpcode(Compiler::Dialogue::opcodeAddTopic, new AddTopic(topics));
+            TestInterpreterContext context;
+            run(*script, context);
+            EXPECT_TRUE(topics.empty());
+        }
+        else
+        {
+            FAIL();
+        }
     }
 
     TEST_F(MWScriptTest, mwscript_test_4061)
@@ -423,7 +615,7 @@ End)mwscript";
 
     TEST_F(MWScriptTest, mwscript_test_4597)
     {
-        if(auto script = compile(sIssue4597))
+        if(const auto script = compile(sIssue4597))
         {
             TestInterpreterContext context;
             for(int a = 0; a < 100; ++a)
diff --git a/apps/openmw_test_suite/mwscript/test_utils.hpp b/apps/openmw_test_suite/mwscript/test_utils.hpp
index 1d0f39d2b0..f29cb7bb89 100644
--- a/apps/openmw_test_suite/mwscript/test_utils.hpp
+++ b/apps/openmw_test_suite/mwscript/test_utils.hpp
@@ -31,7 +31,6 @@ namespace
         char getGlobalType(const std::string& name) const override { return ' '; }
         std::pair<char, bool> getMemberType(const std::string& name, const std::string& id) const override { return {' ', false}; }
         bool isId(const std::string& name) const override { return Misc::StringUtils::ciEqual(name, "player"); }
-        bool isJournalId(const std::string& name) const override { return false; }
     };
 
     class TestErrorHandler : public Compiler::ErrorHandler

From ae08f942d5142ff1c3e05f0a3a326732e87021a0 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 30 Oct 2021 12:23:14 +0200
Subject: [PATCH 1589/2859] Test binary operators

---
 .../mwscript/test_scripts.cpp                 | 124 ++++++++++++++++--
 1 file changed, 115 insertions(+), 9 deletions(-)

diff --git a/apps/openmw_test_suite/mwscript/test_scripts.cpp b/apps/openmw_test_suite/mwscript/test_scripts.cpp
index 0facafbe87..79db3bb414 100644
--- a/apps/openmw_test_suite/mwscript/test_scripts.cpp
+++ b/apps/openmw_test_suite/mwscript/test_scripts.cpp
@@ -173,6 +173,49 @@ End)mwscript";
 
 player->GetPcRank "temple"
 
+End)mwscript";
+
+    const std::string sIssue2185 = R"mwscript(Begin issue2185
+
+short a
+short b
+short eq
+short gte
+short lte
+short ne
+
+set eq to 0
+if ( a == b )
+    set eq to ( eq + 1 )
+endif
+if ( a = = b )
+    set eq to ( eq + 1 )
+endif
+
+set gte to 0
+if ( a >= b )
+    set gte to ( gte + 1 )
+endif
+if ( a > = b )
+    set gte to ( gte + 1 )
+endif
+
+set lte to 0
+if ( a <= b )
+    set lte to ( lte + 1 )
+endif
+if ( a < = b )
+    set lte to ( lte + 1 )
+endif
+
+set ne to 0
+if ( a != b )
+    set ne to ( ne + 1 )
+endif
+if ( a ! = b )
+    set ne to ( ne + 1 )
+endif
+
 End)mwscript";
 
     const std::string sIssue2206 = R"mwscript(Begin issue2206
@@ -232,6 +275,29 @@ if onactivate
     ; do something
 endif
 
+End)mwscript";
+
+    const std::string sIssue3744 = R"mwscript(Begin issue3744
+
+short a
+short b
+short c
+
+set c to 0
+
+if ( a => b )
+    set c to ( c + 1 )
+endif
+if ( a =< b )
+    set c to ( c + 1 )
+endif
+if ( a = b )
+    set c to ( c + 1 )
+endif
+if ( a == b )
+    set c to ( c + 1 )
+endif
+
 End)mwscript";
 
     const std::string sIssue3836 = R"mwscript(Begin issue3836
@@ -512,6 +578,31 @@ End)mwscript";
         EXPECT_FALSE(!compile(sIssue1767));
     }
 
+    TEST_F(MWScriptTest, mwscript_test_2185)
+    {
+        if(const auto script = compile(sIssue2185))
+        {
+            TestInterpreterContext context;
+            for(int a = 0; a < 100; ++a)
+            {
+                for(int b = 0; b < 100; ++b)
+                {
+                    context.setLocalShort(0, a);
+                    context.setLocalShort(1, b);
+                    run(*script, context);
+                    EXPECT_EQ(context.getLocalShort(2), a == b ? 2 : 0);
+                    EXPECT_EQ(context.getLocalShort(3), a >= b ? 2 : 0);
+                    EXPECT_EQ(context.getLocalShort(4), a <= b ? 2 : 0);
+                    EXPECT_EQ(context.getLocalShort(5), a != b ? 2 : 0);
+                }
+            }
+        }
+        else
+        {
+            FAIL();
+        }
+    }
+
     TEST_F(MWScriptTest, mwscript_test_2206)
     {
         registerExtensions();
@@ -566,6 +657,28 @@ End)mwscript";
         EXPECT_FALSE(!compile(sIssue3725));
     }
 
+    TEST_F(MWScriptTest, mwscript_test_3744)
+    {
+        if(const auto script = compile(sIssue3744))
+        {
+            TestInterpreterContext context;
+            for(int a = 0; a < 100; ++a)
+            {
+                for(int b = 0; b < 100; ++b)
+                {
+                    context.setLocalShort(0, a);
+                    context.setLocalShort(1, b);
+                    run(*script, context);
+                    EXPECT_EQ(context.getLocalShort(2), a == b ? 4 : 0);
+                }
+            }
+        }
+        else
+        {
+            FAIL();
+        }
+    }
+
     TEST_F(MWScriptTest, mwscript_test_3836)
     {
         registerExtensions();
@@ -625,15 +738,8 @@ End)mwscript";
                     context.setLocalShort(0, a);
                     context.setLocalShort(1, b);
                     run(*script, context);
-                    if(a < b)
-                        EXPECT_EQ(context.getLocalShort(2), 3);
-                    else
-                        EXPECT_EQ(context.getLocalShort(2), 0);
-                    if(a > b)
-                        EXPECT_EQ(context.getLocalShort(3), 3);
-                    else
-                        EXPECT_EQ(context.getLocalShort(3), 0);
-
+                    EXPECT_EQ(context.getLocalShort(2), a < b ? 3 : 0);
+                    EXPECT_EQ(context.getLocalShort(3), a > b ? 3 : 0);
                 }
             }
         }

From 7e6533f0f3d793e74ed38148ececa51397cc75e9 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Sat, 30 Oct 2021 17:10:16 +0000
Subject: [PATCH 1590/2859] refactors screenshot360 (#3202)

With this PR we refactor screenshot360 not to manually adjust node masks.
---
 apps/openmw/mwrender/renderingmanager.cpp  | 7 -------
 apps/openmw/mwrender/screenshotmanager.cpp | 8 ++------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 7b8393f690..c4ef1d9d9b 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -902,15 +902,8 @@ namespace MWRender
             return false;
         }
 
-        unsigned int maskBackup = mPlayerAnimation->getObjectRoot()->getNodeMask();
-
-        if (mCamera->isFirstPerson())
-            mPlayerAnimation->getObjectRoot()->setNodeMask(0);
-
         mScreenshotManager->screenshot360(image);
 
-        mPlayerAnimation->getObjectRoot()->setNodeMask(maskBackup);
-
         return true;
     }
 
diff --git a/apps/openmw/mwrender/screenshotmanager.cpp b/apps/openmw/mwrender/screenshotmanager.cpp
index 5a047a1566..ab7d0d93f0 100644
--- a/apps/openmw/mwrender/screenshotmanager.cpp
+++ b/apps/openmw/mwrender/screenshotmanager.cpp
@@ -251,14 +251,13 @@ namespace MWRender
 
         osg::ref_ptr<osg::Camera> screenshotCamera(new osg::Camera);
         osg::ref_ptr<osg::ShapeDrawable> quad(new osg::ShapeDrawable(new osg::Box(osg::Vec3(0,0,0), 2.0)));
-        quad->getOrCreateStateSet()->setRenderBinDetails(100, "RenderBin", osg::StateSet::USE_RENDERBIN_DETAILS);
 
         std::map<std::string, std::string> defineMap;
 
         Shader::ShaderManager& shaderMgr = mResourceSystem->getSceneManager()->getShaderManager();
         osg::ref_ptr<osg::Shader> fragmentShader(shaderMgr.getShader("s360_fragment.glsl", defineMap,osg::Shader::FRAGMENT));
         osg::ref_ptr<osg::Shader> vertexShader(shaderMgr.getShader("s360_vertex.glsl", defineMap, osg::Shader::VERTEX));
-        osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
+        osg::ref_ptr<osg::StateSet> stateset = quad->getOrCreateStateSet();
 
         osg::ref_ptr<osg::Program> program(new osg::Program);
         program->addShader(fragmentShader);
@@ -269,9 +268,6 @@ namespace MWRender
         stateset->addUniform(new osg::Uniform("mapping", screenshotMapping));
         stateset->setTextureAttributeAndModes(0, cubeTexture, osg::StateAttribute::ON);
 
-        quad->setStateSet(stateset);
-        quad->setUpdateCallback(nullptr);
-
         screenshotCamera->addChild(quad);
 
         renderCameraToImage(screenshotCamera, image, screenshotW, screenshotH);
@@ -347,7 +343,7 @@ namespace MWRender
         rttCamera->addChild(mWater->getReflectionNode());
         rttCamera->addChild(mWater->getRefractionNode());
 
-        rttCamera->setCullMask(mViewer->getCamera()->getCullMask() & (~Mask_GUI));
+        rttCamera->setCullMask(mViewer->getCamera()->getCullMask() & ~(Mask_GUI|Mask_FirstPerson));
 
         rttCamera->setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 

From 7d34149adc56f2d924795200c3b5b408fff56517 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Sat, 30 Oct 2021 17:19:58 +0000
Subject: [PATCH 1591/2859] consolidates createUnlitMaterial (#3203)

With this PR we remove a few duplicate lines of code by adding a parameter to `createUnlitMaterial`.
---
 apps/openmw/mwrender/skyutil.cpp | 24 +++++++++---------------
 apps/openmw/mwrender/skyutil.hpp |  2 +-
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/apps/openmw/mwrender/skyutil.cpp b/apps/openmw/mwrender/skyutil.cpp
index 8229fa5925..0e2955333f 100644
--- a/apps/openmw/mwrender/skyutil.cpp
+++ b/apps/openmw/mwrender/skyutil.cpp
@@ -93,26 +93,20 @@ namespace
 
 namespace MWRender
 {
-    osg::ref_ptr<osg::Material> createAlphaTrackingUnlitMaterial()
+    osg::ref_ptr<osg::Material> createUnlitMaterial(osg::Material::ColorMode colorMode)
     {
         osg::ref_ptr<osg::Material> mat = new osg::Material;
         mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 1.f));
         mat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 1.f));
         mat->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(1.f, 1.f, 1.f, 1.f));
         mat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 0.f));
-        mat->setColorMode(osg::Material::DIFFUSE);
+        mat->setColorMode(colorMode);
         return mat;
     }
 
-    osg::ref_ptr<osg::Material> createUnlitMaterial()
+    osg::ref_ptr<osg::Material> createAlphaTrackingUnlitMaterial()
     {
-        osg::ref_ptr<osg::Material> mat = new osg::Material;
-        mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 1.f));
-        mat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 1.f));
-        mat->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(1.f, 1.f, 1.f, 1.f));
-        mat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 0.f));
-        mat->setColorMode(osg::Material::OFF);
-        return mat;
+        return createUnlitMaterial(osg::Material::DIFFUSE);
     }
 
     class SunUpdater : public SceneUtil::StateSetUpdater
@@ -126,7 +120,7 @@ namespace MWRender
 
         void setDefaults(osg::StateSet* stateset) override
         {
-            stateset->setAttributeAndModes(MWRender::createUnlitMaterial());
+            stateset->setAttributeAndModes(createUnlitMaterial());
         }
 
         void apply(osg::StateSet* stateset, osg::NodeVisitor*) override
@@ -188,7 +182,7 @@ namespace MWRender
                 if (visibleRatio < fadeThreshold)
                 {
                     float fade = 1.f - (fadeThreshold - visibleRatio) / fadeThreshold;
-                    osg::ref_ptr<osg::Material> mat (MWRender::createUnlitMaterial());
+                    osg::ref_ptr<osg::Material> mat (createUnlitMaterial());
                     mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0,0,0,fade*mGlareView));
                     stateset = new osg::StateSet;
                     stateset->setAttributeAndModes(mat, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
@@ -283,7 +277,7 @@ namespace MWRender
             {
                 osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
 
-                osg::ref_ptr<osg::Material> mat = MWRender::createUnlitMaterial();
+                osg::ref_ptr<osg::Material> mat = createUnlitMaterial();
 
                 mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0,0,0,fade));
                 mat->setEmission(osg::Material::FRONT_AND_BACK, mColor);
@@ -364,7 +358,7 @@ namespace MWRender
                 stateset->addUniform(new osg::Uniform("atmosphereFade", osg::Vec4f{}));
                 stateset->addUniform(new osg::Uniform("diffuseMap", 0));
                 stateset->addUniform(new osg::Uniform("maskMap", 1));
-                stateset->setAttributeAndModes(MWRender::createUnlitMaterial(), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+                stateset->setAttributeAndModes(createUnlitMaterial(), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
             }
             else
             {
@@ -386,7 +380,7 @@ namespace MWRender
                 texEnv2->setSource1_RGB(osg::TexEnvCombine::CONSTANT);
                 texEnv2->setConstantColor(osg::Vec4f(0.f, 0.f, 0.f, 1.f)); // mAtmosphereColor.rgb, mTransparency
                 stateset->setTextureAttributeAndModes(1, texEnv2);
-                stateset->setAttributeAndModes(MWRender::createUnlitMaterial(), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+                stateset->setAttributeAndModes(createUnlitMaterial(), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
             }
         }
 
diff --git a/apps/openmw/mwrender/skyutil.hpp b/apps/openmw/mwrender/skyutil.hpp
index ae04c88d23..c2272143a0 100644
--- a/apps/openmw/mwrender/skyutil.hpp
+++ b/apps/openmw/mwrender/skyutil.hpp
@@ -104,7 +104,7 @@ namespace MWRender
     };
 
     osg::ref_ptr<osg::Material> createAlphaTrackingUnlitMaterial();
-    osg::ref_ptr<osg::Material> createUnlitMaterial();
+    osg::ref_ptr<osg::Material> createUnlitMaterial(osg::Material::ColorMode colorMode = osg::Material::OFF);
 
     class OcclusionCallback
     {

From 1329f22186d8c2de2d17be57a87ce4c020cbbdeb Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Sat, 30 Oct 2021 17:27:57 +0000
Subject: [PATCH 1592/2859] refactors MWWorld::Store maps (#3197)

With this PR we clean up `MWWorld::Store` maps according to the approach of PR #3184.
---
 apps/openmw/mwworld/esmstore.cpp |  13 ++--
 apps/openmw/mwworld/esmstore.hpp |  14 ++--
 apps/openmw/mwworld/store.cpp    | 121 ++++++++++---------------------
 apps/openmw/mwworld/store.hpp    |  16 ++--
 4 files changed, 57 insertions(+), 107 deletions(-)

diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index 66aba9139e..3cedcd457a 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -61,7 +61,7 @@ namespace
         }
     }
 
-    std::vector<ESM::NPC> getNPCsToReplace(const MWWorld::Store<ESM::Faction>& factions, const MWWorld::Store<ESM::Class>& classes, const std::map<std::string, ESM::NPC>& npcs)
+    std::vector<ESM::NPC> getNPCsToReplace(const MWWorld::Store<ESM::Faction>& factions, const MWWorld::Store<ESM::Class>& classes, const std::unordered_map<std::string, ESM::NPC, Misc::StringUtils::CiHash, Misc::StringUtils::CiEqual>& npcs)
     {
         // Cache first class from store - we will use it if current class is not found
         std::string defaultCls;
@@ -114,8 +114,8 @@ namespace
 
     // Custom enchanted items can reference scripts that no longer exist, this doesn't necessarily mean the base item no longer exists however.
     // So instead of removing the item altogether, we're only removing the script.
-    template<class T>
-    void removeMissingScripts(const MWWorld::Store<ESM::Script>& scripts, std::map<std::string, T>& items)
+    template<class MapT>
+    void removeMissingScripts(const MWWorld::Store<ESM::Script>& scripts, MapT& items)
     {
         for(auto& [id, item] : items)
         {
@@ -324,7 +324,6 @@ void ESMStore::countRecords()
         if (value.mRefID != deletedRefID)
         {
             std::string& refId = refIDs[value.mRefID];
-            Misc::StringUtils::lowerCaseInPlace(refId);
             ++mRefCount[std::move(refId)];
         }
     };
@@ -333,8 +332,7 @@ void ESMStore::countRecords()
 
 int ESMStore::getRefCount(const std::string& id) const
 {
-    const std::string lowerId = Misc::StringUtils::lowerCase(id);
-    auto it = mRefCount.find(lowerId);
+    auto it = mRefCount.find(id);
     if(it == mRefCount.end())
         return 0;
     return it->second;
@@ -533,9 +531,8 @@ void ESMStore::removeMissingObjects(Store<T>& store)
             throw std::runtime_error ("Invalid player record (race or class unavailable");
     }
 
-    std::pair<std::shared_ptr<MWMechanics::SpellList>, bool> ESMStore::getSpellList(const std::string& originalId) const
+    std::pair<std::shared_ptr<MWMechanics::SpellList>, bool> ESMStore::getSpellList(const std::string& id) const
     {
-        const std::string id = Misc::StringUtils::lowerCase(originalId);
         auto result = mSpellListCache.find(id);
         std::shared_ptr<MWMechanics::SpellList> ptr;
         if (result != mSpellListCache.end())
diff --git a/apps/openmw/mwworld/esmstore.hpp b/apps/openmw/mwworld/esmstore.hpp
index 22b58f77dd..d1a4942cd3 100644
--- a/apps/openmw/mwworld/esmstore.hpp
+++ b/apps/openmw/mwworld/esmstore.hpp
@@ -75,16 +75,17 @@ namespace MWWorld
 
         // Lookup of all IDs. Makes looking up references faster. Just
         // maps the id name to the record type.
-        std::map<std::string, int> mIds;
-        std::map<std::string, int> mStaticIds;
+        using IDMap = std::unordered_map<std::string, int, Misc::StringUtils::CiHash, Misc::StringUtils::CiEqual>;
+        IDMap mIds;
+        IDMap mStaticIds;
 
-        std::unordered_map<std::string, int> mRefCount;
+        IDMap mRefCount;
 
         std::map<int, StoreBase *> mStores;
 
         unsigned int mDynamicCount;
 
-        mutable std::map<std::string, std::weak_ptr<MWMechanics::SpellList> > mSpellListCache;
+        mutable std::unordered_map<std::string, std::weak_ptr<MWMechanics::SpellList>, Misc::StringUtils::CiHash, Misc::StringUtils::CiEqual> mSpellListCache;
 
         /// Validate entries in store after setup
         void validate();
@@ -115,10 +116,9 @@ namespace MWWorld
         }
 
         /// Look up the given ID in 'all'. Returns 0 if not found.
-        /// \note id must be in lower case.
         int find(const std::string &id) const
         {
-            std::map<std::string, int>::const_iterator it = mIds.find(id);
+            IDMap::const_iterator it = mIds.find(id);
             if (it == mIds.end()) {
                 return 0;
             }
@@ -126,7 +126,7 @@ namespace MWWorld
         }
         int findStatic(const std::string &id) const
         {
-            std::map<std::string, int>::const_iterator it = mStaticIds.find(id);
+            IDMap::const_iterator it = mStaticIds.find(id);
             if (it == mStaticIds.end()) {
                 return 0;
             }
diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index 963e3b78cd..32458a2e84 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -38,8 +38,8 @@ namespace MWWorld
         bool isDeleted = false;
 
         record.load(esm, isDeleted);
-
-        mStatic.insert_or_assign(record.mIndex, record);
+        auto idx = record.mIndex;
+        mStatic.insert_or_assign(idx, std::move(record));
     }
     template<typename T>
     int IndexedStore<T>::getSize() const
@@ -98,13 +98,11 @@ namespace MWWorld
     template<typename T>
     const T *Store<T>::search(const std::string &id) const
     {
-        std::string idLower = Misc::StringUtils::lowerCase(id);
-
-        typename Dynamic::const_iterator dit = mDynamic.find(idLower);
+        typename Dynamic::const_iterator dit = mDynamic.find(id);
         if (dit != mDynamic.end())
             return &dit->second;
 
-        typename std::map<std::string, T>::const_iterator it = mStatic.find(idLower);
+        typename Static::const_iterator it = mStatic.find(id);
         if (it != mStatic.end())
             return &(it->second);
 
@@ -113,8 +111,7 @@ namespace MWWorld
     template<typename T>
     const T *Store<T>::searchStatic(const std::string &id) const
     {
-        std::string idLower = Misc::StringUtils::lowerCase(id);
-        typename std::map<std::string, T>::const_iterator it = mStatic.find(idLower);
+        typename Static::const_iterator it = mStatic.find(id);
         if (it != mStatic.end())
             return &(it->second);
 
@@ -159,7 +156,7 @@ namespace MWWorld
         bool isDeleted = false;
 
         record.load(esm, isDeleted);
-        Misc::StringUtils::lowerCaseInPlace(record.mId);
+        Misc::StringUtils::lowerCaseInPlace(record.mId); // TODO: remove this line once we have ported our remaining code base to lowercase on lookup
 
         std::pair<typename Static::iterator, bool> inserted = mStatic.insert_or_assign(record.mId, record);
         if (inserted.second)
@@ -206,14 +203,13 @@ namespace MWWorld
     template<typename T>
     T *Store<T>::insert(const T &item, bool overrideOnly)
     {
-        std::string id = Misc::StringUtils::lowerCase(item.mId);
         if(overrideOnly)
         {
-            auto it = mStatic.find(id);
+            auto it = mStatic.find(item.mId);
             if(it == mStatic.end())
                 return nullptr;
         }
-        std::pair<typename Dynamic::iterator, bool> result = mDynamic.insert_or_assign(id, item);
+        std::pair<typename Dynamic::iterator, bool> result = mDynamic.insert_or_assign(item.mId, item);
         T *ptr = &result.first->second;
         if (result.second)
             mShared.push_back(ptr);
@@ -222,8 +218,7 @@ namespace MWWorld
     template<typename T>
     T *Store<T>::insertStatic(const T &item)
     {
-        std::string id = Misc::StringUtils::lowerCase(item.mId);
-        std::pair<typename Static::iterator, bool> result = mStatic.insert_or_assign(id, item);
+        std::pair<typename Static::iterator, bool> result = mStatic.insert_or_assign(item.mId, item);
         T *ptr = &result.first->second;
         if (result.second)
             mShared.push_back(ptr);
@@ -232,9 +227,7 @@ namespace MWWorld
     template<typename T>
     bool Store<T>::eraseStatic(const std::string &id)
     {
-        std::string idLower = Misc::StringUtils::lowerCase(id);
-
-        typename std::map<std::string, T>::iterator it = mStatic.find(idLower);
+        typename Static::iterator it = mStatic.find(id);
 
         if (it != mStatic.end()) {
             // delete from the static part of mShared
@@ -242,7 +235,7 @@ namespace MWWorld
             typename std::vector<T *>::iterator end = sharedIter + mStatic.size();
 
             while (sharedIter != mShared.end() && sharedIter != end) {
-                if((*sharedIter)->mId == idLower) {
+                if(Misc::StringUtils::ciEqual((*sharedIter)->mId, id)) {
                     mShared.erase(sharedIter);
                     break;
                 }
@@ -257,17 +250,13 @@ namespace MWWorld
     template<typename T>
     bool Store<T>::erase(const std::string &id)
     {
-        std::string key = Misc::StringUtils::lowerCase(id);
-        typename Dynamic::iterator it = mDynamic.find(key);
-        if (it == mDynamic.end()) {
+        if (!mDynamic.erase(id))
             return false;
-        }
-        mDynamic.erase(it);
 
         // have to reinit the whole shared part
         assert(mShared.size() >= mStatic.size());
         mShared.erase(mShared.begin() + mStatic.size(), mShared.end());
-        for (it = mDynamic.begin(); it != mDynamic.end(); ++it) {
+        for (auto it = mDynamic.begin(); it != mDynamic.end(); ++it) {
             mShared.push_back(&it->second);
         }
         return true;
@@ -353,12 +342,8 @@ namespace MWWorld
             ESM::LandTexture* tex = const_cast<ESM::LandTexture*>(search(lt.mIndex, i));
             if (tex)
             {
-                const std::string texId = Misc::StringUtils::lowerCase(tex->mId);
-                const std::string ltId = Misc::StringUtils::lowerCase(lt.mId);
-                if (texId == ltId)
-                {
+                if (Misc::StringUtils::ciEqual(tex->mId, lt.mId))
                     tex->mTexture = lt.mTexture;
-                }
             }
         }
 
@@ -367,9 +352,10 @@ namespace MWWorld
             ltexl.resize(lt.mIndex+1);
 
         // Store it
-        ltexl[lt.mIndex] = lt;
+        auto idx = lt.mIndex;
+        ltexl[idx] = std::move(lt);
 
-        return RecordId(lt.mId, isDeleted);
+        return RecordId(ltexl[idx].mId, isDeleted);
     }
     RecordId Store<ESM::LandTexture>::load(ESM::ESMReader &esm)
     {
@@ -503,16 +489,12 @@ namespace MWWorld
     }
     const ESM::Cell *Store<ESM::Cell>::search(const std::string &id) const
     {
-        ESM::Cell cell;
-        cell.mName = Misc::StringUtils::lowerCase(id);
-
-        std::map<std::string, ESM::Cell>::const_iterator it = mInt.find(cell.mName);
-
+        DynamicInt::const_iterator it = mInt.find(id);
         if (it != mInt.end()) {
             return &(it->second);
         }
 
-        DynamicInt::const_iterator dit = mDynamicInt.find(cell.mName);
+        DynamicInt::const_iterator dit = mDynamicInt.find(id);
         if (dit != mDynamicInt.end()) {
             return &dit->second;
         }
@@ -521,48 +503,34 @@ namespace MWWorld
     }
     const ESM::Cell *Store<ESM::Cell>::search(int x, int y) const
     {
-        ESM::Cell cell;
-        cell.mData.mX = x;
-        cell.mData.mY = y;
-
         std::pair<int, int> key(x, y);
         DynamicExt::const_iterator it = mExt.find(key);
-        if (it != mExt.end()) {
+        if (it != mExt.end())
             return &(it->second);
-        }
 
         DynamicExt::const_iterator dit = mDynamicExt.find(key);
-        if (dit != mDynamicExt.end()) {
+        if (dit != mDynamicExt.end())
             return &dit->second;
-        }
 
         return nullptr;
     }
     const ESM::Cell *Store<ESM::Cell>::searchStatic(int x, int y) const
     {
-        ESM::Cell cell;
-        cell.mData.mX = x;
-        cell.mData.mY = y;
-
-        std::pair<int, int> key(x, y);
-        DynamicExt::const_iterator it = mExt.find(key);
-        if (it != mExt.end()) {
+        DynamicExt::const_iterator it = mExt.find(std::make_pair(x,y));
+        if (it != mExt.end())
             return &(it->second);
-        }
         return nullptr;
     }
     const ESM::Cell *Store<ESM::Cell>::searchOrCreate(int x, int y)
     {
         std::pair<int, int> key(x, y);
         DynamicExt::const_iterator it = mExt.find(key);
-        if (it != mExt.end()) {
+        if (it != mExt.end())
             return &(it->second);
-        }
 
         DynamicExt::const_iterator dit = mDynamicExt.find(key);
-        if (dit != mDynamicExt.end()) {
+        if (dit != mDynamicExt.end())
             return &dit->second;
-        }
 
         ESM::Cell newCell;
         newCell.mData.mX = x;
@@ -625,12 +593,11 @@ namespace MWWorld
         // Load the (x,y) coordinates of the cell, if it is an exterior cell,
         // so we can find the cell we need to merge with
         cell.loadNameAndData(esm, isDeleted);
-        std::string idLower = Misc::StringUtils::lowerCase(cell.mName);
 
         if(cell.mData.mFlags & ESM::Cell::Interior)
         {
             // Store interior cell by name, try to merge with existing parent data.
-            ESM::Cell *oldcell = const_cast<ESM::Cell*>(search(idLower));
+            ESM::Cell *oldcell = const_cast<ESM::Cell*>(search(cell.mName));
             if (oldcell) {
                 // merge new cell into old cell
                 // push the new references on the list of references to manage (saveContext = true)
@@ -642,7 +609,7 @@ namespace MWWorld
                 // spawn a new cell
                 cell.loadCell(esm, true);
 
-                mInt[idLower] = cell;
+                mInt[cell.mName] = cell;
             }
         }
         else
@@ -780,27 +747,19 @@ namespace MWWorld
             const std::string cellType = (cell.isExterior()) ? "exterior" : "interior";
             throw std::runtime_error("Failed to create " + cellType + " cell");
         }
-        ESM::Cell *ptr;
         if (cell.isExterior()) {
             std::pair<int, int> key(cell.getGridX(), cell.getGridY());
 
             // duplicate insertions are avoided by search(ESM::Cell &)
-            std::pair<DynamicExt::iterator, bool> result =
-                mDynamicExt.insert(std::make_pair(key, cell));
-
-            ptr = &result.first->second;
-            mSharedExt.push_back(ptr);
+            DynamicExt::iterator result = mDynamicExt.emplace(key, cell).first;
+            mSharedExt.push_back(&result->second);
+            return &result->second;
         } else {
-            std::string key = Misc::StringUtils::lowerCase(cell.mName);
-
             // duplicate insertions are avoided by search(ESM::Cell &)
-            std::pair<DynamicInt::iterator, bool> result =
-                mDynamicInt.insert(std::make_pair(key, cell));
-
-            ptr = &result.first->second;
-            mSharedInt.push_back(ptr);
+            DynamicInt::iterator result = mDynamicInt.emplace(cell.mName, cell).first;
+            mSharedInt.push_back(&result->second);
+            return &result->second;
         }
-        return ptr;
     }
     bool Store<ESM::Cell>::erase(const ESM::Cell &cell)
     {
@@ -811,8 +770,7 @@ namespace MWWorld
     }
     bool Store<ESM::Cell>::erase(const std::string &id)
     {
-        std::string key = Misc::StringUtils::lowerCase(id);
-        DynamicInt::iterator it = mDynamicInt.find(key);
+        DynamicInt::iterator it = mDynamicInt.find(id);
 
         if (it == mDynamicInt.end()) {
             return false;
@@ -1062,12 +1020,11 @@ namespace MWWorld
 
         dialogue.loadId(esm);
 
-        std::string idLower = Misc::StringUtils::lowerCase(dialogue.mId);
-        std::map<std::string, ESM::Dialogue>::iterator found = mStatic.find(idLower);
+        Static::iterator found = mStatic.find(dialogue.mId);
         if (found == mStatic.end())
         {
             dialogue.loadData(esm, isDeleted);
-            mStatic.insert(std::make_pair(idLower, dialogue));
+            mStatic.emplace(dialogue.mId, dialogue);
         }
         else
         {
@@ -1081,11 +1038,7 @@ namespace MWWorld
     template<>
     bool Store<ESM::Dialogue>::eraseStatic(const std::string &id)
     {
-        auto it = mStatic.find(Misc::StringUtils::lowerCase(id));
-
-        if (it != mStatic.end())
-            mStatic.erase(it);
-
+        mStatic.erase(id);
         return true;
     }
 
diff --git a/apps/openmw/mwworld/store.hpp b/apps/openmw/mwworld/store.hpp
index 4b1d648703..dbb28258ef 100644
--- a/apps/openmw/mwworld/store.hpp
+++ b/apps/openmw/mwworld/store.hpp
@@ -5,6 +5,7 @@
 #include <vector>
 #include <memory>
 #include <map>
+#include <unordered_map>
 #include <set>
 
 #include "recordcmp.hpp"
@@ -147,14 +148,13 @@ namespace MWWorld
     template <class T>
     class Store : public StoreBase
     {
-        std::map<std::string, T>      mStatic;
-        std::vector<T *>    mShared; // Preserves the record order as it came from the content files (this
+        typedef std::unordered_map<std::string, T, Misc::StringUtils::CiHash, Misc::StringUtils::CiEqual> Static;
+        Static mStatic;
+        std::vector<T*> mShared; // Preserves the record order as it came from the content files (this
                                      // is relevant for the spell autocalc code and selection order
                                      // for heads/hairs in the character creation)
-        std::map<std::string, T> mDynamic;
-
-        typedef std::map<std::string, T> Dynamic;
-        typedef std::map<std::string, T> Static;
+        typedef std::unordered_map<std::string, T, Misc::StringUtils::CiHash, Misc::StringUtils::CiEqual> Dynamic;
+        Dynamic mDynamic;
 
         friend class ESMStore;
 
@@ -294,7 +294,7 @@ namespace MWWorld
             }
         };
 
-        typedef std::map<std::string, ESM::Cell>                           DynamicInt;
+        typedef std::unordered_map<std::string, ESM::Cell, Misc::StringUtils::CiHash, Misc::StringUtils::CiEqual> DynamicInt;
         typedef std::map<std::pair<int, int>, ESM::Cell, DynamicExtCmp>    DynamicExt;
 
         DynamicInt      mInt;
@@ -354,7 +354,7 @@ namespace MWWorld
     class Store<ESM::Pathgrid> : public StoreBase
     {
     private:
-        typedef std::map<std::string, ESM::Pathgrid> Interior;
+        typedef std::unordered_map<std::string, ESM::Pathgrid, Misc::StringUtils::CiHash, Misc::StringUtils::CiEqual> Interior;
         typedef std::map<std::pair<int, int>, ESM::Pathgrid> Exterior;
 
         Interior mInt;

From 8c3b00164ebc5783c54050550d8e661e3358b028 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Wed, 20 Oct 2021 09:42:18 -0700
Subject: [PATCH 1593/2859] soft particles

---
 apps/openmw/mwrender/postprocessor.cpp        | 79 ++++++++++++++++---
 apps/openmw/mwrender/postprocessor.hpp        |  2 +
 apps/openmw/mwrender/renderingmanager.cpp     | 13 +++
 components/nifosg/nifloader.cpp               |  1 +
 components/resource/scenemanager.cpp          |  6 ++
 components/resource/scenemanager.hpp          |  4 +
 components/shader/shadervisitor.cpp           | 20 +++++
 components/shader/shadervisitor.hpp           |  4 +
 .../reference/modding/settings/shaders.rst    | 13 +++
 files/settings-default.cfg                    |  2 +
 files/shaders/CMakeLists.txt                  |  1 +
 files/shaders/objects_fragment.glsl           |  9 +++
 files/shaders/softparticles.glsl              | 32 ++++++++
 13 files changed, 175 insertions(+), 11 deletions(-)
 create mode 100644 files/shaders/softparticles.glsl

diff --git a/apps/openmw/mwrender/postprocessor.cpp b/apps/openmw/mwrender/postprocessor.cpp
index 1ee5745cb4..7405098a03 100644
--- a/apps/openmw/mwrender/postprocessor.cpp
+++ b/apps/openmw/mwrender/postprocessor.cpp
@@ -93,6 +93,41 @@ namespace
 
         MWRender::PostProcessor* mPostProcessor;
     };
+
+    // Copies the currently bound depth attachment to a new texture so drawables in transparent renderbin can safely sample from depth.
+    class OpaqueDepthCopyCallback : public osgUtil::RenderBin::DrawCallback
+    {
+    public:
+        OpaqueDepthCopyCallback(osg::ref_ptr<osg::Texture2D> opaqueDepthTex, osg::ref_ptr<osg::FrameBufferObject> sourceFbo)
+            : mOpaqueDepthFbo(new osg::FrameBufferObject)
+            , mSourceFbo(sourceFbo)
+            , mOpaqueDepthTex(opaqueDepthTex)
+        {
+            mOpaqueDepthFbo->setAttachment(osg::FrameBufferObject::BufferComponent::DEPTH_BUFFER, osg::FrameBufferAttachment(opaqueDepthTex));
+        }
+
+        void drawImplementation(osgUtil::RenderBin* bin, osg::RenderInfo& renderInfo, osgUtil::RenderLeaf*& previous) override
+        {
+            if (bin->getStage()->getFrameBufferObject() == mSourceFbo)
+            {
+                osg::State& state = *renderInfo.getState();
+                osg::GLExtensions* ext = state.get<osg::GLExtensions>();
+
+                mSourceFbo->apply(state, osg::FrameBufferObject::READ_FRAMEBUFFER);
+                mOpaqueDepthFbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
+
+                ext->glBlitFramebuffer(0, 0, mOpaqueDepthTex->getTextureWidth(), mOpaqueDepthTex->getTextureHeight(), 0, 0, mOpaqueDepthTex->getTextureWidth(), mOpaqueDepthTex->getTextureHeight(), GL_DEPTH_BUFFER_BIT, GL_NEAREST);
+
+                mSourceFbo->apply(state);
+            }
+
+            bin->drawImplementation(renderInfo, previous);
+        }
+    private:
+        osg::ref_ptr<osg::FrameBufferObject> mOpaqueDepthFbo;
+        osg::ref_ptr<osg::FrameBufferObject> mSourceFbo;
+        osg::ref_ptr<osg::Texture2D> mOpaqueDepthTex;
+    };
 }
 
 namespace MWRender
@@ -103,7 +138,9 @@ namespace MWRender
         , mDepthFormat(GL_DEPTH_COMPONENT24)
         , mRendering(rendering)
     {
-        if (!SceneUtil::getReverseZ())
+        bool softParticles = Settings::Manager::getBool("soft particles", "Shaders");
+
+        if (!SceneUtil::getReverseZ() && !softParticles)
             return;
 
         osg::GraphicsContext* gc = viewer->getCamera()->getGraphicsContext();
@@ -124,17 +161,22 @@ namespace MWRender
             return;
         }
 
-        if (osg::isGLExtensionSupported(contextID, "GL_ARB_depth_buffer_float"))
-            mDepthFormat = GL_DEPTH_COMPONENT32F;
-        else if (osg::isGLExtensionSupported(contextID, "GL_NV_depth_buffer_float"))
-            mDepthFormat = GL_DEPTH_COMPONENT32F_NV;
-        else
+        if (SceneUtil::getReverseZ())
         {
-            // TODO: Once we have post-processing implemented we want to skip this return and continue with setup.
-            // Rendering to a FBO to fullscreen geometry has overhead (especially when MSAA is enabled) and there are no
-            // benefits if no floating point depth formats are supported.
-            Log(Debug::Warning) << errPreamble << "'GL_ARB_depth_buffer_float' and 'GL_NV_depth_buffer_float' unsupported.";
-            return;
+            if (osg::isGLExtensionSupported(contextID, "GL_ARB_depth_buffer_float"))
+                mDepthFormat = GL_DEPTH_COMPONENT32F;
+            else if (osg::isGLExtensionSupported(contextID, "GL_NV_depth_buffer_float"))
+                mDepthFormat = GL_DEPTH_COMPONENT32F_NV;
+            else
+            {
+                // TODO: Once we have post-processing implemented we want to skip this return and continue with setup.
+                // Rendering to a FBO to fullscreen geometry has overhead (especially when MSAA is enabled) and there are no
+                // benefits if no floating point depth formats are supported.
+                Log(Debug::Warning) << errPreamble << "'GL_ARB_depth_buffer_float' and 'GL_NV_depth_buffer_float' unsupported.";
+
+                if (!softParticles)
+                    return;
+            }
         }
 
         int width = viewer->getCamera()->getViewport()->width();
@@ -165,6 +207,12 @@ namespace MWRender
         mDepthTex->dirtyTextureObject();
         mSceneTex->dirtyTextureObject();
 
+        if (mOpaqueDepthTex)
+        {
+            mOpaqueDepthTex->setTextureSize(width, height);
+            mOpaqueDepthTex->dirtyTextureObject();
+        }
+
         int samples = Settings::Manager::getInt("antialiasing", "Video");
 
         mFbo = new osg::FrameBufferObject;
@@ -186,6 +234,9 @@ namespace MWRender
         if (const auto depthProxy = std::getenv("OPENMW_ENABLE_DEPTH_CLEAR_PROXY"))
             mFirstPersonDepthRBProxy = new osg::RenderBuffer(width, height, mDepthTex->getInternalFormat(), samples);
 
+        if (Settings::Manager::getBool("soft particles", "Shaders"))
+            osgUtil::RenderBin::getRenderBinPrototype("DepthSortedBin")->setDrawCallback(new OpaqueDepthCopyCallback(mOpaqueDepthTex, mMsaaFbo ? mMsaaFbo : mFbo));
+
         mViewer->getCamera()->resize(width, height);
         mHUDCamera->resize(width, height);
         mRendering.updateProjectionMatrix();
@@ -204,6 +255,12 @@ namespace MWRender
         mDepthTex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
         mDepthTex->setResizeNonPowerOfTwoHint(false);
 
+        if (Settings::Manager::getBool("soft particles", "Shaders"))
+        {
+            mOpaqueDepthTex = new osg::Texture2D(*mDepthTex);
+            mOpaqueDepthTex->setName("opaqueTexMap");
+        }
+
         mSceneTex = new osg::Texture2D;
         mSceneTex->setTextureSize(width, height);
         mSceneTex->setSourceFormat(GL_RGB);
diff --git a/apps/openmw/mwrender/postprocessor.hpp b/apps/openmw/mwrender/postprocessor.hpp
index 0d03d4b500..cc5128d8f9 100644
--- a/apps/openmw/mwrender/postprocessor.hpp
+++ b/apps/openmw/mwrender/postprocessor.hpp
@@ -26,6 +26,7 @@ namespace MWRender
         auto getFirstPersonRBProxy() { return mFirstPersonDepthRBProxy; }
 
         int getDepthFormat() { return mDepthFormat; }
+        osg::ref_ptr<osg::Texture2D> getOpaqueDepthTex() { return mOpaqueDepthTex; }
 
         void resize(int width, int height);
 
@@ -42,6 +43,7 @@ namespace MWRender
 
         osg::ref_ptr<osg::Texture2D> mSceneTex;
         osg::ref_ptr<osg::Texture2D> mDepthTex;
+        osg::ref_ptr<osg::Texture2D> mOpaqueDepthTex;
 
         int mDepthFormat;
 
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 7b8393f690..a129543828 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -91,6 +91,7 @@ namespace MWRender
             stateset->addUniform(new osg::Uniform("linearFac", 0.f));
             stateset->addUniform(new osg::Uniform("near", 0.f));
             stateset->addUniform(new osg::Uniform("far", 0.f));
+            stateset->addUniform(new osg::Uniform("screenRes", osg::Vec2f{}));
             if (mUsePlayerUniforms)
             {
                 stateset->addUniform(new osg::Uniform("windSpeed", 0.0f));
@@ -116,6 +117,10 @@ namespace MWRender
             if (uFar)
                 uFar->set(mFar);
 
+            auto* uScreenRes = stateset->getUniform("screenRes");
+            if (uScreenRes)
+                uScreenRes->set(mScreenRes);
+
             if (mUsePlayerUniforms)
             {
                 auto* windSpeed = stateset->getUniform("windSpeed");
@@ -148,6 +153,11 @@ namespace MWRender
             mFar = far;
         }
 
+        void setScreenRes(float width, float height)
+        {
+            mScreenRes = osg::Vec2f(width, height);
+        }
+
         void setWindSpeed(float windSpeed)
         {
             mWindSpeed = windSpeed;
@@ -167,6 +177,7 @@ namespace MWRender
         bool mUsePlayerUniforms;
         float mWindSpeed;
         osg::Vec3f mPlayerPos;
+        osg::Vec2f mScreenRes;
     };
 
     class StateUpdater : public SceneUtil::StateSetUpdater
@@ -453,6 +464,7 @@ namespace MWRender
 
         mPostProcessor = new PostProcessor(*this, viewer, mRootNode);
         resourceSystem->getSceneManager()->setDepthFormat(mPostProcessor->getDepthFormat());
+        resourceSystem->getSceneManager()->setOpaqueDepthTex(mPostProcessor->getOpaqueDepthTex());
 
         if (reverseZ && !SceneUtil::isFloatingPointDepthFormat(mPostProcessor->getDepthFormat()))
             Log(Debug::Warning) << "Floating point depth format not in use but reverse-z buffer is enabled, consider disabling it.";
@@ -1166,6 +1178,7 @@ namespace MWRender
 
         mSharedUniformStateUpdater->setNear(mNearClip);
         mSharedUniformStateUpdater->setFar(mViewDistance);
+        mSharedUniformStateUpdater->setScreenRes(mViewer->getCamera()->getViewport()->width(), mViewer->getCamera()->getViewport()->height()); 
 
         // Since our fog is not radial yet, we should take FOV in account, otherwise terrain near viewing distance may disappear.
         // Limit FOV here just for sure, otherwise viewing distance can be too high.
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 838895eb47..a745d50eda 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -1045,6 +1045,7 @@ namespace NifOsg
         void handleParticleSystem(const Nif::Node *nifNode, osg::Group *parentNode, SceneUtil::CompositeStateSetUpdater* composite, int animflags)
         {
             osg::ref_ptr<ParticleSystem> partsys (new ParticleSystem);
+            partsys->getOrCreateStateSet();
             partsys->setSortMode(osgParticle::ParticleSystem::SORT_BACK_TO_FRONT);
 
             const Nif::NiParticleSystemController* partctrl = nullptr;
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 4184a77c54..b6608ab631 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -429,6 +429,11 @@ namespace Resource
         mConvertAlphaTestToAlphaToCoverage = convert;
     }
 
+    void SceneManager::setOpaqueDepthTex(osg::ref_ptr<osg::Texture2D> texture)
+    {
+        mOpaqueDepthTex = texture;
+    }
+
     SceneManager::~SceneManager()
     {
         // this has to be defined in the .cpp file as we can't delete incomplete types
@@ -891,6 +896,7 @@ namespace Resource
         shaderVisitor->setSpecularMapPattern(mSpecularMapPattern);
         shaderVisitor->setApplyLightingToEnvMaps(mApplyLightingToEnvMaps);
         shaderVisitor->setConvertAlphaTestToAlphaToCoverage(mConvertAlphaTestToAlphaToCoverage);
+        shaderVisitor->setOpaqueDepthTex(mOpaqueDepthTex);
         return shaderVisitor;
     }
 }
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index 85e012071d..58ae8fdb8b 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -9,6 +9,7 @@
 #include <osg/ref_ptr>
 #include <osg/Node>
 #include <osg/Texture>
+#include <osg/Texture2D>
 
 #include "resourcemanager.hpp"
 
@@ -111,6 +112,8 @@ namespace Resource
         void setSupportedLightingMethods(const SceneUtil::LightManager::SupportedMethods& supported);
         bool isSupportedLightingMethod(SceneUtil::LightingMethod method) const;
 
+        void setOpaqueDepthTex(osg::ref_ptr<osg::Texture2D> texture);
+
         enum class UBOBinding
         {
             // If we add more UBO's, we should probably assign their bindings dynamically according to the current count of UBO's in the programTemplate
@@ -209,6 +212,7 @@ namespace Resource
         SceneUtil::LightManager::SupportedMethods mSupportedLightingMethods;
         bool mConvertAlphaTestToAlphaToCoverage;
         GLenum mDepthFormat;
+        osg::ref_ptr<osg::Texture2D> mOpaqueDepthTex;
 
         osg::ref_ptr<Resource::SharedStateManager> mSharedStateManager;
         mutable std::mutex mSharedStateMutex;
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 9877ab1863..9b54060730 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -11,6 +11,8 @@
 #include <osg/Texture>
 #include <osg/ValueObject>
 
+#include <osgParticle/ParticleSystem>
+
 #include <osgUtil/TangentSpaceGenerator>
 
 #include <components/debug/debuglog.hpp>
@@ -19,6 +21,7 @@
 #include <components/vfs/manager.hpp>
 #include <components/sceneutil/riggeometry.hpp>
 #include <components/sceneutil/morphgeometry.hpp>
+#include <components/sceneutil/util.hpp>
 
 #include "removedalphafunc.hpp"
 #include "shadermanager.hpp"
@@ -554,6 +557,18 @@ namespace Shader
             updateAddedState(*writableUserData, addedState);
         }
 
+        if (auto partsys = dynamic_cast<osgParticle::ParticleSystem*>(&node))
+        {
+            writableStateSet->setDefine("SOFT_PARTICLES", "1", osg::StateAttribute::ON);
+
+            auto depth = SceneUtil::createDepth();
+            depth->setWriteMask(false);
+            writableStateSet->setAttributeAndModes(depth, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+            writableStateSet->addUniform(new osg::Uniform("particleSize", partsys->getDefaultParticleTemplate().getSizeRange().maximum));
+            writableStateSet->addUniform(new osg::Uniform("opaqueDepthTex", 2));
+            writableStateSet->setTextureAttributeAndModes(2, mOpaqueDepthTex, osg::StateAttribute::ON);
+        }
+
         std::string shaderPrefix;
         if (!node.getUserValue("shaderPrefix", shaderPrefix))
             shaderPrefix = mDefaultShaderPrefix;
@@ -769,6 +784,11 @@ namespace Shader
         mConvertAlphaTestToAlphaToCoverage = convert;
     }
 
+    void ShaderVisitor::setOpaqueDepthTex(osg::ref_ptr<osg::Texture2D> texture)
+    {
+        mOpaqueDepthTex = texture;
+    }
+
     ReinstateRemovedStateVisitor::ReinstateRemovedStateVisitor(bool allowedToModifyStateSets)
         : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
         , mAllowedToModifyStateSets(allowedToModifyStateSets)
diff --git a/components/shader/shadervisitor.hpp b/components/shader/shadervisitor.hpp
index 5f9739ea90..d80e697fd8 100644
--- a/components/shader/shadervisitor.hpp
+++ b/components/shader/shadervisitor.hpp
@@ -3,6 +3,7 @@
 
 #include <osg/NodeVisitor>
 #include <osg/Program>
+#include <osg/Texture2D>
 
 namespace Resource
 {
@@ -45,6 +46,8 @@ namespace Shader
 
         void setConvertAlphaTestToAlphaToCoverage(bool convert);
 
+        void setOpaqueDepthTex(osg::ref_ptr<osg::Texture2D> texture);
+
         void apply(osg::Node& node) override;
 
         void apply(osg::Drawable& drawable) override;
@@ -110,6 +113,7 @@ namespace Shader
         bool adjustGeometry(osg::Geometry& sourceGeometry, const ShaderRequirements& reqs);
 
         osg::ref_ptr<const osg::Program> mProgramTemplate;
+        osg::ref_ptr<osg::Texture2D> mOpaqueDepthTex;
     };
 
     class ReinstateRemovedStateVisitor : public osg::NodeVisitor
diff --git a/docs/source/reference/modding/settings/shaders.rst b/docs/source/reference/modding/settings/shaders.rst
index 03b7805de6..c62c44e936 100644
--- a/docs/source/reference/modding/settings/shaders.rst
+++ b/docs/source/reference/modding/settings/shaders.rst
@@ -269,3 +269,16 @@ antialias alpha test
 Convert the alpha test (cutout/punchthrough alpha) to alpha-to-coverage when :ref:`antialiasing` is on.
 This allows MSAA to work with alpha-tested meshes, producing better-looking edges without pixelation.
 When MSAA is off, this setting will have no visible effect, but might have a performance cost.
+
+soft particles
+------------------------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	False
+
+Enables soft particles for almost all particle effects, excluding precipitation.
+This technique softens the intersection between individual particles and other
+opaque geometry by blending between them. Note, this relies on overriding
+specific properties of particle systems that potentially differ from the source
+content, this setting may change the look of some particle systems.
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 27a9544ea6..2df6eaa0a7 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -494,6 +494,8 @@ minimum interior brightness = 0.08
 # When MSAA is off, this setting will have no visible effect, but might have a performance cost.
 antialias alpha test = false
 
+soft particles = true
+
 [Input]
 
 # Capture control of the cursor prevent movement outside the window.
diff --git a/files/shaders/CMakeLists.txt b/files/shaders/CMakeLists.txt
index d86719f318..6e19263a38 100644
--- a/files/shaders/CMakeLists.txt
+++ b/files/shaders/CMakeLists.txt
@@ -39,6 +39,7 @@ set(SHADER_FILES
     sky_vertex.glsl
     sky_fragment.glsl
     skypasses.glsl
+    softparticles.glsl
 )
 
 copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_SHADERS_ROOT} ${DDIRRELATIVE} "${SHADER_FILES}")
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index 6f6cede4e4..cb435c7790 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -1,5 +1,6 @@
 #version 120
 #pragma import_defines(FORCE_OPAQUE)
+#pragma import_defines(SOFT_PARTICLES)
 
 #if @useUBO
     #extension GL_ARB_uniform_buffer_object : require
@@ -80,6 +81,10 @@ varying vec3 passNormal;
 #include "parallax.glsl"
 #include "alpha.glsl"
 
+#if defined(SOFT_PARTICLES) && SOFT_PARTICLES
+#include "softparticles.glsl"
+#endif
+
 void main()
 {
 #if @diffuseMap
@@ -220,6 +225,10 @@ void main()
 #endif
     gl_FragData[0].xyz = mix(gl_FragData[0].xyz, gl_Fog.color.xyz, fogValue);
 
+#if defined(SOFT_PARTICLES) && SOFT_PARTICLES
+    gl_FragData[0].a *= calcSoftParticleFade();
+#endif
+
 #if defined(FORCE_OPAQUE) && FORCE_OPAQUE
     // having testing & blending isn't enough - we need to write an opaque pixel to be opaque
     gl_FragData[0].a = 1.0;
diff --git a/files/shaders/softparticles.glsl b/files/shaders/softparticles.glsl
new file mode 100644
index 0000000000..fa8b4de4c1
--- /dev/null
+++ b/files/shaders/softparticles.glsl
@@ -0,0 +1,32 @@
+uniform float near;
+uniform float far;
+uniform sampler2D opaqueDepthTex;
+uniform vec2 screenRes;
+uniform float particleSize;
+
+float viewDepth(float depth)
+{
+#if @reverseZ
+    depth = 1.0 - depth;
+#endif
+    return (near * far) / ((far - near) * depth - far);
+}
+
+float calcSoftParticleFade()
+{
+    const float falloffMultiplier = 0.33;
+    const float contrast = 1.30;
+
+    vec2 screenCoords = gl_FragCoord.xy / screenRes;
+    float sceneDepth = viewDepth(texture2D(opaqueDepthTex, screenCoords).x);
+    float particleDepth = viewDepth(gl_FragCoord.z);
+    float falloff = particleSize * falloffMultiplier;
+    float delta = particleDepth - sceneDepth;
+
+    if (delta < 0.0)
+        discard;
+
+    const float shift = 0.845;
+
+    return shift * pow(clamp(delta/falloff, 0.0, 1.0), contrast);
+}

From 40b6bbbdf34bdc7e337bf394b987e527388a5442 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Sat, 23 Oct 2021 13:46:39 -0700
Subject: [PATCH 1594/2859] use openmw define system

---
 components/shader/shadervisitor.cpp | 4 +++-
 files/shaders/objects_fragment.glsl | 5 ++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 9b54060730..2c673200f7 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -559,7 +559,7 @@ namespace Shader
 
         if (auto partsys = dynamic_cast<osgParticle::ParticleSystem*>(&node))
         {
-            writableStateSet->setDefine("SOFT_PARTICLES", "1", osg::StateAttribute::ON);
+            defineMap["softParticles"] = "1";
 
             auto depth = SceneUtil::createDepth();
             depth->setWriteMask(false);
@@ -568,6 +568,8 @@ namespace Shader
             writableStateSet->addUniform(new osg::Uniform("opaqueDepthTex", 2));
             writableStateSet->setTextureAttributeAndModes(2, mOpaqueDepthTex, osg::StateAttribute::ON);
         }
+        else
+            defineMap["softParticles"] = "0";
 
         std::string shaderPrefix;
         if (!node.getUserValue("shaderPrefix", shaderPrefix))
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index cb435c7790..d750a4dd1f 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -1,6 +1,5 @@
 #version 120
 #pragma import_defines(FORCE_OPAQUE)
-#pragma import_defines(SOFT_PARTICLES)
 
 #if @useUBO
     #extension GL_ARB_uniform_buffer_object : require
@@ -81,7 +80,7 @@ varying vec3 passNormal;
 #include "parallax.glsl"
 #include "alpha.glsl"
 
-#if defined(SOFT_PARTICLES) && SOFT_PARTICLES
+#if @softParticles
 #include "softparticles.glsl"
 #endif
 
@@ -225,7 +224,7 @@ void main()
 #endif
     gl_FragData[0].xyz = mix(gl_FragData[0].xyz, gl_Fog.color.xyz, fogValue);
 
-#if defined(SOFT_PARTICLES) && SOFT_PARTICLES
+#if @softParticles
     gl_FragData[0].a *= calcSoftParticleFade();
 #endif
 

From 356e9d7cf0a6313417515589790f1873cce45054 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Sat, 30 Oct 2021 20:43:18 +0000
Subject: [PATCH 1595/2859] refactors osg::Callback virtual inheritance (#3200)

With this PR we refactor `SceneUtil::KeyframeController` not to require `virtual osg::Callback` inheritance. I suppose such `virtual` overhead is not justified here because it negatively impacts many other classes we derive from `osg::Callback`.
---
 apps/openmw/mwrender/animation.cpp      |  5 +++--
 components/nifosg/controller.hpp        |  1 +
 components/sceneutil/keyframe.hpp       | 14 ++++++++------
 components/sceneutil/nodecallback.hpp   |  2 +-
 components/sceneutil/osgacontroller.hpp |  2 ++
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index cdc6c49ab2..91ef6cc975 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -968,8 +968,9 @@ namespace MWRender
                 {
                     osg::ref_ptr<osg::Node> node = getNodeMap().at(it->first); // this should not throw, we already checked for the node existing in addAnimSource
 
-                    node->addUpdateCallback(it->second);
-                    mActiveControllers.emplace_back(node, it->second);
+                    osg::Callback* callback = it->second->getAsCallback();
+                    node->addUpdateCallback(callback);
+                    mActiveControllers.emplace_back(node, callback);
 
                     if (blendMask == 0 && node == mAccumRoot)
                     {
diff --git a/components/nifosg/controller.hpp b/components/nifosg/controller.hpp
index c6311fd5fc..5d88dda1f1 100644
--- a/components/nifosg/controller.hpp
+++ b/components/nifosg/controller.hpp
@@ -248,6 +248,7 @@ namespace NifOsg
         META_Object(NifOsg, KeyframeController)
 
         osg::Vec3f getTranslation(float time) const override;
+        osg::Callback* getAsCallback() override { return this; }
 
         void operator() (NifOsg::MatrixTransform*, osg::NodeVisitor*);
 
diff --git a/components/sceneutil/keyframe.hpp b/components/sceneutil/keyframe.hpp
index 5be6924a09..59a87ab08e 100644
--- a/components/sceneutil/keyframe.hpp
+++ b/components/sceneutil/keyframe.hpp
@@ -3,7 +3,7 @@
 
 #include <map>
 
-#include <osg/Callback>
+#include <osg/Object>
 
 #include <components/sceneutil/controller.hpp>
 #include <components/sceneutil/textkeymap.hpp>
@@ -11,18 +11,20 @@
 
 namespace SceneUtil
 {
-    class KeyframeController : public SceneUtil::Controller, public virtual osg::Callback
+    /// @note Derived classes are expected to derive from osg::Callback and implement getAsCallback().
+    class KeyframeController : public SceneUtil::Controller, public virtual osg::Object
     {
     public:
         KeyframeController() {}
 
         KeyframeController(const KeyframeController& copy, const osg::CopyOp& copyop)
-            : osg::Callback(copy, copyop)
-            , SceneUtil::Controller(copy)
-        {}
-        META_Object(SceneUtil, KeyframeController)
+            : osg::Object(copy, copyop)
+            , SceneUtil::Controller(copy) {}
 
         virtual osg::Vec3f getTranslation(float time) const  { return osg::Vec3f(); }
+
+        /// @note We could drop this function in favour of osg::Object::asCallback from OSG 3.6 on.
+        virtual osg::Callback* getAsCallback() = 0;
     };
 
     /// Wrapper object containing an animation track as a ref-countable osg::Object.
diff --git a/components/sceneutil/nodecallback.hpp b/components/sceneutil/nodecallback.hpp
index 6f0140d64c..942cb17ded 100644
--- a/components/sceneutil/nodecallback.hpp
+++ b/components/sceneutil/nodecallback.hpp
@@ -13,7 +13,7 @@ namespace SceneUtil
 {
 
 template <class Derived, typename NodeType=osg::Node*, typename VisitorType=osg::NodeVisitor*>
-class NodeCallback : public virtual osg::Callback
+class NodeCallback : public osg::Callback
 {
 public:
     NodeCallback(){}
diff --git a/components/sceneutil/osgacontroller.hpp b/components/sceneutil/osgacontroller.hpp
index 26212a3b99..893b8b1ebe 100644
--- a/components/sceneutil/osgacontroller.hpp
+++ b/components/sceneutil/osgacontroller.hpp
@@ -45,6 +45,8 @@ namespace SceneUtil
 
         META_Object(SceneUtil, OsgAnimationController)
 
+        osg::Callback* getAsCallback() override { return this; }
+
         /// @brief Handles the location of the instance
         osg::Vec3f getTranslation(float time) const override;
 

From 3c40935ec16cde3d5db8ce2fe26da63fb2d07c17 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 31 Oct 2021 11:57:33 +0100
Subject: [PATCH 1596/2859] Fix regression #6375

---
 apps/openmw/mwmechanics/creaturestats.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index 6710dcd734..d832c47c87 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -539,6 +539,7 @@ namespace MWMechanics
         state.mFallHeight = mFallHeight; // TODO: vertical velocity (move from PhysicActor to CreatureStats?)
         state.mLastHitObject = mLastHitObject;
         state.mLastHitAttemptObject = mLastHitAttemptObject;
+        state.mRecalcDynamicStats = false;
         state.mDrawState = mDrawState;
         state.mLevel = mLevel;
         state.mActorId = mActorId;

From d88d006984a27de79fbec9c100403d3af339132f Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Sun, 31 Oct 2021 11:59:34 +0000
Subject: [PATCH 1597/2859] fixes getViewDistance (#3207)

I have been informed by @akortunov that my addition of `Groundcover::getViewDistance` is not working in some cases. Investigations revealed that some `ViewData` code interacting with my additions had been quite thoroughly optimised in a way that was not sufficiently documented and interfered with the new feature. With this PR we repair `getViewDistance` while preserving such optimisations and add a necessary comment to avoid issues in the future. In addition, we now rebuild views when the global `mViewDistance` changes.
---
 components/terrain/quadtreeworld.cpp | 36 ++++++++++++++++-------
 components/terrain/quadtreeworld.hpp |  7 ++++-
 components/terrain/viewdata.cpp      | 35 +++-------------------
 components/terrain/viewdata.hpp      | 43 ++++++++++++++--------------
 4 files changed, 57 insertions(+), 64 deletions(-)

diff --git a/components/terrain/quadtreeworld.cpp b/components/terrain/quadtreeworld.cpp
index 0282eb8de1..7fc0895846 100644
--- a/components/terrain/quadtreeworld.cpp
+++ b/components/terrain/quadtreeworld.cpp
@@ -278,6 +278,7 @@ QuadTreeWorld::QuadTreeWorld(osg::Group *parent, osg::Group *compileRoot, Resour
     , mViewDistance(std::numeric_limits<float>::max())
     , mMinSize(1/8.f)
     , mDebugTerrainChunks(debugChunks)
+    , mRevalidateDistance(0.f)
 {
     mChunkManager->setCompositeMapSize(compMapResolution);
     mChunkManager->setCompositeMapLevel(compMapLevel);
@@ -346,22 +347,25 @@ unsigned int getLodFlags(QuadTreeNode* node, int ourLod, int vertexLodMod, const
     return lodFlags;
 }
 
-void loadRenderingNode(ViewData::Entry& entry, ViewData* vd, int vertexLodMod, float cellWorldSize, const osg::Vec4i &gridbounds, const std::vector<QuadTreeWorld::ChunkManager*>& chunkManagers, bool compile, float reuseDistance)
+void QuadTreeWorld::loadRenderingNode(ViewDataEntry& entry, ViewData* vd, float cellWorldSize, const osg::Vec4i &gridbounds, bool compile, float reuseDistance)
 {
     if (!vd->hasChanged() && entry.mRenderingNode)
         return;
 
-    int ourLod = getVertexLod(entry.mNode, vertexLodMod);
+    int ourLod = getVertexLod(entry.mNode, mVertexLodMod);
 
     if (vd->hasChanged())
     {
         // have to recompute the lodFlags in case a neighbour has changed LOD.
-        unsigned int lodFlags = getLodFlags(entry.mNode, ourLod, vertexLodMod, vd);
+        unsigned int lodFlags = getLodFlags(entry.mNode, ourLod, mVertexLodMod, vd);
         if (lodFlags != entry.mLodFlags)
         {
             entry.mRenderingNode = nullptr;
             entry.mLodFlags = lodFlags;
         }
+        // have to revalidate chunks within a custom view distance.
+        if (mRevalidateDistance && entry.mNode->distance(vd->getViewPoint()) <= mRevalidateDistance + reuseDistance)
+            entry.mRenderingNode = nullptr;
     }
 
     if (!entry.mRenderingNode)
@@ -372,9 +376,9 @@ void loadRenderingNode(ViewData::Entry& entry, ViewData* vd, int vertexLodMod, f
         const osg::Vec2f& center = entry.mNode->getCenter();
         bool activeGrid = (center.x() > gridbounds.x() && center.y() > gridbounds.y() && center.x() < gridbounds.z() && center.y() < gridbounds.w());
 
-        for (QuadTreeWorld::ChunkManager* m : chunkManagers)
+        for (QuadTreeWorld::ChunkManager* m : mChunkManagers)
         {
-            if (m->getViewDistance() && entry.mNode->distance(vd->getViewPoint()) > m->getViewDistance() + reuseDistance)
+            if (mRevalidateDistance && m->getViewDistance() && entry.mNode->distance(vd->getViewPoint()) > m->getViewDistance() + reuseDistance)
                 continue;
             osg::ref_ptr<osg::Node> n = m->getChunk(entry.mNode->getSize(), entry.mNode->getCenter(), ourLod, entry.mLodFlags, activeGrid, vd->getViewPoint(), compile);
             if (n) pat->addChild(n);
@@ -398,7 +402,7 @@ void updateWaterCullingView(HeightCullCallback* callback, ViewData* vd, osgUtil:
     static bool debug = getenv("OPENMW_WATER_CULLING_DEBUG") != nullptr;
     for (unsigned int i=0; i<vd->getNumEntries(); ++i)
     {
-        ViewData::Entry& entry = vd->getEntry(i);
+        ViewDataEntry& entry = vd->getEntry(i);
         osg::BoundingBox bb = static_cast<TerrainDrawable*>(entry.mRenderingNode->asGroup()->getChild(0))->getWaterBoundingBox();
         if (!bb.valid())
             continue;
@@ -457,15 +461,15 @@ void QuadTreeWorld::accept(osg::NodeVisitor &nv)
 
     for (unsigned int i=0; i<vd->getNumEntries(); ++i)
     {
-        ViewData::Entry& entry = vd->getEntry(i);
-        loadRenderingNode(entry, vd, mVertexLodMod, cellWorldSize, mActiveGrid, mChunkManagers, false, mViewDataMap->getReuseDistance());
+        ViewDataEntry& entry = vd->getEntry(i);
+        loadRenderingNode(entry, vd, cellWorldSize, mActiveGrid, false, mViewDataMap->getReuseDistance());
         entry.mRenderingNode->accept(nv);
     }
 
     if (mHeightCullCallback && isCullVisitor)
         updateWaterCullingView(mHeightCullCallback, vd, static_cast<osgUtil::CullVisitor*>(&nv), mStorage->getCellWorldSize(), !isGridEmpty());
 
-    vd->markUnchanged();
+    vd->setChanged(false);
 
     double referenceTime = nv.getFrameStamp() ? nv.getFrameStamp()->getReferenceTime() : 0.0;
     if (referenceTime != 0.0)
@@ -540,9 +544,9 @@ void QuadTreeWorld::preload(View *view, const osg::Vec3f &viewPoint, const osg::
         const float reuseDistance = std::max(mViewDataMap->getReuseDistance(), std::abs(distanceModifier));
         for (unsigned int i=startEntry; i<vd->getNumEntries() && !abort; ++i)
         {
-            ViewData::Entry& entry = vd->getEntry(i);
+            ViewDataEntry& entry = vd->getEntry(i);
 
-            loadRenderingNode(entry, vd, mVertexLodMod, cellWorldSize, grid, mChunkManagers, true, reuseDistance);
+            loadRenderingNode(entry, vd, cellWorldSize, grid, true, reuseDistance);
             if (pass==0) reporter.addProgress(entry.mNode->getSize());
             entry.mNode = nullptr; // Clear node lest we break the neighbours search for the next pass
         }
@@ -579,6 +583,8 @@ void QuadTreeWorld::addChunkManager(QuadTreeWorld::ChunkManager* m)
 {
     mChunkManagers.push_back(m);
     mTerrainRoot->setNodeMask(mTerrainRoot->getNodeMask()|m->getNodeMask());
+    if (m->getViewDistance())
+        mRevalidateDistance = std::max(m->getViewDistance(), mRevalidateDistance);
 }
 
 void QuadTreeWorld::rebuildViews()
@@ -586,4 +592,12 @@ void QuadTreeWorld::rebuildViews()
     mViewDataMap->rebuildViews();
 }
 
+void QuadTreeWorld::setViewDistance(float viewDistance)
+{
+    if (mViewDistance == viewDistance)
+        return;
+    mViewDistance = viewDistance;
+    mViewDataMap->rebuildViews();
+}
+
 }
diff --git a/components/terrain/quadtreeworld.hpp b/components/terrain/quadtreeworld.hpp
index 3bd606d6c6..9d21d65fc5 100644
--- a/components/terrain/quadtreeworld.hpp
+++ b/components/terrain/quadtreeworld.hpp
@@ -16,6 +16,9 @@ namespace Terrain
 {
     class RootNode;
     class ViewDataMap;
+    class ViewData;
+    struct ViewDataEntry;
+    
     class DebugChunkManager;
 
     /// @brief Terrain implementation that loads cells into a Quad Tree, with geometry LOD and texture LOD.
@@ -30,7 +33,7 @@ namespace Terrain
 
         void enable(bool enabled) override;
 
-        void setViewDistance(float distance) override { mViewDistance = distance; }
+        void setViewDistance(float distance) override;
 
         void cacheCell(View *view, int x, int y) override {}
         /// @note Not thread safe.
@@ -60,6 +63,7 @@ namespace Terrain
 
     private:
         void ensureQuadTreeBuilt();
+        void loadRenderingNode(ViewDataEntry& entry, ViewData* vd, float cellWorldSize, const osg::Vec4i &gridbounds, bool compile, float reuseDistance);
 
         osg::ref_ptr<RootNode> mRootNode;
 
@@ -75,6 +79,7 @@ namespace Terrain
         float mMinSize;
         bool mDebugTerrainChunks;
         std::unique_ptr<DebugChunkManager> mDebugChunkManager;
+        float mRevalidateDistance;
     };
 
 }
diff --git a/components/terrain/viewdata.cpp b/components/terrain/viewdata.cpp
index e517390b44..ae23f034a8 100644
--- a/components/terrain/viewdata.cpp
+++ b/components/terrain/viewdata.cpp
@@ -12,12 +12,10 @@ ViewData::ViewData()
     , mHasViewPoint(false)
     , mWorldUpdateRevision(0)
 {
-
 }
 
 ViewData::~ViewData()
 {
-
 }
 
 void ViewData::copyFrom(const ViewData& other)
@@ -38,42 +36,17 @@ void ViewData::add(QuadTreeNode *node)
     if (index+1 > mEntries.size())
         mEntries.resize(index+1);
 
-    Entry& entry = mEntries[index];
+    ViewDataEntry& entry = mEntries[index];
     if (entry.set(node))
         mChanged = true;
 }
 
-unsigned int ViewData::getNumEntries() const
-{
-    return mNumEntries;
-}
-
-ViewData::Entry &ViewData::getEntry(unsigned int i)
-{
-    return mEntries[i];
-}
-
-bool ViewData::hasChanged() const
-{
-    return mChanged;
-}
-
-bool ViewData::hasViewPoint() const
-{
-    return mHasViewPoint;
-}
-
 void ViewData::setViewPoint(const osg::Vec3f &viewPoint)
 {
     mViewPoint = viewPoint;
     mHasViewPoint = true;
 }
 
-const osg::Vec3f& ViewData::getViewPoint() const
-{
-    return mViewPoint;
-}
-
 // NOTE: As a performance optimisation, we cache mRenderingNodes from previous frames here.
 // If this cache becomes invalid (e.g. through mWorldUpdateRevision), we need to use clear() instead of reset().
 void ViewData::reset()
@@ -110,14 +83,13 @@ bool ViewData::contains(QuadTreeNode *node) const
     return false;
 }
 
-ViewData::Entry::Entry()
+ViewDataEntry::ViewDataEntry()
     : mNode(nullptr)
     , mLodFlags(0)
 {
-
 }
 
-bool ViewData::Entry::set(QuadTreeNode *node)
+bool ViewDataEntry::set(QuadTreeNode *node)
 {
     if (node == mNode)
         return false;
@@ -173,6 +145,7 @@ ViewData *ViewDataMap::getViewData(osg::Object *viewer, const osg::Vec3f& viewPo
             }
             vd->setViewPoint(viewPoint);
             vd->setActiveGrid(activeGrid);
+            vd->setChanged(true);
             needsUpdate = true;
         }
     }
diff --git a/components/terrain/viewdata.hpp b/components/terrain/viewdata.hpp
index 5d814251ea..b7dbc977b1 100644
--- a/components/terrain/viewdata.hpp
+++ b/components/terrain/viewdata.hpp
@@ -13,6 +13,18 @@ namespace Terrain
 
     class QuadTreeNode;
 
+    struct ViewDataEntry
+    {
+        ViewDataEntry();
+
+        bool set(QuadTreeNode* node);
+
+        QuadTreeNode* mNode;
+
+        unsigned int mLodFlags;
+        osg::ref_ptr<osg::Node> mRenderingNode;
+    };
+
     class ViewData : public View
     {
     public:
@@ -31,33 +43,22 @@ namespace Terrain
 
         void copyFrom(const ViewData& other);
 
-        struct Entry
-        {
-            Entry();
-
-            bool set(QuadTreeNode* node);
-
-            QuadTreeNode* mNode;
-
-            unsigned int mLodFlags;
-            osg::ref_ptr<osg::Node> mRenderingNode;
-        };
-
-        unsigned int getNumEntries() const;
-
-        Entry& getEntry(unsigned int i);
+        unsigned int getNumEntries() const { return mNumEntries; }
+        ViewDataEntry& getEntry(unsigned int i) { return mEntries[i]; }
 
         double getLastUsageTimeStamp() const { return mLastUsageTimeStamp; }
         void setLastUsageTimeStamp(double timeStamp) { mLastUsageTimeStamp = timeStamp; }
 
-        /// @return Have any nodes changed since the last frame
-        bool hasChanged() const;
-        void markUnchanged() { mChanged = false; }
+        /// Indicates at least one mNode of mEntries has changed or the view point has moved beyond mReuseDistance.
+        /// @note Such changes may necessitate a revalidation of cached mRenderingNodes elsewhere depending
+        /// on the parameters that affect the creation of mRenderingNode.
+        bool hasChanged() const { return mChanged; }
+        void setChanged(bool changed) { mChanged = changed; }
 
-        bool hasViewPoint() const;
+        bool hasViewPoint() const { return mHasViewPoint; }
 
         void setViewPoint(const osg::Vec3f& viewPoint);
-        const osg::Vec3f& getViewPoint() const;
+        const osg::Vec3f& getViewPoint() const { return mViewPoint; }
 
         void setActiveGrid(const osg::Vec4i &grid) { if (grid != mActiveGrid) {mActiveGrid = grid;mEntries.clear();mNumEntries=0;} }
         const osg::Vec4i &getActiveGrid() const { return mActiveGrid;}
@@ -66,7 +67,7 @@ namespace Terrain
         void setWorldUpdateRevision(int updateRevision) { mWorldUpdateRevision = updateRevision; }
 
     private:
-        std::vector<Entry> mEntries;
+        std::vector<ViewDataEntry> mEntries;
         unsigned int mNumEntries;
         double mLastUsageTimeStamp;
         bool mChanged;

From b9911da4c799984c639102e5dcae133bd52ce378 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Sun, 31 Oct 2021 12:03:42 +0000
Subject: [PATCH 1598/2859] applies lightMask (#3201)

With this PR we apply `lightMask` to a `Transform` node we create specifically for a light. This mask will allow us to stop traversing such nodes sooner and avoid costly processing associated with `Transform` nodes in the cull visitor.
---
 components/sceneutil/lightutil.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/sceneutil/lightutil.cpp b/components/sceneutil/lightutil.cpp
index 6a1a1376ec..2a5a945558 100644
--- a/components/sceneutil/lightutil.cpp
+++ b/components/sceneutil/lightutil.cpp
@@ -79,6 +79,7 @@ namespace SceneUtil
             // PositionAttitudeTransform seems to be slightly faster than MatrixTransform
             osg::ref_ptr<SceneUtil::PositionAttitudeTransform> trans(new SceneUtil::PositionAttitudeTransform);
             trans->setPosition(computeBound.getBoundingBox().center());
+            trans->setNodeMask(lightMask);
 
             node->addChild(trans);
 

From 226d3eac0ddb09b48eb45127825da6485ed2c4be Mon Sep 17 00:00:00 2001
From: wareya <wareya@gmail.com>
Date: Sun, 31 Oct 2021 10:33:28 -0400
Subject: [PATCH 1599/2859] Improve performance, add simpler ripples, add a
 setting, fix nighttime brightness

---
 apps/openmw/mwgui/settingswindow.cpp      |  13 ++
 apps/openmw/mwgui/settingswindow.hpp      |   2 +
 apps/openmw/mwrender/water.cpp            |   2 +
 files/mygui/openmw_settings_window.layout |  10 ++
 files/settings-default.cfg                |   4 +
 files/shaders/water_fragment.glsl         | 147 +++++++++++++++-------
 6 files changed, 135 insertions(+), 43 deletions(-)

diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index 3b4afc852f..00bd064bc7 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -232,6 +232,7 @@ namespace MWGui
         getWidget(mControllerSwitch, "ControllerButton");
         getWidget(mWaterTextureSize, "WaterTextureSize");
         getWidget(mWaterReflectionDetail, "WaterReflectionDetail");
+        getWidget(mWaterRainRippleDetail, "WaterRainRippleDetail");
         getWidget(mLightingMethodButton, "LightingMethodButton");
         getWidget(mLightsResetButton, "LightsResetButton");
         getWidget(mMaxLights, "MaxLights");
@@ -259,6 +260,7 @@ namespace MWGui
 
         mWaterTextureSize->eventComboChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onWaterTextureSizeChanged);
         mWaterReflectionDetail->eventComboChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onWaterReflectionDetailChanged);
+        mWaterRainRippleDetail->eventComboChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onWaterRainRippleDetailChanged);
 
         mLightingMethodButton->eventComboChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onLightingMethodButtonChanged);
         mLightsResetButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onLightsResetButtonClicked);
@@ -309,6 +311,10 @@ namespace MWGui
         waterReflectionDetail = std::min(5, std::max(0, waterReflectionDetail));
         mWaterReflectionDetail->setIndexSelected(waterReflectionDetail);
 
+        int waterRainRippleDetail = Settings::Manager::getInt("rain ripple density", "Water");
+        waterRainRippleDetail = std::min(2, std::max(0, waterRainRippleDetail));
+        mWaterRainRippleDetail->setIndexSelected(waterRainRippleDetail);
+
         updateMaxLightsComboBox(mMaxLights);
 
         mWindowBorderButton->setEnabled(!Settings::Manager::getBool("fullscreen", "Video"));
@@ -397,6 +403,13 @@ namespace MWGui
         apply();
     }
 
+    void SettingsWindow::onWaterRainRippleDetailChanged(MyGUI::ComboBox* _sender, size_t pos)
+    {
+        unsigned int level = std::min((unsigned int)2, (unsigned int)(pos));
+        Settings::Manager::setInt("rain ripple density", "Water", level);
+        apply();
+    }
+
     void SettingsWindow::onLightingMethodButtonChanged(MyGUI::ComboBox* _sender, size_t pos)
     {
         if (pos == MyGUI::ITEM_NONE)
diff --git a/apps/openmw/mwgui/settingswindow.hpp b/apps/openmw/mwgui/settingswindow.hpp
index 9c28733f9a..aae14de373 100644
--- a/apps/openmw/mwgui/settingswindow.hpp
+++ b/apps/openmw/mwgui/settingswindow.hpp
@@ -31,6 +31,7 @@ namespace MWGui
 
             MyGUI::ComboBox* mWaterTextureSize;
             MyGUI::ComboBox* mWaterReflectionDetail;
+            MyGUI::ComboBox* mWaterRainRippleDetail;
 
             MyGUI::ComboBox* mMaxLights;
             MyGUI::ComboBox* mLightingMethodButton;
@@ -55,6 +56,7 @@ namespace MWGui
 
             void onWaterTextureSizeChanged(MyGUI::ComboBox* _sender, size_t pos);
             void onWaterReflectionDetailChanged(MyGUI::ComboBox* _sender, size_t pos);
+            void onWaterRainRippleDetailChanged(MyGUI::ComboBox* _sender, size_t pos);
 
             void onLightingMethodButtonChanged(MyGUI::ComboBox* _sender, size_t pos);
             void onLightsResetButtonClicked(MyGUI::Widget* _sender);
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index 37368b8e7a..45e0864226 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -619,6 +619,8 @@ public:
             stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
         }
         stateset->addUniform(new osg::Uniform("nodePosition", osg::Vec3f(mWater->getPosition())));
+
+        stateset->addUniform(new osg::Uniform("rainRippleDensity", Settings::Manager::getInt("rain ripple density", "Water")));
     }
 
     void apply(osg::StateSet* stateset, osg::NodeVisitor* nv) override
diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index a07d8125d5..8e81764f60 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -454,6 +454,16 @@
                                     <Property key="Caption" value="Reflection shader detail"/>
                                 </Widget>
                             </Widget>
+                            <Widget type="HBox" skin="" position="4 84 350 24">
+                                <Widget type="ComboBox" skin="MW_ComboBox" position="0 0 115 24" align="Left Top" name="WaterRainRippleDetail">
+                                    <Property key="AddItem" value="Simple"/>
+                                    <Property key="AddItem" value="Sparse"/>
+                                    <Property key="AddItem" value="Dense"/>
+                                </Widget>
+                                <Widget type="AutoSizedTextBox" skin="SandText" position="64 4 90 16" align="Left Top">
+                                    <Property key="Caption" value="Rain ripple detail/density"/>
+                                </Widget>
+                            </Widget>
                         </Widget>
 
                     </Widget>
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 27a9544ea6..cc8bc6085d 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -649,6 +649,10 @@ refraction = false
 # Draw objects on water reflections.
 reflection detail = 2
 
+# Whether to use fully detailed raindrop ripples.
+# 2 means more, 1 means less, 0 means less with simpler ring-only ripples (no normal mapping).
+rain ripple density = 2
+
 # Overrides the value in '[Camera] small feature culling pixel size' specifically for water reflection/refraction textures.
 small feature culling pixel size = 20.0
 
diff --git a/files/shaders/water_fragment.glsl b/files/shaders/water_fragment.glsl
index ac12b355ee..dbb40c8da7 100644
--- a/files/shaders/water_fragment.glsl
+++ b/files/shaders/water_fragment.glsl
@@ -55,14 +55,22 @@ const float WOBBLY_SHORE_FADE_DISTANCE = 6200.0;   // fade out wobbly shores to
 
 // ---------------- rain ripples related stuff ---------------------
 
-const float RAIN_RIPPLE_GAPS = 5.0;
-const float RAIN_RIPPLE_RADIUS = 0.1;
+uniform int rainRippleDensity;
 
-vec2 randOffset(vec2 c)
+const float RAIN_RIPPLE_GAPS = 10.0;
+const float RAIN_RIPPLE_RADIUS = 0.2;
+
+float scramble(float x, float z)
+{
+    return fract(pow(x*3.0+1.0, z));
+}
+
+vec2 randOffset(vec2 c, float time)
 {
-  return fract(vec2(
-          c.x * c.y / 8.0 + c.y * 0.3 + c.x * 0.2,
-          c.x * c.y / 14.0 + c.y * 0.5 + c.x * 0.7));
+  time = fract(time/1000.0);
+  c.x *= scramble(scramble(time + c.x/1000.0, 4.0), 3.0) + 1.0;
+  c.y *= scramble(scramble(time + c.y/1000.0, 3.5), 3.0) + 1.0;
+  return fract(c);
 }
 
 float randPhase(vec2 c)
@@ -83,51 +91,97 @@ float blipDerivative(float x)
   return -6.0*x*n*n;
 }
 
-vec2 randomize_center(vec2 i_part, float time)
+const float RAIN_RING_TIME_OFFSET = 1.0/6.0;
+vec4 circle(vec2 coords, vec2 corner, float adjusted_time)
 {
-  time = 1.0 + mod(time, 10000.0); // so things don't get out of hand after long runtimes
-  vec2 center = vec2(0.5,0.5) + (0.5 - RAIN_RIPPLE_RADIUS) * (2.0 * randOffset(i_part*time) - 1.0);
-  return center;
-}
-
-vec4 circle(vec2 coords, vec2 uv, float adjusted_time)
-{
-  vec2 center = randomize_center(floor(uv * RAIN_RIPPLE_GAPS), floor(adjusted_time));
+  vec2 center = vec2(0.5,0.5) + (0.5 - RAIN_RIPPLE_RADIUS) * (2.0 * randOffset(corner, floor(adjusted_time)) - 1.0);
   float phase = fract(adjusted_time);
   vec2 toCenter = coords - center;
+
   float r = RAIN_RIPPLE_RADIUS;
   float d = length(toCenter);
-  float ringfollower = (phase-d/r)*6.0-1.0;
+  float ringfollower = (phase-d/r)/RAIN_RING_TIME_OFFSET-1.0; // -1.0 ~ +1.0 cover the breadth of the ripple's ring
+  if(ringfollower < -1.0 || ringfollower > 1.0)
+    return vec4(0.0);
+
+  if(d > 1.0) // normalize center direction vector, but not for near-center ripples
+    toCenter /= d;
+
+  float height = blip(ringfollower*2.0+0.5); // brighten up outer edge of ring; for fake specularity
+  float range_limit = blip(min(0.0, ringfollower));
   float energy = 1.0-phase;
-  energy = energy*energy;
 
-  vec2 normal = -toCenter*blipDerivative(ringfollower)*5.0;
-  float height = blip(ringfollower);
-  vec4 ret = vec4(normal.x, normal.y, height, height);
-  ret.xyw *= energy;
-  ret.xyz = normalize(ret.xyz);
+  vec2 normal2d = -toCenter*blipDerivative(ringfollower)*5.0;
+  vec3 normal = vec3(normal2d, 0.5);
+  vec4 ret = vec4(normal, height);
+  ret.xyw *= energy*energy;
+  // do energy adjustment here rather than later, so that we can use the w component for fake specularity
+  ret.xyz = normalize(ret.xyz) * energy*range_limit;
+  ret.z *= range_limit;
   return ret;
 }
-
-const float RAIN_RING_TIME_OFFSET = 1/6.0;
 vec4 rain(vec2 uv, float time)
 {
-  vec2 i_part = floor(uv * RAIN_RIPPLE_GAPS);
-  float time_prog = time * 1.2 + randPhase(i_part);
-  vec2 f_part = fract(uv * RAIN_RIPPLE_GAPS);
-  return circle(f_part, uv, time_prog)
-       - circle(f_part, uv, time_prog - RAIN_RING_TIME_OFFSET)     / 4.0
-       + circle(f_part, uv, time_prog - RAIN_RING_TIME_OFFSET*2.0) / 8.0
-       - circle(f_part, uv, time_prog - RAIN_RING_TIME_OFFSET*3.0) / 16.0;
+  uv *= RAIN_RIPPLE_GAPS;
+  vec2 f_part = fract(uv);
+  vec2 i_part = floor(uv);
+  float adjusted_time = time * 1.2 + randPhase(i_part);
+  vec4 a = circle(f_part, i_part, adjusted_time);
+  vec4 b = circle(f_part, i_part, adjusted_time - RAIN_RING_TIME_OFFSET);
+  vec4 c = circle(f_part, i_part, adjusted_time - RAIN_RING_TIME_OFFSET*2.0);
+  vec4 d = circle(f_part, i_part, adjusted_time - RAIN_RING_TIME_OFFSET*3.0);
+  vec4 ret;
+  ret.xy = a.xy - b.xy/2.0 + c.xy/4.0 - d.xy/8.0;
+  // z should always point up
+  ret.z  = a.z  + b.z /2.0 + c.z /4.0 + d.z /8.0;
+  //ret.xyz *= 1.5;
+  // fake specularity looks weird if we use every single ring, also if the inner rings are too bright 
+  ret.w  = (a.w + c.w /8.0)*1.5;
+  return ret;
+}
+vec4 circleSimple(vec2 coords, vec2 corner, float adjusted_time) // only returns fake specularity
+{
+  vec2 center = vec2(0.5,0.5) + (0.5 - RAIN_RIPPLE_RADIUS) * (2.0 * randOffset(corner, floor(adjusted_time)) - 1.0);
+  float phase = fract(adjusted_time);
+  vec2 toCenter = coords - center;
+
+  float r = RAIN_RIPPLE_RADIUS;
+  float d = length(toCenter);
+  float ringfollower = (phase-d/r)/RAIN_RING_TIME_OFFSET-1.0; // -1.0 ~ +1.0 cover the breadth of the ripple's ring
+
+  if(ringfollower < -1.0 || ringfollower > 0.5)
+    return vec4(0.0);
+
+  float energy = 1.0-phase;
+  float height = blip(ringfollower*2.0+0.5)*energy*energy; // fake specularity
+
+  return vec4(0.0, 0.0, 0.0, height);
+}
+vec4 rainSimple(vec2 uv, float time)
+{
+  uv *= RAIN_RIPPLE_GAPS;
+  vec2 f_part = fract(uv);
+  vec2 i_part = floor(uv);
+  float adjusted_time = time * 1.2 + randPhase(i_part);
+  return circleSimple(f_part, i_part, adjusted_time) * 1.5;
 }
-vec4 rainCombined(vec2 uv, float time)     // returns ripple normal in xyz and ripple height in w
+vec2 complex_mult(vec2 a, vec2 b)
 {
-  return
-    rain(uv,time) +
-    rain(uv + vec2(10.5,5.7),time) +
-    rain(uv * 0.75 + vec2(3.7,18.9),time) +
-    rain(uv * 0.9 + vec2(5.7,30.1),time) +
-    rain(uv * 0.8 + vec2(1.2,3.0),time);
+    return vec2(a.x*b.x - a.y*b.y, a.x*b.y + a.y*b.x);
+}
+vec4 rainCombined(vec2 uv, float time) // returns ripple normal in xyz and fake specularity in w
+{
+  if(rainRippleDensity == 0)
+    return rainSimple(uv, time) + rainSimple(complex_mult(uv, vec2(0.4, 0.7)) + vec2( 1.2, 3.0), time);
+  vec4 ret =
+    rain(uv, time)
+  + rain(complex_mult(uv, vec2(0.4, 0.7)) + vec2(1.2, 3.0),time);
+  if(rainRippleDensity == 2)
+    ret +=
+      rain(uv * 0.75 + vec2( 3.7,18.9),time)
+    + rain(uv * 0.9  + vec2( 5.7,30.1),time)
+    + rain(uv * 1.0  + vec2(10.5 ,5.7),time);
+  return ret;
 }
 
 
@@ -217,11 +271,11 @@ void main(void)
     vec4 rainRipple;
 
     if (rainIntensity > 0.01)
-      rainRipple = rainCombined(position.xy / 1000.0,waterTimer) * clamp(rainIntensity,0.0,1.0);
+      rainRipple = rainCombined(position.xy/1000.0, waterTimer) * clamp(rainIntensity, 0.0, 1.0);
     else
       rainRipple = vec4(0.0);
 
-    vec3 rippleAdd = rainRipple.xyz * abs(rainRipple.w) * 10.0;
+    vec3 rippleAdd = rainRipple.xyz * 10.0;
 
     vec2 bigWaves = vec2(BIG_WAVES_X,BIG_WAVES_Y);
     vec2 midWaves = mix(vec2(MID_WAVES_X,MID_WAVES_Y),vec2(MID_WAVES_RAIN_X,MID_WAVES_RAIN_Y),rainIntensity);
@@ -269,7 +323,14 @@ void main(void)
 
     vec4 sunSpec = lcalcSpecular(0);
 
+    // artificial specularity to make rain ripples more noticeable
+    vec3 skyColorEstimate = vec3(max(0.0, mix(-0.3, 1.0, sunFade)));
+    vec3 rainSpecular = abs(rainRipple.w)*mix(skyColorEstimate, vec3(1.0), 0.05)*0.5;
+
 #if REFRACTION
+    // no alpha here, so make sure raindrop ripple specularity gets properly subdued
+    rainSpecular *= clamp(fresnel*6.0 + specular * sunSpec.w, 0.0, 1.0);
+
     // refraction
     vec3 refraction = texture2D(refractionMap, screenCoords - screenCoordsOffset).rgb;
     vec3 rawRefraction = refraction;
@@ -289,7 +350,7 @@ void main(void)
     vec3 scatterColour = mix(SCATTER_COLOUR*vec3(1.0,0.4,0.0), SCATTER_COLOUR, clamp(1.0-exp(-sunHeight*SUN_EXT), 0.0, 1.0));
     vec3 lR = reflect(lVec, lNormal);
     float lightScatter = clamp(dot(lVec,lNormal)*0.7+0.3, 0.0, 1.0) * clamp(dot(lR, vVec)*2.0-1.2, 0.0, 1.0) * SCATTER_AMOUNT * sunFade * clamp(1.0-exp(-sunHeight), 0.0, 1.0);
-    gl_FragData[0].xyz = mix( mix(refraction,  scatterColour,  lightScatter),  reflection,  fresnel) + specular * sunSpec.xyz + vec3(abs(rainRipple.w)) * 0.2;
+    gl_FragData[0].xyz = mix( mix(refraction,  scatterColour,  lightScatter),  reflection,  fresnel) + specular * sunSpec.xyz + rainSpecular;
     gl_FragData[0].w = 1.0;
 
     // wobbly water: hard-fade into refraction texture at extremely low depth, with a wobble based on normal mapping
@@ -302,7 +363,7 @@ void main(void)
     shoreOffset = clamp(mix(shoreOffset, 1.0, clamp(linearDepth / WOBBLY_SHORE_FADE_DISTANCE, 0.0, 1.0)), 0.0, 1.0);
     gl_FragData[0].xyz = mix(rawRefraction, gl_FragData[0].xyz, shoreOffset);
 #else
-    gl_FragData[0].xyz = mix(reflection,  waterColor,  (1.0-fresnel)*0.5) + specular * sunSpec.xyz + vec3(abs(rainRipple.w)) * 0.7;
+    gl_FragData[0].xyz = mix(reflection,  waterColor,  (1.0-fresnel)*0.5) + specular * sunSpec.xyz + rainSpecular;
     gl_FragData[0].w = clamp(fresnel*6.0 + specular * sunSpec.w, 0.0, 1.0);     //clamp(fresnel*2.0 + specular * gl_LightSource[0].specular.w, 0.0, 1.0);
 #endif
 
@@ -312,7 +373,7 @@ void main(void)
 #else
     float fogValue = clamp((linearDepth - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);
 #endif
-    gl_FragData[0].xyz = mix(gl_FragData[0].xyz,  gl_Fog.color.xyz,  fogValue);
+    gl_FragData[0].xyz = mix(gl_FragData[0].xyz, gl_Fog.color.xyz, fogValue);
 
     applyShadowDebugOverlay();
 }

From e7ec89573e437e66b8fc26aaf3fab1903183a20e Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 31 Oct 2021 17:38:06 +0100
Subject: [PATCH 1600/2859] Refactoring. Lua `Callback` is moved from
 apps/openmw/mwlua to components/lua.

---
 apps/openmw/mwlua/asyncbindings.cpp |  5 ++-
 apps/openmw/mwlua/luamanagerimp.cpp | 10 ------
 apps/openmw/mwlua/luamanagerimp.hpp | 22 ++++--------
 components/lua/scriptscontainer.cpp | 52 +++++++++++++++++------------
 components/lua/scriptscontainer.hpp | 26 +++++++++++----
 5 files changed, 59 insertions(+), 56 deletions(-)

diff --git a/apps/openmw/mwlua/asyncbindings.cpp b/apps/openmw/mwlua/asyncbindings.cpp
index d438518452..9bddf75ee4 100644
--- a/apps/openmw/mwlua/asyncbindings.cpp
+++ b/apps/openmw/mwlua/asyncbindings.cpp
@@ -52,13 +52,12 @@ namespace MWLua
         };
         api["callback"] = [](const AsyncPackageId& asyncId, sol::function fn)
         {
-            return Callback{std::move(fn), asyncId.mHiddenData};
+            return LuaUtil::Callback{std::move(fn), asyncId.mHiddenData};
         };
 
         auto initializer = [](sol::table hiddenData)
         {
-            LuaUtil::ScriptsContainer::ScriptId id = hiddenData[LuaUtil::ScriptsContainer::ScriptId::KEY];
-            hiddenData[Callback::SCRIPT_NAME_KEY] = id.toString();
+            LuaUtil::ScriptsContainer::ScriptId id = hiddenData[LuaUtil::ScriptsContainer::sScriptIdKey];
             return AsyncPackageId{id.mContainer, id.mIndex, hiddenData};
         };
         return sol::make_object(context.mLua->sol(), initializer);
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 5695883691..4e47bf7167 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -78,16 +78,6 @@ namespace MWLua
         mInitialized = true;
     }
 
-    void Callback::operator()(sol::object arg) const
-    {
-        if (mHiddenData[LuaUtil::ScriptsContainer::ScriptId::KEY] != sol::nil)
-            LuaUtil::call(mFunc, std::move(arg));
-        else
-        {
-            Log(Debug::Debug) << "Ignored callback to removed script " << mHiddenData.get<std::string>(SCRIPT_NAME_KEY);
-        }
-    }
-
     void LuaManager::update(bool paused, float dt)
     {
         ObjectRegistry* objectRegistry = mWorldView.getObjectRegistry();
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index b9151de685..f5ffe9d258 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -19,19 +19,6 @@
 namespace MWLua
 {
 
-    // Wrapper for a single-argument Lua function.
-    // Holds information about the script the function belongs to.
-    // Needed to prevent callback calls if the script was removed.
-    struct Callback
-    {
-        static constexpr std::string_view SCRIPT_NAME_KEY = "name";
-
-        sol::function mFunc;
-        sol::table mHiddenData;
-
-        void operator()(sol::object arg) const;
-    };
-
     class LuaManager : public MWBase::LuaManager
     {
     public:
@@ -82,13 +69,16 @@ namespace MWLua
         void reloadAllScripts() override;
 
         // Used to call Lua callbacks from C++
-        void queueCallback(Callback callback, sol::object arg) { mQueuedCallbacks.push_back({std::move(callback), std::move(arg)}); }
+        void queueCallback(LuaUtil::Callback callback, sol::object arg)
+        {
+            mQueuedCallbacks.push_back({std::move(callback), std::move(arg)});
+        }
 
         // Wraps Lua callback into an std::function.
         // NOTE: Resulted function is not thread safe. Can not be used while LuaManager::update() or
         //       any other Lua-related function is running.
         template <class Arg>
-        std::function<void(Arg)> wrapLuaCallback(const Callback& c)
+        std::function<void(Arg)> wrapLuaCallback(const LuaUtil::Callback& c)
         {
             return [this, c](Arg arg) { this->queueCallback(c, sol::make_object(c.mFunc.lua_state(), arg)); };
         }
@@ -131,7 +121,7 @@ namespace MWLua
 
         struct CallbackWithData
         {
-            Callback mCallback;
+            LuaUtil::Callback mCallback;
             sol::object mArg;
         };
         std::vector<CallbackWithData> mQueuedCallbacks;
diff --git a/components/lua/scriptscontainer.cpp b/components/lua/scriptscontainer.cpp
index c92116f1d9..517ad5f788 100644
--- a/components/lua/scriptscontainer.cpp
+++ b/components/lua/scriptscontainer.cpp
@@ -15,15 +15,6 @@ namespace LuaUtil
     static constexpr std::string_view HANDLER_LOAD = "onLoad";
     static constexpr std::string_view HANDLER_INTERFACE_OVERRIDE = "onInterfaceOverride";
 
-    std::string ScriptsContainer::ScriptId::toString() const
-    {
-        std::string res = mContainer->mNamePrefix;
-        res.push_back('[');
-        res.append(mPath);
-        res.push_back(']');
-        return res;
-    }
-
     ScriptsContainer::ScriptsContainer(LuaUtil::LuaState* lua, std::string_view namePrefix, ESM::LuaScriptCfg::Flags autoStartMode)
         : mNamePrefix(namePrefix), mLua(*lua), mAutoStartMode(autoStartMode)
     {
@@ -70,11 +61,19 @@ namespace LuaUtil
             return false;  // already present
 
         const std::string& path = scriptPath(scriptId);
+        std::string debugName = mNamePrefix;
+        debugName.push_back('[');
+        debugName.append(path);
+        debugName.push_back(']');
+
+        Script& script = mScripts[scriptId];
+        script.mHiddenData = mLua.newTable();
+        script.mHiddenData[sScriptIdKey] = ScriptId{this, scriptId};
+        script.mHiddenData[sScriptDebugNameKey] = debugName;
+        script.mPath = path;
+
         try
         {
-            Script& script = mScripts[scriptId];
-            script.mHiddenData = mLua.newTable();
-            script.mHiddenData[ScriptId::KEY] = ScriptId{this, scriptId, path};
             sol::object scriptOutput = mLua.runInNewSandbox(path, mNamePrefix, mAPI, script.mHiddenData);
             if (scriptOutput == sol::nil)
                 return true;
@@ -91,7 +90,7 @@ namespace LuaUtil
                 else if (sectionName == INTERFACE)
                     script.mInterface = value.as<sol::table>();
                 else
-                    Log(Debug::Error) << "Not supported section '" << sectionName << "' in " << mNamePrefix << "[" << path << "]";
+                    Log(Debug::Error) << "Not supported section '" << sectionName << "' in " << debugName;
             }
             if (engineHandlers != sol::nil)
             {
@@ -110,8 +109,7 @@ namespace LuaUtil
                     {
                         auto it = mEngineHandlers.find(handlerName);
                         if (it == mEngineHandlers.end())
-                            Log(Debug::Error) << "Not supported handler '" << handlerName
-                                              << "' in " << mNamePrefix << "[" << path << "]";
+                            Log(Debug::Error) << "Not supported handler '" << handlerName << "' in " << debugName;
                         else
                             insertHandler(it->second->mList, scriptId, fn);
                     }
@@ -131,7 +129,7 @@ namespace LuaUtil
 
             if (script.mInterfaceName.empty() == script.mInterface.has_value())
             {
-                Log(Debug::Error) << mNamePrefix << "[" << path << "]: 'interfaceName' should always be used together with 'interface'";
+                Log(Debug::Error) << debugName << ": 'interfaceName' should always be used together with 'interface'";
                 script.mInterfaceName.clear();
                 script.mInterface = sol::nil;
             }
@@ -145,8 +143,9 @@ namespace LuaUtil
         }
         catch (std::exception& e)
         {
+            mScripts[scriptId].mHiddenData[sScriptIdKey] = sol::nil;
             mScripts.erase(scriptId);
-            Log(Debug::Error) << "Can't start " << mNamePrefix << "[" << path << "]; " << e.what();
+            Log(Debug::Error) << "Can't start " << debugName << "; " << e.what();
             return false;
         }
     }
@@ -159,7 +158,7 @@ namespace LuaUtil
         Script& script = scriptIter->second;
         if (script.mInterface)
             removeInterface(scriptId, script);
-        script.mHiddenData[ScriptId::KEY] = sol::nil;
+        script.mHiddenData[sScriptIdKey] = sol::nil;
         mScripts.erase(scriptIter);
         for (auto& [_, handlers] : mEngineHandlers)
             removeHandler(handlers->mList, scriptId);
@@ -329,7 +328,9 @@ namespace LuaUtil
         for (auto& [scriptId, script] : mScripts)
         {
             ESM::LuaScript savedScript;
-            savedScript.mScriptPath = script.mHiddenData.get<ScriptId>(ScriptId::KEY).mPath;
+            // Note: We can not use `scriptPath(scriptId)` here because `save` can be called during
+            // evaluating "reloadlua" command when ScriptsConfiguration is already changed.
+            savedScript.mScriptPath = script.mPath;
             if (script.mOnSave)
             {
                 try
@@ -423,7 +424,7 @@ namespace LuaUtil
     ScriptsContainer::~ScriptsContainer()
     {
         for (auto& [_, script] : mScripts)
-            script.mHiddenData[ScriptId::KEY] = sol::nil;
+            script.mHiddenData[sScriptIdKey] = sol::nil;
     }
 
     // Note: shouldn't be called from destructor because mEngineHandlers has pointers on
@@ -431,7 +432,7 @@ namespace LuaUtil
     void ScriptsContainer::removeAllScripts()
     {
         for (auto& [_, script] : mScripts)
-            script.mHiddenData[ScriptId::KEY] = sol::nil;
+            script.mHiddenData[sScriptIdKey] = sol::nil;
         mScripts.clear();
         for (auto& [_, handlers] : mEngineHandlers)
             handlers->mList.clear();
@@ -529,4 +530,13 @@ namespace LuaUtil
         updateTimerQueue(mHoursTimersQueue, gameHours);
     }
 
+    void Callback::operator()(sol::object arg) const
+    {
+        if (mHiddenData[ScriptsContainer::sScriptIdKey] != sol::nil)
+            LuaUtil::call(mFunc, std::move(arg));
+        else
+            Log(Debug::Debug) << "Ignored callback to the removed script "
+                              << mHiddenData.get<std::string>(ScriptsContainer::sScriptDebugNameKey);
+    }
+
 }
diff --git a/components/lua/scriptscontainer.hpp b/components/lua/scriptscontainer.hpp
index b25c69b5b4..e934868d08 100644
--- a/components/lua/scriptscontainer.hpp
+++ b/components/lua/scriptscontainer.hpp
@@ -60,16 +60,18 @@ namespace LuaUtil
     class ScriptsContainer
     {
     public:
+        // ScriptId of each script is stored with this key in Script::mHiddenData.
+        // Removed from mHiddenData when the script if removed.
+        constexpr static std::string_view sScriptIdKey = "_id";
+
+        // Debug identifier of each script is stored with this key in Script::mHiddenData.
+        // Present in mHiddenData even after removal of the script from ScriptsContainer.
+        constexpr static std::string_view sScriptDebugNameKey = "_name";
+
         struct ScriptId
         {
-            // ScriptId is stored in hidden data (see getHiddenData) with this key.
-            constexpr static std::string_view KEY = "_id";
-
             ScriptsContainer* mContainer;
             int mIndex;  // index in LuaUtil::ScriptsConfiguration
-            std::string mPath;  // path to the script source in VFS
-
-            std::string toString() const;
         };
         using TimeUnit = ESM::LuaTimer::TimeUnit;
 
@@ -192,6 +194,7 @@ namespace LuaUtil
             sol::table mHiddenData;
             std::map<std::string, sol::function> mRegisteredCallbacks;
             std::map<int64_t, sol::function> mTemporaryCallbacks;
+            std::string mPath;
         };
         struct Timer
         {
@@ -239,6 +242,17 @@ namespace LuaUtil
         int64_t mTemporaryCallbackCounter = 0;
     };
 
+    // Wrapper for a single-argument Lua function.
+    // Holds information about the script the function belongs to.
+    // Needed to prevent callback calls if the script was removed.
+    struct Callback
+    {
+        sol::function mFunc;
+        sol::table mHiddenData;  // same object as Script::mHiddenData in ScriptsContainer
+
+        void operator()(sol::object arg) const;
+    };
+
 }
 
 #endif // COMPONENTS_LUA_SCRIPTSCONTAINER_H

From e1378cd290f1f9a0128913703dc753860defe7ff Mon Sep 17 00:00:00 2001
From: wareya <wareya@gmail.com>
Date: Sun, 31 Oct 2021 12:23:36 -0400
Subject: [PATCH 1601/2859] Replace uniform with define

---
 apps/openmw/mwgui/settingswindow.cpp | 12 +++---
 apps/openmw/mwrender/water.cpp       |  5 ++-
 files/settings-default.cfg           |  6 +--
 files/shaders/water_fragment.glsl    | 64 ++++++++++++----------------
 4 files changed, 38 insertions(+), 49 deletions(-)

diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index 00bd064bc7..b4a240af83 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -307,12 +307,10 @@ namespace MWGui
         if (waterTextureSize >= 2048)
             mWaterTextureSize->setIndexSelected(2);
 
-        int waterReflectionDetail = Settings::Manager::getInt("reflection detail", "Water");
-        waterReflectionDetail = std::min(5, std::max(0, waterReflectionDetail));
+        int waterReflectionDetail = std::clamp(Settings::Manager::getInt("reflection detail", "Water"), 0, 5);
         mWaterReflectionDetail->setIndexSelected(waterReflectionDetail);
 
-        int waterRainRippleDetail = Settings::Manager::getInt("rain ripple density", "Water");
-        waterRainRippleDetail = std::min(2, std::max(0, waterRainRippleDetail));
+        int waterRainRippleDetail = std::clamp(Settings::Manager::getInt("rain ripple detail", "Water"), 0, 2);
         mWaterRainRippleDetail->setIndexSelected(waterRainRippleDetail);
 
         updateMaxLightsComboBox(mMaxLights);
@@ -398,15 +396,15 @@ namespace MWGui
 
     void SettingsWindow::onWaterReflectionDetailChanged(MyGUI::ComboBox* _sender, size_t pos)
     {
-        unsigned int level = std::min((unsigned int)5, (unsigned int)pos);
+        unsigned int level = std::min(unsigned int(pos), unsigned int(5));
         Settings::Manager::setInt("reflection detail", "Water", level);
         apply();
     }
 
     void SettingsWindow::onWaterRainRippleDetailChanged(MyGUI::ComboBox* _sender, size_t pos)
     {
-        unsigned int level = std::min((unsigned int)2, (unsigned int)(pos));
-        Settings::Manager::setInt("rain ripple density", "Water", level);
+        unsigned int level = std::min(unsigned int(pos), unsigned int(2));
+        Settings::Manager::setInt("rain ripple detail", "Water", level);
         apply();
     }
 
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index 45e0864226..a84e7d6ee6 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -32,6 +32,7 @@
 #include <components/sceneutil/lightmanager.hpp>
 
 #include <components/misc/constants.hpp>
+#include <components/misc/stringops.hpp>
 
 #include <components/nifosg/controller.hpp>
 
@@ -619,8 +620,6 @@ public:
             stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
         }
         stateset->addUniform(new osg::Uniform("nodePosition", osg::Vec3f(mWater->getPosition())));
-
-        stateset->addUniform(new osg::Uniform("rainRippleDensity", Settings::Manager::getInt("rain ripple density", "Water")));
     }
 
     void apply(osg::StateSet* stateset, osg::NodeVisitor* nv) override
@@ -649,6 +648,8 @@ void Water::createShaderWaterStateSet(osg::Node* node, Reflection* reflection, R
     // use a define map to conditionally compile the shader
     std::map<std::string, std::string> defineMap;
     defineMap.insert(std::make_pair(std::string("refraction_enabled"), std::string(mRefraction ? "1" : "0")));
+    unsigned int rippleDetail = std::clamp(Settings::Manager::getInt("rain ripple detail", "Water"), 0, 2);
+    defineMap.insert(std::make_pair(std::string("rain_ripple_detail"), Misc::StringUtils::format("%u", rippleDetail)));
 
     Shader::ShaderManager& shaderMgr = mResourceSystem->getSceneManager()->getShaderManager();
     osg::ref_ptr<osg::Shader> vertexShader(shaderMgr.getShader("water_vertex.glsl", defineMap, osg::Shader::VERTEX));
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index cc8bc6085d..bac06aee2d 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -649,9 +649,9 @@ refraction = false
 # Draw objects on water reflections.
 reflection detail = 2
 
-# Whether to use fully detailed raindrop ripples.
-# 2 means more, 1 means less, 0 means less with simpler ring-only ripples (no normal mapping).
-rain ripple density = 2
+# Whether to use fully detailed raindrop ripples. (0, 1, 2).
+# 0 = rings only; 1 = sparse, high detail; 2 = dense, high detail
+rain ripple detail = 2
 
 # Overrides the value in '[Camera] small feature culling pixel size' specifically for water reflection/refraction textures.
 small feature culling pixel size = 20.0
diff --git a/files/shaders/water_fragment.glsl b/files/shaders/water_fragment.glsl
index dbb40c8da7..029c5b9749 100644
--- a/files/shaders/water_fragment.glsl
+++ b/files/shaders/water_fragment.glsl
@@ -9,6 +9,7 @@
 #endif
 
 #define REFRACTION @refraction_enabled
+#define RAIN_RIPPLE_DETAIL @rain_ripple_detail
 
 // Inspired by Blender GLSL Water by martinsh ( https://devlog-martinsh.blogspot.de/2012/07/waterundewater-shader-wip.html )
 
@@ -55,8 +56,6 @@ const float WOBBLY_SHORE_FADE_DISTANCE = 6200.0;   // fade out wobbly shores to
 
 // ---------------- rain ripples related stuff ---------------------
 
-uniform int rainRippleDensity;
-
 const float RAIN_RIPPLE_GAPS = 10.0;
 const float RAIN_RIPPLE_RADIUS = 0.2;
 
@@ -92,6 +91,7 @@ float blipDerivative(float x)
 }
 
 const float RAIN_RING_TIME_OFFSET = 1.0/6.0;
+
 vec4 circle(vec2 coords, vec2 corner, float adjusted_time)
 {
   vec2 center = vec2(0.5,0.5) + (0.5 - RAIN_RIPPLE_RADIUS) * (2.0 * randOffset(corner, floor(adjusted_time)) - 1.0);
@@ -101,6 +101,9 @@ vec4 circle(vec2 coords, vec2 corner, float adjusted_time)
   float r = RAIN_RIPPLE_RADIUS;
   float d = length(toCenter);
   float ringfollower = (phase-d/r)/RAIN_RING_TIME_OFFSET-1.0; // -1.0 ~ +1.0 cover the breadth of the ripple's ring
+
+#if RAIN_RIPPLE_DETAIL > 0
+// normal mapped ripples
   if(ringfollower < -1.0 || ringfollower > 1.0)
     return vec4(0.0);
 
@@ -119,6 +122,16 @@ vec4 circle(vec2 coords, vec2 corner, float adjusted_time)
   ret.xyz = normalize(ret.xyz) * energy*range_limit;
   ret.z *= range_limit;
   return ret;
+#else
+// ring-only ripples
+  if(ringfollower < -1.0 || ringfollower > 0.5)
+    return vec4(0.0);
+
+  float energy = 1.0-phase;
+  float height = blip(ringfollower*2.0+0.5)*energy*energy; // fake specularity
+
+  return vec4(0.0, 0.0, 0.0, height);
+#endif
 }
 vec4 rain(vec2 uv, float time)
 {
@@ -126,6 +139,7 @@ vec4 rain(vec2 uv, float time)
   vec2 f_part = fract(uv);
   vec2 i_part = floor(uv);
   float adjusted_time = time * 1.2 + randPhase(i_part);
+#if RAIN_RIPPLE_DETAIL > 0
   vec4 a = circle(f_part, i_part, adjusted_time);
   vec4 b = circle(f_part, i_part, adjusted_time - RAIN_RING_TIME_OFFSET);
   vec4 c = circle(f_part, i_part, adjusted_time - RAIN_RING_TIME_OFFSET*2.0);
@@ -138,50 +152,26 @@ vec4 rain(vec2 uv, float time)
   // fake specularity looks weird if we use every single ring, also if the inner rings are too bright 
   ret.w  = (a.w + c.w /8.0)*1.5;
   return ret;
+#else
+  return circle(f_part, i_part, adjusted_time) * 1.5;
+#endif
 }
-vec4 circleSimple(vec2 coords, vec2 corner, float adjusted_time) // only returns fake specularity
-{
-  vec2 center = vec2(0.5,0.5) + (0.5 - RAIN_RIPPLE_RADIUS) * (2.0 * randOffset(corner, floor(adjusted_time)) - 1.0);
-  float phase = fract(adjusted_time);
-  vec2 toCenter = coords - center;
 
-  float r = RAIN_RIPPLE_RADIUS;
-  float d = length(toCenter);
-  float ringfollower = (phase-d/r)/RAIN_RING_TIME_OFFSET-1.0; // -1.0 ~ +1.0 cover the breadth of the ripple's ring
-
-  if(ringfollower < -1.0 || ringfollower > 0.5)
-    return vec4(0.0);
-
-  float energy = 1.0-phase;
-  float height = blip(ringfollower*2.0+0.5)*energy*energy; // fake specularity
-
-  return vec4(0.0, 0.0, 0.0, height);
-}
-vec4 rainSimple(vec2 uv, float time)
-{
-  uv *= RAIN_RIPPLE_GAPS;
-  vec2 f_part = fract(uv);
-  vec2 i_part = floor(uv);
-  float adjusted_time = time * 1.2 + randPhase(i_part);
-  return circleSimple(f_part, i_part, adjusted_time) * 1.5;
-}
 vec2 complex_mult(vec2 a, vec2 b)
 {
     return vec2(a.x*b.x - a.y*b.y, a.x*b.y + a.y*b.x);
 }
 vec4 rainCombined(vec2 uv, float time) // returns ripple normal in xyz and fake specularity in w
 {
-  if(rainRippleDensity == 0)
-    return rainSimple(uv, time) + rainSimple(complex_mult(uv, vec2(0.4, 0.7)) + vec2( 1.2, 3.0), time);
-  vec4 ret =
+  return
     rain(uv, time)
-  + rain(complex_mult(uv, vec2(0.4, 0.7)) + vec2(1.2, 3.0),time);
-  if(rainRippleDensity == 2)
-    ret +=
-      rain(uv * 0.75 + vec2( 3.7,18.9),time)
-    + rain(uv * 0.9  + vec2( 5.7,30.1),time)
-    + rain(uv * 1.0  + vec2(10.5 ,5.7),time);
-  return ret;
+  + rain(complex_mult(uv, vec2(0.4, 0.7)) + vec2(1.2, 3.0),time)
+    #if RAIN_RIPPLE_DETAIL == 2
+      + rain(uv * 0.75 + vec2( 3.7,18.9),time)
+      + rain(uv * 0.9  + vec2( 5.7,30.1),time)
+      + rain(uv * 1.0  + vec2(10.5 ,5.7),time)
+    #endif
+  ;
 }
 
 

From 92bdd44e58941e2e681fde4f590416db6ce239e1 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 31 Oct 2021 20:25:37 +0100
Subject: [PATCH 1602/2859] Allow creatures to use torches

---
 CHANGELOG.md                       |  1 +
 apps/openmw/mwmechanics/actors.cpp | 10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09a574338a..11e4e0ae26 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -65,6 +65,7 @@
     Bug #6326: Detect Enchantment/Key should detect items in unresolved containers
     Bug #6347: PlaceItem/PlaceItemCell/PlaceAt should work with levelled creatures
     Bug #6363: Some scripts in Morrowland fail to work
+    Bug #6376: Creatures should be able to use torches
     Feature #890: OpenMW-CS: Column filtering
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
     Feature #2780: A way to see current OpenMW version in the console
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 0af65844f9..cb4f8237e7 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1496,15 +1496,13 @@ namespace MWMechanics
                         stats.getAiSequence().execute(iter->first, *ctrl, duration, /*outOfRange*/true);
                     }
 
-                    if(iter->first.getClass().isNpc())
+                    if(inProcessingRange && iter->first.getClass().isNpc())
                     {
                         // We can not update drowning state for actors outside of AI distance - they can not resurface to breathe
-                        if (inProcessingRange)
-                            updateDrowning(iter->first, duration, ctrl->isKnockedOut(), isPlayer);
-
-                        if (timerUpdateEquippedLight == 0)
-                            updateEquippedLight(iter->first, updateEquippedLightInterval, showTorches);
+                        updateDrowning(iter->first, duration, ctrl->isKnockedOut(), isPlayer);
                     }
+                    if(timerUpdateEquippedLight == 0 && iter->first.getClass().hasInventoryStore(iter->first))
+                        updateEquippedLight(iter->first, updateEquippedLightInterval, showTorches);
 
                     if (luaControls && isConscious(iter->first))
                     {

From 838fc634c6303815373326ca92573928aca87aa3 Mon Sep 17 00:00:00 2001
From: wareya <wareya@gmail.com>
Date: Sun, 31 Oct 2021 15:32:24 -0400
Subject: [PATCH 1603/2859] address review comments

---
 apps/openmw/mwgui/settingswindow.cpp | 4 ++--
 apps/openmw/mwrender/water.cpp       | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index b4a240af83..7e848f7442 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -396,14 +396,14 @@ namespace MWGui
 
     void SettingsWindow::onWaterReflectionDetailChanged(MyGUI::ComboBox* _sender, size_t pos)
     {
-        unsigned int level = std::min(unsigned int(pos), unsigned int(5));
+        unsigned int level = unsigned int(std::min<size_t>(pos, 5));
         Settings::Manager::setInt("reflection detail", "Water", level);
         apply();
     }
 
     void SettingsWindow::onWaterRainRippleDetailChanged(MyGUI::ComboBox* _sender, size_t pos)
     {
-        unsigned int level = std::min(unsigned int(pos), unsigned int(2));
+        unsigned int level = unsigned int(std::min<size_t>(pos, 2));
         Settings::Manager::setInt("rain ripple detail", "Water", level);
         apply();
     }
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index a84e7d6ee6..5ae71b9979 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -647,9 +647,10 @@ void Water::createShaderWaterStateSet(osg::Node* node, Reflection* reflection, R
 {
     // use a define map to conditionally compile the shader
     std::map<std::string, std::string> defineMap;
-    defineMap.insert(std::make_pair(std::string("refraction_enabled"), std::string(mRefraction ? "1" : "0")));
-    unsigned int rippleDetail = std::clamp(Settings::Manager::getInt("rain ripple detail", "Water"), 0, 2);
-    defineMap.insert(std::make_pair(std::string("rain_ripple_detail"), Misc::StringUtils::format("%u", rippleDetail)));
+    defineMap["refraction_enabled"] = std::string(mRefraction ? "1" : "0");
+    const auto rippleDetail = std::clamp(Settings::Manager::getInt("rain ripple detail", "Water"), 0, 2);
+    defineMap["rain_ripple_detail"] = std::to_string(rippleDetail);
+
 
     Shader::ShaderManager& shaderMgr = mResourceSystem->getSceneManager()->getShaderManager();
     osg::ref_ptr<osg::Shader> vertexShader(shaderMgr.getShader("water_vertex.glsl", defineMap, osg::Shader::VERTEX));

From 9b030e174fde3a65706ba252716eca7119efa86b Mon Sep 17 00:00:00 2001
From: wareya <wareya@gmail.com>
Date: Sun, 31 Oct 2021 15:52:54 -0400
Subject: [PATCH 1604/2859] removing this part was a mistake, made the ripples
 more repetitive

---
 files/shaders/water_fragment.glsl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/files/shaders/water_fragment.glsl b/files/shaders/water_fragment.glsl
index 029c5b9749..5d42a2bdb1 100644
--- a/files/shaders/water_fragment.glsl
+++ b/files/shaders/water_fragment.glsl
@@ -67,6 +67,8 @@ float scramble(float x, float z)
 vec2 randOffset(vec2 c, float time)
 {
   time = fract(time/1000.0);
+  c = vec2(c.x * c.y /  8.0 + c.y * 0.3 + c.x * 0.2,
+           c.x * c.y / 14.0 + c.y * 0.5 + c.x * 0.7);
   c.x *= scramble(scramble(time + c.x/1000.0, 4.0), 3.0) + 1.0;
   c.y *= scramble(scramble(time + c.y/1000.0, 3.5), 3.0) + 1.0;
   return fract(c);

From 4f10d5d544bce22c11937653565260ac6bcaec81 Mon Sep 17 00:00:00 2001
From: wareya <wareya@gmail.com>
Date: Sun, 31 Oct 2021 16:13:51 -0400
Subject: [PATCH 1605/2859] update docs

---
 docs/source/reference/modding/settings/water.rst | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docs/source/reference/modding/settings/water.rst b/docs/source/reference/modding/settings/water.rst
index b3a6f8c1f2..fb3b755c6f 100644
--- a/docs/source/reference/modding/settings/water.rst
+++ b/docs/source/reference/modding/settings/water.rst
@@ -77,6 +77,21 @@ Controls what kinds of things are rendered in water reflections.
 In interiors the lowest level is 2.
 This setting can be changed ingame with the "Reflection shader detail" dropdown under the Water tab of the Video panel in the Options menu.
 
+rain ripple detail
+-----------------
+
+:Type:		integer
+:Range:		0, 1, 2
+:Default:	2
+
+Controls how detailed the raindrop ripples on water are.
+
+0: single, non-normal-mapped ring per raindrop
+1: normal-mapped raindrops, with multiple rings
+2: same as 1, but with a greater number of raindrops
+
+This setting can be changed ingame with the "Rain ripple detail/density" dropdown under the Water tab of the Video panel in the Options menu.
+
 small feature culling pixel size
 --------------------------------
 

From 221f6f134ded2f4148db58874fe904305c59bed3 Mon Sep 17 00:00:00 2001
From: wareya <wareya@gmail.com>
Date: Sun, 31 Oct 2021 17:48:03 -0400
Subject: [PATCH 1606/2859] gcc and clang don't like this

---
 apps/openmw/mwgui/settingswindow.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index 7e848f7442..28143c1af4 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -396,14 +396,14 @@ namespace MWGui
 
     void SettingsWindow::onWaterReflectionDetailChanged(MyGUI::ComboBox* _sender, size_t pos)
     {
-        unsigned int level = unsigned int(std::min<size_t>(pos, 5));
+        unsigned int level = static_cast<unsigned int>(std::min<size_t>(pos, 5));
         Settings::Manager::setInt("reflection detail", "Water", level);
         apply();
     }
 
     void SettingsWindow::onWaterRainRippleDetailChanged(MyGUI::ComboBox* _sender, size_t pos)
     {
-        unsigned int level = unsigned int(std::min<size_t>(pos, 2));
+        unsigned int level = static_cast<unsigned int>(std::min<size_t>(pos, 2));
         Settings::Manager::setInt("rain ripple detail", "Water", level);
         apply();
     }

From 8c21b0b503386f583e57e2ce40e9cd5e64a0299b Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Mon, 1 Nov 2021 12:44:36 +0100
Subject: [PATCH 1607/2859] Apply waterwalking even when we skip simulation.

This chunk was supposed to be part of !1324 but somehow got stuck staged in my tree.
---
 apps/openmw/mwphysics/mtphysics.cpp     |  6 ++++--
 apps/openmw/mwphysics/physicssystem.cpp | 18 ------------------
 apps/openmw/mwphysics/physicssystem.hpp |  1 -
 3 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index a989493f4d..5c49dee297 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -123,8 +123,10 @@ namespace
                 frameData.mPosition = actor->getPosition();
                 if (frameData.mWaterCollision && frameData.mPosition.z() < frameData.mWaterlevel && actor->canMoveToWaterSurface(frameData.mWaterlevel, mCollisionWorld))
                 {
-                    frameData.mPosition.z() = frameData.mWaterlevel;
-                    MWBase::Environment::get().getWorld()->moveObject(actor->getPtr(), frameData.mPosition, false);
+                    const auto offset = osg::Vec3f(0, 0, frameData.mWaterlevel - frameData.mPosition.z());
+                    MWBase::Environment::get().getWorld()->moveObjectBy(actor->getPtr(), offset);
+                    actor->applyOffsetChange();
+                    frameData.mPosition = actor->getPosition();
                 }
                 frameData.mOldHeight = frameData.mPosition.z();
                 const auto rotation = actor->getPtr().getRefData().getPosition().asRotationVec3();
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index af6dc109ed..a64ee70b96 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -945,24 +945,6 @@ namespace MWPhysics
     {
     }
 
-    void ActorFrameData::updatePosition(Actor& actor, btCollisionWorld* world)
-    {
-        actor.applyOffsetChange();
-        mPosition = actor.getPosition();
-        if (mWaterCollision && mPosition.z() < mWaterlevel && actor.canMoveToWaterSurface(mWaterlevel, world))
-        {
-            MWBase::Environment::get().getWorld()->moveObjectBy(actor.getPtr(), osg::Vec3f(0, 0, mWaterlevel - mPosition.z()));
-            actor.applyOffsetChange();
-            mPosition = actor.getPosition();
-        }
-        mOldHeight = mPosition.z();
-        const auto rotation = actor.getPtr().getRefData().getPosition().asRotationVec3();
-        mRotation = osg::Vec2f(rotation.x(), rotation.z());
-        mInertia = actor.getInertialForce();
-        mStuckFrames = actor.getStuckFrames();
-        mLastStuckPosition = actor.getLastStuckPosition();
-    }
-
     ProjectileFrameData::ProjectileFrameData(Projectile& projectile)
         : mPosition(projectile.getPosition())
         , mMovement(projectile.velocity())
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index a025f1cc8b..c31bbfbf65 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -76,7 +76,6 @@ namespace MWPhysics
     struct ActorFrameData
     {
         ActorFrameData(Actor& actor, bool inert, bool waterCollision, float slowFall, float waterlevel);
-        void  updatePosition(Actor& actor, btCollisionWorld* world);
         osg::Vec3f mPosition;
         osg::Vec3f mInertia;
         const btCollisionObject* mStandingOn;

From 4461366761207671b67b806d2320f04877568c33 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Mon, 1 Nov 2021 09:26:50 -0700
Subject: [PATCH 1608/2859] settings update and launcher option

---
 CHANGELOG.md                                  |  1 +
 apps/launcher/advancedpage.cpp                |  2 ++
 components/shader/shadervisitor.cpp           | 29 ++++++++++++-------
 .../reference/modding/settings/shaders.rst    | 16 +++++-----
 files/settings-default.cfg                    |  3 +-
 files/ui/advancedpage.ui                      | 10 +++++++
 6 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a486046e8..65110a0677 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -78,6 +78,7 @@
     Feature #6017: Separate persistent and temporary cell references when saving
     Feature #6032: Reverse-z depth buffer
     Feature #6078: First person should not clear depth buffer
+    Feature #6128: Soft Particles
     Feature #6161: Refactor Sky to use shaders and GLES/GL3 friendly
     Feature #6162: Refactor GUI to use shaders and to be GLES and GL3+ friendly
     Feature #6199: Support FBO Rendering
diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index 2c33992ac3..8d1ab58b79 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -117,6 +117,7 @@ bool Launcher::AdvancedPage::loadSettings()
         loadSettingBool(autoUseTerrainSpecularMapsCheckBox, "auto use terrain specular maps", "Shaders");
         loadSettingBool(bumpMapLocalLightingCheckBox, "apply lighting to environment maps", "Shaders");
         loadSettingBool(radialFogCheckBox, "radial fog", "Shaders");
+        loadSettingBool(softParticlesCheckBox, "soft particles", "Shaders");
         loadSettingBool(magicItemAnimationsCheckBox, "use magic item animations", "Game");
         connect(animSourcesCheckBox, SIGNAL(toggled(bool)), this, SLOT(slotAnimSourcesToggled(bool)));
         loadSettingBool(animSourcesCheckBox, "use additional anim sources", "Game");
@@ -270,6 +271,7 @@ void Launcher::AdvancedPage::saveSettings()
         saveSettingBool(autoUseTerrainSpecularMapsCheckBox, "auto use terrain specular maps", "Shaders");
         saveSettingBool(bumpMapLocalLightingCheckBox, "apply lighting to environment maps", "Shaders");
         saveSettingBool(radialFogCheckBox, "radial fog", "Shaders");
+        saveSettingBool(softParticlesCheckBox, "soft particles", "Shaders");
         saveSettingBool(magicItemAnimationsCheckBox, "use magic item animations", "Game");
         saveSettingBool(animSourcesCheckBox, "use additional anim sources", "Game");
         saveSettingBool(weaponSheathingCheckBox, "weapon sheathing", "Game");
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 2c673200f7..1e9acdb35f 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -557,19 +557,26 @@ namespace Shader
             updateAddedState(*writableUserData, addedState);
         }
 
-        if (auto partsys = dynamic_cast<osgParticle::ParticleSystem*>(&node))
+        bool softParticles = false;
+
+        if (mOpaqueDepthTex)
         {
-            defineMap["softParticles"] = "1";
-
-            auto depth = SceneUtil::createDepth();
-            depth->setWriteMask(false);
-            writableStateSet->setAttributeAndModes(depth, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
-            writableStateSet->addUniform(new osg::Uniform("particleSize", partsys->getDefaultParticleTemplate().getSizeRange().maximum));
-            writableStateSet->addUniform(new osg::Uniform("opaqueDepthTex", 2));
-            writableStateSet->setTextureAttributeAndModes(2, mOpaqueDepthTex, osg::StateAttribute::ON);
+            auto partsys = dynamic_cast<osgParticle::ParticleSystem*>(&node);
+
+            if (partsys)
+            {
+                softParticles = true;
+
+                auto depth = SceneUtil::createDepth();
+                depth->setWriteMask(false);
+                writableStateSet->setAttributeAndModes(depth, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+                writableStateSet->addUniform(new osg::Uniform("particleSize", partsys->getDefaultParticleTemplate().getSizeRange().maximum));
+                writableStateSet->addUniform(new osg::Uniform("opaqueDepthTex", 2));
+                writableStateSet->setTextureAttributeAndModes(2, mOpaqueDepthTex, osg::StateAttribute::ON);
+            }
         }
-        else
-            defineMap["softParticles"] = "0";
+
+        defineMap["softParticles"] = softParticles ? "1" : "0";
 
         std::string shaderPrefix;
         if (!node.getUserValue("shaderPrefix", shaderPrefix))
diff --git a/docs/source/reference/modding/settings/shaders.rst b/docs/source/reference/modding/settings/shaders.rst
index c62c44e936..b9d8cfe1b9 100644
--- a/docs/source/reference/modding/settings/shaders.rst
+++ b/docs/source/reference/modding/settings/shaders.rst
@@ -241,7 +241,7 @@ lighting` is on.
 This setting has no effect if :ref:`lighting method` is 'legacy'.
 
 minimum interior brightness
-------------------------
+---------------------------
 
 :Type:		float
 :Range:		0.0-1.0
@@ -260,7 +260,7 @@ aforementioned changes in visuals.
 This setting has no effect if :ref:`lighting method` is 'legacy'.
 
 antialias alpha test
----------------------------------------
+--------------------
 
 :Type:		boolean
 :Range:		True/False
@@ -271,14 +271,14 @@ This allows MSAA to work with alpha-tested meshes, producing better-looking edge
 When MSAA is off, this setting will have no visible effect, but might have a performance cost.
 
 soft particles
-------------------------
+--------------
 
 :Type:		boolean
 :Range:		True/False
 :Default:	False
 
-Enables soft particles for almost all particle effects, excluding precipitation.
-This technique softens the intersection between individual particles and other
-opaque geometry by blending between them. Note, this relies on overriding
-specific properties of particle systems that potentially differ from the source
-content, this setting may change the look of some particle systems.
+Enables soft particles for particle effects. This technique softens the
+intersection between individual particles and other opaque geometry by blending
+between them. Note, this relies on overriding specific properties of particle
+systems that potentially differ from the source content, this setting may change
+the look of some particle systems.
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 2df6eaa0a7..90e9323db7 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -494,7 +494,8 @@ minimum interior brightness = 0.08
 # When MSAA is off, this setting will have no visible effect, but might have a performance cost.
 antialias alpha test = false
 
-soft particles = true
+# Soften intersection of blended particle systems with opaque geometry
+soft particles = false
 
 [Input]
 
diff --git a/files/ui/advancedpage.ui b/files/ui/advancedpage.ui
index 7964399319..0e80f02700 100644
--- a/files/ui/advancedpage.ui
+++ b/files/ui/advancedpage.ui
@@ -444,6 +444,16 @@
                 </property>
                </widget>
               </item>
+              <item row="3" column="0">
+               <widget class="QCheckBox" name="softParticlesCheckBox">
+                <property name="toolTip">
+                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enables soft particles for particle effects. This technique softens the intersection between individual particles and other opaque geometry by blending between them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                </property>
+                <property name="text">
+                 <string>Soft Particles</string>
+                </property>
+               </widget>
+              </item>
              </layout>
             </widget>
            </item>

From 3660d5cc4cf6d2984d203fe459a63d6d690f8bf0 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 1 Nov 2021 19:33:29 +0100
Subject: [PATCH 1609/2859] Reduce code duplication in getting the shield model

---
 apps/openmw/mwrender/actoranimation.cpp    | 38 +++++++++++++-------
 apps/openmw/mwrender/actoranimation.hpp    |  3 +-
 apps/openmw/mwrender/creatureanimation.cpp | 15 +-------
 apps/openmw/mwrender/npcanimation.cpp      | 42 ++--------------------
 apps/openmw/mwrender/npcanimation.hpp      |  2 +-
 5 files changed, 32 insertions(+), 68 deletions(-)

diff --git a/apps/openmw/mwrender/actoranimation.cpp b/apps/openmw/mwrender/actoranimation.cpp
index 24ca0aa4f3..e820eb5672 100644
--- a/apps/openmw/mwrender/actoranimation.cpp
+++ b/apps/openmw/mwrender/actoranimation.cpp
@@ -84,30 +84,42 @@ PartHolderPtr ActorAnimation::attachMesh(const std::string& model, const std::st
     return PartHolderPtr(new PartHolder(instance));
 }
 
-std::string ActorAnimation::getShieldMesh(const MWWorld::ConstPtr& shield) const
+std::string ActorAnimation::getShieldMesh(const MWWorld::ConstPtr& shield, bool female) const
 {
-    std::string mesh = shield.getClass().getModel(shield);
     const ESM::Armor *armor = shield.get<ESM::Armor>()->mBase;
     const std::vector<ESM::PartReference>& bodyparts = armor->mParts.mParts;
+    // Try to recover the body part model, use ground model as a fallback otherwise.
     if (!bodyparts.empty())
     {
         const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
         const MWWorld::Store<ESM::BodyPart> &partStore = store.get<ESM::BodyPart>();
-
-        // Try to get shield model from bodyparts first, with ground model as fallback
         for (const auto& part : bodyparts)
         {
-            // Assume all creatures use the male mesh.
-            if (part.mPart != ESM::PRT_Shield || part.mMale.empty())
+            if (part.mPart != ESM::PRT_Shield)
                 continue;
-            const ESM::BodyPart *bodypart = partStore.search(part.mMale);
-            if (bodypart && bodypart->mData.mType == ESM::BodyPart::MT_Armor && !bodypart->mModel.empty())
+
+            std::string bodypartName;
+            if (female && !part.mFemale.empty())
+                bodypartName = part.mFemale;
+            else if (!part.mMale.empty())
+                bodypartName = part.mMale;
+
+            if (!bodypartName.empty())
             {
-                mesh = "meshes\\" + bodypart->mModel;
-                break;
+                const ESM::BodyPart *bodypart = partStore.search(bodypartName);
+                if (bodypart == nullptr || bodypart->mData.mType != ESM::BodyPart::MT_Armor)
+                    return std::string();
+                if (!bodypart->mModel.empty())
+                    return "meshes\\" + bodypart->mModel;
             }
         }
     }
+    return shield.getClass().getModel(shield);
+}
+
+std::string ActorAnimation::getSheathedShieldMesh(const MWWorld::ConstPtr& shield) const
+{
+    std::string mesh = getShieldMesh(shield, false);
 
     if (mesh.empty())
         return mesh;
@@ -143,7 +155,7 @@ bool ActorAnimation::updateCarriedLeftVisible(const int weaptype) const
                 const MWWorld::InventoryStore& inv = cls.getInventoryStore(mPtr);
                 const MWWorld::ConstContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
                 const MWWorld::ConstContainerStoreIterator shield = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
-                if (shield != inv.end() && shield->getType() == ESM::Armor::sRecordId && !getShieldMesh(*shield).empty())
+                if (shield != inv.end() && shield->getType() == ESM::Armor::sRecordId && !getSheathedShieldMesh(*shield).empty())
                 {
                     if(stats.getDrawState() != MWMechanics::DrawState_Weapon)
                         return false;
@@ -201,7 +213,7 @@ void ActorAnimation::updateHolsteredShield(bool showCarriedLeft)
             return;
     }
 
-    std::string mesh = getShieldMesh(*shield);
+    std::string mesh = getSheathedShieldMesh(*shield);
     if (mesh.empty())
         return;
 
@@ -255,7 +267,7 @@ bool ActorAnimation::useShieldAnimations() const
     const MWWorld::ConstContainerStoreIterator shield = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
     if (weapon != inv.end() && shield != inv.end() &&
         shield->getType() == ESM::Armor::sRecordId &&
-        !getShieldMesh(*shield).empty())
+        !getSheathedShieldMesh(*shield).empty())
     {
         auto type = weapon->getType();
         if(type == ESM::Weapon::sRecordId)
diff --git a/apps/openmw/mwrender/actoranimation.hpp b/apps/openmw/mwrender/actoranimation.hpp
index 61ad1ca235..c68ce4dfe2 100644
--- a/apps/openmw/mwrender/actoranimation.hpp
+++ b/apps/openmw/mwrender/actoranimation.hpp
@@ -45,7 +45,8 @@ class ActorAnimation : public Animation, public MWWorld::ContainerStoreListener
         virtual void updateHolsteredWeapon(bool showHolsteredWeapons);
         virtual void updateHolsteredShield(bool showCarriedLeft);
         virtual void updateQuiver();
-        virtual std::string getShieldMesh(const MWWorld::ConstPtr& shield) const;
+        std::string getShieldMesh(const MWWorld::ConstPtr& shield, bool female) const;
+        virtual std::string getSheathedShieldMesh(const MWWorld::ConstPtr& shield) const;
         virtual std::string getHolsteredWeaponBoneName(const MWWorld::ConstPtr& weapon);
         virtual PartHolderPtr attachMesh(const std::string& model, const std::string& bonename, bool enchantedGlow, osg::Vec4f* glowColor);
         virtual PartHolderPtr attachMesh(const std::string& model, const std::string& bonename)
diff --git a/apps/openmw/mwrender/creatureanimation.cpp b/apps/openmw/mwrender/creatureanimation.cpp
index 657179db75..7dea8173b6 100644
--- a/apps/openmw/mwrender/creatureanimation.cpp
+++ b/apps/openmw/mwrender/creatureanimation.cpp
@@ -139,20 +139,7 @@ void CreatureWeaponAnimation::updatePart(PartHolderPtr& scene, int slot)
         bonename = "Shield Bone";
         if (item.getType() == ESM::Armor::sRecordId)
         {
-            // Shield body part model should be used if possible.
-            const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
-            for (const auto& part : item.get<ESM::Armor>()->mBase->mParts.mParts)
-            {
-                // Assume all creatures use the male mesh.
-                if (part.mPart != ESM::PRT_Shield || part.mMale.empty())
-                    continue;
-                const ESM::BodyPart *bodypart = store.get<ESM::BodyPart>().search(part.mMale);
-                if (bodypart && bodypart->mData.mType == ESM::BodyPart::MT_Armor && !bodypart->mModel.empty())
-                {
-                    itemModel = "meshes\\" + bodypart->mModel;
-                    break;
-                }
-            }
+            itemModel = getShieldMesh(item, false);
         }
     }
 
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index f3d026ad3c..16cf4cee69 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -82,34 +82,6 @@ std::string getVampireHead(const std::string& race, bool female)
     return "meshes\\" + bodyPart->mModel;
 }
 
-std::string getShieldBodypartMesh(const std::vector<ESM::PartReference>& bodyparts, bool female)
-{
-    const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
-    const MWWorld::Store<ESM::BodyPart> &partStore = store.get<ESM::BodyPart>();
-    for (const auto& part : bodyparts)
-    {
-        if (part.mPart != ESM::PRT_Shield)
-            continue;
-
-        std::string bodypartName;
-        if (female && !part.mFemale.empty())
-            bodypartName = part.mFemale;
-        else if (!part.mMale.empty())
-            bodypartName = part.mMale;
-
-        if (!bodypartName.empty())
-        {
-            const ESM::BodyPart *bodypart = partStore.search(bodypartName);
-            if (bodypart == nullptr || bodypart->mData.mType != ESM::BodyPart::MT_Armor)
-                return std::string();
-            if (!bodypart->mModel.empty())
-                return "meshes\\" + bodypart->mModel;
-        }
-    }
-
-    return std::string();
-}
-
 }
 
 
@@ -547,14 +519,9 @@ void NpcAnimation::updateNpcBase()
     mWeaponAnimationTime->updateStartTime();
 }
 
-std::string NpcAnimation::getShieldMesh(const MWWorld::ConstPtr& shield) const
+std::string NpcAnimation::getSheathedShieldMesh(const MWWorld::ConstPtr& shield) const
 {
-    std::string mesh = shield.getClass().getModel(shield);
-    const ESM::Armor *armor = shield.get<ESM::Armor>()->mBase;
-    const std::vector<ESM::PartReference>& bodyparts = armor->mParts.mParts;
-    // Try to recover the body part model, use ground model as a fallback otherwise.
-    if (!bodyparts.empty())
-        mesh = getShieldBodypartMesh(bodyparts, !mNpc->isMale());
+    std::string mesh = getShieldMesh(shield, !mNpc->isMale());
 
     if (mesh.empty())
         return std::string();
@@ -1011,10 +978,7 @@ void NpcAnimation::showCarriedLeft(bool show)
         // For shields we must try to use the body part model
         if (iter->getType() == ESM::Armor::sRecordId)
         {
-            const ESM::Armor *armor = iter->get<ESM::Armor>()->mBase;
-            const std::vector<ESM::PartReference>& bodyparts = armor->mParts.mParts;
-            if (!bodyparts.empty())
-                mesh = getShieldBodypartMesh(bodyparts, !mNpc->isMale());
+            mesh = getShieldMesh(*iter, !mNpc->isMale());
         }
         if (mesh.empty() || addOrReplaceIndividualPart(ESM::PRT_Shield, MWWorld::InventoryStore::Slot_CarriedLeft, 1,
                                         mesh, !iter->getClass().getEnchantment(*iter).empty(), &glowColor))
diff --git a/apps/openmw/mwrender/npcanimation.hpp b/apps/openmw/mwrender/npcanimation.hpp
index b511a52f37..d0d9a26fdc 100644
--- a/apps/openmw/mwrender/npcanimation.hpp
+++ b/apps/openmw/mwrender/npcanimation.hpp
@@ -105,7 +105,7 @@ private:
 protected:
     void addControllers() override;
     bool isArrowAttached() const override;
-    std::string getShieldMesh(const MWWorld::ConstPtr& shield) const override;
+    std::string getSheathedShieldMesh(const MWWorld::ConstPtr& shield) const override;
 
 public:
     /**

From 665d756f02df18d91f2273be82fb8f5e8851de9e Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Tue, 2 Nov 2021 00:05:22 +0100
Subject: [PATCH 1610/2859] Fix readthedocs config

---
 .readthedocs.yaml     | 10 ++++++++++
 docs/requirements.txt |  2 +-
 readthedocs.yml       |  2 --
 3 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 .readthedocs.yaml
 delete mode 100644 readthedocs.yml

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
new file mode 100644
index 0000000000..e0b39ec495
--- /dev/null
+++ b/.readthedocs.yaml
@@ -0,0 +1,10 @@
+version: 2
+
+sphinx:
+  configuration: docs/source/conf.py
+
+python:
+  version: 3.8
+  install:
+    - requirements: docs/requirements.txt
+
diff --git a/docs/requirements.txt b/docs/requirements.txt
index 288d462d0d..14c09d53e7 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,2 +1,2 @@
 parse_cmake
-sphinx>=1.7.0
+sphinx==1.8.5
diff --git a/readthedocs.yml b/readthedocs.yml
deleted file mode 100644
index e53e54b785..0000000000
--- a/readthedocs.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-# Don't build any extra formats
-formats: []
\ No newline at end of file

From a5a895ffd482737316165d175ec0e2d316fc9dd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20St=C3=B6ckel?= <astoecke@uwaterloo.ca>
Date: Mon, 1 Nov 2021 18:22:38 -0400
Subject: [PATCH 1611/2859] Fix #6381

Do not use osg::PI_f
---
 apps/openmw/mwworld/worldimp.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index cad7de9710..ed5872fb6d 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1313,7 +1313,7 @@ namespace MWWorld
              * currently it's done so for rotating the camera, which needs
              * clamping.
              */
-            objRot[0] = osg::clampBetween(objRot[0], -osg::PIf / 2, osg::PIf / 2);
+            objRot[0] = osg::clampBetween<float>(objRot[0], -osg::PI_2, osg::PI_2);
             objRot[1] = Misc::normalizeAngle(objRot[1]);
             objRot[2] = Misc::normalizeAngle(objRot[2]);
         }

From 20f851b3b50ac26059e3cbea87264fb7c0d8ec08 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Tue, 2 Nov 2021 10:21:21 +0100
Subject: [PATCH 1612/2859] Fix readthedocs config, second attempt.

---
 docs/requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 14c09d53e7..ac82149f5d 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,2 +1,3 @@
 parse_cmake
 sphinx==1.8.5
+docutils==0.17.1

From 213faa669521521a6fa137629abb312e6fa1036a Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Tue, 2 Nov 2021 13:46:41 +0000
Subject: [PATCH 1613/2859] restores countRecords optimisations (#3210)

With this PR we restore @elsid 's optimisations of countRecords we have unintentionally discarded in PR #3197. In addition, we give it a more appropriate name and add comments concerning its peculiar background.
---
 apps/openmw/mwworld/esmstore.cpp | 12 +++++++++---
 apps/openmw/mwworld/esmstore.hpp |  4 ++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index 3cedcd457a..5ec95ecf47 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -29,6 +29,7 @@ namespace
 
     void readRefs(const ESM::Cell& cell, std::vector<Ref>& refs, std::vector<std::string>& refIDs, std::vector<ESM::ESMReader>& readers)
     {
+        // TODO: we have many similar copies of this code.
         for (size_t i = 0; i < cell.mContextList.size(); i++)
         {
             size_t index = cell.mContextList[i].index;
@@ -301,12 +302,14 @@ void ESMStore::setUp(bool validateRecords)
     if (validateRecords)
     {
         validate();
-        countRecords();
+        countAllCellRefs();
     }
 }
 
-void ESMStore::countRecords()
+void ESMStore::countAllCellRefs()
 {
+    // TODO: We currently need to read entire files here again.
+    // We should consider consolidating or deferring this reading.
     if(!mRefCount.empty())
         return;
     std::vector<Ref> refs;
@@ -324,6 +327,8 @@ void ESMStore::countRecords()
         if (value.mRefID != deletedRefID)
         {
             std::string& refId = refIDs[value.mRefID];
+            // We manually lower case IDs here for the time being to improve performance.
+            Misc::StringUtils::lowerCaseInPlace(refId);
             ++mRefCount[std::move(refId)];
         }
     };
@@ -332,7 +337,8 @@ void ESMStore::countRecords()
 
 int ESMStore::getRefCount(const std::string& id) const
 {
-    auto it = mRefCount.find(id);
+    const std::string lowerId = Misc::StringUtils::lowerCase(id);
+    auto it = mRefCount.find(lowerId);
     if(it == mRefCount.end())
         return 0;
     return it->second;
diff --git a/apps/openmw/mwworld/esmstore.hpp b/apps/openmw/mwworld/esmstore.hpp
index d1a4942cd3..8582a1daca 100644
--- a/apps/openmw/mwworld/esmstore.hpp
+++ b/apps/openmw/mwworld/esmstore.hpp
@@ -79,7 +79,7 @@ namespace MWWorld
         IDMap mIds;
         IDMap mStaticIds;
 
-        IDMap mRefCount;
+        std::unordered_map<std::string, int> mRefCount;
 
         std::map<int, StoreBase *> mStores;
 
@@ -90,7 +90,7 @@ namespace MWWorld
         /// Validate entries in store after setup
         void validate();
 
-        void countRecords();
+        void countAllCellRefs();
 
         template<class T>
         void removeMissingObjects(Store<T>& store);

From 940e338453fd4f03309148ea63f6feed2e5bb376 Mon Sep 17 00:00:00 2001
From: wareya <wareya@gmail.com>
Date: Tue, 2 Nov 2021 15:17:26 +0000
Subject: [PATCH 1614/2859] Constifications

---
 apps/openmw/mwphysics/trace.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwphysics/trace.cpp b/apps/openmw/mwphysics/trace.cpp
index e489ea0eb2..b7930bfa53 100644
--- a/apps/openmw/mwphysics/trace.cpp
+++ b/apps/openmw/mwphysics/trace.cpp
@@ -58,7 +58,7 @@ void ActorTracer::doTrace(const btCollisionObject *actor, const osg::Vec3f& star
         doing_short_trace = true;
     }
 
-    auto traceCallback = sweepHelper(actor, btstart, btend, world, false);
+    const auto traceCallback = sweepHelper(actor, btstart, btend, world, false);
 
     // Copy the hit data over to our trace results struct:
     if(traceCallback.hasHit())
@@ -77,7 +77,7 @@ void ActorTracer::doTrace(const btCollisionObject *actor, const osg::Vec3f& star
         if(doing_short_trace)
         {
             btend = Misc::Convert::toBullet(end);
-            auto newTraceCallback = sweepHelper(actor, btstart, btend, world, false);
+            const auto newTraceCallback = sweepHelper(actor, btstart, btend, world, false);
 
             if(newTraceCallback.hasHit())
             {
@@ -100,11 +100,11 @@ void ActorTracer::doTrace(const btCollisionObject *actor, const osg::Vec3f& star
 
 void ActorTracer::findGround(const Actor* actor, const osg::Vec3f& start, const osg::Vec3f& end, const btCollisionWorld* world)
 {
-    auto newTraceCallback = sweepHelper(actor->getCollisionObject(), Misc::Convert::toBullet(start), Misc::Convert::toBullet(end), world, true);
-    if(newTraceCallback.hasHit())
+    const auto traceCallback = sweepHelper(actor->getCollisionObject(), Misc::Convert::toBullet(start), Misc::Convert::toBullet(end), world, true);
+    if(traceCallback.hasHit())
     {
-        mFraction = newTraceCallback.m_closestHitFraction;
-        mPlaneNormal = Misc::Convert::toOsg(newTraceCallback.m_hitNormalWorld);
+        mFraction = traceCallback.m_closestHitFraction;
+        mPlaneNormal = Misc::Convert::toOsg(traceCallback.m_hitNormalWorld);
         mEndPos = (end-start)*mFraction + start;
     }
     else

From a9106f4d7c239adc6ec2ba2968b594ecf238c5c7 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Tue, 2 Nov 2021 18:01:22 +0100
Subject: [PATCH 1615/2859] Rotate torches by 90 degrees

---
 CHANGELOG.md                               |  1 +
 apps/openmw/mwrender/actoranimation.cpp    | 17 +++++++++++++++++
 apps/openmw/mwrender/actoranimation.hpp    |  1 +
 apps/openmw/mwrender/creatureanimation.cpp |  8 +-------
 apps/openmw/mwrender/npcanimation.cpp      | 19 ++++++-------------
 apps/openmw/mwrender/npcanimation.hpp      |  4 ++--
 components/sceneutil/attach.cpp            | 11 ++++++++---
 components/sceneutil/attach.hpp            |  3 ++-
 8 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09a574338a..2ae4126b15 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@
     Bug #5842: GetDisposition adds temporary disposition change from different actors
     Bug #5863: GetEffect should return true after the player has teleported
     Bug #5913: Failed assertion during Ritual of Trees quest
+    Bug #5937: Lights always need to be rotated by 90 degrees
     Bug #6037: Morrowind Content Language Cannot be Set to English in OpenMW Launcher
     Bug #6051: NaN water height in ESM file is not handled gracefully
     Bug #6066: addtopic "return" does not work from within script. No errors thrown
diff --git a/apps/openmw/mwrender/actoranimation.cpp b/apps/openmw/mwrender/actoranimation.cpp
index e820eb5672..7706f7d7f1 100644
--- a/apps/openmw/mwrender/actoranimation.cpp
+++ b/apps/openmw/mwrender/actoranimation.cpp
@@ -11,6 +11,7 @@
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
 
+#include <components/sceneutil/attach.hpp>
 #include <components/sceneutil/lightmanager.hpp>
 #include <components/sceneutil/lightutil.hpp>
 #include <components/sceneutil/visitor.hpp>
@@ -84,6 +85,22 @@ PartHolderPtr ActorAnimation::attachMesh(const std::string& model, const std::st
     return PartHolderPtr(new PartHolder(instance));
 }
 
+osg::ref_ptr<osg::Node> ActorAnimation::attach(const std::string& model, const std::string& bonename, const std::string& bonefilter, bool isLight)
+{
+    osg::ref_ptr<const osg::Node> templateNode = mResourceSystem->getSceneManager()->getTemplate(model);
+
+    const NodeMap& nodeMap = getNodeMap();
+    auto found = nodeMap.find(bonename);
+    if (found == nodeMap.end())
+        throw std::runtime_error("Can't find attachment node " + bonename);
+    if(isLight)
+    {
+        osg::Quat rotation(osg::DegreesToRadians(-90.f), osg::Vec3f(1,0,0));
+        return SceneUtil::attach(templateNode, mObjectRoot, bonefilter, found->second, mResourceSystem->getSceneManager(), &rotation);
+    }
+    return SceneUtil::attach(templateNode, mObjectRoot, bonefilter, found->second, mResourceSystem->getSceneManager());
+}
+
 std::string ActorAnimation::getShieldMesh(const MWWorld::ConstPtr& shield, bool female) const
 {
     const ESM::Armor *armor = shield.get<ESM::Armor>()->mBase;
diff --git a/apps/openmw/mwrender/actoranimation.hpp b/apps/openmw/mwrender/actoranimation.hpp
index c68ce4dfe2..1ece0c326d 100644
--- a/apps/openmw/mwrender/actoranimation.hpp
+++ b/apps/openmw/mwrender/actoranimation.hpp
@@ -54,6 +54,7 @@ class ActorAnimation : public Animation, public MWWorld::ContainerStoreListener
             osg::Vec4f stubColor = osg::Vec4f(0,0,0,0);
             return attachMesh(model, bonename, false, &stubColor);
         };
+        osg::ref_ptr<osg::Node> attach(const std::string& model, const std::string& bonename, const std::string& bonefilter, bool isLight);
 
         PartHolderPtr mScabbard;
         PartHolderPtr mHolsteredShield;
diff --git a/apps/openmw/mwrender/creatureanimation.cpp b/apps/openmw/mwrender/creatureanimation.cpp
index 7dea8173b6..50dfb68008 100644
--- a/apps/openmw/mwrender/creatureanimation.cpp
+++ b/apps/openmw/mwrender/creatureanimation.cpp
@@ -145,13 +145,7 @@ void CreatureWeaponAnimation::updatePart(PartHolderPtr& scene, int slot)
 
     try
     {
-        osg::ref_ptr<const osg::Node> node = mResourceSystem->getSceneManager()->getTemplate(itemModel);
-
-        const NodeMap& nodeMap = getNodeMap();
-        NodeMap::const_iterator found = nodeMap.find(bonename);
-        if (found == nodeMap.end())
-            throw std::runtime_error("Can't find attachment node " + bonename);
-        osg::ref_ptr<osg::Node> attached = SceneUtil::attach(node, mObjectRoot, bonename, found->second.get(), mResourceSystem->getSceneManager());
+        osg::ref_ptr<osg::Node> attached = attach(itemModel, bonename, bonename, item.getType() == ESM::Light::sRecordId);
 
         scene.reset(new PartHolder(attached));
 
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 16cf4cee69..0d6c21c308 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -645,7 +645,7 @@ void NpcAnimation::updateParts()
         {
             const ESM::Light *light = part.get<ESM::Light>()->mBase;
             addOrReplaceIndividualPart(ESM::PRT_Shield, MWWorld::InventoryStore::Slot_CarriedLeft,
-                                       1, "meshes\\"+light->mModel);
+                                       1, "meshes\\"+light->mModel, false, nullptr, true);
             if (mObjectParts[ESM::PRT_Shield])
                 addExtraLight(mObjectParts[ESM::PRT_Shield]->getNode()->asGroup(), light);
         }
@@ -675,16 +675,9 @@ void NpcAnimation::updateParts()
 
 
 
-PartHolderPtr NpcAnimation::insertBoundedPart(const std::string& model, const std::string& bonename, const std::string& bonefilter, bool enchantedGlow, osg::Vec4f* glowColor)
+PartHolderPtr NpcAnimation::insertBoundedPart(const std::string& model, const std::string& bonename, const std::string& bonefilter, bool enchantedGlow, osg::Vec4f* glowColor, bool isLight)
 {
-    osg::ref_ptr<const osg::Node> templateNode = mResourceSystem->getSceneManager()->getTemplate(model);
-
-    const NodeMap& nodeMap = getNodeMap();
-    NodeMap::const_iterator found = nodeMap.find(bonename);
-    if (found == nodeMap.end())
-        throw std::runtime_error("Can't find attachment node " + bonename);
-
-    osg::ref_ptr<osg::Node> attached = SceneUtil::attach(templateNode, mObjectRoot, bonefilter, found->second, mResourceSystem->getSceneManager());
+    osg::ref_ptr<osg::Node> attached = attach(model, bonename, bonefilter, isLight);
     if (enchantedGlow)
         mGlowUpdater = SceneUtil::addEnchantedGlow(attached, mResourceSystem, *glowColor);
 
@@ -757,7 +750,7 @@ bool NpcAnimation::isFemalePart(const ESM::BodyPart* bodypart)
     return bodypart->mData.mFlags & ESM::BodyPart::BPF_Female;
 }
 
-bool NpcAnimation::addOrReplaceIndividualPart(ESM::PartReferenceType type, int group, int priority, const std::string &mesh, bool enchantedGlow, osg::Vec4f* glowColor)
+bool NpcAnimation::addOrReplaceIndividualPart(ESM::PartReferenceType type, int group, int priority, const std::string &mesh, bool enchantedGlow, osg::Vec4f* glowColor, bool isLight)
 {
     if(priority <= mPartPriorities[type])
         return false;
@@ -789,7 +782,7 @@ bool NpcAnimation::addOrReplaceIndividualPart(ESM::PartReferenceType type, int g
 
         // PRT_Hair seems to be the only type that breaks consistency and uses a filter that's different from the attachment bone
         const std::string bonefilter = (type == ESM::PRT_Hair) ? "hair" : bonename;
-        mObjectParts[type] = insertBoundedPart(mesh, bonename, bonefilter, enchantedGlow, glowColor);
+        mObjectParts[type] = insertBoundedPart(mesh, bonename, bonefilter, enchantedGlow, glowColor, isLight);
     }
     catch (std::exception& e)
     {
@@ -981,7 +974,7 @@ void NpcAnimation::showCarriedLeft(bool show)
             mesh = getShieldMesh(*iter, !mNpc->isMale());
         }
         if (mesh.empty() || addOrReplaceIndividualPart(ESM::PRT_Shield, MWWorld::InventoryStore::Slot_CarriedLeft, 1,
-                                        mesh, !iter->getClass().getEnchantment(*iter).empty(), &glowColor))
+                                        mesh, !iter->getClass().getEnchantment(*iter).empty(), &glowColor, iter->getType() == ESM::Light::sRecordId))
         {
             if (mesh.empty())
                 reserveIndividualPart(ESM::PRT_Shield, MWWorld::InventoryStore::Slot_CarriedLeft, 1);
diff --git a/apps/openmw/mwrender/npcanimation.hpp b/apps/openmw/mwrender/npcanimation.hpp
index d0d9a26fdc..2dcfac3036 100644
--- a/apps/openmw/mwrender/npcanimation.hpp
+++ b/apps/openmw/mwrender/npcanimation.hpp
@@ -83,13 +83,13 @@ private:
     NpcType getNpcType() const;
 
     PartHolderPtr insertBoundedPart(const std::string &model, const std::string &bonename,
-                                        const std::string &bonefilter, bool enchantedGlow, osg::Vec4f* glowColor=nullptr);
+                                        const std::string &bonefilter, bool enchantedGlow, osg::Vec4f* glowColor, bool isLight);
 
     void removeIndividualPart(ESM::PartReferenceType type);
     void reserveIndividualPart(ESM::PartReferenceType type, int group, int priority);
 
     bool addOrReplaceIndividualPart(ESM::PartReferenceType type, int group, int priority, const std::string &mesh,
-                                    bool enchantedGlow=false, osg::Vec4f* glowColor=nullptr);
+                                    bool enchantedGlow=false, osg::Vec4f* glowColor=nullptr, bool isLight = false);
     void removePartGroup(int group);
     void addPartGroup(int group, int priority, const std::vector<ESM::PartReference> &parts,
                                     bool enchantedGlow=false, osg::Vec4f* glowColor=nullptr);
diff --git a/components/sceneutil/attach.cpp b/components/sceneutil/attach.cpp
index 9dabb282b0..02c3456425 100644
--- a/components/sceneutil/attach.cpp
+++ b/components/sceneutil/attach.cpp
@@ -100,7 +100,7 @@ namespace SceneUtil
         }
     }
 
-    osg::ref_ptr<osg::Node> attach(osg::ref_ptr<const osg::Node> toAttach, osg::Node *master, const std::string &filter, osg::Group* attachNode, Resource::SceneManager* sceneManager)
+    osg::ref_ptr<osg::Node> attach(osg::ref_ptr<const osg::Node> toAttach, osg::Node *master, const std::string &filter, osg::Group* attachNode, Resource::SceneManager* sceneManager, const osg::Quat* attitude)
     {
         if (dynamic_cast<const SceneUtil::Skeleton*>(toAttach.get()))
         {
@@ -144,8 +144,6 @@ namespace SceneUtil
 
                 trans = new osg::PositionAttitudeTransform;
                 trans->setPosition(boneOffset->getMatrix().getTrans());
-                // The BoneOffset rotation seems to be incorrect
-                trans->setAttitude(osg::Quat(osg::DegreesToRadians(-90.f), osg::Vec3f(1,0,0)));
 
                 // Now that we used it, get rid of the redundant node.
                 if (boneOffset->getNumChildren() == 0 && boneOffset->getNumParents() == 1)
@@ -172,6 +170,13 @@ namespace SceneUtil
                 trans->setStateSet(frontFaceStateSet);
             }
 
+            if(attitude)
+            {
+                if (!trans)
+                    trans = new osg::PositionAttitudeTransform;
+                trans->setAttitude(*attitude);
+            }
+
             if (trans)
             {
                 attachNode->addChild(trans);
diff --git a/components/sceneutil/attach.hpp b/components/sceneutil/attach.hpp
index f5fc693724..ed0299dece 100644
--- a/components/sceneutil/attach.hpp
+++ b/components/sceneutil/attach.hpp
@@ -9,6 +9,7 @@ namespace osg
 {
     class Node;
     class Group;
+    class Quat;
 }
 namespace Resource
 {
@@ -23,7 +24,7 @@ namespace SceneUtil
     /// Otherwise, just attach all of the toAttach scenegraph to the attachment node on the master scenegraph, with no filtering.
     /// @note The master scene graph is expected to include a skeleton.
     /// @return A newly created node that is directly attached to the master scene graph
-    osg::ref_ptr<osg::Node> attach(osg::ref_ptr<const osg::Node> toAttach, osg::Node* master, const std::string& filter, osg::Group* attachNode, Resource::SceneManager *sceneManager);
+    osg::ref_ptr<osg::Node> attach(osg::ref_ptr<const osg::Node> toAttach, osg::Node* master, const std::string& filter, osg::Group* attachNode, Resource::SceneManager *sceneManager, const osg::Quat* attitude = nullptr);
 
 }
 

From 4631d957393059fef18c2cf98e2d6d93140c971c Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 31 Oct 2021 15:19:19 +0100
Subject: [PATCH 1616/2859] Add more tests for BulletNifLoader

---
 .../nifloader/testbulletnifloader.cpp         | 214 +++++++++++++++++-
 components/nifbullet/bulletnifloader.cpp      |   9 +-
 2 files changed, 216 insertions(+), 7 deletions(-)

diff --git a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
index 3d4628c267..3d9b56c930 100644
--- a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
+++ b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
@@ -60,6 +60,19 @@ namespace
     {
         return isNear(lhs.getOrigin(), rhs.getOrigin()) && isNear(lhs.getBasis(), rhs.getBasis());
     }
+
+    struct WriteVec3f
+    {
+        osg::Vec3f mValue;
+
+        friend std::ostream& operator <<(std::ostream& stream, const WriteVec3f& value)
+        {
+            return stream << "osg::Vec3f {"
+                << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.mValue.x() << ", "
+                << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.mValue.y() << ", "
+                << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.mValue.z() << "}";
+        }
+    };
 }
 
 static std::ostream& operator <<(std::ostream& stream, const btVector3& value)
@@ -122,6 +135,17 @@ static std::ostream& operator <<(std::ostream& stream, const TriangleMeshShape&
     return stream << "}}";
 }
 
+static bool operator ==(const BulletShape::CollisionBox& l, const BulletShape::CollisionBox& r)
+{
+    const auto tie = [] (const BulletShape::CollisionBox& v) { return std::tie(v.mExtents, v.mCenter); };
+    return tie(l) == tie(r);
+}
+
+static std::ostream& operator <<(std::ostream& stream, const BulletShape::CollisionBox& value)
+{
+    return stream << "CollisionBox {" << WriteVec3f {value.mExtents} << ", " << WriteVec3f {value.mCenter} << "}";
+}
+
 }
 
 static std::ostream& operator <<(std::ostream& stream, const btCollisionShape& value)
@@ -162,8 +186,7 @@ namespace Resource
     {
         return compareObjects(lhs.mCollisionShape.get(), rhs.mCollisionShape.get())
             && compareObjects(lhs.mAvoidCollisionShape.get(), rhs.mAvoidCollisionShape.get())
-            && lhs.mCollisionBox.mExtents == rhs.mCollisionBox.mExtents
-            && lhs.mCollisionBox.mCenter == rhs.mCollisionBox.mCenter
+            && lhs.mCollisionBox == rhs.mCollisionBox
             && lhs.mAnimatedShapes == rhs.mAnimatedShapes;
     }
 
@@ -172,8 +195,7 @@ namespace Resource
         return stream << "Resource::BulletShape {"
             << value.mCollisionShape.get() << ", "
             << value.mAvoidCollisionShape.get() << ", "
-            << "osg::Vec3f {" << value.mCollisionBox.mExtents << "}" << ", "
-            << "osg::Vec3f {" << value.mCollisionBox.mCenter << "}" << ", "
+            << value.mCollisionBox << ", "
             << value.mAnimatedShapes
             << "}";
     }
@@ -272,6 +294,12 @@ namespace
         value.recType = Nif::RC_NiTriShape;
     }
 
+    void init(Nif::NiTriStrips& value)
+    {
+        init(static_cast<Nif::NiGeometry&>(value));
+        value.recType = Nif::RC_NiTriStrips;
+    }
+
     void init(Nif::NiSkinInstance& value)
     {
         value.data = Nif::NiSkinDataPtr(nullptr);
@@ -330,6 +358,8 @@ namespace
         Nif::NiTriShape mNiTriShape;
         Nif::NiTriShapeData mNiTriShapeData2;
         Nif::NiTriShape mNiTriShape2;
+        Nif::NiTriStripsData mNiTriStripsData;
+        Nif::NiTriStrips mNiTriStrips;
         Nif::NiSkinInstance mNiSkinInstance;
         Nif::NiStringExtraData mNiStringExtraData;
         Nif::NiStringExtraData mNiStringExtraData2;
@@ -361,6 +391,7 @@ namespace
             init(mNiNode3);
             init(mNiTriShape);
             init(mNiTriShape2);
+            init(mNiTriStrips);
             init(mNiSkinInstance);
             init(mNiStringExtraData);
             init(mNiStringExtraData2);
@@ -375,6 +406,11 @@ namespace
             mNiTriShapeData2.vertices = {osg::Vec3f(0, 0, 1), osg::Vec3f(1, 0, 1), osg::Vec3f(1, 1, 1)};
             mNiTriShapeData2.triangles = {0, 1, 2};
             mNiTriShape2.data = Nif::NiGeometryDataPtr(&mNiTriShapeData2);
+
+            mNiTriStripsData.recType = Nif::RC_NiTriStripsData;
+            mNiTriStripsData.vertices = {osg::Vec3f(0, 0, 0), osg::Vec3f(1, 0, 0), osg::Vec3f(1, 1, 0), osg::Vec3f(0, 1, 0)};
+            mNiTriStripsData.strips = {{0, 1, 2, 3}};
+            mNiTriStrips.data = Nif::NiGeometryDataPtr(&mNiTriStripsData);
         }
     };
 
@@ -389,6 +425,18 @@ namespace
         EXPECT_EQ(*result, expected);
     }
 
+    TEST_F(TestBulletNifLoader, should_ignore_nullptr_root)
+    {
+        EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
+        EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(nullptr));
+        EXPECT_CALL(mNifFile, getFilename()).WillOnce(Return("test.nif"));
+        const auto result = mLoader.load(mNifFile);
+
+        Resource::BulletShape expected;
+
+        EXPECT_EQ(*result, expected);
+    }
+
     TEST_F(TestBulletNifLoader, for_default_root_nif_node_should_return_default)
     {
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
@@ -860,6 +908,34 @@ namespace
         EXPECT_EQ(*result, expected);
     }
 
+    TEST_F(TestBulletNifLoader, should_add_static_mesh_to_existing_compound_mesh)
+    {
+        mNiTriShape.parent = &mNiNode;
+        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
+
+        EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(2));
+        EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiNode));
+        EXPECT_CALL(mNifFile, getRoot(1)).WillOnce(Return(&mNiTriShape2));
+        EXPECT_CALL(mNifFile, getFilename()).WillOnce(Return("xtest.nif"));
+        const auto result = mLoader.load(mNifFile);
+
+        std::unique_ptr<btTriangleMesh> triangles(new btTriangleMesh(false));
+        triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
+
+        std::unique_ptr<btTriangleMesh> triangles2(new btTriangleMesh(false));
+        triangles2->addTriangle(btVector3(0, 0, 1), btVector3(1, 0, 1), btVector3(1, 1, 1));
+
+        std::unique_ptr<btCompoundShape> compound(new btCompoundShape);
+        compound->addChildShape(btTransform::getIdentity(), new Resource::TriangleMeshShape(triangles.release(), true));
+        compound->addChildShape(btTransform::getIdentity(), new Resource::TriangleMeshShape(triangles2.release(), true));
+
+        Resource::BulletShape expected;
+        expected.mCollisionShape.reset(compound.release());
+        expected.mAnimatedShapes = {{-1, 0}};
+
+        EXPECT_EQ(*result, expected);
+    }
+
     TEST_F(TestBulletNifLoader, for_root_avoid_node_and_tri_shape_child_node_should_return_shape_with_null_collision_shape)
     {
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
@@ -983,4 +1059,134 @@ namespace
 
         EXPECT_EQ(*result, expected);
     }
+
+    TEST_F(TestBulletNifLoader, should_ignore_tri_shape_data_with_mismatching_data_rec_type)
+    {
+        mNiTriShape.data = Nif::NiGeometryDataPtr(&mNiTriStripsData);
+
+        EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
+        EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiTriShape));
+        EXPECT_CALL(mNifFile, getFilename()).WillOnce(Return("test.nif"));
+        const auto result = mLoader.load(mNifFile);
+
+        const Resource::BulletShape expected;
+
+        EXPECT_EQ(*result, expected);
+    }
+
+    TEST_F(TestBulletNifLoader, for_tri_strips_root_node_should_return_shape_with_triangle_mesh_shape)
+    {
+        EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
+        EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiTriStrips));
+        EXPECT_CALL(mNifFile, getFilename()).WillOnce(Return("test.nif"));
+        const auto result = mLoader.load(mNifFile);
+
+        std::unique_ptr<btTriangleMesh> triangles(new btTriangleMesh(false));
+        triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
+        triangles->addTriangle(btVector3(1, 0, 0), btVector3(0, 1, 0), btVector3(1, 1, 0));
+        Resource::BulletShape expected;
+        expected.mCollisionShape.reset(new Resource::TriangleMeshShape(triangles.release(), true));
+
+        EXPECT_EQ(*result, expected);
+    }
+
+    TEST_F(TestBulletNifLoader, should_ignore_tri_strips_data_with_mismatching_data_rec_type)
+    {
+        mNiTriStrips.data = Nif::NiGeometryDataPtr(&mNiTriShapeData);
+
+        EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
+        EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiTriStrips));
+        EXPECT_CALL(mNifFile, getFilename()).WillOnce(Return("test.nif"));
+        const auto result = mLoader.load(mNifFile);
+
+        const Resource::BulletShape expected;
+
+        EXPECT_EQ(*result, expected);
+    }
+
+    TEST_F(TestBulletNifLoader, should_ignore_tri_strips_data_with_empty_strips)
+    {
+        mNiTriStripsData.strips.clear();
+
+        EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
+        EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiTriStrips));
+        EXPECT_CALL(mNifFile, getFilename()).WillOnce(Return("test.nif"));
+        const auto result = mLoader.load(mNifFile);
+
+        const Resource::BulletShape expected;
+
+        EXPECT_EQ(*result, expected);
+    }
+
+    TEST_F(TestBulletNifLoader, for_static_mesh_should_ignore_tri_strips_data_with_less_than_3_strips)
+    {
+        mNiTriStripsData.strips.front() = {0, 1};
+
+        EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
+        EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiTriStrips));
+        EXPECT_CALL(mNifFile, getFilename()).WillOnce(Return("test.nif"));
+        const auto result = mLoader.load(mNifFile);
+
+        const Resource::BulletShape expected;
+
+        EXPECT_EQ(*result, expected);
+    }
+
+    TEST_F(TestBulletNifLoader, for_avoid_collision_mesh_should_ignore_tri_strips_data_with_less_than_3_strips)
+    {
+        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
+        mNiNode.recType = Nif::RC_AvoidNode;
+        mNiTriStripsData.strips.front() = {0, 1};
+
+        EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
+        EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiTriStrips));
+        EXPECT_CALL(mNifFile, getFilename()).WillOnce(Return("test.nif"));
+        const auto result = mLoader.load(mNifFile);
+
+        const Resource::BulletShape expected;
+
+        EXPECT_EQ(*result, expected);
+    }
+
+    TEST_F(TestBulletNifLoader, for_animated_mesh_should_ignore_tri_strips_data_with_less_than_3_strips)
+    {
+        mNiTriStripsData.strips.front() = {0, 1};
+        mNiTriStrips.parent = &mNiNode;
+        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriStrips)}));
+
+        EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
+        EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiNode));
+        EXPECT_CALL(mNifFile, getFilename()).WillOnce(Return("xtest.nif"));
+        const auto result = mLoader.load(mNifFile);
+
+        Resource::BulletShape expected;
+        expected.mCollisionShape.reset(new btCompoundShape);
+
+        EXPECT_EQ(*result, expected);
+    }
+
+    TEST_F(TestBulletNifLoader, should_not_add_static_mesh_with_no_triangles_to_compound_shape)
+    {
+        mNiTriStripsData.strips.front() = {0, 1};
+        mNiTriShape.parent = &mNiNode;
+        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
+
+        EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(2));
+        EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiNode));
+        EXPECT_CALL(mNifFile, getRoot(1)).WillOnce(Return(&mNiTriStrips));
+        EXPECT_CALL(mNifFile, getFilename()).WillOnce(Return("xtest.nif"));
+        const auto result = mLoader.load(mNifFile);
+
+        std::unique_ptr<btTriangleMesh> triangles(new btTriangleMesh(false));
+        triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
+
+        std::unique_ptr<btCompoundShape> compound(new btCompoundShape);
+        compound->addChildShape(btTransform::getIdentity(), new Resource::TriangleMeshShape(triangles.release(), true));
+
+        Resource::BulletShape expected;
+        expected.mCollisionShape.reset(compound.release());
+        expected.mAnimatedShapes = {{-1, 0}};
+
+        EXPECT_EQ(*result, expected);
+    }
 }
diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index f808877a75..544ec6b0b4 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -170,7 +170,7 @@ osg::ref_ptr<Resource::BulletShape> BulletNifLoader::load(const Nif::File& nif)
 
     if (mCompoundShape)
     {
-        if (mStaticMesh)
+        if (mStaticMesh != nullptr && mStaticMesh->getNumTriangles() > 0)
         {
             btTransform trans;
             trans.setIdentity();
@@ -181,13 +181,13 @@ osg::ref_ptr<Resource::BulletShape> BulletNifLoader::load(const Nif::File& nif)
         }
         mShape->mCollisionShape = std::move(mCompoundShape);
     }
-    else if (mStaticMesh)
+    else if (mStaticMesh != nullptr && mStaticMesh->getNumTriangles() > 0)
     {
         mShape->mCollisionShape.reset(new Resource::TriangleMeshShape(mStaticMesh.get(), true));
         mStaticMesh.release();
     }
 
-    if (mAvoidStaticMesh)
+    if (mAvoidStaticMesh != nullptr && mAvoidStaticMesh->getNumTriangles() > 0)
     {
         mShape->mAvoidCollisionShape.reset(new Resource::TriangleMeshShape(mAvoidStaticMesh.get(), false));
         mAvoidStaticMesh.release();
@@ -376,6 +376,9 @@ void BulletNifLoader::handleNiTriShape(const Nif::Node *nifNode, int flags, cons
 
         fillTriangleMesh(*childMesh, niGeometry);
 
+        if (childMesh->getNumTriangles() == 0)
+            return;
+
         std::unique_ptr<Resource::TriangleMeshShape> childShape(new Resource::TriangleMeshShape(childMesh.get(), true));
         childMesh.release();
 

From 56eef691a84846fd0076a01acc6be5ac40cda171 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 31 Oct 2021 14:23:44 +0100
Subject: [PATCH 1617/2859] Use reference type to pass nif node as argument
 where nullptr is not handled

---
 components/nifbullet/bulletnifloader.cpp | 109 +++++++++++------------
 components/nifbullet/bulletnifloader.hpp |   8 +-
 2 files changed, 54 insertions(+), 63 deletions(-)

diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index 544ec6b0b4..ed5eba819f 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -18,11 +18,11 @@
 namespace
 {
 
-osg::Matrixf getWorldTransform(const Nif::Node *node)
+osg::Matrixf getWorldTransform(const Nif::Node& node)
 {
-    if(node->parent != nullptr)
-        return node->trafo.toMatrix() * getWorldTransform(node->parent);
-    return node->trafo.toMatrix();
+    if(node.parent != nullptr)
+        return node.trafo.toMatrix() * getWorldTransform(*node.parent);
+    return node.trafo.toMatrix();
 }
 
 bool pathFileNameStartsWithX(const std::string& path)
@@ -99,12 +99,12 @@ void fillTriangleMesh(btTriangleMesh& mesh, const Nif::NiTriStripsData& data, co
     }
 }
 
-void fillTriangleMesh(btTriangleMesh& mesh, const Nif::NiGeometry* geometry, const osg::Matrixf &transform = osg::Matrixf())
+void fillTriangleMesh(btTriangleMesh& mesh, const Nif::NiGeometry& geometry, const osg::Matrixf &transform = osg::Matrixf())
 {
-    if (geometry->recType == Nif::RC_NiTriShape || geometry->recType == Nif::RC_BSLODTriShape)
-        fillTriangleMesh(mesh, static_cast<const Nif::NiTriShapeData&>(geometry->data.get()), transform);
-    else if (geometry->recType == Nif::RC_NiTriStrips)
-        fillTriangleMesh(mesh, static_cast<const Nif::NiTriStripsData&>(geometry->data.get()), transform);
+    if (geometry.recType == Nif::RC_NiTriShape || geometry.recType == Nif::RC_BSLODTriShape)
+        fillTriangleMesh(mesh, static_cast<const Nif::NiTriShapeData&>(geometry.data.get()), transform);
+    else if (geometry.recType == Nif::RC_NiTriStrips)
+        fillTriangleMesh(mesh, static_cast<const Nif::NiTriStripsData&>(geometry.data.get()), transform);
 }
 
 }
@@ -141,7 +141,7 @@ osg::ref_ptr<Resource::BulletShape> BulletNifLoader::load(const Nif::File& nif)
     // Try to find a valid bounding box first. If one's found for any root node, use that.
     for (const Nif::Node* node : roots)
     {
-        if (findBoundingBox(node, filename))
+        if (findBoundingBox(*node, filename))
         {
             const btVector3 extents = Misc::Convert::toBullet(mShape->mCollisionBox.mExtents);
             const btVector3 center = Misc::Convert::toBullet(mShape->mCollisionBox.mCenter);
@@ -164,8 +164,8 @@ osg::ref_ptr<Resource::BulletShape> BulletNifLoader::load(const Nif::File& nif)
     // from the collision data present in every root node.
     for (const Nif::Node* node : roots)
     {
-        bool autogenerated = hasAutoGeneratedCollision(node);
-        handleNode(filename, node, 0, autogenerated, isAnimated, autogenerated);
+        bool autogenerated = hasAutoGeneratedCollision(*node);
+        handleNode(filename, *node, 0, autogenerated, isAnimated, autogenerated);
     }
 
     if (mCompoundShape)
@@ -198,41 +198,40 @@ osg::ref_ptr<Resource::BulletShape> BulletNifLoader::load(const Nif::File& nif)
 
 // Find a boundingBox in the node hierarchy.
 // Return: use bounding box for collision?
-bool BulletNifLoader::findBoundingBox(const Nif::Node* node, const std::string& filename)
+bool BulletNifLoader::findBoundingBox(const Nif::Node& node, const std::string& filename)
 {
-    if (node->hasBounds)
+    if (node.hasBounds)
     {
-        unsigned int type = node->bounds.type;
+        unsigned int type = node.bounds.type;
         switch (type)
         {
             case Nif::NiBoundingVolume::Type::BOX_BV:
-                mShape->mCollisionBox.mExtents = node->bounds.box.extents;
-                mShape->mCollisionBox.mCenter = node->bounds.box.center;
+                mShape->mCollisionBox.mExtents = node.bounds.box.extents;
+                mShape->mCollisionBox.mCenter = node.bounds.box.center;
                 break;
             default:
             {
                 std::stringstream warning;
-                warning << "Unsupported NiBoundingVolume type " << type << " in node " << node->recIndex;
+                warning << "Unsupported NiBoundingVolume type " << type << " in node " << node.recIndex;
                 warning << " in file " << filename;
                 warn(warning.str());
             }
         }
 
-        if (node->flags & Nif::NiNode::Flag_BBoxCollision)
+        if (node.flags & Nif::NiNode::Flag_BBoxCollision)
         {
             return true;
         }
     }
 
-    const Nif::NiNode *ninode = dynamic_cast<const Nif::NiNode*>(node);
-    if(ninode)
+    if (const Nif::NiNode *ninode = dynamic_cast<const Nif::NiNode*>(&node))
     {
         const Nif::NodeList &list = ninode->children;
         for(size_t i = 0;i < list.length();i++)
         {
             if(!list[i].empty())
             {
-                if (findBoundingBox(list[i].getPtr(), filename))
+                if (findBoundingBox(list[i].get(), filename))
                     return true;
             }
         }
@@ -240,10 +239,9 @@ bool BulletNifLoader::findBoundingBox(const Nif::Node* node, const std::string&
     return false;
 }
 
-bool BulletNifLoader::hasAutoGeneratedCollision(const Nif::Node* rootNode)
+bool BulletNifLoader::hasAutoGeneratedCollision(const Nif::Node& rootNode)
 {
-    const Nif::NiNode *ninode = dynamic_cast<const Nif::NiNode*>(rootNode);
-    if(ninode)
+    if (const Nif::NiNode* ninode = dynamic_cast<const Nif::NiNode*>(&rootNode))
     {
         const Nif::NodeList &list = ninode->children;
         for(size_t i = 0;i < list.length();i++)
@@ -258,32 +256,32 @@ bool BulletNifLoader::hasAutoGeneratedCollision(const Nif::Node* rootNode)
     return true;
 }
 
-void BulletNifLoader::handleNode(const std::string& fileName, const Nif::Node *node, int flags,
+void BulletNifLoader::handleNode(const std::string& fileName, const Nif::Node& node, int flags,
         bool isCollisionNode, bool isAnimated, bool autogenerated, bool avoid)
 {
     // TODO: allow on-the fly collision switching via toggling this flag
-    if (node->recType == Nif::RC_NiCollisionSwitch && !(node->flags & Nif::NiNode::Flag_ActiveCollision))
+    if (node.recType == Nif::RC_NiCollisionSwitch && !(node.flags & Nif::NiNode::Flag_ActiveCollision))
         return;
 
     // Accumulate the flags from all the child nodes. This works for all
     // the flags we currently use, at least.
-    flags |= node->flags;
+    flags |= node.flags;
 
-    if (!node->controller.empty() && node->controller->recType == Nif::RC_NiKeyframeController
-            && (node->controller->flags & Nif::NiNode::ControllerFlag_Active))
+    if (!node.controller.empty() && node.controller->recType == Nif::RC_NiKeyframeController
+            && (node.controller->flags & Nif::NiNode::ControllerFlag_Active))
         isAnimated = true;
 
-    isCollisionNode = isCollisionNode || (node->recType == Nif::RC_RootCollisionNode);
+    isCollisionNode = isCollisionNode || (node.recType == Nif::RC_RootCollisionNode);
 
     // Don't collide with AvoidNode shapes
-    avoid = avoid || (node->recType == Nif::RC_AvoidNode);
+    avoid = avoid || (node.recType == Nif::RC_AvoidNode);
 
     // We encountered a RootCollisionNode inside autogenerated mesh. It is not right.
-    if (node->recType == Nif::RC_RootCollisionNode && autogenerated)
+    if (node.recType == Nif::RC_RootCollisionNode && autogenerated)
         Log(Debug::Info) << "RootCollisionNode is not attached to the root node in " << fileName << ". Treating it as a common NiTriShape.";
 
     // Check for extra data
-    for (Nif::ExtraPtr e = node->extra; !e.empty(); e = e->next)
+    for (Nif::ExtraPtr e = node.extra; !e.empty(); e = e->next)
     {
         if (e->recType == Nif::RC_NiStringExtraData)
         {
@@ -310,61 +308,58 @@ void BulletNifLoader::handleNode(const std::string& fileName, const Nif::Node *n
         // NOTE: a trishape with hasBounds=true, but no BBoxCollision flag should NOT go through handleNiTriShape!
         // It must be ignored completely.
         // (occurs in tr_ex_imp_wall_arch_04.nif)
-        if(!node->hasBounds && (node->recType == Nif::RC_NiTriShape
-                                || node->recType == Nif::RC_NiTriStrips
-                                || node->recType == Nif::RC_BSLODTriShape))
+        if(!node.hasBounds && (node.recType == Nif::RC_NiTriShape
+                                || node.recType == Nif::RC_NiTriStrips
+                                || node.recType == Nif::RC_BSLODTriShape))
         {
             handleNiTriShape(node, flags, getWorldTransform(node), isAnimated, avoid);
         }
     }
 
     // For NiNodes, loop through children
-    const Nif::NiNode *ninode = dynamic_cast<const Nif::NiNode*>(node);
-    if(ninode)
+    if (const Nif::NiNode *ninode = dynamic_cast<const Nif::NiNode*>(&node))
     {
         const Nif::NodeList &list = ninode->children;
         for(size_t i = 0;i < list.length();i++)
         {
             if(!list[i].empty())
-                handleNode(fileName, list[i].getPtr(), flags, isCollisionNode, isAnimated, autogenerated, avoid);
+                handleNode(fileName, list[i].get(), flags, isCollisionNode, isAnimated, autogenerated, avoid);
         }
     }
 }
 
-void BulletNifLoader::handleNiTriShape(const Nif::Node *nifNode, int flags, const osg::Matrixf &transform,
+void BulletNifLoader::handleNiTriShape(const Nif::Node& nifNode, int flags, const osg::Matrixf &transform,
                                        bool isAnimated, bool avoid)
 {
-    assert(nifNode != nullptr);
-
     // If the object was marked "NCO" earlier, it shouldn't collide with
     // anything. So don't do anything.
     if ((flags & 0x800))
         return;
 
-    auto niGeometry = static_cast<const Nif::NiGeometry*>(nifNode);
-    if (niGeometry->data.empty() || niGeometry->data->vertices.empty())
+    const Nif::NiGeometry& niGeometry = static_cast<const Nif::NiGeometry&>(nifNode);
+    if (niGeometry.data.empty() || niGeometry.data->vertices.empty())
         return;
 
-    if (niGeometry->recType == Nif::RC_NiTriShape || niGeometry->recType == Nif::RC_BSLODTriShape)
+    if (niGeometry.recType == Nif::RC_NiTriShape || niGeometry.recType == Nif::RC_BSLODTriShape)
     {
-        if (niGeometry->data->recType != Nif::RC_NiTriShapeData)
+        if (niGeometry.data->recType != Nif::RC_NiTriShapeData)
             return;
 
-        auto data = static_cast<const Nif::NiTriShapeData*>(niGeometry->data.getPtr());
+        auto data = static_cast<const Nif::NiTriShapeData*>(niGeometry.data.getPtr());
         if (data->triangles.empty())
             return;
     }
-    else if (niGeometry->recType == Nif::RC_NiTriStrips)
+    else if (niGeometry.recType == Nif::RC_NiTriStrips)
     {
-        if (niGeometry->data->recType != Nif::RC_NiTriStripsData)
+        if (niGeometry.data->recType != Nif::RC_NiTriStripsData)
             return;
 
-        auto data = static_cast<const Nif::NiTriStripsData*>(niGeometry->data.getPtr());
+        auto data = static_cast<const Nif::NiTriStripsData*>(niGeometry.data.getPtr());
         if (data->strips.empty())
             return;
     }
 
-    if (!niGeometry->skin.empty())
+    if (!niGeometry.skin.empty())
         isAnimated = false;
 
     if (isAnimated)
@@ -382,20 +377,16 @@ void BulletNifLoader::handleNiTriShape(const Nif::Node *nifNode, int flags, cons
         std::unique_ptr<Resource::TriangleMeshShape> childShape(new Resource::TriangleMeshShape(childMesh.get(), true));
         childMesh.release();
 
-        float scale = nifNode->trafo.scale;
-        const Nif::Node* parent = nifNode;
-        while (parent->parent)
-        {
-            parent = parent->parent;
+        float scale = nifNode.trafo.scale;
+        for (const Nif::Node* parent = nifNode.parent; parent != nullptr; parent = parent->parent)
             scale *= parent->trafo.scale;
-        }
         osg::Quat q = transform.getRotate();
         osg::Vec3f v = transform.getTrans();
         childShape->setLocalScaling(btVector3(scale, scale, scale));
 
         btTransform trans(btQuaternion(q.x(), q.y(), q.z(), q.w()), btVector3(v.x(), v.y(), v.z()));
 
-        mShape->mAnimatedShapes.emplace(nifNode->recIndex, mCompoundShape->getNumChildShapes());
+        mShape->mAnimatedShapes.emplace(nifNode.recIndex, mCompoundShape->getNumChildShapes());
 
         mCompoundShape->addChildShape(trans, childShape.get());
         childShape.release();
diff --git a/components/nifbullet/bulletnifloader.hpp b/components/nifbullet/bulletnifloader.hpp
index 3d6a95e09f..5a17a4240c 100644
--- a/components/nifbullet/bulletnifloader.hpp
+++ b/components/nifbullet/bulletnifloader.hpp
@@ -52,14 +52,14 @@ public:
     osg::ref_ptr<Resource::BulletShape> load(const Nif::File& file);
 
 private:
-    bool findBoundingBox(const Nif::Node* node, const std::string& filename);
+    bool findBoundingBox(const Nif::Node& node, const std::string& filename);
 
-    void handleNode(const std::string& fileName, Nif::Node const *node, int flags, bool isCollisionNode,
+    void handleNode(const std::string& fileName, const Nif::Node& node, int flags, bool isCollisionNode,
                     bool isAnimated=false, bool autogenerated=false, bool avoid=false);
 
-    bool hasAutoGeneratedCollision(const Nif::Node *rootNode);
+    bool hasAutoGeneratedCollision(const Nif::Node& rootNode);
 
-    void handleNiTriShape(const Nif::Node *nifNode, int flags, const osg::Matrixf& transform, bool isAnimated, bool avoid);
+    void handleNiTriShape(const Nif::Node& nifNode, int flags, const osg::Matrixf& transform, bool isAnimated, bool avoid);
 
     std::unique_ptr<btCompoundShape, Resource::DeleteCollisionShape> mCompoundShape;
 

From 4ac83f4c39beab8728a81b83903398efaa3f88d7 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 31 Oct 2021 14:27:16 +0100
Subject: [PATCH 1618/2859] Add separate function to handle NiGeometry node

To force use a single source of data. All fields of Nif::Node are available in NiGeometry.
---
 components/nifbullet/bulletnifloader.cpp | 13 +++++++++----
 components/nifbullet/bulletnifloader.hpp |  3 +++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index ed5eba819f..4bafa8af74 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -336,7 +336,12 @@ void BulletNifLoader::handleNiTriShape(const Nif::Node& nifNode, int flags, cons
     if ((flags & 0x800))
         return;
 
-    const Nif::NiGeometry& niGeometry = static_cast<const Nif::NiGeometry&>(nifNode);
+    handleNiTriShape(static_cast<const Nif::NiGeometry&>(nifNode), transform, isAnimated, avoid);
+}
+
+void BulletNifLoader::handleNiTriShape(const Nif::NiGeometry& niGeometry, const osg::Matrixf &transform,
+    bool isAnimated, bool avoid)
+{
     if (niGeometry.data.empty() || niGeometry.data->vertices.empty())
         return;
 
@@ -377,8 +382,8 @@ void BulletNifLoader::handleNiTriShape(const Nif::Node& nifNode, int flags, cons
         std::unique_ptr<Resource::TriangleMeshShape> childShape(new Resource::TriangleMeshShape(childMesh.get(), true));
         childMesh.release();
 
-        float scale = nifNode.trafo.scale;
-        for (const Nif::Node* parent = nifNode.parent; parent != nullptr; parent = parent->parent)
+        float scale = niGeometry.trafo.scale;
+        for (const Nif::Node* parent = niGeometry.parent; parent != nullptr; parent = parent->parent)
             scale *= parent->trafo.scale;
         osg::Quat q = transform.getRotate();
         osg::Vec3f v = transform.getTrans();
@@ -386,7 +391,7 @@ void BulletNifLoader::handleNiTriShape(const Nif::Node& nifNode, int flags, cons
 
         btTransform trans(btQuaternion(q.x(), q.y(), q.z(), q.w()), btVector3(v.x(), v.y(), v.z()));
 
-        mShape->mAnimatedShapes.emplace(nifNode.recIndex, mCompoundShape->getNumChildShapes());
+        mShape->mAnimatedShapes.emplace(niGeometry.recIndex, mCompoundShape->getNumChildShapes());
 
         mCompoundShape->addChildShape(trans, childShape.get());
         childShape.release();
diff --git a/components/nifbullet/bulletnifloader.hpp b/components/nifbullet/bulletnifloader.hpp
index 5a17a4240c..e0fec338c6 100644
--- a/components/nifbullet/bulletnifloader.hpp
+++ b/components/nifbullet/bulletnifloader.hpp
@@ -27,6 +27,7 @@ namespace Nif
     struct Transformation;
     struct NiTriShape;
     struct NiTriStrips;
+    struct NiGeometry;
 }
 
 namespace NifBullet
@@ -61,6 +62,8 @@ private:
 
     void handleNiTriShape(const Nif::Node& nifNode, int flags, const osg::Matrixf& transform, bool isAnimated, bool avoid);
 
+    void handleNiTriShape(const Nif::NiGeometry& nifNode, const osg::Matrixf& transform, bool isAnimated, bool avoid);
+
     std::unique_ptr<btCompoundShape, Resource::DeleteCollisionShape> mCompoundShape;
 
     std::unique_ptr<btTriangleMesh> mStaticMesh;

From 4e8e8304aae8834aa8868548e18aba42bf79a2fc Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 31 Oct 2021 14:59:35 +0100
Subject: [PATCH 1619/2859] Avoid mesh allocation when data is invalid

---
 .../nifloader/testbulletnifloader.cpp         |  3 +-
 components/nifbullet/bulletnifloader.cpp      | 61 +++++++++++--------
 2 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
index 3d9b56c930..eec09d9a5d 100644
--- a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
+++ b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
@@ -1159,8 +1159,7 @@ namespace
         EXPECT_CALL(mNifFile, getFilename()).WillOnce(Return("xtest.nif"));
         const auto result = mLoader.load(mNifFile);
 
-        Resource::BulletShape expected;
-        expected.mCollisionShape.reset(new btCompoundShape);
+        const Resource::BulletShape expected;
 
         EXPECT_EQ(*result, expected);
     }
diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index 4bafa8af74..655199afb9 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -1,6 +1,7 @@
 #include "bulletnifloader.hpp"
 
 #include <vector>
+#include <variant>
 
 #include <BulletCollision/CollisionShapes/btBoxShape.h>
 #include <BulletCollision/CollisionShapes/btTriangleMesh.h>
@@ -99,12 +100,38 @@ void fillTriangleMesh(btTriangleMesh& mesh, const Nif::NiTriStripsData& data, co
     }
 }
 
-void fillTriangleMesh(btTriangleMesh& mesh, const Nif::NiGeometry& geometry, const osg::Matrixf &transform = osg::Matrixf())
+template <class Function>
+auto handleNiGeometry(const Nif::NiGeometry& geometry, Function&& function)
+    -> decltype(function(static_cast<const Nif::NiTriShapeData&>(geometry.data.get())))
 {
     if (geometry.recType == Nif::RC_NiTriShape || geometry.recType == Nif::RC_BSLODTriShape)
-        fillTriangleMesh(mesh, static_cast<const Nif::NiTriShapeData&>(geometry.data.get()), transform);
-    else if (geometry.recType == Nif::RC_NiTriStrips)
-        fillTriangleMesh(mesh, static_cast<const Nif::NiTriStripsData&>(geometry.data.get()), transform);
+        return function(static_cast<const Nif::NiTriShapeData&>(geometry.data.get()));
+
+    if (geometry.recType == Nif::RC_NiTriStrips)
+        return function(static_cast<const Nif::NiTriStripsData&>(geometry.data.get()));
+
+    return {};
+}
+
+std::monostate fillTriangleMesh(std::unique_ptr<btTriangleMesh>& mesh, const Nif::NiGeometry& geometry, const osg::Matrixf &transform)
+{
+    return handleNiGeometry(geometry, [&] (const auto& data)
+    {
+        if (mesh == nullptr)
+            mesh.reset(new btTriangleMesh(false));
+        fillTriangleMesh(*mesh, data, transform);
+        return std::monostate {};
+    });
+}
+
+std::unique_ptr<btTriangleMesh> makeChildMesh(const Nif::NiGeometry& geometry)
+{
+    return handleNiGeometry(geometry, [&] (const auto& data)
+    {
+        std::unique_ptr<btTriangleMesh> mesh(new btTriangleMesh);
+        fillTriangleMesh(*mesh, data, osg::Matrixf());
+        return mesh;
+    });
 }
 
 }
@@ -369,16 +396,13 @@ void BulletNifLoader::handleNiTriShape(const Nif::NiGeometry& niGeometry, const
 
     if (isAnimated)
     {
+        std::unique_ptr<btTriangleMesh> childMesh = makeChildMesh(niGeometry);
+        if (childMesh == nullptr || childMesh->getNumTriangles() == 0)
+            return;
+
         if (!mCompoundShape)
             mCompoundShape.reset(new btCompoundShape);
 
-        std::unique_ptr<btTriangleMesh> childMesh(new btTriangleMesh);
-
-        fillTriangleMesh(*childMesh, niGeometry);
-
-        if (childMesh->getNumTriangles() == 0)
-            return;
-
         std::unique_ptr<Resource::TriangleMeshShape> childShape(new Resource::TriangleMeshShape(childMesh.get(), true));
         childMesh.release();
 
@@ -397,20 +421,9 @@ void BulletNifLoader::handleNiTriShape(const Nif::NiGeometry& niGeometry, const
         childShape.release();
     }
     else if (avoid)
-    {
-        if (!mAvoidStaticMesh)
-            mAvoidStaticMesh.reset(new btTriangleMesh(false));
-
-        fillTriangleMesh(*mAvoidStaticMesh, niGeometry, transform);
-    }
+        fillTriangleMesh(mAvoidStaticMesh, niGeometry, transform);
     else
-    {
-        if (!mStaticMesh)
-            mStaticMesh.reset(new btTriangleMesh(false));
-
-        // Static shape, just transform all vertices into position
-        fillTriangleMesh(*mStaticMesh, niGeometry, transform);
-    }
+        fillTriangleMesh(mStaticMesh, niGeometry, transform);
 }
 
 } // namespace NifBullet

From 19843af704b53016ed303ec2dc8952bd36f817a0 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 31 Oct 2021 14:55:04 +0100
Subject: [PATCH 1620/2859] Combine data check with data handling logic

---
 components/nifbullet/bulletnifloader.cpp | 41 ++++++++++++------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index 655199afb9..5edf69e17d 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -105,10 +105,28 @@ auto handleNiGeometry(const Nif::NiGeometry& geometry, Function&& function)
     -> decltype(function(static_cast<const Nif::NiTriShapeData&>(geometry.data.get())))
 {
     if (geometry.recType == Nif::RC_NiTriShape || geometry.recType == Nif::RC_BSLODTriShape)
-        return function(static_cast<const Nif::NiTriShapeData&>(geometry.data.get()));
+    {
+        if (geometry.data->recType != Nif::RC_NiTriShapeData)
+            return {};
+
+        auto data = static_cast<const Nif::NiTriShapeData*>(geometry.data.getPtr());
+        if (data->triangles.empty())
+            return {};
+
+        return function(static_cast<const Nif::NiTriShapeData&>(*data));
+    }
 
     if (geometry.recType == Nif::RC_NiTriStrips)
-        return function(static_cast<const Nif::NiTriStripsData&>(geometry.data.get()));
+    {
+        if (geometry.data->recType != Nif::RC_NiTriStripsData)
+            return {};
+
+        auto data = static_cast<const Nif::NiTriStripsData*>(geometry.data.getPtr());
+        if (data->strips.empty())
+            return {};
+
+        return function(static_cast<const Nif::NiTriStripsData&>(*data));
+    }
 
     return {};
 }
@@ -372,25 +390,6 @@ void BulletNifLoader::handleNiTriShape(const Nif::NiGeometry& niGeometry, const
     if (niGeometry.data.empty() || niGeometry.data->vertices.empty())
         return;
 
-    if (niGeometry.recType == Nif::RC_NiTriShape || niGeometry.recType == Nif::RC_BSLODTriShape)
-    {
-        if (niGeometry.data->recType != Nif::RC_NiTriShapeData)
-            return;
-
-        auto data = static_cast<const Nif::NiTriShapeData*>(niGeometry.data.getPtr());
-        if (data->triangles.empty())
-            return;
-    }
-    else if (niGeometry.recType == Nif::RC_NiTriStrips)
-    {
-        if (niGeometry.data->recType != Nif::RC_NiTriStripsData)
-            return;
-
-        auto data = static_cast<const Nif::NiTriStripsData*>(niGeometry.data.getPtr());
-        if (data->strips.empty())
-            return;
-    }
-
     if (!niGeometry.skin.empty())
         isAnimated = false;
 

From 2b057f5c15f0224731ae052cc47a7720ab063a87 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 31 Oct 2021 20:34:45 +0100
Subject: [PATCH 1621/2859] Expect nif node children to have parent

---
 .../nifloader/testbulletnifloader.cpp         | 26 ++++++++++++++++++-
 components/nifbullet/bulletnifloader.cpp      |  8 ++++--
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
index eec09d9a5d..b37a8cd6c0 100644
--- a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
+++ b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
@@ -506,6 +506,7 @@ namespace
         mNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
         mNode.bounds.box.extents = osg::Vec3f(1, 2, 3);
         mNode.bounds.box.center = osg::Vec3f(-1, -2, -3);
+        mNode.parent = &mNiNode;
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNode)}));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
@@ -531,6 +532,7 @@ namespace
         mNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
         mNode.bounds.box.extents = osg::Vec3f(1, 2, 3);
         mNode.bounds.box.center = osg::Vec3f(-1, -2, -3);
+        mNode.parent = &mNiNode;
 
         mNiNode.hasBounds = true;
         mNiNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
@@ -561,11 +563,13 @@ namespace
         mNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
         mNode.bounds.box.extents = osg::Vec3f(1, 2, 3);
         mNode.bounds.box.center = osg::Vec3f(-1, -2, -3);
+        mNode.parent = &mNiNode;
 
         mNode2.hasBounds = true;
         mNode2.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
         mNode2.bounds.box.extents = osg::Vec3f(4, 5, 6);
         mNode2.bounds.box.center = osg::Vec3f(-4, -5, -6);
+        mNode2.parent = &mNiNode;
 
         mNiNode.hasBounds = true;
         mNiNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
@@ -595,12 +599,14 @@ namespace
         mNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
         mNode.bounds.box.extents = osg::Vec3f(1, 2, 3);
         mNode.bounds.box.center = osg::Vec3f(-1, -2, -3);
+        mNode.parent = &mNiNode;
 
         mNode2.hasBounds = true;
         mNode2.flags |= Nif::NiNode::Flag_BBoxCollision;
         mNode2.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
         mNode2.bounds.box.extents = osg::Vec3f(4, 5, 6);
         mNode2.bounds.box.center = osg::Vec3f(-4, -5, -6);
+        mNode2.parent = &mNiNode;
 
         mNiNode.hasBounds = true;
         mNiNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
@@ -679,6 +685,7 @@ namespace
 
     TEST_F(TestBulletNifLoader, for_tri_shape_child_node_should_return_shape_with_triangle_mesh_shape)
     {
+        mNiTriShape.parent = &mNiNode;
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
@@ -697,7 +704,9 @@ namespace
     TEST_F(TestBulletNifLoader, for_nested_tri_shape_child_should_return_shape_with_triangle_mesh_shape)
     {
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiNode2)}));
+        mNiNode2.parent = &mNiNode;
         mNiNode2.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
+        mNiTriShape.parent = &mNiNode2;
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
         EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiNode));
@@ -714,6 +723,8 @@ namespace
 
     TEST_F(TestBulletNifLoader, for_two_tri_shape_children_should_return_shape_with_triangle_mesh_shape_with_all_meshes)
     {
+        mNiTriShape.parent = &mNiNode;
+        mNiTriShape2.parent = &mNiNode;
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({
             Nif::NodePtr(&mNiTriShape),
             Nif::NodePtr(&mNiTriShape2)
@@ -736,6 +747,7 @@ namespace
     TEST_F(TestBulletNifLoader, for_tri_shape_child_node_and_filename_starting_with_x_and_not_empty_skin_should_return_shape_with_triangle_mesh_shape)
     {
         mNiTriShape.skin = Nif::NiSkinInstancePtr(&mNiSkinInstance);
+        mNiTriShape.parent = &mNiNode;
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
@@ -804,9 +816,11 @@ namespace
     {
         copy(mTransform, mNiTriShape.trafo);
         mNiTriShape.trafo.scale = 3;
+        mNiTriShape.parent = &mNiNode;
 
         copy(mTransform, mNiTriShape2.trafo);
         mNiTriShape2.trafo.scale = 3;
+        mNiTriShape2.parent = &mNiNode;
 
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({
             Nif::NodePtr(&mNiTriShape),
@@ -873,6 +887,7 @@ namespace
         mController.flags |= Nif::NiNode::ControllerFlag_Active;
         copy(mTransform, mNiTriShape.trafo);
         mNiTriShape.trafo.scale = 3;
+        mNiTriShape.parent = &mNiNode;
         copy(mTransform, mNiTriShape2.trafo);
         mNiTriShape2.trafo.scale = 3;
         mNiTriShape2.parent = &mNiNode;
@@ -889,7 +904,7 @@ namespace
         const auto result = mLoader.load(mNifFile);
 
         std::unique_ptr<btTriangleMesh> triangles(new btTriangleMesh(false));
-        triangles->addTriangle(btVector3(1, 2, 3), btVector3(4, 2, 3), btVector3(4, 4.632747650146484375, 1.56172335147857666015625));
+        triangles->addTriangle(btVector3(4, 8, 12), btVector3(16, 8, 12), btVector3(16, 18.5309906005859375, 6.246893405914306640625));
         std::unique_ptr<Resource::TriangleMeshShape> mesh(new Resource::TriangleMeshShape(triangles.release(), true));
         mesh->setLocalScaling(btVector3(1, 1, 1));
 
@@ -938,6 +953,7 @@ namespace
 
     TEST_F(TestBulletNifLoader, for_root_avoid_node_and_tri_shape_child_node_should_return_shape_with_null_collision_shape)
     {
+        mNiTriShape.parent = &mNiNode;
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
         mNiNode.recType = Nif::RC_AvoidNode;
 
@@ -957,6 +973,7 @@ namespace
     TEST_F(TestBulletNifLoader, for_tri_shape_child_node_with_empty_data_should_return_shape_with_null_collision_shape)
     {
         mNiTriShape.data = Nif::NiGeometryDataPtr(nullptr);
+        mNiTriShape.parent = &mNiNode;
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
@@ -973,6 +990,7 @@ namespace
     {
         auto data = static_cast<Nif::NiTriShapeData*>(mNiTriShape.data.getPtr());
         data->triangles.clear();
+        mNiTriShape.parent = &mNiNode;
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
@@ -990,6 +1008,7 @@ namespace
         mNiStringExtraData.string = "NC___";
         mNiStringExtraData.recType = Nif::RC_NiStringExtraData;
         mNiTriShape.extra = Nif::ExtraPtr(&mNiStringExtraData);
+        mNiTriShape.parent = &mNiNode;
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
@@ -1008,6 +1027,7 @@ namespace
         mNiStringExtraData2.string = "NC___";
         mNiStringExtraData2.recType = Nif::RC_NiStringExtraData;
         mNiTriShape.extra = Nif::ExtraPtr(&mNiStringExtraData);
+        mNiTriShape.parent = &mNiNode;
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
@@ -1025,6 +1045,7 @@ namespace
         mNiStringExtraData.string = "MRK";
         mNiStringExtraData.recType = Nif::RC_NiStringExtraData;
         mNiTriShape.extra = Nif::ExtraPtr(&mNiStringExtraData);
+        mNiTriShape.parent = &mNiNode;
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
@@ -1042,8 +1063,10 @@ namespace
         mNiStringExtraData.string = "MRK";
         mNiStringExtraData.recType = Nif::RC_NiStringExtraData;
         mNiTriShape.extra = Nif::ExtraPtr(&mNiStringExtraData);
+        mNiTriShape.parent = &mNiNode2;
         mNiNode2.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
         mNiNode2.recType = Nif::RC_RootCollisionNode;
+        mNiNode2.parent = &mNiNode;
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiNode2)}));
         mNiNode.recType = Nif::RC_NiNode;
 
@@ -1134,6 +1157,7 @@ namespace
 
     TEST_F(TestBulletNifLoader, for_avoid_collision_mesh_should_ignore_tri_strips_data_with_less_than_3_strips)
     {
+        mNiTriShape.parent = &mNiNode;
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
         mNiNode.recType = Nif::RC_AvoidNode;
         mNiTriStripsData.strips.front() = {0, 1};
diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index 5edf69e17d..6678d8ff74 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -1,5 +1,6 @@
 #include "bulletnifloader.hpp"
 
+#include <cassert>
 #include <vector>
 #include <variant>
 
@@ -367,8 +368,11 @@ void BulletNifLoader::handleNode(const std::string& fileName, const Nif::Node& n
         const Nif::NodeList &list = ninode->children;
         for(size_t i = 0;i < list.length();i++)
         {
-            if(!list[i].empty())
-                handleNode(fileName, list[i].get(), flags, isCollisionNode, isAnimated, autogenerated, avoid);
+            if (list[i].empty())
+                continue;
+
+            assert(list[i].get().parent == &node);
+            handleNode(fileName, list[i].get(), flags, isCollisionNode, isAnimated, autogenerated, avoid);
         }
     }
 }

From 4657c655b10621f2be75a6fc60ea6dcb721d3727 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Wed, 3 Nov 2021 08:02:06 +0000
Subject: [PATCH 1622/2859] refactors parentFileIndices (#3211)

This PR aims to start addressing `ESM` design issues that have silenced errors we incorporated into groundcover `ESM` loading approaches.

- We move the resolution of `parentFileIndices` from `ESMStore` to `ESMReader` as suggested in a `TODO` comment.
- We improve a highly misleading comment which downplayed the significance of `parentFileIndices`.
- We document important preconditions.
- We move a user facing error message to the highest level and improve its context.
- We remove an inappropriate `setGlobalReaderList` method. We now pass this reader list into the method that requires it.
- We remove a thoroughly pointless optimisation of `Store<ESM::LandTexture>`'s construction that has unnecessarily depended on `getGlobalReaderList`.

There should be no functional changes for `master`, but this PR should remove an issue blocking PR #3208.
---
 apps/openmw/mwworld/esmloader.cpp             |  2 +-
 apps/openmw/mwworld/esmstore.cpp              | 40 ++-----------------
 apps/openmw/mwworld/store.cpp                 |  5 ---
 apps/openmw/mwworld/worldimp.cpp              | 21 ++++++++++
 apps/openmw/mwworld/worldimp.hpp              |  1 +
 apps/openmw_test_suite/mwworld/test_store.cpp | 13 +-----
 components/esm/esmreader.cpp                  | 27 ++++++++++++-
 components/esm/esmreader.hpp                  | 13 +++---
 components/esmloader/load.cpp                 |  1 -
 9 files changed, 60 insertions(+), 63 deletions(-)

diff --git a/apps/openmw/mwworld/esmloader.cpp b/apps/openmw/mwworld/esmloader.cpp
index 06debf4a97..647f5d3609 100644
--- a/apps/openmw/mwworld/esmloader.cpp
+++ b/apps/openmw/mwworld/esmloader.cpp
@@ -42,7 +42,7 @@ void EsmLoader::load(const boost::filesystem::path& filepath, int& index)
   ESM::ESMReader lEsm;
   lEsm.setEncoder(mEncoder);
   lEsm.setIndex(index);
-  lEsm.setGlobalReaderList(&mEsm);
+  lEsm.resolveParentFileIndices(mEsm);
   lEsm.open(filepath.string());
   mEsm[index] = lEsm;
   mStore.load(mEsm[index], &mListener);
diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index 5ec95ecf47..183b13ca09 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -4,8 +4,6 @@
 #include <fstream>
 #include <set>
 
-#include <boost/filesystem/operations.hpp>
-
 #include <components/debug/debuglog.hpp>
 #include <components/esm/esmreader.hpp>
 #include <components/esm/esmwriter.hpp>
@@ -153,41 +151,9 @@ void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener)
     ESM::Dialogue *dialogue = nullptr;
 
     // Land texture loading needs to use a separate internal store for each plugin.
-    // We set the number of plugins here to avoid continual resizes during loading,
-    // and so we can properly verify if valid plugin indices are being passed to the
-    // LandTexture Store retrieval methods.
-    mLandTextures.resize(esm.getGlobalReaderList()->size());
-
-    /// \todo Move this to somewhere else. ESMReader?
-    // Cache parent esX files by tracking their indices in the global list of
-    //  all files/readers used by the engine. This will greaty accelerate
-    //  refnumber mangling, as required for handling moved references.
-    const std::vector<ESM::Header::MasterData> &masters = esm.getGameFiles();
-    std::vector<ESM::ESMReader> *allPlugins = esm.getGlobalReaderList();
-    for (size_t j = 0; j < masters.size(); j++) {
-        const ESM::Header::MasterData &mast = masters[j];
-        std::string fname = mast.name;
-        int index = ~0;
-        for (int i = 0; i < esm.getIndex(); i++) {
-            ESM::ESMReader& reader = allPlugins->at(i);
-            if (reader.getFileSize() == 0)
-                continue;  // Content file in non-ESM format
-            const std::string candidate = reader.getContext().filename;
-            std::string fnamecandidate = boost::filesystem::path(candidate).filename().string();
-            if (Misc::StringUtils::ciEqual(fname, fnamecandidate)) {
-                index = i;
-                break;
-            }
-        }
-        if (index == (int)~0) {
-            // Tried to load a parent file that has not been loaded yet. This is bad,
-            //  the launcher should have taken care of this.
-            std::string fstring = "File " + esm.getName() + " asks for parent file " + masters[j].name
-                + ", but it has not been loaded yet. Please check your load order.";
-            esm.fail(fstring);
-        }
-        esm.addParentFileIndex(index);
-    }
+    // We set the number of plugins here so we can properly verify if valid plugin
+    // indices are being passed to the LandTexture Store retrieval methods.
+    mLandTextures.resize(mLandTextures.getSize()+1);
 
     // Loop through all records
     while(esm.hasMoreRecs())
diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index 32458a2e84..06ea97a859 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -293,11 +293,6 @@ namespace MWWorld
     //=========================================================================
     Store<ESM::LandTexture>::Store()
     {
-        mStatic.emplace_back();
-        LandTextureList &ltexl = mStatic[0];
-        // More than enough to hold Morrowind.esm. Extra lists for plugins will we
-        //  added on-the-fly in a different method.
-        ltexl.reserve(128);
     }
     const ESM::LandTexture *Store<ESM::LandTexture>::search(size_t index, size_t plugin) const
     {
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 34907691e9..d35f72e80c 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -178,6 +178,10 @@ namespace MWWorld
         if (mEsm[0].getFormat() == 0)
             ensureNeededRecords();
 
+        // TODO: We can and should validate before we call loadContentFiles().
+        // Currently we validate here to prevent merge conflicts with groundcover ESMStore fixes.
+        validateMasterFiles(mEsm);
+
         mCurrentDate.reset(new DateTimeManager());
 
         fillGlobalVariables();
@@ -407,6 +411,23 @@ namespace MWWorld
         }
     }
 
+    void World::validateMasterFiles(const std::vector<ESM::ESMReader>& readers)
+    {
+        for (const auto& esm : readers)
+        {
+            assert(esm.getGameFiles().size() == esm.getParentFileIndices().size());
+            for (unsigned int i=0; i<esm.getParentFileIndices().size(); ++i)
+            {
+                if (!esm.isValidParentFileIndex(i))
+                {
+                    std::string fstring = "File " + esm.getName() + " asks for parent file " + esm.getGameFiles()[i].name
+                        + ", but it is not available or has been loaded in the wrong order. Please run the launcher to fix this issue.";
+                    throw std::runtime_error(fstring);
+                }
+            }
+        }
+    }
+
     void World::ensureNeededRecords()
     {
         std::map<std::string, ESM::Variant> gmst;
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index a795b4eafd..afad359cfd 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -157,6 +157,7 @@ namespace MWWorld
             void updateNavigatorObject(const MWPhysics::Object& object);
 
             void ensureNeededRecords();
+            void validateMasterFiles(const std::vector<ESM::ESMReader>& readers);
 
             void fillGlobalVariables();
 
diff --git a/apps/openmw_test_suite/mwworld/test_store.cpp b/apps/openmw_test_suite/mwworld/test_store.cpp
index 3fe479587c..29240a1f7f 100644
--- a/apps/openmw_test_suite/mwworld/test_store.cpp
+++ b/apps/openmw_test_suite/mwworld/test_store.cpp
@@ -29,19 +29,14 @@ struct ContentFileTest : public ::testing::Test
         readContentFiles();
 
         // load the content files
-        std::vector<ESM::ESMReader> readerList;
-        readerList.resize(mContentFiles.size());
-
         int index=0;
         for (const auto & mContentFile : mContentFiles)
         {
             ESM::ESMReader lEsm;
             lEsm.setEncoder(nullptr);
             lEsm.setIndex(index);
-            lEsm.setGlobalReaderList(&readerList);
             lEsm.open(mContentFile.string());
-            readerList[index] = lEsm;
-            mEsmStore.load(readerList[index], &dummyListener);
+            mEsmStore.load(lEsm, &dummyListener);
 
             ++index;
         }
@@ -254,9 +249,6 @@ TEST_F(StoreTest, delete_test)
     record.mId = recordId;
 
     ESM::ESMReader reader;
-    std::vector<ESM::ESMReader> readerList;
-    readerList.push_back(reader);
-    reader.setGlobalReaderList(&readerList);
 
     // master file inserts a record
     Files::IStreamPtr file = getEsmFile(record, false);
@@ -297,9 +289,6 @@ TEST_F(StoreTest, overwrite_test)
     record.mId = recordId;
 
     ESM::ESMReader reader;
-    std::vector<ESM::ESMReader> readerList;
-    readerList.push_back(reader);
-    reader.setGlobalReaderList(&readerList);
 
     // master file inserts a record
     Files::IStreamPtr file = getEsmFile(record, false);
diff --git a/components/esm/esmreader.cpp b/components/esm/esmreader.cpp
index dbf713315b..316748b53a 100644
--- a/components/esm/esmreader.cpp
+++ b/components/esm/esmreader.cpp
@@ -1,5 +1,8 @@
 #include "esmreader.hpp"
 
+#include <boost/filesystem/path.hpp>
+#include <components/misc/stringops.hpp>
+
 #include <stdexcept>
 
 namespace ESM
@@ -17,7 +20,6 @@ ESM_Context ESMReader::getContext()
 ESMReader::ESMReader()
     : mRecordFlags(0)
     , mBuffer(50*1024)
-    , mGlobalReaderList(nullptr)
     , mEncoder(nullptr)
     , mFileSize(0)
 {
@@ -55,6 +57,29 @@ void ESMReader::clearCtx()
    mCtx.subName.clear();
 }
 
+void ESMReader::resolveParentFileIndices(const std::vector<ESMReader>& allPlugins)
+{
+    mCtx.parentFileIndices.clear();
+    const std::vector<Header::MasterData> &masters = getGameFiles();
+    for (size_t j = 0; j < masters.size(); j++) {
+        const Header::MasterData &mast = masters[j];
+        std::string fname = mast.name;
+        int index = getIndex(); 
+        for (int i = 0; i < getIndex(); i++) {
+            const ESMReader& reader = allPlugins.at(i);
+            if (reader.getFileSize() == 0)
+                continue;  // Content file in non-ESM format
+            const std::string candidate = reader.getName();
+            std::string fnamecandidate = boost::filesystem::path(candidate).filename().string();
+            if (Misc::StringUtils::ciEqual(fname, fnamecandidate)) {
+                index = i;
+                break;
+            }
+        }
+        mCtx.parentFileIndices.push_back(index);
+    }
+}
+
 void ESMReader::openRaw(Files::IStreamPtr _esm, const std::string& name)
 {
     close();
diff --git a/components/esm/esmreader.hpp b/components/esm/esmreader.hpp
index a438dca0cd..92f2a6673b 100644
--- a/components/esm/esmreader.hpp
+++ b/components/esm/esmreader.hpp
@@ -80,13 +80,15 @@ public:
   //  to the individual load() methods. This hack allows to pass this reference
   //  indirectly to the load() method.
   void setIndex(const int index) { mCtx.index = index;}
-  int getIndex() {return mCtx.index;}
+  int getIndex() const {return mCtx.index;}
 
-  void setGlobalReaderList(std::vector<ESMReader> *list) {mGlobalReaderList = list;}
-  std::vector<ESMReader> *getGlobalReaderList() {return mGlobalReaderList;}
-
-  void addParentFileIndex(int index) { mCtx.parentFileIndices.push_back(index); }
+  // Assign parent esX files by tracking their indices in the global list of
+  // all files/readers used by the engine. This is required for correct adjustRefNum() results
+  // as required for handling moved, deleted and edited CellRefs.
+  /// @note Does not validate.
+  void resolveParentFileIndices(const std::vector<ESMReader>& files);
   const std::vector<int>& getParentFileIndices() const { return mCtx.parentFileIndices; }
+  bool isValidParentFileIndex(int i) const { return i != getIndex(); }
 
   /*************************************************************************
    *
@@ -279,7 +281,6 @@ private:
 
   Header mHeader;
 
-  std::vector<ESMReader> *mGlobalReaderList;
   ToUTF8::Utf8Encoder* mEncoder;
 
   size_t mFileSize;
diff --git a/components/esmloader/load.cpp b/components/esmloader/load.cpp
index 789e7619b6..9879f33274 100644
--- a/components/esmloader/load.cpp
+++ b/components/esmloader/load.cpp
@@ -214,7 +214,6 @@ namespace EsmLoader
                 ESM::ESMReader& reader = readers[i];
                 reader.setEncoder(encoder);
                 reader.setIndex(static_cast<int>(i));
-                reader.setGlobalReaderList(&readers);
                 reader.open(collection.getPath(file).string());
 
                 loadEsm(query, readers[i], result);

From fac84b5dd36387e6f96325723be545c15ba5de72 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Tue, 2 Nov 2021 20:13:41 +0000
Subject: [PATCH 1623/2859] restores ESM::Dialogue order (#3209)

With this PR we restore the previous order of `ESM::Dialogue` entries implicitly changed by PR #3197. In the future we may want to consider additional verification and documentation of `mShared` order inconsistencies. We might additionally consider applying this sorting in the particular code that requires it.
---
 apps/openmw/mwworld/store.cpp |  3 +++
 apps/openmw/mwworld/store.hpp | 11 +++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index 06ea97a859..5e3f4079c3 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -1005,6 +1005,9 @@ namespace MWWorld
         mShared.reserve(mStatic.size());
         for (auto & [_, dial] : mStatic)
             mShared.push_back(&dial);
+        // TODO: verify and document this inconsistent behaviour
+        // TODO: if we require this behaviour, maybe we should move it to the place that requires it
+        std::sort(mShared.begin(), mShared.end(), [](const ESM::Dialogue* l, const ESM::Dialogue* r) -> bool { return l->mId < r->mId; });
     }
 
     template <>
diff --git a/apps/openmw/mwworld/store.hpp b/apps/openmw/mwworld/store.hpp
index dbb28258ef..4c32b65ec7 100644
--- a/apps/openmw/mwworld/store.hpp
+++ b/apps/openmw/mwworld/store.hpp
@@ -8,7 +8,8 @@
 #include <unordered_map>
 #include <set>
 
-#include "recordcmp.hpp"
+#include <components/esm/records.hpp>
+#include <components/misc/stringops.hpp>
 
 namespace ESM
 {
@@ -150,9 +151,11 @@ namespace MWWorld
     {
         typedef std::unordered_map<std::string, T, Misc::StringUtils::CiHash, Misc::StringUtils::CiEqual> Static;
         Static mStatic;
-        std::vector<T*> mShared; // Preserves the record order as it came from the content files (this
-                                     // is relevant for the spell autocalc code and selection order
-                                     // for heads/hairs in the character creation)
+        /// @par mShared usually preserves the record order as it came from the content files (this
+        /// is relevant for the spell autocalc code and selection order
+        /// for heads/hairs in the character creation)
+        /// @warning ESM::Dialogue Store currently implements a sorted order for unknown reasons.
+        std::vector<T*> mShared;
         typedef std::unordered_map<std::string, T, Misc::StringUtils::CiHash, Misc::StringUtils::CiEqual> Dynamic;
         Dynamic mDynamic;
 

From 2d3c6faec414b1f92729f4a1e1ef7bba919f4445 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Tue, 26 Oct 2021 08:59:11 +0000
Subject: [PATCH 1624/2859] Merge branch 'conditional_push_builds' into
 'master'

Add support for daily builds

See merge request OpenMW/openmw!1314

(cherry picked from commit 50ea9869528c984b8ea66864fa08f5f710734eff)

1ee18b88 Update .gitlab-ci.yml file
603b0ad8 Update .gitlab-ci.yml
a69cc468 Update .gitlab-ci.yml
---
 .gitlab-ci.yml | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b69e930ae2..a07dec1d68 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,6 +8,9 @@ stages:
     - docker
     - linux
   image: debian:bullseye
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "push"  
+  
 
 .Debian:
   extends: .Debian_Image
@@ -52,7 +55,7 @@ Coverity:
   extends: .Debian_Image
   stage: build
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "schedule"'
+    - 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
@@ -70,7 +73,6 @@ Coverity:
   variables:
     CC: gcc
     CXX: g++
-  artifacts:
 
 Debian_GCC:
   extends: .Debian
@@ -162,6 +164,7 @@ Debian_Clang_tests_Debug:
   only:
     variables:
       - $CI_PROJECT_ID == "7107382"
+      - $CI_PIPELINE_SOURCE == "push"    
   cache:
     paths:
     - ccache/
@@ -213,6 +216,8 @@ variables: &tests-targets
 .Windows_Ninja_Base:
   tags:
     - windows
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "push"    
   before_script:
   - Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1"
   - choco source add -n=openmw-proxy -s="https://repo.openmw.org/repository/Chocolatey/" --priority=1
@@ -329,6 +334,8 @@ Windows_Ninja_Tests_RelWithDebInfo:
 .Windows_MSBuild_Base:
   tags:
     - windows
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "push"    
   before_script:
   - Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1"
   - choco source add -n=openmw-proxy -s="https://repo.openmw.org/repository/Chocolatey/" --priority=1
@@ -389,6 +396,15 @@ Windows_Ninja_Tests_RelWithDebInfo:
     - MSVC2019_64/*/*/*/*/*/*/*.log
     - MSVC2019_64/*/*/*/*/*/*/*/*.log
 
+Daily_Windows_MSBuild_Engine_Release:on-schedule:
+  extends:
+    - .Windows_MSBuild_Base
+  variables:
+    <<: *engine-targets
+    config: "Release"
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "schedule"
+
 Windows_MSBuild_Engine_Release:
   extends:
     - .Windows_MSBuild_Base
@@ -444,6 +460,8 @@ Debian_AndroidNDK_arm64-v8a:
   tags:
     - linux
   image: debian:bullseye
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "push"  
   variables:
     CCACHE_SIZE: 3G
   cache:

From f684c1da528106abf59e0aacdea93552c59adb36 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Thu, 4 Nov 2021 09:15:05 +0000
Subject: [PATCH 1625/2859] fixes assertion (#3215)

This PR fixes an assertion introduced by #3211. For some reason my build originally did not contain assertions despite passing `DEBUG` into cmake, but after deleting `CMakeCache.txt` I have now hit the assertion @glassmancody reported as well.
---
 apps/openmw/mwworld/esmloader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/esmloader.cpp b/apps/openmw/mwworld/esmloader.cpp
index 647f5d3609..1917c41428 100644
--- a/apps/openmw/mwworld/esmloader.cpp
+++ b/apps/openmw/mwworld/esmloader.cpp
@@ -42,8 +42,8 @@ void EsmLoader::load(const boost::filesystem::path& filepath, int& index)
   ESM::ESMReader lEsm;
   lEsm.setEncoder(mEncoder);
   lEsm.setIndex(index);
-  lEsm.resolveParentFileIndices(mEsm);
   lEsm.open(filepath.string());
+  lEsm.resolveParentFileIndices(mEsm);
   mEsm[index] = lEsm;
   mStore.load(mEsm[index], &mListener);
 }

From ec6af42fb6eb4eebde67c2199f14be5d2903f9dd Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 3 Nov 2021 16:31:21 +0100
Subject: [PATCH 1626/2859] Add CI job to find missing MRs

---
 .gitlab-ci.yml                         | 15 ++++
 .resubmitted_merge_requests.txt        |  5 ++
 scripts/find_missing_merge_requests.py | 99 ++++++++++++++++++++++----
 3 files changed, 107 insertions(+), 12 deletions(-)
 create mode 100644 .resubmitted_merge_requests.txt

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a07dec1d68..18fbbd91a1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -493,3 +493,18 @@ Debian_AndroidNDK_arm64-v8a:
   # 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
 
+FindMissingMergeRequests:
+  image: python:latest
+  stage: build
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
+  variables:
+    PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
+  cache:
+    key: FindMissingMergeRequests.v1
+    paths:
+      - .cache/pip
+  before_script:
+    - pip3 install --user requests click discord_webhook
+  script:
+    - scripts/find_missing_merge_requests.py --project_id=$CI_PROJECT_ID --ignored_mrs_path=$CI_PROJECT_DIR/.resubmitted_merge_requests.txt
diff --git a/.resubmitted_merge_requests.txt b/.resubmitted_merge_requests.txt
new file mode 100644
index 0000000000..01af064708
--- /dev/null
+++ b/.resubmitted_merge_requests.txt
@@ -0,0 +1,5 @@
+1314
+1216
+1172
+1160
+1051
diff --git a/scripts/find_missing_merge_requests.py b/scripts/find_missing_merge_requests.py
index 09d3e9a581..be54750098 100755
--- a/scripts/find_missing_merge_requests.py
+++ b/scripts/find_missing_merge_requests.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python3
 
 import click
+import discord_webhook
 import multiprocessing
+import os
 import pathlib
 import requests
 import urllib.parse
@@ -24,18 +26,23 @@ import urllib.parse
               help='End before given /merge_requests page.')
 @click.option('--per_page', type=int, default=100,
               help='Number of merge requests per page.')
-def main(token_path, project_id, host, workers, target_branch, begin_page, end_page, per_page):
-    token = read_token(token_path)
+@click.option('--ignored_mrs_path', type=str,
+              help='Path to a list of ignored MRs.')
+def main(token_path, project_id, host, workers, target_branch, begin_page, end_page, per_page, ignored_mrs_path):
+    headers = make_headers(token_path)
     base_url = f'https://{host}/api/v4/projects/{project_id}/'
+    discord_webhook_url = os.getenv('DISCORD_WEBHOOK_URL')
+    ignored_mrs = frozenset(read_ignored_mrs(ignored_mrs_path))
     checked = 0
     filtered = 0
     missing = 0
+    missing_mrs = list()
     for page in range(begin_page, end_page):
-        merge_requests = requests.get(
+        merge_requests = parse_gitlab_response(requests.get(
             url=urllib.parse.urljoin(base_url, 'merge_requests'),
-            headers={'PRIVATE-TOKEN': token},
+            headers=headers,
             params=dict(state='merged', per_page=per_page, page=page),
-        ).json()
+        ))
         if not merge_requests:
             break
         checked += len(merge_requests)
@@ -44,24 +51,63 @@ def main(token_path, project_id, host, workers, target_branch, begin_page, end_p
             continue
         filtered += len(merge_requests)
         with multiprocessing.Pool(workers) as pool:
-            missing_merge_requests = pool.map(FilterMissingMergeRequest(token, base_url), merge_requests)
+            missing_merge_requests = pool.map(FilterMissingMergeRequest(headers, base_url), merge_requests)
             for mr in missing_merge_requests:
-                if mr is not None:
-                    missing += 1
-                    print(f"MR {mr['reference']} ({mr['id']}) is missing from branch {mr['target_branch']},"
+                if mr is None:
+                    continue
+                if mr['reference'] in ignored_mrs or mr['reference'].strip('!') in ignored_mrs:
+                    print(f"Ignored MR {mr['reference']} ({mr['id']}) is missing from branch {mr['target_branch']},"
                           f" previously was merged as {mr['merge_commit_sha']}")
+                    continue
+                missing += 1
+                missing_mrs.append(mr)
+                print(f"MR {mr['reference']} ({mr['id']}) is missing from branch {mr['target_branch']},"
+                      f" previously was merged as {mr['merge_commit_sha']}")
     print(f'Checked {checked} MRs ({filtered} with {target_branch} target branch), {missing} are missing')
+    if discord_webhook_url is not None and missing_mrs:
+        project_web_url = parse_gitlab_response(requests.get(url=base_url, headers=headers))['web_url'] + '/'
+        discord_message = format_discord_message(missing=missing, filtered=filtered, target_branch=target_branch,
+                                                 project_web_url=project_web_url, missing_mrs=missing_mrs)
+        print('Sending Discord notification...')
+        print(discord_message)
+        discord_webhook.DiscordWebhook(url=discord_webhook_url, content=discord_message, rate_limit_retry=True).execute()
+    if missing_mrs:
+        exit(-1)
+
+
+def format_discord_message(missing, filtered, target_branch, project_web_url, missing_mrs):
+    target_branch = format_link(target_branch, urllib.parse.urljoin(project_web_url, f'-/tree/{target_branch}'))
+    return (
+        f'Found {missing} missing MRs out of {filtered} from {target_branch} target branch:\n'
+        + '\n'.join(format_missing_mr_message(v, project_web_url) for v in missing_mrs)
+    )
+
+
+def format_missing_mr_message(mr, project_web_url):
+    web_url = mr.get('web_url')
+    reference = mr['reference']
+    target_branch = mr['target_branch']
+    commit = mr['merge_commit_sha']
+    if web_url is not None:
+        reference = format_link(reference, web_url)
+        target_branch = format_link(target_branch, urllib.parse.urljoin(project_web_url, f'-/tree/{target_branch}'))
+        commit = format_link(commit, urllib.parse.urljoin(project_web_url, f'-/commit/{commit}'))
+    return f"MR {reference} is missing from branch {target_branch}, previously was merged as {commit}"
+
+
+def format_link(name, url):
+    return f'[{name}]({url})'
 
 
 class FilterMissingMergeRequest:
-    def __init__(self, token, base_url):
-        self.token = token
+    def __init__(self, headers, base_url):
+        self.headers = headers
         self.base_url = base_url
 
     def __call__(self, merge_request):
         commit_refs = requests.get(
             url=urllib.parse.urljoin(self.base_url, f"repository/commits/{merge_request['merge_commit_sha']}/refs"),
-            headers={'PRIVATE-TOKEN': self.token},
+            headers=self.headers,
         ).json()
         if 'message' in commit_refs and commit_refs['message'] == '404 Commit Not Found':
             return merge_request
@@ -73,10 +119,39 @@ def present_in_branch(commit_refs, branch):
     return bool(next((v for v in commit_refs if v['type'] == 'branch' and v['name'] == branch), None))
 
 
+def make_headers(token_path):
+    job_token = os.environ.get('CI_JOB_TOKEN')
+    if job_token is not None:
+        print('Using auth token from CI_JOB_TOKEN env')
+        return {'JOB_TOKEN': job_token}
+    if not os.path.exists(token_path):
+        print(f'Ignore absent token path: {token_path}')
+        return dict()
+    print(f'Using auth token from: {token_path}')
+    return {'PRIVATE-TOKEN': read_token(token_path)}
+
+
+def read_ignored_mrs(path):
+    if path is None:
+        return
+    with open(path) as stream:
+        for line in stream:
+            yield line.strip()
+
+
 def read_token(path):
     with open(path) as stream:
         return stream.readline().strip()
 
 
+def parse_gitlab_response(response):
+    response = response.json()
+    if isinstance(response, dict):
+        message = response.get('message')
+        if message is not None:
+            raise RuntimeError(f'Gitlab request has failed: {message}')
+    return response
+
+
 if __name__ == '__main__':
     main()

From db04dee29da240f8f671cef0d9a565c6a0e3abdd Mon Sep 17 00:00:00 2001
From: wareya <wareya@gmail.com>
Date: Thu, 4 Nov 2021 10:09:48 -0400
Subject: [PATCH 1627/2859] Force MSVC to build in utf-8 mode

---
 CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b4e5609ae..f2ee87b2ce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -199,6 +199,10 @@ if (WIN32)
     option(USE_DEBUG_CONSOLE "whether a debug console should be enabled for debug builds, if false debug output is redirected to Visual Studio output" ON)
 endif()
 
+if(MSVC)
+  add_compile_options("/utf-8")
+endif()
+
 # Dependencies
 find_package(OpenGL REQUIRED)
 

From 4c3dd1a964eca65f1b68b15abd2877ba64768e4e Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Thu, 4 Nov 2021 08:42:22 -0700
Subject: [PATCH 1628/2859] remove particle node when resetting particle effect

---
 apps/openmw/mwrender/sky.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index eb7c4a3882..b6b0a3669b 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -535,7 +535,11 @@ namespace MWRender
         mRootNode->setNodeMask(enabled ? Mask_Sky : 0u);
 
         if (!enabled && mParticleNode && mParticleEffect)
-            mCurrentParticleEffect = {};
+        {
+            mCurrentParticleEffect.clear();
+            mParticleNode->removeChild(mParticleEffect);
+            mParticleEffect = nullptr;
+        }
 
         mEnabled = enabled;
     }

From 3042c000c6d51cc9ed819325ccc8cc0622c8478f Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Thu, 4 Nov 2021 15:53:57 +0000
Subject: [PATCH 1629/2859] fixes setActorFade logic errors (#3195)

* resets state updater to apply light settings (#3141)

resets state updater to apply light settings

With this PR we achieve the same effect with fewer lines of code.

* fixes LightSource logic errors

We currently update `LightSource::setActorFade` in `TransparencyUpdater`. There are several logic errors inherent in this approach:
1. We fail to update `LightSource::setActorFade` for off screen actors because their `TransparencyUpdater` cull callback is not invoked.
2. We fail to update `LightSource::setActorFade` in the instant that a `TransparencyUpdater` is removed.
3. We fail to update `setActorFade` when an `mExtraLightSource` is created after calling `Animation::setAlpha`.
With this PR we avoid such issues by updating `LightSource::setActorFade` in `Animation::setAlpha` and `Animation::addExtraLightSource` instead.
---
 apps/openmw/mwrender/animation.cpp | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 91ef6cc975..ecfe65c575 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -389,11 +389,6 @@ namespace MWRender
             mAlpha = alpha;
         }
 
-        void setLightSource(const osg::ref_ptr<SceneUtil::LightSource>& lightSource)
-        {
-            mLightSource = lightSource;
-        }
-
     protected:
         void setDefaults(osg::StateSet* stateset) override
         {
@@ -416,13 +411,10 @@ namespace MWRender
         {
             osg::Material* material = static_cast<osg::Material*>(stateset->getAttribute(osg::StateAttribute::MATERIAL));
             material->setAlpha(osg::Material::FRONT_AND_BACK, mAlpha);
-            if (mLightSource)
-                mLightSource->setActorFade(mAlpha);
         }
 
     private:
         float mAlpha;
-        osg::ref_ptr<SceneUtil::LightSource> mLightSource;
     };
 
     struct Animation::AnimSource
@@ -1485,6 +1477,7 @@ namespace MWRender
         bool exterior = mPtr.isInCell() && mPtr.getCell()->getCell()->isExterior();
 
         mExtraLightSource = SceneUtil::addLight(parent, esmLight, Mask_ParticleSystem, Mask_Lighting, exterior);
+        mExtraLightSource->setActorFade(mAlpha);
     }
 
     void Animation::addEffect (const std::string& model, int effectId, bool loop, const std::string& bonename, const std::string& texture)
@@ -1639,7 +1632,6 @@ namespace MWRender
             if (mTransparencyUpdater == nullptr)
             {
                 mTransparencyUpdater = new TransparencyUpdater(alpha);
-                mTransparencyUpdater->setLightSource(mExtraLightSource);
                 mObjectRoot->addCullCallback(mTransparencyUpdater);
             }
             else
@@ -1650,6 +1642,8 @@ namespace MWRender
             mObjectRoot->removeCullCallback(mTransparencyUpdater);
             mTransparencyUpdater = nullptr;
         }
+        if (mExtraLightSource)
+            mExtraLightSource->setActorFade(alpha);
     }
 
     void Animation::setLightEffect(float effect)

From 1979ee1491a2e8065a00e998b2b357445528c6c4 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Thu, 4 Nov 2021 15:54:47 +0000
Subject: [PATCH 1630/2859] refactors hashed std::map (#3199)

We currently apply a strange algorithm to `LightManager::mStateSetCache`. For some reason this algorithm inserts hashed keys into `std::map` in a way that fails to handle hash collisions and exhibits worse lookup complexity than `std::unordered_map`. With this PR we just use `std::unordered_map` here.
---
 components/sceneutil/lightmanager.cpp | 42 +++++++++++++++++----------
 components/sceneutil/lightmanager.hpp |  8 +++--
 2 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index f38fd80d26..a5ce448b75 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -1,6 +1,8 @@
 #include "lightmanager.hpp"
 
 #include <array>
+#include <algorithm>
+#include <iterator>
 
 #include <osg/BufferObject>
 #include <osg/BufferIndexBinding>
@@ -1158,29 +1160,39 @@ namespace SceneUtil
         return mSun;
     }
 
-    osg::ref_ptr<osg::StateSet> LightManager::getLightListStateSet(const LightList& lightList, size_t frameNum, const osg::RefMatrix* viewMatrix)
+    size_t LightManager::HashLightIdList::operator()(const LightIdList& lightIdList) const
     {
-        // possible optimization: return a StateSet containing all requested lights plus some extra lights (if a suitable one exists)
         size_t hash = 0;
-        for (size_t i = 0; i < lightList.size(); ++i)
-        {
-            auto id = lightList[i]->mLightSource->getId();
-            Misc::hashCombine(hash, id);
+        for (size_t i = 0; i < lightIdList.size(); ++i)
+            Misc::hashCombine(hash, lightIdList[i]);
+        return hash;
+    }
 
-            if (getLightingMethod() != LightingMethod::SingleUBO)
-                continue;
+    osg::ref_ptr<osg::StateSet> LightManager::getLightListStateSet(const LightList& lightList, size_t frameNum, const osg::RefMatrix* viewMatrix)
+    {
+        // possible optimization: return a StateSet containing all requested lights plus some extra lights (if a suitable one exists)
 
-            if (getLightIndexMap(frameNum).find(id) != getLightIndexMap(frameNum).end())
-                continue;
+        if (getLightingMethod() == LightingMethod::SingleUBO)
+        {
+            for (size_t i = 0; i < lightList.size(); ++i)
+            {
+                auto id = lightList[i]->mLightSource->getId();
+                if (getLightIndexMap(frameNum).find(id) != getLightIndexMap(frameNum).end())
+                    continue;
 
-            int index = getLightIndexMap(frameNum).size() + 1;
-            updateGPUPointLight(index, lightList[i]->mLightSource, frameNum, viewMatrix);
-            getLightIndexMap(frameNum).emplace(lightList[i]->mLightSource->getId(), index);
+                int index = getLightIndexMap(frameNum).size() + 1;
+                updateGPUPointLight(index, lightList[i]->mLightSource, frameNum, viewMatrix);
+                getLightIndexMap(frameNum).emplace(id, index);
+            }
         }
 
         auto& stateSetCache = mStateSetCache[frameNum%2];
 
-        auto found = stateSetCache.find(hash);
+        LightIdList lightIdList;
+        lightIdList.reserve(lightList.size());
+        std::transform(lightList.begin(), lightList.end(), std::back_inserter(lightIdList), [] (const LightSourceViewBound* l) { return l->mLightSource->getId(); });
+
+        auto found = stateSetCache.find(lightIdList);
         if (found != stateSetCache.end())
         {
             mStateSetGenerator->update(found->second, lightList, frameNum);
@@ -1188,7 +1200,7 @@ namespace SceneUtil
         }
 
         auto stateset = mStateSetGenerator->generate(lightList, frameNum);
-        stateSetCache.emplace(hash, stateset);
+        stateSetCache.emplace(lightIdList, stateset);
         return stateset;
     }
 
diff --git a/components/sceneutil/lightmanager.hpp b/components/sceneutil/lightmanager.hpp
index b518a4723c..4a7dc7dbe7 100644
--- a/components/sceneutil/lightmanager.hpp
+++ b/components/sceneutil/lightmanager.hpp
@@ -207,8 +207,12 @@ namespace SceneUtil
         using LightSourceViewBoundCollection = std::vector<LightSourceViewBound>;
         std::map<osg::observer_ptr<osg::Camera>, LightSourceViewBoundCollection> mLightsInViewSpace;
 
-        // < Light list hash , StateSet >
-        using LightStateSetMap = std::map<size_t, osg::ref_ptr<osg::StateSet>>;
+        using LightIdList = std::vector<int>;
+        struct HashLightIdList
+        {
+            size_t operator()(const LightIdList&) const;
+        };
+        using LightStateSetMap = std::unordered_map<LightIdList, osg::ref_ptr<osg::StateSet>, HashLightIdList>;
         LightStateSetMap mStateSetCache[2];
 
         std::vector<osg::ref_ptr<osg::StateAttribute>> mDummies;

From 6cf74f7041c120f25e27d54b579ee19bd62bc2a5 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Thu, 4 Nov 2021 15:55:32 +0000
Subject: [PATCH 1631/2859] refactors ESM::Land (#3213)

With this PR we reduce coupling, simplify code, encapsulate a variable and separate actual `ESM` data from its context.
---
 apps/opencs/model/world/collection.hpp |  4 ++--
 apps/opencs/model/world/columnimp.cpp  |  2 +-
 apps/openmw/mwworld/esmstore.cpp       |  2 +-
 apps/openmw/mwworld/store.cpp          | 15 ++-------------
 apps/openmw/mwworld/store.hpp          |  5 ++---
 components/esm/loadland.cpp            |  8 ++------
 components/esm/loadland.hpp            |  5 ++++-
 components/esmterrain/storage.hpp      |  6 +-----
 8 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/apps/opencs/model/world/collection.hpp b/apps/opencs/model/world/collection.hpp
index 6ab9d7ff9d..d15a4ff54d 100644
--- a/apps/opencs/model/world/collection.hpp
+++ b/apps/opencs/model/world/collection.hpp
@@ -296,7 +296,7 @@ namespace CSMWorld
         const std::string& destination, const UniversalId::Type type)
     {
         int index = cloneRecordImp(origin, destination, type);
-        mRecords.at(index)->get().mPlugin = 0;
+        mRecords.at(index)->get().setPlugin(0);
     }
 
     template<typename ESXRecordT, typename IdAccessorT>
@@ -311,7 +311,7 @@ namespace CSMWorld
         int index = touchRecordImp(id);
         if (index >= 0)
         {
-            mRecords.at(index)->get().mPlugin = 0;
+            mRecords.at(index)->get().setPlugin(0);
             return true;
         }
 
diff --git a/apps/opencs/model/world/columnimp.cpp b/apps/opencs/model/world/columnimp.cpp
index bec5008d35..0244ab1e8d 100644
--- a/apps/opencs/model/world/columnimp.cpp
+++ b/apps/opencs/model/world/columnimp.cpp
@@ -52,7 +52,7 @@ namespace CSMWorld
 
     QVariant LandPluginIndexColumn::get(const Record<Land>& record) const
     {
-        return record.get().mPlugin;
+        return record.get().getPlugin();
     }
 
     bool LandPluginIndexColumn::isEditable() const
diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index 183b13ca09..bafdc8f37d 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -153,7 +153,7 @@ void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener)
     // Land texture loading needs to use a separate internal store for each plugin.
     // We set the number of plugins here so we can properly verify if valid plugin
     // indices are being passed to the LandTexture Store retrieval methods.
-    mLandTextures.resize(mLandTextures.getSize()+1);
+    mLandTextures.addPlugin();
 
     // Loop through all records
     while(esm.hasMoreRecs())
diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index 5e3f4079c3..4d720a11a7 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -322,15 +322,13 @@ namespace MWWorld
         assert(plugin < mStatic.size());
         return mStatic[plugin].size();
     }
-    RecordId Store<ESM::LandTexture>::load(ESM::ESMReader &esm, size_t plugin)
+    RecordId Store<ESM::LandTexture>::load(ESM::ESMReader &esm)
     {
         ESM::LandTexture lt;
         bool isDeleted = false;
 
         lt.load(esm, isDeleted);
 
-        assert(plugin < mStatic.size());
-
         // Replace texture for records with given ID and index from all plugins.
         for (unsigned int i=0; i<mStatic.size(); i++)
         {
@@ -342,7 +340,7 @@ namespace MWWorld
             }
         }
 
-        LandTextureList &ltexl = mStatic[plugin];
+        LandTextureList &ltexl = mStatic.back();
         if(lt.mIndex + 1 > (int)ltexl.size())
             ltexl.resize(lt.mIndex+1);
 
@@ -352,10 +350,6 @@ namespace MWWorld
 
         return RecordId(ltexl[idx].mId, isDeleted);
     }
-    RecordId Store<ESM::LandTexture>::load(ESM::ESMReader &esm)
-    {
-        return load(esm, esm.getIndex());
-    }
     Store<ESM::LandTexture>::iterator Store<ESM::LandTexture>::begin(size_t plugin) const
     {
         assert(plugin < mStatic.size());
@@ -366,11 +360,6 @@ namespace MWWorld
         assert(plugin < mStatic.size());
         return mStatic[plugin].end();
     }
-    void Store<ESM::LandTexture>::resize(size_t num)
-    {
-        if (mStatic.size() < num)
-            mStatic.resize(num);
-    }
 
     // Land
     //=========================================================================
diff --git a/apps/openmw/mwworld/store.hpp b/apps/openmw/mwworld/store.hpp
index 4c32b65ec7..17a37c23ea 100644
--- a/apps/openmw/mwworld/store.hpp
+++ b/apps/openmw/mwworld/store.hpp
@@ -222,13 +222,12 @@ namespace MWWorld
         const ESM::LandTexture *search(size_t index, size_t plugin) const;
         const ESM::LandTexture *find(size_t index, size_t plugin) const;
 
-        /// Resize the internal store to hold at least \a num plugins.
-        void resize(size_t num);
+        /// Resize the internal store to hold another plugin.
+        void addPlugin() { mStatic.emplace_back(); }
 
         size_t getSize() const override;
         size_t getSize(size_t plugin) const;
 
-        RecordId load(ESM::ESMReader &esm, size_t plugin);
         RecordId load(ESM::ESMReader &esm) override;
 
         iterator begin(size_t plugin) const;
diff --git a/components/esm/loadland.cpp b/components/esm/loadland.cpp
index d7dcd47c69..3c4a1e0b07 100644
--- a/components/esm/loadland.cpp
+++ b/components/esm/loadland.cpp
@@ -15,7 +15,6 @@ namespace ESM
         : mFlags(0)
         , mX(0)
         , mY(0)
-        , mPlugin(0)
         , mDataTypes(0)
         , mLandData(nullptr)
     {
@@ -40,8 +39,6 @@ namespace ESM
     {
         isDeleted = false;
 
-        mPlugin = esm.getIndex();
-
         bool hasLocation = false;
         bool isLoaded = false;
         while (!isLoaded && esm.hasMoreSubs())
@@ -192,7 +189,7 @@ namespace ESM
 
     void Land::blank()
     {
-        mPlugin = 0;
+        setPlugin(0);
 
         std::fill(std::begin(mWnam), std::end(mWnam), 0);
 
@@ -326,7 +323,7 @@ namespace ESM
     }
 
     Land::Land (const Land& land)
-    : mFlags (land.mFlags), mX (land.mX), mY (land.mY), mPlugin (land.mPlugin),
+    : mFlags (land.mFlags), mX (land.mX), mY (land.mY),
       mContext (land.mContext), mDataTypes (land.mDataTypes),
       mLandData (land.mLandData ? new LandData (*land.mLandData) : nullptr)
     {
@@ -345,7 +342,6 @@ namespace ESM
         std::swap (mFlags, land.mFlags);
         std::swap (mX, land.mX);
         std::swap (mY, land.mY);
-        std::swap (mPlugin, land.mPlugin);
         std::swap (mContext, land.mContext);
         std::swap (mDataTypes, land.mDataTypes);
         std::swap (mLandData, land.mLandData);
diff --git a/components/esm/loadland.hpp b/components/esm/loadland.hpp
index 67dd2e76a2..610dd28fb8 100644
--- a/components/esm/loadland.hpp
+++ b/components/esm/loadland.hpp
@@ -29,7 +29,10 @@ struct Land
     int mFlags; // Only first four bits seem to be used, don't know what
     // they mean.
     int mX, mY; // Map coordinates.
-    int mPlugin; // Plugin index, used to reference the correct material palette.
+    
+    // Plugin index, used to reference the correct material palette.
+    int getPlugin() const { return mContext.index; }
+    void setPlugin(int index) { mContext.index = index; }
 
     // File context. This allows the ESM reader to be 'reset' to this
     // location later when we are ready to load the full data set.
diff --git a/components/esmterrain/storage.hpp b/components/esmterrain/storage.hpp
index 68e71574ee..107255a7af 100644
--- a/components/esmterrain/storage.hpp
+++ b/components/esmterrain/storage.hpp
@@ -36,11 +36,7 @@ namespace ESMTerrain
                 return nullptr;
             return &mData;
         }
-
-        inline int getPlugin() const
-        {
-            return mLand->mPlugin;
-        }
+        inline int getPlugin() const { return mLand->getPlugin(); }
 
     private:
         const ESM::Land* mLand;

From cd946ea35a7f5e8d8ecfa873bea637d679d40c1c Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Thu, 4 Nov 2021 15:56:51 +0000
Subject: [PATCH 1632/2859] removes unused recordcmp.hpp (#3214)

This PR removes an unused source file.
---
 apps/openmw/CMakeLists.txt        |  2 +-
 apps/openmw/mwworld/recordcmp.hpp | 34 -------------------------------
 2 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 apps/openmw/mwworld/recordcmp.hpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index fe402cd0b7..f22204eb8c 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -72,7 +72,7 @@ add_openmw_dir (mwworld
     containerstore actiontalk actiontake manualref player cellvisitors failedaction
     cells localscripts customdata inventorystore ptr actionopen actionread actionharvest
     actionequip timestamp actionalchemy cellstore actionapply actioneat
-    store esmstore recordcmp fallback actionrepair actionsoulgem livecellref actiondoor
+    store esmstore fallback actionrepair actionsoulgem livecellref actiondoor
     contentloader esmloader actiontrap cellreflist cellref weather projectilemanager
     cellpreloader datetimemanager
     )
diff --git a/apps/openmw/mwworld/recordcmp.hpp b/apps/openmw/mwworld/recordcmp.hpp
deleted file mode 100644
index f749351cea..0000000000
--- a/apps/openmw/mwworld/recordcmp.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef OPENMW_MWWORLD_RECORDCMP_H
-#define OPENMW_MWWORLD_RECORDCMP_H
-
-#include <components/esm/records.hpp>
-
-#include <components/misc/stringops.hpp>
-
-namespace MWWorld
-{
-    struct RecordCmp
-    {
-        template <class T>
-        bool operator()(const T &x, const T& y) const {
-            return x.mId < y.mId;
-        }
-    };
-
-    template <>
-    inline bool RecordCmp::operator()<ESM::Dialogue>(const ESM::Dialogue &x, const ESM::Dialogue &y) const {
-        return Misc::StringUtils::ciLess(x.mId, y.mId);
-    }
-
-    template <>
-    inline bool RecordCmp::operator()<ESM::Cell>(const ESM::Cell &x, const ESM::Cell &y) const {
-        return Misc::StringUtils::ciLess(x.mName, y.mName);
-    }
-
-    template <>
-    inline bool RecordCmp::operator()<ESM::Pathgrid>(const ESM::Pathgrid &x, const ESM::Pathgrid &y) const {
-        return Misc::StringUtils::ciLess(x.mCell, y.mCell);
-    }
-
-} // end namespace
-#endif

From ad44142ddad2a1482d73497cfe85cdf24ec26959 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 4 Nov 2021 20:41:26 +0100
Subject: [PATCH 1633/2859] Modify the content file sorting algorithm to finish
 in finite time when encountering circular dependencies

---
 .../contentselector/model/contentmodel.cpp    | 45 +++++++------------
 1 file changed, 16 insertions(+), 29 deletions(-)

diff --git a/components/contentselector/model/contentmodel.cpp b/components/contentselector/model/contentmodel.cpp
index 208b1315f3..fd94b60516 100644
--- a/components/contentselector/model/contentmodel.cpp
+++ b/components/contentselector/model/contentmodel.cpp
@@ -504,40 +504,27 @@ QStringList ContentSelectorModel::ContentModel::gameFiles() const
 
 void ContentSelectorModel::ContentModel::sortFiles()
 {
-    //first, sort the model such that all dependencies are ordered upstream (gamefile) first.
-    bool movedFiles = true;
-    int fileCount = mFiles.size();
-
     //Dependency sort
-    //iterate until no sorting of files occurs
-    while (movedFiles)
+    int sorted = 0;
+    //iterate each file, obtaining a reference to its gamefiles list
+    for(int i = sorted; i < mFiles.size(); ++i)
     {
-        movedFiles = false;
-        //iterate each file, obtaining a reference to it's gamefiles list
-        for (int i = 0; i < fileCount; i++)
+        const QStringList& gameFiles = mFiles.at(i)->gameFiles();
+        int j = sorted;
+        for(;j > 0; --j)
         {
-            QModelIndex idx1 = index (i, 0, QModelIndex());
-            const QStringList &gamefiles = mFiles.at(i)->gameFiles();
-            //iterate each file after the current file, verifying that none of it's
-            //dependencies appear.
-            for (int j = i + 1; j < fileCount; j++)
-            {
-                if (gamefiles.contains(mFiles.at(j)->fileName(), Qt::CaseInsensitive)
-                 || (!mFiles.at(i)->isGameFile() && gamefiles.isEmpty()
-                 && mFiles.at(j)->fileName().compare("Morrowind.esm", Qt::CaseInsensitive) == 0)) // Hack: implicit dependency on Morrowind.esm for dependency-less files
-                {
-                        mFiles.move(j, i);
-
-                        QModelIndex idx2 = index (j, 0, QModelIndex());
-
-                        emit dataChanged (idx1, idx2);
-
-                        movedFiles = true;
-                }
-            }
-            if (movedFiles)
+            const auto file = mFiles.at(j - 1);
+            if(gameFiles.contains(file->fileName(), Qt::CaseInsensitive)
+                 || (!mFiles.at(i)->isGameFile() && gameFiles.isEmpty()
+                 && file->fileName().compare("Morrowind.esm", Qt::CaseInsensitive) == 0)) // Hack: implicit dependency on Morrowind.esm for dependency-less files
                 break;
         }
+        if(i != j)
+        {
+            mFiles.move(i, j);
+            emit dataChanged(index(i, 0, QModelIndex()), index(j, 0, QModelIndex()));
+        }
+        ++sorted;
     }
 }
 

From 1583252dd86751bbd5ecabd2f06ae5078440c19b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20St=C3=B6ckel?= <astoecke@uwaterloo.ca>
Date: Thu, 4 Nov 2021 15:54:33 -0400
Subject: [PATCH 1634/2859] Improve sound fading

* Implement a more general SoundBase::setFade that can be used to fade to any desired
volume and not just fading out
* Implement SoundBase::setFadeout by using SoundBase::setFade
* Implement an exponential fade mode
---
 apps/openmw/mwsound/sound.hpp           | 111 +++++++++++++++++++++---
 apps/openmw/mwsound/soundmanagerimp.cpp |  10 +--
 2 files changed, 101 insertions(+), 20 deletions(-)

diff --git a/apps/openmw/mwsound/sound.hpp b/apps/openmw/mwsound/sound.hpp
index 17f052aec0..2a07f05779 100644
--- a/apps/openmw/mwsound/sound.hpp
+++ b/apps/openmw/mwsound/sound.hpp
@@ -11,7 +11,11 @@ namespace MWSound
     enum PlayModeEx
     {
         Play_2D = 0,
+        Play_StopAtFadeEnd = 1 << 28,
+        Play_FadeExponential = 1 << 29,
+        Play_InFade = 1 << 30,
         Play_3D = 1 << 31,
+        Play_FadeFlagsMask = (Play_StopAtFadeEnd | Play_FadeExponential),
     };
 
     // For testing individual PlayMode flags
@@ -21,13 +25,15 @@ namespace MWSound
     struct SoundParams
     {
         osg::Vec3f mPos;
-        float mVolume = 1;
-        float mBaseVolume = 1;
-        float mPitch = 1;
-        float mMinDistance = 1;
-        float mMaxDistance = 1000;
+        float mVolume = 1.0f;
+        float mBaseVolume = 1.0f;
+        float mPitch = 1.0f;
+        float mMinDistance = 1.0f;
+        float mMaxDistance = 1000.0f;
         int mFlags = 0;
-        float mFadeOutTime = 0;
+        float mFadeVolume = 1.0f;
+        float mFadeTarget = 0.0f;
+        float mFadeStep = 0.0f;
     };
 
     class SoundBase {
@@ -46,19 +52,97 @@ namespace MWSound
         void setPosition(const osg::Vec3f &pos) { mParams.mPos = pos; }
         void setVolume(float volume) { mParams.mVolume = volume; }
         void setBaseVolume(float volume) { mParams.mBaseVolume = volume; }
-        void setFadeout(float duration) { mParams.mFadeOutTime = duration; }
-        void updateFade(float duration)
+        void setFadeout(float duration) { setFade(duration, 0.0, Play_StopAtFadeEnd); }
+
+        /// Fade to the given linear gain within the specified amount of time.
+        /// Note that the fade gain is independent of the sound volume.
+        ///
+        /// \param duration specifies the duration of the fade. For *linear*
+        /// fades (default) this will be exactly the time at which the desired
+        /// volume is reached. Let v0 be the initial volume, v1 be the target
+        /// volume, and t0 be the initial time. Then the volume over time is
+        /// given as
+        ///
+        ///   v(t) =  v0 + (v1 - v0) * (t - t0) / duration  if t <= t0 + duration
+        ///   v(t) =  v1                                    if t >  t0 + duration
+        ///
+        /// For *exponential* fades this determines the time-constant of the
+        /// exponential process describing the fade. In particular, we guarantee
+        /// that we reach v0 + 0.99 * (v1 - v0) within the given duration.
+        ///
+        ///   v(t) = v1 + (v0 - v1) * exp(-4.6 * (t0 - t) / duration)
+        ///
+        /// where -4.6 is approximately log(1%) (i.e., -40 dB).
+        ///
+        /// This interpolation mode is meant for environmental sound effects to
+        /// achieve less jarring transitions.
+        ///
+        /// \param targetVolume is the linear gain that should be reached at
+        /// the end of the fade.
+        ///
+        /// \param flags may be a combination of Play_FadeExponential and
+        /// Play_StopAtFadeEnd. If Play_StopAtFadeEnd is set, stops the sound
+        /// once the fade duration has passed or the target volume has been
+        /// reached. If Play_FadeExponential is set, enables the exponential
+        /// fade mode (see above).
+        void setFade(float duration, float targetVolume, int flags = 0) {
+            // Approximation of log(1%) (i.e., -40 dB).
+            constexpr float minus40Decibel = -4.6f;
+
+            // Do nothing if already at the target, unless we need to trigger a stop event
+            if ((mParams.mFadeVolume == targetVolume) && !(flags & Play_StopAtFadeEnd))
+                return;
+
+            mParams.mFadeTarget = targetVolume;
+            mParams.mFlags = (mParams.mFlags & ~Play_FadeFlagsMask) | (flags & Play_FadeFlagsMask) | Play_InFade;
+            if (duration > 0.0f)
+            {
+                if (mParams.mFlags & Play_FadeExponential)
+                    mParams.mFadeStep = -minus40Decibel / duration;
+                else
+                    mParams.mFadeStep = (mParams.mFadeTarget - mParams.mFadeVolume) / duration;
+            }
+            else
+            {
+                mParams.mFadeVolume = mParams.mFadeTarget;
+                mParams.mFadeStep = 0.0f;
+            }
+        }
+
+        /// Updates the internal fading logic.
+        ///
+        /// \param dt is the time in seconds since the last call to update.
+        ///
+        /// \return true if the sound is still active, false if the sound has
+        /// reached a fading destination that was marked with Play_StopAtFadeEnd.
+        bool updateFade(float dt)
         {
-            if (mParams.mFadeOutTime > 0.0f)
+            // Mark fade as done at this volume difference (-80dB when fading to zero)
+            constexpr float minVolumeDifference = 1e-4f;
+
+            if (!getInFade())
+                return true;
+
+            // Perform the actual fade operation
+            const float deltaBefore = mParams.mFadeTarget - mParams.mFadeVolume;
+            if (mParams.mFlags & Play_FadeExponential)
+                mParams.mFadeVolume += mParams.mFadeStep * deltaBefore * dt;
+            else
+                mParams.mFadeVolume += mParams.mFadeStep * dt;
+            const float deltaAfter = mParams.mFadeTarget - mParams.mFadeVolume;
+
+            // Abort fade if we overshot or reached the minimum difference
+            if ((std::signbit(deltaBefore) != std::signbit(deltaAfter)) || (std::abs(deltaAfter) < minVolumeDifference))
             {
-                float soundDuration = std::min(duration, mParams.mFadeOutTime);
-                mParams.mVolume *= (mParams.mFadeOutTime - soundDuration) / mParams.mFadeOutTime;
-                mParams.mFadeOutTime -= soundDuration;
+                mParams.mFadeVolume = mParams.mFadeTarget;
+                mParams.mFlags &= ~Play_InFade;
             }
+
+            return getInFade() || !(mParams.mFlags & Play_StopAtFadeEnd);
         }
 
         const osg::Vec3f &getPosition() const { return mParams.mPos; }
-        float getRealVolume() const { return mParams.mVolume * mParams.mBaseVolume; }
+        float getRealVolume() const { return mParams.mVolume * mParams.mBaseVolume * mParams.mFadeVolume; }
         float getPitch() const { return mParams.mPitch; }
         float getMinDistance() const { return mParams.mMinDistance; }
         float getMaxDistance() const { return mParams.mMaxDistance; }
@@ -69,6 +153,7 @@ namespace MWSound
         bool getIsLooping() const { return mParams.mFlags & MWSound::PlayMode::Loop; }
         bool getDistanceCull() const { return mParams.mFlags & MWSound::PlayMode::RemoveAtDistance; }
         bool getIs3D() const { return mParams.mFlags & Play_3D; }
+        bool getInFade() const { return mParams.mFlags & Play_InFade; }
 
         void init(const SoundParams& params)
         {
diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index 96bfc27951..8cdc43d2f4 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -897,7 +897,7 @@ namespace MWSound
                     }
                 }
 
-                if(!mOutput->isSoundPlaying(sound))
+                if(!sound->updateFade(duration) || !mOutput->isSoundPlaying(sound))
                 {
                     mOutput->finishSound(sound);
                     if (sound == mUnderwaterSound)
@@ -909,8 +909,6 @@ namespace MWSound
                 }
                 else
                 {
-                    sound->updateFade(duration);
-
                     mOutput->updateSound(sound);
                     ++sndidx;
                 }
@@ -939,15 +937,13 @@ namespace MWSound
                 }
             }
 
-            if(!mOutput->isStreamPlaying(sound))
+            if(!sound->updateFade(duration) || !mOutput->isStreamPlaying(sound))
             {
                 mOutput->finishStream(sound);
-                mActiveSaySounds.erase(sayiter++);
+                sayiter = mActiveSaySounds.erase(sayiter);
             }
             else
             {
-                sound->updateFade(duration);
-
                 mOutput->updateStream(sound);
                 ++sayiter;
             }

From 6f2e311c58c0218a5cce7ea54905a73b9644a543 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20St=C3=B6ckel?= <astoecke@uwaterloo.ca>
Date: Thu, 4 Nov 2021 15:56:05 -0400
Subject: [PATCH 1635/2859] Fade out sound sources that are no longer close

* Handle culling of all sound sources in a separate function cull3DSound
* Add two new settings Sound::sfx fade in duration and Sound::sfx fade out duration
---
 apps/openmw/mwsound/soundmanagerimp.cpp | 71 ++++++++++++++++++-------
 apps/openmw/mwsound/soundmanagerimp.hpp |  3 ++
 2 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index 8cdc43d2f4..e470507e55 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -33,6 +33,8 @@ namespace MWSound
     namespace
     {
         constexpr float sMinUpdateInterval = 1.0f / 30.0f;
+        constexpr float sSfxFadeInDuration = 1.0f;
+        constexpr float sSfxFadeOutDuration = 1.0f;
 
         WaterSoundUpdaterSettings makeWaterSoundUpdaterSettings()
         {
@@ -47,6 +49,17 @@ namespace MWSound
 
             return settings;
         }
+
+        float initialFadeVolume(float squaredDist, Sound_Buffer *sfx, Type type, PlayMode mode)
+        {
+            // If a sound is farther away than its maximum distance, start playing it with a zero fade volume.
+            // It can still become audible once the player moves closer.
+            const float maxDist = sfx->getMaxDist();
+            if (squaredDist > (maxDist * maxDist))
+                return 0.0f;
+
+            return 1.0;
+        }
     }
 
     // For combining PlayMode and Type flags
@@ -517,7 +530,8 @@ namespace MWSound
             return nullptr;
 
         const osg::Vec3f objpos(ptr.getRefData().getPosition().asVec3());
-        if ((mode & PlayMode::RemoveAtDistance) && (mListenerPos - objpos).length2() > 2000 * 2000)
+        const float squaredDist = (mListenerPos - objpos).length2();
+        if ((mode & PlayMode::RemoveAtDistance) && squaredDist > 2000 * 2000)
             return nullptr;
 
         // Look up the sound in the ESM data
@@ -548,6 +562,7 @@ namespace MWSound
                 params.mPos = objpos;
                 params.mVolume = volume * sfx->getVolume();
                 params.mBaseVolume = volumeFromType(type);
+                params.mFadeVolume = initialFadeVolume(squaredDist, sfx, type, mode);
                 params.mPitch = pitch;
                 params.mMinDistance = sfx->getMinDist();
                 params.mMaxDistance = sfx->getMaxDist();
@@ -576,12 +591,15 @@ namespace MWSound
         Sound_Buffer *sfx = mSoundBuffers.load(Misc::StringUtils::lowerCase(soundId));
         if(!sfx) return nullptr;
 
+        const float squaredDist = (mListenerPos - initialPos).length2();
+
         SoundPtr sound = getSoundRef();
         sound->init([&] {
             SoundParams params;
             params.mPos = initialPos;
             params.mVolume = volume * sfx->getVolume();
             params.mBaseVolume = volumeFromType(type);
+            params.mFadeVolume = initialFadeVolume(squaredDist, sfx, type, mode);
             params.mPitch = pitch;
             params.mMinDistance = sfx->getMinDist();
             params.mMaxDistance = sfx->getMaxDist();
@@ -830,6 +848,28 @@ namespace MWSound
         return {WaterSoundAction::DoNothing, nullptr};
     }
 
+    void SoundManager::cull3DSound(SoundBase *sound)
+    {
+        // Hard-coded distance of 2000.0f is from vanilla Morrowind
+        const float maxDist = sound->getDistanceCull() ? 2000.0f : sound->getMaxDistance();
+        const float squaredMaxDist = maxDist * maxDist;
+
+        const osg::Vec3f pos = sound->getPosition();
+        const float squaredDist = (mListenerPos - pos).length2();
+
+        if (squaredDist > squaredMaxDist)
+        {
+            // If getDistanceCull() is set, delete the sound after it has faded out
+            sound->setFade(sSfxFadeOutDuration, 0.0f, Play_FadeExponential | (sound->getDistanceCull() ? Play_StopAtFadeEnd : 0));
+        }
+        else
+        {
+            // Fade sounds back in once they are in range
+            sound->setFade(sSfxFadeInDuration, 1.0f, Play_FadeExponential);
+        }
+    }
+
+
     void SoundManager::updateSounds(float duration)
     {
         // We update active say sounds map for specific actors here
@@ -884,17 +924,12 @@ namespace MWSound
             {
                 Sound *sound = sndidx->first.get();
 
-                if(!ptr.isEmpty() && sound->getIs3D())
+                if (sound->getIs3D())
                 {
-                    const ESM::Position &pos = ptr.getRefData().getPosition();
-                    const osg::Vec3f objpos(pos.asVec3());
-                    sound->setPosition(objpos);
-
-                    if(sound->getDistanceCull())
-                    {
-                        if((mListenerPos - objpos).length2() > 2000*2000)
-                            mOutput->finishSound(sound);
-                    }
+                    if (!ptr.isEmpty())
+                        sound->setPosition(ptr.getRefData().getPosition().asVec3());
+
+                    cull3DSound(sound);
                 }
 
                 if(!sound->updateFade(duration) || !mOutput->isSoundPlaying(sound))
@@ -924,17 +959,15 @@ namespace MWSound
         {
             MWWorld::ConstPtr ptr = sayiter->first;
             Stream *sound = sayiter->second.get();
-            if(!ptr.isEmpty() && sound->getIs3D())
+            if (sound->getIs3D())
             {
-                MWBase::World *world = MWBase::Environment::get().getWorld();
-                const osg::Vec3f pos = world->getActorHeadTransform(ptr).getTrans();
-                sound->setPosition(pos);
-
-                if(sound->getDistanceCull())
+                if (!ptr.isEmpty())
                 {
-                    if((mListenerPos - pos).length2() > 2000*2000)
-                        mOutput->finishStream(sound);
+                    MWBase::World *world = MWBase::Environment::get().getWorld();
+                    sound->setPosition(world->getActorHeadTransform(ptr).getTrans());
                 }
+
+                cull3DSound(sound);
             }
 
             if(!sound->updateFade(duration) || !mOutput->isStreamPlaying(sound))
diff --git a/apps/openmw/mwsound/soundmanagerimp.hpp b/apps/openmw/mwsound/soundmanagerimp.hpp
index 934402cd4c..e659e7a12a 100644
--- a/apps/openmw/mwsound/soundmanagerimp.hpp
+++ b/apps/openmw/mwsound/soundmanagerimp.hpp
@@ -34,6 +34,7 @@ namespace MWSound
 {
     class Sound_Output;
     struct Sound_Decoder;
+    class SoundBase;
     class Sound;
     class Stream;
 
@@ -111,6 +112,8 @@ namespace MWSound
         void advanceMusic(const std::string& filename);
         void startRandomTitle();
 
+        void cull3DSound(SoundBase *sound);
+
         void updateSounds(float duration);
         void updateRegionSound(float duration);
         void updateWaterSound();

From 9cfa2eeab80fefdb1690bd05f1de82a9b1dd573c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20St=C3=B6ckel?= <astoecke@uwaterloo.ca>
Date: Thu, 4 Nov 2021 15:56:16 -0400
Subject: [PATCH 1636/2859] Remove hard maximum distance in the OpenAL driver

Hard sound source culling is now handled by the SoundManager.
---
 apps/openmw/mwsound/openal_output.cpp | 11 +++--------
 apps/openmw/mwsound/openal_output.hpp |  2 +-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwsound/openal_output.cpp b/apps/openmw/mwsound/openal_output.cpp
index 67b52309d5..4615fed8c1 100644
--- a/apps/openmw/mwsound/openal_output.cpp
+++ b/apps/openmw/mwsound/openal_output.cpp
@@ -1109,13 +1109,8 @@ void OpenAL_Output::initCommon3D(ALuint source, const osg::Vec3f &pos, ALfloat m
     alSource3f(source, AL_VELOCITY, 0.0f, 0.0f, 0.0f);
 }
 
-void OpenAL_Output::updateCommon(ALuint source, const osg::Vec3f& pos, ALfloat maxdist, ALfloat gain, ALfloat pitch, bool useenv, bool is3d)
+void OpenAL_Output::updateCommon(ALuint source, const osg::Vec3f& pos, ALfloat maxdist, ALfloat gain, ALfloat pitch, bool useenv)
 {
-    if(is3d)
-    {
-        if((pos - mListenerPos).length2() > maxdist*maxdist)
-            gain = 0.0f;
-    }
     if(useenv && mListenerEnv == Env_Underwater && !mWaterFilter)
     {
         gain *= 0.9f;
@@ -1243,7 +1238,7 @@ void OpenAL_Output::updateSound(Sound *sound)
     ALuint source = GET_PTRID(sound->mHandle);
 
     updateCommon(source, sound->getPosition(), sound->getMaxDistance(), sound->getRealVolume(),
-                 sound->getPitch(), sound->getUseEnv(), sound->getIs3D());
+                 sound->getPitch(), sound->getUseEnv());
     getALError();
 }
 
@@ -1369,7 +1364,7 @@ void OpenAL_Output::updateStream(Stream *sound)
     ALuint source = stream->mSource;
 
     updateCommon(source, sound->getPosition(), sound->getMaxDistance(), sound->getRealVolume(),
-                 sound->getPitch(), sound->getUseEnv(), sound->getIs3D());
+                 sound->getPitch(), sound->getUseEnv());
     getALError();
 }
 
diff --git a/apps/openmw/mwsound/openal_output.hpp b/apps/openmw/mwsound/openal_output.hpp
index 2a19e6768a..47845c0802 100644
--- a/apps/openmw/mwsound/openal_output.hpp
+++ b/apps/openmw/mwsound/openal_output.hpp
@@ -53,7 +53,7 @@ namespace MWSound
         void initCommon2D(ALuint source, const osg::Vec3f &pos, ALfloat gain, ALfloat pitch, bool loop, bool useenv);
         void initCommon3D(ALuint source, const osg::Vec3f &pos, ALfloat mindist, ALfloat maxdist, ALfloat gain, ALfloat pitch, bool loop, bool useenv);
 
-        void updateCommon(ALuint source, const osg::Vec3f &pos, ALfloat maxdist, ALfloat gain, ALfloat pitch, bool useenv, bool is3d);
+        void updateCommon(ALuint source, const osg::Vec3f &pos, ALfloat maxdist, ALfloat gain, ALfloat pitch, bool useenv);
 
         OpenAL_Output& operator=(const OpenAL_Output &rhs);
         OpenAL_Output(const OpenAL_Output &rhs);

From 1cafef7bdb8e8c7358bb528ee570ab0f8c3b8f22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20St=C3=B6ckel?= <astoecke@uwaterloo.ca>
Date: Thu, 4 Nov 2021 15:56:23 -0400
Subject: [PATCH 1637/2859] Fade water sounds more softly

---
 apps/openmw/mwsound/soundmanagerimp.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index e470507e55..32c9a04e2a 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -795,10 +795,10 @@ namespace MWSound
                 break;
             case WaterSoundAction::SetVolume:
                 mNearWaterSound->setVolume(update.mVolume * sfx->getVolume());
+                mNearWaterSound->setFade(sSfxFadeInDuration, 1.0f, Play_FadeExponential);
                 break;
             case WaterSoundAction::FinishSound:
-                mOutput->finishSound(mNearWaterSound);
-                mNearWaterSound = nullptr;
+                mNearWaterSound->setFade(sSfxFadeOutDuration, 0.0f, Play_FadeExponential | Play_StopAtFadeEnd);
                 break;
             case WaterSoundAction::PlaySound:
                 if (mNearWaterSound)

From 3ee4aadd88f7a190b636021e6dd13ea9b414d873 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20St=C3=B6ckel?= <astoecke@uwaterloo.ca>
Date: Thu, 4 Nov 2021 15:56:30 -0400
Subject: [PATCH 1638/2859] Heuristic for fading environment sounds in

---
 apps/openmw/mwsound/soundmanagerimp.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index 32c9a04e2a..758ddfdc56 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -58,6 +58,13 @@ namespace MWSound
             if (squaredDist > (maxDist * maxDist))
                 return 0.0f;
 
+            // This is a *heuristic* that causes environment sounds to fade in. The idea is the following:
+            // - Only looped sounds playing through the effects channel are environment sounds
+            // - Do not fade in sounds if the player is already so close that the sound plays at maximum volume
+            const float minDist = sfx->getMinDist();
+            if ((squaredDist > (minDist * minDist)) && (type == Type::Sfx) && (mode & PlayMode::Loop))
+                return 0.0f;
+
             return 1.0;
         }
     }

From e637d36071fec7dfa7acdab7967e40c3e5c30f59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20St=C3=B6ckel?= <astoecke@uwaterloo.ca>
Date: Thu, 4 Nov 2021 16:04:57 -0400
Subject: [PATCH 1639/2859] Add changelog entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c491cb83c0..a2f0c95f34 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -65,6 +65,7 @@
     Bug #6323: Wyrmhaven: Alboin doesn't follower the player character out of his house
     Bug #6326: Detect Enchantment/Key should detect items in unresolved containers
     Bug #6347: PlaceItem/PlaceItemCell/PlaceAt should work with levelled creatures
+    Bug #6354: SFX abruptly cut off after crossing max distance; implement soft fading of sound effects
     Bug #6363: Some scripts in Morrowland fail to work
     Bug #6376: Creatures should be able to use torches
     Feature #890: OpenMW-CS: Column filtering

From 03710726315f1e649db747cad37180596fdeb0fc Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Thu, 4 Nov 2021 21:20:06 +0000
Subject: [PATCH 1640/2859] removes lowerCaseInPlace (#3217)

This PR removes unneeded `lowerCaseInPlace` calls in in a hot path of `objectpaging.cpp` that are no longer necessary after PR #3197. In addition, I have been informed that these changes should by coincidence address a compiler specific compilation error we currently experience.
---
 apps/openmw/mwrender/objectpaging.cpp | 2 --
 components/misc/resourcehelpers.cpp   | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index 947f23f781..b6f12dea37 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -428,7 +428,6 @@ namespace MWRender
                                 continue;
 
                             if (std::find(cell->mMovedRefs.begin(), cell->mMovedRefs.end(), ref.mRefNum) != cell->mMovedRefs.end()) continue;
-                            Misc::StringUtils::lowerCaseInPlace(ref.mRefID);
                             int type = store.findStatic(ref.mRefID);
                             if (!typeFilter(type,size>=2)) continue;
                             if (deleted) { refs.erase(ref.mRefNum); continue; }
@@ -444,7 +443,6 @@ namespace MWRender
                 for (auto [ref, deleted] : cell->mLeasedRefs)
                 {
                     if (deleted) { refs.erase(ref.mRefNum); continue; }
-                    Misc::StringUtils::lowerCaseInPlace(ref.mRefID);
                     int type = store.findStatic(ref.mRefID);
                     if (!typeFilter(type,size>=2)) continue;
                     refs[ref.mRefNum] = std::move(ref);
diff --git a/components/misc/resourcehelpers.cpp b/components/misc/resourcehelpers.cpp
index 4d54baafc6..610c7a790c 100644
--- a/components/misc/resourcehelpers.cpp
+++ b/components/misc/resourcehelpers.cpp
@@ -142,5 +142,5 @@ std::string Misc::ResourceHelpers::correctActorModelPath(const std::string &resP
 
 bool Misc::ResourceHelpers::isHiddenMarker(std::string_view id)
 {
-    return id == "prisonmarker" || id == "divinemarker" || id == "templemarker" || id == "northmarker";
+    return Misc::StringUtils::ciEqual(id, "prisonmarker") || Misc::StringUtils::ciEqual(id, "divinemarker") || Misc::StringUtils::ciEqual(id, "templemarker") || Misc::StringUtils::ciEqual(id, "northmarker");
 }

From 5debd6e25af486d8234b9ece7d4270b9c63ee099 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Thu, 4 Nov 2021 21:31:22 +0000
Subject: [PATCH 1641/2859] removes two dummy serialisers (#3212)

This PR removes dummy serialisers for `StateSetUpdater`, `NodeCallback` and the respective `META` macros that trigger serialisation requirement here.

`StateSetUpdater` and `NodeCallback` are just base classes that can not be used on their own, so there is no need to incorporate them into serialisation. These changes might have minor effects on derived classes that forget to override `className()`, `libraryName()` through `META`, but it makes hardly a difference to now serialise such classes as a dysfunctional `osg::Callback` instead of a dysfunctional `SceneUtil::NodeCallback`.
---
 components/sceneutil/nodecallback.hpp    | 1 -
 components/sceneutil/serialize.cpp       | 2 --
 components/sceneutil/statesetupdater.hpp | 2 --
 3 files changed, 5 deletions(-)

diff --git a/components/sceneutil/nodecallback.hpp b/components/sceneutil/nodecallback.hpp
index 942cb17ded..96e3ae229e 100644
--- a/components/sceneutil/nodecallback.hpp
+++ b/components/sceneutil/nodecallback.hpp
@@ -19,7 +19,6 @@ public:
     NodeCallback(){}
     NodeCallback(const NodeCallback& nc,const osg::CopyOp& copyop):
             osg::Callback(nc, copyop) {}
-    META_Object(SceneUtil, NodeCallback)
 
     bool run(osg::Object* object, osg::Object* data) override
     {
diff --git a/components/sceneutil/serialize.cpp b/components/sceneutil/serialize.cpp
index 134f7c29dd..9da0d6a40e 100644
--- a/components/sceneutil/serialize.cpp
+++ b/components/sceneutil/serialize.cpp
@@ -125,11 +125,9 @@ void registerSerializers()
             "SceneUtil::CompositeStateSetUpdater",
             "SceneUtil::LightListCallback",
             "SceneUtil::LightManagerUpdateCallback",
-            "SceneUtil::NodeCallback",
             "SceneUtil::UpdateRigBounds",
             "SceneUtil::UpdateRigGeometry",
             "SceneUtil::LightSource",
-            "SceneUtil::StateSetUpdater",
             "SceneUtil::DisableLight",
             "SceneUtil::MWShadowTechnique",
             "SceneUtil::TextKeyMapHolder",
diff --git a/components/sceneutil/statesetupdater.hpp b/components/sceneutil/statesetupdater.hpp
index 35be9cb434..cc2e248457 100644
--- a/components/sceneutil/statesetupdater.hpp
+++ b/components/sceneutil/statesetupdater.hpp
@@ -34,8 +34,6 @@ namespace SceneUtil
         StateSetUpdater();
         StateSetUpdater(const StateSetUpdater& copy, const osg::CopyOp& copyop);
 
-        META_Object(SceneUtil, StateSetUpdater)
-
         void operator()(osg::Node* node, osg::NodeVisitor* nv);
 
         /// Apply state - to override in derived classes

From d5aaa0394ab1a30d8f2ccfb14f5a61d7966bf694 Mon Sep 17 00:00:00 2001
From: wareya <wareya@gmail.com>
Date: Thu, 4 Nov 2021 10:44:28 -0400
Subject: [PATCH 1642/2859] Fix a missing required include

---
 apps/openmw/mwworld/ptr.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/openmw/mwworld/ptr.hpp b/apps/openmw/mwworld/ptr.hpp
index 438b87c7af..4dbdfa5545 100644
--- a/apps/openmw/mwworld/ptr.hpp
+++ b/apps/openmw/mwworld/ptr.hpp
@@ -4,6 +4,7 @@
 #include <cassert>
 #include <type_traits>
 #include <string>
+#include <string_view>
 #include <sstream>
 
 #include "livecellref.hpp"

From ae84a0c9d5a68c6a7fa30c8fa4701ecc6308edd5 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Thu, 4 Nov 2021 23:21:58 +0100
Subject: [PATCH 1643/2859] Fix most of reStructuredText warnings

---
 .../manuals/installation/install-game-files.rst      |  8 ++++----
 docs/source/reference/documentationHowTo.rst         |  6 +++---
 docs/source/reference/modding/settings/game.rst      |  2 +-
 docs/source/reference/modding/settings/general.rst   |  2 +-
 .../reference/modding/settings/groundcover.rst       |  2 ++
 docs/source/reference/modding/settings/map.rst       |  1 +
 docs/source/reference/modding/settings/navigator.rst | 10 +++++-----
 docs/source/reference/modding/settings/shaders.rst   |  2 +-
 .../texture-modding/convert-bump-mapped-mods.rst     | 12 ++++++------
 9 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/docs/source/manuals/installation/install-game-files.rst b/docs/source/manuals/installation/install-game-files.rst
index 538cfd4c6d..2af7946536 100644
--- a/docs/source/manuals/installation/install-game-files.rst
+++ b/docs/source/manuals/installation/install-game-files.rst
@@ -105,10 +105,10 @@ If you are running macOS, you can also download Morrowind through Steam:
 #.	Launch the Steam client and let it download. You can then find ``Morrowind.esm`` at
 	``~/Library/Application Support/Steam/steamapps/common/The Elder Scrolls III - Morrowind/Data Files/``
 
-Linux  
-----
-Debian/Ubuntu - using "Steam Proton" & "OpenMW launcher". 
-----
+Linux
+-----
+Debian/Ubuntu - using "Steam Proton" & "OpenMW launcher".
+---------------------------------------------------------
 #. Install Steam from "Ubuntu Software" Center  
 #. Enable Proton (basically WINE under the hood). This is done in the Steam client menu drop down. Select, "Steam | Settings" then in the "SteamPlay" section check the box next to "enable steam play for all other titles"  
 #. Now Morrowind should be selectable in your game list (as long as you own it). You can install it like any other game, choose to install it and remember the directory path of the location you pick.
diff --git a/docs/source/reference/documentationHowTo.rst b/docs/source/reference/documentationHowTo.rst
index 75dbe8dca2..d2b67d02ca 100644
--- a/docs/source/reference/documentationHowTo.rst
+++ b/docs/source/reference/documentationHowTo.rst
@@ -154,9 +154,9 @@ A push is just copying those "committed" changes to your online repo.
 (Commit and push can be combined in one step in PyCharm, so yay) 
 Once you've pushed all the changes you need to contribute something to the project, you will then submit a pull request, 
 so called because you are *requesting* that the project maintainers "pull"
- and merge the changes you've made into the project master repository. One of the project maintainers will probably ask 
- you to make some corrections or clarifications. Go back and repeat this process to make those changes, 
- and repeat until they're good enough to get merged.
+and merge the changes you've made into the project master repository. One of the project maintainers will probably ask
+you to make some corrections or clarifications. Go back and repeat this process to make those changes,
+and repeat until they're good enough to get merged.
 
 So to go over all that again. You rebase *every* time you start working on something to ensure you're working on the most 
 updated version (I do literally every time I open PyCharm). Then make your edits. 
diff --git a/docs/source/reference/modding/settings/game.rst b/docs/source/reference/modding/settings/game.rst
index fb7b537701..58d5345f65 100644
--- a/docs/source/reference/modding/settings/game.rst
+++ b/docs/source/reference/modding/settings/game.rst
@@ -441,7 +441,7 @@ Some mods add harvestable container models. When this setting is enabled, activa
 When this setting is turned off or when activating a regular container, the menu will open as usual.
 
 allow actors to follow over water surface
----------------------
+-----------------------------------------
 
 :Type:		boolean
 :Range:		True/False
diff --git a/docs/source/reference/modding/settings/general.rst b/docs/source/reference/modding/settings/general.rst
index f0ebe4f972..ee5b908b4a 100644
--- a/docs/source/reference/modding/settings/general.rst
+++ b/docs/source/reference/modding/settings/general.rst
@@ -61,7 +61,7 @@ Mipmapping is a way of reducing the processing power needed during minification
 by pregenerating a series of smaller textures.
 
 notify on saved screenshot
---------------
+--------------------------
 
 :Type:		boolean
 :Range:		True/False
diff --git a/docs/source/reference/modding/settings/groundcover.rst b/docs/source/reference/modding/settings/groundcover.rst
index 3e943e4284..7b060f58ad 100644
--- a/docs/source/reference/modding/settings/groundcover.rst
+++ b/docs/source/reference/modding/settings/groundcover.rst
@@ -51,6 +51,7 @@ Determines whether grass should respond to the player treading on it.
 
 .. list-table:: Modes
 	:header-rows: 1
+
 	* - Mode number
 	  - Meaning
 	* - 0
@@ -77,6 +78,7 @@ How far away from the player grass can be before it's unaffected by being trod o
 
 .. list-table:: Presets
 	:header-rows: 1
+
 	* - Preset number
 	  - Range (Units)
 	  - Distance (Units)
diff --git a/docs/source/reference/modding/settings/map.rst b/docs/source/reference/modding/settings/map.rst
index a4d3cd7e0d..1412d6584f 100644
--- a/docs/source/reference/modding/settings/map.rst
+++ b/docs/source/reference/modding/settings/map.rst
@@ -125,6 +125,7 @@ max local viewing distance
 This setting controls the viewing distance on local map when 'distant terrain' is enabled.
 If this setting is greater than the viewing distance then only up to the viewing distance is used for local map, otherwise the viewing distance is used.
 If view distance is changed in settings menu during the game, then viewable distance on the local map is not updated.
+
 .. warning::
 	Increasing this setting can increase cell load times,
 	because the localmap take a snapshot of each cell contained in a square of 2 x (max local viewing distance) + 1 square.
diff --git a/docs/source/reference/modding/settings/navigator.rst b/docs/source/reference/modding/settings/navigator.rst
index fee4b2626e..aea817530e 100644
--- a/docs/source/reference/modding/settings/navigator.rst
+++ b/docs/source/reference/modding/settings/navigator.rst
@@ -1,5 +1,5 @@
 Navigator Settings
-################
+##################
 
 Main settings
 *************
@@ -43,7 +43,7 @@ Increasing this value may decrease performance.
     It's a limitation of `Recastnavigation <https://github.com/recastnavigation/recastnavigation>`_ library.
 
 wait until min distance to player
-------------------------------
+---------------------------------
 
 :Type:		integer
 :Range:		>= 0
@@ -87,7 +87,7 @@ Memory will be consumed in approximately linear dependency from number of nav me
 But only for new locations or already dropped from cache.
 
 min update interval ms
-----------------
+----------------------
 
 :Type:		integer
 :Range:		>= 0
@@ -181,7 +181,7 @@ Every nav mesh is visible and every update is noticable.
 Potentially decreases performance.
 
 enable agents paths render
--------------------
+--------------------------
 
 :Type:		boolean
 :Range:		True/False
@@ -193,7 +193,7 @@ Works even if Navigator is disabled.
 Potentially decreases performance.
 
 enable recast mesh render
-----------------------
+-------------------------
 
 :Type:		boolean
 :Range:		True/False
diff --git a/docs/source/reference/modding/settings/shaders.rst b/docs/source/reference/modding/settings/shaders.rst
index 03b7805de6..296a351435 100644
--- a/docs/source/reference/modding/settings/shaders.rst
+++ b/docs/source/reference/modding/settings/shaders.rst
@@ -241,7 +241,7 @@ lighting` is on.
 This setting has no effect if :ref:`lighting method` is 'legacy'.
 
 minimum interior brightness
-------------------------
+---------------------------
 
 :Type:		float
 :Range:		0.0-1.0
diff --git a/docs/source/reference/modding/texture-modding/convert-bump-mapped-mods.rst b/docs/source/reference/modding/texture-modding/convert-bump-mapped-mods.rst
index 0ad35d7a50..e05177c268 100644
--- a/docs/source/reference/modding/texture-modding/convert-bump-mapped-mods.rst
+++ b/docs/source/reference/modding/texture-modding/convert-bump-mapped-mods.rst
@@ -15,7 +15,7 @@ Normal maps from Morrowind to OpenMW
     - `Tutorial - Morrowind, Part 2`_
 
 General introduction to normal map conversion
-------------------------------------------------
+---------------------------------------------
 
 :Authors: Joakim (Lysol) Berg, Alexei (Capo) Dobrohotov
 :Updated: 2020-03-03
@@ -34,7 +34,7 @@ There are several techniques for bump-mapping, and normal-mapping is the most co
 So let's get on with it.
 
 OpenMW normal-mapping
-************************
+*********************
 
 Normal-mapping in OpenMW works in a very simple way: The engine just looks for a texture with a *_n.dds* suffix,
 and you're done.
@@ -70,7 +70,7 @@ settings.cfg_-file. Add these rows where it would make sense:
 See OpenMW's wiki page about `texture modding`_ to read more about it.
 
 Morrowind bump-mapping
-*****************************************************
+**********************
 
 **Conversion difficulty:**
 *Varies. Sometimes quick and easy, sometimes time-consuming and hard.*
@@ -93,7 +93,7 @@ In this case you can benefit from OpenMW's normal-mapping support by using these
 This means that you will have to drop the bump-mapping references from the model and sometimes rename the texture.
 
 MGE XE normal-mapping
-***************************************
+*********************
 
 **Conversion difficulty:**
 *Easy*
@@ -169,7 +169,7 @@ depending on a few circumstances. In this tutorial, we will look at a very easy,
 although in some cases a bit time-consuming, example.
 
 Tutorial - Morrowind, Part 1
-**********************
+****************************
 
 We will be converting a quite popular texture replacer of the Hlaalu architecture, namely Lougian's `Hlaalu Bump mapped`_.
 Since this is just a texture pack and not a model replacer,
@@ -201,7 +201,7 @@ We ignored those model files since they are not needed with OpenMW. In this tuto
 we will convert a mod that includes new, custom-made models. In other words, we cannot just ignore those files this time.
 
 Tutorial - Morrowind, Part 2
-**********************
+****************************
 
 The sacks included in Apel's `Various Things - Sacks`_ come in two versions – without bump-mapping, and with bump-mapping.
 Since we want the glory of normal-mapping in our OpenMW setup, we will go with the bump-mapped version.

From 1960e976e2640603f7f21af1b46d6ce65af50a52 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Fri, 5 Nov 2021 09:53:52 +0000
Subject: [PATCH 1644/2859] refactors stringops.hpp (#3192)

With this PR we refactor `StringUtils::replaceAll` to accept `string_view` as suggested in a code comment. In addition, while we are touching this rebuild happy file, we slim it down a bit by moving a few sparingly used functions elsewhere.
---
 apps/openmw/mwgui/journalviewmodel.cpp        |   4 +-
 apps/openmw/mwgui/sortfilteritemmodel.cpp     |  15 ++-
 apps/openmw/mwgui/spellmodel.cpp              |   9 +-
 apps/openmw/mwlua/actions.cpp                 |   2 +
 .../openmw_test_suite/misc/test_stringops.cpp |   3 +-
 components/files/escape.cpp                   |   4 +-
 components/misc/algorithm.hpp                 |  26 ++++
 components/misc/stringops.hpp                 | 123 +-----------------
 components/misc/utf8stream.hpp                |  65 +++++++++
 components/resource/scenemanager.cpp          |   3 +-
 components/sceneutil/lightmanager.cpp         |   1 +
 11 files changed, 119 insertions(+), 136 deletions(-)

diff --git a/apps/openmw/mwgui/journalviewmodel.cpp b/apps/openmw/mwgui/journalviewmodel.cpp
index 6b38cd0d9d..fc3fcc3efe 100644
--- a/apps/openmw/mwgui/journalviewmodel.cpp
+++ b/apps/openmw/mwgui/journalviewmodel.cpp
@@ -313,9 +313,9 @@ struct JournalViewModelImpl : JournalViewModel
         for (MWBase::Journal::TTopicIter i = journal->topicBegin (); i != journal->topicEnd (); ++i)
         {
             Utf8Stream stream (i->first.c_str());
-            Utf8Stream::UnicodeChar first = Misc::StringUtils::toLowerUtf8(stream.peek());
+            Utf8Stream::UnicodeChar first = Utf8Stream::toLowerUtf8(stream.peek());
 
-            if (first != Misc::StringUtils::toLowerUtf8(character))
+            if (first != Utf8Stream::toLowerUtf8(character))
                 continue;
 
             visitor (i->second.getName());
diff --git a/apps/openmw/mwgui/sortfilteritemmodel.cpp b/apps/openmw/mwgui/sortfilteritemmodel.cpp
index eb7ebd0e43..9d6ed49d3d 100644
--- a/apps/openmw/mwgui/sortfilteritemmodel.cpp
+++ b/apps/openmw/mwgui/sortfilteritemmodel.cpp
@@ -1,6 +1,7 @@
 #include "sortfilteritemmodel.hpp"
 
 #include <components/misc/stringops.hpp>
+#include <components/misc/utf8stream.hpp>
 #include <components/debug/debuglog.hpp>
 #include <components/esm/loadalch.hpp>
 #include <components/esm/loadappa.hpp>
@@ -69,8 +70,8 @@ namespace
                 return compareType(leftType, rightType);
 
             // compare items by name
-            std::string leftName = Misc::StringUtils::lowerCaseUtf8(left.mBase.getClass().getName(left.mBase));
-            std::string rightName = Misc::StringUtils::lowerCaseUtf8(right.mBase.getClass().getName(right.mBase));
+            std::string leftName = Utf8Stream::lowerCaseUtf8(left.mBase.getClass().getName(left.mBase));
+            std::string rightName = Utf8Stream::lowerCaseUtf8(right.mBase.getClass().getName(right.mBase));
 
             result = leftName.compare(rightName);
             if (result != 0)
@@ -213,7 +214,7 @@ namespace MWGui
 
             if (!mNameFilter.empty())
             {
-                const auto itemName = Misc::StringUtils::lowerCaseUtf8(base.getClass().getName(base));
+                const auto itemName = Utf8Stream::lowerCaseUtf8(base.getClass().getName(base));
                 return itemName.find(mNameFilter) != std::string::npos;
             }
 
@@ -226,7 +227,7 @@ namespace MWGui
 
                 for (const auto& effect : effects)
                 {
-                    const auto ciEffect = Misc::StringUtils::lowerCaseUtf8(effect);
+                    const auto ciEffect = Utf8Stream::lowerCaseUtf8(effect);
 
                     if (ciEffect.find(mEffectFilter) != std::string::npos)
                         return true;
@@ -285,7 +286,7 @@ namespace MWGui
                 return false;
         }
 
-        std::string compare = Misc::StringUtils::lowerCaseUtf8(item.mBase.getClass().getName(item.mBase));
+        std::string compare = Utf8Stream::lowerCaseUtf8(item.mBase.getClass().getName(item.mBase));
         if(compare.find(mNameFilter) == std::string::npos)
             return false;
 
@@ -318,12 +319,12 @@ namespace MWGui
 
     void SortFilterItemModel::setNameFilter (const std::string& filter)
     {
-        mNameFilter = Misc::StringUtils::lowerCaseUtf8(filter);
+        mNameFilter = Utf8Stream::lowerCaseUtf8(filter);
     }
 
     void SortFilterItemModel::setEffectFilter (const std::string& filter)
     {
-        mEffectFilter = Misc::StringUtils::lowerCaseUtf8(filter);
+        mEffectFilter = Utf8Stream::lowerCaseUtf8(filter);
     }
 
     void SortFilterItemModel::update()
diff --git a/apps/openmw/mwgui/spellmodel.cpp b/apps/openmw/mwgui/spellmodel.cpp
index 61ea9ce93a..455f167415 100644
--- a/apps/openmw/mwgui/spellmodel.cpp
+++ b/apps/openmw/mwgui/spellmodel.cpp
@@ -1,6 +1,7 @@
 #include "spellmodel.hpp"
 
 #include <components/debug/debuglog.hpp>
+#include <components/misc/utf8stream.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
@@ -69,7 +70,7 @@ namespace MWGui
                     fullEffectName += " " + wm->getGameSettingString(ESM::Attribute::sGmstAttributeIds[effect.mAttribute], "");
                 }
 
-                std::string convert = Misc::StringUtils::lowerCaseUtf8(fullEffectName);
+                std::string convert = Utf8Stream::lowerCaseUtf8(fullEffectName);
                 if (convert.find(filter) != std::string::npos)
                 {
                     return true;
@@ -90,14 +91,14 @@ namespace MWGui
         const MWWorld::ESMStore &esmStore =
             MWBase::Environment::get().getWorld()->getStore();
 
-        std::string filter = Misc::StringUtils::lowerCaseUtf8(mFilter);
+        std::string filter = Utf8Stream::lowerCaseUtf8(mFilter);
 
         for (const ESM::Spell* spell : spells)
         {
             if (spell->mData.mType != ESM::Spell::ST_Power && spell->mData.mType != ESM::Spell::ST_Spell)
                 continue;
 
-            std::string name = Misc::StringUtils::lowerCaseUtf8(spell->mName);
+            std::string name = Utf8Stream::lowerCaseUtf8(spell->mName);
  
             if (name.find(filter) == std::string::npos 
                 && !matchingEffectExists(filter, spell->mEffects))
@@ -139,7 +140,7 @@ namespace MWGui
             if (enchant->mData.mType != ESM::Enchantment::WhenUsed && enchant->mData.mType != ESM::Enchantment::CastOnce)
                 continue;
 
-            std::string name = Misc::StringUtils::lowerCaseUtf8(item.getClass().getName(item));
+            std::string name = Utf8Stream::lowerCaseUtf8(item.getClass().getName(item));
 
             if (name.find(filter) == std::string::npos
                 && !matchingEffectExists(filter, enchant->mEffects))
diff --git a/apps/openmw/mwlua/actions.cpp b/apps/openmw/mwlua/actions.cpp
index aad70d1a57..92a7f915bb 100644
--- a/apps/openmw/mwlua/actions.cpp
+++ b/apps/openmw/mwlua/actions.cpp
@@ -1,5 +1,7 @@
 #include "actions.hpp"
 
+#include <cstring>
+
 #include <components/debug/debuglog.hpp>
 
 #include "../mwworld/cellstore.hpp"
diff --git a/apps/openmw_test_suite/misc/test_stringops.cpp b/apps/openmw_test_suite/misc/test_stringops.cpp
index 173cfa4447..7d8e93dc28 100644
--- a/apps/openmw_test_suite/misc/test_stringops.cpp
+++ b/apps/openmw_test_suite/misc/test_stringops.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
 #include "components/misc/stringops.hpp"
+#include "components/misc/algorithm.hpp"
 
 #include <string>
 #include <string_view>
@@ -18,7 +19,7 @@ struct PartialBinarySearchTest : public ::testing::Test
 
     bool matches(const std::string& keyword)
     {
-        return Misc::StringUtils::partialBinarySearch(mDataVec.begin(), mDataVec.end(), keyword) != mDataVec.end();
+        return Misc::partialBinarySearch(mDataVec.begin(), mDataVec.end(), keyword) != mDataVec.end();
     }
 };
 
diff --git a/components/files/escape.cpp b/components/files/escape.cpp
index 8b11504d34..fcbcc04a16 100644
--- a/components/files/escape.cpp
+++ b/components/files/escape.cpp
@@ -29,10 +29,10 @@ namespace Files
         std::string temp = str;
 
         static const char hash[] = { escape_hash_filter::sEscape,  escape_hash_filter::sHashIdentifier };
-        Misc::StringUtils::replaceAll(temp, hash, "#", 2, 1);
+        Misc::StringUtils::replaceAll(temp, std::string_view(hash, 2), "#");
 
         static const char escape[] = { escape_hash_filter::sEscape,  escape_hash_filter::sEscapeIdentifier };
-        Misc::StringUtils::replaceAll(temp, escape, "@", 2, 1);
+        Misc::StringUtils::replaceAll(temp, std::string_view(escape, 2), "@");
 
         return temp;
     }
diff --git a/components/misc/algorithm.hpp b/components/misc/algorithm.hpp
index 4d70afa86c..54ac74e97e 100644
--- a/components/misc/algorithm.hpp
+++ b/components/misc/algorithm.hpp
@@ -4,6 +4,8 @@
 #include <iterator>
 #include <type_traits>
 
+#include "stringops.hpp"
+
 namespace Misc
 {
     template <typename Iterator, typename BinaryPredicate, typename Function>
@@ -31,6 +33,30 @@ namespace Misc
         }
         return begin;
     }
+
+    /// Performs a binary search on a sorted container for a string that 'key' starts with
+    template<typename Iterator, typename T>
+    static Iterator partialBinarySearch(Iterator begin, Iterator end, const T& key)
+    {
+        const Iterator notFound = end;
+
+        while(begin < end)
+        {
+            const Iterator middle = begin + (std::distance(begin, end) / 2);
+
+            int comp = Misc::StringUtils::ciCompareLen((*middle), key, (*middle).size());
+
+            if(comp == 0)
+                return middle;
+            else if(comp > 0)
+                end = middle;
+            else
+                begin = middle + 1;
+        }
+
+        return notFound;
+    }
+
 }
 
 #endif
diff --git a/components/misc/stringops.hpp b/components/misc/stringops.hpp
index dcffa7fdf3..12633db826 100644
--- a/components/misc/stringops.hpp
+++ b/components/misc/stringops.hpp
@@ -8,8 +8,6 @@
 #include <iterator>
 #include <functional>
 
-#include "utf8stream.hpp"
-
 namespace Misc
 {
 class StringUtils
@@ -45,70 +43,6 @@ public:
         return (c >= 'A' && c <= 'Z') ? c + 'a' - 'A' : c;
     }
 
-    static Utf8Stream::UnicodeChar toLowerUtf8(Utf8Stream::UnicodeChar ch)
-    {
-        // Russian alphabet
-        if (ch >= 0x0410 && ch < 0x0430)
-            return ch + 0x20;
-
-        // Cyrillic IO character
-        if (ch == 0x0401)
-            return ch + 0x50;
-
-        // Latin alphabet
-        if (ch >= 0x41 && ch < 0x60)
-            return ch + 0x20;
-
-        // Deutch characters
-        if (ch == 0xc4 || ch == 0xd6 || ch == 0xdc)
-            return ch + 0x20;
-        if (ch == 0x1e9e)
-            return 0xdf;
-
-        // TODO: probably we will need to support characters from other languages
-
-        return ch;
-    }
-
-    static std::string lowerCaseUtf8(const std::string& str)
-    {
-        if (str.empty())
-            return str;
-
-        // Decode string as utf8 characters, convert to lower case and pack them to string
-        std::string out;
-        Utf8Stream stream (str.c_str());
-        while (!stream.eof ())
-        {
-            Utf8Stream::UnicodeChar character = toLowerUtf8(stream.peek());
-
-            if (character <= 0x7f)
-                out.append(1, static_cast<char>(character));
-            else if (character <= 0x7ff)
-            {
-                out.append(1, static_cast<char>(0xc0 | ((character >> 6) & 0x1f)));
-                out.append(1, static_cast<char>(0x80 | (character & 0x3f)));
-            }
-            else if (character <= 0xffff)
-            {
-                out.append(1, static_cast<char>(0xe0 | ((character >> 12) & 0x0f)));
-                out.append(1, static_cast<char>(0x80 | ((character >> 6) & 0x3f)));
-                out.append(1, static_cast<char>(0x80 | (character & 0x3f)));
-            }
-            else
-            {
-                out.append(1, static_cast<char>(0xf0 | ((character >> 18) & 0x07)));
-                out.append(1, static_cast<char>(0x80 | ((character >> 12) & 0x3f)));
-                out.append(1, static_cast<char>(0x80 | ((character >> 6) & 0x3f)));
-                out.append(1, static_cast<char>(0x80 | (character & 0x3f)));
-            }
-
-            stream.consume();
-        }
-
-        return out;
-    }
-
     static bool ciLess(const std::string &x, const std::string &y) {
         return std::lexicographical_compare(x.begin(), x.end(), y.begin(), y.end(), ci());
     }
@@ -207,55 +141,21 @@ public:
         }
     };
 
-
-    /// Performs a binary search on a sorted container for a string that 'key' starts with
-    template<typename Iterator, typename T>
-    static Iterator partialBinarySearch(Iterator begin, Iterator end, const T& key)
-    {
-        const Iterator notFound = end;
-
-        while(begin < end)
-        {
-            const Iterator middle = begin + (std::distance(begin, end) / 2);
-
-            int comp = Misc::StringUtils::ciCompareLen((*middle), key, (*middle).size());
-
-            if(comp == 0)
-                return middle;
-            else if(comp > 0)
-                end = middle;
-            else
-                begin = middle + 1;
-        }
-
-        return notFound;
-    }
-
     /** @brief Replaces all occurrences of a string in another string.
      *
      * @param str The string to operate on.
      * @param what The string to replace.
      * @param with The replacement string.
-     * @param whatLen The length of the string to replace.
-     * @param withLen The length of the replacement string.
-     *
      * @return A reference to the string passed in @p str.
      */
-    static std::string &replaceAll(std::string &str, const char *what, const char *with,
-                                   std::size_t whatLen=std::string::npos, std::size_t withLen=std::string::npos)
+    static std::string &replaceAll(std::string &str, std::string_view what, std::string_view with)
     {
-        if (whatLen == std::string::npos)
-            whatLen = strlen(what);
-
-        if (withLen == std::string::npos)
-            withLen = strlen(with);
-
         std::size_t found;
         std::size_t offset = 0;
-        while((found = str.find(what, offset, whatLen)) != std::string::npos)
+        while((found = str.find(what, offset)) != std::string::npos)
         {
-              str.replace(found, whatLen, with, withLen);
-              offset = found + withLen;
+              str.replace(found, what.size(), with);
+              offset = found + with.size();
         }
         return str;
     }
@@ -311,26 +211,11 @@ public:
         cont.push_back(str.substr(previous, current - previous));
     }
 
-    // TODO: use the std::string_view once we will use the C++17.
-    // It should allow us to avoid data copying while we still will support both string and literal arguments.
-
-    static inline void replaceAll(std::string& data, const std::string& toSearch, const std::string& replaceStr)
-    {
-        size_t pos = data.find(toSearch);
-
-        while( pos != std::string::npos)
-        {
-            data.replace(pos, toSearch.size(), replaceStr);
-            pos = data.find(toSearch, pos + replaceStr.size());
-        }
-    }
-
     static inline void replaceLast(std::string& str, const std::string& substr, const std::string& with)
     {
         size_t pos = str.rfind(substr);
         if (pos == std::string::npos)
             return;
-
         str.replace(pos, substr.size(), with);
     }
 
diff --git a/components/misc/utf8stream.hpp b/components/misc/utf8stream.hpp
index e499d15e60..9dc8aa8208 100644
--- a/components/misc/utf8stream.hpp
+++ b/components/misc/utf8stream.hpp
@@ -2,6 +2,7 @@
 #define MISC_UTF8ITER_HPP
 
 #include <cstring>
+#include <string>
 #include <tuple>
 
 class Utf8Stream
@@ -87,6 +88,70 @@ public:
         return std::make_pair (chr, cur);
     }
 
+    static UnicodeChar toLowerUtf8(UnicodeChar ch)
+    {
+        // Russian alphabet
+        if (ch >= 0x0410 && ch < 0x0430)
+            return ch + 0x20;
+
+        // Cyrillic IO character
+        if (ch == 0x0401)
+            return ch + 0x50;
+
+        // Latin alphabet
+        if (ch >= 0x41 && ch < 0x60)
+            return ch + 0x20;
+
+        // German characters
+        if (ch == 0xc4 || ch == 0xd6 || ch == 0xdc)
+            return ch + 0x20;
+        if (ch == 0x1e9e)
+            return 0xdf;
+
+        // TODO: probably we will need to support characters from other languages
+
+        return ch;
+    }
+
+    static std::string lowerCaseUtf8(const std::string& str)
+    {
+        if (str.empty())
+            return str;
+
+        // Decode string as utf8 characters, convert to lower case and pack them to string
+        std::string out;
+        Utf8Stream stream (str.c_str());
+        while (!stream.eof ())
+        {
+            UnicodeChar character = toLowerUtf8(stream.peek());
+
+            if (character <= 0x7f)
+                out.append(1, static_cast<char>(character));
+            else if (character <= 0x7ff)
+            {
+                out.append(1, static_cast<char>(0xc0 | ((character >> 6) & 0x1f)));
+                out.append(1, static_cast<char>(0x80 | (character & 0x3f)));
+            }
+            else if (character <= 0xffff)
+            {
+                out.append(1, static_cast<char>(0xe0 | ((character >> 12) & 0x0f)));
+                out.append(1, static_cast<char>(0x80 | ((character >> 6) & 0x3f)));
+                out.append(1, static_cast<char>(0x80 | (character & 0x3f)));
+            }
+            else
+            {
+                out.append(1, static_cast<char>(0xf0 | ((character >> 18) & 0x07)));
+                out.append(1, static_cast<char>(0x80 | ((character >> 12) & 0x3f)));
+                out.append(1, static_cast<char>(0x80 | ((character >> 6) & 0x3f)));
+                out.append(1, static_cast<char>(0x80 | (character & 0x3f)));
+            }
+
+            stream.consume();
+        }
+
+        return out;
+    }
+
 private:
 
     static std::pair <int, UnicodeChar> octet_count (unsigned char octet)
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 4184a77c54..c1d567c0e1 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -20,6 +20,7 @@
 
 #include <components/misc/pathhelpers.hpp>
 #include <components/misc/stringops.hpp>
+#include <components/misc/algorithm.hpp>
 
 #include <components/vfs/manager.hpp>
 
@@ -551,7 +552,7 @@ namespace Resource
                 std::sort(reservedNames.begin(), reservedNames.end(), Misc::StringUtils::ciLess);
             }
 
-            std::vector<std::string>::iterator it = Misc::StringUtils::partialBinarySearch(reservedNames.begin(), reservedNames.end(), name);
+            std::vector<std::string>::iterator it = Misc::partialBinarySearch(reservedNames.begin(), reservedNames.end(), name);
             return it != reservedNames.end();
         }
 
diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index a5ce448b75..448f6ca916 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -1,6 +1,7 @@
 #include "lightmanager.hpp"
 
 #include <array>
+#include <cstring>
 #include <algorithm>
 #include <iterator>
 

From 49d2daee6a3562dc2e11c54541897c16e0cae6cd Mon Sep 17 00:00:00 2001
From: wareya <wareya@gmail.com>
Date: Fri, 5 Nov 2021 14:45:31 -0400
Subject: [PATCH 1645/2859] Movement solver tweaks

1) As much as I dislike it, upping the collision margin from 0.1 to 0.2
fixes bugs, particularly involving walking into upwards-slanted walls.

2) There were still some problems involving acute crevices/seams; they
were using the adjusted instead of unadjusted normal, and also they need
to bypass the don't-slide-upwards check to prevent (see #6379)

3) The move-away-from-what-we-just-hit code needs to run always, not
just on non-initial iterations. No idea why I did it this way before.

4) Force bullet to give actor boxes a tiny collision margin of 0.001
instead of the default 0.04. I can't tell whether this is actually
working or not, but it should reduce unexplained weirdness.

5) A piece of code that was meant to prevent bugs by short-circuiting
the movement solver if its direction changed more than 180 degrees
actually caused problems instead of preventing them, so I deleted it.
---
 apps/openmw/mwphysics/actor.cpp          |  1 +
 apps/openmw/mwphysics/constants.hpp      |  2 +-
 apps/openmw/mwphysics/movementsolver.cpp | 26 ++++++++++++++----------
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index 16501c432d..568da999bc 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -59,6 +59,7 @@ Actor::Actor(const MWWorld::Ptr& ptr, const Resource::BulletShape* shape, Physic
     mRotationallyInvariant = (mMeshTranslation.x() == 0.0 && mMeshTranslation.y() == 0.0) && std::fabs(mOriginalHalfExtents.x() - mOriginalHalfExtents.y()) < 2.2;
 
     mConvexShape = static_cast<btConvexShape*>(mShape.get());
+    mConvexShape->setMargin(0.001); // make sure bullet isn't using the huge default convex shape margin of 0.04
 
     mCollisionObject = std::make_unique<btCollisionObject>();
     mCollisionObject->setCollisionFlags(btCollisionObject::CF_KINEMATIC_OBJECT);
diff --git a/apps/openmw/mwphysics/constants.hpp b/apps/openmw/mwphysics/constants.hpp
index c275b63c7b..b2d189e874 100644
--- a/apps/openmw/mwphysics/constants.hpp
+++ b/apps/openmw/mwphysics/constants.hpp
@@ -15,7 +15,7 @@ namespace MWPhysics
     // Arbitrary number. To prevent infinite loops. They shouldn't happen but it's good to be prepared.
     static constexpr int sMaxIterations = 8;
     // Allows for more precise movement solving without getting stuck or snagging too easily.
-    static constexpr float sCollisionMargin = 0.1f;
+    static constexpr float sCollisionMargin = 0.2f;
     // Allow for a small amount of penetration to prevent numerical precision issues from causing the "unstuck"ing code to run unnecessarily
     // Currently set to 0 because having the "unstuck"ing code run whenever possible prevents some glitchy snagging issues
     static constexpr float sAllowedPenetration = 0.0f;
diff --git a/apps/openmw/mwphysics/movementsolver.cpp b/apps/openmw/mwphysics/movementsolver.cpp
index fc2ea57b40..1c06c9f00f 100644
--- a/apps/openmw/mwphysics/movementsolver.cpp
+++ b/apps/openmw/mwphysics/movementsolver.cpp
@@ -252,6 +252,8 @@ namespace MWPhysics
                 remainingTime *= (1.0f-tracer.mFraction);
 
                 auto planeNormal = tracer.mPlaneNormal;
+                // need to know the unadjusted normal to handle certain types of seams properly
+                const auto origPlaneNormal = planeNormal;
 
                 // If we touched the ground this frame, and whatever we ran into is a wall of some sort,
                 // pretend that its collision normal is pointing horizontally
@@ -275,10 +277,11 @@ namespace MWPhysics
                 bool usedSeamLogic = false;
 
                 // check for the current and previous collision planes forming an acute angle; slide along the seam if they do
+                // for this, we want to use the original plane normal, or else certain types of geometry will snag
                 if(numTimesSlid > 0)
                 {
-                    auto dotA = lastSlideNormal * planeNormal;
-                    auto dotB = lastSlideNormalFallback * planeNormal;
+                    auto dotA = lastSlideNormal * origPlaneNormal;
+                    auto dotB = lastSlideNormalFallback * origPlaneNormal;
                     if(numTimesSlid <= 1) // ignore fallback normal if this is only the first or second slide
                         dotB = 1.0;
                     if(dotA <= 0.0 || dotB <= 0.0)
@@ -291,14 +294,14 @@ namespace MWPhysics
                             lastSlideNormal = lastSlideNormalFallback;
                         }
 
-                        auto constraintVector = bestNormal ^ planeNormal; // cross product
+                        auto constraintVector = bestNormal ^ origPlaneNormal; // cross product
                         if(constraintVector.length2() > 0) // only if it's not zero length
                         {
                             constraintVector.normalize();
                             newVelocity = project(velocity, constraintVector);
 
                             // version of surface rejection for acute crevices/seams
-                            auto averageNormal = bestNormal + planeNormal;
+                            auto averageNormal = bestNormal + origPlaneNormal;
                             averageNormal.normalize();
                             tracer.doTrace(actor.mCollisionObject, newPosition, newPosition + averageNormal*(sCollisionMargin*2.0), collisionWorld);
                             newPosition = (newPosition + tracer.mEndPos)/2.0;
@@ -309,27 +312,28 @@ namespace MWPhysics
                 }
                 // otherwise just keep the normal vector rejection
 
-                // if this isn't the first iteration, or if the first iteration is also the last iteration,
                 // move away from the collision plane slightly, if possible
                 // this reduces getting stuck in some concave geometry, like the gaps above the railings in some ald'ruhn buildings
                 // this is different from the normal collision margin, because the normal collision margin is along the movement path,
                 // but this is along the collision normal
-                if(!usedSeamLogic && (iterations > 0 || remainingTime < 0.01f))
+                if(!usedSeamLogic)
                 {
                     tracer.doTrace(actor.mCollisionObject, newPosition, newPosition + planeNormal*(sCollisionMargin*2.0), collisionWorld);
                     newPosition = (newPosition + tracer.mEndPos)/2.0;
                 }
 
                 // Do not allow sliding up steep slopes if there is gravity.
-                if (newPosition.z() >= swimlevel && !actor.mFlying && !isWalkableSlope(planeNormal))
+                // The purpose of this is to prevent air control from letting you slide up tall, unwalkable slopes.
+                // For that purpose, it is not necessary to do it when trying to slide along acute seams/crevices (i.e. usedSeamLogic)
+                // and doing so would actually break air control in some situations where vanilla allows air control.
+                // Vanilla actually allows you to slide up slopes as long as you're in the "walking" animation, which can be true even
+                // in the air, so allowing this for seams isn't a compatibility break.
+                if (newPosition.z() >= swimlevel && !actor.mFlying && !isWalkableSlope(planeNormal) && !usedSeamLogic)
                     newVelocity.z() = std::min(newVelocity.z(), velocity.z());
 
-                if (newVelocity * origVelocity <= 0.0f)
-                    break;
-
                 numTimesSlid += 1;
                 lastSlideNormalFallback = lastSlideNormal;
-                lastSlideNormal = planeNormal;
+                lastSlideNormal = origPlaneNormal;
                 velocity = newVelocity;
             }
         }

From 5db4898beca5f03c4258877a02f5d09cb6d3d661 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 5 Nov 2021 20:47:11 +0100
Subject: [PATCH 1646/2859] Fix tile bounds scaling

OscillatingRecastMeshObject::update should be called with tile bounds in real
coordinates not in navmesh. But proper scaling was done only in
RecastMeshManager::getMesh and RecastMeshManager::updateObject used tile bounds
in navmesh coordinates.

Add a new function to create tile bounds with proper scaling and pass correct
value into RecastMeshManager constructor through CachedRecastMeshManager
constuctor from TileCachedRecastMeshManager member functions.
---
 .../cachedrecastmeshmanager.cpp               |  5 ++-
 .../cachedrecastmeshmanager.hpp               |  2 +-
 .../detournavigator/recastmeshmanager.cpp     | 10 ++----
 .../detournavigator/recastmeshmanager.hpp     |  3 +-
 components/detournavigator/settingsutils.hpp  | 11 +++++++
 .../tilecachedrecastmeshmanager.cpp           | 33 +++++++------------
 .../tilecachedrecastmeshmanager.hpp           |  5 ++-
 7 files changed, 31 insertions(+), 38 deletions(-)

diff --git a/components/detournavigator/cachedrecastmeshmanager.cpp b/components/detournavigator/cachedrecastmeshmanager.cpp
index d82310dc38..2e1ba45959 100644
--- a/components/detournavigator/cachedrecastmeshmanager.cpp
+++ b/components/detournavigator/cachedrecastmeshmanager.cpp
@@ -3,9 +3,8 @@
 
 namespace DetourNavigator
 {
-    CachedRecastMeshManager::CachedRecastMeshManager(const Settings& settings, const TileBounds& bounds,
-            std::size_t generation)
-        : mImpl(settings, bounds, generation)
+    CachedRecastMeshManager::CachedRecastMeshManager(const TileBounds& bounds, std::size_t generation)
+        : mImpl(bounds, generation)
     {}
 
     bool CachedRecastMeshManager::addObject(const ObjectId id, const CollisionShape& shape,
diff --git a/components/detournavigator/cachedrecastmeshmanager.hpp b/components/detournavigator/cachedrecastmeshmanager.hpp
index b1e2570b0a..740e0b73f5 100644
--- a/components/detournavigator/cachedrecastmeshmanager.hpp
+++ b/components/detournavigator/cachedrecastmeshmanager.hpp
@@ -14,7 +14,7 @@ namespace DetourNavigator
     class CachedRecastMeshManager
     {
     public:
-        CachedRecastMeshManager(const Settings& settings, const TileBounds& bounds, std::size_t generation);
+        explicit CachedRecastMeshManager(const TileBounds& bounds, std::size_t generation);
 
         bool addObject(const ObjectId id, const CollisionShape& shape, const btTransform& transform,
                        const AreaType areaType);
diff --git a/components/detournavigator/recastmeshmanager.cpp b/components/detournavigator/recastmeshmanager.cpp
index 2eeb90a9b5..6dcc2b2a42 100644
--- a/components/detournavigator/recastmeshmanager.cpp
+++ b/components/detournavigator/recastmeshmanager.cpp
@@ -28,9 +28,8 @@ namespace
 
 namespace DetourNavigator
 {
-    RecastMeshManager::RecastMeshManager(const Settings& settings, const TileBounds& bounds, std::size_t generation)
-        : mSettings(settings)
-        , mGeneration(generation)
+    RecastMeshManager::RecastMeshManager(const TileBounds& bounds, std::size_t generation)
+        : mGeneration(generation)
         , mTileBounds(bounds)
     {
     }
@@ -119,10 +118,7 @@ namespace DetourNavigator
 
     std::shared_ptr<RecastMesh> RecastMeshManager::getMesh() const
     {
-        TileBounds tileBounds = mTileBounds;
-        tileBounds.mMin /= mSettings.mRecastScaleFactor;
-        tileBounds.mMax /= mSettings.mRecastScaleFactor;
-        RecastMeshBuilder builder(tileBounds);
+        RecastMeshBuilder builder(mTileBounds);
         using Object = std::tuple<
             osg::ref_ptr<const osg::Referenced>,
             std::reference_wrapper<const btCollisionShape>,
diff --git a/components/detournavigator/recastmeshmanager.hpp b/components/detournavigator/recastmeshmanager.hpp
index e1c1567cb3..33aba97bbf 100644
--- a/components/detournavigator/recastmeshmanager.hpp
+++ b/components/detournavigator/recastmeshmanager.hpp
@@ -34,7 +34,7 @@ namespace DetourNavigator
     class RecastMeshManager
     {
     public:
-        RecastMeshManager(const Settings& settings, const TileBounds& bounds, std::size_t generation);
+        explicit RecastMeshManager(const TileBounds& bounds, std::size_t generation);
 
         bool addObject(const ObjectId id, const CollisionShape& shape, const btTransform& transform,
                        const AreaType areaType);
@@ -73,7 +73,6 @@ namespace DetourNavigator
             HeightfieldShape mShape;
         };
 
-        const Settings& mSettings;
         const std::size_t mGeneration;
         const TileBounds mTileBounds;
         mutable std::mutex mMutex;
diff --git a/components/detournavigator/settingsutils.hpp b/components/detournavigator/settingsutils.hpp
index 258eb64c65..6f15faaa3e 100644
--- a/components/detournavigator/settingsutils.hpp
+++ b/components/detournavigator/settingsutils.hpp
@@ -96,6 +96,17 @@ namespace DetourNavigator
     {
         return std::floor(std::sqrt(settings.mMaxTilesNumber / osg::PI)) - 1;
     }
+
+    inline TileBounds makeRealTileBoundsWithBorder(const Settings& settings, const TilePosition& tilePosition)
+    {
+        TileBounds result = makeTileBounds(settings, tilePosition);
+        const float border = getBorderSize(settings);
+        result.mMin -= osg::Vec2f(border, border);
+        result.mMax += osg::Vec2f(border, border);
+        result.mMin /= settings.mRecastScaleFactor;
+        result.mMax /= settings.mRecastScaleFactor;
+        return result;
+    }
 }
 
 #endif
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.cpp b/components/detournavigator/tilecachedrecastmeshmanager.cpp
index d6e3e55005..f82ce9de83 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -18,12 +18,11 @@ namespace DetourNavigator
                                                 const btTransform& transform, const AreaType areaType)
     {
         std::vector<TilePosition> tilesPositions;
-        const auto border = getBorderSize(mSettings);
         {
             auto tiles = mTiles.lock();
             getTilesPositions(shape.getShape(), transform, mSettings, [&] (const TilePosition& tilePosition)
                 {
-                    if (addTile(id, shape, transform, areaType, tilePosition, border, tiles.get()))
+                    if (addTile(id, shape, transform, areaType, tilePosition, tiles.get()))
                         tilesPositions.push_back(tilePosition);
                 });
         }
@@ -58,8 +57,6 @@ namespace DetourNavigator
     bool TileCachedRecastMeshManager::addWater(const osg::Vec2i& cellPosition, const int cellSize,
         const osg::Vec3f& shift)
     {
-        const auto border = getBorderSize(mSettings);
-
         auto& tilesPositions = mWaterTilesPositions[cellPosition];
 
         bool result = false;
@@ -84,11 +81,9 @@ namespace DetourNavigator
                     auto tile = tiles->find(tilePosition);
                     if (tile == tiles->end())
                     {
-                        auto tileBounds = makeTileBounds(mSettings, tilePosition);
-                        tileBounds.mMin -= osg::Vec2f(border, border);
-                        tileBounds.mMax += osg::Vec2f(border, border);
-                        tile = tiles->insert(std::make_pair(tilePosition,
-                                std::make_shared<CachedRecastMeshManager>(mSettings, tileBounds, mTilesGeneration))).first;
+                        const TileBounds tileBounds = makeRealTileBoundsWithBorder(mSettings, tilePosition);
+                        tile = tiles->emplace(tilePosition,
+                                std::make_shared<CachedRecastMeshManager>(tileBounds, mTilesGeneration)).first;
                     }
                     if (tile->second->addWater(cellPosition, cellSize, shift))
                     {
@@ -133,8 +128,6 @@ namespace DetourNavigator
     bool TileCachedRecastMeshManager::addHeightfield(const osg::Vec2i& cellPosition, int cellSize,
         const osg::Vec3f& shift, const HeightfieldShape& shape)
     {
-        const auto border = getBorderSize(mSettings);
-
         auto& tilesPositions = mHeightfieldTilesPositions[cellPosition];
 
         bool result = false;
@@ -145,11 +138,9 @@ namespace DetourNavigator
                 auto tile = tiles->find(tilePosition);
                 if (tile == tiles->end())
                 {
-                    auto tileBounds = makeTileBounds(mSettings, tilePosition);
-                    tileBounds.mMin -= osg::Vec2f(border, border);
-                    tileBounds.mMax += osg::Vec2f(border, border);
-                    tile = tiles->insert(std::make_pair(tilePosition,
-                            std::make_shared<CachedRecastMeshManager>(mSettings, tileBounds, mTilesGeneration))).first;
+                    const TileBounds tileBounds = makeRealTileBoundsWithBorder(mSettings, tilePosition);
+                    tile = tiles->emplace(tilePosition,
+                            std::make_shared<CachedRecastMeshManager>(tileBounds, mTilesGeneration)).first;
                 }
                 if (tile->second->addHeightfield(cellPosition, cellSize, shift, shape))
                 {
@@ -219,17 +210,15 @@ namespace DetourNavigator
     }
 
     bool TileCachedRecastMeshManager::addTile(const ObjectId id, const CollisionShape& shape,
-        const btTransform& transform, const AreaType areaType, const TilePosition& tilePosition, float border,
+        const btTransform& transform, const AreaType areaType, const TilePosition& tilePosition,
         TilesMap& tiles)
     {
         auto tile = tiles.find(tilePosition);
         if (tile == tiles.end())
         {
-            auto tileBounds = makeTileBounds(mSettings, tilePosition);
-            tileBounds.mMin -= osg::Vec2f(border, border);
-            tileBounds.mMax += osg::Vec2f(border, border);
-            tile = tiles.insert(std::make_pair(
-                tilePosition, std::make_shared<CachedRecastMeshManager>(mSettings, tileBounds, mTilesGeneration))).first;
+            const TileBounds tileBounds = makeRealTileBoundsWithBorder(mSettings, tilePosition);
+            tile = tiles.emplace(tilePosition,
+                    std::make_shared<CachedRecastMeshManager>(tileBounds, mTilesGeneration)).first;
         }
         return tile->second->addObject(id, shape, transform, areaType);
     }
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.hpp b/components/detournavigator/tilecachedrecastmeshmanager.hpp
index 7b5480e006..6b930c411f 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.hpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.hpp
@@ -33,7 +33,6 @@ namespace DetourNavigator
             if (object == mObjectsTilesPositions.end())
                 return false;
             auto& currentTiles = object->second;
-            const auto border = getBorderSize(mSettings);
             bool changed = false;
             std::vector<TilePosition> newTiles;
             {
@@ -49,7 +48,7 @@ namespace DetourNavigator
                             changed = true;
                         }
                     }
-                    else if (addTile(id, shape, transform, areaType, tilePosition, border, tiles.get()))
+                    else if (addTile(id, shape, transform, areaType, tilePosition, tiles.get()))
                     {
                         newTiles.push_back(tilePosition);
                         onChangedTile(tilePosition);
@@ -113,7 +112,7 @@ namespace DetourNavigator
         std::size_t mTilesGeneration = 0;
 
         bool addTile(const ObjectId id, const CollisionShape& shape, const btTransform& transform,
-                const AreaType areaType, const TilePosition& tilePosition, float border, TilesMap& tiles);
+                const AreaType areaType, const TilePosition& tilePosition, TilesMap& tiles);
 
         bool updateTile(const ObjectId id, const btTransform& transform, const AreaType areaType,
                 const TilePosition& tilePosition, TilesMap& tiles);

From 3f80725ebe333ef4bb847b3fe0c173ad85c1a186 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 5 Nov 2021 22:54:50 +0100
Subject: [PATCH 1647/2859] Remove duplicated implementation of
 Misc::Convert::toOsg

---
 apps/openmw/mwworld/scene.cpp                    | 4 ++--
 components/detournavigator/gettilespositions.hpp | 6 ++++--
 components/detournavigator/recastmeshbuilder.cpp | 2 +-
 components/misc/convert.hpp                      | 5 -----
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index f9e792c7d2..769817810a 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -147,12 +147,12 @@ namespace
                     transform.getOrigin()
                 );
 
-                const auto start = Misc::Convert::makeOsgVec3f(closedDoorTransform(center + toPoint));
+                const auto start = Misc::Convert::toOsg(closedDoorTransform(center + toPoint));
                 const auto startPoint = physics.castRay(start, start - osg::Vec3f(0, 0, 1000), ptr, {},
                     MWPhysics::CollisionType_World | MWPhysics::CollisionType_HeightMap | MWPhysics::CollisionType_Water);
                 const auto connectionStart = startPoint.mHit ? startPoint.mHitPos : start;
 
-                const auto end = Misc::Convert::makeOsgVec3f(closedDoorTransform(center - toPoint));
+                const auto end = Misc::Convert::toOsg(closedDoorTransform(center - toPoint));
                 const auto endPoint = physics.castRay(end, end - osg::Vec3f(0, 0, 1000), ptr, {},
                     MWPhysics::CollisionType_World | MWPhysics::CollisionType_HeightMap | MWPhysics::CollisionType_Water);
                 const auto connectionEnd = endPoint.mHit ? endPoint.mHitPos : end;
diff --git a/components/detournavigator/gettilespositions.hpp b/components/detournavigator/gettilespositions.hpp
index 27c8f7a4ac..e8ba8beba9 100644
--- a/components/detournavigator/gettilespositions.hpp
+++ b/components/detournavigator/gettilespositions.hpp
@@ -46,13 +46,15 @@ namespace DetourNavigator
         btVector3 aabbMax;
         shape.getAabb(transform, aabbMin, aabbMax);
 
-        getTilesPositions(Misc::Convert::makeOsgVec3f(aabbMin), Misc::Convert::makeOsgVec3f(aabbMax), settings, std::forward<Callback>(callback));
+        getTilesPositions(Misc::Convert::toOsg(aabbMin), Misc::Convert::toOsg(aabbMax), settings, std::forward<Callback>(callback));
     }
 
     template <class Callback>
     void getTilesPositions(const int cellSize, const osg::Vec3f& shift,
         const Settings& settings, Callback&& callback)
     {
+        using Misc::Convert::toOsg;
+
         const auto halfCellSize = cellSize / 2;
         const btTransform transform(btMatrix3x3::getIdentity(), Misc::Convert::toBullet(shift));
         auto aabbMin = transform(btVector3(-halfCellSize, -halfCellSize, 0));
@@ -64,7 +66,7 @@ namespace DetourNavigator
         aabbMax.setX(std::max(aabbMin.x(), aabbMax.x()));
         aabbMax.setY(std::max(aabbMin.y(), aabbMax.y()));
 
-        getTilesPositions(Misc::Convert::makeOsgVec3f(aabbMin), Misc::Convert::makeOsgVec3f(aabbMax), settings, std::forward<Callback>(callback));
+        getTilesPositions(toOsg(aabbMin), toOsg(aabbMax), settings, std::forward<Callback>(callback));
     }
 }
 
diff --git a/components/detournavigator/recastmeshbuilder.cpp b/components/detournavigator/recastmeshbuilder.cpp
index 73b731c247..8f860d2eb1 100644
--- a/components/detournavigator/recastmeshbuilder.cpp
+++ b/components/detournavigator/recastmeshbuilder.cpp
@@ -30,7 +30,7 @@ namespace DetourNavigator
             RecastMeshTriangle result;
             result.mAreaType = areaType;
             for (std::size_t i = 0; i < 3; ++i)
-                result.mVertices[i] = Misc::Convert::makeOsgVec3f(vertices[i]);
+                result.mVertices[i] = Misc::Convert::toOsg(vertices[i]);
             return result;
         }
 
diff --git a/components/misc/convert.hpp b/components/misc/convert.hpp
index 81270c0c0b..6f4a55cfcc 100644
--- a/components/misc/convert.hpp
+++ b/components/misc/convert.hpp
@@ -19,11 +19,6 @@ namespace Convert
         return osg::Vec3f(values[0], values[1], values[2]);
     }
 
-    inline osg::Vec3f makeOsgVec3f(const btVector3& value)
-    {
-        return osg::Vec3f(value.x(), value.y(), value.z());
-    }
-
     inline osg::Vec3f makeOsgVec3f(const ESM::Pathgrid::Point& value)
     {
         return osg::Vec3f(value.mX, value.mY, value.mZ);

From 5e99454cc48f3dd05e07065361efffd0fa321d80 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 6 Nov 2021 00:14:41 +0100
Subject: [PATCH 1648/2859] Add factory functions to create navigator
 implementations

---
 apps/openmw/mwworld/worldimp.cpp         | 10 +++-------
 components/detournavigator/navigator.cpp | 14 ++++++++++++++
 components/detournavigator/navigator.hpp |  4 ++++
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index d35f72e80c..5bb3fa4b58 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -27,10 +27,7 @@
 
 #include <components/sceneutil/positionattitudetransform.hpp>
 
-#include <components/detournavigator/debug.hpp>
-#include <components/detournavigator/navigatorimpl.hpp>
-#include <components/detournavigator/navigatorstub.hpp>
-#include <components/detournavigator/recastglobalallocator.hpp>
+#include <components/detournavigator/navigator.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/soundmanager.hpp"
@@ -197,12 +194,11 @@ namespace MWWorld
         {
             auto navigatorSettings = DetourNavigator::makeSettingsFromSettingsManager();
             navigatorSettings.mSwimHeightScale = mSwimHeightScale;
-            DetourNavigator::RecastGlobalAllocator::init();
-            mNavigator.reset(new DetourNavigator::NavigatorImpl(navigatorSettings));
+            mNavigator = DetourNavigator::makeNavigator(navigatorSettings);
         }
         else
         {
-            mNavigator.reset(new DetourNavigator::NavigatorStub());
+            mNavigator = DetourNavigator::makeNavigatorStub();
         }
 
         mRendering.reset(new MWRender::RenderingManager(viewer, rootNode, resourceSystem, workQueue, resourcePath, *mNavigator));
diff --git a/components/detournavigator/navigator.cpp b/components/detournavigator/navigator.cpp
index 700217c52f..fc7b0ffb6d 100644
--- a/components/detournavigator/navigator.cpp
+++ b/components/detournavigator/navigator.cpp
@@ -1,6 +1,9 @@
 #include "findrandompointaroundcircle.hpp"
 #include "navigator.hpp"
 #include "raycast.hpp"
+#include "navigatorimpl.hpp"
+#include "navigatorstub.hpp"
+#include "recastglobalallocator.hpp"
 
 namespace DetourNavigator
 {
@@ -33,4 +36,15 @@ namespace DetourNavigator
             return {};
         return fromNavMeshCoordinates(settings, *result);
     }
+
+    std::unique_ptr<Navigator> makeNavigator(const Settings& settings)
+    {
+        DetourNavigator::RecastGlobalAllocator::init();
+        return std::make_unique<NavigatorImpl>(settings);
+    }
+
+    std::unique_ptr<Navigator> makeNavigatorStub()
+    {
+        return std::make_unique<NavigatorStub>();
+    }
 }
diff --git a/components/detournavigator/navigator.hpp b/components/detournavigator/navigator.hpp
index 265d69b6e1..0ab351981a 100644
--- a/components/detournavigator/navigator.hpp
+++ b/components/detournavigator/navigator.hpp
@@ -240,6 +240,10 @@ namespace DetourNavigator
 
         virtual float getMaxNavmeshAreaRealRadius() const = 0;
     };
+
+    std::unique_ptr<Navigator> makeNavigator(const Settings& settings);
+
+    std::unique_ptr<Navigator> makeNavigatorStub();
 }
 
 #endif

From 9f808fbe3a1195ee6fa129a29cf9c394578f3f62 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 6 Nov 2021 00:34:06 +0100
Subject: [PATCH 1649/2859] Move findPath-like navigator functions into a
 separate header

---
 apps/openmw/mwmechanics/aicombat.cpp          |  4 +-
 apps/openmw/mwmechanics/aiwander.cpp          |  5 +-
 apps/openmw/mwmechanics/pathfinding.cpp       | 13 ++--
 apps/openmw/mwworld/worldimp.cpp              |  1 +
 .../detournavigator/navigator.cpp             | 45 ++++++------
 components/CMakeLists.txt                     |  1 +
 components/detournavigator/navigator.cpp      | 32 ---------
 components/detournavigator/navigator.hpp      | 61 +----------------
 components/detournavigator/navigatorutils.cpp | 37 ++++++++++
 components/detournavigator/navigatorutils.hpp | 68 +++++++++++++++++++
 components/detournavigator/settings.hpp       |  1 -
 11 files changed, 143 insertions(+), 125 deletions(-)
 create mode 100644 components/detournavigator/navigatorutils.cpp
 create mode 100644 components/detournavigator/navigatorutils.hpp

diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index eb139c918d..91a9b15b6f 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -8,7 +8,7 @@
 #include <components/misc/mathutil.hpp>
 
 #include <components/sceneutil/positionattitudetransform.hpp>
-#include <components/detournavigator/navigator.hpp>
+#include <components/detournavigator/navigatorutils.hpp>
 
 #include "../mwphysics/collisiontype.hpp"
 
@@ -277,7 +277,7 @@ namespace MWMechanics
                 // If there is no path, try to find a point on a line from the actor position to target projected
                 // on navmesh to attack the target from there.
                 const auto navigator = world->getNavigator();
-                const auto hit = navigator->raycast(halfExtents, vActorPos, vTargetPos, navigatorFlags);
+                const auto hit = DetourNavigator::raycast(*navigator, halfExtents, vActorPos, vTargetPos, navigatorFlags);
 
                 if (hit.has_value() && (*hit - vTargetPos).length() <= rangeAttack)
                 {
diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 9c84555404..53f050c0dd 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -5,7 +5,7 @@
 #include <components/debug/debuglog.hpp>
 #include <components/misc/rng.hpp>
 #include <components/esm/aisequence.hpp>
-#include <components/detournavigator/navigator.hpp>
+#include <components/detournavigator/navigatorutils.hpp>
 #include <components/misc/coordinateconverter.hpp>
 
 #include "../mwbase/world.hpp"
@@ -337,7 +337,8 @@ namespace MWMechanics
             if (!isWaterCreature && !isFlyingCreature)
             {
                 // findRandomPointAroundCircle uses wanderDistance as limit for random and not as exact distance
-                if (const auto destination = navigator->findRandomPointAroundCircle(halfExtents, mInitialActorPosition, wanderDistance, navigatorFlags))
+                if (const auto destination = DetourNavigator::findRandomPointAroundCircle(*navigator, halfExtents,
+                        mInitialActorPosition, wanderDistance, navigatorFlags))
                     mDestination = *destination;
                 else
                     mDestination = getRandomPointAround(mInitialActorPosition, wanderRadius);
diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp
index 4b06993a49..e727d8585d 100644
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@@ -3,8 +3,7 @@
 #include <iterator>
 #include <limits>
 
-#include <components/detournavigator/debug.hpp>
-#include <components/detournavigator/navigator.hpp>
+#include <components/detournavigator/navigatorutils.hpp>
 #include <components/debug/debuglog.hpp>
 #include <components/misc/coordinateconverter.hpp>
 
@@ -114,7 +113,7 @@ namespace
 
         bool operator()(const osg::Vec3f& start, const osg::Vec3f& end) const
         {
-            const auto position = mNavigator->raycast(mHalfExtents, start, end, mFlags);
+            const auto position = DetourNavigator::raycast(*mNavigator, mHalfExtents, start, end, mFlags);
             return position.has_value() && std::abs((position.value() - start).length2() - (end - start).length2()) <= 1;
         }
     };
@@ -422,8 +421,8 @@ namespace MWMechanics
         const auto world = MWBase::Environment::get().getWorld();
         const auto stepSize = getPathStepSize(actor);
         const auto navigator = world->getNavigator();
-        const auto status = navigator->findPath(halfExtents, stepSize, startPoint, endPoint, flags, areaCosts,
-                                                endTolerance, out);
+        const auto status = DetourNavigator::findPath(*navigator, halfExtents, stepSize,
+            startPoint, endPoint, flags, areaCosts, endTolerance, out);
 
         if (pathType == PathType::Partial && status == DetourNavigator::Status::PartialPath)
             return DetourNavigator::Status::Success;
@@ -455,8 +454,8 @@ namespace MWMechanics
         std::deque<osg::Vec3f> prePath;
         auto prePathInserter = std::back_inserter(prePath);
         const float endTolerance = 0;
-        const auto status = navigator->findPath(halfExtents, stepSize, startPoint, mPath.front(), flags, areaCosts,
-                                                endTolerance, prePathInserter);
+        const auto status = DetourNavigator::findPath(*navigator, halfExtents, stepSize,
+            startPoint, mPath.front(), flags, areaCosts, endTolerance, prePathInserter);
 
         if (status == DetourNavigator::Status::NavMeshNotFound)
             return;
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 5bb3fa4b58..e1c20d652d 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -28,6 +28,7 @@
 #include <components/sceneutil/positionattitudetransform.hpp>
 
 #include <components/detournavigator/navigator.hpp>
+#include <components/detournavigator/settings.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/soundmanager.hpp"
diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index d4bdcb13b8..d7422cda8b 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -2,6 +2,7 @@
 
 #include <components/detournavigator/navigatorimpl.hpp>
 #include <components/detournavigator/exceptions.hpp>
+#include <components/detournavigator/navigatorutils.hpp>
 #include <components/misc/rng.hpp>
 #include <components/loadinglistener/loadinglistener.hpp>
 #include <components/esm/loadland.hpp>
@@ -136,7 +137,7 @@ namespace
 
     TEST_F(DetourNavigatorNavigatorTest, find_path_for_empty_should_return_empty)
     {
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::NavMeshNotFound);
         EXPECT_EQ(mPath, std::deque<osg::Vec3f>());
     }
@@ -144,7 +145,7 @@ namespace
     TEST_F(DetourNavigatorNavigatorTest, find_path_for_existing_agent_with_no_navmesh_should_throw_exception)
     {
         mNavigator->addAgent(mAgentHalfExtents);
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::StartPolygonNotFound);
     }
 
@@ -153,7 +154,7 @@ namespace
         mNavigator->addAgent(mAgentHalfExtents);
         mNavigator->addAgent(mAgentHalfExtents);
         mNavigator->removeAgent(mAgentHalfExtents);
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::StartPolygonNotFound);
     }
 
@@ -173,7 +174,7 @@ namespace
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::requiredTilesPresent);
 
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
@@ -221,7 +222,7 @@ namespace
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
@@ -255,7 +256,7 @@ namespace
 
         mPath.clear();
         mOut = std::back_inserter(mPath);
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
@@ -305,7 +306,7 @@ namespace
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
@@ -342,7 +343,7 @@ namespace
 
         mPath.clear();
         mOut = std::back_inserter(mPath);
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
@@ -399,7 +400,7 @@ namespace
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
@@ -486,7 +487,7 @@ namespace
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
@@ -538,7 +539,7 @@ namespace
         mEnd.x() = 0;
         mEnd.z() = 300;
 
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_swim, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_swim, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
@@ -583,7 +584,7 @@ namespace
         mStart.x() = 0;
         mEnd.x() = 0;
 
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_swim | Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_swim | Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
@@ -628,7 +629,7 @@ namespace
         mStart.x() = 0;
         mEnd.x() = 0;
 
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_swim | Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_swim | Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
@@ -673,7 +674,7 @@ namespace
         mStart.x() = 0;
         mEnd.x() = 0;
 
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
@@ -722,7 +723,7 @@ namespace
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
@@ -775,7 +776,7 @@ namespace
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
@@ -822,7 +823,7 @@ namespace
 
         Misc::Rng::init(42);
 
-        const auto result = mNavigator->findRandomPointAroundCircle(mAgentHalfExtents, mStart, 100.0, Flag_walk);
+        const auto result = findRandomPointAroundCircle(*mNavigator, mAgentHalfExtents, mStart, 100.0, Flag_walk);
 
         ASSERT_THAT(result, Optional(Vec3fEq(-198.909332275390625, 123.06096649169921875, 1.99998414516448974609375)))
             << (result ? *result : osg::Vec3f());
@@ -870,7 +871,7 @@ namespace
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
@@ -954,7 +955,7 @@ namespace
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        const auto result = mNavigator->raycast(mAgentHalfExtents, mStart, mEnd, Flag_walk);
+        const auto result = raycast(*mNavigator, mAgentHalfExtents, mStart, mEnd, Flag_walk);
 
         ASSERT_THAT(result, Optional(Vec3fEq(mEnd.x(), mEnd.y(), 1.99998295307159423828125)))
             << (result ? *result : osg::Vec3f());
@@ -1019,7 +1020,7 @@ namespace
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::requiredTilesPresent);
 
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
@@ -1069,7 +1070,7 @@ namespace
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::PartialPath);
 
         EXPECT_THAT(mPath, ElementsAre(
@@ -1116,7 +1117,7 @@ namespace
 
         const float endTolerance = 1000.0f;
 
-        EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, endTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, endTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index a3f77d86bf..0b3c95ff45 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -196,6 +196,7 @@ add_component_dir(detournavigator
     offmeshconnectionsmanager
     preparednavmeshdata
     navmeshcacheitem
+    navigatorutils
     )
 
 add_component_dir(loadinglistener
diff --git a/components/detournavigator/navigator.cpp b/components/detournavigator/navigator.cpp
index fc7b0ffb6d..1877c3dd93 100644
--- a/components/detournavigator/navigator.cpp
+++ b/components/detournavigator/navigator.cpp
@@ -1,42 +1,10 @@
-#include "findrandompointaroundcircle.hpp"
 #include "navigator.hpp"
-#include "raycast.hpp"
 #include "navigatorimpl.hpp"
 #include "navigatorstub.hpp"
 #include "recastglobalallocator.hpp"
 
 namespace DetourNavigator
 {
-    std::optional<osg::Vec3f> Navigator::findRandomPointAroundCircle(const osg::Vec3f& agentHalfExtents,
-        const osg::Vec3f& start, const float maxRadius, const Flags includeFlags) const
-    {
-        const auto navMesh = getNavMesh(agentHalfExtents);
-        if (!navMesh)
-            return std::optional<osg::Vec3f>();
-        const auto settings = getSettings();
-        const auto result = DetourNavigator::findRandomPointAroundCircle(navMesh->lockConst()->getImpl(),
-            toNavMeshCoordinates(settings, agentHalfExtents), toNavMeshCoordinates(settings, start),
-            toNavMeshCoordinates(settings, maxRadius), includeFlags, settings);
-        if (!result)
-            return std::optional<osg::Vec3f>();
-        return std::optional<osg::Vec3f>(fromNavMeshCoordinates(settings, *result));
-    }
-
-    std::optional<osg::Vec3f> Navigator::raycast(const osg::Vec3f& agentHalfExtents, const osg::Vec3f& start,
-        const osg::Vec3f& end, const Flags includeFlags) const
-    {
-        const auto navMesh = getNavMesh(agentHalfExtents);
-        if (navMesh == nullptr)
-            return {};
-        const auto settings = getSettings();
-        const auto result = DetourNavigator::raycast(navMesh->lockConst()->getImpl(),
-            toNavMeshCoordinates(settings, agentHalfExtents), toNavMeshCoordinates(settings, start),
-            toNavMeshCoordinates(settings, end), includeFlags, settings);
-        if (!result)
-            return {};
-        return fromNavMeshCoordinates(settings, *result);
-    }
-
     std::unique_ptr<Navigator> makeNavigator(const Settings& settings)
     {
         DetourNavigator::RecastGlobalAllocator::init();
diff --git a/components/detournavigator/navigator.hpp b/components/detournavigator/navigator.hpp
index 0ab351981a..5edc12ed84 100644
--- a/components/detournavigator/navigator.hpp
+++ b/components/detournavigator/navigator.hpp
@@ -1,9 +1,6 @@
 #ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_NAVIGATOR_H
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_NAVIGATOR_H
 
-#include "findsmoothpath.hpp"
-#include "flags.hpp"
-#include "settings.hpp"
 #include "objectid.hpp"
 #include "navmeshcacheitem.hpp"
 #include "recastmeshtiles.hpp"
@@ -12,8 +9,6 @@
 
 #include <components/resource/bulletshape.hpp>
 
-#include <variant>
-
 namespace ESM
 {
     struct Cell;
@@ -27,6 +22,8 @@ namespace Loading
 
 namespace DetourNavigator
 {
+    struct Settings;
+
     struct ObjectShapes
     {
         osg::ref_ptr<const Resource::BulletShapeInstance> mShapeInstance;
@@ -166,38 +163,6 @@ namespace DetourNavigator
          */
         virtual void wait(Loading::Listener& listener, WaitConditionType waitConditionType) = 0;
 
-        /**
-         * @brief findPath fills output iterator with points of scene surfaces to be used for actor to walk through.
-         * @param agentHalfExtents allows to find navmesh for given actor.
-         * @param start path from given point.
-         * @param end path at given point.
-         * @param includeFlags setup allowed surfaces for actor to walk.
-         * @param out the beginning of the destination range.
-         * @param endTolerance defines maximum allowed distance to end path point in addition to agentHalfExtents
-         * @return Output iterator to the element in the destination range, one past the last element of found path.
-         * Equal to out if no path is found.
-         */
-        template <class OutputIterator>
-        Status findPath(const osg::Vec3f& agentHalfExtents, const float stepSize, const osg::Vec3f& start,
-            const osg::Vec3f& end, const Flags includeFlags, const DetourNavigator::AreaCosts& areaCosts,
-            float endTolerance, OutputIterator& out) const
-        {
-            static_assert(
-                std::is_same<
-                    typename std::iterator_traits<OutputIterator>::iterator_category,
-                    std::output_iterator_tag
-                >::value,
-                "out is not an OutputIterator"
-            );
-            const auto navMesh = getNavMesh(agentHalfExtents);
-            if (!navMesh)
-                return Status::NavMeshNotFound;
-            const auto settings = getSettings();
-            return findSmoothPath(navMesh->lockConst()->getImpl(), toNavMeshCoordinates(settings, agentHalfExtents),
-                toNavMeshCoordinates(settings, stepSize), toNavMeshCoordinates(settings, start),
-                toNavMeshCoordinates(settings, end), includeFlags, areaCosts, settings, endTolerance, out);
-        }
-
         /**
          * @brief getNavMesh returns navmesh for specific agent half extents
          * @return navmesh
@@ -214,28 +179,6 @@ namespace DetourNavigator
 
         virtual void reportStats(unsigned int frameNumber, osg::Stats& stats) const = 0;
 
-        /**
-         * @brief findRandomPointAroundCircle returns random location on navmesh within the reach of specified location.
-         * @param agentHalfExtents allows to find navmesh for given actor.
-         * @param start path from given point.
-         * @param maxRadius limit maximum distance from start.
-         * @param includeFlags setup allowed surfaces for actor to walk.
-         * @return not empty optional with position if point is found and empty optional if point is not found.
-         */
-        std::optional<osg::Vec3f> findRandomPointAroundCircle(const osg::Vec3f& agentHalfExtents,
-            const osg::Vec3f& start, const float maxRadius, const Flags includeFlags) const;
-
-        /**
-         * @brief raycast finds farest navmesh point from start on a line from start to end that has path from start.
-         * @param agentHalfExtents allows to find navmesh for given actor.
-         * @param start of the line
-         * @param end of the line
-         * @param includeFlags setup allowed surfaces for actor to walk.
-         * @return not empty optional with position if point is found and empty optional if point is not found.
-         */
-        std::optional<osg::Vec3f> raycast(const osg::Vec3f& agentHalfExtents, const osg::Vec3f& start,
-            const osg::Vec3f& end, const Flags includeFlags) const;
-
         virtual RecastMeshTiles getRecastMeshTiles() const = 0;
 
         virtual float getMaxNavmeshAreaRealRadius() const = 0;
diff --git a/components/detournavigator/navigatorutils.cpp b/components/detournavigator/navigatorutils.cpp
new file mode 100644
index 0000000000..82a108db6f
--- /dev/null
+++ b/components/detournavigator/navigatorutils.cpp
@@ -0,0 +1,37 @@
+#include "navigatorutils.hpp"
+#include "findrandompointaroundcircle.hpp"
+#include "navigator.hpp"
+#include "raycast.hpp"
+
+namespace DetourNavigator
+{
+    std::optional<osg::Vec3f> findRandomPointAroundCircle(const Navigator& navigator, const osg::Vec3f& agentHalfExtents,
+        const osg::Vec3f& start, const float maxRadius, const Flags includeFlags)
+    {
+        const auto navMesh = navigator.getNavMesh(agentHalfExtents);
+        if (!navMesh)
+            return std::nullopt;
+        const auto settings = navigator.getSettings();
+        const auto result = DetourNavigator::findRandomPointAroundCircle(navMesh->lockConst()->getImpl(),
+            toNavMeshCoordinates(settings, agentHalfExtents), toNavMeshCoordinates(settings, start),
+            toNavMeshCoordinates(settings, maxRadius), includeFlags, settings);
+        if (!result)
+            return std::nullopt;
+        return std::optional<osg::Vec3f>(fromNavMeshCoordinates(settings, *result));
+    }
+
+    std::optional<osg::Vec3f> raycast(const Navigator& navigator, const osg::Vec3f& agentHalfExtents, const osg::Vec3f& start,
+        const osg::Vec3f& end, const Flags includeFlags)
+    {
+        const auto navMesh = navigator.getNavMesh(agentHalfExtents);
+        if (navMesh == nullptr)
+            return std::nullopt;
+        const auto settings = navigator.getSettings();
+        const auto result = DetourNavigator::raycast(navMesh->lockConst()->getImpl(),
+            toNavMeshCoordinates(settings, agentHalfExtents), toNavMeshCoordinates(settings, start),
+            toNavMeshCoordinates(settings, end), includeFlags, settings);
+        if (!result)
+            return std::nullopt;
+        return fromNavMeshCoordinates(settings, *result);
+    }
+}
diff --git a/components/detournavigator/navigatorutils.hpp b/components/detournavigator/navigatorutils.hpp
new file mode 100644
index 0000000000..4ccc238f97
--- /dev/null
+++ b/components/detournavigator/navigatorutils.hpp
@@ -0,0 +1,68 @@
+#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_NAVIGATORUTILS_H
+#define OPENMW_COMPONENTS_DETOURNAVIGATOR_NAVIGATORUTILS_H
+
+#include "findsmoothpath.hpp"
+#include "flags.hpp"
+#include "settings.hpp"
+#include "navigator.hpp"
+
+#include <optional>
+
+namespace DetourNavigator
+{
+    /**
+     * @brief findPath fills output iterator with points of scene surfaces to be used for actor to walk through.
+     * @param agentHalfExtents allows to find navmesh for given actor.
+     * @param start path from given point.
+     * @param end path at given point.
+     * @param includeFlags setup allowed surfaces for actor to walk.
+     * @param out the beginning of the destination range.
+     * @param endTolerance defines maximum allowed distance to end path point in addition to agentHalfExtents
+     * @return Output iterator to the element in the destination range, one past the last element of found path.
+     * Equal to out if no path is found.
+     */
+    template <class OutputIterator>
+    inline Status findPath(const Navigator& navigator, const osg::Vec3f& agentHalfExtents, const float stepSize, const osg::Vec3f& start,
+        const osg::Vec3f& end, const Flags includeFlags, const DetourNavigator::AreaCosts& areaCosts,
+        float endTolerance, OutputIterator& out)
+    {
+        static_assert(
+            std::is_same<
+                typename std::iterator_traits<OutputIterator>::iterator_category,
+                std::output_iterator_tag
+            >::value,
+            "out is not an OutputIterator"
+        );
+        const auto navMesh = navigator.getNavMesh(agentHalfExtents);
+        if (navMesh == nullptr)
+            return Status::NavMeshNotFound;
+        const auto settings = navigator.getSettings();
+        return findSmoothPath(navMesh->lockConst()->getImpl(), toNavMeshCoordinates(settings, agentHalfExtents),
+            toNavMeshCoordinates(settings, stepSize), toNavMeshCoordinates(settings, start),
+            toNavMeshCoordinates(settings, end), includeFlags, areaCosts, settings, endTolerance, out);
+    }
+
+    /**
+     * @brief findRandomPointAroundCircle returns random location on navmesh within the reach of specified location.
+     * @param agentHalfExtents allows to find navmesh for given actor.
+     * @param start path from given point.
+     * @param maxRadius limit maximum distance from start.
+     * @param includeFlags setup allowed surfaces for actor to walk.
+     * @return not empty optional with position if point is found and empty optional if point is not found.
+     */
+    std::optional<osg::Vec3f> findRandomPointAroundCircle(const Navigator& navigator, const osg::Vec3f& agentHalfExtents,
+        const osg::Vec3f& start, const float maxRadius, const Flags includeFlags);
+
+    /**
+     * @brief raycast finds farest navmesh point from start on a line from start to end that has path from start.
+     * @param agentHalfExtents allows to find navmesh for given actor.
+     * @param start of the line
+     * @param end of the line
+     * @param includeFlags setup allowed surfaces for actor to walk.
+     * @return not empty optional with position if point is found and empty optional if point is not found.
+     */
+    std::optional<osg::Vec3f> raycast(const Navigator& navigator, const osg::Vec3f& agentHalfExtents, const osg::Vec3f& start,
+        const osg::Vec3f& end, const Flags includeFlags);
+}
+
+#endif
diff --git a/components/detournavigator/settings.hpp b/components/detournavigator/settings.hpp
index 800ad6b2bb..0ea35d9b49 100644
--- a/components/detournavigator/settings.hpp
+++ b/components/detournavigator/settings.hpp
@@ -2,7 +2,6 @@
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_SETTINGS_H
 
 #include <chrono>
-#include <optional>
 #include <string>
 
 namespace DetourNavigator

From 6b30d375fa1f646003d23571bbd9bbeeb84ad91d Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 6 Nov 2021 00:48:39 +0100
Subject: [PATCH 1650/2859] Replace detournavigator includes by forward
 declarations

---
 apps/openmw/engine.cpp               |  2 --
 apps/openmw/mwrender/actorspaths.cpp |  3 +++
 apps/openmw/mwrender/actorspaths.hpp |  8 ++++++--
 apps/openmw/mwrender/navmesh.cpp     |  3 +++
 apps/openmw/mwrender/navmesh.hpp     | 13 ++++++++++---
 apps/openmw/mwrender/recastmesh.cpp  |  2 ++
 apps/openmw/mwrender/recastmesh.hpp  |  7 ++++++-
 7 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 58dabd2cee..9f948de3eb 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -37,8 +37,6 @@
 
 #include <components/version/version.hpp>
 
-#include <components/detournavigator/navigator.hpp>
-
 #include <components/misc/frameratelimiter.hpp>
 
 #include <components/sceneutil/screencapture.hpp>
diff --git a/apps/openmw/mwrender/actorspaths.cpp b/apps/openmw/mwrender/actorspaths.cpp
index 4e3bfd79a6..941f37df75 100644
--- a/apps/openmw/mwrender/actorspaths.cpp
+++ b/apps/openmw/mwrender/actorspaths.cpp
@@ -9,6 +9,9 @@
 
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
+
+#include <algorithm>
+
 namespace MWRender
 {
     ActorsPaths::ActorsPaths(const osg::ref_ptr<osg::Group>& root, bool enabled)
diff --git a/apps/openmw/mwrender/actorspaths.hpp b/apps/openmw/mwrender/actorspaths.hpp
index 1f61834d46..12f102093b 100644
--- a/apps/openmw/mwrender/actorspaths.hpp
+++ b/apps/openmw/mwrender/actorspaths.hpp
@@ -3,18 +3,22 @@
 
 #include <apps/openmw/mwworld/ptr.hpp>
 
-#include <components/detournavigator/navigator.hpp>
-
 #include <osg/ref_ptr>
 
 #include <unordered_map>
 #include <deque>
+#include <map>
 
 namespace osg
 {
     class Group;
 }
 
+namespace DetourNavigator
+{
+    struct Settings;
+}
+
 namespace MWRender
 {
     class ActorsPaths
diff --git a/apps/openmw/mwrender/navmesh.cpp b/apps/openmw/mwrender/navmesh.cpp
index 523f7531af..548e85ad10 100644
--- a/apps/openmw/mwrender/navmesh.cpp
+++ b/apps/openmw/mwrender/navmesh.cpp
@@ -10,11 +10,14 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 
+#include <limits>
+
 namespace MWRender
 {
     NavMesh::NavMesh(const osg::ref_ptr<osg::Group>& root, bool enabled)
         : mRootNode(root)
         , mEnabled(enabled)
+        , mId(std::numeric_limits<std::size_t>::max())
         , mGeneration(0)
         , mRevision(0)
     {
diff --git a/apps/openmw/mwrender/navmesh.hpp b/apps/openmw/mwrender/navmesh.hpp
index d329b895d7..4c71dc74ec 100644
--- a/apps/openmw/mwrender/navmesh.hpp
+++ b/apps/openmw/mwrender/navmesh.hpp
@@ -1,16 +1,23 @@
 #ifndef OPENMW_MWRENDER_NAVMESH_H
 #define OPENMW_MWRENDER_NAVMESH_H
 
-#include <components/detournavigator/navigator.hpp>
-
 #include <osg/ref_ptr>
 
+#include <cstddef>
+
+class dtNavMesh;
+
 namespace osg
 {
     class Group;
     class Geometry;
 }
 
+namespace DetourNavigator
+{
+    struct Settings;
+}
+
 namespace MWRender
 {
     class NavMesh
@@ -38,7 +45,7 @@ namespace MWRender
     private:
         osg::ref_ptr<osg::Group> mRootNode;
         bool mEnabled;
-        std::size_t mId = std::numeric_limits<std::size_t>::max();
+        std::size_t mId;
         std::size_t mGeneration;
         std::size_t mRevision;
         osg::ref_ptr<osg::Group> mGroup;
diff --git a/apps/openmw/mwrender/recastmesh.cpp b/apps/openmw/mwrender/recastmesh.cpp
index 91035907e9..f108536242 100644
--- a/apps/openmw/mwrender/recastmesh.cpp
+++ b/apps/openmw/mwrender/recastmesh.cpp
@@ -3,6 +3,8 @@
 #include <components/sceneutil/recastmesh.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
+#include <components/detournavigator/settings.hpp>
+#include <components/detournavigator/recastmesh.hpp>
 
 #include <osg/PositionAttitudeTransform>
 
diff --git a/apps/openmw/mwrender/recastmesh.hpp b/apps/openmw/mwrender/recastmesh.hpp
index 729438dbe5..194ec04a62 100644
--- a/apps/openmw/mwrender/recastmesh.hpp
+++ b/apps/openmw/mwrender/recastmesh.hpp
@@ -1,7 +1,7 @@
 #ifndef OPENMW_MWRENDER_RECASTMESH_H
 #define OPENMW_MWRENDER_RECASTMESH_H
 
-#include <components/detournavigator/navigator.hpp>
+#include <components/detournavigator/recastmeshtiles.hpp>
 
 #include <osg/ref_ptr>
 
@@ -13,6 +13,11 @@ namespace osg
     class Geometry;
 }
 
+namespace DetourNavigator
+{
+    struct Settings;
+}
+
 namespace MWRender
 {
     class RecastMesh

From 7a0c13fcf87d5916f72b471b41ca833ebf05c811 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sat, 6 Nov 2021 07:30:28 +0300
Subject: [PATCH 1651/2859] Make better use of std::clamp

---
 apps/opencs/view/render/object.cpp             |  2 +-
 apps/openmw/mwdialogue/dialoguemanagerimp.cpp  |  2 +-
 apps/openmw/mwgui/dialogue.cpp                 |  3 +--
 apps/openmw/mwgui/enchantingdialog.cpp         |  2 +-
 apps/openmw/mwgui/hud.cpp                      |  2 +-
 apps/openmw/mwgui/keyboardnavigation.cpp       |  2 +-
 apps/openmw/mwgui/settingswindow.cpp           |  4 ++--
 apps/openmw/mwgui/statswindow.cpp              |  3 +--
 apps/openmw/mwinput/controllermanager.cpp      |  2 +-
 apps/openmw/mwinput/mousemanager.cpp           |  4 ++--
 apps/openmw/mwmechanics/actors.cpp             | 11 ++++-------
 apps/openmw/mwmechanics/character.cpp          | 12 ++++++------
 apps/openmw/mwmechanics/combat.cpp             |  7 +++----
 apps/openmw/mwmechanics/difficultyscaling.cpp  |  4 +---
 apps/openmw/mwmechanics/enchanting.cpp         |  6 +++---
 .../openmw/mwmechanics/mechanicsmanagerimp.cpp | 18 +++++++++---------
 apps/openmw/mwmechanics/npcstats.cpp           |  2 +-
 apps/openmw/mwmechanics/spelleffects.cpp       |  2 +-
 apps/openmw/mwmechanics/spellutil.cpp          |  5 ++++-
 apps/openmw/mwmechanics/weaponpriority.cpp     |  3 +--
 .../mwphysics/hasspherecollisioncallback.hpp   |  6 +++---
 apps/openmw/mwphysics/physicssystem.cpp        |  2 +-
 apps/openmw/mwrender/camera.cpp                |  6 +++---
 apps/openmw/mwrender/localmap.cpp              |  6 +++---
 apps/openmw/mwrender/objectpaging.cpp          |  8 ++------
 apps/openmw/mwrender/renderingmanager.cpp      |  5 ++---
 apps/openmw/mwrender/water.cpp                 |  9 ++++-----
 apps/openmw/mwscript/aiextensions.cpp          |  3 +--
 apps/openmw/mwscript/skyextensions.cpp         |  2 +-
 apps/openmw/mwsound/loudness.cpp               |  5 ++---
 apps/openmw/mwsound/volumesettings.cpp         |  2 +-
 apps/openmw/mwworld/worldimp.cpp               |  4 ++--
 components/esm/loadland.cpp                    |  2 +-
 components/fontloader/fontloader.cpp           |  9 +++------
 components/nifosg/controller.cpp               |  2 +-
 components/sceneutil/shadow.cpp                |  8 +++-----
 components/widgets/fontwrapper.hpp             |  6 +-----
 components/widgets/numericeditbox.cpp          |  2 +-
 38 files changed, 80 insertions(+), 103 deletions(-)

diff --git a/apps/opencs/view/render/object.cpp b/apps/opencs/view/render/object.cpp
index 789fad0587..9f4fd29966 100644
--- a/apps/opencs/view/render/object.cpp
+++ b/apps/opencs/view/render/object.cpp
@@ -308,7 +308,7 @@ osg::ref_ptr<osg::Node> CSVRender::Object::makeRotateMarker (int axis)
     const float OuterRadius = InnerRadius + MarkerShaftWidth;
 
     const float SegmentDistance = 100.f;
-    const size_t SegmentCount = std::min(64, std::max(24, (int)(OuterRadius * 2 * osg::PI / SegmentDistance)));
+    const size_t SegmentCount = std::clamp<int>(OuterRadius * 2 * osg::PI / SegmentDistance, 24, 64);
     const size_t VerticesPerSegment = 4;
     const size_t IndicesPerSegment = 24;
 
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index 8aa6acd8ed..5270c0143a 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -421,7 +421,7 @@ namespace MWDialogue
             // Clamp permanent disposition change so that final disposition doesn't go below 0 (could happen with intimidate)
             npcStats.setBaseDisposition(0);
             int zero = MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mActor, false);
-            int disposition = std::min(100 - zero, std::max(mOriginalDisposition + mPermanentDispositionChange, -zero));
+            int disposition = std::clamp(mOriginalDisposition + mPermanentDispositionChange, -zero, 100 - zero);
 
             npcStats.setBaseDisposition(disposition);
         }
diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp
index 1da77f5d06..86cad0fa7a 100644
--- a/apps/openmw/mwgui/dialogue.cpp
+++ b/apps/openmw/mwgui/dialogue.cpp
@@ -347,8 +347,7 @@ namespace MWGui
     {
         if (!mScrollBar->getVisible())
             return;
-        mScrollBar->setScrollPosition(std::min(static_cast<int>(mScrollBar->getScrollRange()-1),
-                                               std::max(0, static_cast<int>(mScrollBar->getScrollPosition() - _rel*0.3))));
+        mScrollBar->setScrollPosition(std::clamp<int>(mScrollBar->getScrollPosition() - _rel*0.3, 0, mScrollBar->getScrollRange() - 1));
         onScrollbarMoved(mScrollBar, mScrollBar->getScrollPosition());
     }
 
diff --git a/apps/openmw/mwgui/enchantingdialog.cpp b/apps/openmw/mwgui/enchantingdialog.cpp
index d0d2118c6e..ee0067f082 100644
--- a/apps/openmw/mwgui/enchantingdialog.cpp
+++ b/apps/openmw/mwgui/enchantingdialog.cpp
@@ -109,7 +109,7 @@ namespace MWGui
     {
         mEnchantmentPoints->setCaption(std::to_string(static_cast<int>(mEnchanting.getEnchantPoints(false))) + " / " + std::to_string(mEnchanting.getMaxEnchantValue()));
         mCharge->setCaption(std::to_string(mEnchanting.getGemCharge()));
-        mSuccessChance->setCaption(std::to_string(std::max(0, std::min(100, mEnchanting.getEnchantChance()))));
+        mSuccessChance->setCaption(std::to_string(std::clamp(mEnchanting.getEnchantChance(), 0, 100)));
         mCastCost->setCaption(std::to_string(mEnchanting.getEffectiveCastCost()));
         mPrice->setCaption(std::to_string(mEnchanting.getEnchantPrice()));
 
diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp
index 5a7b5a9590..ab596137cd 100644
--- a/apps/openmw/mwgui/hud.cpp
+++ b/apps/openmw/mwgui/hud.cpp
@@ -610,7 +610,7 @@ namespace MWGui
 
         static const float fNPCHealthBarFade = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fNPCHealthBarFade")->mValue.getFloat();
         if (fNPCHealthBarFade > 0.f)
-            mEnemyHealth->setAlpha(std::max(0.f, std::min(1.f, mEnemyHealthTimer/fNPCHealthBarFade)));
+            mEnemyHealth->setAlpha(std::clamp(mEnemyHealthTimer / fNPCHealthBarFade, 0.f, 1.f));
 
     }
 
diff --git a/apps/openmw/mwgui/keyboardnavigation.cpp b/apps/openmw/mwgui/keyboardnavigation.cpp
index b718b712c0..3220e16b94 100644
--- a/apps/openmw/mwgui/keyboardnavigation.cpp
+++ b/apps/openmw/mwgui/keyboardnavigation.cpp
@@ -273,7 +273,7 @@ bool KeyboardNavigation::switchFocus(int direction, bool wrap)
     if (wrap)
         index = (index + keyFocusList.size())%keyFocusList.size();
     else
-        index = std::min(std::max(0, index), static_cast<int>(keyFocusList.size())-1);
+        index = std::clamp<int>(index, 0, keyFocusList.size() - 1);
 
     MyGUI::Widget* next = keyFocusList[index];
     int vertdiff = next->getTop() - focus->getTop();
diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index 3b4afc852f..257c129e8c 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -171,7 +171,7 @@ namespace MWGui
                     else
                         valueStr = MyGUI::utility::toString(int(value));
 
-                    value = std::max(min, std::min(value, max));
+                    value = std::clamp(value, min, max);
                     value = (value-min)/(max-min);
 
                     scroll->setScrollPosition(static_cast<size_t>(value * (scroll->getScrollRange() - 1)));
@@ -306,7 +306,7 @@ namespace MWGui
             mWaterTextureSize->setIndexSelected(2);
 
         int waterReflectionDetail = Settings::Manager::getInt("reflection detail", "Water");
-        waterReflectionDetail = std::min(5, std::max(0, waterReflectionDetail));
+        waterReflectionDetail = std::clamp(waterReflectionDetail, 0, 5);
         mWaterReflectionDetail->setIndexSelected(waterReflectionDetail);
 
         updateMaxLightsComboBox(mMaxLights);
diff --git a/apps/openmw/mwgui/statswindow.cpp b/apps/openmw/mwgui/statswindow.cpp
index 8e6f951291..0830af0744 100644
--- a/apps/openmw/mwgui/statswindow.cpp
+++ b/apps/openmw/mwgui/statswindow.cpp
@@ -599,8 +599,7 @@ namespace MWGui
                     text += "\n#{fontcolourhtml=normal}#{sExpelled}";
                 else
                 {
-                    int rank = factionPair.second;
-                    rank = std::max(0, std::min(9, rank));
+                    const int rank = std::clamp(factionPair.second, 0, 9);
                     text += std::string("\n#{fontcolourhtml=normal}") + faction->mRanks[rank];
 
                     if (rank < 9)
diff --git a/apps/openmw/mwinput/controllermanager.cpp b/apps/openmw/mwinput/controllermanager.cpp
index fa10ce03cd..bdb46e31a8 100644
--- a/apps/openmw/mwinput/controllermanager.cpp
+++ b/apps/openmw/mwinput/controllermanager.cpp
@@ -70,7 +70,7 @@ namespace MWInput
         }
 
         float deadZoneRadius = Settings::Manager::getFloat("joystick dead zone", "Input");
-        deadZoneRadius = std::min(std::max(deadZoneRadius, 0.0f), 0.5f);
+        deadZoneRadius = std::clamp(deadZoneRadius, 0.f, 0.5f);
         mBindingsManager->setJoystickDeadZone(deadZoneRadius);
     }
 
diff --git a/apps/openmw/mwinput/mousemanager.cpp b/apps/openmw/mwinput/mousemanager.cpp
index 7810a40ad2..f2bd4505d1 100644
--- a/apps/openmw/mwinput/mousemanager.cpp
+++ b/apps/openmw/mwinput/mousemanager.cpp
@@ -245,8 +245,8 @@ namespace MWInput
         mMouseWheel += mouseWheelMove;
 
         const MyGUI::IntSize& viewSize = MyGUI::RenderManager::getInstance().getViewSize();
-        mGuiCursorX = std::max(0.f, std::min(mGuiCursorX, float(viewSize.width - 1)));
-        mGuiCursorY = std::max(0.f, std::min(mGuiCursorY, float(viewSize.height - 1)));
+        mGuiCursorX = std::clamp<float>(mGuiCursorX, 0.f, viewSize.width - 1);
+        mGuiCursorY = std::clamp<float>(mGuiCursorY, 0.f, viewSize.height - 1);
 
         MyGUI::InputManager::getInstance().injectMouseMove(static_cast<int>(mGuiCursorX), static_cast<int>(mGuiCursorY), static_cast<int>(mMouseWheel));
     }
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index cb4f8237e7..32562591a5 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1013,13 +1013,10 @@ namespace MWMechanics
     void Actors::updateProcessingRange()
     {
         // We have to cap it since using high values (larger than 7168) will make some quests harder or impossible to complete (bug #1876)
-        static const float maxProcessingRange = 7168.f;
-        static const float minProcessingRange = maxProcessingRange / 2.f;
+        static const float maxRange = 7168.f;
+        static const float minRange = maxRange / 2.f;
 
-        float actorsProcessingRange = Settings::Manager::getFloat("actors processing range", "Game");
-        actorsProcessingRange = std::min(actorsProcessingRange, maxProcessingRange);
-        actorsProcessingRange = std::max(actorsProcessingRange, minProcessingRange);
-        mActorsProcessingRange = actorsProcessingRange;
+        mActorsProcessingRange = std::clamp(Settings::Manager::getFloat("actors processing range", "Game"), minRange, maxRange);
     }
 
     void Actors::addActor (const MWWorld::Ptr& ptr, bool updateImmediately)
@@ -1315,7 +1312,7 @@ namespace MWMechanics
                 angleToApproachingActor = std::atan2(deltaPos.x(), deltaPos.y());
                 osg::Vec2f posAtT = relPos + relSpeed * t;
                 float coef = (posAtT.x() * relSpeed.x() + posAtT.y() * relSpeed.y()) / (collisionDist * collisionDist * maxSpeed);
-                coef *= osg::clampBetween((maxDistForPartialAvoiding - dist) / (maxDistForPartialAvoiding - maxDistForStrictAvoiding), 0.f, 1.f);
+                coef *= std::clamp((maxDistForPartialAvoiding - dist) / (maxDistForPartialAvoiding - maxDistForStrictAvoiding), 0.f, 1.f);
                 movementCorrection = posAtT * coef;
                 if (otherPtr.getClass().getCreatureStats(otherPtr).isDead())
                     // In case of dead body still try to go around (it looks natural), but reduce the correction twice.
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 58339d0228..36d4446580 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -2044,7 +2044,7 @@ void CharacterController::update(float duration)
                 mIsMovingBackward = vec.y() < 0;
 
             float maxDelta = osg::PI * duration * (2.5f - cosDelta);
-            delta = osg::clampBetween(delta, -maxDelta, maxDelta);
+            delta = std::clamp(delta, -maxDelta, maxDelta);
             stats.setSideMovementAngle(stats.getSideMovementAngle() + delta);
             effectiveRotation += delta;
         }
@@ -2286,7 +2286,7 @@ void CharacterController::update(float duration)
             float swimmingPitch = mAnimation->getBodyPitchRadians();
             float targetSwimmingPitch = -mPtr.getRefData().getPosition().rot[0];
             float maxSwimPitchDelta = 3.0f * duration;
-            swimmingPitch += osg::clampBetween(targetSwimmingPitch - swimmingPitch, -maxSwimPitchDelta, maxSwimPitchDelta);
+            swimmingPitch += std::clamp(targetSwimmingPitch - swimmingPitch, -maxSwimPitchDelta, maxSwimPitchDelta);
             mAnimation->setBodyPitchRadians(swimmingPitch);
         }
         else
@@ -2522,7 +2522,7 @@ void CharacterController::unpersistAnimationState()
         {
             float start = mAnimation->getTextKeyTime(anim.mGroup+": start");
             float stop = mAnimation->getTextKeyTime(anim.mGroup+": stop");
-            float time = std::max(start, std::min(stop, anim.mTime));
+            float time = std::clamp(anim.mTime, start, stop);
             complete = (time - start) / (stop - start);
         }
 
@@ -2746,7 +2746,7 @@ void CharacterController::setVisibility(float visibility)
         float chameleon = mPtr.getClass().getCreatureStats(mPtr).getMagicEffects().get(ESM::MagicEffect::Chameleon).getMagnitude();
         if (chameleon)
         {
-            alpha *= std::min(0.75f, std::max(0.25f, (100.f - chameleon)/100.f));
+            alpha *= std::clamp(1.f - chameleon / 100.f, 0.25f, 0.75f);
         }
 
         visibility = std::min(visibility, alpha);
@@ -2965,8 +2965,8 @@ void CharacterController::updateHeadTracking(float duration)
     const double xLimit = osg::DegreesToRadians(40.0);
     const double zLimit = osg::DegreesToRadians(30.0);
     double zLimitOffset = mAnimation->getUpperBodyYawRadians();
-    xAngleRadians = osg::clampBetween(xAngleRadians, -xLimit, xLimit);
-    zAngleRadians = osg::clampBetween(zAngleRadians, -zLimit + zLimitOffset, zLimit + zLimitOffset);
+    xAngleRadians = std::clamp(xAngleRadians, -xLimit, xLimit);
+    zAngleRadians = std::clamp(zAngleRadians, -zLimit + zLimitOffset, zLimit + zLimitOffset);
 
     float factor = duration*5;
     factor = std::min(factor, 1.f);
diff --git a/apps/openmw/mwmechanics/combat.cpp b/apps/openmw/mwmechanics/combat.cpp
index c1d5f711fc..2962a25ede 100644
--- a/apps/openmw/mwmechanics/combat.cpp
+++ b/apps/openmw/mwmechanics/combat.cpp
@@ -113,10 +113,9 @@ namespace MWMechanics
                 + 0.1f * attackerStats.getAttribute(ESM::Attribute::Luck).getModified();
         attackerTerm *= attackerStats.getFatigueTerm();
 
-        int x = int(blockerTerm - attackerTerm);
-        int iBlockMaxChance = gmst.find("iBlockMaxChance")->mValue.getInteger();
-        int iBlockMinChance = gmst.find("iBlockMinChance")->mValue.getInteger();
-        x = std::min(iBlockMaxChance, std::max(iBlockMinChance, x));
+        const int iBlockMaxChance = gmst.find("iBlockMaxChance")->mValue.getInteger();
+        const int iBlockMinChance = gmst.find("iBlockMinChance")->mValue.getInteger();
+        int x = std::clamp<int>(blockerTerm - attackerTerm, iBlockMinChance, iBlockMaxChance);
 
         if (Misc::Rng::roll0to99() < x)
         {
diff --git a/apps/openmw/mwmechanics/difficultyscaling.cpp b/apps/openmw/mwmechanics/difficultyscaling.cpp
index 2376989745..e973e0ed52 100644
--- a/apps/openmw/mwmechanics/difficultyscaling.cpp
+++ b/apps/openmw/mwmechanics/difficultyscaling.cpp
@@ -13,9 +13,7 @@ float scaleDamage(float damage, const MWWorld::Ptr& attacker, const MWWorld::Ptr
     const MWWorld::Ptr& player = MWMechanics::getPlayer();
 
     // [-500, 500]
-    int difficultySetting = Settings::Manager::getInt("difficulty", "Game");
-    difficultySetting = std::min(difficultySetting, 500);
-    difficultySetting = std::max(difficultySetting, -500);
+    const int difficultySetting = std::clamp(Settings::Manager::getInt("difficulty", "Game"), -500, 500);
 
     static const float fDifficultyMult = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fDifficultyMult")->mValue.getFloat();
 
diff --git a/apps/openmw/mwmechanics/enchanting.cpp b/apps/openmw/mwmechanics/enchanting.cpp
index 078cbc5f43..a1870cbdb0 100644
--- a/apps/openmw/mwmechanics/enchanting.cpp
+++ b/apps/openmw/mwmechanics/enchanting.cpp
@@ -356,10 +356,10 @@ namespace MWMechanics
             ESM::WeaponType::Class weapclass = MWMechanics::getWeaponType(mWeaponType)->mWeaponClass;
             if (weapclass == ESM::WeaponType::Thrown || weapclass == ESM::WeaponType::Ammo)
             {
-                static const float multiplier = std::max(0.f, std::min(1.0f, Settings::Manager::getFloat("projectiles enchant multiplier", "Game")));
+                static const float multiplier = std::clamp(Settings::Manager::getFloat("projectiles enchant multiplier", "Game"), 0.f, 1.f);
                 MWWorld::Ptr player = getPlayer();
-                int itemsInInventoryCount = player.getClass().getContainerStore(player).count(mOldItemPtr.getCellRef().getRefId());
-                count = std::min(itemsInInventoryCount, std::max(1, int(getGemCharge() * multiplier / enchantPoints)));
+                count = player.getClass().getContainerStore(player).count(mOldItemPtr.getCellRef().getRefId());
+                count = std::clamp<int>(getGemCharge() * multiplier / enchantPoints, 1, count);
             }
         }
 
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index e01ed3c425..362df54ab7 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -545,9 +545,9 @@ namespace MWMechanics
 
         x += ptr.getClass().getCreatureStats(ptr).getMagicEffects().get(ESM::MagicEffect::Charm).getMagnitude();
 
-        if(clamp)
-            return std::max(0,std::min(int(x),100));//, normally clamped to [0..100] when used
-        return int(x);
+        if (clamp)
+            return std::clamp<int>(x, 0, 100);//, normally clamped to [0..100] when used
+        return static_cast<int>(x);
     }
 
     int MechanicsManager::getBarterOffer(const MWWorld::Ptr& ptr,int basePrice, bool buying)
@@ -649,9 +649,9 @@ namespace MWMechanics
                 int flee = npcStats.getAiSetting(MWMechanics::CreatureStats::AI_Flee).getBase();
                 int fight = npcStats.getAiSetting(MWMechanics::CreatureStats::AI_Fight).getBase();
                 npcStats.setAiSetting (MWMechanics::CreatureStats::AI_Flee,
-                                       std::max(0, std::min(100, flee + int(std::max(iPerMinChange, s)))));
+                                       std::clamp(flee + int(std::max(iPerMinChange, s)), 0, 100));
                 npcStats.setAiSetting (MWMechanics::CreatureStats::AI_Fight,
-                                       std::max(0, std::min(100, fight + int(std::min(-iPerMinChange, -s)))));
+                                       std::clamp(fight + int(std::min(-iPerMinChange, -s)), 0, 100));
             }
 
             float c = -std::abs(floor(r * fPerDieRollMult));
@@ -689,10 +689,10 @@ namespace MWMechanics
                 float s = c * fPerDieRollMult * fPerTempMult;
                 int flee = npcStats.getAiSetting (CreatureStats::AI_Flee).getBase();
                 int fight = npcStats.getAiSetting (CreatureStats::AI_Fight).getBase();
-                npcStats.setAiSetting (CreatureStats::AI_Flee,
-                                       std::max(0, std::min(100, flee + std::min(-int(iPerMinChange), int(-s)))));
-                npcStats.setAiSetting (CreatureStats::AI_Fight,
-                                       std::max(0, std::min(100, fight + std::max(int(iPerMinChange), int(s)))));
+                npcStats.setAiSetting(CreatureStats::AI_Flee,
+                                       std::clamp(flee + std::min(-int(iPerMinChange), int(-s)), 0, 100));
+                npcStats.setAiSetting(CreatureStats::AI_Fight,
+                                       std::clamp(fight + std::max(int(iPerMinChange), int(s)), 0, 100));
             }
             x = floor(-c * fPerDieRollMult);
 
diff --git a/apps/openmw/mwmechanics/npcstats.cpp b/apps/openmw/mwmechanics/npcstats.cpp
index 5d19368bf6..1d1dfacce8 100644
--- a/apps/openmw/mwmechanics/npcstats.cpp
+++ b/apps/openmw/mwmechanics/npcstats.cpp
@@ -371,7 +371,7 @@ int MWMechanics::NpcStats::getReputation() const
 void MWMechanics::NpcStats::setReputation(int reputation)
 {
     // Reputation is capped in original engine
-    mReputation = std::min(255, std::max(0, reputation));
+    mReputation = std::clamp(reputation, 0, 255);
 }
 
 int MWMechanics::NpcStats::getCrimeId() const
diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp
index 7907642f5e..566fb9eded 100644
--- a/apps/openmw/mwmechanics/spelleffects.cpp
+++ b/apps/openmw/mwmechanics/spelleffects.cpp
@@ -631,7 +631,7 @@ void applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, co
                 if (!target.isInCell() || !target.getCell()->isExterior() || godmode)
                     break;
                 float time = world->getTimeStamp().getHour();
-                float timeDiff = std::min(7.f, std::max(0.f, std::abs(time - 13)));
+                float timeDiff = std::clamp(std::abs(time - 13.f), 0.f, 7.f);
                 float damageScale = 1.f - timeDiff / 7.f;
                 // When cloudy, the sun damage effect is halved
                 static float fMagicSunBlockedMult = world->getStore().get<ESM::GameSetting>().find("fMagicSunBlockedMult")->mValue.getFloat();
diff --git a/apps/openmw/mwmechanics/spellutil.cpp b/apps/openmw/mwmechanics/spellutil.cpp
index b18ad288ad..70167abcd3 100644
--- a/apps/openmw/mwmechanics/spellutil.cpp
+++ b/apps/openmw/mwmechanics/spellutil.cpp
@@ -162,7 +162,10 @@ namespace MWMechanics
         float castChance = baseChance + castBonus;
         castChance *= stats.getFatigueTerm();
 
-        return std::max(0.f, cap ? std::min(100.f, castChance) : castChance);
+        if (cap)
+            return std::clamp(castChance, 0.f, 100.f);
+
+        return std::max(castChance, 0.f);
     }
 
     float getSpellSuccessChance (const std::string& spellId, const MWWorld::Ptr& actor, int* effectiveSchool, bool cap, bool checkMagicka)
diff --git a/apps/openmw/mwmechanics/weaponpriority.cpp b/apps/openmw/mwmechanics/weaponpriority.cpp
index 570e89a17d..1a17cc87e6 100644
--- a/apps/openmw/mwmechanics/weaponpriority.cpp
+++ b/apps/openmw/mwmechanics/weaponpriority.cpp
@@ -128,8 +128,7 @@ namespace MWMechanics
         }
 
         // Take hit chance in account, but do not allow rating become negative.
-        float chance = getHitChance(actor, enemy, value) / 100.f;
-        rating *= std::min(1.f, std::max(0.01f, chance));
+        rating *= std::clamp(getHitChance(actor, enemy, value) / 100.f, 0.01f, 1.f);
 
         if (weapclass != ESM::WeaponType::Ammo)
             rating *= weapon->mData.mSpeed;
diff --git a/apps/openmw/mwphysics/hasspherecollisioncallback.hpp b/apps/openmw/mwphysics/hasspherecollisioncallback.hpp
index fc8725f5f4..a01ab96301 100644
--- a/apps/openmw/mwphysics/hasspherecollisioncallback.hpp
+++ b/apps/openmw/mwphysics/hasspherecollisioncallback.hpp
@@ -15,9 +15,9 @@ namespace MWPhysics
         const btVector3& position, const btScalar radius)
     {
         const btVector3 nearest(
-            std::max(aabbMin.x(), std::min(aabbMax.x(), position.x())),
-            std::max(aabbMin.y(), std::min(aabbMax.y(), position.y())),
-            std::max(aabbMin.z(), std::min(aabbMax.z(), position.z()))
+            std::clamp(position.x(), aabbMin.x(), aabbMax.x()),
+            std::clamp(position.y(), aabbMin.y(), aabbMax.y()),
+            std::clamp(position.z(), aabbMin.z(), aabbMax.z())
         );
         return nearest.distance(position) < radius;
     }
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index ea595e6abb..98e3bcf737 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -718,7 +718,7 @@ namespace MWPhysics
             physicActor->setCanWaterWalk(waterCollision);
 
             // Slow fall reduces fall speed by a factor of (effect magnitude / 200)
-            const float slowFall = 1.f - std::max(0.f, std::min(1.f, effects.get(ESM::MagicEffect::SlowFall).getMagnitude() * 0.005f));
+            const float slowFall = 1.f - std::clamp(effects.get(ESM::MagicEffect::SlowFall).getMagnitude() * 0.005f, 0.f, 1.f);
             const bool godmode = ptr == world->getPlayerConstPtr() && world->getGodModeState();
             const bool inert = stats.isDead() || (!godmode && stats.getMagicEffects().get(ESM::MagicEffect::Paralyze).getModifier() > 0);
 
diff --git a/apps/openmw/mwrender/camera.cpp b/apps/openmw/mwrender/camera.cpp
index e750fcad46..d1e842790b 100644
--- a/apps/openmw/mwrender/camera.cpp
+++ b/apps/openmw/mwrender/camera.cpp
@@ -236,7 +236,7 @@ namespace MWRender
         mTotalMovement += speed * duration;
         speed /= (1.f + speed / 500.f);
         float maxDelta = 300.f * duration;
-        mSmoothedSpeed += osg::clampBetween(speed - mSmoothedSpeed, -maxDelta, maxDelta);
+        mSmoothedSpeed += std::clamp(speed - mSmoothedSpeed, -maxDelta, maxDelta);
 
         mMaxNextCameraDistance = mCameraDistance + duration * (100.f + mBaseCameraDistance);
         updateStandingPreviewMode();
@@ -434,7 +434,7 @@ namespace MWRender
     {
         const float epsilon = 0.000001f;
         float limit = static_cast<float>(osg::PI_2) - epsilon;
-        mPitch = osg::clampBetween(angle, -limit, limit);
+        mPitch = std::clamp(angle, -limit, limit);
     }
 
     float Camera::getCameraDistance() const
@@ -460,7 +460,7 @@ namespace MWRender
         }
 
         mIsNearest = mBaseCameraDistance <= mNearest;
-        mBaseCameraDistance = osg::clampBetween(mBaseCameraDistance, mNearest, mFurthest);
+        mBaseCameraDistance = std::clamp(mBaseCameraDistance, mNearest, mFurthest);
         Settings::Manager::setFloat("third person camera distance", "Camera", mBaseCameraDistance);
     }
 
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index 70f0ff02bb..0eb0e7738a 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -562,8 +562,8 @@ bool LocalMap::isPositionExplored (float nX, float nY, int x, int y)
     if (!segment.mFogOfWarImage)
         return false;
 
-    nX = std::max(0.f, std::min(1.f, nX));
-    nY = std::max(0.f, std::min(1.f, nY));
+    nX = std::clamp(nX, 0.f, 1.f);
+    nY = std::clamp(nY, 0.f, 1.f);
 
     int texU = static_cast<int>((sFogOfWarResolution - 1) * nX);
     int texV = static_cast<int>((sFogOfWarResolution - 1) * nY);
@@ -648,7 +648,7 @@ void LocalMap::updatePlayer (const osg::Vec3f& position, const osg::Quat& orient
                     uint32_t clr = *(uint32_t*)data;
                     uint8_t alpha = (clr >> 24);
 
-                    alpha = std::min( alpha, (uint8_t) (std::max(0.f, std::min(1.f, (sqrDist/sqrExploreRadius)))*255) );
+                    alpha = std::min( alpha, (uint8_t) (std::clamp((sqrDist/sqrExploreRadius)*255, 0.f, 1.f)));
                     uint32_t val = (uint32_t) (alpha << 24);
                     if ( *data != val)
                     {
diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index b6f12dea37..4e21d33475 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -733,12 +733,8 @@ namespace MWRender
         }
         void clampToCell(osg::Vec3f& cellPos)
         {
-            osg::Vec2i min (mCell.x(), mCell.y());
-            osg::Vec2i max (mCell.x()+1, mCell.y()+1);
-            if (cellPos.x() < min.x()) cellPos.x() = min.x();
-            if (cellPos.x() > max.x()) cellPos.x() = max.x();
-            if (cellPos.y() < min.y()) cellPos.y() = min.y();
-            if (cellPos.y() > max.y()) cellPos.y() = max.y();
+            cellPos.x() = std::clamp<float>(cellPos.x(), mCell.x(), mCell.x() + 1);
+            cellPos.y() = std::clamp<float>(cellPos.y(), mCell.y(), mCell.y() + 1);
         }
         osg::Vec3f mPosition;
         osg::Vec2i mCell;
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index c4ef1d9d9b..4e2da15107 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -297,7 +297,8 @@ namespace MWRender
         , mViewDistance(Settings::Manager::getFloat("viewing distance", "Camera"))
         , mFieldOfViewOverridden(false)
         , mFieldOfViewOverride(0.f)
-        , mFieldOfView(std::min(std::max(1.f, Settings::Manager::getFloat("field of view", "Camera")), 179.f))
+        , mFieldOfView(std::clamp(Settings::Manager::getFloat("field of view", "Camera"), 1.f, 179.f))
+        , mFirstPersonFieldOfView(std::clamp(Settings::Manager::getFloat("first person field of view", "Camera"), 1.f, 179.f))
     {
         bool reverseZ = SceneUtil::getReverseZ();
 
@@ -517,8 +518,6 @@ namespace MWRender
         NifOsg::Loader::setIntersectionDisabledNodeMask(Mask_Effect);
         Nif::NIFFile::setLoadUnsupportedFiles(Settings::Manager::getBool("load unsupported nif files", "Models"));
 
-        float firstPersonFov = Settings::Manager::getFloat("first person field of view", "Camera");
-        mFirstPersonFieldOfView = std::min(std::max(1.f, firstPersonFov), 179.f);
         mStateUpdater->setFogEnd(mViewDistance);
 
         mRootNode->getOrCreateStateSet()->addUniform(new osg::Uniform("simpleWater", false));
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index d8f92d1d1f..895486ea31 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -305,8 +305,7 @@ public:
 
     void setWaterLevel(float waterLevel)
     {
-        const float refractionScale = std::min(1.0f, std::max(0.0f,
-            Settings::Manager::getFloat("refraction scale", "Water")));
+        const float refractionScale = std::clamp(Settings::Manager::getFloat("refraction scale", "Water"), 0.f, 1.f);
 
         mViewMatrix = osg::Matrix::scale(1, 1, refractionScale) *
             osg::Matrix::translate(0, 0, (1.0 - refractionScale) * waterLevel);
@@ -400,7 +399,7 @@ private:
     unsigned int calcNodeMask()
     {
         int reflectionDetail = Settings::Manager::getInt("reflection detail", "Water");
-        reflectionDetail = std::min(5, std::max(mInterior ? 2 : 0, reflectionDetail));
+        reflectionDetail = std::clamp(reflectionDetail, mInterior ? 2 : 0, 5);
         unsigned int extraMask = 0;
         if(reflectionDetail >= 1) extraMask |= Mask_Terrain;
         if(reflectionDetail >= 2) extraMask |= Mask_Static;
@@ -583,7 +582,7 @@ void Water::createSimpleWaterStateSet(osg::Node* node, float alpha)
 
     // Add animated textures
     std::vector<osg::ref_ptr<osg::Texture2D> > textures;
-    int frameCount = std::max(0, std::min(Fallback::Map::getInt("Water_SurfaceFrameCount"), 320));
+    const int frameCount = std::clamp(Fallback::Map::getInt("Water_SurfaceFrameCount"), 0, 320);
     const std::string& texture = Fallback::Map::getString("Water_SurfaceTexture");
     for (int i=0; i<frameCount; ++i)
     {
@@ -724,7 +723,7 @@ Water::~Water()
 
 void Water::listAssetsToPreload(std::vector<std::string> &textures)
 {
-    int frameCount = std::max(0, std::min(Fallback::Map::getInt("Water_SurfaceFrameCount"), 320));
+    const int frameCount = std::clamp(Fallback::Map::getInt("Water_SurfaceFrameCount"), 0, 320);
     const std::string& texture = Fallback::Map::getString("Water_SurfaceTexture");
     for (int i=0; i<frameCount; ++i)
     {
diff --git a/apps/openmw/mwscript/aiextensions.cpp b/apps/openmw/mwscript/aiextensions.cpp
index c5a4bb6dfc..33f16aea3f 100644
--- a/apps/openmw/mwscript/aiextensions.cpp
+++ b/apps/openmw/mwscript/aiextensions.cpp
@@ -208,8 +208,7 @@ namespace MWScript
                     {
                         if(!repeat)
                             repeat = true;
-                        Interpreter::Type_Integer idleValue = runtime[0].mInteger;
-                        idleValue = std::min(255, std::max(0, idleValue));
+                        Interpreter::Type_Integer idleValue = std::clamp(runtime[0].mInteger, 0, 255);
                         idleList.push_back(idleValue);
                         runtime.pop();
                         --arg0;
diff --git a/apps/openmw/mwscript/skyextensions.cpp b/apps/openmw/mwscript/skyextensions.cpp
index 2b6bf826f9..4f4891b424 100644
--- a/apps/openmw/mwscript/skyextensions.cpp
+++ b/apps/openmw/mwscript/skyextensions.cpp
@@ -108,7 +108,7 @@ namespace MWScript
                     chances.reserve(10);
                     while(arg0 > 0)
                     {
-                        chances.push_back(std::max(0, std::min(127, runtime[0].mInteger)));
+                        chances.push_back(std::clamp(runtime[0].mInteger, 0, 127));
                         runtime.pop();
                         arg0--;
                     }
diff --git a/apps/openmw/mwsound/loudness.cpp b/apps/openmw/mwsound/loudness.cpp
index ae31d60949..a36615ee4a 100644
--- a/apps/openmw/mwsound/loudness.cpp
+++ b/apps/openmw/mwsound/loudness.cpp
@@ -40,7 +40,7 @@ void Sound_Loudness::analyzeLoudness(const std::vector< char >& data)
             else if (mSampleType == SampleType_Float32)
             {
                 value = *reinterpret_cast<const float*>(&mQueue[sample*advance]);
-                value = std::max(-1.f, std::min(1.f, value)); // Float samples *should* be scaled to [-1,1] already.
+                value = std::clamp(value, -1.f, 1.f); // Float samples *should* be scaled to [-1,1] already.
             }
 
             sum += value*value;
@@ -64,8 +64,7 @@ float Sound_Loudness::getLoudnessAtTime(float sec) const
     if(mSamplesPerSec <= 0.0f || mSamples.empty() || sec < 0.0f)
         return 0.0f;
 
-    size_t index = static_cast<size_t>(sec * mSamplesPerSec);
-    index = std::max<size_t>(0, std::min(index, mSamples.size()-1));
+    size_t index = std::clamp<size_t>(sec * mSamplesPerSec, 0, mSamples.size() - 1);
     return mSamples[index];
 }
 
diff --git a/apps/openmw/mwsound/volumesettings.cpp b/apps/openmw/mwsound/volumesettings.cpp
index cc4eac3d6d..fd79b97e9b 100644
--- a/apps/openmw/mwsound/volumesettings.cpp
+++ b/apps/openmw/mwsound/volumesettings.cpp
@@ -10,7 +10,7 @@ namespace MWSound
     {
         float clamp(float value)
         {
-            return std::max(0.0f, std::min(1.0f, value));
+            return std::clamp(value, 0.f, 1.f);
         }
     }
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index d35f72e80c..cc982e4621 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1334,7 +1334,7 @@ namespace MWWorld
              * currently it's done so for rotating the camera, which needs
              * clamping.
              */
-            objRot[0] = osg::clampBetween<float>(objRot[0], -osg::PI_2, osg::PI_2);
+            objRot[0] = std::clamp<float>(objRot[0], -osg::PI_2, osg::PI_2);
             objRot[1] = Misc::normalizeAngle(objRot[1]);
             objRot[2] = Misc::normalizeAngle(objRot[2]);
         }
@@ -1901,7 +1901,7 @@ namespace MWWorld
         const auto& magicEffects = player.getClass().getCreatureStats(player).getMagicEffects();
         if (!mGodMode)
             blind = static_cast<int>(magicEffects.get(ESM::MagicEffect::Blind).getMagnitude());
-        MWBase::Environment::get().getWindowManager()->setBlindness(std::max(0, std::min(100, blind)));
+        MWBase::Environment::get().getWindowManager()->setBlindness(std::clamp(blind, 0, 100));
 
         int nightEye = static_cast<int>(magicEffects.get(ESM::MagicEffect::NightEye).getMagnitude());
         mRendering->setNightEyeFactor(std::min(1.f, (nightEye/100.f)));
diff --git a/components/esm/loadland.cpp b/components/esm/loadland.cpp
index 3c4a1e0b07..e97ad6b759 100644
--- a/components/esm/loadland.cpp
+++ b/components/esm/loadland.cpp
@@ -169,7 +169,7 @@ namespace ESM
                     {
                         float height = mLandData->mHeights[int(row * vertMult) * ESM::Land::LAND_SIZE + int(col * vertMult)];
                         height /= height > 0 ? 128.f : 16.f;
-                        height = std::min(max, std::max(min, height));
+                        height = std::clamp(height, min, max);
                         wnam[row * LAND_GLOBAL_MAP_LOD_SIZE_SQRT + col] = static_cast<signed char>(height);
                     }
                 }
diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index da43cc38ec..76f554bec7 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -145,7 +145,7 @@ namespace Gui
     FontLoader::FontLoader(ToUTF8::FromType encoding, const VFS::Manager* vfs, const std::string& userDataPath, float scalingFactor)
         : mVFS(vfs)
         , mUserDataPath(userDataPath)
-        , mFontHeight(16)
+        , mFontHeight(std::clamp(Settings::Manager::getInt("font size", "GUI"), 12, 20))
         , mScalingFactor(scalingFactor)
     {
         if (encoding == ToUTF8::WINDOWS_1252)
@@ -153,9 +153,6 @@ namespace Gui
         else
             mEncoding = encoding;
 
-        int fontSize = Settings::Manager::getInt("font size", "GUI");
-        mFontHeight = std::min(std::max(12, fontSize), 20);
-
         MyGUI::ResourceManager::getInstance().unregisterLoadXmlDelegate("Resource");
         MyGUI::ResourceManager::getInstance().registerLoadXmlDelegate("Resource") = MyGUI::newDelegate(this, &FontLoader::loadFontFromXml);
     }
@@ -549,7 +546,7 @@ namespace Gui
                 // to allow to configure font size via config file, without need to edit XML files.
                 // Also we should take UI scaling factor in account.
                 int resolution = Settings::Manager::getInt("ttf resolution", "GUI");
-                resolution = std::min(960, std::max(48, resolution)) * mScalingFactor;
+                resolution = std::clamp(resolution, 48, 960) * mScalingFactor;
 
                 MyGUI::xml::ElementPtr resolutionNode = resourceNode->createChild("Property");
                 resolutionNode->addAttribute("key", "Resolution");
@@ -591,7 +588,7 @@ namespace Gui
                     // setup separate fonts with different Resolution to fit these windows.
                     // These fonts have an internal prefix.
                     int resolution = Settings::Manager::getInt("ttf resolution", "GUI");
-                    resolution = std::min(960, std::max(48, resolution));
+                    resolution = std::clamp(resolution, 48, 960);
 
                     float currentX = Settings::Manager::getInt("resolution x", "Video");
                     float currentY = Settings::Manager::getInt("resolution y", "Video");
diff --git a/components/nifosg/controller.cpp b/components/nifosg/controller.cpp
index ddded82156..956fe2e489 100644
--- a/components/nifosg/controller.cpp
+++ b/components/nifosg/controller.cpp
@@ -57,7 +57,7 @@ float ControllerFunction::calculate(float value) const
     }
     case Constant:
     default:
-        return std::min(mStopTime, std::max(mStartTime, time));
+        return std::clamp(time, mStartTime, mStopTime);
     }
 }
 
diff --git a/components/sceneutil/shadow.cpp b/components/sceneutil/shadow.cpp
index 8c3758e980..dfe4cf1507 100644
--- a/components/sceneutil/shadow.cpp
+++ b/components/sceneutil/shadow.cpp
@@ -27,8 +27,7 @@ namespace SceneUtil
         mShadowSettings->setLightNum(0);
         mShadowSettings->setReceivesShadowTraversalMask(~0u);
 
-        int numberOfShadowMapsPerLight = Settings::Manager::getInt("number of shadow maps", "Shadows");
-        numberOfShadowMapsPerLight = std::max(1, std::min(numberOfShadowMapsPerLight, 8));
+        const int numberOfShadowMapsPerLight = std::clamp(Settings::Manager::getInt("number of shadow maps", "Shadows"), 1, 8);
 
         mShadowSettings->setNumShadowMapsPerLight(numberOfShadowMapsPerLight);
         mShadowSettings->setBaseShadowTextureUnit(8 - numberOfShadowMapsPerLight);
@@ -36,7 +35,7 @@ namespace SceneUtil
         const float maximumShadowMapDistance = Settings::Manager::getFloat("maximum shadow map distance", "Shadows");
         if (maximumShadowMapDistance > 0)
         {
-            const float shadowFadeStart = std::min(std::max(0.f, Settings::Manager::getFloat("shadow fade start", "Shadows")), 1.f);
+            const float shadowFadeStart = std::clamp(Settings::Manager::getFloat("shadow fade start", "Shadows"), 0.f, 1.f);
             mShadowSettings->setMaximumShadowMapDistance(maximumShadowMapDistance);
             mShadowTechnique->setShadowFadeStart(maximumShadowMapDistance * shadowFadeStart);
         }
@@ -78,8 +77,7 @@ namespace SceneUtil
         if (!Settings::Manager::getBool("enable shadows", "Shadows"))
             return;
 
-        int numberOfShadowMapsPerLight = Settings::Manager::getInt("number of shadow maps", "Shadows");
-        numberOfShadowMapsPerLight = std::max(1, std::min(numberOfShadowMapsPerLight, 8));
+        const int numberOfShadowMapsPerLight = std::clamp(Settings::Manager::getInt("number of shadow maps", "Shadows"), 1, 8);
 
         int baseShadowTextureUnit = 8 - numberOfShadowMapsPerLight;
         
diff --git a/components/widgets/fontwrapper.hpp b/components/widgets/fontwrapper.hpp
index daa69f9202..16ebba3587 100644
--- a/components/widgets/fontwrapper.hpp
+++ b/components/widgets/fontwrapper.hpp
@@ -31,15 +31,11 @@ namespace Gui
         }
 
     private:
-        static int clamp(const int& value, const int& lowBound, const int& highBound)
-        {
-            return std::min(std::max(lowBound, value), highBound);
-        }
 
         std::string getFontSize()
         {
             // Note: we can not use the FontLoader here, so there is a code duplication a bit.
-            static const std::string fontSize = std::to_string(clamp(Settings::Manager::getInt("font size", "GUI"), 12, 20));
+            static const std::string fontSize = std::to_string(std::clamp(Settings::Manager::getInt("font size", "GUI"), 12, 20));
             return fontSize;
         }
     };
diff --git a/components/widgets/numericeditbox.cpp b/components/widgets/numericeditbox.cpp
index e8ba226f70..c6ff9628ee 100644
--- a/components/widgets/numericeditbox.cpp
+++ b/components/widgets/numericeditbox.cpp
@@ -31,7 +31,7 @@ namespace Gui
         try
         {
             mValue = std::stoi(newCaption);
-            int capped = std::min(mMaxValue, std::max(mValue, mMinValue));
+            int capped = std::clamp(mValue, mMinValue, mMaxValue);
             if (capped != mValue)
             {
                 mValue = capped;

From 04692e601217893999801ff1ff9fdec0314f3430 Mon Sep 17 00:00:00 2001
From: cody glassman <glassmancody.info@gmail.com>
Date: Sat, 6 Nov 2021 04:38:43 -0700
Subject: [PATCH 1652/2859] blackscreen fix

---
 apps/openmw/engine.cpp        | 8 ++++++++
 components/sceneutil/util.cpp | 7 -------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 58dabd2cee..ead6b7c80c 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -8,6 +8,8 @@
 
 #include <boost/filesystem/fstream.hpp>
 
+#include <osg/Version>
+
 #include <osgViewer/ViewerEventHandlers>
 #include <osgDB/ReadFile>
 #include <osgDB/WriteFile>
@@ -754,6 +756,12 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     osg::ref_ptr<osg::GLExtensions> exts = osg::GLExtensions::Get(0, false);
     bool shadersSupported = exts && (exts->glslLanguageVersion >= 1.2f);
 
+#if OSG_VERSION_LESS_THAN(3, 6, 6)
+    // hack fix for https://github.com/openscenegraph/OpenSceneGraph/issues/1028
+    if (exts)
+        exts->glRenderbufferStorageMultisampleCoverageNV = nullptr;
+#endif
+
     std::string myguiResources = (mResDir / "mygui").string();
     osg::ref_ptr<osg::Group> guiRoot = new osg::Group;
     guiRoot->setName("GUI Root");
diff --git a/components/sceneutil/util.cpp b/components/sceneutil/util.cpp
index 5c2f8c2934..5b6e0a3ee0 100644
--- a/components/sceneutil/util.cpp
+++ b/components/sceneutil/util.cpp
@@ -10,7 +10,6 @@
 #include <osg/NodeVisitor>
 #include <osg/TexGen>
 #include <osg/TexEnvCombine>
-#include <osg/Version>
 #include <osg/FrameBufferObject>
 #include <osgUtil/RenderStage>
 #include <osgUtil/CullVisitor>
@@ -324,12 +323,6 @@ osg::ref_ptr<GlowUpdater> addEnchantedGlow(osg::ref_ptr<osg::Node> node, Resourc
 
 bool attachAlphaToCoverageFriendlyFramebufferToCamera(osg::Camera* camera, osg::Camera::BufferComponent buffer, osg::Texture * texture, unsigned int level, unsigned int face, bool mipMapGeneration)
 {
-#if OSG_VERSION_LESS_THAN(3, 6, 6)
-    // hack fix for https://github.com/openscenegraph/OpenSceneGraph/issues/1028
-    osg::ref_ptr<osg::GLExtensions> extensions = osg::GLExtensions::Get(0, false);
-    if (extensions)
-        extensions->glRenderbufferStorageMultisampleCoverageNV = nullptr;
-#endif
     unsigned int samples = 0;
     unsigned int colourSamples = 0;
     bool addMSAAIntermediateTarget = Settings::Manager::getBool("antialias alpha test", "Shaders") && Settings::Manager::getInt("antialiasing", "Video") > 1;

From 303082f6b465ae7f4963acc1c6b625f7ab6b5d72 Mon Sep 17 00:00:00 2001
From: Langerz82 <langley.joshua@gmail.com>
Date: Sat, 8 Feb 2020 07:16:52 +0000
Subject: [PATCH 1653/2859] Finish turning before attacking

---
 apps/openmw/mwmechanics/aicombat.cpp | 5 ++++-
 apps/openmw/mwmechanics/aicombat.hpp | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index eb139c918d..fa14b47965 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -137,7 +137,10 @@ namespace MWMechanics
             }
 
             storage.updateCombatMove(duration);
+            storage.mRotateMove = false;
             if (storage.mReadyToAttack) updateActorsMovement(actor, duration, storage);
+            if (storage.mRotateMove)
+                return false;
             storage.updateAttack(characterController);
         }
         else
@@ -442,7 +445,7 @@ namespace MWMechanics
         storage.mCurrentAction->getCombatRange(isRangedCombat);
         float eps = isRangedCombat ? osg::DegreesToRadians(0.5) : osg::DegreesToRadians(3.f);
         float targetAngleRadians = storage.mMovement.mRotation[axis];
-        smoothTurn(actor, targetAngleRadians, axis, eps);
+        storage.mRotateMove = !smoothTurn(actor, targetAngleRadians, axis, eps);
     }
 
     MWWorld::Ptr AiCombat::getTarget() const
diff --git a/apps/openmw/mwmechanics/aicombat.hpp b/apps/openmw/mwmechanics/aicombat.hpp
index 5425f1af0b..34e726412c 100644
--- a/apps/openmw/mwmechanics/aicombat.hpp
+++ b/apps/openmw/mwmechanics/aicombat.hpp
@@ -33,6 +33,7 @@ namespace MWMechanics
         bool mAttack;
         float mAttackRange;
         bool mCombatMove;
+        bool mRotateMove;
         osg::Vec3f mLastTargetPos;
         const MWWorld::CellStore* mCell;
         std::shared_ptr<Action> mCurrentAction;
@@ -65,6 +66,7 @@ namespace MWMechanics
         mAttack(false),
         mAttackRange(0.0f),
         mCombatMove(false),
+        mRotateMove(false),
         mLastTargetPos(0,0,0),
         mCell(nullptr),
         mCurrentAction(),

From 013043ee6e15c8baec356bb50146d82aba9cb690 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 6 Nov 2021 17:45:29 +0100
Subject: [PATCH 1654/2859] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c491cb83c0..548351acc0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 
     Bug #1751: Birthsign abilities increase modified attribute values instead of base ones
     Bug #3246: ESSImporter: Most NPCs are dead on save load
+    Bug #3488: AI combat aiming is too slow
     Bug #3514: Editing a reference's position after loading an esp file makes the reference disappear
     Bug #3737: Scripts from The Underground 2 .esp do not play (all patched versions)
     Bug #3792: 1 frame late magicka recalc breaks early scripted magicka reactions to Intelligence change

From cd37504d0eb8e23a3c88b278c37bdd3f9520097f Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Sat, 6 Nov 2021 18:48:48 +0000
Subject: [PATCH 1655/2859] Resave hint variables to cache so they'll still
 exist after a reconfigure

---
 cmake/FindLZ4.cmake | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cmake/FindLZ4.cmake b/cmake/FindLZ4.cmake
index ec854c6b18..5b148cb64e 100644
--- a/cmake/FindLZ4.cmake
+++ b/cmake/FindLZ4.cmake
@@ -95,6 +95,8 @@ include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(LZ4 DEFAULT_MSG
         LZ4_LIBRARY LZ4_INCLUDE_DIR LZ4_VERSION)
 
+set(LZ4_INCLUDE_DIR ${LZ4_INCLUDE_DIR} CACHE PATH "LZ4 include dir hint")
+set(LZ4_LIBRARY ${LZ4_LIBRARY} CACHE FILEPATH "LZ4 library path hint")
 mark_as_advanced(LZ4_INCLUDE_DIR LZ4_LIBRARY)
 
 set(LZ4_LIBRARIES ${LZ4_LIBRARY})

From 726653087eace39ef64e80609f346990b9fa063b Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Sun, 7 Nov 2021 09:36:22 +0000
Subject: [PATCH 1656/2859] restores _mergeAlphaBlending behaviour (#3222)

This PR restores a minor peculiarity of `_mergeAlphaBlending` behaviour unintentionally changed by PR #3162.
---
 components/sceneutil/optimizer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/sceneutil/optimizer.cpp b/components/sceneutil/optimizer.cpp
index b9d2f5bac7..e2fcaedbd7 100644
--- a/components/sceneutil/optimizer.cpp
+++ b/components/sceneutil/optimizer.cpp
@@ -1137,7 +1137,7 @@ bool isAbleToMerge(const osg::Geometry& g1, const osg::Geometry& g2)
 
 bool Optimizer::MergeGeometryVisitor::pushStateSet(osg::StateSet *stateSet)
 {
-    if (_mergeAlphaBlending || !stateSet || stateSet->getRenderBinMode() & osg::StateSet::INHERIT_RENDERBIN_DETAILS)
+    if (!stateSet || stateSet->getRenderBinMode() & osg::StateSet::INHERIT_RENDERBIN_DETAILS)
         return false;
     _stateSetStack.push_back(stateSet);
     checkAlphaBlendingActive();

From e125308dd87d84ced535eb762d09c6c308d078e0 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sun, 8 Aug 2021 09:06:01 +0300
Subject: [PATCH 1657/2859] Force assign head animation timer (bug #4389)

---
 CHANGELOG.md                            |  1 +
 apps/openmw/mwrender/actoranimation.cpp |  2 +-
 apps/openmw/mwrender/npcanimation.cpp   | 16 ++++++++++------
 components/sceneutil/controller.cpp     | 15 +++++++++++++++
 components/sceneutil/controller.hpp     | 12 +++++++++++-
 5 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c491cb83c0..461afc892e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
     Bug #3846: Strings starting with "-" fail to compile if not enclosed in quotes
     Bug #3905: Great House Dagoth issues
     Bug #4203: Resurrecting an actor should close the loot GUI
+    Bug #4389: NPC's lips do not move if his head model has the NiBSAnimationNode root node
     Bug #4602: Robert's Bodies: crash inside createInstance()
     Bug #4700: Editor: Incorrect command implementation
     Bug #4744: Invisible particles must still be processed
diff --git a/apps/openmw/mwrender/actoranimation.cpp b/apps/openmw/mwrender/actoranimation.cpp
index 7706f7d7f1..c8607cd97b 100644
--- a/apps/openmw/mwrender/actoranimation.cpp
+++ b/apps/openmw/mwrender/actoranimation.cpp
@@ -335,7 +335,7 @@ void ActorAnimation::resetControllers(osg::Node* node)
 
     std::shared_ptr<SceneUtil::ControllerSource> src;
     src.reset(new NullAnimationTime);
-    SceneUtil::AssignControllerSourcesVisitor removeVisitor(src);
+    SceneUtil::ForceControllerSourcesVisitor removeVisitor(src);
     node->accept(removeVisitor);
 }
 
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 0d6c21c308..7031b5a02b 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -837,14 +837,18 @@ bool NpcAnimation::addOrReplaceIndividualPart(ESM::PartReferenceType type, int g
                     }
                 }
             }
+            SceneUtil::ForceControllerSourcesVisitor assignVisitor(src);
+            node->accept(assignVisitor);
         }
-        else if (type == ESM::PRT_Weapon)
-            src = mWeaponAnimationTime;
         else
-            src.reset(new NullAnimationTime);
-
-        SceneUtil::AssignControllerSourcesVisitor assignVisitor(src);
-        node->accept(assignVisitor);
+        {
+            if (type == ESM::PRT_Weapon)
+                src = mWeaponAnimationTime;
+            else
+                src.reset(new NullAnimationTime);
+            SceneUtil::AssignControllerSourcesVisitor assignVisitor(src);
+            node->accept(assignVisitor);
+        }
     }
 
     return true;
diff --git a/components/sceneutil/controller.cpp b/components/sceneutil/controller.cpp
index dfc72918aa..2c7507d0a3 100644
--- a/components/sceneutil/controller.cpp
+++ b/components/sceneutil/controller.cpp
@@ -121,6 +121,21 @@ namespace SceneUtil
             ctrl.setSource(mToAssign);
     }
 
+    ForceControllerSourcesVisitor::ForceControllerSourcesVisitor()
+        : AssignControllerSourcesVisitor()
+    {
+    }
+
+    ForceControllerSourcesVisitor::ForceControllerSourcesVisitor(std::shared_ptr<ControllerSource> toAssign)
+        : AssignControllerSourcesVisitor(toAssign)
+    {
+    }
+
+    void ForceControllerSourcesVisitor::visit(osg::Node&, Controller &ctrl)
+    {
+        ctrl.setSource(mToAssign);
+    }
+
     FindMaxControllerLengthVisitor::FindMaxControllerLengthVisitor()
         : SceneUtil::ControllerVisitor()
         , mMaxLength(0)
diff --git a/components/sceneutil/controller.hpp b/components/sceneutil/controller.hpp
index 2656d654e1..6ef800f05b 100644
--- a/components/sceneutil/controller.hpp
+++ b/components/sceneutil/controller.hpp
@@ -85,10 +85,20 @@ namespace SceneUtil
         /// By default assigns the ControllerSource passed to the constructor of this class if no ControllerSource is assigned to that controller yet.
         void visit(osg::Node& node, Controller& ctrl) override;
 
-    private:
+    protected:
         std::shared_ptr<ControllerSource> mToAssign;
     };
 
+    class ForceControllerSourcesVisitor : public AssignControllerSourcesVisitor
+    {
+    public:
+        ForceControllerSourcesVisitor();
+        ForceControllerSourcesVisitor(std::shared_ptr<ControllerSource> toAssign);
+
+        /// Assign the wanted ControllerSource even if one is already assigned to the controller.
+        void visit(osg::Node& node, Controller& ctrl) override;
+    };
+
     /// Finds the maximum of all controller functions in the given scene graph
     class FindMaxControllerLengthVisitor : public ControllerVisitor
     {

From 9dd36a345f195ded8ae1528abb47a775b4bb4301 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sun, 7 Nov 2021 16:02:27 +0300
Subject: [PATCH 1658/2859] Fix a typo in nv_default shader

---
 files/shaders/nv_default_fragment.glsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/shaders/nv_default_fragment.glsl b/files/shaders/nv_default_fragment.glsl
index 245f83b620..17204534e3 100644
--- a/files/shaders/nv_default_fragment.glsl
+++ b/files/shaders/nv_default_fragment.glsl
@@ -44,7 +44,7 @@ void main()
 {
 #if @diffuseMap
     gl_FragData[0] = texture2D(diffuseMap, diffuseMapUV);
-    gl_FragData[0].a *= coveragePreservingAlphaScale(diffuseMap, adjustedDiffuseUV);
+    gl_FragData[0].a *= coveragePreservingAlphaScale(diffuseMap, diffuseMapUV);
 #else
     gl_FragData[0] = vec4(1.0);
 #endif

From a3e039d862983d0ae05d99b4c2b949edcb65093a Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 7 Nov 2021 14:15:30 +0100
Subject: [PATCH 1659/2859] Explicitely sort by file name after adding all data
 dirs

---
 apps/launcher/datafilespage.cpp                    |  1 +
 apps/opencs/editor.cpp                             |  6 +-----
 apps/opencs/view/doc/filedialog.cpp                |  9 +++++++--
 apps/opencs/view/doc/filedialog.hpp                |  2 +-
 components/contentselector/model/contentmodel.cpp  | 14 ++++++++------
 components/contentselector/model/contentmodel.hpp  |  3 +--
 .../contentselector/view/contentselector.cpp       |  5 +++++
 .../contentselector/view/contentselector.hpp       |  1 +
 8 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index 4c66668e4a..eb0950dae0 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -121,6 +121,7 @@ void Launcher::DataFilesPage::populateFileViews(const QString& contentModelName)
 
     for (const QString &path : paths)
         mSelector->addFiles(path);
+    mSelector->sortFiles();
 
     PathIterator pathIterator(paths);
 
diff --git a/apps/opencs/editor.cpp b/apps/opencs/editor.cpp
index 3f53a523f4..9cd9f72090 100644
--- a/apps/opencs/editor.cpp
+++ b/apps/opencs/editor.cpp
@@ -149,11 +149,7 @@ std::pair<Files::PathContainer, std::vector<std::string> > CS::Editor::readConfi
     dataDirs.insert (dataDirs.end(), dataLocal.begin(), dataLocal.end());
 
     //iterate the data directories and add them to the file dialog for loading
-    for (Files::PathContainer::const_reverse_iterator iter = dataDirs.rbegin(); iter != dataDirs.rend(); ++iter)
-    {
-        QString path = QString::fromUtf8 (iter->string().c_str());
-        mFileDialog.addFiles(path);
-    }
+    mFileDialog.addFiles(dataDirs);
 
     return std::make_pair (dataDirs, variables["fallback-archive"].as<Files::EscapeStringVector>().toStdStringVector());
 }
diff --git a/apps/opencs/view/doc/filedialog.cpp b/apps/opencs/view/doc/filedialog.cpp
index c3d0d8cc50..946dac047e 100644
--- a/apps/opencs/view/doc/filedialog.cpp
+++ b/apps/opencs/view/doc/filedialog.cpp
@@ -28,9 +28,14 @@ CSVDoc::FileDialog::FileDialog(QWidget *parent) :
     mAdjusterWidget = new AdjusterWidget (this);
 }
 
-void CSVDoc::FileDialog::addFiles(const QString &path)
+void CSVDoc::FileDialog::addFiles(const std::vector<boost::filesystem::path>& dataDirs)
 {
-    mSelector->addFiles(path);
+    for (auto iter = dataDirs.rbegin(); iter != dataDirs.rend(); ++iter)
+    {
+        QString path = QString::fromUtf8(iter->string().c_str());
+        mSelector->addFiles(path);
+    }
+    mSelector->sortFiles();
 }
 
 void CSVDoc::FileDialog::setEncoding(const QString &encoding)
diff --git a/apps/opencs/view/doc/filedialog.hpp b/apps/opencs/view/doc/filedialog.hpp
index 6c48fa78b9..6a15b46b7c 100644
--- a/apps/opencs/view/doc/filedialog.hpp
+++ b/apps/opencs/view/doc/filedialog.hpp
@@ -45,7 +45,7 @@ namespace CSVDoc
         explicit FileDialog(QWidget *parent = nullptr);
         void showDialog (ContentAction action);
 
-        void addFiles (const QString &path);
+        void addFiles(const std::vector<boost::filesystem::path>& dataDirs);
         void setEncoding (const QString &encoding);
         void clearFiles ();
 
diff --git a/components/contentselector/model/contentmodel.cpp b/components/contentselector/model/contentmodel.cpp
index fd94b60516..355f5741bf 100644
--- a/components/contentselector/model/contentmodel.cpp
+++ b/components/contentselector/model/contentmodel.cpp
@@ -1,6 +1,7 @@
 #include "contentmodel.hpp"
 #include "esmfile.hpp"
 
+#include <algorithm>
 #include <stdexcept>
 
 #include <QDir>
@@ -474,8 +475,6 @@ void ContentSelectorModel::ContentModel::addFiles(const QString &path)
         }
 
     }
-
-    sortFiles();
 }
 
 void ContentSelectorModel::ContentModel::clearFiles()
@@ -504,8 +503,13 @@ QStringList ContentSelectorModel::ContentModel::gameFiles() const
 
 void ContentSelectorModel::ContentModel::sortFiles()
 {
+    emit layoutAboutToBeChanged();
+    std::sort(mFiles.begin(), mFiles.end(), [](const EsmFile* a, const EsmFile* b)
+    {
+        return a->fileName().compare(b->fileName(), Qt::CaseInsensitive) > 0;
+    });
     //Dependency sort
-    int sorted = 0;
+    int sorted = 1;
     //iterate each file, obtaining a reference to its gamefiles list
     for(int i = sorted; i < mFiles.size(); ++i)
     {
@@ -520,12 +524,10 @@ void ContentSelectorModel::ContentModel::sortFiles()
                 break;
         }
         if(i != j)
-        {
             mFiles.move(i, j);
-            emit dataChanged(index(i, 0, QModelIndex()), index(j, 0, QModelIndex()));
-        }
         ++sorted;
     }
+    emit layoutChanged();
 }
 
 bool ContentSelectorModel::ContentModel::isChecked(const QString& filepath) const
diff --git a/components/contentselector/model/contentmodel.hpp b/components/contentselector/model/contentmodel.hpp
index f8130e3649..4bbe73b427 100644
--- a/components/contentselector/model/contentmodel.hpp
+++ b/components/contentselector/model/contentmodel.hpp
@@ -44,6 +44,7 @@ namespace ContentSelectorModel
         bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override;
 
         void addFiles(const QString &path);
+        void sortFiles();
         void clearFiles();
 
         QModelIndex indexFromItem(const EsmFile *item) const;
@@ -68,8 +69,6 @@ namespace ContentSelectorModel
 
         void addFile(EsmFile *file);
 
-        void sortFiles();
-
         /// Checks a specific plug-in for load order errors
         /// \return all errors found for specific plug-in
         QList<LoadOrderError> checkForLoadOrderErrors(const EsmFile *file, int row) const;
diff --git a/components/contentselector/view/contentselector.cpp b/components/contentselector/view/contentselector.cpp
index f18e80dd0a..ef925148ab 100644
--- a/components/contentselector/view/contentselector.cpp
+++ b/components/contentselector/view/contentselector.cpp
@@ -173,6 +173,11 @@ void ContentSelectorView::ContentSelector::addFiles(const QString &path)
     mContentModel->checkForLoadOrderErrors();
 }
 
+void ContentSelectorView::ContentSelector::sortFiles()
+{
+    mContentModel->sortFiles();
+}
+
 void ContentSelectorView::ContentSelector::clearFiles()
 {
     mContentModel->clearFiles();
diff --git a/components/contentselector/view/contentselector.hpp b/components/contentselector/view/contentselector.hpp
index 4a9983c1bf..b40675bedc 100644
--- a/components/contentselector/view/contentselector.hpp
+++ b/components/contentselector/view/contentselector.hpp
@@ -28,6 +28,7 @@ namespace ContentSelectorView
         QString currentFile() const;
 
         void addFiles(const QString &path);
+        void sortFiles();
         void clearFiles();
         void setProfileContent (const QStringList &fileList);
 

From 2e031f195b571d8133b82c11b508e42c6bf0b9d8 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Sun, 7 Nov 2021 17:26:02 +0000
Subject: [PATCH 1660/2859] fixes LightBufferBinding messages (#3223)

This PR aims to solve `uniform block LightBufferBinding has no binding` messages @glassmancody has reportedly encountered since PR #3110 due to an apparent bug in OSG. While we do have to add a workaround here that adds a bit of clunkiness, #3216 should allow us to clean up these interactions a bit in the future.
---
 apps/openmw/mwrender/groundcover.cpp |  2 +-
 components/shader/shadermanager.cpp  | 10 +++++++++-
 components/shader/shadermanager.hpp  |  3 +++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwrender/groundcover.cpp b/apps/openmw/mwrender/groundcover.cpp
index 77c4f0fab5..e2d1f0c50d 100644
--- a/apps/openmw/mwrender/groundcover.cpp
+++ b/apps/openmw/mwrender/groundcover.cpp
@@ -152,7 +152,7 @@ namespace MWRender
          mStateset->setAttribute(new osg::VertexAttribDivisor(6, 1));
          mStateset->setAttribute(new osg::VertexAttribDivisor(7, 1));
 
-         mProgramTemplate = mSceneManager->getShaderManager().getProgramTemplate() ? static_cast<osg::Program*>(mSceneManager->getShaderManager().getProgramTemplate()->clone(osg::CopyOp::SHALLOW_COPY)) : new osg::Program;
+         mProgramTemplate = mSceneManager->getShaderManager().getProgramTemplate() ? Shader::ShaderManager::cloneProgram(mSceneManager->getShaderManager().getProgramTemplate()) : osg::ref_ptr<osg::Program>(new osg::Program);
          mProgramTemplate->addBindAttribLocation("aOffset", 6);
          mProgramTemplate->addBindAttribLocation("aRotation", 7);
     }
diff --git a/components/shader/shadermanager.cpp b/components/shader/shadermanager.cpp
index e057cfac02..30c7ed1b1d 100644
--- a/components/shader/shadermanager.cpp
+++ b/components/shader/shadermanager.cpp
@@ -345,7 +345,7 @@ namespace Shader
         if (found == mPrograms.end())
         {
             if (!programTemplate) programTemplate = mProgramTemplate;
-            osg::ref_ptr<osg::Program> program = programTemplate ? static_cast<osg::Program*>(programTemplate->clone(osg::CopyOp::SHALLOW_COPY)) : new osg::Program;
+            osg::ref_ptr<osg::Program> program = programTemplate ? cloneProgram(programTemplate) : osg::ref_ptr<osg::Program>(new osg::Program);
             program->addShader(vertexShader);
             program->addShader(fragmentShader);
             found = mPrograms.insert(std::make_pair(std::make_pair(vertexShader, fragmentShader), program)).first;
@@ -353,6 +353,14 @@ namespace Shader
         return found->second;
     }
 
+    osg::ref_ptr<osg::Program> ShaderManager::cloneProgram(const osg::Program* src)
+    {
+        osg::ref_ptr<osg::Program> program = static_cast<osg::Program*>(src->clone(osg::CopyOp::SHALLOW_COPY));
+        for (auto [name, idx] : src->getUniformBlockBindingList())
+            program->addBindUniformBlock(name, idx);
+        return program;
+    }
+
     ShaderManager::DefineMap ShaderManager::getGlobalDefines()
     {
         return DefineMap(mGlobalDefines);
diff --git a/components/shader/shadermanager.hpp b/components/shader/shadermanager.hpp
index d0ee069b10..613f33b168 100644
--- a/components/shader/shadermanager.hpp
+++ b/components/shader/shadermanager.hpp
@@ -38,6 +38,9 @@ namespace Shader
         const osg::Program* getProgramTemplate() const { return mProgramTemplate; }
         void setProgramTemplate(const osg::Program* program) { mProgramTemplate = program; }
 
+        /// Clone an osg::Program including bindUniformBlocks that osg::Program::clone does not copy for some reason.
+        static osg::ref_ptr<osg::Program> cloneProgram(const osg::Program*);
+
         /// Get (a copy of) the DefineMap used to construct all shaders
         DefineMap getGlobalDefines();
 

From 727f784a98f10934dee4a71c01d9d6e17b74cab8 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 7 Nov 2021 19:47:02 +0100
Subject: [PATCH 1661/2859] Acquire log lock only when logger should log

To minimize overhead for calls when level is less than current. For example
Log(Debug::Debug) should not lock mutex when current logging level is Verbose.
---
 components/debug/debuglog.hpp | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/components/debug/debuglog.hpp b/components/debug/debuglog.hpp
index 0da5b9cbdd..fd5cc4dbb9 100644
--- a/components/debug/debuglog.hpp
+++ b/components/debug/debuglog.hpp
@@ -29,25 +29,29 @@ class Log
 
     std::unique_lock<std::mutex> mLock;
 public:
-    // Locks a global lock while the object is alive
-    Log(Debug::Level level) :
-    mLock(sLock),
-    mLevel(level)
+    explicit Log(Debug::Level level)
+        : mShouldLog(level <= Debug::CurrentDebugLevel)
     {
+        // No need to hold the lock if there will be no logging anyway
+        if (!mShouldLog)
+            return;
+
+        // Locks a global lock while the object is alive
+        mLock = std::unique_lock<std::mutex>(sLock);
+
         // If the app has no logging system enabled, log level is not specified.
         // Show all messages without marker - we just use the plain cout in this case.
         if (Debug::CurrentDebugLevel == Debug::NoLevel)
             return;
 
-        if (mLevel <= Debug::CurrentDebugLevel)
-            std::cout << static_cast<unsigned char>(mLevel);
+        std::cout << static_cast<unsigned char>(level);
     }
 
     // Perfect forwarding wrappers to give the chain of objects to cout
     template<typename T>
     Log& operator<<(T&& rhs)
     {
-        if (mLevel <= Debug::CurrentDebugLevel)
+        if (mShouldLog)
             std::cout << std::forward<T>(rhs);
 
         return *this;
@@ -55,12 +59,12 @@ public:
 
     ~Log()
     {
-        if (mLevel <= Debug::CurrentDebugLevel)
+        if (mShouldLog)
             std::cout << std::endl;
     }
 
 private:
-    Debug::Level mLevel;
+    const bool mShouldLog;
 };
 
 #endif

From 9394cdde222632c80aa98e77411e01aecb951695 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 7 Nov 2021 21:12:15 +0100
Subject: [PATCH 1662/2859] Only restore focus to widgets with visible parents

---
 CHANGELOG.md                             | 1 +
 apps/openmw/mwgui/keyboardnavigation.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 548351acc0..ad87ceca32 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
     Bug #5100: Persuasion doesn't always clamp the resulting disposition
     Bug #5120: Scripted object spawning updates physics system
     Bug #5207: Loose summons can be present in scene
+    Bug #5377: console does not appear after using menutest in inventory
     Bug #5379: Wandering NPCs falling through cantons
     Bug #5453: Magic effect VFX are offset for creatures
     Bug #5483: AutoCalc flag is not used to calculate spells cost
diff --git a/apps/openmw/mwgui/keyboardnavigation.cpp b/apps/openmw/mwgui/keyboardnavigation.cpp
index 3220e16b94..b4437873c3 100644
--- a/apps/openmw/mwgui/keyboardnavigation.cpp
+++ b/apps/openmw/mwgui/keyboardnavigation.cpp
@@ -79,7 +79,7 @@ void KeyboardNavigation::restoreFocus(int mode)
     if (found != mKeyFocus.end())
     {
         MyGUI::Widget* w = found->second;
-        if (w && w->getVisible() && w->getEnabled())
+        if (w && w->getVisible() && w->getEnabled() && w->getInheritedVisible() && w->getInheritedEnabled())
             MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(found->second);
     }
 }

From 11ed5949105bf0d809c046ef4ad211043547982e Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 7 Nov 2021 22:13:27 +0100
Subject: [PATCH 1663/2859] Improve AI rating of bound effects

---
 CHANGELOG.md                              |  1 +
 apps/openmw/mwmechanics/spellpriority.cpp | 28 +++++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 548351acc0..675102a328 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
     Bug #3737: Scripts from The Underground 2 .esp do not play (all patched versions)
     Bug #3792: 1 frame late magicka recalc breaks early scripted magicka reactions to Intelligence change
     Bug #3846: Strings starting with "-" fail to compile if not enclosed in quotes
+    Bug #3855: AI sometimes spams defensive spells
     Bug #3905: Great House Dagoth issues
     Bug #4203: Resurrecting an actor should close the loot GUI
     Bug #4602: Robert's Bodies: crash inside createInstance()
diff --git a/apps/openmw/mwmechanics/spellpriority.cpp b/apps/openmw/mwmechanics/spellpriority.cpp
index eb276deb78..7338f4b2af 100644
--- a/apps/openmw/mwmechanics/spellpriority.cpp
+++ b/apps/openmw/mwmechanics/spellpriority.cpp
@@ -368,6 +368,27 @@ namespace MWMechanics
                 return 0.f;
 
             break;
+        case ESM::MagicEffect::BoundShield:
+            if(actor.getClass().hasInventoryStore(actor))
+            {
+                // If the actor is an NPC they can benefit from the armor rating, otherwise check if we've got a one-handed weapon to use with the shield
+                if(!actor.getClass().isNpc())
+                {
+                    const auto& store = actor.getClass().getInventoryStore(actor);
+                    auto oneHanded = std::find_if(store.cbegin(MWWorld::ContainerStore::Type_Weapon), store.cend(), [](const MWWorld::ConstPtr& weapon)
+                    {
+                        if(weapon.getClass().getItemHealth(weapon) <= 0.f)
+                            return false;
+                        auto type = weapon.get<ESM::Weapon>()->mBase->mData.mType;
+                        return !(MWMechanics::getWeaponType(type)->mFlags & ESM::WeaponType::TwoHanded);
+                    });
+                    if(oneHanded == store.cend())
+                        return 0.f;
+                }
+            }
+            else
+                return 0.f;
+            break;
         // Creatures can not wear armor
         case ESM::MagicEffect::BoundCuirass:
         case ESM::MagicEffect::BoundGloves:
@@ -552,6 +573,13 @@ namespace MWMechanics
             if (!creatureStats.getSummonedCreatureMap().empty())
                 return 0.f;
         }
+        if(effect.mEffectID >= ESM::MagicEffect::BoundDagger && effect.mEffectID <= ESM::MagicEffect::BoundGloves)
+        {
+            // While rateSpell prevents actors from recasting the same spell, it doesn't prevent them from casting different spells with the same effect.
+            // Multiple instances of the same bound item don't stack so if the effect is already active, rate it as useless.
+            if(actor.getClass().getCreatureStats(actor).getMagicEffects().get(effect.mEffectID).getMagnitude() > 0.f)
+                return 0.f;
+        }
 
         // Underwater casting not possible
         if (effect.mRange == ESM::RT_Target)

From 6bcef77433bf617c7a1e2b9de9d3bbe34e917ba4 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sun, 7 Nov 2021 22:45:03 +0100
Subject: [PATCH 1664/2859] Add missing controls to OpenMW's TabControl skin

---
 files/mygui/openmw_resources.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/files/mygui/openmw_resources.xml b/files/mygui/openmw_resources.xml
index 811fa4f7fa..ff4893a9b2 100644
--- a/files/mygui/openmw_resources.xml
+++ b/files/mygui/openmw_resources.xml
@@ -47,7 +47,13 @@
                 <Widget type="Widget" skin="" position="4 4 81 28" align="Left Top Stretch" name="TabItem"/>
             </Widget>
             <Widget type="Widget" skin="" position="0 0 89 23" align="HStretch Top" name="HeaderPlace">
-                <Widget type="Widget" skin="" position="52 0 37 23" name="Controls">
+                <Widget type="Widget" skin="" position="0 0 60 23" name="Controls">
+                    <Widget type="Widget" skin="MW_Box" position="10 0 15 14" align="Left VCenter">
+                        <Widget type="Button" skin="MW_ArrowLeft" position="2 2 10 10" align="Left VStretch" name="Left" />
+                    </Widget>
+                    <Widget type="Widget" skin="MW_Box" position="35 0 15 14" align="Right VCenter">
+                        <Widget type="Button" skin="MW_ArrowRight" position="2 2 10 10" align="Right VStretch" name="Right" />
+                    </Widget>
                 </Widget>
             </Widget>
         </Widget>

From 90ce50190e292016d164eb2d27d57e189709ae7d Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Mon, 8 Nov 2021 00:49:10 +0000
Subject: [PATCH 1665/2859] Remove redundant recreateShaders

---
 apps/openmw/mwrender/actoranimation.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/apps/openmw/mwrender/actoranimation.cpp b/apps/openmw/mwrender/actoranimation.cpp
index 7706f7d7f1..1679c07bf4 100644
--- a/apps/openmw/mwrender/actoranimation.cpp
+++ b/apps/openmw/mwrender/actoranimation.cpp
@@ -261,9 +261,6 @@ void ActorAnimation::updateHolsteredShield(bool showCarriedLeft)
         if (isEnchanted)
             SceneUtil::addEnchantedGlow(shieldNode, mResourceSystem, glowColor);
     }
-
-    if (mAlpha != 1.f)
-        mResourceSystem->getSceneManager()->recreateShaders(mHolsteredShield->getNode());
 }
 
 bool ActorAnimation::useShieldAnimations() const

From e0c4f08aa52813f3740fb28dc4872ed3602a71b0 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 8 Nov 2021 01:45:41 +0100
Subject: [PATCH 1666/2859] Remove redundant includes

---
 apps/openmw/mwgui/mapwindow.hpp                  |  2 ++
 components/debug/debuglog.hpp                    |  2 --
 components/detournavigator/debug.hpp             | 10 +---------
 components/detournavigator/recastmeshbuilder.hpp |  1 -
 components/detournavigator/recastmeshmanager.hpp |  2 --
 5 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/apps/openmw/mwgui/mapwindow.hpp b/apps/openmw/mwgui/mapwindow.hpp
index d3cd626475..61f48d5279 100644
--- a/apps/openmw/mwgui/mapwindow.hpp
+++ b/apps/openmw/mwgui/mapwindow.hpp
@@ -4,6 +4,8 @@
 #include <stdint.h>
 #include <memory>
 
+#include <osg/Vec2f>
+
 #include "windowpinnablebase.hpp"
 
 #include <components/esm/cellid.hpp>
diff --git a/components/debug/debuglog.hpp b/components/debug/debuglog.hpp
index 0da5b9cbdd..f794768546 100644
--- a/components/debug/debuglog.hpp
+++ b/components/debug/debuglog.hpp
@@ -4,8 +4,6 @@
 #include <mutex>
 #include <iostream>
 
-#include <osg/io_utils>
-
 namespace Debug
 {
     enum Level
diff --git a/components/detournavigator/debug.hpp b/components/detournavigator/debug.hpp
index d86d923a41..a868ac2a2e 100644
--- a/components/detournavigator/debug.hpp
+++ b/components/detournavigator/debug.hpp
@@ -7,16 +7,8 @@
 #include <osg/io_utils>
 
 #include <components/bullethelpers/operators.hpp>
-#include <components/misc/guarded.hpp>
-
-#include <chrono>
-#include <fstream>
-#include <iomanip>
-#include <iostream>
-#include <memory>
-#include <sstream>
+
 #include <string>
-#include <thread>
 
 class dtNavMesh;
 
diff --git a/components/detournavigator/recastmeshbuilder.hpp b/components/detournavigator/recastmeshbuilder.hpp
index 120e4b045a..84e9716569 100644
--- a/components/detournavigator/recastmeshbuilder.hpp
+++ b/components/detournavigator/recastmeshbuilder.hpp
@@ -9,7 +9,6 @@
 #include <LinearMath/btTransform.h>
 
 #include <array>
-#include <functional>
 #include <memory>
 #include <tuple>
 #include <vector>
diff --git a/components/detournavigator/recastmeshmanager.hpp b/components/detournavigator/recastmeshmanager.hpp
index 33aba97bbf..d93745c71e 100644
--- a/components/detournavigator/recastmeshmanager.hpp
+++ b/components/detournavigator/recastmeshmanager.hpp
@@ -14,8 +14,6 @@
 #include <map>
 #include <optional>
 #include <memory>
-#include <variant>
-#include <tuple>
 #include <mutex>
 
 class btCollisionShape;

From a824e112d42a1706bc4eee0c1cc6bfd2fd332fdc Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 6 Nov 2021 16:36:59 +0100
Subject: [PATCH 1667/2859] Fix recastmesh.cpp includes

recastmesh.cpp is supposed to include recastmesh.hpp not navmesh.hpp.
---
 components/sceneutil/recastmesh.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/sceneutil/recastmesh.cpp b/components/sceneutil/recastmesh.cpp
index 18cec022ff..5732f86959 100644
--- a/components/sceneutil/recastmesh.cpp
+++ b/components/sceneutil/recastmesh.cpp
@@ -1,4 +1,4 @@
-#include "navmesh.hpp"
+#include "recastmesh.hpp"
 #include "detourdebugdraw.hpp"
 
 #include <components/detournavigator/settings.hpp>

From c489b773856974e20156db28ab0545cef1fed821 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Sun, 7 Nov 2021 20:01:07 -0800
Subject: [PATCH 1668/2859] fix windows aero snap

---
 CHANGELOG.md           | 1 +
 apps/openmw/engine.cpp | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 548351acc0..6e540d02f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
     Bug #5120: Scripted object spawning updates physics system
     Bug #5207: Loose summons can be present in scene
     Bug #5379: Wandering NPCs falling through cantons
+    Bug #5394: Windows snapping no longer works
     Bug #5453: Magic effect VFX are offset for creatures
     Bug #5483: AutoCalc flag is not used to calculate spells cost
     Bug #5508: Engine binary links to Qt without using it
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 2d94c7422f..67944e4546 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -546,6 +546,10 @@ void OMW::Engine::createWindow(Settings::Manager& settings)
     if(fullscreen)
         flags |= SDL_WINDOW_FULLSCREEN;
 
+    // Allows for Windows snapping features to properly work in borderless window
+    SDL_SetHint("SDL_BORDERLESS_WINDOWED_STYLE", "1");
+    SDL_SetHint("SDL_BORDERLESS_RESIZABLE_STYLE", "1");
+
     if (!windowBorder)
         flags |= SDL_WINDOW_BORDERLESS;
 

From 5f1bf8936927e3ebdb9e08b810e236b51f483436 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Mon, 8 Nov 2021 09:27:42 +0000
Subject: [PATCH 1669/2859] improves groundcover view distance (#3219)

This PR aims to solve all issues with `Groundcover` view distance handling in a satisfying way while preserving other optimisations that benefit other features. The main idea here is not to rely on `ViewData` updates for distance culling calculations because we can not accurately determine distance against lazily updated views. Instead, we perform an accurate measurement in a cull callback we can run every frame in `Groundcover` itself. While we do have to add some code to handle this feature, it is quite loosely coupled code that could be useful elsewhere in the future. These changes should address a performance regression @akortunov experienced.
---
 apps/openmw/mwrender/groundcover.cpp      | 31 +++++++++--
 apps/openmw/mwrender/groundcover.hpp      |  2 +-
 apps/openmw/mwrender/renderingmanager.cpp |  4 +-
 components/terrain/buffercache.cpp        |  4 +-
 components/terrain/chunkmanager.cpp       |  3 ++
 components/terrain/quadtreenode.cpp       | 43 +++++++++-------
 components/terrain/quadtreenode.hpp       |  2 +
 components/terrain/quadtreeworld.cpp      | 63 +++++++++++------------
 components/terrain/quadtreeworld.hpp      |  8 ++-
 components/terrain/viewdata.cpp           |  1 -
 components/terrain/viewdata.hpp           |  2 +-
 11 files changed, 98 insertions(+), 65 deletions(-)

diff --git a/apps/openmw/mwrender/groundcover.cpp b/apps/openmw/mwrender/groundcover.cpp
index e2d1f0c50d..25c00fb976 100644
--- a/apps/openmw/mwrender/groundcover.cpp
+++ b/apps/openmw/mwrender/groundcover.cpp
@@ -1,5 +1,6 @@
 #include "groundcover.hpp"
 
+#include <osg/ComputeBoundsVisitor>
 #include <osg/AlphaFunc>
 #include <osg/BlendFunc>
 #include <osg/Geometry>
@@ -7,6 +8,8 @@
 
 #include <components/esm/esmreader.hpp>
 #include <components/sceneutil/lightmanager.hpp>
+#include <components/sceneutil/nodecallback.hpp>
+#include <components/terrain/quadtreenode.hpp>
 #include <components/shader/shadermanager.hpp>
 
 #include "apps/openmw/mwworld/esmstore.hpp"
@@ -106,6 +109,20 @@ namespace MWRender
         float mDensity = 0.f;
     };
 
+    class ViewDistanceCallback : public SceneUtil::NodeCallback<ViewDistanceCallback>
+    {
+    public:
+        ViewDistanceCallback(float dist, const osg::BoundingBox& box) : mViewDistance(dist), mBox(box) {}
+        void operator()(osg::Node* node, osg::NodeVisitor* nv)
+        {
+            if (Terrain::distance(mBox, nv->getEyePoint()) <= mViewDistance)
+                traverse(node, nv);
+        }
+    private:
+        float mViewDistance;
+        osg::BoundingBox mBox;
+    };
+
     inline bool isInChunkBorders(ESM::CellRef& ref, osg::Vec2f& minBound, osg::Vec2f& maxBound)
     {
         osg::Vec2f size = maxBound - minBound;
@@ -122,8 +139,9 @@ namespace MWRender
 
     osg::ref_ptr<osg::Node> Groundcover::getChunk(float size, const osg::Vec2f& center, unsigned char lod, unsigned int lodFlags, bool activeGrid, const osg::Vec3f& viewPoint, bool compile)
     {
+        if (lod > getMaxLodLevel())
+            return nullptr;
         GroundcoverChunkId id = std::make_tuple(center, size);
-
         osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(id);
         if (obj)
             return static_cast<osg::Node*>(obj.get());
@@ -137,12 +155,13 @@ namespace MWRender
         }
     }
 
-    Groundcover::Groundcover(Resource::SceneManager* sceneManager, float density)
+    Groundcover::Groundcover(Resource::SceneManager* sceneManager, float density, float viewDistance)
          : GenericResourceManager<GroundcoverChunkId>(nullptr)
          , mSceneManager(sceneManager)
          , mDensity(density)
          , mStateset(new osg::StateSet)
     {
+         setViewDistance(viewDistance);
          // MGE uses default alpha settings for groundcover, so we can not rely on alpha properties
          // Force a unified alpha handling instead of data from meshes
          osg::ref_ptr<osg::AlphaFunc> alpha = new osg::AlphaFunc(osg::AlphaFunc::GEQUAL, 128.f / 255.f);
@@ -220,10 +239,16 @@ namespace MWRender
             group->addChild(node);
         }
 
+        osg::ComputeBoundsVisitor cbv;
+        group->accept(cbv);
+        osg::BoundingBox box = cbv.getBoundingBox();
+        box = osg::BoundingBox(box._min+worldCenter, box._max+worldCenter);
+        group->addCullCallback(new ViewDistanceCallback(getViewDistance(), box));
+
         group->setStateSet(mStateset);
         group->setNodeMask(Mask_Groundcover);
         if (mSceneManager->getLightingMethod() != SceneUtil::LightingMethod::FFP)
-            group->setCullCallback(new SceneUtil::LightListCallback);
+            group->addCullCallback(new SceneUtil::LightListCallback);
         mSceneManager->recreateShaders(group, "groundcover", true, mProgramTemplate);
         mSceneManager->shareState(group);
         group->getBound();
diff --git a/apps/openmw/mwrender/groundcover.hpp b/apps/openmw/mwrender/groundcover.hpp
index ed88f7fe24..cd73e46eb0 100644
--- a/apps/openmw/mwrender/groundcover.hpp
+++ b/apps/openmw/mwrender/groundcover.hpp
@@ -12,7 +12,7 @@ namespace MWRender
     class Groundcover : public Resource::GenericResourceManager<GroundcoverChunkId>, public Terrain::QuadTreeWorld::ChunkManager
     {
     public:
-        Groundcover(Resource::SceneManager* sceneManager, float density);
+        Groundcover(Resource::SceneManager* sceneManager, float density, float viewDistance);
         ~Groundcover() = default;
 
         osg::ref_ptr<osg::Node> getChunk(float size, const osg::Vec2f& center, unsigned char lod, unsigned int lodFlags, bool activeGrid, const osg::Vec3f& viewPoint, bool compile) override;
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 4e2da15107..19972b094a 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -439,11 +439,9 @@ namespace MWRender
             float density = Settings::Manager::getFloat("density", "Groundcover");
             density = std::clamp(density, 0.f, 1.f);
 
-            mGroundcover.reset(new Groundcover(mResourceSystem->getSceneManager(), density));
+            mGroundcover.reset(new Groundcover(mResourceSystem->getSceneManager(), density, groundcoverDistance));
             static_cast<Terrain::QuadTreeWorld*>(mTerrain.get())->addChunkManager(mGroundcover.get());
             mResourceSystem->addResourceManager(mGroundcover.get());
-
-            mGroundcover->setViewDistance(groundcoverDistance);
         }
 
         mStateUpdater = new StateUpdater;
diff --git a/components/terrain/buffercache.cpp b/components/terrain/buffercache.cpp
index 399df16d34..658c431b1b 100644
--- a/components/terrain/buffercache.cpp
+++ b/components/terrain/buffercache.cpp
@@ -12,8 +12,8 @@ namespace
 template <typename IndexArrayType>
 osg::ref_ptr<IndexArrayType> createIndexBuffer(unsigned int flags, unsigned int verts)
 {
-    // LOD level n means every 2^n-th vertex is kept
-    size_t lodLevel = (flags >> (4*4));
+    // LOD level n means every 2^n-th vertex is kept, but we currently handle LOD elsewhere.
+    size_t lodLevel = 0;//(flags >> (4*4));
 
     size_t lodDeltas[4];
     for (int i=0; i<4; ++i)
diff --git a/components/terrain/chunkmanager.cpp b/components/terrain/chunkmanager.cpp
index e040cbdd93..d57b73768f 100644
--- a/components/terrain/chunkmanager.cpp
+++ b/components/terrain/chunkmanager.cpp
@@ -52,6 +52,9 @@ struct FindChunkTemplate
 
 osg::ref_ptr<osg::Node> ChunkManager::getChunk(float size, const osg::Vec2f& center, unsigned char lod, unsigned int lodFlags, bool activeGrid, const osg::Vec3f& viewPoint, bool compile)
 {
+    // Override lod with the vertexLodMod adjusted value.
+    // TODO: maybe we can refactor this code by moving all vertexLodMod code into this class.
+    lod = static_cast<unsigned char>(lodFlags >> (4*4));
     ChunkId id = std::make_tuple(center, lod, lodFlags);
     osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(id);
     if (obj)
diff --git a/components/terrain/quadtreenode.cpp b/components/terrain/quadtreenode.cpp
index c113a629c5..81d3ccb32d 100644
--- a/components/terrain/quadtreenode.cpp
+++ b/components/terrain/quadtreenode.cpp
@@ -10,6 +10,29 @@
 namespace Terrain
 {
 
+float distance(const osg::BoundingBox& box, const osg::Vec3f& v)
+{
+    if (box.contains(v))
+        return 0;
+    else
+    {
+        osg::Vec3f maxDist(0,0,0);
+        if (v.x() < box.xMin())
+            maxDist.x() = box.xMin() - v.x();
+        else if (v.x() > box.xMax())
+            maxDist.x() = v.x() - box.xMax();
+        if (v.y() < box.yMin())
+            maxDist.y() = box.yMin() - v.y();
+        else if (v.y() > box.yMax())
+            maxDist.y() = v.y() - box.yMax();
+        if (v.z() < box.zMin())
+            maxDist.z() = box.zMin() - v.z();
+        else if (v.z() > box.zMax())
+            maxDist.z() = v.z() - box.zMax();
+        return maxDist.length();
+    }
+}
+
 ChildDirection reflect(ChildDirection dir, Direction dir2)
 {
     assert(dir != Root);
@@ -78,25 +101,7 @@ QuadTreeNode *QuadTreeNode::getNeighbour(Direction dir)
 float QuadTreeNode::distance(const osg::Vec3f& v) const
 {
     const osg::BoundingBox& box = getBoundingBox();
-    if (box.contains(v))
-        return 0;
-    else
-    {
-        osg::Vec3f maxDist(0,0,0);
-        if (v.x() < box.xMin())
-            maxDist.x() = box.xMin() - v.x();
-        else if (v.x() > box.xMax())
-            maxDist.x() = v.x() - box.xMax();
-        if (v.y() < box.yMin())
-            maxDist.y() = box.yMin() - v.y();
-        else if (v.y() > box.yMax())
-            maxDist.y() = v.y() - box.yMax();
-        if (v.z() < box.zMin())
-            maxDist.z() = box.zMin() - v.z();
-        else if (v.z() > box.zMax())
-            maxDist.z() = v.z() - box.zMax();
-        return maxDist.length();
-    }
+    return Terrain::distance(box, v);
 }
 
 void QuadTreeNode::initNeighbours()
diff --git a/components/terrain/quadtreenode.hpp b/components/terrain/quadtreenode.hpp
index 7ae59b92f0..aba78b8b3a 100644
--- a/components/terrain/quadtreenode.hpp
+++ b/components/terrain/quadtreenode.hpp
@@ -34,6 +34,8 @@ namespace Terrain
 
     class ViewData;
 
+    float distance(const osg::BoundingBox&, const osg::Vec3f& v);
+
     class QuadTreeNode : public osg::Group
     {
     public:
diff --git a/components/terrain/quadtreeworld.cpp b/components/terrain/quadtreeworld.cpp
index 7fc0895846..6dbed34331 100644
--- a/components/terrain/quadtreeworld.cpp
+++ b/components/terrain/quadtreeworld.cpp
@@ -40,9 +40,9 @@ namespace
         return 1 << depth;
     }
 
-    int Log2( unsigned int n )
+    unsigned int Log2( unsigned int n )
     {
-        int targetlevel = 0;
+        unsigned int targetlevel = 0;
         while (n >>= 1) ++targetlevel;
         return targetlevel;
     }
@@ -78,16 +78,18 @@ public:
             if (intersects)
                 return Deeper;
         }
-
         dist = std::max(0.f, dist + mDistanceModifier);
-
         if (dist > mViewDistance && !activeGrid) // for Scene<->ObjectPaging sync the activegrid must remain loaded
             return StopTraversal;
-
-        int nativeLodLevel = Log2(static_cast<unsigned int>(node->getSize()/mMinSize));
-        int lodLevel = Log2(static_cast<unsigned int>(dist/(Constants::CellSizeInUnits*mMinSize*mFactor)));
-
-        return nativeLodLevel <= lodLevel ? StopTraversalAndUse : Deeper;
+        return getNativeLodLevel(node, mMinSize) <= convertDistanceToLodLevel(dist, mMinSize, mFactor) ? StopTraversalAndUse : Deeper;
+    }
+    static unsigned int getNativeLodLevel(const QuadTreeNode* node, float minSize)
+    {
+        return Log2(static_cast<unsigned int>(node->getSize()/minSize));
+    }
+    static unsigned int convertDistanceToLodLevel(float dist, float minSize, float factor)
+    {
+        return Log2(static_cast<unsigned int>(dist/(Constants::CellSizeInUnits*minSize*factor)));
     }
 
 private:
@@ -278,7 +280,6 @@ QuadTreeWorld::QuadTreeWorld(osg::Group *parent, osg::Group *compileRoot, Resour
     , mViewDistance(std::numeric_limits<float>::max())
     , mMinSize(1/8.f)
     , mDebugTerrainChunks(debugChunks)
-    , mRevalidateDistance(0.f)
 {
     mChunkManager->setCompositeMapSize(compMapResolution);
     mChunkManager->setCompositeMapLevel(compMapLevel);
@@ -296,13 +297,14 @@ QuadTreeWorld::~QuadTreeWorld()
 {
 }
 
-/// get the level of vertex detail to render this node at, expressed relative to the native resolution of the data set.
+/// get the level of vertex detail to render this node at, expressed relative to the native resolution of the vertex data set,
+/// NOT relative to mMinSize as is the case with node LODs.
 unsigned int getVertexLod(QuadTreeNode* node, int vertexLodMod)
 {
-    int lod = Log2(int(node->getSize()));
+    unsigned int vertexLod = DefaultLodCallback::getNativeLodLevel(node, 1);
     if (vertexLodMod > 0)
     {
-        lod = std::max(0, lod-vertexLodMod);
+        vertexLod = static_cast<unsigned int>(std::max(0, static_cast<int>(vertexLod)-vertexLodMod));
     }
     else if (vertexLodMod < 0)
     {
@@ -313,13 +315,13 @@ unsigned int getVertexLod(QuadTreeNode* node, int vertexLodMod)
             size *= 2;
             vertexLodMod = std::min(0, vertexLodMod+1);
         }
-        lod += std::abs(vertexLodMod);
+        vertexLod += std::abs(vertexLodMod);
     }
-    return lod;
+    return vertexLod;
 }
 
 /// get the flags to use for stitching in the index buffer so that chunks of different LOD connect seamlessly
-unsigned int getLodFlags(QuadTreeNode* node, int ourLod, int vertexLodMod, const ViewData* vd)
+unsigned int getLodFlags(QuadTreeNode* node, unsigned int ourVertexLod, int vertexLodMod, const ViewData* vd)
 {
     unsigned int lodFlags = 0;
     for (unsigned int i=0; i<4; ++i)
@@ -332,40 +334,38 @@ unsigned int getLodFlags(QuadTreeNode* node, int ourLod, int vertexLodMod, const
         // our detail and the neighbour would handle stitching by itself.
         while (neighbour && !vd->contains(neighbour))
             neighbour = neighbour->getParent();
-        int lod = 0;
+        unsigned int lod = 0;
         if (neighbour)
             lod = getVertexLod(neighbour, vertexLodMod);
 
-        if (lod <= ourLod) // We only need to worry about neighbours less detailed than we are -
+        if (lod <= ourVertexLod) // We only need to worry about neighbours less detailed than we are -
             lod = 0;         // neighbours with more detail will do the stitching themselves
         // Use 4 bits for each LOD delta
         if (lod > 0)
         {
-            lodFlags |= static_cast<unsigned int>(lod - ourLod) << (4*i);
+            lodFlags |= (lod - ourVertexLod) << (4*i);
         }
     }
+    // Use the remaining bits for our vertex LOD
+    lodFlags |= (ourVertexLod << (4*4));
     return lodFlags;
 }
 
-void QuadTreeWorld::loadRenderingNode(ViewDataEntry& entry, ViewData* vd, float cellWorldSize, const osg::Vec4i &gridbounds, bool compile, float reuseDistance)
+void QuadTreeWorld::loadRenderingNode(ViewDataEntry& entry, ViewData* vd, float cellWorldSize, const osg::Vec4i &gridbounds, bool compile)
 {
     if (!vd->hasChanged() && entry.mRenderingNode)
         return;
 
-    int ourLod = getVertexLod(entry.mNode, mVertexLodMod);
-
     if (vd->hasChanged())
     {
+        unsigned int ourVertexLod = getVertexLod(entry.mNode, mVertexLodMod);
         // have to recompute the lodFlags in case a neighbour has changed LOD.
-        unsigned int lodFlags = getLodFlags(entry.mNode, ourLod, mVertexLodMod, vd);
+        unsigned int lodFlags = getLodFlags(entry.mNode, ourVertexLod, mVertexLodMod, vd);
         if (lodFlags != entry.mLodFlags)
         {
             entry.mRenderingNode = nullptr;
             entry.mLodFlags = lodFlags;
         }
-        // have to revalidate chunks within a custom view distance.
-        if (mRevalidateDistance && entry.mNode->distance(vd->getViewPoint()) <= mRevalidateDistance + reuseDistance)
-            entry.mRenderingNode = nullptr;
     }
 
     if (!entry.mRenderingNode)
@@ -378,9 +378,7 @@ void QuadTreeWorld::loadRenderingNode(ViewDataEntry& entry, ViewData* vd, float
 
         for (QuadTreeWorld::ChunkManager* m : mChunkManagers)
         {
-            if (mRevalidateDistance && m->getViewDistance() && entry.mNode->distance(vd->getViewPoint()) > m->getViewDistance() + reuseDistance)
-                continue;
-            osg::ref_ptr<osg::Node> n = m->getChunk(entry.mNode->getSize(), entry.mNode->getCenter(), ourLod, entry.mLodFlags, activeGrid, vd->getViewPoint(), compile);
+            osg::ref_ptr<osg::Node> n = m->getChunk(entry.mNode->getSize(), entry.mNode->getCenter(), DefaultLodCallback::getNativeLodLevel(entry.mNode, mMinSize), entry.mLodFlags, activeGrid, vd->getViewPoint(), compile);
             if (n) pat->addChild(n);
         }
         entry.mRenderingNode = pat;
@@ -462,7 +460,7 @@ void QuadTreeWorld::accept(osg::NodeVisitor &nv)
     for (unsigned int i=0; i<vd->getNumEntries(); ++i)
     {
         ViewDataEntry& entry = vd->getEntry(i);
-        loadRenderingNode(entry, vd, cellWorldSize, mActiveGrid, false, mViewDataMap->getReuseDistance());
+        loadRenderingNode(entry, vd, cellWorldSize, mActiveGrid, false);
         entry.mRenderingNode->accept(nv);
     }
 
@@ -541,12 +539,11 @@ void QuadTreeWorld::preload(View *view, const osg::Vec3f &viewPoint, const osg::
             reporter.addTotal(progressTotal);
         }
 
-        const float reuseDistance = std::max(mViewDataMap->getReuseDistance(), std::abs(distanceModifier));
         for (unsigned int i=startEntry; i<vd->getNumEntries() && !abort; ++i)
         {
             ViewDataEntry& entry = vd->getEntry(i);
 
-            loadRenderingNode(entry, vd, cellWorldSize, grid, true, reuseDistance);
+            loadRenderingNode(entry, vd, cellWorldSize, grid, true);
             if (pass==0) reporter.addProgress(entry.mNode->getSize());
             entry.mNode = nullptr; // Clear node lest we break the neighbours search for the next pass
         }
@@ -584,7 +581,7 @@ void QuadTreeWorld::addChunkManager(QuadTreeWorld::ChunkManager* m)
     mChunkManagers.push_back(m);
     mTerrainRoot->setNodeMask(mTerrainRoot->getNodeMask()|m->getNodeMask());
     if (m->getViewDistance())
-        mRevalidateDistance = std::max(m->getViewDistance(), mRevalidateDistance);
+        m->setMaxLodLevel(DefaultLodCallback::convertDistanceToLodLevel(m->getViewDistance() + mViewDataMap->getReuseDistance(), mMinSize, mLodFactor));
 }
 
 void QuadTreeWorld::rebuildViews()
diff --git a/components/terrain/quadtreeworld.hpp b/components/terrain/quadtreeworld.hpp
index 9d21d65fc5..3748f7df98 100644
--- a/components/terrain/quadtreeworld.hpp
+++ b/components/terrain/quadtreeworld.hpp
@@ -56,14 +56,19 @@ namespace Terrain
 
             void setViewDistance(float viewDistance) { mViewDistance = viewDistance; }
             float getViewDistance() const { return mViewDistance; }
+
+            // Automatically set by addChunkManager based on getViewDistance()
+            unsigned int getMaxLodLevel() const { return mMaxLodLevel; }
+            void setMaxLodLevel(unsigned int level) { mMaxLodLevel = level; }
         private:
             float mViewDistance = 0.f;
+            unsigned int mMaxLodLevel = ~0u;
         };
         void addChunkManager(ChunkManager*);
 
     private:
         void ensureQuadTreeBuilt();
-        void loadRenderingNode(ViewDataEntry& entry, ViewData* vd, float cellWorldSize, const osg::Vec4i &gridbounds, bool compile, float reuseDistance);
+        void loadRenderingNode(ViewDataEntry& entry, ViewData* vd, float cellWorldSize, const osg::Vec4i &gridbounds, bool compile);
 
         osg::ref_ptr<RootNode> mRootNode;
 
@@ -79,7 +84,6 @@ namespace Terrain
         float mMinSize;
         bool mDebugTerrainChunks;
         std::unique_ptr<DebugChunkManager> mDebugChunkManager;
-        float mRevalidateDistance;
     };
 
 }
diff --git a/components/terrain/viewdata.cpp b/components/terrain/viewdata.cpp
index ae23f034a8..033b5f5faa 100644
--- a/components/terrain/viewdata.cpp
+++ b/components/terrain/viewdata.cpp
@@ -145,7 +145,6 @@ ViewData *ViewDataMap::getViewData(osg::Object *viewer, const osg::Vec3f& viewPo
             }
             vd->setViewPoint(viewPoint);
             vd->setActiveGrid(activeGrid);
-            vd->setChanged(true);
             needsUpdate = true;
         }
     }
diff --git a/components/terrain/viewdata.hpp b/components/terrain/viewdata.hpp
index b7dbc977b1..d51da011a2 100644
--- a/components/terrain/viewdata.hpp
+++ b/components/terrain/viewdata.hpp
@@ -49,7 +49,7 @@ namespace Terrain
         double getLastUsageTimeStamp() const { return mLastUsageTimeStamp; }
         void setLastUsageTimeStamp(double timeStamp) { mLastUsageTimeStamp = timeStamp; }
 
-        /// Indicates at least one mNode of mEntries has changed or the view point has moved beyond mReuseDistance.
+        /// Indicates at least one mNode of mEntries has changed.
         /// @note Such changes may necessitate a revalidation of cached mRenderingNodes elsewhere depending
         /// on the parameters that affect the creation of mRenderingNode.
         bool hasChanged() const { return mChanged; }

From 1a2fde04bb2757ca852584d7d7b3080a89cfdd93 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 8 Nov 2021 17:28:54 +0100
Subject: [PATCH 1670/2859] Clarify logic

---
 apps/openmw/mwmechanics/spellpriority.cpp | 27 ++++++++++-------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/apps/openmw/mwmechanics/spellpriority.cpp b/apps/openmw/mwmechanics/spellpriority.cpp
index 7338f4b2af..acc9fc2a3f 100644
--- a/apps/openmw/mwmechanics/spellpriority.cpp
+++ b/apps/openmw/mwmechanics/spellpriority.cpp
@@ -369,25 +369,22 @@ namespace MWMechanics
 
             break;
         case ESM::MagicEffect::BoundShield:
-            if(actor.getClass().hasInventoryStore(actor))
+            if(!actor.getClass().hasInventoryStore(actor))
+                return 0.f;
+            else if(!actor.getClass().isNpc())
             {
                 // If the actor is an NPC they can benefit from the armor rating, otherwise check if we've got a one-handed weapon to use with the shield
-                if(!actor.getClass().isNpc())
+                const auto& store = actor.getClass().getInventoryStore(actor);
+                auto oneHanded = std::find_if(store.cbegin(MWWorld::ContainerStore::Type_Weapon), store.cend(), [](const MWWorld::ConstPtr& weapon)
                 {
-                    const auto& store = actor.getClass().getInventoryStore(actor);
-                    auto oneHanded = std::find_if(store.cbegin(MWWorld::ContainerStore::Type_Weapon), store.cend(), [](const MWWorld::ConstPtr& weapon)
-                    {
-                        if(weapon.getClass().getItemHealth(weapon) <= 0.f)
-                            return false;
-                        auto type = weapon.get<ESM::Weapon>()->mBase->mData.mType;
-                        return !(MWMechanics::getWeaponType(type)->mFlags & ESM::WeaponType::TwoHanded);
-                    });
-                    if(oneHanded == store.cend())
-                        return 0.f;
-                }
+                    if(weapon.getClass().getItemHealth(weapon) <= 0.f)
+                        return false;
+                    short type = weapon.get<ESM::Weapon>()->mBase->mData.mType;
+                    return !(MWMechanics::getWeaponType(type)->mFlags & ESM::WeaponType::TwoHanded);
+                });
+                if(oneHanded == store.cend())
+                    return 0.f;
             }
-            else
-                return 0.f;
             break;
         // Creatures can not wear armor
         case ESM::MagicEffect::BoundCuirass:

From 5f5163905abb8c74876fd2f7f93c1d462f4bbff6 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 5 Nov 2021 14:14:15 +0100
Subject: [PATCH 1671/2859] Remove unused operator< for RecastMesh

---
 components/detournavigator/recastmesh.hpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/components/detournavigator/recastmesh.hpp b/components/detournavigator/recastmesh.hpp
index c8e160603b..e2e7b9e188 100644
--- a/components/detournavigator/recastmesh.hpp
+++ b/components/detournavigator/recastmesh.hpp
@@ -132,11 +132,6 @@ namespace DetourNavigator
         std::vector<FlatHeightfield> mFlatHeightfields;
         Bounds mBounds;
 
-        friend inline bool operator <(const RecastMesh& lhs, const RecastMesh& rhs) noexcept
-        {
-            return std::tie(lhs.mMesh, lhs.mWater) < std::tie(rhs.mMesh, rhs.mWater);
-        }
-
         friend inline std::size_t getSize(const RecastMesh& value) noexcept
         {
             return getSize(value.mMesh) + value.mWater.size() * sizeof(Cell)

From 671e1e542402d104a128bff1309f117dfa43dee8 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 5 Nov 2021 17:36:53 +0100
Subject: [PATCH 1672/2859] Avoid copy when adding heightfield to vector

---
 components/detournavigator/recastmeshbuilder.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/detournavigator/recastmeshbuilder.cpp b/components/detournavigator/recastmeshbuilder.cpp
index 8f860d2eb1..ae3458a011 100644
--- a/components/detournavigator/recastmeshbuilder.cpp
+++ b/components/detournavigator/recastmeshbuilder.cpp
@@ -242,7 +242,7 @@ namespace DetourNavigator
         heightfield.mShift = shift + osg::Vec3f(minX, minY, 0) * stepSize - osg::Vec3f(halfCellSize, halfCellSize, 0);
         heightfield.mScale = stepSize;
         heightfield.mHeights = std::move(tileHeights);
-        mHeightfields.emplace_back(heightfield);
+        mHeightfields.push_back(std::move(heightfield));
     }
 
     std::shared_ptr<RecastMesh> RecastMeshBuilder::create(std::size_t generation, std::size_t revision) &&

From 5972520b1abb4ffa971c930e4c8861ecd990d69d Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 5 Nov 2021 17:52:37 +0100
Subject: [PATCH 1673/2859] Make sure areas size is 2 for rectangle

---
 components/detournavigator/makenavmesh.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index 3f133f5033..3043c36308 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -198,7 +198,7 @@ namespace
     }
 
     bool rasterizeTriangles(rcContext& context, const Rectangle& rectangle, const rcConfig& config,
-        const unsigned char* areas, std::size_t areasSize, rcHeightfield& solid)
+        AreaType areaType, rcHeightfield& solid)
     {
         const osg::Vec2f tileBoundsMin(
             std::clamp(rectangle.mBounds.mMin.x(), config.bmin[0], config.bmax[0]),
@@ -224,13 +224,15 @@ namespace
             0, 2, 3,
         };
 
+        const std::array<unsigned char, 2> areas {areaType, areaType};
+
         return rcRasterizeTriangles(
             &context,
             vertices.data(),
             static_cast<int>(vertices.size() / 3),
             indices.data(),
-            areas,
-            static_cast<int>(areasSize),
+            areas.data(),
+            static_cast<int>(areas.size()),
             solid,
             config.walkableClimb
         );
@@ -239,11 +241,10 @@ namespace
     bool rasterizeTriangles(rcContext& context, const osg::Vec3f& agentHalfExtents, const std::vector<Cell>& cells,
         const Settings& settings, const rcConfig& config, rcHeightfield& solid)
     {
-        const std::array<unsigned char, 2> areas {{AreaType_water, AreaType_water}};
         for (const Cell& cell : cells)
         {
             const Rectangle rectangle = getSwimRectangle(cell, settings, agentHalfExtents);
-            if (!rasterizeTriangles(context, rectangle, config, areas.data(), areas.size(), solid))
+            if (!rasterizeTriangles(context, rectangle, config, AreaType_water, solid))
                 return false;
         }
         return true;
@@ -254,9 +255,8 @@ namespace
     {
         for (const FlatHeightfield& heightfield : heightfields)
         {
-            const std::array<unsigned char, 2> areas {{AreaType_ground, AreaType_ground}};
             const Rectangle rectangle {heightfield.mBounds, toNavMeshCoordinates(settings, heightfield.mHeight)};
-            if (!rasterizeTriangles(context, rectangle, config, areas.data(), areas.size(), solid))
+            if (!rasterizeTriangles(context, rectangle, config, AreaType_ground, solid))
                 return false;
         }
         return true;

From f2bc179b0ac24fa282072af33aa42265124b68a1 Mon Sep 17 00:00:00 2001
From: Bret Curtis <bret.curtis@gmail.com>
Date: Tue, 9 Nov 2021 10:20:32 +0100
Subject: [PATCH 1674/2859] Add groundcover back into view

---
 apps/openmw/mwrender/groundcover.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/openmw/mwrender/groundcover.cpp b/apps/openmw/mwrender/groundcover.cpp
index 25c00fb976..3f4e592688 100644
--- a/apps/openmw/mwrender/groundcover.cpp
+++ b/apps/openmw/mwrender/groundcover.cpp
@@ -242,7 +242,6 @@ namespace MWRender
         osg::ComputeBoundsVisitor cbv;
         group->accept(cbv);
         osg::BoundingBox box = cbv.getBoundingBox();
-        box = osg::BoundingBox(box._min+worldCenter, box._max+worldCenter);
         group->addCullCallback(new ViewDistanceCallback(getViewDistance(), box));
 
         group->setStateSet(mStateset);

From 3b6184dcdac631ba3ccd234f7db2e827617e9c2b Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 9 Nov 2021 12:32:25 +0100
Subject: [PATCH 1675/2859] Add missing include
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In file included from /<<BUILDDIR>>/openmw-0.47.0+git202111080927~ubuntu18.04.1/components/detournavigator/findsmoothpath.cpp:1:0:
/<<BUILDDIR>>/openmw-0.47.0+git202111080927~ubuntu18.04.1/components/detournavigator/findsmoothpath.hpp:93:48: error: field ‘mSettings’ has incomplete type ‘std::reference_wrapper<const DetourNavigator::Settings>’
         std::reference_wrapper<const Settings> mSettings;
                                                ^~~~~~~~~
In file included from /usr/include/c++/7/bits/move.h:54:0,
                 from /usr/include/c++/7/bits/nested_exception.h:40,
                 from /usr/include/c++/7/exception:143,
                 from /usr/include/c++/7/ios:39,
                 from /usr/include/c++/7/istream:38,
                 from /usr/include/c++/7/sstream:38,
                 from /<<BUILDDIR>>/openmw-0.47.0+git202111080927~ubuntu18.04.1/components/detournavigator/dtstatus.hpp:6,
                 from /<<BUILDDIR>>/openmw-0.47.0+git202111080927~ubuntu18.04.1/components/detournavigator/findsmoothpath.hpp:4,
                 from /<<BUILDDIR>>/openmw-0.47.0+git202111080927~ubuntu18.04.1/components/detournavigator/findsmoothpath.cpp:1:
/usr/include/c++/7/type_traits:2125:11: note: declaration of ‘class std::reference_wrapper<const DetourNavigator::Settings>’
     class reference_wrapper;
---
 components/detournavigator/findsmoothpath.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/detournavigator/findsmoothpath.hpp b/components/detournavigator/findsmoothpath.hpp
index 07d3054e19..2e63340578 100644
--- a/components/detournavigator/findsmoothpath.hpp
+++ b/components/detournavigator/findsmoothpath.hpp
@@ -18,6 +18,7 @@
 
 #include <cassert>
 #include <vector>
+#include <functional>
 
 class dtNavMesh;
 

From 099cd8a20c3e4d38894f16f9b75c8245bcc8f6c5 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Tue, 9 Nov 2021 16:47:42 +0100
Subject: [PATCH 1676/2859] Force alphabetical order per data dir

---
 .../contentselector/model/contentmodel.cpp    | 45 +++++++++++--------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/components/contentselector/model/contentmodel.cpp b/components/contentselector/model/contentmodel.cpp
index 355f5741bf..ac7851d99c 100644
--- a/components/contentselector/model/contentmodel.cpp
+++ b/components/contentselector/model/contentmodel.cpp
@@ -1,8 +1,8 @@
 #include "contentmodel.hpp"
 #include "esmfile.hpp"
 
-#include <algorithm>
 #include <stdexcept>
+#include <unordered_set>
 
 #include <QDir>
 #include <QTextCodec>
@@ -421,6 +421,7 @@ void ContentSelectorModel::ContentModel::addFiles(const QString &path)
     if (mShowOMWScripts)
         filters << "*.omwscripts";
     dir.setNameFilters(filters);
+    dir.setSorting(QDir::Name);
 
     for (const QString &path2 : dir.entryList())
     {
@@ -504,28 +505,34 @@ QStringList ContentSelectorModel::ContentModel::gameFiles() const
 void ContentSelectorModel::ContentModel::sortFiles()
 {
     emit layoutAboutToBeChanged();
-    std::sort(mFiles.begin(), mFiles.end(), [](const EsmFile* a, const EsmFile* b)
-    {
-        return a->fileName().compare(b->fileName(), Qt::CaseInsensitive) > 0;
-    });
     //Dependency sort
-    int sorted = 1;
-    //iterate each file, obtaining a reference to its gamefiles list
-    for(int i = sorted; i < mFiles.size(); ++i)
+    std::unordered_set<const EsmFile*> moved;
+    for(int i = mFiles.size() - 1; i > 0;)
     {
-        const QStringList& gameFiles = mFiles.at(i)->gameFiles();
-        int j = sorted;
-        for(;j > 0; --j)
+        const auto file = mFiles.at(i);
+        if(moved.find(file) == moved.end())
         {
-            const auto file = mFiles.at(j - 1);
-            if(gameFiles.contains(file->fileName(), Qt::CaseInsensitive)
-                 || (!mFiles.at(i)->isGameFile() && gameFiles.isEmpty()
-                 && file->fileName().compare("Morrowind.esm", Qt::CaseInsensitive) == 0)) // Hack: implicit dependency on Morrowind.esm for dependency-less files
-                break;
+            int index = -1;
+            for(int j = 0; j < i; ++j)
+            {
+                const QStringList& gameFiles = mFiles.at(j)->gameFiles();
+                if(gameFiles.contains(file->fileName(), Qt::CaseInsensitive)
+                    || (!mFiles.at(j)->isGameFile() && gameFiles.isEmpty()
+                    && file->fileName().compare("Morrowind.esm", Qt::CaseInsensitive) == 0)) // Hack: implicit dependency on Morrowind.esm for dependency-less files
+                {
+                    index = j;
+                    break;
+                }
+            }
+            if(index >= 0)
+            {
+                mFiles.move(i, index);
+                moved.insert(file);
+                continue;
+            }
         }
-        if(i != j)
-            mFiles.move(i, j);
-        ++sorted;
+        --i;
+        moved.clear();
     }
     emit layoutChanged();
 }

From fbc7cf5e651ecb5b5d762a9aeca3aae0d44a5ae5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20St=C3=B6ckel?= <astoecke@uwaterloo.ca>
Date: Thu, 4 Nov 2021 00:37:09 -0400
Subject: [PATCH 1677/2859] Fix #6386

Use `gl_FragCoords` instead passing the normalised screen-space coordinates
to the fragment shader in a numerically unstable way.
---
 files/shaders/water_fragment.glsl | 6 +++---
 files/shaders/water_vertex.glsl   | 9 ---------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/files/shaders/water_fragment.glsl b/files/shaders/water_fragment.glsl
index 26f83e052c..1dbe7d14cf 100644
--- a/files/shaders/water_fragment.glsl
+++ b/files/shaders/water_fragment.glsl
@@ -132,7 +132,6 @@ vec2 normalCoords(vec2 uv, float scale, float speed, float time, float timer1, f
     return uv * (WAVE_SCALE * scale) + WIND_DIR * time * (WIND_SPEED * speed) -(previousNormal.xy/previousNormal.zz) * WAVE_CHOPPYNESS + vec2(time * timer1,time * timer2);
   }
 
-varying vec3 screenCoordsPassthrough;
 varying vec4 position;
 varying float linearDepth;
 
@@ -152,6 +151,8 @@ uniform vec3 nodePosition;
 
 uniform float rainIntensity;
 
+uniform vec2 screenRes;
+
 #define PER_PIXEL_LIGHTING 0
 
 #include "shadows_fragment.glsl"
@@ -178,8 +179,7 @@ void main(void)
 
     float shadow = unshadowedLightRatio(linearDepth);
 
-    vec2 screenCoords = screenCoordsPassthrough.xy / screenCoordsPassthrough.z;
-    screenCoords.y = (1.0-screenCoords.y);
+    vec2 screenCoords = gl_FragCoord.xy / screenRes;
 
     #define waterTimer osg_SimulationTime
 
diff --git a/files/shaders/water_vertex.glsl b/files/shaders/water_vertex.glsl
index 8e506a57f8..3a6c352ac8 100644
--- a/files/shaders/water_vertex.glsl
+++ b/files/shaders/water_vertex.glsl
@@ -2,7 +2,6 @@
 
 uniform mat4 projectionMatrix;
 
-varying vec3  screenCoordsPassthrough;
 varying vec4  position;
 varying float linearDepth;
 
@@ -13,14 +12,6 @@ void main(void)
 {
     gl_Position = projectionMatrix * (gl_ModelViewMatrix * gl_Vertex);
 
-    mat4 scalemat = mat4(0.5, 0.0, 0.0, 0.0,
-                         0.0, -0.5, 0.0, 0.0,
-                         0.0, 0.0, 0.5, 0.0,
-                         0.5, 0.5, 0.5, 1.0);
-
-    vec4 texcoordProj = ((scalemat) * ( gl_Position));
-    screenCoordsPassthrough = texcoordProj.xyw;
-
     position = gl_Vertex;
 
     vec4 viewPos = gl_ModelViewMatrix * gl_Vertex;

From 81f2fa992f42c7a51e0d7c85c0dddb0ccd658ccd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20St=C3=B6ckel?= <astoecke@uwaterloo.ca>
Date: Tue, 9 Nov 2021 23:27:32 -0500
Subject: [PATCH 1678/2859] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3cbf9802e..e50b77229a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -71,6 +71,7 @@
     Bug #6354: SFX abruptly cut off after crossing max distance; implement soft fading of sound effects
     Bug #6363: Some scripts in Morrowland fail to work
     Bug #6376: Creatures should be able to use torches
+    Bug #6386: Artifacts in water reflection due to imprecise screen-space coordinate computation
     Feature #890: OpenMW-CS: Column filtering
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
     Feature #2780: A way to see current OpenMW version in the console

From 835bec0ed1da41220ba6766497b46be218c9f6d5 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Wed, 10 Nov 2021 09:36:01 +0300
Subject: [PATCH 1679/2859] Fix stupid typo

---
 apps/openmw/mwrender/localmap.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index 0eb0e7738a..66c8c55c60 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -647,8 +647,7 @@ void LocalMap::updatePlayer (const osg::Vec3f& position, const osg::Quat& orient
 
                     uint32_t clr = *(uint32_t*)data;
                     uint8_t alpha = (clr >> 24);
-
-                    alpha = std::min( alpha, (uint8_t) (std::clamp((sqrDist/sqrExploreRadius)*255, 0.f, 1.f)));
+                    alpha = std::min(alpha, (uint8_t)(std::clamp(sqrDist/sqrExploreRadius, 0.f, 1.f) * 255));
                     uint32_t val = (uint32_t) (alpha << 24);
                     if ( *data != val)
                     {

From 0d13b8cd3f1a1be2ea0211b0e4339ea7d2896af8 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Wed, 10 Nov 2021 15:44:45 +0300
Subject: [PATCH 1680/2859] Allow movement during blocking (bug #6327)

---
 CHANGELOG.md                          | 1 +
 apps/openmw/mwmechanics/character.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3cbf9802e..769f09bedb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -67,6 +67,7 @@
     Bug #6322: Total sold/cost should reset to 0 when there are no items offered
     Bug #6323: Wyrmhaven: Alboin doesn't follower the player character out of his house
     Bug #6326: Detect Enchantment/Key should detect items in unresolved containers
+    Bug #6327: Blocking roots the character in place
     Bug #6347: PlaceItem/PlaceItemCell/PlaceAt should work with levelled creatures
     Bug #6354: SFX abruptly cut off after crossing max distance; implement soft fading of sound effects
     Bug #6363: Some scripts in Morrowland fail to work
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 36d4446580..0cbe5c284a 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -2061,7 +2061,7 @@ void CharacterController::update(float duration)
         vec.x() *= speed;
         vec.y() *= speed;
 
-        if(mHitState != CharState_None && mJumpState == JumpState_None)
+        if(mHitState != CharState_None && mHitState != CharState_Block && mJumpState == JumpState_None)
             vec = osg::Vec3f();
 
         CharacterState movestate = CharState_None;

From 9500afaa5a265ba49fcf8bb95b73edc4b1c9a4e8 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Wed, 10 Nov 2021 19:21:07 +0300
Subject: [PATCH 1681/2859] Load BSFurnitureMarker

---
 components/nif/extra.cpp   | 34 ++++++++++++++++++++++++++++++++++
 components/nif/extra.hpp   | 24 ++++++++++++++++++++++++
 components/nif/niffile.cpp |  1 +
 components/nif/record.hpp  |  3 ++-
 4 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/components/nif/extra.cpp b/components/nif/extra.cpp
index a45ea8c50b..1401291a0f 100644
--- a/components/nif/extra.cpp
+++ b/components/nif/extra.cpp
@@ -94,4 +94,38 @@ void BSBound::read(NIFStream *nif)
     halfExtents = nif->getVector3();
 }
 
+void BSFurnitureMarker::LegacyFurniturePosition::read(NIFStream *nif)
+{
+    offset = nif->getVector3();
+    orientation = nif->getUShort();
+    positionRef = nif->getChar();
+    nif->skip(1); // Position ref 2
+}
+
+void BSFurnitureMarker::FurniturePosition::read(NIFStream *nif)
+{
+    offset = nif->getVector3();
+    heading = nif->getFloat();
+    type = nif->getUShort();
+    entryPoint = nif->getUShort();
+}
+
+void BSFurnitureMarker::read(NIFStream *nif)
+{
+    Extra::read(nif);
+    unsigned int num = nif->getUInt();
+    if (nif->getBethVersion() <= NIFFile::BethVersion::BETHVER_FO3)
+    {
+        legacyMarkers.resize(num);
+        for (auto& marker : legacyMarkers)
+            marker.read(nif);
+    }
+    else
+    {
+        markers.resize(num);
+        for (auto& marker : markers)
+            marker.read(nif);
+    }
+}
+
 }
diff --git a/components/nif/extra.hpp b/components/nif/extra.hpp
index f4ac1caff9..bbc5c216d8 100644
--- a/components/nif/extra.hpp
+++ b/components/nif/extra.hpp
@@ -120,5 +120,29 @@ struct BSBound : public Extra
     void read(NIFStream *nif) override;
 };
 
+struct BSFurnitureMarker : public Extra
+{
+    struct LegacyFurniturePosition
+    {
+        osg::Vec3f offset;
+        uint16_t orientation;
+        uint8_t positionRef;
+        void read(NIFStream *nif);
+    };
+
+    struct FurniturePosition
+    {
+        osg::Vec3f offset;
+        float heading;
+        uint16_t type, entryPoint;
+        void read(NIFStream *nif);
+    };
+
+    std::vector<LegacyFurniturePosition> legacyMarkers;
+    std::vector<FurniturePosition> markers;
+
+    void read(NIFStream *nif) override;
+};
+
 } // Namespace
 #endif
diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index 6863209988..7f330450a0 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -136,6 +136,7 @@ static std::map<std::string,RecordFactoryEntry> makeFactory()
     factory["BSShaderProperty"]             = {&construct <BSShaderProperty>            , RC_BSShaderProperty           };
     factory["BSShaderPPLightingProperty"]   = {&construct <BSShaderPPLightingProperty>  , RC_BSShaderPPLightingProperty };
     factory["BSShaderNoLightingProperty"]   = {&construct <BSShaderNoLightingProperty>  , RC_BSShaderNoLightingProperty };
+    factory["BSFurnitureMarker"]            = {&construct <BSFurnitureMarker>           , RC_BSFurnitureMarker          };
     return factory;
 }
 
diff --git a/components/nif/record.hpp b/components/nif/record.hpp
index dc81eb69c7..dc7314cc95 100644
--- a/components/nif/record.hpp
+++ b/components/nif/record.hpp
@@ -125,7 +125,8 @@ enum RecordType
   RC_BSLODTriShape,
   RC_BSShaderProperty,
   RC_BSShaderPPLightingProperty,
-  RC_BSShaderNoLightingProperty
+  RC_BSShaderNoLightingProperty,
+  RC_BSFurnitureMarker
 };
 
 /// Base class for all records

From 55710991476930c79c6cc37cc88aa625ea31c58b Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Wed, 10 Nov 2021 19:31:28 +0300
Subject: [PATCH 1682/2859] Load NiCollisionObject and bhkCollisionObject

---
 components/CMakeLists.txt    |  2 +-
 components/nif/niffile.cpp   |  2 ++
 components/nif/node.hpp      |  7 +++-
 components/nif/physics.cpp   | 32 +++++++++++++++++++
 components/nif/physics.hpp   | 62 ++++++++++++++++++++++++++++++++++++
 components/nif/record.hpp    |  4 ++-
 components/nif/recordptr.hpp |  6 ++++
 7 files changed, 112 insertions(+), 3 deletions(-)
 create mode 100644 components/nif/physics.cpp
 create mode 100644 components/nif/physics.hpp

diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 0b3c95ff45..5c0ead4ad0 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -61,7 +61,7 @@ add_component_dir (sceneutil
     )
 
 add_component_dir (nif
-    controlled effect niftypes record controller extra node record_ptr data niffile property nifkey base nifstream
+    controlled effect niftypes record controller extra node record_ptr data niffile property nifkey base nifstream physics
     )
 
 add_component_dir (nifosg
diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index 7f330450a0..1f6cc256fc 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -137,6 +137,8 @@ static std::map<std::string,RecordFactoryEntry> makeFactory()
     factory["BSShaderPPLightingProperty"]   = {&construct <BSShaderPPLightingProperty>  , RC_BSShaderPPLightingProperty };
     factory["BSShaderNoLightingProperty"]   = {&construct <BSShaderNoLightingProperty>  , RC_BSShaderNoLightingProperty };
     factory["BSFurnitureMarker"]            = {&construct <BSFurnitureMarker>           , RC_BSFurnitureMarker          };
+    factory["NiCollisionObject"]            = {&construct <NiCollisionObject>           , RC_NiCollisionObject          };
+    factory["bhkCollisionObject"]           = {&construct <bhkCollisionObject>          , RC_bhkCollisionObject         };
     return factory;
 }
 
diff --git a/components/nif/node.hpp b/components/nif/node.hpp
index 406a4d4549..c01ba9b663 100644
--- a/components/nif/node.hpp
+++ b/components/nif/node.hpp
@@ -8,6 +8,7 @@
 #include "niftypes.hpp"
 #include "controller.hpp"
 #include "base.hpp"
+#include "physics.hpp"
 
 #include <components/misc/stringops.hpp>
 
@@ -143,6 +144,9 @@ struct Node : public Named
     bool hasBounds{false};
     NiBoundingVolume bounds;
 
+    // Collision object info
+    NiCollisionObjectPtr collision;
+
     void read(NIFStream *nif) override
     {
         Named::read(nif);
@@ -160,7 +164,7 @@ struct Node : public Named
             bounds.read(nif);
         // Reference to the collision object in Gamebryo files.
         if (nif->getVersion() >= NIFStream::generateVersion(10,0,1,0))
-            nif->skip(4);
+            collision.read(nif);
 
         parent = nullptr;
 
@@ -171,6 +175,7 @@ struct Node : public Named
     {
         Named::post(nif);
         props.post(nif);
+        collision.post(nif);
     }
 
     // Parent node, or nullptr for the root node. As far as I'm aware, only
diff --git a/components/nif/physics.cpp b/components/nif/physics.cpp
new file mode 100644
index 0000000000..fbbc459ab2
--- /dev/null
+++ b/components/nif/physics.cpp
@@ -0,0 +1,32 @@
+#include "physics.hpp"
+#include "node.hpp"
+
+namespace Nif
+{
+    void bhkCollisionObject::read(NIFStream *nif)
+    {
+        NiCollisionObject::read(nif);
+        flags = nif->getUShort();
+        body.read(nif);
+    }
+
+    void bhkWorldObject::read(NIFStream *nif)
+    {
+        shape.read(nif);
+        if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB_OLD)
+            nif->skip(4); // Unknown
+        flags = nif->getUInt();
+        nif->skip(4); // Unused
+        worldObjectInfo.phaseType = nif->getChar();
+        nif->skip(3); // Unused
+        worldObjectInfo.data = nif->getUInt();
+        worldObjectInfo.size = nif->getUInt();
+        worldObjectInfo.capacityAndFlags = nif->getUInt();
+    }
+
+    void bhkWorldObject::post(NIFFile *nif)
+    {
+        shape.post(nif);
+    }
+
+} // Namespace
\ No newline at end of file
diff --git a/components/nif/physics.hpp b/components/nif/physics.hpp
new file mode 100644
index 0000000000..e64eb349eb
--- /dev/null
+++ b/components/nif/physics.hpp
@@ -0,0 +1,62 @@
+#ifndef OPENMW_COMPONENTS_NIF_PHYSICS_HPP
+#define OPENMW_COMPONENTS_NIF_PHYSICS_HPP
+
+#include "base.hpp"
+
+// This header contains certain record definitions
+// specific to Bethesda implementation of Havok physics
+namespace Nif
+{
+
+// Generic collision object
+struct NiCollisionObject : public Record
+{
+    // The node that references this object
+    NodePtr target;
+
+    void read(NIFStream *nif) override
+    {
+        target.read(nif);
+    }
+    void post(NIFFile *nif) override
+    {
+        target.post(nif);
+    }
+};
+
+// Bethesda Havok-specific collision object
+struct bhkCollisionObject : public NiCollisionObject
+{
+    unsigned short flags;
+    CollisionBodyPtr body;
+
+    void read(NIFStream *nif) override;
+    void post(NIFFile *nif) override
+    {
+        NiCollisionObject::post(nif);
+        body.post(nif);
+    }
+};
+
+
+// Abstract Havok shape info record
+struct bhkWorldObject : public Record
+{
+    bhkShapePtr shape;
+    unsigned int flags; // Havok layer type, collision filter flags and group
+    struct WorldObjectInfo
+    {
+        unsigned char phaseType;
+        unsigned int data;
+        unsigned int size;
+        unsigned int capacityAndFlags;
+    };
+    WorldObjectInfo worldObjectInfo;
+    void read(NIFStream *nif) override;
+    void post(NIFFile *nif) override;
+};
+
+struct bhkShape : public Record {};
+
+} // Namespace
+#endif
\ No newline at end of file
diff --git a/components/nif/record.hpp b/components/nif/record.hpp
index dc7314cc95..88ffbe4141 100644
--- a/components/nif/record.hpp
+++ b/components/nif/record.hpp
@@ -126,7 +126,9 @@ enum RecordType
   RC_BSShaderProperty,
   RC_BSShaderPPLightingProperty,
   RC_BSShaderNoLightingProperty,
-  RC_BSFurnitureMarker
+  RC_BSFurnitureMarker,
+  RC_NiCollisionObject,
+  RC_bhkCollisionObject
 };
 
 /// Base class for all records
diff --git a/components/nif/recordptr.hpp b/components/nif/recordptr.hpp
index b30d99fbe4..a25480fe43 100644
--- a/components/nif/recordptr.hpp
+++ b/components/nif/recordptr.hpp
@@ -148,6 +148,9 @@ struct BSShaderTextureSet;
 struct NiGeometryData;
 struct BSShaderProperty;
 struct NiAlphaProperty;
+struct NiCollisionObject;
+struct bhkWorldObject;
+struct bhkShape;
 
 using NodePtr = RecordPtrT<Node>;
 using ExtraPtr = RecordPtrT<Extra>;
@@ -175,6 +178,9 @@ using BSShaderTextureSetPtr = RecordPtrT<BSShaderTextureSet>;
 using NiGeometryDataPtr = RecordPtrT<NiGeometryData>;
 using BSShaderPropertyPtr = RecordPtrT<BSShaderProperty>;
 using NiAlphaPropertyPtr = RecordPtrT<NiAlphaProperty>;
+using NiCollisionObjectPtr = RecordPtrT<NiCollisionObject>;
+using CollisionBodyPtr = RecordPtrT<bhkWorldObject>;
+using bhkShapePtr = RecordPtrT<bhkShape>;
 
 using NodeList = RecordListT<Node>;
 using PropertyList = RecordListT<Property>;

From 41097352a8d4fe1ac58490f58fe1b26e0d5369e2 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Wed, 10 Nov 2021 19:40:02 +0300
Subject: [PATCH 1683/2859] Load BSDismemberSkinInstance

---
 components/nif/data.cpp    | 7 +++++++
 components/nif/data.hpp    | 5 +++++
 components/nif/niffile.cpp | 1 +
 components/nif/record.hpp  | 3 ++-
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/components/nif/data.cpp b/components/nif/data.cpp
index b6674611bc..cac924733d 100644
--- a/components/nif/data.cpp
+++ b/components/nif/data.cpp
@@ -34,6 +34,13 @@ void NiSkinInstance::post(NIFFile *nif)
     }
 }
 
+void BSDismemberSkinInstance::read(NIFStream *nif)
+{
+    NiSkinInstance::read(nif);
+    unsigned int numPartitions = nif->getUInt();
+    nif->skip(4 * numPartitions); // Body part information
+}
+
 void NiGeometryData::read(NIFStream *nif)
 {
     if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,114))
diff --git a/components/nif/data.hpp b/components/nif/data.hpp
index efbe138c53..70171ac47c 100644
--- a/components/nif/data.hpp
+++ b/components/nif/data.hpp
@@ -170,6 +170,11 @@ struct NiSkinInstance : public Record
     void post(NIFFile *nif) override;
 };
 
+struct BSDismemberSkinInstance : public NiSkinInstance
+{
+    void read(NIFStream *nif) override;
+};
+
 struct NiSkinData : public Record
 {
     struct VertWeight
diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index 1f6cc256fc..4e184f68fa 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -139,6 +139,7 @@ static std::map<std::string,RecordFactoryEntry> makeFactory()
     factory["BSFurnitureMarker"]            = {&construct <BSFurnitureMarker>           , RC_BSFurnitureMarker          };
     factory["NiCollisionObject"]            = {&construct <NiCollisionObject>           , RC_NiCollisionObject          };
     factory["bhkCollisionObject"]           = {&construct <bhkCollisionObject>          , RC_bhkCollisionObject         };
+    factory["BSDismemberSkinInstance"]      = {&construct <BSDismemberSkinInstance>     , RC_BSDismemberSkinInstance    };
     return factory;
 }
 
diff --git a/components/nif/record.hpp b/components/nif/record.hpp
index 88ffbe4141..23a1a6df2b 100644
--- a/components/nif/record.hpp
+++ b/components/nif/record.hpp
@@ -128,7 +128,8 @@ enum RecordType
   RC_BSShaderNoLightingProperty,
   RC_BSFurnitureMarker,
   RC_NiCollisionObject,
-  RC_bhkCollisionObject
+  RC_bhkCollisionObject,
+  RC_BSDismemberSkinInstance
 };
 
 /// Base class for all records

From 923756b407feecb97673e9a557472c582e86b0c5 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Wed, 10 Nov 2021 19:42:55 +0300
Subject: [PATCH 1684/2859] Load NiControllerManager

---
 components/nif/controller.cpp | 9 +++++++++
 components/nif/controller.hpp | 6 ++++++
 components/nif/niffile.cpp    | 1 +
 components/nif/record.hpp     | 3 ++-
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/components/nif/controller.cpp b/components/nif/controller.cpp
index 704c4928e6..513c781c58 100644
--- a/components/nif/controller.cpp
+++ b/components/nif/controller.cpp
@@ -270,6 +270,15 @@ namespace Nif
         nif->getUInt(); // Zero
     }
 
+    void NiControllerManager::read(NIFStream *nif)
+    {
+        Controller::read(nif);
+        cumulative = nif->getBoolean();
+        unsigned int numSequences = nif->getUInt();
+        nif->skip(4 * numSequences); // Controller sequences
+        nif->skip(4); // Object palette
+    }
+
     void NiPoint3Interpolator::read(NIFStream *nif)
     {
         defaultVal = nif->getVector3();
diff --git a/components/nif/controller.hpp b/components/nif/controller.hpp
index 503710fe90..15a2937b80 100644
--- a/components/nif/controller.hpp
+++ b/components/nif/controller.hpp
@@ -184,6 +184,12 @@ struct bhkBlendController : public Controller
     void read(NIFStream *nif) override;
 };
 
+struct NiControllerManager : public Controller
+{
+    bool cumulative;
+    void read(NIFStream *nif) override;
+};
+
 struct Interpolator : public Record { };
 
 struct NiPoint3Interpolator : public Interpolator
diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index 4e184f68fa..24b9bbceed 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -140,6 +140,7 @@ static std::map<std::string,RecordFactoryEntry> makeFactory()
     factory["NiCollisionObject"]            = {&construct <NiCollisionObject>           , RC_NiCollisionObject          };
     factory["bhkCollisionObject"]           = {&construct <bhkCollisionObject>          , RC_bhkCollisionObject         };
     factory["BSDismemberSkinInstance"]      = {&construct <BSDismemberSkinInstance>     , RC_BSDismemberSkinInstance    };
+    factory["NiControllerManager"]          = {&construct <NiControllerManager>         , RC_NiControllerManager        };
     return factory;
 }
 
diff --git a/components/nif/record.hpp b/components/nif/record.hpp
index 23a1a6df2b..0b9b2dc998 100644
--- a/components/nif/record.hpp
+++ b/components/nif/record.hpp
@@ -129,7 +129,8 @@ enum RecordType
   RC_BSFurnitureMarker,
   RC_NiCollisionObject,
   RC_bhkCollisionObject,
-  RC_BSDismemberSkinInstance
+  RC_BSDismemberSkinInstance,
+  RC_NiControllerManager
 };
 
 /// Base class for all records

From 9880c43c86b699f30eef2cc78143162d34cff70c Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Wed, 10 Nov 2021 19:58:06 +0300
Subject: [PATCH 1685/2859] Add specular strength shader parameter

---
 apps/openmw/mwrender/objectpaging.cpp     | 1 +
 apps/openmw/mwrender/renderingmanager.cpp | 1 +
 components/nifosg/nifloader.cpp           | 3 +++
 components/resource/scenemanager.cpp      | 1 +
 files/shaders/nv_default_fragment.glsl    | 3 ++-
 files/shaders/objects_fragment.glsl       | 2 ++
 6 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index 4e21d33475..90069c2d8d 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -359,6 +359,7 @@ namespace MWRender
             stateset->setAttribute(m);
             stateset->addUniform(new osg::Uniform("colorMode", 0));
             stateset->addUniform(new osg::Uniform("emissiveMult", 1.f));
+            stateset->addUniform(new osg::Uniform("specStrength", 1.f));
             node.setStateSet(stateset);
         }
     };
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 06bfb3582f..e0cd3f713a 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -500,6 +500,7 @@ namespace MWRender
         defaultMat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 0.f));
         sceneRoot->getOrCreateStateSet()->setAttribute(defaultMat);
         sceneRoot->getOrCreateStateSet()->addUniform(new osg::Uniform("emissiveMult", 1.f));
+        sceneRoot->getOrCreateStateSet()->addUniform(new osg::Uniform("specStrength", 1.f));
 
         mFog.reset(new FogManager());
 
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index a745d50eda..e46e2d934b 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -1932,6 +1932,7 @@ namespace NifOsg
 
             int lightmode = 1;
             float emissiveMult = 1.f;
+            float specStrength = 1.f;
 
             for (const Nif::Property* property : properties)
             {
@@ -2081,6 +2082,8 @@ namespace NifOsg
             stateset->setAttributeAndModes(mat, osg::StateAttribute::ON);
             if (emissiveMult != 1.f)
                 stateset->addUniform(new osg::Uniform("emissiveMult", emissiveMult));
+            if (specStrength != 1.f)
+                stateset->addUniform(new osg::Uniform("specStrength", specStrength));
         }
 
     };
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 8a88f7def9..f6c041a879 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -524,6 +524,7 @@ namespace Resource
                 result.getNode()->accept(colladaAlphaTrickVisitor);
 
                 result.getNode()->getOrCreateStateSet()->addUniform(new osg::Uniform("emissiveMult", 1.f));
+                result.getNode()->getOrCreateStateSet()->addUniform(new osg::Uniform("specStrength", 1.f));
                 result.getNode()->getOrCreateStateSet()->addUniform(new osg::Uniform("envMapColor", osg::Vec4f(1,1,1,1)));
                 result.getNode()->getOrCreateStateSet()->addUniform(new osg::Uniform("useFalloff", false));
             }
diff --git a/files/shaders/nv_default_fragment.glsl b/files/shaders/nv_default_fragment.glsl
index 17204534e3..ff81a2b94d 100644
--- a/files/shaders/nv_default_fragment.glsl
+++ b/files/shaders/nv_default_fragment.glsl
@@ -39,6 +39,7 @@ varying vec3 passNormal;
 #include "alpha.glsl"
 
 uniform float emissiveMult;
+uniform float specStrength;
 
 void main()
 {
@@ -80,7 +81,7 @@ void main()
     gl_FragData[0].xyz *= lighting;
 
     float shininess = gl_FrontMaterial.shininess;
-    vec3 matSpec = getSpecularColor().xyz;
+    vec3 matSpec = getSpecularColor().xyz * specStrength;
 #if @normalMap
     matSpec *= normalTex.a;
 #endif
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index d750a4dd1f..99ed44919b 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -71,6 +71,7 @@ centroid varying vec3 shadowDiffuseLighting;
 #else
 uniform float emissiveMult;
 #endif
+uniform float specStrength;
 varying vec3 passViewPos;
 varying vec3 passNormal;
 
@@ -204,6 +205,7 @@ void main()
     vec3 matSpec = getSpecularColor().xyz;
 #endif
 
+    matSpec *= specStrength;
     if (matSpec != vec3(0.0))
     {
 #if (!@normalMap && !@parallax && !@forcePPL)

From 6de9b49d3dfdaf6934f6abf1a1f5f839109452c4 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Wed, 10 Nov 2021 19:59:13 +0300
Subject: [PATCH 1686/2859] Remove an empty line

---
 components/nif/physics.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/nif/physics.hpp b/components/nif/physics.hpp
index e64eb349eb..a8f053b3be 100644
--- a/components/nif/physics.hpp
+++ b/components/nif/physics.hpp
@@ -38,7 +38,6 @@ struct bhkCollisionObject : public NiCollisionObject
     }
 };
 
-
 // Abstract Havok shape info record
 struct bhkWorldObject : public Record
 {

From 6e5b45453d919a0e952a806f362a79b83c7990f5 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Wed, 10 Nov 2021 20:16:05 +0300
Subject: [PATCH 1687/2859] some physics stuff idk

---
 components/nif/physics.cpp | 22 ++++++++++++++++++++++
 components/nif/physics.hpp | 28 ++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+)

diff --git a/components/nif/physics.cpp b/components/nif/physics.cpp
index fbbc459ab2..fddaaa8cc1 100644
--- a/components/nif/physics.cpp
+++ b/components/nif/physics.cpp
@@ -29,4 +29,26 @@ namespace Nif
         shape.post(nif);
     }
 
+    void bhkEntity::read(NIFStream *nif)
+    {
+        bhkWorldObject::read(nif);
+        responseType = static_cast<hkResponseType>(nif->getChar());
+        nif->skip(1); // Unused
+        processContactDelay = nif->getUShort();
+    }
+
+    void HavokMaterial::read(NIFStream *nif)
+    {
+        if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB_OLD)
+            nif->skip(4); // Unknown
+        material = nif->getUInt();
+    }
+
+    void hkSubPartData::read(NIFStream *nif)
+    {
+        havokFilter = nif->getUInt();
+        numVertices = nif->getUInt();
+        material.read(nif);
+    }
+
 } // Namespace
\ No newline at end of file
diff --git a/components/nif/physics.hpp b/components/nif/physics.hpp
index a8f053b3be..ae7da6d141 100644
--- a/components/nif/physics.hpp
+++ b/components/nif/physics.hpp
@@ -57,5 +57,33 @@ struct bhkWorldObject : public Record
 
 struct bhkShape : public Record {};
 
+enum class hkResponseType : uint8_t
+{
+    Invalid = 0,
+    SimpleContact = 1,
+    Reporting = 2,
+    None = 3
+};
+
+struct bhkEntity : public bhkWorldObject
+{
+    hkResponseType responseType;
+    unsigned short processContactDelay;
+    void read(NIFStream *nif) override;
+};
+
+struct HavokMaterial
+{
+    unsigned int material;
+    void read(NIFStream *nif);
+};
+
+struct hkSubPartData
+{
+    HavokMaterial material;
+    unsigned int numVertices, havokFilter;
+    void read(NIFStream *nif);
+};
+
 } // Namespace
 #endif
\ No newline at end of file

From cc4c96d0f1358c9c8cc745f2354c817a858d172f Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Wed, 10 Nov 2021 22:50:01 +0300
Subject: [PATCH 1688/2859] Follow global naming convention for new records

---
 components/nif/controller.cpp |  2 +-
 components/nif/controller.hpp |  2 +-
 components/nif/extra.cpp      | 22 ++++++++---------
 components/nif/extra.hpp      | 17 ++++++-------
 components/nif/physics.cpp    | 30 +++++++++++------------
 components/nif/physics.hpp    | 45 ++++++++++++++++++-----------------
 6 files changed, 60 insertions(+), 58 deletions(-)

diff --git a/components/nif/controller.cpp b/components/nif/controller.cpp
index 513c781c58..16e6b5e40f 100644
--- a/components/nif/controller.cpp
+++ b/components/nif/controller.cpp
@@ -273,7 +273,7 @@ namespace Nif
     void NiControllerManager::read(NIFStream *nif)
     {
         Controller::read(nif);
-        cumulative = nif->getBoolean();
+        mCumulative = nif->getBoolean();
         unsigned int numSequences = nif->getUInt();
         nif->skip(4 * numSequences); // Controller sequences
         nif->skip(4); // Object palette
diff --git a/components/nif/controller.hpp b/components/nif/controller.hpp
index 15a2937b80..210eaab217 100644
--- a/components/nif/controller.hpp
+++ b/components/nif/controller.hpp
@@ -186,7 +186,7 @@ struct bhkBlendController : public Controller
 
 struct NiControllerManager : public Controller
 {
-    bool cumulative;
+    bool mCumulative;
     void read(NIFStream *nif) override;
 };
 
diff --git a/components/nif/extra.cpp b/components/nif/extra.cpp
index 1401291a0f..04217995ac 100644
--- a/components/nif/extra.cpp
+++ b/components/nif/extra.cpp
@@ -96,18 +96,18 @@ void BSBound::read(NIFStream *nif)
 
 void BSFurnitureMarker::LegacyFurniturePosition::read(NIFStream *nif)
 {
-    offset = nif->getVector3();
-    orientation = nif->getUShort();
-    positionRef = nif->getChar();
+    mOffset = nif->getVector3();
+    mOrientation = nif->getUShort();
+    mPositionRef = nif->getChar();
     nif->skip(1); // Position ref 2
 }
 
 void BSFurnitureMarker::FurniturePosition::read(NIFStream *nif)
 {
-    offset = nif->getVector3();
-    heading = nif->getFloat();
-    type = nif->getUShort();
-    entryPoint = nif->getUShort();
+    mOffset = nif->getVector3();
+    mHeading = nif->getFloat();
+    mType = nif->getUShort();
+    mEntryPoint = nif->getUShort();
 }
 
 void BSFurnitureMarker::read(NIFStream *nif)
@@ -116,14 +116,14 @@ void BSFurnitureMarker::read(NIFStream *nif)
     unsigned int num = nif->getUInt();
     if (nif->getBethVersion() <= NIFFile::BethVersion::BETHVER_FO3)
     {
-        legacyMarkers.resize(num);
-        for (auto& marker : legacyMarkers)
+        mLegacyMarkers.resize(num);
+        for (auto& marker : mLegacyMarkers)
             marker.read(nif);
     }
     else
     {
-        markers.resize(num);
-        for (auto& marker : markers)
+        mMarkers.resize(num);
+        for (auto& marker : mMarkers)
             marker.read(nif);
     }
 }
diff --git a/components/nif/extra.hpp b/components/nif/extra.hpp
index bbc5c216d8..8eb14f9b01 100644
--- a/components/nif/extra.hpp
+++ b/components/nif/extra.hpp
@@ -124,22 +124,23 @@ struct BSFurnitureMarker : public Extra
 {
     struct LegacyFurniturePosition
     {
-        osg::Vec3f offset;
-        uint16_t orientation;
-        uint8_t positionRef;
+        osg::Vec3f mOffset;
+        uint16_t mOrientation;
+        uint8_t mPositionRef;
         void read(NIFStream *nif);
     };
 
     struct FurniturePosition
     {
-        osg::Vec3f offset;
-        float heading;
-        uint16_t type, entryPoint;
+        osg::Vec3f mOffset;
+        float mHeading;
+        uint16_t mType;
+        uint16_t mEntryPoint;
         void read(NIFStream *nif);
     };
 
-    std::vector<LegacyFurniturePosition> legacyMarkers;
-    std::vector<FurniturePosition> markers;
+    std::vector<LegacyFurniturePosition> mLegacyMarkers;
+    std::vector<FurniturePosition> mMarkers;
 
     void read(NIFStream *nif) override;
 };
diff --git a/components/nif/physics.cpp b/components/nif/physics.cpp
index fddaaa8cc1..992a56c9b7 100644
--- a/components/nif/physics.cpp
+++ b/components/nif/physics.cpp
@@ -6,49 +6,49 @@ namespace Nif
     void bhkCollisionObject::read(NIFStream *nif)
     {
         NiCollisionObject::read(nif);
-        flags = nif->getUShort();
-        body.read(nif);
+        mFlags = nif->getUShort();
+        mBody.read(nif);
     }
 
     void bhkWorldObject::read(NIFStream *nif)
     {
-        shape.read(nif);
+        mShape.read(nif);
         if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB_OLD)
             nif->skip(4); // Unknown
-        flags = nif->getUInt();
+        mFlags = nif->getUInt();
         nif->skip(4); // Unused
-        worldObjectInfo.phaseType = nif->getChar();
+        mWorldObjectInfo.mPhaseType = nif->getChar();
         nif->skip(3); // Unused
-        worldObjectInfo.data = nif->getUInt();
-        worldObjectInfo.size = nif->getUInt();
-        worldObjectInfo.capacityAndFlags = nif->getUInt();
+        mWorldObjectInfo.mData = nif->getUInt();
+        mWorldObjectInfo.mSize = nif->getUInt();
+        mWorldObjectInfo.mCapacityAndFlags = nif->getUInt();
     }
 
     void bhkWorldObject::post(NIFFile *nif)
     {
-        shape.post(nif);
+        mShape.post(nif);
     }
 
     void bhkEntity::read(NIFStream *nif)
     {
         bhkWorldObject::read(nif);
-        responseType = static_cast<hkResponseType>(nif->getChar());
+        mResponseType = static_cast<hkResponseType>(nif->getChar());
         nif->skip(1); // Unused
-        processContactDelay = nif->getUShort();
+        mProcessContactDelay = nif->getUShort();
     }
 
     void HavokMaterial::read(NIFStream *nif)
     {
         if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB_OLD)
             nif->skip(4); // Unknown
-        material = nif->getUInt();
+        mMaterial = nif->getUInt();
     }
 
     void hkSubPartData::read(NIFStream *nif)
     {
-        havokFilter = nif->getUInt();
-        numVertices = nif->getUInt();
-        material.read(nif);
+        mHavokFilter = nif->getUInt();
+        mNumVertices = nif->getUInt();
+        mHavokMaterial.read(nif);
     }
 
 } // Namespace
\ No newline at end of file
diff --git a/components/nif/physics.hpp b/components/nif/physics.hpp
index ae7da6d141..ca31512c71 100644
--- a/components/nif/physics.hpp
+++ b/components/nif/physics.hpp
@@ -12,45 +12,45 @@ namespace Nif
 struct NiCollisionObject : public Record
 {
     // The node that references this object
-    NodePtr target;
+    NodePtr mTarget;
 
     void read(NIFStream *nif) override
     {
-        target.read(nif);
+        mTarget.read(nif);
     }
     void post(NIFFile *nif) override
     {
-        target.post(nif);
+        mTarget.post(nif);
     }
 };
 
 // Bethesda Havok-specific collision object
 struct bhkCollisionObject : public NiCollisionObject
 {
-    unsigned short flags;
-    CollisionBodyPtr body;
+    unsigned short mFlags;
+    CollisionBodyPtr mBody;
 
     void read(NIFStream *nif) override;
     void post(NIFFile *nif) override
     {
         NiCollisionObject::post(nif);
-        body.post(nif);
+        mBody.post(nif);
     }
 };
 
 // Abstract Havok shape info record
 struct bhkWorldObject : public Record
 {
-    bhkShapePtr shape;
-    unsigned int flags; // Havok layer type, collision filter flags and group
+    bhkShapePtr mShape;
+    unsigned int mFlags; // Havok layer type, collision filter flags and group
     struct WorldObjectInfo
     {
-        unsigned char phaseType;
-        unsigned int data;
-        unsigned int size;
-        unsigned int capacityAndFlags;
+        unsigned char mPhaseType;
+        unsigned int mData;
+        unsigned int mSize;
+        unsigned int mCapacityAndFlags;
     };
-    WorldObjectInfo worldObjectInfo;
+    WorldObjectInfo mWorldObjectInfo;
     void read(NIFStream *nif) override;
     void post(NIFFile *nif) override;
 };
@@ -59,29 +59,30 @@ struct bhkShape : public Record {};
 
 enum class hkResponseType : uint8_t
 {
-    Invalid = 0,
-    SimpleContact = 1,
-    Reporting = 2,
-    None = 3
+    Response_Invalid = 0,
+    Response_SimpleContact = 1,
+    Response_Reporting = 2,
+    Response_None = 3
 };
 
 struct bhkEntity : public bhkWorldObject
 {
-    hkResponseType responseType;
-    unsigned short processContactDelay;
+    hkResponseType mResponseType;
+    unsigned short mProcessContactDelay;
     void read(NIFStream *nif) override;
 };
 
 struct HavokMaterial
 {
-    unsigned int material;
+    unsigned int mMaterial;
     void read(NIFStream *nif);
 };
 
 struct hkSubPartData
 {
-    HavokMaterial material;
-    unsigned int numVertices, havokFilter;
+    HavokMaterial mHavokMaterial;
+    unsigned int mNumVertices;
+    unsigned int mHavokFilter;
     void read(NIFStream *nif);
 };
 

From 512d64e514967498a2cc2f61448880c754c5ef2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Mocquillon?= <cedric.mocquillon@gmail.com>
Date: Wed, 10 Nov 2021 23:06:35 +0100
Subject: [PATCH 1689/2859] Extract correctSoundPath method to avoid code
 duplication. Add unit test for the new method

---
 apps/openmw/mwsound/openal_output.cpp         | 13 +--
 apps/openmw/mwsound/soundmanagerimp.cpp       | 15 +---
 apps/openmw_test_suite/CMakeLists.txt         |  1 +
 .../misc/test_resourcehelpers.cpp             | 80 +++++++++++++++++++
 components/misc/resourcehelpers.cpp           | 22 ++++-
 components/misc/resourcehelpers.hpp           |  2 +
 6 files changed, 106 insertions(+), 27 deletions(-)
 create mode 100644 apps/openmw_test_suite/misc/test_resourcehelpers.cpp

diff --git a/apps/openmw/mwsound/openal_output.cpp b/apps/openmw/mwsound/openal_output.cpp
index 4615fed8c1..b3cc81b803 100644
--- a/apps/openmw/mwsound/openal_output.cpp
+++ b/apps/openmw/mwsound/openal_output.cpp
@@ -13,6 +13,7 @@
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/constants.hpp>
+#include <components/misc/resourcehelpers.hpp>
 #include <components/vfs/manager.hpp>
 
 #include "openal_output.hpp"
@@ -954,17 +955,7 @@ std::pair<Sound_Handle,size_t> OpenAL_Output::loadSound(const std::string &fname
     try
     {
         DecoderPtr decoder = mManager.getDecoder();
-        // Workaround: Bethesda at some point converted some of the files to mp3, but the references were kept as .wav.
-        if(decoder->mResourceMgr->exists(fname))
-            decoder->open(fname);
-        else
-        {
-            std::string file = fname;
-            std::string::size_type pos = file.rfind('.');
-            if(pos != std::string::npos)
-                file = file.substr(0, pos)+".mp3";
-            decoder->open(file);
-        }
+        decoder->open(Misc::ResourceHelpers::correctSoundPath(fname, decoder->mResourceMgr));
 
         ChannelConfig chans;
         SampleType type;
diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index 758ddfdc56..5399b95c97 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -6,6 +6,7 @@
 
 #include <osg/Matrixf>
 
+#include <components/misc/resourcehelpers.hpp>
 #include <components/misc/rng.hpp>
 #include <components/debug/debuglog.hpp>
 #include <components/vfs/manager.hpp>
@@ -145,19 +146,7 @@ namespace MWSound
         try
         {
             DecoderPtr decoder = getDecoder();
-
-            // Workaround: Bethesda at some point converted some of the files to mp3, but the references were kept as .wav.
-            if(mVFS->exists(voicefile))
-                decoder->open(voicefile);
-            else
-            {
-                std::string file = voicefile;
-                std::string::size_type pos = file.rfind('.');
-                if(pos != std::string::npos)
-                    file = file.substr(0, pos)+".mp3";
-                decoder->open(file);
-            }
-
+            decoder->open(Misc::ResourceHelpers::correctSoundPath(voicefile, decoder->mResourceMgr));
             return decoder;
         }
         catch(std::exception &e)
diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index bf235331cf..a4e9f8323c 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -26,6 +26,7 @@ if (GTEST_FOUND AND GMOCK_FOUND)
 
         misc/test_stringops.cpp
         misc/test_endianness.cpp
+        misc/test_resourcehelpers.cpp
         misc/progressreporter.cpp
         misc/compression.cpp
 
diff --git a/apps/openmw_test_suite/misc/test_resourcehelpers.cpp b/apps/openmw_test_suite/misc/test_resourcehelpers.cpp
new file mode 100644
index 0000000000..ee062c6da8
--- /dev/null
+++ b/apps/openmw_test_suite/misc/test_resourcehelpers.cpp
@@ -0,0 +1,80 @@
+#include <gtest/gtest.h>
+#include "components/misc/resourcehelpers.hpp"
+#include "../lua/testing_util.hpp"
+
+namespace
+{
+    using namespace Misc::ResourceHelpers;
+    TEST(CorrectSoundPath, wav_files_not_overridden_with_mp3_in_vfs_are_not_corrected)
+    {
+        std::unique_ptr<VFS::Manager> mVFS = createTestVFS({
+            {"sound/bar.wav", nullptr}
+        });
+        EXPECT_EQ(correctSoundPath("sound/bar.wav", mVFS.get()), "sound/bar.wav");
+    }
+
+    TEST(CorrectSoundPath, wav_files_overridden_with_mp3_in_vfs_are_corrected)
+    {
+        std::unique_ptr<VFS::Manager> mVFS = createTestVFS({
+            {"sound/foo.mp3", nullptr}
+        });
+        EXPECT_EQ(correctSoundPath("sound/foo.wav", mVFS.get()), "sound/foo.mp3");
+    }
+
+    TEST(CorrectSoundPath, corrected_path_does_not_check_existence_in_vfs)
+    {
+        std::unique_ptr<VFS::Manager> mVFS = createTestVFS({
+        });
+        EXPECT_EQ(correctSoundPath("sound/foo.wav", mVFS.get()), "sound/foo.mp3");
+    }
+
+    TEST(CorrectSoundPath, correct_path_normalize_paths)
+    {
+        std::unique_ptr<VFS::Manager> mVFS = createTestVFS({
+        });
+        EXPECT_EQ(correctSoundPath("sound\\foo.wav", mVFS.get()), "sound/foo.mp3");
+        EXPECT_EQ(correctSoundPath("SOUND\\foo.WAV", mVFS.get()), "SOUND/foo.mp3");
+    }
+
+    namespace
+    {
+        std::string checkChangeExtensionToDds(std::string path)
+        {
+            changeExtensionToDds(path);
+            return path;
+        }
+    }
+
+    TEST(ChangeExtensionToDds, original_extension_with_same_size_as_dds)
+    {
+        EXPECT_EQ(checkChangeExtensionToDds("texture/bar.tga"), "texture/bar.dds");
+    }
+
+    TEST(ChangeExtensionToDds, original_extension_greater_than_dds)
+    {
+        EXPECT_EQ(checkChangeExtensionToDds("texture/bar.jpeg"), "texture/bar.dds");
+    }
+
+    TEST(ChangeExtensionToDds, original_extension_smaller_than_dds)
+    {
+        EXPECT_EQ(checkChangeExtensionToDds("texture/bar.xx"), "texture/bar.dds");
+    }
+
+    TEST(ChangeExtensionToDds, does_not_change_dds_extension)
+    {
+        std::string path = "texture/bar.dds";
+        EXPECT_FALSE(changeExtensionToDds(path));
+    }
+
+    TEST(ChangeExtensionToDds, does_not_change_when_no_extension)
+    {
+        std::string path = "texture/bar";
+        EXPECT_FALSE(changeExtensionToDds(path));
+    }
+
+    TEST(ChangeExtensionToDds, change_when_there_is_an_extension)
+    {
+        std::string path = "texture/bar.jpeg";
+        EXPECT_TRUE(changeExtensionToDds(path));
+    }
+}
diff --git a/components/misc/resourcehelpers.cpp b/components/misc/resourcehelpers.cpp
index 610c7a790c..0095568653 100644
--- a/components/misc/resourcehelpers.cpp
+++ b/components/misc/resourcehelpers.cpp
@@ -30,17 +30,22 @@ namespace
 
 }
 
-bool Misc::ResourceHelpers::changeExtensionToDds(std::string &path)
+bool changeExtension(std::string &path, std::string_view ext)
 {
     std::string::size_type pos = path.rfind('.');
-    if(pos != std::string::npos && path.compare(pos, path.length() - pos, ".dds") != 0)
+    if(pos != std::string::npos && path.compare(pos, path.length() - pos, ext) != 0)
     {
-        path.replace(pos, path.length(), ".dds");
+        path.replace(pos, path.length(), ext);
         return true;
     }
     return false;
 }
 
+bool Misc::ResourceHelpers::changeExtensionToDds(std::string &path)
+{
+    return changeExtension(path, ".dds");
+}
+
 std::string Misc::ResourceHelpers::correctResourcePath(const std::string &topLevelDirectory, const std::string &resPath, const VFS::Manager* vfs)
 {
     /* Bethesda at some point converted all their BSA
@@ -140,6 +145,17 @@ std::string Misc::ResourceHelpers::correctActorModelPath(const std::string &resP
     return mdlname;
 }
 
+std::string Misc::ResourceHelpers::correctSoundPath(const std::string& resPath, const VFS::Manager* vfs)
+{
+    std::string sound = resPath;
+    // Workaround: Bethesda at some point converted some of the files to mp3, but the references were kept as .wav.
+    if (!vfs->exists(sound))
+        changeExtension(sound, ".mp3");
+
+    return vfs->normalizeFilename(sound);
+
+}
+
 bool Misc::ResourceHelpers::isHiddenMarker(std::string_view id)
 {
     return Misc::StringUtils::ciEqual(id, "prisonmarker") || Misc::StringUtils::ciEqual(id, "divinemarker") || Misc::StringUtils::ciEqual(id, "templemarker") || Misc::StringUtils::ciEqual(id, "northmarker");
diff --git a/components/misc/resourcehelpers.hpp b/components/misc/resourcehelpers.hpp
index 9e87954e9d..4ea5f5e121 100644
--- a/components/misc/resourcehelpers.hpp
+++ b/components/misc/resourcehelpers.hpp
@@ -25,6 +25,8 @@ namespace Misc
         /// Use "xfoo.nif" instead of "foo.nif" if available
         std::string correctActorModelPath(const std::string &resPath, const VFS::Manager* vfs);
 
+        std::string correctSoundPath(const std::string& resPath, const VFS::Manager* vfs);
+
         /// marker objects that have a hardcoded function in the game logic, should be hidden from the player
         bool isHiddenMarker(std::string_view id);
     }

From d7041613ef03ec4ca491d28686893ea9c808dfce Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 10 Nov 2021 20:24:17 +0100
Subject: [PATCH 1690/2859] Store BulletShape source file name and content hash

---
 .../nifloader/testbulletnifloader.cpp         |  6 ++++
 components/CMakeLists.txt                     |  4 +--
 components/files/hash.cpp                     | 36 +++++++++++++++++++
 components/files/hash.hpp                     | 13 +++++++
 components/misc/osguservalues.cpp             |  6 ++++
 components/misc/osguservalues.hpp             | 14 ++++++++
 components/nif/niffile.cpp                    |  4 +++
 components/nif/niffile.hpp                    |  5 +++
 components/nifbullet/bulletnifloader.cpp      |  3 ++
 components/nifosg/nifloader.cpp               |  5 +++
 components/resource/bulletshape.cpp           |  2 ++
 components/resource/bulletshape.hpp           | 10 ++++++
 components/resource/bulletshapemanager.cpp    | 12 +++++++
 components/resource/scenemanager.cpp          | 14 ++++++--
 14 files changed, 130 insertions(+), 4 deletions(-)
 create mode 100644 components/files/hash.cpp
 create mode 100644 components/files/hash.hpp
 create mode 100644 components/misc/osguservalues.cpp
 create mode 100644 components/misc/osguservalues.hpp

diff --git a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
index b37a8cd6c0..92aece9075 100644
--- a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
+++ b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
@@ -335,6 +335,7 @@ namespace
         MOCK_METHOD(void, setUseSkinning, (bool), (override));
         MOCK_METHOD(bool, getUseSkinning, (), (const, override));
         MOCK_METHOD(std::string, getFilename, (), (const, override));
+        MOCK_METHOD(std::uint64_t, getHash, (), (const, override));
         MOCK_METHOD(unsigned int, getVersion, (), (const, override));
         MOCK_METHOD(unsigned int, getUserVersion, (), (const, override));
         MOCK_METHOD(unsigned int, getBethVersion, (), (const, override));
@@ -381,6 +382,7 @@ namespace
             ),
             btVector3(4, 8, 12)
         };
+        const std::uint64_t mHash = 42;
 
         TestBulletNifLoader()
         {
@@ -411,6 +413,8 @@ namespace
             mNiTriStripsData.vertices = {osg::Vec3f(0, 0, 0), osg::Vec3f(1, 0, 0), osg::Vec3f(1, 1, 0), osg::Vec3f(0, 1, 0)};
             mNiTriStripsData.strips = {{0, 1, 2, 3}};
             mNiTriStrips.data = Nif::NiGeometryDataPtr(&mNiTriStripsData);
+
+            EXPECT_CALL(mNifFile, getHash()).WillOnce(Return(mHash));
         }
     };
 
@@ -423,6 +427,8 @@ namespace
         Resource::BulletShape expected;
 
         EXPECT_EQ(*result, expected);
+        EXPECT_EQ(result->mFileName, "test.nif");
+        EXPECT_EQ(result->mFileHash, mHash);
     }
 
     TEST_F(TestBulletNifLoader, should_ignore_nullptr_root)
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 0b3c95ff45..5a0f4cd4a2 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -93,7 +93,7 @@ add_component_dir (esmterrain
 
 add_component_dir (misc
     constants utf8stream stringops resourcehelpers rng messageformatparser weakcache thread
-    compression
+    compression osguservalues
     )
 
 add_component_dir (debug
@@ -106,7 +106,7 @@ IF(NOT WIN32 AND NOT APPLE)
 ENDIF()
 add_component_dir (files
     linuxpath androidpath windowspath macospath fixedpath multidircollection collections configurationmanager escape
-    lowlevelfile constrainedfilestream memorystream
+    lowlevelfile constrainedfilestream memorystream hash
     )
 
 add_component_dir (compiler
diff --git a/components/files/hash.cpp b/components/files/hash.cpp
new file mode 100644
index 0000000000..91af1e9283
--- /dev/null
+++ b/components/files/hash.cpp
@@ -0,0 +1,36 @@
+#include "hash.hpp"
+
+#include <components/misc/hash.hpp>
+
+#include <cstdint>
+#include <functional>
+#include <istream>
+#include <string>
+
+namespace Files
+{
+    std::uint64_t getHash(const std::string& fileName, std::istream& stream)
+    {
+        std::uint64_t hash = std::hash<std::string> {}(fileName);
+        try
+        {
+            const auto start = stream.tellg();
+            const auto exceptions = stream.exceptions();
+            stream.exceptions(std::ios_base::badbit);
+            while (stream)
+            {
+                std::uint64_t value = 0;
+                stream.read(reinterpret_cast<char*>(&value), sizeof(value));
+                Misc::hashCombine(hash, value);
+            }
+            stream.exceptions(exceptions);
+            stream.clear();
+            stream.seekg(start);
+        }
+        catch (const std::exception& e)
+        {
+            throw std::runtime_error("Error while reading \"" + fileName + "\" to get hash: " + std::string(e.what()));
+        }
+        return hash;
+    }
+}
diff --git a/components/files/hash.hpp b/components/files/hash.hpp
new file mode 100644
index 0000000000..46784ee9be
--- /dev/null
+++ b/components/files/hash.hpp
@@ -0,0 +1,13 @@
+#ifndef COMPONENTS_FILES_HASH_H
+#define COMPONENTS_FILES_HASH_H
+
+#include <cstdint>
+#include <istream>
+#include <string>
+
+namespace Files
+{
+    std::uint64_t getHash(const std::string& fileName, std::istream& stream);
+}
+
+#endif
diff --git a/components/misc/osguservalues.cpp b/components/misc/osguservalues.cpp
new file mode 100644
index 0000000000..3bdd0d1848
--- /dev/null
+++ b/components/misc/osguservalues.cpp
@@ -0,0 +1,6 @@
+#include "osguservalues.hpp"
+
+namespace Misc
+{
+    const std::string OsgUserValues::sFileHash = "fileHash";
+}
diff --git a/components/misc/osguservalues.hpp b/components/misc/osguservalues.hpp
new file mode 100644
index 0000000000..022e81764f
--- /dev/null
+++ b/components/misc/osguservalues.hpp
@@ -0,0 +1,14 @@
+#ifndef OPENMW_COMPONENTS_MISC_OSGUSERVALUES_H
+#define OPENMW_COMPONENTS_MISC_OSGUSERVALUES_H
+
+#include <string>
+
+namespace Misc
+{
+    struct OsgUserValues
+    {
+        static const std::string sFileHash;
+    };
+}
+
+#endif
diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index 6863209988..b344553ea9 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -1,6 +1,8 @@
 #include "niffile.hpp"
 #include "effect.hpp"
 
+#include <components/files/hash.hpp>
+
 #include <array>
 #include <map>
 #include <sstream>
@@ -156,6 +158,8 @@ std::string NIFFile::printVersion(unsigned int version)
 
 void NIFFile::parse(Files::IStreamPtr stream)
 {
+    hash = Files::getHash(filename, *stream);
+
     NIFStream nif (this, stream);
 
     // Check the header string
diff --git a/components/nif/niffile.hpp b/components/nif/niffile.hpp
index 1ed7cbd5d8..eb851a74ff 100644
--- a/components/nif/niffile.hpp
+++ b/components/nif/niffile.hpp
@@ -34,6 +34,8 @@ struct File
 
     virtual std::string getFilename() const = 0;
 
+    virtual std::uint64_t getHash() const = 0;
+
     virtual unsigned int getVersion() const = 0;
 
     virtual unsigned int getUserVersion() const = 0;
@@ -50,6 +52,7 @@ class NIFFile final : public File
 
     /// File name, used for error messages and opening the file
     std::string filename;
+    std::uint64_t hash = 0;
 
     /// Record list
     std::vector<Record*> records;
@@ -141,6 +144,8 @@ public:
     /// Get the name of the file
     std::string getFilename() const override { return filename; }
 
+    std::uint64_t getHash() const override { return hash; }
+
     /// Get the version of the NIF format used
     unsigned int getVersion() const override { return ver; }
 
diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index 6678d8ff74..4be07525a6 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -166,6 +166,8 @@ osg::ref_ptr<Resource::BulletShape> BulletNifLoader::load(const Nif::File& nif)
     mStaticMesh.reset();
     mAvoidStaticMesh.reset();
 
+    mShape->mFileHash = nif.getHash();
+
     const size_t numRoots = nif.numRoots();
     std::vector<const Nif::Node*> roots;
     for (size_t i = 0; i < numRoots; ++i)
@@ -178,6 +180,7 @@ osg::ref_ptr<Resource::BulletShape> BulletNifLoader::load(const Nif::File& nif)
             roots.emplace_back(node);
     }
     const std::string filename = nif.getFilename();
+    mShape->mFileName = filename;
     if (roots.empty())
     {
         warn("Found no root nodes in NIF file " + filename);
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index a745d50eda..99590e7a2f 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -17,6 +17,7 @@
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/imagemanager.hpp>
 #include <components/sceneutil/util.hpp>
+#include <components/misc/osguservalues.hpp>
 
 // particle
 #include <osgParticle/ParticleSystem>
@@ -325,6 +326,10 @@ namespace NifOsg
             if (!textkeys->mTextKeys.empty())
                 created->getOrCreateUserDataContainer()->addUserObject(textkeys);
 
+            const std::uint64_t nifHash = nif->getHash();
+            created->setUserValue(Misc::OsgUserValues::sFileHash,
+                std::string(reinterpret_cast<const char*>(&nifHash), sizeof(nifHash)));
+
             return created;
         }
 
diff --git a/components/resource/bulletshape.cpp b/components/resource/bulletshape.cpp
index 52d639d272..74515691c6 100644
--- a/components/resource/bulletshape.cpp
+++ b/components/resource/bulletshape.cpp
@@ -74,6 +74,8 @@ BulletShape::BulletShape(const BulletShape &copy, const osg::CopyOp &copyop)
     , mAvoidCollisionShape(duplicateCollisionShape(copy.mAvoidCollisionShape.get()))
     , mCollisionBox(copy.mCollisionBox)
     , mAnimatedShapes(copy.mAnimatedShapes)
+    , mFileName(copy.mFileName)
+    , mFileHash(copy.mFileHash)
 {
 }
 
diff --git a/components/resource/bulletshape.hpp b/components/resource/bulletshape.hpp
index 7188165045..6dfa37aeda 100644
--- a/components/resource/bulletshape.hpp
+++ b/components/resource/bulletshape.hpp
@@ -12,6 +12,11 @@
 
 class btCollisionShape;
 
+namespace NifBullet
+{
+    class BulletNifLoader;
+}
+
 namespace Resource
 {
     struct DeleteCollisionShape
@@ -47,6 +52,9 @@ namespace Resource
         // we store the node's record index mapped to the child index of the shape in the btCompoundShape.
         std::map<int, int> mAnimatedShapes;
 
+        std::string mFileName;
+        std::uint64_t mFileHash = 0;
+
         void setLocalScaling(const btVector3& scale);
 
         bool isAnimated() const { return !mAnimatedShapes.empty(); }
@@ -60,6 +68,8 @@ namespace Resource
     public:
         BulletShapeInstance(osg::ref_ptr<const BulletShape> source);
 
+        const osg::ref_ptr<const BulletShape>& getSource() const { return mSource; }
+
     private:
         osg::ref_ptr<const BulletShape> mSource;
     };
diff --git a/components/resource/bulletshapemanager.cpp b/components/resource/bulletshapemanager.cpp
index 39ceb4fe7e..3803fbf669 100644
--- a/components/resource/bulletshapemanager.cpp
+++ b/components/resource/bulletshapemanager.cpp
@@ -1,5 +1,7 @@
 #include "bulletshapemanager.hpp"
 
+#include <cstring>
+
 #include <osg/NodeVisitor>
 #include <osg/TriangleFunctor>
 #include <osg/Transform>
@@ -10,6 +12,7 @@
 #include <components/misc/pathhelpers.hpp>
 #include <components/sceneutil/visitor.hpp>
 #include <components/vfs/manager.hpp>
+#include <components/misc/osguservalues.hpp>
 
 #include <components/nifbullet/bulletnifloader.hpp>
 
@@ -162,6 +165,15 @@ osg::ref_ptr<const BulletShape> BulletShapeManager::getShape(const std::string &
                 if (!shape)
                     return osg::ref_ptr<BulletShape>();
             }
+
+            if (shape != nullptr)
+            {
+                shape->mFileName = normalized;
+                std::string fileHash;
+                constNode->getUserValue(Misc::OsgUserValues::sFileHash, fileHash);
+                if (!fileHash.empty())
+                    std::memcpy(&shape->mFileHash, fileHash.data(), std::min(fileHash.size(), sizeof(shape->mFileHash)));
+            }
         }
 
         mCache->addEntryToObjectCache(normalized, shape);
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 8a88f7def9..dfcf384e1b 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -21,6 +21,7 @@
 #include <components/misc/pathhelpers.hpp>
 #include <components/misc/stringops.hpp>
 #include <components/misc/algorithm.hpp>
+#include <components/misc/osguservalues.hpp>
 
 #include <components/vfs/manager.hpp>
 
@@ -34,6 +35,8 @@
 #include <components/shader/shadervisitor.hpp>
 #include <components/shader/shadermanager.hpp>
 
+#include <components/files/hash.hpp>
+
 #include "imagemanager.hpp"
 #include "niffilemanager.hpp"
 #include "objectcache.hpp"
@@ -502,7 +505,10 @@ namespace Resource
             options->setReadFileCallback(new ImageReadCallback(imageManager));
             if (ext == "dae") options->setOptionString("daeUseSequencedTextureUnits");
 
-            osgDB::ReaderWriter::ReadResult result = reader->readNode(*vfs->get(normalizedFilename), options);
+            Files::IStreamPtr stream = vfs->get(normalizedFilename);
+            const std::uint64_t fileHash = Files::getHash(normalizedFilename, *stream);
+
+            osgDB::ReaderWriter::ReadResult result = reader->readNode(*stream, options);
             if (!result.success())
             {
                 std::stringstream errormsg;
@@ -528,8 +534,12 @@ namespace Resource
                 result.getNode()->getOrCreateStateSet()->addUniform(new osg::Uniform("useFalloff", false));
             }
 
+            auto node = result.getNode();
+
+            node->setUserValue(Misc::OsgUserValues::sFileHash,
+                std::string(reinterpret_cast<const char*>(&fileHash), sizeof(fileHash)));
 
-            return result.getNode();
+            return node;
         }
     }
 

From d28542748505608929c8cf0dd79c765e70005ef3 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sat, 6 Nov 2021 01:25:20 +0100
Subject: [PATCH 1691/2859] Update Lua package openmw.input

---
 apps/openmw/mwbase/inputmanager.hpp       |   6 +-
 apps/openmw/mwinput/bindingsmanager.cpp   |   9 +-
 apps/openmw/mwinput/bindingsmanager.hpp   |   3 +-
 apps/openmw/mwinput/controllermanager.cpp |  20 +++
 apps/openmw/mwinput/controllermanager.hpp |   7 +-
 apps/openmw/mwinput/controlswitch.cpp     |  14 ++-
 apps/openmw/mwinput/controlswitch.hpp     |   7 +-
 apps/openmw/mwinput/inputmanagerimp.cpp   |  12 +-
 apps/openmw/mwinput/inputmanagerimp.hpp   |   6 +-
 apps/openmw/mwinput/mousemanager.cpp      |   3 +-
 apps/openmw/mwinput/mousemanager.hpp      |   2 -
 apps/openmw/mwlua/inputbindings.cpp       | 144 +++++++++++++++++++++-
 apps/openmw/mwlua/luabindings.cpp         |   2 +-
 files/lua_api/openmw/input.lua            | 141 ++++++++++++++++++++-
 14 files changed, 337 insertions(+), 39 deletions(-)

diff --git a/apps/openmw/mwbase/inputmanager.hpp b/apps/openmw/mwbase/inputmanager.hpp
index 5ac7c218b5..d475d93cd1 100644
--- a/apps/openmw/mwbase/inputmanager.hpp
+++ b/apps/openmw/mwbase/inputmanager.hpp
@@ -49,8 +49,8 @@ namespace MWBase
             virtual void setGamepadGuiCursorEnabled(bool enabled) = 0;
             virtual void setAttemptJump(bool jumping) = 0;
 
-            virtual void toggleControlSwitch (const std::string& sw, bool value) = 0;
-            virtual bool getControlSwitch (const std::string& sw) = 0;
+            virtual void toggleControlSwitch(std::string_view sw, bool value) = 0;
+            virtual bool getControlSwitch(std::string_view sw) = 0;
 
             virtual std::string getActionDescription (int action) const = 0;
             virtual std::string getActionKeyBindingName (int action) const = 0;
@@ -58,8 +58,8 @@ namespace MWBase
             virtual bool actionIsActive(int action) const = 0;
 
             virtual float getActionValue(int action) const = 0;  // returns value in range [0, 1]
+            virtual bool isControllerButtonPressed(SDL_GameControllerButton button) const = 0;
             virtual float getControllerAxisValue(SDL_GameControllerAxis axis) const = 0;  // returns value in range [-1, 1]
-            virtual uint32_t getMouseButtonsState() const = 0;
             virtual int getMouseMoveX() const = 0;
             virtual int getMouseMoveY() const = 0;
 
diff --git a/apps/openmw/mwinput/bindingsmanager.cpp b/apps/openmw/mwinput/bindingsmanager.cpp
index ca7911ecc2..f3e1ba2c8d 100644
--- a/apps/openmw/mwinput/bindingsmanager.cpp
+++ b/apps/openmw/mwinput/bindingsmanager.cpp
@@ -653,14 +653,13 @@ namespace MWInput
         return mInputBinder->getKeyBinding(mInputBinder->getControl(actionId), ICS::Control::INCREASE);
     }
 
-    float BindingsManager::getControllerAxisValue(SDL_GameControllerAxis axis) const
+    SDL_GameController* BindingsManager::getControllerOrNull() const
     {
         const auto& controllers = mInputBinder->getJoystickInstanceMap();
         if (controllers.empty())
-            return 0;
-        SDL_GameController* cntrl = controllers.begin()->second;
-        constexpr int AXIS_MAX_ABSOLUTE_VALUE = 32768;
-        return SDL_GameControllerGetAxis(cntrl, axis) / static_cast<float>(AXIS_MAX_ABSOLUTE_VALUE);
+            return nullptr;
+        else
+            return controllers.begin()->second;
     }
 
     void BindingsManager::actionValueChanged(int action, float currentValue, float previousValue)
diff --git a/apps/openmw/mwinput/bindingsmanager.hpp b/apps/openmw/mwinput/bindingsmanager.hpp
index 5c653f0b3e..668cccd4ca 100644
--- a/apps/openmw/mwinput/bindingsmanager.hpp
+++ b/apps/openmw/mwinput/bindingsmanager.hpp
@@ -43,7 +43,8 @@ namespace MWInput
 
         bool actionIsActive(int id) const;
         float getActionValue(int id) const;  // returns value in range [0, 1]
-        float getControllerAxisValue(SDL_GameControllerAxis axis) const;  // returns value in range [-1, 1]
+
+        SDL_GameController* getControllerOrNull() const;
 
         void mousePressed(const SDL_MouseButtonEvent &evt, int deviceID);
         void mouseReleased(const SDL_MouseButtonEvent &arg, int deviceID);
diff --git a/apps/openmw/mwinput/controllermanager.cpp b/apps/openmw/mwinput/controllermanager.cpp
index bdb46e31a8..07aa89f554 100644
--- a/apps/openmw/mwinput/controllermanager.cpp
+++ b/apps/openmw/mwinput/controllermanager.cpp
@@ -403,4 +403,24 @@ namespace MWInput
 
         return true;
     }
+
+    float ControllerManager::getAxisValue(SDL_GameControllerAxis axis) const
+    {
+        SDL_GameController* cntrl = mBindingsManager->getControllerOrNull();
+        constexpr int AXIS_MAX_ABSOLUTE_VALUE = 32768;
+        if (cntrl)
+            return SDL_GameControllerGetAxis(cntrl, axis) / static_cast<float>(AXIS_MAX_ABSOLUTE_VALUE);
+        else
+            return 0;
+    }
+
+    bool ControllerManager::isButtonPressed(SDL_GameControllerButton button) const
+    {
+        SDL_GameController* cntrl = mBindingsManager->getControllerOrNull();
+        if (cntrl)
+            return SDL_GameControllerGetButton(cntrl, button) > 0;
+        else
+            return false;
+    }
+
 }
diff --git a/apps/openmw/mwinput/controllermanager.hpp b/apps/openmw/mwinput/controllermanager.hpp
index d8c62d57c4..1e8ef90d0e 100644
--- a/apps/openmw/mwinput/controllermanager.hpp
+++ b/apps/openmw/mwinput/controllermanager.hpp
@@ -34,12 +34,15 @@ namespace MWInput
         void processChangedSettings(const Settings::CategorySettingVector& changed);
 
         void setJoystickLastUsed(bool enabled) { mJoystickLastUsed = enabled; }
-        bool joystickLastUsed() { return mJoystickLastUsed; }
+        bool joystickLastUsed() const { return mJoystickLastUsed; }
 
         void setGuiCursorEnabled(bool enabled) { mGuiCursorEnabled = enabled; }
 
         void setGamepadGuiCursorEnabled(bool enabled) { mGamepadGuiCursorEnabled = enabled; }
-        bool gamepadGuiCursorEnabled() { return mGamepadGuiCursorEnabled; }
+        bool gamepadGuiCursorEnabled() const { return mGamepadGuiCursorEnabled; }
+
+        float getAxisValue(SDL_GameControllerAxis axis) const;  // returns value in range [-1, 1]
+        bool isButtonPressed(SDL_GameControllerButton button) const;
 
     private:
         // Return true if GUI consumes input.
diff --git a/apps/openmw/mwinput/controlswitch.cpp b/apps/openmw/mwinput/controlswitch.cpp
index f31744fca6..63d142434e 100644
--- a/apps/openmw/mwinput/controlswitch.cpp
+++ b/apps/openmw/mwinput/controlswitch.cpp
@@ -29,12 +29,15 @@ namespace MWInput
         mSwitches["vanitymode"]          = true;
     }
 
-    bool ControlSwitch::get(const std::string& key)
+    bool ControlSwitch::get(std::string_view key)
     {
-        return mSwitches[key];
+        auto it = mSwitches.find(key);
+        if (it == mSwitches.end())
+            throw std::runtime_error("Incorrect ControlSwitch: " + std::string(key));
+        return it->second;
     }
 
-    void ControlSwitch::set(const std::string& key, bool value)
+    void ControlSwitch::set(std::string_view key, bool value)
     {
         MWWorld::Player& player = MWBase::Environment::get().getWorld()->getPlayer();
 
@@ -59,7 +62,10 @@ namespace MWInput
         {
             MWBase::Environment::get().getWorld()->rotateObject(player.getPlayer(), osg::Vec3f());
         }
-        mSwitches[key] = value;
+        auto it = mSwitches.find(key);
+        if (it == mSwitches.end())
+            throw std::runtime_error("Incorrect ControlSwitch: " + std::string(key));
+        it->second = value;
     }
 
     void ControlSwitch::write(ESM::ESMWriter& writer, Loading::Listener& /*progress*/)
diff --git a/apps/openmw/mwinput/controlswitch.hpp b/apps/openmw/mwinput/controlswitch.hpp
index 38d01066bd..b4353c31f5 100644
--- a/apps/openmw/mwinput/controlswitch.hpp
+++ b/apps/openmw/mwinput/controlswitch.hpp
@@ -3,6 +3,7 @@
 
 #include <map>
 #include <string>
+#include <string_view>
 
 namespace ESM
 {
@@ -23,8 +24,8 @@ namespace MWInput
     public:
         ControlSwitch();
 
-        bool get(const std::string& key);
-        void set(const std::string& key, bool value);
+        bool get(std::string_view key);
+        void set(std::string_view key, bool value);
         void clear();
 
         void write(ESM::ESMWriter& writer, Loading::Listener& progress);
@@ -32,7 +33,7 @@ namespace MWInput
         int countSavedGameRecords() const;
 
     private:
-        std::map<std::string, bool> mSwitches;
+        std::map<std::string, bool, std::less<>> mSwitches;
     };
 }
 #endif
diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index 31f515afb0..cf1b0e936d 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -135,12 +135,12 @@ namespace MWInput
         mSensorManager->processChangedSettings(changed);
     }
 
-    bool InputManager::getControlSwitch(const std::string& sw)
+    bool InputManager::getControlSwitch(std::string_view sw)
     {
         return mControlSwitch->get(sw);
     }
 
-    void InputManager::toggleControlSwitch(const std::string& sw, bool value)
+    void InputManager::toggleControlSwitch(std::string_view sw, bool value)
     {
         mControlSwitch->set(sw, value);
     }
@@ -180,14 +180,14 @@ namespace MWInput
         return mBindingsManager->getActionValue(action);
     }
 
-    float InputManager::getControllerAxisValue(SDL_GameControllerAxis axis) const
+    bool InputManager::isControllerButtonPressed(SDL_GameControllerButton button) const
     {
-        return mBindingsManager->getControllerAxisValue(axis);
+        return mControllerManager->isButtonPressed(button);
     }
 
-    uint32_t InputManager::getMouseButtonsState() const
+    float InputManager::getControllerAxisValue(SDL_GameControllerAxis axis) const
     {
-        return mMouseManager->getButtonsState();
+        return mControllerManager->getAxisValue(axis);
     }
 
     int InputManager::getMouseMoveX() const
diff --git a/apps/openmw/mwinput/inputmanagerimp.hpp b/apps/openmw/mwinput/inputmanagerimp.hpp
index adb8319498..41478d5dcb 100644
--- a/apps/openmw/mwinput/inputmanagerimp.hpp
+++ b/apps/openmw/mwinput/inputmanagerimp.hpp
@@ -70,8 +70,8 @@ namespace MWInput
         void setGamepadGuiCursorEnabled(bool enabled) override;
         void setAttemptJump(bool jumping) override;
 
-        void toggleControlSwitch (const std::string& sw, bool value) override;
-        bool getControlSwitch (const std::string& sw) override;
+        void toggleControlSwitch(std::string_view sw, bool value) override;
+        bool getControlSwitch(std::string_view sw) override;
 
         std::string getActionDescription (int action) const override;
         std::string getActionKeyBindingName (int action) const override;
@@ -79,8 +79,8 @@ namespace MWInput
         bool actionIsActive(int action) const override;
 
         float getActionValue(int action) const override;
+        bool isControllerButtonPressed(SDL_GameControllerButton button) const override;
         float getControllerAxisValue(SDL_GameControllerAxis axis) const override;
-        uint32_t getMouseButtonsState() const override;
         int getMouseMoveX() const override;
         int getMouseMoveY() const override;
 
diff --git a/apps/openmw/mwinput/mousemanager.cpp b/apps/openmw/mwinput/mousemanager.cpp
index f2bd4505d1..6fbe8cfc98 100644
--- a/apps/openmw/mwinput/mousemanager.cpp
+++ b/apps/openmw/mwinput/mousemanager.cpp
@@ -34,7 +34,6 @@ namespace MWInput
         , mMouseWheel(0)
         , mMouseLookEnabled(false)
         , mGuiCursorEnabled(true)
-        , mButtonsState(0)
         , mMouseMoveX(0)
         , mMouseMoveY(0)
     {
@@ -199,7 +198,7 @@ namespace MWInput
 
     void MouseManager::update(float dt)
     {
-        mButtonsState = SDL_GetRelativeMouseState(&mMouseMoveX, &mMouseMoveY);
+        SDL_GetRelativeMouseState(&mMouseMoveX, &mMouseMoveY);
 
         if (!mMouseLookEnabled)
             return;
diff --git a/apps/openmw/mwinput/mousemanager.hpp b/apps/openmw/mwinput/mousemanager.hpp
index d5504c5f5a..16ea56d62b 100644
--- a/apps/openmw/mwinput/mousemanager.hpp
+++ b/apps/openmw/mwinput/mousemanager.hpp
@@ -38,7 +38,6 @@ namespace MWInput
         void setMouseLookEnabled(bool enabled) { mMouseLookEnabled = enabled; }
         void setGuiCursorEnabled(bool enabled) { mGuiCursorEnabled = enabled; }
 
-        uint32_t getButtonsState() const { return mButtonsState; }
         int getMouseMoveX() const { return mMouseMoveX; }
         int getMouseMoveY() const { return mMouseMoveY; }
 
@@ -58,7 +57,6 @@ namespace MWInput
         bool mMouseLookEnabled;
         bool mGuiCursorEnabled;
 
-        uint32_t mButtonsState;
         int mMouseMoveX;
         int mMouseMoveY;
     };
diff --git a/apps/openmw/mwlua/inputbindings.cpp b/apps/openmw/mwlua/inputbindings.cpp
index aaa00f3da9..b528d1b563 100644
--- a/apps/openmw/mwlua/inputbindings.cpp
+++ b/apps/openmw/mwlua/inputbindings.cpp
@@ -2,6 +2,7 @@
 
 #include <SDL_events.h>
 #include <SDL_gamecontroller.h>
+#include <SDL_mouse.h>
 
 #include "../mwbase/inputmanager.hpp"
 #include "../mwinput/actions.hpp"
@@ -18,9 +19,14 @@ namespace MWLua
     sol::table initInputPackage(const Context& context)
     {
         sol::usertype<SDL_Keysym> keyEvent = context.mLua->sol().new_usertype<SDL_Keysym>("KeyEvent");
-        keyEvent["symbol"] = sol::readonly_property([](const SDL_Keysym& e) { return std::string(1, static_cast<char>(e.sym)); });
-        keyEvent["code"] = sol::readonly_property([](const SDL_Keysym& e) -> int { return e.sym; });
-        keyEvent["modifiers"] = sol::readonly_property([](const SDL_Keysym& e) -> int { return e.mod; });
+        keyEvent["symbol"] = sol::readonly_property([](const SDL_Keysym& e)
+        {
+            if (e.sym > 0 && e.sym <= 255)
+                return std::string(1, static_cast<char>(e.sym));
+            else
+                return std::string();
+        });
+        keyEvent["code"] = sol::readonly_property([](const SDL_Keysym& e) -> int { return e.scancode; });
         keyEvent["withShift"] = sol::readonly_property([](const SDL_Keysym& e) -> bool { return e.mod & KMOD_SHIFT; });
         keyEvent["withCtrl"] = sol::readonly_property([](const SDL_Keysym& e) -> bool { return e.mod & KMOD_CTRL; });
         keyEvent["withAlt"] = sol::readonly_property([](const SDL_Keysym& e) -> bool { return e.mod & KMOD_ALT; });
@@ -31,9 +37,26 @@ namespace MWLua
 
         api["isIdle"] = [input]() { return input->isIdle(); };
         api["isActionPressed"] = [input](int action) { return input->actionIsActive(action); };
+        api["isKeyPressed"] = [input](SDL_Scancode code) -> bool
+        {
+            int maxCode;
+            const auto* state = SDL_GetKeyboardState(&maxCode);
+            if (code >= 0 && code < maxCode)
+                return state[code] != 0;
+            else
+                return false;
+        };
+        api["isShiftPressed"] = [input]() -> bool { return SDL_GetModState() & KMOD_SHIFT; };
+        api["isCtrlPressed"] = [input]() -> bool { return SDL_GetModState() & KMOD_CTRL; };
+        api["isAltPressed"] = [input]() -> bool { return SDL_GetModState() & KMOD_ALT; };
+        api["isSuperPressed"] = [input]() -> bool { return SDL_GetModState() & KMOD_GUI; };
+        api["isControllerButtonPressed"] = [input](int button)
+        {
+            return input->isControllerButtonPressed(static_cast<SDL_GameControllerButton>(button));
+        };
         api["isMouseButtonPressed"] = [input](int button) -> bool
         {
-            return input->getMouseButtonsState() & (1 << (button - 1));
+            return SDL_GetMouseState(nullptr, nullptr) & SDL_BUTTON(button);
         };
         api["getMouseMoveX"] = [input]() { return input->getMouseMoveX(); };
         api["getMouseMoveY"] = [input]() { return input->getMouseMoveY(); };
@@ -45,8 +68,8 @@ namespace MWLua
                 return input->getActionValue(axis - SDL_CONTROLLER_AXIS_MAX) * 2 - 1;
         };
 
-        api["getControlSwitch"] = [input](const std::string& key) { return input->getControlSwitch(key); };
-        api["setControlSwitch"] = [input](const std::string& key, bool v) { input->toggleControlSwitch(key, v); };
+        api["getControlSwitch"] = [input](std::string_view key) { return input->getControlSwitch(key); };
+        api["setControlSwitch"] = [input](std::string_view key, bool v) { input->toggleControlSwitch(key, v); };
 
         api["ACTION"] = LuaUtil::makeReadOnly(context.mLua->sol().create_table_with(
             "GameMenu", MWInput::A_GameMenu,
@@ -144,6 +167,115 @@ namespace MWLua
             "MoveLeftRight", SDL_CONTROLLER_AXIS_MAX + MWInput::A_MoveLeftRight
         ));
 
+        api["KEY"] = LuaUtil::makeReadOnly(context.mLua->sol().create_table_with(
+            "_0", SDL_SCANCODE_0,
+            "_1", SDL_SCANCODE_1,
+            "_2", SDL_SCANCODE_2,
+            "_3", SDL_SCANCODE_3,
+            "_4", SDL_SCANCODE_4,
+            "_5", SDL_SCANCODE_5,
+            "_6", SDL_SCANCODE_6,
+            "_7", SDL_SCANCODE_7,
+            "_8", SDL_SCANCODE_8,
+            "_9", SDL_SCANCODE_9,
+
+            "NP_0", SDL_SCANCODE_KP_0,
+            "NP_1", SDL_SCANCODE_KP_1,
+            "NP_2", SDL_SCANCODE_KP_2,
+            "NP_3", SDL_SCANCODE_KP_3,
+            "NP_4", SDL_SCANCODE_KP_4,
+            "NP_5", SDL_SCANCODE_KP_5,
+            "NP_6", SDL_SCANCODE_KP_6,
+            "NP_7", SDL_SCANCODE_KP_7,
+            "NP_8", SDL_SCANCODE_KP_8,
+            "NP_9", SDL_SCANCODE_KP_9,
+            "NP_Divide", SDL_SCANCODE_KP_DIVIDE,
+            "NP_Enter", SDL_SCANCODE_KP_ENTER,
+            "NP_Minus", SDL_SCANCODE_KP_MINUS,
+            "NP_Multiply", SDL_SCANCODE_KP_MULTIPLY,
+            "NP_Delete", SDL_SCANCODE_KP_PERIOD,
+            "NP_Plus", SDL_SCANCODE_KP_PLUS,
+
+            "F1", SDL_SCANCODE_F1,
+            "F2", SDL_SCANCODE_F2,
+            "F3", SDL_SCANCODE_F3,
+            "F4", SDL_SCANCODE_F4,
+            "F5", SDL_SCANCODE_F5,
+            "F6", SDL_SCANCODE_F6,
+            "F7", SDL_SCANCODE_F7,
+            "F8", SDL_SCANCODE_F8,
+            "F9", SDL_SCANCODE_F9,
+            "F10", SDL_SCANCODE_F10,
+            "F11", SDL_SCANCODE_F11,
+            "F12", SDL_SCANCODE_F12,
+
+            "A", SDL_SCANCODE_A,
+            "B", SDL_SCANCODE_B,
+            "C", SDL_SCANCODE_C,
+            "D", SDL_SCANCODE_D,
+            "E", SDL_SCANCODE_E,
+            "F", SDL_SCANCODE_F,
+            "G", SDL_SCANCODE_G,
+            "H", SDL_SCANCODE_H,
+            "I", SDL_SCANCODE_I,
+            "J", SDL_SCANCODE_J,
+            "K", SDL_SCANCODE_K,
+            "L", SDL_SCANCODE_L,
+            "M", SDL_SCANCODE_M,
+            "N", SDL_SCANCODE_N,
+            "O", SDL_SCANCODE_O,
+            "P", SDL_SCANCODE_P,
+            "Q", SDL_SCANCODE_Q,
+            "R", SDL_SCANCODE_R,
+            "S", SDL_SCANCODE_S,
+            "T", SDL_SCANCODE_T,
+            "U", SDL_SCANCODE_U,
+            "V", SDL_SCANCODE_V,
+            "W", SDL_SCANCODE_W,
+            "X", SDL_SCANCODE_X,
+            "Y", SDL_SCANCODE_Y,
+            "Z", SDL_SCANCODE_Z,
+
+            "LeftArrow", SDL_SCANCODE_LEFT,
+            "RightArrow", SDL_SCANCODE_RIGHT,
+            "UpArrow", SDL_SCANCODE_UP,
+            "DownArrow", SDL_SCANCODE_DOWN,
+
+            "LeftAlt", SDL_SCANCODE_LALT,
+            "LeftCtrl", SDL_SCANCODE_LCTRL,
+            "LeftBracket", SDL_SCANCODE_LEFTBRACKET,
+            "LeftSuper", SDL_SCANCODE_LGUI,
+            "LeftShift", SDL_SCANCODE_LSHIFT,
+            "RightAlt", SDL_SCANCODE_RALT,
+            "RightCtrl", SDL_SCANCODE_RCTRL,
+            "RightSuper", SDL_SCANCODE_RGUI,
+            "RightBracket", SDL_SCANCODE_RIGHTBRACKET,
+            "RightShift", SDL_SCANCODE_RSHIFT,
+
+            "BackSlash", SDL_SCANCODE_BACKSLASH,
+            "Backspace", SDL_SCANCODE_BACKSPACE,
+            "CapsLock", SDL_SCANCODE_CAPSLOCK,
+            "Comma", SDL_SCANCODE_COMMA,
+            "Delete", SDL_SCANCODE_DELETE,
+            "End", SDL_SCANCODE_END,
+            "Enter", SDL_SCANCODE_RETURN,
+            "Equals", SDL_SCANCODE_EQUALS,
+            "Escape", SDL_SCANCODE_ESCAPE,
+            "Home", SDL_SCANCODE_HOME,
+            "Insert", SDL_SCANCODE_INSERT,
+            "Minus", SDL_SCANCODE_MINUS,
+            "NumLock", SDL_SCANCODE_NUMLOCKCLEAR,
+            "PageDown", SDL_SCANCODE_PAGEDOWN,
+            "PageUp", SDL_SCANCODE_PAGEUP,
+            "Pause", SDL_SCANCODE_PAUSE,
+            "PrintScreen", SDL_SCANCODE_PRINTSCREEN,
+            "ScrollLock", SDL_SCANCODE_SCROLLLOCK,
+            "Semicolon", SDL_SCANCODE_SEMICOLON,
+            "Slash", SDL_SCANCODE_SLASH,
+            "Space", SDL_SCANCODE_SPACE,
+            "Tab", SDL_SCANCODE_TAB
+        ));
+
         return LuaUtil::makeReadOnly(api);
     }
 
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index 1c05debc73..f9d3911aa8 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -25,7 +25,7 @@ namespace MWLua
     {
         auto* lua = context.mLua;
         sol::table api(lua->sol(), sol::create);
-        api["API_REVISION"] = 8;
+        api["API_REVISION"] = 9;
         api["quit"] = [lua]()
         {
             std::string traceback = lua->sol()["debug"]["traceback"]().get<std::string>();
diff --git a/files/lua_api/openmw/input.lua b/files/lua_api/openmw/input.lua
index 0975ce6e6a..d4ff7f3475 100644
--- a/files/lua_api/openmw/input.lua
+++ b/files/lua_api/openmw/input.lua
@@ -17,6 +17,38 @@
 -- @param #number actionId One of @{openmw.input#ACTION}
 -- @return #boolean
 
+-------------------------------------------------------------------------------
+-- Is a keyboard button currently pressed.
+-- @function [parent=#input] isKeyPressed
+-- @param #number keyCode Key code (the same code that is used in @{openmw.input#KeyEvent})
+-- @return #boolean
+
+-------------------------------------------------------------------------------
+-- Is a controller button currently pressed.
+-- @function [parent=#input] isControllerButtonPressed
+-- @param #number buttonId Button index (see @{openmw.input#CONTROLLER_BUTTON})
+-- @return #boolean
+
+-------------------------------------------------------------------------------
+-- Is `Shift` key pressed.
+-- @function [parent=#input] isShiftPressed
+-- @return #boolean
+
+-------------------------------------------------------------------------------
+-- Is `Ctrl` key pressed.
+-- @function [parent=#input] isCtrlPressed
+-- @return #boolean
+
+-------------------------------------------------------------------------------
+-- Is `Alt` key pressed.
+-- @function [parent=#input] isAltPressed
+-- @return #boolean
+
+-------------------------------------------------------------------------------
+-- Is `Super`/`Win` key pressed.
+-- @function [parent=#input] isSuperPressed
+-- @return #boolean
+
 -------------------------------------------------------------------------------
 -- Is a mouse button currently pressed.
 -- @function [parent=#input] isMouseButtonPressed
@@ -156,10 +188,117 @@
 -- Values that can be used with getAxisValue.
 -- @field [parent=#input] #CONTROLLER_AXIS CONTROLLER_AXIS
 
+-------------------------------------------------------------------------------
+-- @type KEY
+-- @field #number _0
+-- @field #number _1
+-- @field #number _2
+-- @field #number _3
+-- @field #number _4
+-- @field #number _5
+-- @field #number _6
+-- @field #number _7
+-- @field #number _8
+-- @field #number _9
+-- @field #number NP_0
+-- @field #number NP_1
+-- @field #number NP_2
+-- @field #number NP_3
+-- @field #number NP_4
+-- @field #number NP_5
+-- @field #number NP_6
+-- @field #number NP_7
+-- @field #number NP_8
+-- @field #number NP_9
+-- @field #number NP_Divide
+-- @field #number NP_Enter
+-- @field #number NP_Minus
+-- @field #number NP_Multiply
+-- @field #number NP_Delete
+-- @field #number NP_Plus
+-- @field #number F1
+-- @field #number F2
+-- @field #number F3
+-- @field #number F4
+-- @field #number F5
+-- @field #number F6
+-- @field #number F7
+-- @field #number F8
+-- @field #number F9
+-- @field #number F10
+-- @field #number F11
+-- @field #number F12
+-- @field #number A
+-- @field #number B
+-- @field #number C
+-- @field #number D
+-- @field #number E
+-- @field #number F
+-- @field #number G
+-- @field #number H
+-- @field #number I
+-- @field #number J
+-- @field #number K
+-- @field #number L
+-- @field #number M
+-- @field #number N
+-- @field #number O
+-- @field #number P
+-- @field #number Q
+-- @field #number R
+-- @field #number S
+-- @field #number T
+-- @field #number U
+-- @field #number V
+-- @field #number W
+-- @field #number X
+-- @field #number Y
+-- @field #number Z
+-- @field #number LeftArrow
+-- @field #number RightArrow
+-- @field #number UpArrow
+-- @field #number DownArrow
+-- @field #number LeftAlt
+-- @field #number LeftCtrl
+-- @field #number LeftBracket
+-- @field #number LeftSuper
+-- @field #number LeftShift
+-- @field #number RightAlt
+-- @field #number RightCtrl
+-- @field #number RightBracket
+-- @field #number RightSuper
+-- @field #number RightShift
+-- @field #number BackSlash
+-- @field #number Backspace
+-- @field #number CapsLock
+-- @field #number Comma
+-- @field #number Delete
+-- @field #number End
+-- @field #number Enter
+-- @field #number Equals
+-- @field #number Escape
+-- @field #number Home
+-- @field #number Insert
+-- @field #number Minus
+-- @field #number NumLock
+-- @field #number PageDown
+-- @field #number PageUp
+-- @field #number Pause
+-- @field #number PrintScreen
+-- @field #number ScrollLock
+-- @field #number Semicolon
+-- @field #number Slash
+-- @field #number Space
+-- @field #number Tab
+
+-------------------------------------------------------------------------------
+-- Key codes.
+-- @field [parent=#input] #KEY KEY
+
 -------------------------------------------------------------------------------
 -- The argument of `onKeyPress`/`onKeyRelease` engine handlers.
 -- @type KeyboardEvent
--- @field [parent=#KeyboardEvent] #string symbol The pressed symbol (1-symbol string).
+-- @field [parent=#KeyboardEvent] #string symbol The pressed symbol (1-symbol string if can be represented or an empty string otherwise).
 -- @field [parent=#KeyboardEvent] #string code Key code.
 -- @field [parent=#KeyboardEvent] #boolean withShift Is `Shift` key pressed.
 -- @field [parent=#KeyboardEvent] #boolean withCtrl Is `Control` key pressed.

From ed853932885177662cb8090cfe1ba1680ea1906a Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Thu, 11 Nov 2021 22:35:41 +0100
Subject: [PATCH 1692/2859] Replace sol::table::create_table_with with a more
 compiler-friendly implementation. It fixes MSVC error "compiler is out of
 heap space" and also slightly reduces binary size.

---
 apps/openmw/mwlua/inputbindings.cpp  | 374 +++++++++++++--------------
 apps/openmw/mwlua/luabindings.cpp    |  42 +--
 apps/openmw/mwlua/nearbybindings.cpp |  17 +-
 components/lua/luastate.hpp          |   9 +
 4 files changed, 226 insertions(+), 216 deletions(-)

diff --git a/apps/openmw/mwlua/inputbindings.cpp b/apps/openmw/mwlua/inputbindings.cpp
index b528d1b563..303c25f864 100644
--- a/apps/openmw/mwlua/inputbindings.cpp
+++ b/apps/openmw/mwlua/inputbindings.cpp
@@ -71,210 +71,210 @@ namespace MWLua
         api["getControlSwitch"] = [input](std::string_view key) { return input->getControlSwitch(key); };
         api["setControlSwitch"] = [input](std::string_view key, bool v) { input->toggleControlSwitch(key, v); };
 
-        api["ACTION"] = LuaUtil::makeReadOnly(context.mLua->sol().create_table_with(
-            "GameMenu", MWInput::A_GameMenu,
-            "Screenshot", MWInput::A_Screenshot,
-            "Inventory", MWInput::A_Inventory,
-            "Console", MWInput::A_Console,
+        api["ACTION"] = LuaUtil::makeReadOnly(context.mLua->tableFromPairs<std::string_view, MWInput::Actions>({
+            {"GameMenu", MWInput::A_GameMenu},
+            {"Screenshot", MWInput::A_Screenshot},
+            {"Inventory", MWInput::A_Inventory},
+            {"Console", MWInput::A_Console},
 
-            "MoveLeft", MWInput::A_MoveLeft,
-            "MoveRight", MWInput::A_MoveRight,
-            "MoveForward", MWInput::A_MoveForward,
-            "MoveBackward", MWInput::A_MoveBackward,
+            {"MoveLeft", MWInput::A_MoveLeft},
+            {"MoveRight", MWInput::A_MoveRight},
+            {"MoveForward", MWInput::A_MoveForward},
+            {"MoveBackward", MWInput::A_MoveBackward},
 
-            "Activate", MWInput::A_Activate,
-            "Use", MWInput::A_Use,
-            "Jump", MWInput::A_Jump,
-            "AutoMove", MWInput::A_AutoMove,
-            "Rest", MWInput::A_Rest,
-            "Journal", MWInput::A_Journal,
-            "Weapon", MWInput::A_Weapon,
-            "Spell", MWInput::A_Spell,
-            "Run", MWInput::A_Run,
-            "CycleSpellLeft", MWInput::A_CycleSpellLeft,
-            "CycleSpellRight", MWInput::A_CycleSpellRight,
-            "CycleWeaponLeft", MWInput::A_CycleWeaponLeft,
-            "CycleWeaponRight", MWInput::A_CycleWeaponRight,
-            "ToggleSneak", MWInput::A_ToggleSneak,
-            "AlwaysRun", MWInput::A_AlwaysRun,
-            "Sneak", MWInput::A_Sneak,
+            {"Activate", MWInput::A_Activate},
+            {"Use", MWInput::A_Use},
+            {"Jump", MWInput::A_Jump},
+            {"AutoMove", MWInput::A_AutoMove},
+            {"Rest", MWInput::A_Rest},
+            {"Journal", MWInput::A_Journal},
+            {"Weapon", MWInput::A_Weapon},
+            {"Spell", MWInput::A_Spell},
+            {"Run", MWInput::A_Run},
+            {"CycleSpellLeft", MWInput::A_CycleSpellLeft},
+            {"CycleSpellRight", MWInput::A_CycleSpellRight},
+            {"CycleWeaponLeft", MWInput::A_CycleWeaponLeft},
+            {"CycleWeaponRight", MWInput::A_CycleWeaponRight},
+            {"ToggleSneak", MWInput::A_ToggleSneak},
+            {"AlwaysRun", MWInput::A_AlwaysRun},
+            {"Sneak", MWInput::A_Sneak},
 
-            "QuickSave", MWInput::A_QuickSave,
-            "QuickLoad", MWInput::A_QuickLoad,
-            "QuickMenu", MWInput::A_QuickMenu,
-            "ToggleWeapon", MWInput::A_ToggleWeapon,
-            "ToggleSpell", MWInput::A_ToggleSpell,
-            "TogglePOV", MWInput::A_TogglePOV,
+            {"QuickSave", MWInput::A_QuickSave},
+            {"QuickLoad", MWInput::A_QuickLoad},
+            {"QuickMenu", MWInput::A_QuickMenu},
+            {"ToggleWeapon", MWInput::A_ToggleWeapon},
+            {"ToggleSpell", MWInput::A_ToggleSpell},
+            {"TogglePOV", MWInput::A_TogglePOV},
 
-            "QuickKey1", MWInput::A_QuickKey1,
-            "QuickKey2", MWInput::A_QuickKey2,
-            "QuickKey3", MWInput::A_QuickKey3,
-            "QuickKey4", MWInput::A_QuickKey4,
-            "QuickKey5", MWInput::A_QuickKey5,
-            "QuickKey6", MWInput::A_QuickKey6,
-            "QuickKey7", MWInput::A_QuickKey7,
-            "QuickKey8", MWInput::A_QuickKey8,
-            "QuickKey9", MWInput::A_QuickKey9,
-            "QuickKey10", MWInput::A_QuickKey10,
-            "QuickKeysMenu", MWInput::A_QuickKeysMenu,
+            {"QuickKey1", MWInput::A_QuickKey1},
+            {"QuickKey2", MWInput::A_QuickKey2},
+            {"QuickKey3", MWInput::A_QuickKey3},
+            {"QuickKey4", MWInput::A_QuickKey4},
+            {"QuickKey5", MWInput::A_QuickKey5},
+            {"QuickKey6", MWInput::A_QuickKey6},
+            {"QuickKey7", MWInput::A_QuickKey7},
+            {"QuickKey8", MWInput::A_QuickKey8},
+            {"QuickKey9", MWInput::A_QuickKey9},
+            {"QuickKey10", MWInput::A_QuickKey10},
+            {"QuickKeysMenu", MWInput::A_QuickKeysMenu},
 
-            "ToggleHUD", MWInput::A_ToggleHUD,
-            "ToggleDebug", MWInput::A_ToggleDebug,
+            {"ToggleHUD", MWInput::A_ToggleHUD},
+            {"ToggleDebug", MWInput::A_ToggleDebug},
 
-            "ZoomIn", MWInput::A_ZoomIn,
-            "ZoomOut", MWInput::A_ZoomOut
-        ));
+            {"ZoomIn", MWInput::A_ZoomIn},
+            {"ZoomOut", MWInput::A_ZoomOut}
+        }));
 
-        api["CONTROL_SWITCH"] = LuaUtil::makeReadOnly(context.mLua->sol().create_table_with(
-            "Controls", "playercontrols",
-            "Fighting", "playerfighting",
-            "Jumping", "playerjumping",
-            "Looking", "playerlooking",
-            "Magic", "playermagic",
-            "ViewMode", "playerviewswitch",
-            "VanityMode", "vanitymode"
-        ));
+        api["CONTROL_SWITCH"] = LuaUtil::makeReadOnly(context.mLua->tableFromPairs<std::string_view, std::string_view>({
+            {"Controls", "playercontrols"},
+            {"Fighting", "playerfighting"},
+            {"Jumping", "playerjumping"},
+            {"Looking", "playerlooking"},
+            {"Magic", "playermagic"},
+            {"ViewMode", "playerviewswitch"},
+            {"VanityMode", "vanitymode"}
+        }));
 
-        api["CONTROLLER_BUTTON"] = LuaUtil::makeReadOnly(context.mLua->sol().create_table_with(
-            "A", SDL_CONTROLLER_BUTTON_A,
-            "B", SDL_CONTROLLER_BUTTON_B,
-            "X", SDL_CONTROLLER_BUTTON_X,
-            "Y", SDL_CONTROLLER_BUTTON_Y,
-            "Back", SDL_CONTROLLER_BUTTON_BACK,
-            "Guide", SDL_CONTROLLER_BUTTON_GUIDE,
-            "Start", SDL_CONTROLLER_BUTTON_START,
-            "LeftStick", SDL_CONTROLLER_BUTTON_LEFTSTICK,
-            "RightStick", SDL_CONTROLLER_BUTTON_RIGHTSTICK,
-            "LeftShoulder", SDL_CONTROLLER_BUTTON_LEFTSHOULDER,
-            "RightShoulder", SDL_CONTROLLER_BUTTON_RIGHTSHOULDER,
-            "DPadUp", SDL_CONTROLLER_BUTTON_DPAD_UP,
-            "DPadDown", SDL_CONTROLLER_BUTTON_DPAD_DOWN,
-            "DPadLeft", SDL_CONTROLLER_BUTTON_DPAD_LEFT,
-            "DPadRight", SDL_CONTROLLER_BUTTON_DPAD_RIGHT
-        ));
+        api["CONTROLLER_BUTTON"] = LuaUtil::makeReadOnly(context.mLua->tableFromPairs<std::string_view, SDL_GameControllerButton>({
+            {"A", SDL_CONTROLLER_BUTTON_A},
+            {"B", SDL_CONTROLLER_BUTTON_B},
+            {"X", SDL_CONTROLLER_BUTTON_X},
+            {"Y", SDL_CONTROLLER_BUTTON_Y},
+            {"Back", SDL_CONTROLLER_BUTTON_BACK},
+            {"Guide", SDL_CONTROLLER_BUTTON_GUIDE},
+            {"Start", SDL_CONTROLLER_BUTTON_START},
+            {"LeftStick", SDL_CONTROLLER_BUTTON_LEFTSTICK},
+            {"RightStick", SDL_CONTROLLER_BUTTON_RIGHTSTICK},
+            {"LeftShoulder", SDL_CONTROLLER_BUTTON_LEFTSHOULDER},
+            {"RightShoulder", SDL_CONTROLLER_BUTTON_RIGHTSHOULDER},
+            {"DPadUp", SDL_CONTROLLER_BUTTON_DPAD_UP},
+            {"DPadDown", SDL_CONTROLLER_BUTTON_DPAD_DOWN},
+            {"DPadLeft", SDL_CONTROLLER_BUTTON_DPAD_LEFT},
+            {"DPadRight", SDL_CONTROLLER_BUTTON_DPAD_RIGHT}
+        }));
 
-        api["CONTROLLER_AXIS"] = LuaUtil::makeReadOnly(context.mLua->sol().create_table_with(
-            "LeftX", SDL_CONTROLLER_AXIS_LEFTX,
-            "LeftY", SDL_CONTROLLER_AXIS_LEFTY,
-            "RightX", SDL_CONTROLLER_AXIS_RIGHTX,
-            "RightY", SDL_CONTROLLER_AXIS_RIGHTY,
-            "TriggerLeft", SDL_CONTROLLER_AXIS_TRIGGERLEFT,
-            "TriggerRight", SDL_CONTROLLER_AXIS_TRIGGERRIGHT,
+        api["CONTROLLER_AXIS"] = LuaUtil::makeReadOnly(context.mLua->tableFromPairs<std::string_view, int>({
+            {"LeftX", SDL_CONTROLLER_AXIS_LEFTX},
+            {"LeftY", SDL_CONTROLLER_AXIS_LEFTY},
+            {"RightX", SDL_CONTROLLER_AXIS_RIGHTX},
+            {"RightY", SDL_CONTROLLER_AXIS_RIGHTY},
+            {"TriggerLeft", SDL_CONTROLLER_AXIS_TRIGGERLEFT},
+            {"TriggerRight", SDL_CONTROLLER_AXIS_TRIGGERRIGHT},
 
-            "LookUpDown", SDL_CONTROLLER_AXIS_MAX + MWInput::A_LookUpDown,
-            "LookLeftRight", SDL_CONTROLLER_AXIS_MAX + MWInput::A_LookLeftRight,
-            "MoveForwardBackward", SDL_CONTROLLER_AXIS_MAX + MWInput::A_MoveForwardBackward,
-            "MoveLeftRight", SDL_CONTROLLER_AXIS_MAX + MWInput::A_MoveLeftRight
-        ));
+            {"LookUpDown", SDL_CONTROLLER_AXIS_MAX + MWInput::A_LookUpDown},
+            {"LookLeftRight", SDL_CONTROLLER_AXIS_MAX + MWInput::A_LookLeftRight},
+            {"MoveForwardBackward", SDL_CONTROLLER_AXIS_MAX + MWInput::A_MoveForwardBackward},
+            {"MoveLeftRight", SDL_CONTROLLER_AXIS_MAX + MWInput::A_MoveLeftRight}
+        }));
 
-        api["KEY"] = LuaUtil::makeReadOnly(context.mLua->sol().create_table_with(
-            "_0", SDL_SCANCODE_0,
-            "_1", SDL_SCANCODE_1,
-            "_2", SDL_SCANCODE_2,
-            "_3", SDL_SCANCODE_3,
-            "_4", SDL_SCANCODE_4,
-            "_5", SDL_SCANCODE_5,
-            "_6", SDL_SCANCODE_6,
-            "_7", SDL_SCANCODE_7,
-            "_8", SDL_SCANCODE_8,
-            "_9", SDL_SCANCODE_9,
+        api["KEY"] = LuaUtil::makeReadOnly(context.mLua->tableFromPairs<std::string_view, SDL_Scancode>({
+            {"_0", SDL_SCANCODE_0},
+            {"_1", SDL_SCANCODE_1},
+            {"_2", SDL_SCANCODE_2},
+            {"_3", SDL_SCANCODE_3},
+            {"_4", SDL_SCANCODE_4},
+            {"_5", SDL_SCANCODE_5},
+            {"_6", SDL_SCANCODE_6},
+            {"_7", SDL_SCANCODE_7},
+            {"_8", SDL_SCANCODE_8},
+            {"_9", SDL_SCANCODE_9},
 
-            "NP_0", SDL_SCANCODE_KP_0,
-            "NP_1", SDL_SCANCODE_KP_1,
-            "NP_2", SDL_SCANCODE_KP_2,
-            "NP_3", SDL_SCANCODE_KP_3,
-            "NP_4", SDL_SCANCODE_KP_4,
-            "NP_5", SDL_SCANCODE_KP_5,
-            "NP_6", SDL_SCANCODE_KP_6,
-            "NP_7", SDL_SCANCODE_KP_7,
-            "NP_8", SDL_SCANCODE_KP_8,
-            "NP_9", SDL_SCANCODE_KP_9,
-            "NP_Divide", SDL_SCANCODE_KP_DIVIDE,
-            "NP_Enter", SDL_SCANCODE_KP_ENTER,
-            "NP_Minus", SDL_SCANCODE_KP_MINUS,
-            "NP_Multiply", SDL_SCANCODE_KP_MULTIPLY,
-            "NP_Delete", SDL_SCANCODE_KP_PERIOD,
-            "NP_Plus", SDL_SCANCODE_KP_PLUS,
+            {"NP_0", SDL_SCANCODE_KP_0},
+            {"NP_1", SDL_SCANCODE_KP_1},
+            {"NP_2", SDL_SCANCODE_KP_2},
+            {"NP_3", SDL_SCANCODE_KP_3},
+            {"NP_4", SDL_SCANCODE_KP_4},
+            {"NP_5", SDL_SCANCODE_KP_5},
+            {"NP_6", SDL_SCANCODE_KP_6},
+            {"NP_7", SDL_SCANCODE_KP_7},
+            {"NP_8", SDL_SCANCODE_KP_8},
+            {"NP_9", SDL_SCANCODE_KP_9},
+            {"NP_Divide", SDL_SCANCODE_KP_DIVIDE},
+            {"NP_Enter", SDL_SCANCODE_KP_ENTER},
+            {"NP_Minus", SDL_SCANCODE_KP_MINUS},
+            {"NP_Multiply", SDL_SCANCODE_KP_MULTIPLY},
+            {"NP_Delete", SDL_SCANCODE_KP_PERIOD},
+            {"NP_Plus", SDL_SCANCODE_KP_PLUS},
 
-            "F1", SDL_SCANCODE_F1,
-            "F2", SDL_SCANCODE_F2,
-            "F3", SDL_SCANCODE_F3,
-            "F4", SDL_SCANCODE_F4,
-            "F5", SDL_SCANCODE_F5,
-            "F6", SDL_SCANCODE_F6,
-            "F7", SDL_SCANCODE_F7,
-            "F8", SDL_SCANCODE_F8,
-            "F9", SDL_SCANCODE_F9,
-            "F10", SDL_SCANCODE_F10,
-            "F11", SDL_SCANCODE_F11,
-            "F12", SDL_SCANCODE_F12,
+            {"F1", SDL_SCANCODE_F1},
+            {"F2", SDL_SCANCODE_F2},
+            {"F3", SDL_SCANCODE_F3},
+            {"F4", SDL_SCANCODE_F4},
+            {"F5", SDL_SCANCODE_F5},
+            {"F6", SDL_SCANCODE_F6},
+            {"F7", SDL_SCANCODE_F7},
+            {"F8", SDL_SCANCODE_F8},
+            {"F9", SDL_SCANCODE_F9},
+            {"F10", SDL_SCANCODE_F10},
+            {"F11", SDL_SCANCODE_F11},
+            {"F12", SDL_SCANCODE_F12},
 
-            "A", SDL_SCANCODE_A,
-            "B", SDL_SCANCODE_B,
-            "C", SDL_SCANCODE_C,
-            "D", SDL_SCANCODE_D,
-            "E", SDL_SCANCODE_E,
-            "F", SDL_SCANCODE_F,
-            "G", SDL_SCANCODE_G,
-            "H", SDL_SCANCODE_H,
-            "I", SDL_SCANCODE_I,
-            "J", SDL_SCANCODE_J,
-            "K", SDL_SCANCODE_K,
-            "L", SDL_SCANCODE_L,
-            "M", SDL_SCANCODE_M,
-            "N", SDL_SCANCODE_N,
-            "O", SDL_SCANCODE_O,
-            "P", SDL_SCANCODE_P,
-            "Q", SDL_SCANCODE_Q,
-            "R", SDL_SCANCODE_R,
-            "S", SDL_SCANCODE_S,
-            "T", SDL_SCANCODE_T,
-            "U", SDL_SCANCODE_U,
-            "V", SDL_SCANCODE_V,
-            "W", SDL_SCANCODE_W,
-            "X", SDL_SCANCODE_X,
-            "Y", SDL_SCANCODE_Y,
-            "Z", SDL_SCANCODE_Z,
+            {"A", SDL_SCANCODE_A},
+            {"B", SDL_SCANCODE_B},
+            {"C", SDL_SCANCODE_C},
+            {"D", SDL_SCANCODE_D},
+            {"E", SDL_SCANCODE_E},
+            {"F", SDL_SCANCODE_F},
+            {"G", SDL_SCANCODE_G},
+            {"H", SDL_SCANCODE_H},
+            {"I", SDL_SCANCODE_I},
+            {"J", SDL_SCANCODE_J},
+            {"K", SDL_SCANCODE_K},
+            {"L", SDL_SCANCODE_L},
+            {"M", SDL_SCANCODE_M},
+            {"N", SDL_SCANCODE_N},
+            {"O", SDL_SCANCODE_O},
+            {"P", SDL_SCANCODE_P},
+            {"Q", SDL_SCANCODE_Q},
+            {"R", SDL_SCANCODE_R},
+            {"S", SDL_SCANCODE_S},
+            {"T", SDL_SCANCODE_T},
+            {"U", SDL_SCANCODE_U},
+            {"V", SDL_SCANCODE_V},
+            {"W", SDL_SCANCODE_W},
+            {"X", SDL_SCANCODE_X},
+            {"Y", SDL_SCANCODE_Y},
+            {"Z", SDL_SCANCODE_Z},
 
-            "LeftArrow", SDL_SCANCODE_LEFT,
-            "RightArrow", SDL_SCANCODE_RIGHT,
-            "UpArrow", SDL_SCANCODE_UP,
-            "DownArrow", SDL_SCANCODE_DOWN,
+            {"LeftArrow", SDL_SCANCODE_LEFT},
+            {"RightArrow", SDL_SCANCODE_RIGHT},
+            {"UpArrow", SDL_SCANCODE_UP},
+            {"DownArrow", SDL_SCANCODE_DOWN},
 
-            "LeftAlt", SDL_SCANCODE_LALT,
-            "LeftCtrl", SDL_SCANCODE_LCTRL,
-            "LeftBracket", SDL_SCANCODE_LEFTBRACKET,
-            "LeftSuper", SDL_SCANCODE_LGUI,
-            "LeftShift", SDL_SCANCODE_LSHIFT,
-            "RightAlt", SDL_SCANCODE_RALT,
-            "RightCtrl", SDL_SCANCODE_RCTRL,
-            "RightSuper", SDL_SCANCODE_RGUI,
-            "RightBracket", SDL_SCANCODE_RIGHTBRACKET,
-            "RightShift", SDL_SCANCODE_RSHIFT,
+            {"LeftAlt", SDL_SCANCODE_LALT},
+            {"LeftCtrl", SDL_SCANCODE_LCTRL},
+            {"LeftBracket", SDL_SCANCODE_LEFTBRACKET},
+            {"LeftSuper", SDL_SCANCODE_LGUI},
+            {"LeftShift", SDL_SCANCODE_LSHIFT},
+            {"RightAlt", SDL_SCANCODE_RALT},
+            {"RightCtrl", SDL_SCANCODE_RCTRL},
+            {"RightSuper", SDL_SCANCODE_RGUI},
+            {"RightBracket", SDL_SCANCODE_RIGHTBRACKET},
+            {"RightShift", SDL_SCANCODE_RSHIFT},
 
-            "BackSlash", SDL_SCANCODE_BACKSLASH,
-            "Backspace", SDL_SCANCODE_BACKSPACE,
-            "CapsLock", SDL_SCANCODE_CAPSLOCK,
-            "Comma", SDL_SCANCODE_COMMA,
-            "Delete", SDL_SCANCODE_DELETE,
-            "End", SDL_SCANCODE_END,
-            "Enter", SDL_SCANCODE_RETURN,
-            "Equals", SDL_SCANCODE_EQUALS,
-            "Escape", SDL_SCANCODE_ESCAPE,
-            "Home", SDL_SCANCODE_HOME,
-            "Insert", SDL_SCANCODE_INSERT,
-            "Minus", SDL_SCANCODE_MINUS,
-            "NumLock", SDL_SCANCODE_NUMLOCKCLEAR,
-            "PageDown", SDL_SCANCODE_PAGEDOWN,
-            "PageUp", SDL_SCANCODE_PAGEUP,
-            "Pause", SDL_SCANCODE_PAUSE,
-            "PrintScreen", SDL_SCANCODE_PRINTSCREEN,
-            "ScrollLock", SDL_SCANCODE_SCROLLLOCK,
-            "Semicolon", SDL_SCANCODE_SEMICOLON,
-            "Slash", SDL_SCANCODE_SLASH,
-            "Space", SDL_SCANCODE_SPACE,
-            "Tab", SDL_SCANCODE_TAB
-        ));
+            {"BackSlash", SDL_SCANCODE_BACKSLASH},
+            {"Backspace", SDL_SCANCODE_BACKSPACE},
+            {"CapsLock", SDL_SCANCODE_CAPSLOCK},
+            {"Comma", SDL_SCANCODE_COMMA},
+            {"Delete", SDL_SCANCODE_DELETE},
+            {"End", SDL_SCANCODE_END},
+            {"Enter", SDL_SCANCODE_RETURN},
+            {"Equals", SDL_SCANCODE_EQUALS},
+            {"Escape", SDL_SCANCODE_ESCAPE},
+            {"Home", SDL_SCANCODE_HOME},
+            {"Insert", SDL_SCANCODE_INSERT},
+            {"Minus", SDL_SCANCODE_MINUS},
+            {"NumLock", SDL_SCANCODE_NUMLOCKCLEAR},
+            {"PageDown", SDL_SCANCODE_PAGEDOWN},
+            {"PageUp", SDL_SCANCODE_PAGEUP},
+            {"Pause", SDL_SCANCODE_PAUSE},
+            {"PrintScreen", SDL_SCANCODE_PRINTSCREEN},
+            {"ScrollLock", SDL_SCANCODE_SCROLLLOCK},
+            {"Semicolon", SDL_SCANCODE_SEMICOLON},
+            {"Slash", SDL_SCANCODE_SLASH},
+            {"Space", SDL_SCANCODE_SPACE},
+            {"Tab", SDL_SCANCODE_TAB}
+        }));
 
         return LuaUtil::makeReadOnly(api);
     }
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index f9d3911aa8..07e8dcc30c 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -43,27 +43,27 @@ namespace MWLua
             "Activator", "Armor", "Book", "Clothing", "Creature", "Door", "Ingredient",
             "Light", "Miscellaneous", "NPC", "Player", "Potion", "Static", "Weapon"
         });
-        api["EQUIPMENT_SLOT"] = LuaUtil::makeReadOnly(lua->sol().create_table_with(
-            "Helmet", MWWorld::InventoryStore::Slot_Helmet,
-            "Cuirass", MWWorld::InventoryStore::Slot_Cuirass,
-            "Greaves", MWWorld::InventoryStore::Slot_Greaves,
-            "LeftPauldron", MWWorld::InventoryStore::Slot_LeftPauldron,
-            "RightPauldron", MWWorld::InventoryStore::Slot_RightPauldron,
-            "LeftGauntlet", MWWorld::InventoryStore::Slot_LeftGauntlet,
-            "RightGauntlet", MWWorld::InventoryStore::Slot_RightGauntlet,
-            "Boots", MWWorld::InventoryStore::Slot_Boots,
-            "Shirt", MWWorld::InventoryStore::Slot_Shirt,
-            "Pants", MWWorld::InventoryStore::Slot_Pants,
-            "Skirt", MWWorld::InventoryStore::Slot_Skirt,
-            "Robe", MWWorld::InventoryStore::Slot_Robe,
-            "LeftRing", MWWorld::InventoryStore::Slot_LeftRing,
-            "RightRing", MWWorld::InventoryStore::Slot_RightRing,
-            "Amulet", MWWorld::InventoryStore::Slot_Amulet,
-            "Belt", MWWorld::InventoryStore::Slot_Belt,
-            "CarriedRight", MWWorld::InventoryStore::Slot_CarriedRight,
-            "CarriedLeft", MWWorld::InventoryStore::Slot_CarriedLeft,
-            "Ammunition", MWWorld::InventoryStore::Slot_Ammunition
-        ));
+        api["EQUIPMENT_SLOT"] = LuaUtil::makeReadOnly(context.mLua->tableFromPairs<std::string_view, int>({
+            {"Helmet", MWWorld::InventoryStore::Slot_Helmet},
+            {"Cuirass", MWWorld::InventoryStore::Slot_Cuirass},
+            {"Greaves", MWWorld::InventoryStore::Slot_Greaves},
+            {"LeftPauldron", MWWorld::InventoryStore::Slot_LeftPauldron},
+            {"RightPauldron", MWWorld::InventoryStore::Slot_RightPauldron},
+            {"LeftGauntlet", MWWorld::InventoryStore::Slot_LeftGauntlet},
+            {"RightGauntlet", MWWorld::InventoryStore::Slot_RightGauntlet},
+            {"Boots", MWWorld::InventoryStore::Slot_Boots},
+            {"Shirt", MWWorld::InventoryStore::Slot_Shirt},
+            {"Pants", MWWorld::InventoryStore::Slot_Pants},
+            {"Skirt", MWWorld::InventoryStore::Slot_Skirt},
+            {"Robe", MWWorld::InventoryStore::Slot_Robe},
+            {"LeftRing", MWWorld::InventoryStore::Slot_LeftRing},
+            {"RightRing", MWWorld::InventoryStore::Slot_RightRing},
+            {"Amulet", MWWorld::InventoryStore::Slot_Amulet},
+            {"Belt", MWWorld::InventoryStore::Slot_Belt},
+            {"CarriedRight", MWWorld::InventoryStore::Slot_CarriedRight},
+            {"CarriedLeft", MWWorld::InventoryStore::Slot_CarriedLeft},
+            {"Ammunition", MWWorld::InventoryStore::Slot_Ammunition}
+        }));
         return LuaUtil::makeReadOnly(api);
     }
 
diff --git a/apps/openmw/mwlua/nearbybindings.cpp b/apps/openmw/mwlua/nearbybindings.cpp
index 011d0ae9f3..624cf69da6 100644
--- a/apps/openmw/mwlua/nearbybindings.cpp
+++ b/apps/openmw/mwlua/nearbybindings.cpp
@@ -47,14 +47,15 @@ namespace MWLua
                 return LObject(getId(r.mHitObject), worldView->getObjectRegistry());
         });
 
-        api["COLLISION_TYPE"] = LuaUtil::makeReadOnly(context.mLua->sol().create_table_with(
-            "World", MWPhysics::CollisionType_World,
-            "Door", MWPhysics::CollisionType_Door,
-            "Actor", MWPhysics::CollisionType_Actor,
-            "HeightMap", MWPhysics::CollisionType_HeightMap,
-            "Projectile", MWPhysics::CollisionType_Projectile,
-            "Water", MWPhysics::CollisionType_Water,
-            "Default", MWPhysics::CollisionType_Default));
+        api["COLLISION_TYPE"] = LuaUtil::makeReadOnly(context.mLua->tableFromPairs<std::string_view, MWPhysics::CollisionType>({
+            {"World", MWPhysics::CollisionType_World},
+            {"Door", MWPhysics::CollisionType_Door},
+            {"Actor", MWPhysics::CollisionType_Actor},
+            {"HeightMap", MWPhysics::CollisionType_HeightMap},
+            {"Projectile", MWPhysics::CollisionType_Projectile},
+            {"Water", MWPhysics::CollisionType_Water},
+            {"Default", MWPhysics::CollisionType_Default}
+        }));
 
         api["castRay"] = [](const osg::Vec3f& from, const osg::Vec3f& to, sol::optional<sol::table> options)
         {
diff --git a/components/lua/luastate.hpp b/components/lua/luastate.hpp
index 7ac5af0b1b..b302e565f4 100644
--- a/components/lua/luastate.hpp
+++ b/components/lua/luastate.hpp
@@ -38,6 +38,15 @@ namespace LuaUtil
         // A shortcut to create a new Lua table.
         sol::table newTable() { return sol::table(mLua, sol::create); }
 
+        template <typename Key, typename Value>
+        sol::table tableFromPairs(std::initializer_list<std::pair<Key, Value>> list)
+        {
+            sol::table res(mLua, sol::create);
+            for (const auto& [k, v] : list)
+                res[k] = v;
+            return res;
+        }
+
         // Registers a package that will be available from every sandbox via `require(name)`.
         // The package can be either a sol::table with an API or a sol::function. If it is a function,
         // it will be evaluated (once per sandbox) the first time when requested. If the package

From a1d03d178d7f1016b84479b32cb39acd9b9e329c Mon Sep 17 00:00:00 2001
From: wareya <wareya@gmail.com>
Date: Fri, 12 Nov 2021 06:55:19 +0000
Subject: [PATCH 1693/2859] Update water_fragment.glsl

---
 files/shaders/water_fragment.glsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/shaders/water_fragment.glsl b/files/shaders/water_fragment.glsl
index 5d42a2bdb1..5e50b4f7b2 100644
--- a/files/shaders/water_fragment.glsl
+++ b/files/shaders/water_fragment.glsl
@@ -61,7 +61,7 @@ const float RAIN_RIPPLE_RADIUS = 0.2;
 
 float scramble(float x, float z)
 {
-    return fract(pow(x*3.0+1.0, z));
+    return fract(pow(fract(x)*3.0+1.0, z));
 }
 
 vec2 randOffset(vec2 c, float time)

From 700bace24cb7f52e13d571864adcc9966be51273 Mon Sep 17 00:00:00 2001
From: Bret Curtis <bret.curtis@gmail.com>
Date: Fri, 12 Nov 2021 11:53:21 +0100
Subject: [PATCH 1694/2859] do not emplace_back to our mLandTextures; instead
 use the heavy handed resize to be explicit about what we intend to do;
 resolves issue found here:
 https://github.com/OpenMW/openmw/pull/3220#issuecomment-964650167

---
 apps/openmw/mwworld/esmstore.cpp | 2 +-
 apps/openmw/mwworld/store.hpp    | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index bafdc8f37d..1284df694a 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -153,7 +153,7 @@ void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener)
     // Land texture loading needs to use a separate internal store for each plugin.
     // We set the number of plugins here so we can properly verify if valid plugin
     // indices are being passed to the LandTexture Store retrieval methods.
-    mLandTextures.addPlugin();
+    mLandTextures.resize(esm.getIndex()+1);
 
     // Loop through all records
     while(esm.hasMoreRecs())
diff --git a/apps/openmw/mwworld/store.hpp b/apps/openmw/mwworld/store.hpp
index 17a37c23ea..22f36da690 100644
--- a/apps/openmw/mwworld/store.hpp
+++ b/apps/openmw/mwworld/store.hpp
@@ -222,8 +222,7 @@ namespace MWWorld
         const ESM::LandTexture *search(size_t index, size_t plugin) const;
         const ESM::LandTexture *find(size_t index, size_t plugin) const;
 
-        /// Resize the internal store to hold another plugin.
-        void addPlugin() { mStatic.emplace_back(); }
+        void resize(size_t num) { mStatic.resize(num); }
 
         size_t getSize() const override;
         size_t getSize(size_t plugin) const;

From 32839cc7276b59a46f54e027b9c205aa2a2fe9f7 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Fri, 12 Nov 2021 22:06:59 +0100
Subject: [PATCH 1695/2859] Allow Lua scripts to work on pause (except timers
 and onUpdate handlers)

---
 apps/openmw/mwlua/luamanagerimp.cpp | 38 ++++++++++++++---------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 4e47bf7167..2b9f0702e2 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -80,32 +80,28 @@ namespace MWLua
 
     void LuaManager::update(bool paused, float dt)
     {
+        if (mPlayer.isEmpty())
+            return;  // The game is not started yet.
+
         ObjectRegistry* objectRegistry = mWorldView.getObjectRegistry();
 
-        if (!mPlayer.isEmpty())
+        MWWorld::Ptr newPlayerPtr = MWBase::Environment::get().getWorld()->getPlayerPtr();
+        if (!(getId(mPlayer) == getId(newPlayerPtr)))
+            throw std::logic_error("Player Refnum was changed unexpectedly");
+        if (!mPlayer.isInCell() || !newPlayerPtr.isInCell() || mPlayer.getCell() != newPlayerPtr.getCell())
         {
-            MWWorld::Ptr newPlayerPtr = MWBase::Environment::get().getWorld()->getPlayerPtr();
-            if (!(getId(mPlayer) == getId(newPlayerPtr)))
-                throw std::logic_error("Player Refnum was changed unexpectedly");
-            if (!mPlayer.isInCell() || !newPlayerPtr.isInCell() || mPlayer.getCell() != newPlayerPtr.getCell())
-            {
-                mPlayer = newPlayerPtr;  // player was moved to another cell, update ptr in registry
-                objectRegistry->registerPtr(mPlayer);
-            }
+            mPlayer = newPlayerPtr;  // player was moved to another cell, update ptr in registry
+            objectRegistry->registerPtr(mPlayer);
         }
-        mWorldView.update();
 
-        if (paused)
-        {
-            mInputEvents.clear();
-            return;
-        }
+        mWorldView.update();
 
         std::vector<GlobalEvent> globalEvents = std::move(mGlobalEvents);
         std::vector<LocalEvent> localEvents = std::move(mLocalEvents);
         mGlobalEvents = std::vector<GlobalEvent>();
         mLocalEvents = std::vector<LocalEvent>();
 
+        if (!paused)
         {  // Update time and process timers
             double seconds = mWorldView.getGameTimeInSeconds() + dt;
             mWorldView.setGameTimeInSeconds(seconds);
@@ -137,7 +133,7 @@ namespace MWLua
 
         // Engine handlers in local scripts
         PlayerScripts* playerScripts = dynamic_cast<PlayerScripts*>(mPlayer.getRefData().getLuaScripts());
-        if (playerScripts)
+        if (playerScripts && !paused)
         {
             for (const auto& event : mInputEvents)
                 playerScripts->processInputEvent(event);
@@ -158,8 +154,11 @@ namespace MWLua
         }
         mLocalEngineEvents.clear();
 
-        for (LocalScripts* scripts : mActiveLocalScripts)
-            scripts->update(dt);
+        if (!paused)
+        {
+            for (LocalScripts* scripts : mActiveLocalScripts)
+                scripts->update(dt);
+        }
 
         // Engine handlers in global scripts
         if (mPlayerChanged)
@@ -177,7 +176,8 @@ namespace MWLua
             mGlobalScripts.actorActive(GObject(id, objectRegistry));
         mActorAddedEvents.clear();
 
-        mGlobalScripts.update(dt);
+        if (!paused)
+            mGlobalScripts.update(dt);
     }
 
     void LuaManager::applyQueuedChanges()

From 5f406158b5df73c5d7825fbcde0b9aafbaf36c4a Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 13 Nov 2021 12:46:10 +0100
Subject: [PATCH 1696/2859] Zero initialize context index

---
 components/esm/esmreader.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/esm/esmreader.cpp b/components/esm/esmreader.cpp
index 316748b53a..c84a1798ff 100644
--- a/components/esm/esmreader.cpp
+++ b/components/esm/esmreader.cpp
@@ -24,6 +24,7 @@ ESMReader::ESMReader()
     , mFileSize(0)
 {
     clearCtx();
+    mCtx.index = 0;
 }
 
 void ESMReader::restoreContext(const ESM_Context &rc)

From c7edca559bb489862c4996314d1231d7ed41e446 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sat, 13 Nov 2021 14:11:37 +0300
Subject: [PATCH 1697/2859] Morph geometry more like NifSkope (bug #6416)

---
 CHANGELOG.md                           |  1 +
 components/nifosg/controller.cpp       |  2 +-
 components/nifosg/nifloader.cpp        |  5 +++--
 components/sceneutil/morphgeometry.cpp | 22 ++++++++++++----------
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb86227f6c..d030b44859 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -74,6 +74,7 @@
     Bug #6363: Some scripts in Morrowland fail to work
     Bug #6376: Creatures should be able to use torches
     Bug #6386: Artifacts in water reflection due to imprecise screen-space coordinate computation
+    Bug #6416: Morphs are applied to the wrong target
     Feature #890: OpenMW-CS: Column filtering
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
     Feature #2780: A way to see current OpenMW version in the console
diff --git a/components/nifosg/controller.cpp b/components/nifosg/controller.cpp
index 956fe2e489..54300d34e8 100644
--- a/components/nifosg/controller.cpp
+++ b/components/nifosg/controller.cpp
@@ -224,7 +224,7 @@ void GeomMorpherController::operator()(SceneUtil::MorphGeometry* node, osg::Node
         if (mKeyFrames.size() <= 1)
             return;
         float input = getInputValue(nv);
-        int i = 0;
+        int i = 1;
         for (std::vector<FloatInterpolator>::iterator it = mKeyFrames.begin()+1; it != mKeyFrames.end(); ++it,++i)
         {
             float val = 0;
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index e46e2d934b..ef935db0a4 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -1259,8 +1259,9 @@ namespace NifOsg
             const std::vector<Nif::NiMorphData::MorphData>& morphs = morpher->data.getPtr()->mMorphs;
             if (morphs.empty())
                 return morphGeom;
-            // Note we are not interested in morph 0, which just contains the original vertices
-            for (unsigned int i = 1; i < morphs.size(); ++i)
+            if (morphs[0].mVertices.size() != static_cast<const osg::Vec3Array*>(sourceGeometry->getVertexArray())->size())
+                return morphGeom;
+            for (unsigned int i = 0; i < morphs.size(); ++i)
                 morphGeom->addMorphTarget(new osg::Vec3Array(morphs[i].mVertices.size(), morphs[i].mVertices.data()), 0.f);
 
             return morphGeom;
diff --git a/components/sceneutil/morphgeometry.cpp b/components/sceneutil/morphgeometry.cpp
index 59adbffffe..3e34e3dedc 100644
--- a/components/sceneutil/morphgeometry.cpp
+++ b/components/sceneutil/morphgeometry.cpp
@@ -104,8 +104,8 @@ void MorphGeometry::accept(osg::PrimitiveFunctor& func) const
 osg::BoundingBox MorphGeometry::computeBoundingBox() const
 {
     bool anyMorphTarget = false;
-    for (unsigned int i=0; i<mMorphTargets.size(); ++i)
-        if (mMorphTargets[i].getWeight() > 0)
+    for (unsigned int i=1; i<mMorphTargets.size(); ++i)
+        if (mMorphTargets[i].getWeight() != 0)
         {
             anyMorphTarget = true;
             break;
@@ -122,8 +122,10 @@ osg::BoundingBox MorphGeometry::computeBoundingBox() const
     {
         mMorphedBoundingBox = true;
 
-        osg::Vec3Array& sourceVerts = *static_cast<osg::Vec3Array*>(mSourceGeometry->getVertexArray());
-        std::vector<osg::BoundingBox> vertBounds(sourceVerts.size());
+        const osg::Vec3Array* sourceVerts = static_cast<const osg::Vec3Array*>(mSourceGeometry->getVertexArray());
+        if (mMorphTargets.size() != 0)
+            sourceVerts = mMorphTargets[0].getOffsets();
+        std::vector<osg::BoundingBox> vertBounds(sourceVerts->size());
 
         // Since we don't know what combinations of morphs are being applied we need to keep track of a bounding box for each vertex.
         // The minimum/maximum of the box is the minimum/maximum offset the vertex can have from its starting position.
@@ -132,7 +134,7 @@ osg::BoundingBox MorphGeometry::computeBoundingBox() const
         for (unsigned int i=0; i<vertBounds.size(); ++i)
             vertBounds[i].set(osg::Vec3f(0,0,0), osg::Vec3f(0,0,0));
 
-        for (unsigned int i = 0; i < mMorphTargets.size(); ++i)
+        for (unsigned int i = 1; i < mMorphTargets.size(); ++i)
         {
             const osg::Vec3Array& offsets = *mMorphTargets[i].getOffsets();
             for (unsigned int j=0; j<offsets.size() && j<vertBounds.size(); ++j)
@@ -146,8 +148,8 @@ osg::BoundingBox MorphGeometry::computeBoundingBox() const
         osg::BoundingBox box;
         for (unsigned int i=0; i<vertBounds.size(); ++i)
         {
-            vertBounds[i]._max += sourceVerts[i];
-            vertBounds[i]._min += sourceVerts[i];
+            vertBounds[i]._max += (*sourceVerts)[i];
+            vertBounds[i]._min += (*sourceVerts)[i];
             box.expandBy(vertBounds[i]);
         }
         return box;
@@ -156,7 +158,7 @@ osg::BoundingBox MorphGeometry::computeBoundingBox() const
 
 void MorphGeometry::cull(osg::NodeVisitor *nv)
 {
-    if (mLastFrameNumber == nv->getTraversalNumber() || !mDirty)
+    if (mLastFrameNumber == nv->getTraversalNumber() || !mDirty || mMorphTargets.size() == 0)
     {
         osg::Geometry& geom = *getGeometry(mLastFrameNumber);
         nv->pushOntoNodePath(&geom);
@@ -169,13 +171,13 @@ void MorphGeometry::cull(osg::NodeVisitor *nv)
     mLastFrameNumber = nv->getTraversalNumber();
     osg::Geometry& geom = *getGeometry(mLastFrameNumber);
 
-    const osg::Vec3Array* positionSrc = static_cast<osg::Vec3Array*>(mSourceGeometry->getVertexArray());
+    const osg::Vec3Array* positionSrc = mMorphTargets[0].getOffsets();
     osg::Vec3Array* positionDst = static_cast<osg::Vec3Array*>(geom.getVertexArray());
     assert(positionSrc->size() == positionDst->size());
     for (unsigned int vertex=0; vertex<positionSrc->size(); ++vertex)
         (*positionDst)[vertex] = (*positionSrc)[vertex];
 
-    for (unsigned int i=0; i<mMorphTargets.size(); ++i)
+    for (unsigned int i=1; i<mMorphTargets.size(); ++i)
     {
         float weight = mMorphTargets[i].getWeight();
         if (weight == 0.f)

From bee94e2afc69f438d9038c67b83b47f4120efe4c Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 13 Nov 2021 14:06:21 +0100
Subject: [PATCH 1698/2859] Treat commas in scripts as whitespace

---
 CHANGELOG.md                                  |  1 +
 .../mwscript/test_scripts.cpp                 | 15 ++++++++
 components/compiler/discardparser.cpp         | 19 ++--------
 components/compiler/discardparser.hpp         |  2 +-
 components/compiler/exprparser.cpp            | 21 -----------
 components/compiler/fileparser.cpp            |  5 ---
 components/compiler/lineparser.cpp            | 18 ++-------
 components/compiler/lineparser.hpp            |  2 +-
 components/compiler/scanner.cpp               |  4 --
 components/compiler/scanner.hpp               |  3 +-
 components/compiler/stringparser.cpp          | 37 +++++--------------
 components/compiler/stringparser.hpp          | 10 -----
 12 files changed, 36 insertions(+), 101 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb86227f6c..aa1cab9eab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -96,6 +96,7 @@
     Feature #6249: Alpha testing support for Collada
     Feature #6251: OpenMW-CS: Set instance movement based on camera zoom
     Feature #6288: Preserve the "blocked" record flag for referenceable objects.
+    Feature #6380: Commas are treated as whitespace in vanilla
     Task #6201: Remove the "Note: No relevant classes found. No output generated" warnings
     Task #6264: Remove the old classes in animation.cpp
 
diff --git a/apps/openmw_test_suite/mwscript/test_scripts.cpp b/apps/openmw_test_suite/mwscript/test_scripts.cpp
index 79db3bb414..c04860afdf 100644
--- a/apps/openmw_test_suite/mwscript/test_scripts.cpp
+++ b/apps/openmw_test_suite/mwscript/test_scripts.cpp
@@ -427,6 +427,16 @@ set 1 to 42
 
 End)mwscript";
 
+    const std::string sIssue6380 = R"mwscript(,Begin,issue6380,
+
+,short,a
+
+,set,a,to,,,,(a,+1)
+
+messagebox,"this is a %g",a
+
+,End,)mwscript";
+
     TEST_F(MWScriptTest, mwscript_test_invalid)
     {
         EXPECT_THROW(compile("this is not a valid script", true), Compiler::SourceException);
@@ -831,4 +841,9 @@ End)mwscript";
             FAIL();
         }
     }
+
+    TEST_F(MWScriptTest, mwscript_test_6380)
+    {
+        EXPECT_FALSE(!compile(sIssue6380));
+    }
 }
\ No newline at end of file
diff --git a/components/compiler/discardparser.cpp b/components/compiler/discardparser.cpp
index 0e7c4718cb..0a714d4eb6 100644
--- a/components/compiler/discardparser.cpp
+++ b/components/compiler/discardparser.cpp
@@ -12,7 +12,7 @@ namespace Compiler
 
     bool DiscardParser::parseInt (int value, const TokenLoc& loc, Scanner& scanner)
     {
-        if (mState==StartState || mState==CommaState || mState==MinusState)
+        if (mState==StartState || mState==MinusState)
         {
             if (isEmpty())
                 mTokenLoc = loc;
@@ -26,7 +26,7 @@ namespace Compiler
 
     bool DiscardParser::parseFloat (float value, const TokenLoc& loc, Scanner& scanner)
     {
-        if (mState==StartState || mState==CommaState || mState==MinusState)
+        if (mState==StartState || mState==MinusState)
         {
             if (isEmpty())
                 mTokenLoc = loc;
@@ -41,7 +41,7 @@ namespace Compiler
     bool DiscardParser::parseName (const std::string& name, const TokenLoc& loc,
         Scanner& scanner)
     {
-        if (mState==StartState || mState==CommaState)
+        if (mState==StartState)
         {
             if (isEmpty())
                 mTokenLoc = loc;
@@ -55,18 +55,7 @@ namespace Compiler
 
     bool DiscardParser::parseSpecial (int code, const TokenLoc& loc, Scanner& scanner)
     {
-        if (code==Scanner::S_comma && mState==StartState)
-        {
-            if (isEmpty())
-                mTokenLoc = loc;
-
-            start();
-
-            mState = CommaState;
-            return true;
-        }
-
-        if (code==Scanner::S_minus && (mState==StartState || mState==CommaState))
+        if (code==Scanner::S_minus && mState==StartState)
         {
             if (isEmpty())
                 mTokenLoc = loc;
diff --git a/components/compiler/discardparser.hpp b/components/compiler/discardparser.hpp
index 15e06756e2..5286676654 100644
--- a/components/compiler/discardparser.hpp
+++ b/components/compiler/discardparser.hpp
@@ -11,7 +11,7 @@ namespace Compiler
     {
             enum State
             {
-                StartState, CommaState, MinusState
+                StartState, MinusState
             };
 
             State mState;
diff --git a/components/compiler/exprparser.cpp b/components/compiler/exprparser.cpp
index 1aedc8dc59..668946f839 100644
--- a/components/compiler/exprparser.cpp
+++ b/components/compiler/exprparser.cpp
@@ -244,7 +244,6 @@ namespace Compiler
         }
         else
         {
-            // no comma was used between arguments
             scanner.putbackInt (value, loc);
             return false;
         }
@@ -267,7 +266,6 @@ namespace Compiler
         }
         else
         {
-            // no comma was used between arguments
             scanner.putbackFloat (value, loc);
             return false;
         }
@@ -343,7 +341,6 @@ namespace Compiler
         }
         else
         {
-            // no comma was used between arguments
             scanner.putbackName (name, loc);
             return false;
         }
@@ -452,7 +449,6 @@ namespace Compiler
         }
         else
         {
-            // no comma was used between arguments
             scanner.putbackKeyword (keyword, loc);
             return false;
         }
@@ -487,22 +483,6 @@ namespace Compiler
             return Parser::parseSpecial (code, loc, scanner);
         }
 
-        if (code==Scanner::S_comma)
-        {
-            mTokenLoc = loc;
-
-            if (mFirst)
-            {
-                // leading comma
-                mFirst = false;
-                return true;
-            }
-
-            // end marker
-            scanner.putbackSpecial (code, loc);
-            return false;
-        }
-
         mFirst = false;
 
         if (code==Scanner::S_newline)
@@ -539,7 +519,6 @@ namespace Compiler
             }
             else
             {
-                // no comma was used between arguments
                 scanner.putbackSpecial (code, loc);
                 return false;
             }
diff --git a/components/compiler/fileparser.cpp b/components/compiler/fileparser.cpp
index c7459c2ae7..9d5c02785e 100644
--- a/components/compiler/fileparser.cpp
+++ b/components/compiler/fileparser.cpp
@@ -121,11 +121,6 @@ namespace Compiler
                 return false;
             }
         }
-        else if (code==Scanner::S_comma && (mState==NameState || mState==EndNameState))
-        {
-            // ignoring comma (for now)
-            return true;
-        }
 
         return Parser::parseSpecial (code, loc, scanner);
     }
diff --git a/components/compiler/lineparser.cpp b/components/compiler/lineparser.cpp
index ec90812ec7..2e398618a3 100644
--- a/components/compiler/lineparser.cpp
+++ b/components/compiler/lineparser.cpp
@@ -136,7 +136,7 @@ namespace Compiler
             return false;
         }
 
-        if (mState==MessageState || mState==MessageCommaState)
+        if (mState==MessageState)
         {
             GetArgumentsFromMessageFormat processor;
             processor.process(name);
@@ -155,7 +155,7 @@ namespace Compiler
             return true;
         }
 
-        if (mState==MessageButtonState || mState==MessageButtonCommaState)
+        if (mState==MessageButtonState)
         {
             Generator::pushString (mCode, mLiterals, name);
             mState = MessageButtonState;
@@ -198,7 +198,7 @@ namespace Compiler
 
     bool LineParser::parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner)
     {
-        if (mState==MessageState || mState==MessageCommaState)
+        if (mState==MessageState)
         {
             if (const Extensions *extensions = getContext().getExtensions())
             {
@@ -446,12 +446,6 @@ namespace Compiler
         if (code==Scanner::S_newline && (mState==EndState || mState==BeginState))
             return false;
 
-        if (code==Scanner::S_comma && mState==MessageState)
-        {
-            mState = MessageCommaState;
-            return true;
-        }
-
         if (code==Scanner::S_ref && mState==SetPotentialMemberVarState)
         {
             getErrorHandler().warning ("Stray explicit reference", loc);
@@ -479,12 +473,6 @@ namespace Compiler
             return false;
         }
 
-        if (code==Scanner::S_comma && mState==MessageButtonState)
-        {
-            mState = MessageButtonCommaState;
-            return true;
-        }
-
         if (code==Scanner::S_member && mState==SetPotentialMemberVarState)
         {
             mState = SetMemberVarState;
diff --git a/components/compiler/lineparser.hpp b/components/compiler/lineparser.hpp
index c434792d18..2a0e5d6630 100644
--- a/components/compiler/lineparser.hpp
+++ b/components/compiler/lineparser.hpp
@@ -24,7 +24,7 @@ namespace Compiler
                 BeginState,
                 SetState, SetLocalVarState, SetGlobalVarState, SetPotentialMemberVarState,
                 SetMemberVarState, SetMemberVarState2,
-                MessageState, MessageCommaState, MessageButtonState, MessageButtonCommaState,
+                MessageState, MessageButtonState,
                 EndState, PotentialExplicitState, ExplicitState, MemberState
             };
 
diff --git a/components/compiler/scanner.cpp b/components/compiler/scanner.cpp
index 0e2b76cb23..6cf2d6e7c0 100644
--- a/components/compiler/scanner.cpp
+++ b/components/compiler/scanner.cpp
@@ -531,8 +531,6 @@ namespace Compiler
             else
                 special = S_cmpGT;
         }
-        else if (c==',')
-            special = S_comma;
         else if (c=='+')
             special = S_plus;
         else if (c=='*')
@@ -552,8 +550,6 @@ namespace Compiler
             mTolerantNames = tolerant;
             return out;
         }
-        else if (expectName && special == S_comma)
-            mExpectName = true;
 
         TokenLoc loc (mLoc);
         mLoc.mLiteral.clear();
diff --git a/components/compiler/scanner.hpp b/components/compiler/scanner.hpp
index 8ee2672132..7a77811f2a 100644
--- a/components/compiler/scanner.hpp
+++ b/components/compiler/scanner.hpp
@@ -63,7 +63,7 @@ namespace Compiler
 
         bool isWhitespace()
         {
-            return (mData[0]==' ' || mData[0]=='\t') && mData[1]==0 && mData[2]==0 && mData[3]==0;
+            return (mData[0]==' ' || mData[0]=='\t' || mData[0]==',') && mData[1]==0 && mData[2]==0 && mData[3]==0;
         }
 
         bool isDigit()
@@ -214,7 +214,6 @@ namespace Compiler
                 S_open, S_close,
                 S_cmpEQ, S_cmpNE, S_cmpLT, S_cmpLE, S_cmpGT, S_cmpGE,
                 S_plus, S_minus, S_mult, S_div,
-                S_comma,
                 S_ref,
                 S_member
             };
diff --git a/components/compiler/stringparser.cpp b/components/compiler/stringparser.cpp
index 4e0114e0a1..a6423211c2 100644
--- a/components/compiler/stringparser.cpp
+++ b/components/compiler/stringparser.cpp
@@ -13,7 +13,7 @@
 namespace Compiler
 {
     StringParser::StringParser (ErrorHandler& errorHandler, const Context& context, Literals& literals)
-    : Parser (errorHandler, context), mLiterals (literals), mState (StartState), mSmashCase (false), mDiscard (false)
+    : Parser (errorHandler, context), mLiterals (literals), mSmashCase (false), mDiscard (false)
     {
 
     }
@@ -21,23 +21,18 @@ namespace Compiler
     bool StringParser::parseName (const std::string& name, const TokenLoc& loc,
         Scanner& scanner)
     {
-        if (mState==StartState || mState==CommaState)
-        {
-            start();
-            mTokenLoc = loc;
-
-            if (!mDiscard)
-            {
-                if (mSmashCase)
-                    Generator::pushString (mCode, mLiterals, Misc::StringUtils::lowerCase (name));
-                else
-                    Generator::pushString (mCode, mLiterals, name);
-            }
+        start();
+        mTokenLoc = loc;
 
-            return false;
+        if (!mDiscard)
+        {
+            if (mSmashCase)
+                Generator::pushString (mCode, mLiterals, Misc::StringUtils::lowerCase (name));
+            else
+                Generator::pushString (mCode, mLiterals, name);
         }
 
-        return Parser::parseName (name, loc, scanner);
+        return false;
     }
 
     bool StringParser::parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner)
@@ -75,17 +70,6 @@ namespace Compiler
         return Parser::parseKeyword (keyword, loc, scanner);
     }
 
-    bool StringParser::parseSpecial (int code, const TokenLoc& loc, Scanner& scanner)
-    {
-        if (code==Scanner::S_comma && mState==StartState)
-        {
-            mState = CommaState;
-            return true;
-        }
-
-        return Parser::parseSpecial (code, loc, scanner);
-    }
-
     bool StringParser::parseInt (int value, const TokenLoc& loc, Scanner& scanner)
     {
         reportWarning("Treating integer argument as a string", loc);
@@ -99,7 +83,6 @@ namespace Compiler
 
     void StringParser::reset()
     {
-        mState = StartState;
         mCode.clear();
         mSmashCase = false;
         mTokenLoc = TokenLoc();
diff --git a/components/compiler/stringparser.hpp b/components/compiler/stringparser.hpp
index 07b61d8fda..cdc7c676a7 100644
--- a/components/compiler/stringparser.hpp
+++ b/components/compiler/stringparser.hpp
@@ -14,13 +14,7 @@ namespace Compiler
 
     class StringParser : public Parser
     {
-            enum State
-            {
-                StartState, CommaState
-            };
-
             Literals& mLiterals;
-            State mState;
             std::vector<Interpreter::Type_Code> mCode;
             bool mSmashCase;
             TokenLoc mTokenLoc;
@@ -39,10 +33,6 @@ namespace Compiler
             ///< Handle a keyword token.
             /// \return fetch another token?
 
-            bool parseSpecial (int code, const TokenLoc& loc, Scanner& scanner) override;
-            ///< Handle a special character token.
-            /// \return fetch another token?
-
             bool parseInt (int value, const TokenLoc& loc, Scanner& scanner) override;
             ///< Handle an int token.
             /// \return fetch another token?

From e1d28a1af300032e6ed4263dc276e97b74f421cd Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Sat, 13 Nov 2021 13:41:07 +0000
Subject: [PATCH 1699/2859] Only allow macOS builds on OpenMW's fork of openmw

---
 .gitlab-ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 18fbbd91a1..b9ce5612e2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -163,8 +163,7 @@ Debian_Clang_tests_Debug:
   stage: build
   only:
     variables:
-      - $CI_PROJECT_ID == "7107382"
-      - $CI_PIPELINE_SOURCE == "push"    
+      - $CI_PROJECT_ID == "7107382" && $CI_PIPELINE_SOURCE == "push"
   cache:
     paths:
     - ccache/

From 73e9d7f3156c52fade63654379d8c41ed44dd8c0 Mon Sep 17 00:00:00 2001
From: Mads Buvik Sandvei <madssandvei@protonmail.com>
Date: Sat, 13 Nov 2021 13:48:12 +0000
Subject: [PATCH 1700/2859] Recompute minimum settings window size based on tab
 bar size

---
 apps/openmw/mwgui/settingswindow.cpp | 28 ++++++++++++++++++++++++++++
 apps/openmw/mwgui/settingswindow.hpp |  2 ++
 2 files changed, 30 insertions(+)

diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index 257c129e8c..4951d69844 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -267,6 +267,8 @@ namespace MWGui
         mKeyboardSwitch->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onKeyboardSwitchClicked);
         mControllerSwitch->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onControllerSwitchClicked);
 
+        computeMinimumWindowSize();
+
         center();
 
         mResetControlsButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onResetDefaultBindings);
@@ -739,6 +741,32 @@ namespace MWGui
         layoutControlsBox();
     }
 
+    void SettingsWindow::computeMinimumWindowSize()
+    {
+        auto* window = mMainWidget->castType<MyGUI::Window>();
+        auto minSize = window->getMinSize();
+
+        // Window should be at minimum wide enough to show all tabs.
+        int tabBarWidth = 0;
+        for (uint32_t i = 0; i < mSettingsTab->getItemCount(); i++)
+        {
+            tabBarWidth += mSettingsTab->getButtonWidthAt(i);
+        }
+
+        // Need to include window margins
+        int margins = mMainWidget->getWidth() - mSettingsTab->getWidth();
+        int minimumWindowWidth = tabBarWidth + margins;
+
+        if (minimumWindowWidth > minSize.width)
+        {
+            minSize.width = minimumWindowWidth;
+            window->setMinSize(minSize);
+
+            // Make a dummy call to setSize so MyGUI can apply any resize resulting from the change in MinSize
+            mMainWidget->setSize(mMainWidget->getSize());
+        }
+    }
+
     void SettingsWindow::resetScrollbars()
     {
         mResolutionList->setScrollPosition(0);
diff --git a/apps/openmw/mwgui/settingswindow.hpp b/apps/openmw/mwgui/settingswindow.hpp
index 9c28733f9a..5b04da553b 100644
--- a/apps/openmw/mwgui/settingswindow.hpp
+++ b/apps/openmw/mwgui/settingswindow.hpp
@@ -75,6 +75,8 @@ namespace MWGui
             void updateSliderLabel(MyGUI::ScrollBar* scroller, const std::string& value);
 
             void layoutControlsBox();
+
+            void computeMinimumWindowSize();
         
         private:
             void resetScrollbars();

From b918135b4b0906934a8c0ada8e5947b8f253e5e3 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sat, 13 Nov 2021 00:23:16 +0300
Subject: [PATCH 1701/2859] Factor race weight into magic projectile speed (bug
 #6343)

---
 CHANGELOG.md                                    |  1 +
 apps/openmw/mwworld/projectilemanager.cpp       | 13 +++++++++++--
 docs/source/reference/modding/settings/game.rst |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6017f62db4..34ab40098e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -69,6 +69,7 @@
     Bug #6323: Wyrmhaven: Alboin doesn't follower the player character out of his house
     Bug #6326: Detect Enchantment/Key should detect items in unresolved containers
     Bug #6327: Blocking roots the character in place
+    Bug #6343: Magic projectile speed doesn't take race weight into account
     Bug #6347: PlaceItem/PlaceItemCell/PlaceAt should work with levelled creatures
     Bug #6354: SFX abruptly cut off after crossing max distance; implement soft fading of sound effects
     Bug #6363: Some scripts in Morrowland fail to work
diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index e6a7195f5a..3bff1854a6 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -22,6 +22,8 @@
 #include <components/sceneutil/lightmanager.hpp>
 #include <components/sceneutil/nodecallback.hpp>
 
+#include <components/settings/settings.hpp>
+
 #include "../mwworld/manualref.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
@@ -407,6 +409,7 @@ namespace MWWorld
 
     void ProjectileManager::moveMagicBolts(float duration)
     {
+        static const bool normaliseRaceSpeed = Settings::Manager::getBool("normalise race speed", "Game");
         for (auto& magicBoltState : mMagicBolts)
         {
             if (magicBoltState.mToDelete)
@@ -426,10 +429,16 @@ namespace MWWorld
                 }
             }
 
+            const auto& store = MWBase::Environment::get().getWorld()->getStore();
             osg::Quat orient = magicBoltState.mNode->getAttitude();
-            static float fTargetSpellMaxSpeed = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>()
-                        .find("fTargetSpellMaxSpeed")->mValue.getFloat();
+            static float fTargetSpellMaxSpeed = store.get<ESM::GameSetting>().find("fTargetSpellMaxSpeed")->mValue.getFloat();
             float speed = fTargetSpellMaxSpeed * magicBoltState.mSpeed;
+            if (!normaliseRaceSpeed && !caster.isEmpty() && caster.getClass().isNpc())
+            {
+                const auto npc = caster.get<ESM::NPC>()->mBase;
+                const auto race = store.get<ESM::Race>().find(npc->mRace);
+                speed *= npc->isMale() ? race->mData.mWeight.mMale : race->mData.mWeight.mFemale;
+            }
             osg::Vec3f direction = orient * osg::Vec3f(0,1,0);
             direction.normalize();
             projectile->setVelocity(direction * speed);
diff --git a/docs/source/reference/modding/settings/game.rst b/docs/source/reference/modding/settings/game.rst
index 58d5345f65..605be3f6af 100644
--- a/docs/source/reference/modding/settings/game.rst
+++ b/docs/source/reference/modding/settings/game.rst
@@ -275,7 +275,7 @@ normalise race speed
 :Range:		True/False
 :Default:	False
 
-By default race weight is factored into horizontal movement speed like in Morrowind.
+By default race weight is factored into horizontal movement and magic projectile speed like in Morrowind.
 For example, an NPC which has 1.2 race weight is faster than an NPC with the exact same stats and weight 1.0 by a factor of 120%.
 If this setting is true, race weight is ignored in the calculations which allows for a movement behavior
 equivalent to the one introduced by the equivalent Morrowind Code Patch feature.

From 08a25c2b1fc7c989077be6abea15ddcb678ac3b6 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 13 Nov 2021 16:14:50 +0100
Subject: [PATCH 1702/2859] Support seed type different from std::size_t for
 hashCombine

---
 components/misc/hash.hpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/components/misc/hash.hpp b/components/misc/hash.hpp
index 30a9c41ee9..861df73772 100644
--- a/components/misc/hash.hpp
+++ b/components/misc/hash.hpp
@@ -1,15 +1,20 @@
 #ifndef MISC_HASH_H
 #define MISC_HASH_H
 
+#include <cstddef>
+#include <cstdint>
+#include <functional>
+
 namespace Misc
 {
     /// Implemented similar to the boost::hash_combine
-    template <class T>
-    inline void hashCombine(std::size_t& seed, const T& v)
+    template <class Seed, class T>
+    inline void hashCombine(Seed& seed, const T& v)
     {
+        static_assert(sizeof(Seed) >= sizeof(std::size_t), "Resulting hash will be truncated");
         std::hash<T> hasher;
-        seed ^= hasher(v) + 0x9e3779b9 + (seed<<6) + (seed>>2);
+        seed ^= static_cast<Seed>(hasher(v) + 0x9e3779b9 + (seed<<6) + (seed>>2));
     }
 }
 
-#endif
\ No newline at end of file
+#endif

From 59ce00f74271400c5c6484be575caf631a74842f Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sat, 13 Nov 2021 19:14:28 +0300
Subject: [PATCH 1703/2859] Refactor all present Bethesda Havok 'support'

---
 components/nif/physics.cpp   |  73 ++++++++++++++-------
 components/nif/physics.hpp   | 119 ++++++++++++++++++++++++-----------
 components/nif/recordptr.hpp |   5 +-
 3 files changed, 136 insertions(+), 61 deletions(-)

diff --git a/components/nif/physics.cpp b/components/nif/physics.cpp
index 992a56c9b7..ba78f7a9cd 100644
--- a/components/nif/physics.cpp
+++ b/components/nif/physics.cpp
@@ -3,52 +3,79 @@
 
 namespace Nif
 {
-    void bhkCollisionObject::read(NIFStream *nif)
+
+    /// Non-record data types
+
+    void bhkWorldObjCInfoProperty::read(NIFStream *nif)
     {
-        NiCollisionObject::read(nif);
-        mFlags = nif->getUShort();
-        mBody.read(nif);
+        mData = nif->getUInt();
+        mSize = nif->getUInt();
+        mCapacityAndFlags = nif->getUInt();
     }
 
-    void bhkWorldObject::read(NIFStream *nif)
+    void bhkWorldObjectCInfo::read(NIFStream *nif)
     {
-        mShape.read(nif);
-        if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB_OLD)
-            nif->skip(4); // Unknown
-        mFlags = nif->getUInt();
         nif->skip(4); // Unused
-        mWorldObjectInfo.mPhaseType = nif->getChar();
+        mPhaseType = static_cast<BroadPhaseType>(nif->getChar());
         nif->skip(3); // Unused
-        mWorldObjectInfo.mData = nif->getUInt();
-        mWorldObjectInfo.mSize = nif->getUInt();
-        mWorldObjectInfo.mCapacityAndFlags = nif->getUInt();
+        mProperty.read(nif);
     }
 
-    void bhkWorldObject::post(NIFFile *nif)
+    void HavokMaterial::read(NIFStream *nif)
     {
-        mShape.post(nif);
+        if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB_OLD)
+            nif->skip(4); // Unknown
+        mMaterial = nif->getUInt();
     }
 
-    void bhkEntity::read(NIFStream *nif)
+    void HavokFilter::read(NIFStream *nif)
+    {
+        mLayer = nif->getChar();
+        mFlags = nif->getChar();
+        mGroup = nif->getUShort();
+    }
+
+    void hkSubPartData::read(NIFStream *nif)
+    {
+        mHavokFilter.read(nif);
+        mNumVertices = nif->getUInt();
+        mHavokMaterial.read(nif);
+    }
+
+    void bhkEntityCInfo::read(NIFStream *nif)
     {
-        bhkWorldObject::read(nif);
         mResponseType = static_cast<hkResponseType>(nif->getChar());
         nif->skip(1); // Unused
         mProcessContactDelay = nif->getUShort();
     }
 
-    void HavokMaterial::read(NIFStream *nif)
+    /// Record types
+
+    void bhkCollisionObject::read(NIFStream *nif)
+    {
+        NiCollisionObject::read(nif);
+        mFlags = nif->getUShort();
+        mBody.read(nif);
+    }
+
+    void bhkWorldObject::read(NIFStream *nif)
     {
+        mShape.read(nif);
         if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB_OLD)
             nif->skip(4); // Unknown
-        mMaterial = nif->getUInt();
+        mHavokFilter.read(nif);
+        mWorldObjectInfo.read(nif);
     }
 
-    void hkSubPartData::read(NIFStream *nif)
+    void bhkWorldObject::post(NIFFile *nif)
     {
-        mHavokFilter = nif->getUInt();
-        mNumVertices = nif->getUInt();
-        mHavokMaterial.read(nif);
+        mShape.post(nif);
+    }
+
+    void bhkEntity::read(NIFStream *nif)
+    {
+        bhkWorldObject::read(nif);
+        mInfo.read(nif);
     }
 
 } // Namespace
\ No newline at end of file
diff --git a/components/nif/physics.hpp b/components/nif/physics.hpp
index ca31512c71..dc365cf099 100644
--- a/components/nif/physics.hpp
+++ b/components/nif/physics.hpp
@@ -8,6 +8,82 @@
 namespace Nif
 {
 
+/// Non-record data types
+
+struct bhkWorldObjCInfoProperty
+{
+    unsigned int mData;
+    unsigned int mSize;
+    unsigned int mCapacityAndFlags;
+    void read(NIFStream *nif);
+};
+
+enum class BroadPhaseType : uint8_t
+{
+    BroadPhase_Invalid = 0,
+    BroadPhase_Entity = 1,
+    BroadPhase_Phantom = 2,
+    BroadPhase_Border = 3
+};
+
+struct bhkWorldObjectCInfo
+{
+    BroadPhaseType mPhaseType;
+    bhkWorldObjCInfoProperty mProperty;
+    void read(NIFStream *nif);
+};
+
+struct HavokMaterial
+{
+    unsigned int mMaterial;
+    void read(NIFStream *nif);
+};
+
+struct HavokFilter
+{
+    unsigned char mLayer;
+    unsigned char mFlags;
+    unsigned short mGroup;
+    void read(NIFStream *nif);
+};
+
+struct hkSubPartData
+{
+    HavokMaterial mHavokMaterial;
+    unsigned int mNumVertices;
+    HavokFilter mHavokFilter;
+    void read(NIFStream *nif);
+};
+
+enum class hkResponseType : uint8_t
+{
+    Response_Invalid = 0,
+    Response_SimpleContact = 1,
+    Response_Reporting = 2,
+    Response_None = 3
+};
+
+struct bhkEntityCInfo
+{
+    hkResponseType mResponseType;
+    unsigned short mProcessContactDelay;
+    void read(NIFStream *nif);
+}
+
+/// Record types
+
+// Abstract Bethesda Havok object
+struct bhkRefObject : public Record {};
+
+// Abstract serializable Bethesda Havok object
+struct bhkSerializable : public bhkRefObject {};
+
+// Abstract narrowphase collision detection object
+struct bhkShape : public bhkSerializable {};
+
+// Abstract bhkShape collection
+struct bhkShapeCollection : public bhkShape {};
+
 // Generic collision object
 struct NiCollisionObject : public Record
 {
@@ -28,7 +104,7 @@ struct NiCollisionObject : public Record
 struct bhkCollisionObject : public NiCollisionObject
 {
     unsigned short mFlags;
-    CollisionBodyPtr mBody;
+    bhkWorldObjectPtr mBody;
 
     void read(NIFStream *nif) override;
     void post(NIFFile *nif) override
@@ -39,52 +115,21 @@ struct bhkCollisionObject : public NiCollisionObject
 };
 
 // Abstract Havok shape info record
-struct bhkWorldObject : public Record
+struct bhkWorldObject : public bhkSerializable
 {
     bhkShapePtr mShape;
-    unsigned int mFlags; // Havok layer type, collision filter flags and group
-    struct WorldObjectInfo
-    {
-        unsigned char mPhaseType;
-        unsigned int mData;
-        unsigned int mSize;
-        unsigned int mCapacityAndFlags;
-    };
-    WorldObjectInfo mWorldObjectInfo;
+    HavokFilter mHavokFilter;
+    bhkWorldObjectCInfo mWorldObjectInfo;
     void read(NIFStream *nif) override;
     void post(NIFFile *nif) override;
 };
 
-struct bhkShape : public Record {};
-
-enum class hkResponseType : uint8_t
-{
-    Response_Invalid = 0,
-    Response_SimpleContact = 1,
-    Response_Reporting = 2,
-    Response_None = 3
-};
-
+// Abstract
 struct bhkEntity : public bhkWorldObject
 {
-    hkResponseType mResponseType;
-    unsigned short mProcessContactDelay;
+    bhkEntityCInfo mInfo;
     void read(NIFStream *nif) override;
 };
 
-struct HavokMaterial
-{
-    unsigned int mMaterial;
-    void read(NIFStream *nif);
-};
-
-struct hkSubPartData
-{
-    HavokMaterial mHavokMaterial;
-    unsigned int mNumVertices;
-    unsigned int mHavokFilter;
-    void read(NIFStream *nif);
-};
-
 } // Namespace
 #endif
\ No newline at end of file
diff --git a/components/nif/recordptr.hpp b/components/nif/recordptr.hpp
index a25480fe43..c97957c95a 100644
--- a/components/nif/recordptr.hpp
+++ b/components/nif/recordptr.hpp
@@ -151,6 +151,7 @@ struct NiAlphaProperty;
 struct NiCollisionObject;
 struct bhkWorldObject;
 struct bhkShape;
+struct bhkSerializable;
 
 using NodePtr = RecordPtrT<Node>;
 using ExtraPtr = RecordPtrT<Extra>;
@@ -179,7 +180,7 @@ using NiGeometryDataPtr = RecordPtrT<NiGeometryData>;
 using BSShaderPropertyPtr = RecordPtrT<BSShaderProperty>;
 using NiAlphaPropertyPtr = RecordPtrT<NiAlphaProperty>;
 using NiCollisionObjectPtr = RecordPtrT<NiCollisionObject>;
-using CollisionBodyPtr = RecordPtrT<bhkWorldObject>;
+using bhkWorldObjectPtr = RecordPtrT<bhkWorldObject>;
 using bhkShapePtr = RecordPtrT<bhkShape>;
 
 using NodeList = RecordListT<Node>;
@@ -188,6 +189,8 @@ using ExtraList = RecordListT<Extra>;
 using NiSourceTextureList = RecordListT<NiSourceTexture>;
 using NiFloatInterpolatorList = RecordListT<NiFloatInterpolator>;
 using NiTriStripsDataList = RecordListT<NiTriStripsData>;
+using bhkShapeList = RecordListT<bhkShape>;
+using bhkSerializableList = RecordListT<bhkSerializable>;
 
 } // Namespace
 #endif

From e7cc76bba2457d11aaec3af494fb98f11eeac041 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sat, 13 Nov 2021 19:23:37 +0300
Subject: [PATCH 1704/2859] Load bhkMoppBvTreeShape

---
 components/nif/niffile.cpp |  1 +
 components/nif/physics.cpp | 29 +++++++++++++++++++++++++++++
 components/nif/physics.hpp | 24 ++++++++++++++++++++++++
 components/nif/record.hpp  |  3 ++-
 4 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index dbe455fbd4..1bd4821395 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -143,6 +143,7 @@ static std::map<std::string,RecordFactoryEntry> makeFactory()
     factory["bhkCollisionObject"]           = {&construct <bhkCollisionObject>          , RC_bhkCollisionObject         };
     factory["BSDismemberSkinInstance"]      = {&construct <BSDismemberSkinInstance>     , RC_BSDismemberSkinInstance    };
     factory["NiControllerManager"]          = {&construct <NiControllerManager>         , RC_NiControllerManager        };
+    factory["bhkMoppBvTreeShape"]           = {&construct <bhkMoppBvTreeShape>          , RC_bhkMoppBvTreeShape         };
     return factory;
 }
 
diff --git a/components/nif/physics.cpp b/components/nif/physics.cpp
index ba78f7a9cd..3c43c160cd 100644
--- a/components/nif/physics.cpp
+++ b/components/nif/physics.cpp
@@ -42,6 +42,17 @@ namespace Nif
         mHavokMaterial.read(nif);
     }
 
+    void hkpMoppCode::read(NIFStream *nif)
+    {
+        unsigned int size = nif->getUInt();
+        if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,0))
+            mOffset = nif->getVector4();
+        if (nif->getBethVersion() > NIFFile::BethVersion::BETHVER_FO3)
+            nif->getChar(); // MOPP data build type
+        if (size)
+            nif->getChars(mData, size);
+    }
+
     void bhkEntityCInfo::read(NIFStream *nif)
     {
         mResponseType = static_cast<hkResponseType>(nif->getChar());
@@ -78,4 +89,22 @@ namespace Nif
         mInfo.read(nif);
     }
 
+    void bhkBvTreeShape::read(NIFStream *nif)
+    {
+        mShape.read(nif);
+    }
+
+    void bhkBvTreeShape::post(NIFFile *nif)
+    {
+        mShape.post(nif);
+    }
+
+    void bhkMoppBvTreeShape::read(NIFStream *nif)
+    {
+        bhkBvTreeShape::read(nif);
+        nif->skip(12); // Unused
+        mScale = nif->getFloat();
+        mMopp.read(nif);
+    }
+
 } // Namespace
\ No newline at end of file
diff --git a/components/nif/physics.hpp b/components/nif/physics.hpp
index dc365cf099..190cb42b1d 100644
--- a/components/nif/physics.hpp
+++ b/components/nif/physics.hpp
@@ -70,6 +70,13 @@ struct bhkEntityCInfo
     void read(NIFStream *nif);
 }
 
+struct hkpMoppCode
+{
+    osg::Vec4f mOffset;
+    std::vector<char> mData;
+    void read(NIFStream *nif);
+};
+
 /// Record types
 
 // Abstract Bethesda Havok object
@@ -131,5 +138,22 @@ struct bhkEntity : public bhkWorldObject
     void read(NIFStream *nif) override;
 };
 
+// Bethesda extension of hkpBvTreeShape
+// hkpBvTreeShape adds a bounding volume tree to an hkpShapeCollection
+struct bhkBvTreeShape : public bhkShape
+{
+    bhkShapePtr mShape;
+    void read(NIFStream *nif) override;
+    void post(NIFFile *nif) override;
+};
+
+// bhkBvTreeShape with Havok MOPP code
+struct bhkMoppBvTreeShape : public bhkBvTreeShape
+{
+    float mScale;
+    hkpMoppCode mMopp;
+    void read(NIFStream *nif) override;
+};
+
 } // Namespace
 #endif
\ No newline at end of file
diff --git a/components/nif/record.hpp b/components/nif/record.hpp
index 0b9b2dc998..47ce14969f 100644
--- a/components/nif/record.hpp
+++ b/components/nif/record.hpp
@@ -130,7 +130,8 @@ enum RecordType
   RC_NiCollisionObject,
   RC_bhkCollisionObject,
   RC_BSDismemberSkinInstance,
-  RC_NiControllerManager
+  RC_NiControllerManager,
+  RC_bhkMoppBvTreeShape
 };
 
 /// Base class for all records

From 83aa96e38f27de4fd9b7e1b33e17bf09c7e6673c Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sat, 13 Nov 2021 19:38:00 +0300
Subject: [PATCH 1705/2859] Load a bunch of triangle strip-based Havok records

---
 components/nif/niffile.cpp   |  3 ++
 components/nif/physics.cpp   | 72 ++++++++++++++++++++++++++++++++++++
 components/nif/physics.hpp   | 43 +++++++++++++++++++++
 components/nif/record.hpp    |  5 ++-
 components/nif/recordptr.hpp |  2 +
 5 files changed, 124 insertions(+), 1 deletion(-)

diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index 1bd4821395..5eb55e10d1 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -144,6 +144,9 @@ static std::map<std::string,RecordFactoryEntry> makeFactory()
     factory["BSDismemberSkinInstance"]      = {&construct <BSDismemberSkinInstance>     , RC_BSDismemberSkinInstance    };
     factory["NiControllerManager"]          = {&construct <NiControllerManager>         , RC_NiControllerManager        };
     factory["bhkMoppBvTreeShape"]           = {&construct <bhkMoppBvTreeShape>          , RC_bhkMoppBvTreeShape         };
+    factory["bhkNiTriStripsShape"]          = {&construct <bhkNiTriStripsShape>         , RC_bhkNiTriStripsShape        };
+    factory["bhkPackedNiTriStripsShape"]    = {&construct <bhkPackedNiTriStripsShape>   , RC_bhkPackedNiTriStripsShape  };
+    factory["hkPackedNiTriStripsData"]      = {&construct <hkPackedNiTriStripsData>     , RC_hkPackedNiTriStripsData    };
     return factory;
 }
 
diff --git a/components/nif/physics.cpp b/components/nif/physics.cpp
index 3c43c160cd..e447bc65df 100644
--- a/components/nif/physics.cpp
+++ b/components/nif/physics.cpp
@@ -60,6 +60,15 @@ namespace Nif
         mProcessContactDelay = nif->getUShort();
     }
 
+    void TriangleData::read(NIFStream *nif)
+    {
+        for (int i = 0; i < 3; i++)
+            mTriangle[i] = nif->getUShort();
+        mWeldingInfo = nif->getUShort();
+        if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB)
+            mNormal = nif->getVector3();
+    }
+
     /// Record types
 
     void bhkCollisionObject::read(NIFStream *nif)
@@ -107,4 +116,67 @@ namespace Nif
         mMopp.read(nif);
     }
 
+    void bhkNiTriStripsShape::read(NIFStream *nif)
+    {
+        mHavokMaterial.read(nif);
+        mRadius = nif->getFloat();
+        nif->skip(20); // Unused
+        mGrowBy = nif->getUInt();
+        if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,0))
+            mScale = nif->getVector4();
+        mData.read(nif);
+        unsigned int numFilters = nif->getUInt();
+        nif->getUInts(mFilters, numFilters);
+    }
+
+    void bhkNiTriStripsShape::post(NIFFile *nif)
+    {
+        mData.post(nif);
+    }
+
+    void bhkPackedNiTriStripsShape::read(NIFStream *nif)
+    {
+        if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB)
+        {
+            mSubshapes.resize(nif->getUShort());
+            for (hkSubPartData& subshape : mSubshapes)
+                subshape.read(nif);
+        }
+        mUserData = nif->getUInt();
+        nif->skip(4); // Unused
+        mRadius = nif->getFloat();
+        nif->skip(4); // Unused
+        mScale = nif->getVector4();
+        nif->skip(20); // Duplicates of the two previous fields
+        mData.read(nif);
+    }
+
+    void bhkPackedNiTriStripsShape::post(NIFFile *nif)
+    {
+        mData.post(nif);
+    }
+
+    void hkPackedNiTriStripsData::read(NIFStream *nif)
+    {
+        unsigned int numTriangles = nif->getUInt();
+        mTriangles.resize(numTriangles);
+        for (unsigned int i = 0; i < numTriangles; i++)
+            mTriangles[i].read(nif);
+
+        unsigned int numVertices = nif->getUInt();
+        bool compressed = false;
+        if (nif->getVersion() >= NIFFile::NIFVersion::VER_BGS)
+            compressed = nif->getBoolean();
+        if (!compressed)
+            nif->getVector3s(mVertices, numVertices);
+        else
+            nif->skip(6 * numVertices); // Half-precision vectors are not currently supported
+        if (nif->getVersion() >= NIFFile::NIFVersion::VER_BGS)
+        {
+            mSubshapes.resize(nif->getUShort());
+            for (hkSubPartData& subshape : mSubshapes)
+                subshape.read(nif);
+        }
+    }
+
 } // Namespace
\ No newline at end of file
diff --git a/components/nif/physics.hpp b/components/nif/physics.hpp
index 190cb42b1d..6c9fe685ef 100644
--- a/components/nif/physics.hpp
+++ b/components/nif/physics.hpp
@@ -77,6 +77,14 @@ struct hkpMoppCode
     void read(NIFStream *nif);
 };
 
+struct TriangleData
+{
+    unsigned short mTriangle[3];
+    unsigned short mWeldingInfo;
+    osg::Vec3f mNormal;
+    void read(NIFStream *nif);
+};
+
 /// Record types
 
 // Abstract Bethesda Havok object
@@ -155,5 +163,40 @@ struct bhkMoppBvTreeShape : public bhkBvTreeShape
     void read(NIFStream *nif) override;
 };
 
+// Bethesda triangle strip-based Havok shape collection
+struct bhkNiTriStripsShape : public bhkShape
+{
+    HavokMaterial mHavokMaterial;
+    float mRadius;
+    unsigned int mGrowBy;
+    osg::Vec4f mScale{1.f, 1.f, 1.f, 0.f};
+    NiTriStripsDataList mData;
+    std::vector<unsigned int> mFilters;
+    void read(NIFStream *nif) override;
+    void post(NIFFile *nif) override;
+};
+
+// Bethesda packed triangle strip-based Havok shape collection
+struct bhkPackedNiTriStripsShape : public bhkShapeCollection
+{
+    std::vector<hkSubPartData> mSubshapes;
+    unsigned int mUserData;
+    float mRadius;
+    osg::Vec4f mScale;
+    hkPackedNiTriStripsDataPtr mData;
+
+    void read(NIFStream *nif) override;
+    void post(NIFFile *nif) override;
+};
+
+// bhkPackedNiTriStripsShape data block
+struct hkPackedNiTriStripsData : public bhkShapeCollection
+{
+    std::vector<TriangleData> mTriangles;
+    std::vector<osg::Vec3f> mVertices;
+    std::vector<hkSubPartData> mSubshapes;
+    void read(NIFStream *nif) override;
+};
+
 } // Namespace
 #endif
\ No newline at end of file
diff --git a/components/nif/record.hpp b/components/nif/record.hpp
index 47ce14969f..804b13262d 100644
--- a/components/nif/record.hpp
+++ b/components/nif/record.hpp
@@ -131,7 +131,10 @@ enum RecordType
   RC_bhkCollisionObject,
   RC_BSDismemberSkinInstance,
   RC_NiControllerManager,
-  RC_bhkMoppBvTreeShape
+  RC_bhkMoppBvTreeShape,
+  RC_bhkNiTriStripsShape,
+  RC_bhkPackedNiTriStripsShape,
+  RC_hkPackedNiTriStripsData
 };
 
 /// Base class for all records
diff --git a/components/nif/recordptr.hpp b/components/nif/recordptr.hpp
index c97957c95a..cc62d7b2e0 100644
--- a/components/nif/recordptr.hpp
+++ b/components/nif/recordptr.hpp
@@ -152,6 +152,7 @@ struct NiCollisionObject;
 struct bhkWorldObject;
 struct bhkShape;
 struct bhkSerializable;
+struct hkPackedNiTriStripsData;
 
 using NodePtr = RecordPtrT<Node>;
 using ExtraPtr = RecordPtrT<Extra>;
@@ -182,6 +183,7 @@ using NiAlphaPropertyPtr = RecordPtrT<NiAlphaProperty>;
 using NiCollisionObjectPtr = RecordPtrT<NiCollisionObject>;
 using bhkWorldObjectPtr = RecordPtrT<bhkWorldObject>;
 using bhkShapePtr = RecordPtrT<bhkShape>;
+using hkPackedNiTriStripsDataPtr = RecordPtrT<hkPackedNiTriStripsData>;
 
 using NodeList = RecordListT<Node>;
 using PropertyList = RecordListT<Property>;

From c01fff280a45e9cc8edb7e5a9e526d142faa1fbb Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sat, 13 Nov 2021 19:53:03 +0300
Subject: [PATCH 1706/2859] Load bhkConvexVerticesShape, bhkBoxShape,
 bhkListShape

---
 components/nif/niffile.cpp |  3 +++
 components/nif/physics.cpp | 44 ++++++++++++++++++++++++++++++++++++++
 components/nif/physics.hpp | 42 ++++++++++++++++++++++++++++++++++++
 components/nif/record.hpp  |  5 ++++-
 4 files changed, 93 insertions(+), 1 deletion(-)

diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index 5eb55e10d1..a752478d75 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -147,6 +147,9 @@ static std::map<std::string,RecordFactoryEntry> makeFactory()
     factory["bhkNiTriStripsShape"]          = {&construct <bhkNiTriStripsShape>         , RC_bhkNiTriStripsShape        };
     factory["bhkPackedNiTriStripsShape"]    = {&construct <bhkPackedNiTriStripsShape>   , RC_bhkPackedNiTriStripsShape  };
     factory["hkPackedNiTriStripsData"]      = {&construct <hkPackedNiTriStripsData>     , RC_hkPackedNiTriStripsData    };
+    factory["bhkConvexVerticesShape"]       = {&construct <bhkConvexVerticesShape>      , RC_bhkConvexVerticesShape     };
+    factory["bhkBoxShape"]                  = {&construct <bhkBoxShape>                 , RC_bhkBoxShape                };
+    factory["bhkListShape"]                 = {&construct <bhkListShape>                , RC_bhkListShape               };
     return factory;
 }
 
diff --git a/components/nif/physics.cpp b/components/nif/physics.cpp
index e447bc65df..4809762576 100644
--- a/components/nif/physics.cpp
+++ b/components/nif/physics.cpp
@@ -179,4 +179,48 @@ namespace Nif
         }
     }
 
+    void bhkSphereRepShape::read(NIFStream *nif)
+    {
+        mHavokMaterial.read(nif);
+    }
+
+    void bhkConvexShape::read(NIFStream *nif)
+    {
+        bhkSphereRepShape::read(nif);
+        mRadius = nif->getFloat();
+    }
+
+    void bhkConvexVerticesShape::read(NIFStream *nif)
+    {
+        bhkConvexShape::read(nif);
+        mVerticesProperty.read(nif);
+        mNormalsProperty.read(nif);
+        unsigned int numVertices = nif->getUInt();
+        if (numVertices)
+            nif->getVector4s(mVertices, numVertices);
+        unsigned int numNormals = nif->getUInt();
+        if (numNormals)
+            nif->getVector4s(mNormals, numNormals);
+    }
+
+    void bhkBoxShape::read(NIFStream *nif)
+    {
+        bhkConvexShape::read(nif);
+        nif->skip(8); // Unused
+        mExtents = nif->getVector3();
+        nif->skip(4); // Unused
+    }
+
+    void bhkListShape::read(NIFStream *nif)
+    {
+        mSubshapes.read(nif);
+        mHavokMaterial.read(nif);
+        mChildShapeProperty.read(nif);
+        mChildFilterProperty.read(nif);
+        unsigned int numFilters = nif->getUInt();
+        mHavokFilters.resize(numFilters);
+        for (HavokFilter& filter : mHavokFilters)
+            filter.read(nif);
+    }
+
 } // Namespace
\ No newline at end of file
diff --git a/components/nif/physics.hpp b/components/nif/physics.hpp
index 6c9fe685ef..4828f34877 100644
--- a/components/nif/physics.hpp
+++ b/components/nif/physics.hpp
@@ -198,5 +198,47 @@ struct hkPackedNiTriStripsData : public bhkShapeCollection
     void read(NIFStream *nif) override;
 };
 
+// Abstract
+struct bhkSphereRepShape : public bhkShape
+{
+    HavokMaterial mHavokMaterial;
+    void read(NIFStream *nif) override;
+};
+
+// Abstract
+struct bhkConvexShape : public bhkSphereRepShape
+{
+    float mRadius;
+    void read(NIFStream} *nif) override;
+};
+
+// A convex shape built from vertices
+struct bhkConvexVerticesShape : public bhkConvexShape
+{
+    bhkWorldObjCInfoProperty mVerticesProperty;
+    bhkWorldObjCInfoProperty mNormalsProperty;
+    std::vector<osg::Vec4f> mVertices;
+    std::vector<osg::Vec4f> mNormals;
+    void read(NIFStream *nif) override;
+};
+
+// A box
+struct bhkBoxShape : public bhkConvexShape
+{
+    osg::Vec3f mExtents;
+    void read(NIFStream *nif) override;
+};
+
+// A list of shapes
+struct bhkListShape : public bhkShapeCollection
+{
+    bhkShapeList mSubshapes;
+    HavokMaterial mHavokMaterial;
+    bhkWorldObjCInfoProperty mChildShapeProperty;
+    bhkWorldObjCInfoProperty mChildFilterProperty;
+    std::vector<HavokFilter> mHavokFilters;
+    void read(NIFStream *nif) override;
+};
+
 } // Namespace
 #endif
\ No newline at end of file
diff --git a/components/nif/record.hpp b/components/nif/record.hpp
index 804b13262d..8648050d84 100644
--- a/components/nif/record.hpp
+++ b/components/nif/record.hpp
@@ -134,7 +134,10 @@ enum RecordType
   RC_bhkMoppBvTreeShape,
   RC_bhkNiTriStripsShape,
   RC_bhkPackedNiTriStripsShape,
-  RC_hkPackedNiTriStripsData
+  RC_hkPackedNiTriStripsData,
+  RC_bhkConvexVerticesShape,
+  RC_bhkBoxShape,
+  RC_bhkListShape
 };
 
 /// Base class for all records

From 25f4d05c2ebde31376ec84d63cb18d16ee3a8812 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sat, 13 Nov 2021 19:59:30 +0300
Subject: [PATCH 1707/2859] Load bhkRigidBody

---
 components/nif/niffile.cpp |  2 +
 components/nif/physics.cpp | 87 +++++++++++++++++++++++++++++++++++++
 components/nif/physics.hpp | 89 ++++++++++++++++++++++++++++++++++++++
 components/nif/record.hpp  |  4 +-
 4 files changed, 181 insertions(+), 1 deletion(-)

diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index a752478d75..82dab3bcee 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -150,6 +150,8 @@ static std::map<std::string,RecordFactoryEntry> makeFactory()
     factory["bhkConvexVerticesShape"]       = {&construct <bhkConvexVerticesShape>      , RC_bhkConvexVerticesShape     };
     factory["bhkBoxShape"]                  = {&construct <bhkBoxShape>                 , RC_bhkBoxShape                };
     factory["bhkListShape"]                 = {&construct <bhkListShape>                , RC_bhkListShape               };
+    factory["bhkRigidBody"]                 = {&construct <bhkRigidBody>                , RC_bhkRigidBody               };
+    factory["bhkRigidBodyT"]                = {&construct <bhkRigidBody>                , RC_bhkRigidBodyT              };
     return factory;
 }
 
diff --git a/components/nif/physics.cpp b/components/nif/physics.cpp
index 4809762576..9bbeb148dd 100644
--- a/components/nif/physics.cpp
+++ b/components/nif/physics.cpp
@@ -69,6 +69,82 @@ namespace Nif
             mNormal = nif->getVector3();
     }
 
+    void bhkRigidBodyCInfo::read(NIFStream *nif)
+    {
+        if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,0))
+        {
+            nif->skip(4); // Unused
+            mHavokFilter.read(nif);
+            nif->skip(4); // Unused
+            if (nif->getBethVersion() != NIFFile::BethVersion::BETHVER_FO4)
+            {
+                if (nif->getBethVersion() >= 83)
+                    nif->skip(4); // Unused
+                mResponseType = static_cast<hkResponseType>(nif->getChar());
+                nif->skip(1); // Unused
+                mProcessContactDelay = nif->getUShort();
+            }
+        }
+        if (nif->getBethVersion() < 83)
+            nif->skip(4); // Unused
+        mTranslation = nif->getVector4();
+        mRotation = nif->getQuaternion();
+        mLinearVelocity = nif->getVector4();
+        mAngularVelocity = nif->getVector4();
+        for (int i = 0; i < 3; i++)
+            for (int j = 0; j < 4; j++)
+                mInertiaTensor[i][j] = nif->getFloat();
+        mCenter = nif->getVector4();
+        mMass = nif->getFloat();
+        mLinearDamping = nif->getFloat();
+        mAngularDamping = nif->getFloat();
+        if (nif->getBethVersion() >= 83)
+        {
+            if (nif->getBethVersion() != NIFFile::BethVersion::BETHVER_FO4)
+                mTimeFactor = nif->getFloat();
+            mGravityFactor = nif->getFloat();
+        }
+        mFriction = nif->getFloat();
+        if (nif->getBethVersion() >= 83)
+            mRollingFrictionMult = nif->getFloat();
+        mRestitution = nif->getFloat();
+        if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,0))
+        {
+            mMaxLinearVelocity = nif->getFloat();
+            mMaxAngularVelocity = nif->getFloat();
+            if (nif->getBethVersion() != NIFFile::BethVersion::BETHVER_FO4)
+                mPenetrationDepth = nif->getFloat();
+        }
+        mMotionType = static_cast<hkMotionType>(nif->getChar());
+        if (nif->getBethVersion() < 83)
+            mDeactivatorType = static_cast<hkDeactivatorType>(nif->getChar());
+        else
+            mEnableDeactivation = nif->getBoolean();
+        mSolverDeactivation = static_cast<hkSolverDeactivation>(nif->getChar());
+        if (nif->getBethVersion() == NIFFile::BethVersion::BETHVER_FO4)
+        {
+            nif->skip(1);
+            mPenetrationDepth = nif->getFloat();
+            mTimeFactor = nif->getFloat();
+            nif->skip(4);
+            mResponseType = static_cast<hkResponseType>(nif->getChar());
+            nif->skip(1); // Unused
+            mProcessContactDelay = nif->getUShort();
+        }
+        mQualityType = static_cast<hkQualityType>(nif->getChar());
+        if (nif->getBethVersion() >= 83)
+        {
+            mAutoRemoveLevel = nif->getChar();
+            mResponseModifierFlags = nif->getChar();
+            mNumContactPointShapeKeys = nif->getChar();
+            mForceCollidedOntoPPU = nif->getBoolean();
+        }
+        if (nif->getBethVersion() == NIFFile::BethVersion::BETHVER_FO4)
+            nif->skip(3); // Unused
+        else
+            nif->skip(12); // Unused
+    }
+
     /// Record types
 
     void bhkCollisionObject::read(NIFStream *nif)
@@ -223,4 +299,15 @@ namespace Nif
             filter.read(nif);
     }
 
+    void bhkRigidBody::read(NIFStream *nif)
+    {
+        bhkEntity::read(nif);
+        mInfo.read(nif);
+        mConstraints.read(nif);
+        if (nif->getBethVersion() < 76)
+            mBodyFlags = nif->getUInt();
+        else
+            mBodyFlags = nif->getUShort();
+    }
+
 } // Namespace
\ No newline at end of file
diff --git a/components/nif/physics.hpp b/components/nif/physics.hpp
index 4828f34877..c3adb4f6f0 100644
--- a/components/nif/physics.hpp
+++ b/components/nif/physics.hpp
@@ -85,6 +85,86 @@ struct TriangleData
     void read(NIFStream *nif);
 };
 
+enum class hkMotionType : uint8_t
+{
+    Motion_Invalid = 0,
+    Motion_Dynamic = 1,
+    Motion_SphereInertia = 2,
+    Motion_SphereStabilized = 3,
+    Motion_BoxInertia = 4,
+    Motion_BoxStabilized = 5,
+    Motion_Keyframed = 6,
+    Motion_Fixed = 7,
+    Motion_ThinBox = 8,
+    Motion_Character = 9
+};
+
+enum class hkDeactivatorType : uint8_t
+{
+    Deactivator_Invalid = 0,
+    Deactivator_Never = 1,
+    Deactivator_Spatial = 2
+};
+
+enum class hkSolverDeactivation : uint8_t
+{
+    SolverDeactivation_Invalid = 0,
+    SolverDeactivation_Off = 1,
+    SolverDeactivation_Low = 2,
+    SolverDeactivation_Medium = 3,
+    SolverDeactivation_High = 4,
+    SolverDeactivation_Max = 5
+};
+
+enum class hkQualityType : uint8_t
+{
+    Quality_Invalid = 0,
+    Quality_Fixed = 1,
+    Quality_Keyframed = 2,
+    Quality_Debris = 3,
+    Quality_Moving = 4,
+    Quality_Critical = 5,
+    Quality_Bullet = 6,
+    Quality_User = 7,
+    Quality_Character = 8,
+    Quality_KeyframedReport = 9
+};
+
+
+struct bhkRigidBodyCInfo
+{
+    HavokFilter mHavokFilter;
+    hkResponseType mResponseType;
+    unsigned short mProcessContactDelay;
+    osg::Vec4f mTranslation;
+    osg::Quat mRotation;
+    osg::Vec4f mLinearVelocity;
+    osg::Vec4f mAngularVelocity;
+    float mInertiaTensor[3][4];
+    osg::Vec4f mCenter;
+    float mMass;
+    float mLinearDamping;
+    float mAngularDamping;
+    float mTimeFactor{1.f};
+    float mGravityFactor{1.f};
+    float mFriction;
+    float mRollingFrictionMult;
+    float mRestitution;
+    float mMaxLinearVelocity;
+    float mMaxAngularVelocity;
+    float mPenetrationDepth;
+    hkMotionType mMotionType;
+    hkDeactivatorType mDeactivatorType;
+    bool mEnableDeactivation{true};
+    hkSolverDeactivation mSolverDeactivation;
+    hkQualityType mQualityType;
+    unsigned char mAutoRemoveLevel;
+    unsigned char mResponseModifierFlags;
+    unsigned char mNumContactPointShapeKeys;
+    bool mForceCollidedOntoPPU;
+    void read(NIFStream *nif);
+};
+
 /// Record types
 
 // Abstract Bethesda Havok object
@@ -240,5 +320,14 @@ struct bhkListShape : public bhkShapeCollection
     void read(NIFStream *nif) override;
 };
 
+struct bhkRigidBody : public bhkEntity
+{
+    bhkRigidBodyCInfo mInfo;
+    bhkSerializableList mConstraints;
+    unsigned int mBodyFlags;
+
+    void read(NIFStream *nif) override;
+};
+
 } // Namespace
 #endif
\ No newline at end of file
diff --git a/components/nif/record.hpp b/components/nif/record.hpp
index 8648050d84..5fb50a05e5 100644
--- a/components/nif/record.hpp
+++ b/components/nif/record.hpp
@@ -137,7 +137,9 @@ enum RecordType
   RC_hkPackedNiTriStripsData,
   RC_bhkConvexVerticesShape,
   RC_bhkBoxShape,
-  RC_bhkListShape
+  RC_bhkListShape,
+  RC_bhkRigidBody,
+  RC_bhkRigidBodyT
 };
 
 /// Base class for all records

From d347f8f4f01d6e8c9bbe86183658cd294f67a6f6 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sat, 13 Nov 2021 20:04:21 +0300
Subject: [PATCH 1708/2859] Fix build

---
 components/nif/physics.hpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/components/nif/physics.hpp b/components/nif/physics.hpp
index c3adb4f6f0..613ec0ba43 100644
--- a/components/nif/physics.hpp
+++ b/components/nif/physics.hpp
@@ -68,7 +68,7 @@ struct bhkEntityCInfo
     hkResponseType mResponseType;
     unsigned short mProcessContactDelay;
     void read(NIFStream *nif);
-}
+};
 
 struct hkpMoppCode
 {
@@ -130,7 +130,6 @@ enum class hkQualityType : uint8_t
     Quality_KeyframedReport = 9
 };
 
-
 struct bhkRigidBodyCInfo
 {
     HavokFilter mHavokFilter;
@@ -289,7 +288,7 @@ struct bhkSphereRepShape : public bhkShape
 struct bhkConvexShape : public bhkSphereRepShape
 {
     float mRadius;
-    void read(NIFStream} *nif) override;
+    void read(NIFStream *nif) override;
 };
 
 // A convex shape built from vertices

From d0adbc1b8f193e0d0ce3b78eab467e8a9915464b Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Sat, 13 Nov 2021 18:24:51 +0000
Subject: [PATCH 1709/2859] Also import GMock::Main Debug library properly

---
 cmake/FindGMock.cmake | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/cmake/FindGMock.cmake b/cmake/FindGMock.cmake
index 502910a9df..0e98d4e6c0 100644
--- a/cmake/FindGMock.cmake
+++ b/cmake/FindGMock.cmake
@@ -182,8 +182,16 @@ endif()
 
 set_target_properties(GMock::Main PROPERTIES
     INTERFACE_LINK_LIBRARIES "GMock::GMock"
-    IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
-    IMPORTED_LOCATION "${GMOCK_MAIN_LIBRARY}")
+    IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")
+
+if(EXISTS "${GMOCK_MAIN_LIBRARY}")
+    set_target_properties(GMock::Main PROPERTIES
+        IMPORTED_LOCATION "${GMOCK_MAIN_LIBRARY}")
+endif()
+if(EXISTS "${GMOCK_MAIN_LIBRARY_DEBUG}")
+    set_target_properties(GMock::Main PROPERTIES
+        IMPORTED_LOCATION "{GMOCK_MAIN_LIBRARY_DEBUG})
+endif()
 
 if(GMOCK_FOUND)
     set(GMOCK_INCLUDE_DIRS ${GMOCK_INCLUDE_DIR})

From 50b90a594d6016f170b44ec622d5515a2c1281f9 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Thu, 8 Oct 2020 03:39:27 +0300
Subject: [PATCH 1710/2859] Loading and basic handling of
 BSLightingShaderProperty

---
 components/nif/niffile.cpp      |  1 +
 components/nif/property.cpp     | 56 ++++++++++++++++++++
 components/nif/property.hpp     | 63 +++++++++++++++++-----
 components/nif/record.hpp       |  3 +-
 components/nifosg/nifloader.cpp | 93 +++++++++++++++++++++++++++------
 5 files changed, 186 insertions(+), 30 deletions(-)

diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index 82dab3bcee..f11b75d218 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -152,6 +152,7 @@ static std::map<std::string,RecordFactoryEntry> makeFactory()
     factory["bhkListShape"]                 = {&construct <bhkListShape>                , RC_bhkListShape               };
     factory["bhkRigidBody"]                 = {&construct <bhkRigidBody>                , RC_bhkRigidBody               };
     factory["bhkRigidBodyT"]                = {&construct <bhkRigidBody>                , RC_bhkRigidBodyT              };
+    factory["BSLightingShaderProperty"]     = {&construct <BSLightingShaderProperty>    , RC_BSLightingShaderProperty   };
     return factory;
 }
 
diff --git a/components/nif/property.cpp b/components/nif/property.cpp
index 1d2dd885d4..70acbb82ae 100644
--- a/components/nif/property.cpp
+++ b/components/nif/property.cpp
@@ -146,6 +146,62 @@ void BSShaderNoLightingProperty::read(NIFStream *nif)
         falloffParams = nif->getVector4();
 }
 
+void BSLightingShaderProperty::read(NIFStream *nif)
+{
+    type = nif->getUInt();
+    BSShaderProperty::read(nif);
+    flags1 = nif->getUInt();
+    flags2 = nif->getUInt();
+    nif->skip(8); // UV offset
+    nif->skip(8); // UV scale
+    mTextureSet.read(nif);
+    mEmissive = nif->getVector3();
+    mEmissiveMult = nif->getFloat();
+    mClamp = nif->getUInt();
+    mAlpha = nif->getFloat();
+    nif->getFloat(); // Refraction strength
+    mGlossiness = nif->getFloat();
+    mSpecular = nif->getVector3();
+    mSpecStrength = nif->getFloat();
+    nif->skip(8); // Lighting effects
+    switch (static_cast<BSLightingShaderType>(type))
+    {
+        case BSLightingShaderType::ShaderType_EnvMap:
+            nif->skip(4); // Environment map scale
+            break;
+        case BSLightingShaderType::ShaderType_SkinTint:
+        case BSLightingShaderType::ShaderType_HairTint:
+            nif->skip(12); // Tint color
+            break;
+        case BSLightingShaderType::ShaderType_ParallaxOcc:
+            nif->skip(4); // Max passes
+            nif->skip(4); // Scale
+            break;
+        case BSLightingShaderType::ShaderType_MultiLayerParallax:
+            nif->skip(4); // Inner layer thickness
+            nif->skip(4); // Refraction scale
+            nif->skip(4); // Inner layer texture scale
+            nif->skip(4); // Environment map strength
+            break;
+        case BSLightingShaderType::ShaderType_SparkleSnow:
+            nif->skip(16); // Sparkle parameters
+            break;
+        case BSLightingShaderType::ShaderType_EyeEnvmap:
+            nif->skip(4); // Cube map scale
+            nif->skip(12); // Left eye cube map offset
+            nif->skip(12); // Right eye cube map offset
+            break;
+        default:
+            break;
+    }
+}
+
+void BSLightingShaderProperty::post(NIFFile *nif)
+{
+    BSShaderProperty::post(nif);
+    mTextureSet.post(nif);
+}
+
 void NiFogProperty::read(NIFStream *nif)
 {
     Property::read(nif);
diff --git a/components/nif/property.hpp b/components/nif/property.hpp
index 9c76f6d6ec..a428d6a7e1 100644
--- a/components/nif/property.hpp
+++ b/components/nif/property.hpp
@@ -116,20 +116,21 @@ struct NiShadeProperty : public Property
     }
 };
 
-struct BSShaderProperty : public NiShadeProperty
+
+enum class BSShaderType : unsigned int
 {
-    enum BSShaderType
-    {
-        SHADER_TALL_GRASS = 0,
-        SHADER_DEFAULT = 1,
-        SHADER_SKY = 10,
-        SHADER_SKIN = 14,
-        SHADER_WATER = 17,
-        SHADER_LIGHTING30 = 29,
-        SHADER_TILE = 32,
-        SHADER_NOLIGHTING = 33
-    };
+    ShaderType_TallGrass = 0,
+    ShaderType_Default = 1,
+    ShaderType_Sky = 10,
+    ShaderType_Skin = 14,
+    ShaderType_Water = 17,
+    ShaderType_Lighting30 = 29,
+    ShaderType_Tile = 32,
+    ShaderType_NoLighting = 33
+};
 
+struct BSShaderProperty : public NiShadeProperty
+{
     unsigned int type{0u}, flags1{0u}, flags2{0u};
     float envMapIntensity{0.f};
     void read(NIFStream *nif) override;
@@ -169,6 +170,44 @@ struct BSShaderNoLightingProperty : public BSShaderLightingProperty
     void read(NIFStream *nif) override;
 };
 
+enum class BSLightingShaderType : unsigned int
+{
+    ShaderType_Default = 0,
+    ShaderType_EnvMap = 1,
+    ShaderType_Glow = 2,
+    ShaderType_Parallax = 3,
+    ShaderType_FaceTint = 4,
+    ShaderType_SkinTint = 5,
+    ShaderType_HairTint = 6,
+    ShaderType_ParallaxOcc = 7,
+    ShaderType_MultitexLand = 8,
+    ShaderType_LODLand = 9,
+    ShaderType_Snow = 10,
+    ShaderType_MultiLayerParallax = 11,
+    ShaderType_TreeAnim = 12,
+    ShaderType_LODObjects = 13,
+    ShaderType_SparkleSnow = 14,
+    ShaderType_LODObjectsHD = 15,
+    ShaderType_EyeEnvmap = 16,
+    ShaderType_Cloud = 17,
+    ShaderType_LODNoise = 18,
+    ShaderType_MultitexLandLODBlend = 19,
+    ShaderType_Dismemberment = 20
+};
+
+struct BSLightingShaderProperty : public BSShaderProperty
+{
+    BSShaderTextureSetPtr mTextureSet;
+    unsigned int mClamp{0u};
+    float mAlpha;
+    float mGlossiness;
+    osg::Vec3f mEmissive, mSpecular;
+    float mEmissiveMult, mSpecStrength;
+
+    void read(NIFStream *nif) override;
+    void post(NIFFile *nif) override;
+};
+
 struct NiDitherProperty : public Property
 {
     unsigned short flags;
diff --git a/components/nif/record.hpp b/components/nif/record.hpp
index 5fb50a05e5..b38186bd04 100644
--- a/components/nif/record.hpp
+++ b/components/nif/record.hpp
@@ -139,7 +139,8 @@ enum RecordType
   RC_bhkBoxShape,
   RC_bhkListShape,
   RC_bhkRigidBody,
-  RC_bhkRigidBodyT
+  RC_bhkRigidBodyT,
+  RC_BSLightingShaderProperty
 };
 
 /// Base class for all records
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 2fa533518c..90046ecff1 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -1721,28 +1721,64 @@ namespace NifOsg
             }
         }
 
-        const std::string& getNVShaderPrefix(unsigned int type) const
+        const std::string& getBSShaderPrefix(unsigned int type) const
         {
-            static const std::map<unsigned int, std::string> mapping =
-            {
-                {Nif::BSShaderProperty::SHADER_TALL_GRASS, std::string()},
-                {Nif::BSShaderProperty::SHADER_DEFAULT,    "nv_default"},
-                {Nif::BSShaderProperty::SHADER_SKY,        std::string()},
-                {Nif::BSShaderProperty::SHADER_SKIN,       std::string()},
-                {Nif::BSShaderProperty::SHADER_WATER,      std::string()},
-                {Nif::BSShaderProperty::SHADER_LIGHTING30, std::string()},
-                {Nif::BSShaderProperty::SHADER_TILE,       std::string()},
-                {Nif::BSShaderProperty::SHADER_NOLIGHTING, "nv_nolighting"},
+            static const std::unordered_map<Nif::BSShaderType, std::string> mapping =
+            {
+                {Nif::BSShaderType::ShaderType_TallGrass,    std::string()},
+                {Nif::BSShaderType::ShaderType_Default,       "nv_default"},
+                {Nif::BSShaderType::ShaderType_Sky,          std::string()},
+                {Nif::BSShaderType::ShaderType_Skin,         std::string()},
+                {Nif::BSShaderType::ShaderType_Water,        std::string()},
+                {Nif::BSShaderType::ShaderType_Lighting30,   std::string()},
+                {Nif::BSShaderType::ShaderType_Tile,         std::string()},
+                {Nif::BSShaderType::ShaderType_NoLighting, "nv_nolighting"},
             };
-            auto prefix = mapping.find(type);
+            auto prefix = mapping.find(static_cast<Nif::BSShaderType>(type));
             if (prefix == mapping.end())
-                Log(Debug::Warning) << "Unknown shader type " << type << " in " << mFilename;
+                Log(Debug::Warning) << "Unknown BSShaderType " << type << " in " << mFilename;
             else if (prefix->second.empty())
-                Log(Debug::Warning) << "Unhandled shader type " << type << " in " << mFilename;
+                Log(Debug::Warning) << "Unhandled BSShaderType " << type << " in " << mFilename;
             else
                 return prefix->second;
 
-            return mapping.at(Nif::BSShaderProperty::SHADER_DEFAULT);
+            return mapping.at(Nif::BSShaderType::ShaderType_Default);
+        }
+
+        const std::string& getBSLightingShaderPrefix(unsigned int type) const
+        {
+            static const std::unordered_map<Nif::BSLightingShaderType, std::string> mapping =
+            {
+                {Nif::BSLightingShaderType::ShaderType_Default,                "nv_default"},
+                {Nif::BSLightingShaderType::ShaderType_EnvMap,                std::string()},
+                {Nif::BSLightingShaderType::ShaderType_Glow,                  std::string()},
+                {Nif::BSLightingShaderType::ShaderType_Parallax,              std::string()},
+                {Nif::BSLightingShaderType::ShaderType_FaceTint,              std::string()},
+                {Nif::BSLightingShaderType::ShaderType_HairTint,              std::string()},
+                {Nif::BSLightingShaderType::ShaderType_ParallaxOcc,           std::string()},
+                {Nif::BSLightingShaderType::ShaderType_MultitexLand,          std::string()},
+                {Nif::BSLightingShaderType::ShaderType_LODLand,               std::string()},
+                {Nif::BSLightingShaderType::ShaderType_Snow,                  std::string()},
+                {Nif::BSLightingShaderType::ShaderType_MultiLayerParallax,    std::string()},
+                {Nif::BSLightingShaderType::ShaderType_TreeAnim,              std::string()},
+                {Nif::BSLightingShaderType::ShaderType_LODObjects,            std::string()},
+                {Nif::BSLightingShaderType::ShaderType_SparkleSnow,           std::string()},
+                {Nif::BSLightingShaderType::ShaderType_LODObjectsHD,          std::string()},
+                {Nif::BSLightingShaderType::ShaderType_EyeEnvmap,             std::string()},
+                {Nif::BSLightingShaderType::ShaderType_Cloud,                 std::string()},
+                {Nif::BSLightingShaderType::ShaderType_LODNoise,              std::string()},
+                {Nif::BSLightingShaderType::ShaderType_MultitexLandLODBlend,  std::string()},
+                {Nif::BSLightingShaderType::ShaderType_Dismemberment,         std::string()}
+            };
+            auto prefix = mapping.find(static_cast<Nif::BSLightingShaderType>(type));
+            if (prefix == mapping.end())
+                Log(Debug::Warning) << "Unknown BSLightingShaderType " << type << " in " << mFilename;
+            else if (prefix->second.empty())
+                Log(Debug::Warning) << "Unhandled BSLightingShaderType " << type << " in " << mFilename;
+            else
+                return prefix->second;
+
+            return mapping.at(Nif::BSLightingShaderType::ShaderType_Default);
         }
 
         void handleProperty(const Nif::Property *property,
@@ -1834,7 +1870,7 @@ namespace NifOsg
             {
                 auto texprop = static_cast<const Nif::BSShaderPPLightingProperty*>(property);
                 bool shaderRequired = true;
-                node->setUserValue("shaderPrefix", getNVShaderPrefix(texprop->type));
+                node->setUserValue("shaderPrefix", getBSShaderPrefix(texprop->type));
                 node->setUserValue("shaderRequired", shaderRequired);
                 osg::StateSet* stateset = node->getOrCreateStateSet();
                 if (!texprop->textureSet.empty())
@@ -1849,7 +1885,7 @@ namespace NifOsg
             {
                 auto texprop = static_cast<const Nif::BSShaderNoLightingProperty*>(property);
                 bool shaderRequired = true;
-                node->setUserValue("shaderPrefix", getNVShaderPrefix(texprop->type));
+                node->setUserValue("shaderPrefix", getBSShaderPrefix(texprop->type));
                 node->setUserValue("shaderRequired", shaderRequired);
                 osg::StateSet* stateset = node->getOrCreateStateSet();
                 if (!texprop->filename.empty())
@@ -1887,6 +1923,18 @@ namespace NifOsg
                 handleTextureControllers(texprop, composite, imageManager, stateset, animflags);
                 break;
             }
+            case Nif::RC_BSLightingShaderProperty:
+            {
+                auto texprop = static_cast<const Nif::BSLightingShaderProperty*>(property);
+                bool shaderRequired = true;
+                node->setUserValue("shaderPrefix", getBSLightingShaderPrefix(texprop->type));
+                node->setUserValue("shaderRequired", shaderRequired);
+                osg::StateSet* stateset = node->getOrCreateStateSet();
+                if (!texprop->mTextureSet.empty())
+                    handleTextureSet(texprop->mTextureSet.getPtr(), texprop->mClamp, node->getName(), stateset, imageManager, boundTextures);
+                handleTextureControllers(texprop, composite, imageManager, stateset, animflags);
+                break;
+            }
             // unused by mw
             case Nif::RC_NiShadeProperty:
             case Nif::RC_NiDitherProperty:
@@ -2035,6 +2083,17 @@ namespace NifOsg
                     }
                     break;
                 }
+                case Nif::RC_BSLightingShaderProperty:
+                {
+                    auto shaderprop = static_cast<const Nif::BSLightingShaderProperty*>(property);
+                    mat->setAlpha(osg::Material::FRONT_AND_BACK, shaderprop->mAlpha);
+                    mat->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(shaderprop->mEmissive, 1.f));
+                    mat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(shaderprop->mSpecular, 1.f));
+                    mat->setShininess(osg::Material::FRONT_AND_BACK, shaderprop->mGlossiness);
+                    emissiveMult = shaderprop->mEmissiveMult;
+                    specStrength = shaderprop->mSpecStrength;
+                    break;
+                }
                 }
             }
 

From 63ea57e9cf5ccaf5fd798fa4567e881aadf3b9a2 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sat, 13 Nov 2021 23:36:33 +0300
Subject: [PATCH 1711/2859] Load NiSortAdjustNode and NiAccumulators

---
 components/nif/niffile.cpp   |  3 +++
 components/nif/node.hpp      | 34 ++++++++++++++++++++++++++++++++++
 components/nif/record.hpp    |  4 +++-
 components/nif/recordptr.hpp |  2 ++
 4 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index f11b75d218..72071dd79e 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -153,6 +153,9 @@ static std::map<std::string,RecordFactoryEntry> makeFactory()
     factory["bhkRigidBody"]                 = {&construct <bhkRigidBody>                , RC_bhkRigidBody               };
     factory["bhkRigidBodyT"]                = {&construct <bhkRigidBody>                , RC_bhkRigidBodyT              };
     factory["BSLightingShaderProperty"]     = {&construct <BSLightingShaderProperty>    , RC_BSLightingShaderProperty   };
+    factory["NiSortAdjustNode"]             = {&construct <NiSortAdjustNode>            , RC_NiNode                     };
+    factory["NiClusterAccumulator"]         = {&construct <NiClusterAccumulator>        , RC_NiClusterAccumulator       };
+    factory["NiAlphaAccumulator"]           = {&construct <NiAlphaAccumulator>          , RC_NiAlphaAccumulator         };
     return factory;
 }
 
diff --git a/components/nif/node.hpp b/components/nif/node.hpp
index c01ba9b663..7e5bcdb3be 100644
--- a/components/nif/node.hpp
+++ b/components/nif/node.hpp
@@ -427,5 +427,39 @@ struct NiLODNode : public NiSwitchNode
     }
 };
 
+// Abstract
+struct NiAccumulator : Record
+{
+    void read(NIFStream *nif) override {}
+};
+
+// Node children sorters
+struct NiClusterAccumulator : NiAccumulator {};
+struct NiAlphaAccumulator : NiClusterAccumulator {};
+
+struct NiSortAdjustNode : NiNode
+{
+    enum SortingMode
+    {
+        SortingMode_Inherit,
+        SortingMode_Off,
+        SortingMode_Subsort
+    };
+
+    int mMode;
+    NiAccumulatorPtr mSubSorter;
+    void read(NIFStream *nif) override
+    {
+        NiNode::read(nif);
+        mMode = nif->getInt();
+        if (nif->getVersion() <= NIFStream::generateVersion(20,0,0,3))
+            mSubSorter.read(nif);
+    }
+    void post(NIFFile *nif) override
+    {
+        mSubSorter.post(nif);
+    }
+};
+
 } // Namespace
 #endif
diff --git a/components/nif/record.hpp b/components/nif/record.hpp
index b38186bd04..937ce1d1e9 100644
--- a/components/nif/record.hpp
+++ b/components/nif/record.hpp
@@ -140,7 +140,9 @@ enum RecordType
   RC_bhkListShape,
   RC_bhkRigidBody,
   RC_bhkRigidBodyT,
-  RC_BSLightingShaderProperty
+  RC_BSLightingShaderProperty,
+  RC_NiClusterAccumulator,
+  RC_NiAlphaAccumulator
 };
 
 /// Base class for all records
diff --git a/components/nif/recordptr.hpp b/components/nif/recordptr.hpp
index cc62d7b2e0..5ec00b0c92 100644
--- a/components/nif/recordptr.hpp
+++ b/components/nif/recordptr.hpp
@@ -153,6 +153,7 @@ struct bhkWorldObject;
 struct bhkShape;
 struct bhkSerializable;
 struct hkPackedNiTriStripsData;
+struct NiAccumulator;
 
 using NodePtr = RecordPtrT<Node>;
 using ExtraPtr = RecordPtrT<Extra>;
@@ -184,6 +185,7 @@ using NiCollisionObjectPtr = RecordPtrT<NiCollisionObject>;
 using bhkWorldObjectPtr = RecordPtrT<bhkWorldObject>;
 using bhkShapePtr = RecordPtrT<bhkShape>;
 using hkPackedNiTriStripsDataPtr = RecordPtrT<hkPackedNiTriStripsData>;
+using NiAccumulatorPtr = RecordPtrT<NiAccumulator>;
 
 using NodeList = RecordListT<Node>;
 using PropertyList = RecordListT<Property>;

From a62b22cd31c736cf83e85ec12475633557b440a7 Mon Sep 17 00:00:00 2001
From: Bo Svensson <90132211+bosvensson1@users.noreply.github.com>
Date: Sat, 13 Nov 2021 22:37:53 +0000
Subject: [PATCH 1712/2859] isolates groundcover content files (#3208)

Specifications developed in PR #3206 require that groundcover content files must not be allowed to corrupt normal content files. With this PR we simply isolate our existing loading logic by instantiating a separate `ESMStore` for `Groundcover`. In addition, we remove some outdated workarounds.
---
 apps/openmw/mwrender/groundcover.cpp      | 30 +++++------
 apps/openmw/mwrender/groundcover.hpp      | 16 ++++--
 apps/openmw/mwrender/objectpaging.cpp     |  1 -
 apps/openmw/mwrender/renderingmanager.cpp |  4 +-
 apps/openmw/mwrender/renderingmanager.hpp |  2 +-
 apps/openmw/mwworld/cellstore.cpp         |  6 +--
 apps/openmw/mwworld/worldimp.cpp          | 66 +++++++++--------------
 apps/openmw/mwworld/worldimp.hpp          | 13 ++---
 components/esm/cellref.cpp                |  5 --
 components/esm/cellref.hpp                |  5 --
 10 files changed, 62 insertions(+), 86 deletions(-)

diff --git a/apps/openmw/mwrender/groundcover.cpp b/apps/openmw/mwrender/groundcover.cpp
index 3f4e592688..2998ee509a 100644
--- a/apps/openmw/mwrender/groundcover.cpp
+++ b/apps/openmw/mwrender/groundcover.cpp
@@ -5,6 +5,7 @@
 #include <osg/BlendFunc>
 #include <osg/Geometry>
 #include <osg/VertexAttribDivisor>
+#include <osg/Program>
 
 #include <components/esm/esmreader.hpp>
 #include <components/sceneutil/lightmanager.hpp>
@@ -20,15 +21,12 @@
 
 namespace MWRender
 {
-    std::string getGroundcoverModel(int type, const std::string& id, const MWWorld::ESMStore& store)
+    std::string getGroundcoverModel(const std::string& id, const MWWorld::ESMStore& groundcoverStore, const MWWorld::ESMStore& store)
     {
-        switch (type)
-        {
-          case ESM::REC_STAT:
-            return store.get<ESM::Static>().searchStatic(id)->mModel;
-          default:
-            return std::string();
-        }
+        const ESM::Static* stat = groundcoverStore.get<ESM::Static>().searchStatic(id);
+        if (!stat)
+            stat = store.get<ESM::Static>().searchStatic(id);
+        return stat ? stat->mModel : std::string();
     }
 
     class InstancingVisitor : public osg::NodeVisitor
@@ -155,11 +153,12 @@ namespace MWRender
         }
     }
 
-    Groundcover::Groundcover(Resource::SceneManager* sceneManager, float density, float viewDistance)
+    Groundcover::Groundcover(Resource::SceneManager* sceneManager, float density, float viewDistance, const MWWorld::ESMStore& store)
          : GenericResourceManager<GroundcoverChunkId>(nullptr)
          , mSceneManager(sceneManager)
          , mDensity(density)
          , mStateset(new osg::StateSet)
+         , mGroundcoverStore(store)
     {
          setViewDistance(viewDistance);
          // MGE uses default alpha settings for groundcover, so we can not rely on alpha properties
@@ -176,9 +175,13 @@ namespace MWRender
          mProgramTemplate->addBindAttribLocation("aRotation", 7);
     }
 
+    Groundcover::~Groundcover()
+    {
+    }
+
     void Groundcover::collectInstances(InstanceMap& instances, float size, const osg::Vec2f& center)
     {
-        const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
+        const MWWorld::ESMStore& worldStore = MWBase::Environment::get().getWorld()->getStore();
         osg::Vec2f minBound = (center - osg::Vec2f(size/2.f, size/2.f));
         osg::Vec2f maxBound = (center + osg::Vec2f(size/2.f, size/2.f));
         DensityCalculator calculator(mDensity);
@@ -188,7 +191,7 @@ namespace MWRender
         {
             for (int cellY = startCell.y(); cellY < startCell.y() + size; ++cellY)
             {
-                const ESM::Cell* cell = store.get<ESM::Cell>().searchStatic(cellX, cellY);
+                const ESM::Cell* cell = mGroundcoverStore.get<ESM::Cell>().searchStatic(cellX, cellY);
                 if (!cell) continue;
 
                 calculator.reset();
@@ -204,14 +207,11 @@ namespace MWRender
                     while(cell->getNextRef(esm[index], ref, deleted))
                     {
                         if (deleted) continue;
-                        if (!ref.mRefNum.fromGroundcoverFile()) continue;
 
                         if (!calculator.isInstanceEnabled()) continue;
                         if (!isInChunkBorders(ref, minBound, maxBound)) continue;
 
-                        Misc::StringUtils::lowerCaseInPlace(ref.mRefID);
-                        int type = store.findStatic(ref.mRefID);
-                        std::string model = getGroundcoverModel(type, ref.mRefID, store);
+                        std::string model = getGroundcoverModel(ref.mRefID, mGroundcoverStore, worldStore);
                         if (model.empty()) continue;
                         model = "meshes/" + model;
 
diff --git a/apps/openmw/mwrender/groundcover.hpp b/apps/openmw/mwrender/groundcover.hpp
index cd73e46eb0..ea0cfa9b62 100644
--- a/apps/openmw/mwrender/groundcover.hpp
+++ b/apps/openmw/mwrender/groundcover.hpp
@@ -4,7 +4,15 @@
 #include <components/terrain/quadtreeworld.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/esm/loadcell.hpp>
-#include <osg/Program>
+
+namespace MWWorld
+{
+    class ESMStore;
+}
+namespace osg
+{
+    class Program;
+}
 
 namespace MWRender
 {
@@ -12,8 +20,8 @@ namespace MWRender
     class Groundcover : public Resource::GenericResourceManager<GroundcoverChunkId>, public Terrain::QuadTreeWorld::ChunkManager
     {
     public:
-        Groundcover(Resource::SceneManager* sceneManager, float density, float viewDistance);
-        ~Groundcover() = default;
+        Groundcover(Resource::SceneManager* sceneManager, float density, float viewDistance, const MWWorld::ESMStore& groundcoverStore);
+        ~Groundcover();
 
         osg::ref_ptr<osg::Node> getChunk(float size, const osg::Vec2f& center, unsigned char lod, unsigned int lodFlags, bool activeGrid, const osg::Vec3f& viewPoint, bool compile) override;
 
@@ -35,6 +43,8 @@ namespace MWRender
         float mDensity;
         osg::ref_ptr<osg::StateSet> mStateset;
         osg::ref_ptr<osg::Program> mProgramTemplate;
+        /// @note mGroundcoverStore is separated from World's store because groundcover files must not be allowed to corrupt normal content files.
+        const MWWorld::ESMStore& mGroundcoverStore;
 
         typedef std::map<std::string, std::vector<GroundcoverEntry>> InstanceMap;
         osg::ref_ptr<osg::Node> createChunk(InstanceMap& instances, const osg::Vec2f& center);
diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index 90069c2d8d..756769bc7d 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -432,7 +432,6 @@ namespace MWRender
                             int type = store.findStatic(ref.mRefID);
                             if (!typeFilter(type,size>=2)) continue;
                             if (deleted) { refs.erase(ref.mRefNum); continue; }
-                            if (ref.mRefNum.fromGroundcoverFile()) continue;
                             refs[ref.mRefNum] = std::move(ref);
                         }
                     }
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index e0cd3f713a..2ba18378f9 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -294,7 +294,7 @@ namespace MWRender
 
     RenderingManager::RenderingManager(osgViewer::Viewer* viewer, osg::ref_ptr<osg::Group> rootNode,
                                        Resource::ResourceSystem* resourceSystem, SceneUtil::WorkQueue* workQueue,
-                                       const std::string& resourcePath, DetourNavigator::Navigator& navigator)
+                                       const std::string& resourcePath, DetourNavigator::Navigator& navigator, const MWWorld::ESMStore& groundcoverStore)
         : mViewer(viewer)
         , mRootNode(rootNode)
         , mResourceSystem(resourceSystem)
@@ -450,7 +450,7 @@ namespace MWRender
             float density = Settings::Manager::getFloat("density", "Groundcover");
             density = std::clamp(density, 0.f, 1.f);
 
-            mGroundcover.reset(new Groundcover(mResourceSystem->getSceneManager(), density, groundcoverDistance));
+            mGroundcover.reset(new Groundcover(mResourceSystem->getSceneManager(), density, groundcoverDistance, groundcoverStore));
             static_cast<Terrain::QuadTreeWorld*>(mTerrain.get())->addChunkManager(mGroundcover.get());
             mResourceSystem->addResourceManager(mGroundcover.get());
         }
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index b8d5d955c8..99d0bb5f5e 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -95,7 +95,7 @@ namespace MWRender
     public:
         RenderingManager(osgViewer::Viewer* viewer, osg::ref_ptr<osg::Group> rootNode,
                          Resource::ResourceSystem* resourceSystem, SceneUtil::WorkQueue* workQueue,
-                         const std::string& resourcePath, DetourNavigator::Navigator& navigator);
+                         const std::string& resourcePath, DetourNavigator::Navigator& navigator, const MWWorld::ESMStore& groundcoverStore);
         ~RenderingManager();
 
         osgUtil::IncrementalCompileOperation* getIncrementalCompileOperation();
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index b2ac511509..0448d0e28a 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -741,11 +741,7 @@ namespace MWWorld
             case ESM::REC_NPC_: mNpcs.load(ref, deleted, store); break;
             case ESM::REC_PROB: mProbes.load(ref, deleted, store); break;
             case ESM::REC_REPA: mRepairs.load(ref, deleted, store); break;
-            case ESM::REC_STAT:
-            {
-                if (ref.mRefNum.fromGroundcoverFile()) return;
-                mStatics.load(ref, deleted, store); break;
-            }
+            case ESM::REC_STAT: mStatics.load(ref, deleted, store); break;
             case ESM::REC_WEAP: mWeapons.load(ref, deleted, store); break;
             case ESM::REC_BODY: mBodyParts.load(ref, deleted, store); break;
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index ed963b8b28..f434d059da 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -152,23 +152,16 @@ namespace MWWorld
       mLevitationEnabled(true), mGoToJail(false), mDaysInPrison(0),
       mPlayerTraveling(false), mPlayerInJail(false), mSpellPreloadTimer(0.f)
     {
-        mEsm.resize(contentFiles.size() + groundcoverFiles.size());
+        mEsm.resize(contentFiles.size());
         Loading::Listener* listener = MWBase::Environment::get().getWindowManager()->getLoadingScreen();
         listener->loadingOn();
-
-        GameContentLoader gameContentLoader(*listener);
-        EsmLoader esmLoader(mStore, mEsm, encoder, *listener);
-
-        gameContentLoader.addLoader(".esm", &esmLoader);
-        gameContentLoader.addLoader(".esp", &esmLoader);
-        gameContentLoader.addLoader(".omwgame", &esmLoader);
-        gameContentLoader.addLoader(".omwaddon", &esmLoader);
-        gameContentLoader.addLoader(".project", &esmLoader);
-
-        OMWScriptsLoader omwScriptsLoader(*listener, mStore);
-        gameContentLoader.addLoader(".omwscripts", &omwScriptsLoader);
-
-        loadContentFiles(fileCollections, contentFiles, groundcoverFiles, gameContentLoader);
+        
+        loadContentFiles(fileCollections, contentFiles, mStore, mEsm, encoder, listener);
+        if (!groundcoverFiles.empty())
+        {
+            std::vector<ESM::ESMReader> tempReaders (groundcoverFiles.size());
+            loadContentFiles(fileCollections, groundcoverFiles, mGroundcoverStore, tempReaders, encoder, listener, false);
+        }
 
         listener->loadingOff();
 
@@ -176,10 +169,6 @@ namespace MWWorld
         if (mEsm[0].getFormat() == 0)
             ensureNeededRecords();
 
-        // TODO: We can and should validate before we call loadContentFiles().
-        // Currently we validate here to prevent merge conflicts with groundcover ESMStore fixes.
-        validateMasterFiles(mEsm);
-
         mCurrentDate.reset(new DateTimeManager());
 
         fillGlobalVariables();
@@ -202,7 +191,7 @@ namespace MWWorld
             mNavigator = DetourNavigator::makeNavigatorStub();
         }
 
-        mRendering.reset(new MWRender::RenderingManager(viewer, rootNode, resourceSystem, workQueue, resourcePath, *mNavigator));
+        mRendering.reset(new MWRender::RenderingManager(viewer, rootNode, resourceSystem, workQueue, resourcePath, *mNavigator, mGroundcoverStore));
         mProjectileManager.reset(new ProjectileManager(mRendering->getLightRoot(), resourceSystem, mRendering.get(), mPhysics.get()));
         mRendering->preloadCommonAssets();
 
@@ -2959,9 +2948,22 @@ namespace MWWorld
         return mScriptsEnabled;
     }
 
-    void World::loadContentFiles(const Files::Collections& fileCollections,
-        const std::vector<std::string>& content, const std::vector<std::string>& groundcover, ContentLoader& contentLoader)
+    void World::loadContentFiles(const Files::Collections& fileCollections, const std::vector<std::string>& content, ESMStore& store, std::vector<ESM::ESMReader>& readers, ToUTF8::Utf8Encoder* encoder, Loading::Listener* listener, bool validate)
     {
+        GameContentLoader gameContentLoader(*listener);
+        EsmLoader esmLoader(store, readers, encoder, *listener);
+        if (validate)
+            validateMasterFiles(readers);
+
+        gameContentLoader.addLoader(".esm", &esmLoader);
+        gameContentLoader.addLoader(".esp", &esmLoader);
+        gameContentLoader.addLoader(".omwgame", &esmLoader);
+        gameContentLoader.addLoader(".omwaddon", &esmLoader);
+        gameContentLoader.addLoader(".project", &esmLoader);
+
+        OMWScriptsLoader omwScriptsLoader(*listener, store);
+        gameContentLoader.addLoader(".omwscripts", &omwScriptsLoader);
+
         int idx = 0;
         for (const std::string &file : content)
         {
@@ -2969,7 +2971,7 @@ namespace MWWorld
             const Files::MultiDirCollection& col = fileCollections.getCollection(filename.extension().string());
             if (col.doesExist(file))
             {
-                contentLoader.load(col.getPath(file), idx);
+                gameContentLoader.load(col.getPath(file), idx);
             }
             else
             {
@@ -2978,24 +2980,6 @@ namespace MWWorld
             }
             idx++;
         }
-
-        ESM::GroundcoverIndex = idx;
-
-        for (const std::string &file : groundcover)
-        {
-            boost::filesystem::path filename(file);
-            const Files::MultiDirCollection& col = fileCollections.getCollection(filename.extension().string());
-            if (col.doesExist(file))
-            {
-                contentLoader.load(col.getPath(file), idx);
-            }
-            else
-            {
-                std::string message = "Failed loading " + file + ": the groundcover file does not exist";
-                throw std::runtime_error(message);
-            }
-            idx++;
-        }
     }
 
     bool World::startSpellCast(const Ptr &actor)
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index afad359cfd..c8eebd9a8b 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -80,6 +80,7 @@ namespace MWWorld
 
             std::vector<ESM::ESMReader> mEsm;
             MWWorld::ESMStore mStore;
+            MWWorld::ESMStore mGroundcoverStore;
             LocalScripts mLocalScripts;
             MWWorld::Globals mGlobalVariables;
 
@@ -163,14 +164,10 @@ namespace MWWorld
 
             void updateSkyDate();
 
-            /**
-             * @brief loadContentFiles - Loads content files (esm,esp,omwgame,omwaddon)
-             * @param fileCollections- Container which holds content file names and their paths
-             * @param content - Container which holds content file names
-             * @param contentLoader -
-             */
-            void loadContentFiles(const Files::Collections& fileCollections,
-                const std::vector<std::string>& content, const std::vector<std::string>& groundcover, ContentLoader& contentLoader);
+            // A helper method called automatically during World construction.
+            void loadContentFiles(const Files::Collections& fileCollections, const std::vector<std::string>& content,
+                 ESMStore& store, std::vector<ESM::ESMReader>& readers, ToUTF8::Utf8Encoder* encoder, Loading::Listener* listener, bool validateMasterFiles = true);
+
 
             float feetToGameUnits(float feet);
             float getActivationDistancePlusTelekinesis();
diff --git a/components/esm/cellref.cpp b/components/esm/cellref.cpp
index 7126459871..002a885d92 100644
--- a/components/esm/cellref.cpp
+++ b/components/esm/cellref.cpp
@@ -5,11 +5,6 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
-namespace ESM
-{
-    int GroundcoverIndex = std::numeric_limits<int>::max();
-}
-
 void ESM::RefNum::load (ESMReader& esm, bool wide, const std::string& tag)
 {
     if (wide)
diff --git a/components/esm/cellref.hpp b/components/esm/cellref.hpp
index f6eff24cbf..0013329ccc 100644
--- a/components/esm/cellref.hpp
+++ b/components/esm/cellref.hpp
@@ -12,7 +12,6 @@ namespace ESM
     class ESMReader;
 
     const int UnbreakableLock = std::numeric_limits<int>::max();
-    extern int GroundcoverIndex;
 
     struct RefNum
     {
@@ -27,10 +26,6 @@ namespace ESM
 
         inline bool isSet() const { return mIndex != 0 || mContentFile != -1; }
         inline void unset() { *this = {0, -1}; }
-
-        // Note: this method should not be used for objects with invalid RefNum
-        // (for example, for objects from disabled plugins in savegames).
-        inline bool fromGroundcoverFile() const { return mContentFile >= GroundcoverIndex; }
     };
 
     /* Cell reference. This represents ONE object (of many) inside the

From 8fb0b5846ea2e059f225e6659b393584305bcb53 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Sun, 14 Nov 2021 00:22:44 +0000
Subject: [PATCH 1713/2859] Allow paths with trailing data, emmitting a warning

---
 apps/opencs/editor.cpp                        |  12 +--
 apps/openmw/main.cpp                          |  12 +--
 apps/openmw/options.cpp                       |   8 +-
 apps/openmw_test_suite/mwworld/test_store.cpp |   8 +-
 apps/openmw_test_suite/openmw/options.cpp     | 102 ++++++++++--------
 components/files/configurationmanager.cpp     |  24 ++++-
 components/files/configurationmanager.hpp     |  12 +++
 7 files changed, 113 insertions(+), 65 deletions(-)

diff --git a/apps/opencs/editor.cpp b/apps/opencs/editor.cpp
index b437a36201..6294e5eb7c 100644
--- a/apps/opencs/editor.cpp
+++ b/apps/opencs/editor.cpp
@@ -88,11 +88,11 @@ std::pair<Files::PathContainer, std::vector<std::string> > CS::Editor::readConfi
     boost::program_options::options_description desc("Syntax: openmw-cs <options>\nAllowed options");
 
     desc.add_options()
-    ("data", boost::program_options::value<Files::PathContainer>()->default_value(Files::PathContainer(), "data")->multitoken()->composing())
-    ("data-local", boost::program_options::value<Files::PathContainer::value_type>()->default_value(Files::PathContainer::value_type(), ""))
+    ("data", boost::program_options::value<Files::ReluctantPathContainer>()->default_value(Files::ReluctantPathContainer(), "data")->multitoken()->composing())
+    ("data-local", boost::program_options::value<Files::ReluctantPathContainer::value_type>()->default_value(Files::ReluctantPathContainer::value_type(), ""))
     ("fs-strict", boost::program_options::value<bool>()->implicit_value(true)->default_value(false))
     ("encoding", boost::program_options::value<std::string>()->default_value("win1252"))
-    ("resources", boost::program_options::value<boost::filesystem::path>()->default_value(boost::filesystem::path(), "resources"))
+    ("resources", boost::program_options::value<Files::ReluctantPath>()->default_value(Files::ReluctantPath(), "resources"))
     ("fallback-archive", boost::program_options::value<std::vector<std::string>>()->
         default_value(std::vector<std::string>(), "fallback-archive")->multitoken())
     ("fallback", boost::program_options::value<FallbackMap>()->default_value(FallbackMap(), "")
@@ -112,7 +112,7 @@ std::pair<Files::PathContainer, std::vector<std::string> > CS::Editor::readConfi
     mDocumentManager.setEncoding(ToUTF8::calculateEncoding(mEncodingName));
     mFileDialog.setEncoding (QString::fromUtf8(mEncodingName.c_str()));
 
-    mDocumentManager.setResourceDir (mResources = variables["resources"].as<boost::filesystem::path>());
+    mDocumentManager.setResourceDir (mResources = variables["resources"].as<Files::ReluctantPath>());
 
     if (variables["script-blacklist-use"].as<bool>())
         mDocumentManager.setBlacklistedScripts (
@@ -122,10 +122,10 @@ std::pair<Files::PathContainer, std::vector<std::string> > CS::Editor::readConfi
 
     Files::PathContainer dataDirs, dataLocal;
     if (!variables["data"].empty()) {
-        dataDirs = variables["data"].as<Files::PathContainer>();
+        dataDirs = asPathContainer(variables["data"].as<Files::ReluctantPathContainer>());
     }
 
-    Files::PathContainer::value_type local(variables["data-local"].as<Files::PathContainer::value_type>());
+    Files::PathContainer::value_type local(variables["data-local"].as<Files::ReluctantPathContainer::value_type>());
     if (!local.empty())
         dataLocal.push_back(local);
 
diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index 7a3a21b149..50a7c3d844 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -56,7 +56,7 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     {
         cfgMgr.readConfiguration(variables, desc, true);
 
-        Version::Version v = Version::getOpenmwVersion(variables["resources"].as<boost::filesystem::path>().string());
+        Version::Version v = Version::getOpenmwVersion(variables["resources"].as<Files::ReluctantPath>().string());
         getRawStdout() << v.describe() << std::endl;
         return false;
     }
@@ -65,7 +65,7 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     cfgMgr.readConfiguration(variables, desc);
     Files::mergeComposingVariables(variables, composingVariables, desc);
 
-    Version::Version v = Version::getOpenmwVersion(variables["resources"].as<boost::filesystem::path>().string());
+    Version::Version v = Version::getOpenmwVersion(variables["resources"].as<Files::ReluctantPath>().string());
     Log(Debug::Info) << v.describe();
 
     engine.setGrabMouse(!variables["no-grab"].as<bool>());
@@ -78,15 +78,15 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     // directory settings
     engine.enableFSStrict(variables["fs-strict"].as<bool>());
 
-    Files::PathContainer dataDirs(variables["data"].as<Files::PathContainer>());
+    Files::PathContainer dataDirs(asPathContainer(variables["data"].as<Files::ReluctantPathContainer>()));
 
-    Files::PathContainer::value_type local(variables["data-local"].as<Files::PathContainer::value_type>());
+    Files::PathContainer::value_type local(variables["data-local"].as<Files::ReluctantPathContainer::value_type>());
     if (!local.empty())
         dataDirs.push_back(local);
 
     cfgMgr.processPaths(dataDirs);
 
-    engine.setResourceDir(variables["resources"].as<boost::filesystem::path>());
+    engine.setResourceDir(variables["resources"].as<Files::ReluctantPath>());
     engine.setDataDirs(dataDirs);
 
     // fallback archives
@@ -141,7 +141,7 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     engine.setWarningsMode (variables["script-warn"].as<int>());
     engine.setScriptBlacklist (variables["script-blacklist"].as<StringsVector>());
     engine.setScriptBlacklistUse (variables["script-blacklist-use"].as<bool>());
-    engine.setSaveGameFile (variables["load-savegame"].as<boost::filesystem::path>().string());
+    engine.setSaveGameFile (variables["load-savegame"].as<Files::ReluctantPath>().string());
 
     // other settings
     Fallback::Map::init(variables["fallback"].as<FallbackMap>().mMap);
diff --git a/apps/openmw/options.cpp b/apps/openmw/options.cpp
index dd94590f2a..a1b2102f08 100644
--- a/apps/openmw/options.cpp
+++ b/apps/openmw/options.cpp
@@ -25,16 +25,16 @@ namespace OpenMW
             ("replace", bpo::value<StringsVector>()->default_value(StringsVector(), "")
                 ->multitoken()->composing(), "settings where the values from the current source should replace those from lower-priority sources instead of being appended")
 
-            ("data", bpo::value<Files::PathContainer>()->default_value(Files::PathContainer(), "data")
+            ("data", bpo::value<Files::ReluctantPathContainer>()->default_value(Files::ReluctantPathContainer(), "data")
                 ->multitoken()->composing(), "set data directories (later directories have higher priority)")
 
-            ("data-local", bpo::value<Files::PathContainer::value_type>()->default_value(Files::PathContainer::value_type(), ""),
+            ("data-local", bpo::value<Files::ReluctantPathContainer::value_type>()->default_value(Files::ReluctantPathContainer::value_type(), ""),
                 "set local data directory (highest priority)")
 
             ("fallback-archive", bpo::value<StringsVector>()->default_value(StringsVector(), "fallback-archive")
                 ->multitoken()->composing(), "set fallback BSA archives (later archives have higher priority)")
 
-            ("resources", bpo::value<boost::filesystem::path>()->default_value(boost::filesystem::path(), "resources"),
+            ("resources", bpo::value<Files::ReluctantPath>()->default_value(Files::ReluctantPath(), "resources"),
                 "set resources directory")
 
             ("start", bpo::value<std::string>()->default_value(""),
@@ -77,7 +77,7 @@ namespace OpenMW
             ("script-blacklist-use", bpo::value<bool>()->implicit_value(true)
                 ->default_value(true), "enable script blacklisting")
 
-            ("load-savegame", bpo::value<boost::filesystem::path>()->default_value(boost::filesystem::path(), ""),
+            ("load-savegame", bpo::value<Files::ReluctantPath>()->default_value(Files::ReluctantPath(), ""),
                 "load a save game file on game startup (specify an absolute filename or a filename relative to the current working directory)")
 
             ("skip-menu", bpo::value<bool>()->implicit_value(true)
diff --git a/apps/openmw_test_suite/mwworld/test_store.cpp b/apps/openmw_test_suite/mwworld/test_store.cpp
index 9aa5a6758f..f2f9459df0 100644
--- a/apps/openmw_test_suite/mwworld/test_store.cpp
+++ b/apps/openmw_test_suite/mwworld/test_store.cpp
@@ -58,10 +58,10 @@ struct ContentFileTest : public ::testing::Test
 
         boost::program_options::options_description desc("Allowed options");
         desc.add_options()
-        ("data", boost::program_options::value<Files::PathContainer>()->default_value(Files::PathContainer(), "data")->multitoken()->composing())
+        ("data", boost::program_options::value<Files::ReluctantPathContainer>()->default_value(Files::ReluctantPathContainer(), "data")->multitoken()->composing())
         ("content", boost::program_options::value<std::vector<std::string>>()->default_value(std::vector<std::string>(), "")
             ->multitoken()->composing(), "content file(s): esm/esp, or omwgame/omwaddon")
-        ("data-local", boost::program_options::value<Files::PathContainer::value_type>()->default_value(Files::PathContainer::value_type(), ""));
+        ("data-local", boost::program_options::value<Files::ReluctantPathContainer::value_type>()->default_value(Files::ReluctantPathContainer::value_type(), ""));
 
         boost::program_options::notify(variables);
 
@@ -69,10 +69,10 @@ struct ContentFileTest : public ::testing::Test
 
         Files::PathContainer dataDirs, dataLocal;
         if (!variables["data"].empty()) {
-            dataDirs = variables["data"].as<Files::PathContainer>();
+            dataDirs = asPathContainer(variables["data"].as<Files::ReluctantPathContainer>());
         }
 
-        Files::PathContainer::value_type local(variables["data-local"].as<Files::PathContainer::value_type>());
+        Files::PathContainer::value_type local(variables["data-local"].as<Files::ReluctantPathContainer::value_type>());
         if (!local.empty()) {
             dataLocal.push_back(local);
         }
diff --git a/apps/openmw_test_suite/openmw/options.cpp b/apps/openmw_test_suite/openmw/options.cpp
index 7cf0df1066..bae324b134 100644
--- a/apps/openmw_test_suite/openmw/options.cpp
+++ b/apps/openmw_test_suite/openmw/options.cpp
@@ -40,7 +40,7 @@ namespace
         const std::array arguments {"openmw", "--load-savegame=save.omwsave"};
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), "save.omwsave");
+        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "save.omwsave");
     }
 
     TEST(OpenMWOptionsFromArguments, should_support_single_word_load_savegame_path)
@@ -49,7 +49,7 @@ namespace
         const std::array arguments {"openmw", "--load-savegame", "save.omwsave"};
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), "save.omwsave");
+        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "save.omwsave");
     }
 
     TEST(OpenMWOptionsFromArguments, should_support_multi_component_load_savegame_path)
@@ -58,7 +58,7 @@ namespace
         const std::array arguments {"openmw", "--load-savegame", "/home/user/openmw/save.omwsave"};
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), "/home/user/openmw/save.omwsave");
+        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "/home/user/openmw/save.omwsave");
     }
 
     TEST(OpenMWOptionsFromArguments, should_support_windows_multi_component_load_savegame_path)
@@ -67,18 +67,18 @@ namespace
         const std::array arguments {"openmw", "--load-savegame", R"(C:\OpenMW\save.omwsave)"};
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), R"(C:\OpenMW\save.omwsave)");
+        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), R"(C:\OpenMW\save.omwsave)");
     }
 
-    /*TEST(OpenMWOptionsFromArguments, should_support_load_savegame_path_with_spaces)
+    TEST(OpenMWOptionsFromArguments, should_support_load_savegame_path_with_spaces)
     {
         bpo::options_description description = makeOptionsDescription();
         const std::array arguments {"openmw", "--load-savegame", "my save.omwsave"};
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), "my");
-//        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), "my save.omwsave");
-    }*/
+        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "my");
+//        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "my save.omwsave");
+    }
 
     TEST(OpenMWOptionsFromArguments, should_support_load_savegame_path_with_octothorpe)
     {
@@ -86,7 +86,7 @@ namespace
         const std::array arguments {"openmw", "--load-savegame", "my#save.omwsave"};
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), "my#save.omwsave");
+        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "my#save.omwsave");
     }
 
     TEST(OpenMWOptionsFromArguments, should_support_load_savegame_path_with_at_sign)
@@ -95,7 +95,7 @@ namespace
         const std::array arguments {"openmw", "--load-savegame", "my@save.omwsave"};
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), "my@save.omwsave");
+        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "my@save.omwsave");
     }
 
     TEST(OpenMWOptionsFromArguments, should_support_load_savegame_path_with_quote)
@@ -104,18 +104,18 @@ namespace
         const std::array arguments {"openmw", "--load-savegame", R"(my"save.omwsave)"};
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), R"(my"save.omwsave)");
+        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), R"(my"save.omwsave)");
     }
 
-/*    TEST(OpenMWOptionsFromArguments, should_support_quoted_load_savegame_path)
+    TEST(OpenMWOptionsFromArguments, should_support_quoted_load_savegame_path)
     {
         bpo::options_description description = makeOptionsDescription();
         const std::array arguments {"openmw", "--load-savegame", R"("save".omwsave)"};
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), R"(save)");
-//        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), R"("save".omwsave)");
-    }*/
+        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), R"(save)");
+//        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), R"("save".omwsave)");
+    }
 
     TEST(OpenMWOptionsFromArguments, should_support_quoted_load_savegame_path_with_escaped_quote_by_ampersand)
     {
@@ -123,7 +123,7 @@ namespace
         const std::array arguments {"openmw", "--load-savegame", R"("save&".omwsave")"};
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), R"(save".omwsave)");
+        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), R"(save".omwsave)");
     }
 
     TEST(OpenMWOptionsFromArguments, should_support_quoted_load_savegame_path_with_escaped_ampersand)
@@ -132,7 +132,7 @@ namespace
         const std::array arguments {"openmw", "--load-savegame", R"("save.omwsave&&")"};
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), "save.omwsave&");
+        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "save.omwsave&");
     }
 
     TEST(OpenMWOptionsFromArguments, should_support_load_savegame_path_with_ampersand)
@@ -141,7 +141,7 @@ namespace
         const std::array arguments {"openmw", "--load-savegame", "save&.omwsave"};
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), "save&.omwsave");
+        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "save&.omwsave");
     }
 
     TEST(OpenMWOptionsFromArguments, should_support_load_savegame_path_with_multiple_quotes)
@@ -150,7 +150,7 @@ namespace
         const std::array arguments {"openmw", "--load-savegame", R"(my"save".omwsave)"};
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), R"(my"save".omwsave)");
+        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), R"(my"save".omwsave)");
     }
 
     TEST(OpenMWOptionsFromArguments, should_compose_data)
@@ -159,7 +159,7 @@ namespace
         const std::array arguments {"openmw", "--data", "1", "--data", "2"};
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_THAT(variables["data"].as<Files::PathContainer>(), ElementsAre(IsPath("1"), IsPath("2")));
+        EXPECT_THAT(variables["data"].as<Files::ReluctantPathContainer>(), ElementsAre(IsPath("1"), IsPath("2")));
     }
 
     TEST(OpenMWOptionsFromArguments, should_compose_data_from_single_flag)
@@ -168,7 +168,7 @@ namespace
         const std::array arguments {"openmw", "--data", "1", "2"};
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_THAT(variables["data"].as<Files::PathContainer>(), ElementsAre(IsPath("1"), IsPath("2")));
+        EXPECT_THAT(variables["data"].as<Files::ReluctantPathContainer>(), ElementsAre(IsPath("1"), IsPath("2")));
     }
 
     TEST(OpenMWOptionsFromArguments, should_throw_on_multiple_load_savegame)
@@ -189,7 +189,7 @@ namespace
         const std::array arguments {"openmw", "--load-savegame", pathArgument.c_str()};
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), path);
+        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), path);
     }
 
     INSTANTIATE_TEST_SUITE_P(
@@ -204,7 +204,7 @@ namespace
         std::istringstream stream("load-savegame=save.omwsave");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), "save.omwsave");
+        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "save.omwsave");
     }
 
     TEST(OpenMWOptionsFromConfig, should_strip_quotes_from_load_savegame_path)
@@ -213,18 +213,18 @@ namespace
         std::istringstream stream(R"(load-savegame="save.omwsave")");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), "save.omwsave");
+        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "save.omwsave");
     }
 
-/*    TEST(OpenMWOptionsFromConfig, should_strip_outer_quotes_from_load_savegame_path)
+    TEST(OpenMWOptionsFromConfig, should_strip_outer_quotes_from_load_savegame_path)
     {
         bpo::options_description description = makeOptionsDescription();
         std::istringstream stream(R"(load-savegame=""save".omwsave")");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), "");
-//        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), R"(""save".omwsave")");
-    }*/
+        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "");
+//        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), R"(""save".omwsave")");
+    }
 
     TEST(OpenMWOptionsFromConfig, should_strip_quotes_from_load_savegame_path_with_space)
     {
@@ -232,7 +232,7 @@ namespace
         std::istringstream stream(R"(load-savegame="my save.omwsave")");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), "my save.omwsave");
+        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "my save.omwsave");
     }
 
     TEST(OpenMWOptionsFromConfig, should_support_quoted_load_savegame_path_with_octothorpe)
@@ -241,7 +241,7 @@ namespace
         std::istringstream stream("load-savegame=save#.omwsave");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), "save#.omwsave");
+        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "save#.omwsave");
     }
 
     TEST(OpenMWOptionsFromConfig, should_support_quoted_load_savegame_path_with_at_sign)
@@ -250,7 +250,7 @@ namespace
         std::istringstream stream("load-savegame=save@.omwsave");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), "save@.omwsave");
+        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "save@.omwsave");
     }
 
     TEST(OpenMWOptionsFromConfig, should_support_quoted_load_savegame_path_with_quote)
@@ -259,7 +259,25 @@ namespace
         std::istringstream stream(R"(load-savegame=save".omwsave)");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), R"(save".omwsave)");
+        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), R"(save".omwsave)");
+    }
+
+    TEST(OpenMWOptionsFromConfig, should_support_confusing_savegame_path_with_lots_going_on)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        std::istringstream stream(R"(load-savegame="one &"two"three".omwsave")");
+        bpo::variables_map variables;
+        Files::parseConfig(stream, variables, description);
+        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), R"(one "two)");
+    }
+
+    TEST(OpenMWOptionsFromConfig, should_support_confusing_savegame_path_with_even_more_going_on)
+    {
+        bpo::options_description description = makeOptionsDescription();
+        std::istringstream stream(R"(load-savegame="one &"two"three ".omwsave")");
+        bpo::variables_map variables;
+        Files::parseConfig(stream, variables, description);
+        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), R"(one "two)");
     }
 
     TEST(OpenMWOptionsFromConfig, should_ignore_commented_option)
@@ -268,7 +286,7 @@ namespace
         std::istringstream stream("#load-savegame=save.omwsave");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), "");
+        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "");
     }
 
     TEST(OpenMWOptionsFromConfig, should_ignore_whitespace_prefixed_commented_option)
@@ -277,7 +295,7 @@ namespace
         std::istringstream stream(" \t#load-savegame=save.omwsave");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), "");
+        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "");
     }
 
     TEST(OpenMWOptionsFromConfig, should_support_whitespace_around_option)
@@ -286,7 +304,7 @@ namespace
         std::istringstream stream(" load-savegame = save.omwsave ");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), "save.omwsave");
+        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "save.omwsave");
     }
 
     TEST(OpenMWOptionsFromConfig, should_throw_on_multiple_load_savegame)
@@ -303,7 +321,7 @@ namespace
         std::istringstream stream("load-savegame=/home/user/openmw/save.omwsave");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), "/home/user/openmw/save.omwsave");
+        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "/home/user/openmw/save.omwsave");
     }
 
     TEST(OpenMWOptionsFromConfig, should_support_windows_multi_component_load_savegame_path)
@@ -312,7 +330,7 @@ namespace
         std::istringstream stream(R"(load-savegame=C:\OpenMW\save.omwsave)");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), R"(C:\OpenMW\save.omwsave)");
+        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), R"(C:\OpenMW\save.omwsave)");
     }
 
     TEST(OpenMWOptionsFromConfig, should_compose_data)
@@ -321,7 +339,7 @@ namespace
         std::istringstream stream("data=1\ndata=2");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_THAT(variables["data"].as<Files::PathContainer>(), ElementsAre(IsPath("1"), IsPath("2")));
+        EXPECT_THAT(variables["data"].as<Files::ReluctantPathContainer>(), ElementsAre(IsPath("1"), IsPath("2")));
     }
 
     TEST(OpenMWOptionsFromConfig, should_support_quoted_load_savegame_path_with_escaped_quote_by_ampersand)
@@ -330,7 +348,7 @@ namespace
         std::istringstream stream(R"(load-savegame="save&".omwsave")");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), R"(save".omwsave)");
+        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), R"(save".omwsave)");
     }
 
     TEST(OpenMWOptionsFromConfig, should_support_quoted_load_savegame_path_with_escaped_ampersand)
@@ -339,7 +357,7 @@ namespace
         std::istringstream stream(R"(load-savegame="save.omwsave&&")");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), "save.omwsave&");
+        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "save.omwsave&");
     }
 
     TEST(OpenMWOptionsFromConfig, should_support_load_savegame_path_with_ampersand)
@@ -348,7 +366,7 @@ namespace
         std::istringstream stream("load-savegame=save&.omwsave");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), "save&.omwsave");
+        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "save&.omwsave");
     }
 
     struct OpenMWOptionsFromConfigStrings : TestWithParam<std::string> {};
@@ -360,7 +378,7 @@ namespace
         std::istringstream stream("load-savegame=\"" + path + "\"");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<boost::filesystem::path>().string(), path);
+        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), path);
     }
 
     INSTANTIATE_TEST_SUITE_P(
diff --git a/components/files/configurationmanager.cpp b/components/files/configurationmanager.cpp
index 23c25fd413..b04b211967 100644
--- a/components/files/configurationmanager.cpp
+++ b/components/files/configurationmanager.cpp
@@ -138,10 +138,10 @@ void mergeComposingVariables(boost::program_options::variables_map& first, boost
             boost::any& firstValue = firstPosition->second.value();
             const boost::any& secondValue = second[name].value();
             
-            if (firstValue.type() == typeid(Files::PathContainer))
+            if (firstValue.type() == typeid(Files::ReluctantPathContainer))
             {
-                auto& firstPathContainer = boost::any_cast<Files::PathContainer&>(firstValue);
-                const auto& secondPathContainer = boost::any_cast<const Files::PathContainer&>(secondValue);
+                auto& firstPathContainer = boost::any_cast<Files::ReluctantPathContainer&>(firstValue);
+                const auto& secondPathContainer = boost::any_cast<const Files::ReluctantPathContainer&>(secondValue);
 
                 firstPathContainer.insert(firstPathContainer.end(), secondPathContainer.begin(), secondPathContainer.end());
             }
@@ -317,4 +317,22 @@ void parseConfig(std::istream& stream, boost::program_options::variables_map& va
     );
 }
 
+std::istream& operator>> (std::istream& istream, ReluctantPath& reluctantPath)
+{
+    // Read from stream using boost::filesystem::path rules, then discard anything remaining.
+    // This prevents boost::program_options getting upset that we've not consumed the whole stream.
+    istream >> static_cast<boost::filesystem::path&>(reluctantPath);
+    if (istream && !istream.eof() && istream.peek() != EOF)
+    {
+        std::string remainder(std::istreambuf_iterator(istream), {});
+        Log(Debug::Warning) << "Trailing data in path setting. Used '" << reluctantPath.string() << "' but '" << remainder << "' remained";
+    }
+    return istream;
+}
+
+PathContainer asPathContainer(const ReluctantPathContainer& reluctantPathContainer)
+{
+    return PathContainer(reluctantPathContainer.begin(), reluctantPathContainer.end());
+}
+
 } /* namespace Cfg */
diff --git a/components/files/configurationmanager.hpp b/components/files/configurationmanager.hpp
index 99e65a7658..8f3e5f938e 100644
--- a/components/files/configurationmanager.hpp
+++ b/components/files/configurationmanager.hpp
@@ -77,6 +77,18 @@ void parseArgs(int argc, const char* const argv[], boost::program_options::varia
 void parseConfig(std::istream& stream, boost::program_options::variables_map& variables,
     boost::program_options::options_description& description);
 
+class ReluctantPath : public boost::filesystem::path
+{
+public:
+    operator boost::filesystem::path() { return *this; }
+};
+
+std::istream& operator>> (std::istream& istream, ReluctantPath& reluctantPath);
+
+typedef std::vector<ReluctantPath> ReluctantPathContainer;
+
+PathContainer asPathContainer(const ReluctantPathContainer& reluctantPathContainer);
+
 } /* namespace Cfg */
 
 #endif /* COMPONENTS_FILES_CONFIGURATIONMANAGER_HPP */

From dce4cceb39ee70c0df7880047c67a5ad999e3a8f Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Fri, 5 Nov 2021 11:06:19 +0400
Subject: [PATCH 1714/2859] Support deleted CellRefs in groundcover (bug 6276)

---
 CHANGELOG.md                         |  1 +
 apps/openmw/mwrender/groundcover.cpp | 24 +++++++++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc23c39d92..0dea848d7b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -235,6 +235,7 @@
     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 #6276: Deleted groundcover instances are not deleted in game
     Bug #6294: Game crashes with empty pathgrid
     Feature #390: 3rd person look "over the shoulder"
     Feature #832: OpenMW-CS: Handle deleted references
diff --git a/apps/openmw/mwrender/groundcover.cpp b/apps/openmw/mwrender/groundcover.cpp
index 2998ee509a..1cabf564e2 100644
--- a/apps/openmw/mwrender/groundcover.cpp
+++ b/apps/openmw/mwrender/groundcover.cpp
@@ -181,6 +181,8 @@ namespace MWRender
 
     void Groundcover::collectInstances(InstanceMap& instances, float size, const osg::Vec2f& center)
     {
+        if (mDensity <=0.f) return;
+
         const MWWorld::ESMStore& worldStore = MWBase::Environment::get().getWorld()->getStore();
         osg::Vec2f minBound = (center - osg::Vec2f(size/2.f, size/2.f));
         osg::Vec2f maxBound = (center + osg::Vec2f(size/2.f, size/2.f));
@@ -195,6 +197,7 @@ namespace MWRender
                 if (!cell) continue;
 
                 calculator.reset();
+                std::map<ESM::RefNum, ESM::CellRef> refs;
                 for (size_t i=0; i<cell->mContextList.size(); ++i)
                 {
                     unsigned int index = cell->mContextList[i].index;
@@ -206,18 +209,21 @@ namespace MWRender
                     bool deleted = false;
                     while(cell->getNextRef(esm[index], ref, deleted))
                     {
-                        if (deleted) continue;
-
-                        if (!calculator.isInstanceEnabled()) continue;
-                        if (!isInChunkBorders(ref, minBound, maxBound)) continue;
-
-                        std::string model = getGroundcoverModel(ref.mRefID, mGroundcoverStore, worldStore);
-                        if (model.empty()) continue;
-                        model = "meshes/" + model;
+                        if (!deleted && refs.find(ref.mRefNum) == refs.end() && !calculator.isInstanceEnabled()) deleted = true;
+                        if (!deleted && !isInChunkBorders(ref, minBound, maxBound)) deleted = true;
 
-                        instances[model].emplace_back(std::move(ref));
+                        if (deleted) { refs.erase(ref.mRefNum); continue; }
+                        refs[ref.mRefNum] = std::move(ref);
                     }
                 }
+
+                for (auto& pair : refs)
+                {
+                    ESM::CellRef& ref = pair.second;
+                    const std::string& model = getGroundcoverModel(ref.mRefID, mGroundcoverStore, worldStore);
+                    if (!model.empty())
+                        instances["meshes\\" + model].emplace_back(std::move(ref));
+                }
             }
         }
     }

From cca6029088397ec54e9b2fc0e86dfefcf56d1250 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sun, 14 Nov 2021 11:08:05 +0400
Subject: [PATCH 1715/2859] Add missing changelog entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0dea848d7b..0d61907f46 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -235,6 +235,7 @@
     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 #6142: Groundcover plugins change cells flags
     Bug #6276: Deleted groundcover instances are not deleted in game
     Bug #6294: Game crashes with empty pathgrid
     Feature #390: 3rd person look "over the shoulder"

From 8f48a1f030f35929cc277212f093889d80906750 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Tue, 9 Nov 2021 21:45:16 +0100
Subject: [PATCH 1716/2859] Handle non-ASCII characters while saving without
 triggering an assertion

---
 CHANGELOG.md                      |  1 +
 apps/openmw/mwstate/character.cpp | 12 ++++++++----
 components/misc/utf8stream.hpp    |  5 +++++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc23c39d92..fdb30ab110 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -75,6 +75,7 @@
     Bug #6363: Some scripts in Morrowland fail to work
     Bug #6376: Creatures should be able to use torches
     Bug #6386: Artifacts in water reflection due to imprecise screen-space coordinate computation
+    Bug #6396: Inputting certain Unicode characters triggers an assertion
     Bug #6416: Morphs are applied to the wrong target
     Feature #890: OpenMW-CS: Column filtering
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
diff --git a/apps/openmw/mwstate/character.cpp b/apps/openmw/mwstate/character.cpp
index 59ddd2cd10..7216e45df6 100644
--- a/apps/openmw/mwstate/character.cpp
+++ b/apps/openmw/mwstate/character.cpp
@@ -8,6 +8,8 @@
 #include <components/esm/esmreader.hpp>
 #include <components/esm/defs.hpp>
 
+#include <components/misc/utf8stream.hpp>
+
 bool MWState::operator< (const Slot& left, const Slot& right)
 {
     return left.mTimeStamp<right.mTimeStamp;
@@ -52,12 +54,14 @@ void MWState::Character::addSlot (const ESM::SavedGame& profile)
     std::ostringstream stream;
 
     // The profile description is user-supplied, so we need to escape the path
-    for (std::string::const_iterator it = profile.mDescription.begin(); it != profile.mDescription.end(); ++it)
+    Utf8Stream description(profile.mDescription);
+    while(!description.eof())
     {
-        if (std::isalnum(*it))  // Ignores multibyte characters and non alphanumeric characters
-            stream << *it;
+        auto c = description.consume();
+        if(c > 0 && c <= 0x7F && std::isalnum(c)) // Ignore multibyte characters and non alphanumeric characters
+            stream << static_cast<char>(c);
         else
-            stream << "_";
+            stream << '_';
     }
 
     const std::string ext = ".omwsave";
diff --git a/components/misc/utf8stream.hpp b/components/misc/utf8stream.hpp
index 9dc8aa8208..efa3e4939a 100644
--- a/components/misc/utf8stream.hpp
+++ b/components/misc/utf8stream.hpp
@@ -30,6 +30,11 @@ public:
     {
     }
 
+    Utf8Stream (const std::string& str) :
+        Utf8Stream (reinterpret_cast<Point>(str.c_str()), reinterpret_cast<Point>(str.c_str() + str.size()))
+    {
+    }
+
     bool eof () const
     {
         return cur == end;

From c01ba41aa6a491f26512c1c541354a6e7510d6bb Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 10 Nov 2021 16:54:52 +0100
Subject: [PATCH 1717/2859] Handle character directories like save names

---
 apps/openmw/mwstate/character.cpp        |  2 +-
 apps/openmw/mwstate/charactermanager.cpp | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwstate/character.cpp b/apps/openmw/mwstate/character.cpp
index 7216e45df6..52696de104 100644
--- a/apps/openmw/mwstate/character.cpp
+++ b/apps/openmw/mwstate/character.cpp
@@ -58,7 +58,7 @@ void MWState::Character::addSlot (const ESM::SavedGame& profile)
     while(!description.eof())
     {
         auto c = description.consume();
-        if(c > 0 && c <= 0x7F && std::isalnum(c)) // Ignore multibyte characters and non alphanumeric characters
+        if(c <= 0x7F && std::isalnum(c)) // Ignore multibyte characters and non alphanumeric characters
             stream << static_cast<char>(c);
         else
             stream << '_';
diff --git a/apps/openmw/mwstate/charactermanager.cpp b/apps/openmw/mwstate/charactermanager.cpp
index 027a4f38a4..301f33c5df 100644
--- a/apps/openmw/mwstate/charactermanager.cpp
+++ b/apps/openmw/mwstate/charactermanager.cpp
@@ -5,6 +5,8 @@
 
 #include <boost/filesystem.hpp>
 
+#include <components/misc/utf8stream.hpp>
+
 MWState::CharacterManager::CharacterManager (const boost::filesystem::path& saves,
     const std::vector<std::string>& contentFiles)
 : mPath (saves), mCurrent (nullptr), mGame (getFirstGameFile(contentFiles))
@@ -57,12 +59,14 @@ MWState::Character* MWState::CharacterManager::createCharacter(const std::string
     std::ostringstream stream;
 
     // The character name is user-supplied, so we need to escape the path
-    for (std::string::const_iterator it = name.begin(); it != name.end(); ++it)
+    Utf8Stream nameStream(name);
+    while(!nameStream.eof())
     {
-        if (std::isalnum(*it)) // Ignores multibyte characters and non alphanumeric characters
-            stream << *it;
+        auto c = nameStream.consume();
+        if(c <= 0x7F && std::isalnum(c)) // Ignore multibyte characters and non alphanumeric characters
+            stream << static_cast<char>(c);
         else
-            stream << "_";
+            stream << '_';
     }
 
     boost::filesystem::path path = mPath / stream.str();

From 751e8cf76b9d2c792f595088337618af61c1ad04 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 10 Nov 2021 21:25:16 +0100
Subject: [PATCH 1718/2859] Do a bounds check before calling functions defined
 in cctype

---
 apps/niftest/niftest.cpp                | 14 +++-----------
 apps/opencs/model/filter/parser.cpp     | 21 +++++++++++++++++----
 apps/opencs/model/world/idtable.cpp     |  7 +++----
 apps/openmw/mwinput/keyboardmanager.cpp |  2 +-
 components/files/escape.hpp             |  2 +-
 components/interpreter/defines.cpp      |  3 +--
 components/lua/configuration.cpp        | 15 ++++++++++-----
 components/misc/stringops.hpp           | 15 +++++++--------
 components/settings/parser.cpp          |  2 +-
 9 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/apps/niftest/niftest.cpp b/apps/niftest/niftest.cpp
index cb6205ef5c..c42df4a423 100644
--- a/apps/niftest/niftest.cpp
+++ b/apps/niftest/niftest.cpp
@@ -2,8 +2,8 @@
 
 #include <iostream>
 #include <fstream>
-#include <cstdlib>
 
+#include <components/misc/stringops.hpp>
 #include <components/nif/niffile.hpp>
 #include <components/files/constrainedfilestream.hpp>
 #include <components/vfs/manager.hpp>
@@ -18,18 +18,10 @@ namespace bpo = boost::program_options;
 namespace bfs = boost::filesystem;
 
 ///See if the file has the named extension
-bool hasExtension(std::string filename, std::string  extensionToFind)
+bool hasExtension(std::string filename, std::string extensionToFind)
 {
     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);
-    std::transform(extensionToFind.begin(), extensionToFind.end(), extensionToFind.begin(), ::tolower);
-
-    if(extension == extensionToFind)
-        return true;
-    else
-        return false;
+    return Misc::StringUtils::ciEqual(extension, extensionToFind);
 }
 
 ///See if the file has the "nif" extension.
diff --git a/apps/opencs/model/filter/parser.cpp b/apps/opencs/model/filter/parser.cpp
index d363b4849d..b8f125e237 100644
--- a/apps/opencs/model/filter/parser.cpp
+++ b/apps/opencs/model/filter/parser.cpp
@@ -17,6 +17,19 @@
 #include "textnode.hpp"
 #include "valuenode.hpp"
 
+namespace
+{
+    bool isAlpha(char c)
+    {
+        return c >= 0 && c <= 255 && std::isalpha(c);
+    }
+
+    bool isDigit(char c)
+    {
+        return c >= 0 && c <= 255 && std::isdigit(c);
+    }
+}
+
 namespace CSMFilter
 {
     struct Token
@@ -103,7 +116,7 @@ CSMFilter::Token CSMFilter::Parser::getStringToken()
     {
         char c = mInput[mIndex];
 
-        if (std::isalpha (c) || c==':' || c=='_' || (!string.empty() && std::isdigit (c)) || c=='"' ||
+        if (isAlpha(c) || c==':' || c=='_' || (!string.empty() && isDigit(c)) || c=='"' ||
             (!string.empty() && string[0]=='"'))
             string += c;
         else
@@ -150,7 +163,7 @@ CSMFilter::Token CSMFilter::Parser::getNumberToken()
     {
         char c = mInput[mIndex];
 
-        if (std::isdigit (c))
+        if (isDigit(c))
         {
             string += c;
             hasDigit = true;
@@ -225,10 +238,10 @@ CSMFilter::Token CSMFilter::Parser::getNextToken()
         case '!': ++mIndex; return Token (Token::Type_OneShot);
     }
 
-    if (c=='"' || c=='_' || std::isalpha (c) || c==':')
+    if (c=='"' || c=='_' || isAlpha(c) || c==':')
         return getStringToken();
 
-    if (c=='-' || c=='.' || std::isdigit (c))
+    if (c=='-' || c=='.' || isDigit(c))
         return getNumberToken();
 
     error();
diff --git a/apps/opencs/model/world/idtable.cpp b/apps/opencs/model/world/idtable.cpp
index 5b4a9b31bc..215f42133d 100644
--- a/apps/opencs/model/world/idtable.cpp
+++ b/apps/opencs/model/world/idtable.cpp
@@ -8,6 +8,7 @@
 #include <stdexcept>
 
 #include <components/esm/cellid.hpp>
+#include <components/misc/stringops.hpp>
 
 #include "collectionbase.hpp"
 #include "columnbase.hpp"
@@ -354,8 +355,7 @@ CSMWorld::LandTextureIdTable::ImportResults CSMWorld::LandTextureIdTable::import
     for (int i = 0; i < idCollection()->getSize(); ++i)
     {
         auto& record = static_cast<const Record<LandTexture>&>(idCollection()->getRecord(i));
-        std::string texture = record.get().mTexture;
-        std::transform(texture.begin(), texture.end(), texture.begin(), tolower);
+        std::string texture = Misc::StringUtils::lowerCase(record.get().mTexture);
         if (record.isModified())
             reverseLookupMap.emplace(texture, idCollection()->getId(i));
     }
@@ -376,8 +376,7 @@ CSMWorld::LandTextureIdTable::ImportResults CSMWorld::LandTextureIdTable::import
 
         // Look for a pre-existing record
         auto& record = static_cast<const Record<LandTexture>&>(idCollection()->getRecord(oldRow));
-        std::string texture = record.get().mTexture;
-        std::transform(texture.begin(), texture.end(), texture.begin(), tolower);
+        std::string texture = Misc::StringUtils::lowerCase(record.get().mTexture);
         auto searchIt = reverseLookupMap.find(texture);
         if (searchIt != reverseLookupMap.end())
         {
diff --git a/apps/openmw/mwinput/keyboardmanager.cpp b/apps/openmw/mwinput/keyboardmanager.cpp
index b8019b12ba..c5a665e5c6 100644
--- a/apps/openmw/mwinput/keyboardmanager.cpp
+++ b/apps/openmw/mwinput/keyboardmanager.cpp
@@ -42,7 +42,7 @@ namespace MWInput
 
         bool consumed = SDL_IsTextInputActive() &&  // Little trick to check if key is printable
                         (!(SDLK_SCANCODE_MASK & arg.keysym.sym) &&
-                        (std::isprint(arg.keysym.sym) ||
+                        (arg.keysym.sym >= 0 && arg.keysym.sym <= 255 && std::isprint(arg.keysym.sym) ||
                         // Don't trust isprint for symbols outside the extended ASCII range
                         (kc == MyGUI::KeyCode::None && arg.keysym.sym > 0xff)));
         if (kc != MyGUI::KeyCode::None && !mBindingsManager->isDetectingBindingState())
diff --git a/components/files/escape.hpp b/components/files/escape.hpp
index d01bd8d980..310042072d 100644
--- a/components/files/escape.hpp
+++ b/components/files/escape.hpp
@@ -84,7 +84,7 @@ namespace Files
             {
                 mNext.push(character);
             }
-            if (!mSeenNonWhitespace && !isspace(character))
+            if (!mSeenNonWhitespace && !(character >= 0 && character <= 255 && isspace(character)))
                 mSeenNonWhitespace = true;
         }
         int retval = mNext.front();
diff --git a/components/interpreter/defines.cpp b/components/interpreter/defines.cpp
index 48d2ceaa45..164e7b2126 100644
--- a/components/interpreter/defines.cpp
+++ b/components/interpreter/defines.cpp
@@ -172,8 +172,7 @@ namespace Interpreter{
 
                         for(unsigned int j = 0; j < globals.size(); j++){
                             if(globals[j].length() > temp.length()){ // Just in case there's a global with a huuuge name
-                                temp = text.substr(i+1, globals[j].length());
-                                transform(temp.begin(), temp.end(), temp.begin(), ::tolower);
+                                temp = Misc::StringUtils::lowerCase(text.substr(i+1, globals[j].length()));
                             }
 
                             found = check(temp, globals[j], &i, &start);
diff --git a/components/lua/configuration.cpp b/components/lua/configuration.cpp
index 4598ed2508..d059d1716f 100644
--- a/components/lua/configuration.cpp
+++ b/components/lua/configuration.cpp
@@ -30,6 +30,11 @@ namespace LuaUtil
             {"POTION", ESM::LuaScriptCfg::sPotion},
             {"WEAPON", ESM::LuaScriptCfg::sWeapon},
         };
+
+        bool isSpace(int c)
+        {
+            return c >= 0 && c <= 255 && std::isspace(c);
+        }
     }
 
     const std::vector<int> ScriptsConfiguration::sEmpty;
@@ -101,11 +106,11 @@ namespace LuaUtil
             if (!line.empty() && line.back() == '\r')
                 line = line.substr(0, line.size() - 1);
 
-            while (!line.empty() && std::isspace(line[0]))
+            while (!line.empty() && isSpace(line[0]))
                 line = line.substr(1);
             if (line.empty() || line[0] == '#')  // Skip empty lines and comments
                 continue;
-            while (!line.empty() && std::isspace(line.back()))
+            while (!line.empty() && isSpace(line.back()))
                 line = line.substr(0, line.size() - 1);
 
             if (!Misc::StringUtils::ciEndsWith(line, ".lua"))
@@ -118,7 +123,7 @@ namespace LuaUtil
                 throw std::runtime_error(Misc::StringUtils::format("No flags found in: %s", std::string(line)));
             std::string_view flagsStr = line.substr(0, semicolonPos);
             std::string_view scriptPath = line.substr(semicolonPos + 1);
-            while (std::isspace(scriptPath[0]))
+            while (isSpace(scriptPath[0]))
                 scriptPath = scriptPath.substr(1);
 
             // Parse flags
@@ -126,10 +131,10 @@ namespace LuaUtil
             size_t flagsPos = 0;
             while (true)
             {
-                while (flagsPos < flagsStr.size() && (std::isspace(flagsStr[flagsPos]) || flagsStr[flagsPos] == ','))
+                while (flagsPos < flagsStr.size() && (isSpace(flagsStr[flagsPos]) || flagsStr[flagsPos] == ','))
                     flagsPos++;
                 size_t startPos = flagsPos;
-                while (flagsPos < flagsStr.size() && !std::isspace(flagsStr[flagsPos]) && flagsStr[flagsPos] != ',')
+                while (flagsPos < flagsStr.size() && !isSpace(flagsStr[flagsPos]) && flagsStr[flagsPos] != ',')
                     flagsPos++;
                 if (startPos == flagsPos)
                     break;
diff --git a/components/misc/stringops.hpp b/components/misc/stringops.hpp
index 12633db826..a0ec9f62dd 100644
--- a/components/misc/stringops.hpp
+++ b/components/misc/stringops.hpp
@@ -184,17 +184,16 @@ public:
 
     static inline void trim(std::string &s)
     {
-        // left trim
-        s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](int ch)
+        const auto notSpace = [](int ch)
         {
-            return !std::isspace(ch);
-        }));
+            // TODO Do we care about multibyte whitespace?
+            return ch < 0 || ch > 255 || !std::isspace(ch);
+        };
+        // left trim
+        s.erase(s.begin(), std::find_if(s.begin(), s.end(), notSpace));
 
         // right trim
-        s.erase(std::find_if(s.rbegin(), s.rend(), [](int ch)
-        {
-            return !std::isspace(ch);
-        }).base(), s.end());
+        s.erase(std::find_if(s.rbegin(), s.rend(), notSpace).base(), s.end());
     }
 
     template <class Container>
diff --git a/components/settings/parser.cpp b/components/settings/parser.cpp
index f2419dfdd6..f36f190ee2 100644
--- a/components/settings/parser.cpp
+++ b/components/settings/parser.cpp
@@ -311,7 +311,7 @@ void Settings::SettingsFileParser::saveSettingsFile(const std::string& file, con
 
 bool Settings::SettingsFileParser::skipWhiteSpace(size_t& i, std::string& str)
 {
-    while (i < str.size() && std::isspace(str[i], std::locale::classic()))
+    while (i < str.size() && str[i] >= 0 && str[i] <= 255 && std::isspace(str[i], std::locale::classic()))
     {
         ++i;
     }

From c6470f33d363e5139ffb78c1a6e64c2ed09e0a44 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 10 Nov 2021 21:37:29 +0100
Subject: [PATCH 1719/2859] Use string_view

---
 components/misc/utf8stream.hpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/misc/utf8stream.hpp b/components/misc/utf8stream.hpp
index efa3e4939a..8435816c67 100644
--- a/components/misc/utf8stream.hpp
+++ b/components/misc/utf8stream.hpp
@@ -3,6 +3,7 @@
 
 #include <cstring>
 #include <string>
+#include <string_view>
 #include <tuple>
 
 class Utf8Stream
@@ -30,8 +31,8 @@ public:
     {
     }
 
-    Utf8Stream (const std::string& str) :
-        Utf8Stream (reinterpret_cast<Point>(str.c_str()), reinterpret_cast<Point>(str.c_str() + str.size()))
+    Utf8Stream (std::string_view str) :
+        Utf8Stream (reinterpret_cast<Point>(str.data()), reinterpret_cast<Point>(str.data() + str.size()))
     {
     }
 

From f23bd51175a432c3fe1c156f3118bae799978701 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 10 Nov 2021 22:53:25 +0100
Subject: [PATCH 1720/2859] Don't check bounds when the type is unambiguously a
 char

---
 apps/opencs/model/filter/parser.cpp | 21 ++++-----------------
 components/lua/configuration.cpp    | 15 +++++----------
 components/misc/stringops.hpp       |  4 ++--
 components/settings/parser.cpp      |  2 +-
 4 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/apps/opencs/model/filter/parser.cpp b/apps/opencs/model/filter/parser.cpp
index b8f125e237..d363b4849d 100644
--- a/apps/opencs/model/filter/parser.cpp
+++ b/apps/opencs/model/filter/parser.cpp
@@ -17,19 +17,6 @@
 #include "textnode.hpp"
 #include "valuenode.hpp"
 
-namespace
-{
-    bool isAlpha(char c)
-    {
-        return c >= 0 && c <= 255 && std::isalpha(c);
-    }
-
-    bool isDigit(char c)
-    {
-        return c >= 0 && c <= 255 && std::isdigit(c);
-    }
-}
-
 namespace CSMFilter
 {
     struct Token
@@ -116,7 +103,7 @@ CSMFilter::Token CSMFilter::Parser::getStringToken()
     {
         char c = mInput[mIndex];
 
-        if (isAlpha(c) || c==':' || c=='_' || (!string.empty() && isDigit(c)) || c=='"' ||
+        if (std::isalpha (c) || c==':' || c=='_' || (!string.empty() && std::isdigit (c)) || c=='"' ||
             (!string.empty() && string[0]=='"'))
             string += c;
         else
@@ -163,7 +150,7 @@ CSMFilter::Token CSMFilter::Parser::getNumberToken()
     {
         char c = mInput[mIndex];
 
-        if (isDigit(c))
+        if (std::isdigit (c))
         {
             string += c;
             hasDigit = true;
@@ -238,10 +225,10 @@ CSMFilter::Token CSMFilter::Parser::getNextToken()
         case '!': ++mIndex; return Token (Token::Type_OneShot);
     }
 
-    if (c=='"' || c=='_' || isAlpha(c) || c==':')
+    if (c=='"' || c=='_' || std::isalpha (c) || c==':')
         return getStringToken();
 
-    if (c=='-' || c=='.' || isDigit(c))
+    if (c=='-' || c=='.' || std::isdigit (c))
         return getNumberToken();
 
     error();
diff --git a/components/lua/configuration.cpp b/components/lua/configuration.cpp
index d059d1716f..4598ed2508 100644
--- a/components/lua/configuration.cpp
+++ b/components/lua/configuration.cpp
@@ -30,11 +30,6 @@ namespace LuaUtil
             {"POTION", ESM::LuaScriptCfg::sPotion},
             {"WEAPON", ESM::LuaScriptCfg::sWeapon},
         };
-
-        bool isSpace(int c)
-        {
-            return c >= 0 && c <= 255 && std::isspace(c);
-        }
     }
 
     const std::vector<int> ScriptsConfiguration::sEmpty;
@@ -106,11 +101,11 @@ namespace LuaUtil
             if (!line.empty() && line.back() == '\r')
                 line = line.substr(0, line.size() - 1);
 
-            while (!line.empty() && isSpace(line[0]))
+            while (!line.empty() && std::isspace(line[0]))
                 line = line.substr(1);
             if (line.empty() || line[0] == '#')  // Skip empty lines and comments
                 continue;
-            while (!line.empty() && isSpace(line.back()))
+            while (!line.empty() && std::isspace(line.back()))
                 line = line.substr(0, line.size() - 1);
 
             if (!Misc::StringUtils::ciEndsWith(line, ".lua"))
@@ -123,7 +118,7 @@ namespace LuaUtil
                 throw std::runtime_error(Misc::StringUtils::format("No flags found in: %s", std::string(line)));
             std::string_view flagsStr = line.substr(0, semicolonPos);
             std::string_view scriptPath = line.substr(semicolonPos + 1);
-            while (isSpace(scriptPath[0]))
+            while (std::isspace(scriptPath[0]))
                 scriptPath = scriptPath.substr(1);
 
             // Parse flags
@@ -131,10 +126,10 @@ namespace LuaUtil
             size_t flagsPos = 0;
             while (true)
             {
-                while (flagsPos < flagsStr.size() && (isSpace(flagsStr[flagsPos]) || flagsStr[flagsPos] == ','))
+                while (flagsPos < flagsStr.size() && (std::isspace(flagsStr[flagsPos]) || flagsStr[flagsPos] == ','))
                     flagsPos++;
                 size_t startPos = flagsPos;
-                while (flagsPos < flagsStr.size() && !isSpace(flagsStr[flagsPos]) && flagsStr[flagsPos] != ',')
+                while (flagsPos < flagsStr.size() && !std::isspace(flagsStr[flagsPos]) && flagsStr[flagsPos] != ',')
                     flagsPos++;
                 if (startPos == flagsPos)
                     break;
diff --git a/components/misc/stringops.hpp b/components/misc/stringops.hpp
index a0ec9f62dd..c8d236a9d0 100644
--- a/components/misc/stringops.hpp
+++ b/components/misc/stringops.hpp
@@ -184,10 +184,10 @@ public:
 
     static inline void trim(std::string &s)
     {
-        const auto notSpace = [](int ch)
+        const auto notSpace = [](char ch)
         {
             // TODO Do we care about multibyte whitespace?
-            return ch < 0 || ch > 255 || !std::isspace(ch);
+            return !std::isspace(ch);
         };
         // left trim
         s.erase(s.begin(), std::find_if(s.begin(), s.end(), notSpace));
diff --git a/components/settings/parser.cpp b/components/settings/parser.cpp
index f36f190ee2..f2419dfdd6 100644
--- a/components/settings/parser.cpp
+++ b/components/settings/parser.cpp
@@ -311,7 +311,7 @@ void Settings::SettingsFileParser::saveSettingsFile(const std::string& file, con
 
 bool Settings::SettingsFileParser::skipWhiteSpace(size_t& i, std::string& str)
 {
-    while (i < str.size() && str[i] >= 0 && str[i] <= 255 && std::isspace(str[i], std::locale::classic()))
+    while (i < str.size() && std::isspace(str[i], std::locale::classic()))
     {
         ++i;
     }

From 6daefe3ddc0a94c507efd52b5769e457af07c870 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 11 Nov 2021 18:14:10 +0100
Subject: [PATCH 1721/2859] Cast to the unsigned char expected by cctype
 functions

---
 apps/opencs/model/filter/parser.cpp     | 21 +++++++++++++++++----
 apps/openmw/mwinput/keyboardmanager.cpp |  4 ++--
 components/lua/configuration.cpp        | 15 ++++++++++-----
 components/misc/stringops.hpp           |  2 +-
 components/settings/parser.cpp          |  2 +-
 5 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/apps/opencs/model/filter/parser.cpp b/apps/opencs/model/filter/parser.cpp
index d363b4849d..6f185d60fa 100644
--- a/apps/opencs/model/filter/parser.cpp
+++ b/apps/opencs/model/filter/parser.cpp
@@ -17,6 +17,19 @@
 #include "textnode.hpp"
 #include "valuenode.hpp"
 
+namespace
+{
+    bool isAlpha(char c)
+    {
+        return std::isalpha(static_cast<unsigned char>(c));
+    }
+
+    bool isDigit(char c)
+    {
+        return std::isdigit(static_cast<unsigned char>(c));
+    }
+}
+
 namespace CSMFilter
 {
     struct Token
@@ -103,7 +116,7 @@ CSMFilter::Token CSMFilter::Parser::getStringToken()
     {
         char c = mInput[mIndex];
 
-        if (std::isalpha (c) || c==':' || c=='_' || (!string.empty() && std::isdigit (c)) || c=='"' ||
+        if (isAlpha(c) || c==':' || c=='_' || (!string.empty() && isDigit(c)) || c=='"' ||
             (!string.empty() && string[0]=='"'))
             string += c;
         else
@@ -150,7 +163,7 @@ CSMFilter::Token CSMFilter::Parser::getNumberToken()
     {
         char c = mInput[mIndex];
 
-        if (std::isdigit (c))
+        if (isDigit(c))
         {
             string += c;
             hasDigit = true;
@@ -225,10 +238,10 @@ CSMFilter::Token CSMFilter::Parser::getNextToken()
         case '!': ++mIndex; return Token (Token::Type_OneShot);
     }
 
-    if (c=='"' || c=='_' || std::isalpha (c) || c==':')
+    if (c=='"' || c=='_' || isAlpha(c) || c==':')
         return getStringToken();
 
-    if (c=='-' || c=='.' || std::isdigit (c))
+    if (c=='-' || c=='.' || isDigit(c))
         return getNumberToken();
 
     error();
diff --git a/apps/openmw/mwinput/keyboardmanager.cpp b/apps/openmw/mwinput/keyboardmanager.cpp
index c5a665e5c6..b121b665e7 100644
--- a/apps/openmw/mwinput/keyboardmanager.cpp
+++ b/apps/openmw/mwinput/keyboardmanager.cpp
@@ -42,9 +42,9 @@ namespace MWInput
 
         bool consumed = SDL_IsTextInputActive() &&  // Little trick to check if key is printable
                         (!(SDLK_SCANCODE_MASK & arg.keysym.sym) &&
-                        (arg.keysym.sym >= 0 && arg.keysym.sym <= 255 && std::isprint(arg.keysym.sym) ||
                         // Don't trust isprint for symbols outside the extended ASCII range
-                        (kc == MyGUI::KeyCode::None && arg.keysym.sym > 0xff)));
+                        ((kc == MyGUI::KeyCode::None && arg.keysym.sym > 0xff) ||
+                        (arg.keysym.sym >= 0 && arg.keysym.sym <= 255 && std::isprint(arg.keysym.sym))));
         if (kc != MyGUI::KeyCode::None && !mBindingsManager->isDetectingBindingState())
         {
             if (MWBase::Environment::get().getWindowManager()->injectKeyPress(kc, 0, arg.repeat))
diff --git a/components/lua/configuration.cpp b/components/lua/configuration.cpp
index 4598ed2508..172d958029 100644
--- a/components/lua/configuration.cpp
+++ b/components/lua/configuration.cpp
@@ -30,6 +30,11 @@ namespace LuaUtil
             {"POTION", ESM::LuaScriptCfg::sPotion},
             {"WEAPON", ESM::LuaScriptCfg::sWeapon},
         };
+
+        bool isSpace(char c)
+        {
+            return std::isspace(static_cast<unsigned char>(c));
+        }
     }
 
     const std::vector<int> ScriptsConfiguration::sEmpty;
@@ -101,11 +106,11 @@ namespace LuaUtil
             if (!line.empty() && line.back() == '\r')
                 line = line.substr(0, line.size() - 1);
 
-            while (!line.empty() && std::isspace(line[0]))
+            while (!line.empty() && isSpace(line[0]))
                 line = line.substr(1);
             if (line.empty() || line[0] == '#')  // Skip empty lines and comments
                 continue;
-            while (!line.empty() && std::isspace(line.back()))
+            while (!line.empty() && isSpace(line.back()))
                 line = line.substr(0, line.size() - 1);
 
             if (!Misc::StringUtils::ciEndsWith(line, ".lua"))
@@ -118,7 +123,7 @@ namespace LuaUtil
                 throw std::runtime_error(Misc::StringUtils::format("No flags found in: %s", std::string(line)));
             std::string_view flagsStr = line.substr(0, semicolonPos);
             std::string_view scriptPath = line.substr(semicolonPos + 1);
-            while (std::isspace(scriptPath[0]))
+            while (isSpace(scriptPath[0]))
                 scriptPath = scriptPath.substr(1);
 
             // Parse flags
@@ -126,10 +131,10 @@ namespace LuaUtil
             size_t flagsPos = 0;
             while (true)
             {
-                while (flagsPos < flagsStr.size() && (std::isspace(flagsStr[flagsPos]) || flagsStr[flagsPos] == ','))
+                while (flagsPos < flagsStr.size() && (isSpace(flagsStr[flagsPos]) || flagsStr[flagsPos] == ','))
                     flagsPos++;
                 size_t startPos = flagsPos;
-                while (flagsPos < flagsStr.size() && !std::isspace(flagsStr[flagsPos]) && flagsStr[flagsPos] != ',')
+                while (flagsPos < flagsStr.size() && !isSpace(flagsStr[flagsPos]) && flagsStr[flagsPos] != ',')
                     flagsPos++;
                 if (startPos == flagsPos)
                     break;
diff --git a/components/misc/stringops.hpp b/components/misc/stringops.hpp
index c8d236a9d0..fe4be00006 100644
--- a/components/misc/stringops.hpp
+++ b/components/misc/stringops.hpp
@@ -187,7 +187,7 @@ public:
         const auto notSpace = [](char ch)
         {
             // TODO Do we care about multibyte whitespace?
-            return !std::isspace(ch);
+            return !std::isspace(static_cast<unsigned char>(ch));
         };
         // left trim
         s.erase(s.begin(), std::find_if(s.begin(), s.end(), notSpace));
diff --git a/components/settings/parser.cpp b/components/settings/parser.cpp
index f2419dfdd6..8d387ab9c7 100644
--- a/components/settings/parser.cpp
+++ b/components/settings/parser.cpp
@@ -311,7 +311,7 @@ void Settings::SettingsFileParser::saveSettingsFile(const std::string& file, con
 
 bool Settings::SettingsFileParser::skipWhiteSpace(size_t& i, std::string& str)
 {
-    while (i < str.size() && std::isspace(str[i], std::locale::classic()))
+    while (i < str.size() && std::isspace(static_cast<unsigned char>(str[i]), std::locale::classic()))
     {
         ++i;
     }

From c5ba733855c698e1d07768998c7490135b4966a4 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 11 Nov 2021 21:16:25 +0100
Subject: [PATCH 1722/2859] Unbreak the unit test in gcc and clang

---
 components/settings/parser.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/settings/parser.cpp b/components/settings/parser.cpp
index 8d387ab9c7..f2419dfdd6 100644
--- a/components/settings/parser.cpp
+++ b/components/settings/parser.cpp
@@ -311,7 +311,7 @@ void Settings::SettingsFileParser::saveSettingsFile(const std::string& file, con
 
 bool Settings::SettingsFileParser::skipWhiteSpace(size_t& i, std::string& str)
 {
-    while (i < str.size() && std::isspace(static_cast<unsigned char>(str[i]), std::locale::classic()))
+    while (i < str.size() && std::isspace(str[i], std::locale::classic()))
     {
         ++i;
     }

From 3275440f0de2eb09cf045b54769777740ffc5f81 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Fri, 29 Oct 2021 16:47:17 +0400
Subject: [PATCH 1723/2859] Use a separate storage for groundcover data

---
 apps/openmw/CMakeLists.txt                |  2 +-
 apps/openmw/mwrender/groundcover.cpp      | 32 +++++---------
 apps/openmw/mwrender/groundcover.hpp      |  6 +--
 apps/openmw/mwrender/renderingmanager.cpp |  3 +-
 apps/openmw/mwrender/renderingmanager.hpp |  7 ++-
 apps/openmw/mwworld/groundcoverstore.cpp  | 54 +++++++++++++++++++++++
 apps/openmw/mwworld/groundcoverstore.hpp  | 29 ++++++++++++
 apps/openmw/mwworld/worldimp.cpp          | 22 +++++----
 apps/openmw/mwworld/worldimp.hpp          |  8 ++--
 components/esmloader/load.cpp             |  2 +
 10 files changed, 125 insertions(+), 40 deletions(-)
 create mode 100644 apps/openmw/mwworld/groundcoverstore.cpp
 create mode 100644 apps/openmw/mwworld/groundcoverstore.hpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index f22204eb8c..7aa2928da5 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -74,7 +74,7 @@ add_openmw_dir (mwworld
     actionequip timestamp actionalchemy cellstore actionapply actioneat
     store esmstore fallback actionrepair actionsoulgem livecellref actiondoor
     contentloader esmloader actiontrap cellreflist cellref weather projectilemanager
-    cellpreloader datetimemanager
+    cellpreloader datetimemanager groundcoverstore
     )
 
 add_openmw_dir (mwphysics
diff --git a/apps/openmw/mwrender/groundcover.cpp b/apps/openmw/mwrender/groundcover.cpp
index 1cabf564e2..a39e31bb4d 100644
--- a/apps/openmw/mwrender/groundcover.cpp
+++ b/apps/openmw/mwrender/groundcover.cpp
@@ -13,22 +13,12 @@
 #include <components/terrain/quadtreenode.hpp>
 #include <components/shader/shadermanager.hpp>
 
-#include "apps/openmw/mwworld/esmstore.hpp"
-#include "apps/openmw/mwbase/environment.hpp"
-#include "apps/openmw/mwbase/world.hpp"
+#include "../mwworld/groundcoverstore.hpp"
 
 #include "vismask.hpp"
 
 namespace MWRender
 {
-    std::string getGroundcoverModel(const std::string& id, const MWWorld::ESMStore& groundcoverStore, const MWWorld::ESMStore& store)
-    {
-        const ESM::Static* stat = groundcoverStore.get<ESM::Static>().searchStatic(id);
-        if (!stat)
-            stat = store.get<ESM::Static>().searchStatic(id);
-        return stat ? stat->mModel : std::string();
-    }
-
     class InstancingVisitor : public osg::NodeVisitor
     {
     public:
@@ -153,7 +143,7 @@ namespace MWRender
         }
     }
 
-    Groundcover::Groundcover(Resource::SceneManager* sceneManager, float density, float viewDistance, const MWWorld::ESMStore& store)
+    Groundcover::Groundcover(Resource::SceneManager* sceneManager, float density, float viewDistance, const MWWorld::GroundcoverStore& store)
          : GenericResourceManager<GroundcoverChunkId>(nullptr)
          , mSceneManager(sceneManager)
          , mDensity(density)
@@ -183,7 +173,6 @@ namespace MWRender
     {
         if (mDensity <=0.f) return;
 
-        const MWWorld::ESMStore& worldStore = MWBase::Environment::get().getWorld()->getStore();
         osg::Vec2f minBound = (center - osg::Vec2f(size/2.f, size/2.f));
         osg::Vec2f maxBound = (center + osg::Vec2f(size/2.f, size/2.f));
         DensityCalculator calculator(mDensity);
@@ -193,21 +182,22 @@ namespace MWRender
         {
             for (int cellY = startCell.y(); cellY < startCell.y() + size; ++cellY)
             {
-                const ESM::Cell* cell = mGroundcoverStore.get<ESM::Cell>().searchStatic(cellX, cellY);
-                if (!cell) continue;
+                ESM::Cell cell;
+                mGroundcoverStore.initCell(cell, cellX, cellY);
+                if (cell.mContextList.empty()) continue;
 
                 calculator.reset();
                 std::map<ESM::RefNum, ESM::CellRef> refs;
-                for (size_t i=0; i<cell->mContextList.size(); ++i)
+                for (size_t i=0; i<cell.mContextList.size(); ++i)
                 {
-                    unsigned int index = cell->mContextList[i].index;
+                    unsigned int index = cell.mContextList[i].index;
                     if (esm.size() <= index)
                         esm.resize(index+1);
-                    cell->restore(esm[index], i);
+                    cell.restore(esm[index], i);
                     ESM::CellRef ref;
                     ref.mRefNum.unset();
                     bool deleted = false;
-                    while(cell->getNextRef(esm[index], ref, deleted))
+                    while(cell.getNextRef(esm[index], ref, deleted))
                     {
                         if (!deleted && refs.find(ref.mRefNum) == refs.end() && !calculator.isInstanceEnabled()) deleted = true;
                         if (!deleted && !isInChunkBorders(ref, minBound, maxBound)) deleted = true;
@@ -220,9 +210,9 @@ namespace MWRender
                 for (auto& pair : refs)
                 {
                     ESM::CellRef& ref = pair.second;
-                    const std::string& model = getGroundcoverModel(ref.mRefID, mGroundcoverStore, worldStore);
+                    const std::string& model = mGroundcoverStore.getGroundcoverModel(ref.mRefID);
                     if (!model.empty())
-                        instances["meshes\\" + model].emplace_back(std::move(ref));
+                        instances[model].emplace_back(std::move(ref));
                 }
             }
         }
diff --git a/apps/openmw/mwrender/groundcover.hpp b/apps/openmw/mwrender/groundcover.hpp
index ea0cfa9b62..26ed8530aa 100644
--- a/apps/openmw/mwrender/groundcover.hpp
+++ b/apps/openmw/mwrender/groundcover.hpp
@@ -8,6 +8,7 @@
 namespace MWWorld
 {
     class ESMStore;
+    class GroundcoverStore;
 }
 namespace osg
 {
@@ -20,7 +21,7 @@ namespace MWRender
     class Groundcover : public Resource::GenericResourceManager<GroundcoverChunkId>, public Terrain::QuadTreeWorld::ChunkManager
     {
     public:
-        Groundcover(Resource::SceneManager* sceneManager, float density, float viewDistance, const MWWorld::ESMStore& groundcoverStore);
+        Groundcover(Resource::SceneManager* sceneManager, float density, float viewDistance, const MWWorld::GroundcoverStore& store);
         ~Groundcover();
 
         osg::ref_ptr<osg::Node> getChunk(float size, const osg::Vec2f& center, unsigned char lod, unsigned int lodFlags, bool activeGrid, const osg::Vec3f& viewPoint, bool compile) override;
@@ -43,8 +44,7 @@ namespace MWRender
         float mDensity;
         osg::ref_ptr<osg::StateSet> mStateset;
         osg::ref_ptr<osg::Program> mProgramTemplate;
-        /// @note mGroundcoverStore is separated from World's store because groundcover files must not be allowed to corrupt normal content files.
-        const MWWorld::ESMStore& mGroundcoverStore;
+        const MWWorld::GroundcoverStore& mGroundcoverStore;
 
         typedef std::map<std::string, std::vector<GroundcoverEntry>> InstanceMap;
         osg::ref_ptr<osg::Node> createChunk(InstanceMap& instances, const osg::Vec2f& center);
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 2ba18378f9..583df469dc 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -49,6 +49,7 @@
 
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/class.hpp"
+#include "../mwworld/groundcoverstore.hpp"
 #include "../mwgui/loadingscreen.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwmechanics/actorutil.hpp"
@@ -294,7 +295,7 @@ namespace MWRender
 
     RenderingManager::RenderingManager(osgViewer::Viewer* viewer, osg::ref_ptr<osg::Group> rootNode,
                                        Resource::ResourceSystem* resourceSystem, SceneUtil::WorkQueue* workQueue,
-                                       const std::string& resourcePath, DetourNavigator::Navigator& navigator, const MWWorld::ESMStore& groundcoverStore)
+                                       const std::string& resourcePath, DetourNavigator::Navigator& navigator, const MWWorld::GroundcoverStore& groundcoverStore)
         : mViewer(viewer)
         , mRootNode(rootNode)
         , mResourceSystem(resourceSystem)
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index 99d0bb5f5e..bcfa64ec14 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -67,6 +67,11 @@ namespace DetourNavigator
     struct Settings;
 }
 
+namespace MWWorld
+{
+    class GroundcoverStore;
+}
+
 namespace MWRender
 {
     class StateUpdater;
@@ -95,7 +100,7 @@ namespace MWRender
     public:
         RenderingManager(osgViewer::Viewer* viewer, osg::ref_ptr<osg::Group> rootNode,
                          Resource::ResourceSystem* resourceSystem, SceneUtil::WorkQueue* workQueue,
-                         const std::string& resourcePath, DetourNavigator::Navigator& navigator, const MWWorld::ESMStore& groundcoverStore);
+                         const std::string& resourcePath, DetourNavigator::Navigator& navigator, const MWWorld::GroundcoverStore& groundcoverStore);
         ~RenderingManager();
 
         osgUtil::IncrementalCompileOperation* getIncrementalCompileOperation();
diff --git a/apps/openmw/mwworld/groundcoverstore.cpp b/apps/openmw/mwworld/groundcoverstore.cpp
new file mode 100644
index 0000000000..543cd3e0d8
--- /dev/null
+++ b/apps/openmw/mwworld/groundcoverstore.cpp
@@ -0,0 +1,54 @@
+#include "groundcoverstore.hpp"
+
+#include <components/esmloader/load.hpp>
+#include <components/misc/stringops.hpp>
+
+namespace MWWorld
+{
+    void GroundcoverStore::init(const Store<ESM::Static>& statics, const Files::Collections& fileCollections, const std::vector<std::string>& groundcoverFiles, ToUTF8::Utf8Encoder* encoder)
+    {
+        EsmLoader::Query query;
+        query.mLoadStatics = true;
+        query.mLoadCells = true;
+
+        std::vector<ESM::ESMReader> readers(groundcoverFiles.size());
+        const EsmLoader::EsmData content = EsmLoader::loadEsmData(query, groundcoverFiles, fileCollections, readers, encoder);
+
+        for (const ESM::Static& stat : statics)
+        {
+            std::string id = Misc::StringUtils::lowerCase(stat.mId);
+            mMeshCache[id] = "meshes\\" + Misc::StringUtils::lowerCase(stat.mModel);
+        }
+
+        for (const ESM::Static& stat : content.mStatics)
+        {
+            std::string id = Misc::StringUtils::lowerCase(stat.mId);
+            mMeshCache[id] = "meshes\\" + Misc::StringUtils::lowerCase(stat.mModel);
+        }
+
+        for (const ESM::Cell& cell : content.mCells)
+        {
+            if (!cell.isExterior()) continue;
+            auto cellIndex = std::make_pair(cell.getCellId().mIndex.mX, cell.getCellId().mIndex.mY);
+            mCellContexts[cellIndex] = std::move(cell.mContextList);
+        }
+    }
+
+    std::string GroundcoverStore::getGroundcoverModel(const std::string& id) const
+    {
+        std::string idLower = Misc::StringUtils::lowerCase(id);
+        auto search = mMeshCache.find(idLower);
+        if (search == mMeshCache.end()) return std::string();
+
+        return search->second;
+    }
+
+    void GroundcoverStore::initCell(ESM::Cell& cell, int cellX, int cellY) const
+    {
+        cell.blank();
+
+        auto searchCell = mCellContexts.find(std::make_pair(cellX, cellY));
+        if (searchCell != mCellContexts.end())
+            cell.mContextList = searchCell->second;
+    }
+}
diff --git a/apps/openmw/mwworld/groundcoverstore.hpp b/apps/openmw/mwworld/groundcoverstore.hpp
new file mode 100644
index 0000000000..197be2a998
--- /dev/null
+++ b/apps/openmw/mwworld/groundcoverstore.hpp
@@ -0,0 +1,29 @@
+#ifndef GAME_MWWORLD_GROUNDCOVER_STORE_H
+#define GAME_MWWORLD_GROUNDCOVER_STORE_H
+
+#include <vector>
+#include <string>
+#include <map>
+
+#include <components/esm/esmreader.hpp>
+#include <components/esmloader/esmdata.hpp>
+#include <components/files/collections.hpp>
+
+#include "esmstore.hpp"
+
+namespace MWWorld
+{
+    class GroundcoverStore
+    {
+        private:
+            std::map<std::string, std::string> mMeshCache;
+            std::map<std::pair<int, int>, std::vector<ESM::ESM_Context>> mCellContexts;
+
+        public:
+            void init(const Store<ESM::Static>& statics, const Files::Collections& fileCollections, const std::vector<std::string>& groundcoverFiles, ToUTF8::Utf8Encoder* encoder);
+            std::string getGroundcoverModel(const std::string& id) const;
+            void initCell(ESM::Cell& cell, int cellX, int cellY) const;
+    };
+}
+
+#endif
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index f434d059da..bb97f23407 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -155,13 +155,9 @@ namespace MWWorld
         mEsm.resize(contentFiles.size());
         Loading::Listener* listener = MWBase::Environment::get().getWindowManager()->getLoadingScreen();
         listener->loadingOn();
-        
+
         loadContentFiles(fileCollections, contentFiles, mStore, mEsm, encoder, listener);
-        if (!groundcoverFiles.empty())
-        {
-            std::vector<ESM::ESMReader> tempReaders (groundcoverFiles.size());
-            loadContentFiles(fileCollections, groundcoverFiles, mGroundcoverStore, tempReaders, encoder, listener, false);
-        }
+        loadGroundcoverFiles(fileCollections, groundcoverFiles, encoder);
 
         listener->loadingOff();
 
@@ -2948,12 +2944,11 @@ namespace MWWorld
         return mScriptsEnabled;
     }
 
-    void World::loadContentFiles(const Files::Collections& fileCollections, const std::vector<std::string>& content, ESMStore& store, std::vector<ESM::ESMReader>& readers, ToUTF8::Utf8Encoder* encoder, Loading::Listener* listener, bool validate)
+    void World::loadContentFiles(const Files::Collections& fileCollections, const std::vector<std::string>& content, ESMStore& store, std::vector<ESM::ESMReader>& readers, ToUTF8::Utf8Encoder* encoder, Loading::Listener* listener)
     {
         GameContentLoader gameContentLoader(*listener);
         EsmLoader esmLoader(store, readers, encoder, *listener);
-        if (validate)
-            validateMasterFiles(readers);
+        validateMasterFiles(readers);
 
         gameContentLoader.addLoader(".esm", &esmLoader);
         gameContentLoader.addLoader(".esp", &esmLoader);
@@ -2982,6 +2977,15 @@ namespace MWWorld
         }
     }
 
+    void World::loadGroundcoverFiles(const Files::Collections& fileCollections, const std::vector<std::string>& groundcoverFiles, ToUTF8::Utf8Encoder* encoder)
+    {
+        if (!Settings::Manager::getBool("enabled", "Groundcover")) return;
+
+        Log(Debug::Info) << "Loading groundcover:";
+
+        mGroundcoverStore.init(mStore.get<ESM::Static>(), fileCollections, groundcoverFiles, encoder);
+    }
+
     bool World::startSpellCast(const Ptr &actor)
     {
         MWMechanics::CreatureStats& stats = actor.getClass().getCreatureStats(actor);
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index c8eebd9a8b..753169107e 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -15,6 +15,7 @@
 #include "timestamp.hpp"
 #include "globals.hpp"
 #include "contentloader.hpp"
+#include "groundcoverstore.hpp"
 
 namespace osg
 {
@@ -80,7 +81,7 @@ namespace MWWorld
 
             std::vector<ESM::ESMReader> mEsm;
             MWWorld::ESMStore mStore;
-            MWWorld::ESMStore mGroundcoverStore;
+            GroundcoverStore mGroundcoverStore;
             LocalScripts mLocalScripts;
             MWWorld::Globals mGlobalVariables;
 
@@ -164,10 +165,9 @@ namespace MWWorld
 
             void updateSkyDate();
 
-            // A helper method called automatically during World construction.
-            void loadContentFiles(const Files::Collections& fileCollections, const std::vector<std::string>& content,
-                 ESMStore& store, std::vector<ESM::ESMReader>& readers, ToUTF8::Utf8Encoder* encoder, Loading::Listener* listener, bool validateMasterFiles = true);
+            void loadContentFiles(const Files::Collections& fileCollections, const std::vector<std::string>& content, ESMStore& store, std::vector<ESM::ESMReader>& readers, ToUTF8::Utf8Encoder* encoder, Loading::Listener* listener);
 
+            void loadGroundcoverFiles(const Files::Collections& fileCollections, const std::vector<std::string>& groundcoverFiles, ToUTF8::Utf8Encoder* encoder);
 
             float feetToGameUnits(float feet);
             float getActivationDistancePlusTelekinesis();
diff --git a/components/esmloader/load.cpp b/components/esmloader/load.cpp
index 9879f33274..673c272e59 100644
--- a/components/esmloader/load.cpp
+++ b/components/esmloader/load.cpp
@@ -215,6 +215,8 @@ namespace EsmLoader
                 reader.setEncoder(encoder);
                 reader.setIndex(static_cast<int>(i));
                 reader.open(collection.getPath(file).string());
+                if (query.mLoadCells)
+                    reader.resolveParentFileIndices(readers);
 
                 loadEsm(query, readers[i], result);
             }

From 365739d6099cc941a2400ec1beba121c6c43fa7a Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Sun, 14 Nov 2021 20:17:30 +0000
Subject: [PATCH 1724/2859] Give psi29a's custom android-ndk22 a go

---
 .gitlab-ci.yml               | 8 +++-----
 CI/before_install.android.sh | 4 ++--
 CI/before_script.android.sh  | 5 ++---
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b9ce5612e2..9f985856ec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -458,23 +458,21 @@ Windows_MSBuild_Tests_RelWithDebInfo:
 Debian_AndroidNDK_arm64-v8a:
   tags:
     - linux
-  image: debian:bullseye
+  image: psi29a/android-ndk:focal-ndk22
   rules:
     - if: $CI_PIPELINE_SOURCE == "push"  
   variables:
     CCACHE_SIZE: 3G
   cache:
-    key: Debian_AndroidNDK_arm64-v8a.v3
+    key: Ubuntu__Focal_AndroidNDK_r22b_arm64-v8a.v1
     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
+    - apt-get -q -o dir::cache::archives="$APT_CACHE_DIR" install -y cmake ccache curl unzip git build-essential
   stage: build
   script:
     - export CCACHE_BASEDIR="`pwd`"
diff --git a/CI/before_install.android.sh b/CI/before_install.android.sh
index 59d98f48c4..712ded2769 100755
--- a/CI/before_install.android.sh
+++ b/CI/before_install.android.sh
@@ -1,4 +1,4 @@
 #!/bin/sh -ex
 
-curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/android/openmw-android-deps-20201230.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
+curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/android/openmw-android-deps-20211114.zip -o ~/openmw-android-deps.zip
+unzip -o ~/openmw-android-deps -d /android-ndk-r22/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr > /dev/null
diff --git a/CI/before_script.android.sh b/CI/before_script.android.sh
index 3219f3a4ba..bdf7d4a244 100755
--- a/CI/before_script.android.sh
+++ b/CI/before_script.android.sh
@@ -7,9 +7,10 @@ mkdir -p build
 cd build
 
 cmake \
--DCMAKE_TOOLCHAIN_FILE=/usr/lib/android-sdk/ndk-bundle/build/cmake/android.toolchain.cmake \
+-DCMAKE_TOOLCHAIN_FILE=/android-ndk-r22/build/cmake/android.toolchain.cmake \
 -DANDROID_ABI=arm64-v8a \
 -DANDROID_PLATFORM=android-21 \
+-DANDROID_LD=deprecated \
 -DCMAKE_C_COMPILER_LAUNCHER=ccache \
 -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
 -DCMAKE_INSTALL_PREFIX=install \
@@ -22,7 +23,5 @@ cmake \
 -DBUILD_OPENCS=0 \
 -DBUILD_WIZARD=0 \
 -DOPENMW_USE_SYSTEM_MYGUI=OFF \
--DOPENMW_USE_SYSTEM_OSG=OFF \
--DOPENMW_USE_SYSTEM_BULLET=OFF \
 -DOPENMW_USE_SYSTEM_SQLITE3=OFF \
 ..

From c7d6620c352eb643e509537b10cb329782a9aee4 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Mon, 15 Nov 2021 00:54:01 +0100
Subject: [PATCH 1725/2859] Add error checking in MWLua::Action

---
 apps/openmw/mwlua/actions.cpp        | 29 ++++++++++++++++++++++++----
 apps/openmw/mwlua/actions.hpp        | 23 +++++++++++++++++++---
 apps/openmw/mwlua/localscripts.cpp   |  4 ++--
 apps/openmw/mwlua/luabindings.cpp    |  3 +--
 apps/openmw/mwlua/luamanagerimp.cpp  |  4 ++--
 apps/openmw/mwlua/objectbindings.cpp | 15 +++++++-------
 components/lua/luastate.hpp          |  5 +++++
 7 files changed, 63 insertions(+), 20 deletions(-)

diff --git a/apps/openmw/mwlua/actions.cpp b/apps/openmw/mwlua/actions.cpp
index 92a7f915bb..7389363fe6 100644
--- a/apps/openmw/mwlua/actions.cpp
+++ b/apps/openmw/mwlua/actions.cpp
@@ -3,6 +3,7 @@
 #include <cstring>
 
 #include <components/debug/debuglog.hpp>
+#include <components/lua/luastate.hpp>
 
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/class.hpp"
@@ -12,14 +13,34 @@
 namespace MWLua
 {
 
+#ifdef NDEBUG
+    Action::Action(LuaUtil::LuaState* state) {}
+#else
+    Action::Action(LuaUtil::LuaState* state) : mCallerTraceback(state->debugTraceback()) {}
+#endif
+
+    void Action::safeApply(WorldView& w) const
+    {
+        try
+        {
+            apply(w);
+        }
+        catch (const std::exception& e)
+        {
+            Log(Debug::Error) << "Error in " << this->toString() << ": " << e.what();
+#ifdef NDEBUG
+            Log(Debug::Error) << "Traceback is available only in debug builds";
+#else
+            Log(Debug::Error) << "Caller " << mCallerTraceback;
+#endif
+        }
+    }
+
     void TeleportAction::apply(WorldView& worldView) const
     {
         MWWorld::CellStore* cell = worldView.findCell(mCell, mPos);
         if (!cell)
-        {
-            Log(Debug::Error) << "LuaManager::applyTeleport -> cell not found: '" << mCell << "'";
-            return;
-        }
+            throw std::runtime_error(std::string("cell not found: '") + mCell + "'");
 
         MWBase::World* world = MWBase::Environment::get().getWorld();
         MWWorld::Ptr obj = worldView.getObjectRegistry()->getPtr(mObject, false);
diff --git a/apps/openmw/mwlua/actions.hpp b/apps/openmw/mwlua/actions.hpp
index 900b175320..3b71eef4a9 100644
--- a/apps/openmw/mwlua/actions.hpp
+++ b/apps/openmw/mwlua/actions.hpp
@@ -6,6 +6,11 @@
 #include "object.hpp"
 #include "worldview.hpp"
 
+namespace LuaUtil
+{
+    class LuaState;
+}
+
 namespace MWLua
 {
 
@@ -16,17 +21,27 @@ namespace MWLua
     class Action
     {
     public:
+        Action(LuaUtil::LuaState* state);
         virtual ~Action() {}
+
+        void safeApply(WorldView&) const;
         virtual void apply(WorldView&) const = 0;
+        virtual std::string toString() const = 0;
+
+    private:
+#ifndef NDEBUG
+        std::string mCallerTraceback;
+#endif
     };
 
     class TeleportAction final : public Action
     {
     public:
-        TeleportAction(ObjectId object, std::string cell, const osg::Vec3f& pos, const osg::Vec3f& rot)
-            : mObject(object), mCell(std::move(cell)), mPos(pos), mRot(rot) {}
+        TeleportAction(LuaUtil::LuaState* state, ObjectId object, std::string cell, const osg::Vec3f& pos, const osg::Vec3f& rot)
+            : Action(state), mObject(object), mCell(std::move(cell)), mPos(pos), mRot(rot) {}
 
         void apply(WorldView&) const override;
+        std::string toString() const override { return "TeleportAction"; }
 
     private:
         ObjectId mObject;
@@ -41,9 +56,11 @@ namespace MWLua
         using Item = std::variant<std::string, ObjectId>;  // recordId or ObjectId
         using Equipment = std::map<int, Item>;  // slot to item
 
-        SetEquipmentAction(ObjectId actor, Equipment equipment) : mActor(actor), mEquipment(std::move(equipment)) {}
+        SetEquipmentAction(LuaUtil::LuaState* state, ObjectId actor, Equipment equipment)
+            : Action(state), mActor(actor), mEquipment(std::move(equipment)) {}
 
         void apply(WorldView&) const override;
+        std::string toString() const override { return "SetEquipmentAction"; }
 
     private:
         ObjectId mActor;
diff --git a/apps/openmw/mwlua/localscripts.cpp b/apps/openmw/mwlua/localscripts.cpp
index ee23b4b90c..98cf0a0b1a 100644
--- a/apps/openmw/mwlua/localscripts.cpp
+++ b/apps/openmw/mwlua/localscripts.cpp
@@ -39,7 +39,7 @@ namespace MWLua
         selfAPI["controls"] = sol::readonly_property([](SelfObject& self) { return &self.mControls; });
         selfAPI["isActive"] = [](SelfObject& self) { return &self.mIsActive; };
         selfAPI["enableAI"] = [](SelfObject& self, bool v) { self.mControls.mDisableAI = !v; };
-        selfAPI["setEquipment"] = [manager=context.mLuaManager](const SelfObject& obj, sol::table equipment)
+        selfAPI["setEquipment"] = [context](const SelfObject& obj, sol::table equipment)
         {
             if (!obj.ptr().getClass().hasInventoryStore(obj.ptr()))
             {
@@ -56,7 +56,7 @@ namespace MWLua
                 else
                     eqp[slot] = value.as<std::string>();
             }
-            manager->addAction(std::make_unique<SetEquipmentAction>(obj.id(), std::move(eqp)));
+            context.mLuaManager->addAction(std::make_unique<SetEquipmentAction>(context.mLua, obj.id(), std::move(eqp)));
         };
         selfAPI["getCombatTarget"] = [worldView=context.mWorldView](SelfObject& self) -> sol::optional<LObject>
         {
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index 07e8dcc30c..bf323351a3 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -28,8 +28,7 @@ namespace MWLua
         api["API_REVISION"] = 9;
         api["quit"] = [lua]()
         {
-            std::string traceback = lua->sol()["debug"]["traceback"]().get<std::string>();
-            Log(Debug::Warning) << "Quit requested by a Lua script.\n" << traceback;
+            Log(Debug::Warning) << "Quit requested by a Lua script.\n" << lua->debugTraceback();
             MWBase::Environment::get().getStateManager()->requestQuit();
         };
         api["sendGlobalEvent"] = [context](std::string eventName, const sol::object& eventData)
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 2b9f0702e2..dae11513b5 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -188,11 +188,11 @@ namespace MWLua
         mUIMessages.clear();
 
         for (std::unique_ptr<Action>& action : mActionQueue)
-            action->apply(mWorldView);
+            action->safeApply(mWorldView);
         mActionQueue.clear();
         
         if (mTeleportPlayerAction)
-            mTeleportPlayerAction->apply(mWorldView);
+            mTeleportPlayerAction->safeApply(mWorldView);
         mTeleportPlayerAction.reset();
     }
 
diff --git a/apps/openmw/mwlua/objectbindings.cpp b/apps/openmw/mwlua/objectbindings.cpp
index 2eceecc061..9857170b32 100644
--- a/apps/openmw/mwlua/objectbindings.cpp
+++ b/apps/openmw/mwlua/objectbindings.cpp
@@ -179,16 +179,16 @@ namespace MWLua
                 localScripts->removeScript(*scriptId);
             };
 
-            objectT["teleport"] = [luaManager=context.mLuaManager](const GObject& object, std::string_view cell,
-                                                                   const osg::Vec3f& pos, const sol::optional<osg::Vec3f>& optRot)
+            objectT["teleport"] = [context](const GObject& object, std::string_view cell,
+                                            const osg::Vec3f& pos, const sol::optional<osg::Vec3f>& optRot)
             {
                 MWWorld::Ptr ptr = object.ptr();
                 osg::Vec3f rot = optRot ? *optRot : ptr.getRefData().getPosition().asRotationVec3();
-                auto action = std::make_unique<TeleportAction>(object.id(), std::string(cell), pos, rot);
+                auto action = std::make_unique<TeleportAction>(context.mLua, object.id(), std::string(cell), pos, rot);
                 if (ptr == MWBase::Environment::get().getWorld()->getPlayerPtr())
-                    luaManager->addTeleportPlayerAction(std::move(action));
+                    context.mLuaManager->addTeleportPlayerAction(std::move(action));
                 else
-                    luaManager->addAction(std::move(action));
+                    context.mLuaManager->addAction(std::move(action));
             };
         }
         else
@@ -352,7 +352,7 @@ namespace MWLua
 
         if constexpr (std::is_same_v<ObjectT, GObject>)
         {  // Only for global scripts
-            objectT["setEquipment"] = [manager=context.mLuaManager](const GObject& obj, sol::table equipment)
+            objectT["setEquipment"] = [context](const GObject& obj, sol::table equipment)
             {
                 if (!obj.ptr().getClass().hasInventoryStore(obj.ptr()))
                 {
@@ -360,7 +360,8 @@ namespace MWLua
                         throw std::runtime_error(ptrToString(obj.ptr()) + " has no equipment slots");
                     return;
                 }
-                manager->addAction(std::make_unique<SetEquipmentAction>(obj.id(), parseEquipmentTable(equipment)));
+                context.mLuaManager->addAction(std::make_unique<SetEquipmentAction>(
+                    context.mLua, obj.id(), parseEquipmentTable(equipment)));
             };
 
             // TODO
diff --git a/components/lua/luastate.hpp b/components/lua/luastate.hpp
index b302e565f4..71cdb4f75d 100644
--- a/components/lua/luastate.hpp
+++ b/components/lua/luastate.hpp
@@ -35,6 +35,11 @@ namespace LuaUtil
         // Returns underlying sol::state.
         sol::state& sol() { return mLua; }
 
+        // Can be used by a C++ function that is called from Lua to get the Lua traceback.
+        // Makes no sense if called not from Lua code.
+        // Note: It is a slow function, should be used for debug purposes only.
+        std::string debugTraceback() { return mLua["debug"]["traceback"]().get<std::string>(); }
+
         // A shortcut to create a new Lua table.
         sol::table newTable() { return sol::table(mLua, sol::create); }
 

From c277e8bf3fe730e4546cfdd85155a9cfe6755c82 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 15 Nov 2021 16:31:38 +0100
Subject: [PATCH 1726/2859] Unset store listeners for creatures

---
 apps/openmw/mwrender/objects.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwrender/objects.cpp b/apps/openmw/mwrender/objects.cpp
index f51008fffa..e208d7191e 100644
--- a/apps/openmw/mwrender/objects.cpp
+++ b/apps/openmw/mwrender/objects.cpp
@@ -141,11 +141,11 @@ void Objects::removeCell(const MWWorld::CellStore* store)
         MWWorld::Ptr ptr = iter->second->getPtr();
         if(ptr.getCell() == store)
         {
-            if (ptr.getClass().isNpc() && ptr.getRefData().getCustomData())
+            if (ptr.getClass().isActor() && ptr.getRefData().getCustomData())
             {
-                MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore(ptr);
-                invStore.setInvListener(nullptr, ptr);
-                invStore.setContListener(nullptr);
+                if (ptr.getClass().hasInventoryStore(ptr))
+                    ptr.getClass().getInventoryStore(ptr).setInvListener(nullptr, ptr);
+                ptr.getClass().getContainerStore(ptr).setContListener(nullptr);
             }
 
             mObjects.erase(iter++);

From e53d5ed91bffe266fabd14af68f615aa2f31ff14 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Mon, 15 Nov 2021 17:31:57 +0100
Subject: [PATCH 1727/2859] Fix compiler warnings in
 apps/openmw/mwlua/inputbindings.cpp

---
 apps/openmw/mwlua/inputbindings.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwlua/inputbindings.cpp b/apps/openmw/mwlua/inputbindings.cpp
index 303c25f864..6707d35d3b 100644
--- a/apps/openmw/mwlua/inputbindings.cpp
+++ b/apps/openmw/mwlua/inputbindings.cpp
@@ -37,7 +37,7 @@ namespace MWLua
 
         api["isIdle"] = [input]() { return input->isIdle(); };
         api["isActionPressed"] = [input](int action) { return input->actionIsActive(action); };
-        api["isKeyPressed"] = [input](SDL_Scancode code) -> bool
+        api["isKeyPressed"] = [](SDL_Scancode code) -> bool
         {
             int maxCode;
             const auto* state = SDL_GetKeyboardState(&maxCode);
@@ -46,10 +46,10 @@ namespace MWLua
             else
                 return false;
         };
-        api["isShiftPressed"] = [input]() -> bool { return SDL_GetModState() & KMOD_SHIFT; };
-        api["isCtrlPressed"] = [input]() -> bool { return SDL_GetModState() & KMOD_CTRL; };
-        api["isAltPressed"] = [input]() -> bool { return SDL_GetModState() & KMOD_ALT; };
-        api["isSuperPressed"] = [input]() -> bool { return SDL_GetModState() & KMOD_GUI; };
+        api["isShiftPressed"] = []() -> bool { return SDL_GetModState() & KMOD_SHIFT; };
+        api["isCtrlPressed"] = []() -> bool { return SDL_GetModState() & KMOD_CTRL; };
+        api["isAltPressed"] = []() -> bool { return SDL_GetModState() & KMOD_ALT; };
+        api["isSuperPressed"] = []() -> bool { return SDL_GetModState() & KMOD_GUI; };
         api["isControllerButtonPressed"] = [input](int button)
         {
             return input->isControllerButtonPressed(static_cast<SDL_GameControllerButton>(button));

From ee41b94a73e982dfb5023e9fd90ead58cba588b6 Mon Sep 17 00:00:00 2001
From: Brian Kelley <fustigator@gmail.com>
Date: Mon, 15 Nov 2021 19:01:52 +0000
Subject: [PATCH 1728/2859] Enable compilation on apple silicon

---
 CMakeLists.txt                                   | 6 ++++--
 components/detournavigator/recastmeshbuilder.cpp | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2ee87b2ce..067b645a39 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -709,8 +709,10 @@ if (WIN32)
 endif()
 
 if (BUILD_OPENMW AND APPLE)
-    # Without these flags LuaJit crashes on startup on OSX
-    set_target_properties(openmw PROPERTIES LINK_FLAGS "-pagezero_size 10000 -image_base 100000000")
+    if (USE_LUAJIT)
+        # Without these flags LuaJit crashes on startup on OSX
+        set_target_properties(openmw PROPERTIES LINK_FLAGS "-pagezero_size 10000 -image_base 100000000")
+    endif(USE_LUAJIT)
     target_compile_definitions(components PRIVATE GL_SILENCE_DEPRECATION=1)
     target_compile_definitions(openmw PRIVATE GL_SILENCE_DEPRECATION=1)
 endif()
diff --git a/components/detournavigator/recastmeshbuilder.cpp b/components/detournavigator/recastmeshbuilder.cpp
index ae3458a011..8a0d30616d 100644
--- a/components/detournavigator/recastmeshbuilder.cpp
+++ b/components/detournavigator/recastmeshbuilder.cpp
@@ -18,6 +18,7 @@
 #include <cassert>
 #include <array>
 #include <vector>
+#include <sstream>
 
 namespace DetourNavigator
 {

From 68963538ae2013943bd3dad3e79cc71259a852a4 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Thu, 18 Nov 2021 15:19:54 +0000
Subject: [PATCH 1729/2859] Lua UI API

---
 apps/openmw/mwgui/windowmanagerimp.cpp        |   3 +
 apps/openmw/mwlua/uibindings.cpp              | 169 +++++++++-
 apps/openmw_test_suite/CMakeLists.txt         |   2 +
 .../openmw_test_suite/lua/test_ui_content.cpp |  97 ++++++
 components/CMakeLists.txt                     |   5 +
 components/lua_ui/content.cpp                 | 106 ++++++
 components/lua_ui/content.hpp                 |  41 +++
 components/lua_ui/element.cpp                 | 151 +++++++++
 components/lua_ui/element.hpp                 |  31 ++
 components/lua_ui/text.cpp                    |  40 +++
 components/lua_ui/text.hpp                    |  26 ++
 components/lua_ui/textedit.cpp                |  19 ++
 components/lua_ui/textedit.hpp                |  19 ++
 components/lua_ui/widget.cpp                  | 307 ++++++++++++++++++
 components/lua_ui/widget.hpp                  |  91 ++++++
 components/lua_ui/widgetlist.cpp              |  31 ++
 components/lua_ui/widgetlist.hpp              |  14 +
 components/lua_ui/window.cpp                  |  94 ++++++
 components/lua_ui/window.hpp                  |  33 ++
 docs/source/generate_luadoc.sh                |  23 +-
 docs/source/reference/lua-scripting/api.rst   |   5 +-
 .../reference/lua-scripting/overview.rst      |   4 +-
 .../lua-scripting/user_interface.rst          | 151 +++++++++
 .../lua-scripting/widgets/widget.rst          |  77 +++++
 files/lua_api/openmw/ui.lua                   | 108 +++++-
 25 files changed, 1633 insertions(+), 14 deletions(-)
 create mode 100644 apps/openmw_test_suite/lua/test_ui_content.cpp
 create mode 100644 components/lua_ui/content.cpp
 create mode 100644 components/lua_ui/content.hpp
 create mode 100644 components/lua_ui/element.cpp
 create mode 100644 components/lua_ui/element.hpp
 create mode 100644 components/lua_ui/text.cpp
 create mode 100644 components/lua_ui/text.hpp
 create mode 100644 components/lua_ui/textedit.cpp
 create mode 100644 components/lua_ui/textedit.hpp
 create mode 100644 components/lua_ui/widget.cpp
 create mode 100644 components/lua_ui/widget.hpp
 create mode 100644 components/lua_ui/widgetlist.cpp
 create mode 100644 components/lua_ui/widgetlist.hpp
 create mode 100644 components/lua_ui/window.cpp
 create mode 100644 components/lua_ui/window.hpp
 create mode 100644 docs/source/reference/lua-scripting/user_interface.rst
 create mode 100644 docs/source/reference/lua-scripting/widgets/widget.rst

diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 6eeb2d3654..a935d7f900 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -53,6 +53,8 @@
 #include <components/misc/resourcehelpers.hpp>
 #include <components/misc/frameratelimiter.hpp>
 
+#include <components/lua_ui/widgetlist.hpp>
+
 #include "../mwbase/inputmanager.hpp"
 #include "../mwbase/statemanager.hpp"
 #include "../mwbase/soundmanager.hpp"
@@ -220,6 +222,7 @@ namespace MWGui
         ItemWidget::registerComponents();
         SpellView::registerComponents();
         Gui::registerAllWidgets();
+        LuaUi::registerAllWidgets();
 
         MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Controllers::ControllerFollowMouse>("Controller");
 
diff --git a/apps/openmw/mwlua/uibindings.cpp b/apps/openmw/mwlua/uibindings.cpp
index 4fae84cd40..7008a0caea 100644
--- a/apps/openmw/mwlua/uibindings.cpp
+++ b/apps/openmw/mwlua/uibindings.cpp
@@ -1,17 +1,182 @@
-#include "luabindings.hpp"
+#include <components/lua_ui/content.hpp>
+#include <components/lua_ui/widgetlist.hpp>
+#include <components/lua_ui/element.hpp>
 
+#include "context.hpp"
+#include "actions.hpp"
 #include "luamanagerimp.hpp"
 
 namespace MWLua
 {
+    namespace
+    {
+
+        class UiAction final : public Action
+        {
+            public:
+                enum Type
+                {
+                    CREATE = 0,
+                    UPDATE,
+                    DESTROY,
+                };
+
+                UiAction(Type type, std::shared_ptr<LuaUi::Element> element, LuaUtil::LuaState* state)
+                    : Action(state)
+                    , mType{ type }
+                    , mElement{ std::move(element) }
+                {}
+
+                void apply(WorldView&) const override
+                {
+                    try {
+                        switch (mType)
+                        {
+                            case CREATE:
+                                mElement->create();
+                                break;
+                            case UPDATE:
+                                mElement->update();
+                                break;
+                            case DESTROY:
+                                mElement->destroy();
+                                break;
+                        }
+                    }
+                    catch (std::exception& e)
+                    {
+                        // prevent any actions on a potentially corrupted widget
+                        mElement->mRoot = nullptr;
+                        throw;
+                    }
+                }
+
+                std::string toString() const override
+                {
+                    std::string result;
+                    switch (mType)
+                    {
+                        case CREATE:
+                            result += "Create";
+                            break;
+                        case UPDATE:
+                            result += "Update";
+                            break;
+                        case DESTROY:
+                            result += "Destroy";
+                            break;
+                    }
+                    result += " UI";
+                    return result;
+                }
+
+            private:
+                Type mType;
+                std::shared_ptr<LuaUi::Element> mElement;
+        };
+
+        // Lua arrays index from 1
+        inline size_t fromLuaIndex(size_t i) { return i - 1; }
+        inline size_t toLuaIndex(size_t i) { return i + 1; }
+    }
 
     sol::table initUserInterfacePackage(const Context& context)
     {
-        sol::table api(context.mLua->sol(), sol::create);
+        auto uiContent = context.mLua->sol().new_usertype<LuaUi::Content>("UiContent");
+        uiContent[sol::meta_function::length] = [](const LuaUi::Content& content)
+        {
+            return content.size();
+        };
+        uiContent[sol::meta_function::index] = sol::overload(
+            [](const LuaUi::Content& content, size_t index)
+            {
+                return content.at(fromLuaIndex(index));
+            },
+            [](const LuaUi::Content& content, std::string_view name)
+            {
+                return content.at(name);
+            });
+        uiContent[sol::meta_function::new_index] = sol::overload(
+            [](LuaUi::Content& content, size_t index, const sol::table& table)
+            {
+                content.assign(fromLuaIndex(index), table);
+            },
+            [](LuaUi::Content& content, size_t index, sol::nil_t nil)
+            {
+                content.remove(fromLuaIndex(index));
+            },
+            [](LuaUi::Content& content, std::string_view name, const sol::table& table)
+            {
+                content.assign(name, table);
+            },
+            [](LuaUi::Content& content, std::string_view name, sol::nil_t nil)
+            {
+                content.remove(name);
+            });
+        uiContent["insert"] = [](LuaUi::Content& content, size_t index, const sol::table& table)
+        {
+            content.insert(fromLuaIndex(index), table);
+        };
+        uiContent["add"] = [](LuaUi::Content& content, const sol::table& table)
+        {
+            content.insert(content.size(), table);
+        };
+        uiContent["indexOf"] = [](LuaUi::Content& content, const sol::table& table) -> sol::optional<size_t>
+        {
+            size_t index = content.indexOf(table);
+            if (index < content.size())
+                return toLuaIndex(index);
+            else
+                return sol::nullopt;
+        };
+
+        auto element = context.mLua->sol().new_usertype<LuaUi::Element>("Element");
+        element["layout"] = sol::property(
+            [](LuaUi::Element& element)
+            {
+                return element.mLayout;
+            },
+            [](LuaUi::Element& element, const sol::table& layout)
+            {
+                element.mLayout = layout;
+            }
+        );
+        element["update"] = [context](const std::shared_ptr<LuaUi::Element>& element)
+        {
+            if (element->mDestroy || element->mUpdate)
+                return;
+            element->mUpdate = true;
+            context.mLuaManager->addAction(std::make_unique<UiAction>(UiAction::UPDATE, element, context.mLua));
+        };
+        element["destroy"] = [context](const std::shared_ptr<LuaUi::Element>& element)
+        {
+            if (element->mDestroy)
+                return;
+            element->mDestroy = true;
+            context.mLuaManager->addAction(std::make_unique<UiAction>(UiAction::DESTROY, element, context.mLua));
+        };
+
+        sol::table api = context.mLua->newTable();
         api["showMessage"] = [luaManager=context.mLuaManager](std::string_view message)
         {
             luaManager->addUIMessage(message);
         };
+        api["content"] = [](const sol::table& table)
+        {
+            return LuaUi::Content(table);
+        };
+        api["create"] = [context](const sol::table& layout)
+        {
+            auto element = std::make_shared<LuaUi::Element>(layout);
+            context.mLuaManager->addAction(std::make_unique<UiAction>(UiAction::CREATE, element, context.mLua));
+            return element;
+        };
+
+        sol::table typeTable = context.mLua->newTable();
+        for (const auto& it : LuaUi::widgetTypeToName())
+            typeTable.set(it.second, it.first);
+        api["TYPE"] = LuaUtil::makeReadOnly(typeTable);
+
         return LuaUtil::makeReadOnly(api);
     }
     
diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index a4e9f8323c..29564ef191 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -24,6 +24,8 @@ if (GTEST_FOUND AND GMOCK_FOUND)
         lua/test_querypackage.cpp
         lua/test_configuration.cpp
 
+        lua/test_ui_content.cpp
+
         misc/test_stringops.cpp
         misc/test_endianness.cpp
         misc/test_resourcehelpers.cpp
diff --git a/apps/openmw_test_suite/lua/test_ui_content.cpp b/apps/openmw_test_suite/lua/test_ui_content.cpp
new file mode 100644
index 0000000000..f478c618dc
--- /dev/null
+++ b/apps/openmw_test_suite/lua/test_ui_content.cpp
@@ -0,0 +1,97 @@
+#include <gtest/gtest.h>
+#include <sol/sol.hpp>
+
+#include <components/lua_ui/content.hpp>
+
+namespace
+{
+    using namespace testing;
+
+    sol::state state;
+
+    sol::table makeTable()
+    {
+        return sol::table(state, sol::create);
+    }
+
+    sol::table makeTable(std::string name)
+    {
+        auto result = makeTable();
+        result["name"] = name;
+        return result;
+    }
+
+    TEST(LuaUiContentTest, Create)
+    {
+        auto table = makeTable();
+        table.add(makeTable());
+        table.add(makeTable());
+        table.add(makeTable());
+        LuaUi::Content content(table);
+        EXPECT_EQ(content.size(), 3);
+    }
+
+    TEST(LuaUiContentTest, CreateWithHole)
+    {
+        auto table = makeTable();
+        table.add(makeTable());
+        table.add(makeTable());
+        table[4] = makeTable();
+        EXPECT_ANY_THROW(LuaUi::Content content(table));
+    }
+
+    TEST(LuaUiContentTest, WrongType)
+    {
+        auto table = makeTable();
+        table.add(makeTable());
+        table.add("a");
+        table.add(makeTable());
+        EXPECT_ANY_THROW(LuaUi::Content content(table));
+    }
+
+    TEST(LuaUiContentTest, NameAccess)
+    {
+        auto table = makeTable();
+        table.add(makeTable());
+        table.add(makeTable("a"));
+        LuaUi::Content content(table);
+        EXPECT_NO_THROW(content.at("a"));
+        content.remove("a");
+        content.assign(content.size(), makeTable("b"));
+        content.assign("b", makeTable());
+        EXPECT_ANY_THROW(content.at("b"));
+        EXPECT_EQ(content.size(), 2);
+        content.assign(content.size(), makeTable("c"));
+        content.assign(content.size(), makeTable("c"));
+        content.remove("c");
+        EXPECT_ANY_THROW(content.at("c"));
+    }
+
+    TEST(LuaUiContentTest, IndexOf)
+    {
+        auto table = makeTable();
+        table.add(makeTable());
+        table.add(makeTable());
+        table.add(makeTable());
+        LuaUi::Content content(table);
+        auto child = makeTable();
+        content.assign(2, child);
+        EXPECT_EQ(content.indexOf(child), 2);
+        EXPECT_EQ(content.indexOf(makeTable()), content.size());
+    }
+
+    TEST(LuaUiContentTest, BoundsChecks)
+    {
+        auto table = makeTable();
+        LuaUi::Content content(table);
+        EXPECT_ANY_THROW(content.at(0));
+        content.assign(content.size(), makeTable());
+        content.assign(content.size(), makeTable());
+        content.assign(content.size(), makeTable());
+        EXPECT_ANY_THROW(content.at(3));
+        EXPECT_ANY_THROW(content.remove(3));
+        EXPECT_NO_THROW(content.remove(1));
+        EXPECT_NO_THROW(content.at(1));
+        EXPECT_EQ(content.size(), 2);
+    }
+}
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 71a96716ec..bf073a0e78 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -160,6 +160,11 @@ add_component_dir (fallback
 add_component_dir (queries
     query luabindings
     )
+    
+add_component_dir (lua_ui
+    widget widgetlist element content text textedit window
+    )
+
 
 if(WIN32)
     add_component_dir (crashcatcher
diff --git a/components/lua_ui/content.cpp b/components/lua_ui/content.cpp
new file mode 100644
index 0000000000..6f9cf61f2f
--- /dev/null
+++ b/components/lua_ui/content.cpp
@@ -0,0 +1,106 @@
+#include "content.hpp"
+
+namespace LuaUi
+{
+    Content::Content(const sol::table& table)
+    {
+        size_t size = table.size();
+        for (size_t index = 0; index < size; ++index)
+        {
+            sol::object value = table.get<sol::object>(index + 1);
+            if (value.is<sol::table>())
+                assign(index, value.as<sol::table>());
+            else
+                throw std::logic_error("UI Content children must all be tables.");
+        }
+    }
+
+    void Content::assign(size_t index, const sol::table& table)
+    {
+        if (mOrdered.size() < index)
+            throw std::logic_error("Can't have gaps in UI Content.");
+        if (index == mOrdered.size())
+            mOrdered.push_back(table);
+        else
+        {
+            sol::optional<std::string> oldName = mOrdered[index]["name"];
+            if (oldName.has_value())
+                mNamed.erase(oldName.value());
+            mOrdered[index] = table;
+        }
+        sol::optional<std::string> name = table["name"];
+        if (name.has_value())
+            mNamed[name.value()] = index;
+    }
+
+    void Content::assign(std::string_view name, const sol::table& table)
+    {
+        auto it = mNamed.find(name);
+        if (it != mNamed.end())
+            assign(it->second, table);
+        else
+            throw std::logic_error(std::string("Can't find a UI Content child with name ") += name);
+    }
+
+    void Content::insert(size_t index, const sol::table& table)
+    {
+        size_t size = mOrdered.size();
+        if (size < index)
+            throw std::logic_error("Can't have gaps in UI Content.");
+        mOrdered.insert(mOrdered.begin() + index, table);
+        for (size_t i = index; i < size; ++i)
+        {
+            sol::optional<std::string> name = mOrdered[i]["name"];
+            if (name.has_value())
+                mNamed[name.value()] = index;
+        }
+    }
+
+    sol::table Content::at(size_t index) const
+    {
+        if (index > size())
+            throw std::logic_error("Invalid UI Content index.");
+        return mOrdered.at(index);
+    }
+
+    sol::table Content::at(std::string_view name) const
+    {
+        auto it = mNamed.find(name);
+        if (it == mNamed.end())
+            throw std::logic_error("Invalid UI Content name.");
+        return mOrdered.at(it->second);
+    }
+
+    size_t Content::remove(size_t index)
+    {
+        sol::table table = at(index);
+        sol::optional<std::string> name = table["name"];
+        if (name.has_value())
+        {
+            auto it = mNamed.find(name.value());
+            if (it != mNamed.end())
+                mNamed.erase(it);
+        }
+        mOrdered.erase(mOrdered.begin() + index);
+        return index;
+    }
+
+    size_t Content::remove(std::string_view name)
+    {
+        auto it = mNamed.find(name);
+        if (it == mNamed.end())
+            throw std::logic_error("Invalid UI Content name.");
+        size_t index = it->second;
+        remove(index);
+        return index;
+    }
+
+    size_t Content::indexOf(const sol::table& table)
+    {
+        auto it = std::find(mOrdered.begin(), mOrdered.end(), table);
+        if (it == mOrdered.end())
+            return size();
+        else
+            return it - mOrdered.begin();
+    }
+}
diff --git a/components/lua_ui/content.hpp b/components/lua_ui/content.hpp
new file mode 100644
index 0000000000..e970744b3d
--- /dev/null
+++ b/components/lua_ui/content.hpp
@@ -0,0 +1,41 @@
+#ifndef COMPONENTS_LUAUI_CONTENT
+#define COMPONENTS_LUAUI_CONTENT
+
+#include <map>
+#include <string>
+
+#include <sol/sol.hpp>
+
+namespace LuaUi
+{
+    class Content
+    {
+        public:
+            using iterator = std::vector<sol::table>::iterator;
+
+            Content() {}
+
+            // expects a Lua array - a table with keys from 1 to n without any nil values in between
+            // any other keys are ignored
+            explicit Content(const sol::table&);
+
+            size_t size() const { return mOrdered.size(); }
+
+            void assign(std::string_view name, const sol::table& table);
+            void assign(size_t index, const sol::table& table);
+            void insert(size_t index, const sol::table& table);
+
+            sol::table at(size_t index) const;
+            sol::table at(std::string_view name) const;
+            size_t remove(size_t index);
+            size_t remove(std::string_view name);
+            size_t indexOf(const sol::table& table);
+
+        private:
+            std::map<std::string, size_t, std::less<>> mNamed;
+            std::vector<sol::table> mOrdered;
+    };
+
+}
+
+#endif // COMPONENTS_LUAUI_CONTENT
diff --git a/components/lua_ui/element.cpp b/components/lua_ui/element.cpp
new file mode 100644
index 0000000000..258da5269f
--- /dev/null
+++ b/components/lua_ui/element.cpp
@@ -0,0 +1,151 @@
+#include "element.hpp"
+
+#include <MyGUI_Gui.h>
+
+#include "content.hpp"
+#include "widgetlist.hpp"
+
+namespace LuaUi
+{
+
+    std::string widgetType(const sol::table& layout)
+    {
+        return layout.get_or("type", std::string("LuaWidget"));
+    }
+
+    Content content(const sol::table& layout)
+    {
+        auto optional = layout.get<sol::optional<Content>>("content");
+        if (optional.has_value())
+            return optional.value();
+        else
+            return Content();
+    }
+
+    void setProperties(LuaUi::WidgetExtension* ext, const sol::table& layout)
+    {
+        auto props = layout.get<sol::optional<sol::table>>("props");
+        if (props.has_value())
+        {
+            props.value().for_each([ext](const sol::object& key, const sol::object& value)
+                {
+                    if (key.is<std::string_view>())
+                        ext->setProperty(key.as<std::string_view>(), value);
+                    else
+                        Log(Debug::Warning) << "UI property key must be a string";
+                });
+            ext->updateCoord();
+        }
+    }
+
+    void setEventCallbacks(LuaUi::WidgetExtension* ext, const sol::table& layout)
+    {
+        ext->clearCallbacks();
+        auto events = layout.get<sol::optional<sol::table>>("events");
+        if (events.has_value())
+        {
+            events.value().for_each([ext](const sol::object& name, const sol::object& callback)
+                {
+                    if (name.is<std::string>() && callback.is<LuaUtil::Callback>())
+                        ext->setCallback(name.as<std::string>(), callback.as<LuaUtil::Callback>());
+                    else if (!name.is<std::string>())
+                        Log(Debug::Warning) << "UI event key must be a string";
+                    else if (!callback.is<LuaUtil::Callback>())
+                        Log(Debug::Warning) << "UI event handler for key \"" << name.as<std::string>()
+                                            << "\" must be an openmw.async.callback";
+                });
+        }
+    }
+
+    LuaUi::WidgetExtension* createWidget(const sol::table& layout, LuaUi::WidgetExtension* parent)
+    {
+        std::string type = widgetType(layout);
+        std::string skin = layout.get_or("skin", std::string());
+        std::string layer = layout.get_or("layer", std::string("Windows"));
+        std::string name = layout.get_or("name", std::string());
+
+        static auto widgetTypeMap = widgetTypeToName();
+        if (widgetTypeMap.find(type) == widgetTypeMap.end())
+            throw std::logic_error(std::string("Invalid widget type ") += type);
+
+        MyGUI::Widget* widget = MyGUI::Gui::getInstancePtr()->createWidgetT(
+            type, skin,
+            MyGUI::IntCoord(), MyGUI::Align::Default,
+            layer, name);
+
+        LuaUi::WidgetExtension* ext = dynamic_cast<LuaUi::WidgetExtension*>(widget);
+        if (!ext)
+            throw std::runtime_error("Invalid widget!");
+
+        ext->create(layout.lua_state(), widget);
+        if (parent != nullptr)
+            widget->attachToWidget(parent->widget());
+
+        setEventCallbacks(ext, layout);
+        setProperties(ext, layout);
+
+        Content cont = content(layout);
+        for (size_t i = 0; i < cont.size(); i++)
+            ext->addChild(createWidget(cont.at(i), ext));
+
+        return ext;
+    }
+
+    void destroyWidget(LuaUi::WidgetExtension* ext)
+    {
+        ext->destroy();
+        MyGUI::Gui::getInstancePtr()->destroyWidget(ext->widget());
+    }
+
+    void updateWidget(const sol::table& layout, LuaUi::WidgetExtension* ext)
+    {
+        setEventCallbacks(ext, layout);
+        setProperties(ext, layout);
+
+        Content newContent = content(layout);
+
+        size_t oldSize = ext->childCount();
+        size_t newSize = newContent.size();
+        size_t minSize = std::min(oldSize, newSize);
+        for (size_t i = 0; i < minSize; i++)
+        {
+            LuaUi::WidgetExtension* oldWidget = ext->childAt(i);
+            sol::table newChild = newContent.at(i);
+
+            if (oldWidget->widget()->getTypeName() != widgetType(newChild))
+            {
+                destroyWidget(oldWidget);
+                ext->assignChild(i, createWidget(newChild, ext));
+            }
+            else
+                updateWidget(newChild, oldWidget);
+        }
+
+        for (size_t i = minSize; i < oldSize; i++)
+            destroyWidget(ext->eraseChild(i));
+
+        for (size_t i = minSize; i < newSize; i++)
+            ext->addChild(createWidget(newContent.at(i), ext));
+    }
+
+    void Element::create()
+    {
+        assert(!mRoot);
+        if (!mRoot)
+            mRoot = createWidget(mLayout, nullptr);
+    }
+
+    void Element::update()
+    {
+        if (mRoot && mUpdate)
+            updateWidget(mLayout, mRoot);
+        mUpdate = false;
+    }
+
+    void Element::destroy()
+    {
+        if (mRoot)
+            destroyWidget(mRoot);
+        mRoot = nullptr;
+    }
+}
diff --git a/components/lua_ui/element.hpp b/components/lua_ui/element.hpp
new file mode 100644
index 0000000000..10e10d8960
--- /dev/null
+++ b/components/lua_ui/element.hpp
@@ -0,0 +1,31 @@
+#ifndef OPENMW_LUAUI_ELEMENT
+#define OPENMW_LUAUI_ELEMENT
+
+#include "widget.hpp"
+
+namespace LuaUi
+{
+    struct Element
+    {
+        Element(sol::table layout)
+            : mRoot{ nullptr }
+            , mLayout{ layout }
+            , mUpdate{ false }
+            , mDestroy{ false }
+        {
+        }
+
+        LuaUi::WidgetExtension* mRoot;
+        sol::table mLayout;
+        bool mUpdate;
+        bool mDestroy;
+
+        void create();
+
+        void update();
+
+        void destroy();
+    };
+}
+
+#endif // !OPENMW_LUAUI_ELEMENT
diff --git a/components/lua_ui/text.cpp b/components/lua_ui/text.cpp
new file mode 100644
index 0000000000..241af981b0
--- /dev/null
+++ b/components/lua_ui/text.cpp
@@ -0,0 +1,40 @@
+
+#include "text.hpp"
+
+namespace LuaUi
+{
+    void LuaText::initialize()
+    {
+        WidgetExtension::initialize();
+        mAutoSized = true;
+    }
+
+    bool LuaText::setPropertyRaw(std::string_view name, sol::object value)
+    {
+        if (name == "caption")
+        {
+            if (!value.is<std::string>())
+                return false;
+            setCaption(value.as<std::string>());
+        }
+        else if (name == "autoSize")
+        {
+            if (!value.is<bool>())
+                return false;
+            mAutoSized = value.as<bool>();
+        }
+        else
+        {
+            return WidgetExtension::setPropertyRaw(name, value);
+        }
+        return true;
+    }
+
+    MyGUI::IntSize LuaText::calculateSize()
+    {
+        if (mAutoSized)
+            return getTextSize();
+        else
+            return WidgetExtension::calculateSize();
+    }
+}
diff --git a/components/lua_ui/text.hpp b/components/lua_ui/text.hpp
new file mode 100644
index 0000000000..08de275d23
--- /dev/null
+++ b/components/lua_ui/text.hpp
@@ -0,0 +1,26 @@
+#ifndef OPENMW_LUAUI_TEXT
+#define OPENMW_LUAUI_TEXT
+
+#include <MyGUI_TextBox.h>
+
+#include "widget.hpp"
+
+namespace LuaUi
+{
+    class LuaText : public MyGUI::TextBox, public WidgetExtension
+    {
+        MYGUI_RTTI_DERIVED(LuaText)
+
+        public:
+            virtual void initialize() override;
+
+        private:
+            bool mAutoSized;
+
+        protected:
+            virtual MyGUI::IntSize calculateSize() override;
+            bool setPropertyRaw(std::string_view name, sol::object value) override;
+    };
+}
+
+#endif // OPENMW_LUAUI_TEXT
diff --git a/components/lua_ui/textedit.cpp b/components/lua_ui/textedit.cpp
new file mode 100644
index 0000000000..2324a770c2
--- /dev/null
+++ b/components/lua_ui/textedit.cpp
@@ -0,0 +1,19 @@
+#include "textedit.hpp"
+
+namespace LuaUi
+{
+    bool LuaTextEdit::setPropertyRaw(std::string_view name, sol::object value)
+    {
+        if (name == "caption")
+        {
+            if (!value.is<std::string>())
+                return false;
+            setCaption(value.as<std::string>());
+        }
+        else
+        {
+            return WidgetExtension::setPropertyRaw(name, value);
+        }
+        return true;
+    }
+}
diff --git a/components/lua_ui/textedit.hpp b/components/lua_ui/textedit.hpp
new file mode 100644
index 0000000000..7d3291692c
--- /dev/null
+++ b/components/lua_ui/textedit.hpp
@@ -0,0 +1,19 @@
+#ifndef OPENMW_LUAUI_TEXTEDIT
+#define OPENMW_LUAUI_TEXTEDIT
+
+#include <MyGUI_EditBox.h>
+
+#include "widget.hpp"
+
+namespace LuaUi
+{
+    class LuaTextEdit : public MyGUI::EditBox, public WidgetExtension
+    {
+        MYGUI_RTTI_DERIVED(LuaTextEdit)
+
+    protected:
+        bool setPropertyRaw(std::string_view name, sol::object value) override;
+    };
+}
+
+#endif // OPENMW_LUAUI_TEXTEDIT
diff --git a/components/lua_ui/widget.cpp b/components/lua_ui/widget.cpp
new file mode 100644
index 0000000000..5cbf1f318d
--- /dev/null
+++ b/components/lua_ui/widget.cpp
@@ -0,0 +1,307 @@
+#include "widget.hpp"
+
+#include <SDL_events.h>
+
+#include "text.hpp"
+#include "textedit.hpp"
+#include "window.hpp"
+
+namespace LuaUi
+{
+    void WidgetExtension::triggerEvent(std::string_view name, const sol::object& argument = sol::nil) const
+    {
+        auto it = mCallbacks.find(name);
+        if (it != mCallbacks.end())
+            it->second(argument);
+    }
+
+    void WidgetExtension::create(lua_State* lua, MyGUI::Widget* self)
+    {
+        mLua = lua;
+        mWidget = self;
+
+        mWidget->eventChangeCoord += MyGUI::newDelegate(this, &WidgetExtension::updateChildrenCoord);
+
+        initialize();
+    }
+
+    void WidgetExtension::initialize()
+    {
+        mAbsoluteCoord = MyGUI::IntCoord();
+        mRelativeCoord = MyGUI::FloatCoord();
+        mAnchor = MyGUI::FloatSize();
+        mForcedCoord = MyGUI::IntCoord();
+
+        // \todo might be more efficient to only register these if there are Lua callbacks
+        mWidget->eventKeyButtonPressed += MyGUI::newDelegate(this, &WidgetExtension::keyPress);
+        mWidget->eventKeyButtonReleased += MyGUI::newDelegate(this, &WidgetExtension::keyRelease);
+        mWidget->eventMouseButtonClick += MyGUI::newDelegate(this, &WidgetExtension::mouseClick);
+        mWidget->eventMouseButtonDoubleClick += MyGUI::newDelegate(this, &WidgetExtension::mouseDoubleClick);
+        mWidget->eventMouseButtonPressed += MyGUI::newDelegate(this, &WidgetExtension::mousePress);
+        mWidget->eventMouseButtonReleased += MyGUI::newDelegate(this, &WidgetExtension::mouseRelease);
+        mWidget->eventMouseMove += MyGUI::newDelegate(this, &WidgetExtension::mouseMove);
+        mWidget->eventMouseDrag += MyGUI::newDelegate(this, &WidgetExtension::mouseDrag);
+
+        mWidget->eventMouseSetFocus += MyGUI::newDelegate(this, &WidgetExtension::focusGain);
+        mWidget->eventMouseLostFocus += MyGUI::newDelegate(this, &WidgetExtension::focusLoss);
+        mWidget->eventKeySetFocus += MyGUI::newDelegate(this, &WidgetExtension::focusGain);
+        mWidget->eventKeyLostFocus += MyGUI::newDelegate(this, &WidgetExtension::focusLoss);
+    }
+
+    void WidgetExtension::destroy()
+    {
+        clearCallbacks();
+        deinitialize();
+
+        for (WidgetExtension* child : mContent)
+            child->destroy();
+    }
+
+    void WidgetExtension::deinitialize()
+    {
+        mWidget->eventKeyButtonPressed.clear();
+        mWidget->eventKeyButtonReleased.clear();
+        mWidget->eventMouseButtonClick.clear();
+        mWidget->eventMouseButtonDoubleClick.clear();
+        mWidget->eventMouseButtonPressed.clear();
+        mWidget->eventMouseButtonReleased.clear();
+        mWidget->eventMouseMove.clear();
+        mWidget->eventMouseDrag.m_event.clear();
+
+        mWidget->eventMouseSetFocus.clear();
+        mWidget->eventMouseLostFocus.clear();
+        mWidget->eventKeySetFocus.clear();
+        mWidget->eventKeyLostFocus.clear();
+    }
+
+    sol::table WidgetExtension::makeTable() const
+    {
+        return sol::table(mLua, sol::create);
+    }
+
+    sol::object WidgetExtension::keyEvent(MyGUI::KeyCode code) const
+    {
+        SDL_Keysym keySym;
+        // MyGUI key codes are not one to one with SDL key codes
+        // \todo refactor sdlmappings.cpp to map this back to SDL correctly
+        keySym.sym = static_cast<SDL_Keycode>(code.getValue());
+        keySym.scancode = SDL_GetScancodeFromKey(keySym.sym);
+        keySym.mod = SDL_GetModState();
+        return sol::make_object(mLua, keySym);
+    }
+
+    sol::object WidgetExtension::mouseEvent(int left, int top, MyGUI::MouseButton button = MyGUI::MouseButton::None) const
+    {
+        auto position = osg::Vec2f(left, top);
+        auto absolutePosition = mWidget->getAbsolutePosition();
+        auto offset = position - osg::Vec2f(absolutePosition.left, absolutePosition.top);
+        sol::table table = makeTable();
+        table["position"] = position;
+        table["offset"] = offset;
+        // \todo refactor sdlmappings.cpp to map this back to SDL properly
+        table["button"] = button.getValue() + 1;
+        return table;
+    }
+
+    void WidgetExtension::addChild(WidgetExtension* ext)
+    {
+        mContent.push_back(ext);
+    }
+
+    WidgetExtension* WidgetExtension::childAt(size_t index) const
+    {
+        return mContent.at(index);
+    }
+
+    void WidgetExtension::assignChild(size_t index, WidgetExtension* ext)
+    {
+        if (mContent.size() <= index)
+            throw std::logic_error("Invalid widget child index");
+        mContent[index] = ext;
+    }
+
+    WidgetExtension* WidgetExtension::eraseChild(size_t index)
+    {
+        if (mContent.size() <= index)
+            throw std::logic_error("Invalid widget child index");
+        auto it = mContent.begin() + index;
+        WidgetExtension* ext = *it;
+        mContent.erase(it);
+        return ext;
+    }
+
+    void WidgetExtension::setCallback(const std::string& name, const LuaUtil::Callback& callback)
+    {
+        mCallbacks[name] = callback;
+    }
+
+    void WidgetExtension::clearCallbacks()
+    {
+        mCallbacks.clear();
+    }
+
+    void WidgetExtension::setProperty(std::string_view name, sol::object value)
+    {
+        if (!setPropertyRaw(name, value))
+            Log(Debug::Error) << "Invalid value of property " << name
+                              << ": " << LuaUtil::toString(value);
+    }
+
+    MyGUI::IntCoord WidgetExtension::forcedOffset()
+    {
+        return mForcedCoord;
+    }
+
+    void WidgetExtension::setForcedOffset(const MyGUI::IntCoord& offset)
+    {
+        mForcedCoord = offset;
+    }
+
+    void WidgetExtension::updateCoord()
+    {
+        mWidget->setCoord(calculateCoord());
+    }
+
+    bool WidgetExtension::setPropertyRaw(std::string_view name, sol::object value)
+    {
+        if (name == "position")
+        {
+            if (!value.is<osg::Vec2f>())
+                return false;
+            auto v = value.as<osg::Vec2f>();
+            mAbsoluteCoord.left = v.x();
+            mAbsoluteCoord.top = v.y();
+        }
+        else if (name == "size")
+        {
+            if (!value.is<osg::Vec2f>())
+                return false;
+            auto v = value.as<osg::Vec2f>();
+            mAbsoluteCoord.width = v.x();
+            mAbsoluteCoord.height = v.y();
+        }
+        else if (name == "relativePosition")
+        {
+            if (!value.is<osg::Vec2f>())
+                return false;
+            auto v = value.as<osg::Vec2f>();
+            mRelativeCoord.left = v.x();
+            mRelativeCoord.top = v.y();
+        }
+        else if (name == "relativeSize")
+        {
+            if (!value.is<osg::Vec2f>())
+                return false;
+            auto v = value.as<osg::Vec2f>();
+            mRelativeCoord.width = v.x();
+            mRelativeCoord.height = v.y();
+        }
+        else if (name == "anchor")
+        {
+            if (!value.is<osg::Vec2f>())
+                return false;
+            auto v = value.as<osg::Vec2f>();
+            mAnchor.width = v.x();
+            mAnchor.height = v.y();
+        }
+        else if (name == "visible")
+        {
+            if (!value.is<bool>())
+                return false;
+            mWidget->setVisible(value.as<bool>());
+        }
+        return true;
+    }
+
+    void WidgetExtension::updateChildrenCoord(MyGUI::Widget* _widget)
+    {
+        for (auto& child : mContent)
+            child->updateCoord();
+    }
+
+    MyGUI::IntSize WidgetExtension::calculateSize()
+    {
+        const MyGUI::IntSize& parentSize = mWidget->getParentSize();
+        MyGUI::IntSize newSize;
+        newSize = mAbsoluteCoord.size() + mForcedCoord.size();
+        newSize.width += mRelativeCoord.width * parentSize.width;
+        newSize.height += mRelativeCoord.height * parentSize.height;
+        return newSize;
+    }
+
+    MyGUI::IntPoint WidgetExtension::calculatePosition(const MyGUI::IntSize& size)
+    {
+        const MyGUI::IntSize& parentSize = mWidget->getParentSize();
+        MyGUI::IntPoint newPosition;
+        newPosition = mAbsoluteCoord.point() + mForcedCoord.point();
+        newPosition.left += mRelativeCoord.left * parentSize.width - mAnchor.width * size.width;
+        newPosition.top += mRelativeCoord.top * parentSize.height - mAnchor.height * size.height;
+        return newPosition;
+    }
+
+    MyGUI::IntCoord WidgetExtension::calculateCoord()
+    {
+        MyGUI::IntCoord newCoord;
+        newCoord = calculateSize();
+        newCoord = calculatePosition(newCoord.size());
+        return newCoord;
+    }
+
+    void WidgetExtension::keyPress(MyGUI::Widget*, MyGUI::KeyCode code, MyGUI::Char ch)
+    {
+        if (code == MyGUI::KeyCode::None)
+        {
+            // \todo decide how to handle unicode strings in Lua
+            MyGUI::UString uString;
+            uString.push_back(static_cast<MyGUI::UString::unicode_char>(ch));
+            triggerEvent("textInput", sol::make_object(mLua, uString.asUTF8()));
+        }
+        else
+            triggerEvent("keyPress", keyEvent(code));
+    }
+
+    void WidgetExtension::keyRelease(MyGUI::Widget*, MyGUI::KeyCode code)
+    {
+        triggerEvent("keyRelease", keyEvent(code));
+    }
+
+    void WidgetExtension::mouseMove(MyGUI::Widget*, int left, int top)
+    {
+        triggerEvent("mouseMove", mouseEvent(left, top));
+    }
+
+    void WidgetExtension::mouseDrag(MyGUI::Widget*, int left, int top, MyGUI::MouseButton button)
+    {
+        triggerEvent("mouseMove", mouseEvent(left, top, button));
+    }
+
+    void WidgetExtension::mouseClick(MyGUI::Widget* _widget)
+    {
+        triggerEvent("mouseClick");
+    }
+
+    void WidgetExtension::mouseDoubleClick(MyGUI::Widget* _widget)
+    {
+        triggerEvent("mouseDoubleClick");
+    }
+
+    void WidgetExtension::mousePress(MyGUI::Widget*, int left, int top, MyGUI::MouseButton button)
+    {
+        triggerEvent("mousePress", mouseEvent(left, top, button));
+    }
+
+    void WidgetExtension::mouseRelease(MyGUI::Widget*, int left, int top, MyGUI::MouseButton button)
+    {
+        triggerEvent("mouseRelease", mouseEvent(left, top, button));
+    }
+
+    void WidgetExtension::focusGain(MyGUI::Widget*, MyGUI::Widget*)
+    {
+        triggerEvent("focusGain");
+    }
+
+    void WidgetExtension::focusLoss(MyGUI::Widget*, MyGUI::Widget*)
+    {
+        triggerEvent("focusLoss");
+    }
+}
diff --git a/components/lua_ui/widget.hpp b/components/lua_ui/widget.hpp
new file mode 100644
index 0000000000..fe1ad46716
--- /dev/null
+++ b/components/lua_ui/widget.hpp
@@ -0,0 +1,91 @@
+#ifndef OPENMW_LUAUI_WIDGET
+#define OPENMW_LUAUI_WIDGET
+
+#include <map>
+
+#include <MyGUI_Widget.h>
+#include <sol/sol.hpp>
+#include <osg/Vec2>
+
+#include <components/lua/scriptscontainer.hpp>
+
+namespace LuaUi
+{
+    /*
+    * extends MyGUI::Widget and its child classes
+    * memory ownership is controlled by MyGUI
+    * it is important not to call any WidgetExtension methods after destroying the MyGUI::Widget
+    */
+    class WidgetExtension
+    {
+    public:
+        // must be called after creating the underlying MyGUI::Widget
+        void create(lua_State* lua, MyGUI::Widget* self);
+        // must be called after before destroying the underlying MyGUI::Widget
+        void destroy();
+
+        void addChild(WidgetExtension* ext);
+        WidgetExtension* childAt(size_t index) const;
+        void assignChild(size_t index, WidgetExtension* ext);
+        WidgetExtension* eraseChild(size_t index);
+        size_t childCount() const { return mContent.size(); }
+
+        MyGUI::Widget* widget() const { return mWidget; }
+
+        void setCallback(const std::string&, const LuaUtil::Callback&);
+        void clearCallbacks();
+
+        void setProperty(std::string_view, sol::object value);
+
+        MyGUI::IntCoord forcedOffset();
+        void setForcedOffset(const MyGUI::IntCoord& offset);
+        void updateCoord();
+
+    protected:
+        ~WidgetExtension() {}
+        sol::table makeTable() const;
+        sol::object keyEvent(MyGUI::KeyCode) const;
+        sol::object mouseEvent(int left, int top, MyGUI::MouseButton button) const;
+        virtual bool setPropertyRaw(std::string_view name, sol::object value);
+        virtual void initialize();
+        virtual void deinitialize();
+        virtual MyGUI::IntSize calculateSize();
+        virtual MyGUI::IntPoint calculatePosition(const MyGUI::IntSize& size);
+        MyGUI::IntCoord calculateCoord();
+
+        void triggerEvent(std::string_view name, const sol::object& argument) const;
+
+        MyGUI::IntCoord mForcedCoord;
+        MyGUI::IntCoord mAbsoluteCoord;
+        MyGUI::FloatCoord mRelativeCoord;
+        MyGUI::FloatSize mAnchor;
+
+    private:
+        // use lua_State* instead of sol::state_view because MyGUI requires a default constructor
+        lua_State* mLua; 
+        MyGUI::Widget* mWidget;
+
+        std::vector<WidgetExtension*> mContent;
+        std::map<std::string, LuaUtil::Callback, std::less<>> mCallbacks;
+
+        void updateChildrenCoord(MyGUI::Widget*);
+
+        void keyPress(MyGUI::Widget*, MyGUI::KeyCode, MyGUI::Char);
+        void keyRelease(MyGUI::Widget*, MyGUI::KeyCode);
+        void mouseMove(MyGUI::Widget*, int, int);
+        void mouseDrag(MyGUI::Widget*, int, int, MyGUI::MouseButton);
+        void mouseClick(MyGUI::Widget*);
+        void mouseDoubleClick(MyGUI::Widget*);
+        void mousePress(MyGUI::Widget*, int, int, MyGUI::MouseButton);
+        void mouseRelease(MyGUI::Widget*, int, int, MyGUI::MouseButton);
+        void focusGain(MyGUI::Widget*, MyGUI::Widget*);
+        void focusLoss(MyGUI::Widget*, MyGUI::Widget*);
+    };
+
+    class LuaWidget : public MyGUI::Widget, public WidgetExtension
+    {
+        MYGUI_RTTI_DERIVED(LuaWidget)
+    };
+}
+
+#endif // !OPENMW_LUAUI_WIDGET
diff --git a/components/lua_ui/widgetlist.cpp b/components/lua_ui/widgetlist.cpp
new file mode 100644
index 0000000000..c2a9bef990
--- /dev/null
+++ b/components/lua_ui/widgetlist.cpp
@@ -0,0 +1,31 @@
+#include "widgetlist.hpp"
+
+#include <MyGUI_FactoryManager.h>
+
+#include "widget.hpp"
+#include "text.hpp"
+#include "textedit.hpp"
+#include "window.hpp"
+
+namespace LuaUi
+{
+
+    void registerAllWidgets()
+    {
+        MyGUI::FactoryManager::getInstance().registerFactory<LuaWidget>("Widget");
+        MyGUI::FactoryManager::getInstance().registerFactory<LuaText>("Widget");
+        MyGUI::FactoryManager::getInstance().registerFactory<LuaTextEdit>("Widget");
+        MyGUI::FactoryManager::getInstance().registerFactory<LuaWindow>("Widget");
+    }
+
+    const std::unordered_map<std::string, std::string>& widgetTypeToName()
+    {
+        static std::unordered_map<std::string, std::string> types{
+            { "LuaWidget", "Widget" },
+            { "LuaText", "Text" },
+            { "LuaTextEdit", "TextEdit" },
+            { "LuaWindow", "Window" },
+        };
+        return types;
+    }
+}
diff --git a/components/lua_ui/widgetlist.hpp b/components/lua_ui/widgetlist.hpp
new file mode 100644
index 0000000000..ff033fb6ca
--- /dev/null
+++ b/components/lua_ui/widgetlist.hpp
@@ -0,0 +1,14 @@
+#ifndef OPENMW_LUAUI_WIDGETLIST
+#define OPENMW_LUAUI_WIDGETLIST
+
+#include <unordered_map>
+#include <string>
+
+namespace LuaUi
+{
+    void registerAllWidgets();
+
+    const std::unordered_map<std::string, std::string>& widgetTypeToName();
+}
+
+#endif // OPENMW_LUAUI_WIDGETLIST
diff --git a/components/lua_ui/window.cpp b/components/lua_ui/window.cpp
new file mode 100644
index 0000000000..874ccb9fa4
--- /dev/null
+++ b/components/lua_ui/window.cpp
@@ -0,0 +1,94 @@
+#include "window.hpp"
+
+#include <MyGUI_InputManager.h>
+
+namespace LuaUi
+{
+    void LuaWindow::initialize()
+    {
+        WidgetExtension::initialize();
+
+        assignWidget(mCaption, "Caption");
+        if (mCaption)
+        {
+            mCaption->eventMouseButtonPressed += MyGUI::newDelegate(this, &LuaWindow::notifyMousePress);
+            mCaption->eventMouseDrag += MyGUI::newDelegate(this, &LuaWindow::notifyMouseDrag);
+        }
+        for (auto w : getSkinWidgetsByName("Action"))
+        {
+            w->eventMouseButtonPressed += MyGUI::newDelegate(this, &LuaWindow::notifyMousePress);
+            w->eventMouseDrag += MyGUI::newDelegate(this, &LuaWindow::notifyMouseDrag);
+        }
+    }
+
+    void LuaWindow::deinitialize()
+    {
+        WidgetExtension::deinitialize();
+
+        if (mCaption)
+        {
+            mCaption->eventMouseButtonPressed.clear();
+            mCaption->eventMouseDrag.m_event.clear();
+        }
+        for (auto w : getSkinWidgetsByName("Action"))
+        {
+            w->eventMouseButtonPressed.clear();
+            w->eventMouseDrag.m_event.clear();
+        }
+    }
+
+    bool LuaWindow::setPropertyRaw(std::string_view name, sol::object value)
+    {
+        if (name == "caption")
+        {
+            if (!value.is<std::string>())
+                return false;
+            if (mCaption)
+                mCaption->setCaption(value.as<std::string>());
+        }
+        else
+        {
+            return WidgetExtension::setPropertyRaw(name, value);
+        }
+        return true;
+    }
+
+    void LuaWindow::notifyMousePress(MyGUI::Widget* sender, int left, int top, MyGUI::MouseButton id)
+    {
+        if (id != MyGUI::MouseButton::Left)
+            return;
+
+        mPreviousMouse.left = left;
+        mPreviousMouse.top = top;
+
+        if (sender->isUserString("Scale"))
+            mChangeScale = MyGUI::IntCoord::parse(sender->getUserString("Scale"));
+        else
+            mChangeScale = MyGUI::IntCoord(1, 1, 0, 0);
+    }
+
+    void LuaWindow::notifyMouseDrag(MyGUI::Widget* sender, int left, int top, MyGUI::MouseButton id)
+    {
+        if (id != MyGUI::MouseButton::Left)
+            return;
+
+        MyGUI::IntCoord change = mChangeScale;
+        change.left *= (left - mPreviousMouse.left);
+        change.top *= (top - mPreviousMouse.top);
+        change.width *= (left - mPreviousMouse.left);
+        change.height *= (top - mPreviousMouse.top);
+
+        setForcedOffset(forcedOffset() + change.size());
+        MyGUI::IntPoint positionOffset = change.point() + getPosition() - calculateCoord().point();
+        setForcedOffset(forcedOffset() + positionOffset);
+        updateCoord();
+
+        mPreviousMouse.left = left;
+        mPreviousMouse.top = top;
+
+        sol::table table = makeTable();
+        table["position"] = osg::Vec2f(mCoord.left, mCoord.top);
+        table["size"] = osg::Vec2f(mCoord.width, mCoord.height);
+        triggerEvent("windowDrag", table);
+    }
+}
diff --git a/components/lua_ui/window.hpp b/components/lua_ui/window.hpp
new file mode 100644
index 0000000000..d92bf8dcbf
--- /dev/null
+++ b/components/lua_ui/window.hpp
@@ -0,0 +1,33 @@
+#ifndef OPENMW_LUAUI_WINDOW
+#define OPENMW_LUAUI_WINDOW
+
+#include <optional>
+
+#include <MyGUI_TextBox.h>
+
+#include "widget.hpp"
+
+namespace LuaUi
+{
+    class LuaWindow : public MyGUI::Widget, public WidgetExtension
+    {
+        MYGUI_RTTI_DERIVED(LuaWindow)
+
+        private:
+            // \todo replace with LuaText when skins are properly implemented
+            MyGUI::TextBox* mCaption;
+            MyGUI::IntPoint mPreviousMouse;
+            MyGUI::IntCoord mChangeScale;
+
+        protected:
+            virtual void initialize() override;
+            virtual void deinitialize() override;
+
+            bool setPropertyRaw(std::string_view name, sol::object value) override;
+
+            void notifyMousePress(MyGUI::Widget*, int, int, MyGUI::MouseButton);
+            void notifyMouseDrag(MyGUI::Widget*, int, int, MyGUI::MouseButton);
+    };
+}
+
+#endif // OPENMW_LUAUI_WINDOW
diff --git a/docs/source/generate_luadoc.sh b/docs/source/generate_luadoc.sh
index 7a238eca5a..1af9f0e0f7 100755
--- a/docs/source/generate_luadoc.sh
+++ b/docs/source/generate_luadoc.sh
@@ -8,6 +8,18 @@
 # luarocks --local pack openmwluadocumentor-0.1.1-1.rockspec
 # luarocks --local install openmwluadocumentor-0.1.1-1.src.rock
 
+# How to install on Windows:
+
+# install LuaRocks (heavily recommended to use the standalone package)
+#   https://github.com/luarocks/luarocks/wiki/Installation-instructions-for-Windows
+# git clone https://gitlab.com/ptmikheev/openmw-luadocumentor.git
+# cd openmw-luadocumentor/luarocks
+# open "Developer Command Prompt for VS <2017/2019>" in this directory and run:
+#   luarocks --local pack openmwluadocumentor-0.1.1-1.rockspec
+#   luarocks --local install openmwluadocumentor-0.1.1-1.src.rock
+# open "Git Bash" in the same directory and run script:
+#   ./generate_luadoc.sh
+
 if [ -f /.dockerenv ]; then
     # We are inside readthedocs pipeline
     echo "Install lua 5.1"
@@ -32,7 +44,6 @@ if [ -f /.dockerenv ]; then
     cd ~
     git clone https://gitlab.com/ptmikheev/openmw-luadocumentor.git
     cd openmw-luadocumentor/luarocks
-    luarocks --local install checks
     luarocks --local pack openmwluadocumentor-0.1.1-1.rockspec
     luarocks --local install openmwluadocumentor-0.1.1-1.src.rock
 fi
@@ -40,12 +51,18 @@ fi
 DOCS_SOURCE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 FILES_DIR=$DOCS_SOURCE_DIR/../../files
 OUTPUT_DIR=$DOCS_SOURCE_DIR/reference/lua-scripting/generated_html
+DOCUMENTOR_PATH=~/.luarocks/bin/openmwluadocumentor
+
+if [ ! -x $DOCUMENTOR_PATH ]; then
+  # running on Windows?
+  DOCUMENTOR_PATH="$APPDATA/LuaRocks/bin/openmwluadocumentor.bat"
+fi
 
 rm -f $OUTPUT_DIR/*.html
 
 cd $FILES_DIR/lua_api
-~/.luarocks/bin/openmwluadocumentor -f doc -d $OUTPUT_DIR openmw/*lua
+$DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR openmw/*lua
 
 cd $FILES_DIR/builtin_scripts
-~/.luarocks/bin/openmwluadocumentor -f doc -d $OUTPUT_DIR openmw_aux/*lua
+$DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR openmw_aux/*lua
 
diff --git a/docs/source/reference/lua-scripting/api.rst b/docs/source/reference/lua-scripting/api.rst
index 5075f8a5fe..6398a19be8 100644
--- a/docs/source/reference/lua-scripting/api.rst
+++ b/docs/source/reference/lua-scripting/api.rst
@@ -6,6 +6,7 @@ Lua API reference
     :hidden:
 
     engine_handlers
+    user_interface
     openmw_util
     openmw_settings
     openmw_core
@@ -20,6 +21,7 @@ Lua API reference
 
 
 - :ref:`Engine handlers reference`
+- :ref:`User interface reference <User interface reference>`
 - `Game object reference <openmw_core.html##(GameObject)>`_
 - `Cell reference <openmw_core.html##(Cell)>`_
 
@@ -56,7 +58,7 @@ Player scripts are local scripts that are attached to a player.
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.input <Package openmw.input>`               | by player scripts  | | User input                                                  |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.ui <Package openmw.ui>`                     | by player scripts  | | Controls user interface                                     |
+|:ref:`openmw.ui <Package openmw.ui>`                     | by player scripts  | | Controls :ref:`user interface <User interface reference>`   |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |openmw.camera                                            | by player scripts  | | Controls camera (not implemented)                           |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
@@ -71,4 +73,3 @@ Sources can be found in ``resources/vfs/openmw_aux``. In theory mods can overrid
 +=========================================================+====================+===============================================================+
 |:ref:`openmw_aux.util <Package openmw_aux.util>`         | everywhere         | | Miscellaneous utils                                         |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-
diff --git a/docs/source/reference/lua-scripting/overview.rst b/docs/source/reference/lua-scripting/overview.rst
index c32fc74fa5..5bc413036a 100644
--- a/docs/source/reference/lua-scripting/overview.rst
+++ b/docs/source/reference/lua-scripting/overview.rst
@@ -350,7 +350,7 @@ Player scripts are local scripts that are attached to a player.
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.input <Package openmw.input>`               | by player scripts  | | User input                                                  |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.ui <Package openmw.ui>`                     | by player scripts  | | Controls user interface                                     |
+|:ref:`openmw.ui <Package openmw.ui>`                     | by player scripts  | | Controls :ref:`user interface <User interface reference>`   |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |openmw.camera                                            | by player scripts  | | Controls camera (not implemented)                           |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
@@ -750,5 +750,3 @@ You can add special hints to give LDT more information:
 .. image:: https://gitlab.com/OpenMW/openmw-docs/raw/master/docs/source/reference/lua-scripting/_static/lua-ide-code-completion2.png
 
 See `LDT Documentation Language <https://wiki.eclipse.org/LDT/User_Area/Documentation_Language>`__ for more details.
-
-
diff --git a/docs/source/reference/lua-scripting/user_interface.rst b/docs/source/reference/lua-scripting/user_interface.rst
new file mode 100644
index 0000000000..5b733a8fe9
--- /dev/null
+++ b/docs/source/reference/lua-scripting/user_interface.rst
@@ -0,0 +1,151 @@
+User interface reference
+========================
+
+.. toctree::
+    :hidden:
+
+    widgets/widget
+
+Layouts
+-------
+
+Every widget is defined by a layout, which is a Lua table with the following fields (all of them are optional):
+
+1. `type`: One of the available widget types from `openmw.ui.TYPE`.
+2. | `props`: A Lua table, containing all the properties values.
+   | Properties define most of the information about the widget: its position, data it displays, etc.
+   | See the widget pages (table below) for details on specific properties.
+   | Properties of the basic Widget are inherited by all the other widgets.
+3. | `events`: A Lua table, containing `openmw.async.callback` values, which trigger on various interactions with the widget.
+   | See the Widget pages for details on specific events.
+   | Events of the basic Widget are inherited by all the other widgets.
+4. `content`: a Content (`openmw.ui.content`), which contains layouts for the children of this widget.
+5. | `name`: an arbitrary string, the only limitatiion is it being unique within a `Content`.
+   | Helpful for navigatilng through the layouts.
+6. `layer`: only applies for the root widget. (Windows, HUD, etc)
+
+.. TODO: Write a more detailed documentation for layers when they are finished
+
+Elements
+--------
+
+Element is the root widget of a layout.
+It is an independent part of the UI, connected only to a specific layer, but not any other layouts.
+Creating or destroying an element also creates/destroys all of its children.
+
+Content
+-------
+
+A container holding all the widget's children. It has a few important differences from a Lua table:
+
+1. All the keys are integers, i. e. it is an "array"
+2. Holes are not allowed. At any point all keys from `1` to the highest `n` must contain a value.
+3. | You can access the values by their `name` field as a `Content` key.
+   | While there is nothing preventing you from changing the `name` of a table inside a content, it is not supported, and will lead to undefined behaviour.
+   | If you have to change the name, assign a new table to the index instead.
+
+.. TODO: Talk about skins/templates here when they are ready
+
+Widget types
+------------
+
+.. list-table::
+   :widths: 30 70
+
+   * - :ref:`Widget`
+     - Base widget type, all the other widget inherit its properties and events.
+   * - `Text`
+     - Displays text.
+   * - EditText
+     - Accepts text input from the user.
+   * - Window
+     - Can be moved and resized by the user.
+
+Example
+-------
+
+*scripts/requirePassword.lua*
+
+.. code-block:: Lua
+
+   local core = require('openmw.core')
+   local async = require('openmw.async')
+   local ui = require('openmw.ui')
+   local v2 = require('openmw.util').vector2
+
+   local layout = {
+      layers = 'Windows',
+      type = ui.TYPE.Window,
+      skin = 'MW_Window', -- TODO: replace all skins here when they are properly implemented
+      props = {
+         size = v2(200, 250),
+         -- put the window in the middle of the screen
+         relativePosition = v2(0.5, 0.5),
+         anchor = v2(0.5, 0.5),
+      },
+      content = ui.content {
+         {
+            type = ui.TYPE.Text,
+            skin = 'SandText',
+            props = {
+               caption = 'Input password',
+               relativePosition = v2(0.5, 0),
+               anchor = v2(0.5, 0),
+            },
+         },
+         {
+            name = 'input',
+            type = ui.TYPE.TextEdit,
+            skin = "MW_TextEdit",
+            props = {
+               caption = '',
+               relativePosition = v2(0.5, 0.5),
+               anchor = v2(0.5, 0.5),
+               size = v2(125, 50),
+            },
+            events = {}
+         },
+         {
+            name = 'submit',
+            type = ui.TYPE.Text, -- TODO: replace with button when implemented
+            skin = "MW_Button",
+            props = {
+               caption = 'Submit',
+               -- position at the bottom
+               relativePosition = v2(0.5, 1.0),
+               anchor = v2(0.5, 1.0),
+               autoSize = false,
+               size = v2(75, 50),
+            },
+            events = {},
+         },
+      },
+   }
+
+   local element = nil
+
+   local input = layout.content.input
+   -- TODO: replace with a better event when TextEdit is finished
+   input.events.textInput = async:callback(function(text)
+      input.props.caption = input.props.caption .. text
+   end)
+
+   local submit = layout.content.submit
+   submit.events.mouseClick = async:callback(function()
+      if input.props.caption == 'very secret password' then
+         if element then
+            element:destroy()
+         end
+      else
+         print('wrong password', input.props.caption)
+         core.quit()
+      end
+   end)
+
+   element = ui.create(layout)
+
+*requirePassword.omwscripts*
+
+::
+
+  PLAYER: scripts/requirePassword.lua
diff --git a/docs/source/reference/lua-scripting/widgets/widget.rst b/docs/source/reference/lua-scripting/widgets/widget.rst
new file mode 100644
index 0000000000..51d6d17203
--- /dev/null
+++ b/docs/source/reference/lua-scripting/widgets/widget.rst
@@ -0,0 +1,77 @@
+Widget
+======
+
+Properties
+----------
+
+.. list-table::
+  :header-rows: 1
+  :widths: 20 20 60
+
+  * - name
+    - type (default value)
+    - description
+  * - position
+    - util.vector2 (0, 0)
+    - | Offsets the position of the widget from its parent's
+      | top-left corner in pixels.
+  * - size
+    - util.vector2 (0, 0)
+    - Increases the widget's size in pixels.
+  * - relativePosition  
+    - util.vector2 (0, 0)
+    - | Offsets the position of the widget from its parent's
+      | top-left corner as a fraction of the parent's size.
+  * - relativeSize
+    - util.vector2 (0, 0)
+    - Increases the widget's size by a fraction of its parent's size.
+  * - anchor
+    - util.vector2 (0, 0)
+    - | Offsets the widget's position by a fraction of its size.
+      | Useful for centering or aligning to a corner.
+  * - visible
+    - boolean (true)
+    - Defines if the widget is visible
+
+Events
+------
+
+.. list-table::
+  :header-rows: 1
+  :widths: 20 20 60
+
+  * - name
+    - type
+    - description
+  * - keyPress
+    - `KeyboardEvent <../openmw_input.html##(KeyboardEvent)>`_
+    - A key was pressed with this widget in focus
+  * - keyRelease
+    - `KeyboardEvent <../openmw_input.html##(KeyboardEvent)>`_
+    - A key was released with this widget in focus
+  * - mouseMove
+    - `MouseEvent <../openmw_ui.html##(MouseEvent)>`_
+    - | Mouse cursor moved on this widget
+      | `MouseEvent.button` is the mouse button being held
+      | (nil when simply moving, and not dragging)
+  * - mouseClick
+    - nil
+    - Widget was clicked with left mouse button
+  * - mouseDoubleClick
+    - nil
+    - Widget was double clicked with left mouse button
+  * - mousePress  
+    - `MouseEvent <../openmw_ui.html##(MouseEvent)>`_
+    - A mouse button was pressed on this widget
+  * - mouseRelease  
+    -  `MouseEvent <../openmw_ui.html##(MouseEvent)>`_
+    - A mouse button was released on this widget
+  * - focusGain
+    - nil
+    - Widget gained focus (either through mouse or keyboard)
+  * - focusLoss
+    - nil
+    - Widget lost focus
+  * - textInput
+    - string
+    - Text input with this widget in focus
diff --git a/files/lua_api/openmw/ui.lua b/files/lua_api/openmw/ui.lua
index bf6976c76b..593cbf8043 100644
--- a/files/lua_api/openmw/ui.lua
+++ b/files/lua_api/openmw/ui.lua
@@ -1,15 +1,115 @@
--------------------------------------------------------------------------------
+---
 -- `openmw.ui` controls user interface.
 -- Can be used only by local scripts, that are attached to a player.
 -- @module ui
--- @usage local ui = require('openmw.ui')
+-- @usage
+-- local ui = require('openmw.ui')
 
+---
+-- @field [parent=#ui] #WIDGET_TYPE WIDGET_TYPE
 
+---
+-- @type WIDGET_TYPE
+-- @field [parent=#WIDGET_TYPE] Widget Base widget type
+-- @field [parent=#WIDGET_TYPE] Text Display text
+-- @field [parent=#WIDGET_TYPE] TextEdit Accepts user text input
+-- @field [parent=#WIDGET_TYPE] Window Can be moved and resized by the user
 
--------------------------------------------------------------------------------
+---
 -- Shows given message at the bottom of the screen.
 -- @function [parent=#ui] showMessage
 -- @param #string msg
 
-return nil
+---
+-- Converts a given table of tables into an @{openmw.ui#Content}
+-- @function [parent=#ui] content
+-- @param #table table
+-- @return #Content
+
+---
+-- Creates a UI element from the given layout table
+-- @function [parent=#ui] create
+-- @param #Layout layout
+-- @return #Element
+
+---
+-- Layout
+-- @type Layout
+-- @field #string name Optional name of the layout. Allows access by name from Content
+-- @field #table props Optional table of widget properties
+-- @field #table events Optional table of event callbacks
+-- @field #Content content Optional @{openmw.ui#Content} of children layouts
+
+---
+-- Content. An array-like container, which allows to reference elements by their name
+-- @type Content
+-- @list <#Layout>
+-- @usage
+-- local content = ui.content {
+--    { name = 'input' },
+-- }
+-- -- bad idea!
+-- -- content[1].name = 'otherInput'
+-- -- do this instead:
+-- content.input = { name = 'otherInput' }
+-- @usage
+-- local content = ui.content {
+--    { name = 'display' },
+--    { name = 'submit' },
+-- }
+-- -- allowed, but shifts all the items after it "up" the array
+-- content.display = nil
+-- -- still no holes after this!
+-- @usage
+-- -- iterate over a Content
+-- for i = 1, #content do
+--    print('widget',content[i].name,'at',i)
+-- end
+
+---
+-- Puts the layout at given index by shifting all the elements after it
+-- @function [parent=#Content] insert
+-- @param self
+-- @param #number index
+-- @param #Layout layout
+
+---
+-- Adds the layout at the end of the Content
+-- (same as calling insert with `last index + 1`)
+-- @function [parent=#Content] add
+-- @param self
+-- @param #Layout layout
+
+---
+-- Finds the index of the given layout. If it is not in the container, returns nil
+-- @function [parent=#Content] indexOf
+-- @param self
+-- @param #Layout layout
+-- @return #number, #nil index
 
+---
+-- Element. An element of the user interface
+-- @type Element
+
+---
+-- Refreshes the rendered element to match the current layout state
+-- @function [parent=#Element] update
+-- @param self
+
+---
+-- Destroys the element
+-- @function [parent=#Element] destroy
+-- @param self
+
+---
+-- Access or replace the element's layout
+-- @field [parent=#Element] #Layout layout
+
+---
+-- Mouse event, passed as an argument to relevant UI events
+-- @type MouseEvent
+-- @field openmw.util#Vector2 position Absolute position of the mouse cursor
+-- @field openmw.util#Vector2 offset Position of the mouse cursor relative to the widget
+-- @field #number button Mouse button which triggered the event (could be nil)
+
+return nil

From 750514cda2eaaee3217de3ef01ab53f5882c7f3b Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Thu, 18 Nov 2021 19:40:13 -0800
Subject: [PATCH 1730/2859] simply lightmanager and fix racey behavior

---
 apps/openmw/engine.cpp                |   2 -
 components/sceneutil/lightmanager.cpp | 524 ++++++++++----------------
 components/sceneutil/lightmanager.hpp |  53 ++-
 components/sceneutil/serialize.cpp    |   3 +-
 4 files changed, 254 insertions(+), 328 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 67944e4546..e3ba74cf58 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -1069,8 +1069,6 @@ void OMW::Engine::go()
     // Save user settings
     settings.saveUser(settingspath);
 
-    mViewer->stopThreading();
-
     Log(Debug::Info) << "Quitting peacefully.";
 }
 
diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 448f6ca916..29907c542d 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -29,18 +29,6 @@ namespace
         return left->mViewBound.center().length2() - left->mViewBound.radius2()*illuminationBias < right->mViewBound.center().length2() - right->mViewBound.radius2()*illuminationBias;
     }
 
-    float getLightRadius(const osg::Light* light)
-    {
-        float value = 0.0;
-        light->getUserValue("radius", value);
-        return value;
-    }
-
-    void setLightRadius(osg::Light* light, float value)
-    {
-        light->setUserValue("radius", value);
-    }
-
     void configurePosition(osg::Matrixf& mat, const osg::Vec4& pos)
     {
         mat(0, 0) = pos.x();
@@ -77,11 +65,6 @@ namespace
         mat(2, 3) = q;
         mat(3, 3) = r;
     }
-
-    bool isReflectionCamera(osg::Camera* camera)
-    {
-        return (camera->getName() == "ReflectionCamera");
-    }
 }
 
 namespace SceneUtil
@@ -188,19 +171,15 @@ namespace SceneUtil
 
         void configureLayout(int offsetColors, int offsetPosition, int offsetAttenuationRadius, int size, int stride)
         {
-            const Offsets offsets(offsetColors, offsetPosition, offsetAttenuationRadius, stride);
+            configureLayout(Offsets(offsetColors, offsetPosition, offsetAttenuationRadius, stride), size);
+        }
 
-            // Copy cloned data using current layout into current data using new layout.
-            // This allows to preserve osg::FloatArray buffer object in mData.
-            const auto data = mData->asVector();
-            mData->resizeArray(static_cast<unsigned>(size));
-            for (int i = 0; i < mCount; ++i)
-            {
-                std::memcpy(&(*mData)[offsets.get(i, Diffuse)], data.data() + getOffset(i, Diffuse), sizeof(osg::Vec4f));
-                std::memcpy(&(*mData)[offsets.get(i, Position)], data.data() + getOffset(i, Position), sizeof(osg::Vec4f));
-                std::memcpy(&(*mData)[offsets.get(i, AttenuationRadius)], data.data() + getOffset(i, AttenuationRadius), sizeof(osg::Vec4f));
-            }
-            mOffsets = offsets;
+        void configureLayout(const LightBuffer* other)
+        {
+            mOffsets = other->mOffsets;
+            int size = other->mData->size();
+
+            configureLayout(mOffsets, size);
         }
 
     private:
@@ -242,6 +221,21 @@ namespace SceneUtil
                 std::array<int, 6> mValues;
         };
 
+        void configureLayout(const Offsets& offsets, int size)
+        {
+            // Copy cloned data using current layout into current data using new layout.
+            // This allows to preserve osg::FloatArray buffer object in mData.
+            const auto data = mData->asVector();
+            mData->resizeArray(static_cast<unsigned>(size));
+            for (int i = 0; i < mCount; ++i)
+            {
+                std::memcpy(&(*mData)[offsets.get(i, Diffuse)], data.data() + getOffset(i, Diffuse), sizeof(osg::Vec4f));
+                std::memcpy(&(*mData)[offsets.get(i, Position)], data.data() + getOffset(i, Position), sizeof(osg::Vec4f));
+                std::memcpy(&(*mData)[offsets.get(i, AttenuationRadius)], data.data() + getOffset(i, AttenuationRadius), sizeof(osg::Vec4f));
+            }
+            mOffsets = offsets;
+        }
+
         osg::ref_ptr<osg::FloatArray> mData;
         osg::Endian mEndian;
         int mCount;
@@ -249,9 +243,8 @@ namespace SceneUtil
         osg::Vec4 mCachedSunPos;
     };
 
-    class LightStateCache
+    struct LightStateCache
     {
-    public:
         std::vector<osg::Light*> lastAppliedLight;
     };
 
@@ -281,9 +274,7 @@ namespace SceneUtil
                 configureDiffuse(lightMat, light->getDiffuse());
                 configureSpecular(lightMat, light->getSpecular());
 
-                osg::ref_ptr<osg::Uniform> uni = new osg::Uniform(osg::Uniform::FLOAT_MAT4, "LightBuffer", lightManager->getMaxLights());
-                uni->setElement(0, lightMat);
-                stateset->addUniform(uni, mode);
+                stateset->addUniform(lightManager->generateLightBufferUniform(lightMat), mode);
                 break;
             }
         case LightingMethod::SingleUBO:
@@ -318,25 +309,20 @@ namespace SceneUtil
         DisableLight(const DisableLight& copy,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY)
             : osg::StateAttribute(copy,copyop), mIndex(copy.mIndex) {}
 
-        osg::Object* cloneType() const override { return new DisableLight(mIndex); }
-        osg::Object* clone(const osg::CopyOp& copyop) const override { return new DisableLight(*this,copyop); }
-        bool isSameKindAs(const osg::Object* obj) const override { return dynamic_cast<const DisableLight *>(obj)!=nullptr; }
-        const char* libraryName() const override { return "SceneUtil"; }
-        const char* className() const override { return "DisableLight"; }
-        Type getType() const override { return LIGHT; }
+        META_StateAttribute(SceneUtil, DisableLight, osg::StateAttribute::LIGHT)
 
         unsigned int getMember() const override
         {
             return mIndex;
         }
 
-        bool getModeUsage(ModeUsage & usage) const override
+        bool getModeUsage(ModeUsage& usage) const override
         {
             usage.usesMode(GL_LIGHT0 + mIndex);
             return true;
         }
 
-        int compare(const StateAttribute &sa) const override
+        int compare(const StateAttribute& sa) const override
         {
             throw std::runtime_error("DisableLight::compare: unimplemented");
         }
@@ -361,7 +347,7 @@ namespace SceneUtil
     {
     public:
         FFPLightStateAttribute() : mIndex(0) {}
-        FFPLightStateAttribute(size_t index, const std::vector<osg::ref_ptr<osg::Light> >& lights) : mIndex(index), mLights(lights) {}
+        FFPLightStateAttribute(size_t index, const std::vector<osg::ref_ptr<osg::Light>>& lights) : mIndex(index), mLights(lights) {}
 
         FFPLightStateAttribute(const FFPLightStateAttribute& copy,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY)
             : osg::StateAttribute(copy,copyop), mIndex(copy.mIndex), mLights(copy.mLights) {}
@@ -371,19 +357,19 @@ namespace SceneUtil
             return mIndex;
         }
 
-        bool getModeUsage(ModeUsage & usage) const override
+        bool getModeUsage(ModeUsage& usage) const override
         {
             for (size_t i = 0; i < mLights.size(); ++i)
                 usage.usesMode(GL_LIGHT0 + mIndex + i);
             return true;
         }
 
-        int compare(const StateAttribute &sa) const override
+        int compare(const StateAttribute& sa) const override
         {
             throw std::runtime_error("FFPLightStateAttribute::compare: unimplemented");
         }
 
-        META_StateAttribute(NifOsg, FFPLightStateAttribute, osg::StateAttribute::LIGHT)
+        META_StateAttribute(SceneUtil, FFPLightStateAttribute, osg::StateAttribute::LIGHT)
 
         void apply(osg::State& state) const override
         {
@@ -429,69 +415,6 @@ namespace SceneUtil
         std::vector<osg::ref_ptr<osg::Light>> mLights;
     };
 
-    LightManager* findLightManager(const osg::NodePath& path)
-    {
-        for (size_t i = 0; i < path.size(); ++i)
-        {
-            if (LightManager* lightManager = dynamic_cast<LightManager*>(path[i]))
-                return lightManager;
-        }
-        return nullptr;
-    }
-
-    class LightStateAttributePerObjectUniform : public osg::StateAttribute
-    {
-    public:
-        LightStateAttributePerObjectUniform() : mLightManager(nullptr) {}
-        LightStateAttributePerObjectUniform(const std::vector<osg::ref_ptr<osg::Light>>& lights, LightManager* lightManager) :  mLights(lights), mLightManager(lightManager) {}
-
-        LightStateAttributePerObjectUniform(const LightStateAttributePerObjectUniform& copy,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY)
-            : osg::StateAttribute(copy,copyop), mLights(copy.mLights), mLightManager(copy.mLightManager) {}
-
-        int compare(const StateAttribute &sa) const override
-        {
-            throw std::runtime_error("LightStateAttributePerObjectUniform::compare: unimplemented");
-        }
-
-        META_StateAttribute(NifOsg, LightStateAttributePerObjectUniform, osg::StateAttribute::LIGHT)
-
-        void resize(int numLights)
-        {
-            mLights.resize(std::min(static_cast<size_t>(numLights), mLights.size()));
-        }
-
-        void apply(osg::State &state) const override
-        {
-            osg::StateSet* stateSet = mLightManager->getStateSet();
-            if (!stateSet)
-                return;
-
-            auto* lightUniform = stateSet->getUniform("LightBuffer");
-            for (size_t i = 0; i < mLights.size(); ++i)
-            {
-                auto light = mLights[i];
-                osg::Matrixf lightMat;
-
-                configurePosition(lightMat, light->getPosition() * state.getInitialViewMatrix());
-                configureAmbient(lightMat, light->getAmbient());
-                configureDiffuse(lightMat, light->getDiffuse());
-                configureAttenuation(lightMat, light->getConstantAttenuation(), light->getLinearAttenuation(), light->getQuadraticAttenuation(), getLightRadius(light));
-
-                lightUniform->setElement(i+1, lightMat);
-            }
-
-            auto sun = mLightManager->getSunlightBuffer(state.getFrameStamp()->getFrameNumber());
-            configurePosition(sun, osg::Vec4(sun(0,0), sun(0,1), sun(0,2), 0.0) * state.getInitialViewMatrix());
-            lightUniform->setElement(0, sun);
-
-            lightUniform->dirty();
-        }
-
-    private:
-        std::vector<osg::ref_ptr<osg::Light>> mLights;
-        LightManager* mLightManager;
-    };
-
     struct StateSetGenerator
     {
         LightManager* mLightManager;
@@ -501,6 +424,8 @@ namespace SceneUtil
         virtual osg::ref_ptr<osg::StateSet> generate(const LightManager::LightList& lightList, size_t frameNum) = 0;
 
         virtual void update(osg::StateSet* stateset, const LightManager::LightList& lightList, size_t frameNum) {}
+
+        osg::Matrix mViewMatrix;
     };
 
     struct StateSetGeneratorFFP : StateSetGenerator
@@ -588,37 +513,50 @@ namespace SceneUtil
         osg::ref_ptr<osg::StateSet> generate(const LightManager::LightList& lightList, size_t frameNum) override
         {
             osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
-
-            std::vector<osg::ref_ptr<osg::Light>> lights(lightList.size());
+            osg::ref_ptr<osg::Uniform> data = mLightManager->generateLightBufferUniform(mLightManager->getSunlightBuffer(frameNum));
 
             for (size_t i = 0; i < lightList.size(); ++i)
             {
                 auto* light = lightList[i]->mLightSource->getLight(frameNum);
-                lights[i] = light;
-                setLightRadius(light, lightList[i]->mLightSource->getRadius());
-            }
+                osg::Matrixf lightMat;
+                configurePosition(lightMat, light->getPosition() * mViewMatrix);
+                configureAmbient(lightMat, light->getAmbient());
+                configureDiffuse(lightMat, light->getDiffuse());
+                configureAttenuation(lightMat, light->getConstantAttenuation(), light->getLinearAttenuation(), light->getQuadraticAttenuation(), lightList[i]->mLightSource->getRadius());
 
-            stateset->setAttributeAndModes(new LightStateAttributePerObjectUniform(std::move(lights), mLightManager), osg::StateAttribute::ON);
+                data->setElement(i+1, lightMat);
+            }
 
+            stateset->addUniform(data);
             stateset->addUniform(new osg::Uniform("PointLightCount", static_cast<int>(lightList.size() + 1)));
 
             return stateset;
         }
     };
 
+    LightManager* findLightManager(const osg::NodePath& path)
+    {
+        for (size_t i = 0; i < path.size(); ++i)
+        {
+            if (LightManager* lightManager = dynamic_cast<LightManager*>(path[i]))
+                return lightManager;
+        }
+        return nullptr;
+    }
+
     // Set on a LightSource. Adds the light source to its light manager for the current frame.
     // This allows us to keep track of the current lights in the scene graph without tying creation & destruction to the manager.
-    class CollectLightCallback : public SceneUtil::NodeCallback<CollectLightCallback>
+    class CollectLightCallback : public NodeCallback<CollectLightCallback>
     {
     public:
         CollectLightCallback()
             : mLightManager(nullptr) { }
 
         CollectLightCallback(const CollectLightCallback& copy, const osg::CopyOp& copyop)
-            : SceneUtil::NodeCallback<CollectLightCallback>(copy, copyop)
+            : NodeCallback<CollectLightCallback>(copy, copyop)
             , mLightManager(nullptr) { }
 
-        META_Object(SceneUtil, SceneUtil::CollectLightCallback)
+        META_Object(SceneUtil, CollectLightCallback)
 
         void operator()(osg::Node* node, osg::NodeVisitor* nv)
         {
@@ -656,169 +594,163 @@ namespace SceneUtil
     class LightManagerCullCallback : public SceneUtil::NodeCallback<LightManagerCullCallback, LightManager*, osgUtil::CullVisitor*>
     {
     public:
-        LightManagerCullCallback() : mLastFrameNumber(0) {}
-
         void operator()(LightManager* node, osgUtil::CullVisitor* cv)
         {
-            if (mLastFrameNumber != cv->getTraversalNumber())
-            {
-                mLastFrameNumber = cv->getTraversalNumber();
+            osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
 
-                if (node->getLightingMethod() == LightingMethod::SingleUBO)
-                {
-                    auto stateset = node->getStateSet();
-                    auto bo = node->getLightBuffer(mLastFrameNumber);
+            if (node->getLightingMethod() == LightingMethod::SingleUBO)
+            {
+                auto buffer = node->getUBOManager()->getLightBuffer(cv->getTraversalNumber());
 
 #if OSG_VERSION_GREATER_OR_EQUAL(3,5,7)
-                    osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(static_cast<int>(Resource::SceneManager::UBOBinding::LightBuffer), bo->getData(), 0, bo->getData()->getTotalDataSize());
+                osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(static_cast<int>(Resource::SceneManager::UBOBinding::LightBuffer), buffer->getData(), 0, buffer->getData()->getTotalDataSize());
 #else
-                    osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(static_cast<int>(Resource::SceneManager::UBOBinding::LightBuffer), bo->getData()->getBufferObject(), 0, bo->getData()->getTotalDataSize());
+                osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(static_cast<int>(Resource::SceneManager::UBOBinding::LightBuffer), buffer->getData()->getBufferObject(), 0, buffer->getData()->getTotalDataSize());
 #endif
-                    stateset->setAttributeAndModes(ubb, osg::StateAttribute::ON);
-                }
+                stateset->setAttributeAndModes(ubb, osg::StateAttribute::ON);
 
-                auto sun = node->getSunlight();
-
-                if (sun)
+                if (auto sun = node->getSunlight())
                 {
-                    // we must defer uploading the transformation to view-space position to deal with different cameras (e.g. reflection RTT).
-                    if (node->getLightingMethod() == LightingMethod::PerObjectUniform)
-                    {
-                        osg::Matrixf lightMat;
-                        configurePosition(lightMat, sun->getPosition());
-                        configureAmbient(lightMat, sun->getAmbient());
-                        configureDiffuse(lightMat, sun->getDiffuse());
-                        configureSpecular(lightMat, sun->getSpecular());
-                        node->setSunlightBuffer(lightMat, mLastFrameNumber);
-                    }
-                    else
-                    {
-                        auto buf = node->getLightBuffer(mLastFrameNumber);
-
-                        buf->setCachedSunPos(sun->getPosition());
-                        buf->setAmbient(0, sun->getAmbient());
-                        buf->setDiffuse(0, sun->getDiffuse());
-                        buf->setSpecular(0, sun->getSpecular());
-                    }
+                    buffer->setCachedSunPos(sun->getPosition());
+                    buffer->setAmbient(0, sun->getAmbient());
+                    buffer->setDiffuse(0, sun->getDiffuse());
+                    buffer->setSpecular(0, sun->getSpecular());
+                }
+            }
+            else if (node->getLightingMethod() == LightingMethod::PerObjectUniform)
+            {
+                if (auto sun = node->getSunlight())
+                {
+                    osg::Matrixf lightMat;
+                    configurePosition(lightMat, sun->getPosition() * (*cv->getCurrentRenderStage()->getInitialViewMatrix()));
+                    configureAmbient(lightMat, sun->getAmbient());
+                    configureDiffuse(lightMat, sun->getDiffuse());
+                    configureSpecular(lightMat, sun->getSpecular());
+                    node->setSunlightBuffer(lightMat, cv->getTraversalNumber());
+                    stateset->addUniform(node->generateLightBufferUniform(lightMat));
                 }
             }
 
+            cv->pushStateSet(stateset);
             traverse(node, cv);
+            cv->popStateSet();
         }
-
-    private:
-        size_t mLastFrameNumber;
     };
 
-    class LightManagerStateAttribute : public osg::StateAttribute
+    UBOManager::UBOManager(int lightCount)
+        : mDummyProgram(new osg::Program)
+        , mInitLayout(false)
+        , mDirty({ true, true })
+        , mTemplate(new LightBuffer(lightCount))
     {
-    public:
-        LightManagerStateAttribute()
-            : mLightManager(nullptr)
-            , mInitLayout(false)
-        {
-        }
+        static const std::string dummyVertSource = generateDummyShader(lightCount);
 
-        LightManagerStateAttribute(LightManager* lightManager)
-        : mLightManager(lightManager)
-        , mDummyProgram(new osg::Program)
-        , mInitLayout(false)
-        {
-            static const std::string dummyVertSource = generateDummyShader(mLightManager->getMaxLightsInScene());
+        // Needed to query the layout of the buffer object. The layout specifier needed to use the std140 layout is not reliably
+        // available, regardless of extensions, until GLSL 140.
+        mDummyProgram->addShader(new osg::Shader(osg::Shader::VERTEX, dummyVertSource));
+        mDummyProgram->addBindUniformBlock("LightBufferBinding", static_cast<int>(Resource::SceneManager::UBOBinding::LightBuffer));
 
-            // Needed to query the layout of the buffer object. The layout specifier needed to use the std140 layout is not reliably
-            // available, regardless of extensions, until GLSL 140.
-            mDummyProgram->addShader(new osg::Shader(osg::Shader::VERTEX, dummyVertSource));
-            mDummyProgram->addBindUniformBlock("LightBufferBinding", static_cast<int>(Resource::SceneManager::UBOBinding::LightBuffer));
-        }
+        for (size_t i = 0; i < mLightBuffers.size(); ++i)
+        {
+            mLightBuffers[i] = new LightBuffer(lightCount);
 
-        LightManagerStateAttribute(const LightManagerStateAttribute& copy, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY)
-            : osg::StateAttribute(copy,copyop), mLightManager(copy.mLightManager), mInitLayout(copy.mInitLayout) {}
+            osg::ref_ptr<osg::UniformBufferObject> ubo = new osg::UniformBufferObject;
+            ubo->setUsage(GL_STREAM_DRAW);
 
-        int compare(const StateAttribute &sa) const override
-        {
-            throw std::runtime_error("LightManagerStateAttribute::compare: unimplemented");
+            mLightBuffers[i]->getData()->setBufferObject(ubo);
         }
+    }
 
-        META_StateAttribute(NifOsg, LightManagerStateAttribute, osg::StateAttribute::LIGHT)
+    UBOManager::UBOManager(const UBOManager& copy, const osg::CopyOp& copyop) : osg::StateAttribute(copy,copyop), mDummyProgram(copy.mDummyProgram), mInitLayout(copy.mInitLayout) {}
 
-        void initSharedLayout(osg::GLExtensions* ext, int handle) const
-        {
-            constexpr std::array<unsigned int, 1> index = { static_cast<unsigned int>(Resource::SceneManager::UBOBinding::LightBuffer) };
-            int totalBlockSize = -1;
-            int stride = -1;
+    void UBOManager::releaseGLObjects(osg::State* state) const
+    {
+        mDummyProgram->releaseGLObjects(state);
+    }
 
-            ext->glGetActiveUniformBlockiv(handle, 0, GL_UNIFORM_BLOCK_DATA_SIZE, &totalBlockSize);
-            ext->glGetActiveUniformsiv(handle, index.size(), index.data(), GL_UNIFORM_ARRAY_STRIDE, &stride);
+    int UBOManager::compare(const StateAttribute &sa) const
+    {
+        throw std::runtime_error("LightManagerStateAttribute::compare: unimplemented");
+    }
 
-            std::array<const char*, 3> names = {
-                "LightBuffer[0].packedColors",
-                "LightBuffer[0].position",
-                "LightBuffer[0].attenuation",
-            };
-            std::vector<unsigned int> indices(names.size());
-            std::vector<int> offsets(names.size());
+    void UBOManager::apply(osg::State& state) const
+    {
+        unsigned int frame = state.getFrameStamp()->getFrameNumber();
+        unsigned int index = frame % 2;
 
-            ext->glGetUniformIndices(handle, names.size(), names.data(), indices.data());
-            ext->glGetActiveUniformsiv(handle, indices.size(), indices.data(), GL_UNIFORM_OFFSET, offsets.data());
+        if (!mInitLayout)
+        {
+            mDummyProgram->apply(state);
+            auto handle = mDummyProgram->getPCP(state)->getHandle();
+            auto* ext = state.get<osg::GLExtensions>();
 
-            for (int i = 0; i < 2; ++i)
-                mLightManager->getLightBuffer(i)->configureLayout(offsets[0], offsets[1], offsets[2], totalBlockSize, stride);
-        }
+            int activeUniformBlocks = 0;
+            ext->glGetProgramiv(handle, GL_ACTIVE_UNIFORM_BLOCKS, &activeUniformBlocks);
 
-        void apply(osg::State& state) const override
-        {
-            if (!mInitLayout)
+            // wait until the UBO binding is created
+            if (activeUniformBlocks > 0)
             {
-                mDummyProgram->apply(state);
-                auto handle = mDummyProgram->getPCP(state)->getHandle();
-                auto* ext = state.get<osg::GLExtensions>();
+                initSharedLayout(ext, handle, frame);
+                mInitLayout = true;
+            }
+        }
+        else if (mDirty[index])
+        {
+            mDirty[index] = false;
+            mLightBuffers[index]->configureLayout(mTemplate);
+        }
 
-                int activeUniformBlocks = 0;
-                ext->glGetProgramiv(handle, GL_ACTIVE_UNIFORM_BLOCKS, &activeUniformBlocks);
+        mLightBuffers[index]->uploadCachedSunPos(state.getInitialViewMatrix());
+        mLightBuffers[index]->dirty();
+    }
 
-                // wait until the UBO binding is created
-                if (activeUniformBlocks > 0)
-                {
-                    initSharedLayout(ext, handle);
-                    mInitLayout = true;
-                }
+    std::string UBOManager::generateDummyShader(int maxLightsInScene)
+    {
+        const std::string define = "@maxLightsInScene";
+
+        std::string shader = R"GLSL(
+            #version 120
+            #extension GL_ARB_uniform_buffer_object : require
+            struct LightData {
+                ivec4 packedColors;
+                vec4 position;
+                vec4 attenuation;
+            };
+            uniform LightBufferBinding {
+                LightData LightBuffer[@maxLightsInScene];
+            };
+            void main()
+            {
+                gl_Position = vec4(0.0);
             }
-            mLightManager->getLightBuffer(state.getFrameStamp()->getFrameNumber())->uploadCachedSunPos(state.getInitialViewMatrix());
-            mLightManager->getLightBuffer(state.getFrameStamp()->getFrameNumber())->dirty();
-        }
+        )GLSL";
 
-    private:
+        shader.replace(shader.find(define), define.length(), std::to_string(maxLightsInScene));
+        return shader;
+    }
 
-        std::string generateDummyShader(int maxLightsInScene)
-        {
-            const std::string define = "@maxLightsInScene";
-
-            std::string shader = R"GLSL(
-                #version 120
-                #extension GL_ARB_uniform_buffer_object : require
-                struct LightData {
-                   ivec4 packedColors;
-                   vec4 position;
-                   vec4 attenuation;
-                };
-                uniform LightBufferBinding {
-                   LightData LightBuffer[@maxLightsInScene];
-                };
-                void main()
-                {
-                    gl_Position = vec4(0.0);
-                }
-            )GLSL";
+    void UBOManager::initSharedLayout(osg::GLExtensions* ext, int handle, unsigned int frame) const
+    {
+        constexpr std::array<unsigned int, 1> index = { static_cast<unsigned int>(Resource::SceneManager::UBOBinding::LightBuffer) };
+        int totalBlockSize = -1;
+        int stride = -1;
 
-            shader.replace(shader.find(define), define.length(), std::to_string(maxLightsInScene));
-            return shader;
-        }
+        ext->glGetActiveUniformBlockiv(handle, 0, GL_UNIFORM_BLOCK_DATA_SIZE, &totalBlockSize);
+        ext->glGetActiveUniformsiv(handle, index.size(), index.data(), GL_UNIFORM_ARRAY_STRIDE, &stride);
 
-        LightManager* mLightManager;
-        osg::ref_ptr<osg::Program> mDummyProgram;
-        mutable bool mInitLayout;
-    };
+        std::array<const char*, 3> names = {
+            "LightBuffer[0].packedColors",
+            "LightBuffer[0].position",
+            "LightBuffer[0].attenuation",
+        };
+        std::vector<unsigned int> indices(names.size());
+        std::vector<int> offsets(names.size());
+
+        ext->glGetUniformIndices(handle, names.size(), names.data(), indices.data());
+        ext->glGetActiveUniformsiv(handle, indices.size(), indices.data(), GL_UNIFORM_OFFSET, offsets.data());
+
+        mTemplate->configureLayout(offsets[0], offsets[1], offsets[2], totalBlockSize, stride);
+    }
 
     const std::unordered_map<std::string, LightingMethod> LightManager::mLightingMethodSettingMap = {
          {"legacy", LightingMethod::FFP}
@@ -845,11 +777,6 @@ namespace SceneUtil
         return "";
     }
 
-    LightManager::~LightManager()
-    {
-        getOrCreateStateSet()->removeAttribute(osg::StateAttribute::LIGHT);
-    }
-
     LightManager::LightManager(bool ffp)
         : mStartLight(0)
         , mLightingMask(~0u)
@@ -899,7 +826,7 @@ namespace SceneUtil
 
         getOrCreateStateSet()->addUniform(new osg::Uniform("PointLightCount", 0));
 
-        addCullCallback(new LightManagerCullCallback());
+        addCullCallback(new LightManagerCullCallback);
     }
 
     LightManager::LightManager(const LightManager &copy, const osg::CopyOp &copyop)
@@ -970,55 +897,16 @@ namespace SceneUtil
         if (usingFFP())
             return;
 
-        int targetLights = std::clamp(Settings::Manager::getInt("max lights", "Shaders"), mMaxLightsLowerLimit, mMaxLightsUpperLimit);
-        setMaxLights(targetLights);
+        setMaxLights(std::clamp(Settings::Manager::getInt("max lights", "Shaders"), mMaxLightsLowerLimit, mMaxLightsUpperLimit));
 
         if (getLightingMethod() == LightingMethod::PerObjectUniform)
         {
-            auto* prevUniform = getStateSet()->getUniform("LightBuffer");
-            osg::ref_ptr<osg::Uniform> newUniform = new osg::Uniform(osg::Uniform::FLOAT_MAT4, "LightBuffer", getMaxLights());
-
-            for (int i = 0; i < getMaxLights(); ++i)
-            {
-                osg::Matrixf prevLightData;
-                prevUniform->getElement(i, prevLightData);
-                newUniform->setElement(i, prevLightData);
-            }
-
-            getStateSet()->removeUniform(prevUniform);
-            getStateSet()->addUniform(newUniform);
-
-            for (int i = 0; i < 2; ++i)
-            {
-                for (auto& pair : mStateSetCache[i])
-                    static_cast<LightStateAttributePerObjectUniform*>(pair.second->getAttribute(osg::StateAttribute::LIGHT))->resize(getMaxLights());
-                mStateSetCache[i].clear();
-            }
+            getStateSet()->removeUniform("LightBuffer");
+            getStateSet()->addUniform(generateLightBufferUniform(osg::Matrixf()));
         }
-        else
-        {
-            for (int i = 0; i < 2; ++i)
-            {
-                for (auto& pair : mStateSetCache[i])
-                {
-                    auto& stateset = pair.second;
-                    osg::Uniform* uOldArray = stateset->getUniform("PointLightIndex");
-                    osg::Uniform* uOldCount = stateset->getUniform("PointLightCount");
 
-                    int prevCount;
-                    uOldCount->get(prevCount);
-                    int newCount = std::min(getMaxLights(), prevCount);
-                    uOldCount->set(newCount);
-
-                    osg::ref_ptr<osg::IntArray> newArray = uOldArray->getIntArray();
-                    newArray->resize(newCount);
-
-                    stateset->removeUniform(uOldArray);
-                    stateset->addUniform(new osg::Uniform("PointLightIndex", newArray));
-                }
-                mStateSetCache[i].clear();
-            }
-        }
+        for (auto& cache : mStateSetCache)
+            cache.clear();
     }
 
     void LightManager::updateSettings()
@@ -1047,14 +935,10 @@ namespace SceneUtil
 
     void LightManager::initPerObjectUniform(int targetLights)
     {
-        auto* stateset = getOrCreateStateSet();
-
         setLightingMethod(LightingMethod::PerObjectUniform);
         setMaxLights(targetLights);
 
-        // ensures sunlight element in our uniform array is updated when there are no point lights in scene
-        stateset->setAttributeAndModes(new LightStateAttributePerObjectUniform({}, this), osg::StateAttribute::ON);
-        stateset->addUniform(new osg::Uniform(osg::Uniform::FLOAT_MAT4, "LightBuffer", getMaxLights()));
+        getOrCreateStateSet()->addUniform(generateLightBufferUniform(osg::Matrixf()));
     }
 
     void LightManager::initSingleUBO(int targetLights)
@@ -1062,17 +946,8 @@ namespace SceneUtil
         setLightingMethod(LightingMethod::SingleUBO);
         setMaxLights(targetLights);
 
-        for (int i = 0; i < 2; ++i)
-        {
-            mLightBuffers[i] = new LightBuffer(getMaxLightsInScene());
-
-            osg::ref_ptr<osg::UniformBufferObject> ubo = new osg::UniformBufferObject;
-            ubo->setUsage(GL_STREAM_DRAW);
-
-            mLightBuffers[i]->getData()->setBufferObject(ubo);
-        }
-
-        getOrCreateStateSet()->setAttribute(new LightManagerStateAttribute(this), osg::StateAttribute::ON);
+        mUBOManager = new UBOManager(getMaxLightsInScene());
+        getOrCreateStateSet()->setAttributeAndModes(mUBOManager);
     }
 
     void LightManager::setLightingMethod(LightingMethod method)
@@ -1171,6 +1046,12 @@ namespace SceneUtil
 
     osg::ref_ptr<osg::StateSet> LightManager::getLightListStateSet(const LightList& lightList, size_t frameNum, const osg::RefMatrix* viewMatrix)
     {
+        if (getLightingMethod() == LightingMethod::PerObjectUniform)
+        {
+            mStateSetGenerator->mViewMatrix = *viewMatrix;
+            return mStateSetGenerator->generate(lightList, frameNum);
+        }
+
         // possible optimization: return a StateSet containing all requested lights plus some extra lights (if a suitable one exists)
 
         if (getLightingMethod() == LightingMethod::SingleUBO)
@@ -1205,7 +1086,7 @@ namespace SceneUtil
         return stateset;
     }
 
-    const std::vector<LightManager::LightSourceViewBound>& LightManager::getLightsInViewSpace(osgUtil::CullVisitor *cv, const osg::RefMatrix* viewMatrix, size_t frameNum)
+    const std::vector<LightManager::LightSourceViewBound>& LightManager::getLightsInViewSpace(osgUtil::CullVisitor* cv, const osg::RefMatrix* viewMatrix, size_t frameNum)
     {
         osg::Camera* camera = cv->getCurrentCamera();
 
@@ -1216,8 +1097,6 @@ namespace SceneUtil
         {
             it = mLightsInViewSpace.insert(std::make_pair(camPtr, LightSourceViewBoundCollection())).first;
 
-            bool isReflection = isReflectionCamera(camera);
-
             for (const auto& transform : mLights)
             {
                 osg::Matrixf worldViewMat = transform.mWorldMatrix * (*viewMatrix);
@@ -1227,7 +1106,7 @@ namespace SceneUtil
                 osg::BoundingSphere viewBound = osg::BoundingSphere(osg::Vec3f(0,0,0), radius);
                 transformBoundingSphere(worldViewMat, viewBound);
 
-                if (!isReflection && mPointLightFadeEnd != 0.f)
+                if (transform.mLightSource->getLastAppliedFrame() != frameNum && mPointLightFadeEnd != 0.f)
                 {
                     const float fadeDelta = mPointLightFadeEnd - mPointLightFadeStart;
                     float fade = 1 - std::clamp((viewBound.center().length() - mPointLightFadeStart) / fadeDelta, 0.f, 1.f);
@@ -1236,6 +1115,7 @@ namespace SceneUtil
 
                     auto* light = transform.mLightSource->getLight(frameNum);
                     light->setDiffuse(light->getDiffuse() * fade);
+                    transform.mLightSource->setLastAppliedFrame(frameNum);
                 }
 
                 // remove lights culled by this camera
@@ -1272,16 +1152,25 @@ namespace SceneUtil
     void LightManager::updateGPUPointLight(int index, LightSource* lightSource, size_t frameNum,const osg::RefMatrix* viewMatrix)
     {
         auto* light = lightSource->getLight(frameNum);
-        auto& buf = getLightBuffer(frameNum);
+        auto& buf = getUBOManager()->getLightBuffer(frameNum);
         buf->setDiffuse(index, light->getDiffuse());
         buf->setAmbient(index, light->getAmbient());
         buf->setAttenuationRadius(index, osg::Vec4(light->getConstantAttenuation(), light->getLinearAttenuation(), light->getQuadraticAttenuation(), lightSource->getRadius()));
         buf->setPosition(index, light->getPosition() * (*viewMatrix));
     }
 
+    osg::ref_ptr<osg::Uniform> LightManager::generateLightBufferUniform(const osg::Matrixf& sun)
+    {
+        osg::ref_ptr<osg::Uniform> uniform = new osg::Uniform(osg::Uniform::FLOAT_MAT4, "LightBuffer", getMaxLights());
+        uniform->setElement(0, sun);
+
+        return uniform;
+    }
+
     LightSource::LightSource()
         : mRadius(0.f)
         , mActorFade(1.f)
+        , mLastAppliedFrame(0)
     {
         setUpdateCallback(new CollectLightCallback);
         mId = sLightId++;
@@ -1291,10 +1180,11 @@ namespace SceneUtil
         : osg::Node(copy, copyop)
         , mRadius(copy.mRadius)
         , mActorFade(copy.mActorFade)
+        , mLastAppliedFrame(copy.mLastAppliedFrame)
     {
         mId = sLightId++;
 
-        for (int i = 0; i < 2; ++i)
+        for (size_t i = 0; i < mLight.size(); ++i)
             mLight[i] = new osg::Light(*copy.mLight[i].get(), copyop);
     }
 
@@ -1358,7 +1248,7 @@ namespace SceneUtil
         {
             size_t maxLights = mLightManager->getMaxLights() - mLightManager->getStartLight();
 
-            osg::StateSet* stateset = nullptr;
+            osg::ref_ptr<osg::StateSet> stateset = nullptr;
 
             if (mLightList.size() > maxLights)
             {
diff --git a/components/sceneutil/lightmanager.hpp b/components/sceneutil/lightmanager.hpp
index 4a7dc7dbe7..64b7e325ad 100644
--- a/components/sceneutil/lightmanager.hpp
+++ b/components/sceneutil/lightmanager.hpp
@@ -2,13 +2,11 @@
 #define OPENMW_COMPONENTS_SCENEUTIL_LIGHTMANAGER_H
 
 #include <set>
-#include <unordered_set>
 #include <unordered_map>
 #include <memory>
 #include <array>
 
 #include <osg/Light>
-
 #include <osg/Group>
 #include <osg/NodeVisitor>
 #include <osg/observer_ptr>
@@ -46,7 +44,7 @@ namespace SceneUtil
     class LightSource : public osg::Node
     {
         // double buffered osg::Light's, since one of them may be in use by the draw thread at any given time
-        osg::ref_ptr<osg::Light> mLight[2];
+        std::array<osg::ref_ptr<osg::Light>, 2> mLight;
 
         // LightSource will affect objects within this radius
         float mRadius;
@@ -55,6 +53,8 @@ namespace SceneUtil
 
         float mActorFade;
 
+        unsigned int mLastAppliedFrame;
+
     public:
 
         META_Node(SceneUtil, LightSource)
@@ -107,6 +107,43 @@ namespace SceneUtil
         {
             return mId;
         }
+
+        void setLastAppliedFrame(unsigned int lastAppliedFrame)
+        {
+            mLastAppliedFrame = lastAppliedFrame;
+        }
+
+        unsigned int getLastAppliedFrame() const
+        {
+            return mLastAppliedFrame;
+        }
+    };
+
+    class UBOManager : public osg::StateAttribute
+    {
+    public:
+        UBOManager(int lightCount=1);
+        UBOManager(const UBOManager& copy, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
+
+        void releaseGLObjects(osg::State* state) const override;
+
+        int compare(const StateAttribute& sa) const override;
+
+        META_StateAttribute(SceneUtil, UBOManager, osg::StateAttribute::LIGHT)
+
+        void apply(osg::State& state) const override;
+
+        auto& getLightBuffer(size_t frameNum) { return mLightBuffers[frameNum%2]; }
+
+    private:
+        std::string generateDummyShader(int maxLightsInScene);
+        void initSharedLayout(osg::GLExtensions* ext, int handle, unsigned int frame) const;
+
+        osg::ref_ptr<osg::Program> mDummyProgram;
+        mutable bool mInitLayout;
+        mutable std::array<osg::ref_ptr<LightBuffer>, 2> mLightBuffers;
+        mutable std::array<bool, 2> mDirty;
+        osg::ref_ptr<LightBuffer> mTemplate;
     };
 
     /// @brief Decorator node implementing the rendering of any number of LightSources that can be anywhere in the subgraph.
@@ -138,8 +175,6 @@ namespace SceneUtil
 
         LightManager(const LightManager& copy, const osg::CopyOp& copyop);
 
-        ~LightManager();
-
         /// @param mask This mask is compared with the current Camera's cull mask to determine if lighting is desired.
         /// By default, it's ~0u i.e. always on.
         /// If you have some views that do not require lighting, then set the Camera's cull mask to not include
@@ -176,7 +211,7 @@ namespace SceneUtil
 
         auto& getLightIndexMap(size_t frameNum) { return mLightIndexMaps[frameNum%2]; }
 
-        auto& getLightBuffer(size_t frameNum) { return mLightBuffers[frameNum%2]; }
+        auto& getUBOManager() { return mUBOManager; }
 
         osg::Matrixf getSunlightBuffer(size_t frameNum) const { return mSunlightBuffers[frameNum%2]; }
         void setSunlightBuffer(const osg::Matrixf& buffer, size_t frameNum) { mSunlightBuffers[frameNum%2] = buffer; }
@@ -190,6 +225,8 @@ namespace SceneUtil
         /// Not thread safe, it is the responsibility of the caller to stop/start threading on the viewer
         void updateMaxLights();
 
+        osg::ref_ptr<osg::Uniform> generateLightBufferUniform(const osg::Matrixf& sun);
+
     private:
         void initFFP(int targetLights);
         void initPerObjectUniform(int targetLights);
@@ -223,8 +260,6 @@ namespace SceneUtil
 
         osg::ref_ptr<osg::Light> mSun;
 
-        osg::ref_ptr<LightBuffer> mLightBuffers[2];
-
         osg::Matrixf mSunlightBuffers[2];
 
         // < Light ID , Buffer Index >
@@ -233,6 +268,8 @@ namespace SceneUtil
 
         std::unique_ptr<StateSetGenerator> mStateSetGenerator;
 
+        osg::ref_ptr<UBOManager> mUBOManager;
+
         LightingMethod mLightingMethod;
 
         float mPointLightRadiusMultiplier;
diff --git a/components/sceneutil/serialize.cpp b/components/sceneutil/serialize.cpp
index 9da0d6a40e..964b8bc4c2 100644
--- a/components/sceneutil/serialize.cpp
+++ b/components/sceneutil/serialize.cpp
@@ -123,8 +123,10 @@ void registerSerializers()
             "Resource::TemplateRef",
             "Resource::TemplateMultiRef",
             "SceneUtil::CompositeStateSetUpdater",
+            "SceneUtil::UBOManager",
             "SceneUtil::LightListCallback",
             "SceneUtil::LightManagerUpdateCallback",
+            "SceneUtil::FFPLightStateAttribute",
             "SceneUtil::UpdateRigBounds",
             "SceneUtil::UpdateRigGeometry",
             "SceneUtil::LightSource",
@@ -133,7 +135,6 @@ void registerSerializers()
             "SceneUtil::TextKeyMapHolder",
             "Shader::AddedState",
             "Shader::RemovedAlphaFunc",
-            "NifOsg::LightManagerStateAttribute",
             "NifOsg::FlipController",
             "NifOsg::KeyframeController",
             "NifOsg::Emitter",

From eceed558be6df1b31958a8376bb12f5797c8efa6 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Fri, 19 Nov 2021 16:21:17 +0100
Subject: [PATCH 1731/2859] Fix coverity uninitialized variables

---
 components/lua_ui/text.cpp     |  5 ++++-
 components/lua_ui/text.hpp     |  1 +
 components/lua_ui/textedit.hpp |  4 ++--
 components/lua_ui/widget.cpp   | 12 +++++++-----
 components/lua_ui/widget.hpp   |  2 +-
 components/lua_ui/window.cpp   |  6 ++++++
 components/lua_ui/window.hpp   |  3 +++
 7 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/components/lua_ui/text.cpp b/components/lua_ui/text.cpp
index 241af981b0..571bdaf403 100644
--- a/components/lua_ui/text.cpp
+++ b/components/lua_ui/text.cpp
@@ -3,10 +3,13 @@
 
 namespace LuaUi
 {
+    LuaText::LuaText()
+        : mAutoSized(true)
+    {}
+
     void LuaText::initialize()
     {
         WidgetExtension::initialize();
-        mAutoSized = true;
     }
 
     bool LuaText::setPropertyRaw(std::string_view name, sol::object value)
diff --git a/components/lua_ui/text.hpp b/components/lua_ui/text.hpp
index 08de275d23..90a3fc563c 100644
--- a/components/lua_ui/text.hpp
+++ b/components/lua_ui/text.hpp
@@ -12,6 +12,7 @@ namespace LuaUi
         MYGUI_RTTI_DERIVED(LuaText)
 
         public:
+            LuaText();
             virtual void initialize() override;
 
         private:
diff --git a/components/lua_ui/textedit.hpp b/components/lua_ui/textedit.hpp
index 7d3291692c..3eb5b471c3 100644
--- a/components/lua_ui/textedit.hpp
+++ b/components/lua_ui/textedit.hpp
@@ -11,8 +11,8 @@ namespace LuaUi
     {
         MYGUI_RTTI_DERIVED(LuaTextEdit)
 
-    protected:
-        bool setPropertyRaw(std::string_view name, sol::object value) override;
+        protected:
+            bool setPropertyRaw(std::string_view name, sol::object value) override;
     };
 }
 
diff --git a/components/lua_ui/widget.cpp b/components/lua_ui/widget.cpp
index 5cbf1f318d..3ce07273f8 100644
--- a/components/lua_ui/widget.cpp
+++ b/components/lua_ui/widget.cpp
@@ -8,6 +8,13 @@
 
 namespace LuaUi
 {
+    WidgetExtension::WidgetExtension()
+        : mForcedCoord()
+        , mAbsoluteCoord()
+        , mRelativeCoord()
+        , mAnchor()
+    {}
+
     void WidgetExtension::triggerEvent(std::string_view name, const sol::object& argument = sol::nil) const
     {
         auto it = mCallbacks.find(name);
@@ -27,11 +34,6 @@ namespace LuaUi
 
     void WidgetExtension::initialize()
     {
-        mAbsoluteCoord = MyGUI::IntCoord();
-        mRelativeCoord = MyGUI::FloatCoord();
-        mAnchor = MyGUI::FloatSize();
-        mForcedCoord = MyGUI::IntCoord();
-
         // \todo might be more efficient to only register these if there are Lua callbacks
         mWidget->eventKeyButtonPressed += MyGUI::newDelegate(this, &WidgetExtension::keyPress);
         mWidget->eventKeyButtonReleased += MyGUI::newDelegate(this, &WidgetExtension::keyRelease);
diff --git a/components/lua_ui/widget.hpp b/components/lua_ui/widget.hpp
index fe1ad46716..48b169572f 100644
--- a/components/lua_ui/widget.hpp
+++ b/components/lua_ui/widget.hpp
@@ -19,6 +19,7 @@ namespace LuaUi
     class WidgetExtension
     {
     public:
+        WidgetExtension();
         // must be called after creating the underlying MyGUI::Widget
         void create(lua_State* lua, MyGUI::Widget* self);
         // must be called after before destroying the underlying MyGUI::Widget
@@ -42,7 +43,6 @@ namespace LuaUi
         void updateCoord();
 
     protected:
-        ~WidgetExtension() {}
         sol::table makeTable() const;
         sol::object keyEvent(MyGUI::KeyCode) const;
         sol::object mouseEvent(int left, int top, MyGUI::MouseButton button) const;
diff --git a/components/lua_ui/window.cpp b/components/lua_ui/window.cpp
index 874ccb9fa4..b7bb426a63 100644
--- a/components/lua_ui/window.cpp
+++ b/components/lua_ui/window.cpp
@@ -4,6 +4,12 @@
 
 namespace LuaUi
 {
+    LuaWindow::LuaWindow()
+        : mCaption()
+        , mPreviousMouse()
+        , mChangeScale()
+    {}
+
     void LuaWindow::initialize()
     {
         WidgetExtension::initialize();
diff --git a/components/lua_ui/window.hpp b/components/lua_ui/window.hpp
index d92bf8dcbf..c04b0a6055 100644
--- a/components/lua_ui/window.hpp
+++ b/components/lua_ui/window.hpp
@@ -13,6 +13,9 @@ namespace LuaUi
     {
         MYGUI_RTTI_DERIVED(LuaWindow)
 
+        public:
+            LuaWindow();
+
         private:
             // \todo replace with LuaText when skins are properly implemented
             MyGUI::TextBox* mCaption;

From d5ca091d6e761fb8518f38efbfb8fe22575e5f0d Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Thu, 18 Nov 2021 15:11:39 +0100
Subject: [PATCH 1732/2859] Make util.rotateX, util.rotateY, rotate.Z
 consistent with morrowind rotation

---
 apps/openmw_test_suite/lua/test_utilpackage.cpp |  8 ++++----
 components/lua/utilpackage.cpp                  |  6 +++---
 files/lua_api/openmw/util.lua                   | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/apps/openmw_test_suite/lua/test_utilpackage.cpp b/apps/openmw_test_suite/lua/test_utilpackage.cpp
index ead3cecc6f..21d2a344d4 100644
--- a/apps/openmw_test_suite/lua/test_utilpackage.cpp
+++ b/apps/openmw_test_suite/lua/test_utilpackage.cpp
@@ -93,13 +93,13 @@ namespace
         EXPECT_EQ(getAsString(lua, "moveAndScale * v(300, 200, 100)"), "(156, 222, 68)");
         EXPECT_THAT(getAsString(lua, "moveAndScale"), AllOf(StartsWith("TransformM{ move(6, 22, 18) scale(0.5, 1, 0.5) "), EndsWith(" }")));
         EXPECT_EQ(getAsString(lua, "T.identity"), "TransformM{ }");
-        lua.safe_script("rx = T.rotateX(math.pi / 2)");
-        lua.safe_script("ry = T.rotateY(math.pi / 2)");
-        lua.safe_script("rz = T.rotateZ(math.pi / 2)");
+        lua.safe_script("rx = T.rotateX(-math.pi / 2)");
+        lua.safe_script("ry = T.rotateY(-math.pi / 2)");
+        lua.safe_script("rz = T.rotateZ(-math.pi / 2)");
         EXPECT_LT(get<float>(lua, "(rx * v(1, 2, 3) - v(1, -3, 2)):length()"), 1e-6);
         EXPECT_LT(get<float>(lua, "(ry * v(1, 2, 3) - v(3, 2, -1)):length()"), 1e-6);
         EXPECT_LT(get<float>(lua, "(rz * v(1, 2, 3) - v(-2, 1, 3)):length()"), 1e-6);
-        lua.safe_script("rot = T.rotate(math.pi / 2, v(-1, -1, 0)) * T.rotateZ(-math.pi / 4)");
+        lua.safe_script("rot = T.rotate(math.pi / 2, v(-1, -1, 0)) * T.rotateZ(math.pi / 4)");
         EXPECT_THAT(getAsString(lua, "rot"), HasSubstr("TransformQ"));
         EXPECT_LT(get<float>(lua, "(rot * v(1, 0, 0) - v(0, 0, 1)):length()"), 1e-6);
         EXPECT_LT(get<float>(lua, "(rot * rot:inverse() * v(1, 0, 0) - v(1, 0, 0)):length()"), 1e-6);
diff --git a/components/lua/utilpackage.cpp b/components/lua/utilpackage.cpp
index 17cb64461a..b68fc7afa4 100644
--- a/components/lua/utilpackage.cpp
+++ b/components/lua/utilpackage.cpp
@@ -105,9 +105,9 @@ namespace LuaUtil
             [](const Vec3& v) { return TransformM{osg::Matrixf::scale(v)}; },
             [](float x, float y, float z) { return TransformM{osg::Matrixf::scale(x, y, z)}; });
         transforms["rotate"] = [](float angle, const Vec3& axis) { return TransformQ{osg::Quat(angle, axis)}; };
-        transforms["rotateX"] = [](float angle) { return TransformQ{osg::Quat(angle, Vec3(1, 0, 0))}; };
-        transforms["rotateY"] = [](float angle) { return TransformQ{osg::Quat(angle, Vec3(0, 1, 0))}; };
-        transforms["rotateZ"] = [](float angle) { return TransformQ{osg::Quat(angle, Vec3(0, 0, 1))}; };
+        transforms["rotateX"] = [](float angle) { return TransformQ{osg::Quat(angle, Vec3(-1, 0, 0))}; };
+        transforms["rotateY"] = [](float angle) { return TransformQ{osg::Quat(angle, Vec3(0, -1, 0))}; };
+        transforms["rotateZ"] = [](float angle) { return TransformQ{osg::Quat(angle, Vec3(0, 0, -1))}; };
 
         transMType[sol::meta_function::multiplication] = sol::overload(
             [](const TransformM& a, const Vec3& b) { return a.mM.preMult(b); },
diff --git a/files/lua_api/openmw/util.lua b/files/lua_api/openmw/util.lua
index 84e640ff40..fdb140ad53 100644
--- a/files/lua_api/openmw/util.lua
+++ b/files/lua_api/openmw/util.lua
@@ -32,7 +32,7 @@
 -- v:length()     -- 5.0    length
 -- v:length2()    -- 25.0   square of the length
 -- v:normalize()  -- vector2(3/5, 4/5)
--- v:rotate(radians)    -- rotate clockwise (returns rotated vector)
+-- v:rotate(radians)    -- rotate counterclockwise (returns rotated vector)
 -- v1:dot(v2)     -- dot product (returns a number)
 -- v1 * v2        -- dot product
 -- v1 + v2        -- vector addition
@@ -183,26 +183,26 @@
 
 
 -------------------------------------------------------------------------------
--- Rotation (any axis).
+-- Rotation around a vector (counterclockwise if the vector points to us).
 -- @function [parent=#TRANSFORM] rotate
 -- @param #number angle
 -- @param #Vector3 axis.
 -- @return #Transform.
 
 -------------------------------------------------------------------------------
--- X-axis rotation.
+-- X-axis rotation (equivalent to `rotate(angle, vector3(-1, 0, 0))`).
 -- @function [parent=#TRANSFORM] rotateX
 -- @param #number angle
 -- @return #Transform.
 
 -------------------------------------------------------------------------------
--- Y-axis rotation.
+-- Y-axis rotation (equivalent to `rotate(angle, vector3(0, -1, 0))`).
 -- @function [parent=#TRANSFORM] rotateY
 -- @param #number angle
 -- @return #Transform.
 
 -------------------------------------------------------------------------------
--- Z-axis rotation.
+-- Z-axis rotation (equivalent to `rotate(angle, vector3(0, 0, -1))`).
 -- @function [parent=#TRANSFORM] rotateZ
 -- @param #number angle
 -- @return #Transform.

From 47cbdcba15a7e38d50ab6407c13dac6cf67d29cb Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 20 Jun 2021 00:57:41 +0200
Subject: [PATCH 1733/2859] Camera refactoring

---
 apps/openmw/mwrender/camera.cpp           | 261 +++++++++-------------
 apps/openmw/mwrender/camera.hpp           |  38 ++--
 apps/openmw/mwrender/renderingmanager.cpp |   6 +-
 apps/openmw/mwrender/renderingmanager.hpp |   2 -
 apps/openmw/mwrender/viewovershoulder.cpp |   8 +-
 apps/openmw/mwworld/worldimp.cpp          |  23 +-
 6 files changed, 143 insertions(+), 195 deletions(-)

diff --git a/apps/openmw/mwrender/camera.cpp b/apps/openmw/mwrender/camera.cpp
index d1e842790b..90f2a28329 100644
--- a/apps/openmw/mwrender/camera.cpp
+++ b/apps/openmw/mwrender/camera.cpp
@@ -56,21 +56,19 @@ namespace MWRender
       mCamera(camera),
       mAnimation(nullptr),
       mFirstPersonView(true),
-      mMode(Mode::Normal),
+      mMode(Mode::FirstPerson),
       mVanityAllowed(true),
       mStandingPreviewAllowed(Settings::Manager::getBool("preview if stand still", "Camera")),
       mDeferredRotationAllowed(Settings::Manager::getBool("deferred preview rotation", "Camera")),
       mNearest(30.f),
       mFurthest(800.f),
       mIsNearest(false),
+      mProcessViewChange(false),
       mHeight(124.f),
       mBaseCameraDistance(Settings::Manager::getFloat("third person camera distance", "Camera")),
       mPitch(0.f),
       mYaw(0.f),
       mRoll(0.f),
-      mVanityToggleQueued(false),
-      mVanityToggleQueuedValue(false),
-      mViewModeToggleQueued(false),
       mCameraDistance(0.f),
       mMaxNextCameraDistance(800.f),
       mFocalPointCurrentOffset(osg::Vec2d()),
@@ -100,7 +98,7 @@ namespace MWRender
         mCamera->removeUpdateCallback(mUpdateCallback);
     }
 
-    osg::Vec3d Camera::getFocalPoint() const
+    osg::Vec3d Camera::getTrackingNodePosition() const
     {
         if (!mTrackingNode)
             return osg::Vec3d();
@@ -108,54 +106,37 @@ namespace MWRender
         if (nodepaths.empty())
             return osg::Vec3d();
         osg::Matrix worldMat = osg::computeLocalToWorld(nodepaths[0]);
+        return worldMat.getTrans();
+    }
 
-        osg::Vec3d position = worldMat.getTrans();
-        if (isFirstPerson())
-            position.z() += mHeadBobbingOffset;
-        else
-        {
-            position.z() += mHeight * mHeightScale;
+    osg::Vec3d Camera::getThirdPersonBasePosition() const
+    {
+        osg::Vec3d position = getTrackingNodePosition();
+        position.z() += mHeight * mHeightScale;
 
-            // We subtract 10.f here and add it within focalPointOffset in order to avoid camera clipping through ceiling.
-            // Needed because character's head can be a bit higher than collision area.
-            position.z() -= 10.f;
+        // We subtract 10.f here and add it within focalPointOffset in order to avoid camera clipping through ceiling.
+        // Needed because character's head can be a bit higher than collision area.
+        position.z() -= 10.f;
 
-            position += getFocalPointOffset() + mFocalPointAdjustment;
-        }
         return position;
     }
 
     osg::Vec3d Camera::getFocalPointOffset() const
     {
         osg::Vec3d offset(0, 0, 10.f);
-        offset.x() += mFocalPointCurrentOffset.x() * cos(getYaw());
-        offset.y() += mFocalPointCurrentOffset.x() * sin(getYaw());
+        offset.x() += mFocalPointCurrentOffset.x() * cos(mYaw);
+        offset.y() += mFocalPointCurrentOffset.x() * sin(mYaw);
         offset.z() += mFocalPointCurrentOffset.y();
         return offset;
     }
 
-    void Camera::getPosition(osg::Vec3d &focal, osg::Vec3d &camera) const
-    {
-        focal = getFocalPoint();
-        osg::Vec3d offset(0,0,0);
-        if (!isFirstPerson())
-        {
-            osg::Quat orient =  osg::Quat(getPitch(), osg::Vec3d(1,0,0)) * osg::Quat(getYaw(), osg::Vec3d(0,0,1));
-            offset = orient * osg::Vec3d(0.f, -mCameraDistance, 0.f);
-        }
-        camera = focal + offset;
-    }
-
     void Camera::updateCamera(osg::Camera *cam)
     {
-        osg::Vec3d focal, position;
-        getPosition(focal, position);
-
         osg::Quat orient = osg::Quat(mRoll, osg::Vec3d(0, 1, 0)) * osg::Quat(mPitch, osg::Vec3d(1, 0, 0)) * osg::Quat(mYaw, osg::Vec3d(0, 0, 1));
         osg::Vec3d forward = orient * osg::Vec3d(0,1,0);
         osg::Vec3d up = orient * osg::Vec3d(0,0,1);
 
-        cam->setViewMatrixAsLookAt(position, position + forward, up);
+        cam->setViewMatrixAsLookAt(mPosition, mPosition + forward, up);
     }
 
     void Camera::updateHeadBobbing(float duration) {
@@ -176,42 +157,12 @@ namespace MWRender
         mRoll = osg::sign(stepState) * effect * coef * maxRoll; // range from -maxRoll to maxRoll
     }
 
-    void Camera::reset()
-    {
-        togglePreviewMode(false);
-        toggleVanityMode(false);
-        if (!mFirstPersonView)
-            toggleViewMode();
-    }
-
-    void Camera::rotateCamera(float pitch, float yaw, bool adjust)
-    {
-        if (adjust)
-        {
-            pitch += getPitch();
-            yaw += getYaw();
-        }
-        setYaw(yaw);
-        setPitch(pitch);
-    }
-
     void Camera::update(float duration, bool paused)
     {
-        if (mAnimation->upperBodyReady())
-        {
-            // Now process the view changes we queued earlier
-            if (mVanityToggleQueued)
-            {
-                toggleVanityMode(mVanityToggleQueuedValue);
-                mVanityToggleQueued = false;
-            }
-            if (mViewModeToggleQueued)
-            {
-                togglePreviewMode(false);
-                toggleViewMode();
-                mViewModeToggleQueued = false;
-            }
-        }
+        if (mQueuedMode && mAnimation->upperBodyReady())
+            setMode(*mQueuedMode);
+        if (mProcessViewChange)
+            processViewChange();
 
         if (paused)
             return;
@@ -222,9 +173,9 @@ namespace MWRender
                           && (mFirstPersonView || mShowCrosshairInThirdPersonMode));
 
         if(mMode == Mode::Vanity)
-            rotateCamera(0.f, osg::DegreesToRadians(3.f * duration), true);
+            setYaw(mYaw + osg::DegreesToRadians(3.f) * duration);
 
-        if (isFirstPerson() && mHeadBobbingEnabled)
+        if (mMode == Mode::FirstPerson && mHeadBobbingEnabled)
             updateHeadBobbing(duration);
         else
             mRoll = mHeadBobbingOffset = 0;
@@ -244,19 +195,24 @@ namespace MWRender
 
     void Camera::updatePosition()
     {
-        mFocalPointAdjustment = osg::Vec3d();
-        if (isFirstPerson())
+        if (mMode == Mode::Static)
             return;
+        if (mMode == Mode::FirstPerson)
+        {
+            mPosition = getTrackingNodePosition();
+            mPosition.z() += mHeadBobbingOffset;
+            return;
+        }
 
-        const float cameraObstacleLimit = 5.0f;
-        const float focalObstacleLimit = 10.f;
-        const int collisionType = (MWPhysics::CollisionType::CollisionType_Default & ~MWPhysics::CollisionType::CollisionType_Actor);
+        constexpr float cameraObstacleLimit = 5.0f;
+        constexpr float focalObstacleLimit = 10.f;
 
         const auto* rayCasting = MWBase::Environment::get().getWorld()->getRayCasting();
+        constexpr int collisionType = (MWPhysics::CollisionType::CollisionType_Default & ~MWPhysics::CollisionType::CollisionType_Actor);
 
         // Adjust focal point to prevent clipping.
-        osg::Vec3d focal = getFocalPoint();
         osg::Vec3d focalOffset = getFocalPointOffset();
+        osg::Vec3d focal = getThirdPersonBasePosition() + focalOffset;
         float offsetLen = focalOffset.length();
         if (offsetLen > 0)
         {
@@ -264,39 +220,73 @@ namespace MWRender
             if (result.mHit)
             {
                 double adjustmentCoef = -(result.mHitPos + result.mHitNormal * focalObstacleLimit - focal).length() / offsetLen;
-                mFocalPointAdjustment = focalOffset * std::max(-1.0, adjustmentCoef);
+                focal += focalOffset * std::max(-1.0, adjustmentCoef);
             }
         }
 
-        // Calculate camera distance.
+        // Calculate offset from focal point.
         mCameraDistance = mBaseCameraDistance + getCameraDistanceCorrection();
         if (mDynamicCameraDistanceEnabled)
             mCameraDistance = std::min(mCameraDistance, mMaxNextCameraDistance);
-        osg::Vec3d cameraPos;
-        getPosition(focal, cameraPos);
-        MWPhysics::RayCastingResult result = rayCasting->castSphere(focal, cameraPos, cameraObstacleLimit, collisionType);
+
+        osg::Quat orient =  osg::Quat(getPitch(), osg::Vec3d(1,0,0)) * osg::Quat(getYaw(), osg::Vec3d(0,0,1));
+        osg::Vec3d offset = orient * osg::Vec3d(0.f, -mCameraDistance, 0.f);
+        MWPhysics::RayCastingResult result = rayCasting->castSphere(focal, focal + offset, cameraObstacleLimit, collisionType);
         if (result.mHit)
+        {
             mCameraDistance = (result.mHitPos + result.mHitNormal * cameraObstacleLimit - focal).length();
+            offset = orient * osg::Vec3d(0.f, -mCameraDistance, 0.f);
+        }
+
+        mPosition = focal + offset;
     }
 
-    void Camera::updateStandingPreviewMode()
+    void Camera::setMode(Mode newMode, bool force)
     {
-        if (!mStandingPreviewAllowed)
+        if (newMode == Mode::StandingPreview)
+            newMode = Mode::ThirdPerson;
+        if (mMode == newMode)
+            return;
+        Mode oldMode = mMode;
+        if (!force && (newMode == Mode::FirstPerson || oldMode == Mode::FirstPerson) && !mAnimation->upperBodyReady())
+        {
+            // Changing the view will stop all playing animations, so if we are playing
+            // anything important, queue the view change for later
+            mQueuedMode = newMode;
             return;
+        }
+        mMode = newMode;
+        mQueuedMode = std::nullopt;
+        if (newMode == Mode::FirstPerson)
+            mFirstPersonView = true;
+        else if (newMode == Mode::ThirdPerson)
+            mFirstPersonView = false;
+        calculateDeferredRotation();
+        if (oldMode == Mode::FirstPerson || newMode == Mode::FirstPerson)
+        {
+            instantTransition();
+            mProcessViewChange = true;
+        }
+        else if (newMode == Mode::ThirdPerson)
+            updateStandingPreviewMode();
+    }
+
+    void Camera::updateStandingPreviewMode()
+    {
         float speed = mTrackingPtr.getClass().getCurrentSpeed(mTrackingPtr);
         bool combat = mTrackingPtr.getClass().isActor() &&
                       mTrackingPtr.getClass().getCreatureStats(mTrackingPtr).getDrawState() != MWMechanics::DrawState_Nothing;
-        bool standingStill = speed == 0 && !combat && !mFirstPersonView;
+        bool standingStill = speed == 0 && !combat && mStandingPreviewAllowed;
         if (!standingStill && mMode == Mode::StandingPreview)
         {
-            mMode = Mode::Normal;
+            mMode = Mode::ThirdPerson;
             calculateDeferredRotation();
         }
-        else if (standingStill && mMode == Mode::Normal)
+        else if (standingStill && mMode == Mode::ThirdPerson)
             mMode = Mode::StandingPreview;
     }
 
-    void Camera::setFocalPointTargetOffset(osg::Vec2d v)
+    void Camera::setFocalPointTargetOffset(const osg::Vec2d& v)
     {
         mFocalPointTargetOffset = v;
         mPreviousTransitionSpeed = mFocalPointTransitionSpeed;
@@ -346,78 +336,35 @@ namespace MWRender
 
     void Camera::toggleViewMode(bool force)
     {
-        // Changing the view will stop all playing animations, so if we are playing
-        // anything important, queue the view change for later
-        if (!mAnimation->upperBodyReady() && !force)
-        {
-            mViewModeToggleQueued = true;
-            return;
-        }
-        else
-            mViewModeToggleQueued = false;
-
-        mFirstPersonView = !mFirstPersonView;
-        updateStandingPreviewMode();
-        instantTransition();
-        processViewChange();
+        setMode(mFirstPersonView ? Mode::ThirdPerson : Mode::FirstPerson, force);
     }
 
     void Camera::allowVanityMode(bool allow)
     {
         if (!allow && mMode == Mode::Vanity)
-        {
-            disableDeferredPreviewRotation();
             toggleVanityMode(false);
-        }
         mVanityAllowed = allow;
     }
 
     bool Camera::toggleVanityMode(bool enable)
     {
-        // Changing the view will stop all playing animations, so if we are playing
-        // anything important, queue the view change for later
-        if (mFirstPersonView && !mAnimation->upperBodyReady())
-        {
-            mVanityToggleQueued = true;
-            mVanityToggleQueuedValue = enable;
-            return false;
-        }
-
-        if (!mVanityAllowed && enable)
-            return false;
-
-        if ((mMode == Mode::Vanity) == enable)
-            return true;
-        mMode = enable ? Mode::Vanity : Mode::Normal;
-        if (!mDeferredRotationAllowed)
-            disableDeferredPreviewRotation();
         if (!enable)
-            calculateDeferredRotation();
-
-        processViewChange();
-        return true;
+            setMode(mFirstPersonView ? Mode::FirstPerson : Mode::ThirdPerson, false);
+        else if (mVanityAllowed)
+            setMode(Mode::Vanity, false);
+        return (mMode == Mode::Vanity) == enable;
     }
 
     void Camera::togglePreviewMode(bool enable)
     {
         if (mFirstPersonView && !mAnimation->upperBodyReady())
             return;
-
-        if((mMode == Mode::Preview) == enable)
+        if ((mMode == Mode::Preview) == enable)
             return;
-
-        mMode = enable ? Mode::Preview : Mode::Normal;
-        if (mMode == Mode::Normal)
-            updateStandingPreviewMode();
-        else if (mFirstPersonView)
-            instantTransition();
-        if (mMode == Mode::Normal)
-        {
-            if (!mDeferredRotationAllowed)
-                disableDeferredPreviewRotation();
-            calculateDeferredRotation();
-        }
-        processViewChange();
+        if (enable)
+            setMode(Mode::Preview);
+        else
+            setMode(mFirstPersonView ? Mode::FirstPerson : Mode::ThirdPerson);
     }
 
     void Camera::setSneakOffset(float offset)
@@ -439,16 +386,16 @@ namespace MWRender
 
     float Camera::getCameraDistance() const
     {
-        if (isFirstPerson())
-            return 0.f;
-        return mCameraDistance;
+        return mMode == Mode::FirstPerson ? 0.f : mCameraDistance;
     }
 
     void Camera::adjustCameraDistance(float delta)
     {
-        if (!isFirstPerson())
+        if (mMode == Mode::Static)
+            return;
+        if (mMode != Mode::FirstPerson)
         {
-            if(isNearest() && delta < 0.f && getMode() != Mode::Preview && getMode() != Mode::Vanity)
+            if (mIsNearest && delta < 0.f && mMode != Mode::Preview && mMode != Mode::Vanity)
                 toggleViewMode();
             else
                 mBaseCameraDistance = std::min(mCameraDistance - getCameraDistanceCorrection(), mBaseCameraDistance) + delta;
@@ -480,12 +427,12 @@ namespace MWRender
     void Camera::setAnimation(NpcAnimation *anim)
     {
         mAnimation = anim;
-        processViewChange();
+        mProcessViewChange = true;
     }
 
     void Camera::processViewChange()
     {
-        if(isFirstPerson())
+        if (mMode == Mode::FirstPerson)
         {
             mAnimation->setViewMode(NpcAnimation::VM_FirstPerson);
             mTrackingNode = mAnimation->getNode("Camera");
@@ -503,12 +450,12 @@ namespace MWRender
             else
                 mHeightScale = 1.f;
         }
-        rotateCamera(getPitch(), getYaw(), false);
+        mProcessViewChange = false;
     }
 
     void Camera::applyDeferredPreviewRotationToPlayer(float dt)
     {
-        if (isVanityOrPreviewModeEnabled() || mTrackingPtr.isEmpty())
+        if (mMode != Mode::ThirdPerson || mTrackingPtr.isEmpty())
             return;
 
         osg::Vec3f rot = mDeferredRotation;
@@ -541,6 +488,8 @@ namespace MWRender
 
     void Camera::rotateCameraToTrackingPtr()
     {
+        if (mMode == Mode::Static)
+            return;
         setPitch(-mTrackingPtr.getRefData().getPosition().rot[0] - mDeferredRotation.x());
         setYaw(-mTrackingPtr.getRefData().getPosition().rot[2] - mDeferredRotation.z());
     }
@@ -555,8 +504,13 @@ namespace MWRender
 
     void Camera::calculateDeferredRotation()
     {
+        if (mMode == Mode::Static)
+        {
+            mDeferredRotation = osg::Vec3f();
+            return;
+        }
         MWWorld::Ptr ptr = mTrackingPtr;
-        if (isVanityOrPreviewModeEnabled() || ptr.isEmpty())
+        if (mMode == Mode::Preview || mMode == Mode::Vanity || ptr.isEmpty())
             return;
         if (mFirstPersonView)
         {
@@ -566,6 +520,13 @@ namespace MWRender
 
         mDeferredRotation.x() = Misc::normalizeAngle(-ptr.getRefData().getPosition().rot[0] - mPitch);
         mDeferredRotation.z() = Misc::normalizeAngle(-ptr.getRefData().getPosition().rot[2] - mYaw);
+        if (!mDeferredRotationAllowed)
+            mDeferredRotationDisabled = true;
+    }
+
+    bool Camera::isVanityOrPreviewModeEnabled() const
+    {
+        return mMode == Mode::Vanity || mMode == Mode::Preview || mMode == Mode::StandingPreview;
     }
 
 }
diff --git a/apps/openmw/mwrender/camera.hpp b/apps/openmw/mwrender/camera.hpp
index 1a5477e89c..cf25aa4852 100644
--- a/apps/openmw/mwrender/camera.hpp
+++ b/apps/openmw/mwrender/camera.hpp
@@ -1,6 +1,7 @@
 #ifndef GAME_MWRENDER_CAMERA_H
 #define GAME_MWRENDER_CAMERA_H
 
+#include <optional>
 #include <string>
 
 #include <osg/ref_ptr>
@@ -24,7 +25,7 @@ namespace MWRender
     class Camera
     {
     public:
-        enum class Mode { Normal, Vanity, Preview, StandingPreview };
+        enum class Mode : int {Static = 0, FirstPerson = 1, ThirdPerson = 2, Vanity = 3, Preview = 4, StandingPreview = 5};
 
     private:
         MWWorld::Ptr mTrackingPtr;
@@ -35,8 +36,12 @@ namespace MWRender
 
         NpcAnimation *mAnimation;
 
+        // Always 'true' if mMode == `FirstPerson`. Also it is 'true' in `Vanity` or `Preview` modes if
+        // the camera should return to `FirstPerson` view after it.
         bool mFirstPersonView;
+
         Mode mMode;
+        std::optional<Mode> mQueuedMode;
         bool mVanityAllowed;
         bool mStandingPreviewAllowed;
         bool mDeferredRotationAllowed;
@@ -45,17 +50,15 @@ namespace MWRender
         float mFurthest;
         bool mIsNearest;
 
+        bool mProcessViewChange;
+
         float mHeight, mBaseCameraDistance;
         float mPitch, mYaw, mRoll;
-
-        bool mVanityToggleQueued;
-        bool mVanityToggleQueuedValue;
-        bool mViewModeToggleQueued;
+        osg::Vec3d mPosition;
 
         float mCameraDistance;
         float mMaxNextCameraDistance;
 
-        osg::Vec3d mFocalPointAdjustment;
         osg::Vec2d mFocalPointCurrentOffset;
         osg::Vec2d mFocalPointTargetOffset;
         float mFocalPointTransitionSpeedCoef;
@@ -78,6 +81,8 @@ namespace MWRender
         float mTotalMovement; // Needed for head bobbing.
         void updateHeadBobbing(float duration);
 
+        osg::Vec3d getTrackingNodePosition() const;
+        osg::Vec3d getFocalPointOffset() const;
         void updateFocalPointOffset(float duration);
         void updatePosition();
         float getCameraDistanceCorrection() const;
@@ -99,7 +104,7 @@ namespace MWRender
         MWWorld::Ptr getTrackingPtr() const { return mTrackingPtr; }
 
         void setFocalPointTransitionSpeed(float v) { mFocalPointTransitionSpeedCoef = v; }
-        void setFocalPointTargetOffset(osg::Vec2d v);
+        void setFocalPointTargetOffset(const osg::Vec2d& v);
         void instantTransition();
         void enableDynamicCameraDistance(bool v) { mDynamicCameraDistanceEnabled = v; }
         void enableCrosshairInThirdPersonMode(bool v) { mShowCrosshairInThirdPersonMode = v; }
@@ -108,11 +113,8 @@ namespace MWRender
         void updateCamera(osg::Camera* cam);
 
         /// Reset to defaults
-        void reset();
+        void reset() { setMode(Mode::FirstPerson); }
 
-        /// Set where the camera is looking at. Uses Morrowind (euler) angles
-        /// \param rot Rotation angles in radians
-        void rotateCamera(float pitch, float yaw, bool adjust);
         void rotateCameraToTrackingPtr();
 
         float getYaw() const { return mYaw; }
@@ -136,8 +138,6 @@ namespace MWRender
         /// \brief Lowers the camera for sneak.
         void setSneakOffset(float offset);
 
-        bool isFirstPerson() const { return mFirstPersonView && mMode == Mode::Normal; }
-
         void processViewChange();
 
         void update(float duration, bool paused=false);
@@ -149,16 +149,12 @@ namespace MWRender
 
         void setAnimation(NpcAnimation *anim);
 
-        osg::Vec3d getFocalPoint() const;
-        osg::Vec3d getFocalPointOffset() const;
-
-        /// Stores focal and camera world positions in passed arguments
-        void getPosition(osg::Vec3d &focal, osg::Vec3d &camera) const;
+        osg::Vec3d getThirdPersonBasePosition() const;
+        const osg::Vec3d& getPosition() const { return mPosition; }
 
-        bool isVanityOrPreviewModeEnabled() const { return mMode != Mode::Normal; }
+        bool isVanityOrPreviewModeEnabled() const;
         Mode getMode() const { return mMode; }
-
-        bool isNearest() const { return mIsNearest; }
+        void setMode(Mode mode, bool force = true);
     };
 }
 
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 2ba18378f9..0542d8ed90 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -830,11 +830,7 @@ namespace MWRender
             mViewOverShoulderController->update();
         mCamera->update(dt, paused);
 
-        osg::Vec3d focal, cameraPos;
-        mCamera->getPosition(focal, cameraPos);
-        mCurrentCameraPos = cameraPos;
-
-        bool isUnderwater = mWater->isUnderwater(cameraPos);
+        bool isUnderwater = mWater->isUnderwater(mCamera->getPosition());
         mStateUpdater->setFogStart(mFog->getFogStart(isUnderwater));
         mStateUpdater->setFogEnd(mFog->getFogEnd(isUnderwater));
         setFogColor(mFog->getFogColor(isUnderwater));
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index 99d0bb5f5e..672f48c64f 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -207,7 +207,6 @@ namespace MWRender
 
         // camera stuff
         Camera* getCamera() { return mCamera.get(); }
-        const osg::Vec3f& getCameraPosition() const { return mCurrentCameraPos; }
 
         /// temporarily override the field of view with given value.
         void overrideFieldOfView(float val);
@@ -285,7 +284,6 @@ namespace MWRender
         osg::ref_ptr<SceneUtil::PositionAttitudeTransform> mPlayerNode;
         std::unique_ptr<Camera> mCamera;
         std::unique_ptr<ViewOverShoulderController> mViewOverShoulderController;
-        osg::Vec3f mCurrentCameraPos;
 
         osg::ref_ptr<StateUpdater> mStateUpdater;
         osg::ref_ptr<SharedUniformStateUpdater> mSharedUniformStateUpdater;
diff --git a/apps/openmw/mwrender/viewovershoulder.cpp b/apps/openmw/mwrender/viewovershoulder.cpp
index 799e34c992..bd45480cf3 100644
--- a/apps/openmw/mwrender/viewovershoulder.cpp
+++ b/apps/openmw/mwrender/viewovershoulder.cpp
@@ -33,7 +33,7 @@ namespace MWRender
 
     void ViewOverShoulderController::update()
     {
-        if (mCamera->isFirstPerson())
+        if (mCamera->getMode() == Camera::Mode::FirstPerson || mCamera->getMode() == Camera::Mode::Static)
             return;
 
         Mode oldMode = mMode;
@@ -54,7 +54,7 @@ namespace MWRender
         if (mCamera->getMode() == Camera::Mode::Vanity)
             // Player doesn't touch controls for a long time. Transition should be very slow.
             mCamera->setFocalPointTransitionSpeed(0.2f);
-        else if ((oldMode == Mode::Combat || mMode == Mode::Combat) && mCamera->getMode() == Camera::Mode::Normal)
+        else if ((oldMode == Mode::Combat || mMode == Mode::Combat) && mCamera->getMode() == Camera::Mode::ThirdPerson)
             // Transition to/from combat mode and we are not it preview mode. Should be fast.
             mCamera->setFocalPointTransitionSpeed(5.f);
         else
@@ -77,14 +77,14 @@ namespace MWRender
 
     void ViewOverShoulderController::trySwitchShoulder()
     {
-        if (mCamera->getMode() != Camera::Mode::Normal)
+        if (mCamera->getMode() != Camera::Mode::ThirdPerson)
             return;
 
         const float limitToSwitch = 120; // switch to other shoulder if wall is closer than this limit
         const float limitToSwitchBack = 300; // switch back to default shoulder if there is no walls at this distance
 
         auto orient = osg::Quat(mCamera->getYaw(), osg::Vec3d(0,0,1));
-        osg::Vec3d playerPos = mCamera->getFocalPoint() - mCamera->getFocalPointOffset();
+        osg::Vec3d playerPos = mCamera->getThirdPersonBasePosition();
 
         MWBase::World* world = MWBase::Environment::get().getWorld();
         osg::Vec3d sideOffset = orient * osg::Vec3d(world->getHalfExtents(mCamera->getTrackingPtr()).x() - 1, 0, 0);
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index f434d059da..71f44f125d 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -595,13 +595,7 @@ namespace MWWorld
 
     void World::useDeathCamera()
     {
-        if(mRendering->getCamera()->isVanityOrPreviewModeEnabled() )
-        {
-            mRendering->getCamera()->togglePreviewMode(false);
-            mRendering->getCamera()->toggleVanityMode(false);
-        }
-        if(mRendering->getCamera()->isFirstPerson())
-            mRendering->getCamera()->toggleViewMode(true);
+        mRendering->getCamera()->setMode(MWRender::Camera::Mode::ThirdPerson);
     }
 
     MWWorld::Player& World::getPlayer()
@@ -1858,7 +1852,7 @@ namespace MWWorld
         }
 
         bool isWerewolf = player.getClass().getNpcStats(player).isWerewolf();
-        bool isFirstPerson = mRendering->getCamera()->isFirstPerson();
+        bool isFirstPerson = this->isFirstPerson();
         if (isWerewolf && isFirstPerson)
         {
             float werewolfFov = Fallback::Map::getFloat("General_Werewolf_FOV");
@@ -1928,11 +1922,12 @@ namespace MWWorld
 
     void World::updateSoundListener()
     {
+        osg::Vec3f cameraPosition = mRendering->getCamera()->getPosition();
         const ESM::Position& refpos = getPlayerPtr().getRefData().getPosition();
         osg::Vec3f listenerPos;
 
         if (isFirstPerson())
-            listenerPos = mRendering->getCameraPosition();
+            listenerPos = cameraPosition;
         else
             listenerPos = refpos.asVec3() + osg::Vec3f(0, 0, 1.85f * mPhysics->getHalfExtents(getPlayerPtr()).z());
 
@@ -1943,7 +1938,7 @@ namespace MWWorld
         osg::Vec3f forward = listenerOrient * osg::Vec3f(0,1,0);
         osg::Vec3f up = listenerOrient * osg::Vec3f(0,0,1);
 
-        bool underwater = isUnderwater(getPlayerPtr().getCell(), mRendering->getCameraPosition());
+        bool underwater = isUnderwater(getPlayerPtr().getCell(), cameraPosition);
 
         MWBase::Environment::get().getSoundManager()->setListenerPosDir(listenerPos, forward, up, underwater);
     }
@@ -2395,7 +2390,7 @@ namespace MWWorld
 
     bool World::isFirstPerson() const
     {
-        return mRendering->getCamera()->isFirstPerson();
+        return mRendering->getCamera()->getMode() == MWRender::Camera::Mode::FirstPerson;
     }
     
     bool World::isPreviewModeEnabled() const
@@ -2430,10 +2425,12 @@ namespace MWWorld
 
     bool World::vanityRotateCamera(float * rot)
     {
-        if(!mRendering->getCamera()->isVanityOrPreviewModeEnabled())
+        auto* camera = mRendering->getCamera();
+        if(!camera->isVanityOrPreviewModeEnabled())
             return false;
 
-        mRendering->getCamera()->rotateCamera(rot[0], rot[2], true);
+        camera->setPitch(camera->getPitch() + rot[0]);
+        camera->setYaw(camera->getYaw() + rot[2]);
         return true;
     }
 

From e56ee2c73519f26afa728860bb6bc23813a24774 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Wed, 17 Nov 2021 03:05:50 +0100
Subject: [PATCH 1734/2859] Apply lua handlers for user input in the main
 thread in order to reduce latency.

---
 apps/openmw/engine.cpp                        |  5 +++-
 apps/openmw/mwlua/luamanagerimp.cpp           | 23 +++++++++++--------
 apps/openmw/mwlua/luamanagerimp.hpp           |  2 +-
 apps/openmw/mwlua/playerscripts.hpp           |  5 +++-
 .../lua-scripting/engine_handlers.rst         |  5 +++-
 5 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 67944e4546..70d5a26c7a 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -293,6 +293,10 @@ bool OMW::Engine::frame(float frametime)
         // Main menu opened? Then scripts are also paused.
         bool paused = mEnvironment.getWindowManager()->containsMode(MWGui::GM_MainMenu);
 
+        // Should be called after input manager update and before any change to the game world.
+        // It applies to the game world queued changes from the previous frame.
+        mLuaManager->synchronizedUpdate(paused, frametime);
+
         // update game state
         {
             ScopedProfile<UserStatsType::State> profile(frameStart, frameNumber, *timer, *stats);
@@ -874,7 +878,6 @@ public:
         }
         else
             update();
-        mEngine->mLuaManager->applyQueuedChanges();
     };
 
     void join()
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index dae11513b5..f55ca20f02 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -132,14 +132,6 @@ namespace MWLua
         mQueuedCallbacks.clear();
 
         // Engine handlers in local scripts
-        PlayerScripts* playerScripts = dynamic_cast<PlayerScripts*>(mPlayer.getRefData().getLuaScripts());
-        if (playerScripts && !paused)
-        {
-            for (const auto& event : mInputEvents)
-                playerScripts->processInputEvent(event);
-        }
-        mInputEvents.clear();
-
         for (const LocalEngineEvent& e : mLocalEngineEvents)
         {
             LObject obj(e.mDest, objectRegistry);
@@ -180,8 +172,21 @@ namespace MWLua
             mGlobalScripts.update(dt);
     }
 
-    void LuaManager::applyQueuedChanges()
+    void LuaManager::synchronizedUpdate(bool paused, float dt)
     {
+        if (mPlayer.isEmpty())
+            return;  // The game is not started yet.
+
+        // We apply input events in `synchronizedUpdate` rather than in `update` in order to reduce input latency.
+        PlayerScripts* playerScripts = dynamic_cast<PlayerScripts*>(mPlayer.getRefData().getLuaScripts());
+        if (playerScripts && !paused)
+        {
+            for (const auto& event : mInputEvents)
+                playerScripts->processInputEvent(event);
+            playerScripts->inputUpdate(dt);
+        }
+        mInputEvents.clear();
+
         MWBase::WindowManager* windowManager = MWBase::Environment::get().getWindowManager();
         for (const std::string& message : mUIMessages)
             windowManager->messageBox(message);
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index f5ffe9d258..56d20c2720 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -32,7 +32,7 @@ namespace MWLua
         void update(bool paused, float dt);
 
         // Called by engine.cpp from the main thread. Can use scene graph.
-        void applyQueuedChanges();
+        void synchronizedUpdate(bool paused, float dt);
 
         // Available everywhere through the MWBase::LuaManager interface.
         // LuaManager queues these events and propagates to scripts on the next `update` call.
diff --git a/apps/openmw/mwlua/playerscripts.hpp b/apps/openmw/mwlua/playerscripts.hpp
index 0393a1375d..e8cdd120ac 100644
--- a/apps/openmw/mwlua/playerscripts.hpp
+++ b/apps/openmw/mwlua/playerscripts.hpp
@@ -17,7 +17,7 @@ namespace MWLua
         {
             registerEngineHandlers({&mKeyPressHandlers, &mKeyReleaseHandlers,
                                     &mControllerButtonPressHandlers, &mControllerButtonReleaseHandlers,
-                                    &mActionHandlers});
+                                    &mActionHandlers, &mInputUpdateHandlers});
         }
 
         void processInputEvent(const MWBase::LuaManager::InputEvent& event)
@@ -43,12 +43,15 @@ namespace MWLua
             }
         }
 
+        void inputUpdate(float dt) { callEngineHandlers(mInputUpdateHandlers, dt); }
+
     private:
         EngineHandlerList mKeyPressHandlers{"onKeyPress"};
         EngineHandlerList mKeyReleaseHandlers{"onKeyRelease"};
         EngineHandlerList mControllerButtonPressHandlers{"onControllerButtonPress"};
         EngineHandlerList mControllerButtonReleaseHandlers{"onControllerButtonRelease"};
         EngineHandlerList mActionHandlers{"onInputAction"};
+        EngineHandlerList mInputUpdateHandlers{"onInputUpdate"};
     };
 
 }
diff --git a/docs/source/reference/lua-scripting/engine_handlers.rst b/docs/source/reference/lua-scripting/engine_handlers.rst
index ef74684182..4f5f99965a 100644
--- a/docs/source/reference/lua-scripting/engine_handlers.rst
+++ b/docs/source/reference/lua-scripting/engine_handlers.rst
@@ -10,7 +10,7 @@ Engine handler is a function defined by a script, that can be called by the engi
 |                                  | | `be assigned to a script in openmw-cs (not yet implemented)`.      |
 |                                  | | ``onInterfaceOverride`` can be called before ``onInit``.           |
 +----------------------------------+----------------------------------------------------------------------+
-| onUpdate(dt)                     | | Called every frame if game not paused. `dt` is the time            |
+| onUpdate(dt)                     | | Called every frame if the game is not paused. `dt` is the time     |
 |                                  | | from the last update in seconds.                                   |
 +----------------------------------+----------------------------------------------------------------------+
 | onSave() -> savedData            | | Called when the game is saving. May be called in inactive          |
@@ -44,6 +44,9 @@ Engine handler is a function defined by a script, that can be called by the engi
 +----------------------------------+----------------------------------------------------------------------+
 | **Only for local scripts attached to a player**                                                         |
 +----------------------------------+----------------------------------------------------------------------+
+| onInputUpdate(dt)                | | Called every frame (if the game is not paused) right after         |
+|                                  | | processing user input. Use it only for latency-critical stuff.     |
++----------------------------------+----------------------------------------------------------------------+
 | onKeyPress(key)                  | | `Key <openmw_input.html##(KeyboardEvent)>`_ is pressed.            |
 |                                  | | Usage example: ``if key.symbol == 'z' and key.withShift then ...`` |
 +----------------------------------+----------------------------------------------------------------------+

From f42badd7be5a7f38f25abf911b695434921e1671 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Mon, 14 Jun 2021 19:58:04 +0200
Subject: [PATCH 1735/2859] Dehardcode camera

---
 apps/openmw/mwbase/world.hpp                  |   5 +-
 apps/openmw/mwinput/actionmanager.cpp         |  55 +----
 apps/openmw/mwinput/actionmanager.hpp         |   5 -
 apps/openmw/mwinput/controllermanager.cpp     |  32 +--
 apps/openmw/mwinput/controllermanager.hpp     |   2 -
 apps/openmw/mwinput/controlswitch.cpp         |   4 -
 apps/openmw/mwlua/camerabindings.cpp          |  72 +++++-
 apps/openmw/mwlua/luabindings.cpp             |   2 +-
 apps/openmw/mwrender/camera.cpp               | 231 +++++-------------
 apps/openmw/mwrender/camera.hpp               | 163 ++++++------
 apps/openmw/mwrender/renderingmanager.cpp     |   5 -
 apps/openmw/mwrender/renderingmanager.hpp     |   2 -
 apps/openmw/mwrender/viewovershoulder.cpp     | 110 ---------
 apps/openmw/mwrender/viewovershoulder.hpp     |  30 ---
 apps/openmw/mwworld/worldimp.cpp              |  15 +-
 apps/openmw/mwworld/worldimp.hpp              |   5 +-
 files/builtin_scripts/builtin.omwscripts      |   1 +
 files/builtin_scripts/scripts/omw/camera.lua  | 221 +++++++++++++++++
 .../scripts/omw/head_bobbing.lua              |  51 ++++
 .../scripts/omw/third_person.lua              | 139 +++++++++++
 files/openmw.cfg                              |   1 +
 files/openmw.cfg.local                        |   1 +
 22 files changed, 638 insertions(+), 514 deletions(-)
 delete mode 100644 apps/openmw/mwrender/viewovershoulder.cpp
 delete mode 100644 apps/openmw/mwrender/viewovershoulder.hpp
 create mode 100644 files/builtin_scripts/builtin.omwscripts
 create mode 100644 files/builtin_scripts/scripts/omw/camera.lua
 create mode 100644 files/builtin_scripts/scripts/omw/head_bobbing.lua
 create mode 100644 files/builtin_scripts/scripts/omw/third_person.lua

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index c1a8d09120..d1747a2e39 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -62,6 +62,7 @@ namespace MWPhysics
 namespace MWRender
 {
     class Animation;
+    class Camera;
 }
 
 namespace MWMechanics
@@ -433,14 +434,12 @@ namespace MWBase
 
             virtual osg::Matrixf getActorHeadTransform(const MWWorld::ConstPtr& actor) const = 0;
 
+            virtual MWRender::Camera* getCamera() = 0;
             virtual void togglePOV(bool force = false) = 0;
             virtual bool isFirstPerson() const = 0;
             virtual bool isPreviewModeEnabled() const = 0;
-            virtual void togglePreviewMode(bool enable) = 0;
             virtual bool toggleVanityMode(bool enable) = 0;
-            virtual void allowVanityMode(bool allow) = 0;
             virtual bool vanityRotateCamera(float * rot) = 0;
-            virtual void adjustCameraDistance(float dist) = 0;
             virtual void applyDeferredPreviewRotationToPlayer(float dt) = 0;
             virtual void disableDeferredPreviewRotation() = 0;
 
diff --git a/apps/openmw/mwinput/actionmanager.cpp b/apps/openmw/mwinput/actionmanager.cpp
index e080437d92..59bdc37bb8 100644
--- a/apps/openmw/mwinput/actionmanager.cpp
+++ b/apps/openmw/mwinput/actionmanager.cpp
@@ -27,7 +27,6 @@
 
 namespace MWInput
 {
-    const float ZOOM_SCALE = 10.f; /// Used for scrolling camera in and out
 
     ActionManager::ActionManager(BindingsManager* bindingsManager,
             osgViewer::ScreenCaptureHandler::CaptureOperation* screenCaptureOperation,
@@ -41,7 +40,6 @@ namespace MWInput
         , mSneaking(false)
         , mAttemptJump(false)
         , mOverencumberedMessageDelay(0.f)
-        , mPreviewPOVDelay(0.f)
         , mTimeIdle(0.f)
     {
     }
@@ -109,27 +107,6 @@ namespace MWInput
                 }
             }
 
-            if (MWBase::Environment::get().getInputManager()->getControlSwitch("playerviewswitch"))
-            {
-                const float switchLimit = 0.25;
-                MWBase::World* world = MWBase::Environment::get().getWorld();
-                if (mBindingsManager->actionIsActive(A_TogglePOV))
-                {
-                    if (world->isFirstPerson() ? mPreviewPOVDelay > switchLimit : mPreviewPOVDelay == 0)
-                        world->togglePreviewMode(true);
-                    mPreviewPOVDelay += dt;
-                }
-                else
-                {
-                    //disable preview mode
-                    if (mPreviewPOVDelay > 0)
-                        world->togglePreviewMode(false);
-                    if (mPreviewPOVDelay > 0.f && mPreviewPOVDelay <= switchLimit)
-                        world->togglePOV();
-                    mPreviewPOVDelay = 0.f;
-                }
-            }
-
             if (triedToMove)
                 MWBase::Environment::get().getInputManager()->resetIdleTime();
 
@@ -162,38 +139,16 @@ namespace MWInput
             resetIdleTime();
         }
         else
-        {
-            updateIdleTime(dt);
-        }
+            mTimeIdle += dt;
 
         mAttemptJump = false;
     }
-    
-    bool ActionManager::isPreviewModeEnabled()
-    {
-        return MWBase::Environment::get().getWorld()->isPreviewModeEnabled();
-    }
 
     void ActionManager::resetIdleTime()
     {
-        if (mTimeIdle < 0)
-            MWBase::Environment::get().getWorld()->toggleVanityMode(false);
         mTimeIdle = 0.f;
     }
 
-    void ActionManager::updateIdleTime(float dt)
-    {
-        static const float vanityDelay = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>()
-                .find("fVanityDelay")->mValue.getFloat();
-        if (mTimeIdle >= 0.f)
-            mTimeIdle += dt;
-        if (mTimeIdle > vanityDelay)
-        {
-            MWBase::Environment::get().getWorld()->toggleVanityMode(true);
-            mTimeIdle = -1.f;
-        }
-    }
-
     void ActionManager::executeAction(int action)
     {
         MWBase::Environment::get().getLuaManager()->inputEvent({MWBase::LuaManager::InputEvent::Action, action});
@@ -281,14 +236,6 @@ namespace MWInput
         case A_ToggleDebug:
             windowManager->toggleDebugWindow();
             break;
-        case A_ZoomIn:
-            if (inputManager->getControlSwitch("playerviewswitch") && inputManager->getControlSwitch("playercontrols") && !windowManager->isGuiMode())
-                MWBase::Environment::get().getWorld()->adjustCameraDistance(-ZOOM_SCALE);
-            break;
-        case A_ZoomOut:
-            if (inputManager->getControlSwitch("playerviewswitch") && inputManager->getControlSwitch("playercontrols") && !windowManager->isGuiMode())
-                MWBase::Environment::get().getWorld()->adjustCameraDistance(ZOOM_SCALE);
-            break;
         case A_QuickSave:
             quickSave();
             break;
diff --git a/apps/openmw/mwinput/actionmanager.hpp b/apps/openmw/mwinput/actionmanager.hpp
index 2180e1944e..4141767bcc 100644
--- a/apps/openmw/mwinput/actionmanager.hpp
+++ b/apps/openmw/mwinput/actionmanager.hpp
@@ -55,13 +55,9 @@ namespace MWInput
 
         void setAttemptJump(bool enabled) { mAttemptJump = enabled; }
 
-        bool isPreviewModeEnabled();
-
     private:
         void handleGuiArrowKey(int action);
 
-        void updateIdleTime(float dt);
-
         BindingsManager* mBindingsManager;
         osg::ref_ptr<osgViewer::Viewer> mViewer;
         osg::ref_ptr<osgViewer::ScreenCaptureHandler> mScreenCaptureHandler;
@@ -72,7 +68,6 @@ namespace MWInput
         bool mAttemptJump;
 
         float mOverencumberedMessageDelay;
-        float mPreviewPOVDelay;
         float mTimeIdle;
     };
 }
diff --git a/apps/openmw/mwinput/controllermanager.cpp b/apps/openmw/mwinput/controllermanager.cpp
index 07aa89f554..0ed58349d6 100644
--- a/apps/openmw/mwinput/controllermanager.cpp
+++ b/apps/openmw/mwinput/controllermanager.cpp
@@ -34,12 +34,10 @@ namespace MWInput
         , mJoystickEnabled (Settings::Manager::getBool("enable controller", "Input"))
         , mGamepadCursorSpeed(Settings::Manager::getFloat("gamepad cursor speed", "Input"))
         , mSneakToggleShortcutTimer(0.f)
-        , mGamepadZoom(0)
         , mGamepadGuiCursorEnabled(true)
         , mGuiCursorEnabled(true)
         , mJoystickLastUsed(false)
         , mSneakGamepadShortcut(false)
-        , mGamepadPreviewMode(false)
     {
         if (!controllerBindingsFile.empty())
         {
@@ -85,8 +83,6 @@ namespace MWInput
 
     bool ControllerManager::update(float dt)
     {
-        mGamepadPreviewMode = mActionManager->isPreviewModeEnabled();
-
         if (mGuiCursorEnabled && !(mJoystickLastUsed && !mGamepadGuiCursorEnabled))
         {
             float xAxis = mBindingsManager->getActionValue(A_MoveLeftRight) * 2.0f - 1.0f;
@@ -115,7 +111,6 @@ namespace MWInput
         if (MWBase::Environment::get().getWindowManager()->isGuiMode()
             || MWBase::Environment::get().getStateManager()->getState() != MWBase::StateManager::State_Running)
         {
-            mGamepadZoom = 0;
             return false;
         }
 
@@ -182,15 +177,6 @@ namespace MWInput
             }
         }
 
-        if (MWBase::Environment::get().getInputManager()->getControlSwitch("playerviewswitch"))
-        {
-            if (!mBindingsManager->actionIsActive(A_TogglePOV))
-                mGamepadZoom = 0;
-
-            if (mGamepadZoom)
-                MWBase::Environment::get().getWorld()->adjustCameraDistance(-mGamepadZoom);
-        }
-
         return triedToMove;
     }
 
@@ -289,21 +275,11 @@ namespace MWInput
         {
             gamepadToGuiControl(arg);
         }
-        else
+        else if (MWBase::Environment::get().getWorld()->isPreviewModeEnabled() &&
+                (arg.axis == SDL_CONTROLLER_AXIS_TRIGGERRIGHT || arg.axis == SDL_CONTROLLER_AXIS_TRIGGERLEFT))
         {
-            if (mGamepadPreviewMode) // Preview Mode Gamepad Zooming
-            {
-                if (arg.axis == SDL_CONTROLLER_AXIS_TRIGGERRIGHT)
-                {
-                    mGamepadZoom = arg.value * 0.85f / 1000.f / 12.f;
-                    return; // Do not propagate event.
-                }
-                else if (arg.axis == SDL_CONTROLLER_AXIS_TRIGGERLEFT)
-                {
-                    mGamepadZoom = -arg.value * 0.85f / 1000.f / 12.f;
-                    return; // Do not propagate event.
-                }
-            }
+            // Preview Mode Gamepad Zooming; do not propagate to mBindingsManager
+            return;
         }
         mBindingsManager->controllerAxisMoved(deviceID, arg);
     }
diff --git a/apps/openmw/mwinput/controllermanager.hpp b/apps/openmw/mwinput/controllermanager.hpp
index 1e8ef90d0e..948b48d538 100644
--- a/apps/openmw/mwinput/controllermanager.hpp
+++ b/apps/openmw/mwinput/controllermanager.hpp
@@ -56,12 +56,10 @@ namespace MWInput
         bool mJoystickEnabled;
         float mGamepadCursorSpeed;
         float mSneakToggleShortcutTimer;
-        float mGamepadZoom;
         bool mGamepadGuiCursorEnabled;
         bool mGuiCursorEnabled;
         bool mJoystickLastUsed;
         bool mSneakGamepadShortcut;
-        bool mGamepadPreviewMode;
     };
 }
 #endif
diff --git a/apps/openmw/mwinput/controlswitch.cpp b/apps/openmw/mwinput/controlswitch.cpp
index 63d142434e..6c22e133bc 100644
--- a/apps/openmw/mwinput/controlswitch.cpp
+++ b/apps/openmw/mwinput/controlswitch.cpp
@@ -54,10 +54,6 @@ namespace MWInput
             /// \fixme maybe crouching at this time
             player.setUpDown(0);
         }
-        else if (key == "vanitymode")
-        {
-            MWBase::Environment::get().getWorld()->allowVanityMode(value);
-        }
         else if (key == "playerlooking" && !value)
         {
             MWBase::Environment::get().getWorld()->rotateObject(player.getPlayer(), osg::Vec3f());
diff --git a/apps/openmw/mwlua/camerabindings.cpp b/apps/openmw/mwlua/camerabindings.cpp
index 46bf079d65..abbd806cef 100644
--- a/apps/openmw/mwlua/camerabindings.cpp
+++ b/apps/openmw/mwlua/camerabindings.cpp
@@ -1,12 +1,82 @@
 #include "luabindings.hpp"
 
+#include "../mwrender/camera.hpp"
+
 namespace MWLua
 {
 
+    using CameraMode = MWRender::Camera::Mode;
+
     sol::table initCameraPackage(const Context& context)
     {
+        MWRender::Camera* camera = MWBase::Environment::get().getWorld()->getCamera();
+
         sol::table api(context.mLua->sol(), sol::create);
-        // TODO
+        api["MODE"] = LuaUtil::makeReadOnly(context.mLua->sol().create_table_with(
+            "Static", CameraMode::Static,
+            "FirstPerson", CameraMode::FirstPerson,
+            "ThirdPerson", CameraMode::ThirdPerson,
+            "Vanity", CameraMode::Vanity,
+            "Preview", CameraMode::Preview
+        ));
+
+        api["getMode"] = [camera]() -> int { return static_cast<int>(camera->getMode()); };
+        api["getQueuedMode"] = [camera]() -> sol::optional<int>
+        {
+            std::optional<CameraMode> mode = camera->getQueuedMode();
+            if (mode)
+                return static_cast<int>(*mode);
+            else
+                return sol::nullopt;
+        };
+        api["setMode"] = [camera](int mode, sol::optional<bool> force)
+        {
+            camera->setMode(static_cast<CameraMode>(mode), force ? *force : false);
+        };
+
+        api["allowCharacterDeferredRotation"] = [camera](bool v) { camera->allowCharacterDeferredRotation(v); };
+        api["showCrosshair"] = [camera](bool v) { camera->showCrosshair(v); };
+
+        api["getTrackedPosition"] = [camera]() -> osg::Vec3f { return camera->getTrackedPosition(); };
+        api["getPosition"] = [camera]() -> osg::Vec3f { return camera->getPosition(); };
+
+        // All angles are negated in order to make camera rotation consistent with objects rotation.
+        // TODO: Fix the inconsistency of rotation direction in camera.cpp.
+        api["getPitch"] = [camera]() { return -camera->getPitch(); };
+        api["getYaw"] = [camera]() { return -camera->getYaw(); };
+        api["getRoll"] = [camera]() { return -camera->getRoll(); };
+
+        api["setStaticPosition"] = [camera](const osg::Vec3f& pos) { camera->setStaticPosition(pos); };
+        api["setPitch"] = [camera](float v)
+        {
+            camera->setPitch(-v, true);
+            if (camera->getMode() == CameraMode::ThirdPerson)
+                camera->calculateDeferredRotation();
+        };
+        api["setYaw"] = [camera](float v)
+        {
+            camera->setYaw(-v, true);
+            if (camera->getMode() == CameraMode::ThirdPerson)
+                camera->calculateDeferredRotation();
+        };
+        api["setRoll"] = [camera](float v) { camera->setRoll(-v); };
+        api["setExtraPitch"] = [camera](float v) { camera->setExtraPitch(-v); };
+        api["setExtraYaw"] = [camera](float v) { camera->setExtraYaw(-v); };
+        api["getExtraPitch"] = [camera]() { return -camera->getExtraPitch(); };
+        api["getExtraYaw"] = [camera]() { return -camera->getExtraYaw(); };
+
+        api["getThirdPersonDistance"] = [camera]() { return camera->getCameraDistance(); };
+        api["setPreferredThirdPersonDistance"] = [camera](float v) { camera->setPreferredCameraDistance(v); };
+
+        api["getFirstPersonOffset"] = [camera]() { return camera->getFirstPersonOffset(); };
+        api["setFirstPersonOffset"] = [camera](const osg::Vec3f& v) { camera->setFirstPersonOffset(v); };
+
+        api["getFocalPreferredOffset"] = [camera]() -> osg::Vec2f { return camera->getFocalPointTargetOffset(); };
+        api["setFocalPreferredOffset"] = [camera](const osg::Vec2f& v) { camera->setFocalPointTargetOffset(v); };
+        api["getFocalTransitionSpeed"] = [camera]() { return camera->getFocalPointTransitionSpeed(); };
+        api["setFocalTransitionSpeed"] = [camera](float v) { camera->setFocalPointTransitionSpeed(v); };
+        api["instantTransition"] = [camera]() { camera->instantTransition(); };
+
         return LuaUtil::makeReadOnly(api);
     }
 
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index bf323351a3..80af77139c 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -25,7 +25,7 @@ namespace MWLua
     {
         auto* lua = context.mLua;
         sol::table api(lua->sol(), sol::create);
-        api["API_REVISION"] = 9;
+        api["API_REVISION"] = 10;
         api["quit"] = [lua]()
         {
             Log(Debug::Warning) << "Quit requested by a Lua script.\n" << lua->debugTraceback();
diff --git a/apps/openmw/mwrender/camera.cpp b/apps/openmw/mwrender/camera.cpp
index 90f2a28329..5ca102bc39 100644
--- a/apps/openmw/mwrender/camera.cpp
+++ b/apps/openmw/mwrender/camera.cpp
@@ -58,37 +58,23 @@ namespace MWRender
       mFirstPersonView(true),
       mMode(Mode::FirstPerson),
       mVanityAllowed(true),
-      mStandingPreviewAllowed(Settings::Manager::getBool("preview if stand still", "Camera")),
-      mDeferredRotationAllowed(Settings::Manager::getBool("deferred preview rotation", "Camera")),
-      mNearest(30.f),
-      mFurthest(800.f),
-      mIsNearest(false),
+      mDeferredRotationAllowed(true),
       mProcessViewChange(false),
       mHeight(124.f),
-      mBaseCameraDistance(Settings::Manager::getFloat("third person camera distance", "Camera")),
       mPitch(0.f),
       mYaw(0.f),
       mRoll(0.f),
       mCameraDistance(0.f),
-      mMaxNextCameraDistance(800.f),
+      mPreferredCameraDistance(0.f),
       mFocalPointCurrentOffset(osg::Vec2d()),
       mFocalPointTargetOffset(osg::Vec2d()),
       mFocalPointTransitionSpeedCoef(1.f),
       mSkipFocalPointTransition(true),
       mPreviousTransitionInfluence(0.f),
-      mSmoothedSpeed(0.f),
-      mZoomOutWhenMoveCoef(Settings::Manager::getFloat("zoom out when move coef", "Camera")),
-      mDynamicCameraDistanceEnabled(false),
-      mShowCrosshairInThirdPersonMode(false),
-      mHeadBobbingEnabled(Settings::Manager::getBool("head bobbing", "Camera")),
-      mHeadBobbingOffset(0.f),
-      mHeadBobbingWeight(0.f),
-      mTotalMovement(0.f),
+      mShowCrosshair(false),
       mDeferredRotation(osg::Vec3f()),
       mDeferredRotationDisabled(false)
     {
-        mCameraDistance = mBaseCameraDistance;
-
         mUpdateCallback = new UpdateRenderCameraCallback(this);
         mCamera->addUpdateCallback(mUpdateCallback);
     }
@@ -98,7 +84,7 @@ namespace MWRender
         mCamera->removeUpdateCallback(mUpdateCallback);
     }
 
-    osg::Vec3d Camera::getTrackingNodePosition() const
+    osg::Vec3d Camera::calculateTrackedPosition() const
     {
         if (!mTrackingNode)
             return osg::Vec3d();
@@ -106,59 +92,46 @@ namespace MWRender
         if (nodepaths.empty())
             return osg::Vec3d();
         osg::Matrix worldMat = osg::computeLocalToWorld(nodepaths[0]);
-        return worldMat.getTrans();
-    }
-
-    osg::Vec3d Camera::getThirdPersonBasePosition() const
-    {
-        osg::Vec3d position = getTrackingNodePosition();
-        position.z() += mHeight * mHeightScale;
-
-        // We subtract 10.f here and add it within focalPointOffset in order to avoid camera clipping through ceiling.
-        // Needed because character's head can be a bit higher than collision area.
-        position.z() -= 10.f;
-
-        return position;
+        osg::Vec3d res = worldMat.getTrans();
+        if (mMode != Mode::FirstPerson)
+            res.z() += mHeight * mHeightScale;
+        return res;
     }
 
     osg::Vec3d Camera::getFocalPointOffset() const
     {
-        osg::Vec3d offset(0, 0, 10.f);
-        offset.x() += mFocalPointCurrentOffset.x() * cos(mYaw);
-        offset.y() += mFocalPointCurrentOffset.x() * sin(mYaw);
-        offset.z() += mFocalPointCurrentOffset.y();
+        osg::Vec3d offset;
+        offset.x() = mFocalPointCurrentOffset.x() * cos(mYaw);
+        offset.y() = mFocalPointCurrentOffset.x() * sin(mYaw);
+        offset.z() = mFocalPointCurrentOffset.y();
         return offset;
     }
 
     void Camera::updateCamera(osg::Camera *cam)
     {
-        osg::Quat orient = osg::Quat(mRoll, osg::Vec3d(0, 1, 0)) * osg::Quat(mPitch, osg::Vec3d(1, 0, 0)) * osg::Quat(mYaw, osg::Vec3d(0, 0, 1));
+        osg::Quat orient = osg::Quat(mRoll, osg::Vec3d(0, 1, 0)) *
+                           osg::Quat(mPitch + mExtraPitch, osg::Vec3d(1, 0, 0)) *
+                           osg::Quat(mYaw + mExtraYaw, osg::Vec3d(0, 0, 1));
         osg::Vec3d forward = orient * osg::Vec3d(0,1,0);
         osg::Vec3d up = orient * osg::Vec3d(0,0,1);
 
-        cam->setViewMatrixAsLookAt(mPosition, mPosition + forward, up);
-    }
-
-    void Camera::updateHeadBobbing(float duration) {
-        static const float doubleStepLength = Settings::Manager::getFloat("head bobbing step", "Camera") * 2;
-        static const float stepHeight = Settings::Manager::getFloat("head bobbing height", "Camera");
-        static const float maxRoll = osg::DegreesToRadians(Settings::Manager::getFloat("head bobbing roll", "Camera"));
-
-        if (MWBase::Environment::get().getWorld()->isOnGround(mTrackingPtr))
-            mHeadBobbingWeight = std::min(mHeadBobbingWeight + duration * 5, 1.f);
-        else
-            mHeadBobbingWeight = std::max(mHeadBobbingWeight - duration * 5, 0.f);
-
-        float doubleStepState = mTotalMovement / doubleStepLength - std::floor(mTotalMovement / doubleStepLength); // from 0 to 1 during 2 steps
-        float stepState = std::abs(doubleStepState * 4 - 2) - 1; // from -1 to 1 on even steps and from 1 to -1 on odd steps
-        float effect = (1 - std::cos(stepState * osg::DegreesToRadians(30.f))) * 7.5f; // range from 0 to 1
-        float coef = std::min(mSmoothedSpeed / 300.f, 1.f) * mHeadBobbingWeight;
-        mHeadBobbingOffset = (0.5f - effect) * coef * stepHeight; // range from -stepHeight/2 to stepHeight/2
-        mRoll = osg::sign(stepState) * effect * coef * maxRoll; // range from -maxRoll to maxRoll
+        osg::Vec3d pos = mPosition;
+        if (mMode == Mode::FirstPerson)
+        {
+            // It is a hack. Camera position depends on neck animation.
+            // Animations are updated in OSG cull traversal and in order to avoid 1 frame delay we
+            // recalculate the position here. Note that it becomes different from mPosition that
+            // is used in other parts of the code.
+            // TODO: detach camera from OSG animation and get rid of this hack.
+            osg::Vec3d recalculatedTrackedPosition = calculateTrackedPosition();
+            pos = calculateFirstPersonPosition(recalculatedTrackedPosition);
+        }
+        cam->setViewMatrixAsLookAt(pos, pos + forward, up);
     }
 
     void Camera::update(float duration, bool paused)
     {
+        mLockPitch = mLockYaw = false;
         if (mQueuedMode && mAnimation->upperBodyReady())
             setMode(*mQueuedMode);
         if (mProcessViewChange)
@@ -169,38 +142,31 @@ namespace MWRender
 
         // only show the crosshair in game mode
         MWBase::WindowManager *wm = MWBase::Environment::get().getWindowManager();
-        wm->showCrosshair(!wm->isGuiMode() && mMode != Mode::Preview && mMode != Mode::Vanity
-                          && (mFirstPersonView || mShowCrosshairInThirdPersonMode));
-
-        if(mMode == Mode::Vanity)
-            setYaw(mYaw + osg::DegreesToRadians(3.f) * duration);
-
-        if (mMode == Mode::FirstPerson && mHeadBobbingEnabled)
-            updateHeadBobbing(duration);
-        else
-            mRoll = mHeadBobbingOffset = 0;
+        wm->showCrosshair(!wm->isGuiMode() && mShowCrosshair);
 
         updateFocalPointOffset(duration);
         updatePosition();
+    }
 
-        float speed = mTrackingPtr.getClass().getCurrentSpeed(mTrackingPtr);
-        mTotalMovement += speed * duration;
-        speed /= (1.f + speed / 500.f);
-        float maxDelta = 300.f * duration;
-        mSmoothedSpeed += std::clamp(speed - mSmoothedSpeed, -maxDelta, maxDelta);
-
-        mMaxNextCameraDistance = mCameraDistance + duration * (100.f + mBaseCameraDistance);
-        updateStandingPreviewMode();
+    osg::Vec3d Camera::calculateFirstPersonPosition(const osg::Vec3d& trackedPosition) const
+    {
+        osg::Vec3d res = trackedPosition;
+        osg::Vec2f horizontalOffset = Misc::rotateVec2f(osg::Vec2f(mFirstPersonOffset.x(), mFirstPersonOffset.y()), mYaw);
+        res.x() += horizontalOffset.x();
+        res.y() += horizontalOffset.y();
+        res.z() += mFirstPersonOffset.z();
+        return res;
     }
 
     void Camera::updatePosition()
     {
+        mTrackedPosition = calculateTrackedPosition();
         if (mMode == Mode::Static)
             return;
         if (mMode == Mode::FirstPerson)
         {
-            mPosition = getTrackingNodePosition();
-            mPosition.z() += mHeadBobbingOffset;
+            mPosition = calculateFirstPersonPosition(mTrackedPosition);
+            mCameraDistance = 0;
             return;
         }
 
@@ -212,7 +178,9 @@ namespace MWRender
 
         // Adjust focal point to prevent clipping.
         osg::Vec3d focalOffset = getFocalPointOffset();
-        osg::Vec3d focal = getThirdPersonBasePosition() + focalOffset;
+        osg::Vec3d focal = mTrackedPosition + focalOffset;
+        focalOffset.z() += 10.f;  // Needed to avoid camera clipping through the ceiling because
+                                  // character's head can be a bit higher than the collision area.
         float offsetLen = focalOffset.length();
         if (offsetLen > 0)
         {
@@ -224,12 +192,9 @@ namespace MWRender
             }
         }
 
-        // Calculate offset from focal point.
-        mCameraDistance = mBaseCameraDistance + getCameraDistanceCorrection();
-        if (mDynamicCameraDistanceEnabled)
-            mCameraDistance = std::min(mCameraDistance, mMaxNextCameraDistance);
-
-        osg::Quat orient =  osg::Quat(getPitch(), osg::Vec3d(1,0,0)) * osg::Quat(getYaw(), osg::Vec3d(0,0,1));
+        // Adjust camera distance.
+        mCameraDistance = mPreferredCameraDistance;
+        osg::Quat orient =  osg::Quat(mPitch + mExtraPitch, osg::Vec3d(1,0,0)) * osg::Quat(mYaw + mExtraYaw, osg::Vec3d(0,0,1));
         osg::Vec3d offset = orient * osg::Vec3d(0.f, -mCameraDistance, 0.f);
         MWPhysics::RayCastingResult result = rayCasting->castSphere(focal, focal + offset, cameraObstacleLimit, collisionType);
         if (result.mHit)
@@ -243,8 +208,6 @@ namespace MWRender
 
     void Camera::setMode(Mode newMode, bool force)
     {
-        if (newMode == Mode::StandingPreview)
-            newMode = Mode::ThirdPerson;
         if (mMode == newMode)
             return;
         Mode oldMode = mMode;
@@ -267,23 +230,6 @@ namespace MWRender
             instantTransition();
             mProcessViewChange = true;
         }
-        else if (newMode == Mode::ThirdPerson)
-            updateStandingPreviewMode();
-    }
-
-    void Camera::updateStandingPreviewMode()
-    {
-        float speed = mTrackingPtr.getClass().getCurrentSpeed(mTrackingPtr);
-        bool combat = mTrackingPtr.getClass().isActor() &&
-                      mTrackingPtr.getClass().getCreatureStats(mTrackingPtr).getDrawState() != MWMechanics::DrawState_Nothing;
-        bool standingStill = speed == 0 && !combat && mStandingPreviewAllowed;
-        if (!standingStill && mMode == Mode::StandingPreview)
-        {
-            mMode = Mode::ThirdPerson;
-            calculateDeferredRotation();
-        }
-        else if (standingStill && mMode == Mode::ThirdPerson)
-            mMode = Mode::StandingPreview;
     }
 
     void Camera::setFocalPointTargetOffset(const osg::Vec2d& v)
@@ -339,13 +285,6 @@ namespace MWRender
         setMode(mFirstPersonView ? Mode::ThirdPerson : Mode::FirstPerson, force);
     }
 
-    void Camera::allowVanityMode(bool allow)
-    {
-        if (!allow && mMode == Mode::Vanity)
-            toggleVanityMode(false);
-        mVanityAllowed = allow;
-    }
-
     bool Camera::toggleVanityMode(bool enable)
     {
         if (!enable)
@@ -355,73 +294,34 @@ namespace MWRender
         return (mMode == Mode::Vanity) == enable;
     }
 
-    void Camera::togglePreviewMode(bool enable)
-    {
-        if (mFirstPersonView && !mAnimation->upperBodyReady())
-            return;
-        if ((mMode == Mode::Preview) == enable)
-            return;
-        if (enable)
-            setMode(Mode::Preview);
-        else
-            setMode(mFirstPersonView ? Mode::FirstPerson : Mode::ThirdPerson);
-    }
-
     void Camera::setSneakOffset(float offset)
     {
         mAnimation->setFirstPersonOffset(osg::Vec3f(0,0,-offset));
     }
 
-    void Camera::setYaw(float angle)
+    void Camera::setYaw(float angle, bool force)
     {
-        mYaw = Misc::normalizeAngle(angle);
+        if (!mLockYaw || force)
+            mYaw = Misc::normalizeAngle(angle);
+        if (force)
+            mLockYaw = true;
     }
 
-    void Camera::setPitch(float angle)
+    void Camera::setPitch(float angle, bool force)
     {
         const float epsilon = 0.000001f;
         float limit = static_cast<float>(osg::PI_2) - epsilon;
-        mPitch = std::clamp(angle, -limit, limit);
+        if (!mLockPitch || force)
+            mPitch = std::clamp(angle, -limit, limit);
+        if (force)
+            mLockPitch = true;
     }
 
-    float Camera::getCameraDistance() const
+    void Camera::setStaticPosition(const osg::Vec3d& pos)
     {
-        return mMode == Mode::FirstPerson ? 0.f : mCameraDistance;
-    }
-
-    void Camera::adjustCameraDistance(float delta)
-    {
-        if (mMode == Mode::Static)
-            return;
-        if (mMode != Mode::FirstPerson)
-        {
-            if (mIsNearest && delta < 0.f && mMode != Mode::Preview && mMode != Mode::Vanity)
-                toggleViewMode();
-            else
-                mBaseCameraDistance = std::min(mCameraDistance - getCameraDistanceCorrection(), mBaseCameraDistance) + delta;
-        }
-        else if (delta > 0.f)
-        {
-            toggleViewMode();
-            mBaseCameraDistance = 0;
-        }
-
-        mIsNearest = mBaseCameraDistance <= mNearest;
-        mBaseCameraDistance = std::clamp(mBaseCameraDistance, mNearest, mFurthest);
-        Settings::Manager::setFloat("third person camera distance", "Camera", mBaseCameraDistance);
-    }
-
-    float Camera::getCameraDistanceCorrection() const
-    {
-        if (!mDynamicCameraDistanceEnabled)
-            return 0;
-
-        float pitchCorrection = std::max(-getPitch(), 0.f) * 50.f;
-
-        float smoothedSpeedSqr = mSmoothedSpeed * mSmoothedSpeed;
-        float speedCorrection = smoothedSpeedSqr / (smoothedSpeedSqr + 300.f*300.f) * mZoomOutWhenMoveCoef;
-
-        return pitchCorrection + speedCorrection;
+        if (mMode != Mode::Static)
+            throw std::runtime_error("setStaticPosition can be used only if camera is in Static mode");
+        mPosition = pos;
     }
 
     void Camera::setAnimation(NpcAnimation *anim)
@@ -432,6 +332,8 @@ namespace MWRender
 
     void Camera::processViewChange()
     {
+        if (mTrackingPtr.isEmpty())
+            return;
         if (mMode == Mode::FirstPerson)
         {
             mAnimation->setViewMode(NpcAnimation::VM_FirstPerson);
@@ -488,7 +390,7 @@ namespace MWRender
 
     void Camera::rotateCameraToTrackingPtr()
     {
-        if (mMode == Mode::Static)
+        if (mMode == Mode::Static || mTrackingPtr.isEmpty())
             return;
         setPitch(-mTrackingPtr.getRefData().getPosition().rot[0] - mDeferredRotation.x());
         setYaw(-mTrackingPtr.getRefData().getPosition().rot[2] - mDeferredRotation.z());
@@ -524,9 +426,4 @@ namespace MWRender
             mDeferredRotationDisabled = true;
     }
 
-    bool Camera::isVanityOrPreviewModeEnabled() const
-    {
-        return mMode == Mode::Vanity || mMode == Mode::Preview || mMode == Mode::StandingPreview;
-    }
-
 }
diff --git a/apps/openmw/mwrender/camera.hpp b/apps/openmw/mwrender/camera.hpp
index cf25aa4852..280d309256 100644
--- a/apps/openmw/mwrender/camera.hpp
+++ b/apps/openmw/mwrender/camera.hpp
@@ -25,11 +25,80 @@ namespace MWRender
     class Camera
     {
     public:
-        enum class Mode : int {Static = 0, FirstPerson = 1, ThirdPerson = 2, Vanity = 3, Preview = 4, StandingPreview = 5};
+        enum class Mode : int {Static = 0, FirstPerson = 1, ThirdPerson = 2, Vanity = 3, Preview = 4};
+
+        Camera(osg::Camera* camera);
+        ~Camera();
+
+        /// Attach camera to object
+        void attachTo(const MWWorld::Ptr &ptr) { mTrackingPtr = ptr; }
+        MWWorld::Ptr getTrackingPtr() const { return mTrackingPtr; }
+
+        void setFocalPointTransitionSpeed(float v) { mFocalPointTransitionSpeedCoef = v; }
+        float getFocalPointTransitionSpeed() const { return mFocalPointTransitionSpeedCoef; }
+        void setFocalPointTargetOffset(const osg::Vec2d& v);
+        osg::Vec2d getFocalPointTargetOffset() const { return mFocalPointTargetOffset; }
+        void instantTransition();
+        void showCrosshair(bool v) { mShowCrosshair = v; }
+
+        /// Update the view matrix of \a cam
+        void updateCamera(osg::Camera* cam);
+
+        /// Reset to defaults
+        void reset() { setMode(Mode::FirstPerson); }
+
+        void rotateCameraToTrackingPtr();
+
+        float getPitch() const { return mPitch; }
+        float getYaw() const { return mYaw; }
+        float getRoll() const { return mRoll; }
+
+        void setPitch(float angle, bool force = false);
+        void setYaw(float angle, bool force = false);
+        void setRoll(float angle) { mRoll = angle; }
+
+        float getExtraPitch() const { return mExtraPitch; }
+        float getExtraYaw() const { return mExtraYaw; }
+        void setExtraPitch(float angle) { mExtraPitch = angle; }
+        void setExtraYaw(float angle) { mExtraYaw = angle; }
+
+        /// @param Force view mode switch, even if currently not allowed by the animation.
+        void toggleViewMode(bool force=false);
+        bool toggleVanityMode(bool enable);
+
+        void applyDeferredPreviewRotationToPlayer(float dt);
+        void disableDeferredPreviewRotation() { mDeferredRotationDisabled = true; }
+
+        /// \brief Lowers the camera for sneak.
+        void setSneakOffset(float offset);
+
+        void processViewChange();
+
+        void update(float duration, bool paused=false);
+
+        float getCameraDistance() const { return mCameraDistance; }
+        void setPreferredCameraDistance(float v) { mPreferredCameraDistance = v; }
+
+        void setAnimation(NpcAnimation *anim);
+
+        osg::Vec3d getTrackedPosition() const { return mTrackedPosition; }
+        const osg::Vec3d& getPosition() const { return mPosition; }
+        void setStaticPosition(const osg::Vec3d& pos);
+
+        bool isVanityOrPreviewModeEnabled() const { return mMode == Mode::Vanity || mMode == Mode::Preview; }
+        Mode getMode() const { return mMode; }
+        std::optional<Mode> getQueuedMode() const { return mQueuedMode; }
+        void setMode(Mode mode, bool force = true);
+
+        void allowCharacterDeferredRotation(bool v) { mDeferredRotationAllowed = v; }
+        void calculateDeferredRotation();
+        void setFirstPersonOffset(const osg::Vec3f& v) { mFirstPersonOffset = v; }
+        osg::Vec3f getFirstPersonOffset() const { return mFirstPersonOffset; }
 
     private:
         MWWorld::Ptr mTrackingPtr;
         osg::ref_ptr<const osg::Node> mTrackingNode;
+        osg::Vec3d mTrackedPosition;
         float mHeightScale;
 
         osg::ref_ptr<osg::Camera> mCamera;
@@ -43,21 +112,19 @@ namespace MWRender
         Mode mMode;
         std::optional<Mode> mQueuedMode;
         bool mVanityAllowed;
-        bool mStandingPreviewAllowed;
         bool mDeferredRotationAllowed;
 
-        float mNearest;
-        float mFurthest;
-        bool mIsNearest;
-
         bool mProcessViewChange;
 
-        float mHeight, mBaseCameraDistance;
+        float mHeight;
         float mPitch, mYaw, mRoll;
+        float mExtraPitch = 0, mExtraYaw = 0;
+        bool mLockPitch = false, mLockYaw = false;
         osg::Vec3d mPosition;
 
-        float mCameraDistance;
-        float mMaxNextCameraDistance;
+        float mCameraDistance, mPreferredCameraDistance;
+
+        osg::Vec3f mFirstPersonOffset{0, 0, 0};
 
         osg::Vec2d mFocalPointCurrentOffset;
         osg::Vec2d mFocalPointTargetOffset;
@@ -70,91 +137,19 @@ namespace MWRender
         osg::Vec2d mPreviousTransitionSpeed;
         osg::Vec2d mPreviousExtraOffset;
 
-        float mSmoothedSpeed;
-        float mZoomOutWhenMoveCoef;
-        bool mDynamicCameraDistanceEnabled;
-        bool mShowCrosshairInThirdPersonMode;
-
-        bool mHeadBobbingEnabled;
-        float mHeadBobbingOffset;
-        float mHeadBobbingWeight; // Value from 0 to 1 for smooth enabling/disabling.
-        float mTotalMovement; // Needed for head bobbing.
-        void updateHeadBobbing(float duration);
+        bool mShowCrosshair;
 
-        osg::Vec3d getTrackingNodePosition() const;
+        osg::Vec3d calculateTrackedPosition() const;
+        osg::Vec3d calculateFirstPersonPosition(const osg::Vec3d& trackedPosition) const;
         osg::Vec3d getFocalPointOffset() const;
         void updateFocalPointOffset(float duration);
         void updatePosition();
-        float getCameraDistanceCorrection() const;
 
         osg::ref_ptr<osg::Callback> mUpdateCallback;
 
         // Used to rotate player to the direction of view after exiting preview or vanity mode.
         osg::Vec3f mDeferredRotation;
         bool mDeferredRotationDisabled;
-        void calculateDeferredRotation();
-        void updateStandingPreviewMode();
-
-    public:
-        Camera(osg::Camera* camera);
-        ~Camera();
-
-        /// Attach camera to object
-        void attachTo(const MWWorld::Ptr &ptr) { mTrackingPtr = ptr; }
-        MWWorld::Ptr getTrackingPtr() const { return mTrackingPtr; }
-
-        void setFocalPointTransitionSpeed(float v) { mFocalPointTransitionSpeedCoef = v; }
-        void setFocalPointTargetOffset(const osg::Vec2d& v);
-        void instantTransition();
-        void enableDynamicCameraDistance(bool v) { mDynamicCameraDistanceEnabled = v; }
-        void enableCrosshairInThirdPersonMode(bool v) { mShowCrosshairInThirdPersonMode = v; }
-
-        /// Update the view matrix of \a cam
-        void updateCamera(osg::Camera* cam);
-
-        /// Reset to defaults
-        void reset() { setMode(Mode::FirstPerson); }
-
-        void rotateCameraToTrackingPtr();
-
-        float getYaw() const { return mYaw; }
-        void setYaw(float angle);
-
-        float getPitch() const { return mPitch; }
-        void setPitch(float angle);
-
-        /// @param Force view mode switch, even if currently not allowed by the animation.
-        void toggleViewMode(bool force=false);
-
-        bool toggleVanityMode(bool enable);
-        void allowVanityMode(bool allow);
-
-        /// @note this may be ignored if an important animation is currently playing
-        void togglePreviewMode(bool enable);
-
-        void applyDeferredPreviewRotationToPlayer(float dt);
-        void disableDeferredPreviewRotation() { mDeferredRotationDisabled = true; }
-
-        /// \brief Lowers the camera for sneak.
-        void setSneakOffset(float offset);
-
-        void processViewChange();
-
-        void update(float duration, bool paused=false);
-
-        /// Adds distDelta to the camera distance. Switches 3rd/1st person view if distance is less than limit.
-        void adjustCameraDistance(float distDelta);
-
-        float getCameraDistance() const;
-
-        void setAnimation(NpcAnimation *anim);
-
-        osg::Vec3d getThirdPersonBasePosition() const;
-        const osg::Vec3d& getPosition() const { return mPosition; }
-
-        bool isVanityOrPreviewModeEnabled() const;
-        Mode getMode() const { return mMode; }
-        void setMode(Mode mode, bool force = true);
     };
 }
 
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 0542d8ed90..b3b0d880c5 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -59,7 +59,6 @@
 #include "vismask.hpp"
 #include "pathgrid.hpp"
 #include "camera.hpp"
-#include "viewovershoulder.hpp"
 #include "water.hpp"
 #include "terrainstorage.hpp"
 #include "navmesh.hpp"
@@ -472,8 +471,6 @@ namespace MWRender
         mWater.reset(new Water(sceneRoot->getParent(0), sceneRoot, mResourceSystem, mViewer->getIncrementalCompileOperation(), resourcePath));
 
         mCamera.reset(new Camera(mViewer->getCamera()));
-        if (Settings::Manager::getBool("view over shoulder", "Camera"))
-            mViewOverShoulderController.reset(new ViewOverShoulderController(mCamera.get()));
 
         mScreenshotManager.reset(new ScreenshotManager(viewer, mRootNode, sceneRoot, mResourceSystem, mWater.get()));
 
@@ -826,8 +823,6 @@ namespace MWRender
         updateNavMesh();
         updateRecastMesh();
 
-        if (mViewOverShoulderController)
-            mViewOverShoulderController->update();
         mCamera->update(dt, paused);
 
         bool isUnderwater = mWater->isUnderwater(mCamera->getPosition());
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index 672f48c64f..91f03e8c27 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -79,7 +79,6 @@ namespace MWRender
     class NpcAnimation;
     class Pathgrid;
     class Camera;
-    class ViewOverShoulderController;
     class Water;
     class TerrainStorage;
     class LandManager;
@@ -283,7 +282,6 @@ namespace MWRender
         osg::ref_ptr<NpcAnimation> mPlayerAnimation;
         osg::ref_ptr<SceneUtil::PositionAttitudeTransform> mPlayerNode;
         std::unique_ptr<Camera> mCamera;
-        std::unique_ptr<ViewOverShoulderController> mViewOverShoulderController;
 
         osg::ref_ptr<StateUpdater> mStateUpdater;
         osg::ref_ptr<SharedUniformStateUpdater> mSharedUniformStateUpdater;
diff --git a/apps/openmw/mwrender/viewovershoulder.cpp b/apps/openmw/mwrender/viewovershoulder.cpp
deleted file mode 100644
index bd45480cf3..0000000000
--- a/apps/openmw/mwrender/viewovershoulder.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-#include "viewovershoulder.hpp"
-
-#include <osg/Quat>
-
-#include <components/settings/settings.hpp>
-
-#include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
-
-#include "../mwworld/class.hpp"
-#include "../mwworld/ptr.hpp"
-#include "../mwworld/refdata.hpp"
-
-#include "../mwmechanics/drawstate.hpp"
-
-namespace MWRender
-{
-
-    ViewOverShoulderController::ViewOverShoulderController(Camera* camera) :
-        mCamera(camera), mMode(Mode::RightShoulder),
-        mAutoSwitchShoulder(Settings::Manager::getBool("auto switch shoulder", "Camera")),
-        mOverShoulderHorizontalOffset(30.f), mOverShoulderVerticalOffset(-10.f)
-    {
-        osg::Vec2f offset = Settings::Manager::getVector2("view over shoulder offset", "Camera");
-        mOverShoulderHorizontalOffset = std::abs(offset.x());
-        mOverShoulderVerticalOffset = offset.y();
-        mDefaultShoulderIsRight = offset.x() >= 0;
-
-        mCamera->enableDynamicCameraDistance(true);
-        mCamera->enableCrosshairInThirdPersonMode(true);
-        mCamera->setFocalPointTargetOffset(offset);
-    }
-
-    void ViewOverShoulderController::update()
-    {
-        if (mCamera->getMode() == Camera::Mode::FirstPerson || mCamera->getMode() == Camera::Mode::Static)
-            return;
-
-        Mode oldMode = mMode;
-        auto ptr = mCamera->getTrackingPtr();
-        bool combat = ptr.getClass().isActor() && ptr.getClass().getCreatureStats(ptr).getDrawState() != MWMechanics::DrawState_Nothing;
-        if (combat && !mCamera->isVanityOrPreviewModeEnabled())
-            mMode = Mode::Combat;
-        else if (MWBase::Environment::get().getWorld()->isSwimming(ptr))
-            mMode = Mode::Swimming;
-        else if (oldMode == Mode::Combat || oldMode == Mode::Swimming)
-            mMode = mDefaultShoulderIsRight ? Mode::RightShoulder : Mode::LeftShoulder;
-        if (mAutoSwitchShoulder && (mMode == Mode::LeftShoulder || mMode == Mode::RightShoulder))
-            trySwitchShoulder();
-
-        if (oldMode == mMode)
-            return;
-
-        if (mCamera->getMode() == Camera::Mode::Vanity)
-            // Player doesn't touch controls for a long time. Transition should be very slow.
-            mCamera->setFocalPointTransitionSpeed(0.2f);
-        else if ((oldMode == Mode::Combat || mMode == Mode::Combat) && mCamera->getMode() == Camera::Mode::ThirdPerson)
-            // Transition to/from combat mode and we are not it preview mode. Should be fast.
-            mCamera->setFocalPointTransitionSpeed(5.f);
-        else
-            mCamera->setFocalPointTransitionSpeed(1.f);  // Default transition speed.
-
-        switch (mMode)
-        {
-        case Mode::RightShoulder:
-            mCamera->setFocalPointTargetOffset({mOverShoulderHorizontalOffset, mOverShoulderVerticalOffset});
-            break;
-        case Mode::LeftShoulder:
-            mCamera->setFocalPointTargetOffset({-mOverShoulderHorizontalOffset, mOverShoulderVerticalOffset});
-            break;
-        case Mode::Combat:
-        case Mode::Swimming:
-        default:
-            mCamera->setFocalPointTargetOffset({0, 15});
-        }
-    }
-
-    void ViewOverShoulderController::trySwitchShoulder()
-    {
-        if (mCamera->getMode() != Camera::Mode::ThirdPerson)
-            return;
-
-        const float limitToSwitch = 120; // switch to other shoulder if wall is closer than this limit
-        const float limitToSwitchBack = 300; // switch back to default shoulder if there is no walls at this distance
-
-        auto orient = osg::Quat(mCamera->getYaw(), osg::Vec3d(0,0,1));
-        osg::Vec3d playerPos = mCamera->getThirdPersonBasePosition();
-
-        MWBase::World* world = MWBase::Environment::get().getWorld();
-        osg::Vec3d sideOffset = orient * osg::Vec3d(world->getHalfExtents(mCamera->getTrackingPtr()).x() - 1, 0, 0);
-        float rayRight = world->getDistToNearestRayHit(
-            playerPos + sideOffset, orient * osg::Vec3d(1, 0, 0), limitToSwitchBack + 1);
-        float rayLeft = world->getDistToNearestRayHit(
-            playerPos - sideOffset, orient * osg::Vec3d(-1, 0, 0), limitToSwitchBack + 1);
-        float rayRightForward = world->getDistToNearestRayHit(
-            playerPos + sideOffset, orient * osg::Vec3d(1, 3, 0), limitToSwitchBack + 1);
-        float rayLeftForward = world->getDistToNearestRayHit(
-            playerPos - sideOffset, orient * osg::Vec3d(-1, 3, 0), limitToSwitchBack + 1);
-        float distRight = std::min(rayRight, rayRightForward);
-        float distLeft = std::min(rayLeft, rayLeftForward);
-
-        if (distLeft < limitToSwitch && distRight > limitToSwitchBack)
-            mMode = Mode::RightShoulder;
-        else if (distRight < limitToSwitch && distLeft > limitToSwitchBack)
-            mMode = Mode::LeftShoulder;
-        else if (distRight > limitToSwitchBack && distLeft > limitToSwitchBack)
-            mMode = mDefaultShoulderIsRight ? Mode::RightShoulder : Mode::LeftShoulder;
-    }
-
-}
diff --git a/apps/openmw/mwrender/viewovershoulder.hpp b/apps/openmw/mwrender/viewovershoulder.hpp
deleted file mode 100644
index 80ac308656..0000000000
--- a/apps/openmw/mwrender/viewovershoulder.hpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef VIEWOVERSHOULDER_H
-#define VIEWOVERSHOULDER_H
-
-#include "camera.hpp"
-
-namespace MWRender
-{
-
-    class ViewOverShoulderController
-    {
-        public:
-            ViewOverShoulderController(Camera* camera);
-
-            void update();
-
-        private:
-            void trySwitchShoulder();
-            enum class Mode { RightShoulder, LeftShoulder, Combat, Swimming };
-
-            Camera* mCamera;
-            Mode mMode;
-            bool mAutoSwitchShoulder;
-            float mOverShoulderHorizontalOffset;
-            float mOverShoulderVerticalOffset;
-            bool mDefaultShoulderIsRight;
-    };
-
-}
-
-#endif // VIEWOVERSHOULDER_H
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 71f44f125d..14b1082ba3 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -2398,11 +2398,6 @@ namespace MWWorld
         return mRendering->getCamera()->getMode() == MWRender::Camera::Mode::Preview;
     }
 
-    void World::togglePreviewMode(bool enable)
-    {
-        mRendering->getCamera()->togglePreviewMode(enable);
-    }
-
     bool World::toggleVanityMode(bool enable)
     {
         return mRendering->getCamera()->toggleVanityMode(enable);
@@ -2418,10 +2413,7 @@ namespace MWWorld
         mRendering->getCamera()->applyDeferredPreviewRotationToPlayer(dt);
     }
 
-    void World::allowVanityMode(bool allow)
-    {
-        mRendering->getCamera()->allowVanityMode(allow);
-    }
+    MWRender::Camera* World::getCamera() { return mRendering->getCamera(); }
 
     bool World::vanityRotateCamera(float * rot)
     {
@@ -2434,11 +2426,6 @@ namespace MWWorld
         return true;
     }
 
-    void World::adjustCameraDistance(float dist)
-    {
-        mRendering->getCamera()->adjustCameraDistance(dist);
-    }
-
     void World::saveLoaded()
     {
         mStore.validateDynamic();
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index c8eebd9a8b..bf61483ecf 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -529,13 +529,10 @@ namespace MWWorld
             bool isFirstPerson() const override;
             bool isPreviewModeEnabled() const override;
 
-            void togglePreviewMode(bool enable) override;
-
             bool toggleVanityMode(bool enable) override;
 
-            void allowVanityMode(bool allow) override;
+            MWRender::Camera* getCamera() override;
             bool vanityRotateCamera(float * rot) override;
-            void adjustCameraDistance(float dist) override;
 
             void applyDeferredPreviewRotationToPlayer(float dt) override;
             void disableDeferredPreviewRotation() override;
diff --git a/files/builtin_scripts/builtin.omwscripts b/files/builtin_scripts/builtin.omwscripts
new file mode 100644
index 0000000000..30fccad9fa
--- /dev/null
+++ b/files/builtin_scripts/builtin.omwscripts
@@ -0,0 +1 @@
+PLAYER: scripts/omw/camera.lua
diff --git a/files/builtin_scripts/scripts/omw/camera.lua b/files/builtin_scripts/scripts/omw/camera.lua
new file mode 100644
index 0000000000..55460dc615
--- /dev/null
+++ b/files/builtin_scripts/scripts/omw/camera.lua
@@ -0,0 +1,221 @@
+local camera = require('openmw.camera')
+local input = require('openmw.input')
+local settings = require('openmw.settings')
+local util = require('openmw.util')
+local self = require('openmw.self')
+
+local head_bobbing = require('scripts.omw.head_bobbing')
+local third_person = require('scripts.omw.third_person')
+
+local MODE = camera.MODE
+
+local previewIfStandSill = settings._getBoolFromSettingsCfg('Camera', 'preview if stand still')
+local showCrosshairInThirdPerson = settings._getBoolFromSettingsCfg('Camera', 'view over shoulder')
+
+local primaryMode
+
+local noModeControl = 0
+local noStandingPreview = 0
+local noHeadBobbing = 0
+local noZoom = 0
+
+function init()
+    camera.allowCharacterDeferredRotation(settings._getBoolFromSettingsCfg('Camera', 'deferred preview rotation'))
+    if camera.getMode() == MODE.FirstPerson then
+        primaryMode = MODE.FirstPerson
+    else
+        primaryMode = MODE.ThirdPerson
+        camera.setMode(MODE.ThirdPerson)
+    end
+end
+
+local smoothedSpeed = 0
+local previewTimer = 0
+
+local function updatePOV(dt)
+    local switchLimit = 0.25
+    if input.isActionPressed(input.ACTION.TogglePOV) and input.getControlSwitch(input.CONTROL_SWITCH.ViewMode) then
+        previewTimer = previewTimer + dt
+        if primaryMode == MODE.ThirdPerson or previewTimer >= switchLimit then
+            third_person.standingPreview = false
+            camera.setMode(MODE.Preview)
+        end
+    elseif previewTimer > 0 then
+        if previewTimer <= switchLimit then
+            if primaryMode == MODE.FirstPerson then
+                primaryMode = MODE.ThirdPerson
+            else
+                primaryMode = MODE.FirstPerson
+            end
+        end
+        camera.setMode(primaryMode)
+        previewTimer = 0
+    end
+end
+
+local idleTimer = 0
+local vanityDelay = settings.getGMST('fVanityDelay')
+
+local function updateVanity(dt)
+    if input.isIdle() then
+        idleTimer = idleTimer + dt
+    else
+        idleTimer = 0
+    end
+    local vanityAllowed = input.getControlSwitch(input.CONTROL_SWITCH.VanityMode)
+    if vanityAllowed and idleTimer > vanityDelay and camera.getMode() ~= MODE.Vanity then
+        camera.setMode(MODE.Vanity)
+    end
+    if camera.getMode() == MODE.Vanity then
+        if not vanityAllowed or idleTimer == 0 then
+            camera.setMode(primaryMode)
+        else
+            camera.setYaw(camera.getYaw() + math.rad(3) * dt)
+        end
+    end
+end
+
+local function updateSmoothedSpeed(dt)
+    local speed = self:getCurrentSpeed()
+    speed = speed / (1 + speed / 500)
+    local maxDelta = 300 * dt
+    smoothedSpeed = smoothedSpeed + util.clamp(speed - smoothedSpeed, -maxDelta, maxDelta)
+end
+
+local minDistance = 30
+local maxDistance = 800
+
+local function zoom(delta)
+    if not input.getControlSwitch(input.CONTROL_SWITCH.ViewMode) or
+       not input.getControlSwitch(input.CONTROL_SWITCH.Controls) or
+       camera.getMode() == MODE.Static or noZoom > 0 then
+        return
+    end
+    if camera.getMode() ~= MODE.FirstPerson then
+        local obstacleDelta = third_person.preferredDistance - camera.getThirdPersonDistance()
+        if delta > 0 and third_person.baseDistance == minDistance and
+           (camera.getMode() ~= MODE.Preview or third_person.standingPreview) and noModeControl == 0 then
+            primaryMode = MODE.FirstPerson
+            camera.setMode(primaryMode)
+        elseif delta > 0 or obstacleDelta < -delta then
+            third_person.baseDistance = util.clamp(third_person.baseDistance - delta - obstacleDelta, minDistance, maxDistance)
+        end
+    elseif delta < 0 and noModeControl == 0 then
+        primaryMode = MODE.ThirdPerson
+        camera.setMode(primaryMode)
+        third_person.baseDistance = minDistance
+    end
+end
+
+local function applyControllerZoom(dt)
+    if camera.getMode() == MODE.Preview then
+        local triggerLeft = input.getAxisValue(input.CONTROLLER_AXIS.TriggerLeft)
+        local triggerRight = input.getAxisValue(input.CONTROLLER_AXIS.TriggerRight)
+        local controllerZoom = (triggerRight - triggerLeft) * 100 * dt
+        if controllerZoom ~= 0 then
+            zoom(controllerZoom)
+        end
+    end
+end
+
+local function updateStandingPreview()
+    local mode = camera.getMode()
+    if not previewIfStandSill or noStandingPreview > 0
+       or mode == MODE.FirstPerson or mode == MODE.Static or mode == MODE.Vanity then
+        third_person.standingPreview = false
+        return
+    end
+    local standingStill = self:getCurrentSpeed() == 0 and not self:isInWeaponStance() and not self:isInMagicStance()
+    if standingStill and mode == MODE.ThirdPerson then
+        third_person.standingPreview = true
+        camera.setMode(MODE.Preview)
+    elseif not standingStill and third_person.standingPreview then
+        third_person.standingPreview = false
+        camera.setMode(primaryMode)
+    end
+end
+
+local function updateCrosshair()
+    camera.showCrosshair(
+        camera.getMode() == MODE.FirstPerson or
+        (showCrosshairInThirdPerson and (camera.getMode() == MODE.ThirdPerson or third_person.standingPreview)))
+end
+
+local function onUpdate(dt)
+    camera.setExtraPitch(0)
+    camera.setExtraYaw(0)
+    camera.setRoll(0)
+    camera.setFirstPersonOffset(util.vector3(0, 0, 0))
+    updateSmoothedSpeed(dt)
+end
+
+local function onInputUpdate(dt)
+    local mode = camera.getMode()
+    if mode == MODE.FirstPerson or mode == MODE.ThirdPerson then
+        primaryMode = mode
+    end
+    if mode ~= MODE.Static then
+        if not camera.getQueuedMode() or camera.getQueuedMode() == MODE.Preview then
+            if noModeControl == 0 then
+                updatePOV(dt)
+                updateVanity(dt)
+            end
+            updateStandingPreview()
+        end
+        updateCrosshair()
+    end
+    applyControllerZoom(dt)
+    third_person.update(dt, smoothedSpeed)
+    if noHeadBobbing == 0 then head_bobbing.update(dt, smoothedSpeed) end
+end
+
+return {
+    interfaceName = 'Camera',
+    interface = {
+        version = 0,
+
+        getPrimaryMode = function() return primaryMode end,
+        getBaseThirdPersonDistance = function() return third_person.baseDistance end,
+        setBaseThirdPersonDistance = function(v) third_person.baseDistance = v end,
+        getTargetThirdPersonDistance = function() return third_person.preferredDistance end,
+
+        isModeControlEnabled = function() return noModeControl == 0 end,
+        disableModeControl = function() noModeControl = noModeControl + 1 end,
+        enableModeControl = function() noModeControl = math.max(0, noModeControl - 1) end,
+
+        isStandingPreviewEnabled = function() return previewIfStandSill and noStandingPreview == 0 end,
+        disableStandingPreview = function() noStandingPreview = noStandingPreview + 1 end,
+        enableStandingPreview = function() noStandingPreview = math.max(0, noStandingPreview - 1) end,
+
+        isHeadBobbingEnabled = function() return head_bobbing.enabled and noHeadBobbing == 0 end,
+        disableHeadBobbing = function() noHeadBobbing = noHeadBobbing + 1 end,
+        enableHeadBobbing = function() noHeadBobbing = math.max(0, noHeadBobbing - 1) end,
+
+        isZoomEnabled = function() return noZoom == 0 end,
+        disableZoom = function() noZoom = noZoom + 1 end,
+        enableZoom = function() noZoom = math.max(0, noZoom - 1) end,
+
+        isThirdPersonOffsetControlEnabled = function() return third_person.noOffsetControl == 0 end,
+        disableThirdPersonOffsetControl = function() third_person.noOffsetControl = third_person.noOffsetControl + 1 end,
+        enableThirdPersonOffsetControl = function() third_person.noOffsetControl = math.max(0, third_person.noOffsetControl - 1) end,
+    },
+    engineHandlers = {
+        onUpdate = onUpdate,
+        onInputUpdate = onInputUpdate,
+        onInputAction = function(action)
+            if action == input.ACTION.ZoomIn then
+                zoom(10)
+            elseif action == input.ACTION.ZoomOut then
+                zoom(-10)
+            end
+        end,
+        onActive = init,
+        onLoad = function(data)
+            if data and data.distance then third_person.baseDistance = data.distance end
+        end,
+        onSave = function()
+            return {version = 0, distance = third_person.baseDistance}
+        end,
+    },
+}
+
diff --git a/files/builtin_scripts/scripts/omw/head_bobbing.lua b/files/builtin_scripts/scripts/omw/head_bobbing.lua
new file mode 100644
index 0000000000..fe809fca8a
--- /dev/null
+++ b/files/builtin_scripts/scripts/omw/head_bobbing.lua
@@ -0,0 +1,51 @@
+local camera = require('openmw.camera')
+local self = require('openmw.self')
+local settings = require('openmw.settings')
+local util = require('openmw.util')
+
+local doubleStepLength = settings._getFloatFromSettingsCfg('Camera', 'head bobbing step') * 2
+local stepHeight = settings._getFloatFromSettingsCfg('Camera', 'head bobbing height')
+local maxRoll = math.rad(settings._getFloatFromSettingsCfg('Camera', 'head bobbing roll'))
+
+local effectWeight = 0
+local totalMovement = 0
+
+local M = {
+    enabled = settings._getBoolFromSettingsCfg('Camera', 'head bobbing')
+}
+
+-- Trajectory of each step is a scaled arc of 60 degrees.
+local halfArc = math.rad(30)
+local sampleArc = function(x) return 1 - math.cos(x * halfArc) end
+local arcHeight = sampleArc(1)
+
+function M.update(dt, smoothedSpeed)
+    local speed = self:getCurrentSpeed()
+    speed = speed / (1 + speed / 500)  -- limit bobbing frequency if the speed is very high
+    totalMovement = totalMovement + speed * dt
+    if not M.enabled or camera.getMode() ~= camera.MODE.FirstPerson then
+        effectWeight = 0
+        return
+    end
+    if self:isOnGround() then
+        effectWeight = math.min(1, effectWeight + dt * 5)
+    else
+        effectWeight = math.max(0, effectWeight - dt * 5)
+    end
+
+    local doubleStepState = totalMovement / doubleStepLength
+    doubleStepState = doubleStepState - math.floor(doubleStepState)  -- from 0 to 1 during 2 steps
+    local stepState = math.abs(doubleStepState * 4 - 2) - 1  -- from -1 to 1 on even steps and from 1 to -1 on odd steps
+    local effect = sampleArc(stepState) / arcHeight  -- range from 0 to 1
+
+    -- Smoothly reduce the effect to zero when the player stops
+    local coef = math.min(smoothedSpeed / 300, 1) * effectWeight
+
+    local zOffset = (0.5 - effect) * coef * stepHeight  -- range from -stepHeight/2 to stepHeight/2
+    local roll = ((stepState > 0 and 1) or -1) * effect * coef * maxRoll  -- range from -maxRoll to maxRoll
+    camera.setFirstPersonOffset(camera.getFirstPersonOffset() + util.vector3(0, 0, zOffset))
+    camera.setRoll(camera.getRoll() + roll)
+end
+
+return M
+
diff --git a/files/builtin_scripts/scripts/omw/third_person.lua b/files/builtin_scripts/scripts/omw/third_person.lua
new file mode 100644
index 0000000000..ca00ef5ee9
--- /dev/null
+++ b/files/builtin_scripts/scripts/omw/third_person.lua
@@ -0,0 +1,139 @@
+local camera = require('openmw.camera')
+local settings = require('openmw.settings')
+local util = require('openmw.util')
+local self = require('openmw.self')
+local nearby = require('openmw.nearby')
+
+local MODE = camera.MODE
+local STATE = { RightShoulder = 0, LeftShoulder = 1, Combat = 2, Swimming = 3 }
+
+local M = {
+    baseDistance = settings._getFloatFromSettingsCfg('Camera', 'third person camera distance'),
+    preferredDistance = 0,
+    standingPreview = false,
+    noOffsetControl = 0,
+}
+
+local viewOverShoulder = settings._getBoolFromSettingsCfg('Camera', 'view over shoulder')
+local autoSwitchShoulder = settings._getBoolFromSettingsCfg('Camera', 'auto switch shoulder')
+local shoulderOffset = settings._getVector2FromSettingsCfg('Camera', 'view over shoulder offset')
+local zoomOutWhenMoveCoef = settings._getFloatFromSettingsCfg('Camera', 'zoom out when move coef')
+
+local defaultShoulder = (shoulderOffset.x > 0 and STATE.RightShoulder) or STATE.LeftShoulder
+local rightShoulderOffset = util.vector2(math.abs(shoulderOffset.x), shoulderOffset.y)
+local leftShoulderOffset = util.vector2(-math.abs(shoulderOffset.x), shoulderOffset.y)
+local combatOffset = util.vector2(0, 15)
+
+local state = defaultShoulder
+
+local rayOptions = {collisionType = nearby.COLLISION_TYPE.Default - nearby.COLLISION_TYPE.Actor}
+local function ray(from, angle, limit)
+    local to = from + util.transform.rotateZ(angle) * util.vector3(0, limit, 0)
+    local res = nearby.castRay(from, to, rayOptions)
+    if res.hit then
+        return (res.hitPos - from):length()
+    else
+        return limit
+    end
+end
+
+local function trySwitchShoulder()
+    local limitToSwitch = 120  -- switch to other shoulder if wall is closer than this limit
+    local limitToSwitchBack = 300  -- switch back to default shoulder if there is no walls at this distance
+
+    local pos = camera.getTrackedPosition()
+    local rayRight = ray(pos, camera.getYaw() + math.rad(90), limitToSwitchBack + 1)
+    local rayLeft = ray(pos, camera.getYaw() - math.rad(90), limitToSwitchBack + 1)
+    local rayRightForward = ray(pos, camera.getYaw() + math.rad(30), limitToSwitchBack + 1)
+    local rayLeftForward = ray(pos, camera.getYaw() - math.rad(30), limitToSwitchBack + 1)
+
+    local distRight = math.min(rayRight, rayRightForward)
+    local distLeft = math.min(rayLeft, rayLeftForward)
+
+    if distLeft < limitToSwitch and distRight > limitToSwitchBack then
+        state = STATE.RightShoulder
+    elseif distRight < limitToSwitch and distLeft > limitToSwitchBack then
+        state = STATE.LeftShoulder
+    elseif distRight > limitToSwitchBack and distLeft > limitToSwitchBack then
+        state = defaultShoulder
+    end
+end
+
+local function calculateDistance(smoothedSpeed)
+    local smoothedSpeedSqr = smoothedSpeed * smoothedSpeed
+    return (M.baseDistance + math.max(camera.getPitch(), 0) * 50
+            + smoothedSpeedSqr / (smoothedSpeedSqr + 300*300) * zoomOutWhenMoveCoef)
+end
+
+local noThirdPersonLastFrame = true
+
+local function updateState()
+    local mode = camera.getMode()
+    local oldState = state
+    if (self:isInWeaponStance() or self:isInMagicStance()) and mode == MODE.ThirdPerson then
+        state = STATE.Combat
+    elseif self:isSwimming() then
+        state = STATE.Swimming
+    elseif oldState == STATE.Combat or oldState == STATE.Swimming then
+        state = defaultShoulder
+    end
+    if autoSwitchShoulder and (mode == MODE.ThirdPerson or state ~= oldState or noThirdPersonLastFrame)
+       and (state == STATE.LeftShoulder or state == STATE.RightShoulder) then
+        trySwitchShoulder()
+    end
+    if oldState ~= state or noThirdPersonLastFrame then
+        -- State was changed, start focal point transition.
+        if mode == MODE.Vanity then
+            -- Player doesn't touch controls for a long time. Transition should be very slow.
+            camera.setFocalTransitionSpeed(0.2)
+        elseif (oldState == STATE.Combat or state == STATE.Combat) and
+               (mode ~= MODE.Preview or M.standingPreview) then
+            -- Transition to/from combat mode and we are not in preview mode. Should be fast.
+            camera.setFocalTransitionSpeed(5.0)
+        else
+            camera.setFocalTransitionSpeed(1.0)  -- Default transition speed.
+        end
+
+        if state == STATE.RightShoulder then
+            camera.setFocalPreferredOffset(rightShoulderOffset)
+        elseif state == STATE.LeftShoulder then
+            camera.setFocalPreferredOffset(leftShoulderOffset)
+        else
+            camera.setFocalPreferredOffset(combatOffset)
+        end
+    end
+end
+
+function M.update(dt, smoothedSpeed)
+    local mode = camera.getMode()
+    if mode == MODE.FirstPerson or mode == MODE.Static then
+        noThirdPersonLastFrame = true
+        return
+    end
+    if not viewOverShoulder then
+        M.preferredDistance = M.baseDistance
+        camera.setPreferredThirdPersonDistance(M.baseDistance)
+        noThirdPersonLastFrame = false
+        return
+    end
+
+    if M.noOffsetControl == 0 then
+        updateState()
+    else
+        state = nil
+    end
+
+    M.preferredDistance = calculateDistance(smoothedSpeed)
+    if noThirdPersonLastFrame then  -- just switched to third person view
+        camera.setPreferredThirdPersonDistance(M.preferredDistance)
+        camera.instantTransition()
+        noThirdPersonLastFrame = false
+    else
+        local maxIncrease = dt * (100 + M.baseDistance)
+        camera.setPreferredThirdPersonDistance(math.min(
+            M.preferredDistance, camera.getThirdPersonDistance() + maxIncrease))
+    end
+end
+
+return M
+
diff --git a/files/openmw.cfg b/files/openmw.cfg
index afbf0810cc..d98097c3eb 100644
--- a/files/openmw.cfg
+++ b/files/openmw.cfg
@@ -2,6 +2,7 @@
 # Modifications should be done on the user openmw.cfg file instead
 # (see: https://openmw.readthedocs.io/en/master/reference/modding/paths.html)
 
+content=builtin.omwscripts
 data=${MORROWIND_DATA_FILES}
 data-local="?userdata?data"
 resources=${OPENMW_RESOURCE_FILES}
diff --git a/files/openmw.cfg.local b/files/openmw.cfg.local
index 76f829379b..704ac68068 100644
--- a/files/openmw.cfg.local
+++ b/files/openmw.cfg.local
@@ -2,6 +2,7 @@
 # Modifications should be done on the user openmw.cfg file instead
 # (see: https://openmw.readthedocs.io/en/master/reference/modding/paths.html)
 
+content=builtin.omwscripts
 data="?global?data"
 data=./data
 data-local="?userdata?data"

From 3941c42a7162c2a3773aeb6cc1ddd69ea12397e6 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 17 Oct 2021 21:35:34 +0200
Subject: [PATCH 1736/2859] Use `applyDeferredPreviewRotationToPlayer` only
 after applying values from `luaControls`. Otherwise camera rotation is not
 smooth when movement is controlled from lua.

---
 apps/openmw/mwinput/inputmanagerimp.cpp | 2 --
 apps/openmw/mwmechanics/actors.cpp      | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index cf1b0e936d..5d737bd446 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -101,8 +101,6 @@ namespace MWInput
         mMouseManager->update(dt);
         mSensorManager->update(dt);
         mActionManager->update(dt, controllerMove);
-
-        MWBase::Environment::get().getWorld()->applyDeferredPreviewRotationToPlayer(dt);
     }
 
     void InputManager::setDragDrop(bool dragDrop)
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 32562591a5..b3ddefec3f 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1598,6 +1598,7 @@ namespace MWMechanics
 
             if (playerCharacter)
             {
+                MWBase::Environment::get().getWorld()->applyDeferredPreviewRotationToPlayer(duration);
                 playerCharacter->update(duration);
                 playerCharacter->setVisibility(1.f);
             }

From ded89973629a409c7d0c2ffc4e56e70d33a330b9 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Fri, 12 Nov 2021 19:22:20 +0100
Subject: [PATCH 1737/2859] Avoid problems if `builtin.omwscripts` is above
 `Morrowind.esm` in content list.

---
 apps/openmw/mwworld/worldimp.cpp                  | 12 +++++++++---
 components/contentselector/model/contentmodel.cpp |  4 ++++
 components/esm/esmreader.hpp                      |  6 +++---
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 14b1082ba3..639c37fe2d 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -165,9 +165,15 @@ namespace MWWorld
 
         listener->loadingOff();
 
-        // insert records that may not be present in all versions of MW
-        if (mEsm[0].getFormat() == 0)
-            ensureNeededRecords();
+        // Find main game file
+        for (const ESM::ESMReader& reader : mEsm)
+        {
+            if (!Misc::StringUtils::ciEndsWith(reader.getName(), ".esm") && !Misc::StringUtils::ciEndsWith(reader.getName(), ".omwgame"))
+                continue;
+            if (reader.getFormat() == 0)
+                ensureNeededRecords();  // and insert records that may not be present in all versions of MW.
+            break;
+        }
 
         mCurrentDate.reset(new DateTimeManager());
 
diff --git a/components/contentselector/model/contentmodel.cpp b/components/contentselector/model/contentmodel.cpp
index ac7851d99c..199799025a 100644
--- a/components/contentselector/model/contentmodel.cpp
+++ b/components/contentselector/model/contentmodel.cpp
@@ -430,6 +430,10 @@ void ContentSelectorModel::ContentModel::addFiles(const QString &path)
         if (item(info.fileName()))
             continue;
 
+        // Enabled by default in system openmw.cfg; shouldn't be shown in content list.
+        if (info.fileName().compare("builtin.omwscripts", Qt::CaseInsensitive) == 0)
+            continue;
+
         if (info.fileName().endsWith(".omwscripts", Qt::CaseInsensitive))
         {
             EsmFile *file = new EsmFile(path2);
diff --git a/components/esm/esmreader.hpp b/components/esm/esmreader.hpp
index 92f2a6673b..d7eb6ff0a1 100644
--- a/components/esm/esmreader.hpp
+++ b/components/esm/esmreader.hpp
@@ -32,14 +32,14 @@ public:
   int getVer() const { return mHeader.mData.version; }
   int getRecordCount() const { return mHeader.mData.records; }
   float getFVer() const { return (mHeader.mData.version == VER_12) ? 1.2f : 1.3f; }
-  const std::string getAuthor() const { return mHeader.mData.author; }
-  const std::string getDesc() const { return mHeader.mData.desc; }
+  const std::string& getAuthor() const { return mHeader.mData.author; }
+  const std::string& getDesc() const { return mHeader.mData.desc; }
   const std::vector<Header::MasterData> &getGameFiles() const { return mHeader.mMaster; }
   const Header& getHeader() const { return mHeader; }
   int getFormat() const { return mHeader.mFormat; };
   const NAME &retSubName() const { return mCtx.subName; }
   uint32_t getSubSize() const { return mCtx.leftSub; }
-  std::string getName() const {return mCtx.filename; };
+  const std::string& getName() const { return mCtx.filename; };
 
   /*************************************************************************
    *

From 73821ace94f9abbd30bc22e8d736787580f5f603 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Mon, 1 Nov 2021 18:39:18 +0100
Subject: [PATCH 1738/2859] Update Lua docs

---
 docs/source/generate_luadoc.sh                |   1 +
 docs/source/reference/lua-scripting/api.rst   |  18 +-
 .../lua-scripting/interface_camera.rst        |   6 +
 .../reference/lua-scripting/openmw_camera.rst |   5 +
 .../reference/lua-scripting/overview.rst      |  27 ++-
 files/builtin_scripts/scripts/omw/camera.lua  |  24 ++-
 files/lua_api/openmw/camera.lua               | 171 ++++++++++++++++++
 7 files changed, 245 insertions(+), 7 deletions(-)
 create mode 100644 docs/source/reference/lua-scripting/interface_camera.rst
 create mode 100644 docs/source/reference/lua-scripting/openmw_camera.rst
 create mode 100644 files/lua_api/openmw/camera.lua

diff --git a/docs/source/generate_luadoc.sh b/docs/source/generate_luadoc.sh
index 1af9f0e0f7..067a1ad4cf 100755
--- a/docs/source/generate_luadoc.sh
+++ b/docs/source/generate_luadoc.sh
@@ -65,4 +65,5 @@ $DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR openmw/*lua
 
 cd $FILES_DIR/builtin_scripts
 $DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR openmw_aux/*lua
+$DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR scripts/omw/camera.lua
 
diff --git a/docs/source/reference/lua-scripting/api.rst b/docs/source/reference/lua-scripting/api.rst
index 6398a19be8..dd9d151482 100644
--- a/docs/source/reference/lua-scripting/api.rst
+++ b/docs/source/reference/lua-scripting/api.rst
@@ -17,7 +17,9 @@ Lua API reference
     openmw_nearby
     openmw_input
     openmw_ui
+    openmw_camera
     openmw_aux_util
+    interface_camera
 
 
 - :ref:`Engine handlers reference`
@@ -56,11 +58,11 @@ Player scripts are local scripts that are attached to a player.
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.nearby <Package openmw.nearby>`             | by local scripts   | | Read-only access to the nearest area of the game world.     |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.input <Package openmw.input>`               | by player scripts  | | User input                                                  |
+|:ref:`openmw.input <Package openmw.input>`               | by player scripts  | | User input.                                                 |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.ui <Package openmw.ui>`                     | by player scripts  | | Controls :ref:`user interface <User interface reference>`   |
+|:ref:`openmw.ui <Package openmw.ui>`                     | by player scripts  | | Controls :ref:`user interface <User interface reference>`.  |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|openmw.camera                                            | by player scripts  | | Controls camera (not implemented)                           |
+|:ref:`openmw.camera <Package openmw.camera>`             | by player scripts  | | Controls camera.                                            |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 
 **openmw_aux**
@@ -73,3 +75,13 @@ Sources can be found in ``resources/vfs/openmw_aux``. In theory mods can overrid
 +=========================================================+====================+===============================================================+
 |:ref:`openmw_aux.util <Package openmw_aux.util>`         | everywhere         | | Miscellaneous utils                                         |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+
+**Interfaces of built-in scripts**
+
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+| Interface                                               | Can be used        | Description                                                   |
++=========================================================+====================+===============================================================+
+|:ref:`Camera <Interface Camera>`                         | by player scripts  | | Allows to alter behavior of the built-in camera script      |
+|                                                         |                    | | without overriding the script completely.                   |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+
diff --git a/docs/source/reference/lua-scripting/interface_camera.rst b/docs/source/reference/lua-scripting/interface_camera.rst
new file mode 100644
index 0000000000..c2db83b721
--- /dev/null
+++ b/docs/source/reference/lua-scripting/interface_camera.rst
@@ -0,0 +1,6 @@
+Interface Camera
+================
+
+.. raw:: html
+   :file: generated_html/scripts_omw_camera.html
+
diff --git a/docs/source/reference/lua-scripting/openmw_camera.rst b/docs/source/reference/lua-scripting/openmw_camera.rst
new file mode 100644
index 0000000000..4090843920
--- /dev/null
+++ b/docs/source/reference/lua-scripting/openmw_camera.rst
@@ -0,0 +1,5 @@
+Package openmw.camera
+=====================
+
+.. raw:: html
+   :file: generated_html/openmw_camera.html
diff --git a/docs/source/reference/lua-scripting/overview.rst b/docs/source/reference/lua-scripting/overview.rst
index 5bc413036a..938611635a 100644
--- a/docs/source/reference/lua-scripting/overview.rst
+++ b/docs/source/reference/lua-scripting/overview.rst
@@ -352,7 +352,7 @@ Player scripts are local scripts that are attached to a player.
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.ui <Package openmw.ui>`                     | by player scripts  | | Controls :ref:`user interface <User interface reference>`   |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|openmw.camera                                            | by player scripts  | | Controls camera (not implemented)                           |
+|:ref:`openmw.camera <Package openmw.camera>`             | by player scripts  | | Controls camera                                             |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 
 openmw_aux
@@ -439,6 +439,15 @@ Using the interface:
 
 The order in which the scripts are started is important. So if one mod should override an interface provided by another mod, make sure that load order (i.e. the sequence of `lua-scripts=...` in `openmw.cfg`) is correct.
 
+**Interfaces of built-in scripts**
+
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+| Interface                                               | Can be used        | Description                                                   |
++=========================================================+====================+===============================================================+
+|:ref:`Camera <Interface Camera>`                         | by player scripts  | | Allows to alter behavior of the built-in camera script      |
+|                                                         |                    | | without overriding the script completely.                   |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+
 
 Event system
 ============
@@ -719,8 +728,7 @@ you can import these files to get code autocompletion and integrated OpenMW API
 .. image:: https://gitlab.com/OpenMW/openmw-docs/raw/master/docs/source/reference/lua-scripting/_static/lua-ide-project-settings.png
 
 - Press `Next`, choose the `Libraries` tab, and click `Add External Source Folder`.
-- Specify there the path to ``resources/lua_api`` in your OpenMW installation.
-- If you use `openmw_aux`_, add ``resources/vfs`` as an additional external source folder.
+- Specify there paths to ``resources/lua_api`` and ``resources/vfs`` in your OpenMW installation.
 
 .. image:: https://gitlab.com/OpenMW/openmw-docs/raw/master/docs/source/reference/lua-scripting/_static/lua-ide-import-api.png
 
@@ -749,4 +757,17 @@ You can add special hints to give LDT more information:
 
 .. image:: https://gitlab.com/OpenMW/openmw-docs/raw/master/docs/source/reference/lua-scripting/_static/lua-ide-code-completion2.png
 
+In order to have autocompletion for script interfaces the information where to find these interfaces should be provided.
+For example for the camera interface (defined in ``resources/vfs/scripts/omw/camera.lua``):
+
+.. code-block:: Lua
+
+    --- @type Interfaces
+    -- @field scripts.omw.camera#Interface Camera
+    -- ... other interfaces here
+    --- @field #Interfaces I
+    local I = require('openmw.interfaces')
+
+    I.Camera.disableZoom()
+
 See `LDT Documentation Language <https://wiki.eclipse.org/LDT/User_Area/Documentation_Language>`__ for more details.
diff --git a/files/builtin_scripts/scripts/omw/camera.lua b/files/builtin_scripts/scripts/omw/camera.lua
index 55460dc615..1a5d1ca730 100644
--- a/files/builtin_scripts/scripts/omw/camera.lua
+++ b/files/builtin_scripts/scripts/omw/camera.lua
@@ -19,7 +19,7 @@ local noStandingPreview = 0
 local noHeadBobbing = 0
 local noZoom = 0
 
-function init()
+local function init()
     camera.allowCharacterDeferredRotation(settings._getBoolFromSettingsCfg('Camera', 'deferred preview rotation'))
     if camera.getMode() == MODE.FirstPerson then
         primaryMode = MODE.FirstPerson
@@ -171,32 +171,54 @@ end
 
 return {
     interfaceName = 'Camera',
+    --- @module Camera
+    -- @usage require('openmw.interfaces').Camera
     interface = {
+        --- @field [parent=#Camera] #number version Interface version
         version = 0,
 
+        --- @function [parent=#Camera] getPrimaryMode Returns primary mode (MODE.FirstPerson or MODE.ThirdPerson).
         getPrimaryMode = function() return primaryMode end,
+        --- @function [parent=#Camera] getBaseThirdPersonDistance
         getBaseThirdPersonDistance = function() return third_person.baseDistance end,
+        --- @function [parent=#Camera] setBaseThirdPersonDistance
         setBaseThirdPersonDistance = function(v) third_person.baseDistance = v end,
+        --- @function [parent=#Camera] getTargetThirdPersonDistance
         getTargetThirdPersonDistance = function() return third_person.preferredDistance end,
 
+        --- @function [parent=#Camera] isModeControlEnabled
         isModeControlEnabled = function() return noModeControl == 0 end,
+        --- @function [parent=#Camera] disableModeControl
         disableModeControl = function() noModeControl = noModeControl + 1 end,
+        --- @function [parent=#Camera] enableModeControl
         enableModeControl = function() noModeControl = math.max(0, noModeControl - 1) end,
 
+        --- @function [parent=#Camera] isStandingPreviewEnabled
         isStandingPreviewEnabled = function() return previewIfStandSill and noStandingPreview == 0 end,
+        --- @function [parent=#Camera] disableStandingPreview
         disableStandingPreview = function() noStandingPreview = noStandingPreview + 1 end,
+        --- @function [parent=#Camera] enableStandingPreview
         enableStandingPreview = function() noStandingPreview = math.max(0, noStandingPreview - 1) end,
 
+        --- @function [parent=#Camera] isHeadBobbingEnabled
         isHeadBobbingEnabled = function() return head_bobbing.enabled and noHeadBobbing == 0 end,
+        --- @function [parent=#Camera] disableHeadBobbing
         disableHeadBobbing = function() noHeadBobbing = noHeadBobbing + 1 end,
+        --- @function [parent=#Camera] enableHeadBobbing
         enableHeadBobbing = function() noHeadBobbing = math.max(0, noHeadBobbing - 1) end,
 
+        --- @function [parent=#Camera] isZoomEnabled
         isZoomEnabled = function() return noZoom == 0 end,
+        --- @function [parent=#Camera] disableZoom
         disableZoom = function() noZoom = noZoom + 1 end,
+        --- @function [parent=#Camera] enableZoom
         enableZoom = function() noZoom = math.max(0, noZoom - 1) end,
 
+        --- @function [parent=#Camera] isThirdPersonOffsetControlEnabled
         isThirdPersonOffsetControlEnabled = function() return third_person.noOffsetControl == 0 end,
+        --- @function [parent=#Camera] disableThirdPersonOffsetControl
         disableThirdPersonOffsetControl = function() third_person.noOffsetControl = third_person.noOffsetControl + 1 end,
+        --- @function [parent=#Camera] enableThirdPersonOffsetControl
         enableThirdPersonOffsetControl = function() third_person.noOffsetControl = math.max(0, third_person.noOffsetControl - 1) end,
     },
     engineHandlers = {
diff --git a/files/lua_api/openmw/camera.lua b/files/lua_api/openmw/camera.lua
new file mode 100644
index 0000000000..0d72214414
--- /dev/null
+++ b/files/lua_api/openmw/camera.lua
@@ -0,0 +1,171 @@
+-------------------------------------------------------------------------------
+-- `openmw.camera` controls camera.
+-- Can be used only by player scripts.
+-- @module camera
+-- @usage local camera = require('openmw.camera')
+
+
+-------------------------------------------------------------------------------
+-- @type MODE Camera modes.
+-- @field #number Static Camera doesn't track player; player inputs doesn't affect camera; use `setStaticPosition` to move the camera.
+-- @field #number FirstPerson First person mode.
+-- @field #number ThirdPerson Third person mode; player character turns to the view direction.
+-- @field #number Vanity Similar to Preview; camera slowly moves around the player.
+-- @field #number Preview Third person mode, but player character doesn't turn to the view direction.
+
+-------------------------------------------------------------------------------
+-- Camera modes.
+-- @field [parent=#camera] #MODE MODE
+
+-------------------------------------------------------------------------------
+-- Return the current @{openmw.camera#MODE}.
+-- @function [parent=#camera] getMode
+-- @return #MODE
+
+-------------------------------------------------------------------------------
+-- Return the mode the camera will switch to after the end of the current animation. Can be nil.
+-- @function [parent=#camera] getQueuedMode
+-- @return #MODE
+
+-------------------------------------------------------------------------------
+-- Change @{openmw.camera#MODE}; if the second (optional, true by default) argument is set to false, the switching can be delayed (see `getQueuedMode`).
+-- @function [parent=#camera] setMode
+-- @param #MODE mode
+-- @param #boolean force
+
+-------------------------------------------------------------------------------
+-- If set to true then after switching from Preview to ThirdPerson the player character turns to the camera view direction. Otherwise the camera turns to the character view direction.
+-- @function [parent=#camera] allowCharacterDeferredRotation
+-- @param #boolean boolValue
+
+-------------------------------------------------------------------------------
+-- Show/hide crosshair.
+-- @function [parent=#camera] showCrosshair
+-- @param #boolean boolValue
+
+-------------------------------------------------------------------------------
+-- Current position of the tracked object (the characters head if there is no animation).
+-- @function [parent=#camera] getTrackedPosition
+-- @return openmw.util#Vector3
+
+-------------------------------------------------------------------------------
+-- Current position of the camera.
+-- @function [parent=#camera] getPosition
+-- @return openmw.util#Vector3
+
+-------------------------------------------------------------------------------
+-- Camera pitch angle (radians) without taking extraPitch into account.
+-- Full pitch is `getPitch()+getExtraPitch()`.
+-- @function [parent=#camera] getPitch
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Force the pitch angle to the given value (radians); player input on this axis is ignored in this frame.
+-- @function [parent=#camera] setPitch
+-- @param #number value
+
+-------------------------------------------------------------------------------
+-- Camera yaw angle (radians) without taking extraYaw into account.
+-- Full yaw is `getYaw()+getExtraYaw()`.
+-- @function [parent=#camera] getYaw
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Force the yaw angle to the given value (radians); player input on this axis is ignored in this frame.
+-- @function [parent=#camera] setYaw
+-- @param #number value
+
+-------------------------------------------------------------------------------
+-- Get camera roll angle (radians).
+-- @function [parent=#camera] getRoll
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Set camera roll angle (radians).
+-- @function [parent=#camera] setRoll
+-- @param #number value
+
+-------------------------------------------------------------------------------
+-- Additional summand for the pitch angle that is not affected by player input.
+-- Full pitch is `getPitch()+getExtraPitch()`.
+-- @function [parent=#camera] getExtraPitch
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Additional summand for the pitch angle; useful for camera shaking effects.
+-- Setting extra pitch doesn't block player input.
+-- Full pitch is `getPitch()+getExtraPitch()`.
+-- @function [parent=#camera] setExtraPitch
+-- @param #number value
+
+-------------------------------------------------------------------------------
+-- Additional summand for the yaw angle that is not affected by player input.
+-- Full yaw is `getYaw()+getExtraYaw()`.
+-- @function [parent=#camera] getExtraYaw
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Additional summand for the yaw angle; useful for camera shaking effects.
+-- Setting extra pitch doesn't block player input.
+-- Full yaw is `getYaw()+getExtraYaw()`.
+-- @function [parent=#camera] setExtraYaw
+-- @param #number value
+
+-------------------------------------------------------------------------------
+-- Set camera position; can be used only if camera is in Static mode.
+-- @function [parent=#camera] setStaticPosition
+-- @param openmw.util#Vector3 pos
+
+-------------------------------------------------------------------------------
+-- The offset between the characters head and the camera in first person mode (3d vector).
+-- @function [parent=#camera] getFirstPersonOffset
+-- @return openmw.util#Vector3
+
+-------------------------------------------------------------------------------
+-- Set the offset between the characters head and the camera in first person mode (3d vector).
+-- @function [parent=#camera] setFirstPersonOffset
+-- @param openmw.util#Vector3 offset
+
+-------------------------------------------------------------------------------
+-- Preferred offset between tracked position (see `getTrackedPosition`) and the camera focal point (the center of the screen) in third person mode.
+-- See `setFocalPreferredOffset`.
+-- @function [parent=#camera] getFocalPreferredOffset
+-- @return openmw.util#Vector2
+
+-------------------------------------------------------------------------------
+-- Set preferred offset between tracked position (see `getTrackedPosition`) and the camera focal point (the center of the screen) in third person mode.
+-- The offset is a 2d vector (X, Y) where X is horizontal (to the right from the character) and Y component is vertical (upward).
+-- The real offset can differ from the preferred one during smooth transition of if blocked by an obstacle.
+-- Smooth transition happens by default every time when the preferred offset was changed. Use `instantTransition()` to skip the current transition.
+-- @function [parent=#camera] setFocalPreferredOffset
+-- @param openmw.util#Vector2 offset
+
+-------------------------------------------------------------------------------
+-- The actual distance between the camera and the character in third person mode; can differ from the preferred one if there is an obstacle.
+-- @function [parent=#camera] getThirdPersonDistance
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Set preferred distance between the camera and the character in third person mode.
+-- @function [parent=#camera] setPreferredThirdPersonDistance
+-- @param #number distance
+
+-------------------------------------------------------------------------------
+-- The current speed coefficient of focal point (the center of the screen in third person mode) smooth transition.
+-- @function [parent=#camera] getFocalTransitionSpeed
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Set the speed coefficient of focal point (the center of the screen in third person mode) smooth transition.
+-- Smooth transition happens by default every time when the preferred offset was changed. Use `instantTransition()` to skip the current transition.
+-- @function [parent=#camera] setFocalTransitionSpeed
+-- Set the speed coefficient 
+-- @param #number speed
+
+-------------------------------------------------------------------------------
+-- Make instant the current transition of camera focal point and the current deferred rotation (see `allowCharacterDeferredRotation`).
+-- @function [parent=#camera] instantTransition
+
+
+return nil
+

From 42020bc2c3558915c0e033e6ee4bd9858132cccc Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 20 Nov 2021 00:02:48 +0000
Subject: [PATCH 1739/2859] Ignore the axis argument when rotating the player

---
 CHANGELOG.md                                      | 1 +
 apps/openmw/mwscript/transformationextensions.cpp | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index be789859ea..27a5094e1b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -68,6 +68,7 @@
     Bug #6321: Arrow enchantments should always be applied to the target
     Bug #6322: Total sold/cost should reset to 0 when there are no items offered
     Bug #6323: Wyrmhaven: Alboin doesn't follower the player character out of his house
+    Bug #6324: Special Slave Companions: Can't buy the slave companions
     Bug #6326: Detect Enchantment/Key should detect items in unresolved containers
     Bug #6327: Blocking roots the character in place
     Bug #6343: Magic projectile speed doesn't take race weight into account
diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index 5cfb2b2989..292965fd94 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -622,12 +622,13 @@ namespace MWScript
                     runtime.pop();
 
                     auto rot = ptr.getRefData().getPosition().asRotationVec3();
-                    if (axis == "x")
+                    // Regardless of the axis argument, the player may only be rotated on Z
+                    if (axis == "z" || MWMechanics::getPlayer() == ptr)
+                        rot.z() += rotation;
+                    else if (axis == "x")
                         rot.x() += rotation;
                     else if (axis == "y")
                         rot.y() += rotation;
-                    else if (axis == "z")
-                        rot.z() += rotation;
                     MWBase::Environment::get().getWorld()->rotateObject(ptr,rot);
                 }
         };

From fcef92e3ea74b46754f3f4ec4e55730fb34d1e46 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sat, 20 Nov 2021 02:59:57 +0300
Subject: [PATCH 1740/2859] Make AiExtensions less toxic (bug #6429)

---
 CHANGELOG.md                          |  1 +
 apps/openmw/mwscript/aiextensions.cpp | 76 ++++++++++++++++++++-------
 2 files changed, 58 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index be789859ea..d5f157d81a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -78,6 +78,7 @@
     Bug #6386: Artifacts in water reflection due to imprecise screen-space coordinate computation
     Bug #6396: Inputting certain Unicode characters triggers an assertion
     Bug #6416: Morphs are applied to the wrong target
+    Bug #6429: Wyrmhaven: Can't add AI packages to player
     Feature #890: OpenMW-CS: Column filtering
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
     Feature #2780: A way to see current OpenMW version in the console
diff --git a/apps/openmw/mwscript/aiextensions.cpp b/apps/openmw/mwscript/aiextensions.cpp
index 33f16aea3f..d1adffc9fa 100644
--- a/apps/openmw/mwscript/aiextensions.cpp
+++ b/apps/openmw/mwscript/aiextensions.cpp
@@ -14,6 +14,7 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
 
+#include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/aiactivate.hpp"
 #include "../mwmechanics/aiescort.hpp"
@@ -50,6 +51,9 @@ namespace MWScript
                     // discard additional arguments (reset), because we have no idea what they mean.
                     for (unsigned int i=0; i<arg0; ++i) runtime.pop();
 
+                    if (!ptr.getClass().isActor() || ptr == MWMechanics::getPlayer())
+                        return;
+
                     MWMechanics::AiActivate activatePackage(objectID);
                     ptr.getClass().getCreatureStats (ptr).getAiSequence().stack(activatePackage, ptr);
                     Log(Debug::Info) << "AiActivate";
@@ -77,6 +81,9 @@ namespace MWScript
                     // discard additional arguments (reset), because we have no idea what they mean.
                     for (unsigned int i=0; i<arg0; ++i) runtime.pop();
 
+                    if (!ptr.getClass().isActor() || ptr == MWMechanics::getPlayer())
+                        return;
+
                     MWMechanics::AiTravel travelPackage(x, y, z);
                     ptr.getClass().getCreatureStats (ptr).getAiSequence().stack(travelPackage, ptr);
 
@@ -111,6 +118,9 @@ namespace MWScript
                     // discard additional arguments (reset), because we have no idea what they mean.
                     for (unsigned int i=0; i<arg0; ++i) runtime.pop();
 
+                    if (!ptr.getClass().isActor() || ptr == MWMechanics::getPlayer())
+                        return;
+
                     MWMechanics::AiEscort escortPackage(actorID, static_cast<int>(duration), x, y, z);
                     ptr.getClass().getCreatureStats (ptr).getAiSequence().stack(escortPackage, ptr);
 
@@ -148,10 +158,14 @@ namespace MWScript
                     // discard additional arguments (reset), because we have no idea what they mean.
                     for (unsigned int i=0; i<arg0; ++i) runtime.pop();
 
+                    if (!ptr.getClass().isActor() || ptr == MWMechanics::getPlayer())
+                        return;
+
                     if (cellID.empty())
-                        throw std::runtime_error("AiEscortCell: no cell ID given");
+                        return;
 
-                    MWBase::Environment::get().getWorld()->getStore().get<ESM::Cell>().find(cellID);
+                    if (!MWBase::Environment::get().getWorld()->getStore().get<ESM::Cell>().search(cellID))
+                        return;
 
                     MWMechanics::AiEscort escortPackage(actorID, cellID, static_cast<int>(duration), x, y, z);
                     ptr.getClass().getCreatureStats (ptr).getAiSequence().stack(escortPackage, ptr);
@@ -169,9 +183,11 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    Interpreter::Type_Integer value = ptr.getClass().getCreatureStats (ptr).getAiSequence().isPackageDone();
+                    bool done = false;
+                    if (ptr.getClass().isActor())
+                        done = ptr.getClass().getCreatureStats(ptr).getAiSequence().isPackageDone();
 
-                    runtime.push (value);
+                    runtime.push(done);
                 }
         };
 
@@ -224,6 +240,9 @@ namespace MWScript
                     // discard additional arguments (reset), because we have no idea what they mean.
                     for (unsigned int i=0; i<arg0; ++i) runtime.pop();
 
+                    if (!ptr.getClass().isActor() || ptr == MWMechanics::getPlayer())
+                        return;
+
                     MWMechanics::AiWander wanderPackage(range, duration, time, idleList, repeat);
                     ptr.getClass().getCreatureStats (ptr).getAiSequence().stack(wanderPackage, ptr);
                 }
@@ -240,7 +259,10 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    runtime.push(ptr.getClass().getCreatureStats (ptr).getAiSetting (mIndex).getModified(false));
+                    Interpreter::Type_Integer value = 0;
+                    if (ptr.getClass().isActor())
+                        value = ptr.getClass().getCreatureStats (ptr).getAiSetting(mIndex).getModified(false);
+                    runtime.push(value);
                 }
         };
         template<class R>
@@ -256,6 +278,9 @@ namespace MWScript
                     Interpreter::Type_Integer value = runtime[0].mInteger;
                     runtime.pop();
 
+                    if (!ptr.getClass().isActor())
+                        return;
+
                     int modified = ptr.getClass().getCreatureStats (ptr).getAiSetting (mIndex).getBase() + value;
 
                     ptr.getClass().getCreatureStats (ptr).setAiSetting (mIndex, modified);
@@ -309,6 +334,9 @@ namespace MWScript
                     // discard additional arguments (reset), because we have no idea what they mean.
                     for (unsigned int i=0; i<arg0; ++i) runtime.pop();
 
+                    if (!ptr.getClass().isActor() || ptr == MWMechanics::getPlayer())
+                        return;
+
                     MWMechanics::AiFollow followPackage(actorID, duration, x, y ,z);
                     ptr.getClass().getCreatureStats (ptr).getAiSequence().stack(followPackage, ptr);
 
@@ -346,6 +374,9 @@ namespace MWScript
                     // discard additional arguments (reset), because we have no idea what they mean.
                     for (unsigned int i=0; i<arg0; ++i) runtime.pop();
 
+                    if (!ptr.getClass().isActor() || ptr == MWMechanics::getPlayer())
+                        return;
+
                     MWMechanics::AiFollow followPackage(actorID, cellID, duration, x, y ,z);
                     ptr.getClass().getCreatureStats (ptr).getAiSequence().stack(followPackage, ptr);
                     Log(Debug::Info) << "AiFollow: " << actorID << ", " << x << ", " << y << ", " << z << ", " << duration;
@@ -431,23 +462,25 @@ namespace MWScript
                     std::string testedTargetId = runtime.getStringLiteral (runtime[0].mInteger);
                     runtime.pop();
 
-                    const MWMechanics::CreatureStats& creatureStats = actor.getClass().getCreatureStats(actor);
-
                     bool targetsAreEqual = false;
-                    MWWorld::Ptr targetPtr;
-                    if (creatureStats.getAiSequence().getCombatTarget (targetPtr))
+                    if (actor.getClass().isActor())
                     {
-                        if (!targetPtr.isEmpty() && targetPtr.getCellRef().getRefId() == testedTargetId)
-                            targetsAreEqual = true;
-                    }
-                    else if (testedTargetId == "player") // Currently the player ID is hardcoded
-                    {
-                        MWBase::MechanicsManager* mechMgr = MWBase::Environment::get().getMechanicsManager();
-                        bool greeting = mechMgr->getGreetingState(actor) == MWMechanics::Greet_InProgress;
-                        bool sayActive = MWBase::Environment::get().getSoundManager()->sayActive(actor);
-                        targetsAreEqual = (greeting && sayActive) || mechMgr->isTurningToPlayer(actor);
+                        const MWMechanics::CreatureStats& creatureStats = actor.getClass().getCreatureStats(actor);
+                        MWWorld::Ptr targetPtr;
+                        if (creatureStats.getAiSequence().getCombatTarget(targetPtr))
+                        {
+                            if (!targetPtr.isEmpty() && targetPtr.getCellRef().getRefId() == testedTargetId)
+                                targetsAreEqual = true;
+                        }
+                        else if (testedTargetId == "player") // Currently the player ID is hardcoded
+                        {
+                            MWBase::MechanicsManager* mechMgr = MWBase::Environment::get().getMechanicsManager();
+                            bool greeting = mechMgr->getGreetingState(actor) == MWMechanics::Greet_InProgress;
+                            bool sayActive = MWBase::Environment::get().getSoundManager()->sayActive(actor);
+                            targetsAreEqual = (greeting && sayActive) || mechMgr->isTurningToPlayer(actor);
+                        }
                     }
-                    runtime.push(int(targetsAreEqual));
+                    runtime.push(targetsAreEqual);
                 }
         };
 
@@ -474,6 +507,8 @@ namespace MWScript
                 void execute (Interpreter::Runtime& runtime) override
                 {
                     MWWorld::Ptr actor = R()(runtime);
+                    if (!actor.getClass().isActor())
+                        return;
                     MWMechanics::CreatureStats& creatureStats = actor.getClass().getCreatureStats(actor);
                     creatureStats.getAiSequence().stopCombat();
                 }
@@ -505,6 +540,9 @@ namespace MWScript
                 Interpreter::Type_Float y = runtime[0].mFloat;
                 runtime.pop();
 
+                if (!actor.getClass().isActor() || actor == MWMechanics::getPlayer())
+                    return;
+
                 MWMechanics::AiFace facePackage(x, y);
                 actor.getClass().getCreatureStats(actor).getAiSequence().stack(facePackage, actor);
             }

From 231da19aa4e1a01e625c853d613089ec671e4bcb Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Tue, 16 Nov 2021 22:04:04 +0100
Subject: [PATCH 1741/2859] Load repeat flag and use reset argument

---
 apps/openmw/mwmechanics/aiactivate.cpp     |  4 +--
 apps/openmw/mwmechanics/aiactivate.hpp     |  2 +-
 apps/openmw/mwmechanics/aiescort.cpp       |  8 ++---
 apps/openmw/mwmechanics/aiescort.hpp       |  4 +--
 apps/openmw/mwmechanics/aifollow.cpp       | 24 +++------------
 apps/openmw/mwmechanics/aifollow.hpp       |  6 ++--
 apps/openmw/mwmechanics/aipackage.hpp      |  2 +-
 apps/openmw/mwmechanics/aisequence.cpp     | 36 ++++------------------
 apps/openmw/mwmechanics/aisequence.hpp     |  3 --
 apps/openmw/mwmechanics/aitravel.cpp       |  8 ++---
 apps/openmw/mwmechanics/aitravel.hpp       |  4 +--
 apps/openmw/mwmechanics/aiwander.cpp       |  2 +-
 apps/openmw/mwmechanics/typedaipackage.hpp |  3 ++
 apps/openmw/mwscript/aiextensions.cpp      | 32 +++++++++++--------
 components/esm/aipackage.hpp               |  8 +++--
 15 files changed, 56 insertions(+), 90 deletions(-)

diff --git a/apps/openmw/mwmechanics/aiactivate.cpp b/apps/openmw/mwmechanics/aiactivate.cpp
index b4ddf0c030..aa36b9af95 100644
--- a/apps/openmw/mwmechanics/aiactivate.cpp
+++ b/apps/openmw/mwmechanics/aiactivate.cpp
@@ -13,8 +13,8 @@
 
 namespace MWMechanics
 {
-    AiActivate::AiActivate(const std::string &objectId)
-        : mObjectId(objectId)
+    AiActivate::AiActivate(const std::string &objectId, bool repeat)
+        : TypedAiPackage<AiActivate>(repeat), mObjectId(objectId)
     {
     }
 
diff --git a/apps/openmw/mwmechanics/aiactivate.hpp b/apps/openmw/mwmechanics/aiactivate.hpp
index dc7e0bb26b..ad4d4e6064 100644
--- a/apps/openmw/mwmechanics/aiactivate.hpp
+++ b/apps/openmw/mwmechanics/aiactivate.hpp
@@ -24,7 +24,7 @@ namespace MWMechanics
         public:
             /// Constructor
             /** \param objectId Reference to object to activate **/
-            explicit AiActivate(const std::string &objectId);
+            explicit AiActivate(const std::string &objectId, bool repeat);
 
             explicit AiActivate(const ESM::AiSequence::AiActivate* activate);
 
diff --git a/apps/openmw/mwmechanics/aiescort.cpp b/apps/openmw/mwmechanics/aiescort.cpp
index 75c0461105..6a6df50049 100644
--- a/apps/openmw/mwmechanics/aiescort.cpp
+++ b/apps/openmw/mwmechanics/aiescort.cpp
@@ -20,16 +20,16 @@
 
 namespace MWMechanics
 {
-    AiEscort::AiEscort(const std::string &actorId, int duration, float x, float y, float z)
-    : mX(x), mY(y), mZ(z), mDuration(duration), mRemainingDuration(static_cast<float>(duration))
+    AiEscort::AiEscort(const std::string &actorId, int duration, float x, float y, float z, bool repeat)
+    : TypedAiPackage<AiEscort>(repeat), mX(x), mY(y), mZ(z), mDuration(duration), mRemainingDuration(static_cast<float>(duration))
     , mCellX(std::numeric_limits<int>::max())
     , mCellY(std::numeric_limits<int>::max())
     {
         mTargetActorRefId = actorId;
     }
 
-    AiEscort::AiEscort(const std::string &actorId, const std::string &cellId, int duration, float x, float y, float z)
-    : mCellId(cellId), mX(x), mY(y), mZ(z), mDuration(duration), mRemainingDuration(static_cast<float>(duration))
+    AiEscort::AiEscort(const std::string &actorId, const std::string &cellId, int duration, float x, float y, float z, bool repeat)
+    : TypedAiPackage<AiEscort>(repeat), mCellId(cellId), mX(x), mY(y), mZ(z), mDuration(duration), mRemainingDuration(static_cast<float>(duration))
     , mCellX(std::numeric_limits<int>::max())
     , mCellY(std::numeric_limits<int>::max())
     {
diff --git a/apps/openmw/mwmechanics/aiescort.hpp b/apps/openmw/mwmechanics/aiescort.hpp
index 27a177893d..c49e227e09 100644
--- a/apps/openmw/mwmechanics/aiescort.hpp
+++ b/apps/openmw/mwmechanics/aiescort.hpp
@@ -22,11 +22,11 @@ namespace MWMechanics
             /// Implementation of AiEscort
             /** The Actor will escort the specified actor to the world position x, y, z until they reach their position, or they run out of time
                 \implement AiEscort **/
-            AiEscort(const std::string &actorId, int duration, float x, float y, float z);
+            AiEscort(const std::string &actorId, int duration, float x, float y, float z, bool repeat);
             /// Implementation of AiEscortCell
             /** The Actor will escort the specified actor to the cell position x, y, z until they reach their position, or they run out of time
                 \implement AiEscortCell **/
-            AiEscort(const std::string &actorId, const std::string &cellId, int duration, float x, float y, float z);
+            AiEscort(const std::string &actorId, const std::string &cellId, int duration, float x, float y, float z, bool repeat);
 
             AiEscort(const ESM::AiSequence::AiEscort* escort);
 
diff --git a/apps/openmw/mwmechanics/aifollow.cpp b/apps/openmw/mwmechanics/aifollow.cpp
index ec23679977..f44321dfbc 100644
--- a/apps/openmw/mwmechanics/aifollow.cpp
+++ b/apps/openmw/mwmechanics/aifollow.cpp
@@ -28,36 +28,20 @@ namespace MWMechanics
 {
 int AiFollow::mFollowIndexCounter = 0;
 
-AiFollow::AiFollow(const std::string &actorId, float duration, float x, float y, float z)
-: mAlwaysFollow(false), mDuration(duration), mRemainingDuration(duration), mX(x), mY(y), mZ(z)
+AiFollow::AiFollow(const std::string &actorId, float duration, float x, float y, float z, bool repeat)
+: TypedAiPackage<AiFollow>(repeat), mAlwaysFollow(false), mDuration(duration), mRemainingDuration(duration), mX(x), mY(y), mZ(z)
 , mCellId(""), mActive(false), mFollowIndex(mFollowIndexCounter++)
 {
     mTargetActorRefId = actorId;
 }
 
-AiFollow::AiFollow(const std::string &actorId, const std::string &cellId, float duration, float x, float y, float z)
-: mAlwaysFollow(false), mDuration(duration), mRemainingDuration(duration), mX(x), mY(y), mZ(z)
+AiFollow::AiFollow(const std::string &actorId, const std::string &cellId, float duration, float x, float y, float z, bool repeat)
+: TypedAiPackage<AiFollow>(repeat), mAlwaysFollow(false), mDuration(duration), mRemainingDuration(duration), mX(x), mY(y), mZ(z)
 , mCellId(cellId), mActive(false), mFollowIndex(mFollowIndexCounter++)
 {
     mTargetActorRefId = actorId;
 }
 
-AiFollow::AiFollow(const MWWorld::Ptr& actor, float duration, float x, float y, float z)
-: mAlwaysFollow(false), mDuration(duration), mRemainingDuration(duration), mX(x), mY(y), mZ(z)
-, mCellId(""), mActive(false), mFollowIndex(mFollowIndexCounter++)
-{
-    mTargetActorRefId = actor.getCellRef().getRefId();
-    mTargetActorId = actor.getClass().getCreatureStats(actor).getActorId();
-}
-
-AiFollow::AiFollow(const MWWorld::Ptr& actor, const std::string &cellId, float duration, float x, float y, float z)
-: mAlwaysFollow(false), mDuration(duration), mRemainingDuration(duration), mX(x), mY(y), mZ(z)
-, mCellId(cellId), mActive(false), mFollowIndex(mFollowIndexCounter++)
-{
-    mTargetActorRefId = actor.getCellRef().getRefId();
-    mTargetActorId = actor.getClass().getCreatureStats(actor).getActorId();
-}
-
 AiFollow::AiFollow(const MWWorld::Ptr& actor, bool commanded)
 : TypedAiPackage<AiFollow>(makeDefaultOptions().withShouldCancelPreviousAi(!commanded))
 , mAlwaysFollow(true), mDuration(0), mRemainingDuration(0), mX(0), mY(0), mZ(0)
diff --git a/apps/openmw/mwmechanics/aifollow.hpp b/apps/openmw/mwmechanics/aifollow.hpp
index c4ac5eb3f2..b83e464fa1 100644
--- a/apps/openmw/mwmechanics/aifollow.hpp
+++ b/apps/openmw/mwmechanics/aifollow.hpp
@@ -40,12 +40,10 @@ namespace MWMechanics
     class AiFollow final : public TypedAiPackage<AiFollow>
     {
         public:
-            AiFollow(const std::string &actorId, float duration, float x, float y, float z);
-            AiFollow(const std::string &actorId, const std::string &CellId, float duration, float x, float y, float z);
             /// Follow Actor for duration or until you arrive at a world position
-            AiFollow(const MWWorld::Ptr& actor, float duration, float X, float Y, float Z);
+            AiFollow(const std::string &actorId, float duration, float x, float y, float z, bool repeat);
             /// Follow Actor for duration or until you arrive at a position in a cell
-            AiFollow(const MWWorld::Ptr& actor, const std::string &CellId, float duration, float X, float Y, float Z);
+            AiFollow(const std::string &actorId, const std::string &CellId, float duration, float x, float y, float z, bool repeat);
             /// Follow Actor indefinitively
             AiFollow(const MWWorld::Ptr& actor, bool commanded=false);
 
diff --git a/apps/openmw/mwmechanics/aipackage.hpp b/apps/openmw/mwmechanics/aipackage.hpp
index 5270b74166..498c6e3050 100644
--- a/apps/openmw/mwmechanics/aipackage.hpp
+++ b/apps/openmw/mwmechanics/aipackage.hpp
@@ -108,7 +108,7 @@ namespace MWMechanics
             /// Upon adding this Ai package, should the Ai Sequence attempt to cancel previous Ai packages (default true)?
             bool shouldCancelPreviousAi() const { return mOptions.mShouldCancelPreviousAi; }
 
-            /// Return true if this package should repeat. Currently only used for Wander packages.
+            /// Return true if this package should repeat.
             bool getRepeat() const { return mOptions.mRepeat; }
 
             virtual osg::Vec3f getDestination() const { return osg::Vec3f(0, 0, 0); }
diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index bf4cf28deb..b1827dd8ef 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -31,14 +31,13 @@ void AiSequence::copy (const AiSequence& sequence)
     sequence.mAiState.copy<AiWanderStorage>(mAiState);
 }
 
-AiSequence::AiSequence() : mDone (false), mRepeat(false), mLastAiPackage(AiPackageTypeId::None) {}
+AiSequence::AiSequence() : mDone (false), mLastAiPackage(AiPackageTypeId::None) {}
 
 AiSequence::AiSequence (const AiSequence& sequence)
 {
     copy (sequence);
     mDone = sequence.mDone;
     mLastAiPackage = sequence.mLastAiPackage;
-    mRepeat = sequence.mRepeat;
 }
 
 AiSequence& AiSequence::operator= (const AiSequence& sequence)
@@ -281,7 +280,7 @@ void AiSequence::execute (const MWWorld::Ptr& actor, CharacterController& charac
             if (package->execute(actor, characterController, mAiState, duration))
             {
                 // Put repeating noncombat AI packages on the end of the stack so they can be used again
-                if (isActualAiPackage(packageTypeId) && (mRepeat || package->getRepeat()))
+                if (isActualAiPackage(packageTypeId) && package->getRepeat())
                 {
                     package->reset();
                     mPackages.push_back(package->clone());
@@ -355,7 +354,6 @@ void AiSequence::stack (const AiPackage& package, const MWWorld::Ptr& actor, boo
             else
                 ++it;
         }
-        mRepeat=false;
     }
 
     // insert new package in correct place depending on priority
@@ -401,10 +399,6 @@ const AiPackage& MWMechanics::AiSequence::getActivePackage()
 
 void AiSequence::fill(const ESM::AIPackageList &list)
 {
-    // If there is more than one package in the list, enable repeating
-    if (list.mList.size() >= 2)
-        mRepeat = true;
-
     for (const auto& esmPackage : list.mList)
     {
         std::unique_ptr<MWMechanics::AiPackage> package;
@@ -420,22 +414,22 @@ void AiSequence::fill(const ESM::AIPackageList &list)
         else if (esmPackage.mType == ESM::AI_Escort)
         {
             ESM::AITarget data = esmPackage.mTarget;
-            package = std::make_unique<MWMechanics::AiEscort>(data.mId.toString(), data.mDuration, data.mX, data.mY, data.mZ);
+            package = std::make_unique<MWMechanics::AiEscort>(data.mId.toString(), data.mDuration, data.mX, data.mY, data.mZ, data.mShouldRepeat != 0);
         }
         else if (esmPackage.mType == ESM::AI_Travel)
         {
             ESM::AITravel data = esmPackage.mTravel;
-            package = std::make_unique<MWMechanics::AiTravel>(data.mX, data.mY, data.mZ);
+            package = std::make_unique<MWMechanics::AiTravel>(data.mX, data.mY, data.mZ, data.mShouldRepeat != 0);
         }
         else if (esmPackage.mType == ESM::AI_Activate)
         {
             ESM::AIActivate data = esmPackage.mActivate;
-            package = std::make_unique<MWMechanics::AiActivate>(data.mName.toString());
+            package = std::make_unique<MWMechanics::AiActivate>(data.mName.toString(), data.mShouldRepeat != 0);
         }
         else //if (esmPackage.mType == ESM::AI_Follow)
         {
             ESM::AITarget data = esmPackage.mTarget;
-            package = std::make_unique<MWMechanics::AiFollow>(data.mId.toString(), data.mDuration, data.mX, data.mY, data.mZ);
+            package = std::make_unique<MWMechanics::AiFollow>(data.mId.toString(), data.mDuration, data.mX, data.mY, data.mZ, data.mShouldRepeat != 0);
         }
         mPackages.push_back(std::move(package));
     }
@@ -454,24 +448,6 @@ void AiSequence::readState(const ESM::AiSequence::AiSequence &sequence)
     if (!sequence.mPackages.empty())
         clear();
 
-    // If there is more than one non-combat, non-pursue package in the list, enable repeating.
-    int count = 0;
-    for (auto& container : sequence.mPackages)
-    {
-        switch (container.mType)
-        {
-            case ESM::AiSequence::Ai_Wander:
-            case ESM::AiSequence::Ai_Travel:
-            case ESM::AiSequence::Ai_Escort:
-            case ESM::AiSequence::Ai_Follow:
-            case ESM::AiSequence::Ai_Activate:
-                ++count;
-        }
-    }
-
-    if (count > 1)
-        mRepeat = true;
-
     // Load packages
     for (auto& container : sequence.mPackages)
     {
diff --git a/apps/openmw/mwmechanics/aisequence.hpp b/apps/openmw/mwmechanics/aisequence.hpp
index 645524d381..90bd999c91 100644
--- a/apps/openmw/mwmechanics/aisequence.hpp
+++ b/apps/openmw/mwmechanics/aisequence.hpp
@@ -43,9 +43,6 @@ namespace MWMechanics
             ///Finished with top AIPackage, set for one frame
             bool mDone;
 
-            ///Does this AI sequence repeat (repeating of Wander packages handled separately)
-            bool mRepeat;
-
             ///Copy AiSequence
             void copy (const AiSequence& sequence);
 
diff --git a/apps/openmw/mwmechanics/aitravel.cpp b/apps/openmw/mwmechanics/aitravel.cpp
index 2594adcb34..7a2353dbc6 100644
--- a/apps/openmw/mwmechanics/aitravel.cpp
+++ b/apps/openmw/mwmechanics/aitravel.cpp
@@ -34,8 +34,8 @@ bool isWithinMaxRange(const osg::Vec3f& pos1, const osg::Vec3f& pos2)
 
 namespace MWMechanics
 {
-    AiTravel::AiTravel(float x, float y, float z, AiTravel*)
-        : mX(x), mY(y), mZ(z), mHidden(false)
+    AiTravel::AiTravel(float x, float y, float z, bool repeat, AiTravel*)
+        : TypedAiPackage<AiTravel>(repeat), mX(x), mY(y), mZ(z), mHidden(false)
     {
     }
 
@@ -44,8 +44,8 @@ namespace MWMechanics
     {
     }
 
-    AiTravel::AiTravel(float x, float y, float z)
-        : AiTravel(x, y, z, this)
+    AiTravel::AiTravel(float x, float y, float z, bool repeat)
+        : AiTravel(x, y, z, repeat, this)
     {
     }
 
diff --git a/apps/openmw/mwmechanics/aitravel.hpp b/apps/openmw/mwmechanics/aitravel.hpp
index ee4ff9ad4d..303df7b105 100644
--- a/apps/openmw/mwmechanics/aitravel.hpp
+++ b/apps/openmw/mwmechanics/aitravel.hpp
@@ -19,11 +19,11 @@ namespace MWMechanics
     class AiTravel : public TypedAiPackage<AiTravel>
     {
         public:
-            AiTravel(float x, float y, float z, AiTravel* derived);
+            AiTravel(float x, float y, float z, bool repeat, AiTravel* derived);
 
             AiTravel(float x, float y, float z, AiInternalTravel* derived);
 
-            AiTravel(float x, float y, float z);
+            AiTravel(float x, float y, float z, bool repeat);
 
             explicit AiTravel(const ESM::AiSequence::AiTravel* travel);
 
diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 53f050c0dd..664ae105f3 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -105,7 +105,7 @@ namespace MWMechanics
     }
 
     AiWander::AiWander(int distance, int duration, int timeOfDay, const std::vector<unsigned char>& idle, bool repeat):
-        TypedAiPackage<AiWander>(makeDefaultOptions().withRepeat(repeat)),
+        TypedAiPackage<AiWander>(repeat),
         mDistance(std::max(0, distance)),
         mDuration(std::max(0, duration)),
         mRemainingDuration(duration), mTimeOfDay(timeOfDay),
diff --git a/apps/openmw/mwmechanics/typedaipackage.hpp b/apps/openmw/mwmechanics/typedaipackage.hpp
index d2d424326c..0ea276999f 100644
--- a/apps/openmw/mwmechanics/typedaipackage.hpp
+++ b/apps/openmw/mwmechanics/typedaipackage.hpp
@@ -11,6 +11,9 @@ namespace MWMechanics
         TypedAiPackage() :
             AiPackage(T::getTypeId(), T::makeDefaultOptions()) {}
 
+        TypedAiPackage(bool repeat) :
+            AiPackage(T::getTypeId(), T::makeDefaultOptions().withRepeat(repeat)) {}
+
         TypedAiPackage(const Options& options) :
             AiPackage(T::getTypeId(), options) {}
 
diff --git a/apps/openmw/mwscript/aiextensions.cpp b/apps/openmw/mwscript/aiextensions.cpp
index d1adffc9fa..5ebc0bc529 100644
--- a/apps/openmw/mwscript/aiextensions.cpp
+++ b/apps/openmw/mwscript/aiextensions.cpp
@@ -48,13 +48,14 @@ namespace MWScript
                     std::string objectID = runtime.getStringLiteral (runtime[0].mInteger);
                     runtime.pop();
 
-                    // discard additional arguments (reset), because we have no idea what they mean.
+                    // The value of the reset argument doesn't actually matter
+                    bool repeat = arg0;
                     for (unsigned int i=0; i<arg0; ++i) runtime.pop();
 
                     if (!ptr.getClass().isActor() || ptr == MWMechanics::getPlayer())
                         return;
 
-                    MWMechanics::AiActivate activatePackage(objectID);
+                    MWMechanics::AiActivate activatePackage(objectID, repeat);
                     ptr.getClass().getCreatureStats (ptr).getAiSequence().stack(activatePackage, ptr);
                     Log(Debug::Info) << "AiActivate";
                 }
@@ -78,13 +79,14 @@ namespace MWScript
                     Interpreter::Type_Float z = runtime[0].mFloat;
                     runtime.pop();
 
-                    // discard additional arguments (reset), because we have no idea what they mean.
+                    // The value of the reset argument doesn't actually matter
+                    bool repeat = arg0;
                     for (unsigned int i=0; i<arg0; ++i) runtime.pop();
 
                     if (!ptr.getClass().isActor() || ptr == MWMechanics::getPlayer())
                         return;
 
-                    MWMechanics::AiTravel travelPackage(x, y, z);
+                    MWMechanics::AiTravel travelPackage(x, y, z, repeat);
                     ptr.getClass().getCreatureStats (ptr).getAiSequence().stack(travelPackage, ptr);
 
                     Log(Debug::Info) << "AiTravel: " << x << ", " << y << ", " << z;
@@ -115,13 +117,14 @@ namespace MWScript
                     Interpreter::Type_Float z = runtime[0].mFloat;
                     runtime.pop();
 
-                    // discard additional arguments (reset), because we have no idea what they mean.
+                    // The value of the reset argument doesn't actually matter
+                    bool repeat = arg0;
                     for (unsigned int i=0; i<arg0; ++i) runtime.pop();
 
                     if (!ptr.getClass().isActor() || ptr == MWMechanics::getPlayer())
                         return;
 
-                    MWMechanics::AiEscort escortPackage(actorID, static_cast<int>(duration), x, y, z);
+                    MWMechanics::AiEscort escortPackage(actorID, static_cast<int>(duration), x, y, z, repeat);
                     ptr.getClass().getCreatureStats (ptr).getAiSequence().stack(escortPackage, ptr);
 
                     Log(Debug::Info) << "AiEscort: " << x << ", " << y << ", " << z << ", " << duration;
@@ -155,7 +158,8 @@ namespace MWScript
                     Interpreter::Type_Float z = runtime[0].mFloat;
                     runtime.pop();
 
-                    // discard additional arguments (reset), because we have no idea what they mean.
+                    // The value of the reset argument doesn't actually matter
+                    bool repeat = arg0;
                     for (unsigned int i=0; i<arg0; ++i) runtime.pop();
 
                     if (!ptr.getClass().isActor() || ptr == MWMechanics::getPlayer())
@@ -167,7 +171,7 @@ namespace MWScript
                     if (!MWBase::Environment::get().getWorld()->getStore().get<ESM::Cell>().search(cellID))
                         return;
 
-                    MWMechanics::AiEscort escortPackage(actorID, cellID, static_cast<int>(duration), x, y, z);
+                    MWMechanics::AiEscort escortPackage(actorID, cellID, static_cast<int>(duration), x, y, z, repeat);
                     ptr.getClass().getCreatureStats (ptr).getAiSequence().stack(escortPackage, ptr);
 
                     Log(Debug::Info) << "AiEscort: " << x << ", " << y << ", " << z << ", " << duration;
@@ -237,7 +241,7 @@ namespace MWScript
                         --arg0;
                     }
 
-                    // discard additional arguments (reset), because we have no idea what they mean.
+                    // discard additional arguments, because we have no idea what they mean.
                     for (unsigned int i=0; i<arg0; ++i) runtime.pop();
 
                     if (!ptr.getClass().isActor() || ptr == MWMechanics::getPlayer())
@@ -331,13 +335,14 @@ namespace MWScript
                     Interpreter::Type_Float z = runtime[0].mFloat;
                     runtime.pop();
 
-                    // discard additional arguments (reset), because we have no idea what they mean.
+                    // The value of the reset argument doesn't actually matter
+                    bool repeat = arg0;
                     for (unsigned int i=0; i<arg0; ++i) runtime.pop();
 
                     if (!ptr.getClass().isActor() || ptr == MWMechanics::getPlayer())
                         return;
 
-                    MWMechanics::AiFollow followPackage(actorID, duration, x, y ,z);
+                    MWMechanics::AiFollow followPackage(actorID, duration, x, y, z, repeat);
                     ptr.getClass().getCreatureStats (ptr).getAiSequence().stack(followPackage, ptr);
 
                     Log(Debug::Info) << "AiFollow: " << actorID << ", " << x << ", " << y << ", " << z << ", " << duration;
@@ -371,13 +376,14 @@ namespace MWScript
                     Interpreter::Type_Float z = runtime[0].mFloat;
                     runtime.pop();
 
-                    // discard additional arguments (reset), because we have no idea what they mean.
+                    // The value of the reset argument doesn't actually matter
+                    bool repeat = arg0;
                     for (unsigned int i=0; i<arg0; ++i) runtime.pop();
 
                     if (!ptr.getClass().isActor() || ptr == MWMechanics::getPlayer())
                         return;
 
-                    MWMechanics::AiFollow followPackage(actorID, cellID, duration, x, y ,z);
+                    MWMechanics::AiFollow followPackage(actorID, cellID, duration, x, y, z, repeat);
                     ptr.getClass().getCreatureStats (ptr).getAiSequence().stack(followPackage, ptr);
                     Log(Debug::Info) << "AiFollow: " << actorID << ", " << x << ", " << y << ", " << z << ", " << duration;
                 }
diff --git a/components/esm/aipackage.hpp b/components/esm/aipackage.hpp
index 026e65dd82..6993867da1 100644
--- a/components/esm/aipackage.hpp
+++ b/components/esm/aipackage.hpp
@@ -37,7 +37,8 @@ namespace ESM
     struct AITravel
     {
         float   mX, mY, mZ;
-        int     mUnk;
+        unsigned char mShouldRepeat;
+        unsigned char mPadding[3];
     };
 
     struct AITarget
@@ -45,13 +46,14 @@ namespace ESM
         float   mX, mY, mZ;
         short   mDuration;
         NAME32  mId;
-        short   mUnk;
+        unsigned char mShouldRepeat;
+        unsigned char mPadding;
     };
 
     struct AIActivate
     {
         NAME32 mName;
-        unsigned char mUnk;
+        unsigned char mShouldRepeat;
     };
 
     #pragma pack(pop)

From 3c57ffd81fc4f67b2443c820a1ab08788f99d151 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 17 Nov 2021 20:44:55 +0100
Subject: [PATCH 1742/2859] Save repeat and duration

---
 CHANGELOG.md                           |  2 +
 apps/esmtool/record.cpp                |  6 +--
 apps/openmw/mwmechanics/aiactivate.cpp |  3 +-
 apps/openmw/mwmechanics/aiescort.cpp   |  9 ++---
 apps/openmw/mwmechanics/aifollow.cpp   | 18 +++++----
 apps/openmw/mwmechanics/aitravel.cpp   |  3 +-
 components/esm/aisequence.cpp          | 54 ++++++++++++++++++++++++++
 components/esm/aisequence.hpp          |  4 ++
 components/esm/savedgame.cpp           |  2 +-
 9 files changed, 82 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6042e37c08..7b326b29a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,6 +52,7 @@
     Bug #6168: Weather particles flicker for a frame at start of storms
     Bug #6172: Some creatures can't open doors
     Bug #6174: Spellmaking and Enchanting sliders differences from vanilla
+    Bug #6177: Followers of player follower stop following after waiting for a day
     Bug #6184: Command and Calm and Demoralize and Frenzy and Rally magic effects inconsistencies with vanilla
     Bug #6197: Infinite Casting Loop
     Bug #6253: Multiple instances of Reflect stack additively
@@ -81,6 +82,7 @@
     Bug #6416: Morphs are applied to the wrong target
     Bug #6429: Wyrmhaven: Can't add AI packages to player
     Feature #890: OpenMW-CS: Column filtering
+    Feature #1465: "Reset" argument for AI functions
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
     Feature #2780: A way to see current OpenMW version in the console
     Feature #3616: Allow Zoom levels on the World Map
diff --git a/apps/esmtool/record.cpp b/apps/esmtool/record.cpp
index 1de3288ad4..171f64eabe 100644
--- a/apps/esmtool/record.cpp
+++ b/apps/esmtool/record.cpp
@@ -30,7 +30,7 @@ void printAIPackage(const ESM::AIPackage& p)
     {
         std::cout << "    Travel Coordinates: (" << p.mTravel.mX << ","
                   << p.mTravel.mY << "," << p.mTravel.mZ << ")" << std::endl;
-        std::cout << "    Travel Unknown: " << p.mTravel.mUnk << std::endl;
+        std::cout << "    Should repeat: " << p.mTravel.mShouldRepeat << std::endl;
     }
     else if (p.mType == ESM::AI_Follow || p.mType == ESM::AI_Escort)
     {
@@ -38,12 +38,12 @@ void printAIPackage(const ESM::AIPackage& p)
                   << p.mTarget.mY << "," << p.mTarget.mZ << ")" << std::endl;
         std::cout << "    Duration: " << p.mTarget.mDuration << std::endl;
         std::cout << "    Target ID: " << p.mTarget.mId.toString() << std::endl;
-        std::cout << "    Unknown: " << p.mTarget.mUnk << std::endl;
+        std::cout << "    Should repeat: " << p.mTarget.mShouldRepeat << std::endl;
     }
     else if (p.mType == ESM::AI_Activate)
     {
         std::cout << "    Name: " << p.mActivate.mName.toString() << std::endl;
-        std::cout << "    Activate Unknown: " << p.mActivate.mUnk << std::endl;
+        std::cout << "    Should repeat: " << p.mActivate.mShouldRepeat << std::endl;
     }
     else {
         std::cout << "    BadPackage: " << Misc::StringUtils::format("0x%08X", p.mType) << std::endl;
diff --git a/apps/openmw/mwmechanics/aiactivate.cpp b/apps/openmw/mwmechanics/aiactivate.cpp
index aa36b9af95..06aef0cdb0 100644
--- a/apps/openmw/mwmechanics/aiactivate.cpp
+++ b/apps/openmw/mwmechanics/aiactivate.cpp
@@ -48,6 +48,7 @@ namespace MWMechanics
     {
         std::unique_ptr<ESM::AiSequence::AiActivate> activate(new ESM::AiSequence::AiActivate());
         activate->mTargetId = mObjectId;
+        activate->mRepeat = getRepeat();
 
         ESM::AiSequence::AiPackageContainer package;
         package.mType = ESM::AiSequence::Ai_Activate;
@@ -56,7 +57,7 @@ namespace MWMechanics
     }
 
     AiActivate::AiActivate(const ESM::AiSequence::AiActivate *activate)
-        : mObjectId(activate->mTargetId)
+        : AiActivate(activate->mTargetId, activate->mRepeat)
     {
     }
 }
diff --git a/apps/openmw/mwmechanics/aiescort.cpp b/apps/openmw/mwmechanics/aiescort.cpp
index 6a6df50049..0184c6e66f 100644
--- a/apps/openmw/mwmechanics/aiescort.cpp
+++ b/apps/openmw/mwmechanics/aiescort.cpp
@@ -37,11 +37,8 @@ namespace MWMechanics
     }
 
     AiEscort::AiEscort(const ESM::AiSequence::AiEscort *escort)
-        : mCellId(escort->mCellId), mX(escort->mData.mX), mY(escort->mData.mY), mZ(escort->mData.mZ)
-        // mDuration isn't saved in the save file, so just giving it "1" for now if the package has a duration.
-        // The exact value of mDuration only matters for repeating packages.
-        // Previously mRemainingDuration could be negative even when mDuration was 0. Checking for > 0 should fix old saves.
-        , mDuration(escort->mRemainingDuration > 0)
+        : TypedAiPackage<AiEscort>(escort->mRepeat), mCellId(escort->mCellId), mX(escort->mData.mX), mY(escort->mData.mY), mZ(escort->mData.mZ)
+        , mDuration(escort->mData.mDuration)
         , mRemainingDuration(escort->mRemainingDuration)
         , mCellX(std::numeric_limits<int>::max())
         , mCellY(std::numeric_limits<int>::max())
@@ -103,10 +100,12 @@ namespace MWMechanics
         escort->mData.mX = mX;
         escort->mData.mY = mY;
         escort->mData.mZ = mZ;
+        escort->mData.mDuration = mDuration;
         escort->mTargetId = mTargetActorRefId;
         escort->mTargetActorId = mTargetActorId;
         escort->mRemainingDuration = mRemainingDuration;
         escort->mCellId = mCellId;
+        escort->mRepeat = getRepeat();
 
         ESM::AiSequence::AiPackageContainer package;
         package.mType = ESM::AiSequence::Ai_Escort;
diff --git a/apps/openmw/mwmechanics/aifollow.cpp b/apps/openmw/mwmechanics/aifollow.cpp
index f44321dfbc..43a0f25c62 100644
--- a/apps/openmw/mwmechanics/aifollow.cpp
+++ b/apps/openmw/mwmechanics/aifollow.cpp
@@ -52,12 +52,9 @@ AiFollow::AiFollow(const MWWorld::Ptr& actor, bool commanded)
 }
 
 AiFollow::AiFollow(const ESM::AiSequence::AiFollow *follow)
-    : TypedAiPackage<AiFollow>(makeDefaultOptions().withShouldCancelPreviousAi(!follow->mCommanded))
+    : TypedAiPackage<AiFollow>(makeDefaultOptions().withShouldCancelPreviousAi(!follow->mCommanded).withRepeat(follow->mRepeat))
     , mAlwaysFollow(follow->mAlwaysFollow)
-    // mDuration isn't saved in the save file, so just giving it "1" for now if the package had a duration.
-    // The exact value of mDuration only matters for repeating packages.
-    // Previously mRemainingDuration could be negative even when mDuration was 0. Checking for > 0 should fix old saves.
-    , mDuration(follow->mRemainingDuration)
+    , mDuration(follow->mData.mDuration)
     , mRemainingDuration(follow->mRemainingDuration)
     , mX(follow->mData.mX), mY(follow->mData.mY), mZ(follow->mData.mZ)
     , mCellId(follow->mCellId), mActive(follow->mActive), mFollowIndex(mFollowIndexCounter++)
@@ -144,12 +141,15 @@ bool AiFollow::execute (const MWWorld::Ptr& actor, CharacterController& characte
             if (actor.getCell()->isExterior()) //Outside?
             {
                 if (mCellId == "") //No cell to travel to
+                {
+                    mRemainingDuration = mDuration;
                     return true;
+                }
             }
-            else
+            else if (mCellId == actor.getCell()->getCell()->mName) //Cell to travel to
             {
-                if (mCellId == actor.getCell()->getCell()->mName) //Cell to travel to
-                    return true;
+                mRemainingDuration = mDuration;
+                return true;
             }
         }
     }
@@ -205,6 +205,7 @@ void AiFollow::writeState(ESM::AiSequence::AiSequence &sequence) const
     follow->mData.mX = mX;
     follow->mData.mY = mY;
     follow->mData.mZ = mZ;
+    follow->mData.mDuration = mDuration;
     follow->mTargetId = mTargetActorRefId;
     follow->mTargetActorId = mTargetActorId;
     follow->mRemainingDuration = mRemainingDuration;
@@ -212,6 +213,7 @@ void AiFollow::writeState(ESM::AiSequence::AiSequence &sequence) const
     follow->mAlwaysFollow = mAlwaysFollow;
     follow->mCommanded = isCommanded();
     follow->mActive = mActive;
+    follow->mRepeat = getRepeat();
 
     ESM::AiSequence::AiPackageContainer package;
     package.mType = ESM::AiSequence::Ai_Follow;
diff --git a/apps/openmw/mwmechanics/aitravel.cpp b/apps/openmw/mwmechanics/aitravel.cpp
index 7a2353dbc6..0b4a1411eb 100644
--- a/apps/openmw/mwmechanics/aitravel.cpp
+++ b/apps/openmw/mwmechanics/aitravel.cpp
@@ -50,7 +50,7 @@ namespace MWMechanics
     }
 
     AiTravel::AiTravel(const ESM::AiSequence::AiTravel *travel)
-        : mX(travel->mData.mX), mY(travel->mData.mY), mZ(travel->mData.mZ), mHidden(false)
+        : TypedAiPackage<AiTravel>(travel->mRepeat), mX(travel->mData.mX), mY(travel->mData.mY), mZ(travel->mData.mZ), mHidden(false)
     {
         // Hidden ESM::AiSequence::AiTravel package should be converted into MWMechanics::AiInternalTravel type
         assert(!travel->mHidden);
@@ -125,6 +125,7 @@ namespace MWMechanics
         travel->mData.mY = mY;
         travel->mData.mZ = mZ;
         travel->mHidden = mHidden;
+        travel->mRepeat = getRepeat();
 
         ESM::AiSequence::AiPackageContainer package;
         package.mType = ESM::AiSequence::Ai_Travel;
diff --git a/components/esm/aisequence.cpp b/components/esm/aisequence.cpp
index ca4c21802c..b99cac3ade 100644
--- a/components/esm/aisequence.cpp
+++ b/components/esm/aisequence.cpp
@@ -3,6 +3,7 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
+#include <algorithm>
 #include <memory>
 
 namespace ESM
@@ -34,12 +35,16 @@ namespace AiSequence
     {
         esm.getHNT (mData, "DATA");
         esm.getHNOT (mHidden, "HIDD");
+        mRepeat = false;
+        esm.getHNOT(mRepeat, "REPT");
     }
 
     void AiTravel::save(ESMWriter &esm) const
     {
         esm.writeHNT ("DATA", mData);
         esm.writeHNT ("HIDD", mHidden);
+        if(mRepeat)
+            esm.writeHNT("REPT", mRepeat);
     }
 
     void AiEscort::load(ESMReader &esm)
@@ -50,6 +55,15 @@ namespace AiSequence
         esm.getHNOT (mTargetActorId, "TAID");
         esm.getHNT (mRemainingDuration, "DURA");
         mCellId = esm.getHNOString ("CELL");
+        mRepeat = false;
+        esm.getHNOT(mRepeat, "REPT");
+        if(esm.getFormat() < 18)
+        {
+            // mDuration isn't saved in the save file, so just giving it "1" for now if the package has a duration.
+            // The exact value of mDuration only matters for repeating packages.
+            // Previously mRemainingDuration could be negative even when mDuration was 0. Checking for > 0 should fix old saves.
+            mData.mDuration = std::max<float>(mRemainingDuration > 0, mRemainingDuration);
+        }
     }
 
     void AiEscort::save(ESMWriter &esm) const
@@ -60,6 +74,8 @@ namespace AiSequence
         esm.writeHNT ("DURA", mRemainingDuration);
         if (!mCellId.empty())
             esm.writeHNString ("CELL", mCellId);
+        if(mRepeat)
+            esm.writeHNT("REPT", mRepeat);
     }
 
     void AiFollow::load(ESMReader &esm)
@@ -75,6 +91,15 @@ namespace AiSequence
         esm.getHNOT (mCommanded, "CMND");
         mActive = false;
         esm.getHNOT (mActive, "ACTV");
+        mRepeat = false;
+        esm.getHNOT(mRepeat, "REPT");
+        if(esm.getFormat() < 18)
+        {
+            // mDuration isn't saved in the save file, so just giving it "1" for now if the package has a duration.
+            // The exact value of mDuration only matters for repeating packages.
+            // Previously mRemainingDuration could be negative even when mDuration was 0. Checking for > 0 should fix old saves.
+            mData.mDuration = std::max<float>(mRemainingDuration > 0, mRemainingDuration);
+        }
     }
 
     void AiFollow::save(ESMWriter &esm) const
@@ -89,16 +114,22 @@ namespace AiSequence
         esm.writeHNT ("CMND", mCommanded);
         if (mActive)
             esm.writeHNT("ACTV", mActive);
+        if(mRepeat)
+            esm.writeHNT("REPT", mRepeat);
     }
 
     void AiActivate::load(ESMReader &esm)
     {
         mTargetId = esm.getHNString("TARG");
+        mRepeat = false;
+        esm.getHNOT(mRepeat, "REPT");
     }
 
     void AiActivate::save(ESMWriter &esm) const
     {
         esm.writeHNString("TARG", mTargetId);
+        if(mRepeat)
+            esm.writeHNT("REPT", mRepeat);
     }
 
     void AiCombat::load(ESMReader &esm)
@@ -166,6 +197,7 @@ namespace AiSequence
 
     void AiSequence::load(ESMReader &esm)
     {
+        int count = 0;
         while (esm.isNextSub("AIPK"))
         {
             int type;
@@ -181,6 +213,7 @@ namespace AiSequence
                 std::unique_ptr<AiWander> ptr = std::make_unique<AiWander>();
                 ptr->load(esm);
                 mPackages.back().mPackage = ptr.release();
+                ++count;
                 break;
             }
             case Ai_Travel:
@@ -188,6 +221,7 @@ namespace AiSequence
                 std::unique_ptr<AiTravel> ptr = std::make_unique<AiTravel>();
                 ptr->load(esm);
                 mPackages.back().mPackage = ptr.release();
+                ++count;
                 break;
             }
             case Ai_Escort:
@@ -195,6 +229,7 @@ namespace AiSequence
                 std::unique_ptr<AiEscort> ptr = std::make_unique<AiEscort>();
                 ptr->load(esm);
                 mPackages.back().mPackage = ptr.release();
+                ++count;
                 break;
             }
             case Ai_Follow:
@@ -202,6 +237,7 @@ namespace AiSequence
                 std::unique_ptr<AiFollow> ptr = std::make_unique<AiFollow>();
                 ptr->load(esm);
                 mPackages.back().mPackage = ptr.release();
+                ++count;
                 break;
             }
             case Ai_Activate:
@@ -209,6 +245,7 @@ namespace AiSequence
                 std::unique_ptr<AiActivate> ptr = std::make_unique<AiActivate>();
                 ptr->load(esm);
                 mPackages.back().mPackage = ptr.release();
+                ++count;
                 break;
             }
             case Ai_Combat:
@@ -231,6 +268,23 @@ namespace AiSequence
         }
 
         esm.getHNOT (mLastAiPackage, "LAST");
+
+        if(count > 1 && esm.getFormat() < 18)
+        {
+            for(auto& pkg : mPackages)
+            {
+                if(pkg.mType == Ai_Wander)
+                    static_cast<AiWander*>(pkg.mPackage)->mData.mShouldRepeat = true;
+                else if(pkg.mType == Ai_Travel)
+                    static_cast<AiTravel*>(pkg.mPackage)->mRepeat = true;
+                else if(pkg.mType == Ai_Escort)
+                    static_cast<AiEscort*>(pkg.mPackage)->mRepeat = true;
+                else if(pkg.mType == Ai_Follow)
+                    static_cast<AiFollow*>(pkg.mPackage)->mRepeat = true;
+                else if(pkg.mType == Ai_Activate)
+                    static_cast<AiActivate*>(pkg.mPackage)->mRepeat = true;
+            }
+        }
     }
 }
 }
diff --git a/components/esm/aisequence.hpp b/components/esm/aisequence.hpp
index d8c20185f8..00c1316d9c 100644
--- a/components/esm/aisequence.hpp
+++ b/components/esm/aisequence.hpp
@@ -81,6 +81,7 @@ namespace ESM
     {
         AiTravelData mData;
         bool mHidden;
+        bool mRepeat;
 
         void load(ESMReader &esm);
         void save(ESMWriter &esm) const;
@@ -94,6 +95,7 @@ namespace ESM
         std::string mTargetId;
         std::string mCellId;
         float mRemainingDuration;
+        bool mRepeat;
 
         void load(ESMReader &esm);
         void save(ESMWriter &esm) const;
@@ -112,6 +114,7 @@ namespace ESM
         bool mCommanded;
 
         bool mActive;
+        bool mRepeat;
 
         void load(ESMReader &esm);
         void save(ESMWriter &esm) const;
@@ -120,6 +123,7 @@ namespace ESM
     struct AiActivate : AiPackage
     {
         std::string mTargetId;
+        bool mRepeat;
 
         void load(ESMReader &esm);
         void save(ESMWriter &esm) const;
diff --git a/components/esm/savedgame.cpp b/components/esm/savedgame.cpp
index 8a98a63419..4ce0876bb8 100644
--- a/components/esm/savedgame.cpp
+++ b/components/esm/savedgame.cpp
@@ -4,7 +4,7 @@
 #include "esmwriter.hpp"
 
 unsigned int ESM::SavedGame::sRecordId = ESM::REC_SAVE;
-int ESM::SavedGame::sCurrentFormat = 17;
+int ESM::SavedGame::sCurrentFormat = 18;
 
 void ESM::SavedGame::load (ESMReader &esm)
 {

From 52f963462410a701ccaa9cea55da49c44a955db1 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 17 Nov 2021 21:09:01 +0100
Subject: [PATCH 1743/2859] Allow the CS to handle the repeat flag for all
 types

---
 apps/opencs/model/world/columns.cpp         |  2 +-
 apps/opencs/model/world/refidadapterimp.hpp | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/apps/opencs/model/world/columns.cpp b/apps/opencs/model/world/columns.cpp
index 6eefdb6e21..8e53b3b270 100644
--- a/apps/opencs/model/world/columns.cpp
+++ b/apps/opencs/model/world/columns.cpp
@@ -255,7 +255,7 @@ namespace CSMWorld
             { ColumnId_AiWanderDist, "Wander Dist" },
             { ColumnId_AiDuration, "Ai Duration" },
             { ColumnId_AiWanderToD, "Wander ToD" },
-            { ColumnId_AiWanderRepeat, "Wander Repeat" },
+            { ColumnId_AiWanderRepeat, "Ai Repeat" },
             { ColumnId_AiActivateName, "Activate" },
             { ColumnId_AiTargetId, "Target ID" },
             { ColumnId_AiTargetCell, "Target Cell" },
diff --git a/apps/opencs/model/world/refidadapterimp.hpp b/apps/opencs/model/world/refidadapterimp.hpp
index c35d3c5a7c..153d1bde91 100644
--- a/apps/opencs/model/world/refidadapterimp.hpp
+++ b/apps/opencs/model/world/refidadapterimp.hpp
@@ -1678,7 +1678,7 @@ namespace CSMWorld
             newRow.mWander.mTimeOfDay = 0;
             for (int i = 0; i < 8; ++i)
                 newRow.mWander.mIdle[i] = 0;
-            newRow.mWander.mShouldRepeat = 0;
+            newRow.mWander.mShouldRepeat = 1;
             newRow.mCellName = "";
 
             if (position >= (int)list.size())
@@ -1784,9 +1784,15 @@ namespace CSMWorld
                         return static_cast<int>(content.mWander.mIdle[subColIndex-4]);
                     else
                         return QVariant();
-                case 12: // wander repeat
+                case 12: // repeat
                     if (content.mType == ESM::AI_Wander)
                         return content.mWander.mShouldRepeat != 0;
+                    else if (content.mType == ESM::AI_Travel)
+                        return content.mTravel.mShouldRepeat != 0;
+                    else if (content.mType == ESM::AI_Follow || content.mType == ESM::AI_Escort)
+                        return content.mTarget.mShouldRepeat != 0;
+                    else if (content.mType == ESM::AI_Activate)
+                        return content.mActivate.mShouldRepeat != 0;
                     else
                         return QVariant();
                 case 13: // activate name
@@ -1895,6 +1901,12 @@ namespace CSMWorld
                 case 12:
                     if (content.mType == ESM::AI_Wander)
                         content.mWander.mShouldRepeat = static_cast<unsigned char>(value.toInt());
+                    else if (content.mType == ESM::AI_Travel)
+                        content.mTravel.mShouldRepeat = static_cast<unsigned char>(value.toInt());
+                    else if (content.mType == ESM::AI_Follow || content.mType == ESM::AI_Escort)
+                        content.mTarget.mShouldRepeat = static_cast<unsigned char>(value.toInt());
+                    else if (content.mType == ESM::AI_Activate)
+                        content.mActivate.mShouldRepeat = static_cast<unsigned char>(value.toInt());
                     else
                         return; // return without saving
 

From 40656b31359797f9ff1594736c8cbf37a94e46bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Mocquillon?= <cedric.mocquillon@gmail.com>
Date: Fri, 12 Nov 2021 11:08:17 +0100
Subject: [PATCH 1744/2859] Embed error marker in osgt format inside a string
 defined in misc/errorMarker.hpp. Use the embed error marker we fail to load a
 mesh.

---
 components/CMakeLists.txt            |    2 +-
 components/misc/errorMarker.cpp      | 1390 ++++++++++++++++++++++++++
 components/misc/errorMarker.hpp      |   11 +
 components/resource/scenemanager.cpp |   64 +-
 4 files changed, 1438 insertions(+), 29 deletions(-)
 create mode 100644 components/misc/errorMarker.cpp
 create mode 100644 components/misc/errorMarker.hpp

diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 71a96716ec..012677fc0d 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -93,7 +93,7 @@ add_component_dir (esmterrain
 
 add_component_dir (misc
     constants utf8stream stringops resourcehelpers rng messageformatparser weakcache thread
-    compression osguservalues
+    compression osguservalues errorMarker
     )
 
 add_component_dir (debug
diff --git a/components/misc/errorMarker.cpp b/components/misc/errorMarker.cpp
new file mode 100644
index 0000000000..fd2b0b53ac
--- /dev/null
+++ b/components/misc/errorMarker.cpp
@@ -0,0 +1,1390 @@
+#include "errorMarker.hpp"
+
+namespace Misc
+{
+     const std::string errorMarker = "#Ascii Scene "
+"#Version 162 "
+"#Generator OpenSceneGraph 3.6.5 "
+""
+"osg::Group {"
+"  UniqueID 1 "
+"  Children 5 {"
+"    osg::Geode {"
+"      UniqueID 2 "
+"      Name \"Error\" "
+"      Drawables 1 {"
+"        osg::Geometry {"
+"          UniqueID 3 "
+"          DataVariance STATIC "
+"          StateSet TRUE {"
+"            osg::StateSet {"
+"              UniqueID 4 "
+"              DataVariance STATIC "
+"              ModeList 1 {"
+"                GL_BLEND ON "
+"              }"
+"              AttributeList 1 {"
+"                osg::Material {"
+"                  UniqueID 5 "
+"                  Name \"Error\" "
+"                  Ambient TRUE Front 1 1 1 0.5 Back 1 1 1 0.5 "
+"                  Diffuse TRUE Front 0.8 0.704 0.32 0.5 Back 0.8 0.704 0.32 0.5 "
+"                  Specular TRUE Front 0.5 0.5 0.5 0.5 Back 0.5 0.5 0.5 0.5 "
+"                  Emission TRUE Front 1 0.88 0.4 0.5 Back 1 0.88 0.4 0.5 "
+"                  Shininess TRUE Front 28.8 Back 28.8 "
+"                }"
+"                Value OFF "
+"              }"
+"              RenderingHint 2 "
+"              RenderBinMode USE_RENDERBIN_DETAILS "
+"              BinNumber 10 "
+"              BinName \"DepthSortedBin\" "
+"            }"
+"          }"
+"          PrimitiveSetList 1 {"
+"            osg::DrawElementsUShort {"
+"              UniqueID 6 "
+"              BufferObject TRUE {"
+"                osg::ElementBufferObject {"
+"                  UniqueID 7 "
+"                  Target 34963 "
+"                }"
+"              }"
+"              Mode TRIANGLES "
+"              vector 108 {"
+"                0 1 2 3 "
+"                0 2 2 4 "
+"                3 5 3 4 "
+"                4 6 5 6 "
+"                7 8 8 9 "
+"                10 6 8 10 "
+"                5 6 11 11 "
+"                6 10 12 5 "
+"                11 13 12 11 "
+"                11 14 13 10 "
+"                15 11 11 15 "
+"                16 15 17 16 "
+"                18 16 17 17 "
+"                19 18 20 21 "
+"                22 23 20 22 "
+"                22 24 23 25 "
+"                23 24 24 26 "
+"                25 26 27 28 "
+"                28 29 30 26 "
+"                28 30 25 26 "
+"                31 31 26 30 "
+"                32 25 31 33 "
+"                32 31 31 34 "
+"                33 30 35 31 "
+"                31 35 36 35 "
+"                37 36 38 36 "
+"                37 37 39 38 "
+"                "
+"              }"
+"            }"
+"          }"
+"          VertexArray TRUE {"
+"            osg::Vec3Array {"
+"              UniqueID 8 "
+"              BufferObject TRUE {"
+"                osg::VertexBufferObject {"
+"                  UniqueID 9 "
+"                }"
+"              }"
+"              Binding BIND_PER_VERTEX "
+"              vector 40 {"
+"                -4.51996 -5.9634 -60.7026 "
+"                2e-06 -5.96339 -61.6017 "
+"                4.51996 -5.96339 -60.7026 "
+"                -8.3518 -5.9634 -58.1422 "
+"                8.3518 -5.96339 -58.1422 "
+"                -58.1422 -5.96341 -8.3518 "
+"                58.1422 -5.96339 -8.3518 "
+"                60.7026 -5.96339 -4.51996 "
+"                61.6017 -5.96339 0 "
+"                60.7026 -5.96339 4.51996 "
+"                58.1423 -5.96339 8.3518 "
+"                -58.1422 -5.96341 8.3518 "
+"                -60.7026 -5.96341 -4.51996 "
+"                -61.6017 -5.96341 0 "
+"                -60.7026 -5.96341 4.51996 "
+"                8.3518 -5.9634 58.1422 "
+"                -8.3518 -5.96341 58.1422 "
+"                4.51997 -5.96341 60.7026 "
+"                -4.51996 -5.96341 60.7026 "
+"                2e-06 -5.96341 61.6017 "
+"                -60.7026 5.96339 -4.51996 "
+"                -61.6017 5.96339 0 "
+"                -60.7026 5.96339 4.51996 "
+"                -58.1423 5.96339 -8.3518 "
+"                -58.1422 5.96339 8.3518 "
+"                -8.3518 5.9634 -58.1422 "
+"                -8.3518 5.96339 58.1422 "
+"                -4.51996 5.96339 60.7026 "
+"                -2e-06 5.96339 61.6017 "
+"                4.51996 5.9634 60.7026 "
+"                8.3518 5.9634 58.1422 "
+"                8.3518 5.96341 -58.1422 "
+"                -4.51997 5.96341 -60.7026 "
+"                -2e-06 5.96341 -61.6017 "
+"                4.51996 5.96341 -60.7026 "
+"                58.1422 5.96341 8.3518 "
+"                58.1422 5.96341 -8.3518 "
+"                60.7026 5.96341 4.51996 "
+"                60.7026 5.96341 -4.51996 "
+"                61.6017 5.96341 0 "
+"              }"
+"            }"
+"          }"
+"          NormalArray TRUE {"
+"            osg::Vec3Array {"
+"              UniqueID 10 "
+"              BufferObject TRUE {"
+"                osg::VertexBufferObject {"
+"                  UniqueID 9 "
+"                }"
+"              }"
+"              Binding BIND_PER_VERTEX "
+"              vector 40 {"
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"              }"
+"            }"
+"          }"
+"          TexCoordArrayList 1 {"
+"            osg::Vec2Array {"
+"              UniqueID 11 "
+"              BufferObject TRUE {"
+"                osg::VertexBufferObject {"
+"                  UniqueID 9 "
+"                }"
+"              }"
+"              Binding BIND_PER_VERTEX "
+"              vector 40 {"
+"                0.37739 0.519384 "
+"                0.384197 0.509197 "
+"                0.394384 0.50239 "
+"                0.375 0.531401 "
+"                0.406401 0.5 "
+"                0.375 0.718599 "
+"                0.593599 0.5 "
+"                0.605616 0.50239 "
+"                0.615803 0.509197 "
+"                0.62261 0.519384 "
+"                0.625 0.531401 "
+"                0.406401 0.75 "
+"                0.37739 0.730616 "
+"                0.384197 0.740803 "
+"                0.394384 0.74761 "
+"                0.625 0.718599 "
+"                0.593599 0.75 "
+"                0.62261 0.730616 "
+"                0.605616 0.74761 "
+"                0.615803 0.740803 "
+"                0.37739 0.019384 "
+"                0.384197 0.009197 "
+"                0.394384 0.00239 "
+"                0.375 0.031401 "
+"                0.406401 0 "
+"                0.375 0.218599 "
+"                0.593599 0 "
+"                0.605616 0.00239 "
+"                0.615803 0.009197 "
+"                0.62261 0.019384 "
+"                0.625 0.031401 "
+"                0.406401 0.25 "
+"                0.37739 0.230616 "
+"                0.384197 0.240803 "
+"                0.394384 0.24761 "
+"                0.625 0.218599 "
+"                0.593599 0.25 "
+"                0.62261 0.230616 "
+"                0.605616 0.24761 "
+"                0.615803 0.240803 "
+"              }"
+"            }"
+"          }"
+"        }"
+"      }"
+"    }"
+"    osg::Geode {"
+"      UniqueID 12 "
+"      Name \"Error\" "
+"      Drawables 1 {"
+"        osg::Geometry {"
+"          UniqueID 13 "
+"          DataVariance STATIC "
+"          StateSet TRUE {"
+"            osg::StateSet {"
+"              UniqueID 4 "
+"            }"
+"          }"
+"          PrimitiveSetList 1 {"
+"            osg::DrawElementsUShort {"
+"              UniqueID 14 "
+"              BufferObject TRUE {"
+"                osg::ElementBufferObject {"
+"                  UniqueID 15 "
+"                  Target 34963 "
+"                }"
+"              }"
+"              Mode TRIANGLES "
+"              vector 120 {"
+"                0 1 2 0 "
+"                3 1 3 4 "
+"                1 3 5 4 "
+"                4 5 6 4 "
+"                6 7 8 7 "
+"                6 8 6 9 "
+"                10 8 9 10 "
+"                9 11 12 13 "
+"                11 12 11 14 "
+"                15 12 14 15 "
+"                14 16 16 17 "
+"                15 16 18 17 "
+"                18 19 17 18 "
+"                20 19 20 21 "
+"                19 20 22 21 "
+"                22 23 24 22 "
+"                25 23 25 26 "
+"                23 25 27 26 "
+"                28 26 27 28 "
+"                29 26 30 29 "
+"                28 30 28 31 "
+"                32 30 31 32 "
+"                31 33 34 35 "
+"                33 34 33 36 "
+"                37 34 36 37 "
+"                36 38 39 37 "
+"                38 39 38 40 "
+"                40 41 39 40 "
+"                42 41 42 43 "
+"                41 42 0 43 "
+"                "
+"              }"
+"            }"
+"          }"
+"          VertexArray TRUE {"
+"            osg::Vec3Array {"
+"              UniqueID 16 "
+"              BufferObject TRUE {"
+"                osg::VertexBufferObject {"
+"                  UniqueID 17 "
+"                }"
+"              }"
+"              Binding BIND_PER_VERTEX "
+"              vector 44 {"
+"                61.6017 -5.96339 0 "
+"                60.7026 5.96341 -4.51996 "
+"                61.6017 5.96341 0 "
+"                60.7026 -5.96339 -4.51996 "
+"                58.1422 5.96341 -8.3518 "
+"                58.1422 -5.96339 -8.3518 "
+"                8.3518 -5.96339 -58.1422 "
+"                8.3518 5.96341 -58.1422 "
+"                4.51996 5.96341 -60.7026 "
+"                4.51996 -5.96339 -60.7026 "
+"                -2e-06 5.96341 -61.6017 "
+"                2e-06 -5.96339 -61.6017 "
+"                -4.51997 5.96341 -60.7026 "
+"                -2e-06 5.96341 -61.6017 "
+"                -4.51996 -5.9634 -60.7026 "
+"                -8.3518 5.9634 -58.1422 "
+"                -8.3518 -5.9634 -58.1422 "
+"                -58.1423 5.96339 -8.3518 "
+"                -58.1422 -5.96341 -8.3518 "
+"                -60.7026 5.96339 -4.51996 "
+"                -60.7026 -5.96341 -4.51996 "
+"                -61.6017 5.96339 0 "
+"                -61.6017 -5.96341 0 "
+"                -60.7026 5.96339 4.51996 "
+"                -61.6017 5.96339 0 "
+"                -60.7026 -5.96341 4.51996 "
+"                -58.1422 5.96339 8.3518 "
+"                -58.1422 -5.96341 8.3518 "
+"                -8.3518 -5.96341 58.1422 "
+"                -8.3518 5.96339 58.1422 "
+"                -4.51996 5.96339 60.7026 "
+"                -4.51996 -5.96341 60.7026 "
+"                -2e-06 5.96339 61.6017 "
+"                2e-06 -5.96341 61.6017 "
+"                4.51996 5.9634 60.7026 "
+"                -2e-06 5.96339 61.6017 "
+"                4.51997 -5.96341 60.7026 "
+"                8.3518 5.9634 58.1422 "
+"                8.3518 -5.9634 58.1422 "
+"                58.1422 5.96341 8.3518 "
+"                58.1423 -5.96339 8.3518 "
+"                60.7026 5.96341 4.51996 "
+"                60.7026 -5.96339 4.51996 "
+"                61.6017 5.96341 0 "
+"              }"
+"            }"
+"          }"
+"          NormalArray TRUE {"
+"            osg::Vec3Array {"
+"              UniqueID 18 "
+"              BufferObject TRUE {"
+"                osg::VertexBufferObject {"
+"                  UniqueID 17 "
+"                }"
+"              }"
+"              Binding BIND_PER_VERTEX "
+"              vector 44 {"
+"                1 0 0 "
+"                0.923877 0 -0.38269 "
+"                0.980784 0 -0.195097 "
+"                0.923877 0 -0.38269 "
+"                0.773003 0 -0.634402 "
+"                0.773003 0 -0.634402 "
+"                0.634402 0 -0.773003 "
+"                0.634402 0 -0.773003 "
+"                0.38269 0 -0.923877 "
+"                0.38269 0 -0.923877 "
+"                0.195097 0 -0.980784 "
+"                0 0 -1 "
+"                -0.38269 -0 -0.923877 "
+"                -0.195097 -0 -0.980784 "
+"                -0.38269 -0 -0.923877 "
+"                -0.634402 -0 -0.773003 "
+"                -0.634402 -0 -0.773003 "
+"                -0.773003 -0 -0.634402 "
+"                -0.773003 -0 -0.634402 "
+"                -0.923877 -0 -0.38269 "
+"                -0.923877 -0 -0.38269 "
+"                -0.980784 -0 -0.195097 "
+"                -1 0 0 "
+"                -0.923877 0 0.38269 "
+"                -0.980784 0 0.195097 "
+"                -0.923877 0 0.38269 "
+"                -0.773003 0 0.634402 "
+"                -0.773003 0 0.634402 "
+"                -0.634402 0 0.773003 "
+"                -0.634402 0 0.773003 "
+"                -0.38269 0 0.923877 "
+"                -0.38269 0 0.923877 "
+"                -0.195097 0 0.980784 "
+"                0 0 1 "
+"                0.38269 0 0.923877 "
+"                0.195097 0 0.980784 "
+"                0.38269 0 0.923877 "
+"                0.634402 0 0.773003 "
+"                0.634402 0 0.773003 "
+"                0.773003 0 0.634402 "
+"                0.773003 0 0.634402 "
+"                0.923877 0 0.38269 "
+"                0.923877 0 0.38269 "
+"                0.980784 0 0.195097 "
+"              }"
+"            }"
+"          }"
+"          TexCoordArrayList 1 {"
+"            osg::Vec2Array {"
+"              UniqueID 19 "
+"              BufferObject TRUE {"
+"                osg::VertexBufferObject {"
+"                  UniqueID 17 "
+"                }"
+"              }"
+"              Binding BIND_PER_VERTEX "
+"              vector 44 {"
+"                0.625 0.5 "
+"                0.605616 0.25 "
+"                0.625 0.25 "
+"                0.605616 0.5 "
+"                0.593599 0.25 "
+"                0.593599 0.5 "
+"                0.406401 0.5 "
+"                0.406401 0.25 "
+"                0.394384 0.25 "
+"                0.394384 0.5 "
+"                0.375 0.25 "
+"                0.375 0.5 "
+"                0.125 0.519384 "
+"                0.125 0.5 "
+"                0.375 0.519384 "
+"                0.125 0.531401 "
+"                0.375 0.531401 "
+"                0.125 0.718599 "
+"                0.375 0.718599 "
+"                0.125 0.730616 "
+"                0.375 0.730616 "
+"                0.125 0.75 "
+"                0.375 0.75 "
+"                0.394384 1 "
+"                0.375 1 "
+"                0.394384 0.75 "
+"                0.406401 1 "
+"                0.406401 0.75 "
+"                0.593599 0.75 "
+"                0.593599 1 "
+"                0.605616 1 "
+"                0.605616 0.75 "
+"                0.625 1 "
+"                0.625 0.75 "
+"                0.875 0.730616 "
+"                0.875 0.75 "
+"                0.625 0.730616 "
+"                0.875 0.718599 "
+"                0.625 0.718599 "
+"                0.875 0.531401 "
+"                0.625 0.531401 "
+"                0.875 0.519384 "
+"                0.625 0.519384 "
+"                0.875 0.5 "
+"              }"
+"            }"
+"          }"
+"        }"
+"      }"
+"    }"
+"    osg::Geode {"
+"      UniqueID 20 "
+"      Name \"Error\" "
+"      Drawables 1 {"
+"        osg::Geometry {"
+"          UniqueID 21 "
+"          DataVariance STATIC "
+"          StateSet TRUE {"
+"            osg::StateSet {"
+"              UniqueID 22 "
+"              DataVariance STATIC "
+"              AttributeList 1 {"
+"                osg::Material {"
+"                  UniqueID 23 "
+"                  Name \"ErrorLabel\" "
+"                  Ambient TRUE Front 1 1 1 1 Back 1 1 1 1 "
+"                  Diffuse TRUE Front 0.176208 0.176208 0.176208 1 Back 0.176208 0.176208 0.176208 1 "
+"                  Specular TRUE Front 0.5 0.5 0.5 1 Back 0.5 0.5 0.5 1 "
+"                  Emission TRUE Front 0.22026 0.22026 0.22026 1 Back 0.22026 0.22026 0.22026 1 "
+"                  Shininess TRUE Front 28.8 Back 28.8 "
+"                }"
+"                Value OFF "
+"              }"
+"            }"
+"          }"
+"          PrimitiveSetList 1 {"
+"            osg::DrawElementsUShort {"
+"              UniqueID 24 "
+"              BufferObject TRUE {"
+"                osg::ElementBufferObject {"
+"                  UniqueID 25 "
+"                  Target 34963 "
+"                }"
+"              }"
+"              Mode TRIANGLES "
+"              vector 216 {"
+"                0 1 2 3 "
+"                0 2 2 4 "
+"                3 4 5 3 "
+"                5 6 7 5 "
+"                8 3 8 5 "
+"                7 7 9 8 "
+"                10 3 8 8 "
+"                11 10 12 13 "
+"                10 14 12 10 "
+"                15 14 10 10 "
+"                11 15 16 15 "
+"                11 11 17 16 "
+"                18 16 17 17 "
+"                19 18 20 21 "
+"                22 23 20 22 "
+"                22 24 23 25 "
+"                23 24 24 26 "
+"                25 26 27 28 "
+"                28 29 30 26 "
+"                28 30 25 26 "
+"                31 31 26 30 "
+"                32 25 31 33 "
+"                32 31 31 34 "
+"                33 30 35 31 "
+"                31 35 36 35 "
+"                37 36 38 36 "
+"                37 37 39 38 "
+"                40 41 42 43 "
+"                40 42 42 44 "
+"                43 45 43 44 "
+"                44 46 45 47 "
+"                45 46 48 47 "
+"                46 46 49 48 "
+"                44 50 46 51 "
+"                46 50 50 52 "
+"                53 54 50 53 "
+"                53 55 54 50 "
+"                54 51 54 56 "
+"                51 56 57 51 "
+"                58 51 57 57 "
+"                59 58 60 61 "
+"                62 63 60 62 "
+"                62 64 63 65 "
+"                63 64 64 66 "
+"                65 66 67 68 "
+"                69 70 65 71 "
+"                69 65 72 71 "
+"                65 66 68 73 "
+"                65 66 73 68 "
+"                74 73 73 72 "
+"                65 73 75 72 "
+"                72 75 76 75 "
+"                77 76 78 76 "
+"                77 77 79 78 "
+"                "
+"              }"
+"            }"
+"          }"
+"          VertexArray TRUE {"
+"            osg::Vec3Array {"
+"              UniqueID 26 "
+"              BufferObject TRUE {"
+"                osg::VertexBufferObject {"
+"                  UniqueID 27 "
+"                }"
+"              }"
+"              Binding BIND_PER_VERTEX "
+"              vector 80 {"
+"                -7.12646 -9.95049 -13.7349 "
+"                -6.35115 -9.95049 -14.8952 "
+"                -5.1908 -9.95049 -15.6705 "
+"                -7.39872 -9.95049 -12.3661 "
+"                -3.82208 -9.95049 -15.9428 "
+"                3.82208 -9.95049 -15.9428 "
+"                5.1908 -9.95049 -15.6705 "
+"                6.35115 -9.95049 -14.8952 "
+"                7.39872 -9.95049 -12.3661 "
+"                7.12646 -9.95049 -13.7349 "
+"                -7.39872 -9.95049 33.4208 "
+"                7.39872 -9.95049 33.4208 "
+"                -6.35115 -9.95049 35.9499 "
+"                -7.12647 -9.95049 34.7895 "
+"                -5.1908 -9.95049 36.7252 "
+"                -3.82208 -9.95049 36.9975 "
+"                3.82208 -9.95049 36.9975 "
+"                7.12646 -9.95049 34.7895 "
+"                5.1908 -9.95049 36.7252 "
+"                6.35115 -9.95049 35.9499 "
+"                -7.12646 -9.95042 -36.7346 "
+"                -6.35115 -9.95042 -37.8949 "
+"                -5.1908 -9.95042 -38.6702 "
+"                -7.39872 -9.95042 -35.3659 "
+"                -3.82208 -9.95042 -38.9425 "
+"                -7.39872 -9.95042 -27.7217 "
+"                3.82208 -9.95042 -38.9425 "
+"                5.1908 -9.95042 -38.6702 "
+"                6.35115 -9.95042 -37.8949 "
+"                7.12646 -9.95042 -36.7346 "
+"                7.39872 -9.95042 -35.3659 "
+"                -3.82208 -9.95042 -24.1451 "
+"                -7.12647 -9.95042 -26.353 "
+"                -6.35115 -9.95042 -25.1926 "
+"                -5.1908 -9.95042 -24.4173 "
+"                7.39872 -9.95042 -27.7217 "
+"                3.82208 -9.95042 -24.1451 "
+"                7.12646 -9.95042 -26.353 "
+"                5.1908 -9.95042 -24.4173 "
+"                6.35115 -9.95042 -25.1926 "
+"                -5.1908 9.95055 -15.6705 "
+"                -6.35115 9.95055 -14.8952 "
+"                -7.12646 9.95055 -13.7349 "
+"                -3.82208 9.95055 -15.9428 "
+"                -7.39872 9.95055 -12.3661 "
+"                3.82208 9.95055 -15.9428 "
+"                7.39872 9.95055 -12.3661 "
+"                5.1908 9.95055 -15.6705 "
+"                6.35115 9.95055 -14.8952 "
+"                7.12646 9.95055 -13.7349 "
+"                -7.39872 9.95055 33.4208 "
+"                7.39872 9.95055 33.4208 "
+"                -7.12646 9.95055 34.7895 "
+"                -6.35115 9.95056 35.9499 "
+"                -3.82208 9.95056 36.9975 "
+"                -5.1908 9.95056 36.7252 "
+"                3.82208 9.95055 36.9975 "
+"                5.19081 9.95055 36.7252 "
+"                7.12646 9.95056 34.7895 "
+"                6.35115 9.95055 35.9499 "
+"                -5.1908 9.95062 -38.6702 "
+"                -6.35115 9.95062 -37.8949 "
+"                -7.12646 9.95062 -36.7346 "
+"                -3.82208 9.95062 -38.9425 "
+"                -7.39872 9.95062 -35.3659 "
+"                3.82208 9.95062 -38.9425 "
+"                -7.39872 9.95063 -27.7217 "
+"                -7.12646 9.95063 -26.353 "
+"                -6.35115 9.95063 -25.1926 "
+"                6.35115 9.95062 -37.8949 "
+"                5.1908 9.95062 -38.6702 "
+"                7.12647 9.95062 -36.7346 "
+"                7.39872 9.95062 -35.3659 "
+"                -3.82208 9.95063 -24.1451 "
+"                -5.1908 9.95063 -24.4173 "
+"                3.82208 9.95063 -24.1451 "
+"                7.39872 9.95062 -27.7217 "
+"                5.1908 9.95063 -24.4173 "
+"                7.12646 9.95063 -26.353 "
+"                6.35115 9.95063 -25.1926 "
+"              }"
+"            }"
+"          }"
+"          NormalArray TRUE {"
+"            osg::Vec3Array {"
+"              UniqueID 28 "
+"              BufferObject TRUE {"
+"                osg::VertexBufferObject {"
+"                  UniqueID 27 "
+"                }"
+"              }"
+"              Binding BIND_PER_VERTEX "
+"              vector 80 {"
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"              }"
+"            }"
+"          }"
+"          TexCoordArrayList 1 {"
+"            osg::Vec2Array {"
+"              UniqueID 29 "
+"              BufferObject TRUE {"
+"                osg::VertexBufferObject {"
+"                  UniqueID 27 "
+"                }"
+"              }"
+"              Binding BIND_PER_VERTEX "
+"              vector 80 {"
+"                0.006133 0.041706 "
+"                0.023598 0.006596 "
+"                0.149209 0.001714 "
+"                0 0.06756 "
+"                0.241707 0 "
+"                0.758294 0 "
+"                0.850791 0.001714 "
+"                0.976402 0.006596 "
+"                1 0.06756 "
+"                0.993867 0.041706 "
+"                0 0.93244 "
+"                1 0.93244 "
+"                0.023598 0.993404 "
+"                0.006133 0.958294 "
+"                0.149209 0.998286 "
+"                0.241706 1 "
+"                0.758294 1 "
+"                0.993867 0.958294 "
+"                0.850791 0.998286 "
+"                0.976402 0.993404 "
+"                0.006133 0.149209 "
+"                0.023598 0.023598 "
+"                0.149209 0.006133 "
+"                0 0.241707 "
+"                0.241707 0 "
+"                0 0.758294 "
+"                0.758294 0 "
+"                0.850791 0.006133 "
+"                0.976402 0.023598 "
+"                0.993867 0.149209 "
+"                1 0.241707 "
+"                0.241706 1 "
+"                0.006133 0.850791 "
+"                0.023598 0.976402 "
+"                0.149209 0.993867 "
+"                1 0.758293 "
+"                0.758294 1 "
+"                0.993867 0.850791 "
+"                0.850791 0.993867 "
+"                0.976402 0.976402 "
+"                0.149209 0.001714 "
+"                0.023598 0.006596 "
+"                0.006133 0.041706 "
+"                0.241706 0 "
+"                0 0.06756 "
+"                0.758294 0 "
+"                1 0.06756 "
+"                0.850791 0.001714 "
+"                0.976402 0.006596 "
+"                0.993867 0.041706 "
+"                0 0.93244 "
+"                1 0.93244 "
+"                0.006133 0.958294 "
+"                0.023598 0.993404 "
+"                0.241707 1 "
+"                0.149209 0.998286 "
+"                0.758294 1 "
+"                0.850791 0.998286 "
+"                0.993867 0.958294 "
+"                0.976402 0.993404 "
+"                0.149209 0.006133 "
+"                0.023598 0.023598 "
+"                0.006133 0.149209 "
+"                0.241706 0 "
+"                0 0.241707 "
+"                0.758294 0 "
+"                0 0.758294 "
+"                0.006133 0.850791 "
+"                0.023598 0.976402 "
+"                0.976402 0.023598 "
+"                0.850791 0.006133 "
+"                0.993867 0.149209 "
+"                1 0.241706 "
+"                0.241707 1 "
+"                0.149209 0.993867 "
+"                0.758294 1 "
+"                1 0.758294 "
+"                0.850791 0.993867 "
+"                0.993867 0.850791 "
+"                0.976402 0.976402 "
+"              }"
+"            }"
+"          }"
+"        }"
+"      }"
+"    }"
+"    osg::Geode {"
+"      UniqueID 30 "
+"      Name \"Error\" "
+"      Drawables 1 {"
+"        osg::Geometry {"
+"          UniqueID 31 "
+"          DataVariance STATIC "
+"          StateSet TRUE {"
+"            osg::StateSet {"
+"              UniqueID 22 "
+"            }"
+"          }"
+"          PrimitiveSetList 1 {"
+"            osg::DrawElementsUShort {"
+"              UniqueID 32 "
+"              BufferObject TRUE {"
+"                osg::ElementBufferObject {"
+"                  UniqueID 33 "
+"                  Target 34963 "
+"                }"
+"              }"
+"              Mode TRIANGLES "
+"              vector 240 {"
+"                0 1 2 0 "
+"                3 1 0 2 "
+"                4 0 5 3 "
+"                4 2 6 5 "
+"                7 3 4 6 "
+"                8 5 9 7 "
+"                6 10 8 9 "
+"                11 7 6 12 "
+"                10 9 13 11 "
+"                12 14 10 13 "
+"                15 11 12 16 "
+"                14 13 17 15 "
+"                16 18 14 19 "
+"                15 17 16 20 "
+"                18 19 21 15 "
+"                18 20 22 23 "
+"                21 19 18 22 "
+"                24 23 19 25 "
+"                26 24 22 27 "
+"                23 25 26 22 "
+"                28 27 25 29 "
+"                30 26 28 31 "
+"                27 29 30 32 "
+"                26 31 29 33 "
+"                34 32 30 35 "
+"                31 33 34 30 "
+"                36 35 33 37 "
+"                38 34 36 39 "
+"                35 37 38 39 "
+"                34 39 38 35 "
+"                40 41 42 43 "
+"                41 40 40 42 "
+"                44 43 40 45 "
+"                46 44 42 47 "
+"                43 45 46 48 "
+"                44 47 45 49 "
+"                50 48 46 51 "
+"                47 49 50 46 "
+"                52 51 49 53 "
+"                54 50 52 55 "
+"                51 53 54 52 "
+"                56 55 53 57 "
+"                58 54 56 57 "
+"                59 55 58 56 "
+"                60 57 61 59 "
+"                58 60 62 61 "
+"                63 59 58 62 "
+"                64 61 65 63 "
+"                62 66 64 65 "
+"                67 63 62 68 "
+"                66 65 69 67 "
+"                66 68 70 69 "
+"                71 67 66 70 "
+"                72 69 73 71 "
+"                70 74 72 71 "
+"                73 75 70 76 "
+"                74 71 75 77 "
+"                76 78 74 75 "
+"                79 77 76 79 "
+"                78 75 78 79 "
+"                "
+"              }"
+"            }"
+"          }"
+"          VertexArray TRUE {"
+"            osg::Vec3Array {"
+"              UniqueID 34 "
+"              BufferObject TRUE {"
+"                osg::VertexBufferObject {"
+"                  UniqueID 35 "
+"                }"
+"              }"
+"              Binding BIND_PER_VERTEX "
+"              vector 80 {"
+"                -7.39872 9.95055 -12.3661 "
+"                -7.39872 -9.95049 -12.3661 "
+"                -7.39872 -9.95049 33.4208 "
+"                -7.12646 -9.95049 -13.7349 "
+"                -7.39872 9.95055 33.4208 "
+"                -7.12646 9.95055 -13.7349 "
+"                -7.12647 -9.95049 34.7895 "
+"                -6.35115 -9.95049 -14.8952 "
+"                -7.12646 9.95055 34.7895 "
+"                -6.35115 9.95055 -14.8952 "
+"                -6.35115 9.95056 35.9499 "
+"                -5.1908 -9.95049 -15.6705 "
+"                -6.35115 -9.95049 35.9499 "
+"                -5.1908 9.95055 -15.6705 "
+"                -5.1908 9.95056 36.7252 "
+"                -3.82208 -9.95049 -15.9428 "
+"                -5.1908 -9.95049 36.7252 "
+"                -3.82208 9.95055 -15.9428 "
+"                -3.82208 9.95056 36.9975 "
+"                3.82208 9.95055 -15.9428 "
+"                -3.82208 -9.95049 36.9975 "
+"                3.82208 -9.95049 -15.9428 "
+"                3.82208 -9.95049 36.9975 "
+"                5.1908 -9.95049 -15.6705 "
+"                3.82208 9.95055 36.9975 "
+"                5.1908 9.95055 -15.6705 "
+"                5.19081 9.95055 36.7252 "
+"                6.35115 -9.95049 -14.8952 "
+"                5.1908 -9.95049 36.7252 "
+"                6.35115 9.95055 -14.8952 "
+"                6.35115 -9.95049 35.9499 "
+"                7.12646 -9.95049 -13.7349 "
+"                6.35115 9.95055 35.9499 "
+"                7.12646 9.95055 -13.7349 "
+"                7.12646 9.95056 34.7895 "
+"                7.39872 -9.95049 -12.3661 "
+"                7.12646 -9.95049 34.7895 "
+"                7.39872 9.95055 -12.3661 "
+"                7.39872 -9.95049 33.4208 "
+"                7.39872 9.95055 33.4208 "
+"                -3.82208 9.95063 -24.1451 "
+"                -3.82208 -9.95042 -24.1451 "
+"                3.82208 -9.95042 -24.1451 "
+"                -5.1908 -9.95042 -24.4173 "
+"                3.82208 9.95063 -24.1451 "
+"                -5.1908 9.95063 -24.4173 "
+"                5.1908 -9.95042 -24.4173 "
+"                -6.35115 -9.95042 -25.1926 "
+"                5.1908 9.95063 -24.4173 "
+"                -6.35115 9.95063 -25.1926 "
+"                6.35115 9.95063 -25.1926 "
+"                -7.12647 -9.95042 -26.353 "
+"                6.35115 -9.95042 -25.1926 "
+"                -7.12646 9.95063 -26.353 "
+"                7.12646 9.95063 -26.353 "
+"                -7.39872 -9.95042 -27.7217 "
+"                7.12646 -9.95042 -26.353 "
+"                -7.39872 9.95063 -27.7217 "
+"                7.39872 9.95062 -27.7217 "
+"                -7.39872 -9.95042 -35.3659 "
+"                7.39872 -9.95042 -27.7217 "
+"                -7.39872 9.95062 -35.3659 "
+"                7.39872 -9.95042 -35.3659 "
+"                -7.12646 -9.95042 -36.7346 "
+"                7.39872 9.95062 -35.3659 "
+"                -7.12646 9.95062 -36.7346 "
+"                7.12647 9.95062 -36.7346 "
+"                -6.35115 -9.95042 -37.8949 "
+"                7.12646 -9.95042 -36.7346 "
+"                -6.35115 9.95062 -37.8949 "
+"                6.35115 -9.95042 -37.8949 "
+"                -5.1908 -9.95042 -38.6702 "
+"                6.35115 9.95062 -37.8949 "
+"                -5.1908 9.95062 -38.6702 "
+"                5.1908 9.95062 -38.6702 "
+"                -3.82208 9.95062 -38.9425 "
+"                5.1908 -9.95042 -38.6702 "
+"                -3.82208 -9.95042 -38.9425 "
+"                3.82208 9.95062 -38.9425 "
+"                3.82208 -9.95042 -38.9425 "
+"              }"
+"            }"
+"          }"
+"          NormalArray TRUE {"
+"            osg::Vec3Array {"
+"              UniqueID 36 "
+"              BufferObject TRUE {"
+"                osg::VertexBufferObject {"
+"                  UniqueID 35 "
+"                }"
+"              }"
+"              Binding BIND_PER_VERTEX "
+"              vector 80 {"
+"                -0.995187 -0 -0.0979987 "
+"                -0.995187 -0 -0.0979987 "
+"                -0.995187 0 0.0979987 "
+"                -0.923877 -0 -0.38269 "
+"                -0.995187 0 0.0979987 "
+"                -0.923877 -0 -0.38269 "
+"                -0.923877 0 0.38269 "
+"                -0.707107 -0 -0.707107 "
+"                -0.923877 0 0.38269 "
+"                -0.707107 -0 -0.707107 "
+"                -0.707107 0 0.707107 "
+"                -0.38269 -0 -0.923877 "
+"                -0.707107 0 0.707107 "
+"                -0.38269 -0 -0.923877 "
+"                -0.38269 0 0.923877 "
+"                -0.0979987 -0 -0.995187 "
+"                -0.38269 0 0.923877 "
+"                -0.0979987 -0 -0.995187 "
+"                -0.0979987 0 0.995187 "
+"                0.0979987 0 -0.995187 "
+"                -0.0979987 0 0.995187 "
+"                0.0979987 0 -0.995187 "
+"                0.0979987 0 0.995187 "
+"                0.38269 0 -0.923877 "
+"                0.0979987 0 0.995187 "
+"                0.38269 0 -0.923877 "
+"                0.38269 0 0.923877 "
+"                0.707107 0 -0.707107 "
+"                0.38269 0 0.923877 "
+"                0.707107 0 -0.707107 "
+"                0.707107 0 0.707107 "
+"                0.923877 0 -0.38269 "
+"                0.707107 0 0.707107 "
+"                0.923877 0 -0.38269 "
+"                0.923877 0 0.38269 "
+"                0.995187 0 -0.0979987 "
+"                0.923877 0 0.38269 "
+"                0.995187 0 -0.0979987 "
+"                0.995187 0 0.0979987 "
+"                0.995187 0 0.0979987 "
+"                -0.0979987 0 0.995187 "
+"                -0.0979987 0 0.995187 "
+"                0.0979987 0 0.995187 "
+"                -0.38269 0 0.923877 "
+"                0.0979987 0 0.995187 "
+"                -0.38269 0 0.923877 "
+"                0.38269 0 0.923877 "
+"                -0.707107 0 0.707107 "
+"                0.38269 0 0.923877 "
+"                -0.707107 0 0.707107 "
+"                0.707107 0 0.707107 "
+"                -0.923877 0 0.38269 "
+"                0.707107 0 0.707107 "
+"                -0.923877 0 0.38269 "
+"                0.923877 0 0.38269 "
+"                -0.995187 0 0.0979987 "
+"                0.923877 0 0.38269 "
+"                -0.995187 0 0.0979987 "
+"                0.995187 0 0.0979987 "
+"                -0.995187 -0 -0.0979987 "
+"                0.995187 0 0.0979987 "
+"                -0.995187 -0 -0.0979987 "
+"                0.995187 0 -0.0979987 "
+"                -0.923877 -0 -0.38269 "
+"                0.995187 0 -0.0979987 "
+"                -0.923877 -0 -0.38269 "
+"                0.923877 0 -0.38269 "
+"                -0.707107 -0 -0.707107 "
+"                0.923877 0 -0.38269 "
+"                -0.707107 -0 -0.707107 "
+"                0.707107 0 -0.707107 "
+"                -0.38269 -0 -0.923877 "
+"                0.707107 0 -0.707107 "
+"                -0.38269 -0 -0.923877 "
+"                0.38269 0 -0.923877 "
+"                -0.0979987 -0 -0.995187 "
+"                0.38269 0 -0.923877 "
+"                -0.0979987 -0 -0.995187 "
+"                0.0979987 0 -0.995187 "
+"                0.0979987 0 -0.995187 "
+"              }"
+"            }"
+"          }"
+"          TexCoordArrayList 1 {"
+"            osg::Vec2Array {"
+"              UniqueID 37 "
+"              BufferObject TRUE {"
+"                osg::VertexBufferObject {"
+"                  UniqueID 35 "
+"                }"
+"              }"
+"              Binding BIND_PER_VERTEX "
+"              vector 80 {"
+"                0 0.06756 "
+"                0 0.06756 "
+"                0 0.93244 "
+"                0.006133 0.041706 "
+"                0 0.93244 "
+"                0.006133 0.041706 "
+"                0.006133 0.958294 "
+"                0.023598 0.006596 "
+"                0.006133 0.958294 "
+"                0.023598 0.006596 "
+"                0.023598 0.993404 "
+"                0.149209 0.001714 "
+"                0.023598 0.993404 "
+"                0.149209 0.001714 "
+"                0.149209 0.998286 "
+"                0.241706 0 "
+"                0.149209 0.998286 "
+"                0.241707 0 "
+"                0.241706 1 "
+"                0.758294 0 "
+"                0.241707 1 "
+"                0.758294 0 "
+"                0.758294 1 "
+"                0.850791 0.001714 "
+"                0.758294 1 "
+"                0.850791 0.001714 "
+"                0.850791 0.998286 "
+"                0.976402 0.006596 "
+"                0.850791 0.998286 "
+"                0.976402 0.006596 "
+"                0.976402 0.993404 "
+"                0.993867 0.041706 "
+"                0.976402 0.993404 "
+"                0.993867 0.041706 "
+"                0.993867 0.958294 "
+"                1 0.06756 "
+"                0.993867 0.958294 "
+"                1 0.06756 "
+"                1 0.93244 "
+"                1 0.93244 "
+"                0.241706 1 "
+"                0.241707 1 "
+"                0.758294 1 "
+"                0.149209 0.993867 "
+"                0.758294 1 "
+"                0.149209 0.993867 "
+"                0.850791 0.993867 "
+"                0.023598 0.976402 "
+"                0.850791 0.993867 "
+"                0.023598 0.976402 "
+"                0.976402 0.976402 "
+"                0.006133 0.850791 "
+"                0.976402 0.976402 "
+"                0.006133 0.850791 "
+"                0.993867 0.850791 "
+"                0 0.758293 "
+"                0.993867 0.850791 "
+"                0 0.758294 "
+"                1 0.758294 "
+"                0 0.241707 "
+"                1 0.758294 "
+"                0 0.241706 "
+"                1 0.241707 "
+"                0.006133 0.149209 "
+"                1 0.241707 "
+"                0.006133 0.149209 "
+"                0.993867 0.149209 "
+"                0.023598 0.023598 "
+"                0.993867 0.149209 "
+"                0.023598 0.023598 "
+"                0.976402 0.023598 "
+"                0.149209 0.006133 "
+"                0.976402 0.023598 "
+"                0.149209 0.006133 "
+"                0.850791 0.006133 "
+"                0.241707 0 "
+"                0.850791 0.006133 "
+"                0.241706 0 "
+"                0.758294 0 "
+"                0.758294 0 "
+"              }"
+"            }"
+"          }"
+"        }"
+"      }"
+"    }"
+"    osg::Geode {"
+"      UniqueID 38 "
+"      Name \"Cube\" "
+"      Drawables 1 {"
+"        osg::Geometry {"
+"          UniqueID 39 "
+"          DataVariance STATIC "
+"          StateSet TRUE {"
+"            osg::StateSet {"
+"              UniqueID 40 "
+"              DataVariance STATIC "
+"              AttributeList 1 {"
+"                osg::Material {"
+"                  UniqueID 41 "
+"                  Name \"Material\" "
+"                  Ambient TRUE Front 1 1 1 1 Back 1 1 1 1 "
+"                  Diffuse TRUE Front 0.8 0.8 0.8 1 Back 0.8 0.8 0.8 1 "
+"                  Specular TRUE Front 0.5 0.5 0.5 1 Back 0.5 0.5 0.5 1 "
+"                  Emission TRUE Front 0 0 0 1 Back 0 0 0 1 "
+"                  Shininess TRUE Front 41.344 Back 41.344 "
+"                }"
+"                Value OFF "
+"              }"
+"            }"
+"          }"
+"          PrimitiveSetList 1 {"
+"            osg::DrawElementsUShort {"
+"              UniqueID 42 "
+"              BufferObject TRUE {"
+"                osg::ElementBufferObject {"
+"                  UniqueID 43 "
+"                  Target 34963 "
+"                }"
+"              }"
+"              Mode TRIANGLES "
+"              vector 36 {"
+"                0 1 2 0 "
+"                2 3 4 5 "
+"                6 4 6 7 "
+"                8 9 10 8 "
+"                10 11 12 13 "
+"                14 12 14 15 "
+"                16 17 18 16 "
+"                18 19 20 21 "
+"                22 20 22 23 "
+"                "
+"              }"
+"            }"
+"          }"
+"          VertexArray TRUE {"
+"            osg::Vec3Array {"
+"              UniqueID 44 "
+"              BufferObject TRUE {"
+"                osg::VertexBufferObject {"
+"                  UniqueID 45 "
+"                }"
+"              }"
+"              Binding BIND_PER_VERTEX "
+"              vector 24 {"
+"                1 1 1 "
+"                -1 1 1 "
+"                -1 -1 1 "
+"                1 -1 1 "
+"                1 -1 -1 "
+"                1 -1 1 "
+"                -1 -1 1 "
+"                -1 -1 -1 "
+"                -1 -1 -1 "
+"                -1 -1 1 "
+"                -1 1 1 "
+"                -1 1 -1 "
+"                -1 1 -1 "
+"                1 1 -1 "
+"                1 -1 -1 "
+"                -1 -1 -1 "
+"                1 1 -1 "
+"                1 1 1 "
+"                1 -1 1 "
+"                1 -1 -1 "
+"                -1 1 -1 "
+"                -1 1 1 "
+"                1 1 1 "
+"                1 1 -1 "
+"              }"
+"            }"
+"          }"
+"          NormalArray TRUE {"
+"            osg::Vec3Array {"
+"              UniqueID 46 "
+"              BufferObject TRUE {"
+"                osg::VertexBufferObject {"
+"                  UniqueID 45 "
+"                }"
+"              }"
+"              Binding BIND_PER_VERTEX "
+"              vector 24 {"
+"                0 0 1 "
+"                0 0 1 "
+"                0 0 1 "
+"                0 0 1 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                0 -1 0 "
+"                -1 0 0 "
+"                -1 0 0 "
+"                -1 0 0 "
+"                -1 0 0 "
+"                0 0 -1 "
+"                0 0 -1 "
+"                0 0 -1 "
+"                0 0 -1 "
+"                1 0 0 "
+"                1 0 0 "
+"                1 0 0 "
+"                1 0 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"                0 1 0 "
+"              }"
+"            }"
+"          }"
+"          TexCoordArrayList 1 {"
+"            osg::Vec2Array {"
+"              UniqueID 47 "
+"              BufferObject TRUE {"
+"                osg::VertexBufferObject {"
+"                  UniqueID 45 "
+"                }"
+"              }"
+"              Binding BIND_PER_VERTEX "
+"              vector 24 {"
+"                0.625 0.5 "
+"                0.875 0.5 "
+"                0.875 0.75 "
+"                0.625 0.75 "
+"                0.375 0.75 "
+"                0.625 0.75 "
+"                0.625 1 "
+"                0.375 1 "
+"                0.375 0 "
+"                0.625 0 "
+"                0.625 0.25 "
+"                0.375 0.25 "
+"                0.125 0.5 "
+"                0.375 0.5 "
+"                0.375 0.75 "
+"                0.125 0.75 "
+"                0.375 0.5 "
+"                0.625 0.5 "
+"                0.625 0.75 "
+"                0.375 0.75 "
+"                0.375 0.25 "
+"                0.625 0.25 "
+"                0.625 0.5 "
+"                0.375 0.5 "
+"              }"
+"            }"
+"          }"
+"        }"
+"      }"
+"    }"
+"  }"
+"}";
+
+}
diff --git a/components/misc/errorMarker.hpp b/components/misc/errorMarker.hpp
new file mode 100644
index 0000000000..05e1fa9557
--- /dev/null
+++ b/components/misc/errorMarker.hpp
@@ -0,0 +1,11 @@
+#ifndef OPENMW_COMPONENTS_MISC_ERRORMARKER_H
+#define OPENMW_COMPONENTS_MISC_ERRORMARKER_H
+
+#include <string>
+
+namespace Misc
+{
+    extern const std::string errorMarker;
+}
+
+#endif
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 23581a09b8..f39a5919b6 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -21,6 +21,7 @@
 #include <components/misc/pathhelpers.hpp>
 #include <components/misc/stringops.hpp>
 #include <components/misc/algorithm.hpp>
+#include <components/misc/errorMarker.hpp>
 #include <components/misc/osguservalues.hpp>
 
 #include <components/vfs/manager.hpp>
@@ -36,6 +37,7 @@
 #include <components/shader/shadermanager.hpp>
 
 #include <components/files/hash.hpp>
+#include <components/files/memorystream.hpp>
 
 #include "imagemanager.hpp"
 #include "niffilemanager.hpp"
@@ -483,13 +485,11 @@ namespace Resource
         Resource::ImageManager* mImageManager;
     };
 
-    osg::ref_ptr<osg::Node> load (const std::string& normalizedFilename, const VFS::Manager* vfs, Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager)
+    namespace
     {
-        auto ext = Misc::getFileExtension(normalizedFilename);
-        if (ext == "nif")
-            return NifOsg::Loader::load(nifFileManager->get(normalizedFilename), imageManager);
-        else
+        osg::ref_ptr<osg::Node> loadNonNif(const std::string& normalizedFilename, std::istream& model, Resource::ImageManager* imageManager)
         {
+            auto ext = Misc::getFileExtension(normalizedFilename);
             osgDB::ReaderWriter* reader = osgDB::Registry::instance()->getReaderWriterForExtension(std::string(ext));
             if (!reader)
             {
@@ -505,10 +505,9 @@ namespace Resource
             options->setReadFileCallback(new ImageReadCallback(imageManager));
             if (ext == "dae") options->setOptionString("daeUseSequencedTextureUnits");
 
-            Files::IStreamPtr stream = vfs->get(normalizedFilename);
-            const std::uint64_t fileHash = Files::getHash(normalizedFilename, *stream);
+            const std::uint64_t fileHash = Files::getHash(normalizedFilename, model);
 
-            osgDB::ReaderWriter::ReadResult result = reader->readNode(*stream, options);
+            osgDB::ReaderWriter::ReadResult result = reader->readNode(model, options);
             if (!result.success())
             {
                 std::stringstream errormsg;
@@ -519,7 +518,9 @@ namespace Resource
             // Recognize and hide collision node
             unsigned int hiddenNodeMask = 0;
             SceneUtil::FindByNameVisitor nameFinder("Collision");
-            result.getNode()->accept(nameFinder);
+
+            auto node = result.getNode();
+            node->accept(nameFinder);
             if (nameFinder.mFoundNode)
                 nameFinder.mFoundNode->setNodeMask(hiddenNodeMask);
 
@@ -527,16 +528,14 @@ namespace Resource
             {
                 // Collada alpha testing
                 Resource::ColladaAlphaTrickVisitor colladaAlphaTrickVisitor;
-                result.getNode()->accept(colladaAlphaTrickVisitor);
+                node->accept(colladaAlphaTrickVisitor);
 
-                result.getNode()->getOrCreateStateSet()->addUniform(new osg::Uniform("emissiveMult", 1.f));
-                result.getNode()->getOrCreateStateSet()->addUniform(new osg::Uniform("specStrength", 1.f));
-                result.getNode()->getOrCreateStateSet()->addUniform(new osg::Uniform("envMapColor", osg::Vec4f(1,1,1,1)));
-                result.getNode()->getOrCreateStateSet()->addUniform(new osg::Uniform("useFalloff", false));
+                node->getOrCreateStateSet()->addUniform(new osg::Uniform("emissiveMult", 1.f));
+                node->getOrCreateStateSet()->addUniform(new osg::Uniform("specStrength", 1.f));
+                node->getOrCreateStateSet()->addUniform(new osg::Uniform("envMapColor", osg::Vec4f(1,1,1,1)));
+                node->getOrCreateStateSet()->addUniform(new osg::Uniform("useFalloff", false));
             }
 
-            auto node = result.getNode();
-
             node->setUserValue(Misc::OsgUserValues::sFileHash,
                 std::string(reinterpret_cast<const char*>(&fileHash), sizeof(fileHash)));
 
@@ -544,6 +543,15 @@ namespace Resource
         }
     }
 
+    osg::ref_ptr<osg::Node> load (const std::string& normalizedFilename, const VFS::Manager* vfs, Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager)
+    {
+        auto ext = Misc::getFileExtension(normalizedFilename);
+        if (ext == "nif")
+            return NifOsg::Loader::load(nifFileManager->get(normalizedFilename), imageManager);
+        else
+            return loadNonNif(normalizedFilename, *vfs->get(normalizedFilename), imageManager);
+    }
+
     class CanOptimizeCallback : public SceneUtil::Optimizer::IsOperationPermissibleForObjectCallback
     {
     public:
@@ -659,23 +667,23 @@ namespace Resource
             {
                 loaded = load(normalized, mVFS, mImageManager, mNifFileManager);
             }
-            catch (std::exception& e)
+            catch (const std::exception& e)
             {
-                static const char * const sMeshTypes[] = { "nif", "osg", "osgt", "osgb", "osgx", "osg2", "dae" };
+                static osg::ref_ptr<osg::Node> errorMarkerNode = [&] {
+                    static const char* const sMeshTypes[] = { "nif", "osg", "osgt", "osgb", "osgx", "osg2", "dae" };
 
-                for (unsigned int i=0; i<sizeof(sMeshTypes)/sizeof(sMeshTypes[0]); ++i)
-                {
-                    normalized = "meshes/marker_error." + std::string(sMeshTypes[i]);
-                    if (mVFS->exists(normalized))
+                    for (unsigned int i=0; i<sizeof(sMeshTypes)/sizeof(sMeshTypes[0]); ++i)
                     {
-                        Log(Debug::Error) << "Failed to load '" << name << "': " << e.what() << ", using marker_error." << sMeshTypes[i] << " instead";
-                        loaded = load(normalized, mVFS, mImageManager, mNifFileManager);
-                        break;
+                        normalized = "meshes/marker_error." + std::string(sMeshTypes[i]);
+                        if (mVFS->exists(normalized))
+                            return load(normalized, mVFS, mImageManager, mNifFileManager);
                     }
-                }
+                    Files::IMemStream file(Misc::errorMarker.data(), Misc::errorMarker.size());
+                    return loadNonNif("error_marker.osgt", file, mImageManager);
+                }();
 
-                if (!loaded)
-                    throw;
+                Log(Debug::Error) << "Failed to load '" << name << "': " << e.what() << ", using marker_error instead";
+                loaded = static_cast<osg::Node*>(errorMarkerNode->clone(osg::CopyOp::DEEP_COPY_ALL));
             }
 
             // set filtering settings

From 8a7b4649f016a20706e2466f19d9d4be0b1dc7db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Mocquillon?= <cedric.mocquillon@gmail.com>
Date: Sat, 13 Nov 2021 18:03:37 +0100
Subject: [PATCH 1745/2859] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb86227f6c..6d6dacf106 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -93,6 +93,7 @@
     Feature #6161: Refactor Sky to use shaders and GLES/GL3 friendly
     Feature #6162: Refactor GUI to use shaders and to be GLES and GL3+ friendly
     Feature #6199: Support FBO Rendering
+    Feature #6248: Embedded error marker mesh
     Feature #6249: Alpha testing support for Collada
     Feature #6251: OpenMW-CS: Set instance movement based on camera zoom
     Feature #6288: Preserve the "blocked" record flag for referenceable objects.

From eb75e394b34de8f78d38c8d49c7a5eadf2894739 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Mocquillon?= <cedric.mocquillon@gmail.com>
Date: Sat, 20 Nov 2021 11:11:12 +0100
Subject: [PATCH 1746/2859] Use Files::MemBuf for Bsa::MemoryInputStream base
 classe instead of making a duplicate (MemoryInputStreamBuf)

---
 components/CMakeLists.txt       |  2 +-
 components/bsa/memorystream.cpp | 48 ---------------------------------
 components/bsa/memorystream.hpp | 28 +++++++++----------
 3 files changed, 13 insertions(+), 65 deletions(-)
 delete mode 100644 components/bsa/memorystream.cpp

diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 012677fc0d..abcec188f4 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -37,7 +37,7 @@ add_component_dir (settings
     )
 
 add_component_dir (bsa
-    bsa_file compressedbsafile memorystream
+    bsa_file compressedbsafile
     )
 
 add_component_dir (vfs
diff --git a/components/bsa/memorystream.cpp b/components/bsa/memorystream.cpp
deleted file mode 100644
index 34e98e6b68..0000000000
--- a/components/bsa/memorystream.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-  OpenMW - The completely unofficial reimplementation of Morrowind
-  Copyright (C) 2008-2010  Nicolay Korslund
-  Email: < korslund@gmail.com >
-  WWW: http://openmw.sourceforge.net/
-
-  This file (memorystream.cpp) is part of the OpenMW package.
-
-  OpenMW is distributed as free software: you can redistribute it
-  and/or modify it under the terms of the GNU General Public License
-  version 3, as published by the Free Software Foundation.
-
-  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
-  version 3 along with this program. If not, see
-  http://www.gnu.org/licenses/ .
-
-  Compressed BSA upgrade added by Azdul 2019
-
- */
-#include "memorystream.hpp"
-
-
-namespace Bsa
-{
-MemoryInputStreamBuf::MemoryInputStreamBuf(size_t bufferSize) : mBufferPtr(bufferSize)
-{
-    this->setg(mBufferPtr.data(), mBufferPtr.data(), mBufferPtr.data() + bufferSize);
-}
-
-char* MemoryInputStreamBuf::getRawData() {
-    return mBufferPtr.data();
-}
-
-MemoryInputStream::MemoryInputStream(size_t bufferSize) : 
-                   MemoryInputStreamBuf(bufferSize),
-    std::istream(static_cast<std::streambuf*>(this)) {
-
-}
-
-char* MemoryInputStream::getRawData() {
-    return MemoryInputStreamBuf::getRawData();
-}
-}
diff --git a/components/bsa/memorystream.hpp b/components/bsa/memorystream.hpp
index d168e93d65..5aae448299 100644
--- a/components/bsa/memorystream.hpp
+++ b/components/bsa/memorystream.hpp
@@ -28,22 +28,10 @@
 
 #include <vector>
 #include <iostream>
+#include <components/files/memorystream.hpp>
 
 namespace Bsa
 {
-/**
-Class used internally by MemoryInputStream.
-*/
-class MemoryInputStreamBuf : public std::streambuf {
-
-public:
-    explicit MemoryInputStreamBuf(size_t bufferSize);
-    virtual char* getRawData();
-private:
-    //correct call to delete [] on C++ 11
-    std::vector<char> mBufferPtr;
-};
-
 /**
     Class replaces Ogre memory streams without introducing any new external dependencies
     beyond standard library.
@@ -52,10 +40,18 @@ private:
 
     Memory buffer is freed once the class instance is destroyed.
  */
-class MemoryInputStream : virtual MemoryInputStreamBuf, std::istream {
+class MemoryInputStream : private std::vector<char>, public virtual Files::MemBuf, public std::istream {
 public:
-    explicit MemoryInputStream(size_t bufferSize);
-    char* getRawData() override;
+    explicit MemoryInputStream(size_t bufferSize)
+        : std::vector<char>(bufferSize)
+        , Files::MemBuf(this->data(), this->size())
+        , std::istream(static_cast<std::streambuf*>(this))
+    {}
+
+    char* getRawData()
+    {
+        return this->data();
+    }
 };
 
 }

From 85c8c91bcc35df0e9a3b33ce1e980b3d087446ca Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sat, 20 Nov 2021 12:55:36 +0100
Subject: [PATCH 1747/2859] Get rid of problematic / in branch name on OSX

Taken from https://devhints.io/bash

Should fix #6424
---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9f985856ec..5ec31d349d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -176,7 +176,7 @@ Debian_Clang_tests_Debug:
     - ccache -z -M "${CCACHE_SIZE}"
     - CI/before_script.osx.sh
     - 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
+    - for dmg in *.dmg; do mv "$dmg" "${dmg%.dmg}_${CI_COMMIT_REF_NAME##*/}_${CI_JOB_ID}.dmg"; done
     - ccache -s
   artifacts:
     paths:

From 10b3ca8194295f5d5038fc658ee3b231e7171d8d Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Sat, 20 Nov 2021 18:12:29 +0000
Subject: [PATCH 1748/2859] small fixup

---
 cmake/FindGMock.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/FindGMock.cmake b/cmake/FindGMock.cmake
index 0e98d4e6c0..6b3caf543e 100644
--- a/cmake/FindGMock.cmake
+++ b/cmake/FindGMock.cmake
@@ -190,7 +190,7 @@ if(EXISTS "${GMOCK_MAIN_LIBRARY}")
 endif()
 if(EXISTS "${GMOCK_MAIN_LIBRARY_DEBUG}")
     set_target_properties(GMock::Main PROPERTIES
-        IMPORTED_LOCATION "{GMOCK_MAIN_LIBRARY_DEBUG})
+        IMPORTED_LOCATION "${GMOCK_MAIN_LIBRARY_DEBUG}")
 endif()
 
 if(GMOCK_FOUND)

From 5f195b757690cb5bb5658ddb3961d7f39983d6f6 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 21 Nov 2021 01:48:28 +0100
Subject: [PATCH 1749/2859] Make arguments passed to
 LuaManager::synchronizedUpdate consistent with arguments passed to
 LuaManager::update. Fixes #6431.

---
 apps/openmw/engine.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 70d5a26c7a..f43406f705 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -295,7 +295,7 @@ bool OMW::Engine::frame(float frametime)
 
         // Should be called after input manager update and before any change to the game world.
         // It applies to the game world queued changes from the previous frame.
-        mLuaManager->synchronizedUpdate(paused, frametime);
+        mLuaManager->synchronizedUpdate(mEnvironment.getWindowManager()->isGuiMode(), frametime);
 
         // update game state
         {

From d85f772269241cb2f6fe95b74734ff675c007c82 Mon Sep 17 00:00:00 2001
From: Cody Glassman <glassmancody.info@gmail.com>
Date: Sun, 21 Nov 2021 02:25:05 +0000
Subject: [PATCH 1750/2859] Depth refactor

---
 apps/openmw/engine.cpp                     |  17 +++
 apps/openmw/mwgui/bookpage.cpp             |   4 +-
 apps/openmw/mwrender/bulletdebugdraw.cpp   |   4 +-
 apps/openmw/mwrender/characterpreview.cpp  |  51 ++-------
 apps/openmw/mwrender/globalmap.cpp         |   7 +-
 apps/openmw/mwrender/localmap.cpp          |  12 +--
 apps/openmw/mwrender/npcanimation.cpp      |   3 +-
 apps/openmw/mwrender/postprocessor.cpp     |   6 +-
 apps/openmw/mwrender/renderingmanager.cpp  |  14 +--
 apps/openmw/mwrender/ripplesimulation.cpp  |   8 +-
 apps/openmw/mwrender/screenshotmanager.cpp |   4 +-
 apps/openmw/mwrender/sky.cpp               |   4 +-
 apps/openmw/mwrender/skyutil.cpp           |   6 +-
 apps/openmw/mwrender/water.cpp             |   6 +-
 components/CMakeLists.txt                  |   2 +-
 components/nifosg/nifloader.cpp            |   3 +-
 components/resource/scenemanager.cpp       |   8 +-
 components/sceneutil/depth.cpp             |  63 +++++++++++
 components/sceneutil/depth.hpp             | 117 +++++++++++++++++++++
 components/sceneutil/mwshadowtechnique.cpp |   9 +-
 components/sceneutil/optimizer.cpp         |   6 +-
 components/sceneutil/rtt.cpp               |   2 +
 components/sceneutil/util.cpp              |  98 -----------------
 components/sceneutil/util.hpp              |  26 -----
 components/sceneutil/waterutil.cpp         |   4 +-
 components/shader/shadervisitor.cpp        |   4 +-
 components/terrain/material.cpp            |   6 +-
 27 files changed, 262 insertions(+), 232 deletions(-)
 create mode 100644 components/sceneutil/depth.cpp
 create mode 100644 components/sceneutil/depth.hpp

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 70d5a26c7a..0d97ebee4e 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -42,6 +42,7 @@
 #include <components/misc/frameratelimiter.hpp>
 
 #include <components/sceneutil/screencapture.hpp>
+#include <components/sceneutil/depth.hpp>
 
 #include "mwinput/inputmanagerimp.hpp"
 
@@ -761,6 +762,22 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
 
     osg::ref_ptr<osg::GLExtensions> exts = osg::GLExtensions::Get(0, false);
     bool shadersSupported = exts && (exts->glslLanguageVersion >= 1.2f);
+    bool enableReverseZ = false;
+
+    if (Settings::Manager::getBool("reverse z", "Camera"))
+    {
+        if (exts && exts->isClipControlSupported)
+        {
+            enableReverseZ = true;
+            Log(Debug::Info) << "Using reverse-z depth buffer";
+        }
+        else
+            Log(Debug::Warning) << "GL_ARB_clip_control not supported: disabling reverse-z depth buffer";
+    }
+    else
+        Log(Debug::Info) << "Using standard depth buffer";
+
+    SceneUtil::AutoDepth::setReversed(enableReverseZ);
 
 #if OSG_VERSION_LESS_THAN(3, 6, 6)
     // hack fix for https://github.com/openscenegraph/OpenSceneGraph/issues/1028
diff --git a/apps/openmw/mwgui/bookpage.cpp b/apps/openmw/mwgui/bookpage.cpp
index 874d1d866b..b2d2c39fd6 100644
--- a/apps/openmw/mwgui/bookpage.cpp
+++ b/apps/openmw/mwgui/bookpage.cpp
@@ -8,7 +8,7 @@
 #include "MyGUI_FactoryManager.h"
 
 #include <components/misc/utf8stream.hpp>
-#include <components/sceneutil/util.hpp>
+#include <components/sceneutil/depth.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
@@ -1221,7 +1221,7 @@ public:
 
         RenderXform renderXform (mCroppedParent, textFormat.mRenderItem->getRenderTarget()->getInfo());
 
-        float z = SceneUtil::getReverseZ() ? 1.f : -1.f;
+        float z = SceneUtil::AutoDepth::isReversed() ? 1.f : -1.f;
 
         GlyphStream glyphStream(textFormat.mFont, static_cast<float>(mCoord.left), static_cast<float>(mCoord.top - mViewTop),
                                   z /*mNode->getNodeDepth()*/, vertices, renderXform);
diff --git a/apps/openmw/mwrender/bulletdebugdraw.cpp b/apps/openmw/mwrender/bulletdebugdraw.cpp
index 9155132871..b169251465 100644
--- a/apps/openmw/mwrender/bulletdebugdraw.cpp
+++ b/apps/openmw/mwrender/bulletdebugdraw.cpp
@@ -8,7 +8,7 @@
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/convert.hpp>
-#include <components/sceneutil/util.hpp>
+#include <components/sceneutil/depth.hpp>
 #include <osg/PolygonMode>
 #include <osg/PolygonOffset>
 #include <osg/ShapeDrawable>
@@ -66,7 +66,7 @@ void DebugDrawer::createGeometry()
 
         auto* stateSet = new osg::StateSet;
         stateSet->setAttributeAndModes(new osg::PolygonMode(osg::PolygonMode::FRONT_AND_BACK, osg::PolygonMode::LINE), osg::StateAttribute::ON);
-        stateSet->setAttributeAndModes(new osg::PolygonOffset(SceneUtil::getReverseZ() ? 1.0 : -1.0, SceneUtil::getReverseZ() ? 1.0 : -1.0));
+        stateSet->setAttributeAndModes(new osg::PolygonOffset(SceneUtil::AutoDepth::isReversed() ? 1.0 : -1.0, SceneUtil::AutoDepth::isReversed() ? 1.0 : -1.0));
         osg::ref_ptr<osg::Material> material = new osg::Material;
         material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
         stateSet->setAttribute(material);
diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index c717806e35..7cca787580 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -23,6 +23,7 @@
 #include <components/sceneutil/shadow.hpp>
 #include <components/settings/settings.hpp>
 #include <components/sceneutil/nodecallback.hpp>
+#include <components/sceneutil/depth.hpp>
 
 #include "../mwbase/world.hpp"
 #include "../mwworld/class.hpp"
@@ -132,43 +133,6 @@ namespace MWRender
                     newStateSet->setTextureMode(7, GL_TEXTURE_2D, osg::StateAttribute::OFF);
                     newStateSet->setDefine("FORCE_OPAQUE", "0", osg::StateAttribute::ON);
                 }
-                if (SceneUtil::getReverseZ() && stateset->getAttribute(osg::StateAttribute::DEPTH))
-                {
-                    bool depthModified = false;
-                    osg::Depth* depth = static_cast<osg::Depth*>(stateset->getAttribute(osg::StateAttribute::DEPTH));
-                    depth->getUserValue("depthModified", depthModified);
-
-                    if (!depthModified)
-                    {
-                        if (!newStateSet)
-                        {
-                            newStateSet = new osg::StateSet(*stateset, osg::CopyOp::SHALLOW_COPY);
-                            node.setStateSet(newStateSet);
-                        }
-                        // Setup standard depth ranges
-                        osg::ref_ptr<osg::Depth> newDepth = new osg::Depth(*depth);
-
-                        switch (newDepth->getFunction())
-                        {
-                            case osg::Depth::LESS:
-                                newDepth->setFunction(osg::Depth::GREATER);
-                                break;
-                            case osg::Depth::LEQUAL:
-                                newDepth->setFunction(osg::Depth::GEQUAL);
-                                break;
-                            case osg::Depth::GREATER:
-                                newDepth->setFunction(osg::Depth::LESS);
-                                break;
-                            case osg::Depth::GEQUAL:
-                                newDepth->setFunction(osg::Depth::LEQUAL);
-                                break;
-                            default:
-                                break;
-                        }
-                        newStateSet->setAttribute(newDepth, osg::StateAttribute::ON);
-                        newDepth->setUserValue("depthModified", true);
-                    }
-                }
             }
             traverse(node);
         }
@@ -200,8 +164,6 @@ namespace MWRender
         mCamera->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT, osg::Camera::PIXEL_BUFFER_RTT);
         mCamera->setClearColor(osg::Vec4(0.f, 0.f, 0.f, 0.f));
         mCamera->setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-        const float fovYDegrees = 12.3f;
-        mCamera->setProjectionMatrixAsPerspective(fovYDegrees, sizeX/static_cast<float>(sizeY), 0.1f, 10000.f); // zNear and zFar are autocomputed
         mCamera->setViewport(0, 0, sizeX, sizeY);
         mCamera->setRenderOrder(osg::Camera::PRE_RENDER);
         mCamera->attach(osg::Camera::COLOR_BUFFER, mTexture, 0, 0, false, Settings::Manager::getInt("antialiasing", "Video"));
@@ -211,6 +173,8 @@ namespace MWRender
 
         mCamera->setNodeMask(Mask_RenderToTexture);
 
+        SceneUtil::setCameraClearDepth(mCamera);
+
         bool ffp = mResourceSystem->getSceneManager()->getLightingMethod() == SceneUtil::LightingMethod::FFP;
 
         osg::ref_ptr<SceneUtil::LightManager> lightManager = new SceneUtil::LightManager(ffp);
@@ -226,9 +190,14 @@ namespace MWRender
         defaultMat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
         defaultMat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 0.f));
         stateset->setAttribute(defaultMat);
-        stateset->addUniform(new osg::Uniform("projectionMatrix", static_cast<osg::Matrixf>(mCamera->getProjectionMatrix())));
 
-        stateset->setAttributeAndModes(new osg::Depth, osg::StateAttribute::ON);
+        const float fovYDegrees = 12.3f;
+        const float aspectRatio = static_cast<float>(sizeX) / static_cast<float>(sizeY);
+        const float znear = 0.1f;
+        const float zfar = 10000.f;
+        mCamera->setProjectionMatrixAsPerspective(fovYDegrees, aspectRatio, znear, zfar);
+        osg::Matrixf projectionMatrix = SceneUtil::AutoDepth::isReversed() ? static_cast<osg::Matrixf>(SceneUtil::getReversedZProjectionMatrixAsPerspective(fovYDegrees, aspectRatio, znear, zfar)) : static_cast<osg::Matrixf>(mCamera->getProjectionMatrix());
+        stateset->addUniform(new osg::Uniform("projectionMatrix", projectionMatrix));
 
         SceneUtil::ShadowManager::disableShadowsForStateSet(stateset);
 
diff --git a/apps/openmw/mwrender/globalmap.cpp b/apps/openmw/mwrender/globalmap.cpp
index b248efad4e..ba8749d81c 100644
--- a/apps/openmw/mwrender/globalmap.cpp
+++ b/apps/openmw/mwrender/globalmap.cpp
@@ -4,7 +4,6 @@
 #include <osg/Texture2D>
 #include <osg/Group>
 #include <osg/Geometry>
-#include <osg/Depth>
 #include <osg/TexEnvCombine>
 
 #include <osgDB/WriteFile>
@@ -15,8 +14,8 @@
 #include <components/debug/debuglog.hpp>
 
 #include <components/sceneutil/workqueue.hpp>
-#include <components/sceneutil/util.hpp>
 #include <components/sceneutil/nodecallback.hpp>
+#include <components/sceneutil/depth.hpp>
 
 #include <components/esm/globalmap.hpp>
 
@@ -326,8 +325,8 @@ namespace MWRender
         if (texture)
         {
             osg::ref_ptr<osg::Geometry> geom = createTexturedQuad(srcLeft, srcTop, srcRight, srcBottom);
-            auto depth = SceneUtil::createDepth();
-            depth->setWriteMask(0);
+            osg::ref_ptr<osg::Depth> depth = new SceneUtil::AutoDepth;
+            depth->setWriteMask(false);
             osg::StateSet* stateset = geom->getOrCreateStateSet();
             stateset->setAttribute(depth);
             stateset->setTextureAttributeAndModes(0, texture, osg::StateAttribute::ON);
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index 66c8c55c60..d9982d35c3 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -18,7 +18,7 @@
 #include <components/settings/settings.hpp>
 #include <components/sceneutil/visitor.hpp>
 #include <components/sceneutil/shadow.hpp>
-#include <components/sceneutil/util.hpp>
+#include <components/sceneutil/depth.hpp>
 #include <components/sceneutil/lightmanager.hpp>
 #include <components/sceneutil/nodecallback.hpp>
 #include <components/files/memorystream.hpp>
@@ -178,7 +178,7 @@ osg::ref_ptr<osg::Camera> LocalMap::createOrthographicCamera(float x, float y, f
 {
     osg::ref_ptr<osg::Camera> camera (new osg::Camera);
 
-    if (SceneUtil::getReverseZ())
+    if (SceneUtil::AutoDepth::isReversed())
         camera->setProjectionMatrix(SceneUtil::getReversedZProjectionMatrixAsOrtho(-width/2, width/2, -height/2, height/2, 5, (zmax-zmin) + 10));
     else
         camera->setProjectionMatrixAsOrtho(-width/2, width/2, -height/2, height/2, 5, (zmax-zmin) + 10);
@@ -198,14 +198,10 @@ osg::ref_ptr<osg::Camera> LocalMap::createOrthographicCamera(float x, float y, f
     osg::Camera::CullingMode cullingMode = (osg::Camera::DEFAULT_CULLING|osg::Camera::FAR_PLANE_CULLING) & ~(osg::Camera::SMALL_FEATURE_CULLING);
     camera->setCullingMode(cullingMode);
 
-    osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
-    stateset->setAttribute(new osg::PolygonMode(osg::PolygonMode::FRONT_AND_BACK, osg::PolygonMode::FILL), osg::StateAttribute::OVERRIDE);
-
-    if (SceneUtil::getReverseZ())
-        stateset->setAttributeAndModes(SceneUtil::createDepth(), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
-
     SceneUtil::setCameraClearDepth(camera);
 
+    osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
+    stateset->setAttribute(new osg::PolygonMode(osg::PolygonMode::FRONT_AND_BACK, osg::PolygonMode::FILL), osg::StateAttribute::OVERRIDE);
     stateset->addUniform(new osg::Uniform("projectionMatrix", static_cast<osg::Matrixf>(camera->getProjectionMatrix())), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
 
     // assign large value to effectively turn off fog
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 7031b5a02b..da361aec25 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -20,6 +20,7 @@
 #include <components/sceneutil/visitor.hpp>
 #include <components/sceneutil/skeleton.hpp>
 #include <components/sceneutil/keyframe.hpp>
+#include <components/sceneutil/depth.hpp>
 
 #include <components/settings/settings.hpp>
 
@@ -310,7 +311,7 @@ class DepthClearCallback : public osgUtil::RenderBin::DrawCallback
 public:
     DepthClearCallback()
     {
-        mDepth = SceneUtil::createDepth();
+        mDepth = new SceneUtil::AutoDepth;
         mDepth->setWriteMask(true);
 
         mStateSet = new osg::StateSet;
diff --git a/apps/openmw/mwrender/postprocessor.cpp b/apps/openmw/mwrender/postprocessor.cpp
index 7405098a03..b08cfe1f71 100644
--- a/apps/openmw/mwrender/postprocessor.cpp
+++ b/apps/openmw/mwrender/postprocessor.cpp
@@ -9,7 +9,7 @@
 #include <osgViewer/Viewer>
 
 #include <components/settings/settings.hpp>
-#include <components/sceneutil/util.hpp>
+#include <components/sceneutil/depth.hpp>
 #include <components/sceneutil/nodecallback.hpp>
 #include <components/debug/debuglog.hpp>
 
@@ -140,7 +140,7 @@ namespace MWRender
     {
         bool softParticles = Settings::Manager::getBool("soft particles", "Shaders");
 
-        if (!SceneUtil::getReverseZ() && !softParticles)
+        if (!SceneUtil::AutoDepth::isReversed() && !softParticles)
             return;
 
         osg::GraphicsContext* gc = viewer->getCamera()->getGraphicsContext();
@@ -161,7 +161,7 @@ namespace MWRender
             return;
         }
 
-        if (SceneUtil::getReverseZ())
+        if (SceneUtil::AutoDepth::isReversed())
         {
             if (osg::isGLExtensionSupported(contextID, "GL_ARB_depth_buffer_float"))
                 mDepthFormat = GL_DEPTH_COMPONENT32F;
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index b3b0d880c5..30be74c839 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -32,7 +32,7 @@
 
 #include <components/settings/settings.hpp>
 
-#include <components/sceneutil/util.hpp>
+#include <components/sceneutil/depth.hpp>
 #include <components/sceneutil/lightmanager.hpp>
 #include <components/sceneutil/statesetupdater.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
@@ -310,13 +310,7 @@ namespace MWRender
         , mFieldOfView(std::clamp(Settings::Manager::getFloat("field of view", "Camera"), 1.f, 179.f))
         , mFirstPersonFieldOfView(std::clamp(Settings::Manager::getFloat("first person field of view", "Camera"), 1.f, 179.f))
     {
-        bool reverseZ = SceneUtil::getReverseZ();
-
-        if (reverseZ)
-            Log(Debug::Info) << "Using reverse-z depth buffer";
-        else
-            Log(Debug::Info) << "Using standard depth buffer";
-
+        bool reverseZ = SceneUtil::AutoDepth::isReversed();
         auto lightingMethod = SceneUtil::LightManager::getLightingMethodFromString(Settings::Manager::getString("lighting method", "Shaders"));
 
         resourceSystem->getSceneManager()->setParticleSystemMask(MWRender::Mask_ParticleSystem);
@@ -538,7 +532,7 @@ namespace MWRender
         if (reverseZ)
         {
             osg::ref_ptr<osg::ClipControl> clipcontrol = new osg::ClipControl(osg::ClipControl::LOWER_LEFT, osg::ClipControl::ZERO_TO_ONE);
-            mRootNode->getOrCreateStateSet()->setAttributeAndModes(SceneUtil::createDepth(), osg::StateAttribute::ON);
+            mRootNode->getOrCreateStateSet()->setAttributeAndModes(new SceneUtil::AutoDepth, osg::StateAttribute::ON);
             mRootNode->getOrCreateStateSet()->setAttributeAndModes(clipcontrol, osg::StateAttribute::ON);
         }
 
@@ -1150,7 +1144,7 @@ namespace MWRender
 
         mViewer->getCamera()->setProjectionMatrixAsPerspective(fov, aspect, mNearClip, mViewDistance);
 
-        if (SceneUtil::getReverseZ())
+        if (SceneUtil::AutoDepth::isReversed())
         {
             mSharedUniformStateUpdater->setLinearFac(-mNearClip / (mViewDistance - mNearClip) - 1.f);
             mSharedUniformStateUpdater->setProjectionMatrix(SceneUtil::getReversedZProjectionMatrixAsPerspective(fov, aspect, mNearClip, mViewDistance));
diff --git a/apps/openmw/mwrender/ripplesimulation.cpp b/apps/openmw/mwrender/ripplesimulation.cpp
index fdfc3db63d..282362ea56 100644
--- a/apps/openmw/mwrender/ripplesimulation.cpp
+++ b/apps/openmw/mwrender/ripplesimulation.cpp
@@ -16,7 +16,7 @@
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/fallback/fallback.hpp>
-#include <components/sceneutil/util.hpp>
+#include <components/sceneutil/depth.hpp>
 
 #include "vismask.hpp"
 
@@ -56,13 +56,13 @@ namespace
         stateset->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
         stateset->setTextureAttributeAndModes(0, textures[0], osg::StateAttribute::ON);
 
-        auto depth = SceneUtil::createDepth();
+        osg::ref_ptr<osg::Depth> depth = new SceneUtil::AutoDepth;
         depth->setWriteMask(false);
         stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
 
         osg::ref_ptr<osg::PolygonOffset> polygonOffset (new osg::PolygonOffset);
-        polygonOffset->setUnits(SceneUtil::getReverseZ() ? 1 : -1);
-        polygonOffset->setFactor(SceneUtil::getReverseZ() ? 1 : -1);
+        polygonOffset->setUnits(SceneUtil::AutoDepth::isReversed() ? 1 : -1);
+        polygonOffset->setFactor(SceneUtil::AutoDepth::isReversed() ? 1 : -1);
         stateset->setAttributeAndModes(polygonOffset, osg::StateAttribute::ON);
 
         stateset->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
diff --git a/apps/openmw/mwrender/screenshotmanager.cpp b/apps/openmw/mwrender/screenshotmanager.cpp
index ab7d0d93f0..1973ca4025 100644
--- a/apps/openmw/mwrender/screenshotmanager.cpp
+++ b/apps/openmw/mwrender/screenshotmanager.cpp
@@ -12,7 +12,7 @@
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/shader/shadermanager.hpp>
-#include <components/sceneutil/util.hpp>
+#include <components/sceneutil/depth.hpp>
 
 #include <components/settings/settings.hpp>
 
@@ -331,7 +331,7 @@ namespace MWRender
         float nearClip = Settings::Manager::getFloat("near clip", "Camera");
         float viewDistance = Settings::Manager::getFloat("viewing distance", "Camera");
         // each cubemap side sees 90 degrees
-        if (SceneUtil::getReverseZ())
+        if (SceneUtil::AutoDepth::isReversed())
             rttCamera->setProjectionMatrix(SceneUtil::getReversedZProjectionMatrixAsPerspectiveInf(90.0, w/float(h), nearClip));
         else
             rttCamera->setProjectionMatrixAsPerspective(90.0, w/float(h), nearClip, viewDistance);
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index b6b0a3669b..fcb7447cf3 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -14,7 +14,7 @@
 #include <components/sceneutil/controller.hpp>
 #include <components/sceneutil/shadow.hpp>
 #include <components/sceneutil/visitor.hpp>
-#include <components/sceneutil/util.hpp>
+#include <components/sceneutil/depth.hpp>
 
 #include <components/resource/scenemanager.hpp>
 #include <components/resource/imagemanager.hpp>
@@ -338,7 +338,7 @@ namespace MWRender
             mEarlyRenderBinRoot->getOrCreateStateSet()->setAttributeAndModes(program, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
         }
 
-        auto depth = SceneUtil::createDepth();
+        osg::ref_ptr<osg::Depth> depth = new SceneUtil::AutoDepth;
         depth->setWriteMask(false);
         mEarlyRenderBinRoot->getOrCreateStateSet()->setAttributeAndModes(depth);
         mEarlyRenderBinRoot->getOrCreateStateSet()->setMode(GL_BLEND, osg::StateAttribute::ON);
diff --git a/apps/openmw/mwrender/skyutil.cpp b/apps/openmw/mwrender/skyutil.cpp
index 0e2955333f..b98e489738 100644
--- a/apps/openmw/mwrender/skyutil.cpp
+++ b/apps/openmw/mwrender/skyutil.cpp
@@ -25,7 +25,7 @@
 #include <components/resource/scenemanager.hpp>
 #include <components/resource/imagemanager.hpp>
 
-#include <components/sceneutil/util.hpp>
+#include <components/sceneutil/depth.hpp>
 
 #include <components/fallback/fallback.hpp>
 
@@ -811,11 +811,11 @@ namespace MWRender
         osg::StateSet* queryStateSet = new osg::StateSet;
         if (queryVisible)
         {
-            auto depth = SceneUtil::createDepth();
+            osg::ref_ptr<osg::Depth> depth = new SceneUtil::AutoDepth;
             // This is a trick to make fragments written by the query always use the maximum depth value,
             // without having to retrieve the current far clipping distance.
             // We want the sun glare to be "infinitely" far away.
-            double far = SceneUtil::getReverseZ() ? 0.0 : 1.0;
+            double far = SceneUtil::AutoDepth::isReversed() ? 0.0 : 1.0;
             depth->setZNear(far);
             depth->setZFar(far);
             depth->setWriteMask(false);
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index ca42423efe..fd5cbe0f79 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -27,7 +27,7 @@
 
 #include <components/sceneutil/rtt.hpp>
 #include <components/sceneutil/shadow.hpp>
-#include <components/sceneutil/util.hpp>
+#include <components/sceneutil/depth.hpp>
 #include <components/sceneutil/waterutil.hpp>
 #include <components/sceneutil/lightmanager.hpp>
 
@@ -268,7 +268,6 @@ public:
 
     void setDefaults(osg::Camera* camera) override
     {
-        SceneUtil::setCameraClearDepth(camera);
         camera->setReferenceFrame(osg::Camera::RELATIVE_RF);
         camera->setSmallFeatureCullingPixelSize(Settings::Manager::getInt("small feature culling pixel size", "Water"));
         camera->setName("RefractionCamera");
@@ -344,7 +343,6 @@ public:
 
     void setDefaults(osg::Camera* camera) override
     {
-        SceneUtil::setCameraClearDepth(camera);
         camera->setReferenceFrame(osg::Camera::RELATIVE_RF);
         camera->setSmallFeatureCullingPixelSize(Settings::Manager::getInt("small feature culling pixel size", "Water"));
         camera->setName("ReflectionCamera");
@@ -645,7 +643,7 @@ public:
         {
             stateset->setMode(GL_BLEND, osg::StateAttribute::ON);
             stateset->setRenderBinDetails(MWRender::RenderBin_Water, "RenderBin");
-            osg::ref_ptr<osg::Depth> depth = SceneUtil::createDepth();
+            osg::ref_ptr<osg::Depth> depth = new SceneUtil::AutoDepth;
             depth->setWriteMask(false);
             stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
         }
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 7d62824f4d..56371a8c02 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -57,7 +57,7 @@ add_component_dir (sceneutil
     clone attach visitor util statesetupdater controller skeleton riggeometry morphgeometry lightcontroller
     lightmanager lightutil positionattitudetransform workqueue pathgridutil waterutil writescene serialize optimizer
     actorutil detourdebugdraw navmesh agentpath shadow mwshadowtechnique recastmesh shadowsbin osgacontroller rtt
-    screencapture
+    screencapture depth
     )
 
 add_component_dir (nif
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 90046ecff1..91d2300161 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -16,7 +16,6 @@
 #include <components/misc/stringops.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/imagemanager.hpp>
-#include <components/sceneutil/util.hpp>
 #include <components/misc/osguservalues.hpp>
 
 // particle
@@ -1838,7 +1837,7 @@ namespace NifOsg
                 // Depth test flag
                 stateset->setMode(GL_DEPTH_TEST, zprop->flags&1 ? osg::StateAttribute::ON
                                                                 : osg::StateAttribute::OFF);
-                auto depth = SceneUtil::createDepth();
+                osg::ref_ptr<osg::Depth> depth = new osg::Depth;
                 // Depth write flag
                 depth->setWriteMask((zprop->flags>>1)&1);
                 // Morrowind ignores depth test function
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index f39a5919b6..16d942ecec 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -32,6 +32,7 @@
 #include <components/sceneutil/optimizer.hpp>
 #include <components/sceneutil/visitor.hpp>
 #include <components/sceneutil/lightmanager.hpp>
+#include <components/sceneutil/depth.hpp>
 
 #include <components/shader/shadervisitor.hpp>
 #include <components/shader/shadermanager.hpp>
@@ -252,14 +253,14 @@ namespace Resource
             {
                 if (stateset->getRenderingHint() == osg::StateSet::TRANSPARENT_BIN)
                 {
-                    osg::ref_ptr<osg::Depth> depth = SceneUtil::createDepth();
+                    osg::ref_ptr<osg::Depth> depth = new osg::Depth;
                     depth->setWriteMask(false);
 
                     stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
                 }
                 else if (stateset->getRenderingHint() == osg::StateSet::OPAQUE_BIN)
                 {
-                    osg::ref_ptr<osg::Depth> depth = SceneUtil::createDepth();
+                    osg::ref_ptr<osg::Depth> depth = new osg::Depth;
                     depth->setWriteMask(true);
 
                     stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
@@ -692,6 +693,9 @@ namespace Resource
             SetFilterSettingsControllerVisitor setFilterSettingsControllerVisitor(mMinFilter, mMagFilter, mMaxAnisotropy);
             loaded->accept(setFilterSettingsControllerVisitor);
 
+            SceneUtil::ReplaceDepthVisitor replaceDepthVisitor;
+            loaded->accept(replaceDepthVisitor);
+
             osg::ref_ptr<Shader::ShaderVisitor> shaderVisitor (createShaderVisitor());
             loaded->accept(*shaderVisitor);
 
diff --git a/components/sceneutil/depth.cpp b/components/sceneutil/depth.cpp
new file mode 100644
index 0000000000..5d53b97726
--- /dev/null
+++ b/components/sceneutil/depth.cpp
@@ -0,0 +1,63 @@
+#include "depth.hpp"
+
+#include <algorithm>
+
+#include <SDL_opengl_glext.h>
+
+#include <components/settings/settings.hpp>
+
+#ifndef GL_DEPTH32F_STENCIL8_NV
+#define GL_DEPTH32F_STENCIL8_NV 0x8DAC
+#endif
+
+namespace SceneUtil
+{
+    void setCameraClearDepth(osg::Camera* camera)
+    {
+        camera->setClearDepth(AutoDepth::isReversed() ? 0.0 : 1.0);
+    }
+
+    osg::Matrix getReversedZProjectionMatrixAsPerspectiveInf(double fov, double aspect, double near)
+    {
+        double A = 1.0/std::tan(osg::DegreesToRadians(fov)/2.0);
+        return osg::Matrix(
+            A/aspect,   0,      0,      0,
+            0,          A,      0,      0,
+            0,          0,      0,      -1,
+            0,          0,      near,   0
+        );
+    }
+
+    osg::Matrix getReversedZProjectionMatrixAsPerspective(double fov, double aspect, double near, double far)
+    {
+        double A = 1.0/std::tan(osg::DegreesToRadians(fov)/2.0);
+        return osg::Matrix(
+            A/aspect,   0,      0,                          0,
+            0,          A,      0,                          0,
+            0,          0,      near/(far-near),            -1,
+            0,          0,      (far*near)/(far - near),    0
+        );
+    }
+
+    osg::Matrix getReversedZProjectionMatrixAsOrtho(double left, double right, double bottom, double top, double near, double far)
+    {
+        return osg::Matrix(
+            2/(right-left),             0,                          0,                  0,
+            0,                          2/(top-bottom),             0,                  0,
+            0,                          0,                          1/(far-near),       0,
+            (right+left)/(left-right),  (top+bottom)/(bottom-top),  far/(far-near),     1
+        );
+    }
+
+    bool isFloatingPointDepthFormat(GLenum format)
+    {
+        constexpr std::array<GLenum, 4> formats = {
+            GL_DEPTH_COMPONENT32F,
+            GL_DEPTH_COMPONENT32F_NV,
+            GL_DEPTH32F_STENCIL8,
+            GL_DEPTH32F_STENCIL8_NV,
+        };
+
+        return std::find(formats.cbegin(), formats.cend(), format) != formats.cend();
+    }
+}
\ No newline at end of file
diff --git a/components/sceneutil/depth.hpp b/components/sceneutil/depth.hpp
new file mode 100644
index 0000000000..11a863ef7a
--- /dev/null
+++ b/components/sceneutil/depth.hpp
@@ -0,0 +1,117 @@
+#ifndef OPENMW_COMPONENTS_SCENEUTIL_DEPTH_H
+#define OPENMW_COMPONENTS_SCENEUTIL_DEPTH_H
+
+#include <osg/Depth>
+
+#include "util.hpp"
+
+namespace SceneUtil
+{
+    // Sets camera clear depth to 0 if reversed depth buffer is in use, 1 otherwise.
+    void setCameraClearDepth(osg::Camera* camera);
+
+    // Returns a perspective projection matrix for use with a reversed z-buffer
+    // and an infinite far plane. This is derived by mapping the default z-range
+    // of [0,1] to [1,0], then taking the limit as far plane approaches infinity.
+    osg::Matrix getReversedZProjectionMatrixAsPerspectiveInf(double fov, double aspect, double near);
+
+    // Returns a perspective projection matrix for use with a reversed z-buffer.
+    osg::Matrix getReversedZProjectionMatrixAsPerspective(double fov, double aspect, double near, double far);
+
+    // Returns an orthographic projection matrix for use with a reversed z-buffer.
+    osg::Matrix getReversedZProjectionMatrixAsOrtho(double left, double right, double bottom, double top, double near, double far);
+
+    // Returns true if the GL format is a floating point depth format.
+    bool isFloatingPointDepthFormat(GLenum format);
+
+    // Brief wrapper around an osg::Depth that applies the reversed depth function when a reversed depth buffer is in use
+    class AutoDepth : public osg::Depth
+    {
+    public:
+        AutoDepth(osg::Depth::Function func=osg::Depth::LESS, double zNear=0.0, double zFar=1.0, bool writeMask=true)
+        {
+            setFunction(func);
+            setZNear(zNear);
+            setZFar(zFar);
+            setWriteMask(writeMask);
+        }
+
+        AutoDepth(const osg::Depth& copy, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY) : osg::Depth(copy, copyop) {}
+
+        osg::Object* cloneType() const override { return new AutoDepth; }
+        osg::Object* clone(const osg::CopyOp& copyop) const override { return new AutoDepth(*this,copyop); }
+
+        void apply(osg::State& state) const override
+        {
+            glDepthFunc(static_cast<GLenum>(AutoDepth::isReversed() ? getReversedDepthFunction() : getFunction()));
+            glDepthMask(static_cast<GLboolean>(getWriteMask()));
+        #if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE) || defined(OSG_GLES3_AVAILABLE)
+            glDepthRangef(getZNear(),getZFar());
+        #else
+            glDepthRange(getZNear(),getZFar());
+        #endif
+        }
+
+        static void setReversed(bool reverseZ)
+        {
+            static bool init = false;
+
+            if (!init)
+            {
+                AutoDepth::sReversed = reverseZ;
+                init = true;
+            }
+        }
+
+        static bool isReversed()
+        {
+            return AutoDepth::sReversed;
+        }
+
+    private:
+
+        static inline bool sReversed = false;
+
+        osg::Depth::Function getReversedDepthFunction() const
+        {
+            const osg::Depth::Function func = getFunction();
+
+            switch (func)
+            {
+            case osg::Depth::LESS:
+                return osg::Depth::GREATER;
+            case osg::Depth::LEQUAL:
+                return osg::Depth::GEQUAL;
+            case osg::Depth::GREATER:
+                return osg::Depth::LESS;
+            case osg::Depth::GEQUAL:
+                return osg::Depth::LEQUAL;
+            default:
+                return func;
+            }
+        }
+
+    };
+
+    // Replaces all nodes osg::Depth state attributes with SceneUtil::AutoDepth.
+    class ReplaceDepthVisitor : public osg::NodeVisitor
+    {
+    public:
+        ReplaceDepthVisitor() : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN) {}
+
+        void apply(osg::Node& node) override
+        {
+            osg::StateSet* stateSet = node.getStateSet();
+
+            if (stateSet)
+            {
+                if (osg::Depth* depth = static_cast<osg::Depth*>(stateSet->getAttribute(osg::StateAttribute::DEPTH)))
+                    stateSet->setAttribute(new SceneUtil::AutoDepth(*depth));
+            };
+
+            traverse(node);
+        }
+    };
+}
+
+#endif
diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
index 770917eda7..daf6bb80ab 100644
--- a/components/sceneutil/mwshadowtechnique.cpp
+++ b/components/sceneutil/mwshadowtechnique.cpp
@@ -27,8 +27,6 @@
 
 #include <sstream>
 
-#include <components/sceneutil/util.hpp>
-
 #include "shadowsbin.hpp"
 
 namespace {
@@ -1652,11 +1650,8 @@ void MWShadowTechnique::createShaders()
     _shadowCastingStateSet->addUniform(new osg::Uniform("alphaTestShadows", false));
     osg::ref_ptr<osg::Depth> depth = new osg::Depth;
     depth->setWriteMask(true);
-    if (SceneUtil::getReverseZ())
-    {
-        osg::ref_ptr<osg::ClipControl> clipcontrol = new osg::ClipControl(osg::ClipControl::LOWER_LEFT, osg::ClipControl::NEGATIVE_ONE_TO_ONE);
-        _shadowCastingStateSet->setAttribute(clipcontrol, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
-    }
+    osg::ref_ptr<osg::ClipControl> clipcontrol = new osg::ClipControl(osg::ClipControl::LOWER_LEFT, osg::ClipControl::NEGATIVE_ONE_TO_ONE);
+    _shadowCastingStateSet->setAttribute(clipcontrol, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
     _shadowCastingStateSet->setAttribute(depth, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
     _shadowCastingStateSet->setMode(GL_DEPTH_CLAMP, osg::StateAttribute::ON);
 
diff --git a/components/sceneutil/optimizer.cpp b/components/sceneutil/optimizer.cpp
index e2fcaedbd7..748ceee952 100644
--- a/components/sceneutil/optimizer.cpp
+++ b/components/sceneutil/optimizer.cpp
@@ -42,7 +42,7 @@
 
 #include <iterator>
 
-#include <components/sceneutil/util.hpp>
+#include <components/sceneutil/depth.hpp>
 
 using namespace osgUtil;
 
@@ -1597,8 +1597,8 @@ bool Optimizer::MergeGeometryVisitor::mergeGroup(osg::Group& group)
                 }
                 if (_alphaBlendingActive && _mergeAlphaBlending && !geom->getStateSet())
                 {
-                    auto d = createDepth();
-                    d->setWriteMask(0);
+                    osg::ref_ptr<osg::Depth> d = new SceneUtil::AutoDepth;
+                    d->setWriteMask(false);
                     geom->getOrCreateStateSet()->setAttribute(d);
                 }
             }
diff --git a/components/sceneutil/rtt.cpp b/components/sceneutil/rtt.cpp
index 3b60c80afd..0765a2e835 100644
--- a/components/sceneutil/rtt.cpp
+++ b/components/sceneutil/rtt.cpp
@@ -8,6 +8,7 @@
 
 #include <components/sceneutil/nodecallback.hpp>
 #include <components/settings/settings.hpp>
+#include <components/sceneutil/depth.hpp>
 
 namespace SceneUtil
 {
@@ -69,6 +70,7 @@ namespace SceneUtil
             camera->setClearMask(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
             camera->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT);
             camera->setViewport(0, 0, mTextureWidth, mTextureHeight);
+            SceneUtil::setCameraClearDepth(camera);
 
             setDefaults(mViewDependentDataMap[cv]->mCamera.get());
 
diff --git a/components/sceneutil/util.cpp b/components/sceneutil/util.cpp
index 5b6e0a3ee0..7065fae933 100644
--- a/components/sceneutil/util.cpp
+++ b/components/sceneutil/util.cpp
@@ -4,8 +4,6 @@
 #include <sstream>
 #include <iomanip>
 
-#include <SDL_opengl_glext.h>
-
 #include <osg/Node>
 #include <osg/NodeVisitor>
 #include <osg/TexGen>
@@ -16,27 +14,8 @@
 
 #include <components/resource/imagemanager.hpp>
 #include <components/resource/scenemanager.hpp>
-#include <components/settings/settings.hpp>
-#include <components/debug/debuglog.hpp>
 #include <components/sceneutil/nodecallback.hpp>
 
-#ifndef GL_DEPTH32F_STENCIL8_NV
-#define GL_DEPTH32F_STENCIL8_NV 0x8DAC
-#endif
-
-namespace
-{
-
-bool isReverseZSupported()
-{
-    if (!Settings::Manager::mDefaultSettings.count({"Camera", "reverse z"}))
-        return false;
-    auto ext = osg::GLExtensions::Get(0, false);
-    return Settings::Manager::getBool("reverse z", "Camera") && ext && ext->isClipControlSupported;
-}
-
-}
-
 namespace SceneUtil
 {
 
@@ -338,81 +317,4 @@ bool attachAlphaToCoverageFriendlyFramebufferToCamera(osg::Camera* camera, osg::
     return addMSAAIntermediateTarget;
 }
 
-void attachAlphaToCoverageFriendlyDepthColor(osg::Camera* camera, osg::Texture2D* colorTex, osg::Texture2D* depthTex, GLenum depthFormat)
-{
-    bool addMSAAIntermediateTarget = Settings::Manager::getBool("antialias alpha test", "Shaders") && Settings::Manager::getInt("antialiasing", "Video") > 1;
-
-    if (isFloatingPointDepthFormat(depthFormat) && addMSAAIntermediateTarget)
-    {
-        camera->attach(osg::Camera::COLOR_BUFFER0, colorTex);
-        camera->attach(osg::Camera::DEPTH_BUFFER, depthTex);
-        camera->addCullCallback(new AttachMultisampledDepthColorCallback(colorTex, depthTex, 2, 1));
-    }
-    else
-    {
-        attachAlphaToCoverageFriendlyFramebufferToCamera(camera, osg::Camera::COLOR_BUFFER, colorTex);
-        camera->attach(osg::Camera::DEPTH_BUFFER, depthTex);
-    }
-}
-
-bool getReverseZ()
-{
-    static bool reverseZ = isReverseZSupported();
-    return reverseZ;
-}
-
-void setCameraClearDepth(osg::Camera* camera)
-{
-    camera->setClearDepth(getReverseZ() ? 0.0 : 1.0);
-}
-
-osg::ref_ptr<osg::Depth> createDepth()
-{
-    return new osg::Depth(getReverseZ() ? osg::Depth::GEQUAL : osg::Depth::LEQUAL);
-}
-
-osg::Matrix getReversedZProjectionMatrixAsPerspectiveInf(double fov, double aspect, double near)
-{
-    double A = 1.0/std::tan(osg::DegreesToRadians(fov)/2.0);
-    return osg::Matrix(
-        A/aspect,   0,      0,      0,
-        0,          A,      0,      0,
-        0,          0,      0,      -1,
-        0,          0,      near,   0
-    );
-}
-
-osg::Matrix getReversedZProjectionMatrixAsPerspective(double fov, double aspect, double near, double far)
-{
-    double A = 1.0/std::tan(osg::DegreesToRadians(fov)/2.0);
-    return osg::Matrix(
-        A/aspect,   0,      0,                          0,
-        0,          A,      0,                          0,
-        0,          0,      near/(far-near),            -1,
-        0,          0,      (far*near)/(far - near),    0
-    );
-}
-
-osg::Matrix getReversedZProjectionMatrixAsOrtho(double left, double right, double bottom, double top, double near, double far)
-{
-    return osg::Matrix(
-        2/(right-left),             0,                          0,                  0,
-        0,                          2/(top-bottom),             0,                  0,
-        0,                          0,                          1/(far-near),       0,
-        (right+left)/(left-right),  (top+bottom)/(bottom-top),  far/(far-near),     1
-    );
-}
-
-bool isFloatingPointDepthFormat(GLenum format)
-{
-    constexpr std::array<GLenum, 4> formats = {
-        GL_DEPTH_COMPONENT32F,
-        GL_DEPTH_COMPONENT32F_NV,
-        GL_DEPTH32F_STENCIL8,
-        GL_DEPTH32F_STENCIL8_NV,
-    };
-
-    return std::find(formats.cbegin(), formats.cend(), format) != formats.cend();
-}
-
 }
diff --git a/components/sceneutil/util.hpp b/components/sceneutil/util.hpp
index 4d19714d66..ddc2db845d 100644
--- a/components/sceneutil/util.hpp
+++ b/components/sceneutil/util.hpp
@@ -6,7 +6,6 @@
 #include <osg/Camera>
 #include <osg/Texture2D>
 #include <osg/Vec4f>
-#include <osg/Depth>
 
 #include <components/resource/resourcesystem.hpp>
 
@@ -64,31 +63,6 @@ namespace SceneUtil
 
     // Alpha-to-coverage requires a multisampled framebuffer, so we need to set that up for RTTs
     bool attachAlphaToCoverageFriendlyFramebufferToCamera(osg::Camera* camera, osg::Camera::BufferComponent buffer, osg::Texture* texture, unsigned int level = 0, unsigned int face = 0, bool mipMapGeneration = false);
-
-    void attachAlphaToCoverageFriendlyDepthColor(osg::Camera* camera, osg::Texture2D* colorTex, osg::Texture2D* depthTex, GLenum depthFormat);
-
-    bool getReverseZ();
-
-    void setCameraClearDepth(osg::Camera* camera);
-
-    // Returns a suitable depth state attribute dependent on whether a reverse-z
-    // depth buffer is in use.
-    osg::ref_ptr<osg::Depth> createDepth();
-
-    // Returns a perspective projection matrix for use with a reversed z-buffer
-    // and an infinite far plane. This is derived by mapping the default z-range
-    // of [0,1] to [1,0], then taking the limit as far plane approaches
-    // infinity.
-    osg::Matrix getReversedZProjectionMatrixAsPerspectiveInf(double fov, double aspect, double near);
-
-    // Returns a perspective projection matrix for use with a reversed z-buffer.
-    osg::Matrix getReversedZProjectionMatrixAsPerspective(double fov, double aspect, double near, double far);
-
-    // Returns an orthographic projection matrix for use with a reversed z-buffer.
-    osg::Matrix getReversedZProjectionMatrixAsOrtho(double left, double right, double bottom, double top, double near, double far);
-
-    // Returns true if the GL format is a floating point depth format
-    bool isFloatingPointDepthFormat(GLenum format);
 }
 
 #endif
diff --git a/components/sceneutil/waterutil.cpp b/components/sceneutil/waterutil.cpp
index ac171005ae..e22070f40f 100644
--- a/components/sceneutil/waterutil.cpp
+++ b/components/sceneutil/waterutil.cpp
@@ -5,7 +5,7 @@
 #include <osg/Material>
 #include <osg/StateSet>
 
-#include "util.hpp"
+#include "depth.hpp"
 
 namespace SceneUtil
 {
@@ -78,7 +78,7 @@ namespace SceneUtil
         stateset->setMode(GL_BLEND, osg::StateAttribute::ON);
         stateset->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
 
-        auto depth = createDepth();
+        osg::ref_ptr<osg::Depth> depth = new SceneUtil::AutoDepth;
         depth->setWriteMask(false);
         stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
 
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 1e9acdb35f..95e0a75f18 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -21,7 +21,7 @@
 #include <components/vfs/manager.hpp>
 #include <components/sceneutil/riggeometry.hpp>
 #include <components/sceneutil/morphgeometry.hpp>
-#include <components/sceneutil/util.hpp>
+#include <components/sceneutil/depth.hpp>
 
 #include "removedalphafunc.hpp"
 #include "shadermanager.hpp"
@@ -567,7 +567,7 @@ namespace Shader
             {
                 softParticles = true;
 
-                auto depth = SceneUtil::createDepth();
+                auto depth = new SceneUtil::AutoDepth;
                 depth->setWriteMask(false);
                 writableStateSet->setAttributeAndModes(depth, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
                 writableStateSet->addUniform(new osg::Uniform("particleSize", partsys->getDefaultParticleTemplate().getSizeRange().maximum));
diff --git a/components/terrain/material.cpp b/components/terrain/material.cpp
index 22f507b3a2..ae432d262e 100644
--- a/components/terrain/material.cpp
+++ b/components/terrain/material.cpp
@@ -8,7 +8,7 @@
 #include <osg/BlendFunc>
 
 #include <components/shader/shadermanager.hpp>
-#include <components/sceneutil/util.hpp>
+#include <components/sceneutil/depth.hpp>
 
 #include <mutex>
 
@@ -87,7 +87,7 @@ namespace
         osg::ref_ptr<osg::Depth> mValue;
 
         EqualDepth()
-            : mValue(new osg::Depth)
+            : mValue(new SceneUtil::AutoDepth)
         {
             mValue->setFunction(osg::Depth::EQUAL);
         }
@@ -106,7 +106,7 @@ namespace
         osg::ref_ptr<osg::Depth> mValue;
 
         LequalDepth()
-            : mValue(SceneUtil::createDepth())
+            : mValue(new SceneUtil::AutoDepth)
         {
         }
     };

From ebe8ba717ef96556a14463790938e350ee349f3e Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Sun, 21 Nov 2021 02:30:57 +0000
Subject: [PATCH 1751/2859] Move essimporter to CS CI job

It's the only thing that won't impact most users, and might buy enough
seconds to stop the CI timeouts.
---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5ec31d349d..47511923ad 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -201,11 +201,11 @@ macOS10.15_Xcode11:
     CCACHE_SIZE: 3G
 
 variables: &engine-targets
-  targets: "openmw,openmw-essimporter,openmw-iniimporter,openmw-launcher,openmw-wizard"
+  targets: "openmw,openmw-iniimporter,openmw-launcher,openmw-wizard"
   package: "Engine"
 
 variables: &cs-targets
-  targets: "openmw-cs,bsatool,esmtool,niftest"
+  targets: "openmw-cs,bsatool,esmtool,niftest,openmw-essimporter"
   package: "CS"
 
 variables: &tests-targets

From 9389cfaa42532c532e00f666de259ef983b73554 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Sat, 20 Nov 2021 18:39:20 -0800
Subject: [PATCH 1752/2859] mac os driver workaround and shadervisitor fixes

---
 apps/openmw/mwrender/postprocessor.cpp        | 21 +++++
 apps/openmw/mwrender/renderingmanager.cpp     |  1 +
 apps/openmw/mwrender/sky.cpp                  |  2 -
 components/nifosg/nifloader.cpp               |  1 -
 components/shader/shadervisitor.cpp           | 89 +++++++++++++------
 components/shader/shadervisitor.hpp           |  3 +
 .../reference/modding/settings/shaders.rst    |  3 +
 files/shaders/objects_fragment.glsl           |  2 +-
 8 files changed, 90 insertions(+), 32 deletions(-)

diff --git a/apps/openmw/mwrender/postprocessor.cpp b/apps/openmw/mwrender/postprocessor.cpp
index b08cfe1f71..19655c5cdb 100644
--- a/apps/openmw/mwrender/postprocessor.cpp
+++ b/apps/openmw/mwrender/postprocessor.cpp
@@ -102,8 +102,15 @@ namespace
             : mOpaqueDepthFbo(new osg::FrameBufferObject)
             , mSourceFbo(sourceFbo)
             , mOpaqueDepthTex(opaqueDepthTex)
+            , mColorAttached(false)
         {
             mOpaqueDepthFbo->setAttachment(osg::FrameBufferObject::BufferComponent::DEPTH_BUFFER, osg::FrameBufferAttachment(opaqueDepthTex));
+
+#ifdef __APPLE__
+            // Mac OS drivers complain that a FBO is incomplete if it has no color attachment
+            mOpaqueDepthFbo->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER, osg::FrameBufferAttachment(new osg::RenderBuffer(mOpaqueDepthTex->getTextureWidth(), mOpaqueDepthTex->getTextureHeight(), GL_RGB)));
+            mColorAttached = true;
+#endif
         }
 
         void drawImplementation(osgUtil::RenderBin* bin, osg::RenderInfo& renderInfo, osgUtil::RenderLeaf*& previous) override
@@ -114,7 +121,10 @@ namespace
                 osg::GLExtensions* ext = state.get<osg::GLExtensions>();
 
                 mSourceFbo->apply(state, osg::FrameBufferObject::READ_FRAMEBUFFER);
+                postBindOperation(state);
+
                 mOpaqueDepthFbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
+                postBindOperation(state);
 
                 ext->glBlitFramebuffer(0, 0, mOpaqueDepthTex->getTextureWidth(), mOpaqueDepthTex->getTextureHeight(), 0, 0, mOpaqueDepthTex->getTextureWidth(), mOpaqueDepthTex->getTextureHeight(), GL_DEPTH_BUFFER_BIT, GL_NEAREST);
 
@@ -124,9 +134,20 @@ namespace
             bin->drawImplementation(renderInfo, previous);
         }
     private:
+        void postBindOperation(osg::State& state)
+        {
+            if (mColorAttached)
+                return;
+            #if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE) && !defined(OSG_GLES3_AVAILABLE)
+            state.glDrawBuffer(GL_NONE);
+            state.glReadBuffer(GL_NONE);
+            #endif
+        }
+
         osg::ref_ptr<osg::FrameBufferObject> mOpaqueDepthFbo;
         osg::ref_ptr<osg::FrameBufferObject> mSourceFbo;
         osg::ref_ptr<osg::Texture2D> mOpaqueDepthTex;
+        bool mColorAttached;
     };
 }
 
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 30be74c839..9abd2e7487 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -316,6 +316,7 @@ namespace MWRender
         resourceSystem->getSceneManager()->setParticleSystemMask(MWRender::Mask_ParticleSystem);
         // Shadows and radial fog have problems with fixed-function mode
         bool forceShaders = Settings::Manager::getBool("radial fog", "Shaders")
+                            || Settings::Manager::getBool("soft particles", "Shaders")
                             || Settings::Manager::getBool("force shaders", "Shaders")
                             || Settings::Manager::getBool("enable shadows", "Shadows")
                             || lightingMethod != SceneUtil::LightingMethod::FFP
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index fcb7447cf3..8d24ada5be 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -636,7 +636,6 @@ namespace MWRender
                     mParticleNode = new osg::PositionAttitudeTransform;
                     mParticleNode->addCullCallback(mUnderwaterSwitch);
                     mParticleNode->setNodeMask(Mask_WeatherParticles);
-                    mParticleNode->getOrCreateStateSet();
                     mRootNode->addChild(mParticleNode);
                 }
 
@@ -668,7 +667,6 @@ namespace MWRender
                         ps->getParticle(particleIndex)->update(0, true);
                     }
 
-                    ps->getOrCreateStateSet();
                     ps->setUserValue("simpleLighting", true);
                 }
 
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 91d2300161..f85946f7bd 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -1049,7 +1049,6 @@ namespace NifOsg
         void handleParticleSystem(const Nif::Node *nifNode, osg::Group *parentNode, SceneUtil::CompositeStateSetUpdater* composite, int animflags)
         {
             osg::ref_ptr<ParticleSystem> partsys (new ParticleSystem);
-            partsys->getOrCreateStateSet();
             partsys->setSortMode(osgParticle::ParticleSystem::SORT_BACK_TO_FRONT);
 
             const Nif::NiParticleSystemController* partctrl = nullptr;
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 95e0a75f18..2063546034 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -1,6 +1,7 @@
 #include "shadervisitor.hpp"
 
 #include <unordered_set>
+#include <unordered_map>
 #include <set>
 
 #include <osg/AlphaFunc>
@@ -37,12 +38,14 @@ namespace Shader
             , mUniforms(rhs.mUniforms)
             , mModes(rhs.mModes)
             , mAttributes(rhs.mAttributes)
+            , mTextureModes(rhs.mTextureModes)
         {
         }
 
         void addUniform(const std::string& name) { mUniforms.emplace(name); }
         void setMode(osg::StateAttribute::GLMode mode) { mModes.emplace(mode); }
         void setAttribute(osg::StateAttribute::TypeMemberPair typeMemberPair) { mAttributes.emplace(typeMemberPair); }
+        void setTextureMode(int unit, osg::StateAttribute::GLMode mode) { mTextureModes[unit].emplace(mode); }
 
         void setAttribute(const osg::StateAttribute* attribute)
         {
@@ -64,12 +67,20 @@ namespace Shader
         bool hasMode(osg::StateAttribute::GLMode mode) { return mModes.count(mode); }
         bool hasAttribute(const osg::StateAttribute::TypeMemberPair &typeMemberPair) { return mAttributes.count(typeMemberPair); }
         bool hasAttribute(osg::StateAttribute::Type type, unsigned int member) { return hasAttribute(osg::StateAttribute::TypeMemberPair(type, member)); }
+        bool hasTextureMode(int unit, osg::StateAttribute::GLMode mode)
+        {
+            auto it = mTextureModes.find(unit);
+            if (it == mTextureModes.cend())
+                return false;
+
+            return it->second.count(mode);
+        }
 
         const std::set<osg::StateAttribute::TypeMemberPair>& getAttributes() { return mAttributes; }
 
         bool empty()
         {
-            return mUniforms.empty() && mModes.empty() && mAttributes.empty();
+            return mUniforms.empty() && mModes.empty() && mAttributes.empty() && mTextureModes.empty();
         }
 
         META_Object(Shader, AddedState)
@@ -86,9 +97,12 @@ namespace Shader
             AddedState* mTracker;
         };
 
+        using ModeSet = std::unordered_set<osg::StateAttribute::GLMode>;
+
         std::unordered_set<std::string> mUniforms;
-        std::unordered_set<osg::StateAttribute::GLMode> mModes;
+        ModeSet mModes;
         std::set<osg::StateAttribute::TypeMemberPair> mAttributes;
+        std::unordered_map<int, ModeSet> mTextureModes;
     };
 
     ShaderVisitor::ShaderRequirements::ShaderRequirements()
@@ -102,6 +116,8 @@ namespace Shader
         , mAlphaBlend(false)
         , mNormalHeight(false)
         , mTexStageRequiringTangents(-1)
+        , mSoftParticles(false)
+        , mSoftParticleSize(0.f)
         , mNode(nullptr)
     {
     }
@@ -213,6 +229,8 @@ namespace Shader
         if (node.getUserValue("shaderRequired", shaderRequired) && shaderRequired)
             mRequirements.back().mShaderRequired = true;
 
+        osg::ref_ptr<AddedState> addedState = getAddedState(*stateset);
+
         if (!texAttributes.empty())
         {
             const osg::Texture* diffuseMap = nullptr;
@@ -224,6 +242,9 @@ namespace Shader
                 const osg::StateAttribute *attr = stateset->getTextureAttribute(unit, osg::StateAttribute::TEXTURE);
                 if (attr)
                 {
+                    if (addedState && addedState->hasTextureMode(unit, GL_TEXTURE_2D))
+                        continue;
+
                     const osg::Texture* texture = attr->asTexture();
                     if (texture)
                     {
@@ -350,7 +371,6 @@ namespace Shader
         osg::StateSet::AttributeList removedAttributes;
         if (osg::ref_ptr<osg::StateSet> removedState = getRemovedState(*stateset))
             removedAttributes = removedState->getAttributeList();
-        osg::ref_ptr<AddedState> addedState = getAddedState(*stateset);
 
         for (const auto* attributeMap : std::initializer_list<const osg::StateSet::AttributeList*>{ &attributes, &removedAttributes })
         {
@@ -545,6 +565,25 @@ namespace Shader
             updateRemovedState(*writableUserData, removedState);
         }
 
+        if (reqs.mSoftParticles)
+        {
+            osg::ref_ptr<osg::Depth> depth = new SceneUtil::AutoDepth;
+            depth->setWriteMask(false);
+            writableStateSet->setAttributeAndModes(depth, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+            addedState->setAttribute(depth);
+
+            writableStateSet->addUniform(new osg::Uniform("particleSize", reqs.mSoftParticleSize));
+            addedState->addUniform("particleSize");
+
+            writableStateSet->addUniform(new osg::Uniform("opaqueDepthTex", 2));
+            addedState->addUniform("opaqueDepthTex");
+
+            writableStateSet->setTextureAttributeAndModes(2, mOpaqueDepthTex, osg::StateAttribute::ON);
+            addedState->setTextureMode(2, GL_TEXTURE_2D);
+        }
+
+        defineMap["softParticles"] = reqs.mSoftParticles ? "1" : "0";
+
         if (!addedState->empty())
         {
             // user data is normally shallow copied so shared with the original stateset
@@ -557,27 +596,6 @@ namespace Shader
             updateAddedState(*writableUserData, addedState);
         }
 
-        bool softParticles = false;
-
-        if (mOpaqueDepthTex)
-        {
-            auto partsys = dynamic_cast<osgParticle::ParticleSystem*>(&node);
-
-            if (partsys)
-            {
-                softParticles = true;
-
-                auto depth = new SceneUtil::AutoDepth;
-                depth->setWriteMask(false);
-                writableStateSet->setAttributeAndModes(depth, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
-                writableStateSet->addUniform(new osg::Uniform("particleSize", partsys->getDefaultParticleTemplate().getSizeRange().maximum));
-                writableStateSet->addUniform(new osg::Uniform("opaqueDepthTex", 2));
-                writableStateSet->setTextureAttributeAndModes(2, mOpaqueDepthTex, osg::StateAttribute::ON);
-            }
-        }
-
-        defineMap["softParticles"] = softParticles ? "1" : "0";
-
         std::string shaderPrefix;
         if (!node.getUserValue("shaderPrefix", shaderPrefix))
             shaderPrefix = mDefaultShaderPrefix;
@@ -719,13 +737,22 @@ namespace Shader
 
     void ShaderVisitor::apply(osg::Drawable& drawable)
     {
-        // non-Geometry drawable (e.g. particle system)
-        bool needPop = (drawable.getStateSet() != nullptr);
+        auto partsys = dynamic_cast<osgParticle::ParticleSystem*>(&drawable);
+
+        bool needPop = drawable.getStateSet() || partsys;
 
-        if (drawable.getStateSet())
+        if (needPop)
         {
             pushRequirements(drawable);
-            applyStateSet(drawable.getStateSet(), drawable);
+
+            if (partsys && mOpaqueDepthTex)
+            {
+                mRequirements.back().mSoftParticles = true;
+                mRequirements.back().mSoftParticleSize = partsys->getDefaultParticleTemplate().getSizeRange().maximum;
+            }
+
+            if (drawable.getStateSet())
+                applyStateSet(drawable.getStateSet(), drawable);
         }
 
         if (!mRequirements.empty())
@@ -831,6 +858,12 @@ namespace Shader
 
                 for (const auto& attribute : removedState->getAttributeList())
                     writableStateSet->setAttribute(attribute.second.first, attribute.second.second);
+
+                for (unsigned int unit = 0; unit < removedState->getTextureModeList().size(); ++unit)
+                {
+                    for (const auto&[mode, value] : removedState->getTextureModeList()[unit])
+                        writableStateSet->setTextureMode(unit, mode, value);
+                }
             }
         }
 
diff --git a/components/shader/shadervisitor.hpp b/components/shader/shadervisitor.hpp
index d80e697fd8..72dec05b5e 100644
--- a/components/shader/shadervisitor.hpp
+++ b/components/shader/shadervisitor.hpp
@@ -101,6 +101,9 @@ namespace Shader
             // -1 == no tangents required
             int mTexStageRequiringTangents;
 
+            bool mSoftParticles;
+            float mSoftParticleSize;
+
             // the Node that requested these requirements
             osg::Node* mNode;
         };
diff --git a/docs/source/reference/modding/settings/shaders.rst b/docs/source/reference/modding/settings/shaders.rst
index b9d8cfe1b9..5629e321d0 100644
--- a/docs/source/reference/modding/settings/shaders.rst
+++ b/docs/source/reference/modding/settings/shaders.rst
@@ -282,3 +282,6 @@ intersection between individual particles and other opaque geometry by blending
 between them. Note, this relies on overriding specific properties of particle
 systems that potentially differ from the source content, this setting may change
 the look of some particle systems.
+
+Note that the rendering will act as if you have 'force shaders' option enabled.
+This means that shaders will be used to render all objects and the terrain.
\ No newline at end of file
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index 99ed44919b..bae9ff7951 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -226,7 +226,7 @@ void main()
 #endif
     gl_FragData[0].xyz = mix(gl_FragData[0].xyz, gl_Fog.color.xyz, fogValue);
 
-#if @softParticles
+#if !defined(FORCE_OPAQUE) && @softParticles
     gl_FragData[0].a *= calcSoftParticleFade();
 #endif
 

From f9136d4392b4a3d76f373f6d1a609674d8911d81 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 21 Nov 2021 13:12:35 +0100
Subject: [PATCH 1753/2859] Support multiple arguments in Lua callbacks.

---
 .../lua/test_scriptscontainer.cpp             | 20 +++++++++++++++++++
 components/lua/scriptscontainer.cpp           |  9 ---------
 components/lua/scriptscontainer.hpp           | 12 +++++++++--
 3 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/apps/openmw_test_suite/lua/test_scriptscontainer.cpp b/apps/openmw_test_suite/lua/test_scriptscontainer.cpp
index 344fbb3c78..8be02a2f13 100644
--- a/apps/openmw_test_suite/lua/test_scriptscontainer.cpp
+++ b/apps/openmw_test_suite/lua/test_scriptscontainer.cpp
@@ -440,4 +440,24 @@ return {
         EXPECT_EQ(counter4, 25);
     }
 
+    TEST_F(LuaScriptsContainerTest, CallbackWrapper)
+    {
+        LuaUtil::Callback callback{mLua.sol()["print"], mLua.newTable()};
+        callback.mHiddenData[LuaUtil::ScriptsContainer::sScriptDebugNameKey] = "some_script.lua";
+        callback.mHiddenData[LuaUtil::ScriptsContainer::sScriptIdKey] = LuaUtil::ScriptsContainer::ScriptId{nullptr, 0};
+
+        testing::internal::CaptureStdout();
+        callback(1.5);
+        EXPECT_EQ(internal::GetCapturedStdout(), "1.5\n");
+
+        testing::internal::CaptureStdout();
+        callback(1.5, 2.5);
+        EXPECT_EQ(internal::GetCapturedStdout(), "1.5\t2.5\n");
+
+        testing::internal::CaptureStdout();
+        callback.mHiddenData[LuaUtil::ScriptsContainer::sScriptIdKey] = sol::nil;
+        callback(1.5, 2.5);
+        EXPECT_EQ(internal::GetCapturedStdout(), "Ignored callback to the removed script some_script.lua\n");
+    }
+
 }
diff --git a/components/lua/scriptscontainer.cpp b/components/lua/scriptscontainer.cpp
index 517ad5f788..eb9da7a60b 100644
--- a/components/lua/scriptscontainer.cpp
+++ b/components/lua/scriptscontainer.cpp
@@ -530,13 +530,4 @@ namespace LuaUtil
         updateTimerQueue(mHoursTimersQueue, gameHours);
     }
 
-    void Callback::operator()(sol::object arg) const
-    {
-        if (mHiddenData[ScriptsContainer::sScriptIdKey] != sol::nil)
-            LuaUtil::call(mFunc, std::move(arg));
-        else
-            Log(Debug::Debug) << "Ignored callback to the removed script "
-                              << mHiddenData.get<std::string>(ScriptsContainer::sScriptDebugNameKey);
-    }
-
 }
diff --git a/components/lua/scriptscontainer.hpp b/components/lua/scriptscontainer.hpp
index e934868d08..1863d04669 100644
--- a/components/lua/scriptscontainer.hpp
+++ b/components/lua/scriptscontainer.hpp
@@ -242,7 +242,7 @@ namespace LuaUtil
         int64_t mTemporaryCallbackCounter = 0;
     };
 
-    // Wrapper for a single-argument Lua function.
+    // Wrapper for a Lua function.
     // Holds information about the script the function belongs to.
     // Needed to prevent callback calls if the script was removed.
     struct Callback
@@ -250,7 +250,15 @@ namespace LuaUtil
         sol::function mFunc;
         sol::table mHiddenData;  // same object as Script::mHiddenData in ScriptsContainer
 
-        void operator()(sol::object arg) const;
+        template <typename... Args>
+        void operator()(Args&&... args) const
+        {
+            if (mHiddenData[ScriptsContainer::sScriptIdKey] != sol::nil)
+                LuaUtil::call(mFunc, std::forward<Args>(args)...);
+            else
+                Log(Debug::Debug) << "Ignored callback to the removed script "
+                                  << mHiddenData.get<std::string>(ScriptsContainer::sScriptDebugNameKey);
+        }
     };
 
 }

From ce7f8c90f8d9aa70078428acf4e39398cac283d3 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 21 Nov 2021 14:21:47 +0100
Subject: [PATCH 1754/2859] Fix unity build

---
 components/detournavigator/makenavmesh.cpp    |  5 +-
 .../detournavigator/navmeshtileview.cpp       | 83 +++++++++++--------
 .../detournavigator/navmeshtileview.hpp       |  2 +-
 .../detournavigator/preparednavmeshdata.cpp   |  9 --
 .../preparednavmeshdatatuple.hpp              | 22 +++--
 5 files changed, 67 insertions(+), 54 deletions(-)

diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index 3043c36308..c53fcdcc48 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -26,10 +26,10 @@
 #include <limits>
 #include <array>
 
+namespace DetourNavigator
+{
 namespace
 {
-    using namespace DetourNavigator;
-
     struct Rectangle
     {
         TileBounds mBounds;
@@ -388,6 +388,7 @@ namespace
         return power;
     }
 }
+} // namespace DetourNavigator
 
 namespace DetourNavigator
 {
diff --git a/components/detournavigator/navmeshtileview.cpp b/components/detournavigator/navmeshtileview.cpp
index 336cd1ba84..d12bcecd7e 100644
--- a/components/detournavigator/navmeshtileview.cpp
+++ b/components/detournavigator/navmeshtileview.cpp
@@ -9,14 +9,11 @@
 #include <stdexcept>
 #include <tuple>
 
-namespace
+inline bool operator==(const dtMeshHeader& lhs, const dtMeshHeader& rhs) noexcept
 {
-    using DetourNavigator::ArrayRef;
-    using DetourNavigator::Ref;
-    using DetourNavigator::Span;
-
-    auto makeTuple(const dtMeshHeader& v)
+    const auto makeTuple = [] (const dtMeshHeader& v)
     {
+        using DetourNavigator::ArrayRef;
         return std::tuple(
             v.x,
             v.y,
@@ -39,47 +36,46 @@ namespace
             ArrayRef(v.bmax),
             v.bvQuantFactor
         );
-    }
+    };
+    return makeTuple(lhs) == makeTuple(rhs);
+}
 
-    auto makeTuple(const dtPoly& v)
+inline bool operator==(const dtPoly& lhs, const dtPoly& rhs) noexcept
+{
+    const auto makeTuple = [] (const dtPoly& v)
     {
+        using DetourNavigator::ArrayRef;
         return std::tuple(ArrayRef(v.verts), ArrayRef(v.neis), v.flags, v.vertCount, v.areaAndtype);
-    }
+    };
+    return makeTuple(lhs) == makeTuple(rhs);
+}
 
-    auto makeTuple(const dtPolyDetail& v)
+inline bool operator==(const dtPolyDetail& lhs, const dtPolyDetail& rhs) noexcept
+{
+    const auto makeTuple = [] (const dtPolyDetail& v)
     {
         return std::tuple(v.vertBase, v.triBase, v.vertCount, v.triCount);
-    }
+    };
+    return makeTuple(lhs) == makeTuple(rhs);
+}
 
-    auto makeTuple(const dtBVNode& v)
+inline bool operator==(const dtBVNode& lhs, const dtBVNode& rhs) noexcept
+{
+    const auto makeTuple = [] (const dtBVNode& v)
     {
+        using DetourNavigator::ArrayRef;
         return std::tuple(ArrayRef(v.bmin), ArrayRef(v.bmax), v.i);
-    }
-
-    auto makeTuple(const dtOffMeshConnection& v)
-    {
-        return std::tuple(ArrayRef(v.pos), v.rad, v.poly, v.flags, v.side, v.userId);
-    }
-
-    auto makeTuple(const DetourNavigator::NavMeshTileConstView& v)
-    {
-        return std::tuple(
-            Ref(*v.mHeader),
-            Span(v.mPolys, v.mHeader->polyCount),
-            Span(v.mVerts, v.mHeader->vertCount),
-            Span(v.mDetailMeshes, v.mHeader->detailMeshCount),
-            Span(v.mDetailVerts, v.mHeader->detailVertCount),
-            Span(v.mDetailTris, v.mHeader->detailTriCount),
-            Span(v.mBvTree, v.mHeader->bvNodeCount),
-            Span(v.mOffMeshCons, v.mHeader->offMeshConCount)
-        );
-    }
+    };
+    return makeTuple(lhs) == makeTuple(rhs);
 }
 
-template <class T>
-inline auto operator==(const T& lhs, const T& rhs)
-    -> std::enable_if_t<std::is_same_v<std::void_t<decltype(makeTuple(lhs))>, void>, bool>
+inline bool operator==(const dtOffMeshConnection& lhs, const dtOffMeshConnection& rhs) noexcept
 {
+    const auto makeTuple = [] (const dtOffMeshConnection& v)
+    {
+        using DetourNavigator::ArrayRef;
+        return std::tuple(ArrayRef(v.pos), v.rad, v.poly, v.flags, v.side, v.userId);
+    };
     return makeTuple(lhs) == makeTuple(rhs);
 }
 
@@ -139,8 +135,23 @@ namespace DetourNavigator
         return view;
     }
 
-    bool operator==(const NavMeshTileConstView& lhs, const NavMeshTileConstView& rhs)
+    bool operator==(const NavMeshTileConstView& lhs, const NavMeshTileConstView& rhs) noexcept
     {
+        using DetourNavigator::Ref;
+        using DetourNavigator::Span;
+        const auto makeTuple = [] (const DetourNavigator::NavMeshTileConstView& v)
+        {
+            return std::tuple(
+                Ref(*v.mHeader),
+                Span(v.mPolys, v.mHeader->polyCount),
+                Span(v.mVerts, v.mHeader->vertCount),
+                Span(v.mDetailMeshes, v.mHeader->detailMeshCount),
+                Span(v.mDetailVerts, v.mHeader->detailVertCount),
+                Span(v.mDetailTris, v.mHeader->detailTriCount),
+                Span(v.mBvTree, v.mHeader->bvNodeCount),
+                Span(v.mOffMeshCons, v.mHeader->offMeshConCount)
+            );
+        };
         return makeTuple(lhs) == makeTuple(rhs);
     }
 }
diff --git a/components/detournavigator/navmeshtileview.hpp b/components/detournavigator/navmeshtileview.hpp
index 92017360c3..b797545b8a 100644
--- a/components/detournavigator/navmeshtileview.hpp
+++ b/components/detournavigator/navmeshtileview.hpp
@@ -21,7 +21,7 @@ namespace DetourNavigator
         const dtBVNode* mBvTree;
         const dtOffMeshConnection* mOffMeshCons;
 
-        friend bool operator==(const NavMeshTileConstView& lhs, const NavMeshTileConstView& rhs);
+        friend bool operator==(const NavMeshTileConstView& lhs, const NavMeshTileConstView& rhs) noexcept;
     };
 
     NavMeshTileConstView asNavMeshTileConstView(const unsigned char* data);
diff --git a/components/detournavigator/preparednavmeshdata.cpp b/components/detournavigator/preparednavmeshdata.cpp
index 3fea46b26c..c86e18482c 100644
--- a/components/detournavigator/preparednavmeshdata.cpp
+++ b/components/detournavigator/preparednavmeshdata.cpp
@@ -6,8 +6,6 @@
 
 namespace
 {
-    using namespace DetourNavigator;
-
     void initPolyMeshDetail(rcPolyMeshDetail& value) noexcept
     {
         value.meshes = nullptr;
@@ -26,13 +24,6 @@ namespace
     }
 }
 
-template <class T>
-inline constexpr auto operator==(const T& lhs, const T& rhs) noexcept
-    -> std::enable_if_t<std::is_same_v<std::void_t<decltype(makeTuple(lhs))>, void>, bool>
-{
-    return makeTuple(lhs) == makeTuple(rhs);
-}
-
 namespace DetourNavigator
 {
     PreparedNavMeshData::PreparedNavMeshData() noexcept
diff --git a/components/detournavigator/preparednavmeshdatatuple.hpp b/components/detournavigator/preparednavmeshdatatuple.hpp
index bcca0ace37..03b192ad38 100644
--- a/components/detournavigator/preparednavmeshdatatuple.hpp
+++ b/components/detournavigator/preparednavmeshdatatuple.hpp
@@ -9,10 +9,11 @@
 
 #include <tuple>
 
-namespace DetourNavigator
+inline bool operator==(const rcPolyMesh& lhs, const rcPolyMesh& rhs) noexcept
 {
-    constexpr auto makeTuple(const rcPolyMesh& v) noexcept
+    const auto makeTuple = [] (const rcPolyMesh& v)
     {
+        using namespace DetourNavigator;
         return std::tuple(
             Span(v.verts, static_cast<int>(getVertsLength(v))),
             Span(v.polys, static_cast<int>(getPolysLength(v))),
@@ -26,18 +27,27 @@ namespace DetourNavigator
             v.borderSize,
             v.maxEdgeError
         );
-    }
+    };
+    return makeTuple(lhs) == makeTuple(rhs);
+}
 
-    constexpr auto makeTuple(const rcPolyMeshDetail& v) noexcept
+inline bool operator==(const rcPolyMeshDetail& lhs, const rcPolyMeshDetail& rhs) noexcept
+{
+    const auto makeTuple = [] (const rcPolyMeshDetail& v)
     {
+        using namespace DetourNavigator;
         return std::tuple(
             Span(v.meshes, static_cast<int>(getMeshesLength(v))),
             Span(v.verts, static_cast<int>(getVertsLength(v))),
             Span(v.tris, static_cast<int>(getTrisLength(v)))
         );
-    }
+    };
+    return makeTuple(lhs) == makeTuple(rhs);
+}
 
-    constexpr auto makeTuple(const PreparedNavMeshData& v) noexcept
+namespace DetourNavigator
+{
+    inline auto makeTuple(const PreparedNavMeshData& v) noexcept
     {
         return std::tuple(
             v.mUserId,

From d04d4ab4991c17619192ed234b5817fcac7f2000 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 15 Nov 2021 14:48:13 +0100
Subject: [PATCH 1755/2859] Add MurmurHash3_x64_128 implementation

Sources:
https://github.com/aappleby/smhasher/blob/92cf3702fcfaadc84eb7bef59825a23e0cd84f56/src/MurmurHash3.h
https://github.com/aappleby/smhasher/blob/92cf3702fcfaadc84eb7bef59825a23e0cd84f56/src/MurmurHash3.cpp

Other hash functions and unused implementation details are removed.
---
 extern/CMakeLists.txt           |   2 +
 extern/smhasher/CMakeLists.txt  |   2 +
 extern/smhasher/MurmurHash3.cpp | 148 ++++++++++++++++++++++++++++++++
 extern/smhasher/MurmurHash3.h   |  33 +++++++
 4 files changed, 185 insertions(+)
 create mode 100644 extern/smhasher/CMakeLists.txt
 create mode 100644 extern/smhasher/MurmurHash3.cpp
 create mode 100644 extern/smhasher/MurmurHash3.h

diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 59d3d15176..0bfdc4c233 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -208,3 +208,5 @@ if (NOT OPENMW_USE_SYSTEM_SQLITE3)
     set(SQLite3_INCLUDE_DIR ${sqlite3_SOURCE_DIR}/ PARENT_SCOPE)
     set(SQLite3_LIBRARY sqlite3 PARENT_SCOPE)
 endif()
+
+add_subdirectory(smhasher)
diff --git a/extern/smhasher/CMakeLists.txt b/extern/smhasher/CMakeLists.txt
new file mode 100644
index 0000000000..ee03e6c38e
--- /dev/null
+++ b/extern/smhasher/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_library(smhasher STATIC MurmurHash3.cpp)
+target_include_directories(smhasher INTERFACE .)
diff --git a/extern/smhasher/MurmurHash3.cpp b/extern/smhasher/MurmurHash3.cpp
new file mode 100644
index 0000000000..62be4f3cef
--- /dev/null
+++ b/extern/smhasher/MurmurHash3.cpp
@@ -0,0 +1,148 @@
+//-----------------------------------------------------------------------------
+// MurmurHash3 was written by Austin Appleby, and is placed in the public
+// domain. The author hereby disclaims copyright to this source code.
+
+// Note - The x86 and x64 versions do _not_ produce the same results, as the
+// algorithms are optimized for their respective platforms. You can still
+// compile and run any of them on any platform, but your performance with the
+// non-native version will be less than optimal.
+
+#include "MurmurHash3.h"
+
+//-----------------------------------------------------------------------------
+// Platform-specific functions and macros
+
+// Microsoft Visual Studio
+
+#if defined(_MSC_VER)
+
+#define FORCE_INLINE	__forceinline
+
+#include <stdlib.h>
+
+#define ROTL64(x,y)	_rotl64(x,y)
+
+#define BIG_CONSTANT(x) (x)
+
+// Other compilers
+
+#else	// defined(_MSC_VER)
+
+#define	FORCE_INLINE inline __attribute__((always_inline))
+
+inline uint64_t rotl64 ( uint64_t x, int8_t r )
+{
+  return (x << r) | (x >> (64 - r));
+}
+
+#define ROTL64(x,y)	rotl64(x,y)
+
+#define BIG_CONSTANT(x) (x##LLU)
+
+#endif // !defined(_MSC_VER)
+
+//-----------------------------------------------------------------------------
+// Block read - if your platform needs to do endian-swapping or can only
+// handle aligned reads, do the conversion here
+
+FORCE_INLINE uint64_t getblock64 ( const uint64_t * p, int i )
+{
+  return p[i];
+}
+
+//----------
+
+FORCE_INLINE uint64_t fmix64 ( uint64_t k )
+{
+  k ^= k >> 33;
+  k *= BIG_CONSTANT(0xff51afd7ed558ccd);
+  k ^= k >> 33;
+  k *= BIG_CONSTANT(0xc4ceb9fe1a85ec53);
+  k ^= k >> 33;
+
+  return k;
+}
+
+//-----------------------------------------------------------------------------
+
+void MurmurHash3_x64_128 ( const void * key, const int len,
+                           const uint32_t seed, void * out )
+{
+  const uint8_t * data = (const uint8_t*)key;
+  const int nblocks = len / 16;
+
+  uint64_t h1 = seed;
+  uint64_t h2 = seed;
+
+  const uint64_t c1 = BIG_CONSTANT(0x87c37b91114253d5);
+  const uint64_t c2 = BIG_CONSTANT(0x4cf5ad432745937f);
+
+  //----------
+  // body
+
+  const uint64_t * blocks = (const uint64_t *)(data);
+
+  for(int i = 0; i < nblocks; i++)
+  {
+    uint64_t k1 = getblock64(blocks,i*2+0);
+    uint64_t k2 = getblock64(blocks,i*2+1);
+
+    k1 *= c1; k1  = ROTL64(k1,31); k1 *= c2; h1 ^= k1;
+
+    h1 = ROTL64(h1,27); h1 += h2; h1 = h1*5+0x52dce729;
+
+    k2 *= c2; k2  = ROTL64(k2,33); k2 *= c1; h2 ^= k2;
+
+    h2 = ROTL64(h2,31); h2 += h1; h2 = h2*5+0x38495ab5;
+  }
+
+  //----------
+  // tail
+
+  const uint8_t * tail = (const uint8_t*)(data + nblocks*16);
+
+  uint64_t k1 = 0;
+  uint64_t k2 = 0;
+
+  switch(len & 15)
+  {
+  case 15: k2 ^= ((uint64_t)tail[14]) << 48;
+  case 14: k2 ^= ((uint64_t)tail[13]) << 40;
+  case 13: k2 ^= ((uint64_t)tail[12]) << 32;
+  case 12: k2 ^= ((uint64_t)tail[11]) << 24;
+  case 11: k2 ^= ((uint64_t)tail[10]) << 16;
+  case 10: k2 ^= ((uint64_t)tail[ 9]) << 8;
+  case  9: k2 ^= ((uint64_t)tail[ 8]) << 0;
+           k2 *= c2; k2  = ROTL64(k2,33); k2 *= c1; h2 ^= k2;
+
+  case  8: k1 ^= ((uint64_t)tail[ 7]) << 56;
+  case  7: k1 ^= ((uint64_t)tail[ 6]) << 48;
+  case  6: k1 ^= ((uint64_t)tail[ 5]) << 40;
+  case  5: k1 ^= ((uint64_t)tail[ 4]) << 32;
+  case  4: k1 ^= ((uint64_t)tail[ 3]) << 24;
+  case  3: k1 ^= ((uint64_t)tail[ 2]) << 16;
+  case  2: k1 ^= ((uint64_t)tail[ 1]) << 8;
+  case  1: k1 ^= ((uint64_t)tail[ 0]) << 0;
+           k1 *= c1; k1  = ROTL64(k1,31); k1 *= c2; h1 ^= k1;
+  };
+
+  //----------
+  // finalization
+
+  h1 ^= len; h2 ^= len;
+
+  h1 += h2;
+  h2 += h1;
+
+  h1 = fmix64(h1);
+  h2 = fmix64(h2);
+
+  h1 += h2;
+  h2 += h1;
+
+  ((uint64_t*)out)[0] = h1;
+  ((uint64_t*)out)[1] = h2;
+}
+
+//-----------------------------------------------------------------------------
+
diff --git a/extern/smhasher/MurmurHash3.h b/extern/smhasher/MurmurHash3.h
new file mode 100644
index 0000000000..5a7ed73f33
--- /dev/null
+++ b/extern/smhasher/MurmurHash3.h
@@ -0,0 +1,33 @@
+//-----------------------------------------------------------------------------
+// MurmurHash3 was written by Austin Appleby, and is placed in the public
+// domain. The author hereby disclaims copyright to this source code.
+
+#ifndef _MURMURHASH3_H_
+#define _MURMURHASH3_H_
+
+//-----------------------------------------------------------------------------
+// Platform-specific functions and macros
+
+// Microsoft Visual Studio
+
+#if defined(_MSC_VER) && (_MSC_VER < 1600)
+
+typedef unsigned char uint8_t;
+typedef unsigned int uint32_t;
+typedef unsigned __int64 uint64_t;
+
+// Other compilers
+
+#else	// defined(_MSC_VER)
+
+#include <stdint.h>
+
+#endif // !defined(_MSC_VER)
+
+//-----------------------------------------------------------------------------
+
+void MurmurHash3_x64_128 ( const void * key, int len, uint32_t seed, void * out );
+
+//-----------------------------------------------------------------------------
+
+#endif // _MURMURHASH3_H_

From 86bf9d5b8df6b2c136dc9429376a8671c2571d06 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 15 Nov 2021 14:50:04 +0100
Subject: [PATCH 1756/2859] Support 128bit seed for MurmurHash3_x64_128

---
 extern/smhasher/MurmurHash3.cpp | 6 +++---
 extern/smhasher/MurmurHash3.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/extern/smhasher/MurmurHash3.cpp b/extern/smhasher/MurmurHash3.cpp
index 62be4f3cef..69d8d6c773 100644
--- a/extern/smhasher/MurmurHash3.cpp
+++ b/extern/smhasher/MurmurHash3.cpp
@@ -66,13 +66,13 @@ FORCE_INLINE uint64_t fmix64 ( uint64_t k )
 //-----------------------------------------------------------------------------
 
 void MurmurHash3_x64_128 ( const void * key, const int len,
-                           const uint32_t seed, void * out )
+                           const uint64_t * seed, void * out )
 {
   const uint8_t * data = (const uint8_t*)key;
   const int nblocks = len / 16;
 
-  uint64_t h1 = seed;
-  uint64_t h2 = seed;
+  uint64_t h1 = seed[0];
+  uint64_t h2 = seed[1];
 
   const uint64_t c1 = BIG_CONSTANT(0x87c37b91114253d5);
   const uint64_t c2 = BIG_CONSTANT(0x4cf5ad432745937f);
diff --git a/extern/smhasher/MurmurHash3.h b/extern/smhasher/MurmurHash3.h
index 5a7ed73f33..8aebdc304d 100644
--- a/extern/smhasher/MurmurHash3.h
+++ b/extern/smhasher/MurmurHash3.h
@@ -26,7 +26,7 @@ typedef unsigned __int64 uint64_t;
 
 //-----------------------------------------------------------------------------
 
-void MurmurHash3_x64_128 ( const void * key, int len, uint32_t seed, void * out );
+void MurmurHash3_x64_128 ( const void * key, int len, const uint64_t * seed, void * out );
 
 //-----------------------------------------------------------------------------
 

From f85053d78c7d21484bcf49d75ab2a9fce5ce79f3 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 15 Nov 2021 16:57:58 +0100
Subject: [PATCH 1757/2859] Support unaligned blocks

---
 extern/smhasher/MurmurHash3.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/extern/smhasher/MurmurHash3.cpp b/extern/smhasher/MurmurHash3.cpp
index 69d8d6c773..c8b774bab9 100644
--- a/extern/smhasher/MurmurHash3.cpp
+++ b/extern/smhasher/MurmurHash3.cpp
@@ -9,6 +9,8 @@
 
 #include "MurmurHash3.h"
 
+#include <cstring>
+
 //-----------------------------------------------------------------------------
 // Platform-specific functions and macros
 
@@ -47,7 +49,9 @@ inline uint64_t rotl64 ( uint64_t x, int8_t r )
 
 FORCE_INLINE uint64_t getblock64 ( const uint64_t * p, int i )
 {
-  return p[i];
+  uint64_t result = 0;
+  std::memcpy(&result, p + i, sizeof(result));
+  return result;
 }
 
 //----------

From a665a38aca554515b7e6e2d071183ba325134317 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 15 Nov 2021 17:40:22 +0100
Subject: [PATCH 1758/2859] Use MurmurHash3_x64_128 for file hash

---
 apps/openmw_test_suite/CMakeLists.txt         |  2 +
 apps/openmw_test_suite/files/hash.cpp         | 55 +++++++++++++++++++
 .../nifloader/testbulletnifloader.cpp         |  4 +-
 components/CMakeLists.txt                     |  1 +
 components/files/hash.cpp                     | 19 ++++---
 components/files/hash.hpp                     |  3 +-
 components/nif/niffile.cpp                    |  3 +-
 components/nif/niffile.hpp                    |  6 +-
 components/nifosg/nifloader.cpp               |  4 +-
 components/resource/bulletshape.hpp           |  3 +-
 components/resource/bulletshapemanager.cpp    |  5 +-
 components/resource/scenemanager.cpp          |  4 +-
 12 files changed, 85 insertions(+), 24 deletions(-)
 create mode 100644 apps/openmw_test_suite/files/hash.cpp

diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index 29564ef191..ed1d6c413b 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -62,6 +62,8 @@ if (GTEST_FOUND AND GMOCK_FOUND)
 
         esmloader/load.cpp
         esmloader/esmdata.cpp
+
+        files/hash.cpp
     )
 
     source_group(apps\\openmw_test_suite FILES openmw_test_suite.cpp ${UNITTEST_SRC_FILES})
diff --git a/apps/openmw_test_suite/files/hash.cpp b/apps/openmw_test_suite/files/hash.cpp
new file mode 100644
index 0000000000..e6dbc8f6cc
--- /dev/null
+++ b/apps/openmw_test_suite/files/hash.cpp
@@ -0,0 +1,55 @@
+#include <components/files/hash.hpp>
+#include <components/files/constrainedfilestream.hpp>
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+#include <algorithm>
+#include <fstream>
+#include <sstream>
+#include <string>
+
+namespace
+{
+    using namespace testing;
+    using namespace Files;
+
+    struct Params
+    {
+        std::size_t mSize;
+        std::array<std::uint64_t, 2> mHash;
+    };
+
+    struct FilesGetHash : TestWithParam<Params> {};
+
+    TEST_P(FilesGetHash, shouldReturnHashForStringStream)
+    {
+        const std::string fileName = "fileName";
+        std::string content;
+        std::fill_n(std::back_inserter(content), GetParam().mSize, 'a');
+        std::istringstream stream(content);
+        EXPECT_EQ(getHash(fileName, stream), GetParam().mHash);
+    }
+
+    TEST_P(FilesGetHash, shouldReturnHashForConstrainedFileStream)
+    {
+        std::string fileName(UnitTest::GetInstance()->current_test_info()->name());
+        std::replace(fileName.begin(), fileName.end(), '/', '_');
+        std::string content;
+        std::fill_n(std::back_inserter(content), GetParam().mSize, 'a');
+        std::fstream(fileName, std::ios_base::out | std::ios_base::binary)
+            .write(content.data(), static_cast<std::streamsize>(content.size()));
+        const auto stream = Files::openConstrainedFileStream(fileName.data(), 0, content.size());
+        EXPECT_EQ(getHash(fileName, *stream), GetParam().mHash);
+    }
+
+    INSTANTIATE_TEST_SUITE_P(Params, FilesGetHash, Values(
+        Params {0, {0, 0}},
+        Params {1, {9607679276477937801ull, 16624257681780017498ull}},
+        Params {128, {15287858148353394424ull, 16818615825966581310ull}},
+        Params {1000, {11018119256083894017ull, 6631144854802791578ull}},
+        Params {4096, {11972283295181039100ull, 16027670129106775155ull}},
+        Params {4097, {16717956291025443060ull, 12856404199748778153ull}},
+        Params {5000, {15775925571142117787ull, 10322955217889622896ull}}
+    ));
+}
diff --git a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
index 92aece9075..8fbf5c1b5b 100644
--- a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
+++ b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
@@ -335,7 +335,7 @@ namespace
         MOCK_METHOD(void, setUseSkinning, (bool), (override));
         MOCK_METHOD(bool, getUseSkinning, (), (const, override));
         MOCK_METHOD(std::string, getFilename, (), (const, override));
-        MOCK_METHOD(std::uint64_t, getHash, (), (const, override));
+        MOCK_METHOD(std::string, getHash, (), (const, override));
         MOCK_METHOD(unsigned int, getVersion, (), (const, override));
         MOCK_METHOD(unsigned int, getUserVersion, (), (const, override));
         MOCK_METHOD(unsigned int, getBethVersion, (), (const, override));
@@ -382,7 +382,7 @@ namespace
             ),
             btVector3(4, 8, 12)
         };
-        const std::uint64_t mHash = 42;
+        const std::string mHash = "hash";
 
         TestBulletNifLoader()
         {
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 56371a8c02..3fc9cb92a1 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -289,6 +289,7 @@ target_link_libraries(components
 
     Base64
     SQLite::SQLite3
+    smhasher
     )
 
 target_link_libraries(components ${BULLET_LIBRARIES})
diff --git a/components/files/hash.cpp b/components/files/hash.cpp
index 91af1e9283..079a169ae5 100644
--- a/components/files/hash.cpp
+++ b/components/files/hash.cpp
@@ -1,17 +1,17 @@
 #include "hash.hpp"
 
-#include <components/misc/hash.hpp>
+#include <extern/smhasher/MurmurHash3.h>
 
+#include <array>
 #include <cstdint>
-#include <functional>
 #include <istream>
 #include <string>
 
 namespace Files
 {
-    std::uint64_t getHash(const std::string& fileName, std::istream& stream)
+    std::array<std::uint64_t, 2> getHash(const std::string& fileName, std::istream& stream)
     {
-        std::uint64_t hash = std::hash<std::string> {}(fileName);
+        std::array<std::uint64_t, 2> hash {0, 0};
         try
         {
             const auto start = stream.tellg();
@@ -19,9 +19,14 @@ namespace Files
             stream.exceptions(std::ios_base::badbit);
             while (stream)
             {
-                std::uint64_t value = 0;
-                stream.read(reinterpret_cast<char*>(&value), sizeof(value));
-                Misc::hashCombine(hash, value);
+                std::array<char, 4096> value;
+                stream.read(value.data(), value.size());
+                const std::streamsize read = stream.gcount();
+                if (read == 0)
+                    break;
+                std::array<std::uint64_t, 2> blockHash {0, 0};
+                MurmurHash3_x64_128(value.data(), static_cast<int>(read), hash.data(), blockHash.data());
+                hash = blockHash;
             }
             stream.exceptions(exceptions);
             stream.clear();
diff --git a/components/files/hash.hpp b/components/files/hash.hpp
index 46784ee9be..13d56d5824 100644
--- a/components/files/hash.hpp
+++ b/components/files/hash.hpp
@@ -1,13 +1,14 @@
 #ifndef COMPONENTS_FILES_HASH_H
 #define COMPONENTS_FILES_HASH_H
 
+#include <array>
 #include <cstdint>
 #include <istream>
 #include <string>
 
 namespace Files
 {
-    std::uint64_t getHash(const std::string& fileName, std::istream& stream);
+    std::array<std::uint64_t, 2> getHash(const std::string& fileName, std::istream& stream);
 }
 
 #endif
diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index f11b75d218..f70b9024f9 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -173,7 +173,8 @@ std::string NIFFile::printVersion(unsigned int version)
 
 void NIFFile::parse(Files::IStreamPtr stream)
 {
-    hash = Files::getHash(filename, *stream);
+    const std::array<std::uint64_t, 2> fileHash = Files::getHash(filename, *stream);
+    hash.append(reinterpret_cast<const char*>(fileHash.data()), fileHash.size() * sizeof(std::uint64_t));
 
     NIFStream nif (this, stream);
 
diff --git a/components/nif/niffile.hpp b/components/nif/niffile.hpp
index eb851a74ff..6884f51d58 100644
--- a/components/nif/niffile.hpp
+++ b/components/nif/niffile.hpp
@@ -34,7 +34,7 @@ struct File
 
     virtual std::string getFilename() const = 0;
 
-    virtual std::uint64_t getHash() const = 0;
+    virtual std::string getHash() const = 0;
 
     virtual unsigned int getVersion() const = 0;
 
@@ -52,7 +52,7 @@ class NIFFile final : public File
 
     /// File name, used for error messages and opening the file
     std::string filename;
-    std::uint64_t hash = 0;
+    std::string hash;
 
     /// Record list
     std::vector<Record*> records;
@@ -144,7 +144,7 @@ public:
     /// Get the name of the file
     std::string getFilename() const override { return filename; }
 
-    std::uint64_t getHash() const override { return hash; }
+    std::string getHash() const override { return hash; }
 
     /// Get the version of the NIF format used
     unsigned int getVersion() const override { return ver; }
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 91d2300161..99aaaa3323 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -325,9 +325,7 @@ namespace NifOsg
             if (!textkeys->mTextKeys.empty())
                 created->getOrCreateUserDataContainer()->addUserObject(textkeys);
 
-            const std::uint64_t nifHash = nif->getHash();
-            created->setUserValue(Misc::OsgUserValues::sFileHash,
-                std::string(reinterpret_cast<const char*>(&nifHash), sizeof(nifHash)));
+            created->setUserValue(Misc::OsgUserValues::sFileHash, nif->getHash());
 
             return created;
         }
diff --git a/components/resource/bulletshape.hpp b/components/resource/bulletshape.hpp
index 6dfa37aeda..cd8922ec8e 100644
--- a/components/resource/bulletshape.hpp
+++ b/components/resource/bulletshape.hpp
@@ -1,6 +1,7 @@
 #ifndef OPENMW_COMPONENTS_RESOURCE_BULLETSHAPE_H
 #define OPENMW_COMPONENTS_RESOURCE_BULLETSHAPE_H
 
+#include <array>
 #include <map>
 #include <memory>
 
@@ -53,7 +54,7 @@ namespace Resource
         std::map<int, int> mAnimatedShapes;
 
         std::string mFileName;
-        std::uint64_t mFileHash = 0;
+        std::string mFileHash;
 
         void setLocalScaling(const btVector3& scale);
 
diff --git a/components/resource/bulletshapemanager.cpp b/components/resource/bulletshapemanager.cpp
index 3803fbf669..da4672757a 100644
--- a/components/resource/bulletshapemanager.cpp
+++ b/components/resource/bulletshapemanager.cpp
@@ -169,10 +169,7 @@ osg::ref_ptr<const BulletShape> BulletShapeManager::getShape(const std::string &
             if (shape != nullptr)
             {
                 shape->mFileName = normalized;
-                std::string fileHash;
-                constNode->getUserValue(Misc::OsgUserValues::sFileHash, fileHash);
-                if (!fileHash.empty())
-                    std::memcpy(&shape->mFileHash, fileHash.data(), std::min(fileHash.size(), sizeof(shape->mFileHash)));
+                constNode->getUserValue(Misc::OsgUserValues::sFileHash, shape->mFileHash);
             }
         }
 
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 16d942ecec..5f2d78d2ed 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -506,7 +506,7 @@ namespace Resource
             options->setReadFileCallback(new ImageReadCallback(imageManager));
             if (ext == "dae") options->setOptionString("daeUseSequencedTextureUnits");
 
-            const std::uint64_t fileHash = Files::getHash(normalizedFilename, model);
+            const std::array<std::uint64_t, 2> fileHash = Files::getHash(normalizedFilename, model);
 
             osgDB::ReaderWriter::ReadResult result = reader->readNode(model, options);
             if (!result.success())
@@ -538,7 +538,7 @@ namespace Resource
             }
 
             node->setUserValue(Misc::OsgUserValues::sFileHash,
-                std::string(reinterpret_cast<const char*>(&fileHash), sizeof(fileHash)));
+                std::string(reinterpret_cast<const char*>(fileHash.data()), fileHash.size() * sizeof(std::uint64_t)));
 
             return node;
         }

From 6b7363bd59c199409c7c8358ccecf93a4f18531f Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 1 Nov 2021 20:21:27 +0100
Subject: [PATCH 1759/2859] Replace generation and revision by version

---
 apps/openmw/mwrender/navmesh.cpp              | 11 +++-----
 apps/openmw/mwrender/navmesh.hpp              |  9 ++++---
 apps/openmw/mwrender/renderingmanager.cpp     |  3 +--
 .../detournavigator/navigator.cpp             |  6 ++---
 .../detournavigator/asyncnavmeshupdater.cpp   | 13 +++-------
 .../detournavigator/navmeshcacheitem.cpp      |  6 ++---
 .../detournavigator/navmeshcacheitem.hpp      | 17 ++++--------
 components/detournavigator/version.hpp        | 26 ++++++++++++++++---
 8 files changed, 47 insertions(+), 44 deletions(-)

diff --git a/apps/openmw/mwrender/navmesh.cpp b/apps/openmw/mwrender/navmesh.cpp
index 548e85ad10..7cf045d0bd 100644
--- a/apps/openmw/mwrender/navmesh.cpp
+++ b/apps/openmw/mwrender/navmesh.cpp
@@ -18,8 +18,6 @@ namespace MWRender
         : mRootNode(root)
         , mEnabled(enabled)
         , mId(std::numeric_limits<std::size_t>::max())
-        , mGeneration(0)
-        , mRevision(0)
     {
     }
 
@@ -39,15 +37,14 @@ namespace MWRender
         return mEnabled;
     }
 
-    void NavMesh::update(const dtNavMesh& navMesh, const std::size_t id,
-        const std::size_t generation, const std::size_t revision, const DetourNavigator::Settings& settings)
+    void NavMesh::update(const dtNavMesh& navMesh, std::size_t id, const DetourNavigator::Version& version,
+        const DetourNavigator::Settings& settings)
     {
-        if (!mEnabled || (mGroup && mId == id && mGeneration == generation && mRevision == revision))
+        if (!mEnabled || (mGroup && mId == id && mVersion == version))
             return;
 
         mId = id;
-        mGeneration = generation;
-        mRevision = revision;
+        mVersion = version;
         if (mGroup)
             mRootNode->removeChild(mGroup);
         mGroup = SceneUtil::createNavMeshGroup(navMesh, settings);
diff --git a/apps/openmw/mwrender/navmesh.hpp b/apps/openmw/mwrender/navmesh.hpp
index 4c71dc74ec..c3aa31e05b 100644
--- a/apps/openmw/mwrender/navmesh.hpp
+++ b/apps/openmw/mwrender/navmesh.hpp
@@ -1,6 +1,8 @@
 #ifndef OPENMW_MWRENDER_NAVMESH_H
 #define OPENMW_MWRENDER_NAVMESH_H
 
+#include <components/detournavigator/version.hpp>
+
 #include <osg/ref_ptr>
 
 #include <cstddef>
@@ -28,8 +30,8 @@ namespace MWRender
 
         bool toggle();
 
-        void update(const dtNavMesh& navMesh, const std::size_t number, const std::size_t generation,
-                    const std::size_t revision, const DetourNavigator::Settings& settings);
+        void update(const dtNavMesh& navMesh, std::size_t id, const DetourNavigator::Version& version,
+            const DetourNavigator::Settings& settings);
 
         void reset();
 
@@ -46,8 +48,7 @@ namespace MWRender
         osg::ref_ptr<osg::Group> mRootNode;
         bool mEnabled;
         std::size_t mId;
-        std::size_t mGeneration;
-        std::size_t mRevision;
+        DetourNavigator::Version mVersion;
         osg::ref_ptr<osg::Group> mGroup;
     };
 }
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 30be74c839..58a1383c7c 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -1366,8 +1366,7 @@ namespace MWRender
             try
             {
                 const auto locked = it->second->lockConst();
-                mNavMesh->update(locked->getImpl(), mNavMeshNumber, locked->getGeneration(),
-                                 locked->getNavMeshRevision(), mNavigator.getSettings());
+                mNavMesh->update(locked->getImpl(), mNavMeshNumber, locked->getVersion(), mNavigator.getSettings());
             }
             catch (const std::exception& e)
             {
diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index d7422cda8b..0f4f1e3345 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -990,8 +990,7 @@ namespace
         ASSERT_EQ(navMeshes.size(), 1);
         {
             const auto navMesh = navMeshes.begin()->second->lockConst();
-            ASSERT_EQ(navMesh->getGeneration(), 1);
-            ASSERT_EQ(navMesh->getNavMeshRevision(), 4);
+            ASSERT_EQ(navMesh->getVersion(), (Version {1, 4}));
         }
 
         for (int n = 0; n < 10; ++n)
@@ -1006,8 +1005,7 @@ namespace
         ASSERT_EQ(navMeshes.size(), 1);
         {
             const auto navMesh = navMeshes.begin()->second->lockConst();
-            ASSERT_EQ(navMesh->getGeneration(), 1);
-            ASSERT_EQ(navMesh->getNavMeshRevision(), 4);
+            ASSERT_EQ(navMesh->getVersion(), (Version {1, 4}));
         }
     }
 
diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index 966e07bc5a..583fd1162a 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -311,12 +311,7 @@ namespace DetourNavigator
 
         if (recastMesh != nullptr)
         {
-            Version navMeshVersion;
-            {
-                const auto locked = navMeshCacheItem->lockConst();
-                navMeshVersion.mGeneration = locked->getGeneration();
-                navMeshVersion.mRevision = locked->getNavMeshRevision();
-            }
+            const Version navMeshVersion = navMeshCacheItem->lockConst()->getVersion();
             mRecastMeshManager.get().reportNavMeshChange(job.mChangedTile,
                 Version {recastMesh->getGeneration(), recastMesh->getRevision()},
                 navMeshVersion);
@@ -339,13 +334,13 @@ namespace DetourNavigator
 
         using FloatMs = std::chrono::duration<float, std::milli>;
 
-        const auto locked = navMeshCacheItem->lockConst();
+        const Version version = navMeshCacheItem->lockConst()->getVersion();
         Log(Debug::Debug) << std::fixed << std::setprecision(2) <<
             "Cache updated for agent=(" << job.mAgentHalfExtents << ")" <<
             " tile=" << job.mChangedTile <<
             " status=" << status <<
-            " generation=" << locked->getGeneration() <<
-            " revision=" << locked->getNavMeshRevision() <<
+            " generation=" << version.mGeneration <<
+            " revision=" << version.mRevision <<
             " time=" << std::chrono::duration_cast<FloatMs>(finish - start).count() << "ms" <<
             " thread=" << std::this_thread::get_id();
 
diff --git a/components/detournavigator/navmeshcacheitem.cpp b/components/detournavigator/navmeshcacheitem.cpp
index ee6f3308d0..889b764c3c 100644
--- a/components/detournavigator/navmeshcacheitem.cpp
+++ b/components/detournavigator/navmeshcacheitem.cpp
@@ -55,7 +55,7 @@ namespace DetourNavigator
         if (dtStatusSucceed(addStatus))
         {
             mUsedTiles[position] = std::make_pair(std::move(cached), std::move(navMeshData));
-            ++mNavMeshRevision;
+            ++mVersion.mRevision;
             return UpdateNavMeshStatusBuilder().added(true).removed(removed).getResult();
         }
         else
@@ -63,7 +63,7 @@ namespace DetourNavigator
             if (removed)
             {
                 mUsedTiles.erase(position);
-                ++mNavMeshRevision;
+                ++mVersion.mRevision;
             }
             return UpdateNavMeshStatusBuilder().removed(removed).failed((addStatus & DT_OUT_OF_MEMORY) != 0).getResult();
         }
@@ -75,7 +75,7 @@ namespace DetourNavigator
         if (removed)
         {
             mUsedTiles.erase(position);
-            ++mNavMeshRevision;
+            ++mVersion.mRevision;
         }
         return UpdateNavMeshStatusBuilder().removed(removed).getResult();
     }
diff --git a/components/detournavigator/navmeshcacheitem.hpp b/components/detournavigator/navmeshcacheitem.hpp
index ac68caedb3..6fc9b17189 100644
--- a/components/detournavigator/navmeshcacheitem.hpp
+++ b/components/detournavigator/navmeshcacheitem.hpp
@@ -6,6 +6,7 @@
 #include "navmeshtilescache.hpp"
 #include "dtstatus.hpp"
 #include "navmeshdata.hpp"
+#include "version.hpp"
 
 #include <components/misc/guarded.hpp>
 
@@ -127,7 +128,8 @@ namespace DetourNavigator
     {
     public:
         NavMeshCacheItem(const NavMeshPtr& impl, std::size_t generation)
-            : mImpl(impl), mGeneration(generation), mNavMeshRevision(0)
+            : mImpl(impl)
+            , mVersion {generation, 0}
         {
         }
 
@@ -136,15 +138,7 @@ namespace DetourNavigator
             return *mImpl;
         }
 
-        std::size_t getGeneration() const
-        {
-            return mGeneration;
-        }
-
-        std::size_t getNavMeshRevision() const
-        {
-            return mNavMeshRevision;
-        }
+        const Version& getVersion() const { return mVersion; }
 
         UpdateNavMeshStatus updateTile(const TilePosition& position, NavMeshTilesCache::Value&& cached,
                                        NavMeshData&& navMeshData);
@@ -153,8 +147,7 @@ namespace DetourNavigator
 
     private:
         NavMeshPtr mImpl;
-        std::size_t mGeneration;
-        std::size_t mNavMeshRevision;
+        Version mVersion;
         std::map<TilePosition, std::pair<NavMeshTilesCache::Value, NavMeshData>> mUsedTiles;
     };
 
diff --git a/components/detournavigator/version.hpp b/components/detournavigator/version.hpp
index c9de98459d..792680a7d5 100644
--- a/components/detournavigator/version.hpp
+++ b/components/detournavigator/version.hpp
@@ -8,12 +8,32 @@ namespace DetourNavigator
 {
     struct Version
     {
-        std::size_t mGeneration;
-        std::size_t mRevision;
+        std::size_t mGeneration = 0;
+        std::size_t mRevision = 0;
+
+        friend inline auto tie(const Version& value)
+        {
+            return std::tie(value.mGeneration, value.mRevision);
+        }
 
         friend inline bool operator<(const Version& lhs, const Version& rhs)
         {
-            return std::tie(lhs.mGeneration, lhs.mRevision) < std::tie(rhs.mGeneration, rhs.mRevision);
+            return tie(lhs) < tie(rhs);
+        }
+
+        friend inline bool operator<=(const Version& lhs, const Version& rhs)
+        {
+            return tie(lhs) <= tie(rhs);
+        }
+
+        friend inline bool operator==(const Version& lhs, const Version& rhs)
+        {
+            return tie(lhs) == tie(rhs);
+        }
+
+        friend inline bool operator!=(const Version& lhs, const Version& rhs)
+        {
+            return !(lhs == rhs);
         }
     };
 }

From 66390bd8a4e4a7d9deee5c8ce99f7a7d3b5e2d9c Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 1 Nov 2021 20:54:10 +0100
Subject: [PATCH 1760/2859] Use line width 1 as the only guaranteed to be
 supported value by glLineWidth

---
 components/sceneutil/detourdebugdraw.cpp | 5 +++--
 components/sceneutil/detourdebugdraw.hpp | 2 +-
 components/sceneutil/navmesh.cpp         | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/components/sceneutil/detourdebugdraw.cpp b/components/sceneutil/detourdebugdraw.cpp
index 7ef329fc16..0b374846d1 100644
--- a/components/sceneutil/detourdebugdraw.cpp
+++ b/components/sceneutil/detourdebugdraw.cpp
@@ -56,7 +56,7 @@ namespace SceneUtil
         mMode = mode;
         mVertices = new osg::Vec3Array;
         mColors = new osg::Vec4Array;
-        mSize = size * mRecastInvertedScaleFactor;
+        mSize = size;
     }
 
     void DebugDraw::begin(duDebugDrawPrimitives prim, float size)
@@ -93,7 +93,8 @@ namespace SceneUtil
         stateSet->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
         stateSet->setMode(GL_DEPTH, (mDepthMask ? osg::StateAttribute::ON : osg::StateAttribute::OFF));
         stateSet->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
-        stateSet->setAttributeAndModes(new osg::LineWidth(mSize));
+        // TODO: mSize has to be used for the line width, but not for glLineWidth because of the spec limitations
+        stateSet->setAttributeAndModes(new osg::LineWidth());
         stateSet->setAttributeAndModes(new osg::BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA));
 
         osg::ref_ptr<osg::Geometry> geometry(new osg::Geometry);
diff --git a/components/sceneutil/detourdebugdraw.hpp b/components/sceneutil/detourdebugdraw.hpp
index 9b6a28acea..79975cacbc 100644
--- a/components/sceneutil/detourdebugdraw.hpp
+++ b/components/sceneutil/detourdebugdraw.hpp
@@ -15,7 +15,7 @@ namespace SceneUtil
     class DebugDraw : public duDebugDraw
     {
     public:
-        DebugDraw(osg::Group& group, const osg::Vec3f& shift, float recastInvertedScaleFactor);
+        explicit DebugDraw(osg::Group& group, const osg::Vec3f& shift, float recastInvertedScaleFactor);
 
         void depthMask(bool state) override;
 
diff --git a/components/sceneutil/navmesh.cpp b/components/sceneutil/navmesh.cpp
index b0f356f089..b0ce3499e7 100644
--- a/components/sceneutil/navmesh.cpp
+++ b/components/sceneutil/navmesh.cpp
@@ -12,7 +12,7 @@ namespace SceneUtil
 {
     osg::ref_ptr<osg::Group> createNavMeshGroup(const dtNavMesh& navMesh, const DetourNavigator::Settings& settings)
     {
-        const osg::ref_ptr<osg::Group> group(new osg::Group);
+        osg::ref_ptr<osg::Group> group(new osg::Group);
         DebugDraw debugDraw(*group, osg::Vec3f(0, 0, 10), 1.0f / settings.mRecastScaleFactor);
         dtNavMeshQuery navMeshQuery;
         navMeshQuery.init(&navMesh, settings.mMaxNavMeshQueryNodes);

From 3c41d0efc31af7fca2c4af048ad5386251f0c065 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 1 Nov 2021 20:05:34 +0100
Subject: [PATCH 1761/2859] Render each navmesh tile independently

---
 apps/openmw/mwrender/navmesh.cpp              |  66 +++--
 apps/openmw/mwrender/navmesh.hpp              |  13 +-
 apps/openmw/mwrender/renderingmanager.cpp     |   3 +-
 .../detournavigator/navmeshcacheitem.cpp      |  27 ++-
 .../detournavigator/navmeshcacheitem.hpp      |  19 +-
 components/sceneutil/navmesh.cpp              | 225 +++++++++++++++++-
 components/sceneutil/navmesh.hpp              |   4 +-
 7 files changed, 320 insertions(+), 37 deletions(-)

diff --git a/apps/openmw/mwrender/navmesh.cpp b/apps/openmw/mwrender/navmesh.cpp
index 7cf045d0bd..d4a42fa37e 100644
--- a/apps/openmw/mwrender/navmesh.cpp
+++ b/apps/openmw/mwrender/navmesh.cpp
@@ -4,6 +4,7 @@
 #include <components/sceneutil/navmesh.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
+#include <components/detournavigator/navmeshcacheitem.hpp>
 
 #include <osg/PositionAttitudeTransform>
 
@@ -37,45 +38,70 @@ namespace MWRender
         return mEnabled;
     }
 
-    void NavMesh::update(const dtNavMesh& navMesh, std::size_t id, const DetourNavigator::Version& version,
+    void NavMesh::update(const DetourNavigator::NavMeshCacheItem& navMesh, std::size_t id,
         const DetourNavigator::Settings& settings)
     {
-        if (!mEnabled || (mGroup && mId == id && mVersion == version))
+        using DetourNavigator::TilePosition;
+        using DetourNavigator::Version;
+
+        if (!mEnabled || (!mTiles.empty() && mId == id && mVersion == navMesh.getVersion()))
             return;
 
-        mId = id;
-        mVersion = version;
-        if (mGroup)
-            mRootNode->removeChild(mGroup);
-        mGroup = SceneUtil::createNavMeshGroup(navMesh, settings);
-        if (mGroup)
+        if (mId != id)
+        {
+            reset();
+            mId = id;
+        }
+
+        mVersion = navMesh.getVersion();
+
+        std::vector<TilePosition> updated;
+        navMesh.forEachUsedTile([&] (const TilePosition& position, const Version& version, const dtMeshTile& meshTile)
+        {
+            updated.push_back(position);
+            Tile& tile = mTiles[position];
+            if (tile.mGroup != nullptr && tile.mVersion == version)
+                return;
+            if (tile.mGroup != nullptr)
+                mRootNode->removeChild(tile.mGroup);
+            tile.mGroup = SceneUtil::createNavMeshTileGroup(navMesh.getImpl(), meshTile, settings);
+            if (tile.mGroup == nullptr)
+                return;
+            MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(tile.mGroup, "debug");
+            tile.mGroup->setNodeMask(Mask_Debug);
+            mRootNode->addChild(tile.mGroup);
+        });
+        std::sort(updated.begin(), updated.end());
+        for (auto it = mTiles.begin(); it != mTiles.end();)
         {
-            MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(mGroup, "debug");
-            mGroup->setNodeMask(Mask_Debug);
-            mRootNode->addChild(mGroup);
+            if (!std::binary_search(updated.begin(), updated.end(), it->first))
+            {
+                mRootNode->removeChild(it->second.mGroup);
+                it = mTiles.erase(it);
+            }
+            else
+                ++it;
         }
     }
 
     void NavMesh::reset()
     {
-        if (mGroup)
-        {
-            mRootNode->removeChild(mGroup);
-            mGroup = nullptr;
-        }
+        for (auto& [position, tile] : mTiles)
+            mRootNode->removeChild(tile.mGroup);
+        mTiles.clear();
     }
 
     void NavMesh::enable()
     {
-        if (mGroup)
-            mRootNode->addChild(mGroup);
+        for (const auto& [position, tile] : mTiles)
+            mRootNode->addChild(tile.mGroup);
         mEnabled = true;
     }
 
     void NavMesh::disable()
     {
-        if (mGroup)
-            mRootNode->removeChild(mGroup);
+        for (const auto& [position, tile] : mTiles)
+            mRootNode->removeChild(tile.mGroup);
         mEnabled = false;
     }
 }
diff --git a/apps/openmw/mwrender/navmesh.hpp b/apps/openmw/mwrender/navmesh.hpp
index c3aa31e05b..cdfa05d9e8 100644
--- a/apps/openmw/mwrender/navmesh.hpp
+++ b/apps/openmw/mwrender/navmesh.hpp
@@ -2,10 +2,12 @@
 #define OPENMW_MWRENDER_NAVMESH_H
 
 #include <components/detournavigator/version.hpp>
+#include <components/detournavigator/tileposition.hpp>
 
 #include <osg/ref_ptr>
 
 #include <cstddef>
+#include <map>
 
 class dtNavMesh;
 
@@ -17,6 +19,7 @@ namespace osg
 
 namespace DetourNavigator
 {
+    class NavMeshCacheItem;
     struct Settings;
 }
 
@@ -30,7 +33,7 @@ namespace MWRender
 
         bool toggle();
 
-        void update(const dtNavMesh& navMesh, std::size_t id, const DetourNavigator::Version& version,
+        void update(const DetourNavigator::NavMeshCacheItem& navMesh, std::size_t id,
             const DetourNavigator::Settings& settings);
 
         void reset();
@@ -45,11 +48,17 @@ namespace MWRender
         }
 
     private:
+        struct Tile
+        {
+            DetourNavigator::Version mVersion;
+            osg::ref_ptr<osg::Group> mGroup;
+        };
+
         osg::ref_ptr<osg::Group> mRootNode;
         bool mEnabled;
         std::size_t mId;
         DetourNavigator::Version mVersion;
-        osg::ref_ptr<osg::Group> mGroup;
+        std::map<DetourNavigator::TilePosition, Tile> mTiles;
     };
 }
 
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 58a1383c7c..e543709303 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -1365,8 +1365,7 @@ namespace MWRender
         {
             try
             {
-                const auto locked = it->second->lockConst();
-                mNavMesh->update(locked->getImpl(), mNavMeshNumber, locked->getVersion(), mNavigator.getSettings());
+                mNavMesh->update(*it->second->lockConst(), mNavMeshNumber, mNavigator.getSettings());
             }
             catch (const std::exception& e)
             {
diff --git a/components/detournavigator/navmeshcacheitem.cpp b/components/detournavigator/navmeshcacheitem.cpp
index 889b764c3c..decf45de2c 100644
--- a/components/detournavigator/navmeshcacheitem.cpp
+++ b/components/detournavigator/navmeshcacheitem.cpp
@@ -13,12 +13,6 @@ namespace
 {
     using DetourNavigator::TilePosition;
 
-    const dtMeshTile* getTile(const dtNavMesh& navMesh, const TilePosition& position)
-    {
-        const int layer = 0;
-        return navMesh.getTileAt(position.x(), position.y(), layer);
-    }
-
     bool removeTile(dtNavMesh& navMesh, const TilePosition& position)
     {
         const int layer = 0;
@@ -41,10 +35,16 @@ namespace
 
 namespace DetourNavigator
 {
+    const dtMeshTile* getTile(const dtNavMesh& navMesh, const TilePosition& position)
+    {
+        const int layer = 0;
+        return navMesh.getTileAt(position.x(), position.y(), layer);
+    }
+
     UpdateNavMeshStatus NavMeshCacheItem::updateTile(const TilePosition& position, NavMeshTilesCache::Value&& cached,
         NavMeshData&& navMeshData)
     {
-        const dtMeshTile* currentTile = ::getTile(*mImpl, position);
+        const dtMeshTile* currentTile = getTile(*mImpl, position);
         if (currentTile != nullptr
             && asNavMeshTileConstView(*currentTile) == asNavMeshTileConstView(navMeshData.mValue.get()))
         {
@@ -54,7 +54,18 @@ namespace DetourNavigator
         const auto addStatus = addTile(*mImpl, navMeshData.mValue.get(), navMeshData.mSize);
         if (dtStatusSucceed(addStatus))
         {
-            mUsedTiles[position] = std::make_pair(std::move(cached), std::move(navMeshData));
+            auto tile = mUsedTiles.find(position);
+            if (tile == mUsedTiles.end())
+            {
+                mUsedTiles.emplace_hint(tile, position,
+                    Tile {Version {mVersion.mRevision, 1}, std::move(cached), std::move(navMeshData)});
+            }
+            else
+            {
+                ++tile->second.mVersion.mRevision;
+                tile->second.mCached = std::move(cached);
+                tile->second.mData = std::move(navMeshData);
+            }
             ++mVersion.mRevision;
             return UpdateNavMeshStatusBuilder().added(true).removed(removed).getResult();
         }
diff --git a/components/detournavigator/navmeshcacheitem.hpp b/components/detournavigator/navmeshcacheitem.hpp
index 6fc9b17189..5d3b404080 100644
--- a/components/detournavigator/navmeshcacheitem.hpp
+++ b/components/detournavigator/navmeshcacheitem.hpp
@@ -124,6 +124,8 @@ namespace DetourNavigator
         }
     };
 
+    const dtMeshTile* getTile(const dtNavMesh& navMesh, const TilePosition& position);
+
     class NavMeshCacheItem
     {
     public:
@@ -145,10 +147,25 @@ namespace DetourNavigator
 
         UpdateNavMeshStatus removeTile(const TilePosition& position);
 
+        template <class Function>
+        void forEachUsedTile(Function&& function) const
+        {
+            for (const auto& [position, tile] : mUsedTiles)
+                if (const dtMeshTile* meshTile = getTile(*mImpl, position))
+                    function(position, tile.mVersion, *meshTile);
+        }
+
     private:
+        struct Tile
+        {
+            Version mVersion;
+            NavMeshTilesCache::Value mCached;
+            NavMeshData mData;
+        };
+
         NavMeshPtr mImpl;
         Version mVersion;
-        std::map<TilePosition, std::pair<NavMeshTilesCache::Value, NavMeshData>> mUsedTiles;
+        std::map<TilePosition, Tile> mUsedTiles;
     };
 
     using GuardedNavMeshCacheItem = Misc::ScopeGuarded<NavMeshCacheItem>;
diff --git a/components/sceneutil/navmesh.cpp b/components/sceneutil/navmesh.cpp
index b0ce3499e7..01f1d52a47 100644
--- a/components/sceneutil/navmesh.cpp
+++ b/components/sceneutil/navmesh.cpp
@@ -8,16 +8,235 @@
 #include <osg/Group>
 #include <osg/Material>
 
+namespace
+{
+    // Copied from https://github.com/recastnavigation/recastnavigation/blob/c5cbd53024c8a9d8d097a4371215e3342d2fdc87/DebugUtils/Source/DetourDebugDraw.cpp#L26-L38
+    float distancePtLine2d(const float* pt, const float* p, const float* q)
+    {
+        float pqx = q[0] - p[0];
+        float pqz = q[2] - p[2];
+        float dx = pt[0] - p[0];
+        float dz = pt[2] - p[2];
+        float d = pqx*pqx + pqz*pqz;
+        float t = pqx*dx + pqz*dz;
+        if (d != 0) t /= d;
+        dx = p[0] + t*pqx - pt[0];
+        dz = p[2] + t*pqz - pt[2];
+        return dx*dx + dz*dz;
+    }
+
+    // Copied from https://github.com/recastnavigation/recastnavigation/blob/c5cbd53024c8a9d8d097a4371215e3342d2fdc87/DebugUtils/Source/DetourDebugDraw.cpp#L40-L118
+    void drawPolyBoundaries(duDebugDraw* dd, const dtMeshTile* tile, const unsigned int col,
+        const float linew, bool inner)
+    {
+        static const float thr = 0.01f*0.01f;
+
+        dd->begin(DU_DRAW_LINES, linew);
+
+        for (int i = 0; i < tile->header->polyCount; ++i)
+        {
+            const dtPoly* p = &tile->polys[i];
+
+            if (p->getType() == DT_POLYTYPE_OFFMESH_CONNECTION) continue;
+
+            const dtPolyDetail* pd = &tile->detailMeshes[i];
+
+            for (int j = 0, nj = (int)p->vertCount; j < nj; ++j)
+            {
+                unsigned int c = col;
+                if (inner)
+                {
+                    if (p->neis[j] == 0) continue;
+                    if (p->neis[j] & DT_EXT_LINK)
+                    {
+                        bool con = false;
+                        for (unsigned int k = p->firstLink; k != DT_NULL_LINK; k = tile->links[k].next)
+                        {
+                            if (tile->links[k].edge == j)
+                            {
+                                con = true;
+                                break;
+                            }
+                        }
+                        if (con)
+                            c = duRGBA(255,255,255,48);
+                        else
+                            c = duRGBA(0,0,0,48);
+                    }
+                    else
+                        c = duRGBA(0,48,64,32);
+                }
+                else
+                {
+                    if (p->neis[j] != 0) continue;
+                }
+
+                const float* v0 = &tile->verts[p->verts[j]*3];
+                const float* v1 = &tile->verts[p->verts[(j+1) % nj]*3];
+
+                // Draw detail mesh edges which align with the actual poly edge.
+                // This is really slow.
+                for (int k = 0; k < pd->triCount; ++k)
+                {
+                    const unsigned char* t = &tile->detailTris[(pd->triBase+k)*4];
+                    const float* tv[3];
+                    for (int m = 0; m < 3; ++m)
+                    {
+                        if (t[m] < p->vertCount)
+                            tv[m] = &tile->verts[p->verts[t[m]]*3];
+                        else
+                            tv[m] = &tile->detailVerts[(pd->vertBase+(t[m]-p->vertCount))*3];
+                    }
+                    for (int m = 0, n = 2; m < 3; n=m++)
+                    {
+                        if ((dtGetDetailTriEdgeFlags(t[3], n) & DT_DETAIL_EDGE_BOUNDARY) == 0)
+                            continue;
+
+                        if (distancePtLine2d(tv[n],v0,v1) < thr &&
+                            distancePtLine2d(tv[m],v0,v1) < thr)
+                        {
+                            dd->vertex(tv[n], c);
+                            dd->vertex(tv[m], c);
+                        }
+                    }
+                }
+            }
+        }
+        dd->end();
+    }
+
+    // Copied from https://github.com/recastnavigation/recastnavigation/blob/c5cbd53024c8a9d8d097a4371215e3342d2fdc87/DebugUtils/Source/DetourDebugDraw.cpp#L120-L235
+    void drawMeshTile(duDebugDraw* dd, const dtNavMesh& mesh, const dtNavMeshQuery* query,
+        const dtMeshTile* tile, unsigned char flags)
+    {
+        dtPolyRef base = mesh.getPolyRefBase(tile);
+
+        int tileNum = mesh.decodePolyIdTile(base);
+        const unsigned int tileColor = duIntToCol(tileNum, 128);
+
+        dd->depthMask(false);
+
+        dd->begin(DU_DRAW_TRIS);
+        for (int i = 0; i < tile->header->polyCount; ++i)
+        {
+            const dtPoly* p = &tile->polys[i];
+            if (p->getType() == DT_POLYTYPE_OFFMESH_CONNECTION)	// Skip off-mesh links.
+                continue;
+
+            const dtPolyDetail* pd = &tile->detailMeshes[i];
+
+            unsigned int col;
+            if (query && query->isInClosedList(base | (dtPolyRef)i))
+                col = duRGBA(255,196,0,64);
+            else
+            {
+                if (flags & DU_DRAWNAVMESH_COLOR_TILES)
+                    col = tileColor;
+                else
+                    col = duTransCol(dd->areaToCol(p->getArea()), 64);
+            }
+
+            for (int j = 0; j < pd->triCount; ++j)
+            {
+                const unsigned char* t = &tile->detailTris[(pd->triBase+j)*4];
+                for (int k = 0; k < 3; ++k)
+                {
+                    if (t[k] < p->vertCount)
+                        dd->vertex(&tile->verts[p->verts[t[k]]*3], col);
+                    else
+                        dd->vertex(&tile->detailVerts[(pd->vertBase+t[k]-p->vertCount)*3], col);
+                }
+            }
+        }
+        dd->end();
+
+        // Draw inter poly boundaries
+        drawPolyBoundaries(dd, tile, duRGBA(0,48,64,32), 1.5f, true);
+
+        // Draw outer poly boundaries
+        drawPolyBoundaries(dd, tile, duRGBA(0,48,64,220), 2.5f, false);
+
+        if (flags & DU_DRAWNAVMESH_OFFMESHCONS)
+        {
+            dd->begin(DU_DRAW_LINES, 2.0f);
+            for (int i = 0; i < tile->header->polyCount; ++i)
+            {
+                const dtPoly* p = &tile->polys[i];
+                if (p->getType() != DT_POLYTYPE_OFFMESH_CONNECTION)	// Skip regular polys.
+                    continue;
+
+                unsigned int col, col2;
+                if (query && query->isInClosedList(base | (dtPolyRef)i))
+                    col = duRGBA(255,196,0,220);
+                else
+                    col = duDarkenCol(duTransCol(dd->areaToCol(p->getArea()), 220));
+
+                const dtOffMeshConnection* con = &tile->offMeshCons[i - tile->header->offMeshBase];
+                const float* va = &tile->verts[p->verts[0]*3];
+                const float* vb = &tile->verts[p->verts[1]*3];
+
+                // Check to see if start and end end-points have links.
+                bool startSet = false;
+                bool endSet = false;
+                for (unsigned int k = p->firstLink; k != DT_NULL_LINK; k = tile->links[k].next)
+                {
+                    if (tile->links[k].edge == 0)
+                        startSet = true;
+                    if (tile->links[k].edge == 1)
+                        endSet = true;
+                }
+
+                // End points and their on-mesh locations.
+                dd->vertex(va[0],va[1],va[2], col);
+                dd->vertex(con->pos[0],con->pos[1],con->pos[2], col);
+                col2 = startSet ? col : duRGBA(220,32,16,196);
+                duAppendCircle(dd, con->pos[0],con->pos[1]+0.1f,con->pos[2], con->rad, col2);
+
+                dd->vertex(vb[0],vb[1],vb[2], col);
+                dd->vertex(con->pos[3],con->pos[4],con->pos[5], col);
+                col2 = endSet ? col : duRGBA(220,32,16,196);
+                duAppendCircle(dd, con->pos[3],con->pos[4]+0.1f,con->pos[5], con->rad, col2);
+
+                // End point vertices.
+                dd->vertex(con->pos[0],con->pos[1],con->pos[2], duRGBA(0,48,64,196));
+                dd->vertex(con->pos[0],con->pos[1]+0.2f,con->pos[2], duRGBA(0,48,64,196));
+
+                dd->vertex(con->pos[3],con->pos[4],con->pos[5], duRGBA(0,48,64,196));
+                dd->vertex(con->pos[3],con->pos[4]+0.2f,con->pos[5], duRGBA(0,48,64,196));
+
+                // Connection arc.
+                duAppendArc(dd, con->pos[0],con->pos[1],con->pos[2], con->pos[3],con->pos[4],con->pos[5], 0.25f,
+                            (con->flags & 1) ? 0.6f : 0, 0.6f, col);
+            }
+            dd->end();
+        }
+
+        const unsigned int vcol = duRGBA(0,0,0,196);
+        dd->begin(DU_DRAW_POINTS, 3.0f);
+        for (int i = 0; i < tile->header->vertCount; ++i)
+        {
+            const float* v = &tile->verts[i*3];
+            dd->vertex(v[0], v[1], v[2], vcol);
+        }
+        dd->end();
+
+        dd->depthMask(true);
+    }
+}
+
 namespace SceneUtil
 {
-    osg::ref_ptr<osg::Group> createNavMeshGroup(const dtNavMesh& navMesh, const DetourNavigator::Settings& settings)
+    osg::ref_ptr<osg::Group> createNavMeshTileGroup(const dtNavMesh& navMesh, const dtMeshTile& meshTile,
+        const DetourNavigator::Settings& settings)
     {
+        if (meshTile.header == nullptr)
+            return nullptr;
+
         osg::ref_ptr<osg::Group> group(new osg::Group);
         DebugDraw debugDraw(*group, osg::Vec3f(0, 0, 10), 1.0f / settings.mRecastScaleFactor);
         dtNavMeshQuery navMeshQuery;
         navMeshQuery.init(&navMesh, settings.mMaxNavMeshQueryNodes);
-        duDebugDrawNavMeshWithClosedList(&debugDraw, navMesh, navMeshQuery,
-                                         DU_DRAWNAVMESH_OFFMESHCONS | DU_DRAWNAVMESH_CLOSEDLIST);
+        drawMeshTile(&debugDraw, navMesh, &navMeshQuery, &meshTile, DU_DRAWNAVMESH_OFFMESHCONS | DU_DRAWNAVMESH_CLOSEDLIST);
 
         osg::ref_ptr<osg::Material> material = new osg::Material;
         material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
diff --git a/components/sceneutil/navmesh.hpp b/components/sceneutil/navmesh.hpp
index b255b05756..acfb583eba 100644
--- a/components/sceneutil/navmesh.hpp
+++ b/components/sceneutil/navmesh.hpp
@@ -4,6 +4,7 @@
 #include <osg/ref_ptr>
 
 class dtNavMesh;
+struct dtMeshTile;
 
 namespace osg
 {
@@ -17,7 +18,8 @@ namespace DetourNavigator
 
 namespace SceneUtil
 {
-    osg::ref_ptr<osg::Group> createNavMeshGroup(const dtNavMesh& navMesh, const DetourNavigator::Settings& settings);
+    osg::ref_ptr<osg::Group> createNavMeshTileGroup(const dtNavMesh& navMesh, const dtMeshTile& meshTile,
+        const DetourNavigator::Settings& settings);
 }
 
 #endif

From 0511a81baaf1fbe9969a88897d870ac28c00dfe0 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 1 Nov 2021 21:00:40 +0100
Subject: [PATCH 1762/2859] Use different alpha color for navmesh tiles with
 non zero user id

---
 components/sceneutil/navmesh.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/components/sceneutil/navmesh.cpp b/components/sceneutil/navmesh.cpp
index 01f1d52a47..891f1350a1 100644
--- a/components/sceneutil/navmesh.cpp
+++ b/components/sceneutil/navmesh.cpp
@@ -105,14 +105,15 @@ namespace
         dd->end();
     }
 
-    // Copied from https://github.com/recastnavigation/recastnavigation/blob/c5cbd53024c8a9d8d097a4371215e3342d2fdc87/DebugUtils/Source/DetourDebugDraw.cpp#L120-L235
+    // Based on https://github.com/recastnavigation/recastnavigation/blob/c5cbd53024c8a9d8d097a4371215e3342d2fdc87/DebugUtils/Source/DetourDebugDraw.cpp#L120-L235
     void drawMeshTile(duDebugDraw* dd, const dtNavMesh& mesh, const dtNavMeshQuery* query,
         const dtMeshTile* tile, unsigned char flags)
     {
         dtPolyRef base = mesh.getPolyRefBase(tile);
 
         int tileNum = mesh.decodePolyIdTile(base);
-        const unsigned int tileColor = duIntToCol(tileNum, 128);
+        const unsigned int tileNumColor = duIntToCol(tileNum, 128);
+        const unsigned alpha = tile->header->userId == 0 ? 64 : 128;
 
         dd->depthMask(false);
 
@@ -127,13 +128,13 @@ namespace
 
             unsigned int col;
             if (query && query->isInClosedList(base | (dtPolyRef)i))
-                col = duRGBA(255,196,0,64);
+                col = duRGBA(255, 196, 0, alpha);
             else
             {
                 if (flags & DU_DRAWNAVMESH_COLOR_TILES)
-                    col = tileColor;
+                    col = duTransCol(tileNumColor, alpha);
                 else
-                    col = duTransCol(dd->areaToCol(p->getArea()), 64);
+                    col = duTransCol(dd->areaToCol(p->getArea()), alpha);
             }
 
             for (int j = 0; j < pd->triCount; ++j)

From d1a1b8c01ca6dedff239eaf0b6dd7270bcf28dab Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 1 Nov 2021 21:52:33 +0100
Subject: [PATCH 1763/2859] Use polygon offset to render navmesh and recast
 mesh

---
 components/sceneutil/navmesh.cpp    | 11 ++++++++++-
 components/sceneutil/recastmesh.cpp | 11 ++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/components/sceneutil/navmesh.cpp b/components/sceneutil/navmesh.cpp
index 891f1350a1..3f91d41d51 100644
--- a/components/sceneutil/navmesh.cpp
+++ b/components/sceneutil/navmesh.cpp
@@ -1,5 +1,6 @@
 #include "navmesh.hpp"
 #include "detourdebugdraw.hpp"
+#include "depth.hpp"
 
 #include <components/detournavigator/settings.hpp>
 
@@ -7,6 +8,7 @@
 
 #include <osg/Group>
 #include <osg/Material>
+#include <osg/PolygonOffset>
 
 namespace
 {
@@ -241,7 +243,14 @@ namespace SceneUtil
 
         osg::ref_ptr<osg::Material> material = new osg::Material;
         material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
-        group->getOrCreateStateSet()->setAttribute(material);
+
+        const float polygonOffsetFactor = SceneUtil::AutoDepth::isReversed() ? 1.0 : -1.0;
+        const float polygonOffsetUnits = SceneUtil::AutoDepth::isReversed() ? 1.0 : -1.0;
+        osg::ref_ptr<osg::PolygonOffset> polygonOffset = new osg::PolygonOffset(polygonOffsetFactor, polygonOffsetUnits);
+
+        osg::ref_ptr<osg::StateSet> stateSet = group->getOrCreateStateSet();
+        stateSet->setAttribute(material);
+        stateSet->setAttributeAndModes(polygonOffset);
 
         return group;
     }
diff --git a/components/sceneutil/recastmesh.cpp b/components/sceneutil/recastmesh.cpp
index 5732f86959..ed40bfedf7 100644
--- a/components/sceneutil/recastmesh.cpp
+++ b/components/sceneutil/recastmesh.cpp
@@ -1,5 +1,6 @@
 #include "recastmesh.hpp"
 #include "detourdebugdraw.hpp"
+#include "depth.hpp"
 
 #include <components/detournavigator/settings.hpp>
 #include <components/detournavigator/recastmesh.hpp>
@@ -9,6 +10,7 @@
 
 #include <osg/Group>
 #include <osg/Material>
+#include <osg/PolygonOffset>
 
 #include <algorithm>
 #include <vector>
@@ -69,7 +71,14 @@ namespace SceneUtil
 
         osg::ref_ptr<osg::Material> material = new osg::Material;
         material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
-        group->getOrCreateStateSet()->setAttribute(material);
+
+        const float polygonOffsetFactor = SceneUtil::AutoDepth::isReversed() ? 1.0 : -1.0;
+        const float polygonOffsetUnits = SceneUtil::AutoDepth::isReversed() ? 1.0 : -1.0;
+        osg::ref_ptr<osg::PolygonOffset> polygonOffset = new osg::PolygonOffset(polygonOffsetFactor, polygonOffsetUnits);
+
+        osg::ref_ptr<osg::StateSet> stateSet = group->getOrCreateStateSet();
+        stateSet->setAttribute(material);
+        stateSet->setAttributeAndModes(polygonOffset);
 
         return group;
     }

From cffcb6a8974c1e4e180b35652f8d76a04b5d0d11 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 2 Nov 2021 02:43:09 +0100
Subject: [PATCH 1764/2859] Share state set between all navmesh tiles

Do not change GL_DEPTH because it's always disabled anyway.
---
 apps/openmw/mwrender/navmesh.cpp         |  7 +++++-
 apps/openmw/mwrender/navmesh.hpp         |  3 +++
 components/sceneutil/agentpath.cpp       |  2 +-
 components/sceneutil/detourdebugdraw.cpp | 31 +++++++++++++-----------
 components/sceneutil/detourdebugdraw.hpp |  7 ++++--
 components/sceneutil/navmesh.cpp         | 31 +++++++++++++++---------
 components/sceneutil/navmesh.hpp         |  6 ++++-
 components/sceneutil/recastmesh.cpp      |  2 +-
 8 files changed, 57 insertions(+), 32 deletions(-)

diff --git a/apps/openmw/mwrender/navmesh.cpp b/apps/openmw/mwrender/navmesh.cpp
index d4a42fa37e..a3c26aeb59 100644
--- a/apps/openmw/mwrender/navmesh.cpp
+++ b/apps/openmw/mwrender/navmesh.cpp
@@ -5,8 +5,10 @@
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/detournavigator/navmeshcacheitem.hpp>
+#include <components/sceneutil/detourdebugdraw.hpp>
 
 #include <osg/PositionAttitudeTransform>
+#include <osg/StateSet>
 
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
@@ -17,6 +19,8 @@ namespace MWRender
 {
     NavMesh::NavMesh(const osg::ref_ptr<osg::Group>& root, bool enabled)
         : mRootNode(root)
+        , mGroupStateSet(SceneUtil::makeNavMeshTileStateSet())
+        , mDebugDrawStateSet(SceneUtil::DebugDraw::makeStateSet())
         , mEnabled(enabled)
         , mId(std::numeric_limits<std::size_t>::max())
     {
@@ -64,7 +68,8 @@ namespace MWRender
                 return;
             if (tile.mGroup != nullptr)
                 mRootNode->removeChild(tile.mGroup);
-            tile.mGroup = SceneUtil::createNavMeshTileGroup(navMesh.getImpl(), meshTile, settings);
+            tile.mGroup = SceneUtil::createNavMeshTileGroup(navMesh.getImpl(), meshTile, settings,
+                                                            mGroupStateSet, mDebugDrawStateSet);
             if (tile.mGroup == nullptr)
                 return;
             MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(tile.mGroup, "debug");
diff --git a/apps/openmw/mwrender/navmesh.hpp b/apps/openmw/mwrender/navmesh.hpp
index cdfa05d9e8..fd69a3e487 100644
--- a/apps/openmw/mwrender/navmesh.hpp
+++ b/apps/openmw/mwrender/navmesh.hpp
@@ -15,6 +15,7 @@ namespace osg
 {
     class Group;
     class Geometry;
+    class StateSet;
 }
 
 namespace DetourNavigator
@@ -55,6 +56,8 @@ namespace MWRender
         };
 
         osg::ref_ptr<osg::Group> mRootNode;
+        osg::ref_ptr<osg::StateSet> mGroupStateSet;
+        osg::ref_ptr<osg::StateSet> mDebugDrawStateSet;
         bool mEnabled;
         std::size_t mId;
         DetourNavigator::Version mVersion;
diff --git a/components/sceneutil/agentpath.cpp b/components/sceneutil/agentpath.cpp
index 5f9b574e7d..5721110f77 100644
--- a/components/sceneutil/agentpath.cpp
+++ b/components/sceneutil/agentpath.cpp
@@ -43,7 +43,7 @@ namespace SceneUtil
 
         const osg::ref_ptr<osg::Group> group(new osg::Group);
 
-        DebugDraw debugDraw(*group, osg::Vec3f(0, 0, 0), 1);
+        DebugDraw debugDraw(*group, DebugDraw::makeStateSet(), osg::Vec3f(0, 0, 0), 1);
 
         const auto agentRadius = halfExtents.x();
         const auto agentHeight = 2.0f * halfExtents.z();
diff --git a/components/sceneutil/detourdebugdraw.cpp b/components/sceneutil/detourdebugdraw.cpp
index 0b374846d1..f1325340ea 100644
--- a/components/sceneutil/detourdebugdraw.cpp
+++ b/components/sceneutil/detourdebugdraw.cpp
@@ -32,19 +32,19 @@ namespace
 
 namespace SceneUtil
 {
-    DebugDraw::DebugDraw(osg::Group& group, const osg::Vec3f& shift, float recastInvertedScaleFactor)
+    DebugDraw::DebugDraw(osg::Group& group, const osg::ref_ptr<osg::StateSet>& stateSet,
+        const osg::Vec3f& shift, float recastInvertedScaleFactor)
         : mGroup(group)
+        , mStateSet(stateSet)
         , mShift(shift)
         , mRecastInvertedScaleFactor(recastInvertedScaleFactor)
-        , mDepthMask(false)
         , mMode(osg::PrimitiveSet::POINTS)
         , mSize(1.0f)
     {
     }
 
-    void DebugDraw::depthMask(bool state)
+    void DebugDraw::depthMask(bool)
     {
-        mDepthMask = state;
     }
 
     void DebugDraw::texture(bool)
@@ -88,17 +88,8 @@ namespace SceneUtil
 
     void DebugDraw::end()
     {
-        osg::ref_ptr<osg::StateSet> stateSet(new osg::StateSet);
-        stateSet->setMode(GL_BLEND, osg::StateAttribute::ON);
-        stateSet->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
-        stateSet->setMode(GL_DEPTH, (mDepthMask ? osg::StateAttribute::ON : osg::StateAttribute::OFF));
-        stateSet->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
-        // TODO: mSize has to be used for the line width, but not for glLineWidth because of the spec limitations
-        stateSet->setAttributeAndModes(new osg::LineWidth());
-        stateSet->setAttributeAndModes(new osg::BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA));
-
         osg::ref_ptr<osg::Geometry> geometry(new osg::Geometry);
-        geometry->setStateSet(stateSet);
+        geometry->setStateSet(mStateSet);
         geometry->setVertexArray(mVertices);
         geometry->setColorArray(mColors, osg::Array::BIND_PER_VERTEX);
         geometry->addPrimitiveSet(new osg::DrawArrays(mMode, 0, static_cast<int>(mVertices->size())));
@@ -118,4 +109,16 @@ namespace SceneUtil
     {
         mColors->push_back(value);
     }
+
+    osg::ref_ptr<osg::StateSet> DebugDraw::makeStateSet()
+    {
+        osg::ref_ptr<osg::StateSet> stateSet = new osg::StateSet;
+        stateSet->setMode(GL_BLEND, osg::StateAttribute::ON);
+        stateSet->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+        stateSet->setMode(GL_DEPTH, osg::StateAttribute::OFF);
+        stateSet->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
+        stateSet->setAttributeAndModes(new osg::LineWidth());
+        stateSet->setAttributeAndModes(new osg::BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA));
+        return stateSet;
+    }
 }
diff --git a/components/sceneutil/detourdebugdraw.hpp b/components/sceneutil/detourdebugdraw.hpp
index 79975cacbc..1d00735ea0 100644
--- a/components/sceneutil/detourdebugdraw.hpp
+++ b/components/sceneutil/detourdebugdraw.hpp
@@ -15,7 +15,10 @@ namespace SceneUtil
     class DebugDraw : public duDebugDraw
     {
     public:
-        explicit DebugDraw(osg::Group& group, const osg::Vec3f& shift, float recastInvertedScaleFactor);
+        explicit DebugDraw(osg::Group& group, const osg::ref_ptr<osg::StateSet>& stateSet,
+            const osg::Vec3f& shift, float recastInvertedScaleFactor);
+
+        static osg::ref_ptr<osg::StateSet> makeStateSet();
 
         void depthMask(bool state) override;
 
@@ -38,9 +41,9 @@ namespace SceneUtil
 
     private:
         osg::Group& mGroup;
+        osg::ref_ptr<osg::StateSet> mStateSet;
         osg::Vec3f mShift;
         float mRecastInvertedScaleFactor;
-        bool mDepthMask;
         osg::PrimitiveSet::Mode mMode;
         float mSize;
         osg::ref_ptr<osg::Vec3Array> mVertices;
diff --git a/components/sceneutil/navmesh.cpp b/components/sceneutil/navmesh.cpp
index 3f91d41d51..d66f95381c 100644
--- a/components/sceneutil/navmesh.cpp
+++ b/components/sceneutil/navmesh.cpp
@@ -229,18 +229,8 @@ namespace
 
 namespace SceneUtil
 {
-    osg::ref_ptr<osg::Group> createNavMeshTileGroup(const dtNavMesh& navMesh, const dtMeshTile& meshTile,
-        const DetourNavigator::Settings& settings)
+    osg::ref_ptr<osg::StateSet> makeNavMeshTileStateSet()
     {
-        if (meshTile.header == nullptr)
-            return nullptr;
-
-        osg::ref_ptr<osg::Group> group(new osg::Group);
-        DebugDraw debugDraw(*group, osg::Vec3f(0, 0, 10), 1.0f / settings.mRecastScaleFactor);
-        dtNavMeshQuery navMeshQuery;
-        navMeshQuery.init(&navMesh, settings.mMaxNavMeshQueryNodes);
-        drawMeshTile(&debugDraw, navMesh, &navMeshQuery, &meshTile, DU_DRAWNAVMESH_OFFMESHCONS | DU_DRAWNAVMESH_CLOSEDLIST);
-
         osg::ref_ptr<osg::Material> material = new osg::Material;
         material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
 
@@ -248,9 +238,26 @@ namespace SceneUtil
         const float polygonOffsetUnits = SceneUtil::AutoDepth::isReversed() ? 1.0 : -1.0;
         osg::ref_ptr<osg::PolygonOffset> polygonOffset = new osg::PolygonOffset(polygonOffsetFactor, polygonOffsetUnits);
 
-        osg::ref_ptr<osg::StateSet> stateSet = group->getOrCreateStateSet();
+        osg::ref_ptr<osg::StateSet> stateSet = new osg::StateSet;
         stateSet->setAttribute(material);
         stateSet->setAttributeAndModes(polygonOffset);
+        return stateSet;
+    }
+
+    osg::ref_ptr<osg::Group> createNavMeshTileGroup(const dtNavMesh& navMesh, const dtMeshTile& meshTile,
+        const DetourNavigator::Settings& settings, const osg::ref_ptr<osg::StateSet>& groupStateSet,
+        const osg::ref_ptr<osg::StateSet>& debugDrawStateSet)
+    {
+        if (meshTile.header == nullptr)
+            return nullptr;
+
+        osg::ref_ptr<osg::Group> group(new osg::Group);
+        group->setStateSet(groupStateSet);
+        constexpr float shift = 10.0f;
+        DebugDraw debugDraw(*group, debugDrawStateSet, osg::Vec3f(0, 0, shift), 1.0f / settings.mRecastScaleFactor);
+        dtNavMeshQuery navMeshQuery;
+        navMeshQuery.init(&navMesh, settings.mMaxNavMeshQueryNodes);
+        drawMeshTile(&debugDraw, navMesh, &navMeshQuery, &meshTile, DU_DRAWNAVMESH_OFFMESHCONS | DU_DRAWNAVMESH_CLOSEDLIST);
 
         return group;
     }
diff --git a/components/sceneutil/navmesh.hpp b/components/sceneutil/navmesh.hpp
index acfb583eba..ca9b8bd570 100644
--- a/components/sceneutil/navmesh.hpp
+++ b/components/sceneutil/navmesh.hpp
@@ -9,6 +9,7 @@ struct dtMeshTile;
 namespace osg
 {
     class Group;
+    class StateSet;
 }
 
 namespace DetourNavigator
@@ -18,8 +19,11 @@ namespace DetourNavigator
 
 namespace SceneUtil
 {
+    osg::ref_ptr<osg::StateSet> makeNavMeshTileStateSet();
+
     osg::ref_ptr<osg::Group> createNavMeshTileGroup(const dtNavMesh& navMesh, const dtMeshTile& meshTile,
-        const DetourNavigator::Settings& settings);
+        const DetourNavigator::Settings& settings, const osg::ref_ptr<osg::StateSet>& groupStateSet,
+        const osg::ref_ptr<osg::StateSet>& debugDrawStateSet);
 }
 
 #endif
diff --git a/components/sceneutil/recastmesh.cpp b/components/sceneutil/recastmesh.cpp
index ed40bfedf7..9614673a64 100644
--- a/components/sceneutil/recastmesh.cpp
+++ b/components/sceneutil/recastmesh.cpp
@@ -47,7 +47,7 @@ namespace SceneUtil
         using namespace DetourNavigator;
 
         const osg::ref_ptr<osg::Group> group(new osg::Group);
-        DebugDraw debugDraw(*group, osg::Vec3f(0, 0, 0), 1.0f);
+        DebugDraw debugDraw(*group, DebugDraw::makeStateSet(), osg::Vec3f(0, 0, 0), 1.0f);
         const DetourNavigator::Mesh& mesh = recastMesh.getMesh();
         std::vector<int> indices = mesh.getIndices();
         std::vector<float> vertices = mesh.getVertices();

From 84d6de3eba16c79ae814d8359c2d0b299f6649ba Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Sun, 21 Nov 2021 19:51:02 +0000
Subject: [PATCH 1765/2859] Parse paths with boost rules when it's quoted, but
 use the string verbatim when it's not

---
 apps/opencs/editor.cpp                        | 12 +--
 apps/openmw/main.cpp                          | 12 +--
 apps/openmw/options.cpp                       |  8 +-
 apps/openmw_test_suite/mwworld/test_store.cpp |  8 +-
 apps/openmw_test_suite/openmw/options.cpp     | 75 +++++++++----------
 components/files/configurationmanager.cpp     | 31 +++++---
 components/files/configurationmanager.hpp     |  8 +-
 7 files changed, 81 insertions(+), 73 deletions(-)

diff --git a/apps/opencs/editor.cpp b/apps/opencs/editor.cpp
index 6294e5eb7c..ac0a7a5ef7 100644
--- a/apps/opencs/editor.cpp
+++ b/apps/opencs/editor.cpp
@@ -88,11 +88,11 @@ std::pair<Files::PathContainer, std::vector<std::string> > CS::Editor::readConfi
     boost::program_options::options_description desc("Syntax: openmw-cs <options>\nAllowed options");
 
     desc.add_options()
-    ("data", boost::program_options::value<Files::ReluctantPathContainer>()->default_value(Files::ReluctantPathContainer(), "data")->multitoken()->composing())
-    ("data-local", boost::program_options::value<Files::ReluctantPathContainer::value_type>()->default_value(Files::ReluctantPathContainer::value_type(), ""))
+    ("data", boost::program_options::value<Files::MaybeQuotedPathContainer>()->default_value(Files::MaybeQuotedPathContainer(), "data")->multitoken()->composing())
+    ("data-local", boost::program_options::value<Files::MaybeQuotedPathContainer::value_type>()->default_value(Files::MaybeQuotedPathContainer::value_type(), ""))
     ("fs-strict", boost::program_options::value<bool>()->implicit_value(true)->default_value(false))
     ("encoding", boost::program_options::value<std::string>()->default_value("win1252"))
-    ("resources", boost::program_options::value<Files::ReluctantPath>()->default_value(Files::ReluctantPath(), "resources"))
+    ("resources", boost::program_options::value<Files::MaybeQuotedPath>()->default_value(Files::MaybeQuotedPath(), "resources"))
     ("fallback-archive", boost::program_options::value<std::vector<std::string>>()->
         default_value(std::vector<std::string>(), "fallback-archive")->multitoken())
     ("fallback", boost::program_options::value<FallbackMap>()->default_value(FallbackMap(), "")
@@ -112,7 +112,7 @@ std::pair<Files::PathContainer, std::vector<std::string> > CS::Editor::readConfi
     mDocumentManager.setEncoding(ToUTF8::calculateEncoding(mEncodingName));
     mFileDialog.setEncoding (QString::fromUtf8(mEncodingName.c_str()));
 
-    mDocumentManager.setResourceDir (mResources = variables["resources"].as<Files::ReluctantPath>());
+    mDocumentManager.setResourceDir (mResources = variables["resources"].as<Files::MaybeQuotedPath>());
 
     if (variables["script-blacklist-use"].as<bool>())
         mDocumentManager.setBlacklistedScripts (
@@ -122,10 +122,10 @@ std::pair<Files::PathContainer, std::vector<std::string> > CS::Editor::readConfi
 
     Files::PathContainer dataDirs, dataLocal;
     if (!variables["data"].empty()) {
-        dataDirs = asPathContainer(variables["data"].as<Files::ReluctantPathContainer>());
+        dataDirs = asPathContainer(variables["data"].as<Files::MaybeQuotedPathContainer>());
     }
 
-    Files::PathContainer::value_type local(variables["data-local"].as<Files::ReluctantPathContainer::value_type>());
+    Files::PathContainer::value_type local(variables["data-local"].as<Files::MaybeQuotedPathContainer::value_type>());
     if (!local.empty())
         dataLocal.push_back(local);
 
diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index 50a7c3d844..d502ecbc05 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -56,7 +56,7 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     {
         cfgMgr.readConfiguration(variables, desc, true);
 
-        Version::Version v = Version::getOpenmwVersion(variables["resources"].as<Files::ReluctantPath>().string());
+        Version::Version v = Version::getOpenmwVersion(variables["resources"].as<Files::MaybeQuotedPath>().string());
         getRawStdout() << v.describe() << std::endl;
         return false;
     }
@@ -65,7 +65,7 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     cfgMgr.readConfiguration(variables, desc);
     Files::mergeComposingVariables(variables, composingVariables, desc);
 
-    Version::Version v = Version::getOpenmwVersion(variables["resources"].as<Files::ReluctantPath>().string());
+    Version::Version v = Version::getOpenmwVersion(variables["resources"].as<Files::MaybeQuotedPath>().string());
     Log(Debug::Info) << v.describe();
 
     engine.setGrabMouse(!variables["no-grab"].as<bool>());
@@ -78,15 +78,15 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     // directory settings
     engine.enableFSStrict(variables["fs-strict"].as<bool>());
 
-    Files::PathContainer dataDirs(asPathContainer(variables["data"].as<Files::ReluctantPathContainer>()));
+    Files::PathContainer dataDirs(asPathContainer(variables["data"].as<Files::MaybeQuotedPathContainer>()));
 
-    Files::PathContainer::value_type local(variables["data-local"].as<Files::ReluctantPathContainer::value_type>());
+    Files::PathContainer::value_type local(variables["data-local"].as<Files::MaybeQuotedPathContainer::value_type>());
     if (!local.empty())
         dataDirs.push_back(local);
 
     cfgMgr.processPaths(dataDirs);
 
-    engine.setResourceDir(variables["resources"].as<Files::ReluctantPath>());
+    engine.setResourceDir(variables["resources"].as<Files::MaybeQuotedPath>());
     engine.setDataDirs(dataDirs);
 
     // fallback archives
@@ -141,7 +141,7 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     engine.setWarningsMode (variables["script-warn"].as<int>());
     engine.setScriptBlacklist (variables["script-blacklist"].as<StringsVector>());
     engine.setScriptBlacklistUse (variables["script-blacklist-use"].as<bool>());
-    engine.setSaveGameFile (variables["load-savegame"].as<Files::ReluctantPath>().string());
+    engine.setSaveGameFile (variables["load-savegame"].as<Files::MaybeQuotedPath>().string());
 
     // other settings
     Fallback::Map::init(variables["fallback"].as<FallbackMap>().mMap);
diff --git a/apps/openmw/options.cpp b/apps/openmw/options.cpp
index a1b2102f08..f7d20b4dd7 100644
--- a/apps/openmw/options.cpp
+++ b/apps/openmw/options.cpp
@@ -25,16 +25,16 @@ namespace OpenMW
             ("replace", bpo::value<StringsVector>()->default_value(StringsVector(), "")
                 ->multitoken()->composing(), "settings where the values from the current source should replace those from lower-priority sources instead of being appended")
 
-            ("data", bpo::value<Files::ReluctantPathContainer>()->default_value(Files::ReluctantPathContainer(), "data")
+            ("data", bpo::value<Files::MaybeQuotedPathContainer>()->default_value(Files::MaybeQuotedPathContainer(), "data")
                 ->multitoken()->composing(), "set data directories (later directories have higher priority)")
 
-            ("data-local", bpo::value<Files::ReluctantPathContainer::value_type>()->default_value(Files::ReluctantPathContainer::value_type(), ""),
+            ("data-local", bpo::value<Files::MaybeQuotedPathContainer::value_type>()->default_value(Files::MaybeQuotedPathContainer::value_type(), ""),
                 "set local data directory (highest priority)")
 
             ("fallback-archive", bpo::value<StringsVector>()->default_value(StringsVector(), "fallback-archive")
                 ->multitoken()->composing(), "set fallback BSA archives (later archives have higher priority)")
 
-            ("resources", bpo::value<Files::ReluctantPath>()->default_value(Files::ReluctantPath(), "resources"),
+            ("resources", bpo::value<Files::MaybeQuotedPath>()->default_value(Files::MaybeQuotedPath(), "resources"),
                 "set resources directory")
 
             ("start", bpo::value<std::string>()->default_value(""),
@@ -77,7 +77,7 @@ namespace OpenMW
             ("script-blacklist-use", bpo::value<bool>()->implicit_value(true)
                 ->default_value(true), "enable script blacklisting")
 
-            ("load-savegame", bpo::value<Files::ReluctantPath>()->default_value(Files::ReluctantPath(), ""),
+            ("load-savegame", bpo::value<Files::MaybeQuotedPath>()->default_value(Files::MaybeQuotedPath(), ""),
                 "load a save game file on game startup (specify an absolute filename or a filename relative to the current working directory)")
 
             ("skip-menu", bpo::value<bool>()->implicit_value(true)
diff --git a/apps/openmw_test_suite/mwworld/test_store.cpp b/apps/openmw_test_suite/mwworld/test_store.cpp
index f2f9459df0..71b1fb0ff0 100644
--- a/apps/openmw_test_suite/mwworld/test_store.cpp
+++ b/apps/openmw_test_suite/mwworld/test_store.cpp
@@ -58,10 +58,10 @@ struct ContentFileTest : public ::testing::Test
 
         boost::program_options::options_description desc("Allowed options");
         desc.add_options()
-        ("data", boost::program_options::value<Files::ReluctantPathContainer>()->default_value(Files::ReluctantPathContainer(), "data")->multitoken()->composing())
+        ("data", boost::program_options::value<Files::MaybeQuotedPathContainer>()->default_value(Files::MaybeQuotedPathContainer(), "data")->multitoken()->composing())
         ("content", boost::program_options::value<std::vector<std::string>>()->default_value(std::vector<std::string>(), "")
             ->multitoken()->composing(), "content file(s): esm/esp, or omwgame/omwaddon")
-        ("data-local", boost::program_options::value<Files::ReluctantPathContainer::value_type>()->default_value(Files::ReluctantPathContainer::value_type(), ""));
+        ("data-local", boost::program_options::value<Files::MaybeQuotedPathContainer::value_type>()->default_value(Files::MaybeQuotedPathContainer::value_type(), ""));
 
         boost::program_options::notify(variables);
 
@@ -69,10 +69,10 @@ struct ContentFileTest : public ::testing::Test
 
         Files::PathContainer dataDirs, dataLocal;
         if (!variables["data"].empty()) {
-            dataDirs = asPathContainer(variables["data"].as<Files::ReluctantPathContainer>());
+            dataDirs = asPathContainer(variables["data"].as<Files::MaybeQuotedPathContainer>());
         }
 
-        Files::PathContainer::value_type local(variables["data-local"].as<Files::ReluctantPathContainer::value_type>());
+        Files::PathContainer::value_type local(variables["data-local"].as<Files::MaybeQuotedPathContainer::value_type>());
         if (!local.empty()) {
             dataLocal.push_back(local);
         }
diff --git a/apps/openmw_test_suite/openmw/options.cpp b/apps/openmw_test_suite/openmw/options.cpp
index bae324b134..9b8535ea36 100644
--- a/apps/openmw_test_suite/openmw/options.cpp
+++ b/apps/openmw_test_suite/openmw/options.cpp
@@ -40,7 +40,7 @@ namespace
         const std::array arguments {"openmw", "--load-savegame=save.omwsave"};
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "save.omwsave");
+        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), "save.omwsave");
     }
 
     TEST(OpenMWOptionsFromArguments, should_support_single_word_load_savegame_path)
@@ -49,7 +49,7 @@ namespace
         const std::array arguments {"openmw", "--load-savegame", "save.omwsave"};
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "save.omwsave");
+        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), "save.omwsave");
     }
 
     TEST(OpenMWOptionsFromArguments, should_support_multi_component_load_savegame_path)
@@ -58,7 +58,7 @@ namespace
         const std::array arguments {"openmw", "--load-savegame", "/home/user/openmw/save.omwsave"};
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "/home/user/openmw/save.omwsave");
+        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), "/home/user/openmw/save.omwsave");
     }
 
     TEST(OpenMWOptionsFromArguments, should_support_windows_multi_component_load_savegame_path)
@@ -67,7 +67,7 @@ namespace
         const std::array arguments {"openmw", "--load-savegame", R"(C:\OpenMW\save.omwsave)"};
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), R"(C:\OpenMW\save.omwsave)");
+        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), R"(C:\OpenMW\save.omwsave)");
     }
 
     TEST(OpenMWOptionsFromArguments, should_support_load_savegame_path_with_spaces)
@@ -76,8 +76,7 @@ namespace
         const std::array arguments {"openmw", "--load-savegame", "my save.omwsave"};
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "my");
-//        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "my save.omwsave");
+        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), "my save.omwsave");
     }
 
     TEST(OpenMWOptionsFromArguments, should_support_load_savegame_path_with_octothorpe)
@@ -86,7 +85,7 @@ namespace
         const std::array arguments {"openmw", "--load-savegame", "my#save.omwsave"};
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "my#save.omwsave");
+        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), "my#save.omwsave");
     }
 
     TEST(OpenMWOptionsFromArguments, should_support_load_savegame_path_with_at_sign)
@@ -95,7 +94,7 @@ namespace
         const std::array arguments {"openmw", "--load-savegame", "my@save.omwsave"};
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "my@save.omwsave");
+        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), "my@save.omwsave");
     }
 
     TEST(OpenMWOptionsFromArguments, should_support_load_savegame_path_with_quote)
@@ -104,7 +103,7 @@ namespace
         const std::array arguments {"openmw", "--load-savegame", R"(my"save.omwsave)"};
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), R"(my"save.omwsave)");
+        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), R"(my"save.omwsave)");
     }
 
     TEST(OpenMWOptionsFromArguments, should_support_quoted_load_savegame_path)
@@ -113,8 +112,8 @@ namespace
         const std::array arguments {"openmw", "--load-savegame", R"("save".omwsave)"};
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), R"(save)");
-//        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), R"("save".omwsave)");
+        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), R"(save)");
+//        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), R"("save".omwsave)");
     }
 
     TEST(OpenMWOptionsFromArguments, should_support_quoted_load_savegame_path_with_escaped_quote_by_ampersand)
@@ -123,7 +122,7 @@ namespace
         const std::array arguments {"openmw", "--load-savegame", R"("save&".omwsave")"};
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), R"(save".omwsave)");
+        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), R"(save".omwsave)");
     }
 
     TEST(OpenMWOptionsFromArguments, should_support_quoted_load_savegame_path_with_escaped_ampersand)
@@ -132,7 +131,7 @@ namespace
         const std::array arguments {"openmw", "--load-savegame", R"("save.omwsave&&")"};
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "save.omwsave&");
+        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), "save.omwsave&");
     }
 
     TEST(OpenMWOptionsFromArguments, should_support_load_savegame_path_with_ampersand)
@@ -141,7 +140,7 @@ namespace
         const std::array arguments {"openmw", "--load-savegame", "save&.omwsave"};
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "save&.omwsave");
+        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), "save&.omwsave");
     }
 
     TEST(OpenMWOptionsFromArguments, should_support_load_savegame_path_with_multiple_quotes)
@@ -150,7 +149,7 @@ namespace
         const std::array arguments {"openmw", "--load-savegame", R"(my"save".omwsave)"};
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), R"(my"save".omwsave)");
+        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), R"(my"save".omwsave)");
     }
 
     TEST(OpenMWOptionsFromArguments, should_compose_data)
@@ -159,7 +158,7 @@ namespace
         const std::array arguments {"openmw", "--data", "1", "--data", "2"};
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_THAT(variables["data"].as<Files::ReluctantPathContainer>(), ElementsAre(IsPath("1"), IsPath("2")));
+        EXPECT_THAT(variables["data"].as<Files::MaybeQuotedPathContainer>(), ElementsAre(IsPath("1"), IsPath("2")));
     }
 
     TEST(OpenMWOptionsFromArguments, should_compose_data_from_single_flag)
@@ -168,7 +167,7 @@ namespace
         const std::array arguments {"openmw", "--data", "1", "2"};
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_THAT(variables["data"].as<Files::ReluctantPathContainer>(), ElementsAre(IsPath("1"), IsPath("2")));
+        EXPECT_THAT(variables["data"].as<Files::MaybeQuotedPathContainer>(), ElementsAre(IsPath("1"), IsPath("2")));
     }
 
     TEST(OpenMWOptionsFromArguments, should_throw_on_multiple_load_savegame)
@@ -189,7 +188,7 @@ namespace
         const std::array arguments {"openmw", "--load-savegame", pathArgument.c_str()};
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), path);
+        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), path);
     }
 
     INSTANTIATE_TEST_SUITE_P(
@@ -204,7 +203,7 @@ namespace
         std::istringstream stream("load-savegame=save.omwsave");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "save.omwsave");
+        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), "save.omwsave");
     }
 
     TEST(OpenMWOptionsFromConfig, should_strip_quotes_from_load_savegame_path)
@@ -213,7 +212,7 @@ namespace
         std::istringstream stream(R"(load-savegame="save.omwsave")");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "save.omwsave");
+        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), "save.omwsave");
     }
 
     TEST(OpenMWOptionsFromConfig, should_strip_outer_quotes_from_load_savegame_path)
@@ -222,8 +221,8 @@ namespace
         std::istringstream stream(R"(load-savegame=""save".omwsave")");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "");
-//        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), R"(""save".omwsave")");
+        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), "");
+//        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), R"(""save".omwsave")");
     }
 
     TEST(OpenMWOptionsFromConfig, should_strip_quotes_from_load_savegame_path_with_space)
@@ -232,7 +231,7 @@ namespace
         std::istringstream stream(R"(load-savegame="my save.omwsave")");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "my save.omwsave");
+        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), "my save.omwsave");
     }
 
     TEST(OpenMWOptionsFromConfig, should_support_quoted_load_savegame_path_with_octothorpe)
@@ -241,7 +240,7 @@ namespace
         std::istringstream stream("load-savegame=save#.omwsave");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "save#.omwsave");
+        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), "save#.omwsave");
     }
 
     TEST(OpenMWOptionsFromConfig, should_support_quoted_load_savegame_path_with_at_sign)
@@ -250,7 +249,7 @@ namespace
         std::istringstream stream("load-savegame=save@.omwsave");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "save@.omwsave");
+        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), "save@.omwsave");
     }
 
     TEST(OpenMWOptionsFromConfig, should_support_quoted_load_savegame_path_with_quote)
@@ -259,7 +258,7 @@ namespace
         std::istringstream stream(R"(load-savegame=save".omwsave)");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), R"(save".omwsave)");
+        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), R"(save".omwsave)");
     }
 
     TEST(OpenMWOptionsFromConfig, should_support_confusing_savegame_path_with_lots_going_on)
@@ -268,7 +267,7 @@ namespace
         std::istringstream stream(R"(load-savegame="one &"two"three".omwsave")");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), R"(one "two)");
+        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), R"(one "two)");
     }
 
     TEST(OpenMWOptionsFromConfig, should_support_confusing_savegame_path_with_even_more_going_on)
@@ -277,7 +276,7 @@ namespace
         std::istringstream stream(R"(load-savegame="one &"two"three ".omwsave")");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), R"(one "two)");
+        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), R"(one "two)");
     }
 
     TEST(OpenMWOptionsFromConfig, should_ignore_commented_option)
@@ -286,7 +285,7 @@ namespace
         std::istringstream stream("#load-savegame=save.omwsave");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "");
+        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), "");
     }
 
     TEST(OpenMWOptionsFromConfig, should_ignore_whitespace_prefixed_commented_option)
@@ -295,7 +294,7 @@ namespace
         std::istringstream stream(" \t#load-savegame=save.omwsave");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "");
+        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), "");
     }
 
     TEST(OpenMWOptionsFromConfig, should_support_whitespace_around_option)
@@ -304,7 +303,7 @@ namespace
         std::istringstream stream(" load-savegame = save.omwsave ");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "save.omwsave");
+        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), "save.omwsave");
     }
 
     TEST(OpenMWOptionsFromConfig, should_throw_on_multiple_load_savegame)
@@ -321,7 +320,7 @@ namespace
         std::istringstream stream("load-savegame=/home/user/openmw/save.omwsave");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "/home/user/openmw/save.omwsave");
+        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), "/home/user/openmw/save.omwsave");
     }
 
     TEST(OpenMWOptionsFromConfig, should_support_windows_multi_component_load_savegame_path)
@@ -330,7 +329,7 @@ namespace
         std::istringstream stream(R"(load-savegame=C:\OpenMW\save.omwsave)");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), R"(C:\OpenMW\save.omwsave)");
+        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), R"(C:\OpenMW\save.omwsave)");
     }
 
     TEST(OpenMWOptionsFromConfig, should_compose_data)
@@ -339,7 +338,7 @@ namespace
         std::istringstream stream("data=1\ndata=2");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_THAT(variables["data"].as<Files::ReluctantPathContainer>(), ElementsAre(IsPath("1"), IsPath("2")));
+        EXPECT_THAT(variables["data"].as<Files::MaybeQuotedPathContainer>(), ElementsAre(IsPath("1"), IsPath("2")));
     }
 
     TEST(OpenMWOptionsFromConfig, should_support_quoted_load_savegame_path_with_escaped_quote_by_ampersand)
@@ -348,7 +347,7 @@ namespace
         std::istringstream stream(R"(load-savegame="save&".omwsave")");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), R"(save".omwsave)");
+        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), R"(save".omwsave)");
     }
 
     TEST(OpenMWOptionsFromConfig, should_support_quoted_load_savegame_path_with_escaped_ampersand)
@@ -357,7 +356,7 @@ namespace
         std::istringstream stream(R"(load-savegame="save.omwsave&&")");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "save.omwsave&");
+        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), "save.omwsave&");
     }
 
     TEST(OpenMWOptionsFromConfig, should_support_load_savegame_path_with_ampersand)
@@ -366,7 +365,7 @@ namespace
         std::istringstream stream("load-savegame=save&.omwsave");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), "save&.omwsave");
+        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), "save&.omwsave");
     }
 
     struct OpenMWOptionsFromConfigStrings : TestWithParam<std::string> {};
@@ -378,7 +377,7 @@ namespace
         std::istringstream stream("load-savegame=\"" + path + "\"");
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
-        EXPECT_EQ(variables["load-savegame"].as<Files::ReluctantPath>().string(), path);
+        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), path);
     }
 
     INSTANTIATE_TEST_SUITE_P(
diff --git a/components/files/configurationmanager.cpp b/components/files/configurationmanager.cpp
index b04b211967..bb22e4750f 100644
--- a/components/files/configurationmanager.cpp
+++ b/components/files/configurationmanager.cpp
@@ -138,10 +138,10 @@ void mergeComposingVariables(boost::program_options::variables_map& first, boost
             boost::any& firstValue = firstPosition->second.value();
             const boost::any& secondValue = second[name].value();
             
-            if (firstValue.type() == typeid(Files::ReluctantPathContainer))
+            if (firstValue.type() == typeid(Files::MaybeQuotedPathContainer))
             {
-                auto& firstPathContainer = boost::any_cast<Files::ReluctantPathContainer&>(firstValue);
-                const auto& secondPathContainer = boost::any_cast<const Files::ReluctantPathContainer&>(secondValue);
+                auto& firstPathContainer = boost::any_cast<Files::MaybeQuotedPathContainer&>(firstValue);
+                const auto& secondPathContainer = boost::any_cast<const Files::MaybeQuotedPathContainer&>(secondValue);
 
                 firstPathContainer.insert(firstPathContainer.end(), secondPathContainer.begin(), secondPathContainer.end());
             }
@@ -317,22 +317,31 @@ void parseConfig(std::istream& stream, boost::program_options::variables_map& va
     );
 }
 
-std::istream& operator>> (std::istream& istream, ReluctantPath& reluctantPath)
+std::istream& operator>> (std::istream& istream, MaybeQuotedPath& MaybeQuotedPath)
 {
-    // Read from stream using boost::filesystem::path rules, then discard anything remaining.
+    // If the stream starts with a double quote, read from stream using boost::filesystem::path rules, then discard anything remaining.
     // This prevents boost::program_options getting upset that we've not consumed the whole stream.
-    istream >> static_cast<boost::filesystem::path&>(reluctantPath);
-    if (istream && !istream.eof() && istream.peek() != EOF)
+    // If it doesn't start with a double quote, read the whole thing verbatim
+    if (istream.peek() == '"')
     {
-        std::string remainder(std::istreambuf_iterator(istream), {});
-        Log(Debug::Warning) << "Trailing data in path setting. Used '" << reluctantPath.string() << "' but '" << remainder << "' remained";
+        istream >> static_cast<boost::filesystem::path&>(MaybeQuotedPath);
+        if (istream && !istream.eof() && istream.peek() != EOF)
+        {
+            std::string remainder(std::istreambuf_iterator(istream), {});
+            Log(Debug::Warning) << "Trailing data in path setting. Used '" << MaybeQuotedPath.string() << "' but '" << remainder << "' remained";
+        }
+    }
+    else
+    {
+        std::string intermediate(std::istreambuf_iterator(istream), {});
+        static_cast<boost::filesystem::path&>(MaybeQuotedPath) = intermediate;
     }
     return istream;
 }
 
-PathContainer asPathContainer(const ReluctantPathContainer& reluctantPathContainer)
+PathContainer asPathContainer(const MaybeQuotedPathContainer& MaybeQuotedPathContainer)
 {
-    return PathContainer(reluctantPathContainer.begin(), reluctantPathContainer.end());
+    return PathContainer(MaybeQuotedPathContainer.begin(), MaybeQuotedPathContainer.end());
 }
 
 } /* namespace Cfg */
diff --git a/components/files/configurationmanager.hpp b/components/files/configurationmanager.hpp
index 8f3e5f938e..0c4d2dc835 100644
--- a/components/files/configurationmanager.hpp
+++ b/components/files/configurationmanager.hpp
@@ -77,17 +77,17 @@ void parseArgs(int argc, const char* const argv[], boost::program_options::varia
 void parseConfig(std::istream& stream, boost::program_options::variables_map& variables,
     boost::program_options::options_description& description);
 
-class ReluctantPath : public boost::filesystem::path
+class MaybeQuotedPath : public boost::filesystem::path
 {
 public:
     operator boost::filesystem::path() { return *this; }
 };
 
-std::istream& operator>> (std::istream& istream, ReluctantPath& reluctantPath);
+std::istream& operator>> (std::istream& istream, MaybeQuotedPath& MaybeQuotedPath);
 
-typedef std::vector<ReluctantPath> ReluctantPathContainer;
+typedef std::vector<MaybeQuotedPath> MaybeQuotedPathContainer;
 
-PathContainer asPathContainer(const ReluctantPathContainer& reluctantPathContainer);
+PathContainer asPathContainer(const MaybeQuotedPathContainer& MaybeQuotedPathContainer);
 
 } /* namespace Cfg */
 

From a9877aea984243bc04cf26b80320a7d96c22124f Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Sat, 13 Nov 2021 18:19:14 +0000
Subject: [PATCH 1766/2859] Ensure Debug version of GMock library is added to
 imported target

(cherry picked from commit dcf61dfe783fe808c76d102e6639ed0be77d5932)
---
 cmake/FindGMock.cmake | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/cmake/FindGMock.cmake b/cmake/FindGMock.cmake
index 6b3caf543e..bc3410969f 100644
--- a/cmake/FindGMock.cmake
+++ b/cmake/FindGMock.cmake
@@ -164,8 +164,16 @@ find_dependency(Threads)
 
 set_target_properties(GMock::GMock PROPERTIES
     INTERFACE_LINK_LIBRARIES "Threads::Threads"
-    IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
-    IMPORTED_LOCATION "${GMOCK_LIBRARY}")
+    IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")
+
+if(EXISTS "${GMOCK_LIBRARY}")
+    set_target_properties(GMock::GMock PROPERTIES
+        IMPORTED_LOCATION "${GMOCK_LIBRARY}")
+endif()
+if(EXISTS "${GMOCK_LIBRARY_DEBUG}")
+    set_target_properties(GMock::GMock PROPERTIES
+        IMPORTED_LOCATION_DEBUG "${GMOCK_LIBRARY_DEBUG}")
+endif()
 
 if(GMOCK_INCLUDE_DIR)
     set_target_properties(GMock::GMock PROPERTIES

From 5b8cba7323031bba5b862401b3cf4620f9fce933 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Mon, 22 Nov 2021 19:17:36 +0000
Subject: [PATCH 1767/2859] Clear Lua-created UI on game load and reloadlua
 command

---
 apps/openmw/mwlua/luabindings.hpp   | 1 +
 apps/openmw/mwlua/luamanagerimp.cpp | 2 ++
 apps/openmw/mwlua/uibindings.cpp    | 9 +++++++++
 3 files changed, 12 insertions(+)

diff --git a/apps/openmw/mwlua/luabindings.hpp b/apps/openmw/mwlua/luabindings.hpp
index aad3183734..b021354a75 100644
--- a/apps/openmw/mwlua/luabindings.hpp
+++ b/apps/openmw/mwlua/luabindings.hpp
@@ -58,6 +58,7 @@ namespace MWLua
 
     // Implemented in uibindings.cpp
     sol::table initUserInterfacePackage(const Context&);
+    void clearUserInterface();
 
     // Implemented in inputbindings.cpp
     sol::table initInputPackage(const Context&);
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index f55ca20f02..2f3df00f7f 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -220,6 +220,7 @@ namespace MWLua
             mPlayer.getRefData().setLuaScripts(nullptr);
             mPlayer = MWWorld::Ptr();
         }
+        clearUserInterface();
     }
 
     void LuaManager::setupPlayer(const MWWorld::Ptr& ptr)
@@ -425,6 +426,7 @@ namespace MWLua
                 continue;
             ESM::LuaScripts data;
             scripts->save(data);
+            clearUserInterface();
             scripts->load(data);
         }
         for (LocalScripts* scripts : mActiveLocalScripts)
diff --git a/apps/openmw/mwlua/uibindings.cpp b/apps/openmw/mwlua/uibindings.cpp
index 7008a0caea..9982b857c8 100644
--- a/apps/openmw/mwlua/uibindings.cpp
+++ b/apps/openmw/mwlua/uibindings.cpp
@@ -10,6 +10,7 @@ namespace MWLua
 {
     namespace
     {
+        std::set<LuaUi::Element*> allElements;
 
         class UiAction final : public Action
         {
@@ -152,6 +153,7 @@ namespace MWLua
         {
             if (element->mDestroy)
                 return;
+            allElements.erase(element.get());
             element->mDestroy = true;
             context.mLuaManager->addAction(std::make_unique<UiAction>(UiAction::DESTROY, element, context.mLua));
         };
@@ -168,6 +170,7 @@ namespace MWLua
         api["create"] = [context](const sol::table& layout)
         {
             auto element = std::make_shared<LuaUi::Element>(layout);
+            allElements.emplace(element.get());
             context.mLuaManager->addAction(std::make_unique<UiAction>(UiAction::CREATE, element, context.mLua));
             return element;
         };
@@ -180,4 +183,10 @@ namespace MWLua
         return LuaUtil::makeReadOnly(api);
     }
     
+    void clearUserInterface()
+    {
+        for (auto element : allElements)
+            element->destroy();
+        allElements.clear();
+    }
 }

From 4a976a8e239b5375ed3d5c587ec6e21b62254d4a Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Mon, 22 Nov 2021 19:39:47 +0000
Subject: [PATCH 1768/2859] Use a setting to enable Lua Action tracebacks

---
 apps/openmw/mwlua/actions.cpp                 | 23 ++++++++++---------
 apps/openmw/mwlua/actions.hpp                 |  2 --
 .../source/reference/modding/settings/lua.rst | 12 ++++++++++
 files/settings-default.cfg                    |  3 +++
 4 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/apps/openmw/mwlua/actions.cpp b/apps/openmw/mwlua/actions.cpp
index 7389363fe6..49bb5cfcb4 100644
--- a/apps/openmw/mwlua/actions.cpp
+++ b/apps/openmw/mwlua/actions.cpp
@@ -4,6 +4,7 @@
 
 #include <components/debug/debuglog.hpp>
 #include <components/lua/luastate.hpp>
+#include <components/settings/settings.hpp>
 
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/class.hpp"
@@ -12,12 +13,12 @@
 
 namespace MWLua
 {
-
-#ifdef NDEBUG
-    Action::Action(LuaUtil::LuaState* state) {}
-#else
-    Action::Action(LuaUtil::LuaState* state) : mCallerTraceback(state->debugTraceback()) {}
-#endif
+    Action::Action(LuaUtil::LuaState* state)
+    {
+        static const bool luaDebug = Settings::Manager::getBool("lua debug", "Lua");
+        if (luaDebug)
+            mCallerTraceback = state->debugTraceback();
+    }
 
     void Action::safeApply(WorldView& w) const
     {
@@ -28,11 +29,11 @@ namespace MWLua
         catch (const std::exception& e)
         {
             Log(Debug::Error) << "Error in " << this->toString() << ": " << e.what();
-#ifdef NDEBUG
-            Log(Debug::Error) << "Traceback is available only in debug builds";
-#else
-            Log(Debug::Error) << "Caller " << mCallerTraceback;
-#endif
+
+            if (mCallerTraceback.empty())
+                Log(Debug::Error) << "Set 'lua_debug=true' in settings.cfg to enable action tracebacks";
+            else
+                Log(Debug::Error) << "Caller " << mCallerTraceback;
         }
     }
 
diff --git a/apps/openmw/mwlua/actions.hpp b/apps/openmw/mwlua/actions.hpp
index 3b71eef4a9..e88b39e83c 100644
--- a/apps/openmw/mwlua/actions.hpp
+++ b/apps/openmw/mwlua/actions.hpp
@@ -29,9 +29,7 @@ namespace MWLua
         virtual std::string toString() const = 0;
 
     private:
-#ifndef NDEBUG
         std::string mCallerTraceback;
-#endif
     };
 
     class TeleportAction final : public Action
diff --git a/docs/source/reference/modding/settings/lua.rst b/docs/source/reference/modding/settings/lua.rst
index 4d1a3ca808..65faf884ae 100644
--- a/docs/source/reference/modding/settings/lua.rst
+++ b/docs/source/reference/modding/settings/lua.rst
@@ -1,6 +1,18 @@
 Lua Settings
 ############
 
+lua debug
+---------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	False
+
+Enables debug tracebacks for Lua actions.
+It adds significant performance overhead, don't enable if you don't need it.
+
+This setting can only be configured by editing the settings configuration file.
+
 lua num threads
 ---------------
 
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index c0083e4238..9715e3793e 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -1106,6 +1106,9 @@ stomp intensity = 1
 
 [Lua]
 
+# Enable performance-heavy debug features
+lua debug = false
+
 # Set the maximum number of threads used for Lua scripts.
 # If zero, Lua scripts are processed in the main thread.
 lua num threads = 1

From da0c5b54f0d0162ff062292f3fae38238c186249 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 21 Nov 2021 16:16:15 +0100
Subject: [PATCH 1769/2859] Load only supported content formats by EsmLoader

---
 apps/openmw_test_suite/esmloader/load.cpp | 23 +++++++++++++++++++++++
 components/esmloader/load.cpp             | 19 ++++++++++++++++++-
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/apps/openmw_test_suite/esmloader/load.cpp b/apps/openmw_test_suite/esmloader/load.cpp
index 0f00847226..d6ed66f7a7 100644
--- a/apps/openmw_test_suite/esmloader/load.cpp
+++ b/apps/openmw_test_suite/esmloader/load.cpp
@@ -101,4 +101,27 @@ namespace
         EXPECT_EQ(esmData.mLands.size(), 0);
         EXPECT_EQ(esmData.mStatics.size(), 0);
     }
+
+    TEST_F(EsmLoaderTest, loadEsmDataShouldSkipUnsupportedFormats)
+    {
+        Query query;
+        query.mLoadActivators = true;
+        query.mLoadCells = true;
+        query.mLoadContainers = true;
+        query.mLoadDoors = true;
+        query.mLoadGameSettings = true;
+        query.mLoadLands = true;
+        query.mLoadStatics = true;
+        const std::vector<std::string> contentFiles {{"script.omwscripts"}};
+        std::vector<ESM::ESMReader> readers(contentFiles.size());
+        ToUTF8::Utf8Encoder* const encoder = nullptr;
+        const EsmData esmData = loadEsmData(query, contentFiles, mFileCollections, readers, encoder);
+        EXPECT_EQ(esmData.mActivators.size(), 0);
+        EXPECT_EQ(esmData.mCells.size(), 0);
+        EXPECT_EQ(esmData.mContainers.size(), 0);
+        EXPECT_EQ(esmData.mDoors.size(), 0);
+        EXPECT_EQ(esmData.mGameSettings.size(), 0);
+        EXPECT_EQ(esmData.mLands.size(), 0);
+        EXPECT_EQ(esmData.mStatics.size(), 0);
+    }
 }
diff --git a/components/esmloader/load.cpp b/components/esmloader/load.cpp
index 9879f33274..42870989db 100644
--- a/components/esmloader/load.cpp
+++ b/components/esmloader/load.cpp
@@ -22,6 +22,7 @@
 #include <algorithm>
 #include <cstddef>
 #include <map>
+#include <set>
 #include <string>
 #include <string_view>
 #include <type_traits>
@@ -206,10 +207,26 @@ namespace EsmLoader
         {
             ShallowContent result;
 
+            const std::set<std::string> supportedFormats {
+                ".esm",
+                ".esp",
+                ".omwgame",
+                ".omwaddon",
+                ".project",
+            };
+
             for (std::size_t i = 0; i < contentFiles.size(); ++i)
             {
                 const std::string &file = contentFiles[i];
-                const Files::MultiDirCollection& collection = fileCollections.getCollection(boost::filesystem::path(file).extension().string());
+                const std::string extension = boost::filesystem::path(file).extension().string();
+
+                if (supportedFormats.find(extension) == supportedFormats.end())
+                {
+                    Log(Debug::Warning) << "Skipping unsupported content file: " << file;
+                    continue;
+                }
+
+                const Files::MultiDirCollection& collection = fileCollections.getCollection(extension);
 
                 ESM::ESMReader& reader = readers[i];
                 reader.setEncoder(encoder);

From 1b1de86b4a984b888669eb9017362f67fbe99d7a Mon Sep 17 00:00:00 2001
From: kuyondo <rdja.kyd@gmail.com>
Date: Tue, 23 Nov 2021 04:07:10 +0800
Subject: [PATCH 1770/2859] Validate Quick Keys

---
 apps/openmw/mwgui/quickkeysmenu.cpp | 55 ++++++++++++++++-------------
 apps/openmw/mwgui/quickkeysmenu.hpp |  1 +
 2 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/apps/openmw/mwgui/quickkeysmenu.cpp b/apps/openmw/mwgui/quickkeysmenu.cpp
index ad61f63b90..5bf5a4df63 100644
--- a/apps/openmw/mwgui/quickkeysmenu.cpp
+++ b/apps/openmw/mwgui/quickkeysmenu.cpp
@@ -79,44 +79,49 @@ namespace MWGui
         delete mMagicSelectionDialog;
     }
 
-    void QuickKeysMenu::onOpen()
+    // Check if quick keys are still valid
+    void QuickKeysMenu::validate(MWWorld::Ptr player)
     {
-        WindowBase::onOpen();
-
-        MWWorld::Ptr player = MWMechanics::getPlayer();
         MWWorld::InventoryStore& store = player.getClass().getInventoryStore(player);
 
-        // Check if quick keys are still valid
-        for (int i=0; i<10; ++i)
+        for (int i = 0; i < 10; ++i)
         {
             switch (mKey[i].type)
             {
-                case Type_Unassigned:
-                case Type_HandToHand:
-                case Type_Magic:
-                    break;
-                case Type_Item:
-                case Type_MagicItem:
-                {
-                    MWWorld::Ptr item = *mKey[i].button->getUserData<MWWorld::Ptr>();
-                    // Make sure the item is available and is not broken
-                    if (!item || item.getRefData().getCount() < 1 ||
-                        (item.getClass().hasItemHealth(item) &&
+            case Type_Unassigned:
+            case Type_HandToHand:
+            case Type_Magic:
+                break;
+            case Type_Item:
+            case Type_MagicItem:
+            {
+                MWWorld::Ptr item = *mKey[i].button->getUserData<MWWorld::Ptr>();
+                // Make sure the item is available and is not broken
+                if (!item || item.getRefData().getCount() < 1 ||
+                    (item.getClass().hasItemHealth(item) &&
                         item.getClass().getItemHealth(item) <= 0))
-                    {
-                        // Try searching for a compatible replacement
-                        item = store.findReplacement(mKey[i].id);
+                {
+                    // Try searching for a compatible replacement
+                    item = store.findReplacement(mKey[i].id);
 
-                        if (item)
-                            mKey[i].button->setUserData(MWWorld::Ptr(item));
+                    if (item)
+                        mKey[i].button->setUserData(MWWorld::Ptr(item));
 
-                        break;
-                    }
+                    break;
                 }
             }
+            }
         }
     }
 
+    void QuickKeysMenu::onOpen()
+    {
+        WindowBase::onOpen();
+
+        MWWorld::Ptr player = MWMechanics::getPlayer();
+        validate(player);
+    }
+
     void QuickKeysMenu::unassign(keyData* key)
     {
         key->button->clearUserStrings();
@@ -334,6 +339,8 @@ namespace MWGui
         MWWorld::InventoryStore& store = player.getClass().getInventoryStore(player);
         const MWMechanics::CreatureStats &playerStats = player.getClass().getCreatureStats(player);
 
+        validate(player);
+
         // Delay action executing,
         // if player is busy for now (casting a spell, attacking someone, etc.)
         bool isDelayNeeded = MWBase::Environment::get().getMechanicsManager()->isAttackingOrSpell(player)
diff --git a/apps/openmw/mwgui/quickkeysmenu.hpp b/apps/openmw/mwgui/quickkeysmenu.hpp
index b2742df796..bfb54e5d16 100644
--- a/apps/openmw/mwgui/quickkeysmenu.hpp
+++ b/apps/openmw/mwgui/quickkeysmenu.hpp
@@ -32,6 +32,7 @@ namespace MWGui
         void onAssignMagicItem (MWWorld::Ptr item);
         void onAssignMagic (const std::string& spellId);
         void onAssignMagicCancel ();
+        void validate(MWWorld::Ptr player);
         void onOpen() override;
 
         void activateQuickKey(int index);

From 44d5c9618372daf7b3cb7903e46a73bc4fa8f2d7 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Mon, 22 Nov 2021 17:35:00 -0800
Subject: [PATCH 1771/2859] sunglare fix

---
 apps/openmw/mwrender/sky.cpp     |  2 +-
 apps/openmw/mwrender/skyutil.cpp | 16 ++++++++++++----
 apps/openmw/mwrender/skyutil.hpp |  2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index fcb7447cf3..c0a071c062 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -300,7 +300,7 @@ namespace MWRender
         mAtmosphereNightUpdater = new AtmosphereNightUpdater(mSceneManager->getImageManager(), forceShaders);
         atmosphereNight->addUpdateCallback(mAtmosphereNightUpdater);
 
-        mSun.reset(new Sun(mEarlyRenderBinRoot, *mSceneManager->getImageManager()));
+        mSun.reset(new Sun(mEarlyRenderBinRoot, *mSceneManager));
         mMasser.reset(new Moon(mEarlyRenderBinRoot, *mSceneManager, Fallback::Map::getFloat("Moons_Masser_Size")/125, Moon::Type_Masser));
         mSecunda.reset(new Moon(mEarlyRenderBinRoot, *mSceneManager, Fallback::Map::getFloat("Moons_Secunda_Size")/125, Moon::Type_Secunda));
 
diff --git a/apps/openmw/mwrender/skyutil.cpp b/apps/openmw/mwrender/skyutil.cpp
index b98e489738..c0b6f81358 100644
--- a/apps/openmw/mwrender/skyutil.cpp
+++ b/apps/openmw/mwrender/skyutil.cpp
@@ -694,12 +694,14 @@ namespace MWRender
         mTransform->setNodeMask(visible ? mVisibleMask : 0);
     }
 
-    Sun::Sun(osg::Group* parentNode, Resource::ImageManager& imageManager)
+    Sun::Sun(osg::Group* parentNode, Resource::SceneManager& sceneManager)
         : CelestialBody(parentNode, 1.0f, 1, Mask_Sun)
         , mUpdater(new SunUpdater)
     {
         mTransform->addUpdateCallback(mUpdater);
 
+        Resource::ImageManager& imageManager = *sceneManager.getImageManager();
+
         osg::ref_ptr<osg::Texture2D> sunTex = new osg::Texture2D(imageManager.getImage("textures/tx_sun_05.dds"));
         sunTex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
         sunTex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
@@ -714,9 +716,12 @@ namespace MWRender
         stateset->setRenderBinDetails(RenderBin_OcclusionQuery, "RenderBin");
         stateset->setNestRenderBins(false);
         // Set up alpha testing on the occlusion testing subgraph, that way we can get the occlusion tested fragments to match the circular shape of the sun
-        osg::ref_ptr<osg::AlphaFunc> alphaFunc = new osg::AlphaFunc;
-        alphaFunc->setFunction(osg::AlphaFunc::GREATER, 0.8);
-        stateset->setAttributeAndModes(alphaFunc);
+        if (!sceneManager.getForceShaders())
+        {
+            osg::ref_ptr<osg::AlphaFunc> alphaFunc = new osg::AlphaFunc;
+            alphaFunc->setFunction(osg::AlphaFunc::GREATER, 0.8);
+            stateset->setAttributeAndModes(alphaFunc);
+        }
         stateset->setTextureAttributeAndModes(0, sunTex);
         stateset->setAttributeAndModes(createUnlitMaterial());
         stateset->addUniform(new osg::Uniform("pass", static_cast<int>(Pass::Sunflash_Query)));
@@ -816,6 +821,7 @@ namespace MWRender
             // without having to retrieve the current far clipping distance.
             // We want the sun glare to be "infinitely" far away.
             double far = SceneUtil::AutoDepth::isReversed() ? 0.0 : 1.0;
+            depth->setFunction(osg::Depth::LEQUAL);
             depth->setZNear(far);
             depth->setZFar(far);
             depth->setWriteMask(false);
@@ -879,6 +885,8 @@ namespace MWRender
         camera->setClearMask(0);
         camera->setRenderOrder(osg::Camera::NESTED_RENDER);
         camera->setAllowEventFocus(false);
+        camera->getOrCreateStateSet()->addUniform(new osg::Uniform("projectionMatrix", static_cast<osg::Matrixf>(camera->getProjectionMatrix())));
+        SceneUtil::setCameraClearDepth(camera);
 
         osg::ref_ptr<osg::Geometry> geom = osg::createTexturedQuadGeometry(osg::Vec3f(-1,-1,0), osg::Vec3f(2,0,0), osg::Vec3f(0,2,0));
         camera->addChild(geom);
diff --git a/apps/openmw/mwrender/skyutil.hpp b/apps/openmw/mwrender/skyutil.hpp
index c2272143a0..a0d9ed72b4 100644
--- a/apps/openmw/mwrender/skyutil.hpp
+++ b/apps/openmw/mwrender/skyutil.hpp
@@ -239,7 +239,7 @@ namespace MWRender
     class Sun : public CelestialBody
     {
     public:
-        Sun(osg::Group* parentNode, Resource::ImageManager& imageManager);
+        Sun(osg::Group* parentNode, Resource::SceneManager& sceneManager);
 
         ~Sun();
 

From fd58e5ba778124469c91ddfec0669bb6cf649b3a Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Tue, 23 Nov 2021 04:39:17 +0300
Subject: [PATCH 1772/2859] Use the anim source to find mAccumRoot (bug #6417)

---
 CHANGELOG.md                       |  1 +
 apps/openmw/mwrender/animation.cpp | 35 ++++++++++++++++++++++--------
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d2a67349b..5bf298a457 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -80,6 +80,7 @@
     Bug #6386: Artifacts in water reflection due to imprecise screen-space coordinate computation
     Bug #6396: Inputting certain Unicode characters triggers an assertion
     Bug #6416: Morphs are applied to the wrong target
+    Bug #6417: OpenMW doesn't always use the right node to accumulate movement
     Bug #6429: Wyrmhaven: Can't add AI packages to player
     Feature #890: OpenMW-CS: Column filtering
     Feature #1465: "Reset" argument for AI functions
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index ecfe65c575..bf0ed04055 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -624,9 +624,8 @@ namespace MWRender
             return;
 
         const NodeMap& nodeMap = getNodeMap();
-
-        for (SceneUtil::KeyframeHolder::KeyframeControllerMap::const_iterator it = animsrc->mKeyframes->mKeyframeControllers.begin();
-             it != animsrc->mKeyframes->mKeyframeControllers.end(); ++it)
+        const auto& controllerMap = animsrc->mKeyframes->mKeyframeControllers;
+        for (SceneUtil::KeyframeHolder::KeyframeControllerMap::const_iterator it = controllerMap.begin(); it != controllerMap.end(); ++it)
         {
             std::string bonename = Misc::StringUtils::lowerCase(it->first);
             NodeMap::const_iterator found = nodeMap.find(bonename);
@@ -652,14 +651,32 @@ namespace MWRender
         SceneUtil::AssignControllerSourcesVisitor assignVisitor(mAnimationTimePtr[0]);
         mObjectRoot->accept(assignVisitor);
 
+        // Determine the movement accumulation bone if necessary
         if (!mAccumRoot)
         {
-            NodeMap::const_iterator found = nodeMap.find("bip01");
-            if (found == nodeMap.end())
-                found = nodeMap.find("root bone");
-
-            if (found != nodeMap.end())
-                mAccumRoot = found->second;
+            // Priority matters! bip01 is preferred.
+            static const std::array<std::string, 2> accumRootNames =
+            {
+                "bip01",
+                "root bone"
+            };
+            NodeMap::const_iterator found = nodeMap.end();
+            for (const std::string& name : accumRootNames)
+            {
+                found = nodeMap.find(name);
+                if (found == nodeMap.end())
+                    continue;
+                for (SceneUtil::KeyframeHolder::KeyframeControllerMap::const_iterator it = controllerMap.begin(); it != controllerMap.end(); ++it)
+                {
+                    if (Misc::StringUtils::lowerCase(it->first) == name)
+                    {
+                        mAccumRoot = found->second;
+                        break;
+                    }
+                }
+                if (mAccumRoot)
+                    break;
+            }
         }
     }
 

From 503f0e62e7482c4fa4770e4f7d906187c070c2d9 Mon Sep 17 00:00:00 2001
From: kuyondo <rdja.kyd@gmail.com>
Date: Tue, 23 Nov 2021 14:55:50 +0800
Subject: [PATCH 1773/2859] Validate Argument is Index instead of Player

---
 apps/openmw/mwgui/quickkeysmenu.cpp | 28 ++++++++++++++--------------
 apps/openmw/mwgui/quickkeysmenu.hpp |  4 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/apps/openmw/mwgui/quickkeysmenu.cpp b/apps/openmw/mwgui/quickkeysmenu.cpp
index 5bf5a4df63..1ada078ab6 100644
--- a/apps/openmw/mwgui/quickkeysmenu.cpp
+++ b/apps/openmw/mwgui/quickkeysmenu.cpp
@@ -79,14 +79,11 @@ namespace MWGui
         delete mMagicSelectionDialog;
     }
 
-    // Check if quick keys are still valid
-    void QuickKeysMenu::validate(MWWorld::Ptr player)
+    inline void QuickKeysMenu::validate(int index)
     {
+        MWWorld::Ptr player = MWMechanics::getPlayer();
         MWWorld::InventoryStore& store = player.getClass().getInventoryStore(player);
-
-        for (int i = 0; i < 10; ++i)
-        {
-            switch (mKey[i].type)
+            switch (mKey[index].type)
             {
             case Type_Unassigned:
             case Type_HandToHand:
@@ -95,31 +92,34 @@ namespace MWGui
             case Type_Item:
             case Type_MagicItem:
             {
-                MWWorld::Ptr item = *mKey[i].button->getUserData<MWWorld::Ptr>();
+                MWWorld::Ptr item = *mKey[index].button->getUserData<MWWorld::Ptr>();
                 // Make sure the item is available and is not broken
+                std::cout << item << std::endl;
                 if (!item || item.getRefData().getCount() < 1 ||
                     (item.getClass().hasItemHealth(item) &&
                         item.getClass().getItemHealth(item) <= 0))
                 {
                     // Try searching for a compatible replacement
-                    item = store.findReplacement(mKey[i].id);
+                    item = store.findReplacement(mKey[index].id);
 
                     if (item)
-                        mKey[i].button->setUserData(MWWorld::Ptr(item));
+                        mKey[index].button->setUserData(MWWorld::Ptr(item));
 
                     break;
                 }
             }
             }
-        }
     }
 
     void QuickKeysMenu::onOpen()
     {
         WindowBase::onOpen();
 
-        MWWorld::Ptr player = MWMechanics::getPlayer();
-        validate(player);
+        // Quick key index
+        for (int index = 0; index < 10; ++index)
+        {
+            validate(index);
+        }
     }
 
     void QuickKeysMenu::unassign(keyData* key)
@@ -334,12 +334,12 @@ namespace MWGui
         assert(index >= 1 && index <= 10);
 
         keyData *key = &mKey[index-1];
-
+        
         MWWorld::Ptr player = MWMechanics::getPlayer();
         MWWorld::InventoryStore& store = player.getClass().getInventoryStore(player);
         const MWMechanics::CreatureStats &playerStats = player.getClass().getCreatureStats(player);
 
-        validate(player);
+        validate(index-1);
 
         // Delay action executing,
         // if player is busy for now (casting a spell, attacking someone, etc.)
diff --git a/apps/openmw/mwgui/quickkeysmenu.hpp b/apps/openmw/mwgui/quickkeysmenu.hpp
index bfb54e5d16..4761c98ceb 100644
--- a/apps/openmw/mwgui/quickkeysmenu.hpp
+++ b/apps/openmw/mwgui/quickkeysmenu.hpp
@@ -32,7 +32,6 @@ namespace MWGui
         void onAssignMagicItem (MWWorld::Ptr item);
         void onAssignMagic (const std::string& spellId);
         void onAssignMagicCancel ();
-        void validate(MWWorld::Ptr player);
         void onOpen() override;
 
         void activateQuickKey(int index);
@@ -77,7 +76,8 @@ namespace MWGui
 
         void onQuickKeyButtonClicked(MyGUI::Widget* sender);
         void onOkButtonClicked(MyGUI::Widget* sender);
-
+        // Check if quick key is still valid
+        inline void validate(int index);
         void unassign(keyData* key);
     };
 

From d55682f8331508411d277d04e374c7ea7c6abad7 Mon Sep 17 00:00:00 2001
From: kuyondo <rdja.kyd@gmail.com>
Date: Tue, 23 Nov 2021 15:14:59 +0800
Subject: [PATCH 1774/2859] remove debug code

---
 apps/openmw/mwgui/quickkeysmenu.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/openmw/mwgui/quickkeysmenu.cpp b/apps/openmw/mwgui/quickkeysmenu.cpp
index 1ada078ab6..a581a52cc0 100644
--- a/apps/openmw/mwgui/quickkeysmenu.cpp
+++ b/apps/openmw/mwgui/quickkeysmenu.cpp
@@ -94,7 +94,6 @@ namespace MWGui
             {
                 MWWorld::Ptr item = *mKey[index].button->getUserData<MWWorld::Ptr>();
                 // Make sure the item is available and is not broken
-                std::cout << item << std::endl;
                 if (!item || item.getRefData().getCount() < 1 ||
                     (item.getClass().hasItemHealth(item) &&
                         item.getClass().getItemHealth(item) <= 0))

From f18b8adfea812ea0be6ade47b2bbfdae9860e6af Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Tue, 23 Nov 2021 17:00:53 +0100
Subject: [PATCH 1775/2859] Truncate instead of rounding to deal with negative
 values

---
 apps/openmw/mwmechanics/magiceffects.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/magiceffects.cpp b/apps/openmw/mwmechanics/magiceffects.cpp
index b01c5446a7..7a1acb1003 100644
--- a/apps/openmw/mwmechanics/magiceffects.cpp
+++ b/apps/openmw/mwmechanics/magiceffects.cpp
@@ -11,7 +11,7 @@ namespace
     // Round value to prevent precision issues
     void truncate(float& value)
     {
-        value = std::roundf(value * 1024.f) / 1024.f;
+        value = static_cast<int>(value * 1024.f) / 1024.f;
     }
 }
 

From 60a345f5ccf59bfe6485f12f9e201cb6f87fbcb0 Mon Sep 17 00:00:00 2001
From: kuyondo <rdja.kyd@gmail.com>
Date: Wed, 24 Nov 2021 01:44:14 +0800
Subject: [PATCH 1776/2859] Better indentation

---
 apps/openmw/mwgui/quickkeysmenu.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwgui/quickkeysmenu.cpp b/apps/openmw/mwgui/quickkeysmenu.cpp
index a581a52cc0..e55b9b4878 100644
--- a/apps/openmw/mwgui/quickkeysmenu.cpp
+++ b/apps/openmw/mwgui/quickkeysmenu.cpp
@@ -83,8 +83,8 @@ namespace MWGui
     {
         MWWorld::Ptr player = MWMechanics::getPlayer();
         MWWorld::InventoryStore& store = player.getClass().getInventoryStore(player);
-            switch (mKey[index].type)
-            {
+        switch (mKey[index].type)
+        {
             case Type_Unassigned:
             case Type_HandToHand:
             case Type_Magic:
@@ -107,7 +107,7 @@ namespace MWGui
                     break;
                 }
             }
-            }
+        }
     }
 
     void QuickKeysMenu::onOpen()

From 5ffd077f9ec8fba5fba51ad5cb3a9e645ddfffc1 Mon Sep 17 00:00:00 2001
From: kuyondo <rdja.kyd@gmail.com>
Date: Wed, 24 Nov 2021 01:51:03 +0800
Subject: [PATCH 1777/2859] Update changelog.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d2a67349b..87b2d72770 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -81,6 +81,7 @@
     Bug #6396: Inputting certain Unicode characters triggers an assertion
     Bug #6416: Morphs are applied to the wrong target
     Bug #6429: Wyrmhaven: Can't add AI packages to player
+    Bug #6433: Items bound to Quick Keys sometimes do not appear until the Quick Key menu is opened.
     Feature #890: OpenMW-CS: Column filtering
     Feature #1465: "Reset" argument for AI functions
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record

From 30ff688c70b706de93454a1b294369a38664eb5b Mon Sep 17 00:00:00 2001
From: kuyondo <rdja.kyd@gmail.com>
Date: Wed, 24 Nov 2021 19:35:39 +0800
Subject: [PATCH 1778/2859] Create only one overencumbered messagebox

---
 apps/openmw/mwgui/messagebox.cpp | 9 +++++++++
 apps/openmw/mwgui/messagebox.hpp | 1 +
 2 files changed, 10 insertions(+)

diff --git a/apps/openmw/mwgui/messagebox.cpp b/apps/openmw/mwgui/messagebox.cpp
index ed6633c983..f77b274f30 100644
--- a/apps/openmw/mwgui/messagebox.cpp
+++ b/apps/openmw/mwgui/messagebox.cpp
@@ -93,10 +93,19 @@ namespace MWGui
 
     void MessageBoxManager::createMessageBox (const std::string& message, bool stat)
     {
+        if (message == "#{sNotifyMessage59}")
+            for (MessageBox* messageBox : mMessageBoxes)
+                if (messageBox->mIsEncumberedMessage)
+                {
+                    messageBox->mCurrentTime = 0;
+                    return;
+                }
+
         MessageBox *box = new MessageBox(*this, message);
         box->mCurrentTime = 0;
         std::string realMessage = MyGUI::LanguageManager::getInstance().replaceTags(message);
         box->mMaxTime = realMessage.length()*mMessageBoxSpeed;
+        box->mIsEncumberedMessage = (message == "#{sNotifyMessage59}");
 
         if(stat)
             mStaticMessageBox = box;
diff --git a/apps/openmw/mwgui/messagebox.hpp b/apps/openmw/mwgui/messagebox.hpp
index 26d26bac56..b7c8e91b99 100644
--- a/apps/openmw/mwgui/messagebox.hpp
+++ b/apps/openmw/mwgui/messagebox.hpp
@@ -69,6 +69,7 @@ namespace MWGui
 
             float mCurrentTime;
             float mMaxTime;
+            bool mIsEncumberedMessage;
 
         protected:
             MessageBoxManager& mMessageBoxManager;

From 11925b17ea7b28c9cc953527da2a56b886e17fe3 Mon Sep 17 00:00:00 2001
From: kuyondo <rdja.kyd@gmail.com>
Date: Wed, 24 Nov 2021 19:39:22 +0800
Subject: [PATCH 1779/2859] Remove mOverencumberedMessageDelay

---
 apps/openmw/mwinput/actionmanager.cpp | 9 +--------
 apps/openmw/mwinput/actionmanager.hpp | 1 -
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/apps/openmw/mwinput/actionmanager.cpp b/apps/openmw/mwinput/actionmanager.cpp
index 59bdc37bb8..3931517fab 100644
--- a/apps/openmw/mwinput/actionmanager.cpp
+++ b/apps/openmw/mwinput/actionmanager.cpp
@@ -39,7 +39,6 @@ namespace MWInput
         , mAlwaysRunActive(Settings::Manager::getBool("always run", "Input"))
         , mSneaking(false)
         , mAttemptJump(false)
-        , mOverencumberedMessageDelay(0.f)
         , mTimeIdle(0.f)
     {
     }
@@ -88,22 +87,16 @@ namespace MWInput
             {
                 player.setUpDown(1);
                 triedToMove = true;
-                mOverencumberedMessageDelay = 0.f;
             }
 
             // if player tried to start moving, but can't (due to being overencumbered), display a notification.
             if (triedToMove)
             {
                 MWWorld::Ptr playerPtr = MWBase::Environment::get().getWorld ()->getPlayerPtr();
-                mOverencumberedMessageDelay -= dt;
                 if (playerPtr.getClass().getEncumbrance(playerPtr) > playerPtr.getClass().getCapacity(playerPtr))
                 {
                     player.setAutoMove (false);
-                    if (mOverencumberedMessageDelay <= 0)
-                    {
-                        MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage59}");
-                        mOverencumberedMessageDelay = 1.0;
-                    }
+                    MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage59}");
                 }
             }
 
diff --git a/apps/openmw/mwinput/actionmanager.hpp b/apps/openmw/mwinput/actionmanager.hpp
index 4141767bcc..4c51139d46 100644
--- a/apps/openmw/mwinput/actionmanager.hpp
+++ b/apps/openmw/mwinput/actionmanager.hpp
@@ -67,7 +67,6 @@ namespace MWInput
         bool mSneaking;
         bool mAttemptJump;
 
-        float mOverencumberedMessageDelay;
         float mTimeIdle;
     };
 }

From 6b43ce066294c058de4b1c2908f8f60f8d59fd04 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 24 Nov 2021 19:10:02 +0100
Subject: [PATCH 1780/2859] Fix deadlock in physics system

1. Reorder unlock and notify_all calls to avoid notifying when not all worker
   threads are waiting.
2. Make sure main thread does not attempt to exclusively lock mSimulationMutex
   while not all workers are done with previous frame.
3. Replace mNewFrame flag by counter to avoid modification from multiple
   threads.
---
 apps/openmw/mwphysics/mtphysics.cpp | 39 ++++++++++++++++++++++++-----
 apps/openmw/mwphysics/mtphysics.hpp |  7 +++++-
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 5c49dee297..2f7e3b5995 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -267,7 +267,7 @@ namespace MWPhysics
           , mNumJobs(0)
           , mRemainingSteps(0)
           , mLOSCacheExpiry(Settings::Manager::getInt("lineofsight keep inactive cache", "Physics"))
-          , mNewFrame(false)
+          , mFrameCounter(0)
           , mAdvanceSimulation(false)
           , mQuit(false)
           , mNextJob(0)
@@ -302,13 +302,14 @@ namespace MWPhysics
 
     PhysicsTaskScheduler::~PhysicsTaskScheduler()
     {
+        waitForWorkers();
         {
             MaybeExclusiveLock lock(mSimulationMutex, mNumThreads);
             mQuit = true;
             mNumJobs = 0;
             mRemainingSteps = 0;
+            mHasJob.notify_all();
         }
-        mHasJob.notify_all();
         for (auto& thread : mThreads)
             thread.join();
     }
@@ -361,6 +362,8 @@ namespace MWPhysics
 
     void PhysicsTaskScheduler::applyQueuedMovements(float & timeAccum, std::vector<Simulation>&& simulations, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
     {
+        waitForWorkers();
+
         // This function run in the main thread.
         // While the mSimulationMutex is held, background physics threads can't run.
 
@@ -393,7 +396,7 @@ namespace MWPhysics
         mPhysicsDt = newDelta;
         mSimulations = std::move(simulations);
         mAdvanceSimulation = (mRemainingSteps != 0);
-        mNewFrame = true;
+        ++mFrameCounter;
         mNumJobs = mSimulations.size();
         mNextLOS.store(0, std::memory_order_relaxed);
         mNextJob.store(0, std::memory_order_release);
@@ -421,6 +424,7 @@ namespace MWPhysics
 
     void PhysicsTaskScheduler::resetSimulation(const ActorMap& actors)
     {
+        waitForWorkers();
         MaybeExclusiveLock lock(mSimulationMutex, mNumThreads);
         mBudget.reset(mDefaultPhysicsDt);
         mAsyncBudget.reset(0.0f);
@@ -577,11 +581,15 @@ namespace MWPhysics
 
     void PhysicsTaskScheduler::worker()
     {
+        std::size_t lastFrame = 0;
         std::shared_lock lock(mSimulationMutex);
         while (!mQuit)
         {
-            if (!mNewFrame)
-                mHasJob.wait(lock, [&]() { return mQuit || mNewFrame; });
+            if (lastFrame == mFrameCounter)
+            {
+                mHasJob.wait(lock, [&] { return mQuit || lastFrame != mFrameCounter; });
+                lastFrame = mFrameCounter;
+            }
 
             doSimulation();
         }
@@ -663,6 +671,7 @@ namespace MWPhysics
 
     void PhysicsTaskScheduler::releaseSharedStates()
     {
+        waitForWorkers();
         std::scoped_lock lock(mSimulationMutex, mUpdateAabbMutex);
         mSimulations.clear();
         mUpdateAabb.clear();
@@ -693,7 +702,6 @@ namespace MWPhysics
 
     void PhysicsTaskScheduler::afterPostSim()
     {
-        mNewFrame = false;
         {
             MaybeExclusiveLock lock(mLOSCacheMutex, mNumThreads);
             mLOSCache.erase(
@@ -702,6 +710,10 @@ namespace MWPhysics
                     mLOSCache.end());
         }
         mTimeEnd = mTimer->tick();
+
+        std::unique_lock lock(mWorkersDoneMutex);
+        ++mWorkersFrameCounter;
+        mWorkersDone.notify_all();
     }
 
     void PhysicsTaskScheduler::syncWithMainThread()
@@ -710,4 +722,19 @@ namespace MWPhysics
         for (auto& sim : mSimulations)
             std::visit(vis, sim);
     }
+
+    // Attempt to acquire unique lock on mSimulationMutex while not all worker
+    // threads are holding shared lock but will have to may lead to a deadlock because
+    // C++ standard does not guarantee priority for exclusive and shared locks
+    // for std::shared_mutex. For example microsoft STL implementation points out
+    // for the absence of such priority:
+    // https://docs.microsoft.com/en-us/windows/win32/sync/slim-reader-writer--srw--locks
+    void PhysicsTaskScheduler::waitForWorkers()
+    {
+        if (mNumThreads == 0)
+            return;
+        std::unique_lock lock(mWorkersDoneMutex);
+        if (mFrameCounter != mWorkersFrameCounter)
+            mWorkersDone.wait(lock);
+    }
 }
diff --git a/apps/openmw/mwphysics/mtphysics.hpp b/apps/openmw/mwphysics/mtphysics.hpp
index 44330b2cc6..9ded1262d6 100644
--- a/apps/openmw/mwphysics/mtphysics.hpp
+++ b/apps/openmw/mwphysics/mtphysics.hpp
@@ -74,6 +74,7 @@ namespace MWPhysics
             void afterPostStep();
             void afterPostSim();
             void syncWithMainThread();
+            void waitForWorkers();
 
             std::unique_ptr<WorldFrameData> mWorldFrameData;
             std::vector<Simulation> mSimulations;
@@ -95,13 +96,17 @@ namespace MWPhysics
             int mNumJobs;
             int mRemainingSteps;
             int mLOSCacheExpiry;
-            bool mNewFrame;
+            std::size_t mFrameCounter;
             bool mAdvanceSimulation;
             bool mQuit;
             std::atomic<int> mNextJob;
             std::atomic<int> mNextLOS;
             std::vector<std::thread> mThreads;
 
+            std::size_t mWorkersFrameCounter = 0;
+            std::condition_variable mWorkersDone;
+            std::mutex mWorkersDoneMutex;
+
             mutable std::shared_mutex mSimulationMutex;
             mutable std::shared_mutex mCollisionWorldMutex;
             mutable std::shared_mutex mLOSCacheMutex;

From d6f06fbf9a0030edb51aaeaf92b2ae8c361fbc5b Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 25 Nov 2021 22:00:52 +0100
Subject: [PATCH 1781/2859] Remove allies from combat when stopping combat

---
 CHANGELOG.md                                  |  1 +
 apps/openmw/mwbase/mechanicsmanager.hpp       |  3 +++
 apps/openmw/mwmechanics/actors.cpp            | 22 ++++++++++++++++---
 apps/openmw/mwmechanics/actors.hpp            |  2 ++
 apps/openmw/mwmechanics/aisequence.cpp        | 14 ++++++++++++
 apps/openmw/mwmechanics/aisequence.hpp        |  3 +++
 .../mwmechanics/mechanicsmanagerimp.cpp       |  5 +++++
 .../mwmechanics/mechanicsmanagerimp.hpp       |  2 ++
 apps/openmw/mwscript/aiextensions.cpp         |  3 +--
 9 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 174eb9e4b4..8332066203 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 ------
 
     Bug #1751: Birthsign abilities increase modified attribute values instead of base ones
+    Bug #1930: Followers are still fighting if a target stops combat with a leader
     Bug #3246: ESSImporter: Most NPCs are dead on save load
     Bug #3488: AI combat aiming is too slow
     Bug #3514: Editing a reference's position after loading an esp file makes the reference disappear
diff --git a/apps/openmw/mwbase/mechanicsmanager.hpp b/apps/openmw/mwbase/mechanicsmanager.hpp
index 6bedbb5b4d..484940e3e6 100644
--- a/apps/openmw/mwbase/mechanicsmanager.hpp
+++ b/apps/openmw/mwbase/mechanicsmanager.hpp
@@ -112,6 +112,9 @@ namespace MWBase
             /// Makes \a ptr fight \a target. Also shouts a combat taunt.
             virtual void startCombat (const MWWorld::Ptr& ptr, const MWWorld::Ptr& target) = 0;
 
+            /// Removes an actor and its allies from combat with the actor's targets.
+            virtual void stopCombat(const MWWorld::Ptr& ptr) = 0;
+
             enum OffenseType
             {
                 OT_Theft, // Taking items owned by an NPC or a faction you are not a member of
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index b3ddefec3f..ce2465ec97 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -443,6 +443,22 @@ namespace MWMechanics
         }
     }
 
+    void Actors::stopCombat(const MWWorld::Ptr& ptr)
+    {
+        auto& ai = ptr.getClass().getCreatureStats(ptr).getAiSequence();
+        std::vector<MWWorld::Ptr> targets;
+        if(ai.getCombatTargets(targets))
+        {
+            std::set<MWWorld::Ptr> allySet;
+            getActorsSidingWith(ptr, allySet);
+            std::vector<MWWorld::Ptr> allies(allySet.begin(), allySet.end());
+            for(const auto& ally : allies)
+                ally.getClass().getCreatureStats(ally).getAiSequence().stopCombat(targets);
+            for(const auto& target : targets)
+                target.getClass().getCreatureStats(target).getAiSequence().stopCombat(allies);
+        }
+    }
+
     void Actors::engageCombat (const MWWorld::Ptr& actor1, const MWWorld::Ptr& actor2, std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr> >& cachedAllies, bool againstPlayer)
     {
         // No combat for totally static creatures
@@ -979,7 +995,7 @@ namespace MWMechanics
                     // Calm witness down
                     if (ptr.getClass().isClass(ptr, "Guard"))
                         creatureStats.getAiSequence().stopPursuit();
-                    creatureStats.getAiSequence().stopCombat();
+                    stopCombat(ptr);
 
                     // Reset factors to attack
                     creatureStats.setAttacked(false);
@@ -1967,7 +1983,7 @@ namespace MWMechanics
             if (stats.isDead())
                 continue;
 
-            // An actor counts as siding with this actor if Follow or Escort is the current AI package, or there are only Combat and Wander packages before the Follow/Escort package
+            // An actor counts as siding with this actor if Follow or Escort is the current AI package, or there are only Wander packages before the Follow/Escort package
             // Actors that are targeted by this actor's Follow or Escort packages also side with them
             for (const auto& package : stats.getAiSequence())
             {
@@ -1983,7 +1999,7 @@ namespace MWMechanics
                     }
                     break;
                 }
-                else if (package->getTypeId() != AiPackageTypeId::Combat && package->getTypeId() != AiPackageTypeId::Wander)
+                else if (package->getTypeId() > AiPackageTypeId::Wander && package->getTypeId() <= AiPackageTypeId::Activate) // Don't count "fake" package types
                     break;
             }
         }
diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index 7d44fd06cd..f922be6556 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -111,6 +111,8 @@ namespace MWMechanics
             ///< This function is normally called automatically during the update process, but it can
             /// also be called explicitly at any time to force an update.
 
+            /// Removes an actor from combat and makes all of their allies stop fighting the actor's targets
+            void stopCombat(const MWWorld::Ptr& ptr);
             /** Start combat between two actors
                 @Notes: If againstPlayer = true then actor2 should be the Player.
                         If one of the combatants is creature it should be actor1.
diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index b1827dd8ef..545ec7f140 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -158,6 +158,7 @@ bool AiSequence::isInCombat(const MWWorld::Ptr &actor) const
     return false;
 }
 
+// TODO: use std::list::remove_if for all these methods when we switch to C++20
 void AiSequence::stopCombat()
 {
     for(auto it = mPackages.begin(); it != mPackages.end(); )
@@ -171,6 +172,19 @@ void AiSequence::stopCombat()
     }
 }
 
+void AiSequence::stopCombat(const std::vector<MWWorld::Ptr>& targets)
+{
+    for(auto it = mPackages.begin(); it != mPackages.end(); )
+    {
+        if ((*it)->getTypeId() == AiPackageTypeId::Combat && std::find(targets.begin(), targets.end(), (*it)->getTarget()) != targets.end())
+        {
+            it = mPackages.erase(it);
+        }
+        else
+            ++it;
+    }
+}
+
 void AiSequence::stopPursuit()
 {
     for(auto it = mPackages.begin(); it != mPackages.end(); )
diff --git a/apps/openmw/mwmechanics/aisequence.hpp b/apps/openmw/mwmechanics/aisequence.hpp
index 90bd999c91..77f6b2f7c0 100644
--- a/apps/openmw/mwmechanics/aisequence.hpp
+++ b/apps/openmw/mwmechanics/aisequence.hpp
@@ -102,6 +102,9 @@ namespace MWMechanics
             /// Removes all combat packages until first non-combat or stack empty.
             void stopCombat();
 
+            /// Removes all combat packages with the given targets
+            void stopCombat(const std::vector<MWWorld::Ptr>& targets);
+
             /// Has a package been completed during the last update?
             bool isPackageDone() const;
 
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 362df54ab7..cfaad486a2 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -1607,6 +1607,11 @@ namespace MWMechanics
         MWBase::Environment::get().getDialogueManager()->say(ptr, "attack");
     }
 
+    void MechanicsManager::stopCombat(const MWWorld::Ptr& actor)
+    {
+        mActors.stopCombat(actor);
+    }
+
     void MechanicsManager::getObjectsInRange(const osg::Vec3f &position, float radius, std::vector<MWWorld::Ptr> &objects)
     {
         mActors.getObjectsInRange(position, radius, objects);
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
index 06da2fde51..0f4c2e606a 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
@@ -102,6 +102,8 @@ namespace MWMechanics
             /// Makes \a ptr fight \a target. Also shouts a combat taunt.
             void startCombat (const MWWorld::Ptr& ptr, const MWWorld::Ptr& target) override;
 
+            void stopCombat(const MWWorld::Ptr& ptr) override;
+
             /**
              * @note victim may be empty
              * @param arg Depends on \a type, e.g. for Theft, the value of the item that was stolen.
diff --git a/apps/openmw/mwscript/aiextensions.cpp b/apps/openmw/mwscript/aiextensions.cpp
index 5ebc0bc529..b7b6de9463 100644
--- a/apps/openmw/mwscript/aiextensions.cpp
+++ b/apps/openmw/mwscript/aiextensions.cpp
@@ -515,8 +515,7 @@ namespace MWScript
                     MWWorld::Ptr actor = R()(runtime);
                     if (!actor.getClass().isActor())
                         return;
-                    MWMechanics::CreatureStats& creatureStats = actor.getClass().getCreatureStats(actor);
-                    creatureStats.getAiSequence().stopCombat();
+                    MWBase::Environment::get().getMechanicsManager()->stopCombat(actor);
                 }
         };
 

From 1f2311538dc344cd418ef682cbe2806bf342b110 Mon Sep 17 00:00:00 2001
From: kuyondo <rdja.kyd@gmail.com>
Date: Fri, 26 Nov 2021 05:20:58 +0800
Subject: [PATCH 1782/2859] vanilla style messagebox 2

---
 apps/openmw/mwbase/windowmanager.hpp   |  2 ++
 apps/openmw/mwgui/messagebox.cpp       | 11 +++++++++++
 apps/openmw/mwgui/messagebox.hpp       |  5 ++++-
 apps/openmw/mwgui/windowmanagerimp.cpp |  5 +++++
 apps/openmw/mwgui/windowmanagerimp.hpp |  1 +
 apps/openmw/mwinput/actionmanager.cpp  | 17 +++++++++++------
 apps/openmw/mwinput/actionmanager.hpp  |  1 -
 7 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index 961a63ac79..6a05a71703 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -69,6 +69,7 @@ namespace MWGui
     class DialogueWindow;
     class WindowModal;
     class JailScreen;
+    class MessageBox;
 
     enum ShowInDialogueMode {
         ShowInDialogueMode_IfPossible,
@@ -145,6 +146,7 @@ namespace MWBase
             virtual MWGui::CountDialog* getCountDialog() = 0;
             virtual MWGui::ConfirmationDialog* getConfirmationDialog() = 0;
             virtual MWGui::TradeWindow* getTradeWindow() = 0;
+            virtual std::vector<MWGui::MessageBox*> getActiveMessageBoxes() = 0;
 
             /// Make the player use an item, while updating GUI state accordingly
             virtual void useItem(const MWWorld::Ptr& item, bool force=false) = 0;
diff --git a/apps/openmw/mwgui/messagebox.cpp b/apps/openmw/mwgui/messagebox.cpp
index ed6633c983..738d28e189 100644
--- a/apps/openmw/mwgui/messagebox.cpp
+++ b/apps/openmw/mwgui/messagebox.cpp
@@ -161,6 +161,12 @@ namespace MWGui
         return false;
     }
 
+    std::vector<MessageBox*> MessageBoxManager::getActiveMessageBoxes()
+    {
+        return mMessageBoxes;
+    }
+
+
     int MessageBoxManager::readPressedButton (bool reset)
     {
         int pressed = mLastButtonPressed;
@@ -202,6 +208,11 @@ namespace MWGui
         mMainWidget->setPosition(pos);
     }
 
+    std::string MessageBox::getMessage()
+    { 
+        return mMessage;
+    }
+
     int MessageBox::getHeight ()
     {
         return mMainWidget->getHeight()+mNextBoxPadding;
diff --git a/apps/openmw/mwgui/messagebox.hpp b/apps/openmw/mwgui/messagebox.hpp
index 26d26bac56..746d558e6a 100644
--- a/apps/openmw/mwgui/messagebox.hpp
+++ b/apps/openmw/mwgui/messagebox.hpp
@@ -49,6 +49,8 @@ namespace MWGui
 
             void setVisible(bool value);
 
+            std::vector<MessageBox*> getActiveMessageBoxes();
+
         private:
             std::vector<MessageBox*> mMessageBoxes;
             InteractiveMessageBox* mInterMessageBoxe;
@@ -63,6 +65,7 @@ namespace MWGui
         public:
             MessageBox (MessageBoxManager& parMessageBoxManager, const std::string& message);
             void setMessage (const std::string& message);
+            std::string getMessage();
             int getHeight ();
             void update (int height);
             void setVisible(bool value);
@@ -72,7 +75,7 @@ namespace MWGui
 
         protected:
             MessageBoxManager& mMessageBoxManager;
-            const std::string& mMessage;
+            const std::string mMessage;
             MyGUI::EditBox* mMessageWidget;
             int mBottomPadding;
             int mNextBoxPadding;
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index a935d7f900..28a19a63ef 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -771,6 +771,11 @@ namespace MWGui
         mMessageBoxManager->removeStaticMessageBox();
     }
 
+    std::vector<MWGui::MessageBox*> WindowManager::getActiveMessageBoxes()
+    {
+        return mMessageBoxManager->getActiveMessageBoxes();
+    }
+
     int WindowManager::readPressedButton ()
     {
         return mMessageBoxManager->readPressedButton();
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index 9ec79e0c82..a4bc266a86 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -187,6 +187,7 @@ namespace MWGui
     MWGui::CountDialog* getCountDialog() override;
     MWGui::ConfirmationDialog* getConfirmationDialog() override;
     MWGui::TradeWindow* getTradeWindow() override;
+    std::vector<MWGui::MessageBox*> getActiveMessageBoxes() override;
 
     /// Make the player use an item, while updating GUI state accordingly
     void useItem(const MWWorld::Ptr& item, bool bypassBeastRestrictions=false) override;
diff --git a/apps/openmw/mwinput/actionmanager.cpp b/apps/openmw/mwinput/actionmanager.cpp
index 59bdc37bb8..180f3aa2fb 100644
--- a/apps/openmw/mwinput/actionmanager.cpp
+++ b/apps/openmw/mwinput/actionmanager.cpp
@@ -22,6 +22,8 @@
 #include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/actorutil.hpp"
 
+#include "../mwgui/messagebox.hpp"
+
 #include "actions.hpp"
 #include "bindingsmanager.hpp"
 
@@ -39,7 +41,6 @@ namespace MWInput
         , mAlwaysRunActive(Settings::Manager::getBool("always run", "Input"))
         , mSneaking(false)
         , mAttemptJump(false)
-        , mOverencumberedMessageDelay(0.f)
         , mTimeIdle(0.f)
     {
     }
@@ -88,22 +89,26 @@ namespace MWInput
             {
                 player.setUpDown(1);
                 triedToMove = true;
-                mOverencumberedMessageDelay = 0.f;
             }
 
             // if player tried to start moving, but can't (due to being overencumbered), display a notification.
             if (triedToMove)
             {
                 MWWorld::Ptr playerPtr = MWBase::Environment::get().getWorld ()->getPlayerPtr();
-                mOverencumberedMessageDelay -= dt;
                 if (playerPtr.getClass().getEncumbrance(playerPtr) > playerPtr.getClass().getCapacity(playerPtr))
                 {
                     player.setAutoMove (false);
-                    if (mOverencumberedMessageDelay <= 0)
+                    std::vector<MWGui::MessageBox*> msgboxs = MWBase::Environment::get().getWindowManager()->getActiveMessageBoxes();
+                    std::vector<MWGui::MessageBox*>::iterator it = std::find_if(msgboxs.begin(), msgboxs.end(), [](MWGui::MessageBox*& msg)
                     {
+                        return (msg->getMessage() == "#{sNotifyMessage59}");
+                    });
+
+                    // if an overencumbered messagebox is already present, reset its expiry timer, otherwise create new one.
+                    if (it != msgboxs.end())
+                        (*it)->mCurrentTime = 0;
+                    else
                         MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage59}");
-                        mOverencumberedMessageDelay = 1.0;
-                    }
                 }
             }
 
diff --git a/apps/openmw/mwinput/actionmanager.hpp b/apps/openmw/mwinput/actionmanager.hpp
index 4141767bcc..4c51139d46 100644
--- a/apps/openmw/mwinput/actionmanager.hpp
+++ b/apps/openmw/mwinput/actionmanager.hpp
@@ -67,7 +67,6 @@ namespace MWInput
         bool mSneaking;
         bool mAttemptJump;
 
-        float mOverencumberedMessageDelay;
         float mTimeIdle;
     };
 }

From df9f601ed74aef143b1487da34906e685e530a5b Mon Sep 17 00:00:00 2001
From: kuyondo <rdja.kyd@gmail.com>
Date: Sun, 28 Nov 2021 02:22:34 +0800
Subject: [PATCH 1783/2859] initialize constants

---
 apps/openmw/mwbase/windowmanager.hpp   | 2 +-
 apps/openmw/mwgui/messagebox.cpp       | 4 ++--
 apps/openmw/mwgui/messagebox.hpp       | 4 ++--
 apps/openmw/mwgui/windowmanagerimp.cpp | 2 +-
 apps/openmw/mwgui/windowmanagerimp.hpp | 2 +-
 apps/openmw/mwinput/actionmanager.cpp  | 7 ++++---
 apps/openmw/mwinput/actionmanager.hpp  | 2 ++
 7 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index 6a05a71703..e7d22bef92 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -146,7 +146,7 @@ namespace MWBase
             virtual MWGui::CountDialog* getCountDialog() = 0;
             virtual MWGui::ConfirmationDialog* getConfirmationDialog() = 0;
             virtual MWGui::TradeWindow* getTradeWindow() = 0;
-            virtual std::vector<MWGui::MessageBox*> getActiveMessageBoxes() = 0;
+            virtual const std::vector<MWGui::MessageBox*> getActiveMessageBoxes() = 0;
 
             /// Make the player use an item, while updating GUI state accordingly
             virtual void useItem(const MWWorld::Ptr& item, bool force=false) = 0;
diff --git a/apps/openmw/mwgui/messagebox.cpp b/apps/openmw/mwgui/messagebox.cpp
index 738d28e189..fa9a8007b7 100644
--- a/apps/openmw/mwgui/messagebox.cpp
+++ b/apps/openmw/mwgui/messagebox.cpp
@@ -161,7 +161,7 @@ namespace MWGui
         return false;
     }
 
-    std::vector<MessageBox*> MessageBoxManager::getActiveMessageBoxes()
+    const std::vector<MessageBox*> MessageBoxManager::getActiveMessageBoxes()
     {
         return mMessageBoxes;
     }
@@ -208,7 +208,7 @@ namespace MWGui
         mMainWidget->setPosition(pos);
     }
 
-    std::string MessageBox::getMessage()
+    const std::string MessageBox::getMessage()
     { 
         return mMessage;
     }
diff --git a/apps/openmw/mwgui/messagebox.hpp b/apps/openmw/mwgui/messagebox.hpp
index 746d558e6a..e01c54b9a5 100644
--- a/apps/openmw/mwgui/messagebox.hpp
+++ b/apps/openmw/mwgui/messagebox.hpp
@@ -49,7 +49,7 @@ namespace MWGui
 
             void setVisible(bool value);
 
-            std::vector<MessageBox*> getActiveMessageBoxes();
+            const std::vector<MessageBox*> getActiveMessageBoxes();
 
         private:
             std::vector<MessageBox*> mMessageBoxes;
@@ -65,7 +65,7 @@ namespace MWGui
         public:
             MessageBox (MessageBoxManager& parMessageBoxManager, const std::string& message);
             void setMessage (const std::string& message);
-            std::string getMessage();
+            const std::string getMessage();
             int getHeight ();
             void update (int height);
             void setVisible(bool value);
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 28a19a63ef..2eff1f6c84 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -771,7 +771,7 @@ namespace MWGui
         mMessageBoxManager->removeStaticMessageBox();
     }
 
-    std::vector<MWGui::MessageBox*> WindowManager::getActiveMessageBoxes()
+    const std::vector<MWGui::MessageBox*> WindowManager::getActiveMessageBoxes()
     {
         return mMessageBoxManager->getActiveMessageBoxes();
     }
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index a4bc266a86..10577c8485 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -187,7 +187,7 @@ namespace MWGui
     MWGui::CountDialog* getCountDialog() override;
     MWGui::ConfirmationDialog* getConfirmationDialog() override;
     MWGui::TradeWindow* getTradeWindow() override;
-    std::vector<MWGui::MessageBox*> getActiveMessageBoxes() override;
+    const std::vector<MWGui::MessageBox*> getActiveMessageBoxes() override;
 
     /// Make the player use an item, while updating GUI state accordingly
     void useItem(const MWWorld::Ptr& item, bool bypassBeastRestrictions=false) override;
diff --git a/apps/openmw/mwinput/actionmanager.cpp b/apps/openmw/mwinput/actionmanager.cpp
index 180f3aa2fb..84bdc7d12b 100644
--- a/apps/openmw/mwinput/actionmanager.cpp
+++ b/apps/openmw/mwinput/actionmanager.cpp
@@ -42,6 +42,7 @@ namespace MWInput
         , mSneaking(false)
         , mAttemptJump(false)
         , mTimeIdle(0.f)
+        , mOverencumberedMessage("#{sNotifyMessage59}")
     {
     }
 
@@ -99,16 +100,16 @@ namespace MWInput
                 {
                     player.setAutoMove (false);
                     std::vector<MWGui::MessageBox*> msgboxs = MWBase::Environment::get().getWindowManager()->getActiveMessageBoxes();
-                    std::vector<MWGui::MessageBox*>::iterator it = std::find_if(msgboxs.begin(), msgboxs.end(), [](MWGui::MessageBox*& msg)
+                    const std::vector<MWGui::MessageBox*>::iterator it = std::find_if(msgboxs.begin(), msgboxs.end(), [=](MWGui::MessageBox*& msgbox)
                     {
-                        return (msg->getMessage() == "#{sNotifyMessage59}");
+                        return (msgbox->getMessage() == mOverencumberedMessage);
                     });
 
                     // if an overencumbered messagebox is already present, reset its expiry timer, otherwise create new one.
                     if (it != msgboxs.end())
                         (*it)->mCurrentTime = 0;
                     else
-                        MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage59}");
+                        MWBase::Environment::get().getWindowManager()->messageBox(mOverencumberedMessage);
                 }
             }
 
diff --git a/apps/openmw/mwinput/actionmanager.hpp b/apps/openmw/mwinput/actionmanager.hpp
index 4c51139d46..b3deaed20e 100644
--- a/apps/openmw/mwinput/actionmanager.hpp
+++ b/apps/openmw/mwinput/actionmanager.hpp
@@ -67,6 +67,8 @@ namespace MWInput
         bool mSneaking;
         bool mAttemptJump;
 
+        const std::string mOverencumberedMessage;
+
         float mTimeIdle;
     };
 }

From 6e43206d690c14f57242fdbe7ebaf201e44d33d8 Mon Sep 17 00:00:00 2001
From: kuyondo <rdja.kyd@gmail.com>
Date: Sun, 28 Nov 2021 04:58:49 +0800
Subject: [PATCH 1784/2859] remove empty/redundant lines

---
 apps/openmw/mwgui/messagebox.cpp | 11 -----------
 apps/openmw/mwgui/messagebox.hpp |  1 -
 2 files changed, 12 deletions(-)

diff --git a/apps/openmw/mwgui/messagebox.cpp b/apps/openmw/mwgui/messagebox.cpp
index 1eee2bb857..ef9ad73437 100644
--- a/apps/openmw/mwgui/messagebox.cpp
+++ b/apps/openmw/mwgui/messagebox.cpp
@@ -93,19 +93,10 @@ namespace MWGui
 
     void MessageBoxManager::createMessageBox (const std::string& message, bool stat)
     {
-        if (message == "#{sNotifyMessage59}")
-            for (MessageBox* messageBox : mMessageBoxes)
-                if (messageBox->mIsEncumberedMessage)
-                {
-                    messageBox->mCurrentTime = 0;
-                    return;
-                }
-
         MessageBox *box = new MessageBox(*this, message);
         box->mCurrentTime = 0;
         std::string realMessage = MyGUI::LanguageManager::getInstance().replaceTags(message);
         box->mMaxTime = realMessage.length()*mMessageBoxSpeed;
-        box->mIsEncumberedMessage = (message == "#{sNotifyMessage59}");
 
         if(stat)
             mStaticMessageBox = box;
@@ -154,7 +145,6 @@ namespace MWGui
         return mInterMessageBoxe != nullptr;
     }
 
-
     bool MessageBoxManager::removeMessageBox (MessageBox *msgbox)
     {
         std::vector<MessageBox*>::iterator it;
@@ -175,7 +165,6 @@ namespace MWGui
         return mMessageBoxes;
     }
 
-
     int MessageBoxManager::readPressedButton (bool reset)
     {
         int pressed = mLastButtonPressed;
diff --git a/apps/openmw/mwgui/messagebox.hpp b/apps/openmw/mwgui/messagebox.hpp
index 6a4cda948e..e01c54b9a5 100644
--- a/apps/openmw/mwgui/messagebox.hpp
+++ b/apps/openmw/mwgui/messagebox.hpp
@@ -72,7 +72,6 @@ namespace MWGui
 
             float mCurrentTime;
             float mMaxTime;
-            bool mIsEncumberedMessage;
 
         protected:
             MessageBoxManager& mMessageBoxManager;

From e9f8c3437292d16dea754f702f3d3a6feee28346 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sun, 28 Nov 2021 11:31:34 +0000
Subject: [PATCH 1785/2859] Correctly set UI properties to defaults when passed
 nil

---
 components/CMakeLists.txt        |  3 +-
 components/lua_ui/element.cpp    | 13 +-----
 components/lua_ui/properties.hpp | 64 ++++++++++++++++++++++++++++++
 components/lua_ui/text.cpp       | 22 ++---------
 components/lua_ui/text.hpp       |  2 +-
 components/lua_ui/textedit.cpp   | 15 ++-----
 components/lua_ui/textedit.hpp   |  3 +-
 components/lua_ui/widget.cpp     | 68 ++++++--------------------------
 components/lua_ui/widget.hpp     | 15 ++++---
 components/lua_ui/window.cpp     | 28 ++++++-------
 components/lua_ui/window.hpp     |  5 ++-
 11 files changed, 112 insertions(+), 126 deletions(-)
 create mode 100644 components/lua_ui/properties.hpp

diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 56371a8c02..3ea44f1f11 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -162,7 +162,8 @@ add_component_dir (queries
     )
     
 add_component_dir (lua_ui
-    widget widgetlist element content text textedit window
+    widget widgetlist element content
+    text textedit window
     )
 
 
diff --git a/components/lua_ui/element.cpp b/components/lua_ui/element.cpp
index 258da5269f..1a1b38e4dc 100644
--- a/components/lua_ui/element.cpp
+++ b/components/lua_ui/element.cpp
@@ -24,18 +24,7 @@ namespace LuaUi
 
     void setProperties(LuaUi::WidgetExtension* ext, const sol::table& layout)
     {
-        auto props = layout.get<sol::optional<sol::table>>("props");
-        if (props.has_value())
-        {
-            props.value().for_each([ext](const sol::object& key, const sol::object& value)
-                {
-                    if (key.is<std::string_view>())
-                        ext->setProperty(key.as<std::string_view>(), value);
-                    else
-                        Log(Debug::Warning) << "UI property key must be a string";
-                });
-            ext->updateCoord();
-        }
+        ext->setProperties(layout.get<sol::object>("props"));
     }
 
     void setEventCallbacks(LuaUi::WidgetExtension* ext, const sol::table& layout)
diff --git a/components/lua_ui/properties.hpp b/components/lua_ui/properties.hpp
new file mode 100644
index 0000000000..7f23a5ce6c
--- /dev/null
+++ b/components/lua_ui/properties.hpp
@@ -0,0 +1,64 @@
+#ifndef OPENMW_LUAUI_PROPERTIES
+#define OPENMW_LUAUI_PROPERTIES
+
+#include <sol/sol.hpp>
+#include <MyGUI_Types.h>
+#include <osg/Vec2>
+
+#include <components/lua/luastate.hpp>
+
+namespace LuaUi
+{
+    template <typename T>
+    sol::optional<T> getProperty(sol::object from, std::string_view field) {
+        sol::object value = LuaUtil::getFieldOrNil(from, field);
+        if (value == sol::nil)
+            return sol::nullopt;
+        if (value.is<T>())
+            return value.as<T>();
+        std::string error("Property \"");
+        error += field;
+        error += "\" has an invalid value \"";
+        error += LuaUtil::toString(value);
+        error += "\"";
+        throw std::logic_error(error);
+    }
+
+    template<typename T>
+    T parseProperty(sol::object from, std::string_view field, const T& defaultValue)
+    {
+        sol::optional<T> opt = getProperty<T>(from, field);
+        if (opt.has_value())
+            return opt.value();
+        else
+            return defaultValue;
+    }
+
+    template <typename T>
+    MyGUI::types::TPoint<T> parseProperty(
+        sol::object from,
+        std::string_view field,
+        const MyGUI::types::TPoint<T>& defaultValue)
+    {
+        auto v = getProperty<osg::Vec2f>(from, field);
+        if (v.has_value())
+            return MyGUI::types::TPoint<T>(v.value().x(), v.value().y());
+        else
+            return defaultValue;
+    }
+
+    template <typename T>
+    MyGUI::types::TSize<T> parseProperty(
+        sol::object from,
+        std::string_view field,
+        const MyGUI::types::TSize<T>& defaultValue)
+    {
+        auto v = getProperty<osg::Vec2f>(from, field);
+        if (v.has_value())
+            return MyGUI::types::TSize<T>(v.value().x(), v.value().y());
+        else
+            return defaultValue;
+    }
+}
+
+#endif // !OPENMW_LUAUI_PROPERTIES
diff --git a/components/lua_ui/text.cpp b/components/lua_ui/text.cpp
index 571bdaf403..4ae9865ac3 100644
--- a/components/lua_ui/text.cpp
+++ b/components/lua_ui/text.cpp
@@ -12,25 +12,11 @@ namespace LuaUi
         WidgetExtension::initialize();
     }
 
-    bool LuaText::setPropertyRaw(std::string_view name, sol::object value)
+    void LuaText::setProperties(sol::object props)
     {
-        if (name == "caption")
-        {
-            if (!value.is<std::string>())
-                return false;
-            setCaption(value.as<std::string>());
-        }
-        else if (name == "autoSize")
-        {
-            if (!value.is<bool>())
-                return false;
-            mAutoSized = value.as<bool>();
-        }
-        else
-        {
-            return WidgetExtension::setPropertyRaw(name, value);
-        }
-        return true;
+        setCaption(parseProperty(props, "caption", std::string()));
+        mAutoSized = parseProperty(props, "autoSize", true);
+        WidgetExtension::setProperties(props);
     }
 
     MyGUI::IntSize LuaText::calculateSize()
diff --git a/components/lua_ui/text.hpp b/components/lua_ui/text.hpp
index 90a3fc563c..d87a9001a2 100644
--- a/components/lua_ui/text.hpp
+++ b/components/lua_ui/text.hpp
@@ -14,13 +14,13 @@ namespace LuaUi
         public:
             LuaText();
             virtual void initialize() override;
+            virtual void setProperties(sol::object) override;
 
         private:
             bool mAutoSized;
 
         protected:
             virtual MyGUI::IntSize calculateSize() override;
-            bool setPropertyRaw(std::string_view name, sol::object value) override;
     };
 }
 
diff --git a/components/lua_ui/textedit.cpp b/components/lua_ui/textedit.cpp
index 2324a770c2..9cdc716ce4 100644
--- a/components/lua_ui/textedit.cpp
+++ b/components/lua_ui/textedit.cpp
@@ -2,18 +2,9 @@
 
 namespace LuaUi
 {
-    bool LuaTextEdit::setPropertyRaw(std::string_view name, sol::object value)
+    void LuaTextEdit::setProperties(sol::object props)
     {
-        if (name == "caption")
-        {
-            if (!value.is<std::string>())
-                return false;
-            setCaption(value.as<std::string>());
-        }
-        else
-        {
-            return WidgetExtension::setPropertyRaw(name, value);
-        }
-        return true;
+        setCaption(parseProperty(props, "caption", std::string()));
+        WidgetExtension::setProperties(props);
     }
 }
diff --git a/components/lua_ui/textedit.hpp b/components/lua_ui/textedit.hpp
index 3eb5b471c3..d14f54d659 100644
--- a/components/lua_ui/textedit.hpp
+++ b/components/lua_ui/textedit.hpp
@@ -11,8 +11,7 @@ namespace LuaUi
     {
         MYGUI_RTTI_DERIVED(LuaTextEdit)
 
-        protected:
-            bool setPropertyRaw(std::string_view name, sol::object value) override;
+        virtual void setProperties(sol::object) override;
     };
 }
 
diff --git a/components/lua_ui/widget.cpp b/components/lua_ui/widget.cpp
index 3ce07273f8..ef876e8a06 100644
--- a/components/lua_ui/widget.cpp
+++ b/components/lua_ui/widget.cpp
@@ -142,19 +142,12 @@ namespace LuaUi
         mCallbacks.clear();
     }
 
-    void WidgetExtension::setProperty(std::string_view name, sol::object value)
-    {
-        if (!setPropertyRaw(name, value))
-            Log(Debug::Error) << "Invalid value of property " << name
-                              << ": " << LuaUtil::toString(value);
-    }
-
-    MyGUI::IntCoord WidgetExtension::forcedOffset()
+    MyGUI::IntCoord WidgetExtension::forcedCoord()
     {
         return mForcedCoord;
     }
 
-    void WidgetExtension::setForcedOffset(const MyGUI::IntCoord& offset)
+    void WidgetExtension::setForcedCoord(const MyGUI::IntCoord& offset)
     {
         mForcedCoord = offset;
     }
@@ -164,55 +157,16 @@ namespace LuaUi
         mWidget->setCoord(calculateCoord());
     }
 
-    bool WidgetExtension::setPropertyRaw(std::string_view name, sol::object value)
+    void WidgetExtension::setProperties(sol::object props)
     {
-        if (name == "position")
-        {
-            if (!value.is<osg::Vec2f>())
-                return false;
-            auto v = value.as<osg::Vec2f>();
-            mAbsoluteCoord.left = v.x();
-            mAbsoluteCoord.top = v.y();
-        }
-        else if (name == "size")
-        {
-            if (!value.is<osg::Vec2f>())
-                return false;
-            auto v = value.as<osg::Vec2f>();
-            mAbsoluteCoord.width = v.x();
-            mAbsoluteCoord.height = v.y();
-        }
-        else if (name == "relativePosition")
-        {
-            if (!value.is<osg::Vec2f>())
-                return false;
-            auto v = value.as<osg::Vec2f>();
-            mRelativeCoord.left = v.x();
-            mRelativeCoord.top = v.y();
-        }
-        else if (name == "relativeSize")
-        {
-            if (!value.is<osg::Vec2f>())
-                return false;
-            auto v = value.as<osg::Vec2f>();
-            mRelativeCoord.width = v.x();
-            mRelativeCoord.height = v.y();
-        }
-        else if (name == "anchor")
-        {
-            if (!value.is<osg::Vec2f>())
-                return false;
-            auto v = value.as<osg::Vec2f>();
-            mAnchor.width = v.x();
-            mAnchor.height = v.y();
-        }
-        else if (name == "visible")
-        {
-            if (!value.is<bool>())
-                return false;
-            mWidget->setVisible(value.as<bool>());
-        }
-        return true;
+        mAbsoluteCoord = parseProperty(props, "position", MyGUI::IntPoint());
+        mAbsoluteCoord = parseProperty(props, "size", MyGUI::IntSize());
+        mRelativeCoord = parseProperty(props, "relativePosition", MyGUI::FloatPoint());
+        mRelativeCoord = parseProperty(props, "relativeSize", MyGUI::FloatSize());
+        mAnchor = parseProperty(props, "anchor", MyGUI::FloatSize());
+        mWidget->setVisible(parseProperty(props, "visible", true));
+
+        updateCoord();
     }
 
     void WidgetExtension::updateChildrenCoord(MyGUI::Widget* _widget)
diff --git a/components/lua_ui/widget.hpp b/components/lua_ui/widget.hpp
index 48b169572f..360c6483ba 100644
--- a/components/lua_ui/widget.hpp
+++ b/components/lua_ui/widget.hpp
@@ -5,10 +5,11 @@
 
 #include <MyGUI_Widget.h>
 #include <sol/sol.hpp>
-#include <osg/Vec2>
 
 #include <components/lua/scriptscontainer.hpp>
 
+#include "properties.hpp"
+
 namespace LuaUi
 {
     /*
@@ -36,17 +37,16 @@ namespace LuaUi
         void setCallback(const std::string&, const LuaUtil::Callback&);
         void clearCallbacks();
 
-        void setProperty(std::string_view, sol::object value);
+        virtual void setProperties(sol::object);
 
-        MyGUI::IntCoord forcedOffset();
-        void setForcedOffset(const MyGUI::IntCoord& offset);
+        MyGUI::IntCoord forcedCoord();
+        void setForcedCoord(const MyGUI::IntCoord& offset);
         void updateCoord();
 
     protected:
         sol::table makeTable() const;
         sol::object keyEvent(MyGUI::KeyCode) const;
         sol::object mouseEvent(int left, int top, MyGUI::MouseButton button) const;
-        virtual bool setPropertyRaw(std::string_view name, sol::object value);
         virtual void initialize();
         virtual void deinitialize();
         virtual MyGUI::IntSize calculateSize();
@@ -55,9 +55,14 @@ namespace LuaUi
 
         void triggerEvent(std::string_view name, const sol::object& argument) const;
 
+        // offsets the position and size, used only in C++ widget code
         MyGUI::IntCoord mForcedCoord;
+        // position and size in pixels
         MyGUI::IntCoord mAbsoluteCoord;
+        // position and size as a ratio of parent size
         MyGUI::FloatCoord mRelativeCoord;
+        // negative position offset as a ratio of this widget's size
+        // used in combination with relative coord to align the widget, e. g. center it
         MyGUI::FloatSize mAnchor;
 
     private:
diff --git a/components/lua_ui/window.cpp b/components/lua_ui/window.cpp
index b7bb426a63..5d34bf8212 100644
--- a/components/lua_ui/window.cpp
+++ b/components/lua_ui/window.cpp
@@ -8,6 +8,7 @@ namespace LuaUi
         : mCaption()
         , mPreviousMouse()
         , mChangeScale()
+        , mMoveResize()
     {}
 
     void LuaWindow::initialize()
@@ -43,20 +44,13 @@ namespace LuaUi
         }
     }
 
-    bool LuaWindow::setPropertyRaw(std::string_view name, sol::object value)
+    void LuaWindow::setProperties(sol::object props)
     {
-        if (name == "caption")
-        {
-            if (!value.is<std::string>())
-                return false;
-            if (mCaption)
-                mCaption->setCaption(value.as<std::string>());
-        }
-        else
-        {
-            return WidgetExtension::setPropertyRaw(name, value);
-        }
-        return true;
+        if (mCaption)
+            mCaption->setCaption(parseProperty(props, "caption", std::string()));
+        mMoveResize = MyGUI::IntCoord();
+        setForcedCoord(mMoveResize);
+        WidgetExtension::setProperties(props);
     }
 
     void LuaWindow::notifyMousePress(MyGUI::Widget* sender, int left, int top, MyGUI::MouseButton id)
@@ -84,9 +78,11 @@ namespace LuaUi
         change.width *= (left - mPreviousMouse.left);
         change.height *= (top - mPreviousMouse.top);
 
-        setForcedOffset(forcedOffset() + change.size());
-        MyGUI::IntPoint positionOffset = change.point() + getPosition() - calculateCoord().point();
-        setForcedOffset(forcedOffset() + positionOffset);
+        mMoveResize = mMoveResize + change.size();
+        setForcedCoord(mMoveResize);
+        // position can change based on size changes
+        mMoveResize = mMoveResize + change.point() + getPosition() - calculateCoord().point();
+        setForcedCoord(mMoveResize);
         updateCoord();
 
         mPreviousMouse.left = left;
diff --git a/components/lua_ui/window.hpp b/components/lua_ui/window.hpp
index c04b0a6055..f34779c8f7 100644
--- a/components/lua_ui/window.hpp
+++ b/components/lua_ui/window.hpp
@@ -15,6 +15,7 @@ namespace LuaUi
 
         public:
             LuaWindow();
+            virtual void setProperties(sol::object) override;
 
         private:
             // \todo replace with LuaText when skins are properly implemented
@@ -22,12 +23,12 @@ namespace LuaUi
             MyGUI::IntPoint mPreviousMouse;
             MyGUI::IntCoord mChangeScale;
 
+            MyGUI::IntCoord mMoveResize;
+
         protected:
             virtual void initialize() override;
             virtual void deinitialize() override;
 
-            bool setPropertyRaw(std::string_view name, sol::object value) override;
-
             void notifyMousePress(MyGUI::Widget*, int, int, MyGUI::MouseButton);
             void notifyMouseDrag(MyGUI::Widget*, int, int, MyGUI::MouseButton);
     };

From 989f09930a95c1f3adf3be36040ec32d3c130e40 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sun, 28 Nov 2021 18:58:40 +0100
Subject: [PATCH 1786/2859] Use the scaled mesh translation for collision shape
 position for living actors. It seems only (some) dead actors really needs to
 use the vertical half-extent.

---
 apps/openmw/mwphysics/actor.hpp          | 6 +++---
 apps/openmw/mwphysics/movementsolver.cpp | 4 ----
 apps/openmw/mwphysics/physicssystem.cpp  | 3 ++-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index 01d8037f6b..cdf49eeb54 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -158,6 +158,9 @@ namespace MWPhysics
 
         bool canMoveToWaterSurface(float waterlevel, const btCollisionWorld* world) const;
 
+        /// Returns the mesh translation, scaled and rotated as necessary
+        osg::Vec3f getScaledMeshTranslation() const;
+
     private:
         MWWorld::Ptr mStandingOnPtr;
         /// Removes then re-adds the collision object to the dynamics world
@@ -165,9 +168,6 @@ namespace MWPhysics
         void addCollisionMask(int collisionMask);
         int getCollisionMask() const;
 
-        /// Returns the mesh translation, scaled and rotated as necessary
-        osg::Vec3f getScaledMeshTranslation() const;
-
         bool mCanWaterWalk;
         bool mWalkingOnWater;
 
diff --git a/apps/openmw/mwphysics/movementsolver.cpp b/apps/openmw/mwphysics/movementsolver.cpp
index fc2ea57b40..fff4606c7f 100644
--- a/apps/openmw/mwphysics/movementsolver.cpp
+++ b/apps/openmw/mwphysics/movementsolver.cpp
@@ -134,8 +134,6 @@ namespace MWPhysics
 
         // Adjust for collision mesh offset relative to actor's "location"
         // (doTrace doesn't take local/interior collision shape translation into account, so we have to do it on our own)
-        // for compatibility with vanilla assets, we have to derive this from the vertical half extent instead of from internal hull translation
-        // if not for this hack, the "correct" collision hull position would be physicActor->getScaledMeshTranslation()
         actor.mPosition.z() += actor.mHalfExtentsZ; // vanilla-accurate
 
         float swimlevel = actor.mSwimLevel + actor.mHalfExtentsZ;
@@ -449,8 +447,6 @@ namespace MWPhysics
             }
         }
 
-        // use vanilla-accurate collision hull position hack (do same hitbox offset hack as movement solver)
-        // if vanilla compatibility didn't matter, the "correct" collision hull position would be physicActor->getScaledMeshTranslation()
         const auto verticalHalfExtent = osg::Vec3f(0.0, 0.0, actor.mHalfExtentsZ);
 
         // use a 3d approximation of the movement vector to better judge player intent
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 98e3bcf737..c2a4402d27 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -934,7 +934,8 @@ namespace MWPhysics
         , mRotation()
         , mMovement(actor.velocity())
         , mWaterlevel(waterlevel)
-        , mHalfExtentsZ(actor.getHalfExtents().z())
+        // for compatibility with vanilla assets, mesh offset is the actor halfextent for dead actors
+        , mHalfExtentsZ(actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isDead() ? actor.getHalfExtents().z() : actor.getScaledMeshTranslation().z())
         , mOldHeight(0)
         , mStuckFrames(0)
         , mFlying(MWBase::Environment::get().getWorld()->isFlying(actor.getPtr()))

From bc4b54157b4b5e558e8fc25072b708a1b48ba0ce Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Sun, 28 Nov 2021 20:30:16 +0000
Subject: [PATCH 1787/2859] Remove commented-out test conditions

---
 apps/openmw_test_suite/openmw/options.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/openmw_test_suite/openmw/options.cpp b/apps/openmw_test_suite/openmw/options.cpp
index 9b8535ea36..04c209e8a4 100644
--- a/apps/openmw_test_suite/openmw/options.cpp
+++ b/apps/openmw_test_suite/openmw/options.cpp
@@ -113,7 +113,6 @@ namespace
         bpo::variables_map variables;
         parseArgs(arguments, variables, description);
         EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), R"(save)");
-//        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), R"("save".omwsave)");
     }
 
     TEST(OpenMWOptionsFromArguments, should_support_quoted_load_savegame_path_with_escaped_quote_by_ampersand)
@@ -222,7 +221,6 @@ namespace
         bpo::variables_map variables;
         Files::parseConfig(stream, variables, description);
         EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), "");
-//        EXPECT_EQ(variables["load-savegame"].as<Files::MaybeQuotedPath>().string(), R"(""save".omwsave")");
     }
 
     TEST(OpenMWOptionsFromConfig, should_strip_quotes_from_load_savegame_path_with_space)

From 5e9d460032d523a90628c61717ef6fcb187e80fc Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Sun, 28 Nov 2021 20:33:17 +0000
Subject: [PATCH 1788/2859] Remove redundant conversion operator

---
 components/files/configurationmanager.hpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/components/files/configurationmanager.hpp b/components/files/configurationmanager.hpp
index 0c4d2dc835..4b641c12fd 100644
--- a/components/files/configurationmanager.hpp
+++ b/components/files/configurationmanager.hpp
@@ -79,8 +79,6 @@ void parseConfig(std::istream& stream, boost::program_options::variables_map& va
 
 class MaybeQuotedPath : public boost::filesystem::path
 {
-public:
-    operator boost::filesystem::path() { return *this; }
 };
 
 std::istream& operator>> (std::istream& istream, MaybeQuotedPath& MaybeQuotedPath);

From 01a9eaf4a85dd1355d8c8fdf36705b5f83b392ea Mon Sep 17 00:00:00 2001
From: kuyondo <rdja.kyd@gmail.com>
Date: Mon, 29 Nov 2021 19:04:34 +0800
Subject: [PATCH 1789/2859] fix#6451

---
 apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 362df54ab7..e16bfd4794 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -289,13 +289,8 @@ namespace MWMechanics
         MWWorld::Ptr ptr = getPlayer();
         MWBase::WindowManager *winMgr = MWBase::Environment::get().getWindowManager();
 
-        // Update the equipped weapon icon
         MWWorld::InventoryStore& inv = ptr.getClass().getInventoryStore(ptr);
         MWWorld::ContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
-        if (weapon == inv.end())
-            winMgr->unsetSelectedWeapon();
-        else
-            winMgr->setSelectedWeapon(*weapon);
 
         // Update the selected spell icon
         MWWorld::ContainerStoreIterator enchantItem = inv.getSelectedEnchantItem();
@@ -310,6 +305,12 @@ namespace MWMechanics
                 winMgr->unsetSelectedSpell();
         }
 
+        // Update the equipped weapon icon
+        if (weapon == inv.end())
+            winMgr->unsetSelectedWeapon();
+        else
+            winMgr->setSelectedWeapon(*weapon);
+
         if (mUpdatePlayer)
         {
             mUpdatePlayer = false;

From 5f355a14cdda016535863a8e75332ba097628517 Mon Sep 17 00:00:00 2001
From: Thomas Lowe <musicaltommy@gmail.com>
Date: Mon, 29 Nov 2021 07:18:49 -0500
Subject: [PATCH 1790/2859] Changed default setting for anti-alias alpha test
 to true. Added checkbox in advanced page for anti-alias alpha test, connected
 to AA combobox in the graphics page.

---
 apps/launcher/advancedpage.cpp | 12 ++++++++++++
 apps/launcher/advancedpage.hpp |  1 +
 apps/launcher/graphicspage.cpp |  3 +++
 apps/launcher/graphicspage.hpp |  4 ++++
 apps/launcher/maindialog.cpp   |  2 +-
 files/settings-default.cfg     |  2 +-
 files/ui/advancedpage.ui       | 10 ++++++++++
 7 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index af1fa255db..c7e228878c 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -118,6 +118,11 @@ bool Launcher::AdvancedPage::loadSettings()
         loadSettingBool(bumpMapLocalLightingCheckBox, "apply lighting to environment maps", "Shaders");
         loadSettingBool(radialFogCheckBox, "radial fog", "Shaders");
         loadSettingBool(softParticlesCheckBox, "soft particles", "Shaders");
+        loadSettingBool(antialiasAlphaTestCheckBox, "antialias alpha test", "Shaders");
+        if (Settings::Manager::getInt("antialiasing", "Video") == 0) {
+            antialiasAlphaTestCheckBox->setCheckState(Qt::Unchecked);
+            antialiasAlphaTestCheckBox->setEnabled(false);
+        }
         loadSettingBool(magicItemAnimationsCheckBox, "use magic item animations", "Game");
         connect(animSourcesCheckBox, SIGNAL(toggled(bool)), this, SLOT(slotAnimSourcesToggled(bool)));
         loadSettingBool(animSourcesCheckBox, "use additional anim sources", "Game");
@@ -268,6 +273,7 @@ void Launcher::AdvancedPage::saveSettings()
         saveSettingBool(bumpMapLocalLightingCheckBox, "apply lighting to environment maps", "Shaders");
         saveSettingBool(radialFogCheckBox, "radial fog", "Shaders");
         saveSettingBool(softParticlesCheckBox, "soft particles", "Shaders");
+        saveSettingBool(antialiasAlphaTestCheckBox, "antialias alpha test", "Shaders");
         saveSettingBool(magicItemAnimationsCheckBox, "use magic item animations", "Game");
         saveSettingBool(animSourcesCheckBox, "use additional anim sources", "Game");
         saveSettingBool(weaponSheathingCheckBox, "weapon sheathing", "Game");
@@ -439,6 +445,12 @@ void Launcher::AdvancedPage::slotLoadedCellsChanged(QStringList cellNames)
     loadCellsForAutocomplete(cellNames);
 }
 
+void Launcher::AdvancedPage::slotAASettingChanged(int aaLevel) {
+    antialiasAlphaTestCheckBox->setEnabled(aaLevel > 0);
+    if (aaLevel == 0)
+        antialiasAlphaTestCheckBox->setCheckState(Qt::Unchecked);
+}
+
 void Launcher::AdvancedPage::slotAnimSourcesToggled(bool checked)
 {
     weaponSheathingCheckBox->setEnabled(checked);
diff --git a/apps/launcher/advancedpage.hpp b/apps/launcher/advancedpage.hpp
index 1d16fae706..e26f1690e9 100644
--- a/apps/launcher/advancedpage.hpp
+++ b/apps/launcher/advancedpage.hpp
@@ -24,6 +24,7 @@ namespace Launcher
 
     public slots:
         void slotLoadedCellsChanged(QStringList cellNames);
+        void slotAASettingChanged(int aaLevel);
 
     private slots:
         void on_skipMenuCheckBox_stateChanged(int state);
diff --git a/apps/launcher/graphicspage.cpp b/apps/launcher/graphicspage.cpp
index 8359834ddb..06cc98c741 100644
--- a/apps/launcher/graphicspage.cpp
+++ b/apps/launcher/graphicspage.cpp
@@ -47,7 +47,10 @@ Launcher::GraphicsPage::GraphicsPage(QWidget *parent)
     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)));
+}
 
+void Launcher::GraphicsPage::connectAntiAliasingChanged(const QObject* receiver, const char* slot) {
+    connect(antiAliasingComboBox, SIGNAL(currentIndexChanged(int)), receiver, slot);
 }
 
 bool Launcher::GraphicsPage::setupSDL()
diff --git a/apps/launcher/graphicspage.hpp b/apps/launcher/graphicspage.hpp
index a6754ccb04..9275bf8e3d 100644
--- a/apps/launcher/graphicspage.hpp
+++ b/apps/launcher/graphicspage.hpp
@@ -20,12 +20,16 @@ namespace Launcher
     public:
         explicit GraphicsPage(QWidget *parent = nullptr);
 
+        void connectAntiAliasingChanged(const QObject *receiver, const char *slot);
         void saveSettings();
         bool loadSettings();
 
     public slots:
         void screenChanged(int screen);
 
+    signals:
+        void signalAntiAliasingChanged(int aaValue);
+
     private slots:
         void slotFullScreenChanged(int state);
         void slotStandardToggled(bool checked);
diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp
index 75d4464b68..d58be7afcf 100644
--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@@ -146,7 +146,7 @@ void Launcher::MainDialog::createPages()
     connect(mDataFilesPage, SIGNAL(signalProfileChanged(int)), mPlayPage, SLOT(setProfilesIndex(int)));
     // Using Qt::QueuedConnection because signal is emitted in a subthread and slot is in the main thread
     connect(mDataFilesPage, SIGNAL(signalLoadedCellsChanged(QStringList)), mAdvancedPage, SLOT(slotLoadedCellsChanged(QStringList)), Qt::QueuedConnection);
-
+    mGraphicsPage->connectAntiAliasingChanged(mAdvancedPage, SLOT(slotAASettingChanged(int)));
 }
 
 Launcher::FirstRunDialogResult Launcher::MainDialog::showFirstRunDialog()
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index c0083e4238..0e2c329ff2 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -492,7 +492,7 @@ minimum interior brightness = 0.08
 # Convert the alpha test (cutout/punchthrough alpha) to alpha-to-coverage.
 # This allows MSAA to work with alpha-tested meshes, producing better-looking edges without pixelation.
 # When MSAA is off, this setting will have no visible effect, but might have a performance cost.
-antialias alpha test = false
+antialias alpha test = true
 
 # Soften intersection of blended particle systems with opaque geometry
 soft particles = false
diff --git a/files/ui/advancedpage.ui b/files/ui/advancedpage.ui
index 0e80f02700..0952e660d8 100644
--- a/files/ui/advancedpage.ui
+++ b/files/ui/advancedpage.ui
@@ -454,6 +454,16 @@
                 </property>
                </widget>
               </item>
+               <item row="3" column="1">
+                 <widget class="QCheckBox" name="antialiasAlphaTestCheckBox">
+                   <property name="toolTip">
+                     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enables alpha testing for smoother anti-aliasing (Requires anti-aliasing to be enabled)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                   </property>
+                   <property name="text">
+                     <string>Use anti-alias alpha testing.</string>
+                   </property>
+                 </widget>
+               </item>
              </layout>
             </widget>
            </item>

From 5927924ebc0c99649b9598820050692de6cb3d75 Mon Sep 17 00:00:00 2001
From: Kindi <2538602-Kuyondo@users.noreply.gitlab.com>
Date: Mon, 29 Nov 2021 17:29:35 +0000
Subject: [PATCH 1791/2859] Update CHANGELOG.md

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 174eb9e4b4..09f1279bad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -82,7 +82,8 @@
     Bug #6416: Morphs are applied to the wrong target
     Bug #6417: OpenMW doesn't always use the right node to accumulate movement
     Bug #6429: Wyrmhaven: Can't add AI packages to player
-    Bug #6433: Items bound to Quick Keys sometimes do not appear until the Quick Key menu is opened.
+    Bug #6433: Items bound to Quick Keys sometimes do not appear until the Quick Key menu is opened
+    Bug #6451: Weapon summoned from Cast When Used item will have the name "None"
     Feature #890: OpenMW-CS: Column filtering
     Feature #1465: "Reset" argument for AI functions
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record

From b991263a92beb2c4bb78d7ce98ca698a49b4d7f6 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Mon, 29 Nov 2021 20:16:49 +0000
Subject: [PATCH 1792/2859] Work around
 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89062

---
 components/files/configurationmanager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/files/configurationmanager.cpp b/components/files/configurationmanager.cpp
index bb22e4750f..c2cd44960f 100644
--- a/components/files/configurationmanager.cpp
+++ b/components/files/configurationmanager.cpp
@@ -327,13 +327,13 @@ std::istream& operator>> (std::istream& istream, MaybeQuotedPath& MaybeQuotedPat
         istream >> static_cast<boost::filesystem::path&>(MaybeQuotedPath);
         if (istream && !istream.eof() && istream.peek() != EOF)
         {
-            std::string remainder(std::istreambuf_iterator(istream), {});
+            std::string remainder{std::istreambuf_iterator(istream), {}};
             Log(Debug::Warning) << "Trailing data in path setting. Used '" << MaybeQuotedPath.string() << "' but '" << remainder << "' remained";
         }
     }
     else
     {
-        std::string intermediate(std::istreambuf_iterator(istream), {});
+        std::string intermediate{std::istreambuf_iterator(istream), {}};
         static_cast<boost::filesystem::path&>(MaybeQuotedPath) = intermediate;
     }
     return istream;

From 47219b4def6632ba2efb843b22209b6f3224e1d5 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 23 Nov 2021 15:15:22 +0100
Subject: [PATCH 1793/2859] Avoid base class call antipattern in classes
 derived from ContentLoader

---
 apps/openmw/mwworld/contentloader.hpp | 25 +++---------
 apps/openmw/mwworld/esmloader.cpp     | 27 ++++++-------
 apps/openmw/mwworld/esmloader.hpp     | 10 ++---
 apps/openmw/mwworld/worldimp.cpp      | 57 ++++++++++++++-------------
 4 files changed, 52 insertions(+), 67 deletions(-)

diff --git a/apps/openmw/mwworld/contentloader.hpp b/apps/openmw/mwworld/contentloader.hpp
index b529ae9db8..55de77ad25 100644
--- a/apps/openmw/mwworld/contentloader.hpp
+++ b/apps/openmw/mwworld/contentloader.hpp
@@ -2,33 +2,20 @@
 #define CONTENTLOADER_HPP
 
 #include <boost/filesystem/path.hpp>
-#include <MyGUI_TextIterator.h>
 
-#include <components/debug/debuglog.hpp>
-#include "components/loadinglistener/loadinglistener.hpp"
+namespace Loading
+{
+    class Listener;
+}
 
 namespace MWWorld
 {
 
 struct ContentLoader
 {
-    ContentLoader(Loading::Listener& listener)
-      : mListener(listener)
-    {
-    }
-
-    virtual ~ContentLoader()
-    {
-    }
-
-    virtual void load(const boost::filesystem::path& filepath, int& index)
-    {
-        Log(Debug::Info) << "Loading content file " << filepath.string();
-        mListener.setLabel(MyGUI::TextIterator::toTagsString(filepath.string()));
-    }
+    virtual ~ContentLoader() = default;
 
-    protected:
-        Loading::Listener& mListener;
+    virtual void load(const boost::filesystem::path& filepath, int& index, Loading::Listener* listener) = 0;
 };
 
 } /* namespace MWWorld */
diff --git a/apps/openmw/mwworld/esmloader.cpp b/apps/openmw/mwworld/esmloader.cpp
index 1917c41428..8e702e7447 100644
--- a/apps/openmw/mwworld/esmloader.cpp
+++ b/apps/openmw/mwworld/esmloader.cpp
@@ -27,25 +27,22 @@ namespace MWWorld
 {
 
 EsmLoader::EsmLoader(MWWorld::ESMStore& store, std::vector<ESM::ESMReader>& readers,
-  ToUTF8::Utf8Encoder* encoder, Loading::Listener& listener)
-  : ContentLoader(listener)
-  , mEsm(readers)
-  , mStore(store)
-  , mEncoder(encoder)
+    ToUTF8::Utf8Encoder* encoder)
+    : mEsm(readers)
+    , mStore(store)
+    , mEncoder(encoder)
 {
 }
 
-void EsmLoader::load(const boost::filesystem::path& filepath, int& index)
+void EsmLoader::load(const boost::filesystem::path& filepath, int& index, Loading::Listener* listener)
 {
-  ContentLoader::load(filepath.filename(), index);
-
-  ESM::ESMReader lEsm;
-  lEsm.setEncoder(mEncoder);
-  lEsm.setIndex(index);
-  lEsm.open(filepath.string());
-  lEsm.resolveParentFileIndices(mEsm);
-  mEsm[index] = lEsm;
-  mStore.load(mEsm[index], &mListener);
+    ESM::ESMReader lEsm;
+    lEsm.setEncoder(mEncoder);
+    lEsm.setIndex(index);
+    lEsm.open(filepath.string());
+    lEsm.resolveParentFileIndices(mEsm);
+    mEsm[index] = lEsm;
+    mStore.load(mEsm[index], listener);
 }
 
     void convertMagicEffects(ESM::CreatureStats& creatureStats, ESM::InventoryState& inventory, ESM::NpcStats* npcStats)
diff --git a/apps/openmw/mwworld/esmloader.hpp b/apps/openmw/mwworld/esmloader.hpp
index 50631603de..533cf383ad 100644
--- a/apps/openmw/mwworld/esmloader.hpp
+++ b/apps/openmw/mwworld/esmloader.hpp
@@ -26,14 +26,14 @@ class ESMStore;
 struct EsmLoader : public ContentLoader
 {
     EsmLoader(MWWorld::ESMStore& store, std::vector<ESM::ESMReader>& readers,
-      ToUTF8::Utf8Encoder* encoder, Loading::Listener& listener);
+        ToUTF8::Utf8Encoder* encoder);
 
-    void load(const boost::filesystem::path& filepath, int& index) override;
+    void load(const boost::filesystem::path& filepath, int& index, Loading::Listener* listener) override;
 
     private:
-      std::vector<ESM::ESMReader>& mEsm;
-      MWWorld::ESMStore& mStore;
-      ToUTF8::Utf8Encoder* mEncoder;
+        std::vector<ESM::ESMReader>& mEsm;
+        MWWorld::ESMStore& mStore;
+        ToUTF8::Utf8Encoder* mEncoder;
 };
 
 void convertMagicEffects(ESM::CreatureStats& creatureStats, ESM::InventoryState& inventory, ESM::NpcStats* npcStats = nullptr);
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index db7bc0debd..f0ac894cfc 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -7,6 +7,8 @@
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 #include <BulletCollision/CollisionShapes/btCompoundShape.h>
 
+#include <MyGUI_TextIterator.h>
+
 #include <components/debug/debuglog.hpp>
 
 #include <components/esm/esmreader.hpp>
@@ -30,6 +32,8 @@
 #include <components/detournavigator/navigator.hpp>
 #include <components/detournavigator/settings.hpp>
 
+#include <components/loadinglistener/loadinglistener.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
@@ -79,43 +83,40 @@ namespace MWWorld
 {
     struct GameContentLoader : public ContentLoader
     {
-        GameContentLoader(Loading::Listener& listener)
-          : ContentLoader(listener)
-        {
-        }
-
-        bool addLoader(const std::string& extension, ContentLoader* loader)
+        void addLoader(std::string&& extension, ContentLoader& loader)
         {
-            return mLoaders.insert(std::make_pair(extension, loader)).second;
+            mLoaders.emplace(std::move(extension), &loader);
         }
 
-        void load(const boost::filesystem::path& filepath, int& index) override
+        void load(const boost::filesystem::path& filepath, int& index, Loading::Listener* listener) override
         {
-            LoadersContainer::iterator it(mLoaders.find(Misc::StringUtils::lowerCase(filepath.extension().string())));
+            const auto it = mLoaders.find(Misc::StringUtils::lowerCase(filepath.extension().string()));
             if (it != mLoaders.end())
             {
-                it->second->load(filepath, index);
+                const std::string filename = filepath.filename().string();
+                Log(Debug::Info) << "Loading content file " << filename;
+                if (listener != nullptr)
+                    listener->setLabel(MyGUI::TextIterator::toTagsString(filename));
+                it->second->load(filepath, index, listener);
             }
             else
             {
-              std::string msg("Cannot load file: ");
-              msg += filepath.string();
-              throw std::runtime_error(msg.c_str());
+                std::string msg("Cannot load file: ");
+                msg += filepath.string();
+                throw std::runtime_error(msg.c_str());
             }
         }
 
         private:
-          typedef std::map<std::string, ContentLoader*> LoadersContainer;
-          LoadersContainer mLoaders;
+            std::map<std::string, ContentLoader*> mLoaders;
     };
 
     struct OMWScriptsLoader : public ContentLoader
     {
         ESMStore& mStore;
-        OMWScriptsLoader(Loading::Listener& listener, ESMStore& store) : ContentLoader(listener), mStore(store) {}
-        void load(const boost::filesystem::path& filepath, int& index) override
+        OMWScriptsLoader(ESMStore& store) : mStore(store) {}
+        void load(const boost::filesystem::path& filepath, int& /*index*/, Loading::Listener* /*listener*/) override
         {
-            ContentLoader::load(filepath.filename(), index);
             mStore.addOMWScripts(filepath.string());
         }
     };
@@ -2936,18 +2937,18 @@ namespace MWWorld
 
     void World::loadContentFiles(const Files::Collections& fileCollections, const std::vector<std::string>& content, ESMStore& store, std::vector<ESM::ESMReader>& readers, ToUTF8::Utf8Encoder* encoder, Loading::Listener* listener)
     {
-        GameContentLoader gameContentLoader(*listener);
-        EsmLoader esmLoader(store, readers, encoder, *listener);
+        GameContentLoader gameContentLoader;
+        EsmLoader esmLoader(store, readers, encoder);
         validateMasterFiles(readers);
 
-        gameContentLoader.addLoader(".esm", &esmLoader);
-        gameContentLoader.addLoader(".esp", &esmLoader);
-        gameContentLoader.addLoader(".omwgame", &esmLoader);
-        gameContentLoader.addLoader(".omwaddon", &esmLoader);
-        gameContentLoader.addLoader(".project", &esmLoader);
+        gameContentLoader.addLoader(".esm", esmLoader);
+        gameContentLoader.addLoader(".esp", esmLoader);
+        gameContentLoader.addLoader(".omwgame", esmLoader);
+        gameContentLoader.addLoader(".omwaddon", esmLoader);
+        gameContentLoader.addLoader(".project", esmLoader);
 
-        OMWScriptsLoader omwScriptsLoader(*listener, store);
-        gameContentLoader.addLoader(".omwscripts", &omwScriptsLoader);
+        OMWScriptsLoader omwScriptsLoader(store);
+        gameContentLoader.addLoader(".omwscripts", omwScriptsLoader);
 
         int idx = 0;
         for (const std::string &file : content)
@@ -2956,7 +2957,7 @@ namespace MWWorld
             const Files::MultiDirCollection& col = fileCollections.getCollection(filename.extension().string());
             if (col.doesExist(file))
             {
-                gameContentLoader.load(col.getPath(file), idx);
+                gameContentLoader.load(col.getPath(file), idx, listener);
             }
             else
             {

From c4cd2f36c33ace443fb89fa3b98cf8a2a5f0daf6 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 23 Nov 2021 15:26:43 +0100
Subject: [PATCH 1794/2859] Move convertMagicEffects into separate file

As completely unrelated to EsmLoader.
---
 apps/openmw/CMakeLists.txt           |   2 +-
 apps/openmw/mwworld/cellstore.cpp    |   1 +
 apps/openmw/mwworld/esmloader.cpp    | 203 --------------------------
 apps/openmw/mwworld/esmloader.hpp    |   5 -
 apps/openmw/mwworld/magiceffects.cpp | 210 +++++++++++++++++++++++++++
 apps/openmw/mwworld/magiceffects.hpp |  17 +++
 apps/openmw/mwworld/player.cpp       |   1 +
 7 files changed, 230 insertions(+), 209 deletions(-)
 create mode 100644 apps/openmw/mwworld/magiceffects.cpp
 create mode 100644 apps/openmw/mwworld/magiceffects.hpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 7aa2928da5..2582b272cf 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -74,7 +74,7 @@ add_openmw_dir (mwworld
     actionequip timestamp actionalchemy cellstore actionapply actioneat
     store esmstore fallback actionrepair actionsoulgem livecellref actiondoor
     contentloader esmloader actiontrap cellreflist cellref weather projectilemanager
-    cellpreloader datetimemanager groundcoverstore
+    cellpreloader datetimemanager groundcoverstore magiceffects
     )
 
 add_openmw_dir (mwphysics
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 0448d0e28a..052cc35b45 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -1,4 +1,5 @@
 #include "cellstore.hpp"
+#include "magiceffects.hpp"
 
 #include <algorithm>
 
diff --git a/apps/openmw/mwworld/esmloader.cpp b/apps/openmw/mwworld/esmloader.cpp
index 8e702e7447..de16e386f2 100644
--- a/apps/openmw/mwworld/esmloader.cpp
+++ b/apps/openmw/mwworld/esmloader.cpp
@@ -2,26 +2,6 @@
 #include "esmstore.hpp"
 
 #include <components/esm/esmreader.hpp>
-#include <components/esm/npcstate.hpp>
-
-#include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
-
-#include "../mwmechanics/magiceffects.hpp"
-
-namespace
-{
-    template<class T>
-    void getEnchantedItem(const std::string& id, std::string& enchantment, std::string& itemName)
-    {
-        const T* item = MWBase::Environment::get().getWorld()->getStore().get<T>().search(id);
-        if(item)
-        {
-            enchantment = item->mEnchant;
-            itemName = item->mName;
-        }
-    }
-}
 
 namespace MWWorld
 {
@@ -45,187 +25,4 @@ void EsmLoader::load(const boost::filesystem::path& filepath, int& index, Loadin
     mStore.load(mEsm[index], listener);
 }
 
-    void convertMagicEffects(ESM::CreatureStats& creatureStats, ESM::InventoryState& inventory, ESM::NpcStats* npcStats)
-    {
-        const auto& store = MWBase::Environment::get().getWorld()->getStore();
-        // Convert corprus to format 10
-        for (const auto& [id, oldStats] : creatureStats.mSpells.mCorprusSpells)
-        {
-            const ESM::Spell* spell = store.get<ESM::Spell>().search(id);
-            if (!spell)
-                continue;
-
-            ESM::CreatureStats::CorprusStats stats;
-            stats.mNextWorsening = oldStats.mNextWorsening;
-            for (int i=0; i<ESM::Attribute::Length; ++i)
-                stats.mWorsenings[i] = 0;
-
-            for (auto& effect : spell->mEffects.mList)
-            {
-                if (effect.mEffectID == ESM::MagicEffect::DrainAttribute)
-                    stats.mWorsenings[effect.mAttribute] = oldStats.mWorsenings;
-            }
-            creatureStats.mCorprusSpells[id] = stats;
-        }
-        // Convert to format 17
-        for(const auto& [id, oldParams] : creatureStats.mSpells.mSpellParams)
-        {
-            const ESM::Spell* spell = store.get<ESM::Spell>().search(id);
-            if (!spell || spell->mData.mType == ESM::Spell::ST_Spell || spell->mData.mType == ESM::Spell::ST_Power)
-                continue;
-            ESM::ActiveSpells::ActiveSpellParams params;
-            params.mId = id;
-            params.mDisplayName = spell->mName;
-            params.mItem.unset();
-            params.mCasterActorId = creatureStats.mActorId;
-            if(spell->mData.mType == ESM::Spell::ST_Ability)
-                params.mType = ESM::ActiveSpells::Type_Ability;
-            else
-                params.mType = ESM::ActiveSpells::Type_Permanent;
-            params.mWorsenings = -1;
-            int effectIndex = 0;
-            for(const auto& enam : spell->mEffects.mList)
-            {
-                if(oldParams.mPurgedEffects.find(effectIndex) == oldParams.mPurgedEffects.end())
-                {
-                    ESM::ActiveEffect effect;
-                    effect.mEffectId = enam.mEffectID;
-                    effect.mArg = MWMechanics::EffectKey(enam).mArg;
-                    effect.mDuration = -1;
-                    effect.mTimeLeft = -1;
-                    effect.mEffectIndex = effectIndex;
-                    auto rand = oldParams.mEffectRands.find(effectIndex);
-                    if(rand != oldParams.mEffectRands.end())
-                    {
-                        float magnitude = (enam.mMagnMax - enam.mMagnMin) * rand->second + enam.mMagnMin;
-                        effect.mMagnitude = magnitude;
-                        effect.mMinMagnitude = magnitude;
-                        effect.mMaxMagnitude = magnitude;
-                        // Prevent recalculation of resistances and don't reflect or absorb the effect
-                        effect.mFlags = ESM::ActiveEffect::Flag_Ignore_Resistances | ESM::ActiveEffect::Flag_Ignore_Reflect | ESM::ActiveEffect::Flag_Ignore_SpellAbsorption;
-                    }
-                    else
-                    {
-                        effect.mMagnitude = 0.f;
-                        effect.mMinMagnitude = enam.mMagnMin;
-                        effect.mMaxMagnitude = enam.mMagnMax;
-                        effect.mFlags = ESM::ActiveEffect::Flag_None;
-                    }
-                    params.mEffects.emplace_back(effect);
-                }
-                effectIndex++;
-            }
-            creatureStats.mActiveSpells.mSpells.emplace_back(params);
-        }
-        std::multimap<std::string, int> equippedItems;
-        for(std::size_t i = 0; i < inventory.mItems.size(); ++i)
-        {
-            const ESM::ObjectState& item = inventory.mItems[i];
-            auto slot = inventory.mEquipmentSlots.find(i);
-            if(slot != inventory.mEquipmentSlots.end())
-                equippedItems.emplace(item.mRef.mRefID, slot->second);
-        }
-        for(const auto& [id, oldMagnitudes] : inventory.mPermanentMagicEffectMagnitudes)
-        {
-            std::string eId;
-            std::string name;
-            switch(store.find(id))
-            {
-                case ESM::REC_ARMO:
-                    getEnchantedItem<ESM::Armor>(id, eId, name);
-                    break;
-                case ESM::REC_CLOT:
-                    getEnchantedItem<ESM::Clothing>(id, eId, name);
-                    break;
-                case ESM::REC_WEAP:
-                    getEnchantedItem<ESM::Weapon>(id, eId, name);
-                    break;
-            }
-            if(eId.empty())
-                continue;
-            const ESM::Enchantment* enchantment = store.get<ESM::Enchantment>().search(eId);
-            if(!enchantment)
-                continue;
-            ESM::ActiveSpells::ActiveSpellParams params;
-            params.mId = id;
-            params.mDisplayName = name;
-            params.mCasterActorId = creatureStats.mActorId;
-            params.mType = ESM::ActiveSpells::Type_Enchantment;
-            params.mWorsenings = -1;
-            for(std::size_t effectIndex = 0; effectIndex < oldMagnitudes.size() && effectIndex < enchantment->mEffects.mList.size(); ++effectIndex)
-            {
-                const auto& enam = enchantment->mEffects.mList[effectIndex];
-                auto [random, multiplier] = oldMagnitudes[effectIndex];
-                float magnitude = (enam.mMagnMax - enam.mMagnMin) * random + enam.mMagnMin;
-                magnitude *= multiplier;
-                if(magnitude <= 0)
-                    continue;
-                ESM::ActiveEffect effect;
-                effect.mEffectId = enam.mEffectID;
-                effect.mMagnitude = magnitude;
-                effect.mMinMagnitude = magnitude;
-                effect.mMaxMagnitude = magnitude;
-                effect.mArg = MWMechanics::EffectKey(enam).mArg;
-                effect.mDuration = -1;
-                effect.mTimeLeft = -1;
-                effect.mEffectIndex = static_cast<int>(effectIndex);
-                // Prevent recalculation of resistances and don't reflect or absorb the effect
-                effect.mFlags = ESM::ActiveEffect::Flag_Ignore_Resistances | ESM::ActiveEffect::Flag_Ignore_Reflect | ESM::ActiveEffect::Flag_Ignore_SpellAbsorption;
-                params.mEffects.emplace_back(effect);
-            }
-            auto [begin, end] = equippedItems.equal_range(id);
-            for(auto it = begin; it != end; ++it)
-            {
-                params.mItem = { static_cast<unsigned int>(it->second), 0 };
-                creatureStats.mActiveSpells.mSpells.emplace_back(params);
-            }
-        }
-        for(const auto& spell : creatureStats.mCorprusSpells)
-        {
-            auto it = std::find_if(creatureStats.mActiveSpells.mSpells.begin(), creatureStats.mActiveSpells.mSpells.end(), [&] (const auto& params) { return params.mId == spell.first; });
-            if(it != creatureStats.mActiveSpells.mSpells.end())
-            {
-                it->mNextWorsening = spell.second.mNextWorsening;
-                int worsenings = 0;
-                for(int i = 0; i < ESM::Attribute::Length; ++i)
-                    worsenings = std::max(spell.second.mWorsenings[i], worsenings);
-                it->mWorsenings = worsenings;
-            }
-        }
-        for(const auto& [key, actorId] : creatureStats.mSummonedCreatureMap)
-        {
-            if(actorId == -1)
-                continue;
-            for(auto& params : creatureStats.mActiveSpells.mSpells)
-            {
-                if(params.mId == key.mSourceId)
-                {
-                    bool found = false;
-                    for(auto& effect : params.mEffects)
-                    {
-                        if(effect.mEffectId == key.mEffectId && effect.mEffectIndex == key.mEffectIndex)
-                        {
-                            effect.mArg = actorId;
-                            found = true;
-                            break;
-                        }
-                    }
-                    if(found)
-                        break;
-                }
-            }
-        }
-        // Reset modifiers that were previously recalculated each frame
-        for(std::size_t i = 0; i < ESM::Attribute::Length; ++i)
-            creatureStats.mAttributes[i].mMod = 0.f;
-        for(std::size_t i = 0; i < 3; ++i)
-            creatureStats.mDynamic[i].mMod = 0.f;
-        for(std::size_t i = 0; i < 4; ++i)
-            creatureStats.mAiSettings[i].mMod = 0.f;
-        if(npcStats)
-        {
-            for(std::size_t i = 0; i < ESM::Skill::Length; ++i)
-                npcStats->mSkills[i].mMod = 0.f;
-        }
-    }
 } /* namespace MWWorld */
diff --git a/apps/openmw/mwworld/esmloader.hpp b/apps/openmw/mwworld/esmloader.hpp
index 533cf383ad..db50d44146 100644
--- a/apps/openmw/mwworld/esmloader.hpp
+++ b/apps/openmw/mwworld/esmloader.hpp
@@ -13,9 +13,6 @@ namespace ToUTF8
 namespace ESM
 {
     class ESMReader;
-    struct CreatureStats;
-    struct InventoryState;
-    struct NpcStats;
 }
 
 namespace MWWorld
@@ -36,8 +33,6 @@ struct EsmLoader : public ContentLoader
         ToUTF8::Utf8Encoder* mEncoder;
 };
 
-void convertMagicEffects(ESM::CreatureStats& creatureStats, ESM::InventoryState& inventory, ESM::NpcStats* npcStats = nullptr);
-
 } /* namespace MWWorld */
 
 #endif // ESMLOADER_HPP
diff --git a/apps/openmw/mwworld/magiceffects.cpp b/apps/openmw/mwworld/magiceffects.cpp
new file mode 100644
index 0000000000..7d7e2857fe
--- /dev/null
+++ b/apps/openmw/mwworld/magiceffects.cpp
@@ -0,0 +1,210 @@
+#include "magiceffects.hpp"
+#include "esmstore.hpp"
+
+#include <components/esm/npcstate.hpp>
+
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+
+#include "../mwmechanics/magiceffects.hpp"
+
+namespace
+{
+    template<class T>
+    void getEnchantedItem(const std::string& id, std::string& enchantment, std::string& itemName)
+    {
+        const T* item = MWBase::Environment::get().getWorld()->getStore().get<T>().search(id);
+        if(item)
+        {
+            enchantment = item->mEnchant;
+            itemName = item->mName;
+        }
+    }
+}
+
+namespace MWWorld
+{
+    void convertMagicEffects(ESM::CreatureStats& creatureStats, ESM::InventoryState& inventory, ESM::NpcStats* npcStats)
+    {
+        const auto& store = MWBase::Environment::get().getWorld()->getStore();
+        // Convert corprus to format 10
+        for (const auto& [id, oldStats] : creatureStats.mSpells.mCorprusSpells)
+        {
+            const ESM::Spell* spell = store.get<ESM::Spell>().search(id);
+            if (!spell)
+                continue;
+
+            ESM::CreatureStats::CorprusStats stats;
+            stats.mNextWorsening = oldStats.mNextWorsening;
+            for (int i=0; i<ESM::Attribute::Length; ++i)
+                stats.mWorsenings[i] = 0;
+
+            for (auto& effect : spell->mEffects.mList)
+            {
+                if (effect.mEffectID == ESM::MagicEffect::DrainAttribute)
+                    stats.mWorsenings[effect.mAttribute] = oldStats.mWorsenings;
+            }
+            creatureStats.mCorprusSpells[id] = stats;
+        }
+        // Convert to format 17
+        for(const auto& [id, oldParams] : creatureStats.mSpells.mSpellParams)
+        {
+            const ESM::Spell* spell = store.get<ESM::Spell>().search(id);
+            if (!spell || spell->mData.mType == ESM::Spell::ST_Spell || spell->mData.mType == ESM::Spell::ST_Power)
+                continue;
+            ESM::ActiveSpells::ActiveSpellParams params;
+            params.mId = id;
+            params.mDisplayName = spell->mName;
+            params.mItem.unset();
+            params.mCasterActorId = creatureStats.mActorId;
+            if(spell->mData.mType == ESM::Spell::ST_Ability)
+                params.mType = ESM::ActiveSpells::Type_Ability;
+            else
+                params.mType = ESM::ActiveSpells::Type_Permanent;
+            params.mWorsenings = -1;
+            int effectIndex = 0;
+            for(const auto& enam : spell->mEffects.mList)
+            {
+                if(oldParams.mPurgedEffects.find(effectIndex) == oldParams.mPurgedEffects.end())
+                {
+                    ESM::ActiveEffect effect;
+                    effect.mEffectId = enam.mEffectID;
+                    effect.mArg = MWMechanics::EffectKey(enam).mArg;
+                    effect.mDuration = -1;
+                    effect.mTimeLeft = -1;
+                    effect.mEffectIndex = effectIndex;
+                    auto rand = oldParams.mEffectRands.find(effectIndex);
+                    if(rand != oldParams.mEffectRands.end())
+                    {
+                        float magnitude = (enam.mMagnMax - enam.mMagnMin) * rand->second + enam.mMagnMin;
+                        effect.mMagnitude = magnitude;
+                        effect.mMinMagnitude = magnitude;
+                        effect.mMaxMagnitude = magnitude;
+                        // Prevent recalculation of resistances and don't reflect or absorb the effect
+                        effect.mFlags = ESM::ActiveEffect::Flag_Ignore_Resistances | ESM::ActiveEffect::Flag_Ignore_Reflect | ESM::ActiveEffect::Flag_Ignore_SpellAbsorption;
+                    }
+                    else
+                    {
+                        effect.mMagnitude = 0.f;
+                        effect.mMinMagnitude = enam.mMagnMin;
+                        effect.mMaxMagnitude = enam.mMagnMax;
+                        effect.mFlags = ESM::ActiveEffect::Flag_None;
+                    }
+                    params.mEffects.emplace_back(effect);
+                }
+                effectIndex++;
+            }
+            creatureStats.mActiveSpells.mSpells.emplace_back(params);
+        }
+        std::multimap<std::string, int> equippedItems;
+        for(std::size_t i = 0; i < inventory.mItems.size(); ++i)
+        {
+            const ESM::ObjectState& item = inventory.mItems[i];
+            auto slot = inventory.mEquipmentSlots.find(i);
+            if(slot != inventory.mEquipmentSlots.end())
+                equippedItems.emplace(item.mRef.mRefID, slot->second);
+        }
+        for(const auto& [id, oldMagnitudes] : inventory.mPermanentMagicEffectMagnitudes)
+        {
+            std::string eId;
+            std::string name;
+            switch(store.find(id))
+            {
+                case ESM::REC_ARMO:
+                    getEnchantedItem<ESM::Armor>(id, eId, name);
+                    break;
+                case ESM::REC_CLOT:
+                    getEnchantedItem<ESM::Clothing>(id, eId, name);
+                    break;
+                case ESM::REC_WEAP:
+                    getEnchantedItem<ESM::Weapon>(id, eId, name);
+                    break;
+            }
+            if(eId.empty())
+                continue;
+            const ESM::Enchantment* enchantment = store.get<ESM::Enchantment>().search(eId);
+            if(!enchantment)
+                continue;
+            ESM::ActiveSpells::ActiveSpellParams params;
+            params.mId = id;
+            params.mDisplayName = name;
+            params.mCasterActorId = creatureStats.mActorId;
+            params.mType = ESM::ActiveSpells::Type_Enchantment;
+            params.mWorsenings = -1;
+            for(std::size_t effectIndex = 0; effectIndex < oldMagnitudes.size() && effectIndex < enchantment->mEffects.mList.size(); ++effectIndex)
+            {
+                const auto& enam = enchantment->mEffects.mList[effectIndex];
+                auto [random, multiplier] = oldMagnitudes[effectIndex];
+                float magnitude = (enam.mMagnMax - enam.mMagnMin) * random + enam.mMagnMin;
+                magnitude *= multiplier;
+                if(magnitude <= 0)
+                    continue;
+                ESM::ActiveEffect effect;
+                effect.mEffectId = enam.mEffectID;
+                effect.mMagnitude = magnitude;
+                effect.mMinMagnitude = magnitude;
+                effect.mMaxMagnitude = magnitude;
+                effect.mArg = MWMechanics::EffectKey(enam).mArg;
+                effect.mDuration = -1;
+                effect.mTimeLeft = -1;
+                effect.mEffectIndex = static_cast<int>(effectIndex);
+                // Prevent recalculation of resistances and don't reflect or absorb the effect
+                effect.mFlags = ESM::ActiveEffect::Flag_Ignore_Resistances | ESM::ActiveEffect::Flag_Ignore_Reflect | ESM::ActiveEffect::Flag_Ignore_SpellAbsorption;
+                params.mEffects.emplace_back(effect);
+            }
+            auto [begin, end] = equippedItems.equal_range(id);
+            for(auto it = begin; it != end; ++it)
+            {
+                params.mItem = { static_cast<unsigned int>(it->second), 0 };
+                creatureStats.mActiveSpells.mSpells.emplace_back(params);
+            }
+        }
+        for(const auto& spell : creatureStats.mCorprusSpells)
+        {
+            auto it = std::find_if(creatureStats.mActiveSpells.mSpells.begin(), creatureStats.mActiveSpells.mSpells.end(), [&] (const auto& params) { return params.mId == spell.first; });
+            if(it != creatureStats.mActiveSpells.mSpells.end())
+            {
+                it->mNextWorsening = spell.second.mNextWorsening;
+                int worsenings = 0;
+                for(int i = 0; i < ESM::Attribute::Length; ++i)
+                    worsenings = std::max(spell.second.mWorsenings[i], worsenings);
+                it->mWorsenings = worsenings;
+            }
+        }
+        for(const auto& [key, actorId] : creatureStats.mSummonedCreatureMap)
+        {
+            if(actorId == -1)
+                continue;
+            for(auto& params : creatureStats.mActiveSpells.mSpells)
+            {
+                if(params.mId == key.mSourceId)
+                {
+                    bool found = false;
+                    for(auto& effect : params.mEffects)
+                    {
+                        if(effect.mEffectId == key.mEffectId && effect.mEffectIndex == key.mEffectIndex)
+                        {
+                            effect.mArg = actorId;
+                            found = true;
+                            break;
+                        }
+                    }
+                    if(found)
+                        break;
+                }
+            }
+        }
+        // Reset modifiers that were previously recalculated each frame
+        for(std::size_t i = 0; i < ESM::Attribute::Length; ++i)
+            creatureStats.mAttributes[i].mMod = 0.f;
+        for(std::size_t i = 0; i < 3; ++i)
+            creatureStats.mDynamic[i].mMod = 0.f;
+        for(std::size_t i = 0; i < 4; ++i)
+            creatureStats.mAiSettings[i].mMod = 0.f;
+        if(npcStats)
+        {
+            for(std::size_t i = 0; i < ESM::Skill::Length; ++i)
+                npcStats->mSkills[i].mMod = 0.f;
+        }
+    }
+}
diff --git a/apps/openmw/mwworld/magiceffects.hpp b/apps/openmw/mwworld/magiceffects.hpp
new file mode 100644
index 0000000000..31d5ed2038
--- /dev/null
+++ b/apps/openmw/mwworld/magiceffects.hpp
@@ -0,0 +1,17 @@
+#ifndef OPENMW_MWWORLD_MAGICEFFECTS_H
+#define OPENMW_MWWORLD_MAGICEFFECTS_H
+
+namespace ESM
+{
+    struct CreatureStats;
+    struct InventoryState;
+    struct NpcStats;
+}
+
+namespace MWWorld
+{
+    void convertMagicEffects(ESM::CreatureStats& creatureStats, ESM::InventoryState& inventory,
+        ESM::NpcStats* npcStats = nullptr);
+}
+
+#endif
diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp
index caa0600f7c..4687a4eddd 100644
--- a/apps/openmw/mwworld/player.cpp
+++ b/apps/openmw/mwworld/player.cpp
@@ -12,6 +12,7 @@
 
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/inventorystore.hpp"
+#include "../mwworld/magiceffects.hpp"
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"

From 4f77c18af4b2df9abd13f5106591e75683089d99 Mon Sep 17 00:00:00 2001
From: Thomas Lowe <musicaltommy@gmail.com>
Date: Mon, 29 Nov 2021 20:44:47 -0500
Subject: [PATCH 1795/2859] Removed unneeded signal.

---
 apps/launcher/graphicspage.hpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/apps/launcher/graphicspage.hpp b/apps/launcher/graphicspage.hpp
index 9275bf8e3d..d86b570914 100644
--- a/apps/launcher/graphicspage.hpp
+++ b/apps/launcher/graphicspage.hpp
@@ -27,9 +27,6 @@ namespace Launcher
     public slots:
         void screenChanged(int screen);
 
-    signals:
-        void signalAntiAliasingChanged(int aaValue);
-
     private slots:
         void slotFullScreenChanged(int state);
         void slotStandardToggled(bool checked);

From bdb7b6079ee073baa465b2c1c75f42f42a9ebfc8 Mon Sep 17 00:00:00 2001
From: Thomas Lowe <musicaltommy@gmail.com>
Date: Mon, 29 Nov 2021 20:49:31 -0500
Subject: [PATCH 1796/2859] Removed a period from the checkbox's display text
 to conform with other buttons.

---
 files/ui/advancedpage.ui | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/files/ui/advancedpage.ui b/files/ui/advancedpage.ui
index 0952e660d8..f782c6caa0 100644
--- a/files/ui/advancedpage.ui
+++ b/files/ui/advancedpage.ui
@@ -14,7 +14,7 @@
    <item>
     <widget class="QTabWidget" name="AdvancedTabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="GameMechanics">
       <attribute name="title">
@@ -281,8 +281,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>645</width>
-            <height>413</height>
+            <width>665</width>
+            <height>525</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout">
@@ -454,16 +454,16 @@
                 </property>
                </widget>
               </item>
-               <item row="3" column="1">
-                 <widget class="QCheckBox" name="antialiasAlphaTestCheckBox">
-                   <property name="toolTip">
-                     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enables alpha testing for smoother anti-aliasing (Requires anti-aliasing to be enabled)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                   </property>
-                   <property name="text">
-                     <string>Use anti-alias alpha testing.</string>
-                   </property>
-                 </widget>
-               </item>
+              <item row="3" column="1">
+               <widget class="QCheckBox" name="antialiasAlphaTestCheckBox">
+                <property name="toolTip">
+                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enables alpha testing for smoother anti-aliasing (Requires anti-aliasing to be enabled)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                </property>
+                <property name="text">
+                 <string>Use anti-alias alpha testing</string>
+                </property>
+               </widget>
+              </item>
              </layout>
             </widget>
            </item>

From 95d7bdd0c9b469c41dfc51613a45a42538aaab88 Mon Sep 17 00:00:00 2001
From: Thomas Lowe <musicaltommy@gmail.com>
Date: Tue, 30 Nov 2021 07:50:30 -0500
Subject: [PATCH 1797/2859] alpha test defaults to false

---
 files/settings-default.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 0e2c329ff2..c0083e4238 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -492,7 +492,7 @@ minimum interior brightness = 0.08
 # Convert the alpha test (cutout/punchthrough alpha) to alpha-to-coverage.
 # This allows MSAA to work with alpha-tested meshes, producing better-looking edges without pixelation.
 # When MSAA is off, this setting will have no visible effect, but might have a performance cost.
-antialias alpha test = true
+antialias alpha test = false
 
 # Soften intersection of blended particle systems with opaque geometry
 soft particles = false

From c5b33185b543dd7247ac64315b0b866314e48fd8 Mon Sep 17 00:00:00 2001
From: OnlyForF1 <10170702-OnlyForF1@users.noreply.gitlab.com>
Date: Tue, 30 Nov 2021 16:00:30 +0000
Subject: [PATCH 1798/2859] Recalculate the Projection Matrix every time the
 window is resized.

---
 apps/openmw/mwgui/windowmanagerimp.cpp    | 17 ++++++++++---
 apps/openmw/mwrender/postprocessor.cpp    |  5 +---
 apps/openmw/mwrender/postprocessor.hpp    |  6 +----
 apps/openmw/mwrender/renderingmanager.cpp | 18 ++++++++++---
 components/settings/categories.hpp        |  2 +-
 components/settings/settings.cpp          | 31 ++++++++++++++++++-----
 components/settings/settings.hpp          | 26 ++++++++++++-------
 7 files changed, 72 insertions(+), 33 deletions(-)

diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index a935d7f900..94a064a6c8 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -1098,12 +1098,21 @@ namespace MWGui
 
     void WindowManager::windowResized(int x, int y)
     {
-        // Note: this is a side effect of resolution change or window resize.
-        // There is no need to track these changes.
         Settings::Manager::setInt("resolution x", "Video", x);
         Settings::Manager::setInt("resolution y", "Video", y);
-        Settings::Manager::resetPendingChange("resolution x", "Video");
-        Settings::Manager::resetPendingChange("resolution y", "Video");
+
+        // We only want to process changes to window-size related settings.
+        Settings::CategorySettingVector filter = {{"Video", "resolution x"},
+                                                  {"Video", "resolution y"}};
+
+        // If the HUD has not been initialised, the World singleton will not be available.
+        if (mHud)
+        {
+            MWBase::Environment::get().getWorld()->processChangedSettings(
+                    Settings::Manager::getPendingChanges(filter));
+        }
+
+        Settings::Manager::resetPendingChanges(filter);
 
         mGuiPlatform->getRenderManagerPtr()->setViewSize(x, y);
 
diff --git a/apps/openmw/mwrender/postprocessor.cpp b/apps/openmw/mwrender/postprocessor.cpp
index b08cfe1f71..53fae4cd7d 100644
--- a/apps/openmw/mwrender/postprocessor.cpp
+++ b/apps/openmw/mwrender/postprocessor.cpp
@@ -14,7 +14,6 @@
 #include <components/debug/debuglog.hpp>
 
 #include "vismask.hpp"
-#include "renderingmanager.hpp"
 
 namespace
 {
@@ -132,11 +131,10 @@ namespace
 
 namespace MWRender
 {
-    PostProcessor::PostProcessor(RenderingManager& rendering, osgViewer::Viewer* viewer, osg::Group* rootNode)
+    PostProcessor::PostProcessor(osgViewer::Viewer* viewer, osg::Group* rootNode)
         : mViewer(viewer)
         , mRootNode(new osg::Group)
         , mDepthFormat(GL_DEPTH_COMPONENT24)
-        , mRendering(rendering)
     {
         bool softParticles = Settings::Manager::getBool("soft particles", "Shaders");
 
@@ -239,7 +237,6 @@ namespace MWRender
 
         mViewer->getCamera()->resize(width, height);
         mHUDCamera->resize(width, height);
-        mRendering.updateProjectionMatrix();
     }
 
     void PostProcessor::createTexturesAndCamera(int width, int height)
diff --git a/apps/openmw/mwrender/postprocessor.hpp b/apps/openmw/mwrender/postprocessor.hpp
index cc5128d8f9..f2ef238737 100644
--- a/apps/openmw/mwrender/postprocessor.hpp
+++ b/apps/openmw/mwrender/postprocessor.hpp
@@ -14,12 +14,10 @@ namespace osgViewer
 
 namespace MWRender
 {
-    class RenderingManager;
-
     class PostProcessor : public osg::Referenced
     {
     public:
-        PostProcessor(RenderingManager& rendering, osgViewer::Viewer* viewer, osg::Group* rootNode);
+        PostProcessor(osgViewer::Viewer* viewer, osg::Group* rootNode);
 
         auto getMsaaFbo() { return mMsaaFbo; }
         auto getFbo() { return mFbo; }
@@ -46,8 +44,6 @@ namespace MWRender
         osg::ref_ptr<osg::Texture2D> mOpaqueDepthTex;
 
         int mDepthFormat;
-
-        RenderingManager& mRendering;
     };
 }
 
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 30be74c839..b15aaf6f06 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -454,7 +454,7 @@ namespace MWRender
         mSharedUniformStateUpdater = new SharedUniformStateUpdater(groundcover);
         rootNode->addUpdateCallback(mSharedUniformStateUpdater);
 
-        mPostProcessor = new PostProcessor(*this, viewer, mRootNode);
+        mPostProcessor = new PostProcessor(viewer, mRootNode);
         resourceSystem->getSceneManager()->setDepthFormat(mPostProcessor->getDepthFormat());
         resourceSystem->getSceneManager()->setOpaqueDepthTex(mPostProcessor->getOpaqueDepthTex());
 
@@ -1208,19 +1208,26 @@ namespace MWRender
 
     void RenderingManager::processChangedSettings(const Settings::CategorySettingVector &changed)
     {
+        // Only perform a projection matrix update once if a relevant setting is changed.
+        bool updateProjection = false;
+
         for (Settings::CategorySettingVector::const_iterator it = changed.begin(); it != changed.end(); ++it)
         {
             if (it->first == "Camera" && it->second == "field of view")
             {
                 mFieldOfView = Settings::Manager::getFloat("field of view", "Camera");
-                updateProjectionMatrix();
+                updateProjection = true;
+            }
+            else if (it->first == "Video" && (it->second == "resolution x" || it->second == "resolution y"))
+            {
+                updateProjection = true;
             }
             else if (it->first == "Camera" && it->second == "viewing distance")
             {
                 mViewDistance = Settings::Manager::getFloat("viewing distance", "Camera");
                 if(!Settings::Manager::getBool("use distant fog", "Fog"))
                     mStateUpdater->setFogEnd(mViewDistance);
-                updateProjectionMatrix();
+                updateProjection = true;
             }
             else if (it->first == "General" && (it->second == "texture filter" ||
                                                 it->second == "texture mipmap" ||
@@ -1263,6 +1270,11 @@ namespace MWRender
                 }
             }
         }
+
+        if (updateProjection)
+        {
+            updateProjectionMatrix();
+        }
     }
 
     float RenderingManager::getNearClipDistance() const
diff --git a/components/settings/categories.hpp b/components/settings/categories.hpp
index d6cd042f61..6a2da2fa10 100644
--- a/components/settings/categories.hpp
+++ b/components/settings/categories.hpp
@@ -9,7 +9,7 @@
 namespace Settings
 {
     using CategorySetting = std::pair<std::string, std::string>;
-    using CategorySettingVector = std::set<std::pair<std::string, std::string>>;
+    using CategorySettingVector = std::set<CategorySetting>;
     using CategorySettingValueMap = std::map<CategorySetting, std::string>;
 }
 
diff --git a/components/settings/settings.cpp b/components/settings/settings.cpp
index 09a3d1f516..cef627acd4 100644
--- a/components/settings/settings.cpp
+++ b/components/settings/settings.cpp
@@ -39,7 +39,7 @@ void Manager::saveUser(const std::string &file)
 
 std::string Manager::getString(const std::string &setting, const std::string &category)
 {
-    CategorySettingValueMap::key_type key = std::make_pair(category, setting);
+    CategorySettingValueMap::key_type key (category, setting);
     CategorySettingValueMap::iterator it = mUserSettings.find(key);
     if (it != mUserSettings.end())
         return it->second;
@@ -93,7 +93,7 @@ osg::Vec2f Manager::getVector2 (const std::string& setting, const std::string& c
     stream >> x >> y;
     if (stream.fail())
         throw std::runtime_error(std::string("Can't parse 2d vector: " + value));
-    return osg::Vec2f(x, y);
+    return {x, y};
 }
 
 osg::Vec3f Manager::getVector3 (const std::string& setting, const std::string& category)
@@ -104,14 +104,14 @@ osg::Vec3f Manager::getVector3 (const std::string& setting, const std::string& c
     stream >> x >> y >> z;
     if (stream.fail())
         throw std::runtime_error(std::string("Can't parse 3d vector: " + value));
-    return osg::Vec3f(x, y, z);
+    return {x, y, z};
 }
 
 void Manager::setString(const std::string &setting, const std::string &category, const std::string &value)
 {
-    CategorySettingValueMap::key_type key = std::make_pair(category, setting);
+    CategorySettingValueMap::key_type key (category, setting);
 
-    CategorySettingValueMap::iterator found = mUserSettings.find(key);
+    auto found = mUserSettings.find(key);
     if (found != mUserSettings.end())
     {
         if (found->second == value)
@@ -165,18 +165,35 @@ void Manager::setVector3 (const std::string &setting, const std::string &categor
 
 void Manager::resetPendingChange(const std::string &setting, const std::string &category)
 {
-    CategorySettingValueMap::key_type key = std::make_pair(category, setting);
+    CategorySettingValueMap::key_type key (category, setting);
     mChangedSettings.erase(key);
 }
 
-const CategorySettingVector Manager::getPendingChanges()
+CategorySettingVector Manager::getPendingChanges()
 {
     return mChangedSettings;
 }
 
+CategorySettingVector Manager::getPendingChanges(const CategorySettingVector& filter)
+{
+    CategorySettingVector intersection;
+    std::set_intersection(mChangedSettings.begin(), mChangedSettings.end(),
+                          filter.begin(), filter.end(),
+                          std::inserter(intersection, intersection.begin()));
+    return intersection;
+}
+
 void Manager::resetPendingChanges()
 {
     mChangedSettings.clear();
 }
 
+void Manager::resetPendingChanges(const CategorySettingVector& filter)
+{
+    for (const auto& key : filter)
+    {
+        mChangedSettings.erase(key);
+    }
+}
+
 }
diff --git a/components/settings/settings.hpp b/components/settings/settings.hpp
index e3a29d4c34..21d5aff770 100644
--- a/components/settings/settings.hpp
+++ b/components/settings/settings.hpp
@@ -36,11 +36,19 @@ namespace Settings
         ///< save user settings to file
 
         static void resetPendingChange(const std::string &setting, const std::string &category);
+        ///< resets a single pending change
 
         static void resetPendingChanges();
+        ///< resets the list of all pending changes
 
-        static const CategorySettingVector getPendingChanges();
-        ///< returns the list of changed settings and then clears it
+        static void resetPendingChanges(const CategorySettingVector& filter);
+        ///< resets only the pending changes listed in the filter
+
+        static CategorySettingVector getPendingChanges();
+        ///< returns the list of changed settings
+
+        static CategorySettingVector getPendingChanges(const CategorySettingVector& filter);
+        ///< returns the list of changed settings intersecting with the filter
 
         static int getInt (const std::string& setting, const std::string& category);
         static float getFloat (const std::string& setting, const std::string& category);
@@ -50,15 +58,15 @@ namespace Settings
         static osg::Vec2f getVector2 (const std::string& setting, const std::string& category);
         static osg::Vec3f getVector3 (const std::string& setting, const std::string& category);
 
-        static void setInt (const std::string& setting, const std::string& category, const int value);
-        static void setFloat (const std::string& setting, const std::string& category, const float value);
-        static void setDouble (const std::string& setting, const std::string& category, const double value);
+        static void setInt (const std::string& setting, const std::string& category, int value);
+        static void setFloat (const std::string& setting, const std::string& category, float value);
+        static void setDouble (const std::string& setting, const std::string& category, double value);
         static void setString (const std::string& setting, const std::string& category, const std::string& value);
-        static void setBool (const std::string& setting, const std::string& category, const bool value);
-        static void setVector2 (const std::string& setting, const std::string& category, const osg::Vec2f value);
-        static void setVector3 (const std::string& setting, const std::string& category, const osg::Vec3f value);
+        static void setBool (const std::string& setting, const std::string& category, bool value);
+        static void setVector2 (const std::string& setting, const std::string& category, osg::Vec2f value);
+        static void setVector3 (const std::string& setting, const std::string& category, osg::Vec3f value);
     };
 
 }
 
-#endif // _COMPONENTS_SETTINGS_H
+#endif // COMPONENTS_SETTINGS_H

From f1ec8db393f5ff7bae77bf0ba16540763c5b56e9 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 20 Nov 2021 00:15:18 +0100
Subject: [PATCH 1799/2859] Make Set- and ModStat behave as they should

---
 CHANGELOG.md                             |  1 +
 apps/openmw/mwmechanics/stat.cpp         | 15 +++++++-
 apps/openmw/mwmechanics/stat.hpp         |  7 ++--
 apps/openmw/mwscript/statsextensions.cpp | 47 ++++++++++--------------
 4 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f5b83f158..0cff18a5f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 
     Bug #1751: Birthsign abilities increase modified attribute values instead of base ones
     Bug #1930: Followers are still fighting if a target stops combat with a leader
+    Bug #2036: SetStat and ModStat instructions aren't implemented the same way as in Morrowind
     Bug #3246: ESSImporter: Most NPCs are dead on save load
     Bug #3488: AI combat aiming is too slow
     Bug #3514: Editing a reference's position after loading an esp file makes the reference disappear
diff --git a/apps/openmw/mwmechanics/stat.cpp b/apps/openmw/mwmechanics/stat.cpp
index c87de2ccbb..ee484f5afd 100644
--- a/apps/openmw/mwmechanics/stat.cpp
+++ b/apps/openmw/mwmechanics/stat.cpp
@@ -246,14 +246,25 @@ namespace MWMechanics
         return mModifier;
     }
 
-    void AttributeValue::setBase(float base)
+    void AttributeValue::setBase(float base, bool clearModifier)
     {
         mBase = base;
+        if(clearModifier)
+        {
+            mModifier = 0.f;
+            mDamage = 0.f;
+        }
     }
 
     void AttributeValue::setModifier(float mod)
     {
-        mModifier = mod;
+        if(mod < 0)
+        {
+            mModifier = 0.f;
+            mDamage -= mod;
+        }
+        else
+            mModifier = mod;
     }
 
     void AttributeValue::damage(float damage)
diff --git a/apps/openmw/mwmechanics/stat.hpp b/apps/openmw/mwmechanics/stat.hpp
index fb9dca9221..c80c5b1b70 100644
--- a/apps/openmw/mwmechanics/stat.hpp
+++ b/apps/openmw/mwmechanics/stat.hpp
@@ -133,13 +133,14 @@ namespace MWMechanics
         float getBase() const;
         float getModifier() const;
 
-        void setBase(float base);
+        void setBase(float base, bool clearModifier = false);
 
         void setModifier(float mod);
 
         // Maximum attribute damage is limited to the modified value.
-        // Note: I think MW applies damage directly to mModified, since you can also
-        // "restore" drained attributes. We need to rewrite the magic effect system to support this.
+        // Note: MW applies damage directly to mModified, however it does track how much
+        // a damaged attribute that has been fortified beyond its base can be restored.
+        // Getting rid of mDamage would require calculating its value by ignoring active effects when restoring
         void damage(float damage);
         void restore(float amount);
 
diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp
index ccad186a0d..e57a9570f2 100644
--- a/apps/openmw/mwscript/statsextensions.cpp
+++ b/apps/openmw/mwscript/statsextensions.cpp
@@ -40,6 +40,22 @@ namespace
 
         return factionId;
     }
+
+    void modStat(MWMechanics::AttributeValue& stat, float amount)
+    {
+        float base = stat.getBase();
+        float modifier = stat.getModifier() - stat.getDamage();
+        float modified = base + modifier;
+        if(modified <= 0.f && amount < 0.f)
+            amount = 0.f;
+        else if(amount < 0.f && modified + amount < 0.f)
+            amount = -modified;
+        else if((modifier <= 0.f || base >= 100.f) && amount > 0.f)
+            amount = std::clamp(100.f - modified, 0.f, amount);
+        stat.setBase(std::min(base + amount, 100.f), true);
+        modifier += base - stat.getBase() + amount;
+        stat.setModifier(modifier);
+    }
 }
 
 namespace MWScript
@@ -122,7 +138,7 @@ namespace MWScript
                     runtime.pop();
 
                     MWMechanics::AttributeValue attribute = ptr.getClass().getCreatureStats(ptr).getAttribute(mIndex);
-                    attribute.setBase (value);
+                    attribute.setBase(value, true);
                     ptr.getClass().getCreatureStats(ptr).setAttribute(mIndex, attribute);
                 }
         };
@@ -146,19 +162,7 @@ namespace MWScript
                     MWMechanics::AttributeValue attribute = ptr.getClass()
                         .getCreatureStats(ptr)
                         .getAttribute(mIndex);
-
-                    if (value == 0)
-                        return;
-
-                    if (((attribute.getBase() <= 0) && (value < 0))
-                        || ((attribute.getBase() >= 100) && (value > 0)))
-                        return;
-
-                    if (value < 0)
-                        attribute.setBase(std::max(0.f, attribute.getBase() + value));
-                    else
-                        attribute.setBase(std::min(100.f, attribute.getBase() + value));
-
+                    modStat(attribute, value);
                     ptr.getClass().getCreatureStats(ptr).setAttribute(mIndex, attribute);
                 }
         };
@@ -372,7 +376,7 @@ namespace MWScript
 
                     MWMechanics::NpcStats& stats = ptr.getClass().getNpcStats (ptr);
 
-                    stats.getSkill (mIndex).setBase (value);
+                    stats.getSkill(mIndex).setBase(value, true);
                 }
         };
 
@@ -395,18 +399,7 @@ namespace MWScript
                     MWMechanics::SkillValue &skill = ptr.getClass()
                         .getNpcStats(ptr)
                         .getSkill(mIndex);
-
-                    if (value == 0)
-                        return;
-
-                    if (((skill.getBase() <= 0.f) && (value < 0.f))
-                        || ((skill.getBase() >= 100.f) && (value > 0.f)))
-                        return;
-
-                    if (value < 0)
-                        skill.setBase(std::max(0.f, skill.getBase() + value));
-                    else
-                        skill.setBase(std::min(100.f, skill.getBase() + value));
+                    modStat(skill, value);
                 }
         };
 

From f50cbcad812845e2712671c2e9db99d8333fbedc Mon Sep 17 00:00:00 2001
From: Thomas Lowe <musicaltommy@gmail.com>
Date: Tue, 30 Nov 2021 20:07:29 -0500
Subject: [PATCH 1800/2859]  * AA combo box no longer disables the AA alpha
 test checkbox.  * Updated AA alpha test description to be more accurate

---
 apps/launcher/advancedpage.cpp | 7 -------
 apps/launcher/advancedpage.hpp | 1 -
 apps/launcher/graphicspage.cpp | 4 ----
 apps/launcher/graphicspage.hpp | 1 -
 apps/launcher/maindialog.cpp   | 1 -
 files/ui/advancedpage.ui       | 2 +-
 6 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index c7e228878c..d09704851a 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -121,7 +121,6 @@ bool Launcher::AdvancedPage::loadSettings()
         loadSettingBool(antialiasAlphaTestCheckBox, "antialias alpha test", "Shaders");
         if (Settings::Manager::getInt("antialiasing", "Video") == 0) {
             antialiasAlphaTestCheckBox->setCheckState(Qt::Unchecked);
-            antialiasAlphaTestCheckBox->setEnabled(false);
         }
         loadSettingBool(magicItemAnimationsCheckBox, "use magic item animations", "Game");
         connect(animSourcesCheckBox, SIGNAL(toggled(bool)), this, SLOT(slotAnimSourcesToggled(bool)));
@@ -445,12 +444,6 @@ void Launcher::AdvancedPage::slotLoadedCellsChanged(QStringList cellNames)
     loadCellsForAutocomplete(cellNames);
 }
 
-void Launcher::AdvancedPage::slotAASettingChanged(int aaLevel) {
-    antialiasAlphaTestCheckBox->setEnabled(aaLevel > 0);
-    if (aaLevel == 0)
-        antialiasAlphaTestCheckBox->setCheckState(Qt::Unchecked);
-}
-
 void Launcher::AdvancedPage::slotAnimSourcesToggled(bool checked)
 {
     weaponSheathingCheckBox->setEnabled(checked);
diff --git a/apps/launcher/advancedpage.hpp b/apps/launcher/advancedpage.hpp
index e26f1690e9..1d16fae706 100644
--- a/apps/launcher/advancedpage.hpp
+++ b/apps/launcher/advancedpage.hpp
@@ -24,7 +24,6 @@ namespace Launcher
 
     public slots:
         void slotLoadedCellsChanged(QStringList cellNames);
-        void slotAASettingChanged(int aaLevel);
 
     private slots:
         void on_skipMenuCheckBox_stateChanged(int state);
diff --git a/apps/launcher/graphicspage.cpp b/apps/launcher/graphicspage.cpp
index 06cc98c741..e6d857a943 100644
--- a/apps/launcher/graphicspage.cpp
+++ b/apps/launcher/graphicspage.cpp
@@ -49,10 +49,6 @@ Launcher::GraphicsPage::GraphicsPage(QWidget *parent)
     connect(shadowDistanceCheckBox, SIGNAL(toggled(bool)), this, SLOT(slotShadowDistLimitToggled(bool)));
 }
 
-void Launcher::GraphicsPage::connectAntiAliasingChanged(const QObject* receiver, const char* slot) {
-    connect(antiAliasingComboBox, SIGNAL(currentIndexChanged(int)), receiver, slot);
-}
-
 bool Launcher::GraphicsPage::setupSDL()
 {
     bool sdlConnectSuccessful = initSDL();
diff --git a/apps/launcher/graphicspage.hpp b/apps/launcher/graphicspage.hpp
index d86b570914..a6754ccb04 100644
--- a/apps/launcher/graphicspage.hpp
+++ b/apps/launcher/graphicspage.hpp
@@ -20,7 +20,6 @@ namespace Launcher
     public:
         explicit GraphicsPage(QWidget *parent = nullptr);
 
-        void connectAntiAliasingChanged(const QObject *receiver, const char *slot);
         void saveSettings();
         bool loadSettings();
 
diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp
index d58be7afcf..d335d7cded 100644
--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@@ -146,7 +146,6 @@ void Launcher::MainDialog::createPages()
     connect(mDataFilesPage, SIGNAL(signalProfileChanged(int)), mPlayPage, SLOT(setProfilesIndex(int)));
     // Using Qt::QueuedConnection because signal is emitted in a subthread and slot is in the main thread
     connect(mDataFilesPage, SIGNAL(signalLoadedCellsChanged(QStringList)), mAdvancedPage, SLOT(slotLoadedCellsChanged(QStringList)), Qt::QueuedConnection);
-    mGraphicsPage->connectAntiAliasingChanged(mAdvancedPage, SLOT(slotAASettingChanged(int)));
 }
 
 Launcher::FirstRunDialogResult Launcher::MainDialog::showFirstRunDialog()
diff --git a/files/ui/advancedpage.ui b/files/ui/advancedpage.ui
index f782c6caa0..4b7434dc35 100644
--- a/files/ui/advancedpage.ui
+++ b/files/ui/advancedpage.ui
@@ -457,7 +457,7 @@
               <item row="3" column="1">
                <widget class="QCheckBox" name="antialiasAlphaTestCheckBox">
                 <property name="toolTip">
-                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enables alpha testing for smoother anti-aliasing (Requires anti-aliasing to be enabled)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Allows MSAA to work with alpha-tested meshes, producing better-looking edges without pixelation. Can negatively impact performance if MSAA is off.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                 </property>
                 <property name="text">
                  <string>Use anti-alias alpha testing</string>

From b02560bbaed89e3a7293f064439377b3a88c1153 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Wed, 1 Dec 2021 11:11:02 +0100
Subject: [PATCH 1801/2859] Add a precision parameter to format floating point
 number in stats mode

---
 scripts/osg_stats.py | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/scripts/osg_stats.py b/scripts/osg_stats.py
index 037aafea00..d28558217e 100755
--- a/scripts/osg_stats.py
+++ b/scripts/osg_stats.py
@@ -35,6 +35,8 @@ import termtables
                    'between Physics Actors and physics_time_taken. Format: --plot <x> <y> <function>.')
 @click.option('--stats', type=str, multiple=True,
               help='Print table with stats for a given metric containing min, max, mean, median etc.')
+@click.option('--precision', type=int,
+              help='Format floating point numbers with given precision')
 @click.option('--timeseries_sum', is_flag=True,
               help='Add a graph to timeseries for a sum per frame of all given timeseries metrics.')
 @click.option('--commulative_timeseries_sum', is_flag=True,
@@ -54,7 +56,7 @@ import termtables
 @click.option('--threshold_value', type=float, default=1.05/60,
               help='Threshold for hist_over.')
 @click.argument('path', type=click.Path(), nargs=-1)
-def main(print_keys, timeseries, hist, hist_ratio, stdev_hist, plot, stats,
+def main(print_keys, timeseries, hist, hist_ratio, stdev_hist, plot, stats, precision,
          timeseries_sum, stats_sum, begin_frame, end_frame, path,
          commulative_timeseries, commulative_timeseries_sum, frame_number_name,
          hist_threshold, threshold_name, threshold_value):
@@ -82,7 +84,7 @@ def main(print_keys, timeseries, hist, hist_ratio, stdev_hist, plot, stats,
     if plot:
         draw_plots(sources=frames, plots=plot)
     if stats:
-        print_stats(sources=frames, keys=stats, stats_sum=stats_sum)
+        print_stats(sources=frames, keys=stats, stats_sum=stats_sum, precision=precision)
     if hist_threshold:
         draw_hist_threshold(sources=frames, keys=hist_threshold, begin_frame=begin_frame,
                             threshold_name=threshold_name, threshold_value=threshold_value)
@@ -242,13 +244,13 @@ def draw_plots(sources, plots):
     fig.canvas.set_window_title('plots')
 
 
-def print_stats(sources, keys, stats_sum):
+def print_stats(sources, keys, stats_sum, precision):
     stats = list()
     for name, frames in sources.items():
         for key in keys:
-            stats.append(make_stats(source=name, key=key, values=filter_not_none(frames[key])))
+            stats.append(make_stats(source=name, key=key, values=filter_not_none(frames[key]), precision=precision))
         if stats_sum:
-            stats.append(make_stats(source=name, key='sum', values=sum_multiple(frames, keys)))
+            stats.append(make_stats(source=name, key='sum', values=sum_multiple(frames, keys), precision=precision))
     metrics = list(stats[0].keys())
     termtables.print(
         [list(v.values()) for v in stats],
@@ -282,6 +284,10 @@ def filter_not_none(values):
     return [v for v in values if v is not None]
 
 
+def fixed_float(value, precision):
+    return '{v:.{p}f}'.format(v=value, p=precision) if precision else value
+
+
 def sum_multiple(frames, keys):
     result = collections.Counter()
     for key in keys:
@@ -292,17 +298,17 @@ def sum_multiple(frames, keys):
     return numpy.array([result[k] for k in sorted(result.keys())])
 
 
-def make_stats(source, key, values):
+def make_stats(source, key, values, precision):
     return collections.OrderedDict(
         source=source,
         key=key,
         number=len(values),
-        min=min(values),
-        max=max(values),
-        mean=statistics.mean(values),
-        median=statistics.median(values),
-        stdev=statistics.stdev(values),
-        q95=numpy.quantile(values, 0.95),
+        min=fixed_float(min(values), precision),
+        max=fixed_float(max(values), precision),
+        mean=fixed_float(statistics.mean(values), precision),
+        median=fixed_float(statistics.median(values), precision),
+        stdev=fixed_float(statistics.stdev(values), precision),
+        q95=fixed_float(numpy.quantile(values, 0.95), precision),
     )
 
 

From 3754e59de0c9ac3cd3d518d6990ac7091b25da4f Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Wed, 1 Dec 2021 11:46:02 +0100
Subject: [PATCH 1802/2859] Add a regexp_match flag for keys used in stats and
 timeseries. When set, the argument given is considered a regexp against which
 the keys are matched.

---
 scripts/osg_stats.py | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/scripts/osg_stats.py b/scripts/osg_stats.py
index d28558217e..275e70dcff 100755
--- a/scripts/osg_stats.py
+++ b/scripts/osg_stats.py
@@ -12,11 +12,14 @@ import numpy
 import statistics
 import sys
 import termtables
+import re
 
 
 @click.command()
 @click.option('--print_keys', is_flag=True,
               help='Print a list of all present keys in the input file.')
+@click.option('--regexp_match', is_flag=True,
+              help='Use all metric that match given key. Can be used with stats and timeseries.')
 @click.option('--timeseries', type=str, multiple=True,
               help='Show a graph for given metric over time.')
 @click.option('--commulative_timeseries', type=str, multiple=True,
@@ -56,7 +59,7 @@ import termtables
 @click.option('--threshold_value', type=float, default=1.05/60,
               help='Threshold for hist_over.')
 @click.argument('path', type=click.Path(), nargs=-1)
-def main(print_keys, timeseries, hist, hist_ratio, stdev_hist, plot, stats, precision,
+def main(print_keys, regexp_match, timeseries, hist, hist_ratio, stdev_hist, plot, stats, precision,
          timeseries_sum, stats_sum, begin_frame, end_frame, path,
          commulative_timeseries, commulative_timeseries_sum, frame_number_name,
          hist_threshold, threshold_name, threshold_value):
@@ -70,10 +73,10 @@ def main(print_keys, timeseries, hist, hist_ratio, stdev_hist, plot, stats, prec
         for v in keys:
             print(v)
     if timeseries:
-        draw_timeseries(sources=frames, keys=timeseries, add_sum=timeseries_sum,
+        draw_timeseries(sources=frames, keys=matching_keys(keys, timeseries, regexp_match), add_sum=timeseries_sum,
                         begin_frame=begin_frame, end_frame=end_frame)
     if commulative_timeseries:
-        draw_commulative_timeseries(sources=frames, keys=commulative_timeseries, add_sum=commulative_timeseries_sum,
+        draw_commulative_timeseries(sources=frames, keys=matching_keys(keys, commulative_timeseries, regexp_match), add_sum=commulative_timeseries_sum,
                                     begin_frame=begin_frame, end_frame=end_frame)
     if hist:
         draw_hists(sources=frames, keys=hist)
@@ -84,7 +87,7 @@ def main(print_keys, timeseries, hist, hist_ratio, stdev_hist, plot, stats, prec
     if plot:
         draw_plots(sources=frames, plots=plot)
     if stats:
-        print_stats(sources=frames, keys=stats, stats_sum=stats_sum, precision=precision)
+        print_stats(sources=frames, keys=matching_keys(keys, stats, regexp_match), stats_sum=stats_sum, precision=precision)
     if hist_threshold:
         draw_hist_threshold(sources=frames, keys=hist_threshold, begin_frame=begin_frame,
                             threshold_name=threshold_name, threshold_value=threshold_value)
@@ -142,6 +145,12 @@ def collect_unique_keys(sources):
     return sorted(result)
 
 
+def matching_keys(keys, patterns, regexp_match):
+    if regexp_match:
+        return { key for pattern in patterns for key in keys if re.search(pattern, key) }
+    return keys
+
+
 def draw_timeseries(sources, keys, add_sum, begin_frame, end_frame):
     fig, ax = matplotlib.pyplot.subplots()
     x = numpy.array(range(begin_frame, end_frame))

From 893d569529724dc2cf782a34d0f8c832c0c9b72b Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 1 Dec 2021 18:21:21 +0100
Subject: [PATCH 1803/2859] Force the loot UI open if it was open while
 resurrecting the lootee

---
 apps/openmw/mwbase/windowmanager.hpp     |  1 +
 apps/openmw/mwgui/container.cpp          |  5 ++++-
 apps/openmw/mwgui/container.hpp          |  3 ++-
 apps/openmw/mwgui/windowmanagerimp.cpp   | 21 +++++++++++++++++----
 apps/openmw/mwgui/windowmanagerimp.hpp   |  4 ++++
 apps/openmw/mwscript/statsextensions.cpp |  7 ++++++-
 6 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index 961a63ac79..958bb466ab 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -355,6 +355,7 @@ namespace MWBase
             virtual const std::string& getVersionDescription() const = 0;
 
             virtual void onDeleteCustomData(const MWWorld::Ptr& ptr) = 0;
+            virtual void forceLootMode(const MWWorld::Ptr& ptr) = 0;
     };
 }
 
diff --git a/apps/openmw/mwgui/container.cpp b/apps/openmw/mwgui/container.cpp
index de771051ef..fdfd192cc1 100644
--- a/apps/openmw/mwgui/container.cpp
+++ b/apps/openmw/mwgui/container.cpp
@@ -38,6 +38,7 @@ namespace MWGui
         , mSortModel(nullptr)
         , mModel(nullptr)
         , mSelectedItem(-1)
+        , mTreatNextOpenAsLoot(false)
     {
         getWidget(mDisposeCorpseButton, "DisposeCorpseButton");
         getWidget(mTakeButton, "TakeButton");
@@ -121,13 +122,15 @@ namespace MWGui
 
     void ContainerWindow::setPtr(const MWWorld::Ptr& container)
     {
+        bool lootAnyway = mTreatNextOpenAsLoot;
+        mTreatNextOpenAsLoot = false;
         mPtr = container;
 
         bool loot = mPtr.getClass().isActor() && mPtr.getClass().getCreatureStats(mPtr).isDead();
 
         if (mPtr.getClass().hasInventoryStore(mPtr))
         {
-            if (mPtr.getClass().isNpc() && !loot)
+            if (mPtr.getClass().isNpc() && !loot && !lootAnyway)
             {
                 // we are stealing stuff
                 mModel = new PickpocketItemModel(mPtr, new InventoryItemModel(container),
diff --git a/apps/openmw/mwgui/container.hpp b/apps/openmw/mwgui/container.hpp
index 2a0dee44e2..66a20e7ef5 100644
--- a/apps/openmw/mwgui/container.hpp
+++ b/apps/openmw/mwgui/container.hpp
@@ -37,6 +37,7 @@ namespace MWGui
 
         void onDeleteCustomData(const MWWorld::Ptr& ptr) override;
 
+        void treatNextOpenAsLoot() { mTreatNextOpenAsLoot = true; };
     private:
         DragAndDrop* mDragAndDrop;
 
@@ -44,7 +45,7 @@ namespace MWGui
         SortFilterItemModel* mSortModel;
         ItemModel* mModel;
         int mSelectedItem;
-
+        bool mTreatNextOpenAsLoot;
         MyGUI::Button* mDisposeCorpseButton;
         MyGUI::Button* mTakeButton;
         MyGUI::Button* mCloseButton;
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index a935d7f900..3417fb479b 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -165,6 +165,7 @@ namespace MWGui
       , mScreenFader(nullptr)
       , mDebugWindow(nullptr)
       , mJailScreen(nullptr)
+      , mContainerWindow(nullptr)
       , mTranslationDataStorage (translationDataStorage)
       , mCharGen(nullptr)
       , mInputBlocker(nullptr)
@@ -360,10 +361,10 @@ namespace MWGui
         mGuiModeStates[GM_Dialogue] = GuiModeState(mDialogueWindow);
         mTradeWindow->eventTradeDone += MyGUI::newDelegate(mDialogueWindow, &DialogueWindow::onTradeComplete);
 
-        ContainerWindow* containerWindow = new ContainerWindow(mDragAndDrop);
-        mWindows.push_back(containerWindow);
-        trackWindow(containerWindow, "container");
-        mGuiModeStates[GM_Container] = GuiModeState({containerWindow, mInventoryWindow});
+        mContainerWindow = new ContainerWindow(mDragAndDrop);
+        mWindows.push_back(mContainerWindow);
+        trackWindow(mContainerWindow, "container");
+        mGuiModeStates[GM_Container] = GuiModeState({mContainerWindow, mInventoryWindow});
 
         mHud = new HUD(mCustomMarkers, mDragAndDrop, mLocalMapRender);
         mWindows.push_back(mHud);
@@ -1166,6 +1167,16 @@ namespace MWGui
     }
 
     void WindowManager::pushGuiMode(GuiMode mode, const MWWorld::Ptr& arg)
+    {
+        pushGuiMode(mode, arg, false);
+    }
+
+    void WindowManager::forceLootMode(const MWWorld::Ptr& ptr)
+    {
+        pushGuiMode(MWGui::GM_Container, ptr, true);
+    }
+
+    void WindowManager::pushGuiMode(GuiMode mode, const MWWorld::Ptr& arg, bool force)
     {
         if (mode==GM_Inventory && mAllowed==GW_None)
             return;
@@ -1188,6 +1199,8 @@ namespace MWGui
             mGuiModeStates[mode].update(true);
             playSound(mGuiModeStates[mode].mOpenSound);
         }
+        if(force)
+            mContainerWindow->treatNextOpenAsLoot();
         for (WindowBase* window : mGuiModeStates[mode].mWindows)
             window->setPtr(arg);
 
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index 9ec79e0c82..f68592cb5d 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -389,6 +389,7 @@ namespace MWGui
     const std::string& getVersionDescription() const override;
 
     void onDeleteCustomData(const MWWorld::Ptr& ptr) override;
+    void forceLootMode(const MWWorld::Ptr& ptr) override;
 
   private:
     unsigned int mOldUpdateMask; unsigned int mOldCullMask;
@@ -447,6 +448,7 @@ namespace MWGui
     ScreenFader* mScreenFader;
     DebugWindow* mDebugWindow;
     JailScreen* mJailScreen;
+    ContainerWindow* mContainerWindow;
 
     std::vector<WindowBase*> mWindows;
 
@@ -573,6 +575,8 @@ namespace MWGui
     void enableScene(bool enable);
 
     void handleScheduledMessageBoxes();
+
+    void pushGuiMode(GuiMode mode, const MWWorld::Ptr& arg, bool force);
   };
 }
 
diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp
index ccad186a0d..c53588ed22 100644
--- a/apps/openmw/mwscript/statsextensions.cpp
+++ b/apps/openmw/mwscript/statsextensions.cpp
@@ -1195,7 +1195,9 @@ namespace MWScript
                         bool wasEnabled = ptr.getRefData().isEnabled();
                         MWBase::Environment::get().getWorld()->undeleteObject(ptr);
                         MWBase::Environment::get().getWorld()->removeContainerScripts(ptr);
-                        MWBase::Environment::get().getWindowManager()->onDeleteCustomData(ptr);
+                        auto windowManager = MWBase::Environment::get().getWindowManager();
+                        bool wasOpen = windowManager->containsMode(MWGui::GM_Container);
+                        windowManager->onDeleteCustomData(ptr);
 
                         // HACK: disable/enable object to re-add it to the scene properly (need a new Animation).
                         MWBase::Environment::get().getWorld()->disable(ptr);
@@ -1203,6 +1205,9 @@ namespace MWScript
                         ptr.getRefData().setCustomData(nullptr);
                         if (wasEnabled)
                             MWBase::Environment::get().getWorld()->enable(ptr);
+                        // Reopen the loot GUI if it was closed because we resurrected the actor we were looting
+                        if (wasOpen && !windowManager->containsMode(MWGui::GM_Container))
+                            windowManager->forceLootMode(ptr);
                     }
                 }
         };

From dca0fa0a415b5b994067a1633429b2852e7560c2 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 1 Dec 2021 21:39:53 +0000
Subject: [PATCH 1804/2859] Remove teleportation effects after they've been
 applied

---
 apps/openmw/mwmechanics/spelleffects.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp
index 566fb9eded..d41cf82a9c 100644
--- a/apps/openmw/mwmechanics/spelleffects.cpp
+++ b/apps/openmw/mwmechanics/spelleffects.cpp
@@ -798,6 +798,11 @@ MagicApplicationResult applyMagicEffect(const MWWorld::Ptr& target, const MWWorl
             MWBase::Environment::get().getWindowManager()->messageBox ("#{sLevitateDisabled}");
         return MagicApplicationResult::REMOVED;
     }
+    else if(effect.mEffectId == ESM::MagicEffect::AlmsiviIntervention || effect.mEffectId == ESM::MagicEffect::DivineIntervention || effect.mEffectId == ESM::MagicEffect::Recall)
+    {
+        if(effect.mFlags & ESM::ActiveEffect::Flag_Applied)
+            return MagicApplicationResult::REMOVED;
+    }
     const auto* magicEffect = world->getStore().get<ESM::MagicEffect>().find(effect.mEffectId);
     if(effect.mFlags & ESM::ActiveEffect::Flag_Applied)
     {

From a680952434f292c758b7b640d35ddb33bb94410c Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Wed, 1 Dec 2021 21:43:31 +0000
Subject: [PATCH 1805/2859] Combine daily and on-push build declarations

---
 .gitlab-ci.yml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 47511923ad..349bb5ffa3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -395,21 +395,16 @@ Windows_Ninja_Tests_RelWithDebInfo:
     - MSVC2019_64/*/*/*/*/*/*/*.log
     - MSVC2019_64/*/*/*/*/*/*/*/*.log
 
-Daily_Windows_MSBuild_Engine_Release:on-schedule:
-  extends:
-    - .Windows_MSBuild_Base
-  variables:
-    <<: *engine-targets
-    config: "Release"
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "schedule"
-
 Windows_MSBuild_Engine_Release:
   extends:
     - .Windows_MSBuild_Base
   variables:
     <<: *engine-targets
     config: "Release"
+  rules:
+    # run this for both pushes and schedules so 'latest successful pipeline for branch' always includes it
+    - if: $CI_PIPELINE_SOURCE == "push"
+    - if: $CI_PIPELINE_SOURCE == "schedule" 
 
 Windows_MSBuild_Engine_Debug:
   extends:
@@ -431,6 +426,10 @@ Windows_MSBuild_CS_Release:
   variables:
     <<: *cs-targets
     config: "Release"
+  rules:
+    # run this for both pushes and schedules so 'latest successful pipeline for branch' always includes it
+    - if: $CI_PIPELINE_SOURCE == "push"
+    - if: $CI_PIPELINE_SOURCE == "schedule" 
 
 Windows_MSBuild_CS_Debug:
   extends:

From ead0cb5ce07148bed0cded91c335e3a2534751e2 Mon Sep 17 00:00:00 2001
From: Ivan Beloborodov <myrix@mail.ru>
Date: Thu, 2 Dec 2021 08:04:29 +0000
Subject: [PATCH 1806/2859] #6419 Topic shouldn't be greyed out if they can
 produce another topic reference.

---
 AUTHORS.md                                    |  1 +
 CHANGELOG.md                                  |  1 +
 apps/openmw/mwdialogue/dialoguemanagerimp.cpp | 66 ++++++++++++++-----
 apps/openmw/mwdialogue/dialoguemanagerimp.hpp | 13 +++-
 4 files changed, 62 insertions(+), 19 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index 8ca9db90b9..4b6c054619 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -92,6 +92,7 @@ Programmers
     Haoda Wang (h313)
     hristoast
     Internecine
+    Ivan Beloborodov (myrix)
     Jackerty
     Jacob Essex (Yacoby)
     Jacob Turnbull (Tankinfrank)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f5b83f158..c3a84f5909 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -110,6 +110,7 @@
     Feature #6251: OpenMW-CS: Set instance movement based on camera zoom
     Feature #6288: Preserve the "blocked" record flag for referenceable objects.
     Feature #6380: Commas are treated as whitespace in vanilla
+    Feature #6419: Topics shouldn't be greyed out if they can produce another topic reference
     Task #6201: Remove the "Note: No relevant classes found. No output generated" warnings
     Task #6264: Remove the old classes in animation.cpp
 
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index 5270c0143a..9800f1b39c 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -76,9 +76,10 @@ namespace MWDialogue
         mKnownTopics.insert( Misc::StringUtils::lowerCase(topic) );
     }
 
-    void DialogueManager::parseText (const std::string& text)
+    std::vector<std::string> DialogueManager::parseTopicIdsFromText (const std::string& text)
     {
-        updateActorKnownTopics();
+        std::vector<std::string> topicIdList;
+
         std::vector<HyperTextParser::Token> hypertext = HyperTextParser::parseHyperText(text);
 
         for (std::vector<HyperTextParser::Token>::iterator tok = hypertext.begin(); tok != hypertext.end(); ++tok)
@@ -95,6 +96,18 @@ namespace MWDialogue
                 topicId = mTranslationDataStorage.topicStandardForm(topicId);
             }
 
+            topicIdList.push_back(topicId);
+        }
+
+        return topicIdList;
+    }
+
+    void DialogueManager::addTopicsFromText (const std::string& text)
+    {
+        updateActorKnownTopics();
+
+        for (const auto& topicId : parseTopicIdsFromText(text))
+        {
             if (mActorKnownTopics.count( topicId ))
                 mKnownTopics.insert( topicId );
         }
@@ -136,7 +149,6 @@ namespace MWDialogue
         mTalkedTo = creatureStats.hasTalkedToPlayer();
 
         mActorKnownTopics.clear();
-        mActorKnownTopicsFlag.clear();
 
         //greeting
         const MWWorld::Store<ESM::Dialogue> &dialogs =
@@ -163,7 +175,7 @@ namespace MWDialogue
                     executeScript (info->mResultScript, mActor);
                     mLastTopic = it->mId;
 
-                    parseText (info->mResponse);
+                    addTopicsFromText (info->mResponse);
 
                     return true;
                 }
@@ -277,7 +289,10 @@ namespace MWDialogue
 
         const ESM::Dialogue& dialogue = *dialogues.find (topic);
 
-        const ESM::DialInfo* info = filter.search(dialogue, true);
+        const ESM::DialInfo* info =
+            mChoice == -1 && mActorKnownTopics.count(topic) ?
+                mActorKnownTopics[topic].mInfo : filter.search(dialogue, true);
+        
         if (info)
         {
             std::string title;
@@ -320,7 +335,7 @@ namespace MWDialogue
 
             executeScript (info->mResultScript, mActor);
 
-            parseText (info->mResponse);
+            addTopicsFromText (info->mResponse);
         }
     }
 
@@ -339,7 +354,6 @@ namespace MWDialogue
         updateGlobals();
 
         mActorKnownTopics.clear();
-        mActorKnownTopicsFlag.clear();
 
         const auto& dialogs = MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>();
 
@@ -354,21 +368,41 @@ namespace MWDialogue
 
                 if (answer != nullptr)
                 {
-                    int flag = 0;
+                    int topicFlags = 0;
                     if(!inJournal(topicId, answer->mId))
                     {
                         // Does this dialogue contains some actor-specific answer?
                         if (Misc::StringUtils::ciEqual(answer->mActor, mActor.getCellRef().getRefId()))
-                            flag |= MWBase::DialogueManager::TopicType::Specific;
+                            topicFlags |= MWBase::DialogueManager::TopicType::Specific;
                     }
                     else
-                        flag |= MWBase::DialogueManager::TopicType::Exhausted;
-                    mActorKnownTopics.insert (dialog.mId);
-                    mActorKnownTopicsFlag[dialog.mId] = flag;
+                        topicFlags |= MWBase::DialogueManager::TopicType::Exhausted;
+                    mActorKnownTopics.insert (std::make_pair(dialog.mId, ActorKnownTopicInfo {topicFlags, answer}));
                 }
 
             }
         }
+
+        // If response to a topic leads to a new topic, the original topic is not exhausted.
+
+        for (auto& [dialogId, topicInfo] : mActorKnownTopics)
+        {
+            // If the topic is not marked as exhausted, we don't need to do anything about it.
+            // If the topic will not be shown to the player, the flag actually does not matter.
+
+            if (!(topicInfo.mFlags & MWBase::DialogueManager::TopicType::Exhausted) ||
+                !mKnownTopics.count(dialogId))
+                continue;
+
+            for (const auto& topicId : parseTopicIdsFromText(topicInfo.mInfo->mResponse))
+            {
+                if (mActorKnownTopics.count( topicId ) && !mKnownTopics.count( topicId ))
+                {
+                    topicInfo.mFlags &= ~MWBase::DialogueManager::TopicType::Exhausted;
+                    break;
+                }
+            }
+        }
     }
 
     std::list<std::string> DialogueManager::getAvailableTopics()
@@ -377,7 +411,7 @@ namespace MWDialogue
 
         std::list<std::string> keywordList;
 
-        for (const std::string& topic : mActorKnownTopics)
+        for (const auto& [topic, topicInfo] : mActorKnownTopics)
         {
             //does the player know the topic?
             if (mKnownTopics.count(topic))
@@ -391,7 +425,7 @@ namespace MWDialogue
 
     int DialogueManager::getTopicFlag(const std::string& topicId)
     {
-        return mActorKnownTopicsFlag[topicId];
+        return mActorKnownTopics[topicId].mFlags;
     }
 
     void DialogueManager::keywordSelected (const std::string& keyword, ResponseCallback* callback)
@@ -444,7 +478,7 @@ namespace MWDialogue
                 if (const ESM::DialInfo *info = filter.search (*dialogue, true))
                 {
                     std::string text = info->mResponse;
-                    parseText (text);
+                    addTopicsFromText (text);
 
                     mChoice = -1;
                     mIsInChoice = false;
@@ -579,7 +613,7 @@ namespace MWDialogue
         {
             const ESM::DialInfo* info = infos[0];
 
-            parseText (info->mResponse);
+            addTopicsFromText (info->mResponse);
 
             const MWWorld::Store<ESM::GameSetting>& gmsts =
                 MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.hpp b/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
index ab2625ff5a..57eb74d0a6 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
@@ -10,6 +10,7 @@
 #include <components/compiler/streamerrorhandler.hpp>
 #include <components/translation/translation.hpp>
 #include <components/misc/stringops.hpp>
+#include <components/esm/loadinfo.hpp>
 
 #include "../mwworld/ptr.hpp"
 
@@ -24,14 +25,19 @@ namespace MWDialogue
 {
     class DialogueManager : public MWBase::DialogueManager
     {
+            struct ActorKnownTopicInfo
+            {
+                int mFlags;
+                const ESM::DialInfo* mInfo;
+            };
+
             std::set<std::string, Misc::StringUtils::CiComp> mKnownTopics;// Those are the topics the player knows.
 
             // Modified faction reactions. <Faction1, <Faction2, Difference> >
             typedef std::map<std::string, std::map<std::string, int> > ModFactionReactionMap;
             ModFactionReactionMap mChangedFactionReaction;
 
-            std::set<std::string, Misc::StringUtils::CiComp> mActorKnownTopics;
-            std::unordered_map<std::string, int> mActorKnownTopicsFlag;
+            std::map<std::string, ActorKnownTopicInfo, Misc::StringUtils::CiComp> mActorKnownTopics;
 
             Translation::Storage& mTranslationDataStorage;
             MWScript::CompilerContext mCompilerContext;
@@ -51,7 +57,8 @@ namespace MWDialogue
             int mCurrentDisposition;
             int mPermanentDispositionChange;
 
-            void parseText (const std::string& text);
+            std::vector<std::string> parseTopicIdsFromText (const std::string& text);
+            void addTopicsFromText (const std::string& text);
 
             void updateActorKnownTopics();
             void updateGlobals();

From 13400b2c5f4c222db3b6c471f32e20fce92ba622 Mon Sep 17 00:00:00 2001
From: andrew-app <andrew.appuhamy@gmail.com>
Date: Thu, 2 Dec 2021 17:01:40 +0000
Subject: [PATCH 1807/2859] Bug #5434: Pinned windows shouldn't cover breath
 progress bar

---
 AUTHORS.md                             |  3 ++-
 CHANGELOG.md                           |  1 +
 apps/openmw/mwgui/hud.cpp              | 13 +++++----
 apps/openmw/mwgui/hud.hpp              |  2 +-
 apps/openmw/mwgui/windowmanagerimp.cpp |  1 +
 files/mygui/openmw_hud.layout          | 37 ++++++++++++++------------
 files/mygui/openmw_layers.xml          |  1 +
 7 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index 8ca9db90b9..d7f7198901 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -31,6 +31,7 @@ Programmers
     Allofich
     Andreas Stöckel
     Andrei Kortunov (akortunov)
+    Andrew Appuhamy (andrew-app)
     AnyOldName3
     Ardekantur
     Armin Preiml
@@ -230,7 +231,7 @@ Programmers
     Yuri Krupenin
     zelurker
     Noah Gooder
-    Andrew Appuhamy (andrew-app)
+    
 
 Documentation
 -------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f5b83f158..ccb3d772fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@
     Bug #5377: console does not appear after using menutest in inventory
     Bug #5379: Wandering NPCs falling through cantons
     Bug #5394: Windows snapping no longer works
+    Bug #5434: Pinned windows shouldn't cover breath progress bar
     Bug #5453: Magic effect VFX are offset for creatures
     Bug #5483: AutoCalc flag is not used to calculate spells cost
     Bug #5508: Engine binary links to Qt without using it
diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp
index ab596137cd..f6136791e9 100644
--- a/apps/openmw/mwgui/hud.cpp
+++ b/apps/openmw/mwgui/hud.cpp
@@ -81,7 +81,7 @@ namespace MWGui
         , mMinimap(nullptr)
         , mCrosshair(nullptr)
         , mCellNameBox(nullptr)
-        , mDrowningFrame(nullptr)
+        , mDrowningBar(nullptr)
         , mDrowningFlash(nullptr)
         , mHealthManaStaminaBaseLeft(0)
         , mWeapBoxBaseLeft(0)
@@ -119,6 +119,7 @@ namespace MWGui
         fatigueFrame->eventMouseButtonClick += MyGUI::newDelegate(this, &HUD::onHMSClicked);
 
         //Drowning bar
+        getWidget(mDrowningBar, "DrowningBar");
         getWidget(mDrowningFrame, "DrowningFrame");
         getWidget(mDrowning, "Drowning");
         getWidget(mDrowningFlash, "Flash");
@@ -224,7 +225,7 @@ namespace MWGui
 
     void HUD::setDrowningBarVisible(bool visible)
     {
-        mDrowningFrame->setVisible(visible);
+        mDrowningBar->setVisible(visible);
     }
 
     void HUD::onWorldClicked(MyGUI::Widget* _sender)
@@ -368,9 +369,6 @@ namespace MWGui
             mWeaponSpellBox->setPosition(mWeaponSpellBox->getPosition() + MyGUI::IntPoint(0,20));
         }
 
-        if (mIsDrowning)
-            mDrowningFlashTheta += dt * osg::PI*2;
-
         mSpellIcons->updateWidgets(mEffectBox, true);
 
         if (mEnemyActorId != -1 && mEnemyHealth->getVisible())
@@ -378,8 +376,13 @@ namespace MWGui
             updateEnemyHealthBar();
         }
 
+        if (mDrowningBar->getVisible())
+            mDrowningBar->setPosition(mMainWidget->getWidth()/2 - mDrowningFrame->getWidth()/2, mMainWidget->getTop());
+
         if (mIsDrowning)
         {
+            mDrowningFlashTheta += dt * osg::PI*2;
+
             float intensity = (cos(mDrowningFlashTheta) + 2.0f) / 3.0f;
 
             mDrowningFlash->setAlpha(intensity);
diff --git a/apps/openmw/mwgui/hud.hpp b/apps/openmw/mwgui/hud.hpp
index 8a89320d8c..ef591bec97 100644
--- a/apps/openmw/mwgui/hud.hpp
+++ b/apps/openmw/mwgui/hud.hpp
@@ -73,7 +73,7 @@ namespace MWGui
         MyGUI::ImageBox* mCrosshair;
         MyGUI::TextBox* mCellNameBox;
         MyGUI::TextBox* mWeaponSpellBox;
-        MyGUI::Widget *mDrowningFrame, *mDrowningFlash;
+        MyGUI::Widget *mDrowningBar, *mDrowningFrame, *mDrowningFlash;
 
         // bottom left elements
         int mHealthManaStaminaBaseLeft, mWeapBoxBaseLeft, mSpellBoxBaseLeft, mSneakBoxBaseLeft;
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 94a064a6c8..ca8557f2e1 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -638,6 +638,7 @@ namespace MWGui
             mMap->setVisible(false);
             mStatsWindow->setVisible(false);
             mSpellWindow->setVisible(false);
+            mHud->setDrowningBarVisible(false);
             mInventoryWindow->setVisible(getMode() == GM_Container || getMode() == GM_Barter || getMode() == GM_Companion);
         }
 
diff --git a/files/mygui/openmw_hud.layout b/files/mygui/openmw_hud.layout
index b3e3cfb9df..a189075f44 100644
--- a/files/mygui/openmw_hud.layout
+++ b/files/mygui/openmw_hud.layout
@@ -31,22 +31,6 @@
             </Widget>
         </Widget>
 
-        <!-- Drowning bar -->
-        <Widget type="Window" skin="MW_Dialog" position="0 36 230 58" align="Center Top" name="DrowningFrame">
-            <Property key="Visible" value="false"/>
-            <Widget type="TextBox" skin="SandText" position="0 3 222 24" name="DrowningTitle" align="Center Top HStretch">
-                <Property key="Caption" value="#{sBreath}"/>
-                <Property key="TextAlign" value="Center"/>
-                <Property key="TextShadow" value="true"/>
-                <Property key="TextShadowColour" value="0 0 0"/>
-            </Widget>
-            <Widget type="Widget" skin="MW_Box" position="11 29 200 10" align="Stretch" name="BoundingBox"/>
-            <Widget type="ProgressBar" skin="MW_Progress_Drowning_Full" position="13 31 196 6" align="Center Top" name="Drowning">
-                <Property key="NeedMouse" value="false"/>
-            </Widget>
-            <Widget type="Widget" skin="MW_Progress_Drowning_Small" position="15 33 192 2" align="Center Top" name="Flash"/>
-        </Widget>
-
         <!-- Equipped weapon/selected spell name display for a few seconds after it changes -->
         <Widget type="TextBox" skin="SandText" position="13 118 270 24" name="WeaponSpellName" align="Left Bottom HStretch">
             <Property key="Visible" value="false"/>
@@ -128,4 +112,23 @@
         </Widget>
 
     </Widget>
-</MyGUI>
+
+    <!-- Drowning bar -->
+    <Widget type="Widget" layer="DrowningBar" position="0 0 300 200" name="DrowningBar" align="Center Top">
+        <Property key="Visible" value="false"/>
+        <Widget type="Window" skin="MW_Dialog" position="0 36 230 58" align="Center Top" name="DrowningFrame">
+            <Widget type="TextBox" skin="SandText" position="0 3 222 24" name="DrowningTitle" align="Center Top HStretch">
+                <Property key="Caption" value="#{sBreath}"/>
+                <Property key="TextAlign" value="Center"/>
+                <Property key="TextShadow" value="true"/>
+                <Property key="TextShadowColour" value="0 0 0"/>
+            </Widget>
+            <Widget type="Widget" skin="MW_Box" position="11 29 200 10" align="Stretch" name="BoundingBox"/>
+            <Widget type="ProgressBar" skin="MW_Progress_Drowning_Full" position="13 31 196 6" align="Center Top" name="Drowning">
+                <Property key="NeedMouse" value="false"/>
+            </Widget>
+            <Widget type="Widget" skin="MW_Progress_Drowning_Small" position="15 33 192 2" align="Center Top" name="Flash"/>
+        </Widget>
+    </Widget>
+
+</MyGUI>
\ No newline at end of file
diff --git a/files/mygui/openmw_layers.xml b/files/mygui/openmw_layers.xml
index c288655027..4afa67f314 100644
--- a/files/mygui/openmw_layers.xml
+++ b/files/mygui/openmw_layers.xml
@@ -15,6 +15,7 @@
     <Layer name="Popup" overlapped="true" pick="true"/>
     <Layer name="Notification" overlapped="false" pick="false"/>
     <Layer name="DragAndDrop" overlapped="false" pick="false"/>
+    <Layer name="DrowningBar" overlapped="false" pick="false"/>
     <Layer name="LoadingScreen" overlapped="false" pick="true"/>
     <Layer name="MessageBox" overlapped="false" pick="true"/>
     <Layer name="InputBlocker" overlapped="false" pick="true"/>

From 58b888a38ee7a59fd6402b0978220c299bc34c22 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 2 Dec 2021 20:36:42 +0100
Subject: [PATCH 1808/2859] Preserve inventories when resurrecting actors while
 looting them

---
 apps/openmw/mwscript/statsextensions.cpp | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp
index c53588ed22..d7120af53a 100644
--- a/apps/openmw/mwscript/statsextensions.cpp
+++ b/apps/openmw/mwscript/statsextensions.cpp
@@ -1194,20 +1194,25 @@ namespace MWScript
                     {
                         bool wasEnabled = ptr.getRefData().isEnabled();
                         MWBase::Environment::get().getWorld()->undeleteObject(ptr);
-                        MWBase::Environment::get().getWorld()->removeContainerScripts(ptr);
                         auto windowManager = MWBase::Environment::get().getWindowManager();
                         bool wasOpen = windowManager->containsMode(MWGui::GM_Container);
                         windowManager->onDeleteCustomData(ptr);
-
                         // HACK: disable/enable object to re-add it to the scene properly (need a new Animation).
                         MWBase::Environment::get().getWorld()->disable(ptr);
-                        // resets runtime state such as inventory, stats and AI. does not reset position in the world
-                        ptr.getRefData().setCustomData(nullptr);
-                        if (wasEnabled)
-                            MWBase::Environment::get().getWorld()->enable(ptr);
-                        // Reopen the loot GUI if it was closed because we resurrected the actor we were looting
                         if (wasOpen && !windowManager->containsMode(MWGui::GM_Container))
+                        {
+                            // Reopen the loot GUI if it was closed because we resurrected the actor we were looting
+                            MWBase::Environment::get().getMechanicsManager()->resurrect(ptr);
                             windowManager->forceLootMode(ptr);
+                        }
+                        else
+                        {
+                            MWBase::Environment::get().getWorld()->removeContainerScripts(ptr);
+                            // resets runtime state such as inventory, stats and AI. does not reset position in the world
+                            ptr.getRefData().setCustomData(nullptr);
+                        }
+                        if (wasEnabled)
+                            MWBase::Environment::get().getWorld()->enable(ptr);
                     }
                 }
         };

From e65c9464522571139d96d4f954a7d0715a662d06 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Thu, 2 Dec 2021 21:52:29 +0000
Subject: [PATCH 1809/2859] Add a data field to Lua UI layouts

---
 components/lua_ui/element.cpp                          | 7 +++++++
 components/lua_ui/widget.cpp                           | 5 ++++-
 components/lua_ui/widget.hpp                           | 5 ++++-
 docs/source/reference/lua-scripting/user_interface.rst | 8 ++++++++
 docs/source/reference/lua-scripting/widgets/widget.rst | 2 +-
 5 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/components/lua_ui/element.cpp b/components/lua_ui/element.cpp
index 1a1b38e4dc..63ae0e7d5e 100644
--- a/components/lua_ui/element.cpp
+++ b/components/lua_ui/element.cpp
@@ -46,6 +46,11 @@ namespace LuaUi
         }
     }
 
+    void setLayout(LuaUi::WidgetExtension* ext, const sol::table& layout)
+    {
+        ext->setLayout(layout);
+    }
+
     LuaUi::WidgetExtension* createWidget(const sol::table& layout, LuaUi::WidgetExtension* parent)
     {
         std::string type = widgetType(layout);
@@ -72,6 +77,7 @@ namespace LuaUi
 
         setEventCallbacks(ext, layout);
         setProperties(ext, layout);
+        setLayout(ext, layout);
 
         Content cont = content(layout);
         for (size_t i = 0; i < cont.size(); i++)
@@ -90,6 +96,7 @@ namespace LuaUi
     {
         setEventCallbacks(ext, layout);
         setProperties(ext, layout);
+        setLayout(ext, layout);
 
         Content newContent = content(layout);
 
diff --git a/components/lua_ui/widget.cpp b/components/lua_ui/widget.cpp
index ef876e8a06..5653659287 100644
--- a/components/lua_ui/widget.cpp
+++ b/components/lua_ui/widget.cpp
@@ -13,13 +13,16 @@ namespace LuaUi
         , mAbsoluteCoord()
         , mRelativeCoord()
         , mAnchor()
+        , mLua{ nullptr }
+        , mWidget{ nullptr }
+        , mLayout{ sol::nil }
     {}
 
     void WidgetExtension::triggerEvent(std::string_view name, const sol::object& argument = sol::nil) const
     {
         auto it = mCallbacks.find(name);
         if (it != mCallbacks.end())
-            it->second(argument);
+            it->second(argument, mLayout);
     }
 
     void WidgetExtension::create(lua_State* lua, MyGUI::Widget* self)
diff --git a/components/lua_ui/widget.hpp b/components/lua_ui/widget.hpp
index 360c6483ba..99d430f71c 100644
--- a/components/lua_ui/widget.hpp
+++ b/components/lua_ui/widget.hpp
@@ -43,6 +43,8 @@ namespace LuaUi
         void setForcedCoord(const MyGUI::IntCoord& offset);
         void updateCoord();
 
+        void setLayout(const sol::table& layout) { mLayout = layout; }
+
     protected:
         sol::table makeTable() const;
         sol::object keyEvent(MyGUI::KeyCode) const;
@@ -67,11 +69,12 @@ namespace LuaUi
 
     private:
         // use lua_State* instead of sol::state_view because MyGUI requires a default constructor
-        lua_State* mLua; 
+        lua_State* mLua;
         MyGUI::Widget* mWidget;
 
         std::vector<WidgetExtension*> mContent;
         std::map<std::string, LuaUtil::Callback, std::less<>> mCallbacks;
+        sol::table mLayout;
 
         void updateChildrenCoord(MyGUI::Widget*);
 
diff --git a/docs/source/reference/lua-scripting/user_interface.rst b/docs/source/reference/lua-scripting/user_interface.rst
index 5b733a8fe9..88233dceb9 100644
--- a/docs/source/reference/lua-scripting/user_interface.rst
+++ b/docs/source/reference/lua-scripting/user_interface.rst
@@ -46,6 +46,14 @@ A container holding all the widget's children. It has a few important difference
 
 .. TODO: Talk about skins/templates here when they are ready
 
+Events
+------
+
+| A table mapping event names to `openmw.async.callback` s.
+| When an event triggers, the callback is called with two arguments:
+   an event-specific value, and that widget's layout table.
+| See the Widget type pages for information on what events exist, and which first argument they pass. 
+
 Widget types
 ------------
 
diff --git a/docs/source/reference/lua-scripting/widgets/widget.rst b/docs/source/reference/lua-scripting/widgets/widget.rst
index 51d6d17203..49058ee278 100644
--- a/docs/source/reference/lua-scripting/widgets/widget.rst
+++ b/docs/source/reference/lua-scripting/widgets/widget.rst
@@ -41,7 +41,7 @@ Events
   :widths: 20 20 60
 
   * - name
-    - type
+    - first argument type
     - description
   * - keyPress
     - `KeyboardEvent <../openmw_input.html##(KeyboardEvent)>`_

From e10bbb9ad7b1439c6bbc11274763f2375973c3bf Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 4 Nov 2021 19:48:18 +0100
Subject: [PATCH 1810/2859] Shift heightfield and water in navigator tests

---
 .../detournavigator/navigator.cpp             | 861 +++++++++---------
 .../detournavigator/operators.hpp             |   2 +-
 components/detournavigator/makenavmesh.cpp    |   1 +
 3 files changed, 448 insertions(+), 416 deletions(-)

diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index 0f4f1e3345..367572d449 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -7,6 +7,7 @@
 #include <components/loadinglistener/loadinglistener.hpp>
 #include <components/esm/loadland.hpp>
 #include <components/resource/bulletshape.hpp>
+#include <components/bullethelpers/heightfield.hpp>
 
 #include <osg/ref_ptr>
 
@@ -35,8 +36,8 @@ namespace
     {
         Settings mSettings;
         std::unique_ptr<Navigator> mNavigator;
-        osg::Vec3f mPlayerPosition;
-        osg::Vec3f mAgentHalfExtents;
+        const osg::Vec3f mPlayerPosition;
+        const osg::Vec3f mAgentHalfExtents;
         osg::Vec3f mStart;
         osg::Vec3f mEnd;
         std::deque<osg::Vec3f> mPath;
@@ -48,12 +49,13 @@ namespace
         const int mHeightfieldTileSize = ESM::Land::REAL_SIZE / (ESM::Land::LAND_SIZE - 1);
         const osg::Vec3f mShift {0, 0, 0};
         const float mEndTolerance = 0;
+        const btTransform mTransform {btMatrix3x3::getIdentity(), btVector3(256, 256, 0)};
 
         DetourNavigatorNavigatorTest()
-            : mPlayerPosition(0, 0, 0)
+            : mPlayerPosition(256, 256, 0)
             , mAgentHalfExtents(29, 29, 66)
-            , mStart(-204, 204, 1)
-            , mEnd(204, -204, 1)
+            , mStart(52, 460, 1)
+            , mEnd(460, 52, 1)
             , mOut(mPath)
             , mStepSize(28.333332061767578125f)
         {
@@ -135,6 +137,11 @@ namespace
         osg::ref_ptr<const Resource::BulletShapeInstance> mInstance;
     };
 
+    osg::Vec3f getHeightfieldShift(const osg::Vec2i& cellPosition, int cellSize, float minHeight, float maxHeight)
+    {
+        return Misc::Convert::toOsg(BulletHelpers::getHeightfieldShift(cellPosition.x(), cellPosition.x(), cellSize, minHeight, maxHeight));
+    }
+
     TEST_F(DetourNavigatorNavigatorTest, find_path_for_empty_should_return_empty)
     {
         EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
@@ -168,9 +175,11 @@ namespace
             0, -25, -100, -100, -100,
         }};
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
+        const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
+        const osg::Vec3f shift = getHeightfieldShift(mCellPosition, cellSize, surface.mMinHeight, surface.mMaxHeight);
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
+        mNavigator->addHeightfield(mCellPosition, cellSize, shift, surface);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::requiredTilesPresent);
 
@@ -178,28 +187,28 @@ namespace
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(-204.0000152587890625, 204, 1.99998295307159423828125),
-            Vec3fEq(-183.96533203125, 183.9653167724609375, 1.99998819828033447265625),
-            Vec3fEq(-163.930633544921875, 163.9306182861328125, 1.99999344348907470703125),
-            Vec3fEq(-143.8959503173828125, 143.89593505859375, -2.720611572265625),
-            Vec3fEq(-123.86126708984375, 123.86124420166015625, -13.1089687347412109375),
-            Vec3fEq(-103.82657623291015625, 103.8265533447265625, -23.497333526611328125),
-            Vec3fEq(-83.7918853759765625, 83.7918548583984375, -33.885692596435546875),
-            Vec3fEq(-63.757190704345703125, 63.757171630859375, -44.274051666259765625),
-            Vec3fEq(-43.722503662109375, 43.72248077392578125, -54.66241455078125),
-            Vec3fEq(-23.687808990478515625, 23.6877918243408203125, -65.05077362060546875),
-            Vec3fEq(-3.6531188488006591796875, 3.6531002521514892578125, -75.43914031982421875),
-            Vec3fEq(16.3815746307373046875, -16.381591796875, -69.74927520751953125),
-            Vec3fEq(36.416263580322265625, -36.416286468505859375, -60.4739532470703125),
-            Vec3fEq(56.450958251953125, -56.450977325439453125, -51.1986236572265625),
-            Vec3fEq(76.48564910888671875, -76.4856719970703125, -41.92330169677734375),
-            Vec3fEq(96.5203399658203125, -96.52036285400390625, -31.46941375732421875),
-            Vec3fEq(116.55503082275390625, -116.5550537109375, -19.597003936767578125),
-            Vec3fEq(136.5897216796875, -136.5897369384765625, -7.724592685699462890625),
-            Vec3fEq(156.624420166015625, -156.624420166015625, 1.99999535083770751953125),
-            Vec3fEq(176.6591033935546875, -176.65911865234375, 1.99999010562896728515625),
-            Vec3fEq(196.69378662109375, -196.6938018798828125, 1.99998486042022705078125),
-            Vec3fEq(204, -204.0000152587890625, 1.99998295307159423828125)
+            Vec3fEq(56.66666412353515625, 460, 1.99998295307159423828125),
+            Vec3fEq(76.70135498046875, 439.965301513671875, -0.9659786224365234375),
+            Vec3fEq(96.73604583740234375, 419.93060302734375, -4.002437114715576171875),
+            Vec3fEq(116.770751953125, 399.89593505859375, -7.0388965606689453125),
+            Vec3fEq(136.8054351806640625, 379.861236572265625, -11.5593852996826171875),
+            Vec3fEq(156.840118408203125, 359.826568603515625, -20.7333812713623046875),
+            Vec3fEq(176.8748016357421875, 339.7918701171875, -34.014251708984375),
+            Vec3fEq(196.90948486328125, 319.757171630859375, -47.2951202392578125),
+            Vec3fEq(216.944183349609375, 299.722503662109375, -59.4111785888671875),
+            Vec3fEq(236.9788665771484375, 279.68780517578125, -65.76436614990234375),
+            Vec3fEq(257.0135498046875, 259.65313720703125, -68.12311553955078125),
+            Vec3fEq(277.048248291015625, 239.618438720703125, -66.5666656494140625),
+            Vec3fEq(297.082916259765625, 219.583740234375, -60.305889129638671875),
+            Vec3fEq(317.11761474609375, 199.549041748046875, -49.181324005126953125),
+            Vec3fEq(337.15228271484375, 179.5143585205078125, -35.742702484130859375),
+            Vec3fEq(357.186981201171875, 159.47967529296875, -22.304073333740234375),
+            Vec3fEq(377.221649169921875, 139.4449920654296875, -12.65070629119873046875),
+            Vec3fEq(397.25634765625, 119.41030120849609375, -7.41098117828369140625),
+            Vec3fEq(417.291046142578125, 99.3756103515625, -4.382833957672119140625),
+            Vec3fEq(437.325714111328125, 79.340911865234375, -1.354687213897705078125),
+            Vec3fEq(457.360443115234375, 59.3062286376953125, 1.624610424041748046875),
+            Vec3fEq(460, 56.66666412353515625, 1.99998295307159423828125)
         )) << mPath;
     }
 
@@ -213,12 +222,14 @@ namespace
             0, -25, -100, -100, -100,
         }};
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
+        const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
+        const osg::Vec3f shift = getHeightfieldShift(mCellPosition, cellSize, surface.mMinHeight, surface.mMaxHeight);
 
         CollisionShapeInstance compound(std::make_unique<btCompoundShape>());
         compound.shape().addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(0, 0, 0)), new btBoxShape(btVector3(20, 20, 100)));
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
+        mNavigator->addHeightfield(mCellPosition, cellSize, shift, surface);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -226,31 +237,31 @@ namespace
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(-204, 204, 1.99998295307159423828125),
-            Vec3fEq(-183.965301513671875, 183.965301513671875, 1.99998819828033447265625),
-            Vec3fEq(-163.9306182861328125, 163.9306182861328125, 1.99999344348907470703125),
-            Vec3fEq(-143.89593505859375, 143.89593505859375, -2.7206256389617919921875),
-            Vec3fEq(-123.86124420166015625, 123.86124420166015625, -13.1089839935302734375),
-            Vec3fEq(-103.8265533447265625, 103.8265533447265625, -23.4973468780517578125),
-            Vec3fEq(-83.7918548583984375, 83.7918548583984375, -33.885707855224609375),
-            Vec3fEq(-63.75716400146484375, 63.75716400146484375, -44.27407073974609375),
-            Vec3fEq(-43.72247314453125, 43.72247314453125, -54.662433624267578125),
-            Vec3fEq(-23.6877803802490234375, 23.6877803802490234375, -65.0507965087890625),
-            Vec3fEq(-3.653090000152587890625, 3.653090000152587890625, -75.43915557861328125),
-            Vec3fEq(16.3816013336181640625, -16.3816013336181640625, -69.749267578125),
-            Vec3fEq(36.416290283203125, -36.416290283203125, -60.4739532470703125),
-            Vec3fEq(56.450984954833984375, -56.450984954833984375, -51.1986236572265625),
-            Vec3fEq(76.4856719970703125, -76.4856719970703125, -41.92330169677734375),
-            Vec3fEq(96.52036285400390625, -96.52036285400390625, -31.46941375732421875),
-            Vec3fEq(116.5550537109375, -116.5550537109375, -19.597003936767578125),
-            Vec3fEq(136.5897369384765625, -136.5897369384765625, -7.724592685699462890625),
-            Vec3fEq(156.6244354248046875, -156.6244354248046875, 1.99999535083770751953125),
-            Vec3fEq(176.6591339111328125, -176.6591339111328125, 1.99999010562896728515625),
-            Vec3fEq(196.693817138671875, -196.693817138671875, 1.99998486042022705078125),
-            Vec3fEq(204, -204, 1.99998295307159423828125)
+            Vec3fEq(56.66666412353515625, 460, 1.99998295307159423828125),
+            Vec3fEq(76.70135498046875, 439.965301513671875, -0.9659786224365234375),
+            Vec3fEq(96.73604583740234375, 419.93060302734375, -4.002437114715576171875),
+            Vec3fEq(116.770751953125, 399.89593505859375, -7.0388965606689453125),
+            Vec3fEq(136.8054351806640625, 379.861236572265625, -11.5593852996826171875),
+            Vec3fEq(156.840118408203125, 359.826568603515625, -20.7333812713623046875),
+            Vec3fEq(176.8748016357421875, 339.7918701171875, -34.014251708984375),
+            Vec3fEq(196.90948486328125, 319.757171630859375, -47.2951202392578125),
+            Vec3fEq(216.944183349609375, 299.722503662109375, -59.4111785888671875),
+            Vec3fEq(236.9788665771484375, 279.68780517578125, -65.76436614990234375),
+            Vec3fEq(257.0135498046875, 259.65313720703125, -68.12311553955078125),
+            Vec3fEq(277.048248291015625, 239.618438720703125, -66.5666656494140625),
+            Vec3fEq(297.082916259765625, 219.583740234375, -60.305889129638671875),
+            Vec3fEq(317.11761474609375, 199.549041748046875, -49.181324005126953125),
+            Vec3fEq(337.15228271484375, 179.5143585205078125, -35.742702484130859375),
+            Vec3fEq(357.186981201171875, 159.47967529296875, -22.304073333740234375),
+            Vec3fEq(377.221649169921875, 139.4449920654296875, -12.65070629119873046875),
+            Vec3fEq(397.25634765625, 119.41030120849609375, -7.41098117828369140625),
+            Vec3fEq(417.291046142578125, 99.3756103515625, -4.382833957672119140625),
+            Vec3fEq(437.325714111328125, 79.340911865234375, -1.354687213897705078125),
+            Vec3fEq(457.360443115234375, 59.3062286376953125, 1.624610424041748046875),
+            Vec3fEq(460, 56.66666412353515625, 1.99998295307159423828125)
         )) << mPath;
 
-        mNavigator->addObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance()), btTransform::getIdentity());
+        mNavigator->addObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance()), mTransform);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -260,29 +271,29 @@ namespace
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(-204, 204, 1.99998295307159423828125),
-            Vec3fEq(-189.9427337646484375, 179.3997802734375, -3.622931003570556640625),
-            Vec3fEq(-175.8854522705078125, 154.7995452880859375, -9.24583911895751953125),
-            Vec3fEq(-161.82818603515625, 130.1993255615234375, -14.86874866485595703125),
-            Vec3fEq(-147.770904541015625, 105.5991058349609375, -20.4916591644287109375),
-            Vec3fEq(-133.7136383056640625, 80.99887847900390625, -26.1145648956298828125),
-            Vec3fEq(-119.65636444091796875, 56.39865875244140625, -31.7374725341796875),
-            Vec3fEq(-105.59909820556640625, 31.798435211181640625, -26.133396148681640625),
-            Vec3fEq(-91.54183197021484375, 7.1982135772705078125, -31.5624217987060546875),
-            Vec3fEq(-77.48455810546875, -17.402008056640625, -26.98972320556640625),
-            Vec3fEq(-63.427295684814453125, -42.00223541259765625, -19.9045581817626953125),
-            Vec3fEq(-42.193531036376953125, -60.761363983154296875, -20.4544773101806640625),
-            Vec3fEq(-20.9597682952880859375, -79.5204925537109375, -23.599918365478515625),
-            Vec3fEq(3.8312885761260986328125, -93.2384033203125, -30.7141361236572265625),
-            Vec3fEq(28.6223468780517578125, -106.95632171630859375, -24.8243885040283203125),
-            Vec3fEq(53.413402557373046875, -120.6742401123046875, -31.3303241729736328125),
-            Vec3fEq(78.20446014404296875, -134.39215087890625, -25.8431549072265625),
-            Vec3fEq(102.99552154541015625, -148.110076904296875, -20.3559894561767578125),
-            Vec3fEq(127.7865753173828125, -161.827972412109375, -14.868824005126953125),
-            Vec3fEq(152.57763671875, -175.5458984375, -9.3816623687744140625),
-            Vec3fEq(177.3686981201171875, -189.2638092041015625, -3.894496917724609375),
-            Vec3fEq(202.1597442626953125, -202.9817047119140625, 1.59266507625579833984375),
-            Vec3fEq(204, -204, 1.99998295307159423828125)
+            Vec3fEq(56.66666412353515625, 460, 1.99998295307159423828125),
+            Vec3fEq(69.5299530029296875, 434.754913330078125, -2.6775772571563720703125),
+            Vec3fEq(82.39324951171875, 409.50982666015625, -7.355137348175048828125),
+            Vec3fEq(95.25653839111328125, 384.2647705078125, -12.0326976776123046875),
+            Vec3fEq(108.11983489990234375, 359.019683837890625, -16.71025848388671875),
+            Vec3fEq(120.983123779296875, 333.774627685546875, -21.3878192901611328125),
+            Vec3fEq(133.8464202880859375, 308.529541015625, -26.0653781890869140625),
+            Vec3fEq(146.7097015380859375, 283.284454345703125, -30.7429370880126953125),
+            Vec3fEq(159.572998046875, 258.039398193359375, -35.420497894287109375),
+            Vec3fEq(172.4362945556640625, 232.7943115234375, -27.2731761932373046875),
+            Vec3fEq(185.2996063232421875, 207.54925537109375, -19.575878143310546875),
+            Vec3fEq(206.6449737548828125, 188.917236328125, -20.3511219024658203125),
+            Vec3fEq(227.9903564453125, 170.28521728515625, -22.9776935577392578125),
+            Vec3fEq(253.4362640380859375, 157.8239593505859375, -31.1692962646484375),
+            Vec3fEq(278.8822021484375, 145.3627166748046875, -30.253124237060546875),
+            Vec3fEq(304.328094482421875, 132.9014739990234375, -22.219127655029296875),
+            Vec3fEq(329.774017333984375, 120.44022369384765625, -13.2701435089111328125),
+            Vec3fEq(355.219940185546875, 107.97898101806640625, -5.330339908599853515625),
+            Vec3fEq(380.665863037109375, 95.51773834228515625, -3.5501649379730224609375),
+            Vec3fEq(406.111785888671875, 83.05649566650390625, -1.76998889446258544921875),
+            Vec3fEq(431.557708740234375, 70.5952606201171875, 0.01018683053553104400634765625),
+            Vec3fEq(457.003662109375, 58.134021759033203125, 1.79036080837249755859375),
+            Vec3fEq(460, 56.66666412353515625, 1.99998295307159423828125)
         )) << mPath;
     }
 
@@ -296,13 +307,15 @@ namespace
             0, -25, -100, -100, -100,
         }};
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
+        const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
+        const osg::Vec3f shift = getHeightfieldShift(mCellPosition, cellSize, surface.mMinHeight, surface.mMaxHeight);
 
         CollisionShapeInstance compound(std::make_unique<btCompoundShape>());
         compound.shape().addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(0, 0, 0)), new btBoxShape(btVector3(20, 20, 100)));
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
-        mNavigator->addObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance()), btTransform::getIdentity());
+        mNavigator->addHeightfield(mCellPosition, cellSize, shift, surface);
+        mNavigator->addObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance()), mTransform);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -310,34 +323,34 @@ namespace
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(-204, 204, 1.99998295307159423828125),
-            Vec3fEq(-189.9427337646484375, 179.3997802734375, -3.622931003570556640625),
-            Vec3fEq(-175.8854522705078125, 154.7995452880859375, -9.24583911895751953125),
-            Vec3fEq(-161.82818603515625, 130.1993255615234375, -14.86874866485595703125),
-            Vec3fEq(-147.770904541015625, 105.5991058349609375, -20.4916591644287109375),
-            Vec3fEq(-133.7136383056640625, 80.99887847900390625, -26.1145648956298828125),
-            Vec3fEq(-119.65636444091796875, 56.39865875244140625, -31.7374725341796875),
-            Vec3fEq(-105.59909820556640625, 31.798435211181640625, -26.133396148681640625),
-            Vec3fEq(-91.54183197021484375, 7.1982135772705078125, -31.5624217987060546875),
-            Vec3fEq(-77.48455810546875, -17.402008056640625, -26.98972320556640625),
-            Vec3fEq(-63.427295684814453125, -42.00223541259765625, -19.9045581817626953125),
-            Vec3fEq(-42.193531036376953125, -60.761363983154296875, -20.4544773101806640625),
-            Vec3fEq(-20.9597682952880859375, -79.5204925537109375, -23.599918365478515625),
-            Vec3fEq(3.8312885761260986328125, -93.2384033203125, -30.7141361236572265625),
-            Vec3fEq(28.6223468780517578125, -106.95632171630859375, -24.8243885040283203125),
-            Vec3fEq(53.413402557373046875, -120.6742401123046875, -31.3303241729736328125),
-            Vec3fEq(78.20446014404296875, -134.39215087890625, -25.8431549072265625),
-            Vec3fEq(102.99552154541015625, -148.110076904296875, -20.3559894561767578125),
-            Vec3fEq(127.7865753173828125, -161.827972412109375, -14.868824005126953125),
-            Vec3fEq(152.57763671875, -175.5458984375, -9.3816623687744140625),
-            Vec3fEq(177.3686981201171875, -189.2638092041015625, -3.894496917724609375),
-            Vec3fEq(202.1597442626953125, -202.9817047119140625, 1.59266507625579833984375),
-            Vec3fEq(204, -204, 1.99998295307159423828125)
+            Vec3fEq(56.66666412353515625, 460, 1.99998295307159423828125),
+            Vec3fEq(69.5299530029296875, 434.754913330078125, -2.6775772571563720703125),
+            Vec3fEq(82.39324951171875, 409.50982666015625, -7.355137348175048828125),
+            Vec3fEq(95.25653839111328125, 384.2647705078125, -12.0326976776123046875),
+            Vec3fEq(108.11983489990234375, 359.019683837890625, -16.71025848388671875),
+            Vec3fEq(120.983123779296875, 333.774627685546875, -21.3878192901611328125),
+            Vec3fEq(133.8464202880859375, 308.529541015625, -26.0653781890869140625),
+            Vec3fEq(146.7097015380859375, 283.284454345703125, -30.7429370880126953125),
+            Vec3fEq(159.572998046875, 258.039398193359375, -35.420497894287109375),
+            Vec3fEq(172.4362945556640625, 232.7943115234375, -27.2731761932373046875),
+            Vec3fEq(185.2996063232421875, 207.54925537109375, -19.575878143310546875),
+            Vec3fEq(206.6449737548828125, 188.917236328125, -20.3511219024658203125),
+            Vec3fEq(227.9903564453125, 170.28521728515625, -22.9776935577392578125),
+            Vec3fEq(253.4362640380859375, 157.8239593505859375, -31.1692962646484375),
+            Vec3fEq(278.8822021484375, 145.3627166748046875, -30.253124237060546875),
+            Vec3fEq(304.328094482421875, 132.9014739990234375, -22.219127655029296875),
+            Vec3fEq(329.774017333984375, 120.44022369384765625, -13.2701435089111328125),
+            Vec3fEq(355.219940185546875, 107.97898101806640625, -5.330339908599853515625),
+            Vec3fEq(380.665863037109375, 95.51773834228515625, -3.5501649379730224609375),
+            Vec3fEq(406.111785888671875, 83.05649566650390625, -1.76998889446258544921875),
+            Vec3fEq(431.557708740234375, 70.5952606201171875, 0.01018683053553104400634765625),
+            Vec3fEq(457.003662109375, 58.134021759033203125, 1.79036080837249755859375),
+            Vec3fEq(460, 56.66666412353515625, 1.99998295307159423828125)
         )) << mPath;
 
         compound.shape().updateChildTransform(0, btTransform(btMatrix3x3::getIdentity(), btVector3(1000, 0, 0)));
 
-        mNavigator->updateObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance()), btTransform::getIdentity());
+        mNavigator->updateObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance()), mTransform);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -347,28 +360,28 @@ namespace
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(-204, 204, 1.99998295307159423828125),
-            Vec3fEq(-183.965301513671875, 183.965301513671875, 1.99998819828033447265625),
-            Vec3fEq(-163.9306182861328125, 163.9306182861328125, 1.99999344348907470703125),
-            Vec3fEq(-143.89593505859375, 143.89593505859375, -2.7206256389617919921875),
-            Vec3fEq(-123.86124420166015625, 123.86124420166015625, -13.1089839935302734375),
-            Vec3fEq(-103.8265533447265625, 103.8265533447265625, -23.4973468780517578125),
-            Vec3fEq(-83.7918548583984375, 83.7918548583984375, -33.885707855224609375),
-            Vec3fEq(-63.75716400146484375, 63.75716400146484375, -44.27407073974609375),
-            Vec3fEq(-43.72247314453125, 43.72247314453125, -54.662433624267578125),
-            Vec3fEq(-23.6877803802490234375, 23.6877803802490234375, -65.0507965087890625),
-            Vec3fEq(-3.653090000152587890625, 3.653090000152587890625, -75.43915557861328125),
-            Vec3fEq(16.3816013336181640625, -16.3816013336181640625, -69.749267578125),
-            Vec3fEq(36.416290283203125, -36.416290283203125, -60.4739532470703125),
-            Vec3fEq(56.450984954833984375, -56.450984954833984375, -51.1986236572265625),
-            Vec3fEq(76.4856719970703125, -76.4856719970703125, -41.92330169677734375),
-            Vec3fEq(96.52036285400390625, -96.52036285400390625, -31.46941375732421875),
-            Vec3fEq(116.5550537109375, -116.5550537109375, -19.597003936767578125),
-            Vec3fEq(136.5897369384765625, -136.5897369384765625, -7.724592685699462890625),
-            Vec3fEq(156.6244354248046875, -156.6244354248046875, 1.99999535083770751953125),
-            Vec3fEq(176.6591339111328125, -176.6591339111328125, 1.99999010562896728515625),
-            Vec3fEq(196.693817138671875, -196.693817138671875, 1.99998486042022705078125),
-            Vec3fEq(204, -204, 1.99998295307159423828125)
+            Vec3fEq(56.66666412353515625, 460, 1.99998295307159423828125),
+            Vec3fEq(76.70135498046875, 439.965301513671875, -0.9659786224365234375),
+            Vec3fEq(96.73604583740234375, 419.93060302734375, -4.002437114715576171875),
+            Vec3fEq(116.770751953125, 399.89593505859375, -7.0388965606689453125),
+            Vec3fEq(136.8054351806640625, 379.861236572265625, -11.5593852996826171875),
+            Vec3fEq(156.840118408203125, 359.826568603515625, -20.7333812713623046875),
+            Vec3fEq(176.8748016357421875, 339.7918701171875, -34.014251708984375),
+            Vec3fEq(196.90948486328125, 319.757171630859375, -47.2951202392578125),
+            Vec3fEq(216.944183349609375, 299.722503662109375, -59.4111785888671875),
+            Vec3fEq(236.9788665771484375, 279.68780517578125, -65.76436614990234375),
+            Vec3fEq(257.0135498046875, 259.65313720703125, -68.12311553955078125),
+            Vec3fEq(277.048248291015625, 239.618438720703125, -66.5666656494140625),
+            Vec3fEq(297.082916259765625, 219.583740234375, -60.305889129638671875),
+            Vec3fEq(317.11761474609375, 199.549041748046875, -49.181324005126953125),
+            Vec3fEq(337.15228271484375, 179.5143585205078125, -35.742702484130859375),
+            Vec3fEq(357.186981201171875, 159.47967529296875, -22.304073333740234375),
+            Vec3fEq(377.221649169921875, 139.4449920654296875, -12.65070629119873046875),
+            Vec3fEq(397.25634765625, 119.41030120849609375, -7.41098117828369140625),
+            Vec3fEq(417.291046142578125, 99.3756103515625, -4.382833957672119140625),
+            Vec3fEq(437.325714111328125, 79.340911865234375, -1.354687213897705078125),
+            Vec3fEq(457.360443115234375, 59.3062286376953125, 1.624610424041748046875),
+            Vec3fEq(460, 56.66666412353515625, 1.99998295307159423828125)
         )) << mPath;
     }
 
@@ -395,8 +408,8 @@ namespace
         heightfield2.shape().setLocalScaling(btVector3(128, 128, 1));
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addObject(ObjectId(&heightfield1.shape()), ObjectShapes(heightfield1.instance()), btTransform::getIdentity());
-        mNavigator->addObject(ObjectId(&heightfield2.shape()), ObjectShapes(heightfield2.instance()), btTransform::getIdentity());
+        mNavigator->addObject(ObjectId(&heightfield1.shape()), ObjectShapes(heightfield1.instance()), mTransform);
+        mNavigator->addObject(ObjectId(&heightfield2.shape()), ObjectShapes(heightfield2.instance()), mTransform);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -404,28 +417,28 @@ namespace
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(-204, 204, 1.999981403350830078125),
-            Vec3fEq(-183.965301513671875, 183.965301513671875, -0.428465187549591064453125),
-            Vec3fEq(-163.9306182861328125, 163.9306182861328125, -2.8569104671478271484375),
-            Vec3fEq(-143.89593505859375, 143.89593505859375, -5.28535556793212890625),
-            Vec3fEq(-123.86124420166015625, 123.86124420166015625, -7.7138004302978515625),
-            Vec3fEq(-103.8265533447265625, 103.8265533447265625, -10.142246246337890625),
-            Vec3fEq(-83.7918548583984375, 83.7918548583984375, -12.3704509735107421875),
-            Vec3fEq(-63.75716400146484375, 63.75716400146484375, -14.354084014892578125),
-            Vec3fEq(-43.72247314453125, 43.72247314453125, -16.3377170562744140625),
-            Vec3fEq(-23.6877803802490234375, 23.6877803802490234375, -18.32135009765625),
-            Vec3fEq(-3.653090000152587890625, 3.653090000152587890625, -20.3049831390380859375),
-            Vec3fEq(16.3816013336181640625, -16.3816013336181640625, -19.044734954833984375),
-            Vec3fEq(36.416290283203125, -36.416290283203125, -17.061100006103515625),
-            Vec3fEq(56.450984954833984375, -56.450984954833984375, -15.0774688720703125),
-            Vec3fEq(76.4856719970703125, -76.4856719970703125, -13.0938358306884765625),
-            Vec3fEq(96.52036285400390625, -96.52036285400390625, -11.02784252166748046875),
-            Vec3fEq(116.5550537109375, -116.5550537109375, -8.5993976593017578125),
-            Vec3fEq(136.5897369384765625, -136.5897369384765625, -6.170953273773193359375),
-            Vec3fEq(156.6244354248046875, -156.6244354248046875, -3.74250507354736328125),
-            Vec3fEq(176.6591339111328125, -176.6591339111328125, -1.314060688018798828125),
-            Vec3fEq(196.693817138671875, -196.693817138671875, 1.1143856048583984375),
-            Vec3fEq(204, -204, 1.9999811649322509765625)
+            Vec3fEq(56.66666412353515625, 460, 1.99998295307159423828125),
+            Vec3fEq(76.70135498046875, 439.965301513671875, -0.903246104717254638671875),
+            Vec3fEq(96.73604583740234375, 419.93060302734375, -3.8064472675323486328125),
+            Vec3fEq(116.770751953125, 399.89593505859375, -6.709649562835693359375),
+            Vec3fEq(136.8054351806640625, 379.861236572265625, -9.33333873748779296875),
+            Vec3fEq(156.840118408203125, 359.826568603515625, -9.33333873748779296875),
+            Vec3fEq(176.8748016357421875, 339.7918701171875, -9.33333873748779296875),
+            Vec3fEq(196.90948486328125, 319.757171630859375, -9.33333873748779296875),
+            Vec3fEq(216.944183349609375, 299.722503662109375, -9.33333873748779296875),
+            Vec3fEq(236.9788665771484375, 279.68780517578125, -9.33333873748779296875),
+            Vec3fEq(257.0135498046875, 259.65313720703125, -9.33333873748779296875),
+            Vec3fEq(277.048248291015625, 239.618438720703125, -9.33333873748779296875),
+            Vec3fEq(297.082916259765625, 219.583740234375, -9.33333873748779296875),
+            Vec3fEq(317.11761474609375, 199.549041748046875, -9.33333873748779296875),
+            Vec3fEq(337.15228271484375, 179.5143585205078125, -9.33333873748779296875),
+            Vec3fEq(357.186981201171875, 159.47967529296875, -9.33333873748779296875),
+            Vec3fEq(377.221649169921875, 139.4449920654296875, -9.33333873748779296875),
+            Vec3fEq(397.25634765625, 119.41030120849609375, -6.891522884368896484375),
+            Vec3fEq(417.291046142578125, 99.3756103515625, -4.053897380828857421875),
+            Vec3fEq(437.325714111328125, 79.340911865234375, -1.21627247333526611328125),
+            Vec3fEq(457.360443115234375, 59.3062286376953125, 1.621352672576904296875),
+            Vec3fEq(460, 56.66666412353515625, 1.99998295307159423828125)
         )) << mPath;
     }
 
@@ -439,6 +452,8 @@ namespace
             0, -25, -100, -100, -100,
         }};
         const HeightfieldSurface surface1 = makeSquareHeightfieldSurface(heightfieldData1);
+        const int cellSize1 = mHeightfieldTileSize * (surface1.mSize - 1);
+        const osg::Vec3f shift1 = getHeightfieldShift(mCellPosition, cellSize1, surface1.mMinHeight, surface1.mMaxHeight);
 
         const std::array<float, 5 * 5> heightfieldData2 {{
             -25, -25, -25, -25, -25,
@@ -448,10 +463,12 @@ namespace
             -25, -25, -25, -25, -25,
         }};
         const HeightfieldSurface surface2 = makeSquareHeightfieldSurface(heightfieldData2);
+        const int cellSize2 = mHeightfieldTileSize * (surface2.mSize - 1);
+        const osg::Vec3f shift2 = getHeightfieldShift(mCellPosition, cellSize2, surface2.mMinHeight, surface2.mMaxHeight);
 
         mNavigator->addAgent(mAgentHalfExtents);
-        EXPECT_TRUE(mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface1.mSize - 1), mShift, surface1));
-        EXPECT_FALSE(mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface2.mSize - 1), mShift, surface2));
+        EXPECT_TRUE(mNavigator->addHeightfield(mCellPosition, cellSize1, shift1, surface1));
+        EXPECT_FALSE(mNavigator->addHeightfield(mCellPosition, cellSize2, shift2, surface2));
     }
 
     TEST_F(DetourNavigatorNavigatorTest, path_should_be_around_avoid_shape)
@@ -483,7 +500,7 @@ namespace
         osg::ref_ptr<const Resource::BulletShapeInstance> instance(new Resource::BulletShapeInstance(bulletShape));
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addObject(ObjectId(instance->mCollisionShape.get()), ObjectShapes(instance), btTransform::getIdentity());
+        mNavigator->addObject(ObjectId(instance->mCollisionShape.get()), ObjectShapes(instance), mTransform);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -491,29 +508,29 @@ namespace
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(-204, 204, 1.99997997283935546875),
-            Vec3fEq(-191.328948974609375, 178.65789794921875, -0.815807759761810302734375),
-            Vec3fEq(-178.65789794921875, 153.3157806396484375, -3.6315968036651611328125),
-            Vec3fEq(-165.986846923828125, 127.9736785888671875, -6.4473857879638671875),
-            Vec3fEq(-153.3157806396484375, 102.6315765380859375, -9.26317310333251953125),
-            Vec3fEq(-140.6447296142578125, 77.28946685791015625, -12.07896137237548828125),
-            Vec3fEq(-127.9736785888671875, 51.947368621826171875, -14.894748687744140625),
-            Vec3fEq(-115.3026275634765625, 26.6052646636962890625, -17.7105388641357421875),
-            Vec3fEq(-102.63158416748046875, 1.2631585597991943359375, -20.5263233184814453125),
-            Vec3fEq(-89.9605712890625, -24.0789661407470703125, -19.591716766357421875),
-            Vec3fEq(-68.54410552978515625, -42.629238128662109375, -19.847625732421875),
-            Vec3fEq(-47.127635955810546875, -61.17951202392578125, -20.1035366058349609375),
-            Vec3fEq(-25.711170196533203125, -79.72978973388671875, -20.359447479248046875),
-            Vec3fEq(-4.294706821441650390625, -98.280059814453125, -20.6153545379638671875),
-            Vec3fEq(17.121753692626953125, -116.83034515380859375, -17.3710460662841796875),
-            Vec3fEq(42.7990570068359375, -128.80755615234375, -14.7094440460205078125),
-            Vec3fEq(68.4763641357421875, -140.7847747802734375, -12.0478420257568359375),
-            Vec3fEq(94.15366363525390625, -152.761993408203125, -9.3862361907958984375),
-            Vec3fEq(119.83097076416015625, -164.7392120361328125, -6.724635601043701171875),
-            Vec3fEq(145.508270263671875, -176.7164306640625, -4.06303119659423828125),
-            Vec3fEq(171.185577392578125, -188.69366455078125, -1.40142619609832763671875),
-            Vec3fEq(196.862884521484375, -200.6708831787109375, 1.2601754665374755859375),
-            Vec3fEq(204, -204, 1.999979496002197265625)
+            Vec3fEq(56.66666412353515625, 460, 1.99998295307159423828125),
+            Vec3fEq(69.013885498046875, 434.49853515625, -0.74384129047393798828125),
+            Vec3fEq(81.36110687255859375, 408.997100830078125, -3.4876689910888671875),
+            Vec3fEq(93.7083282470703125, 383.495635986328125, -6.2314929962158203125),
+            Vec3fEq(106.0555419921875, 357.99420166015625, -8.97531890869140625),
+            Vec3fEq(118.40276336669921875, 332.49273681640625, -11.7191448211669921875),
+            Vec3fEq(130.7499847412109375, 306.991302490234375, -14.4629726409912109375),
+            Vec3fEq(143.0972137451171875, 281.4898681640625, -17.206798553466796875),
+            Vec3fEq(155.4444122314453125, 255.9884033203125, -19.9506206512451171875),
+            Vec3fEq(167.7916412353515625, 230.4869537353515625, -19.91887664794921875),
+            Vec3fEq(189.053619384765625, 211.75982666015625, -20.1138629913330078125),
+            Vec3fEq(210.3155975341796875, 193.032684326171875, -20.3088512420654296875),
+            Vec3fEq(231.577606201171875, 174.3055419921875, -20.503841400146484375),
+            Vec3fEq(252.839599609375, 155.5784149169921875, -19.9803981781005859375),
+            Vec3fEq(278.407989501953125, 143.3704071044921875, -17.2675113677978515625),
+            Vec3fEq(303.976348876953125, 131.16241455078125, -14.55462360382080078125),
+            Vec3fEq(329.54473876953125, 118.9544219970703125, -11.84173583984375),
+            Vec3fEq(355.11309814453125, 106.74642181396484375, -9.12884807586669921875),
+            Vec3fEq(380.681488037109375, 94.538421630859375, -6.4159603118896484375),
+            Vec3fEq(406.249847412109375, 82.33042144775390625, -3.7030735015869140625),
+            Vec3fEq(431.8182373046875, 70.1224365234375, -0.990187108516693115234375),
+            Vec3fEq(457.38665771484375, 57.9144439697265625, 1.72269880771636962890625),
+            Vec3fEq(460, 56.66666412353515625, 1.99998295307159423828125)
         )) << mPath;
     }
 
@@ -527,38 +544,40 @@ namespace
               0,  -50, -100, -100, -100,
         }};
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
+        const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
+        const osg::Vec3f shift = getHeightfieldShift(mCellPosition, cellSize, surface.mMinHeight, surface.mMaxHeight);
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addWater(osg::Vec2i(0, 0), 128 * 4, osg::Vec3f(0, 0, 300));
-        mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
+        mNavigator->addWater(mCellPosition, cellSize, osg::Vec3f(shift.x(), shift.y(), 300));
+        mNavigator->addHeightfield(mCellPosition, cellSize, shift, surface);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        mStart.x() = 0;
+        mStart.x() = 256;
         mStart.z() = 300;
-        mEnd.x() = 0;
+        mEnd.x() = 256;
         mEnd.z() = 300;
 
         EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_swim, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(0, 204, 185.33331298828125),
-            Vec3fEq(0, 175.6666717529296875, 185.33331298828125),
-            Vec3fEq(0, 147.3333282470703125, 185.33331298828125),
-            Vec3fEq(0, 119, 185.33331298828125),
-            Vec3fEq(0, 90.6666717529296875, 185.33331298828125),
-            Vec3fEq(0, 62.333339691162109375, 185.33331298828125),
-            Vec3fEq(0, 34.00000762939453125, 185.33331298828125),
-            Vec3fEq(0, 5.66667461395263671875, 185.33331298828125),
-            Vec3fEq(0, -22.6666584014892578125, 185.33331298828125),
-            Vec3fEq(0, -50.999988555908203125, 185.33331298828125),
-            Vec3fEq(0, -79.33332061767578125, 185.33331298828125),
-            Vec3fEq(0, -107.666656494140625, 185.33331298828125),
-            Vec3fEq(0, -135.9999847412109375, 185.33331298828125),
-            Vec3fEq(0, -164.33331298828125, 185.33331298828125),
-            Vec3fEq(0, -192.666656494140625, 185.33331298828125),
-            Vec3fEq(0, -204, 185.33331298828125)
+            Vec3fEq(256, 460, 185.33331298828125),
+            Vec3fEq(256, 431.666656494140625, 185.33331298828125),
+            Vec3fEq(256, 403.33331298828125, 185.33331298828125),
+            Vec3fEq(256, 375, 185.33331298828125),
+            Vec3fEq(256, 346.666656494140625, 185.33331298828125),
+            Vec3fEq(256, 318.33331298828125, 185.33331298828125),
+            Vec3fEq(256, 290, 185.33331298828125),
+            Vec3fEq(256, 261.666656494140625, 185.33331298828125),
+            Vec3fEq(256, 233.3333282470703125, 185.33331298828125),
+            Vec3fEq(256, 205, 185.33331298828125),
+            Vec3fEq(256, 176.6666717529296875, 185.33331298828125),
+            Vec3fEq(256, 148.3333282470703125, 185.33331298828125),
+            Vec3fEq(256, 120, 185.33331298828125),
+            Vec3fEq(256, 91.6666717529296875, 185.33331298828125),
+            Vec3fEq(255.999969482421875, 63.33333587646484375, 185.33331298828125),
+            Vec3fEq(255.999969482421875, 56.66666412353515625, 185.33331298828125)
         )) << mPath;
     }
 
@@ -574,36 +593,38 @@ namespace
             0,    0,    0,    0,    0,    0, 0,
         }};
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
+        const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
+        const osg::Vec3f shift = getHeightfieldShift(mCellPosition, cellSize, surface.mMinHeight, surface.mMaxHeight);
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addWater(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), osg::Vec3f(0, 0, -25));
-        mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
+        mNavigator->addWater(mCellPosition, cellSize, osg::Vec3f(shift.x(), shift.y(), -25));
+        mNavigator->addHeightfield(mCellPosition, cellSize, shift, surface);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        mStart.x() = 0;
-        mEnd.x() = 0;
+        mStart.x() = 256;
+        mEnd.x() = 256;
 
         EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_swim | Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(0, 204, -98.000030517578125),
-            Vec3fEq(0, 175.6666717529296875, -108.30306243896484375),
-            Vec3fEq(0, 147.3333282470703125, -118.6060791015625),
-            Vec3fEq(0, 119, -128.90911865234375),
-            Vec3fEq(0, 90.6666717529296875, -139.2121429443359375),
-            Vec3fEq(0, 62.333339691162109375, -143.3333587646484375),
-            Vec3fEq(0, 34.00000762939453125, -143.3333587646484375),
-            Vec3fEq(0, 5.66667461395263671875, -143.3333587646484375),
-            Vec3fEq(0, -22.6666584014892578125, -143.3333587646484375),
-            Vec3fEq(0, -50.999988555908203125, -143.3333587646484375),
-            Vec3fEq(0, -79.33332061767578125, -143.3333587646484375),
-            Vec3fEq(0, -107.666656494140625, -133.0303192138671875),
-            Vec3fEq(0, -135.9999847412109375, -122.72728729248046875),
-            Vec3fEq(0, -164.33331298828125, -112.4242706298828125),
-            Vec3fEq(0, -192.666656494140625, -102.12123870849609375),
-            Vec3fEq(0, -204, -98.00002288818359375)
+            Vec3fEq(256, 460, -129.4098663330078125),
+            Vec3fEq(256, 431.666656494140625, -129.6970062255859375),
+            Vec3fEq(256, 403.33331298828125, -129.6970062255859375),
+            Vec3fEq(256, 375, -129.4439239501953125),
+            Vec3fEq(256, 346.666656494140625, -129.02587890625),
+            Vec3fEq(256, 318.33331298828125, -128.6078338623046875),
+            Vec3fEq(256, 290, -128.1021728515625),
+            Vec3fEq(256, 261.666656494140625, -126.46875),
+            Vec3fEq(256, 233.3333282470703125, -119.4891357421875),
+            Vec3fEq(256, 205, -110.62021636962890625),
+            Vec3fEq(256, 176.6666717529296875, -101.7512969970703125),
+            Vec3fEq(256, 148.3333282470703125, -92.88237762451171875),
+            Vec3fEq(256, 120, -75.29378509521484375),
+            Vec3fEq(256, 91.6666717529296875, -55.201839447021484375),
+            Vec3fEq(256.000030517578125, 63.33333587646484375, -34.800380706787109375),
+            Vec3fEq(256.000030517578125, 56.66666412353515625, -30.00003814697265625)
         )) << mPath;
     }
 
@@ -619,36 +640,38 @@ namespace
             0,    0,    0,    0,    0,    0, 0,
         }};
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
+        const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
+        const osg::Vec3f shift = getHeightfieldShift(mCellPosition, cellSize, surface.mMinHeight, surface.mMaxHeight);
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
-        mNavigator->addWater(osg::Vec2i(0, 0), std::numeric_limits<int>::max(), osg::Vec3f(0, 0, -25));
+        mNavigator->addHeightfield(mCellPosition, cellSize, shift, surface);
+        mNavigator->addWater(mCellPosition, std::numeric_limits<int>::max(), osg::Vec3f(shift.x(), shift.y(), -25));
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        mStart.x() = 0;
-        mEnd.x() = 0;
+        mStart.x() = 256;
+        mEnd.x() = 256;
 
         EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_swim | Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(0, 204, -98.000030517578125),
-            Vec3fEq(0, 175.6666717529296875, -108.30306243896484375),
-            Vec3fEq(0, 147.3333282470703125, -118.6060791015625),
-            Vec3fEq(0, 119, -128.90911865234375),
-            Vec3fEq(0, 90.6666717529296875, -139.2121429443359375),
-            Vec3fEq(0, 62.333339691162109375, -143.3333587646484375),
-            Vec3fEq(0, 34.00000762939453125, -143.3333587646484375),
-            Vec3fEq(0, 5.66667461395263671875, -143.3333587646484375),
-            Vec3fEq(0, -22.6666584014892578125, -143.3333587646484375),
-            Vec3fEq(0, -50.999988555908203125, -143.3333587646484375),
-            Vec3fEq(0, -79.33332061767578125, -143.3333587646484375),
-            Vec3fEq(0, -107.666656494140625, -133.0303192138671875),
-            Vec3fEq(0, -135.9999847412109375, -122.72728729248046875),
-            Vec3fEq(0, -164.33331298828125, -112.4242706298828125),
-            Vec3fEq(0, -192.666656494140625, -102.12123870849609375),
-            Vec3fEq(0, -204, -98.00002288818359375)
+            Vec3fEq(256, 460, -129.4098663330078125),
+            Vec3fEq(256, 431.666656494140625, -129.6970062255859375),
+            Vec3fEq(256, 403.33331298828125, -129.6970062255859375),
+            Vec3fEq(256, 375, -129.4439239501953125),
+            Vec3fEq(256, 346.666656494140625, -129.02587890625),
+            Vec3fEq(256, 318.33331298828125, -128.6078338623046875),
+            Vec3fEq(256, 290, -128.1021728515625),
+            Vec3fEq(256, 261.666656494140625, -126.46875),
+            Vec3fEq(256, 233.3333282470703125, -119.4891357421875),
+            Vec3fEq(256, 205, -110.62021636962890625),
+            Vec3fEq(256, 176.6666717529296875, -101.7512969970703125),
+            Vec3fEq(256, 148.3333282470703125, -92.88237762451171875),
+            Vec3fEq(256, 120, -75.29378509521484375),
+            Vec3fEq(256, 91.6666717529296875, -55.201839447021484375),
+            Vec3fEq(256.000030517578125, 63.33333587646484375, -34.800380706787109375),
+            Vec3fEq(256.000030517578125, 56.66666412353515625, -30.00003814697265625)
         )) << mPath;
     }
 
@@ -664,37 +687,38 @@ namespace
             0,    0,    0,    0,    0,    0, 0,
         }};
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
+        const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
+        const osg::Vec3f shift = getHeightfieldShift(mCellPosition, cellSize, surface.mMinHeight, surface.mMaxHeight);
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addWater(osg::Vec2i(0, 0), 128 * 4, osg::Vec3f(0, 0, -25));
-        mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
+        mNavigator->addWater(mCellPosition, cellSize, osg::Vec3f(shift.x(), shift.y(), -25));
+        mNavigator->addHeightfield(mCellPosition, cellSize, shift, surface);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        mStart.x() = 0;
-        mEnd.x() = 0;
+        mStart.x() = 256;
+        mEnd.x() = 256;
 
         EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(0, 204, -98.000030517578125),
-            Vec3fEq(10.26930999755859375, 177.59320068359375, -107.4711456298828125),
-            Vec3fEq(20.5386199951171875, 151.1864166259765625, -116.9422607421875),
-            Vec3fEq(30.8079280853271484375, 124.77960968017578125, -126.41339111328125),
-            Vec3fEq(41.077239990234375, 98.37281036376953125, -135.8845062255859375),
-            Vec3fEq(51.346546173095703125, 71.96601104736328125, -138.2003936767578125),
-            Vec3fEq(61.615856170654296875, 45.559215545654296875, -140.0838470458984375),
-            Vec3fEq(71.88516998291015625, 19.1524181365966796875, -141.9673004150390625),
-            Vec3fEq(82.15447235107421875, -7.254379749298095703125, -142.3074798583984375),
-            Vec3fEq(81.04636383056640625, -35.56603240966796875, -142.7104339599609375),
-            Vec3fEq(79.93825531005859375, -63.877685546875, -143.1133880615234375),
-            Vec3fEq(78.83014678955078125, -92.18933868408203125, -138.7660675048828125),
-            Vec3fEq(62.50392913818359375, -115.3460235595703125, -130.237823486328125),
-            Vec3fEq(46.17771148681640625, -138.502716064453125, -121.8172149658203125),
-            Vec3fEq(29.85149383544921875, -161.6594085693359375, -113.39659881591796875),
-            Vec3fEq(13.52527523040771484375, -184.81610107421875, -104.97599029541015625),
-            Vec3fEq(0, -204, -98.00002288818359375)
+            Vec3fEq(256, 460, -129.4098663330078125),
+            Vec3fEq(256, 431.666656494140625, -129.6970062255859375),
+            Vec3fEq(256, 403.33331298828125, -129.6970062255859375),
+            Vec3fEq(256, 375, -129.4439239501953125),
+            Vec3fEq(256, 346.666656494140625, -129.02587890625),
+            Vec3fEq(256, 318.33331298828125, -128.6078338623046875),
+            Vec3fEq(256, 290, -128.1021728515625),
+            Vec3fEq(256, 261.666656494140625, -126.46875),
+            Vec3fEq(256, 233.3333282470703125, -119.4891357421875),
+            Vec3fEq(256, 205, -110.62021636962890625),
+            Vec3fEq(256, 176.6666717529296875, -101.7512969970703125),
+            Vec3fEq(256, 148.3333282470703125, -92.88237762451171875),
+            Vec3fEq(256, 120, -75.29378509521484375),
+            Vec3fEq(256, 91.6666717529296875, -55.201839447021484375),
+            Vec3fEq(256.000030517578125, 63.33333587646484375, -34.800380706787109375),
+            Vec3fEq(256.000030517578125, 56.66666412353515625, -30.00003814697265625)
         )) << mPath;
     }
 
@@ -711,7 +735,7 @@ namespace
         heightfield.shape().setLocalScaling(btVector3(128, 128, 1));
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addObject(ObjectId(&heightfield.shape()), ObjectShapes(heightfield.instance()), btTransform::getIdentity());
+        mNavigator->addObject(ObjectId(&heightfield.shape()), ObjectShapes(heightfield.instance()), mTransform);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -719,7 +743,7 @@ namespace
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        mNavigator->addObject(ObjectId(&heightfield.shape()), ObjectShapes(heightfield.instance()), btTransform::getIdentity());
+        mNavigator->addObject(ObjectId(&heightfield.shape()), ObjectShapes(heightfield.instance()), mTransform);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -727,28 +751,28 @@ namespace
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(-204, 204, 1.99998295307159423828125),
-            Vec3fEq(-183.965301513671875, 183.965301513671875, 1.99998819828033447265625),
-            Vec3fEq(-163.9306182861328125, 163.9306182861328125, 1.99999344348907470703125),
-            Vec3fEq(-143.89593505859375, 143.89593505859375, -2.7206256389617919921875),
-            Vec3fEq(-123.86124420166015625, 123.86124420166015625, -13.1089839935302734375),
-            Vec3fEq(-103.8265533447265625, 103.8265533447265625, -23.4973468780517578125),
-            Vec3fEq(-83.7918548583984375, 83.7918548583984375, -33.885707855224609375),
-            Vec3fEq(-63.75716400146484375, 63.75716400146484375, -44.27407073974609375),
-            Vec3fEq(-43.72247314453125, 43.72247314453125, -54.662433624267578125),
-            Vec3fEq(-23.6877803802490234375, 23.6877803802490234375, -65.0507965087890625),
-            Vec3fEq(-3.653090000152587890625, 3.653090000152587890625, -75.43915557861328125),
-            Vec3fEq(16.3816013336181640625, -16.3816013336181640625, -69.749267578125),
-            Vec3fEq(36.416290283203125, -36.416290283203125, -60.4739532470703125),
-            Vec3fEq(56.450984954833984375, -56.450984954833984375, -51.1986236572265625),
-            Vec3fEq(76.4856719970703125, -76.4856719970703125, -41.92330169677734375),
-            Vec3fEq(96.52036285400390625, -96.52036285400390625, -31.46941375732421875),
-            Vec3fEq(116.5550537109375, -116.5550537109375, -19.597003936767578125),
-            Vec3fEq(136.5897369384765625, -136.5897369384765625, -7.724592685699462890625),
-            Vec3fEq(156.6244354248046875, -156.6244354248046875, 1.99999535083770751953125),
-            Vec3fEq(176.6591339111328125, -176.6591339111328125, 1.99999010562896728515625),
-            Vec3fEq(196.693817138671875, -196.693817138671875, 1.99998486042022705078125),
-            Vec3fEq(204, -204, 1.99998295307159423828125)
+            Vec3fEq(56.66666412353515625, 460, 1.99998295307159423828125),
+            Vec3fEq(76.70135498046875, 439.965301513671875, -0.9659786224365234375),
+            Vec3fEq(96.73604583740234375, 419.93060302734375, -4.002437114715576171875),
+            Vec3fEq(116.770751953125, 399.89593505859375, -7.0388965606689453125),
+            Vec3fEq(136.8054351806640625, 379.861236572265625, -11.5593852996826171875),
+            Vec3fEq(156.840118408203125, 359.826568603515625, -20.7333812713623046875),
+            Vec3fEq(176.8748016357421875, 339.7918701171875, -34.014251708984375),
+            Vec3fEq(196.90948486328125, 319.757171630859375, -47.2951202392578125),
+            Vec3fEq(216.944183349609375, 299.722503662109375, -59.4111785888671875),
+            Vec3fEq(236.9788665771484375, 279.68780517578125, -65.76436614990234375),
+            Vec3fEq(257.0135498046875, 259.65313720703125, -68.12311553955078125),
+            Vec3fEq(277.048248291015625, 239.618438720703125, -66.5666656494140625),
+            Vec3fEq(297.082916259765625, 219.583740234375, -60.305889129638671875),
+            Vec3fEq(317.11761474609375, 199.549041748046875, -49.181324005126953125),
+            Vec3fEq(337.15228271484375, 179.5143585205078125, -35.742702484130859375),
+            Vec3fEq(357.186981201171875, 159.47967529296875, -22.304073333740234375),
+            Vec3fEq(377.221649169921875, 139.4449920654296875, -12.65070629119873046875),
+            Vec3fEq(397.25634765625, 119.41030120849609375, -7.41098117828369140625),
+            Vec3fEq(417.291046142578125, 99.3756103515625, -4.382833957672119140625),
+            Vec3fEq(437.325714111328125, 79.340911865234375, -1.354687213897705078125),
+            Vec3fEq(457.360443115234375, 59.3062286376953125, 1.624610424041748046875),
+            Vec3fEq(460, 56.66666412353515625, 1.99998295307159423828125)
         )) << mPath;
     }
 
@@ -762,9 +786,11 @@ namespace
             0, -25, -100, -100, -100,
         }};
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
+        const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
+        const osg::Vec3f shift = getHeightfieldShift(mCellPosition, cellSize, surface.mMinHeight, surface.mMaxHeight);
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
+        mNavigator->addHeightfield(mCellPosition, cellSize, shift, surface);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -772,7 +798,7 @@ namespace
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
+        mNavigator->addHeightfield(mCellPosition, cellSize, shift, surface);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -780,44 +806,47 @@ namespace
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(-204, 204, 1.99998295307159423828125),
-            Vec3fEq(-183.965301513671875, 183.965301513671875, 1.99998819828033447265625),
-            Vec3fEq(-163.9306182861328125, 163.9306182861328125, 1.99999344348907470703125),
-            Vec3fEq(-143.89593505859375, 143.89593505859375, -2.7206256389617919921875),
-            Vec3fEq(-123.86124420166015625, 123.86124420166015625, -13.1089839935302734375),
-            Vec3fEq(-103.8265533447265625, 103.8265533447265625, -23.4973468780517578125),
-            Vec3fEq(-83.7918548583984375, 83.7918548583984375, -33.885707855224609375),
-            Vec3fEq(-63.75716400146484375, 63.75716400146484375, -44.27407073974609375),
-            Vec3fEq(-43.72247314453125, 43.72247314453125, -54.662433624267578125),
-            Vec3fEq(-23.6877803802490234375, 23.6877803802490234375, -65.0507965087890625),
-            Vec3fEq(-3.653090000152587890625, 3.653090000152587890625, -75.43915557861328125),
-            Vec3fEq(16.3816013336181640625, -16.3816013336181640625, -69.749267578125),
-            Vec3fEq(36.416290283203125, -36.416290283203125, -60.4739532470703125),
-            Vec3fEq(56.450984954833984375, -56.450984954833984375, -51.1986236572265625),
-            Vec3fEq(76.4856719970703125, -76.4856719970703125, -41.92330169677734375),
-            Vec3fEq(96.52036285400390625, -96.52036285400390625, -31.46941375732421875),
-            Vec3fEq(116.5550537109375, -116.5550537109375, -19.597003936767578125),
-            Vec3fEq(136.5897369384765625, -136.5897369384765625, -7.724592685699462890625),
-            Vec3fEq(156.6244354248046875, -156.6244354248046875, 1.99999535083770751953125),
-            Vec3fEq(176.6591339111328125, -176.6591339111328125, 1.99999010562896728515625),
-            Vec3fEq(196.693817138671875, -196.693817138671875, 1.99998486042022705078125),
-            Vec3fEq(204, -204, 1.99998295307159423828125)
+            Vec3fEq(56.66666412353515625, 460, 1.99998295307159423828125),
+            Vec3fEq(76.70135498046875, 439.965301513671875, -0.9659786224365234375),
+            Vec3fEq(96.73604583740234375, 419.93060302734375, -4.002437114715576171875),
+            Vec3fEq(116.770751953125, 399.89593505859375, -7.0388965606689453125),
+            Vec3fEq(136.8054351806640625, 379.861236572265625, -11.5593852996826171875),
+            Vec3fEq(156.840118408203125, 359.826568603515625, -20.7333812713623046875),
+            Vec3fEq(176.8748016357421875, 339.7918701171875, -34.014251708984375),
+            Vec3fEq(196.90948486328125, 319.757171630859375, -47.2951202392578125),
+            Vec3fEq(216.944183349609375, 299.722503662109375, -59.4111785888671875),
+            Vec3fEq(236.9788665771484375, 279.68780517578125, -65.76436614990234375),
+            Vec3fEq(257.0135498046875, 259.65313720703125, -68.12311553955078125),
+            Vec3fEq(277.048248291015625, 239.618438720703125, -66.5666656494140625),
+            Vec3fEq(297.082916259765625, 219.583740234375, -60.305889129638671875),
+            Vec3fEq(317.11761474609375, 199.549041748046875, -49.181324005126953125),
+            Vec3fEq(337.15228271484375, 179.5143585205078125, -35.742702484130859375),
+            Vec3fEq(357.186981201171875, 159.47967529296875, -22.304073333740234375),
+            Vec3fEq(377.221649169921875, 139.4449920654296875, -12.65070629119873046875),
+            Vec3fEq(397.25634765625, 119.41030120849609375, -7.41098117828369140625),
+            Vec3fEq(417.291046142578125, 99.3756103515625, -4.382833957672119140625),
+            Vec3fEq(437.325714111328125, 79.340911865234375, -1.354687213897705078125),
+            Vec3fEq(457.360443115234375, 59.3062286376953125, 1.624610424041748046875),
+            Vec3fEq(460, 56.66666412353515625, 1.99998295307159423828125)
         )) << mPath;
     }
 
     TEST_F(DetourNavigatorNavigatorTest, update_then_find_random_point_around_circle_should_return_position)
     {
-        const std::array<float, 5 * 5> heightfieldData {{
-            0,   0,    0,    0,    0,
-            0, -25,  -25,  -25,  -25,
-            0, -25, -100, -100, -100,
-            0, -25, -100, -100, -100,
-            0, -25, -100, -100, -100,
+        const std::array<float, 6 * 6> heightfieldData {{
+            0,   0,     0,     0,    0,    0,
+            0, -25,   -25,   -25,  -25,  -25,
+            0, -25, -1000, -1000, -100, -100,
+            0, -25, -1000, -1000, -100, -100,
+            0, -25,  -100,  -100, -100, -100,
+            0, -25,  -100,  -100, -100, -100,
         }};
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
+        const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
+        const osg::Vec3f shift = getHeightfieldShift(mCellPosition, cellSize, surface.mMinHeight, surface.mMaxHeight);
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
+        mNavigator->addHeightfield(mCellPosition, cellSize, shift, surface);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -825,12 +854,12 @@ namespace
 
         const auto result = findRandomPointAroundCircle(*mNavigator, mAgentHalfExtents, mStart, 100.0, Flag_walk);
 
-        ASSERT_THAT(result, Optional(Vec3fEq(-198.909332275390625, 123.06096649169921875, 1.99998414516448974609375)))
+        ASSERT_THAT(result, Optional(Vec3fEq(69.6253509521484375, 531.29852294921875, -2.6667339801788330078125)))
             << (result ? *result : osg::Vec3f());
 
         const auto distance = (*result - mStart).length();
 
-        EXPECT_FLOAT_EQ(distance, 81.105133056640625) << distance;
+        EXPECT_FLOAT_EQ(distance, 73.536231994628906) << distance;
     }
 
     TEST_F(DetourNavigatorNavigatorTest, multiple_threads_should_lock_tiles)
@@ -846,17 +875,19 @@ namespace
             0, -25, -100, -100, -100,
         }};
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
+        const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
+        const osg::Vec3f shift = getHeightfieldShift(mCellPosition, cellSize, surface.mMinHeight, surface.mMaxHeight);
 
         std::vector<CollisionShapeInstance<btBoxShape>> boxes;
         std::generate_n(std::back_inserter(boxes), 100, [] { return std::make_unique<btBoxShape>(btVector3(20, 20, 100)); });
 
         mNavigator->addAgent(mAgentHalfExtents);
 
-        mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
+        mNavigator->addHeightfield(mCellPosition, cellSize, shift, surface);
 
         for (std::size_t i = 0; i < boxes.size(); ++i)
         {
-            const btTransform transform(btMatrix3x3::getIdentity(), btVector3(i * 10, i * 10, i * 10));
+            const btTransform transform(btMatrix3x3::getIdentity(), btVector3(shift.x() + i * 10, shift.y() + i * 10, i * 10));
             mNavigator->addObject(ObjectId(&boxes[i].shape()), ObjectShapes(boxes[i].instance()), transform);
         }
 
@@ -864,7 +895,7 @@ namespace
 
         for (std::size_t i = 0; i < boxes.size(); ++i)
         {
-            const btTransform transform(btMatrix3x3::getIdentity(), btVector3(i * 10 + 1, i * 10 + 1, i * 10 + 1));
+            const btTransform transform(btMatrix3x3::getIdentity(), btVector3(shift.x() + i * 10 + 1, shift.y() + i * 10 + 1, i * 10 + 1));
             mNavigator->updateObject(ObjectId(&boxes[i].shape()), ObjectShapes(boxes[i].instance()), transform);
         }
 
@@ -875,29 +906,29 @@ namespace
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(-204, 204, 1.99998295307159423828125),
-            Vec3fEq(-189.9427337646484375, 179.3997802734375, 1.9999866485595703125),
-            Vec3fEq(-175.8854522705078125, 154.7995452880859375, 1.99999034404754638671875),
-            Vec3fEq(-161.82818603515625, 130.1993255615234375, -3.701923847198486328125),
-            Vec3fEq(-147.770904541015625, 105.5991058349609375, -15.67664432525634765625),
-            Vec3fEq(-133.7136383056640625, 80.99887847900390625, -27.6513614654541015625),
-            Vec3fEq(-119.65636444091796875, 56.39865875244140625, -20.1209163665771484375),
-            Vec3fEq(-105.59909820556640625, 31.798435211181640625, -25.0669879913330078125),
-            Vec3fEq(-91.54183197021484375, 7.1982135772705078125, -31.5624217987060546875),
-            Vec3fEq(-77.48455810546875, -17.402008056640625, -26.98972320556640625),
-            Vec3fEq(-63.427295684814453125, -42.00223541259765625, -19.9045581817626953125),
-            Vec3fEq(-42.193531036376953125, -60.761363983154296875, -20.4544773101806640625),
-            Vec3fEq(-20.9597682952880859375, -79.5204925537109375, -23.599918365478515625),
-            Vec3fEq(3.8312885761260986328125, -93.2384033203125, -30.7141361236572265625),
-            Vec3fEq(28.6223468780517578125, -106.95632171630859375, -24.1782474517822265625),
-            Vec3fEq(53.413402557373046875, -120.6742401123046875, -19.4096889495849609375),
-            Vec3fEq(78.20446014404296875, -134.39215087890625, -27.6632633209228515625),
-            Vec3fEq(102.99552154541015625, -148.110076904296875, -15.8613681793212890625),
-            Vec3fEq(127.7865753173828125, -161.827972412109375, -4.059485912322998046875),
-            Vec3fEq(152.57763671875, -175.5458984375, 1.9999904632568359375),
-            Vec3fEq(177.3686981201171875, -189.2638092041015625, 1.9999866485595703125),
-            Vec3fEq(202.1597442626953125, -202.9817047119140625, 1.9999830722808837890625),
-            Vec3fEq(204, -204, 1.99998295307159423828125)
+            Vec3fEq(56.66666412353515625, 460, 1.99998295307159423828125),
+            Vec3fEq(69.5299530029296875, 434.754913330078125, -2.6775772571563720703125),
+            Vec3fEq(82.39324951171875, 409.50982666015625, -7.355137348175048828125),
+            Vec3fEq(95.25653839111328125, 384.2647705078125, -12.0326976776123046875),
+            Vec3fEq(108.11983489990234375, 359.019683837890625, -16.71025848388671875),
+            Vec3fEq(120.983123779296875, 333.774627685546875, -21.3878192901611328125),
+            Vec3fEq(133.8464202880859375, 308.529541015625, -26.0653781890869140625),
+            Vec3fEq(146.7097015380859375, 283.284454345703125, -30.7429370880126953125),
+            Vec3fEq(159.572998046875, 258.039398193359375, -35.420497894287109375),
+            Vec3fEq(172.4362945556640625, 232.7943115234375, -27.2731761932373046875),
+            Vec3fEq(185.2996063232421875, 207.54925537109375, -20.3612518310546875),
+            Vec3fEq(206.6449737548828125, 188.917236328125, -20.578319549560546875),
+            Vec3fEq(227.9903564453125, 170.28521728515625, -26.291717529296875),
+            Vec3fEq(253.4362640380859375, 157.8239593505859375, -34.784488677978515625),
+            Vec3fEq(278.8822021484375, 145.3627166748046875, -30.253124237060546875),
+            Vec3fEq(304.328094482421875, 132.9014739990234375, -25.72176361083984375),
+            Vec3fEq(329.774017333984375, 120.44022369384765625, -21.1904010772705078125),
+            Vec3fEq(355.219940185546875, 107.97898101806640625, -16.6590404510498046875),
+            Vec3fEq(380.665863037109375, 95.51773834228515625, -12.127681732177734375),
+            Vec3fEq(406.111785888671875, 83.05649566650390625, -7.5963191986083984375),
+            Vec3fEq(431.557708740234375, 70.5952606201171875, -3.0649592876434326171875),
+            Vec3fEq(457.003662109375, 58.134021759033203125, 1.4664003849029541015625),
+            Vec3fEq(460, 56.66666412353515625, 1.99998295307159423828125)
         )) << mPath;
     }
 
@@ -949,15 +980,19 @@ namespace
             0, -25, -100, -100, -100,
         }};
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
+        const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
+        const osg::Vec3f shift = getHeightfieldShift(mCellPosition, cellSize, surface.mMinHeight, surface.mMaxHeight);
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
+        mNavigator->addHeightfield(mCellPosition, cellSize, shift, surface);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        const auto result = raycast(*mNavigator, mAgentHalfExtents, mStart, mEnd, Flag_walk);
+        const osg::Vec3f start(57, 460, 1);
+        const osg::Vec3f end(460, 57, 1);
+        const auto result = raycast(*mNavigator, mAgentHalfExtents, start, end, Flag_walk);
 
-        ASSERT_THAT(result, Optional(Vec3fEq(mEnd.x(), mEnd.y(), 1.99998295307159423828125)))
+        ASSERT_THAT(result, Optional(Vec3fEq(end.x(), end.y(), 1.95257937908172607421875)))
             << (result ? *result : osg::Vec3f());
     }
 
@@ -971,27 +1006,28 @@ namespace
             0, -25, -100, -100, -100,
         }};
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
+        const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
+        const osg::Vec3f shift = getHeightfieldShift(mCellPosition, cellSize, surface.mMinHeight, surface.mMaxHeight);
 
         CollisionShapeInstance oscillatingBox(std::make_unique<btBoxShape>(btVector3(20, 20, 20)));
-        const btVector3 oscillatingBoxShapePosition(32, 32, 400);
-        CollisionShapeInstance boderBox(std::make_unique<btBoxShape>(btVector3(50, 50, 50)));
+        const btVector3 oscillatingBoxShapePosition(288, 288, 400);
+        CollisionShapeInstance borderBox(std::make_unique<btBoxShape>(btVector3(50, 50, 50)));
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
+        mNavigator->addHeightfield(mCellPosition, cellSize, shift, surface);
         mNavigator->addObject(ObjectId(&oscillatingBox.shape()), ObjectShapes(oscillatingBox.instance()),
                               btTransform(btMatrix3x3::getIdentity(), oscillatingBoxShapePosition));
         // add this box to make navmesh bound box independent from oscillatingBoxShape rotations
-        mNavigator->addObject(ObjectId(&boderBox.shape()), ObjectShapes(boderBox.instance()),
+        mNavigator->addObject(ObjectId(&borderBox.shape()), ObjectShapes(borderBox.instance()),
                               btTransform(btMatrix3x3::getIdentity(), oscillatingBoxShapePosition + btVector3(0, 0, 200)));
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
+        const Version expectedVersion {1, 1};
+
         const auto navMeshes = mNavigator->getNavMeshes();
         ASSERT_EQ(navMeshes.size(), 1);
-        {
-            const auto navMesh = navMeshes.begin()->second->lockConst();
-            ASSERT_EQ(navMesh->getVersion(), (Version {1, 4}));
-        }
+        ASSERT_EQ(navMeshes.begin()->second->lockConst()->getVersion(), expectedVersion);
 
         for (int n = 0; n < 10; ++n)
         {
@@ -1003,18 +1039,17 @@ namespace
         }
 
         ASSERT_EQ(navMeshes.size(), 1);
-        {
-            const auto navMesh = navMeshes.begin()->second->lockConst();
-            ASSERT_EQ(navMesh->getVersion(), (Version {1, 4}));
-        }
+        ASSERT_EQ(navMeshes.begin()->second->lockConst()->getVersion(), expectedVersion);
     }
 
     TEST_F(DetourNavigatorNavigatorTest, should_provide_path_over_flat_heightfield)
     {
         const HeightfieldPlane plane {100};
+        const int cellSize = mHeightfieldTileSize * 4;
+        const osg::Vec3f shift = getHeightfieldShift(mCellPosition, cellSize, plane.mHeight, plane.mHeight);
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * 4, mShift, plane);
+        mNavigator->addHeightfield(mCellPosition, cellSize, shift, plane);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::requiredTilesPresent);
 
@@ -1022,28 +1057,28 @@ namespace
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(-204, 204, 101.99999237060546875),
-            Vec3fEq(-183.965301513671875, 183.965301513671875, 101.99999237060546875),
-            Vec3fEq(-163.9306182861328125, 163.9306182861328125, 101.99999237060546875),
-            Vec3fEq(-143.89593505859375, 143.89593505859375, 101.99999237060546875),
-            Vec3fEq(-123.86124420166015625, 123.86124420166015625, 101.99999237060546875),
-            Vec3fEq(-103.8265533447265625, 103.8265533447265625, 101.99999237060546875),
-            Vec3fEq(-83.7918548583984375, 83.7918548583984375, 101.99999237060546875),
-            Vec3fEq(-63.75716400146484375, 63.75716400146484375, 101.99999237060546875),
-            Vec3fEq(-43.72247314453125, 43.72247314453125, 101.99999237060546875),
-            Vec3fEq(-23.6877803802490234375, 23.6877803802490234375, 101.99999237060546875),
-            Vec3fEq(-3.653090000152587890625, 3.653090000152587890625, 101.99999237060546875),
-            Vec3fEq(16.3816013336181640625, -16.3816013336181640625, 101.99999237060546875),
-            Vec3fEq(36.416290283203125, -36.416290283203125, 101.99999237060546875),
-            Vec3fEq(56.450984954833984375, -56.450984954833984375, 101.99999237060546875),
-            Vec3fEq(76.4856719970703125, -76.4856719970703125, 101.99999237060546875),
-            Vec3fEq(96.52036285400390625, -96.52036285400390625, 101.99999237060546875),
-            Vec3fEq(116.5550537109375, -116.5550537109375, 101.99999237060546875),
-            Vec3fEq(136.5897369384765625, -136.5897369384765625, 101.99999237060546875),
-            Vec3fEq(156.6244354248046875, -156.6244354248046875, 101.99999237060546875),
-            Vec3fEq(176.6591339111328125, -176.6591339111328125, 101.99999237060546875),
-            Vec3fEq(196.693817138671875, -196.693817138671875, 101.99999237060546875),
-            Vec3fEq(204, -204, 101.99999237060546875)
+            Vec3fEq(56.66666412353515625, 460, 203.9999847412109375),
+            Vec3fEq(76.70135498046875, 439.965301513671875, 203.9999847412109375),
+            Vec3fEq(96.73604583740234375, 419.93060302734375, 203.9999847412109375),
+            Vec3fEq(116.770751953125, 399.89593505859375, 203.9999847412109375),
+            Vec3fEq(136.8054351806640625, 379.861236572265625, 203.9999847412109375),
+            Vec3fEq(156.840118408203125, 359.826568603515625, 203.9999847412109375),
+            Vec3fEq(176.8748016357421875, 339.7918701171875, 203.9999847412109375),
+            Vec3fEq(196.90948486328125, 319.757171630859375, 203.9999847412109375),
+            Vec3fEq(216.944183349609375, 299.722503662109375, 203.9999847412109375),
+            Vec3fEq(236.9788665771484375, 279.68780517578125, 203.9999847412109375),
+            Vec3fEq(257.0135498046875, 259.65313720703125, 203.9999847412109375),
+            Vec3fEq(277.048248291015625, 239.618438720703125, 203.9999847412109375),
+            Vec3fEq(297.082916259765625, 219.583740234375, 203.9999847412109375),
+            Vec3fEq(317.11761474609375, 199.549041748046875, 203.9999847412109375),
+            Vec3fEq(337.15228271484375, 179.5143585205078125, 203.9999847412109375),
+            Vec3fEq(357.186981201171875, 159.47967529296875, 203.9999847412109375),
+            Vec3fEq(377.221649169921875, 139.4449920654296875, 203.9999847412109375),
+            Vec3fEq(397.25634765625, 119.41030120849609375, 203.9999847412109375),
+            Vec3fEq(417.291046142578125, 99.3756103515625, 203.9999847412109375),
+            Vec3fEq(437.325714111328125, 79.340911865234375, 203.9999847412109375),
+            Vec3fEq(457.360443115234375, 59.3062286376953125, 203.9999847412109375),
+            Vec3fEq(460, 56.66666412353515625, 203.9999847412109375)
         )) << mPath;
     }
 
@@ -1057,14 +1092,16 @@ namespace
             0, -25, -100, -100, -100,
         }};
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
+        const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
+        const osg::Vec3f shift = getHeightfieldShift(mCellPosition, cellSize, surface.mMinHeight, surface.mMaxHeight);
 
         CollisionShapeInstance compound(std::make_unique<btCompoundShape>());
         compound.shape().addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(204, -204, 0)),
                                        new btBoxShape(btVector3(200, 200, 1000)));
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
-        mNavigator->addObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance()), btTransform::getIdentity());
+        mNavigator->addHeightfield(mCellPosition, cellSize, shift, surface);
+        mNavigator->addObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance()), mTransform);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -1072,23 +1109,16 @@ namespace
                   Status::PartialPath);
 
         EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(-204, 204, -2.666739940643310546875),
-            Vec3fEq(-193.730682373046875, 177.59320068359375, -3.9535934925079345703125),
-            Vec3fEq(-183.4613800048828125, 151.1864166259765625, -5.240451335906982421875),
-            Vec3fEq(-173.1920623779296875, 124.77962493896484375, -6.527309417724609375),
-            Vec3fEq(-162.922760009765625, 98.37282562255859375, -7.814167022705078125),
-            Vec3fEq(-152.6534423828125, 71.96602630615234375, -9.898590087890625),
-            Vec3fEq(-142.384124755859375, 45.559230804443359375, -17.641445159912109375),
-            Vec3fEq(-132.1148223876953125, 19.152431488037109375, -25.3843059539794921875),
-            Vec3fEq(-121.8455047607421875, -7.254369258880615234375, -27.97742462158203125),
-            Vec3fEq(-111.57619476318359375, -33.66117095947265625, -16.974590301513671875),
-            Vec3fEq(-101.30689239501953125, -60.06797027587890625, -5.9717559814453125),
-            Vec3fEq(-91.0375823974609375, -86.47476959228515625, -2.6667339801788330078125),
-            Vec3fEq(-80.76827239990234375, -112.88156890869140625, -2.6667339801788330078125),
-            Vec3fEq(-70.49897003173828125, -139.2883758544921875, -2.6667339801788330078125),
-            Vec3fEq(-60.229663848876953125, -165.6951751708984375, -2.6667339801788330078125),
-            Vec3fEq(-49.96035003662109375, -192.1019744873046875, -2.6667339801788330078125),
-            Vec3fEq(-45.333343505859375, -204, -2.6667339801788330078125)
+            Vec3fEq(56.66666412353515625, 460, -2.5371043682098388671875),
+            Vec3fEq(76.4206390380859375, 439.688446044921875, -2.913421630859375),
+            Vec3fEq(96.17461395263671875, 419.37689208984375, -4.508244037628173828125),
+            Vec3fEq(115.9285888671875, 399.06536865234375, -6.103069305419921875),
+            Vec3fEq(135.68255615234375, 378.753814697265625, -7.69789028167724609375),
+            Vec3fEq(155.4365386962890625, 358.44232177734375, -20.9574832916259765625),
+            Vec3fEq(175.190521240234375, 338.130767822265625, -35.907501220703125),
+            Vec3fEq(194.944488525390625, 317.8192138671875, -50.8574981689453125),
+            Vec3fEq(214.6984710693359375, 297.507720947265625, -65.8075103759765625),
+            Vec3fEq(222.0000457763671875, 290.00006103515625, -71.3334197998046875)
         )) << mPath;
     }
 
@@ -1102,14 +1132,16 @@ namespace
             0, -25, -100, -100, -100,
         }};
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
+        const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
+        const osg::Vec3f shift = getHeightfieldShift(mCellPosition, cellSize, surface.mMinHeight, surface.mMaxHeight);
 
         CollisionShapeInstance compound(std::make_unique<btCompoundShape>());
         compound.shape().addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(204, -204, 0)),
                                        new btBoxShape(btVector3(100, 100, 1000)));
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addHeightfield(mCellPosition, mHeightfieldTileSize * (surface.mSize - 1), mShift, surface);
-        mNavigator->addObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance()), btTransform::getIdentity());
+        mNavigator->addHeightfield(mCellPosition, cellSize, shift, surface);
+        mNavigator->addObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance()), mTransform);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -1119,25 +1151,24 @@ namespace
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(-204, 204, -2.666739940643310546875),
-            Vec3fEq(-188.745635986328125, 180.1236114501953125, -4.578275203704833984375),
-            Vec3fEq(-173.49127197265625, 156.247222900390625, -6.489814281463623046875),
-            Vec3fEq(-158.2369232177734375, 132.370819091796875, -8.4013538360595703125),
-            Vec3fEq(-142.9825592041015625, 108.49443817138671875, -10.31289386749267578125),
-            Vec3fEq(-127.7281951904296875, 84.6180419921875, -17.4810466766357421875),
-            Vec3fEq(-112.47383880615234375, 60.7416534423828125, -27.6026020050048828125),
-            Vec3fEq(-97.21947479248046875, 36.865261077880859375, -37.724163055419921875),
-            Vec3fEq(-81.965118408203125, 12.98886966705322265625, -47.84572601318359375),
-            Vec3fEq(-66.71075439453125, -10.887523651123046875, -46.691577911376953125),
-            Vec3fEq(-51.45639801025390625, -34.763916015625, -32.085445404052734375),
-            Vec3fEq(-36.202037811279296875, -58.640308380126953125, -28.5217914581298828125),
-            Vec3fEq(-20.947673797607421875, -82.5167083740234375, -32.16143035888671875),
-            Vec3fEq(-5.693310260772705078125, -106.393096923828125, -35.8010711669921875),
-            Vec3fEq(9.56105327606201171875, -130.2694854736328125, -29.6399688720703125),
-            Vec3fEq(24.8154163360595703125, -154.1458740234375, -17.6428318023681640625),
-            Vec3fEq(40.0697784423828125, -178.0222625732421875, -10.46006107330322265625),
-            Vec3fEq(55.3241424560546875, -201.8986663818359375, -3.297139644622802734375),
-            Vec3fEq(56.66666412353515625, -204, -2.6667373180389404296875)
+            Vec3fEq(56.66666412353515625, 460, -2.5371043682098388671875),
+            Vec3fEq(71.5649566650390625, 435.899810791015625, -5.817593097686767578125),
+            Vec3fEq(86.46324920654296875, 411.79962158203125, -9.66499996185302734375),
+            Vec3fEq(101.36154937744140625, 387.699462890625, -13.512401580810546875),
+            Vec3fEq(116.2598419189453125, 363.599273681640625, -17.359806060791015625),
+            Vec3fEq(131.1581268310546875, 339.499114990234375, -21.2072086334228515625),
+            Vec3fEq(146.056427001953125, 315.39892578125, -25.0546112060546875),
+            Vec3fEq(160.9547271728515625, 291.298736572265625, -28.9020137786865234375),
+            Vec3fEq(175.8530120849609375, 267.198577880859375, -32.749416351318359375),
+            Vec3fEq(190.751312255859375, 243.098388671875, -33.819454193115234375),
+            Vec3fEq(205.64959716796875, 218.9982147216796875, -31.020172119140625),
+            Vec3fEq(220.5478973388671875, 194.898040771484375, -26.844608306884765625),
+            Vec3fEq(235.446197509765625, 170.7978668212890625, -26.785541534423828125),
+            Vec3fEq(250.3444671630859375, 146.6976776123046875, -26.7264766693115234375),
+            Vec3fEq(265.242767333984375, 122.59751129150390625, -20.59339141845703125),
+            Vec3fEq(280.141021728515625, 98.4973297119140625, -14.040531158447265625),
+            Vec3fEq(295.039306640625, 74.39715576171875, -7.48766994476318359375),
+            Vec3fEq(306, 56.66666412353515625, -2.6667339801788330078125)
         )) << mPath;
     }
 }
diff --git a/apps/openmw_test_suite/detournavigator/operators.hpp b/apps/openmw_test_suite/detournavigator/operators.hpp
index 92740c65f1..fb6fcc5c39 100644
--- a/apps/openmw_test_suite/detournavigator/operators.hpp
+++ b/apps/openmw_test_suite/detournavigator/operators.hpp
@@ -48,7 +48,7 @@ namespace testing
     template <>
     inline testing::Message& Message::operator <<(const osg::Vec3f& value)
     {
-        return (*this) << "osg::Vec3f(" << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.x()
+        return (*this) << "Vec3fEq(" << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.x()
             << ", " << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.y()
             << ", " << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.z()
             << ')';
diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index c53fcdcc48..890e2c994b 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -357,6 +357,7 @@ namespace
         rcPolyMeshDetail& polyMeshDetail)
     {
         rcCompactHeightfield compact;
+        compact.dist = nullptr;
         buildCompactHeightfield(context, config.walkableHeight, config.walkableClimb, solid, compact);
 
         erodeWalkableArea(context, config.walkableRadius, compact);

From f4f4458d01716613ff78369a538959060f2af559 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 5 Nov 2021 15:30:56 +0100
Subject: [PATCH 1811/2859] Calculate recast mesh bounds when building navmesh

---
 .../detournavigator/navigator.cpp             | 20 ++---
 components/detournavigator/makenavmesh.cpp    | 84 ++++++++++++-------
 components/detournavigator/recastmesh.cpp     | 22 -----
 components/detournavigator/recastmesh.hpp     |  6 --
 4 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index 367572d449..f6b09c1d55 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -1109,16 +1109,16 @@ namespace
                   Status::PartialPath);
 
         EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(56.66666412353515625, 460, -2.5371043682098388671875),
-            Vec3fEq(76.4206390380859375, 439.688446044921875, -2.913421630859375),
-            Vec3fEq(96.17461395263671875, 419.37689208984375, -4.508244037628173828125),
-            Vec3fEq(115.9285888671875, 399.06536865234375, -6.103069305419921875),
-            Vec3fEq(135.68255615234375, 378.753814697265625, -7.69789028167724609375),
-            Vec3fEq(155.4365386962890625, 358.44232177734375, -20.9574832916259765625),
-            Vec3fEq(175.190521240234375, 338.130767822265625, -35.907501220703125),
-            Vec3fEq(194.944488525390625, 317.8192138671875, -50.8574981689453125),
-            Vec3fEq(214.6984710693359375, 297.507720947265625, -65.8075103759765625),
-            Vec3fEq(222.0000457763671875, 290.00006103515625, -71.3334197998046875)
+            Vec3fEq(56.66664886474609375, 460, -2.5371043682098388671875),
+            Vec3fEq(76.42063140869140625, 439.6884765625, -2.9134314060211181640625),
+            Vec3fEq(96.17461395263671875, 419.376953125, -4.50826549530029296875),
+            Vec3fEq(115.9285888671875, 399.0654296875, -6.1030979156494140625),
+            Vec3fEq(135.6825714111328125, 378.753936767578125, -7.697928905487060546875),
+            Vec3fEq(155.436553955078125, 358.442413330078125, -20.9574985504150390625),
+            Vec3fEq(175.190521240234375, 338.130889892578125, -35.907512664794921875),
+            Vec3fEq(194.9445037841796875, 317.8193359375, -50.85752105712890625),
+            Vec3fEq(214.698486328125, 297.5078125, -65.807525634765625),
+            Vec3fEq(222.0001068115234375, 290.000091552734375, -71.333465576171875)
         )) << mPath;
     }
 
diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index 890e2c994b..cac4be0fdd 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -121,7 +121,7 @@ namespace
         return result;
     }
 
-    rcConfig makeConfig(const osg::Vec3f& agentHalfExtents, const osg::Vec3f& boundsMin, const osg::Vec3f& boundsMax,
+    rcConfig makeConfig(const osg::Vec3f& agentHalfExtents, const TilePosition& tile, float minZ, float maxZ,
         const Settings& settings)
     {
         rcConfig config;
@@ -140,15 +140,18 @@ namespace
         config.detailSampleDist = settings.mDetailSampleDist < 0.9f ? 0 : config.cs * settings.mDetailSampleDist;
         config.detailSampleMaxError = config.ch * settings.mDetailSampleMaxError;
         config.borderSize = settings.mBorderSize;
-        config.width = settings.mTileSize + config.borderSize * 2;
-        config.height = settings.mTileSize + config.borderSize * 2;
-        rcVcopy(config.bmin, boundsMin.ptr());
-        rcVcopy(config.bmax, boundsMax.ptr());
-        config.bmin[0] -= getBorderSize(settings);
-        config.bmin[2] -= getBorderSize(settings);
-        config.bmax[0] += getBorderSize(settings);
-        config.bmax[2] += getBorderSize(settings);
         config.tileSize = settings.mTileSize;
+        const int size = config.tileSize + config.borderSize * 2;
+        config.width = size;
+        config.height = size;
+        const float halfBoundsSize = size * config.cs * 0.5f;
+        const osg::Vec2f shift = osg::Vec2f(tile.x() + 0.5f, tile.y() + 0.5f) * getTileSize(settings);
+        config.bmin[0] = shift.x() - halfBoundsSize;
+        config.bmin[1] = minZ;
+        config.bmin[2] = shift.y() - halfBoundsSize;
+        config.bmax[0] = shift.x() + halfBoundsSize;
+        config.bmax[1] = maxZ;
+        config.bmax[2] = shift.y() + halfBoundsSize;
 
         return config;
     }
@@ -388,20 +391,56 @@ namespace
             ++power;
         return power;
     }
+
+    std::pair<float, float> getBoundsByZ(const RecastMesh& recastMesh, const osg::Vec3f& agentHalfExtents, const Settings& settings)
+    {
+        float minZ = 0;
+        float maxZ = 0;
+
+        const std::vector<float>& vertices = recastMesh.getMesh().getVertices();
+        for (std::size_t i = 0, n = vertices.size(); i < n; i += 3)
+        {
+            minZ = std::min(minZ, vertices[i + 2]);
+            maxZ = std::max(maxZ, vertices[i + 2]);
+        }
+
+        for (const Cell& water : recastMesh.getWater())
+        {
+            const float swimLevel = getSwimLevel(settings, water.mShift.z(), agentHalfExtents.z());
+            minZ = std::min(minZ, swimLevel);
+            maxZ = std::max(maxZ, swimLevel);
+        }
+
+        for (const Heightfield& heightfield : recastMesh.getHeightfields())
+        {
+            if (heightfield.mHeights.empty())
+                continue;
+            const auto [minHeight, maxHeight] = std::minmax_element(heightfield.mHeights.begin(), heightfield.mHeights.end());
+            minZ = std::min(minZ, *minHeight);
+            maxZ = std::max(maxZ, *maxHeight);
+        }
+
+        for (const FlatHeightfield& heightfield : recastMesh.getFlatHeightfields())
+        {
+            minZ = std::min(minZ, heightfield.mHeight);
+            maxZ = std::max(maxZ, heightfield.mHeight);
+        }
+
+        return {minZ, maxZ};
+    }
 }
 } // namespace DetourNavigator
 
 namespace DetourNavigator
 {
     std::unique_ptr<PreparedNavMeshData> prepareNavMeshTileData(const RecastMesh& recastMesh,
-        const TilePosition& tile, const Bounds& bounds, const osg::Vec3f& agentHalfExtents, const Settings& settings)
+        const TilePosition& tilePosition, const osg::Vec3f& agentHalfExtents, const Settings& settings)
     {
-        const TileBounds tileBounds = makeTileBounds(settings, tile);
-        const osg::Vec3f boundsMin(tileBounds.mMin.x(), bounds.mMin.y() - 1, tileBounds.mMin.y());
-        const osg::Vec3f boundsMax(tileBounds.mMax.x(), bounds.mMax.y() + 1, tileBounds.mMax.y());
+        const auto [minZ, maxZ] = getBoundsByZ(recastMesh, agentHalfExtents, settings);
 
         rcContext context;
-        const auto config = makeConfig(agentHalfExtents, boundsMin, boundsMax, settings);
+        const auto config = makeConfig(agentHalfExtents, tilePosition, toNavMeshCoordinates(settings, minZ),
+                                       toNavMeshCoordinates(settings, maxZ), settings);
 
         rcHeightfield solid;
         createHeightfield(context, solid, config.width, config.height, config.bmin, config.bmax, config.cs, config.ch);
@@ -529,18 +568,8 @@ namespace DetourNavigator
             return navMeshCacheItem->lock()->removeTile(changedTile);
         }
 
-        auto recastMeshBounds = recastMesh->getBounds();
-        recastMeshBounds.mMin = toNavMeshCoordinates(settings, recastMeshBounds.mMin);
-        recastMeshBounds.mMax = toNavMeshCoordinates(settings, recastMeshBounds.mMax);
-
-        for (const auto& water : recastMesh->getWater())
-        {
-            const float height = toNavMeshCoordinates(settings, getSwimLevel(settings, water.mShift.z(), agentHalfExtents.z()));
-            recastMeshBounds.mMin.y() = std::min(recastMeshBounds.mMin.y(), height);
-            recastMeshBounds.mMax.y() = std::max(recastMeshBounds.mMax.y(), height);
-        }
-
-        if (isEmpty(recastMeshBounds))
+        if (recastMesh->getMesh().getIndices().empty() && recastMesh->getWater().empty()
+                && recastMesh->getHeightfields().empty() && recastMesh->getFlatHeightfields().empty())
         {
             Log(Debug::Debug) << "Ignore add tile: recastMesh is empty";
             return navMeshCacheItem->lock()->removeTile(changedTile);
@@ -559,8 +588,7 @@ namespace DetourNavigator
 
         if (!cachedNavMeshData)
         {
-            auto prepared = prepareNavMeshTileData(*recastMesh, changedTile, recastMeshBounds,
-                                                   agentHalfExtents, settings);
+            auto prepared = prepareNavMeshTileData(*recastMesh, changedTile, agentHalfExtents, settings);
 
             if (prepared == nullptr)
             {
diff --git a/components/detournavigator/recastmesh.cpp b/components/detournavigator/recastmesh.cpp
index e2dea0ad6e..258a700b0e 100644
--- a/components/detournavigator/recastmesh.cpp
+++ b/components/detournavigator/recastmesh.cpp
@@ -27,31 +27,9 @@ namespace DetourNavigator
         , mHeightfields(std::move(heightfields))
         , mFlatHeightfields(std::move(flatHeightfields))
     {
-        if (mMesh.getVerticesCount() > 0)
-            rcCalcBounds(mMesh.getVertices().data(), static_cast<int>(mMesh.getVerticesCount()),
-                         mBounds.mMin.ptr(), mBounds.mMax.ptr());
         mWater.shrink_to_fit();
         mHeightfields.shrink_to_fit();
         for (Heightfield& v : mHeightfields)
             v.mHeights.shrink_to_fit();
-        for (const Heightfield& v : mHeightfields)
-        {
-            const auto [min, max] = std::minmax_element(v.mHeights.begin(), v.mHeights.end());
-            mBounds.mMin.x() = std::min(mBounds.mMin.x(), v.mBounds.mMin.x());
-            mBounds.mMin.y() = std::min(mBounds.mMin.y(), v.mBounds.mMin.y());
-            mBounds.mMin.z() = std::min(mBounds.mMin.z(), *min);
-            mBounds.mMax.x() = std::max(mBounds.mMax.x(), v.mBounds.mMax.x());
-            mBounds.mMax.y() = std::max(mBounds.mMax.y(), v.mBounds.mMax.y());
-            mBounds.mMax.z() = std::max(mBounds.mMax.z(), *max);
-        }
-        for (const FlatHeightfield& v : mFlatHeightfields)
-        {
-            mBounds.mMin.x() = std::min(mBounds.mMin.x(), v.mBounds.mMin.x());
-            mBounds.mMin.y() = std::min(mBounds.mMin.y(), v.mBounds.mMin.y());
-            mBounds.mMin.z() = std::min(mBounds.mMin.z(), v.mHeight);
-            mBounds.mMax.x() = std::max(mBounds.mMax.x(), v.mBounds.mMax.x());
-            mBounds.mMax.y() = std::max(mBounds.mMax.y(), v.mBounds.mMax.y());
-            mBounds.mMax.z() = std::max(mBounds.mMax.z(), v.mHeight);
-        }
     }
 }
diff --git a/components/detournavigator/recastmesh.hpp b/components/detournavigator/recastmesh.hpp
index e2e7b9e188..928b282d19 100644
--- a/components/detournavigator/recastmesh.hpp
+++ b/components/detournavigator/recastmesh.hpp
@@ -118,11 +118,6 @@ namespace DetourNavigator
             return mFlatHeightfields;
         }
 
-        const Bounds& getBounds() const
-        {
-            return mBounds;
-        }
-
     private:
         std::size_t mGeneration;
         std::size_t mRevision;
@@ -130,7 +125,6 @@ namespace DetourNavigator
         std::vector<Cell> mWater;
         std::vector<Heightfield> mHeightfields;
         std::vector<FlatHeightfield> mFlatHeightfields;
-        Bounds mBounds;
 
         friend inline std::size_t getSize(const RecastMesh& value) noexcept
         {

From 8571c317d8cc767255e15b57a668adaf963665d0 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 4 Nov 2021 02:48:32 +0100
Subject: [PATCH 1812/2859] Add raw water data to navigator

---
 .../detournavigator/navmeshtilescache.cpp     |  9 ++--
 apps/openmw/mwworld/scene.cpp                 | 11 +----
 .../detournavigator/navigator.cpp             |  8 ++--
 .../detournavigator/navmeshtilescache.cpp     | 28 ++++++------
 .../detournavigator/recastmeshbuilder.cpp     | 28 ++++++++++--
 .../tilecachedrecastmeshmanager.cpp           | 24 +++++------
 .../cachedrecastmeshmanager.cpp               |  7 ++-
 .../cachedrecastmeshmanager.hpp               |  4 +-
 components/detournavigator/makenavmesh.cpp    | 23 +++++-----
 components/detournavigator/navigator.hpp      |  2 +-
 components/detournavigator/navigatorimpl.cpp  |  4 +-
 components/detournavigator/navigatorimpl.hpp  |  2 +-
 components/detournavigator/navigatorstub.hpp  |  2 +-
 components/detournavigator/navmeshmanager.cpp |  8 ++--
 components/detournavigator/navmeshmanager.hpp |  2 +-
 .../detournavigator/navmeshtilescache.hpp     |  2 +-
 components/detournavigator/recastmesh.cpp     |  2 +-
 components/detournavigator/recastmesh.hpp     | 43 +++++++++++++++++--
 .../detournavigator/recastmeshbuilder.cpp     |  4 +-
 .../detournavigator/recastmeshbuilder.hpp     |  4 +-
 .../detournavigator/recastmeshmanager.cpp     | 10 ++---
 .../detournavigator/recastmeshmanager.hpp     |  6 +--
 .../tilecachedrecastmeshmanager.cpp           | 12 +++---
 .../tilecachedrecastmeshmanager.hpp           |  4 +-
 24 files changed, 150 insertions(+), 99 deletions(-)

diff --git a/apps/benchmarks/detournavigator/navmeshtilescache.cpp b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
index 6c530db41c..7acbcc3a4f 100644
--- a/apps/benchmarks/detournavigator/navmeshtilescache.cpp
+++ b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
@@ -89,10 +89,11 @@ namespace
     template <typename OutputIterator, typename Random>
     void generateWater(OutputIterator out, std::size_t count, Random& random)
     {
-        std::uniform_real_distribution<float> distribution(0.0, 1.0);
+        std::uniform_real_distribution<float> floatDistribution(0.0, 1.0);
+        std::uniform_int_distribution<int> intDistribution(-10, 10);
         std::generate_n(out, count, [&] {
-            const osg::Vec3f shift(distribution(random), distribution(random), distribution(random));
-            return Cell {1, shift};
+            const osg::Vec2i cellPosition(intDistribution(random), intDistribution(random));
+            return CellWater {cellPosition, Water {8196, floatDistribution(random)}};
         });
     }
 
@@ -148,7 +149,7 @@ namespace
         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);
         Mesh mesh = generateMesh(triangles, random);
-        std::vector<Cell> water;
+        std::vector<CellWater> water;
         generateWater(std::back_inserter(water), 1, random);
         RecastMesh recastMesh(generation, revision, std::move(mesh), std::move(water),
                               {generateHeightfield(random)}, {generateFlatHeightfield(random)});
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 769817810a..cc2a692e2b 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -434,18 +434,11 @@ namespace MWWorld
             if (cell->getCell()->isExterior())
             {
                 if (const auto heightField = mPhysics->getHeightField(cellX, cellY))
-                {
-                    const btTransform& transform =heightField->getCollisionObject()->getWorldTransform();
-                    mNavigator.addWater(osg::Vec2i(cellX, cellY), ESM::Land::REAL_SIZE,
-                                        osg::Vec3f(static_cast<float>(transform.getOrigin().x()),
-                                                   static_cast<float>(transform.getOrigin().y()),
-                                                   waterLevel));
-                }
+                    mNavigator.addWater(osg::Vec2i(cellX, cellY), ESM::Land::REAL_SIZE, waterLevel);
             }
             else
             {
-                mNavigator.addWater(osg::Vec2i(cellX, cellY), std::numeric_limits<int>::max(),
-                                    osg::Vec3f(0, 0, waterLevel));
+                mNavigator.addWater(osg::Vec2i(cellX, cellY), std::numeric_limits<int>::max(), waterLevel);
             }
         }
         else
diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index f6b09c1d55..a8b42f0db9 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -548,7 +548,7 @@ namespace
         const osg::Vec3f shift = getHeightfieldShift(mCellPosition, cellSize, surface.mMinHeight, surface.mMaxHeight);
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addWater(mCellPosition, cellSize, osg::Vec3f(shift.x(), shift.y(), 300));
+        mNavigator->addWater(mCellPosition, cellSize, 300);
         mNavigator->addHeightfield(mCellPosition, cellSize, shift, surface);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
@@ -597,7 +597,7 @@ namespace
         const osg::Vec3f shift = getHeightfieldShift(mCellPosition, cellSize, surface.mMinHeight, surface.mMaxHeight);
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addWater(mCellPosition, cellSize, osg::Vec3f(shift.x(), shift.y(), -25));
+        mNavigator->addWater(mCellPosition, cellSize, -25);
         mNavigator->addHeightfield(mCellPosition, cellSize, shift, surface);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
@@ -645,7 +645,7 @@ namespace
 
         mNavigator->addAgent(mAgentHalfExtents);
         mNavigator->addHeightfield(mCellPosition, cellSize, shift, surface);
-        mNavigator->addWater(mCellPosition, std::numeric_limits<int>::max(), osg::Vec3f(shift.x(), shift.y(), -25));
+        mNavigator->addWater(mCellPosition, std::numeric_limits<int>::max(), -25);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -691,7 +691,7 @@ namespace
         const osg::Vec3f shift = getHeightfieldShift(mCellPosition, cellSize, surface.mMinHeight, surface.mMaxHeight);
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addWater(mCellPosition, cellSize, osg::Vec3f(shift.x(), shift.y(), -25));
+        mNavigator->addWater(mCellPosition, cellSize, -25);
         mNavigator->addHeightfield(mCellPosition, cellSize, shift, surface);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
diff --git a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
index 309266142f..c56be440e3 100644
--- a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
+++ b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
@@ -144,14 +144,14 @@ namespace
         const std::size_t mGeneration = 0;
         const std::size_t mRevision = 0;
         const Mesh mMesh {makeMesh()};
-        const std::vector<Cell> mWater {};
+        const std::vector<CellWater> mWater {};
         const std::vector<Heightfield> mHeightfields {};
         const std::vector<FlatHeightfield> mFlatHeightfields {};
         const RecastMesh mRecastMesh {mGeneration, mRevision, mMesh, mWater, mHeightfields, mFlatHeightfields};
         std::unique_ptr<PreparedNavMeshData> mPreparedNavMeshData {makePeparedNavMeshData(3)};
 
         const std::size_t mRecastMeshSize = sizeof(mRecastMesh) + getSize(mRecastMesh);
-        const std::size_t mRecastMeshWithWaterSize = mRecastMeshSize + sizeof(Cell);
+        const std::size_t mRecastMeshWithWaterSize = mRecastMeshSize + sizeof(CellWater);
         const std::size_t mPreparedNavMeshDataSize = sizeof(*mPreparedNavMeshData) + getSize(*mPreparedNavMeshData);
     };
 
@@ -234,7 +234,7 @@ namespace
     {
         const std::size_t maxSize = 1;
         NavMeshTilesCache cache(maxSize);
-        const std::vector<Cell> water {1, Cell {1, osg::Vec3f()}};
+        const std::vector<CellWater> water(1, CellWater {osg::Vec2i(), Water {1, 0.0f}});
         const RecastMesh unexistentRecastMesh {mGeneration, mRevision, mMesh, water, mHeightfields, mFlatHeightfields};
 
         cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
@@ -246,7 +246,7 @@ namespace
         const std::size_t maxSize = mRecastMeshWithWaterSize + mPreparedNavMeshDataSize;
         NavMeshTilesCache cache(maxSize);
 
-        const std::vector<Cell> water {1, Cell {1, osg::Vec3f()}};
+        const std::vector<CellWater> water(1, CellWater {osg::Vec2i(), Water {1, 0.0f}});
         const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, water, mHeightfields, mFlatHeightfields};
         auto anotherPreparedNavMeshData = makePeparedNavMeshData(3);
         const auto copy = clone(*anotherPreparedNavMeshData);
@@ -264,7 +264,7 @@ namespace
         const std::size_t maxSize = mRecastMeshWithWaterSize + mPreparedNavMeshDataSize;
         NavMeshTilesCache cache(maxSize);
 
-        const std::vector<Cell> water {1, Cell {1, osg::Vec3f()}};
+        const std::vector<CellWater> water(1, CellWater {osg::Vec2i(), Water {1, 0.0f}});
         const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, water, mHeightfields, mFlatHeightfields};
         auto anotherPreparedNavMeshData = makePeparedNavMeshData(3);
 
@@ -280,12 +280,12 @@ namespace
         NavMeshTilesCache cache(maxSize);
         const auto copy = clone(*mPreparedNavMeshData);
 
-        const std::vector<Cell> leastRecentlySetWater {1, Cell {1, osg::Vec3f()}};
+        const std::vector<CellWater> leastRecentlySetWater(1, CellWater {osg::Vec2i(), Water {1, 0.0f}});
         const RecastMesh leastRecentlySetRecastMesh {mGeneration, mRevision, mMesh, leastRecentlySetWater,
                     mHeightfields, mFlatHeightfields};
         auto leastRecentlySetData = makePeparedNavMeshData(3);
 
-        const std::vector<Cell> mostRecentlySetWater {1, Cell {2, osg::Vec3f()}};
+        const std::vector<CellWater> mostRecentlySetWater(1, CellWater {osg::Vec2i(), Water {2, 0.0f}});
         const RecastMesh mostRecentlySetRecastMesh {mGeneration, mRevision, mMesh, mostRecentlySetWater,
                     mHeightfields, mFlatHeightfields};
         auto mostRecentlySetData = makePeparedNavMeshData(3);
@@ -308,13 +308,13 @@ namespace
         const std::size_t maxSize = 2 * (mRecastMeshWithWaterSize + mPreparedNavMeshDataSize);
         NavMeshTilesCache cache(maxSize);
 
-        const std::vector<Cell> leastRecentlyUsedWater {1, Cell {1, osg::Vec3f()}};
+        const std::vector<CellWater> leastRecentlyUsedWater(1, CellWater {osg::Vec2i(), Water {1, 0.0f}});
         const RecastMesh leastRecentlyUsedRecastMesh {mGeneration, mRevision, mMesh, leastRecentlyUsedWater,
                     mHeightfields, mFlatHeightfields};
         auto leastRecentlyUsedData = makePeparedNavMeshData(3);
         const auto leastRecentlyUsedCopy = clone(*leastRecentlyUsedData);
 
-        const std::vector<Cell> mostRecentlyUsedWater {1, Cell {2, osg::Vec3f()}};
+        const std::vector<CellWater> mostRecentlyUsedWater(1, CellWater {osg::Vec2i(), Water {2, 0.0f}});
         const RecastMesh mostRecentlyUsedRecastMesh {mGeneration, mRevision, mMesh, mostRecentlyUsedWater,
                     mHeightfields, mFlatHeightfields};
         auto mostRecentlyUsedData = makePeparedNavMeshData(3);
@@ -349,7 +349,7 @@ namespace
         const std::size_t maxSize = 2 * (mRecastMeshWithWaterSize + mPreparedNavMeshDataSize);
         NavMeshTilesCache cache(maxSize);
 
-        const std::vector<Cell> water {1, Cell {1, osg::Vec3f()}};
+        const std::vector<CellWater> water(1, CellWater {osg::Vec2i(), Water {1, 0.0f}});
         const RecastMesh tooLargeRecastMesh {mGeneration, mRevision, mMesh, water,
                     mHeightfields, mFlatHeightfields};
         auto tooLargeData = makePeparedNavMeshData(10);
@@ -364,12 +364,12 @@ namespace
         const std::size_t maxSize = 2 * (mRecastMeshWithWaterSize + mPreparedNavMeshDataSize);
         NavMeshTilesCache cache(maxSize);
 
-        const std::vector<Cell> anotherWater {1, Cell {1, osg::Vec3f()}};
+        const std::vector<CellWater> anotherWater(1, CellWater {osg::Vec2i(), Water {1, 0.0f}});
         const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, anotherWater,
                     mHeightfields, mFlatHeightfields};
         auto anotherData = makePeparedNavMeshData(3);
 
-        const std::vector<Cell> tooLargeWater {1, Cell {2, osg::Vec3f()}};
+        const std::vector<CellWater> tooLargeWater(1, CellWater {osg::Vec2i(), Water {2, 0.0f}});
         const RecastMesh tooLargeRecastMesh {mGeneration, mRevision, mMesh, tooLargeWater,
                     mHeightfields, mFlatHeightfields};
         auto tooLargeData = makePeparedNavMeshData(10);
@@ -390,7 +390,7 @@ namespace
         const std::size_t maxSize = mRecastMeshWithWaterSize + mPreparedNavMeshDataSize;
         NavMeshTilesCache cache(maxSize);
 
-        const std::vector<Cell> water {1, Cell {1, osg::Vec3f()}};
+        const std::vector<CellWater> water(1, CellWater {osg::Vec2i(), Water {1, 0.0f}});
         const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, water, mHeightfields, mFlatHeightfields};
         auto anotherData = makePeparedNavMeshData(3);
 
@@ -409,7 +409,7 @@ namespace
         const std::size_t maxSize = mRecastMeshWithWaterSize + mPreparedNavMeshDataSize;
         NavMeshTilesCache cache(maxSize);
 
-        const std::vector<Cell> water {1, Cell {1, osg::Vec3f()}};
+        const std::vector<CellWater> water(1, CellWater {osg::Vec2i(), Water {1, 0.0f}});
         const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, water, mHeightfields, mFlatHeightfields};
         auto anotherData = makePeparedNavMeshData(3);
 
diff --git a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
index 73d86bd6ee..67a1206e46 100644
--- a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
+++ b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
@@ -28,6 +28,18 @@ namespace DetourNavigator
         return lhs.mSize == rhs.mSize && lhs.mShift == rhs.mShift;
     }
 
+    static inline bool operator ==(const Water& lhs, const Water& rhs)
+    {
+        const auto tie = [] (const Water& v) { return std::tie(v.mCellSize, v.mLevel); };
+        return tie(lhs) == tie(rhs);
+    }
+
+    static inline bool operator ==(const CellWater& lhs, const CellWater& rhs)
+    {
+        const auto tie = [] (const CellWater& v) { return std::tie(v.mCellPosition, v.mWater); };
+        return tie(lhs) == tie(rhs);
+    }
+
     static inline bool operator==(const Heightfield& lhs, const Heightfield& rhs)
     {
         return makeTuple(lhs) == makeTuple(rhs);
@@ -38,6 +50,16 @@ namespace DetourNavigator
         return std::tie(lhs.mBounds, lhs.mHeight) == std::tie(rhs.mBounds, rhs.mHeight);
     }
 
+    static inline std::ostream& operator<<(std::ostream& s, const Water& v)
+    {
+        return s << "Water {" << v.mCellSize << ", " << v.mLevel << "}";
+    }
+
+    static inline std::ostream& operator<<(std::ostream& s, const CellWater& v)
+    {
+        return s << "CellWater {" << v.mCellPosition << ", " << v.mWater << "}";
+    }
+
     static inline std::ostream& operator<<(std::ostream& s, const FlatHeightfield& v)
     {
         return s << "FlatHeightfield {" << v.mBounds << ", " << v.mHeight << "}";
@@ -435,10 +457,10 @@ namespace
     TEST_F(DetourNavigatorRecastMeshBuilderTest, add_water_then_get_water_should_return_it)
     {
         RecastMeshBuilder builder(mBounds);
-        builder.addWater(1000, osg::Vec3f(100, 200, 300));
+        builder.addWater(osg::Vec2i(1, 2), Water {1000, 300.0f});
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
-        EXPECT_EQ(recastMesh->getWater(), std::vector<Cell>({
-            Cell {1000, osg::Vec3f(100, 200, 300)}
+        EXPECT_EQ(recastMesh->getWater(), std::vector<CellWater>({
+            CellWater {osg::Vec2i(1, 2), Water {1000, 300.0f}}
         }));
     }
 
diff --git a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
index 6209ec9c2a..3667e946e0 100644
--- a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -264,7 +264,7 @@ namespace
         TileCachedRecastMeshManager manager(mSettings);
         const osg::Vec2i cellPosition(0, 0);
         const int cellSize = 8192;
-        EXPECT_TRUE(manager.addWater(cellPosition, cellSize, osg::Vec3f()));
+        EXPECT_TRUE(manager.addWater(cellPosition, cellSize, 0.0f));
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, add_water_for_not_max_int_should_add_new_tiles)
@@ -272,9 +272,9 @@ namespace
         TileCachedRecastMeshManager manager(mSettings);
         const osg::Vec2i cellPosition(0, 0);
         const int cellSize = 8192;
-        ASSERT_TRUE(manager.addWater(cellPosition, cellSize, osg::Vec3f()));
-        for (int x = -6; x < 6; ++x)
-            for (int y = -6; y < 6; ++y)
+        ASSERT_TRUE(manager.addWater(cellPosition, cellSize, 0.0f));
+        for (int x = -1; x < 12; ++x)
+            for (int y = -1; y < 12; ++y)
                 ASSERT_NE(manager.getMesh(TilePosition(x, y)), nullptr);
     }
 
@@ -286,7 +286,7 @@ namespace
         ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground));
         const osg::Vec2i cellPosition(0, 0);
         const int cellSize = std::numeric_limits<int>::max();
-        ASSERT_TRUE(manager.addWater(cellPosition, cellSize, osg::Vec3f()));
+        ASSERT_TRUE(manager.addWater(cellPosition, cellSize, 0.0f));
         for (int x = -6; x < 6; ++x)
             for (int y = -6; y < 6; ++y)
                 ASSERT_EQ(manager.getMesh(TilePosition(x, y)) != nullptr, -1 <= x && x <= 0 && -1 <= y && y <= 0);
@@ -303,10 +303,10 @@ namespace
         TileCachedRecastMeshManager manager(mSettings);
         const osg::Vec2i cellPosition(0, 0);
         const int cellSize = 8192;
-        ASSERT_TRUE(manager.addWater(cellPosition, cellSize, osg::Vec3f()));
+        ASSERT_TRUE(manager.addWater(cellPosition, cellSize, 0.0f));
         const auto result = manager.removeWater(cellPosition);
         ASSERT_TRUE(result.has_value());
-        EXPECT_EQ(result->mSize, cellSize);
+        EXPECT_EQ(result->mCellSize, cellSize);
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, remove_water_for_existing_cell_should_remove_empty_tiles)
@@ -314,7 +314,7 @@ namespace
         TileCachedRecastMeshManager manager(mSettings);
         const osg::Vec2i cellPosition(0, 0);
         const int cellSize = 8192;
-        ASSERT_TRUE(manager.addWater(cellPosition, cellSize, osg::Vec3f()));
+        ASSERT_TRUE(manager.addWater(cellPosition, cellSize, 0.0f));
         ASSERT_TRUE(manager.removeWater(cellPosition));
         for (int x = -6; x < 6; ++x)
             for (int y = -6; y < 6; ++y)
@@ -329,7 +329,7 @@ namespace
         ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground));
         const osg::Vec2i cellPosition(0, 0);
         const int cellSize = 8192;
-        ASSERT_TRUE(manager.addWater(cellPosition, cellSize, osg::Vec3f()));
+        ASSERT_TRUE(manager.addWater(cellPosition, cellSize, 0.0f));
         ASSERT_TRUE(manager.removeWater(cellPosition));
         for (int x = -6; x < 6; ++x)
             for (int y = -6; y < 6; ++y)
@@ -344,10 +344,10 @@ namespace
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(nullptr, boxShape);
         ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground));
-        ASSERT_TRUE(manager.addWater(cellPosition, cellSize, osg::Vec3f()));
+        ASSERT_TRUE(manager.addWater(cellPosition, cellSize, 0.0f));
         ASSERT_TRUE(manager.removeObject(ObjectId(&boxShape)));
-        for (int x = -6; x < 6; ++x)
-            for (int y = -6; y < 6; ++y)
+        for (int x = -1; x < 12; ++x)
+            for (int y = -1; y < 12; ++y)
                 ASSERT_NE(manager.getMesh(TilePosition(x, y)), nullptr);
     }
 }
diff --git a/components/detournavigator/cachedrecastmeshmanager.cpp b/components/detournavigator/cachedrecastmeshmanager.cpp
index 2e1ba45959..991f27cce1 100644
--- a/components/detournavigator/cachedrecastmeshmanager.cpp
+++ b/components/detournavigator/cachedrecastmeshmanager.cpp
@@ -32,16 +32,15 @@ namespace DetourNavigator
         return object;
     }
 
-    bool CachedRecastMeshManager::addWater(const osg::Vec2i& cellPosition, const int cellSize,
-        const osg::Vec3f& shift)
+    bool CachedRecastMeshManager::addWater(const osg::Vec2i& cellPosition, int cellSize, float level)
     {
-        if (!mImpl.addWater(cellPosition, cellSize, shift))
+        if (!mImpl.addWater(cellPosition, cellSize, level))
             return false;
         mOutdatedCache = true;
         return true;
     }
 
-    std::optional<Cell> CachedRecastMeshManager::removeWater(const osg::Vec2i& cellPosition)
+    std::optional<Water> CachedRecastMeshManager::removeWater(const osg::Vec2i& cellPosition)
     {
         const auto water = mImpl.removeWater(cellPosition);
         if (water)
diff --git a/components/detournavigator/cachedrecastmeshmanager.hpp b/components/detournavigator/cachedrecastmeshmanager.hpp
index 740e0b73f5..4d34a1b040 100644
--- a/components/detournavigator/cachedrecastmeshmanager.hpp
+++ b/components/detournavigator/cachedrecastmeshmanager.hpp
@@ -23,9 +23,9 @@ namespace DetourNavigator
 
         std::optional<RemovedRecastMeshObject> removeObject(const ObjectId id);
 
-        bool addWater(const osg::Vec2i& cellPosition, const int cellSize, const osg::Vec3f& shift);
+        bool addWater(const osg::Vec2i& cellPosition, int cellSize, float level);
 
-        std::optional<Cell> removeWater(const osg::Vec2i& cellPosition);
+        std::optional<Water> removeWater(const osg::Vec2i& cellPosition);
 
         bool addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const osg::Vec3f& shift,
             const HeightfieldShape& shape);
diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index cac4be0fdd..f91a81e6d7 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -36,29 +36,28 @@ namespace
         float mHeight;
     };
 
-    Rectangle getSwimRectangle(const Cell& water, const Settings& settings,
-        const osg::Vec3f& agentHalfExtents)
+    Rectangle getSwimRectangle(const CellWater& water, const Settings& settings, const osg::Vec3f& agentHalfExtents)
     {
-        if (water.mSize == std::numeric_limits<int>::max())
+        if (water.mWater.mCellSize == std::numeric_limits<int>::max())
         {
             return Rectangle {
                 TileBounds {
                     osg::Vec2f(-std::numeric_limits<float>::max(), -std::numeric_limits<float>::max()),
                     osg::Vec2f(std::numeric_limits<float>::max(), std::numeric_limits<float>::max())
                 },
-                toNavMeshCoordinates(settings, getSwimLevel(settings, water.mShift.z(), agentHalfExtents.z()))
+                toNavMeshCoordinates(settings, getSwimLevel(settings, water.mWater.mLevel, agentHalfExtents.z()))
             };
         }
         else
         {
-            const osg::Vec2f shift(water.mShift.x(), water.mShift.y());
-            const float halfCellSize = water.mSize / 2.0f;
+            const osg::Vec2f shift = getWaterShift2d(water.mCellPosition, water.mWater.mCellSize);
+            const float halfCellSize = water.mWater.mCellSize / 2.0f;
             return Rectangle {
                 TileBounds{
                     toNavMeshCoordinates(settings, shift + osg::Vec2f(-halfCellSize, -halfCellSize)),
                     toNavMeshCoordinates(settings, shift + osg::Vec2f(halfCellSize, halfCellSize))
                 },
-                toNavMeshCoordinates(settings, getSwimLevel(settings, water.mShift.z(), agentHalfExtents.z()))
+                toNavMeshCoordinates(settings, getSwimLevel(settings, water.mWater.mLevel, agentHalfExtents.z()))
             };
         }
     }
@@ -241,12 +240,12 @@ namespace
         );
     }
 
-    bool rasterizeTriangles(rcContext& context, const osg::Vec3f& agentHalfExtents, const std::vector<Cell>& cells,
+    bool rasterizeTriangles(rcContext& context, const osg::Vec3f& agentHalfExtents, const std::vector<CellWater>& water,
         const Settings& settings, const rcConfig& config, rcHeightfield& solid)
     {
-        for (const Cell& cell : cells)
+        for (const CellWater& cellWater : water)
         {
-            const Rectangle rectangle = getSwimRectangle(cell, settings, agentHalfExtents);
+            const Rectangle rectangle = getSwimRectangle(cellWater, settings, agentHalfExtents);
             if (!rasterizeTriangles(context, rectangle, config, AreaType_water, solid))
                 return false;
         }
@@ -404,9 +403,9 @@ namespace
             maxZ = std::max(maxZ, vertices[i + 2]);
         }
 
-        for (const Cell& water : recastMesh.getWater())
+        for (const CellWater& water : recastMesh.getWater())
         {
-            const float swimLevel = getSwimLevel(settings, water.mShift.z(), agentHalfExtents.z());
+            const float swimLevel = getSwimLevel(settings, water.mWater.mLevel, agentHalfExtents.z());
             minZ = std::min(minZ, swimLevel);
             maxZ = std::max(maxZ, swimLevel);
         }
diff --git a/components/detournavigator/navigator.hpp b/components/detournavigator/navigator.hpp
index 5edc12ed84..9243aaf382 100644
--- a/components/detournavigator/navigator.hpp
+++ b/components/detournavigator/navigator.hpp
@@ -122,7 +122,7 @@ namespace DetourNavigator
          * at least single object is added to the scene, false if there is already water for given cell or there is no
          * any other objects.
          */
-        virtual bool addWater(const osg::Vec2i& cellPosition, int cellSize, const osg::Vec3f& shift) = 0;
+        virtual bool addWater(const osg::Vec2i& cellPosition, int cellSize, float level) = 0;
 
         /**
          * @brief removeWater to make it no more available at the scene.
diff --git a/components/detournavigator/navigatorimpl.cpp b/components/detournavigator/navigatorimpl.cpp
index 44b42b22c2..333d018b28 100644
--- a/components/detournavigator/navigatorimpl.cpp
+++ b/components/detournavigator/navigatorimpl.cpp
@@ -97,9 +97,9 @@ namespace DetourNavigator
         return result;
     }
 
-    bool NavigatorImpl::addWater(const osg::Vec2i& cellPosition, int cellSize, const osg::Vec3f& shift)
+    bool NavigatorImpl::addWater(const osg::Vec2i& cellPosition, int cellSize, float level)
     {
-        return mNavMeshManager.addWater(cellPosition, cellSize, shift);
+        return mNavMeshManager.addWater(cellPosition, cellSize, level);
     }
 
     bool NavigatorImpl::removeWater(const osg::Vec2i& cellPosition)
diff --git a/components/detournavigator/navigatorimpl.hpp b/components/detournavigator/navigatorimpl.hpp
index 8ed16b9a5b..8e3dd52982 100644
--- a/components/detournavigator/navigatorimpl.hpp
+++ b/components/detournavigator/navigatorimpl.hpp
@@ -31,7 +31,7 @@ namespace DetourNavigator
 
         bool removeObject(const ObjectId id) override;
 
-        bool addWater(const osg::Vec2i& cellPosition, int cellSize, const osg::Vec3f& shift) override;
+        bool addWater(const osg::Vec2i& cellPosition, int cellSize, float level) override;
 
         bool removeWater(const osg::Vec2i& cellPosition) override;
 
diff --git a/components/detournavigator/navigatorstub.hpp b/components/detournavigator/navigatorstub.hpp
index 758519769b..c66207bf18 100644
--- a/components/detournavigator/navigatorstub.hpp
+++ b/components/detournavigator/navigatorstub.hpp
@@ -44,7 +44,7 @@ namespace DetourNavigator
             return false;
         }
 
-        bool addWater(const osg::Vec2i& /*cellPosition*/, int /*cellSize*/, const osg::Vec3f& /*shift*/) override
+        bool addWater(const osg::Vec2i& /*cellPosition*/, int /*cellSize*/, float /*level*/) override
         {
             return false;
         }
diff --git a/components/detournavigator/navmeshmanager.cpp b/components/detournavigator/navmeshmanager.cpp
index 362c6938c0..809d92d83c 100644
--- a/components/detournavigator/navmeshmanager.cpp
+++ b/components/detournavigator/navmeshmanager.cpp
@@ -73,10 +73,11 @@ namespace DetourNavigator
         return true;
     }
 
-    bool NavMeshManager::addWater(const osg::Vec2i& cellPosition, const int cellSize, const osg::Vec3f& shift)
+    bool NavMeshManager::addWater(const osg::Vec2i& cellPosition, int cellSize, float level)
     {
-        if (!mRecastMeshManager.addWater(cellPosition, cellSize, shift))
+        if (!mRecastMeshManager.addWater(cellPosition, cellSize, level))
             return false;
+        const osg::Vec3f shift = getWaterShift3d(cellPosition, cellSize, level);
         addChangedTiles(cellSize, shift, ChangeType::add);
         return true;
     }
@@ -86,7 +87,8 @@ namespace DetourNavigator
         const auto water = mRecastMeshManager.removeWater(cellPosition);
         if (!water)
             return false;
-        addChangedTiles(water->mSize, water->mShift, ChangeType::remove);
+        const osg::Vec3f shift = getWaterShift3d(cellPosition, water->mCellSize, water->mLevel);
+        addChangedTiles(water->mCellSize, shift, ChangeType::remove);
         return true;
     }
 
diff --git a/components/detournavigator/navmeshmanager.hpp b/components/detournavigator/navmeshmanager.hpp
index b1496dc817..4a8731bb05 100644
--- a/components/detournavigator/navmeshmanager.hpp
+++ b/components/detournavigator/navmeshmanager.hpp
@@ -34,7 +34,7 @@ namespace DetourNavigator
 
         void addAgent(const osg::Vec3f& agentHalfExtents);
 
-        bool addWater(const osg::Vec2i& cellPosition, const int cellSize, const osg::Vec3f& shift);
+        bool addWater(const osg::Vec2i& cellPosition, int cellSize, float level);
 
         bool removeWater(const osg::Vec2i& cellPosition);
 
diff --git a/components/detournavigator/navmeshtilescache.hpp b/components/detournavigator/navmeshtilescache.hpp
index 06d6c69e9b..fdafa0c6d6 100644
--- a/components/detournavigator/navmeshtilescache.hpp
+++ b/components/detournavigator/navmeshtilescache.hpp
@@ -23,7 +23,7 @@ namespace DetourNavigator
     struct RecastMeshData
     {
         Mesh mMesh;
-        std::vector<Cell> mWater;
+        std::vector<CellWater> mWater;
         std::vector<Heightfield> mHeightfields;
         std::vector<FlatHeightfield> mFlatHeightfields;
     };
diff --git a/components/detournavigator/recastmesh.cpp b/components/detournavigator/recastmesh.cpp
index 258a700b0e..93a0e171a1 100644
--- a/components/detournavigator/recastmesh.cpp
+++ b/components/detournavigator/recastmesh.cpp
@@ -18,7 +18,7 @@ namespace DetourNavigator
         mAreaTypes = std::move(areaTypes);
     }
 
-    RecastMesh::RecastMesh(std::size_t generation, std::size_t revision, Mesh mesh, std::vector<Cell> water,
+    RecastMesh::RecastMesh(std::size_t generation, std::size_t revision, Mesh mesh, std::vector<CellWater> water,
         std::vector<Heightfield> heightfields, std::vector<FlatHeightfield> flatHeightfields)
         : mGeneration(generation)
         , mRevision(revision)
diff --git a/components/detournavigator/recastmesh.hpp b/components/detournavigator/recastmesh.hpp
index 928b282d19..8a06131c93 100644
--- a/components/detournavigator/recastmesh.hpp
+++ b/components/detournavigator/recastmesh.hpp
@@ -8,6 +8,7 @@
 #include <components/bullethelpers/operators.hpp>
 
 #include <osg/Vec3f>
+#include <osg/Vec2i>
 
 #include <memory>
 #include <string>
@@ -53,6 +54,40 @@ namespace DetourNavigator
         osg::Vec3f mShift;
     };
 
+    struct Water
+    {
+        int mCellSize;
+        float mLevel;
+    };
+
+    inline bool operator<(const Water& lhs, const Water& rhs) noexcept
+    {
+        const auto tie = [] (const Water& v) { return std::tie(v.mCellSize, v.mLevel); };
+        return tie(lhs) < tie(rhs);
+    }
+
+    struct CellWater
+    {
+        osg::Vec2i mCellPosition;
+        Water mWater;
+    };
+
+    inline bool operator<(const CellWater& lhs, const CellWater& rhs) noexcept
+    {
+        const auto tie = [] (const CellWater& v) { return std::tie(v.mCellPosition, v.mWater); };
+        return tie(lhs) < tie(rhs);
+    }
+
+    inline osg::Vec2f getWaterShift2d(const osg::Vec2i& cellPosition, int cellSize)
+    {
+        return osg::Vec2f((cellPosition.x() + 0.5f) * cellSize, (cellPosition.y() + 0.5f) * cellSize);
+    }
+
+    inline osg::Vec3f getWaterShift3d(const osg::Vec2i& cellPosition, int cellSize, float level)
+    {
+        return osg::Vec3f(getWaterShift2d(cellPosition, cellSize), level);
+    }
+
     struct Heightfield
     {
         TileBounds mBounds;
@@ -88,7 +123,7 @@ namespace DetourNavigator
     class RecastMesh
     {
     public:
-        RecastMesh(std::size_t generation, std::size_t revision, Mesh mesh, std::vector<Cell> water,
+        RecastMesh(std::size_t generation, std::size_t revision, Mesh mesh, std::vector<CellWater> water,
             std::vector<Heightfield> heightfields, std::vector<FlatHeightfield> flatHeightfields);
 
         std::size_t getGeneration() const
@@ -103,7 +138,7 @@ namespace DetourNavigator
 
         const Mesh& getMesh() const noexcept { return mMesh; }
 
-        const std::vector<Cell>& getWater() const
+        const std::vector<CellWater>& getWater() const
         {
             return mWater;
         }
@@ -122,13 +157,13 @@ namespace DetourNavigator
         std::size_t mGeneration;
         std::size_t mRevision;
         Mesh mMesh;
-        std::vector<Cell> mWater;
+        std::vector<CellWater> mWater;
         std::vector<Heightfield> mHeightfields;
         std::vector<FlatHeightfield> mFlatHeightfields;
 
         friend inline std::size_t getSize(const RecastMesh& value) noexcept
         {
-            return getSize(value.mMesh) + value.mWater.size() * sizeof(Cell)
+            return getSize(value.mMesh) + value.mWater.size() * sizeof(CellWater)
                 + value.mHeightfields.size() * sizeof(Heightfield)
                 + std::accumulate(value.mHeightfields.begin(), value.mHeightfields.end(), std::size_t {0},
                                   [] (std::size_t r, const Heightfield& v) { return r + v.mHeights.size() * sizeof(float); })
diff --git a/components/detournavigator/recastmeshbuilder.cpp b/components/detournavigator/recastmeshbuilder.cpp
index 8a0d30616d..dfa1893310 100644
--- a/components/detournavigator/recastmeshbuilder.cpp
+++ b/components/detournavigator/recastmeshbuilder.cpp
@@ -200,9 +200,9 @@ namespace DetourNavigator
         }
     }
 
-    void RecastMeshBuilder::addWater(const int cellSize, const osg::Vec3f& shift)
+    void RecastMeshBuilder::addWater(const osg::Vec2i& cellPosition, const Water& water)
     {
-        mWater.push_back(Cell {cellSize, shift});
+        mWater.push_back(CellWater {cellPosition, water});
     }
 
     void RecastMeshBuilder::addHeightfield(int cellSize, const osg::Vec3f& shift, float height)
diff --git a/components/detournavigator/recastmeshbuilder.hpp b/components/detournavigator/recastmeshbuilder.hpp
index 84e9716569..2d68a7e89f 100644
--- a/components/detournavigator/recastmeshbuilder.hpp
+++ b/components/detournavigator/recastmeshbuilder.hpp
@@ -48,7 +48,7 @@ namespace DetourNavigator
 
         void addObject(const btBoxShape& shape, const btTransform& transform, const AreaType areaType);
 
-        void addWater(const int mCellSize, const osg::Vec3f& shift);
+        void addWater(const osg::Vec2i& cellPosition, const Water& water);
 
         void addHeightfield(int cellSize, const osg::Vec3f& shift, float height);
 
@@ -60,7 +60,7 @@ namespace DetourNavigator
     private:
         const TileBounds mBounds;
         std::vector<RecastMeshTriangle> mTriangles;
-        std::vector<Cell> mWater;
+        std::vector<CellWater> mWater;
         std::vector<Heightfield> mHeightfields;
         std::vector<FlatHeightfield> mFlatHeightfields;
 
diff --git a/components/detournavigator/recastmeshmanager.cpp b/components/detournavigator/recastmeshmanager.cpp
index 6dcc2b2a42..48a64d70aa 100644
--- a/components/detournavigator/recastmeshmanager.cpp
+++ b/components/detournavigator/recastmeshmanager.cpp
@@ -73,23 +73,23 @@ namespace DetourNavigator
         return result;
     }
 
-    bool RecastMeshManager::addWater(const osg::Vec2i& cellPosition, const int cellSize, const osg::Vec3f& shift)
+    bool RecastMeshManager::addWater(const osg::Vec2i& cellPosition, int cellSize, float level)
     {
         const std::lock_guard lock(mMutex);
-        if (!mWater.emplace(cellPosition, Cell {cellSize, shift}).second)
+        if (!mWater.emplace(cellPosition, Water {cellSize, level}).second)
             return false;
         ++mRevision;
         return true;
     }
 
-    std::optional<Cell> RecastMeshManager::removeWater(const osg::Vec2i& cellPosition)
+    std::optional<Water> RecastMeshManager::removeWater(const osg::Vec2i& cellPosition)
     {
         const std::lock_guard lock(mMutex);
         const auto water = mWater.find(cellPosition);
         if (water == mWater.end())
             return std::nullopt;
         ++mRevision;
-        const Cell result = water->second;
+        Water result = water->second;
         mWater.erase(water);
         return result;
     }
@@ -130,7 +130,7 @@ namespace DetourNavigator
         {
             const std::lock_guard lock(mMutex);
             for (const auto& [k, v] : mWater)
-                builder.addWater(v.mSize, v.mShift);
+                builder.addWater(k, v);
             for (const auto& [cellPosition, v] : mHeightfields)
                 std::visit(AddHeightfield {v.mCell, builder}, v.mShape);
             objects.reserve(mObjects.size());
diff --git a/components/detournavigator/recastmeshmanager.hpp b/components/detournavigator/recastmeshmanager.hpp
index d93745c71e..576314191f 100644
--- a/components/detournavigator/recastmeshmanager.hpp
+++ b/components/detournavigator/recastmeshmanager.hpp
@@ -41,9 +41,9 @@ namespace DetourNavigator
 
         std::optional<RemovedRecastMeshObject> removeObject(const ObjectId id);
 
-        bool addWater(const osg::Vec2i& cellPosition, const int cellSize, const osg::Vec3f& shift);
+        bool addWater(const osg::Vec2i& cellPosition, int cellSize, float level);
 
-        std::optional<Cell> removeWater(const osg::Vec2i& cellPosition);
+        std::optional<Water> removeWater(const osg::Vec2i& cellPosition);
 
         bool addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const osg::Vec3f& shift,
             const HeightfieldShape& shape);
@@ -76,7 +76,7 @@ namespace DetourNavigator
         mutable std::mutex mMutex;
         std::size_t mRevision = 0;
         std::map<ObjectId, OscillatingRecastMeshObject> mObjects;
-        std::map<osg::Vec2i, Cell> mWater;
+        std::map<osg::Vec2i, Water> mWater;
         std::map<osg::Vec2i, Heightfield> mHeightfields;
         std::optional<Report> mLastNavMeshReportedChange;
         std::optional<Report> mLastNavMeshReport;
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.cpp b/components/detournavigator/tilecachedrecastmeshmanager.cpp
index f82ce9de83..347d4b7b30 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -54,8 +54,7 @@ namespace DetourNavigator
         return result;
     }
 
-    bool TileCachedRecastMeshManager::addWater(const osg::Vec2i& cellPosition, const int cellSize,
-        const osg::Vec3f& shift)
+    bool TileCachedRecastMeshManager::addWater(const osg::Vec2i& cellPosition, int cellSize, float level)
     {
         auto& tilesPositions = mWaterTilesPositions[cellPosition];
 
@@ -66,7 +65,7 @@ namespace DetourNavigator
             const auto tiles = mTiles.lock();
             for (auto& tile : *tiles)
             {
-                if (tile.second->addWater(cellPosition, cellSize, shift))
+                if (tile.second->addWater(cellPosition, cellSize, level))
                 {
                     tilesPositions.push_back(tile.first);
                     result = true;
@@ -75,6 +74,7 @@ namespace DetourNavigator
         }
         else
         {
+            const osg::Vec3f shift = getWaterShift3d(cellPosition, cellSize, level);
             getTilesPositions(cellSize, shift, mSettings, [&] (const TilePosition& tilePosition)
                 {
                     const auto tiles = mTiles.lock();
@@ -85,7 +85,7 @@ namespace DetourNavigator
                         tile = tiles->emplace(tilePosition,
                                 std::make_shared<CachedRecastMeshManager>(tileBounds, mTilesGeneration)).first;
                     }
-                    if (tile->second->addWater(cellPosition, cellSize, shift))
+                    if (tile->second->addWater(cellPosition, cellSize, level))
                     {
                         tilesPositions.push_back(tilePosition);
                         result = true;
@@ -99,12 +99,12 @@ namespace DetourNavigator
         return result;
     }
 
-    std::optional<Cell> TileCachedRecastMeshManager::removeWater(const osg::Vec2i& cellPosition)
+    std::optional<Water> TileCachedRecastMeshManager::removeWater(const osg::Vec2i& cellPosition)
     {
         const auto object = mWaterTilesPositions.find(cellPosition);
         if (object == mWaterTilesPositions.end())
             return std::nullopt;
-        std::optional<Cell> result;
+        std::optional<Water> result;
         for (const auto& tilePosition : object->second)
         {
             const auto tiles = mTiles.lock();
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.hpp b/components/detournavigator/tilecachedrecastmeshmanager.hpp
index 6b930c411f..606d08afdf 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.hpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.hpp
@@ -76,9 +76,9 @@ namespace DetourNavigator
 
         std::optional<RemovedRecastMeshObject> removeObject(const ObjectId id);
 
-        bool addWater(const osg::Vec2i& cellPosition, const int cellSize, const osg::Vec3f& shift);
+        bool addWater(const osg::Vec2i& cellPosition, int cellSize, float level);
 
-        std::optional<Cell> removeWater(const osg::Vec2i& cellPosition);
+        std::optional<Water> removeWater(const osg::Vec2i& cellPosition);
 
         bool addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const osg::Vec3f& shift,
             const HeightfieldShape& shape);

From 7dcb219ecfa1adadec6a8d0d07fca491f18453c2 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 4 Nov 2021 03:19:41 +0100
Subject: [PATCH 1813/2859] Add raw heightfield data to navigator

---
 .../detournavigator/navmeshtilescache.cpp     |  31 ++---
 apps/openmw/mwworld/scene.cpp                 |   2 +-
 .../detournavigator/navigator.cpp             | 103 +++++++----------
 .../detournavigator/recastmeshbuilder.cpp     | 106 +++++++++++++-----
 .../cachedrecastmeshmanager.cpp               |  12 +-
 .../cachedrecastmeshmanager.hpp               |   5 +-
 .../detournavigator/gettilespositions.hpp     |   4 +-
 .../detournavigator/heightfieldshape.hpp      |  19 ++++
 components/detournavigator/makenavmesh.cpp    |  20 ++--
 components/detournavigator/navigator.hpp      |   3 +-
 components/detournavigator/navigatorimpl.cpp  |   5 +-
 components/detournavigator/navigatorimpl.hpp  |   3 +-
 components/detournavigator/navigatorstub.hpp  |   3 +-
 components/detournavigator/navmeshmanager.cpp |  16 +--
 components/detournavigator/navmeshmanager.hpp |   5 +-
 components/detournavigator/recastmesh.hpp     |  28 ++---
 .../detournavigator/recastmeshbuilder.cpp     |  45 +++++---
 .../detournavigator/recastmeshbuilder.hpp     |   4 +-
 .../detournavigator/recastmeshmanager.cpp     |  18 +--
 .../detournavigator/recastmeshmanager.hpp     |  19 ++--
 components/detournavigator/tilebounds.hpp     |   9 ++
 .../tilecachedrecastmeshmanager.cpp           |  11 +-
 .../tilecachedrecastmeshmanager.hpp           |   5 +-
 23 files changed, 266 insertions(+), 210 deletions(-)

diff --git a/apps/benchmarks/detournavigator/navmeshtilescache.cpp b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
index 7acbcc3a4f..9d41b62597 100644
--- a/apps/benchmarks/detournavigator/navmeshtilescache.cpp
+++ b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
@@ -25,18 +25,10 @@ namespace
     };
 
     template <typename Random>
-    TilePosition generateTilePosition(int max, Random& random)
+    osg::Vec2i generateVec2i(int max, Random& random)
     {
         std::uniform_int_distribution<int> distribution(0, max);
-        return TilePosition(distribution(random), distribution(random));
-    }
-
-    template <typename Random>
-    TileBounds generateTileBounds(Random& random)
-    {
-        std::uniform_real_distribution<float> distribution(0.0, 1.0);
-        const osg::Vec2f min(distribution(random), distribution(random));
-        return TileBounds {min, min + osg::Vec2f(1.0, 1.0)};
+        return osg::Vec2i(distribution(random), distribution(random));
     }
 
     template <typename Random>
@@ -89,11 +81,9 @@ namespace
     template <typename OutputIterator, typename Random>
     void generateWater(OutputIterator out, std::size_t count, Random& random)
     {
-        std::uniform_real_distribution<float> floatDistribution(0.0, 1.0);
-        std::uniform_int_distribution<int> intDistribution(-10, 10);
+        std::uniform_real_distribution<float> distribution(0.0, 1.0);
         std::generate_n(out, count, [&] {
-            const osg::Vec2i cellPosition(intDistribution(random), intDistribution(random));
-            return CellWater {cellPosition, Water {8196, floatDistribution(random)}};
+            return CellWater {generateVec2i(1000, random), Water {ESM::Land::REAL_SIZE, distribution(random)}};
         });
     }
 
@@ -118,16 +108,18 @@ namespace
     {
         std::uniform_real_distribution<float> distribution(0.0, 1.0);
         Heightfield result;
-        result.mBounds = generateTileBounds(random);
+        result.mCellPosition = generateVec2i(1000, random);
+        result.mCellSize = ESM::Land::REAL_SIZE;
         result.mMinHeight = distribution(random);
         result.mMaxHeight = result.mMinHeight + 1.0;
-        result.mShift = osg::Vec3f(distribution(random), distribution(random), distribution(random));
-        result.mScale = distribution(random);
         result.mLength = static_cast<std::uint8_t>(ESM::Land::LAND_SIZE);
         std::generate_n(std::back_inserter(result.mHeights), ESM::Land::LAND_NUM_VERTS, [&]
         {
             return distribution(random);
         });
+        result.mOriginalSize = ESM::Land::LAND_SIZE;
+        result.mMinX = 0;
+        result.mMinY = 0;
         return result;
     }
 
@@ -136,7 +128,8 @@ namespace
     {
         std::uniform_real_distribution<float> distribution(0.0, 1.0);
         FlatHeightfield result;
-        result.mBounds = generateTileBounds(random);
+        result.mCellPosition = generateVec2i(1000, random);
+        result.mCellSize = ESM::Land::REAL_SIZE;
         result.mHeight = distribution(random);
         return result;
     }
@@ -145,7 +138,7 @@ namespace
     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 TilePosition tilePosition = generateVec2i(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);
         Mesh mesh = generateMesh(triangles, random);
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index cc2a692e2b..15b3477cb8 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -404,7 +404,7 @@ namespace MWWorld
                         return heights;
                     }
                 } ();
-                mNavigator.addHeightfield(cellPosition, ESM::Land::REAL_SIZE, shift, shape);
+                mNavigator.addHeightfield(cellPosition, ESM::Land::REAL_SIZE, shape);
             }
         }
 
diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index a8b42f0db9..4e2b7758ff 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -47,7 +47,6 @@ namespace
         Loading::Listener mListener;
         const osg::Vec2i mCellPosition {0, 0};
         const int mHeightfieldTileSize = ESM::Land::REAL_SIZE / (ESM::Land::LAND_SIZE - 1);
-        const osg::Vec3f mShift {0, 0, 0};
         const float mEndTolerance = 0;
         const btTransform mTransform {btMatrix3x3::getIdentity(), btVector3(256, 256, 0)};
 
@@ -137,9 +136,9 @@ namespace
         osg::ref_ptr<const Resource::BulletShapeInstance> mInstance;
     };
 
-    osg::Vec3f getHeightfieldShift(const osg::Vec2i& cellPosition, int cellSize, float minHeight, float maxHeight)
+    btVector3 getHeightfieldShift(const osg::Vec2i& cellPosition, int cellSize, float minHeight, float maxHeight)
     {
-        return Misc::Convert::toOsg(BulletHelpers::getHeightfieldShift(cellPosition.x(), cellPosition.x(), cellSize, minHeight, maxHeight));
+        return BulletHelpers::getHeightfieldShift(cellPosition.x(), cellPosition.x(), cellSize, minHeight, maxHeight);
     }
 
     TEST_F(DetourNavigatorNavigatorTest, find_path_for_empty_should_return_empty)
@@ -176,10 +175,9 @@ namespace
         }};
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
-        const osg::Vec3f shift = getHeightfieldShift(mCellPosition, cellSize, surface.mMinHeight, surface.mMaxHeight);
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addHeightfield(mCellPosition, cellSize, shift, surface);
+        mNavigator->addHeightfield(mCellPosition, cellSize, surface);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::requiredTilesPresent);
 
@@ -223,13 +221,12 @@ namespace
         }};
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
-        const osg::Vec3f shift = getHeightfieldShift(mCellPosition, cellSize, surface.mMinHeight, surface.mMaxHeight);
 
         CollisionShapeInstance compound(std::make_unique<btCompoundShape>());
         compound.shape().addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(0, 0, 0)), new btBoxShape(btVector3(20, 20, 100)));
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addHeightfield(mCellPosition, cellSize, shift, surface);
+        mNavigator->addHeightfield(mCellPosition, cellSize, surface);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -308,13 +305,12 @@ namespace
         }};
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
-        const osg::Vec3f shift = getHeightfieldShift(mCellPosition, cellSize, surface.mMinHeight, surface.mMaxHeight);
 
         CollisionShapeInstance compound(std::make_unique<btCompoundShape>());
         compound.shape().addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(0, 0, 0)), new btBoxShape(btVector3(20, 20, 100)));
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addHeightfield(mCellPosition, cellSize, shift, surface);
+        mNavigator->addHeightfield(mCellPosition, cellSize, surface);
         mNavigator->addObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance()), mTransform);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
@@ -453,7 +449,6 @@ namespace
         }};
         const HeightfieldSurface surface1 = makeSquareHeightfieldSurface(heightfieldData1);
         const int cellSize1 = mHeightfieldTileSize * (surface1.mSize - 1);
-        const osg::Vec3f shift1 = getHeightfieldShift(mCellPosition, cellSize1, surface1.mMinHeight, surface1.mMaxHeight);
 
         const std::array<float, 5 * 5> heightfieldData2 {{
             -25, -25, -25, -25, -25,
@@ -464,11 +459,10 @@ namespace
         }};
         const HeightfieldSurface surface2 = makeSquareHeightfieldSurface(heightfieldData2);
         const int cellSize2 = mHeightfieldTileSize * (surface2.mSize - 1);
-        const osg::Vec3f shift2 = getHeightfieldShift(mCellPosition, cellSize2, surface2.mMinHeight, surface2.mMaxHeight);
 
         mNavigator->addAgent(mAgentHalfExtents);
-        EXPECT_TRUE(mNavigator->addHeightfield(mCellPosition, cellSize1, shift1, surface1));
-        EXPECT_FALSE(mNavigator->addHeightfield(mCellPosition, cellSize2, shift2, surface2));
+        EXPECT_TRUE(mNavigator->addHeightfield(mCellPosition, cellSize1, surface1));
+        EXPECT_FALSE(mNavigator->addHeightfield(mCellPosition, cellSize2, surface2));
     }
 
     TEST_F(DetourNavigatorNavigatorTest, path_should_be_around_avoid_shape)
@@ -545,11 +539,10 @@ namespace
         }};
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
-        const osg::Vec3f shift = getHeightfieldShift(mCellPosition, cellSize, surface.mMinHeight, surface.mMaxHeight);
 
         mNavigator->addAgent(mAgentHalfExtents);
         mNavigator->addWater(mCellPosition, cellSize, 300);
-        mNavigator->addHeightfield(mCellPosition, cellSize, shift, surface);
+        mNavigator->addHeightfield(mCellPosition, cellSize, surface);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -594,11 +587,10 @@ namespace
         }};
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
-        const osg::Vec3f shift = getHeightfieldShift(mCellPosition, cellSize, surface.mMinHeight, surface.mMaxHeight);
 
         mNavigator->addAgent(mAgentHalfExtents);
         mNavigator->addWater(mCellPosition, cellSize, -25);
-        mNavigator->addHeightfield(mCellPosition, cellSize, shift, surface);
+        mNavigator->addHeightfield(mCellPosition, cellSize, surface);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -641,10 +633,9 @@ namespace
         }};
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
-        const osg::Vec3f shift = getHeightfieldShift(mCellPosition, cellSize, surface.mMinHeight, surface.mMaxHeight);
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addHeightfield(mCellPosition, cellSize, shift, surface);
+        mNavigator->addHeightfield(mCellPosition, cellSize, surface);
         mNavigator->addWater(mCellPosition, std::numeric_limits<int>::max(), -25);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
@@ -688,11 +679,10 @@ namespace
         }};
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
-        const osg::Vec3f shift = getHeightfieldShift(mCellPosition, cellSize, surface.mMinHeight, surface.mMaxHeight);
 
         mNavigator->addAgent(mAgentHalfExtents);
         mNavigator->addWater(mCellPosition, cellSize, -25);
-        mNavigator->addHeightfield(mCellPosition, cellSize, shift, surface);
+        mNavigator->addHeightfield(mCellPosition, cellSize, surface);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -787,10 +777,9 @@ namespace
         }};
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
-        const osg::Vec3f shift = getHeightfieldShift(mCellPosition, cellSize, surface.mMinHeight, surface.mMaxHeight);
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addHeightfield(mCellPosition, cellSize, shift, surface);
+        mNavigator->addHeightfield(mCellPosition, cellSize, surface);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -798,7 +787,7 @@ namespace
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        mNavigator->addHeightfield(mCellPosition, cellSize, shift, surface);
+        mNavigator->addHeightfield(mCellPosition, cellSize, surface);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -843,10 +832,9 @@ namespace
         }};
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
-        const osg::Vec3f shift = getHeightfieldShift(mCellPosition, cellSize, surface.mMinHeight, surface.mMaxHeight);
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addHeightfield(mCellPosition, cellSize, shift, surface);
+        mNavigator->addHeightfield(mCellPosition, cellSize, surface);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -876,14 +864,14 @@ namespace
         }};
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
-        const osg::Vec3f shift = getHeightfieldShift(mCellPosition, cellSize, surface.mMinHeight, surface.mMaxHeight);
+        const btVector3 shift = getHeightfieldShift(mCellPosition, cellSize, surface.mMinHeight, surface.mMaxHeight);
 
         std::vector<CollisionShapeInstance<btBoxShape>> boxes;
         std::generate_n(std::back_inserter(boxes), 100, [] { return std::make_unique<btBoxShape>(btVector3(20, 20, 100)); });
 
         mNavigator->addAgent(mAgentHalfExtents);
 
-        mNavigator->addHeightfield(mCellPosition, cellSize, shift, surface);
+        mNavigator->addHeightfield(mCellPosition, cellSize, surface);
 
         for (std::size_t i = 0; i < boxes.size(); ++i)
         {
@@ -981,10 +969,9 @@ namespace
         }};
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
-        const osg::Vec3f shift = getHeightfieldShift(mCellPosition, cellSize, surface.mMinHeight, surface.mMaxHeight);
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addHeightfield(mCellPosition, cellSize, shift, surface);
+        mNavigator->addHeightfield(mCellPosition, cellSize, surface);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -1007,14 +994,13 @@ namespace
         }};
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
-        const osg::Vec3f shift = getHeightfieldShift(mCellPosition, cellSize, surface.mMinHeight, surface.mMaxHeight);
 
         CollisionShapeInstance oscillatingBox(std::make_unique<btBoxShape>(btVector3(20, 20, 20)));
         const btVector3 oscillatingBoxShapePosition(288, 288, 400);
         CollisionShapeInstance borderBox(std::make_unique<btBoxShape>(btVector3(50, 50, 50)));
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addHeightfield(mCellPosition, cellSize, shift, surface);
+        mNavigator->addHeightfield(mCellPosition, cellSize, surface);
         mNavigator->addObject(ObjectId(&oscillatingBox.shape()), ObjectShapes(oscillatingBox.instance()),
                               btTransform(btMatrix3x3::getIdentity(), oscillatingBoxShapePosition));
         // add this box to make navmesh bound box independent from oscillatingBoxShape rotations
@@ -1046,10 +1032,9 @@ namespace
     {
         const HeightfieldPlane plane {100};
         const int cellSize = mHeightfieldTileSize * 4;
-        const osg::Vec3f shift = getHeightfieldShift(mCellPosition, cellSize, plane.mHeight, plane.mHeight);
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addHeightfield(mCellPosition, cellSize, shift, plane);
+        mNavigator->addHeightfield(mCellPosition, cellSize, plane);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::requiredTilesPresent);
 
@@ -1057,28 +1042,28 @@ namespace
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
-            Vec3fEq(56.66666412353515625, 460, 203.9999847412109375),
-            Vec3fEq(76.70135498046875, 439.965301513671875, 203.9999847412109375),
-            Vec3fEq(96.73604583740234375, 419.93060302734375, 203.9999847412109375),
-            Vec3fEq(116.770751953125, 399.89593505859375, 203.9999847412109375),
-            Vec3fEq(136.8054351806640625, 379.861236572265625, 203.9999847412109375),
-            Vec3fEq(156.840118408203125, 359.826568603515625, 203.9999847412109375),
-            Vec3fEq(176.8748016357421875, 339.7918701171875, 203.9999847412109375),
-            Vec3fEq(196.90948486328125, 319.757171630859375, 203.9999847412109375),
-            Vec3fEq(216.944183349609375, 299.722503662109375, 203.9999847412109375),
-            Vec3fEq(236.9788665771484375, 279.68780517578125, 203.9999847412109375),
-            Vec3fEq(257.0135498046875, 259.65313720703125, 203.9999847412109375),
-            Vec3fEq(277.048248291015625, 239.618438720703125, 203.9999847412109375),
-            Vec3fEq(297.082916259765625, 219.583740234375, 203.9999847412109375),
-            Vec3fEq(317.11761474609375, 199.549041748046875, 203.9999847412109375),
-            Vec3fEq(337.15228271484375, 179.5143585205078125, 203.9999847412109375),
-            Vec3fEq(357.186981201171875, 159.47967529296875, 203.9999847412109375),
-            Vec3fEq(377.221649169921875, 139.4449920654296875, 203.9999847412109375),
-            Vec3fEq(397.25634765625, 119.41030120849609375, 203.9999847412109375),
-            Vec3fEq(417.291046142578125, 99.3756103515625, 203.9999847412109375),
-            Vec3fEq(437.325714111328125, 79.340911865234375, 203.9999847412109375),
-            Vec3fEq(457.360443115234375, 59.3062286376953125, 203.9999847412109375),
-            Vec3fEq(460, 56.66666412353515625, 203.9999847412109375)
+            Vec3fEq(56.66666412353515625, 460, 101.99999237060546875),
+            Vec3fEq(76.70135498046875, 439.965301513671875, 101.99999237060546875),
+            Vec3fEq(96.73604583740234375, 419.93060302734375, 101.99999237060546875),
+            Vec3fEq(116.770751953125, 399.89593505859375, 101.99999237060546875),
+            Vec3fEq(136.8054351806640625, 379.861236572265625, 101.99999237060546875),
+            Vec3fEq(156.840118408203125, 359.826568603515625, 101.99999237060546875),
+            Vec3fEq(176.8748016357421875, 339.7918701171875, 101.99999237060546875),
+            Vec3fEq(196.90948486328125, 319.757171630859375, 101.99999237060546875),
+            Vec3fEq(216.944183349609375, 299.722503662109375, 101.99999237060546875),
+            Vec3fEq(236.9788665771484375, 279.68780517578125, 101.99999237060546875),
+            Vec3fEq(257.0135498046875, 259.65313720703125, 101.99999237060546875),
+            Vec3fEq(277.048248291015625, 239.618438720703125, 101.99999237060546875),
+            Vec3fEq(297.082916259765625, 219.583740234375, 101.99999237060546875),
+            Vec3fEq(317.11761474609375, 199.549041748046875, 101.99999237060546875),
+            Vec3fEq(337.15228271484375, 179.5143585205078125, 101.99999237060546875),
+            Vec3fEq(357.186981201171875, 159.47967529296875, 101.99999237060546875),
+            Vec3fEq(377.221649169921875, 139.4449920654296875, 101.99999237060546875),
+            Vec3fEq(397.25634765625, 119.41030120849609375, 101.99999237060546875),
+            Vec3fEq(417.291046142578125, 99.3756103515625, 101.99999237060546875),
+            Vec3fEq(437.325714111328125, 79.340911865234375, 101.99999237060546875),
+            Vec3fEq(457.360443115234375, 59.3062286376953125, 101.99999237060546875),
+            Vec3fEq(460, 56.66666412353515625, 101.99999237060546875)
         )) << mPath;
     }
 
@@ -1093,14 +1078,13 @@ namespace
         }};
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
-        const osg::Vec3f shift = getHeightfieldShift(mCellPosition, cellSize, surface.mMinHeight, surface.mMaxHeight);
 
         CollisionShapeInstance compound(std::make_unique<btCompoundShape>());
         compound.shape().addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(204, -204, 0)),
                                        new btBoxShape(btVector3(200, 200, 1000)));
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addHeightfield(mCellPosition, cellSize, shift, surface);
+        mNavigator->addHeightfield(mCellPosition, cellSize, surface);
         mNavigator->addObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance()), mTransform);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
@@ -1133,14 +1117,13 @@ namespace
         }};
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
-        const osg::Vec3f shift = getHeightfieldShift(mCellPosition, cellSize, surface.mMinHeight, surface.mMaxHeight);
 
         CollisionShapeInstance compound(std::make_unique<btCompoundShape>());
         compound.shape().addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(204, -204, 0)),
                                        new btBoxShape(btVector3(100, 100, 1000)));
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addHeightfield(mCellPosition, cellSize, shift, surface);
+        mNavigator->addHeightfield(mCellPosition, cellSize, surface);
         mNavigator->addObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance()), mTransform);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
diff --git a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
index 67a1206e46..ad28bf4053 100644
--- a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
+++ b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
@@ -23,11 +23,6 @@
 
 namespace DetourNavigator
 {
-    static inline bool operator ==(const Cell& lhs, const Cell& rhs)
-    {
-        return lhs.mSize == rhs.mSize && lhs.mShift == rhs.mShift;
-    }
-
     static inline bool operator ==(const Water& lhs, const Water& rhs)
     {
         const auto tie = [] (const Water& v) { return std::tie(v.mCellSize, v.mLevel); };
@@ -47,7 +42,11 @@ namespace DetourNavigator
 
     static inline bool operator==(const FlatHeightfield& lhs, const FlatHeightfield& rhs)
     {
-        return std::tie(lhs.mBounds, lhs.mHeight) == std::tie(rhs.mBounds, rhs.mHeight);
+        const auto tie = [] (const FlatHeightfield& v)
+        {
+            return std::tie(v.mCellPosition, v.mCellSize, v.mHeight);
+        };
+        return tie(lhs) == tie(rhs);
     }
 
     static inline std::ostream& operator<<(std::ostream& s, const Water& v)
@@ -62,21 +61,21 @@ namespace DetourNavigator
 
     static inline std::ostream& operator<<(std::ostream& s, const FlatHeightfield& v)
     {
-        return s << "FlatHeightfield {" << v.mBounds << ", " << v.mHeight << "}";
+        return s << "FlatHeightfield {" << v.mCellPosition << ", " << v.mCellSize << ", " << v.mHeight << "}";
     }
 
     static inline std::ostream& operator<<(std::ostream& s, const Heightfield& v)
     {
-        s << "Heightfield {.mBounds=" << v.mBounds
-          << ", .mLength=" << int(v.mLength)
+        s << "Heightfield {.mCellPosition=" << v.mCellPosition
+          << ", .mCellSize=" << v.mCellSize
+          << ", .mLength=" << static_cast<int>(v.mLength)
           << ", .mMinHeight=" << v.mMinHeight
           << ", .mMaxHeight=" << v.mMaxHeight
-          << ", .mShift=" << v.mShift
-          << ", .mScale=" << v.mScale
           << ", .mHeights={";
         for (float h : v.mHeights)
             s << h << ", ";
-        return s << "}}";
+        s << "}";
+        return s << ", .mOriginalSize=" << v.mOriginalSize << "}";
     }
 }
 
@@ -486,62 +485,111 @@ namespace
 
     TEST_F(DetourNavigatorRecastMeshBuilderTest, add_flat_heightfield_should_add_intersection)
     {
-        mBounds.mMin = osg::Vec2f(0, 0);
+        const osg::Vec2i cellPosition(0, 0);
+        const int cellSize = 1000;
+        const float height = 10;
+        mBounds.mMin = osg::Vec2f(100, 100);
         RecastMeshBuilder builder(mBounds);
-        builder.addHeightfield(1000, osg::Vec3f(1, 2, 3), 10);
+        builder.addHeightfield(cellPosition, cellSize, height);
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getFlatHeightfields(), std::vector<FlatHeightfield>({
-            FlatHeightfield {TileBounds {osg::Vec2f(0, 0), osg::Vec2f(501, 502)}, 13},
+            FlatHeightfield {cellPosition, cellSize, height},
         }));
     }
 
     TEST_F(DetourNavigatorRecastMeshBuilderTest, add_heightfield_inside_tile)
     {
-        constexpr std::array<float, 9> heights {{
+        constexpr std::size_t size = 3;
+        constexpr std::array<float, size * size> heights {{
             0, 1, 2,
             3, 4, 5,
             6, 7, 8,
         }};
+        const osg::Vec2i cellPosition(0, 0);
+        const int cellSize = 1000;
+        const float minHeight = 0;
+        const float maxHeight = 8;
         RecastMeshBuilder builder(mBounds);
-        builder.addHeightfield(1000, osg::Vec3f(1, 2, 3), heights.data(), 3, 0, 8);
+        builder.addHeightfield(cellPosition, cellSize, heights.data(), size, minHeight, maxHeight);
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         Heightfield expected;
-        expected.mBounds = TileBounds {osg::Vec2f(-499, -498), osg::Vec2f(501, 502)};
-        expected.mLength = 3;
-        expected.mMinHeight = 0;
-        expected.mMaxHeight = 8;
-        expected.mShift = osg::Vec3f(-499, -498, 3);
-        expected.mScale = 500;
+        expected.mCellPosition = cellPosition;
+        expected.mCellSize = cellSize;
+        expected.mLength = size;
+        expected.mMinHeight = minHeight;
+        expected.mMaxHeight = maxHeight;
+        expected.mHeights = {
+            0, 1, 2,
+            3, 4, 5,
+            6, 7, 8,
+        };
+        expected.mOriginalSize = 3;
+        expected.mMinX = 0;
+        expected.mMinY = 0;
+        EXPECT_EQ(recastMesh->getHeightfields(), std::vector<Heightfield>({expected}));
+    }
+
+    TEST_F(DetourNavigatorRecastMeshBuilderTest, add_heightfield_to_shifted_cell_inside_tile)
+    {
+        constexpr std::size_t size = 3;
+        constexpr std::array<float, size * size> heights {{
+            0, 1, 2,
+            3, 4, 5,
+            6, 7, 8,
+        }};
+        const osg::Vec2i cellPosition(1, 2);
+        const int cellSize = 1000;
+        const float minHeight = 0;
+        const float maxHeight = 8;
+        RecastMeshBuilder builder(maxCellTileBounds(cellPosition, cellSize));
+        builder.addHeightfield(cellPosition, cellSize, heights.data(), size, minHeight, maxHeight);
+        const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
+        Heightfield expected;
+        expected.mCellPosition = cellPosition;
+        expected.mCellSize = cellSize;
+        expected.mLength = size;
+        expected.mMinHeight = minHeight;
+        expected.mMaxHeight = maxHeight;
         expected.mHeights = {
             0, 1, 2,
             3, 4, 5,
             6, 7, 8,
         };
+        expected.mOriginalSize = 3;
+        expected.mMinX = 0;
+        expected.mMinY = 0;
         EXPECT_EQ(recastMesh->getHeightfields(), std::vector<Heightfield>({expected}));
     }
 
     TEST_F(DetourNavigatorRecastMeshBuilderTest, add_heightfield_should_add_intersection)
     {
-        constexpr std::array<float, 9> heights {{
+        constexpr std::size_t size = 3;
+        constexpr std::array<float, 3 * 3> heights {{
             0, 1, 2,
             3, 4, 5,
             6, 7, 8,
         }};
-        mBounds.mMin = osg::Vec2f(250, 250);
+        const osg::Vec2i cellPosition(0, 0);
+        const int cellSize = 1000;
+        const float minHeight = 0;
+        const float maxHeight = 8;
+        mBounds.mMin = osg::Vec2f(750, 750);
         RecastMeshBuilder builder(mBounds);
-        builder.addHeightfield(1000, osg::Vec3f(-1, -2, 3), heights.data(), 3, 0, 8);
+        builder.addHeightfield(cellPosition, cellSize, heights.data(), size, minHeight, maxHeight);
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         Heightfield expected;
-        expected.mBounds = TileBounds {osg::Vec2f(250, 250), osg::Vec2f(499, 498)};
+        expected.mCellPosition = cellPosition;
+        expected.mCellSize = cellSize;
         expected.mLength = 2;
         expected.mMinHeight = 0;
         expected.mMaxHeight = 8;
-        expected.mShift = osg::Vec3f(-1, -2, 3);
-        expected.mScale = 500;
         expected.mHeights = {
             4, 5,
             7, 8,
         };
+        expected.mOriginalSize = 3;
+        expected.mMinX = 1;
+        expected.mMinY = 1;
         EXPECT_EQ(recastMesh->getHeightfields(), std::vector<Heightfield>({expected}));
     }
 }
diff --git a/components/detournavigator/cachedrecastmeshmanager.cpp b/components/detournavigator/cachedrecastmeshmanager.cpp
index 991f27cce1..a3c7f4b172 100644
--- a/components/detournavigator/cachedrecastmeshmanager.cpp
+++ b/components/detournavigator/cachedrecastmeshmanager.cpp
@@ -49,20 +49,20 @@ namespace DetourNavigator
     }
 
     bool CachedRecastMeshManager::addHeightfield(const osg::Vec2i& cellPosition, int cellSize,
-        const osg::Vec3f& shift, const HeightfieldShape& shape)
+        const HeightfieldShape& shape)
     {
-        if (!mImpl.addHeightfield(cellPosition, cellSize, shift, shape))
+        if (!mImpl.addHeightfield(cellPosition, cellSize, shape))
             return false;
         mOutdatedCache = true;
         return true;
     }
 
-    std::optional<Cell> CachedRecastMeshManager::removeHeightfield(const osg::Vec2i& cellPosition)
+    std::optional<SizedHeightfieldShape> CachedRecastMeshManager::removeHeightfield(const osg::Vec2i& cellPosition)
     {
-        const auto cell = mImpl.removeHeightfield(cellPosition);
-        if (cell)
+        const auto heightfield = mImpl.removeHeightfield(cellPosition);
+        if (heightfield)
             mOutdatedCache = true;
-        return cell;
+        return heightfield;
     }
 
     std::shared_ptr<RecastMesh> CachedRecastMeshManager::getMesh()
diff --git a/components/detournavigator/cachedrecastmeshmanager.hpp b/components/detournavigator/cachedrecastmeshmanager.hpp
index 4d34a1b040..eb18519891 100644
--- a/components/detournavigator/cachedrecastmeshmanager.hpp
+++ b/components/detournavigator/cachedrecastmeshmanager.hpp
@@ -27,10 +27,9 @@ namespace DetourNavigator
 
         std::optional<Water> removeWater(const osg::Vec2i& cellPosition);
 
-        bool addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const osg::Vec3f& shift,
-            const HeightfieldShape& shape);
+        bool addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const HeightfieldShape& shape);
 
-        std::optional<Cell> removeHeightfield(const osg::Vec2i& cellPosition);
+        std::optional<SizedHeightfieldShape> removeHeightfield(const osg::Vec2i& cellPosition);
 
         std::shared_ptr<RecastMesh> getMesh();
 
diff --git a/components/detournavigator/gettilespositions.hpp b/components/detournavigator/gettilespositions.hpp
index e8ba8beba9..abfce06464 100644
--- a/components/detournavigator/gettilespositions.hpp
+++ b/components/detournavigator/gettilespositions.hpp
@@ -50,13 +50,13 @@ namespace DetourNavigator
     }
 
     template <class Callback>
-    void getTilesPositions(const int cellSize, const osg::Vec3f& shift,
+    void getTilesPositions(const int cellSize, const btVector3& shift,
         const Settings& settings, Callback&& callback)
     {
         using Misc::Convert::toOsg;
 
         const auto halfCellSize = cellSize / 2;
-        const btTransform transform(btMatrix3x3::getIdentity(), Misc::Convert::toBullet(shift));
+        const btTransform transform(btMatrix3x3::getIdentity(), shift);
         auto aabbMin = transform(btVector3(-halfCellSize, -halfCellSize, 0));
         auto aabbMax = transform(btVector3(halfCellSize, halfCellSize, 0));
 
diff --git a/components/detournavigator/heightfieldshape.hpp b/components/detournavigator/heightfieldshape.hpp
index 48a273725b..06770e9b3d 100644
--- a/components/detournavigator/heightfieldshape.hpp
+++ b/components/detournavigator/heightfieldshape.hpp
@@ -1,6 +1,10 @@
 #ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_HEIGHFIELDSHAPE_H
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_HEIGHFIELDSHAPE_H
 
+#include <components/bullethelpers/heightfield.hpp>
+
+#include <osg/Vec2i>
+
 #include <cstddef>
 #include <variant>
 
@@ -20,6 +24,21 @@ namespace DetourNavigator
     };
 
     using HeightfieldShape = std::variant<HeightfieldPlane, HeightfieldSurface>;
+
+    inline btVector3 getHeightfieldShift(const HeightfieldPlane& v, const osg::Vec2i& cellPosition, int cellSize)
+    {
+        return BulletHelpers::getHeightfieldShift(cellPosition.x(), cellPosition.y(), cellSize, v.mHeight, v.mHeight);
+    }
+
+    inline btVector3 getHeightfieldShift(const HeightfieldSurface& v, const osg::Vec2i& cellPosition, int cellSize)
+    {
+        return BulletHelpers::getHeightfieldShift(cellPosition.x(), cellPosition.y(), cellSize, v.mMinHeight, v.mMaxHeight);
+    }
+
+    inline btVector3 getHeightfieldShift(const HeightfieldShape& v, const osg::Vec2i& cellPosition, int cellSize)
+    {
+        return std::visit([&] (const auto& w) { return getHeightfieldShift(w, cellPosition, cellSize); }, v);
+    }
 }
 
 #endif
diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index f91a81e6d7..7d478b9c1b 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -252,14 +252,17 @@ namespace
         return true;
     }
 
-    bool rasterizeTriangles(rcContext& context, const std::vector<FlatHeightfield>& heightfields,
+    bool rasterizeTriangles(rcContext& context, const TileBounds& tileBounds, const std::vector<FlatHeightfield>& heightfields,
         const Settings& settings, const rcConfig& config, rcHeightfield& solid)
     {
         for (const FlatHeightfield& heightfield : heightfields)
         {
-            const Rectangle rectangle {heightfield.mBounds, toNavMeshCoordinates(settings, heightfield.mHeight)};
-            if (!rasterizeTriangles(context, rectangle, config, AreaType_ground, solid))
-                return false;
+            if (auto intersection = getIntersection(tileBounds, maxCellTileBounds(heightfield.mCellPosition, heightfield.mCellSize)))
+            {
+                const Rectangle rectangle {*intersection, toNavMeshCoordinates(settings, heightfield.mHeight)};
+                if (!rasterizeTriangles(context, rectangle, config, AreaType_ground, solid))
+                    return false;
+            }
         }
         return true;
     }
@@ -278,13 +281,14 @@ namespace
         return true;
     }
 
-    bool rasterizeTriangles(rcContext& context, const osg::Vec3f& agentHalfExtents, const RecastMesh& recastMesh,
-        const rcConfig& config, const Settings& settings, rcHeightfield& solid)
+    bool rasterizeTriangles(rcContext& context, const TilePosition& tilePosition, const osg::Vec3f& agentHalfExtents,
+        const RecastMesh& recastMesh, const rcConfig& config, const Settings& settings, rcHeightfield& solid)
     {
         return rasterizeTriangles(context, recastMesh.getMesh(), settings, config, solid)
             && rasterizeTriangles(context, agentHalfExtents, recastMesh.getWater(), settings, config, solid)
             && rasterizeTriangles(context, recastMesh.getHeightfields(), settings, config, solid)
-            && rasterizeTriangles(context, recastMesh.getFlatHeightfields(), settings, config, solid);
+            && rasterizeTriangles(context, makeRealTileBoundsWithBorder(settings, tilePosition),
+                                  recastMesh.getFlatHeightfields(), settings, config, solid);
     }
 
     void buildCompactHeightfield(rcContext& context, const int walkableHeight, const int walkableClimb,
@@ -444,7 +448,7 @@ namespace DetourNavigator
         rcHeightfield solid;
         createHeightfield(context, solid, config.width, config.height, config.bmin, config.bmax, config.cs, config.ch);
 
-        if (!rasterizeTriangles(context, agentHalfExtents, recastMesh, config, settings, solid))
+        if (!rasterizeTriangles(context, tilePosition, agentHalfExtents, recastMesh, config, settings, solid))
             return nullptr;
 
         rcFilterLowHangingWalkableObstacles(&context, config.walkableClimb, solid);
diff --git a/components/detournavigator/navigator.hpp b/components/detournavigator/navigator.hpp
index 9243aaf382..6070a19fa8 100644
--- a/components/detournavigator/navigator.hpp
+++ b/components/detournavigator/navigator.hpp
@@ -131,8 +131,7 @@ namespace DetourNavigator
          */
         virtual bool removeWater(const osg::Vec2i& cellPosition) = 0;
 
-        virtual bool addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const osg::Vec3f& shift,
-            const HeightfieldShape& shape) = 0;
+        virtual bool addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const HeightfieldShape& shape) = 0;
 
         virtual bool removeHeightfield(const osg::Vec2i& cellPosition) = 0;
 
diff --git a/components/detournavigator/navigatorimpl.cpp b/components/detournavigator/navigatorimpl.cpp
index 333d018b28..f209a24c2c 100644
--- a/components/detournavigator/navigatorimpl.cpp
+++ b/components/detournavigator/navigatorimpl.cpp
@@ -107,10 +107,9 @@ namespace DetourNavigator
         return mNavMeshManager.removeWater(cellPosition);
     }
 
-    bool NavigatorImpl::addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const osg::Vec3f& shift,
-        const HeightfieldShape& shape)
+    bool NavigatorImpl::addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const HeightfieldShape& shape)
     {
-        return mNavMeshManager.addHeightfield(cellPosition, cellSize, shift, shape);
+        return mNavMeshManager.addHeightfield(cellPosition, cellSize, shape);
     }
 
     bool NavigatorImpl::removeHeightfield(const osg::Vec2i& cellPosition)
diff --git a/components/detournavigator/navigatorimpl.hpp b/components/detournavigator/navigatorimpl.hpp
index 8e3dd52982..2c8474786f 100644
--- a/components/detournavigator/navigatorimpl.hpp
+++ b/components/detournavigator/navigatorimpl.hpp
@@ -35,8 +35,7 @@ namespace DetourNavigator
 
         bool removeWater(const osg::Vec2i& cellPosition) override;
 
-        bool addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const osg::Vec3f& shift,
-            const HeightfieldShape& shape) override;
+        bool addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const HeightfieldShape& shape) override;
 
         bool removeHeightfield(const osg::Vec2i& cellPosition) override;
 
diff --git a/components/detournavigator/navigatorstub.hpp b/components/detournavigator/navigatorstub.hpp
index c66207bf18..1a6096feef 100644
--- a/components/detournavigator/navigatorstub.hpp
+++ b/components/detournavigator/navigatorstub.hpp
@@ -54,8 +54,7 @@ namespace DetourNavigator
             return false;
         }
 
-        bool addHeightfield(const osg::Vec2i& /*cellPosition*/, int /*cellSize*/, const osg::Vec3f& /*shift*/,
-            const HeightfieldShape& /*height*/) override
+        bool addHeightfield(const osg::Vec2i& /*cellPosition*/, int /*cellSize*/, const HeightfieldShape& /*height*/) override
         {
             return false;
         }
diff --git a/components/detournavigator/navmeshmanager.cpp b/components/detournavigator/navmeshmanager.cpp
index 809d92d83c..fff7d8d7cc 100644
--- a/components/detournavigator/navmeshmanager.cpp
+++ b/components/detournavigator/navmeshmanager.cpp
@@ -8,6 +8,7 @@
 #include "waitconditiontype.hpp"
 
 #include <components/debug/debuglog.hpp>
+#include <components/bullethelpers/heightfield.hpp>
 
 #include <DetourNavMesh.h>
 
@@ -77,7 +78,7 @@ namespace DetourNavigator
     {
         if (!mRecastMeshManager.addWater(cellPosition, cellSize, level))
             return false;
-        const osg::Vec3f shift = getWaterShift3d(cellPosition, cellSize, level);
+        const btVector3 shift = Misc::Convert::toBullet(getWaterShift3d(cellPosition, cellSize, level));
         addChangedTiles(cellSize, shift, ChangeType::add);
         return true;
     }
@@ -87,16 +88,16 @@ namespace DetourNavigator
         const auto water = mRecastMeshManager.removeWater(cellPosition);
         if (!water)
             return false;
-        const osg::Vec3f shift = getWaterShift3d(cellPosition, water->mCellSize, water->mLevel);
+        const btVector3 shift = Misc::Convert::toBullet(getWaterShift3d(cellPosition, water->mCellSize, water->mLevel));
         addChangedTiles(water->mCellSize, shift, ChangeType::remove);
         return true;
     }
 
-    bool NavMeshManager::addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const osg::Vec3f& shift,
-        const HeightfieldShape& shape)
+    bool NavMeshManager::addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const HeightfieldShape& shape)
     {
-        if (!mRecastMeshManager.addHeightfield(cellPosition, cellSize, shift, shape))
+        if (!mRecastMeshManager.addHeightfield(cellPosition, cellSize, shape))
             return false;
+        const btVector3 shift = getHeightfieldShift(shape, cellPosition, cellSize);
         addChangedTiles(cellSize, shift, ChangeType::add);
         return true;
     }
@@ -106,7 +107,8 @@ namespace DetourNavigator
         const auto heightfield = mRecastMeshManager.removeHeightfield(cellPosition);
         if (!heightfield)
             return false;
-        addChangedTiles(heightfield->mSize, heightfield->mShift, ChangeType::remove);
+        const btVector3 shift = getHeightfieldShift(heightfield->mShape, cellPosition, heightfield->mCellSize);
+        addChangedTiles(heightfield->mCellSize, shift, ChangeType::remove);
         return true;
     }
 
@@ -253,7 +255,7 @@ namespace DetourNavigator
             [&] (const TilePosition& v) { addChangedTile(v, changeType); });
     }
 
-    void NavMeshManager::addChangedTiles(const int cellSize, const osg::Vec3f& shift,
+    void NavMeshManager::addChangedTiles(const int cellSize, const btVector3& shift,
             const ChangeType changeType)
     {
         if (cellSize == std::numeric_limits<int>::max())
diff --git a/components/detournavigator/navmeshmanager.hpp b/components/detournavigator/navmeshmanager.hpp
index 4a8731bb05..b1926741c5 100644
--- a/components/detournavigator/navmeshmanager.hpp
+++ b/components/detournavigator/navmeshmanager.hpp
@@ -38,8 +38,7 @@ namespace DetourNavigator
 
         bool removeWater(const osg::Vec2i& cellPosition);
 
-        bool addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const osg::Vec3f& shift,
-            const HeightfieldShape& shape);
+        bool addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const HeightfieldShape& shape);
 
         bool removeHeightfield(const osg::Vec2i& cellPosition);
 
@@ -74,7 +73,7 @@ namespace DetourNavigator
 
         void addChangedTiles(const btCollisionShape& shape, const btTransform& transform, const ChangeType changeType);
 
-        void addChangedTiles(const int cellSize, const osg::Vec3f& shift, const ChangeType changeType);
+        void addChangedTiles(const int cellSize, const btVector3& shift, const ChangeType changeType);
 
         void addChangedTile(const TilePosition& tilePosition, const ChangeType changeType);
 
diff --git a/components/detournavigator/recastmesh.hpp b/components/detournavigator/recastmesh.hpp
index 8a06131c93..3cfe9e1cab 100644
--- a/components/detournavigator/recastmesh.hpp
+++ b/components/detournavigator/recastmesh.hpp
@@ -48,12 +48,6 @@ namespace DetourNavigator
         }
     };
 
-    struct Cell
-    {
-        int mSize;
-        osg::Vec3f mShift;
-    };
-
     struct Water
     {
         int mCellSize;
@@ -90,18 +84,21 @@ namespace DetourNavigator
 
     struct Heightfield
     {
-        TileBounds mBounds;
+        osg::Vec2i mCellPosition;
+        int mCellSize;
         std::uint8_t mLength;
         float mMinHeight;
         float mMaxHeight;
-        osg::Vec3f mShift;
-        float mScale;
         std::vector<float> mHeights;
+        std::size_t mOriginalSize;
+        std::uint8_t mMinX;
+        std::uint8_t mMinY;
     };
 
     inline auto makeTuple(const Heightfield& v) noexcept
     {
-        return std::tie(v.mBounds, v.mLength, v.mMinHeight, v.mMaxHeight, v.mShift, v.mScale, v.mHeights);
+        return std::tie(v.mCellPosition, v.mCellSize, v.mLength, v.mMinHeight, v.mMaxHeight,
+                        v.mHeights, v.mOriginalSize, v.mMinX, v.mMinY);
     }
 
     inline bool operator<(const Heightfield& lhs, const Heightfield& rhs) noexcept
@@ -111,13 +108,15 @@ namespace DetourNavigator
 
     struct FlatHeightfield
     {
-        TileBounds mBounds;
+        osg::Vec2i mCellPosition;
+        int mCellSize;
         float mHeight;
     };
 
     inline bool operator<(const FlatHeightfield& lhs, const FlatHeightfield& rhs) noexcept
     {
-        return std::tie(lhs.mBounds, lhs.mHeight) < std::tie(rhs.mBounds, rhs.mHeight);
+        const auto tie = [] (const FlatHeightfield& v) { return std::tie(v.mCellPosition, v.mCellSize, v.mHeight); };
+        return tie(lhs) < tie(rhs);
     }
 
     class RecastMesh
@@ -170,11 +169,6 @@ namespace DetourNavigator
                 + value.mFlatHeightfields.size() * sizeof(FlatHeightfield);
         }
     };
-
-    inline bool operator<(const Cell& lhs, const Cell& rhs) noexcept
-    {
-        return std::tie(lhs.mSize, lhs.mShift) < std::tie(rhs.mSize, rhs.mShift);
-    }
 }
 
 #endif
diff --git a/components/detournavigator/recastmeshbuilder.cpp b/components/detournavigator/recastmeshbuilder.cpp
index dfa1893310..b54b927696 100644
--- a/components/detournavigator/recastmeshbuilder.cpp
+++ b/components/detournavigator/recastmeshbuilder.cpp
@@ -6,6 +6,7 @@
 #include <components/bullethelpers/processtrianglecallback.hpp>
 #include <components/misc/convert.hpp>
 #include <components/debug/debuglog.hpp>
+#include <components/bullethelpers/heightfield.hpp>
 
 #include <BulletCollision/CollisionShapes/btBoxShape.h>
 #include <BulletCollision/CollisionShapes/btCompoundShape.h>
@@ -35,13 +36,9 @@ namespace DetourNavigator
             return result;
         }
 
-        TileBounds maxCellTileBounds(int size, const osg::Vec3f& shift)
+        float getHeightfieldScale(int cellSize, std::size_t dataSize)
         {
-            const float halfCellSize = static_cast<float>(size) / 2;
-            return TileBounds {
-                osg::Vec2f(shift.x() - halfCellSize, shift.y() - halfCellSize),
-                osg::Vec2f(shift.x() + halfCellSize, shift.y() + halfCellSize)
-            };
+            return static_cast<float>(cellSize) / (dataSize - 1);
         }
     }
 
@@ -108,7 +105,8 @@ namespace DetourNavigator
             static_cast<int>(heightfield.mLength), heightfield.mHeights.data(),
             heightfield.mMinHeight, heightfield.mMaxHeight, upAxis, flipQuadEdges);
 #endif
-        shape.setLocalScaling(btVector3(heightfield.mScale, heightfield.mScale, 1));
+        const float scale = getHeightfieldScale(heightfield.mCellSize, heightfield.mOriginalSize);
+        shape.setLocalScaling(btVector3(scale, scale, 1));
         btVector3 aabbMin;
         btVector3 aabbMax;
         shape.getAabb(btTransform::getIdentity(), aabbMin, aabbMax);
@@ -118,8 +116,16 @@ namespace DetourNavigator
             triangles.emplace_back(makeRecastMeshTriangle(vertices, AreaType_ground));
         });
         shape.processAllTriangles(&callback, aabbMin, aabbMax);
-        const osg::Vec2f shift = (osg::Vec2f(aabbMax.x(), aabbMax.y()) - osg::Vec2f(aabbMin.x(), aabbMin.y())) * 0.5;
-        return makeMesh(std::move(triangles), heightfield.mShift + osg::Vec3f(shift.x(), shift.y(), 0));
+        const osg::Vec2f aabbShift = (osg::Vec2f(aabbMax.x(), aabbMax.y()) - osg::Vec2f(aabbMin.x(), aabbMin.y())) * 0.5;
+        const osg::Vec2f tileShift = osg::Vec2f(heightfield.mMinX, heightfield.mMinY) * scale;
+        const osg::Vec2f localShift = aabbShift + tileShift;
+        const float cellSize = static_cast<float>(heightfield.mCellSize);
+        const osg::Vec3f cellShift(
+            heightfield.mCellPosition.x() * cellSize,
+            heightfield.mCellPosition.y() * cellSize,
+            (heightfield.mMinHeight + heightfield.mMaxHeight) * 0.5f
+        );
+        return makeMesh(std::move(triangles), cellShift + osg::Vec3f(localShift.x(), localShift.y(), 0));
     }
 
     RecastMeshBuilder::RecastMeshBuilder(const TileBounds& bounds) noexcept
@@ -205,19 +211,20 @@ namespace DetourNavigator
         mWater.push_back(CellWater {cellPosition, water});
     }
 
-    void RecastMeshBuilder::addHeightfield(int cellSize, const osg::Vec3f& shift, float height)
+    void RecastMeshBuilder::addHeightfield(const osg::Vec2i& cellPosition, int cellSize, float height)
     {
-        if (const auto intersection = getIntersection(mBounds, maxCellTileBounds(cellSize, shift)))
-            mFlatHeightfields.emplace_back(FlatHeightfield {*intersection, height + shift.z()});
+        if (const auto intersection = getIntersection(mBounds, maxCellTileBounds(cellPosition, cellSize)))
+            mFlatHeightfields.emplace_back(FlatHeightfield {cellPosition, cellSize, height});
     }
 
-    void RecastMeshBuilder::addHeightfield(int cellSize, const osg::Vec3f& shift, const float* heights,
+    void RecastMeshBuilder::addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const float* heights,
         std::size_t size, float minHeight, float maxHeight)
     {
-        const auto intersection = getIntersection(mBounds, maxCellTileBounds(cellSize, shift));
+        const auto intersection = getIntersection(mBounds, maxCellTileBounds(cellPosition, cellSize));
         if (!intersection.has_value())
             return;
-        const float stepSize = static_cast<float>(cellSize) / (size - 1);
+        const osg::Vec3f shift = Misc::Convert::toOsg(BulletHelpers::getHeightfieldShift(cellPosition.x(), cellPosition.y(), cellSize, minHeight, maxHeight));
+        const float stepSize = getHeightfieldScale(cellSize, size);
         const int halfCellSize = cellSize / 2;
         const auto local = [&] (float v, float shift) { return (v - shift + halfCellSize) / stepSize; };
         const auto index = [&] (float v, int add) { return std::clamp<int>(static_cast<int>(v) + add, 0, size); };
@@ -236,13 +243,15 @@ namespace DetourNavigator
             for (std::size_t x = minX; x < endX; ++x)
                 tileHeights.push_back(heights[x + y * size]);
         Heightfield heightfield;
-        heightfield.mBounds = *intersection;
+        heightfield.mCellPosition = cellPosition;
+        heightfield.mCellSize = cellSize;
         heightfield.mLength = static_cast<std::uint8_t>(endY - minY);
         heightfield.mMinHeight = minHeight;
         heightfield.mMaxHeight = maxHeight;
-        heightfield.mShift = shift + osg::Vec3f(minX, minY, 0) * stepSize - osg::Vec3f(halfCellSize, halfCellSize, 0);
-        heightfield.mScale = stepSize;
         heightfield.mHeights = std::move(tileHeights);
+        heightfield.mOriginalSize = size;
+        heightfield.mMinX = static_cast<std::uint8_t>(minX);
+        heightfield.mMinY = static_cast<std::uint8_t>(minY);
         mHeightfields.push_back(std::move(heightfield));
     }
 
diff --git a/components/detournavigator/recastmeshbuilder.hpp b/components/detournavigator/recastmeshbuilder.hpp
index 2d68a7e89f..4bdcb788e3 100644
--- a/components/detournavigator/recastmeshbuilder.hpp
+++ b/components/detournavigator/recastmeshbuilder.hpp
@@ -50,9 +50,9 @@ namespace DetourNavigator
 
         void addWater(const osg::Vec2i& cellPosition, const Water& water);
 
-        void addHeightfield(int cellSize, const osg::Vec3f& shift, float height);
+        void addHeightfield(const osg::Vec2i& cellPosition, int cellSize, float height);
 
-        void addHeightfield(int cellSize, const osg::Vec3f& shift, const float* heights, std::size_t size,
+        void addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const float* heights, std::size_t size,
             float minHeight, float maxHeight);
 
         std::shared_ptr<RecastMesh> create(std::size_t generation, std::size_t revision) &&;
diff --git a/components/detournavigator/recastmeshmanager.cpp b/components/detournavigator/recastmeshmanager.cpp
index 48a64d70aa..4772ec74a9 100644
--- a/components/detournavigator/recastmeshmanager.cpp
+++ b/components/detournavigator/recastmeshmanager.cpp
@@ -4,6 +4,7 @@
 #include "heightfieldshape.hpp"
 
 #include <components/debug/debuglog.hpp>
+#include <components/misc/convert.hpp>
 
 #include <utility>
 
@@ -11,17 +12,18 @@ namespace
 {
     struct AddHeightfield
     {
-        const DetourNavigator::Cell& mCell;
+        osg::Vec2i mCellPosition;
+        int mCellSize;
         DetourNavigator::RecastMeshBuilder& mBuilder;
 
         void operator()(const DetourNavigator::HeightfieldSurface& v)
         {
-            mBuilder.addHeightfield(mCell.mSize, mCell.mShift, v.mHeights, v.mSize, v.mMinHeight, v.mMaxHeight);
+            mBuilder.addHeightfield(mCellPosition, mCellSize, v.mHeights, v.mSize, v.mMinHeight, v.mMaxHeight);
         }
 
         void operator()(DetourNavigator::HeightfieldPlane v)
         {
-            mBuilder.addHeightfield(mCell.mSize, mCell.mShift, v.mHeight);
+            mBuilder.addHeightfield(mCellPosition, mCellSize, v.mHeight);
         }
     };
 }
@@ -94,24 +96,24 @@ namespace DetourNavigator
         return result;
     }
 
-    bool RecastMeshManager::addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const osg::Vec3f& shift,
+    bool RecastMeshManager::addHeightfield(const osg::Vec2i& cellPosition, int cellSize,
         const HeightfieldShape& shape)
     {
         const std::lock_guard lock(mMutex);
-        if (!mHeightfields.emplace(cellPosition, Heightfield {Cell {cellSize, shift}, shape}).second)
+        if (!mHeightfields.emplace(cellPosition, SizedHeightfieldShape {cellSize, shape}).second)
             return false;
         ++mRevision;
         return true;
     }
 
-    std::optional<Cell> RecastMeshManager::removeHeightfield(const osg::Vec2i& cellPosition)
+    std::optional<SizedHeightfieldShape> RecastMeshManager::removeHeightfield(const osg::Vec2i& cellPosition)
     {
         const std::lock_guard lock(mMutex);
         const auto it = mHeightfields.find(cellPosition);
         if (it == mHeightfields.end())
             return std::nullopt;
         ++mRevision;
-        const auto result = std::make_optional(it->second.mCell);
+        auto result = std::make_optional(it->second);
         mHeightfields.erase(it);
         return result;
     }
@@ -132,7 +134,7 @@ namespace DetourNavigator
             for (const auto& [k, v] : mWater)
                 builder.addWater(k, v);
             for (const auto& [cellPosition, v] : mHeightfields)
-                std::visit(AddHeightfield {v.mCell, builder}, v.mShape);
+                std::visit(AddHeightfield {cellPosition, v.mCellSize, builder}, v.mShape);
             objects.reserve(mObjects.size());
             for (const auto& [k, object] : mObjects)
             {
diff --git a/components/detournavigator/recastmeshmanager.hpp b/components/detournavigator/recastmeshmanager.hpp
index 576314191f..e897c797fc 100644
--- a/components/detournavigator/recastmeshmanager.hpp
+++ b/components/detournavigator/recastmeshmanager.hpp
@@ -29,6 +29,12 @@ namespace DetourNavigator
         btTransform mTransform;
     };
 
+    struct SizedHeightfieldShape
+    {
+        int mCellSize;
+        HeightfieldShape mShape;
+    };
+
     class RecastMeshManager
     {
     public:
@@ -45,10 +51,9 @@ namespace DetourNavigator
 
         std::optional<Water> removeWater(const osg::Vec2i& cellPosition);
 
-        bool addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const osg::Vec3f& shift,
-            const HeightfieldShape& shape);
+        bool addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const HeightfieldShape& shape);
 
-        std::optional<Cell> removeHeightfield(const osg::Vec2i& cellPosition);
+        std::optional<SizedHeightfieldShape> removeHeightfield(const osg::Vec2i& cellPosition);
 
         std::shared_ptr<RecastMesh> getMesh() const;
 
@@ -65,19 +70,13 @@ namespace DetourNavigator
             Version mNavMeshVersion;
         };
 
-        struct Heightfield
-        {
-            Cell mCell;
-            HeightfieldShape mShape;
-        };
-
         const std::size_t mGeneration;
         const TileBounds mTileBounds;
         mutable std::mutex mMutex;
         std::size_t mRevision = 0;
         std::map<ObjectId, OscillatingRecastMeshObject> mObjects;
         std::map<osg::Vec2i, Water> mWater;
-        std::map<osg::Vec2i, Heightfield> mHeightfields;
+        std::map<osg::Vec2i, SizedHeightfieldShape> mHeightfields;
         std::optional<Report> mLastNavMeshReportedChange;
         std::optional<Report> mLastNavMeshReport;
     };
diff --git a/components/detournavigator/tilebounds.hpp b/components/detournavigator/tilebounds.hpp
index 8557045342..693a382740 100644
--- a/components/detournavigator/tilebounds.hpp
+++ b/components/detournavigator/tilebounds.hpp
@@ -2,6 +2,7 @@
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_TILEBOUNDS_H
 
 #include <osg/Vec2f>
+#include <osg/Vec2i>
 
 #include <algorithm>
 #include <optional>
@@ -32,6 +33,14 @@ namespace DetourNavigator
             return std::nullopt;
         return TileBounds {osg::Vec2f(minX, minY), osg::Vec2f(maxX, maxY)};
     }
+
+    inline TileBounds maxCellTileBounds(const osg::Vec2i& position, int size)
+    {
+        return TileBounds {
+            osg::Vec2f(position.x(), position.y()) * size,
+            osg::Vec2f(position.x() + 1, position.y() + 1) * size
+        };
+    }
 }
 
 #endif
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.cpp b/components/detournavigator/tilecachedrecastmeshmanager.cpp
index 347d4b7b30..20fbe30667 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -74,7 +74,7 @@ namespace DetourNavigator
         }
         else
         {
-            const osg::Vec3f shift = getWaterShift3d(cellPosition, cellSize, level);
+            const btVector3 shift = Misc::Convert::toBullet(getWaterShift3d(cellPosition, cellSize, level));
             getTilesPositions(cellSize, shift, mSettings, [&] (const TilePosition& tilePosition)
                 {
                     const auto tiles = mTiles.lock();
@@ -126,8 +126,9 @@ namespace DetourNavigator
     }
 
     bool TileCachedRecastMeshManager::addHeightfield(const osg::Vec2i& cellPosition, int cellSize,
-        const osg::Vec3f& shift, const HeightfieldShape& shape)
+        const HeightfieldShape& shape)
     {
+        const btVector3 shift = getHeightfieldShift(shape, cellPosition, cellSize);
         auto& tilesPositions = mHeightfieldTilesPositions[cellPosition];
 
         bool result = false;
@@ -142,7 +143,7 @@ namespace DetourNavigator
                     tile = tiles->emplace(tilePosition,
                             std::make_shared<CachedRecastMeshManager>(tileBounds, mTilesGeneration)).first;
                 }
-                if (tile->second->addHeightfield(cellPosition, cellSize, shift, shape))
+                if (tile->second->addHeightfield(cellPosition, cellSize, shape))
                 {
                     tilesPositions.push_back(tilePosition);
                     result = true;
@@ -155,12 +156,12 @@ namespace DetourNavigator
         return result;
     }
 
-    std::optional<Cell> TileCachedRecastMeshManager::removeHeightfield(const osg::Vec2i& cellPosition)
+    std::optional<SizedHeightfieldShape> TileCachedRecastMeshManager::removeHeightfield(const osg::Vec2i& cellPosition)
     {
         const auto object = mHeightfieldTilesPositions.find(cellPosition);
         if (object == mHeightfieldTilesPositions.end())
             return std::nullopt;
-        std::optional<Cell> result;
+        std::optional<SizedHeightfieldShape> result;
         for (const auto& tilePosition : object->second)
         {
             const auto tiles = mTiles.lock();
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.hpp b/components/detournavigator/tilecachedrecastmeshmanager.hpp
index 606d08afdf..bb08a4227e 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.hpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.hpp
@@ -80,10 +80,9 @@ namespace DetourNavigator
 
         std::optional<Water> removeWater(const osg::Vec2i& cellPosition);
 
-        bool addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const osg::Vec3f& shift,
-            const HeightfieldShape& shape);
+        bool addHeightfield(const osg::Vec2i& cellPosition, int cellSize, const HeightfieldShape& shape);
 
-        std::optional<Cell> removeHeightfield(const osg::Vec2i& cellPosition);
+        std::optional<SizedHeightfieldShape> removeHeightfield(const osg::Vec2i& cellPosition);
 
         std::shared_ptr<RecastMesh> getMesh(const TilePosition& tilePosition) const;
 

From 3daa716090ef1fd18c14875ef69c4b131e1cb25c Mon Sep 17 00:00:00 2001
From: Thomas Lowe <musicaltommy@gmail.com>
Date: Fri, 3 Dec 2021 06:45:54 -0500
Subject: [PATCH 1814/2859] Updated button description.

---
 files/ui/advancedpage.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/ui/advancedpage.ui b/files/ui/advancedpage.ui
index 4b7434dc35..3a2e7c49fc 100644
--- a/files/ui/advancedpage.ui
+++ b/files/ui/advancedpage.ui
@@ -457,7 +457,7 @@
               <item row="3" column="1">
                <widget class="QCheckBox" name="antialiasAlphaTestCheckBox">
                 <property name="toolTip">
-                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Allows MSAA to work with alpha-tested meshes, producing better-looking edges without pixelation. Can negatively impact performance if MSAA is off.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Allows MSAA to work with alpha-tested meshes, producing better-looking edges without pixelation. Can negatively impact performance.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                 </property>
                 <property name="text">
                  <string>Use anti-alias alpha testing</string>

From 620748480b07df8f30435ec518a788dd9e50bc68 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Thu, 2 Dec 2021 22:02:42 +0000
Subject: [PATCH 1815/2859] Merge branch 'lua_missing_key_codes' into 'master'

Lua binding for SDL_GetKeyName, two missing scan codes

See merge request OpenMW/openmw!1450

(cherry picked from commit d86e7d4c9a28bc96af0a5638b26879fa49b8a847)

9a073baa Add Apostrophe and Period scan codes
d66f3a35 Add getKeyName to Lua input API
ed64add9 Replace mentions of KeyEvent with KEY
---
 apps/openmw/mwlua/inputbindings.cpp |  6 ++++++
 files/lua_api/openmw/input.lua      | 10 +++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwlua/inputbindings.cpp b/apps/openmw/mwlua/inputbindings.cpp
index 6707d35d3b..8aecd1269c 100644
--- a/apps/openmw/mwlua/inputbindings.cpp
+++ b/apps/openmw/mwlua/inputbindings.cpp
@@ -71,6 +71,10 @@ namespace MWLua
         api["getControlSwitch"] = [input](std::string_view key) { return input->getControlSwitch(key); };
         api["setControlSwitch"] = [input](std::string_view key, bool v) { input->toggleControlSwitch(key, v); };
 
+        api["getKeyName"] = [](SDL_Scancode code) {
+            return SDL_GetKeyName(SDL_GetKeyFromScancode(code));
+        };
+
         api["ACTION"] = LuaUtil::makeReadOnly(context.mLua->tableFromPairs<std::string_view, MWInput::Actions>({
             {"GameMenu", MWInput::A_GameMenu},
             {"Screenshot", MWInput::A_Screenshot},
@@ -252,6 +256,7 @@ namespace MWLua
             {"RightBracket", SDL_SCANCODE_RIGHTBRACKET},
             {"RightShift", SDL_SCANCODE_RSHIFT},
 
+            {"Apostrophe", SDL_SCANCODE_APOSTROPHE},
             {"BackSlash", SDL_SCANCODE_BACKSLASH},
             {"Backspace", SDL_SCANCODE_BACKSPACE},
             {"CapsLock", SDL_SCANCODE_CAPSLOCK},
@@ -267,6 +272,7 @@ namespace MWLua
             {"NumLock", SDL_SCANCODE_NUMLOCKCLEAR},
             {"PageDown", SDL_SCANCODE_PAGEDOWN},
             {"PageUp", SDL_SCANCODE_PAGEUP},
+            {"Period", SDL_SCANCODE_PERIOD},
             {"Pause", SDL_SCANCODE_PAUSE},
             {"PrintScreen", SDL_SCANCODE_PRINTSCREEN},
             {"ScrollLock", SDL_SCANCODE_SCROLLLOCK},
diff --git a/files/lua_api/openmw/input.lua b/files/lua_api/openmw/input.lua
index d4ff7f3475..361073e79d 100644
--- a/files/lua_api/openmw/input.lua
+++ b/files/lua_api/openmw/input.lua
@@ -20,7 +20,7 @@
 -------------------------------------------------------------------------------
 -- Is a keyboard button currently pressed.
 -- @function [parent=#input] isKeyPressed
--- @param #number keyCode Key code (the same code that is used in @{openmw.input#KeyEvent})
+-- @param #number keyCode Key code (see @{openmw.input#KEY})
 -- @return #boolean
 
 -------------------------------------------------------------------------------
@@ -83,6 +83,12 @@
 -- @param #string key Control type (see @{openmw.input#CONTROL_SWITCH})
 -- @param #boolean value
 
+-------------------------------------------------------------------------------
+-- Returns a human readable name for the given key code
+-- @function [parent=#input] getKeyName
+-- @param #number code A key code (see @{openmw.input#KEY})
+-- @return #string
+
 -------------------------------------------------------------------------------
 -- @type CONTROL_SWITCH
 -- @field [parent=#CONTROL_SWITCH] #string Controls Ability to move
@@ -268,6 +274,7 @@
 -- @field #number RightBracket
 -- @field #number RightSuper
 -- @field #number RightShift
+-- @field #number Apostrophe
 -- @field #number BackSlash
 -- @field #number Backspace
 -- @field #number CapsLock
@@ -284,6 +291,7 @@
 -- @field #number PageDown
 -- @field #number PageUp
 -- @field #number Pause
+-- @field #number Period
 -- @field #number PrintScreen
 -- @field #number ScrollLock
 -- @field #number Semicolon

From f19b315651e9383f8759b719097faead398bdf99 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Fri, 3 Dec 2021 13:39:39 +0000
Subject: [PATCH 1816/2859] Update .resubmitted_merge_requests.txt

---
 .resubmitted_merge_requests.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.resubmitted_merge_requests.txt b/.resubmitted_merge_requests.txt
index 01af064708..93dda75f1d 100644
--- a/.resubmitted_merge_requests.txt
+++ b/.resubmitted_merge_requests.txt
@@ -1,3 +1,4 @@
+1450
 1314
 1216
 1172

From 47ff6a87a3c54b55722d114eba6a699da3fb329e Mon Sep 17 00:00:00 2001
From: Kindi <2538602-Kuyondo@users.noreply.gitlab.com>
Date: Fri, 3 Dec 2021 16:05:18 +0000
Subject: [PATCH 1817/2859] Raise a warning when entering non-existent region

---
 CHANGELOG.md                           | 1 +
 apps/openmw/mwscript/skyextensions.cpp | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 778df6e680..0d85fbc865 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -77,6 +77,7 @@
     Bug #6343: Magic projectile speed doesn't take race weight into account
     Bug #6347: PlaceItem/PlaceItemCell/PlaceAt should work with levelled creatures
     Bug #6354: SFX abruptly cut off after crossing max distance; implement soft fading of sound effects
+    Bug #6358: Changeweather command does not report an error when entering non-existent region
     Bug #6363: Some scripts in Morrowland fail to work
     Bug #6376: Creatures should be able to use torches
     Bug #6386: Artifacts in water reflection due to imprecise screen-space coordinate computation
diff --git a/apps/openmw/mwscript/skyextensions.cpp b/apps/openmw/mwscript/skyextensions.cpp
index 4f4891b424..81984ad7b7 100644
--- a/apps/openmw/mwscript/skyextensions.cpp
+++ b/apps/openmw/mwscript/skyextensions.cpp
@@ -11,6 +11,8 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
+#include "../mwworld/esmstore.hpp"
+
 #include "interpretercontext.hpp"
 
 namespace MWScript
@@ -91,7 +93,11 @@ namespace MWScript
                     Interpreter::Type_Integer id = runtime[0].mInteger;
                     runtime.pop();
 
-                    MWBase::Environment::get().getWorld()->changeWeather(region, id);
+                    const ESM::Region* reg = MWBase::Environment::get().getWorld()->getStore().get<ESM::Region>().search(region);
+                    if (reg)
+                        MWBase::Environment::get().getWorld()->changeWeather(region, id);
+                    else
+                        runtime.getContext().report("Warning: Region \"" + region + "\" was not found");
                 }
         };
 

From d3df3efaf191a1554a32100c41fa18a22c689858 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sat, 4 Dec 2021 11:32:39 +0000
Subject: [PATCH 1818/2859] Precompile sol.hpp in order to reduce compilation
 time.

---
 CMakeLists.txt                        | 6 ++++--
 apps/openmw/CMakeLists.txt            | 5 ++++-
 apps/openmw/android_main.cpp          | 2 ++
 apps/openmw_test_suite/CMakeLists.txt | 2 +-
 components/CMakeLists.txt             | 5 +++++
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 067b645a39..3f19b2a54f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -414,7 +414,8 @@ else(USE_LUAJIT)
 endif(USE_LUAJIT)
 
 # C++ library binding to Lua
-set(SOL_INCLUDE_DIRS ${OpenMW_SOURCE_DIR}/extern/sol3.2.2 ${OpenMW_SOURCE_DIR}/extern/sol_config)
+set(SOL_INCLUDE_DIR ${OpenMW_SOURCE_DIR}/extern/sol3.2.2)
+set(SOL_CONFIG_DIR ${OpenMW_SOURCE_DIR}/extern/sol_config)
 
 include_directories(
     BEFORE SYSTEM
@@ -426,7 +427,8 @@ include_directories(
     ${OPENGL_INCLUDE_DIR}
     ${BULLET_INCLUDE_DIRS}
     ${LUA_INCLUDE_DIR}
-    ${SOL_INCLUDE_DIRS}
+    ${SOL_INCLUDE_DIR}
+    ${SOL_CONFIG_DIR}
 )
 
 link_directories(${SDL2_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS})
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 2582b272cf..551c68ce11 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -153,9 +153,12 @@ target_link_libraries(openmw
     "osg-ffmpeg-videoplayer"
     "oics"
     components
-    ${LUA_LIBRARIES}
 )
 
+if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16)
+    target_precompile_headers(openmw PRIVATE ${SOL_INCLUDE_DIR}/sol/sol.hpp)
+endif ()
+
 if (ANDROID)
     target_link_libraries(openmw EGL android log z)
 endif (ANDROID)
diff --git a/apps/openmw/android_main.cpp b/apps/openmw/android_main.cpp
index cc36388b0b..95365915df 100644
--- a/apps/openmw/android_main.cpp
+++ b/apps/openmw/android_main.cpp
@@ -1,4 +1,6 @@
+#ifndef stderr
 int stderr = 0; // Hack: fix linker error
+#endif
 
 #include "SDL_main.h"
 #include <SDL_gamecontroller.h>
diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index ed1d6c413b..7cfac20421 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -70,7 +70,7 @@ if (GTEST_FOUND AND GMOCK_FOUND)
 
     openmw_add_executable(openmw_test_suite openmw_test_suite.cpp ${UNITTEST_SRC_FILES})
 
-    target_link_libraries(openmw_test_suite ${GMOCK_LIBRARIES} components ${LUA_LIBRARIES})
+    target_link_libraries(openmw_test_suite ${GMOCK_LIBRARIES} components)
     # Fix for not visible pthreads functions for linker with glibc 2.15
     if (UNIX AND NOT APPLE)
         target_link_libraries(openmw_test_suite ${CMAKE_THREAD_LIBS_INIT})
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index bdb22f2dc5..43f0fb1ab5 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -283,6 +283,7 @@ target_link_libraries(components
     ${SDL2_LIBRARIES}
     ${OPENGL_gl_LIBRARY}
     ${MyGUI_LIBRARIES}
+    ${LUA_LIBRARIES}
     LZ4::LZ4
     RecastNavigation::DebugUtils
     RecastNavigation::Detour
@@ -371,3 +372,7 @@ endif(OSG_STATIC)
 if(USE_QT)
     set_property(TARGET components_qt PROPERTY AUTOMOC ON)
 endif(USE_QT)
+
+if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16)
+    target_precompile_headers(components PRIVATE ${SOL_INCLUDE_DIR}/sol/sol.hpp)
+endif ()

From 15c7bddd57355c085c0f5094b39ba8143ce98795 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sat, 4 Dec 2021 12:16:38 +0000
Subject: [PATCH 1819/2859] Move SDL-MyGUI input mappings to components, map
 both ways

---
 apps/openmw/CMakeLists.txt                    |   2 +-
 apps/openmw/mwinput/bindingsmanager.cpp       |   7 +-
 apps/openmw/mwinput/controllermanager.cpp     |   6 +-
 apps/openmw/mwinput/inputmanagerimp.cpp       |   1 -
 apps/openmw/mwinput/keyboardmanager.cpp       |   7 +-
 apps/openmw/mwinput/mousemanager.cpp          |  24 +-
 apps/openmw/mwinput/sdlmappings.cpp           | 218 ---------------
 components/CMakeLists.txt                     |   2 +-
 components/lua_ui/widget.cpp                  |   8 +-
 components/sdlutil/sdlmappings.cpp            | 251 ++++++++++++++++++
 .../sdlutil}/sdlmappings.hpp                  |  12 +-
 11 files changed, 293 insertions(+), 245 deletions(-)
 delete mode 100644 apps/openmw/mwinput/sdlmappings.cpp
 create mode 100644 components/sdlutil/sdlmappings.cpp
 rename {apps/openmw/mwinput => components/sdlutil}/sdlmappings.hpp (50%)

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 2582b272cf..6b2dc91b72 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -27,7 +27,7 @@ add_openmw_dir (mwrender
 
 add_openmw_dir (mwinput
     actions actionmanager bindingsmanager controllermanager controlswitch
-    inputmanagerimp mousemanager keyboardmanager sdlmappings sensormanager
+    inputmanagerimp mousemanager keyboardmanager sensormanager
     )
 
 add_openmw_dir (mwgui
diff --git a/apps/openmw/mwinput/bindingsmanager.cpp b/apps/openmw/mwinput/bindingsmanager.cpp
index f3e1ba2c8d..68be849dbd 100644
--- a/apps/openmw/mwinput/bindingsmanager.cpp
+++ b/apps/openmw/mwinput/bindingsmanager.cpp
@@ -5,6 +5,8 @@
 #include <extern/oics/ICSChannelListener.h>
 #include <extern/oics/ICSInputControlSystem.h>
 
+#include <components/sdlutil/sdlmappings.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/inputmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
@@ -13,7 +15,6 @@
 #include "../mwworld/player.hpp"
 
 #include "actions.hpp"
-#include "sdlmappings.hpp"
 
 namespace MWInput
 {
@@ -546,9 +547,9 @@ namespace MWInput
         ICS::Control* c = mInputBinder->getChannel(action)->getAttachedControls().front().control;
 
         if (mInputBinder->getJoystickAxisBinding(c, sFakeDeviceId, ICS::Control::INCREASE) != ICS::InputControlSystem::UNASSIGNED)
-            return sdlControllerAxisToString(mInputBinder->getJoystickAxisBinding(c, sFakeDeviceId, ICS::Control::INCREASE));
+            return SDLUtil::sdlControllerAxisToString(mInputBinder->getJoystickAxisBinding(c, sFakeDeviceId, ICS::Control::INCREASE));
         else if (mInputBinder->getJoystickButtonBinding(c, sFakeDeviceId, ICS::Control::INCREASE) != ICS_MAX_DEVICE_BUTTONS)
-            return sdlControllerButtonToString(mInputBinder->getJoystickButtonBinding(c, sFakeDeviceId, ICS::Control::INCREASE));
+            return SDLUtil::sdlControllerButtonToString(mInputBinder->getJoystickButtonBinding(c, sFakeDeviceId, ICS::Control::INCREASE));
         else
             return "#{sNone}";
     }
diff --git a/apps/openmw/mwinput/controllermanager.cpp b/apps/openmw/mwinput/controllermanager.cpp
index 0ed58349d6..1e72a1c95b 100644
--- a/apps/openmw/mwinput/controllermanager.cpp
+++ b/apps/openmw/mwinput/controllermanager.cpp
@@ -5,6 +5,7 @@
 #include <MyGUI_Widget.h>
 
 #include <components/debug/debuglog.hpp>
+#include <components/sdlutil/sdlmappings.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/inputmanager.hpp"
@@ -19,7 +20,6 @@
 #include "actionmanager.hpp"
 #include "bindingsmanager.hpp"
 #include "mousemanager.hpp"
-#include "sdlmappings.hpp"
 
 namespace MWInput
 {
@@ -215,7 +215,7 @@ namespace MWInput
             mBindingsManager->setPlayerControlsEnabled(true);
 
         //esc, to leave initial movie screen
-        auto kc = sdlKeyToMyGUI(SDLK_ESCAPE);
+        auto kc = SDLUtil::sdlKeyToMyGUI(SDLK_ESCAPE);
         mBindingsManager->setPlayerControlsEnabled(!MyGUI::InputManager::getInstance().injectKeyPress(kc, 0));
 
         if (!MWBase::Environment::get().getInputManager()->controlsDisabled())
@@ -259,7 +259,7 @@ namespace MWInput
             mBindingsManager->setPlayerControlsEnabled(true);
 
         //esc, to leave initial movie screen
-        auto kc = sdlKeyToMyGUI(SDLK_ESCAPE);
+        auto kc = SDLUtil::sdlKeyToMyGUI(SDLK_ESCAPE);
         mBindingsManager->setPlayerControlsEnabled(!MyGUI::InputManager::getInstance().injectKeyRelease(kc));
 
         mBindingsManager->controllerButtonReleased(deviceID, arg);
diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index 5d737bd446..4ebe56bf94 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -18,7 +18,6 @@
 #include "controlswitch.hpp"
 #include "keyboardmanager.hpp"
 #include "mousemanager.hpp"
-#include "sdlmappings.hpp"
 #include "sensormanager.hpp"
 
 namespace MWInput
diff --git a/apps/openmw/mwinput/keyboardmanager.cpp b/apps/openmw/mwinput/keyboardmanager.cpp
index b121b665e7..d8fc548f25 100644
--- a/apps/openmw/mwinput/keyboardmanager.cpp
+++ b/apps/openmw/mwinput/keyboardmanager.cpp
@@ -4,6 +4,8 @@
 
 #include <MyGUI_InputManager.h>
 
+#include <components/sdlutil/sdlmappings.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/inputmanager.hpp"
 #include "../mwbase/luamanager.hpp"
@@ -13,7 +15,6 @@
 
 #include "actions.hpp"
 #include "bindingsmanager.hpp"
-#include "sdlmappings.hpp"
 
 namespace MWInput
 {
@@ -35,7 +36,7 @@ namespace MWInput
         // HACK: to make default keybinding for the console work without printing an extra "^" upon closing
         // This assumes that SDL_TextInput events always come *after* the key event
         // (which is somewhat reasonable, and hopefully true for all SDL platforms)
-        auto kc = sdlKeyToMyGUI(arg.keysym.sym);
+        auto kc = SDLUtil::sdlKeyToMyGUI(arg.keysym.sym);
         if (mBindingsManager->getKeyBinding(A_Console) == arg.keysym.scancode
                 && MWBase::Environment::get().getWindowManager()->isConsoleMode())
             SDL_StopTextInput();
@@ -71,7 +72,7 @@ namespace MWInput
     void KeyboardManager::keyReleased(const SDL_KeyboardEvent &arg)
     {
         MWBase::Environment::get().getInputManager()->setJoystickLastUsed(false);
-        auto kc = sdlKeyToMyGUI(arg.keysym.sym);
+        auto kc = SDLUtil::sdlKeyToMyGUI(arg.keysym.sym);
 
         if (!mBindingsManager->isDetectingBindingState())
             mBindingsManager->setPlayerControlsEnabled(!MyGUI::InputManager::getInstance().injectKeyRelease(kc));
diff --git a/apps/openmw/mwinput/mousemanager.cpp b/apps/openmw/mwinput/mousemanager.cpp
index 6fbe8cfc98..f646501607 100644
--- a/apps/openmw/mwinput/mousemanager.cpp
+++ b/apps/openmw/mwinput/mousemanager.cpp
@@ -7,6 +7,7 @@
 
 #include <components/debug/debuglog.hpp>
 #include <components/sdlutil/sdlinputwrapper.hpp>
+#include <components/sdlutil/sdlmappings.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/inputmanager.hpp"
@@ -17,7 +18,6 @@
 
 #include "actions.hpp"
 #include "bindingsmanager.hpp"
-#include "sdlmappings.hpp"
 
 namespace MWInput
 {
@@ -125,7 +125,11 @@ namespace MWInput
         else
         {
             bool guiMode = MWBase::Environment::get().getWindowManager()->isGuiMode();
-            guiMode = MyGUI::InputManager::getInstance().injectMouseRelease(static_cast<int>(mGuiCursorX), static_cast<int>(mGuiCursorY), sdlButtonToMyGUI(id)) && guiMode;
+            guiMode = MyGUI::InputManager::getInstance().injectMouseRelease(
+                static_cast<int>(mGuiCursorX),
+                static_cast<int>(mGuiCursorY),
+                SDLUtil::sdlMouseButtonToMyGui(id)
+            ) && guiMode;
 
             if (mBindingsManager->isDetectingBindingState())
                 return; // don't allow same mouseup to bind as initiated bind
@@ -153,7 +157,11 @@ namespace MWInput
         if (id == SDL_BUTTON_LEFT || id == SDL_BUTTON_RIGHT) // MyGUI only uses these mouse events
         {
             guiMode = MWBase::Environment::get().getWindowManager()->isGuiMode();
-            guiMode = MyGUI::InputManager::getInstance().injectMousePress(static_cast<int>(mGuiCursorX), static_cast<int>(mGuiCursorY), sdlButtonToMyGUI(id)) && guiMode;
+            guiMode = MyGUI::InputManager::getInstance().injectMousePress(
+                static_cast<int>(mGuiCursorX),
+                static_cast<int>(mGuiCursorY),
+                SDLUtil::sdlMouseButtonToMyGui(id)
+            ) && guiMode;
             if (MyGUI::InputManager::getInstance().getMouseFocusWidget () != nullptr)
             {
                 MyGUI::Button* b = MyGUI::InputManager::getInstance().getMouseFocusWidget()->castType<MyGUI::Button>(false);
@@ -229,12 +237,18 @@ namespace MWInput
 
     bool MouseManager::injectMouseButtonPress(Uint8 button)
     {
-        return MyGUI::InputManager::getInstance().injectMousePress(static_cast<int>(mGuiCursorX), static_cast<int>(mGuiCursorY), sdlButtonToMyGUI(button));
+        return MyGUI::InputManager::getInstance().injectMousePress(
+            static_cast<int>(mGuiCursorX),
+            static_cast<int>(mGuiCursorY),
+            SDLUtil::sdlMouseButtonToMyGui(button));
     }
 
     bool MouseManager::injectMouseButtonRelease(Uint8 button)
     {
-        return MyGUI::InputManager::getInstance().injectMouseRelease(static_cast<int>(mGuiCursorX), static_cast<int>(mGuiCursorY), sdlButtonToMyGUI(button));
+        return MyGUI::InputManager::getInstance().injectMouseRelease(
+            static_cast<int>(mGuiCursorX),
+            static_cast<int>(mGuiCursorY),
+            SDLUtil::sdlMouseButtonToMyGui(button));
     }
 
     void MouseManager::injectMouseMove(float xMove, float yMove, float mouseWheelMove)
diff --git a/apps/openmw/mwinput/sdlmappings.cpp b/apps/openmw/mwinput/sdlmappings.cpp
deleted file mode 100644
index 0c3f5c5d85..0000000000
--- a/apps/openmw/mwinput/sdlmappings.cpp
+++ /dev/null
@@ -1,218 +0,0 @@
-#include "sdlmappings.hpp"
-
-#include <map>
-
-#include <MyGUI_MouseButton.h>
-
-#include <SDL_gamecontroller.h>
-#include <SDL_mouse.h>
-
-namespace MWInput
-{
-    std::string sdlControllerButtonToString(int button)
-    {
-        switch(button)
-        {
-            case SDL_CONTROLLER_BUTTON_A:
-                return "A Button";
-            case SDL_CONTROLLER_BUTTON_B:
-                return "B Button";
-            case SDL_CONTROLLER_BUTTON_BACK:
-                return "Back Button";
-            case SDL_CONTROLLER_BUTTON_DPAD_DOWN:
-                return "DPad Down";
-            case SDL_CONTROLLER_BUTTON_DPAD_LEFT:
-                return "DPad Left";
-            case SDL_CONTROLLER_BUTTON_DPAD_RIGHT:
-                return "DPad Right";
-            case SDL_CONTROLLER_BUTTON_DPAD_UP:
-                return "DPad Up";
-            case SDL_CONTROLLER_BUTTON_GUIDE:
-                return "Guide Button";
-            case SDL_CONTROLLER_BUTTON_LEFTSHOULDER:
-                return "Left Shoulder";
-            case SDL_CONTROLLER_BUTTON_LEFTSTICK:
-                return "Left Stick Button";
-            case SDL_CONTROLLER_BUTTON_RIGHTSHOULDER:
-                return "Right Shoulder";
-            case SDL_CONTROLLER_BUTTON_RIGHTSTICK:
-                return "Right Stick Button";
-            case SDL_CONTROLLER_BUTTON_START:
-                return "Start Button";
-            case SDL_CONTROLLER_BUTTON_X:
-                return "X Button";
-            case SDL_CONTROLLER_BUTTON_Y:
-                return "Y Button";
-            default:
-                return "Button " + std::to_string(button);
-        }
-    }
-
-    std::string sdlControllerAxisToString(int axis)
-    {
-        switch(axis)
-        {
-            case SDL_CONTROLLER_AXIS_LEFTX:
-                return "Left Stick X";
-            case SDL_CONTROLLER_AXIS_LEFTY:
-                return "Left Stick Y";
-            case SDL_CONTROLLER_AXIS_RIGHTX:
-                return "Right Stick X";
-            case SDL_CONTROLLER_AXIS_RIGHTY:
-                return "Right Stick Y";
-            case SDL_CONTROLLER_AXIS_TRIGGERLEFT:
-                return "Left Trigger";
-            case SDL_CONTROLLER_AXIS_TRIGGERRIGHT:
-                return "Right Trigger";
-            default:
-                return "Axis " + std::to_string(axis);
-        }
-    }
-
-    MyGUI::MouseButton sdlButtonToMyGUI(Uint8 button)
-    {
-        //The right button is the second button, according to MyGUI
-        if(button == SDL_BUTTON_RIGHT)
-            button = SDL_BUTTON_MIDDLE;
-        else if(button == SDL_BUTTON_MIDDLE)
-            button = SDL_BUTTON_RIGHT;
-
-        //MyGUI's buttons are 0 indexed
-        return MyGUI::MouseButton::Enum(button - 1);
-    }
-
-    void initKeyMap(std::map<SDL_Keycode, MyGUI::KeyCode>& keyMap)
-    {
-        keyMap[SDLK_UNKNOWN] = MyGUI::KeyCode::None;
-        keyMap[SDLK_ESCAPE] = MyGUI::KeyCode::Escape;
-        keyMap[SDLK_1] = MyGUI::KeyCode::One;
-        keyMap[SDLK_2] = MyGUI::KeyCode::Two;
-        keyMap[SDLK_3] = MyGUI::KeyCode::Three;
-        keyMap[SDLK_4] = MyGUI::KeyCode::Four;
-        keyMap[SDLK_5] = MyGUI::KeyCode::Five;
-        keyMap[SDLK_6] = MyGUI::KeyCode::Six;
-        keyMap[SDLK_7] = MyGUI::KeyCode::Seven;
-        keyMap[SDLK_8] = MyGUI::KeyCode::Eight;
-        keyMap[SDLK_9] = MyGUI::KeyCode::Nine;
-        keyMap[SDLK_0] = MyGUI::KeyCode::Zero;
-        keyMap[SDLK_MINUS] = MyGUI::KeyCode::Minus;
-        keyMap[SDLK_EQUALS] = MyGUI::KeyCode::Equals;
-        keyMap[SDLK_BACKSPACE] = MyGUI::KeyCode::Backspace;
-        keyMap[SDLK_TAB] = MyGUI::KeyCode::Tab;
-        keyMap[SDLK_q] = MyGUI::KeyCode::Q;
-        keyMap[SDLK_w] = MyGUI::KeyCode::W;
-        keyMap[SDLK_e] = MyGUI::KeyCode::E;
-        keyMap[SDLK_r] = MyGUI::KeyCode::R;
-        keyMap[SDLK_t] = MyGUI::KeyCode::T;
-        keyMap[SDLK_y] = MyGUI::KeyCode::Y;
-        keyMap[SDLK_u] = MyGUI::KeyCode::U;
-        keyMap[SDLK_i] = MyGUI::KeyCode::I;
-        keyMap[SDLK_o] = MyGUI::KeyCode::O;
-        keyMap[SDLK_p] = MyGUI::KeyCode::P;
-        keyMap[SDLK_RETURN] = MyGUI::KeyCode::Return;
-        keyMap[SDLK_a] = MyGUI::KeyCode::A;
-        keyMap[SDLK_s] = MyGUI::KeyCode::S;
-        keyMap[SDLK_d] = MyGUI::KeyCode::D;
-        keyMap[SDLK_f] = MyGUI::KeyCode::F;
-        keyMap[SDLK_g] = MyGUI::KeyCode::G;
-        keyMap[SDLK_h] = MyGUI::KeyCode::H;
-        keyMap[SDLK_j] = MyGUI::KeyCode::J;
-        keyMap[SDLK_k] = MyGUI::KeyCode::K;
-        keyMap[SDLK_l] = MyGUI::KeyCode::L;
-        keyMap[SDLK_SEMICOLON] = MyGUI::KeyCode::Semicolon;
-        keyMap[SDLK_QUOTE] = MyGUI::KeyCode::Apostrophe;
-        keyMap[SDLK_BACKQUOTE] = MyGUI::KeyCode::Grave;
-        keyMap[SDLK_LSHIFT] = MyGUI::KeyCode::LeftShift;
-        keyMap[SDLK_BACKSLASH] = MyGUI::KeyCode::Backslash;
-        keyMap[SDLK_z] = MyGUI::KeyCode::Z;
-        keyMap[SDLK_x] = MyGUI::KeyCode::X;
-        keyMap[SDLK_c] = MyGUI::KeyCode::C;
-        keyMap[SDLK_v] = MyGUI::KeyCode::V;
-        keyMap[SDLK_b] = MyGUI::KeyCode::B;
-        keyMap[SDLK_n] = MyGUI::KeyCode::N;
-        keyMap[SDLK_m] = MyGUI::KeyCode::M;
-        keyMap[SDLK_COMMA] = MyGUI::KeyCode::Comma;
-        keyMap[SDLK_PERIOD] = MyGUI::KeyCode::Period;
-        keyMap[SDLK_SLASH] = MyGUI::KeyCode::Slash;
-        keyMap[SDLK_RSHIFT] = MyGUI::KeyCode::RightShift;
-        keyMap[SDLK_KP_MULTIPLY] = MyGUI::KeyCode::Multiply;
-        keyMap[SDLK_LALT] = MyGUI::KeyCode::LeftAlt;
-        keyMap[SDLK_SPACE] = MyGUI::KeyCode::Space;
-        keyMap[SDLK_CAPSLOCK] = MyGUI::KeyCode::Capital;
-        keyMap[SDLK_F1] = MyGUI::KeyCode::F1;
-        keyMap[SDLK_F2] = MyGUI::KeyCode::F2;
-        keyMap[SDLK_F3] = MyGUI::KeyCode::F3;
-        keyMap[SDLK_F4] = MyGUI::KeyCode::F4;
-        keyMap[SDLK_F5] = MyGUI::KeyCode::F5;
-        keyMap[SDLK_F6] = MyGUI::KeyCode::F6;
-        keyMap[SDLK_F7] = MyGUI::KeyCode::F7;
-        keyMap[SDLK_F8] = MyGUI::KeyCode::F8;
-        keyMap[SDLK_F9] = MyGUI::KeyCode::F9;
-        keyMap[SDLK_F10] = MyGUI::KeyCode::F10;
-        keyMap[SDLK_NUMLOCKCLEAR] = MyGUI::KeyCode::NumLock;
-        keyMap[SDLK_SCROLLLOCK] = MyGUI::KeyCode::ScrollLock;
-        keyMap[SDLK_KP_7] = MyGUI::KeyCode::Numpad7;
-        keyMap[SDLK_KP_8] = MyGUI::KeyCode::Numpad8;
-        keyMap[SDLK_KP_9] = MyGUI::KeyCode::Numpad9;
-        keyMap[SDLK_KP_MINUS] = MyGUI::KeyCode::Subtract;
-        keyMap[SDLK_KP_4] = MyGUI::KeyCode::Numpad4;
-        keyMap[SDLK_KP_5] = MyGUI::KeyCode::Numpad5;
-        keyMap[SDLK_KP_6] = MyGUI::KeyCode::Numpad6;
-        keyMap[SDLK_KP_PLUS] = MyGUI::KeyCode::Add;
-        keyMap[SDLK_KP_1] = MyGUI::KeyCode::Numpad1;
-        keyMap[SDLK_KP_2] = MyGUI::KeyCode::Numpad2;
-        keyMap[SDLK_KP_3] = MyGUI::KeyCode::Numpad3;
-        keyMap[SDLK_KP_0] = MyGUI::KeyCode::Numpad0;
-        keyMap[SDLK_KP_PERIOD] = MyGUI::KeyCode::Decimal;
-        keyMap[SDLK_F11] = MyGUI::KeyCode::F11;
-        keyMap[SDLK_F12] = MyGUI::KeyCode::F12;
-        keyMap[SDLK_F13] = MyGUI::KeyCode::F13;
-        keyMap[SDLK_F14] = MyGUI::KeyCode::F14;
-        keyMap[SDLK_F15] = MyGUI::KeyCode::F15;
-        keyMap[SDLK_KP_EQUALS] = MyGUI::KeyCode::NumpadEquals;
-        keyMap[SDLK_COLON] = MyGUI::KeyCode::Colon;
-        keyMap[SDLK_KP_ENTER] = MyGUI::KeyCode::NumpadEnter;
-        keyMap[SDLK_KP_DIVIDE] = MyGUI::KeyCode::Divide;
-        keyMap[SDLK_SYSREQ] = MyGUI::KeyCode::SysRq;
-        keyMap[SDLK_RALT] = MyGUI::KeyCode::RightAlt;
-        keyMap[SDLK_HOME] = MyGUI::KeyCode::Home;
-        keyMap[SDLK_UP] = MyGUI::KeyCode::ArrowUp;
-        keyMap[SDLK_PAGEUP] = MyGUI::KeyCode::PageUp;
-        keyMap[SDLK_LEFT] = MyGUI::KeyCode::ArrowLeft;
-        keyMap[SDLK_RIGHT] = MyGUI::KeyCode::ArrowRight;
-        keyMap[SDLK_END] = MyGUI::KeyCode::End;
-        keyMap[SDLK_DOWN] = MyGUI::KeyCode::ArrowDown;
-        keyMap[SDLK_PAGEDOWN] = MyGUI::KeyCode::PageDown;
-        keyMap[SDLK_INSERT] = MyGUI::KeyCode::Insert;
-        keyMap[SDLK_DELETE] = MyGUI::KeyCode::Delete;
-        keyMap[SDLK_APPLICATION] = MyGUI::KeyCode::AppMenu;
-
-//The function of the Ctrl and Meta keys are switched on macOS compared to other platforms.
-//For instance] = Cmd+C versus Ctrl+C to copy from the system clipboard
-#if defined(__APPLE__)
-        keyMap[SDLK_LGUI] = MyGUI::KeyCode::LeftControl;
-        keyMap[SDLK_RGUI] = MyGUI::KeyCode::RightControl;
-        keyMap[SDLK_LCTRL] = MyGUI::KeyCode::LeftWindows;
-        keyMap[SDLK_RCTRL] = MyGUI::KeyCode::RightWindows;
-#else
-        keyMap[SDLK_LGUI] = MyGUI::KeyCode::LeftWindows;
-        keyMap[SDLK_RGUI] = MyGUI::KeyCode::RightWindows;
-        keyMap[SDLK_LCTRL] = MyGUI::KeyCode::LeftControl;
-        keyMap[SDLK_RCTRL] = MyGUI::KeyCode::RightControl;
-#endif
-    }
-
-    MyGUI::KeyCode sdlKeyToMyGUI(SDL_Keycode code)
-    {
-        static std::map<SDL_Keycode, MyGUI::KeyCode> keyMap;
-        if (keyMap.empty())
-            initKeyMap(keyMap);
-
-        MyGUI::KeyCode kc = MyGUI::KeyCode::None;
-        auto foundKey = keyMap.find(code);
-        if (foundKey != keyMap.end())
-            kc = foundKey->second;
-
-        return kc;
-    }
-}
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index bdb22f2dc5..25b8f06331 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -146,7 +146,7 @@ add_component_dir (fontloader
     )
 
 add_component_dir (sdlutil
-    gl4es_init sdlgraphicswindow imagetosurface sdlinputwrapper sdlvideowrapper events sdlcursormanager
+    gl4es_init sdlgraphicswindow imagetosurface sdlinputwrapper sdlvideowrapper events sdlcursormanager sdlmappings
     )
 
 add_component_dir (version
diff --git a/components/lua_ui/widget.cpp b/components/lua_ui/widget.cpp
index 5653659287..6d7bb5063c 100644
--- a/components/lua_ui/widget.cpp
+++ b/components/lua_ui/widget.cpp
@@ -1,6 +1,7 @@
 #include "widget.hpp"
 
 #include <SDL_events.h>
+#include <components/sdlutil/sdlmappings.hpp>
 
 #include "text.hpp"
 #include "textedit.hpp"
@@ -87,9 +88,7 @@ namespace LuaUi
     sol::object WidgetExtension::keyEvent(MyGUI::KeyCode code) const
     {
         SDL_Keysym keySym;
-        // MyGUI key codes are not one to one with SDL key codes
-        // \todo refactor sdlmappings.cpp to map this back to SDL correctly
-        keySym.sym = static_cast<SDL_Keycode>(code.getValue());
+        keySym.sym = SDLUtil::myGuiKeyToSdl(code);
         keySym.scancode = SDL_GetScancodeFromKey(keySym.sym);
         keySym.mod = SDL_GetModState();
         return sol::make_object(mLua, keySym);
@@ -103,8 +102,7 @@ namespace LuaUi
         sol::table table = makeTable();
         table["position"] = position;
         table["offset"] = offset;
-        // \todo refactor sdlmappings.cpp to map this back to SDL properly
-        table["button"] = button.getValue() + 1;
+        table["button"] = SDLUtil::myGuiMouseButtonToSdl(button);
         return table;
     }
 
diff --git a/components/sdlutil/sdlmappings.cpp b/components/sdlutil/sdlmappings.cpp
new file mode 100644
index 0000000000..8306909ee5
--- /dev/null
+++ b/components/sdlutil/sdlmappings.cpp
@@ -0,0 +1,251 @@
+#include "sdlmappings.hpp"
+
+#include <map>
+
+#include <MyGUI_MouseButton.h>
+
+#include <SDL_gamecontroller.h>
+#include <SDL_mouse.h>
+
+namespace SDLUtil
+{
+    std::string sdlControllerButtonToString(int button)
+    {
+        switch(button)
+        {
+            case SDL_CONTROLLER_BUTTON_A:
+                return "A Button";
+            case SDL_CONTROLLER_BUTTON_B:
+                return "B Button";
+            case SDL_CONTROLLER_BUTTON_BACK:
+                return "Back Button";
+            case SDL_CONTROLLER_BUTTON_DPAD_DOWN:
+                return "DPad Down";
+            case SDL_CONTROLLER_BUTTON_DPAD_LEFT:
+                return "DPad Left";
+            case SDL_CONTROLLER_BUTTON_DPAD_RIGHT:
+                return "DPad Right";
+            case SDL_CONTROLLER_BUTTON_DPAD_UP:
+                return "DPad Up";
+            case SDL_CONTROLLER_BUTTON_GUIDE:
+                return "Guide Button";
+            case SDL_CONTROLLER_BUTTON_LEFTSHOULDER:
+                return "Left Shoulder";
+            case SDL_CONTROLLER_BUTTON_LEFTSTICK:
+                return "Left Stick Button";
+            case SDL_CONTROLLER_BUTTON_RIGHTSHOULDER:
+                return "Right Shoulder";
+            case SDL_CONTROLLER_BUTTON_RIGHTSTICK:
+                return "Right Stick Button";
+            case SDL_CONTROLLER_BUTTON_START:
+                return "Start Button";
+            case SDL_CONTROLLER_BUTTON_X:
+                return "X Button";
+            case SDL_CONTROLLER_BUTTON_Y:
+                return "Y Button";
+            default:
+                return "Button " + std::to_string(button);
+        }
+    }
+
+    std::string sdlControllerAxisToString(int axis)
+    {
+        switch(axis)
+        {
+            case SDL_CONTROLLER_AXIS_LEFTX:
+                return "Left Stick X";
+            case SDL_CONTROLLER_AXIS_LEFTY:
+                return "Left Stick Y";
+            case SDL_CONTROLLER_AXIS_RIGHTX:
+                return "Right Stick X";
+            case SDL_CONTROLLER_AXIS_RIGHTY:
+                return "Right Stick Y";
+            case SDL_CONTROLLER_AXIS_TRIGGERLEFT:
+                return "Left Trigger";
+            case SDL_CONTROLLER_AXIS_TRIGGERRIGHT:
+                return "Right Trigger";
+            default:
+                return "Axis " + std::to_string(axis);
+        }
+    }
+
+    MyGUI::MouseButton sdlMouseButtonToMyGui(Uint8 button)
+    {
+        //The right button is the second button, according to MyGUI
+        if(button == SDL_BUTTON_RIGHT)
+            button = SDL_BUTTON_MIDDLE;
+        else if(button == SDL_BUTTON_MIDDLE)
+            button = SDL_BUTTON_RIGHT;
+
+        //MyGUI's buttons are 0 indexed
+        return MyGUI::MouseButton::Enum(button - 1);
+    }
+
+    Uint8 myGuiMouseButtonToSdl(MyGUI::MouseButton button)
+    {
+        Uint8 value = button.getValue() + 1;
+        if (value == SDL_BUTTON_RIGHT)
+            value = SDL_BUTTON_MIDDLE;
+        else if (value == SDL_BUTTON_MIDDLE)
+            value = SDL_BUTTON_RIGHT;
+        return value;
+    }
+
+    namespace
+    {
+        std::map<SDL_Keycode, MyGUI::KeyCode> initKeyMap()
+        {
+            std::map<SDL_Keycode, MyGUI::KeyCode> keyMap;
+            keyMap[SDLK_UNKNOWN] = MyGUI::KeyCode::None;
+            keyMap[SDLK_ESCAPE] = MyGUI::KeyCode::Escape;
+            keyMap[SDLK_1] = MyGUI::KeyCode::One;
+            keyMap[SDLK_2] = MyGUI::KeyCode::Two;
+            keyMap[SDLK_3] = MyGUI::KeyCode::Three;
+            keyMap[SDLK_4] = MyGUI::KeyCode::Four;
+            keyMap[SDLK_5] = MyGUI::KeyCode::Five;
+            keyMap[SDLK_6] = MyGUI::KeyCode::Six;
+            keyMap[SDLK_7] = MyGUI::KeyCode::Seven;
+            keyMap[SDLK_8] = MyGUI::KeyCode::Eight;
+            keyMap[SDLK_9] = MyGUI::KeyCode::Nine;
+            keyMap[SDLK_0] = MyGUI::KeyCode::Zero;
+            keyMap[SDLK_MINUS] = MyGUI::KeyCode::Minus;
+            keyMap[SDLK_EQUALS] = MyGUI::KeyCode::Equals;
+            keyMap[SDLK_BACKSPACE] = MyGUI::KeyCode::Backspace;
+            keyMap[SDLK_TAB] = MyGUI::KeyCode::Tab;
+            keyMap[SDLK_q] = MyGUI::KeyCode::Q;
+            keyMap[SDLK_w] = MyGUI::KeyCode::W;
+            keyMap[SDLK_e] = MyGUI::KeyCode::E;
+            keyMap[SDLK_r] = MyGUI::KeyCode::R;
+            keyMap[SDLK_t] = MyGUI::KeyCode::T;
+            keyMap[SDLK_y] = MyGUI::KeyCode::Y;
+            keyMap[SDLK_u] = MyGUI::KeyCode::U;
+            keyMap[SDLK_i] = MyGUI::KeyCode::I;
+            keyMap[SDLK_o] = MyGUI::KeyCode::O;
+            keyMap[SDLK_p] = MyGUI::KeyCode::P;
+            keyMap[SDLK_RETURN] = MyGUI::KeyCode::Return;
+            keyMap[SDLK_a] = MyGUI::KeyCode::A;
+            keyMap[SDLK_s] = MyGUI::KeyCode::S;
+            keyMap[SDLK_d] = MyGUI::KeyCode::D;
+            keyMap[SDLK_f] = MyGUI::KeyCode::F;
+            keyMap[SDLK_g] = MyGUI::KeyCode::G;
+            keyMap[SDLK_h] = MyGUI::KeyCode::H;
+            keyMap[SDLK_j] = MyGUI::KeyCode::J;
+            keyMap[SDLK_k] = MyGUI::KeyCode::K;
+            keyMap[SDLK_l] = MyGUI::KeyCode::L;
+            keyMap[SDLK_SEMICOLON] = MyGUI::KeyCode::Semicolon;
+            keyMap[SDLK_QUOTE] = MyGUI::KeyCode::Apostrophe;
+            keyMap[SDLK_BACKQUOTE] = MyGUI::KeyCode::Grave;
+            keyMap[SDLK_LSHIFT] = MyGUI::KeyCode::LeftShift;
+            keyMap[SDLK_BACKSLASH] = MyGUI::KeyCode::Backslash;
+            keyMap[SDLK_z] = MyGUI::KeyCode::Z;
+            keyMap[SDLK_x] = MyGUI::KeyCode::X;
+            keyMap[SDLK_c] = MyGUI::KeyCode::C;
+            keyMap[SDLK_v] = MyGUI::KeyCode::V;
+            keyMap[SDLK_b] = MyGUI::KeyCode::B;
+            keyMap[SDLK_n] = MyGUI::KeyCode::N;
+            keyMap[SDLK_m] = MyGUI::KeyCode::M;
+            keyMap[SDLK_COMMA] = MyGUI::KeyCode::Comma;
+            keyMap[SDLK_PERIOD] = MyGUI::KeyCode::Period;
+            keyMap[SDLK_SLASH] = MyGUI::KeyCode::Slash;
+            keyMap[SDLK_RSHIFT] = MyGUI::KeyCode::RightShift;
+            keyMap[SDLK_KP_MULTIPLY] = MyGUI::KeyCode::Multiply;
+            keyMap[SDLK_LALT] = MyGUI::KeyCode::LeftAlt;
+            keyMap[SDLK_SPACE] = MyGUI::KeyCode::Space;
+            keyMap[SDLK_CAPSLOCK] = MyGUI::KeyCode::Capital;
+            keyMap[SDLK_F1] = MyGUI::KeyCode::F1;
+            keyMap[SDLK_F2] = MyGUI::KeyCode::F2;
+            keyMap[SDLK_F3] = MyGUI::KeyCode::F3;
+            keyMap[SDLK_F4] = MyGUI::KeyCode::F4;
+            keyMap[SDLK_F5] = MyGUI::KeyCode::F5;
+            keyMap[SDLK_F6] = MyGUI::KeyCode::F6;
+            keyMap[SDLK_F7] = MyGUI::KeyCode::F7;
+            keyMap[SDLK_F8] = MyGUI::KeyCode::F8;
+            keyMap[SDLK_F9] = MyGUI::KeyCode::F9;
+            keyMap[SDLK_F10] = MyGUI::KeyCode::F10;
+            keyMap[SDLK_NUMLOCKCLEAR] = MyGUI::KeyCode::NumLock;
+            keyMap[SDLK_SCROLLLOCK] = MyGUI::KeyCode::ScrollLock;
+            keyMap[SDLK_KP_7] = MyGUI::KeyCode::Numpad7;
+            keyMap[SDLK_KP_8] = MyGUI::KeyCode::Numpad8;
+            keyMap[SDLK_KP_9] = MyGUI::KeyCode::Numpad9;
+            keyMap[SDLK_KP_MINUS] = MyGUI::KeyCode::Subtract;
+            keyMap[SDLK_KP_4] = MyGUI::KeyCode::Numpad4;
+            keyMap[SDLK_KP_5] = MyGUI::KeyCode::Numpad5;
+            keyMap[SDLK_KP_6] = MyGUI::KeyCode::Numpad6;
+            keyMap[SDLK_KP_PLUS] = MyGUI::KeyCode::Add;
+            keyMap[SDLK_KP_1] = MyGUI::KeyCode::Numpad1;
+            keyMap[SDLK_KP_2] = MyGUI::KeyCode::Numpad2;
+            keyMap[SDLK_KP_3] = MyGUI::KeyCode::Numpad3;
+            keyMap[SDLK_KP_0] = MyGUI::KeyCode::Numpad0;
+            keyMap[SDLK_KP_PERIOD] = MyGUI::KeyCode::Decimal;
+            keyMap[SDLK_F11] = MyGUI::KeyCode::F11;
+            keyMap[SDLK_F12] = MyGUI::KeyCode::F12;
+            keyMap[SDLK_F13] = MyGUI::KeyCode::F13;
+            keyMap[SDLK_F14] = MyGUI::KeyCode::F14;
+            keyMap[SDLK_F15] = MyGUI::KeyCode::F15;
+            keyMap[SDLK_KP_EQUALS] = MyGUI::KeyCode::NumpadEquals;
+            keyMap[SDLK_COLON] = MyGUI::KeyCode::Colon;
+            keyMap[SDLK_KP_ENTER] = MyGUI::KeyCode::NumpadEnter;
+            keyMap[SDLK_KP_DIVIDE] = MyGUI::KeyCode::Divide;
+            keyMap[SDLK_SYSREQ] = MyGUI::KeyCode::SysRq;
+            keyMap[SDLK_RALT] = MyGUI::KeyCode::RightAlt;
+            keyMap[SDLK_HOME] = MyGUI::KeyCode::Home;
+            keyMap[SDLK_UP] = MyGUI::KeyCode::ArrowUp;
+            keyMap[SDLK_PAGEUP] = MyGUI::KeyCode::PageUp;
+            keyMap[SDLK_LEFT] = MyGUI::KeyCode::ArrowLeft;
+            keyMap[SDLK_RIGHT] = MyGUI::KeyCode::ArrowRight;
+            keyMap[SDLK_END] = MyGUI::KeyCode::End;
+            keyMap[SDLK_DOWN] = MyGUI::KeyCode::ArrowDown;
+            keyMap[SDLK_PAGEDOWN] = MyGUI::KeyCode::PageDown;
+            keyMap[SDLK_INSERT] = MyGUI::KeyCode::Insert;
+            keyMap[SDLK_DELETE] = MyGUI::KeyCode::Delete;
+            keyMap[SDLK_APPLICATION] = MyGUI::KeyCode::AppMenu;
+
+            //The function of the Ctrl and Meta keys are switched on macOS compared to other platforms.
+            //For instance] = Cmd+C versus Ctrl+C to copy from the system clipboard
+            #if defined(__APPLE__)
+            keyMap[SDLK_LGUI] = MyGUI::KeyCode::LeftControl;
+            keyMap[SDLK_RGUI] = MyGUI::KeyCode::RightControl;
+            keyMap[SDLK_LCTRL] = MyGUI::KeyCode::LeftWindows;
+            keyMap[SDLK_RCTRL] = MyGUI::KeyCode::RightWindows;
+            #else
+            keyMap[SDLK_LGUI] = MyGUI::KeyCode::LeftWindows;
+            keyMap[SDLK_RGUI] = MyGUI::KeyCode::RightWindows;
+            keyMap[SDLK_LCTRL] = MyGUI::KeyCode::LeftControl;
+            keyMap[SDLK_RCTRL] = MyGUI::KeyCode::RightControl;
+            #endif
+            return keyMap;
+        }
+
+        std::map<MyGUI::KeyCode, SDL_Keycode> reverseKeyMap(const std::map<SDL_Keycode, MyGUI::KeyCode>& map)
+        {
+            std::map<MyGUI::KeyCode, SDL_Keycode> result;
+            for (auto [sdl, mygui] : map)
+                result[mygui] = sdl;
+            return result;
+        }
+    }
+
+    MyGUI::KeyCode sdlKeyToMyGUI(SDL_Keycode code)
+    {
+        static std::map<SDL_Keycode, MyGUI::KeyCode> keyMap = initKeyMap();
+
+        MyGUI::KeyCode kc = MyGUI::KeyCode::None;
+        auto foundKey = keyMap.find(code);
+        if (foundKey != keyMap.end())
+            kc = foundKey->second;
+
+        return kc;
+    }
+
+    SDL_Keycode myGuiKeyToSdl(MyGUI::KeyCode button)
+    {
+        static auto keyMap = reverseKeyMap(initKeyMap());
+
+        SDL_Keycode kc = 0;
+        auto foundKey = keyMap.find(button);
+        if (foundKey != keyMap.end())
+            kc = foundKey->second;
+
+        return kc;
+    }
+}
diff --git a/apps/openmw/mwinput/sdlmappings.hpp b/components/sdlutil/sdlmappings.hpp
similarity index 50%
rename from apps/openmw/mwinput/sdlmappings.hpp
rename to components/sdlutil/sdlmappings.hpp
index 0cdd4694f5..3625075009 100644
--- a/apps/openmw/mwinput/sdlmappings.hpp
+++ b/components/sdlutil/sdlmappings.hpp
@@ -1,5 +1,5 @@
-#ifndef MWINPUT_SDLMAPPINGS_H
-#define MWINPUT_SDLMAPPINGS_H
+#ifndef SDLUTIL_SDLMAPPINGS
+#define SDLUTIL_SDLMAPPINGS
 
 #include <string>
 
@@ -12,14 +12,16 @@ namespace MyGUI
     struct MouseButton;
 }
 
-namespace MWInput
+namespace SDLUtil
 {
     std::string sdlControllerButtonToString(int button);
 
     std::string sdlControllerAxisToString(int axis);
 
-    MyGUI::MouseButton sdlButtonToMyGUI(Uint8 button);
+    MyGUI::MouseButton sdlMouseButtonToMyGui(Uint8 button);
+    Uint8 myGuiMouseButtonToSdl(MyGUI::MouseButton button);
 
     MyGUI::KeyCode sdlKeyToMyGUI(SDL_Keycode code);
+    SDL_Keycode myGuiKeyToSdl(MyGUI::KeyCode button);
 }
-#endif
+#endif // !SDLUTIL_SDLMAPPINGS

From dd15b30a27a1f759d00776a0173f246451a4077c Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sun, 5 Dec 2021 12:54:49 +0300
Subject: [PATCH 1820/2859] Keep only one '\0' in NIF strings (bug #6473)

---
 CHANGELOG.md                 | 1 +
 components/nif/nifstream.hpp | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d85fbc865..65caa921a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -87,6 +87,7 @@
     Bug #6429: Wyrmhaven: Can't add AI packages to player
     Bug #6433: Items bound to Quick Keys sometimes do not appear until the Quick Key menu is opened
     Bug #6451: Weapon summoned from Cast When Used item will have the name "None"
+    Bug #6473: Strings from NIF should be parsed only to first null terminator
     Feature #890: OpenMW-CS: Column filtering
     Feature #1465: "Reset" argument for AI functions
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
diff --git a/components/nif/nifstream.hpp b/components/nif/nifstream.hpp
index b6bf01ce58..04243c2506 100644
--- a/components/nif/nifstream.hpp
+++ b/components/nif/nifstream.hpp
@@ -149,6 +149,9 @@ public:
         inp->read(str.data(), length);
         if (inp->bad())
             throw std::runtime_error("Failed to read sized string of " + std::to_string(length) + " chars");
+        size_t end = str.find('\0');
+        if (end != std::string::npos)
+            str.erase(end);
         return str;
     }
     ///Read in a string of the length specified in the file

From e2ca5288c2ff9a05a868c2924a12bb9e20b4a560 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sun, 5 Dec 2021 13:19:36 +0000
Subject: [PATCH 1821/2859] Aggressively prune/expire unnecessary artifacts

---
 .gitlab-ci.yml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 349bb5ffa3..da77eccd31 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,6 +50,9 @@ Clang_Tidy:
     CXX: clang++
     CI_CLANG_TIDY: 1
   timeout: 8h
+  artifacts:
+    paths: []
+    expire_in: 1 minute
 
 Coverity:
   extends: .Debian_Image
@@ -73,6 +76,9 @@ Coverity:
   variables:
     CC: gcc
     CXX: g++
+  artifacts:
+    paths: []
+    expire_in: 1 minute
 
 Debian_GCC:
   extends: .Debian
@@ -94,6 +100,9 @@ Debian_GCC_tests:
   variables:
     CCACHE_SIZE: 1G
     BUILD_TESTS_ONLY: 1
+  artifacts:
+    paths: []
+    expire_in: 1 minute
 
 Debian_GCC_tests_Debug:
   extends: Debian_GCC
@@ -103,6 +112,9 @@ Debian_GCC_tests_Debug:
     CCACHE_SIZE: 1G
     BUILD_TESTS_ONLY: 1
     CMAKE_BUILD_TYPE: Debug
+  artifacts:
+    paths: []
+    expire_in: 1 minute
 
 Debian_GCC_Static_Deps:
   extends: Debian_GCC
@@ -125,6 +137,9 @@ Debian_GCC_Static_Deps_tests:
   variables:
     CCACHE_SIZE: 1G
     BUILD_TESTS_ONLY: 1
+  artifacts:
+    paths: []
+    expire_in: 1 minute
 
 Debian_Clang:
   extends: .Debian
@@ -146,6 +161,9 @@ Debian_Clang_tests:
   variables:
     CCACHE_SIZE: 1G
     BUILD_TESTS_ONLY: 1
+  artifacts:
+    paths: []
+    expire_in: 1 minute
 
 Debian_Clang_tests_Debug:
   extends: Debian_Clang
@@ -155,6 +173,9 @@ Debian_Clang_tests_Debug:
     CCACHE_SIZE: 1G
     BUILD_TESTS_ONLY: 1
     CMAKE_BUILD_TYPE: Debug
+  artifacts:
+    paths: []
+    expire_in: 1 minute
 
 .MacOS:
   image: macos-11-xcode-12
@@ -329,6 +350,9 @@ Windows_Ninja_Tests_RelWithDebInfo:
     config: "RelWithDebInfo"
     # Gitlab can't successfully execute following binaries due to unknown reason
     # executables: "openmw_test_suite.exe,openmw_detournavigator_navmeshtilescache_benchmark.exe"
+  artifacts:
+    paths: []
+    expire_in: 1 minute
 
 .Windows_MSBuild_Base:
   tags:
@@ -453,6 +477,9 @@ Windows_MSBuild_Tests_RelWithDebInfo:
     config: "RelWithDebInfo"
     # Gitlab can't successfully execute following binaries due to unknown reason
     # executables: "openmw_test_suite.exe,openmw_detournavigator_navmeshtilescache_benchmark.exe"
+  artifacts:
+    paths: []
+    expire_in: 1 minute
 
 Debian_AndroidNDK_arm64-v8a:
   tags:

From 99bfe024ef2f7503be21089b7827d520639f497f Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 5 Dec 2021 18:36:35 +0100
Subject: [PATCH 1822/2859] Cap temp disposition change properly

---
 apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index f1101d2566..e450e76483 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -718,7 +718,7 @@ namespace MWMechanics
         if (currentDisposition + tempChange < 0)
         {
             cappedDispositionChange = -currentDisposition;
-            tempChange = 0;
+            tempChange = cappedDispositionChange;
         }
 
         permChange = floor(cappedDispositionChange / fPerTempMult);

From 9d694c2184b0483d55a141cfd19cfb454a8a8c53 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sun, 5 Dec 2021 23:54:08 +0100
Subject: [PATCH 1823/2859] Show the coverity log in the CI

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index da77eccd31..6a87ea20b0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -73,6 +73,7 @@ Coverity:
       --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"
+    - cat /builds/OpenMW/openmw/cov-int/build-log.txt
   variables:
     CC: gcc
     CXX: g++

From 30a351a1181f95be267025e66dddf542004684c1 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sun, 5 Dec 2021 23:57:37 +0100
Subject: [PATCH 1824/2859] Remove the two last badges from the README

They're already proudly displayed on gitlab: https://gitlab.com/OpenMW/openmw
---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 638801b129..557cd614cd 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,6 @@
 OpenMW
 ======
 
-[![Coverity Scan Build Status](https://scan.coverity.com/projects/3740/badge.svg)](https://scan.coverity.com/projects/3740) [![pipeline status](https://gitlab.com/OpenMW/openmw/badges/master/pipeline.svg)](https://gitlab.com/OpenMW/openmw/commits/master)
-
 OpenMW is an open-source game engine that supports playing Morrowind by Bethesda Softworks. You need to own the game for OpenMW to play Morrowind.
 
 OpenMW also comes with OpenMW-CS, a replacement for Bethesda's Construction Set.

From 17560683c6e108e6aae972f901657d7b7e56ed0a Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Mon, 6 Dec 2021 11:07:53 +0100
Subject: [PATCH 1825/2859] Remove OSX 10.15

This has been broken for a while on gitlab's side.
---
 .gitlab-ci.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index da77eccd31..a6355b160e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -212,15 +212,6 @@ macOS11_Xcode12:
   variables:
     CCACHE_SIZE: 3G
 
-macOS10.15_Xcode11:
-  extends: .MacOS
-  image: macos-10.15-xcode-11
-  allow_failure: true
-  cache:
-    key: macOS10.15_Xcode11.v1
-  variables:
-    CCACHE_SIZE: 3G
-
 variables: &engine-targets
   targets: "openmw,openmw-iniimporter,openmw-launcher,openmw-wizard"
   package: "Engine"

From c844e5d0452c77deae3854139350db8efb92a94a Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Mon, 6 Dec 2021 13:46:56 +0000
Subject: [PATCH 1826/2859] Merge branch 'racer_recursion_limited' into
 'master'

Check if a leveled creature is in an unloaded cell before deciding it doesn't exist

Closes #4376

See merge request OpenMW/openmw!1420

(cherry picked from commit 782371cb2e7f6653d72305090033557b53bbcf3a)

6d945da7 Check if a leveled creature is in an unloaded cell before deciding it doesn't exist
---
 CHANGELOG.md                            |  1 +
 apps/openmw/mwclass/creaturelevlist.cpp |  8 +++++++-
 apps/openmw/mwworld/cellstore.cpp       | 14 ++++++++++++++
 apps/openmw/mwworld/cellstore.hpp       |  2 ++
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d85fbc865..5f5b59c9c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
     Bug #3855: AI sometimes spams defensive spells
     Bug #3905: Great House Dagoth issues
     Bug #4203: Resurrecting an actor should close the loot GUI
+    Bug #4376: Moved actors don't respawn in their original cells
     Bug #4389: NPC's lips do not move if his head model has the NiBSAnimationNode root node
     Bug #4602: Robert's Bodies: crash inside createInstance()
     Bug #4700: Editor: Incorrect command implementation
diff --git a/apps/openmw/mwclass/creaturelevlist.cpp b/apps/openmw/mwclass/creaturelevlist.cpp
index ddb5fd2b38..ee33242126 100644
--- a/apps/openmw/mwclass/creaturelevlist.cpp
+++ b/apps/openmw/mwclass/creaturelevlist.cpp
@@ -64,7 +64,13 @@ namespace MWClass
         if (customData.mSpawn)
             return;
 
-        MWWorld::Ptr creature = (customData.mSpawnActorId == -1) ? MWWorld::Ptr() : MWBase::Environment::get().getWorld()->searchPtrViaActorId(customData.mSpawnActorId);
+        MWWorld::Ptr creature;
+        if(customData.mSpawnActorId != -1)
+        {
+            creature = MWBase::Environment::get().getWorld()->searchPtrViaActorId(customData.mSpawnActorId);
+            if(creature.isEmpty())
+                creature = ptr.getCell()->getMovedActor(customData.mSpawnActorId);
+        }
         if (!creature.isEmpty())
         {
             const MWMechanics::CreatureStats& creatureStats = creature.getClass().getCreatureStats(creature);
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 052cc35b45..0c871e4f58 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -1195,4 +1195,18 @@ namespace MWWorld
                 || enchantment->mData.mType == ESM::Enchantment::WhenStrikes)
             mRechargingItems.emplace_back(ptr.getBase(), static_cast<float>(enchantment->mData.mCharge));
     }
+
+    Ptr MWWorld::CellStore::getMovedActor(int actorId) const
+    {
+        for(const auto& [cellRef, cell] : mMovedToAnotherCell)
+        {
+            if(cellRef->mClass->isActor() && cellRef->mData.getCustomData())
+            {
+                Ptr actor(cellRef, cell);
+                if(actor.getClass().getCreatureStats(actor).getActorId() == actorId)
+                    return actor;
+            }
+        }
+        return {};
+    }
 }
diff --git a/apps/openmw/mwworld/cellstore.hpp b/apps/openmw/mwworld/cellstore.hpp
index 6e927fbea6..d284a291a5 100644
--- a/apps/openmw/mwworld/cellstore.hpp
+++ b/apps/openmw/mwworld/cellstore.hpp
@@ -397,6 +397,8 @@ namespace MWWorld
             void respawn ();
             ///< Check mLastRespawn and respawn references if necessary. This is a no-op if the cell is not loaded.
 
+            Ptr getMovedActor(int actorId) const;
+
         private:
 
             /// Run through references and store IDs

From 0bbf9a5499ddd9700a56349a6d18a94d2c15f8bc Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Wed, 8 Dec 2021 07:53:10 +0000
Subject: [PATCH 1827/2859] Added !1420

---
 .resubmitted_merge_requests.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.resubmitted_merge_requests.txt b/.resubmitted_merge_requests.txt
index 93dda75f1d..5fd67c190c 100644
--- a/.resubmitted_merge_requests.txt
+++ b/.resubmitted_merge_requests.txt
@@ -1,4 +1,5 @@
 1450
+1420
 1314
 1216
 1172

From b62b144ec056605ae4a77c637b0d797ba3766b29 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Wed, 8 Dec 2021 09:06:10 +0000
Subject: [PATCH 1828/2859] Switch to Ubuntu Focal for now, until Debian gets
 latest MyGUI.

---
 .gitlab-ci.yml | 67 +++++++++++++++++++++++++++-----------------------
 1 file changed, 36 insertions(+), 31 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 41830c0b56..538bfa11ec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,17 +3,17 @@
 stages:
   - build
 
-.Debian_Image:
+.Ubuntu_Image:
   tags:
     - docker
     - linux
-  image: debian:bullseye
+  image: ubuntu:focal
   rules:
     - if: $CI_PIPELINE_SOURCE == "push"  
   
 
-.Debian:
-  extends: .Debian_Image
+.Ubuntu:
+  extends: .Ubuntu_Image
   cache:
     paths:
     - apt-cache/
@@ -35,11 +35,12 @@ stages:
       - build/install/
 
 Clang_Tidy:
-  extends: .Debian_Image
+  extends: .Ubuntu_Image
   stage: build
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule"'
   before_script:
+    - apt-get update; apt-get -y install software-properties-common; add-apt-repository -y ppa:openmw/openmw
     - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic clang-tidy clang
   script:
     - CI/before_script.linux.sh
@@ -55,11 +56,12 @@ Clang_Tidy:
     expire_in: 1 minute
 
 Coverity:
-  extends: .Debian_Image
+  extends: .Ubuntu_Image
   stage: build
   rules:
     - if: $CI_PIPELINE_SOURCE == "schedule"
   before_script:
+    - apt-get update; apt-get -y install software-properties-common; add-apt-repository -y ppa:openmw/openmw
     - 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
@@ -81,11 +83,12 @@ Coverity:
     paths: []
     expire_in: 1 minute
 
-Debian_GCC:
-  extends: .Debian
+Ubuntu_GCC:
+  extends: .Ubuntu
   cache:
-    key: Debian_GCC.v2
+    key: Ubuntu_GCC.v2
   before_script:
+    - apt-get update; apt-get -y install software-properties-common; add-apt-repository -y ppa:openmw/openmw
     - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic
   variables:
     CC: gcc
@@ -94,10 +97,10 @@ Debian_GCC:
   # 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
+Ubuntu_GCC_tests:
+  extends: Ubuntu_GCC
   cache:
-    key: Debian_GCC_tests.v2
+    key: Ubuntu_GCC_tests.v2
   variables:
     CCACHE_SIZE: 1G
     BUILD_TESTS_ONLY: 1
@@ -105,10 +108,10 @@ Debian_GCC_tests:
     paths: []
     expire_in: 1 minute
 
-Debian_GCC_tests_Debug:
-  extends: Debian_GCC
+Ubuntu_GCC_tests_Debug:
+  extends: Ubuntu_GCC
   cache:
-    key: Debian_GCC_tests_Debug.v1
+    key: Ubuntu_GCC_tests_Debug.v1
   variables:
     CCACHE_SIZE: 1G
     BUILD_TESTS_ONLY: 1
@@ -117,24 +120,25 @@ Debian_GCC_tests_Debug:
     paths: []
     expire_in: 1 minute
 
-Debian_GCC_Static_Deps:
-  extends: Debian_GCC
+Ubuntu_GCC_Static_Deps:
+  extends: Ubuntu_GCC
   cache:
-    key: Debian_GCC_Static_Deps
+    key: Ubuntu_GCC_Static_Deps
     paths:
     - apt-cache/
     - ccache/
     - build/extern/fetched/
   before_script:
+    - apt-get update; apt-get -y install software-properties-common; add-apt-repository -y ppa:openmw/openmw
     - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-static
   variables:
     CI_OPENMW_USE_STATIC_DEPS: 1
   timeout: 3h
 
-Debian_GCC_Static_Deps_tests:
-  extends: Debian_GCC_Static_Deps
+Ubuntu_GCC_Static_Deps_tests:
+  extends: Ubuntu_GCC_Static_Deps
   cache:
-    key: Debian_GCC_Static_Deps_tests
+    key: Ubuntu_GCC_Static_Deps_tests
   variables:
     CCACHE_SIZE: 1G
     BUILD_TESTS_ONLY: 1
@@ -142,12 +146,13 @@ Debian_GCC_Static_Deps_tests:
     paths: []
     expire_in: 1 minute
 
-Debian_Clang:
-  extends: .Debian
+Ubuntu_Clang:
+  extends: .Ubuntu
   before_script:
+    - apt-get update; apt-get -y install software-properties-common; add-apt-repository -y ppa:openmw/openmw
     - CI/install_debian_deps.sh clang openmw-deps openmw-deps-dynamic
   cache:
-    key: Debian_Clang.v2
+    key: Ubuntu_Clang.v2
   variables:
     CC: clang
     CXX: clang++
@@ -155,10 +160,10 @@ Debian_Clang:
   # 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
+Ubuntu_Clang_tests:
+  extends: Ubuntu_Clang
   cache:
-    key: Debian_Clang_tests.v2
+    key: Ubuntu_Clang_tests.v2
   variables:
     CCACHE_SIZE: 1G
     BUILD_TESTS_ONLY: 1
@@ -166,10 +171,10 @@ Debian_Clang_tests:
     paths: []
     expire_in: 1 minute
 
-Debian_Clang_tests_Debug:
-  extends: Debian_Clang
+Ubuntu_Clang_tests_Debug:
+  extends: Ubuntu_Clang
   cache:
-    key: Debian_Clang_tests_Debug.v1
+    key: Ubuntu_Clang_tests_Debug.v1
   variables:
     CCACHE_SIZE: 1G
     BUILD_TESTS_ONLY: 1
@@ -473,7 +478,7 @@ Windows_MSBuild_Tests_RelWithDebInfo:
     paths: []
     expire_in: 1 minute
 
-Debian_AndroidNDK_arm64-v8a:
+Ubuntu_AndroidNDK_arm64-v8a:
   tags:
     - linux
   image: psi29a/android-ndk:focal-ndk22

From a9bf53d4ed986212d19ee38f5a0b9022f4b908af Mon Sep 17 00:00:00 2001
From: Bret Curtis <bret.curtis@gmail.com>
Date: Tue, 7 Dec 2021 11:31:41 +0100
Subject: [PATCH 1829/2859] modified builtin_scripts to be macOS aware;
 simplified things as the SHADER and MYGUI dir were just pointing to the
 OpenMW_BINARY_DIR anyway, so removing the code duplication

---
 CMakeLists.txt                       |  5 ++---
 apps/opencs/CMakeLists.txt           |  3 +--
 apps/openmw/CMakeLists.txt           |  3 +--
 files/builtin_scripts/CMakeLists.txt | 24 ++++++++++++++++++------
 files/mygui/CMakeLists.txt           |  4 ++--
 files/shaders/CMakeLists.txt         |  4 ++--
 files/vfs/CMakeLists.txt             |  4 ++--
 7 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f19b2a54f..d1da593883 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -445,9 +445,8 @@ if (APPLE)
         "${APP_BUNDLE_DIR}/Contents/Resources/OpenMW.icns" COPYONLY)
 endif (APPLE)
 
-if (NOT APPLE)
-    set(OPENMW_MYGUI_FILES_ROOT ${OpenMW_BINARY_DIR})
-    set(OPENMW_SHADERS_ROOT ${OpenMW_BINARY_DIR})
+if (NOT APPLE)  # this is modified for macOS use later in "apps/open[mw|cs]/CMakeLists.txt"
+    set(OPENMW_BINARY_ROOT ${OpenMW_BINARY_DIR})
 endif ()
 
 add_subdirectory(files/)
diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 952bbbdbda..521cf495f7 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -183,8 +183,7 @@ if(APPLE)
     set(OPENCS_BUNDLE_NAME "OpenMW-CS")
     set(OPENCS_BUNDLE_RESOURCES_DIR "${OpenMW_BINARY_DIR}/${OPENCS_BUNDLE_NAME}.app/Contents/Resources")
 
-    set(OPENMW_MYGUI_FILES_ROOT ${OPENCS_BUNDLE_RESOURCES_DIR})
-    set(OPENMW_SHADERS_ROOT ${OPENCS_BUNDLE_RESOURCES_DIR})
+    set(OPENMW_BINARY_ROOT ${OPENCS_BUNDLE_RESOURCES_DIR})
 
     add_subdirectory(../../files/ ${CMAKE_CURRENT_BINARY_DIR}/files)
 
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index c8ce797587..fc5e6af325 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -179,8 +179,7 @@ endif()
 if(APPLE)
     set(BUNDLE_RESOURCES_DIR "${APP_BUNDLE_DIR}/Contents/Resources")
 
-    set(OPENMW_MYGUI_FILES_ROOT ${BUNDLE_RESOURCES_DIR})
-    set(OPENMW_SHADERS_ROOT ${BUNDLE_RESOURCES_DIR})
+    set(OPENMW_BINARY_ROOT ${BUNDLE_RESOURCES_DIR})
 
     add_subdirectory(../../files/ ${CMAKE_CURRENT_BINARY_DIR}/files)
 
diff --git a/files/builtin_scripts/CMakeLists.txt b/files/builtin_scripts/CMakeLists.txt
index 5906680e1b..3e531c680e 100644
--- a/files/builtin_scripts/CMakeLists.txt
+++ b/files/builtin_scripts/CMakeLists.txt
@@ -1,8 +1,20 @@
-file(GLOB_RECURSE BUILTIN_SCRIPTS LIST_DIRECTORIES false RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} CONFIGURE_DEPENDS "*")
+if (NOT DEFINED OPENMW_BINARY_ROOT)
+    return()
+endif()
 
-foreach (f ${BUILTIN_SCRIPTS})
-    if (NOT ("CMakeLists.txt" STREQUAL "${f}"))
-        copy_resource_file("${CMAKE_CURRENT_SOURCE_DIR}/${f}" "${OpenMW_BINARY_DIR}" "resources/vfs/${f}")
-    endif()
-endforeach (f)
+# Copy resource files into the build directory
+set(SDIR ${CMAKE_CURRENT_SOURCE_DIR})
+set(DDIRRELATIVE resources/vfs)
+copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_BINARY_ROOT} ${DDIRRELATIVE} "builtin.omwscripts")
 
+set(DDIRRELATIVE resources/vfs/openmw_aux)
+copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_BINARY_ROOT} ${DDIRRELATIVE} "openmw_aux/util.lua")
+
+set(LUA_SCRIPTS_FILES
+    scripts/omw/camera.lua
+    scripts/omw/head_bobbing.lua
+    scripts/omw/third_person.lua
+)
+
+set(DDIRRELATIVE resources/vfs/scripts/omw)
+copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_BINARY_ROOT} ${DDIRRELATIVE} "${LUA_SCRIPTS_FILES}")
diff --git a/files/mygui/CMakeLists.txt b/files/mygui/CMakeLists.txt
index 49b833e382..cac1691aa3 100644
--- a/files/mygui/CMakeLists.txt
+++ b/files/mygui/CMakeLists.txt
@@ -1,4 +1,4 @@
-if (NOT DEFINED OPENMW_MYGUI_FILES_ROOT)
+if (NOT DEFINED OPENMW_BINARY_ROOT)
     return()
 endif()
 
@@ -97,4 +97,4 @@ set(MYGUI_FILES
 )
 
 
-copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_MYGUI_FILES_ROOT} ${DDIRRELATIVE} "${MYGUI_FILES}")
+copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_BINARY_ROOT} ${DDIRRELATIVE} "${MYGUI_FILES}")
diff --git a/files/shaders/CMakeLists.txt b/files/shaders/CMakeLists.txt
index 6e19263a38..f00b52d024 100644
--- a/files/shaders/CMakeLists.txt
+++ b/files/shaders/CMakeLists.txt
@@ -1,4 +1,4 @@
-if (NOT DEFINED OPENMW_SHADERS_ROOT)
+if (NOT DEFINED OPENMW_BINARY_ROOT)
     return()
 endif()
 
@@ -42,4 +42,4 @@ set(SHADER_FILES
     softparticles.glsl
 )
 
-copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_SHADERS_ROOT} ${DDIRRELATIVE} "${SHADER_FILES}")
+copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_BINARY_ROOT} ${DDIRRELATIVE} "${SHADER_FILES}")
diff --git a/files/vfs/CMakeLists.txt b/files/vfs/CMakeLists.txt
index a97210d1df..0139138c04 100644
--- a/files/vfs/CMakeLists.txt
+++ b/files/vfs/CMakeLists.txt
@@ -1,4 +1,4 @@
-if (NOT DEFINED OPENMW_MYGUI_FILES_ROOT)
+if (NOT DEFINED OPENMW_BINARY_ROOT)
     return()
 endif()
 
@@ -15,4 +15,4 @@ set(TEXTURE_FILES
     textures/omw_menu_scroll_center_v.dds
 )
 
-copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_MYGUI_FILES_ROOT} ${DDIRRELATIVE} "${TEXTURE_FILES}")
+copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_BINARY_ROOT} ${DDIRRELATIVE} "${TEXTURE_FILES}")

From 93366269271f13f658a05e7175979387f71683f9 Mon Sep 17 00:00:00 2001
From: Bret Curtis <bret.curtis@gmail.com>
Date: Wed, 8 Dec 2021 14:33:49 +0100
Subject: [PATCH 1830/2859] use OPENMW_RESOURCES_ROOT instead

---
 CMakeLists.txt                       | 2 +-
 apps/opencs/CMakeLists.txt           | 2 +-
 apps/openmw/CMakeLists.txt           | 2 +-
 files/builtin_scripts/CMakeLists.txt | 8 ++++----
 files/mygui/CMakeLists.txt           | 4 ++--
 files/shaders/CMakeLists.txt         | 4 ++--
 files/vfs/CMakeLists.txt             | 4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d1da593883..644a7419a8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -446,7 +446,7 @@ if (APPLE)
 endif (APPLE)
 
 if (NOT APPLE)  # this is modified for macOS use later in "apps/open[mw|cs]/CMakeLists.txt"
-    set(OPENMW_BINARY_ROOT ${OpenMW_BINARY_DIR})
+    set(OPENMW_RESOURCES_ROOT ${OpenMW_BINARY_DIR})
 endif ()
 
 add_subdirectory(files/)
diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 521cf495f7..b3d405d1a3 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -183,7 +183,7 @@ if(APPLE)
     set(OPENCS_BUNDLE_NAME "OpenMW-CS")
     set(OPENCS_BUNDLE_RESOURCES_DIR "${OpenMW_BINARY_DIR}/${OPENCS_BUNDLE_NAME}.app/Contents/Resources")
 
-    set(OPENMW_BINARY_ROOT ${OPENCS_BUNDLE_RESOURCES_DIR})
+    set(OPENMW_RESOURCES_ROOT ${OPENCS_BUNDLE_RESOURCES_DIR})
 
     add_subdirectory(../../files/ ${CMAKE_CURRENT_BINARY_DIR}/files)
 
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index fc5e6af325..94babb6ab1 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -179,7 +179,7 @@ endif()
 if(APPLE)
     set(BUNDLE_RESOURCES_DIR "${APP_BUNDLE_DIR}/Contents/Resources")
 
-    set(OPENMW_BINARY_ROOT ${BUNDLE_RESOURCES_DIR})
+    set(OPENMW_RESOURCES_ROOT ${BUNDLE_RESOURCES_DIR})
 
     add_subdirectory(../../files/ ${CMAKE_CURRENT_BINARY_DIR}/files)
 
diff --git a/files/builtin_scripts/CMakeLists.txt b/files/builtin_scripts/CMakeLists.txt
index 3e531c680e..6f290cc1f7 100644
--- a/files/builtin_scripts/CMakeLists.txt
+++ b/files/builtin_scripts/CMakeLists.txt
@@ -1,14 +1,14 @@
-if (NOT DEFINED OPENMW_BINARY_ROOT)
+if (NOT DEFINED OPENMW_RESOURCES_ROOT)
     return()
 endif()
 
 # Copy resource files into the build directory
 set(SDIR ${CMAKE_CURRENT_SOURCE_DIR})
 set(DDIRRELATIVE resources/vfs)
-copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_BINARY_ROOT} ${DDIRRELATIVE} "builtin.omwscripts")
+copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_ROOT} ${DDIRRELATIVE} "builtin.omwscripts")
 
 set(DDIRRELATIVE resources/vfs/openmw_aux)
-copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_BINARY_ROOT} ${DDIRRELATIVE} "openmw_aux/util.lua")
+copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_ROOT} ${DDIRRELATIVE} "openmw_aux/util.lua")
 
 set(LUA_SCRIPTS_FILES
     scripts/omw/camera.lua
@@ -17,4 +17,4 @@ set(LUA_SCRIPTS_FILES
 )
 
 set(DDIRRELATIVE resources/vfs/scripts/omw)
-copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_BINARY_ROOT} ${DDIRRELATIVE} "${LUA_SCRIPTS_FILES}")
+copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_ROOT} ${DDIRRELATIVE} "${LUA_SCRIPTS_FILES}")
diff --git a/files/mygui/CMakeLists.txt b/files/mygui/CMakeLists.txt
index cac1691aa3..bdf7558cf7 100644
--- a/files/mygui/CMakeLists.txt
+++ b/files/mygui/CMakeLists.txt
@@ -1,4 +1,4 @@
-if (NOT DEFINED OPENMW_BINARY_ROOT)
+if (NOT DEFINED OPENMW_RESOURCES_ROOT)
     return()
 endif()
 
@@ -97,4 +97,4 @@ set(MYGUI_FILES
 )
 
 
-copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_BINARY_ROOT} ${DDIRRELATIVE} "${MYGUI_FILES}")
+copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_ROOT} ${DDIRRELATIVE} "${MYGUI_FILES}")
diff --git a/files/shaders/CMakeLists.txt b/files/shaders/CMakeLists.txt
index f00b52d024..73929486cd 100644
--- a/files/shaders/CMakeLists.txt
+++ b/files/shaders/CMakeLists.txt
@@ -1,4 +1,4 @@
-if (NOT DEFINED OPENMW_BINARY_ROOT)
+if (NOT DEFINED OPENMW_RESOURCES_ROOT)
     return()
 endif()
 
@@ -42,4 +42,4 @@ set(SHADER_FILES
     softparticles.glsl
 )
 
-copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_BINARY_ROOT} ${DDIRRELATIVE} "${SHADER_FILES}")
+copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_ROOT} ${DDIRRELATIVE} "${SHADER_FILES}")
diff --git a/files/vfs/CMakeLists.txt b/files/vfs/CMakeLists.txt
index 0139138c04..15dcb80ec1 100644
--- a/files/vfs/CMakeLists.txt
+++ b/files/vfs/CMakeLists.txt
@@ -1,4 +1,4 @@
-if (NOT DEFINED OPENMW_BINARY_ROOT)
+if (NOT DEFINED OPENMW_RESOURCES_ROOT)
     return()
 endif()
 
@@ -15,4 +15,4 @@ set(TEXTURE_FILES
     textures/omw_menu_scroll_center_v.dds
 )
 
-copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_BINARY_ROOT} ${DDIRRELATIVE} "${TEXTURE_FILES}")
+copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_ROOT} ${DDIRRELATIVE} "${TEXTURE_FILES}")

From 4b67fe5351f9037e2e2f49bad4ff85b25d4412ad Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 8 Dec 2021 17:18:08 +0100
Subject: [PATCH 1831/2859] Actually remove effects before proclaiming they've
 been removed

---
 apps/openmw/mwmechanics/spelleffects.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp
index d41cf82a9c..3b352a710b 100644
--- a/apps/openmw/mwmechanics/spelleffects.cpp
+++ b/apps/openmw/mwmechanics/spelleffects.cpp
@@ -796,12 +796,16 @@ MagicApplicationResult applyMagicEffect(const MWWorld::Ptr& target, const MWWorl
     {
         if(target == getPlayer())
             MWBase::Environment::get().getWindowManager()->messageBox ("#{sLevitateDisabled}");
+        onMagicEffectRemoved(target, spellParams, effect);
         return MagicApplicationResult::REMOVED;
     }
     else if(effect.mEffectId == ESM::MagicEffect::AlmsiviIntervention || effect.mEffectId == ESM::MagicEffect::DivineIntervention || effect.mEffectId == ESM::MagicEffect::Recall)
     {
         if(effect.mFlags & ESM::ActiveEffect::Flag_Applied)
+        {
+            onMagicEffectRemoved(target, spellParams, effect);
             return MagicApplicationResult::REMOVED;
+        }
     }
     const auto* magicEffect = world->getStore().get<ESM::MagicEffect>().find(effect.mEffectId);
     if(effect.mFlags & ESM::ActiveEffect::Flag_Applied)

From 5129ab39fcd7bde0961a4b5fb51822aa336efef4 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 9 Dec 2021 00:06:28 +0100
Subject: [PATCH 1832/2859] Check extension in lower case

---
 components/esmloader/load.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/esmloader/load.cpp b/components/esmloader/load.cpp
index cc3e011d3d..842cc8003a 100644
--- a/components/esmloader/load.cpp
+++ b/components/esmloader/load.cpp
@@ -218,7 +218,7 @@ namespace EsmLoader
             for (std::size_t i = 0; i < contentFiles.size(); ++i)
             {
                 const std::string &file = contentFiles[i];
-                const std::string extension = boost::filesystem::path(file).extension().string();
+                const std::string extension = Misc::StringUtils::lowerCase(boost::filesystem::path(file).extension().string());
 
                 if (supportedFormats.find(extension) == supportedFormats.end())
                 {

From fd025f69911ebe1f372d862f619d7318b7d15fcc Mon Sep 17 00:00:00 2001
From: Thomas Lowe <musicaltommy@gmail.com>
Date: Wed, 8 Dec 2021 18:55:31 -0500
Subject: [PATCH 1833/2859] Added my name to authors list!

---
 AUTHORS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS.md b/AUTHORS.md
index 8ca9db90b9..8ed88a8c22 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -215,6 +215,7 @@ Programmers
     tlmullis
     tri4ng1e
     Thoronador
+    Tom Lowe (Vulpen)
     Tom Mason (wheybags)
     Torben Leif Carrington (TorbenC)
     unelsson

From 221e425fe664a6981b3b37ee8a303d0b9c1ac354 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Thu, 9 Dec 2021 14:59:17 +0000
Subject: [PATCH 1834/2859] Only precompile headers with MSVC

---
 apps/openmw/CMakeLists.txt | 2 +-
 components/CMakeLists.txt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 94babb6ab1..b54ecb416c 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -155,7 +155,7 @@ target_link_libraries(openmw
     components
 )
 
-if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16)
+if (MSVC AND CMAKE_VERSION VERSION_GREATER_EQUAL 3.16)
     target_precompile_headers(openmw PRIVATE ${SOL_INCLUDE_DIR}/sol/sol.hpp)
 endif ()
 
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index cea215fe42..e980eb5532 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -373,6 +373,6 @@ if(USE_QT)
     set_property(TARGET components_qt PROPERTY AUTOMOC ON)
 endif(USE_QT)
 
-if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16)
+if (MSVC AND CMAKE_VERSION VERSION_GREATER_EQUAL 3.16)
     target_precompile_headers(components PRIVATE ${SOL_INCLUDE_DIR}/sol/sol.hpp)
 endif ()

From 810ad9d3fbc1be23f879f3cf79d99ba35dafd8fa Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Thu, 9 Dec 2021 20:05:33 +0100
Subject: [PATCH 1835/2859] Silence apt-get install

---
 CI/install_debian_deps.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CI/install_debian_deps.sh b/CI/install_debian_deps.sh
index a8843207d9..370f7f23ed 100755
--- a/CI/install_debian_deps.sh
+++ b/CI/install_debian_deps.sh
@@ -64,5 +64,5 @@ 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[@]}"
+apt-get update -yqq
+apt-get -qq -o dir::cache::archives="$APT_CACHE_DIR" install -y --no-install-recommends "${deps[@]}"

From f007025cedcfd1b24a3cb8d2c14d063c58035a6c Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 9 Dec 2021 21:05:55 +0100
Subject: [PATCH 1836/2859] Add job ID to discord notification

To easily track down where it comes from.
---
 scripts/find_missing_merge_requests.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/scripts/find_missing_merge_requests.py b/scripts/find_missing_merge_requests.py
index be54750098..1cca15c03b 100755
--- a/scripts/find_missing_merge_requests.py
+++ b/scripts/find_missing_merge_requests.py
@@ -14,6 +14,8 @@ import urllib.parse
               help='Path to text file with Gitlab token.')
 @click.option('--project_id', type=int, default=7107382,
               help='Gitlab project id.')
+@click.option('--job_id', type=int, default=os.getenv('CI_JOB_ID'),
+              help='Gitlab job id.')
 @click.option('--host', type=str, default='gitlab.com',
               help='Gitlab host.')
 @click.option('--workers', type=int, default=10,
@@ -28,7 +30,7 @@ import urllib.parse
               help='Number of merge requests per page.')
 @click.option('--ignored_mrs_path', type=str,
               help='Path to a list of ignored MRs.')
-def main(token_path, project_id, host, workers, target_branch, begin_page, end_page, per_page, ignored_mrs_path):
+def main(token_path, project_id, job_id, host, workers, target_branch, begin_page, end_page, per_page, ignored_mrs_path):
     headers = make_headers(token_path)
     base_url = f'https://{host}/api/v4/projects/{project_id}/'
     discord_webhook_url = os.getenv('DISCORD_WEBHOOK_URL')
@@ -67,7 +69,8 @@ def main(token_path, project_id, host, workers, target_branch, begin_page, end_p
     if discord_webhook_url is not None and missing_mrs:
         project_web_url = parse_gitlab_response(requests.get(url=base_url, headers=headers))['web_url'] + '/'
         discord_message = format_discord_message(missing=missing, filtered=filtered, target_branch=target_branch,
-                                                 project_web_url=project_web_url, missing_mrs=missing_mrs)
+                                                 project_web_url=project_web_url, missing_mrs=missing_mrs,
+                                                 job_id=job_id)
         print('Sending Discord notification...')
         print(discord_message)
         discord_webhook.DiscordWebhook(url=discord_webhook_url, content=discord_message, rate_limit_retry=True).execute()
@@ -75,10 +78,11 @@ def main(token_path, project_id, host, workers, target_branch, begin_page, end_p
         exit(-1)
 
 
-def format_discord_message(missing, filtered, target_branch, project_web_url, missing_mrs):
+def format_discord_message(missing, filtered, target_branch, project_web_url, missing_mrs, job_id):
     target_branch = format_link(target_branch, urllib.parse.urljoin(project_web_url, f'-/tree/{target_branch}'))
+    job = f' by job ' + format_link(job_id, urllib.parse.urljoin(project_web_url, f'-/jobs/{job_id}')) if job_id else ''
     return (
-        f'Found {missing} missing MRs out of {filtered} from {target_branch} target branch:\n'
+        f'Found {missing} missing MRs out of {filtered} from {target_branch} target branch{job}:\n'
         + '\n'.join(format_missing_mr_message(v, project_web_url) for v in missing_mrs)
     )
 

From 9257c27fe124e1edb5fdf08dc71cb48799e3de3a Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Fri, 10 Dec 2021 18:51:37 +0100
Subject: [PATCH 1837/2859] Move target checking code so it applies to all
 sources

---
 apps/openmw/mwmechanics/spellcasting.cpp |  3 --
 apps/openmw/mwmechanics/spelleffects.cpp | 60 +++++++++++++++++++-----
 apps/openmw/mwmechanics/spellutil.cpp    | 44 -----------------
 apps/openmw/mwmechanics/spellutil.hpp    |  3 --
 4 files changed, 47 insertions(+), 63 deletions(-)

diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index 2edc437752..c99eee43d5 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -128,9 +128,6 @@ namespace MWMechanics
             }
             canCastAnEffect = true;
 
-            if (!checkEffectTarget(effectIt->mEffectID, target, caster, castByPlayer))
-                continue;
-
             // caster needs to be an actor for linked effects (e.g. Absorb)
             if (magicEffect->mData.mFlags & ESM::MagicEffect::CasterLinked
                     && (caster.isEmpty() || !caster.getClass().isActor()))
diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp
index 3b352a710b..aef6b26f19 100644
--- a/apps/openmw/mwmechanics/spelleffects.cpp
+++ b/apps/openmw/mwmechanics/spelleffects.cpp
@@ -774,6 +774,45 @@ void applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, co
     }
 }
 
+bool shouldRemoveEffect(const MWWorld::Ptr& target, const ESM::ActiveEffect& effect)
+{
+    const auto world = MWBase::Environment::get().getWorld();
+    switch(effect.mEffectId)
+    {
+        case ESM::MagicEffect::Levitate:
+        {
+            if(!world->isLevitationEnabled())
+            {
+                if(target == getPlayer())
+                    MWBase::Environment::get().getWindowManager()->messageBox("#{sLevitateDisabled}");
+                return true;
+            }
+            break;
+        }
+        case ESM::MagicEffect::Recall:
+        case ESM::MagicEffect::DivineIntervention:
+        case ESM::MagicEffect::AlmsiviIntervention:
+        {
+            return effect.mFlags & ESM::ActiveEffect::Flag_Applied;
+        }
+        case ESM::MagicEffect::WaterWalking:
+        {
+            if (target.getClass().isPureWaterCreature(target) && world->isSwimming(target))
+                return true;
+            if (effect.mFlags & ESM::ActiveEffect::Flag_Applied)
+                break;
+            if (!world->isWaterWalkingCastableOnTarget(target))
+            {
+                if(target == getPlayer())
+                    MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicInvalidEffect}");
+                return true;
+            }
+            break;
+        }
+    }
+    return false;
+}
+
 MagicApplicationResult applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, ActiveSpells::ActiveSpellParams& spellParams, ESM::ActiveEffect& effect, float dt)
 {
     const auto world = MWBase::Environment::get().getWorld();
@@ -792,21 +831,11 @@ MagicApplicationResult applyMagicEffect(const MWWorld::Ptr& target, const MWWorl
             MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicCorprusWorsens}");
         return MagicApplicationResult::APPLIED;
     }
-    else if(effect.mEffectId == ESM::MagicEffect::Levitate && !world->isLevitationEnabled())
+    else if(shouldRemoveEffect(target, effect))
     {
-        if(target == getPlayer())
-            MWBase::Environment::get().getWindowManager()->messageBox ("#{sLevitateDisabled}");
         onMagicEffectRemoved(target, spellParams, effect);
         return MagicApplicationResult::REMOVED;
     }
-    else if(effect.mEffectId == ESM::MagicEffect::AlmsiviIntervention || effect.mEffectId == ESM::MagicEffect::DivineIntervention || effect.mEffectId == ESM::MagicEffect::Recall)
-    {
-        if(effect.mFlags & ESM::ActiveEffect::Flag_Applied)
-        {
-            onMagicEffectRemoved(target, spellParams, effect);
-            return MagicApplicationResult::REMOVED;
-        }
-    }
     const auto* magicEffect = world->getStore().get<ESM::MagicEffect>().find(effect.mEffectId);
     if(effect.mFlags & ESM::ActiveEffect::Flag_Applied)
     {
@@ -883,8 +912,13 @@ MagicApplicationResult applyMagicEffect(const MWWorld::Ptr& target, const MWWorl
         float oldMagnitude = 0.f;
         if(effect.mFlags & ESM::ActiveEffect::Flag_Applied)
             oldMagnitude = effect.mMagnitude;
-        else if(spellParams.getType() == ESM::ActiveSpells::Type_Consumable || spellParams.getType() == ESM::ActiveSpells::Type_Temporary)
-            playEffects(target, *magicEffect);
+        else
+        {
+            if(spellParams.getType() == ESM::ActiveSpells::Type_Consumable || spellParams.getType() == ESM::ActiveSpells::Type_Temporary)
+                playEffects(target, *magicEffect);
+            if(effect.mEffectId == ESM::MagicEffect::Soultrap && !target.getClass().isNpc() && target.getType() == ESM::Creature::sRecordId && target.get<ESM::Creature>()->mBase->mData.mSoul == 0 && caster == getPlayer())
+                MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicInvalidTarget}");
+        }
         float magnitude = roll(effect);
         //Note that there's an early out for Flag_Applied AppliedOnce effects so we don't have to exclude them here
         effect.mMagnitude = magnitude;
diff --git a/apps/openmw/mwmechanics/spellutil.cpp b/apps/openmw/mwmechanics/spellutil.cpp
index 70167abcd3..3c4f094be4 100644
--- a/apps/openmw/mwmechanics/spellutil.cpp
+++ b/apps/openmw/mwmechanics/spellutil.cpp
@@ -199,48 +199,4 @@ namespace MWMechanics
         const auto spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(spellId);
         return spell && spellIncreasesSkill(spell);
     }
-
-    bool checkEffectTarget (int effectId, const MWWorld::Ptr& target, const MWWorld::Ptr& caster, bool castByPlayer)
-    {
-        switch (effectId)
-        {
-            case ESM::MagicEffect::Levitate:
-            {
-                if (!MWBase::Environment::get().getWorld()->isLevitationEnabled())
-                {
-                    if (castByPlayer)
-                        MWBase::Environment::get().getWindowManager()->messageBox("#{sLevitateDisabled}");
-                    return false;
-                }
-                break;
-            }
-            case ESM::MagicEffect::Soultrap:
-            {
-                if (!target.getClass().isNpc() // no messagebox for NPCs
-                     && (target.getType() == ESM::Creature::sRecordId && target.get<ESM::Creature>()->mBase->mData.mSoul == 0))
-                {
-                    if (castByPlayer)
-                        MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicInvalidTarget}");
-                    return true; // must still apply to get visual effect and have target regard it as attack
-                }
-                break;
-            }
-            case ESM::MagicEffect::WaterWalking:
-            {
-                if (target.getClass().isPureWaterCreature(target) && MWBase::Environment::get().getWorld()->isSwimming(target))
-                    return false;
-
-                MWBase::World *world = MWBase::Environment::get().getWorld();
-
-                if (!world->isWaterWalkingCastableOnTarget(target))
-                {
-                    if (castByPlayer && caster == target)
-                        MWBase::Environment::get().getWindowManager()->messageBox ("#{sMagicInvalidEffect}");
-                    return false;
-                }
-                break;
-            }
-        }
-        return true;
-    }
 }
diff --git a/apps/openmw/mwmechanics/spellutil.hpp b/apps/openmw/mwmechanics/spellutil.hpp
index 81f39b6dda..bcc531087c 100644
--- a/apps/openmw/mwmechanics/spellutil.hpp
+++ b/apps/openmw/mwmechanics/spellutil.hpp
@@ -48,9 +48,6 @@ namespace MWMechanics
     /// Get whether or not the given spell contributes to skill progress.
     bool spellIncreasesSkill(const ESM::Spell* spell);
     bool spellIncreasesSkill(const std::string& spellId);
-
-    /// Check if the given effect can be applied to the target. If \a castByPlayer, emits a message box on failure.
-    bool checkEffectTarget (int effectId, const MWWorld::Ptr& target, const MWWorld::Ptr& caster, bool castByPlayer);
 }
 
 #endif

From 5a6b39f8e054bf9280cf4300f6271d700b77bf64 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 4 Nov 2021 01:57:27 +0100
Subject: [PATCH 1838/2859] Store mesh source data in recast mesh

---
 .../detournavigator/navmeshtilescache.cpp     |  2 +-
 apps/openmw/mwphysics/ptrholder.hpp           |  2 +-
 apps/openmw/mwworld/scene.cpp                 | 25 +++++++----
 apps/openmw/mwworld/worldimp.cpp              |  4 +-
 .../detournavigator/navigator.cpp             | 37 +++++++++--------
 .../detournavigator/navmeshtilescache.cpp     | 41 ++++++++++---------
 .../detournavigator/recastmeshbuilder.cpp     | 35 +++++++++-------
 .../detournavigator/recastmeshobject.cpp      |  8 ++--
 .../tilecachedrecastmeshmanager.cpp           | 41 ++++++++++---------
 components/CMakeLists.txt                     |  1 +
 components/detournavigator/areatype.hpp       | 15 +++++++
 components/detournavigator/navigator.hpp      | 13 ++++--
 components/detournavigator/navigatorimpl.cpp  |  8 ++--
 .../detournavigator/objecttransform.hpp       | 27 ++++++++++++
 components/detournavigator/recastmesh.cpp     |  4 +-
 components/detournavigator/recastmesh.hpp     | 15 ++++++-
 .../detournavigator/recastmeshbuilder.cpp     | 10 ++++-
 .../detournavigator/recastmeshbuilder.hpp     |  8 +++-
 .../detournavigator/recastmeshmanager.cpp     | 10 +++--
 .../detournavigator/recastmeshobject.cpp      |  3 +-
 .../detournavigator/recastmeshobject.hpp      | 22 +++++++---
 components/esm/defs.hpp                       |  8 ++++
 components/misc/convert.hpp                   |  5 +++
 23 files changed, 236 insertions(+), 108 deletions(-)
 create mode 100644 components/detournavigator/objecttransform.hpp

diff --git a/apps/benchmarks/detournavigator/navmeshtilescache.cpp b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
index 9d41b62597..c27fdc4289 100644
--- a/apps/benchmarks/detournavigator/navmeshtilescache.cpp
+++ b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
@@ -145,7 +145,7 @@ namespace
         std::vector<CellWater> water;
         generateWater(std::back_inserter(water), 1, random);
         RecastMesh recastMesh(generation, revision, std::move(mesh), std::move(water),
-                              {generateHeightfield(random)}, {generateFlatHeightfield(random)});
+                              {generateHeightfield(random)}, {generateFlatHeightfield(random)}, {});
         return Key {agentHalfExtents, tilePosition, std::move(recastMesh)};
     }
 
diff --git a/apps/openmw/mwphysics/ptrholder.hpp b/apps/openmw/mwphysics/ptrholder.hpp
index fcd6ce203a..e194f8e934 100644
--- a/apps/openmw/mwphysics/ptrholder.hpp
+++ b/apps/openmw/mwphysics/ptrholder.hpp
@@ -20,7 +20,7 @@ namespace MWPhysics
             mPtr = updated;
         }
 
-        MWWorld::Ptr getPtr()
+        MWWorld::Ptr getPtr() const
         {
             return mPtr;
         }
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 15b3477cb8..c3db62b5a9 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -64,14 +64,23 @@ namespace
                 * osg::Quat(zr, osg::Vec3(0, 0, -1));
     }
 
-    osg::Quat makeNodeRotation(const MWWorld::Ptr& ptr, RotationOrder order)
+    osg::Quat makeInverseNodeRotation(const MWWorld::Ptr& ptr)
     {
         const auto pos = ptr.getRefData().getPosition();
+        return ptr.getClass().isActor() ? makeActorOsgQuat(pos) : makeInversedOrderObjectOsgQuat(pos);
+    }
 
-        const auto rot = ptr.getClass().isActor() ? makeActorOsgQuat(pos)
-            : (order == RotationOrder::inverse ? makeInversedOrderObjectOsgQuat(pos) : Misc::Convert::makeOsgQuat(pos));
+    osg::Quat makeDirectNodeRotation(const MWWorld::Ptr& ptr)
+    {
+        const auto pos = ptr.getRefData().getPosition();
+        return ptr.getClass().isActor() ? makeActorOsgQuat(pos) : Misc::Convert::makeOsgQuat(pos);
+    }
 
-        return rot;
+    osg::Quat makeNodeRotation(const MWWorld::Ptr& ptr, RotationOrder order)
+    {
+        if (order == RotationOrder::inverse)
+            return makeInverseNodeRotation(ptr);
+        return makeDirectNodeRotation(ptr);
     }
 
     void setNodeRotation(const MWWorld::Ptr& ptr, MWRender::RenderingManager& rendering, const osg::Quat &rotation)
@@ -101,7 +110,7 @@ namespace
         }
 
         std::string model = getModel(ptr, rendering.getResourceSystem()->getVFS());
-        const auto rotation = makeNodeRotation(ptr, RotationOrder::direct);
+        const auto rotation = makeDirectNodeRotation(ptr);
 
         const ESM::RefNum& refnum = ptr.getCellRef().getRefNum();
         if (!refnum.hasContentFile() || pagedRefs.find(refnum) == pagedRefs.end())
@@ -128,6 +137,8 @@ namespace
     {
         if (const auto object = physics.getObject(ptr))
         {
+            const DetourNavigator::ObjectTransform objectTransform {ptr.getRefData().getPosition(), ptr.getCellRef().getScale()};
+
             if (ptr.getClass().isDoor() && !ptr.getCellRef().getTeleport())
             {
                 btVector3 aabbMin;
@@ -159,7 +170,7 @@ namespace
 
                 navigator.addObject(
                     DetourNavigator::ObjectId(object),
-                    DetourNavigator::DoorShapes(object->getShapeInstance(), connectionStart, connectionEnd),
+                    DetourNavigator::DoorShapes(object->getShapeInstance(), objectTransform, connectionStart, connectionEnd),
                     transform
                 );
             }
@@ -167,7 +178,7 @@ namespace
             {
                 navigator.addObject(
                     DetourNavigator::ObjectId(object),
-                    DetourNavigator::ObjectShapes(object->getShapeInstance()),
+                    DetourNavigator::ObjectShapes(object->getShapeInstance(), objectTransform),
                     object->getTransform()
                 );
             }
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index f0ac894cfc..d08eef2904 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1533,7 +1533,9 @@ namespace MWWorld
 
     void World::updateNavigatorObject(const MWPhysics::Object& object)
     {
-        const DetourNavigator::ObjectShapes shapes(object.getShapeInstance());
+        const MWWorld::Ptr ptr = object.getPtr();
+        const DetourNavigator::ObjectShapes shapes(object.getShapeInstance(),
+            DetourNavigator::ObjectTransform {ptr.getRefData().getPosition(), ptr.getCellRef().getScale()});
         mShouldUpdateNavigator = mNavigator->updateObject(DetourNavigator::ObjectId(&object), shapes, object.getTransform())
             || mShouldUpdateNavigator;
     }
diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index 4e2b7758ff..07dcbb2002 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -49,6 +49,7 @@ namespace
         const int mHeightfieldTileSize = ESM::Land::REAL_SIZE / (ESM::Land::LAND_SIZE - 1);
         const float mEndTolerance = 0;
         const btTransform mTransform {btMatrix3x3::getIdentity(), btVector3(256, 256, 0)};
+        const ObjectTransform mObjectTransform {ESM::Position {{256, 256, 0}, {0, 0, 0}}, 0.0f};
 
         DetourNavigatorNavigatorTest()
             : mPlayerPosition(256, 256, 0)
@@ -258,7 +259,7 @@ namespace
             Vec3fEq(460, 56.66666412353515625, 1.99998295307159423828125)
         )) << mPath;
 
-        mNavigator->addObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance()), mTransform);
+        mNavigator->addObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance(), mObjectTransform), mTransform);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -311,7 +312,7 @@ namespace
 
         mNavigator->addAgent(mAgentHalfExtents);
         mNavigator->addHeightfield(mCellPosition, cellSize, surface);
-        mNavigator->addObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance()), mTransform);
+        mNavigator->addObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance(), mObjectTransform), mTransform);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -346,7 +347,7 @@ namespace
 
         compound.shape().updateChildTransform(0, btTransform(btMatrix3x3::getIdentity(), btVector3(1000, 0, 0)));
 
-        mNavigator->updateObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance()), mTransform);
+        mNavigator->updateObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance(), mObjectTransform), mTransform);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -404,8 +405,8 @@ namespace
         heightfield2.shape().setLocalScaling(btVector3(128, 128, 1));
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addObject(ObjectId(&heightfield1.shape()), ObjectShapes(heightfield1.instance()), mTransform);
-        mNavigator->addObject(ObjectId(&heightfield2.shape()), ObjectShapes(heightfield2.instance()), mTransform);
+        mNavigator->addObject(ObjectId(&heightfield1.shape()), ObjectShapes(heightfield1.instance(), mObjectTransform), mTransform);
+        mNavigator->addObject(ObjectId(&heightfield2.shape()), ObjectShapes(heightfield2.instance(), mObjectTransform), mTransform);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -494,7 +495,7 @@ namespace
         osg::ref_ptr<const Resource::BulletShapeInstance> instance(new Resource::BulletShapeInstance(bulletShape));
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addObject(ObjectId(instance->mCollisionShape.get()), ObjectShapes(instance), mTransform);
+        mNavigator->addObject(ObjectId(instance->mCollisionShape.get()), ObjectShapes(instance, mObjectTransform), mTransform);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -725,7 +726,7 @@ namespace
         heightfield.shape().setLocalScaling(btVector3(128, 128, 1));
 
         mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addObject(ObjectId(&heightfield.shape()), ObjectShapes(heightfield.instance()), mTransform);
+        mNavigator->addObject(ObjectId(&heightfield.shape()), ObjectShapes(heightfield.instance(), mObjectTransform), mTransform);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -733,7 +734,7 @@ namespace
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        mNavigator->addObject(ObjectId(&heightfield.shape()), ObjectShapes(heightfield.instance()), mTransform);
+        mNavigator->addObject(ObjectId(&heightfield.shape()), ObjectShapes(heightfield.instance(), mObjectTransform), mTransform);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -876,7 +877,7 @@ namespace
         for (std::size_t i = 0; i < boxes.size(); ++i)
         {
             const btTransform transform(btMatrix3x3::getIdentity(), btVector3(shift.x() + i * 10, shift.y() + i * 10, i * 10));
-            mNavigator->addObject(ObjectId(&boxes[i].shape()), ObjectShapes(boxes[i].instance()), transform);
+            mNavigator->addObject(ObjectId(&boxes[i].shape()), ObjectShapes(boxes[i].instance(), mObjectTransform), transform);
         }
 
         std::this_thread::sleep_for(std::chrono::microseconds(1));
@@ -884,7 +885,7 @@ namespace
         for (std::size_t i = 0; i < boxes.size(); ++i)
         {
             const btTransform transform(btMatrix3x3::getIdentity(), btVector3(shift.x() + i * 10 + 1, shift.y() + i * 10 + 1, i * 10 + 1));
-            mNavigator->updateObject(ObjectId(&boxes[i].shape()), ObjectShapes(boxes[i].instance()), transform);
+            mNavigator->updateObject(ObjectId(&boxes[i].shape()), ObjectShapes(boxes[i].instance(), mObjectTransform), transform);
         }
 
         mNavigator->update(mPlayerPosition);
@@ -930,7 +931,7 @@ namespace
         for (std::size_t i = 0; i < shapes.size(); ++i)
         {
             const btTransform transform(btMatrix3x3::getIdentity(), btVector3(i * 32, i * 32, i * 32));
-            mNavigator->addObject(ObjectId(&shapes[i].shape()), ObjectShapes(shapes[i].instance()), transform);
+            mNavigator->addObject(ObjectId(&shapes[i].shape()), ObjectShapes(shapes[i].instance(), mObjectTransform), transform);
         }
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
@@ -939,7 +940,7 @@ namespace
         for (std::size_t i = 0; i < shapes.size(); ++i)
         {
             const btTransform transform(btMatrix3x3::getIdentity(), btVector3(i * 32 + 1, i * 32 + 1, i * 32 + 1));
-            mNavigator->updateObject(ObjectId(&shapes[i].shape()), ObjectShapes(shapes[i].instance()), transform);
+            mNavigator->updateObject(ObjectId(&shapes[i].shape()), ObjectShapes(shapes[i].instance(), mObjectTransform), transform);
         }
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
@@ -947,7 +948,7 @@ namespace
         for (std::size_t i = 0; i < shapes.size(); ++i)
         {
             const btTransform transform(btMatrix3x3::getIdentity(), btVector3(i * 32 + 2, i * 32 + 2, i * 32 + 2));
-            mNavigator->updateObject(ObjectId(&shapes[i].shape()), ObjectShapes(shapes[i].instance()), transform);
+            mNavigator->updateObject(ObjectId(&shapes[i].shape()), ObjectShapes(shapes[i].instance(), mObjectTransform), transform);
         }
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
@@ -1001,10 +1002,10 @@ namespace
 
         mNavigator->addAgent(mAgentHalfExtents);
         mNavigator->addHeightfield(mCellPosition, cellSize, surface);
-        mNavigator->addObject(ObjectId(&oscillatingBox.shape()), ObjectShapes(oscillatingBox.instance()),
+        mNavigator->addObject(ObjectId(&oscillatingBox.shape()), ObjectShapes(oscillatingBox.instance(), mObjectTransform),
                               btTransform(btMatrix3x3::getIdentity(), oscillatingBoxShapePosition));
         // add this box to make navmesh bound box independent from oscillatingBoxShape rotations
-        mNavigator->addObject(ObjectId(&borderBox.shape()), ObjectShapes(borderBox.instance()),
+        mNavigator->addObject(ObjectId(&borderBox.shape()), ObjectShapes(borderBox.instance(), mObjectTransform),
                               btTransform(btMatrix3x3::getIdentity(), oscillatingBoxShapePosition + btVector3(0, 0, 200)));
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
@@ -1019,7 +1020,7 @@ namespace
         {
             const btTransform transform(btQuaternion(btVector3(0, 0, 1), n * 2 * osg::PI / 10),
                                         oscillatingBoxShapePosition);
-            mNavigator->updateObject(ObjectId(&oscillatingBox.shape()), ObjectShapes(oscillatingBox.instance()), transform);
+            mNavigator->updateObject(ObjectId(&oscillatingBox.shape()), ObjectShapes(oscillatingBox.instance(), mObjectTransform), transform);
             mNavigator->update(mPlayerPosition);
             mNavigator->wait(mListener, WaitConditionType::allJobsDone);
         }
@@ -1085,7 +1086,7 @@ namespace
 
         mNavigator->addAgent(mAgentHalfExtents);
         mNavigator->addHeightfield(mCellPosition, cellSize, surface);
-        mNavigator->addObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance()), mTransform);
+        mNavigator->addObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance(), mObjectTransform), mTransform);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
@@ -1124,7 +1125,7 @@ namespace
 
         mNavigator->addAgent(mAgentHalfExtents);
         mNavigator->addHeightfield(mCellPosition, cellSize, surface);
-        mNavigator->addObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance()), mTransform);
+        mNavigator->addObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance(), mObjectTransform), mTransform);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
diff --git a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
index c56be440e3..2a7c5ac5a1 100644
--- a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
+++ b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
@@ -147,7 +147,8 @@ namespace
         const std::vector<CellWater> mWater {};
         const std::vector<Heightfield> mHeightfields {};
         const std::vector<FlatHeightfield> mFlatHeightfields {};
-        const RecastMesh mRecastMesh {mGeneration, mRevision, mMesh, mWater, mHeightfields, mFlatHeightfields};
+        const std::vector<MeshSource> mSources {};
+        const RecastMesh mRecastMesh {mGeneration, mRevision, mMesh, mWater, mHeightfields, mFlatHeightfields, mSources};
         std::unique_ptr<PreparedNavMeshData> mPreparedNavMeshData {makePeparedNavMeshData(3)};
 
         const std::size_t mRecastMeshSize = sizeof(mRecastMesh) + getSize(mRecastMesh);
@@ -235,7 +236,7 @@ namespace
         const std::size_t maxSize = 1;
         NavMeshTilesCache cache(maxSize);
         const std::vector<CellWater> water(1, CellWater {osg::Vec2i(), Water {1, 0.0f}});
-        const RecastMesh unexistentRecastMesh {mGeneration, mRevision, mMesh, water, mHeightfields, mFlatHeightfields};
+        const RecastMesh unexistentRecastMesh(mGeneration, mRevision, mMesh, water, mHeightfields, mFlatHeightfields, mSources);
 
         cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
         EXPECT_FALSE(cache.get(mAgentHalfExtents, mTilePosition, unexistentRecastMesh));
@@ -247,7 +248,7 @@ namespace
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<CellWater> water(1, CellWater {osg::Vec2i(), Water {1, 0.0f}});
-        const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, water, mHeightfields, mFlatHeightfields};
+        const RecastMesh anotherRecastMesh(mGeneration, mRevision, mMesh, water, mHeightfields, mFlatHeightfields, mSources);
         auto anotherPreparedNavMeshData = makePeparedNavMeshData(3);
         const auto copy = clone(*anotherPreparedNavMeshData);
 
@@ -265,7 +266,7 @@ namespace
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<CellWater> water(1, CellWater {osg::Vec2i(), Water {1, 0.0f}});
-        const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, water, mHeightfields, mFlatHeightfields};
+        const RecastMesh anotherRecastMesh(mGeneration, mRevision, mMesh, water, mHeightfields, mFlatHeightfields, mSources);
         auto anotherPreparedNavMeshData = makePeparedNavMeshData(3);
 
         const auto value = cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh,
@@ -281,13 +282,13 @@ namespace
         const auto copy = clone(*mPreparedNavMeshData);
 
         const std::vector<CellWater> leastRecentlySetWater(1, CellWater {osg::Vec2i(), Water {1, 0.0f}});
-        const RecastMesh leastRecentlySetRecastMesh {mGeneration, mRevision, mMesh, leastRecentlySetWater,
-                    mHeightfields, mFlatHeightfields};
+        const RecastMesh leastRecentlySetRecastMesh(mGeneration, mRevision, mMesh, leastRecentlySetWater,
+                    mHeightfields, mFlatHeightfields, mSources);
         auto leastRecentlySetData = makePeparedNavMeshData(3);
 
         const std::vector<CellWater> mostRecentlySetWater(1, CellWater {osg::Vec2i(), Water {2, 0.0f}});
-        const RecastMesh mostRecentlySetRecastMesh {mGeneration, mRevision, mMesh, mostRecentlySetWater,
-                    mHeightfields, mFlatHeightfields};
+        const RecastMesh mostRecentlySetRecastMesh(mGeneration, mRevision, mMesh, mostRecentlySetWater,
+                    mHeightfields, mFlatHeightfields, mSources);
         auto mostRecentlySetData = makePeparedNavMeshData(3);
 
         ASSERT_TRUE(cache.set(mAgentHalfExtents, mTilePosition, leastRecentlySetRecastMesh,
@@ -309,14 +310,14 @@ namespace
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<CellWater> leastRecentlyUsedWater(1, CellWater {osg::Vec2i(), Water {1, 0.0f}});
-        const RecastMesh leastRecentlyUsedRecastMesh {mGeneration, mRevision, mMesh, leastRecentlyUsedWater,
-                    mHeightfields, mFlatHeightfields};
+        const RecastMesh leastRecentlyUsedRecastMesh(mGeneration, mRevision, mMesh, leastRecentlyUsedWater,
+                    mHeightfields, mFlatHeightfields, mSources);
         auto leastRecentlyUsedData = makePeparedNavMeshData(3);
         const auto leastRecentlyUsedCopy = clone(*leastRecentlyUsedData);
 
         const std::vector<CellWater> mostRecentlyUsedWater(1, CellWater {osg::Vec2i(), Water {2, 0.0f}});
-        const RecastMesh mostRecentlyUsedRecastMesh {mGeneration, mRevision, mMesh, mostRecentlyUsedWater,
-                    mHeightfields, mFlatHeightfields};
+        const RecastMesh mostRecentlyUsedRecastMesh(mGeneration, mRevision, mMesh, mostRecentlyUsedWater,
+                    mHeightfields, mFlatHeightfields, mSources);
         auto mostRecentlyUsedData = makePeparedNavMeshData(3);
         const auto mostRecentlyUsedCopy = clone(*mostRecentlyUsedData);
 
@@ -350,8 +351,8 @@ namespace
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<CellWater> water(1, CellWater {osg::Vec2i(), Water {1, 0.0f}});
-        const RecastMesh tooLargeRecastMesh {mGeneration, mRevision, mMesh, water,
-                    mHeightfields, mFlatHeightfields};
+        const RecastMesh tooLargeRecastMesh(mGeneration, mRevision, mMesh, water,
+                    mHeightfields, mFlatHeightfields, mSources);
         auto tooLargeData = makePeparedNavMeshData(10);
 
         cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
@@ -365,13 +366,13 @@ namespace
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<CellWater> anotherWater(1, CellWater {osg::Vec2i(), Water {1, 0.0f}});
-        const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, anotherWater,
-                    mHeightfields, mFlatHeightfields};
+        const RecastMesh anotherRecastMesh(mGeneration, mRevision, mMesh, anotherWater,
+                    mHeightfields, mFlatHeightfields, mSources);
         auto anotherData = makePeparedNavMeshData(3);
 
         const std::vector<CellWater> tooLargeWater(1, CellWater {osg::Vec2i(), Water {2, 0.0f}});
-        const RecastMesh tooLargeRecastMesh {mGeneration, mRevision, mMesh, tooLargeWater,
-                    mHeightfields, mFlatHeightfields};
+        const RecastMesh tooLargeRecastMesh(mGeneration, mRevision, mMesh, tooLargeWater,
+                    mHeightfields, mFlatHeightfields, mSources);
         auto tooLargeData = makePeparedNavMeshData(10);
 
         const auto value = cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh,
@@ -391,7 +392,7 @@ namespace
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<CellWater> water(1, CellWater {osg::Vec2i(), Water {1, 0.0f}});
-        const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, water, mHeightfields, mFlatHeightfields};
+        const RecastMesh anotherRecastMesh(mGeneration, mRevision, mMesh, water, mHeightfields, mFlatHeightfields, mSources);
         auto anotherData = makePeparedNavMeshData(3);
 
         const auto firstCopy = cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
@@ -410,7 +411,7 @@ namespace
         NavMeshTilesCache cache(maxSize);
 
         const std::vector<CellWater> water(1, CellWater {osg::Vec2i(), Water {1, 0.0f}});
-        const RecastMesh anotherRecastMesh {mGeneration, mRevision, mMesh, water, mHeightfields, mFlatHeightfields};
+        const RecastMesh anotherRecastMesh(mGeneration, mRevision, mMesh, water, mHeightfields, mFlatHeightfields, mSources);
         auto anotherData = makePeparedNavMeshData(3);
 
         cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
diff --git a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
index ad28bf4053..39e57234a3 100644
--- a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
+++ b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
@@ -89,6 +89,8 @@ namespace
         TileBounds mBounds;
         const std::size_t mGeneration = 0;
         const std::size_t mRevision = 0;
+        const osg::ref_ptr<const Resource::BulletShape> mSource {nullptr};
+        const ObjectTransform mObjectTransform {ESM::Position {{0, 0, 0}, {0, 0, 0}}, 0.0f};
 
         DetourNavigatorRecastMeshBuilderTest()
         {
@@ -115,7 +117,8 @@ namespace
         btBvhTriangleMeshShape shape(&mesh, true);
 
         RecastMeshBuilder builder(mBounds);
-        builder.addObject(static_cast<const btCollisionShape&>(shape), btTransform::getIdentity(), AreaType_ground);
+        builder.addObject(static_cast<const btCollisionShape&>(shape), btTransform::getIdentity(),
+                          AreaType_ground, mSource, mObjectTransform);
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
             -1, -1, 0,
@@ -135,7 +138,7 @@ namespace
         builder.addObject(
             static_cast<const btCollisionShape&>(shape),
             btTransform(btMatrix3x3::getIdentity().scaled(btVector3(1, 2, 3)), btVector3(1, 2, 3)),
-            AreaType_ground
+            AreaType_ground, mSource, mObjectTransform
         );
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
@@ -152,7 +155,8 @@ namespace
         const std::array<btScalar, 4> heightfieldData {{0, 0, 0, 0}};
         btHeightfieldTerrainShape shape(2, 2, heightfieldData.data(), 1, 0, 0, 2, PHY_FLOAT, false);
         RecastMeshBuilder builder(mBounds);
-        builder.addObject(static_cast<const btCollisionShape&>(shape), btTransform::getIdentity(), AreaType_ground);
+        builder.addObject(static_cast<const btCollisionShape&>(shape), btTransform::getIdentity(),
+                          AreaType_ground, mSource, mObjectTransform);
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
             -0.5, -0.5, 0,
@@ -168,7 +172,8 @@ namespace
     {
         btBoxShape shape(btVector3(1, 1, 2));
         RecastMeshBuilder builder(mBounds);
-        builder.addObject(static_cast<const btCollisionShape&>(shape), btTransform::getIdentity(), AreaType_ground);
+        builder.addObject(static_cast<const btCollisionShape&>(shape), btTransform::getIdentity(),
+                          AreaType_ground, mSource, mObjectTransform);
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
             -1, -1, -2,
@@ -214,7 +219,7 @@ namespace
         builder.addObject(
             static_cast<const btCollisionShape&>(shape),
             btTransform::getIdentity(),
-            AreaType_ground
+            AreaType_ground, mSource, mObjectTransform
         );
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
@@ -261,7 +266,7 @@ namespace
         builder.addObject(
             static_cast<const btCollisionShape&>(shape),
             btTransform(btMatrix3x3::getIdentity().scaled(btVector3(1, 2, 3)), btVector3(1, 2, 3)),
-            AreaType_ground
+            AreaType_ground, mSource, mObjectTransform
         );
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
@@ -285,7 +290,7 @@ namespace
         builder.addObject(
             static_cast<const btCollisionShape&>(shape),
             btTransform(btMatrix3x3::getIdentity().scaled(btVector3(1, 2, 3)), btVector3(1, 2, 3)),
-            AreaType_ground
+            AreaType_ground, mSource, mObjectTransform
         );
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
@@ -307,7 +312,7 @@ namespace
         builder.addObject(
             static_cast<const btCollisionShape&>(shape),
             btTransform::getIdentity(),
-            AreaType_ground
+            AreaType_ground, mSource, mObjectTransform
         );
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
@@ -334,7 +339,7 @@ namespace
         builder.addObject(
             static_cast<const btCollisionShape&>(shape),
             btTransform::getIdentity(),
-            AreaType_ground
+            AreaType_ground, mSource, mObjectTransform
         );
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
@@ -359,7 +364,7 @@ namespace
             static_cast<const btCollisionShape&>(shape),
             btTransform(btQuaternion(btVector3(1, 0, 0),
             static_cast<btScalar>(-osg::PI_4))),
-            AreaType_ground
+            AreaType_ground, mSource, mObjectTransform
         );
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_THAT(recastMesh->getMesh().getVertices(), Pointwise(FloatNear(1e-5), std::vector<float>({
@@ -384,7 +389,7 @@ namespace
             static_cast<const btCollisionShape&>(shape),
             btTransform(btQuaternion(btVector3(0, 1, 0),
             static_cast<btScalar>(osg::PI_4))),
-            AreaType_ground
+            AreaType_ground, mSource, mObjectTransform
         );
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_THAT(recastMesh->getMesh().getVertices(), Pointwise(FloatNear(1e-5), std::vector<float>({
@@ -409,7 +414,7 @@ namespace
             static_cast<const btCollisionShape&>(shape),
             btTransform(btQuaternion(btVector3(0, 0, 1),
             static_cast<btScalar>(osg::PI_4))),
-            AreaType_ground
+            AreaType_ground, mSource, mObjectTransform
         );
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_THAT(recastMesh->getMesh().getVertices(), Pointwise(FloatNear(1e-5), std::vector<float>({
@@ -433,12 +438,12 @@ namespace
         builder.addObject(
             static_cast<const btCollisionShape&>(shape1),
             btTransform::getIdentity(),
-            AreaType_ground
+            AreaType_ground, mSource, mObjectTransform
         );
         builder.addObject(
             static_cast<const btCollisionShape&>(shape2),
             btTransform::getIdentity(),
-            AreaType_null
+            AreaType_null, mSource, mObjectTransform
         );
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
@@ -471,7 +476,7 @@ namespace
         btBvhTriangleMeshShape shape(&mesh, true);
 
         RecastMeshBuilder builder(mBounds);
-        builder.addObject(static_cast<const btCollisionShape&>(shape), btTransform::getIdentity(), AreaType_ground);
+        builder.addObject(static_cast<const btCollisionShape&>(shape), btTransform::getIdentity(), AreaType_ground, mSource, mObjectTransform);
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
         EXPECT_EQ(recastMesh->getMesh().getVertices(), std::vector<float>({
             -1, -1, 0,
diff --git a/apps/openmw_test_suite/detournavigator/recastmeshobject.cpp b/apps/openmw_test_suite/detournavigator/recastmeshobject.cpp
index 7751d5220c..ff0d3e519c 100644
--- a/apps/openmw_test_suite/detournavigator/recastmeshobject.cpp
+++ b/apps/openmw_test_suite/detournavigator/recastmeshobject.cpp
@@ -1,6 +1,7 @@
 #include "operators.hpp"
 
 #include <components/detournavigator/recastmeshobject.hpp>
+#include <components/misc/convert.hpp>
 
 #include <BulletCollision/CollisionShapes/btBoxShape.h>
 #include <BulletCollision/CollisionShapes/btCompoundShape.h>
@@ -15,10 +16,11 @@ namespace
     struct DetourNavigatorRecastMeshObjectTest : Test
     {
         btBoxShape mBoxShapeImpl {btVector3(1, 2, 3)};
-        CollisionShape mBoxShape {nullptr, mBoxShapeImpl};
+        const ObjectTransform mObjectTransform {ESM::Position {{1, 2, 3}, {1, 2, 3}}, 0.5f};
+        CollisionShape mBoxShape {nullptr, mBoxShapeImpl, mObjectTransform};
         btCompoundShape mCompoundShapeImpl {true};
-        CollisionShape mCompoundShape {nullptr, mCompoundShapeImpl};
-        btTransform mTransform {btQuaternion(btVector3(1, 2, 3), 1), btVector3(1, 2, 3)};
+        CollisionShape mCompoundShape {nullptr, mCompoundShapeImpl, mObjectTransform};
+        btTransform mTransform {Misc::Convert::makeBulletTransform(mObjectTransform.mPosition)};
 
         DetourNavigatorRecastMeshObjectTest()
         {
diff --git a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
index 3667e946e0..eac7f4abbd 100644
--- a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -17,6 +17,9 @@ namespace
     {
         Settings mSettings;
         std::vector<TilePosition> mChangedTiles;
+        const ObjectTransform mObjectTransform {ESM::Position {{0, 0, 0}, {0, 0, 0}}, 0.0f};
+        const osg::ref_ptr<const Resource::BulletShape> mShape = new Resource::BulletShape;
+        const osg::ref_ptr<const Resource::BulletShapeInstance> mInstance = new Resource::BulletShapeInstance(mShape);
 
         DetourNavigatorTileCachedRecastMeshManagerTest()
         {
@@ -56,7 +59,7 @@ namespace
     {
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
-        const CollisionShape shape(nullptr, boxShape);
+        const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         EXPECT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground));
     }
 
@@ -64,7 +67,7 @@ namespace
     {
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
-        const CollisionShape shape(nullptr, boxShape);
+        const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
         EXPECT_FALSE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground));
     }
@@ -73,7 +76,7 @@ namespace
     {
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
-        const CollisionShape shape(nullptr, boxShape);
+        const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground));
         for (int x = -1; x < 1; ++x)
             for (int y = -1; y < 1; ++y)
@@ -85,7 +88,7 @@ namespace
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const btTransform transform(btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
-        const CollisionShape shape(nullptr, boxShape);
+        const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         manager.addObject(ObjectId(&boxShape), shape, transform, AreaType::AreaType_ground);
         EXPECT_TRUE(manager.updateObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground,
                                          [&] (const auto& v) { onChangedTile(v); }));
@@ -100,7 +103,7 @@ namespace
     {
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
-        const CollisionShape shape(nullptr, boxShape);
+        const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
         EXPECT_FALSE(manager.updateObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground,
                                           [&] (const auto& v) { onChangedTile(v); }));
@@ -111,7 +114,7 @@ namespace
     {
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
-        const CollisionShape shape(nullptr, boxShape);
+        const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
         EXPECT_NE(manager.getMesh(TilePosition(-1, -1)), nullptr);
         EXPECT_NE(manager.getMesh(TilePosition(-1, 0)), nullptr);
@@ -123,7 +126,7 @@ namespace
     {
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
-        const CollisionShape shape(nullptr, boxShape);
+        const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
         EXPECT_EQ(manager.getMesh(TilePosition(1, 0)), nullptr);
     }
@@ -133,7 +136,7 @@ namespace
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const btTransform transform(btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
-        const CollisionShape shape(nullptr, boxShape);
+        const CollisionShape shape(mInstance, boxShape, mObjectTransform);
 
         manager.addObject(ObjectId(&boxShape), shape, transform, AreaType::AreaType_ground);
         EXPECT_NE(manager.getMesh(TilePosition(0, -1)), nullptr);
@@ -153,7 +156,7 @@ namespace
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const btTransform transform(btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
-        const CollisionShape shape(nullptr, boxShape);
+        const CollisionShape shape(mInstance, boxShape, mObjectTransform);
 
         manager.addObject(ObjectId(&boxShape), shape, transform, AreaType::AreaType_ground);
         EXPECT_EQ(manager.getMesh(TilePosition(-1, -1)), nullptr);
@@ -168,7 +171,7 @@ namespace
     {
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
-        const CollisionShape shape(nullptr, boxShape);
+        const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
         manager.removeObject(ObjectId(&boxShape));
         EXPECT_EQ(manager.getMesh(TilePosition(-1, -1)), nullptr);
@@ -181,7 +184,7 @@ namespace
     {
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
-        const CollisionShape shape(nullptr, boxShape);
+        const CollisionShape shape(mInstance, boxShape, mObjectTransform);
 
         manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
         EXPECT_NE(manager.getMesh(TilePosition(-1, -1)), nullptr);
@@ -201,7 +204,7 @@ namespace
         TileCachedRecastMeshManager manager(mSettings);
         const auto initialRevision = manager.getRevision();
         const btBoxShape boxShape(btVector3(20, 20, 100));
-        const CollisionShape shape(nullptr, boxShape);
+        const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
         EXPECT_EQ(manager.getRevision(), initialRevision + 1);
     }
@@ -210,7 +213,7 @@ namespace
     {
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
-        const CollisionShape shape(nullptr, boxShape);
+        const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
         const auto beforeAddRevision = manager.getRevision();
         manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
@@ -222,7 +225,7 @@ namespace
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const btTransform transform(btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
-        const CollisionShape shape(nullptr, boxShape);
+        const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         manager.addObject(ObjectId(&boxShape), shape, transform, AreaType::AreaType_ground);
         const auto beforeUpdateRevision = manager.getRevision();
         manager.updateObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {});
@@ -233,7 +236,7 @@ namespace
     {
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
-        const CollisionShape shape(nullptr, boxShape);
+        const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
         const auto beforeUpdateRevision = manager.getRevision();
         manager.updateObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {});
@@ -244,7 +247,7 @@ namespace
     {
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
-        const CollisionShape shape(nullptr, boxShape);
+        const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
         const auto beforeRemoveRevision = manager.getRevision();
         manager.removeObject(ObjectId(&boxShape));
@@ -282,7 +285,7 @@ namespace
     {
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
-        const CollisionShape shape(nullptr, boxShape);
+        const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground));
         const osg::Vec2i cellPosition(0, 0);
         const int cellSize = std::numeric_limits<int>::max();
@@ -325,7 +328,7 @@ namespace
     {
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
-        const CollisionShape shape(nullptr, boxShape);
+        const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground));
         const osg::Vec2i cellPosition(0, 0);
         const int cellSize = 8192;
@@ -342,7 +345,7 @@ namespace
         const osg::Vec2i cellPosition(0, 0);
         const int cellSize = 8192;
         const btBoxShape boxShape(btVector3(20, 20, 100));
-        const CollisionShape shape(nullptr, boxShape);
+        const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground));
         ASSERT_TRUE(manager.addWater(cellPosition, cellSize, 0.0f));
         ASSERT_TRUE(manager.removeObject(ObjectId(&boxShape)));
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index dd1ac36d91..b145f61332 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -203,6 +203,7 @@ add_component_dir(detournavigator
     preparednavmeshdata
     navmeshcacheitem
     navigatorutils
+    generatenavmeshtile
     )
 
 add_component_dir(loadinglistener
diff --git a/components/detournavigator/areatype.hpp b/components/detournavigator/areatype.hpp
index 9d99421af0..125b7ed7b9 100644
--- a/components/detournavigator/areatype.hpp
+++ b/components/detournavigator/areatype.hpp
@@ -3,6 +3,8 @@
 
 #include <Recast.h>
 
+#include <ostream>
+
 namespace DetourNavigator
 {
     enum AreaType : unsigned char
@@ -21,6 +23,19 @@ namespace DetourNavigator
         float mPathgrid = 1.0f;
         float mGround = 1.0f;
     };
+
+    inline std::ostream& operator<<(std::ostream& stream, AreaType value)
+    {
+        switch (value)
+        {
+            case AreaType_null: return stream << "null";
+            case AreaType_water: return stream << "water";
+            case AreaType_door: return stream << "door";
+            case AreaType_pathgrid: return stream << "pathgrid";
+            case AreaType_ground: return stream << "ground";
+        }
+        return stream << "unknown area type (" << static_cast<std::underlying_type_t<AreaType>>(value) << ")";
+    }
 }
 
 #endif
diff --git a/components/detournavigator/navigator.hpp b/components/detournavigator/navigator.hpp
index 6070a19fa8..9ffe062fe5 100644
--- a/components/detournavigator/navigator.hpp
+++ b/components/detournavigator/navigator.hpp
@@ -6,6 +6,7 @@
 #include "recastmeshtiles.hpp"
 #include "waitconditiontype.hpp"
 #include "heightfieldshape.hpp"
+#include "objecttransform.hpp"
 
 #include <components/resource/bulletshape.hpp>
 
@@ -27,10 +28,14 @@ namespace DetourNavigator
     struct ObjectShapes
     {
         osg::ref_ptr<const Resource::BulletShapeInstance> mShapeInstance;
+        ObjectTransform mTransform;
 
-        ObjectShapes(const osg::ref_ptr<const Resource::BulletShapeInstance>& shapeInstance)
+        ObjectShapes(const osg::ref_ptr<const Resource::BulletShapeInstance>& shapeInstance, const ObjectTransform& transform)
             : mShapeInstance(shapeInstance)
-        {}
+            , mTransform(transform)
+        {
+            assert(mShapeInstance != nullptr);
+        }
     };
 
     struct DoorShapes : ObjectShapes
@@ -39,8 +44,8 @@ namespace DetourNavigator
         osg::Vec3f mConnectionEnd;
 
         DoorShapes(const osg::ref_ptr<const Resource::BulletShapeInstance>& shapeInstance,
-                   const osg::Vec3f& connectionStart,const osg::Vec3f& connectionEnd)
-            : ObjectShapes(shapeInstance)
+                   const ObjectTransform& transform, const osg::Vec3f& connectionStart, const osg::Vec3f& connectionEnd)
+            : ObjectShapes(shapeInstance, transform)
             , mConnectionStart(connectionStart)
             , mConnectionEnd(connectionEnd)
         {}
diff --git a/components/detournavigator/navigatorimpl.cpp b/components/detournavigator/navigatorimpl.cpp
index f209a24c2c..9092624ca3 100644
--- a/components/detournavigator/navigatorimpl.cpp
+++ b/components/detournavigator/navigatorimpl.cpp
@@ -34,12 +34,12 @@ namespace DetourNavigator
 
     bool NavigatorImpl::addObject(const ObjectId id, const ObjectShapes& shapes, const btTransform& transform)
     {
-        CollisionShape collisionShape {shapes.mShapeInstance, *shapes.mShapeInstance->mCollisionShape};
+        const CollisionShape collisionShape(shapes.mShapeInstance, *shapes.mShapeInstance->mCollisionShape, shapes.mTransform);
         bool result = mNavMeshManager.addObject(id, collisionShape, transform, AreaType_ground);
         if (const btCollisionShape* const avoidShape = shapes.mShapeInstance->mAvoidCollisionShape.get())
         {
             const ObjectId avoidId(avoidShape);
-            CollisionShape avoidCollisionShape {shapes.mShapeInstance, *avoidShape};
+            const CollisionShape avoidCollisionShape(shapes.mShapeInstance, *avoidShape, shapes.mTransform);
             if (mNavMeshManager.addObject(avoidId, avoidCollisionShape, transform, AreaType_null))
             {
                 updateAvoidShapeId(id, avoidId);
@@ -64,12 +64,12 @@ namespace DetourNavigator
 
     bool NavigatorImpl::updateObject(const ObjectId id, const ObjectShapes& shapes, const btTransform& transform)
     {
-        const CollisionShape collisionShape {shapes.mShapeInstance, *shapes.mShapeInstance->mCollisionShape};
+        const CollisionShape collisionShape(shapes.mShapeInstance, *shapes.mShapeInstance->mCollisionShape, shapes.mTransform);
         bool result = mNavMeshManager.updateObject(id, collisionShape, transform, AreaType_ground);
         if (const btCollisionShape* const avoidShape = shapes.mShapeInstance->mAvoidCollisionShape.get())
         {
             const ObjectId avoidId(avoidShape);
-            const CollisionShape avoidCollisionShape {shapes.mShapeInstance, *avoidShape};
+            const CollisionShape avoidCollisionShape(shapes.mShapeInstance, *avoidShape, shapes.mTransform);
             if (mNavMeshManager.updateObject(avoidId, avoidCollisionShape, transform, AreaType_null))
             {
                 updateAvoidShapeId(id, avoidId);
diff --git a/components/detournavigator/objecttransform.hpp b/components/detournavigator/objecttransform.hpp
new file mode 100644
index 0000000000..2da9a25348
--- /dev/null
+++ b/components/detournavigator/objecttransform.hpp
@@ -0,0 +1,27 @@
+#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_OBJECTTRANSFORM_H
+#define OPENMW_COMPONENTS_DETOURNAVIGATOR_OBJECTTRANSFORM_H
+
+#include <components/esm/defs.hpp>
+
+#include <tuple>
+
+namespace DetourNavigator
+{
+    struct ObjectTransform
+    {
+        ESM::Position mPosition;
+        float mScale;
+
+        friend inline auto tie(const ObjectTransform& v)
+        {
+            return std::tie(v.mPosition, v.mScale);
+        }
+
+        friend inline bool operator<(const ObjectTransform& l, const ObjectTransform& r)
+        {
+            return tie(l) < tie(r);
+        }
+    };
+}
+
+#endif
diff --git a/components/detournavigator/recastmesh.cpp b/components/detournavigator/recastmesh.cpp
index 93a0e171a1..16220d74f1 100644
--- a/components/detournavigator/recastmesh.cpp
+++ b/components/detournavigator/recastmesh.cpp
@@ -19,13 +19,15 @@ namespace DetourNavigator
     }
 
     RecastMesh::RecastMesh(std::size_t generation, std::size_t revision, Mesh mesh, std::vector<CellWater> water,
-        std::vector<Heightfield> heightfields, std::vector<FlatHeightfield> flatHeightfields)
+        std::vector<Heightfield> heightfields, std::vector<FlatHeightfield> flatHeightfields,
+        std::vector<MeshSource> meshSources)
         : mGeneration(generation)
         , mRevision(revision)
         , mMesh(std::move(mesh))
         , mWater(std::move(water))
         , mHeightfields(std::move(heightfields))
         , mFlatHeightfields(std::move(flatHeightfields))
+        , mMeshSources(std::move(meshSources))
     {
         mWater.shrink_to_fit();
         mHeightfields.shrink_to_fit();
diff --git a/components/detournavigator/recastmesh.hpp b/components/detournavigator/recastmesh.hpp
index 3cfe9e1cab..df9d6414d5 100644
--- a/components/detournavigator/recastmesh.hpp
+++ b/components/detournavigator/recastmesh.hpp
@@ -4,8 +4,10 @@
 #include "areatype.hpp"
 #include "bounds.hpp"
 #include "tilebounds.hpp"
+#include "objecttransform.hpp"
 
 #include <components/bullethelpers/operators.hpp>
+#include <components/resource/bulletshape.hpp>
 
 #include <osg/Vec3f>
 #include <osg/Vec2i>
@@ -119,11 +121,19 @@ namespace DetourNavigator
         return tie(lhs) < tie(rhs);
     }
 
+    struct MeshSource
+    {
+        osg::ref_ptr<const Resource::BulletShape> mShape;
+        ObjectTransform mObjectTransform;
+        AreaType mAreaType;
+    };
+
     class RecastMesh
     {
     public:
         RecastMesh(std::size_t generation, std::size_t revision, Mesh mesh, std::vector<CellWater> water,
-            std::vector<Heightfield> heightfields, std::vector<FlatHeightfield> flatHeightfields);
+            std::vector<Heightfield> heightfields, std::vector<FlatHeightfield> flatHeightfields,
+            std::vector<MeshSource> sources);
 
         std::size_t getGeneration() const
         {
@@ -152,6 +162,8 @@ namespace DetourNavigator
             return mFlatHeightfields;
         }
 
+        const std::vector<MeshSource>& getMeshSources() const noexcept { return mMeshSources; }
+
     private:
         std::size_t mGeneration;
         std::size_t mRevision;
@@ -159,6 +171,7 @@ namespace DetourNavigator
         std::vector<CellWater> mWater;
         std::vector<Heightfield> mHeightfields;
         std::vector<FlatHeightfield> mFlatHeightfields;
+        std::vector<MeshSource> mMeshSources;
 
         friend inline std::size_t getSize(const RecastMesh& value) noexcept
         {
diff --git a/components/detournavigator/recastmeshbuilder.cpp b/components/detournavigator/recastmeshbuilder.cpp
index b54b927696..0f7552aa77 100644
--- a/components/detournavigator/recastmeshbuilder.cpp
+++ b/components/detournavigator/recastmeshbuilder.cpp
@@ -133,6 +133,13 @@ namespace DetourNavigator
     {
     }
 
+    void RecastMeshBuilder::addObject(const btCollisionShape& shape, const btTransform& transform,
+        const AreaType areaType, osg::ref_ptr<const Resource::BulletShape> source, const ObjectTransform& objectTransform)
+    {
+        addObject(shape, transform, areaType);
+        mSources.push_back(MeshSource {std::move(source), objectTransform, areaType});
+    }
+
     void RecastMeshBuilder::addObject(const btCollisionShape& shape, const btTransform& transform,
                                       const AreaType areaType)
     {
@@ -261,7 +268,8 @@ namespace DetourNavigator
         std::sort(mWater.begin(), mWater.end());
         Mesh mesh = makeMesh(std::move(mTriangles));
         return std::make_shared<RecastMesh>(generation, revision, std::move(mesh), std::move(mWater),
-                                            std::move(mHeightfields), std::move(mFlatHeightfields));
+                                            std::move(mHeightfields), std::move(mFlatHeightfields),
+                                            std::move(mSources));
     }
 
     void RecastMeshBuilder::addObject(const btConcaveShape& shape, const btTransform& transform,
diff --git a/components/detournavigator/recastmeshbuilder.hpp b/components/detournavigator/recastmeshbuilder.hpp
index 4bdcb788e3..d0848c2a45 100644
--- a/components/detournavigator/recastmeshbuilder.hpp
+++ b/components/detournavigator/recastmeshbuilder.hpp
@@ -4,6 +4,8 @@
 #include "recastmesh.hpp"
 #include "tilebounds.hpp"
 
+#include <components/resource/bulletshape.hpp>
+
 #include <osg/Vec3f>
 
 #include <LinearMath/btTransform.h>
@@ -38,7 +40,8 @@ namespace DetourNavigator
     public:
         explicit RecastMeshBuilder(const TileBounds& bounds) noexcept;
 
-        void addObject(const btCollisionShape& shape, const btTransform& transform, const AreaType areaType);
+        void addObject(const btCollisionShape& shape, const btTransform& transform, const AreaType areaType,
+            osg::ref_ptr<const Resource::BulletShape> source, const ObjectTransform& objectTransform);
 
         void addObject(const btCompoundShape& shape, const btTransform& transform, const AreaType areaType);
 
@@ -63,6 +66,9 @@ namespace DetourNavigator
         std::vector<CellWater> mWater;
         std::vector<Heightfield> mHeightfields;
         std::vector<FlatHeightfield> mFlatHeightfields;
+        std::vector<MeshSource> mSources;
+
+        inline void addObject(const btCollisionShape& shape, const btTransform& transform, const AreaType areaType);
 
         void addObject(const btConcaveShape& shape, const btTransform& transform, btTriangleCallback&& callback);
 
diff --git a/components/detournavigator/recastmeshmanager.cpp b/components/detournavigator/recastmeshmanager.cpp
index 4772ec74a9..a7b24766fc 100644
--- a/components/detournavigator/recastmeshmanager.cpp
+++ b/components/detournavigator/recastmeshmanager.cpp
@@ -122,7 +122,8 @@ namespace DetourNavigator
     {
         RecastMeshBuilder builder(mTileBounds);
         using Object = std::tuple<
-            osg::ref_ptr<const osg::Referenced>,
+            osg::ref_ptr<const Resource::BulletShapeInstance>,
+            ObjectTransform,
             std::reference_wrapper<const btCollisionShape>,
             btTransform,
             AreaType
@@ -139,12 +140,13 @@ namespace DetourNavigator
             for (const auto& [k, object] : mObjects)
             {
                 const RecastMeshObject& impl = object.getImpl();
-                objects.emplace_back(impl.getHolder(), impl.getShape(), impl.getTransform(), impl.getAreaType());
+                objects.emplace_back(impl.getInstance(), impl.getObjectTransform(), impl.getShape(),
+                                     impl.getTransform(), impl.getAreaType());
             }
             revision = mRevision;
         }
-        for (const auto& [holder, shape, transform, areaType] : objects)
-            builder.addObject(shape, transform, areaType);
+        for (const auto& [instance, objectTransform, shape, transform, areaType] : objects)
+            builder.addObject(shape, transform, areaType, instance->getSource(), objectTransform);
         return std::move(builder).create(mGeneration, revision);
     }
 
diff --git a/components/detournavigator/recastmeshobject.cpp b/components/detournavigator/recastmeshobject.cpp
index 31aa13a208..343aeeb39e 100644
--- a/components/detournavigator/recastmeshobject.cpp
+++ b/components/detournavigator/recastmeshobject.cpp
@@ -75,7 +75,8 @@ namespace DetourNavigator
 
     RecastMeshObject::RecastMeshObject(const CollisionShape& shape, const btTransform& transform,
             const AreaType areaType)
-        : mHolder(shape.getHolder())
+        : mInstance(shape.getInstance())
+        , mObjectTransform(shape.getObjectTransform())
         , mImpl(shape.getShape(), transform, areaType)
     {
     }
diff --git a/components/detournavigator/recastmeshobject.hpp b/components/detournavigator/recastmeshobject.hpp
index e833ee37e3..760774353c 100644
--- a/components/detournavigator/recastmeshobject.hpp
+++ b/components/detournavigator/recastmeshobject.hpp
@@ -2,6 +2,9 @@
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_RECASTMESHOBJECT_H
 
 #include "areatype.hpp"
+#include "objecttransform.hpp"
+
+#include <components/resource/bulletshape.hpp>
 
 #include <LinearMath/btTransform.h>
 
@@ -19,17 +22,21 @@ namespace DetourNavigator
     class CollisionShape
     {
     public:
-        CollisionShape(osg::ref_ptr<const osg::Referenced> holder, const btCollisionShape& shape)
-            : mHolder(std::move(holder))
+        CollisionShape(osg::ref_ptr<const Resource::BulletShapeInstance> instance, const btCollisionShape& shape,
+                       const ObjectTransform& transform)
+            : mInstance(std::move(instance))
             , mShape(shape)
+            , mObjectTransform(transform)
         {}
 
-        const osg::ref_ptr<const osg::Referenced>& getHolder() const { return mHolder; }
+        const osg::ref_ptr<const Resource::BulletShapeInstance>& getInstance() const { return mInstance; }
         const btCollisionShape& getShape() const { return mShape; }
+        const ObjectTransform& getObjectTransform() const { return mObjectTransform; }
 
     private:
-        osg::ref_ptr<const osg::Referenced> mHolder;
+        osg::ref_ptr<const Resource::BulletShapeInstance> mInstance;
         std::reference_wrapper<const btCollisionShape> mShape;
+        ObjectTransform mObjectTransform;
     };
 
     class ChildRecastMeshObject
@@ -60,7 +67,7 @@ namespace DetourNavigator
 
             bool update(const btTransform& transform, const AreaType areaType) { return mImpl.update(transform, areaType); }
 
-            const osg::ref_ptr<const osg::Referenced>& getHolder() const { return mHolder; }
+            const osg::ref_ptr<const Resource::BulletShapeInstance>& getInstance() const { return mInstance; }
 
             const btCollisionShape& getShape() const { return mImpl.getShape(); }
 
@@ -68,8 +75,11 @@ namespace DetourNavigator
 
             AreaType getAreaType() const { return mImpl.getAreaType(); }
 
+            const ObjectTransform& getObjectTransform() const { return mObjectTransform; }
+
         private:
-            osg::ref_ptr<const osg::Referenced> mHolder;
+            osg::ref_ptr<const Resource::BulletShapeInstance> mInstance;
+            ObjectTransform mObjectTransform;
             ChildRecastMeshObject mImpl;
     };
 }
diff --git a/components/esm/defs.hpp b/components/esm/defs.hpp
index 254e66ec3a..e793c6fea7 100644
--- a/components/esm/defs.hpp
+++ b/components/esm/defs.hpp
@@ -3,6 +3,8 @@
 
 #include <stdint.h>
 
+#include <tuple>
+
 #include <osg/Vec3f>
 
 namespace ESM
@@ -59,6 +61,12 @@ struct Position
     {
         return osg::Vec3f(rot[0], rot[1], rot[2]);
     }
+
+    friend inline bool operator<(const Position& l, const Position& r)
+    {
+        const auto tuple = [] (const Position& v) { return std::tuple(v.asVec3(), v.asRotationVec3()); };
+        return tuple(l) < tuple(r);
+    }
 };
 #pragma pack(pop)
 
diff --git a/components/misc/convert.hpp b/components/misc/convert.hpp
index 6f4a55cfcc..45f3504dc1 100644
--- a/components/misc/convert.hpp
+++ b/components/misc/convert.hpp
@@ -67,6 +67,11 @@ namespace Convert
     {
         return makeBulletQuaternion(position.rot);
     }
+
+    inline btTransform makeBulletTransform(const ESM::Position& position)
+    {
+        return btTransform(makeBulletQuaternion(position), toBullet(position.asVec3()));
+    }
 }
 }
 

From 33bb18850df8c7a085a50a598fa65baaf0a4e236 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 5 Nov 2021 23:48:48 +0100
Subject: [PATCH 1839/2859] Move operator<< to debug.hpp

---
 .../detournavigator/recastmeshbuilder.cpp     | 29 ------------------
 components/detournavigator/debug.hpp          | 30 +++++++++++++++++++
 2 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
index 39e57234a3..36e0287461 100644
--- a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
+++ b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
@@ -48,35 +48,6 @@ namespace DetourNavigator
         };
         return tie(lhs) == tie(rhs);
     }
-
-    static inline std::ostream& operator<<(std::ostream& s, const Water& v)
-    {
-        return s << "Water {" << v.mCellSize << ", " << v.mLevel << "}";
-    }
-
-    static inline std::ostream& operator<<(std::ostream& s, const CellWater& v)
-    {
-        return s << "CellWater {" << v.mCellPosition << ", " << v.mWater << "}";
-    }
-
-    static inline std::ostream& operator<<(std::ostream& s, const FlatHeightfield& v)
-    {
-        return s << "FlatHeightfield {" << v.mCellPosition << ", " << v.mCellSize << ", " << v.mHeight << "}";
-    }
-
-    static inline std::ostream& operator<<(std::ostream& s, const Heightfield& v)
-    {
-        s << "Heightfield {.mCellPosition=" << v.mCellPosition
-          << ", .mCellSize=" << v.mCellSize
-          << ", .mLength=" << static_cast<int>(v.mLength)
-          << ", .mMinHeight=" << v.mMinHeight
-          << ", .mMaxHeight=" << v.mMaxHeight
-          << ", .mHeights={";
-        for (float h : v.mHeights)
-            s << h << ", ";
-        s << "}";
-        return s << ", .mOriginalSize=" << v.mOriginalSize << "}";
-    }
 }
 
 namespace
diff --git a/components/detournavigator/debug.hpp b/components/detournavigator/debug.hpp
index a868ac2a2e..7c86603348 100644
--- a/components/detournavigator/debug.hpp
+++ b/components/detournavigator/debug.hpp
@@ -3,6 +3,7 @@
 
 #include "tilebounds.hpp"
 #include "status.hpp"
+#include "recastmesh.hpp"
 
 #include <osg/io_utils>
 
@@ -39,6 +40,35 @@ namespace DetourNavigator
         return stream << "DetourNavigator::Error::" << static_cast<int>(value);
     }
 
+    inline std::ostream& operator<<(std::ostream& s, const Water& v)
+    {
+        return s << "Water {" << v.mCellSize << ", " << v.mLevel << "}";
+    }
+
+    inline std::ostream& operator<<(std::ostream& s, const CellWater& v)
+    {
+        return s << "CellWater {" << v.mCellPosition << ", " << v.mWater << "}";
+    }
+
+    inline std::ostream& operator<<(std::ostream& s, const FlatHeightfield& v)
+    {
+        return s << "FlatHeightfield {" << v.mCellPosition << ", " << v.mCellSize << ", " << v.mHeight << "}";
+    }
+
+    inline std::ostream& operator<<(std::ostream& s, const Heightfield& v)
+    {
+        s << "Heightfield {.mCellPosition=" << v.mCellPosition
+          << ", .mCellSize=" << v.mCellSize
+          << ", .mLength=" << static_cast<int>(v.mLength)
+          << ", .mMinHeight=" << v.mMinHeight
+          << ", .mMaxHeight=" << v.mMaxHeight
+          << ", .mHeights={";
+        for (float h : v.mHeights)
+            s << h << ", ";
+        s << "}";
+        return s << ", .mOriginalSize=" << v.mOriginalSize << "}";
+    }
+
     class RecastMesh;
     struct Settings;
 

From 01c712d5f1d7934ad57e22e26f7fa2fcbcbb803a Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 6 Nov 2021 13:46:43 +0100
Subject: [PATCH 1840/2859] Split navigator settings into subtypes

Mostly to distinguish settings that affect properties of the generated navmesh.
---
 apps/openmw/mwrender/actorspaths.cpp          |   3 +-
 apps/openmw/mwrender/recastmesh.cpp           |   4 +-
 apps/openmw/mwworld/worldimp.cpp              |   2 +-
 .../detournavigator/gettilespositions.cpp     |   2 +-
 .../detournavigator/navigator.cpp             |  38 +--
 .../detournavigator/settingsutils.cpp         |   4 +-
 .../tilecachedrecastmeshmanager.cpp           |   2 +-
 .../detournavigator/asyncnavmeshupdater.cpp   |   2 +-
 components/detournavigator/debug.cpp          |   3 +-
 components/detournavigator/debug.hpp          |   5 +-
 .../findrandompointaroundcircle.cpp           |   2 +-
 .../findrandompointaroundcircle.hpp           |   4 +-
 components/detournavigator/findsmoothpath.hpp |  12 +-
 .../detournavigator/gettilespositions.hpp     |   6 +-
 components/detournavigator/makenavmesh.cpp    | 252 ++++++++----------
 components/detournavigator/makenavmesh.hpp    |  14 +-
 components/detournavigator/navigatorimpl.cpp  |  12 +-
 components/detournavigator/navigatorutils.cpp |  12 +-
 components/detournavigator/navigatorutils.hpp |   6 +-
 components/detournavigator/navmeshmanager.cpp |  14 +-
 .../offmeshconnectionsmanager.cpp             |   2 +-
 .../offmeshconnectionsmanager.hpp             |   4 +-
 components/detournavigator/raycast.cpp        |   2 +-
 components/detournavigator/raycast.hpp        |   4 +-
 components/detournavigator/settings.cpp       |  90 ++++---
 components/detournavigator/settings.hpp       |  38 ++-
 components/detournavigator/settingsutils.hpp  |  52 ++--
 .../tilecachedrecastmeshmanager.cpp           |   2 +-
 .../tilecachedrecastmeshmanager.hpp           |   4 +-
 components/sceneutil/agentpath.cpp            |   2 +-
 components/sceneutil/agentpath.hpp            |   4 +-
 components/sceneutil/navmesh.cpp              |   4 +-
 components/sceneutil/recastmesh.cpp           |   2 +-
 components/sceneutil/recastmesh.hpp           |   4 +-
 components/settings/settings.cpp              |   9 +
 components/settings/settings.hpp              |   1 +
 .../reference/modding/settings/navigator.rst  |   8 +-
 files/settings-default.cfg                    |   4 +-
 38 files changed, 329 insertions(+), 306 deletions(-)

diff --git a/apps/openmw/mwrender/actorspaths.cpp b/apps/openmw/mwrender/actorspaths.cpp
index 941f37df75..c8c5f56d8f 100644
--- a/apps/openmw/mwrender/actorspaths.cpp
+++ b/apps/openmw/mwrender/actorspaths.cpp
@@ -4,6 +4,7 @@
 #include <components/sceneutil/agentpath.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
+#include <components/detournavigator/settings.hpp>
 
 #include <osg/PositionAttitudeTransform>
 
@@ -47,7 +48,7 @@ namespace MWRender
         if (group != mGroups.end())
             mRootNode->removeChild(group->second);
 
-        const auto newGroup = SceneUtil::createAgentPathGroup(path, halfExtents, start, end, settings);
+        const auto newGroup = SceneUtil::createAgentPathGroup(path, halfExtents, start, end, settings.mRecast);
         if (newGroup)
         {
             MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(newGroup, "debug");
diff --git a/apps/openmw/mwrender/recastmesh.cpp b/apps/openmw/mwrender/recastmesh.cpp
index f108536242..5f202720b2 100644
--- a/apps/openmw/mwrender/recastmesh.cpp
+++ b/apps/openmw/mwrender/recastmesh.cpp
@@ -54,7 +54,7 @@ namespace MWRender
             if (it->second.mGeneration != tile->second->getGeneration()
                 || it->second.mRevision != tile->second->getRevision())
             {
-                const auto group = SceneUtil::createRecastMeshGroup(*tile->second, settings);
+                const auto group = SceneUtil::createRecastMeshGroup(*tile->second, settings.mRecast);
                 MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(group, "debug");
                 group->setNodeMask(Mask_Debug);
                 mRootNode->removeChild(it->second.mValue);
@@ -71,7 +71,7 @@ namespace MWRender
         {
             if (mGroups.count(tile.first))
                 continue;
-            const auto group = SceneUtil::createRecastMeshGroup(*tile.second, settings);
+            const auto group = SceneUtil::createRecastMeshGroup(*tile.second, settings.mRecast);
             MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(group, "debug");
             group->setNodeMask(Mask_Debug);
             mGroups.emplace(tile.first, Group {tile.second->getGeneration(), tile.second->getRevision(), group});
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index d08eef2904..5a937d1a78 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -186,7 +186,7 @@ namespace MWWorld
         if (Settings::Manager::getBool("enable", "Navigator"))
         {
             auto navigatorSettings = DetourNavigator::makeSettingsFromSettingsManager();
-            navigatorSettings.mSwimHeightScale = mSwimHeightScale;
+            navigatorSettings.mRecast.mSwimHeightScale = mSwimHeightScale;
             mNavigator = DetourNavigator::makeNavigator(navigatorSettings);
         }
         else
diff --git a/apps/openmw_test_suite/detournavigator/gettilespositions.cpp b/apps/openmw_test_suite/detournavigator/gettilespositions.cpp
index 1ad5c063d0..ced33a99f0 100644
--- a/apps/openmw_test_suite/detournavigator/gettilespositions.cpp
+++ b/apps/openmw_test_suite/detournavigator/gettilespositions.cpp
@@ -21,7 +21,7 @@ namespace
 
     struct DetourNavigatorGetTilesPositionsTest : Test
     {
-        Settings mSettings;
+        RecastSettings mSettings;
         std::vector<TilePosition> mTilesPositions;
         CollectTilesPositions mCollect {mTilesPositions};
 
diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index 07dcbb2002..b630c261ef 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -63,28 +63,28 @@ namespace
             mSettings.mEnableWriteNavMeshToFile = false;
             mSettings.mEnableRecastMeshFileNameRevision = false;
             mSettings.mEnableNavMeshFileNameRevision = false;
-            mSettings.mBorderSize = 16;
-            mSettings.mCellHeight = 0.2f;
-            mSettings.mCellSize = 0.2f;
-            mSettings.mDetailSampleDist = 6;
-            mSettings.mDetailSampleMaxError = 1;
-            mSettings.mMaxClimb = 34;
-            mSettings.mMaxSimplificationError = 1.3f;
-            mSettings.mMaxSlope = 49;
-            mSettings.mRecastScaleFactor = 0.017647058823529415f;
-            mSettings.mSwimHeightScale = 0.89999997615814208984375f;
-            mSettings.mMaxEdgeLen = 12;
-            mSettings.mMaxNavMeshQueryNodes = 2048;
-            mSettings.mMaxVertsPerPoly = 6;
-            mSettings.mRegionMergeSize = 20;
-            mSettings.mRegionMinSize = 8;
-            mSettings.mTileSize = 64;
+            mSettings.mRecast.mBorderSize = 16;
+            mSettings.mRecast.mCellHeight = 0.2f;
+            mSettings.mRecast.mCellSize = 0.2f;
+            mSettings.mRecast.mDetailSampleDist = 6;
+            mSettings.mRecast.mDetailSampleMaxError = 1;
+            mSettings.mRecast.mMaxClimb = 34;
+            mSettings.mRecast.mMaxSimplificationError = 1.3f;
+            mSettings.mRecast.mMaxSlope = 49;
+            mSettings.mRecast.mRecastScaleFactor = 0.017647058823529415f;
+            mSettings.mRecast.mSwimHeightScale = 0.89999997615814208984375f;
+            mSettings.mRecast.mMaxEdgeLen = 12;
+            mSettings.mDetour.mMaxNavMeshQueryNodes = 2048;
+            mSettings.mRecast.mMaxVertsPerPoly = 6;
+            mSettings.mRecast.mRegionMergeArea = 400;
+            mSettings.mRecast.mRegionMinArea = 64;
+            mSettings.mRecast.mTileSize = 64;
             mSettings.mWaitUntilMinDistanceToPlayer = std::numeric_limits<int>::max();
             mSettings.mAsyncNavMeshUpdaterThreads = 1;
             mSettings.mMaxNavMeshTilesCacheSize = 1024 * 1024;
-            mSettings.mMaxPolygonPathSize = 1024;
-            mSettings.mMaxSmoothPathSize = 1024;
-            mSettings.mMaxPolys = 4096;
+            mSettings.mDetour.mMaxPolygonPathSize = 1024;
+            mSettings.mDetour.mMaxSmoothPathSize = 1024;
+            mSettings.mDetour.mMaxPolys = 4096;
             mSettings.mMaxTilesNumber = 512;
             mSettings.mMinUpdateInterval = std::chrono::milliseconds(50);
             mNavigator.reset(new NavigatorImpl(mSettings));
diff --git a/apps/openmw_test_suite/detournavigator/settingsutils.cpp b/apps/openmw_test_suite/detournavigator/settingsutils.cpp
index ffed64ab81..f06f3b3e32 100644
--- a/apps/openmw_test_suite/detournavigator/settingsutils.cpp
+++ b/apps/openmw_test_suite/detournavigator/settingsutils.cpp
@@ -11,7 +11,7 @@ namespace
 
     struct DetourNavigatorGetTilePositionTest : Test
     {
-        Settings mSettings;
+        RecastSettings mSettings;
 
         DetourNavigatorGetTilePositionTest()
         {
@@ -47,7 +47,7 @@ namespace
 
     struct DetourNavigatorMakeTileBoundsTest : Test
     {
-        Settings mSettings;
+        RecastSettings mSettings;
 
         DetourNavigatorMakeTileBoundsTest()
         {
diff --git a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
index eac7f4abbd..9426a3968f 100644
--- a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -15,7 +15,7 @@ namespace
 
     struct DetourNavigatorTileCachedRecastMeshManagerTest : Test
     {
-        Settings mSettings;
+        RecastSettings mSettings;
         std::vector<TilePosition> mChangedTiles;
         const ObjectTransform mObjectTransform {ESM::Position {{0, 0, 0}, {0, 0, 0}}, 0.0f};
         const osg::ref_ptr<const Resource::BulletShape> mShape = new Resource::BulletShape;
diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index 583fd1162a..c2c79a840e 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -404,7 +404,7 @@ namespace DetourNavigator
         }
         if (recastMesh && mSettings.get().mEnableWriteRecastMeshToFile)
             writeToFile(*recastMesh, mSettings.get().mRecastMeshPathPrefix + std::to_string(job.mChangedTile.x())
-                        + "_" + std::to_string(job.mChangedTile.y()) + "_", recastMeshRevision, mSettings);
+                        + "_" + std::to_string(job.mChangedTile.y()) + "_", recastMeshRevision, mSettings.get().mRecast);
         if (mSettings.get().mEnableWriteNavMeshToFile)
             if (const auto shared = job.mNavMeshCacheItem.lock())
                 writeToFile(shared->lockConst()->getImpl(), mSettings.get().mNavMeshPathPrefix, navMeshRevision);
diff --git a/components/detournavigator/debug.cpp b/components/detournavigator/debug.cpp
index 07832d748f..8394c6696d 100644
--- a/components/detournavigator/debug.cpp
+++ b/components/detournavigator/debug.cpp
@@ -11,7 +11,8 @@
 
 namespace DetourNavigator
 {
-    void writeToFile(const RecastMesh& recastMesh, const std::string& pathPrefix, const std::string& revision, const Settings& settings)
+    void writeToFile(const RecastMesh& recastMesh, const std::string& pathPrefix,
+        const std::string& revision, const RecastSettings& settings)
     {
         const auto path = pathPrefix + "recastmesh" + revision + ".obj";
         boost::filesystem::ofstream file(boost::filesystem::path(path), std::ios::out);
diff --git a/components/detournavigator/debug.hpp b/components/detournavigator/debug.hpp
index 7c86603348..ce1e2d2023 100644
--- a/components/detournavigator/debug.hpp
+++ b/components/detournavigator/debug.hpp
@@ -70,9 +70,10 @@ namespace DetourNavigator
     }
 
     class RecastMesh;
-    struct Settings;
+    struct RecastSettings;
 
-    void writeToFile(const RecastMesh& recastMesh, const std::string& pathPrefix, const std::string& revision, const Settings& settings);
+    void writeToFile(const RecastMesh& recastMesh, const std::string& pathPrefix,
+        const std::string& revision, const RecastSettings& settings);
     void writeToFile(const dtNavMesh& navMesh, const std::string& pathPrefix, const std::string& revision);
 }
 
diff --git a/components/detournavigator/findrandompointaroundcircle.cpp b/components/detournavigator/findrandompointaroundcircle.cpp
index a3407a61c3..1e1e2401c5 100644
--- a/components/detournavigator/findrandompointaroundcircle.cpp
+++ b/components/detournavigator/findrandompointaroundcircle.cpp
@@ -10,7 +10,7 @@
 namespace DetourNavigator
 {
     std::optional<osg::Vec3f> findRandomPointAroundCircle(const dtNavMesh& navMesh, const osg::Vec3f& halfExtents,
-        const osg::Vec3f& start, const float maxRadius, const Flags includeFlags, const Settings& settings)
+        const osg::Vec3f& start, const float maxRadius, const Flags includeFlags, const DetourSettings& settings)
     {
         dtNavMeshQuery navMeshQuery;
         if (!initNavMeshQuery(navMeshQuery, navMesh, settings.mMaxNavMeshQueryNodes))
diff --git a/components/detournavigator/findrandompointaroundcircle.hpp b/components/detournavigator/findrandompointaroundcircle.hpp
index d0dc2bbbc0..89a3c0964c 100644
--- a/components/detournavigator/findrandompointaroundcircle.hpp
+++ b/components/detournavigator/findrandompointaroundcircle.hpp
@@ -10,10 +10,10 @@ class dtNavMesh;
 
 namespace DetourNavigator
 {
-    struct Settings;
+    struct DetourSettings;
 
     std::optional<osg::Vec3f> findRandomPointAroundCircle(const dtNavMesh& navMesh, const osg::Vec3f& halfExtents,
-        const osg::Vec3f& start, const float maxRadius, const Flags includeFlags, const Settings& settings);
+        const osg::Vec3f& start, const float maxRadius, const Flags includeFlags, const DetourSettings& settings);
 }
 
 #endif
diff --git a/components/detournavigator/findsmoothpath.hpp b/components/detournavigator/findsmoothpath.hpp
index 2e63340578..fa35470c42 100644
--- a/components/detournavigator/findsmoothpath.hpp
+++ b/components/detournavigator/findsmoothpath.hpp
@@ -60,7 +60,7 @@ namespace DetourNavigator
     class OutputTransformIterator
     {
     public:
-        OutputTransformIterator(OutputIterator& impl, const Settings& settings)
+        explicit OutputTransformIterator(OutputIterator& impl, const RecastSettings& settings)
             : mImpl(impl), mSettings(settings)
         {
         }
@@ -91,7 +91,7 @@ namespace DetourNavigator
 
     private:
         std::reference_wrapper<OutputIterator> mImpl;
-        std::reference_wrapper<const Settings> mSettings;
+        std::reference_wrapper<const RecastSettings> mSettings;
     };
 
     inline bool initNavMeshQuery(dtNavMeshQuery& value, const dtNavMesh& navMesh, const int maxNodes)
@@ -261,7 +261,7 @@ namespace DetourNavigator
             const Settings& settings, float endTolerance, OutputIterator& out)
     {
         dtNavMeshQuery navMeshQuery;
-        if (!initNavMeshQuery(navMeshQuery, navMesh, settings.mMaxNavMeshQueryNodes))
+        if (!initNavMeshQuery(navMeshQuery, navMesh, settings.mDetour.mMaxNavMeshQueryNodes))
             return Status::InitNavMeshQueryFailed;
 
         dtQueryFilter queryFilter;
@@ -283,7 +283,7 @@ namespace DetourNavigator
         if (endRef == 0)
             return Status::EndPolygonNotFound;
 
-        std::vector<dtPolyRef> polygonPath(settings.mMaxPolygonPathSize);
+        std::vector<dtPolyRef> polygonPath(settings.mDetour.mMaxPolygonPathSize);
         const auto polygonPathSize = findPath(navMeshQuery, startRef, endRef, start, end, queryFilter,
                                               polygonPath.data(), polygonPath.size());
 
@@ -294,9 +294,9 @@ namespace DetourNavigator
             return Status::Success;
 
         const bool partialPath = polygonPath[*polygonPathSize - 1] != endRef;
-        auto outTransform = OutputTransformIterator<OutputIterator>(out, settings);
+        auto outTransform = OutputTransformIterator<OutputIterator>(out, settings.mRecast);
         const Status smoothStatus = makeSmoothPath(navMesh, navMeshQuery, queryFilter, start, end, stepSize,
-            polygonPath, *polygonPathSize, settings.mMaxSmoothPathSize, outTransform);
+            polygonPath, *polygonPathSize, settings.mDetour.mMaxSmoothPathSize, outTransform);
 
         if (smoothStatus != Status::Success)
             return smoothStatus;
diff --git a/components/detournavigator/gettilespositions.hpp b/components/detournavigator/gettilespositions.hpp
index abfce06464..707db0b512 100644
--- a/components/detournavigator/gettilespositions.hpp
+++ b/components/detournavigator/gettilespositions.hpp
@@ -15,7 +15,7 @@ namespace DetourNavigator
 {
     template <class Callback>
     void getTilesPositions(const osg::Vec3f& aabbMin, const osg::Vec3f& aabbMax,
-        const Settings& settings, Callback&& callback)
+        const RecastSettings& settings, Callback&& callback)
     {
         auto min = toNavMeshCoordinates(settings, aabbMin);
         auto max = toNavMeshCoordinates(settings, aabbMax);
@@ -40,7 +40,7 @@ namespace DetourNavigator
 
     template <class Callback>
     void getTilesPositions(const btCollisionShape& shape, const btTransform& transform,
-        const Settings& settings, Callback&& callback)
+        const RecastSettings& settings, Callback&& callback)
     {
         btVector3 aabbMin;
         btVector3 aabbMax;
@@ -51,7 +51,7 @@ namespace DetourNavigator
 
     template <class Callback>
     void getTilesPositions(const int cellSize, const btVector3& shift,
-        const Settings& settings, Callback&& callback)
+        const RecastSettings& settings, Callback&& callback)
     {
         using Misc::Convert::toOsg;
 
diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index 7d478b9c1b..217e2b565e 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -36,32 +36,6 @@ namespace
         float mHeight;
     };
 
-    Rectangle getSwimRectangle(const CellWater& water, const Settings& settings, const osg::Vec3f& agentHalfExtents)
-    {
-        if (water.mWater.mCellSize == std::numeric_limits<int>::max())
-        {
-            return Rectangle {
-                TileBounds {
-                    osg::Vec2f(-std::numeric_limits<float>::max(), -std::numeric_limits<float>::max()),
-                    osg::Vec2f(std::numeric_limits<float>::max(), std::numeric_limits<float>::max())
-                },
-                toNavMeshCoordinates(settings, getSwimLevel(settings, water.mWater.mLevel, agentHalfExtents.z()))
-            };
-        }
-        else
-        {
-            const osg::Vec2f shift = getWaterShift2d(water.mCellPosition, water.mWater.mCellSize);
-            const float halfCellSize = water.mWater.mCellSize / 2.0f;
-            return Rectangle {
-                TileBounds{
-                    toNavMeshCoordinates(settings, shift + osg::Vec2f(-halfCellSize, -halfCellSize)),
-                    toNavMeshCoordinates(settings, shift + osg::Vec2f(halfCellSize, halfCellSize))
-                },
-                toNavMeshCoordinates(settings, getSwimLevel(settings, water.mWater.mLevel, agentHalfExtents.z()))
-            };
-        }
-    }
-
     std::vector<float> getOffMeshVerts(const std::vector<OffMeshConnection>& connections)
     {
         std::vector<float> result;
@@ -120,52 +94,46 @@ namespace
         return result;
     }
 
-    rcConfig makeConfig(const osg::Vec3f& agentHalfExtents, const TilePosition& tile, float minZ, float maxZ,
-        const Settings& settings)
-    {
-        rcConfig config;
-
-        config.cs = settings.mCellSize;
-        config.ch = settings.mCellHeight;
-        config.walkableSlopeAngle = settings.mMaxSlope;
-        config.walkableHeight = static_cast<int>(std::ceil(getHeight(settings, agentHalfExtents) / config.ch));
-        config.walkableClimb = static_cast<int>(std::floor(getMaxClimb(settings) / config.ch));
-        config.walkableRadius = static_cast<int>(std::ceil(getRadius(settings, agentHalfExtents) / config.cs));
-        config.maxEdgeLen = static_cast<int>(std::round(settings.mMaxEdgeLen / config.cs));
-        config.maxSimplificationError = settings.mMaxSimplificationError;
-        config.minRegionArea = settings.mRegionMinSize * settings.mRegionMinSize;
-        config.mergeRegionArea = settings.mRegionMergeSize * settings.mRegionMergeSize;
-        config.maxVertsPerPoly = settings.mMaxVertsPerPoly;
-        config.detailSampleDist = settings.mDetailSampleDist < 0.9f ? 0 : config.cs * settings.mDetailSampleDist;
-        config.detailSampleMaxError = config.ch * settings.mDetailSampleMaxError;
-        config.borderSize = settings.mBorderSize;
-        config.tileSize = settings.mTileSize;
-        const int size = config.tileSize + config.borderSize * 2;
-        config.width = size;
-        config.height = size;
-        const float halfBoundsSize = size * config.cs * 0.5f;
-        const osg::Vec2f shift = osg::Vec2f(tile.x() + 0.5f, tile.y() + 0.5f) * getTileSize(settings);
-        config.bmin[0] = shift.x() - halfBoundsSize;
-        config.bmin[1] = minZ;
-        config.bmin[2] = shift.y() - halfBoundsSize;
-        config.bmax[0] = shift.x() + halfBoundsSize;
-        config.bmax[1] = maxZ;
-        config.bmax[2] = shift.y() + halfBoundsSize;
-
-        return config;
+    float getHeight(const RecastSettings& settings,const osg::Vec3f& agentHalfExtents)
+    {
+        return 2.0f * agentHalfExtents.z() * settings.mRecastScaleFactor;
+    }
+
+    float getMaxClimb(const RecastSettings& settings)
+    {
+        return settings.mMaxClimb * settings.mRecastScaleFactor;
+    }
+
+    float getRadius(const RecastSettings& settings, const osg::Vec3f& agentHalfExtents)
+    {
+        return std::max(agentHalfExtents.x(), agentHalfExtents.y()) * std::sqrt(2) * settings.mRecastScaleFactor;
+    }
+
+    float getSwimLevel(const RecastSettings& settings, const float waterLevel, const float agentHalfExtentsZ)
+    {
+        return waterLevel - settings.mSwimHeightScale * agentHalfExtentsZ - agentHalfExtentsZ;;
     }
 
-    void createHeightfield(rcContext& context, rcHeightfield& solid, int width, int height, const float* bmin,
-        const float* bmax, const float cs, const float ch)
+    void initHeightfield(rcContext& context, const TilePosition& tilePosition, float minZ, float maxZ,
+        const RecastSettings& settings, rcHeightfield& solid)
     {
-        const auto result = rcCreateHeightfield(&context, solid, width, height, bmin, bmax, cs, ch);
+        const int size = settings.mTileSize + settings.mBorderSize * 2;
+        const int width = size;
+        const int height = size;
+        const float halfBoundsSize = size * settings.mCellSize * 0.5f;
+        const osg::Vec2f shift = osg::Vec2f(tilePosition.x() + 0.5f, tilePosition.y() + 0.5f) * getTileSize(settings);
+        const osg::Vec3f bmin(shift.x() - halfBoundsSize, minZ, shift.y() - halfBoundsSize);
+        const osg::Vec3f bmax(shift.x() + halfBoundsSize, maxZ, shift.y() + halfBoundsSize);
+
+        const auto result = rcCreateHeightfield(&context, solid, width, height, bmin.ptr(), bmax.ptr(),
+                                                settings.mCellSize, settings.mCellHeight);
 
         if (!result)
             throw NavigatorException("Failed to create heightfield for navmesh");
     }
 
-    bool rasterizeTriangles(rcContext& context, const Mesh& mesh, const Settings& settings, const rcConfig& config,
-        rcHeightfield& solid)
+    bool rasterizeTriangles(rcContext& context, const Mesh& mesh, const RecastSettings& settings,
+        const RecastParams& params, rcHeightfield& solid)
     {
         std::vector<unsigned char> areas(mesh.getAreaTypes().begin(), mesh.getAreaTypes().end());
         std::vector<float> vertices = mesh.getVertices();
@@ -179,7 +147,7 @@ namespace
 
         rcClearUnwalkableTriangles(
             &context,
-            config.walkableSlopeAngle,
+            settings.mMaxSlope,
             vertices.data(),
             static_cast<int>(mesh.getVerticesCount()),
             mesh.getIndices().data(),
@@ -195,30 +163,18 @@ namespace
             areas.data(),
             static_cast<int>(areas.size()),
             solid,
-            config.walkableClimb
+            params.mWalkableClimb
         );
     }
 
-    bool rasterizeTriangles(rcContext& context, const Rectangle& rectangle, const rcConfig& config,
-        AreaType areaType, rcHeightfield& solid)
+    bool rasterizeTriangles(rcContext& context, const Rectangle& rectangle, AreaType areaType,
+        const RecastParams& params, rcHeightfield& solid)
     {
-        const osg::Vec2f tileBoundsMin(
-            std::clamp(rectangle.mBounds.mMin.x(), config.bmin[0], config.bmax[0]),
-            std::clamp(rectangle.mBounds.mMin.y(), config.bmin[2], config.bmax[2])
-        );
-        const osg::Vec2f tileBoundsMax(
-            std::clamp(rectangle.mBounds.mMax.x(), config.bmin[0], config.bmax[0]),
-            std::clamp(rectangle.mBounds.mMax.y(), config.bmin[2], config.bmax[2])
-        );
-
-        if (tileBoundsMax == tileBoundsMin)
-            return true;
-
         const std::array vertices {
-            tileBoundsMin.x(), rectangle.mHeight, tileBoundsMin.y(),
-            tileBoundsMin.x(), rectangle.mHeight, tileBoundsMax.y(),
-            tileBoundsMax.x(), rectangle.mHeight, tileBoundsMax.y(),
-            tileBoundsMax.x(), rectangle.mHeight, tileBoundsMin.y(),
+            rectangle.mBounds.mMin.x(), rectangle.mHeight, rectangle.mBounds.mMin.y(),
+            rectangle.mBounds.mMin.x(), rectangle.mHeight, rectangle.mBounds.mMax.y(),
+            rectangle.mBounds.mMax.x(), rectangle.mHeight, rectangle.mBounds.mMax.y(),
+            rectangle.mBounds.mMax.x(), rectangle.mHeight, rectangle.mBounds.mMin.y(),
         };
 
         const std::array indices {
@@ -236,31 +192,42 @@ namespace
             areas.data(),
             static_cast<int>(areas.size()),
             solid,
-            config.walkableClimb
+            params.mWalkableClimb
         );
     }
 
     bool rasterizeTriangles(rcContext& context, const osg::Vec3f& agentHalfExtents, const std::vector<CellWater>& water,
-        const Settings& settings, const rcConfig& config, rcHeightfield& solid)
+        const RecastSettings& settings, const RecastParams& params, const TileBounds& realTileBounds, rcHeightfield& solid)
     {
         for (const CellWater& cellWater : water)
         {
-            const Rectangle rectangle = getSwimRectangle(cellWater, settings, agentHalfExtents);
-            if (!rasterizeTriangles(context, rectangle, config, AreaType_water, solid))
-                return false;
+            const TileBounds cellTileBounds = maxCellTileBounds(cellWater.mCellPosition, cellWater.mWater.mCellSize);
+            if (auto intersection = getIntersection(realTileBounds, cellTileBounds))
+            {
+                const Rectangle rectangle {
+                    toNavMeshCoordinates(settings, *intersection),
+                    toNavMeshCoordinates(settings, getSwimLevel(settings, cellWater.mWater.mLevel, agentHalfExtents.z()))
+                };
+                if (!rasterizeTriangles(context, rectangle, AreaType_water, params, solid))
+                    return false;
+            }
         }
         return true;
     }
 
-    bool rasterizeTriangles(rcContext& context, const TileBounds& tileBounds, const std::vector<FlatHeightfield>& heightfields,
-        const Settings& settings, const rcConfig& config, rcHeightfield& solid)
+    bool rasterizeTriangles(rcContext& context, const TileBounds& realTileBounds, const std::vector<FlatHeightfield>& heightfields,
+        const RecastSettings& settings, const RecastParams& params, rcHeightfield& solid)
     {
         for (const FlatHeightfield& heightfield : heightfields)
         {
-            if (auto intersection = getIntersection(tileBounds, maxCellTileBounds(heightfield.mCellPosition, heightfield.mCellSize)))
+            const TileBounds cellTileBounds = maxCellTileBounds(heightfield.mCellPosition, heightfield.mCellSize);
+            if (auto intersection = getIntersection(realTileBounds, cellTileBounds))
             {
-                const Rectangle rectangle {*intersection, toNavMeshCoordinates(settings, heightfield.mHeight)};
-                if (!rasterizeTriangles(context, rectangle, config, AreaType_ground, solid))
+                const Rectangle rectangle {
+                    toNavMeshCoordinates(settings, *intersection),
+                    toNavMeshCoordinates(settings, heightfield.mHeight)
+                };
+                if (!rasterizeTriangles(context, rectangle, AreaType_ground, params, solid))
                     return false;
             }
         }
@@ -268,27 +235,25 @@ namespace
     }
 
     bool rasterizeTriangles(rcContext& context, const std::vector<Heightfield>& heightfields,
-        const Settings& settings, const rcConfig& config, rcHeightfield& solid)
+        const RecastSettings& settings, const RecastParams& params, rcHeightfield& solid)
     {
-        using BulletHelpers::makeProcessTriangleCallback;
-
         for (const Heightfield& heightfield : heightfields)
         {
             const Mesh mesh = makeMesh(heightfield);
-            if (!rasterizeTriangles(context, mesh, settings, config, solid))
+            if (!rasterizeTriangles(context, mesh, settings, params, solid))
                 return false;
         }
         return true;
     }
 
     bool rasterizeTriangles(rcContext& context, const TilePosition& tilePosition, const osg::Vec3f& agentHalfExtents,
-        const RecastMesh& recastMesh, const rcConfig& config, const Settings& settings, rcHeightfield& solid)
+        const RecastMesh& recastMesh, const RecastSettings& settings, const RecastParams& params, rcHeightfield& solid)
     {
-        return rasterizeTriangles(context, recastMesh.getMesh(), settings, config, solid)
-            && rasterizeTriangles(context, agentHalfExtents, recastMesh.getWater(), settings, config, solid)
-            && rasterizeTriangles(context, recastMesh.getHeightfields(), settings, config, solid)
-            && rasterizeTriangles(context, makeRealTileBoundsWithBorder(settings, tilePosition),
-                                  recastMesh.getFlatHeightfields(), settings, config, solid);
+        const TileBounds realTileBounds = makeRealTileBoundsWithBorder(settings, tilePosition);
+        return rasterizeTriangles(context, recastMesh.getMesh(), settings, params, solid)
+            && rasterizeTriangles(context, agentHalfExtents, recastMesh.getWater(), settings, params, realTileBounds, solid)
+            && rasterizeTriangles(context, recastMesh.getHeightfields(), settings, params, solid)
+            && rasterizeTriangles(context, realTileBounds, recastMesh.getFlatHeightfields(), settings, params, solid);
     }
 
     void buildCompactHeightfield(rcContext& context, const int walkableHeight, const int walkableClimb,
@@ -359,27 +324,25 @@ namespace
             polyMesh.flags[i] = getFlag(static_cast<AreaType>(polyMesh.areas[i]));
     }
 
-    bool fillPolyMesh(rcContext& context, const rcConfig& config, rcHeightfield& solid, rcPolyMesh& polyMesh,
-        rcPolyMeshDetail& polyMeshDetail)
+    bool fillPolyMesh(rcContext& context, const RecastSettings& settings, const RecastParams& params,
+        rcHeightfield& solid, rcPolyMesh& polyMesh, rcPolyMeshDetail& polyMeshDetail)
     {
         rcCompactHeightfield compact;
-        compact.dist = nullptr;
-        buildCompactHeightfield(context, config.walkableHeight, config.walkableClimb, solid, compact);
+        buildCompactHeightfield(context, params.mWalkableHeight, params.mWalkableClimb, solid, compact);
 
-        erodeWalkableArea(context, config.walkableRadius, compact);
+        erodeWalkableArea(context, params.mWalkableRadius, compact);
         buildDistanceField(context, compact);
-        buildRegions(context, compact, config.borderSize, config.minRegionArea, config.mergeRegionArea);
+        buildRegions(context, compact, settings.mBorderSize, settings.mRegionMinArea, settings.mRegionMergeArea);
 
         rcContourSet contourSet;
-        buildContours(context, compact, config.maxSimplificationError, config.maxEdgeLen, contourSet);
+        buildContours(context, compact, settings.mMaxSimplificationError, params.mMaxEdgeLen, contourSet);
 
         if (contourSet.nconts == 0)
             return false;
 
-        buildPolyMesh(context, contourSet, config.maxVertsPerPoly, polyMesh);
+        buildPolyMesh(context, contourSet, settings.mMaxVertsPerPoly, polyMesh);
 
-        buildPolyMeshDetail(context, polyMesh, compact, config.detailSampleDist, config.detailSampleMaxError,
-                            polyMeshDetail);
+        buildPolyMeshDetail(context, polyMesh, compact, params.mSampleDist, params.mSampleMaxError, polyMeshDetail);
 
         setPolyMeshFlags(polyMesh);
 
@@ -395,7 +358,7 @@ namespace
         return power;
     }
 
-    std::pair<float, float> getBoundsByZ(const RecastMesh& recastMesh, const osg::Vec3f& agentHalfExtents, const Settings& settings)
+    std::pair<float, float> getBoundsByZ(const RecastMesh& recastMesh, const osg::Vec3f& agentHalfExtents, const RecastSettings& settings)
     {
         float minZ = 0;
         float maxZ = 0;
@@ -436,39 +399,54 @@ namespace
 
 namespace DetourNavigator
 {
+    RecastParams makeRecastParams(const RecastSettings& settings, const osg::Vec3f& agentHalfExtents)
+    {
+        RecastParams result;
+
+        result.mWalkableHeight = static_cast<int>(std::ceil(getHeight(settings, agentHalfExtents) / settings.mCellHeight));
+        result.mWalkableClimb = static_cast<int>(std::floor(getMaxClimb(settings) / settings.mCellHeight));
+        result.mWalkableRadius = static_cast<int>(std::ceil(getRadius(settings, agentHalfExtents) / settings.mCellSize));
+        result.mMaxEdgeLen = static_cast<int>(std::round(static_cast<float>(settings.mMaxEdgeLen) / settings.mCellSize));
+        result.mSampleDist = settings.mDetailSampleDist < 0.9f ? 0 : settings.mCellSize * settings.mDetailSampleDist;
+        result.mSampleMaxError = settings.mCellHeight * settings.mDetailSampleMaxError;
+
+        return result;
+    }
+
     std::unique_ptr<PreparedNavMeshData> prepareNavMeshTileData(const RecastMesh& recastMesh,
-        const TilePosition& tilePosition, const osg::Vec3f& agentHalfExtents, const Settings& settings)
+        const TilePosition& tilePosition, const osg::Vec3f& agentHalfExtents, const RecastSettings& settings)
     {
         const auto [minZ, maxZ] = getBoundsByZ(recastMesh, agentHalfExtents, settings);
 
         rcContext context;
-        const auto config = makeConfig(agentHalfExtents, tilePosition, toNavMeshCoordinates(settings, minZ),
-                                       toNavMeshCoordinates(settings, maxZ), settings);
 
         rcHeightfield solid;
-        createHeightfield(context, solid, config.width, config.height, config.bmin, config.bmax, config.cs, config.ch);
+        initHeightfield(context, tilePosition, toNavMeshCoordinates(settings, minZ),
+                        toNavMeshCoordinates(settings, maxZ), settings, solid);
+
+        const RecastParams params = makeRecastParams(settings, agentHalfExtents);
 
-        if (!rasterizeTriangles(context, tilePosition, agentHalfExtents, recastMesh, config, settings, solid))
+        if (!rasterizeTriangles(context, tilePosition, agentHalfExtents, recastMesh, settings, params, solid))
             return nullptr;
 
-        rcFilterLowHangingWalkableObstacles(&context, config.walkableClimb, solid);
-        rcFilterLedgeSpans(&context, config.walkableHeight, config.walkableClimb, solid);
-        rcFilterWalkableLowHeightSpans(&context, config.walkableHeight, solid);
+        rcFilterLowHangingWalkableObstacles(&context, params.mWalkableClimb, solid);
+        rcFilterLedgeSpans(&context, params.mWalkableHeight, params.mWalkableClimb, solid);
+        rcFilterWalkableLowHeightSpans(&context, params.mWalkableHeight, solid);
 
         std::unique_ptr<PreparedNavMeshData> result = std::make_unique<PreparedNavMeshData>();
 
-        if (!fillPolyMesh(context, config, solid, result->mPolyMesh, result->mPolyMeshDetail))
+        if (!fillPolyMesh(context, settings, params, solid, result->mPolyMesh, result->mPolyMeshDetail))
             return nullptr;
 
-        result->mCellSize = config.cs;
-        result->mCellHeight = config.ch;
+        result->mCellSize = settings.mCellSize;
+        result->mCellHeight = settings.mCellHeight;
 
         return result;
     }
 
     NavMeshData makeNavMeshTileData(const PreparedNavMeshData& data,
         const std::vector<OffMeshConnection>& offMeshConnections, const osg::Vec3f& agentHalfExtents,
-        const TilePosition& tile, const Settings& settings)
+        const TilePosition& tile, const RecastSettings& settings)
     {
         const auto offMeshConVerts = getOffMeshVerts(offMeshConnections);
         const std::vector<float> offMeshConRad(offMeshConnections.size(), getRadius(settings, agentHalfExtents));
@@ -524,7 +502,7 @@ namespace DetourNavigator
         // Max tiles and max polys affect how the tile IDs are caculated.
         // There are 22 bits available for identifying a tile and a polygon.
         const int polysAndTilesBits = 22;
-        const auto polysBits = getMinValuableBitsNumber(settings.mMaxPolys);
+        const auto polysBits = getMinValuableBitsNumber(settings.mDetour.mMaxPolys);
 
         if (polysBits >= polysAndTilesBits)
             throw InvalidArgument("Too many polygons per tile");
@@ -533,8 +511,8 @@ namespace DetourNavigator
 
         dtNavMeshParams params;
         std::fill_n(params.orig, 3, 0.0f);
-        params.tileWidth = settings.mTileSize * settings.mCellSize;
-        params.tileHeight = settings.mTileSize * settings.mCellSize;
+        params.tileWidth = settings.mRecast.mTileSize * settings.mRecast.mCellSize;
+        params.tileHeight = settings.mRecast.mTileSize * settings.mRecast.mCellSize;
         params.maxTiles = 1 << tilesBits;
         params.maxPolys = 1 << polysBits;
 
@@ -558,9 +536,9 @@ namespace DetourNavigator
     {
         Log(Debug::Debug) << std::fixed << std::setprecision(2) <<
             "Update NavMesh with multiple tiles:" <<
-            " agentHeight=" << getHeight(settings, agentHalfExtents) <<
-            " agentMaxClimb=" << getMaxClimb(settings) <<
-            " agentRadius=" << getRadius(settings, agentHalfExtents) <<
+            " agentHeight=" << getHeight(settings.mRecast, agentHalfExtents) <<
+            " agentMaxClimb=" << getMaxClimb(settings.mRecast) <<
+            " agentRadius=" << getRadius(settings.mRecast, agentHalfExtents) <<
             " changedTile=(" << changedTile << ")" <<
             " playerTile=(" << playerTile << ")" <<
             " changedTileDistance=" << getDistance(changedTile, playerTile);
@@ -591,7 +569,7 @@ namespace DetourNavigator
 
         if (!cachedNavMeshData)
         {
-            auto prepared = prepareNavMeshTileData(*recastMesh, changedTile, agentHalfExtents, settings);
+            auto prepared = prepareNavMeshTileData(*recastMesh, changedTile, agentHalfExtents, settings.mRecast);
 
             if (prepared == nullptr)
             {
@@ -601,7 +579,7 @@ namespace DetourNavigator
 
             if (updateType == UpdateType::Temporary)
                 return navMeshCacheItem->lock()->updateTile(changedTile, NavMeshTilesCache::Value(),
-                    makeNavMeshTileData(*prepared, offMeshConnections, agentHalfExtents, changedTile, settings));
+                    makeNavMeshTileData(*prepared, offMeshConnections, agentHalfExtents, changedTile, settings.mRecast));
 
             cachedNavMeshData = navMeshTilesCache.set(agentHalfExtents, changedTile, *recastMesh, std::move(prepared));
 
@@ -609,12 +587,12 @@ namespace DetourNavigator
             {
                 Log(Debug::Debug) << "Navigator cache overflow";
                 return navMeshCacheItem->lock()->updateTile(changedTile, NavMeshTilesCache::Value(),
-                    makeNavMeshTileData(*prepared, offMeshConnections, agentHalfExtents, changedTile, settings));
+                    makeNavMeshTileData(*prepared, offMeshConnections, agentHalfExtents, changedTile, settings.mRecast));
             }
         }
 
         const auto updateStatus = navMeshCacheItem->lock()->updateTile(changedTile, std::move(cachedNavMeshData),
-            makeNavMeshTileData(cachedNavMeshData.get(), offMeshConnections, agentHalfExtents, changedTile, settings));
+            makeNavMeshTileData(cachedNavMeshData.get(), offMeshConnections, agentHalfExtents, changedTile, settings.mRecast));
 
         return UpdateNavMeshStatusBuilder(updateStatus).cached(cached).getResult();
     }
diff --git a/components/detournavigator/makenavmesh.hpp b/components/detournavigator/makenavmesh.hpp
index 5b4169374b..989565d4bf 100644
--- a/components/detournavigator/makenavmesh.hpp
+++ b/components/detournavigator/makenavmesh.hpp
@@ -22,6 +22,16 @@ namespace DetourNavigator
     struct PreparedNavMeshData;
     struct NavMeshData;
 
+    struct RecastParams
+    {
+        float mSampleDist = 0;
+        float mSampleMaxError = 0;
+        int mMaxEdgeLen = 0;
+        int mWalkableClimb = 0;
+        int mWalkableHeight = 0;
+        int mWalkableRadius = 0;
+    };
+
     inline float getLength(const osg::Vec2i& value)
     {
         return std::sqrt(float(osg::square(value.x()) + osg::square(value.y())));
@@ -38,12 +48,14 @@ namespace DetourNavigator
         return expectedTilesCount <= maxTiles;
     }
 
+    RecastParams makeRecastParams(const RecastSettings& settings, const osg::Vec3f& agentHalfExtents);
+
     std::unique_ptr<PreparedNavMeshData> prepareNavMeshTileData(const RecastMesh& recastMesh, const TilePosition& tile,
         const Bounds& bounds, const osg::Vec3f& agentHalfExtents, const Settings& settings);
 
     NavMeshData makeNavMeshTileData(const PreparedNavMeshData& data,
         const std::vector<OffMeshConnection>& offMeshConnections, const osg::Vec3f& agentHalfExtents,
-        const TilePosition& tile, const Settings& settings);
+        const TilePosition& tile, const RecastSettings& settings);
 
     NavMeshPtr makeEmptyNavMesh(const Settings& settings);
 
diff --git a/components/detournavigator/navigatorimpl.cpp b/components/detournavigator/navigatorimpl.cpp
index 9092624ca3..541e1f791c 100644
--- a/components/detournavigator/navigatorimpl.cpp
+++ b/components/detournavigator/navigatorimpl.cpp
@@ -53,8 +53,8 @@ namespace DetourNavigator
     {
         if (addObject(id, static_cast<const ObjectShapes&>(shapes), transform))
         {
-            const osg::Vec3f start = toNavMeshCoordinates(mSettings, shapes.mConnectionStart);
-            const osg::Vec3f end = toNavMeshCoordinates(mSettings, shapes.mConnectionEnd);
+            const osg::Vec3f start = toNavMeshCoordinates(mSettings.mRecast, shapes.mConnectionStart);
+            const osg::Vec3f end = toNavMeshCoordinates(mSettings.mRecast, shapes.mConnectionEnd);
             mNavMeshManager.addOffMeshConnection(id, start, end, AreaType_door);
             mNavMeshManager.addOffMeshConnection(id, end, start, AreaType_door);
             return true;
@@ -126,8 +126,8 @@ namespace DetourNavigator
             const auto dst = Misc::Convert::makeOsgVec3f(converter.toWorldPoint(pathgrid.mPoints[edge.mV1]));
             mNavMeshManager.addOffMeshConnection(
                 ObjectId(&pathgrid),
-                toNavMeshCoordinates(mSettings, src),
-                toNavMeshCoordinates(mSettings, dst),
+                toNavMeshCoordinates(mSettings.mRecast, src),
+                toNavMeshCoordinates(mSettings.mRecast, dst),
                 AreaType_pathgrid
             );
         }
@@ -149,7 +149,7 @@ namespace DetourNavigator
 
     void NavigatorImpl::updatePlayerPosition(const osg::Vec3f& playerPosition)
     {
-        const TilePosition tilePosition = getTilePosition(mSettings, toNavMeshCoordinates(mSettings, playerPosition));
+        const TilePosition tilePosition = getTilePosition(mSettings.mRecast, toNavMeshCoordinates(mSettings.mRecast, playerPosition));
         if (mLastPlayerPosition.has_value() && *mLastPlayerPosition == tilePosition)
             return;
         update(playerPosition);
@@ -225,6 +225,6 @@ namespace DetourNavigator
     float NavigatorImpl::getMaxNavmeshAreaRealRadius() const
     {
         const auto& settings = getSettings();
-        return getRealTileSize(settings) * getMaxNavmeshAreaRadius(settings);
+        return getRealTileSize(settings.mRecast) * getMaxNavmeshAreaRadius(settings);
     }
 }
diff --git a/components/detournavigator/navigatorutils.cpp b/components/detournavigator/navigatorutils.cpp
index 82a108db6f..bc94e3f991 100644
--- a/components/detournavigator/navigatorutils.cpp
+++ b/components/detournavigator/navigatorutils.cpp
@@ -13,11 +13,11 @@ namespace DetourNavigator
             return std::nullopt;
         const auto settings = navigator.getSettings();
         const auto result = DetourNavigator::findRandomPointAroundCircle(navMesh->lockConst()->getImpl(),
-            toNavMeshCoordinates(settings, agentHalfExtents), toNavMeshCoordinates(settings, start),
-            toNavMeshCoordinates(settings, maxRadius), includeFlags, settings);
+            toNavMeshCoordinates(settings.mRecast, agentHalfExtents), toNavMeshCoordinates(settings.mRecast, start),
+            toNavMeshCoordinates(settings.mRecast, maxRadius), includeFlags, settings.mDetour);
         if (!result)
             return std::nullopt;
-        return std::optional<osg::Vec3f>(fromNavMeshCoordinates(settings, *result));
+        return std::optional<osg::Vec3f>(fromNavMeshCoordinates(settings.mRecast, *result));
     }
 
     std::optional<osg::Vec3f> raycast(const Navigator& navigator, const osg::Vec3f& agentHalfExtents, const osg::Vec3f& start,
@@ -28,10 +28,10 @@ namespace DetourNavigator
             return std::nullopt;
         const auto settings = navigator.getSettings();
         const auto result = DetourNavigator::raycast(navMesh->lockConst()->getImpl(),
-            toNavMeshCoordinates(settings, agentHalfExtents), toNavMeshCoordinates(settings, start),
-            toNavMeshCoordinates(settings, end), includeFlags, settings);
+            toNavMeshCoordinates(settings.mRecast, agentHalfExtents), toNavMeshCoordinates(settings.mRecast, start),
+            toNavMeshCoordinates(settings.mRecast, end), includeFlags, settings.mDetour);
         if (!result)
             return std::nullopt;
-        return fromNavMeshCoordinates(settings, *result);
+        return fromNavMeshCoordinates(settings.mRecast, *result);
     }
 }
diff --git a/components/detournavigator/navigatorutils.hpp b/components/detournavigator/navigatorutils.hpp
index 4ccc238f97..8f3b6161f9 100644
--- a/components/detournavigator/navigatorutils.hpp
+++ b/components/detournavigator/navigatorutils.hpp
@@ -37,9 +37,9 @@ namespace DetourNavigator
         if (navMesh == nullptr)
             return Status::NavMeshNotFound;
         const auto settings = navigator.getSettings();
-        return findSmoothPath(navMesh->lockConst()->getImpl(), toNavMeshCoordinates(settings, agentHalfExtents),
-            toNavMeshCoordinates(settings, stepSize), toNavMeshCoordinates(settings, start),
-            toNavMeshCoordinates(settings, end), includeFlags, areaCosts, settings, endTolerance, out);
+        return findSmoothPath(navMesh->lockConst()->getImpl(), toNavMeshCoordinates(settings.mRecast, agentHalfExtents),
+            toNavMeshCoordinates(settings.mRecast, stepSize), toNavMeshCoordinates(settings.mRecast, start),
+            toNavMeshCoordinates(settings.mRecast, end), includeFlags, areaCosts, settings, endTolerance, out);
     }
 
     /**
diff --git a/components/detournavigator/navmeshmanager.cpp b/components/detournavigator/navmeshmanager.cpp
index fff7d8d7cc..452fba93ad 100644
--- a/components/detournavigator/navmeshmanager.cpp
+++ b/components/detournavigator/navmeshmanager.cpp
@@ -43,8 +43,8 @@ namespace DetourNavigator
 {
     NavMeshManager::NavMeshManager(const Settings& settings)
         : mSettings(settings)
-        , mRecastMeshManager(settings)
-        , mOffMeshConnectionsManager(settings)
+        , mRecastMeshManager(mSettings.mRecast)
+        , mOffMeshConnectionsManager(mSettings.mRecast)
         , mAsyncNavMeshUpdater(settings, mRecastMeshManager, mOffMeshConnectionsManager)
     {}
 
@@ -140,8 +140,8 @@ namespace DetourNavigator
     {
         mOffMeshConnectionsManager.add(id, OffMeshConnection {start, end, areaType});
 
-        const auto startTilePosition = getTilePosition(mSettings, start);
-        const auto endTilePosition = getTilePosition(mSettings, end);
+        const auto startTilePosition = getTilePosition(mSettings.mRecast, start);
+        const auto endTilePosition = getTilePosition(mSettings.mRecast, end);
 
         addChangedTile(startTilePosition, ChangeType::add);
 
@@ -158,7 +158,7 @@ namespace DetourNavigator
 
     void NavMeshManager::update(const osg::Vec3f& playerPosition, const osg::Vec3f& agentHalfExtents)
     {
-        const auto playerTile = getTilePosition(mSettings, toNavMeshCoordinates(mSettings, playerPosition));
+        const auto playerTile = getTilePosition(mSettings.mRecast, toNavMeshCoordinates(mSettings.mRecast, playerPosition));
         auto& lastRevision = mLastRecastMeshManagerRevision[agentHalfExtents];
         auto lastPlayerTile = mPlayerTile.find(agentHalfExtents);
         if (lastRevision == mRecastMeshManager.getRevision() && lastPlayerTile != mPlayerTile.end()
@@ -251,7 +251,7 @@ namespace DetourNavigator
     void NavMeshManager::addChangedTiles(const btCollisionShape& shape, const btTransform& transform,
             const ChangeType changeType)
     {
-        getTilesPositions(shape, transform, mSettings,
+        getTilesPositions(shape, transform, mSettings.mRecast,
             [&] (const TilePosition& v) { addChangedTile(v, changeType); });
     }
 
@@ -261,7 +261,7 @@ namespace DetourNavigator
         if (cellSize == std::numeric_limits<int>::max())
             return;
 
-        getTilesPositions(cellSize, shift, mSettings,
+        getTilesPositions(cellSize, shift, mSettings.mRecast,
             [&] (const TilePosition& v) { addChangedTile(v, changeType); });
     }
 
diff --git a/components/detournavigator/offmeshconnectionsmanager.cpp b/components/detournavigator/offmeshconnectionsmanager.cpp
index a673ae3e68..2306e50da9 100644
--- a/components/detournavigator/offmeshconnectionsmanager.cpp
+++ b/components/detournavigator/offmeshconnectionsmanager.cpp
@@ -11,7 +11,7 @@
 
 namespace DetourNavigator
 {
-    OffMeshConnectionsManager::OffMeshConnectionsManager(const Settings& settings)
+    OffMeshConnectionsManager::OffMeshConnectionsManager(const RecastSettings& settings)
         : mSettings(settings)
     {}
 
diff --git a/components/detournavigator/offmeshconnectionsmanager.hpp b/components/detournavigator/offmeshconnectionsmanager.hpp
index 20a6427cd5..a0a1231bc4 100644
--- a/components/detournavigator/offmeshconnectionsmanager.hpp
+++ b/components/detournavigator/offmeshconnectionsmanager.hpp
@@ -18,7 +18,7 @@ namespace DetourNavigator
     class OffMeshConnectionsManager
     {
     public:
-        OffMeshConnectionsManager(const Settings& settings);
+        explicit OffMeshConnectionsManager(const RecastSettings& settings);
 
         void add(const ObjectId id, const OffMeshConnection& value);
 
@@ -33,7 +33,7 @@ namespace DetourNavigator
             std::map<TilePosition, std::unordered_set<ObjectId>> mByTilePosition;
         };
 
-        const Settings& mSettings;
+        const RecastSettings& mSettings;
         Misc::ScopeGuarded<Values> mValues;
     };
 }
diff --git a/components/detournavigator/raycast.cpp b/components/detournavigator/raycast.cpp
index 271da22496..be3217ba40 100644
--- a/components/detournavigator/raycast.cpp
+++ b/components/detournavigator/raycast.cpp
@@ -10,7 +10,7 @@
 namespace DetourNavigator
 {
     std::optional<osg::Vec3f> raycast(const dtNavMesh& navMesh, const osg::Vec3f& halfExtents,
-        const osg::Vec3f& start, const osg::Vec3f& end, const Flags includeFlags, const Settings& settings)
+        const osg::Vec3f& start, const osg::Vec3f& end, const Flags includeFlags, const DetourSettings& settings)
     {
         dtNavMeshQuery navMeshQuery;
         if (!initNavMeshQuery(navMeshQuery, navMesh, settings.mMaxNavMeshQueryNodes))
diff --git a/components/detournavigator/raycast.hpp b/components/detournavigator/raycast.hpp
index ddf61b49f4..60cdf0a157 100644
--- a/components/detournavigator/raycast.hpp
+++ b/components/detournavigator/raycast.hpp
@@ -10,10 +10,10 @@ class dtNavMesh;
 
 namespace DetourNavigator
 {
-    struct Settings;
+    struct DetourSettings;
 
     std::optional<osg::Vec3f> raycast(const dtNavMesh& navMesh, const osg::Vec3f& halfExtents,
-        const osg::Vec3f& start, const osg::Vec3f& end, const Flags includeFlags, const Settings& settings);
+        const osg::Vec3f& start, const osg::Vec3f& end, const Flags includeFlags, const DetourSettings& settings);
 }
 
 #endif
diff --git a/components/detournavigator/settings.cpp b/components/detournavigator/settings.cpp
index e428f3695a..5ad45d699b 100644
--- a/components/detournavigator/settings.cpp
+++ b/components/detournavigator/settings.cpp
@@ -3,43 +3,65 @@
 #include <components/settings/settings.hpp>
 #include <components/misc/constants.hpp>
 
+#include <algorithm>
+
 namespace DetourNavigator
 {
+    RecastSettings makeRecastSettingsFromSettingsManager()
+    {
+        constexpr float epsilon = std::numeric_limits<float>::epsilon();
+
+        RecastSettings result;
+
+        result.mBorderSize = std::max(0, ::Settings::Manager::getInt("border size", "Navigator"));
+        result.mCellHeight = std::max(epsilon, ::Settings::Manager::getFloat("cell height", "Navigator"));
+        result.mCellSize = std::max(epsilon, ::Settings::Manager::getFloat("cell size", "Navigator"));
+        result.mDetailSampleDist = std::max(0.0f, ::Settings::Manager::getFloat("detail sample dist", "Navigator"));
+        result.mDetailSampleMaxError = std::max(0.0f, ::Settings::Manager::getFloat("detail sample max error", "Navigator"));
+        result.mMaxClimb = Constants::sStepSizeUp;
+        result.mMaxSimplificationError = std::max(0.0f, ::Settings::Manager::getFloat("max simplification error", "Navigator"));
+        result.mMaxSlope = Constants::sMaxSlope;
+        result.mRecastScaleFactor = std::max(epsilon, ::Settings::Manager::getFloat("recast scale factor", "Navigator"));
+        result.mSwimHeightScale = 0;
+        result.mMaxEdgeLen = std::max(0, ::Settings::Manager::getInt("max edge len", "Navigator"));
+        result.mMaxVertsPerPoly = std::max(3, ::Settings::Manager::getInt("max verts per poly", "Navigator"));
+        result.mRegionMergeArea = std::max(0, ::Settings::Manager::getInt("region merge area", "Navigator"));
+        result.mRegionMinArea = std::max(0, ::Settings::Manager::getInt("region min area", "Navigator"));
+        result.mTileSize = std::max(1, ::Settings::Manager::getInt("tile size", "Navigator"));
+
+        return result;
+    }
+
+    DetourSettings makeDetourSettingsFromSettingsManager()
+    {
+        DetourSettings result;
+
+        result.mMaxNavMeshQueryNodes = std::clamp(::Settings::Manager::getInt("max nav mesh query nodes", "Navigator"), 1, 65535);
+        result.mMaxPolys = std::clamp(::Settings::Manager::getInt("max polygons per tile", "Navigator"), 1, (1 << 22) - 1);
+        result.mMaxPolygonPathSize = static_cast<std::size_t>(std::max(0, ::Settings::Manager::getInt("max polygon path size", "Navigator")));
+        result.mMaxSmoothPathSize = static_cast<std::size_t>(std::max(0, ::Settings::Manager::getInt("max smooth path size", "Navigator")));
+
+        return result;
+    }
+
     Settings makeSettingsFromSettingsManager()
     {
-        Settings navigatorSettings;
-
-        navigatorSettings.mBorderSize = ::Settings::Manager::getInt("border size", "Navigator");
-        navigatorSettings.mCellHeight = ::Settings::Manager::getFloat("cell height", "Navigator");
-        navigatorSettings.mCellSize = ::Settings::Manager::getFloat("cell size", "Navigator");
-        navigatorSettings.mDetailSampleDist = ::Settings::Manager::getFloat("detail sample dist", "Navigator");
-        navigatorSettings.mDetailSampleMaxError = ::Settings::Manager::getFloat("detail sample max error", "Navigator");
-        navigatorSettings.mMaxClimb = Constants::sStepSizeUp;
-        navigatorSettings.mMaxSimplificationError = ::Settings::Manager::getFloat("max simplification error", "Navigator");
-        navigatorSettings.mMaxSlope = Constants::sMaxSlope;
-        navigatorSettings.mRecastScaleFactor = ::Settings::Manager::getFloat("recast scale factor", "Navigator");
-        navigatorSettings.mSwimHeightScale = 0;
-        navigatorSettings.mMaxEdgeLen = ::Settings::Manager::getInt("max edge len", "Navigator");
-        navigatorSettings.mMaxNavMeshQueryNodes = ::Settings::Manager::getInt("max nav mesh query nodes", "Navigator");
-        navigatorSettings.mMaxPolys = ::Settings::Manager::getInt("max polygons per tile", "Navigator");
-        navigatorSettings.mMaxTilesNumber = ::Settings::Manager::getInt("max tiles number", "Navigator");
-        navigatorSettings.mMaxVertsPerPoly = ::Settings::Manager::getInt("max verts per poly", "Navigator");
-        navigatorSettings.mRegionMergeSize = ::Settings::Manager::getInt("region merge size", "Navigator");
-        navigatorSettings.mRegionMinSize = ::Settings::Manager::getInt("region min size", "Navigator");
-        navigatorSettings.mTileSize = ::Settings::Manager::getInt("tile size", "Navigator");
-        navigatorSettings.mWaitUntilMinDistanceToPlayer = ::Settings::Manager::getInt("wait until min distance to player", "Navigator");
-        navigatorSettings.mAsyncNavMeshUpdaterThreads = static_cast<std::size_t>(::Settings::Manager::getInt("async nav mesh updater threads", "Navigator"));
-        navigatorSettings.mMaxNavMeshTilesCacheSize = static_cast<std::size_t>(::Settings::Manager::getInt("max nav mesh tiles cache size", "Navigator"));
-        navigatorSettings.mMaxPolygonPathSize = static_cast<std::size_t>(::Settings::Manager::getInt("max polygon path size", "Navigator"));
-        navigatorSettings.mMaxSmoothPathSize = static_cast<std::size_t>(::Settings::Manager::getInt("max smooth path size", "Navigator"));
-        navigatorSettings.mEnableWriteRecastMeshToFile = ::Settings::Manager::getBool("enable write recast mesh to file", "Navigator");
-        navigatorSettings.mEnableWriteNavMeshToFile = ::Settings::Manager::getBool("enable write nav mesh to file", "Navigator");
-        navigatorSettings.mRecastMeshPathPrefix = ::Settings::Manager::getString("recast mesh path prefix", "Navigator");
-        navigatorSettings.mNavMeshPathPrefix = ::Settings::Manager::getString("nav mesh path prefix", "Navigator");
-        navigatorSettings.mEnableRecastMeshFileNameRevision = ::Settings::Manager::getBool("enable recast mesh file name revision", "Navigator");
-        navigatorSettings.mEnableNavMeshFileNameRevision = ::Settings::Manager::getBool("enable nav mesh file name revision", "Navigator");
-        navigatorSettings.mMinUpdateInterval = std::chrono::milliseconds(::Settings::Manager::getInt("min update interval ms", "Navigator"));
-
-        return navigatorSettings;
+        Settings result;
+
+        result.mRecast = makeRecastSettingsFromSettingsManager();
+        result.mDetour = makeDetourSettingsFromSettingsManager();
+        result.mMaxTilesNumber = std::max(0, ::Settings::Manager::getInt("max tiles number", "Navigator"));
+        result.mWaitUntilMinDistanceToPlayer = ::Settings::Manager::getInt("wait until min distance to player", "Navigator");
+        result.mAsyncNavMeshUpdaterThreads = static_cast<std::size_t>(std::max(0, ::Settings::Manager::getInt("async nav mesh updater threads", "Navigator")));
+        result.mMaxNavMeshTilesCacheSize = static_cast<std::size_t>(std::max(std::int64_t {0}, ::Settings::Manager::getInt64("max nav mesh tiles cache size", "Navigator")));
+        result.mEnableWriteRecastMeshToFile = ::Settings::Manager::getBool("enable write recast mesh to file", "Navigator");
+        result.mEnableWriteNavMeshToFile = ::Settings::Manager::getBool("enable write nav mesh to file", "Navigator");
+        result.mRecastMeshPathPrefix = ::Settings::Manager::getString("recast mesh path prefix", "Navigator");
+        result.mNavMeshPathPrefix = ::Settings::Manager::getString("nav mesh path prefix", "Navigator");
+        result.mEnableRecastMeshFileNameRevision = ::Settings::Manager::getBool("enable recast mesh file name revision", "Navigator");
+        result.mEnableNavMeshFileNameRevision = ::Settings::Manager::getBool("enable nav mesh file name revision", "Navigator");
+        result.mMinUpdateInterval = std::chrono::milliseconds(::Settings::Manager::getInt("min update interval ms", "Navigator"));
+
+        return result;
     }
 }
diff --git a/components/detournavigator/settings.hpp b/components/detournavigator/settings.hpp
index 0ea35d9b49..fbd44dfcfc 100644
--- a/components/detournavigator/settings.hpp
+++ b/components/detournavigator/settings.hpp
@@ -6,12 +6,8 @@
 
 namespace DetourNavigator
 {
-    struct Settings
+    struct RecastSettings
     {
-        bool mEnableWriteRecastMeshToFile = false;
-        bool mEnableWriteNavMeshToFile = false;
-        bool mEnableRecastMeshFileNameRevision = false;
-        bool mEnableNavMeshFileNameRevision = false;
         float mCellHeight = 0;
         float mCellSize = 0;
         float mDetailSampleDist = 0;
@@ -23,23 +19,41 @@ namespace DetourNavigator
         float mSwimHeightScale = 0;
         int mBorderSize = 0;
         int mMaxEdgeLen = 0;
-        int mMaxNavMeshQueryNodes = 0;
-        int mMaxPolys = 0;
-        int mMaxTilesNumber = 0;
         int mMaxVertsPerPoly = 0;
-        int mRegionMergeSize = 0;
-        int mRegionMinSize = 0;
+        int mRegionMergeArea = 0;
+        int mRegionMinArea = 0;
         int mTileSize = 0;
+    };
+
+    struct DetourSettings
+    {
+        int mMaxPolys = 0;
+        int mMaxNavMeshQueryNodes = 0;
+        std::size_t mMaxPolygonPathSize = 0;
+        std::size_t mMaxSmoothPathSize = 0;
+    };
+
+    struct Settings
+    {
+        bool mEnableWriteRecastMeshToFile = false;
+        bool mEnableWriteNavMeshToFile = false;
+        bool mEnableRecastMeshFileNameRevision = false;
+        bool mEnableNavMeshFileNameRevision = false;
+        RecastSettings mRecast;
+        DetourSettings mDetour;
         int mWaitUntilMinDistanceToPlayer = 0;
+        int mMaxTilesNumber = 0;
         std::size_t mAsyncNavMeshUpdaterThreads = 0;
         std::size_t mMaxNavMeshTilesCacheSize = 0;
-        std::size_t mMaxPolygonPathSize = 0;
-        std::size_t mMaxSmoothPathSize = 0;
         std::string mRecastMeshPathPrefix;
         std::string mNavMeshPathPrefix;
         std::chrono::milliseconds mMinUpdateInterval;
     };
 
+    RecastSettings makeRecastSettingsFromSettingsManager();
+
+    DetourSettings makeDetourSettingsFromSettingsManager();
+
     Settings makeSettingsFromSettingsManager();
 }
 
diff --git a/components/detournavigator/settingsutils.hpp b/components/detournavigator/settingsutils.hpp
index 6f15faaa3e..285920e5a0 100644
--- a/components/detournavigator/settingsutils.hpp
+++ b/components/detournavigator/settingsutils.hpp
@@ -4,12 +4,8 @@
 #include "settings.hpp"
 #include "tilebounds.hpp"
 #include "tileposition.hpp"
-#include "tilebounds.hpp"
-
-#include <LinearMath/btTransform.h>
 
 #include <osg/Vec2f>
-#include <osg/Vec2i>
 #include <osg/Vec3f>
 
 #include <algorithm>
@@ -17,38 +13,31 @@
 
 namespace DetourNavigator
 {
-    inline float getHeight(const Settings& settings,const osg::Vec3f& agentHalfExtents)
-    {
-        return 2.0f * agentHalfExtents.z() * settings.mRecastScaleFactor;
-    }
-
-    inline float getMaxClimb(const Settings& settings)
-    {
-        return settings.mMaxClimb * settings.mRecastScaleFactor;
-    }
-
-    inline float getRadius(const Settings& settings, const osg::Vec3f& agentHalfExtents)
-    {
-        return std::max(agentHalfExtents.x(), agentHalfExtents.y()) * std::sqrt(2) * settings.mRecastScaleFactor;
-    }
-
-    inline float toNavMeshCoordinates(const Settings& settings, float value)
+    inline float toNavMeshCoordinates(const RecastSettings& settings, float value)
     {
         return value * settings.mRecastScaleFactor;
     }
 
-    inline osg::Vec2f toNavMeshCoordinates(const Settings& settings, osg::Vec2f position)
+    inline osg::Vec2f toNavMeshCoordinates(const RecastSettings& settings, osg::Vec2f position)
     {
         return position * settings.mRecastScaleFactor;
     }
 
-    inline osg::Vec3f toNavMeshCoordinates(const Settings& settings, osg::Vec3f position)
+    inline osg::Vec3f toNavMeshCoordinates(const RecastSettings& settings, osg::Vec3f position)
     {
         std::swap(position.y(), position.z());
         return position * settings.mRecastScaleFactor;
     }
 
-    inline osg::Vec3f fromNavMeshCoordinates(const Settings& settings, osg::Vec3f position)
+    inline TileBounds toNavMeshCoordinates(const RecastSettings& settings, const TileBounds& value)
+    {
+        return TileBounds {
+            toNavMeshCoordinates(settings, value.mMin),
+            toNavMeshCoordinates(settings, value.mMax)
+        };
+    }
+
+    inline osg::Vec3f fromNavMeshCoordinates(const RecastSettings& settings, osg::Vec3f position)
     {
         const auto factor = 1.0f / settings.mRecastScaleFactor;
         position *= factor;
@@ -56,12 +45,12 @@ namespace DetourNavigator
         return position;
     }
 
-    inline float getTileSize(const Settings& settings)
+    inline float getTileSize(const RecastSettings& settings)
     {
         return static_cast<float>(settings.mTileSize) * settings.mCellSize;
     }
 
-    inline TilePosition getTilePosition(const Settings& settings, const osg::Vec3f& position)
+    inline TilePosition getTilePosition(const RecastSettings& settings, const osg::Vec3f& position)
     {
         return TilePosition(
             static_cast<int>(std::floor(position.x() / getTileSize(settings))),
@@ -69,7 +58,7 @@ namespace DetourNavigator
         );
     }
 
-    inline TileBounds makeTileBounds(const Settings& settings, const TilePosition& tilePosition)
+    inline TileBounds makeTileBounds(const RecastSettings& settings, const TilePosition& tilePosition)
     {
         return TileBounds {
             osg::Vec2f(tilePosition.x(), tilePosition.y()) * getTileSize(settings),
@@ -77,17 +66,12 @@ namespace DetourNavigator
         };
     }
 
-    inline float getBorderSize(const Settings& settings)
+    inline float getBorderSize(const RecastSettings& settings)
     {
         return static_cast<float>(settings.mBorderSize) * settings.mCellSize;
     }
 
-    inline float getSwimLevel(const Settings& settings, const float waterLevel, const float agentHalfExtentsZ)
-    {
-        return waterLevel - settings.mSwimHeightScale * agentHalfExtentsZ - agentHalfExtentsZ;;
-    }
-
-    inline float getRealTileSize(const Settings& settings)
+    inline float getRealTileSize(const RecastSettings& settings)
     {
         return settings.mTileSize * settings.mCellSize / settings.mRecastScaleFactor;
     }
@@ -97,7 +81,7 @@ namespace DetourNavigator
         return std::floor(std::sqrt(settings.mMaxTilesNumber / osg::PI)) - 1;
     }
 
-    inline TileBounds makeRealTileBoundsWithBorder(const Settings& settings, const TilePosition& tilePosition)
+    inline TileBounds makeRealTileBoundsWithBorder(const RecastSettings& settings, const TilePosition& tilePosition)
     {
         TileBounds result = makeTileBounds(settings, tilePosition);
         const float border = getBorderSize(settings);
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.cpp b/components/detournavigator/tilecachedrecastmeshmanager.cpp
index 20fbe30667..ebd64180aa 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -10,7 +10,7 @@
 
 namespace DetourNavigator
 {
-    TileCachedRecastMeshManager::TileCachedRecastMeshManager(const Settings& settings)
+    TileCachedRecastMeshManager::TileCachedRecastMeshManager(const RecastSettings& settings)
         : mSettings(settings)
     {}
 
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.hpp b/components/detournavigator/tilecachedrecastmeshmanager.hpp
index bb08a4227e..96183a51be 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.hpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.hpp
@@ -20,7 +20,7 @@ namespace DetourNavigator
     class TileCachedRecastMeshManager
     {
     public:
-        TileCachedRecastMeshManager(const Settings& settings);
+        explicit TileCachedRecastMeshManager(const RecastSettings& settings);
 
         bool addObject(const ObjectId id, const CollisionShape& shape, const btTransform& transform,
                        const AreaType areaType);
@@ -102,7 +102,7 @@ namespace DetourNavigator
     private:
         using TilesMap = std::map<TilePosition, std::shared_ptr<CachedRecastMeshManager>>;
 
-        const Settings& mSettings;
+        const RecastSettings& mSettings;
         Misc::ScopeGuarded<TilesMap> mTiles;
         std::unordered_map<ObjectId, std::vector<TilePosition>> mObjectsTilesPositions;
         std::map<osg::Vec2i, std::vector<TilePosition>> mWaterTilesPositions;
diff --git a/components/sceneutil/agentpath.cpp b/components/sceneutil/agentpath.cpp
index 5721110f77..db026a3332 100644
--- a/components/sceneutil/agentpath.cpp
+++ b/components/sceneutil/agentpath.cpp
@@ -37,7 +37,7 @@ namespace SceneUtil
 {
     osg::ref_ptr<osg::Group> createAgentPathGroup(const std::deque<osg::Vec3f>& path,
             const osg::Vec3f& halfExtents, const osg::Vec3f& start, const osg::Vec3f& end,
-            const DetourNavigator::Settings& settings)
+            const DetourNavigator::RecastSettings& settings)
     {
         using namespace DetourNavigator;
 
diff --git a/components/sceneutil/agentpath.hpp b/components/sceneutil/agentpath.hpp
index a8965d852e..1194fa512a 100644
--- a/components/sceneutil/agentpath.hpp
+++ b/components/sceneutil/agentpath.hpp
@@ -13,14 +13,14 @@ namespace osg
 
 namespace DetourNavigator
 {
-    struct Settings;
+    struct RecastSettings;
 }
 
 namespace SceneUtil
 {
     osg::ref_ptr<osg::Group> createAgentPathGroup(const std::deque<osg::Vec3f>& path,
             const osg::Vec3f& halfExtents, const osg::Vec3f& start, const osg::Vec3f& end,
-            const DetourNavigator::Settings& settings);
+            const DetourNavigator::RecastSettings& settings);
 }
 
 #endif
diff --git a/components/sceneutil/navmesh.cpp b/components/sceneutil/navmesh.cpp
index d66f95381c..eac3d17156 100644
--- a/components/sceneutil/navmesh.cpp
+++ b/components/sceneutil/navmesh.cpp
@@ -254,9 +254,9 @@ namespace SceneUtil
         osg::ref_ptr<osg::Group> group(new osg::Group);
         group->setStateSet(groupStateSet);
         constexpr float shift = 10.0f;
-        DebugDraw debugDraw(*group, debugDrawStateSet, osg::Vec3f(0, 0, shift), 1.0f / settings.mRecastScaleFactor);
+        DebugDraw debugDraw(*group, debugDrawStateSet, osg::Vec3f(0, 0, shift), 1.0f / settings.mRecast.mRecastScaleFactor);
         dtNavMeshQuery navMeshQuery;
-        navMeshQuery.init(&navMesh, settings.mMaxNavMeshQueryNodes);
+        navMeshQuery.init(&navMesh, settings.mDetour.mMaxNavMeshQueryNodes);
         drawMeshTile(&debugDraw, navMesh, &navMeshQuery, &meshTile, DU_DRAWNAVMESH_OFFMESHCONS | DU_DRAWNAVMESH_CLOSEDLIST);
 
         return group;
diff --git a/components/sceneutil/recastmesh.cpp b/components/sceneutil/recastmesh.cpp
index 9614673a64..d320624682 100644
--- a/components/sceneutil/recastmesh.cpp
+++ b/components/sceneutil/recastmesh.cpp
@@ -42,7 +42,7 @@ namespace
 namespace SceneUtil
 {
     osg::ref_ptr<osg::Group> createRecastMeshGroup(const DetourNavigator::RecastMesh& recastMesh,
-        const DetourNavigator::Settings& settings)
+        const DetourNavigator::RecastSettings& settings)
     {
         using namespace DetourNavigator;
 
diff --git a/components/sceneutil/recastmesh.hpp b/components/sceneutil/recastmesh.hpp
index ee5d9865e5..674b5b1d2a 100644
--- a/components/sceneutil/recastmesh.hpp
+++ b/components/sceneutil/recastmesh.hpp
@@ -11,13 +11,13 @@ namespace osg
 namespace DetourNavigator
 {
     class RecastMesh;
-    struct Settings;
+    struct RecastSettings;
 }
 
 namespace SceneUtil
 {
     osg::ref_ptr<osg::Group> createRecastMeshGroup(const DetourNavigator::RecastMesh& recastMesh,
-        const DetourNavigator::Settings& settings);
+        const DetourNavigator::RecastSettings& settings);
 }
 
 #endif
diff --git a/components/settings/settings.cpp b/components/settings/settings.cpp
index cef627acd4..7fa625e4ab 100644
--- a/components/settings/settings.cpp
+++ b/components/settings/settings.cpp
@@ -79,6 +79,15 @@ int Manager::getInt (const std::string& setting, const std::string& category)
     return number;
 }
 
+std::int64_t Manager::getInt64 (const std::string& setting, const std::string& category)
+{
+    const std::string& value = getString(setting, category);
+    std::stringstream stream(value);
+    std::size_t number = 0;
+    stream >> number;
+    return number;
+}
+
 bool Manager::getBool (const std::string& setting, const std::string& category)
 {
     const std::string& string = getString(setting, category);
diff --git a/components/settings/settings.hpp b/components/settings/settings.hpp
index 21d5aff770..a4b1cf3a54 100644
--- a/components/settings/settings.hpp
+++ b/components/settings/settings.hpp
@@ -51,6 +51,7 @@ namespace Settings
         ///< returns the list of changed settings intersecting with the filter
 
         static int getInt (const std::string& setting, const std::string& category);
+        static std::int64_t getInt64 (const std::string& setting, const std::string& category);
         static float getFloat (const std::string& setting, const std::string& category);
         static double getDouble (const std::string& setting, const std::string& category);
         static std::string getString (const std::string& setting, const std::string& category);
diff --git a/docs/source/reference/modding/settings/navigator.rst b/docs/source/reference/modding/settings/navigator.rst
index aea817530e..f8ab4522d6 100644
--- a/docs/source/reference/modding/settings/navigator.rst
+++ b/docs/source/reference/modding/settings/navigator.rst
@@ -365,20 +365,20 @@ max verts per poly
 
 The maximum number of vertices allowed for polygons generated during the contour to polygon conversion process.
 
-region merge size
+region merge area
 -----------------
 
 :Type:		integer
 :Range:		>= 0
-:Default:	20
+:Default:	400
 
 Any regions with a span count smaller than this value will, if possible, be merged with larger regions.
 
-region min size
+region min area
 ---------------
 
 :Type:		integer
 :Range:		>= 0
-:Default:	8
+:Default:	64
 
 The minimum number of cells allowed to form isolated island areas.
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 9715e3793e..084aad4fe3 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -876,10 +876,10 @@ max polygons per tile = 4096
 max verts per poly = 6
 
 # Any regions with a span count smaller than this value will, if possible, be merged with larger regions. (value >= 0)
-region merge size = 20
+region merge area = 400
 
 # The minimum number of cells allowed to form isolated island areas. (value >= 0)
-region min size = 8
+region min area = 64
 
 # Number of background threads to update nav mesh (value >= 1)
 async nav mesh updater threads = 1

From 5325495f464462826f9b062ee42f4a001e2cc6b4 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 30 Oct 2021 17:01:50 +0200
Subject: [PATCH 1841/2859] Move serialization detournavigator/ -> components/

---
 apps/openmw_test_suite/CMakeLists.txt                  |  9 +++++----
 .../serialization/binaryreader.cpp                     |  6 +++---
 .../serialization/binarywriter.cpp                     |  6 +++---
 .../{detournavigator => }/serialization/format.hpp     |  8 ++++----
 .../serialization/integration.cpp                      | 10 +++++-----
 .../serialization/sizeaccumulator.cpp                  |  6 +++---
 .../serialization/binaryreader.hpp                     |  6 +++---
 .../serialization/binarywriter.hpp                     |  6 +++---
 .../{detournavigator => }/serialization/format.hpp     |  9 ++++++---
 .../serialization/sizeaccumulator.hpp                  |  6 +++---
 10 files changed, 38 insertions(+), 34 deletions(-)
 rename apps/openmw_test_suite/{detournavigator => }/serialization/binaryreader.cpp (93%)
 rename apps/openmw_test_suite/{detournavigator => }/serialization/binarywriter.cpp (91%)
 rename apps/openmw_test_suite/{detournavigator => }/serialization/format.hpp (89%)
 rename apps/openmw_test_suite/{detournavigator => }/serialization/integration.cpp (85%)
 rename apps/openmw_test_suite/{detournavigator => }/serialization/sizeaccumulator.cpp (85%)
 rename components/{detournavigator => }/serialization/binaryreader.hpp (89%)
 rename components/{detournavigator => }/serialization/binarywriter.hpp (89%)
 rename components/{detournavigator => }/serialization/format.hpp (90%)
 rename components/{detournavigator => }/serialization/sizeaccumulator.hpp (81%)

diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index 7cfac20421..57e05b8511 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -41,10 +41,11 @@ if (GTEST_FOUND AND GMOCK_FOUND)
         detournavigator/recastmeshobject.cpp
         detournavigator/navmeshtilescache.cpp
         detournavigator/tilecachedrecastmeshmanager.cpp
-        detournavigator/serialization/binaryreader.cpp
-        detournavigator/serialization/binarywriter.cpp
-        detournavigator/serialization/sizeaccumulator.cpp
-        detournavigator/serialization/integration.cpp
+
+        serialization/binaryreader.cpp
+        serialization/binarywriter.cpp
+        serialization/sizeaccumulator.cpp
+        serialization/integration.cpp
 
         settings/parser.cpp
 
diff --git a/apps/openmw_test_suite/detournavigator/serialization/binaryreader.cpp b/apps/openmw_test_suite/serialization/binaryreader.cpp
similarity index 93%
rename from apps/openmw_test_suite/detournavigator/serialization/binaryreader.cpp
rename to apps/openmw_test_suite/serialization/binaryreader.cpp
index d071326cf5..cb4f5c57bd 100644
--- a/apps/openmw_test_suite/detournavigator/serialization/binaryreader.cpp
+++ b/apps/openmw_test_suite/serialization/binaryreader.cpp
@@ -1,6 +1,6 @@
 #include "format.hpp"
 
-#include <components/detournavigator/serialization/binaryreader.hpp>
+#include <components/serialization/binaryreader.hpp>
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
@@ -12,8 +12,8 @@
 namespace
 {
     using namespace testing;
-    using namespace DetourNavigator::Serialization;
-    using namespace DetourNavigator::SerializationTesting;
+    using namespace Serialization;
+    using namespace SerializationTesting;
 
     TEST(DetourNavigatorSerializationBinaryReaderTest, shouldReadArithmeticTypeValue)
     {
diff --git a/apps/openmw_test_suite/detournavigator/serialization/binarywriter.cpp b/apps/openmw_test_suite/serialization/binarywriter.cpp
similarity index 91%
rename from apps/openmw_test_suite/detournavigator/serialization/binarywriter.cpp
rename to apps/openmw_test_suite/serialization/binarywriter.cpp
index fccc2be3da..cb0f29ba85 100644
--- a/apps/openmw_test_suite/detournavigator/serialization/binarywriter.cpp
+++ b/apps/openmw_test_suite/serialization/binarywriter.cpp
@@ -1,6 +1,6 @@
 #include "format.hpp"
 
-#include <components/detournavigator/serialization/binarywriter.hpp>
+#include <components/serialization/binarywriter.hpp>
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
@@ -12,8 +12,8 @@
 namespace
 {
     using namespace testing;
-    using namespace DetourNavigator::Serialization;
-    using namespace DetourNavigator::SerializationTesting;
+    using namespace Serialization;
+    using namespace SerializationTesting;
 
     TEST(DetourNavigatorSerializationBinaryWriterTest, shouldWriteArithmeticTypeValue)
     {
diff --git a/apps/openmw_test_suite/detournavigator/serialization/format.hpp b/apps/openmw_test_suite/serialization/format.hpp
similarity index 89%
rename from apps/openmw_test_suite/detournavigator/serialization/format.hpp
rename to apps/openmw_test_suite/serialization/format.hpp
index 7c5e26a0be..8f61838fde 100644
--- a/apps/openmw_test_suite/detournavigator/serialization/format.hpp
+++ b/apps/openmw_test_suite/serialization/format.hpp
@@ -1,12 +1,12 @@
-#ifndef OPENMW_TEST_SUITE_DETOURNAVIGATOR_SERIALIZATION_FORMAT_H
-#define OPENMW_TEST_SUITE_DETOURNAVIGATOR_SERIALIZATION_FORMAT_H
+#ifndef OPENMW_TEST_SUITE_SERIALIZATION_FORMAT_H
+#define OPENMW_TEST_SUITE_SERIALIZATION_FORMAT_H
 
-#include <components/detournavigator/serialization/format.hpp>
+#include <components/serialization/format.hpp>
 
 #include <utility>
 #include <type_traits>
 
-namespace DetourNavigator::SerializationTesting
+namespace SerializationTesting
 {
     struct Pod
     {
diff --git a/apps/openmw_test_suite/detournavigator/serialization/integration.cpp b/apps/openmw_test_suite/serialization/integration.cpp
similarity index 85%
rename from apps/openmw_test_suite/detournavigator/serialization/integration.cpp
rename to apps/openmw_test_suite/serialization/integration.cpp
index e7e8eacc20..cb8c711c67 100644
--- a/apps/openmw_test_suite/detournavigator/serialization/integration.cpp
+++ b/apps/openmw_test_suite/serialization/integration.cpp
@@ -1,8 +1,8 @@
 #include "format.hpp"
 
-#include <components/detournavigator/serialization/sizeaccumulator.hpp>
-#include <components/detournavigator/serialization/binarywriter.hpp>
-#include <components/detournavigator/serialization/binaryreader.hpp>
+#include <components/serialization/sizeaccumulator.hpp>
+#include <components/serialization/binarywriter.hpp>
+#include <components/serialization/binaryreader.hpp>
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
@@ -12,8 +12,8 @@
 namespace
 {
     using namespace testing;
-    using namespace DetourNavigator::Serialization;
-    using namespace DetourNavigator::SerializationTesting;
+    using namespace Serialization;
+    using namespace SerializationTesting;
 
     struct DetourNavigatorSerializationIntegrationTest : Test
     {
diff --git a/apps/openmw_test_suite/detournavigator/serialization/sizeaccumulator.cpp b/apps/openmw_test_suite/serialization/sizeaccumulator.cpp
similarity index 85%
rename from apps/openmw_test_suite/detournavigator/serialization/sizeaccumulator.cpp
rename to apps/openmw_test_suite/serialization/sizeaccumulator.cpp
index 39b7ea8646..dce148468a 100644
--- a/apps/openmw_test_suite/detournavigator/serialization/sizeaccumulator.cpp
+++ b/apps/openmw_test_suite/serialization/sizeaccumulator.cpp
@@ -1,6 +1,6 @@
 #include "format.hpp"
 
-#include <components/detournavigator/serialization/sizeaccumulator.hpp>
+#include <components/serialization/sizeaccumulator.hpp>
 
 #include <gtest/gtest.h>
 
@@ -12,8 +12,8 @@
 namespace
 {
     using namespace testing;
-    using namespace DetourNavigator::Serialization;
-    using namespace DetourNavigator::SerializationTesting;
+    using namespace Serialization;
+    using namespace SerializationTesting;
 
     TEST(DetourNavigatorSerializationSizeAccumulatorTest, shouldProvideSizeForArithmeticType)
     {
diff --git a/components/detournavigator/serialization/binaryreader.hpp b/components/serialization/binaryreader.hpp
similarity index 89%
rename from components/detournavigator/serialization/binaryreader.hpp
rename to components/serialization/binaryreader.hpp
index 0d75c3ac99..65b1e2f9d8 100644
--- a/components/detournavigator/serialization/binaryreader.hpp
+++ b/components/serialization/binaryreader.hpp
@@ -1,5 +1,5 @@
-#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_SERIALIZATION_BINARYREADER_H
-#define OPENMW_COMPONENTS_DETOURNAVIGATOR_SERIALIZATION_BINARYREADER_H
+#ifndef OPENMW_COMPONENTS_SERIALIZATION_BINARYREADER_H
+#define OPENMW_COMPONENTS_SERIALIZATION_BINARYREADER_H
 
 #include <cassert>
 #include <cstddef>
@@ -7,7 +7,7 @@
 #include <stdexcept>
 #include <type_traits>
 
-namespace DetourNavigator::Serialization
+namespace Serialization
 {
     class BinaryReader
     {
diff --git a/components/detournavigator/serialization/binarywriter.hpp b/components/serialization/binarywriter.hpp
similarity index 89%
rename from components/detournavigator/serialization/binarywriter.hpp
rename to components/serialization/binarywriter.hpp
index 5e710d85d5..de549c7e02 100644
--- a/components/detournavigator/serialization/binarywriter.hpp
+++ b/components/serialization/binarywriter.hpp
@@ -1,5 +1,5 @@
-#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_SERIALIZATION_BINARYWRITER_H
-#define OPENMW_COMPONENTS_DETOURNAVIGATOR_SERIALIZATION_BINARYWRITER_H
+#ifndef OPENMW_COMPONENTS_SERIALIZATION_BINARYWRITER_H
+#define OPENMW_COMPONENTS_SERIALIZATION_BINARYWRITER_H
 
 #include <cassert>
 #include <cstddef>
@@ -7,7 +7,7 @@
 #include <stdexcept>
 #include <type_traits>
 
-namespace DetourNavigator::Serialization
+namespace Serialization
 {
     struct BinaryWriter
     {
diff --git a/components/detournavigator/serialization/format.hpp b/components/serialization/format.hpp
similarity index 90%
rename from components/detournavigator/serialization/format.hpp
rename to components/serialization/format.hpp
index d07ab9da6f..5d287e80cf 100644
--- a/components/detournavigator/serialization/format.hpp
+++ b/components/serialization/format.hpp
@@ -1,5 +1,5 @@
-#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_SERIALIZATION_FORMAT_H
-#define OPENMW_COMPONENTS_DETOURNAVIGATOR_SERIALIZATION_FORMAT_H
+#ifndef OPENMW_COMPONENTS_SERIALIZATION_FORMAT_H
+#define OPENMW_COMPONENTS_SERIALIZATION_FORMAT_H
 
 #include <algorithm>
 #include <cstddef>
@@ -8,7 +8,7 @@
 #include <utility>
 #include <vector>
 
-namespace DetourNavigator::Serialization
+namespace Serialization
 {
     enum class Mode
     {
@@ -22,6 +22,9 @@ namespace DetourNavigator::Serialization
     template <class ... Args>
     struct IsContiguousContainer<std::vector<Args ...>> : std::true_type {};
 
+    template <class T, std::size_t n>
+    struct IsContiguousContainer<std::array<T, n>> : std::true_type {};
+
     template <class T>
     constexpr bool isContiguousContainer = IsContiguousContainer<std::decay_t<T>>::value;
 
diff --git a/components/detournavigator/serialization/sizeaccumulator.hpp b/components/serialization/sizeaccumulator.hpp
similarity index 81%
rename from components/detournavigator/serialization/sizeaccumulator.hpp
rename to components/serialization/sizeaccumulator.hpp
index 28bdb5c1cb..2386fe7bea 100644
--- a/components/detournavigator/serialization/sizeaccumulator.hpp
+++ b/components/serialization/sizeaccumulator.hpp
@@ -1,10 +1,10 @@
-#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_SERIALIZATION_SIZEACCUMULATOR_H
-#define OPENMW_COMPONENTS_DETOURNAVIGATOR_SERIALIZATION_SIZEACCUMULATOR_H
+#ifndef OPENMW_COMPONENTS_SERIALIZATION_SIZEACCUMULATOR_H
+#define OPENMW_COMPONENTS_SERIALIZATION_SIZEACCUMULATOR_H
 
 #include <cstddef>
 #include <type_traits>
 
-namespace DetourNavigator::Serialization
+namespace Serialization
 {
     class SizeAccumulator
     {

From 23ad1b2b9fef5fd86bbb84ff97ea47168ddf75c0 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 8 Nov 2021 19:25:42 +0100
Subject: [PATCH 1842/2859] Move enum related serialization logic from format
 to visitors

---
 components/serialization/binaryreader.hpp    | 18 +++++++++++-------
 components/serialization/binarywriter.hpp    | 14 +++++++++-----
 components/serialization/format.hpp          | 16 +---------------
 components/serialization/sizeaccumulator.hpp |  4 ++--
 4 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/components/serialization/binaryreader.hpp b/components/serialization/binaryreader.hpp
index 65b1e2f9d8..c1a9031676 100644
--- a/components/serialization/binaryreader.hpp
+++ b/components/serialization/binaryreader.hpp
@@ -23,12 +23,14 @@ namespace Serialization
         template <class Format, class T>
         void operator()(Format&& format, T& value)
         {
-            if constexpr (std::is_arithmetic_v<T>)
+            if constexpr (std::is_enum_v<T>)
+                (*this)(std::forward<Format>(format), static_cast<std::underlying_type_t<T>&>(value));
+            else if constexpr (std::is_arithmetic_v<T>)
             {
-                if (mEnd - mPos < static_cast<std::ptrdiff_t>(sizeof(value)))
+                if (mEnd - mPos < static_cast<std::ptrdiff_t>(sizeof(T)))
                     throw std::runtime_error("Not enough data");
-                std::memcpy(&value, mPos, sizeof(value));
-                mPos += sizeof(value);
+                std::memcpy(&value, mPos, sizeof(T));
+                mPos += sizeof(T);
             }
             else
             {
@@ -39,11 +41,13 @@ namespace Serialization
         template <class Format, class T>
         auto operator()(Format&& format, T* data, std::size_t count)
         {
-            if constexpr (std::is_arithmetic_v<T>)
+            if constexpr (std::is_enum_v<T>)
+                (*this)(std::forward<Format>(format), reinterpret_cast<std::underlying_type_t<T>*>(data), count);
+            else if constexpr (std::is_arithmetic_v<T>)
             {
-                if (mEnd - mPos < static_cast<std::ptrdiff_t>(count * sizeof(T)))
-                    throw std::runtime_error("Not enough data");
                 const std::size_t size = sizeof(T) * count;
+                if (mEnd - mPos < static_cast<std::ptrdiff_t>(size))
+                    throw std::runtime_error("Not enough data");
                 std::memcpy(data, mPos, size);
                 mPos += size;
             }
diff --git a/components/serialization/binarywriter.hpp b/components/serialization/binarywriter.hpp
index de549c7e02..5250bcfdf2 100644
--- a/components/serialization/binarywriter.hpp
+++ b/components/serialization/binarywriter.hpp
@@ -23,12 +23,14 @@ namespace Serialization
         template <class Format, class T>
         void operator()(Format&& format, const T& value)
         {
-            if constexpr (std::is_arithmetic_v<T>)
+            if constexpr (std::is_enum_v<T>)
+                (*this)(std::forward<Format>(format), static_cast<std::underlying_type_t<T>>(value));
+            else if constexpr (std::is_arithmetic_v<T>)
             {
-                if (mEnd - mDest < static_cast<std::ptrdiff_t>(sizeof(value)))
+                if (mEnd - mDest < static_cast<std::ptrdiff_t>(sizeof(T)))
                     throw std::runtime_error("Not enough space");
-                std::memcpy(mDest, &value, sizeof(value));
-                mDest += sizeof(value);
+                std::memcpy(mDest, &value, sizeof(T));
+                mDest += sizeof(T);
             }
             else
             {
@@ -39,7 +41,9 @@ namespace Serialization
         template <class Format, class T>
         auto operator()(Format&& format, const T* data, std::size_t count)
         {
-            if constexpr (std::is_arithmetic_v<T>)
+            if constexpr (std::is_enum_v<T>)
+                (*this)(std::forward<Format>(format), reinterpret_cast<const std::underlying_type_t<T>*>(data), count);
+            else if constexpr (std::is_arithmetic_v<T>)
             {
                 const std::size_t size = sizeof(T) * count;
                 if (mEnd - mDest < static_cast<std::ptrdiff_t>(size))
diff --git a/components/serialization/format.hpp b/components/serialization/format.hpp
index 5d287e80cf..595afd0dad 100644
--- a/components/serialization/format.hpp
+++ b/components/serialization/format.hpp
@@ -34,24 +34,10 @@ namespace Serialization
         template <class Visitor, class T>
         void operator()(Visitor&& visitor, T* data, std::size_t size) const
         {
-            if constexpr (std::is_arithmetic_v<T>)
-            {
+            if constexpr (std::is_arithmetic_v<T> || std::is_enum_v<T>)
                 visitor(self(), data, size);
-            }
-            else if constexpr (std::is_enum_v<T>)
-            {
-                if constexpr (mode == Mode::Write)
-                    visitor(self(), reinterpret_cast<const std::underlying_type_t<T>*>(data), size);
-                else
-                {
-                    static_assert(mode == Mode::Read);
-                    visitor(self(), reinterpret_cast<std::underlying_type_t<T>*>(data), size);
-                }
-            }
             else
-            {
                 std::for_each(data, data + size, [&] (auto& v) { visitor(self(), v); });
-            }
         }
 
         template <class Visitor, class T, std::size_t size>
diff --git a/components/serialization/sizeaccumulator.hpp b/components/serialization/sizeaccumulator.hpp
index 2386fe7bea..4dcc004f73 100644
--- a/components/serialization/sizeaccumulator.hpp
+++ b/components/serialization/sizeaccumulator.hpp
@@ -18,7 +18,7 @@ namespace Serialization
         template <class Format, class T>
         void operator()(Format&& format, const T& value)
         {
-            if constexpr (std::is_arithmetic_v<T>)
+            if constexpr (std::is_arithmetic_v<T> || std::is_enum_v<T>)
                 mValue += sizeof(T);
             else
                 format(*this, value);
@@ -27,7 +27,7 @@ namespace Serialization
         template <class Format, class T>
         auto operator()(Format&& format, const T* data, std::size_t count)
         {
-            if constexpr (std::is_arithmetic_v<T>)
+            if constexpr (std::is_arithmetic_v<T> || std::is_enum_v<T>)
                 mValue += count * sizeof(T);
             else
                 format(*this, data, count);

From b5c689976e6271ac5f915ce060ef2945488cc5c0 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 8 Nov 2021 19:28:04 +0100
Subject: [PATCH 1843/2859] Serialize arithmetic and enum types in little
 endian encoding

---
 components/serialization/binaryreader.hpp |  6 ++++++
 components/serialization/binarywriter.hpp | 23 +++++++++++++++++++----
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/components/serialization/binaryreader.hpp b/components/serialization/binaryreader.hpp
index c1a9031676..66e09f6ffb 100644
--- a/components/serialization/binaryreader.hpp
+++ b/components/serialization/binaryreader.hpp
@@ -1,6 +1,9 @@
 #ifndef OPENMW_COMPONENTS_SERIALIZATION_BINARYREADER_H
 #define OPENMW_COMPONENTS_SERIALIZATION_BINARYREADER_H
 
+#include <components/misc/endianness.hpp>
+
+#include <algorithm>
 #include <cassert>
 #include <cstddef>
 #include <cstring>
@@ -31,6 +34,7 @@ namespace Serialization
                     throw std::runtime_error("Not enough data");
                 std::memcpy(&value, mPos, sizeof(T));
                 mPos += sizeof(T);
+                value = Misc::toLittleEndian(value);
             }
             else
             {
@@ -50,6 +54,8 @@ namespace Serialization
                     throw std::runtime_error("Not enough data");
                 std::memcpy(data, mPos, size);
                 mPos += size;
+                if constexpr (!Misc::IS_LITTLE_ENDIAN)
+                    std::for_each(data, data + count, [&] (T& v) { v = Misc::fromLittleEndian(v); });
             }
             else
             {
diff --git a/components/serialization/binarywriter.hpp b/components/serialization/binarywriter.hpp
index 5250bcfdf2..199f208da9 100644
--- a/components/serialization/binarywriter.hpp
+++ b/components/serialization/binarywriter.hpp
@@ -1,6 +1,9 @@
 #ifndef OPENMW_COMPONENTS_SERIALIZATION_BINARYWRITER_H
 #define OPENMW_COMPONENTS_SERIALIZATION_BINARYWRITER_H
 
+#include <components/misc/endianness.hpp>
+
+#include <algorithm>
 #include <cassert>
 #include <cstddef>
 #include <cstring>
@@ -29,8 +32,7 @@ namespace Serialization
             {
                 if (mEnd - mDest < static_cast<std::ptrdiff_t>(sizeof(T)))
                     throw std::runtime_error("Not enough space");
-                std::memcpy(mDest, &value, sizeof(T));
-                mDest += sizeof(T);
+                writeValue(value);
             }
             else
             {
@@ -48,8 +50,13 @@ namespace Serialization
                 const std::size_t size = sizeof(T) * count;
                 if (mEnd - mDest < static_cast<std::ptrdiff_t>(size))
                     throw std::runtime_error("Not enough space");
-                std::memcpy(mDest, data, size);
-                mDest += size;
+                if constexpr (Misc::IS_LITTLE_ENDIAN)
+                {
+                    std::memcpy(mDest, data, size);
+                    mDest += size;
+                }
+                else
+                    std::for_each(data, data + count, [&] (const T& v) { writeValue(v); });
             }
             else
             {
@@ -60,6 +67,14 @@ namespace Serialization
     private:
         std::byte* mDest;
         const std::byte* const mEnd;
+
+        template <class T>
+        void writeValue(const T& value) noexcept
+        {
+            T coverted = Misc::toLittleEndian(value);
+            std::memcpy(mDest, &coverted, sizeof(T));
+            mDest += sizeof(T);
+        }
     };
 }
 

From 953a4c5550db6030617f84f4d4b3c5d261f62f5c Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 29 Jun 2021 03:49:21 +0200
Subject: [PATCH 1844/2859] Add a binary to generate navmesh from content files

Load content files based on the engine config files. Generate navmesh per cell
for all cells and store into SQLite database.
---
 .gitlab-ci.yml                                |   2 +-
 CI/before_script.android.sh                   |   1 +
 CI/before_script.linux.sh                     |   1 +
 CMakeLists.txt                                |  12 +
 apps/navmeshtool/CMakeLists.txt               |  22 ++
 apps/navmeshtool/main.cpp                     | 209 +++++++++++
 apps/navmeshtool/navmesh.cpp                  | 212 +++++++++++
 apps/navmeshtool/navmesh.hpp                  |  23 ++
 apps/navmeshtool/worldspacedata.cpp           | 329 ++++++++++++++++++
 apps/navmeshtool/worldspacedata.hpp           |  97 ++++++
 apps/openmw_test_suite/CMakeLists.txt         |   2 +
 .../detournavigator/generate.hpp              |  51 +++
 .../detournavigator/navmeshdb.cpp             | 112 ++++++
 .../detournavigator/navmeshtilescache.cpp     |  54 +--
 components/CMakeLists.txt                     |   3 +
 .../cachedrecastmeshmanager.cpp               |   5 +
 .../cachedrecastmeshmanager.hpp               |   2 +
 .../detournavigator/dbrefgeometryobject.hpp   |  46 +++
 .../detournavigator/generatenavmeshtile.cpp   |  95 +++++
 .../detournavigator/generatenavmeshtile.hpp   |  71 ++++
 components/detournavigator/makenavmesh.cpp    |  45 ++-
 components/detournavigator/makenavmesh.hpp    |  23 +-
 components/detournavigator/navmeshdb.cpp      | 296 ++++++++++++++++
 components/detournavigator/navmeshdb.hpp      | 153 ++++++++
 components/detournavigator/navmeshdbutils.cpp |  40 +++
 components/detournavigator/navmeshdbutils.hpp |  13 +
 components/detournavigator/objectid.hpp       |   5 +
 .../offmeshconnectionsmanager.cpp             |   4 +-
 .../offmeshconnectionsmanager.hpp             |   2 +-
 .../detournavigator/recastmeshprovider.hpp    |  33 ++
 components/detournavigator/serialization.cpp  | 214 ++++++++++++
 components/detournavigator/serialization.hpp  |  27 ++
 components/detournavigator/settings.cpp       |   1 +
 components/detournavigator/settings.hpp       |   1 +
 .../tilecachedrecastmeshmanager.cpp           |   7 +
 .../tilecachedrecastmeshmanager.hpp           |   2 +
 components/sqlite3/request.hpp                |   8 +
 components/sqlite3/types.hpp                  |  15 +
 .../reference/modding/settings/game.rst       |   1 +
 .../reference/modding/settings/navigator.rst  |  11 +
 files/settings-default.cfg                    |   4 +
 41 files changed, 2195 insertions(+), 59 deletions(-)
 create mode 100644 apps/navmeshtool/CMakeLists.txt
 create mode 100644 apps/navmeshtool/main.cpp
 create mode 100644 apps/navmeshtool/navmesh.cpp
 create mode 100644 apps/navmeshtool/navmesh.hpp
 create mode 100644 apps/navmeshtool/worldspacedata.cpp
 create mode 100644 apps/navmeshtool/worldspacedata.hpp
 create mode 100644 apps/openmw_test_suite/detournavigator/generate.hpp
 create mode 100644 apps/openmw_test_suite/detournavigator/navmeshdb.cpp
 create mode 100644 components/detournavigator/dbrefgeometryobject.hpp
 create mode 100644 components/detournavigator/generatenavmeshtile.cpp
 create mode 100644 components/detournavigator/generatenavmeshtile.hpp
 create mode 100644 components/detournavigator/navmeshdb.cpp
 create mode 100644 components/detournavigator/navmeshdb.hpp
 create mode 100644 components/detournavigator/navmeshdbutils.cpp
 create mode 100644 components/detournavigator/navmeshdbutils.hpp
 create mode 100644 components/detournavigator/recastmeshprovider.hpp
 create mode 100644 components/detournavigator/serialization.cpp
 create mode 100644 components/detournavigator/serialization.hpp
 create mode 100644 components/sqlite3/types.hpp

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 538bfa11ec..b977d86a97 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -219,7 +219,7 @@ macOS11_Xcode12:
     CCACHE_SIZE: 3G
 
 variables: &engine-targets
-  targets: "openmw,openmw-iniimporter,openmw-launcher,openmw-wizard"
+  targets: "openmw,openmw-iniimporter,openmw-launcher,openmw-wizard,openmw-navmeshtool"
   package: "Engine"
 
 variables: &cs-targets
diff --git a/CI/before_script.android.sh b/CI/before_script.android.sh
index bdf7d4a244..43422f68c1 100755
--- a/CI/before_script.android.sh
+++ b/CI/before_script.android.sh
@@ -22,6 +22,7 @@ cmake \
 -DBUILD_ESSIMPORTER=0 \
 -DBUILD_OPENCS=0 \
 -DBUILD_WIZARD=0 \
+-DBUILD_NAVMESHTOOL=OFF \
 -DOPENMW_USE_SYSTEM_MYGUI=OFF \
 -DOPENMW_USE_SYSTEM_SQLITE3=OFF \
 ..
diff --git a/CI/before_script.linux.sh b/CI/before_script.linux.sh
index b9fed204e3..19d8338721 100755
--- a/CI/before_script.linux.sh
+++ b/CI/before_script.linux.sh
@@ -71,6 +71,7 @@ if [[ "${BUILD_TESTS_ONLY}" ]]; then
         -DBUILD_ESSIMPORTER=OFF \
         -DBUILD_OPENCS=OFF \
         -DBUILD_WIZARD=OFF \
+        -DBUILD_NAVMESHTOOL=OFF \
         -DBUILD_UNITTESTS=${BUILD_UNITTESTS} \
         -DBUILD_BENCHMARKS=${BUILD_BENCHMARKS} \
         -DGTEST_ROOT="${GOOGLETEST_DIR}" \
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 644a7419a8..090e6c56e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,6 +37,7 @@ option(BUILD_DOCS               "Build documentation." OFF )
 option(BUILD_WITH_CODE_COVERAGE "Enable code coverage with gconv" OFF)
 option(BUILD_UNITTESTS          "Enable Unittests with Google C++ Unittest" OFF)
 option(BUILD_BENCHMARKS         "Build benchmarks with Google Benchmark" OFF)
+option(BUILD_NAVMESHTOOL        "Build navmesh tool" ON)
 
 set(OpenGL_GL_PREFERENCE LEGACY)  # Use LEGACY as we use GL2; GLNVD is for GL3 and up.
 
@@ -603,6 +604,10 @@ if (BUILD_BENCHMARKS)
   add_subdirectory(apps/benchmarks)
 endif()
 
+if (BUILD_NAVMESHTOOL)
+  add_subdirectory(apps/navmeshtool)
+endif()
+
 if (WIN32)
   if (MSVC)
     if (OPENMW_MP_BUILD)
@@ -702,6 +707,10 @@ if (WIN32)
     if (BUILD_BENCHMARKS)
         set_target_properties(openmw_detournavigator_navmeshtilescache_benchmark PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}")
     endif()
+
+    if (BUILD_NAVMESHTOOL)
+        set_target_properties(openmw-navmeshtool PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}")
+    endif()
   endif(MSVC)
 
   # TODO: At some point release builds should not use the console but rather write to a log file
@@ -944,6 +953,9 @@ elseif(NOT APPLE)
         IF(BUILD_WIZARD)
             INSTALL(PROGRAMS "${INSTALL_SOURCE}/openmw-wizard" DESTINATION "${BINDIR}" )
         ENDIF(BUILD_WIZARD)
+        if(BUILD_NAVMESHTOOL)
+            install(PROGRAMS "${INSTALL_SOURCE}/openmw-navmeshtool" DESTINATION "${BINDIR}" )
+        endif()
 
         # Install licenses
         INSTALL(FILES "files/mygui/DejaVuFontLicense.txt" DESTINATION "${LICDIR}" )
diff --git a/apps/navmeshtool/CMakeLists.txt b/apps/navmeshtool/CMakeLists.txt
new file mode 100644
index 0000000000..7df049af97
--- /dev/null
+++ b/apps/navmeshtool/CMakeLists.txt
@@ -0,0 +1,22 @@
+set(NAVMESHTOOL
+    worldspacedata.cpp
+    navmesh.cpp
+    main.cpp
+)
+source_group(apps\\navmeshtool FILES ${NAVMESHTOOL})
+
+openmw_add_executable(openmw-navmeshtool ${NAVMESHTOOL})
+
+target_link_libraries(openmw-navmeshtool
+    ${Boost_PROGRAM_OPTIONS_LIBRARY}
+    components
+)
+
+if (BUILD_WITH_CODE_COVERAGE)
+    add_definitions(--coverage)
+    target_link_libraries(openmw-navmeshtool gcov)
+endif()
+
+if (WIN32)
+    install(TARGETS openmw-navmeshtool RUNTIME DESTINATION ".")
+endif()
diff --git a/apps/navmeshtool/main.cpp b/apps/navmeshtool/main.cpp
new file mode 100644
index 0000000000..3e867fcbc9
--- /dev/null
+++ b/apps/navmeshtool/main.cpp
@@ -0,0 +1,209 @@
+#include "worldspacedata.hpp"
+#include "navmesh.hpp"
+
+#include <components/debug/debugging.hpp>
+#include <components/detournavigator/navmeshdb.hpp>
+#include <components/detournavigator/recastglobalallocator.hpp>
+#include <components/esm/esmreader.hpp>
+#include <components/esm/variant.hpp>
+#include <components/esmloader/esmdata.hpp>
+#include <components/esmloader/load.hpp>
+#include <components/fallback/fallback.hpp>
+#include <components/fallback/validate.hpp>
+#include <components/files/configurationmanager.hpp>
+#include <components/resource/bulletshapemanager.hpp>
+#include <components/resource/imagemanager.hpp>
+#include <components/resource/niffilemanager.hpp>
+#include <components/resource/scenemanager.hpp>
+#include <components/settings/settings.hpp>
+#include <components/to_utf8/to_utf8.hpp>
+#include <components/version/version.hpp>
+#include <components/vfs/manager.hpp>
+#include <components/vfs/registerarchives.hpp>
+
+#include <osg/Vec3f>
+
+#include <boost/filesystem.hpp>
+#include <boost/program_options.hpp>
+
+#include <cstddef>
+#include <stdexcept>
+#include <string>
+#include <thread>
+#include <vector>
+
+namespace NavMeshTool
+{
+    namespace
+    {
+        namespace bpo = boost::program_options;
+
+        using StringsVector = std::vector<std::string>;
+
+        bpo::options_description makeOptionsDescription()
+        {
+            using Fallback::FallbackMap;
+
+            bpo::options_description result;
+
+            result.add_options()
+                ("help", "print help message")
+
+                ("version", "print version information and quit")
+
+                ("data", bpo::value<Files::MaybeQuotedPathContainer>()->default_value(Files::MaybeQuotedPathContainer(), "data")
+                    ->multitoken()->composing(), "set data directories (later directories have higher priority)")
+
+                ("data-local", bpo::value<Files::MaybeQuotedPathContainer::value_type>()->default_value(Files::MaybeQuotedPathContainer::value_type(), ""),
+                    "set local data directory (highest priority)")
+
+                ("fallback-archive", bpo::value<StringsVector>()->default_value(StringsVector(), "fallback-archive")
+                    ->multitoken()->composing(), "set fallback BSA archives (later archives have higher priority)")
+
+                ("resources", bpo::value<Files::MaybeQuotedPath>()->default_value(Files::MaybeQuotedPath(), "resources"),
+                    "set resources directory")
+
+                ("content", bpo::value<StringsVector>()->default_value(StringsVector(), "")
+                    ->multitoken()->composing(), "content file(s): esm/esp, or omwgame/omwaddon/omwscripts")
+
+                ("fs-strict", bpo::value<bool>()->implicit_value(true)
+                    ->default_value(false), "strict file system handling (no case folding)")
+
+                ("encoding", bpo::value<std::string>()->
+                    default_value("win1252"),
+                    "Character encoding used in OpenMW game messages:\n"
+                    "\n\twin1250 - Central and Eastern European such as Polish, Czech, Slovak, Hungarian, Slovene, Bosnian, Croatian, Serbian (Latin script), Romanian and Albanian languages\n"
+                    "\n\twin1251 - Cyrillic alphabet such as Russian, Bulgarian, Serbian Cyrillic and other languages\n"
+                    "\n\twin1252 - Western European (Latin) alphabet, used by default")
+
+                ("fallback", bpo::value<Fallback::FallbackMap>()->default_value(Fallback::FallbackMap(), "")
+                    ->multitoken()->composing(), "fallback values")
+
+                ("threads", bpo::value<std::size_t>()->default_value(std::max<std::size_t>(std::thread::hardware_concurrency() - 1, 1)),
+                    "number of threads for parallel processing")
+
+                ("process-interior-cells", bpo::value<bool>()->implicit_value(true)
+                    ->default_value(false), "build navmesh for interior cells")
+            ;
+
+            return result;
+        }
+
+        void loadSettings(const Files::ConfigurationManager& config, Settings::Manager& settings)
+        {
+            const std::string localDefault = (config.getLocalPath() / "defaults.bin").string();
+            const std::string globalDefault = (config.getGlobalPath() / "defaults.bin").string();
+
+            if (boost::filesystem::exists(localDefault))
+                settings.loadDefault(localDefault);
+            else if (boost::filesystem::exists(globalDefault))
+                settings.loadDefault(globalDefault);
+            else
+                throw std::runtime_error("No default settings file found! Make sure the file \"defaults.bin\" was properly installed.");
+
+            const std::string settingsPath = (config.getUserConfigPath() / "settings.cfg").string();
+            if (boost::filesystem::exists(settingsPath))
+                settings.loadUser(settingsPath);
+        }
+
+        int runNavMeshTool(int argc, char *argv[])
+        {
+            bpo::options_description desc = makeOptionsDescription();
+
+            bpo::parsed_options options = bpo::command_line_parser(argc, argv)
+                .options(desc).allow_unregistered().run();
+            bpo::variables_map variables;
+
+            bpo::store(options, variables);
+            bpo::notify(variables);
+
+            if (variables.find("help") != variables.end())
+            {
+                getRawStdout() << desc << std::endl;
+                return 0;
+            }
+
+            Files::ConfigurationManager config;
+
+            bpo::variables_map composingVariables = Files::separateComposingVariables(variables, desc);
+            config.readConfiguration(variables, desc);
+            Files::mergeComposingVariables(variables, composingVariables, desc);
+
+            const std::string encoding(variables["encoding"].as<std::string>());
+            Log(Debug::Info) << ToUTF8::encodingUsingMessage(encoding);
+            ToUTF8::Utf8Encoder encoder(ToUTF8::calculateEncoding(encoding));
+
+            Files::PathContainer dataDirs(asPathContainer(variables["data"].as<Files::MaybeQuotedPathContainer>()));
+
+            auto local = variables["data-local"].as<Files::MaybeQuotedPathContainer::value_type>();
+            if (!local.empty())
+                dataDirs.push_back(std::move(local));
+
+            config.processPaths(dataDirs);
+
+            const auto fsStrict = variables["fs-strict"].as<bool>();
+            const auto resDir = variables["resources"].as<Files::MaybeQuotedPath>();
+            Version::Version v = Version::getOpenmwVersion(resDir.string());
+            Log(Debug::Info) << v.describe();
+            dataDirs.insert(dataDirs.begin(), resDir / "vfs");
+            const auto fileCollections = Files::Collections(dataDirs, !fsStrict);
+            const auto archives = variables["fallback-archive"].as<StringsVector>();
+            const auto contentFiles = variables["content"].as<StringsVector>();
+            const std::size_t threadsNumber = variables["threads"].as<std::size_t>();
+
+            if (threadsNumber < 1)
+            {
+                std::cerr << "Invalid threads number: " << threadsNumber << ", expected >= 1";
+                return -1;
+            }
+
+            const bool processInteriorCells = variables["process-interior-cells"].as<bool>();
+
+            Fallback::Map::init(variables["fallback"].as<Fallback::FallbackMap>().mMap);
+
+            VFS::Manager vfs(fsStrict);
+
+            VFS::registerArchives(&vfs, fileCollections, archives, true);
+
+            Settings::Manager settings;
+            loadSettings(config, settings);
+
+            const osg::Vec3f agentHalfExtents = Settings::Manager::getVector3("default actor pathfind half extents", "Game");
+
+            DetourNavigator::NavMeshDb db((config.getUserDataPath() / "navmesh.db").string());
+
+            std::vector<ESM::ESMReader> readers(contentFiles.size());
+            EsmLoader::Query query;
+            query.mLoadActivators = true;
+            query.mLoadCells = true;
+            query.mLoadContainers = true;
+            query.mLoadDoors = true;
+            query.mLoadGameSettings = true;
+            query.mLoadLands = true;
+            query.mLoadStatics = true;
+            const EsmLoader::EsmData esmData = EsmLoader::loadEsmData(query, contentFiles, fileCollections, readers, &encoder);
+
+            Resource::ImageManager imageManager(&vfs);
+            Resource::NifFileManager nifFileManager(&vfs);
+            Resource::SceneManager sceneManager(&vfs, &imageManager, &nifFileManager);
+            Resource::BulletShapeManager bulletShapeManager(&vfs, &sceneManager, &nifFileManager);
+            DetourNavigator::RecastGlobalAllocator::init();
+            DetourNavigator::Settings navigatorSettings = DetourNavigator::makeSettingsFromSettingsManager();
+            navigatorSettings.mRecast.mSwimHeightScale = EsmLoader::getGameSetting(esmData.mGameSettings, "fSwimHeightScale").getFloat();
+
+            WorldspaceData cellsData = gatherWorldspaceData(navigatorSettings, readers, vfs, bulletShapeManager,
+                                                            esmData, processInteriorCells);
+
+            generateAllNavMeshTiles(agentHalfExtents, navigatorSettings, threadsNumber, cellsData, std::move(db));
+
+            Log(Debug::Info) << "Done";
+
+            return 0;
+        }
+    }
+}
+
+int main(int argc, char *argv[])
+{
+    return wrapApplication(NavMeshTool::runNavMeshTool, argc, argv, "NavMeshTool");
+}
diff --git a/apps/navmeshtool/navmesh.cpp b/apps/navmeshtool/navmesh.cpp
new file mode 100644
index 0000000000..6b8150f1c0
--- /dev/null
+++ b/apps/navmeshtool/navmesh.cpp
@@ -0,0 +1,212 @@
+#include "navmesh.hpp"
+
+#include "worldspacedata.hpp"
+
+#include <components/bullethelpers/aabb.hpp>
+#include <components/debug/debuglog.hpp>
+#include <components/detournavigator/generatenavmeshtile.hpp>
+#include <components/detournavigator/gettilespositions.hpp>
+#include <components/detournavigator/navmeshdb.hpp>
+#include <components/detournavigator/navmeshdbutils.hpp>
+#include <components/detournavigator/offmeshconnection.hpp>
+#include <components/detournavigator/offmeshconnectionsmanager.hpp>
+#include <components/detournavigator/preparednavmeshdata.hpp>
+#include <components/detournavigator/recastmesh.hpp>
+#include <components/detournavigator/recastmeshprovider.hpp>
+#include <components/detournavigator/serialization.hpp>
+#include <components/detournavigator/tilecachedrecastmeshmanager.hpp>
+#include <components/detournavigator/tileposition.hpp>
+#include <components/esm/loadcell.hpp>
+#include <components/misc/guarded.hpp>
+#include <components/misc/progressreporter.hpp>
+#include <components/sceneutil/workqueue.hpp>
+#include <components/sqlite3/transaction.hpp>
+
+#include <DetourNavMesh.h>
+
+#include <osg/Vec3f>
+
+#include <algorithm>
+#include <atomic>
+#include <chrono>
+#include <cstddef>
+#include <stdexcept>
+#include <string>
+#include <string_view>
+#include <utility>
+#include <vector>
+
+namespace NavMeshTool
+{
+    namespace
+    {
+        using DetourNavigator::GenerateNavMeshTile;
+        using DetourNavigator::NavMeshDb;
+        using DetourNavigator::NavMeshTileInfo;
+        using DetourNavigator::PreparedNavMeshData;
+        using DetourNavigator::RecastMeshProvider;
+        using DetourNavigator::MeshSource;
+        using DetourNavigator::Settings;
+        using DetourNavigator::ShapeId;
+        using DetourNavigator::TileId;
+        using DetourNavigator::TilePosition;
+        using DetourNavigator::TileVersion;
+        using Sqlite3::Transaction;
+
+        void logGeneratedTiles(std::size_t provided, std::size_t expected)
+        {
+            Log(Debug::Info) << provided << "/" << expected << " ("
+                << (static_cast<double>(provided) / static_cast<double>(expected) * 100)
+                << "%) navmesh tiles are generated";
+        }
+
+        struct LogGeneratedTiles
+        {
+            void operator()(std::size_t provided, std::size_t expected) const
+            {
+                logGeneratedTiles(provided, expected);
+            }
+        };
+
+        class NavMeshTileConsumer final : public DetourNavigator::NavMeshTileConsumer
+        {
+        public:
+            std::atomic_size_t mExpected {0};
+
+            explicit NavMeshTileConsumer(NavMeshDb db)
+                : mDb(std::move(db))
+                , mTransaction(mDb.startTransaction())
+                , mNextTileId(mDb.getMaxTileId() + 1)
+                , mNextShapeId(mDb.getMaxShapeId() + 1)
+            {}
+
+            std::size_t getProvided() const { return mProvided.load(); }
+
+            std::size_t getInserted() const { return mInserted.load(); }
+
+            std::size_t getUpdated() const { return mUpdated.load(); }
+
+            std::int64_t resolveMeshSource(const MeshSource& source) override
+            {
+                const std::lock_guard lock(mMutex);
+                return DetourNavigator::resolveMeshSource(mDb, source, mNextShapeId);
+            }
+
+            std::optional<NavMeshTileInfo> find(const std::string& worldspace, const TilePosition &tilePosition,
+                const std::vector<std::byte> &input) override
+            {
+                std::optional<NavMeshTileInfo> result;
+                std::lock_guard lock(mMutex);
+                if (const auto tile = mDb.findTile(worldspace, tilePosition, input))
+                {
+                    NavMeshTileInfo info;
+                    info.mTileId = tile->mTileId;
+                    info.mVersion = tile->mVersion;
+                    result.emplace(info);
+                }
+                return result;
+            }
+
+            void ignore() override { report(); }
+
+            void insert(const std::string& worldspace, const TilePosition& tilePosition, std::int64_t version,
+                const std::vector<std::byte>& input, PreparedNavMeshData& data) override
+            {
+                data.mUserId = static_cast<unsigned>(mNextTileId);
+                {
+                    std::lock_guard lock(mMutex);
+                    mDb.insertTile(mNextTileId, worldspace, tilePosition, TileVersion {version}, input, serialize(data));
+                    ++mNextTileId.t;
+                }
+                ++mInserted;
+                report();
+            }
+
+            void update(std::int64_t tileId, std::int64_t version, PreparedNavMeshData& data) override
+            {
+                data.mUserId = static_cast<unsigned>(tileId);
+                {
+                    std::lock_guard lock(mMutex);
+                    mDb.updateTile(TileId {tileId}, TileVersion {version}, serialize(data));
+                }
+                ++mUpdated;
+                report();
+            }
+
+            void wait()
+            {
+                constexpr std::size_t tilesPerTransaction = 3000;
+                std::unique_lock lock(mMutex);
+                while (mProvided < mExpected)
+                {
+                    mHasTile.wait(lock);
+                    if (mProvided % tilesPerTransaction == 0)
+                    {
+                        mTransaction.commit();
+                        mTransaction = mDb.startTransaction();
+                    }
+                }
+                logGeneratedTiles(mProvided, mExpected);
+            }
+
+            void commit() { mTransaction.commit(); }
+
+        private:
+            std::atomic_size_t mProvided {0};
+            std::atomic_size_t mInserted {0};
+            std::atomic_size_t mUpdated {0};
+            std::mutex mMutex;
+            NavMeshDb mDb;
+            Transaction mTransaction;
+            TileId mNextTileId;
+            std::condition_variable mHasTile;
+            Misc::ProgressReporter<LogGeneratedTiles> mReporter;
+            ShapeId mNextShapeId;
+
+            void report()
+            {
+                mReporter(mProvided + 1, mExpected);
+                ++mProvided;
+                mHasTile.notify_one();
+            }
+        };
+    }
+
+    void generateAllNavMeshTiles(const osg::Vec3f& agentHalfExtents, const Settings& settings,
+        const std::size_t threadsNumber, WorldspaceData& data, NavMeshDb&& db)
+    {
+        Log(Debug::Info) << "Generating navmesh tiles by " << threadsNumber << " parallel workers...";
+
+        SceneUtil::WorkQueue workQueue(threadsNumber);
+        auto navMeshTileConsumer = std::make_shared<NavMeshTileConsumer>(std::move(db));
+        std::size_t tiles = 0;
+
+        for (const std::unique_ptr<WorldspaceNavMeshInput>& input : data.mNavMeshInputs)
+        {
+            DetourNavigator::getTilesPositions(
+                Misc::Convert::toOsg(input->mAabb.m_min), Misc::Convert::toOsg(input->mAabb.m_max), settings.mRecast,
+                [&] (const TilePosition& tilePosition)
+                {
+                    workQueue.addWorkItem(new GenerateNavMeshTile(
+                        input->mWorldspace,
+                        tilePosition,
+                        RecastMeshProvider(input->mTileCachedRecastMeshManager),
+                        agentHalfExtents,
+                        settings,
+                        navMeshTileConsumer
+                    ));
+
+                    ++tiles;
+                });
+
+            navMeshTileConsumer->mExpected = tiles;
+        }
+
+        navMeshTileConsumer->wait();
+        navMeshTileConsumer->commit();
+
+        Log(Debug::Info) << "Generated navmesh for " << navMeshTileConsumer->getProvided() << " tiles, "
+            << navMeshTileConsumer->getInserted() << " are inserted and "
+            << navMeshTileConsumer->getUpdated() << " updated";
+    }
+}
diff --git a/apps/navmeshtool/navmesh.hpp b/apps/navmeshtool/navmesh.hpp
new file mode 100644
index 0000000000..725f0cd6a4
--- /dev/null
+++ b/apps/navmeshtool/navmesh.hpp
@@ -0,0 +1,23 @@
+#ifndef OPENMW_NAVMESHTOOL_NAVMESH_H
+#define OPENMW_NAVMESHTOOL_NAVMESH_H
+
+#include <osg/Vec3f>
+
+#include <cstddef>
+#include <string_view>
+
+namespace DetourNavigator
+{
+    class NavMeshDb;
+    struct Settings;
+}
+
+namespace NavMeshTool
+{
+    struct WorldspaceData;
+
+    void generateAllNavMeshTiles(const osg::Vec3f& agentHalfExtents, const DetourNavigator::Settings& settings,
+        const std::size_t threadsNumber, WorldspaceData& cellsData, DetourNavigator::NavMeshDb&& db);
+}
+
+#endif
diff --git a/apps/navmeshtool/worldspacedata.cpp b/apps/navmeshtool/worldspacedata.cpp
new file mode 100644
index 0000000000..7c5aa06c83
--- /dev/null
+++ b/apps/navmeshtool/worldspacedata.cpp
@@ -0,0 +1,329 @@
+#include "worldspacedata.hpp"
+
+#include <components/bullethelpers/aabb.hpp>
+#include <components/bullethelpers/heightfield.hpp>
+#include <components/debug/debuglog.hpp>
+#include <components/detournavigator/gettilespositions.hpp>
+#include <components/detournavigator/objectid.hpp>
+#include <components/detournavigator/recastmesh.hpp>
+#include <components/detournavigator/tilecachedrecastmeshmanager.hpp>
+#include <components/esm/cellref.hpp>
+#include <components/esm/esmreader.hpp>
+#include <components/esm/loadcell.hpp>
+#include <components/esm/loadland.hpp>
+#include <components/esmloader/esmdata.hpp>
+#include <components/esmloader/lessbyid.hpp>
+#include <components/esmloader/record.hpp>
+#include <components/misc/coordinateconverter.hpp>
+#include <components/misc/resourcehelpers.hpp>
+#include <components/misc/stringops.hpp>
+#include <components/resource/bulletshapemanager.hpp>
+#include <components/settings/settings.hpp>
+#include <components/vfs/manager.hpp>
+
+#include <LinearMath/btVector3.h>
+
+#include <osg/Vec2i>
+#include <osg/Vec3f>
+#include <osg/ref_ptr>
+
+#include <algorithm>
+#include <memory>
+#include <stdexcept>
+#include <string>
+#include <string_view>
+#include <thread>
+#include <tuple>
+#include <utility>
+#include <vector>
+
+namespace NavMeshTool
+{
+    namespace
+    {
+        using DetourNavigator::CollisionShape;
+        using DetourNavigator::HeightfieldPlane;
+        using DetourNavigator::HeightfieldShape;
+        using DetourNavigator::HeightfieldSurface;
+        using DetourNavigator::ObjectId;
+        using DetourNavigator::ObjectTransform;
+
+        struct CellRef
+        {
+            ESM::RecNameInts mType;
+            ESM::RefNum mRefNum;
+            std::string mRefId;
+            float mScale;
+            ESM::Position mPos;
+
+            CellRef(ESM::RecNameInts type, ESM::RefNum refNum, std::string&& refId, float scale, const ESM::Position& pos)
+                : mType(type), mRefNum(refNum), mRefId(std::move(refId)), mScale(scale), mPos(pos) {}
+        };
+
+        ESM::RecNameInts getType(const EsmLoader::EsmData& esmData, std::string_view refId)
+        {
+            const auto it = std::lower_bound(esmData.mRefIdTypes.begin(), esmData.mRefIdTypes.end(),
+                                             refId, EsmLoader::LessById {});
+            if (it == esmData.mRefIdTypes.end() || it->mId != refId)
+                return {};
+            return it->mType;
+        }
+
+        std::vector<CellRef> loadCellRefs(const ESM::Cell& cell, const EsmLoader::EsmData& esmData,
+            std::vector<ESM::ESMReader>& readers)
+        {
+            std::vector<EsmLoader::Record<CellRef>> cellRefs;
+
+            for (std::size_t i = 0; i < cell.mContextList.size(); i++)
+            {
+                ESM::ESMReader& reader = readers[static_cast<std::size_t>(cell.mContextList[i].index)];
+                cell.restore(reader, static_cast<int>(i));
+                ESM::CellRef cellRef;
+                bool deleted = false;
+                while (ESM::Cell::getNextRef(reader, cellRef, deleted))
+                {
+                    Misc::StringUtils::lowerCaseInPlace(cellRef.mRefID);
+                    const ESM::RecNameInts type = getType(esmData, cellRef.mRefID);
+                    if (type == ESM::RecNameInts {})
+                        continue;
+                    cellRefs.emplace_back(deleted, type, cellRef.mRefNum, std::move(cellRef.mRefID),
+                                        cellRef.mScale, cellRef.mPos);
+                }
+            }
+
+            Log(Debug::Debug) << "Loaded " << cellRefs.size() << " cell refs";
+
+            const auto getKey = [] (const EsmLoader::Record<CellRef>& v) -> const ESM::RefNum& { return v.mValue.mRefNum; };
+            std::vector<CellRef> result = prepareRecords(cellRefs, getKey);
+
+            Log(Debug::Debug) << "Prepared " << result.size() << " unique cell refs";
+
+            return result;
+        }
+
+        template <class F>
+        void forEachObject(const ESM::Cell& cell, const EsmLoader::EsmData& esmData, const VFS::Manager& vfs,
+            Resource::BulletShapeManager& bulletShapeManager, std::vector<ESM::ESMReader>& readers,
+            F&& f)
+        {
+            std::vector<CellRef> cellRefs = loadCellRefs(cell, esmData, readers);
+
+            Log(Debug::Debug) << "Prepared " << cellRefs.size() << " unique cell refs";
+
+            for (CellRef& cellRef : cellRefs)
+            {
+                std::string model(getModel(esmData, cellRef.mRefId, cellRef.mType));
+                if (model.empty())
+                    continue;
+
+                if (cellRef.mType != ESM::REC_STAT)
+                    model = Misc::ResourceHelpers::correctActorModelPath(model, &vfs);
+
+                osg::ref_ptr<const Resource::BulletShape> shape = [&]
+                {
+                    try
+                    {
+                        return bulletShapeManager.getShape("meshes/" + model);
+                    }
+                    catch (const std::exception& e)
+                    {
+                        Log(Debug::Warning) << "Failed to load cell ref \"" << cellRef.mRefId << "\" model \"" << model << "\": " << e.what();
+                        return osg::ref_ptr<const Resource::BulletShape>();
+                    }
+                } ();
+
+                if (shape == nullptr || shape->mCollisionShape == nullptr)
+                    continue;
+
+                osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance(new Resource::BulletShapeInstance(std::move(shape)));
+
+                switch (cellRef.mType)
+                {
+                    case ESM::REC_ACTI:
+                    case ESM::REC_CONT:
+                    case ESM::REC_DOOR:
+                    case ESM::REC_STAT:
+                        f(BulletObject(std::move(shapeInstance), cellRef.mPos, cellRef.mScale));
+                        break;
+                    default:
+                        break;
+                }
+            }
+        }
+
+        struct GetXY
+        {
+            osg::Vec2i operator()(const ESM::Land& value) const { return osg::Vec2i(value.mX, value.mY); }
+        };
+
+        struct LessByXY
+        {
+            bool operator ()(const ESM::Land& lhs, const ESM::Land& rhs) const
+            {
+                return GetXY {}(lhs) < GetXY {}(rhs);
+            }
+
+            bool operator ()(const ESM::Land& lhs, const osg::Vec2i& rhs) const
+            {
+                return GetXY {}(lhs) < rhs;
+            }
+
+            bool operator ()(const osg::Vec2i& lhs, const ESM::Land& rhs) const
+            {
+                return lhs < GetXY {}(rhs);
+            }
+        };
+
+        btAABB getAabb(const osg::Vec2i& cellPosition, btScalar minHeight, btScalar maxHeight)
+        {
+            btAABB aabb;
+            aabb.m_min = btVector3(
+                static_cast<btScalar>(cellPosition.x() * ESM::Land::REAL_SIZE),
+                static_cast<btScalar>(cellPosition.y() * ESM::Land::REAL_SIZE),
+                minHeight
+            );
+            aabb.m_min = btVector3(
+                static_cast<btScalar>((cellPosition.x() + 1) * ESM::Land::REAL_SIZE),
+                static_cast<btScalar>((cellPosition.y() + 1) * ESM::Land::REAL_SIZE),
+                maxHeight
+            );
+            return aabb;
+        }
+
+        void mergeOrAssign(const btAABB& aabb, btAABB& target, bool& initialized)
+        {
+            if (initialized)
+                return target.merge(aabb);
+
+            target.m_min = aabb.m_min;
+            target.m_max = aabb.m_max;
+            initialized = true;
+        }
+
+        std::tuple<HeightfieldShape, float, float> makeHeightfieldShape(const std::optional<ESM::Land>& land,
+            const osg::Vec2i& cellPosition, std::vector<std::vector<float>>& heightfields,
+            std::vector<std::unique_ptr<ESM::Land::LandData>>& landDatas)
+        {
+            if (!land.has_value() || osg::Vec2i(land->mX, land->mY) != cellPosition
+                    || (land->mDataTypes & ESM::Land::DATA_VHGT) == 0)
+                return {HeightfieldPlane {ESM::Land::DEFAULT_HEIGHT}, ESM::Land::DEFAULT_HEIGHT, ESM::Land::DEFAULT_HEIGHT};
+
+            ESM::Land::LandData& landData = *landDatas.emplace_back(std::make_unique<ESM::Land::LandData>());
+            land->loadData(ESM::Land::DATA_VHGT, &landData);
+            heightfields.emplace_back(std::vector(std::begin(landData.mHeights), std::end(landData.mHeights)));
+            HeightfieldSurface surface;
+            surface.mHeights = heightfields.back().data();
+            surface.mMinHeight = landData.mMinHeight;
+            surface.mMaxHeight = landData.mMaxHeight;
+            surface.mSize = static_cast<std::size_t>(ESM::Land::LAND_SIZE);
+            return {surface, landData.mMinHeight, landData.mMaxHeight};
+        }
+    }
+
+    WorldspaceNavMeshInput::WorldspaceNavMeshInput(std::string worldspace, const DetourNavigator::RecastSettings& settings)
+        : mWorldspace(std::move(worldspace))
+        , mTileCachedRecastMeshManager(settings)
+    {
+        mAabb.m_min = btVector3(0, 0, 0);
+        mAabb.m_max = btVector3(0, 0, 0);
+    }
+
+    WorldspaceData gatherWorldspaceData(const DetourNavigator::Settings& settings, std::vector<ESM::ESMReader>& readers,
+        const VFS::Manager& vfs, Resource::BulletShapeManager& bulletShapeManager, const EsmLoader::EsmData& esmData,
+        bool processInteriorCells)
+    {
+        Log(Debug::Info) << "Processing " << esmData.mCells.size() << " cells...";
+
+        std::map<std::string_view, std::unique_ptr<WorldspaceNavMeshInput>> navMeshInputs;
+        WorldspaceData data;
+
+        std::size_t objectsCounter = 0;
+
+        for (std::size_t i = 0; i < esmData.mCells.size(); ++i)
+        {
+            const ESM::Cell& cell = esmData.mCells[i];
+            const bool exterior = cell.isExterior();
+
+            if (!exterior && !processInteriorCells)
+            {
+                Log(Debug::Info) << "Skipped " << (exterior ? "exterior" : "interior")
+                    << " cell (" << (i + 1) << "/" << esmData.mCells.size() << ") \"" << cell.getDescription() << "\"";
+                continue;
+            }
+
+            Log(Debug::Debug) << "Processing " << (exterior ? "exterior" : "interior")
+                << " cell (" << (i + 1) << "/" << esmData.mCells.size() << ") \"" << cell.getDescription() << "\"";
+
+            const osg::Vec2i cellPosition(cell.mData.mX, cell.mData.mY);
+            const std::size_t cellObjectsBegin = data.mObjects.size();
+
+            WorldspaceNavMeshInput& navMeshInput = [&] () -> WorldspaceNavMeshInput&
+            {
+                auto it = navMeshInputs.find(cell.mCellId.mWorldspace);
+                if (it == navMeshInputs.end())
+                {
+                    it = navMeshInputs.emplace(cell.mCellId.mWorldspace,
+                        std::make_unique<WorldspaceNavMeshInput>(cell.mCellId.mWorldspace, settings.mRecast)).first;
+                }
+                return *it->second;
+            } ();
+
+            if (exterior)
+            {
+                const auto it = std::lower_bound(esmData.mLands.begin(), esmData.mLands.end(), cellPosition, LessByXY {});
+                const auto [heightfieldShape, minHeight, maxHeight] = makeHeightfieldShape(
+                    it == esmData.mLands.end() ? std::optional<ESM::Land>() : *it,
+                    cellPosition, data.mHeightfields, data.mLandData
+                );
+
+                mergeOrAssign(getAabb(cellPosition, minHeight, maxHeight),
+                              navMeshInput.mAabb, navMeshInput.mAabbInitialized);
+
+                navMeshInput.mTileCachedRecastMeshManager.addHeightfield(cellPosition, ESM::Land::REAL_SIZE, heightfieldShape);
+
+                navMeshInput.mTileCachedRecastMeshManager.addWater(cellPosition, ESM::Land::REAL_SIZE, -1);
+            }
+            else
+            {
+                if ((cell.mData.mFlags & ESM::Cell::HasWater) != 0)
+                    navMeshInput.mTileCachedRecastMeshManager.addWater(cellPosition, std::numeric_limits<int>::max(), cell.mWater);
+            }
+
+            forEachObject(cell, esmData, vfs, bulletShapeManager, readers,
+                [&] (BulletObject object)
+                {
+                    const btTransform& transform = object.getCollisionObject().getWorldTransform();
+                    const btAABB aabb = BulletHelpers::getAabb(*object.getCollisionObject().getCollisionShape(), transform);
+                    mergeOrAssign(aabb, navMeshInput.mAabb, navMeshInput.mAabbInitialized);
+                    if (const btCollisionShape* avoid = object.getShapeInstance()->mAvoidCollisionShape.get())
+                        navMeshInput.mAabb.merge(BulletHelpers::getAabb(*avoid, transform));
+
+                    const ObjectId objectId(++objectsCounter);
+                    const CollisionShape shape(object.getShapeInstance(), *object.getCollisionObject().getCollisionShape(), object.getObjectTransform());
+
+                    navMeshInput.mTileCachedRecastMeshManager.addObject(objectId, shape, transform, DetourNavigator::AreaType_ground);
+
+                    if (const btCollisionShape* avoid = object.getShapeInstance()->mAvoidCollisionShape.get())
+                    {
+                        const CollisionShape avoidShape(object.getShapeInstance(), *avoid, object.getObjectTransform());
+                        navMeshInput.mTileCachedRecastMeshManager.addObject(objectId, avoidShape, transform, DetourNavigator::AreaType_null);
+                    }
+
+                    data.mObjects.emplace_back(std::move(object));
+                });
+
+            Log(Debug::Info) << "Processed " << (exterior ? "exterior" : "interior")
+                << " cell (" << (i + 1) << "/" << esmData.mCells.size() << ") " << cell.getDescription()
+                << " with " << (data.mObjects.size() - cellObjectsBegin) << " objects";
+        }
+
+        data.mNavMeshInputs.reserve(navMeshInputs.size());
+        std::transform(navMeshInputs.begin(), navMeshInputs.end(), std::back_inserter(data.mNavMeshInputs),
+                       [] (auto& v) { return std::move(v.second); });
+
+        Log(Debug::Info) << "Processed " << esmData.mCells.size() << " cells, added "
+            << data.mObjects.size() << " objects and " << data.mHeightfields.size() << " height fields";
+
+        return data;
+    }
+}
diff --git a/apps/navmeshtool/worldspacedata.hpp b/apps/navmeshtool/worldspacedata.hpp
new file mode 100644
index 0000000000..3dccd5a8bc
--- /dev/null
+++ b/apps/navmeshtool/worldspacedata.hpp
@@ -0,0 +1,97 @@
+#ifndef OPENMW_NAVMESHTOOL_WORLDSPACEDATA_H
+#define OPENMW_NAVMESHTOOL_WORLDSPACEDATA_H
+
+#include <components/bullethelpers/collisionobject.hpp>
+#include <components/detournavigator/tilecachedrecastmeshmanager.hpp>
+#include <components/esm/loadland.hpp>
+#include <components/misc/convert.hpp>
+#include <components/resource/bulletshape.hpp>
+
+#include <BulletCollision/CollisionDispatch/btCollisionObject.h>
+#include <BulletCollision/Gimpact/btBoxCollision.h>
+#include <LinearMath/btVector3.h>
+
+#include <memory>
+#include <string>
+#include <vector>
+
+namespace ESM
+{
+    class ESMReader;
+}
+
+namespace VFS
+{
+    class Manager;
+}
+
+namespace Resource
+{
+    class BulletShapeManager;
+}
+
+namespace EsmLoader
+{
+    struct EsmData;
+}
+
+namespace DetourNavigator
+{
+    struct Settings;
+}
+
+namespace NavMeshTool
+{
+    using DetourNavigator::TileCachedRecastMeshManager;
+    using DetourNavigator::ObjectTransform;
+
+    struct WorldspaceNavMeshInput
+    {
+        std::string mWorldspace;
+        TileCachedRecastMeshManager mTileCachedRecastMeshManager;
+        btAABB mAabb;
+        bool mAabbInitialized = false;
+
+        explicit WorldspaceNavMeshInput(std::string worldspace, const DetourNavigator::RecastSettings& settings);
+    };
+
+    class BulletObject
+    {
+    public:
+        BulletObject(osg::ref_ptr<Resource::BulletShapeInstance>&& shapeInstance, const ESM::Position& position,
+            float localScaling)
+            : mShapeInstance(std::move(shapeInstance))
+            , mObjectTransform {position, localScaling}
+            , mCollisionObject(BulletHelpers::makeCollisionObject(
+                mShapeInstance->mCollisionShape.get(),
+                Misc::Convert::toBullet(position.asVec3()),
+                Misc::Convert::toBullet(Misc::Convert::makeOsgQuat(position))
+            ))
+        {
+            mShapeInstance->setLocalScaling(btVector3(localScaling, localScaling, localScaling));
+        }
+
+        const osg::ref_ptr<Resource::BulletShapeInstance>& getShapeInstance() const noexcept { return mShapeInstance; }
+        const DetourNavigator::ObjectTransform& getObjectTransform() const noexcept { return mObjectTransform; }
+        btCollisionObject& getCollisionObject() const noexcept { return *mCollisionObject; }
+
+    private:
+        osg::ref_ptr<Resource::BulletShapeInstance> mShapeInstance;
+        DetourNavigator::ObjectTransform mObjectTransform;
+        std::unique_ptr<btCollisionObject> mCollisionObject;
+    };
+
+    struct WorldspaceData
+    {
+        std::vector<std::unique_ptr<WorldspaceNavMeshInput>> mNavMeshInputs;
+        std::vector<BulletObject> mObjects;
+        std::vector<std::unique_ptr<ESM::Land::LandData>> mLandData;
+        std::vector<std::vector<float>> mHeightfields;
+    };
+
+    WorldspaceData gatherWorldspaceData(const DetourNavigator::Settings& settings, std::vector<ESM::ESMReader>& readers,
+        const VFS::Manager& vfs, Resource::BulletShapeManager& bulletShapeManager, const EsmLoader::EsmData& esmData,
+        bool processInteriorCells);
+}
+
+#endif
diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index 57e05b8511..6a93eaa397 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -41,6 +41,8 @@ if (GTEST_FOUND AND GMOCK_FOUND)
         detournavigator/recastmeshobject.cpp
         detournavigator/navmeshtilescache.cpp
         detournavigator/tilecachedrecastmeshmanager.cpp
+        detournavigator/navmeshdb.cpp
+        detournavigator/serialization.cpp
 
         serialization/binaryreader.cpp
         serialization/binarywriter.cpp
diff --git a/apps/openmw_test_suite/detournavigator/generate.hpp b/apps/openmw_test_suite/detournavigator/generate.hpp
new file mode 100644
index 0000000000..52d04495a7
--- /dev/null
+++ b/apps/openmw_test_suite/detournavigator/generate.hpp
@@ -0,0 +1,51 @@
+#ifndef OPENMW_TEST_SUITE_DETOURNAVIGATOR_GENERATE_H
+#define OPENMW_TEST_SUITE_DETOURNAVIGATOR_GENERATE_H
+
+#include <algorithm>
+#include <numeric>
+#include <random>
+#include <type_traits>
+
+namespace DetourNavigator
+{
+    namespace Tests
+    {
+        template <class T, class Random>
+        inline auto generateValue(T& value, Random& random)
+            -> std::enable_if_t<sizeof(T) >= 2>
+        {
+            using Distribution = std::conditional_t<
+                std::is_floating_point_v<T>,
+                std::uniform_real_distribution<T>,
+                std::uniform_int_distribution<T>
+            >;
+            Distribution distribution(std::numeric_limits<T>::min(), std::numeric_limits<T>::max());
+            value = distribution(random);
+        }
+
+        template <class T, class Random>
+        inline auto generateValue(T& value, Random& random)
+            -> std::enable_if_t<sizeof(T) == 1>
+        {
+            unsigned short v;
+            generateValue(v, random);
+            value = static_cast<T>(v % 256);
+        }
+
+        template <class Random>
+        inline void generateValue(unsigned char& value, Random& random)
+        {
+            unsigned short v;
+            generateValue(v, random);
+            value = static_cast<unsigned char>(v % 256);
+        }
+
+        template <class I, class Random>
+        inline void generateRange(I begin, I end, Random& random)
+        {
+            std::for_each(begin, end, [&] (auto& v) { generateValue(v, random); });
+        }
+    }
+}
+
+#endif
diff --git a/apps/openmw_test_suite/detournavigator/navmeshdb.cpp b/apps/openmw_test_suite/detournavigator/navmeshdb.cpp
new file mode 100644
index 0000000000..feadc2f59d
--- /dev/null
+++ b/apps/openmw_test_suite/detournavigator/navmeshdb.cpp
@@ -0,0 +1,112 @@
+#include "generate.hpp"
+
+#include <components/detournavigator/navmeshdb.hpp>
+#include <components/esm/cellid.hpp>
+
+#include <DetourAlloc.h>
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+#include <numeric>
+#include <random>
+
+namespace
+{
+    using namespace testing;
+    using namespace DetourNavigator;
+    using namespace DetourNavigator::Tests;
+
+    struct Tile
+    {
+        std::string mWorldspace;
+        TilePosition mTilePosition;
+        std::vector<std::byte> mInput;
+        std::vector<std::byte> mData;
+    };
+
+    struct DetourNavigatorNavMeshDbTest : Test
+    {
+        NavMeshDb mDb {":memory:"};
+        std::minstd_rand mRandom;
+
+        std::vector<std::byte> generateData()
+        {
+            std::vector<std::byte> data(32);
+            generateRange(data.begin(), data.end(), mRandom);
+            return data;
+        }
+
+        Tile insertTile(TileId tileId, TileVersion version)
+        {
+            std::string worldspace = "sys::default";
+            const TilePosition tilePosition {3, 4};
+            std::vector<std::byte> input = generateData();
+            std::vector<std::byte> data = generateData();
+            EXPECT_EQ(mDb.insertTile(tileId, worldspace, tilePosition, version, input, data), 1);
+            return {std::move(worldspace), tilePosition, std::move(input), std::move(data)};
+        }
+    };
+
+    TEST_F(DetourNavigatorNavMeshDbTest, get_max_tile_id_for_empty_db_should_return_zero)
+    {
+        EXPECT_EQ(mDb.getMaxTileId(), TileId {0});
+    }
+
+    TEST_F(DetourNavigatorNavMeshDbTest, inserted_tile_should_be_found_by_key)
+    {
+        const TileId tileId {146};
+        const TileVersion version {1};
+        const auto [worldspace, tilePosition, input, data] = insertTile(tileId, version);
+        const auto result = mDb.findTile(worldspace, tilePosition, input);
+        ASSERT_TRUE(result.has_value());
+        EXPECT_EQ(result->mTileId, tileId);
+        EXPECT_EQ(result->mVersion, version);
+    }
+
+    TEST_F(DetourNavigatorNavMeshDbTest, inserted_tile_should_change_max_tile_id)
+    {
+        insertTile(TileId {53}, TileVersion {1});
+        EXPECT_EQ(mDb.getMaxTileId(), TileId {53});
+    }
+
+    TEST_F(DetourNavigatorNavMeshDbTest, updated_tile_should_change_data)
+    {
+        const TileId tileId {13};
+        const TileVersion version {1};
+        auto [worldspace, tilePosition, input, data] = insertTile(tileId, version);
+        generateRange(data.begin(), data.end(), mRandom);
+        ASSERT_EQ(mDb.updateTile(tileId, version, data), 1);
+        const auto row = mDb.getTileData(worldspace, tilePosition, input);
+        ASSERT_TRUE(row.has_value());
+        EXPECT_EQ(row->mTileId, tileId);
+        EXPECT_EQ(row->mVersion, version);
+        ASSERT_FALSE(row->mData.empty());
+        EXPECT_EQ(row->mData, data);
+    }
+
+    TEST_F(DetourNavigatorNavMeshDbTest, on_inserted_duplicate_should_throw_exception)
+    {
+        const TileId tileId {53};
+        const TileVersion version {1};
+        const std::string worldspace = "sys::default";
+        const TilePosition tilePosition {3, 4};
+        const std::vector<std::byte> input = generateData();
+        const std::vector<std::byte> data = generateData();
+        ASSERT_EQ(mDb.insertTile(tileId, worldspace, tilePosition, version, input, data), 1);
+        EXPECT_THROW(mDb.insertTile(tileId, worldspace, tilePosition, version, input, data), std::runtime_error);
+    }
+
+    TEST_F(DetourNavigatorNavMeshDbTest, inserted_duplicate_leaves_db_in_correct_state)
+    {
+        const TileId tileId {53};
+        const TileVersion version {1};
+        const std::string worldspace = "sys::default";
+        const TilePosition tilePosition {3, 4};
+        const std::vector<std::byte> input = generateData();
+        const std::vector<std::byte> data = generateData();
+        ASSERT_EQ(mDb.insertTile(tileId, worldspace, tilePosition, version, input, data), 1);
+        EXPECT_THROW(mDb.insertTile(tileId, worldspace, tilePosition, version, input, data), std::runtime_error);
+        EXPECT_NO_THROW(insertTile(TileId {54}, version));
+    }
+}
diff --git a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
index 2a7c5ac5a1..b47ae98233 100644
--- a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
+++ b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
@@ -1,4 +1,5 @@
 #include "operators.hpp"
+#include "generate.hpp"
 
 #include <components/detournavigator/navmeshtilescache.hpp>
 #include <components/detournavigator/exceptions.hpp>
@@ -21,6 +22,7 @@ namespace
 {
     using namespace testing;
     using namespace DetourNavigator;
+    using namespace DetourNavigator::Tests;
 
     void* permRecastAlloc(int size)
     {
@@ -30,14 +32,15 @@ namespace
         return result;
     }
 
-    template <class T>
-    void generate(T*& values, int size)
+    template <class T, class Random>
+    void generateRecastArray(T*& values, int size, Random& random)
     {
         values = static_cast<T*>(permRecastAlloc(size * sizeof(T)));
-        std::generate_n(values, static_cast<std::size_t>(size), [] { return static_cast<T>(std::rand()); });
+        generateRange(values, values + static_cast<std::ptrdiff_t>(size), random);
     }
 
-    void generate(rcPolyMesh& value, int size)
+    template <class Random>
+    void generate(rcPolyMesh& value, int size, Random& random)
     {
         value.nverts = size;
         value.maxpolys = size;
@@ -45,40 +48,43 @@ namespace
         value.npolys = size;
         rcVcopy(value.bmin, osg::Vec3f(-1, -2, -3).ptr());
         rcVcopy(value.bmax, osg::Vec3f(3, 2, 1).ptr());
-        value.cs = 1.0f / (std::rand() % 999 + 1);
-        value.ch = 1.0f / (std::rand() % 999 + 1);
-        value.borderSize = std::rand();
-        value.maxEdgeError = 1.0f / (std::rand() % 999 + 1);
-        generate(value.verts, getVertsLength(value));
-        generate(value.polys, getPolysLength(value));
-        generate(value.regs, getRegsLength(value));
-        generate(value.flags, getFlagsLength(value));
-        generate(value.areas, getAreasLength(value));
+        generateValue(value.cs, random);
+        generateValue(value.ch, random);
+        generateValue(value.borderSize, random);
+        generateValue(value.maxEdgeError, random);
+        generateRecastArray(value.verts, getVertsLength(value), random);
+        generateRecastArray(value.polys, getPolysLength(value), random);
+        generateRecastArray(value.regs, getRegsLength(value), random);
+        generateRecastArray(value.flags, getFlagsLength(value), random);
+        generateRecastArray(value.areas, getAreasLength(value), random);
     }
 
-    void generate(rcPolyMeshDetail& value, int size)
+    template <class Random>
+    void generate(rcPolyMeshDetail& value, int size, Random& random)
     {
         value.nmeshes = size;
         value.nverts = size;
         value.ntris = size;
-        generate(value.meshes, getMeshesLength(value));
-        generate(value.verts, getVertsLength(value));
-        generate(value.tris, getTrisLength(value));
+        generateRecastArray(value.meshes, getMeshesLength(value), random);
+        generateRecastArray(value.verts, getVertsLength(value), random);
+        generateRecastArray(value.tris, getTrisLength(value), random);
     }
 
-    void generate(PreparedNavMeshData& value, int size)
+    template <class Random>
+    void generate(PreparedNavMeshData& value, int size, Random& random)
     {
-        value.mUserId = std::rand();
-        value.mCellHeight = 1.0f / (std::rand() % 999 + 1);
-        value.mCellSize = 1.0f / (std::rand() % 999 + 1);
-        generate(value.mPolyMesh, size);
-        generate(value.mPolyMeshDetail, size);
+        generateValue(value.mUserId, random);
+        generateValue(value.mCellHeight, random);
+        generateValue(value.mCellSize, random);
+        generate(value.mPolyMesh, size, random);
+        generate(value.mPolyMeshDetail, size, random);
     }
 
     std::unique_ptr<PreparedNavMeshData> makePeparedNavMeshData(int size)
     {
+        std::minstd_rand random;
         auto result = std::make_unique<PreparedNavMeshData>();
-        generate(*result, size);
+        generate(*result, size, random);
         return result;
     }
 
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index b145f61332..be3efd1b9f 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -204,6 +204,9 @@ add_component_dir(detournavigator
     navmeshcacheitem
     navigatorutils
     generatenavmeshtile
+    navmeshdb
+    serialization
+    navmeshdbutils
     )
 
 add_component_dir(loadinglistener
diff --git a/components/detournavigator/cachedrecastmeshmanager.cpp b/components/detournavigator/cachedrecastmeshmanager.cpp
index a3c7f4b172..e350c5591f 100644
--- a/components/detournavigator/cachedrecastmeshmanager.cpp
+++ b/components/detournavigator/cachedrecastmeshmanager.cpp
@@ -84,6 +84,11 @@ namespace DetourNavigator
         return *mCached.lockConst();
     }
 
+    std::shared_ptr<RecastMesh> CachedRecastMeshManager::getNewMesh() const
+    {
+        return mImpl.getMesh();
+    }
+
     bool CachedRecastMeshManager::isEmpty() const
     {
         return mImpl.isEmpty();
diff --git a/components/detournavigator/cachedrecastmeshmanager.hpp b/components/detournavigator/cachedrecastmeshmanager.hpp
index eb18519891..b92d39efa4 100644
--- a/components/detournavigator/cachedrecastmeshmanager.hpp
+++ b/components/detournavigator/cachedrecastmeshmanager.hpp
@@ -35,6 +35,8 @@ namespace DetourNavigator
 
         std::shared_ptr<RecastMesh> getCachedMesh() const;
 
+        std::shared_ptr<RecastMesh> getNewMesh() const;
+
         bool isEmpty() const;
 
         void reportNavMeshChange(const Version& recastMeshVersion, const Version& navMeshVersion);
diff --git a/components/detournavigator/dbrefgeometryobject.hpp b/components/detournavigator/dbrefgeometryobject.hpp
new file mode 100644
index 0000000000..2be44ca175
--- /dev/null
+++ b/components/detournavigator/dbrefgeometryobject.hpp
@@ -0,0 +1,46 @@
+#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_DBREFGEOMETRYOBJECT_H
+#define OPENMW_COMPONENTS_DETOURNAVIGATOR_DBREFGEOMETRYOBJECT_H
+
+#include "objecttransform.hpp"
+#include "recastmesh.hpp"
+
+#include <algorithm>
+#include <cstdint>
+#include <tuple>
+#include <vector>
+
+namespace DetourNavigator
+{
+    struct DbRefGeometryObject
+    {
+        std::int64_t mShapeId;
+        ObjectTransform mObjectTransform;
+
+        friend inline auto tie(const DbRefGeometryObject& v)
+        {
+            return std::tie(v.mShapeId, v.mObjectTransform);
+        }
+
+        friend inline bool operator<(const DbRefGeometryObject& l, const DbRefGeometryObject& r)
+        {
+            return tie(l) < tie(r);
+        }
+    };
+
+    template <class ResolveMeshSource>
+    inline std::vector<DbRefGeometryObject> makeDbRefGeometryObjects(const std::vector<MeshSource>& meshSources,
+        ResolveMeshSource&& resolveMeshSource)
+    {
+        std::vector<DbRefGeometryObject> result;
+        result.reserve(meshSources.size());
+        std::transform(meshSources.begin(), meshSources.end(), std::back_inserter(result),
+            [&] (const MeshSource& meshSource)
+            {
+                return DbRefGeometryObject {resolveMeshSource(meshSource), meshSource.mObjectTransform};
+            });
+        std::sort(result.begin(), result.end());
+        return result;
+    }
+}
+
+#endif
diff --git a/components/detournavigator/generatenavmeshtile.cpp b/components/detournavigator/generatenavmeshtile.cpp
new file mode 100644
index 0000000000..9dc8e70383
--- /dev/null
+++ b/components/detournavigator/generatenavmeshtile.cpp
@@ -0,0 +1,95 @@
+#include "generatenavmeshtile.hpp"
+
+#include "dbrefgeometryobject.hpp"
+#include "makenavmesh.hpp"
+#include "offmeshconnectionsmanager.hpp"
+#include "preparednavmeshdata.hpp"
+#include "serialization.hpp"
+#include "settings.hpp"
+#include "tilecachedrecastmeshmanager.hpp"
+
+#include <components/debug/debuglog.hpp>
+
+#include <osg/Vec3f>
+#include <osg/io_utils>
+
+#include <memory>
+#include <stdexcept>
+#include <vector>
+#include <optional>
+#include <functional>
+
+namespace DetourNavigator
+{
+    namespace
+    {
+        struct Ignore
+        {
+            std::shared_ptr<NavMeshTileConsumer> mConsumer;
+
+            ~Ignore() noexcept
+            {
+                if (mConsumer != nullptr)
+                    mConsumer->ignore();
+            }
+        };
+    }
+
+    GenerateNavMeshTile::GenerateNavMeshTile(std::string worldspace, const TilePosition& tilePosition,
+            RecastMeshProvider recastMeshProvider, const osg::Vec3f& agentHalfExtents,
+            const DetourNavigator::Settings& settings, std::weak_ptr<NavMeshTileConsumer> consumer)
+        : mWorldspace(std::move(worldspace))
+        , mTilePosition(tilePosition)
+        , mRecastMeshProvider(recastMeshProvider)
+        , mAgentHalfExtents(agentHalfExtents)
+        , mSettings(settings)
+        , mConsumer(std::move(consumer)) {}
+
+    void GenerateNavMeshTile::doWork()
+    {
+        impl();
+    }
+
+    void GenerateNavMeshTile::impl() noexcept
+    {
+        const auto consumer = mConsumer.lock();
+
+        if (consumer == nullptr)
+            return;
+
+        try
+        {
+            Ignore ignore {consumer};
+
+            const std::shared_ptr<RecastMesh> recastMesh = mRecastMeshProvider.getMesh(mTilePosition);
+
+            if (recastMesh == nullptr || isEmpty(*recastMesh))
+                return;
+
+            const std::vector<DbRefGeometryObject> objects = makeDbRefGeometryObjects(recastMesh->getMeshSources(),
+                [&] (const MeshSource& v) { return consumer->resolveMeshSource(v); });
+            std::vector<std::byte> input = serialize(mSettings.mRecast, *recastMesh, objects);
+            const std::optional<NavMeshTileInfo> info = consumer->find(mWorldspace, mTilePosition, input);
+
+            if (info.has_value() && info->mVersion == mSettings.mNavMeshVersion)
+                return;
+
+            const auto data = prepareNavMeshTileData(*recastMesh, mTilePosition, mAgentHalfExtents, mSettings.mRecast);
+
+            if (data == nullptr)
+                return;
+
+            if (info.has_value())
+                consumer->update(info->mTileId, mSettings.mNavMeshVersion, *data);
+            else
+                consumer->insert(mWorldspace, mTilePosition, mSettings.mNavMeshVersion, input, *data);
+
+            ignore.mConsumer = nullptr;
+        }
+        catch (const std::exception& e)
+        {
+            Log(Debug::Warning) << "Failed to generate navmesh for worldspace \"" << mWorldspace
+                                << "\" tile " << mTilePosition << ": " << e.what();
+        }
+    }
+}
diff --git a/components/detournavigator/generatenavmeshtile.hpp b/components/detournavigator/generatenavmeshtile.hpp
new file mode 100644
index 0000000000..511b8dfb8f
--- /dev/null
+++ b/components/detournavigator/generatenavmeshtile.hpp
@@ -0,0 +1,71 @@
+#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_GENERATENAVMESHTILE_H
+#define OPENMW_COMPONENTS_DETOURNAVIGATOR_GENERATENAVMESHTILE_H
+
+#include "recastmeshprovider.hpp"
+#include "tileposition.hpp"
+
+#include <components/sceneutil/workqueue.hpp>
+
+#include <osg/Vec3f>
+
+#include <cstdint>
+#include <functional>
+#include <memory>
+#include <optional>
+#include <string_view>
+#include <vector>
+
+namespace DetourNavigator
+{
+    class OffMeshConnectionsManager;
+    class RecastMesh;
+    struct NavMeshTileConsumer;
+    struct OffMeshConnection;
+    struct PreparedNavMeshData;
+    struct Settings;
+
+    struct NavMeshTileInfo
+    {
+        std::int64_t mTileId;
+        std::int64_t mVersion;
+    };
+
+    struct NavMeshTileConsumer
+    {
+        virtual ~NavMeshTileConsumer() = default;
+
+        virtual std::int64_t resolveMeshSource(const MeshSource& source) = 0;
+
+        virtual std::optional<NavMeshTileInfo> find(const std::string& worldspace, const TilePosition& tilePosition,
+            const std::vector<std::byte>& input) = 0;
+
+        virtual void ignore() = 0;
+
+        virtual void insert(const std::string& worldspace, const TilePosition& tilePosition,
+                            std::int64_t version, const std::vector<std::byte>& input, PreparedNavMeshData& data) = 0;
+
+        virtual void update(std::int64_t tileId, std::int64_t version, PreparedNavMeshData& data) = 0;
+    };
+
+    class GenerateNavMeshTile final : public SceneUtil::WorkItem
+    {
+    public:
+        GenerateNavMeshTile(std::string worldspace, const TilePosition& tilePosition,
+                RecastMeshProvider recastMeshProvider, const osg::Vec3f& agentHalfExtents, const Settings& settings,
+                std::weak_ptr<NavMeshTileConsumer> consumer);
+
+        void doWork() final;
+
+    private:
+        const std::string mWorldspace;
+        const TilePosition mTilePosition;
+        const RecastMeshProvider mRecastMeshProvider;
+        const osg::Vec3f mAgentHalfExtents;
+        const Settings& mSettings;
+        std::weak_ptr<NavMeshTileConsumer> mConsumer;
+
+        inline void impl() noexcept;
+    };
+}
+
+#endif
diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index 217e2b565e..4bfffb22ab 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -114,6 +114,30 @@ namespace
         return waterLevel - settings.mSwimHeightScale * agentHalfExtentsZ - agentHalfExtentsZ;;
     }
 
+    struct RecastParams
+    {
+        float mSampleDist = 0;
+        float mSampleMaxError = 0;
+        int mMaxEdgeLen = 0;
+        int mWalkableClimb = 0;
+        int mWalkableHeight = 0;
+        int mWalkableRadius = 0;
+    };
+
+    RecastParams makeRecastParams(const RecastSettings& settings, const osg::Vec3f& agentHalfExtents)
+    {
+        RecastParams result;
+
+        result.mWalkableHeight = static_cast<int>(std::ceil(getHeight(settings, agentHalfExtents) / settings.mCellHeight));
+        result.mWalkableClimb = static_cast<int>(std::floor(getMaxClimb(settings) / settings.mCellHeight));
+        result.mWalkableRadius = static_cast<int>(std::ceil(getRadius(settings, agentHalfExtents) / settings.mCellSize));
+        result.mMaxEdgeLen = static_cast<int>(std::round(static_cast<float>(settings.mMaxEdgeLen) / settings.mCellSize));
+        result.mSampleDist = settings.mDetailSampleDist < 0.9f ? 0 : settings.mCellSize * settings.mDetailSampleDist;
+        result.mSampleMaxError = settings.mCellHeight * settings.mDetailSampleMaxError;
+
+        return result;
+    }
+
     void initHeightfield(rcContext& context, const TilePosition& tilePosition, float minZ, float maxZ,
         const RecastSettings& settings, rcHeightfield& solid)
     {
@@ -399,27 +423,13 @@ namespace
 
 namespace DetourNavigator
 {
-    RecastParams makeRecastParams(const RecastSettings& settings, const osg::Vec3f& agentHalfExtents)
-    {
-        RecastParams result;
-
-        result.mWalkableHeight = static_cast<int>(std::ceil(getHeight(settings, agentHalfExtents) / settings.mCellHeight));
-        result.mWalkableClimb = static_cast<int>(std::floor(getMaxClimb(settings) / settings.mCellHeight));
-        result.mWalkableRadius = static_cast<int>(std::ceil(getRadius(settings, agentHalfExtents) / settings.mCellSize));
-        result.mMaxEdgeLen = static_cast<int>(std::round(static_cast<float>(settings.mMaxEdgeLen) / settings.mCellSize));
-        result.mSampleDist = settings.mDetailSampleDist < 0.9f ? 0 : settings.mCellSize * settings.mDetailSampleDist;
-        result.mSampleMaxError = settings.mCellHeight * settings.mDetailSampleMaxError;
-
-        return result;
-    }
-
     std::unique_ptr<PreparedNavMeshData> prepareNavMeshTileData(const RecastMesh& recastMesh,
         const TilePosition& tilePosition, const osg::Vec3f& agentHalfExtents, const RecastSettings& settings)
     {
-        const auto [minZ, maxZ] = getBoundsByZ(recastMesh, agentHalfExtents, settings);
-
         rcContext context;
 
+        const auto [minZ, maxZ] = getBoundsByZ(recastMesh, agentHalfExtents, settings);
+
         rcHeightfield solid;
         initHeightfield(context, tilePosition, toNavMeshCoordinates(settings, minZ),
                         toNavMeshCoordinates(settings, maxZ), settings, solid);
@@ -549,8 +559,7 @@ namespace DetourNavigator
             return navMeshCacheItem->lock()->removeTile(changedTile);
         }
 
-        if (recastMesh->getMesh().getIndices().empty() && recastMesh->getWater().empty()
-                && recastMesh->getHeightfields().empty() && recastMesh->getFlatHeightfields().empty())
+        if (isEmpty(*recastMesh))
         {
             Log(Debug::Debug) << "Ignore add tile: recastMesh is empty";
             return navMeshCacheItem->lock()->removeTile(changedTile);
diff --git a/components/detournavigator/makenavmesh.hpp b/components/detournavigator/makenavmesh.hpp
index 989565d4bf..fccf70baad 100644
--- a/components/detournavigator/makenavmesh.hpp
+++ b/components/detournavigator/makenavmesh.hpp
@@ -14,6 +14,7 @@
 #include <vector>
 
 class dtNavMesh;
+struct rcConfig;
 
 namespace DetourNavigator
 {
@@ -22,16 +23,6 @@ namespace DetourNavigator
     struct PreparedNavMeshData;
     struct NavMeshData;
 
-    struct RecastParams
-    {
-        float mSampleDist = 0;
-        float mSampleMaxError = 0;
-        int mMaxEdgeLen = 0;
-        int mWalkableClimb = 0;
-        int mWalkableHeight = 0;
-        int mWalkableRadius = 0;
-    };
-
     inline float getLength(const osg::Vec2i& value)
     {
         return std::sqrt(float(osg::square(value.x()) + osg::square(value.y())));
@@ -48,10 +39,16 @@ namespace DetourNavigator
         return expectedTilesCount <= maxTiles;
     }
 
-    RecastParams makeRecastParams(const RecastSettings& settings, const osg::Vec3f& agentHalfExtents);
+    inline bool isEmpty(const RecastMesh& recastMesh)
+    {
+        return recastMesh.getMesh().getIndices().empty()
+                && recastMesh.getWater().empty()
+                && recastMesh.getHeightfields().empty()
+                && recastMesh.getFlatHeightfields().empty();
+    }
 
-    std::unique_ptr<PreparedNavMeshData> prepareNavMeshTileData(const RecastMesh& recastMesh, const TilePosition& tile,
-        const Bounds& bounds, const osg::Vec3f& agentHalfExtents, const Settings& settings);
+    std::unique_ptr<PreparedNavMeshData> prepareNavMeshTileData(const RecastMesh& recastMesh,
+        const TilePosition& tilePosition, const osg::Vec3f& agentHalfExtents, const RecastSettings& settings);
 
     NavMeshData makeNavMeshTileData(const PreparedNavMeshData& data,
         const std::vector<OffMeshConnection>& offMeshConnections, const osg::Vec3f& agentHalfExtents,
diff --git a/components/detournavigator/navmeshdb.cpp b/components/detournavigator/navmeshdb.cpp
new file mode 100644
index 0000000000..ebff250ee0
--- /dev/null
+++ b/components/detournavigator/navmeshdb.cpp
@@ -0,0 +1,296 @@
+#include "navmeshdb.hpp"
+
+#include <components/debug/debuglog.hpp>
+#include <components/misc/compression.hpp>
+#include <components/sqlite3/db.hpp>
+#include <components/sqlite3/request.hpp>
+
+#include <DetourAlloc.h>
+
+#include <sqlite3.h>
+
+#include <cstddef>
+#include <string>
+#include <string_view>
+#include <vector>
+
+namespace DetourNavigator
+{
+    namespace
+    {
+        constexpr const char schema[] = R"(
+            BEGIN TRANSACTION;
+
+            CREATE TABLE IF NOT EXISTS tiles (
+                tile_id INTEGER PRIMARY KEY,
+                revision INTEGER NOT NULL DEFAULT 1,
+                worldspace TEXT NOT NULL,
+                tile_position_x INTEGER NOT NULL,
+                tile_position_y INTEGER NOT NULL,
+                version INTEGER NOT NULL,
+                input BLOB,
+                data BLOB
+            );
+
+            CREATE UNIQUE INDEX IF NOT EXISTS index_unique_tiles_by_worldspace_and_tile_position_and_input
+                ON tiles (worldspace, tile_position_x, tile_position_y, input);
+
+            CREATE TABLE IF NOT EXISTS shapes (
+                shape_id INTEGER PRIMARY KEY,
+                name TEXT NOT NULL,
+                type INTEGER NOT NULL,
+                hash BLOB NOT NULL
+            );
+
+            CREATE UNIQUE INDEX IF NOT EXISTS index_unique_shapes_by_name_and_type_and_hash
+                ON shapes (name, type, hash);
+
+            COMMIT;
+        )";
+
+        constexpr std::string_view getMaxTileIdQuery = R"(
+            SELECT max(tile_id) FROM tiles
+        )";
+
+        constexpr std::string_view findTileQuery = R"(
+            SELECT tile_id, version
+              FROM tiles
+             WHERE worldspace = :worldspace
+               AND tile_position_x = :tile_position_x
+               AND tile_position_y = :tile_position_y
+               AND input = :input
+        )";
+
+        constexpr std::string_view getTileDataQuery = R"(
+            SELECT tile_id, version, data
+              FROM tiles
+             WHERE worldspace = :worldspace
+               AND tile_position_x = :tile_position_x
+               AND tile_position_y = :tile_position_y
+               AND input = :input
+        )";
+
+        constexpr std::string_view insertTileQuery = R"(
+            INSERT INTO tiles ( tile_id,  worldspace,  version,  tile_position_x,  tile_position_y,  input,  data)
+                   VALUES     (:tile_id, :worldspace, :version, :tile_position_x, :tile_position_y, :input, :data)
+        )";
+
+        constexpr std::string_view updateTileQuery = R"(
+            UPDATE tiles
+               SET version = :version,
+                   data = :data,
+                   revision = revision + 1
+             WHERE tile_id = :tile_id
+        )";
+
+        constexpr std::string_view getMaxShapeIdQuery = R"(
+            SELECT max(shape_id) FROM shapes
+        )";
+
+        constexpr std::string_view findShapeIdQuery = R"(
+            SELECT shape_id
+              FROM shapes
+             WHERE name = :name
+               AND type = :type
+               AND hash = :hash
+        )";
+
+        constexpr std::string_view insertShapeQuery = R"(
+            INSERT INTO shapes ( shape_id,  name,  type,  hash)
+                   VALUES      (:shape_id, :name, :type, :hash)
+        )";
+    }
+
+    std::ostream& operator<<(std::ostream& stream, ShapeType value)
+    {
+        switch (value)
+        {
+            case ShapeType::Collision: return stream << "collision";
+            case ShapeType::Avoid: return stream << "avoid";
+        }
+        return stream << "unknown shape type (" << static_cast<std::underlying_type_t<ShapeType>>(value) << ")";
+    }
+
+    NavMeshDb::NavMeshDb(std::string_view path)
+        : mDb(Sqlite3::makeDb(path, schema))
+        , mGetMaxTileId(*mDb, DbQueries::GetMaxTileId {})
+        , mFindTile(*mDb, DbQueries::FindTile {})
+        , mGetTileData(*mDb, DbQueries::GetTileData {})
+        , mInsertTile(*mDb, DbQueries::InsertTile {})
+        , mUpdateTile(*mDb, DbQueries::UpdateTile {})
+        , mGetMaxShapeId(*mDb, DbQueries::GetMaxShapeId {})
+        , mFindShapeId(*mDb, DbQueries::FindShapeId {})
+        , mInsertShape(*mDb, DbQueries::InsertShape {})
+    {
+    }
+
+    Sqlite3::Transaction NavMeshDb::startTransaction()
+    {
+        return Sqlite3::Transaction(*mDb);
+    }
+
+    TileId NavMeshDb::getMaxTileId()
+    {
+        TileId tileId {0};
+        request(*mDb, mGetMaxTileId, &tileId, 1);
+        return tileId;
+    }
+
+    std::optional<Tile> NavMeshDb::findTile(const std::string& worldspace,
+        const TilePosition& tilePosition, const std::vector<std::byte>& input)
+    {
+        Tile result;
+        auto row = std::tie(result.mTileId, result.mVersion);
+        const std::vector<std::byte> compressedInput = Misc::compress(input);
+        if (&row == request(*mDb, mFindTile, &row, 1, worldspace, tilePosition, compressedInput))
+            return {};
+        return result;
+    }
+
+    std::optional<TileData> NavMeshDb::getTileData(const std::string& worldspace,
+        const TilePosition& tilePosition, const std::vector<std::byte>& input)
+    {
+        TileData result;
+        auto row = std::tie(result.mTileId, result.mVersion, result.mData);
+        const std::vector<std::byte> compressedInput = Misc::compress(input);
+        if (&row == request(*mDb, mGetTileData, &row, 1, worldspace, tilePosition, compressedInput))
+            return {};
+        result.mData = Misc::decompress(result.mData);
+        return result;
+    }
+
+    int NavMeshDb::insertTile(TileId tileId, const std::string& worldspace, const TilePosition& tilePosition,
+        TileVersion version, const std::vector<std::byte>& input, const std::vector<std::byte>& data)
+    {
+        const std::vector<std::byte> compressedInput = Misc::compress(input);
+        const std::vector<std::byte> compressedData = Misc::compress(data);
+        return execute(*mDb, mInsertTile, tileId, worldspace, tilePosition, version, compressedInput, compressedData);
+    }
+
+    int NavMeshDb::updateTile(TileId tileId, TileVersion version, const std::vector<std::byte>& data)
+    {
+        const std::vector<std::byte> compressedData = Misc::compress(data);
+        return execute(*mDb, mUpdateTile, tileId, version, compressedData);
+    }
+
+    ShapeId NavMeshDb::getMaxShapeId()
+    {
+        ShapeId shapeId {0};
+        request(*mDb, mGetMaxShapeId, &shapeId, 1);
+        return shapeId;
+    }
+
+    std::optional<ShapeId> NavMeshDb::findShapeId(const std::string& name, ShapeType type,
+        const Sqlite3::ConstBlob& hash)
+    {
+        ShapeId shapeId;
+        if (&shapeId == request(*mDb, mFindShapeId, &shapeId, 1, name, type, hash))
+            return {};
+        return shapeId;
+    }
+
+    int NavMeshDb::insertShape(ShapeId shapeId, const std::string& name, ShapeType type,
+        const Sqlite3::ConstBlob& hash)
+    {
+        return execute(*mDb, mInsertShape, shapeId, name, type, hash);
+    }
+
+    namespace DbQueries
+    {
+        std::string_view GetMaxTileId::text() noexcept
+        {
+            return getMaxTileIdQuery;
+        }
+
+        std::string_view FindTile::text() noexcept
+        {
+            return findTileQuery;
+        }
+
+        void FindTile::bind(sqlite3& db, sqlite3_stmt& statement, const std::string& worldspace,
+            const TilePosition& tilePosition, const std::vector<std::byte>& input)
+        {
+            Sqlite3::bindParameter(db, statement, ":worldspace", worldspace);
+            Sqlite3::bindParameter(db, statement, ":tile_position_x", tilePosition.x());
+            Sqlite3::bindParameter(db, statement, ":tile_position_y", tilePosition.y());
+            Sqlite3::bindParameter(db, statement, ":input", input);
+        }
+
+        std::string_view GetTileData::text() noexcept
+        {
+            return getTileDataQuery;
+        }
+
+        void GetTileData::bind(sqlite3& db, sqlite3_stmt& statement, const std::string& worldspace,
+            const TilePosition& tilePosition, const std::vector<std::byte>& input)
+        {
+            Sqlite3::bindParameter(db, statement, ":worldspace", worldspace);
+            Sqlite3::bindParameter(db, statement, ":tile_position_x", tilePosition.x());
+            Sqlite3::bindParameter(db, statement, ":tile_position_y", tilePosition.y());
+            Sqlite3::bindParameter(db, statement, ":input", input);
+        }
+
+        std::string_view InsertTile::text() noexcept
+        {
+            return insertTileQuery;
+        }
+
+        void InsertTile::bind(sqlite3& db, sqlite3_stmt& statement, TileId tileId, const std::string& worldspace,
+            const TilePosition& tilePosition, TileVersion version, const std::vector<std::byte>& input,
+            const std::vector<std::byte>& data)
+        {
+            Sqlite3::bindParameter(db, statement, ":tile_id", tileId);
+            Sqlite3::bindParameter(db, statement, ":worldspace", worldspace);
+            Sqlite3::bindParameter(db, statement, ":tile_position_x", tilePosition.x());
+            Sqlite3::bindParameter(db, statement, ":tile_position_y", tilePosition.y());
+            Sqlite3::bindParameter(db, statement, ":version", version);
+            Sqlite3::bindParameter(db, statement, ":input", input);
+            Sqlite3::bindParameter(db, statement, ":data", data);
+        }
+
+        std::string_view UpdateTile::text() noexcept
+        {
+            return updateTileQuery;
+        }
+
+        void UpdateTile::bind(sqlite3& db, sqlite3_stmt& statement, TileId tileId, TileVersion version,
+            const std::vector<std::byte>& data)
+        {
+            Sqlite3::bindParameter(db, statement, ":tile_id", tileId);
+            Sqlite3::bindParameter(db, statement, ":version", version);
+            Sqlite3::bindParameter(db, statement, ":data", data);
+        }
+
+        std::string_view GetMaxShapeId::text() noexcept
+        {
+            return getMaxShapeIdQuery;
+        }
+
+        std::string_view FindShapeId::text() noexcept
+        {
+            return findShapeIdQuery;
+        }
+
+        void FindShapeId::bind(sqlite3& db, sqlite3_stmt& statement, const std::string& name,
+            ShapeType type, const Sqlite3::ConstBlob& hash)
+        {
+            Sqlite3::bindParameter(db, statement, ":name", name);
+            Sqlite3::bindParameter(db, statement, ":type", static_cast<int>(type));
+            Sqlite3::bindParameter(db, statement, ":hash", hash);
+        }
+
+        std::string_view InsertShape::text() noexcept
+        {
+            return insertShapeQuery;
+        }
+
+        void InsertShape::bind(sqlite3& db, sqlite3_stmt& statement, ShapeId shapeId, const std::string& name,
+            ShapeType type, const Sqlite3::ConstBlob& hash)
+        {
+            Sqlite3::bindParameter(db, statement, ":shape_id", shapeId);
+            Sqlite3::bindParameter(db, statement, ":name", name);
+            Sqlite3::bindParameter(db, statement, ":type", static_cast<int>(type));
+            Sqlite3::bindParameter(db, statement, ":hash", hash);
+        }
+    }
+}
diff --git a/components/detournavigator/navmeshdb.hpp b/components/detournavigator/navmeshdb.hpp
new file mode 100644
index 0000000000..636f1de000
--- /dev/null
+++ b/components/detournavigator/navmeshdb.hpp
@@ -0,0 +1,153 @@
+#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_NAVMESHDB_H
+#define OPENMW_COMPONENTS_DETOURNAVIGATOR_NAVMESHDB_H
+
+#include "tileposition.hpp"
+
+#include <components/sqlite3/db.hpp>
+#include <components/sqlite3/statement.hpp>
+#include <components/sqlite3/transaction.hpp>
+#include <components/sqlite3/types.hpp>
+
+#include <boost/serialization/strong_typedef.hpp>
+
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
+#include <optional>
+#include <stdexcept>
+#include <string>
+#include <string_view>
+#include <tuple>
+#include <utility>
+#include <vector>
+#include <memory>
+
+struct sqlite3;
+struct sqlite3_stmt;
+
+namespace DetourNavigator
+{
+    BOOST_STRONG_TYPEDEF(std::int64_t, TileId)
+    BOOST_STRONG_TYPEDEF(std::int64_t, TileRevision)
+    BOOST_STRONG_TYPEDEF(std::int64_t, TileVersion)
+    BOOST_STRONG_TYPEDEF(std::int64_t, ShapeId)
+
+    struct Tile
+    {
+        TileId mTileId;
+        TileVersion mVersion;
+    };
+
+    struct TileData
+    {
+        TileId mTileId;
+        TileVersion mVersion;
+        std::vector<std::byte> mData;
+    };
+
+    enum class ShapeType
+    {
+        Collision = 1,
+        Avoid = 2,
+    };
+
+    std::ostream& operator<<(std::ostream& stream, ShapeType value);
+
+    namespace DbQueries
+    {
+        struct GetMaxTileId
+        {
+            static std::string_view text() noexcept;
+            static void bind(sqlite3&, sqlite3_stmt&) {}
+        };
+
+        struct FindTile
+        {
+            static std::string_view text() noexcept;
+            static void bind(sqlite3& db, sqlite3_stmt& statement, const std::string& worldspace,
+                const TilePosition& tilePosition, const std::vector<std::byte>& input);
+        };
+
+        struct GetTileData
+        {
+            static std::string_view text() noexcept;
+            static void bind(sqlite3& db, sqlite3_stmt& statement, const std::string& worldspace,
+                const TilePosition& tilePosition, const std::vector<std::byte>& input);
+        };
+
+        struct InsertTile
+        {
+            static std::string_view text() noexcept;
+            static void bind(sqlite3& db, sqlite3_stmt& statement, TileId tileId, const std::string& worldspace,
+                const TilePosition& tilePosition, TileVersion version, const std::vector<std::byte>& input,
+                const std::vector<std::byte>& data);
+        };
+
+        struct UpdateTile
+        {
+            static std::string_view text() noexcept;
+            static void bind(sqlite3& db, sqlite3_stmt& statement, TileId tileId, TileVersion version,
+                const std::vector<std::byte>& data);
+        };
+
+        struct GetMaxShapeId
+        {
+            static std::string_view text() noexcept;
+            static void bind(sqlite3&, sqlite3_stmt&) {}
+        };
+
+        struct FindShapeId
+        {
+            static std::string_view text() noexcept;
+            static void bind(sqlite3& db, sqlite3_stmt& statement, const std::string& name,
+                ShapeType type, const Sqlite3::ConstBlob& hash);
+        };
+
+        struct InsertShape
+        {
+            static std::string_view text() noexcept;
+            static void bind(sqlite3& db, sqlite3_stmt& statement, ShapeId shapeId, const std::string& name,
+                ShapeType type, const Sqlite3::ConstBlob& hash);
+        };
+    }
+
+    class NavMeshDb
+    {
+    public:
+        explicit NavMeshDb(std::string_view path);
+
+        Sqlite3::Transaction startTransaction();
+
+        TileId getMaxTileId();
+
+        std::optional<Tile> findTile(const std::string& worldspace,
+            const TilePosition& tilePosition, const std::vector<std::byte>& input);
+
+        std::optional<TileData> getTileData(const std::string& worldspace,
+            const TilePosition& tilePosition, const std::vector<std::byte>& input);
+
+        int insertTile(TileId tileId, const std::string& worldspace, const TilePosition& tilePosition,
+            TileVersion version, const std::vector<std::byte>& input, const std::vector<std::byte>& data);
+
+        int updateTile(TileId tileId, TileVersion version, const std::vector<std::byte>& data);
+
+        ShapeId getMaxShapeId();
+
+        std::optional<ShapeId> findShapeId(const std::string& name, ShapeType type, const Sqlite3::ConstBlob& hash);
+
+        int insertShape(ShapeId shapeId, const std::string& name, ShapeType type, const Sqlite3::ConstBlob& hash);
+
+    private:
+        Sqlite3::Db mDb;
+        Sqlite3::Statement<DbQueries::GetMaxTileId> mGetMaxTileId;
+        Sqlite3::Statement<DbQueries::FindTile> mFindTile;
+        Sqlite3::Statement<DbQueries::GetTileData> mGetTileData;
+        Sqlite3::Statement<DbQueries::InsertTile> mInsertTile;
+        Sqlite3::Statement<DbQueries::UpdateTile> mUpdateTile;
+        Sqlite3::Statement<DbQueries::GetMaxShapeId> mGetMaxShapeId;
+        Sqlite3::Statement<DbQueries::FindShapeId> mFindShapeId;
+        Sqlite3::Statement<DbQueries::InsertShape> mInsertShape;
+    };
+}
+
+#endif
diff --git a/components/detournavigator/navmeshdbutils.cpp b/components/detournavigator/navmeshdbutils.cpp
new file mode 100644
index 0000000000..dce6ef3a72
--- /dev/null
+++ b/components/detournavigator/navmeshdbutils.cpp
@@ -0,0 +1,40 @@
+#include "navmeshdbutils.hpp"
+#include "navmeshdb.hpp"
+#include "recastmesh.hpp"
+
+#include <components/debug/debuglog.hpp>
+
+#include <cassert>
+
+namespace DetourNavigator
+{
+    namespace
+    {
+        ShapeId getShapeId(NavMeshDb& db, const std::string& name, ShapeType type, const std::string& hash, ShapeId& nextShapeId)
+        {
+            const Sqlite3::ConstBlob hashData {hash.data(), static_cast<int>(hash.size())};
+            if (const auto existingShapeId = db.findShapeId(name, type, hashData))
+                return *existingShapeId;
+            const ShapeId newShapeId = nextShapeId;
+            db.insertShape(newShapeId, name, type, hashData);
+            Log(Debug::Verbose) << "Added " << name << " " << type << " shape to navmeshdb with id " << newShapeId;
+            ++nextShapeId.t;
+            return newShapeId;
+        }
+    }
+
+    ShapeId resolveMeshSource(NavMeshDb& db, const MeshSource& source, ShapeId& nextShapeId)
+    {
+        switch (source.mAreaType)
+        {
+            case AreaType_null:
+                return getShapeId(db, source.mShape->mFileName, ShapeType::Avoid, source.mShape->mFileHash, nextShapeId);
+            case AreaType_ground:
+                return getShapeId(db, source.mShape->mFileName, ShapeType::Collision, source.mShape->mFileHash, nextShapeId);
+            default:
+                Log(Debug::Warning) << "Trying to resolve recast mesh source with unsupported area type: " << source.mAreaType;
+                assert(false);
+                return ShapeId(0);
+        }
+    }
+}
diff --git a/components/detournavigator/navmeshdbutils.hpp b/components/detournavigator/navmeshdbutils.hpp
new file mode 100644
index 0000000000..02b3bdbb00
--- /dev/null
+++ b/components/detournavigator/navmeshdbutils.hpp
@@ -0,0 +1,13 @@
+#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_NAVMESHDBUTILS_H
+#define OPENMW_COMPONENTS_DETOURNAVIGATOR_NAVMESHDBUTILS_H
+
+#include "navmeshdb.hpp"
+
+namespace DetourNavigator
+{
+    struct MeshSource;
+
+    ShapeId resolveMeshSource(NavMeshDb& db, const MeshSource& source, ShapeId& nextShapeId);
+}
+
+#endif
diff --git a/components/detournavigator/objectid.hpp b/components/detournavigator/objectid.hpp
index 9c4b5b2710..22fc792c6f 100644
--- a/components/detournavigator/objectid.hpp
+++ b/components/detournavigator/objectid.hpp
@@ -15,6 +15,11 @@ namespace DetourNavigator
         {
         }
 
+        explicit ObjectId(std::size_t value) noexcept
+            : mValue(value)
+        {
+        }
+
         std::size_t value() const noexcept
         {
             return mValue;
diff --git a/components/detournavigator/offmeshconnectionsmanager.cpp b/components/detournavigator/offmeshconnectionsmanager.cpp
index 2306e50da9..a11da21218 100644
--- a/components/detournavigator/offmeshconnectionsmanager.cpp
+++ b/components/detournavigator/offmeshconnectionsmanager.cpp
@@ -65,11 +65,11 @@ namespace DetourNavigator
         return removed;
     }
 
-    std::vector<OffMeshConnection> OffMeshConnectionsManager::get(const TilePosition& tilePosition)
+    std::vector<OffMeshConnection> OffMeshConnectionsManager::get(const TilePosition& tilePosition) const
     {
         std::vector<OffMeshConnection> result;
 
-        const auto values = mValues.lock();
+        const auto values = mValues.lockConst();
 
         const auto itByTilePosition = values->mByTilePosition.find(tilePosition);
 
diff --git a/components/detournavigator/offmeshconnectionsmanager.hpp b/components/detournavigator/offmeshconnectionsmanager.hpp
index a0a1231bc4..455b03276a 100644
--- a/components/detournavigator/offmeshconnectionsmanager.hpp
+++ b/components/detournavigator/offmeshconnectionsmanager.hpp
@@ -24,7 +24,7 @@ namespace DetourNavigator
 
         std::set<TilePosition> remove(const ObjectId id);
 
-        std::vector<OffMeshConnection> get(const TilePosition& tilePosition);
+        std::vector<OffMeshConnection> get(const TilePosition& tilePosition) const;
 
     private:
         struct Values
diff --git a/components/detournavigator/recastmeshprovider.hpp b/components/detournavigator/recastmeshprovider.hpp
new file mode 100644
index 0000000000..5c56d15a5e
--- /dev/null
+++ b/components/detournavigator/recastmeshprovider.hpp
@@ -0,0 +1,33 @@
+#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_RECASTMESHPROVIDER_H
+#define OPENMW_COMPONENTS_DETOURNAVIGATOR_RECASTMESHPROVIDER_H
+
+#include "tileposition.hpp"
+#include "recastmesh.hpp"
+#include "tilecachedrecastmeshmanager.hpp"
+#include "version.hpp"
+
+#include <functional>
+#include <memory>
+
+namespace DetourNavigator
+{
+    class RecastMesh;
+
+    class RecastMeshProvider
+    {
+    public:
+        RecastMeshProvider(TileCachedRecastMeshManager& impl)
+            : mImpl(impl)
+        {}
+
+        std::shared_ptr<RecastMesh> getMesh(const TilePosition& tilePosition) const
+        {
+            return mImpl.get().getNewMesh(tilePosition);
+        }
+
+    private:
+        std::reference_wrapper<TileCachedRecastMeshManager> mImpl;
+    };
+}
+
+#endif
diff --git a/components/detournavigator/serialization.cpp b/components/detournavigator/serialization.cpp
new file mode 100644
index 0000000000..8eb60ddb97
--- /dev/null
+++ b/components/detournavigator/serialization.cpp
@@ -0,0 +1,214 @@
+#include "serialization.hpp"
+
+#include "dbrefgeometryobject.hpp"
+#include "preparednavmeshdata.hpp"
+#include "recastmesh.hpp"
+#include "settings.hpp"
+
+#include <components/serialization/binarywriter.hpp>
+#include <components/serialization/format.hpp>
+#include <components/serialization/sizeaccumulator.hpp>
+
+#include <cstddef>
+#include <vector>
+
+namespace DetourNavigator
+{
+namespace
+{
+    template <Serialization::Mode mode>
+    struct Format : Serialization::Format<mode, Format<mode>>
+    {
+        using Serialization::Format<mode, Format<mode>>::operator();
+
+        template <class Visitor>
+        void operator()(Visitor&& visitor, const osg::Vec2i& value) const
+        {
+            visitor(*this, value.ptr(), 2);
+        }
+
+        template <class Visitor>
+        void operator()(Visitor&& visitor, const osg::Vec2f& value) const
+        {
+            visitor(*this, value.ptr(), 2);
+        }
+
+        template <class Visitor>
+        void operator()(Visitor&& visitor, const osg::Vec3f& value) const
+        {
+            visitor(*this, value.ptr(), 3);
+        }
+
+        template <class Visitor>
+        void operator()(Visitor&& visitor, const Water& value) const
+        {
+            visitor(*this, value.mCellSize);
+            visitor(*this, value.mLevel);
+        }
+
+        template <class Visitor>
+        void operator()(Visitor&& visitor, const CellWater& value) const
+        {
+            visitor(*this, value.mCellPosition);
+            visitor(*this, value.mWater);
+        }
+
+        template <class Visitor>
+        void operator()(Visitor&& visitor, const RecastSettings& value) const
+        {
+            visitor(*this, value.mCellHeight);
+            visitor(*this, value.mCellSize);
+            visitor(*this, value.mDetailSampleDist);
+            visitor(*this, value.mDetailSampleMaxError);
+            visitor(*this, value.mMaxClimb);
+            visitor(*this, value.mMaxSimplificationError);
+            visitor(*this, value.mMaxSlope);
+            visitor(*this, value.mRecastScaleFactor);
+            visitor(*this, value.mSwimHeightScale);
+            visitor(*this, value.mBorderSize);
+            visitor(*this, value.mMaxEdgeLen);
+            visitor(*this, value.mMaxVertsPerPoly);
+            visitor(*this, value.mRegionMergeArea);
+            visitor(*this, value.mRegionMinArea);
+            visitor(*this, value.mTileSize);
+        }
+
+        template <class Visitor>
+        void operator()(Visitor&& visitor, const TileBounds& value) const
+        {
+            visitor(*this, value.mMin);
+            visitor(*this, value.mMax);
+        }
+
+        template <class Visitor>
+        void operator()(Visitor&& visitor, const Heightfield& value) const
+        {
+            visitor(*this, value.mCellPosition);
+            visitor(*this, value.mCellSize);
+            visitor(*this, value.mLength);
+            visitor(*this, value.mMinHeight);
+            visitor(*this, value.mMaxHeight);
+            visitor(*this, value.mHeights);
+            visitor(*this, value.mOriginalSize);
+            visitor(*this, value.mMinX);
+            visitor(*this, value.mMinY);
+        }
+
+        template <class Visitor>
+        void operator()(Visitor&& visitor, const FlatHeightfield& value) const
+        {
+            visitor(*this, value.mCellPosition);
+            visitor(*this, value.mCellSize);
+            visitor(*this, value.mHeight);
+        }
+
+        template <class Visitor>
+        void operator()(Visitor&& visitor, const RecastMesh& value) const
+        {
+            visitor(*this, value.getWater());
+            visitor(*this, value.getHeightfields());
+            visitor(*this, value.getFlatHeightfields());
+        }
+
+        template <class Visitor>
+        void operator()(Visitor&& visitor, const ESM::Position& value) const
+        {
+            visitor(*this, value.pos);
+            visitor(*this, value.rot);
+        }
+
+        template <class Visitor>
+        void operator()(Visitor&& visitor, const ObjectTransform& value) const
+        {
+            visitor(*this, value.mPosition);
+            visitor(*this, value.mScale);
+        }
+
+        template <class Visitor>
+        void operator()(Visitor&& visitor, const DbRefGeometryObject& value) const
+        {
+            visitor(*this, value.mShapeId);
+            visitor(*this, value.mObjectTransform);
+        }
+
+        template <class Visitor>
+        void operator()(Visitor&& visitor, const RecastSettings& settings, const RecastMesh& recastMesh,
+            const std::vector<DbRefGeometryObject>& dbRefGeometryObjects) const
+        {
+            visitor(*this, DetourNavigator::recastMeshMagic);
+            visitor(*this, DetourNavigator::recastMeshVersion);
+            visitor(*this, settings);
+            visitor(*this, recastMesh);
+            visitor(*this, dbRefGeometryObjects);
+        }
+
+        template <class Visitor>
+        auto operator()(Visitor&& visitor, const rcPolyMesh& value) const
+        {
+            visitor(*this, value.nverts);
+            visitor(*this, value.npolys);
+            visitor(*this, value.maxpolys);
+            visitor(*this, value.nvp);
+            visitor(*this, value.bmin);
+            visitor(*this, value.bmax);
+            visitor(*this, value.cs);
+            visitor(*this, value.ch);
+            visitor(*this, value.borderSize);
+            visitor(*this, value.maxEdgeError);
+            visitor(*this, value.verts, getVertsLength(value));
+            visitor(*this, value.polys, getPolysLength(value));
+            visitor(*this, value.regs, getRegsLength(value));
+            visitor(*this, value.flags, getFlagsLength(value));
+            visitor(*this, value.areas, getAreasLength(value));
+        }
+
+        template <class Visitor>
+        auto operator()(Visitor&& visitor, const rcPolyMeshDetail& value) const
+        {
+            visitor(*this, value.nmeshes);
+            visitor(*this, value.meshes, getMeshesLength(value));
+            visitor(*this, value.nverts);
+            visitor(*this, value.verts, getVertsLength(value));
+            visitor(*this, value.ntris);
+            visitor(*this, value.tris, getTrisLength(value));
+        }
+
+        template <class Visitor>
+        auto operator()(Visitor&& visitor, const PreparedNavMeshData& value) const
+        {
+            visitor(*this, DetourNavigator::preparedNavMeshDataMagic);
+            visitor(*this, DetourNavigator::preparedNavMeshDataVersion);
+            visitor(*this, value.mUserId);
+            visitor(*this, value.mCellSize);
+            visitor(*this, value.mCellHeight);
+            visitor(*this, value.mPolyMesh);
+            visitor(*this, value.mPolyMeshDetail);
+        }
+    };
+}
+} // namespace DetourNavigator
+
+namespace DetourNavigator
+{
+    std::vector<std::byte> serialize(const RecastSettings& settings, const RecastMesh& recastMesh,
+        const std::vector<DbRefGeometryObject>& dbRefGeometryObjects)
+    {
+        constexpr Format<Serialization::Mode::Write> format;
+        Serialization::SizeAccumulator sizeAccumulator;
+        format(sizeAccumulator, settings, recastMesh, dbRefGeometryObjects);
+        std::vector<std::byte> result(sizeAccumulator.value());
+        format(Serialization::BinaryWriter(result.data(), result.data() + result.size()),
+               settings, recastMesh, dbRefGeometryObjects);
+        return result;
+    }
+
+    std::vector<std::byte> serialize(const PreparedNavMeshData& value)
+    {
+        constexpr Format<Serialization::Mode::Write> format;
+        Serialization::SizeAccumulator sizeAccumulator;
+        format(sizeAccumulator, value);
+        std::vector<std::byte> result(sizeAccumulator.value());
+        format(Serialization::BinaryWriter(result.data(), result.data() + result.size()), value);
+        return result;
+    }
+}
diff --git a/components/detournavigator/serialization.hpp b/components/detournavigator/serialization.hpp
new file mode 100644
index 0000000000..8e8096a3dc
--- /dev/null
+++ b/components/detournavigator/serialization.hpp
@@ -0,0 +1,27 @@
+#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_SERIALIZATION_H
+#define OPENMW_COMPONENTS_DETOURNAVIGATOR_SERIALIZATION_H
+
+#include <cstddef>
+#include <cstdint>
+#include <vector>
+
+namespace DetourNavigator
+{
+    class RecastMesh;
+    struct DbRefGeometryObject;
+    struct PreparedNavMeshData;
+    struct RecastSettings;
+
+    constexpr char recastMeshMagic[] = {'r', 'c', 's', 't'};
+    constexpr std::uint32_t recastMeshVersion = 1;
+
+    constexpr char preparedNavMeshDataMagic[] = {'p', 'n', 'a', 'v'};
+    constexpr std::uint32_t preparedNavMeshDataVersion = 1;
+
+    std::vector<std::byte> serialize(const RecastSettings& settings, const RecastMesh& value,
+        const std::vector<DbRefGeometryObject>& dbRefGeometryObjects);
+
+    std::vector<std::byte> serialize(const PreparedNavMeshData& value);
+}
+
+#endif
diff --git a/components/detournavigator/settings.cpp b/components/detournavigator/settings.cpp
index 5ad45d699b..cda9ab8d2f 100644
--- a/components/detournavigator/settings.cpp
+++ b/components/detournavigator/settings.cpp
@@ -61,6 +61,7 @@ namespace DetourNavigator
         result.mEnableRecastMeshFileNameRevision = ::Settings::Manager::getBool("enable recast mesh file name revision", "Navigator");
         result.mEnableNavMeshFileNameRevision = ::Settings::Manager::getBool("enable nav mesh file name revision", "Navigator");
         result.mMinUpdateInterval = std::chrono::milliseconds(::Settings::Manager::getInt("min update interval ms", "Navigator"));
+        result.mNavMeshVersion = ::Settings::Manager::getInt("nav mesh version", "Navigator");
 
         return result;
     }
diff --git a/components/detournavigator/settings.hpp b/components/detournavigator/settings.hpp
index fbd44dfcfc..3253b60893 100644
--- a/components/detournavigator/settings.hpp
+++ b/components/detournavigator/settings.hpp
@@ -48,6 +48,7 @@ namespace DetourNavigator
         std::string mRecastMeshPathPrefix;
         std::string mNavMeshPathPrefix;
         std::chrono::milliseconds mMinUpdateInterval;
+        std::int64_t mNavMeshVersion = 0;
     };
 
     RecastSettings makeRecastSettingsFromSettingsManager();
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.cpp b/components/detournavigator/tilecachedrecastmeshmanager.cpp
index ebd64180aa..88fd8ab3f5 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -196,6 +196,13 @@ namespace DetourNavigator
         return nullptr;
     }
 
+    std::shared_ptr<RecastMesh> TileCachedRecastMeshManager::getNewMesh(const TilePosition& tilePosition) const
+    {
+        if (const auto manager = getManager(tilePosition))
+            return manager->getNewMesh();
+        return nullptr;
+    }
+
     std::size_t TileCachedRecastMeshManager::getRevision() const
     {
         return mRevision;
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.hpp b/components/detournavigator/tilecachedrecastmeshmanager.hpp
index 96183a51be..68dc565fa5 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.hpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.hpp
@@ -88,6 +88,8 @@ namespace DetourNavigator
 
         std::shared_ptr<RecastMesh> getCachedMesh(const TilePosition& tilePosition) const;
 
+        std::shared_ptr<RecastMesh> getNewMesh(const TilePosition& tilePosition) const;
+
         template <class Function>
         void forEachTile(Function&& function) const
         {
diff --git a/components/sqlite3/request.hpp b/components/sqlite3/request.hpp
index 339c7f7521..0a74bf1cb3 100644
--- a/components/sqlite3/request.hpp
+++ b/components/sqlite3/request.hpp
@@ -2,6 +2,7 @@
 #define OPENMW_COMPONENTS_SQLITE3_REQUEST_H
 
 #include "statement.hpp"
+#include "types.hpp"
 
 #include <sqlite3.h>
 
@@ -53,6 +54,13 @@ namespace Sqlite3
                                      + ": " + std::string(sqlite3_errmsg(&db)));
     }
 
+    inline void bindParameter(sqlite3& db, sqlite3_stmt& stmt, int index, const ConstBlob& value)
+    {
+        if (sqlite3_bind_blob(&stmt, index, value.mData, value.mSize, SQLITE_STATIC) != SQLITE_OK)
+            throw std::runtime_error("Failed to bind blob to parameter " + std::to_string(index)
+                                     + ": " + std::string(sqlite3_errmsg(&db)));
+    }
+
     template <typename T>
     inline void bindParameter(sqlite3& db, sqlite3_stmt& stmt, const char* name, const T& value)
     {
diff --git a/components/sqlite3/types.hpp b/components/sqlite3/types.hpp
new file mode 100644
index 0000000000..325e9e6608
--- /dev/null
+++ b/components/sqlite3/types.hpp
@@ -0,0 +1,15 @@
+#ifndef OPENMW_COMPONENTS_SQLITE3_TYPES_H
+#define OPENMW_COMPONENTS_SQLITE3_TYPES_H
+
+#include <cstddef>
+
+namespace Sqlite3
+{
+    struct ConstBlob
+    {
+        const char* mData;
+        int mSize;
+    };
+}
+
+#endif
diff --git a/docs/source/reference/modding/settings/game.rst b/docs/source/reference/modding/settings/game.rst
index 605be3f6af..6b19885557 100644
--- a/docs/source/reference/modding/settings/game.rst
+++ b/docs/source/reference/modding/settings/game.rst
@@ -464,3 +464,4 @@ default actor pathfind half extents
 :Default:	29.27999496459961 28.479997634887695 66.5
 
 Actor half extents used for exterior cells to generate navmesh.
+Changing the value will invalidate navmesh disk cache.
diff --git a/docs/source/reference/modding/settings/navigator.rst b/docs/source/reference/modding/settings/navigator.rst
index f8ab4522d6..9132364d48 100644
--- a/docs/source/reference/modding/settings/navigator.rst
+++ b/docs/source/reference/modding/settings/navigator.rst
@@ -206,6 +206,17 @@ Absent pieces usually mean a bug in recast mesh tiles building.
 Allows to do in-game debug.
 Potentially decreases performance.
 
+nav mesh version
+----------------
+
+:Type:		integer
+:Range:		> 0
+:Default:	1
+
+Version of navigation mesh generation algorithm.
+Should be increased each time there is a difference between output of makeNavMeshTileData function for the same input.
+Changing the value will invalidate navmesh disk cache.
+
 Expert settings
 ***************
 
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 084aad4fe3..e80d6d1106 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -930,6 +930,10 @@ min update interval ms = 250
 # Distance is measured in the number of tiles and can be only an integer value.
 wait until min distance to player = 5
 
+# Version of navigation mesh generation algorithm.
+# Should be increased each time there is a difference between output of makeNavMeshTileData function for the same input.
+nav mesh version = 1
+
 [Shadows]
 
 # Enable or disable shadows. Bear in mind that this will force OpenMW to use shaders as if "[Shaders]/force shaders" was set to true.

From c9b8ba7b46c2170ef873d7c2f1d8172b3e86fb69 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 9 Jul 2021 22:51:42 +0200
Subject: [PATCH 1845/2859] Read navmesh tile data from database

When tile is not found in memory cache try to find it in the database.
---
 apps/navmeshtool/worldspacedata.cpp           |   1 +
 .../mwmechanics/mechanicsmanagerimp.cpp       |   2 +-
 apps/openmw/mwworld/scene.cpp                 |  24 +++--
 apps/openmw/mwworld/worldimp.cpp              |   7 +-
 .../detournavigator/navigator.cpp             |   7 +-
 .../detournavigator/navmeshtilescache.cpp     |   8 --
 .../tilecachedrecastmeshmanager.cpp           | 100 +++++++++++-------
 components/CMakeLists.txt                     |   1 +
 .../detournavigator/asyncnavmeshupdater.cpp   |  21 ++--
 .../detournavigator/asyncnavmeshupdater.hpp   |  11 +-
 .../detournavigator/generatenavmeshtile.cpp   |   2 +-
 components/detournavigator/makenavmesh.cpp    |  30 +++++-
 components/detournavigator/makenavmesh.hpp    |   8 +-
 components/detournavigator/navigator.cpp      |   9 +-
 components/detournavigator/navigator.hpp      |  10 +-
 components/detournavigator/navigatorimpl.cpp  |   9 +-
 components/detournavigator/navigatorimpl.hpp  |   5 +-
 components/detournavigator/navigatorstub.hpp  |   2 +
 components/detournavigator/navmeshmanager.cpp |  23 ++--
 components/detournavigator/navmeshmanager.hpp |   5 +-
 .../detournavigator/preparednavmeshdata.cpp   |   9 +-
 components/detournavigator/recast.cpp         |  49 +++++++++
 components/detournavigator/recast.hpp         |  16 +++
 .../detournavigator/recastmeshprovider.hpp    |   4 +-
 components/detournavigator/serialization.cpp  |  74 +++++++++++--
 components/detournavigator/serialization.hpp  |   2 +
 components/detournavigator/settings.cpp       |   1 +
 components/detournavigator/settings.hpp       |   1 +
 .../tilecachedrecastmeshmanager.cpp           |  96 ++++++++++-------
 .../tilecachedrecastmeshmanager.hpp           |  30 +++---
 .../reference/modding/settings/navigator.rst  |  11 ++
 files/settings-default.cfg                    |   3 +
 32 files changed, 424 insertions(+), 157 deletions(-)
 create mode 100644 components/detournavigator/recast.cpp

diff --git a/apps/navmeshtool/worldspacedata.cpp b/apps/navmeshtool/worldspacedata.cpp
index 7c5aa06c83..189d24f34a 100644
--- a/apps/navmeshtool/worldspacedata.cpp
+++ b/apps/navmeshtool/worldspacedata.cpp
@@ -264,6 +264,7 @@ namespace NavMeshTool
                 {
                     it = navMeshInputs.emplace(cell.mCellId.mWorldspace,
                         std::make_unique<WorldspaceNavMeshInput>(cell.mCellId.mWorldspace, settings.mRecast)).first;
+                    it->second->mTileCachedRecastMeshManager.setWorldspace(cell.mCellId.mWorldspace);
                 }
                 return *it->second;
             } ();
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index e450e76483..9974cb44cd 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -788,7 +788,7 @@ namespace MWMechanics
         MWBase::World* world = MWBase::Environment::get().getWorld();
         world->getNavigator()->setUpdatesEnabled(mAI);
         if (mAI)
-           world->getNavigator()->update(world->getPlayerPtr().getRefData().getPosition().asVec3());
+            world->getNavigator()->update(world->getPlayerPtr().getRefData().getPosition().asVec3());
 
         return mAI;
     }
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index c3db62b5a9..054e26e855 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -350,8 +350,7 @@ namespace MWWorld
         if (const auto pathgrid = world->getStore().get<ESM::Pathgrid>().search(*cell->getCell()))
             mNavigator.removePathgrid(*pathgrid);
 
-        const auto player = world->getPlayerPtr();
-        mNavigator.update(player.getRefData().getPosition().asVec3());
+        mNavigator.update(world->getPlayerPtr().getRefData().getPosition().asVec3());
 
         MWBase::Environment::get().getMechanicsManager()->drop (cell);
 
@@ -378,6 +377,8 @@ namespace MWWorld
         const int cellX = cell->getCell()->getGridX();
         const int cellY = cell->getCell()->getGridY();
 
+        mNavigator.setWorldspace(cell->getCell()->mCellId.mWorldspace);
+
         if (cell->getCell()->isExterior())
         {
             osg::ref_ptr<const ESMTerrain::LandObject> land = mRendering.getLandManager()->getLand(cellX, cellY);
@@ -507,10 +508,13 @@ namespace MWWorld
 
     void Scene::playerMoved(const osg::Vec3f &pos)
     {
+        if (mCurrentCell == nullptr)
+            return;
+
         const auto player = MWBase::Environment::get().getWorld()->getPlayerPtr();
         mNavigator.updatePlayerPosition(player.getRefData().getPosition().asVec3());
 
-        if (!mCurrentCell || !mCurrentCell->isExterior())
+        if (!mCurrentCell->isExterior())
             return;
 
         osg::Vec2i newCell = getNewGridCenter(pos, &mCurrentGridCenter);
@@ -886,8 +890,11 @@ namespace MWWorld
             addObject(ptr, *mPhysics, mRendering, mPagedRefs);
             addObject(ptr, *mPhysics, mNavigator);
             MWBase::Environment::get().getWorld()->scaleObject(ptr, ptr.getCellRef().getScale());
-            const auto player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-            mNavigator.update(player.getRefData().getPosition().asVec3());
+            if (mCurrentCell != nullptr)
+            {
+                const auto player = MWBase::Environment::get().getWorld()->getPlayerPtr();
+                mNavigator.update(player.getRefData().getPosition().asVec3());
+            }
         }
         catch (std::exception& e)
         {
@@ -903,8 +910,11 @@ namespace MWWorld
         if (const auto object = mPhysics->getObject(ptr))
         {
             mNavigator.removeObject(DetourNavigator::ObjectId(object));
-            const auto player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-            mNavigator.update(player.getRefData().getPosition().asVec3());
+            if (mCurrentCell != nullptr)
+            {
+                const auto player = MWBase::Environment::get().getWorld()->getPlayerPtr();
+                mNavigator.update(player.getRefData().getPosition().asVec3());
+            }
         }
         else if (mPhysics->getActor(ptr))
         {
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 5a937d1a78..a44646ef37 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -187,7 +187,7 @@ namespace MWWorld
         {
             auto navigatorSettings = DetourNavigator::makeSettingsFromSettingsManager();
             navigatorSettings.mRecast.mSwimHeightScale = mSwimHeightScale;
-            mNavigator = DetourNavigator::makeNavigator(navigatorSettings);
+            mNavigator = DetourNavigator::makeNavigator(navigatorSettings, userDataPath);
         }
         else
         {
@@ -1524,9 +1524,10 @@ namespace MWWorld
             if (const auto object = mPhysics->getObject(door.first))
                 updateNavigatorObject(*object);
 
-        if (mShouldUpdateNavigator)
+        auto player = getPlayerPtr();
+        if (mShouldUpdateNavigator && player.getCell() != nullptr)
         {
-            mNavigator->update(getPlayerPtr().getRefData().getPosition().asVec3());
+            mNavigator->update(player.getRefData().getPosition().asVec3());
             mShouldUpdateNavigator = false;
         }
     }
diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index b630c261ef..0254d1b813 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -3,6 +3,7 @@
 #include <components/detournavigator/navigatorimpl.hpp>
 #include <components/detournavigator/exceptions.hpp>
 #include <components/detournavigator/navigatorutils.hpp>
+#include <components/detournavigator/navmeshdb.hpp>
 #include <components/misc/rng.hpp>
 #include <components/loadinglistener/loadinglistener.hpp>
 #include <components/esm/loadland.hpp>
@@ -37,6 +38,7 @@ namespace
         Settings mSettings;
         std::unique_ptr<Navigator> mNavigator;
         const osg::Vec3f mPlayerPosition;
+        const std::string mWorldspace;
         const osg::Vec3f mAgentHalfExtents;
         osg::Vec3f mStart;
         osg::Vec3f mEnd;
@@ -53,6 +55,7 @@ namespace
 
         DetourNavigatorNavigatorTest()
             : mPlayerPosition(256, 256, 0)
+            , mWorldspace("sys::default")
             , mAgentHalfExtents(29, 29, 66)
             , mStart(52, 460, 1)
             , mEnd(460, 52, 1)
@@ -87,7 +90,7 @@ namespace
             mSettings.mDetour.mMaxPolys = 4096;
             mSettings.mMaxTilesNumber = 512;
             mSettings.mMinUpdateInterval = std::chrono::milliseconds(50);
-            mNavigator.reset(new NavigatorImpl(mSettings));
+            mNavigator.reset(new NavigatorImpl(mSettings, std::make_unique<NavMeshDb>(":memory:")));
         }
     };
 
@@ -854,7 +857,7 @@ namespace
     TEST_F(DetourNavigatorNavigatorTest, multiple_threads_should_lock_tiles)
     {
         mSettings.mAsyncNavMeshUpdaterThreads = 2;
-        mNavigator.reset(new NavigatorImpl(mSettings));
+        mNavigator.reset(new NavigatorImpl(mSettings, std::make_unique<NavMeshDb>(":memory:")));
 
         const std::array<float, 5 * 5> heightfieldData {{
             0,   0,    0,    0,    0,
diff --git a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
index b47ae98233..ec5576a634 100644
--- a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
+++ b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
@@ -24,14 +24,6 @@ namespace
     using namespace DetourNavigator;
     using namespace DetourNavigator::Tests;
 
-    void* permRecastAlloc(int size)
-    {
-        void* result = rcAlloc(static_cast<std::size_t>(size), RC_ALLOC_PERM);
-        if (result == nullptr)
-            throw std::bad_alloc();
-        return result;
-    }
-
     template <class T, class Random>
     void generateRecastArray(T*& values, int size, Random& random)
     {
diff --git a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
index 9426a3968f..c44ebc5155 100644
--- a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -38,7 +38,7 @@ namespace
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, get_mesh_for_empty_should_return_nullptr)
     {
         TileCachedRecastMeshManager manager(mSettings);
-        EXPECT_EQ(manager.getMesh(TilePosition(0, 0)), nullptr);
+        EXPECT_EQ(manager.getMesh("worldspace", TilePosition(0, 0)), nullptr);
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, get_revision_for_empty_should_return_zero)
@@ -75,12 +75,13 @@ namespace
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, add_object_should_add_tiles)
     {
         TileCachedRecastMeshManager manager(mSettings);
+        manager.setWorldspace("worldspace");
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground));
         for (int x = -1; x < 1; ++x)
             for (int y = -1; y < 1; ++y)
-                ASSERT_NE(manager.getMesh(TilePosition(x, y)), nullptr);
+                ASSERT_NE(manager.getMesh("worldspace", TilePosition(x, y)), nullptr);
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, update_object_for_changed_object_should_return_changed_tiles)
@@ -113,90 +114,98 @@ namespace
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, get_mesh_after_add_object_should_return_recast_mesh_for_each_used_tile)
     {
         TileCachedRecastMeshManager manager(mSettings);
+        manager.setWorldspace("worldspace");
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
-        EXPECT_NE(manager.getMesh(TilePosition(-1, -1)), nullptr);
-        EXPECT_NE(manager.getMesh(TilePosition(-1, 0)), nullptr);
-        EXPECT_NE(manager.getMesh(TilePosition(0, -1)), nullptr);
-        EXPECT_NE(manager.getMesh(TilePosition(0, 0)), nullptr);
+        EXPECT_NE(manager.getMesh("worldspace", TilePosition(-1, -1)), nullptr);
+        EXPECT_NE(manager.getMesh("worldspace", TilePosition(-1, 0)), nullptr);
+        EXPECT_NE(manager.getMesh("worldspace", TilePosition(0, -1)), nullptr);
+        EXPECT_NE(manager.getMesh("worldspace", TilePosition(0, 0)), nullptr);
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, get_mesh_after_add_object_should_return_nullptr_for_unused_tile)
     {
         TileCachedRecastMeshManager manager(mSettings);
+        manager.setWorldspace("worldspace");
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
-        EXPECT_EQ(manager.getMesh(TilePosition(1, 0)), nullptr);
+        EXPECT_EQ(manager.getMesh("worldspace", TilePosition(1, 0)), nullptr);
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, get_mesh_for_moved_object_should_return_recast_mesh_for_each_used_tile)
     {
         TileCachedRecastMeshManager manager(mSettings);
+        manager.setWorldspace("worldspace");
+
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const btTransform transform(btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
 
         manager.addObject(ObjectId(&boxShape), shape, transform, AreaType::AreaType_ground);
-        EXPECT_NE(manager.getMesh(TilePosition(0, -1)), nullptr);
-        EXPECT_NE(manager.getMesh(TilePosition(0, 0)), nullptr);
-        EXPECT_NE(manager.getMesh(TilePosition(1, 0)), nullptr);
-        EXPECT_NE(manager.getMesh(TilePosition(1, -1)), nullptr);
+        EXPECT_NE(manager.getMesh("worldspace", TilePosition(0, -1)), nullptr);
+        EXPECT_NE(manager.getMesh("worldspace", TilePosition(0, 0)), nullptr);
+        EXPECT_NE(manager.getMesh("worldspace", TilePosition(1, 0)), nullptr);
+        EXPECT_NE(manager.getMesh("worldspace", TilePosition(1, -1)), nullptr);
 
         manager.updateObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {});
-        EXPECT_NE(manager.getMesh(TilePosition(-1, -1)), nullptr);
-        EXPECT_NE(manager.getMesh(TilePosition(-1, 0)), nullptr);
-        EXPECT_NE(manager.getMesh(TilePosition(0, -1)), nullptr);
-        EXPECT_NE(manager.getMesh(TilePosition(0, 0)), nullptr);
+        EXPECT_NE(manager.getMesh("worldspace", TilePosition(-1, -1)), nullptr);
+        EXPECT_NE(manager.getMesh("worldspace", TilePosition(-1, 0)), nullptr);
+        EXPECT_NE(manager.getMesh("worldspace", TilePosition(0, -1)), nullptr);
+        EXPECT_NE(manager.getMesh("worldspace", TilePosition(0, 0)), nullptr);
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, get_mesh_for_moved_object_should_return_nullptr_for_unused_tile)
     {
         TileCachedRecastMeshManager manager(mSettings);
+        manager.setWorldspace("worldspace");
+
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const btTransform transform(btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
 
         manager.addObject(ObjectId(&boxShape), shape, transform, AreaType::AreaType_ground);
-        EXPECT_EQ(manager.getMesh(TilePosition(-1, -1)), nullptr);
-        EXPECT_EQ(manager.getMesh(TilePosition(-1, 0)), nullptr);
+        EXPECT_EQ(manager.getMesh("worldspace", TilePosition(-1, -1)), nullptr);
+        EXPECT_EQ(manager.getMesh("worldspace", TilePosition(-1, 0)), nullptr);
 
         manager.updateObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {});
-        EXPECT_EQ(manager.getMesh(TilePosition(1, 0)), nullptr);
-        EXPECT_EQ(manager.getMesh(TilePosition(1, -1)), nullptr);
+        EXPECT_EQ(manager.getMesh("worldspace", TilePosition(1, 0)), nullptr);
+        EXPECT_EQ(manager.getMesh("worldspace", TilePosition(1, -1)), nullptr);
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, get_mesh_for_removed_object_should_return_nullptr_for_all_previously_used_tiles)
     {
         TileCachedRecastMeshManager manager(mSettings);
+        manager.setWorldspace("worldspace");
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
         manager.removeObject(ObjectId(&boxShape));
-        EXPECT_EQ(manager.getMesh(TilePosition(-1, -1)), nullptr);
-        EXPECT_EQ(manager.getMesh(TilePosition(-1, 0)), nullptr);
-        EXPECT_EQ(manager.getMesh(TilePosition(0, -1)), nullptr);
-        EXPECT_EQ(manager.getMesh(TilePosition(0, 0)), nullptr);
+        EXPECT_EQ(manager.getMesh("worldspace", TilePosition(-1, -1)), nullptr);
+        EXPECT_EQ(manager.getMesh("worldspace", TilePosition(-1, 0)), nullptr);
+        EXPECT_EQ(manager.getMesh("worldspace", TilePosition(0, -1)), nullptr);
+        EXPECT_EQ(manager.getMesh("worldspace", TilePosition(0, 0)), nullptr);
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, get_mesh_for_not_changed_object_after_update_should_return_recast_mesh_for_same_tiles)
     {
         TileCachedRecastMeshManager manager(mSettings);
+        manager.setWorldspace("worldspace");
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
 
         manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
-        EXPECT_NE(manager.getMesh(TilePosition(-1, -1)), nullptr);
-        EXPECT_NE(manager.getMesh(TilePosition(-1, 0)), nullptr);
-        EXPECT_NE(manager.getMesh(TilePosition(0, -1)), nullptr);
-        EXPECT_NE(manager.getMesh(TilePosition(0, 0)), nullptr);
+        EXPECT_NE(manager.getMesh("worldspace", TilePosition(-1, -1)), nullptr);
+        EXPECT_NE(manager.getMesh("worldspace", TilePosition(-1, 0)), nullptr);
+        EXPECT_NE(manager.getMesh("worldspace", TilePosition(0, -1)), nullptr);
+        EXPECT_NE(manager.getMesh("worldspace", TilePosition(0, 0)), nullptr);
 
         manager.updateObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {});
-        EXPECT_NE(manager.getMesh(TilePosition(-1, -1)), nullptr);
-        EXPECT_NE(manager.getMesh(TilePosition(-1, 0)), nullptr);
-        EXPECT_NE(manager.getMesh(TilePosition(0, -1)), nullptr);
-        EXPECT_NE(manager.getMesh(TilePosition(0, 0)), nullptr);
+        EXPECT_NE(manager.getMesh("worldspace", TilePosition(-1, -1)), nullptr);
+        EXPECT_NE(manager.getMesh("worldspace", TilePosition(-1, 0)), nullptr);
+        EXPECT_NE(manager.getMesh("worldspace", TilePosition(0, -1)), nullptr);
+        EXPECT_NE(manager.getMesh("worldspace", TilePosition(0, 0)), nullptr);
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, get_revision_after_add_object_new_should_return_incremented_value)
@@ -235,6 +244,7 @@ namespace
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, get_revision_after_update_not_changed_object_should_return_same_value)
     {
         TileCachedRecastMeshManager manager(mSettings);
+        manager.setWorldspace("worldspace");
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
@@ -273,17 +283,19 @@ namespace
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, add_water_for_not_max_int_should_add_new_tiles)
     {
         TileCachedRecastMeshManager manager(mSettings);
+        manager.setWorldspace("worldspace");
         const osg::Vec2i cellPosition(0, 0);
         const int cellSize = 8192;
         ASSERT_TRUE(manager.addWater(cellPosition, cellSize, 0.0f));
         for (int x = -1; x < 12; ++x)
             for (int y = -1; y < 12; ++y)
-                ASSERT_NE(manager.getMesh(TilePosition(x, y)), nullptr);
+                ASSERT_NE(manager.getMesh("worldspace", TilePosition(x, y)), nullptr);
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, add_water_for_max_int_should_not_add_new_tiles)
     {
         TileCachedRecastMeshManager manager(mSettings);
+        manager.setWorldspace("worldspace");
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground));
@@ -292,7 +304,7 @@ namespace
         ASSERT_TRUE(manager.addWater(cellPosition, cellSize, 0.0f));
         for (int x = -6; x < 6; ++x)
             for (int y = -6; y < 6; ++y)
-                ASSERT_EQ(manager.getMesh(TilePosition(x, y)) != nullptr, -1 <= x && x <= 0 && -1 <= y && y <= 0);
+                ASSERT_EQ(manager.getMesh("worldspace", TilePosition(x, y)) != nullptr, -1 <= x && x <= 0 && -1 <= y && y <= 0);
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, remove_water_for_absent_cell_should_return_nullopt)
@@ -315,18 +327,20 @@ namespace
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, remove_water_for_existing_cell_should_remove_empty_tiles)
     {
         TileCachedRecastMeshManager manager(mSettings);
+        manager.setWorldspace("worldspace");
         const osg::Vec2i cellPosition(0, 0);
         const int cellSize = 8192;
         ASSERT_TRUE(manager.addWater(cellPosition, cellSize, 0.0f));
         ASSERT_TRUE(manager.removeWater(cellPosition));
         for (int x = -6; x < 6; ++x)
             for (int y = -6; y < 6; ++y)
-                ASSERT_EQ(manager.getMesh(TilePosition(x, y)), nullptr);
+                ASSERT_EQ(manager.getMesh("worldspace", TilePosition(x, y)), nullptr);
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, remove_water_for_existing_cell_should_leave_not_empty_tiles)
     {
         TileCachedRecastMeshManager manager(mSettings);
+        manager.setWorldspace("worldspace");
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground));
@@ -336,12 +350,13 @@ namespace
         ASSERT_TRUE(manager.removeWater(cellPosition));
         for (int x = -6; x < 6; ++x)
             for (int y = -6; y < 6; ++y)
-                ASSERT_EQ(manager.getMesh(TilePosition(x, y)) != nullptr, -1 <= x && x <= 0 && -1 <= y && y <= 0);
+                ASSERT_EQ(manager.getMesh("worldspace", TilePosition(x, y)) != nullptr, -1 <= x && x <= 0 && -1 <= y && y <= 0);
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, remove_object_should_not_remove_tile_with_water)
     {
         TileCachedRecastMeshManager manager(mSettings);
+        manager.setWorldspace("worldspace");
         const osg::Vec2i cellPosition(0, 0);
         const int cellSize = 8192;
         const btBoxShape boxShape(btVector3(20, 20, 100));
@@ -351,6 +366,19 @@ namespace
         ASSERT_TRUE(manager.removeObject(ObjectId(&boxShape)));
         for (int x = -1; x < 12; ++x)
             for (int y = -1; y < 12; ++y)
-                ASSERT_NE(manager.getMesh(TilePosition(x, y)), nullptr);
+                ASSERT_NE(manager.getMesh("worldspace", TilePosition(x, y)), nullptr);
+    }
+
+    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, set_new_worldspace_should_remove_tiles)
+    {
+        TileCachedRecastMeshManager manager(mSettings);
+        manager.setWorldspace("worldspace");
+        const btBoxShape boxShape(btVector3(20, 20, 100));
+        const CollisionShape shape(nullptr, boxShape, mObjectTransform);
+        ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground));
+        manager.setWorldspace("other");
+        for (int x = -1; x < 1; ++x)
+            for (int y = -1; y < 1; ++y)
+                ASSERT_EQ(manager.getMesh("other", TilePosition(x, y)), nullptr);
     }
 }
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index be3efd1b9f..f969ac1265 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -207,6 +207,7 @@ add_component_dir(detournavigator
     navmeshdb
     serialization
     navmeshdbutils
+    recast
     )
 
 add_component_dir(loadinglistener
diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index c2c79a840e..a808030478 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -76,10 +76,11 @@ namespace
 namespace DetourNavigator
 {
     Job::Job(const osg::Vec3f& agentHalfExtents, std::weak_ptr<GuardedNavMeshCacheItem> navMeshCacheItem,
-        const TilePosition& changedTile, ChangeType changeType, int distanceToPlayer,
+        std::string_view worldspace, const TilePosition& changedTile, ChangeType changeType, int distanceToPlayer,
         std::chrono::steady_clock::time_point processTime)
         : mAgentHalfExtents(agentHalfExtents)
         , mNavMeshCacheItem(std::move(navMeshCacheItem))
+        , mWorldspace(worldspace)
         , mChangedTile(changedTile)
         , mProcessTime(processTime)
         , mChangeType(changeType)
@@ -89,10 +90,11 @@ namespace DetourNavigator
     }
 
     AsyncNavMeshUpdater::AsyncNavMeshUpdater(const Settings& settings, TileCachedRecastMeshManager& recastMeshManager,
-            OffMeshConnectionsManager& offMeshConnectionsManager)
+            OffMeshConnectionsManager& offMeshConnectionsManager, std::unique_ptr<NavMeshDb>&& db)
         : mSettings(settings)
         , mRecastMeshManager(recastMeshManager)
         , mOffMeshConnectionsManager(offMeshConnectionsManager)
+        , mDb(std::move(db))
         , mShouldStop()
         , mNavMeshTilesCache(settings.mMaxNavMeshTilesCacheSize)
     {
@@ -111,8 +113,8 @@ namespace DetourNavigator
             thread.join();
     }
 
-    void AsyncNavMeshUpdater::post(const osg::Vec3f& agentHalfExtents,
-        const SharedNavMeshCacheItem& navMeshCacheItem, const TilePosition& playerTile,
+    void AsyncNavMeshUpdater::post(const osg::Vec3f& agentHalfExtents, const SharedNavMeshCacheItem& navMeshCacheItem,
+        const TilePosition& playerTile, std::string_view worldspace,
         const std::map<TilePosition, ChangeType>& changedTiles)
     {
         bool playerTileChanged = false;
@@ -147,8 +149,8 @@ namespace DetourNavigator
                     ? mLastUpdates[std::tie(agentHalfExtents, changedTile)] + mSettings.get().mMinUpdateInterval
                     : std::chrono::steady_clock::time_point();
 
-                const JobIt it = mJobs.emplace(mJobs.end(), agentHalfExtents, navMeshCacheItem, changedTile,
-                    changeType, getManhattanDistance(changedTile, playerTile), processTime);
+                const JobIt it = mJobs.emplace(mJobs.end(), agentHalfExtents, navMeshCacheItem, worldspace,
+                    changedTile, changeType, getManhattanDistance(changedTile, playerTile), processTime);
 
                 if (playerTileChanged)
                     mWaiting.push_back(it);
@@ -302,12 +304,13 @@ namespace DetourNavigator
         if (!navMeshCacheItem)
             return true;
 
-        const auto recastMesh = mRecastMeshManager.get().getMesh(job.mChangedTile);
+        const auto recastMesh = mRecastMeshManager.get().getMesh(job.mWorldspace, job.mChangedTile);
         const auto playerTile = *mPlayerTile.lockConst();
         const auto offMeshConnections = mOffMeshConnectionsManager.get().get(job.mChangedTile);
 
-        const auto status = updateNavMesh(job.mAgentHalfExtents, recastMesh.get(), job.mChangedTile, playerTile,
-            offMeshConnections, mSettings, navMeshCacheItem, mNavMeshTilesCache, getUpdateType(job.mChangeType));
+        const auto status = updateNavMesh(job.mAgentHalfExtents, recastMesh.get(), job.mWorldspace, job.mChangedTile,
+            playerTile, offMeshConnections, mSettings, navMeshCacheItem, mNavMeshTilesCache,
+            getUpdateType(job.mChangeType), mDb, mNextShapeId);
 
         if (recastMesh != nullptr)
         {
diff --git a/components/detournavigator/asyncnavmeshupdater.hpp b/components/detournavigator/asyncnavmeshupdater.hpp
index 2d915ad434..44d5be58d5 100644
--- a/components/detournavigator/asyncnavmeshupdater.hpp
+++ b/components/detournavigator/asyncnavmeshupdater.hpp
@@ -7,6 +7,7 @@
 #include "tileposition.hpp"
 #include "navmeshtilescache.hpp"
 #include "waitconditiontype.hpp"
+#include "navmeshdb.hpp"
 
 #include <osg/Vec3f>
 
@@ -57,6 +58,7 @@ namespace DetourNavigator
     {
         const osg::Vec3f mAgentHalfExtents;
         const std::weak_ptr<GuardedNavMeshCacheItem> mNavMeshCacheItem;
+        const std::string mWorldspace;
         const TilePosition mChangedTile;
         const std::chrono::steady_clock::time_point mProcessTime;
         unsigned mTryNumber = 0;
@@ -65,7 +67,7 @@ namespace DetourNavigator
         const int mDistanceToOrigin;
 
         Job(const osg::Vec3f& agentHalfExtents, std::weak_ptr<GuardedNavMeshCacheItem> navMeshCacheItem,
-            const TilePosition& changedTile, ChangeType changeType, int distanceToPlayer,
+            std::string_view worldspace, const TilePosition& changedTile, ChangeType changeType, int distanceToPlayer,
             std::chrono::steady_clock::time_point processTime);
     };
 
@@ -75,11 +77,12 @@ namespace DetourNavigator
     {
     public:
         AsyncNavMeshUpdater(const Settings& settings, TileCachedRecastMeshManager& recastMeshManager,
-            OffMeshConnectionsManager& offMeshConnectionsManager);
+            OffMeshConnectionsManager& offMeshConnectionsManager, std::unique_ptr<NavMeshDb>&& db);
         ~AsyncNavMeshUpdater();
 
         void post(const osg::Vec3f& agentHalfExtents, const SharedNavMeshCacheItem& mNavMeshCacheItem,
-            const TilePosition& playerTile, const std::map<TilePosition, ChangeType>& changedTiles);
+            const TilePosition& playerTile, std::string_view worldspace,
+            const std::map<TilePosition, ChangeType>& changedTiles);
 
         void wait(Loading::Listener& listener, WaitConditionType waitConditionType);
 
@@ -89,6 +92,8 @@ namespace DetourNavigator
         std::reference_wrapper<const Settings> mSettings;
         std::reference_wrapper<TileCachedRecastMeshManager> mRecastMeshManager;
         std::reference_wrapper<OffMeshConnectionsManager> mOffMeshConnectionsManager;
+        Misc::ScopeGuarded<std::unique_ptr<NavMeshDb>> mDb;
+        ShapeId mNextShapeId {1};
         std::atomic_bool mShouldStop;
         mutable std::mutex mMutex;
         std::condition_variable mHasJob;
diff --git a/components/detournavigator/generatenavmeshtile.cpp b/components/detournavigator/generatenavmeshtile.cpp
index 9dc8e70383..ad8978cd4b 100644
--- a/components/detournavigator/generatenavmeshtile.cpp
+++ b/components/detournavigator/generatenavmeshtile.cpp
@@ -61,7 +61,7 @@ namespace DetourNavigator
         {
             Ignore ignore {consumer};
 
-            const std::shared_ptr<RecastMesh> recastMesh = mRecastMeshProvider.getMesh(mTilePosition);
+            const std::shared_ptr<RecastMesh> recastMesh = mRecastMeshProvider.getMesh(mWorldspace, mTilePosition);
 
             if (recastMesh == nullptr || isEmpty(*recastMesh))
                 return;
diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index 4bfffb22ab..8b764b91b4 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -10,9 +10,15 @@
 #include "preparednavmeshdata.hpp"
 #include "navmeshdata.hpp"
 #include "recastmeshbuilder.hpp"
+#include "navmeshdb.hpp"
+#include "serialization.hpp"
+#include "dbrefgeometryobject.hpp"
+#include "navmeshdbutils.hpp"
 
 #include <components/misc/convert.hpp>
 #include <components/bullethelpers/processtrianglecallback.hpp>
+#include <components/misc/convert.hpp>
+#include <components/misc/guarded.hpp>
 
 #include <DetourNavMesh.h>
 #include <DetourNavMeshBuilder.h>
@@ -540,9 +546,10 @@ namespace DetourNavigator
     }
 
     UpdateNavMeshStatus updateNavMesh(const osg::Vec3f& agentHalfExtents, const RecastMesh* recastMesh,
-        const TilePosition& changedTile, const TilePosition& playerTile,
+        const std::string& worldspace, const TilePosition& changedTile, const TilePosition& playerTile,
         const std::vector<OffMeshConnection>& offMeshConnections, const Settings& settings,
-        const SharedNavMeshCacheItem& navMeshCacheItem, NavMeshTilesCache& navMeshTilesCache, UpdateType updateType)
+        const SharedNavMeshCacheItem& navMeshCacheItem, NavMeshTilesCache& navMeshTilesCache, UpdateType updateType,
+        Misc::ScopeGuarded<std::unique_ptr<NavMeshDb>>& db, ShapeId& nextShapeId)
     {
         Log(Debug::Debug) << std::fixed << std::setprecision(2) <<
             "Update NavMesh with multiple tiles:" <<
@@ -578,7 +585,24 @@ namespace DetourNavigator
 
         if (!cachedNavMeshData)
         {
-            auto prepared = prepareNavMeshTileData(*recastMesh, changedTile, agentHalfExtents, settings.mRecast);
+            std::optional<TileData> stored;
+            if (const auto dbLocked = db.lock(); *dbLocked != nullptr)
+            {
+                const std::vector<DbRefGeometryObject> objects = makeDbRefGeometryObjects(recastMesh->getMeshSources(),
+                    [&] (const MeshSource& v) { return resolveMeshSource(**dbLocked, v, nextShapeId); });
+                stored = (*dbLocked)->getTileData(worldspace, changedTile, serialize(settings.mRecast, *recastMesh, objects));
+            }
+
+            std::unique_ptr<PreparedNavMeshData> prepared;
+            if (stored.has_value() && stored->mVersion == settings.mNavMeshVersion)
+            {
+                prepared = std::make_unique<PreparedNavMeshData>();
+                if (!deserialize(stored->mData, *prepared))
+                    prepared = nullptr;
+            }
+
+            if (prepared == nullptr)
+                prepared = prepareNavMeshTileData(*recastMesh, changedTile, agentHalfExtents, settings.mRecast);
 
             if (prepared == nullptr)
             {
diff --git a/components/detournavigator/makenavmesh.hpp b/components/detournavigator/makenavmesh.hpp
index fccf70baad..40ead79ad6 100644
--- a/components/detournavigator/makenavmesh.hpp
+++ b/components/detournavigator/makenavmesh.hpp
@@ -7,6 +7,9 @@
 #include "sharednavmesh.hpp"
 #include "navmeshtilescache.hpp"
 #include "offmeshconnection.hpp"
+#include "navmeshdb.hpp"
+
+#include <components/misc/guarded.hpp>
 
 #include <osg/Vec3f>
 
@@ -63,9 +66,10 @@ namespace DetourNavigator
     };
 
     UpdateNavMeshStatus updateNavMesh(const osg::Vec3f& agentHalfExtents, const RecastMesh* recastMesh,
-        const TilePosition& changedTile, const TilePosition& playerTile,
+        const std::string& worldspace, const TilePosition& changedTile, const TilePosition& playerTile,
         const std::vector<OffMeshConnection>& offMeshConnections, const Settings& settings,
-        const SharedNavMeshCacheItem& navMeshCacheItem, NavMeshTilesCache& navMeshTilesCache, UpdateType updateType);
+        const SharedNavMeshCacheItem& navMeshCacheItem, NavMeshTilesCache& navMeshTilesCache, UpdateType updateType,
+        Misc::ScopeGuarded<std::unique_ptr<NavMeshDb>>& db, ShapeId& nextShapeId);
 }
 
 #endif
diff --git a/components/detournavigator/navigator.cpp b/components/detournavigator/navigator.cpp
index 1877c3dd93..cf3c4ba5b3 100644
--- a/components/detournavigator/navigator.cpp
+++ b/components/detournavigator/navigator.cpp
@@ -5,10 +5,15 @@
 
 namespace DetourNavigator
 {
-    std::unique_ptr<Navigator> makeNavigator(const Settings& settings)
+    std::unique_ptr<Navigator> makeNavigator(const Settings& settings, const std::string& userDataPath)
     {
         DetourNavigator::RecastGlobalAllocator::init();
-        return std::make_unique<NavigatorImpl>(settings);
+
+        std::unique_ptr<NavMeshDb> db;
+        if (settings.mEnableNavMeshDiskCache)
+            db = std::make_unique<NavMeshDb>(userDataPath + "/navmesh.db");
+
+        return std::make_unique<NavigatorImpl>(settings, std::move(db));
     }
 
     std::unique_ptr<Navigator> makeNavigatorStub()
diff --git a/components/detournavigator/navigator.hpp b/components/detournavigator/navigator.hpp
index 9ffe062fe5..14731fcc5b 100644
--- a/components/detournavigator/navigator.hpp
+++ b/components/detournavigator/navigator.hpp
@@ -10,6 +10,8 @@
 
 #include <components/resource/bulletshape.hpp>
 
+#include <string_view>
+
 namespace ESM
 {
     struct Cell;
@@ -75,6 +77,12 @@ namespace DetourNavigator
          */
         virtual void removeAgent(const osg::Vec3f& agentHalfExtents) = 0;
 
+        /**
+         * @brief setWorldspace should be called before adding object from new worldspace
+         * @param worldspace
+         */
+        virtual void setWorldspace(std::string_view worldspace) = 0;
+
         /**
          * @brief addObject is used to add complex object with allowed to walk and avoided to walk shapes
          * @param id is used to distinguish different objects
@@ -188,7 +196,7 @@ namespace DetourNavigator
         virtual float getMaxNavmeshAreaRealRadius() const = 0;
     };
 
-    std::unique_ptr<Navigator> makeNavigator(const Settings& settings);
+    std::unique_ptr<Navigator> makeNavigator(const Settings& settings, const std::string& userDataPath);
 
     std::unique_ptr<Navigator> makeNavigatorStub();
 }
diff --git a/components/detournavigator/navigatorimpl.cpp b/components/detournavigator/navigatorimpl.cpp
index 541e1f791c..85d86e6b2b 100644
--- a/components/detournavigator/navigatorimpl.cpp
+++ b/components/detournavigator/navigatorimpl.cpp
@@ -8,9 +8,9 @@
 
 namespace DetourNavigator
 {
-    NavigatorImpl::NavigatorImpl(const Settings& settings)
+    NavigatorImpl::NavigatorImpl(const Settings& settings, std::unique_ptr<NavMeshDb>&& db)
         : mSettings(settings)
-        , mNavMeshManager(mSettings)
+        , mNavMeshManager(mSettings, std::move(db))
         , mUpdatesEnabled(true)
     {
     }
@@ -32,6 +32,11 @@ namespace DetourNavigator
             --it->second;
     }
 
+    void NavigatorImpl::setWorldspace(std::string_view worldspace)
+    {
+        mNavMeshManager.setWorldspace(worldspace);
+    }
+
     bool NavigatorImpl::addObject(const ObjectId id, const ObjectShapes& shapes, const btTransform& transform)
     {
         const CollisionShape collisionShape(shapes.mShapeInstance, *shapes.mShapeInstance->mCollisionShape, shapes.mTransform);
diff --git a/components/detournavigator/navigatorimpl.hpp b/components/detournavigator/navigatorimpl.hpp
index 2c8474786f..116817395c 100644
--- a/components/detournavigator/navigatorimpl.hpp
+++ b/components/detournavigator/navigatorimpl.hpp
@@ -5,6 +5,7 @@
 #include "navmeshmanager.hpp"
 
 #include <set>
+#include <memory>
 
 namespace DetourNavigator
 {
@@ -15,12 +16,14 @@ namespace DetourNavigator
          * @brief Navigator constructor initializes all internal data. Constructed object is ready to build a scene.
          * @param settings allows to customize navigator work. Constructor is only place to set navigator settings.
          */
-        explicit NavigatorImpl(const Settings& settings);
+        explicit NavigatorImpl(const Settings& settings, std::unique_ptr<NavMeshDb>&& db);
 
         void addAgent(const osg::Vec3f& agentHalfExtents) override;
 
         void removeAgent(const osg::Vec3f& agentHalfExtents) override;
 
+        void setWorldspace(std::string_view worldspace) override;
+
         bool addObject(const ObjectId id, const ObjectShapes& shapes, const btTransform& transform) override;
 
         bool addObject(const ObjectId id, const DoorShapes& shapes, const btTransform& transform) override;
diff --git a/components/detournavigator/navigatorstub.hpp b/components/detournavigator/navigatorstub.hpp
index 1a6096feef..6a320c1a08 100644
--- a/components/detournavigator/navigatorstub.hpp
+++ b/components/detournavigator/navigatorstub.hpp
@@ -19,6 +19,8 @@ namespace DetourNavigator
 
         void removeAgent(const osg::Vec3f& /*agentHalfExtents*/) override {}
 
+        void setWorldspace(std::string_view /*worldspace*/) override {}
+
         bool addObject(const ObjectId /*id*/, const ObjectShapes& /*shapes*/, const btTransform& /*transform*/) override
         {
             return false;
diff --git a/components/detournavigator/navmeshmanager.cpp b/components/detournavigator/navmeshmanager.cpp
index 452fba93ad..9c8cb5389c 100644
--- a/components/detournavigator/navmeshmanager.cpp
+++ b/components/detournavigator/navmeshmanager.cpp
@@ -41,13 +41,23 @@ namespace
 
 namespace DetourNavigator
 {
-    NavMeshManager::NavMeshManager(const Settings& settings)
+    NavMeshManager::NavMeshManager(const Settings& settings, std::unique_ptr<NavMeshDb>&& db)
         : mSettings(settings)
-        , mRecastMeshManager(mSettings.mRecast)
-        , mOffMeshConnectionsManager(mSettings.mRecast)
-        , mAsyncNavMeshUpdater(settings, mRecastMeshManager, mOffMeshConnectionsManager)
+        , mRecastMeshManager(settings.mRecast)
+        , mOffMeshConnectionsManager(settings.mRecast)
+        , mAsyncNavMeshUpdater(settings, mRecastMeshManager, mOffMeshConnectionsManager, std::move(db))
     {}
 
+    void NavMeshManager::setWorldspace(std::string_view worldspace)
+    {
+        if (worldspace == mWorldspace)
+            return;
+        mRecastMeshManager.setWorldspace(worldspace);
+        for (auto& [agent, cache] : mCache)
+            cache = std::make_shared<GuardedNavMeshCacheItem>(makeEmptyNavMesh(mSettings), ++mGenerationCounter);
+        mWorldspace = worldspace;
+    }
+
     bool NavMeshManager::addObject(const ObjectId id, const CollisionShape& shape, const btTransform& transform,
                                    const AreaType areaType)
     {
@@ -208,7 +218,7 @@ namespace DetourNavigator
                     recastMeshManager.reportNavMeshChange(recastMeshManager.getVersion(), Version {0, 0});
             });
         }
-        mAsyncNavMeshUpdater.post(agentHalfExtents, cached, playerTile, tilesToPost);
+        mAsyncNavMeshUpdater.post(agentHalfExtents, cached, playerTile, mRecastMeshManager.getWorldspace(), tilesToPost);
         if (changedTiles != mChangedTiles.end())
             changedTiles->second.clear();
         Log(Debug::Debug) << "Cache update posted for agent=" << agentHalfExtents <<
@@ -241,9 +251,10 @@ namespace DetourNavigator
         std::vector<TilePosition> tiles;
         mRecastMeshManager.forEachTile(
             [&tiles] (const TilePosition& tile, const CachedRecastMeshManager&) { tiles.push_back(tile); });
+        const std::string worldspace = mRecastMeshManager.getWorldspace();
         RecastMeshTiles result;
         for (const TilePosition& tile : tiles)
-            if (auto mesh = mRecastMeshManager.getCachedMesh(tile))
+            if (auto mesh = mRecastMeshManager.getCachedMesh(worldspace, tile))
                 result.emplace(tile, std::move(mesh));
         return result;
     }
diff --git a/components/detournavigator/navmeshmanager.hpp b/components/detournavigator/navmeshmanager.hpp
index b1926741c5..3fd2d28d74 100644
--- a/components/detournavigator/navmeshmanager.hpp
+++ b/components/detournavigator/navmeshmanager.hpp
@@ -22,7 +22,9 @@ namespace DetourNavigator
     class NavMeshManager
     {
     public:
-        NavMeshManager(const Settings& settings);
+        explicit NavMeshManager(const Settings& settings, std::unique_ptr<NavMeshDb>&& db);
+
+        void setWorldspace(std::string_view worldspace);
 
         bool addObject(const ObjectId id, const CollisionShape& shape, const btTransform& transform,
                        const AreaType areaType);
@@ -62,6 +64,7 @@ namespace DetourNavigator
 
     private:
         const Settings& mSettings;
+        std::string mWorldspace;
         TileCachedRecastMeshManager mRecastMeshManager;
         OffMeshConnectionsManager mOffMeshConnectionsManager;
         AsyncNavMeshUpdater mAsyncNavMeshUpdater;
diff --git a/components/detournavigator/preparednavmeshdata.cpp b/components/detournavigator/preparednavmeshdata.cpp
index c86e18482c..77c70eade3 100644
--- a/components/detournavigator/preparednavmeshdata.cpp
+++ b/components/detournavigator/preparednavmeshdata.cpp
@@ -1,8 +1,8 @@
 #include "preparednavmeshdata.hpp"
 #include "preparednavmeshdatatuple.hpp"
+#include "recast.hpp"
 
 #include <Recast.h>
-#include <RecastAlloc.h>
 
 namespace
 {
@@ -15,13 +15,6 @@ namespace
         value.nverts = 0;
         value.ntris = 0;
     }
-
-    void freePolyMeshDetail(rcPolyMeshDetail& value) noexcept
-    {
-        rcFree(value.meshes);
-        rcFree(value.verts);
-        rcFree(value.tris);
-    }
 }
 
 namespace DetourNavigator
diff --git a/components/detournavigator/recast.cpp b/components/detournavigator/recast.cpp
new file mode 100644
index 0000000000..f3c7768430
--- /dev/null
+++ b/components/detournavigator/recast.cpp
@@ -0,0 +1,49 @@
+#include "recast.hpp"
+
+#include <Recast.h>
+#include <RecastAlloc.h>
+
+#include <cstring>
+#include <new>
+
+namespace DetourNavigator
+{
+    void* permRecastAlloc(std::size_t size)
+    {
+        void* const result = rcAlloc(size, RC_ALLOC_PERM);
+        if (result == nullptr)
+            throw std::bad_alloc();
+        return result;
+    }
+
+    void permRecastAlloc(rcPolyMesh& value)
+    {
+        permRecastAlloc(value.verts, getVertsLength(value));
+        permRecastAlloc(value.polys, getPolysLength(value));
+        permRecastAlloc(value.regs, getRegsLength(value));
+        permRecastAlloc(value.flags, getFlagsLength(value));
+        permRecastAlloc(value.areas, getAreasLength(value));
+    }
+
+    void permRecastAlloc(rcPolyMeshDetail& value)
+    {
+        try
+        {
+            permRecastAlloc(value.meshes, getMeshesLength(value));
+            permRecastAlloc(value.verts, getVertsLength(value));
+            permRecastAlloc(value.tris, getTrisLength(value));
+        }
+        catch (...)
+        {
+            freePolyMeshDetail(value);
+            throw;
+        }
+    }
+
+    void freePolyMeshDetail(rcPolyMeshDetail& value) noexcept
+    {
+        rcFree(value.meshes);
+        rcFree(value.verts);
+        rcFree(value.tris);
+    }
+}
diff --git a/components/detournavigator/recast.hpp b/components/detournavigator/recast.hpp
index 4e9ab329b7..8b9042b661 100644
--- a/components/detournavigator/recast.hpp
+++ b/components/detournavigator/recast.hpp
@@ -4,6 +4,7 @@
 #include <Recast.h>
 
 #include <cstddef>
+#include <type_traits>
 
 namespace DetourNavigator
 {
@@ -46,6 +47,21 @@ namespace DetourNavigator
     {
         return 4 * static_cast<std::size_t>(value.ntris);
     }
+
+    void* permRecastAlloc(std::size_t size);
+
+    template <class T>
+    inline void permRecastAlloc(T*& values, std::size_t size)
+    {
+        static_assert(std::is_arithmetic_v<T>);
+        values = new (permRecastAlloc(size * sizeof(T))) T[size];
+    }
+
+    void permRecastAlloc(rcPolyMesh& value);
+
+    void permRecastAlloc(rcPolyMeshDetail& value);
+
+    void freePolyMeshDetail(rcPolyMeshDetail& value) noexcept;
 }
 
 #endif
diff --git a/components/detournavigator/recastmeshprovider.hpp b/components/detournavigator/recastmeshprovider.hpp
index 5c56d15a5e..b01b7c4ea1 100644
--- a/components/detournavigator/recastmeshprovider.hpp
+++ b/components/detournavigator/recastmeshprovider.hpp
@@ -20,9 +20,9 @@ namespace DetourNavigator
             : mImpl(impl)
         {}
 
-        std::shared_ptr<RecastMesh> getMesh(const TilePosition& tilePosition) const
+        std::shared_ptr<RecastMesh> getMesh(std::string_view worldspace, const TilePosition& tilePosition) const
         {
-            return mImpl.get().getNewMesh(tilePosition);
+            return mImpl.get().getNewMesh(worldspace, tilePosition);
         }
 
     private:
diff --git a/components/detournavigator/serialization.cpp b/components/detournavigator/serialization.cpp
index 8eb60ddb97..50b014acb1 100644
--- a/components/detournavigator/serialization.cpp
+++ b/components/detournavigator/serialization.cpp
@@ -2,14 +2,18 @@
 
 #include "dbrefgeometryobject.hpp"
 #include "preparednavmeshdata.hpp"
+#include "recast.hpp"
 #include "recastmesh.hpp"
 #include "settings.hpp"
 
+#include <components/serialization/binaryreader.hpp>
 #include <components/serialization/binarywriter.hpp>
 #include <components/serialization/format.hpp>
 #include <components/serialization/sizeaccumulator.hpp>
 
 #include <cstddef>
+#include <cstring>
+#include <type_traits>
 #include <vector>
 
 namespace DetourNavigator
@@ -142,8 +146,9 @@ namespace
             visitor(*this, dbRefGeometryObjects);
         }
 
-        template <class Visitor>
-        auto operator()(Visitor&& visitor, const rcPolyMesh& value) const
+        template <class Visitor, class T>
+        auto operator()(Visitor&& visitor, T& value) const
+            -> std::enable_if_t<std::is_same_v<std::decay_t<T>, rcPolyMesh>>
         {
             visitor(*this, value.nverts);
             visitor(*this, value.npolys);
@@ -155,6 +160,19 @@ namespace
             visitor(*this, value.ch);
             visitor(*this, value.borderSize);
             visitor(*this, value.maxEdgeError);
+            if constexpr (mode == Serialization::Mode::Read)
+            {
+                if (value.verts == nullptr)
+                    permRecastAlloc(value.verts, getVertsLength(value));
+                if (value.polys == nullptr)
+                    permRecastAlloc(value.polys, getPolysLength(value));
+                if (value.regs == nullptr)
+                    permRecastAlloc(value.regs, getRegsLength(value));
+                if (value.flags == nullptr)
+                    permRecastAlloc(value.flags, getFlagsLength(value));
+                if (value.areas == nullptr)
+                    permRecastAlloc(value.areas, getAreasLength(value));
+            }
             visitor(*this, value.verts, getVertsLength(value));
             visitor(*this, value.polys, getPolysLength(value));
             visitor(*this, value.regs, getRegsLength(value));
@@ -162,22 +180,48 @@ namespace
             visitor(*this, value.areas, getAreasLength(value));
         }
 
-        template <class Visitor>
-        auto operator()(Visitor&& visitor, const rcPolyMeshDetail& value) const
+        template <class Visitor, class T>
+        auto operator()(Visitor&& visitor, T& value) const
+            -> std::enable_if_t<std::is_same_v<std::decay_t<T>, rcPolyMeshDetail>>
         {
             visitor(*this, value.nmeshes);
+            if constexpr (mode == Serialization::Mode::Read)
+                if (value.meshes == nullptr)
+                    permRecastAlloc(value.meshes, getMeshesLength(value));
             visitor(*this, value.meshes, getMeshesLength(value));
             visitor(*this, value.nverts);
+            if constexpr (mode == Serialization::Mode::Read)
+                if (value.verts == nullptr)
+                    permRecastAlloc(value.verts, getVertsLength(value));
             visitor(*this, value.verts, getVertsLength(value));
             visitor(*this, value.ntris);
+            if constexpr (mode == Serialization::Mode::Read)
+                if (value.tris == nullptr)
+                    permRecastAlloc(value.tris, getTrisLength(value));
             visitor(*this, value.tris, getTrisLength(value));
         }
 
-        template <class Visitor>
-        auto operator()(Visitor&& visitor, const PreparedNavMeshData& value) const
+        template <class Visitor, class T>
+        auto operator()(Visitor&& visitor, T& value) const
+            -> std::enable_if_t<std::is_same_v<std::decay_t<T>, PreparedNavMeshData>>
         {
-            visitor(*this, DetourNavigator::preparedNavMeshDataMagic);
-            visitor(*this, DetourNavigator::preparedNavMeshDataVersion);
+            if constexpr (mode == Serialization::Mode::Write)
+            {
+                visitor(*this, DetourNavigator::preparedNavMeshDataMagic);
+                visitor(*this, DetourNavigator::preparedNavMeshDataVersion);
+            }
+            else
+            {
+                static_assert(mode == Serialization::Mode::Read);
+                char magic[std::size(DetourNavigator::preparedNavMeshDataMagic)];
+                visitor(*this, magic);
+                if (std::memcmp(magic, DetourNavigator::preparedNavMeshDataMagic, sizeof(magic)) != 0)
+                    throw std::runtime_error("Bad PreparedNavMeshData magic");
+                std::uint32_t version = 0;
+                visitor(*this, version);
+                if (version != DetourNavigator::preparedNavMeshDataVersion)
+                    throw std::runtime_error("Bad PreparedNavMeshData version");
+            }
             visitor(*this, value.mUserId);
             visitor(*this, value.mCellSize);
             visitor(*this, value.mCellHeight);
@@ -211,4 +255,18 @@ namespace DetourNavigator
         format(Serialization::BinaryWriter(result.data(), result.data() + result.size()), value);
         return result;
     }
+
+    bool deserialize(const std::vector<std::byte>& data, PreparedNavMeshData& value)
+    {
+        try
+        {
+            constexpr Format<Serialization::Mode::Read> format;
+            format(Serialization::BinaryReader(data.data(), data.data() + data.size()), value);
+            return true;
+        }
+        catch (const std::exception&)
+        {
+            return false;
+        }
+    }
 }
diff --git a/components/detournavigator/serialization.hpp b/components/detournavigator/serialization.hpp
index 8e8096a3dc..194e50a994 100644
--- a/components/detournavigator/serialization.hpp
+++ b/components/detournavigator/serialization.hpp
@@ -22,6 +22,8 @@ namespace DetourNavigator
         const std::vector<DbRefGeometryObject>& dbRefGeometryObjects);
 
     std::vector<std::byte> serialize(const PreparedNavMeshData& value);
+
+    bool deserialize(const std::vector<std::byte>& data, PreparedNavMeshData& value);
 }
 
 #endif
diff --git a/components/detournavigator/settings.cpp b/components/detournavigator/settings.cpp
index cda9ab8d2f..68baeb51d8 100644
--- a/components/detournavigator/settings.cpp
+++ b/components/detournavigator/settings.cpp
@@ -62,6 +62,7 @@ namespace DetourNavigator
         result.mEnableNavMeshFileNameRevision = ::Settings::Manager::getBool("enable nav mesh file name revision", "Navigator");
         result.mMinUpdateInterval = std::chrono::milliseconds(::Settings::Manager::getInt("min update interval ms", "Navigator"));
         result.mNavMeshVersion = ::Settings::Manager::getInt("nav mesh version", "Navigator");
+        result.mEnableNavMeshDiskCache = ::Settings::Manager::getBool("enable nav mesh disk cache", "Navigator");
 
         return result;
     }
diff --git a/components/detournavigator/settings.hpp b/components/detournavigator/settings.hpp
index 3253b60893..ab8a95c649 100644
--- a/components/detournavigator/settings.hpp
+++ b/components/detournavigator/settings.hpp
@@ -39,6 +39,7 @@ namespace DetourNavigator
         bool mEnableWriteNavMeshToFile = false;
         bool mEnableRecastMeshFileNameRevision = false;
         bool mEnableNavMeshFileNameRevision = false;
+        bool mEnableNavMeshDiskCache = false;
         RecastSettings mRecast;
         DetourSettings mDetour;
         int mWaitUntilMinDistanceToPlayer = 0;
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.cpp b/components/detournavigator/tilecachedrecastmeshmanager.cpp
index 88fd8ab3f5..bf3df92d6e 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -14,15 +14,30 @@ namespace DetourNavigator
         : mSettings(settings)
     {}
 
+    std::string TileCachedRecastMeshManager::getWorldspace() const
+    {
+        const std::lock_guard lock(mMutex);
+        return mWorldspace;
+    }
+
+    void TileCachedRecastMeshManager::setWorldspace(std::string_view worldspace)
+    {
+        const std::lock_guard lock(mMutex);
+        if (mWorldspace == worldspace)
+            return;
+        mTiles.clear();
+        mWorldspace = worldspace;
+    }
+
     bool TileCachedRecastMeshManager::addObject(const ObjectId id, const CollisionShape& shape,
                                                 const btTransform& transform, const AreaType areaType)
     {
         std::vector<TilePosition> tilesPositions;
         {
-            auto tiles = mTiles.lock();
+            const std::lock_guard lock(mMutex);
             getTilesPositions(shape.getShape(), transform, mSettings, [&] (const TilePosition& tilePosition)
                 {
-                    if (addTile(id, shape, transform, areaType, tilePosition, tiles.get()))
+                    if (addTile(id, shape, transform, areaType, tilePosition, mTiles))
                         tilesPositions.push_back(tilePosition);
                 });
         }
@@ -41,10 +56,10 @@ namespace DetourNavigator
             return std::nullopt;
         std::optional<RemovedRecastMeshObject> result;
         {
-            auto tiles = mTiles.lock();
+            const std::lock_guard lock(mMutex);
             for (const auto& tilePosition : object->second)
             {
-                const auto removed = removeTile(id, tilePosition, tiles.get());
+                const auto removed = removeTile(id, tilePosition, mTiles);
                 if (removed && !result)
                     result = removed;
             }
@@ -62,8 +77,8 @@ namespace DetourNavigator
 
         if (cellSize == std::numeric_limits<int>::max())
         {
-            const auto tiles = mTiles.lock();
-            for (auto& tile : *tiles)
+            const std::lock_guard lock(mMutex);
+            for (auto& tile : mTiles)
             {
                 if (tile.second->addWater(cellPosition, cellSize, level))
                 {
@@ -77,13 +92,13 @@ namespace DetourNavigator
             const btVector3 shift = Misc::Convert::toBullet(getWaterShift3d(cellPosition, cellSize, level));
             getTilesPositions(cellSize, shift, mSettings, [&] (const TilePosition& tilePosition)
                 {
-                    const auto tiles = mTiles.lock();
-                    auto tile = tiles->find(tilePosition);
-                    if (tile == tiles->end())
+                    const std::lock_guard lock(mMutex);
+                    auto tile = mTiles.find(tilePosition);
+                    if (tile == mTiles.end())
                     {
                         const TileBounds tileBounds = makeRealTileBoundsWithBorder(mSettings, tilePosition);
-                        tile = tiles->emplace(tilePosition,
-                                std::make_shared<CachedRecastMeshManager>(tileBounds, mTilesGeneration)).first;
+                        tile = mTiles.emplace_hint(tile, tilePosition,
+                                std::make_shared<CachedRecastMeshManager>(tileBounds, mTilesGeneration));
                     }
                     if (tile->second->addWater(cellPosition, cellSize, level))
                     {
@@ -107,14 +122,14 @@ namespace DetourNavigator
         std::optional<Water> result;
         for (const auto& tilePosition : object->second)
         {
-            const auto tiles = mTiles.lock();
-            const auto tile = tiles->find(tilePosition);
-            if (tile == tiles->end())
+            const std::lock_guard lock(mMutex);
+            const auto tile = mTiles.find(tilePosition);
+            if (tile == mTiles.end())
                 continue;
             const auto tileResult = tile->second->removeWater(cellPosition);
             if (tile->second->isEmpty())
             {
-                tiles->erase(tile);
+                mTiles.erase(tile);
                 ++mTilesGeneration;
             }
             if (tileResult && !result)
@@ -135,13 +150,13 @@ namespace DetourNavigator
 
         getTilesPositions(cellSize, shift, mSettings, [&] (const TilePosition& tilePosition)
             {
-                const auto tiles = mTiles.lock();
-                auto tile = tiles->find(tilePosition);
-                if (tile == tiles->end())
+                const std::lock_guard lock(mMutex);
+                auto tile = mTiles.find(tilePosition);
+                if (tile == mTiles.end())
                 {
                     const TileBounds tileBounds = makeRealTileBoundsWithBorder(mSettings, tilePosition);
-                    tile = tiles->emplace(tilePosition,
-                            std::make_shared<CachedRecastMeshManager>(tileBounds, mTilesGeneration)).first;
+                    tile = mTiles.emplace_hint(tile, tilePosition,
+                            std::make_shared<CachedRecastMeshManager>(tileBounds, mTilesGeneration));
                 }
                 if (tile->second->addHeightfield(cellPosition, cellSize, shape))
                 {
@@ -164,14 +179,14 @@ namespace DetourNavigator
         std::optional<SizedHeightfieldShape> result;
         for (const auto& tilePosition : object->second)
         {
-            const auto tiles = mTiles.lock();
-            const auto tile = tiles->find(tilePosition);
-            if (tile == tiles->end())
+            const std::lock_guard lock(mMutex);
+            const auto tile = mTiles.find(tilePosition);
+            if (tile == mTiles.end())
                 continue;
             const auto tileResult = tile->second->removeHeightfield(cellPosition);
             if (tile->second->isEmpty())
             {
-                tiles->erase(tile);
+                mTiles.erase(tile);
                 ++mTilesGeneration;
             }
             if (tileResult && !result)
@@ -182,23 +197,23 @@ namespace DetourNavigator
         return result;
     }
 
-    std::shared_ptr<RecastMesh> TileCachedRecastMeshManager::getMesh(const TilePosition& tilePosition) const
+    std::shared_ptr<RecastMesh> TileCachedRecastMeshManager::getMesh(std::string_view worldspace, const TilePosition& tilePosition) const
     {
-        if (const auto manager = getManager(tilePosition))
+        if (const auto manager = getManager(worldspace, tilePosition))
             return manager->getMesh();
         return nullptr;
     }
 
-    std::shared_ptr<RecastMesh> TileCachedRecastMeshManager::getCachedMesh(const TilePosition& tilePosition) const
+    std::shared_ptr<RecastMesh> TileCachedRecastMeshManager::getCachedMesh(std::string_view worldspace, const TilePosition& tilePosition) const
     {
-        if (const auto manager = getManager(tilePosition))
+        if (const auto manager = getManager(worldspace, tilePosition))
             return manager->getCachedMesh();
         return nullptr;
     }
 
-    std::shared_ptr<RecastMesh> TileCachedRecastMeshManager::getNewMesh(const TilePosition& tilePosition) const
+    std::shared_ptr<RecastMesh> TileCachedRecastMeshManager::getNewMesh(std::string_view worldspace, const TilePosition& tilePosition) const
     {
-        if (const auto manager = getManager(tilePosition))
+        if (const auto manager = getManager(worldspace, tilePosition))
             return manager->getNewMesh();
         return nullptr;
     }
@@ -210,9 +225,9 @@ namespace DetourNavigator
 
     void TileCachedRecastMeshManager::reportNavMeshChange(const TilePosition& tilePosition, Version recastMeshVersion, Version navMeshVersion) const
     {
-        const auto tiles = mTiles.lockConst();
-        const auto it = tiles->find(tilePosition);
-        if (it == tiles->end())
+        const std::lock_guard lock(mMutex);
+        const auto it = mTiles.find(tilePosition);
+        if (it == mTiles.end())
             return;
         it->second->reportNavMeshChange(recastMeshVersion, navMeshVersion);
     }
@@ -225,8 +240,8 @@ namespace DetourNavigator
         if (tile == tiles.end())
         {
             const TileBounds tileBounds = makeRealTileBoundsWithBorder(mSettings, tilePosition);
-            tile = tiles.emplace(tilePosition,
-                    std::make_shared<CachedRecastMeshManager>(tileBounds, mTilesGeneration)).first;
+            tile = tiles.emplace_hint(tile, tilePosition,
+                    std::make_shared<CachedRecastMeshManager>(tileBounds, mTilesGeneration));
         }
         return tile->second->addObject(id, shape, transform, areaType);
     }
@@ -253,11 +268,14 @@ namespace DetourNavigator
         return tileResult;
     }
 
-    std::shared_ptr<CachedRecastMeshManager> TileCachedRecastMeshManager::getManager(const TilePosition& tilePosition) const
+    std::shared_ptr<CachedRecastMeshManager> TileCachedRecastMeshManager::getManager(std::string_view worldspace,
+        const TilePosition& tilePosition) const
     {
-        const auto tiles = mTiles.lockConst();
-        const auto it = tiles->find(tilePosition);
-        if (it == tiles->end())
+        const std::lock_guard lock(mMutex);
+        if (mWorldspace != worldspace)
+            return nullptr;
+        const auto it = mTiles.find(tilePosition);
+        if (it == mTiles.end())
             return nullptr;
         return it->second;
     }
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.hpp b/components/detournavigator/tilecachedrecastmeshmanager.hpp
index 68dc565fa5..23171f0925 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.hpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.hpp
@@ -8,8 +8,6 @@
 #include "version.hpp"
 #include "heightfieldshape.hpp"
 
-#include <components/misc/guarded.hpp>
-
 #include <algorithm>
 #include <map>
 #include <mutex>
@@ -22,6 +20,10 @@ namespace DetourNavigator
     public:
         explicit TileCachedRecastMeshManager(const RecastSettings& settings);
 
+        std::string getWorldspace() const;
+
+        void setWorldspace(std::string_view worldspace);
+
         bool addObject(const ObjectId id, const CollisionShape& shape, const btTransform& transform,
                        const AreaType areaType);
 
@@ -36,19 +38,19 @@ namespace DetourNavigator
             bool changed = false;
             std::vector<TilePosition> newTiles;
             {
-                auto tiles = mTiles.lock();
+                const std::lock_guard lock(mMutex);
                 const auto onTilePosition = [&] (const TilePosition& tilePosition)
                 {
                     if (std::binary_search(currentTiles.begin(), currentTiles.end(), tilePosition))
                     {
                         newTiles.push_back(tilePosition);
-                        if (updateTile(id, transform, areaType, tilePosition, tiles.get()))
+                        if (updateTile(id, transform, areaType, tilePosition, mTiles))
                         {
                             onChangedTile(tilePosition);
                             changed = true;
                         }
                     }
-                    else if (addTile(id, shape, transform, areaType, tilePosition, tiles.get()))
+                    else if (addTile(id, shape, transform, areaType, tilePosition, mTiles))
                     {
                         newTiles.push_back(tilePosition);
                         onChangedTile(tilePosition);
@@ -59,7 +61,7 @@ namespace DetourNavigator
                 std::sort(newTiles.begin(), newTiles.end());
                 for (const auto& tile : currentTiles)
                 {
-                    if (!std::binary_search(newTiles.begin(), newTiles.end(), tile) && removeTile(id, tile, tiles.get()))
+                    if (!std::binary_search(newTiles.begin(), newTiles.end(), tile) && removeTile(id, tile, mTiles))
                     {
                         onChangedTile(tile);
                         changed = true;
@@ -84,16 +86,17 @@ namespace DetourNavigator
 
         std::optional<SizedHeightfieldShape> removeHeightfield(const osg::Vec2i& cellPosition);
 
-        std::shared_ptr<RecastMesh> getMesh(const TilePosition& tilePosition) const;
+        std::shared_ptr<RecastMesh> getMesh(std::string_view worldspace, const TilePosition& tilePosition) const;
 
-        std::shared_ptr<RecastMesh> getCachedMesh(const TilePosition& tilePosition) const;
+        std::shared_ptr<RecastMesh> getCachedMesh(std::string_view worldspace, const TilePosition& tilePosition) const;
 
-        std::shared_ptr<RecastMesh> getNewMesh(const TilePosition& tilePosition) const;
+        std::shared_ptr<RecastMesh> getNewMesh(std::string_view worldspace, const TilePosition& tilePosition) const;
 
         template <class Function>
         void forEachTile(Function&& function) const
         {
-            for (auto& [tilePosition, recastMeshManager] : *mTiles.lockConst())
+            const std::lock_guard lock(mMutex);
+            for (auto& [tilePosition, recastMeshManager] : mTiles)
                 function(tilePosition, *recastMeshManager);
         }
 
@@ -105,7 +108,9 @@ namespace DetourNavigator
         using TilesMap = std::map<TilePosition, std::shared_ptr<CachedRecastMeshManager>>;
 
         const RecastSettings& mSettings;
-        Misc::ScopeGuarded<TilesMap> mTiles;
+        mutable std::mutex mMutex;
+        std::string mWorldspace;
+        TilesMap mTiles;
         std::unordered_map<ObjectId, std::vector<TilePosition>> mObjectsTilesPositions;
         std::map<osg::Vec2i, std::vector<TilePosition>> mWaterTilesPositions;
         std::map<osg::Vec2i, std::vector<TilePosition>> mHeightfieldTilesPositions;
@@ -121,7 +126,8 @@ namespace DetourNavigator
         std::optional<RemovedRecastMeshObject> removeTile(const ObjectId id, const TilePosition& tilePosition,
                 TilesMap& tiles);
 
-        inline std::shared_ptr<CachedRecastMeshManager> getManager(const TilePosition& tilePosition) const;
+        inline std::shared_ptr<CachedRecastMeshManager> getManager(std::string_view worldspace,
+                const TilePosition& tilePosition) const;
     };
 }
 
diff --git a/docs/source/reference/modding/settings/navigator.rst b/docs/source/reference/modding/settings/navigator.rst
index 9132364d48..15059356ff 100644
--- a/docs/source/reference/modding/settings/navigator.rst
+++ b/docs/source/reference/modding/settings/navigator.rst
@@ -54,6 +54,17 @@ Allows to complete cell loading only when minimal navigation mesh area is genera
 nearby the player. Increasing this value will keep loading screen longer but will slightly increase nav mesh generation
 speed on systems bound by CPU. Zero means no waiting.
 
+enable nav mesh disk cache
+--------------------------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	True
+
+If true navmesh cache stored on disk will be used in addition to memory cache.
+If navmesh tile is not present in memory cache, it will be looked up in the disk cache.
+If it's not found there it will be generated.
+
 Advanced settings
 *****************
 
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index e80d6d1106..1752b4f5a0 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -934,6 +934,9 @@ wait until min distance to player = 5
 # Should be increased each time there is a difference between output of makeNavMeshTileData function for the same input.
 nav mesh version = 1
 
+# Use navigation mesh cache stored on disk (true, false)
+enable nav mesh disk cache = true
+
 [Shadows]
 
 # Enable or disable shadows. Bear in mind that this will force OpenMW to use shaders as if "[Shaders]/force shaders" was set to true.

From 9e0451c714c052fb2234be20bac00b4d8c2645a0 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 1 Aug 2021 23:35:45 +0200
Subject: [PATCH 1846/2859] Support navmesh generation from launcher

---
 apps/launcher/datafilespage.cpp       | 68 +++++++++++++++++++++-
 apps/launcher/datafilespage.hpp       | 14 ++++-
 components/process/processinvoker.cpp | 14 ++++-
 components/process/processinvoker.hpp |  6 +-
 files/ui/datafilespage.ui             | 84 ++++++++++++++++++++++++++-
 5 files changed, 179 insertions(+), 7 deletions(-)

diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index eb0950dae0..097dc21dd2 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -1,4 +1,5 @@
 #include "datafilespage.hpp"
+#include "maindialog.hpp"
 
 #include <QDebug>
 
@@ -8,6 +9,7 @@
 #include <QSortFilterProxyModel>
 #include <thread>
 #include <mutex>
+#include <algorithm>
 
 #include <apps/launcher/utils/cellnameloader.hpp>
 #include <components/files/configurationmanager.hpp>
@@ -24,11 +26,14 @@
 
 const char *Launcher::DataFilesPage::mDefaultContentListName = "Default";
 
-Launcher::DataFilesPage::DataFilesPage(Files::ConfigurationManager &cfg, Config::GameSettings &gameSettings, Config::LauncherSettings &launcherSettings, QWidget *parent)
+Launcher::DataFilesPage::DataFilesPage(Files::ConfigurationManager &cfg, Config::GameSettings &gameSettings,
+                                       Config::LauncherSettings &launcherSettings, MainDialog *parent)
     : QWidget(parent)
+    , mMainDialog(parent)
     , mCfgMgr(cfg)
     , mGameSettings(gameSettings)
     , mLauncherSettings(launcherSettings)
+    , mNavMeshToolInvoker(new Process::ProcessInvoker(this))
 {
     ui.setupUi (this);
     setObjectName ("DataFilesPage");
@@ -57,8 +62,6 @@ Launcher::DataFilesPage::DataFilesPage(Files::ConfigurationManager &cfg, Config:
 
 void Launcher::DataFilesPage::buildView()
 {
-    ui.verticalLayout->insertWidget (0, mSelector->uiWidget());
-
     QToolButton * refreshButton = mSelector->refreshButton();    
 
     //tool buttons
@@ -89,6 +92,13 @@ void Launcher::DataFilesPage::buildView()
              this, SLOT (slotProfileChangedByUser(QString, QString)));
 
     connect(ui.refreshDataFilesAction, SIGNAL(triggered()),this, SLOT(slotRefreshButtonClicked()));
+
+    connect(ui.updateNavMeshButton, SIGNAL(clicked()), this, SLOT(startNavMeshTool()));
+    connect(ui.cancelNavMeshButton, SIGNAL(clicked()), this, SLOT(killNavMeshTool()));
+
+    connect(mNavMeshToolInvoker->getProcess(), SIGNAL(readyReadStandardOutput()), this, SLOT(updateNavMeshProgress()));
+    connect(mNavMeshToolInvoker->getProcess(), SIGNAL(readyReadStandardError()), this, SLOT(updateNavMeshProgress()));
+    connect(mNavMeshToolInvoker->getProcess(), SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(navMeshToolFinished(int, QProcess::ExitStatus)));
 }
 
 bool Launcher::DataFilesPage::loadSettings()
@@ -411,3 +421,55 @@ void Launcher::DataFilesPage::reloadCells(QStringList selectedFiles)
     std::sort(cellNamesList.begin(), cellNamesList.end());
     emit signalLoadedCellsChanged(cellNamesList);
 }
+
+void Launcher::DataFilesPage::startNavMeshTool()
+{
+    mMainDialog->writeSettings();
+
+    ui.navMeshLogPlainTextEdit->clear();
+    ui.navMeshProgressBar->setValue(0);
+    ui.navMeshProgressBar->setMaximum(1);
+
+    if (!mNavMeshToolInvoker->startProcess(QLatin1String("openmw-navmeshtool")))
+        return;
+
+    ui.cancelNavMeshButton->setEnabled(true);
+    ui.navMeshProgressBar->setEnabled(true);
+}
+
+void Launcher::DataFilesPage::killNavMeshTool()
+{
+    mNavMeshToolInvoker->killProcess();
+}
+
+void Launcher::DataFilesPage::updateNavMeshProgress()
+{
+    QProcess& process = *mNavMeshToolInvoker->getProcess();
+    QString text;
+    while (process.canReadLine())
+    {
+        const QByteArray line = process.readLine();
+        const auto end = std::find_if(line.rbegin(), line.rend(), [] (auto v) { return v != '\n' && v != '\r'; });
+        text = QString::fromUtf8(line.mid(0, line.size() - (end - line.rbegin())));
+        ui.navMeshLogPlainTextEdit->appendPlainText(text);
+    }
+    const QRegularExpression pattern(R"([\( ](\d+)/(\d+)[\) ])");
+    QRegularExpressionMatch match = pattern.match(text);
+    if (!match.hasMatch())
+        return;
+    int maximum = match.captured(2).toInt();
+    if (text.contains("cell"))
+        maximum *= 100;
+    ui.navMeshProgressBar->setMaximum(std::max(ui.navMeshProgressBar->maximum(), maximum));
+    ui.navMeshProgressBar->setValue(match.captured(1).toInt());
+}
+
+void Launcher::DataFilesPage::navMeshToolFinished(int exitCode, QProcess::ExitStatus exitStatus)
+{
+    updateNavMeshProgress();
+    ui.navMeshLogPlainTextEdit->appendPlainText(QString::fromUtf8(mNavMeshToolInvoker->getProcess()->readAll()));
+    if (exitCode == 0 && exitStatus == QProcess::ExitStatus::NormalExit)
+        ui.navMeshProgressBar->setValue(ui.navMeshProgressBar->maximum());
+    ui.cancelNavMeshButton->setEnabled(false);
+    ui.navMeshProgressBar->setEnabled(false);
+}
diff --git a/apps/launcher/datafilespage.hpp b/apps/launcher/datafilespage.hpp
index 5a7a6dc6e6..a039237590 100644
--- a/apps/launcher/datafilespage.hpp
+++ b/apps/launcher/datafilespage.hpp
@@ -2,6 +2,9 @@
 #define DATAFILESPAGE_H
 
 #include "ui_datafilespage.h"
+
+#include <components/process/processinvoker.hpp>
+
 #include <QWidget>
 
 
@@ -19,6 +22,7 @@ namespace Config { class GameSettings;
 
 namespace Launcher
 {
+    class MainDialog;
     class TextInputDialog;
     class ProfilesComboBox;
 
@@ -31,7 +35,7 @@ namespace Launcher
 
     public:
         explicit DataFilesPage (Files::ConfigurationManager &cfg, Config::GameSettings &gameSettings,
-                                Config::LauncherSettings &launcherSettings, QWidget *parent = nullptr);
+                                Config::LauncherSettings &launcherSettings, MainDialog *parent = nullptr);
 
         QAbstractItemModel* profilesModel() const;
 
@@ -69,12 +73,18 @@ namespace Launcher
         void on_cloneProfileAction_triggered();
         void on_deleteProfileAction_triggered();
 
+        void startNavMeshTool();
+        void killNavMeshTool();
+        void updateNavMeshProgress();
+        void navMeshToolFinished(int exitCode, QProcess::ExitStatus exitStatus);
+
     public:
         /// Content List that is always present
         const static char *mDefaultContentListName;
 
     private:
 
+        MainDialog *mMainDialog;
         TextInputDialog *mNewProfileDialog;
         TextInputDialog *mCloneProfileDialog;
 
@@ -87,6 +97,8 @@ namespace Launcher
         QStringList previousSelectedFiles;
         QString mDataLocal;
 
+        Process::ProcessInvoker* mNavMeshToolInvoker;
+
         void buildView();
         void setProfile (int index, bool savePrevious);
         void setProfile (const QString &previous, const QString &current, bool savePrevious);
diff --git a/components/process/processinvoker.cpp b/components/process/processinvoker.cpp
index 78cf70038b..7c45c865a1 100644
--- a/components/process/processinvoker.cpp
+++ b/components/process/processinvoker.cpp
@@ -7,7 +7,8 @@
 #include <QDebug>
 #include <QCoreApplication>
 
-Process::ProcessInvoker::ProcessInvoker()
+Process::ProcessInvoker::ProcessInvoker(QObject* parent)
+    : QObject(parent)
 {
     mProcess = new QProcess(this);
 
@@ -56,6 +57,7 @@ bool Process::ProcessInvoker::startProcess(const QString &name, const QStringLis
 //    mProcess = new QProcess(this);
     mName = name;
     mArguments = arguments;
+    mIgnoreErrors = false;
 
     QString path(name);
 #ifdef Q_OS_WIN
@@ -151,6 +153,8 @@ bool Process::ProcessInvoker::startProcess(const QString &name, const QStringLis
 
 void Process::ProcessInvoker::processError(QProcess::ProcessError error)
 {
+    if (mIgnoreErrors)
+        return;
     QMessageBox msgBox;
     msgBox.setWindowTitle(tr("Error running executable"));
     msgBox.setIcon(QMessageBox::Critical);
@@ -166,6 +170,8 @@ void Process::ProcessInvoker::processError(QProcess::ProcessError error)
 void Process::ProcessInvoker::processFinished(int exitCode, QProcess::ExitStatus exitStatus)
 {
     if (exitCode != 0 || exitStatus == QProcess::CrashExit) {
+        if (mIgnoreErrors)
+            return;
         QString error(mProcess->readAllStandardError());
         error.append(tr("\nArguments:\n"));
         error.append(mArguments.join(" "));
@@ -181,3 +187,9 @@ void Process::ProcessInvoker::processFinished(int exitCode, QProcess::ExitStatus
         msgBox.exec();
     }
 }
+
+void Process::ProcessInvoker::killProcess()
+{
+    mIgnoreErrors = true;
+    mProcess->kill();
+}
diff --git a/components/process/processinvoker.hpp b/components/process/processinvoker.hpp
index 8fff6658ca..f4b402cb12 100644
--- a/components/process/processinvoker.hpp
+++ b/components/process/processinvoker.hpp
@@ -13,7 +13,7 @@ namespace Process
 
     public:
 
-        ProcessInvoker();
+        ProcessInvoker(QObject* parent = nullptr);
         ~ProcessInvoker();
 
 //        void setProcessName(const QString &name);
@@ -27,12 +27,16 @@ namespace Process
         inline bool startProcess(const QString &name, bool detached = false) { return startProcess(name, QStringList(), detached); }
         bool startProcess(const QString &name, const QStringList &arguments, bool detached = false);
 
+        void killProcess();
+
     private:
         QProcess *mProcess;
 
         QString mName;
         QStringList mArguments;
 
+        bool mIgnoreErrors = false;
+
     private slots:
         void processError(QProcess::ProcessError error);
         void processFinished(int exitCode, QProcess::ExitStatus exitStatus);
diff --git a/files/ui/datafilespage.ui b/files/ui/datafilespage.ui
index ccac5050ed..ff330391d2 100644
--- a/files/ui/datafilespage.ui
+++ b/files/ui/datafilespage.ui
@@ -2,12 +2,94 @@
 <ui version="4.0">
  <class>DataFilesPage</class>
  <widget class="QWidget" name="DataFilesPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>571</width>
+    <height>384</height>
+   </rect>
+  </property>
   <property name="contextMenuPolicy">
    <enum>Qt::DefaultContextMenu</enum>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QWidget" name="contentSelectorWidget" native="true"/>
+    <widget class="QTabWidget" name="tabWidget">
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="tab">
+      <attribute name="title">
+       <string>Data Files</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_4">
+       <item>
+        <widget class="QWidget" name="contentSelectorWidget" native="true"/>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab_2">
+      <attribute name="title">
+       <string>Navigation mesh cache</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <item>
+          <widget class="QPushButton" name="updateNavMeshButton">
+           <property name="focusPolicy">
+            <enum>Qt::TabFocus</enum>
+           </property>
+           <property name="toolTip">
+            <string>Generate navigation mesh cache for all content. Will be used by the engine to make cell loading faster.</string>
+           </property>
+           <property name="text">
+            <string>Update</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QProgressBar" name="navMeshProgressBar">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
+           <property name="value">
+            <number>0</number>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="cancelNavMeshButton">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
+           <property name="toolTip">
+            <string>Cancel navigation mesh generation. Already processed data will be saved.</string>
+           </property>
+           <property name="text">
+            <string>Cancel</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="QPlainTextEdit" name="navMeshLogPlainTextEdit">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+         <property name="lineWrapMode">
+          <enum>QPlainTextEdit::NoWrap</enum>
+         </property>
+         <property name="readOnly">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="profileGroupBox">

From 96eb8d7be9077b93461673c332ab536fc29bb7b0 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 6 Aug 2021 00:05:09 +0200
Subject: [PATCH 1847/2859] Write generated navmesh to navmeshdb

Perform all request to db in a single thread to avoid blocking navmesh
generator threads due to slow write operations.

Write to db navmesh for all changes except update as it done for memory cache.

Batch multiple db operations into a single transaction to speed up writing by
not executing fsync after each insert/update query. All reads are performed in
the same transaction so they see uncommited data.
---
 apps/openmw_test_suite/CMakeLists.txt         |   1 +
 .../detournavigator/asyncnavmeshupdater.cpp   | 201 ++++++
 .../detournavigator/navigator.cpp             |  34 +-
 .../detournavigator/navmeshtilescache.cpp     |  44 +-
 .../detournavigator/settings.hpp              |  50 ++
 .../detournavigator/asyncnavmeshupdater.cpp   | 596 ++++++++++++++----
 .../detournavigator/asyncnavmeshupdater.hpp   | 135 +++-
 components/detournavigator/makenavmesh.cpp    |  85 ---
 components/detournavigator/makenavmesh.hpp    |  12 -
 .../detournavigator/navmeshcacheitem.cpp      |  23 +-
 .../detournavigator/navmeshcacheitem.hpp      |   6 +
 components/detournavigator/navmeshmanager.cpp |   4 +-
 .../detournavigator/navmeshtilescache.cpp     |   9 +-
 .../detournavigator/navmeshtilescache.hpp     |   4 +-
 .../detournavigator/preparednavmeshdata.cpp   |  11 +
 .../detournavigator/preparednavmeshdata.hpp   |   2 +-
 components/detournavigator/recast.cpp         |  31 +
 components/detournavigator/recast.hpp         |   5 +
 components/detournavigator/settings.cpp       |   1 +
 components/detournavigator/settings.hpp       |   1 +
 components/resource/stats.cpp                 |   2 +
 .../reference/modding/settings/navigator.rst  |   9 +
 files/settings-default.cfg                    |   3 +
 23 files changed, 966 insertions(+), 303 deletions(-)
 create mode 100644 apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp
 create mode 100644 apps/openmw_test_suite/detournavigator/settings.hpp

diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index 6a93eaa397..19b31f78be 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -43,6 +43,7 @@ if (GTEST_FOUND AND GMOCK_FOUND)
         detournavigator/tilecachedrecastmeshmanager.cpp
         detournavigator/navmeshdb.cpp
         detournavigator/serialization.cpp
+        detournavigator/asyncnavmeshupdater.cpp
 
         serialization/binaryreader.cpp
         serialization/binarywriter.cpp
diff --git a/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp b/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp
new file mode 100644
index 0000000000..d245838858
--- /dev/null
+++ b/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp
@@ -0,0 +1,201 @@
+#include "settings.hpp"
+
+#include <components/detournavigator/asyncnavmeshupdater.hpp>
+#include <components/detournavigator/makenavmesh.hpp>
+#include <components/detournavigator/serialization.hpp>
+#include <components/loadinglistener/loadinglistener.hpp>
+#include <components/detournavigator/navmeshdbutils.hpp>
+#include <components/detournavigator/dbrefgeometryobject.hpp>
+
+#include <DetourNavMesh.h>
+
+#include <gtest/gtest.h>
+
+#include <map>
+
+namespace
+{
+    using namespace testing;
+    using namespace DetourNavigator;
+    using namespace DetourNavigator::Tests;
+
+    void addHeightFieldPlane(TileCachedRecastMeshManager& recastMeshManager)
+    {
+        const osg::Vec2i cellPosition(0, 0);
+        const int cellSize = 8192;
+        recastMeshManager.addHeightfield(cellPosition, cellSize, HeightfieldPlane {0});
+    }
+
+    struct DetourNavigatorAsyncNavMeshUpdaterTest : Test
+    {
+        Settings mSettings = makeSettings();
+        TileCachedRecastMeshManager mRecastMeshManager {mSettings.mRecast};
+        OffMeshConnectionsManager mOffMeshConnectionsManager {mSettings.mRecast};
+        const osg::Vec3f mAgentHalfExtents {29, 29, 66};
+        const TilePosition mPlayerTile {0, 0};
+        const std::string mWorldspace = "sys::default";
+        Loading::Listener mListener;
+    };
+
+    TEST_F(DetourNavigatorAsyncNavMeshUpdaterTest, for_all_jobs_done_when_empty_wait_should_terminate)
+    {
+        AsyncNavMeshUpdater updater {mSettings, mRecastMeshManager, mOffMeshConnectionsManager, nullptr};
+        updater.wait(mListener, WaitConditionType::allJobsDone);
+    }
+
+    TEST_F(DetourNavigatorAsyncNavMeshUpdaterTest, for_required_tiles_present_when_empty_wait_should_terminate)
+    {
+        AsyncNavMeshUpdater updater(mSettings, mRecastMeshManager, mOffMeshConnectionsManager, nullptr);
+        updater.wait(mListener, WaitConditionType::requiredTilesPresent);
+    }
+
+    TEST_F(DetourNavigatorAsyncNavMeshUpdaterTest, post_should_generate_navmesh_tile)
+    {
+        mRecastMeshManager.setWorldspace(mWorldspace);
+        addHeightFieldPlane(mRecastMeshManager);
+        AsyncNavMeshUpdater updater(mSettings, mRecastMeshManager, mOffMeshConnectionsManager, nullptr);
+        const auto navMeshCacheItem = std::make_shared<GuardedNavMeshCacheItem>(makeEmptyNavMesh(mSettings), 1);
+        const std::map<TilePosition, ChangeType> changedTiles {{TilePosition {0, 0}, ChangeType::add}};
+        updater.post(mAgentHalfExtents, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
+        updater.wait(mListener, WaitConditionType::allJobsDone);
+        EXPECT_NE(navMeshCacheItem->lockConst()->getImpl().getTileRefAt(0, 0, 0), 0);
+    }
+
+    TEST_F(DetourNavigatorAsyncNavMeshUpdaterTest, repeated_post_should_lead_to_cache_hit)
+    {
+        mRecastMeshManager.setWorldspace(mWorldspace);
+        addHeightFieldPlane(mRecastMeshManager);
+        AsyncNavMeshUpdater updater(mSettings, mRecastMeshManager, mOffMeshConnectionsManager, nullptr);
+        const auto navMeshCacheItem = std::make_shared<GuardedNavMeshCacheItem>(makeEmptyNavMesh(mSettings), 1);
+        const std::map<TilePosition, ChangeType> changedTiles {{TilePosition {0, 0}, ChangeType::add}};
+        updater.post(mAgentHalfExtents, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
+        updater.wait(mListener, WaitConditionType::allJobsDone);
+        {
+            const auto stats = updater.getStats();
+            ASSERT_EQ(stats.mCache.mGetCount, 1);
+            ASSERT_EQ(stats.mCache.mHitCount, 0);
+        }
+        updater.post(mAgentHalfExtents, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
+        updater.wait(mListener, WaitConditionType::allJobsDone);
+        {
+            const auto stats = updater.getStats();
+            EXPECT_EQ(stats.mCache.mGetCount, 2);
+            EXPECT_EQ(stats.mCache.mHitCount, 1);
+        }
+    }
+
+    TEST_F(DetourNavigatorAsyncNavMeshUpdaterTest, post_for_update_change_type_should_not_update_cache)
+    {
+        mRecastMeshManager.setWorldspace(mWorldspace);
+        addHeightFieldPlane(mRecastMeshManager);
+        AsyncNavMeshUpdater updater(mSettings, mRecastMeshManager, mOffMeshConnectionsManager, nullptr);
+        const auto navMeshCacheItem = std::make_shared<GuardedNavMeshCacheItem>(makeEmptyNavMesh(mSettings), 1);
+        const std::map<TilePosition, ChangeType> changedTiles {{TilePosition {0, 0}, ChangeType::update}};
+        updater.post(mAgentHalfExtents, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
+        updater.wait(mListener, WaitConditionType::allJobsDone);
+        {
+            const auto stats = updater.getStats();
+            ASSERT_EQ(stats.mCache.mGetCount, 1);
+            ASSERT_EQ(stats.mCache.mHitCount, 0);
+        }
+        updater.post(mAgentHalfExtents, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
+        updater.wait(mListener, WaitConditionType::allJobsDone);
+        {
+            const auto stats = updater.getStats();
+            EXPECT_EQ(stats.mCache.mGetCount, 2);
+            EXPECT_EQ(stats.mCache.mHitCount, 0);
+        }
+    }
+
+    TEST_F(DetourNavigatorAsyncNavMeshUpdaterTest, post_should_write_generated_tile_to_db)
+    {
+        mRecastMeshManager.setWorldspace(mWorldspace);
+        addHeightFieldPlane(mRecastMeshManager);
+        auto db = std::make_unique<NavMeshDb>(":memory:");
+        NavMeshDb* const dbPtr = db.get();
+        AsyncNavMeshUpdater updater(mSettings, mRecastMeshManager, mOffMeshConnectionsManager, std::move(db));
+        const auto navMeshCacheItem = std::make_shared<GuardedNavMeshCacheItem>(makeEmptyNavMesh(mSettings), 1);
+        const TilePosition tilePosition {0, 0};
+        const std::map<TilePosition, ChangeType> changedTiles {{tilePosition, ChangeType::add}};
+        updater.post(mAgentHalfExtents, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
+        updater.wait(mListener, WaitConditionType::allJobsDone);
+        const auto recastMesh = mRecastMeshManager.getMesh(mWorldspace, tilePosition);
+        ASSERT_NE(recastMesh, nullptr);
+        ShapeId nextShapeId {1};
+        const std::vector<DbRefGeometryObject> objects = makeDbRefGeometryObjects(recastMesh->getMeshSources(),
+            [&] (const MeshSource& v) { return resolveMeshSource(*dbPtr, v, nextShapeId); });
+        const auto tile = dbPtr->findTile(mWorldspace, tilePosition, serialize(mSettings.mRecast, *recastMesh, objects));
+        ASSERT_TRUE(tile.has_value());
+        EXPECT_EQ(tile->mTileId, 1);
+        EXPECT_EQ(tile->mVersion, mSettings.mNavMeshVersion);
+    }
+
+    TEST_F(DetourNavigatorAsyncNavMeshUpdaterTest, post_when_writing_to_db_disabled_should_not_write)
+    {
+        mRecastMeshManager.setWorldspace(mWorldspace);
+        addHeightFieldPlane(mRecastMeshManager);
+        auto db = std::make_unique<NavMeshDb>(":memory:");
+        NavMeshDb* const dbPtr = db.get();
+        mSettings.mWriteToNavMeshDb = false;
+        AsyncNavMeshUpdater updater(mSettings, mRecastMeshManager, mOffMeshConnectionsManager, std::move(db));
+        const auto navMeshCacheItem = std::make_shared<GuardedNavMeshCacheItem>(makeEmptyNavMesh(mSettings), 1);
+        const TilePosition tilePosition {0, 0};
+        const std::map<TilePosition, ChangeType> changedTiles {{tilePosition, ChangeType::add}};
+        updater.post(mAgentHalfExtents, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
+        updater.wait(mListener, WaitConditionType::allJobsDone);
+        const auto recastMesh = mRecastMeshManager.getMesh(mWorldspace, tilePosition);
+        ASSERT_NE(recastMesh, nullptr);
+        ShapeId nextShapeId {1};
+        const std::vector<DbRefGeometryObject> objects = makeDbRefGeometryObjects(recastMesh->getMeshSources(),
+            [&] (const MeshSource& v) { return resolveMeshSource(*dbPtr, v, nextShapeId); });
+        const auto tile = dbPtr->findTile(mWorldspace, tilePosition, serialize(mSettings.mRecast, *recastMesh, objects));
+        ASSERT_FALSE(tile.has_value());
+    }
+
+    TEST_F(DetourNavigatorAsyncNavMeshUpdaterTest, post_should_read_from_db_on_cache_miss)
+    {
+        mRecastMeshManager.setWorldspace(mWorldspace);
+        addHeightFieldPlane(mRecastMeshManager);
+        mSettings.mMaxNavMeshTilesCacheSize = 0;
+        AsyncNavMeshUpdater updater(mSettings, mRecastMeshManager, mOffMeshConnectionsManager, std::make_unique<NavMeshDb>(":memory:"));
+        const auto navMeshCacheItem = std::make_shared<GuardedNavMeshCacheItem>(makeEmptyNavMesh(mSettings), 1);
+        const std::map<TilePosition, ChangeType> changedTiles {{TilePosition {0, 0}, ChangeType::add}};
+        updater.post(mAgentHalfExtents, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
+        updater.wait(mListener, WaitConditionType::allJobsDone);
+        {
+            const auto stats = updater.getStats();
+            ASSERT_EQ(stats.mCache.mGetCount, 1);
+            ASSERT_EQ(stats.mCache.mHitCount, 0);
+            ASSERT_TRUE(stats.mDb.has_value());
+            ASSERT_EQ(stats.mDb->mGetTileCount, 1);
+            ASSERT_EQ(stats.mDbGetTileHits, 0);
+        }
+        updater.post(mAgentHalfExtents, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
+        updater.wait(mListener, WaitConditionType::allJobsDone);
+        {
+            const auto stats = updater.getStats();
+            EXPECT_EQ(stats.mCache.mGetCount, 2);
+            EXPECT_EQ(stats.mCache.mHitCount, 0);
+            ASSERT_TRUE(stats.mDb.has_value());
+            EXPECT_EQ(stats.mDb->mGetTileCount, 2);
+            EXPECT_EQ(stats.mDbGetTileHits, 1);
+        }
+    }
+
+    TEST_F(DetourNavigatorAsyncNavMeshUpdaterTest, on_changing_player_tile_post_should_remove_tiles_out_of_range)
+    {
+        mRecastMeshManager.setWorldspace(mWorldspace);
+        addHeightFieldPlane(mRecastMeshManager);
+        AsyncNavMeshUpdater updater(mSettings, mRecastMeshManager, mOffMeshConnectionsManager, nullptr);
+        const auto navMeshCacheItem = std::make_shared<GuardedNavMeshCacheItem>(makeEmptyNavMesh(mSettings), 1);
+        const std::map<TilePosition, ChangeType> changedTilesAdd {{TilePosition {0, 0}, ChangeType::add}};
+        updater.post(mAgentHalfExtents, navMeshCacheItem, mPlayerTile, mWorldspace, changedTilesAdd);
+        updater.wait(mListener, WaitConditionType::allJobsDone);
+        ASSERT_NE(navMeshCacheItem->lockConst()->getImpl().getTileRefAt(0, 0, 0), 0);
+        const std::map<TilePosition, ChangeType> changedTilesRemove {{TilePosition {0, 0}, ChangeType::remove}};
+        const TilePosition playerTile(100, 100);
+        updater.post(mAgentHalfExtents, navMeshCacheItem, playerTile, mWorldspace, changedTilesRemove);
+        updater.wait(mListener, WaitConditionType::allJobsDone);
+        EXPECT_EQ(navMeshCacheItem->lockConst()->getImpl().getTileRefAt(0, 0, 0), 0);
+    }
+}
diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index 0254d1b813..e7cd0a7db0 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -1,4 +1,5 @@
 #include "operators.hpp"
+#include "settings.hpp"
 
 #include <components/detournavigator/navigatorimpl.hpp>
 #include <components/detournavigator/exceptions.hpp>
@@ -32,10 +33,11 @@ namespace
 {
     using namespace testing;
     using namespace DetourNavigator;
+    using namespace DetourNavigator::Tests;
 
     struct DetourNavigatorNavigatorTest : Test
     {
-        Settings mSettings;
+        Settings mSettings = makeSettings();
         std::unique_ptr<Navigator> mNavigator;
         const osg::Vec3f mPlayerPosition;
         const std::string mWorldspace;
@@ -62,34 +64,6 @@ namespace
             , mOut(mPath)
             , mStepSize(28.333332061767578125f)
         {
-            mSettings.mEnableWriteRecastMeshToFile = false;
-            mSettings.mEnableWriteNavMeshToFile = false;
-            mSettings.mEnableRecastMeshFileNameRevision = false;
-            mSettings.mEnableNavMeshFileNameRevision = false;
-            mSettings.mRecast.mBorderSize = 16;
-            mSettings.mRecast.mCellHeight = 0.2f;
-            mSettings.mRecast.mCellSize = 0.2f;
-            mSettings.mRecast.mDetailSampleDist = 6;
-            mSettings.mRecast.mDetailSampleMaxError = 1;
-            mSettings.mRecast.mMaxClimb = 34;
-            mSettings.mRecast.mMaxSimplificationError = 1.3f;
-            mSettings.mRecast.mMaxSlope = 49;
-            mSettings.mRecast.mRecastScaleFactor = 0.017647058823529415f;
-            mSettings.mRecast.mSwimHeightScale = 0.89999997615814208984375f;
-            mSettings.mRecast.mMaxEdgeLen = 12;
-            mSettings.mDetour.mMaxNavMeshQueryNodes = 2048;
-            mSettings.mRecast.mMaxVertsPerPoly = 6;
-            mSettings.mRecast.mRegionMergeArea = 400;
-            mSettings.mRecast.mRegionMinArea = 64;
-            mSettings.mRecast.mTileSize = 64;
-            mSettings.mWaitUntilMinDistanceToPlayer = std::numeric_limits<int>::max();
-            mSettings.mAsyncNavMeshUpdaterThreads = 1;
-            mSettings.mMaxNavMeshTilesCacheSize = 1024 * 1024;
-            mSettings.mDetour.mMaxPolygonPathSize = 1024;
-            mSettings.mDetour.mMaxSmoothPathSize = 1024;
-            mSettings.mDetour.mMaxPolys = 4096;
-            mSettings.mMaxTilesNumber = 512;
-            mSettings.mMinUpdateInterval = std::chrono::milliseconds(50);
             mNavigator.reset(new NavigatorImpl(mSettings, std::make_unique<NavMeshDb>(":memory:")));
         }
     };
@@ -1013,7 +987,7 @@ namespace
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        const Version expectedVersion {1, 1};
+        const Version expectedVersion {1, 4};
 
         const auto navMeshes = mNavigator->getNavMeshes();
         ASSERT_EQ(navMeshes.size(), 1);
diff --git a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
index ec5576a634..cbd68e0fe1 100644
--- a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
+++ b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
@@ -80,51 +80,9 @@ namespace
         return result;
     }
 
-    template <class T>
-    void clone(const T* src, T*& dst, std::size_t size)
-    {
-        dst = static_cast<T*>(permRecastAlloc(static_cast<int>(size) * sizeof(T)));
-        std::memcpy(dst, src, size * sizeof(T));
-    }
-
-    void clone(const rcPolyMesh& src, rcPolyMesh& dst)
-    {
-        dst.nverts = src.nverts;
-        dst.npolys = src.npolys;
-        dst.maxpolys = src.maxpolys;
-        dst.nvp = src.nvp;
-        rcVcopy(dst.bmin, src.bmin);
-        rcVcopy(dst.bmax, src.bmax);
-        dst.cs = src.cs;
-        dst.ch = src.ch;
-        dst.borderSize = src.borderSize;
-        dst.maxEdgeError = src.maxEdgeError;
-        clone(src.verts, dst.verts, getVertsLength(dst));
-        clone(src.polys, dst.polys, getPolysLength(dst));
-        clone(src.regs, dst.regs, getRegsLength(dst));
-        clone(src.flags, dst.flags, getFlagsLength(dst));
-        clone(src.areas, dst.areas, getAreasLength(dst));
-    }
-
-    void clone(const rcPolyMeshDetail& src, rcPolyMeshDetail& dst)
-    {
-        dst.nmeshes = src.nmeshes;
-        dst.nverts = src.nverts;
-        dst.ntris = src.ntris;
-        clone(src.meshes, dst.meshes, getMeshesLength(dst));
-        clone(src.verts, dst.verts, getVertsLength(dst));
-        clone(src.tris, dst.tris, getTrisLength(dst));
-    }
-
     std::unique_ptr<PreparedNavMeshData> clone(const PreparedNavMeshData& value)
     {
-        auto result = std::make_unique<PreparedNavMeshData>();
-        result->mUserId = value.mUserId;
-        result->mCellHeight = value.mCellHeight;
-        result->mCellSize = value.mCellSize;
-        clone(value.mPolyMesh, result->mPolyMesh);
-        clone(value.mPolyMeshDetail, result->mPolyMeshDetail);
-        return result;
+        return std::make_unique<PreparedNavMeshData>(value);
     }
 
     Mesh makeMesh()
diff --git a/apps/openmw_test_suite/detournavigator/settings.hpp b/apps/openmw_test_suite/detournavigator/settings.hpp
new file mode 100644
index 0000000000..dc37dc7550
--- /dev/null
+++ b/apps/openmw_test_suite/detournavigator/settings.hpp
@@ -0,0 +1,50 @@
+#ifndef OPENMW_TEST_SUITE_DETOURNAVIGATOR_SETTINGS_H
+#define OPENMW_TEST_SUITE_DETOURNAVIGATOR_SETTINGS_H
+
+#include <components/detournavigator/settings.hpp>
+
+#include <chrono>
+#include <limits>
+
+namespace DetourNavigator
+{
+    namespace Tests
+    {
+        inline Settings makeSettings()
+        {
+            Settings result;
+            result.mEnableWriteRecastMeshToFile = false;
+            result.mEnableWriteNavMeshToFile = false;
+            result.mEnableRecastMeshFileNameRevision = false;
+            result.mEnableNavMeshFileNameRevision = false;
+            result.mRecast.mBorderSize = 16;
+            result.mRecast.mCellHeight = 0.2f;
+            result.mRecast.mCellSize = 0.2f;
+            result.mRecast.mDetailSampleDist = 6;
+            result.mRecast.mDetailSampleMaxError = 1;
+            result.mRecast.mMaxClimb = 34;
+            result.mRecast.mMaxSimplificationError = 1.3f;
+            result.mRecast.mMaxSlope = 49;
+            result.mRecast.mRecastScaleFactor = 0.017647058823529415f;
+            result.mRecast.mSwimHeightScale = 0.89999997615814208984375f;
+            result.mRecast.mMaxEdgeLen = 12;
+            result.mDetour.mMaxNavMeshQueryNodes = 2048;
+            result.mRecast.mMaxVertsPerPoly = 6;
+            result.mRecast.mRegionMergeArea = 400;
+            result.mRecast.mRegionMinArea = 64;
+            result.mRecast.mTileSize = 64;
+            result.mWaitUntilMinDistanceToPlayer = std::numeric_limits<int>::max();
+            result.mAsyncNavMeshUpdaterThreads = 1;
+            result.mMaxNavMeshTilesCacheSize = 1024 * 1024;
+            result.mDetour.mMaxPolygonPathSize = 1024;
+            result.mDetour.mMaxSmoothPathSize = 1024;
+            result.mDetour.mMaxPolys = 4096;
+            result.mMaxTilesNumber = 512;
+            result.mMinUpdateInterval = std::chrono::milliseconds(50);
+            result.mWriteToNavMeshDb = true;
+            return result;
+        }
+    }
+}
+
+#endif
diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index a808030478..47d984030f 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -3,6 +3,9 @@
 #include "makenavmesh.hpp"
 #include "settings.hpp"
 #include "version.hpp"
+#include "serialization.hpp"
+#include "navmeshdbutils.hpp"
+#include "dbrefgeometryobject.hpp"
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/thread.hpp>
@@ -15,70 +18,102 @@
 #include <algorithm>
 #include <numeric>
 #include <set>
+#include <type_traits>
 
-namespace
+namespace DetourNavigator
 {
-    using DetourNavigator::ChangeType;
-    using DetourNavigator::TilePosition;
-    using DetourNavigator::UpdateType;
-    using DetourNavigator::ChangeType;
-    using DetourNavigator::Job;
-    using DetourNavigator::JobIt;
-
-    int getManhattanDistance(const TilePosition& lhs, const TilePosition& rhs)
+    namespace
     {
-        return std::abs(lhs.x() - rhs.x()) + std::abs(lhs.y() - rhs.y());
-    }
+        int getManhattanDistance(const TilePosition& lhs, const TilePosition& rhs)
+        {
+            return std::abs(lhs.x() - rhs.x()) + std::abs(lhs.y() - rhs.y());
+        }
 
-    int getMinDistanceTo(const TilePosition& position, int maxDistance,
-                         const std::set<std::tuple<osg::Vec3f, TilePosition>>& pushedTiles,
-                         const std::set<std::tuple<osg::Vec3f, TilePosition>>& presentTiles)
-    {
-        int result = maxDistance;
-        for (const auto& [halfExtents, tile] : pushedTiles)
-            if (presentTiles.find(std::tie(halfExtents, tile)) == presentTiles.end())
-                result = std::min(result, getManhattanDistance(position, tile));
-        return result;
-    }
+        int getMinDistanceTo(const TilePosition& position, int maxDistance,
+                             const std::set<std::tuple<osg::Vec3f, TilePosition>>& pushedTiles,
+                             const std::set<std::tuple<osg::Vec3f, TilePosition>>& presentTiles)
+        {
+            int result = maxDistance;
+            for (const auto& [halfExtents, tile] : pushedTiles)
+                if (presentTiles.find(std::tie(halfExtents, tile)) == presentTiles.end())
+                    result = std::min(result, getManhattanDistance(position, tile));
+            return result;
+        }
 
-    UpdateType getUpdateType(ChangeType changeType) noexcept
-    {
-        if (changeType == ChangeType::update)
-            return UpdateType::Temporary;
-        return UpdateType::Persistent;
-    }
+        auto getPriority(const Job& job) noexcept
+        {
+            return std::make_tuple(-static_cast<std::underlying_type_t<JobState>>(job.mState), job.mProcessTime,
+                                   job.mChangeType, job.mTryNumber, job.mDistanceToPlayer, job.mDistanceToOrigin);
+        }
 
-    auto getPriority(const Job& job) noexcept
-    {
-        return std::make_tuple(job.mProcessTime, job.mChangeType, job.mTryNumber, job.mDistanceToPlayer, job.mDistanceToOrigin);
-    }
+        struct LessByJobPriority
+        {
+            bool operator()(JobIt lhs, JobIt rhs) const noexcept
+            {
+                return getPriority(*lhs) < getPriority(*rhs);
+            }
+        };
 
-    struct LessByJobPriority
-    {
-        bool operator()(JobIt lhs, JobIt rhs) const noexcept
+        void insertPrioritizedJob(JobIt job, std::deque<JobIt>& queue)
         {
-            return getPriority(*lhs) < getPriority(*rhs);
+            const auto it = std::upper_bound(queue.begin(), queue.end(), job, LessByJobPriority {});
+            queue.insert(it, job);
         }
-    };
 
-    void insertPrioritizedJob(JobIt job, std::deque<JobIt>& queue)
-    {
-        const auto it = std::upper_bound(queue.begin(), queue.end(), job, LessByJobPriority {});
-        queue.insert(it, job);
-    }
+        auto getDbPriority(const Job& job) noexcept
+        {
+            return std::make_tuple(static_cast<std::underlying_type_t<JobState>>(job.mState),
+                                   job.mChangeType, job.mDistanceToPlayer, job.mDistanceToOrigin);
+        }
 
-    auto getAgentAndTile(const Job& job) noexcept
-    {
-        return std::make_tuple(job.mAgentHalfExtents, job.mChangedTile);
+        struct LessByJobDbPriority
+        {
+            bool operator()(JobIt lhs, JobIt rhs) const noexcept
+            {
+                return getDbPriority(*lhs) < getDbPriority(*rhs);
+            }
+        };
+
+        void insertPrioritizedDbJob(JobIt job, std::deque<JobIt>& queue)
+        {
+            const auto it = std::upper_bound(queue.begin(), queue.end(), job, LessByJobDbPriority {});
+            queue.insert(it, job);
+        }
+
+        auto getAgentAndTile(const Job& job) noexcept
+        {
+            return std::make_tuple(job.mAgentHalfExtents, job.mChangedTile);
+        }
+
+        std::unique_ptr<DbWorker> makeDbWorker(AsyncNavMeshUpdater& updater, std::unique_ptr<NavMeshDb>&& db, const Settings& settings)
+        {
+            if (db == nullptr)
+                return nullptr;
+            return std::make_unique<DbWorker>(updater, std::move(db), TileVersion(settings.mNavMeshVersion), settings.mRecast);
+        }
+
+        void updateJobs(std::deque<JobIt>& jobs, TilePosition playerTile, int maxTiles)
+        {
+            for (JobIt job : jobs)
+            {
+                job->mDistanceToPlayer = getManhattanDistance(job->mChangedTile, playerTile);
+                if (!shouldAddTile(job->mChangedTile, playerTile, maxTiles))
+                    job->mChangeType = ChangeType::remove;
+            }
+        }
+
+        std::size_t getNextJobId()
+        {
+            static std::atomic_size_t nextJobId {1};
+            return nextJobId.fetch_add(1);
+        }
     }
-}
 
-namespace DetourNavigator
-{
     Job::Job(const osg::Vec3f& agentHalfExtents, std::weak_ptr<GuardedNavMeshCacheItem> navMeshCacheItem,
         std::string_view worldspace, const TilePosition& changedTile, ChangeType changeType, int distanceToPlayer,
         std::chrono::steady_clock::time_point processTime)
-        : mAgentHalfExtents(agentHalfExtents)
+        : mId(getNextJobId())
+        , mAgentHalfExtents(agentHalfExtents)
         , mNavMeshCacheItem(std::move(navMeshCacheItem))
         , mWorldspace(worldspace)
         , mChangedTile(changedTile)
@@ -94,9 +129,9 @@ namespace DetourNavigator
         : mSettings(settings)
         , mRecastMeshManager(recastMeshManager)
         , mOffMeshConnectionsManager(offMeshConnectionsManager)
-        , mDb(std::move(db))
         , mShouldStop()
         , mNavMeshTilesCache(settings.mMaxNavMeshTilesCacheSize)
+        , mDbWorker(makeDbWorker(*this, std::move(db), mSettings))
     {
         for (std::size_t i = 0; i < mSettings.get().mAsyncNavMeshUpdaterThreads; ++i)
             mThreads.emplace_back([&] { process(); });
@@ -105,6 +140,8 @@ namespace DetourNavigator
     AsyncNavMeshUpdater::~AsyncNavMeshUpdater()
     {
         mShouldStop = true;
+        if (mDbWorker != nullptr)
+            mDbWorker->stop();
         std::unique_lock<std::mutex> lock(mMutex);
         mWaiting.clear();
         mHasJob.notify_all();
@@ -128,18 +165,12 @@ namespace DetourNavigator
             return;
 
         const dtNavMeshParams params = *navMeshCacheItem->lockConst()->getImpl().getParams();
+        const int maxTiles = std::min(mSettings.get().mMaxTilesNumber, params.maxTiles);
 
-        const std::lock_guard<std::mutex> lock(mMutex);
+        std::unique_lock lock(mMutex);
 
         if (playerTileChanged)
-        {
-            for (JobIt job : mWaiting)
-            {
-                job->mDistanceToPlayer = getManhattanDistance(job->mChangedTile, playerTile);
-                if (!shouldAddTile(job->mChangedTile, playerTile, std::min(mSettings.get().mMaxTilesNumber, params.maxTiles)))
-                    job->mChangeType = ChangeType::remove;
-            }
-        }
+            updateJobs(mWaiting, playerTile, maxTiles);
 
         for (const auto& [changedTile, changeType] : changedTiles)
         {
@@ -152,6 +183,9 @@ namespace DetourNavigator
                 const JobIt it = mJobs.emplace(mJobs.end(), agentHalfExtents, navMeshCacheItem, worldspace,
                     changedTile, changeType, getManhattanDistance(changedTile, playerTile), processTime);
 
+                Log(Debug::Debug) << "Post job " << it->mId << " for agent=(" << it->mAgentHalfExtents << ")"
+                    << " changedTile=(" << it->mChangedTile << ")";
+
                 if (playerTileChanged)
                     mWaiting.push_back(it);
                 else
@@ -166,6 +200,11 @@ namespace DetourNavigator
 
         if (!mWaiting.empty())
             mHasJob.notify_all();
+
+        lock.unlock();
+
+        if (playerTileChanged && mDbWorker != nullptr)
+            mDbWorker->updateJobs(playerTile, maxTiles);
     }
 
     void AsyncNavMeshUpdater::wait(Loading::Listener& listener, WaitConditionType waitConditionType)
@@ -243,25 +282,40 @@ namespace DetourNavigator
         mProcessingTiles.wait(mProcessed, [] (const auto& v) { return v.empty(); });
     }
 
-    void AsyncNavMeshUpdater::reportStats(unsigned int frameNumber, osg::Stats& stats) const
+    AsyncNavMeshUpdater::Stats AsyncNavMeshUpdater::getStats() const
     {
-        std::size_t jobs = 0;
-        std::size_t waiting = 0;
-        std::size_t pushed = 0;
-
+        Stats result;
         {
             const std::lock_guard<std::mutex> lock(mMutex);
-            jobs = mJobs.size();
-            waiting = mWaiting.size();
-            pushed = mPushed.size();
+            result.mJobs = mJobs.size();
+            result.mWaiting = mWaiting.size();
+            result.mPushed = mPushed.size();
         }
+        result.mProcessing = mProcessingTiles.lockConst()->size();
+        if (mDbWorker != nullptr)
+            result.mDb = mDbWorker->getStats();
+        result.mCache = mNavMeshTilesCache.getStats();
+        result.mDbGetTileHits = mDbGetTileHits.load(std::memory_order_relaxed);
+        return result;
+    }
 
-        stats.setAttribute(frameNumber, "NavMesh Jobs", jobs);
-        stats.setAttribute(frameNumber, "NavMesh Waiting", waiting);
-        stats.setAttribute(frameNumber, "NavMesh Pushed", pushed);
-        stats.setAttribute(frameNumber, "NavMesh Processing", mProcessingTiles.lockConst()->size());
+    void reportStats(const AsyncNavMeshUpdater::Stats& stats, unsigned int frameNumber, osg::Stats& out)
+    {
+        out.setAttribute(frameNumber, "NavMesh Jobs", static_cast<double>(stats.mJobs));
+        out.setAttribute(frameNumber, "NavMesh Waiting", static_cast<double>(stats.mWaiting));
+        out.setAttribute(frameNumber, "NavMesh Pushed", static_cast<double>(stats.mPushed));
+        out.setAttribute(frameNumber, "NavMesh Processing", static_cast<double>(stats.mProcessing));
 
-        mNavMeshTilesCache.reportStats(frameNumber, stats);
+        if (stats.mDb.has_value())
+        {
+            out.setAttribute(frameNumber, "NavMesh DbJobs", static_cast<double>(stats.mDb->mJobs));
+
+            if (stats.mDb->mGetTileCount > 0)
+                out.setAttribute(frameNumber, "NavMesh DbCacheHitRate", static_cast<double>(stats.mDbGetTileHits)
+                                    / static_cast<double>(stats.mDb->mGetTileCount) * 100.0);
+        }
+
+        reportStats(stats.mCache, frameNumber, out);
     }
 
     void AsyncNavMeshUpdater::process() noexcept
@@ -274,12 +328,26 @@ namespace DetourNavigator
             {
                 if (JobIt job = getNextJob(); job != mJobs.end())
                 {
-                    const auto processed = processJob(*job);
-                    unlockTile(job->mAgentHalfExtents, job->mChangedTile);
-                    if (processed)
-                        removeJob(job);
-                    else
-                        repost(job);
+                    const JobStatus status = processJob(*job);
+                    Log(Debug::Debug) << "Processed job " << job->mId << " with status=" << status;
+                    switch (status)
+                    {
+                        case JobStatus::Done:
+                            unlockTile(job->mAgentHalfExtents, job->mChangedTile);
+                            if (job->mGeneratedNavMeshData != nullptr)
+                                mDbWorker->enqueueJob(job);
+                            else
+                                removeJob(job);
+                            break;
+                        case JobStatus::Fail:
+                            repost(job);
+                            break;
+                        case JobStatus::MemoryCacheMiss:
+                        {
+                            mDbWorker->enqueueJob(job);
+                            break;
+                        }
+                    }
                 }
                 else
                     cleanupLastUpdates();
@@ -292,34 +360,156 @@ namespace DetourNavigator
         Log(Debug::Debug) << "Stop navigator jobs processing by thread=" << std::this_thread::get_id();
     }
 
-    bool AsyncNavMeshUpdater::processJob(const Job& job)
+    JobStatus AsyncNavMeshUpdater::processJob(Job& job)
     {
-        Log(Debug::Debug) << "Process job for agent=(" << std::fixed << std::setprecision(2) << job.mAgentHalfExtents << ")"
-            " by thread=" << std::this_thread::get_id();
-
-        const auto start = std::chrono::steady_clock::now();
+        Log(Debug::Debug) << "Processing job " << job.mId << " by thread=" << std::this_thread::get_id();
 
         const auto navMeshCacheItem = job.mNavMeshCacheItem.lock();
 
         if (!navMeshCacheItem)
-            return true;
+            return JobStatus::Done;
 
-        const auto recastMesh = mRecastMeshManager.get().getMesh(job.mWorldspace, job.mChangedTile);
         const auto playerTile = *mPlayerTile.lockConst();
+        const auto params = *navMeshCacheItem->lockConst()->getImpl().getParams();
+
+        if (!shouldAddTile(job.mChangedTile, playerTile, std::min(mSettings.get().mMaxTilesNumber, params.maxTiles)))
+        {
+            Log(Debug::Debug) << "Ignore add tile by job " << job.mId << ": too far from player";
+            navMeshCacheItem->lock()->removeTile(job.mChangedTile);
+            return JobStatus::Done;
+        }
+
+        switch (job.mState)
+        {
+            case JobState::Initial:
+                return processInitialJob(job, *navMeshCacheItem);
+            case JobState::WithDbResult:
+                return processJobWithDbResult(job, *navMeshCacheItem);
+        }
+
+        return JobStatus::Done;
+    }
+
+    JobStatus AsyncNavMeshUpdater::processInitialJob(Job& job, GuardedNavMeshCacheItem& navMeshCacheItem)
+    {
+        Log(Debug::Debug) << "Processing initial job " << job.mId;
+
+        std::shared_ptr<RecastMesh> recastMesh = mRecastMeshManager.get().getMesh(job.mWorldspace, job.mChangedTile);
+
+        if (recastMesh == nullptr)
+        {
+            Log(Debug::Debug) << "Null recast mesh for job " << job.mId;
+            navMeshCacheItem.lock()->markAsEmpty(job.mChangedTile);
+            return JobStatus::Done;
+        }
+
+        if (isEmpty(*recastMesh))
+        {
+            Log(Debug::Debug) << "Empty bounds for job " << job.mId;
+            navMeshCacheItem.lock()->markAsEmpty(job.mChangedTile);
+            return JobStatus::Done;
+        }
+
+        NavMeshTilesCache::Value cachedNavMeshData = mNavMeshTilesCache.get(job.mAgentHalfExtents, job.mChangedTile, *recastMesh);
+        std::unique_ptr<PreparedNavMeshData> preparedNavMeshData;
+        const PreparedNavMeshData* preparedNavMeshDataPtr = nullptr;
+
+        if (cachedNavMeshData)
+        {
+            preparedNavMeshDataPtr = &cachedNavMeshData.get();
+        }
+        else
+        {
+            if (job.mChangeType != ChangeType::update && mDbWorker != nullptr)
+            {
+                job.mRecastMesh = std::move(recastMesh);
+                return JobStatus::MemoryCacheMiss;
+            }
+
+            preparedNavMeshData = prepareNavMeshTileData(*recastMesh, job.mChangedTile, job.mAgentHalfExtents, mSettings.get().mRecast);
+
+            if (preparedNavMeshData == nullptr)
+            {
+                Log(Debug::Debug) << "Null navmesh data for job " << job.mId;
+                navMeshCacheItem.lock()->markAsEmpty(job.mChangedTile);
+                return JobStatus::Done;
+            }
+
+            if (job.mChangeType == ChangeType::update)
+            {
+                preparedNavMeshDataPtr = preparedNavMeshData.get();
+            }
+            else
+            {
+                cachedNavMeshData = mNavMeshTilesCache.set(job.mAgentHalfExtents, job.mChangedTile,
+                                                           *recastMesh, std::move(preparedNavMeshData));
+                preparedNavMeshDataPtr = cachedNavMeshData ? &cachedNavMeshData.get() : preparedNavMeshData.get();
+            }
+        }
+
         const auto offMeshConnections = mOffMeshConnectionsManager.get().get(job.mChangedTile);
 
-        const auto status = updateNavMesh(job.mAgentHalfExtents, recastMesh.get(), job.mWorldspace, job.mChangedTile,
-            playerTile, offMeshConnections, mSettings, navMeshCacheItem, mNavMeshTilesCache,
-            getUpdateType(job.mChangeType), mDb, mNextShapeId);
+        const UpdateNavMeshStatus status = navMeshCacheItem.lock()->updateTile(job.mChangedTile, std::move(cachedNavMeshData),
+            makeNavMeshTileData(*preparedNavMeshDataPtr, offMeshConnections, job.mAgentHalfExtents, job.mChangedTile, mSettings.get().mRecast));
+
+        return handleUpdateNavMeshStatus(status, job, navMeshCacheItem, *recastMesh);
+    }
+
+    JobStatus AsyncNavMeshUpdater::processJobWithDbResult(Job& job, GuardedNavMeshCacheItem& navMeshCacheItem)
+    {
+        Log(Debug::Debug) << "Processing job with db result " << job.mId;
+
+        std::unique_ptr<PreparedNavMeshData> preparedNavMeshData;
+        bool generatedNavMeshData = false;
+
+        if (job.mCachedTileData.has_value() && job.mCachedTileData->mVersion == mSettings.get().mNavMeshVersion)
+        {
+            preparedNavMeshData = std::make_unique<PreparedNavMeshData>();
+            if (deserialize(job.mCachedTileData->mData, *preparedNavMeshData))
+                ++mDbGetTileHits;
+            else
+                preparedNavMeshData = nullptr;
+        }
+
+        if (preparedNavMeshData == nullptr)
+        {
+            preparedNavMeshData = prepareNavMeshTileData(*job.mRecastMesh, job.mChangedTile, job.mAgentHalfExtents, mSettings.get().mRecast);
+            generatedNavMeshData = true;
+        }
 
-        if (recastMesh != nullptr)
+        if (preparedNavMeshData == nullptr)
         {
-            const Version navMeshVersion = navMeshCacheItem->lockConst()->getVersion();
-            mRecastMeshManager.get().reportNavMeshChange(job.mChangedTile,
-                Version {recastMesh->getGeneration(), recastMesh->getRevision()},
-                navMeshVersion);
+            Log(Debug::Debug) << "Null navmesh data for job " << job.mId;
+            navMeshCacheItem.lock()->markAsEmpty(job.mChangedTile);
+            return JobStatus::Done;
         }
 
+        auto cachedNavMeshData = mNavMeshTilesCache.set(job.mAgentHalfExtents, job.mChangedTile, *job.mRecastMesh,
+                                                        std::move(preparedNavMeshData));
+
+        const auto offMeshConnections = mOffMeshConnectionsManager.get().get(job.mChangedTile);
+
+        const PreparedNavMeshData* preparedNavMeshDataPtr = cachedNavMeshData ? &cachedNavMeshData.get() : preparedNavMeshData.get();
+        const UpdateNavMeshStatus status = navMeshCacheItem.lock()->updateTile(job.mChangedTile, std::move(cachedNavMeshData),
+            makeNavMeshTileData(*preparedNavMeshDataPtr, offMeshConnections, job.mAgentHalfExtents, job.mChangedTile, mSettings.get().mRecast));
+
+        const JobStatus result = handleUpdateNavMeshStatus(status, job, navMeshCacheItem, *job.mRecastMesh);
+
+        if (result == JobStatus::Done && job.mChangeType != ChangeType::update
+                && mDbWorker != nullptr && mSettings.get().mWriteToNavMeshDb && generatedNavMeshData)
+            job.mGeneratedNavMeshData = std::make_unique<PreparedNavMeshData>(*preparedNavMeshDataPtr);
+
+        return result;
+    }
+
+    JobStatus AsyncNavMeshUpdater::handleUpdateNavMeshStatus(UpdateNavMeshStatus status,
+        const Job& job, const GuardedNavMeshCacheItem& navMeshCacheItem, const RecastMesh& recastMesh)
+    {
+        const Version navMeshVersion = navMeshCacheItem.lockConst()->getVersion();
+        mRecastMeshManager.get().reportNavMeshChange(job.mChangedTile,
+            Version {recastMesh.getGeneration(), recastMesh.getRevision()},
+            navMeshVersion);
+
         if (status == UpdateNavMeshStatus::removed || status == UpdateNavMeshStatus::lost)
         {
             const std::scoped_lock lock(mMutex);
@@ -331,23 +521,9 @@ namespace DetourNavigator
             mPresentTiles.insert(std::make_tuple(job.mAgentHalfExtents, job.mChangedTile));
         }
 
-        const auto finish = std::chrono::steady_clock::now();
-
-        writeDebugFiles(job, recastMesh.get());
-
-        using FloatMs = std::chrono::duration<float, std::milli>;
+        writeDebugFiles(job, &recastMesh);
 
-        const Version version = navMeshCacheItem->lockConst()->getVersion();
-        Log(Debug::Debug) << std::fixed << std::setprecision(2) <<
-            "Cache updated for agent=(" << job.mAgentHalfExtents << ")" <<
-            " tile=" << job.mChangedTile <<
-            " status=" << status <<
-            " generation=" << version.mGeneration <<
-            " revision=" << version.mRevision <<
-            " time=" << std::chrono::duration_cast<FloatMs>(finish - start).count() << "ms" <<
-            " thread=" << std::this_thread::get_id();
-
-        return isSuccess(status);
+        return isSuccess(status) ? JobStatus::Done : JobStatus::Fail;
     }
 
     JobIt AsyncNavMeshUpdater::getNextJob()
@@ -376,8 +552,12 @@ namespace DetourNavigator
 
         mWaiting.pop_front();
 
+        if (job->mRecastMesh != nullptr)
+            return job;
+
         if (!lockTile(job->mAgentHalfExtents, job->mChangedTile))
         {
+            Log(Debug::Debug) << "Failed to lock tile by " << job->mId;
             ++job->mTryNumber;
             insertPrioritizedJob(job, mWaiting);
             return mJobs.end();
@@ -415,6 +595,8 @@ namespace DetourNavigator
 
     void AsyncNavMeshUpdater::repost(JobIt job)
     {
+        unlockTile(job->mAgentHalfExtents, job->mChangedTile);
+
         if (mShouldStop || job->mTryNumber > 2)
             return;
 
@@ -433,17 +615,15 @@ namespace DetourNavigator
 
     bool AsyncNavMeshUpdater::lockTile(const osg::Vec3f& agentHalfExtents, const TilePosition& changedTile)
     {
-        if (mSettings.get().mAsyncNavMeshUpdaterThreads <= 1)
-            return true;
+        Log(Debug::Debug) << "Locking tile agent=(" << agentHalfExtents << ") changedTile=(" << changedTile << ")";
         return mProcessingTiles.lock()->emplace(agentHalfExtents, changedTile).second;
     }
 
     void AsyncNavMeshUpdater::unlockTile(const osg::Vec3f& agentHalfExtents, const TilePosition& changedTile)
     {
-        if (mSettings.get().mAsyncNavMeshUpdaterThreads <= 1)
-            return;
         auto locked = mProcessingTiles.lock();
         locked->erase(std::tie(agentHalfExtents, changedTile));
+        Log(Debug::Debug) << "Unlocked tile agent=(" << agentHalfExtents << ") changedTile=(" << changedTile << ")";
         if (locked->empty())
             mProcessed.notify_all();
     }
@@ -469,9 +649,201 @@ namespace DetourNavigator
         }
     }
 
+    void AsyncNavMeshUpdater::enqueueJob(JobIt job)
+    {
+        Log(Debug::Debug) << "Enqueueing job " << job->mId << " by thread=" << std::this_thread::get_id();
+        const std::lock_guard lock(mMutex);
+        insertPrioritizedJob(job, mWaiting);
+        mHasJob.notify_all();
+    }
+
     void AsyncNavMeshUpdater::removeJob(JobIt job)
     {
+        Log(Debug::Debug) << "Removing job " << job->mId << " by thread=" << std::this_thread::get_id();
         const std::lock_guard lock(mMutex);
         mJobs.erase(job);
     }
+
+    void DbJobQueue::push(JobIt job)
+    {
+        const std::lock_guard lock(mMutex);
+        insertPrioritizedDbJob(job, mJobs);
+        mHasJob.notify_all();
+    }
+
+    std::optional<JobIt> DbJobQueue::pop()
+    {
+        std::unique_lock lock(mMutex);
+        mHasJob.wait(lock, [&] { return mShouldStop || !mJobs.empty(); });
+        if (mJobs.empty())
+            return std::nullopt;
+        const JobIt job = mJobs.front();
+        mJobs.pop_front();
+        return job;
+    }
+
+    void DbJobQueue::update(TilePosition playerTile, int maxTiles)
+    {
+        const std::lock_guard lock(mMutex);
+        updateJobs(mJobs, playerTile, maxTiles);
+        std::sort(mJobs.begin(), mJobs.end(), LessByJobDbPriority {});
+    }
+
+    void DbJobQueue::stop()
+    {
+        const std::lock_guard lock(mMutex);
+        mJobs.clear();
+        mShouldStop = true;
+        mHasJob.notify_all();
+    }
+
+    std::size_t DbJobQueue::size() const
+    {
+        const std::lock_guard lock(mMutex);
+        return mJobs.size();
+    }
+
+    DbWorker::DbWorker(AsyncNavMeshUpdater& updater, std::unique_ptr<NavMeshDb>&& db,
+        TileVersion version, const RecastSettings& recastSettings)
+        : mUpdater(updater)
+        , mRecastSettings(recastSettings)
+        , mDb(std::move(db))
+        , mVersion(version)
+        , mNextTileId(mDb->getMaxTileId() + 1)
+        , mNextShapeId(mDb->getMaxShapeId() + 1)
+        , mThread([this] { run(); })
+    {
+    }
+
+    DbWorker::~DbWorker()
+    {
+        stop();
+        mThread.join();
+    }
+
+    void DbWorker::enqueueJob(JobIt job)
+    {
+        Log(Debug::Debug) << "Enqueueing db job " << job->mId << " by thread=" << std::this_thread::get_id();
+        mQueue.push(job);
+    }
+
+    DbWorker::Stats DbWorker::getStats() const
+    {
+        Stats result;
+        result.mJobs = mQueue.size();
+        result.mGetTileCount = mGetTileCount.load(std::memory_order::memory_order_relaxed);
+        return result;
+    }
+
+    void DbWorker::stop()
+    {
+        mShouldStop = true;
+        mQueue.stop();
+    }
+
+    void DbWorker::run() noexcept
+    {
+        constexpr std::size_t writesPerTransaction = 100;
+        auto transaction = mDb->startTransaction();
+        while (!mShouldStop)
+        {
+            try
+            {
+                if (const auto job = mQueue.pop())
+                    processJob(*job);
+                if (mWrites > writesPerTransaction)
+                {
+                    mWrites = 0;
+                    transaction.commit();
+                    transaction = mDb->startTransaction();
+                }
+            }
+            catch (const std::exception& e)
+            {
+                Log(Debug::Error) << "DbWorker exception: " << e.what();
+            }
+        }
+        transaction.commit();
+    }
+
+    void DbWorker::processJob(JobIt job)
+    {
+        const auto process = [&] (auto f)
+        {
+            try
+            {
+                f(job);
+            }
+            catch (const std::exception& e)
+            {
+                Log(Debug::Error) << "DbWorker exception while processing job " << job->mId << ": " << e.what();
+            }
+        };
+
+        if (job->mGeneratedNavMeshData != nullptr)
+        {
+            process([&] (JobIt job) { processWritingJob(job); });
+            mUpdater.removeJob(job);
+            return;
+        }
+
+        process([&] (JobIt job) { processReadingJob(job); });
+        job->mState = JobState::WithDbResult;
+        mUpdater.enqueueJob(job);
+    }
+
+    void DbWorker::processReadingJob(JobIt job)
+    {
+        Log(Debug::Debug) << "Processing db read job " << job->mId;
+
+        if (job->mInput.empty())
+        {
+            Log(Debug::Debug) << "Serializing input for job " << job->mId;
+            const ShapeId shapeId = mNextShapeId;
+            const std::vector<DbRefGeometryObject> objects = makeDbRefGeometryObjects(job->mRecastMesh->getMeshSources(),
+                [&] (const MeshSource& v) { return resolveMeshSource(*mDb, v, mNextShapeId); });
+            if (shapeId != mNextShapeId)
+                ++mWrites;
+            job->mInput = serialize(mRecastSettings, *job->mRecastMesh, objects);
+        }
+
+        job->mCachedTileData = mDb->getTileData(job->mWorldspace, job->mChangedTile, job->mInput);
+        ++mGetTileCount;
+    }
+
+    void DbWorker::processWritingJob(JobIt job)
+    {
+        ++mWrites;
+
+        Log(Debug::Debug) << "Processing db write job " << job->mId;
+
+        if (job->mInput.empty())
+        {
+            Log(Debug::Debug) << "Serializing input for job " << job->mId;
+            const std::vector<DbRefGeometryObject> objects = makeDbRefGeometryObjects(job->mRecastMesh->getMeshSources(),
+                [&] (const MeshSource& v) { return resolveMeshSource(*mDb, v, mNextShapeId); });
+            job->mInput = serialize(mRecastSettings, *job->mRecastMesh, objects);
+        }
+
+        if (const auto& cachedTileData = job->mCachedTileData)
+        {
+            Log(Debug::Debug) << "Update db tile by job " << job->mId;
+            job->mGeneratedNavMeshData->mUserId = cachedTileData->mTileId;
+            mDb->updateTile(cachedTileData->mTileId, mVersion, serialize(*job->mGeneratedNavMeshData));
+            return;
+        }
+
+        const auto cached = mDb->findTile(job->mWorldspace, job->mChangedTile, job->mInput);
+        if (cached.has_value() && cached->mVersion == mVersion)
+        {
+            Log(Debug::Debug) << "Ignore existing db tile by job " << job->mId;
+            return;
+        }
+
+        job->mGeneratedNavMeshData->mUserId = mNextTileId;
+        Log(Debug::Debug) << "Insert db tile by job " << job->mId;
+        mDb->insertTile(mNextTileId, job->mWorldspace, job->mChangedTile,
+                        mVersion, job->mInput, serialize(*job->mGeneratedNavMeshData));
+        ++mNextTileId.t;
+    }
 }
diff --git a/components/detournavigator/asyncnavmeshupdater.hpp b/components/detournavigator/asyncnavmeshupdater.hpp
index 44d5be58d5..541d86fe9c 100644
--- a/components/detournavigator/asyncnavmeshupdater.hpp
+++ b/components/detournavigator/asyncnavmeshupdater.hpp
@@ -21,6 +21,7 @@
 #include <thread>
 #include <tuple>
 #include <list>
+#include <optional>
 
 class dtNavMesh;
 
@@ -54,8 +55,15 @@ namespace DetourNavigator
         return stream << "ChangeType::" << static_cast<int>(value);
     }
 
+    enum class JobState
+    {
+        Initial,
+        WithDbResult,
+    };
+
     struct Job
     {
+        const std::size_t mId;
         const osg::Vec3f mAgentHalfExtents;
         const std::weak_ptr<GuardedNavMeshCacheItem> mNavMeshCacheItem;
         const std::string mWorldspace;
@@ -65,6 +73,11 @@ namespace DetourNavigator
         ChangeType mChangeType;
         int mDistanceToPlayer;
         const int mDistanceToOrigin;
+        JobState mState = JobState::Initial;
+        std::vector<std::byte> mInput;
+        std::shared_ptr<RecastMesh> mRecastMesh;
+        std::optional<TileData> mCachedTileData;
+        std::unique_ptr<PreparedNavMeshData> mGeneratedNavMeshData;
 
         Job(const osg::Vec3f& agentHalfExtents, std::weak_ptr<GuardedNavMeshCacheItem> navMeshCacheItem,
             std::string_view worldspace, const TilePosition& changedTile, ChangeType changeType, int distanceToPlayer,
@@ -73,27 +86,124 @@ namespace DetourNavigator
 
     using JobIt = std::list<Job>::iterator;
 
+    enum class JobStatus
+    {
+        Done,
+        Fail,
+        MemoryCacheMiss,
+    };
+
+    inline std::ostream& operator<<(std::ostream& stream, JobStatus value)
+    {
+        switch (value)
+        {
+            case JobStatus::Done: return stream << "JobStatus::Done";
+            case JobStatus::Fail: return stream << "JobStatus::Fail";
+            case JobStatus::MemoryCacheMiss: return stream << "JobStatus::MemoryCacheMiss";
+        }
+        return stream << "JobStatus::" << static_cast<std::underlying_type_t<JobState>>(value);
+    }
+
+    class DbJobQueue
+    {
+    public:
+        void push(JobIt job);
+
+        std::optional<JobIt> pop();
+
+        void update(TilePosition playerTile, int maxTiles);
+
+        void stop();
+
+        std::size_t size() const;
+
+    private:
+        mutable std::mutex mMutex;
+        std::condition_variable mHasJob;
+        std::deque<JobIt> mJobs;
+        bool mShouldStop = false;
+    };
+
+    class AsyncNavMeshUpdater;
+
+    class DbWorker
+    {
+    public:
+        struct Stats
+        {
+            std::size_t mJobs = 0;
+            std::size_t mGetTileCount = 0;
+        };
+
+        DbWorker(AsyncNavMeshUpdater& updater, std::unique_ptr<NavMeshDb>&& db,
+            TileVersion version, const RecastSettings& recastSettings);
+
+        ~DbWorker();
+
+        Stats getStats() const;
+
+        void enqueueJob(JobIt job);
+
+        void updateJobs(TilePosition playerTile, int maxTiles) { mQueue.update(playerTile, maxTiles); }
+
+        void stop();
+
+    private:
+        AsyncNavMeshUpdater& mUpdater;
+        const RecastSettings& mRecastSettings;
+        const std::unique_ptr<NavMeshDb> mDb;
+        const TileVersion mVersion;
+        TileId mNextTileId;
+        ShapeId mNextShapeId;
+        DbJobQueue mQueue;
+        std::atomic_bool mShouldStop {false};
+        std::atomic_size_t mGetTileCount {0};
+        std::size_t mWrites = 0;
+        std::thread mThread;
+
+        inline void run() noexcept;
+
+        inline void processJob(JobIt job);
+
+        inline void processReadingJob(JobIt job);
+
+        inline void processWritingJob(JobIt job);
+    };
+
     class AsyncNavMeshUpdater
     {
     public:
+        struct Stats
+        {
+            std::size_t mJobs = 0;
+            std::size_t mWaiting = 0;
+            std::size_t mPushed = 0;
+            std::size_t mProcessing = 0;
+            std::size_t mDbGetTileHits = 0;
+            std::optional<DbWorker::Stats> mDb;
+            NavMeshTilesCache::Stats mCache;
+        };
+
         AsyncNavMeshUpdater(const Settings& settings, TileCachedRecastMeshManager& recastMeshManager,
             OffMeshConnectionsManager& offMeshConnectionsManager, std::unique_ptr<NavMeshDb>&& db);
         ~AsyncNavMeshUpdater();
 
-        void post(const osg::Vec3f& agentHalfExtents, const SharedNavMeshCacheItem& mNavMeshCacheItem,
+        void post(const osg::Vec3f& agentHalfExtents, const SharedNavMeshCacheItem& navMeshCacheItem,
             const TilePosition& playerTile, std::string_view worldspace,
             const std::map<TilePosition, ChangeType>& changedTiles);
 
         void wait(Loading::Listener& listener, WaitConditionType waitConditionType);
 
-        void reportStats(unsigned int frameNumber, osg::Stats& stats) const;
+        Stats getStats() const;
+
+        void enqueueJob(JobIt job);
+
+        void removeJob(JobIt job);
 
     private:
         std::reference_wrapper<const Settings> mSettings;
         std::reference_wrapper<TileCachedRecastMeshManager> mRecastMeshManager;
         std::reference_wrapper<OffMeshConnectionsManager> mOffMeshConnectionsManager;
-        Misc::ScopeGuarded<std::unique_ptr<NavMeshDb>> mDb;
-        ShapeId mNextShapeId {1};
         std::atomic_bool mShouldStop;
         mutable std::mutex mMutex;
         std::condition_variable mHasJob;
@@ -108,14 +218,21 @@ namespace DetourNavigator
         std::map<std::tuple<osg::Vec3f, TilePosition>, std::chrono::steady_clock::time_point> mLastUpdates;
         std::set<std::tuple<osg::Vec3f, TilePosition>> mPresentTiles;
         std::vector<std::thread> mThreads;
+        std::unique_ptr<DbWorker> mDbWorker;
+        std::atomic_size_t mDbGetTileHits {0};
 
         void process() noexcept;
 
-        bool processJob(const Job& job);
+        JobStatus processJob(Job& job);
 
-        JobIt getNextJob();
+        inline JobStatus processInitialJob(Job& job, GuardedNavMeshCacheItem& navMeshCacheItem);
+
+        inline JobStatus processJobWithDbResult(Job& job, GuardedNavMeshCacheItem& navMeshCacheItem);
+
+        inline JobStatus handleUpdateNavMeshStatus(UpdateNavMeshStatus status, const Job& job,
+            const GuardedNavMeshCacheItem& navMeshCacheItem, const RecastMesh& recastMesh);
 
-        JobIt getJob(std::deque<JobIt>& jobs, bool changeLastUpdate);
+        JobIt getNextJob();
 
         void postThreadJob(JobIt job, std::deque<JobIt>& queue);
 
@@ -134,9 +251,9 @@ namespace DetourNavigator
         int waitUntilJobsDoneForNotPresentTiles(const std::size_t initialJobsLeft, std::size_t& maxJobsLeft, Loading::Listener& listener);
 
         void waitUntilAllJobsDone();
-
-        inline void removeJob(JobIt job);
     };
+
+    void reportStats(const AsyncNavMeshUpdater::Stats& stats, unsigned int frameNumber, osg::Stats& out);
 }
 
 #endif
diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index 8b764b91b4..070a227454 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -544,89 +544,4 @@ namespace DetourNavigator
 
         return navMesh;
     }
-
-    UpdateNavMeshStatus updateNavMesh(const osg::Vec3f& agentHalfExtents, const RecastMesh* recastMesh,
-        const std::string& worldspace, const TilePosition& changedTile, const TilePosition& playerTile,
-        const std::vector<OffMeshConnection>& offMeshConnections, const Settings& settings,
-        const SharedNavMeshCacheItem& navMeshCacheItem, NavMeshTilesCache& navMeshTilesCache, UpdateType updateType,
-        Misc::ScopeGuarded<std::unique_ptr<NavMeshDb>>& db, ShapeId& nextShapeId)
-    {
-        Log(Debug::Debug) << std::fixed << std::setprecision(2) <<
-            "Update NavMesh with multiple tiles:" <<
-            " agentHeight=" << getHeight(settings.mRecast, agentHalfExtents) <<
-            " agentMaxClimb=" << getMaxClimb(settings.mRecast) <<
-            " agentRadius=" << getRadius(settings.mRecast, agentHalfExtents) <<
-            " changedTile=(" << changedTile << ")" <<
-            " playerTile=(" << playerTile << ")" <<
-            " changedTileDistance=" << getDistance(changedTile, playerTile);
-
-        if (!recastMesh)
-        {
-            Log(Debug::Debug) << "Ignore add tile: recastMesh is null";
-            return navMeshCacheItem->lock()->removeTile(changedTile);
-        }
-
-        if (isEmpty(*recastMesh))
-        {
-            Log(Debug::Debug) << "Ignore add tile: recastMesh is empty";
-            return navMeshCacheItem->lock()->removeTile(changedTile);
-        }
-
-        const dtNavMeshParams params = *navMeshCacheItem->lockConst()->getImpl().getParams();
-
-        if (!shouldAddTile(changedTile, playerTile, std::min(settings.mMaxTilesNumber, params.maxTiles)))
-        {
-            Log(Debug::Debug) << "Ignore add tile: too far from player";
-            return navMeshCacheItem->lock()->removeTile(changedTile);
-        }
-
-        auto cachedNavMeshData = navMeshTilesCache.get(agentHalfExtents, changedTile, *recastMesh);
-        bool cached = static_cast<bool>(cachedNavMeshData);
-
-        if (!cachedNavMeshData)
-        {
-            std::optional<TileData> stored;
-            if (const auto dbLocked = db.lock(); *dbLocked != nullptr)
-            {
-                const std::vector<DbRefGeometryObject> objects = makeDbRefGeometryObjects(recastMesh->getMeshSources(),
-                    [&] (const MeshSource& v) { return resolveMeshSource(**dbLocked, v, nextShapeId); });
-                stored = (*dbLocked)->getTileData(worldspace, changedTile, serialize(settings.mRecast, *recastMesh, objects));
-            }
-
-            std::unique_ptr<PreparedNavMeshData> prepared;
-            if (stored.has_value() && stored->mVersion == settings.mNavMeshVersion)
-            {
-                prepared = std::make_unique<PreparedNavMeshData>();
-                if (!deserialize(stored->mData, *prepared))
-                    prepared = nullptr;
-            }
-
-            if (prepared == nullptr)
-                prepared = prepareNavMeshTileData(*recastMesh, changedTile, agentHalfExtents, settings.mRecast);
-
-            if (prepared == nullptr)
-            {
-                Log(Debug::Debug) << "Ignore add tile: NavMeshData is null";
-                return navMeshCacheItem->lock()->removeTile(changedTile);
-            }
-
-            if (updateType == UpdateType::Temporary)
-                return navMeshCacheItem->lock()->updateTile(changedTile, NavMeshTilesCache::Value(),
-                    makeNavMeshTileData(*prepared, offMeshConnections, agentHalfExtents, changedTile, settings.mRecast));
-
-            cachedNavMeshData = navMeshTilesCache.set(agentHalfExtents, changedTile, *recastMesh, std::move(prepared));
-
-            if (!cachedNavMeshData)
-            {
-                Log(Debug::Debug) << "Navigator cache overflow";
-                return navMeshCacheItem->lock()->updateTile(changedTile, NavMeshTilesCache::Value(),
-                    makeNavMeshTileData(*prepared, offMeshConnections, agentHalfExtents, changedTile, settings.mRecast));
-            }
-        }
-
-        const auto updateStatus = navMeshCacheItem->lock()->updateTile(changedTile, std::move(cachedNavMeshData),
-            makeNavMeshTileData(cachedNavMeshData.get(), offMeshConnections, agentHalfExtents, changedTile, settings.mRecast));
-
-        return UpdateNavMeshStatusBuilder(updateStatus).cached(cached).getResult();
-    }
 }
diff --git a/components/detournavigator/makenavmesh.hpp b/components/detournavigator/makenavmesh.hpp
index 40ead79ad6..14919ab134 100644
--- a/components/detournavigator/makenavmesh.hpp
+++ b/components/detournavigator/makenavmesh.hpp
@@ -58,18 +58,6 @@ namespace DetourNavigator
         const TilePosition& tile, const RecastSettings& settings);
 
     NavMeshPtr makeEmptyNavMesh(const Settings& settings);
-
-    enum class UpdateType
-    {
-        Persistent,
-        Temporary
-    };
-
-    UpdateNavMeshStatus updateNavMesh(const osg::Vec3f& agentHalfExtents, const RecastMesh* recastMesh,
-        const std::string& worldspace, const TilePosition& changedTile, const TilePosition& playerTile,
-        const std::vector<OffMeshConnection>& offMeshConnections, const Settings& settings,
-        const SharedNavMeshCacheItem& navMeshCacheItem, NavMeshTilesCache& navMeshTilesCache, UpdateType updateType,
-        Misc::ScopeGuarded<std::unique_ptr<NavMeshDb>>& db, ShapeId& nextShapeId);
 }
 
 #endif
diff --git a/components/detournavigator/navmeshcacheitem.cpp b/components/detournavigator/navmeshcacheitem.cpp
index decf45de2c..ffcb0a7359 100644
--- a/components/detournavigator/navmeshcacheitem.cpp
+++ b/components/detournavigator/navmeshcacheitem.cpp
@@ -50,7 +50,8 @@ namespace DetourNavigator
         {
             return UpdateNavMeshStatus::ignored;
         }
-        const auto removed = ::removeTile(*mImpl, position);
+        bool removed = ::removeTile(*mImpl, position);
+        removed = mEmptyTiles.erase(position) > 0 || removed;
         const auto addStatus = addTile(*mImpl, navMeshData.mValue.get(), navMeshData.mSize);
         if (dtStatusSucceed(addStatus))
         {
@@ -82,7 +83,8 @@ namespace DetourNavigator
 
     UpdateNavMeshStatus NavMeshCacheItem::removeTile(const TilePosition& position)
     {
-        const auto removed = ::removeTile(*mImpl, position);
+        bool removed = ::removeTile(*mImpl, position);
+        removed = mEmptyTiles.erase(position) > 0 || removed;
         if (removed)
         {
             mUsedTiles.erase(position);
@@ -90,4 +92,21 @@ namespace DetourNavigator
         }
         return UpdateNavMeshStatusBuilder().removed(removed).getResult();
     }
+
+    UpdateNavMeshStatus NavMeshCacheItem::markAsEmpty(const TilePosition& position)
+    {
+        bool removed = ::removeTile(*mImpl, position);
+        removed = mEmptyTiles.insert(position).second || removed;
+        if (removed)
+        {
+            mUsedTiles.erase(position);
+            ++mVersion.mRevision;
+        }
+        return UpdateNavMeshStatusBuilder().removed(removed).getResult();
+    }
+
+    bool NavMeshCacheItem::isEmptyTile(const TilePosition& position) const
+    {
+        return mEmptyTiles.find(position) != mEmptyTiles.end();
+    }
 }
diff --git a/components/detournavigator/navmeshcacheitem.hpp b/components/detournavigator/navmeshcacheitem.hpp
index 5d3b404080..ae4a2de66b 100644
--- a/components/detournavigator/navmeshcacheitem.hpp
+++ b/components/detournavigator/navmeshcacheitem.hpp
@@ -12,6 +12,7 @@
 
 #include <map>
 #include <ostream>
+#include <set>
 
 struct dtMeshTile;
 
@@ -147,6 +148,10 @@ namespace DetourNavigator
 
         UpdateNavMeshStatus removeTile(const TilePosition& position);
 
+        UpdateNavMeshStatus markAsEmpty(const TilePosition& position);
+
+        bool isEmptyTile(const TilePosition& position) const;
+
         template <class Function>
         void forEachUsedTile(Function&& function) const
         {
@@ -166,6 +171,7 @@ namespace DetourNavigator
         NavMeshPtr mImpl;
         Version mVersion;
         std::map<TilePosition, Tile> mUsedTiles;
+        std::set<TilePosition> mEmptyTiles;
     };
 
     using GuardedNavMeshCacheItem = Misc::ScopeGuarded<NavMeshCacheItem>;
diff --git a/components/detournavigator/navmeshmanager.cpp b/components/detournavigator/navmeshmanager.cpp
index 9c8cb5389c..399af8a6a9 100644
--- a/components/detournavigator/navmeshmanager.cpp
+++ b/components/detournavigator/navmeshmanager.cpp
@@ -211,7 +211,7 @@ namespace DetourNavigator
                 const auto shouldAdd = shouldAddTile(tile, playerTile, maxTiles);
                 const auto presentInNavMesh = bool(navMesh.getTileAt(tile.x(), tile.y(), 0));
                 if (shouldAdd && !presentInNavMesh)
-                    tilesToPost.insert(std::make_pair(tile, ChangeType::add));
+                    tilesToPost.insert(std::make_pair(tile, locked->isEmptyTile(tile) ? ChangeType::update : ChangeType::add));
                 else if (!shouldAdd && presentInNavMesh)
                     tilesToPost.insert(std::make_pair(tile, ChangeType::mixed));
                 else
@@ -243,7 +243,7 @@ namespace DetourNavigator
 
     void NavMeshManager::reportStats(unsigned int frameNumber, osg::Stats& stats) const
     {
-        mAsyncNavMeshUpdater.reportStats(frameNumber, stats);
+        DetourNavigator::reportStats(mAsyncNavMeshUpdater.getStats(), frameNumber, stats);
     }
 
     RecastMeshTiles NavMeshManager::getRecastMeshTiles() const
diff --git a/components/detournavigator/navmeshtilescache.cpp b/components/detournavigator/navmeshtilescache.cpp
index 3d595f13a8..bbda8a3179 100644
--- a/components/detournavigator/navmeshtilescache.cpp
+++ b/components/detournavigator/navmeshtilescache.cpp
@@ -79,12 +79,11 @@ namespace DetourNavigator
         return result;
     }
 
-    void NavMeshTilesCache::reportStats(unsigned int frameNumber, osg::Stats& out) const
+    void reportStats(const NavMeshTilesCache::Stats& stats, unsigned int frameNumber, osg::Stats& out)
     {
-        const Stats stats = getStats();
-        out.setAttribute(frameNumber, "NavMesh CacheSize", stats.mNavMeshCacheSize);
-        out.setAttribute(frameNumber, "NavMesh UsedTiles", stats.mUsedNavMeshTiles);
-        out.setAttribute(frameNumber, "NavMesh CachedTiles", stats.mCachedNavMeshTiles);
+        out.setAttribute(frameNumber, "NavMesh CacheSize", static_cast<double>(stats.mNavMeshCacheSize));
+        out.setAttribute(frameNumber, "NavMesh UsedTiles", static_cast<double>(stats.mUsedNavMeshTiles));
+        out.setAttribute(frameNumber, "NavMesh CachedTiles", static_cast<double>(stats.mCachedNavMeshTiles));
         if (stats.mGetCount > 0)
             out.setAttribute(frameNumber, "NavMesh CacheHitRate", static_cast<double>(stats.mHitCount) / stats.mGetCount * 100.0);
     }
diff --git a/components/detournavigator/navmeshtilescache.hpp b/components/detournavigator/navmeshtilescache.hpp
index fdafa0c6d6..e7e0b6c7a8 100644
--- a/components/detournavigator/navmeshtilescache.hpp
+++ b/components/detournavigator/navmeshtilescache.hpp
@@ -144,8 +144,6 @@ namespace DetourNavigator
 
         Stats getStats() const;
 
-        void reportStats(unsigned int frameNumber, osg::Stats& stats) const;
-
     private:
         mutable std::mutex mMutex;
         std::size_t mMaxNavMeshDataSize;
@@ -163,6 +161,8 @@ namespace DetourNavigator
 
         void releaseItem(ItemIterator iterator);
     };
+
+    void reportStats(const NavMeshTilesCache::Stats& stats, unsigned int frameNumber, osg::Stats& out);
 }
 
 #endif
diff --git a/components/detournavigator/preparednavmeshdata.cpp b/components/detournavigator/preparednavmeshdata.cpp
index 77c70eade3..a737ae19a5 100644
--- a/components/detournavigator/preparednavmeshdata.cpp
+++ b/components/detournavigator/preparednavmeshdata.cpp
@@ -4,6 +4,8 @@
 
 #include <Recast.h>
 
+#include <cstring>
+
 namespace
 {
     void initPolyMeshDetail(rcPolyMeshDetail& value) noexcept
@@ -24,6 +26,15 @@ namespace DetourNavigator
         initPolyMeshDetail(mPolyMeshDetail);
     }
 
+    PreparedNavMeshData::PreparedNavMeshData(const PreparedNavMeshData& other)
+        : mUserId(other.mUserId)
+        , mCellSize(other.mCellSize)
+        , mCellHeight(other.mCellHeight)
+    {
+        copyPolyMesh(other.mPolyMesh, mPolyMesh);
+        copyPolyMeshDetail(other.mPolyMeshDetail, mPolyMeshDetail);
+    }
+
     PreparedNavMeshData::~PreparedNavMeshData() noexcept
     {
         freePolyMeshDetail(mPolyMeshDetail);
diff --git a/components/detournavigator/preparednavmeshdata.hpp b/components/detournavigator/preparednavmeshdata.hpp
index 3566cfc71b..b3de7a447f 100644
--- a/components/detournavigator/preparednavmeshdata.hpp
+++ b/components/detournavigator/preparednavmeshdata.hpp
@@ -18,7 +18,7 @@ namespace DetourNavigator
         rcPolyMeshDetail mPolyMeshDetail;
 
         PreparedNavMeshData() noexcept;
-        PreparedNavMeshData(const PreparedNavMeshData&) = delete;
+        PreparedNavMeshData(const PreparedNavMeshData& other);
 
         ~PreparedNavMeshData() noexcept;
 
diff --git a/components/detournavigator/recast.cpp b/components/detournavigator/recast.cpp
index f3c7768430..c1d14c0aa8 100644
--- a/components/detournavigator/recast.cpp
+++ b/components/detournavigator/recast.cpp
@@ -46,4 +46,35 @@ namespace DetourNavigator
         rcFree(value.verts);
         rcFree(value.tris);
     }
+
+    void copyPolyMesh(const rcPolyMesh& src, rcPolyMesh& dst)
+    {
+        dst.nverts = src.nverts;
+        dst.npolys = src.npolys;
+        dst.maxpolys = src.maxpolys;
+        dst.nvp = src.nvp;
+        rcVcopy(dst.bmin, src.bmin);
+        rcVcopy(dst.bmax, src.bmax);
+        dst.cs = src.cs;
+        dst.ch = src.ch;
+        dst.borderSize = src.borderSize;
+        dst.maxEdgeError = src.maxEdgeError;
+        permRecastAlloc(dst);
+        std::memcpy(dst.verts, src.verts, getVertsLength(src) * sizeof(*dst.verts));
+        std::memcpy(dst.polys, src.polys, getPolysLength(src) * sizeof(*dst.polys));
+        std::memcpy(dst.regs, src.regs, getRegsLength(src) * sizeof(*dst.regs));
+        std::memcpy(dst.flags, src.flags, getFlagsLength(src) * sizeof(*dst.flags));
+        std::memcpy(dst.areas, src.areas, getAreasLength(src) * sizeof(*dst.areas));
+    }
+
+    void copyPolyMeshDetail(const rcPolyMeshDetail& src, rcPolyMeshDetail& dst)
+    {
+        dst.nmeshes = src.nmeshes;
+        dst.nverts = src.nverts;
+        dst.ntris = src.ntris;
+        permRecastAlloc(dst);
+        std::memcpy(dst.meshes, src.meshes, getMeshesLength(src) * sizeof(*dst.meshes));
+        std::memcpy(dst.verts, src.verts, getVertsLength(src) * sizeof(*dst.verts));
+        std::memcpy(dst.tris, src.tris, getTrisLength(src) * sizeof(*dst.tris));
+    }
 }
diff --git a/components/detournavigator/recast.hpp b/components/detournavigator/recast.hpp
index 8b9042b661..1811d35772 100644
--- a/components/detournavigator/recast.hpp
+++ b/components/detournavigator/recast.hpp
@@ -2,6 +2,7 @@
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_RECAST_H
 
 #include <Recast.h>
+#include <RecastAlloc.h>
 
 #include <cstddef>
 #include <type_traits>
@@ -62,6 +63,10 @@ namespace DetourNavigator
     void permRecastAlloc(rcPolyMeshDetail& value);
 
     void freePolyMeshDetail(rcPolyMeshDetail& value) noexcept;
+
+    void copyPolyMesh(const rcPolyMesh& src, rcPolyMesh& dst);
+
+    void copyPolyMeshDetail(const rcPolyMeshDetail& src, rcPolyMeshDetail& dst);
 }
 
 #endif
diff --git a/components/detournavigator/settings.cpp b/components/detournavigator/settings.cpp
index 68baeb51d8..cc2c685992 100644
--- a/components/detournavigator/settings.cpp
+++ b/components/detournavigator/settings.cpp
@@ -63,6 +63,7 @@ namespace DetourNavigator
         result.mMinUpdateInterval = std::chrono::milliseconds(::Settings::Manager::getInt("min update interval ms", "Navigator"));
         result.mNavMeshVersion = ::Settings::Manager::getInt("nav mesh version", "Navigator");
         result.mEnableNavMeshDiskCache = ::Settings::Manager::getBool("enable nav mesh disk cache", "Navigator");
+        result.mWriteToNavMeshDb = ::Settings::Manager::getBool("write to navmeshdb", "Navigator");
 
         return result;
     }
diff --git a/components/detournavigator/settings.hpp b/components/detournavigator/settings.hpp
index ab8a95c649..e6be8017d5 100644
--- a/components/detournavigator/settings.hpp
+++ b/components/detournavigator/settings.hpp
@@ -40,6 +40,7 @@ namespace DetourNavigator
         bool mEnableRecastMeshFileNameRevision = false;
         bool mEnableNavMeshFileNameRevision = false;
         bool mEnableNavMeshDiskCache = false;
+        bool mWriteToNavMeshDb = false;
         RecastSettings mRecast;
         DetourSettings mDetour;
         int mWaitUntilMinDistanceToPlayer = 0;
diff --git a/components/resource/stats.cpp b/components/resource/stats.cpp
index b3705f69cc..d97ddd1d6f 100644
--- a/components/resource/stats.cpp
+++ b/components/resource/stats.cpp
@@ -393,6 +393,8 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase *viewer)
             "NavMesh Waiting",
             "NavMesh Pushed",
             "NavMesh Processing",
+            "NavMesh DbJobs",
+            "NavMesh DbCacheHitRate",
             "NavMesh CacheSize",
             "NavMesh UsedTiles",
             "NavMesh CachedTiles",
diff --git a/docs/source/reference/modding/settings/navigator.rst b/docs/source/reference/modding/settings/navigator.rst
index 15059356ff..6d00c770bc 100644
--- a/docs/source/reference/modding/settings/navigator.rst
+++ b/docs/source/reference/modding/settings/navigator.rst
@@ -65,6 +65,15 @@ If true navmesh cache stored on disk will be used in addition to memory cache.
 If navmesh tile is not present in memory cache, it will be looked up in the disk cache.
 If it's not found there it will be generated.
 
+write to navmeshdb
+------------------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	False
+
+If true generated navmesh tiles will be stored into disk cache while game is running.
+
 Advanced settings
 *****************
 
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 1752b4f5a0..57faaba11d 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -937,6 +937,9 @@ nav mesh version = 1
 # Use navigation mesh cache stored on disk (true, false)
 enable nav mesh disk cache = true
 
+# Cache navigation mesh tiles to disk (true, false)
+write to navmeshdb = false
+
 [Shadows]
 
 # Enable or disable shadows. Bear in mind that this will force OpenMW to use shaders as if "[Shaders]/force shaders" was set to true.

From 24ec06f0d2450b4086825b8a7bb34c48c6caa86d Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 11 Dec 2021 01:14:53 +0100
Subject: [PATCH 1848/2859] Add changelog record for navmesh disk cache

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 984b545ef1..9bc340bef0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -108,6 +108,7 @@
     Feature #6128: Soft Particles
     Feature #6161: Refactor Sky to use shaders and GLES/GL3 friendly
     Feature #6162: Refactor GUI to use shaders and to be GLES and GL3+ friendly
+    Feature #6189: Navigation mesh disk cache
     Feature #6199: Support FBO Rendering
     Feature #6248: Embedded error marker mesh
     Feature #6249: Alpha testing support for Collada

From a64057fb3660c98a7ca94553bcaa16f7b45f1ed1 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sat, 11 Dec 2021 04:42:47 +0300
Subject: [PATCH 1849/2859] Some NIF cleanup

Clean up keyframe controller construction
Make LOD and switch node generation static
Clarify decal map implementation
---
 components/nifosg/controller.cpp | 57 +++++++++++++++++---------------
 components/nifosg/controller.hpp |  9 +----
 components/nifosg/nifloader.cpp  | 33 +++++-------------
 3 files changed, 40 insertions(+), 59 deletions(-)

diff --git a/components/nifosg/controller.cpp b/components/nifosg/controller.cpp
index 54300d34e8..07134532e9 100644
--- a/components/nifosg/controller.cpp
+++ b/components/nifosg/controller.cpp
@@ -82,34 +82,37 @@ KeyframeController::KeyframeController(const KeyframeController &copy, const osg
 {
 }
 
-KeyframeController::KeyframeController(const Nif::NiKeyframeData *data)
-    : mRotations(data->mRotations)
-    , mXRotations(data->mXRotations, 0.f)
-    , mYRotations(data->mYRotations, 0.f)
-    , mZRotations(data->mZRotations, 0.f)
-    , mTranslations(data->mTranslations, osg::Vec3f())
-    , mScales(data->mScales, 1.f)
-{
-}
-
-KeyframeController::KeyframeController(const Nif::NiTransformInterpolator* interpolator)
-    : mRotations(interpolator->data->mRotations, interpolator->defaultRot)
-    , mXRotations(interpolator->data->mXRotations, 0.f)
-    , mYRotations(interpolator->data->mYRotations, 0.f)
-    , mZRotations(interpolator->data->mZRotations, 0.f)
-    , mTranslations(interpolator->data->mTranslations, interpolator->defaultPos)
-    , mScales(interpolator->data->mScales, interpolator->defaultScale)
-{
-}
-
-KeyframeController::KeyframeController(const float scale, const osg::Vec3f& pos, const osg::Quat& rot)
-    : mRotations(Nif::QuaternionKeyMapPtr(), rot)
-    , mXRotations(Nif::FloatKeyMapPtr(), 0.f)
-    , mYRotations(Nif::FloatKeyMapPtr(), 0.f)
-    , mZRotations(Nif::FloatKeyMapPtr(), 0.f)
-    , mTranslations(Nif::Vector3KeyMapPtr(), pos)
-    , mScales(Nif::FloatKeyMapPtr(), scale)
+KeyframeController::KeyframeController(const Nif::NiKeyframeController *keyctrl)
 {
+    if (!keyctrl->interpolator.empty())
+    {
+        const Nif::NiTransformInterpolator* interp = keyctrl->interpolator.getPtr();
+        if (!interp->data.empty())
+        {
+            mRotations = QuaternionInterpolator(interp->data->mRotations, interp->defaultRot);
+            mXRotations = FloatInterpolator(interp->data->mXRotations);
+            mYRotations = FloatInterpolator(interp->data->mYRotations);
+            mZRotations = FloatInterpolator(interp->data->mZRotations);
+            mTranslations = Vec3Interpolator(interp->data->mTranslations, interp->defaultPos);
+            mScales = FloatInterpolator(interp->data->mScales, interp->defaultScale);
+        }
+        else
+        {
+            mRotations = QuaternionInterpolator(Nif::QuaternionKeyMapPtr(), interp->defaultRot);
+            mTranslations = Vec3Interpolator(Nif::Vector3KeyMapPtr(), interp->defaultPos);
+            mScales = FloatInterpolator(Nif::FloatKeyMapPtr(), interp->defaultScale);
+        }
+    }
+    else if (!keyctrl->data.empty())
+    {
+        const Nif::NiKeyframeData* keydata = keyctrl->data.getPtr();
+        mRotations = QuaternionInterpolator(keydata->mRotations);
+        mXRotations = FloatInterpolator(keydata->mXRotations);
+        mYRotations = FloatInterpolator(keydata->mYRotations);
+        mZRotations = FloatInterpolator(keydata->mZRotations);
+        mTranslations = Vec3Interpolator(keydata->mTranslations);
+        mScales = FloatInterpolator(keydata->mScales, 1.f);
+    }
 }
 
 osg::Quat KeyframeController::getXYZRotation(float time) const
diff --git a/components/nifosg/controller.hpp b/components/nifosg/controller.hpp
index 5d88dda1f1..a5f887ebe6 100644
--- a/components/nifosg/controller.hpp
+++ b/components/nifosg/controller.hpp
@@ -234,16 +234,9 @@ namespace NifOsg
     class KeyframeController : public SceneUtil::KeyframeController, public SceneUtil::NodeCallback<KeyframeController, NifOsg::MatrixTransform*>
     {
     public:
-        // This is used if there's no interpolator but there is data (Morrowind meshes).
-        KeyframeController(const Nif::NiKeyframeData *data);
-        // This is used if the interpolator has data.
-        KeyframeController(const Nif::NiTransformInterpolator* interpolator);
-        // This is used if there are default values available (e.g. from a data-less interpolator).
-        // If there's neither keyframe data nor an interpolator a KeyframeController must not be created.
-        KeyframeController(const float scale, const osg::Vec3f& pos, const osg::Quat& rot);
-
         KeyframeController();
         KeyframeController(const KeyframeController& copy, const osg::CopyOp& copyop);
+        KeyframeController(const Nif::NiKeyframeController *keyctrl);
 
         META_Object(NifOsg, KeyframeController)
 
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 99aaaa3323..3148b93cdc 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -270,8 +270,8 @@ namespace NifOsg
                 if (key->data.empty() && key->interpolator.empty())
                     continue;
 
-                osg::ref_ptr<SceneUtil::KeyframeController> callback(handleKeyframeController(key));
-                callback->setFunction(std::shared_ptr<NifOsg::ControllerFunction>(new NifOsg::ControllerFunction(key)));
+                osg::ref_ptr<SceneUtil::KeyframeController> callback = new NifOsg::KeyframeController(key);
+                setupController(key, callback, /*animflags*/0);
 
                 if (!target.mKeyframeControllers.emplace(strdata->string, callback).second)
                     Log(Debug::Verbose) << "Controller " << strdata->string << " present more than once in " << nif->getFilename() << ", ignoring later version";
@@ -359,7 +359,7 @@ namespace NifOsg
                 handleProperty(geometry->shaderprop.getPtr(), applyTo, composite, imageManager, boundTextures, animflags);
         }
 
-        void setupController(const Nif::Controller* ctrl, SceneUtil::Controller* toSetup, int animflags)
+        static void setupController(const Nif::Controller* ctrl, SceneUtil::Controller* toSetup, int animflags)
         {
             bool autoPlay = animflags & Nif::NiNode::AnimFlag_AutoPlay;
             if (autoPlay)
@@ -368,7 +368,7 @@ namespace NifOsg
             toSetup->setFunction(std::shared_ptr<ControllerFunction>(new ControllerFunction(ctrl)));
         }
 
-        osg::ref_ptr<osg::LOD> handleLodNode(const Nif::NiLODNode* niLodNode)
+        static osg::ref_ptr<osg::LOD> handleLodNode(const Nif::NiLODNode* niLodNode)
         {
             osg::ref_ptr<osg::LOD> lod (new osg::LOD);
             lod->setName(niLodNode->name);
@@ -383,7 +383,7 @@ namespace NifOsg
             return lod;
         }
 
-        osg::ref_ptr<osg::Switch> handleSwitchNode(const Nif::NiSwitchNode* niSwitchNode)
+        static osg::ref_ptr<osg::Switch> handleSwitchNode(const Nif::NiSwitchNode* niSwitchNode)
         {
             osg::ref_ptr<osg::Switch> switchNode (new osg::Switch);
             switchNode->setName(niSwitchNode->name);
@@ -718,24 +718,6 @@ namespace NifOsg
             }
         }
 
-        static osg::ref_ptr<KeyframeController> handleKeyframeController(const Nif::NiKeyframeController* keyctrl)
-        {
-            osg::ref_ptr<NifOsg::KeyframeController> ctrl;
-            if (!keyctrl->interpolator.empty())
-            {
-                const Nif::NiTransformInterpolator* interp = keyctrl->interpolator.getPtr();
-                if (!interp->data.empty())
-                    ctrl = new NifOsg::KeyframeController(interp);
-                else
-                    ctrl = new NifOsg::KeyframeController(interp->defaultScale, interp->defaultPos, interp->defaultRot);
-            }
-            else if (!keyctrl->data.empty())
-            {
-                ctrl = new NifOsg::KeyframeController(keyctrl->data.getPtr());
-            }
-            return ctrl;
-        }
-
         void handleNodeControllers(const Nif::Node* nifNode, osg::Node* node, int animflags, bool& isAnimated)
         {
             for (Nif::ControllerPtr ctrl = nifNode->controller; !ctrl.empty(); ctrl = ctrl->next)
@@ -747,7 +729,7 @@ namespace NifOsg
                     const Nif::NiKeyframeController *key = static_cast<const Nif::NiKeyframeController*>(ctrl.getPtr());
                     if (key->data.empty() && key->interpolator.empty())
                         continue;
-                    osg::ref_ptr<KeyframeController> callback(handleKeyframeController(key));
+                    osg::ref_ptr<KeyframeController> callback = new KeyframeController(key);
                     setupController(key, callback, animflags);
                     node->addUpdateCallback(callback);
                     isAnimated = true;
@@ -1615,6 +1597,9 @@ namespace NifOsg
                     }
                     else if (i == Nif::NiTexturingProperty::DecalTexture)
                     {
+                        // This is only an inaccurate imitation of the original implementation,
+                        // see https://github.com/niftools/nifskope/issues/184
+
                         osg::TexEnvCombine* texEnv = new osg::TexEnvCombine;
                         // Interpolate to the decal texture's colour...
                         texEnv->setCombine_RGB(osg::TexEnvCombine::INTERPOLATE);

From ff9f010d99f1330401d7bdda2241672f9fda9dda Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 11 Dec 2021 15:30:57 +0100
Subject: [PATCH 1850/2859] Explicitely add the initial actor to the set of its
 allies

---
 apps/openmw/mwmechanics/actors.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index ce2465ec97..d5d434e128 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -451,6 +451,7 @@ namespace MWMechanics
         {
             std::set<MWWorld::Ptr> allySet;
             getActorsSidingWith(ptr, allySet);
+            allySet.insert(ptr);
             std::vector<MWWorld::Ptr> allies(allySet.begin(), allySet.end());
             for(const auto& ally : allies)
                 ally.getClass().getCreatureStats(ally).getAiSequence().stopCombat(targets);

From a71bda2bf9b9601aaf05085420a236a5c74a0534 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Tue, 14 Dec 2021 09:18:43 +0000
Subject: [PATCH 1851/2859] Merge branch 'a_bit_faster' into 'master'

Speed up the pipeline a teensy bit

See merge request OpenMW/openmw!1471

(cherry picked from commit 0dff3042d0af6256aba74dc905dd44c723529845)

2b026cad Speed up the pipeline a teensy bit
---
 .gitlab-ci.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b977d86a97..1f31278be1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,14 @@
 stages:
   - build
 
+# https://blog.nimbleways.com/let-s-make-faster-gitlab-ci-cd-pipelines/
+variables:
+  FF_USE_NEW_SHELL_ESCAPE: "true"
+  FF_USE_FASTZIP: "true"
+  # These can be specified per job or per pipeline
+  ARTIFACT_COMPRESSION_LEVEL: "fast"
+  CACHE_COMPRESSION_LEVEL: "fast"
+
 .Ubuntu_Image:
   tags:
     - docker

From 029eb1ade6338bb55589b2e2aeb95a2b7141eb69 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Tue, 14 Dec 2021 09:21:41 +0000
Subject: [PATCH 1852/2859] added !1471

---
 .resubmitted_merge_requests.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.resubmitted_merge_requests.txt b/.resubmitted_merge_requests.txt
index 5fd67c190c..1585a60ec1 100644
--- a/.resubmitted_merge_requests.txt
+++ b/.resubmitted_merge_requests.txt
@@ -1,3 +1,4 @@
+1471
 1450
 1420
 1314

From 2fce89e64fdc170ab086283240862c289109a61d Mon Sep 17 00:00:00 2001
From: kuyondo <rdja.kyd@gmail.com>
Date: Tue, 14 Dec 2021 22:40:05 +0800
Subject: [PATCH 1853/2859] changes

---
 apps/openmw/mwgui/messagebox.cpp      | 5 -----
 apps/openmw/mwgui/messagebox.hpp      | 4 ++--
 apps/openmw/mwinput/actionmanager.cpp | 7 +++----
 apps/openmw/mwinput/actionmanager.hpp | 2 --
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/apps/openmw/mwgui/messagebox.cpp b/apps/openmw/mwgui/messagebox.cpp
index ef9ad73437..890406cd12 100644
--- a/apps/openmw/mwgui/messagebox.cpp
+++ b/apps/openmw/mwgui/messagebox.cpp
@@ -206,11 +206,6 @@ namespace MWGui
         mMainWidget->setPosition(pos);
     }
 
-    const std::string MessageBox::getMessage()
-    { 
-        return mMessage;
-    }
-
     int MessageBox::getHeight ()
     {
         return mMainWidget->getHeight()+mNextBoxPadding;
diff --git a/apps/openmw/mwgui/messagebox.hpp b/apps/openmw/mwgui/messagebox.hpp
index e01c54b9a5..d46d31d938 100644
--- a/apps/openmw/mwgui/messagebox.hpp
+++ b/apps/openmw/mwgui/messagebox.hpp
@@ -65,7 +65,7 @@ namespace MWGui
         public:
             MessageBox (MessageBoxManager& parMessageBoxManager, const std::string& message);
             void setMessage (const std::string& message);
-            const std::string getMessage();
+            const std::string& getMessage() { return mMessage; };
             int getHeight ();
             void update (int height);
             void setVisible(bool value);
@@ -75,7 +75,7 @@ namespace MWGui
 
         protected:
             MessageBoxManager& mMessageBoxManager;
-            const std::string mMessage;
+            std::string mMessage;
             MyGUI::EditBox* mMessageWidget;
             int mBottomPadding;
             int mNextBoxPadding;
diff --git a/apps/openmw/mwinput/actionmanager.cpp b/apps/openmw/mwinput/actionmanager.cpp
index 84bdc7d12b..63b0a197a7 100644
--- a/apps/openmw/mwinput/actionmanager.cpp
+++ b/apps/openmw/mwinput/actionmanager.cpp
@@ -42,7 +42,6 @@ namespace MWInput
         , mSneaking(false)
         , mAttemptJump(false)
         , mTimeIdle(0.f)
-        , mOverencumberedMessage("#{sNotifyMessage59}")
     {
     }
 
@@ -100,16 +99,16 @@ namespace MWInput
                 {
                     player.setAutoMove (false);
                     std::vector<MWGui::MessageBox*> msgboxs = MWBase::Environment::get().getWindowManager()->getActiveMessageBoxes();
-                    const std::vector<MWGui::MessageBox*>::iterator it = std::find_if(msgboxs.begin(), msgboxs.end(), [=](MWGui::MessageBox*& msgbox)
+                    const std::vector<MWGui::MessageBox*>::iterator it = std::find_if(msgboxs.begin(), msgboxs.end(), [](MWGui::MessageBox*& msgbox)
                     {
-                        return (msgbox->getMessage() == mOverencumberedMessage);
+                        return (msgbox->getMessage() == "#{sNotifyMessage59}");
                     });
 
                     // if an overencumbered messagebox is already present, reset its expiry timer, otherwise create new one.
                     if (it != msgboxs.end())
                         (*it)->mCurrentTime = 0;
                     else
-                        MWBase::Environment::get().getWindowManager()->messageBox(mOverencumberedMessage);
+                        MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage59}");
                 }
             }
 
diff --git a/apps/openmw/mwinput/actionmanager.hpp b/apps/openmw/mwinput/actionmanager.hpp
index b3deaed20e..4c51139d46 100644
--- a/apps/openmw/mwinput/actionmanager.hpp
+++ b/apps/openmw/mwinput/actionmanager.hpp
@@ -67,8 +67,6 @@ namespace MWInput
         bool mSneaking;
         bool mAttemptJump;
 
-        const std::string mOverencumberedMessage;
-
         float mTimeIdle;
     };
 }

From c865114b9b74fde4a38ed47ef4cb0b0b1e0f589d Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Tue, 14 Dec 2021 17:38:06 +0000
Subject: [PATCH 1854/2859] Lua UI Layers

---
 apps/openmw/mwlua/uibindings.cpp              | 64 ++++++++++++++++++-
 components/CMakeLists.txt                     |  2 +-
 components/lua/luastate.hpp                   | 11 ++++
 components/lua_ui/element.cpp                 | 22 ++++++-
 components/lua_ui/layers.hpp                  | 55 ++++++++++++++++
 .../lua-scripting/user_interface.rst          | 17 ++++-
 files/lua_api/openmw/ui.lua                   | 25 ++++++++
 7 files changed, 190 insertions(+), 6 deletions(-)
 create mode 100644 components/lua_ui/layers.hpp

diff --git a/apps/openmw/mwlua/uibindings.cpp b/apps/openmw/mwlua/uibindings.cpp
index 9982b857c8..987304d4c3 100644
--- a/apps/openmw/mwlua/uibindings.cpp
+++ b/apps/openmw/mwlua/uibindings.cpp
@@ -1,6 +1,7 @@
-#include <components/lua_ui/content.hpp>
 #include <components/lua_ui/widgetlist.hpp>
 #include <components/lua_ui/element.hpp>
+#include <components/lua_ui/layers.hpp>
+#include <components/lua_ui/content.hpp>
 
 #include "context.hpp"
 #include "actions.hpp"
@@ -81,6 +82,41 @@ namespace MWLua
         inline size_t toLuaIndex(size_t i) { return i + 1; }
     }
 
+    class LayerAction final : public Action
+    {
+        public:
+            LayerAction(std::string_view name, std::string_view afterName,
+                LuaUi::Layers::Options options, LuaUtil::LuaState* state)
+                : Action(state)
+                , mName(name)
+                , mAfterName(afterName)
+                , mOptions(options)
+            {}
+
+            void apply(WorldView&) const override
+            {
+                size_t index = LuaUi::Layers::indexOf(mAfterName);
+                if (index == LuaUi::Layers::size())
+                    throw std::logic_error(std::string("Layer not found"));
+                LuaUi::Layers::insert(index, mName, mOptions);
+            }
+
+            std::string toString() const override
+            {
+                std::string result("Insert UI layer \"");
+                result += mName;
+                result += "\" after \"";
+                result += mAfterName;
+                result += "\"";
+                return result;
+            }
+
+        private:
+            std::string mName;
+            std::string mAfterName;
+            LuaUi::Layers::Options mOptions;
+    };
+
     sol::table initUserInterfacePackage(const Context& context)
     {
         auto uiContent = context.mLua->sol().new_usertype<LuaUi::Content>("UiContent");
@@ -175,6 +211,32 @@ namespace MWLua
             return element;
         };
 
+        sol::table layers = context.mLua->newTable();
+        layers[sol::meta_function::length] = []()
+        {
+            return LuaUi::Layers::size();
+        };
+        layers[sol::meta_function::index] = [](size_t index)
+        {
+            index = fromLuaIndex(index);
+            return LuaUi::Layers::at(index);
+        };
+        layers["indexOf"] = [](std::string_view name) -> sol::optional<size_t>
+        {
+            size_t index = LuaUi::Layers::indexOf(name);
+            if (index == LuaUi::Layers::size())
+                return sol::nullopt;
+            else
+                return toLuaIndex(index);
+        };
+        layers["insertAfter"] = [context](std::string_view afterName, std::string_view name, const sol::object& opt)
+        {
+            LuaUi::Layers::Options options;
+            options.mInteractive = LuaUtil::getValueOrDefault(LuaUtil::getFieldOrNil(opt, "interactive"), true);
+            context.mLuaManager->addAction(std::make_unique<LayerAction>(name, afterName, options, context.mLua));
+        };
+        api["layers"] = LuaUtil::makeReadOnly(layers);
+
         sol::table typeTable = context.mLua->newTable();
         for (const auto& it : LuaUi::widgetTypeToName())
             typeTable.set(it.second, it.first);
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index f969ac1265..3b38489d7a 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -162,7 +162,7 @@ add_component_dir (queries
     )
     
 add_component_dir (lua_ui
-    widget widgetlist element content
+    widget widgetlist element layers content
     text textedit window
     )
 
diff --git a/components/lua/luastate.hpp b/components/lua/luastate.hpp
index 71cdb4f75d..32c180c987 100644
--- a/components/lua/luastate.hpp
+++ b/components/lua/luastate.hpp
@@ -119,6 +119,17 @@ namespace LuaUtil
     // String representation of a Lua object. Should be used for debugging/logging purposes only.
     std::string toString(const sol::object&);
 
+    template <class T>
+    T getValueOrDefault(const sol::object& obj, const T& defaultValue)
+    {
+        if (obj == sol::nil)
+            return defaultValue;
+        if (obj.is<T>())
+            return obj.as<T>();
+        else
+            throw std::logic_error(std::string("Value \"") + toString(obj) + std::string("\" has unexpected type"));
+    }
+
     // Makes a table read only (when accessed from Lua) by wrapping it with an empty userdata.
     // Needed to forbid any changes in common resources that can be accessed from different sandboxes.
     sol::table makeReadOnly(sol::table);
diff --git a/components/lua_ui/element.cpp b/components/lua_ui/element.cpp
index 63ae0e7d5e..5147068a7e 100644
--- a/components/lua_ui/element.cpp
+++ b/components/lua_ui/element.cpp
@@ -55,7 +55,6 @@ namespace LuaUi
     {
         std::string type = widgetType(layout);
         std::string skin = layout.get_or("skin", std::string());
-        std::string layer = layout.get_or("layer", std::string("Windows"));
         std::string name = layout.get_or("name", std::string());
 
         static auto widgetTypeMap = widgetTypeToName();
@@ -65,7 +64,7 @@ namespace LuaUi
         MyGUI::Widget* widget = MyGUI::Gui::getInstancePtr()->createWidgetT(
             type, skin,
             MyGUI::IntCoord(), MyGUI::Align::Default,
-            layer, name);
+            std::string(), name);
 
         LuaUi::WidgetExtension* ext = dynamic_cast<LuaUi::WidgetExtension*>(widget);
         if (!ext)
@@ -124,17 +123,36 @@ namespace LuaUi
             ext->addChild(createWidget(newContent.at(i), ext));
     }
 
+    void setLayer(const sol::table& layout, LuaUi::WidgetExtension* ext)
+    {
+        MyGUI::ILayer* layerNode = ext->widget()->getLayer();
+        std::string currentLayer = layerNode ? layerNode->getName() : std::string();
+        std::string newLayer = layout.get_or("layer", std::string());
+        if (!newLayer.empty() && !MyGUI::LayerManager::getInstance().isExist(newLayer))
+            throw std::logic_error(std::string("Layer ") += newLayer += " doesn't exist");
+        else if (newLayer != currentLayer)
+        {
+            MyGUI::LayerManager::getInstance().attachToLayerNode(newLayer, ext->widget());
+        }
+    }
+
     void Element::create()
     {
         assert(!mRoot);
         if (!mRoot)
+        {
             mRoot = createWidget(mLayout, nullptr);
+            setLayer(mLayout, mRoot);
+        }
     }
 
     void Element::update()
     {
         if (mRoot && mUpdate)
+        {
             updateWidget(mLayout, mRoot);
+            setLayer(mLayout, mRoot);
+        }
         mUpdate = false;
     }
 
diff --git a/components/lua_ui/layers.hpp b/components/lua_ui/layers.hpp
new file mode 100644
index 0000000000..6fe7fc9c16
--- /dev/null
+++ b/components/lua_ui/layers.hpp
@@ -0,0 +1,55 @@
+#ifndef OPENMW_LUAUI_LAYERS
+#define OPENMW_LUAUI_LAYERS
+
+#include <string>
+#include <string_view>
+
+#include <MyGUI_LayerManager.h>
+#include <MyGUI_OverlappedLayer.h>
+
+namespace LuaUi
+{
+    namespace Layers
+    {
+        struct Options {
+            bool mInteractive;
+        };
+
+        size_t size()
+        {
+            return MyGUI::LayerManager::getInstance().getLayerCount();
+        }
+
+        std::string at(size_t index)
+        {
+            if (index >= size())
+                throw std::logic_error("Invalid layer index");
+            return MyGUI::LayerManager::getInstance().getLayer(index)->getName();
+        }
+
+        size_t indexOf(std::string_view name)
+        {
+            for (size_t i = 0; i < size(); i++)
+                if (at(i) == name)
+                    return i;
+            return size();
+        }
+
+        void insert(size_t index, std::string_view name, Options options)
+        {
+            if (index > size())
+                throw std::logic_error("Invalid layer index");
+            if (indexOf(name) < size())
+                Log(Debug::Error) << "Layer \"" << name << "\" already exists";
+            else
+            {
+                auto layer = MyGUI::LayerManager::getInstance()
+                                 .createLayerAt(std::string(name), "OverlappedLayer", index);
+                auto overlappedLayer = dynamic_cast<MyGUI::OverlappedLayer*>(layer);
+                overlappedLayer->setPick(options.mInteractive);
+            }
+        }
+    }
+}
+
+#endif // OPENMW_LUAUI_LAYERS
diff --git a/docs/source/reference/lua-scripting/user_interface.rst b/docs/source/reference/lua-scripting/user_interface.rst
index 88233dceb9..73ca57d1a7 100644
--- a/docs/source/reference/lua-scripting/user_interface.rst
+++ b/docs/source/reference/lua-scripting/user_interface.rst
@@ -22,9 +22,22 @@ Every widget is defined by a layout, which is a Lua table with the following fie
 4. `content`: a Content (`openmw.ui.content`), which contains layouts for the children of this widget.
 5. | `name`: an arbitrary string, the only limitatiion is it being unique within a `Content`.
    | Helpful for navigatilng through the layouts.
-6. `layer`: only applies for the root widget. (Windows, HUD, etc)
+6. `layer`: only applies for the root widget. 
 
-.. TODO: Write a more detailed documentation for layers when they are finished
+Layers
+------
+Layers control how widgets overlap - layers with higher indexes cover render over layers with lower indexes.
+Widgets within the same layer which were added later overlap the ones created earlier.
+A layer can also be set as non-interactive, which prevents all mouse interactions with the widgets in that layer.
+
+.. TODO: Move this list when layers are de-hardcoded
+
+Pre-defined OpenMW layers:
+
+1. `HUD` interactive
+2. `Windows` interactive
+3. `Notification` non-interactive
+4. `MessageBox` interactive
 
 Elements
 --------
diff --git a/files/lua_api/openmw/ui.lua b/files/lua_api/openmw/ui.lua
index 593cbf8043..c60a4e1abd 100644
--- a/files/lua_api/openmw/ui.lua
+++ b/files/lua_api/openmw/ui.lua
@@ -8,6 +8,10 @@
 ---
 -- @field [parent=#ui] #WIDGET_TYPE WIDGET_TYPE
 
+---
+-- Tools for working with layers
+-- @field [parent=#ui] #Layers layers
+
 ---
 -- @type WIDGET_TYPE
 -- @field [parent=#WIDGET_TYPE] Widget Base widget type
@@ -40,6 +44,27 @@
 -- @field #table events Optional table of event callbacks
 -- @field #Content content Optional @{openmw.ui#Content} of children layouts
 
+---
+-- Layers
+-- @type Layers
+-- @usage
+-- ui.layers.insertAfter('HUD', 'NewLayer', { interactive = true })
+-- local fourthLayerName = ui.layers[4]
+-- local windowsIndex = ui.layers.indexOf('Windows')
+
+---
+-- Index of the layer with the givent name. Returns nil if the layer doesn't exist
+-- @function [parent=#Layers] indexOf
+-- @param #string name Name of the layer
+-- @return #number, #nil index
+
+---
+-- Creates a layer and inserts it after another layer (shifts indexes of some other layers).
+-- @function [parent=#Layers] insertAfter
+-- @param #string afterName Name of the layer after which the new layer will be inserted
+-- @param #string name Name of the new layer
+-- @param #table options Table with a boolean `interactive` field (default is true). Layers with interactive = false will ignore all mouse interactions.
+
 ---
 -- Content. An array-like container, which allows to reference elements by their name
 -- @type Content

From a204b4da9648d41264f4526dab0f09f13347f7aa Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Tue, 14 Dec 2021 21:06:40 +0100
Subject: [PATCH 1855/2859] Change the legalities of opening unlocked objects

---
 CHANGELOG.md                                  |  1 +
 .../mwmechanics/mechanicsmanagerimp.cpp       | 70 +++++++++++--------
 2 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9bc340bef0..b61cf944b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -89,6 +89,7 @@
     Bug #6433: Items bound to Quick Keys sometimes do not appear until the Quick Key menu is opened
     Bug #6451: Weapon summoned from Cast When Used item will have the name "None"
     Bug #6473: Strings from NIF should be parsed only to first null terminator
+    Bug #6493: Unlocking owned but not locked or unlocked containers is considered a crime
     Feature #890: OpenMW-CS: Column filtering
     Feature #1465: "Reset" argument for AI functions
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 9974cb44cd..fa5aaa82ef 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -66,6 +66,35 @@ namespace
         }
     }
 
+    bool isOwned(const MWWorld::Ptr& ptr, const MWWorld::Ptr& target, MWWorld::Ptr& victim)
+    {
+        const MWWorld::CellRef& cellref = target.getCellRef();
+
+        const std::string& owner = cellref.getOwner();
+        bool isOwned = !owner.empty() && owner != "player";
+
+        const std::string& faction = cellref.getFaction();
+        bool isFactionOwned = false;
+        if (!faction.empty() && ptr.getClass().isNpc())
+        {
+            const std::map<std::string, int>& factions = ptr.getClass().getNpcStats(ptr).getFactionRanks();
+            auto found = factions.find(Misc::StringUtils::lowerCase(faction));
+            if (found == factions.end() || found->second < cellref.getFactionRank())
+                isFactionOwned = true;
+        }
+
+        const std::string& globalVariable = cellref.getGlobalVariable();
+        if (!globalVariable.empty() && MWBase::Environment::get().getWorld()->getGlobalInt(globalVariable))
+        {
+            isOwned = false;
+            isFactionOwned = false;
+        }
+
+        if (!cellref.getOwner().empty())
+            victim = MWBase::Environment::get().getWorld()->searchPtr(cellref.getOwner(), true, false);
+
+        return isOwned || isFactionOwned;
+    }
 }
 
 namespace MWMechanics
@@ -881,35 +910,11 @@ namespace MWMechanics
             return true;
         }
 
-        const std::string& owner = cellref.getOwner();
-        bool isOwned = !owner.empty() && owner != "player";
-
-        const std::string& faction = cellref.getFaction();
-        bool isFactionOwned = false;
-        if (!faction.empty() && ptr.getClass().isNpc())
-        {
-            const std::map<std::string, int>& factions = ptr.getClass().getNpcStats(ptr).getFactionRanks();
-            std::map<std::string, int>::const_iterator found = factions.find(Misc::StringUtils::lowerCase(faction));
-            if (found == factions.end()
-                    || found->second < cellref.getFactionRank())
-                isFactionOwned = true;
-        }
-
-        const std::string& globalVariable = cellref.getGlobalVariable();
-        if (!globalVariable.empty() && MWBase::Environment::get().getWorld()->getGlobalInt(Misc::StringUtils::lowerCase(globalVariable)) == 1)
-        {
-            isOwned = false;
-            isFactionOwned = false;
-        }
-
-        if (!cellref.getOwner().empty())
-            victim = MWBase::Environment::get().getWorld()->searchPtr(cellref.getOwner(), true, false);
-
-        // A special case for evidence chest - we should not allow to take items even if it is technically permitted
-        if (Misc::StringUtils::ciEqual(cellref.getRefId(), "stolen_goods"))
+        if (isOwned(ptr, target, victim))
             return false;
 
-        return (!isOwned && !isFactionOwned);
+        // A special case for evidence chest - we should not allow to take items even if it is technically permitted
+        return !Misc::StringUtils::ciEqual(cellref.getRefId(), "stolen_goods");
     }
 
     bool MechanicsManager::sleepInBed(const MWWorld::Ptr &ptr, const MWWorld::Ptr &bed)
@@ -941,9 +946,14 @@ namespace MWMechanics
     void MechanicsManager::unlockAttempted(const MWWorld::Ptr &ptr, const MWWorld::Ptr &item)
     {
         MWWorld::Ptr victim;
-        if (isAllowedToUse(ptr, item, victim))
-            return;
-        commitCrime(ptr, victim, OT_Trespassing, item.getCellRef().getFaction());
+        if (isOwned(ptr, item, victim))
+        {
+            // Note that attempting to unlock something that has ever been locked (even ESM::UnbreakableLock) is a crime even if it's already unlocked.
+            // Likewise, it's illegal to unlock something that has a trap but isn't otherwise locked.
+            const auto& cellref = item.getCellRef();
+            if(cellref.getLockLevel() || !cellref.getTrap().empty())
+                commitCrime(ptr, victim, OT_Trespassing, item.getCellRef().getFaction());
+        }
     }
 
     std::vector<std::pair<std::string, int> > MechanicsManager::getStolenItemOwners(const std::string& itemid)

From b834527813eb2d4bede3197f19e20b75c42ad5d8 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Tue, 14 Dec 2021 21:36:11 +0100
Subject: [PATCH 1856/2859] Add missing include

---
 components/vfs/filesystemarchive.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/vfs/filesystemarchive.cpp b/components/vfs/filesystemarchive.cpp
index 35f44f46cd..7766a74f49 100644
--- a/components/vfs/filesystemarchive.cpp
+++ b/components/vfs/filesystemarchive.cpp
@@ -1,5 +1,7 @@
 #include "filesystemarchive.hpp"
 
+#include <algorithm>
+
 #include <boost/filesystem.hpp>
 
 #include <components/debug/debuglog.hpp>

From 7549496162dd665b6fde48262dcf968c8afccda6 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Tue, 14 Dec 2021 00:36:26 +0100
Subject: [PATCH 1857/2859] A few small fixes + expose makeReadOnly to Lua + an
 option to apply makeReadOnly during deserialize

---
 apps/openmw/mwlua/cellbindings.cpp            |  8 +++++
 apps/openmw/mwlua/inputbindings.cpp           |  2 +-
 apps/openmw/mwlua/userdataserializer.cpp      |  2 +-
 .../lua/test_serialization.cpp                | 27 ++++++++++++-----
 .../lua/test_utilpackage.cpp                  |  3 ++
 components/lua/luastate.cpp                   |  3 +-
 components/lua/serialization.cpp              | 30 +++++++++++--------
 components/lua/serialization.hpp              |  6 ++--
 components/lua/utilpackage.cpp                |  1 +
 files/lua_api/openmw/util.lua                 |  6 ++++
 10 files changed, 61 insertions(+), 27 deletions(-)

diff --git a/apps/openmw/mwlua/cellbindings.cpp b/apps/openmw/mwlua/cellbindings.cpp
index a23fb47c32..4ca9018cad 100644
--- a/apps/openmw/mwlua/cellbindings.cpp
+++ b/apps/openmw/mwlua/cellbindings.cpp
@@ -4,6 +4,14 @@
 
 #include "../mwworld/cellstore.hpp"
 
+namespace sol
+{
+    template <>
+    struct is_automagical<MWLua::LCell> : std::false_type {};
+    template <>
+    struct is_automagical<MWLua::GCell> : std::false_type {};
+}
+
 namespace MWLua
 {
 
diff --git a/apps/openmw/mwlua/inputbindings.cpp b/apps/openmw/mwlua/inputbindings.cpp
index 8aecd1269c..9ca2d94770 100644
--- a/apps/openmw/mwlua/inputbindings.cpp
+++ b/apps/openmw/mwlua/inputbindings.cpp
@@ -54,7 +54,7 @@ namespace MWLua
         {
             return input->isControllerButtonPressed(static_cast<SDL_GameControllerButton>(button));
         };
-        api["isMouseButtonPressed"] = [input](int button) -> bool
+        api["isMouseButtonPressed"] = [](int button) -> bool
         {
             return SDL_GetMouseState(nullptr, nullptr) & SDL_BUTTON(button);
         };
diff --git a/apps/openmw/mwlua/userdataserializer.cpp b/apps/openmw/mwlua/userdataserializer.cpp
index 6946cd5532..b675774c53 100644
--- a/apps/openmw/mwlua/userdataserializer.cpp
+++ b/apps/openmw/mwlua/userdataserializer.cpp
@@ -33,7 +33,7 @@ namespace MWLua
 
         // Deserializes userdata of type "typeName" from binaryData. Should push the result on stack using sol::stack::push.
         // Returns false if this type is not supported by this serializer.
-        bool deserialize(std::string_view typeName, std::string_view binaryData, sol::state& lua) const override
+        bool deserialize(std::string_view typeName, std::string_view binaryData, lua_State* lua) const override
         {
             if (typeName == "o")
             {
diff --git a/apps/openmw_test_suite/lua/test_serialization.cpp b/apps/openmw_test_suite/lua/test_serialization.cpp
index 1983daa158..9300e4571b 100644
--- a/apps/openmw_test_suite/lua/test_serialization.cpp
+++ b/apps/openmw_test_suite/lua/test_serialization.cpp
@@ -121,14 +121,25 @@ namespace
         std::string serialized = LuaUtil::serialize(table);
         EXPECT_EQ(serialized.size(), 123);
         sol::table res_table = LuaUtil::deserialize(lua, serialized);
+        sol::table res_readonly_table = LuaUtil::deserialize(lua, serialized, nullptr, true);
 
-        EXPECT_EQ(res_table.get<int>("aa"), 1);
-        EXPECT_EQ(res_table.get<bool>("ab"), true);
-        EXPECT_EQ(res_table.get<sol::table>("nested").get<int>("aa"), 2);
-        EXPECT_EQ(res_table.get<sol::table>("nested").get<std::string>("bb"), "something");
-        EXPECT_FLOAT_EQ(res_table.get<sol::table>("nested").get<double>(5), -0.5);
-        EXPECT_EQ(res_table.get<osg::Vec2f>(1), osg::Vec2f(1, 2));
-        EXPECT_EQ(res_table.get<osg::Vec2f>(2), osg::Vec2f(2, 1));
+        for (auto t : {res_table, res_readonly_table})
+        {
+            EXPECT_EQ(t.get<int>("aa"), 1);
+            EXPECT_EQ(t.get<bool>("ab"), true);
+            EXPECT_EQ(t.get<sol::table>("nested").get<int>("aa"), 2);
+            EXPECT_EQ(t.get<sol::table>("nested").get<std::string>("bb"), "something");
+            EXPECT_FLOAT_EQ(t.get<sol::table>("nested").get<double>(5), -0.5);
+            EXPECT_EQ(t.get<osg::Vec2f>(1), osg::Vec2f(1, 2));
+            EXPECT_EQ(t.get<osg::Vec2f>(2), osg::Vec2f(2, 1));
+        }
+
+        lua["t"] = res_table;
+        lua["ro_t"] = res_readonly_table;
+        EXPECT_NO_THROW(lua.safe_script("t.x = 5"));
+        EXPECT_NO_THROW(lua.safe_script("t.nested.x = 5"));
+        EXPECT_ERROR(lua.safe_script("ro_t.x = 5"), "userdata value");
+        EXPECT_ERROR(lua.safe_script("ro_t.nested.x = 5"), "userdata value");
     }
 
     struct TestStruct1 { double a, b; };
@@ -157,7 +168,7 @@ namespace
             return false;
         }
 
-        bool deserialize(std::string_view typeName, std::string_view binaryData, sol::state& lua) const override
+        bool deserialize(std::string_view typeName, std::string_view binaryData, lua_State* lua) const override
         {
             if (typeName == "ts1")
             {
diff --git a/apps/openmw_test_suite/lua/test_utilpackage.cpp b/apps/openmw_test_suite/lua/test_utilpackage.cpp
index 21d2a344d4..14b7021532 100644
--- a/apps/openmw_test_suite/lua/test_utilpackage.cpp
+++ b/apps/openmw_test_suite/lua/test_utilpackage.cpp
@@ -120,6 +120,9 @@ namespace
         EXPECT_FLOAT_EQ(get<float>(lua, "util.clamp(0.1, 0, 1.5)"), 0.1);
         EXPECT_FLOAT_EQ(get<float>(lua, "util.clamp(-0.1, 0, 1.5)"), 0);
         EXPECT_FLOAT_EQ(get<float>(lua, "util.clamp(2.1, 0, 1.5)"), 1.5);
+        lua.safe_script("t = util.makeReadOnly({x = 1})");
+        EXPECT_FLOAT_EQ(get<float>(lua, "t.x"), 1);
+        EXPECT_ERROR(lua.safe_script("t.y = 2"), "userdata value");
     }
 
 }
diff --git a/components/lua/luastate.cpp b/components/lua/luastate.cpp
index e78f7bed06..61637d7b07 100644
--- a/components/lua/luastate.cpp
+++ b/components/lua/luastate.cpp
@@ -76,9 +76,8 @@ namespace LuaUtil
 
         lua_State* lua = table.lua_state();
         table[sol::meta_function::index] = table;
-        sol::stack::push(lua, std::move(table));
         lua_newuserdata(lua, 0);
-        lua_pushvalue(lua, -2);
+        sol::stack::push(lua, std::move(table));
         lua_setmetatable(lua, -2);
         return sol::stack::pop<sol::table>(lua);
     }
diff --git a/components/lua/serialization.cpp b/components/lua/serialization.cpp
index 2e13cfe29f..f9b8951e4e 100644
--- a/components/lua/serialization.cpp
+++ b/components/lua/serialization.cpp
@@ -5,6 +5,8 @@
 
 #include <components/misc/endianness.hpp>
 
+#include "luastate.hpp"
+
 namespace LuaUtil
 {
 
@@ -147,7 +149,8 @@ namespace LuaUtil
             throw std::runtime_error("Unknown Lua type.");
     }
 
-    static void deserializeImpl(sol::state& lua, std::string_view& binaryData, const UserdataSerializer* customSerializer)
+    static void deserializeImpl(lua_State* lua, std::string_view& binaryData,
+                                const UserdataSerializer* customSerializer, bool readOnly)
     {
         if (binaryData.empty())
             throw std::runtime_error("Unexpected end of serialized data.");
@@ -176,22 +179,22 @@ namespace LuaUtil
         if (type & SHORT_STRING_FLAG)
         {
             size_t size = type & 0x1f;
-            sol::stack::push<std::string_view>(lua.lua_state(), binaryData.substr(0, size));
+            sol::stack::push<std::string_view>(lua, binaryData.substr(0, size));
             binaryData = binaryData.substr(size);
             return;
         }
         switch (static_cast<SerializedType>(type))
         {
             case SerializedType::NUMBER:
-                sol::stack::push<double>(lua.lua_state(), getValue<double>(binaryData));
+                sol::stack::push<double>(lua, getValue<double>(binaryData));
                 return;
             case SerializedType::BOOLEAN:
-                sol::stack::push<bool>(lua.lua_state(), getValue<char>(binaryData) != 0);
+                sol::stack::push<bool>(lua, getValue<char>(binaryData) != 0);
                 return;
             case SerializedType::LONG_STRING:
             {
                 uint32_t size = getValue<uint32_t>(binaryData);
-                sol::stack::push<std::string_view>(lua.lua_state(), binaryData.substr(0, size));
+                sol::stack::push<std::string_view>(lua, binaryData.substr(0, size));
                 binaryData = binaryData.substr(size);
                 return;
             }
@@ -200,13 +203,15 @@ namespace LuaUtil
                 lua_createtable(lua, 0, 0);
                 while (!binaryData.empty() && binaryData[0] != char(SerializedType::TABLE_END))
                 {
-                    deserializeImpl(lua, binaryData, customSerializer);
-                    deserializeImpl(lua, binaryData, customSerializer);
+                    deserializeImpl(lua, binaryData, customSerializer, readOnly);
+                    deserializeImpl(lua, binaryData, customSerializer, readOnly);
                     lua_settable(lua, -3);
                 }
                 if (binaryData.empty())
                     throw std::runtime_error("Unexpected end of serialized data.");
                 binaryData = binaryData.substr(1);
+                if (readOnly)
+                    sol::stack::push(lua, makeReadOnly(sol::stack::pop<sol::table>(lua)));
                 return;
             }
             case SerializedType::TABLE_END:
@@ -215,7 +220,7 @@ namespace LuaUtil
             {
                 float x = getValue<float>(binaryData);
                 float y = getValue<float>(binaryData);
-                sol::stack::push<osg::Vec2f>(lua.lua_state(), osg::Vec2f(x, y));
+                sol::stack::push<osg::Vec2f>(lua, osg::Vec2f(x, y));
                 return;
             }
             case SerializedType::VEC3:
@@ -223,7 +228,7 @@ namespace LuaUtil
                 float x = getValue<float>(binaryData);
                 float y = getValue<float>(binaryData);
                 float z = getValue<float>(binaryData);
-                sol::stack::push<osg::Vec3f>(lua.lua_state(), osg::Vec3f(x, y, z));
+                sol::stack::push<osg::Vec3f>(lua, osg::Vec3f(x, y, z));
                 return;
             }
         }
@@ -240,7 +245,8 @@ namespace LuaUtil
         return res;
     }
 
-    sol::object deserialize(sol::state& lua, std::string_view binaryData, const UserdataSerializer* customSerializer)
+    sol::object deserialize(lua_State* lua, std::string_view binaryData,
+                            const UserdataSerializer* customSerializer, bool readOnly)
     {
         if (binaryData.empty())
             return sol::nil;
@@ -248,10 +254,10 @@ namespace LuaUtil
             throw std::runtime_error("Incorrect version of Lua serialization format: " +
                                      std::to_string(static_cast<unsigned>(binaryData[0])));
         binaryData = binaryData.substr(1);
-        deserializeImpl(lua, binaryData, customSerializer);
+        deserializeImpl(lua, binaryData, customSerializer, readOnly);
         if (!binaryData.empty())
             throw std::runtime_error("Unexpected data after serialized object");
-        return sol::stack::pop<sol::object>(lua.lua_state());
+        return sol::stack::pop<sol::object>(lua);
     }
 
 }
diff --git a/components/lua/serialization.hpp b/components/lua/serialization.hpp
index fddae2cfb4..d685bb2ad6 100644
--- a/components/lua/serialization.hpp
+++ b/components/lua/serialization.hpp
@@ -1,7 +1,6 @@
 #ifndef COMPONENTS_LUA_SERIALIZATION_H
 #define COMPONENTS_LUA_SERIALIZATION_H
 
-#include <limits> // missing from sol/sol.hpp
 #include <sol/sol.hpp>
 
 namespace LuaUtil
@@ -21,14 +20,15 @@ namespace LuaUtil
 
         // Deserializes userdata of type "typeName" from binaryData. Should push the result on stack using sol::stack::push.
         // Returns false if this type is not supported by this serializer.
-        virtual bool deserialize(std::string_view typeName, std::string_view binaryData, sol::state&) const = 0;
+        virtual bool deserialize(std::string_view typeName, std::string_view binaryData, lua_State*) const = 0;
 
     protected:
         static void append(BinaryData&, std::string_view typeName, const void* data, size_t dataSize);
     };
 
     BinaryData serialize(const sol::object&, const UserdataSerializer* customSerializer = nullptr);
-    sol::object deserialize(sol::state& lua, std::string_view binaryData, const UserdataSerializer* customSerializer = nullptr);
+    sol::object deserialize(lua_State* lua, std::string_view binaryData,
+                            const UserdataSerializer* customSerializer = nullptr, bool readOnly = false);
 
 }
 
diff --git a/components/lua/utilpackage.cpp b/components/lua/utilpackage.cpp
index b68fc7afa4..abb680a6bc 100644
--- a/components/lua/utilpackage.cpp
+++ b/components/lua/utilpackage.cpp
@@ -175,6 +175,7 @@ namespace LuaUtil
         util["clamp"] = [](float value, float from, float to) { return std::clamp(value, from, to); };
         // NOTE: `util["clamp"] = std::clamp<float>` causes error 'AddressSanitizer: stack-use-after-scope'
         util["normalizeAngle"] = &Misc::normalizeAngle;
+        util["makeReadOnly"] = &makeReadOnly;
 
         return util;
     }
diff --git a/files/lua_api/openmw/util.lua b/files/lua_api/openmw/util.lua
index fdb140ad53..22986f09a6 100644
--- a/files/lua_api/openmw/util.lua
+++ b/files/lua_api/openmw/util.lua
@@ -19,6 +19,12 @@
 -- @param #number angle Angle in radians
 -- @return #number Angle in range `[-pi, pi]`
 
+-------------------------------------------------------------------------------
+-- Makes a table read only.
+-- @function [parent=#util] makeReadOnly
+-- @param #table table Any table.
+-- @return #table The same table wrapped with read only userdata.
+
 
 -------------------------------------------------------------------------------
 -- Immutable 2D vector

From db72380ba926655354fc89f6e9cbe643d1c7babf Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Tue, 14 Dec 2021 00:51:18 +0100
Subject: [PATCH 1858/2859] Allow Lua scripts to handle input actions when UI
 is opened. Also fixes #6456.

---
 apps/openmw/engine.cpp                       | 12 ++++-------
 apps/openmw/mwlua/luabindings.cpp            |  3 ++-
 apps/openmw/mwlua/luamanagerimp.cpp          | 22 +++++++++++---------
 apps/openmw/mwlua/luamanagerimp.hpp          |  4 ++--
 apps/openmw/mwlua/worldview.cpp              |  3 +++
 apps/openmw/mwlua/worldview.hpp              |  4 ++++
 files/builtin_scripts/scripts/omw/camera.lua |  2 ++
 files/lua_api/openmw/core.lua                |  7 ++++++-
 8 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index a44a02ef18..5c9e915703 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -296,7 +296,7 @@ bool OMW::Engine::frame(float frametime)
 
         // Should be called after input manager update and before any change to the game world.
         // It applies to the game world queued changes from the previous frame.
-        mLuaManager->synchronizedUpdate(mEnvironment.getWindowManager()->isGuiMode(), frametime);
+        mLuaManager->synchronizedUpdate();
 
         // update game state
         {
@@ -873,10 +873,8 @@ public:
             mThread = std::thread([this]{ threadBody(); });
     };
 
-    void allowUpdate(double dt)
+    void allowUpdate()
     {
-        mDt = dt;
-        mIsGuiMode = mEngine->mEnvironment.getWindowManager()->isGuiMode();
         if (!mThread)
             return;
         {
@@ -918,7 +916,7 @@ private:
         const unsigned int frameNumber = viewer->getFrameStamp()->getFrameNumber();
         ScopedProfile<UserStatsType::Lua> profile(frameStart, frameNumber, *osg::Timer::instance(), *viewer->getViewerStats());
 
-        mEngine->mLuaManager->update(mIsGuiMode, mDt);
+        mEngine->mLuaManager->update();
     }
 
     void threadBody()
@@ -943,8 +941,6 @@ private:
     std::condition_variable mCV;
     bool mUpdateRequest = false;
     bool mJoinRequest = false;
-    double mDt = 0;
-    bool mIsGuiMode = false;
     std::optional<std::thread> mThread;
 };
 
@@ -1057,7 +1053,7 @@ void OMW::Engine::go()
 
             mEnvironment.getWorld()->updateWindowManager();
 
-            luaWorker.allowUpdate(dt);  // if there is a separate Lua thread, it starts the update now
+            luaWorker.allowUpdate();  // if there is a separate Lua thread, it starts the update now
 
             mViewer->renderingTraversals();
 
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index 80af77139c..57b1b17a3b 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -25,7 +25,7 @@ namespace MWLua
     {
         auto* lua = context.mLua;
         sol::table api(lua->sol(), sol::create);
-        api["API_REVISION"] = 10;
+        api["API_REVISION"] = 11;
         api["quit"] = [lua]()
         {
             Log(Debug::Warning) << "Quit requested by a Lua script.\n" << lua->debugTraceback();
@@ -37,6 +37,7 @@ namespace MWLua
         };
         api["getGameTimeInSeconds"] = [world=context.mWorldView]() { return world->getGameTimeInSeconds(); };
         api["getGameTimeInHours"] = [world=context.mWorldView]() { return world->getGameTimeInHours(); };
+        api["isWorldPaused"] = [world=context.mWorldView]() { return world->isPaused(); };
         api["OBJECT_TYPE"] = definitionList(*lua,
         {
             "Activator", "Armor", "Book", "Clothing", "Creature", "Door", "Ingredient",
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 2f3df00f7f..f134ef86dd 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -78,11 +78,12 @@ namespace MWLua
         mInitialized = true;
     }
 
-    void LuaManager::update(bool paused, float dt)
+    void LuaManager::update()
     {
         if (mPlayer.isEmpty())
             return;  // The game is not started yet.
 
+        float frameDuration = MWBase::Environment::get().getFrameDuration();
         ObjectRegistry* objectRegistry = mWorldView.getObjectRegistry();
 
         MWWorld::Ptr newPlayerPtr = MWBase::Environment::get().getWorld()->getPlayerPtr();
@@ -101,9 +102,9 @@ namespace MWLua
         mGlobalEvents = std::vector<GlobalEvent>();
         mLocalEvents = std::vector<LocalEvent>();
 
-        if (!paused)
+        if (!mWorldView.isPaused())
         {  // Update time and process timers
-            double seconds = mWorldView.getGameTimeInSeconds() + dt;
+            double seconds = mWorldView.getGameTimeInSeconds() + frameDuration;
             mWorldView.setGameTimeInSeconds(seconds);
             double hours = mWorldView.getGameTimeInHours();
 
@@ -146,10 +147,10 @@ namespace MWLua
         }
         mLocalEngineEvents.clear();
 
-        if (!paused)
+        if (!mWorldView.isPaused())
         {
             for (LocalScripts* scripts : mActiveLocalScripts)
-                scripts->update(dt);
+                scripts->update(frameDuration);
         }
 
         // Engine handlers in global scripts
@@ -168,24 +169,25 @@ namespace MWLua
             mGlobalScripts.actorActive(GObject(id, objectRegistry));
         mActorAddedEvents.clear();
 
-        if (!paused)
-            mGlobalScripts.update(dt);
+        if (!mWorldView.isPaused())
+            mGlobalScripts.update(frameDuration);
     }
 
-    void LuaManager::synchronizedUpdate(bool paused, float dt)
+    void LuaManager::synchronizedUpdate()
     {
         if (mPlayer.isEmpty())
             return;  // The game is not started yet.
 
         // We apply input events in `synchronizedUpdate` rather than in `update` in order to reduce input latency.
         PlayerScripts* playerScripts = dynamic_cast<PlayerScripts*>(mPlayer.getRefData().getLuaScripts());
-        if (playerScripts && !paused)
+        if (playerScripts && !MWBase::Environment::get().getWindowManager()->containsMode(MWGui::GM_MainMenu))
         {
             for (const auto& event : mInputEvents)
                 playerScripts->processInputEvent(event);
-            playerScripts->inputUpdate(dt);
         }
         mInputEvents.clear();
+        if (playerScripts && !mWorldView.isPaused())
+            playerScripts->inputUpdate(MWBase::Environment::get().getFrameDuration());
 
         MWBase::WindowManager* windowManager = MWBase::Environment::get().getWindowManager();
         for (const std::string& message : mUIMessages)
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index 56d20c2720..88273de7f0 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -29,10 +29,10 @@ namespace MWLua
 
         // Called by engine.cpp every frame. For performance reasons it works in a separate
         // thread (in parallel with osg Cull). Can not use scene graph.
-        void update(bool paused, float dt);
+        void update();
 
         // Called by engine.cpp from the main thread. Can use scene graph.
-        void synchronizedUpdate(bool paused, float dt);
+        void synchronizedUpdate();
 
         // Available everywhere through the MWBase::LuaManager interface.
         // LuaManager queues these events and propagates to scripts on the next `update` call.
diff --git a/apps/openmw/mwlua/worldview.cpp b/apps/openmw/mwlua/worldview.cpp
index beaa2d4770..219035745a 100644
--- a/apps/openmw/mwlua/worldview.cpp
+++ b/apps/openmw/mwlua/worldview.cpp
@@ -4,6 +4,8 @@
 #include <components/esm/esmwriter.hpp>
 #include <components/esm/loadcell.hpp>
 
+#include "../mwbase/windowmanager.hpp"
+
 #include "../mwclass/container.hpp"
 
 #include "../mwworld/class.hpp"
@@ -20,6 +22,7 @@ namespace MWLua
         mContainersInScene.updateList();
         mDoorsInScene.updateList();
         mItemsInScene.updateList();
+        mPaused = MWBase::Environment::get().getWindowManager()->isGuiMode();
     }
 
     void WorldView::clear()
diff --git a/apps/openmw/mwlua/worldview.hpp b/apps/openmw/mwlua/worldview.hpp
index ea27e0ff84..a8befd4685 100644
--- a/apps/openmw/mwlua/worldview.hpp
+++ b/apps/openmw/mwlua/worldview.hpp
@@ -19,6 +19,9 @@ namespace MWLua
         void update();  // Should be called every frame.
         void clear();  // Should be called every time before starting or loading a new game.
 
+        // Whether the world is paused (i.e. game time is not changing and actors don't move).
+        bool isPaused() const { return mPaused; }
+
         // Returns the number of seconds passed from the beginning of the game.
         double getGameTimeInSeconds() const { return mGameSeconds; }
         void setGameTimeInSeconds(double t) { mGameSeconds = t; }
@@ -74,6 +77,7 @@ namespace MWLua
         ObjectGroup mItemsInScene;
 
         double mGameSeconds = 0;
+        bool mPaused = false;
     };
 
 }
diff --git a/files/builtin_scripts/scripts/omw/camera.lua b/files/builtin_scripts/scripts/omw/camera.lua
index 1a5d1ca730..4025f7eee4 100644
--- a/files/builtin_scripts/scripts/omw/camera.lua
+++ b/files/builtin_scripts/scripts/omw/camera.lua
@@ -1,4 +1,5 @@
 local camera = require('openmw.camera')
+local core = require('openmw.core')
 local input = require('openmw.input')
 local settings = require('openmw.settings')
 local util = require('openmw.util')
@@ -225,6 +226,7 @@ return {
         onUpdate = onUpdate,
         onInputUpdate = onInputUpdate,
         onInputAction = function(action)
+            if core.isWorldPaused() then return end
             if action == input.ACTION.ZoomIn then
                 zoom(10)
             elseif action == input.ACTION.ZoomOut then
diff --git a/files/lua_api/openmw/core.lua b/files/lua_api/openmw/core.lua
index 35513bbb79..fe309a92db 100644
--- a/files/lua_api/openmw/core.lua
+++ b/files/lua_api/openmw/core.lua
@@ -22,7 +22,7 @@
 
 -------------------------------------------------------------------------------
 -- Game time in seconds.
--- The number of seconds in the game world, passed from starting a new game.
+-- The number of seconds passed in the game world since starting a new game.
 -- @function [parent=#core] getGameTimeInSeconds
 -- @return #number
 
@@ -32,6 +32,11 @@
 -- @function [parent=#core] getGameTimeInHours
 -- @return #number
 
+-------------------------------------------------------------------------------
+-- Whether the world is paused (onUpdate doesn't work when the world is paused).
+-- @function [parent=#core] isWorldPaused
+-- @return #boolean
+
 
 -------------------------------------------------------------------------------
 -- @type OBJECT_TYPE

From 7d3c5f529a339030cafa1d5e0894ad8986194ee2 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Wed, 15 Dec 2021 13:19:00 +0000
Subject: [PATCH 1859/2859] Update .gitlab-ci.yml file to allow failure of
 static deps build

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1f31278be1..34a40756fe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -130,6 +130,7 @@ Ubuntu_GCC_tests_Debug:
 
 Ubuntu_GCC_Static_Deps:
   extends: Ubuntu_GCC
+  allow_failure: true
   cache:
     key: Ubuntu_GCC_Static_Deps
     paths:

From e967e0544fc885c6458ad3b90f298037ae09c877 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 15 Dec 2021 21:13:22 +0100
Subject: [PATCH 1860/2859] Upgrade to SDL 2.0.18

---
 CI/before_script.msvc.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 1341289335..32169fc04b 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -566,9 +566,9 @@ if [ -z $SKIP_DOWNLOAD ]; then
 	fi
 
 	# SDL2
-	download "SDL 2.0.12" \
-		"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/SDL2-2.0.12.zip" \
-		"SDL2-2.0.12.zip"
+	download "SDL 2.0.18" \
+		"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/SDL2-2.0.18.zip" \
+		"SDL2-2.0.18.zip"
 
 	# LZ4
 	download "LZ4 1.9.2" \
@@ -898,17 +898,17 @@ fi
 cd $DEPS
 echo
 # SDL2
-printf "SDL 2.0.12... "
+printf "SDL 2.0.18... "
 {
-	if [ -d SDL2-2.0.12 ]; then
+	if [ -d SDL2-2.0.18 ]; then
 		printf "Exists. "
 	elif [ -z $SKIP_EXTRACT ]; then
-		rm -rf SDL2-2.0.12
-		eval 7z x -y SDL2-2.0.12.zip $STRIP
+		rm -rf SDL2-2.0.18
+		eval 7z x -y SDL2-2.0.18.zip $STRIP
 	fi
-	export SDL2DIR="$(real_pwd)/SDL2-2.0.12"
+	export SDL2DIR="$(real_pwd)/SDL2-2.0.18"
 	for config in ${CONFIGURATIONS[@]}; do
-		add_runtime_dlls $config "$(pwd)/SDL2-2.0.12/lib/x${ARCHSUFFIX}/SDL2.dll"
+		add_runtime_dlls $config "$(pwd)/SDL2-2.0.18/lib/x${ARCHSUFFIX}/SDL2.dll"
 	done
 	echo Done.
 }

From d66907ba6777a858aea95d73c470a3e0d820a16d Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Wed, 15 Dec 2021 22:17:38 +0000
Subject: [PATCH 1861/2859] Log OpenGL Vendor, Renderer and Version on startup

---
 apps/openmw/engine.cpp        | 21 ++++++++++++++++++++-
 components/sceneutil/util.cpp | 16 ++++++++++++++++
 components/sceneutil/util.hpp | 12 ++++++++++++
 3 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 5c9e915703..1a73ae3531 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -43,6 +43,7 @@
 
 #include <components/sceneutil/screencapture.hpp>
 #include <components/sceneutil/depth.hpp>
+#include <components/sceneutil/util.hpp>
 
 #include "mwinput/inputmanagerimp.hpp"
 
@@ -239,6 +240,20 @@ namespace
     {
         void operator()(std::string) const {}
     };
+
+    class IdentifyOpenGLOperation : public osg::GraphicsOperation
+    {
+    public:
+        IdentifyOpenGLOperation() : GraphicsOperation("IdentifyOpenGLOperation", false)
+        {}
+
+        void operator()(osg::GraphicsContext* graphicsContext) override
+        {
+            Log(Debug::Info) << "OpenGL Vendor: " << glGetString(GL_VENDOR);
+            Log(Debug::Info) << "OpenGL Renderer: " << glGetString(GL_RENDERER);
+            Log(Debug::Info) << "OpenGL Version: " << glGetString(GL_VERSION);
+        }
+    };
 }
 
 void OMW::Engine::executeLocalScripts()
@@ -643,8 +658,12 @@ void OMW::Engine::createWindow(Settings::Manager& settings)
     camera->setGraphicsContext(graphicsWindow);
     camera->setViewport(0, 0, graphicsWindow->getTraits()->width, graphicsWindow->getTraits()->height);
 
+    osg::ref_ptr<SceneUtil::OperationSequence> realizeOperations = new SceneUtil::OperationSequence(false);
+    mViewer->setRealizeOperation(realizeOperations);
+    realizeOperations->add(new IdentifyOpenGLOperation());
+
     if (Debug::shouldDebugOpenGL())
-        mViewer->setRealizeOperation(new Debug::EnableGLDebugOperation());
+        realizeOperations->add(new Debug::EnableGLDebugOperation());
 
     mViewer->realize();
 
diff --git a/components/sceneutil/util.cpp b/components/sceneutil/util.cpp
index 7065fae933..33d8f1c8a6 100644
--- a/components/sceneutil/util.cpp
+++ b/components/sceneutil/util.cpp
@@ -317,4 +317,20 @@ bool attachAlphaToCoverageFriendlyFramebufferToCamera(osg::Camera* camera, osg::
     return addMSAAIntermediateTarget;
 }
 
+OperationSequence::OperationSequence(bool keep)
+    : Operation("OperationSequence", keep)
+    , mOperationQueue(new osg::OperationQueue())
+{
+}
+
+void OperationSequence::operator()(osg::Object* object)
+{
+    mOperationQueue->runOperations(object);
+}
+
+void OperationSequence::add(osg::Operation* operation)
+{
+    mOperationQueue->add(operation);
+}
+
 }
diff --git a/components/sceneutil/util.hpp b/components/sceneutil/util.hpp
index ddc2db845d..89d3a12e97 100644
--- a/components/sceneutil/util.hpp
+++ b/components/sceneutil/util.hpp
@@ -63,6 +63,18 @@ namespace SceneUtil
 
     // Alpha-to-coverage requires a multisampled framebuffer, so we need to set that up for RTTs
     bool attachAlphaToCoverageFriendlyFramebufferToCamera(osg::Camera* camera, osg::Camera::BufferComponent buffer, osg::Texture* texture, unsigned int level = 0, unsigned int face = 0, bool mipMapGeneration = false);
+
+    class OperationSequence : public osg::Operation
+    {
+    public:
+        OperationSequence(bool keep);
+
+        void operator()(osg::Object* object) override;
+
+        void add(osg::Operation* operation);
+    protected:
+        osg::ref_ptr<osg::OperationQueue> mOperationQueue;
+    };
 }
 
 #endif

From 651b79d34e43b32d8392c1bb2ea690a46b8ba163 Mon Sep 17 00:00:00 2001
From: kuyondo <rdja.kyd@gmail.com>
Date: Thu, 16 Dec 2021 12:53:28 +0800
Subject: [PATCH 1862/2859] Update changelog.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 174eb9e4b4..e5428e9112 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,6 +54,7 @@
     Bug #6174: Spellmaking and Enchanting sliders differences from vanilla
     Bug #6177: Followers of player follower stop following after waiting for a day
     Bug #6184: Command and Calm and Demoralize and Frenzy and Rally magic effects inconsistencies with vanilla
+    Bug #6191: Encumbrance messagebox timer works incorrectly
     Bug #6197: Infinite Casting Loop
     Bug #6253: Multiple instances of Reflect stack additively
     Bug #6255: Reflect is different from vanilla

From 94b2bde48adf3b3e4e29209057c3d70409f93b6d Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Thu, 16 Dec 2021 16:52:39 +0100
Subject: [PATCH 1863/2859] Raise required MyGUI version to 3.4.1

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 090e6c56e3..67a8f7c679 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -399,7 +399,7 @@ set(Boost_NO_BOOST_CMAKE ON)
 
 find_package(Boost 1.6.2 REQUIRED COMPONENTS ${BOOST_COMPONENTS} OPTIONAL_COMPONENTS ${BOOST_OPTIONAL_COMPONENTS})
 if(OPENMW_USE_SYSTEM_MYGUI)
-    find_package(MyGUI 3.2.2 REQUIRED)
+    find_package(MyGUI 3.4.1 REQUIRED)
 endif()
 find_package(SDL2 2.0.9 REQUIRED)
 find_package(OpenAL REQUIRED)

From 2bc81e47a6af08bef6008282621f7e36ec4da877 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Thu, 16 Dec 2021 19:22:07 +0100
Subject: [PATCH 1864/2859] Remove all MyGUI version checks

---
 apps/openmw/mwgui/bookpage.cpp                |  6 -----
 apps/openmw/mwgui/keyboardnavigation.cpp      | 27 -------------------
 .../myguiplatform/myguirendermanager.cpp      |  2 --
 .../myguiplatform/myguirendermanager.hpp      |  8 ------
 components/myguiplatform/myguitexture.cpp     |  2 --
 components/myguiplatform/myguitexture.hpp     | 23 +++++-----------
 6 files changed, 7 insertions(+), 61 deletions(-)

diff --git a/apps/openmw/mwgui/bookpage.cpp b/apps/openmw/mwgui/bookpage.cpp
index b2d2c39fd6..acaee7de28 100644
--- a/apps/openmw/mwgui/bookpage.cpp
+++ b/apps/openmw/mwgui/bookpage.cpp
@@ -907,12 +907,6 @@ protected:
             return {};
 
         MyGUI::IntPoint pos (left, top);
-#if MYGUI_VERSION < MYGUI_DEFINE_VERSION(3,2,3)
-        // work around inconsistency in MyGUI where the mouse press coordinates aren't
-        // transformed by the current Layer (even though mouse *move* events are).
-        if(!move)
-            pos = mNode->getLayer()->getPosition(left, top);
-#endif
         pos.left -= mCroppedParent->getAbsoluteLeft ();
         pos.top  -= mCroppedParent->getAbsoluteTop  ();
         pos.top += mViewTop;
diff --git a/apps/openmw/mwgui/keyboardnavigation.cpp b/apps/openmw/mwgui/keyboardnavigation.cpp
index b4437873c3..249e5d0240 100644
--- a/apps/openmw/mwgui/keyboardnavigation.cpp
+++ b/apps/openmw/mwgui/keyboardnavigation.cpp
@@ -93,19 +93,6 @@ void KeyboardNavigation::_unlinkWidget(MyGUI::Widget *widget)
         mCurrentFocus = nullptr;
 }
 
-#if MYGUI_VERSION < MYGUI_DEFINE_VERSION(3,2,3)
-void styleFocusedButton(MyGUI::Widget* w)
-{
-    if (w)
-    {
-        if (MyGUI::Button* b = w->castType<MyGUI::Button>(false))
-        {
-            b->_setWidgetState("highlighted");
-        }
-    }
-}
-#endif
-
 bool isRootParent(MyGUI::Widget* widget, MyGUI::Widget* root)
 {
     while (widget && widget->getParent())
@@ -128,9 +115,6 @@ void KeyboardNavigation::onFrame()
 
     if (focus == mCurrentFocus)
     {
-#if MYGUI_VERSION < MYGUI_DEFINE_VERSION(3,2,3)
-        styleFocusedButton(mCurrentFocus);
-#endif
         return;
     }
 
@@ -143,19 +127,8 @@ void KeyboardNavigation::onFrame()
 
     if (focus != mCurrentFocus)
     {
-#if MYGUI_VERSION < MYGUI_DEFINE_VERSION(3,2,3)
-        if (mCurrentFocus)
-        {
-            if (MyGUI::Button* b = mCurrentFocus->castType<MyGUI::Button>(false))
-                b->_setWidgetState("normal");
-        }
-#endif
         mCurrentFocus = focus;
     }
-
-#if MYGUI_VERSION < MYGUI_DEFINE_VERSION(3,2,3)
-    styleFocusedButton(mCurrentFocus);
-#endif
 }
 
 void KeyboardNavigation::setDefaultFocus(MyGUI::Widget *window, MyGUI::Widget *defaultFocus)
diff --git a/components/myguiplatform/myguirendermanager.cpp b/components/myguiplatform/myguirendermanager.cpp
index 43b176c795..7fb82bbce5 100644
--- a/components/myguiplatform/myguirendermanager.cpp
+++ b/components/myguiplatform/myguirendermanager.cpp
@@ -586,7 +586,6 @@ bool RenderManager::checkTexture(MyGUI::ITexture* _texture)
     return true;
 }
 
-#if MYGUI_VERSION > MYGUI_DEFINE_VERSION(3, 4, 0)
 void RenderManager::registerShader(
     const std::string& _shaderName,
     const std::string& _vertexProgramFile,
@@ -594,6 +593,5 @@ void RenderManager::registerShader(
 {
     MYGUI_PLATFORM_LOG(Warning, "osgMyGUI::RenderManager::registerShader is not implemented");
 }
-#endif
 
 }
diff --git a/components/myguiplatform/myguirendermanager.hpp b/components/myguiplatform/myguirendermanager.hpp
index 8ef9691e4f..bfb3da605a 100644
--- a/components/myguiplatform/myguirendermanager.hpp
+++ b/components/myguiplatform/myguirendermanager.hpp
@@ -116,17 +116,9 @@ public:
 
     bool checkTexture(MyGUI::ITexture* _texture);
 
-    // setViewSize() is a part of MyGUI::RenderManager interface since 3.4.0 release
-#if MYGUI_VERSION < MYGUI_DEFINE_VERSION(3, 4, 0)
-    void setViewSize(int width, int height);
-#else
     void setViewSize(int width, int height) override;
-#endif
 
-    // registerShader() is a part of MyGUI::RenderManager interface since 3.4.1 release
-#if MYGUI_VERSION > MYGUI_DEFINE_VERSION(3, 4, 0)
     void registerShader(const std::string& _shaderName, const std::string& _vertexProgramFile, const std::string& _fragmentProgramFile) override;
-#endif
 
 /*internal:*/
 
diff --git a/components/myguiplatform/myguitexture.cpp b/components/myguiplatform/myguitexture.cpp
index d0e4e9a86e..d120cb52f3 100644
--- a/components/myguiplatform/myguitexture.cpp
+++ b/components/myguiplatform/myguitexture.cpp
@@ -165,8 +165,6 @@ namespace osgMyGUI
         return nullptr;
     }
 
-#if MYGUI_VERSION > MYGUI_DEFINE_VERSION(3, 4, 0)
     void OSGTexture::setShader(const std::string& _shaderName)
     { Log(Debug::Warning) << "OSGTexture::setShader is not implemented"; }
-#endif
 }
diff --git a/components/myguiplatform/myguitexture.hpp b/components/myguiplatform/myguitexture.hpp
index e8b49eab04..4f7ff8f116 100644
--- a/components/myguiplatform/myguitexture.hpp
+++ b/components/myguiplatform/myguitexture.hpp
@@ -5,12 +5,6 @@
 
 #include <osg/ref_ptr>
 
-#if MYGUI_VERSION > MYGUI_DEFINE_VERSION(3, 4, 0)
-    #define OPENMW_MYGUI_CONST_GETTER_3_4_1 const
-#else
-    #define OPENMW_MYGUI_CONST_GETTER_3_4_1
-#endif
-
 namespace osg
 {
     class Image;
@@ -57,21 +51,18 @@ namespace osgMyGUI
 
         void* lock(MyGUI::TextureUsage access) override;
         void unlock() override;
-        bool isLocked() OPENMW_MYGUI_CONST_GETTER_3_4_1 override { return mLockedImage.valid(); }
+        bool isLocked() const override { return mLockedImage.valid(); }
 
-        int getWidth() OPENMW_MYGUI_CONST_GETTER_3_4_1 override { return mWidth; }
-        int getHeight() OPENMW_MYGUI_CONST_GETTER_3_4_1 override { return mHeight; }
+        int getWidth() const override { return mWidth; }
+        int getHeight() const override { return mHeight; }
 
-        MyGUI::PixelFormat getFormat() OPENMW_MYGUI_CONST_GETTER_3_4_1 override { return mFormat; }
-        MyGUI::TextureUsage getUsage() OPENMW_MYGUI_CONST_GETTER_3_4_1 override { return mUsage; }
-        size_t getNumElemBytes() OPENMW_MYGUI_CONST_GETTER_3_4_1 override { return mNumElemBytes; }
+        MyGUI::PixelFormat getFormat() const override { return mFormat; }
+        MyGUI::TextureUsage getUsage() const override { return mUsage; }
+        size_t getNumElemBytes() const override { return mNumElemBytes; }
 
         MyGUI::IRenderTarget *getRenderTarget() override;
 
-    // setShader() is a part of MyGUI::RenderManager interface since 3.4.1 release
-#if MYGUI_VERSION > MYGUI_DEFINE_VERSION(3, 4, 0)
-    void setShader(const std::string& _shaderName) override;
-#endif
+        void setShader(const std::string& _shaderName) override;
 
     /*internal:*/
         osg::Texture2D *getTexture() const { return mTexture.get(); }

From 3f52ede9cbae3153bc0827c3b4e478135c71fa4f Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Thu, 16 Dec 2021 19:48:10 +0100
Subject: [PATCH 1865/2859] Remove unnecessary myguicompat

---
 components/myguiplatform/myguicompat.h          | 12 ------------
 components/myguiplatform/myguidatamanager.cpp   |  8 ++++----
 components/myguiplatform/myguidatamanager.hpp   | 10 ++++------
 components/myguiplatform/myguirendermanager.cpp |  5 ++---
 components/myguiplatform/myguirendermanager.hpp |  6 ++----
 components/myguiplatform/scalinglayer.cpp       |  4 +---
 6 files changed, 13 insertions(+), 32 deletions(-)
 delete mode 100644 components/myguiplatform/myguicompat.h

diff --git a/components/myguiplatform/myguicompat.h b/components/myguiplatform/myguicompat.h
deleted file mode 100644
index 04ca11a79f..0000000000
--- a/components/myguiplatform/myguicompat.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef OPENMW_COMPONENTS_MYGUIPLATFORM_MYGUICOMPAT_H
-#define OPENMW_COMPONENTS_MYGUIPLATFORM_MYGUICOMPAT_H
-
-#include <MyGUI_Prerequest.h>
-
-#if MYGUI_VERSION > MYGUI_DEFINE_VERSION(3, 4, 0)
-    #define OPENMW_MYGUI_CONST_GETTER_3_4_1 const
-#else
-    #define OPENMW_MYGUI_CONST_GETTER_3_4_1
-#endif
-
-#endif  // OPENMW_COMPONENTS_MYGUIPLATFORM_MYGUICOMPAT_H
diff --git a/components/myguiplatform/myguidatamanager.cpp b/components/myguiplatform/myguidatamanager.cpp
index 0310e996b9..fc5d2bf953 100644
--- a/components/myguiplatform/myguidatamanager.cpp
+++ b/components/myguiplatform/myguidatamanager.cpp
@@ -15,7 +15,7 @@ void DataManager::setResourcePath(const std::string &path)
     mResourcePath = path;
 }
 
-MyGUI::IDataStream *DataManager::getData(const std::string &name) OPENMW_MYGUI_CONST_GETTER_3_4_1
+MyGUI::IDataStream *DataManager::getData(const std::string &name) const
 {
     std::string fullpath = getDataPath(name);
     std::unique_ptr<boost::filesystem::ifstream> stream;
@@ -34,13 +34,13 @@ void DataManager::freeData(MyGUI::IDataStream *data)
     delete data;
 }
 
-bool DataManager::isDataExist(const std::string &name) OPENMW_MYGUI_CONST_GETTER_3_4_1
+bool DataManager::isDataExist(const std::string &name) const
 {
     std::string fullpath = mResourcePath + "/" + name;
     return boost::filesystem::exists(fullpath);
 }
 
-const MyGUI::VectorString &DataManager::getDataListNames(const std::string &pattern) OPENMW_MYGUI_CONST_GETTER_3_4_1
+const MyGUI::VectorString &DataManager::getDataListNames(const std::string &pattern) const
 {
     // TODO: pattern matching (unused?)
     static MyGUI::VectorString strings;
@@ -49,7 +49,7 @@ const MyGUI::VectorString &DataManager::getDataListNames(const std::string &patt
     return strings;
 }
 
-const std::string &DataManager::getDataPath(const std::string &name) OPENMW_MYGUI_CONST_GETTER_3_4_1
+const std::string &DataManager::getDataPath(const std::string &name) const
 {
     static std::string result;
     result.clear();
diff --git a/components/myguiplatform/myguidatamanager.hpp b/components/myguiplatform/myguidatamanager.hpp
index ca2f94899c..da24763d7b 100644
--- a/components/myguiplatform/myguidatamanager.hpp
+++ b/components/myguiplatform/myguidatamanager.hpp
@@ -3,8 +3,6 @@
 
 #include <MyGUI_DataManager.h>
 
-#include "myguicompat.h"
-
 namespace osgMyGUI
 {
 
@@ -19,7 +17,7 @@ public:
     /** Get data stream from specified resource name.
         @param _name Resource name (usually file name).
     */
-    MyGUI::IDataStream* getData(const std::string& _name) OPENMW_MYGUI_CONST_GETTER_3_4_1 override;
+    MyGUI::IDataStream* getData(const std::string& _name) const override;
 
     /** Free data stream.
         @param _data Data stream.
@@ -29,18 +27,18 @@ public:
     /** Is data with specified name exist.
         @param _name Resource name.
     */
-    bool isDataExist(const std::string& _name) OPENMW_MYGUI_CONST_GETTER_3_4_1 override;
+    bool isDataExist(const std::string& _name) const override;
 
     /** Get all data names with names that matches pattern.
         @param _pattern Pattern to match (for example "*.layout").
     */
-    const MyGUI::VectorString& getDataListNames(const std::string& _pattern) OPENMW_MYGUI_CONST_GETTER_3_4_1 override;
+    const MyGUI::VectorString& getDataListNames(const std::string& _pattern) const override;
 
     /** Get full path to data.
         @param _name Resource name.
         @return Return full path to specified data.
     */
-    const std::string& getDataPath(const std::string& _name) OPENMW_MYGUI_CONST_GETTER_3_4_1 override;
+    const std::string& getDataPath(const std::string& _name) const override;
 
 private:
     std::string mResourcePath;
diff --git a/components/myguiplatform/myguirendermanager.cpp b/components/myguiplatform/myguirendermanager.cpp
index 7fb82bbce5..b8ca06a181 100644
--- a/components/myguiplatform/myguirendermanager.cpp
+++ b/components/myguiplatform/myguirendermanager.cpp
@@ -15,7 +15,6 @@
 #include <components/shader/shadermanager.hpp>
 #include <components/sceneutil/nodecallback.hpp>
 
-#include "myguicompat.h"
 #include "myguitexture.hpp"
 
 #define MYGUI_PLATFORM_LOG_SECTION "Platform"
@@ -276,7 +275,7 @@ public:
     osg::VertexBufferObject* getVertexBuffer();
 
     void setVertexCount(size_t count) override;
-    size_t getVertexCount() OPENMW_MYGUI_CONST_GETTER_3_4_1 override;
+    size_t getVertexCount() const override;
 
     MyGUI::Vertex *lock() override;
     void unlock() override;
@@ -303,7 +302,7 @@ void OSGVertexBuffer::setVertexCount(size_t count)
     mNeedVertexCount = count;
 }
 
-size_t OSGVertexBuffer::getVertexCount() OPENMW_MYGUI_CONST_GETTER_3_4_1
+size_t OSGVertexBuffer::getVertexCount() const
 {
     return mNeedVertexCount;
 }
diff --git a/components/myguiplatform/myguirendermanager.hpp b/components/myguiplatform/myguirendermanager.hpp
index bfb3da605a..0d1ad4fb41 100644
--- a/components/myguiplatform/myguirendermanager.hpp
+++ b/components/myguiplatform/myguirendermanager.hpp
@@ -5,8 +5,6 @@
 
 #include <osg/ref_ptr>
 
-#include "myguicompat.h"
-
 namespace Resource
 {
     class ImageManager;
@@ -79,7 +77,7 @@ public:
     const MyGUI::IntSize& getViewSize() const override { return mViewSize; }
 
     /** @see RenderManager::getVertexFormat */
-    MyGUI::VertexColourType getVertexFormat() OPENMW_MYGUI_CONST_GETTER_3_4_1 override
+    MyGUI::VertexColourType getVertexFormat() const override
     { return mVertexFormat; }
 
     /** @see RenderManager::isFormatSupported */
@@ -112,7 +110,7 @@ public:
     void setInjectState(osg::StateSet* stateSet);
 
     /** @see IRenderTarget::getInfo */
-    const MyGUI::RenderTargetInfo& getInfo() OPENMW_MYGUI_CONST_GETTER_3_4_1 override { return mInfo; }
+    const MyGUI::RenderTargetInfo& getInfo() const override { return mInfo; }
 
     bool checkTexture(MyGUI::ITexture* _texture);
 
diff --git a/components/myguiplatform/scalinglayer.cpp b/components/myguiplatform/scalinglayer.cpp
index 51c148253f..75a149c810 100644
--- a/components/myguiplatform/scalinglayer.cpp
+++ b/components/myguiplatform/scalinglayer.cpp
@@ -3,8 +3,6 @@
 #include <MyGUI_RenderManager.h>
 #include <algorithm>
 
-#include "myguicompat.h"
-
 namespace osgMyGUI
 {
 
@@ -39,7 +37,7 @@ namespace osgMyGUI
             mTarget->doRender(_buffer, _texture, _count);
         }
 
-        const MyGUI::RenderTargetInfo& getInfo() OPENMW_MYGUI_CONST_GETTER_3_4_1 override
+        const MyGUI::RenderTargetInfo& getInfo() const override
         {
             mInfo = mTarget->getInfo();
             mInfo.hOffset = mHOffset;

From 8fedca57802f5953f0ab229c48849ae54c9d851c Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 16 Dec 2021 21:48:47 +0100
Subject: [PATCH 1866/2859] Fix navmesh cache progress bar jumps

When initial approximation of maximum progress based on numer of cells is too
high comparing to real number of navmesh tiles.
---
 apps/launcher/datafilespage.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index 097dc21dd2..f5efa8bbcc 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -457,11 +457,18 @@ void Launcher::DataFilesPage::updateNavMeshProgress()
     QRegularExpressionMatch match = pattern.match(text);
     if (!match.hasMatch())
         return;
-    int maximum = match.captured(2).toInt();
+    int value = match.captured(1).toInt();
+    const int maximum = match.captured(2).toInt();
     if (text.contains("cell"))
-        maximum *= 100;
-    ui.navMeshProgressBar->setMaximum(std::max(ui.navMeshProgressBar->maximum(), maximum));
-    ui.navMeshProgressBar->setValue(match.captured(1).toInt());
+        ui.navMeshProgressBar->setMaximum(maximum * 100);
+    else if (maximum > ui.navMeshProgressBar->maximum())
+        ui.navMeshProgressBar->setMaximum(maximum);
+    else
+        value += static_cast<int>(std::round(
+            (ui.navMeshProgressBar->maximum() - maximum)
+            * (static_cast<float>(value) / static_cast<float>(maximum))
+        ));
+    ui.navMeshProgressBar->setValue(value);
 }
 
 void Launcher::DataFilesPage::navMeshToolFinished(int exitCode, QProcess::ExitStatus exitStatus)

From aaf6c82e33ff03567dd9657f8d4c075e061ea7b2 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 16 Dec 2021 22:40:02 +0100
Subject: [PATCH 1867/2859] Do not write shapes to navmeshdb when writing is
 disabled

---
 .../detournavigator/asyncnavmeshupdater.cpp   | 43 ++++++++++++++++++-
 .../detournavigator/asyncnavmeshupdater.cpp   | 29 +++++++++----
 .../detournavigator/asyncnavmeshupdater.hpp   |  3 +-
 .../detournavigator/dbrefgeometryobject.hpp   | 27 +++++++++---
 components/detournavigator/navmeshdbutils.cpp | 25 ++++++++++-
 components/detournavigator/navmeshdbutils.hpp |  4 ++
 components/misc/typetraits.hpp                | 19 ++++++++
 7 files changed, 133 insertions(+), 17 deletions(-)
 create mode 100644 components/misc/typetraits.hpp

diff --git a/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp b/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp
index d245838858..b23446cea7 100644
--- a/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp
+++ b/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp
@@ -26,6 +26,23 @@ namespace
         recastMeshManager.addHeightfield(cellPosition, cellSize, HeightfieldPlane {0});
     }
 
+    void addObject(const btBoxShape& shape, TileCachedRecastMeshManager& recastMeshManager)
+    {
+        const ObjectId id(&shape);
+        osg::ref_ptr<Resource::BulletShape> bulletShape(new Resource::BulletShape);
+        bulletShape->mFileName = "test.nif";
+        bulletShape->mFileHash = "test_hash";
+        ObjectTransform objectTransform;
+        std::fill(std::begin(objectTransform.mPosition.pos), std::end(objectTransform.mPosition.pos), 0.1f);
+        std::fill(std::begin(objectTransform.mPosition.rot), std::end(objectTransform.mPosition.rot), 0.2f);
+        objectTransform.mScale = 3.14f;
+        const CollisionShape collisionShape(
+            osg::ref_ptr<Resource::BulletShapeInstance>(new Resource::BulletShapeInstance(bulletShape)),
+            shape, objectTransform
+        );
+        recastMeshManager.addObject(id, collisionShape, btTransform::getIdentity(), AreaType_ground);
+    }
+
     struct DetourNavigatorAsyncNavMeshUpdaterTest : Test
     {
         Settings mSettings = makeSettings();
@@ -34,6 +51,7 @@ namespace
         const osg::Vec3f mAgentHalfExtents {29, 29, 66};
         const TilePosition mPlayerTile {0, 0};
         const std::string mWorldspace = "sys::default";
+        const btBoxShape mBox {btVector3(100, 100, 20)};
         Loading::Listener mListener;
     };
 
@@ -111,6 +129,7 @@ namespace
     {
         mRecastMeshManager.setWorldspace(mWorldspace);
         addHeightFieldPlane(mRecastMeshManager);
+        addObject(mBox, mRecastMeshManager);
         auto db = std::make_unique<NavMeshDb>(":memory:");
         NavMeshDb* const dbPtr = db.get();
         AsyncNavMeshUpdater updater(mSettings, mRecastMeshManager, mOffMeshConnectionsManager, std::move(db));
@@ -130,10 +149,11 @@ namespace
         EXPECT_EQ(tile->mVersion, mSettings.mNavMeshVersion);
     }
 
-    TEST_F(DetourNavigatorAsyncNavMeshUpdaterTest, post_when_writing_to_db_disabled_should_not_write)
+    TEST_F(DetourNavigatorAsyncNavMeshUpdaterTest, post_when_writing_to_db_disabled_should_not_write_tiles)
     {
         mRecastMeshManager.setWorldspace(mWorldspace);
         addHeightFieldPlane(mRecastMeshManager);
+        addObject(mBox, mRecastMeshManager);
         auto db = std::make_unique<NavMeshDb>(":memory:");
         NavMeshDb* const dbPtr = db.get();
         mSettings.mWriteToNavMeshDb = false;
@@ -152,6 +172,27 @@ namespace
         ASSERT_FALSE(tile.has_value());
     }
 
+    TEST_F(DetourNavigatorAsyncNavMeshUpdaterTest, post_when_writing_to_db_disabled_should_not_write_shapes)
+    {
+        mRecastMeshManager.setWorldspace(mWorldspace);
+        addHeightFieldPlane(mRecastMeshManager);
+        addObject(mBox, mRecastMeshManager);
+        auto db = std::make_unique<NavMeshDb>(":memory:");
+        NavMeshDb* const dbPtr = db.get();
+        mSettings.mWriteToNavMeshDb = false;
+        AsyncNavMeshUpdater updater(mSettings, mRecastMeshManager, mOffMeshConnectionsManager, std::move(db));
+        const auto navMeshCacheItem = std::make_shared<GuardedNavMeshCacheItem>(makeEmptyNavMesh(mSettings), 1);
+        const TilePosition tilePosition {0, 0};
+        const std::map<TilePosition, ChangeType> changedTiles {{tilePosition, ChangeType::add}};
+        updater.post(mAgentHalfExtents, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
+        updater.wait(mListener, WaitConditionType::allJobsDone);
+        const auto recastMesh = mRecastMeshManager.getMesh(mWorldspace, tilePosition);
+        ASSERT_NE(recastMesh, nullptr);
+        const auto objects = makeDbRefGeometryObjects(recastMesh->getMeshSources(),
+            [&] (const MeshSource& v) { return resolveMeshSource(*dbPtr, v); });
+        EXPECT_FALSE(objects.has_value());
+    }
+
     TEST_F(DetourNavigatorAsyncNavMeshUpdaterTest, post_should_read_from_db_on_cache_miss)
     {
         mRecastMeshManager.setWorldspace(mWorldspace);
diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index 47d984030f..657befd9d7 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -89,7 +89,8 @@ namespace DetourNavigator
         {
             if (db == nullptr)
                 return nullptr;
-            return std::make_unique<DbWorker>(updater, std::move(db), TileVersion(settings.mNavMeshVersion), settings.mRecast);
+            return std::make_unique<DbWorker>(updater, std::move(db), TileVersion(settings.mNavMeshVersion),
+                                              settings.mRecast, settings.mWriteToNavMeshDb);
         }
 
         void updateJobs(std::deque<JobIt>& jobs, TilePosition playerTile, int maxTiles)
@@ -704,11 +705,12 @@ namespace DetourNavigator
     }
 
     DbWorker::DbWorker(AsyncNavMeshUpdater& updater, std::unique_ptr<NavMeshDb>&& db,
-        TileVersion version, const RecastSettings& recastSettings)
+        TileVersion version, const RecastSettings& recastSettings, bool writeToDb)
         : mUpdater(updater)
         , mRecastSettings(recastSettings)
         , mDb(std::move(db))
         , mVersion(version)
+        , mWriteToDb(writeToDb)
         , mNextTileId(mDb->getMaxTileId() + 1)
         , mNextShapeId(mDb->getMaxShapeId() + 1)
         , mThread([this] { run(); })
@@ -799,12 +801,23 @@ namespace DetourNavigator
         if (job->mInput.empty())
         {
             Log(Debug::Debug) << "Serializing input for job " << job->mId;
-            const ShapeId shapeId = mNextShapeId;
-            const std::vector<DbRefGeometryObject> objects = makeDbRefGeometryObjects(job->mRecastMesh->getMeshSources(),
-                [&] (const MeshSource& v) { return resolveMeshSource(*mDb, v, mNextShapeId); });
-            if (shapeId != mNextShapeId)
-                ++mWrites;
-            job->mInput = serialize(mRecastSettings, *job->mRecastMesh, objects);
+            if (mWriteToDb)
+            {
+                const ShapeId shapeId = mNextShapeId;
+                const auto objects = makeDbRefGeometryObjects(job->mRecastMesh->getMeshSources(),
+                    [&] (const MeshSource& v) { return resolveMeshSource(*mDb, v, mNextShapeId); });
+                if (shapeId != mNextShapeId)
+                    ++mWrites;
+                job->mInput = serialize(mRecastSettings, *job->mRecastMesh, objects);
+            }
+            else
+            {
+                const auto objects = makeDbRefGeometryObjects(job->mRecastMesh->getMeshSources(),
+                    [&] (const MeshSource& v) { return resolveMeshSource(*mDb, v); });
+                if (!objects.has_value())
+                    return;
+                job->mInput = serialize(mRecastSettings, *job->mRecastMesh, *objects);
+            }
         }
 
         job->mCachedTileData = mDb->getTileData(job->mWorldspace, job->mChangedTile, job->mInput);
diff --git a/components/detournavigator/asyncnavmeshupdater.hpp b/components/detournavigator/asyncnavmeshupdater.hpp
index 541d86fe9c..31778f8c26 100644
--- a/components/detournavigator/asyncnavmeshupdater.hpp
+++ b/components/detournavigator/asyncnavmeshupdater.hpp
@@ -136,7 +136,7 @@ namespace DetourNavigator
         };
 
         DbWorker(AsyncNavMeshUpdater& updater, std::unique_ptr<NavMeshDb>&& db,
-            TileVersion version, const RecastSettings& recastSettings);
+            TileVersion version, const RecastSettings& recastSettings, bool writeToDb);
 
         ~DbWorker();
 
@@ -153,6 +153,7 @@ namespace DetourNavigator
         const RecastSettings& mRecastSettings;
         const std::unique_ptr<NavMeshDb> mDb;
         const TileVersion mVersion;
+        const bool mWriteToDb;
         TileId mNextTileId;
         ShapeId mNextShapeId;
         DbJobQueue mQueue;
diff --git a/components/detournavigator/dbrefgeometryobject.hpp b/components/detournavigator/dbrefgeometryobject.hpp
index 2be44ca175..acf2a58b19 100644
--- a/components/detournavigator/dbrefgeometryobject.hpp
+++ b/components/detournavigator/dbrefgeometryobject.hpp
@@ -4,10 +4,14 @@
 #include "objecttransform.hpp"
 #include "recastmesh.hpp"
 
+#include <components/misc/typetraits.hpp>
+
 #include <algorithm>
 #include <cstdint>
 #include <tuple>
 #include <vector>
+#include <optional>
+#include <type_traits>
 
 namespace DetourNavigator
 {
@@ -28,16 +32,27 @@ namespace DetourNavigator
     };
 
     template <class ResolveMeshSource>
-    inline std::vector<DbRefGeometryObject> makeDbRefGeometryObjects(const std::vector<MeshSource>& meshSources,
-        ResolveMeshSource&& resolveMeshSource)
+    inline auto makeDbRefGeometryObjects(const std::vector<MeshSource>& meshSources, ResolveMeshSource&& resolveMeshSource)
+        -> std::conditional_t<
+            Misc::isOptional<std::decay_t<decltype(resolveMeshSource(meshSources.front()))>>,
+            std::optional<std::vector<DbRefGeometryObject>>,
+            std::vector<DbRefGeometryObject>
+        >
     {
         std::vector<DbRefGeometryObject> result;
         result.reserve(meshSources.size());
-        std::transform(meshSources.begin(), meshSources.end(), std::back_inserter(result),
-            [&] (const MeshSource& meshSource)
+        for (const MeshSource& meshSource : meshSources)
+        {
+            const auto shapeId = resolveMeshSource(meshSource);
+            if constexpr (Misc::isOptional<std::decay_t<decltype(shapeId)>>)
             {
-                return DbRefGeometryObject {resolveMeshSource(meshSource), meshSource.mObjectTransform};
-            });
+                if (!shapeId.has_value())
+                    return std::nullopt;
+                result.push_back(DbRefGeometryObject {*shapeId, meshSource.mObjectTransform});
+            }
+            else
+                result.push_back(DbRefGeometryObject {shapeId, meshSource.mObjectTransform});
+        }
         std::sort(result.begin(), result.end());
         return result;
     }
diff --git a/components/detournavigator/navmeshdbutils.cpp b/components/detournavigator/navmeshdbutils.cpp
index dce6ef3a72..86f81bfc51 100644
--- a/components/detournavigator/navmeshdbutils.cpp
+++ b/components/detournavigator/navmeshdbutils.cpp
@@ -5,12 +5,21 @@
 #include <components/debug/debuglog.hpp>
 
 #include <cassert>
+#include <optional>
 
 namespace DetourNavigator
 {
     namespace
     {
-        ShapeId getShapeId(NavMeshDb& db, const std::string& name, ShapeType type, const std::string& hash, ShapeId& nextShapeId)
+        std::optional<ShapeId> findShapeId(NavMeshDb& db, const std::string& name, ShapeType type,
+            const std::string& hash)
+        {
+            const Sqlite3::ConstBlob hashData {hash.data(), static_cast<int>(hash.size())};
+            return db.findShapeId(name, type, hashData);
+        }
+
+        ShapeId getShapeId(NavMeshDb& db, const std::string& name, ShapeType type,
+            const std::string& hash, ShapeId& nextShapeId)
         {
             const Sqlite3::ConstBlob hashData {hash.data(), static_cast<int>(hash.size())};
             if (const auto existingShapeId = db.findShapeId(name, type, hashData))
@@ -37,4 +46,18 @@ namespace DetourNavigator
                 return ShapeId(0);
         }
     }
+
+    std::optional<ShapeId> resolveMeshSource(NavMeshDb& db, const MeshSource& source)
+    {
+        switch (source.mAreaType)
+        {
+            case AreaType_null:
+                return findShapeId(db, source.mShape->mFileName, ShapeType::Avoid, source.mShape->mFileHash);
+            case AreaType_ground:
+                return findShapeId(db, source.mShape->mFileName, ShapeType::Collision, source.mShape->mFileHash);
+            default:
+                Log(Debug::Warning) << "Trying to resolve recast mesh source with unsupported area type: " << source.mAreaType;
+                return std::nullopt;
+        }
+    }
 }
diff --git a/components/detournavigator/navmeshdbutils.hpp b/components/detournavigator/navmeshdbutils.hpp
index 02b3bdbb00..aafde3307c 100644
--- a/components/detournavigator/navmeshdbutils.hpp
+++ b/components/detournavigator/navmeshdbutils.hpp
@@ -3,11 +3,15 @@
 
 #include "navmeshdb.hpp"
 
+#include <optional>
+
 namespace DetourNavigator
 {
     struct MeshSource;
 
     ShapeId resolveMeshSource(NavMeshDb& db, const MeshSource& source, ShapeId& nextShapeId);
+
+    std::optional<ShapeId> resolveMeshSource(NavMeshDb& db, const MeshSource& source);
 }
 
 #endif
diff --git a/components/misc/typetraits.hpp b/components/misc/typetraits.hpp
new file mode 100644
index 0000000000..4c6a7e731b
--- /dev/null
+++ b/components/misc/typetraits.hpp
@@ -0,0 +1,19 @@
+#ifndef OPENMW_COMPONENTS_MISC_TYPETRAITS_H
+#define OPENMW_COMPONENTS_MISC_TYPETRAITS_H
+
+#include <optional>
+#include <type_traits>
+
+namespace Misc
+{
+    template <class T>
+    struct IsOptional : std::false_type {};
+
+    template <class T>
+    struct IsOptional<std::optional<T>> : std::true_type {};
+
+    template <class T>
+    inline constexpr bool isOptional = IsOptional<T>::value;
+}
+
+#endif

From b0c2317d3456860816ca2a384ce3f92fd1e4a23c Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 17 Dec 2021 00:06:11 +0100
Subject: [PATCH 1868/2859] Fix build on ubuntu 18.04
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

/<<BUILDDIR>>/openmw-0.47.0+git202112160802~ubuntu18.04.1/apps/navmeshtool/worldspacedata.cpp:213:109: error: class template argument deduction failed:
             heightfields.emplace_back(std::vector(std::begin(landData.mHeights), std::end(landData.mHeights)));
                                                                                                             ^
/<<BUILDDIR>>/openmw-0.47.0+git202112160802~ubuntu18.04.1/apps/navmeshtool/worldspacedata.cpp:213:109: error: no matching function for call to ‘vector(float*, float*)’
In file included from /usr/include/c++/7/vector:64:0,
                 from /<<BUILDDIR>>/openmw-0.47.0+git202112160802~ubuntu18.04.1/components/esm/loadpgrd.hpp:5,
                 from /<<BUILDDIR>>/openmw-0.47.0+git202112160802~ubuntu18.04.1/components/misc/convert.hpp:5,
                 from /<<BUILDDIR>>/openmw-0.47.0+git202112160802~ubuntu18.04.1/components/bullethelpers/collisionobject.hpp:4,
                 from /<<BUILDDIR>>/openmw-0.47.0+git202112160802~ubuntu18.04.1/apps/navmeshtool/worldspacedata.hpp:4,
                 from /<<BUILDDIR>>/openmw-0.47.0+git202112160802~ubuntu18.04.1/apps/navmeshtool/worldspacedata.cpp:1:
/usr/include/c++/7/bits/stl_vector.h:411:2: note: candidate: template<class _Tp, class _Alloc, class _InputIterator, class> vector(_InputIterator, _InputIterator, const _Alloc&)-> std::vector<_Tp, _Alloc>
  vector(_InputIterator __first, _InputIterator __last,
  ^~~~~~
---
 apps/navmeshtool/worldspacedata.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/navmeshtool/worldspacedata.cpp b/apps/navmeshtool/worldspacedata.cpp
index 189d24f34a..b88b967cf5 100644
--- a/apps/navmeshtool/worldspacedata.cpp
+++ b/apps/navmeshtool/worldspacedata.cpp
@@ -210,7 +210,7 @@ namespace NavMeshTool
 
             ESM::Land::LandData& landData = *landDatas.emplace_back(std::make_unique<ESM::Land::LandData>());
             land->loadData(ESM::Land::DATA_VHGT, &landData);
-            heightfields.emplace_back(std::vector(std::begin(landData.mHeights), std::end(landData.mHeights)));
+            heightfields.push_back(std::vector<float>(std::begin(landData.mHeights), std::end(landData.mHeights)));
             HeightfieldSurface surface;
             surface.mHeights = heightfields.back().data();
             surface.mMinHeight = landData.mMinHeight;

From 85a52606cf83affde56ce30dbb8ade1e25e29747 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Fri, 17 Dec 2021 09:33:13 +0000
Subject: [PATCH 1869/2859] Add support for macOS12 with XCode13 in our CI/CD

---
 .gitlab-ci.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 34a40756fe..d7f8520de4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -227,6 +227,14 @@ macOS11_Xcode12:
   variables:
     CCACHE_SIZE: 3G
 
+macOS12_Xcode13:
+  extends: .MacOS
+  image: macos-12-xcode-13
+  cache:
+    key: macOS12_Xcode13.v1
+  variables:
+    CCACHE_SIZE: 3G
+
 variables: &engine-targets
   targets: "openmw,openmw-iniimporter,openmw-launcher,openmw-wizard,openmw-navmeshtool"
   package: "Engine"

From 43b2114444d7e9577d16ba463b7ea7cb150502c2 Mon Sep 17 00:00:00 2001
From: Wassim DHIF <wassimdhif@gmail.com>
Date: Fri, 8 Oct 2021 18:36:16 +0200
Subject: [PATCH 1870/2859] Add Ubuntu build Docker image

---
 docker/Dockerfile.ubuntu | 23 +++++++++++++++++++++++
 docker/README.md         | 17 +++++++++++++++++
 docker/build.sh          | 13 +++++++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 docker/Dockerfile.ubuntu
 create mode 100644 docker/README.md
 create mode 100755 docker/build.sh

diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu
new file mode 100644
index 0000000000..51aaa6465e
--- /dev/null
+++ b/docker/Dockerfile.ubuntu
@@ -0,0 +1,23 @@
+FROM ubuntu
+LABEL maintainer="Wassim DHIF <wassimdhif@gmail.com>"
+
+ENV NPROC=1
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends software-properties-common apt-utils \
+    && add-apt-repository ppa:openmw/openmw \
+    && apt-get update \
+    && apt-get install -y --no-install-recommends openmw openmw-launcher \
+    && apt-get install -y --no-install-recommends git build-essential cmake \
+    libopenal-dev libopenscenegraph-dev libbullet-dev libsdl2-dev \
+    libmygui-dev libunshield-dev liblz4-dev libtinyxml-dev libqt5opengl5-dev \
+    libboost-filesystem-dev libboost-program-options-dev libboost-iostreams-dev \
+    libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libswresample-dev \
+    librecastnavigation-dev libluajit-5.1-dev
+
+COPY build.sh /build.sh
+
+RUN mkdir /openmw
+WORKDIR /openmw
+
+ENTRYPOINT ["/build.sh"]
diff --git a/docker/README.md b/docker/README.md
new file mode 100644
index 0000000000..4c4131c235
--- /dev/null
+++ b/docker/README.md
@@ -0,0 +1,17 @@
+# Build OpenMW using Docker
+
+## Build Docker image
+
+Replace `LINUX_VERSION` with the Linux distribution you wish to use.
+```
+docker build -f Dockerfile.LINUX_VERSION -t openmw.LINUX_VERSION .
+```
+
+## Build OpenMW using Docker
+
+Labeling systems like SELinux require that proper labels are placed on volume content mounted into a container.
+Without a label, the security system might prevent the processes running inside the container from using the content.
+The Z option tells Docker to label the content with a private unshared label.
+```
+docker run -v /path/to/openmw:/openmw:Z -e NPROC=2 -it openmw.LINUX_VERSION
+```
diff --git a/docker/build.sh b/docker/build.sh
new file mode 100755
index 0000000000..0f79161379
--- /dev/null
+++ b/docker/build.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -xe
+
+# Creating build directory...
+mkdir -p build
+cd build
+
+# Running CMake...
+cmake ../
+
+# Building with $NPROC CPU...
+make -j $NPROC

From a2964f2244cb43613e3bd81d322dc5b824cef93b Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 18 Dec 2021 15:16:37 +0100
Subject: [PATCH 1871/2859] Don't consider underwater sneaking to be sneaking

---
 apps/openmw/mwmechanics/character.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 0cbe5c284a..6c33f86c76 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -1944,7 +1944,7 @@ void CharacterController::update(float duration)
         bool flying = world->isFlying(mPtr);
         bool solid = world->isActorCollisionEnabled(mPtr);
         // Can't run and sneak while flying (see speed formula in Npc/Creature::getSpeed)
-        bool sneak = cls.getCreatureStats(mPtr).getStance(MWMechanics::CreatureStats::Stance_Sneak) && !flying;
+        bool sneak = cls.getCreatureStats(mPtr).getStance(MWMechanics::CreatureStats::Stance_Sneak) && !flying && !inwater;
         bool isrunning = cls.getCreatureStats(mPtr).getStance(MWMechanics::CreatureStats::Stance_Run) && !flying;
         CreatureStats &stats = cls.getCreatureStats(mPtr);
         Movement& movementSettings = cls.getMovementSettings(mPtr);

From 0688f55171628a91080e0b23f95678ec600a5b61 Mon Sep 17 00:00:00 2001
From: myrix <myrix@mail.ru>
Date: Sat, 18 Dec 2021 20:07:41 +0300
Subject: [PATCH 1872/2859] optimized keyword parsing

---
 apps/openmw/mwdialogue/hypertextparser.cpp | 26 +++++++++++++---------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwdialogue/hypertextparser.cpp b/apps/openmw/mwdialogue/hypertextparser.cpp
index caafa5f324..389488cbe1 100644
--- a/apps/openmw/mwdialogue/hypertextparser.cpp
+++ b/apps/openmw/mwdialogue/hypertextparser.cpp
@@ -47,19 +47,25 @@ namespace MWDialogue
 
         void tokenizeKeywords(const std::string & text, std::vector<Token> & tokens)
         {
-            const MWWorld::Store<ESM::Dialogue> & dialogs =
-                MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>();
+            static bool keywordSearchInitialized = false;
+            static KeywordSearch<std::string, int /*unused*/> keywordSearch;
 
-            std::vector<std::string> keywordList;
-            keywordList.reserve(dialogs.getSize());
-            for (const auto& it : dialogs)
-                keywordList.push_back(Misc::StringUtils::lowerCase(it.mId));
-            sort(keywordList.begin(), keywordList.end());
+            if (!keywordSearchInitialized)
+            {
+                const MWWorld::Store<ESM::Dialogue> & dialogs =
+                    MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>();
+
+                std::vector<std::string> keywordList;
+                keywordList.reserve(dialogs.getSize());
+                for (const auto& it : dialogs)
+                    keywordList.push_back(Misc::StringUtils::lowerCase(it.mId));
+                sort(keywordList.begin(), keywordList.end());
 
-            KeywordSearch<std::string, int /*unused*/> keywordSearch;
+                for (const auto& it : keywordList)
+                    keywordSearch.seed(it, 0 /*unused*/);
 
-            for (const auto& it : keywordList)
-                keywordSearch.seed(it, 0 /*unused*/);
+                keywordSearchInitialized = true;
+            }
 
             std::vector<KeywordSearch<std::string, int /*unused*/>::Match> matches;
             keywordSearch.highlightKeywords(text.begin(), text.end(), matches);

From c746a8abb70a21b73eb9bf0fec934f43337a41ca Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Sat, 18 Dec 2021 21:34:15 +0000
Subject: [PATCH 1873/2859] Attempt to catch freezes on Windows

---
 .../crashcatcher/windows_crashcatcher.cpp     |  3 +-
 .../crashcatcher/windows_crashmonitor.cpp     | 56 +++++++++++++++++++
 .../crashcatcher/windows_crashmonitor.hpp     |  4 ++
 components/crashcatcher/windows_crashshm.hpp  |  1 +
 4 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/components/crashcatcher/windows_crashcatcher.cpp b/components/crashcatcher/windows_crashcatcher.cpp
index 39ac86d7b8..eea6ac40ad 100644
--- a/components/crashcatcher/windows_crashcatcher.cpp
+++ b/components/crashcatcher/windows_crashcatcher.cpp
@@ -144,6 +144,7 @@ namespace Crash
         mShm->mEvent = CrashSHM::Event::Startup;
         mShm->mStartup.mShmMutex = duplicateHandle(mShmMutex);
         mShm->mStartup.mAppProcessHandle = duplicateHandle(GetCurrentProcess());
+        mShm->mStartup.mAppMainThreadId = GetThreadId(GetCurrentThread());
         mShm->mStartup.mSignalApp = duplicateHandle(mSignalAppEvent);
         mShm->mStartup.mSignalMonitor = duplicateHandle(mSignalMonitorEvent);
 
@@ -196,7 +197,7 @@ namespace Crash
         // must remain until monitor has finished
         waitMonitor();
 
-        std::string message = "OpenMW has encountered a fatal error.\nCrash log saved to '" + std::string(mShm->mStartup.mLogFilePath) + "'.\n Please report this to https://gitlab.com/OpenMW/openmw/issues !";
+        std::string message = "OpenMW has encountered a fatal error.\nCrash log saved to '" + std::string(mShm->mStartup.mLogFilePath) + "'.\nPlease report this to https://gitlab.com/OpenMW/openmw/issues !";
         SDL_ShowSimpleMessageBox(0, "Fatal Error", message.c_str(), nullptr);
     }
 
diff --git a/components/crashcatcher/windows_crashmonitor.cpp b/components/crashcatcher/windows_crashmonitor.cpp
index 8976deb2ea..26ebc0bad3 100644
--- a/components/crashcatcher/windows_crashmonitor.cpp
+++ b/components/crashcatcher/windows_crashmonitor.cpp
@@ -9,6 +9,8 @@
 #include <memory>
 #include <sstream>
 
+#include <SDL_messagebox.h>
+
 #include "windows_crashcatcher.hpp"
 #include "windows_crashmonitor.hpp"
 #include "windows_crashshm.hpp"
@@ -28,6 +30,7 @@ namespace Crash
 
         mShmMutex = mShm->mStartup.mShmMutex;
         mAppProcessHandle = mShm->mStartup.mAppProcessHandle;
+        mAppMainThreadId = mShm->mStartup.mAppMainThreadId;
         mSignalAppEvent = mShm->mStartup.mSignalApp;
         mSignalMonitorEvent = mShm->mStartup.mSignalMonitor;
     }
@@ -80,6 +83,44 @@ namespace Crash
         return code == STILL_ACTIVE;
     }
 
+    bool CrashMonitor::isAppFrozen()
+    {
+        if (!mAppWindowHandle)
+        {
+            EnumWindows([](HWND handle, LPARAM param) -> BOOL {
+                CrashMonitor& crashMonitor = *(CrashMonitor*)param;
+                DWORD processId;
+                if (GetWindowThreadProcessId(handle, &processId) == crashMonitor.mAppMainThreadId && processId == GetProcessId(crashMonitor.mAppProcessHandle))
+                {
+                    if (GetWindow(handle, GW_OWNER) == 0)
+                    {
+                        crashMonitor.mAppWindowHandle = handle;
+                        return false;
+                    }
+                }
+                return true;
+                }, (LPARAM)this);
+            if (mAppWindowHandle)
+            {
+                // TODO: use https://devblogs.microsoft.com/oldnewthing/20111026-00/?p=9263 to monitor for the window being destroyed
+            }
+            else
+                return false;
+        }
+        if (IsHungAppWindow)
+            return IsHungAppWindow(mAppWindowHandle);
+        else
+        {
+            BOOL debuggerPresent;
+
+            if (CheckRemoteDebuggerPresent(mAppProcessHandle, &debuggerPresent) && debuggerPresent)
+                return false;
+            if (SendMessageTimeoutA(mAppWindowHandle, WM_NULL, 0, 0, 0, 5000, nullptr) == 0)
+                return GetLastError() == ERROR_TIMEOUT;
+        }
+        return false;
+    }
+
     void CrashMonitor::run()
     {
         try
@@ -88,8 +129,16 @@ namespace Crash
             signalApp();
 
             bool running = true;
+            bool frozen = false;
             while (isAppAlive() && running)
             {
+                if (isAppFrozen())
+                {
+                    frozen = true;
+                    handleCrash();
+                    running = false;
+                    break;
+                }
                 if (waitApp())
                 {
                     shmLock();
@@ -113,6 +162,13 @@ namespace Crash
                 }
             }
 
+            if (frozen)
+            {
+                TerminateProcess(mAppProcessHandle, -1);
+                std::string message = "OpenMW appears to have frozen.\nCrash log saved to '" + std::string(mShm->mStartup.mLogFilePath) + "'.\nPlease report this to https://gitlab.com/OpenMW/openmw/issues !";
+                SDL_ShowSimpleMessageBox(0, "Fatal Error", message.c_str(), nullptr);
+            }
+
         } 
         catch (...)
         {
diff --git a/components/crashcatcher/windows_crashmonitor.hpp b/components/crashcatcher/windows_crashmonitor.hpp
index 678d38435c..01acd34bdd 100644
--- a/components/crashcatcher/windows_crashmonitor.hpp
+++ b/components/crashcatcher/windows_crashmonitor.hpp
@@ -21,6 +21,8 @@ public:
 private:
 
     HANDLE mAppProcessHandle = nullptr;
+    DWORD mAppMainThreadId = 0;
+    HWND mAppWindowHandle = nullptr;
 
     // triggered when the monitor process wants to wake the parent process (received via SHM)
     HANDLE mSignalAppEvent = nullptr;
@@ -37,6 +39,8 @@ private:
 
     bool isAppAlive() const;
 
+    bool isAppFrozen();
+
     void shmLock();
 
     void shmUnlock();
diff --git a/components/crashcatcher/windows_crashshm.hpp b/components/crashcatcher/windows_crashshm.hpp
index 47929a45fe..a474600f94 100644
--- a/components/crashcatcher/windows_crashshm.hpp
+++ b/components/crashcatcher/windows_crashshm.hpp
@@ -26,6 +26,7 @@ namespace Crash
         struct Startup
         {
             HANDLE mAppProcessHandle;
+            DWORD mAppMainThreadId;
             HANDLE mSignalApp;
             HANDLE mSignalMonitor;
             HANDLE mShmMutex;

From 3a9cfbfa5340b80dd8949a0334ddea72a58eb39a Mon Sep 17 00:00:00 2001
From: myrix <myrix@mail.ru>
Date: Sun, 19 Dec 2021 14:00:49 +0300
Subject: [PATCH 1874/2859] HyperTextParser as a class with proper keyword
 search caching

---
 apps/openmw/mwdialogue/dialoguemanagerimp.cpp |   3 +-
 apps/openmw/mwdialogue/dialoguemanagerimp.hpp |   4 +
 apps/openmw/mwdialogue/hypertextparser.cpp    | 126 +++++++++---------
 apps/openmw/mwdialogue/hypertextparser.hpp    |  15 ++-
 apps/openmw/mwworld/store.cpp                 |  26 +++-
 apps/openmw/mwworld/store.hpp                 |   4 +
 6 files changed, 105 insertions(+), 73 deletions(-)

diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index 9800f1b39c..0698624f32 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -43,7 +43,6 @@
 #include "../mwmechanics/actorutil.hpp"
 
 #include "filter.hpp"
-#include "hypertextparser.hpp"
 
 namespace MWDialogue
 {
@@ -80,7 +79,7 @@ namespace MWDialogue
     {
         std::vector<std::string> topicIdList;
 
-        std::vector<HyperTextParser::Token> hypertext = HyperTextParser::parseHyperText(text);
+        std::vector<HyperTextParser::Token> hypertext = mHyperTextParser.parseHyperText(text);
 
         for (std::vector<HyperTextParser::Token>::iterator tok = hypertext.begin(); tok != hypertext.end(); ++tok)
         {
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.hpp b/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
index 57eb74d0a6..1fc80db666 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
@@ -16,6 +16,8 @@
 
 #include "../mwscript/compilercontext.hpp"
 
+#include "hypertextparser.hpp"
+
 namespace ESM
 {
     struct Dialogue;
@@ -57,6 +59,8 @@ namespace MWDialogue
             int mCurrentDisposition;
             int mPermanentDispositionChange;
 
+            HyperTextParser mHyperTextParser;
+
             std::vector<std::string> parseTopicIdsFromText (const std::string& text);
             void addTopicsFromText (const std::string& text);
 
diff --git a/apps/openmw/mwdialogue/hypertextparser.cpp b/apps/openmw/mwdialogue/hypertextparser.cpp
index 389488cbe1..eae36d26d1 100644
--- a/apps/openmw/mwdialogue/hypertextparser.cpp
+++ b/apps/openmw/mwdialogue/hypertextparser.cpp
@@ -6,95 +6,89 @@
 #include "../mwworld/store.hpp"
 #include "../mwworld/esmstore.hpp"
 
-#include "keywordsearch.hpp"
-
 #include "hypertextparser.hpp"
 
 namespace MWDialogue
 {
-    namespace HyperTextParser
+    std::vector<HyperTextParser::Token> HyperTextParser::parseHyperText(const std::string & text)
     {
-        std::vector<Token> parseHyperText(const std::string & text)
+        std::vector<Token> result;
+        size_t pos_end = std::string::npos, iteration_pos = 0;
+        for(;;)
         {
-            std::vector<Token> result;
-            size_t pos_end = std::string::npos, iteration_pos = 0;
-            for(;;)
+            size_t pos_begin = text.find('@', iteration_pos);
+            if (pos_begin != std::string::npos)
+                pos_end = text.find('#', pos_begin);
+
+            if (pos_begin != std::string::npos && pos_end != std::string::npos)
             {
-                size_t pos_begin = text.find('@', iteration_pos);
-                if (pos_begin != std::string::npos)
-                    pos_end = text.find('#', pos_begin);
-
-                if (pos_begin != std::string::npos && pos_end != std::string::npos)
-                {
-                    if (pos_begin != iteration_pos)
-                        tokenizeKeywords(text.substr(iteration_pos, pos_begin - iteration_pos), result);
-
-                    std::string link = text.substr(pos_begin + 1, pos_end - pos_begin - 1);
-                    result.emplace_back(link, Token::ExplicitLink);
-
-                    iteration_pos = pos_end + 1;
-                }
-                else
-                {
-                    if (iteration_pos != text.size())
-                        tokenizeKeywords(text.substr(iteration_pos), result);
-                    break;
-                }
-            }
+                if (pos_begin != iteration_pos)
+                    tokenizeKeywords(text.substr(iteration_pos, pos_begin - iteration_pos), result);
 
-            return result;
+                std::string link = text.substr(pos_begin + 1, pos_end - pos_begin - 1);
+                result.emplace_back(link, Token::ExplicitLink);
+
+                iteration_pos = pos_end + 1;
+            }
+            else
+            {
+                if (iteration_pos != text.size())
+                    tokenizeKeywords(text.substr(iteration_pos), result);
+                break;
+            }
         }
 
-        void tokenizeKeywords(const std::string & text, std::vector<Token> & tokens)
-        {
-            static bool keywordSearchInitialized = false;
-            static KeywordSearch<std::string, int /*unused*/> keywordSearch;
+        return result;
+    }
 
-            if (!keywordSearchInitialized)
-            {
-                const MWWorld::Store<ESM::Dialogue> & dialogs =
-                    MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>();
+    void HyperTextParser::tokenizeKeywords(const std::string & text, std::vector<Token> & tokens)
+    {
+        const MWWorld::Store<ESM::Dialogue> & dialogs =
+            MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>();
 
-                std::vector<std::string> keywordList;
-                keywordList.reserve(dialogs.getSize());
-                for (const auto& it : dialogs)
-                    keywordList.push_back(Misc::StringUtils::lowerCase(it.mId));
-                sort(keywordList.begin(), keywordList.end());
+        if (dialogs.getModPoint() != mKeywordModPoint)
+        {
+            mKeywordSearch.clear();
 
-                for (const auto& it : keywordList)
-                    keywordSearch.seed(it, 0 /*unused*/);
+            std::vector<std::string> keywordList;
+            keywordList.reserve(dialogs.getSize());
+            for (const auto& it : dialogs)
+                keywordList.push_back(Misc::StringUtils::lowerCase(it.mId));
+            sort(keywordList.begin(), keywordList.end());
 
-                keywordSearchInitialized = true;
-            }
+            for (const auto& it : keywordList)
+                mKeywordSearch.seed(it, 0 /*unused*/);
 
-            std::vector<KeywordSearch<std::string, int /*unused*/>::Match> matches;
-            keywordSearch.highlightKeywords(text.begin(), text.end(), matches);
+            mKeywordModPoint = dialogs.getModPoint();
+        }
 
-            for (std::vector<KeywordSearch<std::string, int /*unused*/>::Match>::const_iterator it = matches.begin(); it != matches.end(); ++it)
-            {
-                tokens.emplace_back(std::string(it->mBeg, it->mEnd), Token::ImplicitKeyword);
-            }
+        std::vector<KeywordSearch<std::string, int /*unused*/>::Match> matches;
+        mKeywordSearch.highlightKeywords(text.begin(), text.end(), matches);
+
+        for (std::vector<KeywordSearch<std::string, int /*unused*/>::Match>::const_iterator it = matches.begin(); it != matches.end(); ++it)
+        {
+            tokens.emplace_back(std::string(it->mBeg, it->mEnd), Token::ImplicitKeyword);
         }
+    }
+
+    size_t HyperTextParser::removePseudoAsterisks(std::string & phrase)
+    {
+        size_t pseudoAsterisksCount = 0;
 
-        size_t removePseudoAsterisks(std::string & phrase)
+        if( !phrase.empty() )
         {
-            size_t pseudoAsterisksCount = 0;
+            std::string::reverse_iterator rit = phrase.rbegin();
 
-            if( !phrase.empty() )
+            const char specialPseudoAsteriskCharacter = 127;
+            while( rit != phrase.rend() && *rit == specialPseudoAsteriskCharacter )
             {
-                std::string::reverse_iterator rit = phrase.rbegin();
-
-                const char specialPseudoAsteriskCharacter = 127;
-                while( rit != phrase.rend() && *rit == specialPseudoAsteriskCharacter )
-                {
-                    pseudoAsterisksCount++;
-                    ++rit;
-                }
+                pseudoAsterisksCount++;
+                ++rit;
             }
+        }
 
-            phrase = phrase.substr(0, phrase.length() - pseudoAsterisksCount);
+        phrase = phrase.substr(0, phrase.length() - pseudoAsterisksCount);
 
-            return pseudoAsterisksCount;
-        }
+        return pseudoAsterisksCount;
     }
 }
diff --git a/apps/openmw/mwdialogue/hypertextparser.hpp b/apps/openmw/mwdialogue/hypertextparser.hpp
index 4ae0474c42..1e903d5618 100644
--- a/apps/openmw/mwdialogue/hypertextparser.hpp
+++ b/apps/openmw/mwdialogue/hypertextparser.hpp
@@ -4,10 +4,17 @@
 #include <string>
 #include <vector>
 
+#include "keywordsearch.hpp"
+
 namespace MWDialogue
 {
-    namespace HyperTextParser
+    class HyperTextParser
     {
+        uint64_t mKeywordModPoint;
+        KeywordSearch<std::string, int /*unused*/> mKeywordSearch;
+
+    public:
+
         struct Token
         {
             enum Type
@@ -24,12 +31,14 @@ namespace MWDialogue
             Type mType;
         };
 
+        HyperTextParser() : mKeywordModPoint(0) {}
+
         // In translations (at least Russian) the links are marked with @#, so
         // it should be a function to parse it
         std::vector<Token> parseHyperText(const std::string & text);
         void tokenizeKeywords(const std::string & text, std::vector<Token> & tokens);
-        size_t removePseudoAsterisks(std::string & phrase);
-    }
+        static size_t removePseudoAsterisks(std::string & phrase);
+    };
 }
 
 #endif
diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index 4d720a11a7..5c696e5556 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -77,12 +77,13 @@ namespace MWWorld
 
     template<typename T>
     Store<T>::Store()
+        : mModPoint(1)
     {
     }
 
     template<typename T>
     Store<T>::Store(const Store<T>& orig)
-        : mStatic(orig.mStatic)
+        : mStatic(orig.mStatic), mModPoint(orig.mModPoint + 1)
     {
     }
 
@@ -93,6 +94,8 @@ namespace MWWorld
         assert(mShared.size() >= mStatic.size());
         mShared.erase(mShared.begin() + mStatic.size(), mShared.end());
         mDynamic.clear();
+
+        mModPoint++;
     }
 
     template<typename T>
@@ -162,6 +165,8 @@ namespace MWWorld
         if (inserted.second)
             mShared.push_back(&inserted.first->second);
 
+        mModPoint++;
+
         return RecordId(record.mId, isDeleted);
     }
     template<typename T>
@@ -213,6 +218,9 @@ namespace MWWorld
         T *ptr = &result.first->second;
         if (result.second)
             mShared.push_back(ptr);
+
+        mModPoint++;
+
         return ptr;
     }
     template<typename T>
@@ -222,6 +230,9 @@ namespace MWWorld
         T *ptr = &result.first->second;
         if (result.second)
             mShared.push_back(ptr);
+
+        mModPoint++;
+
         return ptr;
     }
     template<typename T>
@@ -242,6 +253,8 @@ namespace MWWorld
                 ++sharedIter;
             }
             mStatic.erase(it);
+
+            mModPoint++;
         }
 
         return true;
@@ -259,6 +272,9 @@ namespace MWWorld
         for (auto it = mDynamic.begin(); it != mDynamic.end(); ++it) {
             mShared.push_back(&it->second);
         }
+
+        mModPoint++;
+
         return true;
     }
     template<typename T>
@@ -997,6 +1013,8 @@ namespace MWWorld
         // TODO: verify and document this inconsistent behaviour
         // TODO: if we require this behaviour, maybe we should move it to the place that requires it
         std::sort(mShared.begin(), mShared.end(), [](const ESM::Dialogue* l, const ESM::Dialogue* r) -> bool { return l->mId < r->mId; });
+
+        mModPoint++;
     }
 
     template <>
@@ -1018,6 +1036,8 @@ namespace MWWorld
             found->second.loadData(esm, isDeleted);
             dialogue.mId = found->second.mId;
         }
+        
+        mModPoint++;
 
         return RecordId(dialogue.mId, isDeleted);
     }
@@ -1025,7 +1045,9 @@ namespace MWWorld
     template<>
     bool Store<ESM::Dialogue>::eraseStatic(const std::string &id)
     {
-        mStatic.erase(id);
+        if (mStatic.erase(id))
+            mModPoint++;
+
         return true;
     }
 
diff --git a/apps/openmw/mwworld/store.hpp b/apps/openmw/mwworld/store.hpp
index 22f36da690..b4ac1056a8 100644
--- a/apps/openmw/mwworld/store.hpp
+++ b/apps/openmw/mwworld/store.hpp
@@ -159,6 +159,8 @@ namespace MWWorld
         typedef std::unordered_map<std::string, T, Misc::StringUtils::CiHash, Misc::StringUtils::CiEqual> Dynamic;
         Dynamic mDynamic;
 
+        uint64_t mModPoint;
+
         friend class ESMStore;
 
     public:
@@ -203,6 +205,8 @@ namespace MWWorld
         RecordId load(ESM::ESMReader &esm) override;
         void write(ESM::ESMWriter& writer, Loading::Listener& progress) const override;
         RecordId read(ESM::ESMReader& reader, bool overrideOnly = false) override;
+
+        uint64_t getModPoint() const { return mModPoint; }
     };
 
     template <>

From 02ef6c858dcc92e5a32d985180b6dd4143dc3d8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matja=C5=BE=20Lamut?= <matjaz.lamut@gmail.com>
Date: Sun, 19 Dec 2021 21:27:00 +0000
Subject: [PATCH 1875/2859] Tutorial on how to get a static model from Blender
 to OpenMW. The existing article on Blender-OpenMW pipeline via COLLADA will
 be split into more in-depth articles for static and animated models
 respectively.

---
 ...pipeline-blender-collada-static-models.rst | 129 ++++++++++++++++++
 1 file changed, 129 insertions(+)
 create mode 100644 docs/source/reference/modding/custom-models/pipeline-blender-collada-static-models.rst

diff --git a/docs/source/reference/modding/custom-models/pipeline-blender-collada-static-models.rst b/docs/source/reference/modding/custom-models/pipeline-blender-collada-static-models.rst
new file mode 100644
index 0000000000..72edc6fe1f
--- /dev/null
+++ b/docs/source/reference/modding/custom-models/pipeline-blender-collada-static-models.rst
@@ -0,0 +1,129 @@
+########################
+Static Model via COLLADA
+########################
+
+This tutorial shows how to get a static model from Blender to OpenMW 
+using the COLLADA format. It does not cover using Blender itself, as there are 
+many better resources for that. The focus is solely on the pipeline and its 
+specific requirements. Static models are those that don’t have any animations 
+included in the exported file.
+
+Requirements
+************
+
+To use the Blender to OpenMW pipeline via COLLADA, you will need the following.
+
+* `OpenMW 0.47 <https://openmw.org/downloads/>`_ or later
+* `Blender 2.81 <https://www.blender.org/download/>`_ or later. Latest confirmed, working version is Blender 3.0
+* `Better COLLADA Exporter <https://github.com/unelsson/collada-exporter>`_ tuned for OpenMW
+* A model you would like to export. In our case, it's a barrel.
+
+The Barrel
+********
+The barrel shown in this tutorial, and its revelant files, are available from 
+the `Example Suite repository <https://gitlab.com/OpenMW/example-suite/-/tree/master/example_static_object>`_.
+This should be useful for further study of how to set up a static prop in case
+the tutorial is not clear on any particular thing.
+
+.. image:: barrel-prop-in-blender.webp
+    :align: center
+
+* ``data/meshes/the_barrel.dae`` – exported model
+* ``data/textures/the_barrel.dds`` – diffuse texture
+* ``data/textures/the_barrel_n.dds`` – normal map
+* ``data/textures/the_barrel_n.dds`` – specular map
+* ``source_assets/the_barrel.blend`` – source file configured as this tutorial specifies
+
+Location, Rotation, Scale
+*************************
+
+First, let's take a look at how the fundamental properties of a scene 
+in Blender translate to a COLLADA model suitable for use in OpenMW. These apply 
+the same to static and animated models.
+
+Location
+========
+
+Objects keep their visual location and origin they had in the original scene.
+
+Rotation
+========
+
+* Blender’s +Z axis is up axis in OpenMW
+* Blender’s +Y axis is front axis in OpenMW
+* Blender’s X axis is left-right axis in OpenMW
+
+Scale
+=====
+
+Scale ratio between Blender and OpenMW is 70 to 1. This means 70 units in 
+Blender translate to 1 m in OpenMW.
+
+However, a scale factor like this is impractical to work with. A better 
+approach is to work with a scale of 1 Blender unit = 1 m and apply the 70 scale 
+factor at export. The exporter will automatically scale all object, mesh, 
+armature and animation data.
+
+
+Materials
+*********
+
+OpenMW uses the classic, specular material setup and currently doesn't 
+support the more mainstream `PBR <https://en.wikipedia.org/wiki/Physically_based_rendering>`_
+way. In Blender, the mesh needs a default material with a diffuse texture
+connected to the ``Base Color`` socket. This is enough for the material to be
+included in the exported COLLADA file.
+
+.. image:: barrel-prop-in-blender-material.webp
+    :align: center
+
+Additional texture types, such as specular or normal maps, are used 
+when enabled in the OpenMW Launcher with the ``Auto use object normal maps`` 
+and ``Auto use object specular maps`` options. The textures need to follow the 
+name of the diffuse texture with an additional suffix, and be in the same 
+folder. OpenMW will then automatically recognize and use these textures. In the 
+case of the barrel, the textures are named:
+
+* ``the_barrel.dds`` - diffuse texture
+* ``the_barrel_n.dds`` - normal map
+* ``the_barrel_spec.dds`` - specular map
+
+Collision Shapes
+****************
+
+In Blender, a custom collision shape is set up with an empty named 
+``Collision`` or ``collision``. Any mesh that is a child of this empty will be 
+used for physics collision and will not be visible in-game. There can be 
+multiple child meshes under ``collision`` and they will all contribute to the 
+collision shapes. The meshes themselves can have an arbitrary name, it's only 
+the name of the empty that is important. The ``tcb`` command in OpenMW's in-game 
+console will make the collision shapes visible and you will be able to inspect 
+them.
+
+.. image:: barrel-prop-in-blender-collision.webp
+    :align: center
+
+If not custom collision shape is present, OpenMW will use the regular 
+mesh itself, which is not optimal and needs to be avoided.
+
+Exporter Settings
+*****************
+
+For static models, use the following exporter settings. Before export, select 
+all objects you wish to include in the exported file and have the "Selected 
+Objects" option enabled. Without this, the exporter could fail.
+
+
+.. image:: dae-exporter-static.webp
+    :align: center
+
+Getting the Model in-game
+*************************
+
+Once the model is exported, it needs to be placed in the correct folder where 
+OpenMW will read it. In OpenMW-CS it can then be assigned to an object and added 
+to a world cell.
+
+
+.. image:: barrel-prop-in-openmwcs.webp
+    :align: center

From f057713bcbdd6e6444dea216b4ea53ac851a1961 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Mon, 20 Dec 2021 18:31:39 +0100
Subject: [PATCH 1876/2859] Fix coverity submission.

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d7f8520de4..e7cd3e4cba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -81,8 +81,8 @@ Coverity:
     - 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"
+      --form file=@cov-int.tar.gz --form version="$CI_COMMIT_REF_NAME:$CI_COMMIT_SHORT_SHA"
+      --form description="CI_COMMIT_SHORT_SHA / $CI_COMMIT_TITLE / $CI_COMMIT_REF_NAME:$CI_PIPELINE_ID"
     - cat /builds/OpenMW/openmw/cov-int/build-log.txt
   variables:
     CC: gcc

From c0d097237964e5ba213d16b5a30a9f0fbc2e6138 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matja=C5=BE=20Lamut?= <matjaz.lamut@gmail.com>
Date: Mon, 20 Dec 2021 20:20:56 +0000
Subject: [PATCH 1877/2859] Some more  tweaks and hook up the .rst file so it
 will show everything properly once on readthedocs.

---
 .../reference/modding/custom-models/index.rst    |  1 +
 .../pipeline-blender-collada-static-models.rst   | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/docs/source/reference/modding/custom-models/index.rst b/docs/source/reference/modding/custom-models/index.rst
index b204dffd99..8b6c5d87f7 100644
--- a/docs/source/reference/modding/custom-models/index.rst
+++ b/docs/source/reference/modding/custom-models/index.rst
@@ -19,5 +19,6 @@ Below is a quick overview of supported formats, followed by separate articles wi
 	:maxdepth: 1
 
 	pipeline-blender-collada
+	pipeline-blender-collada-static-models
 	pipeline-blender-osgnative
 	pipeline-blender-nif
diff --git a/docs/source/reference/modding/custom-models/pipeline-blender-collada-static-models.rst b/docs/source/reference/modding/custom-models/pipeline-blender-collada-static-models.rst
index 72edc6fe1f..a2073f0e56 100644
--- a/docs/source/reference/modding/custom-models/pipeline-blender-collada-static-models.rst
+++ b/docs/source/reference/modding/custom-models/pipeline-blender-collada-static-models.rst
@@ -15,7 +15,7 @@ To use the Blender to OpenMW pipeline via COLLADA, you will need the following.
 
 * `OpenMW 0.47 <https://openmw.org/downloads/>`_ or later
 * `Blender 2.81 <https://www.blender.org/download/>`_ or later. Latest confirmed, working version is Blender 3.0
-* `Better COLLADA Exporter <https://github.com/unelsson/collada-exporter>`_ tuned for OpenMW
+* `OpenMW COLLADA Exporter <https://github.com/Lamoot/collada-exporter>`_
 * A model you would like to export. In our case, it's a barrel.
 
 The Barrel
@@ -25,7 +25,7 @@ the `Example Suite repository <https://gitlab.com/OpenMW/example-suite/-/tree/ma
 This should be useful for further study of how to set up a static prop in case
 the tutorial is not clear on any particular thing.
 
-.. image:: barrel-prop-in-blender.webp
+.. image:: https://gitlab.com/OpenMW/openmw-docs/-/raw/master/docs/source/reference/modding/custom-models/_static/barrel-prop-in-blender.webp
     :align: center
 
 * ``data/meshes/the_barrel.dae`` – exported model
@@ -74,7 +74,7 @@ way. In Blender, the mesh needs a default material with a diffuse texture
 connected to the ``Base Color`` socket. This is enough for the material to be
 included in the exported COLLADA file.
 
-.. image:: barrel-prop-in-blender-material.webp
+.. image:: https://gitlab.com/OpenMW/openmw-docs/-/raw/master/docs/source/reference/modding/custom-models/_static/barrel-prop-in-blender-material.webp
     :align: center
 
 Additional texture types, such as specular or normal maps, are used 
@@ -100,11 +100,11 @@ the name of the empty that is important. The ``tcb`` command in OpenMW's in-game
 console will make the collision shapes visible and you will be able to inspect 
 them.
 
-.. image:: barrel-prop-in-blender-collision.webp
+.. image:: https://gitlab.com/OpenMW/openmw-docs/-/raw/master/docs/source/reference/modding/custom-models/_static/barrel-prop-in-blender-collision.webp
     :align: center
 
-If not custom collision shape is present, OpenMW will use the regular 
-mesh itself, which is not optimal and needs to be avoided.
+If no custom collision shape is present, OpenMW will use the regular 
+mesh itself, which is not optimal and should be avoided.
 
 Exporter Settings
 *****************
@@ -114,7 +114,7 @@ all objects you wish to include in the exported file and have the "Selected
 Objects" option enabled. Without this, the exporter could fail.
 
 
-.. image:: dae-exporter-static.webp
+.. image:: https://gitlab.com/OpenMW/openmw-docs/-/raw/master/docs/source/reference/modding/custom-models/_static/dae-exporter-static.webp
     :align: center
 
 Getting the Model in-game
@@ -125,5 +125,5 @@ OpenMW will read it. In OpenMW-CS it can then be assigned to an object and added
 to a world cell.
 
 
-.. image:: barrel-prop-in-openmwcs.webp
+.. image:: https://gitlab.com/OpenMW/openmw-docs/-/raw/master/docs/source/reference/modding/custom-models/_static/barrel-prop-in-openmwcs.webp
     :align: center

From fe1523d16d203ec1fe21a077c4adde0bacef196e Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Mon, 20 Dec 2021 22:13:11 +0000
Subject: [PATCH 1878/2859] Fix signed/unsigned mismatch

---
 components/crashcatcher/windows_crashmonitor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/crashcatcher/windows_crashmonitor.cpp b/components/crashcatcher/windows_crashmonitor.cpp
index 26ebc0bad3..5774f5ee30 100644
--- a/components/crashcatcher/windows_crashmonitor.cpp
+++ b/components/crashcatcher/windows_crashmonitor.cpp
@@ -164,7 +164,7 @@ namespace Crash
 
             if (frozen)
             {
-                TerminateProcess(mAppProcessHandle, -1);
+                TerminateProcess(mAppProcessHandle, 0xDEAD);
                 std::string message = "OpenMW appears to have frozen.\nCrash log saved to '" + std::string(mShm->mStartup.mLogFilePath) + "'.\nPlease report this to https://gitlab.com/OpenMW/openmw/issues !";
                 SDL_ShowSimpleMessageBox(0, "Fatal Error", message.c_str(), nullptr);
             }

From 97396da74c51def4ca84f86107d418cec43deb69 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Mon, 20 Dec 2021 22:23:44 +0000
Subject: [PATCH 1879/2859] Get rid of break

It might look confusing with the breaks in the switch below
---
 components/crashcatcher/windows_crashmonitor.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/components/crashcatcher/windows_crashmonitor.cpp b/components/crashcatcher/windows_crashmonitor.cpp
index 5774f5ee30..2c942e00b7 100644
--- a/components/crashcatcher/windows_crashmonitor.cpp
+++ b/components/crashcatcher/windows_crashmonitor.cpp
@@ -137,9 +137,8 @@ namespace Crash
                     frozen = true;
                     handleCrash();
                     running = false;
-                    break;
                 }
-                if (waitApp())
+                if (!frozen && waitApp())
                 {
                     shmLock();
 

From d15c2922a96f7c414229508767765acfb6c42cf6 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Mon, 20 Dec 2021 22:24:47 +0000
Subject: [PATCH 1880/2859] Stop monitoring closed windows

If it gets repalced, the new one will be watched instead
---
 .../crashcatcher/windows_crashmonitor.cpp     | 20 ++++++++++++++++++-
 .../crashcatcher/windows_crashmonitor.hpp     |  2 ++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/components/crashcatcher/windows_crashmonitor.cpp b/components/crashcatcher/windows_crashmonitor.cpp
index 2c942e00b7..4627380356 100644
--- a/components/crashcatcher/windows_crashmonitor.cpp
+++ b/components/crashcatcher/windows_crashmonitor.cpp
@@ -18,6 +18,7 @@
 
 namespace Crash
 {
+    std::unordered_map<HWINEVENTHOOK, CrashMonitor*> CrashMonitor::smEventHookOwners{};
 
     CrashMonitor::CrashMonitor(HANDLE shmHandle)
         : mShmHandle(shmHandle)
@@ -85,6 +86,10 @@ namespace Crash
 
     bool CrashMonitor::isAppFrozen()
     {
+        MSG message;
+        // Allow the event hook callback to run
+        PeekMessage(&message, nullptr, 0, 0, PM_NOREMOVE);
+
         if (!mAppWindowHandle)
         {
             EnumWindows([](HWND handle, LPARAM param) -> BOOL {
@@ -102,7 +107,20 @@ namespace Crash
                 }, (LPARAM)this);
             if (mAppWindowHandle)
             {
-                // TODO: use https://devblogs.microsoft.com/oldnewthing/20111026-00/?p=9263 to monitor for the window being destroyed
+                DWORD processId;
+                GetWindowThreadProcessId(mAppWindowHandle, &processId);
+                HWINEVENTHOOK eventHookHandle = SetWinEventHook(EVENT_OBJECT_DESTROY, EVENT_OBJECT_DESTROY, nullptr,
+                    [](HWINEVENTHOOK hWinEventHook, DWORD event, HWND windowHandle, LONG objectId, LONG childId, DWORD eventThread, DWORD eventTime)
+                    {
+                        CrashMonitor& crashMonitor = *smEventHookOwners[hWinEventHook];
+                        if (event == EVENT_OBJECT_DESTROY && windowHandle == crashMonitor.mAppWindowHandle && objectId == OBJID_WINDOW && childId == INDEXID_CONTAINER)
+                        {
+                            crashMonitor.mAppWindowHandle = nullptr;
+                            smEventHookOwners.erase(hWinEventHook);
+                            UnhookWinEvent(hWinEventHook);
+                        }
+                    }, processId, mAppMainThreadId, WINEVENT_OUTOFCONTEXT);
+                smEventHookOwners[eventHookHandle] = this;
             }
             else
                 return false;
diff --git a/components/crashcatcher/windows_crashmonitor.hpp b/components/crashcatcher/windows_crashmonitor.hpp
index 01acd34bdd..031e5b0612 100644
--- a/components/crashcatcher/windows_crashmonitor.hpp
+++ b/components/crashcatcher/windows_crashmonitor.hpp
@@ -33,6 +33,8 @@ private:
     HANDLE mShmHandle = nullptr;
     HANDLE mShmMutex = nullptr;
 
+    static std::unordered_map<HWINEVENTHOOK, CrashMonitor*> smEventHookOwners;
+
     void signalApp() const;
 
     bool waitApp() const;

From ed3286994ca59abc669b229c62e63f238f1e73d1 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 20 Dec 2021 19:50:58 +0100
Subject: [PATCH 1881/2859] Fix ASAN error: heap-use-after-free

=================================================================
==20931==ERROR: AddressSanitizer: heap-use-after-free on address 0x607000206030 at pc 0x7fc8b0f3a72b bp 0x7ffcee176860 sp 0x7ffcee176008
READ of size 13 at 0x607000206030 thread T0
    #0 0x7fc8b0f3a72a in __interceptor_strlen /build/gcc/src/gcc/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc:389
    #1 0x562e069a0af7 in QString::fromUtf8(char const*, int) /usr/include/qt/QtCore/qstring.h:706
    #2 0x562e069a0af7 in Launcher::AdvancedPage::AdvancedPage(Config::GameSettings&, QWidget*) /home/elsid/dev/openmw/apps/launcher/advancedpage.cpp:29
    #3 0x562e06959613 in Launcher::MainDialog::createPages() /home/elsid/dev/openmw/apps/launcher/maindialog.cpp:127
    #4 0x562e069691d2 in Launcher::MainDialog::setup() /home/elsid/dev/openmw/apps/launcher/maindialog.cpp:228
    #5 0x562e06969d88 in Launcher::MainDialog::showFirstRunDialog() /home/elsid/dev/openmw/apps/launcher/maindialog.cpp:188
    #6 0x562e06957025 in main /home/elsid/dev/openmw/apps/launcher/main.cpp:35
    #7 0x7fc8ad0d9b24 in __libc_start_main (/usr/lib/libc.so.6+0x27b24)
    #8 0x562e0690fced in _start (/home/elsid/dev/openmw/build/gcc/asan/openmw-launcher+0x56ced)

0x607000206030 is located 16 bytes inside of 64-byte region [0x607000206020,0x607000206060)
freed by thread T0 here:
    #0 0x7fc8b0fb3f19 in __interceptor_free /build/gcc/src/gcc/libsanitizer/asan/asan_malloc_linux.cpp:127
    #1 0x7fc8b0de3388  (/usr/lib/libopenal.so.1+0x40388)

previously allocated by thread T0 here:
    #0 0x7fc8b0fb4fd6 in __interceptor_posix_memalign /build/gcc/src/gcc/libsanitizer/asan/asan_malloc_linux.cpp:226
    #1 0x7fc8b0e379cb  (/usr/lib/libopenal.so.1+0x949cb)

SUMMARY: AddressSanitizer: heap-use-after-free /build/gcc/src/gcc/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc:389 in __interceptor_strlen
Shadow bytes around the buggy address:
  0x0c0e80038bb0: 00 00 00 00 00 00 00 00 00 fa fa fa fa fa 00 00
  0x0c0e80038bc0: 00 00 00 00 00 00 00 fa fa fa fa fa 00 00 00 00
  0x0c0e80038bd0: 00 00 00 00 00 fa fa fa fa fa 00 00 00 00 00 00
  0x0c0e80038be0: 00 00 02 fa fa fa fa fa 00 00 00 00 00 00 00 00
  0x0c0e80038bf0: 02 fa fa fa fa fa fd fd fd fd fd fd fd fd fa fa
=>0x0c0e80038c00: fa fa fa fa fd fd[fd]fd fd fd fd fd fa fa fa fa
  0x0c0e80038c10: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
  0x0c0e80038c20: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
  0x0c0e80038c30: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
  0x0c0e80038c40: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
  0x0c0e80038c50: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
Shadow byte legend (one shadow byte represents 8 application bytes):
  Addressable:           00
  Partially addressable: 01 02 03 04 05 06 07
  Heap left redzone:       fa
  Freed heap region:       fd
  Stack left redzone:      f1
  Stack mid redzone:       f2
  Stack right redzone:     f3
  Stack after return:      f5
  Stack use after scope:   f8
  Global redzone:          f9
  Global init order:       f6
  Poisoned by user:        f7
  Container overflow:      fc
  Array cookie:            ac
  Intra object redzone:    bb
  ASan internal:           fe
  Left alloca redzone:     ca
  Right alloca redzone:    cb
  Shadow gap:              cc
==20931==ABORTING
---
 apps/launcher/advancedpage.cpp     |  9 +++++----
 apps/launcher/utils/openalutil.cpp | 10 +++++-----
 apps/launcher/utils/openalutil.hpp |  7 ++++---
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index d09704851a..b9d35b3c95 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -1,6 +1,7 @@
 #include "advancedpage.hpp"
 
 #include <array>
+#include <string>
 
 #include <components/config/gamesettings.hpp>
 #include <QFileDialog>
@@ -20,13 +21,13 @@ Launcher::AdvancedPage::AdvancedPage(Config::GameSettings &gameSettings, QWidget
     setObjectName ("AdvancedPage");
     setupUi(this);
 
-    for(const char * name : Launcher::enumerateOpenALDevices())
+    for(const std::string& name : Launcher::enumerateOpenALDevices())
     {
-        audioDeviceSelectorComboBox->addItem(QString::fromUtf8(name), QString::fromUtf8(name));
+        audioDeviceSelectorComboBox->addItem(QString::fromStdString(name), QString::fromStdString(name));
     }
-    for(const char * name : Launcher::enumerateOpenALDevicesHrtf())
+    for(const std::string& name : Launcher::enumerateOpenALDevicesHrtf())
     {
-        hrtfProfileSelectorComboBox->addItem(QString::fromUtf8(name), QString::fromUtf8(name));
+        hrtfProfileSelectorComboBox->addItem(QString::fromStdString(name), QString::fromStdString(name));
     }
 
     loadSettings();
diff --git a/apps/launcher/utils/openalutil.cpp b/apps/launcher/utils/openalutil.cpp
index 53fd704203..469872d158 100644
--- a/apps/launcher/utils/openalutil.cpp
+++ b/apps/launcher/utils/openalutil.cpp
@@ -9,9 +9,9 @@
 #define ALC_ALL_DEVICES_SPECIFIER 0x1013
 #endif
 
-std::vector<const char *> Launcher::enumerateOpenALDevices()
+std::vector<std::string> Launcher::enumerateOpenALDevices()
 {
-    std::vector<const char *> devlist;
+    std::vector<std::string> devlist;
     const ALCchar *devnames;
 
     if(alcIsExtensionPresent(nullptr, "ALC_ENUMERATE_ALL_EXT"))
@@ -22,7 +22,7 @@ std::vector<const char *> Launcher::enumerateOpenALDevices()
     {
         devnames = alcGetString(nullptr, ALC_DEVICE_SPECIFIER);
     }
-    
+
     while(devnames && *devnames)
     {
         devlist.emplace_back(devnames);
@@ -31,9 +31,9 @@ std::vector<const char *> Launcher::enumerateOpenALDevices()
     return devlist;
 }
 
-std::vector<const char *> Launcher::enumerateOpenALDevicesHrtf()
+std::vector<std::string> Launcher::enumerateOpenALDevicesHrtf()
 {
-    std::vector<const char *> ret;
+    std::vector<std::string> ret;
 
     ALCdevice *device = alcOpenDevice(nullptr);
     if(device)
diff --git a/apps/launcher/utils/openalutil.hpp b/apps/launcher/utils/openalutil.hpp
index 4a84fbae7d..b084dce7ce 100644
--- a/apps/launcher/utils/openalutil.hpp
+++ b/apps/launcher/utils/openalutil.hpp
@@ -1,7 +1,8 @@
 #include <vector>
+#include <string>
 
 namespace Launcher
 {
-    std::vector<const char *> enumerateOpenALDevices();
-    std::vector<const char *> enumerateOpenALDevicesHrtf();
-}
\ No newline at end of file
+    std::vector<std::string> enumerateOpenALDevices();
+    std::vector<std::string> enumerateOpenALDevicesHrtf();
+}

From 55b066d2bdb42b19251aedfe34e25823a9e31a5d Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Tue, 21 Dec 2021 10:50:28 +0100
Subject: [PATCH 1882/2859] Preserve the original caster if classic reflected
 absorb spells behaviour is on

---
 apps/openmw/mwmechanics/activespells.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/activespells.cpp b/apps/openmw/mwmechanics/activespells.cpp
index d435bd6c44..3fbb347098 100644
--- a/apps/openmw/mwmechanics/activespells.cpp
+++ b/apps/openmw/mwmechanics/activespells.cpp
@@ -9,6 +9,8 @@
 
 #include <components/esm/loadmgef.hpp>
 
+#include <components/settings/settings.hpp>
+
 #include "creaturestats.hpp"
 #include "spellcasting.hpp"
 #include "spelleffects.hpp"
@@ -236,7 +238,13 @@ namespace MWMechanics
                 if(result == MagicApplicationResult::REFLECTED)
                 {
                     if(!reflected)
-                        reflected = {*spellIt, ptr};
+                    {
+                        static const bool keepOriginalCaster = Settings::Manager::getBool("classic reflected absorb spells behavior", "Game");
+                        if(keepOriginalCaster)
+                            reflected = {*spellIt, caster};
+                        else
+                            reflected = {*spellIt, ptr};
+                    }
                     auto& reflectedEffect = reflected->mEffects.emplace_back(*it);
                     reflectedEffect.mFlags = ESM::ActiveEffect::Flag_Ignore_Reflect | ESM::ActiveEffect::Flag_Ignore_SpellAbsorption;
                     it = spellIt->mEffects.erase(it);

From 766cb52523498b4b3878f33941f8908f52b481fc Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Tue, 21 Dec 2021 14:53:31 +0000
Subject: [PATCH 1883/2859] Factorise `add-apt-repository -y ppa:openmw/openmw`

---
 .gitlab-ci.yml            | 5 -----
 CI/install_debian_deps.sh | 2 ++
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e7cd3e4cba..ea2d860f07 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,7 +48,6 @@ Clang_Tidy:
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule"'
   before_script:
-    - apt-get update; apt-get -y install software-properties-common; add-apt-repository -y ppa:openmw/openmw
     - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic clang-tidy clang
   script:
     - CI/before_script.linux.sh
@@ -69,7 +68,6 @@ Coverity:
   rules:
     - if: $CI_PIPELINE_SOURCE == "schedule"
   before_script:
-    - apt-get update; apt-get -y install software-properties-common; add-apt-repository -y ppa:openmw/openmw
     - 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
@@ -96,7 +94,6 @@ Ubuntu_GCC:
   cache:
     key: Ubuntu_GCC.v2
   before_script:
-    - apt-get update; apt-get -y install software-properties-common; add-apt-repository -y ppa:openmw/openmw
     - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic
   variables:
     CC: gcc
@@ -138,7 +135,6 @@ Ubuntu_GCC_Static_Deps:
     - ccache/
     - build/extern/fetched/
   before_script:
-    - apt-get update; apt-get -y install software-properties-common; add-apt-repository -y ppa:openmw/openmw
     - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-static
   variables:
     CI_OPENMW_USE_STATIC_DEPS: 1
@@ -158,7 +154,6 @@ Ubuntu_GCC_Static_Deps_tests:
 Ubuntu_Clang:
   extends: .Ubuntu
   before_script:
-    - apt-get update; apt-get -y install software-properties-common; add-apt-repository -y ppa:openmw/openmw
     - CI/install_debian_deps.sh clang openmw-deps openmw-deps-dynamic
   cache:
     key: Ubuntu_Clang.v2
diff --git a/CI/install_debian_deps.sh b/CI/install_debian_deps.sh
index 370f7f23ed..6364bb2cd1 100755
--- a/CI/install_debian_deps.sh
+++ b/CI/install_debian_deps.sh
@@ -65,4 +65,6 @@ export APT_CACHE_DIR="${PWD}/apt-cache"
 set -x
 mkdir -pv "$APT_CACHE_DIR"
 apt-get update -yqq
+apt-get -qq -o dir::cache::archives="$APT_CACHE_DIR" install -y --no-install-recommends software-properties-common
+add-apt-repository -y ppa:openmw/openmw
 apt-get -qq -o dir::cache::archives="$APT_CACHE_DIR" install -y --no-install-recommends "${deps[@]}"

From f05cd901cf02694f9561fc01af2bd73fadbaedad Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Tue, 21 Dec 2021 23:19:13 +0000
Subject: [PATCH 1884/2859] Show messagebox while OpenMW appears to be frozen

If it thaws, the messagebox disappears again.
The user can press the Abort button to kill OpenMW and generate a crash
dump.
---
 .../crashcatcher/windows_crashmonitor.cpp     | 60 +++++++++++++++++--
 .../crashcatcher/windows_crashmonitor.hpp     |  7 +++
 2 files changed, 62 insertions(+), 5 deletions(-)

diff --git a/components/crashcatcher/windows_crashmonitor.cpp b/components/crashcatcher/windows_crashmonitor.cpp
index 4627380356..336210391a 100644
--- a/components/crashcatcher/windows_crashmonitor.cpp
+++ b/components/crashcatcher/windows_crashmonitor.cpp
@@ -148,15 +148,23 @@ namespace Crash
 
             bool running = true;
             bool frozen = false;
-            while (isAppAlive() && running)
+            while (isAppAlive() && running && !mFreezeAbort)
             {
                 if (isAppFrozen())
                 {
-                    frozen = true;
-                    handleCrash();
-                    running = false;
+                    if (!frozen)
+                    {
+                        showFreezeMessageBox();
+                        frozen = true;
+                    }
+                }
+                else if (frozen)
+                {
+                    hideFreezeMessageBox();
+                    frozen = false;
                 }
-                if (!frozen && waitApp())
+
+                if (!mFreezeAbort && waitApp())
                 {
                     shmLock();
 
@@ -180,6 +188,9 @@ namespace Crash
             }
 
             if (frozen)
+                hideFreezeMessageBox();
+
+            if (mFreezeAbort)
             {
                 TerminateProcess(mAppProcessHandle, 0xDEAD);
                 std::string message = "OpenMW appears to have frozen.\nCrash log saved to '" + std::string(mShm->mStartup.mLogFilePath) + "'.\nPlease report this to https://gitlab.com/OpenMW/openmw/issues !";
@@ -258,4 +269,43 @@ namespace Crash
         }
     }
 
+    void CrashMonitor::showFreezeMessageBox()
+    {
+        std::thread messageBoxThread([&]() {
+            SDL_MessageBoxButtonData button = { SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT, 0, "Abort" };
+            SDL_MessageBoxData messageBoxData = {
+                SDL_MESSAGEBOX_ERROR,
+                nullptr,
+                "OpenMW appears to have frozen",
+                "OpenMW appears to have frozen. Press Abort to terminate it and generate a crash dump.\nIf OpenMW hasn't actually frozen, this message box will disappear a within a few seconds of it becoming responsive.",
+                1,
+                &button,
+                nullptr
+            };
+
+            int buttonId;
+            if (SDL_ShowMessageBox(&messageBoxData, &buttonId) == 0 && buttonId == 0)
+                mFreezeAbort = true;
+            });
+
+        mFreezeMessageBoxThreadId = GetThreadId(messageBoxThread.native_handle());
+        messageBoxThread.detach();
+    }
+
+    void CrashMonitor::hideFreezeMessageBox()
+    {
+        if (!mFreezeMessageBoxThreadId)
+            return;
+
+        EnumWindows([](HWND handle, LPARAM param) -> BOOL {
+            CrashMonitor& crashMonitor = *(CrashMonitor*)param;
+            DWORD processId;
+            if (GetWindowThreadProcessId(handle, &processId) == crashMonitor.mFreezeMessageBoxThreadId && processId == GetCurrentProcessId())
+                PostMessage(handle, WM_CLOSE, 0, 0);
+            return true;
+            }, (LPARAM)this);
+
+        mFreezeMessageBoxThreadId = 0;
+    }
+
 } // namespace Crash
diff --git a/components/crashcatcher/windows_crashmonitor.hpp b/components/crashcatcher/windows_crashmonitor.hpp
index 031e5b0612..b520e309b0 100644
--- a/components/crashcatcher/windows_crashmonitor.hpp
+++ b/components/crashcatcher/windows_crashmonitor.hpp
@@ -33,6 +33,9 @@ private:
     HANDLE mShmHandle = nullptr;
     HANDLE mShmMutex = nullptr;
 
+    DWORD mFreezeMessageBoxThreadId = 0;
+    std::atomic_bool mFreezeAbort;
+
     static std::unordered_map<HWINEVENTHOOK, CrashMonitor*> smEventHookOwners;
 
     void signalApp() const;
@@ -48,6 +51,10 @@ private:
     void shmUnlock();
 
     void handleCrash();
+
+    void showFreezeMessageBox();
+
+    void hideFreezeMessageBox();
 };
 
 } // namespace Crash

From ca453910797c07b8dff777f58a25d9c744da7f04 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Tue, 21 Dec 2021 21:38:23 +0100
Subject: [PATCH 1885/2859] Only run static jobs when cmake-related things are
 modified

---
 .gitlab-ci.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ea2d860f07..987e05da44 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -127,6 +127,13 @@ Ubuntu_GCC_tests_Debug:
 
 Ubuntu_GCC_Static_Deps:
   extends: Ubuntu_GCC
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "push"  
+      changes:
+        - "**/CMakeLists.txt"
+        - "cmake/**/*"
+        - "CI/**/*"
+        - ".gitlab-ci.yml"
   allow_failure: true
   cache:
     key: Ubuntu_GCC_Static_Deps

From c9fb4ee2ede75f375d34c236eeadcbe87244b5dc Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Wed, 22 Dec 2021 22:43:23 +0000
Subject: [PATCH 1886/2859] Silence `apt-get install` even more

---
 CI/install_debian_deps.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CI/install_debian_deps.sh b/CI/install_debian_deps.sh
index 6364bb2cd1..945c5f09bf 100755
--- a/CI/install_debian_deps.sh
+++ b/CI/install_debian_deps.sh
@@ -65,6 +65,6 @@ export APT_CACHE_DIR="${PWD}/apt-cache"
 set -x
 mkdir -pv "$APT_CACHE_DIR"
 apt-get update -yqq
-apt-get -qq -o dir::cache::archives="$APT_CACHE_DIR" install -y --no-install-recommends software-properties-common
+apt-get -qq -o dir::cache::archives="$APT_CACHE_DIR" install -y --no-install-recommends software-properties-common >/dev/null
 add-apt-repository -y ppa:openmw/openmw
-apt-get -qq -o dir::cache::archives="$APT_CACHE_DIR" install -y --no-install-recommends "${deps[@]}"
+apt-get -qq -o dir::cache::archives="$APT_CACHE_DIR" install -y --no-install-recommends "${deps[@]}" >/dev/null

From b06248a31f52c0c7b808d79dd2b14df5d6bf37e3 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sat, 18 Dec 2021 17:04:55 +0100
Subject: [PATCH 1887/2859] Fix #6502

---
 components/resource/scenemanager.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 5f2d78d2ed..72349dadb1 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -1,6 +1,7 @@
 #include "scenemanager.hpp"
 
 #include <cstdlib>
+#include <filesystem>
 
 #include <osg/AlphaFunc>
 #include <osg/Node>
@@ -10,6 +11,7 @@
 
 #include <osgUtil/IncrementalCompileOperation>
 
+#include <osgDB/FileUtils>
 #include <osgDB/SharedStateManager>
 #include <osgDB/Registry>
 
@@ -472,9 +474,14 @@ namespace Resource
 
         osgDB::ReaderWriter::ReadResult readImage(const std::string& filename, const osgDB::Options* options) override
         {
+            std::filesystem::path filePath(filename);
+            if (filePath.is_absolute())
+                // It is a hack. Needed because either OSG or libcollada-dom tries to make an absolute path from
+                // our relative VFS path by adding current working directory.
+                filePath = std::filesystem::relative(filename, osgDB::getCurrentWorkingDirectory());
             try
             {
-                return osgDB::ReaderWriter::ReadResult(mImageManager->getImage(filename), osgDB::ReaderWriter::ReadResult::FILE_LOADED);
+                return osgDB::ReaderWriter::ReadResult(mImageManager->getImage(filePath), osgDB::ReaderWriter::ReadResult::FILE_LOADED);
             }
             catch (std::exception& e)
             {

From 27cc7a5172265b861e0b5b050f95df549534a0bc Mon Sep 17 00:00:00 2001
From: myrix <myrix@mail.ru>
Date: Fri, 24 Dec 2021 00:54:00 +0300
Subject: [PATCH 1888/2859] caching dialog keyword search in
 Store<ESM::Dialogue>

---
 apps/openmw/mwbase/world.hpp                  |   6 +
 apps/openmw/mwdialogue/dialoguemanagerimp.cpp |   3 +-
 apps/openmw/mwdialogue/dialoguemanagerimp.hpp |   4 -
 apps/openmw/mwdialogue/hypertextparser.cpp    | 115 ++++++++----------
 apps/openmw/mwdialogue/hypertextparser.hpp    |  15 +--
 apps/openmw/mwdialogue/keywordsearch.hpp      |  10 +-
 apps/openmw/mwworld/esmstore.hpp              |   3 +
 apps/openmw/mwworld/store.cpp                 |  87 +++++++++----
 apps/openmw/mwworld/store.hpp                 |  42 ++++++-
 apps/openmw/mwworld/worldimp.hpp              |   3 +
 10 files changed, 175 insertions(+), 113 deletions(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index d1747a2e39..d0ff851274 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -87,6 +87,11 @@ namespace MWWorld
     typedef std::vector<std::pair<MWWorld::Ptr,MWMechanics::Movement> > PtrMovementList;
 }
 
+namespace MWDialogue
+{
+    template <typename string_t, typename value_t> class KeywordSearch;
+}
+
 namespace MWBase
 {
     /// \brief Interface for the World (implemented in MWWorld)
@@ -150,6 +155,7 @@ namespace MWBase
             virtual MWWorld::ConstPtr getPlayerConstPtr() const = 0;
 
             virtual const MWWorld::ESMStore& getStore() const = 0;
+            virtual const MWDialogue::KeywordSearch<std::string, int>& getDialogIdKeywordSearch() = 0;
 
             virtual std::vector<ESM::ESMReader>& getEsmReader() = 0;
 
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index 0698624f32..9800f1b39c 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -43,6 +43,7 @@
 #include "../mwmechanics/actorutil.hpp"
 
 #include "filter.hpp"
+#include "hypertextparser.hpp"
 
 namespace MWDialogue
 {
@@ -79,7 +80,7 @@ namespace MWDialogue
     {
         std::vector<std::string> topicIdList;
 
-        std::vector<HyperTextParser::Token> hypertext = mHyperTextParser.parseHyperText(text);
+        std::vector<HyperTextParser::Token> hypertext = HyperTextParser::parseHyperText(text);
 
         for (std::vector<HyperTextParser::Token>::iterator tok = hypertext.begin(); tok != hypertext.end(); ++tok)
         {
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.hpp b/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
index 1fc80db666..57eb74d0a6 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
@@ -16,8 +16,6 @@
 
 #include "../mwscript/compilercontext.hpp"
 
-#include "hypertextparser.hpp"
-
 namespace ESM
 {
     struct Dialogue;
@@ -59,8 +57,6 @@ namespace MWDialogue
             int mCurrentDisposition;
             int mPermanentDispositionChange;
 
-            HyperTextParser mHyperTextParser;
-
             std::vector<std::string> parseTopicIdsFromText (const std::string& text);
             void addTopicsFromText (const std::string& text);
 
diff --git a/apps/openmw/mwdialogue/hypertextparser.cpp b/apps/openmw/mwdialogue/hypertextparser.cpp
index eae36d26d1..c1fb6c9c43 100644
--- a/apps/openmw/mwdialogue/hypertextparser.cpp
+++ b/apps/openmw/mwdialogue/hypertextparser.cpp
@@ -6,89 +6,78 @@
 #include "../mwworld/store.hpp"
 #include "../mwworld/esmstore.hpp"
 
+#include "keywordsearch.hpp"
+
 #include "hypertextparser.hpp"
 
 namespace MWDialogue
 {
-    std::vector<HyperTextParser::Token> HyperTextParser::parseHyperText(const std::string & text)
+    namespace HyperTextParser
     {
-        std::vector<Token> result;
-        size_t pos_end = std::string::npos, iteration_pos = 0;
-        for(;;)
+        std::vector<Token> parseHyperText(const std::string & text)
         {
-            size_t pos_begin = text.find('@', iteration_pos);
-            if (pos_begin != std::string::npos)
-                pos_end = text.find('#', pos_begin);
-
-            if (pos_begin != std::string::npos && pos_end != std::string::npos)
-            {
-                if (pos_begin != iteration_pos)
-                    tokenizeKeywords(text.substr(iteration_pos, pos_begin - iteration_pos), result);
-
-                std::string link = text.substr(pos_begin + 1, pos_end - pos_begin - 1);
-                result.emplace_back(link, Token::ExplicitLink);
-
-                iteration_pos = pos_end + 1;
-            }
-            else
+            std::vector<Token> result;
+            size_t pos_end = std::string::npos, iteration_pos = 0;
+            for(;;)
             {
-                if (iteration_pos != text.size())
-                    tokenizeKeywords(text.substr(iteration_pos), result);
-                break;
+                size_t pos_begin = text.find('@', iteration_pos);
+                if (pos_begin != std::string::npos)
+                    pos_end = text.find('#', pos_begin);
+
+                if (pos_begin != std::string::npos && pos_end != std::string::npos)
+                {
+                    if (pos_begin != iteration_pos)
+                        tokenizeKeywords(text.substr(iteration_pos, pos_begin - iteration_pos), result);
+
+                    std::string link = text.substr(pos_begin + 1, pos_end - pos_begin - 1);
+                    result.emplace_back(link, Token::ExplicitLink);
+
+                    iteration_pos = pos_end + 1;
+                }
+                else
+                {
+                    if (iteration_pos != text.size())
+                        tokenizeKeywords(text.substr(iteration_pos), result);
+                    break;
+                }
             }
-        }
-
-        return result;
-    }
 
-    void HyperTextParser::tokenizeKeywords(const std::string & text, std::vector<Token> & tokens)
-    {
-        const MWWorld::Store<ESM::Dialogue> & dialogs =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>();
+            return result;
+        }
 
-        if (dialogs.getModPoint() != mKeywordModPoint)
+        void tokenizeKeywords(const std::string & text, std::vector<Token> & tokens)
         {
-            mKeywordSearch.clear();
-
-            std::vector<std::string> keywordList;
-            keywordList.reserve(dialogs.getSize());
-            for (const auto& it : dialogs)
-                keywordList.push_back(Misc::StringUtils::lowerCase(it.mId));
-            sort(keywordList.begin(), keywordList.end());
+            const auto& keywordSearch =
+                MWBase::Environment::get().getWorld()->getDialogIdKeywordSearch();
 
-            for (const auto& it : keywordList)
-                mKeywordSearch.seed(it, 0 /*unused*/);
+            std::vector<KeywordSearch<std::string, int /*unused*/>::Match> matches;
+            keywordSearch.highlightKeywords(text.begin(), text.end(), matches);
 
-            mKeywordModPoint = dialogs.getModPoint();
+            for (std::vector<KeywordSearch<std::string, int /*unused*/>::Match>::const_iterator it = matches.begin(); it != matches.end(); ++it)
+            {
+                tokens.emplace_back(std::string(it->mBeg, it->mEnd), Token::ImplicitKeyword);
+            }
         }
 
-        std::vector<KeywordSearch<std::string, int /*unused*/>::Match> matches;
-        mKeywordSearch.highlightKeywords(text.begin(), text.end(), matches);
-
-        for (std::vector<KeywordSearch<std::string, int /*unused*/>::Match>::const_iterator it = matches.begin(); it != matches.end(); ++it)
+        size_t removePseudoAsterisks(std::string & phrase)
         {
-            tokens.emplace_back(std::string(it->mBeg, it->mEnd), Token::ImplicitKeyword);
-        }
-    }
+            size_t pseudoAsterisksCount = 0;
 
-    size_t HyperTextParser::removePseudoAsterisks(std::string & phrase)
-    {
-        size_t pseudoAsterisksCount = 0;
-
-        if( !phrase.empty() )
-        {
-            std::string::reverse_iterator rit = phrase.rbegin();
-
-            const char specialPseudoAsteriskCharacter = 127;
-            while( rit != phrase.rend() && *rit == specialPseudoAsteriskCharacter )
+            if( !phrase.empty() )
             {
-                pseudoAsterisksCount++;
-                ++rit;
+                std::string::reverse_iterator rit = phrase.rbegin();
+
+                const char specialPseudoAsteriskCharacter = 127;
+                while( rit != phrase.rend() && *rit == specialPseudoAsteriskCharacter )
+                {
+                    pseudoAsterisksCount++;
+                    ++rit;
+                }
             }
-        }
 
-        phrase = phrase.substr(0, phrase.length() - pseudoAsterisksCount);
+            phrase = phrase.substr(0, phrase.length() - pseudoAsterisksCount);
 
-        return pseudoAsterisksCount;
+            return pseudoAsterisksCount;
+        }
     }
 }
diff --git a/apps/openmw/mwdialogue/hypertextparser.hpp b/apps/openmw/mwdialogue/hypertextparser.hpp
index 1e903d5618..4ae0474c42 100644
--- a/apps/openmw/mwdialogue/hypertextparser.hpp
+++ b/apps/openmw/mwdialogue/hypertextparser.hpp
@@ -4,17 +4,10 @@
 #include <string>
 #include <vector>
 
-#include "keywordsearch.hpp"
-
 namespace MWDialogue
 {
-    class HyperTextParser
+    namespace HyperTextParser
     {
-        uint64_t mKeywordModPoint;
-        KeywordSearch<std::string, int /*unused*/> mKeywordSearch;
-
-    public:
-
         struct Token
         {
             enum Type
@@ -31,14 +24,12 @@ namespace MWDialogue
             Type mType;
         };
 
-        HyperTextParser() : mKeywordModPoint(0) {}
-
         // In translations (at least Russian) the links are marked with @#, so
         // it should be a function to parse it
         std::vector<Token> parseHyperText(const std::string & text);
         void tokenizeKeywords(const std::string & text, std::vector<Token> & tokens);
-        static size_t removePseudoAsterisks(std::string & phrase);
-    };
+        size_t removePseudoAsterisks(std::string & phrase);
+    }
 }
 
 #endif
diff --git a/apps/openmw/mwdialogue/keywordsearch.hpp b/apps/openmw/mwdialogue/keywordsearch.hpp
index 39599457ef..3f932084fe 100644
--- a/apps/openmw/mwdialogue/keywordsearch.hpp
+++ b/apps/openmw/mwdialogue/keywordsearch.hpp
@@ -74,13 +74,13 @@ public:
         return left.mBeg < right.mBeg;
     }
 
-    void highlightKeywords (Point beg, Point end, std::vector<Match>& out)
+    void highlightKeywords (Point beg, Point end, std::vector<Match>& out) const
     {
         std::vector<Match> matches;
         for (Point i = beg; i != end; ++i)
         {
             // check first character
-            typename Entry::childen_t::iterator candidate = mRoot.mChildren.find (Misc::StringUtils::toLower (*i));
+            typename Entry::childen_t::const_iterator candidate = mRoot.mChildren.find (Misc::StringUtils::toLower (*i));
 
             // no match, on to next character
             if (candidate == mRoot.mChildren.end ())
@@ -91,11 +91,11 @@ public:
 
             // some keywords might be longer variations of other keywords, so we definitely need a list of candidates
             // the first element in the pair is length of the match, i.e. depth from the first character on
-            std::vector< typename std::pair<int, typename Entry::childen_t::iterator> > candidates;
+            std::vector< typename std::pair<int, typename Entry::childen_t::const_iterator> > candidates;
 
             while ((j + 1) != end)
             {
-                typename Entry::childen_t::iterator next = candidate->second.mChildren.find (Misc::StringUtils::toLower (*++j));
+                typename Entry::childen_t::const_iterator next = candidate->second.mChildren.find (Misc::StringUtils::toLower (*++j));
 
                 if (next == candidate->second.mChildren.end ())
                 {
@@ -116,7 +116,7 @@ public:
             // shorter candidates will be added to the vector first. however, we want to check against longer candidates first
             std::reverse(candidates.begin(), candidates.end());
 
-            for (typename std::vector< std::pair<int, typename Entry::childen_t::iterator> >::iterator it = candidates.begin();
+            for (typename std::vector< std::pair<int, typename Entry::childen_t::const_iterator> >::iterator it = candidates.begin();
                  it != candidates.end(); ++it)
             {
                 candidate = it->second;
diff --git a/apps/openmw/mwworld/esmstore.hpp b/apps/openmw/mwworld/esmstore.hpp
index 8582a1daca..855dd062e9 100644
--- a/apps/openmw/mwworld/esmstore.hpp
+++ b/apps/openmw/mwworld/esmstore.hpp
@@ -284,6 +284,9 @@ namespace MWWorld
         /// Actors with the same ID share spells, abilities, etc.
         /// @return The shared spell list to use for this actor and whether or not it has already been initialized.
         std::pair<std::shared_ptr<MWMechanics::SpellList>, bool> getSpellList(const std::string& id) const;
+
+        const MWDialogue::KeywordSearch<std::string, int>& getDialogIdKeywordSearch() {
+            return mDialogs.getDialogIdKeywordSearch(); }
     };
 
     template <>
diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index 5c696e5556..a06bf843cb 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -77,13 +77,12 @@ namespace MWWorld
 
     template<typename T>
     Store<T>::Store()
-        : mModPoint(1)
     {
     }
 
     template<typename T>
     Store<T>::Store(const Store<T>& orig)
-        : mStatic(orig.mStatic), mModPoint(orig.mModPoint + 1)
+        : mStatic(orig.mStatic)
     {
     }
 
@@ -94,8 +93,6 @@ namespace MWWorld
         assert(mShared.size() >= mStatic.size());
         mShared.erase(mShared.begin() + mStatic.size(), mShared.end());
         mDynamic.clear();
-
-        mModPoint++;
     }
 
     template<typename T>
@@ -165,8 +162,6 @@ namespace MWWorld
         if (inserted.second)
             mShared.push_back(&inserted.first->second);
 
-        mModPoint++;
-
         return RecordId(record.mId, isDeleted);
     }
     template<typename T>
@@ -218,9 +213,6 @@ namespace MWWorld
         T *ptr = &result.first->second;
         if (result.second)
             mShared.push_back(ptr);
-
-        mModPoint++;
-
         return ptr;
     }
     template<typename T>
@@ -230,9 +222,6 @@ namespace MWWorld
         T *ptr = &result.first->second;
         if (result.second)
             mShared.push_back(ptr);
-
-        mModPoint++;
-
         return ptr;
     }
     template<typename T>
@@ -253,8 +242,6 @@ namespace MWWorld
                 ++sharedIter;
             }
             mStatic.erase(it);
-
-            mModPoint++;
         }
 
         return true;
@@ -272,9 +259,6 @@ namespace MWWorld
         for (auto it = mDynamic.begin(); it != mDynamic.end(); ++it) {
             mShared.push_back(&it->second);
         }
-
-        mModPoint++;
-
         return true;
     }
     template<typename T>
@@ -997,8 +981,11 @@ namespace MWWorld
     // Dialogue
     //=========================================================================
 
+    Store<ESM::Dialogue>::Store()
+        : mKeywordSearchModFlag(true)
+    {
+    }
 
-    template<>
     void Store<ESM::Dialogue>::setUp()
     {
         // DialInfos marked as deleted are kept during the loading phase, so that the linked list
@@ -1014,10 +1001,45 @@ namespace MWWorld
         // TODO: if we require this behaviour, maybe we should move it to the place that requires it
         std::sort(mShared.begin(), mShared.end(), [](const ESM::Dialogue* l, const ESM::Dialogue* r) -> bool { return l->mId < r->mId; });
 
-        mModPoint++;
+        mKeywordSearchModFlag = true;
+    }
+
+    const ESM::Dialogue *Store<ESM::Dialogue>::search(const std::string &id) const
+    {
+        typename Static::const_iterator it = mStatic.find(id);
+        if (it != mStatic.end())
+            return &(it->second);
+
+        return nullptr;
+    }
+
+    const ESM::Dialogue *Store<ESM::Dialogue>::find(const std::string &id) const
+    {
+        const ESM::Dialogue *ptr = search(id);
+        if (ptr == nullptr)
+        {
+            std::stringstream msg;
+            msg << ESM::Dialogue::getRecordType() << " '" << id << "' not found";
+            throw std::runtime_error(msg.str());
+        }
+        return ptr;
+    }
+
+    typename Store<ESM::Dialogue>::iterator Store<ESM::Dialogue>::begin() const
+    {
+        return mShared.begin();
+    }
+
+    typename Store<ESM::Dialogue>::iterator Store<ESM::Dialogue>::end() const
+    {
+        return mShared.end();
+    }
+
+    size_t Store<ESM::Dialogue>::getSize() const
+    {
+        return mShared.size();
     }
 
-    template <>
     inline RecordId Store<ESM::Dialogue>::load(ESM::ESMReader &esm) {
         // The original letter case of a dialogue ID is saved, because it's printed
         ESM::Dialogue dialogue;
@@ -1037,20 +1059,39 @@ namespace MWWorld
             dialogue.mId = found->second.mId;
         }
         
-        mModPoint++;
+        mKeywordSearchModFlag = true;
 
         return RecordId(dialogue.mId, isDeleted);
     }
 
-    template<>
     bool Store<ESM::Dialogue>::eraseStatic(const std::string &id)
     {
         if (mStatic.erase(id))
-            mModPoint++;
+            mKeywordSearchModFlag = true;
 
         return true;
     }
 
+    const MWDialogue::KeywordSearch<std::string, int>& Store<ESM::Dialogue>::getDialogIdKeywordSearch()
+    {
+        if (mKeywordSearchModFlag)
+        {
+            mKeywordSearch.clear();
+
+            std::vector<std::string> keywordList;
+            keywordList.reserve(getSize());
+            for (const auto& it : *this)
+                keywordList.push_back(Misc::StringUtils::lowerCase(it.mId));
+            sort(keywordList.begin(), keywordList.end());
+
+            for (const auto& it : keywordList)
+                mKeywordSearch.seed(it, 0 /*unused*/);
+
+            mKeywordSearchModFlag = false;
+        }
+
+        return mKeywordSearch;
+    }
 }
 
 template class MWWorld::Store<ESM::Activator>;
diff --git a/apps/openmw/mwworld/store.hpp b/apps/openmw/mwworld/store.hpp
index b4ac1056a8..58ac1e6780 100644
--- a/apps/openmw/mwworld/store.hpp
+++ b/apps/openmw/mwworld/store.hpp
@@ -11,6 +11,8 @@
 #include <components/esm/records.hpp>
 #include <components/misc/stringops.hpp>
 
+#include "../mwdialogue/keywordsearch.hpp"
+
 namespace ESM
 {
     struct Land;
@@ -154,13 +156,10 @@ namespace MWWorld
         /// @par mShared usually preserves the record order as it came from the content files (this
         /// is relevant for the spell autocalc code and selection order
         /// for heads/hairs in the character creation)
-        /// @warning ESM::Dialogue Store currently implements a sorted order for unknown reasons.
         std::vector<T*> mShared;
         typedef std::unordered_map<std::string, T, Misc::StringUtils::CiHash, Misc::StringUtils::CiEqual> Dynamic;
         Dynamic mDynamic;
 
-        uint64_t mModPoint;
-
         friend class ESMStore;
 
     public:
@@ -205,8 +204,6 @@ namespace MWWorld
         RecordId load(ESM::ESMReader &esm) override;
         void write(ESM::ESMWriter& writer, Loading::Listener& progress) const override;
         RecordId read(ESM::ESMReader& reader, bool overrideOnly = false) override;
-
-        uint64_t getModPoint() const { return mModPoint; }
     };
 
     template <>
@@ -444,6 +441,41 @@ namespace MWWorld
         iterator end() const;
     };
 
+    template <>
+    class Store<ESM::Dialogue> : public StoreBase
+    {
+        typedef std::unordered_map<std::string, ESM::Dialogue, Misc::StringUtils::CiHash, Misc::StringUtils::CiEqual> Static;
+        Static mStatic;
+        /// @par mShared usually preserves the record order as it came from the content files (this
+        /// is relevant for the spell autocalc code and selection order
+        /// for heads/hairs in the character creation)
+        /// @warning ESM::Dialogue Store currently implements a sorted order for unknown reasons.
+        std::vector<ESM::Dialogue*> mShared;
+
+        bool mKeywordSearchModFlag;
+        MWDialogue::KeywordSearch<std::string, int /*unused*/> mKeywordSearch;
+
+    public:
+        Store();
+
+        typedef SharedIterator<ESM::Dialogue> iterator;
+
+        void setUp() override;
+
+        const ESM::Dialogue *search(const std::string &id) const;
+        const ESM::Dialogue *find(const std::string &id) const;
+
+        iterator begin() const;
+        iterator end() const;
+
+        size_t getSize() const override;
+
+        bool eraseStatic(const std::string &id) override;
+
+        RecordId load(ESM::ESMReader &esm) override;
+
+        const MWDialogue::KeywordSearch<std::string, int>& getDialogIdKeywordSearch();
+    };
 
 } //end namespace
 
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 84d97ce37c..bea7710a53 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -236,6 +236,9 @@ namespace MWWorld
 
             const MWWorld::ESMStore& getStore() const override;
 
+            const MWDialogue::KeywordSearch<std::string, int>& getDialogIdKeywordSearch() override {
+                return mStore.getDialogIdKeywordSearch(); }
+
             std::vector<ESM::ESMReader>& getEsmReader() override;
 
             LocalScripts& getLocalScripts() override;

From 9c7835e27fe812becf82627d2bf6bb0132045317 Mon Sep 17 00:00:00 2001
From: myrix <myrix@mail.ru>
Date: Fri, 24 Dec 2021 02:04:26 +0300
Subject: [PATCH 1889/2859] explicit instantiation error fix

---
 apps/openmw/mwworld/store.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index a06bf843cb..1dc3ebf622 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -1107,7 +1107,7 @@ template class MWWorld::Store<ESM::Clothing>;
 template class MWWorld::Store<ESM::Container>;
 template class MWWorld::Store<ESM::Creature>;
 template class MWWorld::Store<ESM::CreatureLevList>;
-template class MWWorld::Store<ESM::Dialogue>;
+//template class MWWorld::Store<ESM::Dialogue>;
 template class MWWorld::Store<ESM::Door>;
 template class MWWorld::Store<ESM::Enchantment>;
 template class MWWorld::Store<ESM::Faction>;

From 26dfce11148a421edd49918a1bc6ed382bb809a7 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Thu, 23 Dec 2021 23:38:57 +0300
Subject: [PATCH 1890/2859] Rehash key group and morph loading (bug #6517)

---
 CHANGELOG.md              |  1 +
 components/nif/data.cpp   |  8 ++---
 components/nif/nifkey.hpp | 71 ++++++++++++++-------------------------
 3 files changed, 30 insertions(+), 50 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 38cd1efca5..e4094f0ec2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -91,6 +91,7 @@
     Bug #6451: Weapon summoned from Cast When Used item will have the name "None"
     Bug #6473: Strings from NIF should be parsed only to first null terminator
     Bug #6493: Unlocking owned but not locked or unlocked containers is considered a crime
+    Bug #6517: Rotations for KeyframeData in NIFs should be optional
     Feature #890: OpenMW-CS: Column filtering
     Feature #1465: "Reset" argument for AI functions
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
diff --git a/components/nif/data.cpp b/components/nif/data.cpp
index cac924733d..1b6d302d68 100644
--- a/components/nif/data.cpp
+++ b/components/nif/data.cpp
@@ -428,7 +428,7 @@ void NiMorphData::read(NIFStream *nif)
     for(int i = 0;i < morphCount;i++)
     {
         mMorphs[i].mKeyFrames = std::make_shared<FloatKeyMap>();
-        mMorphs[i].mKeyFrames->read(nif, true, /*morph*/true);
+        mMorphs[i].mKeyFrames->read(nif, /*morph*/true);
         nif->getVector3s(mMorphs[i].mVertices, vertCount);
     }
 }
@@ -445,9 +445,9 @@ void NiKeyframeData::read(NIFStream *nif)
         mXRotations = std::make_shared<FloatKeyMap>();
         mYRotations = std::make_shared<FloatKeyMap>();
         mZRotations = std::make_shared<FloatKeyMap>();
-        mXRotations->read(nif, true);
-        mYRotations->read(nif, true);
-        mZRotations->read(nif, true);
+        mXRotations->read(nif);
+        mYRotations->read(nif);
+        mZRotations->read(nif);
     }
     mTranslations = std::make_shared<Vector3KeyMap>();
     mTranslations->read(nif);
diff --git a/components/nif/nifkey.hpp b/components/nif/nifkey.hpp
index 91869ff849..f1b4f94d00 100644
--- a/components/nif/nifkey.hpp
+++ b/components/nif/nifkey.hpp
@@ -48,93 +48,72 @@ struct KeyMapT {
     using ValueType = T;
     using KeyType = KeyT<T>;
 
-    unsigned int mInterpolationType = InterpolationType_Linear;
+    unsigned int mInterpolationType = InterpolationType_Unknown;
     MapType mKeys;
 
     //Read in a KeyGroup (see http://niftools.sourceforge.net/doc/nif/NiKeyframeData.html)
-    void read(NIFStream *nif, bool force = false, bool morph = false)
+    void read(NIFStream *nif, bool morph = false)
     {
         assert(nif);
 
-        mInterpolationType = InterpolationType_Unknown;
-
         if (morph && nif->getVersion() >= NIFStream::generateVersion(10,1,0,106))
             nif->getString(); // Frame name
 
         size_t count = nif->getUInt();
-        if (count == 0 && !force && !morph)
-            return;
-
-        if (morph && nif->getVersion() > NIFStream::generateVersion(10,1,0,0))
-        {
-            if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,104) &&
-                nif->getVersion() <= NIFStream::generateVersion(20,1,0,2) && nif->getBethVersion() < 10)
-                nif->getFloat(); // Legacy weight
-            return;
-        }
 
-        mKeys.clear();
-
-        mInterpolationType = nif->getUInt();
+        if (count != 0 || morph)
+            mInterpolationType = nif->getUInt();
 
         KeyType key = {};
-        NIFStream &nifReference = *nif;
 
-        if (mInterpolationType == InterpolationType_Linear
-         || mInterpolationType == InterpolationType_Constant)
+        if (mInterpolationType == InterpolationType_Linear || mInterpolationType == InterpolationType_Constant)
         {
-            for(size_t i = 0;i < count;i++)
+            for (size_t i = 0;i < count;i++)
             {
                 float time = nif->getFloat();
-                readValue(nifReference, key);
+                readValue(*nif, key);
                 mKeys[time] = key;
             }
         }
         else if (mInterpolationType == InterpolationType_Quadratic)
         {
-            for(size_t i = 0;i < count;i++)
+            for (size_t i = 0;i < count;i++)
             {
                 float time = nif->getFloat();
-                readQuadratic(nifReference, key);
+                readQuadratic(*nif, key);
                 mKeys[time] = key;
             }
         }
         else if (mInterpolationType == InterpolationType_TBC)
         {
-            for(size_t i = 0;i < count;i++)
+            for (size_t i = 0;i < count;i++)
             {
                 float time = nif->getFloat();
-                readTBC(nifReference, key);
+                readTBC(*nif, key);
                 mKeys[time] = key;
             }
         }
-        //XYZ keys aren't actually read here.
-        //data.hpp sees that the last type read was InterpolationType_XYZ and:
-        //    Eats a floating point number, then
-        //    Re-runs the read function 3 more times.
-        //        When it does that it's reading in a bunch of InterpolationType_Linear keys, not InterpolationType_XYZ.
-        else if(mInterpolationType == InterpolationType_XYZ)
-        {
-            //Don't try to read XYZ keys into the wrong part
-            if ( count != 1 )
-            {
-                std::stringstream error;
-                error << "XYZ_ROTATION_KEY count should always be '1' .  Retrieved Value: "
-                      << count;
-                nif->file->fail(error.str());
-            }
-        }
-        else if (mInterpolationType == InterpolationType_Unknown)
+        else if (mInterpolationType == InterpolationType_XYZ)
         {
-            if (count != 0)
-                nif->file->fail("Interpolation type 0 doesn't work with keys");
+            //XYZ keys aren't actually read here.
+            //data.cpp sees that the last type read was InterpolationType_XYZ and:
+            //    Eats a floating point number, then
+            //    Re-runs the read function 3 more times.
+            //        When it does that it's reading in a bunch of InterpolationType_Linear keys, not InterpolationType_XYZ.
         }
-        else
+        else if (count != 0 || morph)
         {
             std::stringstream error;
             error << "Unhandled interpolation type: " << mInterpolationType;
             nif->file->fail(error.str());
         }
+
+        if (morph && nif->getVersion() > NIFStream::generateVersion(10,1,0,0))
+        {
+            if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,104) &&
+                nif->getVersion() <= NIFStream::generateVersion(20,1,0,2) && nif->getBethVersion() < 10)
+                nif->getFloat(); // Legacy weight
+        }
     }
 
 private:

From 88fc038cebcc25106ef24026c0b29346e0298f3c Mon Sep 17 00:00:00 2001
From: myrix <myrix@mail.ru>
Date: Fri, 24 Dec 2021 12:04:26 +0300
Subject: [PATCH 1891/2859] with mutable, without World and ESMStore interface
 change

---
 apps/openmw/mwbase/world.hpp               | 6 ------
 apps/openmw/mwdialogue/hypertextparser.cpp | 2 +-
 apps/openmw/mwworld/esmstore.hpp           | 3 ---
 apps/openmw/mwworld/store.cpp              | 2 +-
 apps/openmw/mwworld/store.hpp              | 6 +++---
 apps/openmw/mwworld/worldimp.hpp           | 3 ---
 6 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index d0ff851274..d1747a2e39 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -87,11 +87,6 @@ namespace MWWorld
     typedef std::vector<std::pair<MWWorld::Ptr,MWMechanics::Movement> > PtrMovementList;
 }
 
-namespace MWDialogue
-{
-    template <typename string_t, typename value_t> class KeywordSearch;
-}
-
 namespace MWBase
 {
     /// \brief Interface for the World (implemented in MWWorld)
@@ -155,7 +150,6 @@ namespace MWBase
             virtual MWWorld::ConstPtr getPlayerConstPtr() const = 0;
 
             virtual const MWWorld::ESMStore& getStore() const = 0;
-            virtual const MWDialogue::KeywordSearch<std::string, int>& getDialogIdKeywordSearch() = 0;
 
             virtual std::vector<ESM::ESMReader>& getEsmReader() = 0;
 
diff --git a/apps/openmw/mwdialogue/hypertextparser.cpp b/apps/openmw/mwdialogue/hypertextparser.cpp
index c1fb6c9c43..89a42bf2ea 100644
--- a/apps/openmw/mwdialogue/hypertextparser.cpp
+++ b/apps/openmw/mwdialogue/hypertextparser.cpp
@@ -48,7 +48,7 @@ namespace MWDialogue
         void tokenizeKeywords(const std::string & text, std::vector<Token> & tokens)
         {
             const auto& keywordSearch =
-                MWBase::Environment::get().getWorld()->getDialogIdKeywordSearch();
+                MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>().getDialogIdKeywordSearch();
 
             std::vector<KeywordSearch<std::string, int /*unused*/>::Match> matches;
             keywordSearch.highlightKeywords(text.begin(), text.end(), matches);
diff --git a/apps/openmw/mwworld/esmstore.hpp b/apps/openmw/mwworld/esmstore.hpp
index 855dd062e9..8582a1daca 100644
--- a/apps/openmw/mwworld/esmstore.hpp
+++ b/apps/openmw/mwworld/esmstore.hpp
@@ -284,9 +284,6 @@ namespace MWWorld
         /// Actors with the same ID share spells, abilities, etc.
         /// @return The shared spell list to use for this actor and whether or not it has already been initialized.
         std::pair<std::shared_ptr<MWMechanics::SpellList>, bool> getSpellList(const std::string& id) const;
-
-        const MWDialogue::KeywordSearch<std::string, int>& getDialogIdKeywordSearch() {
-            return mDialogs.getDialogIdKeywordSearch(); }
     };
 
     template <>
diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index 1dc3ebf622..c767bd669a 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -1072,7 +1072,7 @@ namespace MWWorld
         return true;
     }
 
-    const MWDialogue::KeywordSearch<std::string, int>& Store<ESM::Dialogue>::getDialogIdKeywordSearch()
+    const MWDialogue::KeywordSearch<std::string, int>& Store<ESM::Dialogue>::getDialogIdKeywordSearch() const
     {
         if (mKeywordSearchModFlag)
         {
diff --git a/apps/openmw/mwworld/store.hpp b/apps/openmw/mwworld/store.hpp
index 58ac1e6780..1ec51ad5fd 100644
--- a/apps/openmw/mwworld/store.hpp
+++ b/apps/openmw/mwworld/store.hpp
@@ -452,8 +452,8 @@ namespace MWWorld
         /// @warning ESM::Dialogue Store currently implements a sorted order for unknown reasons.
         std::vector<ESM::Dialogue*> mShared;
 
-        bool mKeywordSearchModFlag;
-        MWDialogue::KeywordSearch<std::string, int /*unused*/> mKeywordSearch;
+        mutable bool mKeywordSearchModFlag;
+        mutable MWDialogue::KeywordSearch<std::string, int /*unused*/> mKeywordSearch;
 
     public:
         Store();
@@ -474,7 +474,7 @@ namespace MWWorld
 
         RecordId load(ESM::ESMReader &esm) override;
 
-        const MWDialogue::KeywordSearch<std::string, int>& getDialogIdKeywordSearch();
+        const MWDialogue::KeywordSearch<std::string, int>& getDialogIdKeywordSearch() const;
     };
 
 } //end namespace
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index bea7710a53..84d97ce37c 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -236,9 +236,6 @@ namespace MWWorld
 
             const MWWorld::ESMStore& getStore() const override;
 
-            const MWDialogue::KeywordSearch<std::string, int>& getDialogIdKeywordSearch() override {
-                return mStore.getDialogIdKeywordSearch(); }
-
             std::vector<ESM::ESMReader>& getEsmReader() override;
 
             LocalScripts& getLocalScripts() override;

From 58697d98b22a686b9b8e16c2b1fbc0c4fa7dd374 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matja=C5=BE=20Lamut?= <matjaz.lamut@gmail.com>
Date: Fri, 24 Dec 2021 18:16:34 +0000
Subject: [PATCH 1892/2859] Fix links in the collada documentation. Exporter
 now points to OpenMW's official repo and the example suite link now points to
 the actual place it needs to.

---
 .../pipeline-blender-collada-static-models.rst              | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/source/reference/modding/custom-models/pipeline-blender-collada-static-models.rst b/docs/source/reference/modding/custom-models/pipeline-blender-collada-static-models.rst
index a2073f0e56..5cb336a305 100644
--- a/docs/source/reference/modding/custom-models/pipeline-blender-collada-static-models.rst
+++ b/docs/source/reference/modding/custom-models/pipeline-blender-collada-static-models.rst
@@ -14,14 +14,14 @@ Requirements
 To use the Blender to OpenMW pipeline via COLLADA, you will need the following.
 
 * `OpenMW 0.47 <https://openmw.org/downloads/>`_ or later
-* `Blender 2.81 <https://www.blender.org/download/>`_ or later. Latest confirmed, working version is Blender 3.0
-* `OpenMW COLLADA Exporter <https://github.com/Lamoot/collada-exporter>`_
+* `Blender 2.83 <https://www.blender.org/download/>`_ or later. Latest confirmed, working version is Blender 3.0
+* `OpenMW COLLADA Exporter <https://github.com/openmw/collada-exporter>`_
 * A model you would like to export. In our case, it's a barrel.
 
 The Barrel
 ********
 The barrel shown in this tutorial, and its revelant files, are available from 
-the `Example Suite repository <https://gitlab.com/OpenMW/example-suite/-/tree/master/example_static_object>`_.
+the `Example Suite repository <https://gitlab.com/OpenMW/example-suite/-/tree/master/example_static_props>`_.
 This should be useful for further study of how to set up a static prop in case
 the tutorial is not clear on any particular thing.
 

From c1f59b1221cdad439909bfedbc742a7228eee485 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Fri, 24 Dec 2021 23:17:50 +0100
Subject: [PATCH 1893/2859] Automatically drop workaround when the format is
 next updated

---
 apps/essimporter/converter.cpp            |  5 ++---
 apps/openmw/mwclass/creature.cpp          |  6 +-----
 apps/openmw/mwclass/npc.cpp               |  5 +----
 apps/openmw/mwmechanics/creaturestats.cpp |  6 +++---
 apps/openmw/mwmechanics/creaturestats.hpp |  2 --
 components/esm/creaturestats.cpp          | 19 +++++++++++++++++--
 components/esm/creaturestats.hpp          |  1 +
 7 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/apps/essimporter/converter.cpp b/apps/essimporter/converter.cpp
index 874b936baf..6e79e27f18 100644
--- a/apps/essimporter/converter.cpp
+++ b/apps/essimporter/converter.cpp
@@ -2,7 +2,6 @@
 
 #include <stdexcept>
 #include <algorithm>
-#include <climits> // INT_MIN
 
 #include <osgDB/WriteFile>
 
@@ -371,7 +370,7 @@ namespace ESSImport
                     if (cellref.mHasACDT)
                         convertACDT(cellref.mACDT, objstate.mCreatureStats);
                     else
-                        objstate.mCreatureStats.mGoldPool = INT_MIN; // HACK: indicates no ACDT
+                        objstate.mCreatureStats.mMissingACDT = true;
                     if (cellref.mHasACSC)
                         convertACSC(cellref.mACSC, objstate.mCreatureStats);
                     convertNpcData(cellref, objstate.mNpcStats);
@@ -414,7 +413,7 @@ namespace ESSImport
                     if (cellref.mHasACDT)
                         convertACDT(cellref.mACDT, objstate.mCreatureStats);
                     else
-                        objstate.mCreatureStats.mGoldPool = INT_MIN; // HACK: indicates no ACDT
+                        objstate.mCreatureStats.mMissingACDT = true;
                     if (cellref.mHasACSC)
                         convertACSC(cellref.mACSC, objstate.mCreatureStats);
                     convertCREC(crecIt->second, objstate);
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 0b3ffa924f..03b7cfb069 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -1,7 +1,5 @@
 #include "creature.hpp"
 
-#include <climits> // INT_MIN
-
 #include <components/misc/rng.hpp>
 #include <components/debug/debuglog.hpp>
 #include <components/esm/loadcrea.hpp>
@@ -758,9 +756,7 @@ namespace MWClass
         {
             if (!ptr.getRefData().getCustomData())
             {
-                // FIXME: the use of mGoldPool can be replaced with another flag the next time
-                // the save file format is changed
-                if (creatureState.mCreatureStats.mGoldPool == INT_MIN)
+                if (creatureState.mCreatureStats.mMissingACDT)
                     ensureCustomData(ptr);
                 else
                 {
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 5d50ba558f..c46e3c0534 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -1,7 +1,6 @@
 #include "npc.hpp"
 
 #include <memory>
-#include <climits> // INT_MIN
 
 #include <components/misc/constants.hpp>
 #include <components/misc/rng.hpp>
@@ -1302,9 +1301,7 @@ namespace MWClass
         {
             if (!ptr.getRefData().getCustomData())
             {
-                // FIXME: the use of mGoldPool can be replaced with another flag the next time
-                // the save file format is changed
-                if (npcState.mCreatureStats.mGoldPool == INT_MIN)
+                if (npcState.mCreatureStats.mMissingACDT)
                     ensureCustomData(ptr);
                 else
                     // Create a CustomData, but don't fill it from ESM records (not needed)
diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index d832c47c87..c99f87e833 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -1,7 +1,6 @@
 #include "creaturestats.hpp"
 
 #include <algorithm>
-#include <climits>
 
 #include <components/esm/creaturestats.hpp>
 #include <components/esm/esmreader.hpp>
@@ -558,12 +557,13 @@ namespace MWMechanics
         state.mHasAiSettings = true;
         for (int i=0; i<4; ++i)
             mAiSettings[i].writeState (state.mAiSettings[i]);
+
+        state.mMissingACDT = false;
     }
 
     void CreatureStats::readState (const ESM::CreatureStats& state)
     {
-        // HACK: using mGoldPool as an indicator for lack of ACDT during .ess import
-        if (state.mGoldPool != INT_MIN)
+        if (!state.mMissingACDT)
         {
             for (int i=0; i<ESM::Attribute::Length; ++i)
                 mAttributes[i].readState (state.mAttributes[i]);
diff --git a/apps/openmw/mwmechanics/creaturestats.hpp b/apps/openmw/mwmechanics/creaturestats.hpp
index e5c4f6fa41..0543a31ba2 100644
--- a/apps/openmw/mwmechanics/creaturestats.hpp
+++ b/apps/openmw/mwmechanics/creaturestats.hpp
@@ -69,8 +69,6 @@ namespace MWMechanics
         MWWorld::TimeStamp mLastRestock;
 
         // The pool of merchant gold (not in inventory)
-        // HACK: value of INT_MIN has a special meaning: indicates a converted .ess file
-        //       (this is a workaround to avoid changing the save file format)
         int mGoldPool;
 
         int mActorId;
diff --git a/components/esm/creaturestats.cpp b/components/esm/creaturestats.cpp
index d5030a6580..ee4b0ad092 100644
--- a/components/esm/creaturestats.cpp
+++ b/components/esm/creaturestats.cpp
@@ -1,6 +1,9 @@
 #include "creaturestats.hpp"
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "savedgame.hpp"
+
+#include <limits>
 
 void ESM::CreatureStats::load (ESMReader &esm)
 {
@@ -163,6 +166,13 @@ void ESM::CreatureStats::load (ESMReader &esm)
 
         mCorprusSpells[id] = stats;
     }
+    if(esm.getFormat() <= 18)
+        mMissingACDT = mGoldPool == std::numeric_limits<int>::min();
+    else
+    {
+        mMissingACDT = false;
+        esm.getHNOT(mMissingACDT, "NOAC");
+    }
 }
 
 void ESM::CreatureStats::save (ESMWriter &esm) const
@@ -173,8 +183,10 @@ void ESM::CreatureStats::save (ESMWriter &esm) const
     for (int i=0; i<3; ++i)
         mDynamic[i].save (esm);
 
-    if (mGoldPool)
-        esm.writeHNT ("GOLD", mGoldPool);
+    if (ESM::SavedGame::sCurrentFormat <= 18 && mMissingACDT)
+        esm.writeHNT("GOLD", std::numeric_limits<int>::min());
+    else if(mGoldPool)
+        esm.writeHNT("GOLD", mGoldPool);
 
     if (mTradeTime.mDay != 0 || mTradeTime.mHour != 0)
         esm.writeHNT ("TIME", mTradeTime);
@@ -246,6 +258,8 @@ void ESM::CreatureStats::save (ESMWriter &esm) const
         for (int i=0; i<4; ++i)
             mAiSettings[i].save(esm);
     }
+    if(ESM::SavedGame::sCurrentFormat > 18 && mMissingACDT)
+        esm.writeHNT("NOAC", mMissingACDT);
 }
 
 void ESM::CreatureStats::blank()
@@ -274,4 +288,5 @@ void ESM::CreatureStats::blank()
     mDeathAnimation = -1;
     mLevel = 1;
     mCorprusSpells.clear();
+    mMissingACDT = false;
 }
diff --git a/components/esm/creaturestats.hpp b/components/esm/creaturestats.hpp
index 651b126d0e..7b261e3dd3 100644
--- a/components/esm/creaturestats.hpp
+++ b/components/esm/creaturestats.hpp
@@ -85,6 +85,7 @@ namespace ESM
         signed char mDeathAnimation;
         ESM::TimeStamp mTimeOfDeath;
         int mLevel;
+        bool mMissingACDT;
 
         std::map<std::string, CorprusStats> mCorprusSpells;
         SpellState mSpells;

From 0e29a760d8080f2f63a582a283e3d7d3b2e201c1 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Sun, 26 Dec 2021 02:09:14 +0000
Subject: [PATCH 1894/2859] Tidy up includes

---
 components/crashcatcher/windows_crashcatcher.cpp | 3 ++-
 components/crashcatcher/windows_crashmonitor.cpp | 3 ++-
 components/crashcatcher/windows_crashmonitor.hpp | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/components/crashcatcher/windows_crashcatcher.cpp b/components/crashcatcher/windows_crashcatcher.cpp
index eea6ac40ad..e9eb60e845 100644
--- a/components/crashcatcher/windows_crashcatcher.cpp
+++ b/components/crashcatcher/windows_crashcatcher.cpp
@@ -1,10 +1,11 @@
+#include "windows_crashcatcher.hpp"
+
 #include <cassert>
 #include <cwchar>
 #include <iostream>
 #include <sstream>
 #include <thread>
 
-#include "windows_crashcatcher.hpp"
 #include "windows_crashmonitor.hpp"
 #include "windows_crashshm.hpp"
 #include <SDL_messagebox.h>
diff --git a/components/crashcatcher/windows_crashmonitor.cpp b/components/crashcatcher/windows_crashmonitor.cpp
index 336210391a..50d3fc08a1 100644
--- a/components/crashcatcher/windows_crashmonitor.cpp
+++ b/components/crashcatcher/windows_crashmonitor.cpp
@@ -1,3 +1,5 @@
+#include "windows_crashmonitor.hpp"
+
 #undef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
@@ -12,7 +14,6 @@
 #include <SDL_messagebox.h>
 
 #include "windows_crashcatcher.hpp"
-#include "windows_crashmonitor.hpp"
 #include "windows_crashshm.hpp"
 #include <components/debug/debuglog.hpp>
 
diff --git a/components/crashcatcher/windows_crashmonitor.hpp b/components/crashcatcher/windows_crashmonitor.hpp
index b520e309b0..871346d292 100644
--- a/components/crashcatcher/windows_crashmonitor.hpp
+++ b/components/crashcatcher/windows_crashmonitor.hpp
@@ -1,7 +1,9 @@
 #ifndef WINDOWS_CRASHMONITOR_HPP
 #define WINDOWS_CRASHMONITOR_HPP
 
-#include <windef.h>
+#undef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
 
 namespace Crash
 {

From fa05b0b96cbdaae575c5b5f65696965139d63042 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Sun, 26 Dec 2021 02:10:37 +0000
Subject: [PATCH 1895/2859] Include <atomic>

Should fix compilation on CI
---
 components/crashcatcher/windows_crashmonitor.hpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/crashcatcher/windows_crashmonitor.hpp b/components/crashcatcher/windows_crashmonitor.hpp
index 871346d292..4028362836 100644
--- a/components/crashcatcher/windows_crashmonitor.hpp
+++ b/components/crashcatcher/windows_crashmonitor.hpp
@@ -5,6 +5,8 @@
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 
+#include <atomic>
+
 namespace Crash
 {
 

From a2a45ccdb3cff1c2dde007f47dd731a9f7ce182d Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Sun, 26 Dec 2021 13:26:35 +0000
Subject: [PATCH 1896/2859] have coverity use clang instead of gcc

---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 987e05da44..4a3f27bc4a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -68,7 +68,7 @@ Coverity:
   rules:
     - if: $CI_PIPELINE_SOURCE == "schedule"
   before_script:
-    - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic coverity
+    - CI/install_debian_deps.sh clang 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:
@@ -83,8 +83,8 @@ Coverity:
       --form description="CI_COMMIT_SHORT_SHA / $CI_COMMIT_TITLE / $CI_COMMIT_REF_NAME:$CI_PIPELINE_ID"
     - cat /builds/OpenMW/openmw/cov-int/build-log.txt
   variables:
-    CC: gcc
-    CXX: g++
+    CC: clang
+    CXX: clang++
   artifacts:
     paths: []
     expire_in: 1 minute

From c61967a316da3a1e38a3824e2c6ea285e1f47c8a Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sun, 26 Dec 2021 14:51:40 +0100
Subject: [PATCH 1897/2859] Use `-O0` when compiling with coverity

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4a3f27bc4a..06148d03d8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -85,6 +85,7 @@ Coverity:
   variables:
     CC: clang
     CXX: clang++
+    CXXFLAGS: -O0
   artifacts:
     paths: []
     expire_in: 1 minute

From 9b2978f14390ad3a6fbd112d8ceee34d10042a2b Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sun, 26 Dec 2021 17:56:19 +0300
Subject: [PATCH 1898/2859] Rehash morph loading rehashing

---
 components/nif/nifkey.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/nif/nifkey.hpp b/components/nif/nifkey.hpp
index f1b4f94d00..7736ab7ad9 100644
--- a/components/nif/nifkey.hpp
+++ b/components/nif/nifkey.hpp
@@ -101,7 +101,7 @@ struct KeyMapT {
             //    Re-runs the read function 3 more times.
             //        When it does that it's reading in a bunch of InterpolationType_Linear keys, not InterpolationType_XYZ.
         }
-        else if (count != 0 || morph)
+        else if (count != 0)
         {
             std::stringstream error;
             error << "Unhandled interpolation type: " << mInterpolationType;

From ac747f02f32b71d65e0211f375c04ed0e0af70e8 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 26 Dec 2021 15:27:25 +0000
Subject: [PATCH 1899/2859] Don't teleport NPCs to unknown cells

---
 .../mwscript/transformationextensions.cpp     | 19 +++++++----
 apps/openmw/mwworld/worldimp.cpp              |  8 +++++
 components/compiler/lineparser.cpp            | 33 +++----------------
 3 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index 292965fd94..8a159a5685 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -355,7 +355,8 @@ namespace MWScript
                     if (ptr.getContainerStore())
                         return;
 
-                    if (ptr == MWMechanics::getPlayer())
+                    bool isPlayer = ptr == MWMechanics::getPlayer();
+                    if (isPlayer)
                     {
                         MWBase::Environment::get().getWorld()->getPlayer().setTeleported(true);
                     }
@@ -378,17 +379,21 @@ namespace MWScript
                     }
                     catch(std::exception&)
                     {
-                        // cell not found, move to exterior instead (vanilla PositionCell compatibility)
+                        // cell not found, move to exterior instead if moving the player (vanilla PositionCell compatibility)
                         const ESM::Cell* cell = MWBase::Environment::get().getWorld()->getExterior(cellID);
-                        int cx,cy;
-                        MWBase::Environment::get().getWorld()->positionToIndex(x,y,cx,cy);
-                        store = MWBase::Environment::get().getWorld()->getExterior(cx,cy);
                         if(!cell)
                         {
-                            std::string error = "Warning: PositionCell: unknown interior cell (" + cellID + "), moving to exterior instead";
+                            std::string error = "Warning: PositionCell: unknown interior cell (" + cellID + ")";
+                            if(isPlayer)
+                                error += ", moving to exterior instead";
                             runtime.getContext().report (error);
                             Log(Debug::Warning) << error;
+                            if(!isPlayer)
+                                return;
                         }
+                        int cx,cy;
+                        MWBase::Environment::get().getWorld()->positionToIndex(x,y,cx,cy);
+                        store = MWBase::Environment::get().getWorld()->getExterior(cx,cy);
                     }
                     if(store)
                     {
@@ -400,7 +405,7 @@ namespace MWScript
                         // Note that you must specify ZRot in minutes (1 degree = 60 minutes; north = 0, east = 5400, south = 10800, west = 16200)
                         // except for when you position the player, then degrees must be used.
                         // See "Morrowind Scripting for Dummies (9th Edition)" pages 50 and 54 for reference.
-                        if(ptr != MWMechanics::getPlayer())
+                        if(!isPlayer)
                             zRot = zRot/60.0f;
                         rot.z() = osg::DegreesToRadians(zRot);
                         MWBase::Environment::get().getWorld()->rotateObject(ptr,rot);
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index a44646ef37..325e048958 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -550,6 +550,14 @@ namespace MWWorld
         const ESM::Cell *cell = mStore.get<ESM::Cell>().searchExtByName (cellName);
         if (cell)
             return cell;
+        // treat "Wilderness" like an empty string
+        static const std::string defaultName = mStore.get<ESM::GameSetting>().find("sDefaultCellname")->mValue.getString();
+        if (Misc::StringUtils::ciEqual(cellName, defaultName))
+        {
+            cell = mStore.get<ESM::Cell>().searchExtByName("");
+            if (cell)
+                return cell;
+        }
 
         // didn't work -> now check for regions
         for (const ESM::Region &region : mStore.get<ESM::Region>())
diff --git a/components/compiler/lineparser.cpp b/components/compiler/lineparser.cpp
index 2e398618a3..3ad8c5bbe2 100644
--- a/components/compiler/lineparser.cpp
+++ b/components/compiler/lineparser.cpp
@@ -12,7 +12,6 @@
 #include "generator.hpp"
 #include "extensions.hpp"
 #include "declarationparser.hpp"
-#include "exception.hpp"
 
 namespace Compiler
 {
@@ -259,33 +258,11 @@ namespace Compiler
                         mExplicit.clear();
                     }
 
-                    try
-                    {
-                        // workaround for broken positioncell instructions.
-                        /// \todo add option to disable this
-                        std::unique_ptr<ErrorDowngrade> errorDowngrade (nullptr);
-                        if (Misc::StringUtils::lowerCase (loc.mLiteral)=="positioncell")
-                            errorDowngrade = std::make_unique<ErrorDowngrade> (getErrorHandler());
-
-                        std::vector<Interpreter::Type_Code> code;
-                        int optionals = mExprParser.parseArguments (argumentType, scanner, code, keyword);
-                        mCode.insert (mCode.end(), code.begin(), code.end());
-                        extensions->generateInstructionCode (keyword, mCode, mLiterals,
-                            mExplicit, optionals);
-                    }
-                    catch (const SourceException&)
-                    {
-                        // Ignore argument exceptions for positioncell.
-                        /// \todo add option to disable this
-                        if (Misc::StringUtils::lowerCase (loc.mLiteral)=="positioncell")
-                        {
-                            SkipParser skip (getErrorHandler(), getContext());
-                            scanner.scan (skip);
-                            return false;
-                        }
-
-                        throw;
-                    }
+                    std::vector<Interpreter::Type_Code> code;
+                    int optionals = mExprParser.parseArguments (argumentType, scanner, code, keyword);
+                    mCode.insert (mCode.end(), code.begin(), code.end());
+                    extensions->generateInstructionCode (keyword, mCode, mLiterals,
+                        mExplicit, optionals);
 
                     mState = EndState;
                     return true;

From 7fe5351f55454dd39c0fc02f21fa1fc141cb99ee Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 26 Dec 2021 18:04:20 +0000
Subject: [PATCH 1900/2859] Fix compilation error on windows: cannot convert
 from 'std::filesystem::path'...

---
 components/resource/scenemanager.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 72349dadb1..4f0658e033 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -481,7 +481,8 @@ namespace Resource
                 filePath = std::filesystem::relative(filename, osgDB::getCurrentWorkingDirectory());
             try
             {
-                return osgDB::ReaderWriter::ReadResult(mImageManager->getImage(filePath), osgDB::ReaderWriter::ReadResult::FILE_LOADED);
+                return osgDB::ReaderWriter::ReadResult(mImageManager->getImage(filePath.string()),
+                                                       osgDB::ReaderWriter::ReadResult::FILE_LOADED);
             }
             catch (std::exception& e)
             {

From 81c9ef947ff8c5309d3b4366f6a4beaac34eb81d Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Sun, 26 Dec 2021 19:50:19 +0000
Subject: [PATCH 1901/2859] Resovles #6519 Do not display effects duration for
 ingredient

---
 CHANGELOG.md                   | 1 +
 apps/openmw/mwgui/tooltips.cpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4094f0ec2..601bbeaeba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -92,6 +92,7 @@
     Bug #6473: Strings from NIF should be parsed only to first null terminator
     Bug #6493: Unlocking owned but not locked or unlocked containers is considered a crime
     Bug #6517: Rotations for KeyframeData in NIFs should be optional
+    Bug #6519: Effects tooltips for ingredients work incorrectly
     Feature #890: OpenMW-CS: Column filtering
     Feature #1465: "Reset" argument for AI functions
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
diff --git a/apps/openmw/mwgui/tooltips.cpp b/apps/openmw/mwgui/tooltips.cpp
index 84d8b65592..0a2fd4c448 100644
--- a/apps/openmw/mwgui/tooltips.cpp
+++ b/apps/openmw/mwgui/tooltips.cpp
@@ -493,6 +493,7 @@ namespace MWGui
             std::vector<MyGUI::Widget*> effectItems;
             int flag = info.isPotion ? Widgets::MWEffectList::EF_NoTarget : 0;
             flag |= info.isIngredient ? Widgets::MWEffectList::EF_NoMagnitude : 0;
+            flag |= info.isIngredient ? Widgets::MWEffectList::EF_Constant : 0;
             effectsWidget->createEffectWidgets(effectItems, effectArea, coord, true, flag);
             totalSize.height += coord.top-6;
             totalSize.width = std::max(totalSize.width, coord.width);

From debdcf29539d0ed9edecdb87aa07bf3e6979fa31 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 27 Dec 2021 00:47:33 +0100
Subject: [PATCH 1902/2859] Don't touch base stats when turning into a werewolf

---
 CHANGELOG.md                                  |  1 +
 .../mwmechanics/mechanicsmanagerimp.cpp       |  4 +-
 apps/openmw/mwworld/player.cpp                | 63 +++++++++++--------
 apps/openmw/mwworld/player.hpp                |  4 +-
 components/esm/player.cpp                     | 48 +++++++++++---
 components/esm/player.hpp                     |  5 +-
 components/esm/savedgame.cpp                  |  2 +-
 7 files changed, 83 insertions(+), 44 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d239717d0a..6127c24154 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -77,6 +77,7 @@
     Bug #6324: Special Slave Companions: Can't buy the slave companions
     Bug #6326: Detect Enchantment/Key should detect items in unresolved containers
     Bug #6327: Blocking roots the character in place
+    Bug #6333: Werewolf stat changes should be implemented as damage/fortifications
     Bug #6343: Magic projectile speed doesn't take race weight into account
     Bug #6347: PlaceItem/PlaceItemCell/PlaceAt should work with levelled creatures
     Bug #6354: SFX abruptly cut off after crossing max distance; implement soft fading of sound effects
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index fa5aaa82ef..e0d2da497b 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -1865,8 +1865,8 @@ namespace MWMechanics
     {
         const MWWorld::Store<ESM::GameSetting>& gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
         MWMechanics::NpcStats &stats = actor.getClass().getNpcStats(actor);
-
-        stats.getSkill(ESM::Skill::Acrobatics).setBase(gmst.find("fWerewolfAcrobatics")->mValue.getInteger());
+        auto& skill = stats.getSkill(ESM::Skill::Acrobatics);
+        skill.setModifier(gmst.find("fWerewolfAcrobatics")->mValue.getFloat() - skill.getModified());
     }
 
     void MechanicsManager::cleanupSummonedCreature(const MWWorld::Ptr &caster, int creatureActorId)
diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp
index 4687a4eddd..270889a23e 100644
--- a/apps/openmw/mwworld/player.cpp
+++ b/apps/openmw/mwworld/player.cpp
@@ -58,9 +58,9 @@ namespace MWWorld
         MWMechanics::NpcStats& stats = getPlayer().getClass().getNpcStats(getPlayer());
 
         for (int i=0; i<ESM::Skill::Length; ++i)
-            mSaveSkills[i] = stats.getSkill(i);
+            mSaveSkills[i] = stats.getSkill(i).getModified();
         for (int i=0; i<ESM::Attribute::Length; ++i)
-            mSaveAttributes[i] = stats.getAttribute(i);
+            mSaveAttributes[i] = stats.getAttribute(i).getModified();
     }
 
     void Player::restoreStats()
@@ -69,11 +69,20 @@ namespace MWWorld
         MWMechanics::CreatureStats& creatureStats = getPlayer().getClass().getCreatureStats(getPlayer());
         MWMechanics::NpcStats& npcStats = getPlayer().getClass().getNpcStats(getPlayer());
         MWMechanics::DynamicStat<float> health = creatureStats.getDynamic(0);
-        creatureStats.setHealth(int(health.getBase() / gmst.find("fWereWolfHealth")->mValue.getFloat()));
+        creatureStats.setHealth(health.getBase() / gmst.find("fWereWolfHealth")->mValue.getFloat());
         for (int i=0; i<ESM::Skill::Length; ++i)
-            npcStats.setSkill(i, mSaveSkills[i]);
+        {
+            auto& skill = npcStats.getSkill(i);
+            skill.restore(skill.getDamage());
+            skill.setModifier(mSaveSkills[i] - skill.getBase());
+        }
         for (int i=0; i<ESM::Attribute::Length; ++i)
-            npcStats.setAttribute(i, mSaveAttributes[i]);
+        {
+            auto attribute = npcStats.getAttribute(i);
+            attribute.restore(attribute.getDamage());
+            attribute.setModifier(mSaveAttributes[i] - attribute.getBase());
+            npcStats.setAttribute(i, attribute);
+        }
     }
 
     void Player::setWerewolfStats()
@@ -82,7 +91,7 @@ namespace MWWorld
         MWMechanics::CreatureStats& creatureStats = getPlayer().getClass().getCreatureStats(getPlayer());
         MWMechanics::NpcStats& npcStats = getPlayer().getClass().getNpcStats(getPlayer());
         MWMechanics::DynamicStat<float> health = creatureStats.getDynamic(0);
-        creatureStats.setHealth(int(health.getBase() * gmst.find("fWereWolfHealth")->mValue.getFloat()));
+        creatureStats.setHealth(health.getBase() * gmst.find("fWereWolfHealth")->mValue.getFloat());
         for(size_t i = 0;i < ESM::Attribute::Length;++i)
         {
             // Oh, Bethesda. It's "Intelligence".
@@ -90,7 +99,7 @@ namespace MWWorld
                                             ESM::Attribute::sAttributeNames[i]);
 
             MWMechanics::AttributeValue value = npcStats.getAttribute(i);
-            value.setBase(int(gmst.find(name)->mValue.getFloat()));
+            value.setModifier(gmst.find(name)->mValue.getFloat() - value.getModified());
             npcStats.setAttribute(i, value);
         }
 
@@ -104,9 +113,8 @@ namespace MWWorld
             std::string name = "fWerewolf"+((i==ESM::Skill::Mercantile) ? std::string("Merchantile") :
                                             ESM::Skill::sSkillNames[i]);
 
-            MWMechanics::SkillValue value = npcStats.getSkill(i);
-            value.setBase(int(gmst.find(name)->mValue.getFloat()));
-            npcStats.setSkill(i, value);
+            MWMechanics::SkillValue& value = npcStats.getSkill(i);
+            value.setModifier(gmst.find(name)->mValue.getFloat() - value.getModified());
         }
     }
 
@@ -316,14 +324,12 @@ namespace MWWorld
 
         for (int i=0; i<ESM::Skill::Length; ++i)
         {
-            mSaveSkills[i].setBase(0);
-            mSaveSkills[i].setModifier(0);
+            mSaveSkills[i] = 0.f;
         }
 
         for (int i=0; i<ESM::Attribute::Length; ++i)
         {
-            mSaveAttributes[i].setBase(0);
-            mSaveAttributes[i].setModifier(0);
+            mSaveAttributes[i] = 0.f;
         }
 
         mMarkedPosition.pos[0] = 0;
@@ -360,9 +366,9 @@ namespace MWWorld
             player.mHasMark = false;
 
         for (int i=0; i<ESM::Attribute::Length; ++i)
-            mSaveAttributes[i].writeState(player.mSaveAttributes[i]);
+            player.mSaveAttributes[i] = mSaveAttributes[i];
         for (int i=0; i<ESM::Skill::Length; ++i)
-            mSaveSkills[i].writeState(player.mSaveSkills[i]);
+            player.mSaveSkills[i] = mSaveSkills[i];
 
         player.mPreviousItems = mPreviousItems;
 
@@ -384,13 +390,7 @@ namespace MWWorld
                 throw std::runtime_error ("invalid player state record (object state)");
             }
             if (reader.getFormat() < 17)
-            {
                 convertMagicEffects(player.mObject.mCreatureStats, player.mObject.mInventory, &player.mObject.mNpcStats);
-                for(std::size_t i = 0; i < ESM::Attribute::Length; ++i)
-                    player.mSaveAttributes[i].mMod = 0.f;
-                for(std::size_t i = 0; i < ESM::Skill::Length; ++i)
-                    player.mSaveSkills[i].mMod = 0.f;
-            }
 
             if (!player.mObject.mEnabled)
             {
@@ -401,14 +401,23 @@ namespace MWWorld
             mPlayer.load (player.mObject);
 
             for (int i=0; i<ESM::Attribute::Length; ++i)
-                mSaveAttributes[i].readState(player.mSaveAttributes[i]);
+                mSaveAttributes[i] = player.mSaveAttributes[i];
             for (int i=0; i<ESM::Skill::Length; ++i)
-                mSaveSkills[i].readState(player.mSaveSkills[i]);
+                mSaveSkills[i] = player.mSaveSkills[i];
 
-            if (player.mObject.mNpcStats.mWerewolfDeprecatedData && player.mObject.mNpcStats.mIsWerewolf)
+            if (player.mObject.mNpcStats.mIsWerewolf)
             {
-                saveStats();
-                setWerewolfStats();
+                if (player.mObject.mNpcStats.mWerewolfDeprecatedData)
+                {
+                    saveStats();
+                    setWerewolfStats();
+                }
+                else if (reader.getFormat() < 19)
+                {
+                    setWerewolfStats();
+                    if (player.mSetWerewolfAcrobatics)
+                        MWBase::Environment::get().getMechanicsManager()->applyWerewolfAcrobatics(getPlayer());
+                }
             }
 
             getPlayer().getClass().getCreatureStats(getPlayer()).getAiSequence().clear();
diff --git a/apps/openmw/mwworld/player.hpp b/apps/openmw/mwworld/player.hpp
index a7e42d95e1..1a9744e8a3 100644
--- a/apps/openmw/mwworld/player.hpp
+++ b/apps/openmw/mwworld/player.hpp
@@ -53,8 +53,8 @@ namespace MWWorld
         PreviousItems mPreviousItems;
 
         // Saved stats prior to becoming a werewolf
-        MWMechanics::SkillValue mSaveSkills[ESM::Skill::Length];
-        MWMechanics::AttributeValue mSaveAttributes[ESM::Attribute::Length];
+        float mSaveSkills[ESM::Skill::Length];
+        float mSaveAttributes[ESM::Attribute::Length];
 
         bool mAttackingOrSpell;
         bool mJumping;
diff --git a/components/esm/player.cpp b/components/esm/player.cpp
index e2e9219e22..028a042809 100644
--- a/components/esm/player.cpp
+++ b/components/esm/player.cpp
@@ -44,13 +44,43 @@ void ESM::Player::load (ESMReader &esm)
             checkPrevItems = false;
     }
 
-    bool intFallback = esm.getFormat() < 11;
-    if (esm.hasMoreSubs())
+    if(esm.getFormat() < 19)
     {
-        for (int i=0; i<ESM::Attribute::Length; ++i)
-            mSaveAttributes[i].load(esm, intFallback);
-        for (int i=0; i<ESM::Skill::Length; ++i)
-            mSaveSkills[i].load(esm, intFallback);
+        bool intFallback = esm.getFormat() < 11;
+        bool clearModified = esm.getFormat() < 17 && !mObject.mNpcStats.mIsWerewolf;
+        if (esm.hasMoreSubs())
+        {
+            for (int i=0; i<ESM::Attribute::Length; ++i)
+            {
+                StatState<float> attribute;
+                attribute.load(esm, intFallback);
+                if (clearModified)
+                    attribute.mMod = 0.f;
+                mSaveAttributes[i] = attribute.mBase + attribute.mMod - attribute.mDamage;
+                if (mObject.mNpcStats.mIsWerewolf)
+                    mObject.mCreatureStats.mAttributes[i] = attribute;
+            }
+            for (int i=0; i<ESM::Skill::Length; ++i)
+            {
+                StatState<float> skill;
+                skill.load(esm, intFallback);
+                if (clearModified)
+                    skill.mMod = 0.f;
+                mSaveSkills[i] = skill.mBase + skill.mMod - skill.mDamage;
+                if (mObject.mNpcStats.mIsWerewolf)
+                {
+                    if(i == ESM::Skill::Acrobatics)
+                        mSetWerewolfAcrobatics = mObject.mNpcStats.mSkills[i].mBase != skill.mBase;
+                    mObject.mNpcStats.mSkills[i] = skill;
+                }
+            }
+        }
+    }
+    else
+    {
+        mSetWerewolfAcrobatics = false;
+        esm.getHNT(mSaveAttributes, "WWAT");
+        esm.getHNT(mSaveSkills, "WWSK");
     }
 }
 
@@ -79,8 +109,6 @@ void ESM::Player::save (ESMWriter &esm) const
         esm.writeHNString ("PREV", it->second);
     }
 
-    for (int i=0; i<ESM::Attribute::Length; ++i)
-        mSaveAttributes[i].save(esm);
-    for (int i=0; i<ESM::Skill::Length; ++i)
-        mSaveSkills[i].save(esm);
+    esm.writeHNT("WWAT", mSaveAttributes);
+    esm.writeHNT("WWSK", mSaveSkills);
 }
diff --git a/components/esm/player.hpp b/components/esm/player.hpp
index 78bd5ab6e7..bea29cf74a 100644
--- a/components/esm/player.hpp
+++ b/components/esm/player.hpp
@@ -23,6 +23,7 @@ namespace ESM
         CellId mCellId;
         float mLastKnownExteriorPosition[3];
         unsigned char mHasMark;
+        bool mSetWerewolfAcrobatics;
         ESM::Position mMarkedPosition;
         CellId mMarkedCell;
         std::string mBirthsign;
@@ -30,8 +31,8 @@ namespace ESM
         int mCurrentCrimeId;
         int mPaidCrimeId;
 
-        StatState<float> mSaveAttributes[ESM::Attribute::Length];
-        StatState<float> mSaveSkills[ESM::Skill::Length];
+        float mSaveAttributes[ESM::Attribute::Length];
+        float mSaveSkills[ESM::Skill::Length];
 
         typedef std::map<std::string, std::string> PreviousItems; // previous equipped items, needed for bound spells
         PreviousItems mPreviousItems;
diff --git a/components/esm/savedgame.cpp b/components/esm/savedgame.cpp
index 4ce0876bb8..6cecf26489 100644
--- a/components/esm/savedgame.cpp
+++ b/components/esm/savedgame.cpp
@@ -4,7 +4,7 @@
 #include "esmwriter.hpp"
 
 unsigned int ESM::SavedGame::sRecordId = ESM::REC_SAVE;
-int ESM::SavedGame::sCurrentFormat = 18;
+int ESM::SavedGame::sCurrentFormat = 19;
 
 void ESM::SavedGame::load (ESMReader &esm)
 {

From ba281a0da059a736d28576acda2cb6298ed664e2 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 27 Dec 2021 16:08:00 +0000
Subject: [PATCH 1903/2859] Fix coverity issues

---
 apps/navmeshtool/navmesh.cpp        | 2 +-
 apps/navmeshtool/worldspacedata.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/navmeshtool/navmesh.cpp b/apps/navmeshtool/navmesh.cpp
index 6b8150f1c0..4187197947 100644
--- a/apps/navmeshtool/navmesh.cpp
+++ b/apps/navmeshtool/navmesh.cpp
@@ -73,7 +73,7 @@ namespace NavMeshTool
         public:
             std::atomic_size_t mExpected {0};
 
-            explicit NavMeshTileConsumer(NavMeshDb db)
+            explicit NavMeshTileConsumer(NavMeshDb&& db)
                 : mDb(std::move(db))
                 , mTransaction(mDb.startTransaction())
                 , mNextTileId(mDb.getMaxTileId() + 1)
diff --git a/apps/navmeshtool/worldspacedata.cpp b/apps/navmeshtool/worldspacedata.cpp
index b88b967cf5..d05a8fe3f0 100644
--- a/apps/navmeshtool/worldspacedata.cpp
+++ b/apps/navmeshtool/worldspacedata.cpp
@@ -246,7 +246,7 @@ namespace NavMeshTool
 
             if (!exterior && !processInteriorCells)
             {
-                Log(Debug::Info) << "Skipped " << (exterior ? "exterior" : "interior")
+                Log(Debug::Info) << "Skipped interior"
                     << " cell (" << (i + 1) << "/" << esmData.mCells.size() << ") \"" << cell.getDescription() << "\"";
                 continue;
             }

From dc946d0a4738808f58cf63c26cfc33b7ff809829 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 27 Dec 2021 22:30:25 +0100
Subject: [PATCH 1904/2859] Fix Dagoth Ur's Fire Shield not being visible

---
 apps/openmw/mwmechanics/activespells.cpp | 3 +--
 apps/openmw/mwmechanics/spelleffects.cpp | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwmechanics/activespells.cpp b/apps/openmw/mwmechanics/activespells.cpp
index 3fbb347098..0c781e81bd 100644
--- a/apps/openmw/mwmechanics/activespells.cpp
+++ b/apps/openmw/mwmechanics/activespells.cpp
@@ -218,8 +218,7 @@ namespace MWMechanics
                         return params.mSlot == slotIndex && params.mType == ESM::ActiveSpells::Type_Enchantment && params.mId == slot->getCellRef().getRefId();
                     }) != mSpells.end())
                         continue;
-                    ActiveSpellParams params(*slot, enchantment, slotIndex, ptr);
-                    mSpells.emplace_back(params);
+                    const ActiveSpellParams& params = mSpells.emplace_back(ActiveSpellParams{*slot, enchantment, slotIndex, ptr});
                     for(const auto& effect : params.mEffects)
                         MWMechanics::playEffects(ptr, *world->getStore().get<ESM::MagicEffect>().find(effect.mEffectId), playNonLooping);
                 }
diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp
index aef6b26f19..8121f7584d 100644
--- a/apps/openmw/mwmechanics/spelleffects.cpp
+++ b/apps/openmw/mwmechanics/spelleffects.cpp
@@ -914,8 +914,8 @@ MagicApplicationResult applyMagicEffect(const MWWorld::Ptr& target, const MWWorl
             oldMagnitude = effect.mMagnitude;
         else
         {
-            if(spellParams.getType() == ESM::ActiveSpells::Type_Consumable || spellParams.getType() == ESM::ActiveSpells::Type_Temporary)
-                playEffects(target, *magicEffect);
+            if(spellParams.getType() != ESM::ActiveSpells::Type_Enchantment)
+                playEffects(target, *magicEffect, spellParams.getType() == ESM::ActiveSpells::Type_Consumable || spellParams.getType() == ESM::ActiveSpells::Type_Temporary);
             if(effect.mEffectId == ESM::MagicEffect::Soultrap && !target.getClass().isNpc() && target.getType() == ESM::Creature::sRecordId && target.get<ESM::Creature>()->mBase->mData.mSoul == 0 && caster == getPlayer())
                 MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicInvalidTarget}");
         }

From adefd0c9cad72875f400f2d98e5040e464261b91 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Tue, 28 Dec 2021 11:55:28 +0000
Subject: [PATCH 1905/2859] Get rid of travis-ci

---
 .travis.yml | 80 -----------------------------------------------------
 1 file changed, 80 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 1322dfca1b..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-language: cpp
-branches:
-  only:
-    - master
-    - /openmw-.*$/
-cache: ccache
-addons:
-  apt:
-    sources:
-      - sourceline: 'ppa:openmw/openmw'
-    packages: [
-      # Dev
-      build-essential, cmake, clang-tools-9, ccache,
-      # Boost
-      libboost-filesystem-dev, libboost-iostreams-dev, libboost-program-options-dev, libboost-system-dev,
-      # FFmpeg
-      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, libopenscenegraph-dev, libmygui-dev
-    ]
-matrix:
-  include:
-    - name: OpenMW (all) on MacOS 10.15 with Xcode 11.6
-      os: osx
-      osx_image: xcode11.6
-    - name: OpenMW (all) on Ubuntu Focal with GCC
-      os: linux
-      dist: focal
-    - name: OpenMW (tests only) on Ubuntu Focal with GCC
-      os: linux
-      dist: focal
-      env:
-        - BUILD_TESTS_ONLY: 1
-    - name: OpenMW (openmw) on Ubuntu Focal with Clang's Static Analysis
-      os: linux
-      dist: focal
-      env:
-        - MATRIX_EVAL="CC=clang-9 && CXX=clang++-9"
-        - ANALYZE="scan-build-9 --force-analyze-debug-code --use-cc clang-9 --use-c++ clang++-9"
-      compiler: clang
-
-before_install:
-    - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then eval "${MATRIX_EVAL}"; fi
-    - ./CI/before_install.${TRAVIS_OS_NAME}.sh
-before_script:
-    - ccache -z
-    - ./CI/before_script.${TRAVIS_OS_NAME}.sh
-script:
- - cd ./build
- - ${ANALYZE} make -j3;
- - 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: OpenMW/openmw
-notifications:
-  email:
-    if: repository_slug = OpenMW/openmw AND branch = master
-    recipients:
-      - corrmage+travis-ci@gmail.com
-    on_success: change
-    on_failure: always
-  irc:
-    if: repository_slug = OpenMW/openmw AND branch = master
-    channels:
-      - "irc.libera.chat#openmw"
-    on_success: change
-    on_failure: always
-    use_notice: true

From 6f870a464be4a3b77706efcf0951510ca05c015e Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 29 Dec 2021 12:34:12 +0000
Subject: [PATCH 1906/2859] Replace magic numbers with enums

---
 CHANGELOG.md                |  1 +
 components/esm/loadmgef.cpp | 28 ++++++++++++----------------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d239717d0a..02d86f8802 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -94,6 +94,7 @@
     Bug #6493: Unlocking owned but not locked or unlocked containers is considered a crime
     Bug #6517: Rotations for KeyframeData in NIFs should be optional
     Bug #6519: Effects tooltips for ingredients work incorrectly
+    Bug #6523: Disintegrate Weapon is resisted by Resist Magicka instead of Sanctuary
     Feature #890: OpenMW-CS: Column filtering
     Feature #1465: "Reset" argument for AI functions
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
diff --git a/components/esm/loadmgef.cpp b/components/esm/loadmgef.cpp
index badbbb2133..7aff249aeb 100644
--- a/components/esm/loadmgef.cpp
+++ b/components/esm/loadmgef.cpp
@@ -281,14 +281,12 @@ short MagicEffect::getResistanceEffect(short effect)
         effects[DisintegrateArmor] = Sanctuary;
         effects[DisintegrateWeapon] = Sanctuary;
 
-        for (int i=0; i<5; ++i)
-            effects[DrainAttribute+i] = ResistMagicka;
-        for (int i=0; i<5; ++i)
-            effects[DamageAttribute+i] = ResistMagicka;
-        for (int i=0; i<5; ++i)
-            effects[AbsorbAttribute+i] = ResistMagicka;
-        for (int i=0; i<10; ++i)
-            effects[WeaknessToFire+i] = ResistMagicka;
+        for (int i = DrainAttribute; i <= DamageSkill; ++i)
+            effects[i] = ResistMagicka;
+        for (int i = AbsorbAttribute; i <= AbsorbSkill; ++i)
+            effects[i] = ResistMagicka;
+        for (int i = WeaknessToFire; i <= WeaknessToNormalWeapons; ++i)
+            effects[i] = ResistMagicka;
 
         effects[Burden] = ResistMagicka;
         effects[Charm] = ResistMagicka;
@@ -326,14 +324,12 @@ short MagicEffect::getWeaknessEffect(short effect)
     static std::map<short, short> effects;
     if (effects.empty())
     {
-        for (int i=0; i<5; ++i)
-            effects[DrainAttribute+i] = WeaknessToMagicka;
-        for (int i=0; i<5; ++i)
-            effects[DamageAttribute+i] = WeaknessToMagicka;
-        for (int i=0; i<5; ++i)
-            effects[AbsorbAttribute+i] = WeaknessToMagicka;
-        for (int i=0; i<10; ++i)
-            effects[WeaknessToFire+i] = WeaknessToMagicka;
+        for (int i = DrainAttribute; i <= DamageSkill; ++i)
+            effects[i] = WeaknessToMagicka;
+        for (int i = AbsorbAttribute; i <= AbsorbSkill; ++i)
+            effects[i] = WeaknessToMagicka;
+        for (int i = WeaknessToFire; i <= WeaknessToNormalWeapons; ++i)
+            effects[i] = WeaknessToMagicka;
 
         effects[Burden] = WeaknessToMagicka;
         effects[Charm] = WeaknessToMagicka;

From 63bf4bf868ec0a415631b8285a8ef6e689e80c7b Mon Sep 17 00:00:00 2001
From: Frederic Chardon <chardon.frederic@gmail.com>
Date: Wed, 29 Dec 2021 15:11:48 +0100
Subject: [PATCH 1907/2859] Solve 2 bugs in projectile movement simulation: -
 properly initialize mSimulationPosition in the constructor. Unlucky thread
 scheduling can cause processHits to be called before the first simulation
 run, causing the projectile to vanish to whatever value the variable happens
 to contains. - don't continue moving the projectile after a hit. The position
 would continue to be updated to some senseless value.

---
 apps/openmw/mwphysics/mtphysics.cpp  | 3 ++-
 apps/openmw/mwphysics/projectile.cpp | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 2f7e3b5995..5fcda2dfa0 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -185,7 +185,8 @@ namespace
             }
             void operator()(MWPhysics::ProjectileSimulation& sim) const
             {
-                MWPhysics::MovementSolver::move(sim.second, mPhysicsDt, mCollisionWorld);
+                if (sim.first->isActive())
+                    MWPhysics::MovementSolver::move(sim.second, mPhysicsDt, mCollisionWorld);
             }
         };
 
diff --git a/apps/openmw/mwphysics/projectile.cpp b/apps/openmw/mwphysics/projectile.cpp
index 9f8962d5e6..6176738043 100644
--- a/apps/openmw/mwphysics/projectile.cpp
+++ b/apps/openmw/mwphysics/projectile.cpp
@@ -33,6 +33,7 @@ Projectile::Projectile(const MWWorld::Ptr& caster, const osg::Vec3f& position, f
 
     mPosition = position;
     mPreviousPosition = position;
+    mSimulationPosition = position;
     setCaster(caster);
 
     const int collisionMask = CollisionType_World | CollisionType_HeightMap |

From 14a330609fad0164ed4036832836d34d04b26c38 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Wed, 8 Dec 2021 20:44:10 +0000
Subject: [PATCH 1908/2859] ShaderVisitor improvements

* Adds comments explaining the less-than-obvious aspects.
* Adds comments explaining what to do when adding new stuff.
* Some fixes caused by those comments not historically existing.
* Add a TODO comment to something which may catch fire in the future.
---
 components/shader/shadervisitor.cpp | 130 +++++++++++++++++++++++-----
 1 file changed, 109 insertions(+), 21 deletions(-)

diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 2063546034..107665369c 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -29,6 +29,15 @@
 
 namespace Shader
 {
+    /**
+    * Miniature version of osg::StateSet used to track state added by the shader visitor which should be ignored when
+    * it's applied a second time, and removed when shaders are removed.
+    * Actual StateAttributes aren't kept as they're recoverable from the StateSet this is attached to - we just want
+    * the TypeMemberPair as that uniquely identifies which of those StateAttributes it was we're tracking.
+    * Not all StateSet features have been added yet - we implement an equivalently-named method to each of the StateSet
+    * methods called in createProgram, and implement new ones as they're needed.
+    * When expanding tracking to cover new things, ensure they're accounted for in ensureFFP.
+    */
     class AddedState : public osg::Object
     {
     public:
@@ -45,7 +54,6 @@ namespace Shader
         void addUniform(const std::string& name) { mUniforms.emplace(name); }
         void setMode(osg::StateAttribute::GLMode mode) { mModes.emplace(mode); }
         void setAttribute(osg::StateAttribute::TypeMemberPair typeMemberPair) { mAttributes.emplace(typeMemberPair); }
-        void setTextureMode(int unit, osg::StateAttribute::GLMode mode) { mTextureModes[unit].emplace(mode); }
 
         void setAttribute(const osg::StateAttribute* attribute)
         {
@@ -63,6 +71,25 @@ namespace Shader
         template<typename T>
         void setAttributeAndModes(osg::ref_ptr<T> attribute) { setAttributeAndModes(attribute.get()); }
 
+        void setTextureMode(unsigned int unit, osg::StateAttribute::GLMode mode) { mTextureModes[unit].emplace(mode); }
+        void setTextureAttribute(int unit, osg::StateAttribute::TypeMemberPair typeMemberPair) { mTextureAttributes[unit].emplace(typeMemberPair); }
+
+        void setTextureAttribute(unsigned int unit, const osg::StateAttribute* attribute)
+        {
+            mTextureAttributes[unit].emplace(attribute->getTypeMemberPair());
+        }
+        template<typename T>
+        void setTextureAttribute(unsigned int unit, osg::ref_ptr<T> attribute) { setTextureAttribute(unit, attribute.get()); }
+
+        void setTextureAttributeAndModes(unsigned int unit, const osg::StateAttribute* attribute)
+        {
+            setTextureAttribute(unit, attribute);
+            InterrogateModesHelper helper(this, unit);
+            attribute->getModeUsage(helper);
+        }
+        template<typename T>
+        void setTextureAttributeAndModes(unsigned int unit, osg::ref_ptr<T> attribute) { setTextureAttributeAndModes(unit, attribute.get()); }
+
         bool hasUniform(const std::string& name) { return mUniforms.count(name); }
         bool hasMode(osg::StateAttribute::GLMode mode) { return mModes.count(mode); }
         bool hasAttribute(const osg::StateAttribute::TypeMemberPair &typeMemberPair) { return mAttributes.count(typeMemberPair); }
@@ -77,10 +104,11 @@ namespace Shader
         }
 
         const std::set<osg::StateAttribute::TypeMemberPair>& getAttributes() { return mAttributes; }
+        const std::unordered_map<unsigned int, std::set<osg::StateAttribute::TypeMemberPair>>& getTextureAttributes() { return mTextureAttributes; }
 
         bool empty()
         {
-            return mUniforms.empty() && mModes.empty() && mAttributes.empty() && mTextureModes.empty();
+            return mUniforms.empty() && mModes.empty() && mAttributes.empty() && mTextureModes.empty() && mTextureAttributes.empty();
         }
 
         META_Object(Shader, AddedState)
@@ -89,20 +117,26 @@ namespace Shader
         class InterrogateModesHelper : public osg::StateAttribute::ModeUsage
         {
         public:
-            InterrogateModesHelper(AddedState* tracker) : mTracker(tracker) {}
+            InterrogateModesHelper(AddedState* tracker, unsigned int textureUnit = 0)
+                : mTracker(tracker)
+                , mTextureUnit(textureUnit)
+            {}
             void usesMode(osg::StateAttribute::GLMode mode) override { mTracker->setMode(mode); }
-            void usesTextureMode(osg::StateAttribute::GLMode mode) override {}
+            void usesTextureMode(osg::StateAttribute::GLMode mode) override { mTracker->setTextureMode(mTextureUnit, mode); }
 
         private:
             AddedState* mTracker;
+            unsigned int mTextureUnit;
         };
 
         using ModeSet = std::unordered_set<osg::StateAttribute::GLMode>;
+        using AttributeSet = std::set<osg::StateAttribute::TypeMemberPair>;
 
         std::unordered_set<std::string> mUniforms;
         ModeSet mModes;
-        std::set<osg::StateAttribute::TypeMemberPair> mAttributes;
-        std::unordered_map<int, ModeSet> mTextureModes;
+        AttributeSet mAttributes;
+        std::unordered_map<unsigned int, ModeSet> mTextureModes;
+        std::unordered_map<unsigned int, AttributeSet> mTextureAttributes;
     };
 
     ShaderVisitor::ShaderRequirements::ShaderRequirements()
@@ -229,6 +263,7 @@ namespace Shader
         if (node.getUserValue("shaderRequired", shaderRequired) && shaderRequired)
             mRequirements.back().mShaderRequired = true;
 
+        // Make sure to disregard any state that came from a previous call to createProgram
         osg::ref_ptr<AddedState> addedState = getAddedState(*stateset);
 
         if (!texAttributes.empty())
@@ -242,6 +277,8 @@ namespace Shader
                 const osg::StateAttribute *attr = stateset->getTextureAttribute(unit, osg::StateAttribute::TEXTURE);
                 if (attr)
                 {
+                    // If textures ever get removed in createProgram, expand this to check we're operating on main texture attribute list
+                    // rather than the removed list
                     if (addedState && addedState->hasTextureMode(unit, GL_TEXTURE_2D))
                         continue;
 
@@ -462,6 +499,22 @@ namespace Shader
             return;
         }
 
+        /**
+        * The shader visitor is supposed to be idempotent and undoable.
+        * That means we need to back up state we've removed (so it can be restored and/or considered by further
+        * applications of the visitor) and track which state we added (so it can be removed and/or ignored by further
+        * applications of the visitor).
+        * Before editing writableStateSet in a way that explicitly removes state or might overwrite existing state, it
+        * should be copied to removedState, another StateSet, unless it's there already or was added by a previous
+        * application of the visitor (is in previousAddedState).
+        * If it's a new class of state that's not already handled by ReinstateRemovedStateVisitor::apply, make sure to
+        * add handling there.
+        * Similarly, any time new state is added to writableStateSet, the equivalent method should be called on
+        * addedState.
+        * If that method doesn't exist yet, implement it - we don't use a full StateSet as we only need to check
+        * existence, not equality, and don't need to actually get the value as we can get it from writableStateSet
+        * instead.
+        */
         osg::Node& node = *reqs.mNode;
         osg::StateSet* writableStateSet = nullptr;
         if (mAllowedToModifyStateSets)
@@ -486,7 +539,10 @@ namespace Shader
         }
 
         if (defineMap["diffuseMap"] == "0")
+        {
             writableStateSet->addUniform(new osg::Uniform("useDiffuseMapForShadowAlpha", false));
+            addedState->addUniform("useDiffuseMapForShadowAlpha");
+        }
 
         defineMap["parallax"] = reqs.mNormalHeight ? "1" : "0";
 
@@ -495,7 +551,6 @@ namespace Shader
 
         defineMap["alphaFunc"] = std::to_string(reqs.mAlphaFunc);
 
-        // back up removed state in case recreateShaders gets rid of the shader later
         osg::ref_ptr<osg::StateSet> removedState;
         if ((removedState = getRemovedState(*writableStateSet)) && !mAllowedToModifyStateSets)
             removedState = new osg::StateSet(*removedState, osg::CopyOp::SHALLOW_COPY);
@@ -570,7 +625,7 @@ namespace Shader
             osg::ref_ptr<osg::Depth> depth = new SceneUtil::AutoDepth;
             depth->setWriteMask(false);
             writableStateSet->setAttributeAndModes(depth, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
-            addedState->setAttribute(depth);
+            addedState->setAttributeAndModes(depth);
 
             writableStateSet->addUniform(new osg::Uniform("particleSize", reqs.mSoftParticleSize));
             addedState->addUniform("particleSize");
@@ -579,23 +634,11 @@ namespace Shader
             addedState->addUniform("opaqueDepthTex");
 
             writableStateSet->setTextureAttributeAndModes(2, mOpaqueDepthTex, osg::StateAttribute::ON);
-            addedState->setTextureMode(2, GL_TEXTURE_2D);
+            addedState->setTextureAttributeAndModes(2, mOpaqueDepthTex);
         }
 
         defineMap["softParticles"] = reqs.mSoftParticles ? "1" : "0";
 
-        if (!addedState->empty())
-        {
-            // user data is normally shallow copied so shared with the original stateset
-            osg::ref_ptr<osg::UserDataContainer> writableUserData;
-            if (mAllowedToModifyStateSets)
-                writableUserData = writableStateSet->getOrCreateUserDataContainer();
-            else
-                writableUserData = getWritableUserDataContainer(*writableStateSet);
-
-            updateAddedState(*writableUserData, addedState);
-        }
-
         std::string shaderPrefix;
         if (!node.getUserValue("shaderPrefix", shaderPrefix))
             shaderPrefix = mDefaultShaderPrefix;
@@ -615,6 +658,18 @@ namespace Shader
                 addedState->addUniform(texIt->second);
             }
         }
+
+        if (!addedState->empty())
+        {
+            // user data is normally shallow copied so shared with the original stateset
+            osg::ref_ptr<osg::UserDataContainer> writableUserData;
+            if (mAllowedToModifyStateSets)
+                writableUserData = writableStateSet->getOrCreateUserDataContainer();
+            else
+                writableUserData = getWritableUserDataContainer(*writableStateSet);
+
+            updateAddedState(*writableUserData, addedState);
+        }
     }
 
     void ShaderVisitor::ensureFFP(osg::Node& node)
@@ -627,6 +682,18 @@ namespace Shader
         else
             writableStateSet = getWritableStateSet(node);
 
+        /**
+        * We might have been using shaders temporarily with the node (e.g. if a GlowUpdater applied a temporary
+        * environment map for a temporary enchantment).
+        * We therefore need to remove any state doing so added, and restore any that it removed.
+        * This is kept track of in createProgram in the StateSet's userdata.
+        * If new classes of state get added, handling it here is required - not all StateSet features are implemented
+        * in AddedState yet as so far they've not been necessary.
+        * Removed state requires no particular special handling as it's dealt with by merging StateSets.
+        * We don't need to worry about state in writableStateSet having the OVERRIDE flag as if it's in both, it's also
+        * in addedState, and gets removed first.
+        */
+
         // user data is normally shallow copied so shared with the original stateset - we'll need to copy before edits
         osg::ref_ptr<osg::UserDataContainer> writableUserData;
 
@@ -661,6 +728,23 @@ namespace Shader
             // We don't have access to the function to do that, and can't call removeAttribute with an iterator
             for (const auto& [type, member] : addedState->getAttributes())
                 writableStateSet->removeAttribute(type, member);
+
+            for (unsigned int unit = 0; unit < writableStateSet->getTextureModeList().size(); ++unit)
+            {
+                for (auto itr = writableStateSet->getTextureModeList()[unit].begin(); itr != writableStateSet->getTextureModeList()[unit].end();)
+                {
+                    if (addedState->hasTextureMode(unit, itr->first))
+                        writableStateSet->getTextureModeList()[unit].erase(itr++);
+                    else
+                        ++itr;
+                }
+            }
+
+            for (const auto& [unit, attributeList] : addedState->getTextureAttributes())
+            {
+                for (const auto& [type, member] : attributeList)
+                    writableStateSet->removeTextureAttribute(unit, type);
+            }
         }
 
 
@@ -833,6 +917,10 @@ namespace Shader
 
     void ReinstateRemovedStateVisitor::apply(osg::Node& node)
     {
+        // TODO: this may eventually need to remove added state.
+        // If so, we can migrate from explicitly copying removed state to just calling osg::StateSet::merge.
+        // Not everything is transferred from removedState yet - implement more when createProgram starts marking more
+        // as removed.
         if (node.getStateSet())
         {
             osg::ref_ptr<osg::StateSet> removedState = getRemovedState(*node.getStateSet());

From f91a5499d353f0d8ffc018268380afcf74c626af Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 26 Dec 2021 19:12:04 +0100
Subject: [PATCH 1909/2859] Add extern/i18n.lua

---
 extern/i18n.lua/CMakeLists.txt       |  17 ++
 extern/i18n.lua/LICENSE              |  22 +++
 extern/i18n.lua/README.md            | 164 ++++++++++++++++
 extern/i18n.lua/i18n/init.lua        | 188 ++++++++++++++++++
 extern/i18n.lua/i18n/interpolate.lua |  60 ++++++
 extern/i18n.lua/i18n/plural.lua      | 280 +++++++++++++++++++++++++++
 extern/i18n.lua/i18n/variants.lua    |  49 +++++
 extern/i18n.lua/i18n/version.lua     |   1 +
 files/CMakeLists.txt                 |   1 +
 9 files changed, 782 insertions(+)
 create mode 100644 extern/i18n.lua/CMakeLists.txt
 create mode 100644 extern/i18n.lua/LICENSE
 create mode 100644 extern/i18n.lua/README.md
 create mode 100644 extern/i18n.lua/i18n/init.lua
 create mode 100644 extern/i18n.lua/i18n/interpolate.lua
 create mode 100644 extern/i18n.lua/i18n/plural.lua
 create mode 100644 extern/i18n.lua/i18n/variants.lua
 create mode 100644 extern/i18n.lua/i18n/version.lua

diff --git a/extern/i18n.lua/CMakeLists.txt b/extern/i18n.lua/CMakeLists.txt
new file mode 100644
index 0000000000..aec4447470
--- /dev/null
+++ b/extern/i18n.lua/CMakeLists.txt
@@ -0,0 +1,17 @@
+if (NOT DEFINED OPENMW_RESOURCES_ROOT)
+    message( FATAL_ERROR "OPENMW_RESOURCES_ROOT is not set" )
+endif()
+
+# Copy resource files into the build directory
+set(SDIR ${CMAKE_CURRENT_SOURCE_DIR})
+set(DDIRRELATIVE resources/lua_libs/i18n)
+
+set(I18N_LUA_FILES
+    i18n/init.lua
+    i18n/interpolate.lua
+    i18n/plural.lua
+    i18n/variants.lua
+    i18n/version.lua
+)
+
+copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_ROOT} ${DDIRRELATIVE} "${I18N_LUA_FILES}")
diff --git a/extern/i18n.lua/LICENSE b/extern/i18n.lua/LICENSE
new file mode 100644
index 0000000000..ddf484685b
--- /dev/null
+++ b/extern/i18n.lua/LICENSE
@@ -0,0 +1,22 @@
+MIT License Terms
+=================
+
+Copyright (c) 2012 Enrique García Cota.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/extern/i18n.lua/README.md b/extern/i18n.lua/README.md
new file mode 100644
index 0000000000..8b3271c321
--- /dev/null
+++ b/extern/i18n.lua/README.md
@@ -0,0 +1,164 @@
+i18n.lua
+========
+
+[![Build Status](https://travis-ci.org/kikito/i18n.lua.png?branch=master)](https://travis-ci.org/kikito/i18n.lua)
+
+A very complete i18n lib for Lua
+
+Description
+===========
+
+``` lua
+i18n = require 'i18n'
+
+-- loading stuff
+i18n.set('en.welcome', 'welcome to this program')
+i18n.load({
+  en = {
+    good_bye = "good-bye!",
+    age_msg = "your age is %{age}.",
+    phone_msg = {
+      one = "you have one new message.",
+      other = "you have %{count} new messages."
+    }
+  }
+})
+i18n.loadFile('path/to/your/project/i18n/de.lua') -- load German language file
+i18n.loadFile('path/to/your/project/i18n/fr.lua') -- load French language file
+…         -- section 'using language files' below describes structure of files
+
+-- setting the translation context
+i18n.setLocale('en') -- English is the default locale anyway
+
+-- getting translations
+i18n.translate('welcome') -- Welcome to this program
+i18n('welcome') -- Welcome to this program
+i18n('age_msg', {age = 18}) -- Your age is 18.
+i18n('phone_msg', {count = 1}) -- You have one new message.
+i18n('phone_msg', {count = 2}) -- You have 2 new messages.
+i18n('good_bye') -- Good-bye!
+
+```
+
+Interpolation
+=============
+
+You can interpolate variables in 3 different ways:
+
+``` lua
+-- the most usual one
+i18n.set('variables', 'Interpolating variables: %{name} %{age}')
+i18n('variables', {name='john', 'age'=10}) -- Interpolating variables: john 10
+
+i18n.set('lua', 'Traditional Lua way: %d %s')
+i18n('lua', {1, 'message'}) -- Traditional Lua way: 1 message
+
+i18n.set('combined', 'Combined: %<name>.q %<age>.d %<age>.o')
+i18n('combined', {name='john', 'age'=10}) -- Combined: john 10 12k
+```
+
+
+
+Pluralization
+=============
+
+This lib implements the [unicode.org plural rules](http://cldr.unicode.org/index/cldr-spec/plural-rules). Just set the locale you want to use and it will deduce the appropiate pluralization rules:
+
+``` lua
+i18n = require 'i18n'
+
+i18n.load({
+  en = {
+    msg = {
+      one   = "one message",
+      other = "%{count} messages"
+    }
+  },
+  ru = {
+    msg = {
+      one   = "1 сообщение",
+      few   = "%{count} сообщения",
+      many  = "%{count} сообщений",
+      other = "%{count} сообщения"
+    }
+  }
+})
+
+i18n('msg', {count = 1}) -- one message
+i18n.setLocale('ru')
+i18n('msg', {count = 5}) -- 5 сообщений
+```
+
+The appropiate rule is chosen by finding the 'root' of the locale used: for example if the current locale is 'fr-CA', the 'fr' rules will be applied.
+
+If the provided functions are not enough (i.e. invented languages) it's possible to specify a custom pluralization function in the second parameter of setLocale. This function must return 'one', 'few', 'other', etc given a number.
+
+Fallbacks
+=========
+
+When a value is not found, the lib has several fallback mechanisms:
+
+* First, it will look in the current locale's parents. For example, if the locale was set to 'en-US' and the key 'msg' was not found there, it will be looked over in 'en'.
+* Second, if the value is not found in the locale ancestry, a 'fallback locale' (by default: 'en') can be used. If the fallback locale has any parents, they will be looked over too.
+* Third, if all the locales have failed, but there is a param called 'default' on the provided data, it will be used.
+* Otherwise the translation will return nil.
+
+The parents of a locale are found by splitting the locale by its hyphens. Other separation characters (spaces, underscores, etc) are not supported.
+
+Using language files
+====================
+
+It might be a good idea to store each translation in a different file. This is supported via the 'i18n.loadFile' directive:
+
+``` lua
+…
+i18n.loadFile('path/to/your/project/i18n/de.lua') -- German translation
+i18n.loadFile('path/to/your/project/i18n/en.lua') -- English translation
+i18n.loadFile('path/to/your/project/i18n/fr.lua') -- French translation
+…
+```
+
+The German language file 'de.lua' should read:
+
+``` lua
+return {
+  de = {
+    good_bye = "Auf Wiedersehen!",
+    age_msg = "Ihr Alter beträgt %{age}.",
+    phone_msg = {
+      one = "Sie haben eine neue Nachricht.",
+      other = "Sie haben %{count} neue Nachrichten."
+    }
+  }
+}
+```
+
+If desired, you can also store all translations in one single file (eg. 'translations.lua'):
+
+``` lua
+return {
+  de = {
+    good_bye = "Auf Wiedersehen!",
+    age_msg = "Ihr Alter beträgt %{age}.",
+    phone_msg = {
+      one = "Sie haben eine neue Nachricht.",
+      other = "Sie haben %{count} neue Nachrichten."
+    }
+  },
+  fr = {
+    good_bye = "Au revoir !",
+    age_msg = "Vous avez %{age} ans.",
+    phone_msg = {
+      one = "Vous avez une noveau message.",
+      other = "Vous avez %{count} noveaux messages."
+    }
+  },
+  …
+}
+```
+
+Specs
+=====
+This project uses [busted](https://github.com/Olivine-Labs/busted) for its specs. If you want to run the specs, you will have to install it first. Then just execute the following from the root inspect folder:
+
+    busted
diff --git a/extern/i18n.lua/i18n/init.lua b/extern/i18n.lua/i18n/init.lua
new file mode 100644
index 0000000000..6bcccd0572
--- /dev/null
+++ b/extern/i18n.lua/i18n/init.lua
@@ -0,0 +1,188 @@
+local i18n = {}
+
+local store
+local locale
+local pluralizeFunction
+local defaultLocale = 'en'
+local fallbackLocale = defaultLocale
+
+local currentFilePath = (...):gsub("%.init$","")
+
+local plural      = require(currentFilePath .. '.plural')
+local interpolate = require(currentFilePath .. '.interpolate')
+local variants    = require(currentFilePath .. '.variants')
+local version     = require(currentFilePath .. '.version')
+
+i18n.plural, i18n.interpolate, i18n.variants, i18n.version, i18n._VERSION =
+  plural, interpolate, variants, version, version
+
+-- private stuff
+
+local function dotSplit(str)
+  local fields, length = {},0
+    str:gsub("[^%.]+", function(c)
+    length = length + 1
+    fields[length] = c
+  end)
+  return fields, length
+end
+
+local function isPluralTable(t)
+  return type(t) == 'table' and type(t.other) == 'string'
+end
+
+local function isPresent(str)
+  return type(str) == 'string' and #str > 0
+end
+
+local function assertPresent(functionName, paramName, value)
+  if isPresent(value) then return end
+
+  local msg = "i18n.%s requires a non-empty string on its %s. Got %s (a %s value)."
+  error(msg:format(functionName, paramName, tostring(value), type(value)))
+end
+
+local function assertPresentOrPlural(functionName, paramName, value)
+  if isPresent(value) or isPluralTable(value) then return end
+
+  local msg = "i18n.%s requires a non-empty string or plural-form table on its %s. Got %s (a %s value)."
+  error(msg:format(functionName, paramName, tostring(value), type(value)))
+end
+
+local function assertPresentOrTable(functionName, paramName, value)
+  if isPresent(value) or type(value) == 'table' then return end
+
+  local msg = "i18n.%s requires a non-empty string or table on its %s. Got %s (a %s value)."
+  error(msg:format(functionName, paramName, tostring(value), type(value)))
+end
+
+local function assertFunctionOrNil(functionName, paramName, value)
+  if value == nil or type(value) == 'function' then return end
+
+  local msg = "i18n.%s requires a function (or nil) on param %s. Got %s (a %s value)."
+  error(msg:format(functionName, paramName, tostring(value), type(value)))
+end
+
+local function defaultPluralizeFunction(count)
+  return plural.get(variants.root(i18n.getLocale()), count)
+end
+
+local function pluralize(t, data)
+  assertPresentOrPlural('interpolatePluralTable', 't', t)
+  data = data or {}
+  local count = data.count or 1
+  local plural_form = pluralizeFunction(count)
+  return t[plural_form]
+end
+
+local function treatNode(node, data)
+  if type(node) == 'string' then
+    return interpolate(node, data)
+  elseif isPluralTable(node) then
+    return interpolate(pluralize(node, data), data)
+  end
+  return node
+end
+
+local function recursiveLoad(currentContext, data)
+  local composedKey
+  for k,v in pairs(data) do
+    composedKey = (currentContext and (currentContext .. '.') or "") .. tostring(k)
+    assertPresent('load', composedKey, k)
+    assertPresentOrTable('load', composedKey, v)
+    if type(v) == 'string' then
+      i18n.set(composedKey, v)
+    else
+      recursiveLoad(composedKey, v)
+    end
+  end
+end
+
+local function localizedTranslate(key, loc, data)
+  local path, length = dotSplit(loc .. "." .. key)
+  local node = store
+
+  for i=1, length do
+    node = node[path[i]]
+    if not node then return nil end
+  end
+
+  return treatNode(node, data)
+end
+
+-- public interface
+
+function i18n.set(key, value)
+  assertPresent('set', 'key', key)
+  assertPresentOrPlural('set', 'value', value)
+
+  local path, length = dotSplit(key)
+  local node = store
+
+  for i=1, length-1 do
+    key = path[i]
+    node[key] = node[key] or {}
+    node = node[key]
+  end
+
+  local lastKey = path[length]
+  node[lastKey] = value
+end
+
+function i18n.translate(key, data)
+  assertPresent('translate', 'key', key)
+
+  data = data or {}
+  local usedLocale = data.locale or locale
+
+  local fallbacks = variants.fallbacks(usedLocale, fallbackLocale)
+  for i=1, #fallbacks do
+    local value = localizedTranslate(key, fallbacks[i], data)
+    if value then return value end
+  end
+
+  return data.default
+end
+
+function i18n.setLocale(newLocale, newPluralizeFunction)
+  assertPresent('setLocale', 'newLocale', newLocale)
+  assertFunctionOrNil('setLocale', 'newPluralizeFunction', newPluralizeFunction)
+  locale = newLocale
+  pluralizeFunction = newPluralizeFunction or defaultPluralizeFunction
+end
+
+function i18n.setFallbackLocale(newFallbackLocale)
+  assertPresent('setFallbackLocale', 'newFallbackLocale', newFallbackLocale)
+  fallbackLocale = newFallbackLocale
+end
+
+function i18n.getFallbackLocale()
+  return fallbackLocale
+end
+
+function i18n.getLocale()
+  return locale
+end
+
+function i18n.reset()
+  store = {}
+  plural.reset()
+  i18n.setLocale(defaultLocale)
+  i18n.setFallbackLocale(defaultLocale)
+end
+
+function i18n.load(data)
+  recursiveLoad(nil, data)
+end
+
+function i18n.loadFile(path)
+  local chunk = assert(loadfile(path))
+  local data = chunk()
+  i18n.load(data)
+end
+
+setmetatable(i18n, {__call = function(_, ...) return i18n.translate(...) end})
+
+i18n.reset()
+
+return i18n
diff --git a/extern/i18n.lua/i18n/interpolate.lua b/extern/i18n.lua/i18n/interpolate.lua
new file mode 100644
index 0000000000..c6bb242f05
--- /dev/null
+++ b/extern/i18n.lua/i18n/interpolate.lua
@@ -0,0 +1,60 @@
+local unpack = unpack or table.unpack -- lua 5.2 compat
+
+local FORMAT_CHARS = { c=1, d=1, E=1, e=1, f=1, g=1, G=1, i=1, o=1, u=1, X=1, x=1, s=1, q=1, ['%']=1 }
+
+-- matches a string of type %{age}
+local function interpolateValue(string, variables)
+  return string:gsub("(.?)%%{%s*(.-)%s*}",
+    function (previous, key)
+      if previous == "%" then
+        return
+      else
+        return previous .. tostring(variables[key])
+      end
+    end)
+end
+
+-- matches a string of type %<age>.d
+local function interpolateField(string, variables)
+  return string:gsub("(.?)%%<%s*(.-)%s*>%.([cdEefgGiouXxsq])",
+    function (previous, key, format)
+      if previous == "%" then
+        return
+      else
+        return previous .. string.format("%" .. format, variables[key] or "nil")
+      end
+    end)
+end
+
+local function escapePercentages(string)
+  return string:gsub("(%%)(.?)", function(_, char)
+    if FORMAT_CHARS[char] then
+      return "%" .. char
+    else
+      return "%%" .. char
+    end
+  end)
+end
+
+local function unescapePercentages(string)
+  return string:gsub("(%%%%)(.?)", function(_, char)
+    if FORMAT_CHARS[char] then
+      return "%" .. char
+    else
+      return "%%" .. char
+    end
+  end)
+end
+
+local function interpolate(pattern, variables)
+  variables = variables or {}
+  local result = pattern
+  result = interpolateValue(result, variables)
+  result = interpolateField(result, variables)
+  result = escapePercentages(result)
+  result = string.format(result, unpack(variables))
+  result = unescapePercentages(result)
+  return result
+end
+
+return interpolate
diff --git a/extern/i18n.lua/i18n/plural.lua b/extern/i18n.lua/i18n/plural.lua
new file mode 100644
index 0000000000..bb99804ee8
--- /dev/null
+++ b/extern/i18n.lua/i18n/plural.lua
@@ -0,0 +1,280 @@
+local plural = {}
+local defaultFunction = nil
+-- helper functions
+
+local function assertPresentString(functionName, paramName, value)
+  if type(value) ~= 'string' or #value == 0 then
+    local msg = "Expected param %s of function %s to be a string, but got %s (a value of type %s) instead"
+    error(msg:format(paramName, functionName, tostring(value), type(value)))
+  end
+end
+
+local function assertNumber(functionName, paramName, value)
+  if type(value) ~= 'number' then
+    local msg = "Expected param %s of function %s to be a number, but got %s (a value of type %s) instead"
+    error(msg:format(paramName, functionName, tostring(value), type(value)))
+  end
+end
+
+-- transforms "foo bar baz" into {'foo','bar','baz'}
+local function words(str)
+  local result, length = {}, 0
+  str:gsub("%S+", function(word)
+    length = length + 1
+    result[length] = word
+  end)
+  return result
+end
+
+local function isInteger(n)
+  return n == math.floor(n)
+end
+
+local function between(value, min, max)
+  return value >= min and value <= max
+end
+
+local function inside(v, list)
+  for i=1, #list do
+    if v == list[i] then return true end
+  end
+  return false
+end
+
+
+-- pluralization functions
+
+local pluralization = {}
+
+local f1 = function(n)
+  return n == 1 and "one" or "other"
+end
+pluralization[f1] = words([[
+  af asa bem bez bg bn brx ca cgg chr da de dv ee el
+  en eo es et eu fi fo fur fy gl gsw gu ha haw he is
+  it jmc kaj kcg kk kl ksb ku lb lg mas ml mn mr nah
+  nb nd ne nl nn no nr ny nyn om or pa pap ps pt rm
+  rof rwk saq seh sn so sq ss ssy st sv sw syr ta te
+  teo tig tk tn ts ur ve vun wae xh xog zu
+]])
+
+local f2 = function(n)
+  return (n == 0 or n == 1) and "one" or "other"
+end
+pluralization[f2] = words("ak am bh fil guw hi ln mg nso ti tl wa")
+
+local f3 = function(n)
+  if not isInteger(n) then return 'other' end
+  return (n == 0 and "zero") or
+         (n == 1 and "one") or
+         (n == 2 and "two") or
+         (between(n % 100, 3, 10) and "few") or
+         (between(n % 100, 11, 99) and "many") or
+         "other"
+end
+pluralization[f3] = {'ar'}
+
+local f4 = function()
+  return "other"
+end
+pluralization[f4] = words([[
+  az bm bo dz fa hu id ig ii ja jv ka kde kea km kn
+  ko lo ms my root sah ses sg th to tr vi wo yo zh
+]])
+
+local f5 = function(n)
+  if not isInteger(n) then return 'other' end
+  local n_10, n_100 = n % 10, n % 100
+  return (n_10 == 1 and n_100 ~= 11 and 'one') or
+         (between(n_10, 2, 4) and not between(n_100, 12, 14) and 'few') or
+         ((n_10 == 0 or between(n_10, 5, 9) or between(n_100, 11, 14)) and 'many') or
+         'other'
+end
+pluralization[f5] = words('be bs hr ru sh sr uk')
+
+local f6 = function(n)
+  if not isInteger(n) then return 'other' end
+  local n_10, n_100 = n % 10, n % 100
+  return (n_10 == 1 and not inside(n_100, {11,71,91}) and 'one') or
+         (n_10 == 2 and not inside(n_100, {12,72,92}) and 'two') or
+         (inside(n_10, {3,4,9}) and
+          not between(n_100, 10, 19) and
+          not between(n_100, 70, 79) and
+          not between(n_100, 90, 99)
+          and 'few') or
+         (n ~= 0 and n % 1000000 == 0 and 'many') or
+         'other'
+end
+pluralization[f6] = {'br'}
+
+local f7 = function(n)
+  return (n == 1 and 'one') or
+         ((n == 2 or n == 3 or n == 4) and 'few') or
+         'other'
+end
+pluralization[f7] = {'cz', 'sk'}
+
+local f8 = function(n)
+  return (n == 0 and 'zero') or
+         (n == 1 and 'one') or
+         (n == 2 and 'two') or
+         (n == 3 and 'few') or
+         (n == 6 and 'many') or
+         'other'
+end
+pluralization[f8] = {'cy'}
+
+local f9 = function(n)
+  return (n >= 0 and n < 2 and 'one') or
+         'other'
+end
+pluralization[f9] = {'ff', 'fr', 'kab'}
+
+local f10 = function(n)
+  return (n == 1 and 'one') or
+         (n == 2 and 'two') or
+         ((n == 3 or n == 4 or n == 5 or n == 6) and 'few') or
+         ((n == 7 or n == 8 or n == 9 or n == 10) and 'many') or
+         'other'
+end
+pluralization[f10] = {'ga'}
+
+local f11 = function(n)
+  return ((n == 1 or n == 11) and 'one') or
+         ((n == 2 or n == 12) and 'two') or
+         (isInteger(n) and (between(n, 3, 10) or between(n, 13, 19)) and 'few') or
+         'other'
+end
+pluralization[f11] = {'gd'}
+
+local f12 = function(n)
+  local n_10 = n % 10
+  return ((n_10 == 1 or n_10 == 2 or n % 20 == 0) and 'one') or
+         'other'
+end
+pluralization[f12] = {'gv'}
+
+local f13 = function(n)
+  return (n == 1 and 'one') or
+         (n == 2 and 'two') or
+         'other'
+end
+pluralization[f13] = words('iu kw naq se sma smi smj smn sms')
+
+local f14 = function(n)
+  return (n == 0 and 'zero') or
+         (n == 1 and 'one') or
+         'other'
+end
+pluralization[f14] = {'ksh'}
+
+local f15 = function(n)
+  return (n == 0 and 'zero') or
+         (n > 0 and n < 2 and 'one') or
+         'other'
+end
+pluralization[f15] = {'lag'}
+
+local f16 = function(n)
+  if not isInteger(n) then return 'other' end
+  if between(n % 100, 11, 19) then return 'other' end
+  local n_10 = n % 10
+  return (n_10 == 1 and 'one') or
+         (between(n_10, 2, 9) and 'few') or
+         'other'
+end
+pluralization[f16] = {'lt'}
+
+local f17 = function(n)
+  return (n == 0 and 'zero') or
+         ((n % 10 == 1 and n % 100 ~= 11) and 'one') or
+         'other'
+end
+pluralization[f17] = {'lv'}
+
+local f18 = function(n)
+  return((n % 10 == 1 and n ~= 11) and 'one') or
+         'other'
+end
+pluralization[f18] = {'mk'}
+
+local f19 = function(n)
+  return (n == 1 and 'one') or
+         ((n == 0 or
+          (n ~= 1 and isInteger(n) and between(n % 100, 1, 19)))
+          and 'few') or
+         'other'
+end
+pluralization[f19] = {'mo', 'ro'}
+
+local f20 = function(n)
+  if n == 1 then return 'one' end
+  if not isInteger(n) then return 'other' end
+  local n_100 = n % 100
+  return ((n == 0 or between(n_100, 2, 10)) and 'few') or
+         (between(n_100, 11, 19) and 'many') or
+         'other'
+end
+pluralization[f20] = {'mt'}
+
+local f21 = function(n)
+  if n == 1 then return 'one' end
+  if not isInteger(n) then return 'other' end
+  local n_10, n_100 = n % 10, n % 100
+
+  return ((between(n_10, 2, 4) and not between(n_100, 12, 14)) and 'few') or
+         ((n_10 == 0 or n_10 == 1 or between(n_10, 5, 9) or between(n_100, 12, 14)) and 'many') or
+         'other'
+end
+pluralization[f21] = {'pl'}
+
+local f22 = function(n)
+  return (n == 0 or n == 1) and 'one' or
+         'other'
+end
+pluralization[f22] = {'shi'}
+
+local f23 = function(n)
+  local n_100 = n % 100
+  return (n_100 == 1 and 'one') or
+         (n_100 == 2 and 'two') or
+         ((n_100 == 3 or n_100 == 4) and 'few') or
+         'other'
+end
+pluralization[f23] = {'sl'}
+
+local f24 = function(n)
+  return (isInteger(n) and (n == 0 or n == 1 or between(n, 11, 99)) and 'one')
+         or 'other'
+end
+pluralization[f24] = {'tzm'}
+
+local pluralizationFunctions = {}
+for f,locales in pairs(pluralization) do
+  for _,locale in ipairs(locales) do
+    pluralizationFunctions[locale] = f
+  end
+end
+
+-- public interface
+
+function plural.get(locale, n)
+  assertPresentString('i18n.plural.get', 'locale', locale)
+  assertNumber('i18n.plural.get', 'n', n)
+
+  local f = pluralizationFunctions[locale] or defaultFunction
+
+  return f(math.abs(n))
+end
+
+function plural.setDefaultFunction(f)
+  defaultFunction = f
+end
+
+function plural.reset()
+  defaultFunction = pluralizationFunctions['en']
+end
+
+plural.reset()
+
+return plural
diff --git a/extern/i18n.lua/i18n/variants.lua b/extern/i18n.lua/i18n/variants.lua
new file mode 100644
index 0000000000..0cfad42f6c
--- /dev/null
+++ b/extern/i18n.lua/i18n/variants.lua
@@ -0,0 +1,49 @@
+local variants = {}
+
+local function reverse(arr, length)
+  local result = {}
+  for i=1, length do result[i] = arr[length-i+1] end
+  return result, length
+end
+
+local function concat(arr1, len1, arr2, len2)
+  for i = 1, len2 do
+    arr1[len1 + i] = arr2[i]
+  end
+  return arr1, len1 + len2
+end
+
+function variants.ancestry(locale)
+  local result, length, accum = {},0,nil
+  locale:gsub("[^%-]+", function(c)
+    length = length + 1
+    accum = accum and (accum .. '-' .. c) or c
+    result[length] = accum
+  end)
+  return reverse(result, length)
+end
+
+function variants.isParent(parent, child)
+  return not not child:match("^".. parent .. "%-")
+end
+
+function variants.root(locale)
+  return locale:match("[^%-]+")
+end
+
+function variants.fallbacks(locale, fallbackLocale)
+  if locale == fallbackLocale or
+     variants.isParent(fallbackLocale, locale) then
+     return variants.ancestry(locale)
+  end
+  if variants.isParent(locale, fallbackLocale) then
+    return variants.ancestry(fallbackLocale)
+  end
+
+  local ancestry1, length1 = variants.ancestry(locale)
+  local ancestry2, length2 = variants.ancestry(fallbackLocale)
+
+  return concat(ancestry1, length1, ancestry2, length2)
+end
+
+return variants
diff --git a/extern/i18n.lua/i18n/version.lua b/extern/i18n.lua/i18n/version.lua
new file mode 100644
index 0000000000..eb788884ac
--- /dev/null
+++ b/extern/i18n.lua/i18n/version.lua
@@ -0,0 +1 @@
+return '0.9.2'
diff --git a/files/CMakeLists.txt b/files/CMakeLists.txt
index cea33f0f40..607ddeca49 100644
--- a/files/CMakeLists.txt
+++ b/files/CMakeLists.txt
@@ -3,3 +3,4 @@ add_subdirectory(shaders)
 add_subdirectory(vfs)
 add_subdirectory(builtin_scripts)
 add_subdirectory(lua_api)
+add_subdirectory(../extern/i18n.lua ${CMAKE_CURRENT_BINARY_DIR}/files)

From d5cba38f4bb7f19a61347e0883c561cfaaeb46b2 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Thu, 30 Dec 2021 17:08:29 -0800
Subject: [PATCH 1910/2859] shader-based object texture blending

---
 files/shaders/objects_fragment.glsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index 99ed44919b..6e8d929569 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -146,7 +146,7 @@ void main()
 
 #if @decalMap
     vec4 decalTex = texture2D(decalMap, decalMapUV);
-    gl_FragData[0].xyz = mix(gl_FragData[0].xyz, decalTex.xyz, decalTex.a);
+    gl_FragData[0].xyz = mix(gl_FragData[0].xyz, decalTex.xyz, decalTex.a * diffuseColor.a);
 #endif
 
 #if @envMap

From 0f246e73653fb1790c0a7c3cdf61e2197bbbade4 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 26 Dec 2021 21:49:20 +0100
Subject: [PATCH 1911/2859] Use a separate instance of Lua i18n for every
 context

---
 apps/openmw/engine.cpp                        |   2 +-
 apps/openmw/mwlua/context.hpp                 |   2 +
 apps/openmw/mwlua/luabindings.cpp             |   4 +-
 apps/openmw/mwlua/luamanagerimp.cpp           |  11 +-
 apps/openmw/mwlua/luamanagerimp.hpp           |   4 +-
 apps/openmw_test_suite/CMakeLists.txt         |   1 +
 apps/openmw_test_suite/lua/test_i18n.cpp      | 110 ++++++++++++++++++
 apps/openmw_test_suite/lua/test_lua.cpp       |   4 +-
 .../lua/test_utilpackage.cpp                  |   6 -
 apps/openmw_test_suite/lua/testing_util.hpp   |   7 ++
 components/CMakeLists.txt                     |   4 +-
 components/lua/i18n.cpp                       | 108 +++++++++++++++++
 components/lua/i18n.hpp                       |  41 +++++++
 components/lua/luastate.cpp                   |  81 +++++++++++--
 components/lua/luastate.hpp                   |   9 +-
 .../source/reference/modding/settings/lua.rst |  11 ++
 files/lua_api/openmw/core.lua                 |  33 ++++++
 files/settings-default.cfg                    |   4 +
 18 files changed, 416 insertions(+), 26 deletions(-)
 create mode 100644 apps/openmw_test_suite/lua/test_i18n.cpp
 create mode 100644 components/lua/i18n.cpp
 create mode 100644 components/lua/i18n.hpp

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 1a73ae3531..afba76edce 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -737,7 +737,7 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
 
     mViewer->addEventHandler(mScreenCaptureHandler);
 
-    mLuaManager = new MWLua::LuaManager(mVFS.get());
+    mLuaManager = new MWLua::LuaManager(mVFS.get(), (mResDir / "lua_libs").string());
     mEnvironment.setLuaManager(mLuaManager);
 
     // Create input and UI first to set up a bootstrapping environment for
diff --git a/apps/openmw/mwlua/context.hpp b/apps/openmw/mwlua/context.hpp
index b3e3703a46..7ff584d8cc 100644
--- a/apps/openmw/mwlua/context.hpp
+++ b/apps/openmw/mwlua/context.hpp
@@ -7,6 +7,7 @@ namespace LuaUtil
 {
     class LuaState;
     class UserdataSerializer;
+    class I18nManager;
 }
 
 namespace MWLua
@@ -20,6 +21,7 @@ namespace MWLua
         LuaManager* mLuaManager;
         LuaUtil::LuaState* mLua;
         LuaUtil::UserdataSerializer* mSerializer;
+        LuaUtil::I18nManager* mI18n;
         WorldView* mWorldView;
         LocalEventQueue* mLocalEventQueue;
         GlobalEventQueue* mGlobalEventQueue;
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index 57b1b17a3b..c525fd8a23 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -1,6 +1,7 @@
 #include "luabindings.hpp"
 
 #include <components/lua/luastate.hpp>
+#include <components/lua/i18n.hpp>
 #include <components/queries/luabindings.hpp>
 
 #include "../mwbase/environment.hpp"
@@ -25,7 +26,7 @@ namespace MWLua
     {
         auto* lua = context.mLua;
         sol::table api(lua->sol(), sol::create);
-        api["API_REVISION"] = 11;
+        api["API_REVISION"] = 12;
         api["quit"] = [lua]()
         {
             Log(Debug::Warning) << "Quit requested by a Lua script.\n" << lua->debugTraceback();
@@ -64,6 +65,7 @@ namespace MWLua
             {"CarriedLeft", MWWorld::InventoryStore::Slot_CarriedLeft},
             {"Ammunition", MWWorld::InventoryStore::Slot_Ammunition}
         }));
+        api["i18n"] = [i18n=context.mI18n](const std::string& context) { return i18n->getContext(context); };
         return LuaUtil::makeReadOnly(api);
     }
 
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index f134ef86dd..be5764c32f 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -6,6 +6,8 @@
 #include <components/esm/esmwriter.hpp>
 #include <components/esm/luascripts.hpp>
 
+#include <components/settings/settings.hpp>
+
 #include <components/lua/utilpackage.hpp>
 
 #include "../mwbase/windowmanager.hpp"
@@ -20,9 +22,10 @@
 namespace MWLua
 {
 
-    LuaManager::LuaManager(const VFS::Manager* vfs) : mLua(vfs, &mConfiguration)
+    LuaManager::LuaManager(const VFS::Manager* vfs, const std::string& libsDir) : mLua(vfs, &mConfiguration), mI18n(vfs, &mLua)
     {
         Log(Debug::Info) << "Lua version: " << LuaUtil::getLuaVersion();
+        mLua.addInternalLibSearchPath(libsDir);
 
         mGlobalSerializer = createUserdataSerializer(false, mWorldView.getObjectRegistry());
         mLocalSerializer = createUserdataSerializer(true, mWorldView.getObjectRegistry());
@@ -46,6 +49,7 @@ namespace MWLua
         context.mIsGlobal = true;
         context.mLuaManager = this;
         context.mLua = &mLua;
+        context.mI18n = &mI18n;
         context.mWorldView = &mWorldView;
         context.mLocalEventQueue = &mLocalEvents;
         context.mGlobalEventQueue = &mGlobalEvents;
@@ -55,6 +59,11 @@ namespace MWLua
         localContext.mIsGlobal = false;
         localContext.mSerializer = mLocalSerializer.get();
 
+        mI18n.init();
+        std::vector<std::string> preferredLanguages;
+        Misc::StringUtils::split(Settings::Manager::getString("i18n preferred languages", "Lua"), preferredLanguages, ", ");
+        mI18n.setPreferredLanguages(preferredLanguages);
+
         initObjectBindingsForGlobalScripts(context);
         initCellBindingsForGlobalScripts(context);
         initObjectBindingsForLocalScripts(localContext);
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index 88273de7f0..d050cb9413 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -5,6 +5,7 @@
 #include <set>
 
 #include <components/lua/luastate.hpp>
+#include <components/lua/i18n.hpp>
 
 #include "../mwbase/luamanager.hpp"
 
@@ -22,7 +23,7 @@ namespace MWLua
     class LuaManager : public MWBase::LuaManager
     {
     public:
-        LuaManager(const VFS::Manager* vfs);
+        LuaManager(const VFS::Manager* vfs, const std::string& libsDir);
 
         // Called by engine.cpp when the environment is fully initialized.
         void init();
@@ -91,6 +92,7 @@ namespace MWLua
         bool mGlobalScriptsStarted = false;
         LuaUtil::ScriptsConfiguration mConfiguration;
         LuaUtil::LuaState mLua;
+        LuaUtil::I18nManager mI18n;
         sol::table mNearbyPackage;
         sol::table mUserInterfacePackage;
         sol::table mCameraPackage;
diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index 19b31f78be..9465d59b47 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -23,6 +23,7 @@ if (GTEST_FOUND AND GMOCK_FOUND)
         lua/test_serialization.cpp
         lua/test_querypackage.cpp
         lua/test_configuration.cpp
+        lua/test_i18n.cpp
 
         lua/test_ui_content.cpp
 
diff --git a/apps/openmw_test_suite/lua/test_i18n.cpp b/apps/openmw_test_suite/lua/test_i18n.cpp
new file mode 100644
index 0000000000..427482be64
--- /dev/null
+++ b/apps/openmw_test_suite/lua/test_i18n.cpp
@@ -0,0 +1,110 @@
+#include "gmock/gmock.h"
+#include <gtest/gtest.h>
+
+#include <components/files/fixedpath.hpp>
+
+#include <components/lua/luastate.hpp>
+#include <components/lua/i18n.hpp>
+
+#include "testing_util.hpp"
+
+namespace
+{
+    using namespace testing;
+
+    TestFile invalidScript("not a script");
+    TestFile incorrectScript("return { incorrectSection = {}, engineHandlers = { incorrectHandler = function() end } }");
+    TestFile emptyScript("");
+    
+    TestFile test1En(R"X(
+return {
+    good_morning = "Good morning.",
+    you_have_arrows = {
+      one = "You have one arrow.",
+      other = "You have %{count} arrows.",
+    },
+}
+)X");
+
+    TestFile test1De(R"X(
+return {
+    good_morning = "Guten Morgen.",
+    you_have_arrows = {
+      one = "Du hast ein Pfeil.",
+      other = "Du hast %{count} Pfeile.",
+    },
+    ["Hello %{name}!"] = "Hallo %{name}!",
+}
+)X");
+
+TestFile test2En(R"X(
+return {
+    good_morning = "Morning!",
+    you_have_arrows = "Arrows count: %{count}",
+}
+)X");
+
+    TestFile invalidTest2De(R"X(
+require('math')
+return {}
+)X");
+
+    struct LuaI18nTest : Test
+    {
+        std::unique_ptr<VFS::Manager> mVFS = createTestVFS({
+            {"i18n/Test1/en.lua", &test1En},
+            {"i18n/Test1/de.lua", &test1De},
+            {"i18n/Test2/en.lua", &test2En},
+            {"i18n/Test2/de.lua", &invalidTest2De},
+        });
+
+        LuaUtil::ScriptsConfiguration mCfg;
+        std::string mLibsPath = (Files::TargetPathType("openmw_test_suite").getLocalPath() / "resources" / "lua_libs").string();
+    };
+
+    TEST_F(LuaI18nTest, I18n)
+    {
+        internal::CaptureStdout();
+        LuaUtil::LuaState lua{mVFS.get(), &mCfg};
+        sol::state& l = lua.sol();
+        LuaUtil::I18nManager i18n(mVFS.get(), &lua);
+        lua.addInternalLibSearchPath(mLibsPath);
+        i18n.init();
+        i18n.setPreferredLanguages({"de", "en"});
+        EXPECT_THAT(internal::GetCapturedStdout(), "I18n preferred languages: de en\n");
+
+        internal::CaptureStdout();
+        l["t1"] = i18n.getContext("Test1");
+        EXPECT_THAT(internal::GetCapturedStdout(), "Language file \"i18n/Test1/de.lua\" is enabled\n");
+
+        internal::CaptureStdout();
+        l["t2"] = i18n.getContext("Test2");
+        {
+            std::string output = internal::GetCapturedStdout();
+            EXPECT_THAT(output, HasSubstr("Can not load i18n/Test2/de.lua"));
+            EXPECT_THAT(output, HasSubstr("Language file \"i18n/Test2/en.lua\" is enabled"));
+        }
+
+        EXPECT_EQ(get<std::string>(l, "t1('good_morning')"), "Guten Morgen.");
+        EXPECT_EQ(get<std::string>(l, "t1('you_have_arrows', {count=1})"), "Du hast ein Pfeil.");
+        EXPECT_EQ(get<std::string>(l, "t1('you_have_arrows', {count=5})"), "Du hast 5 Pfeile.");
+        EXPECT_EQ(get<std::string>(l, "t1('Hello %{name}!', {name='World'})"), "Hallo World!");
+        EXPECT_EQ(get<std::string>(l, "t2('good_morning')"), "Morning!");
+        EXPECT_EQ(get<std::string>(l, "t2('you_have_arrows', {count=3})"), "Arrows count: 3");
+
+        internal::CaptureStdout();
+        i18n.setPreferredLanguages({"en", "de"});
+        EXPECT_THAT(internal::GetCapturedStdout(),
+            "I18n preferred languages: en de\n"
+            "Language file \"i18n/Test1/en.lua\" is enabled\n"
+            "Language file \"i18n/Test2/en.lua\" is enabled\n");
+
+        EXPECT_EQ(get<std::string>(l, "t1('good_morning')"), "Good morning.");
+        EXPECT_EQ(get<std::string>(l, "t1('you_have_arrows', {count=1})"), "You have one arrow.");
+        EXPECT_EQ(get<std::string>(l, "t1('you_have_arrows', {count=5})"), "You have 5 arrows.");
+        EXPECT_EQ(get<std::string>(l, "t1('Hello %{name}!', {name='World'})"), "Hello World!");
+        EXPECT_EQ(get<std::string>(l, "t2('good_morning')"), "Morning!");
+        EXPECT_EQ(get<std::string>(l, "t2('you_have_arrows', {count=3})"), "Arrows count: 3");
+    }
+
+}
diff --git a/apps/openmw_test_suite/lua/test_lua.cpp b/apps/openmw_test_suite/lua/test_lua.cpp
index 4b3ecdcb2b..fe3cf14d25 100644
--- a/apps/openmw_test_suite/lua/test_lua.cpp
+++ b/apps/openmw_test_suite/lua/test_lua.cpp
@@ -106,7 +106,7 @@ return {
         }
         EXPECT_EQ(LuaUtil::call(script["useCounter"]).get<int>(), 45);
 
-        EXPECT_ERROR(LuaUtil::call(script["incorrectRequire"]), "Resource 'counter.lua' not found");
+        EXPECT_ERROR(LuaUtil::call(script["incorrectRequire"]), "module not found: counter");
     }
 
     TEST_F(LuaStateTest, ReadOnly)
@@ -161,7 +161,7 @@ return {
 
         sol::table script2 = lua.runInNewSandbox("bbb/tests.lua", "", {{"test.api", api2}});
 
-        EXPECT_ERROR(LuaUtil::call(script1["sqr"], 3), "Resource 'sqrlib.lua' not found");
+        EXPECT_ERROR(LuaUtil::call(script1["sqr"], 3), "module not found: sqrlib");
         EXPECT_EQ(LuaUtil::call(script2["sqr"], 3).get<int>(), 9);
 
         EXPECT_EQ(LuaUtil::call(script1["apiName"]).get<std::string>(), "api1");
diff --git a/apps/openmw_test_suite/lua/test_utilpackage.cpp b/apps/openmw_test_suite/lua/test_utilpackage.cpp
index 14b7021532..953d5f50d3 100644
--- a/apps/openmw_test_suite/lua/test_utilpackage.cpp
+++ b/apps/openmw_test_suite/lua/test_utilpackage.cpp
@@ -10,12 +10,6 @@ namespace
 {
     using namespace testing;
 
-    template <typename T>
-    T get(sol::state& lua, std::string luaCode)
-    {
-        return lua.safe_script("return " + luaCode).get<T>();
-    }
-
     std::string getAsString(sol::state& lua, std::string luaCode)
     {
         return LuaUtil::toString(lua.safe_script("return " + luaCode));
diff --git a/apps/openmw_test_suite/lua/testing_util.hpp b/apps/openmw_test_suite/lua/testing_util.hpp
index 2f6810350f..ba4a418bfb 100644
--- a/apps/openmw_test_suite/lua/testing_util.hpp
+++ b/apps/openmw_test_suite/lua/testing_util.hpp
@@ -2,6 +2,7 @@
 #define LUA_TESTING_UTIL_H
 
 #include <sstream>
+#include <sol/sol.hpp>
 
 #include <components/vfs/archive.hpp>
 #include <components/vfs/manager.hpp>
@@ -9,6 +10,12 @@
 namespace
 {
 
+    template <typename T>
+    T get(sol::state& lua, const std::string& luaCode)
+    {
+        return lua.safe_script("return " + luaCode).get<T>();
+    }
+
     class TestFile : public VFS::File
     {
     public:
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 3b38489d7a..6fedf25b4c 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -29,7 +29,7 @@ endif (GIT_CHECKOUT)
 # source files
 
 add_component_dir (lua
-    luastate scriptscontainer utilpackage serialization configuration
+    luastate scriptscontainer utilpackage serialization configuration i18n
     )
 
 add_component_dir (settings
@@ -160,7 +160,7 @@ add_component_dir (fallback
 add_component_dir (queries
     query luabindings
     )
-    
+
 add_component_dir (lua_ui
     widget widgetlist element layers content
     text textedit window
diff --git a/components/lua/i18n.cpp b/components/lua/i18n.cpp
new file mode 100644
index 0000000000..9fd2724f75
--- /dev/null
+++ b/components/lua/i18n.cpp
@@ -0,0 +1,108 @@
+#include "i18n.hpp"
+
+#include <components/debug/debuglog.hpp>
+
+namespace sol
+{
+    template <>
+    struct is_automagical<LuaUtil::I18nManager::Context> : std::false_type {};
+}
+
+namespace LuaUtil
+{
+
+    void I18nManager::init()
+    {
+        mPreferredLanguages.push_back("en");
+        sol::usertype<Context> ctx = mLua->sol().new_usertype<Context>("I18nContext");
+        ctx[sol::meta_function::call] = &Context::translate;
+        try
+        {
+            mI18nLoader = mLua->loadInternalLib("i18n");
+            sol::set_environment(mLua->newInternalLibEnvironment(), mI18nLoader);
+        }
+        catch (std::exception& e)
+        {
+            Log(Debug::Error) << "LuaUtil::I18nManager initialization failed: " << e.what();
+        }
+    }
+
+    void I18nManager::setPreferredLanguages(const std::vector<std::string>& langs)
+    {
+        {
+            Log msg(Debug::Info);
+            msg << "I18n preferred languages:";
+            for (const std::string& l : langs)
+                msg << " " << l;
+        }
+        mPreferredLanguages = langs;
+        for (auto& [_, context] : mContexts)
+            context.updateLang(this);
+    }
+
+    void I18nManager::Context::readLangData(I18nManager* manager, const std::string& lang)
+    {
+        std::string path = "i18n/";
+        path.append(mName);
+        path.append("/");
+        path.append(lang);
+        path.append(".lua");
+        if (!manager->mVFS->exists(path))
+            return;
+        try
+        {
+            sol::protected_function dataFn = manager->mLua->loadFromVFS(path);
+            sol::environment emptyEnv(manager->mLua->sol(), sol::create);
+            sol::set_environment(emptyEnv, dataFn);
+            sol::table data = manager->mLua->newTable();
+            data[lang] = call(dataFn);
+            call(mI18n["load"], data);
+            mLoadedLangs[lang] = true;
+        }
+        catch (std::exception& e)
+        {
+            Log(Debug::Error) << "Can not load " << path << ": " << e.what();
+        }
+    }
+
+    sol::object I18nManager::Context::translate(std::string_view key, const sol::object& data)
+    {
+        sol::object res = call(mI18n["translate"], key, data);
+        if (res != sol::nil)
+            return res;
+
+        // If not found in a language file - register the key itself as a message.
+        std::string composedKey = call(mI18n["getLocale"]).get<std::string>();
+        composedKey.push_back('.');
+        composedKey.append(key);
+        call(mI18n["set"], composedKey, key);
+        return call(mI18n["translate"], key, data);
+    }
+
+    void I18nManager::Context::updateLang(I18nManager* manager)
+    {
+        for (const std::string& lang : manager->mPreferredLanguages)
+        {
+            if (mLoadedLangs[lang] == sol::nil)
+                readLangData(manager, lang);
+            if (mLoadedLangs[lang] != sol::nil)
+            {
+                Log(Debug::Verbose) << "Language file \"i18n/" << mName << "/" << lang << ".lua\" is enabled";
+                call(mI18n["setLocale"], lang);
+                return;
+            }
+        }
+        Log(Debug::Warning) << "No language files for the preferred languages found in \"i18n/" << mName << "\"";
+    }
+
+    sol::object I18nManager::getContext(const std::string& contextName)
+    {
+        if (mI18nLoader == sol::nil)
+            throw std::runtime_error("LuaUtil::I18nManager is not initialized");
+        Context ctx{contextName, mLua->newTable(), call(mI18nLoader, "i18n.init")};
+        ctx.updateLang(this);
+        mContexts.emplace(contextName, ctx);
+        return sol::make_object(mLua->sol(), ctx);
+    }
+
+}
diff --git a/components/lua/i18n.hpp b/components/lua/i18n.hpp
new file mode 100644
index 0000000000..4bc7c624f1
--- /dev/null
+++ b/components/lua/i18n.hpp
@@ -0,0 +1,41 @@
+#ifndef COMPONENTS_LUA_I18N_H
+#define COMPONENTS_LUA_I18N_H
+
+#include "luastate.hpp"
+
+namespace LuaUtil
+{
+
+    class I18nManager
+    {
+    public:
+        I18nManager(const VFS::Manager* vfs, LuaState* lua) : mVFS(vfs), mLua(lua) {}
+        void init();
+
+        void setPreferredLanguages(const std::vector<std::string>& langs);
+        const std::vector<std::string>& getPreferredLanguages() const { return mPreferredLanguages; }
+
+        sol::object getContext(const std::string& contextName);
+
+    private:
+        struct Context
+        {
+            std::string mName;
+            sol::table mLoadedLangs;
+            sol::table mI18n;
+
+            void updateLang(I18nManager* manager);
+            void readLangData(I18nManager* manager, const std::string& lang);
+            sol::object translate(std::string_view key, const sol::object& data);
+        };
+
+        const VFS::Manager* mVFS;
+        LuaState* mLua;
+        sol::object mI18nLoader = sol::nil;
+        std::vector<std::string> mPreferredLanguages;
+        std::map<std::string, Context> mContexts;
+    };
+
+}
+
+#endif // COMPONENTS_LUA_I18N_H
\ No newline at end of file
diff --git a/components/lua/luastate.cpp b/components/lua/luastate.cpp
index 61637d7b07..cee48b4545 100644
--- a/components/lua/luastate.cpp
+++ b/components/lua/luastate.cpp
@@ -4,17 +4,44 @@
 #include <luajit.h>
 #endif // NO_LUAJIT
 
+#include <filesystem>
+
 #include <components/debug/debuglog.hpp>
 
 namespace LuaUtil
 {
 
-    static std::string packageNameToPath(std::string_view packageName)
+    static std::string packageNameToVfsPath(std::string_view packageName, const VFS::Manager* vfs)
     {
-        std::string res(packageName);
-        std::replace(res.begin(), res.end(), '.', '/');
-        res.append(".lua");
-        return res;
+        std::string path(packageName);
+        std::replace(path.begin(), path.end(), '.', '/');
+        std::string pathWithInit = path + "/init.lua";
+        path.append(".lua");
+        if (vfs->exists(path))
+            return path;
+        else if (vfs->exists(pathWithInit))
+            return pathWithInit;
+        else
+            throw std::runtime_error("module not found: " + std::string(packageName));
+    }
+
+    static std::string packageNameToPath(std::string_view packageName, const std::vector<std::string>& searchDirs)
+    {
+        std::string path(packageName);
+        std::replace(path.begin(), path.end(), '.', '/');
+        std::string pathWithInit = path + "/init.lua";
+        path.append(".lua");
+        for (const std::string& dir : searchDirs)
+        {
+            std::filesystem::path base(dir);
+            std::filesystem::path p1 = base / path;
+            if (std::filesystem::exists(p1))
+                return p1.string();
+            std::filesystem::path p2 = base / pathWithInit;
+            if (std::filesystem::exists(p2))
+                return p2.string();
+        }
+        throw std::runtime_error("module not found: " + std::string(packageName));
     }
 
     static const std::string safeFunctions[] = {
@@ -28,7 +55,7 @@ namespace LuaUtil
                             sol::lib::string, sol::lib::table, sol::lib::debug);
 
         mLua["math"]["randomseed"](static_cast<unsigned>(std::time(nullptr)));
-        mLua["math"]["randomseed"] = sol::nil;
+        mLua["math"]["randomseed"] = []{};
 
         mLua["writeToLog"] = [](std::string_view s) { Log(Debug::Level::Info) << s; };
         mLua.script(R"(printToLog = function(name, ...)
@@ -105,7 +132,7 @@ namespace LuaUtil
         const std::string& path, const std::string& namePrefix,
         const std::map<std::string, sol::object>& packages, const sol::object& hiddenData)
     {
-        sol::protected_function script = loadScript(path);
+        sol::protected_function script = loadScriptAndCache(path);
 
         sol::environment env(mLua, sol::create, mSandboxEnv);
         std::string envName = namePrefix + "[" + path + "]:";
@@ -122,9 +149,9 @@ namespace LuaUtil
             sol::object package = packages[packageName];
             if (package == sol::nil)
             {
-                sol::protected_function packageLoader = loadScript(packageNameToPath(packageName));
+                sol::protected_function packageLoader = loadScriptAndCache(packageNameToVfsPath(packageName, mVFS));
                 sol::set_environment(env, packageLoader);
-                package = throwIfError(packageLoader());
+                package = call(packageLoader, packageName);
                 if (!package.is<sol::table>())
                     throw std::runtime_error("Lua package must return a table.");
                 packages[packageName] = package;
@@ -138,6 +165,24 @@ namespace LuaUtil
         return call(script);
     }
 
+    sol::environment LuaState::newInternalLibEnvironment()
+    {
+        sol::environment env(mLua, sol::create, mSandboxEnv);
+        sol::table loaded(mLua, sol::create);
+        for (const std::string& s : safePackages)
+            loaded[s] = mSandboxEnv[s];
+        env["require"] = [this, loaded, env](const std::string& module) mutable
+        {
+            if (loaded[module] != sol::nil)
+                return loaded[module];
+            sol::protected_function initializer = loadInternalLib(module);
+            sol::set_environment(env, initializer);
+            loaded[module] = call(initializer, module);
+            return loaded[module];
+        };
+        return env;
+    }
+
     sol::protected_function_result LuaState::throwIfError(sol::protected_function_result&& res)
     {
         if (!res.valid() && static_cast<int>(res.get_type()) == LUA_TSTRING)
@@ -146,17 +191,31 @@ namespace LuaUtil
             return std::move(res);
     }
 
-    sol::function LuaState::loadScript(const std::string& path)
+    sol::function LuaState::loadScriptAndCache(const std::string& path)
     {
         auto iter = mCompiledScripts.find(path);
         if (iter != mCompiledScripts.end())
             return mLua.load(iter->second.as_string_view(), path, sol::load_mode::binary);
+        sol::function res = loadFromVFS(path);
+        mCompiledScripts[path] = res.dump();
+        return res;
+    }
 
+    sol::function LuaState::loadFromVFS(const std::string& path)
+    {
         std::string fileContent(std::istreambuf_iterator<char>(*mVFS->get(path)), {});
         sol::load_result res = mLua.load(fileContent, path, sol::load_mode::text);
         if (!res.valid())
             throw std::runtime_error("Lua error: " + res.get<std::string>());
-        mCompiledScripts[path] = res.get<sol::function>().dump();
+        return res;
+    }
+
+    sol::function LuaState::loadInternalLib(std::string_view libName)
+    {
+        std::string path = packageNameToPath(libName, mLibSearchPaths);
+        sol::load_result res = mLua.load_file(path, sol::load_mode::text);
+        if (!res.valid())
+            throw std::runtime_error("Lua error: " + res.get<std::string>());
         return res;
     }
 
diff --git a/components/lua/luastate.hpp b/components/lua/luastate.hpp
index 32c180c987..f9be5e9e99 100644
--- a/components/lua/luastate.hpp
+++ b/components/lua/luastate.hpp
@@ -76,12 +76,18 @@ namespace LuaUtil
 
         const ScriptsConfiguration& getConfiguration() const { return *mConf; }
 
+        // Load internal Lua library. All libraries are loaded in one sandbox and shouldn't be exposed to scripts directly.
+        void addInternalLibSearchPath(const std::string& path) { mLibSearchPaths.push_back(path); }
+        sol::function loadInternalLib(std::string_view libName);
+        sol::function loadFromVFS(const std::string& path);
+        sol::environment newInternalLibEnvironment();
+
     private:
         static sol::protected_function_result throwIfError(sol::protected_function_result&&);
         template <typename... Args>
         friend sol::protected_function_result call(const sol::protected_function& fn, Args&&... args);
 
-        sol::function loadScript(const std::string& path);
+        sol::function loadScriptAndCache(const std::string& path);
 
         sol::state mLua;
         const ScriptsConfiguration* mConf;
@@ -89,6 +95,7 @@ namespace LuaUtil
         std::map<std::string, sol::bytecode> mCompiledScripts;
         std::map<std::string, sol::object> mCommonPackages;
         const VFS::Manager* mVFS;
+        std::vector<std::string> mLibSearchPaths;
     };
 
     // Should be used for every call of every Lua function.
diff --git a/docs/source/reference/modding/settings/lua.rst b/docs/source/reference/modding/settings/lua.rst
index 65faf884ae..919d530d18 100644
--- a/docs/source/reference/modding/settings/lua.rst
+++ b/docs/source/reference/modding/settings/lua.rst
@@ -27,3 +27,14 @@ Values >1 are not yet supported.
 
 This setting can only be configured by editing the settings configuration file.
 
+i18n preferred languages
+------------------------
+
+:Type:		string
+:Default:	en
+
+List of the preferred languages separated by comma.
+For example "de,en" means German as the first prority and English as a fallback.
+
+This setting can only be configured by editing the settings configuration file.
+
diff --git a/files/lua_api/openmw/core.lua b/files/lua_api/openmw/core.lua
index fe309a92db..016267d39d 100644
--- a/files/lua_api/openmw/core.lua
+++ b/files/lua_api/openmw/core.lua
@@ -37,6 +37,39 @@
 -- @function [parent=#core] isWorldPaused
 -- @return #boolean
 
+-------------------------------------------------------------------------------
+-- Return i18n formatting function for the given context.
+-- It is based on `i18n.lua` library.
+-- Language files should be stored in VFS as `i18n/<ContextName>/<Lang>.lua`.
+-- See https://github.com/kikito/i18n.lua for format details.
+-- @function [parent=#core] i18n
+-- @param #string context I18n context; recommended to use the name of the mod.
+-- @return #function
+-- @usage
+-- -- DataFiles/i18n/MyMod/en.lua
+-- return {
+--     good_morning = 'Good morning.',
+--     you_have_arrows = {
+--       one = 'You have one arrow.',
+--       other = 'You have %{count} arrows.',
+--     },
+-- }
+-- @usage
+-- -- DataFiles/i18n/MyMod/de.lua
+-- return {
+--     good_morning = "Guten Morgen.",
+--     you_have_arrows = {
+--       one = "Du hast ein Pfeil.",
+--       other = "Du hast %{count} Pfeile.",
+--     },
+--     ["Hello %{name}!"] = "Hallo %{name}!",
+-- }
+-- @usage
+-- local myMsg = core.i18n('MyMod')
+-- print( myMsg('good_morning') )
+-- print( myMsg('you_have_arrows', {count=5}) )
+-- print( myMsg('Hello %{name}!', {name='World'}) )
+
 
 -------------------------------------------------------------------------------
 -- @type OBJECT_TYPE
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 57faaba11d..acd011f233 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -1123,3 +1123,7 @@ lua debug = false
 # If zero, Lua scripts are processed in the main thread.
 lua num threads = 1
 
+# List of the preferred languages separated by comma.
+# For example "de,en" means German as the first prority and English as a fallback.
+i18n preferred languages = en
+

From e4ee6ab0c167443927d0d7054b17ecf08f605e78 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Mon, 3 Jan 2022 11:53:07 +0000
Subject: [PATCH 1912/2859] Update extern/i18n.lua/CMakeLists.txt to be like
 the rest... (make i18n work on macOS)

---
 extern/i18n.lua/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extern/i18n.lua/CMakeLists.txt b/extern/i18n.lua/CMakeLists.txt
index aec4447470..1f7a71a2c2 100644
--- a/extern/i18n.lua/CMakeLists.txt
+++ b/extern/i18n.lua/CMakeLists.txt
@@ -1,5 +1,5 @@
 if (NOT DEFINED OPENMW_RESOURCES_ROOT)
-    message( FATAL_ERROR "OPENMW_RESOURCES_ROOT is not set" )
+    return()
 endif()
 
 # Copy resource files into the build directory

From 97ab7cf457bf7cf5054d468eed54ce883f01ef0b Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 3 Jan 2022 19:17:56 +0100
Subject: [PATCH 1913/2859] Fix demoralize and rally being swapped

---
 apps/openmw/mwmechanics/spelleffects.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp
index aef6b26f19..558a7ebea8 100644
--- a/apps/openmw/mwmechanics/spelleffects.cpp
+++ b/apps/openmw/mwmechanics/spelleffects.cpp
@@ -46,7 +46,7 @@ namespace
         {
             auto& creatureStats = target.getClass().getCreatureStats(target);
             auto stat = creatureStats.getAiSetting(setting);
-            stat.setModifier(static_cast<int>(stat.getModifier() - magnitude));
+            stat.setModifier(static_cast<int>(stat.getModifier() + magnitude));
             creatureStats.setAiSetting(setting, stat);
         }
     }
@@ -491,11 +491,11 @@ void applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, co
             break;
         case ESM::MagicEffect::FrenzyCreature:
         case ESM::MagicEffect::FrenzyHumanoid:
-            modifyAiSetting(target, effect, ESM::MagicEffect::FrenzyCreature, CreatureStats::AI_Fight, -effect.mMagnitude, invalid);
+            modifyAiSetting(target, effect, ESM::MagicEffect::FrenzyCreature, CreatureStats::AI_Fight, effect.mMagnitude, invalid);
             break;
         case ESM::MagicEffect::CalmCreature:
         case ESM::MagicEffect::CalmHumanoid:
-            modifyAiSetting(target, effect, ESM::MagicEffect::CalmCreature, CreatureStats::AI_Fight, effect.mMagnitude, invalid);
+            modifyAiSetting(target, effect, ESM::MagicEffect::CalmCreature, CreatureStats::AI_Fight, -effect.mMagnitude, invalid);
             if(!invalid && effect.mMagnitude > 0)
             {
                 auto& creatureStats = target.getClass().getCreatureStats(target);
@@ -998,11 +998,11 @@ void removeMagicEffect(const MWWorld::Ptr& target, ActiveSpells::ActiveSpellPara
             break;
         case ESM::MagicEffect::FrenzyCreature:
         case ESM::MagicEffect::FrenzyHumanoid:
-            modifyAiSetting(target, effect, ESM::MagicEffect::FrenzyCreature, CreatureStats::AI_Fight, effect.mMagnitude, invalid);
+            modifyAiSetting(target, effect, ESM::MagicEffect::FrenzyCreature, CreatureStats::AI_Fight, -effect.mMagnitude, invalid);
             break;
         case ESM::MagicEffect::CalmCreature:
         case ESM::MagicEffect::CalmHumanoid:
-            modifyAiSetting(target, effect, ESM::MagicEffect::CalmCreature, CreatureStats::AI_Fight, -effect.mMagnitude, invalid);
+            modifyAiSetting(target, effect, ESM::MagicEffect::CalmCreature, CreatureStats::AI_Fight, effect.mMagnitude, invalid);
             break;
         case ESM::MagicEffect::DemoralizeCreature:
         case ESM::MagicEffect::DemoralizeHumanoid:

From aab0473c2870e1fabe8cf6bf8e7372d54297b0b7 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 3 Jan 2022 21:05:14 +0100
Subject: [PATCH 1914/2859] Only prevent recasting by the actor who cast the
 spell

---
 apps/openmw/mwmechanics/spellpriority.cpp | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwmechanics/spellpriority.cpp b/apps/openmw/mwmechanics/spellpriority.cpp
index acc9fc2a3f..b79af49b05 100644
--- a/apps/openmw/mwmechanics/spellpriority.cpp
+++ b/apps/openmw/mwmechanics/spellpriority.cpp
@@ -75,6 +75,16 @@ namespace
         }
         return duration;
     }
+
+    bool isSpellActive(const MWWorld::Ptr& caster, const MWWorld::Ptr& target, const std::string& id)
+    {
+        int actorId = caster.getClass().getCreatureStats(caster).getActorId();
+        const auto& active = target.getClass().getCreatureStats(target).getActiveSpells();
+        return std::find_if(active.begin(), active.end(), [&](const auto& spell)
+        {
+            return spell.getCasterActorId() == actorId && Misc::StringUtils::ciEqual(spell.getId(), id);
+        }) != active.end();
+    }
 }
 
 namespace MWMechanics
@@ -105,8 +115,6 @@ namespace MWMechanics
 
     float rateSpell(const ESM::Spell *spell, const MWWorld::Ptr &actor, const MWWorld::Ptr& enemy)
     {
-        const CreatureStats& stats = actor.getClass().getCreatureStats(actor);
-
         float successChance = MWMechanics::getSpellSuccessChance(spell, actor);
         if (successChance == 0.f)
             return 0.f;
@@ -125,9 +133,9 @@ namespace MWMechanics
 
         // Spells don't stack, so early out if the spell is still active on the target
         int types = getRangeTypes(spell->mEffects);
-        if ((types & Self) && stats.getActiveSpells().isSpellActive(spell->mId))
+        if ((types & Self) && isSpellActive(actor, actor, spell->mId))
             return 0.f;
-        if ( ((types & Touch) || (types & Target)) && enemy.getClass().getCreatureStats(enemy).getActiveSpells().isSpellActive(spell->mId))
+        if ( ((types & Touch) || (types & Target)) && isSpellActive(actor, enemy, spell->mId))
             return 0.f;
 
         return rateEffects(spell->mEffects, actor, enemy) * (successChance / 100.f);

From 1816784784855e5defb66bd6cd41e3586c57ece6 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Tue, 4 Jan 2022 09:14:16 +0000
Subject: [PATCH 1915/2859] Update CI/before_script.osx.sh to allow full use of
 c++17 on macOS

---
 CI/before_script.osx.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh
index 6d0fe8c99e..8b2c9c6f01 100755
--- a/CI/before_script.osx.sh
+++ b/CI/before_script.osx.sh
@@ -16,7 +16,7 @@ cmake \
 -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_OSX_DEPLOYMENT_TARGET="10.15" \
 -D CMAKE_BUILD_TYPE=RELEASE \
 -D OPENMW_OSX_DEPLOYMENT=TRUE \
 -D OPENMW_USE_SYSTEM_SQLITE3=OFF \

From e743f896ef9dfc532d02f6cc7d652d434ac9d476 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Tue, 4 Jan 2022 10:48:25 +0000
Subject: [PATCH 1916/2859] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 06148d03d8..105057b860 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -74,7 +74,7 @@ Coverity:
   script:
     - CI/before_script.linux.sh
     # Remove the specific targets and build everything once we can do it under 3h
-    - cov-analysis-linux64-*/bin/cov-build --dir cov-int cmake --build build -- -j $(nproc) openmw esmtool bsatool niftest openmw-wizard openmw-launcher openmw-iniimporter openmw-essimporter
+    - cov-analysis-linux64-*/bin/cov-build --dir cov-int cmake --build build -- -j $(nproc) openmw esmtool bsatool niftest openmw-wizard openmw-launcher openmw-iniimporter openmw-essimporter openmw-navmeshtool openmw-cs
   after_script:
     - tar cfz cov-int.tar.gz cov-int
     - curl https://scan.coverity.com/builds?project=$COVERITY_SCAN_PROJECT_NAME

From bdfad27e05a05a8960edc6a61d0393bc85f2f2f8 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Tue, 4 Jan 2022 16:50:04 +0100
Subject: [PATCH 1917/2859] Remove constant conditions

---
 components/esm/creaturestats.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/components/esm/creaturestats.cpp b/components/esm/creaturestats.cpp
index ee4b0ad092..0f404ba58b 100644
--- a/components/esm/creaturestats.cpp
+++ b/components/esm/creaturestats.cpp
@@ -1,7 +1,6 @@
 #include "creaturestats.hpp"
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "savedgame.hpp"
 
 #include <limits>
 
@@ -183,9 +182,7 @@ void ESM::CreatureStats::save (ESMWriter &esm) const
     for (int i=0; i<3; ++i)
         mDynamic[i].save (esm);
 
-    if (ESM::SavedGame::sCurrentFormat <= 18 && mMissingACDT)
-        esm.writeHNT("GOLD", std::numeric_limits<int>::min());
-    else if(mGoldPool)
+    if (mGoldPool)
         esm.writeHNT("GOLD", mGoldPool);
 
     if (mTradeTime.mDay != 0 || mTradeTime.mHour != 0)
@@ -258,7 +255,7 @@ void ESM::CreatureStats::save (ESMWriter &esm) const
         for (int i=0; i<4; ++i)
             mAiSettings[i].save(esm);
     }
-    if(ESM::SavedGame::sCurrentFormat > 18 && mMissingACDT)
+    if (mMissingACDT)
         esm.writeHNT("NOAC", mMissingACDT);
 }
 

From 5a7a3a0d2d330af4665b49945a17178ebc8e644c Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Tue, 4 Jan 2022 17:11:55 +0100
Subject: [PATCH 1918/2859] Silence a signed/unsigned mismatch warning

---
 components/esm/defs.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/esm/defs.hpp b/components/esm/defs.hpp
index e793c6fea7..f87a67405b 100644
--- a/components/esm/defs.hpp
+++ b/components/esm/defs.hpp
@@ -96,7 +96,7 @@ struct FourCC
     static constexpr unsigned int value = (((((d << 8) | c) << 8) | b) << 8) | a;
 };
 
-enum RecNameInts
+enum RecNameInts : unsigned int
 {
     // format 0 / legacy
     REC_ACTI = FourCC<'A','C','T','I'>::value,

From 40faf5425017644d8c5457e5a89739bf507311f7 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Tue, 4 Jan 2022 19:32:49 +0000
Subject: [PATCH 1919/2859] Remove -bugprone-narrowing-conversions from
 clang-tidy

---
 CI/before_script.linux.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CI/before_script.linux.sh b/CI/before_script.linux.sh
index 19d8338721..8278ffcd0e 100755
--- a/CI/before_script.linux.sh
+++ b/CI/before_script.linux.sh
@@ -46,7 +46,7 @@ fi
 
 if [[ $CI_CLANG_TIDY ]]; then
 	CMAKE_CONF_OPTS+=(
-	      -DCMAKE_CXX_CLANG_TIDY='clang-tidy;-checks=-*,boost-*,clang-analyzer-*,concurrency-*,performance-*,-header-filter=.*,bugprone-*,misc-definitions-in-headers,misc-misplaced-const,misc-redundant-expression'
+	      -DCMAKE_CXX_CLANG_TIDY='clang-tidy;-checks=-*,boost-*,clang-analyzer-*,concurrency-*,performance-*,-header-filter=.*,bugprone-*,misc-definitions-in-headers,misc-misplaced-const,misc-redundant-expression,-bugprone-narrowing-conversions'
 	)
 fi
 

From 421e6629ad98f282dff032d82ad6cf682e26eba4 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Tue, 4 Jan 2022 20:42:09 +0100
Subject: [PATCH 1920/2859] Fix unnecessary-copy-initialization

> warning: the variable 'key' is copy-constructed from a const reference but is
only used as const reference; consider making it a const reference
[performance-unnecessary-copy-initialization]

Found by clang-tidy.
---
 apps/openmw/mwgui/tooltips.cpp                | 4 ++--
 apps/openmw/mwmechanics/magiceffects.cpp      | 2 +-
 apps/wizard/inisettings.cpp                   | 2 +-
 components/detournavigator/navigatorutils.cpp | 4 ++--
 components/esm/esmreader.cpp                  | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwgui/tooltips.cpp b/apps/openmw/mwgui/tooltips.cpp
index 0a2fd4c448..3a2bd65361 100644
--- a/apps/openmw/mwgui/tooltips.cpp
+++ b/apps/openmw/mwgui/tooltips.cpp
@@ -650,7 +650,7 @@ namespace MWGui
 
     std::string ToolTips::getSoulString(const MWWorld::CellRef& cellref)
     {
-        std::string soul = cellref.getSoul();
+        const std::string& soul = cellref.getSoul();
         if (soul.empty())
             return std::string();
         const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
@@ -666,7 +666,7 @@ namespace MWGui
     {
         std::string ret;
         ret += getMiscString(cellref.getOwner(), "Owner");
-        const std::string factionId = cellref.getFaction();
+        const std::string& factionId = cellref.getFaction();
         if (!factionId.empty())
         {
             const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
diff --git a/apps/openmw/mwmechanics/magiceffects.cpp b/apps/openmw/mwmechanics/magiceffects.cpp
index 7a1acb1003..39d340e6ba 100644
--- a/apps/openmw/mwmechanics/magiceffects.cpp
+++ b/apps/openmw/mwmechanics/magiceffects.cpp
@@ -137,7 +137,7 @@ namespace MWMechanics
     {
         if (this==&effects)
         {
-            MagicEffects temp (effects);
+            const MagicEffects& temp (effects);
             *this += temp;
             return *this;
         }
diff --git a/apps/wizard/inisettings.cpp b/apps/wizard/inisettings.cpp
index e9cec12f5f..198d1df6e7 100644
--- a/apps/wizard/inisettings.cpp
+++ b/apps/wizard/inisettings.cpp
@@ -122,7 +122,7 @@ bool Wizard::IniSettings::writeFile(const QString &path, QTextStream &stream)
         QString section(fullKey.at(0));
         section.prepend(QLatin1Char('['));
         section.append(QLatin1Char(']'));
-        QString key(fullKey.at(1));
+        const QString& key(fullKey.at(1));
 
         int index = buffer.lastIndexOf(section);
         if (index == -1) {
diff --git a/components/detournavigator/navigatorutils.cpp b/components/detournavigator/navigatorutils.cpp
index bc94e3f991..bfb0946b9e 100644
--- a/components/detournavigator/navigatorutils.cpp
+++ b/components/detournavigator/navigatorutils.cpp
@@ -11,7 +11,7 @@ namespace DetourNavigator
         const auto navMesh = navigator.getNavMesh(agentHalfExtents);
         if (!navMesh)
             return std::nullopt;
-        const auto settings = navigator.getSettings();
+        const auto& settings = navigator.getSettings();
         const auto result = DetourNavigator::findRandomPointAroundCircle(navMesh->lockConst()->getImpl(),
             toNavMeshCoordinates(settings.mRecast, agentHalfExtents), toNavMeshCoordinates(settings.mRecast, start),
             toNavMeshCoordinates(settings.mRecast, maxRadius), includeFlags, settings.mDetour);
@@ -26,7 +26,7 @@ namespace DetourNavigator
         const auto navMesh = navigator.getNavMesh(agentHalfExtents);
         if (navMesh == nullptr)
             return std::nullopt;
-        const auto settings = navigator.getSettings();
+        const auto& settings = navigator.getSettings();
         const auto result = DetourNavigator::raycast(navMesh->lockConst()->getImpl(),
             toNavMeshCoordinates(settings.mRecast, agentHalfExtents), toNavMeshCoordinates(settings.mRecast, start),
             toNavMeshCoordinates(settings.mRecast, end), includeFlags, settings.mDetour);
diff --git a/components/esm/esmreader.cpp b/components/esm/esmreader.cpp
index c84a1798ff..416e8a9be2 100644
--- a/components/esm/esmreader.cpp
+++ b/components/esm/esmreader.cpp
@@ -70,7 +70,7 @@ void ESMReader::resolveParentFileIndices(const std::vector<ESMReader>& allPlugin
             const ESMReader& reader = allPlugins.at(i);
             if (reader.getFileSize() == 0)
                 continue;  // Content file in non-ESM format
-            const std::string candidate = reader.getName();
+            const std::string& candidate = reader.getName();
             std::string fnamecandidate = boost::filesystem::path(candidate).filename().string();
             if (Misc::StringUtils::ciEqual(fname, fnamecandidate)) {
                 index = i;

From 2c5269536131d5134d825e0cfc77081a510fe83d Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Tue, 4 Jan 2022 12:23:37 -0800
Subject: [PATCH 1921/2859] fix regression where LEQUAL was used instead of
 LESS for depth function

---
 apps/openmw/mwrender/skyutil.cpp | 2 +-
 components/terrain/material.cpp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwrender/skyutil.cpp b/apps/openmw/mwrender/skyutil.cpp
index c0b6f81358..ead9d9af70 100644
--- a/apps/openmw/mwrender/skyutil.cpp
+++ b/apps/openmw/mwrender/skyutil.cpp
@@ -816,7 +816,7 @@ namespace MWRender
         osg::StateSet* queryStateSet = new osg::StateSet;
         if (queryVisible)
         {
-            osg::ref_ptr<osg::Depth> depth = new SceneUtil::AutoDepth;
+            osg::ref_ptr<osg::Depth> depth = new SceneUtil::AutoDepth(osg::Depth::LEQUAL);
             // This is a trick to make fragments written by the query always use the maximum depth value,
             // without having to retrieve the current far clipping distance.
             // We want the sun glare to be "infinitely" far away.
diff --git a/components/terrain/material.cpp b/components/terrain/material.cpp
index ae432d262e..6ae1a970d3 100644
--- a/components/terrain/material.cpp
+++ b/components/terrain/material.cpp
@@ -106,7 +106,7 @@ namespace
         osg::ref_ptr<osg::Depth> mValue;
 
         LequalDepth()
-            : mValue(new SceneUtil::AutoDepth)
+            : mValue(new SceneUtil::AutoDepth(osg::Depth::LEQUAL))
         {
         }
     };

From 27af7767352ede07f33f5e7e74aae8f9a2a64d3a Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Tue, 4 Jan 2022 22:01:52 +0000
Subject: [PATCH 1922/2859] Fix unnecessary float-to-double promotion

---
 apps/openmw/mwmechanics/creaturestats.cpp | 2 +-
 apps/openmw/mwmechanics/trading.cpp       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index c99f87e833..570547e0d9 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -44,7 +44,7 @@ namespace MWMechanics
         float max = getFatigue().getModified();
         float current = getFatigue().getCurrent();
 
-        float normalised = floor(max) == 0 ? 1 : std::max (0.0f, current / max);
+        float normalised = std::floor(max) == 0 ? 1 : std::max (0.0f, current / max);
 
         const MWWorld::Store<ESM::GameSetting> &gmst =
             MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
diff --git a/apps/openmw/mwmechanics/trading.cpp b/apps/openmw/mwmechanics/trading.cpp
index 750fd803d4..d9ec66bab2 100644
--- a/apps/openmw/mwmechanics/trading.cpp
+++ b/apps/openmw/mwmechanics/trading.cpp
@@ -71,10 +71,10 @@ namespace MWMechanics
         int initialMerchantOffer = std::abs(merchantOffer);
 
         if ( !buying && (finalPrice > initialMerchantOffer) ) {
-            skillGain = floor(100.f * (finalPrice - initialMerchantOffer) / finalPrice);
+            skillGain = std::floor(100.f * (finalPrice - initialMerchantOffer) / finalPrice);
         }
         else if ( buying && (finalPrice < initialMerchantOffer) ) {
-            skillGain = floor(100.f * (initialMerchantOffer - finalPrice) / initialMerchantOffer);
+            skillGain = std::floor(100.f * (initialMerchantOffer - finalPrice) / initialMerchantOffer);
         }
         player.getClass().skillUsageSucceeded(player, ESM::Skill::Mercantile, 0, skillGain);
 

From 909aa43ba12b1d06cf822783215ac84ee6a3730d Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Tue, 4 Jan 2022 14:10:39 -0800
Subject: [PATCH 1923/2859] update sky particle node correctly

---
 apps/openmw/mwrender/sky.cpp | 7 ++++---
 apps/openmw/mwrender/sky.hpp | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index c0a071c062..7b124b018c 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -248,6 +248,7 @@ namespace MWRender
         , mEnabled(true)
         , mSunEnabled(true)
         , mPrecipitationAlpha(0.f)
+        , mDirtyParticlesEffect(false)
     {
         osg::ref_ptr<CameraRelativeTransform> skyroot = new CameraRelativeTransform;
         skyroot->setName("Sky Root");
@@ -537,8 +538,7 @@ namespace MWRender
         if (!enabled && mParticleNode && mParticleEffect)
         {
             mCurrentParticleEffect.clear();
-            mParticleNode->removeChild(mParticleEffect);
-            mParticleEffect = nullptr;
+            mDirtyParticlesEffect = true;
         }
 
         mEnabled = enabled;
@@ -610,8 +610,9 @@ namespace MWRender
         if (mIsStorm)
             mStormDirection = weather.mStormDirection;
 
-        if (mCurrentParticleEffect != weather.mParticleEffect)
+        if (mDirtyParticlesEffect || (mCurrentParticleEffect != weather.mParticleEffect))
         {
+            mDirtyParticlesEffect = false;
             mCurrentParticleEffect = weather.mParticleEffect;
 
             // cleanup old particles
diff --git a/apps/openmw/mwrender/sky.hpp b/apps/openmw/mwrender/sky.hpp
index 1a30633886..e2ceae45f4 100644
--- a/apps/openmw/mwrender/sky.hpp
+++ b/apps/openmw/mwrender/sky.hpp
@@ -186,6 +186,7 @@ namespace MWRender
         bool mSunEnabled;
 
         float mPrecipitationAlpha;
+        bool mDirtyParticlesEffect;
 
         osg::Vec4f mMoonScriptColor;
     };

From 4eea734551ff83588a1b756c51b6f6e9f19d52cc Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 29 Dec 2021 13:01:51 +0100
Subject: [PATCH 1924/2859] Resolves #6088 by rolling our own PacketList that
 replaces the deprecated AVPacketList; initial work done by akortunov in
 https://github.com/akortunov/openmw/commit/60aec0460604b32c5e84ecb0cff922d5f6db9855;
 adapted and cleaned up some old cruft along the way.

---
 extern/osg-ffmpeg-videoplayer/videostate.cpp | 82 ++++++++++----------
 extern/osg-ffmpeg-videoplayer/videostate.hpp | 14 +++-
 2 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/extern/osg-ffmpeg-videoplayer/videostate.cpp b/extern/osg-ffmpeg-videoplayer/videostate.cpp
index 7fcad33697..8b7e8b0771 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.cpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.cpp
@@ -4,10 +4,12 @@
 #include <cassert>
 #include <cstddef>
 #include <iostream>
+#include <memory>
 #include <thread>
 #include <chrono>
 
 #include <osg/Texture2D>
+#include <utility>
 
 #if defined(_MSC_VER)
     #pragma warning (push)
@@ -62,20 +64,20 @@ namespace
             av_frame_free(&frame);
         }
     };
-
-    template<class T>
-    struct AVFree
-    {
-        void operator()(T* frame) const
-        {
-            av_free(&frame);
-        }
-    };
 }
 
 namespace Video
 {
 
+struct PacketListFree
+{
+    void operator()(Video::PacketList* list) const
+    {
+        av_packet_free(&list->pkt);
+        av_free(&list);
+    }
+};
+
 VideoState::VideoState()
     : mAudioFactory(nullptr)
     , format_ctx(nullptr)
@@ -114,25 +116,29 @@ void VideoState::setAudioFactory(MovieAudioFactory *factory)
 
 void PacketQueue::put(AVPacket *pkt)
 {
-    std::unique_ptr<AVPacketList, AVFree<AVPacketList>> pkt1(static_cast<AVPacketList*>(av_malloc(sizeof(AVPacketList))));
+    std::unique_ptr<PacketList, PacketListFree> pkt1(static_cast<PacketList*>(av_malloc(sizeof(PacketList))));
     if(!pkt1) throw std::bad_alloc();
 
+
     if(pkt == &flush_pkt)
-        pkt1->pkt = *pkt;
+        pkt1->pkt = pkt;
     else
-        av_packet_move_ref(&pkt1->pkt, pkt);
+    {
+        pkt1->pkt = av_packet_alloc();
+        av_packet_move_ref(pkt1->pkt, pkt);
+    }
 
     pkt1->next = nullptr;
 
     std::lock_guard<std::mutex> lock(this->mutex);
-    AVPacketList* ptr = pkt1.release();
+    PacketList* ptr = pkt1.release();
     if(!last_pkt)
         this->first_pkt = ptr;
     else
         this->last_pkt->next = ptr;
     this->last_pkt = ptr;
     this->nb_packets++;
-    this->size += ptr->pkt.size;
+    this->size += ptr->pkt->size;
     this->cond.notify_one();
 }
 
@@ -141,17 +147,17 @@ int PacketQueue::get(AVPacket *pkt, VideoState *is)
     std::unique_lock<std::mutex> lock(this->mutex);
     while(!is->mQuit)
     {
-        AVPacketList *pkt1 = this->first_pkt;
+        PacketList *pkt1 = this->first_pkt;
         if(pkt1)
         {
             this->first_pkt = pkt1->next;
             if(!this->first_pkt)
                 this->last_pkt = nullptr;
             this->nb_packets--;
-            this->size -= pkt1->pkt.size;
+            this->size -= pkt1->pkt->size;
 
             av_packet_unref(pkt);
-            av_packet_move_ref(pkt, &pkt1->pkt);
+            av_packet_move_ref(pkt, pkt1->pkt);
             av_free(pkt1);
 
             return 1;
@@ -173,14 +179,14 @@ void PacketQueue::flush()
 
 void PacketQueue::clear()
 {
-    AVPacketList *pkt, *pkt1;
+    PacketList *pkt, *pkt1;
 
     std::lock_guard<std::mutex> lock(this->mutex);
     for(pkt = this->first_pkt; pkt != nullptr; pkt = pkt1)
     {
         pkt1 = pkt->next;
-        if (pkt->pkt.data != flush_pkt.data)
-            av_packet_unref(&pkt->pkt);
+        if (pkt->pkt->data != flush_pkt.data)
+            av_packet_unref(pkt->pkt);
         av_freep(&pkt);
     }
     this->last_pkt = nullptr;
@@ -415,7 +421,7 @@ double VideoState::synchronize_video(const AVFrame &src_frame, double pts)
 class VideoThread
 {
 public:
-    VideoThread(VideoState* self)
+    explicit VideoThread(VideoState* self)
         : mVideoState(self)
         , mThread([this]
         {
@@ -439,9 +445,8 @@ public:
     void run()
     {
         VideoState* self = mVideoState;
-        AVPacket packetData;
-        av_init_packet(&packetData);
-        std::unique_ptr<AVPacket, AVPacketUnref> packet(&packetData);
+        AVPacket* packetData = av_packet_alloc();
+        std::unique_ptr<AVPacket, AVPacketUnref> packet(packetData);
         std::unique_ptr<AVFrame, AVFrameFree> pFrame{av_frame_alloc()};
 
         while(self->videoq.get(packet.get(), self) >= 0)
@@ -491,7 +496,7 @@ private:
 class ParseThread
 {
 public:
-    ParseThread(VideoState* self)
+    explicit ParseThread(VideoState* self)
         : mVideoState(self)
         , mThread([this] { run(); })
     {
@@ -507,9 +512,8 @@ public:
         VideoState* self = mVideoState;
 
         AVFormatContext *pFormatCtx = self->format_ctx;
-        AVPacket packetData;
-        av_init_packet(&packetData);
-        std::unique_ptr<AVPacket, AVPacketUnref> packet(&packetData);
+        AVPacket* packetData = av_packet_alloc();
+        std::unique_ptr<AVPacket, AVPacketUnref> packet(packetData);
 
         try
         {
@@ -632,13 +636,11 @@ bool VideoState::update()
 
 int VideoState::stream_open(int stream_index, AVFormatContext *pFormatCtx)
 {
-    const AVCodec *codec;
-
     if(stream_index < 0 || stream_index >= static_cast<int>(pFormatCtx->nb_streams))
         return -1;
 
     // Get a pointer to the codec context for the video stream
-    codec = avcodec_find_decoder(pFormatCtx->streams[stream_index]->codecpar->codec_id);
+    const AVCodec *codec = avcodec_find_decoder(pFormatCtx->streams[stream_index]->codecpar->codec_id);
     if(!codec)
     {
         fprintf(stderr, "Unsupported codec!\n");
@@ -702,7 +704,7 @@ int VideoState::stream_open(int stream_index, AVFormatContext *pFormatCtx)
             return -1;
         }
 
-        this->video_thread.reset(new VideoThread(this));
+        this->video_thread = std::make_unique<VideoThread>(this);
         break;
 
     default:
@@ -721,7 +723,7 @@ void VideoState::init(std::shared_ptr<std::istream> inputstream, const std::stri
     this->av_sync_type = AV_SYNC_DEFAULT;
     this->mQuit = false;
 
-    this->stream = inputstream;
+    this->stream = std::move(inputstream);
     if(!this->stream.get())
         throw std::runtime_error("Failed to open video resource");
 
@@ -789,7 +791,7 @@ void VideoState::init(std::shared_ptr<std::istream> inputstream, const std::stri
     }
 
 
-    this->parse_thread.reset(new ParseThread(this));
+    this->parse_thread = std::make_unique<ParseThread>(this);
 }
 
 void VideoState::deinit()
@@ -801,11 +803,11 @@ void VideoState::deinit()
 
     mAudioDecoder.reset();
 
-    if (this->parse_thread.get())
+    if (this->parse_thread)
     {
         this->parse_thread.reset();
     }
-    if (this->video_thread.get())
+    if (this->video_thread)
     {
         this->video_thread.reset();
     }
@@ -851,8 +853,8 @@ void VideoState::deinit()
     }
 
     // Dellocate RGBA frame queue.
-    for (std::size_t i = 0; i < VIDEO_PICTURE_ARRAY_SIZE; ++i)
-        this->pictq[i].rgbaFrame = nullptr;
+    for (auto & i : this->pictq)
+        i.rgbaFrame = nullptr;
 
 }
 
@@ -870,7 +872,7 @@ double VideoState::get_master_clock()
     return this->get_external_clock();
 }
 
-double VideoState::get_video_clock()
+double VideoState::get_video_clock() const
 {
     return this->frame_last_pts;
 }
@@ -896,7 +898,7 @@ void VideoState::seekTo(double time)
     mSeekRequested = true;
 }
 
-double VideoState::getDuration()
+double VideoState::getDuration() const
 {
     return this->format_ctx->duration / 1000000.0;
 }
diff --git a/extern/osg-ffmpeg-videoplayer/videostate.hpp b/extern/osg-ffmpeg-videoplayer/videostate.hpp
index 32a772f299..654cd1a814 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.hpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.hpp
@@ -46,7 +46,6 @@ extern "C"
 extern "C"
 {
     struct SwsContext;
-    struct AVPacketList;
     struct AVPacket;
     struct AVFormatContext;
     struct AVStream;
@@ -78,6 +77,13 @@ struct ExternalClock
     void set(uint64_t time);
 };
 
+class PacketList
+{
+public:
+    AVPacket* pkt = nullptr;
+    PacketList *next = nullptr;
+};
+
 struct PacketQueue {
     PacketQueue()
       : first_pkt(nullptr), last_pkt(nullptr), flushing(false), nb_packets(0), size(0)
@@ -85,7 +91,7 @@ struct PacketQueue {
     ~PacketQueue()
     { clear(); }
 
-    AVPacketList *first_pkt, *last_pkt;
+    PacketList *first_pkt, *last_pkt;
     std::atomic<bool> flushing;
     std::atomic<int> nb_packets;
     std::atomic<int> size;
@@ -129,7 +135,7 @@ struct VideoState {
     void setPaused(bool isPaused);
     void seekTo(double time);
 
-    double getDuration();
+    double getDuration() const;
 
     int stream_open(int stream_index, AVFormatContext *pFormatCtx);
 
@@ -145,7 +151,7 @@ struct VideoState {
     double synchronize_video(const AVFrame &src_frame, double pts);
 
     double get_audio_clock();
-    double get_video_clock();
+    double get_video_clock() const;
     double get_external_clock();
     double get_master_clock();
 

From bae87139982f06af966f817125f6a88ab3f7a601 Mon Sep 17 00:00:00 2001
From: Bret Curtis <bret.curtis@gmail.com>
Date: Wed, 5 Jan 2022 09:26:02 +0100
Subject: [PATCH 1925/2859] make use of std::array `pictq.size()` instead of
 VIDEO_PICTURE_ARRAY_SIZE; remove redundant smart-pointer .get calls; fix
 typos

---
 extern/osg-ffmpeg-videoplayer/videostate.cpp | 22 ++++++++++----------
 extern/osg-ffmpeg-videoplayer/videostate.hpp |  7 +++----
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/extern/osg-ffmpeg-videoplayer/videostate.cpp b/extern/osg-ffmpeg-videoplayer/videostate.cpp
index 8b7e8b0771..0f3a48faa5 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.cpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.cpp
@@ -97,7 +97,7 @@ VideoState::VideoState()
 {
     mFlushPktData = flush_pkt.data;
 
-// This is not needed anymore above FFMpeg version 4.0
+// This is not needed any more above FFMpeg version 4.0
 #if LIBAVCODEC_VERSION_INT < 3805796
     av_register_all();
 #endif
@@ -310,7 +310,7 @@ void VideoState::video_refresh()
         VideoPicture* vp = &this->pictq[this->pictq_rindex];
         this->video_display(vp);
 
-        this->pictq_rindex = (pictq_rindex+1) % VIDEO_PICTURE_ARRAY_SIZE;
+        this->pictq_rindex = (pictq_rindex+1) % pictq.size();
         this->frame_last_pts = vp->pts;
         this->pictq_size--;
         this->pictq_cond.notify_one();
@@ -327,12 +327,12 @@ void VideoState::video_refresh()
         for (; i<this->pictq_size-1; ++i)
         {
             if (this->pictq[pictq_rindex].pts + threshold <= this->get_master_clock())
-                this->pictq_rindex = (this->pictq_rindex+1) % VIDEO_PICTURE_ARRAY_SIZE; // not enough time to show this picture
+                this->pictq_rindex = (this->pictq_rindex+1) % pictq.size(); // not enough time to show this picture
             else
                 break;
         }
 
-        assert (this->pictq_rindex < VIDEO_PICTURE_ARRAY_SIZE);
+        assert (this->pictq_rindex < pictq.size());
         VideoPicture* vp = &this->pictq[this->pictq_rindex];
 
         this->video_display(vp);
@@ -342,7 +342,7 @@ void VideoState::video_refresh()
         this->pictq_size -= i;
         // update queue for next picture
         this->pictq_size--;
-        this->pictq_rindex = (this->pictq_rindex+1) % VIDEO_PICTURE_ARRAY_SIZE;
+        this->pictq_rindex = (this->pictq_rindex+1) % pictq.size();
         this->pictq_cond.notify_one();
     }
 }
@@ -392,7 +392,7 @@ int VideoState::queue_picture(const AVFrame &pFrame, double pts)
               0, this->video_ctx->height, vp->rgbaFrame->data, vp->rgbaFrame->linesize);
 
     // now we inform our display thread that we have a pic ready
-    this->pictq_windex = (this->pictq_windex+1) % VIDEO_PICTURE_ARRAY_SIZE;
+    this->pictq_windex = (this->pictq_windex+1) % pictq.size();
     this->pictq_size++;
 
     return 0;
@@ -656,7 +656,7 @@ int VideoState::stream_open(int stream_index, AVFormatContext *pFormatCtx)
         this->audio_ctx = avcodec_alloc_context3(codec);
         avcodec_parameters_to_context(this->audio_ctx, pFormatCtx->streams[stream_index]->codecpar);
 
-// This is not needed anymore above FFMpeg version 4.0
+// This is not needed any more above FFMpeg version 4.0
 #if LIBAVCODEC_VERSION_INT < 3805796
         av_codec_set_pkt_timebase(this->audio_ctx, pFormatCtx->streams[stream_index]->time_base);
 #endif
@@ -693,7 +693,7 @@ int VideoState::stream_open(int stream_index, AVFormatContext *pFormatCtx)
         this->video_ctx = avcodec_alloc_context3(codec);
         avcodec_parameters_to_context(this->video_ctx, pFormatCtx->streams[stream_index]->codecpar);
 
-// This is not needed anymore above FFMpeg version 4.0
+// This is not needed any more above FFMpeg version 4.0
 #if LIBAVCODEC_VERSION_INT < 3805796
         av_codec_set_pkt_timebase(this->video_ctx, pFormatCtx->streams[stream_index]->time_base);
 #endif
@@ -724,7 +724,7 @@ void VideoState::init(std::shared_ptr<std::istream> inputstream, const std::stri
     this->mQuit = false;
 
     this->stream = std::move(inputstream);
-    if(!this->stream.get())
+    if(!this->stream)
         throw std::runtime_error("Failed to open video resource");
 
     AVIOContext *ioCtx = avio_alloc_context(nullptr, 0, 0, this, istream_read, istream_write, istream_seek);
@@ -852,7 +852,7 @@ void VideoState::deinit()
         mTexture = nullptr;
     }
 
-    // Dellocate RGBA frame queue.
+    // Deallocate RGBA frame queue.
     for (auto & i : this->pictq)
         i.rgbaFrame = nullptr;
 
@@ -879,7 +879,7 @@ double VideoState::get_video_clock() const
 
 double VideoState::get_audio_clock()
 {
-    if (!mAudioDecoder.get())
+    if (!mAudioDecoder)
         return 0.0;
     return mAudioDecoder->getAudioClock();
 }
diff --git a/extern/osg-ffmpeg-videoplayer/videostate.hpp b/extern/osg-ffmpeg-videoplayer/videostate.hpp
index 654cd1a814..a53acd4183 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.hpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.hpp
@@ -1,8 +1,9 @@
 #ifndef VIDEOPLAYER_VIDEOSTATE_H
 #define VIDEOPLAYER_VIDEOSTATE_H
 
-#include <stdint.h>
+#include <cstdint>
 #include <atomic>
+#include <array>
 #include <vector>
 #include <memory>
 #include <string>
@@ -40,8 +41,6 @@ extern "C"
 #include "videodefs.hpp"
 
 #define VIDEO_PICTURE_QUEUE_SIZE 50
-// allocate one extra to make sure we do not overwrite the osg::Image currently set on the texture
-#define VIDEO_PICTURE_ARRAY_SIZE (VIDEO_PICTURE_QUEUE_SIZE+1)
 
 extern "C"
 {
@@ -184,7 +183,7 @@ struct VideoState {
     PacketQueue videoq;
     SwsContext*  sws_context;
     int sws_context_w, sws_context_h;
-    VideoPicture pictq[VIDEO_PICTURE_ARRAY_SIZE];
+    std::array<VideoPicture, VIDEO_PICTURE_QUEUE_SIZE+1> pictq;  // allocate one extra to make sure we do not overwrite the osg::Image currently set on the texture
     int          pictq_size, pictq_rindex, pictq_windex;
     std::mutex pictq_mutex;
     std::condition_variable pictq_cond;

From a7166aa05ca9b81588a01a37d785c8762da09cb7 Mon Sep 17 00:00:00 2001
From: Cody Glassman <glassmancody.info@gmail.com>
Date: Wed, 5 Jan 2022 10:43:30 +0000
Subject: [PATCH 1926/2859] Use updated resolutions when setting projection
 matrix

---
 apps/openmw/mwrender/renderingmanager.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 73ee40435e..5ebd95ee44 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -1138,7 +1138,10 @@ namespace MWRender
 
     void RenderingManager::updateProjectionMatrix()
     {
-        double aspect = mViewer->getCamera()->getViewport()->aspectRatio();
+        double width = Settings::Manager::getInt("resolution x", "Video");
+        double height = Settings::Manager::getInt("resolution y", "Video");
+
+        double aspect = (height == 0.0) ? 1.0 : width / height;
         float fov = mFieldOfView;
         if (mFieldOfViewOverridden)
             fov = mFieldOfViewOverride;
@@ -1155,7 +1158,7 @@ namespace MWRender
 
         mSharedUniformStateUpdater->setNear(mNearClip);
         mSharedUniformStateUpdater->setFar(mViewDistance);
-        mSharedUniformStateUpdater->setScreenRes(mViewer->getCamera()->getViewport()->width(), mViewer->getCamera()->getViewport()->height()); 
+        mSharedUniformStateUpdater->setScreenRes(width, height);
 
         // Since our fog is not radial yet, we should take FOV in account, otherwise terrain near viewing distance may disappear.
         // Limit FOV here just for sure, otherwise viewing distance can be too high.

From 1a6be081499dd6006c5aa8cb4dc18ec36ed32772 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Wed, 5 Jan 2022 10:44:44 +0000
Subject: [PATCH 1927/2859] Fix "warning: loop variable is copied but only used
 as const reference;...

---
 components/resource/scenemanager.cpp       | 4 ++--
 components/sceneutil/mwshadowtechnique.cpp | 2 +-
 components/sceneutil/osgacontroller.cpp    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 4f0658e033..41f65ba0ab 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -273,7 +273,7 @@ namespace Resource
                correct format for OpenMW: <Description>alphatest mode value MaterialName</Description>
                                       e.g <Description>alphatest GEQUAL 0.8 MyAlphaTestedMaterial</Description> */
             std::vector<std::string> descriptions = node.getDescriptions();
-            for (auto description : descriptions)
+            for (const auto & description : descriptions)
             {
                 mDescriptions.emplace_back(description);
             }
@@ -281,7 +281,7 @@ namespace Resource
             // Iterate each description, and see if the current node uses the specified material for alpha testing
             if (node.getStateSet())
             {
-                for (auto description : mDescriptions)
+                for (const auto & description : mDescriptions)
                 {
                     std::vector<std::string> descriptionParts;
                     std::istringstream descriptionStringStream(description);
diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
index daf6bb80ab..d56708e46c 100644
--- a/components/sceneutil/mwshadowtechnique.cpp
+++ b/components/sceneutil/mwshadowtechnique.cpp
@@ -1404,7 +1404,7 @@ void MWShadowTechnique::cull(osgUtil::CullVisitor& cv)
                     std::string validRegionUniformName = "validRegionMatrix" + std::to_string(sm_i);
                     osg::ref_ptr<osg::Uniform> validRegionUniform;
 
-                    for (auto uniform : _uniforms[cv.getTraversalNumber() % 2])
+                    for (const auto & uniform : _uniforms[cv.getTraversalNumber() % 2])
                     {
                         if (uniform->getName() == validRegionUniformName)
                             validRegionUniform = uniform;
diff --git a/components/sceneutil/osgacontroller.cpp b/components/sceneutil/osgacontroller.cpp
index 520b2d177b..4d0f7a460a 100644
--- a/components/sceneutil/osgacontroller.cpp
+++ b/components/sceneutil/osgacontroller.cpp
@@ -33,7 +33,7 @@ namespace SceneUtil
             if (channelTargetName != umt->getName()) continue;
 
             // check if we can link a StackedTransformElement to the current Channel
-            for (auto stackedTransform : umt->getStackedTransforms())
+            for (const auto & stackedTransform : umt->getStackedTransforms())
             {
                 osgAnimation::StackedTransformElement* element = stackedTransform.get();
                 if (element && !element->getName().empty() && channelName == element->getName())

From f0db57661190b8bc94ad9fc337f5d4e25869c340 Mon Sep 17 00:00:00 2001
From: Bret Curtis <bret.curtis@gmail.com>
Date: Wed, 5 Jan 2022 12:19:22 +0100
Subject: [PATCH 1928/2859] removed redundant get on smart pointer; made
 pictq_[r|w]index unsigned longs to be type compatible with std::array
 pictq.size(); fixes assert issue

---
 extern/osg-ffmpeg-videoplayer/videostate.cpp | 2 +-
 extern/osg-ffmpeg-videoplayer/videostate.hpp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/extern/osg-ffmpeg-videoplayer/videostate.cpp b/extern/osg-ffmpeg-videoplayer/videostate.cpp
index 0f3a48faa5..ff1d9c6517 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.cpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.cpp
@@ -676,7 +676,7 @@ int VideoState::stream_open(int stream_index, AVFormatContext *pFormatCtx)
         }
 
         mAudioDecoder = mAudioFactory->createDecoder(this);
-        if (!mAudioDecoder.get())
+        if (!mAudioDecoder)
         {
             std::cerr << "Failed to create audio decoder, can not play audio stream" << std::endl;
             avcodec_free_context(&this->audio_ctx);
diff --git a/extern/osg-ffmpeg-videoplayer/videostate.hpp b/extern/osg-ffmpeg-videoplayer/videostate.hpp
index a53acd4183..d1592bd910 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.hpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.hpp
@@ -184,7 +184,8 @@ struct VideoState {
     SwsContext*  sws_context;
     int sws_context_w, sws_context_h;
     std::array<VideoPicture, VIDEO_PICTURE_QUEUE_SIZE+1> pictq;  // allocate one extra to make sure we do not overwrite the osg::Image currently set on the texture
-    int          pictq_size, pictq_rindex, pictq_windex;
+    int pictq_size;
+    unsigned long pictq_rindex, pictq_windex;
     std::mutex pictq_mutex;
     std::condition_variable pictq_cond;
 

From cd6edb961a064249f3ac3fab27bbbde8cb4e4121 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 5 Jan 2022 17:22:22 +0100
Subject: [PATCH 1929/2859] Remove dead code

---
 apps/openmw/mwmechanics/magiceffects.cpp | 22 ----------------------
 apps/openmw/mwmechanics/magiceffects.hpp |  2 --
 2 files changed, 24 deletions(-)

diff --git a/apps/openmw/mwmechanics/magiceffects.cpp b/apps/openmw/mwmechanics/magiceffects.cpp
index 39d340e6ba..e9e0be397e 100644
--- a/apps/openmw/mwmechanics/magiceffects.cpp
+++ b/apps/openmw/mwmechanics/magiceffects.cpp
@@ -133,28 +133,6 @@ namespace MWMechanics
         }
     }
 
-    MagicEffects& MagicEffects::operator+= (const MagicEffects& effects)
-    {
-        if (this==&effects)
-        {
-            const MagicEffects& temp (effects);
-            *this += temp;
-            return *this;
-        }
-
-        for (Collection::const_iterator iter (effects.begin()); iter!=effects.end(); ++iter)
-        {
-            Collection::iterator result = mCollection.find (iter->first);
-
-            if (result!=mCollection.end())
-                result->second += iter->second;
-            else
-                mCollection.insert (*iter);
-        }
-
-        return *this;
-    }
-
     EffectParam MagicEffects::get (const EffectKey& key) const
     {
         Collection::const_iterator iter = mCollection.find (key);
diff --git a/apps/openmw/mwmechanics/magiceffects.hpp b/apps/openmw/mwmechanics/magiceffects.hpp
index 50f4dab050..e8175f6a78 100644
--- a/apps/openmw/mwmechanics/magiceffects.hpp
+++ b/apps/openmw/mwmechanics/magiceffects.hpp
@@ -97,8 +97,6 @@ namespace MWMechanics
             /// Copy Modifier values from \a effects, but keep original mBase values.
             void setModifiers(const MagicEffects& effects);
 
-            MagicEffects& operator+= (const MagicEffects& effects);
-
             EffectParam get (const EffectKey& key) const;
             ///< This function can safely be used for keys that are not present.
 

From 5eca122f0424b5194715c0b086fd37dd7298f8d5 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Wed, 5 Jan 2022 19:50:52 +0100
Subject: [PATCH 1930/2859] Avoid creating multiple i18n contexts with the same
 name.

---
 components/lua/i18n.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/components/lua/i18n.cpp b/components/lua/i18n.cpp
index 9fd2724f75..e4d8e3ba78 100644
--- a/components/lua/i18n.cpp
+++ b/components/lua/i18n.cpp
@@ -99,6 +99,9 @@ namespace LuaUtil
     {
         if (mI18nLoader == sol::nil)
             throw std::runtime_error("LuaUtil::I18nManager is not initialized");
+        auto it = mContexts.find(contextName);
+        if (it != mContexts.end())
+            return sol::make_object(mLua->sol(), it->second);
         Context ctx{contextName, mLua->newTable(), call(mI18nLoader, "i18n.init")};
         ctx.updateLang(this);
         mContexts.emplace(contextName, ctx);

From 6a19a66ae5fa15c416fc73cfd2a71b7e9a4f9ca8 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Wed, 5 Jan 2022 20:08:03 +0100
Subject: [PATCH 1931/2859] Fix #6535

---
 components/lua/luastate.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/lua/luastate.cpp b/components/lua/luastate.cpp
index cee48b4545..6ff698c9c2 100644
--- a/components/lua/luastate.cpp
+++ b/components/lua/luastate.cpp
@@ -170,7 +170,7 @@ namespace LuaUtil
         sol::environment env(mLua, sol::create, mSandboxEnv);
         sol::table loaded(mLua, sol::create);
         for (const std::string& s : safePackages)
-            loaded[s] = mSandboxEnv[s];
+            loaded[s] = static_cast<sol::object>(mSandboxEnv[s]);
         env["require"] = [this, loaded, env](const std::string& module) mutable
         {
             if (loaded[module] != sol::nil)

From 6672014a518d01bc53a65aed770ba97726e77619 Mon Sep 17 00:00:00 2001
From: Bret Curtis <bret.curtis@gmail.com>
Date: Thu, 6 Jan 2022 15:02:24 +0100
Subject: [PATCH 1932/2859] make this great again

---
 extern/osg-ffmpeg-videoplayer/videostate.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/extern/osg-ffmpeg-videoplayer/videostate.cpp b/extern/osg-ffmpeg-videoplayer/videostate.cpp
index ff1d9c6517..9b07ece14d 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.cpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.cpp
@@ -310,7 +310,7 @@ void VideoState::video_refresh()
         VideoPicture* vp = &this->pictq[this->pictq_rindex];
         this->video_display(vp);
 
-        this->pictq_rindex = (pictq_rindex+1) % pictq.size();
+        this->pictq_rindex = (this->pictq_rindex+1) % this->pictq.size();
         this->frame_last_pts = vp->pts;
         this->pictq_size--;
         this->pictq_cond.notify_one();
@@ -326,13 +326,13 @@ void VideoState::video_refresh()
         int i=0;
         for (; i<this->pictq_size-1; ++i)
         {
-            if (this->pictq[pictq_rindex].pts + threshold <= this->get_master_clock())
-                this->pictq_rindex = (this->pictq_rindex+1) % pictq.size(); // not enough time to show this picture
+            if (this->pictq[this->pictq_rindex].pts + threshold <= this->get_master_clock())
+                this->pictq_rindex = (this->pictq_rindex+1) % this->pictq.size(); // not enough time to show this picture
             else
                 break;
         }
 
-        assert (this->pictq_rindex < pictq.size());
+        assert (this->pictq_rindex < this->pictq.size());
         VideoPicture* vp = &this->pictq[this->pictq_rindex];
 
         this->video_display(vp);
@@ -342,7 +342,7 @@ void VideoState::video_refresh()
         this->pictq_size -= i;
         // update queue for next picture
         this->pictq_size--;
-        this->pictq_rindex = (this->pictq_rindex+1) % pictq.size();
+        this->pictq_rindex = (this->pictq_rindex+1) % this->pictq.size();
         this->pictq_cond.notify_one();
     }
 }
@@ -392,7 +392,7 @@ int VideoState::queue_picture(const AVFrame &pFrame, double pts)
               0, this->video_ctx->height, vp->rgbaFrame->data, vp->rgbaFrame->linesize);
 
     // now we inform our display thread that we have a pic ready
-    this->pictq_windex = (this->pictq_windex+1) % pictq.size();
+    this->pictq_windex = (this->pictq_windex+1) % this->pictq.size();
     this->pictq_size++;
 
     return 0;

From cdae1c4c978501b5b8c55eb3fecff64263ffbafd Mon Sep 17 00:00:00 2001
From: Cody Glassman <glassmancody.info@gmail.com>
Date: Thu, 6 Jan 2022 22:01:28 +0000
Subject: [PATCH 1933/2859] Heavily mitigate jittery objects far from origin

---
 apps/openmw/mwphysics/ptrholder.hpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwphysics/ptrholder.hpp b/apps/openmw/mwphysics/ptrholder.hpp
index e194f8e934..7366049cba 100644
--- a/apps/openmw/mwphysics/ptrholder.hpp
+++ b/apps/openmw/mwphysics/ptrholder.hpp
@@ -4,6 +4,8 @@
 #include <mutex>
 #include <memory>
 
+#include <osg/Vec3d>
+
 #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
 
 #include "../mwworld/ptr.hpp"
@@ -56,12 +58,12 @@ namespace MWPhysics
             mPosition = position;
         }
 
-        osg::Vec3f getPosition() const
+        osg::Vec3d getPosition() const
         {
             return mPosition;
         }
 
-        osg::Vec3f getPreviousPosition() const
+        osg::Vec3d getPreviousPosition() const
         {
             return mPreviousPosition;
         }
@@ -71,8 +73,8 @@ namespace MWPhysics
         std::unique_ptr<btCollisionObject> mCollisionObject;
         osg::Vec3f mVelocity;
         osg::Vec3f mSimulationPosition;
-        osg::Vec3f mPosition;
-        osg::Vec3f mPreviousPosition;
+        osg::Vec3d mPosition;
+        osg::Vec3d mPreviousPosition;
     };
 }
 

From 63a8bc5f9b3fa2280e539abe6c8ebd1a7982f875 Mon Sep 17 00:00:00 2001
From: Josquin Frei <josquin@genevastage.ch>
Date: Fri, 7 Jan 2022 14:35:11 +0000
Subject: [PATCH 1934/2859] Fix wizard dialogs

---
 apps/wizard/mainwizard.cpp | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/apps/wizard/mainwizard.cpp b/apps/wizard/mainwizard.cpp
index d92f5b029c..064f0813d8 100644
--- a/apps/wizard/mainwizard.cpp
+++ b/apps/wizard/mainwizard.cpp
@@ -88,8 +88,9 @@ void Wizard::MainWizard::setupLog()
         msgBox.setIcon(QMessageBox::Critical);
         msgBox.setStandardButtons(QMessageBox::Ok);
         msgBox.setText(mLogError.arg(file.fileName()));
+        connect(&msgBox, &QDialog::finished, qApp, &QApplication::quit, Qt::QueuedConnection);
         msgBox.exec();
-        return qApp->quit();
+        return;
     }
 
     addLogText(QString("Started OpenMW Wizard on %1").arg(QDateTime::currentDateTime().toString()));
@@ -110,8 +111,9 @@ void Wizard::MainWizard::addLogText(const QString &text)
         msgBox.setIcon(QMessageBox::Critical);
         msgBox.setStandardButtons(QMessageBox::Ok);
         msgBox.setText(mLogError.arg(file.fileName()));
+        connect(&msgBox, &QDialog::finished, qApp, &QApplication::quit, Qt::QueuedConnection);
         msgBox.exec();
-        return qApp->quit();
+        return;
     }
 
     if (!file.isSequential())
@@ -148,8 +150,9 @@ void Wizard::MainWizard::setupGameSettings()
             msgBox.setIcon(QMessageBox::Critical);
             msgBox.setStandardButtons(QMessageBox::Ok);
             msgBox.setText(message.arg(file.fileName()));
+            connect(&msgBox, &QDialog::finished, qApp, &QApplication::quit, Qt::QueuedConnection);
             msgBox.exec();
-            return qApp->quit();
+            return;
         }
         QTextStream stream(&file);
         stream.setCodec(QTextCodec::codecForName("UTF-8"));
@@ -177,8 +180,9 @@ void Wizard::MainWizard::setupGameSettings()
                 msgBox.setIcon(QMessageBox::Critical);
                 msgBox.setStandardButtons(QMessageBox::Ok);
                 msgBox.setText(message.arg(file.fileName()));
-
-                return qApp->quit();
+                connect(&msgBox, &QDialog::finished, qApp, &QApplication::quit, Qt::QueuedConnection);
+                msgBox.exec();
+                return;
             }
             QTextStream stream(&file);
             stream.setCodec(QTextCodec::codecForName("UTF-8"));
@@ -210,8 +214,9 @@ void Wizard::MainWizard::setupLauncherSettings()
             msgBox.setIcon(QMessageBox::Critical);
             msgBox.setStandardButtons(QMessageBox::Ok);
             msgBox.setText(message.arg(file.fileName()));
+            connect(&msgBox, &QDialog::finished, qApp, &QApplication::quit, Qt::QueuedConnection);
             msgBox.exec();
-            return qApp->quit();
+            return;
         }
         QTextStream stream(&file);
         stream.setCodec(QTextCodec::codecForName("UTF-8"));
@@ -394,8 +399,9 @@ void Wizard::MainWizard::writeSettings()
             msgBox.setText(tr("<html><head/><body><p><b>Could not create %1</b></p> \
                               <p>Please make sure you have the right permissions \
                               and try again.</p></body></html>").arg(userPath));
+            connect(&msgBox, &QDialog::finished, qApp, &QApplication::quit, Qt::QueuedConnection);
             msgBox.exec();
-            return qApp->quit();
+            return;
         }
     }
 
@@ -411,8 +417,9 @@ void Wizard::MainWizard::writeSettings()
         msgBox.setText(tr("<html><head/><body><p><b>Could not open %1 for writing</b></p> \
                           <p>Please make sure you have the right permissions \
                           and try again.</p></body></html>").arg(file.fileName()));
+        connect(&msgBox, &QDialog::finished, qApp, &QApplication::quit, Qt::QueuedConnection);
         msgBox.exec();
-        return qApp->quit();
+        return;
     }
 
     QTextStream stream(&file);
@@ -433,8 +440,9 @@ void Wizard::MainWizard::writeSettings()
         msgBox.setText(tr("<html><head/><body><p><b>Could not open %1 for writing</b></p> \
                           <p>Please make sure you have the right permissions \
                           and try again.</p></body></html>").arg(file.fileName()));
+        connect(&msgBox, &QDialog::finished, qApp, &QApplication::quit, Qt::QueuedConnection);
         msgBox.exec();
-        return qApp->quit();
+        return;
     }
 
     stream.setDevice(&file);

From b5a7ad6d62dba84b4eed88fc9a9a76f06312a5a6 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sat, 8 Jan 2022 01:58:52 +0300
Subject: [PATCH 1935/2859] Fix multilayer parallax parameter reading

---
 components/nif/property.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/nif/property.cpp b/components/nif/property.cpp
index 70acbb82ae..ee47e8ccbe 100644
--- a/components/nif/property.cpp
+++ b/components/nif/property.cpp
@@ -180,7 +180,7 @@ void BSLightingShaderProperty::read(NIFStream *nif)
         case BSLightingShaderType::ShaderType_MultiLayerParallax:
             nif->skip(4); // Inner layer thickness
             nif->skip(4); // Refraction scale
-            nif->skip(4); // Inner layer texture scale
+            nif->skip(8); // Inner layer texture scale
             nif->skip(4); // Environment map strength
             break;
         case BSLightingShaderType::ShaderType_SparkleSnow:

From 5d7db94a233a9ad30277d936530427bf6bd36979 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sat, 8 Jan 2022 22:08:05 +0100
Subject: [PATCH 1936/2859] Keep coverity logs as artifacts instead of
 deploying them

---
 .gitlab-ci.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 105057b860..8275df7572 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -81,14 +81,13 @@ Coverity:
       --form token=$COVERITY_SCAN_TOKEN --form email=$GITLAB_USER_EMAIL
       --form file=@cov-int.tar.gz --form version="$CI_COMMIT_REF_NAME:$CI_COMMIT_SHORT_SHA"
       --form description="CI_COMMIT_SHORT_SHA / $CI_COMMIT_TITLE / $CI_COMMIT_REF_NAME:$CI_PIPELINE_ID"
-    - cat /builds/OpenMW/openmw/cov-int/build-log.txt
   variables:
     CC: clang
     CXX: clang++
     CXXFLAGS: -O0
   artifacts:
-    paths: []
-    expire_in: 1 minute
+    paths: 
+      - /builds/OpenMW/openmw/cov-int/build-log.txt
 
 Ubuntu_GCC:
   extends: .Ubuntu

From e32d3d11ce53e97c27a02047632a99f30bf1a470 Mon Sep 17 00:00:00 2001
From: cody glassman <glassmancody.info@gmail.com>
Date: Sat, 8 Jan 2022 16:12:24 -0800
Subject: [PATCH 1937/2859] ensure readbuffer is bound before using
 glReadPixels

---
 apps/openmw/mwrender/screenshotmanager.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwrender/screenshotmanager.cpp b/apps/openmw/mwrender/screenshotmanager.cpp
index 1973ca4025..5c3d925c9b 100644
--- a/apps/openmw/mwrender/screenshotmanager.cpp
+++ b/apps/openmw/mwrender/screenshotmanager.cpp
@@ -91,15 +91,18 @@ namespace MWRender
             int width = screenW - leftPadding*2;
             int height = screenH - topPadding*2;
 
-            // Ensure we are reading from the resolved framebuffer and not the multisampled render buffer when in use.
-            // glReadPixel() cannot read from multisampled targets.
+            // Ensure we are reading from the resolved framebuffer and not the multisampled render buffer. Also ensure that the readbuffer is set correctly with rendeirng to FBO.
+            // glReadPixel() cannot read from multisampled targets
             PostProcessor* postProcessor = dynamic_cast<PostProcessor*>(renderInfo.getCurrentCamera()->getUserData());
 
-            if (postProcessor && postProcessor->getFbo() && postProcessor->getMsaaFbo())
+            if (postProcessor && postProcessor->getFbo())
             {
                 osg::GLExtensions* ext = osg::GLExtensions::Get(renderInfo.getContextID(), false);
                 if (ext)
+                {
                     ext->glBindFramebuffer(GL_FRAMEBUFFER_EXT, postProcessor->getFbo()->getHandle(renderInfo.getContextID()));
+                    renderInfo.getState()->glReadBuffer(GL_COLOR_ATTACHMENT0_EXT);
+                }
             }
 
             mImage->readPixels(leftPadding, topPadding, width, height, GL_RGB, GL_UNSIGNED_BYTE);

From 8216410e7d50ffd2bf6d0a62810880eb9da83c3b Mon Sep 17 00:00:00 2001
From: cody glassman <glassmancody.info@gmail.com>
Date: Sat, 8 Jan 2022 16:19:42 -0800
Subject: [PATCH 1938/2859] add white ambient to spell VFX as in Morrowind

---
 CHANGELOG.md                       |  1 +
 apps/openmw/mwrender/animation.cpp | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 419727c87d..3ee15e0ea3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
     Bug #4602: Robert's Bodies: crash inside createInstance()
     Bug #4700: Editor: Incorrect command implementation
     Bug #4744: Invisible particles must still be processed
+    Bug #4949: Incorrect particle lighting
     Bug #5088: Sky abruptly changes direction during certain weather transitions
     Bug #5100: Persuasion doesn't always clamp the resulting disposition
     Bug #5120: Scripted object spawning updates physics system
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index bf0ed04055..732ffd33aa 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -7,6 +7,7 @@
 #include <osg/BlendFunc>
 #include <osg/Material>
 #include <osg/Switch>
+#include <osg/LightModel>
 
 #include <osgParticle/ParticleSystem>
 #include <osgParticle/ParticleProcessor>
@@ -372,6 +373,19 @@ namespace
     private:
         int mEffectId;
     };
+
+    osg::ref_ptr<osg::LightModel> getVFXLightModelInstance()
+    {
+        static osg::ref_ptr<osg::LightModel> lightModel = nullptr;
+
+        if (!lightModel)
+        {
+            lightModel = new osg::LightModel;
+            lightModel->setAmbientIntensity({1,1,1,1});
+        }
+
+        return lightModel;
+    }
 }
 
 namespace MWRender
@@ -1547,7 +1561,9 @@ namespace MWRender
         parentNode->addChild(trans);
 
         osg::ref_ptr<osg::Node> node = mResourceSystem->getSceneManager()->getInstance(model, trans);
-        node->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+
+        // Morrowind has a white ambient light attached to the root VFX node of the scenegraph
+        node->getOrCreateStateSet()->setAttributeAndModes(getVFXLightModelInstance(), osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
 
         SceneUtil::FindMaxControllerLengthVisitor findMaxLengthVisitor;
         node->accept(findMaxLengthVisitor);

From cd1bea080f4e5f73c8fc273ffae14208d3068b5d Mon Sep 17 00:00:00 2001
From: Abdu Sharif <narukomanroom@gmail.com>
Date: Sun, 9 Jan 2022 09:13:38 +0000
Subject: [PATCH 1939/2859] Update changelog and remove an unused setting from
 settings-default.cfg

---
 CHANGELOG.md               | 2 ++
 files/settings-default.cfg | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 419727c87d..63fcb91cef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -96,6 +96,7 @@
     Bug #6517: Rotations for KeyframeData in NIFs should be optional
     Bug #6519: Effects tooltips for ingredients work incorrectly
     Bug #6523: Disintegrate Weapon is resisted by Resist Magicka instead of Sanctuary
+    Bug #6544: Far from world origin objects jitter when camera is still
     Feature #890: OpenMW-CS: Column filtering
     Feature #1465: "Reset" argument for AI functions
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
@@ -123,6 +124,7 @@
     Feature #6288: Preserve the "blocked" record flag for referenceable objects.
     Feature #6380: Commas are treated as whitespace in vanilla
     Feature #6419: Topics shouldn't be greyed out if they can produce another topic reference
+    Feature #6534: Shader-based object texture blending
     Task #6201: Remove the "Note: No relevant classes found. No output generated" warnings
     Task #6264: Remove the old classes in animation.cpp
 
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index acd011f233..06e080fdfd 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -152,9 +152,6 @@ object paging min size merge factor = 0.3
 # Controls how inexpensive an object needs to be to utilize 'min size merge factor'.
 object paging min size cost multiplier = 25
 
-# Assign a random color to merged batches.
-object paging debug batches = false
-
 [Fog]
 
 # If true, use extended fog parameters for distant terrain not controlled by

From d9672f7d468338cb2e96e775b8494dc85131a546 Mon Sep 17 00:00:00 2001
From: Josquin Frei <josquin@genevastage.ch>
Date: Mon, 10 Jan 2022 12:42:03 +0000
Subject: [PATCH 1940/2859] Add serialization for TransformM and TransformQ

---
 AUTHORS.md                                    |  1 +
 .../lua/test_serialization.cpp                | 30 ++++++++++++++
 components/lua/serialization.cpp              | 40 +++++++++++++++++++
 3 files changed, 71 insertions(+)

diff --git a/AUTHORS.md b/AUTHORS.md
index 67be756f33..2ddaa03cf6 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -115,6 +115,7 @@ Programmers
     John Blomberg (fstp)
     Jordan Ayers
     Jordan Milne
+    Josquin Frei
     Josua Grawitter
     Jules Blok (Armada651)
     julianko
diff --git a/apps/openmw_test_suite/lua/test_serialization.cpp b/apps/openmw_test_suite/lua/test_serialization.cpp
index 9300e4571b..57a1070c83 100644
--- a/apps/openmw_test_suite/lua/test_serialization.cpp
+++ b/apps/openmw_test_suite/lua/test_serialization.cpp
@@ -1,10 +1,13 @@
 #include "gmock/gmock.h"
 #include <gtest/gtest.h>
 
+#include <osg/Matrixf>
+#include <osg/Quat>
 #include <osg/Vec2f>
 #include <osg/Vec3f>
 
 #include <components/lua/serialization.hpp>
+#include <components/lua/utilpackage.hpp>
 
 #include <components/misc/endianness.hpp>
 
@@ -104,6 +107,33 @@ namespace
         }
     }
 
+    TEST(LuaSerializationTest, Transform) {
+        sol::state lua;
+        osg::Matrixf matrix(1, 2, 3, 4,
+                            5, 6, 7, 8,
+                            9, 10, 11, 12,
+                            13, 14, 15, 16);
+        LuaUtil::TransformM transM = LuaUtil::asTransform(matrix);
+        osg::Quat quat(1, 2, 3, 4);
+        LuaUtil::TransformQ transQ = LuaUtil::asTransform(quat);
+
+        {
+            std::string serialized = LuaUtil::serialize(sol::make_object(lua, transM));
+            EXPECT_EQ(serialized.size(), 130); // version, type, 16x double
+            sol::object value = LuaUtil::deserialize(lua, serialized);
+            ASSERT_TRUE(value.is<LuaUtil::TransformM>());
+            EXPECT_EQ(value.as<LuaUtil::TransformM>().mM, transM.mM);
+        }
+        {
+            std::string serialized = LuaUtil::serialize(sol::make_object(lua, transQ));
+            EXPECT_EQ(serialized.size(), 34); // version, type, 4x double
+            sol::object value = LuaUtil::deserialize(lua, serialized);
+            ASSERT_TRUE(value.is<LuaUtil::TransformQ>());
+            EXPECT_EQ(value.as<LuaUtil::TransformQ>().mQ, transQ.mQ);
+        }
+
+    }
+
     TEST(LuaSerializationTest, Table)
     {
         sol::state lua;
diff --git a/components/lua/serialization.cpp b/components/lua/serialization.cpp
index f9b8951e4e..8b18294449 100644
--- a/components/lua/serialization.cpp
+++ b/components/lua/serialization.cpp
@@ -1,11 +1,15 @@
 #include "serialization.hpp"
 
+#include <osg/Matrixf>
+#include <osg/Quat>
 #include <osg/Vec2f>
 #include <osg/Vec3f>
+#include <osg/Vec4f>
 
 #include <components/misc/endianness.hpp>
 
 #include "luastate.hpp"
+#include "utilpackage.hpp"
 
 namespace LuaUtil
 {
@@ -22,6 +26,8 @@ namespace LuaUtil
 
         VEC2 =         0x10,
         VEC3 =         0x11,
+        TRANSFORM_M =  0x12,
+        TRANSFORM_Q =  0x13,
 
         // All values should be lesser than 0x20 (SHORT_STRING_FLAG).
     };
@@ -106,6 +112,23 @@ namespace LuaUtil
             appendValue<float>(out, v.z());
             return;
         }
+        if (data.is<TransformM>())
+        {
+            appendType(out, SerializedType::TRANSFORM_M);
+            osg::Matrixf matrix = data.as<TransformM>().mM;
+            for (size_t i = 0; i < 4; i++)
+                for (size_t j = 0; j < 4; j++)
+                    appendValue<double>(out, matrix(i,j));
+            return;
+        }
+        if (data.is<TransformQ>())
+        {
+            appendType(out, SerializedType::TRANSFORM_Q);
+            osg::Quat quat = data.as<TransformQ>().mQ;
+            for(size_t i = 0; i < 4; i++)
+                appendValue<double>(out, quat[i]);
+            return;
+        }
         if (customSerializer && customSerializer->serialize(out, data))
             return;
         else
@@ -231,6 +254,23 @@ namespace LuaUtil
                 sol::stack::push<osg::Vec3f>(lua, osg::Vec3f(x, y, z));
                 return;
             }
+            case SerializedType::TRANSFORM_M:
+            {
+                osg::Matrixf mat;
+                for (int i = 0; i < 4; i++)
+                    for (int j = 0; j < 4; j++)
+                        mat(i, j) = getValue<double>(binaryData);
+                sol::stack::push<TransformM>(lua, asTransform(mat));
+                return;
+            }
+            case SerializedType::TRANSFORM_Q:
+            {
+                osg::Quat q;
+                for (int i = 0; i < 4; i++)
+                    q[i] = getValue<double>(binaryData);
+                sol::stack::push<TransformQ>(lua, asTransform(q));
+                return;
+            }
         }
         throw std::runtime_error("Unknown type in serialized data: " + std::to_string(type));
     }

From 877f5c445ed296315505e826bceace9b2b92a1d8 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Mon, 10 Jan 2022 19:38:55 +0000
Subject: [PATCH 1941/2859] Add librecast-dev to deps that needed for
 Debian/Ubuntu

---
 CI/install_debian_deps.sh | 3 +--
 docker/Dockerfile.ubuntu  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/CI/install_debian_deps.sh b/CI/install_debian_deps.sh
index 945c5f09bf..131ccae305 100755
--- a/CI/install_debian_deps.sh
+++ b/CI/install_debian_deps.sh
@@ -22,9 +22,8 @@ declare -rA GROUPED_DEPS=(
     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 libluajit-5.1-dev
-    ca-certificates
+    librecast-dev libsqlite3-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 libsqlite3-dev"
diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu
index 51aaa6465e..b5fadff3e3 100644
--- a/docker/Dockerfile.ubuntu
+++ b/docker/Dockerfile.ubuntu
@@ -13,7 +13,7 @@ RUN apt-get update \
     libmygui-dev libunshield-dev liblz4-dev libtinyxml-dev libqt5opengl5-dev \
     libboost-filesystem-dev libboost-program-options-dev libboost-iostreams-dev \
     libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libswresample-dev \
-    librecastnavigation-dev libluajit-5.1-dev
+    librecast-dev libsqlite3-dev libluajit-5.1-dev
 
 COPY build.sh /build.sh
 

From 2d1b1002397f7e7394b18d9e35a658e2f5bcb4ee Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Wed, 1 Dec 2021 21:28:05 +0100
Subject: [PATCH 1942/2859] Change terminology of gameSecond/gameHour to
 simulationTime/gameTime

---
 apps/openmw/mwlua/asyncbindings.cpp           |  22 ++--
 apps/openmw/mwlua/luabindings.cpp             |  28 ++++-
 apps/openmw/mwlua/luamanagerimp.cpp           |  10 +-
 apps/openmw/mwlua/worldview.cpp               |   8 +-
 apps/openmw/mwlua/worldview.hpp               |  17 +--
 .../lua/test_scriptscontainer.cpp             |  26 ++---
 components/esm/luascripts.cpp                 |   4 +-
 components/esm/luascripts.hpp                 |   8 +-
 components/lua/luastate.cpp                   |   7 +-
 components/lua/scriptscontainer.cpp           |  40 +++----
 components/lua/scriptscontainer.hpp           |  19 ++--
 docs/source/reference/lua-scripting/api.rst   |   3 +
 .../lua-scripting/openmw_aux_time.rst         |   5 +
 .../reference/lua-scripting/overview.rst      |   9 +-
 files/builtin_scripts/openmw_aux/time.lua     | 104 ++++++++++++++++++
 files/builtin_scripts/openmw_aux/util.lua     |  67 -----------
 files/lua_api/openmw/async.lua                |  16 +--
 files/lua_api/openmw/core.lua                 |  19 +++-
 files/lua_api/openmw/world.lua                |  30 +++++
 files/lua_api/os.doclua                       |  64 +++++++++++
 20 files changed, 342 insertions(+), 164 deletions(-)
 create mode 100644 docs/source/reference/lua-scripting/openmw_aux_time.rst
 create mode 100644 files/builtin_scripts/openmw_aux/time.lua
 create mode 100644 files/lua_api/os.doclua

diff --git a/apps/openmw/mwlua/asyncbindings.cpp b/apps/openmw/mwlua/asyncbindings.cpp
index 9bddf75ee4..0ffb2aad8f 100644
--- a/apps/openmw/mwlua/asyncbindings.cpp
+++ b/apps/openmw/mwlua/asyncbindings.cpp
@@ -19,36 +19,36 @@ namespace MWLua
 
     sol::function getAsyncPackageInitializer(const Context& context)
     {
-        using TimeUnit = LuaUtil::ScriptsContainer::TimeUnit;
+        using TimerType = LuaUtil::ScriptsContainer::TimerType;
         sol::usertype<AsyncPackageId> api = context.mLua->sol().new_usertype<AsyncPackageId>("AsyncPackage");
         api["registerTimerCallback"] = [](const AsyncPackageId& asyncId, std::string_view name, sol::function callback)
         {
             asyncId.mContainer->registerTimerCallback(asyncId.mScriptId, name, std::move(callback));
             return TimerCallback{asyncId, std::string(name)};
         };
-        api["newTimerInSeconds"] = [world=context.mWorldView](const AsyncPackageId&, double delay,
-                                                              const TimerCallback& callback, sol::object callbackArg)
+        api["newSimulationTimer"] = [world=context.mWorldView](const AsyncPackageId&, double delay,
+                                                               const TimerCallback& callback, sol::object callbackArg)
         {
             callback.mAsyncId.mContainer->setupSerializableTimer(
-                TimeUnit::SECONDS, world->getGameTimeInSeconds() + delay,
+                TimerType::SIMULATION_TIME, world->getSimulationTime() + delay,
                 callback.mAsyncId.mScriptId, callback.mName, std::move(callbackArg));
         };
-        api["newTimerInHours"] = [world=context.mWorldView](const AsyncPackageId&, double delay,
-                                                            const TimerCallback& callback, sol::object callbackArg)
+        api["newGameTimer"] = [world=context.mWorldView](const AsyncPackageId&, double delay,
+                                                         const TimerCallback& callback, sol::object callbackArg)
         {
             callback.mAsyncId.mContainer->setupSerializableTimer(
-                TimeUnit::HOURS, world->getGameTimeInHours() + delay,
+                TimerType::GAME_TIME, world->getGameTime() + delay,
                 callback.mAsyncId.mScriptId, callback.mName, std::move(callbackArg));
         };
-        api["newUnsavableTimerInSeconds"] = [world=context.mWorldView](const AsyncPackageId& asyncId, double delay, sol::function callback)
+        api["newUnsavableSimulationTimer"] = [world=context.mWorldView](const AsyncPackageId& asyncId, double delay, sol::function callback)
         {
             asyncId.mContainer->setupUnsavableTimer(
-                TimeUnit::SECONDS, world->getGameTimeInSeconds() + delay, asyncId.mScriptId, std::move(callback));
+                TimerType::SIMULATION_TIME, world->getSimulationTime() + delay, asyncId.mScriptId, std::move(callback));
         };
-        api["newUnsavableTimerInHours"] = [world=context.mWorldView](const AsyncPackageId& asyncId, double delay, sol::function callback)
+        api["newUnsavableGameTimer"] = [world=context.mWorldView](const AsyncPackageId& asyncId, double delay, sol::function callback)
         {
             asyncId.mContainer->setupUnsavableTimer(
-                TimeUnit::HOURS, world->getGameTimeInHours() + delay, asyncId.mScriptId, std::move(callback));
+                TimerType::GAME_TIME, world->getGameTime() + delay, asyncId.mScriptId, std::move(callback));
         };
         api["callback"] = [](const AsyncPackageId& asyncId, sol::function fn)
         {
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index c525fd8a23..5a9e33faef 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -22,11 +22,32 @@ namespace MWLua
         return LuaUtil::makeReadOnly(res);
     }
 
+    static void addTimeBindings(sol::table& api, const Context& context, bool global)
+    {
+        api["getSimulationTime"] = [world=context.mWorldView]() { return world->getSimulationTime(); };
+        api["getSimulationTimeScale"] = [world=context.mWorldView]() { return world->getSimulationTimeScale(); };
+        api["getGameTime"] = [world=context.mWorldView]() { return world->getGameTime(); };
+        api["getGameTimeScale"] = [world=context.mWorldView]() { return world->getGameTimeScale(); };
+        api["isWorldPaused"] = [world=context.mWorldView]() { return world->isPaused(); };
+
+        if (!global)
+            return;
+
+        api["setGameTimeScale"] = [world=context.mWorldView](double scale) { world->setGameTimeScale(scale); };
+
+        // TODO: Ability to make game time slower or faster than real time (needed for example for mechanics like VATS)
+        // api["setSimulationTimeScale"] = [](double scale) {};
+
+        // TODO: Ability to pause/resume world from Lua (needed for UI dehardcoding)
+        // api["pause"] = []() {};
+        // api["resume"] = []() {};
+    }
+
     sol::table initCorePackage(const Context& context)
     {
         auto* lua = context.mLua;
         sol::table api(lua->sol(), sol::create);
-        api["API_REVISION"] = 12;
+        api["API_REVISION"] = 13;
         api["quit"] = [lua]()
         {
             Log(Debug::Warning) << "Quit requested by a Lua script.\n" << lua->debugTraceback();
@@ -36,9 +57,7 @@ namespace MWLua
         {
             context.mGlobalEventQueue->push_back({std::move(eventName), LuaUtil::serialize(eventData, context.mSerializer)});
         };
-        api["getGameTimeInSeconds"] = [world=context.mWorldView]() { return world->getGameTimeInSeconds(); };
-        api["getGameTimeInHours"] = [world=context.mWorldView]() { return world->getGameTimeInHours(); };
-        api["isWorldPaused"] = [world=context.mWorldView]() { return world->isPaused(); };
+        addTimeBindings(api, context, false);
         api["OBJECT_TYPE"] = definitionList(*lua,
         {
             "Activator", "Armor", "Book", "Clothing", "Creature", "Door", "Ingredient",
@@ -73,6 +92,7 @@ namespace MWLua
     {
         sol::table api(context.mLua->sol(), sol::create);
         WorldView* worldView = context.mWorldView;
+        addTimeBindings(api, context, true);
         api["getCellByName"] = [worldView=context.mWorldView](const std::string& name) -> sol::optional<GCell>
         {
             MWWorld::CellStore* cell = worldView->findNamedCell(name);
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index be5764c32f..658ee7c809 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -113,13 +113,13 @@ namespace MWLua
 
         if (!mWorldView.isPaused())
         {  // Update time and process timers
-            double seconds = mWorldView.getGameTimeInSeconds() + frameDuration;
-            mWorldView.setGameTimeInSeconds(seconds);
-            double hours = mWorldView.getGameTimeInHours();
+            double simulationTime = mWorldView.getSimulationTime() + frameDuration;
+            mWorldView.setSimulationTime(simulationTime);
+            double gameTime = mWorldView.getGameTime();
 
-            mGlobalScripts.processTimers(seconds, hours);
+            mGlobalScripts.processTimers(simulationTime, gameTime);
             for (LocalScripts* scripts : mActiveLocalScripts)
-                scripts->processTimers(seconds, hours);
+                scripts->processTimers(simulationTime, gameTime);
         }
 
         // Receive events
diff --git a/apps/openmw/mwlua/worldview.cpp b/apps/openmw/mwlua/worldview.cpp
index 219035745a..35b1db7a93 100644
--- a/apps/openmw/mwlua/worldview.cpp
+++ b/apps/openmw/mwlua/worldview.cpp
@@ -70,16 +70,16 @@ namespace MWLua
             removeFromGroup(*group, ptr);
     }
 
-    double WorldView::getGameTimeInHours() const
+    double WorldView::getGameTime() const
     {
         MWBase::World* world = MWBase::Environment::get().getWorld();
         MWWorld::TimeStamp timeStamp = world->getTimeStamp();
-        return static_cast<double>(timeStamp.getDay()) * 24 + timeStamp.getHour();
+        return (static_cast<double>(timeStamp.getDay()) * 24 + timeStamp.getHour()) * 3600.0;
     }
 
     void WorldView::load(ESM::ESMReader& esm)
     {
-        esm.getHNT(mGameSeconds, "LUAW");
+        esm.getHNT(mSimulationTime, "LUAW");
         ObjectId lastAssignedId;
         lastAssignedId.load(esm, true);
         mObjectRegistry.setLastAssignedId(lastAssignedId);
@@ -87,7 +87,7 @@ namespace MWLua
 
     void WorldView::save(ESM::ESMWriter& esm) const
     {
-        esm.writeHNT("LUAW", mGameSeconds);
+        esm.writeHNT("LUAW", mSimulationTime);
         mObjectRegistry.getLastAssignedId().save(esm, true);
     }
 
diff --git a/apps/openmw/mwlua/worldview.hpp b/apps/openmw/mwlua/worldview.hpp
index a8befd4685..e5b5fe4f67 100644
--- a/apps/openmw/mwlua/worldview.hpp
+++ b/apps/openmw/mwlua/worldview.hpp
@@ -22,13 +22,16 @@ namespace MWLua
         // Whether the world is paused (i.e. game time is not changing and actors don't move).
         bool isPaused() const { return mPaused; }
 
-        // Returns the number of seconds passed from the beginning of the game.
-        double getGameTimeInSeconds() const { return mGameSeconds; }
-        void setGameTimeInSeconds(double t) { mGameSeconds = t; }
+        // The number of seconds passed from the beginning of the game.
+        double getSimulationTime() const { return mSimulationTime; }
+        void setSimulationTime(double t) { mSimulationTime = t; }
+        double getSimulationTimeScale() const { return 1.0; }
 
-        // Returns the number of game hours passed from the beginning of the game.
-        // Note that the number of seconds in a game hour is not fixed.
-        double getGameTimeInHours() const;
+        // The game time (in game seconds) passed from the beginning of the game.
+        // Note that game time generally goes faster than the simulation time.
+        double getGameTime() const;
+        double getGameTimeScale() const { return MWBase::Environment::get().getWorld()->getTimeScaleFactor(); }
+        void setGameTimeScale(double s) { MWBase::Environment::get().getWorld()->setGlobalFloat("timescale", s); }
 
         ObjectIdList getActivatorsInScene() const { return mActivatorsInScene.mList; }
         ObjectIdList getActorsInScene() const { return mActorsInScene.mList; }
@@ -76,7 +79,7 @@ namespace MWLua
         ObjectGroup mDoorsInScene;
         ObjectGroup mItemsInScene;
 
-        double mGameSeconds = 0;
+        double mSimulationTime = 0;
         bool mPaused = false;
     };
 
diff --git a/apps/openmw_test_suite/lua/test_scriptscontainer.cpp b/apps/openmw_test_suite/lua/test_scriptscontainer.cpp
index 8be02a2f13..779debb4e6 100644
--- a/apps/openmw_test_suite/lua/test_scriptscontainer.cpp
+++ b/apps/openmw_test_suite/lua/test_scriptscontainer.cpp
@@ -364,7 +364,7 @@ return {
 
     TEST_F(LuaScriptsContainerTest, Timers)
     {
-        using TimeUnit = LuaUtil::ScriptsContainer::TimeUnit;
+        using TimerType = LuaUtil::ScriptsContainer::TimerType;
         LuaUtil::ScriptsContainer scripts(&mLua, "Test");
         int test1Id = *mCfg.findId("test1.lua");
         int test2Id = *mCfg.findId("test2.lua");
@@ -387,18 +387,18 @@ return {
 
         scripts.processTimers(1, 2);
 
-        scripts.setupSerializableTimer(TimeUnit::SECONDS, 10, test1Id, "B", sol::make_object(mLua.sol(), 3));
-        scripts.setupSerializableTimer(TimeUnit::HOURS, 10, test2Id, "B", sol::make_object(mLua.sol(), 4));
-        scripts.setupSerializableTimer(TimeUnit::SECONDS, 5, test1Id, "A", sol::make_object(mLua.sol(), 1));
-        scripts.setupSerializableTimer(TimeUnit::HOURS, 5, test2Id, "A", sol::make_object(mLua.sol(), 2));
-        scripts.setupSerializableTimer(TimeUnit::SECONDS, 15, test1Id, "A", sol::make_object(mLua.sol(), 10));
-        scripts.setupSerializableTimer(TimeUnit::SECONDS, 15, test1Id, "B", sol::make_object(mLua.sol(), 20));
-
-        scripts.setupUnsavableTimer(TimeUnit::SECONDS, 10, test2Id, fn2);
-        scripts.setupUnsavableTimer(TimeUnit::HOURS, 10, test1Id, fn2);
-        scripts.setupUnsavableTimer(TimeUnit::SECONDS, 5, test2Id, fn1);
-        scripts.setupUnsavableTimer(TimeUnit::HOURS, 5, test1Id, fn1);
-        scripts.setupUnsavableTimer(TimeUnit::SECONDS, 15, test2Id, fn1);
+        scripts.setupSerializableTimer(TimerType::SIMULATION_TIME, 10, test1Id, "B", sol::make_object(mLua.sol(), 3));
+        scripts.setupSerializableTimer(TimerType::GAME_TIME, 10, test2Id, "B", sol::make_object(mLua.sol(), 4));
+        scripts.setupSerializableTimer(TimerType::SIMULATION_TIME, 5, test1Id, "A", sol::make_object(mLua.sol(), 1));
+        scripts.setupSerializableTimer(TimerType::GAME_TIME, 5, test2Id, "A", sol::make_object(mLua.sol(), 2));
+        scripts.setupSerializableTimer(TimerType::SIMULATION_TIME, 15, test1Id, "A", sol::make_object(mLua.sol(), 10));
+        scripts.setupSerializableTimer(TimerType::SIMULATION_TIME, 15, test1Id, "B", sol::make_object(mLua.sol(), 20));
+
+        scripts.setupUnsavableTimer(TimerType::SIMULATION_TIME, 10, test2Id, fn2);
+        scripts.setupUnsavableTimer(TimerType::GAME_TIME, 10, test1Id, fn2);
+        scripts.setupUnsavableTimer(TimerType::SIMULATION_TIME, 5, test2Id, fn1);
+        scripts.setupUnsavableTimer(TimerType::GAME_TIME, 5, test1Id, fn1);
+        scripts.setupUnsavableTimer(TimerType::SIMULATION_TIME, 15, test2Id, fn1);
 
         EXPECT_EQ(counter1, 0);
         EXPECT_EQ(counter3, 0);
diff --git a/components/esm/luascripts.cpp b/components/esm/luascripts.cpp
index c831cbbbfc..53beb02d82 100644
--- a/components/esm/luascripts.cpp
+++ b/components/esm/luascripts.cpp
@@ -72,7 +72,7 @@ void ESM::LuaScripts::load(ESMReader& esm)
         {
             esm.getSubHeader();
             LuaTimer timer;
-            esm.getT(timer.mUnit);
+            esm.getT(timer.mType);
             esm.getT(timer.mTime);
             timer.mCallbackName = esm.getHNString("LUAC");
             timer.mCallbackArgument = loadLuaBinaryData(esm);
@@ -91,7 +91,7 @@ void ESM::LuaScripts::save(ESMWriter& esm) const
         for (const LuaTimer& timer : script.mTimers)
         {
             esm.startSubRecord("LUAT");
-            esm.writeT(timer.mUnit);
+            esm.writeT(timer.mType);
             esm.writeT(timer.mTime);
             esm.endRecord("LUAT");
             esm.writeHNString("LUAC", timer.mCallbackName);
diff --git a/components/esm/luascripts.hpp b/components/esm/luascripts.hpp
index e6f7113c16..985d756fce 100644
--- a/components/esm/luascripts.hpp
+++ b/components/esm/luascripts.hpp
@@ -51,13 +51,13 @@ namespace ESM
 
     struct LuaTimer
     {
-        enum class TimeUnit : bool
+        enum class Type : bool
         {
-            SECONDS = 0,
-            HOURS = 1,
+            SIMULATION_TIME = 0,
+            GAME_TIME = 1,
         };
 
-        TimeUnit mUnit;
+        Type mType;
         double mTime;
         std::string mCallbackName;
         std::string mCallbackArgument;  // Serialized Lua table. It is a binary data. Can contain '\0'.
diff --git a/components/lua/luastate.cpp b/components/lua/luastate.cpp
index 6ff698c9c2..bfe9cb513c 100644
--- a/components/lua/luastate.cpp
+++ b/components/lua/luastate.cpp
@@ -52,7 +52,7 @@ namespace LuaUtil
     LuaState::LuaState(const VFS::Manager* vfs, const ScriptsConfiguration* conf) : mConf(conf), mVFS(vfs)
     {
         mLua.open_libraries(sol::lib::base, sol::lib::coroutine, sol::lib::math,
-                            sol::lib::string, sol::lib::table, sol::lib::debug);
+                            sol::lib::string, sol::lib::table, sol::lib::os, sol::lib::debug);
 
         mLua["math"]["randomseed"](static_cast<unsigned>(std::time(nullptr)));
         mLua["math"]["randomseed"] = []{};
@@ -85,6 +85,11 @@ namespace LuaUtil
             if (mLua[s] == sol::nil) throw std::logic_error("Lua package not found: " + s);
             mCommonPackages[s] = mSandboxEnv[s] = makeReadOnly(mLua[s]);
         }
+        mCommonPackages["os"] = mSandboxEnv["os"] = makeReadOnly(tableFromPairs<std::string_view, sol::function>({
+            {"date", mLua["os"]["date"]},
+            {"difftime", mLua["os"]["difftime"]},
+            {"time", mLua["os"]["time"]}
+        }));
     }
 
     LuaState::~LuaState()
diff --git a/components/lua/scriptscontainer.cpp b/components/lua/scriptscontainer.cpp
index eb9da7a60b..780d10cebd 100644
--- a/components/lua/scriptscontainer.cpp
+++ b/components/lua/scriptscontainer.cpp
@@ -309,21 +309,21 @@ namespace LuaUtil
     void ScriptsContainer::save(ESM::LuaScripts& data)
     {
         std::map<int, std::vector<ESM::LuaTimer>> timers;
-        auto saveTimerFn = [&](const Timer& timer, TimeUnit timeUnit)
+        auto saveTimerFn = [&](const Timer& timer, TimerType timerType)
         {
             if (!timer.mSerializable)
                 return;
             ESM::LuaTimer savedTimer;
             savedTimer.mTime = timer.mTime;
-            savedTimer.mUnit = timeUnit;
+            savedTimer.mType = timerType;
             savedTimer.mCallbackName = std::get<std::string>(timer.mCallback);
             savedTimer.mCallbackArgument = timer.mSerializedArg;
             timers[timer.mScriptId].push_back(std::move(savedTimer));
         };
-        for (const Timer& timer : mSecondsTimersQueue)
-            saveTimerFn(timer, TimeUnit::SECONDS);
-        for (const Timer& timer : mHoursTimersQueue)
-            saveTimerFn(timer, TimeUnit::HOURS);
+        for (const Timer& timer : mSimulationTimersQueue)
+            saveTimerFn(timer, TimerType::SIMULATION_TIME);
+        for (const Timer& timer : mGameTimersQueue)
+            saveTimerFn(timer, TimerType::GAME_TIME);
         data.mScripts.clear();
         for (auto& [scriptId, script] : mScripts)
         {
@@ -408,17 +408,17 @@ namespace LuaUtil
                     // updates refnums, so timer.mSerializedArg may be not equal to savedTimer.mCallbackArgument.
                     timer.mSerializedArg = serialize(timer.mArg, mSerializer);
 
-                    if (savedTimer.mUnit == TimeUnit::HOURS)
-                        mHoursTimersQueue.push_back(std::move(timer));
+                    if (savedTimer.mType == TimerType::GAME_TIME)
+                        mGameTimersQueue.push_back(std::move(timer));
                     else
-                        mSecondsTimersQueue.push_back(std::move(timer));
+                        mSimulationTimersQueue.push_back(std::move(timer));
                 }
                 catch (std::exception& e) { printError(scriptId, "can not load timer", e); }
             }
         }
 
-        std::make_heap(mSecondsTimersQueue.begin(), mSecondsTimersQueue.end());
-        std::make_heap(mHoursTimersQueue.begin(), mHoursTimersQueue.end());
+        std::make_heap(mSimulationTimersQueue.begin(), mSimulationTimersQueue.end());
+        std::make_heap(mGameTimersQueue.begin(), mGameTimersQueue.end());
     }
 
     ScriptsContainer::~ScriptsContainer()
@@ -437,8 +437,8 @@ namespace LuaUtil
         for (auto& [_, handlers] : mEngineHandlers)
             handlers->mList.clear();
         mEventHandlers.clear();
-        mSecondsTimersQueue.clear();
-        mHoursTimersQueue.clear();
+        mSimulationTimersQueue.clear();
+        mGameTimersQueue.clear();
 
         mPublicInterfaces.clear();
         // Assigned by LuaUtil::makeReadOnly, but `clear` removes it, so we need to assign it again.
@@ -464,7 +464,7 @@ namespace LuaUtil
         std::push_heap(timerQueue.begin(), timerQueue.end());
     }
 
-    void ScriptsContainer::setupSerializableTimer(TimeUnit timeUnit, double time, int scriptId,
+    void ScriptsContainer::setupSerializableTimer(TimerType type, double time, int scriptId,
                                                   std::string_view callbackName, sol::object callbackArg)
     {
         Timer t;
@@ -474,10 +474,10 @@ namespace LuaUtil
         t.mTime = time;
         t.mArg = callbackArg;
         t.mSerializedArg = serialize(t.mArg, mSerializer);
-        insertTimer(timeUnit == TimeUnit::HOURS ? mHoursTimersQueue : mSecondsTimersQueue, std::move(t));
+        insertTimer(type == TimerType::GAME_TIME ? mGameTimersQueue : mSimulationTimersQueue, std::move(t));
     }
 
-    void ScriptsContainer::setupUnsavableTimer(TimeUnit timeUnit, double time, int scriptId, sol::function callback)
+    void ScriptsContainer::setupUnsavableTimer(TimerType type, double time, int scriptId, sol::function callback)
     {
         Timer t;
         t.mScriptId = scriptId;
@@ -488,7 +488,7 @@ namespace LuaUtil
         getScript(t.mScriptId).mTemporaryCallbacks.emplace(mTemporaryCallbackCounter, std::move(callback));
         mTemporaryCallbackCounter++;
 
-        insertTimer(timeUnit == TimeUnit::HOURS ? mHoursTimersQueue : mSecondsTimersQueue, std::move(t));
+        insertTimer(type == TimerType::GAME_TIME ? mGameTimersQueue : mSimulationTimersQueue, std::move(t));
     }
 
     void ScriptsContainer::callTimer(const Timer& t)
@@ -524,10 +524,10 @@ namespace LuaUtil
         }
     }
 
-    void ScriptsContainer::processTimers(double gameSeconds, double gameHours)
+    void ScriptsContainer::processTimers(double simulationTime, double gameTime)
     {
-        updateTimerQueue(mSecondsTimersQueue, gameSeconds);
-        updateTimerQueue(mHoursTimersQueue, gameHours);
+        updateTimerQueue(mSimulationTimersQueue, simulationTime);
+        updateTimerQueue(mGameTimersQueue, gameTime);
     }
 
 }
diff --git a/components/lua/scriptscontainer.hpp b/components/lua/scriptscontainer.hpp
index 1863d04669..fcbd2ba0b7 100644
--- a/components/lua/scriptscontainer.hpp
+++ b/components/lua/scriptscontainer.hpp
@@ -73,7 +73,7 @@ namespace LuaUtil
             ScriptsContainer* mContainer;
             int mIndex;  // index in LuaUtil::ScriptsConfiguration
         };
-        using TimeUnit = ESM::LuaTimer::TimeUnit;
+        using TimerType = ESM::LuaTimer::Type;
 
         // `namePrefix` is a common prefix for all scripts in the container. Used in logs for error messages and `print` output.
         // `autoStartMode` specifies the list of scripts that should be autostarted in this container; the list itself is
@@ -99,8 +99,7 @@ namespace LuaUtil
         bool hasScript(int scriptId) const { return mScripts.count(scriptId) != 0; }
         void removeScript(int scriptId);
 
-        // Processes timers. gameSeconds and gameHours are time (in seconds and in game hours) passed from the game start.
-        void processTimers(double gameSeconds, double gameHours);
+        void processTimers(double simulationTime, double gameTime);
 
         // Calls `onUpdate` (if present) for every script in the container.
         // Handlers are called in the same order as scripts were added.
@@ -134,17 +133,17 @@ namespace LuaUtil
         void registerTimerCallback(int scriptId, std::string_view callbackName, sol::function callback);
 
         // Sets up a timer, that can be automatically saved and loaded.
-        //   timeUnit - game seconds (TimeUnit::Seconds) or game hours (TimeUnit::Hours).
+        //   type - the type of timer, either SIMULATION_TIME or GAME_TIME.
         //   time - the absolute game time (in seconds or in hours) when the timer should be executed.
         //   scriptPath - script path in VFS is used as script id. The script with the given path should already present in the container.
         //   callbackName - callback (should be registered in advance) for this timer.
         //   callbackArg - parameter for the callback (should be serializable).
-        void setupSerializableTimer(TimeUnit timeUnit, double time, int scriptId,
+        void setupSerializableTimer(TimerType type, double time, int scriptId,
                                     std::string_view callbackName, sol::object callbackArg);
 
-        // Creates a timer. `callback` is an arbitrary Lua function. This type of timers is called "unsavable"
-        // because it can not be stored in saves. I.e. loading a saved game will not fully restore the state.
-        void setupUnsavableTimer(TimeUnit timeUnit, double time, int scriptId, sol::function callback);
+        // Creates a timer. `callback` is an arbitrary Lua function. These timers are called "unsavable"
+        // because they can not be stored in saves. I.e. loading a saved game will not fully restore the state.
+        void setupUnsavableTimer(TimerType type, double time, int scriptId, sol::function callback);
 
     protected:
         struct Handler
@@ -237,8 +236,8 @@ namespace LuaUtil
         std::map<std::string_view, EngineHandlerList*> mEngineHandlers;
         std::map<std::string, EventHandlerList, std::less<>> mEventHandlers;
 
-        std::vector<Timer> mSecondsTimersQueue;
-        std::vector<Timer> mHoursTimersQueue;
+        std::vector<Timer> mSimulationTimersQueue;
+        std::vector<Timer> mGameTimersQueue;
         int64_t mTemporaryCallbackCounter = 0;
     };
 
diff --git a/docs/source/reference/lua-scripting/api.rst b/docs/source/reference/lua-scripting/api.rst
index dd9d151482..635fcfb95e 100644
--- a/docs/source/reference/lua-scripting/api.rst
+++ b/docs/source/reference/lua-scripting/api.rst
@@ -19,6 +19,7 @@ Lua API reference
     openmw_ui
     openmw_camera
     openmw_aux_util
+    openmw_aux_time
     interface_camera
 
 
@@ -75,6 +76,8 @@ Sources can be found in ``resources/vfs/openmw_aux``. In theory mods can overrid
 +=========================================================+====================+===============================================================+
 |:ref:`openmw_aux.util <Package openmw_aux.util>`         | everywhere         | | Miscellaneous utils                                         |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw_aux.time <Package openmw_aux.time>`         | everywhere         | | Timers and game time utils                                  |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 
 **Interfaces of built-in scripts**
 
diff --git a/docs/source/reference/lua-scripting/openmw_aux_time.rst b/docs/source/reference/lua-scripting/openmw_aux_time.rst
new file mode 100644
index 0000000000..120d888a01
--- /dev/null
+++ b/docs/source/reference/lua-scripting/openmw_aux_time.rst
@@ -0,0 +1,5 @@
+Package openmw_aux.time
+=======================
+
+.. raw:: html
+   :file: generated_html/openmw_aux_time.html
diff --git a/docs/source/reference/lua-scripting/overview.rst b/docs/source/reference/lua-scripting/overview.rst
index 938611635a..103a93c559 100644
--- a/docs/source/reference/lua-scripting/overview.rst
+++ b/docs/source/reference/lua-scripting/overview.rst
@@ -15,10 +15,11 @@ Here are starting points for learning Lua:
 Each script works in a separate sandbox and doesn't have any access to the underlying operating system.
 Only a limited list of allowed standard libraries can be used:
 `coroutine <https://www.lua.org/manual/5.1/manual.html#5.2>`__,
-`math <https://www.lua.org/manual/5.1/manual.html#5.6>`__,
+`math <https://www.lua.org/manual/5.1/manual.html#5.6>`__ (except `math.randomseed` -- it is called by the engine on startup and not available from scripts),
 `string <https://www.lua.org/manual/5.1/manual.html#5.4>`__,
-`table <https://www.lua.org/manual/5.1/manual.html#5.5>`__.
-These libraries are loaded automatically and are always available (except the function `math.randomseed` -- it is called by the engine on startup and not available from scripts).
+`table <https://www.lua.org/manual/5.1/manual.html#5.5>`__,
+`os <https://www.lua.org/manual/5.1/manual.html#5.8>`__ (only `os.date`, `os.difftime`, `os.time`).
+These libraries are loaded automatically and are always available.
 
 Allowed `basic functions <https://www.lua.org/manual/5.1/manual.html#5.1>`__:
 ``assert``, ``error``, ``ipairs``, ``next``, ``pairs``, ``pcall``, ``print``, ``select``, ``tonumber``, ``tostring``, ``type``, ``unpack``, ``xpcall``, ``rawequal``, ``rawget``, ``rawset``, ``getmetatable``, ``setmetatable``.
@@ -366,6 +367,8 @@ Sources can be found in ``resources/vfs/openmw_aux``. In theory mods can overrid
 +=========================================================+====================+===============================================================+
 |:ref:`openmw_aux.util <Package openmw_aux.util>`         | everywhere         | | Miscellaneous utils                                         |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw_aux.time <Package openmw_aux.time>`         | everywhere         | | Timers and game time utils                                  |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 
 They can be loaded with ``require`` the same as API packages. For example:
 
diff --git a/files/builtin_scripts/openmw_aux/time.lua b/files/builtin_scripts/openmw_aux/time.lua
new file mode 100644
index 0000000000..a6aac0fa1a
--- /dev/null
+++ b/files/builtin_scripts/openmw_aux/time.lua
@@ -0,0 +1,104 @@
+---
+-- `openmw_aux.time` defines utility functions for timers.
+-- Implementation can be found in `resources/vfs/openmw_aux/time.lua`.
+-- @module time
+-- @usage local time = require('openmw_aux.time')
+
+local time = {
+    second = 1,
+    minute = 60,
+    hour = 3600,
+    day = 3600 * 24,
+    GameTime = 'GameTime',
+    SimulationTime = 'SimulationTime',
+}
+
+---
+-- Alias of async:registerTimerCallback ; register a function as a timer callback.
+-- @function [parent=#time] registerTimerCallback
+-- @param #string name
+-- @param #function func
+-- @return openmw.async#TimerCallback
+function time.registerTimerCallback(name, fn)
+    local async = require('openmw.async')
+    return async:registerTimerCallback(name, fn)
+end
+
+---
+-- Alias of async:newSimulationTimer ; call callback(arg) in `delay` game seconds.
+-- Callback must be registered in advance.
+-- @function [parent=#time] newGameTimer
+-- @param #number delay
+-- @param openmw.async#TimerCallback callback A callback returned by `registerTimerCallback`
+-- @param arg An argument for `callback`; can be `nil`.
+function time.newGameTimer(delay, callback, callbackArg)
+    local async = require('openmw.async')
+    return async:newGameTimer(delay, callback, callbackArg)
+end
+
+---
+-- Alias of async:newSimulationTimer ; call callback(arg) in `delay` simulation seconds.
+-- Callback must be registered in advance.
+-- @function [parent=#time] newSimulationTimer
+-- @param #number delay
+-- @param openmw.async#TimerCallback callback A callback returned by `registerTimerCallback`
+-- @param arg An argument for `callback`; can be `nil`.
+function time.newSimulationTimer(delay, callback, callbackArg)
+    local async = require('openmw.async')
+    return async:newSimulationTimer(delay, callback, callbackArg)
+end
+
+---
+-- Run given function repeatedly.
+-- Note that loading a save stops the evaluation. If it should work always, call it during initialization of the script (i.e. not in a handler)
+-- @function [parent=#time] runRepeatedly
+-- @param #function fn the function that should be called
+-- @param #number period interval
+-- @param #table options additional options `initialDelay` and `type`.
+-- `initialDelay` - delay before the first call. If missed then the delay is a random number in range [0, N]. Randomization is used for performance reasons -- to prevent all scripts from doing time consuming operations at the same time.
+-- `type` - either `time.SimulationTime` (by default, timer uses simulation time) or `time.GameTime` (timer uses game time).
+-- @return #function a function without arguments that can be used to stop the periodical evaluation.
+-- @usage
+-- local stopFn = time.runRepeatedly(function() print('Test') end,
+--                                   5 * time.second)  -- print 'Test' every 5 seconds
+-- stopFn()  -- stop printing 'Test'
+-- time.runRepeatedly(  -- print 'Test' every 5 minutes with initial 30 second delay
+--     function() print('Test2') end, 5 * time.minute,
+--     { initialDelay = 30 * time.second })
+-- @usage
+-- local timeBeforeMidnight = time.day - time.gameTime() % time.day
+-- time.runRepeatedly(doSomething, time.day, {
+--     initialDelay = timeBeforeMidnight,
+--     type = time.GameTime,
+-- })  -- call `doSomething` at the end of every game day.
+function time.runRepeatedly(fn, period, options)
+    if period <= 0 then
+        error('Period must be positive. If you want it to be as small '..
+              'as possible, use the engine handler `onUpdate` instead', 2)
+    end
+    local async = require('openmw.async')
+    local core = require('openmw.core')
+    local initialDelay = (options and options.initialDelay) or math.random() * period
+    local getTimeFn, newTimerFn
+    if (options and options.type) == time.GameTime then
+        getTimeFn = core.getGameTime
+        newTimerFn = async.newUnsavableGameTimer
+    else
+        getTimeFn = core.getSimulationTime
+        newTimerFn = async.newUnsavableSimulationTimer
+    end
+    local baseTime = getTimeFn() + initialDelay
+    local breakFlag = false
+    local wrappedFn
+    wrappedFn = function()
+        if breakFlag then return end
+        fn()
+        local nextDelay = 1.5 * period - math.fmod(getTimeFn() - baseTime + period / 2, period)
+        newTimerFn(async, nextDelay, wrappedFn)
+    end
+    newTimerFn(async, initialDelay, wrappedFn)
+    return function() breakFlag = true end
+end
+
+return time
+
diff --git a/files/builtin_scripts/openmw_aux/util.lua b/files/builtin_scripts/openmw_aux/util.lua
index ba52ced2bd..8d4f7c1fd7 100644
--- a/files/builtin_scripts/openmw_aux/util.lua
+++ b/files/builtin_scripts/openmw_aux/util.lua
@@ -28,72 +28,5 @@ function aux_util.findNearestTo(point, objectList)
     return res, resDist
 end
 
--------------------------------------------------------------------------------
--- Runs given function every N game seconds (seconds when the game is not paused).
--- Note that loading a save stops the evaluation. If it should work always, call it in 2 places --
--- when a script starts and in the engine handler `onLoad`.
--- @function [parent=#util] runEveryNSeconds
--- @param #number N interval in seconds
--- @param #function fn the function that should be called every N seconds
--- @param #number initialDelay optional argument -- delay in seconds before the first call. If missed then the delay is a random number in range [0, N]. Randomization is used for performance reasons -- to prevent all scripts from doing time consuming operations at the same time.
--- @return #function a function without arguments that can be used to stop the periodical evaluation.
--- @usage
--- local stopFn = aux_util.runEveryNSeconds(5, function() print('Test') end)  -- print 'Test' every 5 seconds
--- stopFn()  -- stop printing 'Test'
--- aux_util.runEveryNSeconds(5, function() print('Test2') end, 1)  -- print 'Test' every 5 seconds starting from the next second
-function aux_util.runEveryNSeconds(N, fn, initialDelay)
-    if N <= 0 then
-        error('Interval must be positive. If you want it to be as small '..
-              'as possible, use the engine handler `onUpdate` instead', 2)
-    end
-    local async = require('openmw.async')
-    local core = require('openmw.core')
-    local breakFlag = false
-    local initialDelay = initialDelay or math.random() * N
-    local baseTime = core.getGameTimeInSeconds() + initialDelay
-    local wrappedFn
-    wrappedFn = function()
-        if breakFlag then return end
-        fn()
-        local nextDelay = 1.5 * N - math.fmod(core.getGameTimeInSeconds() - baseTime + N / 2, N)
-        async:newUnsavableTimerInSeconds(nextDelay, wrappedFn)
-    end
-    async:newUnsavableTimerInSeconds(initialDelay, wrappedFn)
-    return function() breakFlag = true end
-end
-
--------------------------------------------------------------------------------
--- Runs given function every N game hours.
--- Note that loading a save stops the evaluation. If it should work always, call it in 2 places --
--- when a script starts and in the engine handler `onLoad`.
--- @function [parent=#util] runEveryNHours
--- @param #number N interval in game hours
--- @param #function fn the function that should be called every N game hours
--- @param #number initialDelay optional argument -- delay in game hours before the first call. If missed then the delay is a random number in range [0, N]. Randomization is used for performance reasons -- to prevent all scripts from doing time consuming operations at the same time.
--- @return #function a function without arguments that can be used to stop the periodical evaluation.
--- @usage
--- local timeBeforeMidnight = 24 - math.fmod(core.getGameTimeInHours(), 24)
--- aux_util.runEveryNHours(24, doSomething, timeBeforeMidnight)  -- call `doSomething` at the end of every game day.
-function aux_util.runEveryNHours(N, fn, initialDelay)
-    if N <= 0 then
-        error('Interval must be positive. If you want it to be as small '..
-              'as possible, use the engine handler `onUpdate` instead', 2)
-    end
-    local async = require('openmw.async')
-    local core = require('openmw.core')
-    local breakFlag = false
-    local initialDelay = initialDelay or math.random() * N
-    local baseTime = core.getGameTimeInHours() + initialDelay
-    local wrappedFn
-    wrappedFn = function()
-        if breakFlag then return end
-        fn()
-        local nextDelay = 1.5 * N - math.fmod(core.getGameTimeInHours() - baseTime + N / 2, N)
-        async:newUnsavableTimerInHours(nextDelay, wrappedFn)
-    end
-    async:newUnsavableTimerInHours(initialDelay, wrappedFn)
-    return function() breakFlag = true end
-end
-
 return aux_util
 
diff --git a/files/lua_api/openmw/async.lua b/files/lua_api/openmw/async.lua
index cc3a233f8a..61d5763a0b 100644
--- a/files/lua_api/openmw/async.lua
+++ b/files/lua_api/openmw/async.lua
@@ -15,35 +15,35 @@
 -- @return #TimerCallback
 
 -------------------------------------------------------------------------------
--- Calls callback(arg) in `delay` seconds.
+-- Calls callback(arg) in `delay` simulation seconds.
 -- Callback must be registered in advance.
--- @function [parent=#async] newTimerInSeconds
+-- @function [parent=#async] newSimulationTimer
 -- @param self
 -- @param #number delay
 -- @param #TimerCallback callback A callback returned by `registerTimerCallback`
 -- @param arg An argument for `callback`; can be `nil`.
 
 -------------------------------------------------------------------------------
--- Calls callback(arg) in `delay` game hours.
+-- Calls callback(arg) in `delay` game seconds.
 -- Callback must be registered in advance.
--- @function [parent=#async] newTimerInHours
+-- @function [parent=#async] newGameTimer
 -- @param self
 -- @param #number delay
 -- @param #TimerCallback callback A callback returned by `registerTimerCallback`
 -- @param arg An argument for `callback`; can be `nil`.
 
 -------------------------------------------------------------------------------
--- Calls `func()` in `delay` seconds.
+-- Calls `func()` in `delay` simulation seconds.
 -- The timer will be lost if the game is saved and loaded.
--- @function [parent=#async] newUnsavableTimerInSeconds
+-- @function [parent=#async] newUnsavableSimulationTimer
 -- @param self
 -- @param #number delay
 -- @param #function func
 
 -------------------------------------------------------------------------------
--- Calls `func()` in `delay` game hours.
+-- Calls `func()` in `delay` game seconds.
 -- The timer will be lost if the game is saved and loaded.
--- @function [parent=#async] newUnsavableTimerInHours
+-- @function [parent=#async] newUnsavableGameTimer
 -- @param self
 -- @param #number delay
 -- @param #function func
diff --git a/files/lua_api/openmw/core.lua b/files/lua_api/openmw/core.lua
index 016267d39d..d18be52406 100644
--- a/files/lua_api/openmw/core.lua
+++ b/files/lua_api/openmw/core.lua
@@ -20,16 +20,25 @@
 -- @param #string eventName
 -- @param eventData
 
+-------------------------------------------------------------------------------
+-- Simulation time in seconds.
+-- The number of simulation seconds passed in the game world since starting a new game.
+-- @function [parent=#core] getSimulationTime
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- The scale of simulation time relative to real time.
+-- @function [parent=#core] getSimulationTimeScale
+-- @return #number
+
 -------------------------------------------------------------------------------
 -- Game time in seconds.
--- The number of seconds passed in the game world since starting a new game.
--- @function [parent=#core] getGameTimeInSeconds
+-- @function [parent=#core] getGameTime
 -- @return #number
 
 -------------------------------------------------------------------------------
--- Current time of the game world in hours.
--- Note that the number of game seconds in a game hour is not guaranteed to be fixed.
--- @function [parent=#core] getGameTimeInHours
+-- The scale of game time relative to simulation time.
+-- @function [parent=#core] getGameTimeScale
 -- @return #number
 
 -------------------------------------------------------------------------------
diff --git a/files/lua_api/openmw/world.lua b/files/lua_api/openmw/world.lua
index 90ea23b4f5..690f0bd566 100644
--- a/files/lua_api/openmw/world.lua
+++ b/files/lua_api/openmw/world.lua
@@ -29,6 +29,36 @@
 -- @param #number gridY
 -- @return openmw.core#Cell
 
+-------------------------------------------------------------------------------
+-- Simulation time in seconds.
+-- The number of simulation seconds passed in the game world since starting a new game.
+-- @function [parent=#core] getSimulationTime
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- The scale of simulation time relative to real time.
+-- @function [parent=#core] getSimulationTimeScale
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Game time in seconds.
+-- @function [parent=#core] getGameTime
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- The scale of game time relative to simulation time.
+-- @function [parent=#core] getGameTimeScale
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Set the ratio of game time speed to simulation time speed.
+-- @function [parent=#world] setGameTimeScale
+-- @param #number ratio
+
+-------------------------------------------------------------------------------
+-- Whether the world is paused (onUpdate doesn't work when the world is paused).
+-- @function [parent=#world] isWorldPaused
+-- @return #boolean
 
 return nil
 
diff --git a/files/lua_api/os.doclua b/files/lua_api/os.doclua
new file mode 100644
index 0000000000..127ccd049a
--- /dev/null
+++ b/files/lua_api/os.doclua
@@ -0,0 +1,64 @@
+-------------------------------------------------------------------------------
+-- Operating System Facilities.
+-- This library is implemented through table os. 
+-- @module os
+
+
+-------------------------------------------------------------------------------
+-- Returns a string or a table containing date and time, formatted according
+-- to the given string `format`.
+--
+-- If the `time` argument is present, this is the time to be formatted
+-- (see the `os.time` function for a description of this value). Otherwise,
+-- `date` formats the current time.
+--
+-- If `format` starts with '`!`', then the date is formatted in Coordinated
+-- Universal Time. After this optional character, if `format` is the string
+-- "`*t`", then `date` returns a table with the following fields:
+--
+--   * `year` (four digits)
+--   * `month` (1--12)
+--   * `day` (1--31)
+--   * `hour` (0--23)
+--   * `min` (0--59)
+--   * `sec` (0--61)
+--   * `wday` (weekday, Sunday is 1)
+--   * `yday` (day of the year)
+--   * `isdst` (daylight saving flag, a boolean).
+--
+-- If `format` is not "`*t`", then `date` returns the date as a string,
+-- formatted according to the same rules as the C function `strftime`.
+-- When called without arguments, `date` returns a reasonable date and time
+-- representation that depends on the host system and on the current locale
+-- (that is, `os.date()` is equivalent to `os.date("%c")`).
+-- @function [parent=#os] date
+-- @param #string format format of date. (optional)
+-- @param #number time time to format. (default value is current time) 
+-- @return #string a formatted string representation of `time`. 
+
+-------------------------------------------------------------------------------
+-- Returns the number of seconds from time `t1` to time `t2`. In POSIX,
+-- Windows, and some other systems, this value is exactly `t2`*-*`t1`.
+-- @function [parent=#os] difftime
+-- @param #number t2
+-- @param #number t1 
+-- @return #number the number of seconds from time `t1` to time `t2`.
+
+-------------------------------------------------------------------------------
+-- Returns the current time when called without arguments, or a time
+-- representing the date and time specified by the given table. This table
+-- must have fields `year`, `month`, and `day`, and may have fields `hour`,
+-- `min`, `sec`, and `isdst` (for a description of these fields, see the
+-- `os.date` function).
+-- 
+-- The returned value is a number, whose meaning depends on your system. In
+-- POSIX, Windows, and some other systems, this number counts the number
+-- of seconds since some given start time (the "epoch"). In other systems,
+-- the meaning is not specified, and the number returned by `time` can be
+-- used only as an argument to `date` and `difftime`.
+-- @function [parent=#os] time
+-- @param #table table a table which describes a date.
+-- @return #number a number meaning a date.
+
+return nil
+

From 9fd7630ca056ea122184d395482210b52832d610 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Mon, 10 Jan 2022 21:04:07 +0100
Subject: [PATCH 1943/2859] Add calendar.lua

---
 docs/source/reference/lua-scripting/api.rst   |   3 +
 .../lua-scripting/openmw_aux_calendar.rst     |   5 +
 .../reference/lua-scripting/overview.rst      |   6 +-
 files/builtin_scripts/CMakeLists.txt          |   8 +-
 files/builtin_scripts/i18n/Calendar/en.lua    |  42 +++++
 files/builtin_scripts/openmw_aux/calendar.lua | 159 ++++++++++++++++++
 files/builtin_scripts/scripts/omw/camera.lua  |   6 +-
 7 files changed, 224 insertions(+), 5 deletions(-)
 create mode 100644 docs/source/reference/lua-scripting/openmw_aux_calendar.rst
 create mode 100644 files/builtin_scripts/i18n/Calendar/en.lua
 create mode 100644 files/builtin_scripts/openmw_aux/calendar.lua

diff --git a/docs/source/reference/lua-scripting/api.rst b/docs/source/reference/lua-scripting/api.rst
index 635fcfb95e..d6e85389b8 100644
--- a/docs/source/reference/lua-scripting/api.rst
+++ b/docs/source/reference/lua-scripting/api.rst
@@ -18,6 +18,7 @@ Lua API reference
     openmw_input
     openmw_ui
     openmw_camera
+    openmw_aux_calendar
     openmw_aux_util
     openmw_aux_time
     interface_camera
@@ -74,6 +75,8 @@ Sources can be found in ``resources/vfs/openmw_aux``. In theory mods can overrid
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 | Built-in library                                        | Can be used        | Description                                                   |
 +=========================================================+====================+===============================================================+
+|:ref:`openmw_aux.calendar <Package openmw_aux.calendar>` | everywhere         | | Game time calendar                                          |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw_aux.util <Package openmw_aux.util>`         | everywhere         | | Miscellaneous utils                                         |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw_aux.time <Package openmw_aux.time>`         | everywhere         | | Timers and game time utils                                  |
diff --git a/docs/source/reference/lua-scripting/openmw_aux_calendar.rst b/docs/source/reference/lua-scripting/openmw_aux_calendar.rst
new file mode 100644
index 0000000000..ea60b62852
--- /dev/null
+++ b/docs/source/reference/lua-scripting/openmw_aux_calendar.rst
@@ -0,0 +1,5 @@
+Package openmw_aux.calendar
+===========================
+
+.. raw:: html
+   :file: generated_html/openmw_aux_calendar.html
diff --git a/docs/source/reference/lua-scripting/overview.rst b/docs/source/reference/lua-scripting/overview.rst
index 103a93c559..eab3fc962a 100644
--- a/docs/source/reference/lua-scripting/overview.rst
+++ b/docs/source/reference/lua-scripting/overview.rst
@@ -365,6 +365,8 @@ Sources can be found in ``resources/vfs/openmw_aux``. In theory mods can overrid
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 | Built-in library                                        | Can be used        | Description                                                   |
 +=========================================================+====================+===============================================================+
+|:ref:`openmw_aux.calendar <Package openmw_aux.calendar>` | everywhere         | | Game time calendar                                          |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw_aux.util <Package openmw_aux.util>`         | everywhere         | | Miscellaneous utils                                         |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw_aux.time <Package openmw_aux.time>`         | everywhere         | | Timers and game time utils                                  |
@@ -374,8 +376,8 @@ They can be loaded with ``require`` the same as API packages. For example:
 
 .. code-block:: Lua
 
-    local aux_util = require('openmw_aux.util')
-    aux_util.runEveryNSeconds(15, doSomething)  -- run `doSomething()` every 15 seconds
+    local time = require('openmw_aux.time')
+    time.runRepeatedly(doSomething, 15 * time.second)  -- run `doSomething()` every 15 seconds
 
 
 Script interfaces
diff --git a/files/builtin_scripts/CMakeLists.txt b/files/builtin_scripts/CMakeLists.txt
index 6f290cc1f7..1ef67a2e15 100644
--- a/files/builtin_scripts/CMakeLists.txt
+++ b/files/builtin_scripts/CMakeLists.txt
@@ -7,8 +7,14 @@ set(SDIR ${CMAKE_CURRENT_SOURCE_DIR})
 set(DDIRRELATIVE resources/vfs)
 copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_ROOT} ${DDIRRELATIVE} "builtin.omwscripts")
 
+set(LUA_AUX_FILES
+    openmw_aux/util.lua
+    openmw_aux/time.lua
+    openmw_aux/calendar.lua
+)
+
 set(DDIRRELATIVE resources/vfs/openmw_aux)
-copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_ROOT} ${DDIRRELATIVE} "openmw_aux/util.lua")
+copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_ROOT} ${DDIRRELATIVE} "${LUA_AUX_FILES}")
 
 set(LUA_SCRIPTS_FILES
     scripts/omw/camera.lua
diff --git a/files/builtin_scripts/i18n/Calendar/en.lua b/files/builtin_scripts/i18n/Calendar/en.lua
new file mode 100644
index 0000000000..a4e8183a92
--- /dev/null
+++ b/files/builtin_scripts/i18n/Calendar/en.lua
@@ -0,0 +1,42 @@
+-- source: https://en.uesp.net/wiki/Lore:Calendar
+
+return {
+    month1 = "Morning Star",
+    month2 = "Sun's Dawn",
+    month3 = "First Seed",
+    month4 = "Rain's Hand",
+    month5 = "Second Seed",
+    month6 = "Midyear",
+    month7 = "Sun's Height",
+    month8 = "Last Seed",
+    month9 = "Hearthfire",
+    month10 = "Frostfall",
+    month11 = "Sun's Dusk",
+    month12 = "Evening Star",
+
+    -- The variant of month names in the context "day X of month Y".
+    -- In English it is the same, but some languages require a different form.
+    monthInGenitive1 = "Morning Star",
+    monthInGenitive2 = "Sun's Dawn",
+    monthInGenitive3 = "First Seed",
+    monthInGenitive4 = "Rain's Hand",
+    monthInGenitive5 = "Second Seed",
+    monthInGenitive6 = "Midyear",
+    monthInGenitive7 = "Sun's Height",
+    monthInGenitive8 = "Last Seed",
+    monthInGenitive9 = "Hearthfire",
+    monthInGenitive10 = "Frostfall",
+    monthInGenitive11 = "Sun's Dusk",
+    monthInGenitive12 = "Evening Star",
+
+    dateFormat = "day %{day} of %{monthInGenitive} %{year}",
+
+    weekday1 = "Sundas",
+    weekday2 = "Morndas",
+    weekday3 = "Tirdas",
+    weekday4 = "Middas",
+    weekday5 = "Turdas",
+    weekday6 = "Fredas",
+    weekday7 = "Loredas",
+}
+
diff --git a/files/builtin_scripts/openmw_aux/calendar.lua b/files/builtin_scripts/openmw_aux/calendar.lua
new file mode 100644
index 0000000000..58e7298f1d
--- /dev/null
+++ b/files/builtin_scripts/openmw_aux/calendar.lua
@@ -0,0 +1,159 @@
+---
+-- `openmw_aux.calendar` defines utility functions for formatting game time.
+-- Implementation can be found in `resources/vfs/openmw_aux/calendar.lua`.
+-- @module calendar
+-- @usage local calendar = require('openmw_aux.calendar')
+
+local core = require('openmw.core')
+local time = require('openmw_aux.time')
+local i18n = core.i18n('Calendar')
+
+local monthsDuration = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}
+local daysInWeek = 7
+local daysInYear = 0
+for _, d in ipairs(monthsDuration) do daysInYear = daysInYear + d end
+
+local startingYear = 427
+local startingYearDay = 227
+local startingWeekDay = 1
+
+local function gameTime(t)
+    if not t then
+        return core.getGameTime()
+    else
+        local days = (t.year or 0) * daysInYear + (t.day or 0)
+        for i = 1, (t.month or 1)-1 do
+            days = days + monthsDuration[i]
+        end
+        return days * time.day + (t.hour or 0) * time.hour +
+               (t.min or 0) * time.minute + (t.sec or 0) * time.second
+    end
+end
+
+local function defaultDateFormat(t)
+    return i18n('dateFormat', {
+        day = t.day,
+        month = i18n('month' .. t.month),
+        monthInGenitive = i18n('monthInGenitive' .. t.month),
+        year = t.year,
+    })
+end
+
+local function formatGameTime(formatStr, timestamp)
+    timestamp = timestamp or core.getGameTime()
+
+    local t = {}
+    local day = math.floor(timestamp / time.day)
+    t.year = math.floor(day / daysInYear) + startingYear
+    t.yday = (day + startingYearDay - 1) % daysInYear + 1
+    t.wday = (day + startingWeekDay - 1) % daysInWeek + 1
+    timestamp = timestamp % time.day
+    t.hour = math.floor(timestamp / time.hour)
+    timestamp = timestamp % time.hour
+    t.min = math.floor(timestamp / time.minute)
+    t.sec = math.floor(timestamp) % time.minute
+
+    t.day = t.yday
+    t.month = 1
+    while t.day > monthsDuration[t.month] do
+        t.day = t.day - monthsDuration[t.month]
+        t.month = t.month + 1
+    end
+
+    if formatStr == '*t' then return t end
+
+    local replFn = function(tag)
+        if tag == '%a' or tag == '%A' then return i18n('weekday' .. t.wday) end
+        if tag == '%b' or tag == '%B' then return i18n('monthInGenitive' .. t.month) end
+        if tag == '%c' then
+            return string.format('%02d:%02d %s', t.hour, t.min, defaultDateFormat(t))
+        end
+        if tag == '%d' then return string.format('%02d', t.day) end
+        if tag == '%e' then return string.format('%2d', t.day) end
+        if tag == '%H' then return string.format('%02d', t.hour) end
+        if tag == '%I' then return string.format('%02d', (t.hour - 1) % 12 + 1) end
+        if tag == '%M' then return string.format('%02d', t.min) end
+        if tag == '%m' then return string.format('%02d', t.month) end
+        if tag == '%p' then
+            if t.hour > 0 and t.hour <= 12 then
+                return 'am'
+            else
+                return 'pm'
+            end
+        end
+        if tag == '%S' then return string.format('%02d', t.sec) end
+        if tag == '%w' then return t.wday - 1 end
+        if tag == '%x' then return defaultDateFormat(t) end
+        if tag == '%X' then return string.format('%02d:%02d', t.hour, t.min) end
+        if tag == '%Y' then return t.year end
+        if tag == '%y' then return string.format('%02d', t.year % 100) end
+        if tag == '%%' then return '%' end
+        error('Unknown tag "'..tag..'"')
+    end
+
+    res, _ = string.gsub(formatStr or '%c', '%%.', replFn)
+    return res
+end
+
+return {
+    --- An equivalent of `os.time` for game time.
+    -- See [https://www.lua.org/pil/22.1.html](https://www.lua.org/pil/22.1.html)
+    -- @function [parent=#calendar] gameTime
+    -- @param #table table a table which describes a date (optional).
+    -- @return #number a timestamp.
+    gameTime = gameTime,
+
+    --- An equivalent of `os.date` for game time.
+    -- See [https://www.lua.org/pil/22.1.html](https://www.lua.org/pil/22.1.html).
+    -- It is a slow function. Please try not to use it in every frame.
+    -- @function [parent=#calendar] formatGameTime
+    -- @param #string format format of date (optional)
+    -- @param #number time time to format (default value is current time)
+    -- @return #string a formatted string representation of `time`.
+    formatGameTime = formatGameTime,
+
+    --- The number of months in a year
+    -- @field [parent=#calendar] #number monthCount
+    monthCount = #monthsDuration,
+
+    --- The number of days in a year
+    -- @field [parent=#calendar] #number daysInYear
+    daysInYear = daysInYear,
+
+    --- The number of days in a week
+    -- @field [parent=#calendar] #number daysInWeek
+    daysInWeek = daysInWeek,
+
+    --- The number of days in a month
+    -- @function [parent=#calendar] daysInMonth
+    -- @param monthIndex
+    -- @return #number
+    daysInMonth = function(m)
+        return monthsDuration[(m-1) % #monthsDuration + 1]
+    end,
+
+    --- The name of a month
+    -- @function [parent=#calendar] monthName
+    -- @param monthIndex
+    -- @return #string
+    monthName = function(m)
+        return i18n('month' .. ((m-1) % #monthsDuration + 1))
+    end,
+
+    --- The name of a month in genitive (for English is the same as `monthName`, but in some languages the form can differ).
+    -- @function [parent=#calendar] monthNameInGenitive
+    -- @param monthIndex
+    -- @return #string
+    monthNameInGenitive = function(m)
+        return i18n('monthInGenitive' .. ((m-1) % #monthsDuration + 1))
+    end,
+
+    --- The name of a weekday
+    -- @function [parent=#calendar] weekdayName
+    -- @param dayIndex
+    -- @return #string
+    weekdayName = function(d)
+        return i18n('weekday' .. ((d-1) % daysInWeek + 1))
+    end,
+}
+
diff --git a/files/builtin_scripts/scripts/omw/camera.lua b/files/builtin_scripts/scripts/omw/camera.lua
index 4025f7eee4..cd4d0dccfb 100644
--- a/files/builtin_scripts/scripts/omw/camera.lua
+++ b/files/builtin_scripts/scripts/omw/camera.lua
@@ -175,10 +175,12 @@ return {
     --- @module Camera
     -- @usage require('openmw.interfaces').Camera
     interface = {
-        --- @field [parent=#Camera] #number version Interface version
+        --- Interface version
+        -- @field [parent=#Camera] #number version
         version = 0,
 
-        --- @function [parent=#Camera] getPrimaryMode Returns primary mode (MODE.FirstPerson or MODE.ThirdPerson).
+        --- Return primary mode (MODE.FirstPerson or MODE.ThirdPerson).
+        -- @function [parent=#Camera] getPrimaryMode
         getPrimaryMode = function() return primaryMode end,
         --- @function [parent=#Camera] getBaseThirdPersonDistance
         getBaseThirdPersonDistance = function() return third_person.baseDistance end,

From 8ec0a52605ac0dad211aeb0900cf6bd685fb8d39 Mon Sep 17 00:00:00 2001
From: Cody Glassman <glassmancody.info@gmail.com>
Date: Tue, 11 Jan 2022 09:34:19 +0000
Subject: [PATCH 1944/2859] Toggable day night switch (#5928)

---
 CHANGELOG.md                                  |  1 +
 apps/launcher/advancedpage.cpp                |  4 +++
 apps/opencs/model/prefs/state.cpp             |  1 +
 apps/opencs/view/render/lighting.cpp          | 32 +++++++++++++++++--
 apps/opencs/view/render/scenewidget.cpp       |  5 +++
 apps/opencs/view/world/previewsubview.cpp     |  2 ++
 apps/openmw/mwrender/animation.cpp            |  2 +-
 .../reference/modding/settings/game.rst       |  9 ++++++
 files/settings-default.cfg                    |  3 ++
 files/ui/advancedpage.ui                      | 19 +++++++++++
 10 files changed, 75 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3be525b001..4165c7d579 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,7 @@
     Bug #5842: GetDisposition adds temporary disposition change from different actors
     Bug #5863: GetEffect should return true after the player has teleported
     Bug #5913: Failed assertion during Ritual of Trees quest
+    Bug #5928: Glow in the Dahrk functionality used without mod installed
     Bug #5937: Lights always need to be rotated by 90 degrees
     Bug #6037: Morrowind Content Language Cannot be Set to English in OpenMW Launcher
     Bug #6051: NaN water height in ESM file is not handled gracefully
diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index b9d35b3c95..fc1d84a61f 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -143,6 +143,8 @@ bool Launcher::AdvancedPage::loadSettings()
         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"));
+
+        loadSettingBool(nightDaySwitchesCheckBox, "day night switches", "Game");
     }
 
     // Audio
@@ -298,6 +300,8 @@ void Launcher::AdvancedPage::saveSettings()
         double objectPagingMinSize = objectPagingMinSizeComboBox->value();
         if (objectPagingMinSize != Settings::Manager::getDouble("object paging min size", "Terrain"))
             Settings::Manager::setDouble("object paging min size", "Terrain", objectPagingMinSize);
+
+        saveSettingBool(nightDaySwitchesCheckBox, "day night switches", "Game");
     }
     
     // Audio
diff --git a/apps/opencs/model/prefs/state.cpp b/apps/opencs/model/prefs/state.cpp
index 58a0f296e2..06dc1f4a2e 100644
--- a/apps/opencs/model/prefs/state.cpp
+++ b/apps/opencs/model/prefs/state.cpp
@@ -223,6 +223,7 @@ void CSMPrefs::State::declare()
     declareColour ("scene-night-gradient-colour", "Scene Night Gradient Colour", QColor (47, 51, 51, 255)).
         setTooltip("Sets the gradient color to use in conjunction with the night background color. Ignored if "
             "the gradient option is disabled.");
+    declareBool("scene-day-night-switch-nodes", "Use Day/Night Switch Nodes", true);
 
     declareCategory ("Tooltips");
     declareBool ("scene", "Show Tooltips in 3D scenes", true);
diff --git a/apps/opencs/view/render/lighting.cpp b/apps/opencs/view/render/lighting.cpp
index 82ad43e6ad..c7bee79289 100644
--- a/apps/opencs/view/render/lighting.cpp
+++ b/apps/opencs/view/render/lighting.cpp
@@ -3,9 +3,12 @@
 #include <osg/LightSource>
 #include <osg/NodeVisitor>
 #include <osg/Switch>
+#include <osg/ValueObject>
 
 #include <components/misc/constants.hpp>
 
+#include "../../model/prefs/state.hpp"
+
 class DayNightSwitchVisitor : public osg::NodeVisitor
 {
 public:
@@ -16,8 +19,33 @@ public:
 
     void apply(osg::Switch &switchNode) override
     {
-        if (switchNode.getName() == Constants::NightDayLabel)
-            switchNode.setSingleChildOn(mIndex);
+        constexpr int NoIndex = -1;
+
+        int initialIndex = NoIndex;
+        if (!switchNode.getUserValue("initialIndex", initialIndex))
+        {
+            for (size_t i = 0; i < switchNode.getValueList().size(); ++i)
+            {
+                if (switchNode.getValueList()[i])
+                {
+                    initialIndex = i;
+                    break;
+                }
+            }
+
+            if (initialIndex != NoIndex)
+                switchNode.setUserValue("initialIndex", initialIndex);
+        }
+
+        if (CSMPrefs::get()["Rendering"]["scene-day-night-switch-nodes"].isTrue())
+        {
+            if (switchNode.getName() == Constants::NightDayLabel)
+                switchNode.setSingleChildOn(mIndex);
+        }
+        else if (initialIndex != NoIndex)
+        {
+            switchNode.setSingleChildOn(initialIndex);
+        }
 
         traverse(switchNode);
     }
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index dbed1ba97c..b0c2140da9 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -550,6 +550,11 @@ void SceneWidget::settingChanged (const CSMPrefs::Setting *setting)
     {
         updateCameraParameters();
     }
+    else if (*setting == "Rendering/scene-day-night-switch-nodes")
+    {
+        if (mLighting)
+            setLighting(mLighting);
+    }
 }
 
 void RenderWidget::updateCameraParameters(double overrideAspect)
diff --git a/apps/opencs/view/world/previewsubview.cpp b/apps/opencs/view/world/previewsubview.cpp
index f3312bb208..cb231b4782 100644
--- a/apps/opencs/view/world/previewsubview.cpp
+++ b/apps/opencs/view/world/previewsubview.cpp
@@ -25,6 +25,8 @@ CSVWorld::PreviewSubView::PreviewSubView (const CSMWorld::UniversalId& id, CSMDo
     else
         mScene = new CSVRender::PreviewWidget (document.getData(), id.getId(), true, this);
 
+    mScene->setExterior(true);
+
     CSVWidget::SceneToolbar *toolbar = new CSVWidget::SceneToolbar (48+6, this);
 
     CSVWidget::SceneToolMode *lightingTool = mScene->makeLightingSelector (toolbar);
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 732ffd33aa..b1c7bc89c4 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -1831,7 +1831,7 @@ namespace MWRender
             visitor.remove();
         }
 
-        if (SceneUtil::hasUserDescription(mObjectRoot, Constants::NightDayLabel))
+        if (Settings::Manager::getBool("day night switches", "Game") && SceneUtil::hasUserDescription(mObjectRoot, Constants::NightDayLabel))
         {
             AddSwitchCallbacksVisitor visitor;
             mObjectRoot->accept(visitor);
diff --git a/docs/source/reference/modding/settings/game.rst b/docs/source/reference/modding/settings/game.rst
index 6b19885557..f407c6a126 100644
--- a/docs/source/reference/modding/settings/game.rst
+++ b/docs/source/reference/modding/settings/game.rst
@@ -465,3 +465,12 @@ default actor pathfind half extents
 
 Actor half extents used for exterior cells to generate navmesh.
 Changing the value will invalidate navmesh disk cache.
+
+day night switches
+------------------
+
+:Type:      boolean
+:Range:		True/False
+:Default:	True
+
+Some mods add models which change visuals based on time of day. When this setting is enabled, supporting models will automatically make use of Day/night state.
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 06e080fdfd..f1f3206661 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -373,6 +373,9 @@ allow actors to follow over water surface = true
 # Default size of actor for navmesh generation
 default actor pathfind half extents = 29.27999496459961 28.479997634887695 66.5
 
+# Enables use of day/night switch nodes
+day night switches = true
+
 [General]
 
 # Anisotropy reduces distortion in textures at low angles (e.g. 0 to 16).
diff --git a/files/ui/advancedpage.ui b/files/ui/advancedpage.ui
index 3a2e7c49fc..8e976df42d 100644
--- a/files/ui/advancedpage.ui
+++ b/files/ui/advancedpage.ui
@@ -557,6 +557,25 @@
              </layout>
             </widget>
            </item>
+           <item>
+            <widget class="QGroupBox" name="miscGroup">
+             <property name="title">
+              <string>Models</string>
+             </property>
+             <layout class="QGridLayout" name="miscLayout">
+              <item row="0" column="0">
+               <widget class="QCheckBox" name="nightDaySwitchesCheckBox">
+                <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, supporting models will make use of day night switch nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                </property>
+                <property name="text">
+                 <string>Day night switch nodes</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
            <item>
             <spacer name="verticalSpacer">
              <property name="orientation">

From a182fdeea184a4dd987df57367a426160687f0fd Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Tue, 14 Dec 2021 00:39:01 +0100
Subject: [PATCH 1945/2859] Permanent storage for Lua data

---
 apps/openmw/engine.cpp                        |   2 +
 apps/openmw/mwlua/luabindings.cpp             |  39 +++-
 apps/openmw/mwlua/luabindings.hpp             |   6 +-
 apps/openmw/mwlua/luamanagerimp.cpp           |  29 ++-
 apps/openmw/mwlua/luamanagerimp.hpp           |  11 +-
 apps/openmw/mwlua/settingsbindings.cpp        |   7 +-
 apps/openmw_test_suite/CMakeLists.txt         |   1 +
 apps/openmw_test_suite/lua/test_storage.cpp   | 103 +++++++++
 components/CMakeLists.txt                     |   4 +-
 components/lua/storage.cpp                    | 198 ++++++++++++++++++
 components/lua/storage.hpp                    |  81 +++++++
 docs/source/reference/lua-scripting/api.rst   |   6 +-
 .../lua-scripting/openmw_settings.rst         |   5 -
 .../lua-scripting/openmw_storage.rst          |   5 +
 .../reference/lua-scripting/overview.rst      |   4 +-
 files/lua_api/openmw/core.lua                 |   6 +
 files/lua_api/openmw/settings.lua             |  14 --
 files/lua_api/openmw/storage.lua              |  96 +++++++++
 18 files changed, 583 insertions(+), 34 deletions(-)
 create mode 100644 apps/openmw_test_suite/lua/test_storage.cpp
 create mode 100644 components/lua/storage.cpp
 create mode 100644 components/lua/storage.hpp
 delete mode 100644 docs/source/reference/lua-scripting/openmw_settings.rst
 create mode 100644 docs/source/reference/lua-scripting/openmw_storage.rst
 delete mode 100644 files/lua_api/openmw/settings.lua
 create mode 100644 files/lua_api/openmw/storage.lua

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index afba76edce..4ad140465b 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -881,6 +881,7 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     }
 
     mLuaManager->init();
+    mLuaManager->loadPermanentStorage(mCfgMgr.getUserConfigPath().string());
 }
 
 class OMW::Engine::LuaWorker
@@ -1103,6 +1104,7 @@ void OMW::Engine::go()
 
     // Save user settings
     settings.saveUser(settingspath);
+    mLuaManager->savePermanentStorage(mCfgMgr.getUserConfigPath().string());
 
     Log(Debug::Info) << "Quitting peacefully.";
 }
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index 5a9e33faef..cf60e00728 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -6,7 +6,9 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/statemanager.hpp"
+#include "../mwworld/esmstore.hpp"
 #include "../mwworld/inventorystore.hpp"
+#include "../mwworld/store.hpp"
 
 #include "eventqueue.hpp"
 #include "worldview.hpp"
@@ -47,7 +49,7 @@ namespace MWLua
     {
         auto* lua = context.mLua;
         sol::table api(lua->sol(), sol::create);
-        api["API_REVISION"] = 13;
+        api["API_REVISION"] = 14;
         api["quit"] = [lua]()
         {
             Log(Debug::Warning) << "Quit requested by a Lua script.\n" << lua->debugTraceback();
@@ -85,6 +87,17 @@ namespace MWLua
             {"Ammunition", MWWorld::InventoryStore::Slot_Ammunition}
         }));
         api["i18n"] = [i18n=context.mI18n](const std::string& context) { return i18n->getContext(context); };
+        const MWWorld::Store<ESM::GameSetting>* gmst = &MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        api["getGMST"] = [lua=context.mLua, gmst](const std::string& setting) -> sol::object
+        {
+            const ESM::Variant& value = gmst->find(setting)->mValue;
+            if (value.getType() == ESM::VT_String)
+                return sol::make_object<std::string>(lua->sol(), value.getString());
+            else if (value.getType() == ESM::VT_Int)
+                return sol::make_object<int>(lua->sol(), value.getInteger());
+            else
+                return sol::make_object<float>(lua->sol(), value.getFloat());
+        };
         return LuaUtil::makeReadOnly(api);
     }
 
@@ -163,5 +176,29 @@ namespace MWLua
         return LuaUtil::makeReadOnly(res);
     }
 
+    sol::table initGlobalStoragePackage(const Context& context, LuaUtil::LuaStorage* globalStorage)
+    {
+        sol::table res(context.mLua->sol(), sol::create);
+        res["globalSection"] = [globalStorage](std::string_view section) { return globalStorage->getMutableSection(section); };
+        res["allGlobalSections"] = [globalStorage]() { return globalStorage->getAllSections(); };
+        return LuaUtil::makeReadOnly(res);
+    }
+
+    sol::table initLocalStoragePackage(const Context& context, LuaUtil::LuaStorage* globalStorage)
+    {
+        sol::table res(context.mLua->sol(), sol::create);
+        res["globalSection"] = [globalStorage](std::string_view section) { return globalStorage->getReadOnlySection(section); };
+        return LuaUtil::makeReadOnly(res);
+    }
+
+    sol::table initPlayerStoragePackage(const Context& context, LuaUtil::LuaStorage* globalStorage, LuaUtil::LuaStorage* playerStorage)
+    {
+        sol::table res(context.mLua->sol(), sol::create);
+        res["globalSection"] = [globalStorage](std::string_view section) { return globalStorage->getReadOnlySection(section); };
+        res["playerSection"] = [playerStorage](std::string_view section) { return playerStorage->getMutableSection(section); };
+        res["allPlayerSections"] = [playerStorage]() { return playerStorage->getAllSections(); };
+        return LuaUtil::makeReadOnly(res);
+    }
+
 }
 
diff --git a/apps/openmw/mwlua/luabindings.hpp b/apps/openmw/mwlua/luabindings.hpp
index b021354a75..cfaf50c4f6 100644
--- a/apps/openmw/mwlua/luabindings.hpp
+++ b/apps/openmw/mwlua/luabindings.hpp
@@ -4,6 +4,7 @@
 #include <components/lua/luastate.hpp>
 #include <components/lua/serialization.hpp>
 #include <components/lua/scriptscontainer.hpp>
+#include <components/lua/storage.hpp>
 
 #include "context.hpp"
 #include "eventqueue.hpp"
@@ -25,6 +26,10 @@ namespace MWLua
 
     sol::table initFieldGroup(const Context&, const QueryFieldGroup&);
 
+    sol::table initGlobalStoragePackage(const Context&, LuaUtil::LuaStorage* globalStorage);
+    sol::table initLocalStoragePackage(const Context&, LuaUtil::LuaStorage* globalStorage);
+    sol::table initPlayerStoragePackage(const Context&, LuaUtil::LuaStorage* globalStorage, LuaUtil::LuaStorage* playerStorage);
+
     // Implemented in nearbybindings.cpp
     sol::table initNearbyPackage(const Context&);
 
@@ -65,7 +70,6 @@ namespace MWLua
 
     // Implemented in settingsbindings.cpp
     sol::table initGlobalSettingsPackage(const Context&);
-    sol::table initLocalSettingsPackage(const Context&);
     sol::table initPlayerSettingsPackage(const Context&);
 
     // openmw.self package is implemented in localscripts.cpp
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 658ee7c809..39b944807a 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -1,5 +1,7 @@
 #include "luamanagerimp.hpp"
 
+#include <filesystem>
+
 #include <components/debug/debuglog.hpp>
 
 #include <components/esm/esmreader.hpp>
@@ -69,6 +71,7 @@ namespace MWLua
         initObjectBindingsForLocalScripts(localContext);
         initCellBindingsForLocalScripts(localContext);
         LocalScripts::initializeSelfPackage(localContext);
+        LuaUtil::LuaStorage::initLuaBindings(mLua.sol());
 
         mLua.addCommonPackage("openmw.async", getAsyncPackageInitializer(context));
         mLua.addCommonPackage("openmw.util", LuaUtil::initUtilPackage(mLua.sol()));
@@ -76,17 +79,37 @@ namespace MWLua
         mLua.addCommonPackage("openmw.query", initQueryPackage(context));
         mGlobalScripts.addPackage("openmw.world", initWorldPackage(context));
         mGlobalScripts.addPackage("openmw.settings", initGlobalSettingsPackage(context));
+        mGlobalScripts.addPackage("openmw.storage", initGlobalStoragePackage(context, &mGlobalStorage));
         mCameraPackage = initCameraPackage(localContext);
         mUserInterfacePackage = initUserInterfacePackage(localContext);
         mInputPackage = initInputPackage(localContext);
         mNearbyPackage = initNearbyPackage(localContext);
-        mLocalSettingsPackage = initLocalSettingsPackage(localContext);
+        mLocalSettingsPackage = initGlobalSettingsPackage(localContext);
         mPlayerSettingsPackage = initPlayerSettingsPackage(localContext);
+        mLocalStoragePackage = initLocalStoragePackage(localContext, &mGlobalStorage);
+        mPlayerStoragePackage = initPlayerStoragePackage(localContext, &mGlobalStorage, &mPlayerStorage);
 
         initConfiguration();
         mInitialized = true;
     }
 
+    void LuaManager::loadPermanentStorage(const std::string& userConfigPath)
+    {
+        auto globalPath = std::filesystem::path(userConfigPath) / "global_storage.bin";
+        auto playerPath = std::filesystem::path(userConfigPath) / "player_storage.bin";
+        if (std::filesystem::exists(globalPath))
+            mGlobalStorage.load(globalPath.string());
+        if (std::filesystem::exists(playerPath))
+            mPlayerStorage.load(playerPath.string());
+    }
+
+    void LuaManager::savePermanentStorage(const std::string& userConfigPath)
+    {
+        std::filesystem::path confDir(userConfigPath);
+        mGlobalStorage.save((confDir / "global_storage.bin").string());
+        mPlayerStorage.save((confDir / "player_storage.bin").string());
+    }
+
     void LuaManager::update()
     {
         if (mPlayer.isEmpty())
@@ -232,6 +255,8 @@ namespace MWLua
             mPlayer = MWWorld::Ptr();
         }
         clearUserInterface();
+        mGlobalStorage.clearTemporary();
+        mPlayerStorage.clearTemporary();
     }
 
     void LuaManager::setupPlayer(const MWWorld::Ptr& ptr)
@@ -346,11 +371,13 @@ namespace MWLua
             scripts->addPackage("openmw.camera", mCameraPackage);
             scripts->addPackage("openmw.input", mInputPackage);
             scripts->addPackage("openmw.settings", mPlayerSettingsPackage);
+            scripts->addPackage("openmw.storage", mPlayerStoragePackage);
         }
         else
         {
             scripts = std::make_shared<LocalScripts>(&mLua, LObject(getId(ptr), mWorldView.getObjectRegistry()), flag);
             scripts->addPackage("openmw.settings", mLocalSettingsPackage);
+            scripts->addPackage("openmw.storage", mLocalStoragePackage);
         }
         scripts->addPackage("openmw.nearby", mNearbyPackage);
         scripts->setSerializer(mLocalSerializer.get());
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index d050cb9413..753cc6ca49 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -4,8 +4,9 @@
 #include <map>
 #include <set>
 
-#include <components/lua/luastate.hpp>
 #include <components/lua/i18n.hpp>
+#include <components/lua/luastate.hpp>
+#include <components/lua/storage.hpp>
 
 #include "../mwbase/luamanager.hpp"
 
@@ -28,6 +29,9 @@ namespace MWLua
         // Called by engine.cpp when the environment is fully initialized.
         void init();
 
+        void loadPermanentStorage(const std::string& userConfigPath);
+        void savePermanentStorage(const std::string& userConfigPath);
+
         // Called by engine.cpp every frame. For performance reasons it works in a separate
         // thread (in parallel with osg Cull). Can not use scene graph.
         void update();
@@ -99,6 +103,8 @@ namespace MWLua
         sol::table mInputPackage;
         sol::table mLocalSettingsPackage;
         sol::table mPlayerSettingsPackage;
+        sol::table mLocalStoragePackage;
+        sol::table mPlayerStoragePackage;
 
         GlobalScripts mGlobalScripts{&mLua};
         std::set<LocalScripts*> mActiveLocalScripts;
@@ -139,6 +145,9 @@ namespace MWLua
         std::vector<std::unique_ptr<Action>> mActionQueue;
         std::unique_ptr<TeleportAction> mTeleportPlayerAction;
         std::vector<std::string> mUIMessages;
+
+        LuaUtil::LuaStorage mGlobalStorage{mLua.sol()};
+        LuaUtil::LuaStorage mPlayerStorage{mLua.sol()};
     };
 
 }
diff --git a/apps/openmw/mwlua/settingsbindings.cpp b/apps/openmw/mwlua/settingsbindings.cpp
index 12dd69f73a..afd852b1a0 100644
--- a/apps/openmw/mwlua/settingsbindings.cpp
+++ b/apps/openmw/mwlua/settingsbindings.cpp
@@ -8,7 +8,7 @@
 namespace MWLua
 {
 
-    static sol::table initSettingsPackage(const Context& context, bool /*global*/, bool player)
+    static sol::table initSettingsPackage(const Context& context, bool player)
     {
         LuaUtil::LuaState* lua = context.mLua;
         sol::table config(lua->sol(), sol::create);
@@ -65,8 +65,7 @@ namespace MWLua
         return LuaUtil::makeReadOnly(config);
     }
 
-    sol::table initGlobalSettingsPackage(const Context& context) { return initSettingsPackage(context, true, false); }
-    sol::table initLocalSettingsPackage(const Context& context) { return initSettingsPackage(context, false, false); }
-    sol::table initPlayerSettingsPackage(const Context& context) { return initSettingsPackage(context, false, true); }
+    sol::table initGlobalSettingsPackage(const Context& context) { return initSettingsPackage(context, false); }
+    sol::table initPlayerSettingsPackage(const Context& context) { return initSettingsPackage(context, true); }
 
 }
diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index 9465d59b47..da68a21998 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -24,6 +24,7 @@ if (GTEST_FOUND AND GMOCK_FOUND)
         lua/test_querypackage.cpp
         lua/test_configuration.cpp
         lua/test_i18n.cpp
+        lua/test_storage.cpp
 
         lua/test_ui_content.cpp
 
diff --git a/apps/openmw_test_suite/lua/test_storage.cpp b/apps/openmw_test_suite/lua/test_storage.cpp
new file mode 100644
index 0000000000..fafba008a1
--- /dev/null
+++ b/apps/openmw_test_suite/lua/test_storage.cpp
@@ -0,0 +1,103 @@
+#include <filesystem>
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include <components/lua/storage.hpp>
+
+namespace
+{
+    using namespace testing;
+
+    template <typename T>
+    T get(sol::state& lua, std::string luaCode)
+    {
+        return lua.safe_script("return " + luaCode).get<T>();
+    }
+
+    TEST(LuaUtilStorageTest, Basic)
+    {
+        sol::state mLua;
+        LuaUtil::LuaStorage::initLuaBindings(mLua);
+        LuaUtil::LuaStorage storage(mLua);
+        mLua["mutable"] = storage.getMutableSection("test");
+        mLua["ro"] = storage.getReadOnlySection("test");
+
+        mLua.safe_script("mutable:set('x', 5)");
+        EXPECT_EQ(get<int>(mLua, "mutable:get('x')"), 5);
+        EXPECT_EQ(get<int>(mLua, "ro:get('x')"), 5);
+        EXPECT_FALSE(get<bool>(mLua, "mutable:wasChanged()"));
+        EXPECT_TRUE(get<bool>(mLua, "ro:wasChanged()"));
+        EXPECT_FALSE(get<bool>(mLua, "ro:wasChanged()"));
+
+        EXPECT_THROW(mLua.safe_script("ro:set('y', 3)"), std::exception);
+
+        mLua.safe_script("t1 = mutable:asTable()");
+        mLua.safe_script("t2 = ro:asTable()");
+        EXPECT_EQ(get<int>(mLua, "t1.x"), 5);
+        EXPECT_EQ(get<int>(mLua, "t2.x"), 5);
+
+        mLua.safe_script("mutable:reset()");
+        EXPECT_TRUE(get<bool>(mLua, "ro:get('x') == nil"));
+
+        mLua.safe_script("mutable:reset({x=4, y=7})");
+        EXPECT_EQ(get<int>(mLua, "ro:get('x')"), 4);
+        EXPECT_EQ(get<int>(mLua, "ro:get('y')"), 7);
+        EXPECT_FALSE(get<bool>(mLua, "mutable:wasChanged()"));
+        EXPECT_TRUE(get<bool>(mLua, "ro:wasChanged()"));
+        EXPECT_FALSE(get<bool>(mLua, "ro:wasChanged()"));
+    }
+
+    TEST(LuaUtilStorageTest, Table)
+    {
+        sol::state mLua;
+        LuaUtil::LuaStorage::initLuaBindings(mLua);
+        LuaUtil::LuaStorage storage(mLua);
+        mLua["mutable"] = storage.getMutableSection("test");
+        mLua["ro"] = storage.getReadOnlySection("test");
+
+        mLua.safe_script("mutable:set('x', { y = 'abc', z = 7 })");
+        EXPECT_EQ(get<int>(mLua, "mutable:get('x').z"), 7);
+        EXPECT_THROW(mLua.safe_script("mutable:get('x').z = 3"), std::exception);
+        EXPECT_NO_THROW(mLua.safe_script("mutable:getCopy('x').z = 3"));
+        EXPECT_EQ(get<int>(mLua, "mutable:get('x').z"), 7);
+        EXPECT_EQ(get<int>(mLua, "ro:get('x').z"), 7);
+        EXPECT_EQ(get<std::string>(mLua, "ro:get('x').y"), "abc");
+    }
+
+    TEST(LuaUtilStorageTest, Saving)
+    {
+        sol::state mLua;
+        LuaUtil::LuaStorage::initLuaBindings(mLua);
+        LuaUtil::LuaStorage storage(mLua);
+
+        mLua["permanent"] = storage.getMutableSection("permanent");
+        mLua["temporary"] = storage.getMutableSection("temporary");
+        mLua.safe_script("temporary:removeOnExit()");
+        mLua.safe_script("permanent:set('x', 1)");
+        mLua.safe_script("temporary:set('y', 2)");
+
+        std::string tmpFile = (std::filesystem::temp_directory_path() / "test_storage.bin").string();
+        storage.save(tmpFile);
+        EXPECT_EQ(get<int>(mLua, "permanent:get('x')"), 1);
+        EXPECT_EQ(get<int>(mLua, "temporary:get('y')"), 2);
+
+        storage.clearTemporary();
+        mLua["permanent"] = storage.getMutableSection("permanent");
+        mLua["temporary"] = storage.getMutableSection("temporary");
+        EXPECT_EQ(get<int>(mLua, "permanent:get('x')"), 1);
+        EXPECT_TRUE(get<bool>(mLua, "temporary:get('y') == nil"));
+
+        mLua.safe_script("permanent:set('x', 3)");
+        mLua.safe_script("permanent:set('z', 4)");
+
+        LuaUtil::LuaStorage storage2(mLua);
+        mLua["permanent"] = storage2.getMutableSection("permanent");
+        mLua["temporary"] = storage2.getMutableSection("temporary");
+
+        storage2.load(tmpFile);
+        EXPECT_EQ(get<int>(mLua, "permanent:get('x')"), 1);
+        EXPECT_TRUE(get<bool>(mLua, "permanent:get('z') == nil"));
+        EXPECT_TRUE(get<bool>(mLua, "temporary:get('y') == nil"));
+    }
+
+}
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 6fedf25b4c..f7382db1c7 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -29,7 +29,7 @@ endif (GIT_CHECKOUT)
 # source files
 
 add_component_dir (lua
-    luastate scriptscontainer utilpackage serialization configuration i18n
+    luastate scriptscontainer utilpackage serialization configuration i18n storage
     )
 
 add_component_dir (settings
@@ -160,7 +160,7 @@ add_component_dir (fallback
 add_component_dir (queries
     query luabindings
     )
-
+    
 add_component_dir (lua_ui
     widget widgetlist element layers content
     text textedit window
diff --git a/components/lua/storage.cpp b/components/lua/storage.cpp
new file mode 100644
index 0000000000..def38fdd67
--- /dev/null
+++ b/components/lua/storage.cpp
@@ -0,0 +1,198 @@
+#include "storage.hpp"
+
+#include <filesystem>
+#include <fstream>
+
+#include <components/debug/debuglog.hpp>
+
+namespace sol
+{
+    template <>
+    struct is_automagical<LuaUtil::LuaStorage::SectionMutableView> : std::false_type {};
+    template <>
+    struct is_automagical<LuaUtil::LuaStorage::SectionReadOnlyView> : std::false_type {};
+}
+
+namespace LuaUtil
+{
+    LuaStorage::Value LuaStorage::Section::sEmpty;
+
+    sol::object LuaStorage::Value::getCopy(lua_State* L) const
+    {
+        return deserialize(L, mSerializedValue);
+    }
+
+    sol::object LuaStorage::Value::getReadOnly(lua_State* L) const
+    {
+        if (mReadOnlyValue == sol::nil && !mSerializedValue.empty())
+            mReadOnlyValue = deserialize(L, mSerializedValue, nullptr, true);
+        return mReadOnlyValue;
+    }
+
+    const LuaStorage::Value& LuaStorage::Section::get(std::string_view key) const
+    {
+        auto it = mValues.find(key);
+        if (it != mValues.end())
+            return it->second;
+        else
+            return sEmpty;
+    }
+
+    void LuaStorage::Section::set(std::string_view key, const sol::object& value)
+    {
+        mValues[std::string(key)] = Value(value);
+        mChangeCounter++;
+        if (mStorage->mListener)
+            (*mStorage->mListener)(mSectionName, key, value);
+    }
+
+    bool LuaStorage::Section::wasChanged(int64_t& lastCheck)
+    {
+        bool res = lastCheck < mChangeCounter;
+        lastCheck = mChangeCounter;
+        return res;
+    }
+
+    sol::table LuaStorage::Section::asTable()
+    {
+        sol::table res(mStorage->mLua, sol::create);
+        for (const auto& [k, v] : mValues)
+            res[k] = v.getCopy(mStorage->mLua);
+        return res;
+    }
+
+    void LuaStorage::initLuaBindings(lua_State* L)
+    {
+        sol::state_view lua(L);
+        sol::usertype<SectionReadOnlyView> roView = lua.new_usertype<SectionReadOnlyView>("ReadOnlySection");
+        sol::usertype<SectionMutableView> mutableView = lua.new_usertype<SectionMutableView>("MutableSection");
+        roView["get"] = [](sol::this_state s, SectionReadOnlyView& section, std::string_view key)
+        {
+            return section.mSection->get(key).getReadOnly(s);
+        };
+        roView["getCopy"] = [](sol::this_state s, SectionReadOnlyView& section, std::string_view key)
+        {
+            return section.mSection->get(key).getCopy(s);
+        };
+        roView["wasChanged"] = [](SectionReadOnlyView& section) { return section.mSection->wasChanged(section.mLastCheck); };
+        roView["asTable"] = [](SectionReadOnlyView& section) { return section.mSection->asTable(); };
+        mutableView["get"] = [](sol::this_state s, SectionMutableView& section, std::string_view key)
+        {
+            return section.mSection->get(key).getReadOnly(s);
+        };
+        mutableView["getCopy"] = [](sol::this_state s, SectionMutableView& section, std::string_view key)
+        {
+            return section.mSection->get(key).getCopy(s);
+        };
+        mutableView["wasChanged"] = [](SectionMutableView& section) { return section.mSection->wasChanged(section.mLastCheck); };
+        mutableView["asTable"] = [](SectionMutableView& section) { return section.mSection->asTable(); };
+        mutableView["reset"] = [](SectionMutableView& section, sol::optional<sol::table> newValues)
+        {
+            section.mSection->mValues.clear();
+            if (newValues)
+            {
+                for (const auto& [k, v] : *newValues)
+                {
+                    try
+                    {
+                        section.mSection->set(k.as<std::string_view>(), v);
+                    }
+                    catch (std::exception& e)
+                    {
+                        Log(Debug::Error) << "LuaUtil::LuaStorage::Section::reset(table): " << e.what();
+                    }
+                }
+            }
+            section.mSection->mChangeCounter++;
+            section.mLastCheck = section.mSection->mChangeCounter;
+        };
+        mutableView["removeOnExit"] = [](SectionMutableView& section) { section.mSection->mPermanent = false; };
+        mutableView["set"] = [](SectionMutableView& section, std::string_view key, const sol::object& value)
+        {
+            if (section.mLastCheck == section.mSection->mChangeCounter)
+                section.mLastCheck++;
+            section.mSection->set(key, value);
+        };
+    }
+
+    void LuaStorage::clearTemporary()
+    {
+        auto it = mData.begin();
+        while (it != mData.end())
+        {
+            if (!it->second->mPermanent)
+                it = mData.erase(it);
+            else
+                ++it;
+        }
+    }
+
+    void LuaStorage::load(const std::string& path)
+    {
+        mData.clear();
+        try
+        {
+            Log(Debug::Info) << "Loading Lua storage \"" << path << "\" (" << std::filesystem::file_size(path) << " bytes)";
+            std::ifstream fin(path, std::fstream::binary);
+            std::string serializedData((std::istreambuf_iterator<char>(fin)), std::istreambuf_iterator<char>());
+            sol::table data = deserialize(mLua, serializedData);
+            for (const auto& [sectionName, sectionTable] : data)
+            {
+                Section* section = getSection(sectionName.as<std::string_view>());
+                for (const auto& [key, value] : sol::table(sectionTable))
+                    section->set(key.as<std::string_view>(), value);
+            }
+        }
+        catch (std::exception& e)
+        {
+            Log(Debug::Error) << "Can not read \"" << path << "\": " << e.what();
+        }
+    }
+
+    void LuaStorage::save(const std::string& path) const
+    {
+        sol::table data(mLua, sol::create);
+        for (const auto& [sectionName, section] : mData)
+        {
+            if (section->mPermanent)
+                data[sectionName] = section->asTable();
+        }
+        std::string serializedData = serialize(data);
+        Log(Debug::Info) << "Saving Lua storage \"" << path << "\" (" << serializedData.size() << " bytes)";
+        std::ofstream fout(path, std::fstream::binary);
+        fout.write(serializedData.data(), serializedData.size());
+        fout.close();
+    }
+
+    LuaStorage::Section* LuaStorage::getSection(std::string_view sectionName)
+    {
+        auto it = mData.find(sectionName);
+        if (it != mData.end())
+            return it->second.get();
+        auto section = std::make_unique<Section>(this, std::string(sectionName));
+        sectionName = section->mSectionName;
+        auto [newIt, _] = mData.emplace(sectionName, std::move(section));
+        return newIt->second.get();
+    }
+
+    sol::object LuaStorage::getReadOnlySection(std::string_view sectionName)
+    {
+        Section* section = getSection(sectionName);
+        return sol::make_object<SectionReadOnlyView>(mLua, SectionReadOnlyView{section, section->mChangeCounter});
+    }
+
+    sol::object LuaStorage::getMutableSection(std::string_view sectionName)
+    {
+        Section* section = getSection(sectionName);
+        return sol::make_object<SectionMutableView>(mLua, SectionMutableView{section, section->mChangeCounter});
+    }
+
+    sol::table LuaStorage::getAllSections()
+    {
+        sol::table res(mLua, sol::create);
+        for (const auto& [sectionName, _] : mData)
+            res[sectionName] = getMutableSection(sectionName);
+        return res;
+    }
+
+}
diff --git a/components/lua/storage.hpp b/components/lua/storage.hpp
new file mode 100644
index 0000000000..e847604aeb
--- /dev/null
+++ b/components/lua/storage.hpp
@@ -0,0 +1,81 @@
+#ifndef COMPONENTS_LUA_STORAGE_H
+#define COMPONENTS_LUA_STORAGE_H
+
+#include <map>
+#include <sol/sol.hpp>
+
+#include "serialization.hpp"
+
+namespace LuaUtil
+{
+
+    class LuaStorage
+    {
+    public:
+        static void initLuaBindings(lua_State*);
+
+        explicit LuaStorage(lua_State* lua) : mLua(lua) {}
+
+        void clearTemporary();
+        void load(const std::string& path);
+        void save(const std::string& path) const;
+
+        sol::object getReadOnlySection(std::string_view sectionName);
+        sol::object getMutableSection(std::string_view sectionName);
+        sol::table getAllSections();
+
+        void set(std::string_view section, std::string_view key, const sol::object& value) { getSection(section)->set(key, value); }
+
+        using ListenerFn = std::function<void(std::string_view, std::string_view, const sol::object&)>;
+        void setListener(ListenerFn fn) { mListener = std::move(fn); }
+
+    private:
+        class Value
+        {
+        public:
+            Value() {}
+            Value(const sol::object& value) : mSerializedValue(serialize(value)) {}
+            sol::object getCopy(lua_State* L) const;
+            sol::object getReadOnly(lua_State* L) const;
+
+        private:
+            std::string mSerializedValue;
+            mutable sol::object mReadOnlyValue = sol::nil;
+        };
+
+        struct Section
+        {
+            explicit Section(LuaStorage* storage, std::string name) : mStorage(storage), mSectionName(std::move(name)) {}
+            const Value& get(std::string_view key) const;
+            void set(std::string_view key, const sol::object& value);
+            bool wasChanged(int64_t& lastCheck);
+            sol::table asTable();
+
+            LuaStorage* mStorage;
+            std::string mSectionName;
+            std::map<std::string, Value, std::less<>> mValues;
+            bool mPermanent = true;
+            int64_t mChangeCounter = 0;
+            static Value sEmpty;
+        };
+        struct SectionMutableView
+        {
+            Section* mSection = nullptr;
+            int64_t mLastCheck = 0;
+        };
+        struct SectionReadOnlyView
+        {
+            Section* mSection = nullptr;
+            int64_t mLastCheck = 0;
+        };
+
+        Section* getSection(std::string_view sectionName);
+
+        lua_State* mLua;
+        std::map<std::string_view, std::unique_ptr<Section>> mData;
+        std::optional<ListenerFn> mListener;
+    };
+
+}
+
+#endif // COMPONENTS_LUA_STORAGE_H
diff --git a/docs/source/reference/lua-scripting/api.rst b/docs/source/reference/lua-scripting/api.rst
index d6e85389b8..ef831e734a 100644
--- a/docs/source/reference/lua-scripting/api.rst
+++ b/docs/source/reference/lua-scripting/api.rst
@@ -8,7 +8,7 @@ Lua API reference
     engine_handlers
     user_interface
     openmw_util
-    openmw_settings
+    openmw_storage
     openmw_core
     openmw_async
     openmw_query
@@ -45,8 +45,8 @@ Player scripts are local scripts that are attached to a player.
 |:ref:`openmw.util <Package openmw.util>`                 | everywhere         | | Defines utility functions and classes like 3D vectors,      |
 |                                                         |                    | | that don't depend on the game world.                        |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.settings <Package openmw.settings>`         | everywhere         | | Access to GMST records in content files (implemented) and   |
-|                                                         |                    | | to mod settings (not implemented).                          |
+|:ref:`openmw.storage <Package openmw.storage>`           | everywhere         | | Storage API. In particular can be used to store data        |
+|                                                         |                    | | between game sessions.                                      |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.core <Package openmw.core>`                 | everywhere         | | Functions that are common for both global and local scripts |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
diff --git a/docs/source/reference/lua-scripting/openmw_settings.rst b/docs/source/reference/lua-scripting/openmw_settings.rst
deleted file mode 100644
index f3d26882bb..0000000000
--- a/docs/source/reference/lua-scripting/openmw_settings.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Package openmw.settings
-=======================
-
-.. raw:: html
-   :file: generated_html/openmw_settings.html
diff --git a/docs/source/reference/lua-scripting/openmw_storage.rst b/docs/source/reference/lua-scripting/openmw_storage.rst
new file mode 100644
index 0000000000..5abf664e1a
--- /dev/null
+++ b/docs/source/reference/lua-scripting/openmw_storage.rst
@@ -0,0 +1,5 @@
+Package openmw.storage
+======================
+
+.. raw:: html
+   :file: generated_html/openmw_storage.html
diff --git a/docs/source/reference/lua-scripting/overview.rst b/docs/source/reference/lua-scripting/overview.rst
index eab3fc962a..9de283b029 100644
--- a/docs/source/reference/lua-scripting/overview.rst
+++ b/docs/source/reference/lua-scripting/overview.rst
@@ -334,8 +334,8 @@ Player scripts are local scripts that are attached to a player.
 |:ref:`openmw.util <Package openmw.util>`                 | everywhere         | | Defines utility functions and classes like 3D vectors,      |
 |                                                         |                    | | that don't depend on the game world.                        |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.settings <Package openmw.settings>`         | everywhere         | | Access to GMST records in content files (implemented) and   |
-|                                                         |                    | | to mod settings (not implemented).                          |
+|:ref:`openmw.storage <Package openmw.storage>`           | everywhere         | | Storage API. In particular can be used to store data        |
+|                                                         |                    | | between game sessions.                                      |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.core <Package openmw.core>`                 | everywhere         | | Functions that are common for both global and local scripts |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
diff --git a/files/lua_api/openmw/core.lua b/files/lua_api/openmw/core.lua
index d18be52406..8415690067 100644
--- a/files/lua_api/openmw/core.lua
+++ b/files/lua_api/openmw/core.lua
@@ -46,6 +46,12 @@
 -- @function [parent=#core] isWorldPaused
 -- @return #boolean
 
+-------------------------------------------------------------------------------
+-- Get a GMST setting from content files.
+-- @function [parent=#core] getGMST
+-- @param #string setting Setting name
+-- @return #any
+
 -------------------------------------------------------------------------------
 -- Return i18n formatting function for the given context.
 -- It is based on `i18n.lua` library.
diff --git a/files/lua_api/openmw/settings.lua b/files/lua_api/openmw/settings.lua
deleted file mode 100644
index 6c35caa8af..0000000000
--- a/files/lua_api/openmw/settings.lua
+++ /dev/null
@@ -1,14 +0,0 @@
--------------------------------------------------------------------------------
--- `openmw.settings` provides read-only access to GMST records in content files.
--- @module settings
--- @usage
--- local settings = require('openmw.settings')
-
--------------------------------------------------------------------------------
--- Get a GMST setting from content files.
--- @function [parent=#settings] getGMST
--- @param #string setting
-
-
-return nil
-
diff --git a/files/lua_api/openmw/storage.lua b/files/lua_api/openmw/storage.lua
new file mode 100644
index 0000000000..5499eefb9c
--- /dev/null
+++ b/files/lua_api/openmw/storage.lua
@@ -0,0 +1,96 @@
+---
+-- `openmw.storage` contains functions to work with permanent Lua storage.
+-- @module storage
+-- @usage
+-- local storage = require('openmw.storage')
+-- local myModData = storage.globalSection('MyModExample')
+-- myModData:set("someVariable", 1.0)
+-- myModData:set("anotherVariable", { exampleStr='abc', exampleBool=true })
+-- local function update()
+--     if myModCfg:checkChanged() then
+--         print('Data was changes by another script:')
+--         print('MyModExample.someVariable =', myModData:get('someVariable'))
+--         print('MyModExample.anotherVariable.exampleStr =',
+--               myModData:get('anotherVariable').exampleStr)
+--     end
+-- end
+
+---
+-- Get a section of the global storage; can be used by any script, but only global scripts can change values.
+-- Creates the section if it doesn't exist.
+-- @function [parent=#storage] globalSection
+-- @param #string sectionName
+-- @return #StorageSection
+
+---
+-- Get a section of the player storage; can be used by player scripts only.
+-- Creates the section if it doesn't exist.
+-- @function [parent=#storage] playerSection
+-- @param #string sectionName
+-- @return #StorageSection
+
+---
+-- Get all global sections as a table; can be used by global scripts only.
+-- Note that adding/removing items to the returned table doesn't create or remove sections.
+-- @function [parent=#storage] allGlobalSections
+-- @return #table
+
+---
+-- Get all global sections as a table; can be used by player scripts only.
+-- Note that adding/removing items to the returned table doesn't create or remove sections.
+-- @function [parent=#storage] allPlayerSections
+-- @return #table
+
+---
+-- A map `key -> value` that represents a storage section.
+-- @type StorageSection
+
+---
+-- Get value by a string key; if value is a table makes it readonly.
+-- @function [parent=#StorageSection] get
+-- @param self
+-- @param #string key
+
+---
+-- Get value by a string key; if value is a table returns a copy.
+-- @function [parent=#StorageSection] getCopy
+-- @param self
+-- @param #string key
+
+---
+-- Return `True` if any value in this section was changed by another script since the last `wasChanged`.
+-- @function [parent=#StorageSection] wasChanged
+-- @param self
+-- @return #boolean
+
+---
+-- Copy all values and return them as a table.
+-- @function [parent=#StorageSection] asTable
+-- @param self
+-- @return #table
+
+---
+-- Remove all existing values and assign values from given (the arg is optional) table.
+-- Note: `section:reset()` removes all values, but not the section itself. Use `section:removeOnExit()` to remove the section completely.
+-- @function [parent=#StorageSection] reset
+-- @param self
+-- @param #table values (optional) New values
+
+---
+-- Make the whole section temporary: will be removed on exit or when load a save.
+-- No section can be removed immediately because other scripts may use it at the moment.
+-- Temporary sections have the same interface to get/set values, the only difference is they will not
+-- be saved to the permanent storage on exit.
+-- This function can not be used for a global storage section from a local script.
+-- @function [parent=#StorageSection] removeOnExit
+-- @param self
+
+---
+-- Set value by a string key; can not be used for global storage from a local script.
+-- @function [parent=#StorageSection] set
+-- @param self
+-- @param #string key
+-- @param #any value
+
+return nil
+

From ba30b37bb4b539cacf81e0f8ef43a1555c7613ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Thu, 13 Jan 2022 22:46:00 +0200
Subject: [PATCH 1946/2859] Add missing include to unordered_map

---
 components/crashcatcher/windows_crashmonitor.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/crashcatcher/windows_crashmonitor.hpp b/components/crashcatcher/windows_crashmonitor.hpp
index 4028362836..eaf908bf66 100644
--- a/components/crashcatcher/windows_crashmonitor.hpp
+++ b/components/crashcatcher/windows_crashmonitor.hpp
@@ -6,6 +6,7 @@
 #include <Windows.h>
 
 #include <atomic>
+#include <unordered_map>
 
 namespace Crash
 {

From 97d56e198fdef194d68ef597cc0d850f32637ba0 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sat, 15 Jan 2022 11:25:30 +0100
Subject: [PATCH 1947/2859] Use double precision for vectors serialization in
 Lua

---
 .../lua/test_serialization.cpp                |  6 +++---
 components/lua/serialization.cpp              | 20 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/apps/openmw_test_suite/lua/test_serialization.cpp b/apps/openmw_test_suite/lua/test_serialization.cpp
index 57a1070c83..1d664b06a4 100644
--- a/apps/openmw_test_suite/lua/test_serialization.cpp
+++ b/apps/openmw_test_suite/lua/test_serialization.cpp
@@ -93,14 +93,14 @@ namespace
 
         {
             std::string serialized = LuaUtil::serialize(sol::make_object(lua, vec2));
-            EXPECT_EQ(serialized.size(), 10);  // version, type, 2x float
+            EXPECT_EQ(serialized.size(), 18);  // version, type, 2x double
             sol::object value = LuaUtil::deserialize(lua, serialized);
             ASSERT_TRUE(value.is<osg::Vec2f>());
             EXPECT_EQ(value.as<osg::Vec2f>(), vec2);
         }
         {
             std::string serialized = LuaUtil::serialize(sol::make_object(lua, vec3));
-            EXPECT_EQ(serialized.size(), 14);  // version, type, 3x float
+            EXPECT_EQ(serialized.size(), 26);  // version, type, 3x double
             sol::object value = LuaUtil::deserialize(lua, serialized);
             ASSERT_TRUE(value.is<osg::Vec3f>());
             EXPECT_EQ(value.as<osg::Vec3f>(), vec3);
@@ -149,7 +149,7 @@ namespace
         table[2] = osg::Vec2f(2, 1);
 
         std::string serialized = LuaUtil::serialize(table);
-        EXPECT_EQ(serialized.size(), 123);
+        EXPECT_EQ(serialized.size(), 139);
         sol::table res_table = LuaUtil::deserialize(lua, serialized);
         sol::table res_readonly_table = LuaUtil::deserialize(lua, serialized, nullptr, true);
 
diff --git a/components/lua/serialization.cpp b/components/lua/serialization.cpp
index 8b18294449..e8f66c698c 100644
--- a/components/lua/serialization.cpp
+++ b/components/lua/serialization.cpp
@@ -99,17 +99,17 @@ namespace LuaUtil
         {
             appendType(out, SerializedType::VEC2);
             osg::Vec2f v = data.as<osg::Vec2f>();
-            appendValue<float>(out, v.x());
-            appendValue<float>(out, v.y());
+            appendValue<double>(out, v.x());
+            appendValue<double>(out, v.y());
             return;
         }
         if (data.is<osg::Vec3f>())
         {
             appendType(out, SerializedType::VEC3);
             osg::Vec3f v = data.as<osg::Vec3f>();
-            appendValue<float>(out, v.x());
-            appendValue<float>(out, v.y());
-            appendValue<float>(out, v.z());
+            appendValue<double>(out, v.x());
+            appendValue<double>(out, v.y());
+            appendValue<double>(out, v.z());
             return;
         }
         if (data.is<TransformM>())
@@ -241,16 +241,16 @@ namespace LuaUtil
                 throw std::runtime_error("Unexpected end of table during deserialization.");
             case SerializedType::VEC2:
             {
-                float x = getValue<float>(binaryData);
-                float y = getValue<float>(binaryData);
+                float x = getValue<double>(binaryData);
+                float y = getValue<double>(binaryData);
                 sol::stack::push<osg::Vec2f>(lua, osg::Vec2f(x, y));
                 return;
             }
             case SerializedType::VEC3:
             {
-                float x = getValue<float>(binaryData);
-                float y = getValue<float>(binaryData);
-                float z = getValue<float>(binaryData);
+                float x = getValue<double>(binaryData);
+                float y = getValue<double>(binaryData);
+                float z = getValue<double>(binaryData);
                 sol::stack::push<osg::Vec3f>(lua, osg::Vec3f(x, y, z));
                 return;
             }

From 1b7e923b2c44bd76e83aff6df15a8b27fddfeddf Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sat, 15 Jan 2022 12:01:30 +0000
Subject: [PATCH 1948/2859] Lua fixes

---
 apps/openmw/mwlua/luamanagerimp.cpp | 10 ++++++++--
 apps/openmw/mwlua/luamanagerimp.hpp |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 658ee7c809..f49aa81493 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -244,7 +244,10 @@ namespace MWLua
         mPlayer = ptr;
         LocalScripts* localScripts = ptr.getRefData().getLuaScripts();
         if (!localScripts)
+        {
             localScripts = createLocalScripts(ptr, ESM::LuaScriptCfg::sPlayer);
+            localScripts->addAutoStartedScripts();
+        }
         mActiveLocalScripts.insert(localScripts);
         mLocalEngineEvents.push_back({getId(ptr), LocalScripts::OnActive{}});
         mPlayerChanged = true;
@@ -274,7 +277,10 @@ namespace MWLua
         {
             ESM::LuaScriptCfg::Flags flag = getLuaScriptFlag(ptr);
             if (!mConfiguration.getListByFlag(flag).empty())
-                localScripts = createLocalScripts(ptr, flag);  // TODO: put to a queue and apply on next `update()`
+            {
+                localScripts = createLocalScripts(ptr, flag);
+                localScripts->addAutoStartedScripts();  // TODO: put to a queue and apply on next `update()`
+            }
         }
         if (localScripts)
         {
@@ -327,6 +333,7 @@ namespace MWLua
         if (!localScripts)
         {
             localScripts = createLocalScripts(ptr, getLuaScriptFlag(ptr));
+            localScripts->addAutoStartedScripts();
             if (ptr.isInCell() && MWBase::Environment::get().getWorld()->isCellActive(ptr.getCell()))
                 mActiveLocalScripts.insert(localScripts);
         }
@@ -354,7 +361,6 @@ namespace MWLua
         }
         scripts->addPackage("openmw.nearby", mNearbyPackage);
         scripts->setSerializer(mLocalSerializer.get());
-        scripts->addAutoStartedScripts();
 
         MWWorld::RefData& refData = ptr.getRefData();
         refData.setLuaScripts(std::move(scripts));
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index d050cb9413..5928a4a511 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -24,6 +24,7 @@ namespace MWLua
     {
     public:
         LuaManager(const VFS::Manager* vfs, const std::string& libsDir);
+        ~LuaManager() { clear(); }
 
         // Called by engine.cpp when the environment is fully initialized.
         void init();

From 5fcb2cabc8c85b01bae855c74742638b84325ad0 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 15 Jan 2022 13:04:15 +0100
Subject: [PATCH 1949/2859] Make scaleObject a no-op when not changing scale

---
 apps/openmw/mwworld/worldimp.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 325e048958..f6e00d3e21 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1283,15 +1283,14 @@ namespace MWWorld
 
     void World::scaleObject (const Ptr& ptr, float scale)
     {
+        if (scale == ptr.getCellRef().getScale())
+            return;
         if (mPhysics->getActor(ptr))
             mNavigator->removeAgent(getPathfindingHalfExtents(ptr));
 
-        if (scale != ptr.getCellRef().getScale())
-        {
-            ptr.getCellRef().setScale(scale);
-            mRendering->pagingBlacklistObject(mStore.find(ptr.getCellRef().getRefId()), ptr);
-            mWorldScene->removeFromPagedRefs(ptr);
-        }
+        ptr.getCellRef().setScale(scale);
+        mRendering->pagingBlacklistObject(mStore.find(ptr.getCellRef().getRefId()), ptr);
+        mWorldScene->removeFromPagedRefs(ptr);
 
         if(ptr.getRefData().getBaseNode() != nullptr)
             mWorldScene->updateObjectScale(ptr);

From 467791299737d6dd5e7262687229c65d609d90a8 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sat, 15 Jan 2022 13:59:22 +0100
Subject: [PATCH 1950/2859] Remove incorrect destructor that was added in
 !1557.

---
 apps/openmw/mwlua/luamanagerimp.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index 5928a4a511..d050cb9413 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -24,7 +24,6 @@ namespace MWLua
     {
     public:
         LuaManager(const VFS::Manager* vfs, const std::string& libsDir);
-        ~LuaManager() { clear(); }
 
         // Called by engine.cpp when the environment is fully initialized.
         void init();

From a5cdc889a2d128172b853019f416c5487831fe0c Mon Sep 17 00:00:00 2001
From: Artem Nykolenko <artemnykolenko@gmail.com>
Date: Sun, 16 Jan 2022 10:15:47 +0000
Subject: [PATCH 1951/2859] #6303 Made player stop attacking and sheathe weapon
 when going to jail

---
 CHANGELOG.md                     | 1 +
 apps/openmw/mwworld/worldimp.cpp | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4165c7d579..9c45d15e6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -72,6 +72,7 @@
     Bug #6289: Keyword search in dialogues expected the text to be all ASCII characters
     Bug #6291: Can't pickup the dead mage's journal from the mysterious hunter mod
     Bug #6302: Teleporting disabled actor breaks its disabled state
+    Bug #6303: After "go to jail" weapon can stuck in the ready to attack state
     Bug #6307: Pathfinding in Infidelities quest from Tribunal addon is broken
     Bug #6321: Arrow enchantments should always be applied to the target
     Bug #6322: Total sold/cost should reset to 0 when there are no items offered
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 325e048958..9cf60f7dc5 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -3621,14 +3621,13 @@ namespace MWWorld
 
     void World::goToJail()
     {
+        const MWWorld::Ptr player = getPlayerPtr();
         if (!mGoToJail)
         {
             // Reset bounty and forget the crime now, but don't change cell yet (the player should be able to read the dialog text first)
             mGoToJail = true;
             mPlayerInJail = true;
 
-            MWWorld::Ptr player = getPlayerPtr();
-
             int bounty = player.getClass().getNpcStats(player).getBounty();
             player.getClass().getNpcStats(player).setBounty(0);
             mPlayer->recordCrimeId();
@@ -3641,6 +3640,12 @@ namespace MWWorld
         }
         else
         {
+            if (MWBase::Environment::get().getMechanicsManager()->isAttackPreparing(player))
+            {
+                mPlayer->setAttackingOrSpell(false);
+            }
+
+            mPlayer->setDrawState(MWMechanics::DrawState_Nothing);
             mGoToJail = false;
 
             MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_Dialogue);

From 20cbf941fbe054bc24ff24feb3ef01f6b13c1842 Mon Sep 17 00:00:00 2001
From: wareya <wareya@gmail.com>
Date: Sun, 16 Jan 2022 17:58:04 -0500
Subject: [PATCH 1952/2859] re-introduce short circuiting, but only under
 certain circumstances

---
 apps/openmw/mwphysics/movementsolver.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/apps/openmw/mwphysics/movementsolver.cpp b/apps/openmw/mwphysics/movementsolver.cpp
index 1c06c9f00f..2f2abca487 100644
--- a/apps/openmw/mwphysics/movementsolver.cpp
+++ b/apps/openmw/mwphysics/movementsolver.cpp
@@ -322,6 +322,18 @@ namespace MWPhysics
                     newPosition = (newPosition + tracer.mEndPos)/2.0;
                 }
 
+                // short circuit if we went backwards, but only if it was mostly horizontal and we're on the ground
+                if (seenGround && newVelocity * origVelocity <= 0.0f)
+                {
+                    auto perpendicular = newVelocity ^ origVelocity;
+                    if (perpendicular.length2() > 0.0f)
+                    {
+                        perpendicular.normalize();
+                        if (std::abs(perpendicular.z()) > 0.7071f)
+                            break;
+                    }
+                }
+
                 // Do not allow sliding up steep slopes if there is gravity.
                 // The purpose of this is to prevent air control from letting you slide up tall, unwalkable slopes.
                 // For that purpose, it is not necessary to do it when trying to slide along acute seams/crevices (i.e. usedSeamLogic)

From 886dee57ee3bea182d5ac18555513ae121fd2b08 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Mon, 17 Jan 2022 08:05:19 +0000
Subject: [PATCH 1953/2859] Always use /bigobj, clean up scattered uses into
 one

---
 CMakeLists.txt                        | 45 ++++++++++++++++-----------
 apps/openmw/CMakeLists.txt            |  7 -----
 apps/openmw_test_suite/CMakeLists.txt |  8 -----
 3 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 67a8f7c679..ae840fb8b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -167,6 +167,16 @@ option(OPENMW_OSX_DEPLOYMENT OFF)
 
 if (MSVC)
     option(OPENMW_MP_BUILD "Build OpenMW with /MP flag" OFF)
+    if (OPENMW_MP_BUILD)
+        add_compile_options(/MP)
+    endif()
+
+    # \bigobj is required:
+    #  1) for OPENMW_UNITY_BUILD;
+    #  2) to compile lua bindings in components, openmw and tests, because sol3 is heavily templated.
+    # there should be no relevant downsides to having it on:
+    # https://docs.microsoft.com/en-us/cpp/build/reference/bigobj-increase-number-of-sections-in-dot-obj-file
+    add_compile_options(/bigobj)
 endif()
 
 # Set up common paths
@@ -610,10 +620,6 @@ endif()
 
 if (WIN32)
   if (MSVC)
-    if (OPENMW_MP_BUILD)
-        set( MT_BUILD "/MP")
-    endif()
-
     foreach( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} )
         string( TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG )
         set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} "$(SolutionDir)$(Configuration)" )
@@ -662,54 +668,55 @@ if (WIN32)
         set(WARNINGS "${WARNINGS} /wd${d}")
     endforeach(d)
 
-    set_target_properties(components PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}")
-    set_target_properties(osg-ffmpeg-videoplayer PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}")
+    set_target_properties(components PROPERTIES COMPILE_FLAGS "${WARNINGS}")
+    set_target_properties(osg-ffmpeg-videoplayer PROPERTIES COMPILE_FLAGS "${WARNINGS}")
     
     if (MSVC_VERSION GREATER_EQUAL 1915 AND MSVC_VERSION LESS 1920)
         target_compile_definitions(components INTERFACE _ENABLE_EXTENDED_ALIGNED_STORAGE)
     endif()
 
     if (BUILD_BSATOOL)
-        set_target_properties(bsatool PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}")
+        set_target_properties(bsatool PROPERTIES COMPILE_FLAGS "${WARNINGS}")
     endif()
 
     if (BUILD_ESMTOOL)
-        set_target_properties(esmtool PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}")
+        set_target_properties(esmtool PROPERTIES COMPILE_FLAGS "${WARNINGS}")
     endif()
 
     if (BUILD_ESSIMPORTER)
-        set_target_properties(openmw-essimporter PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}")
+        set_target_properties(openmw-essimporter PROPERTIES COMPILE_FLAGS "${WARNINGS}")
     endif()
 
     if (BUILD_LAUNCHER)
-        set_target_properties(openmw-launcher PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}")
+        set_target_properties(openmw-launcher PROPERTIES COMPILE_FLAGS "${WARNINGS}")
     endif()
 
     if (BUILD_MWINIIMPORTER)
-        set_target_properties(openmw-iniimporter PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}")
+        set_target_properties(openmw-iniimporter PROPERTIES COMPILE_FLAGS "${WARNINGS}")
     endif()
 
     if (BUILD_OPENCS)
-        set_target_properties(openmw-cs PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}")
+        set_target_properties(openmw-cs PROPERTIES COMPILE_FLAGS "${WARNINGS}")
     endif()
 
     if (BUILD_OPENMW)
-        # \bigobj is required:
-        #  1) for OPENMW_UNITY_BUILD;
-        #  2) to compile lua bindings, because sol3 is heavily templated.
-        set_target_properties(openmw PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD} /bigobj")
+        set_target_properties(openmw PROPERTIES COMPILE_FLAGS "${WARNINGS}")
     endif()
 
     if (BUILD_WIZARD)
-        set_target_properties(openmw-wizard PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}")
+        set_target_properties(openmw-wizard PROPERTIES COMPILE_FLAGS "${WARNINGS}")
+    endif()
+
+    if (BUILD_UNITTESTS)
+        set_target_properties(openmw_test_suite PROPERTIES COMPILE_FLAGS "${WARNINGS}")
     endif()
 
     if (BUILD_BENCHMARKS)
-        set_target_properties(openmw_detournavigator_navmeshtilescache_benchmark PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}")
+        set_target_properties(openmw_detournavigator_navmeshtilescache_benchmark PROPERTIES COMPILE_FLAGS "${WARNINGS}")
     endif()
 
     if (BUILD_NAVMESHTOOL)
-        set_target_properties(openmw-navmeshtool PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}")
+        set_target_properties(openmw-navmeshtool PROPERTIES COMPILE_FLAGS "${WARNINGS}")
     endif()
   endif(MSVC)
 
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index b54ecb416c..ea1d48885c 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -207,13 +207,6 @@ if (BUILD_WITH_CODE_COVERAGE)
   target_link_libraries(openmw gcov)
 endif()
 
-if (MSVC)
-    # Debug version needs increased number of sections beyond 2^16
-    if (CMAKE_CL_64)
-        set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /bigobj")
-    endif (CMAKE_CL_64)
-endif (MSVC)
-
 if (WIN32)
     INSTALL(TARGETS openmw RUNTIME DESTINATION ".")
 endif (WIN32)
diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index da68a21998..2ee34186d8 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -87,14 +87,6 @@ if (GTEST_FOUND AND GMOCK_FOUND)
         target_link_libraries(openmw_test_suite gcov)
     endif()
 
-    if (MSVC)
-        if (CMAKE_CL_64)
-            # Debug version of openmw_unit_tests needs increased number of sections beyond 2^16
-            # just like openmw and openmw-cs
-            set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /bigobj")
-        endif (CMAKE_CL_64)
-    endif (MSVC)
-
     file(DOWNLOAD
         https://gitlab.com/OpenMW/example-suite/-/raw/8966dab24692555eec720c854fb0f73d108070cd/data/template.omwgame
         ${CMAKE_CURRENT_BINARY_DIR}/data/template.omwgame

From d1d8f058acf1e8494e114829a9b5e398a0a92efb Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Mon, 17 Jan 2022 22:35:06 +0000
Subject: [PATCH 1954/2859] Lua bindings for Colours

---
 .../lua/test_serialization.cpp                |  24 ++++
 .../lua/test_utilpackage.cpp                  |  46 +++++++
 components/CMakeLists.txt                     |   2 +-
 components/lua/serialization.cpp              |  41 +++++++
 components/lua/utilpackage.cpp                | 108 +++++++++++------
 components/lua/utilpackage.hpp                |   2 +
 components/misc/color.cpp                     |  59 +++++++++
 components/misc/color.hpp                     |  34 ++++++
 files/lua_api/openmw/util.lua                 | 113 +++++++++++++++++-
 9 files changed, 390 insertions(+), 39 deletions(-)
 create mode 100644 components/misc/color.cpp
 create mode 100644 components/misc/color.hpp

diff --git a/apps/openmw_test_suite/lua/test_serialization.cpp b/apps/openmw_test_suite/lua/test_serialization.cpp
index 1d664b06a4..5a6d5b7e51 100644
--- a/apps/openmw_test_suite/lua/test_serialization.cpp
+++ b/apps/openmw_test_suite/lua/test_serialization.cpp
@@ -5,11 +5,13 @@
 #include <osg/Quat>
 #include <osg/Vec2f>
 #include <osg/Vec3f>
+#include <osg/Vec4f>
 
 #include <components/lua/serialization.hpp>
 #include <components/lua/utilpackage.hpp>
 
 #include <components/misc/endianness.hpp>
+#include <components/misc/color.hpp>
 
 #include "testing_util.hpp"
 
@@ -90,6 +92,7 @@ namespace
         sol::state lua;
         osg::Vec2f vec2(1, 2);
         osg::Vec3f vec3(1, 2, 3);
+        osg::Vec4f vec4(1, 2, 3, 4);
 
         {
             std::string serialized = LuaUtil::serialize(sol::make_object(lua, vec2));
@@ -105,6 +108,27 @@ namespace
             ASSERT_TRUE(value.is<osg::Vec3f>());
             EXPECT_EQ(value.as<osg::Vec3f>(), vec3);
         }
+        {
+            std::string serialized = LuaUtil::serialize(sol::make_object(lua, vec4));
+            EXPECT_EQ(serialized.size(), 34); // version, type, 4x double
+            sol::object value = LuaUtil::deserialize(lua, serialized);
+            ASSERT_TRUE(value.is<osg::Vec4f>());
+            EXPECT_EQ(value.as<osg::Vec4f>(), vec4);
+        }
+    }
+
+    TEST(LuaSerializationTest, Color)
+    {
+        sol::state lua;
+        Misc::Color color(1, 1, 1, 1);
+
+        {
+            std::string serialized = LuaUtil::serialize(sol::make_object(lua, color));
+            EXPECT_EQ(serialized.size(), 18); // version, type, 4x float
+            sol::object value = LuaUtil::deserialize(lua, serialized);
+            ASSERT_TRUE(value.is<Misc::Color>());
+            EXPECT_EQ(value.as<Misc::Color>(), color);
+        }
     }
 
     TEST(LuaSerializationTest, Transform) {
diff --git a/apps/openmw_test_suite/lua/test_utilpackage.cpp b/apps/openmw_test_suite/lua/test_utilpackage.cpp
index 953d5f50d3..ba19cca383 100644
--- a/apps/openmw_test_suite/lua/test_utilpackage.cpp
+++ b/apps/openmw_test_suite/lua/test_utilpackage.cpp
@@ -70,6 +70,52 @@ namespace
         EXPECT_FLOAT_EQ(get<float>(lua, "len"), 0);
     }
 
+    TEST(LuaUtilPackageTest, Vector4)
+    {
+        sol::state lua;
+        lua.open_libraries(sol::lib::base, sol::lib::math, sol::lib::string);
+        lua["util"] = LuaUtil::initUtilPackage(lua);
+        lua.safe_script("v = util.vector4(5, 12, 13, 15)");
+        EXPECT_FLOAT_EQ(get<float>(lua, "v.x"), 5);
+        EXPECT_FLOAT_EQ(get<float>(lua, "v.y"), 12);
+        EXPECT_FLOAT_EQ(get<float>(lua, "v.z"), 13);
+        EXPECT_FLOAT_EQ(get<float>(lua, "v.w"), 15);
+        EXPECT_EQ(get<std::string>(lua, "tostring(v)"), "(5, 12, 13, 15)");
+        EXPECT_FLOAT_EQ(get<float>(lua, "util.vector4(4, 0, 0, 3):length()"), 5);
+        EXPECT_FLOAT_EQ(get<float>(lua, "util.vector4(4, 0, 0, 3):length2()"), 25);
+        EXPECT_FALSE(get<bool>(lua, "util.vector4(1, 2, 3, 4) == util.vector4(1, 3, 2, 4)"));
+        EXPECT_TRUE(get<bool>(lua, "util.vector4(1, 2, 3, 4) + util.vector4(2, 5, 1, 2) == util.vector4(3, 7, 4, 6)"));
+        EXPECT_TRUE(get<bool>(lua, "util.vector4(1, 2, 3, 4) - util.vector4(2, 5, 1, 7) == -util.vector4(1, 3, -2, 3)"));
+        EXPECT_TRUE(get<bool>(lua, "util.vector4(1, 2, 3, 4) == util.vector4(2, 4, 6, 8) / 2"));
+        EXPECT_TRUE(get<bool>(lua, "util.vector4(1, 2, 3, 4) * 2 == util.vector4(2, 4, 6, 8)"));
+        EXPECT_FLOAT_EQ(get<float>(lua, "util.vector4(3, 2, 1, 4) * v"), 5 * 3 + 12 * 2 + 13 * 1 + 15 * 4);
+        EXPECT_FLOAT_EQ(get<float>(lua, "util.vector4(3, 2, 1, 4):dot(v)"), 5 * 3 + 12 * 2 + 13 * 1 + 15 * 4);
+        lua.safe_script("v2, len = util.vector4(3, 0, 0, 4):normalize()");
+        EXPECT_FLOAT_EQ(get<float>(lua, "len"), 5);
+        EXPECT_TRUE(get<bool>(lua, "v2 == util.vector4(3/5, 0, 0, 4/5)"));
+        lua.safe_script("_, len = util.vector4(0, 0, 0, 0):normalize()");
+        EXPECT_FLOAT_EQ(get<float>(lua, "len"), 0);
+    }
+
+    TEST(LuaUtilPackageTest, Color)
+    {
+        sol::state lua;
+        lua.open_libraries(sol::lib::base, sol::lib::math, sol::lib::string);
+        lua["util"] = LuaUtil::initUtilPackage(lua);
+        lua.safe_script("brown = util.color.rgba(0.75, 0.25, 0, 1)");
+        EXPECT_EQ(get<std::string>(lua, "tostring(brown)"), "(0.75, 0.25, 0, 1)");
+        lua.safe_script("blue = util.color.rgb(0, 1, 0, 1)");
+        EXPECT_EQ(get<std::string>(lua, "tostring(blue)"), "(0, 1, 0, 1)");
+        lua.safe_script("red = util.color.hex('ff0000')");
+        EXPECT_EQ(get<std::string>(lua, "tostring(red)"), "(1, 0, 0, 1)");
+        lua.safe_script("green = util.color.hex('00FF00')");
+        EXPECT_EQ(get<std::string>(lua, "tostring(green)"), "(0, 1, 0, 1)");
+        lua.safe_script("darkRed = util.color.hex('a01112')");
+        EXPECT_EQ(get<std::string>(lua, "darkRed:asHex()"), "a01112");
+        EXPECT_TRUE(get<bool>(lua, "green:asRgba() == util.vector4(0, 1, 0, 1)"));
+        EXPECT_TRUE(get<bool>(lua, "red:asRgb() == util.vector3(1, 0, 0)"));
+    }
+
     TEST(LuaUtilPackageTest, Transform)
     {
         sol::state lua;
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index f7382db1c7..59f1e331e4 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -93,7 +93,7 @@ add_component_dir (esmterrain
 
 add_component_dir (misc
     constants utf8stream stringops resourcehelpers rng messageformatparser weakcache thread
-    compression osguservalues errorMarker
+    compression osguservalues errorMarker color
     )
 
 add_component_dir (debug
diff --git a/components/lua/serialization.cpp b/components/lua/serialization.cpp
index e8f66c698c..d0bbbc9dc5 100644
--- a/components/lua/serialization.cpp
+++ b/components/lua/serialization.cpp
@@ -6,6 +6,7 @@
 #include <osg/Vec3f>
 #include <osg/Vec4f>
 
+#include <components/misc/color.hpp>
 #include <components/misc/endianness.hpp>
 
 #include "luastate.hpp"
@@ -28,6 +29,8 @@ namespace LuaUtil
         VEC3 =         0x11,
         TRANSFORM_M =  0x12,
         TRANSFORM_Q =  0x13,
+        VEC4 =         0x14,
+        COLOR =        0x15,
 
         // All values should be lesser than 0x20 (SHORT_STRING_FLAG).
     };
@@ -129,6 +132,26 @@ namespace LuaUtil
                 appendValue<double>(out, quat[i]);
             return;
         }
+        if (data.is<osg::Vec4f>())
+        {
+            appendType(out, SerializedType::VEC4);
+            osg::Vec4f v = data.as<osg::Vec4f>();
+            appendValue<double>(out, v.x());
+            appendValue<double>(out, v.y());
+            appendValue<double>(out, v.z());
+            appendValue<double>(out, v.w());
+            return;
+        }
+        if (data.is<Misc::Color>())
+        {
+            appendType(out, SerializedType::COLOR);
+            Misc::Color v = data.as<Misc::Color> ();
+            appendValue<float>(out, v.r());
+            appendValue<float>(out, v.g());
+            appendValue<float>(out, v.b());
+            appendValue<float>(out, v.a());
+            return;
+        }
         if (customSerializer && customSerializer->serialize(out, data))
             return;
         else
@@ -271,6 +294,24 @@ namespace LuaUtil
                 sol::stack::push<TransformQ>(lua, asTransform(q));
                 return;
             }
+            case SerializedType::VEC4:
+            {
+                float x = getValue<double>(binaryData);
+                float y = getValue<double>(binaryData);
+                float z = getValue<double>(binaryData);
+                float w = getValue<double>(binaryData);
+                sol::stack::push<osg::Vec4f>(lua, osg::Vec4f(x, y, z, w));
+                return;
+            }
+            case SerializedType::COLOR:
+            {
+                float r = getValue<float>(binaryData);
+                float g = getValue<float>(binaryData);
+                float b = getValue<float>(binaryData);
+                float a = getValue<float>(binaryData);
+                sol::stack::push<Misc::Color>(lua, Misc::Color(r, g, b, a));
+                return;
+            }
         }
         throw std::runtime_error("Unknown type in serialized data: " + std::to_string(type));
     }
diff --git a/components/lua/utilpackage.cpp b/components/lua/utilpackage.cpp
index abb680a6bc..c51b00a7d5 100644
--- a/components/lua/utilpackage.cpp
+++ b/components/lua/utilpackage.cpp
@@ -2,8 +2,10 @@
 
 #include <algorithm>
 #include <sstream>
+#include <array>
 
 #include <components/misc/mathutil.hpp>
+#include <components/misc/color.hpp>
 
 #include "luastate.hpp"
 
@@ -15,6 +17,12 @@ namespace sol
     template <>
     struct is_automagical<LuaUtil::Vec3> : std::false_type {};
 
+    template <>
+    struct is_automagical<LuaUtil::Vec4> : std::false_type {};
+
+    template <>
+    struct is_automagical<Misc::Color> : std::false_type {};
+
     template <>
     struct is_automagical<LuaUtil::TransformM> : std::false_type {};
 
@@ -24,6 +32,31 @@ namespace sol
 
 namespace LuaUtil
 {
+    namespace {
+        template<typename T>
+        void addVectorMethods(sol::usertype<T>& vectorType)
+        {
+            vectorType[sol::meta_function::unary_minus] = [](const T& a) { return -a; };
+            vectorType[sol::meta_function::addition] = [](const T& a, const T& b) { return a + b; };
+            vectorType[sol::meta_function::subtraction] = [](const T& a, const T& b) { return a - b; };
+            vectorType[sol::meta_function::equal_to] = [](const T& a, const T& b) { return a == b; };
+            vectorType[sol::meta_function::multiplication] = sol::overload(
+                [](const T& a, float c) { return a * c; },
+                [](const T& a, const T& b) { return a * b; });
+            vectorType[sol::meta_function::division] = [](const T& a, float c) { return a / c; };
+            vectorType["dot"] = [](const T& a, const T b) { return a * b; };
+            vectorType["length"] = &T::length;
+            vectorType["length2"] = &T::length2;
+            vectorType["normalize"] = [](const T& v)
+            {
+                float len = v.length();
+                if (len == 0)
+                    return std::make_tuple(T(), 0.f);
+                else
+                    return std::make_tuple(v * (1.f / len), len);
+            };
+        }
+    }
 
     sol::table initUtilPackage(sol::state& lua)
     {
@@ -34,29 +67,13 @@ namespace LuaUtil
         sol::usertype<Vec2> vec2Type = lua.new_usertype<Vec2>("Vec2");
         vec2Type["x"] = sol::readonly_property([](const Vec2& v) -> float { return v.x(); } );
         vec2Type["y"] = sol::readonly_property([](const Vec2& v) -> float { return v.y(); } );
-        vec2Type[sol::meta_function::to_string] = [](const Vec2& v) {
+        vec2Type[sol::meta_function::to_string] = [](const Vec2& v)
+        {
             std::stringstream ss;
             ss << "(" << v.x() << ", " << v.y() << ")";
             return ss.str();
         };
-        vec2Type[sol::meta_function::unary_minus] = [](const Vec2& a) { return -a; };
-        vec2Type[sol::meta_function::addition] = [](const Vec2& a, const Vec2& b) { return a + b; };
-        vec2Type[sol::meta_function::subtraction] = [](const Vec2& a, const Vec2& b) { return a - b; };
-        vec2Type[sol::meta_function::equal_to] = [](const Vec2& a, const Vec2& b) { return a == b; };
-        vec2Type[sol::meta_function::multiplication] = sol::overload(
-            [](const Vec2& a, float c) { return a * c; },
-            [](const Vec2& a, const Vec2& b) { return a * b; });
-        vec2Type[sol::meta_function::division] = [](const Vec2& a, float c) { return a / c; };
-        vec2Type["dot"] = [](const Vec2& a, const Vec2& b) { return a * b; };
-        vec2Type["length"] = &Vec2::length;
-        vec2Type["length2"] = &Vec2::length2;
-        vec2Type["normalize"] = [](const Vec2& v) {
-            float len = v.length();
-            if (len == 0)
-                return std::make_tuple(Vec2(), 0.f);
-            else
-                return std::make_tuple(v * (1.f / len), len);
-        };
+        addVectorMethods<Vec2>(vec2Type);
         vec2Type["rotate"] = &Misc::rotateVec2f;
 
         // Lua bindings for Vec3
@@ -65,31 +82,48 @@ namespace LuaUtil
         vec3Type["x"] = sol::readonly_property([](const Vec3& v) -> float { return v.x(); } );
         vec3Type["y"] = sol::readonly_property([](const Vec3& v) -> float { return v.y(); } );
         vec3Type["z"] = sol::readonly_property([](const Vec3& v) -> float { return v.z(); } );
-        vec3Type[sol::meta_function::to_string] = [](const Vec3& v) {
+        vec3Type[sol::meta_function::to_string] = [](const Vec3& v)
+        {
             std::stringstream ss;
             ss << "(" << v.x() << ", " << v.y() << ", " << v.z() << ")";
             return ss.str();
         };
-        vec3Type[sol::meta_function::unary_minus] = [](const Vec3& a) { return -a; };
-        vec3Type[sol::meta_function::addition] = [](const Vec3& a, const Vec3& b) { return a + b; };
-        vec3Type[sol::meta_function::subtraction] = [](const Vec3& a, const Vec3& b) { return a - b; };
-        vec3Type[sol::meta_function::equal_to] = [](const Vec3& a, const Vec3& b) { return a == b; };
-        vec3Type[sol::meta_function::multiplication] = sol::overload(
-            [](const Vec3& a, float c) { return a * c; },
-            [](const Vec3& a, const Vec3& b) { return a * b; });
-        vec3Type[sol::meta_function::division] = [](const Vec3& a, float c) { return a / c; };
+        addVectorMethods<Vec3>(vec3Type);
         vec3Type[sol::meta_function::involution] = [](const Vec3& a, const Vec3& b) { return a ^ b; };
-        vec3Type["dot"] = [](const Vec3& a, const Vec3& b) { return a * b; };
         vec3Type["cross"] = [](const Vec3& a, const Vec3& b) { return a ^ b; };
-        vec3Type["length"] = &Vec3::length;
-        vec3Type["length2"] = &Vec3::length2;
-        vec3Type["normalize"] = [](const Vec3& v) {
-            float len = v.length();
-            if (len == 0)
-                return std::make_tuple(Vec3(), 0.f);
-            else
-                return std::make_tuple(v * (1.f / len), len);
+
+        // Lua bindings for Vec4
+        util["vector4"] = [](float x, float y, float z, float w)
+        { return Vec4(x, y, z, w); };
+        sol::usertype<Vec4> vec4Type = lua.new_usertype<Vec4>("Vec4");
+        vec4Type["x"] = sol::readonly_property([](const Vec4& v) -> float { return v.x(); });
+        vec4Type["y"] = sol::readonly_property([](const Vec4& v) -> float { return v.y(); });
+        vec4Type["z"] = sol::readonly_property([](const Vec4& v) -> float { return v.z(); });
+        vec4Type["w"] = sol::readonly_property([](const Vec4& v) -> float { return v.w(); });
+        vec4Type[sol::meta_function::to_string] = [](const Vec4& v)
+        {
+            std::stringstream ss;
+            ss << "(" << v.x() << ", " << v.y() << ", " << v.z() << ", " << v.w() << ")";
+            return ss.str();
         };
+        addVectorMethods<Vec4>(vec4Type);
+
+        // Lua bindings for Color
+        sol::usertype<Misc::Color> colorType = lua.new_usertype<Misc::Color>("Color");
+        colorType["r"] = [](const Misc::Color& c) { return c.r(); };
+        colorType["g"] = [](const Misc::Color& c) { return c.g(); };
+        colorType["b"] = [](const Misc::Color& c) { return c.b(); };
+        colorType["a"] = [](const Misc::Color& c) { return c.a(); };
+        colorType[sol::meta_function::to_string] = [](const Misc::Color& c) { return c.toString(); };
+        colorType["asRgba"] = [](const Misc::Color& c) { return Vec4(c.r(), c.g(), c.b(), c.a()); };
+        colorType["asRgb"] = [](const Misc::Color& c) { return Vec3(c.r(), c.g(), c.b()); };
+        colorType["asHex"] = [](const Misc::Color& c) { return c.toHex(); };
+
+        sol::table color(lua, sol::create);
+        color["rgba"] = [](float r, float g, float b, float a) { return Misc::Color(r, g, b, a); };
+        color["rgb"] = [](float r, float g, float b) { return Misc::Color(r, g, b, 1); };
+        color["hex"] = [](std::string_view hex) { return Misc::Color::fromHex(hex); };
+        util["color"] = LuaUtil::makeReadOnly(color);
 
         // Lua bindings for Transform
         sol::usertype<TransformM> transMType = lua.new_usertype<TransformM>("TransformM");
diff --git a/components/lua/utilpackage.hpp b/components/lua/utilpackage.hpp
index d26bfdb027..a647b682af 100644
--- a/components/lua/utilpackage.hpp
+++ b/components/lua/utilpackage.hpp
@@ -3,6 +3,7 @@
 
 #include <osg/Vec2>
 #include <osg/Vec3>
+#include <osg/Vec4>
 #include <osg/Matrix>
 
 #include <sol/sol.hpp>
@@ -11,6 +12,7 @@ namespace LuaUtil
 {
     using Vec2 = osg::Vec2f;
     using Vec3 = osg::Vec3f;
+    using Vec4 = osg::Vec4f;
 
     // For performance reasons "Transform" is implemented as 2 types with the same interface.
     // Transform supports only composition, inversion, and applying to a 3d vector.
diff --git a/components/misc/color.cpp b/components/misc/color.cpp
new file mode 100644
index 0000000000..edf3435428
--- /dev/null
+++ b/components/misc/color.cpp
@@ -0,0 +1,59 @@
+#include "color.hpp"
+
+#include <charconv>
+#include <array>
+#include <sstream>
+#include <algorithm>
+
+namespace Misc
+{
+    Color::Color(float r, float g, float b, float a)
+        : mR(std::clamp(r, 0.f, 1.f))
+        , mG(std::clamp(g, 0.f, 1.f))
+        , mB(std::clamp(b, 0.f, 1.f))
+        , mA(std::clamp(a, 0.f, 1.f))
+    {}
+
+    std::string Color::toString() const
+    {
+        std::ostringstream ss;
+        ss << "(" << r() << ", " << g() << ", " << b() << ", " << a() << ')';
+        return ss.str();
+    }
+
+    Color Color::fromHex(std::string_view hex)
+    {
+        if (hex.size() != 6)
+            throw std::logic_error(std::string("Invalid hex color: ") += hex);
+        std::array<float, 3> rgb;
+        for (size_t i = 0; i < rgb.size(); i++)
+        {
+            auto sub = hex.substr(i * 2, 2);
+            int v;
+            auto [_, ec] = std::from_chars(sub.data(), sub.data() + sub.size(), v, 16);
+            if (ec != std::errc())
+                throw std::logic_error(std::string("Invalid hex color: ") += hex);
+            rgb[i] = v / 255.0f;
+        }
+        return Color(rgb[0], rgb[1], rgb[2], 1);
+    }
+
+    std::string Color::toHex() const
+    {
+        std::string result(6, '0');
+        std::array<float, 3> rgb = { mR, mG, mB };
+        for (size_t i = 0; i < rgb.size(); i++)
+        {
+            int b = static_cast<int>(rgb[i] * 255.0f);
+            auto [_, ec] = std::to_chars(result.data() + i * 2, result.data() + (i + 1) * 2, b, 16);
+            if (ec != std::errc())
+                throw std::logic_error("Error when converting number to base 16");
+        }
+        return result;
+    }
+
+    bool operator==(const Color& l, const Color& r)
+    {
+        return l.mR == r.mR && l.mG == r.mG && l.mB == r.mB && l.mA == r.mA;
+    }
+}
diff --git a/components/misc/color.hpp b/components/misc/color.hpp
new file mode 100644
index 0000000000..932d261fad
--- /dev/null
+++ b/components/misc/color.hpp
@@ -0,0 +1,34 @@
+#ifndef COMPONENTS_MISC_COLOR
+#define COMPONENTS_MISC_COLOR
+
+#include <string>
+
+namespace Misc
+{
+    class Color
+    {
+        public:
+            Color(float r, float g, float b, float a);
+
+            float r() const { return mR; }
+            float g() const { return mG; }
+            float b() const { return mB; }
+            float a() const { return mA; }
+
+            std::string toString() const;
+
+            static Color fromHex(std::string_view hex);
+
+            std::string toHex() const;
+
+            friend bool operator==(const Color& l, const Color& r);
+
+        private:
+            float mR;
+            float mG;
+            float mB;
+            float mA;
+    };
+}
+
+#endif // !COMPONENTS_MISC_COLOR
diff --git a/files/lua_api/openmw/util.lua b/files/lua_api/openmw/util.lua
index 22986f09a6..ea7d037daa 100644
--- a/files/lua_api/openmw/util.lua
+++ b/files/lua_api/openmw/util.lua
@@ -133,7 +133,7 @@
 -------------------------------------------------------------------------------
 -- Normalizes vector.
 -- Returns two values: normalized vector and the length of the original vector.
--- It doesn't change the original vector. 
+-- It doesn't change the original vector.
 -- @function [parent=#Vector3] normalize
 -- @param self
 -- @return #Vector3, #number
@@ -152,6 +152,117 @@
 -- @param #Vector3 v
 -- @return #Vector3
 
+
+-------------------------------------------------------------------------------
+-- Immutable 4D vector.
+-- @type Vector4
+-- @field #number x
+-- @field #number y
+-- @field #number z
+-- @field #number w
+-- @usage
+-- v = util.vector4(3, 4, 5, 6)
+-- v.x, v.y, v.z, v.w  -- 3.0, 4.0, 5.0, 6.0
+-- str(v)         -- "(3.0, 4.0, 5.0, 6.0)"
+-- v:length()     -- length
+-- v:length2()    -- square of the length
+-- v:normalize()  -- normalized vector
+-- v1:dot(v2)     -- dot product (returns a number)
+-- v1 * v2        -- dot product (returns a number)
+-- v1 + v2        -- vector addition
+-- v1 - v2        -- vector subtraction
+-- v1 * x         -- multiplication by a number
+-- v1 / x         -- division by a number
+
+-------------------------------------------------------------------------------
+-- Creates a new 4D vector. Vectors are immutable and can not be changed after creation.
+-- @function [parent=#util] vector4
+-- @param #number x.
+-- @param #number y.
+-- @param #number z.
+-- @param #number w.
+-- @return #Vector4.
+
+-------------------------------------------------------------------------------
+-- Length of the vector
+-- @function [parent=#Vector4] length
+-- @param self
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Square of the length of the vector
+-- @function [parent=#Vector4] length2
+-- @param self
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Normalizes vector.
+-- Returns two values: normalized vector and the length of the original vector.
+-- It doesn't change the original vector.
+-- @function [parent=#Vector4] normalize
+-- @param self
+-- @return #Vector4, #number
+
+-------------------------------------------------------------------------------
+-- Dot product.
+-- @function [parent=#Vector4] dot
+-- @param self
+-- @param #Vector4 v
+-- @return #number
+
+-------------------------------------------------------------------------------
+-- Color in RGBA format. All of the component values are in the range [0, 1].
+-- @type Color
+-- @field #number r Red component
+-- @field #number g Green component
+-- @field #number b Blue component
+-- @field #number a Alpha (transparency) component
+
+-------------------------------------------------------------------------------
+-- Returns a Vector4 with RGBA components of the Color.
+-- @function [parent=#Color] asRgba
+-- @param self
+-- @return #Vector4
+
+-------------------------------------------------------------------------------
+-- Returns a Vector3 with RGB components of the Color.
+-- @function [parent=#Color] asRgb
+-- @param self
+-- @return #Vector3
+
+-------------------------------------------------------------------------------
+-- Converts the color into a HEX string.
+-- @function [parent=#Color] asHex
+-- @param self
+-- @return #string
+
+-------------------------------------------------------------------------------
+-- @type COLOR
+-- @field [parent=#util] #COLOR color Methods for creating #Color values from different formats.
+
+-------------------------------------------------------------------------------
+-- Creates a Color from RGBA format
+-- @function [parent=#COLOR] rgba
+-- @param #number r
+-- @param #number g
+-- @param #number b
+-- @param #number a
+-- @return #Color
+
+-------------------------------------------------------------------------------
+-- Creates a Color from RGB format. Equivalent to calling util.rgba with a = 1.
+-- @function [parent=#COLOR] rgb
+-- @param #number r
+-- @param #number g
+-- @param #number b
+-- @return #Color
+
+-------------------------------------------------------------------------------
+-- Parses a hex color string into a Color.
+-- @function [parent=#COLOR] hex
+-- @param #string hex A hex color string in RRGGBB format (e. g. "ff0000").
+-- @return #Color
+
 -------------------------------------------------------------------------------
 -- @type Transform
 

From cc528d2e0800e7ad258073f6be70224e0f7926c0 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Tue, 18 Jan 2022 08:12:56 +0000
Subject: [PATCH 1955/2859] Dispose Lua UI elements correctly

---
 apps/openmw/mwgui/windowmanagerimp.cpp        |  4 ++-
 apps/openmw/mwlua/luamanagerimp.cpp           |  7 ++++--
 apps/openmw/mwlua/uibindings.cpp              | 15 ++---------
 components/CMakeLists.txt                     |  2 +-
 components/lua_ui/element.cpp                 | 25 ++++++++++++++++---
 components/lua_ui/element.hpp                 | 14 +++++------
 components/lua_ui/text.cpp                    |  5 ----
 components/lua_ui/text.hpp                    |  1 -
 .../lua_ui/{widgetlist.cpp => util.cpp}       | 10 +++++++-
 .../lua_ui/{widgetlist.hpp => util.hpp}       |  2 ++
 components/lua_ui/widget.cpp                  | 15 ++++-------
 components/lua_ui/widget.hpp                  |  8 +++---
 12 files changed, 59 insertions(+), 49 deletions(-)
 rename components/lua_ui/{widgetlist.cpp => util.cpp} (81%)
 rename components/lua_ui/{widgetlist.hpp => util.hpp} (89%)

diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 8e7951667b..37807fdf2a 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -53,7 +53,7 @@
 #include <components/misc/resourcehelpers.hpp>
 #include <components/misc/frameratelimiter.hpp>
 
-#include <components/lua_ui/widgetlist.hpp>
+#include <components/lua_ui/util.hpp>
 
 #include "../mwbase/inputmanager.hpp"
 #include "../mwbase/statemanager.hpp"
@@ -510,6 +510,8 @@ namespace MWGui
     {
         try
         {
+            LuaUi::clearUserInterface();
+
             mStatsWatcher.reset();
 
             MyGUI::LanguageManager::getInstance().eventRequestTag.clear();
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index fc6dc86285..8211c37abf 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -12,6 +12,8 @@
 
 #include <components/lua/utilpackage.hpp>
 
+#include <components/lua_ui/util.hpp>
+
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/class.hpp"
@@ -237,6 +239,7 @@ namespace MWLua
 
     void LuaManager::clear()
     {
+        LuaUi::clearUserInterface();
         mActiveLocalScripts.clear();
         mLocalEvents.clear();
         mGlobalEvents.clear();
@@ -254,7 +257,6 @@ namespace MWLua
             mPlayer.getRefData().setLuaScripts(nullptr);
             mPlayer = MWWorld::Ptr();
         }
-        clearUserInterface();
         mGlobalStorage.clearTemporary();
         mPlayerStorage.clearTemporary();
     }
@@ -454,6 +456,8 @@ namespace MWLua
     void LuaManager::reloadAllScripts()
     {
         Log(Debug::Info) << "Reload Lua";
+
+        LuaUi::clearUserInterface(); 
         mLua.dropScriptCache();
         initConfiguration();
 
@@ -470,7 +474,6 @@ namespace MWLua
                 continue;
             ESM::LuaScripts data;
             scripts->save(data);
-            clearUserInterface();
             scripts->load(data);
         }
         for (LocalScripts* scripts : mActiveLocalScripts)
diff --git a/apps/openmw/mwlua/uibindings.cpp b/apps/openmw/mwlua/uibindings.cpp
index 987304d4c3..61e7c471c1 100644
--- a/apps/openmw/mwlua/uibindings.cpp
+++ b/apps/openmw/mwlua/uibindings.cpp
@@ -1,4 +1,4 @@
-#include <components/lua_ui/widgetlist.hpp>
+#include <components/lua_ui/util.hpp>
 #include <components/lua_ui/element.hpp>
 #include <components/lua_ui/layers.hpp>
 #include <components/lua_ui/content.hpp>
@@ -11,8 +11,6 @@ namespace MWLua
 {
     namespace
     {
-        std::set<LuaUi::Element*> allElements;
-
         class UiAction final : public Action
         {
             public:
@@ -189,7 +187,6 @@ namespace MWLua
         {
             if (element->mDestroy)
                 return;
-            allElements.erase(element.get());
             element->mDestroy = true;
             context.mLuaManager->addAction(std::make_unique<UiAction>(UiAction::DESTROY, element, context.mLua));
         };
@@ -205,8 +202,7 @@ namespace MWLua
         };
         api["create"] = [context](const sol::table& layout)
         {
-            auto element = std::make_shared<LuaUi::Element>(layout);
-            allElements.emplace(element.get());
+            auto element = LuaUi::Element::make(layout);
             context.mLuaManager->addAction(std::make_unique<UiAction>(UiAction::CREATE, element, context.mLua));
             return element;
         };
@@ -244,11 +240,4 @@ namespace MWLua
 
         return LuaUtil::makeReadOnly(api);
     }
-    
-    void clearUserInterface()
-    {
-        for (auto element : allElements)
-            element->destroy();
-        allElements.clear();
-    }
 }
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index f7382db1c7..c12bc98f32 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -162,7 +162,7 @@ add_component_dir (queries
     )
     
 add_component_dir (lua_ui
-    widget widgetlist element layers content
+    widget element util layers content
     text textedit window
     )
 
diff --git a/components/lua_ui/element.cpp b/components/lua_ui/element.cpp
index 5147068a7e..dcb21c32a0 100644
--- a/components/lua_ui/element.cpp
+++ b/components/lua_ui/element.cpp
@@ -3,11 +3,10 @@
 #include <MyGUI_Gui.h>
 
 #include "content.hpp"
-#include "widgetlist.hpp"
+#include "util.hpp"
 
 namespace LuaUi
 {
-
     std::string widgetType(const sol::table& layout)
     {
         return layout.get_or("type", std::string("LuaWidget"));
@@ -70,7 +69,7 @@ namespace LuaUi
         if (!ext)
             throw std::runtime_error("Invalid widget!");
 
-        ext->create(layout.lua_state(), widget);
+        ext->initialize(layout.lua_state(), widget);
         if (parent != nullptr)
             widget->attachToWidget(parent->widget());
 
@@ -87,7 +86,7 @@ namespace LuaUi
 
     void destroyWidget(LuaUi::WidgetExtension* ext)
     {
-        ext->destroy();
+        ext->deinitialize();
         MyGUI::Gui::getInstancePtr()->destroyWidget(ext->widget());
     }
 
@@ -136,6 +135,23 @@ namespace LuaUi
         }
     }
 
+    std::map<Element*, std::shared_ptr<Element>> Element::sAllElements;
+
+    Element::Element(sol::table layout)
+        : mRoot{ nullptr }
+        , mLayout{ std::move(layout) }
+        , mUpdate{ false }
+        , mDestroy{ false }
+    {}
+
+
+    std::shared_ptr<Element> Element::make(sol::table layout)
+    {
+        std::shared_ptr<Element> ptr(new Element(std::move(layout)));
+        sAllElements[ptr.get()] = ptr;
+        return ptr;
+    }
+
     void Element::create()
     {
         assert(!mRoot);
@@ -161,5 +177,6 @@ namespace LuaUi
         if (mRoot)
             destroyWidget(mRoot);
         mRoot = nullptr;
+        sAllElements.erase(this);
     }
 }
diff --git a/components/lua_ui/element.hpp b/components/lua_ui/element.hpp
index 10e10d8960..daaf340660 100644
--- a/components/lua_ui/element.hpp
+++ b/components/lua_ui/element.hpp
@@ -7,13 +7,7 @@ namespace LuaUi
 {
     struct Element
     {
-        Element(sol::table layout)
-            : mRoot{ nullptr }
-            , mLayout{ layout }
-            , mUpdate{ false }
-            , mDestroy{ false }
-        {
-        }
+        static std::shared_ptr<Element> make(sol::table layout);
 
         LuaUi::WidgetExtension* mRoot;
         sol::table mLayout;
@@ -25,6 +19,12 @@ namespace LuaUi
         void update();
 
         void destroy();
+
+        friend void clearUserInterface();
+
+        private:
+            Element(sol::table layout);
+            static std::map<Element*, std::shared_ptr<Element>> sAllElements;
     };
 }
 
diff --git a/components/lua_ui/text.cpp b/components/lua_ui/text.cpp
index 4ae9865ac3..f93f8eecf0 100644
--- a/components/lua_ui/text.cpp
+++ b/components/lua_ui/text.cpp
@@ -7,11 +7,6 @@ namespace LuaUi
         : mAutoSized(true)
     {}
 
-    void LuaText::initialize()
-    {
-        WidgetExtension::initialize();
-    }
-
     void LuaText::setProperties(sol::object props)
     {
         setCaption(parseProperty(props, "caption", std::string()));
diff --git a/components/lua_ui/text.hpp b/components/lua_ui/text.hpp
index d87a9001a2..533dc4f453 100644
--- a/components/lua_ui/text.hpp
+++ b/components/lua_ui/text.hpp
@@ -13,7 +13,6 @@ namespace LuaUi
 
         public:
             LuaText();
-            virtual void initialize() override;
             virtual void setProperties(sol::object) override;
 
         private:
diff --git a/components/lua_ui/widgetlist.cpp b/components/lua_ui/util.cpp
similarity index 81%
rename from components/lua_ui/widgetlist.cpp
rename to components/lua_ui/util.cpp
index c2a9bef990..8cadbc9cc2 100644
--- a/components/lua_ui/widgetlist.cpp
+++ b/components/lua_ui/util.cpp
@@ -1,4 +1,4 @@
-#include "widgetlist.hpp"
+#include "util.hpp"
 
 #include <MyGUI_FactoryManager.h>
 
@@ -7,6 +7,8 @@
 #include "textedit.hpp"
 #include "window.hpp"
 
+#include "element.hpp"
+
 namespace LuaUi
 {
 
@@ -28,4 +30,10 @@ namespace LuaUi
         };
         return types;
     }
+
+    void clearUserInterface()
+    {
+        while (!Element::sAllElements.empty())
+            Element::sAllElements.begin()->second->destroy();
+    }
 }
diff --git a/components/lua_ui/widgetlist.hpp b/components/lua_ui/util.hpp
similarity index 89%
rename from components/lua_ui/widgetlist.hpp
rename to components/lua_ui/util.hpp
index ff033fb6ca..3851e6c947 100644
--- a/components/lua_ui/widgetlist.hpp
+++ b/components/lua_ui/util.hpp
@@ -9,6 +9,8 @@ namespace LuaUi
     void registerAllWidgets();
 
     const std::unordered_map<std::string, std::string>& widgetTypeToName();
+
+    void clearUserInterface();
 }
 
 #endif // OPENMW_LUAUI_WIDGETLIST
diff --git a/components/lua_ui/widget.cpp b/components/lua_ui/widget.cpp
index 6d7bb5063c..50c6a193e6 100644
--- a/components/lua_ui/widget.cpp
+++ b/components/lua_ui/widget.cpp
@@ -26,7 +26,7 @@ namespace LuaUi
             it->second(argument, mLayout);
     }
 
-    void WidgetExtension::create(lua_State* lua, MyGUI::Widget* self)
+    void WidgetExtension::initialize(lua_State* lua, MyGUI::Widget* self)
     {
         mLua = lua;
         mWidget = self;
@@ -54,17 +54,9 @@ namespace LuaUi
         mWidget->eventKeyLostFocus += MyGUI::newDelegate(this, &WidgetExtension::focusLoss);
     }
 
-    void WidgetExtension::destroy()
-    {
-        clearCallbacks();
-        deinitialize();
-
-        for (WidgetExtension* child : mContent)
-            child->destroy();
-    }
-
     void WidgetExtension::deinitialize()
     {
+        clearCallbacks();
         mWidget->eventKeyButtonPressed.clear();
         mWidget->eventKeyButtonReleased.clear();
         mWidget->eventMouseButtonClick.clear();
@@ -78,6 +70,9 @@ namespace LuaUi
         mWidget->eventMouseLostFocus.clear();
         mWidget->eventKeySetFocus.clear();
         mWidget->eventKeyLostFocus.clear();
+
+        for (WidgetExtension* child : mContent)
+            child->deinitialize();
     }
 
     sol::table WidgetExtension::makeTable() const
diff --git a/components/lua_ui/widget.hpp b/components/lua_ui/widget.hpp
index 99d430f71c..f8ba105be5 100644
--- a/components/lua_ui/widget.hpp
+++ b/components/lua_ui/widget.hpp
@@ -22,9 +22,9 @@ namespace LuaUi
     public:
         WidgetExtension();
         // must be called after creating the underlying MyGUI::Widget
-        void create(lua_State* lua, MyGUI::Widget* self);
+        void initialize(lua_State* lua, MyGUI::Widget* self);
         // must be called after before destroying the underlying MyGUI::Widget
-        void destroy();
+        virtual void deinitialize();
 
         void addChild(WidgetExtension* ext);
         WidgetExtension* childAt(size_t index) const;
@@ -46,11 +46,11 @@ namespace LuaUi
         void setLayout(const sol::table& layout) { mLayout = layout; }
 
     protected:
+        virtual void initialize();
         sol::table makeTable() const;
         sol::object keyEvent(MyGUI::KeyCode) const;
         sol::object mouseEvent(int left, int top, MyGUI::MouseButton button) const;
-        virtual void initialize();
-        virtual void deinitialize();
+        
         virtual MyGUI::IntSize calculateSize();
         virtual MyGUI::IntPoint calculatePosition(const MyGUI::IntSize& size);
         MyGUI::IntCoord calculateCoord();

From ca6262c033ebb98d72514cdea20c9f76a3821107 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Tue, 18 Jan 2022 18:22:46 +0000
Subject: [PATCH 1956/2859] switch Static Deps and Tests from GCC to clang and
 set to -O0 to speed up builds

---
 .gitlab-ci.yml            | 20 +++++++++++++-------
 CI/before_script.linux.sh |  4 ++--
 extern/CMakeLists.txt     |  6 +++---
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8275df7572..fef2f39234 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -125,8 +125,8 @@ Ubuntu_GCC_tests_Debug:
     paths: []
     expire_in: 1 minute
 
-Ubuntu_GCC_Static_Deps:
-  extends: Ubuntu_GCC
+Ubuntu_Static_Deps:
+  extends: Ubuntu_Clang
   rules:
     - if: $CI_PIPELINE_SOURCE == "push"  
       changes:
@@ -136,24 +136,30 @@ Ubuntu_GCC_Static_Deps:
         - ".gitlab-ci.yml"
   allow_failure: true
   cache:
-    key: Ubuntu_GCC_Static_Deps
+    key: Ubuntu_Static_Deps.V1
     paths:
     - apt-cache/
     - ccache/
     - build/extern/fetched/
   before_script:
-    - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-static
+    - CI/install_debian_deps.sh clang openmw-deps openmw-deps-static
   variables:
     CI_OPENMW_USE_STATIC_DEPS: 1
+    CC: clang
+    CXX: clang++
+    CXXFLAGS: -O0
   timeout: 3h
 
-Ubuntu_GCC_Static_Deps_tests:
-  extends: Ubuntu_GCC_Static_Deps
+Ubuntu_Static_Deps_tests:
+  extends: Ubuntu_Static_Deps
   cache:
-    key: Ubuntu_GCC_Static_Deps_tests
+    key: Ubuntu_Static_Deps_tests.V1
   variables:
     CCACHE_SIZE: 1G
     BUILD_TESTS_ONLY: 1
+    CC: clang
+    CXX: clang++
+    CXXFLAGS: -O0
   artifacts:
     paths: []
     expire_in: 1 minute
diff --git a/CI/before_script.linux.sh b/CI/before_script.linux.sh
index 8278ffcd0e..2b1d156c77 100755
--- a/CI/before_script.linux.sh
+++ b/CI/before_script.linux.sh
@@ -17,7 +17,7 @@ fi
 CXX_FLAGS='-Werror -Wno-error=deprecated-declarations -Wno-error=nonnull -Wno-error=deprecated-copy'
 
 if [[ "${CXX}" == 'clang++' ]]; then
-    CXX_FLAGS="${CXX_FLAGS} -Wno-error=unused-lambda-capture -Wno-error=gnu-zero-variadic-macro-arguments"
+    CXX_FLAGS="${CXX_FLAGS} -Wno-error=unused-lambda-capture -Wno-error=gnu-zero-variadic-macro-arguments -Wno-error=misleading-indentation"
 fi
 
 declare -a CMAKE_CONF_OPTS=(
@@ -30,7 +30,7 @@ declare -a CMAKE_CONF_OPTS=(
     -DBUILD_SHARED_LIBS=OFF
     -DUSE_SYSTEM_TINYXML=ON
     -DCMAKE_INSTALL_PREFIX=install
-    -DCMAKE_C_FLAGS='-Werror'
+    -DCMAKE_C_FLAGS="-Werror -Wno-error=misleading-indentation"
     -DCMAKE_CXX_FLAGS="${CXX_FLAGS}"
     -DOPENMW_CXX_FLAGS="-Werror=implicit-fallthrough"
 )
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 0bfdc4c233..27351ce675 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -147,11 +147,11 @@ if(NOT OPENMW_USE_SYSTEM_OSG)
         endif()
     endif()
 
-    # branch OpenSceneGraph-3.6 on 23 Jan 2021.
+    # OSGoS branch 3.6
     include(FetchContent)
     FetchContent_Declare(osg
-        URL https://github.com/OpenMW/osg/archive/e65f47c4ab3a0b53cc19f517961671e5f840a08d.zip
-        URL_HASH MD5=0c967fe48d80744f6956f6b0b67ef7c6
+        URL https://github.com/OpenMW/osg/archive/01cc2b585c8456a4ff843066b7e1a8715558289f.zip
+        URL_HASH MD5=f1496c5ce32f733581e84568cf2712af
         SOURCE_DIR fetched/osg
     )
     FetchContent_MakeAvailableExcludeFromAll(osg)

From 55f95f1ea31818c574628a93ba66a1c9e461408a Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Tue, 18 Jan 2022 20:07:02 +0100
Subject: [PATCH 1957/2859] Enable controller gyro and capture the values

---
 apps/openmw/mwinput/controllermanager.cpp | 30 +++++++++++++++++++++++
 apps/openmw/mwinput/controllermanager.hpp |  6 +++++
 2 files changed, 36 insertions(+)

diff --git a/apps/openmw/mwinput/controllermanager.cpp b/apps/openmw/mwinput/controllermanager.cpp
index 1e72a1c95b..5b37686c7d 100644
--- a/apps/openmw/mwinput/controllermanager.cpp
+++ b/apps/openmw/mwinput/controllermanager.cpp
@@ -4,6 +4,8 @@
 #include <MyGUI_InputManager.h>
 #include <MyGUI_Widget.h>
 
+#include <SDL.h>
+
 #include <components/debug/debuglog.hpp>
 #include <components/sdlutil/sdlmappings.hpp>
 
@@ -31,6 +33,7 @@ namespace MWInput
         : mBindingsManager(bindingsManager)
         , mActionManager(actionManager)
         , mMouseManager(mouseManager)
+        , mGyroAvailable(false)
         , mJoystickEnabled (Settings::Manager::getBool("enable controller", "Input"))
         , mGamepadCursorSpeed(Settings::Manager::getFloat("gamepad cursor speed", "Input"))
         , mSneakToggleShortcutTimer(0.f)
@@ -287,6 +290,7 @@ namespace MWInput
     void ControllerManager::controllerAdded(int deviceID, const SDL_ControllerDeviceEvent &arg)
     {
         mBindingsManager->controllerAdded(deviceID, arg);
+        enableGyroSensor();
     }
 
     void ControllerManager::controllerRemoved(const SDL_ControllerDeviceEvent &arg)
@@ -399,4 +403,30 @@ namespace MWInput
             return false;
     }
 
+    void ControllerManager::enableGyroSensor()
+    {
+        mGyroAvailable = false;
+        SDL_GameController* cntrl = mBindingsManager->getControllerOrNull();
+        if (!cntrl)
+            return;
+        if (!SDL_GameControllerHasSensor(cntrl, SDL_SENSOR_GYRO))
+            return;
+        if (SDL_GameControllerSetSensorEnabled(cntrl, SDL_SENSOR_GYRO, SDL_TRUE) < 0)
+            return;
+        mGyroAvailable = true;
+    }
+
+    bool ControllerManager::isGyroAvailable() const
+    {
+        return mGyroAvailable;
+    }
+
+    std::array<float, 3> ControllerManager::getGyroValues() const
+    {
+        float gyro[3] = { 0.f };
+        SDL_GameController* cntrl = mBindingsManager->getControllerOrNull();
+        if (cntrl && mGyroAvailable)
+            SDL_GameControllerGetSensorData(cntrl, SDL_SENSOR_GYRO, gyro, 3);
+        return std::array<float, 3>({gyro[0], gyro[1], gyro[2]});
+    }
 }
diff --git a/apps/openmw/mwinput/controllermanager.hpp b/apps/openmw/mwinput/controllermanager.hpp
index 948b48d538..8df6ee5c9f 100644
--- a/apps/openmw/mwinput/controllermanager.hpp
+++ b/apps/openmw/mwinput/controllermanager.hpp
@@ -44,16 +44,22 @@ namespace MWInput
         float getAxisValue(SDL_GameControllerAxis axis) const;  // returns value in range [-1, 1]
         bool isButtonPressed(SDL_GameControllerButton button) const;
 
+        bool isGyroAvailable() const;
+        std::array<float, 3> getGyroValues() const;
+
     private:
         // Return true if GUI consumes input.
         bool gamepadToGuiControl(const SDL_ControllerButtonEvent &arg);
         bool gamepadToGuiControl(const SDL_ControllerAxisEvent &arg);
 
+        void enableGyroSensor();
+
         BindingsManager* mBindingsManager;
         ActionManager* mActionManager;
         MouseManager* mMouseManager;
 
         bool mJoystickEnabled;
+        bool mGyroAvailable;
         float mGamepadCursorSpeed;
         float mSneakToggleShortcutTimer;
         bool mGamepadGuiCursorEnabled;

From 9fa0faf94453381039fde917877dcb245e30bdc7 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Tue, 18 Jan 2022 21:10:35 +0100
Subject: [PATCH 1958/2859] Refactor sensor manager to match controller manager
 gyro API

---
 apps/openmw/mwinput/sensormanager.cpp | 45 ++++++++++++++++-----------
 apps/openmw/mwinput/sensormanager.hpp |  8 +++--
 2 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/apps/openmw/mwinput/sensormanager.cpp b/apps/openmw/mwinput/sensormanager.cpp
index 3e8e70aefe..601924fa16 100644
--- a/apps/openmw/mwinput/sensormanager.cpp
+++ b/apps/openmw/mwinput/sensormanager.cpp
@@ -13,8 +13,7 @@ namespace MWInput
     SensorManager::SensorManager()
         : mInvertX(Settings::Manager::getBool("invert x axis", "Input"))
         , mInvertY(Settings::Manager::getBool("invert y axis", "Input"))
-        , mGyroXSpeed(0.f)
-        , mGyroYSpeed(0.f)
+        , mGyroValues()
         , mGyroUpdateTimer(0.f)
         , mGyroHSensitivity(Settings::Manager::getFloat("gyro horizontal sensitivity", "Input"))
         , mGyroVSensitivity(Settings::Manager::getFloat("gyro vertical sensitivity", "Input"))
@@ -119,7 +118,6 @@ namespace MWInput
                     {
                         SDL_SensorClose(mGyroscope);
                         mGyroscope = nullptr;
-                        mGyroXSpeed = mGyroYSpeed = 0.f;
                         mGyroUpdateTimer = 0.f;
                     }
 
@@ -141,7 +139,6 @@ namespace MWInput
             {
                 SDL_SensorClose(mGyroscope);
                 mGyroscope = nullptr;
-                mGyroXSpeed = mGyroYSpeed = 0.f;
                 mGyroUpdateTimer = 0.f;
             }
         }
@@ -177,18 +174,18 @@ namespace MWInput
         }
     }
 
-    float SensorManager::getGyroAxisSpeed(GyroscopeAxis axis, const SDL_SensorEvent &arg) const
+    float SensorManager::getGyroAxisSpeed(GyroscopeAxis axis) const
     {
         switch (axis)
         {
             case GyroscopeAxis::X:
             case GyroscopeAxis::Y:
             case GyroscopeAxis::Z:
-                return std::abs(arg.data[0]) >= mGyroInputThreshold ? arg.data[axis-1] : 0.f;
+                return std::abs(mGyroValues[0]) >= mGyroInputThreshold ? mGyroValues[axis - 1] : 0.f;
             case GyroscopeAxis::Minus_X:
             case GyroscopeAxis::Minus_Y:
             case GyroscopeAxis::Minus_Z:
-                return std::abs(arg.data[0]) >= mGyroInputThreshold ? -arg.data[std::abs(axis)-1] : 0.f;
+                return std::abs(mGyroValues[0]) >= mGyroInputThreshold ? -mGyroValues[std::abs(axis) - 1] : 0.f;
             default:
                 return 0.f;
         }
@@ -217,8 +214,9 @@ namespace MWInput
                 break;
             case SDL_SENSOR_GYRO:
             {
-                mGyroXSpeed = getGyroAxisSpeed(mGyroHAxis, arg);
-                mGyroYSpeed = getGyroAxisSpeed(mGyroVAxis, arg);
+                mGyroValues[0] = arg.data[0];
+                mGyroValues[1] = arg.data[1];
+                mGyroValues[2] = arg.data[2];
                 mGyroUpdateTimer = 0.f;
 
                 break;
@@ -230,28 +228,29 @@ namespace MWInput
 
     void SensorManager::update(float dt)
     {
-        if (mGyroXSpeed == 0.f && mGyroYSpeed == 0.f)
-            return;
-
+        mGyroUpdateTimer += dt;
         if (mGyroUpdateTimer > 0.5f)
         {
             // More than half of second passed since the last gyroscope update.
             // A device more likely was disconnected or switched to the sleep mode.
             // Reset current rotation speed and wait for update.
-            mGyroXSpeed = 0.f;
-            mGyroYSpeed = 0.f;
+            mGyroValues = { 0, 0, 0 };
             mGyroUpdateTimer = 0.f;
             return;
         }
 
-        mGyroUpdateTimer += dt;
-
         if (!mGuiCursorEnabled)
         {
+            float gyroH = getGyroAxisSpeed(mGyroHAxis);
+            float gyroV = getGyroAxisSpeed(mGyroVAxis);
+
+            if (gyroH == 0 && gyroV == 0)
+                return;
+
             float rot[3];
-            rot[0] = -mGyroYSpeed * dt * mGyroVSensitivity * 4 * (mInvertY ? -1 : 1);
+            rot[0] = -gyroV * dt * mGyroVSensitivity * 4 * (mInvertY ? -1 : 1);
             rot[1] = 0.0f;
-            rot[2] = -mGyroXSpeed * dt * mGyroHSensitivity * 4 * (mInvertX ? -1 : 1);
+            rot[2] = -gyroH * dt * mGyroHSensitivity * 4 * (mInvertX ? -1 : 1);
 
             // Only actually turn player when we're not in vanity mode
             bool playerLooking = MWBase::Environment::get().getInputManager()->getControlSwitch("playerlooking");
@@ -267,4 +266,14 @@ namespace MWInput
             MWBase::Environment::get().getInputManager()->resetIdleTime();
         }
     }
+
+    bool SensorManager::isGyroAvailable() const
+    {
+        return mGyroscope != nullptr;
+    }
+
+    std::array<float, 3> SensorManager::getGyroValues() const
+    {
+        return mGyroValues;
+    }
 }
diff --git a/apps/openmw/mwinput/sensormanager.hpp b/apps/openmw/mwinput/sensormanager.hpp
index 75472d43b4..e096a89260 100644
--- a/apps/openmw/mwinput/sensormanager.hpp
+++ b/apps/openmw/mwinput/sensormanager.hpp
@@ -35,6 +35,9 @@ namespace MWInput
 
         void setGuiCursorEnabled(bool enabled) { mGuiCursorEnabled = enabled; }
 
+        bool isGyroAvailable() const;
+        std::array<float, 3> getGyroValues() const;
+
     private:
         enum GyroscopeAxis
         {
@@ -50,13 +53,12 @@ namespace MWInput
         void updateSensors();
         void correctGyroscopeAxes();
         GyroscopeAxis mapGyroscopeAxis(const std::string& axis);
-        float getGyroAxisSpeed(GyroscopeAxis axis, const SDL_SensorEvent &arg) const;
+        float getGyroAxisSpeed(GyroscopeAxis axis) const;
 
         bool mInvertX;
         bool mInvertY;
 
-        float mGyroXSpeed;
-        float mGyroYSpeed;
+        std::array<float, 3> mGyroValues;
         float mGyroUpdateTimer;
 
         float mGyroHSensitivity;

From a496f16cdb6939df27949da07c1fa8b1cd40f320 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Tue, 18 Jan 2022 22:47:49 +0100
Subject: [PATCH 1959/2859] Implement gyro camera for controllers

---
 apps/openmw/CMakeLists.txt              |  2 +-
 apps/openmw/mwinput/gyroaxis.cpp        | 22 ++++++
 apps/openmw/mwinput/gyroaxis.hpp        | 22 ++++++
 apps/openmw/mwinput/gyromanager.cpp     | 95 +++++++++++++++++++++++++
 apps/openmw/mwinput/gyromanager.hpp     | 38 ++++++++++
 apps/openmw/mwinput/inputmanagerimp.cpp | 18 +++++
 apps/openmw/mwinput/inputmanagerimp.hpp |  2 +
 apps/openmw/mwinput/sensormanager.cpp   | 89 +----------------------
 apps/openmw/mwinput/sensormanager.hpp   | 20 +-----
 9 files changed, 203 insertions(+), 105 deletions(-)
 create mode 100644 apps/openmw/mwinput/gyroaxis.cpp
 create mode 100644 apps/openmw/mwinput/gyroaxis.hpp
 create mode 100644 apps/openmw/mwinput/gyromanager.cpp
 create mode 100644 apps/openmw/mwinput/gyromanager.hpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index ea1d48885c..79cb6f30bd 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -27,7 +27,7 @@ add_openmw_dir (mwrender
 
 add_openmw_dir (mwinput
     actions actionmanager bindingsmanager controllermanager controlswitch
-    inputmanagerimp mousemanager keyboardmanager sensormanager
+    inputmanagerimp mousemanager keyboardmanager gyroaxis sensormanager gyromanager
     )
 
 add_openmw_dir (mwgui
diff --git a/apps/openmw/mwinput/gyroaxis.cpp b/apps/openmw/mwinput/gyroaxis.cpp
new file mode 100644
index 0000000000..3eb71fb30b
--- /dev/null
+++ b/apps/openmw/mwinput/gyroaxis.cpp
@@ -0,0 +1,22 @@
+#include "gyroaxis.hpp"
+
+namespace MWInput
+{
+    GyroscopeAxis gyroscopeAxisFromString(std::string_view s)
+    {
+        if (s == "x")
+            return GyroscopeAxis::X;
+        else if (s == "y")
+            return GyroscopeAxis::Y;
+        else if (s == "z")
+            return GyroscopeAxis::Z;
+        else if (s == "-x")
+            return GyroscopeAxis::Minus_X;
+        else if (s == "-y")
+            return GyroscopeAxis::Minus_Y;
+        else if (s == "-z")
+            return GyroscopeAxis::Minus_Z;
+
+        return GyroscopeAxis::Unknown;
+    }
+}
diff --git a/apps/openmw/mwinput/gyroaxis.hpp b/apps/openmw/mwinput/gyroaxis.hpp
new file mode 100644
index 0000000000..542217351d
--- /dev/null
+++ b/apps/openmw/mwinput/gyroaxis.hpp
@@ -0,0 +1,22 @@
+#ifndef MWINPUT_GYROAXIS
+#define MWINPUT_GYROAXIS
+
+#include <string_view>
+
+namespace MWInput
+{
+    enum GyroscopeAxis
+    {
+        Unknown = 0,
+        X = 1,
+        Y = 2,
+        Z = 3,
+        Minus_X = -1,
+        Minus_Y = -2,
+        Minus_Z = -3
+    };
+
+    GyroscopeAxis gyroscopeAxisFromString(std::string_view s);
+}
+
+#endif // !MWINPUT_GYROAXIS
diff --git a/apps/openmw/mwinput/gyromanager.cpp b/apps/openmw/mwinput/gyromanager.cpp
new file mode 100644
index 0000000000..5a2b532186
--- /dev/null
+++ b/apps/openmw/mwinput/gyromanager.cpp
@@ -0,0 +1,95 @@
+#include "gyromanager.hpp"
+
+#include "../mwbase/inputmanager.hpp"
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+#include "../mwworld/player.hpp"
+
+namespace MWInput
+{
+    GyroManager::GyroManager()
+        : mEnabled(Settings::Manager::getBool("enable gyroscope", "Input"))
+        , mGuiCursorEnabled(true)
+        , mSensitivityH(Settings::Manager::getFloat("gyro horizontal sensitivity", "Input"))
+        , mSensitivityV(Settings::Manager::getFloat("gyro vertical sensitivity", "Input"))
+        , mInvertH(Settings::Manager::getBool("invert x axis", "Input"))
+        , mInvertV(Settings::Manager::getBool("invert y axis", "Input"))
+        , mInputThreshold(Settings::Manager::getFloat("gyro input threshold", "Input"))
+        , mAxisH(gyroscopeAxisFromString(Settings::Manager::getString("gyro horizontal axis", "Input")))
+        , mAxisV(gyroscopeAxisFromString(Settings::Manager::getString("gyro vertical axis", "Input")))
+    {};
+
+    void GyroManager::update(float dt, std::array<float, 3> values) const
+    {
+        if (!mGuiCursorEnabled)
+        {
+            float gyroH = getAxisValue(mAxisH, values);
+            float gyroV = getAxisValue(mAxisV, values);
+
+            if (gyroH == 0 && gyroV == 0)
+                return;
+
+            float rot[3];
+            rot[0] = -gyroV * dt * mSensitivityV * 4 * (mInvertV ? -1 : 1);
+            rot[1] = 0.0f;
+            rot[2] = -gyroH * dt * mSensitivityH * 4 * (mInvertH ? -1 : 1);
+
+            // Only actually turn player when we're not in vanity mode
+            bool playerLooking = MWBase::Environment::get().getInputManager()->getControlSwitch("playerlooking");
+            if (!MWBase::Environment::get().getWorld()->vanityRotateCamera(rot) && playerLooking)
+            {
+                MWWorld::Player& player = MWBase::Environment::get().getWorld()->getPlayer();
+                player.yaw(-rot[2]);
+                player.pitch(-rot[0]);
+            }
+            else if (!playerLooking)
+                MWBase::Environment::get().getWorld()->disableDeferredPreviewRotation();
+
+            MWBase::Environment::get().getInputManager()->resetIdleTime();
+        }
+    }
+
+    void GyroManager::processChangedSettings(const Settings::CategorySettingVector& changed)
+    {
+        for (const auto& setting : changed)
+        {
+            if (setting.first != "Input")
+                continue;
+
+            if (setting.second == "enable gyroscope")
+                mEnabled = Settings::Manager::getBool("enable gyroscope", "Input");
+            else if (setting.second == "gyro horizontal sensitivity")
+                mSensitivityH = Settings::Manager::getFloat("gyro horizontal sensitivity", "Input");
+            else if (setting.second == "gyro vertical sensitivity")
+                mSensitivityV = Settings::Manager::getFloat("gyro vertical sensitivity", "Input");
+            else if (setting.second == "invert x axis")
+                mInvertH = Settings::Manager::getBool("invert x axis", "Input");
+            else if (setting.second == "invert y axis")
+                mInvertV = Settings::Manager::getBool("invert y axis", "Input");
+            else if (setting.second == "gyro input threshold")
+                mInputThreshold = Settings::Manager::getFloat("gyro input threshold", "Input");
+            else if (setting.second == "gyro horizontal axis")
+                mAxisH = gyroscopeAxisFromString(Settings::Manager::getString("gyro horizontal axis", "Input"));
+            else if (setting.second == "gyro vertical axis")
+                mAxisV = gyroscopeAxisFromString(Settings::Manager::getString("gyro vertical axis", "Input"));
+        }
+    }
+
+    namespace
+    {
+        int signum(int x)
+        {
+            return 0 < x - x < 0;
+        }
+    }
+
+    float GyroManager::getAxisValue(GyroscopeAxis axis, std::array<float, 3> values) const
+    {
+        if (axis == GyroscopeAxis::Unknown)
+            return 0;
+        float value = values[std::abs(axis) - 1] * signum(axis);
+        //if (std::abs(value) <= mInputThreshold)
+        //    value = 0;
+        return value;
+    }
+}
diff --git a/apps/openmw/mwinput/gyromanager.hpp b/apps/openmw/mwinput/gyromanager.hpp
new file mode 100644
index 0000000000..2c4a13905f
--- /dev/null
+++ b/apps/openmw/mwinput/gyromanager.hpp
@@ -0,0 +1,38 @@
+#ifndef MWINPUT_GYROMANAGER
+#define MWINPUT_GYROMANAGER
+
+#include <components/settings/settings.hpp>
+
+#include "gyroaxis.hpp"
+
+namespace MWInput
+{
+    class GyroManager
+    {
+        public:
+            GyroManager();
+
+            bool isEnabled() const { return mEnabled; }
+
+            void update(float dt, std::array<float, 3> values) const;
+
+            void processChangedSettings(const Settings::CategorySettingVector& changed);
+
+            void setGuiCursorEnabled(bool enabled) { mGuiCursorEnabled = enabled; }
+
+        private:
+            bool mEnabled;
+            bool mGuiCursorEnabled;
+            float mSensitivityH;
+            float mSensitivityV;
+            bool mInvertH;
+            bool mInvertV;
+            float mInputThreshold;
+            GyroscopeAxis mAxisH;
+            GyroscopeAxis mAxisV;
+
+            float getAxisValue(GyroscopeAxis axis, std::array<float, 3> values) const;
+    };
+}
+
+#endif // !MWINPUT_GYROMANAGER
diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index 4ebe56bf94..8beead5803 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -19,6 +19,7 @@
 #include "keyboardmanager.hpp"
 #include "mousemanager.hpp"
 #include "sensormanager.hpp"
+#include "gyromanager.hpp"
 
 namespace MWInput
 {
@@ -51,6 +52,8 @@ namespace MWInput
 
         mSensorManager = new SensorManager();
         mInputWrapper->setSensorEventCallback(mSensorManager);
+
+        mGyroManager = new GyroManager();
     }
 
     void InputManager::clear()
@@ -72,6 +75,8 @@ namespace MWInput
         delete mBindingsManager;
 
         delete mInputWrapper;
+
+        delete mGyroManager;
     }
 
     void InputManager::setAttemptJump(bool jumping)
@@ -100,6 +105,17 @@ namespace MWInput
         mMouseManager->update(dt);
         mSensorManager->update(dt);
         mActionManager->update(dt, controllerMove);
+
+        if (mGyroManager->isEnabled())
+        {
+            bool controllerAvailable = mControllerManager->isGyroAvailable();
+            bool sensorAvailable = mSensorManager->isGyroAvailable();
+            if (controllerAvailable || sensorAvailable)
+            {
+                mGyroManager->update(dt,
+                    controllerAvailable ? mControllerManager->getGyroValues() : mSensorManager->getGyroValues());
+            }
+        }
     }
 
     void InputManager::setDragDrop(bool dragDrop)
@@ -117,6 +133,7 @@ namespace MWInput
         mControllerManager->setGuiCursorEnabled(guiMode);
         mMouseManager->setGuiCursorEnabled(guiMode);
         mSensorManager->setGuiCursorEnabled(guiMode);
+        mGyroManager->setGuiCursorEnabled(guiMode);
         mMouseManager->setMouseLookEnabled(!guiMode);
         if (guiMode)
             MWBase::Environment::get().getWindowManager()->showCrosshair(false);
@@ -130,6 +147,7 @@ namespace MWInput
     {
         mMouseManager->processChangedSettings(changed);
         mSensorManager->processChangedSettings(changed);
+        mGyroManager->processChangedSettings(changed);
     }
 
     bool InputManager::getControlSwitch(std::string_view sw)
diff --git a/apps/openmw/mwinput/inputmanagerimp.hpp b/apps/openmw/mwinput/inputmanagerimp.hpp
index 41478d5dcb..3f9f1b3be1 100644
--- a/apps/openmw/mwinput/inputmanagerimp.hpp
+++ b/apps/openmw/mwinput/inputmanagerimp.hpp
@@ -39,6 +39,7 @@ namespace MWInput
     class KeyboardManager;
     class MouseManager;
     class SensorManager;
+    class GyroManager;
 
     /**
     * @brief Class that provides a high-level API for game input
@@ -128,6 +129,7 @@ namespace MWInput
         KeyboardManager* mKeyboardManager;
         MouseManager* mMouseManager;
         SensorManager* mSensorManager;
+        GyroManager* mGyroManager;
     };
 }
 #endif
diff --git a/apps/openmw/mwinput/sensormanager.cpp b/apps/openmw/mwinput/sensormanager.cpp
index 601924fa16..fed25b88ce 100644
--- a/apps/openmw/mwinput/sensormanager.cpp
+++ b/apps/openmw/mwinput/sensormanager.cpp
@@ -11,15 +11,10 @@
 namespace MWInput
 {
     SensorManager::SensorManager()
-        : mInvertX(Settings::Manager::getBool("invert x axis", "Input"))
-        , mInvertY(Settings::Manager::getBool("invert y axis", "Input"))
-        , mGyroValues()
+        : mGyroValues()
         , mGyroUpdateTimer(0.f)
-        , mGyroHSensitivity(Settings::Manager::getFloat("gyro horizontal sensitivity", "Input"))
-        , mGyroVSensitivity(Settings::Manager::getFloat("gyro vertical sensitivity", "Input"))
         , mGyroHAxis(GyroscopeAxis::Minus_X)
         , mGyroVAxis(GyroscopeAxis::Y)
-        , mGyroInputThreshold(Settings::Manager::getFloat("gyro input threshold", "Input"))
         , mGyroscope(nullptr)
         , mGuiCursorEnabled(true)
     {
@@ -41,24 +36,6 @@ namespace MWInput
         }
     }
 
-    SensorManager::GyroscopeAxis SensorManager::mapGyroscopeAxis(const std::string& axis)
-    {
-        if (axis == "x")
-            return GyroscopeAxis::X;
-        else if (axis == "y")
-            return GyroscopeAxis::Y;
-        else if (axis == "z")
-            return GyroscopeAxis::Z;
-        else if (axis == "-x")
-            return GyroscopeAxis::Minus_X;
-        else if (axis == "-y")
-            return GyroscopeAxis::Minus_Y;
-        else if (axis == "-z")
-            return GyroscopeAxis::Minus_Z;
-
-        return GyroscopeAxis::Unknown;
-    }
-
     void SensorManager::correctGyroscopeAxes()
     {
         if (!Settings::Manager::getBool("enable gyroscope", "Input"))
@@ -67,8 +44,8 @@ namespace MWInput
         // Treat setting from config as axes for landscape mode.
         // If the device does not support orientation change, do nothing.
         // Note: in is unclear how to correct axes for devices with non-standart Z axis direction.
-        mGyroHAxis = mapGyroscopeAxis(Settings::Manager::getString("gyro horizontal axis", "Input"));
-        mGyroVAxis = mapGyroscopeAxis(Settings::Manager::getString("gyro vertical axis", "Input"));
+        mGyroHAxis = gyroscopeAxisFromString(Settings::Manager::getString("gyro horizontal axis", "Input"));
+        mGyroVAxis = gyroscopeAxisFromString(Settings::Manager::getString("gyro vertical axis", "Input"));
 
         SDL_DisplayOrientation currentOrientation = SDL_GetDisplayOrientation(Settings::Manager::getInt("screen", "Video"));
         switch (currentOrientation)
@@ -148,18 +125,6 @@ namespace MWInput
     {
         for (const auto& setting : changed)
         {
-            if (setting.first == "Input" && setting.second == "invert x axis")
-                mInvertX = Settings::Manager::getBool("invert x axis", "Input");
-
-            if (setting.first == "Input" && setting.second == "invert y axis")
-                mInvertY = Settings::Manager::getBool("invert y axis", "Input");
-
-            if (setting.first == "Input" && setting.second == "gyro horizontal sensitivity")
-                mGyroHSensitivity = Settings::Manager::getFloat("gyro horizontal sensitivity", "Input");
-
-            if (setting.first == "Input" && setting.second == "gyro vertical sensitivity")
-                mGyroVSensitivity = Settings::Manager::getFloat("gyro vertical sensitivity", "Input");
-
             if (setting.first == "Input" && setting.second == "enable gyroscope")
                 init();
 
@@ -168,26 +133,6 @@ namespace MWInput
 
             if (setting.first == "Input" && setting.second == "gyro vertical axis")
                 correctGyroscopeAxes();
-
-            if (setting.first == "Input" && setting.second == "gyro input threshold")
-                mGyroInputThreshold = Settings::Manager::getFloat("gyro input threshold", "Input");
-        }
-    }
-
-    float SensorManager::getGyroAxisSpeed(GyroscopeAxis axis) const
-    {
-        switch (axis)
-        {
-            case GyroscopeAxis::X:
-            case GyroscopeAxis::Y:
-            case GyroscopeAxis::Z:
-                return std::abs(mGyroValues[0]) >= mGyroInputThreshold ? mGyroValues[axis - 1] : 0.f;
-            case GyroscopeAxis::Minus_X:
-            case GyroscopeAxis::Minus_Y:
-            case GyroscopeAxis::Minus_Z:
-                return std::abs(mGyroValues[0]) >= mGyroInputThreshold ? -mGyroValues[std::abs(axis) - 1] : 0.f;
-            default:
-                return 0.f;
         }
     }
 
@@ -236,34 +181,6 @@ namespace MWInput
             // Reset current rotation speed and wait for update.
             mGyroValues = { 0, 0, 0 };
             mGyroUpdateTimer = 0.f;
-            return;
-        }
-
-        if (!mGuiCursorEnabled)
-        {
-            float gyroH = getGyroAxisSpeed(mGyroHAxis);
-            float gyroV = getGyroAxisSpeed(mGyroVAxis);
-
-            if (gyroH == 0 && gyroV == 0)
-                return;
-
-            float rot[3];
-            rot[0] = -gyroV * dt * mGyroVSensitivity * 4 * (mInvertY ? -1 : 1);
-            rot[1] = 0.0f;
-            rot[2] = -gyroH * dt * mGyroHSensitivity * 4 * (mInvertX ? -1 : 1);
-
-            // Only actually turn player when we're not in vanity mode
-            bool playerLooking = MWBase::Environment::get().getInputManager()->getControlSwitch("playerlooking");
-            if (!MWBase::Environment::get().getWorld()->vanityRotateCamera(rot) && playerLooking)
-            {
-                MWWorld::Player& player = MWBase::Environment::get().getWorld()->getPlayer();
-                player.yaw(-rot[2]);
-                player.pitch(-rot[0]);
-            }
-            else if (!playerLooking)
-                MWBase::Environment::get().getWorld()->disableDeferredPreviewRotation();
-
-            MWBase::Environment::get().getInputManager()->resetIdleTime();
         }
     }
 
diff --git a/apps/openmw/mwinput/sensormanager.hpp b/apps/openmw/mwinput/sensormanager.hpp
index e096a89260..92d0a036e8 100644
--- a/apps/openmw/mwinput/sensormanager.hpp
+++ b/apps/openmw/mwinput/sensormanager.hpp
@@ -6,6 +6,8 @@
 #include <components/settings/settings.hpp>
 #include <components/sdlutil/events.hpp>
 
+#include "gyroaxis.hpp"
+
 namespace SDLUtil
 {
     class InputWrapper;
@@ -39,33 +41,15 @@ namespace MWInput
         std::array<float, 3> getGyroValues() const;
 
     private:
-        enum GyroscopeAxis
-        {
-            Unknown = 0,
-            X = 1,
-            Y = 2,
-            Z = 3,
-            Minus_X = -1,
-            Minus_Y = -2,
-            Minus_Z = -3
-        };
 
         void updateSensors();
         void correctGyroscopeAxes();
-        GyroscopeAxis mapGyroscopeAxis(const std::string& axis);
-        float getGyroAxisSpeed(GyroscopeAxis axis) const;
-
-        bool mInvertX;
-        bool mInvertY;
 
         std::array<float, 3> mGyroValues;
         float mGyroUpdateTimer;
 
-        float mGyroHSensitivity;
-        float mGyroVSensitivity;
         GyroscopeAxis mGyroHAxis;
         GyroscopeAxis mGyroVAxis;
-        float mGyroInputThreshold;
 
         SDL_Sensor* mGyroscope;
 

From bdd13f36b2d0f6f9391f063f8adfe97f897f5877 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Tue, 18 Jan 2022 23:29:45 +0000
Subject: [PATCH 1960/2859] do some Appveyor Qt magic to get it all sorted

---
 CI/before_script.msvc.sh |  8 +++++++-
 appveyor.yml             | 26 +++++++++-----------------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 32169fc04b..aaf459611e 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -878,7 +878,13 @@ fi
 		done
 		echo Done.
 	else
-		QT_SDK="C:/Qt/5.13/msvc2017${SUFFIX}"
+		# default to msvc2019 which pre-loads Qt 5.15.2
+		qt_version="5.15.2"
+		if [ "msvc${MSVC_REAL_YEAR}" == "msvc2017" ]; then
+			qt_version="5.13"
+    	fi
+		QT_SDK="C:/Qt/${qt_version}/msvc${MSVC_REAL_YEAR}${SUFFIX}"
+
 		add_cmake_opts -DQT_QMAKE_EXECUTABLE="${QT_SDK}/bin/qmake.exe" \
 			-DCMAKE_PREFIX_PATH="$QT_SDK"
 		for CONFIGURATION in ${CONFIGURATIONS[@]}; do
diff --git a/appveyor.yml b/appveyor.yml
index e2c13ed948..95f070a662 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -14,7 +14,6 @@ environment:
           APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
 
 platform:
-#   - Win32
     - x64
 
 configuration:
@@ -22,26 +21,20 @@ configuration:
     - Release
 #    - RelWithDebInfo
 
-# For the Qt, Boost, CMake, etc installs
-#os: Visual Studio 2017
-
 # We want the git revision for versioning,
 # so shallow clones don't work.
 clone_depth: 1
 
 cache:
-    - C:\projects\openmw\deps\Bullet-2.87-msvc2015-win32.7z
-    - C:\projects\openmw\deps\Bullet-2.87-msvc2015-win64.7z
-    - C:\projects\openmw\deps\MyGUI-3.2.2-msvc2015-win32.7z
-    - C:\projects\openmw\deps\MyGUI-3.2.2-msvc2015-win64.7z
-    - C:\projects\openmw\deps\OSG-3.4.1-scrawl-msvc2015-win32.7z
-    - C:\projects\openmw\deps\OSG-3.4.1-scrawl-msvc2015-win64.7z
-    - C:\projects\openmw\deps\ffmpeg-3.2.4-dev-win32.zip
-    - C:\projects\openmw\deps\ffmpeg-3.2.4-dev-win64.zip
-    - C:\projects\openmw\deps\ffmpeg-3.2.4-win32.zip
-    - C:\projects\openmw\deps\ffmpeg-3.2.4-win64.zip
-    - C:\projects\openmw\deps\OpenAL-Soft-1.19.1.zip
-    - C:\projects\openmw\deps\SDL2-2.0.7.zip
+    - C:\projects\openmw\deps\Bullet-2.89-msvc2017-win64-double.7z
+    - C:\projects\openmw\deps\MyGUI-3.4.1-msvc2017-win64.7z
+    - C:\projects\openmw\deps\MyGUI-3.4.1-msvc2019-win64.7z
+    - C:\projects\openmw\deps\OSGoS-3.6.5-b02abe2-msvc2017-win64.7z
+    - C:\projects\openmw\deps\OSGoS-3.6.5-b02abe2-msvc2019-win64.7z
+    - C:\projects\openmw\deps\ffmpeg-4.2.2-dev-win64.zip
+    - C:\projects\openmw\deps\ffmpeg-4.2.2-win64.zip
+    - C:\projects\openmw\deps\OpenAL-Soft-1.20.1.zip
+    - C:\projects\openmw\deps\SDL2-2.0.18.zip
 
 clone_folder: C:\projects\openmw
 
@@ -53,7 +46,6 @@ before_build:
     - cmd: sh %APPVEYOR_BUILD_FOLDER%\CI\before_script.msvc.sh -c %configuration% -p %PLATFORM% -v %msvc% -V -i %APPVEYOR_BUILD_FOLDER%\install
 
 build_script:
-    - cmd: if %PLATFORM%==Win32 set build=MSVC%msvc%_32
     - cmd: if %PLATFORM%==x64 set build=MSVC%msvc%_64
     - cmd: msbuild %build%\OpenMW.sln /t:Build /p:Configuration=%configuration% /m:2 /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
     - cmd: cmake --install %build% --config %configuration%

From a2002bc983fb2ed3c767f2bc81db4e0da069ca82 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 19 Jan 2022 01:07:17 +0100
Subject: [PATCH 1961/2859] Support frequency of ProgressReporter calls lower
 than interval

---
 components/misc/progressreporter.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/misc/progressreporter.hpp b/components/misc/progressreporter.hpp
index 733e36191e..30d9b0ae2e 100644
--- a/components/misc/progressreporter.hpp
+++ b/components/misc/progressreporter.hpp
@@ -29,10 +29,10 @@ namespace Misc
             {
                 const std::lock_guard lock(mMutex);
                 const auto now = std::chrono::steady_clock::now();
-                const auto left = mNextReport - now;
-                if (left.count() > 0 || provided == expected)
+                if (mNextReport > now || provided == expected)
                     return false;
-                mNextReport += mInterval + left;
+                if (mInterval.count() > 0)
+                    mNextReport = mNextReport + mInterval * ((now - mNextReport + mInterval).count() / mInterval.count());
                 return true;
             } ();
             if (shouldReport)

From fbb72a19517f3898558367c11b3d8959b75403a8 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 19 Jan 2022 11:31:49 +0000
Subject: [PATCH 1962/2859] Make back launcher "Game Mechanics" tab to be
 default

---
 files/ui/advancedpage.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/ui/advancedpage.ui b/files/ui/advancedpage.ui
index 8e976df42d..18f406d5b3 100644
--- a/files/ui/advancedpage.ui
+++ b/files/ui/advancedpage.ui
@@ -14,7 +14,7 @@
    <item>
     <widget class="QTabWidget" name="AdvancedTabWidget">
      <property name="currentIndex">
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="GameMechanics">
       <attribute name="title">

From 9cafc31c0d8cafb1c75299b41535fe49fc5028a2 Mon Sep 17 00:00:00 2001
From: Cody Glassman <glassmancody.info@gmail.com>
Date: Wed, 19 Jan 2022 11:32:38 +0000
Subject: [PATCH 1963/2859] Restore ripples with soft particles

---
 apps/openmw/mwrender/ripplesimulation.cpp | 2 +-
 components/resource/scenemanager.cpp      | 4 +++-
 components/resource/scenemanager.hpp      | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwrender/ripplesimulation.cpp b/apps/openmw/mwrender/ripplesimulation.cpp
index 282362ea56..1045594c20 100644
--- a/apps/openmw/mwrender/ripplesimulation.cpp
+++ b/apps/openmw/mwrender/ripplesimulation.cpp
@@ -109,7 +109,7 @@ RippleSimulation::RippleSimulation(osg::Group *parent, Resource::ResourceSystem*
 
     createWaterRippleStateSet(resourceSystem, mParticleNode);
 
-    resourceSystem->getSceneManager()->recreateShaders(mParticleNode);
+    resourceSystem->getSceneManager()->recreateShaders(mParticleNode, "objects", false, nullptr, true);
 
     mParent->addChild(mParticleNode);
 }
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 41f65ba0ab..8ddc3fd102 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -340,13 +340,15 @@ namespace Resource
         return mForceShaders;
     }
 
-    void SceneManager::recreateShaders(osg::ref_ptr<osg::Node> node, const std::string& shaderPrefix, bool forceShadersForNode, const osg::Program* programTemplate)
+    void SceneManager::recreateShaders(osg::ref_ptr<osg::Node> node, const std::string& shaderPrefix, bool forceShadersForNode, const osg::Program* programTemplate, bool disableSoftParticles)
     {
         osg::ref_ptr<Shader::ShaderVisitor> shaderVisitor(createShaderVisitor(shaderPrefix));
         shaderVisitor->setAllowedToModifyStateSets(false);
         shaderVisitor->setProgramTemplate(programTemplate);
         if (forceShadersForNode)
             shaderVisitor->setForceShaders(true);
+        if (disableSoftParticles)
+            shaderVisitor->setOpaqueDepthTex(nullptr);
         node->accept(*shaderVisitor);
     }
 
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index 58ae8fdb8b..b3a42bac45 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -77,7 +77,7 @@ namespace Resource
         Shader::ShaderManager& getShaderManager();
 
         /// Re-create shaders for this node, need to call this if alpha testing, texture stages or vertex color mode have changed.
-        void recreateShaders(osg::ref_ptr<osg::Node> node, const std::string& shaderPrefix = "objects", bool forceShadersForNode = false, const osg::Program* programTemplate = nullptr);
+        void recreateShaders(osg::ref_ptr<osg::Node> node, const std::string& shaderPrefix = "objects", bool forceShadersForNode = false, const osg::Program* programTemplate = nullptr, bool disableSoftParticles = false);
 
         /// Applying shaders to a node may replace some fixed-function state.
         /// This restores it.

From a79bdf07d27b659fd4ff0cb23eed0561e9597e62 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Wed, 19 Jan 2022 15:48:35 +0000
Subject: [PATCH 1964/2859] do some bash magic to rearrange CXX_FLAGS

---
 CI/before_script.linux.sh | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/CI/before_script.linux.sh b/CI/before_script.linux.sh
index 2b1d156c77..2a10ae2b78 100755
--- a/CI/before_script.linux.sh
+++ b/CI/before_script.linux.sh
@@ -14,12 +14,7 @@ if [[ "${BUILD_TESTS_ONLY}" ]]; then
     BUILD_BENCHMARKS=ON
 fi
 
-CXX_FLAGS='-Werror -Wno-error=deprecated-declarations -Wno-error=nonnull -Wno-error=deprecated-copy'
-
-if [[ "${CXX}" == 'clang++' ]]; then
-    CXX_FLAGS="${CXX_FLAGS} -Wno-error=unused-lambda-capture -Wno-error=gnu-zero-variadic-macro-arguments -Wno-error=misleading-indentation"
-fi
-
+# setup our basic cmake build options
 declare -a CMAKE_CONF_OPTS=(
     -DCMAKE_C_COMPILER="${CC:-/usr/bin/cc}"
     -DCMAKE_CXX_COMPILER="${CXX:-/usr/bin/c++}"
@@ -29,10 +24,9 @@ declare -a CMAKE_CONF_OPTS=(
     -DCMAKE_BUILD_TYPE=RelWithDebInfo
     -DBUILD_SHARED_LIBS=OFF
     -DUSE_SYSTEM_TINYXML=ON
+    -DOPENMW_USE_SYSTEM_RECASTNAVIGATION=ON
     -DCMAKE_INSTALL_PREFIX=install
-    -DCMAKE_C_FLAGS="-Werror -Wno-error=misleading-indentation"
-    -DCMAKE_CXX_FLAGS="${CXX_FLAGS}"
-    -DOPENMW_CXX_FLAGS="-Werror=implicit-fallthrough"
+    -DOPENMW_CXX_FLAGS="-Werror -Werror=implicit-fallthrough"  # flags specific to OpenMW project
 )
 
 if [[ $CI_OPENMW_USE_STATIC_DEPS ]]; then
@@ -41,12 +35,13 @@ if [[ $CI_OPENMW_USE_STATIC_DEPS ]]; then
         -DOPENMW_USE_SYSTEM_OSG=OFF
         -DOPENMW_USE_SYSTEM_BULLET=OFF
         -DOPENMW_USE_SYSTEM_SQLITE3=OFF
+        -DOPENMW_USE_SYSTEM_RECASTNAVIGATION=OFF
     )
 fi
 
 if [[ $CI_CLANG_TIDY ]]; then
 	CMAKE_CONF_OPTS+=(
-	      -DCMAKE_CXX_CLANG_TIDY='clang-tidy;-checks=-*,boost-*,clang-analyzer-*,concurrency-*,performance-*,-header-filter=.*,bugprone-*,misc-definitions-in-headers,misc-misplaced-const,misc-redundant-expression,-bugprone-narrowing-conversions'
+	      -DCMAKE_CXX_CLANG_TIDY="clang-tidy;-checks=-*,boost-*,clang-analyzer-*,concurrency-*,performance-*,-header-filter=.*,bugprone-*,misc-definitions-in-headers,misc-misplaced-const,misc-redundant-expression,-bugprone-narrowing-conversions"
 	)
 fi
 
@@ -61,6 +56,16 @@ mkdir -p build
 cd build
 
 if [[ "${BUILD_TESTS_ONLY}" ]]; then
+
+    # flags specific to our test suite
+    CXX_FLAGS="-Wno-error=deprecated-declarations -Wno-error=nonnull -Wno-error=deprecated-copy"
+    if [[ "${CXX}" == 'clang++' ]]; then
+        CXX_FLAGS="${CXX_FLAGS} -Wno-error=unused-lambda-capture -Wno-error=gnu-zero-variadic-macro-arguments"
+    fi
+    CMAKE_CONF_OPTS+=(
+        -DCMAKE_CXX_FLAGS="${CXX_FLAGS}"
+    )
+
     ${ANALYZE} cmake \
         "${CMAKE_CONF_OPTS[@]}" \
         -DBUILD_OPENMW=OFF \

From 4021d23cff2cd6b0dba7693c953d1b9c4f78e38c Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Wed, 19 Jan 2022 17:01:43 +0100
Subject: [PATCH 1965/2859] Refactor sensor manager axis correction

---
 apps/openmw/mwinput/controllermanager.cpp |  2 +-
 apps/openmw/mwinput/gyromanager.cpp       | 28 ++++----------
 apps/openmw/mwinput/gyromanager.hpp       |  2 -
 apps/openmw/mwinput/sensormanager.cpp     | 45 ++++++++---------------
 apps/openmw/mwinput/sensormanager.hpp     | 11 +++---
 files/settings-default.cfg                |  2 +-
 6 files changed, 31 insertions(+), 59 deletions(-)

diff --git a/apps/openmw/mwinput/controllermanager.cpp b/apps/openmw/mwinput/controllermanager.cpp
index 5b37686c7d..8753344373 100644
--- a/apps/openmw/mwinput/controllermanager.cpp
+++ b/apps/openmw/mwinput/controllermanager.cpp
@@ -33,8 +33,8 @@ namespace MWInput
         : mBindingsManager(bindingsManager)
         , mActionManager(actionManager)
         , mMouseManager(mouseManager)
-        , mGyroAvailable(false)
         , mJoystickEnabled (Settings::Manager::getBool("enable controller", "Input"))
+        , mGyroAvailable(false)
         , mGamepadCursorSpeed(Settings::Manager::getFloat("gamepad cursor speed", "Input"))
         , mSneakToggleShortcutTimer(0.f)
         , mGamepadGuiCursorEnabled(true)
diff --git a/apps/openmw/mwinput/gyromanager.cpp b/apps/openmw/mwinput/gyromanager.cpp
index 5a2b532186..f590abf45c 100644
--- a/apps/openmw/mwinput/gyromanager.cpp
+++ b/apps/openmw/mwinput/gyromanager.cpp
@@ -12,8 +12,6 @@ namespace MWInput
         , mGuiCursorEnabled(true)
         , mSensitivityH(Settings::Manager::getFloat("gyro horizontal sensitivity", "Input"))
         , mSensitivityV(Settings::Manager::getFloat("gyro vertical sensitivity", "Input"))
-        , mInvertH(Settings::Manager::getBool("invert x axis", "Input"))
-        , mInvertV(Settings::Manager::getBool("invert y axis", "Input"))
         , mInputThreshold(Settings::Manager::getFloat("gyro input threshold", "Input"))
         , mAxisH(gyroscopeAxisFromString(Settings::Manager::getString("gyro horizontal axis", "Input")))
         , mAxisV(gyroscopeAxisFromString(Settings::Manager::getString("gyro vertical axis", "Input")))
@@ -26,13 +24,13 @@ namespace MWInput
             float gyroH = getAxisValue(mAxisH, values);
             float gyroV = getAxisValue(mAxisV, values);
 
-            if (gyroH == 0 && gyroV == 0)
+            if (gyroH == 0.f && gyroV == 0.f)
                 return;
 
             float rot[3];
-            rot[0] = -gyroV * dt * mSensitivityV * 4 * (mInvertV ? -1 : 1);
+            rot[0] = -gyroV * dt * mSensitivityV;
             rot[1] = 0.0f;
-            rot[2] = -gyroH * dt * mSensitivityH * 4 * (mInvertH ? -1 : 1);
+            rot[2] = -gyroH * dt * mSensitivityH;
 
             // Only actually turn player when we're not in vanity mode
             bool playerLooking = MWBase::Environment::get().getInputManager()->getControlSwitch("playerlooking");
@@ -62,10 +60,6 @@ namespace MWInput
                 mSensitivityH = Settings::Manager::getFloat("gyro horizontal sensitivity", "Input");
             else if (setting.second == "gyro vertical sensitivity")
                 mSensitivityV = Settings::Manager::getFloat("gyro vertical sensitivity", "Input");
-            else if (setting.second == "invert x axis")
-                mInvertH = Settings::Manager::getBool("invert x axis", "Input");
-            else if (setting.second == "invert y axis")
-                mInvertV = Settings::Manager::getBool("invert y axis", "Input");
             else if (setting.second == "gyro input threshold")
                 mInputThreshold = Settings::Manager::getFloat("gyro input threshold", "Input");
             else if (setting.second == "gyro horizontal axis")
@@ -75,21 +69,15 @@ namespace MWInput
         }
     }
 
-    namespace
-    {
-        int signum(int x)
-        {
-            return 0 < x - x < 0;
-        }
-    }
-
     float GyroManager::getAxisValue(GyroscopeAxis axis, std::array<float, 3> values) const
     {
         if (axis == GyroscopeAxis::Unknown)
             return 0;
-        float value = values[std::abs(axis) - 1] * signum(axis);
-        //if (std::abs(value) <= mInputThreshold)
-        //    value = 0;
+        float value = values[std::abs(axis) - 1];
+        if (axis < 0)
+            value *= -1;
+        if (std::abs(value) <= mInputThreshold)
+            value = 0;
         return value;
     }
 }
diff --git a/apps/openmw/mwinput/gyromanager.hpp b/apps/openmw/mwinput/gyromanager.hpp
index 2c4a13905f..ede8eb5c81 100644
--- a/apps/openmw/mwinput/gyromanager.hpp
+++ b/apps/openmw/mwinput/gyromanager.hpp
@@ -25,8 +25,6 @@ namespace MWInput
             bool mGuiCursorEnabled;
             float mSensitivityH;
             float mSensitivityV;
-            bool mInvertH;
-            bool mInvertV;
             float mInputThreshold;
             GyroscopeAxis mAxisH;
             GyroscopeAxis mAxisV;
diff --git a/apps/openmw/mwinput/sensormanager.cpp b/apps/openmw/mwinput/sensormanager.cpp
index fed25b88ce..cab78c46f2 100644
--- a/apps/openmw/mwinput/sensormanager.cpp
+++ b/apps/openmw/mwinput/sensormanager.cpp
@@ -11,10 +11,9 @@
 namespace MWInput
 {
     SensorManager::SensorManager()
-        : mGyroValues()
+        : mRotation()
+        , mGyroValues()
         , mGyroUpdateTimer(0.f)
-        , mGyroHAxis(GyroscopeAxis::Minus_X)
-        , mGyroVAxis(GyroscopeAxis::Y)
         , mGyroscope(nullptr)
         , mGuiCursorEnabled(true)
     {
@@ -44,40 +43,36 @@ namespace MWInput
         // Treat setting from config as axes for landscape mode.
         // If the device does not support orientation change, do nothing.
         // Note: in is unclear how to correct axes for devices with non-standart Z axis direction.
-        mGyroHAxis = gyroscopeAxisFromString(Settings::Manager::getString("gyro horizontal axis", "Input"));
-        mGyroVAxis = gyroscopeAxisFromString(Settings::Manager::getString("gyro vertical axis", "Input"));
+
+        mRotation = osg::Matrixf::identity();
+
+        float angle = 0;
 
         SDL_DisplayOrientation currentOrientation = SDL_GetDisplayOrientation(Settings::Manager::getInt("screen", "Video"));
         switch (currentOrientation)
         {
             case SDL_ORIENTATION_UNKNOWN:
-                return;
+                break;
             case SDL_ORIENTATION_LANDSCAPE:
                 break;
             case SDL_ORIENTATION_LANDSCAPE_FLIPPED:
             {
-                mGyroHAxis = GyroscopeAxis(-mGyroHAxis);
-                mGyroVAxis = GyroscopeAxis(-mGyroVAxis);
-
+                angle = osg::PIf;
                 break;
             }
             case SDL_ORIENTATION_PORTRAIT:
             {
-                GyroscopeAxis oldVAxis = mGyroVAxis;
-                mGyroVAxis = mGyroHAxis;
-                mGyroHAxis = GyroscopeAxis(-oldVAxis);
-
+                angle = -0.5 * osg::PIf;
                 break;
             }
             case SDL_ORIENTATION_PORTRAIT_FLIPPED:
             {
-                GyroscopeAxis oldVAxis = mGyroVAxis;
-                mGyroVAxis = GyroscopeAxis(-mGyroHAxis);
-                mGyroHAxis = oldVAxis;
-
+                angle = 0.5 * osg::PIf;
                 break;
             }
         }
+
+        mRotation.makeRotate(angle, osg::Vec3f(0, 0, 1));
     }
 
     void SensorManager::updateSensors()
@@ -127,12 +122,6 @@ namespace MWInput
         {
             if (setting.first == "Input" && setting.second == "enable gyroscope")
                 init();
-
-            if (setting.first == "Input" && setting.second == "gyro horizontal axis")
-                correctGyroscopeAxes();
-
-            if (setting.first == "Input" && setting.second == "gyro vertical axis")
-                correctGyroscopeAxes();
         }
     }
 
@@ -159,11 +148,9 @@ namespace MWInput
                 break;
             case SDL_SENSOR_GYRO:
             {
-                mGyroValues[0] = arg.data[0];
-                mGyroValues[1] = arg.data[1];
-                mGyroValues[2] = arg.data[2];
+                osg::Vec3f gyro(arg.data[0], arg.data[1], arg.data[2]);
+                mGyroValues = mRotation * gyro;
                 mGyroUpdateTimer = 0.f;
-
                 break;
         }
         default:
@@ -179,7 +166,7 @@ namespace MWInput
             // More than half of second passed since the last gyroscope update.
             // A device more likely was disconnected or switched to the sleep mode.
             // Reset current rotation speed and wait for update.
-            mGyroValues = { 0, 0, 0 };
+            mGyroValues = osg::Vec3f();
             mGyroUpdateTimer = 0.f;
         }
     }
@@ -191,6 +178,6 @@ namespace MWInput
 
     std::array<float, 3> SensorManager::getGyroValues() const
     {
-        return mGyroValues;
+        return { mGyroValues.x(), mGyroValues.y(), mGyroValues.z() };
     }
 }
diff --git a/apps/openmw/mwinput/sensormanager.hpp b/apps/openmw/mwinput/sensormanager.hpp
index 92d0a036e8..6353c47764 100644
--- a/apps/openmw/mwinput/sensormanager.hpp
+++ b/apps/openmw/mwinput/sensormanager.hpp
@@ -3,11 +3,12 @@
 
 #include <SDL_sensor.h>
 
+#include <osg/Matrixf>
+#include <osg/Vec3f>
+
 #include <components/settings/settings.hpp>
 #include <components/sdlutil/events.hpp>
 
-#include "gyroaxis.hpp"
-
 namespace SDLUtil
 {
     class InputWrapper;
@@ -45,12 +46,10 @@ namespace MWInput
         void updateSensors();
         void correctGyroscopeAxes();
 
-        std::array<float, 3> mGyroValues;
+        osg::Matrixf mRotation;
+        osg::Vec3f mGyroValues;
         float mGyroUpdateTimer;
 
-        GyroscopeAxis mGyroHAxis;
-        GyroscopeAxis mGyroVAxis;
-
         SDL_Sensor* mGyroscope;
 
         bool mGuiCursorEnabled;
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index f1f3206661..cec1dc3432 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -540,7 +540,7 @@ gyro horizontal axis = -x
 gyro vertical axis = y
 
 # The minimum gyroscope movement that is able to rotate the camera.
-gyro input threshold = 0.01
+gyro input threshold = 0
 
 # Horizontal camera axis sensitivity to gyroscope movement.
 gyro horizontal sensitivity = 1.0

From 15e9c6615c304b5d66365be0005cdcb3d4a55aa0 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Wed, 19 Jan 2022 21:32:46 +0100
Subject: [PATCH 1966/2859] Disable controller gyro with older SDL

---
 apps/openmw/mwinput/controllermanager.cpp | 26 +++++++++++++----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/apps/openmw/mwinput/controllermanager.cpp b/apps/openmw/mwinput/controllermanager.cpp
index 8753344373..6c6549face 100644
--- a/apps/openmw/mwinput/controllermanager.cpp
+++ b/apps/openmw/mwinput/controllermanager.cpp
@@ -406,14 +406,16 @@ namespace MWInput
     void ControllerManager::enableGyroSensor()
     {
         mGyroAvailable = false;
-        SDL_GameController* cntrl = mBindingsManager->getControllerOrNull();
-        if (!cntrl)
-            return;
-        if (!SDL_GameControllerHasSensor(cntrl, SDL_SENSOR_GYRO))
-            return;
-        if (SDL_GameControllerSetSensorEnabled(cntrl, SDL_SENSOR_GYRO, SDL_TRUE) < 0)
-            return;
-        mGyroAvailable = true;
+        #if SDL_VERSION_ATLEAST(2, 0, 14)
+            SDL_GameController* cntrl = mBindingsManager->getControllerOrNull();
+            if (!cntrl)
+                return;
+            if (!SDL_GameControllerHasSensor(cntrl, SDL_SENSOR_GYRO))
+                return;
+            if (SDL_GameControllerSetSensorEnabled(cntrl, SDL_SENSOR_GYRO, SDL_TRUE) < 0)
+                return;
+            mGyroAvailable = true;
+        #endif
     }
 
     bool ControllerManager::isGyroAvailable() const
@@ -424,9 +426,11 @@ namespace MWInput
     std::array<float, 3> ControllerManager::getGyroValues() const
     {
         float gyro[3] = { 0.f };
-        SDL_GameController* cntrl = mBindingsManager->getControllerOrNull();
-        if (cntrl && mGyroAvailable)
-            SDL_GameControllerGetSensorData(cntrl, SDL_SENSOR_GYRO, gyro, 3);
+        #if SDL_VERSION_ATLEAST(2, 0, 14)
+            SDL_GameController* cntrl = mBindingsManager->getControllerOrNull();
+            if (cntrl && mGyroAvailable)
+                SDL_GameControllerGetSensorData(cntrl, SDL_SENSOR_GYRO, gyro, 3);
+        #endif
         return std::array<float, 3>({gyro[0], gyro[1], gyro[2]});
     }
 }

From 57ac592973e81edc08e613e96b32f9d77eb2a02e Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Wed, 19 Jan 2022 22:35:32 +0100
Subject: [PATCH 1967/2859] Fix warning

---
 apps/openmw/mwinput/gyromanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwinput/gyromanager.cpp b/apps/openmw/mwinput/gyromanager.cpp
index f590abf45c..e06f9ac08d 100644
--- a/apps/openmw/mwinput/gyromanager.cpp
+++ b/apps/openmw/mwinput/gyromanager.cpp
@@ -15,7 +15,7 @@ namespace MWInput
         , mInputThreshold(Settings::Manager::getFloat("gyro input threshold", "Input"))
         , mAxisH(gyroscopeAxisFromString(Settings::Manager::getString("gyro horizontal axis", "Input")))
         , mAxisV(gyroscopeAxisFromString(Settings::Manager::getString("gyro vertical axis", "Input")))
-    {};
+    {}
 
     void GyroManager::update(float dt, std::array<float, 3> values) const
     {

From 1df078551505280dc219afad687010c5e460062e Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Thu, 20 Jan 2022 11:08:23 +0000
Subject: [PATCH 1968/2859] Update README.md to add discord link and be more
 clear about OpenMW like in our gitlab repo.

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 557cd614cd..bf81c58e7e 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 OpenMW
 ======
 
-OpenMW is an open-source game engine that supports playing Morrowind by Bethesda Softworks. You need to own the game for OpenMW to play Morrowind.
+OpenMW is an open-source open-world RPG game engine that supports playing Morrowind by Bethesda Softworks. You need to own the game for OpenMW to play Morrowind.
 
 OpenMW also comes with OpenMW-CS, a replacement for Bethesda's Construction Set.
 
@@ -9,6 +9,8 @@ OpenMW also comes with OpenMW-CS, a replacement for Bethesda's Construction Set.
 * License: GPLv3 (see [LICENSE](https://gitlab.com/OpenMW/openmw/-/raw/master/LICENSE) for more information)
 * Website: https://www.openmw.org
 * IRC: #openmw on irc.libera.chat
+* Discord: https://discord.gg/bWuqq2e
+
 
 Font Licenses:
 * DejaVuLGCSansMono.ttf: custom (see [files/mygui/DejaVuFontLicense.txt](https://gitlab.com/OpenMW/openmw/-/raw/master/files/mygui/DejaVuFontLicense.txt) for more information)

From 183ca3079e8f9f1f7a99f025cc6eb4543d73b3ba Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Thu, 20 Jan 2022 15:42:01 +0100
Subject: [PATCH 1969/2859] Merge gyroaxis into gyro manager

---
 apps/openmw/CMakeLists.txt          |  2 +-
 apps/openmw/mwinput/gyroaxis.cpp    | 22 ----------------------
 apps/openmw/mwinput/gyroaxis.hpp    | 22 ----------------------
 apps/openmw/mwinput/gyromanager.cpp | 18 ++++++++++++++++++
 apps/openmw/mwinput/gyromanager.hpp | 15 +++++++++++++--
 5 files changed, 32 insertions(+), 47 deletions(-)
 delete mode 100644 apps/openmw/mwinput/gyroaxis.cpp
 delete mode 100644 apps/openmw/mwinput/gyroaxis.hpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 79cb6f30bd..3c8a0a4d9a 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -27,7 +27,7 @@ add_openmw_dir (mwrender
 
 add_openmw_dir (mwinput
     actions actionmanager bindingsmanager controllermanager controlswitch
-    inputmanagerimp mousemanager keyboardmanager gyroaxis sensormanager gyromanager
+    inputmanagerimp mousemanager keyboardmanager sensormanager gyromanager
     )
 
 add_openmw_dir (mwgui
diff --git a/apps/openmw/mwinput/gyroaxis.cpp b/apps/openmw/mwinput/gyroaxis.cpp
deleted file mode 100644
index 3eb71fb30b..0000000000
--- a/apps/openmw/mwinput/gyroaxis.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "gyroaxis.hpp"
-
-namespace MWInput
-{
-    GyroscopeAxis gyroscopeAxisFromString(std::string_view s)
-    {
-        if (s == "x")
-            return GyroscopeAxis::X;
-        else if (s == "y")
-            return GyroscopeAxis::Y;
-        else if (s == "z")
-            return GyroscopeAxis::Z;
-        else if (s == "-x")
-            return GyroscopeAxis::Minus_X;
-        else if (s == "-y")
-            return GyroscopeAxis::Minus_Y;
-        else if (s == "-z")
-            return GyroscopeAxis::Minus_Z;
-
-        return GyroscopeAxis::Unknown;
-    }
-}
diff --git a/apps/openmw/mwinput/gyroaxis.hpp b/apps/openmw/mwinput/gyroaxis.hpp
deleted file mode 100644
index 542217351d..0000000000
--- a/apps/openmw/mwinput/gyroaxis.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef MWINPUT_GYROAXIS
-#define MWINPUT_GYROAXIS
-
-#include <string_view>
-
-namespace MWInput
-{
-    enum GyroscopeAxis
-    {
-        Unknown = 0,
-        X = 1,
-        Y = 2,
-        Z = 3,
-        Minus_X = -1,
-        Minus_Y = -2,
-        Minus_Z = -3
-    };
-
-    GyroscopeAxis gyroscopeAxisFromString(std::string_view s);
-}
-
-#endif // !MWINPUT_GYROAXIS
diff --git a/apps/openmw/mwinput/gyromanager.cpp b/apps/openmw/mwinput/gyromanager.cpp
index e06f9ac08d..b0c6f121c5 100644
--- a/apps/openmw/mwinput/gyromanager.cpp
+++ b/apps/openmw/mwinput/gyromanager.cpp
@@ -7,6 +7,24 @@
 
 namespace MWInput
 {
+    GyroManager::GyroscopeAxis GyroManager::gyroscopeAxisFromString(std::string_view s)
+    {
+        if (s == "x")
+            return GyroscopeAxis::X;
+        else if (s == "y")
+            return GyroscopeAxis::Y;
+        else if (s == "z")
+            return GyroscopeAxis::Z;
+        else if (s == "-x")
+            return GyroscopeAxis::Minus_X;
+        else if (s == "-y")
+            return GyroscopeAxis::Minus_Y;
+        else if (s == "-z")
+            return GyroscopeAxis::Minus_Z;
+
+        return GyroscopeAxis::Unknown;
+    }
+
     GyroManager::GyroManager()
         : mEnabled(Settings::Manager::getBool("enable gyroscope", "Input"))
         , mGuiCursorEnabled(true)
diff --git a/apps/openmw/mwinput/gyromanager.hpp b/apps/openmw/mwinput/gyromanager.hpp
index ede8eb5c81..bcd3b88f49 100644
--- a/apps/openmw/mwinput/gyromanager.hpp
+++ b/apps/openmw/mwinput/gyromanager.hpp
@@ -3,8 +3,6 @@
 
 #include <components/settings/settings.hpp>
 
-#include "gyroaxis.hpp"
-
 namespace MWInput
 {
     class GyroManager
@@ -21,6 +19,19 @@ namespace MWInput
             void setGuiCursorEnabled(bool enabled) { mGuiCursorEnabled = enabled; }
 
         private:
+            enum GyroscopeAxis
+            {
+                Unknown = 0,
+                X = 1,
+                Y = 2,
+                Z = 3,
+                Minus_X = -1,
+                Minus_Y = -2,
+                Minus_Z = -3
+            };
+
+            static GyroscopeAxis gyroscopeAxisFromString(std::string_view s);
+
             bool mEnabled;
             bool mGuiCursorEnabled;
             float mSensitivityH;

From 580edf18b9cd9ec8911ae8ccfb2c03efa2eb0a06 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 21 Jan 2022 00:28:56 +0000
Subject: [PATCH 1970/2859] Use weak_ptr for Actor and Projectile simulations
 (#6515)

---
 apps/openmw/mwphysics/mtphysics.cpp     | 25 ++++++++++++++++++++-----
 apps/openmw/mwphysics/physicssystem.hpp |  4 ++--
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 2f7e3b5995..2bbd751f63 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -118,7 +118,10 @@ namespace
             const btCollisionWorld* mCollisionWorld;
             void operator()(MWPhysics::ActorSimulation& sim) const
             {
-                auto& [actor, frameData] = sim;
+                auto& [actorPtr, frameData] = sim;
+                const auto actor = actorPtr.lock();
+                if (actor == nullptr)
+                    return;
                 actor->applyOffsetChange();
                 frameData.mPosition = actor->getPosition();
                 if (frameData.mWaterCollision && frameData.mPosition.z() < frameData.mWaterlevel && actor->canMoveToWaterSurface(frameData.mWaterlevel, mCollisionWorld))
@@ -157,7 +160,10 @@ namespace
             btCollisionWorld* mCollisionWorld;
             void operator()(MWPhysics::ActorSimulation& sim) const
             {
-                auto& [actor, frameData] = sim;
+                auto& [actorPtr, frameData] = sim;
+                const auto actor = actorPtr.lock();
+                if (actor == nullptr)
+                    return;
                 if (actor->setPosition(frameData.mPosition))
                 {
                     frameData.mPosition = actor->getPosition(); // account for potential position change made by script
@@ -167,7 +173,10 @@ namespace
             }
             void operator()(MWPhysics::ProjectileSimulation& sim) const
             {
-                auto& [proj, frameData] = sim;
+                auto& [projPtr, frameData] = sim;
+                const auto proj = projPtr.lock();
+                if (proj == nullptr)
+                    return;
                 proj->setPosition(frameData.mPosition);
                 proj->updateCollisionObjectPosition();
                 mCollisionWorld->updateSingleAabb(proj->getCollisionObject());
@@ -197,7 +206,10 @@ namespace
             const MWPhysics::PhysicsTaskScheduler* scheduler;
             void operator()(MWPhysics::ActorSimulation& sim) const
             {
-                auto& [actor, frameData] = sim;
+                auto& [actorPtr, frameData] = sim;
+                const auto actor = actorPtr.lock();
+                if (actor == nullptr)
+                    return;
                 auto ptr = actor->getPtr();
 
                 MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
@@ -229,7 +241,10 @@ namespace
             }
             void operator()(MWPhysics::ProjectileSimulation& sim) const
             {
-                auto& [proj, frameData] = sim;
+                auto& [projPtr, frameData] = sim;
+                const auto proj = projPtr.lock();
+                if (proj == nullptr)
+                    return;
                 proj->setSimulationPosition(::interpolateMovements(*proj, mTimeAccum, mPhysicsDt));
             }
         };
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index c31bbfbf65..d2b535c427 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -117,8 +117,8 @@ namespace MWPhysics
         osg::Vec3f mStormDirection;
     };
 
-    using ActorSimulation = std::pair<std::shared_ptr<Actor>, ActorFrameData>;
-    using ProjectileSimulation = std::pair<std::shared_ptr<Projectile>, ProjectileFrameData>;
+    using ActorSimulation = std::pair<std::weak_ptr<Actor>, ActorFrameData>;
+    using ProjectileSimulation = std::pair<std::weak_ptr<Projectile>, ProjectileFrameData>;
     using Simulation = std::variant<ActorSimulation, ProjectileSimulation>;
 
     class PhysicsSystem : public RayCastingInterface

From 90691814ee93953cb62dfc5292a4e3faf2a92e36 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Fri, 21 Jan 2022 21:06:01 +0000
Subject: [PATCH 1971/2859] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fef2f39234..be6f57053c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -134,7 +134,6 @@ Ubuntu_Static_Deps:
         - "cmake/**/*"
         - "CI/**/*"
         - ".gitlab-ci.yml"
-  allow_failure: true
   cache:
     key: Ubuntu_Static_Deps.V1
     paths:

From 3f14011087a48195a3f2289fde118e6602ba89fb Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 22 Jan 2022 00:15:56 +0100
Subject: [PATCH 1972/2859] Support multiple parents for NIF nodes

Choose a parent base on which node is used to iterate over children nodes.
This leads to duplicate handing of child nodes. A node will be handled so many
times how many parents it has.

For example:
p1 p2
 \ /
  c

Will be handled as:
p1 p2
|  |
c  c

If c has children they will be handled X times c is handled.
---
 .../nifloader/testbulletnifloader.cpp         | 112 +++++++++++++-----
 components/nif/node.hpp                       |   6 +-
 components/nif/parent.hpp                     |  15 +++
 components/nifbullet/bulletnifloader.cpp      |  37 +++---
 components/nifbullet/bulletnifloader.hpp      |  11 +-
 components/nifosg/nifloader.cpp               |  51 ++++----
 6 files changed, 156 insertions(+), 76 deletions(-)
 create mode 100644 components/nif/parent.hpp

diff --git a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
index 8fbf5c1b5b..f84fbe2508 100644
--- a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
+++ b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
@@ -277,7 +277,7 @@ namespace
         value.flags = 0;
         init(value.trafo);
         value.hasBounds = false;
-        value.parent = nullptr;
+        value.parents.push_back(nullptr);
         value.isBone = false;
     }
 
@@ -512,7 +512,7 @@ namespace
         mNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
         mNode.bounds.box.extents = osg::Vec3f(1, 2, 3);
         mNode.bounds.box.center = osg::Vec3f(-1, -2, -3);
-        mNode.parent = &mNiNode;
+        mNode.parents.push_back(&mNiNode);
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNode)}));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
@@ -538,7 +538,7 @@ namespace
         mNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
         mNode.bounds.box.extents = osg::Vec3f(1, 2, 3);
         mNode.bounds.box.center = osg::Vec3f(-1, -2, -3);
-        mNode.parent = &mNiNode;
+        mNode.parents.push_back(&mNiNode);
 
         mNiNode.hasBounds = true;
         mNiNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
@@ -569,13 +569,13 @@ namespace
         mNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
         mNode.bounds.box.extents = osg::Vec3f(1, 2, 3);
         mNode.bounds.box.center = osg::Vec3f(-1, -2, -3);
-        mNode.parent = &mNiNode;
+        mNode.parents.push_back(&mNiNode);
 
         mNode2.hasBounds = true;
         mNode2.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
         mNode2.bounds.box.extents = osg::Vec3f(4, 5, 6);
         mNode2.bounds.box.center = osg::Vec3f(-4, -5, -6);
-        mNode2.parent = &mNiNode;
+        mNode2.parents.push_back(&mNiNode);
 
         mNiNode.hasBounds = true;
         mNiNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
@@ -605,14 +605,14 @@ namespace
         mNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
         mNode.bounds.box.extents = osg::Vec3f(1, 2, 3);
         mNode.bounds.box.center = osg::Vec3f(-1, -2, -3);
-        mNode.parent = &mNiNode;
+        mNode.parents.push_back(&mNiNode);
 
         mNode2.hasBounds = true;
         mNode2.flags |= Nif::NiNode::Flag_BBoxCollision;
         mNode2.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
         mNode2.bounds.box.extents = osg::Vec3f(4, 5, 6);
         mNode2.bounds.box.center = osg::Vec3f(-4, -5, -6);
-        mNode2.parent = &mNiNode;
+        mNode2.parents.push_back(&mNiNode);
 
         mNiNode.hasBounds = true;
         mNiNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
@@ -691,7 +691,7 @@ namespace
 
     TEST_F(TestBulletNifLoader, for_tri_shape_child_node_should_return_shape_with_triangle_mesh_shape)
     {
-        mNiTriShape.parent = &mNiNode;
+        mNiTriShape.parents.push_back(&mNiNode);
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
@@ -710,9 +710,9 @@ namespace
     TEST_F(TestBulletNifLoader, for_nested_tri_shape_child_should_return_shape_with_triangle_mesh_shape)
     {
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiNode2)}));
-        mNiNode2.parent = &mNiNode;
+        mNiNode2.parents.push_back(&mNiNode);
         mNiNode2.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
-        mNiTriShape.parent = &mNiNode2;
+        mNiTriShape.parents.push_back(&mNiNode2);
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
         EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiNode));
@@ -729,8 +729,8 @@ namespace
 
     TEST_F(TestBulletNifLoader, for_two_tri_shape_children_should_return_shape_with_triangle_mesh_shape_with_all_meshes)
     {
-        mNiTriShape.parent = &mNiNode;
-        mNiTriShape2.parent = &mNiNode;
+        mNiTriShape.parents.push_back(&mNiNode);
+        mNiTriShape2.parents.push_back(&mNiNode);
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({
             Nif::NodePtr(&mNiTriShape),
             Nif::NodePtr(&mNiTriShape2)
@@ -753,7 +753,7 @@ namespace
     TEST_F(TestBulletNifLoader, for_tri_shape_child_node_and_filename_starting_with_x_and_not_empty_skin_should_return_shape_with_triangle_mesh_shape)
     {
         mNiTriShape.skin = Nif::NiSkinInstancePtr(&mNiSkinInstance);
-        mNiTriShape.parent = &mNiNode;
+        mNiTriShape.parents.push_back(&mNiNode);
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
@@ -796,7 +796,7 @@ namespace
     {
         copy(mTransform, mNiTriShape.trafo);
         mNiTriShape.trafo.scale = 3;
-        mNiTriShape.parent = &mNiNode;
+        mNiTriShape.parents.push_back(&mNiNode);
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
         mNiNode.trafo.scale = 4;
 
@@ -822,11 +822,11 @@ namespace
     {
         copy(mTransform, mNiTriShape.trafo);
         mNiTriShape.trafo.scale = 3;
-        mNiTriShape.parent = &mNiNode;
+        mNiTriShape.parents.push_back(&mNiNode);
 
         copy(mTransform, mNiTriShape2.trafo);
         mNiTriShape2.trafo.scale = 3;
-        mNiTriShape2.parent = &mNiNode;
+        mNiTriShape2.parents.push_back(&mNiNode);
 
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({
             Nif::NodePtr(&mNiTriShape),
@@ -864,7 +864,7 @@ namespace
         mController.flags |= Nif::NiNode::ControllerFlag_Active;
         copy(mTransform, mNiTriShape.trafo);
         mNiTriShape.trafo.scale = 3;
-        mNiTriShape.parent = &mNiNode;
+        mNiTriShape.parents.push_back(&mNiNode);
         mNiTriShape.controller = Nif::ControllerPtr(&mController);
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
         mNiNode.trafo.scale = 4;
@@ -893,10 +893,10 @@ namespace
         mController.flags |= Nif::NiNode::ControllerFlag_Active;
         copy(mTransform, mNiTriShape.trafo);
         mNiTriShape.trafo.scale = 3;
-        mNiTriShape.parent = &mNiNode;
+        mNiTriShape.parents.push_back(&mNiNode);
         copy(mTransform, mNiTriShape2.trafo);
         mNiTriShape2.trafo.scale = 3;
-        mNiTriShape2.parent = &mNiNode;
+        mNiTriShape2.parents.push_back(&mNiNode);
         mNiTriShape2.controller = Nif::ControllerPtr(&mController);
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({
             Nif::NodePtr(&mNiTriShape),
@@ -931,7 +931,7 @@ namespace
 
     TEST_F(TestBulletNifLoader, should_add_static_mesh_to_existing_compound_mesh)
     {
-        mNiTriShape.parent = &mNiNode;
+        mNiTriShape.parents.push_back(&mNiNode);
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(2));
@@ -959,7 +959,7 @@ namespace
 
     TEST_F(TestBulletNifLoader, for_root_avoid_node_and_tri_shape_child_node_should_return_shape_with_null_collision_shape)
     {
-        mNiTriShape.parent = &mNiNode;
+        mNiTriShape.parents.push_back(&mNiNode);
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
         mNiNode.recType = Nif::RC_AvoidNode;
 
@@ -979,7 +979,7 @@ namespace
     TEST_F(TestBulletNifLoader, for_tri_shape_child_node_with_empty_data_should_return_shape_with_null_collision_shape)
     {
         mNiTriShape.data = Nif::NiGeometryDataPtr(nullptr);
-        mNiTriShape.parent = &mNiNode;
+        mNiTriShape.parents.push_back(&mNiNode);
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
@@ -996,7 +996,7 @@ namespace
     {
         auto data = static_cast<Nif::NiTriShapeData*>(mNiTriShape.data.getPtr());
         data->triangles.clear();
-        mNiTriShape.parent = &mNiNode;
+        mNiTriShape.parents.push_back(&mNiNode);
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
@@ -1014,7 +1014,7 @@ namespace
         mNiStringExtraData.string = "NC___";
         mNiStringExtraData.recType = Nif::RC_NiStringExtraData;
         mNiTriShape.extra = Nif::ExtraPtr(&mNiStringExtraData);
-        mNiTriShape.parent = &mNiNode;
+        mNiTriShape.parents.push_back(&mNiNode);
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
@@ -1033,7 +1033,7 @@ namespace
         mNiStringExtraData2.string = "NC___";
         mNiStringExtraData2.recType = Nif::RC_NiStringExtraData;
         mNiTriShape.extra = Nif::ExtraPtr(&mNiStringExtraData);
-        mNiTriShape.parent = &mNiNode;
+        mNiTriShape.parents.push_back(&mNiNode);
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
@@ -1051,7 +1051,7 @@ namespace
         mNiStringExtraData.string = "MRK";
         mNiStringExtraData.recType = Nif::RC_NiStringExtraData;
         mNiTriShape.extra = Nif::ExtraPtr(&mNiStringExtraData);
-        mNiTriShape.parent = &mNiNode;
+        mNiTriShape.parents.push_back(&mNiNode);
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
@@ -1069,10 +1069,10 @@ namespace
         mNiStringExtraData.string = "MRK";
         mNiStringExtraData.recType = Nif::RC_NiStringExtraData;
         mNiTriShape.extra = Nif::ExtraPtr(&mNiStringExtraData);
-        mNiTriShape.parent = &mNiNode2;
+        mNiTriShape.parents.push_back(&mNiNode2);
         mNiNode2.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
         mNiNode2.recType = Nif::RC_RootCollisionNode;
-        mNiNode2.parent = &mNiNode;
+        mNiNode2.parents.push_back(&mNiNode);
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiNode2)}));
         mNiNode.recType = Nif::RC_NiNode;
 
@@ -1163,7 +1163,7 @@ namespace
 
     TEST_F(TestBulletNifLoader, for_avoid_collision_mesh_should_ignore_tri_strips_data_with_less_than_3_strips)
     {
-        mNiTriShape.parent = &mNiNode;
+        mNiTriShape.parents.push_back(&mNiNode);
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
         mNiNode.recType = Nif::RC_AvoidNode;
         mNiTriStripsData.strips.front() = {0, 1};
@@ -1181,7 +1181,7 @@ namespace
     TEST_F(TestBulletNifLoader, for_animated_mesh_should_ignore_tri_strips_data_with_less_than_3_strips)
     {
         mNiTriStripsData.strips.front() = {0, 1};
-        mNiTriStrips.parent = &mNiNode;
+        mNiTriStrips.parents.push_back(&mNiNode);
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriStrips)}));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
@@ -1197,7 +1197,7 @@ namespace
     TEST_F(TestBulletNifLoader, should_not_add_static_mesh_with_no_triangles_to_compound_shape)
     {
         mNiTriStripsData.strips.front() = {0, 1};
-        mNiTriShape.parent = &mNiNode;
+        mNiTriShape.parents.push_back(&mNiNode);
         mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
 
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(2));
@@ -1218,4 +1218,54 @@ namespace
 
         EXPECT_EQ(*result, expected);
     }
+
+    TEST_F(TestBulletNifLoader, should_handle_node_with_multiple_parents)
+    {
+        copy(mTransform, mNiTriShape.trafo);
+        mNiTriShape.trafo.scale = 4;
+        mNiTriShape.parents = {&mNiNode, &mNiNode2};
+        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
+        mNiNode.trafo.scale = 2;
+        mNiNode2.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
+        mNiNode2.trafo.scale = 3;
+
+        EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(2));
+        EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiNode));
+        EXPECT_CALL(mNifFile, getRoot(1)).WillOnce(Return(&mNiNode2));
+        EXPECT_CALL(mNifFile, getFilename()).WillOnce(Return("xtest.nif"));
+        const auto result = mLoader.load(mNifFile);
+
+        std::unique_ptr<btTriangleMesh> triangles1(new btTriangleMesh(false));
+        triangles1->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
+        std::unique_ptr<Resource::TriangleMeshShape> mesh1(new Resource::TriangleMeshShape(triangles1.release(), true));
+        mesh1->setLocalScaling(btVector3(8, 8, 8));
+        std::unique_ptr<btTriangleMesh> triangles2(new btTriangleMesh(false));
+        triangles2->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
+        std::unique_ptr<Resource::TriangleMeshShape> mesh2(new Resource::TriangleMeshShape(triangles2.release(), true));
+        mesh2->setLocalScaling(btVector3(12, 12, 12));
+        std::unique_ptr<btCompoundShape> shape(new btCompoundShape);
+        const btTransform transform1 {
+            btMatrix3x3(
+                1, 0, 0,
+                0, 0.8004512795493964327775415767973754555, 0.59939782204119995689950428641168400645,
+                0, -0.59939782204119995689950428641168400645, 0.8004512795493964327775415767973754555
+            ),
+            btVector3(2, 4, 6)
+        };
+        const btTransform transform2 {
+            btMatrix3x3(
+                1, 0, 0,
+                0, 0.79515431915808965079861536651151254773, 0.60640713116208888600056070572463795543,
+                0, -0.60640713116208888600056070572463795543, 0.79515431915808965079861536651151254773
+            ),
+            btVector3(3, 6, 9)
+        };
+        shape->addChildShape(transform1, mesh1.release());
+        shape->addChildShape(transform2, mesh2.release());
+        Resource::BulletShape expected;
+        expected.mCollisionShape.reset(shape.release());
+        expected.mAnimatedShapes = {{-1, 0}};
+
+        EXPECT_EQ(*result, expected);
+    }
 }
diff --git a/components/nif/node.hpp b/components/nif/node.hpp
index 7e5bcdb3be..31eb63144c 100644
--- a/components/nif/node.hpp
+++ b/components/nif/node.hpp
@@ -166,7 +166,7 @@ struct Node : public Named
         if (nif->getVersion() >= NIFStream::generateVersion(10,0,1,0))
             collision.read(nif);
 
-        parent = nullptr;
+        parents.clear();
 
         isBone = false;
     }
@@ -180,7 +180,7 @@ struct Node : public Named
 
     // Parent node, or nullptr for the root node. As far as I'm aware, only
     // NiNodes (or types derived from NiNodes) can be parents.
-    NiNode *parent;
+    std::vector<NiNode*> parents;
 
     bool isBone{false};
 
@@ -238,7 +238,7 @@ struct NiNode : Node
         {
             // Why would a unique list of children contain empty refs?
             if(!children[i].empty())
-                children[i]->parent = this;
+                children[i]->parents.push_back(this);
         }
     }
 };
diff --git a/components/nif/parent.hpp b/components/nif/parent.hpp
new file mode 100644
index 0000000000..afa540c8ec
--- /dev/null
+++ b/components/nif/parent.hpp
@@ -0,0 +1,15 @@
+#ifndef OPENMW_COMPONENTS_NIF_PARENT_HPP
+#define OPENMW_COMPONENTS_NIF_PARENT_HPP
+
+namespace Nif
+{
+    struct NiNode;
+
+    struct Parent
+    {
+        const NiNode& mNiNode;
+        const Parent* mParent;
+    };
+}
+
+#endif
diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index 4be07525a6..25079ad9e0 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -16,15 +16,17 @@
 #include <components/nif/node.hpp>
 #include <components/nif/data.hpp>
 #include <components/nif/extra.hpp>
+#include <components/nif/parent.hpp>
 
 namespace
 {
 
-osg::Matrixf getWorldTransform(const Nif::Node& node)
+osg::Matrixf getWorldTransform(const Nif::Node& node, const Nif::Parent* nodeParent)
 {
-    if(node.parent != nullptr)
-        return node.trafo.toMatrix() * getWorldTransform(*node.parent);
-    return node.trafo.toMatrix();
+    osg::Matrixf result = node.trafo.toMatrix();
+    for (const Nif::Parent* parent = nodeParent; parent != nullptr; parent = parent->mParent)
+        result *= parent->mNiNode.trafo.toMatrix();
+    return result;
 }
 
 bool pathFileNameStartsWithX(const std::string& path)
@@ -214,7 +216,7 @@ osg::ref_ptr<Resource::BulletShape> BulletNifLoader::load(const Nif::File& nif)
     for (const Nif::Node* node : roots)
     {
         bool autogenerated = hasAutoGeneratedCollision(*node);
-        handleNode(filename, *node, 0, autogenerated, isAnimated, autogenerated);
+        handleNode(filename, *node, nullptr, 0, autogenerated, isAnimated, autogenerated);
     }
 
     if (mCompoundShape)
@@ -305,8 +307,8 @@ bool BulletNifLoader::hasAutoGeneratedCollision(const Nif::Node& rootNode)
     return true;
 }
 
-void BulletNifLoader::handleNode(const std::string& fileName, const Nif::Node& node, int flags,
-        bool isCollisionNode, bool isAnimated, bool autogenerated, bool avoid)
+void BulletNifLoader::handleNode(const std::string& fileName, const Nif::Node& node, const Nif::Parent* parent,
+    int flags, bool isCollisionNode, bool isAnimated, bool autogenerated, bool avoid)
 {
     // TODO: allow on-the fly collision switching via toggling this flag
     if (node.recType == Nif::RC_NiCollisionSwitch && !(node.flags & Nif::NiNode::Flag_ActiveCollision))
@@ -361,7 +363,7 @@ void BulletNifLoader::handleNode(const std::string& fileName, const Nif::Node& n
                                 || node.recType == Nif::RC_NiTriStrips
                                 || node.recType == Nif::RC_BSLODTriShape))
         {
-            handleNiTriShape(node, flags, getWorldTransform(node), isAnimated, avoid);
+            handleNiTriShape(node, parent, flags, getWorldTransform(node, parent), isAnimated, avoid);
         }
     }
 
@@ -369,30 +371,31 @@ void BulletNifLoader::handleNode(const std::string& fileName, const Nif::Node& n
     if (const Nif::NiNode *ninode = dynamic_cast<const Nif::NiNode*>(&node))
     {
         const Nif::NodeList &list = ninode->children;
+        const Nif::Parent currentParent {*ninode, parent};
         for(size_t i = 0;i < list.length();i++)
         {
             if (list[i].empty())
                 continue;
 
-            assert(list[i].get().parent == &node);
-            handleNode(fileName, list[i].get(), flags, isCollisionNode, isAnimated, autogenerated, avoid);
+            assert(std::find(list[i]->parents.begin(), list[i]->parents.end(), ninode) != list[i]->parents.end());
+            handleNode(fileName, list[i].get(), &currentParent, flags, isCollisionNode, isAnimated, autogenerated, avoid);
         }
     }
 }
 
-void BulletNifLoader::handleNiTriShape(const Nif::Node& nifNode, int flags, const osg::Matrixf &transform,
-                                       bool isAnimated, bool avoid)
+void BulletNifLoader::handleNiTriShape(const Nif::Node& nifNode, const Nif::Parent* parent, int flags,
+    const osg::Matrixf &transform, bool isAnimated, bool avoid)
 {
     // If the object was marked "NCO" earlier, it shouldn't collide with
     // anything. So don't do anything.
     if ((flags & 0x800))
         return;
 
-    handleNiTriShape(static_cast<const Nif::NiGeometry&>(nifNode), transform, isAnimated, avoid);
+    handleNiTriShape(static_cast<const Nif::NiGeometry&>(nifNode), parent, transform, isAnimated, avoid);
 }
 
-void BulletNifLoader::handleNiTriShape(const Nif::NiGeometry& niGeometry, const osg::Matrixf &transform,
-    bool isAnimated, bool avoid)
+void BulletNifLoader::handleNiTriShape(const Nif::NiGeometry& niGeometry, const Nif::Parent* nodeParent,
+    const osg::Matrixf &transform, bool isAnimated, bool avoid)
 {
     if (niGeometry.data.empty() || niGeometry.data->vertices.empty())
         return;
@@ -413,8 +416,8 @@ void BulletNifLoader::handleNiTriShape(const Nif::NiGeometry& niGeometry, const
         childMesh.release();
 
         float scale = niGeometry.trafo.scale;
-        for (const Nif::Node* parent = niGeometry.parent; parent != nullptr; parent = parent->parent)
-            scale *= parent->trafo.scale;
+        for (const Nif::Parent* parent = nodeParent; parent != nullptr; parent = parent->mParent)
+            scale *= parent->mNiNode.trafo.scale;
         osg::Quat q = transform.getRotate();
         osg::Vec3f v = transform.getTrans();
         childShape->setLocalScaling(btVector3(scale, scale, scale));
diff --git a/components/nifbullet/bulletnifloader.hpp b/components/nifbullet/bulletnifloader.hpp
index e0fec338c6..01a17a5aa1 100644
--- a/components/nifbullet/bulletnifloader.hpp
+++ b/components/nifbullet/bulletnifloader.hpp
@@ -28,6 +28,7 @@ namespace Nif
     struct NiTriShape;
     struct NiTriStrips;
     struct NiGeometry;
+    struct Parent;
 }
 
 namespace NifBullet
@@ -55,14 +56,16 @@ public:
 private:
     bool findBoundingBox(const Nif::Node& node, const std::string& filename);
 
-    void handleNode(const std::string& fileName, const Nif::Node& node, int flags, bool isCollisionNode,
-                    bool isAnimated=false, bool autogenerated=false, bool avoid=false);
+    void handleNode(const std::string& fileName, const Nif::Node& node, const Nif::Parent* parent, int flags,
+        bool isCollisionNode, bool isAnimated=false, bool autogenerated=false, bool avoid=false);
 
     bool hasAutoGeneratedCollision(const Nif::Node& rootNode);
 
-    void handleNiTriShape(const Nif::Node& nifNode, int flags, const osg::Matrixf& transform, bool isAnimated, bool avoid);
+    void handleNiTriShape(const Nif::Node& nifNode, const Nif::Parent* parent, int flags, const osg::Matrixf& transform,
+        bool isAnimated, bool avoid);
 
-    void handleNiTriShape(const Nif::NiGeometry& nifNode, const osg::Matrixf& transform, bool isAnimated, bool avoid);
+    void handleNiTriShape(const Nif::NiGeometry& nifNode, const Nif::Parent* parent, const osg::Matrixf& transform,
+        bool isAnimated, bool avoid);
 
     std::unique_ptr<btCompoundShape, Resource::DeleteCollisionShape> mCompoundShape;
 
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 43af68fc90..67cb16b795 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -17,6 +17,7 @@
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/imagemanager.hpp>
 #include <components/misc/osguservalues.hpp>
+#include <components/nif/parent.hpp>
 
 // particle
 #include <osgParticle/ParticleSystem>
@@ -74,10 +75,10 @@ namespace
     }
 
     // Collect all properties affecting the given drawable that should be handled on drawable basis rather than on the node hierarchy above it.
-    void collectDrawableProperties(const Nif::Node* nifNode, std::vector<const Nif::Property*>& out)
+    void collectDrawableProperties(const Nif::Node* nifNode, const Nif::Parent* parent, std::vector<const Nif::Property*>& out)
     {
-        if (nifNode->parent)
-            collectDrawableProperties(nifNode->parent, out);
+        if (parent != nullptr)
+            collectDrawableProperties(&parent->mNiNode, parent->mParent, out);
         const Nif::PropertyList& props = nifNode->props;
         for (size_t i = 0; i <props.length();++i)
         {
@@ -300,7 +301,7 @@ namespace NifOsg
             created->setDataVariance(osg::Object::STATIC);
             for (const Nif::Node* root : roots)
             {
-                auto node = handleNode(root, nullptr, imageManager, std::vector<unsigned int>(), 0, false, false, false, &textkeys->mTextKeys);
+                auto node = handleNode(root, nullptr, nullptr, imageManager, std::vector<unsigned int>(), 0, false, false, false, &textkeys->mTextKeys);
                 created->addChild(node);
             }
             if (mHasNightDayLabel)
@@ -339,7 +340,7 @@ namespace NifOsg
                 {
                     // Get the lowest numbered recIndex of the NiTexturingProperty root node.
                     // This is what is overridden when a spell effect "particle texture" is used.
-                    if (nifNode->parent == nullptr && !mFoundFirstRootTexturingProperty && props[i].getPtr()->recType == Nif::RC_NiTexturingProperty)
+                    if (nifNode->parents.empty() && !mFoundFirstRootTexturingProperty && props[i].getPtr()->recType == Nif::RC_NiTexturingProperty)
                     {
                         mFirstRootTextureIndex = props[i].getPtr()->recIndex;
                         mFoundFirstRootTexturingProperty = true;
@@ -483,7 +484,7 @@ namespace NifOsg
                 // The Root node can be created as a Group if no transformation is required.
                 // This takes advantage of the fact root nodes can't have additional controllers
                 // loaded from an external .kf file (original engine just throws "can't find node" errors if you try).
-                if (!nifNode->parent && nifNode->controller.empty() && nifNode->trafo.isIdentity())
+                if (nifNode->parents.empty() && nifNode->controller.empty() && nifNode->trafo.isIdentity())
                     node = new osg::Group;
 
                 dataVariance = nifNode->isBone ? osg::Object::DYNAMIC : osg::Object::STATIC;
@@ -505,8 +506,10 @@ namespace NifOsg
             return node;
         }
 
-        osg::ref_ptr<osg::Node> handleNode(const Nif::Node* nifNode, osg::Group* parentNode, Resource::ImageManager* imageManager,
-                                std::vector<unsigned int> boundTextures, int animflags, bool skipMeshes, bool hasMarkers, bool hasAnimatedParents, SceneUtil::TextKeyMap* textKeys, osg::Node* rootNode=nullptr)
+        osg::ref_ptr<osg::Node> handleNode(const Nif::Node* nifNode, const Nif::Parent* parent, osg::Group* parentNode,
+            Resource::ImageManager* imageManager, std::vector<unsigned int> boundTextures, int animflags,
+            bool skipMeshes, bool hasMarkers, bool hasAnimatedParents, SceneUtil::TextKeyMap* textKeys,
+            osg::Node* rootNode=nullptr)
         {
             if (rootNode != nullptr && Misc::StringUtils::ciEqual(nifNode->name, "Bounding Box"))
                 return nullptr;
@@ -615,9 +618,9 @@ namespace NifOsg
                     Nif::NiSkinInstancePtr skin = static_cast<const Nif::NiGeometry*>(nifNode)->skin;
 
                     if (skin.empty())
-                        handleGeometry(nifNode, node, composite, boundTextures, animflags);
+                        handleGeometry(nifNode, parent, node, composite, boundTextures, animflags);
                     else
-                        handleSkinnedGeometry(nifNode, node, composite, boundTextures, animflags);
+                        handleSkinnedGeometry(nifNode, parent, node, composite, boundTextures, animflags);
 
                     if (!nifNode->controller.empty())
                         handleMeshControllers(nifNode, node, composite, boundTextures, animflags);
@@ -625,7 +628,7 @@ namespace NifOsg
             }
 
             if (nifNode->recType == Nif::RC_NiParticles)
-                handleParticleSystem(nifNode, node, composite, animflags);
+                handleParticleSystem(nifNode, parent, node, composite, animflags);
 
             if (composite->getNumControllers() > 0)
             {
@@ -681,10 +684,11 @@ namespace NifOsg
                 }
 
                 const Nif::NodeList &children = ninode->children;
+                const Nif::Parent currentParent {*ninode, parent};
                 for(size_t i = 0;i < children.length();++i)
                 {
                     if(!children[i].empty())
-                        handleNode(children[i].getPtr(), currentNode, imageManager, boundTextures, animflags, skipMeshes, hasMarkers, hasAnimatedParents, textKeys, rootNode);
+                        handleNode(children[i].getPtr(), &currentParent, currentNode, imageManager, boundTextures, animflags, skipMeshes, hasMarkers, hasAnimatedParents, textKeys, rootNode);
                 }
             }
 
@@ -1026,7 +1030,8 @@ namespace NifOsg
             mEmitterQueue.clear();
         }
 
-        void handleParticleSystem(const Nif::Node *nifNode, osg::Group *parentNode, SceneUtil::CompositeStateSetUpdater* composite, int animflags)
+        void handleParticleSystem(const Nif::Node *nifNode, const Nif::Parent* parent, osg::Group *parentNode,
+            SceneUtil::CompositeStateSetUpdater* composite, int animflags)
         {
             osg::ref_ptr<ParticleSystem> partsys (new ParticleSystem);
             partsys->setSortMode(osgParticle::ParticleSystem::SORT_BACK_TO_FRONT);
@@ -1095,7 +1100,7 @@ namespace NifOsg
             handleParticlePrograms(partctrl->affectors, partctrl->colliders, parentNode, partsys.get(), rf);
 
             std::vector<const Nif::Property*> drawableProps;
-            collectDrawableProperties(nifNode, drawableProps);
+            collectDrawableProperties(nifNode, parent, drawableProps);
             applyDrawableProperties(parentNode, drawableProps, composite, true, animflags);
 
             // particle system updater (after the emitters and affectors in the scene graph)
@@ -1146,7 +1151,9 @@ namespace NifOsg
             }
         }
 
-        void handleNiGeometry(const Nif::Node *nifNode, osg::Geometry *geometry, osg::Node* parentNode, SceneUtil::CompositeStateSetUpdater* composite, const std::vector<unsigned int>& boundTextures, int animflags)
+        void handleNiGeometry(const Nif::Node *nifNode, const Nif::Parent* parent, osg::Geometry *geometry,
+            osg::Node* parentNode, SceneUtil::CompositeStateSetUpdater* composite,
+            const std::vector<unsigned int>& boundTextures, int animflags)
         {
             const Nif::NiGeometry* niGeometry = static_cast<const Nif::NiGeometry*>(nifNode);
             if (niGeometry->data.empty())
@@ -1198,15 +1205,17 @@ namespace NifOsg
             // - there are 3 "overlapping" nif properties that all affect the osg::Material, handling them
             //   above the actual renderable would be tedious.
             std::vector<const Nif::Property*> drawableProps;
-            collectDrawableProperties(nifNode, drawableProps);
+            collectDrawableProperties(nifNode, parent, drawableProps);
             applyDrawableProperties(parentNode, drawableProps, composite, !niGeometryData->colors.empty(), animflags);
         }
 
-        void handleGeometry(const Nif::Node* nifNode, osg::Group* parentNode, SceneUtil::CompositeStateSetUpdater* composite, const std::vector<unsigned int>& boundTextures, int animflags)
+        void handleGeometry(const Nif::Node* nifNode, const Nif::Parent* parent, osg::Group* parentNode,
+            SceneUtil::CompositeStateSetUpdater* composite, const std::vector<unsigned int>& boundTextures,
+            int animflags)
         {
             assert(isTypeGeometry(nifNode->recType));
             osg::ref_ptr<osg::Geometry> geom (new osg::Geometry);
-            handleNiGeometry(nifNode, geom, parentNode, composite, boundTextures, animflags);
+            handleNiGeometry(nifNode, parent, geom, parentNode, composite, boundTextures, animflags);
             // If the record had no valid geometry data in it, early-out
             if (geom->empty())
                 return;
@@ -1250,12 +1259,12 @@ namespace NifOsg
             return morphGeom;
         }
 
-        void handleSkinnedGeometry(const Nif::Node *nifNode, osg::Group *parentNode, SceneUtil::CompositeStateSetUpdater* composite,
-                                          const std::vector<unsigned int>& boundTextures, int animflags)
+        void handleSkinnedGeometry(const Nif::Node *nifNode, const Nif::Parent* parent, osg::Group *parentNode,
+            SceneUtil::CompositeStateSetUpdater* composite, const std::vector<unsigned int>& boundTextures, int animflags)
         {
             assert(isTypeGeometry(nifNode->recType));
             osg::ref_ptr<osg::Geometry> geometry (new osg::Geometry);
-            handleNiGeometry(nifNode, geometry, parentNode, composite, boundTextures, animflags);
+            handleNiGeometry(nifNode, parent, geometry, parentNode, composite, boundTextures, animflags);
             if (geometry->empty())
                 return;
             osg::ref_ptr<SceneUtil::RigGeometry> rig(new SceneUtil::RigGeometry);

From a85f2b0b2ac1e2ec172a6d094ff48a639784e5b8 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sat, 22 Jan 2022 13:21:23 +0100
Subject: [PATCH 1973/2859] Remove unnecessary mGuiCursorEnabled; from sensor
 manager

---
 apps/openmw/mwinput/inputmanagerimp.cpp | 1 -
 apps/openmw/mwinput/sensormanager.cpp   | 1 -
 apps/openmw/mwinput/sensormanager.hpp   | 4 ----
 3 files changed, 6 deletions(-)

diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index 8beead5803..40de2b45fb 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -132,7 +132,6 @@ namespace MWInput
     {
         mControllerManager->setGuiCursorEnabled(guiMode);
         mMouseManager->setGuiCursorEnabled(guiMode);
-        mSensorManager->setGuiCursorEnabled(guiMode);
         mGyroManager->setGuiCursorEnabled(guiMode);
         mMouseManager->setMouseLookEnabled(!guiMode);
         if (guiMode)
diff --git a/apps/openmw/mwinput/sensormanager.cpp b/apps/openmw/mwinput/sensormanager.cpp
index cab78c46f2..f3cee579e5 100644
--- a/apps/openmw/mwinput/sensormanager.cpp
+++ b/apps/openmw/mwinput/sensormanager.cpp
@@ -15,7 +15,6 @@ namespace MWInput
         , mGyroValues()
         , mGyroUpdateTimer(0.f)
         , mGyroscope(nullptr)
-        , mGuiCursorEnabled(true)
     {
         init();
     }
diff --git a/apps/openmw/mwinput/sensormanager.hpp b/apps/openmw/mwinput/sensormanager.hpp
index 6353c47764..8f72b99de9 100644
--- a/apps/openmw/mwinput/sensormanager.hpp
+++ b/apps/openmw/mwinput/sensormanager.hpp
@@ -36,8 +36,6 @@ namespace MWInput
         void displayOrientationChanged() override;
         void processChangedSettings(const Settings::CategorySettingVector& changed);
 
-        void setGuiCursorEnabled(bool enabled) { mGuiCursorEnabled = enabled; }
-
         bool isGyroAvailable() const;
         std::array<float, 3> getGyroValues() const;
 
@@ -51,8 +49,6 @@ namespace MWInput
         float mGyroUpdateTimer;
 
         SDL_Sensor* mGyroscope;
-
-        bool mGuiCursorEnabled;
     };
 }
 #endif

From 26bdba88a2a9a48a4779b11cda6555f5f6f30d6f Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sat, 22 Jan 2022 17:17:20 +0100
Subject: [PATCH 1974/2859] Store std::weak_ptr into mUpdateAabb. This avoid
 extending the lifetime of collision objects beyond what they should.

---
 apps/openmw/mwphysics/mtphysics.cpp | 11 ++++++++---
 apps/openmw/mwphysics/mtphysics.hpp |  4 ++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 2bbd751f63..29a59314b9 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -518,7 +518,7 @@ namespace MWPhysics
         mCollisionWorld->removeCollisionObject(collisionObject);
     }
 
-    void PhysicsTaskScheduler::updateSingleAabb(std::shared_ptr<PtrHolder> ptr, bool immediate)
+    void PhysicsTaskScheduler::updateSingleAabb(const std::shared_ptr<PtrHolder>& ptr, bool immediate)
     {
         if (immediate || mNumThreads == 0)
         {
@@ -527,7 +527,7 @@ namespace MWPhysics
         else
         {
             MaybeExclusiveLock lock(mUpdateAabbMutex, mNumThreads);
-            mUpdateAabb.insert(std::move(ptr));
+            mUpdateAabb.insert(ptr);
         }
     }
 
@@ -570,7 +570,12 @@ namespace MWPhysics
     {
         MaybeExclusiveLock lock(mUpdateAabbMutex, mNumThreads);
         std::for_each(mUpdateAabb.begin(), mUpdateAabb.end(),
-            [this](const std::shared_ptr<PtrHolder>& ptr) { updatePtrAabb(ptr); });
+            [this](const std::weak_ptr<PtrHolder>& ptr)
+            {
+                auto p = ptr.lock();
+                if (p != nullptr)
+                    updatePtrAabb(p);
+            });
         mUpdateAabb.clear();
     }
 
diff --git a/apps/openmw/mwphysics/mtphysics.hpp b/apps/openmw/mwphysics/mtphysics.hpp
index 9ded1262d6..685d4eefab 100644
--- a/apps/openmw/mwphysics/mtphysics.hpp
+++ b/apps/openmw/mwphysics/mtphysics.hpp
@@ -54,7 +54,7 @@ namespace MWPhysics
             void setCollisionFilterMask(btCollisionObject* collisionObject, int collisionFilterMask);
             void addCollisionObject(btCollisionObject* collisionObject, int collisionFilterGroup, int collisionFilterMask);
             void removeCollisionObject(btCollisionObject* collisionObject);
-            void updateSingleAabb(std::shared_ptr<PtrHolder> ptr, bool immediate=false);
+            void updateSingleAabb(const std::shared_ptr<PtrHolder>& ptr, bool immediate=false);
             bool getLineOfSight(const std::shared_ptr<Actor>& actor1, const std::shared_ptr<Actor>& actor2);
             void debugDraw();
             void* getUserPointer(const btCollisionObject* object) const;
@@ -85,7 +85,7 @@ namespace MWPhysics
             btCollisionWorld* mCollisionWorld;
             MWRender::DebugDrawer* mDebugDrawer;
             std::vector<LOSRequest> mLOSCache;
-            std::set<std::shared_ptr<PtrHolder>> mUpdateAabb;
+            std::set<std::weak_ptr<PtrHolder>, std::owner_less<std::weak_ptr<PtrHolder>>> mUpdateAabb;
 
             // TODO: use std::experimental::flex_barrier or std::barrier once it becomes a thing
             std::unique_ptr<Misc::Barrier> mPreStepBarrier;

From 24989e7bc1fb66577ec340591afa8d2e8f91d708 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 23 Jan 2022 11:30:22 +0100
Subject: [PATCH 1975/2859] Validate that object exists before onActorActive
 Lua handler

---
 apps/openmw/mwlua/luamanagerimp.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 8211c37abf..459a85d9c9 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -200,7 +200,13 @@ namespace MWLua
         }
 
         for (ObjectId id : mActorAddedEvents)
-            mGlobalScripts.actorActive(GObject(id, objectRegistry));
+        {
+            GObject obj(id, objectRegistry);
+            if (obj.isValid())
+                mGlobalScripts.actorActive(obj);
+            else
+                Log(Debug::Verbose) << "Can not call onActorActive engine handler: object" << idToString(id) << " is already removed";
+        }
         mActorAddedEvents.clear();
 
         if (!mWorldView.isPaused())

From 4b59ff20609b4a52d0a8203f337aa539ec1fc687 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 23 Jan 2022 15:40:14 +0100
Subject: [PATCH 1976/2859] Include headers instead of source files

---
 apps/openmw_test_suite/esmloader/esmdata.cpp | 10 +++++++++-
 apps/openmw_test_suite/esmloader/load.cpp    | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/apps/openmw_test_suite/esmloader/esmdata.cpp b/apps/openmw_test_suite/esmloader/esmdata.cpp
index da78aaa3a2..7e5791561e 100644
--- a/apps/openmw_test_suite/esmloader/esmdata.cpp
+++ b/apps/openmw_test_suite/esmloader/esmdata.cpp
@@ -1,4 +1,12 @@
-#include <components/esmloader/esmdata.cpp>
+#include <components/esm/loadacti.hpp>
+#include <components/esm/loadcell.hpp>
+#include <components/esm/loadcont.hpp>
+#include <components/esm/loaddoor.hpp>
+#include <components/esm/loadgmst.hpp>
+#include <components/esm/loadland.hpp>
+#include <components/esm/loadstat.hpp>
+#include <components/esm/variant.hpp>
+#include <components/esmloader/esmdata.hpp>
 
 #include <gtest/gtest.h>
 
diff --git a/apps/openmw_test_suite/esmloader/load.cpp b/apps/openmw_test_suite/esmloader/load.cpp
index d6ed66f7a7..048657e65d 100644
--- a/apps/openmw_test_suite/esmloader/load.cpp
+++ b/apps/openmw_test_suite/esmloader/load.cpp
@@ -1,4 +1,12 @@
-#include <components/esmloader/load.cpp>
+#include <components/esm/loadacti.hpp>
+#include <components/esm/loadcell.hpp>
+#include <components/esm/loadcont.hpp>
+#include <components/esm/loaddoor.hpp>
+#include <components/esm/loadgmst.hpp>
+#include <components/esm/loadland.hpp>
+#include <components/esm/loadstat.hpp>
+#include <components/esmloader/esmdata.hpp>
+#include <components/esmloader/load.hpp>
 #include <components/files/collections.hpp>
 #include <components/files/multidircollection.hpp>
 #include <components/to_utf8/to_utf8.hpp>

From d1fb8545217a4e4044e6825eace60a485618954c Mon Sep 17 00:00:00 2001
From: Bret Curtis <bret.curtis@gmail.com>
Date: Sat, 22 Jan 2022 15:58:41 +0100
Subject: [PATCH 1977/2859] move most of the files from esm to esm3, keep
 common code in esm; this is make space for a future with esm4

esm typo

esm typo
---
 .../detournavigator/navmeshtilescache.cpp     |  2 +-
 apps/esmtool/esmtool.cpp                      |  4 +-
 apps/esmtool/labels.cpp                       | 24 +++---
 apps/essimporter/convertacdt.hpp              |  8 +-
 apps/essimporter/convertcntc.hpp              |  2 +-
 apps/essimporter/convertcrec.hpp              |  2 +-
 apps/essimporter/converter.cpp                |  4 +-
 apps/essimporter/converter.hpp                | 34 ++++----
 apps/essimporter/convertinventory.hpp         |  2 +-
 apps/essimporter/convertnpcc.hpp              |  2 +-
 apps/essimporter/convertplayer.hpp            |  4 +-
 apps/essimporter/convertscpt.hpp              |  2 +-
 apps/essimporter/convertscri.hpp              |  2 +-
 apps/essimporter/importacdt.cpp               |  4 +-
 apps/essimporter/importacdt.hpp               |  2 +-
 apps/essimporter/importcellref.cpp            |  2 +-
 apps/essimporter/importcellref.hpp            |  2 +-
 apps/essimporter/importcntc.cpp               |  2 +-
 apps/essimporter/importcrec.cpp               |  2 +-
 apps/essimporter/importcrec.hpp               |  2 +-
 apps/essimporter/importdial.cpp               |  2 +-
 apps/essimporter/importer.cpp                 | 22 ++---
 apps/essimporter/importercontext.hpp          | 14 ++--
 apps/essimporter/importgame.cpp               |  2 +-
 apps/essimporter/importinfo.cpp               |  2 +-
 apps/essimporter/importinventory.cpp          |  2 +-
 apps/essimporter/importinventory.hpp          |  2 +-
 apps/essimporter/importjour.cpp               |  2 +-
 apps/essimporter/importklst.cpp               |  2 +-
 apps/essimporter/importnpcc.cpp               |  2 +-
 apps/essimporter/importnpcc.hpp               |  4 +-
 apps/essimporter/importplayer.cpp             |  2 +-
 apps/essimporter/importplayer.hpp             |  2 +-
 apps/essimporter/importproj.cpp               |  2 +-
 apps/essimporter/importques.cpp               |  2 +-
 apps/essimporter/importscpt.cpp               |  2 +-
 apps/essimporter/importscpt.hpp               |  2 +-
 apps/essimporter/importscri.cpp               |  2 +-
 apps/essimporter/importscri.hpp               |  2 +-
 apps/essimporter/importsplm.cpp               |  2 +-
 apps/launcher/utils/cellnameloader.cpp        |  2 +-
 apps/launcher/utils/cellnameloader.hpp        |  2 +-
 apps/mwiniimporter/importer.cpp               |  2 +-
 apps/navmeshtool/main.cpp                     |  4 +-
 apps/navmeshtool/navmesh.cpp                  |  2 +-
 apps/navmeshtool/worldspacedata.cpp           |  8 +-
 apps/navmeshtool/worldspacedata.hpp           |  2 +-
 apps/opencs/model/doc/runner.hpp              |  2 +-
 apps/opencs/model/doc/savingstages.cpp        |  2 +-
 apps/opencs/model/doc/savingstate.hpp         |  2 +-
 apps/opencs/model/tools/birthsigncheck.hpp    |  2 +-
 apps/opencs/model/tools/bodypartcheck.hpp     |  4 +-
 apps/opencs/model/tools/classcheck.cpp        |  4 +-
 apps/opencs/model/tools/classcheck.hpp        |  2 +-
 apps/opencs/model/tools/enchantmentcheck.hpp  |  2 +-
 apps/opencs/model/tools/factioncheck.cpp      |  2 +-
 apps/opencs/model/tools/factioncheck.hpp      |  2 +-
 apps/opencs/model/tools/gmstcheck.hpp         |  2 +-
 apps/opencs/model/tools/journalcheck.hpp      |  2 +-
 apps/opencs/model/tools/magiceffectcheck.hpp  |  4 +-
 apps/opencs/model/tools/racecheck.hpp         |  2 +-
 apps/opencs/model/tools/regioncheck.hpp       |  2 +-
 apps/opencs/model/tools/skillcheck.hpp        |  2 +-
 apps/opencs/model/tools/soundcheck.hpp        |  2 +-
 apps/opencs/model/tools/spellcheck.cpp        |  2 +-
 apps/opencs/model/tools/spellcheck.hpp        |  2 +-
 apps/opencs/model/tools/startscriptcheck.hpp  |  4 +-
 apps/opencs/model/tools/topicinfocheck.hpp    | 14 ++--
 apps/opencs/model/world/actoradapter.cpp      | 10 +--
 apps/opencs/model/world/actoradapter.hpp      |  4 +-
 apps/opencs/model/world/cell.hpp              |  2 +-
 apps/opencs/model/world/cellcoordinates.cpp   |  2 +-
 apps/opencs/model/world/columnimp.hpp         |  6 +-
 apps/opencs/model/world/columns.cpp           | 12 +--
 apps/opencs/model/world/data.cpp              |  6 +-
 apps/opencs/model/world/data.hpp              | 38 ++++-----
 apps/opencs/model/world/idcollection.hpp      |  2 +-
 apps/opencs/model/world/idtable.cpp           |  2 +-
 apps/opencs/model/world/info.hpp              |  2 +-
 apps/opencs/model/world/infocollection.cpp    |  4 +-
 apps/opencs/model/world/infoselectwrapper.hpp |  2 +-
 apps/opencs/model/world/land.hpp              |  2 +-
 apps/opencs/model/world/landtexture.cpp       |  2 +-
 apps/opencs/model/world/landtexture.hpp       |  2 +-
 apps/opencs/model/world/metadata.cpp          |  6 +-
 .../model/world/nestedcoladapterimp.cpp       |  4 +-
 .../model/world/nestedcoladapterimp.hpp       | 10 +--
 apps/opencs/model/world/pathgrid.hpp          |  2 +-
 apps/opencs/model/world/ref.hpp               |  2 +-
 apps/opencs/model/world/refcollection.cpp     |  2 +-
 apps/opencs/model/world/refidadapterimp.cpp   |  4 +-
 apps/opencs/model/world/refidadapterimp.hpp   | 10 +--
 apps/opencs/model/world/refidcollection.cpp   |  2 +-
 apps/opencs/model/world/refiddata.hpp         | 40 ++++-----
 apps/opencs/view/render/actor.cpp             |  2 +-
 apps/opencs/view/render/actor.hpp             |  2 +-
 apps/opencs/view/render/brushdraw.hpp         |  2 +-
 apps/opencs/view/render/cell.cpp              |  4 +-
 apps/opencs/view/render/cellborder.cpp        |  2 +-
 apps/opencs/view/render/cellwater.cpp         |  2 +-
 apps/opencs/view/render/commands.cpp          |  2 +-
 apps/opencs/view/render/terrainselection.cpp  |  2 +-
 apps/opencs/view/render/terrainselection.hpp  |  2 +-
 apps/opencs/view/render/terrainshapemode.cpp  |  2 +-
 apps/opencs/view/world/dialoguecreator.cpp    |  2 +-
 apps/opencs/view/world/globalcreator.cpp      |  2 +-
 apps/opencs/view/world/vartypedelegate.hpp    |  2 +-
 apps/openmw/mwbase/world.hpp                  |  2 +-
 apps/openmw/mwclass/activator.cpp             |  2 +-
 apps/openmw/mwclass/actor.cpp                 |  2 +-
 apps/openmw/mwclass/actor.hpp                 |  2 +-
 apps/openmw/mwclass/apparatus.cpp             |  2 +-
 apps/openmw/mwclass/armor.cpp                 |  6 +-
 apps/openmw/mwclass/book.cpp                  |  2 +-
 apps/openmw/mwclass/clothing.cpp              |  2 +-
 apps/openmw/mwclass/container.cpp             |  4 +-
 apps/openmw/mwclass/creature.cpp              |  4 +-
 apps/openmw/mwclass/creaturelevlist.cpp       |  4 +-
 apps/openmw/mwclass/door.cpp                  |  4 +-
 apps/openmw/mwclass/door.hpp                  |  2 +-
 apps/openmw/mwclass/ingredient.cpp            |  2 +-
 apps/openmw/mwclass/itemlevlist.cpp           |  2 +-
 apps/openmw/mwclass/light.cpp                 |  4 +-
 apps/openmw/mwclass/lockpick.cpp              |  2 +-
 apps/openmw/mwclass/misc.cpp                  |  2 +-
 apps/openmw/mwclass/npc.cpp                   |  6 +-
 apps/openmw/mwclass/potion.cpp                |  2 +-
 apps/openmw/mwclass/probe.cpp                 |  2 +-
 apps/openmw/mwclass/repair.cpp                |  2 +-
 apps/openmw/mwclass/static.cpp                |  2 +-
 apps/openmw/mwclass/weapon.cpp                |  2 +-
 apps/openmw/mwdialogue/dialoguemanagerimp.cpp |  8 +-
 apps/openmw/mwdialogue/dialoguemanagerimp.hpp |  2 +-
 apps/openmw/mwdialogue/hypertextparser.cpp    |  2 +-
 apps/openmw/mwdialogue/journalentry.cpp       |  2 +-
 apps/openmw/mwdialogue/journalimp.cpp         |  8 +-
 apps/openmw/mwdialogue/quest.cpp              |  2 +-
 apps/openmw/mwdialogue/selectwrapper.hpp      |  2 +-
 apps/openmw/mwgui/bookwindow.cpp              |  2 +-
 apps/openmw/mwgui/charactercreation.hpp       |  2 +-
 apps/openmw/mwgui/class.hpp                   |  2 +-
 apps/openmw/mwgui/itemchargeview.cpp          |  2 +-
 apps/openmw/mwgui/mapwindow.cpp               |  4 +-
 apps/openmw/mwgui/mapwindow.hpp               |  4 +-
 apps/openmw/mwgui/merchantrepair.cpp          |  2 +-
 apps/openmw/mwgui/pickpocketitemmodel.cpp     |  2 +-
 apps/openmw/mwgui/quickkeysmenu.cpp           |  4 +-
 apps/openmw/mwgui/review.hpp                  |  2 +-
 apps/openmw/mwgui/scrollwindow.cpp            |  2 +-
 apps/openmw/mwgui/sortfilteritemmodel.cpp     | 26 +++---
 apps/openmw/mwgui/spellcreationdialog.hpp     |  4 +-
 apps/openmw/mwgui/spellicons.cpp              |  2 +-
 apps/openmw/mwgui/spellmodel.hpp              |  2 +-
 apps/openmw/mwgui/statswatcher.hpp            |  2 +-
 apps/openmw/mwgui/widgets.hpp                 |  4 +-
 apps/openmw/mwgui/windowmanagerimp.cpp        |  4 +-
 apps/openmw/mwinput/controlswitch.cpp         |  6 +-
 apps/openmw/mwinput/inputmanagerimp.cpp       |  4 +-
 apps/openmw/mwlua/cellbindings.cpp            |  2 +-
 apps/openmw/mwlua/eventqueue.cpp              |  4 +-
 apps/openmw/mwlua/luamanagerimp.cpp           |  4 +-
 apps/openmw/mwlua/object.cpp                  |  2 +-
 apps/openmw/mwlua/object.hpp                  |  2 +-
 apps/openmw/mwlua/worldview.cpp               |  6 +-
 apps/openmw/mwmechanics/activespells.cpp      |  2 +-
 apps/openmw/mwmechanics/activespells.hpp      |  2 +-
 apps/openmw/mwmechanics/actors.cpp            |  4 +-
 apps/openmw/mwmechanics/actorutil.hpp         |  6 +-
 apps/openmw/mwmechanics/aiactivate.cpp        |  2 +-
 apps/openmw/mwmechanics/aicombat.cpp          |  2 +-
 apps/openmw/mwmechanics/aicombataction.cpp    |  4 +-
 apps/openmw/mwmechanics/aiescort.cpp          |  4 +-
 apps/openmw/mwmechanics/aifollow.cpp          |  4 +-
 apps/openmw/mwmechanics/aipackage.cpp         |  4 +-
 apps/openmw/mwmechanics/aipursue.cpp          |  2 +-
 apps/openmw/mwmechanics/aisequence.cpp        |  2 +-
 apps/openmw/mwmechanics/aisequence.hpp        |  2 +-
 apps/openmw/mwmechanics/aitravel.cpp          |  2 +-
 apps/openmw/mwmechanics/aiwander.cpp          |  2 +-
 apps/openmw/mwmechanics/alchemy.cpp           |  8 +-
 apps/openmw/mwmechanics/alchemy.hpp           |  2 +-
 apps/openmw/mwmechanics/creaturestats.cpp     |  6 +-
 apps/openmw/mwmechanics/creaturestats.hpp     |  2 +-
 apps/openmw/mwmechanics/enchanting.hpp        |  4 +-
 apps/openmw/mwmechanics/magiceffects.cpp      |  4 +-
 .../mwmechanics/mechanicsmanagerimp.cpp       |  4 +-
 apps/openmw/mwmechanics/npcstats.cpp          |  8 +-
 apps/openmw/mwmechanics/objects.cpp           |  2 +-
 apps/openmw/mwmechanics/pathfinding.hpp       |  2 +-
 apps/openmw/mwmechanics/pathgrid.hpp          |  2 +-
 apps/openmw/mwmechanics/spellcasting.hpp      |  4 +-
 apps/openmw/mwmechanics/spelleffects.cpp      |  2 +-
 apps/openmw/mwmechanics/spelllist.cpp         |  2 +-
 apps/openmw/mwmechanics/spelllist.hpp         |  2 +-
 apps/openmw/mwmechanics/spellpriority.cpp     |  6 +-
 apps/openmw/mwmechanics/spells.cpp            |  4 +-
 apps/openmw/mwmechanics/spellutil.hpp         |  2 +-
 apps/openmw/mwmechanics/stat.cpp              |  2 +-
 apps/openmw/mwmechanics/summoning.hpp         |  2 +-
 apps/openmw/mwmechanics/weaponpriority.cpp    |  2 +-
 apps/openmw/mwphysics/movementsolver.cpp      |  2 +-
 apps/openmw/mwphysics/physicssystem.cpp       |  2 +-
 apps/openmw/mwrender/actoranimation.cpp       |  4 +-
 apps/openmw/mwrender/characterpreview.hpp     |  2 +-
 apps/openmw/mwrender/creatureanimation.cpp    |  2 +-
 apps/openmw/mwrender/fogmanager.cpp           |  2 +-
 apps/openmw/mwrender/globalmap.cpp            |  2 +-
 apps/openmw/mwrender/groundcover.cpp          |  2 +-
 apps/openmw/mwrender/groundcover.hpp          |  2 +-
 apps/openmw/mwrender/localmap.cpp             |  4 +-
 apps/openmw/mwrender/objectpaging.cpp         |  2 +-
 apps/openmw/mwrender/objectpaging.hpp         |  2 +-
 apps/openmw/mwrender/pathgrid.cpp             |  2 +-
 apps/openmw/mwrender/renderingmanager.cpp     |  2 +-
 apps/openmw/mwrender/water.cpp                |  2 +-
 apps/openmw/mwscript/compilercontext.cpp      |  2 +-
 apps/openmw/mwscript/containerextensions.cpp  |  2 +-
 apps/openmw/mwscript/globalscripts.cpp        |  4 +-
 apps/openmw/mwscript/locals.cpp               |  6 +-
 apps/openmw/mwscript/miscextensions.cpp       |  4 +-
 apps/openmw/mwscript/scriptmanagerimp.cpp     |  2 +-
 apps/openmw/mwscript/statsextensions.cpp      |  2 +-
 .../mwscript/transformationextensions.cpp     |  2 +-
 apps/openmw/mwsound/watersoundupdater.cpp     |  2 +-
 apps/openmw/mwstate/character.cpp             |  2 +-
 apps/openmw/mwstate/character.hpp             |  2 +-
 apps/openmw/mwstate/statemanagerimp.cpp       |  8 +-
 apps/openmw/mwworld/actioneat.cpp             |  2 +-
 apps/openmw/mwworld/cellpreloader.cpp         |  2 +-
 apps/openmw/mwworld/cellref.cpp               |  2 +-
 apps/openmw/mwworld/cellref.hpp               |  2 +-
 apps/openmw/mwworld/cells.cpp                 |  8 +-
 apps/openmw/mwworld/cellstore.cpp             | 24 +++---
 apps/openmw/mwworld/cellstore.hpp             | 40 ++++-----
 apps/openmw/mwworld/containerstore.cpp        |  2 +-
 apps/openmw/mwworld/containerstore.hpp        | 24 +++---
 apps/openmw/mwworld/esmloader.cpp             |  2 +-
 apps/openmw/mwworld/esmstore.cpp              |  4 +-
 apps/openmw/mwworld/globals.cpp               |  4 +-
 apps/openmw/mwworld/globals.hpp               |  2 +-
 apps/openmw/mwworld/groundcoverstore.hpp      |  2 +-
 apps/openmw/mwworld/inventorystore.cpp        |  4 +-
 apps/openmw/mwworld/livecellref.cpp           |  2 +-
 apps/openmw/mwworld/magiceffects.cpp          |  2 +-
 apps/openmw/mwworld/player.cpp                |  8 +-
 apps/openmw/mwworld/player.hpp                |  4 +-
 apps/openmw/mwworld/projectilemanager.cpp     |  4 +-
 apps/openmw/mwworld/projectilemanager.hpp     |  2 +-
 apps/openmw/mwworld/refdata.cpp               |  2 +-
 apps/openmw/mwworld/refdata.hpp               |  2 +-
 apps/openmw/mwworld/store.cpp                 |  6 +-
 apps/openmw/mwworld/weather.cpp               |  6 +-
 apps/openmw/mwworld/worldimp.cpp              |  8 +-
 .../detournavigator/navigator.cpp             |  2 +-
 .../detournavigator/navmeshdb.cpp             |  2 +-
 .../detournavigator/recastmeshbuilder.cpp     |  2 +-
 apps/openmw_test_suite/esm/variant.cpp        |  8 +-
 apps/openmw_test_suite/mwworld/test_store.cpp |  4 +-
 components/CMakeLists.txt                     | 15 ++--
 components/config/gamesettings.cpp            |  2 +-
 .../contentselector/model/contentmodel.cpp    |  2 +-
 components/contentselector/model/esmfile.cpp  |  2 +-
 components/detournavigator/navigatorimpl.cpp  |  2 +-
 components/esm/luascripts.cpp                 |  4 +-
 components/esm/records.hpp                    | 84 +++++++++----------
 components/{esm => esm3}/activespells.cpp     |  0
 components/{esm => esm3}/activespells.hpp     |  2 +-
 components/{esm => esm3}/aipackage.cpp        |  0
 components/{esm => esm3}/aipackage.hpp        |  2 +-
 components/{esm => esm3}/aisequence.cpp       |  0
 components/{esm => esm3}/aisequence.hpp       |  4 +-
 components/{esm => esm3}/animationstate.cpp   |  0
 components/{esm => esm3}/animationstate.hpp   |  0
 components/{esm => esm3}/cellid.cpp           |  0
 components/{esm => esm3}/cellid.hpp           |  0
 components/{esm => esm3}/cellref.cpp          |  0
 components/{esm => esm3}/cellref.hpp          |  2 +-
 components/{esm => esm3}/cellstate.cpp        |  0
 components/{esm => esm3}/cellstate.hpp        |  2 +-
 components/{esm => esm3}/containerstate.cpp   |  0
 components/{esm => esm3}/containerstate.hpp   |  0
 components/{esm => esm3}/controlsstate.cpp    |  0
 components/{esm => esm3}/controlsstate.hpp    |  0
 .../{esm => esm3}/creaturelevliststate.cpp    |  0
 .../{esm => esm3}/creaturelevliststate.hpp    |  0
 components/{esm => esm3}/creaturestate.cpp    |  0
 components/{esm => esm3}/creaturestate.hpp    |  0
 components/{esm => esm3}/creaturestats.cpp    |  0
 components/{esm => esm3}/creaturestats.hpp    |  4 +-
 .../{esm => esm3}/custommarkerstate.cpp       |  0
 .../{esm => esm3}/custommarkerstate.hpp       |  0
 components/{esm => esm3}/debugprofile.cpp     |  2 +-
 components/{esm => esm3}/debugprofile.hpp     |  0
 components/{esm => esm3}/dialoguestate.cpp    |  0
 components/{esm => esm3}/dialoguestate.hpp    |  0
 components/{esm => esm3}/doorstate.cpp        |  0
 components/{esm => esm3}/doorstate.hpp        |  0
 components/{esm => esm3}/effectlist.cpp       |  0
 components/{esm => esm3}/effectlist.hpp       |  0
 components/{esm => esm3}/esmreader.cpp        |  0
 components/{esm => esm3}/esmreader.hpp        |  2 +-
 components/{esm => esm3}/esmwriter.cpp        |  0
 components/{esm => esm3}/esmwriter.hpp        |  2 +-
 components/{esm => esm3}/filter.cpp           |  2 +-
 components/{esm => esm3}/filter.hpp           |  0
 components/{esm => esm3}/fogstate.cpp         |  0
 components/{esm => esm3}/fogstate.hpp         |  0
 components/{esm => esm3}/globalmap.cpp        |  2 +-
 components/{esm => esm3}/globalmap.hpp        |  0
 components/{esm => esm3}/globalscript.cpp     |  0
 components/{esm => esm3}/globalscript.hpp     |  0
 components/{esm => esm3}/inventorystate.cpp   |  0
 components/{esm => esm3}/inventorystate.hpp   |  0
 components/{esm => esm3}/journalentry.cpp     |  0
 components/{esm => esm3}/journalentry.hpp     |  0
 components/{esm => esm3}/loadacti.cpp         |  2 +-
 components/{esm => esm3}/loadacti.hpp         |  0
 components/{esm => esm3}/loadalch.cpp         |  2 +-
 components/{esm => esm3}/loadalch.hpp         |  0
 components/{esm => esm3}/loadappa.cpp         |  2 +-
 components/{esm => esm3}/loadappa.hpp         |  0
 components/{esm => esm3}/loadarmo.cpp         |  2 +-
 components/{esm => esm3}/loadarmo.hpp         |  0
 components/{esm => esm3}/loadbody.cpp         |  2 +-
 components/{esm => esm3}/loadbody.hpp         |  0
 components/{esm => esm3}/loadbook.cpp         |  2 +-
 components/{esm => esm3}/loadbook.hpp         |  0
 components/{esm => esm3}/loadbsgn.cpp         |  2 +-
 components/{esm => esm3}/loadbsgn.hpp         |  0
 components/{esm => esm3}/loadcell.cpp         |  2 +-
 components/{esm => esm3}/loadcell.hpp         |  4 +-
 components/{esm => esm3}/loadclas.cpp         |  2 +-
 components/{esm => esm3}/loadclas.hpp         |  0
 components/{esm => esm3}/loadclot.cpp         |  2 +-
 components/{esm => esm3}/loadclot.hpp         |  0
 components/{esm => esm3}/loadcont.cpp         |  2 +-
 components/{esm => esm3}/loadcont.hpp         |  2 +-
 components/{esm => esm3}/loadcrea.cpp         |  2 +-
 components/{esm => esm3}/loadcrea.hpp         |  0
 components/{esm => esm3}/loaddial.cpp         |  2 +-
 components/{esm => esm3}/loaddial.hpp         |  0
 components/{esm => esm3}/loaddoor.cpp         |  2 +-
 components/{esm => esm3}/loaddoor.hpp         |  0
 components/{esm => esm3}/loadench.cpp         |  2 +-
 components/{esm => esm3}/loadench.hpp         |  0
 components/{esm => esm3}/loadfact.cpp         |  2 +-
 components/{esm => esm3}/loadfact.hpp         |  0
 components/{esm => esm3}/loadglob.cpp         |  2 +-
 components/{esm => esm3}/loadglob.hpp         |  0
 components/{esm => esm3}/loadgmst.cpp         |  2 +-
 components/{esm => esm3}/loadgmst.hpp         |  0
 components/{esm => esm3}/loadinfo.cpp         |  2 +-
 components/{esm => esm3}/loadinfo.hpp         |  2 +-
 components/{esm => esm3}/loadingr.cpp         |  2 +-
 components/{esm => esm3}/loadingr.hpp         |  0
 components/{esm => esm3}/loadland.cpp         |  2 +-
 components/{esm => esm3}/loadland.hpp         |  2 +-
 components/{esm => esm3}/loadlevlist.cpp      |  2 +-
 components/{esm => esm3}/loadlevlist.hpp      |  0
 components/{esm => esm3}/loadligh.cpp         |  2 +-
 components/{esm => esm3}/loadligh.hpp         |  0
 components/{esm => esm3}/loadlock.cpp         |  2 +-
 components/{esm => esm3}/loadlock.hpp         |  0
 components/{esm => esm3}/loadltex.cpp         |  2 +-
 components/{esm => esm3}/loadltex.hpp         |  0
 components/{esm => esm3}/loadmgef.cpp         |  2 +-
 components/{esm => esm3}/loadmgef.hpp         |  0
 components/{esm => esm3}/loadmisc.cpp         |  2 +-
 components/{esm => esm3}/loadmisc.hpp         |  0
 components/{esm => esm3}/loadnpc.cpp          |  2 +-
 components/{esm => esm3}/loadnpc.hpp          |  2 +-
 components/{esm => esm3}/loadpgrd.cpp         |  2 +-
 components/{esm => esm3}/loadpgrd.hpp         |  0
 components/{esm => esm3}/loadprob.cpp         |  2 +-
 components/{esm => esm3}/loadprob.hpp         |  0
 components/{esm => esm3}/loadrace.cpp         |  2 +-
 components/{esm => esm3}/loadrace.hpp         |  0
 components/{esm => esm3}/loadregn.cpp         |  2 +-
 components/{esm => esm3}/loadregn.hpp         |  2 +-
 components/{esm => esm3}/loadrepa.cpp         |  2 +-
 components/{esm => esm3}/loadrepa.hpp         |  0
 components/{esm => esm3}/loadscpt.cpp         |  2 +-
 components/{esm => esm3}/loadscpt.hpp         |  2 +-
 components/{esm => esm3}/loadskil.cpp         |  2 +-
 components/{esm => esm3}/loadskil.hpp         |  2 +-
 components/{esm => esm3}/loadsndg.cpp         |  2 +-
 components/{esm => esm3}/loadsndg.hpp         |  0
 components/{esm => esm3}/loadsoun.cpp         |  2 +-
 components/{esm => esm3}/loadsoun.hpp         |  0
 components/{esm => esm3}/loadspel.cpp         |  2 +-
 components/{esm => esm3}/loadspel.hpp         |  0
 components/{esm => esm3}/loadsscr.cpp         |  2 +-
 components/{esm => esm3}/loadsscr.hpp         |  0
 components/{esm => esm3}/loadstat.cpp         |  2 +-
 components/{esm => esm3}/loadstat.hpp         |  0
 components/{esm => esm3}/loadtes3.cpp         |  4 +-
 components/{esm => esm3}/loadtes3.hpp         |  2 +-
 components/{esm => esm3}/loadweap.cpp         |  2 +-
 components/{esm => esm3}/loadweap.hpp         |  0
 components/{esm => esm3}/locals.cpp           |  0
 components/{esm => esm3}/locals.hpp           |  0
 components/{esm => esm3}/magiceffects.cpp     |  0
 components/{esm => esm3}/magiceffects.hpp     |  0
 components/{esm => esm3}/mappings.cpp         |  0
 components/{esm => esm3}/mappings.hpp         |  4 +-
 components/{esm => esm3}/npcstate.cpp         |  0
 components/{esm => esm3}/npcstate.hpp         |  0
 components/{esm => esm3}/npcstats.cpp         |  0
 components/{esm => esm3}/npcstats.hpp         |  0
 components/{esm => esm3}/objectstate.cpp      |  0
 components/{esm => esm3}/objectstate.hpp      |  2 +-
 components/{esm => esm3}/player.cpp           |  0
 components/{esm => esm3}/player.hpp           |  4 +-
 components/{esm => esm3}/projectilestate.cpp  |  0
 components/{esm => esm3}/projectilestate.hpp  |  2 +-
 components/{esm => esm3}/queststate.cpp       |  0
 components/{esm => esm3}/queststate.hpp       |  0
 components/{esm => esm3}/quickkeys.cpp        |  0
 components/{esm => esm3}/quickkeys.hpp        |  0
 components/{esm => esm3}/savedgame.cpp        |  0
 components/{esm => esm3}/savedgame.hpp        |  2 +-
 components/{esm => esm3}/spelllist.cpp        |  0
 components/{esm => esm3}/spelllist.hpp        |  0
 components/{esm => esm3}/spellstate.cpp       |  0
 components/{esm => esm3}/spellstate.hpp       |  2 +-
 components/{esm => esm3}/statstate.cpp        |  0
 components/{esm => esm3}/statstate.hpp        |  0
 components/{esm => esm3}/stolenitems.cpp      |  4 +-
 components/{esm => esm3}/stolenitems.hpp      |  0
 components/{esm => esm3}/transport.cpp        |  4 +-
 components/{esm => esm3}/transport.hpp        |  2 +-
 components/{esm => esm3}/variant.cpp          |  2 +-
 components/{esm => esm3}/variant.hpp          |  0
 components/{esm => esm3}/variantimp.cpp       |  0
 components/{esm => esm3}/variantimp.hpp       |  0
 components/{esm => esm3}/weatherstate.cpp     |  0
 components/{esm => esm3}/weatherstate.hpp     |  0
 components/esmloader/esmdata.cpp              | 14 ++--
 components/esmloader/load.cpp                 | 18 ++--
 components/esmloader/load.hpp                 |  2 +-
 components/esmloader/record.hpp               |  2 +-
 components/esmterrain/storage.hpp             |  4 +-
 components/lua/configuration.hpp              |  2 +-
 components/misc/convert.hpp                   |  2 +-
 components/misc/coordinateconverter.hpp       |  6 +-
 components/sceneutil/lightutil.cpp            |  2 +-
 components/sceneutil/pathgridutil.cpp         |  2 +-
 components/terrain/cellborder.cpp             |  2 +-
 448 files changed, 687 insertions(+), 684 deletions(-)
 rename components/{esm => esm3}/activespells.cpp (100%)
 rename components/{esm => esm3}/activespells.hpp (97%)
 rename components/{esm => esm3}/aipackage.cpp (100%)
 rename components/{esm => esm3}/aipackage.hpp (98%)
 rename components/{esm => esm3}/aisequence.cpp (100%)
 rename components/{esm => esm3}/aisequence.hpp (98%)
 rename components/{esm => esm3}/animationstate.cpp (100%)
 rename components/{esm => esm3}/animationstate.hpp (100%)
 rename components/{esm => esm3}/cellid.cpp (100%)
 rename components/{esm => esm3}/cellid.hpp (100%)
 rename components/{esm => esm3}/cellref.cpp (100%)
 rename components/{esm => esm3}/cellref.hpp (99%)
 rename components/{esm => esm3}/cellstate.cpp (100%)
 rename components/{esm => esm3}/cellstate.hpp (93%)
 rename components/{esm => esm3}/containerstate.cpp (100%)
 rename components/{esm => esm3}/containerstate.hpp (100%)
 rename components/{esm => esm3}/controlsstate.cpp (100%)
 rename components/{esm => esm3}/controlsstate.hpp (100%)
 rename components/{esm => esm3}/creaturelevliststate.cpp (100%)
 rename components/{esm => esm3}/creaturelevliststate.hpp (100%)
 rename components/{esm => esm3}/creaturestate.cpp (100%)
 rename components/{esm => esm3}/creaturestate.hpp (100%)
 rename components/{esm => esm3}/creaturestats.cpp (100%)
 rename components/{esm => esm3}/creaturestats.hpp (97%)
 rename components/{esm => esm3}/custommarkerstate.cpp (100%)
 rename components/{esm => esm3}/custommarkerstate.hpp (100%)
 rename components/{esm => esm3}/debugprofile.cpp (97%)
 rename components/{esm => esm3}/debugprofile.hpp (100%)
 rename components/{esm => esm3}/dialoguestate.cpp (100%)
 rename components/{esm => esm3}/dialoguestate.hpp (100%)
 rename components/{esm => esm3}/doorstate.cpp (100%)
 rename components/{esm => esm3}/doorstate.hpp (100%)
 rename components/{esm => esm3}/effectlist.cpp (100%)
 rename components/{esm => esm3}/effectlist.hpp (100%)
 rename components/{esm => esm3}/esmreader.cpp (100%)
 rename components/{esm => esm3}/esmreader.hpp (99%)
 rename components/{esm => esm3}/esmwriter.cpp (100%)
 rename components/{esm => esm3}/esmwriter.hpp (99%)
 rename components/{esm => esm3}/filter.cpp (97%)
 rename components/{esm => esm3}/filter.hpp (100%)
 rename components/{esm => esm3}/fogstate.cpp (100%)
 rename components/{esm => esm3}/fogstate.hpp (100%)
 rename components/{esm => esm3}/globalmap.cpp (96%)
 rename components/{esm => esm3}/globalmap.hpp (100%)
 rename components/{esm => esm3}/globalscript.cpp (100%)
 rename components/{esm => esm3}/globalscript.hpp (100%)
 rename components/{esm => esm3}/inventorystate.cpp (100%)
 rename components/{esm => esm3}/inventorystate.hpp (100%)
 rename components/{esm => esm3}/journalentry.cpp (100%)
 rename components/{esm => esm3}/journalentry.hpp (100%)
 rename components/{esm => esm3}/loadacti.cpp (98%)
 rename components/{esm => esm3}/loadacti.hpp (100%)
 rename components/{esm => esm3}/loadalch.cpp (98%)
 rename components/{esm => esm3}/loadalch.hpp (100%)
 rename components/{esm => esm3}/loadappa.cpp (98%)
 rename components/{esm => esm3}/loadappa.hpp (100%)
 rename components/{esm => esm3}/loadarmo.cpp (99%)
 rename components/{esm => esm3}/loadarmo.hpp (100%)
 rename components/{esm => esm3}/loadbody.cpp (98%)
 rename components/{esm => esm3}/loadbody.hpp (100%)
 rename components/{esm => esm3}/loadbook.cpp (98%)
 rename components/{esm => esm3}/loadbook.hpp (100%)
 rename components/{esm => esm3}/loadbsgn.cpp (98%)
 rename components/{esm => esm3}/loadbsgn.hpp (100%)
 rename components/{esm => esm3}/loadcell.cpp (99%)
 rename components/{esm => esm3}/loadcell.hpp (98%)
 rename components/{esm => esm3}/loadclas.cpp (98%)
 rename components/{esm => esm3}/loadclas.hpp (100%)
 rename components/{esm => esm3}/loadclot.cpp (98%)
 rename components/{esm => esm3}/loadclot.hpp (100%)
 rename components/{esm => esm3}/loadcont.cpp (99%)
 rename components/{esm => esm3}/loadcont.hpp (96%)
 rename components/{esm => esm3}/loadcrea.cpp (99%)
 rename components/{esm => esm3}/loadcrea.hpp (100%)
 rename components/{esm => esm3}/loaddial.cpp (99%)
 rename components/{esm => esm3}/loaddial.hpp (100%)
 rename components/{esm => esm3}/loaddoor.cpp (98%)
 rename components/{esm => esm3}/loaddoor.hpp (100%)
 rename components/{esm => esm3}/loadench.cpp (98%)
 rename components/{esm => esm3}/loadench.hpp (100%)
 rename components/{esm => esm3}/loadfact.cpp (99%)
 rename components/{esm => esm3}/loadfact.hpp (100%)
 rename components/{esm => esm3}/loadglob.cpp (96%)
 rename components/{esm => esm3}/loadglob.hpp (100%)
 rename components/{esm => esm3}/loadgmst.cpp (96%)
 rename components/{esm => esm3}/loadgmst.hpp (100%)
 rename components/{esm => esm3}/loadinfo.cpp (99%)
 rename components/{esm => esm3}/loadinfo.hpp (98%)
 rename components/{esm => esm3}/loadingr.cpp (98%)
 rename components/{esm => esm3}/loadingr.hpp (100%)
 rename components/{esm => esm3}/loadland.cpp (99%)
 rename components/{esm => esm3}/loadland.hpp (99%)
 rename components/{esm => esm3}/loadlevlist.cpp (99%)
 rename components/{esm => esm3}/loadlevlist.hpp (100%)
 rename components/{esm => esm3}/loadligh.cpp (98%)
 rename components/{esm => esm3}/loadligh.hpp (100%)
 rename components/{esm => esm3}/loadlock.cpp (98%)
 rename components/{esm => esm3}/loadlock.hpp (100%)
 rename components/{esm => esm3}/loadltex.cpp (97%)
 rename components/{esm => esm3}/loadltex.hpp (100%)
 rename components/{esm => esm3}/loadmgef.cpp (99%)
 rename components/{esm => esm3}/loadmgef.hpp (100%)
 rename components/{esm => esm3}/loadmisc.cpp (98%)
 rename components/{esm => esm3}/loadmisc.hpp (100%)
 rename components/{esm => esm3}/loadnpc.cpp (99%)
 rename components/{esm => esm3}/loadnpc.hpp (98%)
 rename components/{esm => esm3}/loadpgrd.cpp (99%)
 rename components/{esm => esm3}/loadpgrd.hpp (100%)
 rename components/{esm => esm3}/loadprob.cpp (98%)
 rename components/{esm => esm3}/loadprob.hpp (100%)
 rename components/{esm => esm3}/loadrace.cpp (98%)
 rename components/{esm => esm3}/loadrace.hpp (100%)
 rename components/{esm => esm3}/loadregn.cpp (99%)
 rename components/{esm => esm3}/loadregn.hpp (97%)
 rename components/{esm => esm3}/loadrepa.cpp (98%)
 rename components/{esm => esm3}/loadrepa.hpp (100%)
 rename components/{esm => esm3}/loadscpt.cpp (99%)
 rename components/{esm => esm3}/loadscpt.hpp (97%)
 rename components/{esm => esm3}/loadskil.cpp (99%)
 rename components/{esm => esm3}/loadskil.hpp (98%)
 rename components/{esm => esm3}/loadsndg.cpp (98%)
 rename components/{esm => esm3}/loadsndg.hpp (100%)
 rename components/{esm => esm3}/loadsoun.cpp (98%)
 rename components/{esm => esm3}/loadsoun.hpp (100%)
 rename components/{esm => esm3}/loadspel.cpp (98%)
 rename components/{esm => esm3}/loadspel.hpp (100%)
 rename components/{esm => esm3}/loadsscr.cpp (97%)
 rename components/{esm => esm3}/loadsscr.hpp (100%)
 rename components/{esm => esm3}/loadstat.cpp (97%)
 rename components/{esm => esm3}/loadstat.hpp (100%)
 rename components/{esm => esm3}/loadtes3.cpp (96%)
 rename components/{esm => esm3}/loadtes3.hpp (97%)
 rename components/{esm => esm3}/loadweap.cpp (98%)
 rename components/{esm => esm3}/loadweap.hpp (100%)
 rename components/{esm => esm3}/locals.cpp (100%)
 rename components/{esm => esm3}/locals.hpp (100%)
 rename components/{esm => esm3}/magiceffects.cpp (100%)
 rename components/{esm => esm3}/magiceffects.hpp (100%)
 rename components/{esm => esm3}/mappings.cpp (100%)
 rename components/{esm => esm3}/mappings.hpp (78%)
 rename components/{esm => esm3}/npcstate.cpp (100%)
 rename components/{esm => esm3}/npcstate.hpp (100%)
 rename components/{esm => esm3}/npcstats.cpp (100%)
 rename components/{esm => esm3}/npcstats.hpp (100%)
 rename components/{esm => esm3}/objectstate.cpp (100%)
 rename components/{esm => esm3}/objectstate.hpp (97%)
 rename components/{esm => esm3}/player.cpp (100%)
 rename components/{esm => esm3}/player.hpp (93%)
 rename components/{esm => esm3}/projectilestate.cpp (100%)
 rename components/{esm => esm3}/projectilestate.hpp (96%)
 rename components/{esm => esm3}/queststate.cpp (100%)
 rename components/{esm => esm3}/queststate.hpp (100%)
 rename components/{esm => esm3}/quickkeys.cpp (100%)
 rename components/{esm => esm3}/quickkeys.hpp (100%)
 rename components/{esm => esm3}/savedgame.cpp (100%)
 rename components/{esm => esm3}/savedgame.hpp (96%)
 rename components/{esm => esm3}/spelllist.cpp (100%)
 rename components/{esm => esm3}/spelllist.hpp (100%)
 rename components/{esm => esm3}/spellstate.cpp (100%)
 rename components/{esm => esm3}/spellstate.hpp (97%)
 rename components/{esm => esm3}/statstate.cpp (100%)
 rename components/{esm => esm3}/statstate.hpp (100%)
 rename components/{esm => esm3}/stolenitems.cpp (94%)
 rename components/{esm => esm3}/stolenitems.hpp (100%)
 rename components/{esm => esm3}/transport.cpp (92%)
 rename components/{esm => esm3}/transport.hpp (94%)
 rename components/{esm => esm3}/variant.cpp (99%)
 rename components/{esm => esm3}/variant.hpp (100%)
 rename components/{esm => esm3}/variantimp.cpp (100%)
 rename components/{esm => esm3}/variantimp.hpp (100%)
 rename components/{esm => esm3}/weatherstate.cpp (100%)
 rename components/{esm => esm3}/weatherstate.hpp (100%)

diff --git a/apps/benchmarks/detournavigator/navmeshtilescache.cpp b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
index c27fdc4289..e8a4be1e46 100644
--- a/apps/benchmarks/detournavigator/navmeshtilescache.cpp
+++ b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
@@ -1,7 +1,7 @@
 #include <benchmark/benchmark.h>
 
 #include <components/detournavigator/navmeshtilescache.hpp>
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 
 #include <algorithm>
 #include <random>
diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp
index a0ee654da9..60509d7c87 100644
--- a/apps/esmtool/esmtool.cpp
+++ b/apps/esmtool/esmtool.cpp
@@ -10,8 +10,8 @@
 
 #include <boost/program_options.hpp>
 
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 #include <components/esm/records.hpp>
 
 #include "record.hpp"
diff --git a/apps/esmtool/labels.cpp b/apps/esmtool/labels.cpp
index 24e3605eb2..d6cae207c9 100644
--- a/apps/esmtool/labels.cpp
+++ b/apps/esmtool/labels.cpp
@@ -1,17 +1,17 @@
 #include "labels.hpp"
 
-#include <components/esm/loadbody.hpp>
-#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>
-#include <components/esm/loadnpc.hpp>
-#include <components/esm/loadrace.hpp>
-#include <components/esm/loadspel.hpp>
-#include <components/esm/loadweap.hpp>
+#include <components/esm3/loadbody.hpp>
+#include <components/esm3/loadcell.hpp>
+#include <components/esm3/loadcont.hpp>
+#include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loadench.hpp>
+#include <components/esm3/loadlevlist.hpp>
+#include <components/esm3/loadligh.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadnpc.hpp>
+#include <components/esm3/loadrace.hpp>
+#include <components/esm3/loadspel.hpp>
+#include <components/esm3/loadweap.hpp>
 
 #include <components/misc/stringops.hpp>
 
diff --git a/apps/essimporter/convertacdt.hpp b/apps/essimporter/convertacdt.hpp
index 4059dd1af8..00e90ababf 100644
--- a/apps/essimporter/convertacdt.hpp
+++ b/apps/essimporter/convertacdt.hpp
@@ -1,10 +1,10 @@
 #ifndef OPENMW_ESSIMPORT_CONVERTACDT_H
 #define OPENMW_ESSIMPORT_CONVERTACDT_H
 
-#include <components/esm/creaturestats.hpp>
-#include <components/esm/npcstats.hpp>
-#include <components/esm/loadskil.hpp>
-#include <components/esm/animationstate.hpp>
+#include <components/esm3/creaturestats.hpp>
+#include <components/esm3/npcstats.hpp>
+#include <components/esm3/loadskil.hpp>
+#include <components/esm3/animationstate.hpp>
 
 #include "importacdt.hpp"
 
diff --git a/apps/essimporter/convertcntc.hpp b/apps/essimporter/convertcntc.hpp
index c299d87a1e..2dc51949b1 100644
--- a/apps/essimporter/convertcntc.hpp
+++ b/apps/essimporter/convertcntc.hpp
@@ -3,7 +3,7 @@
 
 #include "importcntc.hpp"
 
-#include <components/esm/containerstate.hpp>
+#include <components/esm3/containerstate.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/convertcrec.hpp b/apps/essimporter/convertcrec.hpp
index 7d317f03e8..fa2e7e807f 100644
--- a/apps/essimporter/convertcrec.hpp
+++ b/apps/essimporter/convertcrec.hpp
@@ -3,7 +3,7 @@
 
 #include "importcrec.hpp"
 
-#include <components/esm/creaturestate.hpp>
+#include <components/esm3/creaturestate.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/converter.cpp b/apps/essimporter/converter.cpp
index 6e79e27f18..ad28a9295f 100644
--- a/apps/essimporter/converter.cpp
+++ b/apps/essimporter/converter.cpp
@@ -5,8 +5,8 @@
 
 #include <osgDB/WriteFile>
 
-#include <components/esm/creaturestate.hpp>
-#include <components/esm/containerstate.hpp>
+#include <components/esm3/creaturestate.hpp>
+#include <components/esm3/containerstate.hpp>
 
 #include <components/misc/constants.hpp>
 
diff --git a/apps/essimporter/converter.hpp b/apps/essimporter/converter.hpp
index 81b9711bbf..8b71775759 100644
--- a/apps/essimporter/converter.hpp
+++ b/apps/essimporter/converter.hpp
@@ -6,23 +6,23 @@
 #include <osg/Image>
 #include <osg/ref_ptr>
 
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
-
-#include <components/esm/loadcell.hpp>
-#include <components/esm/loadbook.hpp>
-#include <components/esm/loadclas.hpp>
-#include <components/esm/loadglob.hpp>
-#include <components/esm/cellstate.hpp>
-#include <components/esm/loadfact.hpp>
-#include <components/esm/dialoguestate.hpp>
-#include <components/esm/custommarkerstate.hpp>
-#include <components/esm/loadcrea.hpp>
-#include <components/esm/weatherstate.hpp>
-#include <components/esm/globalscript.hpp>
-#include <components/esm/queststate.hpp>
-#include <components/esm/stolenitems.hpp>
-#include <components/esm/projectilestate.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
+
+#include <components/esm3/loadcell.hpp>
+#include <components/esm3/loadbook.hpp>
+#include <components/esm3/loadclas.hpp>
+#include <components/esm3/loadglob.hpp>
+#include <components/esm3/cellstate.hpp>
+#include <components/esm3/loadfact.hpp>
+#include <components/esm3/dialoguestate.hpp>
+#include <components/esm3/custommarkerstate.hpp>
+#include <components/esm3/loadcrea.hpp>
+#include <components/esm3/weatherstate.hpp>
+#include <components/esm3/globalscript.hpp>
+#include <components/esm3/queststate.hpp>
+#include <components/esm3/stolenitems.hpp>
+#include <components/esm3/projectilestate.hpp>
 
 #include "importcrec.hpp"
 #include "importcntc.hpp"
diff --git a/apps/essimporter/convertinventory.hpp b/apps/essimporter/convertinventory.hpp
index 8abe85a44a..95d134d4fc 100644
--- a/apps/essimporter/convertinventory.hpp
+++ b/apps/essimporter/convertinventory.hpp
@@ -3,7 +3,7 @@
 
 #include "importinventory.hpp"
 
-#include <components/esm/inventorystate.hpp>
+#include <components/esm3/inventorystate.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/convertnpcc.hpp b/apps/essimporter/convertnpcc.hpp
index eb12d8f3bc..d0a395e33e 100644
--- a/apps/essimporter/convertnpcc.hpp
+++ b/apps/essimporter/convertnpcc.hpp
@@ -3,7 +3,7 @@
 
 #include "importnpcc.hpp"
 
-#include <components/esm/npcstate.hpp>
+#include <components/esm3/npcstate.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/convertplayer.hpp b/apps/essimporter/convertplayer.hpp
index 1d2fdc87a6..73c98309f8 100644
--- a/apps/essimporter/convertplayer.hpp
+++ b/apps/essimporter/convertplayer.hpp
@@ -3,8 +3,8 @@
 
 #include "importplayer.hpp"
 
-#include <components/esm/player.hpp>
-#include <components/esm/controlsstate.hpp>
+#include <components/esm3/player.hpp>
+#include <components/esm3/controlsstate.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/convertscpt.hpp b/apps/essimporter/convertscpt.hpp
index 3390bd6070..f4a4e34fe4 100644
--- a/apps/essimporter/convertscpt.hpp
+++ b/apps/essimporter/convertscpt.hpp
@@ -1,7 +1,7 @@
 #ifndef OPENMW_ESSIMPORT_CONVERTSCPT_H
 #define OPENMW_ESSIMPORT_CONVERTSCPT_H
 
-#include <components/esm/globalscript.hpp>
+#include <components/esm3/globalscript.hpp>
 
 #include "importscpt.hpp"
 
diff --git a/apps/essimporter/convertscri.hpp b/apps/essimporter/convertscri.hpp
index 2d89456662..3908dbacf2 100644
--- a/apps/essimporter/convertscri.hpp
+++ b/apps/essimporter/convertscri.hpp
@@ -3,7 +3,7 @@
 
 #include "importscri.hpp"
 
-#include <components/esm/locals.hpp>
+#include <components/esm3/locals.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/importacdt.cpp b/apps/essimporter/importacdt.cpp
index 0ddd2eb64c..69760a6bdb 100644
--- a/apps/essimporter/importacdt.cpp
+++ b/apps/essimporter/importacdt.cpp
@@ -1,8 +1,8 @@
 #include "importacdt.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
-#include <components/esm/cellref.hpp>
+#include <components/esm3/cellref.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/importacdt.hpp b/apps/essimporter/importacdt.hpp
index 354eca32d8..6ecb72e334 100644
--- a/apps/essimporter/importacdt.hpp
+++ b/apps/essimporter/importacdt.hpp
@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include <components/esm/cellref.hpp>
+#include <components/esm3/cellref.hpp>
 
 #include "importscri.hpp"
 
diff --git a/apps/essimporter/importcellref.cpp b/apps/essimporter/importcellref.cpp
index 442a7781c7..e6c62cc812 100644
--- a/apps/essimporter/importcellref.cpp
+++ b/apps/essimporter/importcellref.cpp
@@ -1,6 +1,6 @@
 #include "importcellref.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/importcellref.hpp b/apps/essimporter/importcellref.hpp
index 4d7f07a6cc..d69a0a829d 100644
--- a/apps/essimporter/importcellref.hpp
+++ b/apps/essimporter/importcellref.hpp
@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include <components/esm/cellref.hpp>
+#include <components/esm3/cellref.hpp>
 
 #include "importacdt.hpp"
 
diff --git a/apps/essimporter/importcntc.cpp b/apps/essimporter/importcntc.cpp
index a492aef5aa..a4b54ca7b4 100644
--- a/apps/essimporter/importcntc.cpp
+++ b/apps/essimporter/importcntc.cpp
@@ -1,6 +1,6 @@
 #include "importcntc.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/importcrec.cpp b/apps/essimporter/importcrec.cpp
index 64879f2afc..6cef13333b 100644
--- a/apps/essimporter/importcrec.cpp
+++ b/apps/essimporter/importcrec.cpp
@@ -1,6 +1,6 @@
 #include "importcrec.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/importcrec.hpp b/apps/essimporter/importcrec.hpp
index 5110fbc689..77933eafe8 100644
--- a/apps/essimporter/importcrec.hpp
+++ b/apps/essimporter/importcrec.hpp
@@ -2,7 +2,7 @@
 #define OPENMW_ESSIMPORT_CREC_H
 
 #include "importinventory.hpp"
-#include <components/esm/aipackage.hpp>
+#include <components/esm3/aipackage.hpp>
 
 namespace ESM
 {
diff --git a/apps/essimporter/importdial.cpp b/apps/essimporter/importdial.cpp
index 5797a708a1..1467e43365 100644
--- a/apps/essimporter/importdial.cpp
+++ b/apps/essimporter/importdial.cpp
@@ -1,6 +1,6 @@
 #include "importdial.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/importer.cpp b/apps/essimporter/importer.cpp
index 84f13b8c91..996a24b011 100644
--- a/apps/essimporter/importer.cpp
+++ b/apps/essimporter/importer.cpp
@@ -8,20 +8,20 @@
 #include <osgDB/ReadFile>
 #include <osg/ImageUtils>
 
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 #include <components/esm/defs.hpp>
 
-#include <components/esm/savedgame.hpp>
-#include <components/esm/player.hpp>
+#include <components/esm3/savedgame.hpp>
+#include <components/esm3/player.hpp>
 
-#include <components/esm/loadalch.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/loadlevlist.hpp>
+#include <components/esm3/loadalch.hpp>
+#include <components/esm3/loadspel.hpp>
+#include <components/esm3/loadarmo.hpp>
+#include <components/esm3/loadweap.hpp>
+#include <components/esm3/loadclot.hpp>
+#include <components/esm3/loadench.hpp>
+#include <components/esm3/loadlevlist.hpp>
 
 #include <components/misc/constants.hpp>
 
diff --git a/apps/essimporter/importercontext.hpp b/apps/essimporter/importercontext.hpp
index 179e00f087..149059219c 100644
--- a/apps/essimporter/importercontext.hpp
+++ b/apps/essimporter/importercontext.hpp
@@ -3,13 +3,13 @@
 
 #include <map>
 
-#include <components/esm/loadnpc.hpp>
-#include <components/esm/player.hpp>
-#include <components/esm/dialoguestate.hpp>
-#include <components/esm/globalmap.hpp>
-#include <components/esm/loadcrea.hpp>
-#include <components/esm/loadnpc.hpp>
-#include <components/esm/controlsstate.hpp>
+#include <components/esm3/loadnpc.hpp>
+#include <components/esm3/player.hpp>
+#include <components/esm3/dialoguestate.hpp>
+#include <components/esm3/globalmap.hpp>
+#include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loadnpc.hpp>
+#include <components/esm3/controlsstate.hpp>
 
 #include "importnpcc.hpp"
 #include "importcrec.hpp"
diff --git a/apps/essimporter/importgame.cpp b/apps/essimporter/importgame.cpp
index 1012541b49..df36afe784 100644
--- a/apps/essimporter/importgame.cpp
+++ b/apps/essimporter/importgame.cpp
@@ -1,6 +1,6 @@
 #include "importgame.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/importinfo.cpp b/apps/essimporter/importinfo.cpp
index 1131553709..49a0c745f6 100644
--- a/apps/essimporter/importinfo.cpp
+++ b/apps/essimporter/importinfo.cpp
@@ -1,6 +1,6 @@
 #include "importinfo.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/importinventory.cpp b/apps/essimporter/importinventory.cpp
index e91c39452c..c4d11763f5 100644
--- a/apps/essimporter/importinventory.cpp
+++ b/apps/essimporter/importinventory.cpp
@@ -2,7 +2,7 @@
 
 #include <stdexcept>
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/importinventory.hpp b/apps/essimporter/importinventory.hpp
index a1324a6960..6f757ac9a0 100644
--- a/apps/essimporter/importinventory.hpp
+++ b/apps/essimporter/importinventory.hpp
@@ -4,7 +4,7 @@
 #include <vector>
 #include <string>
 
-#include <components/esm/cellref.hpp>
+#include <components/esm3/cellref.hpp>
 #include <components/esm/esmcommon.hpp>
 
 #include "importscri.hpp"
diff --git a/apps/essimporter/importjour.cpp b/apps/essimporter/importjour.cpp
index e5d24e113c..1c46b3159c 100644
--- a/apps/essimporter/importjour.cpp
+++ b/apps/essimporter/importjour.cpp
@@ -1,6 +1,6 @@
 #include "importjour.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/importklst.cpp b/apps/essimporter/importklst.cpp
index daa1ab0774..5d9f22a31c 100644
--- a/apps/essimporter/importklst.cpp
+++ b/apps/essimporter/importklst.cpp
@@ -1,6 +1,6 @@
 #include "importklst.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/importnpcc.cpp b/apps/essimporter/importnpcc.cpp
index 3cbd749ce8..4d8da66f0f 100644
--- a/apps/essimporter/importnpcc.cpp
+++ b/apps/essimporter/importnpcc.cpp
@@ -1,6 +1,6 @@
 #include "importnpcc.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/importnpcc.hpp b/apps/essimporter/importnpcc.hpp
index a23ab1e50b..d525c00743 100644
--- a/apps/essimporter/importnpcc.hpp
+++ b/apps/essimporter/importnpcc.hpp
@@ -1,9 +1,9 @@
 #ifndef OPENMW_ESSIMPORT_NPCC_H
 #define OPENMW_ESSIMPORT_NPCC_H
 
-#include <components/esm/loadcont.hpp>
+#include <components/esm3/loadcont.hpp>
 
-#include <components/esm/aipackage.hpp>
+#include <components/esm3/aipackage.hpp>
 
 #include "importinventory.hpp"
 
diff --git a/apps/essimporter/importplayer.cpp b/apps/essimporter/importplayer.cpp
index 8c275a2868..52e4a9b7d0 100644
--- a/apps/essimporter/importplayer.cpp
+++ b/apps/essimporter/importplayer.cpp
@@ -1,6 +1,6 @@
 #include "importplayer.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/importplayer.hpp b/apps/essimporter/importplayer.hpp
index 924522383b..6c8f211c57 100644
--- a/apps/essimporter/importplayer.hpp
+++ b/apps/essimporter/importplayer.hpp
@@ -5,7 +5,7 @@
 #include <string>
 
 #include <components/esm/defs.hpp>
-#include <components/esm/cellref.hpp>
+#include <components/esm3/cellref.hpp>
 #include <components/esm/esmcommon.hpp>
 
 #include "importacdt.hpp"
diff --git a/apps/essimporter/importproj.cpp b/apps/essimporter/importproj.cpp
index b2dcf4e7da..aada41a778 100644
--- a/apps/essimporter/importproj.cpp
+++ b/apps/essimporter/importproj.cpp
@@ -1,6 +1,6 @@
 #include "importproj.h"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/importques.cpp b/apps/essimporter/importques.cpp
index 78b779e439..b57083b0b3 100644
--- a/apps/essimporter/importques.cpp
+++ b/apps/essimporter/importques.cpp
@@ -1,6 +1,6 @@
 #include "importques.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/importscpt.cpp b/apps/essimporter/importscpt.cpp
index 652383cdaa..4df46ddc8d 100644
--- a/apps/essimporter/importscpt.cpp
+++ b/apps/essimporter/importscpt.cpp
@@ -1,6 +1,6 @@
 #include "importscpt.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 
 
diff --git a/apps/essimporter/importscpt.hpp b/apps/essimporter/importscpt.hpp
index 6bfd2603a2..15f4fde598 100644
--- a/apps/essimporter/importscpt.hpp
+++ b/apps/essimporter/importscpt.hpp
@@ -3,7 +3,7 @@
 
 #include "importscri.hpp"
 
-#include <components/esm/loadscpt.hpp>
+#include <components/esm3/loadscpt.hpp>
 
 namespace ESM
 {
diff --git a/apps/essimporter/importscri.cpp b/apps/essimporter/importscri.cpp
index de0b35c86c..91971dde3b 100644
--- a/apps/essimporter/importscri.cpp
+++ b/apps/essimporter/importscri.cpp
@@ -1,6 +1,6 @@
 #include "importscri.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/importscri.hpp b/apps/essimporter/importscri.hpp
index fe68e50515..73d8942f81 100644
--- a/apps/essimporter/importscri.hpp
+++ b/apps/essimporter/importscri.hpp
@@ -1,7 +1,7 @@
 #ifndef OPENMW_ESSIMPORT_IMPORTSCRI_H
 #define OPENMW_ESSIMPORT_IMPORTSCRI_H
 
-#include <components/esm/variant.hpp>
+#include <components/esm3/variant.hpp>
 
 #include <vector>
 
diff --git a/apps/essimporter/importsplm.cpp b/apps/essimporter/importsplm.cpp
index 9fdba4ddb5..f635a8fdbb 100644
--- a/apps/essimporter/importsplm.cpp
+++ b/apps/essimporter/importsplm.cpp
@@ -1,6 +1,6 @@
 #include "importsplm.h"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/launcher/utils/cellnameloader.cpp b/apps/launcher/utils/cellnameloader.cpp
index e8ba54651c..4cb8b545aa 100644
--- a/apps/launcher/utils/cellnameloader.cpp
+++ b/apps/launcher/utils/cellnameloader.cpp
@@ -1,6 +1,6 @@
 #include "cellnameloader.hpp"
 
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadcell.hpp>
 #include <components/contentselector/view/contentselector.hpp>
 
 QSet<QString> CellNameLoader::getCellNames(QStringList &contentPaths)
diff --git a/apps/launcher/utils/cellnameloader.hpp b/apps/launcher/utils/cellnameloader.hpp
index 899ff75adb..6143b78bd9 100644
--- a/apps/launcher/utils/cellnameloader.hpp
+++ b/apps/launcher/utils/cellnameloader.hpp
@@ -4,7 +4,7 @@
 #include <QSet>
 #include <QString>
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESM {class ESMReader; struct Cell;}
 namespace ContentSelectorView {class ContentSelector;}
diff --git a/apps/mwiniimporter/importer.cpp b/apps/mwiniimporter/importer.cpp
index 35a1c4ec8b..68f266ed6e 100644
--- a/apps/mwiniimporter/importer.cpp
+++ b/apps/mwiniimporter/importer.cpp
@@ -3,7 +3,7 @@
 #include <iostream>
 #include <sstream>
 #include <components/misc/stringops.hpp>
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
diff --git a/apps/navmeshtool/main.cpp b/apps/navmeshtool/main.cpp
index 3e867fcbc9..aee040bb9d 100644
--- a/apps/navmeshtool/main.cpp
+++ b/apps/navmeshtool/main.cpp
@@ -4,8 +4,8 @@
 #include <components/debug/debugging.hpp>
 #include <components/detournavigator/navmeshdb.hpp>
 #include <components/detournavigator/recastglobalallocator.hpp>
-#include <components/esm/esmreader.hpp>
-#include <components/esm/variant.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/variant.hpp>
 #include <components/esmloader/esmdata.hpp>
 #include <components/esmloader/load.hpp>
 #include <components/fallback/fallback.hpp>
diff --git a/apps/navmeshtool/navmesh.cpp b/apps/navmeshtool/navmesh.cpp
index 4187197947..d59d274c21 100644
--- a/apps/navmeshtool/navmesh.cpp
+++ b/apps/navmeshtool/navmesh.cpp
@@ -16,7 +16,7 @@
 #include <components/detournavigator/serialization.hpp>
 #include <components/detournavigator/tilecachedrecastmeshmanager.hpp>
 #include <components/detournavigator/tileposition.hpp>
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadcell.hpp>
 #include <components/misc/guarded.hpp>
 #include <components/misc/progressreporter.hpp>
 #include <components/sceneutil/workqueue.hpp>
diff --git a/apps/navmeshtool/worldspacedata.cpp b/apps/navmeshtool/worldspacedata.cpp
index d05a8fe3f0..227f73ad33 100644
--- a/apps/navmeshtool/worldspacedata.cpp
+++ b/apps/navmeshtool/worldspacedata.cpp
@@ -7,10 +7,10 @@
 #include <components/detournavigator/objectid.hpp>
 #include <components/detournavigator/recastmesh.hpp>
 #include <components/detournavigator/tilecachedrecastmeshmanager.hpp>
-#include <components/esm/cellref.hpp>
-#include <components/esm/esmreader.hpp>
-#include <components/esm/loadcell.hpp>
-#include <components/esm/loadland.hpp>
+#include <components/esm3/cellref.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/loadcell.hpp>
+#include <components/esm3/loadland.hpp>
 #include <components/esmloader/esmdata.hpp>
 #include <components/esmloader/lessbyid.hpp>
 #include <components/esmloader/record.hpp>
diff --git a/apps/navmeshtool/worldspacedata.hpp b/apps/navmeshtool/worldspacedata.hpp
index 3dccd5a8bc..2efb0954e0 100644
--- a/apps/navmeshtool/worldspacedata.hpp
+++ b/apps/navmeshtool/worldspacedata.hpp
@@ -3,7 +3,7 @@
 
 #include <components/bullethelpers/collisionobject.hpp>
 #include <components/detournavigator/tilecachedrecastmeshmanager.hpp>
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 #include <components/misc/convert.hpp>
 #include <components/resource/bulletshape.hpp>
 
diff --git a/apps/opencs/model/doc/runner.hpp b/apps/opencs/model/doc/runner.hpp
index 517122492a..0cfbaab3af 100644
--- a/apps/opencs/model/doc/runner.hpp
+++ b/apps/opencs/model/doc/runner.hpp
@@ -10,7 +10,7 @@
 #include <QProcess>
 #include <QTextDocument>
 
-#include <components/esm/debugprofile.hpp>
+#include <components/esm3/debugprofile.hpp>
 
 class QTemporaryFile;
 
diff --git a/apps/opencs/model/doc/savingstages.cpp b/apps/opencs/model/doc/savingstages.cpp
index a410d34b2a..5efa474f76 100644
--- a/apps/opencs/model/doc/savingstages.cpp
+++ b/apps/opencs/model/doc/savingstages.cpp
@@ -4,7 +4,7 @@
 
 #include <QUndoStack>
 
-#include <components/esm/loaddial.hpp>
+#include <components/esm3/loaddial.hpp>
 
 #include "../world/infocollection.hpp"
 #include "../world/cellcoordinates.hpp"
diff --git a/apps/opencs/model/doc/savingstate.hpp b/apps/opencs/model/doc/savingstate.hpp
index e6c8c545a7..727352a872 100644
--- a/apps/opencs/model/doc/savingstate.hpp
+++ b/apps/opencs/model/doc/savingstate.hpp
@@ -8,7 +8,7 @@
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/fstream.hpp>
 
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/esmwriter.hpp>
 
 #include <components/to_utf8/to_utf8.hpp>
 
diff --git a/apps/opencs/model/tools/birthsigncheck.hpp b/apps/opencs/model/tools/birthsigncheck.hpp
index 498894f882..1d88673adc 100644
--- a/apps/opencs/model/tools/birthsigncheck.hpp
+++ b/apps/opencs/model/tools/birthsigncheck.hpp
@@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_BIRTHSIGNCHECK_H
 #define CSM_TOOLS_BIRTHSIGNCHECK_H
 
-#include <components/esm/loadbsgn.hpp>
+#include <components/esm3/loadbsgn.hpp>
 
 #include "../world/idcollection.hpp"
 #include "../world/resources.hpp"
diff --git a/apps/opencs/model/tools/bodypartcheck.hpp b/apps/opencs/model/tools/bodypartcheck.hpp
index 2c379bd078..2eba75c495 100644
--- a/apps/opencs/model/tools/bodypartcheck.hpp
+++ b/apps/opencs/model/tools/bodypartcheck.hpp
@@ -1,8 +1,8 @@
 #ifndef CSM_TOOLS_BODYPARTCHECK_H
 #define CSM_TOOLS_BODYPARTCHECK_H
 
-#include <components/esm/loadbody.hpp>
-#include <components/esm/loadrace.hpp>
+#include <components/esm3/loadbody.hpp>
+#include <components/esm3/loadrace.hpp>
 
 #include "../world/resources.hpp"
 #include "../world/idcollection.hpp"
diff --git a/apps/opencs/model/tools/classcheck.cpp b/apps/opencs/model/tools/classcheck.cpp
index a82121597c..aa38ed46ce 100644
--- a/apps/opencs/model/tools/classcheck.cpp
+++ b/apps/opencs/model/tools/classcheck.cpp
@@ -2,8 +2,8 @@
 
 #include <map>
 
-#include <components/esm/loadclas.hpp>
-#include <components/esm/loadskil.hpp>
+#include <components/esm3/loadclas.hpp>
+#include <components/esm3/loadskil.hpp>
 
 #include "../prefs/state.hpp"
 
diff --git a/apps/opencs/model/tools/classcheck.hpp b/apps/opencs/model/tools/classcheck.hpp
index a78c2eb975..9d66336d43 100644
--- a/apps/opencs/model/tools/classcheck.hpp
+++ b/apps/opencs/model/tools/classcheck.hpp
@@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_CLASSCHECK_H
 #define CSM_TOOLS_CLASSCHECK_H
 
-#include <components/esm/loadclas.hpp>
+#include <components/esm3/loadclas.hpp>
 
 #include "../world/idcollection.hpp"
 
diff --git a/apps/opencs/model/tools/enchantmentcheck.hpp b/apps/opencs/model/tools/enchantmentcheck.hpp
index e9c8b9eece..8ee71ad7cb 100644
--- a/apps/opencs/model/tools/enchantmentcheck.hpp
+++ b/apps/opencs/model/tools/enchantmentcheck.hpp
@@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_ENCHANTMENTCHECK_H
 #define CSM_TOOLS_ENCHANTMENTCHECK_H
 
-#include <components/esm/loadench.hpp>
+#include <components/esm3/loadench.hpp>
 
 #include "../world/idcollection.hpp"
 
diff --git a/apps/opencs/model/tools/factioncheck.cpp b/apps/opencs/model/tools/factioncheck.cpp
index 8a198e9535..dbecea9589 100644
--- a/apps/opencs/model/tools/factioncheck.cpp
+++ b/apps/opencs/model/tools/factioncheck.cpp
@@ -2,7 +2,7 @@
 
 #include <map>
 
-#include <components/esm/loadskil.hpp>
+#include <components/esm3/loadskil.hpp>
 
 #include "../prefs/state.hpp"
 
diff --git a/apps/opencs/model/tools/factioncheck.hpp b/apps/opencs/model/tools/factioncheck.hpp
index d281c1b416..a6a6815976 100644
--- a/apps/opencs/model/tools/factioncheck.hpp
+++ b/apps/opencs/model/tools/factioncheck.hpp
@@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_FACTIONCHECK_H
 #define CSM_TOOLS_FACTIONCHECK_H
 
-#include <components/esm/loadfact.hpp>
+#include <components/esm3/loadfact.hpp>
 
 #include "../world/idcollection.hpp"
 
diff --git a/apps/opencs/model/tools/gmstcheck.hpp b/apps/opencs/model/tools/gmstcheck.hpp
index 2c12a8607a..c57f6a088b 100644
--- a/apps/opencs/model/tools/gmstcheck.hpp
+++ b/apps/opencs/model/tools/gmstcheck.hpp
@@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_GMSTCHECK_H
 #define CSM_TOOLS_GMSTCHECK_H
 
-#include <components/esm/loadgmst.hpp>
+#include <components/esm3/loadgmst.hpp>
 
 #include "../world/idcollection.hpp"
 
diff --git a/apps/opencs/model/tools/journalcheck.hpp b/apps/opencs/model/tools/journalcheck.hpp
index b63127b522..65ce8b85df 100644
--- a/apps/opencs/model/tools/journalcheck.hpp
+++ b/apps/opencs/model/tools/journalcheck.hpp
@@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_JOURNALCHECK_H
 #define CSM_TOOLS_JOURNALCHECK_H
 
-#include <components/esm/loaddial.hpp>
+#include <components/esm3/loaddial.hpp>
 
 #include "../world/idcollection.hpp"
 #include "../world/infocollection.hpp"
diff --git a/apps/opencs/model/tools/magiceffectcheck.hpp b/apps/opencs/model/tools/magiceffectcheck.hpp
index 4b2c24cc7c..e264683d04 100644
--- a/apps/opencs/model/tools/magiceffectcheck.hpp
+++ b/apps/opencs/model/tools/magiceffectcheck.hpp
@@ -1,8 +1,8 @@
 #ifndef CSM_TOOLS_MAGICEFFECTCHECK_HPP
 #define CSM_TOOLS_MAGICEFFECTCHECK_HPP
 
-#include <components/esm/loadmgef.hpp>
-#include <components/esm/loadsoun.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadsoun.hpp>
 
 #include "../world/idcollection.hpp"
 #include "../world/refidcollection.hpp"
diff --git a/apps/opencs/model/tools/racecheck.hpp b/apps/opencs/model/tools/racecheck.hpp
index 7c70f13b00..fe08f4bb67 100644
--- a/apps/opencs/model/tools/racecheck.hpp
+++ b/apps/opencs/model/tools/racecheck.hpp
@@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_RACECHECK_H
 #define CSM_TOOLS_RACECHECK_H
 
-#include <components/esm/loadrace.hpp>
+#include <components/esm3/loadrace.hpp>
 
 #include "../world/idcollection.hpp"
 
diff --git a/apps/opencs/model/tools/regioncheck.hpp b/apps/opencs/model/tools/regioncheck.hpp
index e7ddb0bcab..71893c6c5d 100644
--- a/apps/opencs/model/tools/regioncheck.hpp
+++ b/apps/opencs/model/tools/regioncheck.hpp
@@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_REGIONCHECK_H
 #define CSM_TOOLS_REGIONCHECK_H
 
-#include <components/esm/loadregn.hpp>
+#include <components/esm3/loadregn.hpp>
 
 #include "../world/idcollection.hpp"
 
diff --git a/apps/opencs/model/tools/skillcheck.hpp b/apps/opencs/model/tools/skillcheck.hpp
index b1af887f6c..f13a5b7a29 100644
--- a/apps/opencs/model/tools/skillcheck.hpp
+++ b/apps/opencs/model/tools/skillcheck.hpp
@@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_SKILLCHECK_H
 #define CSM_TOOLS_SKILLCHECK_H
 
-#include <components/esm/loadskil.hpp>
+#include <components/esm3/loadskil.hpp>
 
 #include "../world/idcollection.hpp"
 
diff --git a/apps/opencs/model/tools/soundcheck.hpp b/apps/opencs/model/tools/soundcheck.hpp
index 80eb9e7f29..fc3255c538 100644
--- a/apps/opencs/model/tools/soundcheck.hpp
+++ b/apps/opencs/model/tools/soundcheck.hpp
@@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_SOUNDCHECK_H
 #define CSM_TOOLS_SOUNDCHECK_H
 
-#include <components/esm/loadsoun.hpp>
+#include <components/esm3/loadsoun.hpp>
 
 #include "../world/resources.hpp"
 #include "../world/idcollection.hpp"
diff --git a/apps/opencs/model/tools/spellcheck.cpp b/apps/opencs/model/tools/spellcheck.cpp
index dc9ce65c0a..6cec24b705 100644
--- a/apps/opencs/model/tools/spellcheck.cpp
+++ b/apps/opencs/model/tools/spellcheck.cpp
@@ -3,7 +3,7 @@
 #include <sstream>
 #include <map>
 
-#include <components/esm/loadspel.hpp>
+#include <components/esm3/loadspel.hpp>
 
 #include "../prefs/state.hpp"
 
diff --git a/apps/opencs/model/tools/spellcheck.hpp b/apps/opencs/model/tools/spellcheck.hpp
index bfc9628107..1a8d3d0237 100644
--- a/apps/opencs/model/tools/spellcheck.hpp
+++ b/apps/opencs/model/tools/spellcheck.hpp
@@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_SPELLCHECK_H
 #define CSM_TOOLS_SPELLCHECK_H
 
-#include <components/esm/loadspel.hpp>
+#include <components/esm3/loadspel.hpp>
 
 #include "../world/idcollection.hpp"
 
diff --git a/apps/opencs/model/tools/startscriptcheck.hpp b/apps/opencs/model/tools/startscriptcheck.hpp
index a45d3c9437..4113090793 100644
--- a/apps/opencs/model/tools/startscriptcheck.hpp
+++ b/apps/opencs/model/tools/startscriptcheck.hpp
@@ -1,8 +1,8 @@
 #ifndef CSM_TOOLS_STARTSCRIPTCHECK_H
 #define CSM_TOOLS_STARTSCRIPTCHECK_H
 
-#include <components/esm/loadsscr.hpp>
-#include <components/esm/loadscpt.hpp>
+#include <components/esm3/loadsscr.hpp>
+#include <components/esm3/loadscpt.hpp>
 
 #include "../doc/stage.hpp"
 
diff --git a/apps/opencs/model/tools/topicinfocheck.hpp b/apps/opencs/model/tools/topicinfocheck.hpp
index b9dbdc1536..de3fa82ae3 100644
--- a/apps/opencs/model/tools/topicinfocheck.hpp
+++ b/apps/opencs/model/tools/topicinfocheck.hpp
@@ -3,13 +3,13 @@
 
 #include <set>
 
-#include <components/esm/loadclas.hpp>
-#include <components/esm/loaddial.hpp>
-#include <components/esm/loadfact.hpp>
-#include <components/esm/loadglob.hpp>
-#include <components/esm/loadgmst.hpp>
-#include <components/esm/loadrace.hpp>
-#include <components/esm/loadregn.hpp>
+#include <components/esm3/loadclas.hpp>
+#include <components/esm3/loaddial.hpp>
+#include <components/esm3/loadfact.hpp>
+#include <components/esm3/loadglob.hpp>
+#include <components/esm3/loadgmst.hpp>
+#include <components/esm3/loadrace.hpp>
+#include <components/esm3/loadregn.hpp>
 
 #include "../world/cell.hpp"
 #include "../world/idcollection.hpp"
diff --git a/apps/opencs/model/world/actoradapter.cpp b/apps/opencs/model/world/actoradapter.cpp
index 7e7f926384..bc8f519dcd 100644
--- a/apps/opencs/model/world/actoradapter.cpp
+++ b/apps/opencs/model/world/actoradapter.cpp
@@ -1,10 +1,10 @@
 #include "actoradapter.hpp"
 
-#include <components/esm/loadarmo.hpp>
-#include <components/esm/loadclot.hpp>
-#include <components/esm/loadnpc.hpp>
-#include <components/esm/loadrace.hpp>
-#include <components/esm/mappings.hpp>
+#include <components/esm3/loadarmo.hpp>
+#include <components/esm3/loadclot.hpp>
+#include <components/esm3/loadnpc.hpp>
+#include <components/esm3/loadrace.hpp>
+#include <components/esm3/mappings.hpp>
 #include <components/sceneutil/actorutil.hpp>
 
 #include "data.hpp"
diff --git a/apps/opencs/model/world/actoradapter.hpp b/apps/opencs/model/world/actoradapter.hpp
index 826e3b9179..2d8375bb2f 100644
--- a/apps/opencs/model/world/actoradapter.hpp
+++ b/apps/opencs/model/world/actoradapter.hpp
@@ -10,8 +10,8 @@
 #include <QObject>
 #include <QModelIndex>
 
-#include <components/esm/loadarmo.hpp>
-#include <components/esm/loadbody.hpp>
+#include <components/esm3/loadarmo.hpp>
+#include <components/esm3/loadbody.hpp>
 #include <components/misc/weakcache.hpp>
 
 #include "refidcollection.hpp"
diff --git a/apps/opencs/model/world/cell.hpp b/apps/opencs/model/world/cell.hpp
index 160610874c..256a07d301 100644
--- a/apps/opencs/model/world/cell.hpp
+++ b/apps/opencs/model/world/cell.hpp
@@ -4,7 +4,7 @@
 #include <vector>
 #include <string>
 
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadcell.hpp>
 
 namespace CSMWorld
 {
diff --git a/apps/opencs/model/world/cellcoordinates.cpp b/apps/opencs/model/world/cellcoordinates.cpp
index af8c26d70a..9fde26a962 100644
--- a/apps/opencs/model/world/cellcoordinates.cpp
+++ b/apps/opencs/model/world/cellcoordinates.cpp
@@ -5,7 +5,7 @@
 #include <ostream>
 #include <sstream>
 
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 #include <components/misc/constants.hpp>
 
 CSMWorld::CellCoordinates::CellCoordinates() : mX (0), mY (0) {}
diff --git a/apps/opencs/model/world/columnimp.hpp b/apps/opencs/model/world/columnimp.hpp
index e0148d6cc6..493f62694e 100644
--- a/apps/opencs/model/world/columnimp.hpp
+++ b/apps/opencs/model/world/columnimp.hpp
@@ -9,9 +9,9 @@
 #include <QColor>
 #include <QVector>
 
-#include <components/esm/loadbody.hpp>
-#include <components/esm/loadskil.hpp>
-#include <components/esm/loadrace.hpp>
+#include <components/esm3/loadbody.hpp>
+#include <components/esm3/loadskil.hpp>
+#include <components/esm3/loadrace.hpp>
 
 #include "columnbase.hpp"
 #include "columns.hpp"
diff --git a/apps/opencs/model/world/columns.cpp b/apps/opencs/model/world/columns.cpp
index 8e53b3b270..3c5ea52586 100644
--- a/apps/opencs/model/world/columns.cpp
+++ b/apps/opencs/model/world/columns.cpp
@@ -405,7 +405,7 @@ namespace
         "Combat", "Magic", "Stealth", 0
     };
 
-    // see ESM::Attribute::AttributeID in <component/esm/attr.hpp>
+    // see ESM::Attribute::AttributeID in <component/esm3/attr.hpp>
     static const char *sAttributes[] =
     {
         "Strength", "Intelligence", "Willpower", "Agility", "Speed", "Endurance", "Personality",
@@ -498,7 +498,7 @@ namespace
         "Alteration", "Conjuration", "Destruction", "Illusion", "Mysticism", "Restoration", 0
     };
 
-    // impact from magic effects, see ESM::Skill::SkillEnum in <component/esm/loadskil.hpp>
+    // impact from magic effects, see ESM::Skill::SkillEnum in <component/esm3/loadskil.hpp>
     static const char *sSkills[] =
     {
         "Block", "Armorer", "MediumArmor", "HeavyArmor", "BluntWeapon",
@@ -509,13 +509,13 @@ namespace
         "Speechcraft", "HandToHand", 0
     };
 
-    // range of magic effects, see ESM::RangeType in <component/esm/defs.hpp>
+    // range of magic effects, see ESM::RangeType in <component/esm3/defs.hpp>
     static const char *sEffectRange[] =
     {
         "Self", "Touch", "Target", 0
     };
 
-    // magic effect names, see ESM::MagicEffect::Effects in <component/esm/loadmgef.hpp>
+    // magic effect names, see ESM::MagicEffect::Effects in <component/esm3/loadmgef.hpp>
     static const char *sEffectId[] =
     {
         "WaterBreathing", "SwiftSwim", "WaterWalking", "Shield", "FireShield",
@@ -549,7 +549,7 @@ namespace
         "SummonBonewolf", "SummonCreature04", "SummonCreature05", 0
     };
 
-    // see ESM::PartReferenceType in <component/esm/loadarmo.hpp>
+    // see ESM::PartReferenceType in <component/esm3/loadarmo.hpp>
     static const char *sPartRefType[] =
     {
         "Head", "Hair", "Neck", "Cuirass", "Groin",
@@ -560,7 +560,7 @@ namespace
         "Weapon", "Tail", 0
     };
 
-    // see the enums in <component/esm/aipackage.hpp>
+    // see the enums in <component/esm3/aipackage.hpp>
     static const char *sAiPackageType[] =
     {
         "AI Wander", "AI Travel", "AI Follow", "AI Escort", "AI Activate", 0
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index ec4c1f6a13..2018b3e8fd 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -5,10 +5,10 @@
 
 #include <QAbstractItemModel>
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 #include <components/esm/defs.hpp>
-#include <components/esm/loadglob.hpp>
-#include <components/esm/cellref.hpp>
+#include <components/esm3/loadglob.hpp>
+#include <components/esm3/cellref.hpp>
 
 #include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/shadow.hpp>
diff --git a/apps/opencs/model/world/data.hpp b/apps/opencs/model/world/data.hpp
index b1c20b8629..4a5d8f51a6 100644
--- a/apps/opencs/model/world/data.hpp
+++ b/apps/opencs/model/world/data.hpp
@@ -9,25 +9,25 @@
 #include <QObject>
 #include <QModelIndex>
 
-#include <components/esm/loadglob.hpp>
-#include <components/esm/loadgmst.hpp>
-#include <components/esm/loadskil.hpp>
-#include <components/esm/loadclas.hpp>
-#include <components/esm/loadfact.hpp>
-#include <components/esm/loadrace.hpp>
-#include <components/esm/loadsoun.hpp>
-#include <components/esm/loadscpt.hpp>
-#include <components/esm/loadregn.hpp>
-#include <components/esm/loadbsgn.hpp>
-#include <components/esm/loadspel.hpp>
-#include <components/esm/loaddial.hpp>
-#include <components/esm/loadench.hpp>
-#include <components/esm/loadbody.hpp>
-#include <components/esm/loadsndg.hpp>
-#include <components/esm/loadmgef.hpp>
-#include <components/esm/loadsscr.hpp>
-#include <components/esm/debugprofile.hpp>
-#include <components/esm/filter.hpp>
+#include <components/esm3/loadglob.hpp>
+#include <components/esm3/loadgmst.hpp>
+#include <components/esm3/loadskil.hpp>
+#include <components/esm3/loadclas.hpp>
+#include <components/esm3/loadfact.hpp>
+#include <components/esm3/loadrace.hpp>
+#include <components/esm3/loadsoun.hpp>
+#include <components/esm3/loadscpt.hpp>
+#include <components/esm3/loadregn.hpp>
+#include <components/esm3/loadbsgn.hpp>
+#include <components/esm3/loadspel.hpp>
+#include <components/esm3/loaddial.hpp>
+#include <components/esm3/loadench.hpp>
+#include <components/esm3/loadbody.hpp>
+#include <components/esm3/loadsndg.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadsscr.hpp>
+#include <components/esm3/debugprofile.hpp>
+#include <components/esm3/filter.hpp>
 
 #include <components/resource/resourcesystem.hpp>
 
diff --git a/apps/opencs/model/world/idcollection.hpp b/apps/opencs/model/world/idcollection.hpp
index bbc49f18c1..9261d287f5 100644
--- a/apps/opencs/model/world/idcollection.hpp
+++ b/apps/opencs/model/world/idcollection.hpp
@@ -1,7 +1,7 @@
 #ifndef CSM_WOLRD_IDCOLLECTION_H
 #define CSM_WOLRD_IDCOLLECTION_H
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 #include "collection.hpp"
 #include "land.hpp"
diff --git a/apps/opencs/model/world/idtable.cpp b/apps/opencs/model/world/idtable.cpp
index 215f42133d..2e2ea41761 100644
--- a/apps/opencs/model/world/idtable.cpp
+++ b/apps/opencs/model/world/idtable.cpp
@@ -7,7 +7,7 @@
 #include <map>
 #include <stdexcept>
 
-#include <components/esm/cellid.hpp>
+#include <components/esm3/cellid.hpp>
 #include <components/misc/stringops.hpp>
 
 #include "collectionbase.hpp"
diff --git a/apps/opencs/model/world/info.hpp b/apps/opencs/model/world/info.hpp
index 1bcb2dc2d0..9405c002c7 100644
--- a/apps/opencs/model/world/info.hpp
+++ b/apps/opencs/model/world/info.hpp
@@ -1,7 +1,7 @@
 #ifndef CSM_WOLRD_INFO_H
 #define CSM_WOLRD_INFO_H
 
-#include <components/esm/loadinfo.hpp>
+#include <components/esm3/loadinfo.hpp>
 
 namespace CSMWorld
 {
diff --git a/apps/opencs/model/world/infocollection.cpp b/apps/opencs/model/world/infocollection.cpp
index d58a8327f2..a7cdc28d28 100644
--- a/apps/opencs/model/world/infocollection.cpp
+++ b/apps/opencs/model/world/infocollection.cpp
@@ -4,8 +4,8 @@
 #include <iterator>
 #include <cassert>
 
-#include <components/esm/esmreader.hpp>
-#include <components/esm/loaddial.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/loaddial.hpp>
 
 #include <components/misc/stringops.hpp>
 
diff --git a/apps/opencs/model/world/infoselectwrapper.hpp b/apps/opencs/model/world/infoselectwrapper.hpp
index ce26a46dc7..7c7a839fa6 100644
--- a/apps/opencs/model/world/infoselectwrapper.hpp
+++ b/apps/opencs/model/world/infoselectwrapper.hpp
@@ -1,7 +1,7 @@
 #ifndef CSM_WORLD_INFOSELECTWRAPPER_H
 #define CSM_WORLD_INFOSELECTWRAPPER_H
 
-#include <components/esm/loadinfo.hpp>
+#include <components/esm3/loadinfo.hpp>
 
 namespace CSMWorld
 {
diff --git a/apps/opencs/model/world/land.hpp b/apps/opencs/model/world/land.hpp
index e604f13119..99da5cfac0 100644
--- a/apps/opencs/model/world/land.hpp
+++ b/apps/opencs/model/world/land.hpp
@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 
 namespace CSMWorld
 {
diff --git a/apps/opencs/model/world/landtexture.cpp b/apps/opencs/model/world/landtexture.cpp
index 43deb64a47..c8ac8369ed 100644
--- a/apps/opencs/model/world/landtexture.cpp
+++ b/apps/opencs/model/world/landtexture.cpp
@@ -3,7 +3,7 @@
 #include <sstream>
 #include <stdexcept>
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace CSMWorld
 {
diff --git a/apps/opencs/model/world/landtexture.hpp b/apps/opencs/model/world/landtexture.hpp
index a7376438c1..601d4b79c9 100644
--- a/apps/opencs/model/world/landtexture.hpp
+++ b/apps/opencs/model/world/landtexture.hpp
@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include <components/esm/loadltex.hpp>
+#include <components/esm3/loadltex.hpp>
 
 namespace CSMWorld
 {
diff --git a/apps/opencs/model/world/metadata.cpp b/apps/opencs/model/world/metadata.cpp
index b2fa3487cd..acee441883 100644
--- a/apps/opencs/model/world/metadata.cpp
+++ b/apps/opencs/model/world/metadata.cpp
@@ -1,8 +1,8 @@
 #include "metadata.hpp"
 
-#include <components/esm/loadtes3.hpp>
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/loadtes3.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 
 void CSMWorld::MetaData::blank()
 {
diff --git a/apps/opencs/model/world/nestedcoladapterimp.cpp b/apps/opencs/model/world/nestedcoladapterimp.cpp
index e8b4102d7c..08a23f4410 100644
--- a/apps/opencs/model/world/nestedcoladapterimp.cpp
+++ b/apps/opencs/model/world/nestedcoladapterimp.cpp
@@ -1,7 +1,7 @@
 #include "nestedcoladapterimp.hpp"
 
-#include <components/esm/loadregn.hpp>
-#include <components/esm/loadfact.hpp>
+#include <components/esm3/loadregn.hpp>
+#include <components/esm3/loadfact.hpp>
 
 #include "idcollection.hpp"
 #include "pathgrid.hpp"
diff --git a/apps/opencs/model/world/nestedcoladapterimp.hpp b/apps/opencs/model/world/nestedcoladapterimp.hpp
index 54780d290e..a5daefc3cd 100644
--- a/apps/opencs/model/world/nestedcoladapterimp.hpp
+++ b/apps/opencs/model/world/nestedcoladapterimp.hpp
@@ -3,12 +3,12 @@
 
 #include <QVariant>
 
-#include <components/esm/loadpgrd.hpp>
-#include <components/esm/effectlist.hpp>
-#include <components/esm/loadmgef.hpp> // for converting magic effect id to string & back
-#include <components/esm/loadskil.hpp> // for converting skill names
+#include <components/esm3/loadpgrd.hpp>
+#include <components/esm3/effectlist.hpp>
+#include <components/esm3/loadmgef.hpp> // for converting magic effect id to string & back
+#include <components/esm3/loadskil.hpp> // for converting skill names
 #include <components/esm/attr.hpp>     // for converting attributes
-#include <components/esm/loadrace.hpp>
+#include <components/esm3/loadrace.hpp>
 
 #include "nestedcolumnadapter.hpp"
 #include "nestedtablewrapper.hpp"
diff --git a/apps/opencs/model/world/pathgrid.hpp b/apps/opencs/model/world/pathgrid.hpp
index ce74d419e4..712b3969d6 100644
--- a/apps/opencs/model/world/pathgrid.hpp
+++ b/apps/opencs/model/world/pathgrid.hpp
@@ -4,7 +4,7 @@
 #include <vector>
 #include <string>
 
-#include <components/esm/loadpgrd.hpp>
+#include <components/esm3/loadpgrd.hpp>
 
 namespace CSMWorld
 {
diff --git a/apps/opencs/model/world/ref.hpp b/apps/opencs/model/world/ref.hpp
index 23b4ad1b5c..1eefe79f67 100644
--- a/apps/opencs/model/world/ref.hpp
+++ b/apps/opencs/model/world/ref.hpp
@@ -3,7 +3,7 @@
 
 #include <utility>
 
-#include <components/esm/cellref.hpp>
+#include <components/esm3/cellref.hpp>
 
 namespace CSMWorld
 {
diff --git a/apps/opencs/model/world/refcollection.cpp b/apps/opencs/model/world/refcollection.cpp
index c6f5148290..76a3b7311a 100644
--- a/apps/opencs/model/world/refcollection.cpp
+++ b/apps/opencs/model/world/refcollection.cpp
@@ -1,6 +1,6 @@
 #include "refcollection.hpp"
 
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadcell.hpp>
 
 #include "ref.hpp"
 #include "cell.hpp"
diff --git a/apps/opencs/model/world/refidadapterimp.cpp b/apps/opencs/model/world/refidadapterimp.cpp
index 0dfc9945f7..d2c2a46db7 100644
--- a/apps/opencs/model/world/refidadapterimp.cpp
+++ b/apps/opencs/model/world/refidadapterimp.cpp
@@ -4,8 +4,8 @@
 #include <stdexcept>
 #include <utility>
 
-#include <components/esm/loadcont.hpp>
-#include <components/esm/loadmgef.hpp>
+#include <components/esm3/loadcont.hpp>
+#include <components/esm3/loadmgef.hpp>
 
 #include "nestedtablewrapper.hpp"
 
diff --git a/apps/opencs/model/world/refidadapterimp.hpp b/apps/opencs/model/world/refidadapterimp.hpp
index 153d1bde91..55668d16d8 100644
--- a/apps/opencs/model/world/refidadapterimp.hpp
+++ b/apps/opencs/model/world/refidadapterimp.hpp
@@ -5,11 +5,11 @@
 
 #include <QVariant>
 
-#include <components/esm/loadalch.hpp>
-#include <components/esm/loadench.hpp>
-#include <components/esm/loadappa.hpp>
-#include <components/esm/loadnpc.hpp>
-#include <components/esm/loadcrea.hpp>
+#include <components/esm3/loadalch.hpp>
+#include <components/esm3/loadench.hpp>
+#include <components/esm3/loadappa.hpp>
+#include <components/esm3/loadnpc.hpp>
+#include <components/esm3/loadcrea.hpp>
 
 #include "columnbase.hpp"
 #include "record.hpp"
diff --git a/apps/opencs/model/world/refidcollection.cpp b/apps/opencs/model/world/refidcollection.cpp
index 928c7284ad..2e0c7e2028 100644
--- a/apps/opencs/model/world/refidcollection.cpp
+++ b/apps/opencs/model/world/refidcollection.cpp
@@ -4,7 +4,7 @@
 #include <memory>
 #include <string_view>
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 #include "refidadapter.hpp"
 #include "refidadapterimp.hpp"
diff --git a/apps/opencs/model/world/refiddata.hpp b/apps/opencs/model/world/refiddata.hpp
index b9dee80638..ff2232dffe 100644
--- a/apps/opencs/model/world/refiddata.hpp
+++ b/apps/opencs/model/world/refiddata.hpp
@@ -7,26 +7,26 @@
 #include <cassert>
 #include <string_view>
 
-#include <components/esm/loadacti.hpp>
-#include <components/esm/loadalch.hpp>
-#include <components/esm/loadappa.hpp>
-#include <components/esm/loadarmo.hpp>
-#include <components/esm/loadbook.hpp>
-#include <components/esm/loadclot.hpp>
-#include <components/esm/loadcont.hpp>
-#include <components/esm/loadcrea.hpp>
-#include <components/esm/loaddoor.hpp>
-#include <components/esm/loadingr.hpp>
-#include <components/esm/loadlevlist.hpp>
-#include <components/esm/loadligh.hpp>
-#include <components/esm/loadlock.hpp>
-#include <components/esm/loadprob.hpp>
-#include <components/esm/loadrepa.hpp>
-#include <components/esm/loadstat.hpp>
-#include <components/esm/loadweap.hpp>
-#include <components/esm/loadnpc.hpp>
-#include <components/esm/loadmisc.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/loadacti.hpp>
+#include <components/esm3/loadalch.hpp>
+#include <components/esm3/loadappa.hpp>
+#include <components/esm3/loadarmo.hpp>
+#include <components/esm3/loadbook.hpp>
+#include <components/esm3/loadclot.hpp>
+#include <components/esm3/loadcont.hpp>
+#include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loaddoor.hpp>
+#include <components/esm3/loadingr.hpp>
+#include <components/esm3/loadlevlist.hpp>
+#include <components/esm3/loadligh.hpp>
+#include <components/esm3/loadlock.hpp>
+#include <components/esm3/loadprob.hpp>
+#include <components/esm3/loadrepa.hpp>
+#include <components/esm3/loadstat.hpp>
+#include <components/esm3/loadweap.hpp>
+#include <components/esm3/loadnpc.hpp>
+#include <components/esm3/loadmisc.hpp>
+#include <components/esm3/esmwriter.hpp>
 
 #include <components/misc/stringops.hpp>
 
diff --git a/apps/opencs/view/render/actor.cpp b/apps/opencs/view/render/actor.cpp
index 94b82c96cd..d33c6f3f28 100644
--- a/apps/opencs/view/render/actor.cpp
+++ b/apps/opencs/view/render/actor.cpp
@@ -3,7 +3,7 @@
 #include <osg/Group>
 #include <osg/Node>
 
-#include <components/esm/mappings.hpp>
+#include <components/esm3/mappings.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcemanager.hpp>
 #include <components/resource/scenemanager.hpp>
diff --git a/apps/opencs/view/render/actor.hpp b/apps/opencs/view/render/actor.hpp
index 8172e6fff7..414cd438d7 100644
--- a/apps/opencs/view/render/actor.hpp
+++ b/apps/opencs/view/render/actor.hpp
@@ -8,7 +8,7 @@
 
 #include <QObject>
 
-#include <components/esm/loadarmo.hpp>
+#include <components/esm3/loadarmo.hpp>
 #include <components/sceneutil/visitor.hpp>
 
 #include "../../model/world/actoradapter.hpp"
diff --git a/apps/opencs/view/render/brushdraw.hpp b/apps/opencs/view/render/brushdraw.hpp
index 0551631cd9..f95a0c5a7c 100644
--- a/apps/opencs/view/render/brushdraw.hpp
+++ b/apps/opencs/view/render/brushdraw.hpp
@@ -4,7 +4,7 @@
 #include <osg/Group>
 #include <osg/Geometry>
 
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 #include "../widget/brushshapes.hpp"
 
 namespace CSVRender
diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index 2502dc1fd0..04e52bcd1f 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -8,8 +8,8 @@
 #include <osg/Group>
 
 #include <components/misc/stringops.hpp>
-#include <components/esm/loadcell.hpp>
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadcell.hpp>
+#include <components/esm3/loadland.hpp>
 #include <components/sceneutil/pathgridutil.hpp>
 #include <components/terrain/terraingrid.hpp>
 
diff --git a/apps/opencs/view/render/cellborder.cpp b/apps/opencs/view/render/cellborder.cpp
index d8ff638010..b93b5d1fcf 100644
--- a/apps/opencs/view/render/cellborder.cpp
+++ b/apps/opencs/view/render/cellborder.cpp
@@ -5,7 +5,7 @@
 #include <osg/Geometry>
 #include <osg/PrimitiveSet>
 
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 
 #include "mask.hpp"
 
diff --git a/apps/opencs/view/render/cellwater.cpp b/apps/opencs/view/render/cellwater.cpp
index f8857c3afc..9e4dbd9f14 100644
--- a/apps/opencs/view/render/cellwater.cpp
+++ b/apps/opencs/view/render/cellwater.cpp
@@ -5,7 +5,7 @@
 #include <osg/Group>
 #include <osg/PositionAttitudeTransform>
 
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 #include <components/fallback/fallback.hpp>
 #include <components/misc/stringops.hpp>
 #include <components/resource/imagemanager.hpp>
diff --git a/apps/opencs/view/render/commands.cpp b/apps/opencs/view/render/commands.cpp
index 699bf5d016..2820d7578d 100644
--- a/apps/opencs/view/render/commands.cpp
+++ b/apps/opencs/view/render/commands.cpp
@@ -3,7 +3,7 @@
 #include <QPointer>
 
 #include <components/debug/debuglog.hpp>
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 
 #include "editmode.hpp"
 #include "terrainselection.hpp"
diff --git a/apps/opencs/view/render/terrainselection.cpp b/apps/opencs/view/render/terrainselection.cpp
index 1fc183ba47..814b011de1 100644
--- a/apps/opencs/view/render/terrainselection.cpp
+++ b/apps/opencs/view/render/terrainselection.cpp
@@ -6,7 +6,7 @@
 #include <osg/Geometry>
 #include <osg/PositionAttitudeTransform>
 
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 
 #include "../../model/world/cellcoordinates.hpp"
 #include "../../model/world/columnimp.hpp"
diff --git a/apps/opencs/view/render/terrainselection.hpp b/apps/opencs/view/render/terrainselection.hpp
index 1d0da7bb59..4b4758e75e 100644
--- a/apps/opencs/view/render/terrainselection.hpp
+++ b/apps/opencs/view/render/terrainselection.hpp
@@ -8,7 +8,7 @@
 #include <osg/ref_ptr>
 #include <osg/PositionAttitudeTransform>
 
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 #include "../../model/world/cellcoordinates.hpp"
 
 namespace osg
diff --git a/apps/opencs/view/render/terrainshapemode.cpp b/apps/opencs/view/render/terrainshapemode.cpp
index 936e8d6778..9052cc5e6b 100644
--- a/apps/opencs/view/render/terrainshapemode.cpp
+++ b/apps/opencs/view/render/terrainshapemode.cpp
@@ -15,7 +15,7 @@
 #include <osg/Group>
 #include <osg/Vec3f>
 
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 #include <components/debug/debuglog.hpp>
 
 #include "../widget/brushshapes.hpp"
diff --git a/apps/opencs/view/world/dialoguecreator.cpp b/apps/opencs/view/world/dialoguecreator.cpp
index 7c6fb2e81f..82ebee8467 100644
--- a/apps/opencs/view/world/dialoguecreator.cpp
+++ b/apps/opencs/view/world/dialoguecreator.cpp
@@ -1,6 +1,6 @@
 #include "dialoguecreator.hpp"
 
-#include <components/esm/loaddial.hpp>
+#include <components/esm3/loaddial.hpp>
 
 #include "../../model/doc/document.hpp"
 
diff --git a/apps/opencs/view/world/globalcreator.cpp b/apps/opencs/view/world/globalcreator.cpp
index c7b140e156..20a5c75cf6 100644
--- a/apps/opencs/view/world/globalcreator.cpp
+++ b/apps/opencs/view/world/globalcreator.cpp
@@ -1,6 +1,6 @@
 #include "globalcreator.hpp"
 
-#include <components/esm/variant.hpp>
+#include <components/esm3/variant.hpp>
 
 #include "../../model/world/data.hpp"
 #include "../../model/world/commands.hpp"
diff --git a/apps/opencs/view/world/vartypedelegate.hpp b/apps/opencs/view/world/vartypedelegate.hpp
index 44705e80ec..5b0daec904 100644
--- a/apps/opencs/view/world/vartypedelegate.hpp
+++ b/apps/opencs/view/world/vartypedelegate.hpp
@@ -1,7 +1,7 @@
 #ifndef CSV_WORLD_VARTYPEDELEGATE_H
 #define CSV_WORLD_VARTYPEDELEGATE_H
 
-#include <components/esm/variant.hpp>
+#include <components/esm3/variant.hpp>
 
 #include "enumdelegate.hpp"
 
diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index d1747a2e39..1d9e4fae2d 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -8,7 +8,7 @@
 #include <set>
 #include <deque>
 
-#include <components/esm/cellid.hpp>
+#include <components/esm3/cellid.hpp>
 
 #include <osg/Timer>
 
diff --git a/apps/openmw/mwclass/activator.cpp b/apps/openmw/mwclass/activator.cpp
index 6c53ba72f3..a60c44265c 100644
--- a/apps/openmw/mwclass/activator.cpp
+++ b/apps/openmw/mwclass/activator.cpp
@@ -1,6 +1,6 @@
 #include "activator.hpp"
 
-#include <components/esm/loadacti.hpp>
+#include <components/esm3/loadacti.hpp>
 #include <components/misc/rng.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 
diff --git a/apps/openmw/mwclass/actor.cpp b/apps/openmw/mwclass/actor.cpp
index ad43bd6e5f..9b5e10e1c7 100644
--- a/apps/openmw/mwclass/actor.cpp
+++ b/apps/openmw/mwclass/actor.cpp
@@ -1,6 +1,6 @@
 #include "actor.hpp"
 
-#include <components/esm/loadmgef.hpp>
+#include <components/esm3/loadmgef.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwclass/actor.hpp b/apps/openmw/mwclass/actor.hpp
index 596bdf26ec..82055e2500 100644
--- a/apps/openmw/mwclass/actor.hpp
+++ b/apps/openmw/mwclass/actor.hpp
@@ -3,7 +3,7 @@
 
 #include "../mwworld/class.hpp"
 
-#include <components/esm/loadmgef.hpp>
+#include <components/esm3/loadmgef.hpp>
 
 namespace ESM
 {
diff --git a/apps/openmw/mwclass/apparatus.cpp b/apps/openmw/mwclass/apparatus.cpp
index 6e9d8b3779..76bee280bc 100644
--- a/apps/openmw/mwclass/apparatus.cpp
+++ b/apps/openmw/mwclass/apparatus.cpp
@@ -1,6 +1,6 @@
 #include "apparatus.hpp"
 
-#include <components/esm/loadappa.hpp>
+#include <components/esm3/loadappa.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index bc2d788b5b..5dfc5e12f1 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -1,8 +1,8 @@
 #include "armor.hpp"
 
-#include <components/esm/loadarmo.hpp>
-#include <components/esm/loadskil.hpp>
-#include <components/esm/loadgmst.hpp>
+#include <components/esm3/loadarmo.hpp>
+#include <components/esm3/loadskil.hpp>
+#include <components/esm3/loadgmst.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwclass/book.cpp b/apps/openmw/mwclass/book.cpp
index eef8e02808..3fcd7368d6 100644
--- a/apps/openmw/mwclass/book.cpp
+++ b/apps/openmw/mwclass/book.cpp
@@ -1,6 +1,6 @@
 #include "book.hpp"
 
-#include <components/esm/loadbook.hpp>
+#include <components/esm3/loadbook.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index ce8c79d02e..a5f5d828c9 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -1,6 +1,6 @@
 #include "clothing.hpp"
 
-#include <components/esm/loadclot.hpp>
+#include <components/esm3/loadclot.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index 0f45c25744..b043b4671d 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -1,7 +1,7 @@
 #include "container.hpp"
 
-#include <components/esm/loadcont.hpp>
-#include <components/esm/containerstate.hpp>
+#include <components/esm3/loadcont.hpp>
+#include <components/esm3/containerstate.hpp>
 #include <components/settings/settings.hpp>
 
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 03b7cfb069..ba13f5f6d9 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -2,8 +2,8 @@
 
 #include <components/misc/rng.hpp>
 #include <components/debug/debuglog.hpp>
-#include <components/esm/loadcrea.hpp>
-#include <components/esm/creaturestate.hpp>
+#include <components/esm3/loadcrea.hpp>
+#include <components/esm3/creaturestate.hpp>
 #include <components/settings/settings.hpp>
 
 #include "../mwmechanics/creaturestats.hpp"
diff --git a/apps/openmw/mwclass/creaturelevlist.cpp b/apps/openmw/mwclass/creaturelevlist.cpp
index ee33242126..66e35e5bf8 100644
--- a/apps/openmw/mwclass/creaturelevlist.cpp
+++ b/apps/openmw/mwclass/creaturelevlist.cpp
@@ -1,7 +1,7 @@
 #include "creaturelevlist.hpp"
 
-#include <components/esm/loadlevlist.hpp>
-#include <components/esm/creaturelevliststate.hpp>
+#include <components/esm3/loadlevlist.hpp>
+#include <components/esm3/creaturelevliststate.hpp>
 
 #include "../mwmechanics/levelledlist.hpp"
 
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index 01ff2aa440..81a45f3a30 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -1,7 +1,7 @@
 #include "door.hpp"
 
-#include <components/esm/loaddoor.hpp>
-#include <components/esm/doorstate.hpp>
+#include <components/esm3/loaddoor.hpp>
+#include <components/esm3/doorstate.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwclass/door.hpp b/apps/openmw/mwclass/door.hpp
index f9288a88ce..e09d0de6c0 100644
--- a/apps/openmw/mwclass/door.hpp
+++ b/apps/openmw/mwclass/door.hpp
@@ -1,7 +1,7 @@
 #ifndef GAME_MWCLASS_DOOR_H
 #define GAME_MWCLASS_DOOR_H
 
-#include <components/esm/loaddoor.hpp>
+#include <components/esm3/loaddoor.hpp>
 
 #include "../mwworld/class.hpp"
 
diff --git a/apps/openmw/mwclass/ingredient.cpp b/apps/openmw/mwclass/ingredient.cpp
index f582812934..424996e417 100644
--- a/apps/openmw/mwclass/ingredient.cpp
+++ b/apps/openmw/mwclass/ingredient.cpp
@@ -1,6 +1,6 @@
 #include "ingredient.hpp"
 
-#include <components/esm/loadingr.hpp>
+#include <components/esm3/loadingr.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwclass/itemlevlist.cpp b/apps/openmw/mwclass/itemlevlist.cpp
index 4ca45152a1..920c6a5d22 100644
--- a/apps/openmw/mwclass/itemlevlist.cpp
+++ b/apps/openmw/mwclass/itemlevlist.cpp
@@ -1,6 +1,6 @@
 #include "itemlevlist.hpp"
 
-#include <components/esm/loadlevlist.hpp>
+#include <components/esm3/loadlevlist.hpp>
 
 namespace MWClass
 {
diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index dbd4e8a184..26f41d30f7 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -1,7 +1,7 @@
 #include "light.hpp"
 
-#include <components/esm/loadligh.hpp>
-#include <components/esm/objectstate.hpp>
+#include <components/esm3/loadligh.hpp>
+#include <components/esm3/objectstate.hpp>
 #include <components/settings/settings.hpp>
 
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwclass/lockpick.cpp b/apps/openmw/mwclass/lockpick.cpp
index ccb5bbbd58..b97093ae2c 100644
--- a/apps/openmw/mwclass/lockpick.cpp
+++ b/apps/openmw/mwclass/lockpick.cpp
@@ -1,6 +1,6 @@
 #include "lockpick.hpp"
 
-#include <components/esm/loadlock.hpp>
+#include <components/esm3/loadlock.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
diff --git a/apps/openmw/mwclass/misc.cpp b/apps/openmw/mwclass/misc.cpp
index 30e68d2377..4fbe8ea04e 100644
--- a/apps/openmw/mwclass/misc.cpp
+++ b/apps/openmw/mwclass/misc.cpp
@@ -1,6 +1,6 @@
 #include "misc.hpp"
 
-#include <components/esm/loadmisc.hpp>
+#include <components/esm3/loadmisc.hpp>
 #include <components/settings/settings.hpp>
 
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index c46e3c0534..4cf191de9c 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -6,9 +6,9 @@
 #include <components/misc/rng.hpp>
 
 #include <components/debug/debuglog.hpp>
-#include <components/esm/loadmgef.hpp>
-#include <components/esm/loadnpc.hpp>
-#include <components/esm/npcstate.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadnpc.hpp>
+#include <components/esm3/npcstate.hpp>
 #include <components/settings/settings.hpp>
 
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwclass/potion.cpp b/apps/openmw/mwclass/potion.cpp
index e0f8cf8397..9e7aeffbe5 100644
--- a/apps/openmw/mwclass/potion.cpp
+++ b/apps/openmw/mwclass/potion.cpp
@@ -1,6 +1,6 @@
 #include "potion.hpp"
 
-#include <components/esm/loadalch.hpp>
+#include <components/esm3/loadalch.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwclass/probe.cpp b/apps/openmw/mwclass/probe.cpp
index 8291fb8f3c..f705e51435 100644
--- a/apps/openmw/mwclass/probe.cpp
+++ b/apps/openmw/mwclass/probe.cpp
@@ -1,6 +1,6 @@
 #include "probe.hpp"
 
-#include <components/esm/loadprob.hpp>
+#include <components/esm3/loadprob.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
diff --git a/apps/openmw/mwclass/repair.cpp b/apps/openmw/mwclass/repair.cpp
index 42581a8b6b..64fcd08d78 100644
--- a/apps/openmw/mwclass/repair.cpp
+++ b/apps/openmw/mwclass/repair.cpp
@@ -1,6 +1,6 @@
 #include "repair.hpp"
 
-#include <components/esm/loadrepa.hpp>
+#include <components/esm3/loadrepa.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
diff --git a/apps/openmw/mwclass/static.cpp b/apps/openmw/mwclass/static.cpp
index fc350c8351..0b77a5630d 100644
--- a/apps/openmw/mwclass/static.cpp
+++ b/apps/openmw/mwclass/static.cpp
@@ -1,6 +1,6 @@
 #include "static.hpp"
 
-#include <components/esm/loadstat.hpp>
+#include <components/esm3/loadstat.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 
 #include "../mwworld/ptr.hpp"
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index e7337c83b7..a0ec4bd0e5 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -1,6 +1,6 @@
 #include "weapon.hpp"
 
-#include <components/esm/loadweap.hpp>
+#include <components/esm3/loadweap.hpp>
 #include <components/misc/constants.hpp>
 #include <components/settings/settings.hpp>
 
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index 9800f1b39c..4612e2bdfd 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -5,10 +5,10 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/esm/loaddial.hpp>
-#include <components/esm/loadinfo.hpp>
-#include <components/esm/dialoguestate.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/loaddial.hpp>
+#include <components/esm3/loadinfo.hpp>
+#include <components/esm3/dialoguestate.hpp>
+#include <components/esm3/esmwriter.hpp>
 
 #include <components/compiler/exception.hpp>
 #include <components/compiler/errorhandler.hpp>
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.hpp b/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
index 57eb74d0a6..7a3e44349e 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
@@ -10,7 +10,7 @@
 #include <components/compiler/streamerrorhandler.hpp>
 #include <components/translation/translation.hpp>
 #include <components/misc/stringops.hpp>
-#include <components/esm/loadinfo.hpp>
+#include <components/esm3/loadinfo.hpp>
 
 #include "../mwworld/ptr.hpp"
 
diff --git a/apps/openmw/mwdialogue/hypertextparser.cpp b/apps/openmw/mwdialogue/hypertextparser.cpp
index 89a42bf2ea..732cdb1f8f 100644
--- a/apps/openmw/mwdialogue/hypertextparser.cpp
+++ b/apps/openmw/mwdialogue/hypertextparser.cpp
@@ -1,4 +1,4 @@
-#include <components/esm/loaddial.hpp>
+#include <components/esm3/loaddial.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwdialogue/journalentry.cpp b/apps/openmw/mwdialogue/journalentry.cpp
index 32b2b101d9..7af71d034e 100644
--- a/apps/openmw/mwdialogue/journalentry.cpp
+++ b/apps/openmw/mwdialogue/journalentry.cpp
@@ -2,7 +2,7 @@
 
 #include <stdexcept>
 
-#include <components/esm/journalentry.hpp>
+#include <components/esm3/journalentry.hpp>
 
 #include <components/interpreter/defines.hpp>
 
diff --git a/apps/openmw/mwdialogue/journalimp.cpp b/apps/openmw/mwdialogue/journalimp.cpp
index b219516183..9f4c8c3689 100644
--- a/apps/openmw/mwdialogue/journalimp.cpp
+++ b/apps/openmw/mwdialogue/journalimp.cpp
@@ -2,10 +2,10 @@
 
 #include <iterator>
 
-#include <components/esm/esmwriter.hpp>
-#include <components/esm/esmreader.hpp>
-#include <components/esm/queststate.hpp>
-#include <components/esm/journalentry.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/queststate.hpp>
+#include <components/esm3/journalentry.hpp>
 
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/class.hpp"
diff --git a/apps/openmw/mwdialogue/quest.cpp b/apps/openmw/mwdialogue/quest.cpp
index 5f20a8abb2..16e229ca7f 100644
--- a/apps/openmw/mwdialogue/quest.cpp
+++ b/apps/openmw/mwdialogue/quest.cpp
@@ -1,6 +1,6 @@
 #include "quest.hpp"
 
-#include <components/esm/queststate.hpp>
+#include <components/esm3/queststate.hpp>
 
 #include "../mwworld/esmstore.hpp"
 
diff --git a/apps/openmw/mwdialogue/selectwrapper.hpp b/apps/openmw/mwdialogue/selectwrapper.hpp
index ef787d8eec..dff484562d 100644
--- a/apps/openmw/mwdialogue/selectwrapper.hpp
+++ b/apps/openmw/mwdialogue/selectwrapper.hpp
@@ -1,7 +1,7 @@
 #ifndef GAME_MWDIALOGUE_SELECTWRAPPER_H
 #define GAME_MWDIALOGUE_SELECTWRAPPER_H
 
-#include <components/esm/loadinfo.hpp>
+#include <components/esm3/loadinfo.hpp>
 
 namespace MWDialogue
 {
diff --git a/apps/openmw/mwgui/bookwindow.cpp b/apps/openmw/mwgui/bookwindow.cpp
index 86089051d6..8dbb90ca6d 100644
--- a/apps/openmw/mwgui/bookwindow.cpp
+++ b/apps/openmw/mwgui/bookwindow.cpp
@@ -3,7 +3,7 @@
 #include <MyGUI_TextBox.h>
 #include <MyGUI_InputManager.h>
 
-#include <components/esm/loadbook.hpp>
+#include <components/esm3/loadbook.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwgui/charactercreation.hpp b/apps/openmw/mwgui/charactercreation.hpp
index beb8715fcd..a6c2d10c2f 100644
--- a/apps/openmw/mwgui/charactercreation.hpp
+++ b/apps/openmw/mwgui/charactercreation.hpp
@@ -1,7 +1,7 @@
 #ifndef CHARACTER_CREATION_HPP
 #define CHARACTER_CREATION_HPP
 
-#include <components/esm/loadclas.hpp>
+#include <components/esm3/loadclas.hpp>
 
 #include <map>
 #include <vector>
diff --git a/apps/openmw/mwgui/class.hpp b/apps/openmw/mwgui/class.hpp
index bb34a05530..4c5c23535f 100644
--- a/apps/openmw/mwgui/class.hpp
+++ b/apps/openmw/mwgui/class.hpp
@@ -2,7 +2,7 @@
 #define MWGUI_CLASS_H
 
 #include <components/esm/attr.hpp>
-#include <components/esm/loadclas.hpp>
+#include <components/esm3/loadclas.hpp>
 #include "widgets.hpp"
 #include "windowbase.hpp"
 
diff --git a/apps/openmw/mwgui/itemchargeview.cpp b/apps/openmw/mwgui/itemchargeview.cpp
index 44fa94f3a2..5f9788bc45 100644
--- a/apps/openmw/mwgui/itemchargeview.cpp
+++ b/apps/openmw/mwgui/itemchargeview.cpp
@@ -7,7 +7,7 @@
 #include <MyGUI_ScrollView.h>
 #include <MyGUI_FactoryManager.h>
 
-#include <components/esm/loadench.hpp>
+#include <components/esm3/loadench.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index 388bbc7d48..2aa1b51950 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -11,8 +11,8 @@
 #include <MyGUI_RotatingSkin.h>
 #include <MyGUI_FactoryManager.h>
 
-#include <components/esm/globalmap.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/globalmap.hpp>
+#include <components/esm3/esmwriter.hpp>
 #include <components/settings/settings.hpp>
 #include <components/myguiplatform/myguitexture.hpp>
 
diff --git a/apps/openmw/mwgui/mapwindow.hpp b/apps/openmw/mwgui/mapwindow.hpp
index 61f48d5279..3c3d278476 100644
--- a/apps/openmw/mwgui/mapwindow.hpp
+++ b/apps/openmw/mwgui/mapwindow.hpp
@@ -8,9 +8,9 @@
 
 #include "windowpinnablebase.hpp"
 
-#include <components/esm/cellid.hpp>
+#include <components/esm3/cellid.hpp>
 
-#include <components/esm/custommarkerstate.hpp>
+#include <components/esm3/custommarkerstate.hpp>
 #include <components/misc/constants.hpp>
 
 namespace MWRender
diff --git a/apps/openmw/mwgui/merchantrepair.cpp b/apps/openmw/mwgui/merchantrepair.cpp
index e737cb2b29..1542312efe 100644
--- a/apps/openmw/mwgui/merchantrepair.cpp
+++ b/apps/openmw/mwgui/merchantrepair.cpp
@@ -1,6 +1,6 @@
 #include "merchantrepair.hpp"
 
-#include <components/esm/loadgmst.hpp>
+#include <components/esm3/loadgmst.hpp>
 
 #include <MyGUI_Button.h>
 #include <MyGUI_ScrollView.h>
diff --git a/apps/openmw/mwgui/pickpocketitemmodel.cpp b/apps/openmw/mwgui/pickpocketitemmodel.cpp
index 5daea8f3f8..5ba1b4aafa 100644
--- a/apps/openmw/mwgui/pickpocketitemmodel.cpp
+++ b/apps/openmw/mwgui/pickpocketitemmodel.cpp
@@ -1,7 +1,7 @@
 #include "pickpocketitemmodel.hpp"
 
 #include <components/misc/rng.hpp>
-#include <components/esm/loadskil.hpp>
+#include <components/esm3/loadskil.hpp>
 
 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/creaturestats.hpp"
diff --git a/apps/openmw/mwgui/quickkeysmenu.cpp b/apps/openmw/mwgui/quickkeysmenu.cpp
index e55b9b4878..99876e0c85 100644
--- a/apps/openmw/mwgui/quickkeysmenu.cpp
+++ b/apps/openmw/mwgui/quickkeysmenu.cpp
@@ -6,8 +6,8 @@
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_RenderManager.h>
 
-#include <components/esm/esmwriter.hpp>
-#include <components/esm/quickkeys.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/esm3/quickkeys.hpp>
 
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/class.hpp"
diff --git a/apps/openmw/mwgui/review.hpp b/apps/openmw/mwgui/review.hpp
index cb847536d3..cf3d693e97 100644
--- a/apps/openmw/mwgui/review.hpp
+++ b/apps/openmw/mwgui/review.hpp
@@ -2,7 +2,7 @@
 #define MWGUI_REVIEW_H
 
 #include <components/esm/attr.hpp>
-#include <components/esm/loadclas.hpp>
+#include <components/esm3/loadclas.hpp>
 #include "windowbase.hpp"
 #include "widgets.hpp"
 
diff --git a/apps/openmw/mwgui/scrollwindow.cpp b/apps/openmw/mwgui/scrollwindow.cpp
index f2c967da4e..df703dcb61 100644
--- a/apps/openmw/mwgui/scrollwindow.cpp
+++ b/apps/openmw/mwgui/scrollwindow.cpp
@@ -2,7 +2,7 @@
 
 #include <MyGUI_ScrollView.h>
 
-#include <components/esm/loadbook.hpp>
+#include <components/esm3/loadbook.hpp>
 #include <components/widgets/imagebutton.hpp>
 
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwgui/sortfilteritemmodel.cpp b/apps/openmw/mwgui/sortfilteritemmodel.cpp
index 9d6ed49d3d..c804eafb72 100644
--- a/apps/openmw/mwgui/sortfilteritemmodel.cpp
+++ b/apps/openmw/mwgui/sortfilteritemmodel.cpp
@@ -3,19 +3,19 @@
 #include <components/misc/stringops.hpp>
 #include <components/misc/utf8stream.hpp>
 #include <components/debug/debuglog.hpp>
-#include <components/esm/loadalch.hpp>
-#include <components/esm/loadappa.hpp>
-#include <components/esm/loadarmo.hpp>
-#include <components/esm/loadbook.hpp>
-#include <components/esm/loadclot.hpp>
-#include <components/esm/loadingr.hpp>
-#include <components/esm/loadlock.hpp>
-#include <components/esm/loadligh.hpp>
-#include <components/esm/loadmisc.hpp>
-#include <components/esm/loadprob.hpp>
-#include <components/esm/loadrepa.hpp>
-#include <components/esm/loadweap.hpp>
-#include <components/esm/loadench.hpp>
+#include <components/esm3/loadalch.hpp>
+#include <components/esm3/loadappa.hpp>
+#include <components/esm3/loadarmo.hpp>
+#include <components/esm3/loadbook.hpp>
+#include <components/esm3/loadclot.hpp>
+#include <components/esm3/loadingr.hpp>
+#include <components/esm3/loadlock.hpp>
+#include <components/esm3/loadligh.hpp>
+#include <components/esm3/loadmisc.hpp>
+#include <components/esm3/loadprob.hpp>
+#include <components/esm3/loadrepa.hpp>
+#include <components/esm3/loadweap.hpp>
+#include <components/esm3/loadench.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwgui/spellcreationdialog.hpp b/apps/openmw/mwgui/spellcreationdialog.hpp
index 73352ac238..1dd16c33cd 100644
--- a/apps/openmw/mwgui/spellcreationdialog.hpp
+++ b/apps/openmw/mwgui/spellcreationdialog.hpp
@@ -1,8 +1,8 @@
 #ifndef MWGUI_SPELLCREATION_H
 #define MWGUI_SPELLCREATION_H
 
-#include <components/esm/loadmgef.hpp>
-#include <components/esm/loadspel.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadspel.hpp>
 
 #include "windowbase.hpp"
 #include "referenceinterface.hpp"
diff --git a/apps/openmw/mwgui/spellicons.cpp b/apps/openmw/mwgui/spellicons.cpp
index 0673446fe7..acc5131a22 100644
--- a/apps/openmw/mwgui/spellicons.cpp
+++ b/apps/openmw/mwgui/spellicons.cpp
@@ -5,7 +5,7 @@
 
 #include <MyGUI_ImageBox.h>
 
-#include <components/esm/loadmgef.hpp>
+#include <components/esm3/loadmgef.hpp>
 #include <components/settings/settings.hpp>
 
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwgui/spellmodel.hpp b/apps/openmw/mwgui/spellmodel.hpp
index 2404610bf1..af8000c278 100644
--- a/apps/openmw/mwgui/spellmodel.hpp
+++ b/apps/openmw/mwgui/spellmodel.hpp
@@ -2,7 +2,7 @@
 #define OPENMW_GUI_SPELLMODEL_H
 
 #include "../mwworld/ptr.hpp"
-#include <components/esm/effectlist.hpp>
+#include <components/esm3/effectlist.hpp>
 
 namespace MWGui
 {
diff --git a/apps/openmw/mwgui/statswatcher.hpp b/apps/openmw/mwgui/statswatcher.hpp
index 353779d877..6262a50565 100644
--- a/apps/openmw/mwgui/statswatcher.hpp
+++ b/apps/openmw/mwgui/statswatcher.hpp
@@ -4,7 +4,7 @@
 #include <set>
 
 #include <components/esm/attr.hpp>
-#include <components/esm/loadskil.hpp>
+#include <components/esm3/loadskil.hpp>
 
 #include "../mwmechanics/stat.hpp"
 
diff --git a/apps/openmw/mwgui/widgets.hpp b/apps/openmw/mwgui/widgets.hpp
index 3c55287159..2f27cc029c 100644
--- a/apps/openmw/mwgui/widgets.hpp
+++ b/apps/openmw/mwgui/widgets.hpp
@@ -3,8 +3,8 @@
 
 #include "../mwmechanics/stat.hpp"
 
-#include <components/esm/effectlist.hpp>
-#include <components/esm/loadskil.hpp>
+#include <components/esm3/effectlist.hpp>
+#include <components/esm3/loadskil.hpp>
 
 #include <MyGUI_Button.h>
 #include <MyGUI_EditBox.h>
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 37807fdf2a..c2f7785da3 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -28,8 +28,8 @@
 #include <components/sdlutil/sdlcursormanager.hpp>
 #include <components/sdlutil/sdlvideowrapper.hpp>
 
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 
 #include <components/fontloader/fontloader.hpp>
 
diff --git a/apps/openmw/mwinput/controlswitch.cpp b/apps/openmw/mwinput/controlswitch.cpp
index 6c22e133bc..da8df3ac6b 100644
--- a/apps/openmw/mwinput/controlswitch.cpp
+++ b/apps/openmw/mwinput/controlswitch.cpp
@@ -1,8 +1,8 @@
 #include "controlswitch.hpp"
 
-#include <components/esm/esmwriter.hpp>
-#include <components/esm/esmreader.hpp>
-#include <components/esm/controlsstate.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/controlsstate.hpp>
 
 #include <components/loadinglistener/loadinglistener.hpp>
 
diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index 4ebe56bf94..31170cafa2 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -3,8 +3,8 @@
 #include <osgViewer/ViewerEventHandlers>
 
 #include <components/sdlutil/sdlinputwrapper.hpp>
-#include <components/esm/esmwriter.hpp>
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
 
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwlua/cellbindings.cpp b/apps/openmw/mwlua/cellbindings.cpp
index 4ca9018cad..dbcbbab644 100644
--- a/apps/openmw/mwlua/cellbindings.cpp
+++ b/apps/openmw/mwlua/cellbindings.cpp
@@ -1,6 +1,6 @@
 #include "luabindings.hpp"
 
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadcell.hpp>
 
 #include "../mwworld/cellstore.hpp"
 
diff --git a/apps/openmw/mwlua/eventqueue.cpp b/apps/openmw/mwlua/eventqueue.cpp
index 1c136551c4..86086f29db 100644
--- a/apps/openmw/mwlua/eventqueue.cpp
+++ b/apps/openmw/mwlua/eventqueue.cpp
@@ -2,8 +2,8 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 #include <components/esm/luascripts.hpp>
 
 #include <components/lua/serialization.hpp>
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 8211c37abf..944a75837e 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -4,8 +4,8 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 #include <components/esm/luascripts.hpp>
 
 #include <components/settings/settings.hpp>
diff --git a/apps/openmw/mwlua/object.cpp b/apps/openmw/mwlua/object.cpp
index 69206e8c37..5d413a4aea 100644
--- a/apps/openmw/mwlua/object.cpp
+++ b/apps/openmw/mwlua/object.cpp
@@ -142,7 +142,7 @@ namespace MWLua
         }
         else
         {
-            // TODO: If Ptr is empty then try to load the object from esp/esm.
+            // TODO: If Ptr is empty then try to load the object from esp/esm3.
         }
         return ptr;
     }
diff --git a/apps/openmw/mwlua/object.hpp b/apps/openmw/mwlua/object.hpp
index 5b1b5df74e..e87721e381 100644
--- a/apps/openmw/mwlua/object.hpp
+++ b/apps/openmw/mwlua/object.hpp
@@ -3,7 +3,7 @@
 
 #include <typeindex>
 
-#include <components/esm/cellref.hpp>
+#include <components/esm3/cellref.hpp>
 #include <components/esm/defs.hpp>
 #include <components/esm/luascripts.hpp>
 
diff --git a/apps/openmw/mwlua/worldview.cpp b/apps/openmw/mwlua/worldview.cpp
index 35b1db7a93..be712386c0 100644
--- a/apps/openmw/mwlua/worldview.cpp
+++ b/apps/openmw/mwlua/worldview.cpp
@@ -1,8 +1,8 @@
 #include "worldview.hpp"
 
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/esm3/loadcell.hpp>
 
 #include "../mwbase/windowmanager.hpp"
 
diff --git a/apps/openmw/mwmechanics/activespells.cpp b/apps/openmw/mwmechanics/activespells.cpp
index 0c781e81bd..d0cdb4b8bb 100644
--- a/apps/openmw/mwmechanics/activespells.cpp
+++ b/apps/openmw/mwmechanics/activespells.cpp
@@ -7,7 +7,7 @@
 #include <components/misc/rng.hpp>
 #include <components/misc/stringops.hpp>
 
-#include <components/esm/loadmgef.hpp>
+#include <components/esm3/loadmgef.hpp>
 
 #include <components/settings/settings.hpp>
 
diff --git a/apps/openmw/mwmechanics/activespells.hpp b/apps/openmw/mwmechanics/activespells.hpp
index 524bdc0475..5fb732ea8a 100644
--- a/apps/openmw/mwmechanics/activespells.hpp
+++ b/apps/openmw/mwmechanics/activespells.hpp
@@ -8,7 +8,7 @@
 #include <variant>
 #include <vector>
 
-#include <components/esm/activespells.hpp>
+#include <components/esm3/activespells.hpp>
 
 #include "../mwworld/timestamp.hpp"
 #include "../mwworld/ptr.hpp"
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index d5d434e128..7c94c4e604 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -2,8 +2,8 @@
 
 #include <optional>
 
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 
 #include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/debug/debuglog.hpp>
diff --git a/apps/openmw/mwmechanics/actorutil.hpp b/apps/openmw/mwmechanics/actorutil.hpp
index a66d8866bf..91770ddfec 100644
--- a/apps/openmw/mwmechanics/actorutil.hpp
+++ b/apps/openmw/mwmechanics/actorutil.hpp
@@ -3,9 +3,9 @@
 
 #include <algorithm>
 
-#include <components/esm/loadcont.hpp>
-#include <components/esm/loadcrea.hpp>
-#include <components/esm/loadnpc.hpp>
+#include <components/esm3/loadcont.hpp>
+#include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loadnpc.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwmechanics/aiactivate.cpp b/apps/openmw/mwmechanics/aiactivate.cpp
index 06aef0cdb0..59ad0c1ada 100644
--- a/apps/openmw/mwmechanics/aiactivate.cpp
+++ b/apps/openmw/mwmechanics/aiactivate.cpp
@@ -1,6 +1,6 @@
 #include "aiactivate.hpp"
 
-#include <components/esm/aisequence.hpp>
+#include <components/esm3/aisequence.hpp>
 
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index 9eb8a00763..46f04b6f97 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -3,7 +3,7 @@
 #include <components/misc/rng.hpp>
 #include <components/misc/coordinateconverter.hpp>
 
-#include <components/esm/aisequence.hpp>
+#include <components/esm3/aisequence.hpp>
 
 #include <components/misc/mathutil.hpp>
 
diff --git a/apps/openmw/mwmechanics/aicombataction.cpp b/apps/openmw/mwmechanics/aicombataction.cpp
index e6176c869c..3be68f8394 100644
--- a/apps/openmw/mwmechanics/aicombataction.cpp
+++ b/apps/openmw/mwmechanics/aicombataction.cpp
@@ -1,7 +1,7 @@
 #include "aicombataction.hpp"
 
-#include <components/esm/loadench.hpp>
-#include <components/esm/loadmgef.hpp>
+#include <components/esm3/loadench.hpp>
+#include <components/esm3/loadmgef.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwmechanics/aiescort.cpp b/apps/openmw/mwmechanics/aiescort.cpp
index 0184c6e66f..97bb101f06 100644
--- a/apps/openmw/mwmechanics/aiescort.cpp
+++ b/apps/openmw/mwmechanics/aiescort.cpp
@@ -1,7 +1,7 @@
 #include "aiescort.hpp"
 
-#include <components/esm/aisequence.hpp>
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/aisequence.hpp>
+#include <components/esm3/loadcell.hpp>
 
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwmechanics/aifollow.cpp b/apps/openmw/mwmechanics/aifollow.cpp
index 43a0f25c62..b6e1b124c6 100644
--- a/apps/openmw/mwmechanics/aifollow.cpp
+++ b/apps/openmw/mwmechanics/aifollow.cpp
@@ -1,7 +1,7 @@
 #include "aifollow.hpp"
 
-#include <components/esm/aisequence.hpp>
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/aisequence.hpp>
+#include <components/esm3/loadcell.hpp>
 
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index b1f4355a39..e8e03daad6 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -1,7 +1,7 @@
 #include "aipackage.hpp"
 
-#include <components/esm/loadcell.hpp>
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadcell.hpp>
+#include <components/esm3/loadland.hpp>
 #include <components/detournavigator/navigator.hpp>
 #include <components/misc/coordinateconverter.hpp>
 #include <components/settings/settings.hpp>
diff --git a/apps/openmw/mwmechanics/aipursue.cpp b/apps/openmw/mwmechanics/aipursue.cpp
index 2d896ddbdc..3343b3cec0 100644
--- a/apps/openmw/mwmechanics/aipursue.cpp
+++ b/apps/openmw/mwmechanics/aipursue.cpp
@@ -1,6 +1,6 @@
 #include "aipursue.hpp"
 
-#include <components/esm/aisequence.hpp>
+#include <components/esm3/aisequence.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index 545ec7f140..2cb18f1e78 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -3,7 +3,7 @@
 #include <limits>
 
 #include <components/debug/debuglog.hpp>
-#include <components/esm/aisequence.hpp>
+#include <components/esm3/aisequence.hpp>
 
 #include "aipackage.hpp"
 #include "aistate.hpp"
diff --git a/apps/openmw/mwmechanics/aisequence.hpp b/apps/openmw/mwmechanics/aisequence.hpp
index 77f6b2f7c0..853509ed80 100644
--- a/apps/openmw/mwmechanics/aisequence.hpp
+++ b/apps/openmw/mwmechanics/aisequence.hpp
@@ -7,7 +7,7 @@
 #include "aistate.hpp"
 #include "aipackagetypeid.hpp"
 
-#include <components/esm/loadnpc.hpp>
+#include <components/esm3/loadnpc.hpp>
 
 namespace MWWorld
 {
diff --git a/apps/openmw/mwmechanics/aitravel.cpp b/apps/openmw/mwmechanics/aitravel.cpp
index 0b4a1411eb..d420771bd4 100644
--- a/apps/openmw/mwmechanics/aitravel.cpp
+++ b/apps/openmw/mwmechanics/aitravel.cpp
@@ -2,7 +2,7 @@
 
 #include <algorithm>
 
-#include <components/esm/aisequence.hpp>
+#include <components/esm3/aisequence.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 664ae105f3..c2f0beb179 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -4,7 +4,7 @@
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/rng.hpp>
-#include <components/esm/aisequence.hpp>
+#include <components/esm3/aisequence.hpp>
 #include <components/detournavigator/navigatorutils.hpp>
 #include <components/misc/coordinateconverter.hpp>
 
diff --git a/apps/openmw/mwmechanics/alchemy.cpp b/apps/openmw/mwmechanics/alchemy.cpp
index 61fec3b543..f513554c12 100644
--- a/apps/openmw/mwmechanics/alchemy.cpp
+++ b/apps/openmw/mwmechanics/alchemy.cpp
@@ -9,10 +9,10 @@
 
 #include <components/misc/rng.hpp>
 
-#include <components/esm/loadskil.hpp>
-#include <components/esm/loadappa.hpp>
-#include <components/esm/loadgmst.hpp>
-#include <components/esm/loadmgef.hpp>
+#include <components/esm3/loadskil.hpp>
+#include <components/esm3/loadappa.hpp>
+#include <components/esm3/loadgmst.hpp>
+#include <components/esm3/loadmgef.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwmechanics/alchemy.hpp b/apps/openmw/mwmechanics/alchemy.hpp
index d23f978ead..8c91a81177 100644
--- a/apps/openmw/mwmechanics/alchemy.hpp
+++ b/apps/openmw/mwmechanics/alchemy.hpp
@@ -4,7 +4,7 @@
 #include <vector>
 #include <set>
 
-#include <components/esm/effectlist.hpp>
+#include <components/esm3/effectlist.hpp>
 
 #include "../mwworld/ptr.hpp"
 
diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index 570547e0d9..03c2d3f41f 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -2,9 +2,9 @@
 
 #include <algorithm>
 
-#include <components/esm/creaturestats.hpp>
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/creaturestats.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
diff --git a/apps/openmw/mwmechanics/creaturestats.hpp b/apps/openmw/mwmechanics/creaturestats.hpp
index 0543a31ba2..002991e004 100644
--- a/apps/openmw/mwmechanics/creaturestats.hpp
+++ b/apps/openmw/mwmechanics/creaturestats.hpp
@@ -14,7 +14,7 @@
 #include "drawstate.hpp"
 
 #include <components/esm/attr.hpp>
-#include <components/esm/magiceffects.hpp>
+#include <components/esm3/magiceffects.hpp>
 
 namespace ESM
 {
diff --git a/apps/openmw/mwmechanics/enchanting.hpp b/apps/openmw/mwmechanics/enchanting.hpp
index 256c5dad48..5e1a6fa239 100644
--- a/apps/openmw/mwmechanics/enchanting.hpp
+++ b/apps/openmw/mwmechanics/enchanting.hpp
@@ -3,8 +3,8 @@
 
 #include <string>
 
-#include <components/esm/effectlist.hpp>
-#include <components/esm/loadench.hpp>
+#include <components/esm3/effectlist.hpp>
+#include <components/esm3/loadench.hpp>
 
 #include "../mwworld/ptr.hpp"
 
diff --git a/apps/openmw/mwmechanics/magiceffects.cpp b/apps/openmw/mwmechanics/magiceffects.cpp
index e9e0be397e..d4b89c56d0 100644
--- a/apps/openmw/mwmechanics/magiceffects.cpp
+++ b/apps/openmw/mwmechanics/magiceffects.cpp
@@ -3,8 +3,8 @@
 #include <cmath>
 #include <stdexcept>
 
-#include <components/esm/effectlist.hpp>
-#include <components/esm/magiceffects.hpp>
+#include <components/esm3/effectlist.hpp>
+#include <components/esm3/magiceffects.hpp>
 
 namespace
 {
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index e0d2da497b..0816445271 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -4,8 +4,8 @@
 
 #include <components/misc/rng.hpp>
 
-#include <components/esm/esmwriter.hpp>
-#include <components/esm/stolenitems.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/esm3/stolenitems.hpp>
 
 #include <components/detournavigator/navigator.hpp>
 
diff --git a/apps/openmw/mwmechanics/npcstats.cpp b/apps/openmw/mwmechanics/npcstats.cpp
index 1d1dfacce8..ef49381eff 100644
--- a/apps/openmw/mwmechanics/npcstats.cpp
+++ b/apps/openmw/mwmechanics/npcstats.cpp
@@ -2,10 +2,10 @@
 
 #include <iomanip>
 
-#include <components/esm/loadclas.hpp>
-#include <components/esm/loadgmst.hpp>
-#include <components/esm/loadfact.hpp>
-#include <components/esm/npcstats.hpp>
+#include <components/esm3/loadclas.hpp>
+#include <components/esm3/loadgmst.hpp>
+#include <components/esm3/loadfact.hpp>
+#include <components/esm3/npcstats.hpp>
 
 #include "../mwworld/esmstore.hpp"
 
diff --git a/apps/openmw/mwmechanics/objects.cpp b/apps/openmw/mwmechanics/objects.cpp
index 9125eb527b..2b5157b4ec 100644
--- a/apps/openmw/mwmechanics/objects.cpp
+++ b/apps/openmw/mwmechanics/objects.cpp
@@ -1,7 +1,7 @@
 #include "objects.hpp"
 
 #include <components/debug/debuglog.hpp>
-#include <components/esm/loadcont.hpp>
+#include <components/esm3/loadcont.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
diff --git a/apps/openmw/mwmechanics/pathfinding.hpp b/apps/openmw/mwmechanics/pathfinding.hpp
index f0a5040334..17b355682a 100644
--- a/apps/openmw/mwmechanics/pathfinding.hpp
+++ b/apps/openmw/mwmechanics/pathfinding.hpp
@@ -9,7 +9,7 @@
 #include <components/detournavigator/areatype.hpp>
 #include <components/detournavigator/status.hpp>
 #include <components/esm/defs.hpp>
-#include <components/esm/loadpgrd.hpp>
+#include <components/esm3/loadpgrd.hpp>
 
 namespace MWWorld
 {
diff --git a/apps/openmw/mwmechanics/pathgrid.hpp b/apps/openmw/mwmechanics/pathgrid.hpp
index 050504617e..dfe958e745 100644
--- a/apps/openmw/mwmechanics/pathgrid.hpp
+++ b/apps/openmw/mwmechanics/pathgrid.hpp
@@ -3,7 +3,7 @@
 
 #include <deque>
 
-#include <components/esm/loadpgrd.hpp>
+#include <components/esm3/loadpgrd.hpp>
 
 namespace ESM
 {
diff --git a/apps/openmw/mwmechanics/spellcasting.hpp b/apps/openmw/mwmechanics/spellcasting.hpp
index 4d9cc3a7de..8dfd2b3f0c 100644
--- a/apps/openmw/mwmechanics/spellcasting.hpp
+++ b/apps/openmw/mwmechanics/spellcasting.hpp
@@ -1,8 +1,8 @@
 #ifndef MWMECHANICS_SPELLCASTING_H
 #define MWMECHANICS_SPELLCASTING_H
 
-#include <components/esm/activespells.hpp>
-#include <components/esm/effectlist.hpp>
+#include <components/esm3/activespells.hpp>
+#include <components/esm3/effectlist.hpp>
 
 #include "../mwworld/ptr.hpp"
 
diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp
index 7e5f89b39b..95ed3ca06e 100644
--- a/apps/openmw/mwmechanics/spelleffects.cpp
+++ b/apps/openmw/mwmechanics/spelleffects.cpp
@@ -2,7 +2,7 @@
 
 #include <algorithm>
 
-#include <components/esm/loadmgef.hpp>
+#include <components/esm3/loadmgef.hpp>
 #include <components/misc/rng.hpp>
 #include <components/settings/settings.hpp>
 
diff --git a/apps/openmw/mwmechanics/spelllist.cpp b/apps/openmw/mwmechanics/spelllist.cpp
index 9328d533e3..f90bb22f05 100644
--- a/apps/openmw/mwmechanics/spelllist.cpp
+++ b/apps/openmw/mwmechanics/spelllist.cpp
@@ -2,7 +2,7 @@
 
 #include <algorithm>
 
-#include <components/esm/loadspel.hpp>
+#include <components/esm3/loadspel.hpp>
 
 #include "spells.hpp"
 
diff --git a/apps/openmw/mwmechanics/spelllist.hpp b/apps/openmw/mwmechanics/spelllist.hpp
index f5759fd7ee..b43a0bf14f 100644
--- a/apps/openmw/mwmechanics/spelllist.hpp
+++ b/apps/openmw/mwmechanics/spelllist.hpp
@@ -7,7 +7,7 @@
 #include <set>
 #include <vector>
 
-#include <components/esm/loadspel.hpp>
+#include <components/esm3/loadspel.hpp>
 
 namespace ESM
 {
diff --git a/apps/openmw/mwmechanics/spellpriority.cpp b/apps/openmw/mwmechanics/spellpriority.cpp
index b79af49b05..0f44ee7d07 100644
--- a/apps/openmw/mwmechanics/spellpriority.cpp
+++ b/apps/openmw/mwmechanics/spellpriority.cpp
@@ -1,9 +1,9 @@
 #include "spellpriority.hpp"
 #include "weaponpriority.hpp"
 
-#include <components/esm/loadench.hpp>
-#include <components/esm/loadmgef.hpp>
-#include <components/esm/loadspel.hpp>
+#include <components/esm3/loadench.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadspel.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwmechanics/spells.cpp b/apps/openmw/mwmechanics/spells.cpp
index 6520ae3ab3..133fc5e931 100644
--- a/apps/openmw/mwmechanics/spells.cpp
+++ b/apps/openmw/mwmechanics/spells.cpp
@@ -1,8 +1,8 @@
 #include "spells.hpp"
 
 #include <components/debug/debuglog.hpp>
-#include <components/esm/loadspel.hpp>
-#include <components/esm/spellstate.hpp>
+#include <components/esm3/loadspel.hpp>
+#include <components/esm3/spellstate.hpp>
 #include <components/misc/rng.hpp>
 #include <components/misc/stringops.hpp>
 
diff --git a/apps/openmw/mwmechanics/spellutil.hpp b/apps/openmw/mwmechanics/spellutil.hpp
index bcc531087c..571e02d166 100644
--- a/apps/openmw/mwmechanics/spellutil.hpp
+++ b/apps/openmw/mwmechanics/spellutil.hpp
@@ -1,7 +1,7 @@
 #ifndef MWMECHANICS_SPELLUTIL_H
 #define MWMECHANICS_SPELLUTIL_H
 
-#include <components/esm/loadskil.hpp>
+#include <components/esm3/loadskil.hpp>
 
 namespace ESM
 {
diff --git a/apps/openmw/mwmechanics/stat.cpp b/apps/openmw/mwmechanics/stat.cpp
index ee484f5afd..b5285330df 100644
--- a/apps/openmw/mwmechanics/stat.cpp
+++ b/apps/openmw/mwmechanics/stat.cpp
@@ -1,6 +1,6 @@
 #include "stat.hpp"
 
-#include <components/esm/statstate.hpp>
+#include <components/esm3/statstate.hpp>
 
 namespace MWMechanics
 {
diff --git a/apps/openmw/mwmechanics/summoning.hpp b/apps/openmw/mwmechanics/summoning.hpp
index 3186eef986..091ee98185 100644
--- a/apps/openmw/mwmechanics/summoning.hpp
+++ b/apps/openmw/mwmechanics/summoning.hpp
@@ -5,7 +5,7 @@
 
 #include "../mwworld/ptr.hpp"
 
-#include <components/esm/magiceffects.hpp>
+#include <components/esm3/magiceffects.hpp>
 
 #include "magiceffects.hpp"
 
diff --git a/apps/openmw/mwmechanics/weaponpriority.cpp b/apps/openmw/mwmechanics/weaponpriority.cpp
index 1a17cc87e6..024d837fe7 100644
--- a/apps/openmw/mwmechanics/weaponpriority.cpp
+++ b/apps/openmw/mwmechanics/weaponpriority.cpp
@@ -1,6 +1,6 @@
 #include "weaponpriority.hpp"
 
-#include <components/esm/loadench.hpp>
+#include <components/esm3/loadench.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwphysics/movementsolver.cpp b/apps/openmw/mwphysics/movementsolver.cpp
index 2f2abca487..fd8a7f2b05 100644
--- a/apps/openmw/mwphysics/movementsolver.cpp
+++ b/apps/openmw/mwphysics/movementsolver.cpp
@@ -5,7 +5,7 @@
 #include <BulletCollision/CollisionShapes/btCollisionShape.h>
 #include <BulletCollision/CollisionShapes/btConvexShape.h>
 
-#include <components/esm/loadgmst.hpp>
+#include <components/esm3/loadgmst.hpp>
 #include <components/misc/convert.hpp>
 
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 98e3bcf737..195af630f5 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -22,7 +22,7 @@
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/bulletshapemanager.hpp>
 #include <components/debug/debuglog.hpp>
-#include <components/esm/loadgmst.hpp>
+#include <components/esm3/loadgmst.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/misc/convert.hpp>
 
diff --git a/apps/openmw/mwrender/actoranimation.cpp b/apps/openmw/mwrender/actoranimation.cpp
index 25a9904e26..88e1d10d81 100644
--- a/apps/openmw/mwrender/actoranimation.cpp
+++ b/apps/openmw/mwrender/actoranimation.cpp
@@ -5,8 +5,8 @@
 #include <osg/Group>
 #include <osg/Vec4f>
 
-#include <components/esm/loadligh.hpp>
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadligh.hpp>
+#include <components/esm3/loadcell.hpp>
 
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
diff --git a/apps/openmw/mwrender/characterpreview.hpp b/apps/openmw/mwrender/characterpreview.hpp
index 808ff0801d..0d7c1959c3 100644
--- a/apps/openmw/mwrender/characterpreview.hpp
+++ b/apps/openmw/mwrender/characterpreview.hpp
@@ -6,7 +6,7 @@
 
 #include <osg/PositionAttitudeTransform>
 
-#include <components/esm/loadnpc.hpp>
+#include <components/esm3/loadnpc.hpp>
 
 #include <components/resource/resourcesystem.hpp>
 
diff --git a/apps/openmw/mwrender/creatureanimation.cpp b/apps/openmw/mwrender/creatureanimation.cpp
index 50dfb68008..627b200b71 100644
--- a/apps/openmw/mwrender/creatureanimation.cpp
+++ b/apps/openmw/mwrender/creatureanimation.cpp
@@ -2,7 +2,7 @@
 
 #include <osg/MatrixTransform>
 
-#include <components/esm/loadcrea.hpp>
+#include <components/esm3/loadcrea.hpp>
 #include <components/debug/debuglog.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
diff --git a/apps/openmw/mwrender/fogmanager.cpp b/apps/openmw/mwrender/fogmanager.cpp
index b151882922..b68b846851 100644
--- a/apps/openmw/mwrender/fogmanager.cpp
+++ b/apps/openmw/mwrender/fogmanager.cpp
@@ -2,7 +2,7 @@
 
 #include <algorithm>
 
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadcell.hpp>
 #include <components/fallback/fallback.hpp>
 #include <components/sceneutil/util.hpp>
 #include <components/settings/settings.hpp>
diff --git a/apps/openmw/mwrender/globalmap.cpp b/apps/openmw/mwrender/globalmap.cpp
index ba8749d81c..5da79ec037 100644
--- a/apps/openmw/mwrender/globalmap.cpp
+++ b/apps/openmw/mwrender/globalmap.cpp
@@ -17,7 +17,7 @@
 #include <components/sceneutil/nodecallback.hpp>
 #include <components/sceneutil/depth.hpp>
 
-#include <components/esm/globalmap.hpp>
+#include <components/esm3/globalmap.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwrender/groundcover.cpp b/apps/openmw/mwrender/groundcover.cpp
index a39e31bb4d..a25ff004c0 100644
--- a/apps/openmw/mwrender/groundcover.cpp
+++ b/apps/openmw/mwrender/groundcover.cpp
@@ -7,7 +7,7 @@
 #include <osg/VertexAttribDivisor>
 #include <osg/Program>
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 #include <components/sceneutil/lightmanager.hpp>
 #include <components/sceneutil/nodecallback.hpp>
 #include <components/terrain/quadtreenode.hpp>
diff --git a/apps/openmw/mwrender/groundcover.hpp b/apps/openmw/mwrender/groundcover.hpp
index 26ed8530aa..d6d3ac52a7 100644
--- a/apps/openmw/mwrender/groundcover.hpp
+++ b/apps/openmw/mwrender/groundcover.hpp
@@ -3,7 +3,7 @@
 
 #include <components/terrain/quadtreeworld.hpp>
 #include <components/resource/scenemanager.hpp>
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadcell.hpp>
 
 namespace MWWorld
 {
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index d9982d35c3..202420fee6 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -12,8 +12,8 @@
 #include <osgDB/ReadFile>
 
 #include <components/debug/debuglog.hpp>
-#include <components/esm/fogstate.hpp>
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/fogstate.hpp>
+#include <components/esm3/loadcell.hpp>
 #include <components/misc/constants.hpp>
 #include <components/settings/settings.hpp>
 #include <components/sceneutil/visitor.hpp>
diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index 756769bc7d..4748491dd4 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -9,7 +9,7 @@
 #include <osg/Material>
 #include <osgUtil/IncrementalCompileOperation>
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/optimizer.hpp>
diff --git a/apps/openmw/mwrender/objectpaging.hpp b/apps/openmw/mwrender/objectpaging.hpp
index c24cdf4f8d..940760ff6c 100644
--- a/apps/openmw/mwrender/objectpaging.hpp
+++ b/apps/openmw/mwrender/objectpaging.hpp
@@ -3,7 +3,7 @@
 
 #include <components/terrain/quadtreeworld.hpp>
 #include <components/resource/resourcemanager.hpp>
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadcell.hpp>
 
 #include <mutex>
 
diff --git a/apps/openmw/mwrender/pathgrid.cpp b/apps/openmw/mwrender/pathgrid.cpp
index 42d9150811..ec7d2c15e0 100644
--- a/apps/openmw/mwrender/pathgrid.cpp
+++ b/apps/openmw/mwrender/pathgrid.cpp
@@ -6,7 +6,7 @@
 #include <osg/PositionAttitudeTransform>
 #include <osg/Group>
 
-#include <components/esm/loadpgrd.hpp>
+#include <components/esm3/loadpgrd.hpp>
 #include <components/sceneutil/pathgridutil.hpp>
 #include <components/sceneutil/util.hpp>
 #include <components/misc/coordinateconverter.hpp>
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 1925494ccd..7416ec988a 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -43,7 +43,7 @@
 #include <components/terrain/terraingrid.hpp>
 #include <components/terrain/quadtreeworld.hpp>
 
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadcell.hpp>
 
 #include <components/detournavigator/navigator.hpp>
 
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index fd5cbe0f79..47e60245ba 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -38,7 +38,7 @@
 
 #include <components/shader/shadermanager.hpp>
 
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadcell.hpp>
 
 #include <components/fallback/fallback.hpp>
 
diff --git a/apps/openmw/mwscript/compilercontext.cpp b/apps/openmw/mwscript/compilercontext.cpp
index 983365e06a..72537d606b 100644
--- a/apps/openmw/mwscript/compilercontext.cpp
+++ b/apps/openmw/mwscript/compilercontext.cpp
@@ -2,7 +2,7 @@
 
 #include "../mwworld/esmstore.hpp"
 
-#include <components/esm/loaddial.hpp>
+#include <components/esm3/loaddial.hpp>
 
 #include <components/compiler/locals.hpp>
 
diff --git a/apps/openmw/mwscript/containerextensions.cpp b/apps/openmw/mwscript/containerextensions.cpp
index 501404e958..b20e73957b 100644
--- a/apps/openmw/mwscript/containerextensions.cpp
+++ b/apps/openmw/mwscript/containerextensions.cpp
@@ -13,7 +13,7 @@
 
 #include <components/misc/stringops.hpp>
 
-#include <components/esm/loadskil.hpp>
+#include <components/esm3/loadskil.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
diff --git a/apps/openmw/mwscript/globalscripts.cpp b/apps/openmw/mwscript/globalscripts.cpp
index 9de08fbce3..680fd145a0 100644
--- a/apps/openmw/mwscript/globalscripts.cpp
+++ b/apps/openmw/mwscript/globalscripts.cpp
@@ -2,8 +2,8 @@
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/stringops.hpp>
-#include <components/esm/esmwriter.hpp>
-#include <components/esm/globalscript.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/esm3/globalscript.hpp>
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
diff --git a/apps/openmw/mwscript/locals.cpp b/apps/openmw/mwscript/locals.cpp
index b4c8d102c5..4c395f83d4 100644
--- a/apps/openmw/mwscript/locals.cpp
+++ b/apps/openmw/mwscript/locals.cpp
@@ -1,9 +1,9 @@
 #include "locals.hpp"
 #include "globalscripts.hpp"
 
-#include <components/esm/loadscpt.hpp>
-#include <components/esm/variant.hpp>
-#include <components/esm/locals.hpp>
+#include <components/esm3/loadscpt.hpp>
+#include <components/esm3/variant.hpp>
+#include <components/esm3/locals.hpp>
 #include <components/debug/debuglog.hpp>
 #include <components/compiler/locals.hpp>
 
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index 5d9f037357..f2c603089c 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -18,8 +18,8 @@
 
 #include <components/resource/resourcesystem.hpp>
 
-#include <components/esm/loadmgef.hpp>
-#include <components/esm/loadcrea.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadcrea.hpp>
 
 #include <components/vfs/manager.hpp>
 
diff --git a/apps/openmw/mwscript/scriptmanagerimp.cpp b/apps/openmw/mwscript/scriptmanagerimp.cpp
index 2027c9e606..7efb5148fa 100644
--- a/apps/openmw/mwscript/scriptmanagerimp.cpp
+++ b/apps/openmw/mwscript/scriptmanagerimp.cpp
@@ -7,7 +7,7 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/esm/loadscpt.hpp>
+#include <components/esm3/loadscpt.hpp>
 
 #include <components/misc/stringops.hpp>
 
diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp
index 186d1edf26..1697a26e86 100644
--- a/apps/openmw/mwscript/statsextensions.cpp
+++ b/apps/openmw/mwscript/statsextensions.cpp
@@ -2,7 +2,7 @@
 
 #include <cmath>
 
-#include <components/esm/loadnpc.hpp>
+#include <components/esm3/loadnpc.hpp>
 
 #include "../mwworld/esmstore.hpp"
 
diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index 8a159a5685..ec43364e38 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -2,7 +2,7 @@
 
 #include <components/sceneutil/positionattitudetransform.hpp>
 
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadcell.hpp>
 
 #include <components/compiler/opcodes.hpp>
 
diff --git a/apps/openmw/mwsound/watersoundupdater.cpp b/apps/openmw/mwsound/watersoundupdater.cpp
index b1646c404f..4ef9bfffc4 100644
--- a/apps/openmw/mwsound/watersoundupdater.cpp
+++ b/apps/openmw/mwsound/watersoundupdater.cpp
@@ -4,7 +4,7 @@
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/ptr.hpp"
 
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadcell.hpp>
 
 #include <osg/Vec3f>
 
diff --git a/apps/openmw/mwstate/character.cpp b/apps/openmw/mwstate/character.cpp
index 52696de104..2d82602534 100644
--- a/apps/openmw/mwstate/character.cpp
+++ b/apps/openmw/mwstate/character.cpp
@@ -5,7 +5,7 @@
 
 #include <boost/filesystem.hpp>
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 #include <components/esm/defs.hpp>
 
 #include <components/misc/utf8stream.hpp>
diff --git a/apps/openmw/mwstate/character.hpp b/apps/openmw/mwstate/character.hpp
index e12de9ca64..2ecd888a7b 100644
--- a/apps/openmw/mwstate/character.hpp
+++ b/apps/openmw/mwstate/character.hpp
@@ -3,7 +3,7 @@
 
 #include <boost/filesystem/path.hpp>
 
-#include <components/esm/savedgame.hpp>
+#include <components/esm3/savedgame.hpp>
 
 namespace MWState
 {
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index b9825a0f90..db7ca19ff8 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -2,10 +2,10 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/esm/esmwriter.hpp>
-#include <components/esm/esmreader.hpp>
-#include <components/esm/cellid.hpp>
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/cellid.hpp>
+#include <components/esm3/loadcell.hpp>
 
 #include <components/loadinglistener/loadinglistener.hpp>
 
diff --git a/apps/openmw/mwworld/actioneat.cpp b/apps/openmw/mwworld/actioneat.cpp
index ef435cca92..a1f568383b 100644
--- a/apps/openmw/mwworld/actioneat.cpp
+++ b/apps/openmw/mwworld/actioneat.cpp
@@ -1,6 +1,6 @@
 #include "actioneat.hpp"
 
-#include <components/esm/loadskil.hpp>
+#include <components/esm3/loadskil.hpp>
 
 #include "../mwworld/containerstore.hpp"
 
diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index fc09a6e9a8..cdf1986383 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -12,7 +12,7 @@
 #include <components/misc/resourcehelpers.hpp>
 #include <components/misc/stringops.hpp>
 #include <components/terrain/world.hpp>
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadcell.hpp>
 #include <components/loadinglistener/reporter.hpp>
 
 #include "../mwrender/landmanager.hpp"
diff --git a/apps/openmw/mwworld/cellref.cpp b/apps/openmw/mwworld/cellref.cpp
index 2f4702b1eb..2e1d64c441 100644
--- a/apps/openmw/mwworld/cellref.cpp
+++ b/apps/openmw/mwworld/cellref.cpp
@@ -3,7 +3,7 @@
 #include <assert.h>
 
 #include <components/debug/debuglog.hpp>
-#include <components/esm/objectstate.hpp>
+#include <components/esm3/objectstate.hpp>
 
 namespace MWWorld
 {
diff --git a/apps/openmw/mwworld/cellref.hpp b/apps/openmw/mwworld/cellref.hpp
index b5e80930ed..507544f1c9 100644
--- a/apps/openmw/mwworld/cellref.hpp
+++ b/apps/openmw/mwworld/cellref.hpp
@@ -1,7 +1,7 @@
 #ifndef OPENMW_MWWORLD_CELLREF_H
 #define OPENMW_MWWORLD_CELLREF_H
 
-#include <components/esm/cellref.hpp>
+#include <components/esm3/cellref.hpp>
 
 namespace ESM
 {
diff --git a/apps/openmw/mwworld/cells.cpp b/apps/openmw/mwworld/cells.cpp
index d020eace45..9f5e4ffbbc 100644
--- a/apps/openmw/mwworld/cells.cpp
+++ b/apps/openmw/mwworld/cells.cpp
@@ -1,11 +1,11 @@
 #include "cells.hpp"
 
 #include <components/debug/debuglog.hpp>
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 #include <components/esm/defs.hpp>
-#include <components/esm/cellstate.hpp>
-#include <components/esm/cellref.hpp>
+#include <components/esm3/cellstate.hpp>
+#include <components/esm3/cellref.hpp>
 #include <components/loadinglistener/loadinglistener.hpp>
 #include <components/settings/settings.hpp>
 
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 0c871e4f58..92836be72a 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -5,18 +5,18 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/esm/cellstate.hpp>
-#include <components/esm/cellid.hpp>
-#include <components/esm/cellref.hpp>
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
-#include <components/esm/objectstate.hpp>
-#include <components/esm/containerstate.hpp>
-#include <components/esm/npcstate.hpp>
-#include <components/esm/creaturestate.hpp>
-#include <components/esm/fogstate.hpp>
-#include <components/esm/creaturelevliststate.hpp>
-#include <components/esm/doorstate.hpp>
+#include <components/esm3/cellstate.hpp>
+#include <components/esm3/cellid.hpp>
+#include <components/esm3/cellref.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/esm3/objectstate.hpp>
+#include <components/esm3/containerstate.hpp>
+#include <components/esm3/npcstate.hpp>
+#include <components/esm3/creaturestate.hpp>
+#include <components/esm3/fogstate.hpp>
+#include <components/esm3/creaturelevliststate.hpp>
+#include <components/esm3/doorstate.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/luamanager.hpp"
diff --git a/apps/openmw/mwworld/cellstore.hpp b/apps/openmw/mwworld/cellstore.hpp
index d284a291a5..551924857b 100644
--- a/apps/openmw/mwworld/cellstore.hpp
+++ b/apps/openmw/mwworld/cellstore.hpp
@@ -11,26 +11,26 @@
 #include "livecellref.hpp"
 #include "cellreflist.hpp"
 
-#include <components/esm/loadacti.hpp>
-#include <components/esm/loadalch.hpp>
-#include <components/esm/loadappa.hpp>
-#include <components/esm/loadarmo.hpp>
-#include <components/esm/loadbook.hpp>
-#include <components/esm/loadclot.hpp>
-#include <components/esm/loadcont.hpp>
-#include <components/esm/loadcrea.hpp>
-#include <components/esm/loaddoor.hpp>
-#include <components/esm/loadingr.hpp>
-#include <components/esm/loadlevlist.hpp>
-#include <components/esm/loadligh.hpp>
-#include <components/esm/loadlock.hpp>
-#include <components/esm/loadprob.hpp>
-#include <components/esm/loadrepa.hpp>
-#include <components/esm/loadstat.hpp>
-#include <components/esm/loadweap.hpp>
-#include <components/esm/loadnpc.hpp>
-#include <components/esm/loadmisc.hpp>
-#include <components/esm/loadbody.hpp>
+#include <components/esm3/loadacti.hpp>
+#include <components/esm3/loadalch.hpp>
+#include <components/esm3/loadappa.hpp>
+#include <components/esm3/loadarmo.hpp>
+#include <components/esm3/loadbook.hpp>
+#include <components/esm3/loadclot.hpp>
+#include <components/esm3/loadcont.hpp>
+#include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loaddoor.hpp>
+#include <components/esm3/loadingr.hpp>
+#include <components/esm3/loadlevlist.hpp>
+#include <components/esm3/loadligh.hpp>
+#include <components/esm3/loadlock.hpp>
+#include <components/esm3/loadprob.hpp>
+#include <components/esm3/loadrepa.hpp>
+#include <components/esm3/loadstat.hpp>
+#include <components/esm3/loadweap.hpp>
+#include <components/esm3/loadnpc.hpp>
+#include <components/esm3/loadmisc.hpp>
+#include <components/esm3/loadbody.hpp>
 
 #include "timestamp.hpp"
 #include "ptr.hpp"
diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index 112f56abfc..0850f9c40f 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -4,7 +4,7 @@
 #include <stdexcept>
 
 #include <components/debug/debuglog.hpp>
-#include <components/esm/inventorystate.hpp>
+#include <components/esm3/inventorystate.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwworld/containerstore.hpp b/apps/openmw/mwworld/containerstore.hpp
index f18a595466..cf9bc533e0 100644
--- a/apps/openmw/mwworld/containerstore.hpp
+++ b/apps/openmw/mwworld/containerstore.hpp
@@ -6,18 +6,18 @@
 #include <memory>
 #include <utility>
 
-#include <components/esm/loadalch.hpp>
-#include <components/esm/loadappa.hpp>
-#include <components/esm/loadarmo.hpp>
-#include <components/esm/loadbook.hpp>
-#include <components/esm/loadclot.hpp>
-#include <components/esm/loadingr.hpp>
-#include <components/esm/loadlock.hpp>
-#include <components/esm/loadligh.hpp>
-#include <components/esm/loadmisc.hpp>
-#include <components/esm/loadprob.hpp>
-#include <components/esm/loadrepa.hpp>
-#include <components/esm/loadweap.hpp>
+#include <components/esm3/loadalch.hpp>
+#include <components/esm3/loadappa.hpp>
+#include <components/esm3/loadarmo.hpp>
+#include <components/esm3/loadbook.hpp>
+#include <components/esm3/loadclot.hpp>
+#include <components/esm3/loadingr.hpp>
+#include <components/esm3/loadlock.hpp>
+#include <components/esm3/loadligh.hpp>
+#include <components/esm3/loadmisc.hpp>
+#include <components/esm3/loadprob.hpp>
+#include <components/esm3/loadrepa.hpp>
+#include <components/esm3/loadweap.hpp>
 
 #include <components/misc/rng.hpp>
 
diff --git a/apps/openmw/mwworld/esmloader.cpp b/apps/openmw/mwworld/esmloader.cpp
index de16e386f2..8369523dca 100644
--- a/apps/openmw/mwworld/esmloader.cpp
+++ b/apps/openmw/mwworld/esmloader.cpp
@@ -1,7 +1,7 @@
 #include "esmloader.hpp"
 #include "esmstore.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace MWWorld
 {
diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index 1284df694a..695c5636c0 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -5,8 +5,8 @@
 #include <set>
 
 #include <components/debug/debuglog.hpp>
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 #include <components/loadinglistener/loadinglistener.hpp>
 #include <components/lua/configuration.hpp>
 #include <components/misc/algorithm.hpp>
diff --git a/apps/openmw/mwworld/globals.cpp b/apps/openmw/mwworld/globals.cpp
index 8a481334e8..cb1d26cb71 100644
--- a/apps/openmw/mwworld/globals.cpp
+++ b/apps/openmw/mwworld/globals.cpp
@@ -2,8 +2,8 @@
 
 #include <stdexcept>
 
-#include <components/esm/esmwriter.hpp>
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
 #include <components/misc/stringops.hpp>
 
 #include "esmstore.hpp"
diff --git a/apps/openmw/mwworld/globals.hpp b/apps/openmw/mwworld/globals.hpp
index ae5e412c70..5b414971f6 100644
--- a/apps/openmw/mwworld/globals.hpp
+++ b/apps/openmw/mwworld/globals.hpp
@@ -7,7 +7,7 @@
 
 #include <stdint.h>
 
-#include <components/esm/loadglob.hpp>
+#include <components/esm3/loadglob.hpp>
 
 namespace ESM
 {
diff --git a/apps/openmw/mwworld/groundcoverstore.hpp b/apps/openmw/mwworld/groundcoverstore.hpp
index 197be2a998..6c48a63c58 100644
--- a/apps/openmw/mwworld/groundcoverstore.hpp
+++ b/apps/openmw/mwworld/groundcoverstore.hpp
@@ -5,7 +5,7 @@
 #include <string>
 #include <map>
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 #include <components/esmloader/esmdata.hpp>
 #include <components/files/collections.hpp>
 
diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp
index 8cb0b9b012..27a21e3362 100644
--- a/apps/openmw/mwworld/inventorystore.cpp
+++ b/apps/openmw/mwworld/inventorystore.cpp
@@ -4,8 +4,8 @@
 #include <algorithm>
 
 #include <components/debug/debuglog.hpp>
-#include <components/esm/loadench.hpp>
-#include <components/esm/inventorystate.hpp>
+#include <components/esm3/loadench.hpp>
+#include <components/esm3/inventorystate.hpp>
 #include <components/misc/rng.hpp>
 
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwworld/livecellref.cpp b/apps/openmw/mwworld/livecellref.cpp
index 62c9f3a2f0..ad9cdabb38 100644
--- a/apps/openmw/mwworld/livecellref.cpp
+++ b/apps/openmw/mwworld/livecellref.cpp
@@ -1,7 +1,7 @@
 #include "livecellref.hpp"
 
 #include <components/debug/debuglog.hpp>
-#include <components/esm/objectstate.hpp>
+#include <components/esm3/objectstate.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwworld/magiceffects.cpp b/apps/openmw/mwworld/magiceffects.cpp
index 7d7e2857fe..9c257d9093 100644
--- a/apps/openmw/mwworld/magiceffects.cpp
+++ b/apps/openmw/mwworld/magiceffects.cpp
@@ -1,7 +1,7 @@
 #include "magiceffects.hpp"
 #include "esmstore.hpp"
 
-#include <components/esm/npcstate.hpp>
+#include <components/esm3/npcstate.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp
index 270889a23e..8d0724e39e 100644
--- a/apps/openmw/mwworld/player.cpp
+++ b/apps/openmw/mwworld/player.cpp
@@ -4,11 +4,11 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
-#include <components/esm/player.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/esm3/player.hpp>
 #include <components/esm/defs.hpp>
-#include <components/esm/loadbsgn.hpp>
+#include <components/esm3/loadbsgn.hpp>
 
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/inventorystore.hpp"
diff --git a/apps/openmw/mwworld/player.hpp b/apps/openmw/mwworld/player.hpp
index 1a9744e8a3..2770042969 100644
--- a/apps/openmw/mwworld/player.hpp
+++ b/apps/openmw/mwworld/player.hpp
@@ -9,9 +9,9 @@
 #include "../mwmechanics/drawstate.hpp"
 #include "../mwmechanics/stat.hpp"
 
-#include <components/esm/loadskil.hpp>
+#include <components/esm3/loadskil.hpp>
 #include <components/esm/attr.hpp>
-#include <components/esm/loadnpc.hpp>
+#include <components/esm3/loadnpc.hpp>
 
 namespace ESM
 {
diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index 3bff1854a6..5e60154a89 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -8,8 +8,8 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/esm/esmwriter.hpp>
-#include <components/esm/projectilestate.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/esm3/projectilestate.hpp>
 
 #include <components/misc/constants.hpp>
 #include <components/misc/convert.hpp>
diff --git a/apps/openmw/mwworld/projectilemanager.hpp b/apps/openmw/mwworld/projectilemanager.hpp
index f889250e1d..63a0dacc71 100644
--- a/apps/openmw/mwworld/projectilemanager.hpp
+++ b/apps/openmw/mwworld/projectilemanager.hpp
@@ -6,7 +6,7 @@
 #include <osg/ref_ptr>
 #include <osg/PositionAttitudeTransform>
 
-#include <components/esm/effectlist.hpp>
+#include <components/esm3/effectlist.hpp>
 
 #include "../mwbase/soundmanager.hpp"
 
diff --git a/apps/openmw/mwworld/refdata.cpp b/apps/openmw/mwworld/refdata.cpp
index e8c5ba35e4..10c65bd17c 100644
--- a/apps/openmw/mwworld/refdata.cpp
+++ b/apps/openmw/mwworld/refdata.cpp
@@ -1,6 +1,6 @@
 #include "refdata.hpp"
 
-#include <components/esm/objectstate.hpp>
+#include <components/esm3/objectstate.hpp>
 
 #include "customdata.hpp"
 #include "cellstore.hpp"
diff --git a/apps/openmw/mwworld/refdata.hpp b/apps/openmw/mwworld/refdata.hpp
index c98eb0f2af..0bc6df52a5 100644
--- a/apps/openmw/mwworld/refdata.hpp
+++ b/apps/openmw/mwworld/refdata.hpp
@@ -2,7 +2,7 @@
 #define GAME_MWWORLD_REFDATA_H
 
 #include <components/esm/defs.hpp>
-#include <components/esm/animationstate.hpp>
+#include <components/esm3/animationstate.hpp>
 
 #include "../mwscript/locals.hpp"
 #include "../mwworld/customdata.hpp"
diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index c767bd669a..d35746dfff 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -2,8 +2,8 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 
 #include <components/loadinglistener/loadinglistener.hpp>
 #include <components/misc/rng.hpp>
@@ -433,7 +433,7 @@ namespace MWWorld
         return search(cell.mName);
     }
 
-    // this method *must* be called right after esm.loadCell()
+    // this method *must* be called right after esm3.loadCell()
     void Store<ESM::Cell>::handleMovedCellRefs(ESM::ESMReader& esm, ESM::Cell* cell)
     {
         ESM::CellRef ref;
diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index 965c690238..e2b75edc40 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -2,9 +2,9 @@
 
 #include <components/misc/rng.hpp>
 
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
-#include <components/esm/weatherstate.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/esm3/weatherstate.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/soundmanager.hpp"
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 501378d7cc..1aebe94b87 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -11,10 +11,10 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
-#include <components/esm/cellid.hpp>
-#include <components/esm/cellref.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/esm3/cellid.hpp>
+#include <components/esm3/cellref.hpp>
 
 #include <components/misc/constants.hpp>
 #include <components/misc/mathutil.hpp>
diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index e7cd0a7db0..09a2be58ee 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -7,7 +7,7 @@
 #include <components/detournavigator/navmeshdb.hpp>
 #include <components/misc/rng.hpp>
 #include <components/loadinglistener/loadinglistener.hpp>
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 #include <components/resource/bulletshape.hpp>
 #include <components/bullethelpers/heightfield.hpp>
 
diff --git a/apps/openmw_test_suite/detournavigator/navmeshdb.cpp b/apps/openmw_test_suite/detournavigator/navmeshdb.cpp
index feadc2f59d..ba008f50ff 100644
--- a/apps/openmw_test_suite/detournavigator/navmeshdb.cpp
+++ b/apps/openmw_test_suite/detournavigator/navmeshdb.cpp
@@ -1,7 +1,7 @@
 #include "generate.hpp"
 
 #include <components/detournavigator/navmeshdb.hpp>
-#include <components/esm/cellid.hpp>
+#include <components/esm3/cellid.hpp>
 
 #include <DetourAlloc.h>
 
diff --git a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
index 36e0287461..b86fe7616b 100644
--- a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
+++ b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
@@ -3,7 +3,7 @@
 #include <components/detournavigator/recastmeshbuilder.hpp>
 #include <components/detournavigator/recastmesh.hpp>
 #include <components/detournavigator/exceptions.hpp>
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 #include <components/misc/convert.hpp>
 #include <components/debug/debuglog.hpp>
 
diff --git a/apps/openmw_test_suite/esm/variant.cpp b/apps/openmw_test_suite/esm/variant.cpp
index 10d35e486c..6991a8b4a8 100644
--- a/apps/openmw_test_suite/esm/variant.cpp
+++ b/apps/openmw_test_suite/esm/variant.cpp
@@ -1,7 +1,7 @@
-#include <components/esm/variant.hpp>
-#include <components/esm/esmwriter.hpp>
-#include <components/esm/esmreader.hpp>
-#include <components/esm/loadglob.hpp>
+#include <components/esm3/variant.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/loadglob.hpp>
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
diff --git a/apps/openmw_test_suite/mwworld/test_store.cpp b/apps/openmw_test_suite/mwworld/test_store.cpp
index 7ddab538c4..10003cfdfd 100644
--- a/apps/openmw_test_suite/mwworld/test_store.cpp
+++ b/apps/openmw_test_suite/mwworld/test_store.cpp
@@ -3,8 +3,8 @@
 #include <boost/filesystem/fstream.hpp>
 
 #include <components/files/configurationmanager.hpp>
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 #include <components/loadinglistener/loadinglistener.hpp>
 #include <components/misc/stringops.hpp>
 
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 89b27b0d94..1f70091247 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -76,15 +76,18 @@ add_component_dir (to_utf8
     to_utf8
     )
 
-add_component_dir (esm
-    attr defs esmcommon esmreader esmwriter loadacti loadalch loadappa loadarmo loadbody loadbook loadbsgn loadcell
+add_component_dir(esm attr defs esmcommon records util luascripts)
+
+add_component_dir (esm3
+    esmreader esmwriter loadacti loadalch loadappa loadarmo loadbody loadbook loadbsgn loadcell
     loadclas loadclot loadcont loadcrea loaddial loaddoor loadench loadfact loadglob loadgmst
     loadinfo loadingr loadland loadlevlist loadligh loadlock loadprob loadrepa loadltex loadmgef loadmisc
     loadnpc loadpgrd loadrace loadregn loadscpt loadskil loadsndg loadsoun loadspel loadsscr loadstat
-    loadweap records aipackage effectlist spelllist variant variantimp loadtes3 cellref filter
-    savedgame journalentry queststate locals globalscript player objectstate cellid cellstate globalmap inventorystate containerstate npcstate creaturestate dialoguestate statstate
-    npcstats creaturestats weatherstate quickkeys fogstate spellstate activespells creaturelevliststate doorstate projectilestate debugprofile
-    aisequence magiceffects util custommarkerstate stolenitems transport animationstate controlsstate mappings luascripts
+    loadweap aipackage effectlist spelllist variant variantimp loadtes3 cellref filter
+    savedgame journalentry queststate locals globalscript player objectstate cellid cellstate globalmap
+    inventorystate containerstate npcstate creaturestate dialoguestate statstate npcstats creaturestats
+    weatherstate quickkeys fogstate spellstate activespells creaturelevliststate doorstate projectilestate debugprofile
+    aisequence magiceffects custommarkerstate stolenitems transport animationstate controlsstate mappings
     )
 
 add_component_dir (esmterrain
diff --git a/components/config/gamesettings.cpp b/components/config/gamesettings.cpp
index 8717a6839b..2b4bce5faf 100644
--- a/components/config/gamesettings.cpp
+++ b/components/config/gamesettings.cpp
@@ -465,7 +465,7 @@ bool Config::GameSettings::hasMaster()
     QStringList content = mSettings.values(QString(Config::GameSettings::sContentKey));
     for (int i = 0; i < content.count(); ++i) 
     {
-        if (content.at(i).endsWith(QLatin1String(".omwgame"), Qt::CaseInsensitive) || content.at(i).endsWith(QLatin1String(".esm"), Qt::CaseInsensitive)) 
+        if (content.at(i).endsWith(QLatin1String(".omwgame"), Qt::CaseInsensitive) || content.at(i).endsWith(QLatin1String(".esm"), Qt::CaseInsensitive))
         {
             result = true;
             break;
diff --git a/components/contentselector/model/contentmodel.cpp b/components/contentselector/model/contentmodel.cpp
index 199799025a..57dfe0f87e 100644
--- a/components/contentselector/model/contentmodel.cpp
+++ b/components/contentselector/model/contentmodel.cpp
@@ -8,7 +8,7 @@
 #include <QTextCodec>
 #include <QDebug>
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 ContentSelectorModel::ContentModel::ContentModel(QObject *parent, QIcon warningIcon, bool showOMWScripts) :
     QAbstractTableModel(parent),
diff --git a/components/contentselector/model/esmfile.cpp b/components/contentselector/model/esmfile.cpp
index 46a7c96008..c6223128a4 100644
--- a/components/contentselector/model/esmfile.cpp
+++ b/components/contentselector/model/esmfile.cpp
@@ -66,7 +66,7 @@ QByteArray ContentSelectorModel::EsmFile::encodedData() const
 bool ContentSelectorModel::EsmFile::isGameFile() const
 { 
     return (mGameFiles.size() == 0) &&
-        (mFileName.endsWith(QLatin1String(".esm"), Qt::CaseInsensitive) || 
+        (mFileName.endsWith(QLatin1String(".esm"), Qt::CaseInsensitive) ||
         mFileName.endsWith(QLatin1String(".omwgame"), Qt::CaseInsensitive));
 }
 
diff --git a/components/detournavigator/navigatorimpl.cpp b/components/detournavigator/navigatorimpl.cpp
index 85d86e6b2b..0a898665a0 100644
--- a/components/detournavigator/navigatorimpl.cpp
+++ b/components/detournavigator/navigatorimpl.cpp
@@ -3,7 +3,7 @@
 #include "settingsutils.hpp"
 
 #include <components/debug/debuglog.hpp>
-#include <components/esm/loadpgrd.hpp>
+#include <components/esm3/loadpgrd.hpp>
 #include <components/misc/coordinateconverter.hpp>
 
 namespace DetourNavigator
diff --git a/components/esm/luascripts.cpp b/components/esm/luascripts.cpp
index 53beb02d82..17c5e2843a 100644
--- a/components/esm/luascripts.cpp
+++ b/components/esm/luascripts.cpp
@@ -1,7 +1,7 @@
 #include "luascripts.hpp"
 
-#include "esmreader.hpp"
-#include "esmwriter.hpp"
+#include "components/esm3/esmreader.hpp"
+#include "components/esm3/esmwriter.hpp"
 
 // List of all records, that are related to Lua.
 //
diff --git a/components/esm/records.hpp b/components/esm/records.hpp
index 5c183b6f6d..50d2f90263 100644
--- a/components/esm/records.hpp
+++ b/components/esm/records.hpp
@@ -2,48 +2,48 @@
 #define OPENMW_ESM_RECORDS_H
 
 #include "defs.hpp"
-#include "loadacti.hpp"
-#include "loadalch.hpp"
-#include "loadappa.hpp"
-#include "loadarmo.hpp"
-#include "loadbody.hpp"
-#include "loadbook.hpp"
-#include "loadbsgn.hpp"
-#include "loadcell.hpp"
-#include "loadclas.hpp"
-#include "loadclot.hpp"
-#include "loadcont.hpp"
-#include "loadcrea.hpp"
-#include "loadinfo.hpp"
-#include "loaddial.hpp"
-#include "loaddoor.hpp"
-#include "loadench.hpp"
-#include "loadfact.hpp"
-#include "loadglob.hpp"
-#include "loadgmst.hpp"
-#include "loadingr.hpp"
-#include "loadland.hpp"
-#include "loadlevlist.hpp"
-#include "loadligh.hpp"
-#include "loadlock.hpp"
-#include "loadrepa.hpp"
-#include "loadprob.hpp"
-#include "loadltex.hpp"
-#include "loadmgef.hpp"
-#include "loadmisc.hpp"
-#include "loadnpc.hpp"
-#include "loadpgrd.hpp"
-#include "loadrace.hpp"
-#include "loadregn.hpp"
-#include "loadscpt.hpp"
-#include "loadskil.hpp"
-#include "loadsndg.hpp"
-#include "loadsoun.hpp"
-#include "loadspel.hpp"
-#include "loadsscr.hpp"
-#include "loadstat.hpp"
-#include "loadweap.hpp"
+#include "components/esm3/loadacti.hpp"
+#include "components/esm3/loadalch.hpp"
+#include "components/esm3/loadappa.hpp"
+#include "components/esm3/loadarmo.hpp"
+#include "components/esm3/loadbody.hpp"
+#include "components/esm3/loadbook.hpp"
+#include "components/esm3/loadbsgn.hpp"
+#include "components/esm3/loadcell.hpp"
+#include "components/esm3/loadclas.hpp"
+#include "components/esm3/loadclot.hpp"
+#include "components/esm3/loadcont.hpp"
+#include "components/esm3/loadcrea.hpp"
+#include "components/esm3/loadinfo.hpp"
+#include "components/esm3/loaddial.hpp"
+#include "components/esm3/loaddoor.hpp"
+#include "components/esm3/loadench.hpp"
+#include "components/esm3/loadfact.hpp"
+#include "components/esm3/loadglob.hpp"
+#include "components/esm3/loadgmst.hpp"
+#include "components/esm3/loadingr.hpp"
+#include "components/esm3/loadland.hpp"
+#include "components/esm3/loadlevlist.hpp"
+#include "components/esm3/loadligh.hpp"
+#include "components/esm3/loadlock.hpp"
+#include "components/esm3/loadrepa.hpp"
+#include "components/esm3/loadprob.hpp"
+#include "components/esm3/loadltex.hpp"
+#include "components/esm3/loadmgef.hpp"
+#include "components/esm3/loadmisc.hpp"
+#include "components/esm3/loadnpc.hpp"
+#include "components/esm3/loadpgrd.hpp"
+#include "components/esm3/loadrace.hpp"
+#include "components/esm3/loadregn.hpp"
+#include "components/esm3/loadscpt.hpp"
+#include "components/esm3/loadskil.hpp"
+#include "components/esm3/loadsndg.hpp"
+#include "components/esm3/loadsoun.hpp"
+#include "components/esm3/loadspel.hpp"
+#include "components/esm3/loadsscr.hpp"
+#include "components/esm3/loadstat.hpp"
+#include "components/esm3/loadweap.hpp"
 
 // Special records which are not loaded from ESM
-#include "attr.hpp"
+#include "components/esm/attr.hpp"
 #endif
diff --git a/components/esm/activespells.cpp b/components/esm3/activespells.cpp
similarity index 100%
rename from components/esm/activespells.cpp
rename to components/esm3/activespells.cpp
diff --git a/components/esm/activespells.hpp b/components/esm3/activespells.hpp
similarity index 97%
rename from components/esm/activespells.hpp
rename to components/esm3/activespells.hpp
index a79366f9c2..91b3f495f5 100644
--- a/components/esm/activespells.hpp
+++ b/components/esm3/activespells.hpp
@@ -2,7 +2,7 @@
 #define OPENMW_ESM_ACTIVESPELLS_H
 
 #include "cellref.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 #include "effectlist.hpp"
 
 #include <string>
diff --git a/components/esm/aipackage.cpp b/components/esm3/aipackage.cpp
similarity index 100%
rename from components/esm/aipackage.cpp
rename to components/esm3/aipackage.cpp
diff --git a/components/esm/aipackage.hpp b/components/esm3/aipackage.hpp
similarity index 98%
rename from components/esm/aipackage.hpp
rename to components/esm3/aipackage.hpp
index 6993867da1..90e1d1cf9e 100644
--- a/components/esm/aipackage.hpp
+++ b/components/esm3/aipackage.hpp
@@ -4,7 +4,7 @@
 #include <vector>
 #include <string>
 
-#include "esmcommon.hpp"
+#include "components/esm/esmcommon.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/aisequence.cpp b/components/esm3/aisequence.cpp
similarity index 100%
rename from components/esm/aisequence.cpp
rename to components/esm3/aisequence.cpp
diff --git a/components/esm/aisequence.hpp b/components/esm3/aisequence.hpp
similarity index 98%
rename from components/esm/aisequence.hpp
rename to components/esm3/aisequence.hpp
index 00c1316d9c..b5a003678b 100644
--- a/components/esm/aisequence.hpp
+++ b/components/esm3/aisequence.hpp
@@ -4,9 +4,9 @@
 #include <vector>
 #include <string>
 
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
-#include "util.hpp"
+#include "components/esm/util.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/animationstate.cpp b/components/esm3/animationstate.cpp
similarity index 100%
rename from components/esm/animationstate.cpp
rename to components/esm3/animationstate.cpp
diff --git a/components/esm/animationstate.hpp b/components/esm3/animationstate.hpp
similarity index 100%
rename from components/esm/animationstate.hpp
rename to components/esm3/animationstate.hpp
diff --git a/components/esm/cellid.cpp b/components/esm3/cellid.cpp
similarity index 100%
rename from components/esm/cellid.cpp
rename to components/esm3/cellid.cpp
diff --git a/components/esm/cellid.hpp b/components/esm3/cellid.hpp
similarity index 100%
rename from components/esm/cellid.hpp
rename to components/esm3/cellid.hpp
diff --git a/components/esm/cellref.cpp b/components/esm3/cellref.cpp
similarity index 100%
rename from components/esm/cellref.cpp
rename to components/esm3/cellref.cpp
diff --git a/components/esm/cellref.hpp b/components/esm3/cellref.hpp
similarity index 99%
rename from components/esm/cellref.hpp
rename to components/esm3/cellref.hpp
index 0013329ccc..55e4b700fc 100644
--- a/components/esm/cellref.hpp
+++ b/components/esm3/cellref.hpp
@@ -4,7 +4,7 @@
 #include <limits>
 #include <string>
 
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/cellstate.cpp b/components/esm3/cellstate.cpp
similarity index 100%
rename from components/esm/cellstate.cpp
rename to components/esm3/cellstate.cpp
diff --git a/components/esm/cellstate.hpp b/components/esm3/cellstate.hpp
similarity index 93%
rename from components/esm/cellstate.hpp
rename to components/esm3/cellstate.hpp
index 55c1e51550..9c0427f76b 100644
--- a/components/esm/cellstate.hpp
+++ b/components/esm3/cellstate.hpp
@@ -3,7 +3,7 @@
 
 #include "cellid.hpp"
 
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/containerstate.cpp b/components/esm3/containerstate.cpp
similarity index 100%
rename from components/esm/containerstate.cpp
rename to components/esm3/containerstate.cpp
diff --git a/components/esm/containerstate.hpp b/components/esm3/containerstate.hpp
similarity index 100%
rename from components/esm/containerstate.hpp
rename to components/esm3/containerstate.hpp
diff --git a/components/esm/controlsstate.cpp b/components/esm3/controlsstate.cpp
similarity index 100%
rename from components/esm/controlsstate.cpp
rename to components/esm3/controlsstate.cpp
diff --git a/components/esm/controlsstate.hpp b/components/esm3/controlsstate.hpp
similarity index 100%
rename from components/esm/controlsstate.hpp
rename to components/esm3/controlsstate.hpp
diff --git a/components/esm/creaturelevliststate.cpp b/components/esm3/creaturelevliststate.cpp
similarity index 100%
rename from components/esm/creaturelevliststate.cpp
rename to components/esm3/creaturelevliststate.cpp
diff --git a/components/esm/creaturelevliststate.hpp b/components/esm3/creaturelevliststate.hpp
similarity index 100%
rename from components/esm/creaturelevliststate.hpp
rename to components/esm3/creaturelevliststate.hpp
diff --git a/components/esm/creaturestate.cpp b/components/esm3/creaturestate.cpp
similarity index 100%
rename from components/esm/creaturestate.cpp
rename to components/esm3/creaturestate.cpp
diff --git a/components/esm/creaturestate.hpp b/components/esm3/creaturestate.hpp
similarity index 100%
rename from components/esm/creaturestate.hpp
rename to components/esm3/creaturestate.hpp
diff --git a/components/esm/creaturestats.cpp b/components/esm3/creaturestats.cpp
similarity index 100%
rename from components/esm/creaturestats.cpp
rename to components/esm3/creaturestats.cpp
diff --git a/components/esm/creaturestats.hpp b/components/esm3/creaturestats.hpp
similarity index 97%
rename from components/esm/creaturestats.hpp
rename to components/esm3/creaturestats.hpp
index 7b261e3dd3..d47a283630 100644
--- a/components/esm/creaturestats.hpp
+++ b/components/esm3/creaturestats.hpp
@@ -7,9 +7,9 @@
 
 #include "statstate.hpp"
 
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
-#include "attr.hpp"
+#include "components/esm/attr.hpp"
 #include "spellstate.hpp"
 #include "activespells.hpp"
 #include "magiceffects.hpp"
diff --git a/components/esm/custommarkerstate.cpp b/components/esm3/custommarkerstate.cpp
similarity index 100%
rename from components/esm/custommarkerstate.cpp
rename to components/esm3/custommarkerstate.cpp
diff --git a/components/esm/custommarkerstate.hpp b/components/esm3/custommarkerstate.hpp
similarity index 100%
rename from components/esm/custommarkerstate.hpp
rename to components/esm3/custommarkerstate.hpp
diff --git a/components/esm/debugprofile.cpp b/components/esm3/debugprofile.cpp
similarity index 97%
rename from components/esm/debugprofile.cpp
rename to components/esm3/debugprofile.cpp
index 090d2bfe6d..f862d4a289 100644
--- a/components/esm/debugprofile.cpp
+++ b/components/esm3/debugprofile.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 unsigned int ESM::DebugProfile::sRecordId = REC_DBGP;
 
diff --git a/components/esm/debugprofile.hpp b/components/esm3/debugprofile.hpp
similarity index 100%
rename from components/esm/debugprofile.hpp
rename to components/esm3/debugprofile.hpp
diff --git a/components/esm/dialoguestate.cpp b/components/esm3/dialoguestate.cpp
similarity index 100%
rename from components/esm/dialoguestate.cpp
rename to components/esm3/dialoguestate.cpp
diff --git a/components/esm/dialoguestate.hpp b/components/esm3/dialoguestate.hpp
similarity index 100%
rename from components/esm/dialoguestate.hpp
rename to components/esm3/dialoguestate.hpp
diff --git a/components/esm/doorstate.cpp b/components/esm3/doorstate.cpp
similarity index 100%
rename from components/esm/doorstate.cpp
rename to components/esm3/doorstate.cpp
diff --git a/components/esm/doorstate.hpp b/components/esm3/doorstate.hpp
similarity index 100%
rename from components/esm/doorstate.hpp
rename to components/esm3/doorstate.hpp
diff --git a/components/esm/effectlist.cpp b/components/esm3/effectlist.cpp
similarity index 100%
rename from components/esm/effectlist.cpp
rename to components/esm3/effectlist.cpp
diff --git a/components/esm/effectlist.hpp b/components/esm3/effectlist.hpp
similarity index 100%
rename from components/esm/effectlist.hpp
rename to components/esm3/effectlist.hpp
diff --git a/components/esm/esmreader.cpp b/components/esm3/esmreader.cpp
similarity index 100%
rename from components/esm/esmreader.cpp
rename to components/esm3/esmreader.cpp
diff --git a/components/esm/esmreader.hpp b/components/esm3/esmreader.hpp
similarity index 99%
rename from components/esm/esmreader.hpp
rename to components/esm3/esmreader.hpp
index d7eb6ff0a1..3b384dc603 100644
--- a/components/esm/esmreader.hpp
+++ b/components/esm3/esmreader.hpp
@@ -12,7 +12,7 @@
 
 #include <components/to_utf8/to_utf8.hpp>
 
-#include "esmcommon.hpp"
+#include "components/esm/esmcommon.hpp"
 #include "loadtes3.hpp"
 
 namespace ESM {
diff --git a/components/esm/esmwriter.cpp b/components/esm3/esmwriter.cpp
similarity index 100%
rename from components/esm/esmwriter.cpp
rename to components/esm3/esmwriter.cpp
diff --git a/components/esm/esmwriter.hpp b/components/esm3/esmwriter.hpp
similarity index 99%
rename from components/esm/esmwriter.hpp
rename to components/esm3/esmwriter.hpp
index ba5800f67c..ed2ccbb377 100644
--- a/components/esm/esmwriter.hpp
+++ b/components/esm3/esmwriter.hpp
@@ -4,7 +4,7 @@
 #include <iosfwd>
 #include <list>
 
-#include "esmcommon.hpp"
+#include "components/esm/esmcommon.hpp"
 #include "loadtes3.hpp"
 
 namespace ToUTF8
diff --git a/components/esm/filter.cpp b/components/esm3/filter.cpp
similarity index 97%
rename from components/esm/filter.cpp
rename to components/esm3/filter.cpp
index 76a518c63d..03fa4ba278 100644
--- a/components/esm/filter.cpp
+++ b/components/esm3/filter.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 unsigned int ESM::Filter::sRecordId = REC_FILT;
 
diff --git a/components/esm/filter.hpp b/components/esm3/filter.hpp
similarity index 100%
rename from components/esm/filter.hpp
rename to components/esm3/filter.hpp
diff --git a/components/esm/fogstate.cpp b/components/esm3/fogstate.cpp
similarity index 100%
rename from components/esm/fogstate.cpp
rename to components/esm3/fogstate.cpp
diff --git a/components/esm/fogstate.hpp b/components/esm3/fogstate.hpp
similarity index 100%
rename from components/esm/fogstate.hpp
rename to components/esm3/fogstate.hpp
diff --git a/components/esm/globalmap.cpp b/components/esm3/globalmap.cpp
similarity index 96%
rename from components/esm/globalmap.cpp
rename to components/esm3/globalmap.cpp
index 190329c61e..3005349d26 100644
--- a/components/esm/globalmap.cpp
+++ b/components/esm3/globalmap.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 unsigned int ESM::GlobalMap::sRecordId = ESM::REC_GMAP;
 
diff --git a/components/esm/globalmap.hpp b/components/esm3/globalmap.hpp
similarity index 100%
rename from components/esm/globalmap.hpp
rename to components/esm3/globalmap.hpp
diff --git a/components/esm/globalscript.cpp b/components/esm3/globalscript.cpp
similarity index 100%
rename from components/esm/globalscript.cpp
rename to components/esm3/globalscript.cpp
diff --git a/components/esm/globalscript.hpp b/components/esm3/globalscript.hpp
similarity index 100%
rename from components/esm/globalscript.hpp
rename to components/esm3/globalscript.hpp
diff --git a/components/esm/inventorystate.cpp b/components/esm3/inventorystate.cpp
similarity index 100%
rename from components/esm/inventorystate.cpp
rename to components/esm3/inventorystate.cpp
diff --git a/components/esm/inventorystate.hpp b/components/esm3/inventorystate.hpp
similarity index 100%
rename from components/esm/inventorystate.hpp
rename to components/esm3/inventorystate.hpp
diff --git a/components/esm/journalentry.cpp b/components/esm3/journalentry.cpp
similarity index 100%
rename from components/esm/journalentry.cpp
rename to components/esm3/journalentry.cpp
diff --git a/components/esm/journalentry.hpp b/components/esm3/journalentry.hpp
similarity index 100%
rename from components/esm/journalentry.hpp
rename to components/esm3/journalentry.hpp
diff --git a/components/esm/loadacti.cpp b/components/esm3/loadacti.cpp
similarity index 98%
rename from components/esm/loadacti.cpp
rename to components/esm3/loadacti.cpp
index fcb0954918..c4aa9cb6b8 100644
--- a/components/esm/loadacti.cpp
+++ b/components/esm3/loadacti.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadacti.hpp b/components/esm3/loadacti.hpp
similarity index 100%
rename from components/esm/loadacti.hpp
rename to components/esm3/loadacti.hpp
diff --git a/components/esm/loadalch.cpp b/components/esm3/loadalch.cpp
similarity index 98%
rename from components/esm/loadalch.cpp
rename to components/esm3/loadalch.cpp
index ad30570f74..618e116cce 100644
--- a/components/esm/loadalch.cpp
+++ b/components/esm3/loadalch.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadalch.hpp b/components/esm3/loadalch.hpp
similarity index 100%
rename from components/esm/loadalch.hpp
rename to components/esm3/loadalch.hpp
diff --git a/components/esm/loadappa.cpp b/components/esm3/loadappa.cpp
similarity index 98%
rename from components/esm/loadappa.cpp
rename to components/esm3/loadappa.cpp
index 1113870197..13ba0fbb42 100644
--- a/components/esm/loadappa.cpp
+++ b/components/esm3/loadappa.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadappa.hpp b/components/esm3/loadappa.hpp
similarity index 100%
rename from components/esm/loadappa.hpp
rename to components/esm3/loadappa.hpp
diff --git a/components/esm/loadarmo.cpp b/components/esm3/loadarmo.cpp
similarity index 99%
rename from components/esm/loadarmo.cpp
rename to components/esm3/loadarmo.cpp
index cab0d52a88..9c5164f8a6 100644
--- a/components/esm/loadarmo.cpp
+++ b/components/esm3/loadarmo.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadarmo.hpp b/components/esm3/loadarmo.hpp
similarity index 100%
rename from components/esm/loadarmo.hpp
rename to components/esm3/loadarmo.hpp
diff --git a/components/esm/loadbody.cpp b/components/esm3/loadbody.cpp
similarity index 98%
rename from components/esm/loadbody.cpp
rename to components/esm3/loadbody.cpp
index c7f6bce40a..1098941c25 100644
--- a/components/esm/loadbody.cpp
+++ b/components/esm3/loadbody.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadbody.hpp b/components/esm3/loadbody.hpp
similarity index 100%
rename from components/esm/loadbody.hpp
rename to components/esm3/loadbody.hpp
diff --git a/components/esm/loadbook.cpp b/components/esm3/loadbook.cpp
similarity index 98%
rename from components/esm/loadbook.cpp
rename to components/esm3/loadbook.cpp
index 07b9a6b50f..c03046ed9f 100644
--- a/components/esm/loadbook.cpp
+++ b/components/esm3/loadbook.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadbook.hpp b/components/esm3/loadbook.hpp
similarity index 100%
rename from components/esm/loadbook.hpp
rename to components/esm3/loadbook.hpp
diff --git a/components/esm/loadbsgn.cpp b/components/esm3/loadbsgn.cpp
similarity index 98%
rename from components/esm/loadbsgn.cpp
rename to components/esm3/loadbsgn.cpp
index d767eb66e0..d02fc93914 100644
--- a/components/esm/loadbsgn.cpp
+++ b/components/esm3/loadbsgn.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadbsgn.hpp b/components/esm3/loadbsgn.hpp
similarity index 100%
rename from components/esm/loadbsgn.hpp
rename to components/esm3/loadbsgn.hpp
diff --git a/components/esm/loadcell.cpp b/components/esm3/loadcell.cpp
similarity index 99%
rename from components/esm/loadcell.cpp
rename to components/esm3/loadcell.cpp
index b2c95ad25f..256be62898 100644
--- a/components/esm/loadcell.cpp
+++ b/components/esm3/loadcell.cpp
@@ -11,7 +11,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 #include "cellid.hpp"
 
 namespace
diff --git a/components/esm/loadcell.hpp b/components/esm3/loadcell.hpp
similarity index 98%
rename from components/esm/loadcell.hpp
rename to components/esm3/loadcell.hpp
index c2a694b744..61f9fb54a3 100644
--- a/components/esm/loadcell.hpp
+++ b/components/esm3/loadcell.hpp
@@ -5,8 +5,8 @@
 #include <vector>
 #include <list>
 
-#include "esmcommon.hpp"
-#include "defs.hpp"
+#include "components/esm/esmcommon.hpp"
+#include "components/esm/defs.hpp"
 #include "cellref.hpp"
 #include "cellid.hpp"
 
diff --git a/components/esm/loadclas.cpp b/components/esm3/loadclas.cpp
similarity index 98%
rename from components/esm/loadclas.cpp
rename to components/esm3/loadclas.cpp
index c70f7dd0d3..0bd966e752 100644
--- a/components/esm/loadclas.cpp
+++ b/components/esm3/loadclas.cpp
@@ -4,7 +4,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadclas.hpp b/components/esm3/loadclas.hpp
similarity index 100%
rename from components/esm/loadclas.hpp
rename to components/esm3/loadclas.hpp
diff --git a/components/esm/loadclot.cpp b/components/esm3/loadclot.cpp
similarity index 98%
rename from components/esm/loadclot.cpp
rename to components/esm3/loadclot.cpp
index 8f2aff40fc..05a895b0f4 100644
--- a/components/esm/loadclot.cpp
+++ b/components/esm3/loadclot.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadclot.hpp b/components/esm3/loadclot.hpp
similarity index 100%
rename from components/esm/loadclot.hpp
rename to components/esm3/loadclot.hpp
diff --git a/components/esm/loadcont.cpp b/components/esm3/loadcont.cpp
similarity index 99%
rename from components/esm/loadcont.cpp
rename to components/esm3/loadcont.cpp
index b7757646a1..19bb649125 100644
--- a/components/esm/loadcont.cpp
+++ b/components/esm3/loadcont.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadcont.hpp b/components/esm3/loadcont.hpp
similarity index 96%
rename from components/esm/loadcont.hpp
rename to components/esm3/loadcont.hpp
index eac791e3f3..a236f0a3e5 100644
--- a/components/esm/loadcont.hpp
+++ b/components/esm3/loadcont.hpp
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include "esmcommon.hpp"
+#include "components/esm/esmcommon.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadcrea.cpp b/components/esm3/loadcrea.cpp
similarity index 99%
rename from components/esm/loadcrea.cpp
rename to components/esm3/loadcrea.cpp
index 590a68bc35..1cec61b3ab 100644
--- a/components/esm/loadcrea.cpp
+++ b/components/esm3/loadcrea.cpp
@@ -4,7 +4,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM {
 
diff --git a/components/esm/loadcrea.hpp b/components/esm3/loadcrea.hpp
similarity index 100%
rename from components/esm/loadcrea.hpp
rename to components/esm3/loadcrea.hpp
diff --git a/components/esm/loaddial.cpp b/components/esm3/loaddial.cpp
similarity index 99%
rename from components/esm/loaddial.cpp
rename to components/esm3/loaddial.cpp
index 535ea23380..67696be821 100644
--- a/components/esm/loaddial.cpp
+++ b/components/esm3/loaddial.cpp
@@ -4,7 +4,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loaddial.hpp b/components/esm3/loaddial.hpp
similarity index 100%
rename from components/esm/loaddial.hpp
rename to components/esm3/loaddial.hpp
diff --git a/components/esm/loaddoor.cpp b/components/esm3/loaddoor.cpp
similarity index 98%
rename from components/esm/loaddoor.cpp
rename to components/esm3/loaddoor.cpp
index d5bf51b4da..48fa0faaf3 100644
--- a/components/esm/loaddoor.cpp
+++ b/components/esm3/loaddoor.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loaddoor.hpp b/components/esm3/loaddoor.hpp
similarity index 100%
rename from components/esm/loaddoor.hpp
rename to components/esm3/loaddoor.hpp
diff --git a/components/esm/loadench.cpp b/components/esm3/loadench.cpp
similarity index 98%
rename from components/esm/loadench.cpp
rename to components/esm3/loadench.cpp
index db0727099c..fae0aa211b 100644
--- a/components/esm/loadench.cpp
+++ b/components/esm3/loadench.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadench.hpp b/components/esm3/loadench.hpp
similarity index 100%
rename from components/esm/loadench.hpp
rename to components/esm3/loadench.hpp
diff --git a/components/esm/loadfact.cpp b/components/esm3/loadfact.cpp
similarity index 99%
rename from components/esm/loadfact.cpp
rename to components/esm3/loadfact.cpp
index 61d0e1dcf4..554c30e40e 100644
--- a/components/esm/loadfact.cpp
+++ b/components/esm3/loadfact.cpp
@@ -4,7 +4,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadfact.hpp b/components/esm3/loadfact.hpp
similarity index 100%
rename from components/esm/loadfact.hpp
rename to components/esm3/loadfact.hpp
diff --git a/components/esm/loadglob.cpp b/components/esm3/loadglob.cpp
similarity index 96%
rename from components/esm/loadglob.cpp
rename to components/esm3/loadglob.cpp
index d2226d1738..fd4ee05665 100644
--- a/components/esm/loadglob.cpp
+++ b/components/esm3/loadglob.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadglob.hpp b/components/esm3/loadglob.hpp
similarity index 100%
rename from components/esm/loadglob.hpp
rename to components/esm3/loadglob.hpp
diff --git a/components/esm/loadgmst.cpp b/components/esm3/loadgmst.cpp
similarity index 96%
rename from components/esm/loadgmst.cpp
rename to components/esm3/loadgmst.cpp
index 6d4ac1b202..1bcf6a1fa4 100644
--- a/components/esm/loadgmst.cpp
+++ b/components/esm3/loadgmst.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadgmst.hpp b/components/esm3/loadgmst.hpp
similarity index 100%
rename from components/esm/loadgmst.hpp
rename to components/esm3/loadgmst.hpp
diff --git a/components/esm/loadinfo.cpp b/components/esm3/loadinfo.cpp
similarity index 99%
rename from components/esm/loadinfo.cpp
rename to components/esm3/loadinfo.cpp
index 6c54b0b9ab..5cc1f9a090 100644
--- a/components/esm/loadinfo.cpp
+++ b/components/esm3/loadinfo.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadinfo.hpp b/components/esm3/loadinfo.hpp
similarity index 98%
rename from components/esm/loadinfo.hpp
rename to components/esm3/loadinfo.hpp
index d68301c91b..7f135087ee 100644
--- a/components/esm/loadinfo.hpp
+++ b/components/esm3/loadinfo.hpp
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 #include "variant.hpp"
 
 namespace ESM
diff --git a/components/esm/loadingr.cpp b/components/esm3/loadingr.cpp
similarity index 98%
rename from components/esm/loadingr.cpp
rename to components/esm3/loadingr.cpp
index 1aba000267..652e381881 100644
--- a/components/esm/loadingr.cpp
+++ b/components/esm3/loadingr.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadingr.hpp b/components/esm3/loadingr.hpp
similarity index 100%
rename from components/esm/loadingr.hpp
rename to components/esm3/loadingr.hpp
diff --git a/components/esm/loadland.cpp b/components/esm3/loadland.cpp
similarity index 99%
rename from components/esm/loadland.cpp
rename to components/esm3/loadland.cpp
index e97ad6b759..24cac7f015 100644
--- a/components/esm/loadland.cpp
+++ b/components/esm3/loadland.cpp
@@ -5,7 +5,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadland.hpp b/components/esm3/loadland.hpp
similarity index 99%
rename from components/esm/loadland.hpp
rename to components/esm3/loadland.hpp
index 610dd28fb8..1244a955cf 100644
--- a/components/esm/loadland.hpp
+++ b/components/esm3/loadland.hpp
@@ -5,7 +5,7 @@
 
 #include <components/misc/constants.hpp>
 
-#include "esmcommon.hpp"
+#include "components/esm/esmcommon.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadlevlist.cpp b/components/esm3/loadlevlist.cpp
similarity index 99%
rename from components/esm/loadlevlist.cpp
rename to components/esm3/loadlevlist.cpp
index acf97f4259..1de278761b 100644
--- a/components/esm/loadlevlist.cpp
+++ b/components/esm3/loadlevlist.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadlevlist.hpp b/components/esm3/loadlevlist.hpp
similarity index 100%
rename from components/esm/loadlevlist.hpp
rename to components/esm3/loadlevlist.hpp
diff --git a/components/esm/loadligh.cpp b/components/esm3/loadligh.cpp
similarity index 98%
rename from components/esm/loadligh.cpp
rename to components/esm3/loadligh.cpp
index 32c0b16243..4e8c41fbb9 100644
--- a/components/esm/loadligh.cpp
+++ b/components/esm3/loadligh.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadligh.hpp b/components/esm3/loadligh.hpp
similarity index 100%
rename from components/esm/loadligh.hpp
rename to components/esm3/loadligh.hpp
diff --git a/components/esm/loadlock.cpp b/components/esm3/loadlock.cpp
similarity index 98%
rename from components/esm/loadlock.cpp
rename to components/esm3/loadlock.cpp
index bea5c86773..10ac680ab5 100644
--- a/components/esm/loadlock.cpp
+++ b/components/esm3/loadlock.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadlock.hpp b/components/esm3/loadlock.hpp
similarity index 100%
rename from components/esm/loadlock.hpp
rename to components/esm3/loadlock.hpp
diff --git a/components/esm/loadltex.cpp b/components/esm3/loadltex.cpp
similarity index 97%
rename from components/esm/loadltex.cpp
rename to components/esm3/loadltex.cpp
index f2a1e17d49..3d01c4fe17 100644
--- a/components/esm/loadltex.cpp
+++ b/components/esm3/loadltex.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadltex.hpp b/components/esm3/loadltex.hpp
similarity index 100%
rename from components/esm/loadltex.hpp
rename to components/esm3/loadltex.hpp
diff --git a/components/esm/loadmgef.cpp b/components/esm3/loadmgef.cpp
similarity index 99%
rename from components/esm/loadmgef.cpp
rename to components/esm3/loadmgef.cpp
index 7aff249aeb..e86907564c 100644
--- a/components/esm/loadmgef.cpp
+++ b/components/esm3/loadmgef.cpp
@@ -4,7 +4,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace
 {
diff --git a/components/esm/loadmgef.hpp b/components/esm3/loadmgef.hpp
similarity index 100%
rename from components/esm/loadmgef.hpp
rename to components/esm3/loadmgef.hpp
diff --git a/components/esm/loadmisc.cpp b/components/esm3/loadmisc.cpp
similarity index 98%
rename from components/esm/loadmisc.cpp
rename to components/esm3/loadmisc.cpp
index a60012e74b..0405382cfd 100644
--- a/components/esm/loadmisc.cpp
+++ b/components/esm3/loadmisc.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadmisc.hpp b/components/esm3/loadmisc.hpp
similarity index 100%
rename from components/esm/loadmisc.hpp
rename to components/esm3/loadmisc.hpp
diff --git a/components/esm/loadnpc.cpp b/components/esm3/loadnpc.cpp
similarity index 99%
rename from components/esm/loadnpc.cpp
rename to components/esm3/loadnpc.cpp
index b86ea6f8bc..07ee560b54 100644
--- a/components/esm/loadnpc.cpp
+++ b/components/esm3/loadnpc.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadnpc.hpp b/components/esm3/loadnpc.hpp
similarity index 98%
rename from components/esm/loadnpc.hpp
rename to components/esm3/loadnpc.hpp
index f0354cb603..24752beb11 100644
--- a/components/esm/loadnpc.hpp
+++ b/components/esm3/loadnpc.hpp
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 #include "loadcont.hpp"
 #include "aipackage.hpp"
 #include "spelllist.hpp"
diff --git a/components/esm/loadpgrd.cpp b/components/esm3/loadpgrd.cpp
similarity index 99%
rename from components/esm/loadpgrd.cpp
rename to components/esm3/loadpgrd.cpp
index b10e3c453d..da90018619 100644
--- a/components/esm/loadpgrd.cpp
+++ b/components/esm3/loadpgrd.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadpgrd.hpp b/components/esm3/loadpgrd.hpp
similarity index 100%
rename from components/esm/loadpgrd.hpp
rename to components/esm3/loadpgrd.hpp
diff --git a/components/esm/loadprob.cpp b/components/esm3/loadprob.cpp
similarity index 98%
rename from components/esm/loadprob.cpp
rename to components/esm3/loadprob.cpp
index edc6b89cd1..644abb6a39 100644
--- a/components/esm/loadprob.cpp
+++ b/components/esm3/loadprob.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadprob.hpp b/components/esm3/loadprob.hpp
similarity index 100%
rename from components/esm/loadprob.hpp
rename to components/esm3/loadprob.hpp
diff --git a/components/esm/loadrace.cpp b/components/esm3/loadrace.cpp
similarity index 98%
rename from components/esm/loadrace.cpp
rename to components/esm3/loadrace.cpp
index 35ad4421f1..092d064cd8 100644
--- a/components/esm/loadrace.cpp
+++ b/components/esm3/loadrace.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadrace.hpp b/components/esm3/loadrace.hpp
similarity index 100%
rename from components/esm/loadrace.hpp
rename to components/esm3/loadrace.hpp
diff --git a/components/esm/loadregn.cpp b/components/esm3/loadregn.cpp
similarity index 99%
rename from components/esm/loadregn.cpp
rename to components/esm3/loadregn.cpp
index 9cfdaaabc0..9e8921e939 100644
--- a/components/esm/loadregn.cpp
+++ b/components/esm3/loadregn.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadregn.hpp b/components/esm3/loadregn.hpp
similarity index 97%
rename from components/esm/loadregn.hpp
rename to components/esm3/loadregn.hpp
index 64991c9b3a..7944f69cfe 100644
--- a/components/esm/loadregn.hpp
+++ b/components/esm3/loadregn.hpp
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include "esmcommon.hpp"
+#include "components/esm/esmcommon.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadrepa.cpp b/components/esm3/loadrepa.cpp
similarity index 98%
rename from components/esm/loadrepa.cpp
rename to components/esm3/loadrepa.cpp
index 3fe62e740a..f7349256f0 100644
--- a/components/esm/loadrepa.cpp
+++ b/components/esm3/loadrepa.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadrepa.hpp b/components/esm3/loadrepa.hpp
similarity index 100%
rename from components/esm/loadrepa.hpp
rename to components/esm3/loadrepa.hpp
diff --git a/components/esm/loadscpt.cpp b/components/esm3/loadscpt.cpp
similarity index 99%
rename from components/esm/loadscpt.cpp
rename to components/esm3/loadscpt.cpp
index 76cb3c0149..dfbcc1c7f1 100644
--- a/components/esm/loadscpt.cpp
+++ b/components/esm3/loadscpt.cpp
@@ -4,7 +4,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadscpt.hpp b/components/esm3/loadscpt.hpp
similarity index 97%
rename from components/esm/loadscpt.hpp
rename to components/esm3/loadscpt.hpp
index f737698184..d40a571ec6 100644
--- a/components/esm/loadscpt.hpp
+++ b/components/esm3/loadscpt.hpp
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include "esmcommon.hpp"
+#include "components/esm/esmcommon.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadskil.cpp b/components/esm3/loadskil.cpp
similarity index 99%
rename from components/esm/loadskil.cpp
rename to components/esm3/loadskil.cpp
index 9236302dea..5843b3ddb5 100644
--- a/components/esm/loadskil.cpp
+++ b/components/esm3/loadskil.cpp
@@ -4,7 +4,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadskil.hpp b/components/esm3/loadskil.hpp
similarity index 98%
rename from components/esm/loadskil.hpp
rename to components/esm3/loadskil.hpp
index 404ef06692..cd4cad6a71 100644
--- a/components/esm/loadskil.hpp
+++ b/components/esm3/loadskil.hpp
@@ -4,7 +4,7 @@
 #include <array>
 #include <string>
 
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM {
 
diff --git a/components/esm/loadsndg.cpp b/components/esm3/loadsndg.cpp
similarity index 98%
rename from components/esm/loadsndg.cpp
rename to components/esm3/loadsndg.cpp
index c1170b36c7..17423a061b 100644
--- a/components/esm/loadsndg.cpp
+++ b/components/esm3/loadsndg.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadsndg.hpp b/components/esm3/loadsndg.hpp
similarity index 100%
rename from components/esm/loadsndg.hpp
rename to components/esm3/loadsndg.hpp
diff --git a/components/esm/loadsoun.cpp b/components/esm3/loadsoun.cpp
similarity index 98%
rename from components/esm/loadsoun.cpp
rename to components/esm3/loadsoun.cpp
index 9d58e19e99..109d732da5 100644
--- a/components/esm/loadsoun.cpp
+++ b/components/esm3/loadsoun.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadsoun.hpp b/components/esm3/loadsoun.hpp
similarity index 100%
rename from components/esm/loadsoun.hpp
rename to components/esm3/loadsoun.hpp
diff --git a/components/esm/loadspel.cpp b/components/esm3/loadspel.cpp
similarity index 98%
rename from components/esm/loadspel.cpp
rename to components/esm3/loadspel.cpp
index cc26024426..d113cdd194 100644
--- a/components/esm/loadspel.cpp
+++ b/components/esm3/loadspel.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadspel.hpp b/components/esm3/loadspel.hpp
similarity index 100%
rename from components/esm/loadspel.hpp
rename to components/esm3/loadspel.hpp
diff --git a/components/esm/loadsscr.cpp b/components/esm3/loadsscr.cpp
similarity index 97%
rename from components/esm/loadsscr.cpp
rename to components/esm3/loadsscr.cpp
index 723fb3bf10..59d6eab58e 100644
--- a/components/esm/loadsscr.cpp
+++ b/components/esm3/loadsscr.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadsscr.hpp b/components/esm3/loadsscr.hpp
similarity index 100%
rename from components/esm/loadsscr.hpp
rename to components/esm3/loadsscr.hpp
diff --git a/components/esm/loadstat.cpp b/components/esm3/loadstat.cpp
similarity index 97%
rename from components/esm/loadstat.cpp
rename to components/esm3/loadstat.cpp
index e0c9eb2c7e..a4941f0895 100644
--- a/components/esm/loadstat.cpp
+++ b/components/esm3/loadstat.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadstat.hpp b/components/esm3/loadstat.hpp
similarity index 100%
rename from components/esm/loadstat.hpp
rename to components/esm3/loadstat.hpp
diff --git a/components/esm/loadtes3.cpp b/components/esm3/loadtes3.cpp
similarity index 96%
rename from components/esm/loadtes3.cpp
rename to components/esm3/loadtes3.cpp
index f5cbcd62f2..e39d65298c 100644
--- a/components/esm/loadtes3.cpp
+++ b/components/esm3/loadtes3.cpp
@@ -1,9 +1,9 @@
 #include "loadtes3.hpp"
 
-#include "esmcommon.hpp"
+#include "components/esm/esmcommon.hpp"
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 void ESM::Header::blank()
 {
diff --git a/components/esm/loadtes3.hpp b/components/esm3/loadtes3.hpp
similarity index 97%
rename from components/esm/loadtes3.hpp
rename to components/esm3/loadtes3.hpp
index 014e2a1362..8f5ed68413 100644
--- a/components/esm/loadtes3.hpp
+++ b/components/esm3/loadtes3.hpp
@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include "esmcommon.hpp"
+#include "components/esm/esmcommon.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadweap.cpp b/components/esm3/loadweap.cpp
similarity index 98%
rename from components/esm/loadweap.cpp
rename to components/esm3/loadweap.cpp
index 08c5a3b641..e109096e09 100644
--- a/components/esm/loadweap.cpp
+++ b/components/esm3/loadweap.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadweap.hpp b/components/esm3/loadweap.hpp
similarity index 100%
rename from components/esm/loadweap.hpp
rename to components/esm3/loadweap.hpp
diff --git a/components/esm/locals.cpp b/components/esm3/locals.cpp
similarity index 100%
rename from components/esm/locals.cpp
rename to components/esm3/locals.cpp
diff --git a/components/esm/locals.hpp b/components/esm3/locals.hpp
similarity index 100%
rename from components/esm/locals.hpp
rename to components/esm3/locals.hpp
diff --git a/components/esm/magiceffects.cpp b/components/esm3/magiceffects.cpp
similarity index 100%
rename from components/esm/magiceffects.cpp
rename to components/esm3/magiceffects.cpp
diff --git a/components/esm/magiceffects.hpp b/components/esm3/magiceffects.hpp
similarity index 100%
rename from components/esm/magiceffects.hpp
rename to components/esm3/magiceffects.hpp
diff --git a/components/esm/mappings.cpp b/components/esm3/mappings.cpp
similarity index 100%
rename from components/esm/mappings.cpp
rename to components/esm3/mappings.cpp
diff --git a/components/esm/mappings.hpp b/components/esm3/mappings.hpp
similarity index 78%
rename from components/esm/mappings.hpp
rename to components/esm3/mappings.hpp
index f930fef152..e2fa1b62c3 100644
--- a/components/esm/mappings.hpp
+++ b/components/esm3/mappings.hpp
@@ -3,8 +3,8 @@
 
 #include <string>
 
-#include <components/esm/loadarmo.hpp>
-#include <components/esm/loadbody.hpp>
+#include <components/esm3/loadarmo.hpp>
+#include <components/esm3/loadbody.hpp>
 
 namespace ESM
 {
diff --git a/components/esm/npcstate.cpp b/components/esm3/npcstate.cpp
similarity index 100%
rename from components/esm/npcstate.cpp
rename to components/esm3/npcstate.cpp
diff --git a/components/esm/npcstate.hpp b/components/esm3/npcstate.hpp
similarity index 100%
rename from components/esm/npcstate.hpp
rename to components/esm3/npcstate.hpp
diff --git a/components/esm/npcstats.cpp b/components/esm3/npcstats.cpp
similarity index 100%
rename from components/esm/npcstats.cpp
rename to components/esm3/npcstats.cpp
diff --git a/components/esm/npcstats.hpp b/components/esm3/npcstats.hpp
similarity index 100%
rename from components/esm/npcstats.hpp
rename to components/esm3/npcstats.hpp
diff --git a/components/esm/objectstate.cpp b/components/esm3/objectstate.cpp
similarity index 100%
rename from components/esm/objectstate.cpp
rename to components/esm3/objectstate.cpp
diff --git a/components/esm/objectstate.hpp b/components/esm3/objectstate.hpp
similarity index 97%
rename from components/esm/objectstate.hpp
rename to components/esm3/objectstate.hpp
index b30f44b5e1..eb09e2e854 100644
--- a/components/esm/objectstate.hpp
+++ b/components/esm3/objectstate.hpp
@@ -6,7 +6,7 @@
 
 #include "cellref.hpp"
 #include "locals.hpp"
-#include "luascripts.hpp"
+#include "components/esm/luascripts.hpp"
 #include "animationstate.hpp"
 
 namespace ESM
diff --git a/components/esm/player.cpp b/components/esm3/player.cpp
similarity index 100%
rename from components/esm/player.cpp
rename to components/esm3/player.cpp
diff --git a/components/esm/player.hpp b/components/esm3/player.hpp
similarity index 93%
rename from components/esm/player.hpp
rename to components/esm3/player.hpp
index bea29cf74a..d69571705d 100644
--- a/components/esm/player.hpp
+++ b/components/esm3/player.hpp
@@ -5,10 +5,10 @@
 
 #include "npcstate.hpp"
 #include "cellid.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 #include "loadskil.hpp"
-#include "attr.hpp"
+#include "components/esm/attr.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/projectilestate.cpp b/components/esm3/projectilestate.cpp
similarity index 100%
rename from components/esm/projectilestate.cpp
rename to components/esm3/projectilestate.cpp
diff --git a/components/esm/projectilestate.hpp b/components/esm3/projectilestate.hpp
similarity index 96%
rename from components/esm/projectilestate.hpp
rename to components/esm3/projectilestate.hpp
index 84292813ce..2b2f0d137b 100644
--- a/components/esm/projectilestate.hpp
+++ b/components/esm3/projectilestate.hpp
@@ -8,7 +8,7 @@
 
 #include "effectlist.hpp"
 
-#include "util.hpp"
+#include "components/esm/util.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/queststate.cpp b/components/esm3/queststate.cpp
similarity index 100%
rename from components/esm/queststate.cpp
rename to components/esm3/queststate.cpp
diff --git a/components/esm/queststate.hpp b/components/esm3/queststate.hpp
similarity index 100%
rename from components/esm/queststate.hpp
rename to components/esm3/queststate.hpp
diff --git a/components/esm/quickkeys.cpp b/components/esm3/quickkeys.cpp
similarity index 100%
rename from components/esm/quickkeys.cpp
rename to components/esm3/quickkeys.cpp
diff --git a/components/esm/quickkeys.hpp b/components/esm3/quickkeys.hpp
similarity index 100%
rename from components/esm/quickkeys.hpp
rename to components/esm3/quickkeys.hpp
diff --git a/components/esm/savedgame.cpp b/components/esm3/savedgame.cpp
similarity index 100%
rename from components/esm/savedgame.cpp
rename to components/esm3/savedgame.cpp
diff --git a/components/esm/savedgame.hpp b/components/esm3/savedgame.hpp
similarity index 96%
rename from components/esm/savedgame.hpp
rename to components/esm3/savedgame.hpp
index 26efae824e..46180bb704 100644
--- a/components/esm/savedgame.hpp
+++ b/components/esm3/savedgame.hpp
@@ -4,7 +4,7 @@
 #include <vector>
 #include <string>
 
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/spelllist.cpp b/components/esm3/spelllist.cpp
similarity index 100%
rename from components/esm/spelllist.cpp
rename to components/esm3/spelllist.cpp
diff --git a/components/esm/spelllist.hpp b/components/esm3/spelllist.hpp
similarity index 100%
rename from components/esm/spelllist.hpp
rename to components/esm3/spelllist.hpp
diff --git a/components/esm/spellstate.cpp b/components/esm3/spellstate.cpp
similarity index 100%
rename from components/esm/spellstate.cpp
rename to components/esm3/spellstate.cpp
diff --git a/components/esm/spellstate.hpp b/components/esm3/spellstate.hpp
similarity index 97%
rename from components/esm/spellstate.hpp
rename to components/esm3/spellstate.hpp
index e7067dae8c..bb909c506c 100644
--- a/components/esm/spellstate.hpp
+++ b/components/esm3/spellstate.hpp
@@ -6,7 +6,7 @@
 #include <string>
 #include <set>
 
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/statstate.cpp b/components/esm3/statstate.cpp
similarity index 100%
rename from components/esm/statstate.cpp
rename to components/esm3/statstate.cpp
diff --git a/components/esm/statstate.hpp b/components/esm3/statstate.hpp
similarity index 100%
rename from components/esm/statstate.hpp
rename to components/esm3/statstate.hpp
diff --git a/components/esm/stolenitems.cpp b/components/esm3/stolenitems.cpp
similarity index 94%
rename from components/esm/stolenitems.cpp
rename to components/esm3/stolenitems.cpp
index c51b0b99b0..e196fc80c2 100644
--- a/components/esm/stolenitems.cpp
+++ b/components/esm3/stolenitems.cpp
@@ -1,7 +1,7 @@
 #include "stolenitems.hpp"
 
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 
 namespace ESM
 {
diff --git a/components/esm/stolenitems.hpp b/components/esm3/stolenitems.hpp
similarity index 100%
rename from components/esm/stolenitems.hpp
rename to components/esm3/stolenitems.hpp
diff --git a/components/esm/transport.cpp b/components/esm3/transport.cpp
similarity index 92%
rename from components/esm/transport.cpp
rename to components/esm3/transport.cpp
index 9d40debf73..958ef6949a 100644
--- a/components/esm/transport.cpp
+++ b/components/esm3/transport.cpp
@@ -2,8 +2,8 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 
 namespace ESM
 {
diff --git a/components/esm/transport.hpp b/components/esm3/transport.hpp
similarity index 94%
rename from components/esm/transport.hpp
rename to components/esm3/transport.hpp
index 10d4013f72..f1e5f2103b 100644
--- a/components/esm/transport.hpp
+++ b/components/esm3/transport.hpp
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/variant.cpp b/components/esm3/variant.cpp
similarity index 99%
rename from components/esm/variant.cpp
rename to components/esm3/variant.cpp
index 830e13f3e4..a0f6ca7b41 100644
--- a/components/esm/variant.cpp
+++ b/components/esm3/variant.cpp
@@ -6,7 +6,7 @@
 #include "esmreader.hpp"
 #include "variantimp.hpp"
 
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace
 {
diff --git a/components/esm/variant.hpp b/components/esm3/variant.hpp
similarity index 100%
rename from components/esm/variant.hpp
rename to components/esm3/variant.hpp
diff --git a/components/esm/variantimp.cpp b/components/esm3/variantimp.cpp
similarity index 100%
rename from components/esm/variantimp.cpp
rename to components/esm3/variantimp.cpp
diff --git a/components/esm/variantimp.hpp b/components/esm3/variantimp.hpp
similarity index 100%
rename from components/esm/variantimp.hpp
rename to components/esm3/variantimp.hpp
diff --git a/components/esm/weatherstate.cpp b/components/esm3/weatherstate.cpp
similarity index 100%
rename from components/esm/weatherstate.cpp
rename to components/esm3/weatherstate.cpp
diff --git a/components/esm/weatherstate.hpp b/components/esm3/weatherstate.hpp
similarity index 100%
rename from components/esm/weatherstate.hpp
rename to components/esm3/weatherstate.hpp
diff --git a/components/esmloader/esmdata.cpp b/components/esmloader/esmdata.cpp
index bf2a8675d2..fd7d0f622c 100644
--- a/components/esmloader/esmdata.cpp
+++ b/components/esmloader/esmdata.cpp
@@ -3,13 +3,13 @@
 #include "record.hpp"
 
 #include <components/esm/defs.hpp>
-#include <components/esm/loadacti.hpp>
-#include <components/esm/loadcont.hpp>
-#include <components/esm/loaddoor.hpp>
-#include <components/esm/loadgmst.hpp>
-#include <components/esm/loadland.hpp>
-#include <components/esm/loadstat.hpp>
-#include <components/esm/variant.hpp>
+#include <components/esm3/loadacti.hpp>
+#include <components/esm3/loadcont.hpp>
+#include <components/esm3/loaddoor.hpp>
+#include <components/esm3/loadgmst.hpp>
+#include <components/esm3/loadland.hpp>
+#include <components/esm3/loadstat.hpp>
+#include <components/esm3/variant.hpp>
 #include <components/misc/stringops.hpp>
 
 #include <algorithm>
diff --git a/components/esmloader/load.cpp b/components/esmloader/load.cpp
index 842cc8003a..14478a6c85 100644
--- a/components/esmloader/load.cpp
+++ b/components/esmloader/load.cpp
@@ -4,16 +4,16 @@
 #include "record.hpp"
 
 #include <components/debug/debuglog.hpp>
-#include <components/esm/cellref.hpp>
+#include <components/esm3/cellref.hpp>
 #include <components/esm/defs.hpp>
-#include <components/esm/esmreader.hpp>
-#include <components/esm/loadacti.hpp>
-#include <components/esm/loadcell.hpp>
-#include <components/esm/loadcont.hpp>
-#include <components/esm/loaddoor.hpp>
-#include <components/esm/loadgmst.hpp>
-#include <components/esm/loadland.hpp>
-#include <components/esm/loadstat.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/loadacti.hpp>
+#include <components/esm3/loadcell.hpp>
+#include <components/esm3/loadcont.hpp>
+#include <components/esm3/loaddoor.hpp>
+#include <components/esm3/loadgmst.hpp>
+#include <components/esm3/loadland.hpp>
+#include <components/esm3/loadstat.hpp>
 #include <components/files/collections.hpp>
 #include <components/files/multidircollection.hpp>
 #include <components/misc/resourcehelpers.hpp>
diff --git a/components/esmloader/load.hpp b/components/esmloader/load.hpp
index 39d6f48b81..eae592260a 100644
--- a/components/esmloader/load.hpp
+++ b/components/esmloader/load.hpp
@@ -1,7 +1,7 @@
 #ifndef OPENMW_COMPONENTS_ESMLOADER_LOAD_H
 #define OPENMW_COMPONENTS_ESMLOADER_LOAD_H
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 #include <string>
 #include <vector>
diff --git a/components/esmloader/record.hpp b/components/esmloader/record.hpp
index c076ee72c6..b88991cca1 100644
--- a/components/esmloader/record.hpp
+++ b/components/esmloader/record.hpp
@@ -1,7 +1,7 @@
 #ifndef OPENMW_COMPONENTS_ESMLOADER_RECORD_H
 #define OPENMW_COMPONENTS_ESMLOADER_RECORD_H
 
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadcell.hpp>
 
 #include <algorithm>
 #include <utility>
diff --git a/components/esmterrain/storage.hpp b/components/esmterrain/storage.hpp
index 107255a7af..a2ac625c6c 100644
--- a/components/esmterrain/storage.hpp
+++ b/components/esmterrain/storage.hpp
@@ -6,8 +6,8 @@
 
 #include <components/terrain/storage.hpp>
 
-#include <components/esm/loadland.hpp>
-#include <components/esm/loadltex.hpp>
+#include <components/esm3/loadland.hpp>
+#include <components/esm3/loadltex.hpp>
 
 namespace VFS
 {
diff --git a/components/lua/configuration.hpp b/components/lua/configuration.hpp
index 32eddf399c..5baa4f24cf 100644
--- a/components/lua/configuration.hpp
+++ b/components/lua/configuration.hpp
@@ -4,7 +4,7 @@
 #include <map>
 #include <optional>
 
-#include <components/esm/luascripts.hpp>
+#include "components/esm/luascripts.hpp"
 
 namespace LuaUtil
 {
diff --git a/components/misc/convert.hpp b/components/misc/convert.hpp
index 45f3504dc1..81879cbf89 100644
--- a/components/misc/convert.hpp
+++ b/components/misc/convert.hpp
@@ -2,7 +2,7 @@
 #define OPENMW_COMPONENTS_MISC_CONVERT_H
 
 #include <components/esm/defs.hpp>
-#include <components/esm/loadpgrd.hpp>
+#include <components/esm3/loadpgrd.hpp>
 
 #include <LinearMath/btTransform.h>
 #include <LinearMath/btVector3.h>
diff --git a/components/misc/coordinateconverter.hpp b/components/misc/coordinateconverter.hpp
index 1906414150..42e772c16d 100644
--- a/components/misc/coordinateconverter.hpp
+++ b/components/misc/coordinateconverter.hpp
@@ -2,9 +2,9 @@
 #define OPENMW_COMPONENTS_MISC_COORDINATECONVERTER_H
 
 #include <components/esm/defs.hpp>
-#include <components/esm/loadcell.hpp>
-#include <components/esm/loadland.hpp>
-#include <components/esm/loadpgrd.hpp>
+#include <components/esm3/loadcell.hpp>
+#include <components/esm3/loadland.hpp>
+#include <components/esm3/loadpgrd.hpp>
 
 namespace Misc
 {
diff --git a/components/sceneutil/lightutil.cpp b/components/sceneutil/lightutil.cpp
index 2a5a945558..07b41ac814 100644
--- a/components/sceneutil/lightutil.cpp
+++ b/components/sceneutil/lightutil.cpp
@@ -4,7 +4,7 @@
 #include <osg/Group>
 #include <osg/ComputeBoundsVisitor>
 
-#include <components/esm/loadligh.hpp>
+#include <components/esm3/loadligh.hpp>
 #include <components/fallback/fallback.hpp>
 
 #include "lightmanager.hpp"
diff --git a/components/sceneutil/pathgridutil.cpp b/components/sceneutil/pathgridutil.cpp
index 9ebdef61b0..6bfc724d7b 100644
--- a/components/sceneutil/pathgridutil.cpp
+++ b/components/sceneutil/pathgridutil.cpp
@@ -3,7 +3,7 @@
 #include <osg/Geometry>
 #include <osg/Material>
 
-#include <components/esm/loadpgrd.hpp>
+#include <components/esm3/loadpgrd.hpp>
 
 namespace SceneUtil
 {
diff --git a/components/terrain/cellborder.cpp b/components/terrain/cellborder.cpp
index 927530660e..05d212ef4f 100644
--- a/components/terrain/cellborder.cpp
+++ b/components/terrain/cellborder.cpp
@@ -5,7 +5,7 @@
 #include <osg/Geometry>
 
 #include "world.hpp"
-#include "../esm/loadland.hpp"
+#include "../esm3/loadland.hpp"
 
 #include <components/resource/scenemanager.hpp>
 #include <components/terrain/storage.hpp>

From a126e29a19565d731488528aca97c712344ac739 Mon Sep 17 00:00:00 2001
From: Bret Curtis <bret.curtis@gmail.com>
Date: Sat, 22 Jan 2022 16:20:45 +0100
Subject: [PATCH 1978/2859] relative to absolute path

---
 components/terrain/cellborder.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/terrain/cellborder.cpp b/components/terrain/cellborder.cpp
index 05d212ef4f..342df759a5 100644
--- a/components/terrain/cellborder.cpp
+++ b/components/terrain/cellborder.cpp
@@ -5,8 +5,8 @@
 #include <osg/Geometry>
 
 #include "world.hpp"
-#include "../esm3/loadland.hpp"
 
+#include <components/esm3/loadland.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/terrain/storage.hpp>
 

From cdbab2325f3ed96c3f14ad1bcd325306b7532d47 Mon Sep 17 00:00:00 2001
From: Bret Curtis <bret.curtis@gmail.com>
Date: Sat, 22 Jan 2022 23:52:08 +0100
Subject: [PATCH 1979/2859] rename esmterrain to esm3terrain

---
 apps/opencs/view/render/terrainstorage.cpp         | 5 -----
 apps/opencs/view/render/terrainstorage.hpp         | 4 ++--
 apps/openmw/mwrender/landmanager.hpp               | 2 +-
 apps/openmw/mwrender/terrainstorage.hpp            | 2 +-
 components/CMakeLists.txt                          | 2 +-
 components/{esmterrain => esm3terrain}/storage.cpp | 0
 components/{esmterrain => esm3terrain}/storage.hpp | 0
 7 files changed, 5 insertions(+), 10 deletions(-)
 rename components/{esmterrain => esm3terrain}/storage.cpp (100%)
 rename components/{esmterrain => esm3terrain}/storage.hpp (100%)

diff --git a/apps/opencs/view/render/terrainstorage.cpp b/apps/opencs/view/render/terrainstorage.cpp
index 035c073567..c015a6d620 100644
--- a/apps/opencs/view/render/terrainstorage.cpp
+++ b/apps/opencs/view/render/terrainstorage.cpp
@@ -1,10 +1,5 @@
 #include "terrainstorage.hpp"
 
-#include "../../model/world/land.hpp"
-#include "../../model/world/landtexture.hpp"
-
-#include <components/esmterrain/storage.hpp>
-
 namespace CSVRender
 {
     TerrainStorage::TerrainStorage(const CSMWorld::Data &data)
diff --git a/apps/opencs/view/render/terrainstorage.hpp b/apps/opencs/view/render/terrainstorage.hpp
index 762eb80036..d9320d72f3 100644
--- a/apps/opencs/view/render/terrainstorage.hpp
+++ b/apps/opencs/view/render/terrainstorage.hpp
@@ -3,7 +3,7 @@
 
 #include <array>
 
-#include <components/esmterrain/storage.hpp>
+#include <components/esm3terrain/storage.hpp>
 
 #include "../../model/world/data.hpp"
 
@@ -25,7 +25,7 @@ namespace CSVRender
 
     private:
         const CSMWorld::Data& mData;
-        std::array<float, ESM::Land::LAND_SIZE * ESM::Land::LAND_SIZE> mAlteredHeight;
+        std::array<float, ESM::Land::LAND_SIZE * ESM::Land::LAND_SIZE> mAlteredHeight{};
 
         osg::ref_ptr<const ESMTerrain::LandObject> getLand (int cellX, int cellY) override;
         const ESM::LandTexture* getLandTexture(int index, short plugin) override;
diff --git a/apps/openmw/mwrender/landmanager.hpp b/apps/openmw/mwrender/landmanager.hpp
index f3cc860854..e4b068eb76 100644
--- a/apps/openmw/mwrender/landmanager.hpp
+++ b/apps/openmw/mwrender/landmanager.hpp
@@ -4,7 +4,7 @@
 #include <osg/Object>
 
 #include <components/resource/resourcemanager.hpp>
-#include <components/esmterrain/storage.hpp>
+#include <components/esm3terrain/storage.hpp>
 
 namespace ESM
 {
diff --git a/apps/openmw/mwrender/terrainstorage.hpp b/apps/openmw/mwrender/terrainstorage.hpp
index 90bf42b841..edea556157 100644
--- a/apps/openmw/mwrender/terrainstorage.hpp
+++ b/apps/openmw/mwrender/terrainstorage.hpp
@@ -3,7 +3,7 @@
 
 #include <memory>
 
-#include <components/esmterrain/storage.hpp>
+#include <components/esm3terrain/storage.hpp>
 
 #include <components/resource/resourcesystem.hpp>
 
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 1f70091247..9ab2c4b34f 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -90,7 +90,7 @@ add_component_dir (esm3
     aisequence magiceffects custommarkerstate stolenitems transport animationstate controlsstate mappings
     )
 
-add_component_dir (esmterrain
+add_component_dir (esm3terrain
     storage
     )
 
diff --git a/components/esmterrain/storage.cpp b/components/esm3terrain/storage.cpp
similarity index 100%
rename from components/esmterrain/storage.cpp
rename to components/esm3terrain/storage.cpp
diff --git a/components/esmterrain/storage.hpp b/components/esm3terrain/storage.hpp
similarity index 100%
rename from components/esmterrain/storage.hpp
rename to components/esm3terrain/storage.hpp

From 74e7cfc02315f3de16cfc971aff49c6105d6da25 Mon Sep 17 00:00:00 2001
From: Bret Curtis <bret.curtis@gmail.com>
Date: Sat, 22 Jan 2022 22:44:02 +0100
Subject: [PATCH 1980/2859] remove unused includes: part1

remove unused imports: part2

revert one tidy we will keep for c++20
---
 apps/esmtool/esmtool.cpp                     |  1 -
 apps/essimporter/importer.cpp                |  1 -
 apps/essimporter/importscpt.cpp              |  1 -
 apps/essimporter/importscri.cpp              |  1 +
 apps/essimporter/main.cpp                    |  1 -
 apps/launcher/datafilespage.cpp              |  1 -
 apps/launcher/datafilespage.hpp              |  2 --
 apps/launcher/maindialog.hpp                 |  1 -
 apps/mwiniimporter/importer.cpp              |  3 +--
 apps/navmeshtool/main.cpp                    |  1 -
 apps/navmeshtool/navmesh.cpp                 | 12 ------------
 apps/navmeshtool/worldspacedata.cpp          |  4 ----
 apps/niftest/niftest.cpp                     |  1 -
 apps/opencs/model/doc/savingstages.cpp       |  2 --
 apps/opencs/model/tools/classcheck.cpp       |  1 -
 apps/opencs/model/tools/factioncheck.cpp     |  1 -
 apps/opencs/model/tools/mergestate.hpp       |  2 +-
 apps/opencs/model/tools/spellcheck.cpp       |  4 ----
 apps/opencs/model/world/data.cpp             |  1 -
 apps/opencs/model/world/idtable.cpp          |  1 -
 apps/opencs/model/world/refidadapterimp.cpp  |  2 --
 apps/opencs/view/doc/filedialog.cpp          |  5 -----
 apps/opencs/view/render/cell.cpp             |  8 --------
 apps/opencs/view/render/commands.cpp         |  6 ------
 apps/opencs/view/render/terrainselection.cpp |  2 --
 apps/opencs/view/render/terrainshapemode.cpp | 11 -----------
 apps/opencs/view/render/terrainstorage.cpp   |  3 +++
 apps/opencs/view/render/terrainstorage.hpp   |  2 +-
 apps/opencs/view/world/dialoguecreator.cpp   |  4 ----
 apps/opencs/view/world/globalcreator.cpp     |  2 --
 apps/opencs/view/world/table.cpp             |  3 ---
 apps/openmw/engine.cpp                       |  3 ---
 apps/openmw/mwbase/dialoguemanager.hpp       |  2 +-
 apps/openmw/mwbase/inputmanager.hpp          |  2 +-
 apps/openmw/mwbase/journal.hpp               |  2 +-
 apps/openmw/mwbase/mechanicsmanager.hpp      |  2 +-
 apps/openmw/mwbase/windowmanager.hpp         |  2 +-
 apps/openmw/mwclass/container.cpp            |  3 ---
 apps/openmw/mwgui/alchemywindow.cpp          |  1 -
 apps/openmw/mwgui/bookpage.cpp               |  2 --
 apps/openmw/mwgui/bookpage.hpp               |  2 +-
 apps/openmw/mwgui/formatting.cpp             |  5 +----
 apps/openmw/mwgui/hud.cpp                    |  1 -
 apps/openmw/mwgui/inventorywindow.cpp        |  3 ---
 apps/openmw/mwgui/journalviewmodel.hpp       |  2 +-
 apps/openmw/mwgui/mapwindow.hpp              |  2 +-
 apps/openmw/mwgui/spellbuyingwindow.cpp      |  3 ---
 apps/openmw/mwgui/spellcreationdialog.cpp    |  6 ------
 apps/openmw/mwgui/travelwindow.cpp           |  5 +----
 apps/openmw/mwgui/widgets.cpp                |  6 +-----
 apps/openmw/mwmechanics/aifollow.hpp         |  5 +----
 apps/openmw/mwrender/localmap.cpp            |  3 +--
 apps/openmw/mwrender/renderingmanager.cpp    |  3 ---
 apps/openmw/mwscript/globalscripts.hpp       |  2 +-
 apps/openmw/mwsound/ffmpeg_decoder.hpp       |  2 +-
 apps/openmw/mwsound/loudness.cpp             |  2 +-
 apps/openmw/mwsound/openal_output.cpp        |  3 +--
 apps/openmw/mwworld/cellref.cpp              |  2 +-
 apps/openmw/mwworld/class.cpp                |  2 --
 apps/openmw/mwworld/esmstore.cpp             |  1 -
 apps/openmw/mwworld/globals.hpp              |  2 +-
 apps/openmw/mwworld/player.cpp               |  1 -
 apps/openmw/mwworld/scene.cpp                |  3 ---
 apps/openmw/mwworld/weather.hpp              |  2 +-
 apps/openmw/options.cpp                      |  1 -
 apps/wizard/mainwizard.cpp                   |  1 -
 apps/wizard/unshield/unshieldworker.cpp      |  1 -
 components/misc/convert.hpp                  |  5 +----
 components/nifbullet/bulletnifloader.cpp     |  1 -
 components/terrain/quadtreeworld.cpp         |  1 -
 70 files changed, 28 insertions(+), 159 deletions(-)

diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp
index 60509d7c87..aaa5e16be5 100644
--- a/apps/esmtool/esmtool.cpp
+++ b/apps/esmtool/esmtool.cpp
@@ -4,7 +4,6 @@
 #include <list>
 #include <unordered_set>
 #include <map>
-#include <set>
 #include <fstream>
 #include <cmath>
 
diff --git a/apps/essimporter/importer.cpp b/apps/essimporter/importer.cpp
index 996a24b011..710c2e9ab2 100644
--- a/apps/essimporter/importer.cpp
+++ b/apps/essimporter/importer.cpp
@@ -2,7 +2,6 @@
 
 #include <iomanip>
 
-#include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
 
 #include <osgDB/ReadFile>
diff --git a/apps/essimporter/importscpt.cpp b/apps/essimporter/importscpt.cpp
index 4df46ddc8d..5760d8b438 100644
--- a/apps/essimporter/importscpt.cpp
+++ b/apps/essimporter/importscpt.cpp
@@ -3,7 +3,6 @@
 #include <components/esm3/esmreader.hpp>
 
 
-
 namespace ESSImport
 {
 
diff --git a/apps/essimporter/importscri.cpp b/apps/essimporter/importscri.cpp
index 91971dde3b..40a5516147 100644
--- a/apps/essimporter/importscri.cpp
+++ b/apps/essimporter/importscri.cpp
@@ -2,6 +2,7 @@
 
 #include <components/esm3/esmreader.hpp>
 
+
 namespace ESSImport
 {
 
diff --git a/apps/essimporter/main.cpp b/apps/essimporter/main.cpp
index 9b969e35af..e81368c607 100644
--- a/apps/essimporter/main.cpp
+++ b/apps/essimporter/main.cpp
@@ -11,7 +11,6 @@ namespace bpo = boost::program_options;
 namespace bfs = boost::filesystem;
 
 
-
 int main(int argc, char** argv)
 {
     try
diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index f5efa8bbcc..c1fecf86db 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -21,7 +21,6 @@
 #include <components/config/launchersettings.hpp>
 
 #include "utils/textinputdialog.hpp"
-#include "utils/profilescombobox.hpp"
 
 
 const char *Launcher::DataFilesPage::mDefaultContentListName = "Default";
diff --git a/apps/launcher/datafilespage.hpp b/apps/launcher/datafilespage.hpp
index a039237590..36b69d4f8e 100644
--- a/apps/launcher/datafilespage.hpp
+++ b/apps/launcher/datafilespage.hpp
@@ -6,8 +6,6 @@
 #include <components/process/processinvoker.hpp>
 
 #include <QWidget>
-
-
 #include <QDir>
 #include <QStringList>
 
diff --git a/apps/launcher/maindialog.hpp b/apps/launcher/maindialog.hpp
index 398ba882c4..ee81185dd5 100644
--- a/apps/launcher/maindialog.hpp
+++ b/apps/launcher/maindialog.hpp
@@ -5,7 +5,6 @@
 #ifndef Q_MOC_RUN
 #include <components/files/configurationmanager.hpp>
 
-
 #include <components/process/processinvoker.hpp>
 
 #include <components/config/gamesettings.hpp>
diff --git a/apps/mwiniimporter/importer.cpp b/apps/mwiniimporter/importer.cpp
index 68f266ed6e..35d9701803 100644
--- a/apps/mwiniimporter/importer.cpp
+++ b/apps/mwiniimporter/importer.cpp
@@ -1,13 +1,12 @@
 #include "importer.hpp"
 
 #include <iostream>
-#include <sstream>
 #include <components/misc/stringops.hpp>
 #include <components/esm3/esmreader.hpp>
 
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
-#include <boost/version.hpp>
+
 
 namespace bfs = boost::filesystem;
 
diff --git a/apps/navmeshtool/main.cpp b/apps/navmeshtool/main.cpp
index aee040bb9d..8e46170e63 100644
--- a/apps/navmeshtool/main.cpp
+++ b/apps/navmeshtool/main.cpp
@@ -28,7 +28,6 @@
 
 #include <cstddef>
 #include <stdexcept>
-#include <string>
 #include <thread>
 #include <vector>
 
diff --git a/apps/navmeshtool/navmesh.cpp b/apps/navmeshtool/navmesh.cpp
index d59d274c21..94cac36f51 100644
--- a/apps/navmeshtool/navmesh.cpp
+++ b/apps/navmeshtool/navmesh.cpp
@@ -2,37 +2,25 @@
 
 #include "worldspacedata.hpp"
 
-#include <components/bullethelpers/aabb.hpp>
 #include <components/debug/debuglog.hpp>
 #include <components/detournavigator/generatenavmeshtile.hpp>
 #include <components/detournavigator/gettilespositions.hpp>
 #include <components/detournavigator/navmeshdb.hpp>
 #include <components/detournavigator/navmeshdbutils.hpp>
-#include <components/detournavigator/offmeshconnection.hpp>
-#include <components/detournavigator/offmeshconnectionsmanager.hpp>
 #include <components/detournavigator/preparednavmeshdata.hpp>
 #include <components/detournavigator/recastmesh.hpp>
 #include <components/detournavigator/recastmeshprovider.hpp>
 #include <components/detournavigator/serialization.hpp>
-#include <components/detournavigator/tilecachedrecastmeshmanager.hpp>
 #include <components/detournavigator/tileposition.hpp>
-#include <components/esm3/loadcell.hpp>
-#include <components/misc/guarded.hpp>
 #include <components/misc/progressreporter.hpp>
 #include <components/sceneutil/workqueue.hpp>
 #include <components/sqlite3/transaction.hpp>
 
-#include <DetourNavMesh.h>
-
 #include <osg/Vec3f>
 
-#include <algorithm>
 #include <atomic>
 #include <chrono>
 #include <cstddef>
-#include <stdexcept>
-#include <string>
-#include <string_view>
 #include <utility>
 #include <vector>
 
diff --git a/apps/navmeshtool/worldspacedata.cpp b/apps/navmeshtool/worldspacedata.cpp
index 227f73ad33..742e6d775d 100644
--- a/apps/navmeshtool/worldspacedata.cpp
+++ b/apps/navmeshtool/worldspacedata.cpp
@@ -1,7 +1,6 @@
 #include "worldspacedata.hpp"
 
 #include <components/bullethelpers/aabb.hpp>
-#include <components/bullethelpers/heightfield.hpp>
 #include <components/debug/debuglog.hpp>
 #include <components/detournavigator/gettilespositions.hpp>
 #include <components/detournavigator/objectid.hpp>
@@ -14,7 +13,6 @@
 #include <components/esmloader/esmdata.hpp>
 #include <components/esmloader/lessbyid.hpp>
 #include <components/esmloader/record.hpp>
-#include <components/misc/coordinateconverter.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/misc/stringops.hpp>
 #include <components/resource/bulletshapemanager.hpp>
@@ -24,7 +22,6 @@
 #include <LinearMath/btVector3.h>
 
 #include <osg/Vec2i>
-#include <osg/Vec3f>
 #include <osg/ref_ptr>
 
 #include <algorithm>
@@ -32,7 +29,6 @@
 #include <stdexcept>
 #include <string>
 #include <string_view>
-#include <thread>
 #include <tuple>
 #include <utility>
 #include <vector>
diff --git a/apps/niftest/niftest.cpp b/apps/niftest/niftest.cpp
index c42df4a423..f857dbde37 100644
--- a/apps/niftest/niftest.cpp
+++ b/apps/niftest/niftest.cpp
@@ -1,7 +1,6 @@
 ///Program to test .nif files both on the FileSystem and in BSA archives.
 
 #include <iostream>
-#include <fstream>
 
 #include <components/misc/stringops.hpp>
 #include <components/nif/niffile.hpp>
diff --git a/apps/opencs/model/doc/savingstages.cpp b/apps/opencs/model/doc/savingstages.cpp
index 5efa474f76..08bd6c81e8 100644
--- a/apps/opencs/model/doc/savingstages.cpp
+++ b/apps/opencs/model/doc/savingstages.cpp
@@ -2,8 +2,6 @@
 
 #include <boost/filesystem.hpp>
 
-#include <QUndoStack>
-
 #include <components/esm3/loaddial.hpp>
 
 #include "../world/infocollection.hpp"
diff --git a/apps/opencs/model/tools/classcheck.cpp b/apps/opencs/model/tools/classcheck.cpp
index aa38ed46ce..aa64805e5d 100644
--- a/apps/opencs/model/tools/classcheck.cpp
+++ b/apps/opencs/model/tools/classcheck.cpp
@@ -7,7 +7,6 @@
 
 #include "../prefs/state.hpp"
 
-#include "../world/universalid.hpp"
 
 CSMTools::ClassCheckStage::ClassCheckStage (const CSMWorld::IdCollection<ESM::Class>& classes)
 : mClasses (classes)
diff --git a/apps/opencs/model/tools/factioncheck.cpp b/apps/opencs/model/tools/factioncheck.cpp
index dbecea9589..2be59c2f9d 100644
--- a/apps/opencs/model/tools/factioncheck.cpp
+++ b/apps/opencs/model/tools/factioncheck.cpp
@@ -6,7 +6,6 @@
 
 #include "../prefs/state.hpp"
 
-#include "../world/universalid.hpp"
 
 CSMTools::FactionCheckStage::FactionCheckStage (const CSMWorld::IdCollection<ESM::Faction>& factions)
 : mFactions (factions)
diff --git a/apps/opencs/model/tools/mergestate.hpp b/apps/opencs/model/tools/mergestate.hpp
index 96e6752e20..a100d7a2e0 100644
--- a/apps/opencs/model/tools/mergestate.hpp
+++ b/apps/opencs/model/tools/mergestate.hpp
@@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_MERGESTATE_H
 #define CSM_TOOLS_MERGESTATE_H
 
-#include <stdint.h>
+#include <cstdint>
 
 #include <memory>
 #include <map>
diff --git a/apps/opencs/model/tools/spellcheck.cpp b/apps/opencs/model/tools/spellcheck.cpp
index 6cec24b705..eb2302aa70 100644
--- a/apps/opencs/model/tools/spellcheck.cpp
+++ b/apps/opencs/model/tools/spellcheck.cpp
@@ -1,13 +1,9 @@
 #include "spellcheck.hpp"
 
-#include <sstream>
-#include <map>
-
 #include <components/esm3/loadspel.hpp>
 
 #include "../prefs/state.hpp"
 
-#include "../world/universalid.hpp"
 
 CSMTools::SpellCheckStage::SpellCheckStage (const CSMWorld::IdCollection<ESM::Spell>& spells)
 : mSpells (spells)
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 2018b3e8fd..12274b912f 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -8,7 +8,6 @@
 #include <components/esm3/esmreader.hpp>
 #include <components/esm/defs.hpp>
 #include <components/esm3/loadglob.hpp>
-#include <components/esm3/cellref.hpp>
 
 #include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/shadow.hpp>
diff --git a/apps/opencs/model/world/idtable.cpp b/apps/opencs/model/world/idtable.cpp
index 2e2ea41761..75213aab84 100644
--- a/apps/opencs/model/world/idtable.cpp
+++ b/apps/opencs/model/world/idtable.cpp
@@ -1,7 +1,6 @@
 #include "idtable.hpp"
 
 #include <algorithm>
-#include <cctype>
 #include <cstdint>
 #include <limits>
 #include <map>
diff --git a/apps/opencs/model/world/refidadapterimp.cpp b/apps/opencs/model/world/refidadapterimp.cpp
index d2c2a46db7..a30dcadd0b 100644
--- a/apps/opencs/model/world/refidadapterimp.cpp
+++ b/apps/opencs/model/world/refidadapterimp.cpp
@@ -1,8 +1,6 @@
 #include "refidadapterimp.hpp"
 
-#include <cassert>
 #include <stdexcept>
-#include <utility>
 
 #include <components/esm3/loadcont.hpp>
 #include <components/esm3/loadmgef.hpp>
diff --git a/apps/opencs/view/doc/filedialog.cpp b/apps/opencs/view/doc/filedialog.cpp
index 946dac047e..51745be0a7 100644
--- a/apps/opencs/view/doc/filedialog.cpp
+++ b/apps/opencs/view/doc/filedialog.cpp
@@ -1,15 +1,10 @@
 #include "filedialog.hpp"
 
-#include <QCheckBox>
 #include <QPushButton>
 #include <QDialogButtonBox>
 #include <QSortFilterProxyModel>
-#include <QRegExpValidator>
 #include <QRegExp>
-#include <QSpacerItem>
-#include <QPushButton>
 #include <QLabel>
-#include <QGroupBox>
 
 #include "components/contentselector/model/esmfile.hpp"
 #include "components/contentselector/view/contentselector.hpp"
diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index 04e52bcd1f..b6aa5c2fd7 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -1,23 +1,15 @@
 #include "cell.hpp"
 
-#include <math.h>
-
 #include <osg/PositionAttitudeTransform>
 #include <osg/Geode>
-#include <osg/Geometry>
 #include <osg/Group>
 
 #include <components/misc/stringops.hpp>
 #include <components/esm3/loadcell.hpp>
 #include <components/esm3/loadland.hpp>
-#include <components/sceneutil/pathgridutil.hpp>
 #include <components/terrain/terraingrid.hpp>
 
 #include "../../model/world/idtable.hpp"
-#include "../../model/world/columns.hpp"
-#include "../../model/world/data.hpp"
-#include "../../model/world/refcollection.hpp"
-#include "../../model/world/cellcoordinates.hpp"
 
 #include "cellwater.hpp"
 #include "cellborder.hpp"
diff --git a/apps/opencs/view/render/commands.cpp b/apps/opencs/view/render/commands.cpp
index 2820d7578d..515948489e 100644
--- a/apps/opencs/view/render/commands.cpp
+++ b/apps/opencs/view/render/commands.cpp
@@ -1,14 +1,8 @@
 #include "commands.hpp"
 
-#include <QPointer>
-
 #include <components/debug/debuglog.hpp>
-#include <components/esm3/loadland.hpp>
 
-#include "editmode.hpp"
-#include "terrainselection.hpp"
 #include "terrainshapemode.hpp"
-#include "terraintexturemode.hpp"
 #include "worldspacewidget.hpp"
 
 CSVRender::DrawTerrainSelectionCommand::DrawTerrainSelectionCommand(WorldspaceWidget* worldspaceWidget, QUndoCommand* parent)
diff --git a/apps/opencs/view/render/terrainselection.cpp b/apps/opencs/view/render/terrainselection.cpp
index 814b011de1..dc1886d57c 100644
--- a/apps/opencs/view/render/terrainselection.cpp
+++ b/apps/opencs/view/render/terrainselection.cpp
@@ -4,11 +4,9 @@
 
 #include <osg/Group>
 #include <osg/Geometry>
-#include <osg/PositionAttitudeTransform>
 
 #include <components/esm3/loadland.hpp>
 
-#include "../../model/world/cellcoordinates.hpp"
 #include "../../model/world/columnimp.hpp"
 #include "../../model/world/idtable.hpp"
 
diff --git a/apps/opencs/view/render/terrainshapemode.cpp b/apps/opencs/view/render/terrainshapemode.cpp
index 9052cc5e6b..baae1807fd 100644
--- a/apps/opencs/view/render/terrainshapemode.cpp
+++ b/apps/opencs/view/render/terrainshapemode.cpp
@@ -2,15 +2,12 @@
 
 #include <algorithm>
 #include <string>
-#include <sstream>
 #include <memory>
 
 #include <QWidget>
 #include <QIcon>
 #include <QEvent>
 #include <QDropEvent>
-#include <QDragEnterEvent>
-#include <QDrag>
 
 #include <osg/Group>
 #include <osg/Vec3f>
@@ -18,20 +15,12 @@
 #include <components/esm3/loadland.hpp>
 #include <components/debug/debuglog.hpp>
 
-#include "../widget/brushshapes.hpp"
-#include "../widget/modebutton.hpp"
 #include "../widget/scenetoolbar.hpp"
 #include "../widget/scenetoolshapebrush.hpp"
 
-#include "../../model/doc/document.hpp"
 #include "../../model/prefs/state.hpp"
-#include "../../model/world/commands.hpp"
-#include "../../model/world/data.hpp"
-#include "../../model/world/idtable.hpp"
 #include "../../model/world/idtree.hpp"
-#include "../../model/world/land.hpp"
 #include "../../model/world/tablemimedata.hpp"
-#include "../../model/world/universalid.hpp"
 
 #include "brushdraw.hpp"
 #include "commands.hpp"
diff --git a/apps/opencs/view/render/terrainstorage.cpp b/apps/opencs/view/render/terrainstorage.cpp
index c015a6d620..a3f1a91b62 100644
--- a/apps/opencs/view/render/terrainstorage.cpp
+++ b/apps/opencs/view/render/terrainstorage.cpp
@@ -1,5 +1,8 @@
 #include "terrainstorage.hpp"
 
+#include <components/esm3terrain/storage.hpp>
+
+
 namespace CSVRender
 {
     TerrainStorage::TerrainStorage(const CSMWorld::Data &data)
diff --git a/apps/opencs/view/render/terrainstorage.hpp b/apps/opencs/view/render/terrainstorage.hpp
index d9320d72f3..dbb39a44ad 100644
--- a/apps/opencs/view/render/terrainstorage.hpp
+++ b/apps/opencs/view/render/terrainstorage.hpp
@@ -25,7 +25,7 @@ namespace CSVRender
 
     private:
         const CSMWorld::Data& mData;
-        std::array<float, ESM::Land::LAND_SIZE * ESM::Land::LAND_SIZE> mAlteredHeight{};
+        std::array<float, ESM::Land::LAND_SIZE * ESM::Land::LAND_SIZE> mAlteredHeight;
 
         osg::ref_ptr<const ESMTerrain::LandObject> getLand (int cellX, int cellY) override;
         const ESM::LandTexture* getLandTexture(int index, short plugin) override;
diff --git a/apps/opencs/view/world/dialoguecreator.cpp b/apps/opencs/view/world/dialoguecreator.cpp
index 82ebee8467..9317aa95cd 100644
--- a/apps/opencs/view/world/dialoguecreator.cpp
+++ b/apps/opencs/view/world/dialoguecreator.cpp
@@ -2,11 +2,7 @@
 
 #include <components/esm3/loaddial.hpp>
 
-#include "../../model/doc/document.hpp"
-
-#include "../../model/world/data.hpp"
 #include "../../model/world/commands.hpp"
-#include "../../model/world/columns.hpp"
 #include "../../model/world/idtable.hpp"
 
 void CSVWorld::DialogueCreator::configureCreateCommand (CSMWorld::CreateCommand& command) const
diff --git a/apps/opencs/view/world/globalcreator.cpp b/apps/opencs/view/world/globalcreator.cpp
index 20a5c75cf6..6c5b75fb56 100644
--- a/apps/opencs/view/world/globalcreator.cpp
+++ b/apps/opencs/view/world/globalcreator.cpp
@@ -2,9 +2,7 @@
 
 #include <components/esm3/variant.hpp>
 
-#include "../../model/world/data.hpp"
 #include "../../model/world/commands.hpp"
-#include "../../model/world/columns.hpp"
 #include "../../model/world/idtable.hpp"
 
 namespace CSVWorld
diff --git a/apps/opencs/view/world/table.cpp b/apps/opencs/view/world/table.cpp
index 643396a057..69242fbca3 100644
--- a/apps/opencs/view/world/table.cpp
+++ b/apps/opencs/view/world/table.cpp
@@ -16,12 +16,9 @@
 
 #include "../../model/world/commands.hpp"
 #include "../../model/world/infotableproxymodel.hpp"
-#include "../../model/world/idtableproxymodel.hpp"
 #include "../../model/world/idtablebase.hpp"
 #include "../../model/world/idtable.hpp"
 #include "../../model/world/landtexturetableproxymodel.hpp"
-#include "../../model/world/record.hpp"
-#include "../../model/world/columns.hpp"
 #include "../../model/world/commanddispatcher.hpp"
 
 #include "../../model/prefs/state.hpp"
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 4ad140465b..9e2e1aedad 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -1,8 +1,6 @@
 #include "engine.hpp"
 
-#include <condition_variable>
 #include <iomanip>
-#include <fstream>
 #include <chrono>
 #include <thread>
 
@@ -11,7 +9,6 @@
 #include <osg/Version>
 
 #include <osgViewer/ViewerEventHandlers>
-#include <osgDB/ReadFile>
 #include <osgDB/WriteFile>
 
 #include <SDL.h>
diff --git a/apps/openmw/mwbase/dialoguemanager.hpp b/apps/openmw/mwbase/dialoguemanager.hpp
index dc1f6f9667..4fbd958381 100644
--- a/apps/openmw/mwbase/dialoguemanager.hpp
+++ b/apps/openmw/mwbase/dialoguemanager.hpp
@@ -5,7 +5,7 @@
 #include <vector>
 #include <list>
 
-#include <stdint.h>
+#include <cstdint>
 
 namespace Loading
 {
diff --git a/apps/openmw/mwbase/inputmanager.hpp b/apps/openmw/mwbase/inputmanager.hpp
index d475d93cd1..e22d7f00bc 100644
--- a/apps/openmw/mwbase/inputmanager.hpp
+++ b/apps/openmw/mwbase/inputmanager.hpp
@@ -6,7 +6,7 @@
 #include <vector>
 
 #include <SDL_gamecontroller.h>
-#include <stdint.h>
+#include <cstdint>
 
 namespace Loading
 {
diff --git a/apps/openmw/mwbase/journal.hpp b/apps/openmw/mwbase/journal.hpp
index cd87928903..ed07392992 100644
--- a/apps/openmw/mwbase/journal.hpp
+++ b/apps/openmw/mwbase/journal.hpp
@@ -5,7 +5,7 @@
 #include <deque>
 #include <map>
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "../mwdialogue/journalentry.hpp"
 #include "../mwdialogue/topic.hpp"
diff --git a/apps/openmw/mwbase/mechanicsmanager.hpp b/apps/openmw/mwbase/mechanicsmanager.hpp
index 484940e3e6..fb9197782b 100644
--- a/apps/openmw/mwbase/mechanicsmanager.hpp
+++ b/apps/openmw/mwbase/mechanicsmanager.hpp
@@ -5,7 +5,7 @@
 #include <vector>
 #include <list>
 #include <set>
-#include <stdint.h>
+#include <cstdint>
 
 #include "../mwmechanics/actorutil.hpp"
 // For MWMechanics::GreetingState
diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index 0d1ace3f0b..3044e13e9b 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -1,7 +1,7 @@
 #ifndef GAME_MWBASE_WINDOWMANAGER_H
 #define GAME_MWBASE_WINDOWMANAGER_H
 
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 #include <vector>
 #include <map>
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index b043b4671d..09d33af414 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -9,11 +9,8 @@
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
 
-#include "../mwworld/ptr.hpp"
 #include "../mwworld/failedaction.hpp"
 #include "../mwworld/nullaction.hpp"
-#include "../mwworld/containerstore.hpp"
-#include "../mwworld/customdata.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/actionharvest.hpp"
diff --git a/apps/openmw/mwgui/alchemywindow.cpp b/apps/openmw/mwgui/alchemywindow.cpp
index fd4a21cf10..618017a7cd 100644
--- a/apps/openmw/mwgui/alchemywindow.cpp
+++ b/apps/openmw/mwgui/alchemywindow.cpp
@@ -16,7 +16,6 @@
 #include "../mwmechanics/actorutil.hpp"
 
 #include "../mwworld/class.hpp"
-#include "../mwworld/esmstore.hpp"
 
 #include <MyGUI_Macros.h>
 #include <components/esm/records.hpp>
diff --git a/apps/openmw/mwgui/bookpage.cpp b/apps/openmw/mwgui/bookpage.cpp
index acaee7de28..56ab2be8c2 100644
--- a/apps/openmw/mwgui/bookpage.cpp
+++ b/apps/openmw/mwgui/bookpage.cpp
@@ -10,8 +10,6 @@
 #include <components/misc/utf8stream.hpp>
 #include <components/sceneutil/depth.hpp>
 
-#include "../mwbase/environment.hpp"
-#include "../mwbase/windowmanager.hpp"
 
 namespace MWGui
 {
diff --git a/apps/openmw/mwgui/bookpage.hpp b/apps/openmw/mwgui/bookpage.hpp
index 512a439929..ab6ef555b0 100644
--- a/apps/openmw/mwgui/bookpage.hpp
+++ b/apps/openmw/mwgui/bookpage.hpp
@@ -7,7 +7,7 @@
 
 #include <functional>
 #include <memory>
-#include <stdint.h>
+#include <cstdint>
 
 #include <components/settings/settings.hpp>
 
diff --git a/apps/openmw/mwgui/formatting.cpp b/apps/openmw/mwgui/formatting.cpp
index 156dc5b0d6..f416fbe07c 100644
--- a/apps/openmw/mwgui/formatting.cpp
+++ b/apps/openmw/mwgui/formatting.cpp
@@ -15,9 +15,7 @@
 
 #include "../mwscript/interpretercontext.hpp"
 
-namespace MWGui
-{
-    namespace Formatting
+namespace MWGui::Formatting
     {
         /* BookTextParser */
         BookTextParser::BookTextParser(const std::string & text)
@@ -489,4 +487,3 @@ namespace MWGui
             return mPaginator.getCurrentTop();
         }
     }
-}
diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp
index f6136791e9..4ed54c38d6 100644
--- a/apps/openmw/mwgui/hud.cpp
+++ b/apps/openmw/mwgui/hud.cpp
@@ -16,7 +16,6 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
 
-#include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/actorutil.hpp"
 
diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index 0e76c2429f..80e922fb66 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -27,8 +27,6 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/actionequip.hpp"
 
-#include "../mwmechanics/actorutil.hpp"
-#include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/npcstats.hpp"
 
 #include "itemview.hpp"
@@ -38,7 +36,6 @@
 #include "countdialog.hpp"
 #include "tradewindow.hpp"
 #include "draganddrop.hpp"
-#include "widgets.hpp"
 #include "tooltips.hpp"
 
 namespace
diff --git a/apps/openmw/mwgui/journalviewmodel.hpp b/apps/openmw/mwgui/journalviewmodel.hpp
index 3a93721303..eda51b9300 100644
--- a/apps/openmw/mwgui/journalviewmodel.hpp
+++ b/apps/openmw/mwgui/journalviewmodel.hpp
@@ -4,7 +4,7 @@
 #include <string>
 #include <memory>
 #include <functional>
-#include <stdint.h>
+#include <cstdint>
 
 #include <components/misc/utf8stream.hpp>
 
diff --git a/apps/openmw/mwgui/mapwindow.hpp b/apps/openmw/mwgui/mapwindow.hpp
index 3c3d278476..9f6ea1339d 100644
--- a/apps/openmw/mwgui/mapwindow.hpp
+++ b/apps/openmw/mwgui/mapwindow.hpp
@@ -1,7 +1,7 @@
 #ifndef MWGUI_MAPWINDOW_H
 #define MWGUI_MAPWINDOW_H
 
-#include <stdint.h>
+#include <cstdint>
 #include <memory>
 
 #include <osg/Vec2f>
diff --git a/apps/openmw/mwgui/spellbuyingwindow.cpp b/apps/openmw/mwgui/spellbuyingwindow.cpp
index 49870a9ddf..716fd7a0b5 100644
--- a/apps/openmw/mwgui/spellbuyingwindow.cpp
+++ b/apps/openmw/mwgui/spellbuyingwindow.cpp
@@ -11,10 +11,7 @@
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
-#include "../mwworld/esmstore.hpp"
 
-#include "../mwmechanics/creaturestats.hpp"
-#include "../mwmechanics/actorutil.hpp"
 
 namespace MWGui
 {
diff --git a/apps/openmw/mwgui/spellcreationdialog.cpp b/apps/openmw/mwgui/spellcreationdialog.cpp
index 8c0ea865a8..398635b751 100644
--- a/apps/openmw/mwgui/spellcreationdialog.cpp
+++ b/apps/openmw/mwgui/spellcreationdialog.cpp
@@ -8,16 +8,10 @@
 
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
-#include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/class.hpp"
-#include "../mwworld/esmstore.hpp"
 
-#include "../mwmechanics/spells.hpp"
-#include "../mwmechanics/creaturestats.hpp"
-#include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/spellutil.hpp"
 
 #include "tooltips.hpp"
diff --git a/apps/openmw/mwgui/travelwindow.cpp b/apps/openmw/mwgui/travelwindow.cpp
index a42028ee87..4ce3729033 100644
--- a/apps/openmw/mwgui/travelwindow.cpp
+++ b/apps/openmw/mwgui/travelwindow.cpp
@@ -11,15 +11,12 @@
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 
-#include "../mwmechanics/creaturestats.hpp"
-#include "../mwmechanics/actorutil.hpp"
-
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/actionteleport.hpp"
-#include "../mwworld/esmstore.hpp"
 #include "../mwworld/cellstore.hpp"
 
+
 namespace MWGui
 {
     TravelWindow::TravelWindow() :
diff --git a/apps/openmw/mwgui/widgets.cpp b/apps/openmw/mwgui/widgets.cpp
index fb8521f067..6f4c5d9551 100644
--- a/apps/openmw/mwgui/widgets.cpp
+++ b/apps/openmw/mwgui/widgets.cpp
@@ -1,6 +1,5 @@
 #include "widgets.hpp"
 
-#include <sstream>
 #include <iomanip>
 
 #include <MyGUI_ProgressBar.h>
@@ -15,9 +14,7 @@
 
 #include "controllers.hpp"
 
-namespace MWGui
-{
-    namespace Widgets
+namespace MWGui::Widgets
     {
         /* MWSkill */
 
@@ -535,4 +532,3 @@ namespace MWGui
             assignWidget(mBarTextWidget, "BarText");
         }
     }
-}
diff --git a/apps/openmw/mwmechanics/aifollow.hpp b/apps/openmw/mwmechanics/aifollow.hpp
index b83e464fa1..1b7ab7a632 100644
--- a/apps/openmw/mwmechanics/aifollow.hpp
+++ b/apps/openmw/mwmechanics/aifollow.hpp
@@ -9,13 +9,10 @@
 
 #include "../mwworld/ptr.hpp"
 
-namespace ESM
-{
-namespace AiSequence
+namespace ESM::AiSequence
 {
     struct AiFollow;
 }
-}
 
 namespace MWMechanics
 {
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index 202420fee6..9a645312d5 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -1,6 +1,6 @@
 #include "localmap.hpp"
 
-#include <stdint.h>
+#include <cstdint>
 
 #include <osg/Fog>
 #include <osg/LightModel>
@@ -31,7 +31,6 @@
 #include "../mwworld/cellstore.hpp"
 
 #include "vismask.hpp"
-#include "util.hpp"
 
 namespace
 {
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 7416ec988a..6c9ff173ae 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -11,7 +11,6 @@
 #include <osg/Group>
 #include <osg/UserDataContainer>
 #include <osg/ComputeBoundsVisitor>
-#include <osg/Depth>
 #include <osg/ClipControl>
 
 #include <osgUtil/LineSegmentIntersector>
@@ -24,7 +23,6 @@
 
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/imagemanager.hpp>
-#include <components/resource/scenemanager.hpp>
 #include <components/resource/keyframemanager.hpp>
 
 #include <components/shader/removedalphafunc.hpp>
@@ -51,7 +49,6 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/groundcoverstore.hpp"
 #include "../mwgui/loadingscreen.hpp"
-#include "../mwbase/windowmanager.hpp"
 #include "../mwmechanics/actorutil.hpp"
 
 #include "sky.hpp"
diff --git a/apps/openmw/mwscript/globalscripts.hpp b/apps/openmw/mwscript/globalscripts.hpp
index cd70f4e667..f0eaf88739 100644
--- a/apps/openmw/mwscript/globalscripts.hpp
+++ b/apps/openmw/mwscript/globalscripts.hpp
@@ -8,7 +8,7 @@
 #include <memory>
 #include <utility>
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "locals.hpp"
 
diff --git a/apps/openmw/mwsound/ffmpeg_decoder.hpp b/apps/openmw/mwsound/ffmpeg_decoder.hpp
index 0a67a47580..c57740ff55 100644
--- a/apps/openmw/mwsound/ffmpeg_decoder.hpp
+++ b/apps/openmw/mwsound/ffmpeg_decoder.hpp
@@ -1,7 +1,7 @@
 #ifndef GAME_SOUND_FFMPEG_DECODER_H
 #define GAME_SOUND_FFMPEG_DECODER_H
 
-#include <stdint.h>
+#include <cstdint>
 
 #if defined(_MSC_VER)
     #pragma warning (push)
diff --git a/apps/openmw/mwsound/loudness.cpp b/apps/openmw/mwsound/loudness.cpp
index a36615ee4a..ac44d1b40e 100644
--- a/apps/openmw/mwsound/loudness.cpp
+++ b/apps/openmw/mwsound/loudness.cpp
@@ -1,6 +1,6 @@
 #include "loudness.hpp"
 
-#include <stdint.h>
+#include <cstdint>
 #include <limits>
 #include <algorithm>
 
diff --git a/apps/openmw/mwsound/openal_output.cpp b/apps/openmw/mwsound/openal_output.cpp
index b3cc81b803..649c67961d 100644
--- a/apps/openmw/mwsound/openal_output.cpp
+++ b/apps/openmw/mwsound/openal_output.cpp
@@ -6,10 +6,9 @@
 #include <atomic>
 #include <condition_variable>
 #include <thread>
-#include <mutex>
 #include <chrono>
 
-#include <stdint.h>
+#include <cstdint>
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/constants.hpp>
diff --git a/apps/openmw/mwworld/cellref.cpp b/apps/openmw/mwworld/cellref.cpp
index 2e1d64c441..69b6a94da8 100644
--- a/apps/openmw/mwworld/cellref.cpp
+++ b/apps/openmw/mwworld/cellref.cpp
@@ -1,6 +1,6 @@
 #include "cellref.hpp"
 
-#include <assert.h>
+#include <cassert>
 
 #include <components/debug/debuglog.hpp>
 #include <components/esm3/objectstate.hpp>
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index 24cd09ad37..ac78114932 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -10,7 +10,6 @@
 #include "../mwworld/esmstore.hpp"
 
 #include "ptr.hpp"
-#include "refdata.hpp"
 #include "nullaction.hpp"
 #include "failedaction.hpp"
 #include "actiontake.hpp"
@@ -18,7 +17,6 @@
 
 #include "../mwgui/tooltips.hpp"
 
-#include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/npcstats.hpp"
 
 namespace MWWorld
diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index 695c5636c0..6308c9a547 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -2,7 +2,6 @@
 
 #include <algorithm>
 #include <fstream>
-#include <set>
 
 #include <components/debug/debuglog.hpp>
 #include <components/esm3/esmreader.hpp>
diff --git a/apps/openmw/mwworld/globals.hpp b/apps/openmw/mwworld/globals.hpp
index 5b414971f6..85cb7c39ce 100644
--- a/apps/openmw/mwworld/globals.hpp
+++ b/apps/openmw/mwworld/globals.hpp
@@ -5,7 +5,7 @@
 #include <string>
 #include <map>
 
-#include <stdint.h>
+#include <cstdint>
 
 #include <components/esm3/loadglob.hpp>
 
diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp
index 8d0724e39e..3902a409e5 100644
--- a/apps/openmw/mwworld/player.cpp
+++ b/apps/openmw/mwworld/player.cpp
@@ -25,7 +25,6 @@
 
 #include "cellstore.hpp"
 #include "class.hpp"
-#include "esmloader.hpp"
 #include "ptr.hpp"
 
 namespace MWWorld
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 054e26e855..7a9e742895 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -2,11 +2,9 @@
 
 #include <limits>
 #include <chrono>
-#include <thread>
 #include <atomic>
 
 #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
-#include <BulletCollision/CollisionShapes/btCompoundShape.h>
 
 #include <components/debug/debuglog.hpp>
 #include <components/loadinglistener/loadinglistener.hpp>
@@ -14,7 +12,6 @@
 #include <components/settings/settings.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
-#include <components/resource/bulletshape.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/detournavigator/navigator.hpp>
 #include <components/detournavigator/debug.hpp>
diff --git a/apps/openmw/mwworld/weather.hpp b/apps/openmw/mwworld/weather.hpp
index 21b2fae9f8..b29ad9e994 100644
--- a/apps/openmw/mwworld/weather.hpp
+++ b/apps/openmw/mwworld/weather.hpp
@@ -1,7 +1,7 @@
 #ifndef GAME_MWWORLD_WEATHER_H
 #define GAME_MWWORLD_WEATHER_H
 
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 #include <map>
 
diff --git a/apps/openmw/options.cpp b/apps/openmw/options.cpp
index bde10755ea..c78dc395d9 100644
--- a/apps/openmw/options.cpp
+++ b/apps/openmw/options.cpp
@@ -4,7 +4,6 @@
 #include <components/files/configurationmanager.hpp>
 #include <components/misc/rng.hpp>
 
-#include <boost/program_options.hpp>
 
 namespace
 {
diff --git a/apps/wizard/mainwizard.cpp b/apps/wizard/mainwizard.cpp
index 064f0813d8..7987d9b08d 100644
--- a/apps/wizard/mainwizard.cpp
+++ b/apps/wizard/mainwizard.cpp
@@ -3,7 +3,6 @@
 #include <QDebug>
 
 #include <QTime>
-#include <QCloseEvent>
 #include <QMessageBox>
 #include <QTextCodec>
 #include <QDir>
diff --git a/apps/wizard/unshield/unshieldworker.cpp b/apps/wizard/unshield/unshieldworker.cpp
index f84658bf35..14a34e8779 100644
--- a/apps/wizard/unshield/unshieldworker.cpp
+++ b/apps/wizard/unshield/unshieldworker.cpp
@@ -3,7 +3,6 @@
 #include <QDebug>
 
 #include <QReadLocker>
-#include <QWriteLocker>
 #include <QFileDialog>
 #include <QFileInfo>
 #include <QStringList>
diff --git a/components/misc/convert.hpp b/components/misc/convert.hpp
index 81879cbf89..f31f1cc08e 100644
--- a/components/misc/convert.hpp
+++ b/components/misc/convert.hpp
@@ -10,9 +10,7 @@
 #include <osg/Vec3f>
 #include <osg/Quat>
 
-namespace Misc
-{
-namespace Convert
+namespace Misc::Convert
 {
     inline osg::Vec3f makeOsgVec3f(const float* values)
     {
@@ -73,6 +71,5 @@ namespace Convert
         return btTransform(makeBulletQuaternion(position), toBullet(position.asVec3()));
     }
 }
-}
 
 #endif
\ No newline at end of file
diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index 4be07525a6..ebd6f69f03 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -6,7 +6,6 @@
 
 #include <BulletCollision/CollisionShapes/btBoxShape.h>
 #include <BulletCollision/CollisionShapes/btTriangleMesh.h>
-#include <BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h>
 
 #include <components/debug/debuglog.hpp>
 
diff --git a/components/terrain/quadtreeworld.cpp b/components/terrain/quadtreeworld.cpp
index 6dbed34331..eba69ad42d 100644
--- a/components/terrain/quadtreeworld.cpp
+++ b/components/terrain/quadtreeworld.cpp
@@ -6,7 +6,6 @@
 #include <osg/Material>
 
 #include <limits>
-#include <sstream>
 
 #include <components/misc/constants.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>

From 203ee492c882349be194b13fde7e03e81b36ab4d Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 23 Jan 2022 20:55:17 +0100
Subject: [PATCH 1981/2859] Remove `getRefIdRef` because it is the same as
 `getRefId`.

---
 apps/openmw/mwlua/actions.cpp          |  2 +-
 apps/openmw/mwlua/luamanagerimp.cpp    |  2 +-
 apps/openmw/mwlua/object.cpp           |  8 ++++----
 apps/openmw/mwworld/cellref.hpp        |  3 ---
 apps/openmw/mwworld/cells.cpp          |  2 +-
 apps/openmw/mwworld/cellstore.cpp      |  4 ++--
 apps/openmw/mwworld/containerstore.cpp | 10 +++++-----
 7 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/apps/openmw/mwlua/actions.cpp b/apps/openmw/mwlua/actions.cpp
index 49bb5cfcb4..dda237fb4e 100644
--- a/apps/openmw/mwlua/actions.cpp
+++ b/apps/openmw/mwlua/actions.cpp
@@ -95,7 +95,7 @@ namespace MWLua
             else
             {
                 const std::string& recordId = std::get<std::string>(item);
-                if (old_it != store.end() && old_it->getCellRef().getRefIdRef() == recordId)
+                if (old_it != store.end() && old_it->getCellRef().getRefId() == recordId)
                     return true;  // already equipped
                 itemPtr = store.search(recordId);
                 if (itemPtr.isEmpty() || itemPtr.getRefData().getCount() == 0)
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 8211c37abf..240a1b8627 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -374,7 +374,7 @@ namespace MWLua
         std::shared_ptr<LocalScripts> scripts;
         if (flag == ESM::LuaScriptCfg::sPlayer)
         {
-            assert(ptr.getCellRef().getRefIdRef() == "player");
+            assert(ptr.getCellRef().getRefId() == "player");
             scripts = std::make_shared<PlayerScripts>(&mLua, LObject(getId(ptr), mWorldView.getObjectRegistry()));
             scripts->addPackage("openmw.ui", mUserInterfacePackage);
             scripts->addPackage("openmw.camera", mCameraPackage);
diff --git a/apps/openmw/mwlua/object.cpp b/apps/openmw/mwlua/object.cpp
index 69206e8c37..a9f09ad95d 100644
--- a/apps/openmw/mwlua/object.cpp
+++ b/apps/openmw/mwlua/object.cpp
@@ -44,7 +44,7 @@ namespace MWLua
 
     bool isMarker(const MWWorld::Ptr& ptr)
     {
-        std::string_view id = ptr.getCellRef().getRefIdRef();
+        std::string_view id = ptr.getCellRef().getRefId();
         return id == "prisonmarker" || id == "divinemarker" || id == "templemarker" || id == "northmarker";
     }
 
@@ -55,7 +55,7 @@ namespace MWLua
         // and can be accidentally changed. We use `ptr.getTypeDescription()` only as a fallback
         // for types that are not present in `luaObjectTypeInfo` (for such types result stability
         // is not necessary because they are not listed in OpenMW Lua documentation).
-        if (ptr.getCellRef().getRefIdRef() == "player")
+        if (ptr.getCellRef().getRefId() == "player")
             return "Player";
         if (isMarker(ptr))
             return "Marker";
@@ -64,7 +64,7 @@ namespace MWLua
 
     ESM::LuaScriptCfg::Flags getLuaScriptFlag(const MWWorld::Ptr& ptr)
     {
-        if (ptr.getCellRef().getRefIdRef() == "player")
+        if (ptr.getCellRef().getRefId() == "player")
             return ESM::LuaScriptCfg::sPlayer;
         if (isMarker(ptr))
             return 0;
@@ -82,7 +82,7 @@ namespace MWLua
         res.append(" (");
         res.append(getLuaObjectTypeName(ptr));
         res.append(", ");
-        res.append(ptr.getCellRef().getRefIdRef());
+        res.append(ptr.getCellRef().getRefId());
         res.append(")");
         return res;
     }
diff --git a/apps/openmw/mwworld/cellref.hpp b/apps/openmw/mwworld/cellref.hpp
index b5e80930ed..455f2d077d 100644
--- a/apps/openmw/mwworld/cellref.hpp
+++ b/apps/openmw/mwworld/cellref.hpp
@@ -38,9 +38,6 @@ namespace MWWorld
         // Id of object being referenced
         const std::string& getRefId() const { return mCellRef.mRefID; }
 
-        // Reference to ID of the object being referenced
-        const std::string& getRefIdRef() const { return mCellRef.mRefID; }  // TODO replace with getRefId
-
         // For doors - true if this door teleports to somewhere else, false
         // if it should open through animation.
         bool getTeleport() const { return mCellRef.mTeleport; }
diff --git a/apps/openmw/mwworld/cells.cpp b/apps/openmw/mwworld/cells.cpp
index d020eace45..5f8706a740 100644
--- a/apps/openmw/mwworld/cells.cpp
+++ b/apps/openmw/mwworld/cells.cpp
@@ -36,7 +36,7 @@ namespace
             }
             bool cont = cell.second.forEach([&] (MWWorld::Ptr ptr)
             {
-                if (ptr.getCellRef().getRefIdRef() == id)
+                if (ptr.getCellRef().getRefId() == id)
                 {
                     return visitor(ptr);
                 }
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 0c871e4f58..3fbfb4d440 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -190,7 +190,7 @@ namespace
         {
             for (typename MWWorld::CellRefList<T>::List::iterator iter (collection.mList.begin());
                 iter!=collection.mList.end(); ++iter)
-                if (iter->mRef.getRefNum()==state.mRef.mRefNum && iter->mRef.getRefIdRef() == state.mRef.mRefID)
+                if (iter->mRef.getRefNum()==state.mRef.mRefNum && iter->mRef.getRefId() == state.mRef.mRefID)
                 {
                     // overwrite existing reference
                     float oldscale = iter->mRef.getScale();
@@ -426,7 +426,7 @@ namespace MWWorld
         const std::string *mIdToFind;
         bool operator()(const PtrType& ptr)
         {
-            if (ptr.getCellRef().getRefIdRef() == *mIdToFind)
+            if (ptr.getCellRef().getRefId() == *mIdToFind)
             {
                 mFound = ptr;
                 return false;
diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index 112f56abfc..18a91707be 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -183,7 +183,7 @@ int MWWorld::ContainerStore::count(const std::string &id) const
 {
     int total=0;
     for (const auto&& iter : *this)
-        if (Misc::StringUtils::ciEqual(iter.getCellRef().getRefIdRef(), id))
+        if (Misc::StringUtils::ciEqual(iter.getCellRef().getRefId(), id))
             total += iter.getRefData().getCount();
     return total;
 }
@@ -248,7 +248,7 @@ bool MWWorld::ContainerStore::stacks(const ConstPtr& ptr1, const ConstPtr& ptr2)
     const MWWorld::Class& cls1 = ptr1.getClass();
     const MWWorld::Class& cls2 = ptr2.getClass();
 
-    if (!Misc::StringUtils::ciEqual(ptr1.getCellRef().getRefIdRef(), ptr2.getCellRef().getRefIdRef()))
+    if (!Misc::StringUtils::ciEqual(ptr1.getCellRef().getRefId(), ptr2.getCellRef().getRefId()))
         return false;
 
     // If it has an enchantment, don't stack when some of the charge is already used
@@ -363,7 +363,7 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::addImp (const Ptr& ptr,
 
         for (MWWorld::ContainerStoreIterator iter (begin(type)); iter!=end(); ++iter)
         {
-            if (Misc::StringUtils::ciEqual(iter->getCellRef().getRefIdRef(), MWWorld::ContainerStore::sGoldId))
+            if (Misc::StringUtils::ciEqual(iter->getCellRef().getRefId(), MWWorld::ContainerStore::sGoldId))
             {
                 iter->getRefData().setCount(addItems(iter->getRefData().getCount(false), realCount));
                 flagAsModified();
@@ -464,7 +464,7 @@ int MWWorld::ContainerStore::remove(const std::string& itemId, int count, const
     int toRemove = count;
 
     for (ContainerStoreIterator iter(begin()); iter != end() && toRemove > 0; ++iter)
-        if (Misc::StringUtils::ciEqual(iter->getCellRef().getRefIdRef(), itemId))
+        if (Misc::StringUtils::ciEqual(iter->getCellRef().getRefId(), itemId))
             toRemove -= remove(*iter, toRemove, actor, equipReplacement, resolveFirst);
 
     flagAsModified();
@@ -739,7 +739,7 @@ MWWorld::Ptr MWWorld::ContainerStore::findReplacement(const std::string& id)
     for (auto&& iter : *this)
     {
         int iterHealth = iter.getClass().hasItemHealth(iter) ? iter.getClass().getItemHealth(iter) : 1;
-        if (Misc::StringUtils::ciEqual(iter.getCellRef().getRefIdRef(), id))
+        if (Misc::StringUtils::ciEqual(iter.getCellRef().getRefId(), id))
         {
             // Prefer the stack with the lowest remaining uses
             // Try to get item with zero durability only if there are no other items found

From 067d71f7eb591bc6ac77f11844360e9a02799c40 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 23 Jan 2022 22:33:00 +0100
Subject: [PATCH 1982/2859] Fix heap use after free in
 components/lua/storage.cpp

---
 apps/openmw_test_suite/lua/test_storage.cpp |  2 +-
 components/lua/storage.cpp                  | 19 +++++++++++--------
 components/lua/storage.hpp                  |  8 ++++----
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/apps/openmw_test_suite/lua/test_storage.cpp b/apps/openmw_test_suite/lua/test_storage.cpp
index fafba008a1..a1c6af6e0a 100644
--- a/apps/openmw_test_suite/lua/test_storage.cpp
+++ b/apps/openmw_test_suite/lua/test_storage.cpp
@@ -91,10 +91,10 @@ namespace
         mLua.safe_script("permanent:set('z', 4)");
 
         LuaUtil::LuaStorage storage2(mLua);
+        storage2.load(tmpFile);
         mLua["permanent"] = storage2.getMutableSection("permanent");
         mLua["temporary"] = storage2.getMutableSection("temporary");
 
-        storage2.load(tmpFile);
         EXPECT_EQ(get<int>(mLua, "permanent:get('x')"), 1);
         EXPECT_TRUE(get<bool>(mLua, "permanent:get('z') == nil"));
         EXPECT_TRUE(get<bool>(mLua, "temporary:get('y') == nil"));
diff --git a/components/lua/storage.cpp b/components/lua/storage.cpp
index def38fdd67..91a339cb03 100644
--- a/components/lua/storage.cpp
+++ b/components/lua/storage.cpp
@@ -121,7 +121,10 @@ namespace LuaUtil
         while (it != mData.end())
         {
             if (!it->second->mPermanent)
+            {
+                it->second->mValues.clear();
                 it = mData.erase(it);
+            }
             else
                 ++it;
         }
@@ -129,7 +132,7 @@ namespace LuaUtil
 
     void LuaStorage::load(const std::string& path)
     {
-        mData.clear();
+        assert(mData.empty());  // Shouldn't be used before loading
         try
         {
             Log(Debug::Info) << "Loading Lua storage \"" << path << "\" (" << std::filesystem::file_size(path) << " bytes)";
@@ -138,7 +141,7 @@ namespace LuaUtil
             sol::table data = deserialize(mLua, serializedData);
             for (const auto& [sectionName, sectionTable] : data)
             {
-                Section* section = getSection(sectionName.as<std::string_view>());
+                const std::shared_ptr<Section>& section = getSection(sectionName.as<std::string_view>());
                 for (const auto& [key, value] : sol::table(sectionTable))
                     section->set(key.as<std::string_view>(), value);
             }
@@ -164,26 +167,26 @@ namespace LuaUtil
         fout.close();
     }
 
-    LuaStorage::Section* LuaStorage::getSection(std::string_view sectionName)
+    const std::shared_ptr<LuaStorage::Section>& LuaStorage::getSection(std::string_view sectionName)
     {
         auto it = mData.find(sectionName);
         if (it != mData.end())
-            return it->second.get();
-        auto section = std::make_unique<Section>(this, std::string(sectionName));
+            return it->second;
+        auto section = std::make_shared<Section>(this, std::string(sectionName));
         sectionName = section->mSectionName;
         auto [newIt, _] = mData.emplace(sectionName, std::move(section));
-        return newIt->second.get();
+        return newIt->second;
     }
 
     sol::object LuaStorage::getReadOnlySection(std::string_view sectionName)
     {
-        Section* section = getSection(sectionName);
+        const std::shared_ptr<Section>& section = getSection(sectionName);
         return sol::make_object<SectionReadOnlyView>(mLua, SectionReadOnlyView{section, section->mChangeCounter});
     }
 
     sol::object LuaStorage::getMutableSection(std::string_view sectionName)
     {
-        Section* section = getSection(sectionName);
+        const std::shared_ptr<Section>& section = getSection(sectionName);
         return sol::make_object<SectionMutableView>(mLua, SectionMutableView{section, section->mChangeCounter});
     }
 
diff --git a/components/lua/storage.hpp b/components/lua/storage.hpp
index e847604aeb..c23e417f0f 100644
--- a/components/lua/storage.hpp
+++ b/components/lua/storage.hpp
@@ -60,19 +60,19 @@ namespace LuaUtil
         };
         struct SectionMutableView
         {
-            Section* mSection = nullptr;
+            std::shared_ptr<Section> mSection = nullptr;
             int64_t mLastCheck = 0;
         };
         struct SectionReadOnlyView
         {
-            Section* mSection = nullptr;
+            std::shared_ptr<Section> mSection = nullptr;
             int64_t mLastCheck = 0;
         };
 
-        Section* getSection(std::string_view sectionName);
+        const std::shared_ptr<Section>& getSection(std::string_view sectionName);
 
         lua_State* mLua;
-        std::map<std::string_view, std::unique_ptr<Section>> mData;
+        std::map<std::string_view, std::shared_ptr<Section>> mData;
         std::optional<ListenerFn> mListener;
     };
 

From 40a228026104b9d1e3c4fb58c0123d1cc24d6cdd Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Mon, 24 Jan 2022 16:26:24 +0100
Subject: [PATCH 1983/2859] Update documentation regarding gyroscope

---
 docs/source/reference/modding/settings/input.rst | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/docs/source/reference/modding/settings/input.rst b/docs/source/reference/modding/settings/input.rst
index d04c267a76..7aedf1bc21 100644
--- a/docs/source/reference/modding/settings/input.rst
+++ b/docs/source/reference/modding/settings/input.rst
@@ -158,6 +158,11 @@ Enable the support of camera rotation based on the information supplied from the
 
 This setting can only be configured by editing the settings configuration file.
 
+Built-in (e. g. in a phone or tablet) and controller gyroscopes are supported. If both are present, controller gyroscope takes priority.
+
+Note: controller gyroscopes are only supported when OpenMW is built with SDL 2.0.14 or higher,
+and were tested only on Windows.
+
 gyro horizontal axis
 --------------------
 
@@ -190,8 +195,8 @@ gyro input threshold
 --------------------
 
 :Type:		floating point
-:Range:		> 0
-:Default:	0.01
+:Range:		>=0
+:Default:	0.0
 
 This setting determines the minimum value of the rotation that will be accepted.
 It allows to avoid crosshair oscillation due to gyroscope "noise".
@@ -209,6 +214,8 @@ This setting controls the overall gyroscope horizontal sensitivity.
 The smaller this sensitivity is, the less visible effect the device rotation
 will have on the horizontal camera rotation, and vice versa.
 
+Value of X means that rotating the device by 1 degree will cause the player to rotate by X degrees.
+
 This setting can only be configured by editing the settings configuration file.
 
 gyro vertical sensitivity
@@ -222,4 +229,6 @@ This setting controls the overall gyroscope vertical sensitivity.
 The smaller this sensitivity is, the less visible effect the device
 rotation will have on the vertical camera rotation, and vice versa.
 
+Value of X means that rotating the device by 1 degree will cause the player to rotate by X degrees.
+
 This setting can only be configured by editing the settings configuration file.

From 7ec7c57879b8d5384c69879b55074abc075f1534 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 23 Jan 2022 19:24:36 +0100
Subject: [PATCH 1984/2859] Remove unnecessary loops from path

This prevents actors going back when a new shortest path includes a point
behind them where they were right before. Such situation can happen when path
includes off mesh connection. Resulting cost of such path can be lower than
the real one because off mesh connections are straight lines and walking
surface usually is not a plane but a surface.

Skip to path point where distance from current position to the line between
previous and this point is less than point tolerance. Which means actor is
standing very close to the edge between those points. Additionally check by
navmesh raycasting to make sure there is actually a valid path.
---
 apps/openmw/mwmechanics/pathfinding.cpp | 23 +++++++++++++++++++----
 components/misc/math.hpp                | 16 ++++++++++++++++
 2 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 components/misc/math.hpp

diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp
index e727d8585d..1cc4526193 100644
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@@ -6,6 +6,7 @@
 #include <components/detournavigator/navigatorutils.hpp>
 #include <components/debug/debuglog.hpp>
 #include <components/misc/coordinateconverter.hpp>
+#include <components/misc/math.hpp>
 
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
@@ -315,12 +316,13 @@ namespace MWMechanics
         while (mPath.size() > 1 && sqrDistanceIgnoreZ(mPath.front(), position) < pointTolerance * pointTolerance)
             mPath.pop_front();
 
+        const IsValidShortcut isValidShortcut {
+            MWBase::Environment::get().getWorld()->getNavigator(),
+            halfExtents, flags
+        };
+
         if (shortenIfAlmostStraight)
         {
-            const IsValidShortcut isValidShortcut {
-                MWBase::Environment::get().getWorld()->getNavigator(),
-                halfExtents, flags
-            };
             while (mPath.size() > 2 && isAlmostStraight(mPath[0], mPath[1], mPath[2], pointTolerance)
                    && isValidShortcut(mPath[0], mPath[2]))
                 mPath.erase(mPath.begin() + 1);
@@ -329,6 +331,19 @@ namespace MWMechanics
                 mPath.pop_front();
         }
 
+        if (mPath.size() > 1)
+        {
+            std::size_t begin = 0;
+            for (std::size_t i = 1; i < mPath.size(); ++i)
+            {
+                const float sqrDistance = Misc::getVectorToLine(position, mPath[i - 1], mPath[i]).length2();
+                if (sqrDistance < pointTolerance * pointTolerance && isValidShortcut(position, mPath[i]))
+                    begin = i;
+            }
+            for (std::size_t i = 0; i < begin; ++i)
+                mPath.pop_front();
+        }
+
         if (mPath.size() == 1)
         {
             float distSqr;
diff --git a/components/misc/math.hpp b/components/misc/math.hpp
new file mode 100644
index 0000000000..27e29675f2
--- /dev/null
+++ b/components/misc/math.hpp
@@ -0,0 +1,16 @@
+#ifndef OPENMW_COMPONENTS_MISC_MATH_H
+#define OPENMW_COMPONENTS_MISC_MATH_H
+
+#include <osg/Vec3f>
+
+namespace Misc
+{
+    inline osg::Vec3f getVectorToLine(const osg::Vec3f& position, const osg::Vec3f& a, const osg::Vec3f& b)
+    {
+        osg::Vec3f direction = b - a;
+        direction.normalize();
+        return (position - a) ^ direction;
+    }
+}
+
+#endif

From 12df2deb7034772e09da2a7b7a1c0d85c28587ce Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 24 Jan 2022 22:46:33 +0100
Subject: [PATCH 1985/2859] Remove usage of deprecated std::iterator

/home/elsid/dev/openmw/apps/openmw/mwlua/../mwbase/../mwworld/containerstore.hpp:264:23: warning: 'iterator<std::forward_iterator_tag, MWWorld::Ptr>' is deprecated [-Wdeprecated-declarations]
        : public std::iterator<std::forward_iterator_tag, PtrType, std::ptrdiff_t, PtrType *, PtrType&>
                      ^
/home/elsid/dev/openmw/apps/openmw/mwlua/../mwworld/inventorystore.hpp:79:36: note: in instantiation of template class 'MWWorld::ContainerStoreIteratorBase<MWWorld::Ptr>' requested here
            ContainerStoreIterator mSelectedEnchantItem;
                                   ^
/usr/bin/../include/c++/v1/__iterator/iterator.h:27:29: note: 'iterator<std::forward_iterator_tag, MWWorld::Ptr>' has been explicitly marked deprecated here
struct _LIBCPP_TEMPLATE_VIS _LIBCPP_DEPRECATED_IN_CXX17 iterator
                            ^
/usr/bin/../include/c++/v1/__config:1016:39: note: expanded from macro '_LIBCPP_DEPRECATED_IN_CXX17'
                                      ^
/usr/bin/../include/c++/v1/__config:993:48: note: expanded from macro '_LIBCPP_DEPRECATED'
                                               ^
---
 apps/openmw/mwworld/containerstore.hpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwworld/containerstore.hpp b/apps/openmw/mwworld/containerstore.hpp
index f18a595466..1ef53c3e99 100644
--- a/apps/openmw/mwworld/containerstore.hpp
+++ b/apps/openmw/mwworld/containerstore.hpp
@@ -258,10 +258,8 @@ namespace MWWorld
             friend class MWClass::Container;
     };
 
-    
     template<class PtrType>
     class ContainerStoreIteratorBase
-        : public std::iterator<std::forward_iterator_tag, PtrType, std::ptrdiff_t, PtrType *, PtrType&>
     {
         template<class From, class To, class Dummy>
         struct IsConvertible
@@ -362,6 +360,12 @@ namespace MWWorld
         /// \return reached the end?
 
         public:
+            using iterator_category = std::forward_iterator_tag;
+            using value_type = PtrType;
+            using difference_type = std::ptrdiff_t;
+            using pointer = PtrType*;
+            using reference = PtrType&;
+
             template<class T>
             ContainerStoreIteratorBase (const ContainerStoreIteratorBase<T>& other)
             {

From ecc654a36939d8627f21b228c6ddbdf7b09464b8 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 25 Jan 2022 14:06:53 +0000
Subject: [PATCH 1986/2859] Limit and filter navmesh input (#5858)

---
 apps/navmeshtool/navmesh.cpp                  | 39 ++++++----
 apps/openmw/mwworld/scene.cpp                 |  7 +-
 .../detournavigator/gettilespositions.cpp     | 15 ++--
 .../tilecachedrecastmeshmanager.cpp           |  8 ++
 components/CMakeLists.txt                     |  1 +
 .../detournavigator/gettilespositions.cpp     | 66 ++++++++++++++++
 .../detournavigator/gettilespositions.hpp     | 77 ++++++-------------
 components/detournavigator/navigatorimpl.cpp  |  1 +
 components/detournavigator/navmeshmanager.cpp | 18 ++++-
 .../detournavigator/recastmeshbuilder.cpp     | 12 +++
 components/detournavigator/settingsutils.hpp  |  5 ++
 .../tilecachedrecastmeshmanager.cpp           | 22 +++++-
 .../tilecachedrecastmeshmanager.hpp           |  7 +-
 13 files changed, 196 insertions(+), 82 deletions(-)
 create mode 100644 components/detournavigator/gettilespositions.cpp

diff --git a/apps/navmeshtool/navmesh.cpp b/apps/navmeshtool/navmesh.cpp
index 4187197947..100ddaf22a 100644
--- a/apps/navmeshtool/navmesh.cpp
+++ b/apps/navmeshtool/navmesh.cpp
@@ -35,6 +35,7 @@
 #include <string_view>
 #include <utility>
 #include <vector>
+#include <random>
 
 namespace NavMeshTool
 {
@@ -180,26 +181,36 @@ namespace NavMeshTool
         SceneUtil::WorkQueue workQueue(threadsNumber);
         auto navMeshTileConsumer = std::make_shared<NavMeshTileConsumer>(std::move(db));
         std::size_t tiles = 0;
+        std::mt19937_64 random;
 
         for (const std::unique_ptr<WorldspaceNavMeshInput>& input : data.mNavMeshInputs)
         {
+            std::vector<TilePosition> worldspaceTiles;
+
             DetourNavigator::getTilesPositions(
-                Misc::Convert::toOsg(input->mAabb.m_min), Misc::Convert::toOsg(input->mAabb.m_max), settings.mRecast,
-                [&] (const TilePosition& tilePosition)
-                {
-                    workQueue.addWorkItem(new GenerateNavMeshTile(
-                        input->mWorldspace,
-                        tilePosition,
-                        RecastMeshProvider(input->mTileCachedRecastMeshManager),
-                        agentHalfExtents,
-                        settings,
-                        navMeshTileConsumer
-                    ));
-
-                    ++tiles;
-                });
+                DetourNavigator::makeTilesPositionsRange(
+                    Misc::Convert::toOsg(input->mAabb.m_min),
+                    Misc::Convert::toOsg(input->mAabb.m_max),
+                    settings.mRecast
+                ),
+                [&] (const TilePosition& tilePosition) { worldspaceTiles.push_back(tilePosition); }
+            );
+
+            tiles += worldspaceTiles.size();
 
             navMeshTileConsumer->mExpected = tiles;
+
+            std::shuffle(worldspaceTiles.begin(), worldspaceTiles.end(), random);
+
+            for (const TilePosition& tilePosition : worldspaceTiles)
+                workQueue.addWorkItem(new GenerateNavMeshTile(
+                    input->mWorldspace,
+                    tilePosition,
+                    RecastMeshProvider(input->mTileCachedRecastMeshManager),
+                    agentHalfExtents,
+                    settings,
+                    navMeshTileConsumer
+                ));
         }
 
         navMeshTileConsumer->wait();
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 054e26e855..fc02f205ff 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -511,8 +511,7 @@ namespace MWWorld
         if (mCurrentCell == nullptr)
             return;
 
-        const auto player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-        mNavigator.updatePlayerPosition(player.getRefData().getPosition().asVec3());
+        mNavigator.updatePlayerPosition(pos);
 
         if (!mCurrentCell->isExterior())
             return;
@@ -823,6 +822,8 @@ namespace MWWorld
 
         loadingListener->setProgressRange(cell->count());
 
+        mNavigator.updatePlayerPosition(position.asVec3());
+
         // Load cell.
         mPagedRefs.clear();
         loadCell(cell, loadingListener, changeEvent);
@@ -856,6 +857,8 @@ namespace MWWorld
         if (changeEvent)
             MWBase::Environment::get().getWindowManager()->fadeScreenOut(0.5);
 
+        mNavigator.updatePlayerPosition(position.asVec3());
+
         changeCellGrid(position.asVec3(), x, y, changeEvent);
 
         CellStore* current = MWBase::Environment::get().getWorld()->getExterior(x, y);
diff --git a/apps/openmw_test_suite/detournavigator/gettilespositions.cpp b/apps/openmw_test_suite/detournavigator/gettilespositions.cpp
index ced33a99f0..8121c19205 100644
--- a/apps/openmw_test_suite/detournavigator/gettilespositions.cpp
+++ b/apps/openmw_test_suite/detournavigator/gettilespositions.cpp
@@ -1,5 +1,6 @@
 #include <components/detournavigator/gettilespositions.hpp>
 #include <components/detournavigator/debug.hpp>
+#include <components/detournavigator/settings.hpp>
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
@@ -36,35 +37,35 @@ namespace
 
     TEST_F(DetourNavigatorGetTilesPositionsTest, for_object_in_single_tile_should_return_one_tile)
     {
-        getTilesPositions(osg::Vec3f(2, 2, 0), osg::Vec3f(31, 31, 1), mSettings, mCollect);
+        getTilesPositions(makeTilesPositionsRange(osg::Vec3f(2, 2, 0), osg::Vec3f(31, 31, 1), mSettings), mCollect);
 
         EXPECT_THAT(mTilesPositions, ElementsAre(TilePosition(0, 0)));
     }
 
     TEST_F(DetourNavigatorGetTilesPositionsTest, for_object_with_x_bounds_in_two_tiles_should_return_two_tiles)
     {
-        getTilesPositions(osg::Vec3f(0, 0, 0), osg::Vec3f(32, 31, 1), mSettings, mCollect);
+        getTilesPositions(makeTilesPositionsRange(osg::Vec3f(0, 0, 0), osg::Vec3f(32, 31, 1), mSettings), mCollect);
 
         EXPECT_THAT(mTilesPositions, ElementsAre(TilePosition(0, 0), TilePosition(1, 0)));
     }
 
     TEST_F(DetourNavigatorGetTilesPositionsTest, for_object_with_y_bounds_in_two_tiles_should_return_two_tiles)
     {
-        getTilesPositions(osg::Vec3f(0, 0, 0), osg::Vec3f(31, 32, 1), mSettings, mCollect);
+        getTilesPositions(makeTilesPositionsRange(osg::Vec3f(0, 0, 0), osg::Vec3f(31, 32, 1), mSettings), mCollect);
 
         EXPECT_THAT(mTilesPositions, ElementsAre(TilePosition(0, 0), TilePosition(0, 1)));
     }
 
     TEST_F(DetourNavigatorGetTilesPositionsTest, tiling_works_only_for_x_and_y_coordinates)
     {
-        getTilesPositions(osg::Vec3f(0, 0, 0), osg::Vec3f(31, 31, 32), mSettings, mCollect);
+        getTilesPositions(makeTilesPositionsRange(osg::Vec3f(0, 0, 0), osg::Vec3f(31, 31, 32), mSettings), mCollect);
 
         EXPECT_THAT(mTilesPositions, ElementsAre(TilePosition(0, 0)));
     }
 
     TEST_F(DetourNavigatorGetTilesPositionsTest, tiling_should_work_with_negative_coordinates)
     {
-        getTilesPositions(osg::Vec3f(-31, -31, 0), osg::Vec3f(31, 31, 1), mSettings, mCollect);
+        getTilesPositions(makeTilesPositionsRange(osg::Vec3f(-31, -31, 0), osg::Vec3f(31, 31, 1), mSettings), mCollect);
 
         EXPECT_THAT(mTilesPositions, ElementsAre(
             TilePosition(-1, -1),
@@ -78,7 +79,7 @@ namespace
     {
         mSettings.mBorderSize = 1;
 
-        getTilesPositions(osg::Vec3f(0, 0, 0), osg::Vec3f(31.5, 31.5, 1), mSettings, mCollect);
+        getTilesPositions(makeTilesPositionsRange(osg::Vec3f(0, 0, 0), osg::Vec3f(31.5, 31.5, 1), mSettings), mCollect);
 
         EXPECT_THAT(mTilesPositions, ElementsAre(
             TilePosition(-1, -1),
@@ -97,7 +98,7 @@ namespace
     {
         mSettings.mRecastScaleFactor = 0.5;
 
-        getTilesPositions(osg::Vec3f(0, 0, 0), osg::Vec3f(32, 32, 1), mSettings, mCollect);
+        getTilesPositions(makeTilesPositionsRange(osg::Vec3f(0, 0, 0), osg::Vec3f(32, 32, 1), mSettings), mCollect);
 
         EXPECT_THAT(mTilesPositions, ElementsAre(TilePosition(0, 0)));
     }
diff --git a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
index c44ebc5155..631e4105ba 100644
--- a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -90,6 +90,10 @@ namespace
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const btTransform transform(btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
+        TileBounds bounds;
+        bounds.mMin = osg::Vec2f(-1000, -1000);
+        bounds.mMax = osg::Vec2f(1000, 1000);
+        manager.setBounds(bounds);
         manager.addObject(ObjectId(&boxShape), shape, transform, AreaType::AreaType_ground);
         EXPECT_TRUE(manager.updateObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground,
                                          [&] (const auto& v) { onChangedTile(v); }));
@@ -137,6 +141,10 @@ namespace
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, get_mesh_for_moved_object_should_return_recast_mesh_for_each_used_tile)
     {
         TileCachedRecastMeshManager manager(mSettings);
+        TileBounds bounds;
+        bounds.mMin = osg::Vec2f(-1000, -1000);
+        bounds.mMax = osg::Vec2f(1000, 1000);
+        manager.setBounds(bounds);
         manager.setWorldspace("worldspace");
 
         const btBoxShape boxShape(btVector3(20, 20, 100));
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 89b27b0d94..ae06f3f2b0 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -208,6 +208,7 @@ add_component_dir(detournavigator
     serialization
     navmeshdbutils
     recast
+    gettilespositions
     )
 
 add_component_dir(loadinglistener
diff --git a/components/detournavigator/gettilespositions.cpp b/components/detournavigator/gettilespositions.cpp
new file mode 100644
index 0000000000..e74a22e5ba
--- /dev/null
+++ b/components/detournavigator/gettilespositions.cpp
@@ -0,0 +1,66 @@
+#include "gettilespositions.hpp"
+#include "settings.hpp"
+#include "settingsutils.hpp"
+#include "tileposition.hpp"
+#include "tilebounds.hpp"
+
+#include <components/misc/convert.hpp>
+
+#include <BulletCollision/CollisionShapes/btCollisionShape.h>
+
+namespace DetourNavigator
+{
+    TilesPositionsRange makeTilesPositionsRange(const osg::Vec3f& aabbMin, const osg::Vec3f& aabbMax,
+        const RecastSettings& settings)
+    {
+        osg::Vec3f min = toNavMeshCoordinates(settings, aabbMin);
+        osg::Vec3f max = toNavMeshCoordinates(settings, aabbMax);
+
+        const float border = getBorderSize(settings);
+        min -= osg::Vec3f(border, border, border);
+        max += osg::Vec3f(border, border, border);
+
+        TilePosition minTile = getTilePosition(settings, min);
+        TilePosition maxTile = getTilePosition(settings, max);
+
+        if (minTile.x() > maxTile.x())
+            std::swap(minTile.x(), maxTile.x());
+
+        if (minTile.y() > maxTile.y())
+            std::swap(minTile.y(), maxTile.y());
+
+        return {minTile, maxTile};
+    }
+
+    TilesPositionsRange makeTilesPositionsRange(const btCollisionShape& shape, const btTransform& transform,
+        const TileBounds& bounds, const RecastSettings& settings)
+    {
+        btVector3 aabbMin;
+        btVector3 aabbMax;
+        shape.getAabb(transform, aabbMin, aabbMax);
+        aabbMin.setX(std::max<btScalar>(aabbMin.x(), bounds.mMin.x()));
+        aabbMin.setY(std::max<btScalar>(aabbMin.y(), bounds.mMin.y()));
+        aabbMax.setX(std::min<btScalar>(aabbMax.x(), bounds.mMax.x()));
+        aabbMax.setY(std::min<btScalar>(aabbMax.y(), bounds.mMax.y()));
+        return makeTilesPositionsRange(Misc::Convert::toOsg(aabbMin), Misc::Convert::toOsg(aabbMax), settings);
+    }
+
+    TilesPositionsRange makeTilesPositionsRange(const int cellSize, const btVector3& shift,
+        const RecastSettings& settings)
+    {
+        using Misc::Convert::toOsg;
+
+        const int halfCellSize = cellSize / 2;
+        const btTransform transform(btMatrix3x3::getIdentity(), shift);
+        btVector3 aabbMin = transform(btVector3(-halfCellSize, -halfCellSize, 0));
+        btVector3 aabbMax = transform(btVector3(halfCellSize, halfCellSize, 0));
+
+        aabbMin.setX(std::min(aabbMin.x(), aabbMax.x()));
+        aabbMin.setY(std::min(aabbMin.y(), aabbMax.y()));
+
+        aabbMax.setX(std::max(aabbMin.x(), aabbMax.x()));
+        aabbMax.setY(std::max(aabbMin.y(), aabbMax.y()));
+
+        return makeTilesPositionsRange(toOsg(aabbMin), toOsg(aabbMax), settings);
+    }
+}
diff --git a/components/detournavigator/gettilespositions.hpp b/components/detournavigator/gettilespositions.hpp
index 707db0b512..9d3df7ef65 100644
--- a/components/detournavigator/gettilespositions.hpp
+++ b/components/detournavigator/gettilespositions.hpp
@@ -1,72 +1,43 @@
 #ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_GETTILESPOSITIONS_H
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_GETTILESPOSITIONS_H
 
-#include "settings.hpp"
-#include "settingsutils.hpp"
+#include "tilebounds.hpp"
 #include "tileposition.hpp"
 
-#include <components/misc/convert.hpp>
+class btVector3;
+class btTransform;
+class btCollisionShape;
 
-#include <BulletCollision/CollisionShapes/btCollisionShape.h>
-
-#include <osg/Vec3f>
+namespace osg
+{
+    class Vec3f;
+}
 
 namespace DetourNavigator
 {
-    template <class Callback>
-    void getTilesPositions(const osg::Vec3f& aabbMin, const osg::Vec3f& aabbMax,
-        const RecastSettings& settings, Callback&& callback)
-    {
-        auto min = toNavMeshCoordinates(settings, aabbMin);
-        auto max = toNavMeshCoordinates(settings, aabbMax);
+    struct RecastSettings;
 
-        const auto border = getBorderSize(settings);
-        min -= osg::Vec3f(border, border, border);
-        max += osg::Vec3f(border, border, border);
+    struct TilesPositionsRange
+    {
+        TilePosition mMin;
+        TilePosition mMax;
+    };
 
-        auto minTile = getTilePosition(settings, min);
-        auto maxTile = getTilePosition(settings, max);
+    TilesPositionsRange makeTilesPositionsRange(const osg::Vec3f& aabbMin,
+        const osg::Vec3f& aabbMax, const RecastSettings& settings);
 
-        if (minTile.x() > maxTile.x())
-            std::swap(minTile.x(), maxTile.x());
+    TilesPositionsRange makeTilesPositionsRange(const btCollisionShape& shape,
+        const btTransform& transform, const TileBounds& bounds, const RecastSettings& settings);
 
-        if (minTile.y() > maxTile.y())
-            std::swap(minTile.y(), maxTile.y());
-
-        for (int tileX = minTile.x(); tileX <= maxTile.x(); ++tileX)
-            for (int tileY = minTile.y(); tileY <= maxTile.y(); ++tileY)
-                callback(TilePosition {tileX, tileY});
-    }
+    TilesPositionsRange makeTilesPositionsRange(const int cellSize, const btVector3& shift,
+        const RecastSettings& settings);
 
     template <class Callback>
-    void getTilesPositions(const btCollisionShape& shape, const btTransform& transform,
-        const RecastSettings& settings, Callback&& callback)
+    void getTilesPositions(const TilesPositionsRange& range, Callback&& callback)
     {
-        btVector3 aabbMin;
-        btVector3 aabbMax;
-        shape.getAabb(transform, aabbMin, aabbMax);
-
-        getTilesPositions(Misc::Convert::toOsg(aabbMin), Misc::Convert::toOsg(aabbMax), settings, std::forward<Callback>(callback));
-    }
-
-    template <class Callback>
-    void getTilesPositions(const int cellSize, const btVector3& shift,
-        const RecastSettings& settings, Callback&& callback)
-    {
-        using Misc::Convert::toOsg;
-
-        const auto halfCellSize = cellSize / 2;
-        const btTransform transform(btMatrix3x3::getIdentity(), shift);
-        auto aabbMin = transform(btVector3(-halfCellSize, -halfCellSize, 0));
-        auto aabbMax = transform(btVector3(halfCellSize, halfCellSize, 0));
-
-        aabbMin.setX(std::min(aabbMin.x(), aabbMax.x()));
-        aabbMin.setY(std::min(aabbMin.y(), aabbMax.y()));
-
-        aabbMax.setX(std::max(aabbMin.x(), aabbMax.x()));
-        aabbMax.setY(std::max(aabbMin.y(), aabbMax.y()));
-
-        getTilesPositions(toOsg(aabbMin), toOsg(aabbMax), settings, std::forward<Callback>(callback));
+        for (int tileX = range.mMin.x(); tileX <= range.mMax.x(); ++tileX)
+            for (int tileY = range.mMin.y(); tileY <= range.mMax.y(); ++tileY)
+                callback(TilePosition {tileX, tileY});
     }
 }
 
diff --git a/components/detournavigator/navigatorimpl.cpp b/components/detournavigator/navigatorimpl.cpp
index 85d86e6b2b..82a156bb97 100644
--- a/components/detournavigator/navigatorimpl.cpp
+++ b/components/detournavigator/navigatorimpl.cpp
@@ -5,6 +5,7 @@
 #include <components/debug/debuglog.hpp>
 #include <components/esm/loadpgrd.hpp>
 #include <components/misc/coordinateconverter.hpp>
+#include <components/misc/convert.hpp>
 
 namespace DetourNavigator
 {
diff --git a/components/detournavigator/navmeshmanager.cpp b/components/detournavigator/navmeshmanager.cpp
index 399af8a6a9..e8da5a0d61 100644
--- a/components/detournavigator/navmeshmanager.cpp
+++ b/components/detournavigator/navmeshmanager.cpp
@@ -9,6 +9,7 @@
 
 #include <components/debug/debuglog.hpp>
 #include <components/bullethelpers/heightfield.hpp>
+#include <components/misc/convert.hpp>
 
 #include <DetourNavMesh.h>
 
@@ -41,6 +42,18 @@ namespace
 
 namespace DetourNavigator
 {
+    namespace
+    {
+        TileBounds makeBounds(const RecastSettings& settings, const osg::Vec2f& center, int maxTiles)
+        {
+            const float radius = fromNavMeshCoordinates(settings, std::ceil(std::sqrt(static_cast<float>(maxTiles) / osg::PIf) + 1) * getTileSize(settings));
+            TileBounds result;
+            result.mMin = center - osg::Vec2f(radius, radius);
+            result.mMax = center + osg::Vec2f(radius, radius);
+            return result;
+        }
+    }
+
     NavMeshManager::NavMeshManager(const Settings& settings, std::unique_ptr<NavMeshDb>&& db)
         : mSettings(settings)
         , mRecastMeshManager(settings.mRecast)
@@ -204,6 +217,7 @@ namespace DetourNavigator
                     }
             }
             const auto maxTiles = std::min(mSettings.mMaxTilesNumber, navMesh.getParams()->maxTiles);
+            mRecastMeshManager.setBounds(makeBounds(mSettings.mRecast, osg::Vec2f(playerPosition.x(), playerPosition.y()), maxTiles));
             mRecastMeshManager.forEachTile([&] (const TilePosition& tile, CachedRecastMeshManager& recastMeshManager)
             {
                 if (tilesToPost.count(tile))
@@ -262,7 +276,7 @@ namespace DetourNavigator
     void NavMeshManager::addChangedTiles(const btCollisionShape& shape, const btTransform& transform,
             const ChangeType changeType)
     {
-        getTilesPositions(shape, transform, mSettings.mRecast,
+        getTilesPositions(makeTilesPositionsRange(shape, transform, mRecastMeshManager.getBounds(), mSettings.mRecast),
             [&] (const TilePosition& v) { addChangedTile(v, changeType); });
     }
 
@@ -272,7 +286,7 @@ namespace DetourNavigator
         if (cellSize == std::numeric_limits<int>::max())
             return;
 
-        getTilesPositions(cellSize, shift, mSettings.mRecast,
+        getTilesPositions(makeTilesPositionsRange(cellSize, shift, mSettings.mRecast),
             [&] (const TilePosition& v) { addChangedTile(v, changeType); });
     }
 
diff --git a/components/detournavigator/recastmeshbuilder.cpp b/components/detournavigator/recastmeshbuilder.cpp
index 0f7552aa77..08e7002cf8 100644
--- a/components/detournavigator/recastmeshbuilder.cpp
+++ b/components/detournavigator/recastmeshbuilder.cpp
@@ -20,6 +20,7 @@
 #include <array>
 #include <vector>
 #include <sstream>
+#include <cmath>
 
 namespace DetourNavigator
 {
@@ -40,6 +41,16 @@ namespace DetourNavigator
         {
             return static_cast<float>(cellSize) / (dataSize - 1);
         }
+
+        bool isNan(const RecastMeshTriangle& triangle)
+        {
+            for (std::size_t i = 0; i < 3; ++i)
+                if (std::isnan(triangle.mVertices[i].x())
+                    || std::isnan(triangle.mVertices[i].y())
+                    || std::isnan(triangle.mVertices[i].z()))
+                    return true;
+            return false;
+        }
     }
 
     Mesh makeMesh(std::vector<RecastMeshTriangle>&& triangles, const osg::Vec3f& shift)
@@ -264,6 +275,7 @@ namespace DetourNavigator
 
     std::shared_ptr<RecastMesh> RecastMeshBuilder::create(std::size_t generation, std::size_t revision) &&
     {
+        mTriangles.erase(std::remove_if(mTriangles.begin(), mTriangles.end(), isNan), mTriangles.end());
         std::sort(mTriangles.begin(), mTriangles.end());
         std::sort(mWater.begin(), mWater.end());
         Mesh mesh = makeMesh(std::move(mTriangles));
diff --git a/components/detournavigator/settingsutils.hpp b/components/detournavigator/settingsutils.hpp
index 285920e5a0..e38da2d0e1 100644
--- a/components/detournavigator/settingsutils.hpp
+++ b/components/detournavigator/settingsutils.hpp
@@ -37,6 +37,11 @@ namespace DetourNavigator
         };
     }
 
+    inline float fromNavMeshCoordinates(const RecastSettings& settings, float value)
+    {
+        return value / settings.mRecastScaleFactor;
+    }
+
     inline osg::Vec3f fromNavMeshCoordinates(const RecastSettings& settings, osg::Vec3f position)
     {
         const auto factor = 1.0f / settings.mRecastScaleFactor;
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.cpp b/components/detournavigator/tilecachedrecastmeshmanager.cpp
index bf3df92d6e..b3750ad171 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -4,6 +4,7 @@
 #include "settingsutils.hpp"
 
 #include <components/debug/debuglog.hpp>
+#include <components/misc/convert.hpp>
 
 #include <algorithm>
 #include <vector>
@@ -14,6 +15,18 @@ namespace DetourNavigator
         : mSettings(settings)
     {}
 
+    TileBounds TileCachedRecastMeshManager::getBounds() const
+    {
+        const std::lock_guard lock(mMutex);
+        return mBounds;
+    }
+
+    void TileCachedRecastMeshManager::setBounds(const TileBounds& bounds)
+    {
+        const std::lock_guard lock(mMutex);
+        mBounds = bounds;
+    }
+
     std::string TileCachedRecastMeshManager::getWorldspace() const
     {
         const std::lock_guard lock(mMutex);
@@ -35,7 +48,8 @@ namespace DetourNavigator
         std::vector<TilePosition> tilesPositions;
         {
             const std::lock_guard lock(mMutex);
-            getTilesPositions(shape.getShape(), transform, mSettings, [&] (const TilePosition& tilePosition)
+            getTilesPositions(makeTilesPositionsRange(shape.getShape(), transform, mBounds, mSettings),
+                [&] (const TilePosition& tilePosition)
                 {
                     if (addTile(id, shape, transform, areaType, tilePosition, mTiles))
                         tilesPositions.push_back(tilePosition);
@@ -90,7 +104,8 @@ namespace DetourNavigator
         else
         {
             const btVector3 shift = Misc::Convert::toBullet(getWaterShift3d(cellPosition, cellSize, level));
-            getTilesPositions(cellSize, shift, mSettings, [&] (const TilePosition& tilePosition)
+            getTilesPositions(makeTilesPositionsRange(cellSize, shift, mSettings),
+                [&] (const TilePosition& tilePosition)
                 {
                     const std::lock_guard lock(mMutex);
                     auto tile = mTiles.find(tilePosition);
@@ -148,7 +163,8 @@ namespace DetourNavigator
 
         bool result = false;
 
-        getTilesPositions(cellSize, shift, mSettings, [&] (const TilePosition& tilePosition)
+        getTilesPositions(makeTilesPositionsRange(cellSize, shift, mSettings),
+            [&] (const TilePosition& tilePosition)
             {
                 const std::lock_guard lock(mMutex);
                 auto tile = mTiles.find(tilePosition);
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.hpp b/components/detournavigator/tilecachedrecastmeshmanager.hpp
index 23171f0925..d99dc3e27e 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.hpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.hpp
@@ -20,6 +20,10 @@ namespace DetourNavigator
     public:
         explicit TileCachedRecastMeshManager(const RecastSettings& settings);
 
+        TileBounds getBounds() const;
+
+        void setBounds(const TileBounds& bounds);
+
         std::string getWorldspace() const;
 
         void setWorldspace(std::string_view worldspace);
@@ -57,7 +61,7 @@ namespace DetourNavigator
                         changed = true;
                     }
                 };
-                getTilesPositions(shape.getShape(), transform, mSettings, onTilePosition);
+                getTilesPositions(makeTilesPositionsRange(shape.getShape(), transform, mBounds, mSettings), onTilePosition);
                 std::sort(newTiles.begin(), newTiles.end());
                 for (const auto& tile : currentTiles)
                 {
@@ -109,6 +113,7 @@ namespace DetourNavigator
 
         const RecastSettings& mSettings;
         mutable std::mutex mMutex;
+        TileBounds mBounds;
         std::string mWorldspace;
         TilesMap mTiles;
         std::unordered_map<ObjectId, std::vector<TilePosition>> mObjectsTilesPositions;

From 670cc9794726fbfcca7cd06ccd8ecb771a8193f3 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Tue, 25 Jan 2022 15:24:49 +0100
Subject: [PATCH 1987/2859] Add #5858 to the changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c45d15e6d..df20ef97e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@
     Bug #5788: Texture editing parses the selected indexes wrongly
     Bug #5801: A multi-effect spell with the intervention effects and recall always favors Almsivi intervention
     Bug #5842: GetDisposition adds temporary disposition change from different actors
+    Bug #5858: Animated model freezes the game
     Bug #5863: GetEffect should return true after the player has teleported
     Bug #5913: Failed assertion during Ritual of Trees quest
     Bug #5928: Glow in the Dahrk functionality used without mod installed

From 12ce82980ce7db03fbc9eb9bd35b895416eb6b05 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 25 Jan 2022 16:33:53 +0100
Subject: [PATCH 1988/2859] Revert "Limit and filter navmesh input (#5858)"

This reverts commit ecc654a36939d8627f21b228c6ddbdf7b09464b8.
---
 apps/navmeshtool/navmesh.cpp                  | 39 ++++------
 apps/openmw/mwworld/scene.cpp                 |  7 +-
 .../detournavigator/gettilespositions.cpp     | 15 ++--
 .../tilecachedrecastmeshmanager.cpp           |  8 --
 components/CMakeLists.txt                     |  1 -
 .../detournavigator/gettilespositions.cpp     | 66 ----------------
 .../detournavigator/gettilespositions.hpp     | 77 +++++++++++++------
 components/detournavigator/navigatorimpl.cpp  |  1 -
 components/detournavigator/navmeshmanager.cpp | 18 +----
 .../detournavigator/recastmeshbuilder.cpp     | 12 ---
 components/detournavigator/settingsutils.hpp  |  5 --
 .../tilecachedrecastmeshmanager.cpp           | 22 +-----
 .../tilecachedrecastmeshmanager.hpp           |  7 +-
 13 files changed, 82 insertions(+), 196 deletions(-)
 delete mode 100644 components/detournavigator/gettilespositions.cpp

diff --git a/apps/navmeshtool/navmesh.cpp b/apps/navmeshtool/navmesh.cpp
index 100ddaf22a..4187197947 100644
--- a/apps/navmeshtool/navmesh.cpp
+++ b/apps/navmeshtool/navmesh.cpp
@@ -35,7 +35,6 @@
 #include <string_view>
 #include <utility>
 #include <vector>
-#include <random>
 
 namespace NavMeshTool
 {
@@ -181,36 +180,26 @@ namespace NavMeshTool
         SceneUtil::WorkQueue workQueue(threadsNumber);
         auto navMeshTileConsumer = std::make_shared<NavMeshTileConsumer>(std::move(db));
         std::size_t tiles = 0;
-        std::mt19937_64 random;
 
         for (const std::unique_ptr<WorldspaceNavMeshInput>& input : data.mNavMeshInputs)
         {
-            std::vector<TilePosition> worldspaceTiles;
-
             DetourNavigator::getTilesPositions(
-                DetourNavigator::makeTilesPositionsRange(
-                    Misc::Convert::toOsg(input->mAabb.m_min),
-                    Misc::Convert::toOsg(input->mAabb.m_max),
-                    settings.mRecast
-                ),
-                [&] (const TilePosition& tilePosition) { worldspaceTiles.push_back(tilePosition); }
-            );
-
-            tiles += worldspaceTiles.size();
+                Misc::Convert::toOsg(input->mAabb.m_min), Misc::Convert::toOsg(input->mAabb.m_max), settings.mRecast,
+                [&] (const TilePosition& tilePosition)
+                {
+                    workQueue.addWorkItem(new GenerateNavMeshTile(
+                        input->mWorldspace,
+                        tilePosition,
+                        RecastMeshProvider(input->mTileCachedRecastMeshManager),
+                        agentHalfExtents,
+                        settings,
+                        navMeshTileConsumer
+                    ));
+
+                    ++tiles;
+                });
 
             navMeshTileConsumer->mExpected = tiles;
-
-            std::shuffle(worldspaceTiles.begin(), worldspaceTiles.end(), random);
-
-            for (const TilePosition& tilePosition : worldspaceTiles)
-                workQueue.addWorkItem(new GenerateNavMeshTile(
-                    input->mWorldspace,
-                    tilePosition,
-                    RecastMeshProvider(input->mTileCachedRecastMeshManager),
-                    agentHalfExtents,
-                    settings,
-                    navMeshTileConsumer
-                ));
         }
 
         navMeshTileConsumer->wait();
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index fc02f205ff..054e26e855 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -511,7 +511,8 @@ namespace MWWorld
         if (mCurrentCell == nullptr)
             return;
 
-        mNavigator.updatePlayerPosition(pos);
+        const auto player = MWBase::Environment::get().getWorld()->getPlayerPtr();
+        mNavigator.updatePlayerPosition(player.getRefData().getPosition().asVec3());
 
         if (!mCurrentCell->isExterior())
             return;
@@ -822,8 +823,6 @@ namespace MWWorld
 
         loadingListener->setProgressRange(cell->count());
 
-        mNavigator.updatePlayerPosition(position.asVec3());
-
         // Load cell.
         mPagedRefs.clear();
         loadCell(cell, loadingListener, changeEvent);
@@ -857,8 +856,6 @@ namespace MWWorld
         if (changeEvent)
             MWBase::Environment::get().getWindowManager()->fadeScreenOut(0.5);
 
-        mNavigator.updatePlayerPosition(position.asVec3());
-
         changeCellGrid(position.asVec3(), x, y, changeEvent);
 
         CellStore* current = MWBase::Environment::get().getWorld()->getExterior(x, y);
diff --git a/apps/openmw_test_suite/detournavigator/gettilespositions.cpp b/apps/openmw_test_suite/detournavigator/gettilespositions.cpp
index 8121c19205..ced33a99f0 100644
--- a/apps/openmw_test_suite/detournavigator/gettilespositions.cpp
+++ b/apps/openmw_test_suite/detournavigator/gettilespositions.cpp
@@ -1,6 +1,5 @@
 #include <components/detournavigator/gettilespositions.hpp>
 #include <components/detournavigator/debug.hpp>
-#include <components/detournavigator/settings.hpp>
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
@@ -37,35 +36,35 @@ namespace
 
     TEST_F(DetourNavigatorGetTilesPositionsTest, for_object_in_single_tile_should_return_one_tile)
     {
-        getTilesPositions(makeTilesPositionsRange(osg::Vec3f(2, 2, 0), osg::Vec3f(31, 31, 1), mSettings), mCollect);
+        getTilesPositions(osg::Vec3f(2, 2, 0), osg::Vec3f(31, 31, 1), mSettings, mCollect);
 
         EXPECT_THAT(mTilesPositions, ElementsAre(TilePosition(0, 0)));
     }
 
     TEST_F(DetourNavigatorGetTilesPositionsTest, for_object_with_x_bounds_in_two_tiles_should_return_two_tiles)
     {
-        getTilesPositions(makeTilesPositionsRange(osg::Vec3f(0, 0, 0), osg::Vec3f(32, 31, 1), mSettings), mCollect);
+        getTilesPositions(osg::Vec3f(0, 0, 0), osg::Vec3f(32, 31, 1), mSettings, mCollect);
 
         EXPECT_THAT(mTilesPositions, ElementsAre(TilePosition(0, 0), TilePosition(1, 0)));
     }
 
     TEST_F(DetourNavigatorGetTilesPositionsTest, for_object_with_y_bounds_in_two_tiles_should_return_two_tiles)
     {
-        getTilesPositions(makeTilesPositionsRange(osg::Vec3f(0, 0, 0), osg::Vec3f(31, 32, 1), mSettings), mCollect);
+        getTilesPositions(osg::Vec3f(0, 0, 0), osg::Vec3f(31, 32, 1), mSettings, mCollect);
 
         EXPECT_THAT(mTilesPositions, ElementsAre(TilePosition(0, 0), TilePosition(0, 1)));
     }
 
     TEST_F(DetourNavigatorGetTilesPositionsTest, tiling_works_only_for_x_and_y_coordinates)
     {
-        getTilesPositions(makeTilesPositionsRange(osg::Vec3f(0, 0, 0), osg::Vec3f(31, 31, 32), mSettings), mCollect);
+        getTilesPositions(osg::Vec3f(0, 0, 0), osg::Vec3f(31, 31, 32), mSettings, mCollect);
 
         EXPECT_THAT(mTilesPositions, ElementsAre(TilePosition(0, 0)));
     }
 
     TEST_F(DetourNavigatorGetTilesPositionsTest, tiling_should_work_with_negative_coordinates)
     {
-        getTilesPositions(makeTilesPositionsRange(osg::Vec3f(-31, -31, 0), osg::Vec3f(31, 31, 1), mSettings), mCollect);
+        getTilesPositions(osg::Vec3f(-31, -31, 0), osg::Vec3f(31, 31, 1), mSettings, mCollect);
 
         EXPECT_THAT(mTilesPositions, ElementsAre(
             TilePosition(-1, -1),
@@ -79,7 +78,7 @@ namespace
     {
         mSettings.mBorderSize = 1;
 
-        getTilesPositions(makeTilesPositionsRange(osg::Vec3f(0, 0, 0), osg::Vec3f(31.5, 31.5, 1), mSettings), mCollect);
+        getTilesPositions(osg::Vec3f(0, 0, 0), osg::Vec3f(31.5, 31.5, 1), mSettings, mCollect);
 
         EXPECT_THAT(mTilesPositions, ElementsAre(
             TilePosition(-1, -1),
@@ -98,7 +97,7 @@ namespace
     {
         mSettings.mRecastScaleFactor = 0.5;
 
-        getTilesPositions(makeTilesPositionsRange(osg::Vec3f(0, 0, 0), osg::Vec3f(32, 32, 1), mSettings), mCollect);
+        getTilesPositions(osg::Vec3f(0, 0, 0), osg::Vec3f(32, 32, 1), mSettings, mCollect);
 
         EXPECT_THAT(mTilesPositions, ElementsAre(TilePosition(0, 0)));
     }
diff --git a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
index 631e4105ba..c44ebc5155 100644
--- a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -90,10 +90,6 @@ namespace
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const btTransform transform(btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
-        TileBounds bounds;
-        bounds.mMin = osg::Vec2f(-1000, -1000);
-        bounds.mMax = osg::Vec2f(1000, 1000);
-        manager.setBounds(bounds);
         manager.addObject(ObjectId(&boxShape), shape, transform, AreaType::AreaType_ground);
         EXPECT_TRUE(manager.updateObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground,
                                          [&] (const auto& v) { onChangedTile(v); }));
@@ -141,10 +137,6 @@ namespace
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, get_mesh_for_moved_object_should_return_recast_mesh_for_each_used_tile)
     {
         TileCachedRecastMeshManager manager(mSettings);
-        TileBounds bounds;
-        bounds.mMin = osg::Vec2f(-1000, -1000);
-        bounds.mMax = osg::Vec2f(1000, 1000);
-        manager.setBounds(bounds);
         manager.setWorldspace("worldspace");
 
         const btBoxShape boxShape(btVector3(20, 20, 100));
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index ae06f3f2b0..89b27b0d94 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -208,7 +208,6 @@ add_component_dir(detournavigator
     serialization
     navmeshdbutils
     recast
-    gettilespositions
     )
 
 add_component_dir(loadinglistener
diff --git a/components/detournavigator/gettilespositions.cpp b/components/detournavigator/gettilespositions.cpp
deleted file mode 100644
index e74a22e5ba..0000000000
--- a/components/detournavigator/gettilespositions.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-#include "gettilespositions.hpp"
-#include "settings.hpp"
-#include "settingsutils.hpp"
-#include "tileposition.hpp"
-#include "tilebounds.hpp"
-
-#include <components/misc/convert.hpp>
-
-#include <BulletCollision/CollisionShapes/btCollisionShape.h>
-
-namespace DetourNavigator
-{
-    TilesPositionsRange makeTilesPositionsRange(const osg::Vec3f& aabbMin, const osg::Vec3f& aabbMax,
-        const RecastSettings& settings)
-    {
-        osg::Vec3f min = toNavMeshCoordinates(settings, aabbMin);
-        osg::Vec3f max = toNavMeshCoordinates(settings, aabbMax);
-
-        const float border = getBorderSize(settings);
-        min -= osg::Vec3f(border, border, border);
-        max += osg::Vec3f(border, border, border);
-
-        TilePosition minTile = getTilePosition(settings, min);
-        TilePosition maxTile = getTilePosition(settings, max);
-
-        if (minTile.x() > maxTile.x())
-            std::swap(minTile.x(), maxTile.x());
-
-        if (minTile.y() > maxTile.y())
-            std::swap(minTile.y(), maxTile.y());
-
-        return {minTile, maxTile};
-    }
-
-    TilesPositionsRange makeTilesPositionsRange(const btCollisionShape& shape, const btTransform& transform,
-        const TileBounds& bounds, const RecastSettings& settings)
-    {
-        btVector3 aabbMin;
-        btVector3 aabbMax;
-        shape.getAabb(transform, aabbMin, aabbMax);
-        aabbMin.setX(std::max<btScalar>(aabbMin.x(), bounds.mMin.x()));
-        aabbMin.setY(std::max<btScalar>(aabbMin.y(), bounds.mMin.y()));
-        aabbMax.setX(std::min<btScalar>(aabbMax.x(), bounds.mMax.x()));
-        aabbMax.setY(std::min<btScalar>(aabbMax.y(), bounds.mMax.y()));
-        return makeTilesPositionsRange(Misc::Convert::toOsg(aabbMin), Misc::Convert::toOsg(aabbMax), settings);
-    }
-
-    TilesPositionsRange makeTilesPositionsRange(const int cellSize, const btVector3& shift,
-        const RecastSettings& settings)
-    {
-        using Misc::Convert::toOsg;
-
-        const int halfCellSize = cellSize / 2;
-        const btTransform transform(btMatrix3x3::getIdentity(), shift);
-        btVector3 aabbMin = transform(btVector3(-halfCellSize, -halfCellSize, 0));
-        btVector3 aabbMax = transform(btVector3(halfCellSize, halfCellSize, 0));
-
-        aabbMin.setX(std::min(aabbMin.x(), aabbMax.x()));
-        aabbMin.setY(std::min(aabbMin.y(), aabbMax.y()));
-
-        aabbMax.setX(std::max(aabbMin.x(), aabbMax.x()));
-        aabbMax.setY(std::max(aabbMin.y(), aabbMax.y()));
-
-        return makeTilesPositionsRange(toOsg(aabbMin), toOsg(aabbMax), settings);
-    }
-}
diff --git a/components/detournavigator/gettilespositions.hpp b/components/detournavigator/gettilespositions.hpp
index 9d3df7ef65..707db0b512 100644
--- a/components/detournavigator/gettilespositions.hpp
+++ b/components/detournavigator/gettilespositions.hpp
@@ -1,43 +1,72 @@
 #ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_GETTILESPOSITIONS_H
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_GETTILESPOSITIONS_H
 
-#include "tilebounds.hpp"
+#include "settings.hpp"
+#include "settingsutils.hpp"
 #include "tileposition.hpp"
 
-class btVector3;
-class btTransform;
-class btCollisionShape;
+#include <components/misc/convert.hpp>
 
-namespace osg
-{
-    class Vec3f;
-}
+#include <BulletCollision/CollisionShapes/btCollisionShape.h>
+
+#include <osg/Vec3f>
 
 namespace DetourNavigator
 {
-    struct RecastSettings;
-
-    struct TilesPositionsRange
+    template <class Callback>
+    void getTilesPositions(const osg::Vec3f& aabbMin, const osg::Vec3f& aabbMax,
+        const RecastSettings& settings, Callback&& callback)
     {
-        TilePosition mMin;
-        TilePosition mMax;
-    };
+        auto min = toNavMeshCoordinates(settings, aabbMin);
+        auto max = toNavMeshCoordinates(settings, aabbMax);
 
-    TilesPositionsRange makeTilesPositionsRange(const osg::Vec3f& aabbMin,
-        const osg::Vec3f& aabbMax, const RecastSettings& settings);
+        const auto border = getBorderSize(settings);
+        min -= osg::Vec3f(border, border, border);
+        max += osg::Vec3f(border, border, border);
 
-    TilesPositionsRange makeTilesPositionsRange(const btCollisionShape& shape,
-        const btTransform& transform, const TileBounds& bounds, const RecastSettings& settings);
+        auto minTile = getTilePosition(settings, min);
+        auto maxTile = getTilePosition(settings, max);
 
-    TilesPositionsRange makeTilesPositionsRange(const int cellSize, const btVector3& shift,
-        const RecastSettings& settings);
+        if (minTile.x() > maxTile.x())
+            std::swap(minTile.x(), maxTile.x());
+
+        if (minTile.y() > maxTile.y())
+            std::swap(minTile.y(), maxTile.y());
+
+        for (int tileX = minTile.x(); tileX <= maxTile.x(); ++tileX)
+            for (int tileY = minTile.y(); tileY <= maxTile.y(); ++tileY)
+                callback(TilePosition {tileX, tileY});
+    }
 
     template <class Callback>
-    void getTilesPositions(const TilesPositionsRange& range, Callback&& callback)
+    void getTilesPositions(const btCollisionShape& shape, const btTransform& transform,
+        const RecastSettings& settings, Callback&& callback)
     {
-        for (int tileX = range.mMin.x(); tileX <= range.mMax.x(); ++tileX)
-            for (int tileY = range.mMin.y(); tileY <= range.mMax.y(); ++tileY)
-                callback(TilePosition {tileX, tileY});
+        btVector3 aabbMin;
+        btVector3 aabbMax;
+        shape.getAabb(transform, aabbMin, aabbMax);
+
+        getTilesPositions(Misc::Convert::toOsg(aabbMin), Misc::Convert::toOsg(aabbMax), settings, std::forward<Callback>(callback));
+    }
+
+    template <class Callback>
+    void getTilesPositions(const int cellSize, const btVector3& shift,
+        const RecastSettings& settings, Callback&& callback)
+    {
+        using Misc::Convert::toOsg;
+
+        const auto halfCellSize = cellSize / 2;
+        const btTransform transform(btMatrix3x3::getIdentity(), shift);
+        auto aabbMin = transform(btVector3(-halfCellSize, -halfCellSize, 0));
+        auto aabbMax = transform(btVector3(halfCellSize, halfCellSize, 0));
+
+        aabbMin.setX(std::min(aabbMin.x(), aabbMax.x()));
+        aabbMin.setY(std::min(aabbMin.y(), aabbMax.y()));
+
+        aabbMax.setX(std::max(aabbMin.x(), aabbMax.x()));
+        aabbMax.setY(std::max(aabbMin.y(), aabbMax.y()));
+
+        getTilesPositions(toOsg(aabbMin), toOsg(aabbMax), settings, std::forward<Callback>(callback));
     }
 }
 
diff --git a/components/detournavigator/navigatorimpl.cpp b/components/detournavigator/navigatorimpl.cpp
index 82a156bb97..85d86e6b2b 100644
--- a/components/detournavigator/navigatorimpl.cpp
+++ b/components/detournavigator/navigatorimpl.cpp
@@ -5,7 +5,6 @@
 #include <components/debug/debuglog.hpp>
 #include <components/esm/loadpgrd.hpp>
 #include <components/misc/coordinateconverter.hpp>
-#include <components/misc/convert.hpp>
 
 namespace DetourNavigator
 {
diff --git a/components/detournavigator/navmeshmanager.cpp b/components/detournavigator/navmeshmanager.cpp
index e8da5a0d61..399af8a6a9 100644
--- a/components/detournavigator/navmeshmanager.cpp
+++ b/components/detournavigator/navmeshmanager.cpp
@@ -9,7 +9,6 @@
 
 #include <components/debug/debuglog.hpp>
 #include <components/bullethelpers/heightfield.hpp>
-#include <components/misc/convert.hpp>
 
 #include <DetourNavMesh.h>
 
@@ -42,18 +41,6 @@ namespace
 
 namespace DetourNavigator
 {
-    namespace
-    {
-        TileBounds makeBounds(const RecastSettings& settings, const osg::Vec2f& center, int maxTiles)
-        {
-            const float radius = fromNavMeshCoordinates(settings, std::ceil(std::sqrt(static_cast<float>(maxTiles) / osg::PIf) + 1) * getTileSize(settings));
-            TileBounds result;
-            result.mMin = center - osg::Vec2f(radius, radius);
-            result.mMax = center + osg::Vec2f(radius, radius);
-            return result;
-        }
-    }
-
     NavMeshManager::NavMeshManager(const Settings& settings, std::unique_ptr<NavMeshDb>&& db)
         : mSettings(settings)
         , mRecastMeshManager(settings.mRecast)
@@ -217,7 +204,6 @@ namespace DetourNavigator
                     }
             }
             const auto maxTiles = std::min(mSettings.mMaxTilesNumber, navMesh.getParams()->maxTiles);
-            mRecastMeshManager.setBounds(makeBounds(mSettings.mRecast, osg::Vec2f(playerPosition.x(), playerPosition.y()), maxTiles));
             mRecastMeshManager.forEachTile([&] (const TilePosition& tile, CachedRecastMeshManager& recastMeshManager)
             {
                 if (tilesToPost.count(tile))
@@ -276,7 +262,7 @@ namespace DetourNavigator
     void NavMeshManager::addChangedTiles(const btCollisionShape& shape, const btTransform& transform,
             const ChangeType changeType)
     {
-        getTilesPositions(makeTilesPositionsRange(shape, transform, mRecastMeshManager.getBounds(), mSettings.mRecast),
+        getTilesPositions(shape, transform, mSettings.mRecast,
             [&] (const TilePosition& v) { addChangedTile(v, changeType); });
     }
 
@@ -286,7 +272,7 @@ namespace DetourNavigator
         if (cellSize == std::numeric_limits<int>::max())
             return;
 
-        getTilesPositions(makeTilesPositionsRange(cellSize, shift, mSettings.mRecast),
+        getTilesPositions(cellSize, shift, mSettings.mRecast,
             [&] (const TilePosition& v) { addChangedTile(v, changeType); });
     }
 
diff --git a/components/detournavigator/recastmeshbuilder.cpp b/components/detournavigator/recastmeshbuilder.cpp
index 08e7002cf8..0f7552aa77 100644
--- a/components/detournavigator/recastmeshbuilder.cpp
+++ b/components/detournavigator/recastmeshbuilder.cpp
@@ -20,7 +20,6 @@
 #include <array>
 #include <vector>
 #include <sstream>
-#include <cmath>
 
 namespace DetourNavigator
 {
@@ -41,16 +40,6 @@ namespace DetourNavigator
         {
             return static_cast<float>(cellSize) / (dataSize - 1);
         }
-
-        bool isNan(const RecastMeshTriangle& triangle)
-        {
-            for (std::size_t i = 0; i < 3; ++i)
-                if (std::isnan(triangle.mVertices[i].x())
-                    || std::isnan(triangle.mVertices[i].y())
-                    || std::isnan(triangle.mVertices[i].z()))
-                    return true;
-            return false;
-        }
     }
 
     Mesh makeMesh(std::vector<RecastMeshTriangle>&& triangles, const osg::Vec3f& shift)
@@ -275,7 +264,6 @@ namespace DetourNavigator
 
     std::shared_ptr<RecastMesh> RecastMeshBuilder::create(std::size_t generation, std::size_t revision) &&
     {
-        mTriangles.erase(std::remove_if(mTriangles.begin(), mTriangles.end(), isNan), mTriangles.end());
         std::sort(mTriangles.begin(), mTriangles.end());
         std::sort(mWater.begin(), mWater.end());
         Mesh mesh = makeMesh(std::move(mTriangles));
diff --git a/components/detournavigator/settingsutils.hpp b/components/detournavigator/settingsutils.hpp
index e38da2d0e1..285920e5a0 100644
--- a/components/detournavigator/settingsutils.hpp
+++ b/components/detournavigator/settingsutils.hpp
@@ -37,11 +37,6 @@ namespace DetourNavigator
         };
     }
 
-    inline float fromNavMeshCoordinates(const RecastSettings& settings, float value)
-    {
-        return value / settings.mRecastScaleFactor;
-    }
-
     inline osg::Vec3f fromNavMeshCoordinates(const RecastSettings& settings, osg::Vec3f position)
     {
         const auto factor = 1.0f / settings.mRecastScaleFactor;
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.cpp b/components/detournavigator/tilecachedrecastmeshmanager.cpp
index b3750ad171..bf3df92d6e 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -4,7 +4,6 @@
 #include "settingsutils.hpp"
 
 #include <components/debug/debuglog.hpp>
-#include <components/misc/convert.hpp>
 
 #include <algorithm>
 #include <vector>
@@ -15,18 +14,6 @@ namespace DetourNavigator
         : mSettings(settings)
     {}
 
-    TileBounds TileCachedRecastMeshManager::getBounds() const
-    {
-        const std::lock_guard lock(mMutex);
-        return mBounds;
-    }
-
-    void TileCachedRecastMeshManager::setBounds(const TileBounds& bounds)
-    {
-        const std::lock_guard lock(mMutex);
-        mBounds = bounds;
-    }
-
     std::string TileCachedRecastMeshManager::getWorldspace() const
     {
         const std::lock_guard lock(mMutex);
@@ -48,8 +35,7 @@ namespace DetourNavigator
         std::vector<TilePosition> tilesPositions;
         {
             const std::lock_guard lock(mMutex);
-            getTilesPositions(makeTilesPositionsRange(shape.getShape(), transform, mBounds, mSettings),
-                [&] (const TilePosition& tilePosition)
+            getTilesPositions(shape.getShape(), transform, mSettings, [&] (const TilePosition& tilePosition)
                 {
                     if (addTile(id, shape, transform, areaType, tilePosition, mTiles))
                         tilesPositions.push_back(tilePosition);
@@ -104,8 +90,7 @@ namespace DetourNavigator
         else
         {
             const btVector3 shift = Misc::Convert::toBullet(getWaterShift3d(cellPosition, cellSize, level));
-            getTilesPositions(makeTilesPositionsRange(cellSize, shift, mSettings),
-                [&] (const TilePosition& tilePosition)
+            getTilesPositions(cellSize, shift, mSettings, [&] (const TilePosition& tilePosition)
                 {
                     const std::lock_guard lock(mMutex);
                     auto tile = mTiles.find(tilePosition);
@@ -163,8 +148,7 @@ namespace DetourNavigator
 
         bool result = false;
 
-        getTilesPositions(makeTilesPositionsRange(cellSize, shift, mSettings),
-            [&] (const TilePosition& tilePosition)
+        getTilesPositions(cellSize, shift, mSettings, [&] (const TilePosition& tilePosition)
             {
                 const std::lock_guard lock(mMutex);
                 auto tile = mTiles.find(tilePosition);
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.hpp b/components/detournavigator/tilecachedrecastmeshmanager.hpp
index d99dc3e27e..23171f0925 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.hpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.hpp
@@ -20,10 +20,6 @@ namespace DetourNavigator
     public:
         explicit TileCachedRecastMeshManager(const RecastSettings& settings);
 
-        TileBounds getBounds() const;
-
-        void setBounds(const TileBounds& bounds);
-
         std::string getWorldspace() const;
 
         void setWorldspace(std::string_view worldspace);
@@ -61,7 +57,7 @@ namespace DetourNavigator
                         changed = true;
                     }
                 };
-                getTilesPositions(makeTilesPositionsRange(shape.getShape(), transform, mBounds, mSettings), onTilePosition);
+                getTilesPositions(shape.getShape(), transform, mSettings, onTilePosition);
                 std::sort(newTiles.begin(), newTiles.end());
                 for (const auto& tile : currentTiles)
                 {
@@ -113,7 +109,6 @@ namespace DetourNavigator
 
         const RecastSettings& mSettings;
         mutable std::mutex mMutex;
-        TileBounds mBounds;
         std::string mWorldspace;
         TilesMap mTiles;
         std::unordered_map<ObjectId, std::vector<TilePosition>> mObjectsTilesPositions;

From d1d29a24524d062bd36a944b59ca86005e0ed271 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 18 Dec 2021 00:05:50 +0100
Subject: [PATCH 1989/2859] Shuffle tile positions before adding to queue for
 processing

---
 apps/navmeshtool/navmesh.cpp | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/apps/navmeshtool/navmesh.cpp b/apps/navmeshtool/navmesh.cpp
index 4187197947..36ed448e72 100644
--- a/apps/navmeshtool/navmesh.cpp
+++ b/apps/navmeshtool/navmesh.cpp
@@ -35,6 +35,7 @@
 #include <string_view>
 #include <utility>
 #include <vector>
+#include <random>
 
 namespace NavMeshTool
 {
@@ -180,26 +181,31 @@ namespace NavMeshTool
         SceneUtil::WorkQueue workQueue(threadsNumber);
         auto navMeshTileConsumer = std::make_shared<NavMeshTileConsumer>(std::move(db));
         std::size_t tiles = 0;
+        std::mt19937_64 random;
 
         for (const std::unique_ptr<WorldspaceNavMeshInput>& input : data.mNavMeshInputs)
         {
+            std::vector<TilePosition> worldspaceTiles;
+
             DetourNavigator::getTilesPositions(
                 Misc::Convert::toOsg(input->mAabb.m_min), Misc::Convert::toOsg(input->mAabb.m_max), settings.mRecast,
-                [&] (const TilePosition& tilePosition)
-                {
-                    workQueue.addWorkItem(new GenerateNavMeshTile(
-                        input->mWorldspace,
-                        tilePosition,
-                        RecastMeshProvider(input->mTileCachedRecastMeshManager),
-                        agentHalfExtents,
-                        settings,
-                        navMeshTileConsumer
-                    ));
-
-                    ++tiles;
-                });
+                [&] (const TilePosition& tilePosition) { worldspaceTiles.push_back(tilePosition); });
+
+            tiles += worldspaceTiles.size();
 
             navMeshTileConsumer->mExpected = tiles;
+
+            std::shuffle(worldspaceTiles.begin(), worldspaceTiles.end(), random);
+
+            for (const TilePosition& tilePosition : worldspaceTiles)
+                workQueue.addWorkItem(new GenerateNavMeshTile(
+                    input->mWorldspace,
+                    tilePosition,
+                    RecastMeshProvider(input->mTileCachedRecastMeshManager),
+                    agentHalfExtents,
+                    settings,
+                    navMeshTileConsumer
+                ));
         }
 
         navMeshTileConsumer->wait();

From bba7beb0c58f259aaffd8ccd59e0ae03c1907855 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 18 Dec 2021 00:37:32 +0100
Subject: [PATCH 1990/2859] Split tiles position range creation and iteration
 over

---
 apps/navmeshtool/navmesh.cpp                  |  9 ++-
 .../detournavigator/gettilespositions.cpp     | 15 ++--
 components/CMakeLists.txt                     |  1 +
 .../detournavigator/gettilespositions.cpp     | 62 +++++++++++++++
 .../detournavigator/gettilespositions.hpp     | 76 ++++++-------------
 components/detournavigator/navigatorimpl.cpp  |  1 +
 components/detournavigator/navmeshmanager.cpp |  5 +-
 .../tilecachedrecastmeshmanager.cpp           | 10 ++-
 .../tilecachedrecastmeshmanager.hpp           |  2 +-
 9 files changed, 113 insertions(+), 68 deletions(-)
 create mode 100644 components/detournavigator/gettilespositions.cpp

diff --git a/apps/navmeshtool/navmesh.cpp b/apps/navmeshtool/navmesh.cpp
index 36ed448e72..100ddaf22a 100644
--- a/apps/navmeshtool/navmesh.cpp
+++ b/apps/navmeshtool/navmesh.cpp
@@ -188,8 +188,13 @@ namespace NavMeshTool
             std::vector<TilePosition> worldspaceTiles;
 
             DetourNavigator::getTilesPositions(
-                Misc::Convert::toOsg(input->mAabb.m_min), Misc::Convert::toOsg(input->mAabb.m_max), settings.mRecast,
-                [&] (const TilePosition& tilePosition) { worldspaceTiles.push_back(tilePosition); });
+                DetourNavigator::makeTilesPositionsRange(
+                    Misc::Convert::toOsg(input->mAabb.m_min),
+                    Misc::Convert::toOsg(input->mAabb.m_max),
+                    settings.mRecast
+                ),
+                [&] (const TilePosition& tilePosition) { worldspaceTiles.push_back(tilePosition); }
+            );
 
             tiles += worldspaceTiles.size();
 
diff --git a/apps/openmw_test_suite/detournavigator/gettilespositions.cpp b/apps/openmw_test_suite/detournavigator/gettilespositions.cpp
index ced33a99f0..8121c19205 100644
--- a/apps/openmw_test_suite/detournavigator/gettilespositions.cpp
+++ b/apps/openmw_test_suite/detournavigator/gettilespositions.cpp
@@ -1,5 +1,6 @@
 #include <components/detournavigator/gettilespositions.hpp>
 #include <components/detournavigator/debug.hpp>
+#include <components/detournavigator/settings.hpp>
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
@@ -36,35 +37,35 @@ namespace
 
     TEST_F(DetourNavigatorGetTilesPositionsTest, for_object_in_single_tile_should_return_one_tile)
     {
-        getTilesPositions(osg::Vec3f(2, 2, 0), osg::Vec3f(31, 31, 1), mSettings, mCollect);
+        getTilesPositions(makeTilesPositionsRange(osg::Vec3f(2, 2, 0), osg::Vec3f(31, 31, 1), mSettings), mCollect);
 
         EXPECT_THAT(mTilesPositions, ElementsAre(TilePosition(0, 0)));
     }
 
     TEST_F(DetourNavigatorGetTilesPositionsTest, for_object_with_x_bounds_in_two_tiles_should_return_two_tiles)
     {
-        getTilesPositions(osg::Vec3f(0, 0, 0), osg::Vec3f(32, 31, 1), mSettings, mCollect);
+        getTilesPositions(makeTilesPositionsRange(osg::Vec3f(0, 0, 0), osg::Vec3f(32, 31, 1), mSettings), mCollect);
 
         EXPECT_THAT(mTilesPositions, ElementsAre(TilePosition(0, 0), TilePosition(1, 0)));
     }
 
     TEST_F(DetourNavigatorGetTilesPositionsTest, for_object_with_y_bounds_in_two_tiles_should_return_two_tiles)
     {
-        getTilesPositions(osg::Vec3f(0, 0, 0), osg::Vec3f(31, 32, 1), mSettings, mCollect);
+        getTilesPositions(makeTilesPositionsRange(osg::Vec3f(0, 0, 0), osg::Vec3f(31, 32, 1), mSettings), mCollect);
 
         EXPECT_THAT(mTilesPositions, ElementsAre(TilePosition(0, 0), TilePosition(0, 1)));
     }
 
     TEST_F(DetourNavigatorGetTilesPositionsTest, tiling_works_only_for_x_and_y_coordinates)
     {
-        getTilesPositions(osg::Vec3f(0, 0, 0), osg::Vec3f(31, 31, 32), mSettings, mCollect);
+        getTilesPositions(makeTilesPositionsRange(osg::Vec3f(0, 0, 0), osg::Vec3f(31, 31, 32), mSettings), mCollect);
 
         EXPECT_THAT(mTilesPositions, ElementsAre(TilePosition(0, 0)));
     }
 
     TEST_F(DetourNavigatorGetTilesPositionsTest, tiling_should_work_with_negative_coordinates)
     {
-        getTilesPositions(osg::Vec3f(-31, -31, 0), osg::Vec3f(31, 31, 1), mSettings, mCollect);
+        getTilesPositions(makeTilesPositionsRange(osg::Vec3f(-31, -31, 0), osg::Vec3f(31, 31, 1), mSettings), mCollect);
 
         EXPECT_THAT(mTilesPositions, ElementsAre(
             TilePosition(-1, -1),
@@ -78,7 +79,7 @@ namespace
     {
         mSettings.mBorderSize = 1;
 
-        getTilesPositions(osg::Vec3f(0, 0, 0), osg::Vec3f(31.5, 31.5, 1), mSettings, mCollect);
+        getTilesPositions(makeTilesPositionsRange(osg::Vec3f(0, 0, 0), osg::Vec3f(31.5, 31.5, 1), mSettings), mCollect);
 
         EXPECT_THAT(mTilesPositions, ElementsAre(
             TilePosition(-1, -1),
@@ -97,7 +98,7 @@ namespace
     {
         mSettings.mRecastScaleFactor = 0.5;
 
-        getTilesPositions(osg::Vec3f(0, 0, 0), osg::Vec3f(32, 32, 1), mSettings, mCollect);
+        getTilesPositions(makeTilesPositionsRange(osg::Vec3f(0, 0, 0), osg::Vec3f(32, 32, 1), mSettings), mCollect);
 
         EXPECT_THAT(mTilesPositions, ElementsAre(TilePosition(0, 0)));
     }
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 89b27b0d94..ae06f3f2b0 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -208,6 +208,7 @@ add_component_dir(detournavigator
     serialization
     navmeshdbutils
     recast
+    gettilespositions
     )
 
 add_component_dir(loadinglistener
diff --git a/components/detournavigator/gettilespositions.cpp b/components/detournavigator/gettilespositions.cpp
new file mode 100644
index 0000000000..d427eb3e12
--- /dev/null
+++ b/components/detournavigator/gettilespositions.cpp
@@ -0,0 +1,62 @@
+#include "gettilespositions.hpp"
+#include "settings.hpp"
+#include "settingsutils.hpp"
+#include "tileposition.hpp"
+
+#include <components/misc/convert.hpp>
+
+#include <BulletCollision/CollisionShapes/btCollisionShape.h>
+
+namespace DetourNavigator
+{
+    TilesPositionsRange makeTilesPositionsRange(const osg::Vec3f& aabbMin, const osg::Vec3f& aabbMax,
+        const RecastSettings& settings)
+    {
+        osg::Vec3f min = toNavMeshCoordinates(settings, aabbMin);
+        osg::Vec3f max = toNavMeshCoordinates(settings, aabbMax);
+
+        const float border = getBorderSize(settings);
+        min -= osg::Vec3f(border, border, border);
+        max += osg::Vec3f(border, border, border);
+
+        TilePosition minTile = getTilePosition(settings, min);
+        TilePosition maxTile = getTilePosition(settings, max);
+
+        if (minTile.x() > maxTile.x())
+            std::swap(minTile.x(), maxTile.x());
+
+        if (minTile.y() > maxTile.y())
+            std::swap(minTile.y(), maxTile.y());
+
+        return {minTile, maxTile};
+    }
+
+    TilesPositionsRange makeTilesPositionsRange(const btCollisionShape& shape, const btTransform& transform,
+        const RecastSettings& settings)
+    {
+        btVector3 aabbMin;
+        btVector3 aabbMax;
+        shape.getAabb(transform, aabbMin, aabbMax);
+
+        return makeTilesPositionsRange(Misc::Convert::toOsg(aabbMin), Misc::Convert::toOsg(aabbMax), settings);
+    }
+
+    TilesPositionsRange makeTilesPositionsRange(const int cellSize, const btVector3& shift,
+        const RecastSettings& settings)
+    {
+        using Misc::Convert::toOsg;
+
+        const int halfCellSize = cellSize / 2;
+        const btTransform transform(btMatrix3x3::getIdentity(), shift);
+        btVector3 aabbMin = transform(btVector3(-halfCellSize, -halfCellSize, 0));
+        btVector3 aabbMax = transform(btVector3(halfCellSize, halfCellSize, 0));
+
+        aabbMin.setX(std::min(aabbMin.x(), aabbMax.x()));
+        aabbMin.setY(std::min(aabbMin.y(), aabbMax.y()));
+
+        aabbMax.setX(std::max(aabbMin.x(), aabbMax.x()));
+        aabbMax.setY(std::max(aabbMin.y(), aabbMax.y()));
+
+        return makeTilesPositionsRange(toOsg(aabbMin), toOsg(aabbMax), settings);
+    }
+}
diff --git a/components/detournavigator/gettilespositions.hpp b/components/detournavigator/gettilespositions.hpp
index 707db0b512..946f3e64f2 100644
--- a/components/detournavigator/gettilespositions.hpp
+++ b/components/detournavigator/gettilespositions.hpp
@@ -1,72 +1,42 @@
 #ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_GETTILESPOSITIONS_H
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_GETTILESPOSITIONS_H
 
-#include "settings.hpp"
-#include "settingsutils.hpp"
 #include "tileposition.hpp"
 
-#include <components/misc/convert.hpp>
+class btVector3;
+class btTransform;
+class btCollisionShape;
 
-#include <BulletCollision/CollisionShapes/btCollisionShape.h>
-
-#include <osg/Vec3f>
+namespace osg
+{
+    class Vec3f;
+}
 
 namespace DetourNavigator
 {
-    template <class Callback>
-    void getTilesPositions(const osg::Vec3f& aabbMin, const osg::Vec3f& aabbMax,
-        const RecastSettings& settings, Callback&& callback)
-    {
-        auto min = toNavMeshCoordinates(settings, aabbMin);
-        auto max = toNavMeshCoordinates(settings, aabbMax);
+    struct RecastSettings;
 
-        const auto border = getBorderSize(settings);
-        min -= osg::Vec3f(border, border, border);
-        max += osg::Vec3f(border, border, border);
+    struct TilesPositionsRange
+    {
+        TilePosition mMin;
+        TilePosition mMax;
+    };
 
-        auto minTile = getTilePosition(settings, min);
-        auto maxTile = getTilePosition(settings, max);
+    TilesPositionsRange makeTilesPositionsRange(const osg::Vec3f& aabbMin,
+        const osg::Vec3f& aabbMax, const RecastSettings& settings);
 
-        if (minTile.x() > maxTile.x())
-            std::swap(minTile.x(), maxTile.x());
+    TilesPositionsRange makeTilesPositionsRange(const btCollisionShape& shape,
+        const btTransform& transform, const RecastSettings& settings);
 
-        if (minTile.y() > maxTile.y())
-            std::swap(minTile.y(), maxTile.y());
-
-        for (int tileX = minTile.x(); tileX <= maxTile.x(); ++tileX)
-            for (int tileY = minTile.y(); tileY <= maxTile.y(); ++tileY)
-                callback(TilePosition {tileX, tileY});
-    }
+    TilesPositionsRange makeTilesPositionsRange(const int cellSize, const btVector3& shift,
+        const RecastSettings& settings);
 
     template <class Callback>
-    void getTilesPositions(const btCollisionShape& shape, const btTransform& transform,
-        const RecastSettings& settings, Callback&& callback)
+    void getTilesPositions(const TilesPositionsRange& range, Callback&& callback)
     {
-        btVector3 aabbMin;
-        btVector3 aabbMax;
-        shape.getAabb(transform, aabbMin, aabbMax);
-
-        getTilesPositions(Misc::Convert::toOsg(aabbMin), Misc::Convert::toOsg(aabbMax), settings, std::forward<Callback>(callback));
-    }
-
-    template <class Callback>
-    void getTilesPositions(const int cellSize, const btVector3& shift,
-        const RecastSettings& settings, Callback&& callback)
-    {
-        using Misc::Convert::toOsg;
-
-        const auto halfCellSize = cellSize / 2;
-        const btTransform transform(btMatrix3x3::getIdentity(), shift);
-        auto aabbMin = transform(btVector3(-halfCellSize, -halfCellSize, 0));
-        auto aabbMax = transform(btVector3(halfCellSize, halfCellSize, 0));
-
-        aabbMin.setX(std::min(aabbMin.x(), aabbMax.x()));
-        aabbMin.setY(std::min(aabbMin.y(), aabbMax.y()));
-
-        aabbMax.setX(std::max(aabbMin.x(), aabbMax.x()));
-        aabbMax.setY(std::max(aabbMin.y(), aabbMax.y()));
-
-        getTilesPositions(toOsg(aabbMin), toOsg(aabbMax), settings, std::forward<Callback>(callback));
+        for (int tileX = range.mMin.x(); tileX <= range.mMax.x(); ++tileX)
+            for (int tileY = range.mMin.y(); tileY <= range.mMax.y(); ++tileY)
+                callback(TilePosition {tileX, tileY});
     }
 }
 
diff --git a/components/detournavigator/navigatorimpl.cpp b/components/detournavigator/navigatorimpl.cpp
index 85d86e6b2b..82a156bb97 100644
--- a/components/detournavigator/navigatorimpl.cpp
+++ b/components/detournavigator/navigatorimpl.cpp
@@ -5,6 +5,7 @@
 #include <components/debug/debuglog.hpp>
 #include <components/esm/loadpgrd.hpp>
 #include <components/misc/coordinateconverter.hpp>
+#include <components/misc/convert.hpp>
 
 namespace DetourNavigator
 {
diff --git a/components/detournavigator/navmeshmanager.cpp b/components/detournavigator/navmeshmanager.cpp
index 399af8a6a9..9fba4ad611 100644
--- a/components/detournavigator/navmeshmanager.cpp
+++ b/components/detournavigator/navmeshmanager.cpp
@@ -9,6 +9,7 @@
 
 #include <components/debug/debuglog.hpp>
 #include <components/bullethelpers/heightfield.hpp>
+#include <components/misc/convert.hpp>
 
 #include <DetourNavMesh.h>
 
@@ -262,7 +263,7 @@ namespace DetourNavigator
     void NavMeshManager::addChangedTiles(const btCollisionShape& shape, const btTransform& transform,
             const ChangeType changeType)
     {
-        getTilesPositions(shape, transform, mSettings.mRecast,
+        getTilesPositions(makeTilesPositionsRange(shape, transform, mSettings.mRecast),
             [&] (const TilePosition& v) { addChangedTile(v, changeType); });
     }
 
@@ -272,7 +273,7 @@ namespace DetourNavigator
         if (cellSize == std::numeric_limits<int>::max())
             return;
 
-        getTilesPositions(cellSize, shift, mSettings.mRecast,
+        getTilesPositions(makeTilesPositionsRange(cellSize, shift, mSettings.mRecast),
             [&] (const TilePosition& v) { addChangedTile(v, changeType); });
     }
 
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.cpp b/components/detournavigator/tilecachedrecastmeshmanager.cpp
index bf3df92d6e..17ba7afc39 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -4,6 +4,7 @@
 #include "settingsutils.hpp"
 
 #include <components/debug/debuglog.hpp>
+#include <components/misc/convert.hpp>
 
 #include <algorithm>
 #include <vector>
@@ -35,7 +36,8 @@ namespace DetourNavigator
         std::vector<TilePosition> tilesPositions;
         {
             const std::lock_guard lock(mMutex);
-            getTilesPositions(shape.getShape(), transform, mSettings, [&] (const TilePosition& tilePosition)
+            getTilesPositions(makeTilesPositionsRange(shape.getShape(), transform, mSettings),
+                [&] (const TilePosition& tilePosition)
                 {
                     if (addTile(id, shape, transform, areaType, tilePosition, mTiles))
                         tilesPositions.push_back(tilePosition);
@@ -90,7 +92,8 @@ namespace DetourNavigator
         else
         {
             const btVector3 shift = Misc::Convert::toBullet(getWaterShift3d(cellPosition, cellSize, level));
-            getTilesPositions(cellSize, shift, mSettings, [&] (const TilePosition& tilePosition)
+            getTilesPositions(makeTilesPositionsRange(cellSize, shift, mSettings),
+                [&] (const TilePosition& tilePosition)
                 {
                     const std::lock_guard lock(mMutex);
                     auto tile = mTiles.find(tilePosition);
@@ -148,7 +151,8 @@ namespace DetourNavigator
 
         bool result = false;
 
-        getTilesPositions(cellSize, shift, mSettings, [&] (const TilePosition& tilePosition)
+        getTilesPositions(makeTilesPositionsRange(cellSize, shift, mSettings),
+            [&] (const TilePosition& tilePosition)
             {
                 const std::lock_guard lock(mMutex);
                 auto tile = mTiles.find(tilePosition);
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.hpp b/components/detournavigator/tilecachedrecastmeshmanager.hpp
index 23171f0925..88face24ce 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.hpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.hpp
@@ -57,7 +57,7 @@ namespace DetourNavigator
                         changed = true;
                     }
                 };
-                getTilesPositions(shape.getShape(), transform, mSettings, onTilePosition);
+                getTilesPositions(makeTilesPositionsRange(shape.getShape(), transform, mSettings), onTilePosition);
                 std::sort(newTiles.begin(), newTiles.end());
                 for (const auto& tile : currentTiles)
                 {

From a9ae263acd7031c6d5f16a91233cc250890c3118 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 23 Jan 2022 16:44:46 +0100
Subject: [PATCH 1991/2859] Reuse existing player position

---
 apps/openmw/mwworld/scene.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 054e26e855..5b74fe63f4 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -511,8 +511,7 @@ namespace MWWorld
         if (mCurrentCell == nullptr)
             return;
 
-        const auto player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-        mNavigator.updatePlayerPosition(player.getRefData().getPosition().asVec3());
+        mNavigator.updatePlayerPosition(pos);
 
         if (!mCurrentCell->isExterior())
             return;

From b0ef20c30348e52c38464777db9a33ecf693f877 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 23 Jan 2022 14:47:20 +0100
Subject: [PATCH 1992/2859] Cull navmesh objects by scene bounds

If object is too big iteration over all tiles covering it can take too much
time. Limit bounds to a square around a player position to cover only tiles
that will be present in navmesh based on max tiles number option.
---
 apps/openmw/mwworld/scene.cpp                   |  4 ++++
 .../tilecachedrecastmeshmanager.cpp             |  8 ++++++++
 .../detournavigator/gettilespositions.cpp       |  8 ++++++--
 .../detournavigator/gettilespositions.hpp       |  3 ++-
 components/detournavigator/navmeshmanager.cpp   | 15 ++++++++++++++-
 components/detournavigator/settingsutils.hpp    |  5 +++++
 .../tilecachedrecastmeshmanager.cpp             | 17 ++++++++++++++++-
 .../tilecachedrecastmeshmanager.hpp             |  7 ++++++-
 8 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 5b74fe63f4..fc02f205ff 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -822,6 +822,8 @@ namespace MWWorld
 
         loadingListener->setProgressRange(cell->count());
 
+        mNavigator.updatePlayerPosition(position.asVec3());
+
         // Load cell.
         mPagedRefs.clear();
         loadCell(cell, loadingListener, changeEvent);
@@ -855,6 +857,8 @@ namespace MWWorld
         if (changeEvent)
             MWBase::Environment::get().getWindowManager()->fadeScreenOut(0.5);
 
+        mNavigator.updatePlayerPosition(position.asVec3());
+
         changeCellGrid(position.asVec3(), x, y, changeEvent);
 
         CellStore* current = MWBase::Environment::get().getWorld()->getExterior(x, y);
diff --git a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
index c44ebc5155..631e4105ba 100644
--- a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -90,6 +90,10 @@ namespace
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const btTransform transform(btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
+        TileBounds bounds;
+        bounds.mMin = osg::Vec2f(-1000, -1000);
+        bounds.mMax = osg::Vec2f(1000, 1000);
+        manager.setBounds(bounds);
         manager.addObject(ObjectId(&boxShape), shape, transform, AreaType::AreaType_ground);
         EXPECT_TRUE(manager.updateObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground,
                                          [&] (const auto& v) { onChangedTile(v); }));
@@ -137,6 +141,10 @@ namespace
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, get_mesh_for_moved_object_should_return_recast_mesh_for_each_used_tile)
     {
         TileCachedRecastMeshManager manager(mSettings);
+        TileBounds bounds;
+        bounds.mMin = osg::Vec2f(-1000, -1000);
+        bounds.mMax = osg::Vec2f(1000, 1000);
+        manager.setBounds(bounds);
         manager.setWorldspace("worldspace");
 
         const btBoxShape boxShape(btVector3(20, 20, 100));
diff --git a/components/detournavigator/gettilespositions.cpp b/components/detournavigator/gettilespositions.cpp
index d427eb3e12..e74a22e5ba 100644
--- a/components/detournavigator/gettilespositions.cpp
+++ b/components/detournavigator/gettilespositions.cpp
@@ -2,6 +2,7 @@
 #include "settings.hpp"
 #include "settingsutils.hpp"
 #include "tileposition.hpp"
+#include "tilebounds.hpp"
 
 #include <components/misc/convert.hpp>
 
@@ -32,12 +33,15 @@ namespace DetourNavigator
     }
 
     TilesPositionsRange makeTilesPositionsRange(const btCollisionShape& shape, const btTransform& transform,
-        const RecastSettings& settings)
+        const TileBounds& bounds, const RecastSettings& settings)
     {
         btVector3 aabbMin;
         btVector3 aabbMax;
         shape.getAabb(transform, aabbMin, aabbMax);
-
+        aabbMin.setX(std::max<btScalar>(aabbMin.x(), bounds.mMin.x()));
+        aabbMin.setY(std::max<btScalar>(aabbMin.y(), bounds.mMin.y()));
+        aabbMax.setX(std::min<btScalar>(aabbMax.x(), bounds.mMax.x()));
+        aabbMax.setY(std::min<btScalar>(aabbMax.y(), bounds.mMax.y()));
         return makeTilesPositionsRange(Misc::Convert::toOsg(aabbMin), Misc::Convert::toOsg(aabbMax), settings);
     }
 
diff --git a/components/detournavigator/gettilespositions.hpp b/components/detournavigator/gettilespositions.hpp
index 946f3e64f2..9d3df7ef65 100644
--- a/components/detournavigator/gettilespositions.hpp
+++ b/components/detournavigator/gettilespositions.hpp
@@ -1,6 +1,7 @@
 #ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_GETTILESPOSITIONS_H
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_GETTILESPOSITIONS_H
 
+#include "tilebounds.hpp"
 #include "tileposition.hpp"
 
 class btVector3;
@@ -26,7 +27,7 @@ namespace DetourNavigator
         const osg::Vec3f& aabbMax, const RecastSettings& settings);
 
     TilesPositionsRange makeTilesPositionsRange(const btCollisionShape& shape,
-        const btTransform& transform, const RecastSettings& settings);
+        const btTransform& transform, const TileBounds& bounds, const RecastSettings& settings);
 
     TilesPositionsRange makeTilesPositionsRange(const int cellSize, const btVector3& shift,
         const RecastSettings& settings);
diff --git a/components/detournavigator/navmeshmanager.cpp b/components/detournavigator/navmeshmanager.cpp
index 9fba4ad611..e8da5a0d61 100644
--- a/components/detournavigator/navmeshmanager.cpp
+++ b/components/detournavigator/navmeshmanager.cpp
@@ -42,6 +42,18 @@ namespace
 
 namespace DetourNavigator
 {
+    namespace
+    {
+        TileBounds makeBounds(const RecastSettings& settings, const osg::Vec2f& center, int maxTiles)
+        {
+            const float radius = fromNavMeshCoordinates(settings, std::ceil(std::sqrt(static_cast<float>(maxTiles) / osg::PIf) + 1) * getTileSize(settings));
+            TileBounds result;
+            result.mMin = center - osg::Vec2f(radius, radius);
+            result.mMax = center + osg::Vec2f(radius, radius);
+            return result;
+        }
+    }
+
     NavMeshManager::NavMeshManager(const Settings& settings, std::unique_ptr<NavMeshDb>&& db)
         : mSettings(settings)
         , mRecastMeshManager(settings.mRecast)
@@ -205,6 +217,7 @@ namespace DetourNavigator
                     }
             }
             const auto maxTiles = std::min(mSettings.mMaxTilesNumber, navMesh.getParams()->maxTiles);
+            mRecastMeshManager.setBounds(makeBounds(mSettings.mRecast, osg::Vec2f(playerPosition.x(), playerPosition.y()), maxTiles));
             mRecastMeshManager.forEachTile([&] (const TilePosition& tile, CachedRecastMeshManager& recastMeshManager)
             {
                 if (tilesToPost.count(tile))
@@ -263,7 +276,7 @@ namespace DetourNavigator
     void NavMeshManager::addChangedTiles(const btCollisionShape& shape, const btTransform& transform,
             const ChangeType changeType)
     {
-        getTilesPositions(makeTilesPositionsRange(shape, transform, mSettings.mRecast),
+        getTilesPositions(makeTilesPositionsRange(shape, transform, mRecastMeshManager.getBounds(), mSettings.mRecast),
             [&] (const TilePosition& v) { addChangedTile(v, changeType); });
     }
 
diff --git a/components/detournavigator/settingsutils.hpp b/components/detournavigator/settingsutils.hpp
index 285920e5a0..e38da2d0e1 100644
--- a/components/detournavigator/settingsutils.hpp
+++ b/components/detournavigator/settingsutils.hpp
@@ -37,6 +37,11 @@ namespace DetourNavigator
         };
     }
 
+    inline float fromNavMeshCoordinates(const RecastSettings& settings, float value)
+    {
+        return value / settings.mRecastScaleFactor;
+    }
+
     inline osg::Vec3f fromNavMeshCoordinates(const RecastSettings& settings, osg::Vec3f position)
     {
         const auto factor = 1.0f / settings.mRecastScaleFactor;
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.cpp b/components/detournavigator/tilecachedrecastmeshmanager.cpp
index 17ba7afc39..ced5a28656 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -8,13 +8,28 @@
 
 #include <algorithm>
 #include <vector>
+#include <limits>
 
 namespace DetourNavigator
 {
     TileCachedRecastMeshManager::TileCachedRecastMeshManager(const RecastSettings& settings)
         : mSettings(settings)
+        , mBounds {osg::Vec2f(-std::numeric_limits<float>::max(), -std::numeric_limits<float>::max()),
+                   osg::Vec2f(std::numeric_limits<float>::max(), std::numeric_limits<float>::max())}
     {}
 
+    TileBounds TileCachedRecastMeshManager::getBounds() const
+    {
+        const std::lock_guard lock(mMutex);
+        return mBounds;
+    }
+
+    void TileCachedRecastMeshManager::setBounds(const TileBounds& bounds)
+    {
+        const std::lock_guard lock(mMutex);
+        mBounds = bounds;
+    }
+
     std::string TileCachedRecastMeshManager::getWorldspace() const
     {
         const std::lock_guard lock(mMutex);
@@ -36,7 +51,7 @@ namespace DetourNavigator
         std::vector<TilePosition> tilesPositions;
         {
             const std::lock_guard lock(mMutex);
-            getTilesPositions(makeTilesPositionsRange(shape.getShape(), transform, mSettings),
+            getTilesPositions(makeTilesPositionsRange(shape.getShape(), transform, mBounds, mSettings),
                 [&] (const TilePosition& tilePosition)
                 {
                     if (addTile(id, shape, transform, areaType, tilePosition, mTiles))
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.hpp b/components/detournavigator/tilecachedrecastmeshmanager.hpp
index 88face24ce..d99dc3e27e 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.hpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.hpp
@@ -20,6 +20,10 @@ namespace DetourNavigator
     public:
         explicit TileCachedRecastMeshManager(const RecastSettings& settings);
 
+        TileBounds getBounds() const;
+
+        void setBounds(const TileBounds& bounds);
+
         std::string getWorldspace() const;
 
         void setWorldspace(std::string_view worldspace);
@@ -57,7 +61,7 @@ namespace DetourNavigator
                         changed = true;
                     }
                 };
-                getTilesPositions(makeTilesPositionsRange(shape.getShape(), transform, mSettings), onTilePosition);
+                getTilesPositions(makeTilesPositionsRange(shape.getShape(), transform, mBounds, mSettings), onTilePosition);
                 std::sort(newTiles.begin(), newTiles.end());
                 for (const auto& tile : currentTiles)
                 {
@@ -109,6 +113,7 @@ namespace DetourNavigator
 
         const RecastSettings& mSettings;
         mutable std::mutex mMutex;
+        TileBounds mBounds;
         std::string mWorldspace;
         TilesMap mTiles;
         std::unordered_map<ObjectId, std::vector<TilePosition>> mObjectsTilesPositions;

From 9069e97dce21ca0adf795b74b220247bde32471e Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 23 Jan 2022 15:12:27 +0100
Subject: [PATCH 1993/2859] Filter out triangles with NaN coordinates

Sorting a vector with such values gives invalid result because comparison with
NaN is always false.
---
 components/detournavigator/recastmeshbuilder.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/components/detournavigator/recastmeshbuilder.cpp b/components/detournavigator/recastmeshbuilder.cpp
index 0f7552aa77..08e7002cf8 100644
--- a/components/detournavigator/recastmeshbuilder.cpp
+++ b/components/detournavigator/recastmeshbuilder.cpp
@@ -20,6 +20,7 @@
 #include <array>
 #include <vector>
 #include <sstream>
+#include <cmath>
 
 namespace DetourNavigator
 {
@@ -40,6 +41,16 @@ namespace DetourNavigator
         {
             return static_cast<float>(cellSize) / (dataSize - 1);
         }
+
+        bool isNan(const RecastMeshTriangle& triangle)
+        {
+            for (std::size_t i = 0; i < 3; ++i)
+                if (std::isnan(triangle.mVertices[i].x())
+                    || std::isnan(triangle.mVertices[i].y())
+                    || std::isnan(triangle.mVertices[i].z()))
+                    return true;
+            return false;
+        }
     }
 
     Mesh makeMesh(std::vector<RecastMeshTriangle>&& triangles, const osg::Vec3f& shift)
@@ -264,6 +275,7 @@ namespace DetourNavigator
 
     std::shared_ptr<RecastMesh> RecastMeshBuilder::create(std::size_t generation, std::size_t revision) &&
     {
+        mTriangles.erase(std::remove_if(mTriangles.begin(), mTriangles.end(), isNan), mTriangles.end());
         std::sort(mTriangles.begin(), mTriangles.end());
         std::sort(mWater.begin(), mWater.end());
         Mesh mesh = makeMesh(std::move(mTriangles));

From e4cb1a13702906058b0867fa65f367aa6d0b0e3d Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 23 Jan 2022 23:53:25 +0000
Subject: [PATCH 1994/2859] Run unit tests in CI with -fsanitize=address

---
 CI/before_script.linux.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CI/before_script.linux.sh b/CI/before_script.linux.sh
index 2a10ae2b78..801d7f0a3e 100755
--- a/CI/before_script.linux.sh
+++ b/CI/before_script.linux.sh
@@ -58,7 +58,7 @@ cd build
 if [[ "${BUILD_TESTS_ONLY}" ]]; then
 
     # flags specific to our test suite
-    CXX_FLAGS="-Wno-error=deprecated-declarations -Wno-error=nonnull -Wno-error=deprecated-copy"
+    CXX_FLAGS="-Wno-error=deprecated-declarations -Wno-error=nonnull -Wno-error=deprecated-copy -fsanitize=address"
     if [[ "${CXX}" == 'clang++' ]]; then
         CXX_FLAGS="${CXX_FLAGS} -Wno-error=unused-lambda-capture -Wno-error=gnu-zero-variadic-macro-arguments"
     fi

From 34723c8ea8e451c3a205ec3f4b93f2164ccb5a8d Mon Sep 17 00:00:00 2001
From: Matt <3397065-ZehMatt@users.noreply.gitlab.com>
Date: Thu, 27 Jan 2022 19:18:57 +0000
Subject: [PATCH 1995/2859] Cleanup interpreter code a bit

---
 CHANGELOG.md                                  |   1 +
 apps/openmw/mwscript/aiextensions.cpp         | 123 +++++----
 apps/openmw/mwscript/animationextensions.cpp  |  12 +-
 apps/openmw/mwscript/cellextensions.cpp       |  20 +-
 apps/openmw/mwscript/containerextensions.cpp  |  32 +--
 apps/openmw/mwscript/controlextensions.cpp    |  82 +++---
 apps/openmw/mwscript/dialogueextensions.cpp   |  44 +--
 apps/openmw/mwscript/guiextensions.cpp        |  66 ++---
 apps/openmw/mwscript/miscextensions.cpp       | 238 ++++++++---------
 apps/openmw/mwscript/skyextensions.cpp        |  16 +-
 apps/openmw/mwscript/soundextensions.cpp      |  64 ++---
 apps/openmw/mwscript/statsextensions.cpp      | 250 +++++++++---------
 .../mwscript/transformationextensions.cpp     |  82 +++---
 apps/openmw/mwscript/userextensions.cpp       |  12 +-
 .../mwscript/test_scripts.cpp                 |  12 +-
 components/interpreter/installopcodes.cpp     | 134 +++++-----
 components/interpreter/interpreter.cpp        | 132 +++------
 components/interpreter/interpreter.hpp        |  62 +++--
 components/interpreter/localopcodes.hpp       |  42 +--
 19 files changed, 647 insertions(+), 777 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c45d15e6d..c8a17898f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -130,6 +130,7 @@
     Feature #6534: Shader-based object texture blending
     Task #6201: Remove the "Note: No relevant classes found. No output generated" warnings
     Task #6264: Remove the old classes in animation.cpp
+    Task #6553: Simplify interpreter instruction registration
 
 0.47.0
 ------
diff --git a/apps/openmw/mwscript/aiextensions.cpp b/apps/openmw/mwscript/aiextensions.cpp
index b7b6de9463..f862508ee4 100644
--- a/apps/openmw/mwscript/aiextensions.cpp
+++ b/apps/openmw/mwscript/aiextensions.cpp
@@ -553,69 +553,68 @@ namespace MWScript
             }
         };
 
-        void installOpcodes (Interpreter::Interpreter& interpreter)
+        void installOpcodes(Interpreter::Interpreter& interpreter)
         {
-            interpreter.installSegment3 (Compiler::Ai::opcodeAIActivate, new OpAiActivate<ImplicitRef>);
-            interpreter.installSegment3 (Compiler::Ai::opcodeAIActivateExplicit, new OpAiActivate<ExplicitRef>);
-            interpreter.installSegment3 (Compiler::Ai::opcodeAiTravel, new OpAiTravel<ImplicitRef>);
-            interpreter.installSegment3 (Compiler::Ai::opcodeAiTravelExplicit, new OpAiTravel<ExplicitRef>);
-            interpreter.installSegment3 (Compiler::Ai::opcodeAiEscort, new OpAiEscort<ImplicitRef>);
-            interpreter.installSegment3 (Compiler::Ai::opcodeAiEscortExplicit, new OpAiEscort<ExplicitRef>);
-            interpreter.installSegment3 (Compiler::Ai::opcodeAiEscortCell, new OpAiEscortCell<ImplicitRef>);
-            interpreter.installSegment3 (Compiler::Ai::opcodeAiEscortCellExplicit, new OpAiEscortCell<ExplicitRef>);
-            interpreter.installSegment3 (Compiler::Ai::opcodeAiWander, new OpAiWander<ImplicitRef>);
-            interpreter.installSegment3 (Compiler::Ai::opcodeAiWanderExplicit, new OpAiWander<ExplicitRef>);
-            interpreter.installSegment3 (Compiler::Ai::opcodeAiFollow, new OpAiFollow<ImplicitRef>);
-            interpreter.installSegment3 (Compiler::Ai::opcodeAiFollowExplicit, new OpAiFollow<ExplicitRef>);
-            interpreter.installSegment3 (Compiler::Ai::opcodeAiFollowCell, new OpAiFollowCell<ImplicitRef>);
-            interpreter.installSegment3 (Compiler::Ai::opcodeAiFollowCellExplicit, new OpAiFollowCell<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Ai::opcodeGetAiPackageDone, new OpGetAiPackageDone<ImplicitRef>);
-
-            interpreter.installSegment5 (Compiler::Ai::opcodeGetAiPackageDoneExplicit,
-                new OpGetAiPackageDone<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Ai::opcodeGetCurrentAiPackage, new OpGetCurrentAIPackage<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Ai::opcodeGetCurrentAiPackageExplicit, new OpGetCurrentAIPackage<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Ai::opcodeGetDetected, new OpGetDetected<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Ai::opcodeGetDetectedExplicit, new OpGetDetected<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Ai::opcodeGetLineOfSight, new OpGetLineOfSight<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Ai::opcodeGetLineOfSightExplicit, new OpGetLineOfSight<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Ai::opcodeGetTarget, new OpGetTarget<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Ai::opcodeGetTargetExplicit, new OpGetTarget<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Ai::opcodeStartCombat, new OpStartCombat<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Ai::opcodeStartCombatExplicit, new OpStartCombat<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Ai::opcodeStopCombat, new OpStopCombat<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Ai::opcodeStopCombatExplicit, new OpStopCombat<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Ai::opcodeToggleAI, new OpToggleAI);
-
-            interpreter.installSegment5 (Compiler::Ai::opcodeSetHello, new OpSetAiSetting<ImplicitRef>(MWMechanics::CreatureStats::AiSetting::AI_Hello));
-            interpreter.installSegment5 (Compiler::Ai::opcodeSetHelloExplicit, new OpSetAiSetting<ExplicitRef>(MWMechanics::CreatureStats::AiSetting::AI_Hello));
-            interpreter.installSegment5 (Compiler::Ai::opcodeSetFight, new OpSetAiSetting<ImplicitRef>(MWMechanics::CreatureStats::AiSetting::AI_Fight));
-            interpreter.installSegment5 (Compiler::Ai::opcodeSetFightExplicit, new OpSetAiSetting<ExplicitRef>(MWMechanics::CreatureStats::AiSetting::AI_Fight));
-            interpreter.installSegment5 (Compiler::Ai::opcodeSetFlee, new OpSetAiSetting<ImplicitRef>(MWMechanics::CreatureStats::AiSetting::AI_Flee));
-            interpreter.installSegment5 (Compiler::Ai::opcodeSetFleeExplicit, new OpSetAiSetting<ExplicitRef>(MWMechanics::CreatureStats::AiSetting::AI_Flee));
-            interpreter.installSegment5 (Compiler::Ai::opcodeSetAlarm, new OpSetAiSetting<ImplicitRef>(MWMechanics::CreatureStats::AiSetting::AI_Alarm));
-            interpreter.installSegment5 (Compiler::Ai::opcodeSetAlarmExplicit, new OpSetAiSetting<ExplicitRef>(MWMechanics::CreatureStats::AiSetting::AI_Alarm));
-
-            interpreter.installSegment5 (Compiler::Ai::opcodeModHello, new OpModAiSetting<ImplicitRef>(MWMechanics::CreatureStats::AiSetting::AI_Hello));
-            interpreter.installSegment5 (Compiler::Ai::opcodeModHelloExplicit, new OpModAiSetting<ExplicitRef>(MWMechanics::CreatureStats::AiSetting::AI_Hello));
-            interpreter.installSegment5 (Compiler::Ai::opcodeModFight, new OpModAiSetting<ImplicitRef>(MWMechanics::CreatureStats::AiSetting::AI_Fight));
-            interpreter.installSegment5 (Compiler::Ai::opcodeModFightExplicit, new OpModAiSetting<ExplicitRef>(MWMechanics::CreatureStats::AiSetting::AI_Fight));
-            interpreter.installSegment5 (Compiler::Ai::opcodeModFlee, new OpModAiSetting<ImplicitRef>(MWMechanics::CreatureStats::AiSetting::AI_Flee));
-            interpreter.installSegment5 (Compiler::Ai::opcodeModFleeExplicit, new OpModAiSetting<ExplicitRef>(MWMechanics::CreatureStats::AiSetting::AI_Flee));
-            interpreter.installSegment5 (Compiler::Ai::opcodeModAlarm, new OpModAiSetting<ImplicitRef>(MWMechanics::CreatureStats::AiSetting::AI_Alarm));
-            interpreter.installSegment5 (Compiler::Ai::opcodeModAlarmExplicit, new OpModAiSetting<ExplicitRef>(MWMechanics::CreatureStats::AiSetting::AI_Alarm));
-
-            interpreter.installSegment5 (Compiler::Ai::opcodeGetHello, new OpGetAiSetting<ImplicitRef>(MWMechanics::CreatureStats::AiSetting::AI_Hello));
-            interpreter.installSegment5 (Compiler::Ai::opcodeGetHelloExplicit, new OpGetAiSetting<ExplicitRef>(MWMechanics::CreatureStats::AiSetting::AI_Hello));
-            interpreter.installSegment5 (Compiler::Ai::opcodeGetFight, new OpGetAiSetting<ImplicitRef>(MWMechanics::CreatureStats::AiSetting::AI_Fight));
-            interpreter.installSegment5 (Compiler::Ai::opcodeGetFightExplicit, new OpGetAiSetting<ExplicitRef>(MWMechanics::CreatureStats::AiSetting::AI_Fight));
-            interpreter.installSegment5 (Compiler::Ai::opcodeGetFlee, new OpGetAiSetting<ImplicitRef>(MWMechanics::CreatureStats::AiSetting::AI_Flee));
-            interpreter.installSegment5 (Compiler::Ai::opcodeGetFleeExplicit, new OpGetAiSetting<ExplicitRef>(MWMechanics::CreatureStats::AiSetting::AI_Flee));
-            interpreter.installSegment5 (Compiler::Ai::opcodeGetAlarm, new OpGetAiSetting<ImplicitRef>(MWMechanics::CreatureStats::AiSetting::AI_Alarm));
-            interpreter.installSegment5 (Compiler::Ai::opcodeGetAlarmExplicit, new OpGetAiSetting<ExplicitRef>(MWMechanics::CreatureStats::AiSetting::AI_Alarm));
-
-            interpreter.installSegment5 (Compiler::Ai::opcodeFace, new OpFace<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Ai::opcodeFaceExplicit, new OpFace<ExplicitRef>);
+            interpreter.installSegment3<OpAiActivate<ImplicitRef>>(Compiler::Ai::opcodeAIActivate);
+            interpreter.installSegment3<OpAiActivate<ExplicitRef>>(Compiler::Ai::opcodeAIActivateExplicit);
+            interpreter.installSegment3<OpAiTravel<ImplicitRef>>(Compiler::Ai::opcodeAiTravel);
+            interpreter.installSegment3<OpAiTravel<ExplicitRef>>(Compiler::Ai::opcodeAiTravelExplicit);
+            interpreter.installSegment3<OpAiEscort<ImplicitRef>>(Compiler::Ai::opcodeAiEscort);
+            interpreter.installSegment3<OpAiEscort<ExplicitRef>>(Compiler::Ai::opcodeAiEscortExplicit);
+            interpreter.installSegment3<OpAiEscortCell<ImplicitRef>>(Compiler::Ai::opcodeAiEscortCell);
+            interpreter.installSegment3<OpAiEscortCell<ExplicitRef>>(Compiler::Ai::opcodeAiEscortCellExplicit);
+            interpreter.installSegment3<OpAiWander<ImplicitRef>>(Compiler::Ai::opcodeAiWander);
+            interpreter.installSegment3<OpAiWander<ExplicitRef>>(Compiler::Ai::opcodeAiWanderExplicit);
+            interpreter.installSegment3<OpAiFollow<ImplicitRef>>(Compiler::Ai::opcodeAiFollow);
+            interpreter.installSegment3<OpAiFollow<ExplicitRef>>(Compiler::Ai::opcodeAiFollowExplicit);
+            interpreter.installSegment3<OpAiFollowCell<ImplicitRef>>(Compiler::Ai::opcodeAiFollowCell);
+            interpreter.installSegment3<OpAiFollowCell<ExplicitRef>>(Compiler::Ai::opcodeAiFollowCellExplicit);
+            interpreter.installSegment5<OpGetAiPackageDone<ImplicitRef>>(Compiler::Ai::opcodeGetAiPackageDone);
+
+            interpreter.installSegment5<OpGetAiPackageDone<ExplicitRef>>(Compiler::Ai::opcodeGetAiPackageDoneExplicit);
+            interpreter.installSegment5<OpGetCurrentAIPackage<ImplicitRef>>(Compiler::Ai::opcodeGetCurrentAiPackage);
+            interpreter.installSegment5<OpGetCurrentAIPackage<ExplicitRef>>(Compiler::Ai::opcodeGetCurrentAiPackageExplicit);
+            interpreter.installSegment5<OpGetDetected<ImplicitRef>>(Compiler::Ai::opcodeGetDetected);
+            interpreter.installSegment5<OpGetDetected<ExplicitRef>>(Compiler::Ai::opcodeGetDetectedExplicit);
+            interpreter.installSegment5<OpGetLineOfSight<ImplicitRef>>(Compiler::Ai::opcodeGetLineOfSight);
+            interpreter.installSegment5<OpGetLineOfSight<ExplicitRef>>(Compiler::Ai::opcodeGetLineOfSightExplicit);
+            interpreter.installSegment5<OpGetTarget<ImplicitRef>>(Compiler::Ai::opcodeGetTarget);
+            interpreter.installSegment5<OpGetTarget<ExplicitRef>>(Compiler::Ai::opcodeGetTargetExplicit);
+            interpreter.installSegment5<OpStartCombat<ImplicitRef>>(Compiler::Ai::opcodeStartCombat);
+            interpreter.installSegment5<OpStartCombat<ExplicitRef>>(Compiler::Ai::opcodeStartCombatExplicit);
+            interpreter.installSegment5<OpStopCombat<ImplicitRef>>(Compiler::Ai::opcodeStopCombat);
+            interpreter.installSegment5<OpStopCombat<ExplicitRef>>(Compiler::Ai::opcodeStopCombatExplicit);
+            interpreter.installSegment5<OpToggleAI>(Compiler::Ai::opcodeToggleAI);
+
+            interpreter.installSegment5<OpSetAiSetting<ImplicitRef>>(Compiler::Ai::opcodeSetHello, MWMechanics::CreatureStats::AiSetting::AI_Hello);
+            interpreter.installSegment5<OpSetAiSetting<ExplicitRef>>(Compiler::Ai::opcodeSetHelloExplicit, MWMechanics::CreatureStats::AiSetting::AI_Hello);
+            interpreter.installSegment5<OpSetAiSetting<ImplicitRef>>(Compiler::Ai::opcodeSetFight, MWMechanics::CreatureStats::AiSetting::AI_Fight);
+            interpreter.installSegment5<OpSetAiSetting<ExplicitRef>>(Compiler::Ai::opcodeSetFightExplicit, MWMechanics::CreatureStats::AiSetting::AI_Fight);
+            interpreter.installSegment5<OpSetAiSetting<ImplicitRef>>(Compiler::Ai::opcodeSetFlee, MWMechanics::CreatureStats::AiSetting::AI_Flee);
+            interpreter.installSegment5<OpSetAiSetting<ExplicitRef>>(Compiler::Ai::opcodeSetFleeExplicit, MWMechanics::CreatureStats::AiSetting::AI_Flee);
+            interpreter.installSegment5<OpSetAiSetting<ImplicitRef>>(Compiler::Ai::opcodeSetAlarm, MWMechanics::CreatureStats::AiSetting::AI_Alarm);
+            interpreter.installSegment5<OpSetAiSetting<ExplicitRef>>(Compiler::Ai::opcodeSetAlarmExplicit, MWMechanics::CreatureStats::AiSetting::AI_Alarm);
+
+            interpreter.installSegment5<OpModAiSetting<ImplicitRef>>(Compiler::Ai::opcodeModHello, MWMechanics::CreatureStats::AiSetting::AI_Hello);
+            interpreter.installSegment5<OpModAiSetting<ExplicitRef>>(Compiler::Ai::opcodeModHelloExplicit, MWMechanics::CreatureStats::AiSetting::AI_Hello);
+            interpreter.installSegment5<OpModAiSetting<ImplicitRef>>(Compiler::Ai::opcodeModFight, MWMechanics::CreatureStats::AiSetting::AI_Fight);
+            interpreter.installSegment5<OpModAiSetting<ExplicitRef>>(Compiler::Ai::opcodeModFightExplicit, MWMechanics::CreatureStats::AiSetting::AI_Fight);
+            interpreter.installSegment5<OpModAiSetting<ImplicitRef>>(Compiler::Ai::opcodeModFlee, MWMechanics::CreatureStats::AiSetting::AI_Flee);
+            interpreter.installSegment5<OpModAiSetting<ExplicitRef>>(Compiler::Ai::opcodeModFleeExplicit, MWMechanics::CreatureStats::AiSetting::AI_Flee);
+            interpreter.installSegment5<OpModAiSetting<ImplicitRef>>(Compiler::Ai::opcodeModAlarm, MWMechanics::CreatureStats::AiSetting::AI_Alarm);
+            interpreter.installSegment5<OpModAiSetting<ExplicitRef>>(Compiler::Ai::opcodeModAlarmExplicit, MWMechanics::CreatureStats::AiSetting::AI_Alarm);
+
+            interpreter.installSegment5<OpGetAiSetting<ImplicitRef>>(Compiler::Ai::opcodeGetHello, MWMechanics::CreatureStats::AiSetting::AI_Hello);
+            interpreter.installSegment5<OpGetAiSetting<ExplicitRef>>(Compiler::Ai::opcodeGetHelloExplicit, MWMechanics::CreatureStats::AiSetting::AI_Hello);
+            interpreter.installSegment5<OpGetAiSetting<ImplicitRef>>(Compiler::Ai::opcodeGetFight, MWMechanics::CreatureStats::AiSetting::AI_Fight);
+            interpreter.installSegment5<OpGetAiSetting<ExplicitRef>>(Compiler::Ai::opcodeGetFightExplicit, MWMechanics::CreatureStats::AiSetting::AI_Fight);
+            interpreter.installSegment5<OpGetAiSetting<ImplicitRef>>(Compiler::Ai::opcodeGetFlee, MWMechanics::CreatureStats::AiSetting::AI_Flee);
+            interpreter.installSegment5<OpGetAiSetting<ExplicitRef>>(Compiler::Ai::opcodeGetFleeExplicit, MWMechanics::CreatureStats::AiSetting::AI_Flee);
+            interpreter.installSegment5<OpGetAiSetting<ImplicitRef>>(Compiler::Ai::opcodeGetAlarm, MWMechanics::CreatureStats::AiSetting::AI_Alarm);
+            interpreter.installSegment5<OpGetAiSetting<ExplicitRef>>(Compiler::Ai::opcodeGetAlarmExplicit, MWMechanics::CreatureStats::AiSetting::AI_Alarm);
+
+            interpreter.installSegment5<OpFace<ImplicitRef>>(Compiler::Ai::opcodeFace);
+            interpreter.installSegment5<OpFace<ExplicitRef>>(Compiler::Ai::opcodeFaceExplicit);
         }
     }
 }
diff --git a/apps/openmw/mwscript/animationextensions.cpp b/apps/openmw/mwscript/animationextensions.cpp
index 8bb6cc6ada..9320c86a88 100644
--- a/apps/openmw/mwscript/animationextensions.cpp
+++ b/apps/openmw/mwscript/animationextensions.cpp
@@ -101,12 +101,12 @@ namespace MWScript
 
         void installOpcodes (Interpreter::Interpreter& interpreter)
         {
-            interpreter.installSegment5 (Compiler::Animation::opcodeSkipAnim, new OpSkipAnim<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Animation::opcodeSkipAnimExplicit, new OpSkipAnim<ExplicitRef>);
-            interpreter.installSegment3 (Compiler::Animation::opcodePlayAnim, new OpPlayAnim<ImplicitRef>);
-            interpreter.installSegment3 (Compiler::Animation::opcodePlayAnimExplicit, new OpPlayAnim<ExplicitRef>);
-            interpreter.installSegment3 (Compiler::Animation::opcodeLoopAnim, new OpLoopAnim<ImplicitRef>);
-            interpreter.installSegment3 (Compiler::Animation::opcodeLoopAnimExplicit, new OpLoopAnim<ExplicitRef>);
+            interpreter.installSegment5<OpSkipAnim<ImplicitRef>>(Compiler::Animation::opcodeSkipAnim);
+            interpreter.installSegment5<OpSkipAnim<ExplicitRef>>(Compiler::Animation::opcodeSkipAnimExplicit);
+            interpreter.installSegment3<OpPlayAnim<ImplicitRef>>(Compiler::Animation::opcodePlayAnim);
+            interpreter.installSegment3<OpPlayAnim<ExplicitRef>>(Compiler::Animation::opcodePlayAnimExplicit);
+            interpreter.installSegment3<OpLoopAnim<ImplicitRef>>(Compiler::Animation::opcodeLoopAnim);
+            interpreter.installSegment3<OpLoopAnim<ExplicitRef>>(Compiler::Animation::opcodeLoopAnimExplicit);
         }
     }
 }
diff --git a/apps/openmw/mwscript/cellextensions.cpp b/apps/openmw/mwscript/cellextensions.cpp
index b0977984fb..d5ac222244 100644
--- a/apps/openmw/mwscript/cellextensions.cpp
+++ b/apps/openmw/mwscript/cellextensions.cpp
@@ -250,16 +250,16 @@ namespace MWScript
 
         void installOpcodes (Interpreter::Interpreter& interpreter)
         {
-            interpreter.installSegment5 (Compiler::Cell::opcodeCellChanged, new OpCellChanged);
-            interpreter.installSegment5 (Compiler::Cell::opcodeTestCells, new OpTestCells);
-            interpreter.installSegment5 (Compiler::Cell::opcodeTestInteriorCells, new OpTestInteriorCells);
-            interpreter.installSegment5 (Compiler::Cell::opcodeCOC, new OpCOC);
-            interpreter.installSegment5 (Compiler::Cell::opcodeCOE, new OpCOE);
-            interpreter.installSegment5 (Compiler::Cell::opcodeGetInterior, new OpGetInterior);
-            interpreter.installSegment5 (Compiler::Cell::opcodeGetPCCell, new OpGetPCCell);
-            interpreter.installSegment5 (Compiler::Cell::opcodeGetWaterLevel, new OpGetWaterLevel);
-            interpreter.installSegment5 (Compiler::Cell::opcodeSetWaterLevel, new OpSetWaterLevel);
-            interpreter.installSegment5 (Compiler::Cell::opcodeModWaterLevel, new OpModWaterLevel);
+            interpreter.installSegment5<OpCellChanged>(Compiler::Cell::opcodeCellChanged);
+            interpreter.installSegment5<OpTestCells>(Compiler::Cell::opcodeTestCells);
+            interpreter.installSegment5<OpTestInteriorCells>(Compiler::Cell::opcodeTestInteriorCells);
+            interpreter.installSegment5<OpCOC>(Compiler::Cell::opcodeCOC);
+            interpreter.installSegment5<OpCOE>(Compiler::Cell::opcodeCOE);
+            interpreter.installSegment5<OpGetInterior>(Compiler::Cell::opcodeGetInterior);
+            interpreter.installSegment5<OpGetPCCell>(Compiler::Cell::opcodeGetPCCell);
+            interpreter.installSegment5<OpGetWaterLevel>(Compiler::Cell::opcodeGetWaterLevel);
+            interpreter.installSegment5<OpSetWaterLevel>(Compiler::Cell::opcodeSetWaterLevel);
+            interpreter.installSegment5<OpModWaterLevel>(Compiler::Cell::opcodeModWaterLevel);
         }
     }
 }
diff --git a/apps/openmw/mwscript/containerextensions.cpp b/apps/openmw/mwscript/containerextensions.cpp
index 501404e958..ec86ba4869 100644
--- a/apps/openmw/mwscript/containerextensions.cpp
+++ b/apps/openmw/mwscript/containerextensions.cpp
@@ -488,22 +488,22 @@ namespace MWScript
 
         void installOpcodes (Interpreter::Interpreter& interpreter)
         {
-             interpreter.installSegment5 (Compiler::Container::opcodeAddItem, new OpAddItem<ImplicitRef>);
-             interpreter.installSegment5 (Compiler::Container::opcodeAddItemExplicit, new OpAddItem<ExplicitRef>);
-             interpreter.installSegment5 (Compiler::Container::opcodeGetItemCount, new OpGetItemCount<ImplicitRef>);
-             interpreter.installSegment5 (Compiler::Container::opcodeGetItemCountExplicit, new OpGetItemCount<ExplicitRef>);
-             interpreter.installSegment5 (Compiler::Container::opcodeRemoveItem, new OpRemoveItem<ImplicitRef>);
-             interpreter.installSegment5 (Compiler::Container::opcodeRemoveItemExplicit, new OpRemoveItem<ExplicitRef>);
-             interpreter.installSegment5 (Compiler::Container::opcodeEquip, new OpEquip<ImplicitRef>);
-             interpreter.installSegment5 (Compiler::Container::opcodeEquipExplicit, new OpEquip<ExplicitRef>);
-             interpreter.installSegment5 (Compiler::Container::opcodeGetArmorType, new OpGetArmorType<ImplicitRef>);
-             interpreter.installSegment5 (Compiler::Container::opcodeGetArmorTypeExplicit, new OpGetArmorType<ExplicitRef>);
-             interpreter.installSegment5 (Compiler::Container::opcodeHasItemEquipped, new OpHasItemEquipped<ImplicitRef>);
-             interpreter.installSegment5 (Compiler::Container::opcodeHasItemEquippedExplicit, new OpHasItemEquipped<ExplicitRef>);
-             interpreter.installSegment5 (Compiler::Container::opcodeHasSoulGem, new OpHasSoulGem<ImplicitRef>);
-             interpreter.installSegment5 (Compiler::Container::opcodeHasSoulGemExplicit, new OpHasSoulGem<ExplicitRef>);
-             interpreter.installSegment5 (Compiler::Container::opcodeGetWeaponType, new OpGetWeaponType<ImplicitRef>);
-             interpreter.installSegment5 (Compiler::Container::opcodeGetWeaponTypeExplicit, new OpGetWeaponType<ExplicitRef>);
+            interpreter.installSegment5<OpAddItem<ImplicitRef>>(Compiler::Container::opcodeAddItem);
+            interpreter.installSegment5<OpAddItem<ExplicitRef>>(Compiler::Container::opcodeAddItemExplicit);
+            interpreter.installSegment5<OpGetItemCount<ImplicitRef>>(Compiler::Container::opcodeGetItemCount);
+            interpreter.installSegment5<OpGetItemCount<ExplicitRef>>(Compiler::Container::opcodeGetItemCountExplicit);
+            interpreter.installSegment5<OpRemoveItem<ImplicitRef>>(Compiler::Container::opcodeRemoveItem);
+            interpreter.installSegment5<OpRemoveItem<ExplicitRef>>(Compiler::Container::opcodeRemoveItemExplicit);
+            interpreter.installSegment5<OpEquip<ImplicitRef>>(Compiler::Container::opcodeEquip);
+            interpreter.installSegment5<OpEquip<ExplicitRef>>(Compiler::Container::opcodeEquipExplicit);
+            interpreter.installSegment5<OpGetArmorType<ImplicitRef>>(Compiler::Container::opcodeGetArmorType);
+            interpreter.installSegment5<OpGetArmorType<ExplicitRef>>(Compiler::Container::opcodeGetArmorTypeExplicit);
+            interpreter.installSegment5<OpHasItemEquipped<ImplicitRef>>(Compiler::Container::opcodeHasItemEquipped);
+            interpreter.installSegment5<OpHasItemEquipped<ExplicitRef>>(Compiler::Container::opcodeHasItemEquippedExplicit);
+            interpreter.installSegment5<OpHasSoulGem<ImplicitRef>>(Compiler::Container::opcodeHasSoulGem);
+            interpreter.installSegment5<OpHasSoulGem<ExplicitRef>>(Compiler::Container::opcodeHasSoulGemExplicit);
+            interpreter.installSegment5<OpGetWeaponType<ImplicitRef>>(Compiler::Container::opcodeGetWeaponType);
+            interpreter.installSegment5<OpGetWeaponType<ExplicitRef>>(Compiler::Container::opcodeGetWeaponTypeExplicit);
         }
     }
 }
diff --git a/apps/openmw/mwscript/controlextensions.cpp b/apps/openmw/mwscript/controlextensions.cpp
index 2716630d72..74d2067394 100644
--- a/apps/openmw/mwscript/controlextensions.cpp
+++ b/apps/openmw/mwscript/controlextensions.cpp
@@ -188,67 +188,51 @@ namespace MWScript
         };
 
 
-        void installOpcodes (Interpreter::Interpreter& interpreter)
+        void installOpcodes(Interpreter::Interpreter& interpreter)
         {
-            for (int i=0; i<Compiler::Control::numberOfControls; ++i)
+            for (int i = 0; i < Compiler::Control::numberOfControls; ++i)
             {
-                interpreter.installSegment5 (Compiler::Control::opcodeEnable+i, new OpSetControl (Compiler::Control::controls[i], true));
-                interpreter.installSegment5 (Compiler::Control::opcodeDisable+i, new OpSetControl (Compiler::Control::controls[i], false));
-                interpreter.installSegment5 (Compiler::Control::opcodeGetDisabled+i, new OpGetDisabled (Compiler::Control::controls[i]));
+                interpreter.installSegment5<OpSetControl>(Compiler::Control::opcodeEnable + i, Compiler::Control::controls[i], true);
+                interpreter.installSegment5<OpSetControl>(Compiler::Control::opcodeDisable + i, Compiler::Control::controls[i], false);
+                interpreter.installSegment5<OpGetDisabled>(Compiler::Control::opcodeGetDisabled + i, Compiler::Control::controls[i]);
             }
 
-            interpreter.installSegment5 (Compiler::Control::opcodeToggleCollision, new OpToggleCollision);
+            interpreter.installSegment5<OpToggleCollision>(Compiler::Control::opcodeToggleCollision);
 
             //Force Run
-            interpreter.installSegment5 (Compiler::Control::opcodeClearForceRun,
-                new OpClearMovementFlag<ImplicitRef> (MWMechanics::CreatureStats::Flag_ForceRun));
-            interpreter.installSegment5 (Compiler::Control::opcodeClearForceRunExplicit,
-                new OpClearMovementFlag<ExplicitRef> (MWMechanics::CreatureStats::Flag_ForceRun));
-            interpreter.installSegment5 (Compiler::Control::opcodeForceRun,
-                new OpSetMovementFlag<ImplicitRef> (MWMechanics::CreatureStats::Flag_ForceRun));
-            interpreter.installSegment5 (Compiler::Control::opcodeForceRunExplicit,
-                new OpSetMovementFlag<ExplicitRef> (MWMechanics::CreatureStats::Flag_ForceRun));
+            interpreter.installSegment5<OpClearMovementFlag<ImplicitRef>>(Compiler::Control::opcodeClearForceRun, MWMechanics::CreatureStats::Flag_ForceRun);
+            interpreter.installSegment5<OpClearMovementFlag<ExplicitRef>>(Compiler::Control::opcodeClearForceRunExplicit, MWMechanics::CreatureStats::Flag_ForceRun);
+            interpreter.installSegment5<OpSetMovementFlag<ImplicitRef>>(Compiler::Control::opcodeForceRun, MWMechanics::CreatureStats::Flag_ForceRun);
+            interpreter.installSegment5<OpSetMovementFlag<ExplicitRef>>(Compiler::Control::opcodeForceRunExplicit, MWMechanics::CreatureStats::Flag_ForceRun);
 
             //Force Jump
-            interpreter.installSegment5 (Compiler::Control::opcodeClearForceJump,
-                new OpClearMovementFlag<ImplicitRef> (MWMechanics::CreatureStats::Flag_ForceJump));
-            interpreter.installSegment5 (Compiler::Control::opcodeClearForceJumpExplicit,
-                new OpClearMovementFlag<ExplicitRef> (MWMechanics::CreatureStats::Flag_ForceJump));
-            interpreter.installSegment5 (Compiler::Control::opcodeForceJump,
-                new OpSetMovementFlag<ImplicitRef> (MWMechanics::CreatureStats::Flag_ForceJump));
-            interpreter.installSegment5 (Compiler::Control::opcodeForceJumpExplicit,
-                new OpSetMovementFlag<ExplicitRef> (MWMechanics::CreatureStats::Flag_ForceJump));
+            interpreter.installSegment5<OpClearMovementFlag<ImplicitRef>>(Compiler::Control::opcodeClearForceJump, MWMechanics::CreatureStats::Flag_ForceJump);
+            interpreter.installSegment5<OpClearMovementFlag<ExplicitRef>>(Compiler::Control::opcodeClearForceJumpExplicit, MWMechanics::CreatureStats::Flag_ForceJump);
+            interpreter.installSegment5<OpSetMovementFlag<ImplicitRef>>(Compiler::Control::opcodeForceJump, MWMechanics::CreatureStats::Flag_ForceJump);
+            interpreter.installSegment5<OpSetMovementFlag<ExplicitRef>>(Compiler::Control::opcodeForceJumpExplicit, MWMechanics::CreatureStats::Flag_ForceJump);
 
             //Force MoveJump
-            interpreter.installSegment5 (Compiler::Control::opcodeClearForceMoveJump,
-                new OpClearMovementFlag<ImplicitRef> (MWMechanics::CreatureStats::Flag_ForceMoveJump));
-            interpreter.installSegment5 (Compiler::Control::opcodeClearForceMoveJumpExplicit,
-                new OpClearMovementFlag<ExplicitRef> (MWMechanics::CreatureStats::Flag_ForceMoveJump));
-            interpreter.installSegment5 (Compiler::Control::opcodeForceMoveJump,
-                new OpSetMovementFlag<ImplicitRef> (MWMechanics::CreatureStats::Flag_ForceMoveJump));
-            interpreter.installSegment5 (Compiler::Control::opcodeForceMoveJumpExplicit,
-                new OpSetMovementFlag<ExplicitRef> (MWMechanics::CreatureStats::Flag_ForceMoveJump));
+            interpreter.installSegment5<OpClearMovementFlag<ImplicitRef>>(Compiler::Control::opcodeClearForceMoveJump, MWMechanics::CreatureStats::Flag_ForceMoveJump);
+            interpreter.installSegment5<OpClearMovementFlag<ExplicitRef>>(Compiler::Control::opcodeClearForceMoveJumpExplicit, MWMechanics::CreatureStats::Flag_ForceMoveJump);
+            interpreter.installSegment5<OpSetMovementFlag<ImplicitRef>>(Compiler::Control::opcodeForceMoveJump, MWMechanics::CreatureStats::Flag_ForceMoveJump);
+            interpreter.installSegment5<OpSetMovementFlag<ExplicitRef>>(Compiler::Control::opcodeForceMoveJumpExplicit, MWMechanics::CreatureStats::Flag_ForceMoveJump);
 
             //Force Sneak
-            interpreter.installSegment5 (Compiler::Control::opcodeClearForceSneak,
-                new OpClearMovementFlag<ImplicitRef> (MWMechanics::CreatureStats::Flag_ForceSneak));
-            interpreter.installSegment5 (Compiler::Control::opcodeClearForceSneakExplicit,
-                new OpClearMovementFlag<ExplicitRef> (MWMechanics::CreatureStats::Flag_ForceSneak));
-            interpreter.installSegment5 (Compiler::Control::opcodeForceSneak,
-                new OpSetMovementFlag<ImplicitRef> (MWMechanics::CreatureStats::Flag_ForceSneak));
-            interpreter.installSegment5 (Compiler::Control::opcodeForceSneakExplicit,
-                new OpSetMovementFlag<ExplicitRef> (MWMechanics::CreatureStats::Flag_ForceSneak));
-
-            interpreter.installSegment5 (Compiler::Control::opcodeGetPcRunning, new OpGetPcRunning);
-            interpreter.installSegment5 (Compiler::Control::opcodeGetPcSneaking, new OpGetPcSneaking);
-            interpreter.installSegment5 (Compiler::Control::opcodeGetForceRun, new OpGetForceRun<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Control::opcodeGetForceRunExplicit, new OpGetForceRun<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Control::opcodeGetForceJump, new OpGetForceJump<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Control::opcodeGetForceJumpExplicit, new OpGetForceJump<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Control::opcodeGetForceMoveJump, new OpGetForceMoveJump<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Control::opcodeGetForceMoveJumpExplicit, new OpGetForceMoveJump<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Control::opcodeGetForceSneak, new OpGetForceSneak<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Control::opcodeGetForceSneakExplicit, new OpGetForceSneak<ExplicitRef>);
+            interpreter.installSegment5<OpClearMovementFlag<ImplicitRef>>(Compiler::Control::opcodeClearForceSneak, MWMechanics::CreatureStats::Flag_ForceSneak);
+            interpreter.installSegment5<OpClearMovementFlag<ExplicitRef>>(Compiler::Control::opcodeClearForceSneakExplicit, MWMechanics::CreatureStats::Flag_ForceSneak);
+            interpreter.installSegment5<OpSetMovementFlag<ImplicitRef>>(Compiler::Control::opcodeForceSneak, MWMechanics::CreatureStats::Flag_ForceSneak);
+            interpreter.installSegment5<OpSetMovementFlag<ExplicitRef>>(Compiler::Control::opcodeForceSneakExplicit, MWMechanics::CreatureStats::Flag_ForceSneak);
+
+            interpreter.installSegment5<OpGetPcRunning>(Compiler::Control::opcodeGetPcRunning);
+            interpreter.installSegment5<OpGetPcSneaking>(Compiler::Control::opcodeGetPcSneaking);
+            interpreter.installSegment5<OpGetForceRun<ImplicitRef>>(Compiler::Control::opcodeGetForceRun);
+            interpreter.installSegment5<OpGetForceRun<ExplicitRef>>(Compiler::Control::opcodeGetForceRunExplicit);
+            interpreter.installSegment5<OpGetForceJump<ImplicitRef>>(Compiler::Control::opcodeGetForceJump);
+            interpreter.installSegment5<OpGetForceJump<ExplicitRef>>(Compiler::Control::opcodeGetForceJumpExplicit);
+            interpreter.installSegment5<OpGetForceMoveJump<ImplicitRef>>(Compiler::Control::opcodeGetForceMoveJump);
+            interpreter.installSegment5<OpGetForceMoveJump<ExplicitRef>>(Compiler::Control::opcodeGetForceMoveJumpExplicit);
+            interpreter.installSegment5<OpGetForceSneak<ImplicitRef>>(Compiler::Control::opcodeGetForceSneak);
+            interpreter.installSegment5<OpGetForceSneak<ExplicitRef>>(Compiler::Control::opcodeGetForceSneakExplicit);
         }
     }
 }
diff --git a/apps/openmw/mwscript/dialogueextensions.cpp b/apps/openmw/mwscript/dialogueextensions.cpp
index b99a043bf5..a147bce6ea 100644
--- a/apps/openmw/mwscript/dialogueextensions.cpp
+++ b/apps/openmw/mwscript/dialogueextensions.cpp
@@ -284,28 +284,28 @@ namespace MWScript
 
         void installOpcodes (Interpreter::Interpreter& interpreter)
         {
-            interpreter.installSegment5 (Compiler::Dialogue::opcodeJournal, new OpJournal<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Dialogue::opcodeJournalExplicit, new OpJournal<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Dialogue::opcodeSetJournalIndex, new OpSetJournalIndex);
-            interpreter.installSegment5 (Compiler::Dialogue::opcodeGetJournalIndex, new OpGetJournalIndex);
-            interpreter.installSegment5 (Compiler::Dialogue::opcodeAddTopic, new OpAddTopic);
-            interpreter.installSegment3 (Compiler::Dialogue::opcodeChoice,new OpChoice);
-            interpreter.installSegment5 (Compiler::Dialogue::opcodeForceGreeting, new OpForceGreeting<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Dialogue::opcodeForceGreetingExplicit, new OpForceGreeting<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Dialogue::opcodeGoodbye, new OpGoodbye);
-            interpreter.installSegment5 (Compiler::Dialogue::opcodeGetReputation, new OpGetReputation<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Dialogue::opcodeSetReputation, new OpSetReputation<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Dialogue::opcodeModReputation, new OpModReputation<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Dialogue::opcodeSetReputationExplicit, new OpSetReputation<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Dialogue::opcodeModReputationExplicit, new OpModReputation<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Dialogue::opcodeGetReputationExplicit, new OpGetReputation<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Dialogue::opcodeSameFaction, new OpSameFaction<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Dialogue::opcodeSameFactionExplicit, new OpSameFaction<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Dialogue::opcodeModFactionReaction, new OpModFactionReaction);
-            interpreter.installSegment5 (Compiler::Dialogue::opcodeSetFactionReaction, new OpSetFactionReaction);
-            interpreter.installSegment5 (Compiler::Dialogue::opcodeGetFactionReaction, new OpGetFactionReaction);
-            interpreter.installSegment5 (Compiler::Dialogue::opcodeClearInfoActor, new OpClearInfoActor<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Dialogue::opcodeClearInfoActorExplicit, new OpClearInfoActor<ExplicitRef>);
+            interpreter.installSegment5<OpJournal<ImplicitRef>>(Compiler::Dialogue::opcodeJournal);
+            interpreter.installSegment5<OpJournal<ExplicitRef>>(Compiler::Dialogue::opcodeJournalExplicit);
+            interpreter.installSegment5<OpSetJournalIndex>(Compiler::Dialogue::opcodeSetJournalIndex);
+            interpreter.installSegment5<OpGetJournalIndex>(Compiler::Dialogue::opcodeGetJournalIndex);
+            interpreter.installSegment5<OpAddTopic>(Compiler::Dialogue::opcodeAddTopic);
+            interpreter.installSegment3<OpChoice>(Compiler::Dialogue::opcodeChoice);
+            interpreter.installSegment5<OpForceGreeting<ImplicitRef>>(Compiler::Dialogue::opcodeForceGreeting);
+            interpreter.installSegment5<OpForceGreeting<ExplicitRef>>(Compiler::Dialogue::opcodeForceGreetingExplicit);
+            interpreter.installSegment5<OpGoodbye>(Compiler::Dialogue::opcodeGoodbye);
+            interpreter.installSegment5<OpGetReputation<ImplicitRef>>(Compiler::Dialogue::opcodeGetReputation);
+            interpreter.installSegment5<OpSetReputation<ImplicitRef>>(Compiler::Dialogue::opcodeSetReputation);
+            interpreter.installSegment5<OpModReputation<ImplicitRef>>(Compiler::Dialogue::opcodeModReputation);
+            interpreter.installSegment5<OpSetReputation<ExplicitRef>>(Compiler::Dialogue::opcodeSetReputationExplicit);
+            interpreter.installSegment5<OpModReputation<ExplicitRef>>(Compiler::Dialogue::opcodeModReputationExplicit);
+            interpreter.installSegment5<OpGetReputation<ExplicitRef>>(Compiler::Dialogue::opcodeGetReputationExplicit);
+            interpreter.installSegment5<OpSameFaction<ImplicitRef>>(Compiler::Dialogue::opcodeSameFaction);
+            interpreter.installSegment5<OpSameFaction<ExplicitRef>>(Compiler::Dialogue::opcodeSameFactionExplicit);
+            interpreter.installSegment5<OpModFactionReaction>(Compiler::Dialogue::opcodeModFactionReaction);
+            interpreter.installSegment5<OpSetFactionReaction>(Compiler::Dialogue::opcodeSetFactionReaction);
+            interpreter.installSegment5<OpGetFactionReaction>(Compiler::Dialogue::opcodeGetFactionReaction);
+            interpreter.installSegment5<OpClearInfoActor<ImplicitRef>>(Compiler::Dialogue::opcodeClearInfoActor);
+            interpreter.installSegment5<OpClearInfoActor<ExplicitRef>>(Compiler::Dialogue::opcodeClearInfoActorExplicit);
         }
     }
 
diff --git a/apps/openmw/mwscript/guiextensions.cpp b/apps/openmw/mwscript/guiextensions.cpp
index f0bc90e044..e44c94e686 100644
--- a/apps/openmw/mwscript/guiextensions.cpp
+++ b/apps/openmw/mwscript/guiextensions.cpp
@@ -218,45 +218,33 @@ namespace MWScript
 
         void installOpcodes (Interpreter::Interpreter& interpreter)
         {
-            interpreter.installSegment5 (Compiler::Gui::opcodeEnableBirthMenu,
-                new OpShowDialogue (MWGui::GM_Birth));
-            interpreter.installSegment5 (Compiler::Gui::opcodeEnableClassMenu,
-                new OpShowDialogue (MWGui::GM_Class));
-            interpreter.installSegment5 (Compiler::Gui::opcodeEnableNameMenu,
-                new OpShowDialogue (MWGui::GM_Name));
-            interpreter.installSegment5 (Compiler::Gui::opcodeEnableRaceMenu,
-                new OpShowDialogue (MWGui::GM_Race));
-            interpreter.installSegment5 (Compiler::Gui::opcodeEnableStatsReviewMenu,
-                new OpShowDialogue (MWGui::GM_Review));
-            interpreter.installSegment5 (Compiler::Gui::opcodeEnableLevelupMenu,
-                new OpShowDialogue (MWGui::GM_Levelup));
-
-            interpreter.installSegment5 (Compiler::Gui::opcodeEnableInventoryMenu,
-                new OpEnableWindow (MWGui::GW_Inventory));
-            interpreter.installSegment5 (Compiler::Gui::opcodeEnableMagicMenu,
-                new OpEnableWindow (MWGui::GW_Magic));
-            interpreter.installSegment5 (Compiler::Gui::opcodeEnableMapMenu,
-                new OpEnableWindow (MWGui::GW_Map));
-            interpreter.installSegment5 (Compiler::Gui::opcodeEnableStatsMenu,
-                new OpEnableWindow (MWGui::GW_Stats));
-
-            interpreter.installSegment5 (Compiler::Gui::opcodeEnableRest,
-                new OpEnableRest ());
-
-            interpreter.installSegment5 (Compiler::Gui::opcodeShowRestMenu,
-                new OpShowRestMenu<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Gui::opcodeShowRestMenuExplicit, new OpShowRestMenu<ExplicitRef>);
-
-            interpreter.installSegment5 (Compiler::Gui::opcodeGetButtonPressed, new OpGetButtonPressed);
-
-            interpreter.installSegment5 (Compiler::Gui::opcodeToggleFogOfWar, new OpToggleFogOfWar);
-
-            interpreter.installSegment5 (Compiler::Gui::opcodeToggleFullHelp, new OpToggleFullHelp);
-
-            interpreter.installSegment5 (Compiler::Gui::opcodeShowMap, new OpShowMap);
-            interpreter.installSegment5 (Compiler::Gui::opcodeFillMap, new OpFillMap);
-            interpreter.installSegment3 (Compiler::Gui::opcodeMenuTest, new OpMenuTest);
-            interpreter.installSegment5 (Compiler::Gui::opcodeToggleMenus, new OpToggleMenus);
+            interpreter.installSegment5<OpShowDialogue>(Compiler::Gui::opcodeEnableBirthMenu, MWGui::GM_Birth);
+            interpreter.installSegment5<OpShowDialogue>(Compiler::Gui::opcodeEnableClassMenu, MWGui::GM_Class);
+            interpreter.installSegment5<OpShowDialogue>(Compiler::Gui::opcodeEnableNameMenu, MWGui::GM_Name);
+            interpreter.installSegment5<OpShowDialogue>(Compiler::Gui::opcodeEnableRaceMenu, MWGui::GM_Race);
+            interpreter.installSegment5<OpShowDialogue>(Compiler::Gui::opcodeEnableStatsReviewMenu, MWGui::GM_Review);
+            interpreter.installSegment5<OpShowDialogue>(Compiler::Gui::opcodeEnableLevelupMenu, MWGui::GM_Levelup);
+
+            interpreter.installSegment5<OpEnableWindow>(Compiler::Gui::opcodeEnableInventoryMenu, MWGui::GW_Inventory);
+            interpreter.installSegment5<OpEnableWindow>(Compiler::Gui::opcodeEnableMagicMenu, MWGui::GW_Magic);
+            interpreter.installSegment5<OpEnableWindow>(Compiler::Gui::opcodeEnableMapMenu, MWGui::GW_Map);
+            interpreter.installSegment5<OpEnableWindow>(Compiler::Gui::opcodeEnableStatsMenu, MWGui::GW_Stats);
+
+            interpreter.installSegment5<OpEnableRest>(Compiler::Gui::opcodeEnableRest);
+
+            interpreter.installSegment5<OpShowRestMenu<ImplicitRef>>(Compiler::Gui::opcodeShowRestMenu);
+            interpreter.installSegment5<OpShowRestMenu<ExplicitRef>>(Compiler::Gui::opcodeShowRestMenuExplicit);
+
+            interpreter.installSegment5<OpGetButtonPressed>(Compiler::Gui::opcodeGetButtonPressed);
+
+            interpreter.installSegment5<OpToggleFogOfWar>(Compiler::Gui::opcodeToggleFogOfWar);
+
+            interpreter.installSegment5<OpToggleFullHelp>(Compiler::Gui::opcodeToggleFullHelp);
+
+            interpreter.installSegment5<OpShowMap>(Compiler::Gui::opcodeShowMap);
+            interpreter.installSegment5<OpFillMap>(Compiler::Gui::opcodeFillMap);
+            interpreter.installSegment3<OpMenuTest>(Compiler::Gui::opcodeMenuTest);
+            interpreter.installSegment5<OpToggleMenus>(Compiler::Gui::opcodeToggleMenus);
         }
     }
 }
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index 5d9f037357..fe8caf4567 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -1616,125 +1616,125 @@ namespace MWScript
 
         void installOpcodes (Interpreter::Interpreter& interpreter)
         {
-            interpreter.installSegment5 (Compiler::Misc::opcodeMenuMode, new OpMenuMode);
-            interpreter.installSegment5 (Compiler::Misc::opcodeRandom, new OpRandom);
-            interpreter.installSegment5 (Compiler::Misc::opcodeScriptRunning, new OpScriptRunning);
-            interpreter.installSegment5 (Compiler::Misc::opcodeStartScript, new OpStartScript<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeStartScriptExplicit, new OpStartScript<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeStopScript, new OpStopScript);
-            interpreter.installSegment5 (Compiler::Misc::opcodeGetSecondsPassed, new OpGetSecondsPassed);
-            interpreter.installSegment5 (Compiler::Misc::opcodeEnable, new OpEnable<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeEnableExplicit, new OpEnable<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeDisable, new OpDisable<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeDisableExplicit, new OpDisable<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeGetDisabled, new OpGetDisabled<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeGetDisabledExplicit, new OpGetDisabled<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeXBox, new OpXBox);
-            interpreter.installSegment5 (Compiler::Misc::opcodeOnActivate, new OpOnActivate<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeOnActivateExplicit, new OpOnActivate<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeActivate, new OpActivate<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeActivateExplicit, new OpActivate<ExplicitRef>);
-            interpreter.installSegment3 (Compiler::Misc::opcodeLock, new OpLock<ImplicitRef>);
-            interpreter.installSegment3 (Compiler::Misc::opcodeLockExplicit, new OpLock<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeUnlock, new OpUnlock<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeUnlockExplicit, new OpUnlock<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeToggleCollisionDebug, new OpToggleCollisionDebug);
-            interpreter.installSegment5 (Compiler::Misc::opcodeToggleCollisionBoxes, new OpToggleCollisionBoxes);
-            interpreter.installSegment5 (Compiler::Misc::opcodeToggleWireframe, new OpToggleWireframe);
-            interpreter.installSegment5 (Compiler::Misc::opcodeFadeIn, new OpFadeIn);
-            interpreter.installSegment5 (Compiler::Misc::opcodeFadeOut, new OpFadeOut);
-            interpreter.installSegment5 (Compiler::Misc::opcodeFadeTo, new OpFadeTo);
-            interpreter.installSegment5 (Compiler::Misc::opcodeTogglePathgrid, new OpTogglePathgrid);
-            interpreter.installSegment5 (Compiler::Misc::opcodeToggleWater, new OpToggleWater);
-            interpreter.installSegment5 (Compiler::Misc::opcodeToggleWorld, new OpToggleWorld);
-            interpreter.installSegment5 (Compiler::Misc::opcodeDontSaveObject, new OpDontSaveObject);
-            interpreter.installSegment5 (Compiler::Misc::opcodePcForce1stPerson, new OpPcForce1stPerson);
-            interpreter.installSegment5 (Compiler::Misc::opcodePcForce3rdPerson, new OpPcForce3rdPerson);
-            interpreter.installSegment5 (Compiler::Misc::opcodePcGet3rdPerson, new OpPcGet3rdPerson);
-            interpreter.installSegment5 (Compiler::Misc::opcodeToggleVanityMode, new OpToggleVanityMode);
-            interpreter.installSegment5 (Compiler::Misc::opcodeGetPcSleep, new OpGetPcSleep);
-            interpreter.installSegment5 (Compiler::Misc::opcodeGetPcJumping, new OpGetPcJumping);
-            interpreter.installSegment5 (Compiler::Misc::opcodeWakeUpPc, new OpWakeUpPc);
-            interpreter.installSegment5 (Compiler::Misc::opcodePlayBink, new OpPlayBink);
-            interpreter.installSegment5 (Compiler::Misc::opcodePayFine, new OpPayFine);
-            interpreter.installSegment5 (Compiler::Misc::opcodePayFineThief, new OpPayFineThief);
-            interpreter.installSegment5 (Compiler::Misc::opcodeGoToJail, new OpGoToJail);
-            interpreter.installSegment5 (Compiler::Misc::opcodeGetLocked, new OpGetLocked<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeGetLockedExplicit, new OpGetLocked<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeGetEffect, new OpGetEffect<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeGetEffectExplicit, new OpGetEffect<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeAddSoulGem, new OpAddSoulGem<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeAddSoulGemExplicit, new OpAddSoulGem<ExplicitRef>);
-            interpreter.installSegment3 (Compiler::Misc::opcodeRemoveSoulGem, new OpRemoveSoulGem<ImplicitRef>);
-            interpreter.installSegment3 (Compiler::Misc::opcodeRemoveSoulGemExplicit, new OpRemoveSoulGem<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeDrop, new OpDrop<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeDropExplicit, new OpDrop<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeDropSoulGem, new OpDropSoulGem<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeDropSoulGemExplicit, new OpDropSoulGem<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeGetAttacked, new OpGetAttacked<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeGetAttackedExplicit, new OpGetAttacked<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeGetWeaponDrawn, new OpGetWeaponDrawn<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeGetWeaponDrawnExplicit, new OpGetWeaponDrawn<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeGetSpellReadied, new OpGetSpellReadied<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeGetSpellReadiedExplicit, new OpGetSpellReadied<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeGetSpellEffects, new OpGetSpellEffects<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeGetSpellEffectsExplicit, new OpGetSpellEffects<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeGetCurrentTime, new OpGetCurrentTime);
-            interpreter.installSegment5 (Compiler::Misc::opcodeSetDelete, new OpSetDelete<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeSetDeleteExplicit, new OpSetDelete<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeGetSquareRoot, new OpGetSquareRoot);
-            interpreter.installSegment5 (Compiler::Misc::opcodeFall, new OpFall<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeFallExplicit, new OpFall<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeGetStandingPc, new OpGetStandingPc<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeGetStandingPcExplicit, new OpGetStandingPc<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeGetStandingActor, new OpGetStandingActor<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeGetStandingActorExplicit, new OpGetStandingActor<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeGetCollidingPc, new OpGetCollidingPc<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeGetCollidingPcExplicit, new OpGetCollidingPc<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeGetCollidingActor, new OpGetCollidingActor<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeGetCollidingActorExplicit, new OpGetCollidingActor<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeHurtStandingActor, new OpHurtStandingActor<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeHurtStandingActorExplicit, new OpHurtStandingActor<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeHurtCollidingActor, new OpHurtCollidingActor<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeHurtCollidingActorExplicit, new OpHurtCollidingActor<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeGetWindSpeed, new OpGetWindSpeed);
-            interpreter.installSegment5 (Compiler::Misc::opcodeHitOnMe, new OpHitOnMe<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeHitOnMeExplicit, new OpHitOnMe<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeHitAttemptOnMe, new OpHitAttemptOnMe<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeHitAttemptOnMeExplicit, new OpHitAttemptOnMe<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeDisableTeleporting, new OpEnableTeleporting<false>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeEnableTeleporting, new OpEnableTeleporting<true>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeShowVars, new OpShowVars<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeShowVarsExplicit, new OpShowVars<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeShow, new OpShow<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeShowExplicit, new OpShow<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeToggleGodMode, new OpToggleGodMode);
-            interpreter.installSegment5 (Compiler::Misc::opcodeToggleScripts, new OpToggleScripts);
-            interpreter.installSegment5 (Compiler::Misc::opcodeDisableLevitation, new OpEnableLevitation<false>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeEnableLevitation, new OpEnableLevitation<true>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeCast, new OpCast<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeCastExplicit, new OpCast<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeExplodeSpell, new OpExplodeSpell<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeExplodeSpellExplicit, new OpExplodeSpell<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeGetPcInJail, new OpGetPcInJail);
-            interpreter.installSegment5 (Compiler::Misc::opcodeGetPcTraveling, new OpGetPcTraveling);
-            interpreter.installSegment3 (Compiler::Misc::opcodeBetaComment, new OpBetaComment<ImplicitRef>);
-            interpreter.installSegment3 (Compiler::Misc::opcodeBetaCommentExplicit, new OpBetaComment<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeAddToLevCreature, new OpAddToLevCreature);
-            interpreter.installSegment5 (Compiler::Misc::opcodeRemoveFromLevCreature, new OpRemoveFromLevCreature);
-            interpreter.installSegment5 (Compiler::Misc::opcodeAddToLevItem, new OpAddToLevItem);
-            interpreter.installSegment5 (Compiler::Misc::opcodeRemoveFromLevItem, new OpRemoveFromLevItem);
-            interpreter.installSegment3 (Compiler::Misc::opcodeShowSceneGraph, new OpShowSceneGraph<ImplicitRef>);
-            interpreter.installSegment3 (Compiler::Misc::opcodeShowSceneGraphExplicit, new OpShowSceneGraph<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeToggleBorders, new OpToggleBorders);
-            interpreter.installSegment5 (Compiler::Misc::opcodeToggleNavMesh, new OpToggleNavMesh);
-            interpreter.installSegment5 (Compiler::Misc::opcodeToggleActorsPaths, new OpToggleActorsPaths);
-            interpreter.installSegment5 (Compiler::Misc::opcodeSetNavMeshNumberToRender, new OpSetNavMeshNumberToRender);
-            interpreter.installSegment5 (Compiler::Misc::opcodeRepairedOnMe, new OpRepairedOnMe<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeRepairedOnMeExplicit, new OpRepairedOnMe<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Misc::opcodeToggleRecastMesh, new OpToggleRecastMesh);
-            interpreter.installSegment5 (Compiler::Misc::opcodeHelp, new OpHelp);
-            interpreter.installSegment5 (Compiler::Misc::opcodeReloadLua, new OpReloadLua);
+            interpreter.installSegment5<OpMenuMode>(Compiler::Misc::opcodeMenuMode);
+            interpreter.installSegment5<OpRandom>(Compiler::Misc::opcodeRandom);
+            interpreter.installSegment5<OpScriptRunning>(Compiler::Misc::opcodeScriptRunning);
+            interpreter.installSegment5<OpStartScript<ImplicitRef>>(Compiler::Misc::opcodeStartScript);
+            interpreter.installSegment5<OpStartScript<ExplicitRef>>(Compiler::Misc::opcodeStartScriptExplicit);
+            interpreter.installSegment5<OpStopScript>(Compiler::Misc::opcodeStopScript);
+            interpreter.installSegment5<OpGetSecondsPassed>(Compiler::Misc::opcodeGetSecondsPassed);
+            interpreter.installSegment5<OpEnable<ImplicitRef>>(Compiler::Misc::opcodeEnable);
+            interpreter.installSegment5<OpEnable<ExplicitRef>>(Compiler::Misc::opcodeEnableExplicit);
+            interpreter.installSegment5<OpDisable<ImplicitRef>>(Compiler::Misc::opcodeDisable);
+            interpreter.installSegment5<OpDisable<ExplicitRef>>(Compiler::Misc::opcodeDisableExplicit);
+            interpreter.installSegment5<OpGetDisabled<ImplicitRef>>(Compiler::Misc::opcodeGetDisabled);
+            interpreter.installSegment5<OpGetDisabled<ExplicitRef>>(Compiler::Misc::opcodeGetDisabledExplicit);
+            interpreter.installSegment5<OpXBox>(Compiler::Misc::opcodeXBox);
+            interpreter.installSegment5<OpOnActivate<ImplicitRef>>(Compiler::Misc::opcodeOnActivate);
+            interpreter.installSegment5<OpOnActivate<ExplicitRef>>(Compiler::Misc::opcodeOnActivateExplicit);
+            interpreter.installSegment5<OpActivate<ImplicitRef>>(Compiler::Misc::opcodeActivate);
+            interpreter.installSegment5<OpActivate<ExplicitRef>>(Compiler::Misc::opcodeActivateExplicit);
+            interpreter.installSegment3<OpLock<ImplicitRef>>(Compiler::Misc::opcodeLock);
+            interpreter.installSegment3<OpLock<ExplicitRef>>(Compiler::Misc::opcodeLockExplicit);
+            interpreter.installSegment5<OpUnlock<ImplicitRef>>(Compiler::Misc::opcodeUnlock);
+            interpreter.installSegment5<OpUnlock<ExplicitRef>>(Compiler::Misc::opcodeUnlockExplicit);
+            interpreter.installSegment5<OpToggleCollisionDebug>(Compiler::Misc::opcodeToggleCollisionDebug);
+            interpreter.installSegment5<OpToggleCollisionBoxes>(Compiler::Misc::opcodeToggleCollisionBoxes);
+            interpreter.installSegment5<OpToggleWireframe>(Compiler::Misc::opcodeToggleWireframe);
+            interpreter.installSegment5<OpFadeIn>(Compiler::Misc::opcodeFadeIn);
+            interpreter.installSegment5<OpFadeOut>(Compiler::Misc::opcodeFadeOut);
+            interpreter.installSegment5<OpFadeTo>(Compiler::Misc::opcodeFadeTo);
+            interpreter.installSegment5<OpTogglePathgrid>(Compiler::Misc::opcodeTogglePathgrid);
+            interpreter.installSegment5<OpToggleWater>(Compiler::Misc::opcodeToggleWater);
+            interpreter.installSegment5<OpToggleWorld>(Compiler::Misc::opcodeToggleWorld);
+            interpreter.installSegment5<OpDontSaveObject>(Compiler::Misc::opcodeDontSaveObject);
+            interpreter.installSegment5<OpPcForce1stPerson>(Compiler::Misc::opcodePcForce1stPerson);
+            interpreter.installSegment5<OpPcForce3rdPerson>(Compiler::Misc::opcodePcForce3rdPerson);
+            interpreter.installSegment5<OpPcGet3rdPerson>(Compiler::Misc::opcodePcGet3rdPerson);
+            interpreter.installSegment5<OpToggleVanityMode>(Compiler::Misc::opcodeToggleVanityMode);
+            interpreter.installSegment5<OpGetPcSleep>(Compiler::Misc::opcodeGetPcSleep);
+            interpreter.installSegment5<OpGetPcJumping>(Compiler::Misc::opcodeGetPcJumping);
+            interpreter.installSegment5<OpWakeUpPc>(Compiler::Misc::opcodeWakeUpPc);
+            interpreter.installSegment5<OpPlayBink>(Compiler::Misc::opcodePlayBink);
+            interpreter.installSegment5<OpPayFine>(Compiler::Misc::opcodePayFine);
+            interpreter.installSegment5<OpPayFineThief>(Compiler::Misc::opcodePayFineThief);
+            interpreter.installSegment5<OpGoToJail>(Compiler::Misc::opcodeGoToJail);
+            interpreter.installSegment5<OpGetLocked<ImplicitRef>>(Compiler::Misc::opcodeGetLocked);
+            interpreter.installSegment5<OpGetLocked<ExplicitRef>>(Compiler::Misc::opcodeGetLockedExplicit);
+            interpreter.installSegment5<OpGetEffect<ImplicitRef>>(Compiler::Misc::opcodeGetEffect);
+            interpreter.installSegment5<OpGetEffect<ExplicitRef>>(Compiler::Misc::opcodeGetEffectExplicit);
+            interpreter.installSegment5<OpAddSoulGem<ImplicitRef>>(Compiler::Misc::opcodeAddSoulGem);
+            interpreter.installSegment5<OpAddSoulGem<ExplicitRef>>(Compiler::Misc::opcodeAddSoulGemExplicit);
+            interpreter.installSegment3<OpRemoveSoulGem<ImplicitRef>>(Compiler::Misc::opcodeRemoveSoulGem);
+            interpreter.installSegment3<OpRemoveSoulGem<ExplicitRef>>(Compiler::Misc::opcodeRemoveSoulGemExplicit);
+            interpreter.installSegment5<OpDrop<ImplicitRef>>(Compiler::Misc::opcodeDrop);
+            interpreter.installSegment5<OpDrop<ExplicitRef>>(Compiler::Misc::opcodeDropExplicit);
+            interpreter.installSegment5<OpDropSoulGem<ImplicitRef>>(Compiler::Misc::opcodeDropSoulGem);
+            interpreter.installSegment5<OpDropSoulGem<ExplicitRef>>(Compiler::Misc::opcodeDropSoulGemExplicit);
+            interpreter.installSegment5<OpGetAttacked<ImplicitRef>>(Compiler::Misc::opcodeGetAttacked);
+            interpreter.installSegment5<OpGetAttacked<ExplicitRef>>(Compiler::Misc::opcodeGetAttackedExplicit);
+            interpreter.installSegment5<OpGetWeaponDrawn<ImplicitRef>>(Compiler::Misc::opcodeGetWeaponDrawn);
+            interpreter.installSegment5<OpGetWeaponDrawn<ExplicitRef>>(Compiler::Misc::opcodeGetWeaponDrawnExplicit);
+            interpreter.installSegment5<OpGetSpellReadied<ImplicitRef>>(Compiler::Misc::opcodeGetSpellReadied);
+            interpreter.installSegment5<OpGetSpellReadied<ExplicitRef>>(Compiler::Misc::opcodeGetSpellReadiedExplicit);
+            interpreter.installSegment5<OpGetSpellEffects<ImplicitRef>>(Compiler::Misc::opcodeGetSpellEffects);
+            interpreter.installSegment5<OpGetSpellEffects<ExplicitRef>>(Compiler::Misc::opcodeGetSpellEffectsExplicit);
+            interpreter.installSegment5<OpGetCurrentTime>(Compiler::Misc::opcodeGetCurrentTime);
+            interpreter.installSegment5<OpSetDelete<ImplicitRef>>(Compiler::Misc::opcodeSetDelete);
+            interpreter.installSegment5<OpSetDelete<ExplicitRef>>(Compiler::Misc::opcodeSetDeleteExplicit);
+            interpreter.installSegment5<OpGetSquareRoot>(Compiler::Misc::opcodeGetSquareRoot);
+            interpreter.installSegment5<OpFall<ImplicitRef>>(Compiler::Misc::opcodeFall);
+            interpreter.installSegment5<OpFall<ExplicitRef>>(Compiler::Misc::opcodeFallExplicit);
+            interpreter.installSegment5<OpGetStandingPc<ImplicitRef>>(Compiler::Misc::opcodeGetStandingPc);
+            interpreter.installSegment5<OpGetStandingPc<ExplicitRef>>(Compiler::Misc::opcodeGetStandingPcExplicit);
+            interpreter.installSegment5<OpGetStandingActor<ImplicitRef>>(Compiler::Misc::opcodeGetStandingActor);
+            interpreter.installSegment5<OpGetStandingActor<ExplicitRef>>(Compiler::Misc::opcodeGetStandingActorExplicit);
+            interpreter.installSegment5<OpGetCollidingPc<ImplicitRef>>(Compiler::Misc::opcodeGetCollidingPc);
+            interpreter.installSegment5<OpGetCollidingPc<ExplicitRef>>(Compiler::Misc::opcodeGetCollidingPcExplicit);
+            interpreter.installSegment5<OpGetCollidingActor<ImplicitRef>>(Compiler::Misc::opcodeGetCollidingActor);
+            interpreter.installSegment5<OpGetCollidingActor<ExplicitRef>>(Compiler::Misc::opcodeGetCollidingActorExplicit);
+            interpreter.installSegment5<OpHurtStandingActor<ImplicitRef>>(Compiler::Misc::opcodeHurtStandingActor);
+            interpreter.installSegment5<OpHurtStandingActor<ExplicitRef>>(Compiler::Misc::opcodeHurtStandingActorExplicit);
+            interpreter.installSegment5<OpHurtCollidingActor<ImplicitRef>>(Compiler::Misc::opcodeHurtCollidingActor);
+            interpreter.installSegment5<OpHurtCollidingActor<ExplicitRef>>(Compiler::Misc::opcodeHurtCollidingActorExplicit);
+            interpreter.installSegment5<OpGetWindSpeed>(Compiler::Misc::opcodeGetWindSpeed);
+            interpreter.installSegment5<OpHitOnMe<ImplicitRef>>(Compiler::Misc::opcodeHitOnMe);
+            interpreter.installSegment5<OpHitOnMe<ExplicitRef>>(Compiler::Misc::opcodeHitOnMeExplicit);
+            interpreter.installSegment5<OpHitAttemptOnMe<ImplicitRef>>(Compiler::Misc::opcodeHitAttemptOnMe);
+            interpreter.installSegment5<OpHitAttemptOnMe<ExplicitRef>>(Compiler::Misc::opcodeHitAttemptOnMeExplicit);
+            interpreter.installSegment5<OpEnableTeleporting<false>>(Compiler::Misc::opcodeDisableTeleporting);
+            interpreter.installSegment5<OpEnableTeleporting<true>>(Compiler::Misc::opcodeEnableTeleporting);
+            interpreter.installSegment5<OpShowVars<ImplicitRef>>(Compiler::Misc::opcodeShowVars);
+            interpreter.installSegment5<OpShowVars<ExplicitRef>>(Compiler::Misc::opcodeShowVarsExplicit);
+            interpreter.installSegment5<OpShow<ImplicitRef>>(Compiler::Misc::opcodeShow);
+            interpreter.installSegment5<OpShow<ExplicitRef>>(Compiler::Misc::opcodeShowExplicit);
+            interpreter.installSegment5<OpToggleGodMode>(Compiler::Misc::opcodeToggleGodMode);
+            interpreter.installSegment5<OpToggleScripts>(Compiler::Misc::opcodeToggleScripts);
+            interpreter.installSegment5<OpEnableLevitation<false>>(Compiler::Misc::opcodeDisableLevitation);
+            interpreter.installSegment5<OpEnableLevitation<true>>(Compiler::Misc::opcodeEnableLevitation);
+            interpreter.installSegment5<OpCast<ImplicitRef>>(Compiler::Misc::opcodeCast);
+            interpreter.installSegment5<OpCast<ExplicitRef>>(Compiler::Misc::opcodeCastExplicit);
+            interpreter.installSegment5<OpExplodeSpell<ImplicitRef>>(Compiler::Misc::opcodeExplodeSpell);
+            interpreter.installSegment5<OpExplodeSpell<ExplicitRef>>(Compiler::Misc::opcodeExplodeSpellExplicit);
+            interpreter.installSegment5<OpGetPcInJail>(Compiler::Misc::opcodeGetPcInJail);
+            interpreter.installSegment5<OpGetPcTraveling>(Compiler::Misc::opcodeGetPcTraveling);
+            interpreter.installSegment3<OpBetaComment<ImplicitRef>>(Compiler::Misc::opcodeBetaComment);
+            interpreter.installSegment3<OpBetaComment<ExplicitRef>>(Compiler::Misc::opcodeBetaCommentExplicit);
+            interpreter.installSegment5<OpAddToLevCreature>(Compiler::Misc::opcodeAddToLevCreature);
+            interpreter.installSegment5<OpRemoveFromLevCreature>(Compiler::Misc::opcodeRemoveFromLevCreature);
+            interpreter.installSegment5<OpAddToLevItem>(Compiler::Misc::opcodeAddToLevItem);
+            interpreter.installSegment5<OpRemoveFromLevItem>(Compiler::Misc::opcodeRemoveFromLevItem);
+            interpreter.installSegment3<OpShowSceneGraph<ImplicitRef>>(Compiler::Misc::opcodeShowSceneGraph);
+            interpreter.installSegment3<OpShowSceneGraph<ExplicitRef>>(Compiler::Misc::opcodeShowSceneGraphExplicit);
+            interpreter.installSegment5<OpToggleBorders>(Compiler::Misc::opcodeToggleBorders);
+            interpreter.installSegment5<OpToggleNavMesh>(Compiler::Misc::opcodeToggleNavMesh);
+            interpreter.installSegment5<OpToggleActorsPaths>(Compiler::Misc::opcodeToggleActorsPaths);
+            interpreter.installSegment5<OpSetNavMeshNumberToRender>(Compiler::Misc::opcodeSetNavMeshNumberToRender);
+            interpreter.installSegment5<OpRepairedOnMe<ImplicitRef>>(Compiler::Misc::opcodeRepairedOnMe);
+            interpreter.installSegment5<OpRepairedOnMe<ExplicitRef>>(Compiler::Misc::opcodeRepairedOnMeExplicit);
+            interpreter.installSegment5<OpToggleRecastMesh>(Compiler::Misc::opcodeToggleRecastMesh);
+            interpreter.installSegment5<OpHelp>(Compiler::Misc::opcodeHelp);
+            interpreter.installSegment5<OpReloadLua>(Compiler::Misc::opcodeReloadLua);
         }
     }
 }
diff --git a/apps/openmw/mwscript/skyextensions.cpp b/apps/openmw/mwscript/skyextensions.cpp
index 81984ad7b7..1d00b8c052 100644
--- a/apps/openmw/mwscript/skyextensions.cpp
+++ b/apps/openmw/mwscript/skyextensions.cpp
@@ -126,14 +126,14 @@ namespace MWScript
 
         void installOpcodes (Interpreter::Interpreter& interpreter)
         {
-            interpreter.installSegment5 (Compiler::Sky::opcodeToggleSky, new OpToggleSky);
-            interpreter.installSegment5 (Compiler::Sky::opcodeTurnMoonWhite, new OpTurnMoonWhite);
-            interpreter.installSegment5 (Compiler::Sky::opcodeTurnMoonRed, new OpTurnMoonRed);
-            interpreter.installSegment5 (Compiler::Sky::opcodeGetMasserPhase, new OpGetMasserPhase);
-            interpreter.installSegment5 (Compiler::Sky::opcodeGetSecundaPhase, new OpGetSecundaPhase);
-            interpreter.installSegment5 (Compiler::Sky::opcodeGetCurrentWeather, new OpGetCurrentWeather);
-            interpreter.installSegment5 (Compiler::Sky::opcodeChangeWeather, new OpChangeWeather);
-            interpreter.installSegment3 (Compiler::Sky::opcodeModRegion, new OpModRegion);
+            interpreter.installSegment5<OpToggleSky>(Compiler::Sky::opcodeToggleSky);
+            interpreter.installSegment5<OpTurnMoonWhite>(Compiler::Sky::opcodeTurnMoonWhite);
+            interpreter.installSegment5<OpTurnMoonRed>(Compiler::Sky::opcodeTurnMoonRed);
+            interpreter.installSegment5<OpGetMasserPhase>(Compiler::Sky::opcodeGetMasserPhase);
+            interpreter.installSegment5<OpGetSecundaPhase>(Compiler::Sky::opcodeGetSecundaPhase);
+            interpreter.installSegment5<OpGetCurrentWeather>(Compiler::Sky::opcodeGetCurrentWeather);
+            interpreter.installSegment5<OpChangeWeather>(Compiler::Sky::opcodeChangeWeather);
+            interpreter.installSegment3<OpModRegion>(Compiler::Sky::opcodeModRegion);
         }
     }
 }
diff --git a/apps/openmw/mwscript/soundextensions.cpp b/apps/openmw/mwscript/soundextensions.cpp
index 6eab758f19..b8d1470ea8 100644
--- a/apps/openmw/mwscript/soundextensions.cpp
+++ b/apps/openmw/mwscript/soundextensions.cpp
@@ -104,15 +104,11 @@ namespace MWScript
                 }
         };
 
-        template<class R>
+        template<class R, bool TLoop>
         class OpPlaySound3D : public Interpreter::Opcode0
         {
-                bool mLoop;
-
             public:
 
-                OpPlaySound3D (bool loop) : mLoop (loop) {}
-
                 void execute (Interpreter::Runtime& runtime) override
                 {
                     MWWorld::Ptr ptr = R()(runtime);
@@ -122,20 +118,16 @@ namespace MWScript
 
                     MWBase::Environment::get().getSoundManager()->playSound3D(ptr, sound, 1.0, 1.0,
                                                                               MWSound::Type::Sfx,
-                                                                              mLoop ? MWSound::PlayMode::LoopRemoveAtDistance
+                                                                              TLoop ? MWSound::PlayMode::LoopRemoveAtDistance
                                                                                     : MWSound::PlayMode::Normal);
                 }
         };
 
-        template<class R>
+        template<class R, bool TLoop>
         class OpPlaySoundVP3D : public Interpreter::Opcode0
         {
-                bool mLoop;
-
             public:
 
-                OpPlaySoundVP3D (bool loop) : mLoop (loop) {}
-
                 void execute (Interpreter::Runtime& runtime) override
                 {
                     MWWorld::Ptr ptr = R()(runtime);
@@ -151,7 +143,7 @@ namespace MWScript
 
                     MWBase::Environment::get().getSoundManager()->playSound3D(ptr, sound, volume, pitch,
                                                                               MWSound::Type::Sfx,
-                                                                              mLoop ? MWSound::PlayMode::LoopRemoveAtDistance
+                                                                              TLoop ? MWSound::PlayMode::LoopRemoveAtDistance
                                                                                     : MWSound::PlayMode::Normal);
 
                 }
@@ -205,34 +197,28 @@ namespace MWScript
         };
 
 
-        void installOpcodes (Interpreter::Interpreter& interpreter)
+        void installOpcodes(Interpreter::Interpreter& interpreter)
         {
-            interpreter.installSegment5 (Compiler::Sound::opcodeSay, new OpSay<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Sound::opcodeSayDone, new OpSayDone<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Sound::opcodeStreamMusic, new OpStreamMusic);
-            interpreter.installSegment5 (Compiler::Sound::opcodePlaySound, new OpPlaySound);
-            interpreter.installSegment5 (Compiler::Sound::opcodePlaySoundVP, new OpPlaySoundVP);
-            interpreter.installSegment5 (Compiler::Sound::opcodePlaySound3D, new OpPlaySound3D<ImplicitRef> (false));
-            interpreter.installSegment5 (Compiler::Sound::opcodePlaySound3DVP, new OpPlaySoundVP3D<ImplicitRef> (false));
-            interpreter.installSegment5 (Compiler::Sound::opcodePlayLoopSound3D, new OpPlaySound3D<ImplicitRef> (true));
-            interpreter.installSegment5 (Compiler::Sound::opcodePlayLoopSound3DVP,
-                new OpPlaySoundVP3D<ImplicitRef> (true));
-            interpreter.installSegment5 (Compiler::Sound::opcodeStopSound, new OpStopSound<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Sound::opcodeGetSoundPlaying, new OpGetSoundPlaying<ImplicitRef>);
-
-            interpreter.installSegment5 (Compiler::Sound::opcodeSayExplicit, new OpSay<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Sound::opcodeSayDoneExplicit, new OpSayDone<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Sound::opcodePlaySound3DExplicit,
-                new OpPlaySound3D<ExplicitRef> (false));
-            interpreter.installSegment5 (Compiler::Sound::opcodePlaySound3DVPExplicit,
-                new OpPlaySoundVP3D<ExplicitRef> (false));
-            interpreter.installSegment5 (Compiler::Sound::opcodePlayLoopSound3DExplicit,
-                new OpPlaySound3D<ExplicitRef> (true));
-            interpreter.installSegment5 (Compiler::Sound::opcodePlayLoopSound3DVPExplicit,
-                new OpPlaySoundVP3D<ExplicitRef> (true));
-            interpreter.installSegment5 (Compiler::Sound::opcodeStopSoundExplicit, new OpStopSound<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Sound::opcodeGetSoundPlayingExplicit,
-                new OpGetSoundPlaying<ExplicitRef>);
+            interpreter.installSegment5<OpSay<ImplicitRef>>(Compiler::Sound::opcodeSay);
+            interpreter.installSegment5<OpSayDone<ImplicitRef>>(Compiler::Sound::opcodeSayDone);
+            interpreter.installSegment5<OpStreamMusic>(Compiler::Sound::opcodeStreamMusic);
+            interpreter.installSegment5<OpPlaySound>(Compiler::Sound::opcodePlaySound);
+            interpreter.installSegment5<OpPlaySoundVP>(Compiler::Sound::opcodePlaySoundVP);
+            interpreter.installSegment5<OpPlaySound3D<ImplicitRef, false>>(Compiler::Sound::opcodePlaySound3D);
+            interpreter.installSegment5<OpPlaySoundVP3D<ImplicitRef, false>>(Compiler::Sound::opcodePlaySound3DVP);
+            interpreter.installSegment5<OpPlaySound3D<ImplicitRef, true>>(Compiler::Sound::opcodePlayLoopSound3D);
+            interpreter.installSegment5<OpPlaySoundVP3D<ImplicitRef, true>>(Compiler::Sound::opcodePlayLoopSound3DVP);
+            interpreter.installSegment5<OpStopSound<ImplicitRef>>(Compiler::Sound::opcodeStopSound);
+            interpreter.installSegment5<OpGetSoundPlaying<ImplicitRef>>(Compiler::Sound::opcodeGetSoundPlaying);
+
+            interpreter.installSegment5<OpSay<ExplicitRef>>(Compiler::Sound::opcodeSayExplicit);
+            interpreter.installSegment5<OpSayDone<ExplicitRef>>(Compiler::Sound::opcodeSayDoneExplicit);
+            interpreter.installSegment5<OpPlaySound3D<ExplicitRef, false>>(Compiler::Sound::opcodePlaySound3DExplicit);
+            interpreter.installSegment5<OpPlaySoundVP3D<ExplicitRef, false>>(Compiler::Sound::opcodePlaySound3DVPExplicit);
+            interpreter.installSegment5<OpPlaySound3D<ExplicitRef, true>>(Compiler::Sound::opcodePlayLoopSound3DExplicit);
+            interpreter.installSegment5<OpPlaySoundVP3D<ExplicitRef, true>>(Compiler::Sound::opcodePlayLoopSound3DVPExplicit);
+            interpreter.installSegment5<OpStopSound<ExplicitRef>>(Compiler::Sound::opcodeStopSoundExplicit);
+            interpreter.installSegment5<OpGetSoundPlaying<ExplicitRef>>(Compiler::Sound::opcodeGetSoundPlayingExplicit);
         }
     }
 }
diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp
index 186d1edf26..048029c72a 100644
--- a/apps/openmw/mwscript/statsextensions.cpp
+++ b/apps/openmw/mwscript/statsextensions.cpp
@@ -1325,146 +1325,132 @@ namespace MWScript
         {
             for (int i=0; i<Compiler::Stats::numberOfAttributes; ++i)
             {
-                interpreter.installSegment5 (Compiler::Stats::opcodeGetAttribute+i, new OpGetAttribute<ImplicitRef> (i));
-                interpreter.installSegment5 (Compiler::Stats::opcodeGetAttributeExplicit+i,
-                    new OpGetAttribute<ExplicitRef> (i));
+                interpreter.installSegment5<OpGetAttribute<ImplicitRef>>(Compiler::Stats::opcodeGetAttribute + i, i);
+                interpreter.installSegment5<OpGetAttribute<ExplicitRef>>(Compiler::Stats::opcodeGetAttributeExplicit + i, i);
 
-                interpreter.installSegment5 (Compiler::Stats::opcodeSetAttribute+i, new OpSetAttribute<ImplicitRef> (i));
-                interpreter.installSegment5 (Compiler::Stats::opcodeSetAttributeExplicit+i,
-                    new OpSetAttribute<ExplicitRef> (i));
+                interpreter.installSegment5<OpSetAttribute<ImplicitRef>>(Compiler::Stats::opcodeSetAttribute + i, i);
+                interpreter.installSegment5<OpSetAttribute<ExplicitRef>>(Compiler::Stats::opcodeSetAttributeExplicit + i, i);
 
-                interpreter.installSegment5 (Compiler::Stats::opcodeModAttribute+i, new OpModAttribute<ImplicitRef> (i));
-                interpreter.installSegment5 (Compiler::Stats::opcodeModAttributeExplicit+i,
-                    new OpModAttribute<ExplicitRef> (i));
+                interpreter.installSegment5<OpModAttribute<ImplicitRef>>(Compiler::Stats::opcodeModAttribute + i, i);
+                interpreter.installSegment5<OpModAttribute<ExplicitRef>>(Compiler::Stats::opcodeModAttributeExplicit + i, i);
             }
 
             for (int i=0; i<Compiler::Stats::numberOfDynamics; ++i)
             {
-                interpreter.installSegment5 (Compiler::Stats::opcodeGetDynamic+i, new OpGetDynamic<ImplicitRef> (i));
-                interpreter.installSegment5 (Compiler::Stats::opcodeGetDynamicExplicit+i,
-                    new OpGetDynamic<ExplicitRef> (i));
-
-                interpreter.installSegment5 (Compiler::Stats::opcodeSetDynamic+i, new OpSetDynamic<ImplicitRef> (i));
-                interpreter.installSegment5 (Compiler::Stats::opcodeSetDynamicExplicit+i,
-                    new OpSetDynamic<ExplicitRef> (i));
-
-                interpreter.installSegment5 (Compiler::Stats::opcodeModDynamic+i, new OpModDynamic<ImplicitRef> (i));
-                interpreter.installSegment5 (Compiler::Stats::opcodeModDynamicExplicit+i,
-                    new OpModDynamic<ExplicitRef> (i));
-
-                interpreter.installSegment5 (Compiler::Stats::opcodeModCurrentDynamic+i,
-                    new OpModCurrentDynamic<ImplicitRef> (i));
-                interpreter.installSegment5 (Compiler::Stats::opcodeModCurrentDynamicExplicit+i,
-                    new OpModCurrentDynamic<ExplicitRef> (i));
-
-                interpreter.installSegment5 (Compiler::Stats::opcodeGetDynamicGetRatio+i,
-                    new OpGetDynamicGetRatio<ImplicitRef> (i));
-                interpreter.installSegment5 (Compiler::Stats::opcodeGetDynamicGetRatioExplicit+i,
-                    new OpGetDynamicGetRatio<ExplicitRef> (i));
+                interpreter.installSegment5<OpGetDynamic<ImplicitRef>>(Compiler::Stats::opcodeGetDynamic + i, i);
+                interpreter.installSegment5<OpGetDynamic<ExplicitRef>>(Compiler::Stats::opcodeGetDynamicExplicit + i, i);
+
+                interpreter.installSegment5<OpSetDynamic<ImplicitRef>>(Compiler::Stats::opcodeSetDynamic + i, i);
+                interpreter.installSegment5<OpSetDynamic<ExplicitRef>>(Compiler::Stats::opcodeSetDynamicExplicit + i, i);
+
+                interpreter.installSegment5<OpModDynamic<ImplicitRef>>(Compiler::Stats::opcodeModDynamic + i, i);
+                interpreter.installSegment5<OpModDynamic<ExplicitRef>>(Compiler::Stats::opcodeModDynamicExplicit + i, i);
+
+                interpreter.installSegment5<OpModCurrentDynamic<ImplicitRef>>(Compiler::Stats::opcodeModCurrentDynamic + i, i);
+                interpreter.installSegment5<OpModCurrentDynamic<ExplicitRef>>(Compiler::Stats::opcodeModCurrentDynamicExplicit + i, i);
+
+                interpreter.installSegment5<OpGetDynamicGetRatio<ImplicitRef>>(Compiler::Stats::opcodeGetDynamicGetRatio + i, i);
+                interpreter.installSegment5<OpGetDynamicGetRatio<ExplicitRef>>(Compiler::Stats::opcodeGetDynamicGetRatioExplicit + i, i);
             }
 
             for (int i=0; i<Compiler::Stats::numberOfSkills; ++i)
             {
-                interpreter.installSegment5 (Compiler::Stats::opcodeGetSkill+i, new OpGetSkill<ImplicitRef> (i));
-                interpreter.installSegment5 (Compiler::Stats::opcodeGetSkillExplicit+i, new OpGetSkill<ExplicitRef> (i));
+                interpreter.installSegment5<OpGetSkill<ImplicitRef>>(Compiler::Stats::opcodeGetSkill + i, i);
+                interpreter.installSegment5<OpGetSkill<ExplicitRef>>(Compiler::Stats::opcodeGetSkillExplicit + i, i);
 
-                interpreter.installSegment5 (Compiler::Stats::opcodeSetSkill+i, new OpSetSkill<ImplicitRef> (i));
-                interpreter.installSegment5 (Compiler::Stats::opcodeSetSkillExplicit+i, new OpSetSkill<ExplicitRef> (i));
+                interpreter.installSegment5<OpSetSkill<ImplicitRef>>(Compiler::Stats::opcodeSetSkill + i, i);
+                interpreter.installSegment5<OpSetSkill<ExplicitRef>>(Compiler::Stats::opcodeSetSkillExplicit + i, i);
 
-                interpreter.installSegment5 (Compiler::Stats::opcodeModSkill+i, new OpModSkill<ImplicitRef> (i));
-                interpreter.installSegment5 (Compiler::Stats::opcodeModSkillExplicit+i, new OpModSkill<ExplicitRef> (i));
+                interpreter.installSegment5<OpModSkill<ImplicitRef>>(Compiler::Stats::opcodeModSkill + i, i);
+                interpreter.installSegment5<OpModSkill<ExplicitRef>>(Compiler::Stats::opcodeModSkillExplicit + i, i);
             }
 
-            interpreter.installSegment5 (Compiler::Stats::opcodeGetPCCrimeLevel, new OpGetPCCrimeLevel);
-            interpreter.installSegment5 (Compiler::Stats::opcodeSetPCCrimeLevel, new OpSetPCCrimeLevel);
-            interpreter.installSegment5 (Compiler::Stats::opcodeModPCCrimeLevel, new OpModPCCrimeLevel);
-
-            interpreter.installSegment5 (Compiler::Stats::opcodeAddSpell, new OpAddSpell<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeAddSpellExplicit, new OpAddSpell<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeRemoveSpell, new OpRemoveSpell<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeRemoveSpellExplicit,
-                new OpRemoveSpell<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeRemoveSpellEffects, new OpRemoveSpellEffects<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeRemoveSpellEffectsExplicit,
-                new OpRemoveSpellEffects<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeResurrect, new OpResurrect<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeResurrectExplicit,
-                new OpResurrect<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeRemoveEffects, new OpRemoveEffects<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeRemoveEffectsExplicit,
-                new OpRemoveEffects<ExplicitRef>);
-
-            interpreter.installSegment5 (Compiler::Stats::opcodeGetSpell, new OpGetSpell<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeGetSpellExplicit, new OpGetSpell<ExplicitRef>);
-
-            interpreter.installSegment3(Compiler::Stats::opcodePCRaiseRank,new OpPCRaiseRank<ImplicitRef>);
-            interpreter.installSegment3(Compiler::Stats::opcodePCLowerRank,new OpPCLowerRank<ImplicitRef>);
-            interpreter.installSegment3(Compiler::Stats::opcodePCJoinFaction,new OpPCJoinFaction<ImplicitRef>);
-            interpreter.installSegment3(Compiler::Stats::opcodePCRaiseRankExplicit,new OpPCRaiseRank<ExplicitRef>);
-            interpreter.installSegment3(Compiler::Stats::opcodePCLowerRankExplicit,new OpPCLowerRank<ExplicitRef>);
-            interpreter.installSegment3(Compiler::Stats::opcodePCJoinFactionExplicit,new OpPCJoinFaction<ExplicitRef>);
-            interpreter.installSegment3(Compiler::Stats::opcodeGetPCRank,new OpGetPCRank<ImplicitRef>);
-            interpreter.installSegment3(Compiler::Stats::opcodeGetPCRankExplicit,new OpGetPCRank<ExplicitRef>);
-
-            interpreter.installSegment5(Compiler::Stats::opcodeModDisposition,new OpModDisposition<ImplicitRef>);
-            interpreter.installSegment5(Compiler::Stats::opcodeModDispositionExplicit,new OpModDisposition<ExplicitRef>);
-            interpreter.installSegment5(Compiler::Stats::opcodeSetDisposition,new OpSetDisposition<ImplicitRef>);
-            interpreter.installSegment5(Compiler::Stats::opcodeSetDispositionExplicit,new OpSetDisposition<ExplicitRef>);
-            interpreter.installSegment5(Compiler::Stats::opcodeGetDisposition,new OpGetDisposition<ImplicitRef>);
-            interpreter.installSegment5(Compiler::Stats::opcodeGetDispositionExplicit,new OpGetDisposition<ExplicitRef>);
-
-            interpreter.installSegment5 (Compiler::Stats::opcodeGetLevel, new OpGetLevel<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeGetLevelExplicit, new OpGetLevel<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeSetLevel, new OpSetLevel<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeSetLevelExplicit, new OpSetLevel<ExplicitRef>);
-
-            interpreter.installSegment5 (Compiler::Stats::opcodeGetDeadCount, new OpGetDeadCount);
-
-            interpreter.installSegment3 (Compiler::Stats::opcodeGetPCFacRep, new OpGetPCFacRep<ImplicitRef>);
-            interpreter.installSegment3 (Compiler::Stats::opcodeGetPCFacRepExplicit, new OpGetPCFacRep<ExplicitRef>);
-            interpreter.installSegment3 (Compiler::Stats::opcodeSetPCFacRep, new OpSetPCFacRep<ImplicitRef>);
-            interpreter.installSegment3 (Compiler::Stats::opcodeSetPCFacRepExplicit, new OpSetPCFacRep<ExplicitRef>);
-            interpreter.installSegment3 (Compiler::Stats::opcodeModPCFacRep, new OpModPCFacRep<ImplicitRef>);
-            interpreter.installSegment3 (Compiler::Stats::opcodeModPCFacRepExplicit, new OpModPCFacRep<ExplicitRef>);
-
-            interpreter.installSegment5 (Compiler::Stats::opcodeGetCommonDisease, new OpGetCommonDisease<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeGetCommonDiseaseExplicit, new OpGetCommonDisease<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeGetBlightDisease, new OpGetBlightDisease<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeGetBlightDiseaseExplicit, new OpGetBlightDisease<ExplicitRef>);
-
-            interpreter.installSegment5 (Compiler::Stats::opcodeGetRace, new OpGetRace<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeGetRaceExplicit, new OpGetRace<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeGetWerewolfKills, new OpGetWerewolfKills);
-
-            interpreter.installSegment3 (Compiler::Stats::opcodePcExpelled, new OpPcExpelled<ImplicitRef>);
-            interpreter.installSegment3 (Compiler::Stats::opcodePcExpelledExplicit, new OpPcExpelled<ExplicitRef>);
-            interpreter.installSegment3 (Compiler::Stats::opcodePcExpell, new OpPcExpell<ImplicitRef>);
-            interpreter.installSegment3 (Compiler::Stats::opcodePcExpellExplicit, new OpPcExpell<ExplicitRef>);
-            interpreter.installSegment3 (Compiler::Stats::opcodePcClearExpelled, new OpPcClearExpelled<ImplicitRef>);
-            interpreter.installSegment3 (Compiler::Stats::opcodePcClearExpelledExplicit, new OpPcClearExpelled<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeRaiseRank, new OpRaiseRank<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeRaiseRankExplicit, new OpRaiseRank<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeLowerRank, new OpLowerRank<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeLowerRankExplicit, new OpLowerRank<ExplicitRef>);
-
-            interpreter.installSegment5 (Compiler::Stats::opcodeOnDeath, new OpOnDeath<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeOnDeathExplicit, new OpOnDeath<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeOnMurder, new OpOnMurder<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeOnMurderExplicit, new OpOnMurder<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeOnKnockout, new OpOnKnockout<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeOnKnockoutExplicit, new OpOnKnockout<ExplicitRef>);
-
-            interpreter.installSegment5 (Compiler::Stats::opcodeIsWerewolf, new OpIsWerewolf<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeIsWerewolfExplicit, new OpIsWerewolf<ExplicitRef>);
-
-            interpreter.installSegment5 (Compiler::Stats::opcodeBecomeWerewolf, new OpSetWerewolf<ImplicitRef, true>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeBecomeWerewolfExplicit, new OpSetWerewolf<ExplicitRef, true>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeUndoWerewolf, new OpSetWerewolf<ImplicitRef, false>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeUndoWerewolfExplicit, new OpSetWerewolf<ExplicitRef, false>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeSetWerewolfAcrobatics, new OpSetWerewolfAcrobatics<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeSetWerewolfAcrobaticsExplicit, new OpSetWerewolfAcrobatics<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeGetStat, new OpGetStat<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeGetStatExplicit, new OpGetStat<ExplicitRef>);
+            interpreter.installSegment5<OpGetPCCrimeLevel>(Compiler::Stats::opcodeGetPCCrimeLevel);
+            interpreter.installSegment5<OpSetPCCrimeLevel>(Compiler::Stats::opcodeSetPCCrimeLevel);
+            interpreter.installSegment5<OpModPCCrimeLevel>(Compiler::Stats::opcodeModPCCrimeLevel);
+
+            interpreter.installSegment5<OpAddSpell<ImplicitRef>>(Compiler::Stats::opcodeAddSpell);
+            interpreter.installSegment5<OpAddSpell<ExplicitRef>>(Compiler::Stats::opcodeAddSpellExplicit);
+            interpreter.installSegment5<OpRemoveSpell<ImplicitRef>>(Compiler::Stats::opcodeRemoveSpell);
+            interpreter.installSegment5<OpRemoveSpell<ExplicitRef>>(Compiler::Stats::opcodeRemoveSpellExplicit);
+            interpreter.installSegment5<OpRemoveSpellEffects<ImplicitRef>>(Compiler::Stats::opcodeRemoveSpellEffects);
+            interpreter.installSegment5<OpRemoveSpellEffects<ExplicitRef>>(Compiler::Stats::opcodeRemoveSpellEffectsExplicit);
+            interpreter.installSegment5<OpResurrect<ImplicitRef>>(Compiler::Stats::opcodeResurrect);
+            interpreter.installSegment5<OpResurrect<ExplicitRef>>(Compiler::Stats::opcodeResurrectExplicit);
+            interpreter.installSegment5<OpRemoveEffects<ImplicitRef>>(Compiler::Stats::opcodeRemoveEffects);
+            interpreter.installSegment5<OpRemoveEffects<ExplicitRef>>(Compiler::Stats::opcodeRemoveEffectsExplicit);
+
+            interpreter.installSegment5<OpGetSpell<ImplicitRef>>(Compiler::Stats::opcodeGetSpell);
+            interpreter.installSegment5<OpGetSpell<ExplicitRef>>(Compiler::Stats::opcodeGetSpellExplicit);
+
+            interpreter.installSegment3<OpPCRaiseRank<ImplicitRef>>(Compiler::Stats::opcodePCRaiseRank);
+            interpreter.installSegment3<OpPCLowerRank<ImplicitRef>>(Compiler::Stats::opcodePCLowerRank);
+            interpreter.installSegment3<OpPCJoinFaction<ImplicitRef>>(Compiler::Stats::opcodePCJoinFaction);
+            interpreter.installSegment3<OpPCRaiseRank<ExplicitRef>>(Compiler::Stats::opcodePCRaiseRankExplicit);
+            interpreter.installSegment3<OpPCLowerRank<ExplicitRef>>(Compiler::Stats::opcodePCLowerRankExplicit);
+            interpreter.installSegment3<OpPCJoinFaction<ExplicitRef>>(Compiler::Stats::opcodePCJoinFactionExplicit);
+            interpreter.installSegment3<OpGetPCRank<ImplicitRef>>(Compiler::Stats::opcodeGetPCRank);
+            interpreter.installSegment3<OpGetPCRank<ExplicitRef>>(Compiler::Stats::opcodeGetPCRankExplicit);
+
+            interpreter.installSegment5<OpModDisposition<ImplicitRef>>(Compiler::Stats::opcodeModDisposition);
+            interpreter.installSegment5<OpModDisposition<ExplicitRef>>(Compiler::Stats::opcodeModDispositionExplicit);
+            interpreter.installSegment5<OpSetDisposition<ImplicitRef>>(Compiler::Stats::opcodeSetDisposition);
+            interpreter.installSegment5<OpSetDisposition<ExplicitRef>>(Compiler::Stats::opcodeSetDispositionExplicit);
+            interpreter.installSegment5<OpGetDisposition<ImplicitRef>>(Compiler::Stats::opcodeGetDisposition);
+            interpreter.installSegment5<OpGetDisposition<ExplicitRef>>(Compiler::Stats::opcodeGetDispositionExplicit);
+
+            interpreter.installSegment5<OpGetLevel<ImplicitRef>>(Compiler::Stats::opcodeGetLevel);
+            interpreter.installSegment5<OpGetLevel<ExplicitRef>>(Compiler::Stats::opcodeGetLevelExplicit);
+            interpreter.installSegment5<OpSetLevel<ImplicitRef>>(Compiler::Stats::opcodeSetLevel);
+            interpreter.installSegment5<OpSetLevel<ExplicitRef>>(Compiler::Stats::opcodeSetLevelExplicit);
+
+            interpreter.installSegment5<OpGetDeadCount>(Compiler::Stats::opcodeGetDeadCount);
+
+            interpreter.installSegment3<OpGetPCFacRep<ImplicitRef>>(Compiler::Stats::opcodeGetPCFacRep);
+            interpreter.installSegment3<OpGetPCFacRep<ExplicitRef>>(Compiler::Stats::opcodeGetPCFacRepExplicit);
+            interpreter.installSegment3<OpSetPCFacRep<ImplicitRef>>(Compiler::Stats::opcodeSetPCFacRep);
+            interpreter.installSegment3<OpSetPCFacRep<ExplicitRef>>(Compiler::Stats::opcodeSetPCFacRepExplicit);
+            interpreter.installSegment3<OpModPCFacRep<ImplicitRef>>(Compiler::Stats::opcodeModPCFacRep);
+            interpreter.installSegment3<OpModPCFacRep<ExplicitRef>>(Compiler::Stats::opcodeModPCFacRepExplicit);
+
+            interpreter.installSegment5<OpGetCommonDisease<ImplicitRef>>(Compiler::Stats::opcodeGetCommonDisease);
+            interpreter.installSegment5<OpGetCommonDisease<ExplicitRef>>(Compiler::Stats::opcodeGetCommonDiseaseExplicit);
+            interpreter.installSegment5<OpGetBlightDisease<ImplicitRef>>(Compiler::Stats::opcodeGetBlightDisease);
+            interpreter.installSegment5<OpGetBlightDisease<ExplicitRef>>(Compiler::Stats::opcodeGetBlightDiseaseExplicit);
+
+            interpreter.installSegment5<OpGetRace<ImplicitRef>>(Compiler::Stats::opcodeGetRace);
+            interpreter.installSegment5<OpGetRace<ExplicitRef>>(Compiler::Stats::opcodeGetRaceExplicit);
+            interpreter.installSegment5<OpGetWerewolfKills>(Compiler::Stats::opcodeGetWerewolfKills);
+
+            interpreter.installSegment3<OpPcExpelled<ImplicitRef>>(Compiler::Stats::opcodePcExpelled);
+            interpreter.installSegment3<OpPcExpelled<ExplicitRef>>(Compiler::Stats::opcodePcExpelledExplicit);
+            interpreter.installSegment3<OpPcExpell<ImplicitRef>>(Compiler::Stats::opcodePcExpell);
+            interpreter.installSegment3<OpPcExpell<ExplicitRef>>(Compiler::Stats::opcodePcExpellExplicit);
+            interpreter.installSegment3<OpPcClearExpelled<ImplicitRef>>(Compiler::Stats::opcodePcClearExpelled);
+            interpreter.installSegment3<OpPcClearExpelled<ExplicitRef>>(Compiler::Stats::opcodePcClearExpelledExplicit);
+            interpreter.installSegment5<OpRaiseRank<ImplicitRef>>(Compiler::Stats::opcodeRaiseRank);
+            interpreter.installSegment5<OpRaiseRank<ExplicitRef>>(Compiler::Stats::opcodeRaiseRankExplicit);
+            interpreter.installSegment5<OpLowerRank<ImplicitRef>>(Compiler::Stats::opcodeLowerRank);
+            interpreter.installSegment5<OpLowerRank<ExplicitRef>>(Compiler::Stats::opcodeLowerRankExplicit);
+
+            interpreter.installSegment5<OpOnDeath<ImplicitRef>>(Compiler::Stats::opcodeOnDeath);
+            interpreter.installSegment5<OpOnDeath<ExplicitRef>>(Compiler::Stats::opcodeOnDeathExplicit);
+            interpreter.installSegment5<OpOnMurder<ImplicitRef>>(Compiler::Stats::opcodeOnMurder);
+            interpreter.installSegment5<OpOnMurder<ExplicitRef>>(Compiler::Stats::opcodeOnMurderExplicit);
+            interpreter.installSegment5<OpOnKnockout<ImplicitRef>>(Compiler::Stats::opcodeOnKnockout);
+            interpreter.installSegment5<OpOnKnockout<ExplicitRef>>(Compiler::Stats::opcodeOnKnockoutExplicit);
+
+            interpreter.installSegment5<OpIsWerewolf<ImplicitRef>>(Compiler::Stats::opcodeIsWerewolf);
+            interpreter.installSegment5<OpIsWerewolf<ExplicitRef>>(Compiler::Stats::opcodeIsWerewolfExplicit);
+
+            interpreter.installSegment5<OpSetWerewolf<ImplicitRef, true>>(Compiler::Stats::opcodeBecomeWerewolf);
+            interpreter.installSegment5<OpSetWerewolf<ExplicitRef, true>>(Compiler::Stats::opcodeBecomeWerewolfExplicit);
+            interpreter.installSegment5<OpSetWerewolf<ImplicitRef, false>>(Compiler::Stats::opcodeUndoWerewolf);
+            interpreter.installSegment5<OpSetWerewolf<ExplicitRef, false>>(Compiler::Stats::opcodeUndoWerewolfExplicit);
+            interpreter.installSegment5<OpSetWerewolfAcrobatics<ImplicitRef>>(Compiler::Stats::opcodeSetWerewolfAcrobatics);
+            interpreter.installSegment5<OpSetWerewolfAcrobatics<ExplicitRef>>(Compiler::Stats::opcodeSetWerewolfAcrobaticsExplicit);
+            interpreter.installSegment5<OpGetStat<ImplicitRef>>(Compiler::Stats::opcodeGetStat);
+            interpreter.installSegment5<OpGetStat<ExplicitRef>>(Compiler::Stats::opcodeGetStatExplicit);
 
             static const MagicEffect sMagicEffects[] = {
                 { ESM::MagicEffect::ResistMagicka, ESM::MagicEffect::WeaknessToMagicka },
@@ -1498,14 +1484,14 @@ namespace MWScript
                 int positive = sMagicEffects[i].mPositiveEffect;
                 int negative = sMagicEffects[i].mNegativeEffect;
 
-                interpreter.installSegment5 (Compiler::Stats::opcodeGetMagicEffect+i, new OpGetMagicEffect<ImplicitRef> (positive, negative));
-                interpreter.installSegment5 (Compiler::Stats::opcodeGetMagicEffectExplicit+i, new OpGetMagicEffect<ExplicitRef> (positive, negative));
+                interpreter.installSegment5<OpGetMagicEffect<ImplicitRef>>(Compiler::Stats::opcodeGetMagicEffect + i, positive, negative);
+                interpreter.installSegment5<OpGetMagicEffect<ExplicitRef>>(Compiler::Stats::opcodeGetMagicEffectExplicit + i, positive, negative);
 
-                interpreter.installSegment5 (Compiler::Stats::opcodeSetMagicEffect+i, new OpSetMagicEffect<ImplicitRef> (positive, negative));
-                interpreter.installSegment5 (Compiler::Stats::opcodeSetMagicEffectExplicit+i, new OpSetMagicEffect<ExplicitRef> (positive, negative));
+                interpreter.installSegment5<OpSetMagicEffect<ImplicitRef>>(Compiler::Stats::opcodeSetMagicEffect + i, positive, negative);
+                interpreter.installSegment5<OpSetMagicEffect<ExplicitRef>>(Compiler::Stats::opcodeSetMagicEffectExplicit + i, positive, negative);
 
-                interpreter.installSegment5 (Compiler::Stats::opcodeModMagicEffect+i, new OpModMagicEffect<ImplicitRef> (positive, negative));
-                interpreter.installSegment5 (Compiler::Stats::opcodeModMagicEffectExplicit+i, new OpModMagicEffect<ExplicitRef> (positive, negative));
+                interpreter.installSegment5<OpModMagicEffect<ImplicitRef>>(Compiler::Stats::opcodeModMagicEffect + i, positive, negative);
+                interpreter.installSegment5<OpModMagicEffect<ExplicitRef>>(Compiler::Stats::opcodeModMagicEffectExplicit + i, positive, negative);
             }
         }
     }
diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index 8a159a5685..57399cf02b 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -799,47 +799,47 @@ namespace MWScript
 
         void installOpcodes (Interpreter::Interpreter& interpreter)
         {
-            interpreter.installSegment5(Compiler::Transformation::opcodeGetDistance, new OpGetDistance<ImplicitRef>);
-            interpreter.installSegment5(Compiler::Transformation::opcodeGetDistanceExplicit, new OpGetDistance<ExplicitRef>);
-            interpreter.installSegment5(Compiler::Transformation::opcodeSetScale,new OpSetScale<ImplicitRef>);
-            interpreter.installSegment5(Compiler::Transformation::opcodeSetScaleExplicit,new OpSetScale<ExplicitRef>);
-            interpreter.installSegment5(Compiler::Transformation::opcodeSetAngle,new OpSetAngle<ImplicitRef>);
-            interpreter.installSegment5(Compiler::Transformation::opcodeSetAngleExplicit,new OpSetAngle<ExplicitRef>);
-            interpreter.installSegment5(Compiler::Transformation::opcodeGetScale,new OpGetScale<ImplicitRef>);
-            interpreter.installSegment5(Compiler::Transformation::opcodeGetScaleExplicit,new OpGetScale<ExplicitRef>);
-            interpreter.installSegment5(Compiler::Transformation::opcodeGetAngle,new OpGetAngle<ImplicitRef>);
-            interpreter.installSegment5(Compiler::Transformation::opcodeGetAngleExplicit,new OpGetAngle<ExplicitRef>);
-            interpreter.installSegment5(Compiler::Transformation::opcodeGetPos,new OpGetPos<ImplicitRef>);
-            interpreter.installSegment5(Compiler::Transformation::opcodeGetPosExplicit,new OpGetPos<ExplicitRef>);
-            interpreter.installSegment5(Compiler::Transformation::opcodeSetPos,new OpSetPos<ImplicitRef>);
-            interpreter.installSegment5(Compiler::Transformation::opcodeSetPosExplicit,new OpSetPos<ExplicitRef>);
-            interpreter.installSegment5(Compiler::Transformation::opcodeGetStartingPos,new OpGetStartingPos<ImplicitRef>);
-            interpreter.installSegment5(Compiler::Transformation::opcodeGetStartingPosExplicit,new OpGetStartingPos<ExplicitRef>);
-            interpreter.installSegment5(Compiler::Transformation::opcodePosition,new OpPosition<ImplicitRef>);
-            interpreter.installSegment5(Compiler::Transformation::opcodePositionExplicit,new OpPosition<ExplicitRef>);
-            interpreter.installSegment5(Compiler::Transformation::opcodePositionCell,new OpPositionCell<ImplicitRef>);
-            interpreter.installSegment5(Compiler::Transformation::opcodePositionCellExplicit,new OpPositionCell<ExplicitRef>);
-            interpreter.installSegment5(Compiler::Transformation::opcodePlaceItemCell,new OpPlaceItemCell);
-            interpreter.installSegment5(Compiler::Transformation::opcodePlaceItem,new OpPlaceItem);
-            interpreter.installSegment5(Compiler::Transformation::opcodePlaceAtPc,new OpPlaceAt<ImplicitRef, true>);
-            interpreter.installSegment5(Compiler::Transformation::opcodePlaceAtMe,new OpPlaceAt<ImplicitRef, false>);
-            interpreter.installSegment5(Compiler::Transformation::opcodePlaceAtMeExplicit,new OpPlaceAt<ExplicitRef, false>);
-            interpreter.installSegment5(Compiler::Transformation::opcodeModScale,new OpModScale<ImplicitRef>);
-            interpreter.installSegment5(Compiler::Transformation::opcodeModScaleExplicit,new OpModScale<ExplicitRef>);
-            interpreter.installSegment5(Compiler::Transformation::opcodeRotate,new OpRotate<ImplicitRef>);
-            interpreter.installSegment5(Compiler::Transformation::opcodeRotateExplicit,new OpRotate<ExplicitRef>);
-            interpreter.installSegment5(Compiler::Transformation::opcodeRotateWorld,new OpRotateWorld<ImplicitRef>);
-            interpreter.installSegment5(Compiler::Transformation::opcodeRotateWorldExplicit,new OpRotateWorld<ExplicitRef>);
-            interpreter.installSegment5(Compiler::Transformation::opcodeSetAtStart,new OpSetAtStart<ImplicitRef>);
-            interpreter.installSegment5(Compiler::Transformation::opcodeSetAtStartExplicit,new OpSetAtStart<ExplicitRef>);
-            interpreter.installSegment5(Compiler::Transformation::opcodeMove,new OpMove<ImplicitRef>);
-            interpreter.installSegment5(Compiler::Transformation::opcodeMoveExplicit,new OpMove<ExplicitRef>);
-            interpreter.installSegment5(Compiler::Transformation::opcodeMoveWorld,new OpMoveWorld<ImplicitRef>);
-            interpreter.installSegment5(Compiler::Transformation::opcodeMoveWorldExplicit,new OpMoveWorld<ExplicitRef>);
-            interpreter.installSegment5(Compiler::Transformation::opcodeGetStartingAngle, new OpGetStartingAngle<ImplicitRef>);
-            interpreter.installSegment5(Compiler::Transformation::opcodeGetStartingAngleExplicit, new OpGetStartingAngle<ExplicitRef>);
-            interpreter.installSegment5(Compiler::Transformation::opcodeResetActors, new OpResetActors);
-            interpreter.installSegment5(Compiler::Transformation::opcodeFixme, new OpFixme);
+            interpreter.installSegment5<OpGetDistance<ImplicitRef>>(Compiler::Transformation::opcodeGetDistance);
+            interpreter.installSegment5<OpGetDistance<ExplicitRef>>(Compiler::Transformation::opcodeGetDistanceExplicit);
+            interpreter.installSegment5<OpSetScale<ImplicitRef>>(Compiler::Transformation::opcodeSetScale);
+            interpreter.installSegment5<OpSetScale<ExplicitRef>>(Compiler::Transformation::opcodeSetScaleExplicit);
+            interpreter.installSegment5<OpSetAngle<ImplicitRef>>(Compiler::Transformation::opcodeSetAngle);
+            interpreter.installSegment5<OpSetAngle<ExplicitRef>>(Compiler::Transformation::opcodeSetAngleExplicit);
+            interpreter.installSegment5<OpGetScale<ImplicitRef>>(Compiler::Transformation::opcodeGetScale);
+            interpreter.installSegment5<OpGetScale<ExplicitRef>>(Compiler::Transformation::opcodeGetScaleExplicit);
+            interpreter.installSegment5<OpGetAngle<ImplicitRef>>(Compiler::Transformation::opcodeGetAngle);
+            interpreter.installSegment5<OpGetAngle<ExplicitRef>>(Compiler::Transformation::opcodeGetAngleExplicit);
+            interpreter.installSegment5<OpGetPos<ImplicitRef>>(Compiler::Transformation::opcodeGetPos);
+            interpreter.installSegment5<OpGetPos<ExplicitRef>>(Compiler::Transformation::opcodeGetPosExplicit);
+            interpreter.installSegment5<OpSetPos<ImplicitRef>>(Compiler::Transformation::opcodeSetPos);
+            interpreter.installSegment5<OpSetPos<ExplicitRef>>(Compiler::Transformation::opcodeSetPosExplicit);
+            interpreter.installSegment5<OpGetStartingPos<ImplicitRef>>(Compiler::Transformation::opcodeGetStartingPos);
+            interpreter.installSegment5<OpGetStartingPos<ExplicitRef>>(Compiler::Transformation::opcodeGetStartingPosExplicit);
+            interpreter.installSegment5<OpPosition<ImplicitRef>>(Compiler::Transformation::opcodePosition);
+            interpreter.installSegment5<OpPosition<ExplicitRef>>(Compiler::Transformation::opcodePositionExplicit);
+            interpreter.installSegment5<OpPositionCell<ImplicitRef>>(Compiler::Transformation::opcodePositionCell);
+            interpreter.installSegment5<OpPositionCell<ExplicitRef>>(Compiler::Transformation::opcodePositionCellExplicit);
+            interpreter.installSegment5<OpPlaceItemCell>(Compiler::Transformation::opcodePlaceItemCell);
+            interpreter.installSegment5<OpPlaceItem>(Compiler::Transformation::opcodePlaceItem);
+            interpreter.installSegment5<OpPlaceAt<ImplicitRef, true>>(Compiler::Transformation::opcodePlaceAtPc);
+            interpreter.installSegment5<OpPlaceAt<ImplicitRef, false>>(Compiler::Transformation::opcodePlaceAtMe);
+            interpreter.installSegment5<OpPlaceAt<ExplicitRef, false>>(Compiler::Transformation::opcodePlaceAtMeExplicit);
+            interpreter.installSegment5<OpModScale<ImplicitRef>>(Compiler::Transformation::opcodeModScale);
+            interpreter.installSegment5<OpModScale<ExplicitRef>>(Compiler::Transformation::opcodeModScaleExplicit);
+            interpreter.installSegment5<OpRotate<ImplicitRef>>(Compiler::Transformation::opcodeRotate);
+            interpreter.installSegment5<OpRotate<ExplicitRef>>(Compiler::Transformation::opcodeRotateExplicit);
+            interpreter.installSegment5<OpRotateWorld<ImplicitRef>>(Compiler::Transformation::opcodeRotateWorld);
+            interpreter.installSegment5<OpRotateWorld<ExplicitRef>>(Compiler::Transformation::opcodeRotateWorldExplicit);
+            interpreter.installSegment5<OpSetAtStart<ImplicitRef>>(Compiler::Transformation::opcodeSetAtStart);
+            interpreter.installSegment5<OpSetAtStart<ExplicitRef>>(Compiler::Transformation::opcodeSetAtStartExplicit);
+            interpreter.installSegment5<OpMove<ImplicitRef>>(Compiler::Transformation::opcodeMove);
+            interpreter.installSegment5<OpMove<ExplicitRef>>(Compiler::Transformation::opcodeMoveExplicit);
+            interpreter.installSegment5<OpMoveWorld<ImplicitRef>>(Compiler::Transformation::opcodeMoveWorld);
+            interpreter.installSegment5<OpMoveWorld<ExplicitRef>>(Compiler::Transformation::opcodeMoveWorldExplicit);
+            interpreter.installSegment5<OpGetStartingAngle<ImplicitRef>>(Compiler::Transformation::opcodeGetStartingAngle);
+            interpreter.installSegment5<OpGetStartingAngle<ExplicitRef>>(Compiler::Transformation::opcodeGetStartingAngleExplicit);
+            interpreter.installSegment5<OpResetActors>(Compiler::Transformation::opcodeResetActors);
+            interpreter.installSegment5<OpFixme>(Compiler::Transformation::opcodeFixme);
         }
     }
 }
diff --git a/apps/openmw/mwscript/userextensions.cpp b/apps/openmw/mwscript/userextensions.cpp
index 3f443304d7..f929425a9c 100644
--- a/apps/openmw/mwscript/userextensions.cpp
+++ b/apps/openmw/mwscript/userextensions.cpp
@@ -66,12 +66,12 @@ namespace MWScript
 
         void installOpcodes (Interpreter::Interpreter& interpreter)
         {
-            interpreter.installSegment5 (Compiler::User::opcodeUser1, new OpUser1);
-            interpreter.installSegment5 (Compiler::User::opcodeUser2, new OpUser2);
-            interpreter.installSegment5 (Compiler::User::opcodeUser3, new OpUser3<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::User::opcodeUser3Explicit, new OpUser3<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::User::opcodeUser4, new OpUser4<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::User::opcodeUser4Explicit, new OpUser4<ExplicitRef>);
+            interpreter.installSegment5<OpUser1>(Compiler::User::opcodeUser1);
+            interpreter.installSegment5<OpUser2>(Compiler::User::opcodeUser2);
+            interpreter.installSegment5<OpUser3<ImplicitRef>>(Compiler::User::opcodeUser3);
+            interpreter.installSegment5<OpUser3<ExplicitRef>>(Compiler::User::opcodeUser3Explicit);
+            interpreter.installSegment5<OpUser4<ImplicitRef>>(Compiler::User::opcodeUser4);
+            interpreter.installSegment5<OpUser4<ExplicitRef>>(Compiler::User::opcodeUser4Explicit);
         }
     }
 }
diff --git a/apps/openmw_test_suite/mwscript/test_scripts.cpp b/apps/openmw_test_suite/mwscript/test_scripts.cpp
index c04860afdf..dea2a0dc8a 100644
--- a/apps/openmw_test_suite/mwscript/test_scripts.cpp
+++ b/apps/openmw_test_suite/mwscript/test_scripts.cpp
@@ -49,10 +49,12 @@ namespace
             mInterpreter.run(&script.mByteCode[0], static_cast<int>(script.mByteCode.size()), context);
         }
 
-        void installOpcode(int code, Interpreter::Opcode0* opcode)
+        template<typename T, typename ...TArgs>
+        void installOpcode(int code, TArgs&& ...args)
         {
-            mInterpreter.installSegment5(code, opcode);
+            mInterpreter.installSegment5<T>(code, std::forward<TArgs&&>(args)...);
         }
+		
     protected:
         void SetUp() override
         {
@@ -472,7 +474,7 @@ messagebox,"this is a %g",a
                     EXPECT_EQ(topic, "OpenMW Unit Test");
                 }
             };
-            installOpcode(Compiler::Dialogue::opcodeAddTopic, new AddTopic(failed));
+            installOpcode<AddTopic>(Compiler::Dialogue::opcodeAddTopic, failed);
             TestInterpreterContext context;
             run(*script, context);
         }
@@ -715,7 +717,7 @@ messagebox,"this is a %g",a
                     mTopics.erase(mTopics.begin());
                 }
             };
-            installOpcode(Compiler::Dialogue::opcodeAddTopic, new AddTopic(topics));
+            installOpcode<AddTopic>(Compiler::Dialogue::opcodeAddTopic, topics);
             TestInterpreterContext context;
             run(*script, context);
             EXPECT_TRUE(topics.empty());
@@ -826,7 +828,7 @@ messagebox,"this is a %g",a
                 }
             };
             bool ran = false;
-            installOpcode(Compiler::Transformation::opcodePositionCell, new PositionCell(ran));
+            installOpcode<PositionCell>(Compiler::Transformation::opcodePositionCell, ran);
             TestInterpreterContext context;
             context.setLocalShort(0, 0);
             run(*script, context);
diff --git a/components/interpreter/installopcodes.cpp b/components/interpreter/installopcodes.cpp
index b5cb229e84..d5e9bb0cc5 100644
--- a/components/interpreter/installopcodes.cpp
+++ b/components/interpreter/installopcodes.cpp
@@ -11,89 +11,77 @@
 
 namespace Interpreter
 {
-    void installOpcodes (Interpreter& interpreter)
+    void installOpcodes(Interpreter& interpreter)
     {
         // generic
-        interpreter.installSegment0 (0, new OpPushInt);
-        interpreter.installSegment5 (3, new OpIntToFloat);
-        interpreter.installSegment5 (6, new OpFloatToInt);
-        interpreter.installSegment5 (7, new OpNegateInt);
-        interpreter.installSegment5 (8, new OpNegateFloat);
-        interpreter.installSegment5 (17, new OpIntToFloat1);
-        interpreter.installSegment5 (18, new OpFloatToInt1);
+        interpreter.installSegment0<OpPushInt>(0);
+        interpreter.installSegment5<OpIntToFloat>(3);
+        interpreter.installSegment5<OpFloatToInt>(6);
+        interpreter.installSegment5<OpNegateInt>(7);
+        interpreter.installSegment5<OpNegateFloat>(8);
+        interpreter.installSegment5<OpIntToFloat1>(17);
+        interpreter.installSegment5<OpFloatToInt1>(18);
 
         // local variables, global variables & literals
-        interpreter.installSegment5 (0, new OpStoreLocalShort);
-        interpreter.installSegment5 (1, new OpStoreLocalLong);
-        interpreter.installSegment5 (2, new OpStoreLocalFloat);
-        interpreter.installSegment5 (4, new OpFetchIntLiteral);
-        interpreter.installSegment5 (5, new OpFetchFloatLiteral);
-        interpreter.installSegment5 (21, new OpFetchLocalShort);
-        interpreter.installSegment5 (22, new OpFetchLocalLong);
-        interpreter.installSegment5 (23, new OpFetchLocalFloat);
-        interpreter.installSegment5 (39, new OpStoreGlobalShort);
-        interpreter.installSegment5 (40, new OpStoreGlobalLong);
-        interpreter.installSegment5 (41, new OpStoreGlobalFloat);
-        interpreter.installSegment5 (42, new OpFetchGlobalShort);
-        interpreter.installSegment5 (43, new OpFetchGlobalLong);
-        interpreter.installSegment5 (44, new OpFetchGlobalFloat);
-        interpreter.installSegment5 (59, new OpStoreMemberShort (false));
-        interpreter.installSegment5 (60, new OpStoreMemberLong (false));
-        interpreter.installSegment5 (61, new OpStoreMemberFloat (false));
-        interpreter.installSegment5 (62, new OpFetchMemberShort (false));
-        interpreter.installSegment5 (63, new OpFetchMemberLong (false));
-        interpreter.installSegment5 (64, new OpFetchMemberFloat (false));
-        interpreter.installSegment5 (65, new OpStoreMemberShort (true));
-        interpreter.installSegment5 (66, new OpStoreMemberLong (true));
-        interpreter.installSegment5 (67, new OpStoreMemberFloat (true));
-        interpreter.installSegment5 (68, new OpFetchMemberShort (true));
-        interpreter.installSegment5 (69, new OpFetchMemberLong (true));
-        interpreter.installSegment5 (70, new OpFetchMemberFloat (true));
+        interpreter.installSegment5<OpStoreLocalShort>(0);
+        interpreter.installSegment5<OpStoreLocalLong>(1);
+        interpreter.installSegment5<OpStoreLocalFloat>(2);
+        interpreter.installSegment5<OpFetchIntLiteral>(4);
+        interpreter.installSegment5<OpFetchFloatLiteral>(5);
+        interpreter.installSegment5<OpFetchLocalShort>(21);
+        interpreter.installSegment5<OpFetchLocalLong>(22);
+        interpreter.installSegment5<OpFetchLocalFloat>(23);
+        interpreter.installSegment5<OpStoreGlobalShort>(39);
+        interpreter.installSegment5<OpStoreGlobalLong>(40);
+        interpreter.installSegment5<OpStoreGlobalFloat>(41);
+        interpreter.installSegment5<OpFetchGlobalShort>(42);
+        interpreter.installSegment5<OpFetchGlobalLong>(43);
+        interpreter.installSegment5<OpFetchGlobalFloat>(44);
+        interpreter.installSegment5<OpStoreMemberShort<false>>(59);
+        interpreter.installSegment5<OpStoreMemberLong<false>>(60);
+        interpreter.installSegment5<OpStoreMemberFloat<false>>(61);
+        interpreter.installSegment5<OpFetchMemberShort<false>>(62);
+        interpreter.installSegment5<OpFetchMemberLong<false>>(63);
+        interpreter.installSegment5<OpFetchMemberFloat<false>>(64);
+        interpreter.installSegment5<OpStoreMemberShort<true>>(65);
+        interpreter.installSegment5<OpStoreMemberLong<true>>(66);
+        interpreter.installSegment5<OpStoreMemberFloat<true>>(67);
+        interpreter.installSegment5<OpFetchMemberShort<true>>(68);
+        interpreter.installSegment5<OpFetchMemberLong<true>>(69);
+        interpreter.installSegment5<OpFetchMemberFloat<true>>(70);
 
         // math
-        interpreter.installSegment5 (9, new OpAddInt<Type_Integer>);
-        interpreter.installSegment5 (10, new OpAddInt<Type_Float>);
-        interpreter.installSegment5 (11, new OpSubInt<Type_Integer>);
-        interpreter.installSegment5 (12, new OpSubInt<Type_Float>);
-        interpreter.installSegment5 (13, new OpMulInt<Type_Integer>);
-        interpreter.installSegment5 (14, new OpMulInt<Type_Float>);
-        interpreter.installSegment5 (15, new OpDivInt<Type_Integer>);
-        interpreter.installSegment5 (16, new OpDivInt<Type_Float>);
-        interpreter.installSegment5 (26,
-            new OpCompare<Type_Integer, std::equal_to<Type_Integer> >);
-        interpreter.installSegment5 (27,
-            new OpCompare<Type_Integer, std::not_equal_to<Type_Integer> >);
-        interpreter.installSegment5 (28,
-            new OpCompare<Type_Integer, std::less<Type_Integer> >);
-        interpreter.installSegment5 (29,
-            new OpCompare<Type_Integer, std::less_equal<Type_Integer> >);
-        interpreter.installSegment5 (30,
-            new OpCompare<Type_Integer, std::greater<Type_Integer> >);
-        interpreter.installSegment5 (31,
-            new OpCompare<Type_Integer, std::greater_equal<Type_Integer> >);
+        interpreter.installSegment5<OpAddInt<Type_Integer>>(9);
+        interpreter.installSegment5<OpAddInt<Type_Float>>(10);
+        interpreter.installSegment5<OpSubInt<Type_Integer>>(11);
+        interpreter.installSegment5<OpSubInt<Type_Float>>(12);
+        interpreter.installSegment5<OpMulInt<Type_Integer>>(13);
+        interpreter.installSegment5<OpMulInt<Type_Float>>(14);
+        interpreter.installSegment5<OpDivInt<Type_Integer>>(15);
+        interpreter.installSegment5<OpDivInt<Type_Float>>(16);
+        interpreter.installSegment5<OpCompare<Type_Integer, std::equal_to<Type_Integer> >>(26);
+        interpreter.installSegment5<OpCompare<Type_Integer, std::not_equal_to<Type_Integer> >>(27);
+        interpreter.installSegment5<OpCompare<Type_Integer, std::less<Type_Integer> >>(28);
+        interpreter.installSegment5<OpCompare<Type_Integer, std::less_equal<Type_Integer> >>(29);
+        interpreter.installSegment5<OpCompare<Type_Integer, std::greater<Type_Integer> >>(30);
+        interpreter.installSegment5<OpCompare<Type_Integer, std::greater_equal<Type_Integer> >>(31);
 
-        interpreter.installSegment5 (32,
-            new OpCompare<Type_Float, std::equal_to<Type_Float> >);
-        interpreter.installSegment5 (33,
-            new OpCompare<Type_Float, std::not_equal_to<Type_Float> >);
-        interpreter.installSegment5 (34,
-            new OpCompare<Type_Float, std::less<Type_Float> >);
-        interpreter.installSegment5 (35,
-            new OpCompare<Type_Float, std::less_equal<Type_Float> >);
-        interpreter.installSegment5 (36,
-            new OpCompare<Type_Float, std::greater<Type_Float> >);
-        interpreter.installSegment5 (37,
-            new OpCompare<Type_Float, std::greater_equal<Type_Float> >);
+        interpreter.installSegment5<OpCompare<Type_Float, std::equal_to<Type_Float> >>(32);
+        interpreter.installSegment5<OpCompare<Type_Float, std::not_equal_to<Type_Float> >>(33);
+        interpreter.installSegment5<OpCompare<Type_Float, std::less<Type_Float> >>(34);
+        interpreter.installSegment5<OpCompare<Type_Float, std::less_equal<Type_Float> >>(35);
+        interpreter.installSegment5<OpCompare<Type_Float, std::greater<Type_Float> >>(36);
+        interpreter.installSegment5<OpCompare<Type_Float, std::greater_equal<Type_Float> >>(37);
 
         // control structures
-        interpreter.installSegment5 (20, new OpReturn);
-        interpreter.installSegment5 (24, new OpSkipZero);
-        interpreter.installSegment5 (25, new OpSkipNonZero);
-        interpreter.installSegment0 (1, new OpJumpForward);
-        interpreter.installSegment0 (2, new OpJumpBackward);
+        interpreter.installSegment5<OpReturn>(20);
+        interpreter.installSegment5<OpSkipZero>(24);
+        interpreter.installSegment5<OpSkipNonZero>(25);
+        interpreter.installSegment0<OpJumpForward>(1);
+        interpreter.installSegment0<OpJumpBackward>(2);
 
         // misc
-        interpreter.installSegment3 (0, new OpMessageBox);
-        interpreter.installSegment5 (58, new OpReport);
+        interpreter.installSegment3<OpMessageBox>(0);
+        interpreter.installSegment5<OpReport>(58);
     }
 }
diff --git a/components/interpreter/interpreter.cpp b/components/interpreter/interpreter.cpp
index c04352a90f..69f3111440 100644
--- a/components/interpreter/interpreter.cpp
+++ b/components/interpreter/interpreter.cpp
@@ -7,92 +7,75 @@
 
 namespace Interpreter
 {
+    [[noreturn]] static void abortUnknownCode(int segment, int opcode)
+    {
+        const std::string error = "unknown opcode " + std::to_string(opcode) + " in segment " + std::to_string(segment);
+        throw std::runtime_error(error);
+    }
+
+    [[noreturn]] static void abortUnknownSegment(Type_Code code)
+    {
+        const std::string error = "opcode outside of the allocated segment range: " + std::to_string(code);
+        throw std::runtime_error(error);
+    }
+
+    template<typename T>
+    auto& getDispatcher(const T& segment, unsigned int seg, int opcode)
+    {
+        auto it = segment.find(opcode);
+        if (it == segment.end())
+        {
+            abortUnknownCode(seg, opcode);
+        }
+        return it->second;
+    }
+
     void Interpreter::execute (Type_Code code)
     {
-        unsigned int segSpec = code>>30;
+        unsigned int segSpec = code >> 30;
 
         switch (segSpec)
         {
             case 0:
             {
-                int opcode = code>>24;
-                unsigned int arg0 = code & 0xffffff;
+                const int opcode = code >> 24;
+                const unsigned int arg0 = code & 0xffffff;
 
-                std::map<int, Opcode1 *>::iterator iter = mSegment0.find (opcode);
-
-                if (iter==mSegment0.end())
-                    abortUnknownCode (0, opcode);
-
-                iter->second->execute (mRuntime, arg0);
-
-                return;
+                return getDispatcher(mSegment0, 0, opcode)->execute(mRuntime, arg0);
             }
 
             case 2:
             {
-                int opcode = (code>>20) & 0x3ff;
-                unsigned int arg0 = code & 0xfffff;
-
-                std::map<int, Opcode1 *>::iterator iter = mSegment2.find (opcode);
+                const int opcode = (code >> 20) & 0x3ff;
+                const unsigned int arg0 = code & 0xfffff;
 
-                if (iter==mSegment2.end())
-                    abortUnknownCode (2, opcode);
-
-                iter->second->execute (mRuntime, arg0);
-
-                return;
+                return getDispatcher(mSegment2, 2, opcode)->execute(mRuntime, arg0);
             }
         }
 
-        segSpec = code>>26;
+        segSpec = code >> 26;
 
         switch (segSpec)
         {
             case 0x30:
             {
-                int opcode = (code>>8) & 0x3ffff;
-                unsigned int arg0 = code & 0xff;
-
-                std::map<int, Opcode1 *>::iterator iter = mSegment3.find (opcode);
+                const int opcode = (code >> 8) & 0x3ffff;
+                const unsigned int arg0 = code & 0xff;
 
-                if (iter==mSegment3.end())
-                    abortUnknownCode (3, opcode);
-
-                iter->second->execute (mRuntime, arg0);
-
-                return;
+                return getDispatcher(mSegment3, 3, opcode)->execute(mRuntime, arg0);
             }
 
             case 0x32:
             {
-                int opcode = code & 0x3ffffff;
-
-                std::map<int, Opcode0 *>::iterator iter = mSegment5.find (opcode);
+                const int opcode = code & 0x3ffffff;
 
-                if (iter==mSegment5.end())
-                    abortUnknownCode (5, opcode);
-
-                iter->second->execute (mRuntime);
-
-                return;
+                return getDispatcher(mSegment5, 5, opcode)->execute(mRuntime);
             }
         }
 
         abortUnknownSegment (code);
     }
 
-    [[noreturn]] void Interpreter::abortUnknownCode (int segment, int opcode)
-    {
-        const std::string error = "unknown opcode " + std::to_string(opcode) + " in segment " + std::to_string(segment);
-        throw std::runtime_error (error);
-    }
-
-    [[noreturn]] void Interpreter::abortUnknownSegment (Type_Code code)
-    {
-        const std::string error = "opcode outside of the allocated segment range: " + std::to_string(code);
-        throw std::runtime_error (error);
-    }
-
     void Interpreter::begin()
     {
         if (mRunning)
@@ -123,49 +106,6 @@ namespace Interpreter
     Interpreter::Interpreter() : mRunning (false)
     {}
 
-    Interpreter::~Interpreter()
-    {
-        for (std::map<int, Opcode1 *>::iterator iter (mSegment0.begin());
-            iter!=mSegment0.end(); ++iter)
-            delete iter->second;
-
-        for (std::map<int, Opcode1 *>::iterator iter (mSegment2.begin());
-            iter!=mSegment2.end(); ++iter)
-            delete iter->second;
-
-        for (std::map<int, Opcode1 *>::iterator iter (mSegment3.begin());
-            iter!=mSegment3.end(); ++iter)
-            delete iter->second;
-
-        for (std::map<int, Opcode0 *>::iterator iter (mSegment5.begin());
-            iter!=mSegment5.end(); ++iter)
-            delete iter->second;
-    }
-
-    void Interpreter::installSegment0 (int code, Opcode1 *opcode)
-    {
-        assert(mSegment0.find(code) == mSegment0.end());
-        mSegment0.insert (std::make_pair (code, opcode));
-    }
-
-    void Interpreter::installSegment2 (int code, Opcode1 *opcode)
-    {
-        assert(mSegment2.find(code) == mSegment2.end());
-        mSegment2.insert (std::make_pair (code, opcode));
-    }
-
-    void Interpreter::installSegment3 (int code, Opcode1 *opcode)
-    {
-        assert(mSegment3.find(code) == mSegment3.end());
-        mSegment3.insert (std::make_pair (code, opcode));
-    }
-
-    void Interpreter::installSegment5 (int code, Opcode0 *opcode)
-    {
-        assert(mSegment5.find(code) == mSegment5.end());
-        mSegment5.insert (std::make_pair (code, opcode));
-    }
-
     void Interpreter::run (const Type_Code *code, int codeSize, Context& context)
     {
         assert (codeSize>=4);
diff --git a/components/interpreter/interpreter.hpp b/components/interpreter/interpreter.hpp
index 3aa5e36d58..2e08e6614b 100644
--- a/components/interpreter/interpreter.hpp
+++ b/components/interpreter/interpreter.hpp
@@ -3,24 +3,25 @@
 
 #include <map>
 #include <stack>
+#include <memory>
+#include <cassert>
+#include <utility>
 
 #include "runtime.hpp"
 #include "types.hpp"
+#include "opcodes.hpp"
 
 namespace Interpreter
 {
-    class Opcode0;
-    class Opcode1;
-
     class Interpreter
     {
             std::stack<Runtime> mCallstack;
             bool mRunning;
             Runtime mRuntime;
-            std::map<int, Opcode1 *> mSegment0;
-            std::map<int, Opcode1 *> mSegment2;
-            std::map<int, Opcode1 *> mSegment3;
-            std::map<int, Opcode0 *> mSegment5;
+            std::map<int, std::unique_ptr<Opcode1>> mSegment0;
+            std::map<int, std::unique_ptr<Opcode1>> mSegment2;
+            std::map<int, std::unique_ptr<Opcode1>> mSegment3;
+            std::map<int, std::unique_ptr<Opcode0>> mSegment5;
 
             // not implemented
             Interpreter (const Interpreter&);
@@ -28,31 +29,44 @@ namespace Interpreter
 
             void execute (Type_Code code);
 
-            [[noreturn]] void abortUnknownCode (int segment, int opcode);
-
-            [[noreturn]] void abortUnknownSegment (Type_Code code);
-
             void begin();
 
             void end();
 
+            template<typename TSeg, typename TOp>
+            void installSegment(TSeg& seg, int code, TOp&& op)
+            {
+                assert(seg.find(code) == seg.end());
+                seg.emplace(code, std::move(op));
+            }
+
         public:
 
             Interpreter();
 
-            ~Interpreter();
-
-            void installSegment0 (int code, Opcode1 *opcode);
-            ///< ownership of \a opcode is transferred to *this.
-
-            void installSegment2 (int code, Opcode1 *opcode);
-            ///< ownership of \a opcode is transferred to *this.
-
-            void installSegment3 (int code, Opcode1 *opcode);
-            ///< ownership of \a opcode is transferred to *this.
-
-            void installSegment5 (int code, Opcode0 *opcode);
-            ///< ownership of \a opcode is transferred to *this.
+            template<typename T, typename ...TArgs>
+            void installSegment0(int code, TArgs&& ...args)
+            {
+                installSegment(mSegment0, code, std::make_unique<T>(std::forward<TArgs>(args)...));
+            }
+
+            template<typename T, typename ...TArgs>
+            void installSegment2(int code, TArgs&& ...args)
+            {
+                installSegment(mSegment2, code, std::make_unique<T>(std::forward<TArgs>(args)...));
+            }
+
+            template<typename T, typename ...TArgs>
+            void installSegment3(int code, TArgs&& ...args)
+            {
+                installSegment(mSegment3, code, std::make_unique<T>(std::forward<TArgs>(args)...));
+            }
+
+            template<typename T, typename ...TArgs>
+            void installSegment5(int code, TArgs&& ...args)
+            {
+                installSegment(mSegment5, code, std::make_unique<T>(std::forward<TArgs>(args)...));
+            }
 
             void run (const Type_Code *code, int codeSize, Context& context);
     };
diff --git a/components/interpreter/localopcodes.hpp b/components/interpreter/localopcodes.hpp
index 0227327b3a..72a730ae99 100644
--- a/components/interpreter/localopcodes.hpp
+++ b/components/interpreter/localopcodes.hpp
@@ -206,14 +206,11 @@ namespace Interpreter
             }
     };
 
+    template<bool TGlobal>
     class OpStoreMemberShort : public Opcode0
     {
-            bool mGlobal;
-
         public:
 
-            OpStoreMemberShort (bool global) : mGlobal (global) {}
-
             void execute (Runtime& runtime) override
             {
                 Type_Integer data = runtime[0].mInteger;
@@ -222,7 +219,7 @@ namespace Interpreter
                 index = runtime[2].mInteger;
                 std::string variable = runtime.getStringLiteral (index);
 
-                runtime.getContext().setMemberShort (id, variable, data, mGlobal);
+                runtime.getContext().setMemberShort (id, variable, data, TGlobal);
 
                 runtime.pop();
                 runtime.pop();
@@ -230,14 +227,11 @@ namespace Interpreter
             }
     };
 
+    template<bool TGlobal>
     class OpStoreMemberLong : public Opcode0
     {
-            bool mGlobal;
-
         public:
 
-            OpStoreMemberLong (bool global) : mGlobal (global) {}
-
             void execute (Runtime& runtime) override
             {
                 Type_Integer data = runtime[0].mInteger;
@@ -246,7 +240,7 @@ namespace Interpreter
                 index = runtime[2].mInteger;
                 std::string variable = runtime.getStringLiteral (index);
 
-                runtime.getContext().setMemberLong (id, variable, data, mGlobal);
+                runtime.getContext().setMemberLong (id, variable, data, TGlobal);
 
                 runtime.pop();
                 runtime.pop();
@@ -254,14 +248,11 @@ namespace Interpreter
             }
     };
 
+    template<bool TGlobal>
     class OpStoreMemberFloat : public Opcode0
     {
-            bool mGlobal;
-
         public:
 
-            OpStoreMemberFloat (bool global) : mGlobal (global) {}
-
             void execute (Runtime& runtime) override
             {
                 Type_Float data = runtime[0].mFloat;
@@ -270,7 +261,7 @@ namespace Interpreter
                 index = runtime[2].mInteger;
                 std::string variable = runtime.getStringLiteral (index);
 
-                runtime.getContext().setMemberFloat (id, variable, data, mGlobal);
+                runtime.getContext().setMemberFloat (id, variable, data, TGlobal);
 
                 runtime.pop();
                 runtime.pop();
@@ -278,14 +269,11 @@ namespace Interpreter
             }
     };
 
+    template<bool TGlobal>
     class OpFetchMemberShort : public Opcode0
     {
-            bool mGlobal;
-
         public:
 
-            OpFetchMemberShort (bool global) : mGlobal (global) {}
-
             void execute (Runtime& runtime) override
             {
                 Type_Integer index = runtime[0].mInteger;
@@ -294,19 +282,16 @@ namespace Interpreter
                 std::string variable = runtime.getStringLiteral (index);
                 runtime.pop();
 
-                int value = runtime.getContext().getMemberShort (id, variable, mGlobal);
+                int value = runtime.getContext().getMemberShort (id, variable, TGlobal);
                 runtime[0].mInteger = value;
             }
     };
 
+    template<bool TGlobal>
     class OpFetchMemberLong : public Opcode0
     {
-            bool mGlobal;
-
         public:
 
-            OpFetchMemberLong (bool global) : mGlobal (global) {}
-
             void execute (Runtime& runtime) override
             {
                 Type_Integer index = runtime[0].mInteger;
@@ -315,19 +300,16 @@ namespace Interpreter
                 std::string variable = runtime.getStringLiteral (index);
                 runtime.pop();
 
-                int value = runtime.getContext().getMemberLong (id, variable, mGlobal);
+                int value = runtime.getContext().getMemberLong (id, variable, TGlobal);
                 runtime[0].mInteger = value;
             }
     };
 
+    template<bool TGlobal>
     class OpFetchMemberFloat : public Opcode0
     {
-            bool mGlobal;
-
         public:
 
-            OpFetchMemberFloat (bool global) : mGlobal (global) {}
-
             void execute (Runtime& runtime) override
             {
                 Type_Integer index = runtime[0].mInteger;
@@ -336,7 +318,7 @@ namespace Interpreter
                 std::string variable = runtime.getStringLiteral (index);
                 runtime.pop();
 
-                float value = runtime.getContext().getMemberFloat (id, variable, mGlobal);
+                float value = runtime.getContext().getMemberFloat (id, variable, TGlobal);
                 runtime[0].mFloat = value;
             }
     };

From 022fdc49a5b45c9e620b6261d492ebc22583b848 Mon Sep 17 00:00:00 2001
From: Bret Curtis <bret.curtis@gmail.com>
Date: Thu, 27 Jan 2022 21:13:38 +0100
Subject: [PATCH 1996/2859] update tests to use esm3 rename

---
 apps/openmw_test_suite/esmloader/esmdata.cpp | 16 ++++++++--------
 apps/openmw_test_suite/esmloader/load.cpp    | 14 +++++++-------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/apps/openmw_test_suite/esmloader/esmdata.cpp b/apps/openmw_test_suite/esmloader/esmdata.cpp
index 7e5791561e..a697aae531 100644
--- a/apps/openmw_test_suite/esmloader/esmdata.cpp
+++ b/apps/openmw_test_suite/esmloader/esmdata.cpp
@@ -1,11 +1,11 @@
-#include <components/esm/loadacti.hpp>
-#include <components/esm/loadcell.hpp>
-#include <components/esm/loadcont.hpp>
-#include <components/esm/loaddoor.hpp>
-#include <components/esm/loadgmst.hpp>
-#include <components/esm/loadland.hpp>
-#include <components/esm/loadstat.hpp>
-#include <components/esm/variant.hpp>
+#include <components/esm3/loadacti.hpp>
+#include <components/esm3/loadcell.hpp>
+#include <components/esm3/loadcont.hpp>
+#include <components/esm3/loaddoor.hpp>
+#include <components/esm3/loadgmst.hpp>
+#include <components/esm3/loadland.hpp>
+#include <components/esm3/loadstat.hpp>
+#include <components/esm3/variant.hpp>
 #include <components/esmloader/esmdata.hpp>
 
 #include <gtest/gtest.h>
diff --git a/apps/openmw_test_suite/esmloader/load.cpp b/apps/openmw_test_suite/esmloader/load.cpp
index 048657e65d..d1647d138e 100644
--- a/apps/openmw_test_suite/esmloader/load.cpp
+++ b/apps/openmw_test_suite/esmloader/load.cpp
@@ -1,10 +1,10 @@
-#include <components/esm/loadacti.hpp>
-#include <components/esm/loadcell.hpp>
-#include <components/esm/loadcont.hpp>
-#include <components/esm/loaddoor.hpp>
-#include <components/esm/loadgmst.hpp>
-#include <components/esm/loadland.hpp>
-#include <components/esm/loadstat.hpp>
+#include <components/esm3/loadacti.hpp>
+#include <components/esm3/loadcell.hpp>
+#include <components/esm3/loadcont.hpp>
+#include <components/esm3/loaddoor.hpp>
+#include <components/esm3/loadgmst.hpp>
+#include <components/esm3/loadland.hpp>
+#include <components/esm3/loadstat.hpp>
 #include <components/esmloader/esmdata.hpp>
 #include <components/esmloader/load.hpp>
 #include <components/files/collections.hpp>

From 88a83bab1ffa06cda668f8018e4b5c2c276a9a5d Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sat, 22 Jan 2022 17:27:10 +0100
Subject: [PATCH 1997/2859] Remove predefined data paths `data="?global?data"`,
 `data=./data` (#6564)

---
 CHANGELOG.md           | 1 +
 CMakeLists.txt         | 3 ---
 files/openmw.cfg       | 1 -
 files/openmw.cfg.local | 2 --
 4 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b80da169c6..efc831db0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -132,6 +132,7 @@
     Task #6201: Remove the "Note: No relevant classes found. No output generated" warnings
     Task #6264: Remove the old classes in animation.cpp
     Task #6553: Simplify interpreter instruction registration
+    Task #6564: Remove predefined data paths `data="?global?data"`, `data=./data`
 
 0.47.0
 ------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae840fb8b3..75cc8ae10f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -181,7 +181,6 @@ endif()
 
 # Set up common paths
 if (APPLE)
-    set(MORROWIND_DATA_FILES "./data" CACHE PATH "location of Morrowind data files")
     set(OPENMW_RESOURCE_FILES "../Resources/resources" CACHE PATH "location of OpenMW resources files")
 elseif(UNIX)
     # Paths
@@ -199,10 +198,8 @@ elseif(UNIX)
     ENDIF()
     SET(SYSCONFDIR "${GLOBAL_CONFIG_PATH}/openmw" CACHE PATH "Set config dir")
 
-    set(MORROWIND_DATA_FILES "${DATADIR}/data" CACHE PATH "location of Morrowind data files")
     set(OPENMW_RESOURCE_FILES "${DATADIR}/resources" CACHE PATH "location of OpenMW resources files")
 else()
-    set(MORROWIND_DATA_FILES "data" CACHE PATH "location of Morrowind data files")
     set(OPENMW_RESOURCE_FILES "resources" CACHE PATH "location of OpenMW resources files")
 endif(APPLE)
 
diff --git a/files/openmw.cfg b/files/openmw.cfg
index d98097c3eb..f524911489 100644
--- a/files/openmw.cfg
+++ b/files/openmw.cfg
@@ -3,7 +3,6 @@
 # (see: https://openmw.readthedocs.io/en/master/reference/modding/paths.html)
 
 content=builtin.omwscripts
-data=${MORROWIND_DATA_FILES}
 data-local="?userdata?data"
 resources=${OPENMW_RESOURCE_FILES}
 script-blacklist=Museum
diff --git a/files/openmw.cfg.local b/files/openmw.cfg.local
index 704ac68068..bed9b9b10a 100644
--- a/files/openmw.cfg.local
+++ b/files/openmw.cfg.local
@@ -3,8 +3,6 @@
 # (see: https://openmw.readthedocs.io/en/master/reference/modding/paths.html)
 
 content=builtin.omwscripts
-data="?global?data"
-data=./data
 data-local="?userdata?data"
 resources=./resources
 script-blacklist=Museum

From 4521d3987cbaeba6be7d16ab93e5b24b9538f1e4 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Fri, 28 Jan 2022 01:15:15 +0300
Subject: [PATCH 1998/2859] Fix out of bounds UV set handling

---
 components/nifosg/nifloader.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 67cb16b795..36f474a223 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -1136,18 +1136,18 @@ namespace NifOsg
 
             const auto& uvlist = data->uvlist;
             int textureStage = 0;
-            for (const unsigned int uvSet : boundTextures)
+            for (std::vector<unsigned int>::const_iterator it = boundTextures.begin(); it != boundTextures.end(); ++it, ++textureStage)
             {
+                unsigned int uvSet = *it;
                 if (uvSet >= uvlist.size())
                 {
                     Log(Debug::Verbose) << "Out of bounds UV set " << uvSet << " on shape \"" << name << "\" in " << mFilename;
-                    if (!uvlist.empty())
-                        geometry->setTexCoordArray(textureStage, new osg::Vec2Array(uvlist[0].size(), uvlist[0].data()), osg::Array::BIND_PER_VERTEX);
-                    continue;
+                    if (uvlist.empty())
+                        continue;
+                    uvSet = 0;
                 }
 
                 geometry->setTexCoordArray(textureStage, new osg::Vec2Array(uvlist[uvSet].size(), uvlist[uvSet].data()), osg::Array::BIND_PER_VERTEX);
-                textureStage++;
             }
         }
 

From 3877d227f454add588d04c70c88cfe243395527a Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 28 Jan 2022 01:00:52 +0100
Subject: [PATCH 1999/2859] Avoid unnecessary copies

---
 components/esm3/stolenitems.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/components/esm3/stolenitems.cpp b/components/esm3/stolenitems.cpp
index e196fc80c2..a43ae61a60 100644
--- a/components/esm3/stolenitems.cpp
+++ b/components/esm3/stolenitems.cpp
@@ -32,15 +32,14 @@ namespace ESM
             std::map<std::pair<std::string, bool>, int> ownerMap;
             while (esm.isNextSub("FNAM") || esm.isNextSub("ONAM"))
             {
-                std::string subname = esm.retSubName().toString();
+                const bool isFaction = (esm.retSubName() == "FNAM");
                 std::string owner = esm.getHString();
-                bool isFaction = (subname == "FNAM");
                 int count;
                 esm.getHNT(count, "COUN");
-                ownerMap.insert(std::make_pair(std::make_pair(owner, isFaction), count));
+                ownerMap.emplace(std::make_pair(std::move(owner), isFaction), count);
             }
 
-            mStolenItems[itemid] = ownerMap;
+            mStolenItems.insert_or_assign(std::move(itemid), std::move(ownerMap));
         }
     }
 

From bf692a4bfae3c8d90aefcd09b55e3fcf45dda543 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 28 Jan 2022 03:27:10 +0100
Subject: [PATCH 2000/2859] Add more tests for fixed string

---
 .../esm/test_fixed_string.cpp                 | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/apps/openmw_test_suite/esm/test_fixed_string.cpp b/apps/openmw_test_suite/esm/test_fixed_string.cpp
index bd598cc932..b59f19e7bb 100644
--- a/apps/openmw_test_suite/esm/test_fixed_string.cpp
+++ b/apps/openmw_test_suite/esm/test_fixed_string.cpp
@@ -105,3 +105,46 @@ TEST(EsmFixedString, is_pod)
      ASSERT_TRUE(std::is_pod<ESM::NAME32>::value);
      ASSERT_TRUE(std::is_pod<ESM::NAME64>::value);
 }
+
+TEST(EsmFixedString, assign_should_zero_untouched_bytes_for_4)
+{
+    ESM::NAME value;
+    value = static_cast<uint32_t>(0xFFFFFFFFu);
+    value.assign(std::string(1, 'a'));
+    EXPECT_EQ(value, static_cast<uint32_t>('a')) << value.toInt();
+}
+
+TEST(EsmFixedString, assign_should_only_truncate_for_4)
+{
+    ESM::NAME value;
+    value.assign(std::string(5, 'a'));
+    EXPECT_EQ(value, std::string(4, 'a'));
+}
+
+TEST(EsmFixedString, assign_should_truncate_and_set_last_element_to_zero)
+{
+    ESM::FIXED_STRING<17> value;
+    value.assign(std::string(20, 'a'));
+    EXPECT_EQ(value, std::string(16, 'a'));
+}
+
+TEST(EsmFixedString, assign_should_truncate_and_set_last_element_to_zero_for_32)
+{
+    ESM::NAME32 value;
+    value.assign(std::string(33, 'a'));
+    EXPECT_EQ(value, std::string(31, 'a'));
+}
+
+TEST(EsmFixedString, assign_should_truncate_and_set_last_element_to_zero_for_64)
+{
+    ESM::NAME64 value;
+    value.assign(std::string(65, 'a'));
+    EXPECT_EQ(value, std::string(63, 'a'));
+}
+
+TEST(EsmFixedString, assignment_operator_is_supported_for_uint32)
+{
+    ESM::NAME value;
+    value = static_cast<uint32_t>(0xFEDCBA98u);
+    EXPECT_EQ(value, static_cast<uint32_t>(0xFEDCBA98u)) << value.toInt();
+}

From 960dd1f7088f6aaede6c19d5bea9c012b22ed578 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Fri, 28 Jan 2022 09:31:45 +0000
Subject: [PATCH 2001/2859] Lua UI templates

---
 apps/openmw/mwlua/luabindings.hpp             |   1 -
 components/CMakeLists.txt                     |   4 +-
 components/lua_ui/element.cpp                 | 182 ++++++++++--------
 components/lua_ui/image.cpp                   |  51 +++++
 components/lua_ui/image.hpp                   |  37 ++++
 components/lua_ui/properties.hpp              |  90 ++++++---
 components/lua_ui/text.cpp                    |  19 +-
 components/lua_ui/text.hpp                    |   3 +-
 components/lua_ui/textedit.cpp                |   7 +-
 components/lua_ui/textedit.hpp                |   2 +-
 components/lua_ui/util.cpp                    |   4 +
 components/lua_ui/widget.cpp                  | 153 ++++++++++-----
 components/lua_ui/widget.hpp                  |  53 +++--
 components/lua_ui/window.cpp                  |  55 +++---
 components/lua_ui/window.hpp                  |  13 +-
 .../lua-scripting/user_interface.rst          |  21 +-
 .../lua-scripting/widgets/widget.rst          |  17 ++
 files/mygui/core.skin                         |   4 +
 18 files changed, 490 insertions(+), 226 deletions(-)
 create mode 100644 components/lua_ui/image.cpp
 create mode 100644 components/lua_ui/image.hpp

diff --git a/apps/openmw/mwlua/luabindings.hpp b/apps/openmw/mwlua/luabindings.hpp
index cfaf50c4f6..377d6d1e4f 100644
--- a/apps/openmw/mwlua/luabindings.hpp
+++ b/apps/openmw/mwlua/luabindings.hpp
@@ -63,7 +63,6 @@ namespace MWLua
 
     // Implemented in uibindings.cpp
     sol::table initUserInterfacePackage(const Context&);
-    void clearUserInterface();
 
     // Implemented in inputbindings.cpp
     sol::table initInputPackage(const Context&);
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 89b27b0d94..131581f7f7 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -162,8 +162,8 @@ add_component_dir (queries
     )
     
 add_component_dir (lua_ui
-    widget element util layers content
-    text textedit window
+    properties widget element util layers content
+    text textedit window image
     )
 
 
diff --git a/components/lua_ui/element.cpp b/components/lua_ui/element.cpp
index dcb21c32a0..c9e0fc309e 100644
--- a/components/lua_ui/element.cpp
+++ b/components/lua_ui/element.cpp
@@ -7,128 +7,144 @@
 
 namespace LuaUi
 {
-    std::string widgetType(const sol::table& layout)
+    namespace LayoutKeys
     {
-        return layout.get_or("type", std::string("LuaWidget"));
+        constexpr std::string_view type = "type";
+        constexpr std::string_view name = "name";
+        constexpr std::string_view layer = "layer";
+        constexpr std::string_view templateLayout = "template";
+        constexpr std::string_view props = "props";
+        constexpr std::string_view events = "events";
+        constexpr std::string_view content = "content";
+        constexpr std::string_view external = "external";
     }
 
-    Content content(const sol::table& layout)
+    std::string widgetType(const sol::table& layout)
     {
-        auto optional = layout.get<sol::optional<Content>>("content");
-        if (optional.has_value())
-            return optional.value();
-        else
-            return Content();
+        return layout.get_or(LayoutKeys::type, std::string("LuaWidget"));
     }
 
-    void setProperties(LuaUi::WidgetExtension* ext, const sol::table& layout)
+    void destroyWidget(LuaUi::WidgetExtension* ext)
     {
-        ext->setProperties(layout.get<sol::object>("props"));
+        ext->deinitialize();
+        MyGUI::Gui::getInstancePtr()->destroyWidget(ext->widget());
     }
 
-    void setEventCallbacks(LuaUi::WidgetExtension* ext, const sol::table& layout)
+    WidgetExtension* createWidget(const sol::table& layout);
+    void updateWidget(WidgetExtension* ext, const sol::table& layout);
+
+    std::vector<WidgetExtension*> updateContent(
+        const std::vector<WidgetExtension*>& children, const sol::object& contentObj)
     {
-        ext->clearCallbacks();
-        auto events = layout.get<sol::optional<sol::table>>("events");
-        if (events.has_value())
+        std::vector<WidgetExtension*> result;
+        if (contentObj == sol::nil)
         {
-            events.value().for_each([ext](const sol::object& name, const sol::object& callback)
-                {
-                    if (name.is<std::string>() && callback.is<LuaUtil::Callback>())
-                        ext->setCallback(name.as<std::string>(), callback.as<LuaUtil::Callback>());
-                    else if (!name.is<std::string>())
-                        Log(Debug::Warning) << "UI event key must be a string";
-                    else if (!callback.is<LuaUtil::Callback>())
-                        Log(Debug::Warning) << "UI event handler for key \"" << name.as<std::string>()
-                                            << "\" must be an openmw.async.callback";
-                });
+            for (WidgetExtension* w : children)
+                destroyWidget(w);
+            return result;
         }
+        if (!contentObj.is<Content>())
+            throw std::logic_error("Layout content field must be a openmw.ui.content");
+        Content content = contentObj.as<Content>();
+        result.resize(content.size());
+        size_t minSize = std::min(children.size(), content.size());
+        for (size_t i = 0; i < minSize; i++)
+        {
+            WidgetExtension* ext = children[i];
+            sol::table newLayout = content.at(i);
+            if (ext->widget()->getTypeName() == widgetType(newLayout)
+                && ext->getLayout() == newLayout)
+            {
+                updateWidget(ext, newLayout);
+            }
+            else
+            {
+                destroyWidget(ext);
+                ext = createWidget(newLayout);
+            }
+            result[i] = ext;
+        }
+        for (size_t i = minSize; i < children.size(); i++)
+            destroyWidget(children[i]);
+        for (size_t i = minSize; i < content.size(); i++)
+            result[i] = createWidget(content.at(i));
+        return result;
     }
 
-    void setLayout(LuaUi::WidgetExtension* ext, const sol::table& layout)
+    void setTemplate(WidgetExtension* ext, const sol::object& templateLayout)
     {
-        ext->setLayout(layout);
+        // \todo remove when none of the widgets require this workaround
+        sol::object skin = LuaUtil::getFieldOrNil(templateLayout, "skin");
+        if (skin.is<std::string>())
+            ext->widget()->changeWidgetSkin(skin.as<std::string>());
+
+        sol::object props = LuaUtil::getFieldOrNil(templateLayout, LayoutKeys::props);
+        ext->setTemplateProperties(props);
+        sol::object content = LuaUtil::getFieldOrNil(templateLayout, LayoutKeys::content);
+        ext->setTemplateChildren(updateContent(ext->templateChildren(), content));
+    }
+
+    void setEventCallbacks(LuaUi::WidgetExtension* ext, const sol::object& eventsObj)
+    {
+        ext->clearCallbacks();
+        if (eventsObj == sol::nil)
+            return;
+        if (!eventsObj.is<sol::table>())
+            throw std::logic_error("The \"events\" layout field must be a table of callbacks");
+        auto events = eventsObj.as<sol::table>();
+        events.for_each([ext](const sol::object& name, const sol::object& callback)
+        {
+            if (name.is<std::string>() && callback.is<LuaUtil::Callback>())
+                ext->setCallback(name.as<std::string>(), callback.as<LuaUtil::Callback>());
+            else if (!name.is<std::string>())
+                Log(Debug::Warning) << "UI event key must be a string";
+            else if (!callback.is<LuaUtil::Callback>())
+                Log(Debug::Warning) << "UI event handler for key \"" << name.as<std::string>()
+                                    << "\" must be an openmw.async.callback";
+        });
     }
 
-    LuaUi::WidgetExtension* createWidget(const sol::table& layout, LuaUi::WidgetExtension* parent)
+    WidgetExtension* createWidget(const sol::table& layout)
     {
         std::string type = widgetType(layout);
-        std::string skin = layout.get_or("skin", std::string());
-        std::string name = layout.get_or("name", std::string());
+        std::string name = layout.get_or(LayoutKeys::name, std::string());
 
         static auto widgetTypeMap = widgetTypeToName();
         if (widgetTypeMap.find(type) == widgetTypeMap.end())
             throw std::logic_error(std::string("Invalid widget type ") += type);
 
         MyGUI::Widget* widget = MyGUI::Gui::getInstancePtr()->createWidgetT(
-            type, skin,
+            type, "",
             MyGUI::IntCoord(), MyGUI::Align::Default,
             std::string(), name);
 
-        LuaUi::WidgetExtension* ext = dynamic_cast<LuaUi::WidgetExtension*>(widget);
+        WidgetExtension* ext = dynamic_cast<WidgetExtension*>(widget);
         if (!ext)
             throw std::runtime_error("Invalid widget!");
-
         ext->initialize(layout.lua_state(), widget);
-        if (parent != nullptr)
-            widget->attachToWidget(parent->widget());
-
-        setEventCallbacks(ext, layout);
-        setProperties(ext, layout);
-        setLayout(ext, layout);
-
-        Content cont = content(layout);
-        for (size_t i = 0; i < cont.size(); i++)
-            ext->addChild(createWidget(cont.at(i), ext));
 
+        updateWidget(ext, layout);
         return ext;
     }
 
-    void destroyWidget(LuaUi::WidgetExtension* ext)
-    {
-        ext->deinitialize();
-        MyGUI::Gui::getInstancePtr()->destroyWidget(ext->widget());
-    }
-
-    void updateWidget(const sol::table& layout, LuaUi::WidgetExtension* ext)
+    void updateWidget(WidgetExtension* ext, const sol::table& layout)
     {
-        setEventCallbacks(ext, layout);
-        setProperties(ext, layout);
-        setLayout(ext, layout);
-
-        Content newContent = content(layout);
-
-        size_t oldSize = ext->childCount();
-        size_t newSize = newContent.size();
-        size_t minSize = std::min(oldSize, newSize);
-        for (size_t i = 0; i < minSize; i++)
-        {
-            LuaUi::WidgetExtension* oldWidget = ext->childAt(i);
-            sol::table newChild = newContent.at(i);
-
-            if (oldWidget->widget()->getTypeName() != widgetType(newChild))
-            {
-                destroyWidget(oldWidget);
-                ext->assignChild(i, createWidget(newChild, ext));
-            }
-            else
-                updateWidget(newChild, oldWidget);
-        }
-
-        for (size_t i = minSize; i < oldSize; i++)
-            destroyWidget(ext->eraseChild(i));
+        ext->setLayout(layout);
+        ext->setExternal(layout.get<sol::object>(LayoutKeys::external));
+        setTemplate(ext, layout.get<sol::object>(LayoutKeys::templateLayout));
+        ext->setProperties(layout.get<sol::object>(LayoutKeys::props));
+        setEventCallbacks(ext, layout.get<sol::object>(LayoutKeys::events));
 
-        for (size_t i = minSize; i < newSize; i++)
-            ext->addChild(createWidget(newContent.at(i), ext));
+        ext->setChildren(updateContent(ext->children(), layout.get<sol::object>(LayoutKeys::content)));
     }
 
-    void setLayer(const sol::table& layout, LuaUi::WidgetExtension* ext)
+    void setLayer(WidgetExtension* ext, const sol::table& layout)
     {
         MyGUI::ILayer* layerNode = ext->widget()->getLayer();
         std::string currentLayer = layerNode ? layerNode->getName() : std::string();
-        std::string newLayer = layout.get_or("layer", std::string());
+        std::string newLayer = layout.get_or(LayoutKeys::layer, std::string());
         if (!newLayer.empty() && !MyGUI::LayerManager::getInstance().isExist(newLayer))
-            throw std::logic_error(std::string("Layer ") += newLayer += " doesn't exist");
+            throw std::logic_error(std::string("Layer ") + newLayer + " doesn't exist");
         else if (newLayer != currentLayer)
         {
             MyGUI::LayerManager::getInstance().attachToLayerNode(newLayer, ext->widget());
@@ -157,8 +173,8 @@ namespace LuaUi
         assert(!mRoot);
         if (!mRoot)
         {
-            mRoot = createWidget(mLayout, nullptr);
-            setLayer(mLayout, mRoot);
+            mRoot = createWidget(mLayout);
+            setLayer(mRoot, mLayout);
         }
     }
 
@@ -166,8 +182,8 @@ namespace LuaUi
     {
         if (mRoot && mUpdate)
         {
-            updateWidget(mLayout, mRoot);
-            setLayer(mLayout, mRoot);
+            updateWidget(mRoot, mLayout);
+            setLayer(mRoot, mLayout);
         }
         mUpdate = false;
     }
diff --git a/components/lua_ui/image.cpp b/components/lua_ui/image.cpp
new file mode 100644
index 0000000000..c8fdafbb66
--- /dev/null
+++ b/components/lua_ui/image.cpp
@@ -0,0 +1,51 @@
+#include "image.hpp"
+
+#include <MyGUI_RenderManager.h>
+
+namespace LuaUi
+{
+    void LuaTileRect::_setAlign(const MyGUI::IntSize& _oldsize)
+    {
+        mCurrentCoord.set(0, 0, mCroppedParent->getWidth(), mCroppedParent->getHeight());
+        mAlign = MyGUI::Align::Stretch;
+        MyGUI::TileRect::_setAlign(_oldsize);
+        mTileSize = mSetTileSize;
+
+        // zero tilesize stands for not tiling
+        if (mTileSize.width == 0)
+            mTileSize.width = mCoord.width;
+        if (mTileSize.height == 0)
+            mTileSize.height = mCoord.height;
+
+        // mCoord could be zero, prevent division by 0
+        // use arbitrary large numbers to prevent performance issues
+        if (mTileSize.width == 0)
+            mTileSize.width = 1e7;
+        if (mTileSize.height == 0)
+            mTileSize.height = 1e7;
+    }
+
+    LuaImage::LuaImage()
+    {
+        changeWidgetSkin("LuaImage");
+        mTileRect = dynamic_cast<LuaTileRect*>(getSubWidgetMain());
+    }
+
+    void LuaImage::updateProperties()
+    {
+        setImageTexture(propertyValue("path", std::string()));
+
+        bool tileH = propertyValue("tileH", false);
+        bool tileV = propertyValue("tileV", false);
+        MyGUI::ITexture* texture = MyGUI::RenderManager::getInstance().getTexture(_getTextureName());
+        MyGUI::IntSize textureSize;
+        if (texture != nullptr)
+            textureSize = MyGUI::IntSize(texture->getWidth(), texture->getHeight());
+        mTileRect->updateSize(MyGUI::IntSize(
+            tileH ? textureSize.width : 0,
+            tileV ? textureSize.height : 0
+        ));
+
+        WidgetExtension::updateProperties();
+    }
+}
diff --git a/components/lua_ui/image.hpp b/components/lua_ui/image.hpp
new file mode 100644
index 0000000000..4073d1bd2a
--- /dev/null
+++ b/components/lua_ui/image.hpp
@@ -0,0 +1,37 @@
+#ifndef OPENMW_LUAUI_IMAGE
+#define OPENMW_LUAUI_IMAGE
+
+#include <MyGUI_TileRect.h>
+#include <MyGUI_ImageBox.h>
+
+#include "widget.hpp"
+
+namespace LuaUi
+{
+    class LuaTileRect : public MyGUI::TileRect
+    {
+        MYGUI_RTTI_DERIVED(LuaTileRect)
+
+        public:
+            void _setAlign(const MyGUI::IntSize& _oldsize) override;
+
+            void updateSize(MyGUI::IntSize tileSize) { mSetTileSize = tileSize; }
+
+        protected:
+            MyGUI::IntSize mSetTileSize;
+    };
+
+    class LuaImage : public MyGUI::ImageBox, public WidgetExtension
+    {
+        MYGUI_RTTI_DERIVED(LuaImage)
+
+        public:
+            LuaImage();
+
+        protected:
+            virtual void updateProperties() override;
+            LuaTileRect* mTileRect;
+    };
+}
+
+#endif // OPENMW_LUAUI_IMAGE
diff --git a/components/lua_ui/properties.hpp b/components/lua_ui/properties.hpp
index 7f23a5ce6c..7c47291b84 100644
--- a/components/lua_ui/properties.hpp
+++ b/components/lua_ui/properties.hpp
@@ -9,56 +9,82 @@
 
 namespace LuaUi
 {
-    template <typename T>
-    sol::optional<T> getProperty(sol::object from, std::string_view field) {
-        sol::object value = LuaUtil::getFieldOrNil(from, field);
-        if (value == sol::nil)
-            return sol::nullopt;
-        if (value.is<T>())
-            return value.as<T>();
-        std::string error("Property \"");
-        error += field;
-        error += "\" has an invalid value \"";
-        error += LuaUtil::toString(value);
-        error += "\"";
-        throw std::logic_error(error);
+    template<typename T>
+    constexpr bool isMyGuiVector() {
+        return
+            std::is_same<T, MyGUI::IntPoint>() ||
+            std::is_same<T, MyGUI::IntSize>() ||
+            std::is_same<T, MyGUI::FloatPoint>() ||
+            std::is_same<T, MyGUI::FloatSize>();
     }
 
-    template<typename T>
-    T parseProperty(sol::object from, std::string_view field, const T& defaultValue)
+    template <typename T, typename LuaT>
+    sol::optional<T> parseValue(
+        sol::object table,
+        std::string_view field,
+        std::string_view errorPrefix)
     {
-        sol::optional<T> opt = getProperty<T>(from, field);
-        if (opt.has_value())
-            return opt.value();
+        sol::object opt = LuaUtil::getFieldOrNil(table, field);
+        if (opt != sol::nil && !opt.is<LuaT>())
+        {
+            std::string error(errorPrefix);
+            error += " \"";
+            error += field;
+            error += "\" has an invalid value \"";
+            error += LuaUtil::toString(opt);
+            error += "\"";
+            throw std::logic_error(error);
+        }
+        if (!opt.is<LuaT>())
+            return sol::nullopt;
+
+        LuaT luaT = opt.as<LuaT>();
+        if constexpr (isMyGuiVector<T>())
+            return T(luaT.x(), luaT.y());
         else
-            return defaultValue;
+            return luaT;
     }
 
     template <typename T>
-    MyGUI::types::TPoint<T> parseProperty(
-        sol::object from,
+    sol::optional<T> parseValue(
+        sol::object table,
         std::string_view field,
-        const MyGUI::types::TPoint<T>& defaultValue)
+        std::string_view errorPrefix)
     {
-        auto v = getProperty<osg::Vec2f>(from, field);
-        if (v.has_value())
-            return MyGUI::types::TPoint<T>(v.value().x(), v.value().y());
+        if constexpr (isMyGuiVector<T>())
+            return parseValue<T, osg::Vec2f>(table, field, errorPrefix);
         else
-            return defaultValue;
+            return parseValue<T, T>(table, field, errorPrefix);
     }
 
     template <typename T>
-    MyGUI::types::TSize<T> parseProperty(
-        sol::object from,
+    T parseProperty(
+        sol::object props,
+        sol::object templateProps,
         std::string_view field,
-        const MyGUI::types::TSize<T>& defaultValue)
+        const T& defaultValue)
     {
-        auto v = getProperty<osg::Vec2f>(from, field);
-        if (v.has_value())
-            return MyGUI::types::TSize<T>(v.value().x(), v.value().y());
+        auto propOptional = parseValue<T>(props, field, "Property");
+        auto templateOptional = parseValue<T>(templateProps, field, "Template property");
+
+        if (propOptional.has_value())
+            return propOptional.value();
+        else if (templateOptional.has_value())
+            return templateOptional.value();
         else
             return defaultValue;
     }
+
+    template <typename T>
+    T parseExternal(
+        sol::object external,
+        std::string_view field,
+        const T& defaultValue)
+    {
+        auto optional = parseValue<T>(external, field, "External value");
+
+        return optional.value_or(defaultValue);
+    }
 }
 
 #endif // !OPENMW_LUAUI_PROPERTIES
diff --git a/components/lua_ui/text.cpp b/components/lua_ui/text.cpp
index f93f8eecf0..47e2b574cc 100644
--- a/components/lua_ui/text.cpp
+++ b/components/lua_ui/text.cpp
@@ -5,13 +5,22 @@ namespace LuaUi
 {
     LuaText::LuaText()
         : mAutoSized(true)
-    {}
+    {
+        changeWidgetSkin("NormalText");
+    }
+
+    void LuaText::updateProperties()
+    {
+        setCaption(propertyValue("caption", std::string()));
+        mAutoSized = propertyValue("autoSize", true);
+        WidgetExtension::updateProperties();
+    }
 
-    void LuaText::setProperties(sol::object props)
+    void LuaText::setCaption(const MyGUI::UString& caption)
     {
-        setCaption(parseProperty(props, "caption", std::string()));
-        mAutoSized = parseProperty(props, "autoSize", true);
-        WidgetExtension::setProperties(props);
+        MyGUI::TextBox::setCaption(caption);
+        if (mAutoSized)
+            updateCoord();
     }
 
     MyGUI::IntSize LuaText::calculateSize()
diff --git a/components/lua_ui/text.hpp b/components/lua_ui/text.hpp
index 533dc4f453..c435f6687a 100644
--- a/components/lua_ui/text.hpp
+++ b/components/lua_ui/text.hpp
@@ -13,7 +13,8 @@ namespace LuaUi
 
         public:
             LuaText();
-            virtual void setProperties(sol::object) override;
+            virtual void updateProperties() override;
+            void setCaption(const MyGUI::UString& caption) override;
 
         private:
             bool mAutoSized;
diff --git a/components/lua_ui/textedit.cpp b/components/lua_ui/textedit.cpp
index 9cdc716ce4..5fbdf3e6d8 100644
--- a/components/lua_ui/textedit.cpp
+++ b/components/lua_ui/textedit.cpp
@@ -2,9 +2,10 @@
 
 namespace LuaUi
 {
-    void LuaTextEdit::setProperties(sol::object props)
+    void LuaTextEdit::updateProperties()
     {
-        setCaption(parseProperty(props, "caption", std::string()));
-        WidgetExtension::setProperties(props);
+        setCaption(propertyValue("caption", std::string()));
+
+        WidgetExtension::updateProperties();
     }
 }
diff --git a/components/lua_ui/textedit.hpp b/components/lua_ui/textedit.hpp
index d14f54d659..dfc649994a 100644
--- a/components/lua_ui/textedit.hpp
+++ b/components/lua_ui/textedit.hpp
@@ -11,7 +11,7 @@ namespace LuaUi
     {
         MYGUI_RTTI_DERIVED(LuaTextEdit)
 
-        virtual void setProperties(sol::object) override;
+        virtual void updateProperties() override;
     };
 }
 
diff --git a/components/lua_ui/util.cpp b/components/lua_ui/util.cpp
index 8cadbc9cc2..1e13c97a80 100644
--- a/components/lua_ui/util.cpp
+++ b/components/lua_ui/util.cpp
@@ -6,6 +6,7 @@
 #include "text.hpp"
 #include "textedit.hpp"
 #include "window.hpp"
+#include "image.hpp"
 
 #include "element.hpp"
 
@@ -18,6 +19,8 @@ namespace LuaUi
         MyGUI::FactoryManager::getInstance().registerFactory<LuaText>("Widget");
         MyGUI::FactoryManager::getInstance().registerFactory<LuaTextEdit>("Widget");
         MyGUI::FactoryManager::getInstance().registerFactory<LuaWindow>("Widget");
+        MyGUI::FactoryManager::getInstance().registerFactory<LuaImage>("Widget");
+        MyGUI::FactoryManager::getInstance().registerFactory<LuaTileRect>("BasisSkin");
     }
 
     const std::unordered_map<std::string, std::string>& widgetTypeToName()
@@ -27,6 +30,7 @@ namespace LuaUi
             { "LuaText", "Text" },
             { "LuaTextEdit", "TextEdit" },
             { "LuaWindow", "Window" },
+            { "LuaImage", "Image" },
         };
         return types;
     }
diff --git a/components/lua_ui/widget.cpp b/components/lua_ui/widget.cpp
index 50c6a193e6..027adc44ca 100644
--- a/components/lua_ui/widget.cpp
+++ b/components/lua_ui/widget.cpp
@@ -16,22 +16,15 @@ namespace LuaUi
         , mAnchor()
         , mLua{ nullptr }
         , mWidget{ nullptr }
+        , mSlot(this)
         , mLayout{ sol::nil }
     {}
 
-    void WidgetExtension::triggerEvent(std::string_view name, const sol::object& argument = sol::nil) const
-    {
-        auto it = mCallbacks.find(name);
-        if (it != mCallbacks.end())
-            it->second(argument, mLayout);
-    }
-
     void WidgetExtension::initialize(lua_State* lua, MyGUI::Widget* self)
     {
         mLua = lua;
         mWidget = self;
-
-        mWidget->eventChangeCoord += MyGUI::newDelegate(this, &WidgetExtension::updateChildrenCoord);
+        updateTemplate();
 
         initialize();
     }
@@ -71,8 +64,56 @@ namespace LuaUi
         mWidget->eventKeySetFocus.clear();
         mWidget->eventKeyLostFocus.clear();
 
-        for (WidgetExtension* child : mContent)
-            child->deinitialize();
+        for (WidgetExtension* w : mChildren)
+            w->deinitialize();
+        for (WidgetExtension* w : mTemplateChildren)
+            w->deinitialize();
+    }
+
+    void WidgetExtension::attach(WidgetExtension* ext)
+    {
+        ext->widget()->attachToWidget(mSlot->widget());
+        ext->updateCoord();
+    }
+
+    WidgetExtension* WidgetExtension::findFirst(std::string_view flagName)
+    {
+        if (externalValue(flagName, false))
+            return this;
+        for (WidgetExtension* w : mChildren)
+        {
+            WidgetExtension* result = w->findFirst(flagName);
+            if (result != nullptr)
+                return result;
+        }
+        return nullptr;
+    }
+
+    void WidgetExtension::findAll(std::string_view flagName, std::vector<WidgetExtension*>& result)
+    {
+        if (externalValue(flagName, false))
+            result.push_back(this);
+        for (WidgetExtension* w : mChildren)
+            w->findAll(flagName, result);
+    }
+
+    WidgetExtension* WidgetExtension::findFirstInTemplates(std::string_view flagName)
+    {
+        for (WidgetExtension* w : mTemplateChildren)
+        {
+            WidgetExtension* result = w->findFirst(flagName);
+            if (result != nullptr)
+                return result;
+        }
+        return nullptr;
+    }
+
+    std::vector<WidgetExtension*> WidgetExtension::findAllInTemplates(std::string_view flagName)
+    {
+        std::vector<WidgetExtension*> result;
+        for (WidgetExtension* w : mTemplateChildren)
+            w->findAll(flagName, result);
+        return result;
     }
 
     sol::table WidgetExtension::makeTable() const
@@ -91,9 +132,9 @@ namespace LuaUi
 
     sol::object WidgetExtension::mouseEvent(int left, int top, MyGUI::MouseButton button = MyGUI::MouseButton::None) const
     {
-        auto position = osg::Vec2f(left, top);
-        auto absolutePosition = mWidget->getAbsolutePosition();
-        auto offset = position - osg::Vec2f(absolutePosition.left, absolutePosition.top);
+        osg::Vec2f position(left, top);
+        MyGUI::IntPoint absolutePosition = mWidget->getAbsolutePosition();
+        osg::Vec2f offset = position - osg::Vec2f(absolutePosition.left, absolutePosition.top);
         sol::table table = makeTable();
         table["position"] = position;
         table["offset"] = offset;
@@ -101,31 +142,36 @@ namespace LuaUi
         return table;
     }
 
-    void WidgetExtension::addChild(WidgetExtension* ext)
-    {
-        mContent.push_back(ext);
-    }
-
-    WidgetExtension* WidgetExtension::childAt(size_t index) const
+    void WidgetExtension::setChildren(const std::vector<WidgetExtension*>& children)
     {
-        return mContent.at(index);
+        mChildren.resize(children.size());
+        for (size_t i = 0; i < children.size(); ++i)
+        {
+            mChildren[i] = children[i];
+            attach(mChildren[i]);
+        }
     }
 
-    void WidgetExtension::assignChild(size_t index, WidgetExtension* ext)
+    void WidgetExtension::setTemplateChildren(const std::vector<WidgetExtension*>& children)
     {
-        if (mContent.size() <= index)
-            throw std::logic_error("Invalid widget child index");
-        mContent[index] = ext;
+        mTemplateChildren.resize(children.size());
+        for (size_t i = 0; i < children.size(); ++i)
+        {
+            mTemplateChildren[i] = children[i];
+            mTemplateChildren[i]->widget()->attachToWidget(mWidget);
+        }
+        updateTemplate();
     }
 
-    WidgetExtension* WidgetExtension::eraseChild(size_t index)
+    void WidgetExtension::updateTemplate()
     {
-        if (mContent.size() <= index)
-            throw std::logic_error("Invalid widget child index");
-        auto it = mContent.begin() + index;
-        WidgetExtension* ext = *it;
-        mContent.erase(it);
-        return ext;
+        WidgetExtension* oldSlot = mSlot;
+        mSlot = findFirstInTemplates("slot");
+        if (mSlot == nullptr)
+            mSlot = this;
+        if (mSlot != oldSlot)
+            for (WidgetExtension* w : mChildren)
+                attach(w);
     }
 
     void WidgetExtension::setCallback(const std::string& name, const LuaUtil::Callback& callback)
@@ -150,25 +196,39 @@ namespace LuaUi
 
     void WidgetExtension::updateCoord()
     {
-        mWidget->setCoord(calculateCoord());
+        MyGUI::IntCoord oldCoord = mWidget->getCoord();
+        MyGUI::IntCoord newCoord = calculateCoord();
+
+        if (oldCoord != newCoord)
+            mWidget->setCoord(newCoord);
+        if (oldCoord.size() != newCoord.size())
+            updateChildrenCoord();
     }
 
     void WidgetExtension::setProperties(sol::object props)
     {
-        mAbsoluteCoord = parseProperty(props, "position", MyGUI::IntPoint());
-        mAbsoluteCoord = parseProperty(props, "size", MyGUI::IntSize());
-        mRelativeCoord = parseProperty(props, "relativePosition", MyGUI::FloatPoint());
-        mRelativeCoord = parseProperty(props, "relativeSize", MyGUI::FloatSize());
-        mAnchor = parseProperty(props, "anchor", MyGUI::FloatSize());
-        mWidget->setVisible(parseProperty(props, "visible", true));
-
+        mProperties = props;
+        updateProperties();
         updateCoord();
     }
 
-    void WidgetExtension::updateChildrenCoord(MyGUI::Widget* _widget)
+    void WidgetExtension::updateProperties()
+    {
+        mAbsoluteCoord = propertyValue("position", MyGUI::IntPoint());
+        mAbsoluteCoord = propertyValue("size", MyGUI::IntSize());
+        mRelativeCoord = propertyValue("relativePosition", MyGUI::FloatPoint());
+        mRelativeCoord = propertyValue("relativeSize", MyGUI::FloatSize());
+        mAnchor = propertyValue("anchor", MyGUI::FloatSize());
+        mWidget->setVisible(propertyValue("visible", true));
+        mWidget->setPointer(propertyValue("pointer", std::string("arrow")));
+    }
+
+    void WidgetExtension::updateChildrenCoord()
     {
-        for (auto& child : mContent)
-            child->updateCoord();
+        for (WidgetExtension* w : mTemplateChildren)
+            w->updateCoord();
+        for (WidgetExtension* w : mChildren)
+            w->updateCoord();
     }
 
     MyGUI::IntSize WidgetExtension::calculateSize()
@@ -199,6 +259,13 @@ namespace LuaUi
         return newCoord;
     }
 
+    void WidgetExtension::triggerEvent(std::string_view name, const sol::object& argument = sol::nil) const
+    {
+        auto it = mCallbacks.find(name);
+        if (it != mCallbacks.end())
+            it->second(argument, mLayout);
+    }
+
     void WidgetExtension::keyPress(MyGUI::Widget*, MyGUI::KeyCode code, MyGUI::Char ch)
     {
         if (code == MyGUI::KeyCode::None)
diff --git a/components/lua_ui/widget.hpp b/components/lua_ui/widget.hpp
index f8ba105be5..4085963137 100644
--- a/components/lua_ui/widget.hpp
+++ b/components/lua_ui/widget.hpp
@@ -26,35 +26,57 @@ namespace LuaUi
         // must be called after before destroying the underlying MyGUI::Widget
         virtual void deinitialize();
 
-        void addChild(WidgetExtension* ext);
-        WidgetExtension* childAt(size_t index) const;
-        void assignChild(size_t index, WidgetExtension* ext);
-        WidgetExtension* eraseChild(size_t index);
-        size_t childCount() const { return mContent.size(); }
-
         MyGUI::Widget* widget() const { return mWidget; }
 
+        const std::vector<WidgetExtension*>& children() { return mChildren; }
+        void setChildren(const std::vector<WidgetExtension*>&);
+
+        const std::vector<WidgetExtension*>& templateChildren() { return mTemplateChildren; }
+        void setTemplateChildren(const std::vector<WidgetExtension*>&);
+
         void setCallback(const std::string&, const LuaUtil::Callback&);
         void clearCallbacks();
 
-        virtual void setProperties(sol::object);
+        void setProperties(sol::object);
+        void setTemplateProperties(sol::object props) { mTemplateProperties = props; }
+
+        void setExternal(sol::object external) { mExternal = external; }
 
         MyGUI::IntCoord forcedCoord();
         void setForcedCoord(const MyGUI::IntCoord& offset);
         void updateCoord();
 
+        const sol::table& getLayout() { return mLayout; }
         void setLayout(const sol::table& layout) { mLayout = layout; }
 
+        template <typename T>
+        T externalValue(std::string_view name, const T& defaultValue)
+        {
+            return parseExternal(mExternal, name, defaultValue);
+        }
+
     protected:
         virtual void initialize();
         sol::table makeTable() const;
         sol::object keyEvent(MyGUI::KeyCode) const;
         sol::object mouseEvent(int left, int top, MyGUI::MouseButton button) const;
-        
+
         virtual MyGUI::IntSize calculateSize();
         virtual MyGUI::IntPoint calculatePosition(const MyGUI::IntSize& size);
         MyGUI::IntCoord calculateCoord();
 
+        template<typename T>
+        T propertyValue(std::string_view name, const T& defaultValue)
+        {
+            return parseProperty(mProperties, mTemplateProperties, name, defaultValue);
+        }
+
+        WidgetExtension* findFirstInTemplates(std::string_view flagName);
+        std::vector<WidgetExtension*> findAllInTemplates(std::string_view flagName);
+
+        virtual void updateTemplate();
+        virtual void updateProperties();
+
         void triggerEvent(std::string_view name, const sol::object& argument) const;
 
         // offsets the position and size, used only in C++ widget code
@@ -71,12 +93,21 @@ namespace LuaUi
         // use lua_State* instead of sol::state_view because MyGUI requires a default constructor
         lua_State* mLua;
         MyGUI::Widget* mWidget;
-
-        std::vector<WidgetExtension*> mContent;
+        std::vector<WidgetExtension*> mChildren;
+        std::vector<WidgetExtension*> mTemplateChildren;
+        WidgetExtension* mSlot;
         std::map<std::string, LuaUtil::Callback, std::less<>> mCallbacks;
         sol::table mLayout;
+        sol::object mProperties;
+        sol::object mTemplateProperties;
+        sol::object mExternal;
+
+        void attach(WidgetExtension* ext);
+
+        WidgetExtension* findFirst(std::string_view name);
+        void findAll(std::string_view flagName, std::vector<WidgetExtension*>& result);
 
-        void updateChildrenCoord(MyGUI::Widget*);
+        void updateChildrenCoord();
 
         void keyPress(MyGUI::Widget*, MyGUI::KeyCode, MyGUI::Char);
         void keyRelease(MyGUI::Widget*, MyGUI::KeyCode);
diff --git a/components/lua_ui/window.cpp b/components/lua_ui/window.cpp
index 5d34bf8212..6e6b80bf22 100644
--- a/components/lua_ui/window.cpp
+++ b/components/lua_ui/window.cpp
@@ -11,46 +11,40 @@ namespace LuaUi
         , mMoveResize()
     {}
 
-    void LuaWindow::initialize()
+    void LuaWindow::updateTemplate()
     {
-        WidgetExtension::initialize();
-
-        assignWidget(mCaption, "Caption");
-        if (mCaption)
+        for (auto& [w, _] : mActionWidgets)
         {
-            mCaption->eventMouseButtonPressed += MyGUI::newDelegate(this, &LuaWindow::notifyMousePress);
-            mCaption->eventMouseDrag += MyGUI::newDelegate(this, &LuaWindow::notifyMouseDrag);
-        }
-        for (auto w : getSkinWidgetsByName("Action"))
-        {
-            w->eventMouseButtonPressed += MyGUI::newDelegate(this, &LuaWindow::notifyMousePress);
-            w->eventMouseDrag += MyGUI::newDelegate(this, &LuaWindow::notifyMouseDrag);
+            w->eventMouseButtonPressed.clear();
+            w->eventMouseDrag.m_event.clear();
         }
-    }
+        mActionWidgets.clear();
 
-    void LuaWindow::deinitialize()
-    {
-        WidgetExtension::deinitialize();
+        WidgetExtension* captionWidget = findFirstInTemplates("caption");
+        mCaption = dynamic_cast<LuaText*>(captionWidget);
 
         if (mCaption)
+            mActionWidgets.emplace(mCaption->widget(), mCaption);
+        for (WidgetExtension* ext : findAllInTemplates("action"))
+            mActionWidgets.emplace(ext->widget(), ext);
+
+        for (auto& [w, _] : mActionWidgets)
         {
-            mCaption->eventMouseButtonPressed.clear();
-            mCaption->eventMouseDrag.m_event.clear();
-        }
-        for (auto w : getSkinWidgetsByName("Action"))
-        {
-            w->eventMouseButtonPressed.clear();
-            w->eventMouseDrag.m_event.clear();
+            w->eventMouseButtonPressed += MyGUI::newDelegate(this, &LuaWindow::notifyMousePress);
+            w->eventMouseDrag += MyGUI::newDelegate(this, &LuaWindow::notifyMouseDrag);
         }
+
+        WidgetExtension::updateTemplate();
     }
 
-    void LuaWindow::setProperties(sol::object props)
+    void LuaWindow::updateProperties()
     {
         if (mCaption)
-            mCaption->setCaption(parseProperty(props, "caption", std::string()));
+            mCaption->setCaption(propertyValue("caption", std::string()));
         mMoveResize = MyGUI::IntCoord();
         setForcedCoord(mMoveResize);
-        WidgetExtension::setProperties(props);
+
+        WidgetExtension::updateProperties();
     }
 
     void LuaWindow::notifyMousePress(MyGUI::Widget* sender, int left, int top, MyGUI::MouseButton id)
@@ -61,10 +55,11 @@ namespace LuaUi
         mPreviousMouse.left = left;
         mPreviousMouse.top = top;
 
-        if (sender->isUserString("Scale"))
-            mChangeScale = MyGUI::IntCoord::parse(sender->getUserString("Scale"));
-        else
-            mChangeScale = MyGUI::IntCoord(1, 1, 0, 0);
+        WidgetExtension* ext = mActionWidgets[sender];
+
+        mChangeScale = MyGUI::IntCoord(
+            ext->externalValue("move", MyGUI::IntPoint(1, 1)),
+            ext->externalValue("resize", MyGUI::IntSize(0, 0)));
     }
 
     void LuaWindow::notifyMouseDrag(MyGUI::Widget* sender, int left, int top, MyGUI::MouseButton id)
diff --git a/components/lua_ui/window.hpp b/components/lua_ui/window.hpp
index f34779c8f7..be3b3e2c23 100644
--- a/components/lua_ui/window.hpp
+++ b/components/lua_ui/window.hpp
@@ -3,9 +3,8 @@
 
 #include <optional>
 
-#include <MyGUI_TextBox.h>
-
 #include "widget.hpp"
+#include "text.hpp"
 
 namespace LuaUi
 {
@@ -15,20 +14,18 @@ namespace LuaUi
 
         public:
             LuaWindow();
-            virtual void setProperties(sol::object) override;
+            virtual void updateTemplate() override;
+            virtual void updateProperties() override;
 
         private:
-            // \todo replace with LuaText when skins are properly implemented
-            MyGUI::TextBox* mCaption;
+            LuaText* mCaption;
+            std::map<MyGUI::Widget*, WidgetExtension*> mActionWidgets;
             MyGUI::IntPoint mPreviousMouse;
             MyGUI::IntCoord mChangeScale;
 
             MyGUI::IntCoord mMoveResize;
 
         protected:
-            virtual void initialize() override;
-            virtual void deinitialize() override;
-
             void notifyMousePress(MyGUI::Widget*, int, int, MyGUI::MouseButton);
             void notifyMouseDrag(MyGUI::Widget*, int, int, MyGUI::MouseButton);
     };
diff --git a/docs/source/reference/lua-scripting/user_interface.rst b/docs/source/reference/lua-scripting/user_interface.rst
index 73ca57d1a7..13420d318c 100644
--- a/docs/source/reference/lua-scripting/user_interface.rst
+++ b/docs/source/reference/lua-scripting/user_interface.rst
@@ -22,7 +22,9 @@ Every widget is defined by a layout, which is a Lua table with the following fie
 4. `content`: a Content (`openmw.ui.content`), which contains layouts for the children of this widget.
 5. | `name`: an arbitrary string, the only limitatiion is it being unique within a `Content`.
    | Helpful for navigatilng through the layouts.
-6. `layer`: only applies for the root widget. 
+6. `layer`: only applies for the root widget. (Windows, HUD, etc)
+7. `template`: a Lua table which pre-defines a layout for this widget. See Templates below for more details.
+8. `external`: similar to properties, but they affect how other widgets interact with this one. See the widget pages for details.
 
 Layers
 ------
@@ -57,7 +59,14 @@ A container holding all the widget's children. It has a few important difference
    | While there is nothing preventing you from changing the `name` of a table inside a content, it is not supported, and will lead to undefined behaviour.
    | If you have to change the name, assign a new table to the index instead.
 
-.. TODO: Talk about skins/templates here when they are ready
+Templates
+---------
+
+Templates are Lua tables with the following (optional) fields:
+
+1. `props`: Same as in layouts, defines the behaviour of this widget. Can be overwritten by `props` values in the layout.
+2. | `content`: Extra children to add to the widget. For example, the frame and caption for Window widgets.
+   | Contains normal layouts
 
 Events
 ------
@@ -97,7 +106,7 @@ Example
    local layout = {
       layers = 'Windows',
       type = ui.TYPE.Window,
-      skin = 'MW_Window', -- TODO: replace all skins here when they are properly implemented
+      template = { skin = 'MW_Window' }, -- TODO: replace all skins here when they are re-implemented in Lua
       props = {
          size = v2(200, 250),
          -- put the window in the middle of the screen
@@ -107,7 +116,7 @@ Example
       content = ui.content {
          {
             type = ui.TYPE.Text,
-            skin = 'SandText',
+            template = { skin = 'SandText' },
             props = {
                caption = 'Input password',
                relativePosition = v2(0.5, 0),
@@ -117,7 +126,7 @@ Example
          {
             name = 'input',
             type = ui.TYPE.TextEdit,
-            skin = "MW_TextEdit",
+            template = { skin = "MW_TextEdit" },
             props = {
                caption = '',
                relativePosition = v2(0.5, 0.5),
@@ -129,7 +138,7 @@ Example
          {
             name = 'submit',
             type = ui.TYPE.Text, -- TODO: replace with button when implemented
-            skin = "MW_Button",
+            template = { skin = "MW_Button" },
             props = {
                caption = 'Submit',
                -- position at the bottom
diff --git a/docs/source/reference/lua-scripting/widgets/widget.rst b/docs/source/reference/lua-scripting/widgets/widget.rst
index 49058ee278..36cc0917d9 100644
--- a/docs/source/reference/lua-scripting/widgets/widget.rst
+++ b/docs/source/reference/lua-scripting/widgets/widget.rst
@@ -33,6 +33,8 @@ Properties
     - boolean (true)
     - Defines if the widget is visible
 
+.. TODO: document the mouse pointer property, when API for reading / adding pointer types is available
+
 Events
 ------
 
@@ -75,3 +77,18 @@ Events
   * - textInput
     - string
     - Text input with this widget in focus
+
+External
+--------
+.. list-table::
+  :header-rows: 1
+  :widths: 20 20 60
+
+  * - name
+    - type (default value)
+    - description
+  * - slot
+    - bool (false)
+    - | Only applies for template content (ignored in layout content).
+      | If true, all the widgets defined in layout content will be rendered as children of this widget.
+      | Only one widget per template can have slot = true (others will be ignored).
\ No newline at end of file
diff --git a/files/mygui/core.skin b/files/mygui/core.skin
index ee9135554e..5cf02a99e5 100644
--- a/files/mygui/core.skin
+++ b/files/mygui/core.skin
@@ -15,4 +15,8 @@
     <Resource type="ResourceSkin" name="ImageBox" size="16 16">
         <BasisSkin type="MainSkin" offset="0 0 16 16"/>
     </Resource>
+
+    <Resource type="ResourceSkin" name="LuaImage">
+        <BasisSkin type="LuaTileRect"/>
+    </Resource>
 </MyGUI>

From 1832ed6a48204f414dc70347a2f5383d484ba599 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Fri, 28 Jan 2022 16:26:43 +0200
Subject: [PATCH 2002/2859] Use pop_back to shrink the stack

---
 components/interpreter/runtime.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/interpreter/runtime.cpp b/components/interpreter/runtime.cpp
index 1cb8f558c9..8170526f35 100644
--- a/components/interpreter/runtime.cpp
+++ b/components/interpreter/runtime.cpp
@@ -100,7 +100,7 @@ namespace Interpreter
         if (mStack.empty())
             throw std::runtime_error ("stack underflow");
 
-        mStack.resize (mStack.size()-1);
+        mStack.pop_back();
     }
 
     Data& Runtime::operator[] (int Index)

From 45db56b382bf1a4abfafca2bb0f48efad5f4340f Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 27 Jan 2022 23:53:09 +0100
Subject: [PATCH 2003/2859] Rework fixed string

* Avoid inheritance.
* Define equality operators out of the class definition.
* Replace toString with toStringView where it doesn't make sense to create a string.
---
 apps/essimporter/importsplm.h                 |   2 +-
 apps/opencs/model/world/refidadapterimp.hpp   |  10 +-
 apps/openmw/mwmechanics/aiactivate.cpp        |   2 +-
 apps/openmw/mwmechanics/aiactivate.hpp        |   3 +-
 apps/openmw/mwmechanics/aiescort.cpp          |   8 +-
 apps/openmw/mwmechanics/aiescort.hpp          |   5 +-
 apps/openmw/mwmechanics/aifollow.cpp          |   8 +-
 apps/openmw/mwmechanics/aifollow.hpp          |   5 +-
 apps/openmw/mwmechanics/aisequence.cpp        |   6 +-
 apps/openmw/mwstate/statemanagerimp.cpp       |   2 +-
 .../esm/test_fixed_string.cpp                 |   2 +-
 components/esm/esmcommon.hpp                  | 167 ++++++++----------
 components/esm3/esmreader.cpp                 |  12 +-
 components/esm3/loadscpt.cpp                  |   4 +-
 14 files changed, 117 insertions(+), 119 deletions(-)

diff --git a/apps/essimporter/importsplm.h b/apps/essimporter/importsplm.h
index 8fd5c2bb52..1fc118a8f5 100644
--- a/apps/essimporter/importsplm.h
+++ b/apps/essimporter/importsplm.h
@@ -41,7 +41,7 @@ struct SPLM
     {
         int mUnknown;
         unsigned char mUnknown2;
-        ESM::FIXED_STRING<35> mItemId; // disintegrated item / bound item / item to re-equip after expiration
+        ESM::FixedString<35> mItemId; // disintegrated item / bound item / item to re-equip after expiration
     };
 
     struct CNAM // 36 bytes
diff --git a/apps/opencs/model/world/refidadapterimp.hpp b/apps/opencs/model/world/refidadapterimp.hpp
index 55668d16d8..41de82a0ef 100644
--- a/apps/opencs/model/world/refidadapterimp.hpp
+++ b/apps/opencs/model/world/refidadapterimp.hpp
@@ -1913,14 +1913,20 @@ namespace CSMWorld
                     break; // always save
                 case 13: // NAME32
                     if (content.mType == ESM::AI_Activate)
-                        content.mActivate.mName.assign(value.toString().toUtf8().constData());
+                    {
+                        const QByteArray name = value.toString().toUtf8();
+                        content.mActivate.mName.assign(std::string_view(name.constData(), name.size()));
+                    }
                     else
                         return; // return without saving
 
                     break; // always save
                 case 14: // NAME32
                     if (content.mType == ESM::AI_Follow || content.mType == ESM::AI_Escort)
-                        content.mTarget.mId.assign(value.toString().toUtf8().constData());
+                    {
+                        const QByteArray id = value.toString().toUtf8();
+                        content.mTarget.mId.assign(std::string_view(id.constData(), id.size()));
+                    }
                     else
                         return; // return without saving
 
diff --git a/apps/openmw/mwmechanics/aiactivate.cpp b/apps/openmw/mwmechanics/aiactivate.cpp
index 59ad0c1ada..42cff3642e 100644
--- a/apps/openmw/mwmechanics/aiactivate.cpp
+++ b/apps/openmw/mwmechanics/aiactivate.cpp
@@ -13,7 +13,7 @@
 
 namespace MWMechanics
 {
-    AiActivate::AiActivate(const std::string &objectId, bool repeat)
+    AiActivate::AiActivate(std::string_view objectId, bool repeat)
         : TypedAiPackage<AiActivate>(repeat), mObjectId(objectId)
     {
     }
diff --git a/apps/openmw/mwmechanics/aiactivate.hpp b/apps/openmw/mwmechanics/aiactivate.hpp
index ad4d4e6064..eae5ec5b6b 100644
--- a/apps/openmw/mwmechanics/aiactivate.hpp
+++ b/apps/openmw/mwmechanics/aiactivate.hpp
@@ -4,6 +4,7 @@
 #include "typedaipackage.hpp"
 
 #include <string>
+#include <string_view>
 
 #include "pathfinding.hpp"
 
@@ -24,7 +25,7 @@ namespace MWMechanics
         public:
             /// Constructor
             /** \param objectId Reference to object to activate **/
-            explicit AiActivate(const std::string &objectId, bool repeat);
+            explicit AiActivate(std::string_view objectId, bool repeat);
 
             explicit AiActivate(const ESM::AiSequence::AiActivate* activate);
 
diff --git a/apps/openmw/mwmechanics/aiescort.cpp b/apps/openmw/mwmechanics/aiescort.cpp
index 97bb101f06..a1c0bd0471 100644
--- a/apps/openmw/mwmechanics/aiescort.cpp
+++ b/apps/openmw/mwmechanics/aiescort.cpp
@@ -20,20 +20,20 @@
 
 namespace MWMechanics
 {
-    AiEscort::AiEscort(const std::string &actorId, int duration, float x, float y, float z, bool repeat)
+    AiEscort::AiEscort(std::string_view actorId, int duration, float x, float y, float z, bool repeat)
     : TypedAiPackage<AiEscort>(repeat), mX(x), mY(y), mZ(z), mDuration(duration), mRemainingDuration(static_cast<float>(duration))
     , mCellX(std::numeric_limits<int>::max())
     , mCellY(std::numeric_limits<int>::max())
     {
-        mTargetActorRefId = actorId;
+        mTargetActorRefId = std::string(actorId);
     }
 
-    AiEscort::AiEscort(const std::string &actorId, const std::string &cellId, int duration, float x, float y, float z, bool repeat)
+    AiEscort::AiEscort(std::string_view actorId, std::string_view cellId, int duration, float x, float y, float z, bool repeat)
     : TypedAiPackage<AiEscort>(repeat), mCellId(cellId), mX(x), mY(y), mZ(z), mDuration(duration), mRemainingDuration(static_cast<float>(duration))
     , mCellX(std::numeric_limits<int>::max())
     , mCellY(std::numeric_limits<int>::max())
     {
-        mTargetActorRefId = actorId;
+        mTargetActorRefId = std::string(actorId);
     }
 
     AiEscort::AiEscort(const ESM::AiSequence::AiEscort *escort)
diff --git a/apps/openmw/mwmechanics/aiescort.hpp b/apps/openmw/mwmechanics/aiescort.hpp
index c49e227e09..0f601a29ed 100644
--- a/apps/openmw/mwmechanics/aiescort.hpp
+++ b/apps/openmw/mwmechanics/aiescort.hpp
@@ -4,6 +4,7 @@
 #include "typedaipackage.hpp"
 
 #include <string>
+#include <string_view>
 
 namespace ESM
 {
@@ -22,11 +23,11 @@ namespace MWMechanics
             /// Implementation of AiEscort
             /** The Actor will escort the specified actor to the world position x, y, z until they reach their position, or they run out of time
                 \implement AiEscort **/
-            AiEscort(const std::string &actorId, int duration, float x, float y, float z, bool repeat);
+            AiEscort(std::string_view actorId, int duration, float x, float y, float z, bool repeat);
             /// Implementation of AiEscortCell
             /** The Actor will escort the specified actor to the cell position x, y, z until they reach their position, or they run out of time
                 \implement AiEscortCell **/
-            AiEscort(const std::string &actorId, const std::string &cellId, int duration, float x, float y, float z, bool repeat);
+            AiEscort(std::string_view actorId, std::string_view cellId, int duration, float x, float y, float z, bool repeat);
 
             AiEscort(const ESM::AiSequence::AiEscort* escort);
 
diff --git a/apps/openmw/mwmechanics/aifollow.cpp b/apps/openmw/mwmechanics/aifollow.cpp
index b6e1b124c6..cdb8ac8c1d 100644
--- a/apps/openmw/mwmechanics/aifollow.cpp
+++ b/apps/openmw/mwmechanics/aifollow.cpp
@@ -28,18 +28,18 @@ namespace MWMechanics
 {
 int AiFollow::mFollowIndexCounter = 0;
 
-AiFollow::AiFollow(const std::string &actorId, float duration, float x, float y, float z, bool repeat)
+AiFollow::AiFollow(std::string_view actorId, float duration, float x, float y, float z, bool repeat)
 : TypedAiPackage<AiFollow>(repeat), mAlwaysFollow(false), mDuration(duration), mRemainingDuration(duration), mX(x), mY(y), mZ(z)
 , mCellId(""), mActive(false), mFollowIndex(mFollowIndexCounter++)
 {
-    mTargetActorRefId = actorId;
+    mTargetActorRefId = std::string(actorId);
 }
 
-AiFollow::AiFollow(const std::string &actorId, const std::string &cellId, float duration, float x, float y, float z, bool repeat)
+AiFollow::AiFollow(std::string_view actorId, std::string_view cellId, float duration, float x, float y, float z, bool repeat)
 : TypedAiPackage<AiFollow>(repeat), mAlwaysFollow(false), mDuration(duration), mRemainingDuration(duration), mX(x), mY(y), mZ(z)
 , mCellId(cellId), mActive(false), mFollowIndex(mFollowIndexCounter++)
 {
-    mTargetActorRefId = actorId;
+    mTargetActorRefId = std::string(actorId);
 }
 
 AiFollow::AiFollow(const MWWorld::Ptr& actor, bool commanded)
diff --git a/apps/openmw/mwmechanics/aifollow.hpp b/apps/openmw/mwmechanics/aifollow.hpp
index 1b7ab7a632..c57d6da483 100644
--- a/apps/openmw/mwmechanics/aifollow.hpp
+++ b/apps/openmw/mwmechanics/aifollow.hpp
@@ -4,6 +4,7 @@
 #include "typedaipackage.hpp"
 
 #include <string>
+#include <string_view>
 
 #include <components/esm/defs.hpp>
 
@@ -38,9 +39,9 @@ namespace MWMechanics
     {
         public:
             /// Follow Actor for duration or until you arrive at a world position
-            AiFollow(const std::string &actorId, float duration, float x, float y, float z, bool repeat);
+            AiFollow(std::string_view actorId, float duration, float x, float y, float z, bool repeat);
             /// Follow Actor for duration or until you arrive at a position in a cell
-            AiFollow(const std::string &actorId, const std::string &CellId, float duration, float x, float y, float z, bool repeat);
+            AiFollow(std::string_view actorId, std::string_view cellId, float duration, float x, float y, float z, bool repeat);
             /// Follow Actor indefinitively
             AiFollow(const MWWorld::Ptr& actor, bool commanded=false);
 
diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index 2cb18f1e78..b9efcb1cde 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -428,7 +428,7 @@ void AiSequence::fill(const ESM::AIPackageList &list)
         else if (esmPackage.mType == ESM::AI_Escort)
         {
             ESM::AITarget data = esmPackage.mTarget;
-            package = std::make_unique<MWMechanics::AiEscort>(data.mId.toString(), data.mDuration, data.mX, data.mY, data.mZ, data.mShouldRepeat != 0);
+            package = std::make_unique<MWMechanics::AiEscort>(data.mId.toStringView(), data.mDuration, data.mX, data.mY, data.mZ, data.mShouldRepeat != 0);
         }
         else if (esmPackage.mType == ESM::AI_Travel)
         {
@@ -438,12 +438,12 @@ void AiSequence::fill(const ESM::AIPackageList &list)
         else if (esmPackage.mType == ESM::AI_Activate)
         {
             ESM::AIActivate data = esmPackage.mActivate;
-            package = std::make_unique<MWMechanics::AiActivate>(data.mName.toString(), data.mShouldRepeat != 0);
+            package = std::make_unique<MWMechanics::AiActivate>(data.mName.toStringView(), data.mShouldRepeat != 0);
         }
         else //if (esmPackage.mType == ESM::AI_Follow)
         {
             ESM::AITarget data = esmPackage.mTarget;
-            package = std::make_unique<MWMechanics::AiFollow>(data.mId.toString(), data.mDuration, data.mX, data.mY, data.mZ, data.mShouldRepeat != 0);
+            package = std::make_unique<MWMechanics::AiFollow>(data.mId.toStringView(), data.mDuration, data.mX, data.mY, data.mZ, data.mShouldRepeat != 0);
         }
         mPackages.push_back(std::move(package));
     }
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index db7ca19ff8..3b459ec2ce 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -494,7 +494,7 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
                 default:
 
                     // ignore invalid records
-                    Log(Debug::Warning) << "Warning: Ignoring unknown record: " << n.toString();
+                    Log(Debug::Warning) << "Warning: Ignoring unknown record: " << n.toStringView();
                     reader.skipRecord();
             }
             int progressPercent = static_cast<int>(float(reader.getFileOffset())/total*100);
diff --git a/apps/openmw_test_suite/esm/test_fixed_string.cpp b/apps/openmw_test_suite/esm/test_fixed_string.cpp
index b59f19e7bb..26fb1590d5 100644
--- a/apps/openmw_test_suite/esm/test_fixed_string.cpp
+++ b/apps/openmw_test_suite/esm/test_fixed_string.cpp
@@ -123,7 +123,7 @@ TEST(EsmFixedString, assign_should_only_truncate_for_4)
 
 TEST(EsmFixedString, assign_should_truncate_and_set_last_element_to_zero)
 {
-    ESM::FIXED_STRING<17> value;
+    ESM::FixedString<17> value;
     value.assign(std::string(20, 'a'));
     EXPECT_EQ(value, std::string(16, 'a'));
 }
diff --git a/components/esm/esmcommon.hpp b/components/esm/esmcommon.hpp
index 7caaae2afb..921eeed744 100644
--- a/components/esm/esmcommon.hpp
+++ b/components/esm/esmcommon.hpp
@@ -1,12 +1,11 @@
 #ifndef OPENMW_ESM_COMMON_H
 #define OPENMW_ESM_COMMON_H
 
-#include <algorithm>
 #include <string>
 #include <cstring>
 #include <vector>
-
-#include <stdint.h>
+#include <string_view>
+#include <cstdint>
 
 namespace ESM
 {
@@ -22,120 +21,110 @@ enum RecordFlag
     FLAG_Blocked    = 0x00002000
   };
 
-// CRTP for FIXED_STRING class, a structure used for holding fixed-length strings
-template< template<size_t> class DERIVED, size_t SIZE>
-class FIXED_STRING_BASE
+template <std::size_t capacity>
+struct FixedString
 {
-    /* The following methods must be implemented in derived classes:
-     *   char const* ro_data() const; // return pointer to ro buffer
-     *   char*       rw_data();       // return pointer to rw buffer
-     */
-public:
-    enum { size = SIZE };
-
-    template<size_t OTHER_SIZE>
-    bool operator==(char const (&str)[OTHER_SIZE]) const
-    {
-        size_t other_len = strnlen(str, OTHER_SIZE);
-        if (other_len != this->length())
-            return false;
-        return std::strncmp(self()->ro_data(), str, size) == 0;
-    }
+    static_assert(capacity > 0);
 
-    //this operator will not be used for char[N], only for char*
-    template<typename T, typename = typename std::enable_if<std::is_same<T, char>::value>::type>
-    bool operator==(const T* const& str) const
-    {
-        char const* const data = self()->ro_data();
-        for(size_t i = 0; i < size; ++i)
-        {
-            if(data[i] != str[i]) return false;
-            else if(data[i] == '\0') return true;
-        }
-        return str[size] == '\0';
-    }
-    bool operator!=(const char* const str) const { return !( (*this) == str ); }
+    static constexpr std::size_t sCapacity = capacity;
+
+    char mData[capacity];
 
-    bool operator==(const std::string& str) const
+    std::string_view toStringView() const noexcept
     {
-        return (*this) == str.c_str();
+        return std::string_view(mData, strnlen(mData, capacity));
     }
-    bool operator!=(const std::string& str) const { return !( (*this) == str ); }
 
-    static size_t data_size() { return size; }
-    size_t length() const { return strnlen(self()->ro_data(), size); }
-    std::string toString() const { return std::string(self()->ro_data(), this->length()); }
-
-    void assign(const std::string& value)
+    std::string toString() const
     {
-        std::strncpy(self()->rw_data(), value.c_str(), size-1);
-        self()->rw_data()[size-1] = '\0';
+        return std::string(toStringView());
     }
 
-    void clear() { this->assign(""); }
-private:
-    DERIVED<size> const* self() const
+    std::uint32_t toInt() const noexcept
     {
-        return static_cast<DERIVED<size> const*>(this);
+        static_assert(capacity == sizeof(std::uint32_t));
+        std::uint32_t value;
+        std::memcpy(&value, mData, capacity);
+        return value;
     }
 
-    // write the non-const version in terms of the const version
-    // Effective C++ 3rd ed., Item 3 (p. 24-25)
-    DERIVED<size>* self()
+    void clear() noexcept
     {
-        return const_cast<DERIVED<size>*>(static_cast<FIXED_STRING_BASE const*>(this)->self());
+        std::memset(mData, 0, capacity);
     }
-};
 
-// Generic implementation
-template <size_t SIZE>
-struct FIXED_STRING : public FIXED_STRING_BASE<FIXED_STRING, SIZE>
-{
-    char data[SIZE];
-
-    char const* ro_data() const { return data; }
-    char*       rw_data() { return data; }
-};
+    void assign(std::string_view value) noexcept
+    {
+        if (value.empty())
+        {
+            clear();
+            return;
+        }
 
-// In the case of SIZE=4, it can be more efficient to match the string
-// as a 32 bit number, therefore the struct is implemented as a union with an int.
-template <>
-struct FIXED_STRING<4> : public FIXED_STRING_BASE<FIXED_STRING, 4>
-{
-    char data[4];
+        if (value.size() < capacity)
+        {
+            if constexpr (capacity == sizeof(std::uint32_t))
+                std::memset(mData, 0, capacity);
+            std::memcpy(mData, value.data(), value.size());
+            if constexpr (capacity != sizeof(std::uint32_t))
+                mData[value.size()] = '\0';
+            return;
+        }
 
-    using FIXED_STRING_BASE::operator==;
-    using FIXED_STRING_BASE::operator!=;
+        std::memcpy(mData, value.data(), capacity);
 
-    bool operator==(uint32_t v) const { return v == toInt(); }
-    bool operator!=(uint32_t v) const { return v != toInt(); }
+        if constexpr (capacity != sizeof(std::uint32_t))
+            mData[capacity - 1] = '\0';
+    }
 
-    FIXED_STRING<4>& operator=(std::uint32_t value)
+    FixedString& operator=(std::uint32_t value) noexcept
     {
-        std::memcpy(data, &value, sizeof(data));
+        static_assert(capacity == sizeof(value));
+        std::memcpy(&mData, &value, capacity);
         return *this;
     }
+};
 
-    void assign(const std::string& value)
+template <std::size_t capacity, class T, typename = std::enable_if_t<std::is_same_v<T, char>>>
+inline bool operator==(const FixedString<capacity>& lhs, const T* const& rhs) noexcept
+{
+    for (std::size_t i = 0; i < capacity; ++i)
     {
-        std::memset(data, 0, sizeof(data));
-        std::memcpy(data, value.data(), std::min(value.size(), sizeof(data)));
+        if (lhs.mData[i] != rhs[i])
+            return false;
+        if (lhs.mData[i] == '\0')
+            return true;
     }
+    return rhs[capacity] == '\0';
+}
 
-    char const* ro_data() const { return data; }
-    char*       rw_data() { return data; }
+template <std::size_t capacity>
+inline bool operator==(const FixedString<capacity>& lhs, const std::string& rhs) noexcept
+{
+    return lhs == rhs.c_str();
+}
 
-    std::uint32_t toInt() const
-    {
-        std::uint32_t value;
-        std::memcpy(&value, data, sizeof(data));
-        return value;
-    }
-};
+template <std::size_t capacity, std::size_t rhsSize>
+inline bool operator==(const FixedString<capacity>& lhs, const char (&rhs)[rhsSize]) noexcept
+{
+    return strnlen(rhs, rhsSize) == strnlen(lhs.mData, capacity)
+        && std::strncmp(lhs.mData, rhs, capacity) == 0;
+}
+
+inline bool operator==(const FixedString<4>& lhs, std::uint32_t rhs) noexcept
+{
+    return lhs.toInt() == rhs;
+}
+
+template <std::size_t capacity, class Rhs>
+inline bool operator!=(const FixedString<capacity>& lhs, const Rhs& rhs) noexcept
+{
+    return !(lhs == rhs);
+}
 
-typedef FIXED_STRING<4> NAME;
-typedef FIXED_STRING<32> NAME32;
-typedef FIXED_STRING<64> NAME64;
+using NAME = FixedString<4>;
+using NAME32 = FixedString<32>;
+using NAME64 = FixedString<64>;
 
 /* This struct defines a file 'context' which can be saved and later
    restored by an ESMReader instance. It will save the position within
diff --git a/components/esm3/esmreader.cpp b/components/esm3/esmreader.cpp
index 416e8a9be2..a10eba2378 100644
--- a/components/esm3/esmreader.cpp
+++ b/components/esm3/esmreader.cpp
@@ -208,9 +208,9 @@ void ESMReader::getSubName()
     }
 
     // reading the subrecord data anyway.
-    const int subNameSize = static_cast<int>(mCtx.subName.data_size());
-    getExact(mCtx.subName.rw_data(), subNameSize);
-    mCtx.leftRec -= static_cast<uint32_t>(subNameSize);
+    const std::size_t subNameSize = decltype(mCtx.subName)::sCapacity;
+    getExact(mCtx.subName.mData, static_cast<int>(subNameSize));
+    mCtx.leftRec -= static_cast<std::uint32_t>(subNameSize);
 }
 
 void ESMReader::skipHSub()
@@ -257,7 +257,7 @@ NAME ESMReader::getRecName()
     if (!hasMoreRecs())
         fail("No more records, getRecName() failed");
     getName(mCtx.recName);
-    mCtx.leftFile -= mCtx.recName.data_size();
+    mCtx.leftFile -= decltype(mCtx.recName)::sCapacity;
 
     // Make sure we don't carry over any old cached subrecord
     // names. This can happen in some cases when we skip parts of a
@@ -331,8 +331,8 @@ std::string ESMReader::getString(int size)
 
     ss << "ESM Error: " << msg;
     ss << "\n  File: " << mCtx.filename;
-    ss << "\n  Record: " << mCtx.recName.toString();
-    ss << "\n  Subrecord: " << mCtx.subName.toString();
+    ss << "\n  Record: " << mCtx.recName.toStringView();
+    ss << "\n  Subrecord: " << mCtx.subName.toStringView();
     if (mEsm.get())
         ss << "\n  Offset: 0x" << std::hex << mEsm->tellg();
     throw std::runtime_error(ss.str());
diff --git a/components/esm3/loadscpt.cpp b/components/esm3/loadscpt.cpp
index dfbcc1c7f1..a7e59f837e 100644
--- a/components/esm3/loadscpt.cpp
+++ b/components/esm3/loadscpt.cpp
@@ -47,7 +47,7 @@ namespace ESM
             std::stringstream ss;
             ss << "Malformed string table";
             ss << "\n  File: " << esm.getName();
-            ss << "\n  Record: " << esm.getContext().recName.toString();
+            ss << "\n  Record: " << esm.getContext().recName.toStringView();
             ss << "\n  Subrecord: " << "SCVR";
             ss << "\n  Offset: 0x" << std::hex << esm.getFileOffset();
             Log(Debug::Verbose) << ss.str();
@@ -68,7 +68,7 @@ namespace ESM
                     std::stringstream ss;
                     ss << "String table overflow";
                     ss << "\n  File: " << esm.getName();
-                    ss << "\n  Record: " << esm.getContext().recName.toString();
+                    ss << "\n  Record: " << esm.getContext().recName.toStringView();
                     ss << "\n  Subrecord: " << "SCVR";
                     ss << "\n  Offset: 0x" << std::hex << esm.getFileOffset();
                     Log(Debug::Verbose) << ss.str();

From 68ef96410cb6731131a82b6b0583ac30e6ffd9fc Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sat, 29 Jan 2022 02:32:58 +0100
Subject: [PATCH 2004/2859] Make ESM::Position not packed (should fix #6566)

---
 components/esm/defs.hpp         |  4 ----
 components/esm3/objectstate.cpp | 18 +++++++++++++++---
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/components/esm/defs.hpp b/components/esm/defs.hpp
index f87a67405b..a7d2f44dd7 100644
--- a/components/esm/defs.hpp
+++ b/components/esm/defs.hpp
@@ -41,9 +41,6 @@ enum RangeType
     RT_Target = 2
 };
 
-#pragma pack(push)
-#pragma pack(1)
-
 // Position and rotation
 struct Position
 {
@@ -68,7 +65,6 @@ struct Position
         return tuple(l) < tuple(r);
     }
 };
-#pragma pack(pop)
 
 bool inline operator== (const Position& left, const Position& right) noexcept
 {
diff --git a/components/esm3/objectstate.cpp b/components/esm3/objectstate.cpp
index 76967e497c..dd400c0024 100644
--- a/components/esm3/objectstate.cpp
+++ b/components/esm3/objectstate.cpp
@@ -28,8 +28,15 @@ void ESM::ObjectState::load (ESMReader &esm)
     mCount = 1;
     esm.getHNOT (mCount, "COUN");
 
-    mPosition = mRef.mPos;
-    esm.getHNOT (mPosition, "POS_", 24);
+    if(esm.isNextSub("POS_"))
+    {
+        std::array<float, 6> pos;
+        esm.getHT(pos);
+        memcpy(mPosition.pos, pos.data(), sizeof(float) * 3);
+        memcpy(mPosition.rot, pos.data() + 3, sizeof(float) * 3);
+    }
+    else
+        mPosition = mRef.mPos;
 
     if (esm.isNextSub("LROT"))
         esm.skipHSub(); // local rotation, no longer used
@@ -67,7 +74,12 @@ void ESM::ObjectState::save (ESMWriter &esm, bool inInventory) const
         esm.writeHNT ("COUN", mCount);
 
     if (!inInventory && mPosition != mRef.mPos)
-        esm.writeHNT ("POS_", mPosition, 24);
+    {
+        std::array<float, 6> pos;
+        memcpy(pos.data(), mPosition.pos, sizeof(float) * 3);
+        memcpy(pos.data() + 3, mPosition.rot, sizeof(float) * 3);
+        esm.writeHNT ("POS_", pos.data(), 24);
+    }
 
     if (mFlags != 0)
         esm.writeHNT ("FLAG", mFlags);

From ecbcdd0e5466b084487ae391cb8d1f28ade7a13e Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 29 Jan 2022 06:29:55 +0100
Subject: [PATCH 2005/2859] Add missing initialization

---
 components/files/configfileparser.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/files/configfileparser.cpp b/components/files/configfileparser.cpp
index 7fcc033157..3d8e06ebe7 100644
--- a/components/files/configfileparser.cpp
+++ b/components/files/configfileparser.cpp
@@ -91,7 +91,7 @@ namespace Files
             // Invariant: no element is prefix of other element.
             std::set<std::string> allowed_prefixes;
             std::string m_prefix;
-            bool m_allow_unregistered;
+            bool m_allow_unregistered = false;
         };
 
         common_config_file_iterator::common_config_file_iterator(

From 71fe57f7a52a0dd1ffdbada000536731f5a709da Mon Sep 17 00:00:00 2001
From: Timo Gurr <timo.gurr@gmail.com>
Date: Sat, 29 Jan 2022 12:57:04 +0000
Subject: [PATCH 2006/2859] cmake: Use GNUInstallDirs to install data
 directories

---
 CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75cc8ae10f..1e0c7f7d4b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,8 @@ cmake_minimum_required(VERSION 3.1.0)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
+include(GNUInstallDirs)
+
 # for link time optimization, remove if cmake version is >= 3.9
 if(POLICY CMP0069) # LTO
   cmake_policy(SET CMP0069 NEW)
@@ -186,7 +188,7 @@ elseif(UNIX)
     # Paths
     SET(BINDIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Where to install binaries")
     SET(LIBDIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "Where to install libraries")
-    SET(DATAROOTDIR "${CMAKE_INSTALL_PREFIX}/share" CACHE PATH "Sets the root of data directories to a non-default location")
+    SET(DATAROOTDIR "${CMAKE_INSTALL_DATAROOTDIR}" CACHE PATH "Sets the root of data directories to a non-default location")
     SET(GLOBAL_DATA_PATH "${DATAROOTDIR}/games/" CACHE PATH "Set data path prefix")
     SET(DATADIR "${GLOBAL_DATA_PATH}/openmw" CACHE PATH "Sets the openmw data directories to a non-default location")
     SET(ICONDIR "${DATAROOTDIR}/pixmaps" CACHE PATH "Set icon dir")

From 8b7ae9afd8ca7b253cb04dea0449d8b23117054e Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 29 Jan 2022 05:04:32 +0100
Subject: [PATCH 2007/2859] Fix use after free and possible deadlock on exit

Lock Simulation weak_ptr in all visitors to avoid use after free.

And swap order for weak_ptr locking with locking collision world mutex to avoid
deadlock when underlying object tries to lock the same mutex in the destructor.

Add SimulationImpl type to avoid use of FrameData without locking weak_ptr.
---
 apps/openmw/mwphysics/mtphysics.cpp     | 99 ++++++++++++++++---------
 apps/openmw/mwphysics/physicssystem.hpp | 24 +++++-
 2 files changed, 84 insertions(+), 39 deletions(-)

diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 2bbd751f63..7de197a32a 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -1,3 +1,5 @@
+#include <functional>
+
 #include <BulletCollision/BroadphaseCollision/btDbvtBroadphase.h>
 #include <BulletCollision/CollisionShapes/btCollisionShape.h>
 
@@ -111,17 +113,49 @@ namespace
         return ptr.getPosition() * interpolationFactor + ptr.getPreviousPosition() * (1.f - interpolationFactor);
     }
 
+    using LockedActorSimulation = std::pair<
+        std::shared_ptr<MWPhysics::Actor>,
+        std::reference_wrapper<MWPhysics::ActorFrameData>
+    >;
+    using LockedProjectileSimulation = std::pair<
+        std::shared_ptr<MWPhysics::Projectile>,
+        std::reference_wrapper<MWPhysics::ProjectileFrameData>
+    >;
+
     namespace Visitors
     {
+        template <class Impl, template <class> class Lock>
+        struct WithLockedPtr
+        {
+            const Impl& mImpl;
+            std::shared_mutex& mCollisionWorldMutex;
+            const int mNumJobs;
+
+            template <class Ptr, class FrameData>
+            void operator()(MWPhysics::SimulationImpl<Ptr, FrameData>& sim) const
+            {
+                auto locked = sim.lock();
+                if (!locked.has_value())
+                    return;
+                auto&& [ptr, frameData] = *std::move(locked);
+                // Locked shared_ptr has to be destructed after releasing mCollisionWorldMutex to avoid
+                // possible deadlock. Ptr destructor also acquires mCollisionWorldMutex.
+                const std::pair arg(std::move(ptr), frameData);
+                const Lock<std::shared_mutex> lock(mCollisionWorldMutex, mNumJobs);
+                mImpl(arg);
+            }
+        };
+
         struct InitPosition
         {
             const btCollisionWorld* mCollisionWorld;
             void operator()(MWPhysics::ActorSimulation& sim) const
             {
-                auto& [actorPtr, frameData] = sim;
-                const auto actor = actorPtr.lock();
-                if (actor == nullptr)
+                auto locked = sim.lock();
+                if (!locked.has_value())
                     return;
+                auto& [actor, frameDataRef] = *locked;
+                auto& frameData = frameDataRef.get();
                 actor->applyOffsetChange();
                 frameData.mPosition = actor->getPosition();
                 if (frameData.mWaterCollision && frameData.mPosition.z() < frameData.mWaterlevel && actor->canMoveToWaterSurface(frameData.mWaterlevel, mCollisionWorld))
@@ -138,7 +172,7 @@ namespace
                 frameData.mStuckFrames = actor->getStuckFrames();
                 frameData.mLastStuckPosition = actor->getLastStuckPosition();
             }
-            void operator()(MWPhysics::ProjectileSimulation& sim) const
+            void operator()(MWPhysics::ProjectileSimulation& /*sim*/) const
             {
             }
         };
@@ -146,11 +180,11 @@ namespace
         struct PreStep
         {
             btCollisionWorld* mCollisionWorld;
-            void operator()(MWPhysics::ActorSimulation& sim) const
+            void operator()(const LockedActorSimulation& sim) const
             {
                 MWPhysics::MovementSolver::unstuck(sim.second, mCollisionWorld);
             }
-            void operator()(MWPhysics::ProjectileSimulation& sim) const
+            void operator()(const LockedProjectileSimulation& /*sim*/) const
             {
             }
         };
@@ -158,12 +192,10 @@ namespace
         struct UpdatePosition
         {
             btCollisionWorld* mCollisionWorld;
-            void operator()(MWPhysics::ActorSimulation& sim) const
+            void operator()(const LockedActorSimulation& sim) const
             {
-                auto& [actorPtr, frameData] = sim;
-                const auto actor = actorPtr.lock();
-                if (actor == nullptr)
-                    return;
+                auto& [actor, frameDataRef] = sim;
+                auto& frameData = frameDataRef.get();
                 if (actor->setPosition(frameData.mPosition))
                 {
                     frameData.mPosition = actor->getPosition(); // account for potential position change made by script
@@ -171,12 +203,10 @@ namespace
                     mCollisionWorld->updateSingleAabb(actor->getCollisionObject());
                 }
             }
-            void operator()(MWPhysics::ProjectileSimulation& sim) const
+            void operator()(const LockedProjectileSimulation& sim) const
             {
-                auto& [projPtr, frameData] = sim;
-                const auto proj = projPtr.lock();
-                if (proj == nullptr)
-                    return;
+                auto& [proj, frameDataRef] = sim;
+                auto& frameData = frameDataRef.get();
                 proj->setPosition(frameData.mPosition);
                 proj->updateCollisionObjectPosition();
                 mCollisionWorld->updateSingleAabb(proj->getCollisionObject());
@@ -188,11 +218,11 @@ namespace
             const float mPhysicsDt;
             const btCollisionWorld* mCollisionWorld;
             const MWPhysics::WorldFrameData& mWorldFrameData;
-            void operator()(MWPhysics::ActorSimulation& sim) const
+            void operator()(const LockedActorSimulation& sim) const
             {
                 MWPhysics::MovementSolver::move(sim.second, mPhysicsDt, mCollisionWorld, mWorldFrameData);
             }
-            void operator()(MWPhysics::ProjectileSimulation& sim) const
+            void operator()(const LockedProjectileSimulation& sim) const
             {
                 MWPhysics::MovementSolver::move(sim.second, mPhysicsDt, mCollisionWorld);
             }
@@ -206,10 +236,11 @@ namespace
             const MWPhysics::PhysicsTaskScheduler* scheduler;
             void operator()(MWPhysics::ActorSimulation& sim) const
             {
-                auto& [actorPtr, frameData] = sim;
-                const auto actor = actorPtr.lock();
-                if (actor == nullptr)
+                auto locked = sim.lock();
+                if (!locked.has_value())
                     return;
+                auto& [actor, frameDataRef] = *locked;
+                auto& frameData = frameDataRef.get();
                 auto ptr = actor->getPtr();
 
                 MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
@@ -241,10 +272,10 @@ namespace
             }
             void operator()(MWPhysics::ProjectileSimulation& sim) const
             {
-                auto& [projPtr, frameData] = sim;
-                const auto proj = projPtr.lock();
-                if (proj == nullptr)
+                auto locked = sim.lock();
+                if (!locked.has_value())
                     return;
+                auto& [proj, frameData] = *locked;
                 proj->setSimulationPosition(::interpolateMovements(*proj, mTimeAccum, mPhysicsDt));
             }
         };
@@ -612,12 +643,10 @@ namespace MWPhysics
 
     void PhysicsTaskScheduler::updateActorsPositions()
     {
-        const Visitors::UpdatePosition vis{mCollisionWorld};
-        for (auto& sim : mSimulations)
-        {
-            MaybeExclusiveLock lock(mCollisionWorldMutex, mNumThreads);
+        const Visitors::UpdatePosition impl{mCollisionWorld};
+        const Visitors::WithLockedPtr<Visitors::UpdatePosition, MaybeExclusiveLock> vis{impl, mCollisionWorldMutex, mNumThreads};
+        for (Simulation& sim : mSimulations)
             std::visit(vis, sim);
-        }
     }
 
     bool PhysicsTaskScheduler::hasLineOfSight(const Actor* actor1, const Actor* actor2)
@@ -641,12 +670,10 @@ namespace MWPhysics
         {
             mPreStepBarrier->wait([this] { afterPreStep(); });
             int job = 0;
-            const Visitors::Move vis{mPhysicsDt, mCollisionWorld, *mWorldFrameData};
+            const Visitors::Move impl{mPhysicsDt, mCollisionWorld, *mWorldFrameData};
+            const Visitors::WithLockedPtr<Visitors::Move, MaybeLock> vis{impl, mCollisionWorldMutex, mNumThreads};
             while ((job = mNextJob.fetch_add(1, std::memory_order_relaxed)) < mNumJobs)
-            {
-                MaybeLock lockColWorld(mCollisionWorldMutex, mNumThreads);
                 std::visit(vis, mSimulations[job]);
-            }
 
             mPostStepBarrier->wait([this] { afterPostStep(); });
         }
@@ -697,12 +724,10 @@ namespace MWPhysics
         updateAabbs();
         if (!mRemainingSteps)
             return;
-        const Visitors::PreStep vis{mCollisionWorld};
+        const Visitors::PreStep impl{mCollisionWorld};
+        const Visitors::WithLockedPtr<Visitors::PreStep, MaybeExclusiveLock> vis{impl, mCollisionWorldMutex, mNumThreads};
         for (auto& sim : mSimulations)
-        {
-            MaybeExclusiveLock lock(mCollisionWorldMutex, mNumThreads);
             std::visit(vis, sim);
-        }
     }
 
     void PhysicsTaskScheduler::afterPostStep()
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index d2b535c427..1606ac084c 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -8,6 +8,8 @@
 #include <unordered_map>
 #include <algorithm>
 #include <variant>
+#include <optional>
+#include <functional>
 
 #include <osg/Quat>
 #include <osg/BoundingBox>
@@ -117,8 +119,26 @@ namespace MWPhysics
         osg::Vec3f mStormDirection;
     };
 
-    using ActorSimulation = std::pair<std::weak_ptr<Actor>, ActorFrameData>;
-    using ProjectileSimulation = std::pair<std::weak_ptr<Projectile>, ProjectileFrameData>;
+    template <class Ptr, class FrameData>
+    class SimulationImpl
+    {
+        public:
+            explicit SimulationImpl(const std::weak_ptr<Ptr>& ptr, FrameData&& data) : mPtr(ptr), mData(data) {}
+
+            std::optional<std::pair<std::shared_ptr<Ptr>, std::reference_wrapper<FrameData>>> lock()
+            {
+                if (auto locked = mPtr.lock())
+                    return {{std::move(locked), std::ref(mData)}};
+                return std::nullopt;
+            }
+
+        private:
+            std::weak_ptr<Ptr> mPtr;
+            FrameData mData;
+    };
+
+    using ActorSimulation = SimulationImpl<Actor, ActorFrameData>;
+    using ProjectileSimulation = SimulationImpl<Projectile, ProjectileFrameData>;
     using Simulation = std::variant<ActorSimulation, ProjectileSimulation>;
 
     class PhysicsSystem : public RayCastingInterface

From 79dc600dae5cee3f1f4d20ddc4939f453a45c187 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 27 Jan 2022 19:56:27 +0100
Subject: [PATCH 2008/2859] Uncap attribute and skill damage for drain and
 absorb effects

---
 apps/openmw/mwmechanics/spelleffects.cpp | 4 ++++
 apps/openmw/mwmechanics/stat.cpp         | 7 +------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp
index 95ed3ca06e..d0584791a5 100644
--- a/apps/openmw/mwmechanics/spelleffects.cpp
+++ b/apps/openmw/mwmechanics/spelleffects.cpp
@@ -74,6 +74,8 @@ namespace
     {
         auto& creatureStats = target.getClass().getCreatureStats(target);
         auto attr = creatureStats.getAttribute(effect.mArg);
+        if(effect.mEffectId == ESM::MagicEffect::DamageAttribute)
+            magnitude = std::min(attr.getModified(), magnitude);
         attr.damage(magnitude);
         creatureStats.setAttribute(effect.mArg, attr);
     }
@@ -98,6 +100,8 @@ namespace
     {
         auto& npcStats = target.getClass().getNpcStats(target);
         auto& skill = npcStats.getSkill(effect.mArg);
+        if(effect.mEffectId == ESM::MagicEffect::DamageSkill)
+            magnitude = std::min(skill.getModified(), magnitude);
         skill.damage(magnitude);
     }
 
diff --git a/apps/openmw/mwmechanics/stat.cpp b/apps/openmw/mwmechanics/stat.cpp
index b5285330df..263c867aea 100644
--- a/apps/openmw/mwmechanics/stat.cpp
+++ b/apps/openmw/mwmechanics/stat.cpp
@@ -269,12 +269,7 @@ namespace MWMechanics
 
     void AttributeValue::damage(float damage)
     {
-        float threshold = mBase + mModifier;
-
-        if (mDamage + damage > threshold)
-            mDamage = threshold;
-        else
-            mDamage += damage;
+        mDamage += damage;
     }
     void AttributeValue::restore(float amount)
     {

From 07eb6db030116ee14335fdbb3743b4e471b1fa6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Sat, 29 Jan 2022 21:09:27 +0200
Subject: [PATCH 2009/2859] Use unique_ptr for ESM records

---
 apps/esmtool/esmtool.cpp | 16 +++----
 apps/esmtool/record.cpp  | 97 ++++++++++++++++++++--------------------
 apps/esmtool/record.hpp  |  3 +-
 3 files changed, 56 insertions(+), 60 deletions(-)

diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp
index aaa5e16be5..4fe0b248af 100644
--- a/apps/esmtool/esmtool.cpp
+++ b/apps/esmtool/esmtool.cpp
@@ -6,6 +6,7 @@
 #include <map>
 #include <fstream>
 #include <cmath>
+#include <memory>
 
 #include <boost/program_options.hpp>
 
@@ -27,7 +28,7 @@ struct ESMData
     unsigned int version;
     std::vector<ESM::Header::MasterData> masters;
 
-    std::deque<EsmTool::RecordBase *> mRecords;
+    std::deque<std::unique_ptr<EsmTool::RecordBase>> mRecords;
     // Value: (Reference, Deleted flag)
     std::map<ESM::Cell *, std::deque<std::pair<ESM::CellRef, bool> > > mCellRefs;
     std::map<int, int> mRecordStats;
@@ -363,7 +364,7 @@ int load(Arguments& info)
             uint32_t flags;
             esm.getRecHeader(flags);
 
-            EsmTool::RecordBase *record = EsmTool::RecordBase::create(n);
+            auto record = EsmTool::RecordBase::create(n);
             if (record == nullptr)
             {
                 if (skipped.count(n.toInt()) == 0)
@@ -408,11 +409,7 @@ int load(Arguments& info)
 
             if (save)
             {
-                info.data.mRecords.push_back(record);
-            }
-            else
-            {
-                delete record;
+                info.data.mRecords.push_back(std::move(record));
             }
             ++info.data.mRecordStats[n.toInt()];
         }
@@ -420,9 +417,6 @@ int load(Arguments& info)
     } catch(std::exception &e) {
         std::cout << "\nERROR:\n\n  " << e.what() << std::endl;
 
-        for (const EsmTool::RecordBase* record : info.data.mRecords)
-            delete record;
-
         info.data.mRecords.clear();
         return 1;
     }
@@ -485,7 +479,7 @@ int clone(Arguments& info)
     esm.save(save);
 
     int saved = 0;
-    for (EsmTool::RecordBase* record : info.data.mRecords)
+    for (auto& record : info.data.mRecords)
     {
         if (i <= 0)
             break;
diff --git a/apps/esmtool/record.cpp b/apps/esmtool/record.cpp
index 171f64eabe..f9c3dea5d4 100644
--- a/apps/esmtool/record.cpp
+++ b/apps/esmtool/record.cpp
@@ -171,226 +171,227 @@ void printTransport(const std::vector<ESM::Transport::Dest>& transport)
 
 namespace EsmTool {
 
-RecordBase *
-RecordBase::create(const ESM::NAME type)
+std::unique_ptr<RecordBase> RecordBase::create(const ESM::NAME type)
 {
-    RecordBase *record = nullptr;
+    std::unique_ptr<RecordBase> record;
 
-    switch (type.toInt()) {
+    switch (type.toInt())
+    {
     case ESM::REC_ACTI:
     {
-        record = new EsmTool::Record<ESM::Activator>;
+        record = std::make_unique<EsmTool::Record<ESM::Activator>>();
         break;
     }
     case ESM::REC_ALCH:
     {
-        record = new EsmTool::Record<ESM::Potion>;
+        record = std::make_unique<EsmTool::Record<ESM::Potion>>();
         break;
     }
     case ESM::REC_APPA:
     {
-        record = new EsmTool::Record<ESM::Apparatus>;
+        record = std::make_unique<EsmTool::Record<ESM::Apparatus>>();
         break;
     }
     case ESM::REC_ARMO:
     {
-        record = new EsmTool::Record<ESM::Armor>;
+        record = std::make_unique<EsmTool::Record<ESM::Armor>>();
         break;
     }
     case ESM::REC_BODY:
     {
-        record = new EsmTool::Record<ESM::BodyPart>;
+        record = std::make_unique<EsmTool::Record<ESM::BodyPart>>();
         break;
     }
     case ESM::REC_BOOK:
     {
-        record = new EsmTool::Record<ESM::Book>;
+        record = std::make_unique<EsmTool::Record<ESM::Book>>();
         break;
     }
     case ESM::REC_BSGN:
     {
-        record = new EsmTool::Record<ESM::BirthSign>;
+        record = std::make_unique<EsmTool::Record<ESM::BirthSign>>();
         break;
     }
     case ESM::REC_CELL:
     {
-        record = new EsmTool::Record<ESM::Cell>;
+        record = std::make_unique<EsmTool::Record<ESM::Cell>>();
         break;
     }
     case ESM::REC_CLAS:
     {
-        record = new EsmTool::Record<ESM::Class>;
+        record = std::make_unique<EsmTool::Record<ESM::Class>>();
         break;
     }
     case ESM::REC_CLOT:
     {
-        record = new EsmTool::Record<ESM::Clothing>;
+        record = std::make_unique<EsmTool::Record<ESM::Clothing>>();
         break;
     }
     case ESM::REC_CONT:
     {
-        record = new EsmTool::Record<ESM::Container>;
+        record = std::make_unique<EsmTool::Record<ESM::Container>>();
         break;
     }
     case ESM::REC_CREA:
     {
-        record = new EsmTool::Record<ESM::Creature>;
+        record = std::make_unique<EsmTool::Record<ESM::Creature>>();
         break;
     }
     case ESM::REC_DIAL:
     {
-        record = new EsmTool::Record<ESM::Dialogue>;
+        record = std::make_unique<EsmTool::Record<ESM::Dialogue>>();
         break;
     }
     case ESM::REC_DOOR:
     {
-        record = new EsmTool::Record<ESM::Door>;
+        record = std::make_unique<EsmTool::Record<ESM::Door>>();
         break;
     }
     case ESM::REC_ENCH:
     {
-        record = new EsmTool::Record<ESM::Enchantment>;
+        record = std::make_unique<EsmTool::Record<ESM::Enchantment>>();
         break;
     }
     case ESM::REC_FACT:
     {
-        record = new EsmTool::Record<ESM::Faction>;
+        record = std::make_unique<EsmTool::Record<ESM::Faction>>();
         break;
     }
     case ESM::REC_GLOB:
     {
-        record = new EsmTool::Record<ESM::Global>;
+        record = std::make_unique<EsmTool::Record<ESM::Global>>();
         break;
     }
     case ESM::REC_GMST:
     {
-        record = new EsmTool::Record<ESM::GameSetting>;
+        record = std::make_unique<EsmTool::Record<ESM::GameSetting>>();
         break;
     }
     case ESM::REC_INFO:
     {
-        record = new EsmTool::Record<ESM::DialInfo>;
+        record = std::make_unique<EsmTool::Record<ESM::DialInfo>>();
         break;
     }
     case ESM::REC_INGR:
     {
-        record = new EsmTool::Record<ESM::Ingredient>;
+        record = std::make_unique<EsmTool::Record<ESM::Ingredient>>();
         break;
     }
     case ESM::REC_LAND:
     {
-        record = new EsmTool::Record<ESM::Land>;
+        record = std::make_unique<EsmTool::Record<ESM::Land>>();
         break;
     }
     case ESM::REC_LEVI:
     {
-        record = new EsmTool::Record<ESM::ItemLevList>;
+        record = std::make_unique<EsmTool::Record<ESM::ItemLevList>>();
         break;
     }
     case ESM::REC_LEVC:
     {
-        record = new EsmTool::Record<ESM::CreatureLevList>;
+        record = std::make_unique<EsmTool::Record<ESM::CreatureLevList>>();
         break;
     }
     case ESM::REC_LIGH:
     {
-        record = new EsmTool::Record<ESM::Light>;
+        record = std::make_unique<EsmTool::Record<ESM::Light>>();
         break;
     }
     case ESM::REC_LOCK:
     {
-        record = new EsmTool::Record<ESM::Lockpick>;
+        record = std::make_unique<EsmTool::Record<ESM::Lockpick>>();
         break;
     }
     case ESM::REC_LTEX:
     {
-        record = new EsmTool::Record<ESM::LandTexture>;
+        record = std::make_unique<EsmTool::Record<ESM::LandTexture>>();
         break;
     }
     case ESM::REC_MISC:
     {
-        record = new EsmTool::Record<ESM::Miscellaneous>;
+        record = std::make_unique<EsmTool::Record<ESM::Miscellaneous>>();
         break;
     }
     case ESM::REC_MGEF:
     {
-        record = new EsmTool::Record<ESM::MagicEffect>;
+        record = std::make_unique<EsmTool::Record<ESM::MagicEffect>>();
         break;
     }
     case ESM::REC_NPC_:
     {
-        record = new EsmTool::Record<ESM::NPC>;
+        record = std::make_unique<EsmTool::Record<ESM::NPC>>();
         break;
     }
     case ESM::REC_PGRD:
     {
-        record = new EsmTool::Record<ESM::Pathgrid>;
+        record = std::make_unique<EsmTool::Record<ESM::Pathgrid>>();
         break;
     }
     case ESM::REC_PROB:
     {
-        record = new EsmTool::Record<ESM::Probe>;
+        record = std::make_unique<EsmTool::Record<ESM::Probe>>();
         break;
     }
     case ESM::REC_RACE:
     {
-        record = new EsmTool::Record<ESM::Race>;
+        record = std::make_unique<EsmTool::Record<ESM::Race>>();
         break;
     }
     case ESM::REC_REGN:
     {
-        record = new EsmTool::Record<ESM::Region>;
+        record = std::make_unique<EsmTool::Record<ESM::Region>>();
         break;
     }
     case ESM::REC_REPA:
     {
-        record = new EsmTool::Record<ESM::Repair>;
+        record = std::make_unique<EsmTool::Record<ESM::Repair>>();
         break;
     }
     case ESM::REC_SCPT:
     {
-        record = new EsmTool::Record<ESM::Script>;
+        record = std::make_unique<EsmTool::Record<ESM::Script>>();
         break;
     }
     case ESM::REC_SKIL:
     {
-        record = new EsmTool::Record<ESM::Skill>;
+        record = std::make_unique<EsmTool::Record<ESM::Skill>>();
         break;
     }
     case ESM::REC_SNDG:
     {
-        record = new EsmTool::Record<ESM::SoundGenerator>;
+        record = std::make_unique<EsmTool::Record<ESM::SoundGenerator>>();
         break;
     }
     case ESM::REC_SOUN:
     {
-        record = new EsmTool::Record<ESM::Sound>;
+        record = std::make_unique<EsmTool::Record<ESM::Sound>>();
         break;
     }
     case ESM::REC_SPEL:
     {
-        record = new EsmTool::Record<ESM::Spell>;
+        record = std::make_unique<EsmTool::Record<ESM::Spell>>();
         break;
     }
     case ESM::REC_STAT:
     {
-        record = new EsmTool::Record<ESM::Static>;
+        record = std::make_unique<EsmTool::Record<ESM::Static>>();
         break;
     }
     case ESM::REC_WEAP:
     {
-        record = new EsmTool::Record<ESM::Weapon>;
+        record = std::make_unique<EsmTool::Record<ESM::Weapon>>();
         break;
     }
     case ESM::REC_SSCR:
     {
-        record = new EsmTool::Record<ESM::StartScript>;
+        record = std::make_unique<EsmTool::Record<ESM::StartScript>>();
         break;
     }
     default:
-        record = nullptr;
+        break;
     }
-    if (record) {
+    if (record)
+    {
         record->mType = type;
     }
     return record;
diff --git a/apps/esmtool/record.hpp b/apps/esmtool/record.hpp
index bbb3dd0988..ef90dd1310 100644
--- a/apps/esmtool/record.hpp
+++ b/apps/esmtool/record.hpp
@@ -2,6 +2,7 @@
 #define OPENMW_ESMTOOL_RECORD_H
 
 #include <string>
+#include <memory>
 
 #include <components/esm/records.hpp>
 
@@ -54,7 +55,7 @@ namespace EsmTool
         virtual void save(ESM::ESMWriter &esm) = 0;
         virtual void print() = 0;
 
-        static RecordBase *create(ESM::NAME type);
+        static std::unique_ptr<RecordBase> create(ESM::NAME type);
 
         // just make it a bit shorter
         template <class T>

From 70623d0b239b066aa7344b7675962f2ff1b0afce Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 29 Jan 2022 15:14:06 +0100
Subject: [PATCH 2010/2859] Move FetchContent for benchmark to extern

---
 CMakeLists.txt                 |  2 ++
 apps/benchmarks/CMakeLists.txt | 22 ----------------------
 extern/CMakeLists.txt          | 16 ++++++++++++++++
 3 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1e0c7f7d4b..2b12c2b651 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -154,6 +154,8 @@ option(RECASTNAVIGATION_STATIC "Build recastnavigation static libraries" ${_reca
 
 option(OPENMW_USE_SYSTEM_SQLITE3 "Use system provided SQLite3 library" ON)
 
+option(OPENMW_USE_SYSTEM_BENCHMARK "Use system Google Benchmark library." OFF)
+
 option(OPENMW_UNITY_BUILD "Use fewer compilation units to speed up compile time" FALSE)
 option(OPENMW_LTO_BUILD "Build OpenMW with Link-Time Optimization (Needs ~2GB of RAM)" OFF)
 
diff --git a/apps/benchmarks/CMakeLists.txt b/apps/benchmarks/CMakeLists.txt
index ad4a21d5e4..c96531a666 100644
--- a/apps/benchmarks/CMakeLists.txt
+++ b/apps/benchmarks/CMakeLists.txt
@@ -1,27 +1,5 @@
-option(OPENMW_USE_SYSTEM_BENCHMARK "Use system Google Benchmark library." OFF)
-
 if(OPENMW_USE_SYSTEM_BENCHMARK)
     find_package(benchmark REQUIRED)
-else()
-    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}")
 endif()
 
 openmw_add_executable(openmw_detournavigator_navmeshtilescache_benchmark detournavigator/navmeshtilescache.cpp)
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 27351ce675..4dd4c2b416 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -210,3 +210,19 @@ if (NOT OPENMW_USE_SYSTEM_SQLITE3)
 endif()
 
 add_subdirectory(smhasher)
+
+if (NOT OPENMW_USE_SYSTEM_BENCHMARK)
+    cmake_minimum_required(VERSION 3.11)
+
+    set(BENCHMARK_ENABLE_TESTING OFF)
+    set(BENCHMARK_ENABLE_INSTALL OFF)
+    set(BENCHMARK_ENABLE_GTEST_TESTS OFF)
+
+    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)
+endif()

From b0f192d8789edc3c7c7029622efa4a2b80a4c75e Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 29 Jan 2022 15:48:24 +0100
Subject: [PATCH 2011/2859] Fix warning: maybe-uninitialized

../../components/misc/color.cpp: In static member function 'static Misc::Color Misc::Color::fromHex(std::string_view)':
../../components/misc/color.cpp:36:24: error: 'v' may be used uninitialized in this function [-Werror=maybe-uninitialized]
   36 |             rgb[i] = v / 255.0f;
      |                      ~~^~~~~~~~
---
 components/misc/color.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/misc/color.cpp b/components/misc/color.cpp
index edf3435428..56520c5d74 100644
--- a/components/misc/color.cpp
+++ b/components/misc/color.cpp
@@ -29,7 +29,7 @@ namespace Misc
         for (size_t i = 0; i < rgb.size(); i++)
         {
             auto sub = hex.substr(i * 2, 2);
-            int v;
+            int v = 0;
             auto [_, ec] = std::from_chars(sub.data(), sub.data() + sub.size(), v, 16);
             if (ec != std::errc())
                 throw std::logic_error(std::string("Invalid hex color: ") += hex);

From 28ce8fd0f347d6e6dd13289561b979420393f8cc Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 29 Jan 2022 03:16:58 +0100
Subject: [PATCH 2012/2859] Add separate jobs to run tests with ASAN, TSAN,
 UBSAN

To not slow down benchmarks with all optimizations.
---
 .gitlab-ci.yml            | 48 +++++++++++++++++++++++++++++++++++++--
 CI/before_script.linux.sh | 14 +++++++++++-
 2 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index be6f57053c..3b34b0c07f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -105,7 +105,7 @@ Ubuntu_GCC:
 Ubuntu_GCC_tests:
   extends: Ubuntu_GCC
   cache:
-    key: Ubuntu_GCC_tests.v2
+    key: Ubuntu_GCC_tests.v3
   variables:
     CCACHE_SIZE: 1G
     BUILD_TESTS_ONLY: 1
@@ -125,6 +125,50 @@ Ubuntu_GCC_tests_Debug:
     paths: []
     expire_in: 1 minute
 
+Ubuntu_GCC_tests_asan:
+  extends: Ubuntu_GCC
+  cache:
+    key: Ubuntu_GCC_asan.v1
+  variables:
+    CCACHE_SIZE: 1G
+    BUILD_TESTS_ONLY: 1
+    CMAKE_BUILD_TYPE: Debug
+    CMAKE_CXX_FLAGS_DEBUG: -g -O1 -fno-omit-frame-pointer -fsanitize=address -fsanitize=pointer-compare -fsanitize=pointer-subtract -fsanitize=leak
+    CMAKE_EXE_LINKER_FLAGS: -fsanitize=address -fsanitize=pointer-compare -fsanitize=pointer-subtract -fsanitize=leak
+    ASAN_OPTIONS: halt_on_error=1:strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1
+  artifacts:
+    paths: []
+    expire_in: 1 minute
+
+Ubuntu_GCC_tests_ubsan:
+  extends: Ubuntu_GCC
+  cache:
+    key: Ubuntu_GCC_ubsan.v1
+  variables:
+    CCACHE_SIZE: 1G
+    BUILD_TESTS_ONLY: 1
+    CMAKE_BUILD_TYPE: Debug
+    CMAKE_CXX_FLAGS_DEBUG: -g -O0 -fsanitize=undefined
+    UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1
+  artifacts:
+    paths: []
+    expire_in: 1 minute
+
+Ubuntu_GCC_tests_tsan:
+  extends: Ubuntu_GCC
+  cache:
+    key: Ubuntu_GCC_tsan.v1
+  variables:
+    CCACHE_SIZE: 1G
+    BUILD_TESTS_ONLY: 1
+    CMAKE_BUILD_TYPE: Debug
+    CMAKE_CXX_FLAGS_DEBUG: -g -O2 -fno-omit-frame-pointer -fno-optimize-sibling-calls -fsanitize=thread -fPIE
+    CMAKE_EXE_LINKER_FLAGS: -pthread -pie -fsanitize=thread
+    TSAN_OPTIONS: second_deadlock_stack=1:halt_on_error=1
+  artifacts:
+    paths: []
+    expire_in: 1 minute
+
 Ubuntu_Static_Deps:
   extends: Ubuntu_Clang
   rules:
@@ -179,7 +223,7 @@ Ubuntu_Clang:
 Ubuntu_Clang_tests:
   extends: Ubuntu_Clang
   cache:
-    key: Ubuntu_Clang_tests.v2
+    key: Ubuntu_Clang_tests.v3
   variables:
     CCACHE_SIZE: 1G
     BUILD_TESTS_ONLY: 1
diff --git a/CI/before_script.linux.sh b/CI/before_script.linux.sh
index 801d7f0a3e..386b25bbe6 100755
--- a/CI/before_script.linux.sh
+++ b/CI/before_script.linux.sh
@@ -52,13 +52,25 @@ if [[ "${CMAKE_BUILD_TYPE}" ]]; then
     )
 fi
 
+if [[ "${CMAKE_CXX_FLAGS_DEBUG}" ]]; then
+    CMAKE_CONF_OPTS+=(
+        -DCMAKE_CXX_FLAGS_DEBUG="${CMAKE_CXX_FLAGS_DEBUG}"
+    )
+fi
+
+if [[ "${CMAKE_EXE_LINKER_FLAGS}" ]]; then
+    CMAKE_CONF_OPTS+=(
+        -DCMAKE_EXE_LINKER_FLAGS="${CMAKE_EXE_LINKER_FLAGS}"
+    )
+fi
+
 mkdir -p build
 cd build
 
 if [[ "${BUILD_TESTS_ONLY}" ]]; then
 
     # flags specific to our test suite
-    CXX_FLAGS="-Wno-error=deprecated-declarations -Wno-error=nonnull -Wno-error=deprecated-copy -fsanitize=address"
+    CXX_FLAGS="-Wno-error=deprecated-declarations -Wno-error=nonnull -Wno-error=deprecated-copy"
     if [[ "${CXX}" == 'clang++' ]]; then
         CXX_FLAGS="${CXX_FLAGS} -Wno-error=unused-lambda-capture -Wno-error=gnu-zero-variadic-macro-arguments"
     fi

From bebeff88811183c2cd905c3cd03d7e5043e39e75 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 30 Jan 2022 02:19:13 +0100
Subject: [PATCH 2013/2859] Fix build with libc++

/home/elsid/dev/openmw/components/esm3/objectstate.cpp:33:30: error: implicit instantiation of undefined template 'std::array<float, 6>'
        std::array<float, 6> pos;
                             ^
/usr/bin/../include/c++/v1/__tuple:219:64: note: template is declared here
template <class _Tp, size_t _Size> struct _LIBCPP_TEMPLATE_VIS array;
                                                               ^
/home/elsid/dev/openmw/components/esm3/objectstate.cpp:78:30: error: implicit instantiation of undefined template 'std::array<float, 6>'
        std::array<float, 6> pos;
                             ^
/usr/bin/../include/c++/v1/__tuple:219:64: note: template is declared here
template <class _Tp, size_t _Size> struct _LIBCPP_TEMPLATE_VIS array;
                                                               ^
---
 components/esm3/objectstate.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/esm3/objectstate.cpp b/components/esm3/objectstate.cpp
index dd400c0024..11fa81b7d8 100644
--- a/components/esm3/objectstate.cpp
+++ b/components/esm3/objectstate.cpp
@@ -3,6 +3,7 @@
 #include <stdexcept>
 #include <sstream>
 #include <typeinfo>
+#include <array>
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"

From de2383ec982a78d7d20d8e23f6f1f4c3f4a6eda9 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sun, 30 Jan 2022 11:59:30 +0000
Subject: [PATCH 2014/2859] Fix save corruption introduced by
 https://gitlab.com/OpenMW/openmw/-/merge_requests/1600

---
 components/esm3/objectstate.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/esm3/objectstate.cpp b/components/esm3/objectstate.cpp
index dd400c0024..149507d728 100644
--- a/components/esm3/objectstate.cpp
+++ b/components/esm3/objectstate.cpp
@@ -78,7 +78,7 @@ void ESM::ObjectState::save (ESMWriter &esm, bool inInventory) const
         std::array<float, 6> pos;
         memcpy(pos.data(), mPosition.pos, sizeof(float) * 3);
         memcpy(pos.data() + 3, mPosition.rot, sizeof(float) * 3);
-        esm.writeHNT ("POS_", pos.data(), 24);
+        esm.writeHNT ("POS_", pos, 24);
     }
 
     if (mFlags != 0)

From b17c9a22ff7c837058de7c8fcb4bb3fab1a4de7d Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 30 Jan 2022 14:04:12 +0100
Subject: [PATCH 2015/2859] Disallow to call ESMWriter::writeT with pointer
 type

This will make ESMWriter to use a pointer to this pointer to access the data
that is unlikely an intent. For example:
68ef96410cb6731131a82b6b0583ac30e6ffd9fc.
---
 components/esm3/esmwriter.hpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/components/esm3/esmwriter.hpp b/components/esm3/esmwriter.hpp
index ed2ccbb377..3073daf15e 100644
--- a/components/esm3/esmwriter.hpp
+++ b/components/esm3/esmwriter.hpp
@@ -3,6 +3,7 @@
 
 #include <iosfwd>
 #include <list>
+#include <type_traits>
 
 #include "components/esm/esmcommon.hpp"
 #include "loadtes3.hpp"
@@ -111,6 +112,7 @@ class ESMWriter
         template<typename T>
         void writeT(const T& data)
         {
+            static_assert(!std::is_pointer_v<T>);
             write((char*)&data, sizeof(T));
         }
 
@@ -123,6 +125,7 @@ class ESMWriter
         template<typename T>
         void writeT(const T& data, size_t size)
         {
+            static_assert(!std::is_pointer_v<T>);
             write((char*)&data, size);
         }
 

From ec4adcc5a25f400c020ef09a4867e27cbcfe4b77 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 30 Jan 2022 20:27:37 +0000
Subject: [PATCH 2016/2859] Add better explanation of the `onLoad` engine
 handler.

---
 docs/source/reference/lua-scripting/engine_handlers.rst | 3 +++
 docs/source/reference/lua-scripting/overview.rst        | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/source/reference/lua-scripting/engine_handlers.rst b/docs/source/reference/lua-scripting/engine_handlers.rst
index 4f5f99965a..46e648d620 100644
--- a/docs/source/reference/lua-scripting/engine_handlers.rst
+++ b/docs/source/reference/lua-scripting/engine_handlers.rst
@@ -19,6 +19,9 @@ Engine handler is a function defined by a script, that can be called by the engi
 | onLoad(savedData, initData)      | | Called on loading with the data previosly returned by              |
 |                                  | | onSave. During loading the object is always inactive. initData is  |
 |                                  | | the same as in onInit.                                             |
+|                                  | | Note that onLoad means loading a script rather than loading a game.|
+|                                  | | If a script did not exist when a game was saved onLoad will not be |
+|                                  | | called, but onInit will.                                           |
 +----------------------------------+----------------------------------------------------------------------+
 | onInterfaceOverride(base)        | | Called if the current script has an interface and overrides an     |
 |                                  | | interface (``base``) of another script.                            |
diff --git a/docs/source/reference/lua-scripting/overview.rst b/docs/source/reference/lua-scripting/overview.rst
index 9de283b029..1bfdf33c42 100644
--- a/docs/source/reference/lua-scripting/overview.rst
+++ b/docs/source/reference/lua-scripting/overview.rst
@@ -246,11 +246,14 @@ See :ref:`Engine handlers reference`.
 onSave and onLoad
 =================
 
-When a game is saved or loaded, the engine calls the engine handlers `onSave` or `onLoad` for every script.
+When a game is saved or loaded, the engine calls the engine handlers `onSave` or `onLoad` to save or load each script.
 The value that `onSave` returns will be passed to `onLoad` when the game is loaded.
 It is the only way to save the internal state of a script. All other script variables will be lost after closing the game.
 The saved state must be :ref:`serializable <Serializable data>`.
 
+Note that `onLoad` means loading a script rather than loading a game.
+If a script did not exist when a game was saved then `onLoad` will not be called, but `onInit` will.
+
 `onSave` and `onLoad` can be called even for objects in inactive state, so it shouldn't use `openmw.nearby`.
 
 An example:

From 7ea5aa250b73a7c4c09de375a57a7f45630cd92f Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 30 Jan 2022 21:43:23 +0100
Subject: [PATCH 2017/2859] Revert "Cull navmesh objects by scene bounds"

This reverts commit b0ef20c30348e52c38464777db9a33ecf693f877.
---
 apps/openmw/mwworld/scene.cpp                   |  4 ----
 .../tilecachedrecastmeshmanager.cpp             |  8 --------
 .../detournavigator/gettilespositions.cpp       |  8 ++------
 .../detournavigator/gettilespositions.hpp       |  3 +--
 components/detournavigator/navmeshmanager.cpp   | 15 +--------------
 components/detournavigator/settingsutils.hpp    |  5 -----
 .../tilecachedrecastmeshmanager.cpp             | 17 +----------------
 .../tilecachedrecastmeshmanager.hpp             |  7 +------
 8 files changed, 6 insertions(+), 61 deletions(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index de9e2706c4..0d2db8b99a 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -819,8 +819,6 @@ namespace MWWorld
 
         loadingListener->setProgressRange(cell->count());
 
-        mNavigator.updatePlayerPosition(position.asVec3());
-
         // Load cell.
         mPagedRefs.clear();
         loadCell(cell, loadingListener, changeEvent);
@@ -854,8 +852,6 @@ namespace MWWorld
         if (changeEvent)
             MWBase::Environment::get().getWindowManager()->fadeScreenOut(0.5);
 
-        mNavigator.updatePlayerPosition(position.asVec3());
-
         changeCellGrid(position.asVec3(), x, y, changeEvent);
 
         CellStore* current = MWBase::Environment::get().getWorld()->getExterior(x, y);
diff --git a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
index 631e4105ba..c44ebc5155 100644
--- a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -90,10 +90,6 @@ namespace
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const btTransform transform(btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
-        TileBounds bounds;
-        bounds.mMin = osg::Vec2f(-1000, -1000);
-        bounds.mMax = osg::Vec2f(1000, 1000);
-        manager.setBounds(bounds);
         manager.addObject(ObjectId(&boxShape), shape, transform, AreaType::AreaType_ground);
         EXPECT_TRUE(manager.updateObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground,
                                          [&] (const auto& v) { onChangedTile(v); }));
@@ -141,10 +137,6 @@ namespace
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, get_mesh_for_moved_object_should_return_recast_mesh_for_each_used_tile)
     {
         TileCachedRecastMeshManager manager(mSettings);
-        TileBounds bounds;
-        bounds.mMin = osg::Vec2f(-1000, -1000);
-        bounds.mMax = osg::Vec2f(1000, 1000);
-        manager.setBounds(bounds);
         manager.setWorldspace("worldspace");
 
         const btBoxShape boxShape(btVector3(20, 20, 100));
diff --git a/components/detournavigator/gettilespositions.cpp b/components/detournavigator/gettilespositions.cpp
index e74a22e5ba..d427eb3e12 100644
--- a/components/detournavigator/gettilespositions.cpp
+++ b/components/detournavigator/gettilespositions.cpp
@@ -2,7 +2,6 @@
 #include "settings.hpp"
 #include "settingsutils.hpp"
 #include "tileposition.hpp"
-#include "tilebounds.hpp"
 
 #include <components/misc/convert.hpp>
 
@@ -33,15 +32,12 @@ namespace DetourNavigator
     }
 
     TilesPositionsRange makeTilesPositionsRange(const btCollisionShape& shape, const btTransform& transform,
-        const TileBounds& bounds, const RecastSettings& settings)
+        const RecastSettings& settings)
     {
         btVector3 aabbMin;
         btVector3 aabbMax;
         shape.getAabb(transform, aabbMin, aabbMax);
-        aabbMin.setX(std::max<btScalar>(aabbMin.x(), bounds.mMin.x()));
-        aabbMin.setY(std::max<btScalar>(aabbMin.y(), bounds.mMin.y()));
-        aabbMax.setX(std::min<btScalar>(aabbMax.x(), bounds.mMax.x()));
-        aabbMax.setY(std::min<btScalar>(aabbMax.y(), bounds.mMax.y()));
+
         return makeTilesPositionsRange(Misc::Convert::toOsg(aabbMin), Misc::Convert::toOsg(aabbMax), settings);
     }
 
diff --git a/components/detournavigator/gettilespositions.hpp b/components/detournavigator/gettilespositions.hpp
index 9d3df7ef65..946f3e64f2 100644
--- a/components/detournavigator/gettilespositions.hpp
+++ b/components/detournavigator/gettilespositions.hpp
@@ -1,7 +1,6 @@
 #ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_GETTILESPOSITIONS_H
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_GETTILESPOSITIONS_H
 
-#include "tilebounds.hpp"
 #include "tileposition.hpp"
 
 class btVector3;
@@ -27,7 +26,7 @@ namespace DetourNavigator
         const osg::Vec3f& aabbMax, const RecastSettings& settings);
 
     TilesPositionsRange makeTilesPositionsRange(const btCollisionShape& shape,
-        const btTransform& transform, const TileBounds& bounds, const RecastSettings& settings);
+        const btTransform& transform, const RecastSettings& settings);
 
     TilesPositionsRange makeTilesPositionsRange(const int cellSize, const btVector3& shift,
         const RecastSettings& settings);
diff --git a/components/detournavigator/navmeshmanager.cpp b/components/detournavigator/navmeshmanager.cpp
index e8da5a0d61..9fba4ad611 100644
--- a/components/detournavigator/navmeshmanager.cpp
+++ b/components/detournavigator/navmeshmanager.cpp
@@ -42,18 +42,6 @@ namespace
 
 namespace DetourNavigator
 {
-    namespace
-    {
-        TileBounds makeBounds(const RecastSettings& settings, const osg::Vec2f& center, int maxTiles)
-        {
-            const float radius = fromNavMeshCoordinates(settings, std::ceil(std::sqrt(static_cast<float>(maxTiles) / osg::PIf) + 1) * getTileSize(settings));
-            TileBounds result;
-            result.mMin = center - osg::Vec2f(radius, radius);
-            result.mMax = center + osg::Vec2f(radius, radius);
-            return result;
-        }
-    }
-
     NavMeshManager::NavMeshManager(const Settings& settings, std::unique_ptr<NavMeshDb>&& db)
         : mSettings(settings)
         , mRecastMeshManager(settings.mRecast)
@@ -217,7 +205,6 @@ namespace DetourNavigator
                     }
             }
             const auto maxTiles = std::min(mSettings.mMaxTilesNumber, navMesh.getParams()->maxTiles);
-            mRecastMeshManager.setBounds(makeBounds(mSettings.mRecast, osg::Vec2f(playerPosition.x(), playerPosition.y()), maxTiles));
             mRecastMeshManager.forEachTile([&] (const TilePosition& tile, CachedRecastMeshManager& recastMeshManager)
             {
                 if (tilesToPost.count(tile))
@@ -276,7 +263,7 @@ namespace DetourNavigator
     void NavMeshManager::addChangedTiles(const btCollisionShape& shape, const btTransform& transform,
             const ChangeType changeType)
     {
-        getTilesPositions(makeTilesPositionsRange(shape, transform, mRecastMeshManager.getBounds(), mSettings.mRecast),
+        getTilesPositions(makeTilesPositionsRange(shape, transform, mSettings.mRecast),
             [&] (const TilePosition& v) { addChangedTile(v, changeType); });
     }
 
diff --git a/components/detournavigator/settingsutils.hpp b/components/detournavigator/settingsutils.hpp
index e38da2d0e1..285920e5a0 100644
--- a/components/detournavigator/settingsutils.hpp
+++ b/components/detournavigator/settingsutils.hpp
@@ -37,11 +37,6 @@ namespace DetourNavigator
         };
     }
 
-    inline float fromNavMeshCoordinates(const RecastSettings& settings, float value)
-    {
-        return value / settings.mRecastScaleFactor;
-    }
-
     inline osg::Vec3f fromNavMeshCoordinates(const RecastSettings& settings, osg::Vec3f position)
     {
         const auto factor = 1.0f / settings.mRecastScaleFactor;
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.cpp b/components/detournavigator/tilecachedrecastmeshmanager.cpp
index ced5a28656..17ba7afc39 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -8,28 +8,13 @@
 
 #include <algorithm>
 #include <vector>
-#include <limits>
 
 namespace DetourNavigator
 {
     TileCachedRecastMeshManager::TileCachedRecastMeshManager(const RecastSettings& settings)
         : mSettings(settings)
-        , mBounds {osg::Vec2f(-std::numeric_limits<float>::max(), -std::numeric_limits<float>::max()),
-                   osg::Vec2f(std::numeric_limits<float>::max(), std::numeric_limits<float>::max())}
     {}
 
-    TileBounds TileCachedRecastMeshManager::getBounds() const
-    {
-        const std::lock_guard lock(mMutex);
-        return mBounds;
-    }
-
-    void TileCachedRecastMeshManager::setBounds(const TileBounds& bounds)
-    {
-        const std::lock_guard lock(mMutex);
-        mBounds = bounds;
-    }
-
     std::string TileCachedRecastMeshManager::getWorldspace() const
     {
         const std::lock_guard lock(mMutex);
@@ -51,7 +36,7 @@ namespace DetourNavigator
         std::vector<TilePosition> tilesPositions;
         {
             const std::lock_guard lock(mMutex);
-            getTilesPositions(makeTilesPositionsRange(shape.getShape(), transform, mBounds, mSettings),
+            getTilesPositions(makeTilesPositionsRange(shape.getShape(), transform, mSettings),
                 [&] (const TilePosition& tilePosition)
                 {
                     if (addTile(id, shape, transform, areaType, tilePosition, mTiles))
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.hpp b/components/detournavigator/tilecachedrecastmeshmanager.hpp
index d99dc3e27e..88face24ce 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.hpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.hpp
@@ -20,10 +20,6 @@ namespace DetourNavigator
     public:
         explicit TileCachedRecastMeshManager(const RecastSettings& settings);
 
-        TileBounds getBounds() const;
-
-        void setBounds(const TileBounds& bounds);
-
         std::string getWorldspace() const;
 
         void setWorldspace(std::string_view worldspace);
@@ -61,7 +57,7 @@ namespace DetourNavigator
                         changed = true;
                     }
                 };
-                getTilesPositions(makeTilesPositionsRange(shape.getShape(), transform, mBounds, mSettings), onTilePosition);
+                getTilesPositions(makeTilesPositionsRange(shape.getShape(), transform, mSettings), onTilePosition);
                 std::sort(newTiles.begin(), newTiles.end());
                 for (const auto& tile : currentTiles)
                 {
@@ -113,7 +109,6 @@ namespace DetourNavigator
 
         const RecastSettings& mSettings;
         mutable std::mutex mMutex;
-        TileBounds mBounds;
         std::string mWorldspace;
         TilesMap mTiles;
         std::unordered_map<ObjectId, std::vector<TilePosition>> mObjectsTilesPositions;

From ae821738c95042bb7c7687b113e0534e72fb9d7a Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 30 Jan 2022 22:09:37 +0100
Subject: [PATCH 2018/2859] Revert "Add #5858 to the changelog"

This reverts commit 670cc9794726fbfcca7cd06ccd8ecb771a8193f3.
---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index efc831db0c..d2baee6552 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,7 +36,6 @@
     Bug #5788: Texture editing parses the selected indexes wrongly
     Bug #5801: A multi-effect spell with the intervention effects and recall always favors Almsivi intervention
     Bug #5842: GetDisposition adds temporary disposition change from different actors
-    Bug #5858: Animated model freezes the game
     Bug #5863: GetEffect should return true after the player has teleported
     Bug #5913: Failed assertion during Ritual of Trees quest
     Bug #5928: Glow in the Dahrk functionality used without mod installed

From 7e346fbbdd5be341d2e783c969da01c41f3f7bfa Mon Sep 17 00:00:00 2001
From: Timo Gurr <timo.gurr@gmail.com>
Date: Sun, 30 Jan 2022 21:39:28 +0000
Subject: [PATCH 2019/2859] cmake: for now do not use CMAKE_INSTALL_DATAROOTDIR
 for GLOBAL_DATA_PATH

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b12c2b651..20c00fb757 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -191,7 +191,7 @@ elseif(UNIX)
     SET(BINDIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Where to install binaries")
     SET(LIBDIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "Where to install libraries")
     SET(DATAROOTDIR "${CMAKE_INSTALL_DATAROOTDIR}" CACHE PATH "Sets the root of data directories to a non-default location")
-    SET(GLOBAL_DATA_PATH "${DATAROOTDIR}/games/" CACHE PATH "Set data path prefix")
+    SET(GLOBAL_DATA_PATH "${CMAKE_INSTALL_PREFIX}/share/games/" CACHE PATH "Set data path prefix")
     SET(DATADIR "${GLOBAL_DATA_PATH}/openmw" CACHE PATH "Sets the openmw data directories to a non-default location")
     SET(ICONDIR "${DATAROOTDIR}/pixmaps" CACHE PATH "Set icon dir")
     SET(LICDIR "${DATAROOTDIR}/licenses/openmw" CACHE PATH "Sets the openmw license directory to a non-default location.")

From 8512f7cb4c4832d8e81337eb0ac87a1217a48228 Mon Sep 17 00:00:00 2001
From: Timo Gurr <timo.gurr@gmail.com>
Date: Sun, 30 Jan 2022 23:05:35 +0100
Subject: [PATCH 2020/2859] cmake: only download benchmarks if we build with it

Since 70623d0b239b066aa7344b7675962f2ff1b0afce CMake tries to download
benchmarks even if we pass -DBUILD_BENCHMARKS:BOOL=FALSE.
---
 extern/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 4dd4c2b416..b4bfe2e3bd 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -211,7 +211,7 @@ endif()
 
 add_subdirectory(smhasher)
 
-if (NOT OPENMW_USE_SYSTEM_BENCHMARK)
+if (BUILD_BENCHMARKS AND NOT OPENMW_USE_SYSTEM_BENCHMARK)
     cmake_minimum_required(VERSION 3.11)
 
     set(BENCHMARK_ENABLE_TESTING OFF)

From 010dc90d42b9467127ab323b387784df1f2e5596 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Mon, 31 Jan 2022 07:57:08 +0000
Subject: [PATCH 2021/2859] Have Android CI also use latest ccache to fix
 issues with cmake.

---
 .gitlab-ci.yml            | 14 ++++++--------
 CI/install_debian_deps.sh | 10 +++-------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3b34b0c07f..aaf7f233f0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -68,7 +68,7 @@ Coverity:
   rules:
     - if: $CI_PIPELINE_SOURCE == "schedule"
   before_script:
-    - CI/install_debian_deps.sh clang openmw-deps openmw-deps-dynamic coverity
+    - CI/install_debian_deps.sh clang openmw-deps openmw-deps-dynamic
     - 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:
@@ -181,9 +181,9 @@ Ubuntu_Static_Deps:
   cache:
     key: Ubuntu_Static_Deps.V1
     paths:
-    - apt-cache/
-    - ccache/
-    - build/extern/fetched/
+      - apt-cache/
+      - ccache/
+      - build/extern/fetched/
   before_script:
     - CI/install_debian_deps.sh clang openmw-deps openmw-deps-static
   variables:
@@ -555,15 +555,13 @@ Ubuntu_AndroidNDK_arm64-v8a:
   variables:
     CCACHE_SIZE: 3G
   cache:
-    key: Ubuntu__Focal_AndroidNDK_r22b_arm64-v8a.v1
+    key: Ubuntu__Focal_AndroidNDK_r22b_arm64-v8a.v2
     paths:
       - apt-cache/
       - ccache/
       - build/extern/fetched/
   before_script:
-    - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
-    - apt-get update -yq
-    - apt-get -q -o dir::cache::archives="$APT_CACHE_DIR" install -y cmake ccache curl unzip git build-essential
+    - CI/install_debian_deps.sh gcc
   stage: build
   script:
     - export CCACHE_BASEDIR="`pwd`"
diff --git a/CI/install_debian_deps.sh b/CI/install_debian_deps.sh
index 131ccae305..74b0746ac0 100755
--- a/CI/install_debian_deps.sh
+++ b/CI/install_debian_deps.sh
@@ -9,13 +9,11 @@ print_help() {
 }
 
 declare -rA GROUPED_DEPS=(
-  [gcc]="binutils gcc g++ libc-dev"
-  [clang]="binutils clang"
+  [gcc]="binutils gcc build-essential cmake ccache curl unzip git pkg-config"
+  [clang]="binutils clang make cmake ccache curl unzip git pkg-config"
 
   # 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
 
@@ -27,7 +25,6 @@ declare -rA GROUPED_DEPS=(
 
   # These dependencies can alternatively be built and linked statically.
   [openmw-deps-dynamic]="libmygui-dev libopenscenegraph-dev libsqlite3-dev"
-  [coverity]="curl"
   [clang-tidy]="clang-tidy"
 
   # Pre-requisites for building MyGUI and OSG for static linking.
@@ -40,8 +37,7 @@ declare -rA GROUPED_DEPS=(
   #   * JPEG: libjpeg-dev
   #   * PNG: libpng-dev
   [openmw-deps-static]="
-    make cmake
-    ccache curl unzip libcollada-dom-dev libfreetype6-dev libjpeg-dev libpng-dev
+    libcollada-dom-dev libfreetype6-dev libjpeg-dev libpng-dev
     libsdl2-dev libboost-system-dev libboost-filesystem-dev libgl-dev
   "
 )

From ba3ae448d4f69cb802b28dac31e28bd092af7fc0 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Sun, 30 Jan 2022 11:07:39 +0100
Subject: [PATCH 2022/2859] Initial import of esm4 by cc9cii

---
 components/CMakeLists.txt              |  12 +-
 components/esm/common.cpp              |  15 +
 components/esm/common.hpp              |  57 ++
 components/esm/reader.cpp              | 114 +++
 components/esm/reader.hpp              |  60 ++
 components/esm4/acti.hpp               |  70 ++
 components/esm4/actor.hpp              | 163 +++++
 components/esm4/common.cpp             | 100 +++
 components/esm4/common.hpp             | 939 +++++++++++++++++++++++++
 components/esm4/dialogue.hpp           |  46 ++
 components/esm4/effect.hpp             |  56 ++
 components/esm4/formid.cpp             |  78 ++
 components/esm4/formid.hpp             |  42 ++
 components/esm4/inventory.hpp          |  55 ++
 components/esm4/lighting.hpp           |  79 +++
 components/esm4/loadachr.cpp           | 124 ++++
 components/esm4/loadachr.hpp           |  70 ++
 components/esm4/loadacre.cpp           | 106 +++
 components/esm4/loadacre.hpp           |  67 ++
 components/esm4/loadacti.cpp           | 103 +++
 components/esm4/loadalch.cpp           | 121 ++++
 components/esm4/loadalch.hpp           |  88 +++
 components/esm4/loadaloc.cpp           | 172 +++++
 components/esm4/loadaloc.hpp           |  88 +++
 components/esm4/loadammo.cpp           | 133 ++++
 components/esm4/loadammo.hpp           |  84 +++
 components/esm4/loadanio.cpp           |  80 +++
 components/esm4/loadanio.hpp           |  63 ++
 components/esm4/loadappa.cpp           | 106 +++
 components/esm4/loadappa.hpp           |  75 ++
 components/esm4/loadarma.cpp           | 151 ++++
 components/esm4/loadarma.hpp           |  70 ++
 components/esm4/loadarmo.cpp           | 218 ++++++
 components/esm4/loadarmo.hpp           | 196 ++++++
 components/esm4/loadaspc.cpp           |  94 +++
 components/esm4/loadaspc.hpp           |  66 ++
 components/esm4/loadbook.cpp           | 121 ++++
 components/esm4/loadbook.hpp           | 114 +++
 components/esm4/loadbptd.cpp           | 113 +++
 components/esm4/loadbptd.hpp           | 128 ++++
 components/esm4/loadcell.cpp           | 269 +++++++
 components/esm4/loadcell.hpp           | 109 +++
 components/esm4/loadclas.cpp           |  84 +++
 components/esm4/loadclas.hpp           |  66 ++
 components/esm4/loadclfm.cpp           |  93 +++
 components/esm4/loadclfm.hpp           |  70 ++
 components/esm4/loadclot.cpp           | 106 +++
 components/esm4/loadclot.hpp           |  83 +++
 components/esm4/loadcont.cpp           | 107 +++
 components/esm4/loadcont.hpp           |  71 ++
 components/esm4/loadcrea.cpp           | 232 ++++++
 components/esm4/loadcrea.hpp           | 151 ++++
 components/esm4/loaddial.cpp           | 125 ++++
 components/esm4/loaddial.hpp           |  70 ++
 components/esm4/loaddobj.cpp           | 128 ++++
 components/esm4/loaddobj.hpp           | 100 +++
 components/esm4/loaddoor.cpp           |  93 +++
 components/esm4/loaddoor.hpp           |  76 ++
 components/esm4/loadeyes.cpp           |  74 ++
 components/esm4/loadeyes.hpp           |  68 ++
 components/esm4/loadflor.cpp           |  89 +++
 components/esm4/loadflor.hpp           |  78 ++
 components/esm4/loadflst.cpp           |  81 +++
 components/esm4/loadflst.hpp           |  60 ++
 components/esm4/loadfurn.cpp           |  98 +++
 components/esm4/loadfurn.hpp           |  64 ++
 components/esm4/loadglob.cpp           |  82 +++
 components/esm4/loadglob.hpp           |  60 ++
 components/esm4/loadgras.cpp           |  78 ++
 components/esm4/loadgras.hpp           |  98 +++
 components/esm4/loadgrup.hpp           | 158 +++++
 components/esm4/loadhair.cpp           |  84 +++
 components/esm4/loadhair.hpp           |  71 ++
 components/esm4/loadhdpt.cpp           | 104 +++
 components/esm4/loadhdpt.hpp           |  66 ++
 components/esm4/loadidle.cpp           |  84 +++
 components/esm4/loadidle.hpp           |  62 ++
 components/esm4/loadidlm.cpp           | 103 +++
 components/esm4/loadidlm.hpp           |  63 ++
 components/esm4/loadimod.cpp           |  89 +++
 components/esm4/loadimod.hpp           |  59 ++
 components/esm4/loadinfo.cpp           | 222 ++++++
 components/esm4/loadinfo.hpp           |  90 +++
 components/esm4/loadingr.cpp           | 133 ++++
 components/esm4/loadingr.hpp           |  83 +++
 components/esm4/loadkeym.cpp           |  93 +++
 components/esm4/loadkeym.hpp           |  77 ++
 components/esm4/loadland.cpp           | 255 +++++++
 components/esm4/loadland.hpp           | 136 ++++
 components/esm4/loadlgtm.cpp           | 105 +++
 components/esm4/loadlgtm.hpp           |  63 ++
 components/esm4/loadligh.cpp           | 120 ++++
 components/esm4/loadligh.hpp           | 101 +++
 components/esm4/loadltex.cpp           | 107 +++
 components/esm4/loadltex.hpp           |  75 ++
 components/esm4/loadlvlc.cpp           | 130 ++++
 components/esm4/loadlvlc.hpp           |  71 ++
 components/esm4/loadlvli.cpp           | 142 ++++
 components/esm4/loadlvli.hpp           |  72 ++
 components/esm4/loadlvln.cpp           | 114 +++
 components/esm4/loadlvln.hpp           |  69 ++
 components/esm4/loadmato.cpp           |  76 ++
 components/esm4/loadmato.hpp           |  58 ++
 components/esm4/loadmisc.cpp           |  95 +++
 components/esm4/loadmisc.hpp           |  77 ++
 components/esm4/loadmset.cpp           | 115 +++
 components/esm4/loadmset.hpp           |  99 +++
 components/esm4/loadmstt.cpp           |  87 +++
 components/esm4/loadmstt.hpp           |  60 ++
 components/esm4/loadmusc.cpp           |  86 +++
 components/esm4/loadmusc.hpp           |  60 ++
 components/esm4/loadnavi.cpp           | 373 ++++++++++
 components/esm4/loadnavi.hpp           | 117 +++
 components/esm4/loadnavm.cpp           | 270 +++++++
 components/esm4/loadnavm.hpp           | 112 +++
 components/esm4/loadnote.cpp           |  86 +++
 components/esm4/loadnote.hpp           |  60 ++
 components/esm4/loadnpc.cpp            | 333 +++++++++
 components/esm4/loadnpc.hpp            | 230 ++++++
 components/esm4/loadotft.cpp           |  84 +++
 components/esm4/loadotft.hpp           |  60 ++
 components/esm4/loadpack.cpp           | 200 ++++++
 components/esm4/loadpack.hpp           | 110 +++
 components/esm4/loadpgrd.cpp           | 177 +++++
 components/esm4/loadpgrd.hpp           |  96 +++
 components/esm4/loadpgre.cpp           | 105 +++
 components/esm4/loadpgre.hpp           |  59 ++
 components/esm4/loadpwat.cpp           |  82 +++
 components/esm4/loadpwat.hpp           |  59 ++
 components/esm4/loadqust.cpp           | 179 +++++
 components/esm4/loadqust.hpp           |  84 +++
 components/esm4/loadrace.cpp           | 715 +++++++++++++++++++
 components/esm4/loadrace.hpp           | 174 +++++
 components/esm4/loadrefr.cpp           | 349 +++++++++
 components/esm4/loadrefr.hpp           | 119 ++++
 components/esm4/loadregn.cpp           | 164 +++++
 components/esm4/loadregn.hpp           |  98 +++
 components/esm4/loadroad.cpp           | 123 ++++
 components/esm4/loadroad.hpp           |  89 +++
 components/esm4/loadsbsp.cpp           |  78 ++
 components/esm4/loadsbsp.hpp           |  64 ++
 components/esm4/loadscol.cpp           |  84 +++
 components/esm4/loadscol.hpp           |  59 ++
 components/esm4/loadscpt.cpp           | 173 +++++
 components/esm4/loadscpt.hpp           |  59 ++
 components/esm4/loadscrl.cpp           |  99 +++
 components/esm4/loadscrl.hpp           |  68 ++
 components/esm4/loadsgst.cpp           | 118 ++++
 components/esm4/loadsgst.hpp           |  75 ++
 components/esm4/loadslgm.cpp           |  91 +++
 components/esm4/loadslgm.hpp           |  76 ++
 components/esm4/loadsndr.cpp           |  94 +++
 components/esm4/loadsndr.hpp           |  86 +++
 components/esm4/loadsoun.cpp           |  95 +++
 components/esm4/loadsoun.hpp           | 101 +++
 components/esm4/loadstat.cpp           | 101 +++
 components/esm4/loadstat.hpp           |  62 ++
 components/esm4/loadtact.cpp           |  89 +++
 components/esm4/loadtact.hpp           |  76 ++
 components/esm4/loadterm.cpp           | 101 +++
 components/esm4/loadterm.hpp           |  66 ++
 components/esm4/loadtes4.cpp           | 113 +++
 components/esm4/loadtes4.hpp           |  69 ++
 components/esm4/loadtree.cpp           |  85 +++
 components/esm4/loadtree.hpp           |  62 ++
 components/esm4/loadtxst.cpp           |  92 +++
 components/esm4/loadtxst.hpp           |  66 ++
 components/esm4/loadweap.cpp           | 188 +++++
 components/esm4/loadweap.hpp           |  96 +++
 components/esm4/loadwrld.cpp           | 205 ++++++
 components/esm4/loadwrld.hpp           | 137 ++++
 components/esm4/reader.cpp             | 639 +++++++++++++++++
 components/esm4/reader.hpp             | 298 ++++++++
 components/esm4/records.hpp            |  74 ++
 components/esm4/reference.hpp          |  68 ++
 components/esm4/script.hpp             | 384 ++++++++++
 components/to_utf8/to_utf8.cpp         |  40 +-
 components/to_utf8/to_utf8.hpp         |   3 +
 components/translation/translation.cpp |  11 +-
 179 files changed, 20848 insertions(+), 18 deletions(-)
 create mode 100644 components/esm/common.cpp
 create mode 100644 components/esm/common.hpp
 create mode 100644 components/esm/reader.cpp
 create mode 100644 components/esm/reader.hpp
 create mode 100644 components/esm4/acti.hpp
 create mode 100644 components/esm4/actor.hpp
 create mode 100644 components/esm4/common.cpp
 create mode 100644 components/esm4/common.hpp
 create mode 100644 components/esm4/dialogue.hpp
 create mode 100644 components/esm4/effect.hpp
 create mode 100644 components/esm4/formid.cpp
 create mode 100644 components/esm4/formid.hpp
 create mode 100644 components/esm4/inventory.hpp
 create mode 100644 components/esm4/lighting.hpp
 create mode 100644 components/esm4/loadachr.cpp
 create mode 100644 components/esm4/loadachr.hpp
 create mode 100644 components/esm4/loadacre.cpp
 create mode 100644 components/esm4/loadacre.hpp
 create mode 100644 components/esm4/loadacti.cpp
 create mode 100644 components/esm4/loadalch.cpp
 create mode 100644 components/esm4/loadalch.hpp
 create mode 100644 components/esm4/loadaloc.cpp
 create mode 100644 components/esm4/loadaloc.hpp
 create mode 100644 components/esm4/loadammo.cpp
 create mode 100644 components/esm4/loadammo.hpp
 create mode 100644 components/esm4/loadanio.cpp
 create mode 100644 components/esm4/loadanio.hpp
 create mode 100644 components/esm4/loadappa.cpp
 create mode 100644 components/esm4/loadappa.hpp
 create mode 100644 components/esm4/loadarma.cpp
 create mode 100644 components/esm4/loadarma.hpp
 create mode 100644 components/esm4/loadarmo.cpp
 create mode 100644 components/esm4/loadarmo.hpp
 create mode 100644 components/esm4/loadaspc.cpp
 create mode 100644 components/esm4/loadaspc.hpp
 create mode 100644 components/esm4/loadbook.cpp
 create mode 100644 components/esm4/loadbook.hpp
 create mode 100644 components/esm4/loadbptd.cpp
 create mode 100644 components/esm4/loadbptd.hpp
 create mode 100644 components/esm4/loadcell.cpp
 create mode 100644 components/esm4/loadcell.hpp
 create mode 100644 components/esm4/loadclas.cpp
 create mode 100644 components/esm4/loadclas.hpp
 create mode 100644 components/esm4/loadclfm.cpp
 create mode 100644 components/esm4/loadclfm.hpp
 create mode 100644 components/esm4/loadclot.cpp
 create mode 100644 components/esm4/loadclot.hpp
 create mode 100644 components/esm4/loadcont.cpp
 create mode 100644 components/esm4/loadcont.hpp
 create mode 100644 components/esm4/loadcrea.cpp
 create mode 100644 components/esm4/loadcrea.hpp
 create mode 100644 components/esm4/loaddial.cpp
 create mode 100644 components/esm4/loaddial.hpp
 create mode 100644 components/esm4/loaddobj.cpp
 create mode 100644 components/esm4/loaddobj.hpp
 create mode 100644 components/esm4/loaddoor.cpp
 create mode 100644 components/esm4/loaddoor.hpp
 create mode 100644 components/esm4/loadeyes.cpp
 create mode 100644 components/esm4/loadeyes.hpp
 create mode 100644 components/esm4/loadflor.cpp
 create mode 100644 components/esm4/loadflor.hpp
 create mode 100644 components/esm4/loadflst.cpp
 create mode 100644 components/esm4/loadflst.hpp
 create mode 100644 components/esm4/loadfurn.cpp
 create mode 100644 components/esm4/loadfurn.hpp
 create mode 100644 components/esm4/loadglob.cpp
 create mode 100644 components/esm4/loadglob.hpp
 create mode 100644 components/esm4/loadgras.cpp
 create mode 100644 components/esm4/loadgras.hpp
 create mode 100644 components/esm4/loadgrup.hpp
 create mode 100644 components/esm4/loadhair.cpp
 create mode 100644 components/esm4/loadhair.hpp
 create mode 100644 components/esm4/loadhdpt.cpp
 create mode 100644 components/esm4/loadhdpt.hpp
 create mode 100644 components/esm4/loadidle.cpp
 create mode 100644 components/esm4/loadidle.hpp
 create mode 100644 components/esm4/loadidlm.cpp
 create mode 100644 components/esm4/loadidlm.hpp
 create mode 100644 components/esm4/loadimod.cpp
 create mode 100644 components/esm4/loadimod.hpp
 create mode 100644 components/esm4/loadinfo.cpp
 create mode 100644 components/esm4/loadinfo.hpp
 create mode 100644 components/esm4/loadingr.cpp
 create mode 100644 components/esm4/loadingr.hpp
 create mode 100644 components/esm4/loadkeym.cpp
 create mode 100644 components/esm4/loadkeym.hpp
 create mode 100644 components/esm4/loadland.cpp
 create mode 100644 components/esm4/loadland.hpp
 create mode 100644 components/esm4/loadlgtm.cpp
 create mode 100644 components/esm4/loadlgtm.hpp
 create mode 100644 components/esm4/loadligh.cpp
 create mode 100644 components/esm4/loadligh.hpp
 create mode 100644 components/esm4/loadltex.cpp
 create mode 100644 components/esm4/loadltex.hpp
 create mode 100644 components/esm4/loadlvlc.cpp
 create mode 100644 components/esm4/loadlvlc.hpp
 create mode 100644 components/esm4/loadlvli.cpp
 create mode 100644 components/esm4/loadlvli.hpp
 create mode 100644 components/esm4/loadlvln.cpp
 create mode 100644 components/esm4/loadlvln.hpp
 create mode 100644 components/esm4/loadmato.cpp
 create mode 100644 components/esm4/loadmato.hpp
 create mode 100644 components/esm4/loadmisc.cpp
 create mode 100644 components/esm4/loadmisc.hpp
 create mode 100644 components/esm4/loadmset.cpp
 create mode 100644 components/esm4/loadmset.hpp
 create mode 100644 components/esm4/loadmstt.cpp
 create mode 100644 components/esm4/loadmstt.hpp
 create mode 100644 components/esm4/loadmusc.cpp
 create mode 100644 components/esm4/loadmusc.hpp
 create mode 100644 components/esm4/loadnavi.cpp
 create mode 100644 components/esm4/loadnavi.hpp
 create mode 100644 components/esm4/loadnavm.cpp
 create mode 100644 components/esm4/loadnavm.hpp
 create mode 100644 components/esm4/loadnote.cpp
 create mode 100644 components/esm4/loadnote.hpp
 create mode 100644 components/esm4/loadnpc.cpp
 create mode 100644 components/esm4/loadnpc.hpp
 create mode 100644 components/esm4/loadotft.cpp
 create mode 100644 components/esm4/loadotft.hpp
 create mode 100644 components/esm4/loadpack.cpp
 create mode 100644 components/esm4/loadpack.hpp
 create mode 100644 components/esm4/loadpgrd.cpp
 create mode 100644 components/esm4/loadpgrd.hpp
 create mode 100644 components/esm4/loadpgre.cpp
 create mode 100644 components/esm4/loadpgre.hpp
 create mode 100644 components/esm4/loadpwat.cpp
 create mode 100644 components/esm4/loadpwat.hpp
 create mode 100644 components/esm4/loadqust.cpp
 create mode 100644 components/esm4/loadqust.hpp
 create mode 100644 components/esm4/loadrace.cpp
 create mode 100644 components/esm4/loadrace.hpp
 create mode 100644 components/esm4/loadrefr.cpp
 create mode 100644 components/esm4/loadrefr.hpp
 create mode 100644 components/esm4/loadregn.cpp
 create mode 100644 components/esm4/loadregn.hpp
 create mode 100644 components/esm4/loadroad.cpp
 create mode 100644 components/esm4/loadroad.hpp
 create mode 100644 components/esm4/loadsbsp.cpp
 create mode 100644 components/esm4/loadsbsp.hpp
 create mode 100644 components/esm4/loadscol.cpp
 create mode 100644 components/esm4/loadscol.hpp
 create mode 100644 components/esm4/loadscpt.cpp
 create mode 100644 components/esm4/loadscpt.hpp
 create mode 100644 components/esm4/loadscrl.cpp
 create mode 100644 components/esm4/loadscrl.hpp
 create mode 100644 components/esm4/loadsgst.cpp
 create mode 100644 components/esm4/loadsgst.hpp
 create mode 100644 components/esm4/loadslgm.cpp
 create mode 100644 components/esm4/loadslgm.hpp
 create mode 100644 components/esm4/loadsndr.cpp
 create mode 100644 components/esm4/loadsndr.hpp
 create mode 100644 components/esm4/loadsoun.cpp
 create mode 100644 components/esm4/loadsoun.hpp
 create mode 100644 components/esm4/loadstat.cpp
 create mode 100644 components/esm4/loadstat.hpp
 create mode 100644 components/esm4/loadtact.cpp
 create mode 100644 components/esm4/loadtact.hpp
 create mode 100644 components/esm4/loadterm.cpp
 create mode 100644 components/esm4/loadterm.hpp
 create mode 100644 components/esm4/loadtes4.cpp
 create mode 100644 components/esm4/loadtes4.hpp
 create mode 100644 components/esm4/loadtree.cpp
 create mode 100644 components/esm4/loadtree.hpp
 create mode 100644 components/esm4/loadtxst.cpp
 create mode 100644 components/esm4/loadtxst.hpp
 create mode 100644 components/esm4/loadweap.cpp
 create mode 100644 components/esm4/loadweap.hpp
 create mode 100644 components/esm4/loadwrld.cpp
 create mode 100644 components/esm4/loadwrld.hpp
 create mode 100644 components/esm4/reader.cpp
 create mode 100644 components/esm4/reader.hpp
 create mode 100644 components/esm4/records.hpp
 create mode 100644 components/esm4/reference.hpp
 create mode 100644 components/esm4/script.hpp

diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 2d986660bc..3a7b1a43b8 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -76,7 +76,7 @@ add_component_dir (to_utf8
     to_utf8
     )
 
-add_component_dir(esm attr defs esmcommon records util luascripts)
+add_component_dir(esm attr common defs esmcommon reader records util luascripts)
 
 add_component_dir (esm3
     esmreader esmwriter loadacti loadalch loadappa loadarmo loadbody loadbook loadbsgn loadcell
@@ -94,6 +94,16 @@ add_component_dir (esm3terrain
     storage
     )
 
+add_component_dir (esm4
+    loadachr loadacre loadacti loadalch loadaloc loadammo loadanio loadappa loadarma loadarmo loadaspc loadbook
+    loadbptd loadcell loadclas loadclfm loadclot common loadcont loadcrea loaddial loaddobj loaddoor loadeyes
+    loadflor loadflst formid loadfurn loadglob loadgras loadhair loadhdpt loadidle loadidlm loadimod loadinfo
+    loadingr loadkeym loadland loadlgtm loadligh loadltex loadlvlc loadlvli loadlvln loadmato loadmisc loadmset
+    loadmstt loadmusc loadnavi loadnavm loadnote loadnpc loadotft loadpack loadpgrd loadpgre loadpwat loadqust
+    loadrace loadrefr loadregn loadroad loadsbsp loadscol loadscpt loadscrl loadsgst loadslgm loadsndr
+    loadsoun loadstat loadtact loadterm loadtes4 loadtree loadtxst loadweap loadwrld reader
+)
+
 add_component_dir (misc
     constants utf8stream stringops resourcehelpers rng messageformatparser weakcache thread
     compression osguservalues errorMarker color
diff --git a/components/esm/common.cpp b/components/esm/common.cpp
new file mode 100644
index 0000000000..d04033edef
--- /dev/null
+++ b/components/esm/common.cpp
@@ -0,0 +1,15 @@
+#include "sstream"
+
+namespace ESM
+{
+    std::string printName(const std::uint32_t typeId)
+    {
+        unsigned char typeName[4];
+        typeName[0] =  typeId        & 0xff;
+        typeName[1] = (typeId >>  8) & 0xff;
+        typeName[2] = (typeId >> 16) & 0xff;
+        typeName[3] = (typeId >> 24) & 0xff;
+
+        return std::string((char*)typeName, 4);
+    }
+}
diff --git a/components/esm/common.hpp b/components/esm/common.hpp
new file mode 100644
index 0000000000..3a8894e321
--- /dev/null
+++ b/components/esm/common.hpp
@@ -0,0 +1,57 @@
+#ifndef COMPONENT_ESM_COMMON_H
+#define COMPONENT_ESM_COMMON_H
+
+#include <cstdint>
+#include <string>
+
+namespace ESM
+{
+#pragma pack(push, 1)
+    union ESMVersion
+    {
+        float         f;
+        std::uint32_t ui;
+    };
+
+    union TypeId
+    {
+        std::uint32_t value;
+        char name[4]; // record type in ascii
+    };
+#pragma pack(pop)
+
+    enum ESMVersions
+    {
+        VER_120 = 0x3f99999a, // TES3
+        VER_130 = 0x3fa66666, // TES3
+        VER_080 = 0x3f4ccccd, // TES4
+        VER_100 = 0x3f800000, // TES4
+        VER_132 = 0x3fa8f5c3, // FONV Courier's Stash, DeadMoney
+        VER_133 = 0x3faa3d71, // FONV HonestHearts
+        VER_134 = 0x3fab851f, // FONV, GunRunnersArsenal, LonesomeRoad, OldWorldBlues
+        VER_094 = 0x3f70a3d7, // TES5/FO3
+        VER_170 = 0x3fd9999a  // TES5
+    };
+
+    // Defines another files (esm or esp) that this file depends upon.
+    struct MasterData
+    {
+        std::string   name;
+        std::uint64_t size;
+    };
+
+    enum VarType
+    {
+        VT_Unknown = 0,
+        VT_None,
+        VT_Short, // stored as a float, kinda
+        VT_Int,
+        VT_Long, // stored as a float
+        VT_Float,
+        VT_String
+    };
+
+    std::string printName(const std::uint32_t typeId);
+}
+
+#endif // COMPONENT_ESM_COMMON_H
diff --git a/components/esm/reader.cpp b/components/esm/reader.cpp
new file mode 100644
index 0000000000..1f22b95b47
--- /dev/null
+++ b/components/esm/reader.cpp
@@ -0,0 +1,114 @@
+#include "reader.hpp"
+
+//#ifdef NDEBUG
+//#undef NDEBUG
+//#endif
+
+#include <cassert>
+#include <stdexcept>
+
+#include <components/files/constrainedfilestream.hpp>
+
+#include "components/esm3/esmreader.hpp"
+#include "components/esm4/reader.hpp"
+
+namespace ESM
+{
+    Reader* Reader::getReader(const std::string &filename)
+    {
+        Files::IStreamPtr esmStream(Files::openConstrainedFileStream (filename.c_str ()));
+
+        std::uint32_t modVer = 0; // get the first 4 bytes of the record header only
+        esmStream->read((char*)&modVer, sizeof(modVer));
+        if (esmStream->gcount() == sizeof(modVer))
+        {
+            esmStream->seekg(0);
+
+            if (modVer == ESM4::REC_TES4)
+            {
+                return new ESM4::Reader(esmStream, filename);
+            }
+            else
+            {
+                //return new ESM3::ESMReader(esmStream, filename);
+            }
+        }
+
+        throw std::runtime_error("Unknown file format");
+    }
+
+    bool Reader::getStringImpl(std::string& str, std::size_t size,
+            Files::IStreamPtr filestream, ToUTF8::Utf8Encoder* encoder, bool hasNull)
+    {
+        std::size_t newSize = size;
+
+        if (encoder)
+        {
+            if (!hasNull)
+                newSize += 1; // Utf8Encoder::getLength() expects a null terminator
+
+            std::string tmp;
+            tmp.resize(newSize);
+            filestream->read(&tmp[0], size);
+            if ((std::size_t)filestream->gcount() == size)
+            {
+                if (hasNull)
+                {
+                    assert (tmp[newSize - 1] == '\0'
+                            && "ESM4::Reader::getString string is not terminated with a null");
+                }
+                else
+                {
+                    // NOTE: script text of some mods have terminating null;
+                    //       unfortunately we just have to deal with it
+                    //if (tmp[newSize - 2] != '\0')
+                    tmp[newSize - 1] = '\0'; // for Utf8Encoder::getLength()
+                }
+
+                encoder->toUtf8(tmp, str, newSize - 1);
+                // NOTE: the encoder converts “keep” as “keep†which increases the length,
+                //       which results in below resize() truncating the string
+                if (str.size() == newSize)   // ascii
+                    str.resize(newSize - 1); // don't want the null terminator
+                else
+                {
+                    // this is a horrible hack but fortunately there's only a few like this
+                    std::string tmp2(str.data());
+                    str.swap(tmp2);
+                }
+
+                return true;
+            }
+        }
+        else
+        {
+            if (hasNull)
+                newSize -= 1; // don't read the null terminator yet
+
+            str.resize(newSize); // assumed C++11
+            filestream->read(&str[0], newSize);
+            if ((std::size_t)filestream->gcount() == newSize)
+            {
+                if (hasNull)
+                {
+                    char ch;
+                    filestream->read(&ch, 1); // read the null terminator
+                    assert (ch == '\0'
+                            && "ESM4::Reader::getString string is not terminated with a null");
+                }
+#if 0
+                else
+                {
+                    // NOTE: normal ESMs don't but omwsave has locals or spells with null terminator
+                    assert (str[newSize - 1] != '\0'
+                            && "ESM4::Reader::getString string is unexpectedly terminated with a null");
+                }
+#endif
+                return true;
+            }
+        }
+
+        str.clear();
+        return false; // FIXME: throw instead?
+    }
+}
diff --git a/components/esm/reader.hpp b/components/esm/reader.hpp
new file mode 100644
index 0000000000..a5e3dd516b
--- /dev/null
+++ b/components/esm/reader.hpp
@@ -0,0 +1,60 @@
+#ifndef COMPONENT_ESM_READER_H
+#define COMPONENT_ESM_READER_H
+
+#include <vector>
+
+#include <components/files/constrainedfilestream.hpp>
+#include <components/to_utf8/to_utf8.hpp>
+
+#include "common.hpp" // MasterData
+
+namespace ToUTF8
+{
+    class Utf8Encoder;
+}
+
+namespace ESM
+{
+    class Reader
+    {
+        std::vector<Reader*>* mGlobalReaderList;
+
+    public:
+        virtual ~Reader() {}
+
+        static Reader* getReader(const std::string& filename);
+
+        void setGlobalReaderList(std::vector<Reader*> *list) {mGlobalReaderList = list;}
+        std::vector<Reader*> *getGlobalReaderList() {return mGlobalReaderList;}
+
+        virtual inline bool isEsm4() const = 0;
+
+        virtual inline bool hasMoreRecs() const = 0;
+
+        virtual inline void setEncoder(ToUTF8::Utf8Encoder* encoder) = 0;
+
+        // used to check for dependencies e.g. CS::Editor::run()
+        virtual inline const std::vector<ESM::MasterData>& getGameFiles() const = 0;
+
+        // used by ContentSelector::ContentModel::addFiles()
+        virtual inline const std::string getAuthor() const = 0;
+        virtual inline const std::string getDesc() const = 0;
+        virtual inline int getFormat() const = 0;
+
+        virtual inline std::string getFileName() const = 0;
+
+        // used by CSMWorld::Data::startLoading() and getTotalRecords() for loading progress bar
+        virtual inline int getRecordCount() const = 0;
+
+        virtual void setModIndex(std::uint32_t index) = 0;
+
+        // used by CSMWorld::Data::getTotalRecords()
+        virtual void close() = 0;
+
+    protected:
+        bool getStringImpl(std::string& str, std::size_t size,
+                Files::IStreamPtr filestream, ToUTF8::Utf8Encoder* encoder, bool hasNull = false);
+    };
+}
+
+#endif // COMPONENT_ESM_READER_H
diff --git a/components/esm4/acti.hpp b/components/esm4/acti.hpp
new file mode 100644
index 0000000000..4ec3fe1e5e
--- /dev/null
+++ b/components/esm4/acti.hpp
@@ -0,0 +1,70 @@
+/*
+  Copyright (C) 2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_ACTI_H
+#define ESM4_ACTI_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Activator
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mFullName;
+        std::string mModel;
+
+        FormId mScriptId;
+        FormId mLoopingSound;    // SOUN
+        FormId mActivationSound; // SOUN
+
+        float mBoundRadius;
+
+        FormId mRadioTemplate; // SOUN
+        FormId mRadioStation;  // TACT
+
+        std::string mActivationPrompt;
+
+        Activator();
+        virtual ~Activator();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_ACTI_H
diff --git a/components/esm4/actor.hpp b/components/esm4/actor.hpp
new file mode 100644
index 0000000000..ae56a49564
--- /dev/null
+++ b/components/esm4/actor.hpp
@@ -0,0 +1,163 @@
+/*
+  Copyright (C) 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_ACTOR_H
+#define ESM4_ACTOR_H
+
+#include <cstdint>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+#pragma pack(push, 1)
+    struct AIData        // NPC_, CREA
+    {
+        std::uint8_t  aggression;
+        std::uint8_t  confidence;
+        std::uint8_t  energyLevel;
+        std::uint8_t  responsibility;
+        std::uint32_t aiFlags;
+        std::uint8_t  trainSkill;
+        std::uint8_t  trainLevel;
+        std::uint16_t unknown;
+    };
+
+    struct AttributeValues
+    {
+        std::uint8_t  strength;
+        std::uint8_t  intelligence;
+        std::uint8_t  willpower;
+        std::uint8_t  agility;
+        std::uint8_t  speed;
+        std::uint8_t  endurance;
+        std::uint8_t  personality;
+        std::uint8_t  luck;
+    };
+
+    struct ACBS_TES4
+    {
+        std::uint32_t flags;
+        std::uint16_t baseSpell;
+        std::uint16_t fatigue;
+        std::uint16_t barterGold;
+        std::int16_t  levelOrOffset;
+        std::uint16_t calcMin;
+        std::uint16_t calcMax;
+        std::uint32_t padding1;
+        std::uint32_t padding2;
+    };
+
+    struct ACBS_FO3
+    {
+        std::uint32_t flags;
+        std::uint16_t fatigue;
+        std::uint16_t barterGold;
+        std::int16_t  levelOrMult;
+        std::uint16_t calcMinlevel;
+        std::uint16_t calcMaxlevel;
+        std::uint16_t speedMultiplier;
+        float         karma;
+        std::int16_t  dispositionBase;
+        std::uint16_t templateFlags;
+    };
+
+    struct ACBS_TES5
+    {
+        std::uint32_t flags;
+        std::uint16_t magickaOffset;
+        std::uint16_t staminaOffset;
+        std::uint16_t levelOrMult;     // TODO: check if int16_t
+        std::uint16_t calcMinlevel;
+        std::uint16_t calcMaxlevel;
+        std::uint16_t speedMultiplier;
+        std::uint16_t dispositionBase; // TODO: check if int16_t
+        std::uint16_t templateFlags;
+        std::uint16_t healthOffset;
+        std::uint16_t bleedoutOverride;
+    };
+
+    union ActorBaseConfig
+    {
+        ACBS_TES4 tes4;
+        ACBS_FO3  fo3;
+        ACBS_TES5 tes5;
+    };
+
+    struct ActorFaction
+    {
+        FormId       faction;
+        std::int8_t  rank;
+        std::uint8_t unknown1;
+        std::uint8_t unknown2;
+        std::uint8_t unknown3;
+    };
+#pragma pack(pop)
+
+    struct BodyTemplate // TES5
+    {
+        // 0x00000001 - Head
+        // 0x00000002 - Hair
+        // 0x00000004 - Body
+        // 0x00000008 - Hands
+        // 0x00000010 - Forearms
+        // 0x00000020 - Amulet
+        // 0x00000040 - Ring
+        // 0x00000080 - Feet
+        // 0x00000100 - Calves
+        // 0x00000200 - Shield
+        // 0x00000400 - Tail
+        // 0x00000800 - Long Hair
+        // 0x00001000 - Circlet
+        // 0x00002000 - Ears
+        // 0x00004000 - Body AddOn 3
+        // 0x00008000 - Body AddOn 4
+        // 0x00010000 - Body AddOn 5
+        // 0x00020000 - Body AddOn 6
+        // 0x00040000 - Body AddOn 7
+        // 0x00080000 - Body AddOn 8
+        // 0x00100000 - Decapitate Head
+        // 0x00200000 - Decapitate
+        // 0x00400000 - Body AddOn 9
+        // 0x00800000 - Body AddOn 10
+        // 0x01000000 - Body AddOn 11
+        // 0x02000000 - Body AddOn 12
+        // 0x04000000 - Body AddOn 13
+        // 0x08000000 - Body AddOn 14
+        // 0x10000000 - Body AddOn 15
+        // 0x20000000 - Body AddOn 16
+        // 0x40000000 - Body AddOn 17
+        // 0x80000000 - FX01
+        std::uint32_t bodyPart;
+        std::uint8_t flags;
+        std::uint8_t unknown1; // probably padding
+        std::uint8_t unknown2; // probably padding
+        std::uint8_t unknown3; // probably padding
+        std::uint32_t type; // 0 = light, 1 = heavy, 2 = none (cloth?)
+    };
+}
+
+#endif // ESM4_ACTOR_H
diff --git a/components/esm4/common.cpp b/components/esm4/common.cpp
new file mode 100644
index 0000000000..752660fd85
--- /dev/null
+++ b/components/esm4/common.cpp
@@ -0,0 +1,100 @@
+/*
+  Copyright (C) 2015-2016, 2018, 2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "common.hpp"
+
+#include <sstream>
+#include <algorithm>
+#include <stdexcept>
+
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    const char *sGroupType[] =
+    {
+        "Record Type", "World Child", "Interior Cell", "Interior Sub Cell", "Exterior Cell",
+        "Exterior Sub Cell", "Cell Child", "Topic Child", "Cell Persistent Child",
+        "Cell Temporary Child", "Cell Visible Dist Child", "Unknown"
+    };
+
+    std::string printLabel(const GroupLabel& label, const std::uint32_t type)
+    {
+        std::ostringstream ss;
+        ss << std::string(sGroupType[std::min(type, (uint32_t)11)]); // avoid out of range
+
+        switch (type)
+        {
+            case ESM4::Grp_RecordType:
+            {
+                ss << ": " << std::string((char*)label.recordType, 4);
+                break;
+            }
+            case ESM4::Grp_ExteriorCell:
+            case ESM4::Grp_ExteriorSubCell:
+            {
+                //short x, y;
+                //y = label & 0xff;
+                //x = (label >> 16) & 0xff;
+                ss << ": grid (x, y) " << std::dec << label.grid[1] << ", " << label.grid[0];
+
+                break;
+            }
+            case ESM4::Grp_InteriorCell:
+            case ESM4::Grp_InteriorSubCell:
+            {
+                ss << ": block 0x" << std::hex << label.value;
+                break;
+            }
+            case ESM4::Grp_WorldChild:
+            case ESM4::Grp_CellChild:
+            case ESM4::Grp_TopicChild:
+            case ESM4::Grp_CellPersistentChild:
+            case ESM4::Grp_CellTemporaryChild:
+            case ESM4::Grp_CellVisibleDistChild:
+            {
+                ss << ": FormId 0x" << formIdToString(label.value);
+                break;
+            }
+            default:
+                break;
+        }
+
+        return ss.str();
+    }
+
+    void gridToString(std::int16_t x, std::int16_t y, std::string& str)
+    {
+        char buf[6+6+2+1]; // longest signed 16 bit number is 6 characters (-32768)
+        int res = snprintf(buf, 6+6+2+1, "#%d %d", x, y);
+        if (res > 0 && res < 6+6+2+1)
+            str.assign(buf);
+        else
+            throw std::runtime_error("possible buffer overflow while converting grid");
+    }
+}
diff --git a/components/esm4/common.hpp b/components/esm4/common.hpp
new file mode 100644
index 0000000000..2f769c28c9
--- /dev/null
+++ b/components/esm4/common.hpp
@@ -0,0 +1,939 @@
+/*
+  Copyright (C) 2015-2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+  MKTAG macro was adapated from ScummVM.
+
+*/
+#ifndef ESM4_COMMON_H
+#define ESM4_COMMON_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+// From ScummVM's endianness.h but for little endian
+#ifndef MKTAG
+#define MKTAG(a0,a1,a2,a3) ((std::uint32_t)((a0) | ((a1) << 8) | ((a2) << 16) | ((a3) << 24)))
+#endif
+
+namespace ESM4
+{
+
+    // Based on http://www.uesp.net/wiki/Tes5Mod:Mod_File_Format
+    enum RecordTypes
+    {
+        REC_AACT = MKTAG('A','A','C','T'), // Action
+        REC_ACHR = MKTAG('A','C','H','R'), // Actor Reference
+        REC_ACTI = MKTAG('A','C','T','I'), // Activator
+        REC_ADDN = MKTAG('A','D','D','N'), // Addon Node
+        REC_ALCH = MKTAG('A','L','C','H'), // Potion
+        REC_AMMO = MKTAG('A','M','M','O'), // Ammo
+        REC_ANIO = MKTAG('A','N','I','O'), // Animated Object
+        REC_APPA = MKTAG('A','P','P','A'), // Apparatus (probably unused)
+        REC_ARMA = MKTAG('A','R','M','A'), // Armature (Model)
+        REC_ARMO = MKTAG('A','R','M','O'), // Armor
+        REC_ARTO = MKTAG('A','R','T','O'), // Art Object
+        REC_ASPC = MKTAG('A','S','P','C'), // Acoustic Space
+        REC_ASTP = MKTAG('A','S','T','P'), // Association Type
+        REC_AVIF = MKTAG('A','V','I','F'), // Actor Values/Perk Tree Graphics
+        REC_BOOK = MKTAG('B','O','O','K'), // Book
+        REC_BPTD = MKTAG('B','P','T','D'), // Body Part Data
+        REC_CAMS = MKTAG('C','A','M','S'), // Camera Shot
+        REC_CELL = MKTAG('C','E','L','L'), // Cell
+        REC_CLAS = MKTAG('C','L','A','S'), // Class
+        REC_CLFM = MKTAG('C','L','F','M'), // Color
+        REC_CLMT = MKTAG('C','L','M','T'), // Climate
+        REC_CLOT = MKTAG('C','L','O','T'), // Clothing
+        REC_COBJ = MKTAG('C','O','B','J'), // Constructible Object (recipes)
+        REC_COLL = MKTAG('C','O','L','L'), // Collision Layer
+        REC_CONT = MKTAG('C','O','N','T'), // Container
+        REC_CPTH = MKTAG('C','P','T','H'), // Camera Path
+        REC_CREA = MKTAG('C','R','E','A'), // Creature
+        REC_CSTY = MKTAG('C','S','T','Y'), // Combat Style
+        REC_DEBR = MKTAG('D','E','B','R'), // Debris
+        REC_DIAL = MKTAG('D','I','A','L'), // Dialog Topic
+        REC_DLBR = MKTAG('D','L','B','R'), // Dialog Branch
+        REC_DLVW = MKTAG('D','L','V','W'), // Dialog View
+        REC_DOBJ = MKTAG('D','O','B','J'), // Default Object Manager
+        REC_DOOR = MKTAG('D','O','O','R'), // Door
+        REC_DUAL = MKTAG('D','U','A','L'), // Dual Cast Data (possibly unused)
+      //REC_ECZN = MKTAG('E','C','Z','N'), // Encounter Zone
+        REC_EFSH = MKTAG('E','F','S','H'), // Effect Shader
+        REC_ENCH = MKTAG('E','N','C','H'), // Enchantment
+        REC_EQUP = MKTAG('E','Q','U','P'), // Equip Slot (flag-type values)
+        REC_EXPL = MKTAG('E','X','P','L'), // Explosion
+        REC_EYES = MKTAG('E','Y','E','S'), // Eyes
+        REC_FACT = MKTAG('F','A','C','T'), // Faction
+        REC_FLOR = MKTAG('F','L','O','R'), // Flora
+        REC_FLST = MKTAG('F','L','S','T'), // Form List (non-levelled list)
+        REC_FSTP = MKTAG('F','S','T','P'), // Footstep
+        REC_FSTS = MKTAG('F','S','T','S'), // Footstep Set
+        REC_FURN = MKTAG('F','U','R','N'), // Furniture
+        REC_GLOB = MKTAG('G','L','O','B'), // Global Variable
+        REC_GMST = MKTAG('G','M','S','T'), // Game Setting
+        REC_GRAS = MKTAG('G','R','A','S'), // Grass
+        REC_GRUP = MKTAG('G','R','U','P'), // Form Group
+        REC_HAIR = MKTAG('H','A','I','R'), // Hair
+      //REC_HAZD = MKTAG('H','A','Z','D'), // Hazard
+        REC_HDPT = MKTAG('H','D','P','T'), // Head Part
+        REC_IDLE = MKTAG('I','D','L','E'), // Idle Animation
+        REC_IDLM = MKTAG('I','D','L','M'), // Idle Marker
+        REC_IMAD = MKTAG('I','M','A','D'), // Image Space Modifier
+        REC_IMGS = MKTAG('I','M','G','S'), // Image Space
+        REC_INFO = MKTAG('I','N','F','O'), // Dialog Topic Info
+        REC_INGR = MKTAG('I','N','G','R'), // Ingredient
+        REC_IPCT = MKTAG('I','P','C','T'), // Impact Data
+        REC_IPDS = MKTAG('I','P','D','S'), // Impact Data Set
+        REC_KEYM = MKTAG('K','E','Y','M'), // Key
+        REC_KYWD = MKTAG('K','Y','W','D'), // Keyword
+        REC_LAND = MKTAG('L','A','N','D'), // Land
+        REC_LCRT = MKTAG('L','C','R','T'), // Location Reference Type
+        REC_LCTN = MKTAG('L','C','T','N'), // Location
+        REC_LGTM = MKTAG('L','G','T','M'), // Lighting Template
+        REC_LIGH = MKTAG('L','I','G','H'), // Light
+        REC_LSCR = MKTAG('L','S','C','R'), // Load Screen
+        REC_LTEX = MKTAG('L','T','E','X'), // Land Texture
+        REC_LVLC = MKTAG('L','V','L','C'), // Leveled Creature
+        REC_LVLI = MKTAG('L','V','L','I'), // Leveled Item
+        REC_LVLN = MKTAG('L','V','L','N'), // Leveled Actor
+        REC_LVSP = MKTAG('L','V','S','P'), // Leveled Spell
+        REC_MATO = MKTAG('M','A','T','O'), // Material Object
+        REC_MATT = MKTAG('M','A','T','T'), // Material Type
+        REC_MESG = MKTAG('M','E','S','G'), // Message
+        REC_MGEF = MKTAG('M','G','E','F'), // Magic Effect
+        REC_MISC = MKTAG('M','I','S','C'), // Misc. Object
+        REC_MOVT = MKTAG('M','O','V','T'), // Movement Type
+        REC_MSTT = MKTAG('M','S','T','T'), // Movable Static
+        REC_MUSC = MKTAG('M','U','S','C'), // Music Type
+        REC_MUST = MKTAG('M','U','S','T'), // Music Track
+        REC_NAVI = MKTAG('N','A','V','I'), // Navigation (master data)
+        REC_NAVM = MKTAG('N','A','V','M'), // Nav Mesh
+        REC_NOTE = MKTAG('N','O','T','E'), // Note
+        REC_NPC_ = MKTAG('N','P','C','_'), // Actor (NPC, Creature)
+        REC_OTFT = MKTAG('O','T','F','T'), // Outfit
+        REC_PACK = MKTAG('P','A','C','K'), // AI Package
+        REC_PERK = MKTAG('P','E','R','K'), // Perk
+        REC_PGRE = MKTAG('P','G','R','E'), // Placed grenade
+        REC_PHZD = MKTAG('P','H','Z','D'), // Placed hazard
+        REC_PROJ = MKTAG('P','R','O','J'), // Projectile
+        REC_QUST = MKTAG('Q','U','S','T'), // Quest
+        REC_RACE = MKTAG('R','A','C','E'), // Race / Creature type
+        REC_REFR = MKTAG('R','E','F','R'), // Object Reference
+        REC_REGN = MKTAG('R','E','G','N'), // Region (Audio/Weather)
+        REC_RELA = MKTAG('R','E','L','A'), // Relationship
+        REC_REVB = MKTAG('R','E','V','B'), // Reverb Parameters
+        REC_RFCT = MKTAG('R','F','C','T'), // Visual Effect
+        REC_SBSP = MKTAG('S','B','S','P'), // Subspace (TES4 only?)
+        REC_SCEN = MKTAG('S','C','E','N'), // Scene
+        REC_SCPT = MKTAG('S','C','P','T'), // Script
+        REC_SCRL = MKTAG('S','C','R','L'), // Scroll
+        REC_SGST = MKTAG('S','G','S','T'), // Sigil Stone
+        REC_SHOU = MKTAG('S','H','O','U'), // Shout
+        REC_SLGM = MKTAG('S','L','G','M'), // Soul Gem
+        REC_SMBN = MKTAG('S','M','B','N'), // Story Manager Branch Node
+        REC_SMEN = MKTAG('S','M','E','N'), // Story Manager Event Node
+        REC_SMQN = MKTAG('S','M','Q','N'), // Story Manager Quest Node
+        REC_SNCT = MKTAG('S','N','C','T'), // Sound Category
+        REC_SNDR = MKTAG('S','N','D','R'), // Sound Reference
+        REC_SOPM = MKTAG('S','O','P','M'), // Sound Output Model
+        REC_SOUN = MKTAG('S','O','U','N'), // Sound
+        REC_SPEL = MKTAG('S','P','E','L'), // Spell
+        REC_SPGD = MKTAG('S','P','G','D'), // Shader Particle Geometry
+        REC_STAT = MKTAG('S','T','A','T'), // Static
+        REC_TACT = MKTAG('T','A','C','T'), // Talking Activator
+        REC_TERM = MKTAG('T','E','R','M'), // Terminal
+        REC_TES4 = MKTAG('T','E','S','4'), // Plugin info
+        REC_TREE = MKTAG('T','R','E','E'), // Tree
+        REC_TXST = MKTAG('T','X','S','T'), // Texture Set
+        REC_VTYP = MKTAG('V','T','Y','P'), // Voice Type
+        REC_WATR = MKTAG('W','A','T','R'), // Water Type
+        REC_WEAP = MKTAG('W','E','A','P'), // Weapon
+        REC_WOOP = MKTAG('W','O','O','P'), // Word Of Power
+        REC_WRLD = MKTAG('W','R','L','D'), // World Space
+        REC_WTHR = MKTAG('W','T','H','R'), // Weather
+        REC_ACRE = MKTAG('A','C','R','E'), // Placed Creature (TES4 only?)
+        REC_PGRD = MKTAG('P','G','R','D'), // Pathgrid (TES4 only?)
+        REC_ROAD = MKTAG('R','O','A','D'), // Road (TES4 only?)
+        REC_IMOD = MKTAG('I','M','O','D'), // Item Mod
+        REC_PWAT = MKTAG('P','W','A','T'), // Placeable Water
+        REC_SCOL = MKTAG('S','C','O','L'), // Static Collection
+        REC_CCRD = MKTAG('C','C','R','D'), // Caravan Card
+        REC_CMNY = MKTAG('C','M','N','Y'), // Caravan Money
+        REC_ALOC = MKTAG('A','L','O','C'), // Audio Location Controller
+        REC_MSET = MKTAG('M','S','E','T')  // Media Set
+    };
+
+    enum SubRecordTypes
+    {
+        SUB_HEDR = MKTAG('H','E','D','R'),
+        SUB_CNAM = MKTAG('C','N','A','M'),
+        SUB_SNAM = MKTAG('S','N','A','M'), // TES4 only?
+        SUB_MAST = MKTAG('M','A','S','T'),
+        SUB_DATA = MKTAG('D','A','T','A'),
+        SUB_ONAM = MKTAG('O','N','A','M'),
+        SUB_INTV = MKTAG('I','N','T','V'),
+        SUB_INCC = MKTAG('I','N','C','C'),
+        SUB_OFST = MKTAG('O','F','S','T'), // TES4 only?
+        SUB_DELE = MKTAG('D','E','L','E'), // TES4 only?
+
+        SUB_DNAM = MKTAG('D','N','A','M'),
+        SUB_EDID = MKTAG('E','D','I','D'),
+        SUB_FULL = MKTAG('F','U','L','L'),
+        SUB_LTMP = MKTAG('L','T','M','P'),
+        SUB_MHDT = MKTAG('M','H','D','T'),
+        SUB_MNAM = MKTAG('M','N','A','M'),
+        SUB_MODL = MKTAG('M','O','D','L'),
+        SUB_NAM0 = MKTAG('N','A','M','0'),
+        SUB_NAM2 = MKTAG('N','A','M','2'),
+        SUB_NAM3 = MKTAG('N','A','M','3'),
+        SUB_NAM4 = MKTAG('N','A','M','4'),
+        SUB_NAM9 = MKTAG('N','A','M','9'),
+        SUB_NAMA = MKTAG('N','A','M','A'),
+        SUB_PNAM = MKTAG('P','N','A','M'),
+        SUB_RNAM = MKTAG('R','N','A','M'),
+        SUB_TNAM = MKTAG('T','N','A','M'),
+        SUB_UNAM = MKTAG('U','N','A','M'),
+        SUB_WCTR = MKTAG('W','C','T','R'),
+        SUB_WNAM = MKTAG('W','N','A','M'),
+        SUB_XEZN = MKTAG('X','E','Z','N'),
+        SUB_XLCN = MKTAG('X','L','C','N'),
+        SUB_XXXX = MKTAG('X','X','X','X'),
+        SUB_ZNAM = MKTAG('Z','N','A','M'),
+        SUB_MODT = MKTAG('M','O','D','T'),
+        SUB_ICON = MKTAG('I','C','O','N'), // TES4 only?
+
+        SUB_NVER = MKTAG('N','V','E','R'),
+        SUB_NVMI = MKTAG('N','V','M','I'),
+        SUB_NVPP = MKTAG('N','V','P','P'),
+        SUB_NVSI = MKTAG('N','V','S','I'),
+
+        SUB_NVNM = MKTAG('N','V','N','M'),
+        SUB_NNAM = MKTAG('N','N','A','M'),
+
+        SUB_XCLC = MKTAG('X','C','L','C'),
+        SUB_XCLL = MKTAG('X','C','L','L'),
+        SUB_TVDT = MKTAG('T','V','D','T'),
+        SUB_XCGD = MKTAG('X','C','G','D'),
+        SUB_LNAM = MKTAG('L','N','A','M'),
+        SUB_XCLW = MKTAG('X','C','L','W'),
+        SUB_XNAM = MKTAG('X','N','A','M'),
+        SUB_XCLR = MKTAG('X','C','L','R'),
+        SUB_XWCS = MKTAG('X','W','C','S'),
+        SUB_XWCN = MKTAG('X','W','C','N'),
+        SUB_XWCU = MKTAG('X','W','C','U'),
+        SUB_XCWT = MKTAG('X','C','W','T'),
+        SUB_XOWN = MKTAG('X','O','W','N'),
+        SUB_XILL = MKTAG('X','I','L','L'),
+        SUB_XWEM = MKTAG('X','W','E','M'),
+        SUB_XCCM = MKTAG('X','C','C','M'),
+        SUB_XCAS = MKTAG('X','C','A','S'),
+        SUB_XCMO = MKTAG('X','C','M','O'),
+        SUB_XCIM = MKTAG('X','C','I','M'),
+        SUB_XCMT = MKTAG('X','C','M','T'), // TES4 only?
+        SUB_XRNK = MKTAG('X','R','N','K'), // TES4 only?
+        SUB_XGLB = MKTAG('X','G','L','B'), // TES4 only?
+
+        SUB_VNML = MKTAG('V','N','M','L'),
+        SUB_VHGT = MKTAG('V','H','G','T'),
+        SUB_VCLR = MKTAG('V','C','L','R'),
+        SUA_BTXT = MKTAG('B','T','X','T'),
+        SUB_ATXT = MKTAG('A','T','X','T'),
+        SUB_VTXT = MKTAG('V','T','X','T'),
+        SUB_VTEX = MKTAG('V','T','E','X'),
+
+        SUB_HNAM = MKTAG('H','N','A','M'),
+        SUB_GNAM = MKTAG('G','N','A','M'),
+
+        SUB_RCLR = MKTAG('R','C','L','R'),
+        SUB_RPLI = MKTAG('R','P','L','I'),
+        SUB_RPLD = MKTAG('R','P','L','D'),
+        SUB_RDAT = MKTAG('R','D','A','T'),
+        SUB_RDMD = MKTAG('R','D','M','D'), // TES4 only?
+        SUB_RDSD = MKTAG('R','D','S','D'), // TES4 only?
+        SUB_RDGS = MKTAG('R','D','G','S'), // TES4 only?
+        SUB_RDMO = MKTAG('R','D','M','O'),
+        SUB_RDSA = MKTAG('R','D','S','A'),
+        SUB_RDWT = MKTAG('R','D','W','T'),
+        SUB_RDOT = MKTAG('R','D','O','T'),
+        SUB_RDMP = MKTAG('R','D','M','P'),
+
+        SUB_MODB = MKTAG('M','O','D','B'),
+        SUB_OBND = MKTAG('O','B','N','D'),
+        SUB_MODS = MKTAG('M','O','D','S'),
+
+        SUB_NAME = MKTAG('N','A','M','E'),
+        SUB_XMRK = MKTAG('X','M','R','K'),
+        SUB_FNAM = MKTAG('F','N','A','M'),
+        SUB_XSCL = MKTAG('X','S','C','L'),
+        SUB_XTEL = MKTAG('X','T','E','L'),
+        SUB_XTRG = MKTAG('X','T','R','G'),
+        SUB_XSED = MKTAG('X','S','E','D'),
+        SUB_XLOD = MKTAG('X','L','O','D'),
+        SUB_XPCI = MKTAG('X','P','C','I'),
+        SUB_XLOC = MKTAG('X','L','O','C'),
+        SUB_XESP = MKTAG('X','E','S','P'),
+        SUB_XLCM = MKTAG('X','L','C','M'),
+        SUB_XRTM = MKTAG('X','R','T','M'),
+        SUB_XACT = MKTAG('X','A','C','T'),
+        SUB_XCNT = MKTAG('X','C','N','T'),
+        SUB_VMAD = MKTAG('V','M','A','D'),
+        SUB_XPRM = MKTAG('X','P','R','M'),
+        SUB_XMBO = MKTAG('X','M','B','O'),
+        SUB_XPOD = MKTAG('X','P','O','D'),
+        SUB_XRMR = MKTAG('X','R','M','R'),
+        SUB_INAM = MKTAG('I','N','A','M'),
+        SUB_SCHR = MKTAG('S','C','H','R'),
+        SUB_XLRM = MKTAG('X','L','R','M'),
+        SUB_XRGD = MKTAG('X','R','G','D'),
+        SUB_XRDS = MKTAG('X','R','D','S'),
+        SUB_XEMI = MKTAG('X','E','M','I'),
+        SUB_XLIG = MKTAG('X','L','I','G'),
+        SUB_XALP = MKTAG('X','A','L','P'),
+        SUB_XNDP = MKTAG('X','N','D','P'),
+        SUB_XAPD = MKTAG('X','A','P','D'),
+        SUB_XAPR = MKTAG('X','A','P','R'),
+        SUB_XLIB = MKTAG('X','L','I','B'),
+        SUB_XLKR = MKTAG('X','L','K','R'),
+        SUB_XLRT = MKTAG('X','L','R','T'),
+        SUB_XCVL = MKTAG('X','C','V','L'),
+        SUB_XCVR = MKTAG('X','C','V','R'),
+        SUB_XCZA = MKTAG('X','C','Z','A'),
+        SUB_XCZC = MKTAG('X','C','Z','C'),
+        SUB_XFVC = MKTAG('X','F','V','C'),
+        SUB_XHTW = MKTAG('X','H','T','W'),
+        SUB_XIS2 = MKTAG('X','I','S','2'),
+        SUB_XMBR = MKTAG('X','M','B','R'),
+        SUB_XCCP = MKTAG('X','C','C','P'),
+        SUB_XPWR = MKTAG('X','P','W','R'),
+        SUB_XTRI = MKTAG('X','T','R','I'),
+        SUB_XATR = MKTAG('X','A','T','R'),
+        SUB_XPRD = MKTAG('X','P','R','D'),
+        SUB_XPPA = MKTAG('X','P','P','A'),
+        SUB_PDTO = MKTAG('P','D','T','O'),
+        SUB_XLRL = MKTAG('X','L','R','L'),
+
+        SUB_QNAM = MKTAG('Q','N','A','M'),
+        SUB_COCT = MKTAG('C','O','C','T'),
+        SUB_COED = MKTAG('C','O','E','D'),
+        SUB_CNTO = MKTAG('C','N','T','O'),
+        SUB_SCRI = MKTAG('S','C','R','I'),
+
+        SUB_BNAM = MKTAG('B','N','A','M'),
+
+        SUB_BMDT = MKTAG('B','M','D','T'),
+        SUB_MOD2 = MKTAG('M','O','D','2'),
+        SUB_MOD3 = MKTAG('M','O','D','3'),
+        SUB_MOD4 = MKTAG('M','O','D','4'),
+        SUB_MO2B = MKTAG('M','O','2','B'),
+        SUB_MO3B = MKTAG('M','O','3','B'),
+        SUB_MO4B = MKTAG('M','O','4','B'),
+        SUB_MO2T = MKTAG('M','O','2','T'),
+        SUB_MO3T = MKTAG('M','O','3','T'),
+        SUB_MO4T = MKTAG('M','O','4','T'),
+        SUB_ANAM = MKTAG('A','N','A','M'),
+        SUB_ENAM = MKTAG('E','N','A','M'),
+        SUB_ICO2 = MKTAG('I','C','O','2'),
+
+        SUB_ACBS = MKTAG('A','C','B','S'),
+        SUB_SPLO = MKTAG('S','P','L','O'),
+        SUB_AIDT = MKTAG('A','I','D','T'),
+        SUB_PKID = MKTAG('P','K','I','D'),
+        SUB_HCLR = MKTAG('H','C','L','R'),
+        SUB_FGGS = MKTAG('F','G','G','S'),
+        SUB_FGGA = MKTAG('F','G','G','A'),
+        SUB_FGTS = MKTAG('F','G','T','S'),
+        SUB_KFFZ = MKTAG('K','F','F','Z'),
+
+        SUB_PFIG = MKTAG('P','F','I','G'),
+        SUB_PFPC = MKTAG('P','F','P','C'),
+
+        SUB_XHRS = MKTAG('X','H','R','S'),
+        SUB_XMRC = MKTAG('X','M','R','C'),
+
+        SUB_SNDD = MKTAG('S','N','D','D'),
+        SUB_SNDX = MKTAG('S','N','D','X'),
+
+        SUB_DESC = MKTAG('D','E','S','C'),
+
+        SUB_ENIT = MKTAG('E','N','I','T'),
+        SUB_EFID = MKTAG('E','F','I','D'),
+        SUB_EFIT = MKTAG('E','F','I','T'),
+        SUB_SCIT = MKTAG('S','C','I','T'),
+
+        SUB_SOUL = MKTAG('S','O','U','L'),
+        SUB_SLCP = MKTAG('S','L','C','P'),
+
+        SUB_CSCR = MKTAG('C','S','C','R'),
+        SUB_CSDI = MKTAG('C','S','D','I'),
+        SUB_CSDC = MKTAG('C','S','D','C'),
+        SUB_NIFZ = MKTAG('N','I','F','Z'),
+        SUB_CSDT = MKTAG('C','S','D','T'),
+        SUB_NAM1 = MKTAG('N','A','M','1'),
+        SUB_NIFT = MKTAG('N','I','F','T'),
+
+        SUB_LVLD = MKTAG('L','V','L','D'),
+        SUB_LVLF = MKTAG('L','V','L','F'),
+        SUB_LVLO = MKTAG('L','V','L','O'),
+
+        SUB_BODT = MKTAG('B','O','D','T'),
+        SUB_YNAM = MKTAG('Y','N','A','M'),
+        SUB_DEST = MKTAG('D','E','S','T'),
+        SUB_DMDL = MKTAG('D','M','D','L'),
+        SUB_DMDS = MKTAG('D','M','D','S'),
+        SUB_DMDT = MKTAG('D','M','D','T'),
+        SUB_DSTD = MKTAG('D','S','T','D'),
+        SUB_DSTF = MKTAG('D','S','T','F'),
+        SUB_KNAM = MKTAG('K','N','A','M'),
+        SUB_KSIZ = MKTAG('K','S','I','Z'),
+        SUB_KWDA = MKTAG('K','W','D','A'),
+        SUB_VNAM = MKTAG('V','N','A','M'),
+        SUB_SDSC = MKTAG('S','D','S','C'),
+        SUB_MO2S = MKTAG('M','O','2','S'),
+        SUB_MO4S = MKTAG('M','O','4','S'),
+        SUB_BOD2 = MKTAG('B','O','D','2'),
+        SUB_BAMT = MKTAG('B','A','M','T'),
+        SUB_BIDS = MKTAG('B','I','D','S'),
+        SUB_ETYP = MKTAG('E','T','Y','P'),
+        SUB_BMCT = MKTAG('B','M','C','T'),
+        SUB_MICO = MKTAG('M','I','C','O'),
+        SUB_MIC2 = MKTAG('M','I','C','2'),
+        SUB_EAMT = MKTAG('E','A','M','T'),
+        SUB_EITM = MKTAG('E','I','T','M'),
+
+        SUB_SCTX = MKTAG('S','C','T','X'),
+        SUB_XLTW = MKTAG('X','L','T','W'),
+        SUB_XMBP = MKTAG('X','M','B','P'),
+        SUB_XOCP = MKTAG('X','O','C','P'),
+        SUB_XRGB = MKTAG('X','R','G','B'),
+        SUB_XSPC = MKTAG('X','S','P','C'),
+        SUB_XTNM = MKTAG('X','T','N','M'),
+        SUB_ATKR = MKTAG('A','T','K','R'),
+        SUB_CRIF = MKTAG('C','R','I','F'),
+        SUB_DOFT = MKTAG('D','O','F','T'),
+        SUB_DPLT = MKTAG('D','P','L','T'),
+        SUB_ECOR = MKTAG('E','C','O','R'),
+        SUB_ATKD = MKTAG('A','T','K','D'),
+        SUB_ATKE = MKTAG('A','T','K','E'),
+        SUB_FTST = MKTAG('F','T','S','T'),
+        SUB_HCLF = MKTAG('H','C','L','F'),
+        SUB_NAM5 = MKTAG('N','A','M','5'),
+        SUB_NAM6 = MKTAG('N','A','M','6'),
+        SUB_NAM7 = MKTAG('N','A','M','7'),
+        SUB_NAM8 = MKTAG('N','A','M','8'),
+        SUB_PRKR = MKTAG('P','R','K','R'),
+        SUB_PRKZ = MKTAG('P','R','K','Z'),
+        SUB_SOFT = MKTAG('S','O','F','T'),
+        SUB_SPCT = MKTAG('S','P','C','T'),
+        SUB_TINC = MKTAG('T','I','N','C'),
+        SUB_TIAS = MKTAG('T','I','A','S'),
+        SUB_TINI = MKTAG('T','I','N','I'),
+        SUB_TINV = MKTAG('T','I','N','V'),
+        SUB_TPLT = MKTAG('T','P','L','T'),
+        SUB_VTCK = MKTAG('V','T','C','K'),
+        SUB_SHRT = MKTAG('S','H','R','T'),
+        SUB_SPOR = MKTAG('S','P','O','R'),
+        SUB_XHOR = MKTAG('X','H','O','R'),
+        SUB_CTDA = MKTAG('C','T','D','A'),
+        SUB_CRDT = MKTAG('C','R','D','T'),
+        SUB_FNMK = MKTAG('F','N','M','K'),
+        SUB_FNPR = MKTAG('F','N','P','R'),
+        SUB_WBDT = MKTAG('W','B','D','T'),
+        SUB_QUAL = MKTAG('Q','U','A','L'),
+        SUB_INDX = MKTAG('I','N','D','X'),
+        SUB_ATTR = MKTAG('A','T','T','R'),
+        SUB_MTNM = MKTAG('M','T','N','M'),
+        SUB_UNES = MKTAG('U','N','E','S'),
+        SUB_TIND = MKTAG('T','I','N','D'),
+        SUB_TINL = MKTAG('T','I','N','L'),
+        SUB_TINP = MKTAG('T','I','N','P'),
+        SUB_TINT = MKTAG('T','I','N','T'),
+        SUB_TIRS = MKTAG('T','I','R','S'),
+        SUB_PHWT = MKTAG('P','H','W','T'),
+        SUB_AHCF = MKTAG('A','H','C','F'),
+        SUB_AHCM = MKTAG('A','H','C','M'),
+        SUB_HEAD = MKTAG('H','E','A','D'),
+        SUB_MPAI = MKTAG('M','P','A','I'),
+        SUB_MPAV = MKTAG('M','P','A','V'),
+        SUB_DFTF = MKTAG('D','F','T','F'),
+        SUB_DFTM = MKTAG('D','F','T','M'),
+        SUB_FLMV = MKTAG('F','L','M','V'),
+        SUB_FTSF = MKTAG('F','T','S','F'),
+        SUB_FTSM = MKTAG('F','T','S','M'),
+        SUB_MTYP = MKTAG('M','T','Y','P'),
+        SUB_PHTN = MKTAG('P','H','T','N'),
+        SUB_RNMV = MKTAG('R','N','M','V'),
+        SUB_RPRF = MKTAG('R','P','R','F'),
+        SUB_RPRM = MKTAG('R','P','R','M'),
+        SUB_SNMV = MKTAG('S','N','M','V'),
+        SUB_SPED = MKTAG('S','P','E','D'),
+        SUB_SWMV = MKTAG('S','W','M','V'),
+        SUB_WKMV = MKTAG('W','K','M','V'),
+        SUB_LLCT = MKTAG('L','L','C','T'),
+        SUB_IDLF = MKTAG('I','D','L','F'),
+        SUB_IDLA = MKTAG('I','D','L','A'),
+        SUB_IDLC = MKTAG('I','D','L','C'),
+        SUB_IDLT = MKTAG('I','D','L','T'),
+        SUB_DODT = MKTAG('D','O','D','T'),
+        SUB_TX00 = MKTAG('T','X','0','0'),
+        SUB_TX01 = MKTAG('T','X','0','1'),
+        SUB_TX02 = MKTAG('T','X','0','2'),
+        SUB_TX03 = MKTAG('T','X','0','3'),
+        SUB_TX04 = MKTAG('T','X','0','4'),
+        SUB_TX05 = MKTAG('T','X','0','5'),
+        SUB_TX06 = MKTAG('T','X','0','6'),
+        SUB_TX07 = MKTAG('T','X','0','7'),
+        SUB_BPND = MKTAG('B','P','N','D'),
+        SUB_BPTN = MKTAG('B','P','T','N'),
+        SUB_BPNN = MKTAG('B','P','N','N'),
+        SUB_BPNT = MKTAG('B','P','N','T'),
+        SUB_BPNI = MKTAG('B','P','N','I'),
+        SUB_RAGA = MKTAG('R','A','G','A'),
+
+        SUB_QSTI = MKTAG('Q','S','T','I'),
+        SUB_QSTR = MKTAG('Q','S','T','R'),
+        SUB_QSDT = MKTAG('Q','S','D','T'),
+        SUB_SCDA = MKTAG('S','C','D','A'),
+        SUB_SCRO = MKTAG('S','C','R','O'),
+        SUB_QSTA = MKTAG('Q','S','T','A'),
+        SUB_CTDT = MKTAG('C','T','D','T'),
+        SUB_SCHD = MKTAG('S','C','H','D'),
+        SUB_TCLF = MKTAG('T','C','L','F'),
+        SUB_TCLT = MKTAG('T','C','L','T'),
+        SUB_TRDT = MKTAG('T','R','D','T'),
+        SUB_TPIC = MKTAG('T','P','I','C'),
+
+        SUB_PKDT = MKTAG('P','K','D','T'),
+        SUB_PSDT = MKTAG('P','S','D','T'),
+        SUB_PLDT = MKTAG('P','L','D','T'),
+        SUB_PTDT = MKTAG('P','T','D','T'),
+        SUB_PGRP = MKTAG('P','G','R','P'),
+        SUB_PGRR = MKTAG('P','G','R','R'),
+        SUB_PGRI = MKTAG('P','G','R','I'),
+        SUB_PGRL = MKTAG('P','G','R','L'),
+        SUB_PGAG = MKTAG('P','G','A','G'),
+        SUB_FLTV = MKTAG('F','L','T','V'),
+
+        SUB_XHLT = MKTAG('X','H','L','T'), // Unofficial Oblivion Patch
+        SUB_XCHG = MKTAG('X','C','H','G'), // thievery.exp
+
+        SUB_ITXT = MKTAG('I','T','X','T'),
+        SUB_MO5T = MKTAG('M','O','5','T'),
+        SUB_MOD5 = MKTAG('M','O','D','5'),
+        SUB_MDOB = MKTAG('M','D','O','B'),
+        SUB_SPIT = MKTAG('S','P','I','T'),
+        SUB_PTDA = MKTAG('P','T','D','A'), // TES5
+        SUB_PFOR = MKTAG('P','F','O','R'), // TES5
+        SUB_PFO2 = MKTAG('P','F','O','2'), // TES5
+        SUB_PRCB = MKTAG('P','R','C','B'), // TES5
+        SUB_PKCU = MKTAG('P','K','C','U'), // TES5
+        SUB_PKC2 = MKTAG('P','K','C','2'), // TES5
+        SUB_CITC = MKTAG('C','I','T','C'), // TES5
+        SUB_CIS1 = MKTAG('C','I','S','1'), // TES5
+        SUB_CIS2 = MKTAG('C','I','S','2'), // TES5
+        SUB_TIFC = MKTAG('T','I','F','C'), // TES5
+        SUB_ALCA = MKTAG('A','L','C','A'), // TES5
+        SUB_ALCL = MKTAG('A','L','C','L'), // TES5
+        SUB_ALCO = MKTAG('A','L','C','O'), // TES5
+        SUB_ALDN = MKTAG('A','L','D','N'), // TES5
+        SUB_ALEA = MKTAG('A','L','E','A'), // TES5
+        SUB_ALED = MKTAG('A','L','E','D'), // TES5
+        SUB_ALEQ = MKTAG('A','L','E','Q'), // TES5
+        SUB_ALFA = MKTAG('A','L','F','A'), // TES5
+        SUB_ALFC = MKTAG('A','L','F','C'), // TES5
+        SUB_ALFD = MKTAG('A','L','F','D'), // TES5
+        SUB_ALFE = MKTAG('A','L','F','E'), // TES5
+        SUB_ALFI = MKTAG('A','L','F','I'), // TES5
+        SUB_ALFL = MKTAG('A','L','F','L'), // TES5
+        SUB_ALFR = MKTAG('A','L','F','R'), // TES5
+        SUB_ALID = MKTAG('A','L','I','D'), // TES5
+        SUB_ALLS = MKTAG('A','L','L','S'), // TES5
+        SUB_ALNA = MKTAG('A','L','N','A'), // TES5
+        SUB_ALNT = MKTAG('A','L','N','T'), // TES5
+        SUB_ALPC = MKTAG('A','L','P','C'), // TES5
+        SUB_ALRT = MKTAG('A','L','R','T'), // TES5
+        SUB_ALSP = MKTAG('A','L','S','P'), // TES5
+        SUB_ALST = MKTAG('A','L','S','T'), // TES5
+        SUB_ALUA = MKTAG('A','L','U','A'), // TES5
+        SUB_FLTR = MKTAG('F','L','T','R'), // TES5
+        SUB_QTGL = MKTAG('Q','T','G','L'), // TES5
+        SUB_TWAT = MKTAG('T','W','A','T'), // TES5
+        SUB_XIBS = MKTAG('X','I','B','S'), // FO3
+        SUB_REPL = MKTAG('R','E','P','L'), // FO3
+        SUB_BIPL = MKTAG('B','I','P','L'), // FO3
+        SUB_MODD = MKTAG('M','O','D','D'), // FO3
+        SUB_MOSD = MKTAG('M','O','S','D'), // FO3
+        SUB_MO3S = MKTAG('M','O','3','S'), // FO3
+        SUB_XCET = MKTAG('X','C','E','T'), // FO3
+        SUB_LVLG = MKTAG('L','V','L','G'), // FO3
+        SUB_NVCI = MKTAG('N','V','C','I'), // FO3
+        SUB_NVVX = MKTAG('N','V','V','X'), // FO3
+        SUB_NVTR = MKTAG('N','V','T','R'), // FO3
+        SUB_NVCA = MKTAG('N','V','C','A'), // FO3
+        SUB_NVDP = MKTAG('N','V','D','P'), // FO3
+        SUB_NVGD = MKTAG('N','V','G','D'), // FO3
+        SUB_NVEX = MKTAG('N','V','E','X'), // FO3
+        SUB_XHLP = MKTAG('X','H','L','P'), // FO3
+        SUB_XRDO = MKTAG('X','R','D','O'), // FO3
+        SUB_XAMT = MKTAG('X','A','M','T'), // FO3
+        SUB_XAMC = MKTAG('X','A','M','C'), // FO3
+        SUB_XRAD = MKTAG('X','R','A','D'), // FO3
+        SUB_XORD = MKTAG('X','O','R','D'), // FO3
+        SUB_XCLP = MKTAG('X','C','L','P'), // FO3
+        SUB_NEXT = MKTAG('N','E','X','T'), // FO3
+        SUB_QOBJ = MKTAG('Q','O','B','J'), // FO3
+        SUB_POBA = MKTAG('P','O','B','A'), // FO3
+        SUB_POCA = MKTAG('P','O','C','A'), // FO3
+        SUB_POEA = MKTAG('P','O','E','A'), // FO3
+        SUB_PKDD = MKTAG('P','K','D','D'), // FO3
+        SUB_PKD2 = MKTAG('P','K','D','2'), // FO3
+        SUB_PKPT = MKTAG('P','K','P','T'), // FO3
+        SUB_PKED = MKTAG('P','K','E','D'), // FO3
+        SUB_PKE2 = MKTAG('P','K','E','2'), // FO3
+        SUB_PKAM = MKTAG('P','K','A','M'), // FO3
+        SUB_PUID = MKTAG('P','U','I','D'), // FO3
+        SUB_PKW3 = MKTAG('P','K','W','3'), // FO3
+        SUB_PTD2 = MKTAG('P','T','D','2'), // FO3
+        SUB_PLD2 = MKTAG('P','L','D','2'), // FO3
+        SUB_PKFD = MKTAG('P','K','F','D'), // FO3
+        SUB_IDLB = MKTAG('I','D','L','B'), // FO3
+        SUB_XDCR = MKTAG('X','D','C','R'), // FO3
+        SUB_DALC = MKTAG('D','A','L','C'), // FO3
+        SUB_IMPS = MKTAG('I','M','P','S'), // FO3 Anchorage
+        SUB_IMPF = MKTAG('I','M','P','F'), // FO3 Anchorage
+
+        SUB_XATO = MKTAG('X','A','T','O'), // FONV
+        SUB_INFC = MKTAG('I','N','F','C'), // FONV
+        SUB_INFX = MKTAG('I','N','F','X'), // FONV
+        SUB_TDUM = MKTAG('T','D','U','M'), // FONV
+        SUB_TCFU = MKTAG('T','C','F','U'), // FONV
+        SUB_DAT2 = MKTAG('D','A','T','2'), // FONV
+        SUB_RCIL = MKTAG('R','C','I','L'), // FONV
+        SUB_MMRK = MKTAG('M','M','R','K'), // FONV
+        SUB_SCRV = MKTAG('S','C','R','V'), // FONV
+        SUB_SCVR = MKTAG('S','C','V','R'), // FONV
+        SUB_SLSD = MKTAG('S','L','S','D'), // FONV
+        SUB_XSRF = MKTAG('X','S','R','F'), // FONV
+        SUB_XSRD = MKTAG('X','S','R','D'), // FONV
+        SUB_WMI1 = MKTAG('W','M','I','1'), // FONV
+        SUB_RDID = MKTAG('R','D','I','D'), // FONV
+        SUB_RDSB = MKTAG('R','D','S','B'), // FONV
+        SUB_RDSI = MKTAG('R','D','S','I'), // FONV
+        SUB_BRUS = MKTAG('B','R','U','S'), // FONV
+        SUB_VATS = MKTAG('V','A','T','S'), // FONV
+        SUB_VANM = MKTAG('V','A','N','M'), // FONV
+        SUB_MWD1 = MKTAG('M','W','D','1'), // FONV
+        SUB_MWD2 = MKTAG('M','W','D','2'), // FONV
+        SUB_MWD3 = MKTAG('M','W','D','3'), // FONV
+        SUB_MWD4 = MKTAG('M','W','D','4'), // FONV
+        SUB_MWD5 = MKTAG('M','W','D','5'), // FONV
+        SUB_MWD6 = MKTAG('M','W','D','6'), // FONV
+        SUB_MWD7 = MKTAG('M','W','D','7'), // FONV
+        SUB_WMI2 = MKTAG('W','M','I','2'), // FONV
+        SUB_WMI3 = MKTAG('W','M','I','3'), // FONV
+        SUB_WMS1 = MKTAG('W','M','S','1'), // FONV
+        SUB_WMS2 = MKTAG('W','M','S','2'), // FONV
+        SUB_WNM1 = MKTAG('W','N','M','1'), // FONV
+        SUB_WNM2 = MKTAG('W','N','M','2'), // FONV
+        SUB_WNM3 = MKTAG('W','N','M','3'), // FONV
+        SUB_WNM4 = MKTAG('W','N','M','4'), // FONV
+        SUB_WNM5 = MKTAG('W','N','M','5'), // FONV
+        SUB_WNM6 = MKTAG('W','N','M','6'), // FONV
+        SUB_WNM7 = MKTAG('W','N','M','7'), // FONV
+        SUB_JNAM = MKTAG('J','N','A','M'), // FONV
+        SUB_EFSD = MKTAG('E','F','S','D'), // FONV DeadMoney
+    };
+
+    enum MagicEffectID
+    {
+        // Alteration
+        EFI_BRDN = MKTAG('B','R','D','N'),
+        EFI_FTHR = MKTAG('F','T','H','R'),
+        EFI_FISH = MKTAG('F','I','S','H'),
+        EFI_FRSH = MKTAG('F','R','S','H'),
+        EFI_OPEN = MKTAG('O','P','N','N'),
+        EFI_SHLD = MKTAG('S','H','L','D'),
+        EFI_LISH = MKTAG('L','I','S','H'),
+        EFI_WABR = MKTAG('W','A','B','R'),
+        EFI_WAWA = MKTAG('W','A','W','A'),
+
+        // Conjuration
+        EFI_BABO = MKTAG('B','A','B','O'), // Bound Boots
+        EFI_BACU = MKTAG('B','A','C','U'), // Bound Cuirass
+        EFI_BAGA = MKTAG('B','A','G','A'), // Bound Gauntlets
+        EFI_BAGR = MKTAG('B','A','G','R'), // Bound Greaves
+        EFI_BAHE = MKTAG('B','A','H','E'), // Bound Helmet
+        EFI_BASH = MKTAG('B','A','S','H'), // Bound Shield
+        EFI_BWAX = MKTAG('B','W','A','X'), // Bound Axe
+        EFI_BWBO = MKTAG('B','W','B','O'), // Bound Bow
+        EFI_BWDA = MKTAG('B','W','D','A'), // Bound Dagger
+        EFI_BWMA = MKTAG('B','W','M','A'), // Bound Mace
+        EFI_BWSW = MKTAG('B','W','S','W'), // Bound Sword
+        EFI_Z001 = MKTAG('Z','0','0','1'), // Summon Rufio's Ghost
+        EFI_Z002 = MKTAG('Z','0','0','2'), // Summon Ancestor Guardian
+        EFI_Z003 = MKTAG('Z','0','0','3'), // Summon Spiderling
+        EFI_Z005 = MKTAG('Z','0','0','5'), // Summon Bear
+        EFI_ZCLA = MKTAG('Z','C','L','A'), // Summon Clannfear
+        EFI_ZDAE = MKTAG('Z','D','A','E'), // Summon Daedroth
+        EFI_ZDRE = MKTAG('Z','D','R','E'), // Summon Dremora
+        EFI_ZDRL = MKTAG('Z','D','R','L'), // Summon Dremora Lord
+        EFI_ZFIA = MKTAG('Z','F','I','A'), // Summon Flame Atronach
+        EFI_ZFRA = MKTAG('Z','F','R','A'), // Summon Frost Atronach
+        EFI_ZGHO = MKTAG('Z','G','H','O'), // Summon Ghost
+        EFI_ZHDZ = MKTAG('Z','H','D','Z'), // Summon Headless Zombie
+        EFI_ZLIC = MKTAG('Z','L','I','C'), // Summon Lich
+        EFI_ZSCA = MKTAG('Z','S','C','A'), // Summon Scamp
+        EFI_ZSKE = MKTAG('Z','S','K','E'), // Summon Skeleton
+        EFI_ZSKA = MKTAG('Z','S','K','A'), // Summon Skeleton Guardian
+        EFI_ZSKH = MKTAG('Z','S','K','H'), // Summon Skeleton Hero
+        EFI_ZSKC = MKTAG('Z','S','K','C'), // Summon Skeleton Champion
+        EFI_ZSPD = MKTAG('Z','S','P','D'), // Summon Spider Daedra
+        EFI_ZSTA = MKTAG('Z','S','T','A'), // Summon Storm Atronach
+        EFI_ZWRA = MKTAG('Z','W','R','A'), // Summon Faded Wraith
+        EFI_ZWRL = MKTAG('Z','W','R','L'), // Summon Gloom Wraith
+        EFI_ZXIV = MKTAG('Z','X','I','V'), // Summon Xivilai
+        EFI_ZZOM = MKTAG('Z','Z','O','M'), // Summon Zombie
+        EFI_TURN = MKTAG('T','U','R','N'), // Turn Undead
+
+        // Destruction
+        EFI_DGAT = MKTAG('D','G','A','T'), // Damage Attribute
+        EFI_DGFA = MKTAG('D','G','F','A'), // Damage Fatigue
+        EFI_DGHE = MKTAG('D','G','H','E'), // Damage Health
+        EFI_DGSP = MKTAG('D','G','S','P'), // Damage Magicka
+        EFI_DIAR = MKTAG('D','I','A','R'), // Disintegrate Armor
+        EFI_DIWE = MKTAG('D','I','W','E'), // Disintegrate Weapon
+        EFI_DRAT = MKTAG('D','R','A','T'), // Drain Attribute
+        EFI_DRFA = MKTAG('D','R','F','A'), // Drain Fatigue
+        EFI_DRHE = MKTAG('D','R','H','E'), // Drain Health
+        EFI_DRSP = MKTAG('D','R','S','P'), // Drain Magicka
+        EFI_DRSK = MKTAG('D','R','S','K'), // Drain Skill
+        EFI_FIDG = MKTAG('F','I','D','G'), // Fire Damage
+        EFI_FRDG = MKTAG('F','R','D','G'), // Frost Damage
+        EFI_SHDG = MKTAG('S','H','D','G'), // Shock Damage
+        EFI_WKDI = MKTAG('W','K','D','I'), // Weakness to Disease
+        EFI_WKFI = MKTAG('W','K','F','I'), // Weakness to Fire
+        EFI_WKFR = MKTAG('W','K','F','R'), // Weakness to Frost
+        EFI_WKMA = MKTAG('W','K','M','A'), // Weakness to Magic
+        EFI_WKNW = MKTAG('W','K','N','W'), // Weakness to Normal Weapons
+        EFI_WKPO = MKTAG('W','K','P','O'), // Weakness to Poison
+        EFI_WKSH = MKTAG('W','K','S','H'), // Weakness to Shock
+
+        // Illusion
+        EFI_CALM = MKTAG('C','A','L','M'), // Calm
+        EFI_CHML = MKTAG('C','H','M','L'), // Chameleon
+        EFI_CHRM = MKTAG('C','H','R','M'), // Charm
+        EFI_COCR = MKTAG('C','O','C','R'), // Command Creature
+        EFI_COHU = MKTAG('C','O','H','U'), // Command Humanoid
+        EFI_DEMO = MKTAG('D','E','M','O'), // Demoralize
+        EFI_FRNZ = MKTAG('F','R','N','Z'), // Frenzy
+        EFI_INVI = MKTAG('I','N','V','I'), // Invisibility
+        EFI_LGHT = MKTAG('L','G','H','T'), // Light
+        EFI_NEYE = MKTAG('N','E','Y','E'), // Night-Eye
+        EFI_PARA = MKTAG('P','A','R','A'), // Paralyze
+        EFI_RALY = MKTAG('R','A','L','Y'), // Rally
+        EFI_SLNC = MKTAG('S','L','N','C'), // Silence
+
+        // Mysticism
+        EFI_DTCT = MKTAG('D','T','C','T'), // Detect Life
+        EFI_DSPL = MKTAG('D','S','P','L'), // Dispel
+        EFI_REDG = MKTAG('R','E','D','G'), // Reflect Damage
+        EFI_RFLC = MKTAG('R','F','L','C'), // Reflect Spell
+        EFI_STRP = MKTAG('S','T','R','P'), // Soul Trap
+        EFI_SABS = MKTAG('S','A','B','S'), // Spell Absorption
+        EFI_TELE = MKTAG('T','E','L','E'), // Telekinesis
+
+        // Restoration
+        EFI_ABAT = MKTAG('A','B','A','T'), // Absorb Attribute
+        EFI_ABFA = MKTAG('A','B','F','A'), // Absorb Fatigue
+        EFI_ABHe = MKTAG('A','B','H','e'), // Absorb Health
+        EFI_ABSP = MKTAG('A','B','S','P'), // Absorb Magicka
+        EFI_ABSK = MKTAG('A','B','S','K'), // Absorb Skill
+        EFI_1400 = MKTAG('1','4','0','0'), // Cure Disease
+        EFI_CUPA = MKTAG('C','U','P','A'), // Cure Paralysis
+        EFI_CUPO = MKTAG('C','U','P','O'), // Cure Poison
+        EFI_FOAT = MKTAG('F','O','A','T'), // Fortify Attribute
+        EFI_FOFA = MKTAG('F','O','F','A'), // Fortify Fatigue
+        EFI_FOHE = MKTAG('F','O','H','E'), // Fortify Health
+        EFI_FOSP = MKTAG('F','O','S','P'), // Fortify Magicka
+        EFI_FOSK = MKTAG('F','O','S','K'), // Fortify Skill
+        EFI_RSDI = MKTAG('R','S','D','I'), // Resist Disease
+        EFI_RSFI = MKTAG('R','S','F','I'), // Resist Fire
+        EFI_RSFR = MKTAG('R','S','F','R'), // Resist Frost
+        EFI_RSMA = MKTAG('R','S','M','A'), // Resist Magic
+        EFI_RSNW = MKTAG('R','S','N','W'), // Resist Normal Weapons
+        EFI_RSPA = MKTAG('R','S','P','A'), // Resist Paralysis
+        EFI_RSPO = MKTAG('R','S','P','O'), // Resist Poison
+        EFI_RSSH = MKTAG('R','S','S','H'), // Resist Shock
+        EFI_REAT = MKTAG('R','E','A','T'), // Restore Attribute
+        EFI_REFA = MKTAG('R','E','F','A'), // Restore Fatigue
+        EFI_REHE = MKTAG('R','E','H','E'), // Restore Health
+        EFI_RESP = MKTAG('R','E','S','P'), // Restore Magicka
+
+        // Effects
+        EFI_LOCK = MKTAG('L','O','C','K'), // Lock Lock
+        EFI_SEFF = MKTAG('S','E','F','F'), // Script Effect
+        EFI_Z020 = MKTAG('Z','0','2','0'), // Summon 20 Extra
+        EFI_MYHL = MKTAG('M','Y','H','L'), // Summon Mythic Dawn Helmet
+        EFI_MYTH = MKTAG('M','Y','T','H'), // Summon Mythic Dawn Armor
+        EFI_REAN = MKTAG('R','E','A','N'), // Reanimate
+        EFI_DISE = MKTAG('D','I','S','E'), // Disease Info
+        EFI_POSN = MKTAG('P','O','S','N'), // Poison Info
+        EFI_DUMY = MKTAG('D','U','M','Y'), // Mehrunes Dagon Custom Effect
+        EFI_STMA = MKTAG('S','T','M','A'), // Stunted Magicka
+        EFI_SUDG = MKTAG('S','U','D','G'), // Sun Damage
+        EFI_VAMP = MKTAG('V','A','M','P'), // Vampirism
+        EFI_DARK = MKTAG('D','A','R','K'), // Darkness
+        EFI_RSWD = MKTAG('R','S','W','D')  // Resist Water Damage
+    };
+
+    // Based on http://www.uesp.net/wiki/Tes5Mod:Mod_File_Format#Groups
+    enum GroupType
+    {
+        Grp_RecordType           = 0,
+        Grp_WorldChild           = 1,
+        Grp_InteriorCell         = 2,
+        Grp_InteriorSubCell      = 3,
+        Grp_ExteriorCell         = 4,
+        Grp_ExteriorSubCell      = 5,
+        Grp_CellChild            = 6,
+        Grp_TopicChild           = 7,
+        Grp_CellPersistentChild  = 8,
+        Grp_CellTemporaryChild   = 9,
+        Grp_CellVisibleDistChild = 10
+    };
+
+    // Based on http://www.uesp.net/wiki/Tes5Mod:Mod_File_Format#Records
+    enum RecordFlag
+    {
+        Rec_ESM        = 0x00000001, // (TES4 record only) Master (ESM) file.
+        Rec_Deleted    = 0x00000020, // Deleted
+        Rec_Constant   = 0x00000040, // Constant
+        Rec_HiddenLMap = 0x00000040, // (REFR) Hidden From Local Map (Needs Confirmation: Related to shields)
+        Rec_Localized  = 0x00000080, // (TES4 record only) Is localized. This will make Skyrim load the
+                                     //   .STRINGS, .DLSTRINGS, and .ILSTRINGS files associated with the mod.
+                                     //   If this flag is not set, lstrings are treated as zstrings.
+        Rec_FireOff    = 0x00000080, // (PHZD) Turn off fire
+        Rec_UpdateAnim = 0x00000100, // Must Update Anims
+        Rec_NoAccess   = 0x00000100, // (REFR) Inaccessible
+        Rec_Hidden     = 0x00000200, // (REFR) Hidden from local map
+        Rec_StartDead  = 0x00000200, // (ACHR) Starts dead /(REFR) MotionBlurCastsShadows
+        Rec_Persistent = 0x00000400, // Quest item / Persistent reference
+        Rec_DispMenu   = 0x00000400, // (LSCR) Displays in Main Menu
+        Rec_Disabled   = 0x00000800, // Initially disabled
+        Rec_Ignored    = 0x00001000, // Ignored
+        Rec_VisDistant = 0x00008000, // Visible when distant
+        Rec_RandAnim   = 0x00010000, // (ACTI) Random Animation Start
+        Rec_Danger     = 0x00020000, // (ACTI) Dangerous / Off limits (Interior cell)
+                                     //   Dangerous Can't be set withough Ignore Object Interaction
+        Rec_Compressed = 0x00040000, // Data is compressed
+        Rec_CanNotWait = 0x00080000, // Can't wait
+        Rec_IgnoreObj  = 0x00100000, // (ACTI) Ignore Object Interaction
+                                     //   Ignore Object Interaction Sets Dangerous Automatically
+        Rec_Marker     = 0x00800000, // Is Marker
+        Rec_Obstacle   = 0x02000000, // (ACTI) Obstacle / (REFR) No AI Acquire
+        Rec_NavMFilter = 0x04000000, // NavMesh Gen - Filter
+        Rec_NavMBBox   = 0x08000000, // NavMesh Gen - Bounding Box
+        Rec_ExitToTalk = 0x10000000, // (FURN) Must Exit to Talk
+        Rec_Refected   = 0x10000000, // (REFR) Reflected By Auto Water
+        Rec_ChildUse   = 0x20000000, // (FURN/IDLM) Child Can Use
+        Rec_NoHavok    = 0x20000000, // (REFR) Don't Havok Settle
+        Rec_NavMGround = 0x40000000, // NavMesh Gen - Ground
+        Rec_NoRespawn  = 0x40000000, // (REFR) NoRespawn
+        Rec_MultiBound = 0x80000000  // (REFR) MultiBound
+    };
+
+#pragma pack(push, 1)
+    // NOTE: the label field of a group is not reliable (http://www.uesp.net/wiki/Tes4Mod:Mod_File_Format)
+    union GroupLabel
+    {
+        std::uint32_t value;     // formId, blockNo or raw int representation of type
+        char recordType[4];      // record type in ascii
+        std::int16_t grid[2];    // grid y, x (note the reverse order)
+    };
+
+    struct GroupTypeHeader
+    {
+        std::uint32_t typeId;
+        std::uint32_t groupSize; // includes the 24 bytes (20 for TES4) of header (i.e. this struct)
+        GroupLabel    label;     // format based on type
+        std::int32_t  type;
+        std::uint16_t stamp;     // & 0xff for day, & 0xff00 for months since Dec 2002 (i.e. 1 = Jan 2003)
+        std::uint16_t unknown;
+        std::uint16_t version;   // not in TES4
+        std::uint16_t unknown2;  // not in TES4
+    };
+
+    struct RecordTypeHeader
+    {
+        std::uint32_t typeId;
+        std::uint32_t dataSize;  // does *not* include 24 bytes (20 for TES4) of header
+        std::uint32_t flags;
+        FormId        id;
+        std::uint32_t revision;
+        std::uint16_t version;  // not in TES4
+        std::uint16_t unknown;  // not in TES4
+    };
+
+    union RecordHeader
+    {
+        struct GroupTypeHeader  group;
+        struct RecordTypeHeader record;
+    };
+
+    struct SubRecordHeader
+    {
+        std::uint32_t typeId;
+        std::uint16_t dataSize;
+    };
+
+    // Grid, CellGrid and Vertex are shared by NVMI(NAVI) and NVNM(NAVM)
+
+    struct Grid
+    {
+        std::int16_t x;
+        std::int16_t y;
+    };
+
+    union CellGrid
+    {
+        FormId cellId;
+        Grid   grid;
+    };
+
+    struct Vertex
+    {
+        float x;
+        float y;
+        float z;
+    };
+#pragma pack(pop)
+
+    // For pretty printing GroupHeader labels
+    std::string printLabel(const GroupLabel& label, const std::uint32_t type);
+
+    void gridToString(std::int16_t x, std::int16_t y, std::string& str);
+}
+
+#endif // ESM4_COMMON_H
diff --git a/components/esm4/dialogue.hpp b/components/esm4/dialogue.hpp
new file mode 100644
index 0000000000..e77d192901
--- /dev/null
+++ b/components/esm4/dialogue.hpp
@@ -0,0 +1,46 @@
+/*
+  Copyright (C) 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_DIALOGUE_H
+#define ESM4_DIALOGUE_H
+
+namespace ESM4
+{
+    enum DialType
+    {
+        DTYP_Topic         = 0,
+        DTYP_Conversation  = 1,
+        DTYP_Combat        = 2,
+        DTYP_Persuation    = 3,
+        DTYP_Detection     = 4,
+        DTYP_Service       = 5,
+        DTYP_Miscellaneous = 6,
+        // below FO3/FONV
+        DTYP_Radio         = 7
+    };
+}
+
+#endif // ESM4_DIALOGUE_H
diff --git a/components/esm4/effect.hpp b/components/esm4/effect.hpp
new file mode 100644
index 0000000000..8580a478dc
--- /dev/null
+++ b/components/esm4/effect.hpp
@@ -0,0 +1,56 @@
+/*
+  Copyright (C) 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_EFFECT_H
+#define ESM4_EFFECT_H
+
+#include <cstdint>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+#pragma pack(push, 1)
+    union EFI_Label
+    {
+        std::uint32_t value;
+        char effect[4];
+    };
+
+    struct ScriptEffect
+    {
+        FormId       formId;       // Script effect (Magic effect must be SEFF)
+        std::int32_t school;       // Magic school. See Magic schools for more information.
+        EFI_Label    visualEffect; // Visual effect name or 0x00000000 if None
+        std::uint8_t flags;        // 0x01 = Hostile
+        std::uint8_t unknown1;
+        std::uint8_t unknown2;
+        std::uint8_t unknown3;
+    };
+#pragma pack(pop)
+}
+
+#endif // ESM4_EFFECT_H
diff --git a/components/esm4/formid.cpp b/components/esm4/formid.cpp
new file mode 100644
index 0000000000..f5493fd0ca
--- /dev/null
+++ b/components/esm4/formid.cpp
@@ -0,0 +1,78 @@
+/*
+  Copyright (C) 2016, 2020-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+*/
+#include "formid.hpp"
+
+#include <sstream>
+#include <algorithm>
+#include <stdexcept>
+#include <cstdlib> // strtol
+#include <climits> // LONG_MIN, LONG_MAX for gcc
+
+#include <string>
+
+namespace ESM4
+{
+    void formIdToString(FormId formId, std::string& str)
+    {
+        char buf[8+1];
+        int res = snprintf(buf, 8+1, "%08X", formId);
+        if (res > 0 && res < 8+1)
+            str.assign(buf);
+        else
+            throw std::runtime_error("Possible buffer overflow while converting formId");
+    }
+
+    std::string formIdToString(FormId formId)
+    {
+        std::string str;
+        formIdToString(formId, str);
+        return str;
+    }
+
+    bool isFormId(const std::string& str, FormId *id)
+    {
+        if (str.size() != 8)
+            return false;
+
+        char *tmp;
+        errno = 0;
+        unsigned long val = strtol(str.c_str(), &tmp, 16);
+
+        if (tmp == str.c_str() || *tmp != '\0'
+                || ((val == (unsigned long)LONG_MIN || val == (unsigned long)LONG_MAX) && errno == ERANGE))
+            return false;
+
+        if (id != nullptr)
+            *id = static_cast<FormId>(val);
+
+        return true;
+    }
+
+    FormId stringToFormId(const std::string& str)
+    {
+        if (str.size() != 8)
+            throw std::out_of_range("StringToFormId: incorrect string size");
+
+        return static_cast<FormId>(std::stoul(str, nullptr, 16));
+    }
+}
diff --git a/components/esm4/formid.hpp b/components/esm4/formid.hpp
new file mode 100644
index 0000000000..6bb2c475e3
--- /dev/null
+++ b/components/esm4/formid.hpp
@@ -0,0 +1,42 @@
+/*
+  Copyright (C) 2016 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+*/
+#ifndef ESM4_FORMID_H
+#define ESM4_FORMID_H
+
+#include <cstdint>
+#include <string>
+
+namespace ESM4
+{
+    typedef std::uint32_t FormId;
+
+    void formIdToString(FormId formId, std::string& str);
+
+    std::string formIdToString(FormId formId);
+
+    bool isFormId(const std::string& str, FormId *id = nullptr);
+
+    FormId stringToFormId(const std::string& str);
+}
+
+#endif // ESM4_FORMID_H
diff --git a/components/esm4/inventory.hpp b/components/esm4/inventory.hpp
new file mode 100644
index 0000000000..31181ce33c
--- /dev/null
+++ b/components/esm4/inventory.hpp
@@ -0,0 +1,55 @@
+/*
+  Copyright (C) 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_INVENTORY_H
+#define ESM4_INVENTORY_H
+
+#include <cstdint>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+#pragma pack(push, 1)
+    // LVLC, LVLI
+    struct LVLO
+    {
+        std::int16_t  level;
+        std::uint16_t unknown;  // sometimes missing
+        FormId        item;
+        std::int16_t  count;
+        std::uint16_t unknown2; // sometimes missing
+    };
+
+    struct InventoryItem // NPC_, CREA, CONT
+    {
+        FormId        item;
+        std::uint32_t count;
+    };
+#pragma pack(pop)
+}
+
+#endif // ESM4_INVENTORY_H
diff --git a/components/esm4/lighting.hpp b/components/esm4/lighting.hpp
new file mode 100644
index 0000000000..42e76eceee
--- /dev/null
+++ b/components/esm4/lighting.hpp
@@ -0,0 +1,79 @@
+/*
+  Copyright (C) 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_LIGHTING_H
+#define ESM4_LIGHTING_H
+
+#include <cstdint>
+
+namespace ESM4
+{
+#pragma pack(push, 1)
+    // guesses only for TES4
+    struct Lighting
+    {                              //               | Aichan Prison values
+        std::uint32_t ambient;     //               | 16 17 19 00 (RGBA)
+        std::uint32_t directional; //               | 00 00 00 00 (RGBA)
+        std::uint32_t fogColor;    //               | 1D 1B 16 00 (RGBA)
+        float         fogNear;     // Fog Near      | 00 00 00 00 = 0.f
+        float         fogFar;      // Fog Far       | 00 80 3B 45 = 3000.f
+        std::int32_t  rotationXY;  // rotation xy   | 00 00 00 00 = 0
+        std::int32_t  rotationZ;   // rotation z    | 00 00 00 00 = 0
+        float         fogDirFade;  // Fog dir fade  | 00 00 80 3F = 1.f
+        float         fogClipDist; // Fog clip dist | 00 80 3B 45 = 3000.f
+        float         fogPower;
+    };
+
+    struct Lighting_TES5
+    {
+        std::uint32_t ambient;
+        std::uint32_t directional;
+        std::uint32_t fogColor;
+        float         fogNear;
+        float         fogFar;
+        std::int32_t  rotationXY;
+        std::int32_t  rotationZ;
+        float         fogDirFade;
+        float         fogClipDist;
+        float         fogPower;
+        std::uint32_t unknown1;
+        std::uint32_t unknown2;
+        std::uint32_t unknown3;
+        std::uint32_t unknown4;
+        std::uint32_t unknown5;
+        std::uint32_t unknown6;
+        std::uint32_t unknown7;
+        std::uint32_t unknown8;
+        std::uint32_t fogColorFar;
+        float         fogMax;
+        float         LightFadeStart;
+        float         LightFadeEnd;
+        std::uint32_t padding;
+    };
+#pragma pack(pop)
+}
+
+#endif // ESM4_LIGHTING_H
diff --git a/components/esm4/loadachr.cpp b/components/esm4/loadachr.cpp
new file mode 100644
index 0000000000..fe03fcb59e
--- /dev/null
+++ b/components/esm4/loadachr.cpp
@@ -0,0 +1,124 @@
+/*
+  Copyright (C) 2016, 2018, 2020-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadachr.hpp"
+
+#include <stdexcept>
+//#include <iostream>
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::ActorCharacter::ActorCharacter() : mFormId(0), mFlags(0), mBaseObj(0),
+                                         mScale(1.f), mOwner(0), mGlobal(0), mInitiallyDisabled(false)
+{
+    mEditorId.clear();
+    mFullName.clear();
+
+    mEsp.parent = 0;
+    mEsp.flags = 0;
+}
+
+ESM4::ActorCharacter::~ActorCharacter()
+{
+}
+
+void ESM4::ActorCharacter::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+    mParent = reader.currCell(); // NOTE: only for persistent achr? (aren't they all persistent?)
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_FULL: reader.getZString(mFullName); break;
+            case ESM4::SUB_NAME: reader.getFormId(mBaseObj);   break;
+            case ESM4::SUB_DATA: reader.get(mPlacement); break;
+            case ESM4::SUB_XSCL: reader.get(mScale);     break;
+            case ESM4::SUB_XOWN: reader.get(mOwner);     break;
+            case ESM4::SUB_XESP:
+            {
+                reader.get(mEsp);
+                reader.adjustFormId(mEsp.parent);
+                break;
+            }
+            case ESM4::SUB_XRGD: // ragdoll
+            case ESM4::SUB_XRGB: // ragdoll biped
+            {
+                //std::cout << "ACHR " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            case ESM4::SUB_XHRS: // horse formId
+            case ESM4::SUB_XMRC: // merchant container formId
+            // TES5
+            case ESM4::SUB_XAPD: // activation parent
+            case ESM4::SUB_XAPR: // active parent
+            case ESM4::SUB_XEZN: // encounter zone
+            case ESM4::SUB_XHOR:
+            case ESM4::SUB_XLCM: // levelled creature
+            case ESM4::SUB_XLCN: // location
+            case ESM4::SUB_XLKR: // location route?
+            case ESM4::SUB_XLRT: // location type
+            //
+            case ESM4::SUB_XPRD:
+            case ESM4::SUB_XPPA:
+            case ESM4::SUB_INAM:
+            case ESM4::SUB_PDTO:
+            //
+            case ESM4::SUB_XIS2:
+            case ESM4::SUB_XPCI: // formId
+            case ESM4::SUB_XLOD:
+            case ESM4::SUB_VMAD:
+            case ESM4::SUB_XLRL: // Unofficial Skyrim Patch
+            case ESM4::SUB_XRDS: // FO3
+            case ESM4::SUB_XIBS: // FO3
+            case ESM4::SUB_SCHR: // FO3
+            case ESM4::SUB_TNAM: // FO3
+            case ESM4::SUB_XATO: // FONV
+            {
+                //std::cout << "ACHR " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::ACHR::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::ActorCharacter::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::ActorCharacter::blank()
+//{
+//}
diff --git a/components/esm4/loadachr.hpp b/components/esm4/loadachr.hpp
new file mode 100644
index 0000000000..a8656ea926
--- /dev/null
+++ b/components/esm4/loadachr.hpp
@@ -0,0 +1,70 @@
+/*
+  Copyright (C) 2016, 2018, 2020-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_ACHR_H
+#define ESM4_ACHR_H
+
+#include <cstdint>
+
+#include "reference.hpp" // FormId, Placement, EnableParent
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct ActorCharacter
+    {
+        FormId mParent;       // cell formId, from the loading sequence
+                              // NOTE: for exterior cells it will be the dummy cell FormId
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mFullName;
+        FormId      mBaseObj;
+
+        Placement mPlacement;
+        float    mScale;      // default 1.f
+        FormId   mOwner;
+        FormId   mGlobal;
+
+        bool mInitiallyDisabled; // TODO may need to check mFlags & 0x800 (initially disabled)
+
+        EnableParent mEsp;
+
+        ActorCharacter();
+        virtual ~ActorCharacter();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_ACHR_H
diff --git a/components/esm4/loadacre.cpp b/components/esm4/loadacre.cpp
new file mode 100644
index 0000000000..3510986d3c
--- /dev/null
+++ b/components/esm4/loadacre.cpp
@@ -0,0 +1,106 @@
+/*
+  Copyright (C) 2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadacre.hpp"
+
+#include <stdexcept>
+//#include <iostream>
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::ActorCreature::ActorCreature() : mFormId(0), mFlags(0), mBaseObj(0), mScale(1.f),
+                                       mOwner(0), mGlobal(0), mFactionRank(0), mInitiallyDisabled(false)
+{
+    mEditorId.clear();
+
+    mEsp.parent = 0;
+    mEsp.flags = 0;
+}
+
+ESM4::ActorCreature::~ActorCreature()
+{
+}
+
+void ESM4::ActorCreature::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_NAME: reader.getFormId(mBaseObj);   break;
+            case ESM4::SUB_DATA: reader.get(mPlacement);       break;
+            case ESM4::SUB_XSCL: reader.get(mScale);           break;
+            case ESM4::SUB_XESP:
+            {
+                reader.get(mEsp);
+                reader.adjustFormId(mEsp.parent);
+                break;
+            }
+            case ESM4::SUB_XOWN: reader.getFormId(mOwner);     break;
+            case ESM4::SUB_XGLB: reader.get(mGlobal);          break; // FIXME: formId?
+            case ESM4::SUB_XRNK: reader.get(mFactionRank);     break;
+            case ESM4::SUB_XRGD: // ragdoll
+            case ESM4::SUB_XRGB: // ragdoll biped
+            {
+                // seems to occur only for dead bodies, e.g. DeadMuffy, DeadDogVicious
+                //std::cout << "ACRE " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            case ESM4::SUB_XLKR: // FO3
+            case ESM4::SUB_XLCM: // FO3
+            case ESM4::SUB_XEZN: // FO3
+            case ESM4::SUB_XMRC: // FO3
+            case ESM4::SUB_XAPD: // FO3
+            case ESM4::SUB_XAPR: // FO3
+            case ESM4::SUB_XRDS: // FO3
+            case ESM4::SUB_XPRD: // FO3
+            case ESM4::SUB_XATO: // FONV
+            {
+                //std::cout << "ACRE " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::ACRE::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::ActorCreature::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::ActorCreature::blank()
+//{
+//}
diff --git a/components/esm4/loadacre.hpp b/components/esm4/loadacre.hpp
new file mode 100644
index 0000000000..26cab34a4e
--- /dev/null
+++ b/components/esm4/loadacre.hpp
@@ -0,0 +1,67 @@
+/*
+  Copyright (C) 2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_ACRE_H
+#define ESM4_ACRE_H
+
+#include <cstdint>
+
+#include "reference.hpp" // FormId, Placement, EnableParent
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct ActorCreature
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        FormId      mBaseObj;
+
+        Placement mPlacement;
+        float    mScale;      // default 1.f
+        FormId   mOwner;
+        FormId   mGlobal;
+        std::uint32_t mFactionRank;
+
+        bool mInitiallyDisabled; // TODO may need to check mFlags & 0x800 (initially disabled)
+
+        EnableParent mEsp;
+
+        ActorCreature();
+        virtual ~ActorCreature();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_ACRE_H
diff --git a/components/esm4/loadacti.cpp b/components/esm4/loadacti.cpp
new file mode 100644
index 0000000000..abbe901014
--- /dev/null
+++ b/components/esm4/loadacti.cpp
@@ -0,0 +1,103 @@
+/*
+  Copyright (C) 2016, 2018, 2020-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "acti.hpp"
+
+#include <stdexcept>
+#include <iostream> // FIXME
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Activator::Activator() : mFormId(0), mFlags(0), mScriptId(0), mLoopingSound(0), mActivationSound(0),
+    mBoundRadius(0.f), mRadioTemplate(0), mRadioStation(0)
+{
+    mEditorId.clear();
+    mFullName.clear();
+    mModel.clear();
+
+    mActivationPrompt.clear();
+}
+
+ESM4::Activator::~Activator()
+{
+}
+
+void ESM4::Activator::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_MODL: reader.getZString(mModel); break;
+            case ESM4::SUB_SCRI: reader.getFormId(mScriptId); break;
+            case ESM4::SUB_SNAM: reader.getFormId(mLoopingSound);  break;
+            case ESM4::SUB_VNAM: reader.getFormId(mActivationSound);  break;
+            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
+            case ESM4::SUB_INAM: reader.getFormId(mRadioTemplate); break; // FONV
+            case ESM4::SUB_RNAM: reader.getFormId(mRadioStation); break;
+            case ESM4::SUB_XATO: reader.getZString(mActivationPrompt); break; // FONV
+            case ESM4::SUB_MODT:
+            case ESM4::SUB_MODS:
+            case ESM4::SUB_DEST:
+            case ESM4::SUB_DMDL:
+            case ESM4::SUB_DMDS:
+            case ESM4::SUB_DMDT:
+            case ESM4::SUB_DSTD:
+            case ESM4::SUB_DSTF:
+            case ESM4::SUB_FNAM:
+            case ESM4::SUB_KNAM:
+            case ESM4::SUB_KSIZ:
+            case ESM4::SUB_KWDA:
+            case ESM4::SUB_OBND:
+            case ESM4::SUB_PNAM:
+            case ESM4::SUB_VMAD:
+            case ESM4::SUB_WNAM:
+            {
+                //std::cout << "ACTI " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::ACTI::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Activator::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Activator::blank()
+//{
+//}
diff --git a/components/esm4/loadalch.cpp b/components/esm4/loadalch.cpp
new file mode 100644
index 0000000000..b720b740ca
--- /dev/null
+++ b/components/esm4/loadalch.cpp
@@ -0,0 +1,121 @@
+/*
+  Copyright (C) 2016, 2018, 2020-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadalch.hpp"
+
+#include <stdexcept>
+#include <cstring>
+//#include <iostream> // FIXME
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Potion::Potion() : mFormId(0), mFlags(0), mPickUpSound(0), mDropSound(0), mScriptId(0), mBoundRadius(0.f)
+{
+    mEditorId.clear();
+    mFullName.clear();
+    mModel.clear();
+    mIcon.clear();
+    mMiniIcon.clear();
+
+    mData.weight = 0.f;
+
+    std::memset(&mEffect, 0, sizeof(ScriptEffect));
+}
+
+ESM4::Potion::~Potion()
+{
+}
+
+void ESM4::Potion::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_MODL: reader.getZString(mModel); break;
+            case ESM4::SUB_ICON: reader.getZString(mIcon);  break;
+            case ESM4::SUB_MICO: reader.getZString(mMiniIcon); break; // FO3
+            case ESM4::SUB_DATA: reader.get(mData);         break;
+            case ESM4::SUB_SCRI: reader.getFormId(mScriptId); break;
+            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
+            case ESM4::SUB_SCIT:
+            {
+                reader.get(mEffect);
+                reader.adjustFormId(mEffect.formId);
+                break;
+            }
+            case ESM4::SUB_ENIT:
+            {
+                if (subHdr.dataSize == 8) // TES4
+                {
+                    reader.get(&mItem, 8);
+                    mItem.withdrawl = 0;
+                    mItem.sound = 0;
+                    break;
+                }
+
+                reader.get(mItem);
+                reader.adjustFormId(mItem.withdrawl);
+                reader.adjustFormId(mItem.sound);
+                break;
+            }
+            case ESM4::SUB_YNAM: reader.getFormId(mPickUpSound); break;
+            case ESM4::SUB_ZNAM: reader.getFormId(mDropSound); break;
+            case ESM4::SUB_MODT:
+            case ESM4::SUB_EFID:
+            case ESM4::SUB_EFIT:
+            case ESM4::SUB_CTDA:
+            case ESM4::SUB_KSIZ:
+            case ESM4::SUB_KWDA:
+            case ESM4::SUB_MODS:
+            case ESM4::SUB_OBND:
+            case ESM4::SUB_ETYP: // FO3
+            {
+                //std::cout << "ALCH " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::ALCH::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Potion::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Potion::blank()
+//{
+//}
diff --git a/components/esm4/loadalch.hpp b/components/esm4/loadalch.hpp
new file mode 100644
index 0000000000..e6680dc93b
--- /dev/null
+++ b/components/esm4/loadalch.hpp
@@ -0,0 +1,88 @@
+/*
+  Copyright (C) 2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_ALCH_H
+#define ESM4_ALCH_H
+
+#include <cstdint>
+#include <string>
+
+#include "effect.hpp" // FormId, ScriptEffect
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Potion
+    {
+#pragma pack(push, 1)
+        struct Data
+        {
+            float weight;
+        };
+
+        struct EnchantedItem
+        {
+            std::int32_t value;
+            std::uint32_t flags;
+            FormId withdrawl;
+            float  chanceAddition;
+            FormId sound;
+        };
+#pragma pack(pop)
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mFullName;
+        std::string mModel;
+        std::string mIcon; // inventory
+        std::string mMiniIcon; // inventory
+
+        FormId mPickUpSound;
+        FormId mDropSound;
+
+        FormId mScriptId;
+        ScriptEffect mEffect;
+
+        float mBoundRadius;
+
+        Data mData;
+        EnchantedItem mItem;
+
+        Potion();
+        virtual ~Potion();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_ALCH_H
diff --git a/components/esm4/loadaloc.cpp b/components/esm4/loadaloc.cpp
new file mode 100644
index 0000000000..a84e56592d
--- /dev/null
+++ b/components/esm4/loadaloc.cpp
@@ -0,0 +1,172 @@
+/*
+  Copyright (C) 2020-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadaloc.hpp"
+
+#include <stdexcept>
+#include <cstring>
+//#include <iostream> // FIXME: for debugging only
+//#include <iomanip>  // FIXME: for debugging only
+
+//#include <boost/scoped_array.hpp> // FIXME
+
+//#include "formid.hpp" // FIXME:
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::MediaLocationController::MediaLocationController() : mFormId(0), mFlags(0),
+    mConditionalFaction(0), mLocationDelay(0.f), mRetriggerDelay(0.f), mDayStart(0), mNightStart(0)
+{
+    mEditorId.clear();
+    mFullName.clear();
+
+    std::memset(&mMediaFlags, 0, sizeof(MLC_Flags));
+}
+
+ESM4::MediaLocationController::~MediaLocationController()
+{
+}
+
+void ESM4::MediaLocationController::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId);  break;
+            case ESM4::SUB_FULL: reader.getZString(mFullName);  break;
+            case ESM4::SUB_GNAM:
+            {
+                FormId id;
+                reader.getFormId(id);
+                mBattleSets.push_back(id);
+
+                break;
+            }
+            case ESM4::SUB_LNAM:
+            {
+                FormId id;
+                reader.getFormId(id);
+                mLocationSets.push_back(id);
+
+                break;
+            }
+            case ESM4::SUB_YNAM:
+            {
+                FormId id;
+                reader.getFormId(id);
+                mEnemySets.push_back(id);
+
+                break;
+            }
+            case ESM4::SUB_HNAM:
+            {
+                FormId id;
+                reader.getFormId(id);
+                mNeutralSets.push_back(id);
+
+                break;
+            }
+            case ESM4::SUB_XNAM:
+            {
+                FormId id;
+                reader.getFormId(id);
+                mFriendSets.push_back(id);
+
+                break;
+            }
+            case ESM4::SUB_ZNAM:
+            {
+                FormId id;
+                reader.getFormId(id);
+                mAllySets.push_back(id);
+
+                break;
+            }
+            case ESM4::SUB_RNAM: reader.getFormId(mConditionalFaction); break;
+            case ESM4::SUB_NAM1:
+            {
+                reader.get(mMediaFlags);
+                std::uint8_t flags = mMediaFlags.loopingOptions;
+                mMediaFlags.loopingOptions = (flags & 0xF0) >> 4;
+                mMediaFlags.factionNotFound = flags & 0x0F; // WARN: overwriting data
+                break;
+            }
+            case ESM4::SUB_NAM4: reader.get(mLocationDelay); break;
+            case ESM4::SUB_NAM7: reader.get(mRetriggerDelay); break;
+            case ESM4::SUB_NAM5: reader.get(mDayStart); break;
+            case ESM4::SUB_NAM6: reader.get(mNightStart); break;
+            case ESM4::SUB_NAM2: // always 0? 4 bytes
+            case ESM4::SUB_NAM3: // always 0? 4 bytes
+            case ESM4::SUB_FNAM: // always 0? 4 bytes
+            {
+#if 0
+                boost::scoped_array<unsigned char> mDataBuf(new unsigned char[subHdr.dataSize]);
+                reader.get(&mDataBuf[0], subHdr.dataSize);
+
+                std::ostringstream ss;
+                ss << mEditorId << " " << ESM::printName(subHdr.typeId) << ":size " << subHdr.dataSize << "\n";
+                for (std::size_t i = 0; i < subHdr.dataSize; ++i)
+                {
+                    //if (mDataBuf[i] > 64 && mDataBuf[i] < 91) // looks like printable ascii char
+                        //ss << (char)(mDataBuf[i]) << " ";
+                    //else
+                        ss << std::setfill('0') << std::setw(2) << std::hex << (int)(mDataBuf[i]);
+                    if ((i & 0x000f) == 0xf) // wrap around
+                        ss << "\n";
+                    else if (i < subHdr.dataSize-1)
+                        ss << " ";
+                }
+                std::cout << ss.str() << std::endl;
+#else
+                //std::cout << "ALOC " << ESM::printName(subHdr.typeId) << " skipping..."
+                          //<< subHdr.dataSize << std::endl;
+                reader.skipSubRecordData();
+#endif
+                break;
+            }
+            default:
+                //std::cout << "ALOC " << ESM::printName(subHdr.typeId) << " skipping..."
+                          //<< subHdr.dataSize << std::endl;
+                //reader.skipSubRecordData();
+                throw std::runtime_error("ESM4::ALOC::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::MediaLocationController::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::MediaLocationController::blank()
+//{
+//}
diff --git a/components/esm4/loadaloc.hpp b/components/esm4/loadaloc.hpp
new file mode 100644
index 0000000000..1c2d17d11e
--- /dev/null
+++ b/components/esm4/loadaloc.hpp
@@ -0,0 +1,88 @@
+/*
+  Copyright (C) 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_ALOC_H
+#define ESM4_ALOC_H
+
+#include <cstdint>
+#include <string>
+#include <vector>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+#pragma pack(push, 1)
+    struct MLC_Flags
+    {
+        // use day/night transition:  0 = loop, 1 = random, 2 = retrigger, 3 = none
+        // use defaults (6:00/23:54): 4 = loop, 5 = random, 6 = retrigger, 7 = none
+        std::uint8_t loopingOptions;
+        // 0 = neutral, 1 = enemy, 2 = ally, 3 = friend, 4 = location, 5 = none
+        std::uint8_t factionNotFound; // WARN: overwriting whatever is in this
+        std::uint16_t unknown; // padding?
+    };
+#pragma pack(pop)
+
+    struct MediaLocationController
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mFullName;
+
+        std::vector<FormId> mBattleSets;
+        std::vector<FormId> mLocationSets;
+        std::vector<FormId> mEnemySets;
+        std::vector<FormId> mNeutralSets;
+        std::vector<FormId> mFriendSets;
+        std::vector<FormId> mAllySets;
+
+        MLC_Flags mMediaFlags;
+
+        FormId mConditionalFaction;
+
+        float mLocationDelay;
+        float mRetriggerDelay;
+
+        std::uint32_t mDayStart;
+        std::uint32_t mNightStart;
+
+        MediaLocationController();
+        virtual ~MediaLocationController();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_ALOC_H
diff --git a/components/esm4/loadammo.cpp b/components/esm4/loadammo.cpp
new file mode 100644
index 0000000000..7ccf8e1582
--- /dev/null
+++ b/components/esm4/loadammo.cpp
@@ -0,0 +1,133 @@
+/*
+  Copyright (C) 2016, 2018-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadammo.hpp"
+
+#include <stdexcept>
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Ammunition::Ammunition() : mFormId(0), mFlags(0), mPickUpSound(0), mDropSound(0), mBoundRadius(0.f)
+{
+    mEditorId.clear();
+    mFullName.clear();
+    mModel.clear();
+    mText.clear();
+    mIcon.clear();
+    mMiniIcon.clear();
+}
+
+ESM4::Ammunition::~Ammunition()
+{
+}
+
+void ESM4::Ammunition::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+    std::uint32_t esmVer = reader.esmVersion();
+    bool isFONV = esmVer == ESM::VER_132 || esmVer == ESM::VER_133 || esmVer == ESM::VER_134;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_DATA:
+            {
+                //if (reader.esmVersion() == ESM::VER_094 || reader.esmVersion() == ESM::VER_170)
+                if (subHdr.dataSize == 16) // FO3 has 13 bytes even though VER_094
+                {
+                    FormId projectile;
+                    reader.get(projectile); // FIXME: add to mData
+                    reader.get(mData.flags);
+                    reader.get(mData.weight);
+                    float damageInFloat;
+                    reader.get(damageInFloat); // FIXME: add to mData
+                }
+                else if (isFONV || subHdr.dataSize == 13)
+                {
+                    reader.get(mData.speed);
+                    std::uint8_t flags;
+                    reader.get(flags);
+                    mData.flags = flags;
+                    static std::uint8_t dummy;
+                    reader.get(dummy);
+                    reader.get(dummy);
+                    reader.get(dummy);
+                    reader.get(mData.value);
+                    reader.get(mData.clipRounds);
+                }
+                else // TES4
+                {
+                    reader.get(mData.speed);
+                    reader.get(mData.flags);
+                    reader.get(mData.value);
+                    reader.get(mData.weight);
+                    reader.get(mData.damage);
+                }
+                break;
+            }
+            case ESM4::SUB_ICON: reader.getZString(mIcon);  break;
+            case ESM4::SUB_MICO: reader.getZString(mMiniIcon); break; // FO3
+            case ESM4::SUB_MODL: reader.getZString(mModel); break;
+            case ESM4::SUB_ANAM: reader.get(mEnchantmentPoints); break;
+            case ESM4::SUB_ENAM: reader.getFormId(mEnchantment); break;
+            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
+            case ESM4::SUB_DESC: reader.getLocalizedString(mText); break;
+            case ESM4::SUB_YNAM: reader.getFormId(mPickUpSound); break;
+            case ESM4::SUB_ZNAM: reader.getFormId(mDropSound); break;
+            case ESM4::SUB_MODT:
+            case ESM4::SUB_OBND:
+            case ESM4::SUB_KSIZ:
+            case ESM4::SUB_KWDA:
+            case ESM4::SUB_ONAM: // FO3
+            case ESM4::SUB_DAT2: // FONV
+            case ESM4::SUB_QNAM: // FONV
+            case ESM4::SUB_RCIL: // FONV
+            case ESM4::SUB_SCRI: // FONV
+            {
+                //std::cout << "AMMO " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::AMMO::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Ammunition::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Ammunition::blank()
+//{
+//}
diff --git a/components/esm4/loadammo.hpp b/components/esm4/loadammo.hpp
new file mode 100644
index 0000000000..8ff9cd9390
--- /dev/null
+++ b/components/esm4/loadammo.hpp
@@ -0,0 +1,84 @@
+/*
+  Copyright (C) 2016, 2018-2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_AMMO_H
+#define ESM4_AMMO_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Ammunition
+    {
+        struct Data // FIXME: TES5 projectile, damage (float)
+        {
+            float         speed;
+            std::uint32_t flags;
+            std::uint32_t value;   // gold
+            float         weight;
+            std::uint16_t damage;
+            std::uint8_t  clipRounds; // only in FO3/FONV
+
+            Data() : speed(0.f), flags(0), value(0), weight(0.f), damage(0), clipRounds(0) {}
+        };
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mFullName;
+        std::string mModel;
+        std::string mText;
+        std::string mIcon; // inventory
+        std::string mMiniIcon; // inventory
+
+        FormId mPickUpSound;
+        FormId mDropSound;
+
+        float mBoundRadius;
+
+        std::uint16_t mEnchantmentPoints;
+        FormId mEnchantment;
+
+        Data mData;
+
+        Ammunition();
+        virtual ~Ammunition();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_AMMO_H
diff --git a/components/esm4/loadanio.cpp b/components/esm4/loadanio.cpp
new file mode 100644
index 0000000000..b6b97a1a47
--- /dev/null
+++ b/components/esm4/loadanio.cpp
@@ -0,0 +1,80 @@
+/*
+  Copyright (C) 2016, 2018 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadanio.hpp"
+
+#include <stdexcept>
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::AnimObject::AnimObject() : mFormId(0), mFlags(0), mBoundRadius(0.f), mIdleAnim(0)
+{
+    mEditorId.clear();
+    mModel.clear();
+    mUnloadEvent.clear();
+}
+
+ESM4::AnimObject::~AnimObject()
+{
+}
+
+void ESM4::AnimObject::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_MODL: reader.getZString(mModel);    break;
+            case ESM4::SUB_BNAM: reader.getZString(mUnloadEvent); break;
+            case ESM4::SUB_DATA: reader.getFormId(mIdleAnim);  break;
+            case ESM4::SUB_MODB: reader.get(mBoundRadius);     break;
+            case ESM4::SUB_MODT: // TES5 only
+            case ESM4::SUB_MODS: // TES5 only
+            {
+                //std::cout << "ANIO " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::ANIO::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::AnimObject::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::AnimObject::blank()
+//{
+//}
diff --git a/components/esm4/loadanio.hpp b/components/esm4/loadanio.hpp
new file mode 100644
index 0000000000..4259abe7b3
--- /dev/null
+++ b/components/esm4/loadanio.hpp
@@ -0,0 +1,63 @@
+/*
+  Copyright (C) 2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_ANIO_H
+#define ESM4_ANIO_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct AnimObject
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mModel;
+
+        float mBoundRadius;
+
+        FormId mIdleAnim;         // only in TES4
+        std::string mUnloadEvent; // only in TES5
+
+        AnimObject();
+        virtual ~AnimObject();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_ANIO_H
diff --git a/components/esm4/loadappa.cpp b/components/esm4/loadappa.cpp
new file mode 100644
index 0000000000..7ad7635927
--- /dev/null
+++ b/components/esm4/loadappa.cpp
@@ -0,0 +1,106 @@
+/*
+  Copyright (C) 2016, 2018-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadappa.hpp"
+
+#include <stdexcept>
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Apparatus::Apparatus() : mFormId(0), mFlags(0), mBoundRadius(0.f), mScriptId(0)
+{
+    mEditorId.clear();
+    mFullName.clear();
+    mModel.clear();
+    mText.clear();
+    mIcon.clear();
+
+    mData.type = 0;
+    mData.value = 0;
+    mData.weight = 0.f;
+    mData.quality = 0.f;
+}
+
+ESM4::Apparatus::~Apparatus()
+{
+}
+
+void ESM4::Apparatus::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_DATA:
+            {
+                if (reader.esmVersion() == ESM::VER_094 || reader.esmVersion() == ESM::VER_170)
+                {
+                    reader.get(mData.value);
+                    reader.get(mData.weight);
+                }
+                else
+                {
+                    reader.get(mData.type);
+                    reader.get(mData.value);
+                    reader.get(mData.weight);
+                    reader.get(mData.quality);
+                }
+                break;
+            }
+            case ESM4::SUB_ICON: reader.getZString(mIcon);  break;
+            case ESM4::SUB_MODL: reader.getZString(mModel); break;
+            case ESM4::SUB_SCRI: reader.getFormId(mScriptId); break;
+            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
+            case ESM4::SUB_DESC: reader.getLocalizedString(mText); break;
+            case ESM4::SUB_MODT:
+            case ESM4::SUB_OBND:
+            case ESM4::SUB_QUAL:
+            {
+                //std::cout << "APPA " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::APPA::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Apparatus::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Apparatus::blank()
+//{
+//}
diff --git a/components/esm4/loadappa.hpp b/components/esm4/loadappa.hpp
new file mode 100644
index 0000000000..1723c969ee
--- /dev/null
+++ b/components/esm4/loadappa.hpp
@@ -0,0 +1,75 @@
+/*
+  Copyright (C) 2016, 2018-2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_APPA_H
+#define ESM4_APPA_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Apparatus
+    {
+        struct Data
+        {
+            std::uint8_t  type;  // 0 = Mortar and Pestle, 1 = Alembic, 2 = Calcinator, 3 = Retort
+            std::uint32_t value; // gold
+            float         weight;
+            float         quality;
+        };
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mFullName;
+        std::string mModel;
+        std::string mText;
+        std::string mIcon; // inventory
+
+        float mBoundRadius;
+
+        FormId mScriptId;
+
+        Data mData;
+
+        Apparatus();
+        virtual ~Apparatus();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_APPA_H
diff --git a/components/esm4/loadarma.cpp b/components/esm4/loadarma.cpp
new file mode 100644
index 0000000000..8b29000bb3
--- /dev/null
+++ b/components/esm4/loadarma.cpp
@@ -0,0 +1,151 @@
+/*
+  Copyright (C) 2019, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadarma.hpp"
+
+#include <stdexcept>
+//#include <iostream> // FIXME: testing only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::ArmorAddon::ArmorAddon() : mFormId(0), mFlags(0), mTextureMale(0), mTextureFemale(0),
+                                 mRacePrimary(0)
+{
+    mEditorId.clear();
+
+    mModelMale.clear();
+    mModelFemale.clear();
+}
+
+ESM4::ArmorAddon::~ArmorAddon()
+{
+}
+
+void ESM4::ArmorAddon::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    std::uint32_t esmVer = reader.esmVersion();
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_MOD2: reader.getZString(mModelMale); break;
+            case ESM4::SUB_MOD3: reader.getZString(mModelFemale); break;
+            case ESM4::SUB_MOD4:
+            case ESM4::SUB_MOD5:
+            {
+                std::string model;
+                reader.getZString(model);
+
+                //std::cout << mEditorId << " " << ESM::printName(subHdr.typeId) << " " << model << std::endl;
+
+                break;
+            }
+            case ESM4::SUB_NAM0: reader.getFormId(mTextureMale); break;
+            case ESM4::SUB_NAM1: reader.getFormId(mTextureFemale); break;
+            case ESM4::SUB_RNAM: reader.getFormId(mRacePrimary); break;
+            case ESM4::SUB_MODL:
+            {
+                if ((esmVer == ESM::VER_094 || esmVer == ESM::VER_170) && subHdr.dataSize == 4) // TES5
+                {
+                    FormId formId;
+                    reader.getFormId(formId);
+                    mRaces.push_back(formId);
+                }
+                else
+                    reader.skipSubRecordData(); // FIXME: this should be mModelMale for FO3/FONV
+
+                break;
+            }
+            case ESM4::SUB_BODT: // body template
+            {
+                reader.get(mBodyTemplate.bodyPart);
+                reader.get(mBodyTemplate.flags);
+                reader.get(mBodyTemplate.unknown1); // probably padding
+                reader.get(mBodyTemplate.unknown2); // probably padding
+                reader.get(mBodyTemplate.unknown3); // probably padding
+                reader.get(mBodyTemplate.type);
+
+                break;
+            }
+            case ESM4::SUB_BOD2: // TES5
+            {
+                reader.get(mBodyTemplate.bodyPart);
+                mBodyTemplate.flags = 0;
+                mBodyTemplate.unknown1 = 0; // probably padding
+                mBodyTemplate.unknown2 = 0; // probably padding
+                mBodyTemplate.unknown3 = 0; // probably padding
+                reader.get(mBodyTemplate.type);
+
+                break;
+            }
+            case ESM4::SUB_DNAM:
+            case ESM4::SUB_MO2T: // FIXME: should group with MOD2
+            case ESM4::SUB_MO2S: // FIXME: should group with MOD2
+            case ESM4::SUB_MO3T: // FIXME: should group with MOD3
+            case ESM4::SUB_MO3S: // FIXME: should group with MOD3
+            case ESM4::SUB_MOSD: // FO3 // FIXME: should group with MOD3
+            case ESM4::SUB_MO4T: // FIXME: should group with MOD4
+            case ESM4::SUB_MO4S: // FIXME: should group with MOD4
+            case ESM4::SUB_MO5T:
+            case ESM4::SUB_NAM2: // txst formid male
+            case ESM4::SUB_NAM3: // txst formid female
+            case ESM4::SUB_SNDD: // footset sound formid
+            case ESM4::SUB_BMDT: // FO3
+            case ESM4::SUB_DATA: // FO3
+            case ESM4::SUB_ETYP: // FO3
+            case ESM4::SUB_FULL: // FO3
+            case ESM4::SUB_ICO2: // FO3 // female
+            case ESM4::SUB_ICON: // FO3 // male
+            case ESM4::SUB_MODT: // FO3 // FIXME: should group with MODL
+            case ESM4::SUB_MODS: // FO3 // FIXME: should group with MODL
+            case ESM4::SUB_MODD: // FO3 // FIXME: should group with MODL
+            case ESM4::SUB_OBND: // FO3
+            {
+                //std::cout << "ARMA " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::ARMA::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::ArmorAddon::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::ArmorAddon::blank()
+//{
+//}
diff --git a/components/esm4/loadarma.hpp b/components/esm4/loadarma.hpp
new file mode 100644
index 0000000000..59c4550b7f
--- /dev/null
+++ b/components/esm4/loadarma.hpp
@@ -0,0 +1,70 @@
+/*
+  Copyright (C) 2019, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_ARMA_H
+#define ESM4_ARMA_H
+
+#include <cstdint>
+#include <string>
+#include <vector>
+
+#include "formid.hpp"
+#include "actor.hpp" // BodyTemplate
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct ArmorAddon
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+
+        std::string mModelMale;
+        std::string mModelFemale;
+
+        FormId mTextureMale;
+        FormId mTextureFemale;
+
+        FormId mRacePrimary;
+        std::vector<FormId> mRaces; // TES5 only
+
+        BodyTemplate mBodyTemplate; // TES5
+
+        ArmorAddon();
+        virtual ~ArmorAddon();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_ARMA_H
diff --git a/components/esm4/loadarmo.cpp b/components/esm4/loadarmo.cpp
new file mode 100644
index 0000000000..bc0765c869
--- /dev/null
+++ b/components/esm4/loadarmo.cpp
@@ -0,0 +1,218 @@
+/*
+  Copyright (C) 2016, 2018-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadarmo.hpp"
+
+#include <stdexcept>
+//#include <iostream> // FIXME: testing only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Armor::Armor() : mFormId(0), mFlags(0), mIsTES4(false), mIsFO3(false), mIsFONV(false),
+                       mPickUpSound(0), mDropSound(0), mBoundRadius(0.f),
+                       mArmorFlags(0), mGeneralFlags(0), mScriptId(0), mEnchantmentPoints(0), mEnchantment(0)
+{
+    mEditorId.clear();
+    mFullName.clear();
+    mModelMale.clear();
+    mModelMaleWorld.clear();
+    mModelFemale.clear();
+    mModelFemaleWorld.clear();
+    mText.clear();
+    mIconMale.clear();
+    mMiniIconMale.clear();
+    mIconFemale.clear();
+    mMiniIconFemale.clear();
+
+    mData.armor = 0;
+    mData.value = 0;
+    mData.health = 0;
+    mData.weight = 0.f;
+}
+
+ESM4::Armor::~Armor()
+{
+}
+
+void ESM4::Armor::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+    std::uint32_t esmVer = reader.esmVersion();
+    mIsFONV = esmVer == ESM::VER_132 || esmVer == ESM::VER_133 || esmVer == ESM::VER_134;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_DATA:
+            {
+                //if (reader.esmVersion() == ESM::VER_094 || reader.esmVersion() == ESM::VER_170)
+                if (subHdr.dataSize == 8) // FO3 has 12 bytes even though VER_094
+                {
+                    reader.get(mData.value);
+                    reader.get(mData.weight);
+                    mIsFO3 = true;
+                }
+                else if (mIsFONV || subHdr.dataSize == 12)
+                {
+                    reader.get(mData.value);
+                    reader.get(mData.health);
+                    reader.get(mData.weight);
+                }
+                else
+                {
+                    reader.get(mData); // TES4
+                    mIsTES4 = true;
+                }
+
+                break;
+            }
+            case ESM4::SUB_MODL: // seems only for Dawnguard/Dragonborn?
+            {
+                //if (esmVer == ESM::VER_094 || esmVer == ESM::VER_170 || isFONV)
+                if (subHdr.dataSize == 4) // FO3 has zstring even though VER_094
+                {
+                    FormId formId;
+                    reader.getFormId(formId);
+
+                    mAddOns.push_back(formId);
+                }
+                else
+                {
+                    if (!reader.getZString(mModelMale))
+                        throw std::runtime_error ("ARMO MODL data read error");
+                }
+
+                break;
+            }
+            case ESM4::SUB_MOD2: reader.getZString(mModelMaleWorld);break;
+            case ESM4::SUB_MOD3: reader.getZString(mModelFemale); break;
+            case ESM4::SUB_MOD4: reader.getZString(mModelFemaleWorld); break;
+            case ESM4::SUB_ICON: reader.getZString(mIconMale);   break;
+            case ESM4::SUB_MICO: reader.getZString(mMiniIconMale);   break;
+            case ESM4::SUB_ICO2: reader.getZString(mIconFemale); break;
+            case ESM4::SUB_MIC2: reader.getZString(mMiniIconFemale); break;
+            case ESM4::SUB_BMDT:
+            {
+                if (subHdr.dataSize == 8) // FO3
+                {
+                    reader.get(mArmorFlags);
+                    reader.get(mGeneralFlags);
+                    mGeneralFlags &= 0x000000ff;
+                    mGeneralFlags |= TYPE_FO3;
+                }
+                else                      // TES4
+                {
+                    reader.get(mArmorFlags);
+                    mGeneralFlags = (mArmorFlags & 0x00ff0000) >> 16;
+                    mGeneralFlags |= TYPE_TES4;
+                }
+                break;
+            }
+            case ESM4::SUB_BODT:
+            {
+                reader.get(mArmorFlags);
+                uint32_t flags = 0;
+                if (subHdr.dataSize == 12)
+                    reader.get(flags);
+                reader.get(mGeneralFlags);   // skill
+                mGeneralFlags &= 0x0000000f; // 0 (light), 1 (heavy) or 2 (none)
+                if (subHdr.dataSize == 12)
+                    mGeneralFlags |= (flags & 0x0000000f) << 3;
+                mGeneralFlags |= TYPE_TES5;
+                break;
+            }
+            case ESM4::SUB_BOD2:
+            {
+                reader.get(mArmorFlags);
+                reader.get(mGeneralFlags);
+                mGeneralFlags &= 0x0000000f; // 0 (light), 1 (heavy) or 2 (none)
+                mGeneralFlags |= TYPE_TES5;
+                break;
+            }
+            case ESM4::SUB_SCRI: reader.getFormId(mScriptId);      break;
+            case ESM4::SUB_ANAM: reader.get(mEnchantmentPoints); break;
+            case ESM4::SUB_ENAM: reader.getFormId(mEnchantment); break;
+            case ESM4::SUB_MODB: reader.get(mBoundRadius);       break;
+            case ESM4::SUB_DESC: reader.getLocalizedString(mText); break;
+            case ESM4::SUB_YNAM: reader.getFormId(mPickUpSound); break;
+            case ESM4::SUB_ZNAM: reader.getFormId(mDropSound); break;
+            case ESM4::SUB_MODT:
+            case ESM4::SUB_MO2B:
+            case ESM4::SUB_MO3B:
+            case ESM4::SUB_MO4B:
+            case ESM4::SUB_MO2T:
+            case ESM4::SUB_MO2S:
+            case ESM4::SUB_MO3T:
+            case ESM4::SUB_MO4T:
+            case ESM4::SUB_MO4S:
+            case ESM4::SUB_OBND:
+            case ESM4::SUB_RNAM: // race formid
+            case ESM4::SUB_KSIZ:
+            case ESM4::SUB_KWDA:
+            case ESM4::SUB_TNAM:
+            case ESM4::SUB_DNAM:
+            case ESM4::SUB_BAMT:
+            case ESM4::SUB_BIDS:
+            case ESM4::SUB_ETYP:
+            case ESM4::SUB_BMCT:
+            case ESM4::SUB_EAMT:
+            case ESM4::SUB_EITM:
+            case ESM4::SUB_VMAD:
+            case ESM4::SUB_REPL: // FO3
+            case ESM4::SUB_BIPL: // FO3
+            case ESM4::SUB_MODD: // FO3
+            case ESM4::SUB_MOSD: // FO3
+            case ESM4::SUB_MODS: // FO3
+            case ESM4::SUB_MO3S: // FO3
+            case ESM4::SUB_BNAM: // FONV
+            case ESM4::SUB_SNAM: // FONV
+            {
+                //std::cout << "ARMO " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::ARMO::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+    //if ((mArmorFlags&0xffff) == 0x02) // only hair
+        //std::cout << "only hair " << mEditorId << std::endl;
+}
+
+//void ESM4::Armor::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Armor::blank()
+//{
+//}
diff --git a/components/esm4/loadarmo.hpp b/components/esm4/loadarmo.hpp
new file mode 100644
index 0000000000..f17521f507
--- /dev/null
+++ b/components/esm4/loadarmo.hpp
@@ -0,0 +1,196 @@
+/*
+  Copyright (C) 2016, 2018-2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_ARMO_H
+#define ESM4_ARMO_H
+
+#include <cstdint>
+#include <string>
+#include <vector>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Armor
+    {
+        // WARN: TES4 Armorflags still has the general flags high bits
+        enum ArmorFlags
+        {
+            TES4_Head        = 0x00000001,
+            TES4_Hair        = 0x00000002,
+            TES4_UpperBody   = 0x00000004,
+            TES4_LowerBody   = 0x00000008,
+            TES4_Hands       = 0x00000010,
+            TES4_Feet        = 0x00000020,
+            TES4_RightRing   = 0x00000040,
+            TES4_LeftRing    = 0x00000080,
+            TES4_Amulet      = 0x00000100,
+            TES4_Weapon      = 0x00000200,
+            TES4_BackWeapon  = 0x00000400,
+            TES4_SideWeapon  = 0x00000800,
+            TES4_Quiver      = 0x00001000,
+            TES4_Shield      = 0x00002000,
+            TES4_Torch       = 0x00004000,
+            TES4_Tail        = 0x00008000,
+            //
+            FO3_Head         = 0x00000001,
+            FO3_Hair         = 0x00000002,
+            FO3_UpperBody    = 0x00000004,
+            FO3_LeftHand     = 0x00000008,
+            FO3_RightHand    = 0x00000010,
+            FO3_Weapon       = 0x00000020,
+            FO3_PipBoy       = 0x00000040,
+            FO3_Backpack     = 0x00000080,
+            FO3_Necklace     = 0x00000100,
+            FO3_Headband     = 0x00000200,
+            FO3_Hat          = 0x00000400,
+            FO3_EyeGlasses   = 0x00000800,
+            FO3_NoseRing     = 0x00001000,
+            FO3_Earrings     = 0x00002000,
+            FO3_Mask         = 0x00004000,
+            FO3_Choker       = 0x00008000,
+            FO3_MouthObject  = 0x00010000,
+            FO3_BodyAddOn1   = 0x00020000,
+            FO3_BodyAddOn2   = 0x00040000,
+            FO3_BodyAddOn3   = 0x00080000,
+            //
+            TES5_Head        = 0x00000001,
+            TES5_Hair        = 0x00000002,
+            TES5_Body        = 0x00000004,
+            TES5_Hands       = 0x00000008,
+            TES5_Forearms    = 0x00000010,
+            TES5_Amulet      = 0x00000020,
+            TES5_Ring        = 0x00000040,
+            TES5_Feet        = 0x00000080,
+            TES5_Calves      = 0x00000100,
+            TES5_Shield      = 0x00000200,
+            TES5_Tail        = 0x00000400,
+            TES5_LongHair    = 0x00000800,
+            TES5_Circlet     = 0x00001000,
+            TES5_Ears        = 0x00002000,
+            TES5_BodyAddOn3  = 0x00004000,
+            TES5_BodyAddOn4  = 0x00008000,
+            TES5_BodyAddOn5  = 0x00010000,
+            TES5_BodyAddOn6  = 0x00020000,
+            TES5_BodyAddOn7  = 0x00040000,
+            TES5_BodyAddOn8  = 0x00080000,
+            TES5_DecapHead   = 0x00100000,
+            TES5_Decapitate  = 0x00200000,
+            TES5_BodyAddOn9  = 0x00400000,
+            TES5_BodyAddOn10 = 0x00800000,
+            TES5_BodyAddOn11 = 0x01000000,
+            TES5_BodyAddOn12 = 0x02000000,
+            TES5_BodyAddOn13 = 0x04000000,
+            TES5_BodyAddOn14 = 0x08000000,
+            TES5_BodyAddOn15 = 0x10000000,
+            TES5_BodyAddOn16 = 0x20000000,
+            TES5_BodyAddOn17 = 0x40000000,
+            TES5_FX01        = 0x80000000
+        };
+
+        enum GeneralFlags
+        {
+            TYPE_TES4        = 0x1000,
+            TYPE_FO3         = 0x2000,
+            TYPE_TES5        = 0x3000,
+            TYPE_FONV        = 0x4000,
+            //
+            TES4_HideRings   = 0x0001,
+            TES4_HideAmulet  = 0x0002,
+            TES4_NonPlayable = 0x0040,
+            TES4_HeavyArmor  = 0x0080,
+            //
+            FO3_PowerArmor   = 0x0020,
+            FO3_NonPlayable  = 0x0040,
+            FO3_HeavyArmor   = 0x0080,
+            //
+            TES5_LightArmor  = 0x0000,
+            TES5_HeavyArmor  = 0x0001,
+            TES5_None        = 0x0002,
+            TES5_ModVoice    = 0x0004, // note bit shift
+            TES5_NonPlayable = 0x0040  // note bit shift
+        };
+
+#pragma pack(push, 1)
+        struct Data
+        {
+            std::uint16_t armor; // only in TES4?
+            std::uint32_t value;
+            std::uint32_t health; // not in TES5?
+            float         weight;
+        };
+#pragma pack(pop)
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        bool mIsTES4; // TODO: check that these match the general flags
+        bool mIsFO3;
+        bool mIsFONV;
+
+        std::string mEditorId;
+        std::string mFullName;
+        std::string mModelMale;
+        std::string mModelMaleWorld;
+        std::string mModelFemale;
+        std::string mModelFemaleWorld;
+        std::string mText;
+        std::string mIconMale;
+        std::string mMiniIconMale;
+        std::string mIconFemale;
+        std::string mMiniIconFemale;
+
+        FormId mPickUpSound;
+        FormId mDropSound;
+
+        std::string mModel; // FIXME: for OpenCS
+
+        float mBoundRadius;
+
+        std::uint32_t mArmorFlags;
+        std::uint32_t mGeneralFlags;
+        FormId        mScriptId;
+        std::uint16_t mEnchantmentPoints;
+        FormId        mEnchantment;
+
+        std::vector<FormId> mAddOns; // TES5 ARMA
+        Data mData;
+
+        Armor();
+        virtual ~Armor();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_ARMO_H
diff --git a/components/esm4/loadaspc.cpp b/components/esm4/loadaspc.cpp
new file mode 100644
index 0000000000..a4cb6f3939
--- /dev/null
+++ b/components/esm4/loadaspc.cpp
@@ -0,0 +1,94 @@
+/*
+  Copyright (C) 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadaspc.hpp"
+
+#include <stdexcept>
+//#include <iostream> // FIXME: for debugging only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::AcousticSpace::AcousticSpace() : mFormId(0), mFlags(0), mEnvironmentType(0), mSoundRegion(0),
+    mIsInterior(0)
+{
+    mEditorId.clear();
+}
+
+ESM4::AcousticSpace::~AcousticSpace()
+{
+}
+
+void ESM4::AcousticSpace::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId);  break;
+            case ESM4::SUB_ANAM: reader.get(mEnvironmentType); break;
+            case ESM4::SUB_SNAM:
+            {
+                FormId id;
+                reader.getFormId(id);
+                mAmbientLoopSounds.push_back(id);
+                break;
+            }
+            case ESM4::SUB_RDAT: reader.getFormId(mSoundRegion); break;
+            case ESM4::SUB_INAM: reader.get(mIsInterior); break;
+            case ESM4::SUB_WNAM: // usually 0 for FONV (maybe # of close Actors for Walla to trigger)
+            {
+                std::uint32_t dummy;
+                reader.get(dummy);
+                //std::cout << "WNAM " << mEditorId << " " << dummy << std::endl;
+                break;
+            }
+            case ESM4::SUB_BNAM: // TES5 reverb formid
+            case ESM4::SUB_OBND:
+            {
+                //std::cout << "ASPC " << ESM::printName(subHdr.typeId) << " skipping..."
+                          //<< subHdr.dataSize << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::ASPC::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::AcousticSpace::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::AcousticSpace::blank()
+//{
+//}
diff --git a/components/esm4/loadaspc.hpp b/components/esm4/loadaspc.hpp
new file mode 100644
index 0000000000..3ab1a8484d
--- /dev/null
+++ b/components/esm4/loadaspc.hpp
@@ -0,0 +1,66 @@
+/*
+  Copyright (C) 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_ASPC_H
+#define ESM4_ASPC_H
+
+#include <cstdint>
+#include <string>
+#include <vector>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct AcousticSpace
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+
+        std::uint32_t mEnvironmentType;
+
+        // 0 Dawn (5:00 start), 1 Afternoon (8:00), 2 Dusk (18:00), 3 Night (20:00)
+        std::vector<FormId> mAmbientLoopSounds;
+        FormId mSoundRegion;
+
+        std::uint32_t mIsInterior; // if true only use mAmbientLoopSounds[0]
+
+        AcousticSpace();
+        virtual ~AcousticSpace();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_ASPC_H
diff --git a/components/esm4/loadbook.cpp b/components/esm4/loadbook.cpp
new file mode 100644
index 0000000000..0ffc69ef0e
--- /dev/null
+++ b/components/esm4/loadbook.cpp
@@ -0,0 +1,121 @@
+/*
+  Copyright (C) 2016, 2018, 2020-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadbook.hpp"
+
+#include <stdexcept>
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Book::Book() : mFormId(0), mFlags(0), mBoundRadius(0.f), mScriptId(0),
+                     mEnchantmentPoints(0), mEnchantment(0), mPickUpSound(0), mDropSound(0)
+{
+    mEditorId.clear();
+    mFullName.clear();
+    mModel.clear();
+    mText.clear();
+    mIcon.clear();
+
+    mData.flags = 0;
+    mData.type = 0;
+    mData.bookSkill = 0;
+    mData.value = 0;
+    mData.weight = 0.f;
+}
+
+ESM4::Book::~Book()
+{
+}
+
+void ESM4::Book::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+    //std::uint32_t esmVer = reader.esmVersion(); // currently unused
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_DESC: reader.getLocalizedString(mText); break;
+            case ESM4::SUB_DATA:
+            {
+                reader.get(mData.flags);
+                //if (reader.esmVersion() == ESM::VER_094 || reader.esmVersion() == ESM::VER_170)
+                if (subHdr.dataSize == 16) // FO3 has 10 bytes even though VER_094
+                {
+                    static std::uint8_t dummy;
+                    reader.get(mData.type);
+                    reader.get(dummy);
+                    reader.get(dummy);
+                    reader.get(mData.teaches);
+                }
+                else
+                {
+                    reader.get(mData.bookSkill);
+                }
+                reader.get(mData.value);
+                reader.get(mData.weight);
+                break;
+            }
+            case ESM4::SUB_ICON: reader.getZString(mIcon);  break;
+            case ESM4::SUB_MODL: reader.getZString(mModel); break;
+            case ESM4::SUB_SCRI: reader.getFormId(mScriptId);      break;
+            case ESM4::SUB_ANAM: reader.get(mEnchantmentPoints); break;
+            case ESM4::SUB_ENAM: reader.getFormId(mEnchantment); break;
+            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
+            case ESM4::SUB_YNAM: reader.getFormId(mPickUpSound); break;
+            case ESM4::SUB_ZNAM: reader.getFormId(mDropSound); break; // TODO: does this exist?
+            case ESM4::SUB_MODT:
+            case ESM4::SUB_OBND:
+            case ESM4::SUB_KSIZ:
+            case ESM4::SUB_KWDA:
+            case ESM4::SUB_CNAM:
+            case ESM4::SUB_INAM:
+            case ESM4::SUB_VMAD:
+            {
+                //std::cout << "BOOK " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::BOOK::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Book::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Book::blank()
+//{
+//}
diff --git a/components/esm4/loadbook.hpp b/components/esm4/loadbook.hpp
new file mode 100644
index 0000000000..c5c1a3529f
--- /dev/null
+++ b/components/esm4/loadbook.hpp
@@ -0,0 +1,114 @@
+/*
+  Copyright (C) 2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_BOOK_H
+#define ESM4_BOOK_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Book
+    {
+        enum Flags
+        {
+            Flag_Scroll = 0x0001,
+            Flag_NoTake = 0x0002
+        };
+
+        enum BookSkill // for TES4 only
+        {
+            BookSkill_None        = -1,
+            BookSkill_Armorer     =  0,
+            BookSkill_Athletics   =  1,
+            BookSkill_Blade       =  2,
+            BookSkill_Block       =  3,
+            BookSkill_Blunt       =  4,
+            BookSkill_HandToHand  =  5,
+            BookSkill_HeavyArmor  =  6,
+            BookSkill_Alchemy     =  7,
+            BookSkill_Alteration  =  8,
+            BookSkill_Conjuration =  9,
+            BookSkill_Destruction = 10,
+            BookSkill_Illusion    = 11,
+            BookSkill_Mysticism   = 12,
+            BookSkill_Restoration = 13,
+            BookSkill_Acrobatics  = 14,
+            BookSkill_LightArmor  = 15,
+            BookSkill_Marksman    = 16,
+            BookSkill_Mercantile  = 17,
+            BookSkill_Security    = 18,
+            BookSkill_Sneak       = 19,
+            BookSkill_Speechcraft = 20
+        };
+
+        struct Data
+        {
+            std::uint8_t  flags;
+            std::uint8_t  type;    // TES5 only
+            std::uint32_t teaches; // TES5 only
+            std::int8_t bookSkill; // not in TES5
+            std::uint32_t value;
+            float         weight;
+        };
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mFullName;
+        std::string mModel;
+
+        float mBoundRadius;
+
+        std::string mText;
+        FormId      mScriptId;
+        std::string mIcon;
+        std::uint16_t mEnchantmentPoints;
+        FormId      mEnchantment;
+
+        Data mData;
+
+        FormId mPickUpSound;
+        FormId mDropSound;
+
+        Book();
+        virtual ~Book();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_BOOK_H
diff --git a/components/esm4/loadbptd.cpp b/components/esm4/loadbptd.cpp
new file mode 100644
index 0000000000..6c6c1bc26c
--- /dev/null
+++ b/components/esm4/loadbptd.cpp
@@ -0,0 +1,113 @@
+/*
+  Copyright (C) 2019-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadbptd.hpp"
+
+#include <stdexcept>
+#include <iostream> // FIXME: testing only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+void ESM4::BodyPartData::BodyPart::clear()
+{
+    mPartName.clear();
+    mNodeName.clear();
+    mVATSTarget.clear();
+    mIKStartNode.clear();
+    std::memset(&mData, 0, sizeof(BPND));
+    mLimbReplacementModel.clear();
+    mGoreEffectsTarget.clear();
+}
+
+ESM4::BodyPartData::BodyPartData() : mFormId(0), mFlags(0)
+{
+    mEditorId.clear();
+    mFullName.clear();
+    mModel.clear();
+}
+
+ESM4::BodyPartData::~BodyPartData()
+{
+}
+
+void ESM4::BodyPartData::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    BodyPart bodyPart;
+    bodyPart.clear();
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_MODL: reader.getZString(mModel); break;
+            case ESM4::SUB_BPTN: reader.getLocalizedString(bodyPart.mPartName); break;
+            case ESM4::SUB_BPNN: reader.getZString(bodyPart.mNodeName); break;
+            case ESM4::SUB_BPNT: reader.getZString(bodyPart.mVATSTarget); break;
+            case ESM4::SUB_BPNI: reader.getZString(bodyPart.mIKStartNode); break;
+            case ESM4::SUB_BPND: reader.get(bodyPart.mData); break;
+            case ESM4::SUB_NAM1: reader.getZString(bodyPart.mLimbReplacementModel); break;
+            case ESM4::SUB_NAM4: // FIXME: assumed occurs last
+            {
+                reader.getZString(bodyPart.mGoreEffectsTarget); // target bone
+
+                mBodyParts.push_back(bodyPart); // FIXME: possible without copying?
+
+                bodyPart.clear();
+                break;
+            }
+            case ESM4::SUB_NAM5:
+            case ESM4::SUB_RAGA: // ragdoll
+            case ESM4::SUB_MODS:
+            case ESM4::SUB_MODT:
+            {
+                //std::cout << "BPTD " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::BPTD::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+
+    //if (mEditorId == "DefaultBodyPartData")
+        //std::cout << "BPTD: " << mEditorId << std::endl; // FIXME: testing only
+}
+
+//void ESM4::BodyPartData::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::BodyPartData::blank()
+//{
+//}
diff --git a/components/esm4/loadbptd.hpp b/components/esm4/loadbptd.hpp
new file mode 100644
index 0000000000..0a29cd22cb
--- /dev/null
+++ b/components/esm4/loadbptd.hpp
@@ -0,0 +1,128 @@
+/*
+  Copyright (C) 2019, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_BPTD_H
+#define ESM4_BPTD_H
+
+#include <vector>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct BodyPartData
+    {
+#pragma pack(push, 1)
+        struct BPND
+        {
+            float damageMult;
+
+            // Severable
+            // IK Data
+            // IK Data - Biped Data
+            // Explodable
+            // IK Data - Is Head
+            // IK Data - Headtracking
+            // To Hit Chance - Absolute
+            std::uint8_t flags;
+
+            // Torso
+            // Head
+            // Eye
+            // LookAt
+            // Fly Grab
+            // Saddle
+            std::uint8_t partType;
+
+            std::uint8_t healthPercent;
+            std::int8_t  actorValue; //(Actor Values)
+            std::uint8_t toHitChance;
+
+            std::uint8_t explExplosionChance; // %
+            std::uint16_t explDebrisCount;
+            FormId explDebris;
+            FormId explExplosion;
+            float trackingMaxAngle;
+            float explDebrisScale;
+
+            std::int32_t sevDebrisCount;
+            FormId sevDebris;
+            FormId sevExplosion;
+            float sevDebrisScale;
+
+            //Struct - Gore Effects Positioning
+            float transX;
+            float transY;
+            float transZ;
+            float rotX;
+            float rotY;
+            float rotZ;
+
+            FormId sevImpactDataSet;
+            FormId explImpactDataSet;
+            uint8_t sevDecalCount;
+            uint8_t explDecalCount;
+            uint16_t Unknown;
+            float limbReplacementScale;
+        };
+#pragma pack(pop)
+
+        struct BodyPart
+        {
+            std::string mPartName;
+            std::string mNodeName;
+            std::string mVATSTarget;
+            std::string mIKStartNode;
+            BPND mData;
+            std::string mLimbReplacementModel;
+            std::string mGoreEffectsTarget;
+
+            void clear();
+        };
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mFullName;
+        std::string mModel;
+
+        std::vector<BodyPart> mBodyParts;
+
+        BodyPartData();
+        virtual ~BodyPartData();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_BPTD_H
diff --git a/components/esm4/loadcell.cpp b/components/esm4/loadcell.cpp
new file mode 100644
index 0000000000..eb1f864b92
--- /dev/null
+++ b/components/esm4/loadcell.cpp
@@ -0,0 +1,269 @@
+/*
+  Copyright (C) 2015-2016, 2018-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadcell.hpp"
+
+#ifdef NDEBUG // FIXME: debuggigng only
+#undef NDEBUG
+#endif
+
+#include <cassert>
+#include <stdexcept>
+#include <cfloat> // FLT_MAX for gcc
+
+#include <iostream> // FIXME: debug only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Cell::Cell() : mParent(0), mFormId(0), mFlags(0), mCellFlags(0), mX(0), mY(0), mOwner(0),
+                     mGlobal(0), mClimate(0), mWater(0), mWaterHeight(0.f),
+                     mLightingTemplate(0), mLightingTemplateFlags(0), mMusic(0), mAcousticSpace(0),
+                     mMusicType(0), mPreloaded(false)
+{
+    mEditorId.clear();
+    mFullName.clear();
+
+    mLighting.ambient = 0;
+    mLighting.directional = 0;
+    mLighting.fogColor = 0;
+    mLighting.fogNear = 0.f;
+    mLighting.fogFar = 0.f;
+    mLighting.rotationXY = 0;
+    mLighting.rotationZ = 0;
+    mLighting.fogDirFade = 0.f;
+    mLighting.fogClipDist = 0.f;
+    mLighting.fogPower = FLT_MAX; // hack way to detect TES4
+
+    mRegions.clear();
+}
+
+ESM4::Cell::~Cell()
+{
+}
+
+void ESM4::Cell::init(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+    mParent = reader.currWorld();
+
+    reader.clearCellGrid(); // clear until XCLC FIXME: somehow do this automatically?
+
+    // Sometimes cell 0,0 does not have an XCLC sub record (e.g. ToddLand 000009BF)
+    // To workaround this issue put a default value if group is "exterior sub cell" and its
+    // grid from label is "0 0".  Note the reversed X/Y order (no matter since they're both 0
+    // anyway).
+    if (reader.grp().type == ESM4::Grp_ExteriorSubCell
+            && reader.grp().label.grid[1] == 0 && reader.grp().label.grid[0] == 0)
+    {
+        ESM4::CellGrid currCellGrid;
+        currCellGrid.grid.x = 0;
+        currCellGrid.grid.y = 0;
+        reader.setCurrCellGrid(currCellGrid);  // side effect: sets mCellGridValid  true
+    }
+}
+
+// TODO: Try loading only EDID and XCLC (along with mFormId, mFlags and mParent)
+//
+// But, for external cells we may be scanning the whole record since we don't know if there is
+// going to be an EDID subrecord. And the vast majority of cells are these kinds.
+//
+// So perhaps some testing needs to be done to see if scanning and skipping takes
+// longer/shorter/same as loading the subrecords.
+bool ESM4::Cell::preload(ESM4::Reader& reader)
+{
+    if (!mPreloaded)
+        load(reader);
+
+    mPreloaded = true;
+    return true;
+}
+
+void ESM4::Cell::load(ESM4::Reader& reader)
+{
+    if (mPreloaded)
+        return;
+
+    // WARN: we need to call setCurrCell (and maybe setCurrCellGrid?) again before loading
+    // cell child groups if we are loading them after restoring the context
+    // (may be easier to update the context before saving?)
+    init(reader);
+    reader.setCurrCell(mFormId); // save for LAND (and other children) to access later
+    std::uint32_t esmVer = reader.esmVersion();
+    bool isFONV = esmVer == ESM::VER_132 || esmVer == ESM::VER_133 || esmVer == ESM::VER_134;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID:
+            {
+                if (!reader.getZString(mEditorId))
+                    throw std::runtime_error ("CELL EDID data read error");
+#if 0
+                std::string padding = "";
+                padding.insert(0, reader.stackSize()*2, ' ');
+                std::cout << padding << "CELL Editor ID: " << mEditorId << std::endl;
+#endif
+                break;
+            }
+            case ESM4::SUB_XCLC:
+            {
+                //(X, Y) grid location of the cell followed by flags. Always in
+                //exterior cells and never in interior cells.
+                //
+                //    int32 - X
+                //    int32 - Y
+                //    uint32 - flags (high bits look random)
+                //
+                //        0x1 - Force Hide Land Quad 1
+                //        0x2 - Force Hide Land Quad 2
+                //        0x4 - Force Hide Land Quad 3
+                //        0x8 - Force Hide Land Quad 4
+                uint32_t flags;
+                reader.get(mX);
+                reader.get(mY);
+#if 0
+                std::string padding = "";
+                padding.insert(0, reader.stackSize()*2, ' ');
+                std::cout << padding << "CELL group " << ESM4::printLabel(reader.grp().label, reader.grp().type) << std::endl;
+                std::cout << padding << "CELL formId " << std::hex << reader.hdr().record.id << std::endl;
+                std::cout << padding << "CELL X " << std::dec << mX << ", Y " << mY << std::endl;
+#endif
+                if (esmVer == ESM::VER_094 || esmVer == ESM::VER_170 || isFONV)
+                    if (subHdr.dataSize == 12)
+                        reader.get(flags); // not in Obvlivion, nor FO3/FONV
+
+                // Remember cell grid for later (loading LAND, NAVM which should be CELL temporary children)
+                // Note that grids only apply for external cells.  For interior cells use the cell's formid.
+                ESM4::CellGrid currCell;
+                currCell.grid.x = (int16_t)mX;
+                currCell.grid.y = (int16_t)mY;
+                reader.setCurrCellGrid(currCell);
+
+                break;
+            }
+            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_DATA:
+            {
+                if (esmVer == ESM::VER_094 || esmVer == ESM::VER_170 || isFONV)
+                    if (subHdr.dataSize == 2)
+                        reader.get(mCellFlags);
+                    else
+                    {
+                        assert(subHdr.dataSize == 1 && "CELL unexpected DATA flag size");
+                        reader.get(&mCellFlags, sizeof(std::uint8_t));
+                    }
+                else
+                {
+                    reader.get((std::uint8_t&)mCellFlags); // 8 bits in Obvlivion
+                }
+#if 0
+                std::string padding = "";
+                padding.insert(0, reader.stackSize()*2, ' ');
+                std::cout << padding  << "flags: " << std::hex << mCellFlags << std::endl;
+#endif
+                break;
+            }
+            case ESM4::SUB_XCLR: // for exterior cells
+            {
+                mRegions.resize(subHdr.dataSize/sizeof(FormId));
+                for (std::vector<FormId>::iterator it = mRegions.begin(); it != mRegions.end(); ++it)
+                {
+                    reader.getFormId(*it);
+#if 0
+                    std::string padding = "";
+                    padding.insert(0, reader.stackSize()*2, ' ');
+                    std::cout << padding  << "region: " << std::hex << *it << std::endl;
+#endif
+                }
+                break;
+            }
+            case ESM4::SUB_XOWN: reader.getFormId(mOwner);   break;
+            case ESM4::SUB_XGLB: reader.getFormId(mGlobal);  break; // Oblivion only?
+            case ESM4::SUB_XCCM: reader.getFormId(mClimate); break;
+            case ESM4::SUB_XCWT: reader.getFormId(mWater);   break;
+            case ESM4::SUB_XCLW: reader.get(mWaterHeight);   break;
+            case ESM4::SUB_XCLL:
+            {
+                if (esmVer == ESM::VER_094 || esmVer == ESM::VER_170 || isFONV)
+                {
+                    if (subHdr.dataSize == 40) // FO3/FONV
+                        reader.get(mLighting);
+                    else if (subHdr.dataSize == 92) // TES5
+                    {
+                        reader.get(mLighting);
+                        reader.skipSubRecordData(52); // FIXME
+                    }
+                    else
+                        reader.skipSubRecordData();
+                }
+                else
+                    reader.get(&mLighting, 36); // TES4
+
+                break;
+            }
+            case ESM4::SUB_XCMT: reader.get(mMusicType); break; // Oblivion only?
+            case ESM4::SUB_LTMP: reader.getFormId(mLightingTemplate); break;
+            case ESM4::SUB_LNAM: reader.get(mLightingTemplateFlags); break; // seems to always follow LTMP
+            case ESM4::SUB_XCMO: reader.getFormId(mMusic); break;
+            case ESM4::SUB_XCAS: reader.getFormId(mAcousticSpace); break;
+            case ESM4::SUB_TVDT:
+            case ESM4::SUB_MHDT:
+            case ESM4::SUB_XCGD:
+            case ESM4::SUB_XNAM:
+            case ESM4::SUB_XLCN:
+            case ESM4::SUB_XWCS:
+            case ESM4::SUB_XWCU:
+            case ESM4::SUB_XWCN:
+            case ESM4::SUB_XCIM:
+            case ESM4::SUB_XEZN:
+            case ESM4::SUB_XWEM:
+            case ESM4::SUB_XILL:
+            case ESM4::SUB_XRNK: // Oblivion only?
+            case ESM4::SUB_XCET: // FO3
+            case ESM4::SUB_IMPF: // FO3 Zeta
+            {
+                //std::cout << "CELL " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::CELL::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Cell::save(ESM4::Writer& writer) const
+//{
+//}
+
+void ESM4::Cell::blank()
+{
+}
diff --git a/components/esm4/loadcell.hpp b/components/esm4/loadcell.hpp
new file mode 100644
index 0000000000..70dc94e73a
--- /dev/null
+++ b/components/esm4/loadcell.hpp
@@ -0,0 +1,109 @@
+/*
+  Copyright (C) 2015-2016, 2018-2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_CELL_H
+#define ESM4_CELL_H
+
+#include <cstdint>
+#include <string>
+#include <vector>
+
+#include "formid.hpp"
+#include "lighting.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+    struct ReaderContext;
+    struct CellGroup;
+    typedef std::uint32_t FormId;
+
+    enum CellFlags               // TES4                     TES5
+    {                            // -----------------------  ------------------------------------
+        CELL_Interior = 0x0001,  // Can't travel from here   Interior
+        CELL_HasWater = 0x0002,  // Has water (Int)          Has Water (Int)
+        CELL_NoTravel = 0x0004,  //                          not Can't Travel From Here(Int only)
+        CELL_HideLand = 0x0008,  // Force hide land (Ext)    No LOD Water
+                                 // Oblivion interior (Int)
+        CELL_Public   = 0x0020,  // Public place             Public Area
+        CELL_HandChgd = 0x0040,  // Hand changed             Hand Changed
+        CELL_QuasiExt = 0x0080,  // Behave like exterior     Show Sky
+        CELL_SkyLight = 0x0100   //                          Use Sky Lighting
+    };
+
+    // Unlike TES3, multiple cells can have the same exterior co-ordinates.
+    // The cells need to be organised under world spaces.
+    struct Cell
+    {
+        FormId mParent;       // world formId (for grouping cells), from the loading sequence
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mFullName;
+        std::uint16_t mCellFlags; // TES5 can also be 8 bits
+
+        std::int32_t mX;
+        std::int32_t mY;
+
+        FormId mOwner;
+        FormId mGlobal;
+        FormId mClimate;
+        FormId mWater;
+        float  mWaterHeight;
+
+        std::vector<FormId> mRegions;
+        Lighting mLighting;
+
+        FormId mLightingTemplate;             // FO3/FONV
+        std::uint32_t mLightingTemplateFlags; // FO3/FONV
+
+        FormId mMusic;         // FO3/FONV
+        FormId mAcousticSpace; // FO3/FONV
+        // TES4: 0 = default, 1 = public, 2 = dungeon
+        // FO3/FONV have more types (not sure how they are used, however)
+        std::uint8_t mMusicType;
+
+        CellGroup *mCellGroup;
+
+        Cell();
+        virtual ~Cell();
+
+        void init(ESM4::Reader& reader); // common setup for both preload() and load()
+
+        bool mPreloaded;
+        bool preload(ESM4::Reader& reader);
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        void blank();
+    };
+}
+
+#endif // ESM4_CELL_H
diff --git a/components/esm4/loadclas.cpp b/components/esm4/loadclas.cpp
new file mode 100644
index 0000000000..2948976709
--- /dev/null
+++ b/components/esm4/loadclas.cpp
@@ -0,0 +1,84 @@
+/*
+  Copyright (C) 2016, 2018, 2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadclas.hpp"
+
+//#ifdef NDEBUG // FIXME: debugging only
+//#undef NDEBUG
+//#endif
+
+//#include <cassert>
+#include <stdexcept>
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Class::Class()
+{
+    mEditorId.clear();
+    mFullName.clear();
+    mDesc.clear();
+    mIcon.clear();
+}
+
+ESM4::Class::~Class()
+{
+}
+
+void ESM4::Class::load(ESM4::Reader& reader)
+{
+    //mFormId = reader.adjustFormId(reader.hdr().record.id); // FIXME: use master adjusted?
+    mFormId = reader.hdr().record.id;
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_DESC: reader.getLocalizedString(mDesc); break;
+            case ESM4::SUB_ICON: reader.getZString(mIcon);     break;
+            case ESM4::SUB_DATA:
+            {
+                //std::cout << "CLAS " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::CLAS::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Class::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Class::blank()
+//{
+//}
diff --git a/components/esm4/loadclas.hpp b/components/esm4/loadclas.hpp
new file mode 100644
index 0000000000..83e8372f4a
--- /dev/null
+++ b/components/esm4/loadclas.hpp
@@ -0,0 +1,66 @@
+/*
+  Copyright (C) 2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_CLAS_H
+#define ESM4_CLAS_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Class
+    {
+        struct Data
+        {
+            std::uint32_t attr;
+        };
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mFullName;
+        std::string mDesc;
+        std::string mIcon;
+        Data mData;
+
+        Class();
+        ~Class();
+
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& reader) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_CLAS_H
diff --git a/components/esm4/loadclfm.cpp b/components/esm4/loadclfm.cpp
new file mode 100644
index 0000000000..b926cb93fd
--- /dev/null
+++ b/components/esm4/loadclfm.cpp
@@ -0,0 +1,93 @@
+/*
+  Copyright (C) 2020-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadclfm.hpp"
+
+#include <stdexcept>
+#include <iostream> // FIXME: for debugging only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Colour::Colour() : mFormId(0), mFlags(0), mPlayable(0)
+{
+    mEditorId.clear();
+    mFullName.clear();
+
+    mColour.red = 0;
+    mColour.green = 0;
+    mColour.blue = 0;
+    mColour.custom = 0;
+}
+
+ESM4::Colour::~Colour()
+{
+}
+
+void ESM4::Colour::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId);  break;
+            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_CNAM:
+            {
+                reader.get(mColour.red);
+                reader.get(mColour.green);
+                reader.get(mColour.blue);
+                reader.get(mColour.custom);
+
+                break;
+            }
+            case ESM4::SUB_FNAM:
+            {
+                reader.get(mPlayable);
+
+                break;
+            }
+            default:
+                //std::cout << "CLFM " << ESM::printName(subHdr.typeId) << " skipping..."
+                          //<< subHdr.dataSize << std::endl;
+                //reader.skipSubRecordData();
+                throw std::runtime_error("ESM4::CLFM::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Colour::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Colour::blank()
+//{
+//}
diff --git a/components/esm4/loadclfm.hpp b/components/esm4/loadclfm.hpp
new file mode 100644
index 0000000000..2a18e42cd6
--- /dev/null
+++ b/components/esm4/loadclfm.hpp
@@ -0,0 +1,70 @@
+/*
+  Copyright (C) 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_CLFM_H
+#define ESM4_CLFM_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    // FIXME: duplicate with Npc
+    struct ColourRGB
+    {
+        std::uint8_t red;
+        std::uint8_t green;
+        std::uint8_t blue;
+        std::uint8_t custom; // alpha?
+    };
+
+    struct Colour
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mFullName;
+
+        ColourRGB mColour;
+        std::uint32_t mPlayable;
+
+        Colour();
+        virtual ~Colour();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_CLFM_H
diff --git a/components/esm4/loadclot.cpp b/components/esm4/loadclot.cpp
new file mode 100644
index 0000000000..da6473c393
--- /dev/null
+++ b/components/esm4/loadclot.cpp
@@ -0,0 +1,106 @@
+/*
+  Copyright (C) 2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadclot.hpp"
+
+#include <stdexcept>
+//#include <iostream> // FIXME: for debugging only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Clothing::Clothing() : mFormId(0), mFlags(0), mBoundRadius(0.f), mClothingFlags(0),
+                             mScriptId(0), mEnchantmentPoints(0), mEnchantment(0)
+{
+    mEditorId.clear();
+    mFullName.clear();
+    mModelMale.clear();
+    mModelMaleWorld.clear();
+    mModelFemale.clear();
+    mModelFemaleWorld.clear();
+    mIconMale.clear();
+    mIconFemale.clear();
+
+    mData.value = 0;
+    mData.weight = 0.f;
+}
+
+ESM4::Clothing::~Clothing()
+{
+}
+
+void ESM4::Clothing::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_FULL: reader.getZString(mFullName); break;
+            case ESM4::SUB_DATA: reader.get(mData);            break;
+            case ESM4::SUB_BMDT: reader.get(mClothingFlags);   break;
+            case ESM4::SUB_SCRI: reader.getFormId(mScriptId);      break;
+            case ESM4::SUB_ENAM: reader.getFormId(mEnchantment); break;
+            case ESM4::SUB_ANAM: reader.get(mEnchantmentPoints); break;
+            case ESM4::SUB_MODB: reader.get(mBoundRadius);     break;
+            case ESM4::SUB_MODL: reader.getZString(mModelMale); break;
+            case ESM4::SUB_MOD2: reader.getZString(mModelMaleWorld); break;
+            case ESM4::SUB_MOD3: reader.getZString(mModelFemale); break;
+            case ESM4::SUB_MOD4: reader.getZString(mModelFemaleWorld); break;
+            case ESM4::SUB_ICON: reader.getZString(mIconMale); break;
+            case ESM4::SUB_ICO2: reader.getZString(mIconFemale); break;
+            case ESM4::SUB_MODT:
+            case ESM4::SUB_MO2B:
+            case ESM4::SUB_MO3B:
+            case ESM4::SUB_MO4B:
+            case ESM4::SUB_MO2T:
+            case ESM4::SUB_MO3T:
+            case ESM4::SUB_MO4T:
+            {
+                //std::cout << "CLOT " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::CLOT::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+    //if ((mClothingFlags&0xffff) == 0x02) // only hair
+        //std::cout << "only hair " << mEditorId << std::endl;
+}
+
+//void ESM4::Clothing::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Clothing::blank()
+//{
+//}
diff --git a/components/esm4/loadclot.hpp b/components/esm4/loadclot.hpp
new file mode 100644
index 0000000000..06e019137b
--- /dev/null
+++ b/components/esm4/loadclot.hpp
@@ -0,0 +1,83 @@
+/*
+  Copyright (C) 2016, 2018-2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_CLOT_H
+#define ESM4_CLOT_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Clothing
+    {
+#pragma pack(push, 1)
+        struct Data
+        {
+            std::uint32_t value;   // gold
+            float         weight;
+        };
+#pragma pack(pop)
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mFullName;
+        std::string mModelMale;
+        std::string mModelMaleWorld;
+        std::string mModelFemale;
+        std::string mModelFemaleWorld;
+        std::string mIconMale;   // texture
+        std::string mIconFemale; // texture
+
+        std::string mModel; // FIXME: for OpenCS
+
+        float mBoundRadius;
+
+        std::uint32_t mClothingFlags; // see Armor::ArmorFlags for the values
+        FormId        mScriptId;
+        std::uint16_t mEnchantmentPoints;
+        FormId        mEnchantment;
+
+        Data mData;
+
+        Clothing();
+        virtual ~Clothing();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_CLOT_H
diff --git a/components/esm4/loadcont.cpp b/components/esm4/loadcont.cpp
new file mode 100644
index 0000000000..06366c88cc
--- /dev/null
+++ b/components/esm4/loadcont.cpp
@@ -0,0 +1,107 @@
+/*
+  Copyright (C) 2016, 2018, 2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadcont.hpp"
+
+#include <stdexcept>
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Container::Container() : mFormId(0), mFlags(0), mBoundRadius(0.f), mDataFlags(0), mWeight(0.f),
+                               mOpenSound(0), mCloseSound(0), mScriptId(0)
+{
+    mEditorId.clear();
+    mFullName.clear();
+    mModel.clear();
+}
+
+ESM4::Container::~Container()
+{
+}
+
+void ESM4::Container::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_DATA:
+            {
+                reader.get(mDataFlags);
+                reader.get(mWeight);
+                break;
+            }
+            case ESM4::SUB_CNTO:
+            {
+                static InventoryItem inv; // FIXME: use unique_ptr here?
+                reader.get(inv);
+                reader.adjustFormId(inv.item);
+                mInventory.push_back(inv);
+                break;
+            }
+            case ESM4::SUB_MODL: reader.getZString(mModel);     break;
+            case ESM4::SUB_SNAM: reader.getFormId(mOpenSound);  break;
+            case ESM4::SUB_QNAM: reader.getFormId(mCloseSound); break;
+            case ESM4::SUB_SCRI: reader.getFormId(mScriptId);     break;
+            case ESM4::SUB_MODB: reader.get(mBoundRadius);      break;
+            case ESM4::SUB_MODT:
+            case ESM4::SUB_MODS: // TES5 only
+            case ESM4::SUB_VMAD: // TES5 only
+            case ESM4::SUB_OBND: // TES5 only
+            case ESM4::SUB_COCT: // TES5 only
+            case ESM4::SUB_COED: // TES5 only
+            case ESM4::SUB_DEST: // FONV
+            case ESM4::SUB_DSTD: // FONV
+            case ESM4::SUB_DSTF: // FONV
+            case ESM4::SUB_DMDL: // FONV
+            case ESM4::SUB_DMDT: // FONV
+            case ESM4::SUB_RNAM: // FONV
+            {
+                //std::cout << "CONT " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::CONT::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Container::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Container::blank()
+//{
+//}
diff --git a/components/esm4/loadcont.hpp b/components/esm4/loadcont.hpp
new file mode 100644
index 0000000000..e059d9a361
--- /dev/null
+++ b/components/esm4/loadcont.hpp
@@ -0,0 +1,71 @@
+/*
+  Copyright (C) 2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_CONT_H
+#define ESM4_CONT_H
+
+#include <cstdint>
+#include <string>
+#include <vector>
+
+#include "formid.hpp"
+#include "inventory.hpp" // InventoryItem
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Container
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mFullName;
+        std::string mModel;
+
+        float mBoundRadius;
+        unsigned char mDataFlags;
+        float mWeight;
+
+        FormId mOpenSound;
+        FormId mCloseSound;
+        FormId mScriptId; // TES4 only
+
+        std::vector<InventoryItem> mInventory;
+
+        Container();
+        virtual ~Container();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_CONT_H
diff --git a/components/esm4/loadcrea.cpp b/components/esm4/loadcrea.cpp
new file mode 100644
index 0000000000..5fdd414256
--- /dev/null
+++ b/components/esm4/loadcrea.cpp
@@ -0,0 +1,232 @@
+/*
+  Copyright (C) 2016, 2018, 2020-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadcrea.hpp"
+
+#ifdef NDEBUG // FIXME: debuggigng only
+#undef NDEBUG
+#endif
+
+#include <cassert>
+#include <stdexcept>
+#include <cstring>
+#include <string>
+#include <sstream>
+#include <iostream> // FIXME
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Creature::Creature() : mFormId(0), mFlags(0), mDeathItem(0), mScriptId(0), mCombatStyle(0),
+                             mSoundBase(0), mSound(0), mSoundChance(0), mBaseScale(0.f),
+                             mTurningSpeed(0.f), mFootWeight(0.f), mBoundRadius(0.f)
+{
+    mEditorId.clear();
+    mFullName.clear();
+    mModel.clear();
+
+    mBloodSpray.clear();
+    mBloodDecal.clear();
+
+    mAIData.aggression = 0;
+    mAIData.confidence = 0;
+    mAIData.energyLevel = 0;
+    mAIData.responsibility = 0;
+    mAIData.aiFlags = 0;
+    mAIData.trainSkill = 0;
+    mAIData.trainLevel = 0;
+
+    std::memset(&mData, 0, sizeof(Data));
+}
+
+ESM4::Creature::~Creature()
+{
+}
+
+void ESM4::Creature::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_FULL: reader.getZString(mFullName); break;
+            case ESM4::SUB_MODL: reader.getZString(mModel);    break;
+            case ESM4::SUB_CNTO:
+            {
+                static InventoryItem inv; // FIXME: use unique_ptr here?
+                reader.get(inv);
+                reader.adjustFormId(inv.item);
+                mInventory.push_back(inv);
+                break;
+            }
+            case ESM4::SUB_SPLO:
+            {
+                FormId id;
+                reader.getFormId(id);
+                mSpell.push_back(id);
+                break;
+            }
+            case ESM4::SUB_PKID:
+            {
+                FormId id;
+                reader.getFormId(id);
+                mAIPackages.push_back(id);
+                break;
+            }
+            case ESM4::SUB_SNAM:
+            {
+                reader.get(mFaction);
+                reader.adjustFormId(mFaction.faction);
+                break;
+            }
+            case ESM4::SUB_INAM: reader.getFormId(mDeathItem);   break;
+            case ESM4::SUB_SCRI: reader.getFormId(mScriptId);      break;
+            case ESM4::SUB_AIDT:
+            {
+                if (subHdr.dataSize == 20) // FO3
+                    reader.skipSubRecordData();
+                else
+                    reader.get(mAIData); // 12 bytes
+                break;
+            }
+            case ESM4::SUB_ACBS:
+            {
+                //if (esmVer == ESM::VER_094 || esmVer == ESM::VER_170 || mIsFONV)
+                if (subHdr.dataSize == 24)
+                    reader.get(mBaseConfig);
+                else
+                    reader.get(&mBaseConfig, 16); // TES4
+                break;
+            }
+            case ESM4::SUB_DATA:
+            {
+                if (subHdr.dataSize == 17) // FO3
+                    reader.skipSubRecordData();
+                else
+                    reader.get(mData);
+                break;
+            }
+            case ESM4::SUB_ZNAM: reader.getFormId(mCombatStyle); break;
+            case ESM4::SUB_CSCR: reader.getFormId(mSoundBase);   break;
+            case ESM4::SUB_CSDI: reader.getFormId(mSound);       break;
+            case ESM4::SUB_CSDC: reader.get(mSoundChance);  break;
+            case ESM4::SUB_BNAM: reader.get(mBaseScale);    break;
+            case ESM4::SUB_TNAM: reader.get(mTurningSpeed); break;
+            case ESM4::SUB_WNAM: reader.get(mFootWeight);   break;
+            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
+            case ESM4::SUB_NAM0: reader.getZString(mBloodSpray); break;
+            case ESM4::SUB_NAM1: reader.getZString(mBloodDecal); break;
+            case ESM4::SUB_NIFZ:
+            {
+                std::string str;
+                if (!reader.getZString(str))
+                    throw std::runtime_error ("CREA NIFZ data read error");
+
+                std::stringstream ss(str);
+                std::string file;
+                while (std::getline(ss, file, '\0')) // split the strings
+                    mNif.push_back(file);
+
+                break;
+            }
+            case ESM4::SUB_NIFT:
+            {
+                if (subHdr.dataSize != 4) // FIXME: FO3
+                {
+                    reader.skipSubRecordData();
+                    break;
+                }
+
+                assert(subHdr.dataSize == 4 && "CREA NIFT datasize error");
+                std::uint32_t nift;
+                reader.get(nift);
+                if (nift)
+                    std::cout << "CREA NIFT " << mFormId << ", non-zero " << nift << std::endl;
+                break;
+            }
+            case ESM4::SUB_KFFZ:
+            {
+                std::string str;
+                if (!reader.getZString(str))
+                    throw std::runtime_error ("CREA KFFZ data read error");
+
+                std::stringstream ss(str);
+                std::string file;
+                while (std::getline(ss, file, '\0')) // split the strings
+                    mKf.push_back(file);
+
+                break;
+            }
+            case ESM4::SUB_TPLT: reader.get(mBaseTemplate); break; // FO3
+            case ESM4::SUB_PNAM: // FO3/FONV/TES5
+            {
+                FormId bodyPart;
+                reader.get(bodyPart);
+                mBodyParts.push_back(bodyPart);
+
+                break;
+            }
+            case ESM4::SUB_MODT:
+            case ESM4::SUB_RNAM:
+            case ESM4::SUB_CSDT:
+            case ESM4::SUB_OBND: // FO3
+            case ESM4::SUB_EAMT: // FO3
+            case ESM4::SUB_VTCK: // FO3
+            case ESM4::SUB_NAM4: // FO3
+            case ESM4::SUB_NAM5: // FO3
+            case ESM4::SUB_CNAM: // FO3
+            case ESM4::SUB_LNAM: // FO3
+            case ESM4::SUB_EITM: // FO3
+            case ESM4::SUB_DEST: // FO3
+            case ESM4::SUB_DSTD: // FO3
+            case ESM4::SUB_DSTF: // FO3
+            case ESM4::SUB_DMDL: // FO3
+            case ESM4::SUB_DMDT: // FO3
+            case ESM4::SUB_COED: // FO3
+            {
+                //std::cout << "CREA " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::CREA::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Creature::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Creature::blank()
+//{
+//}
diff --git a/components/esm4/loadcrea.hpp b/components/esm4/loadcrea.hpp
new file mode 100644
index 0000000000..c2889d1713
--- /dev/null
+++ b/components/esm4/loadcrea.hpp
@@ -0,0 +1,151 @@
+/*
+  Copyright (C) 2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_CREA_H
+#define ESM4_CREA_H
+
+#include <cstdint>
+#include <string>
+#include <vector>
+
+#include "actor.hpp"
+#include "inventory.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Creature
+    {
+        enum ACBS_TES4
+        {
+            TES4_Essential      = 0x000002,
+            TES4_WeapAndShield  = 0x000004,
+            TES4_Respawn        = 0x000008,
+            TES4_PCLevelOffset  = 0x000080,
+            TES4_NoLowLevelProc = 0x000200,
+            TES4_NoHead         = 0x008000, // different meaning to npc_
+            TES4_NoRightArm     = 0x010000,
+            TES4_NoLeftArm      = 0x020000,
+            TES4_NoCombatWater  = 0x040000,
+            TES4_NoShadow       = 0x080000,
+            TES4_NoCorpseCheck  = 0x100000  // opposite of npc_
+        };
+
+        enum ACBS_FO3
+        {
+            FO3_Biped          = 0x00000001,
+            FO3_Essential      = 0x00000002,
+            FO3_Weap_Shield    = 0x00000004,
+            FO3_Respawn        = 0x00000008,
+            FO3_CanSwim        = 0x00000010,
+            FO3_CanFly         = 0x00000020,
+            FO3_CanWalk        = 0x00000040,
+            FO3_PCLevelMult    = 0x00000080,
+            FO3_NoLowLevelProc = 0x00000200,
+            FO3_NoBloodSpray   = 0x00000800,
+            FO3_NoBloodDecal   = 0x00001000,
+            FO3_NoHead         = 0x00008000,
+            FO3_NoRightArm     = 0x00010000,
+            FO3_NoLeftArm      = 0x00020000,
+            FO3_NoWaterCombat  = 0x00040000,
+            FO3_NoShadow       = 0x00080000,
+            FO3_NoVATSMelee    = 0x00100000,
+            FO3_AllowPCDialog  = 0x00200000,
+            FO3_NoOpenDoors    = 0x00400000,
+            FO3_Immobile       = 0x00800000,
+            FO3_TiltFrontBack  = 0x01000000,
+            FO3_TiltLeftRight  = 0x02000000,
+            FO3_NoKnockdown    = 0x04000000,
+            FO3_NotPushable    = 0x08000000,
+            FO3_AllowPickpoket = 0x10000000,
+            FO3_IsGhost        = 0x20000000,
+            FO3_NoRotateHead   = 0x40000000,
+            FO3_Invulnerable   = 0x80000000
+        };
+
+#pragma pack(push, 1)
+        struct Data
+        {
+            std::uint8_t  unknown;
+            std::uint8_t  combat;
+            std::uint8_t  magic;
+            std::uint8_t  stealth;
+            std::uint16_t soul;
+            std::uint16_t health;
+            std::uint16_t unknown2;
+            std::uint16_t damage;
+            AttributeValues attribs;
+        };
+#pragma pack(pop)
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mFullName;
+        std::string mModel;
+
+        FormId mDeathItem;
+        std::vector<FormId> mSpell;
+        FormId mScriptId;
+
+        AIData mAIData;
+        std::vector<FormId> mAIPackages;
+        ActorBaseConfig mBaseConfig;
+        ActorFaction mFaction;
+        Data   mData;
+        FormId mCombatStyle;
+        FormId mSoundBase;
+        FormId mSound;
+        std::uint8_t mSoundChance;
+        float mBaseScale;
+        float mTurningSpeed;
+        float mFootWeight;
+        std::string mBloodSpray;
+        std::string mBloodDecal;
+
+        float mBoundRadius;
+        std::vector<std::string> mNif; // NIF filenames, get directory from mModel
+        std::vector<std::string> mKf;
+
+        std::vector<InventoryItem> mInventory;
+
+        FormId mBaseTemplate;           // FO3/FONV
+        std::vector<FormId> mBodyParts; // FO3/FONV
+
+        Creature();
+        virtual ~Creature();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_CREA_H
diff --git a/components/esm4/loaddial.cpp b/components/esm4/loaddial.cpp
new file mode 100644
index 0000000000..716da441d5
--- /dev/null
+++ b/components/esm4/loaddial.cpp
@@ -0,0 +1,125 @@
+/*
+  Copyright (C) 2020-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loaddial.hpp"
+
+#include <stdexcept>
+#include <cstring>
+#include <iostream> // FIXME: for debugging only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Dialogue::Dialogue() : mFormId(0), mFlags(0), mDoAllBeforeRepeat(false),
+                             mDialType(0), mDialFlags(0), mPriority(0.f)
+{
+    mEditorId.clear();
+    mTopicName.clear();
+
+    mTextDumb.clear(); // FIXME: temp name
+}
+
+ESM4::Dialogue::~Dialogue()
+{
+}
+
+void ESM4::Dialogue::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId);  break;
+            case ESM4::SUB_FULL: reader.getZString(mTopicName); break;
+            case ESM4::SUB_QSTI:
+            {
+                FormId questId;
+                reader.getFormId(questId);
+                mQuests.push_back(questId);
+
+                break;
+            }
+            case ESM4::SUB_QSTR: // Seems never used in TES4
+            {
+                FormId questRem;
+                reader.getFormId(questRem);
+                mQuestsRemoved.push_back(questRem);
+
+                break;
+            }
+            case ESM4::SUB_DATA:
+            {
+                if (subHdr.dataSize == 4) // TES5
+                {
+                    std::uint8_t dummy;
+                    reader.get(dummy);
+                    if (dummy != 0)
+                        mDoAllBeforeRepeat = true;
+                }
+
+                reader.get(mDialType); // TES4/FO3/FONV/TES5
+
+                if (subHdr.dataSize >= 2) // FO3/FONV/TES5
+                    reader.get(mDialFlags);
+
+                if (subHdr.dataSize >= 3) // TES5
+                    reader.skipSubRecordData(1); // unknown
+
+                break;
+            }
+            case ESM4::SUB_PNAM: reader.get(mPriority); break; // FO3/FONV
+            case ESM4::SUB_TDUM: reader.getZString(mTextDumb); break; // FONV
+            case ESM4::SUB_SCRI:
+            case ESM4::SUB_INFC: // FONV info connection
+            case ESM4::SUB_INFX: // FONV info index
+            case ESM4::SUB_QNAM: // TES5
+            case ESM4::SUB_BNAM: // TES5
+            case ESM4::SUB_SNAM: // TES5
+            case ESM4::SUB_TIFC: // TES5
+            {
+                //std::cout << "DIAL " << ESM::printName(subHdr.typeId) << " skipping..."
+                        //<< subHdr.dataSize << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::DIAL::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Dialogue::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Dialogue::blank()
+//{
+//}
diff --git a/components/esm4/loaddial.hpp b/components/esm4/loaddial.hpp
new file mode 100644
index 0000000000..ef44c841fc
--- /dev/null
+++ b/components/esm4/loaddial.hpp
@@ -0,0 +1,70 @@
+/*
+  Copyright (C) 2020-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_DIAL_H
+#define ESM4_DIAL_H
+
+#include <cstdint>
+#include <string>
+#include <vector>
+
+#include "formid.hpp"
+#include "dialogue.hpp" // DialType
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Dialogue
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::vector<FormId> mQuests;
+        std::vector<FormId> mQuestsRemoved; // FONV only?
+        std::string mTopicName;
+
+        std::string mTextDumb; // FIXME: temp name
+
+        bool mDoAllBeforeRepeat; // TES5 only
+        std::uint8_t mDialType;  // DialType
+        std::uint8_t mDialFlags; // FO3/FONV: 0x1 rumours, 0x2 top-level
+
+        float mPriority;
+
+        Dialogue();
+        virtual ~Dialogue();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_DIAL_H
diff --git a/components/esm4/loaddobj.cpp b/components/esm4/loaddobj.cpp
new file mode 100644
index 0000000000..307674a5db
--- /dev/null
+++ b/components/esm4/loaddobj.cpp
@@ -0,0 +1,128 @@
+/*
+  Copyright (C) 2020-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+  Also see https://tes5edit.github.io/fopdoc/ for FO3/FONV specific details.
+
+*/
+#include "loaddobj.hpp"
+
+#include <stdexcept>
+#include <cstring>
+//#include <iostream> // FIXME: for debugging only
+
+//#include "formid.hpp"
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::DefaultObj::DefaultObj() : mFormId(0), mFlags(0)
+{
+    mEditorId.clear();
+
+    std::memset(&mData, 0, sizeof(Defaults));
+}
+
+ESM4::DefaultObj::~DefaultObj()
+{
+}
+
+void ESM4::DefaultObj::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break; // "DefaultObjectManager"
+            case ESM4::SUB_DATA:
+            {
+                reader.getFormId(mData.stimpack);
+                reader.getFormId(mData.superStimpack);
+                reader.getFormId(mData.radX);
+                reader.getFormId(mData.radAway);
+                reader.getFormId(mData.morphine);
+                reader.getFormId(mData.perkParalysis);
+                reader.getFormId(mData.playerFaction);
+                reader.getFormId(mData.mysteriousStrangerNPC);
+                reader.getFormId(mData.mysteriousStrangerFaction);
+                reader.getFormId(mData.defaultMusic);
+                reader.getFormId(mData.battleMusic);
+                reader.getFormId(mData.deathMusic);
+                reader.getFormId(mData.successMusic);
+                reader.getFormId(mData.levelUpMusic);
+                reader.getFormId(mData.playerVoiceMale);
+                reader.getFormId(mData.playerVoiceMaleChild);
+                reader.getFormId(mData.playerVoiceFemale);
+                reader.getFormId(mData.playerVoiceFemaleChild);
+                reader.getFormId(mData.eatPackageDefaultFood);
+                reader.getFormId(mData.everyActorAbility);
+                reader.getFormId(mData.drugWearsOffImageSpace);
+                // below FONV only
+                if (subHdr.dataSize == 136) // FONV 136/4 = 34 formid
+                {
+                    reader.getFormId(mData.doctorsBag);
+                    reader.getFormId(mData.missFortuneNPC);
+                    reader.getFormId(mData.missFortuneFaction);
+                    reader.getFormId(mData.meltdownExplosion);
+                    reader.getFormId(mData.unarmedForwardPA);
+                    reader.getFormId(mData.unarmedBackwardPA);
+                    reader.getFormId(mData.unarmedLeftPA);
+                    reader.getFormId(mData.unarmedRightPA);
+                    reader.getFormId(mData.unarmedCrouchPA);
+                    reader.getFormId(mData.unarmedCounterPA);
+                    reader.getFormId(mData.spotterEffect);
+                    reader.getFormId(mData.itemDetectedEfect);
+                    reader.getFormId(mData.cateyeMobileEffectNYI);
+                }
+
+                break;
+            }
+            case ESM4::SUB_DNAM:
+            {
+                //std::cout << "DOBJ " << ESM::printName(subHdr.typeId) << " skipping..."
+                          //<< subHdr.dataSize << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                //std::cout << "DOBJ " << ESM::printName(subHdr.typeId) << " skipping..."
+                          //<< subHdr.dataSize << std::endl;
+                //reader.skipSubRecordData();
+                throw std::runtime_error("ESM4::DOBJ::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::DefaultObj::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::DefaultObj::blank()
+//{
+//}
diff --git a/components/esm4/loaddobj.hpp b/components/esm4/loaddobj.hpp
new file mode 100644
index 0000000000..6d708fcbbc
--- /dev/null
+++ b/components/esm4/loaddobj.hpp
@@ -0,0 +1,100 @@
+/*
+  Copyright (C) 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+  Also see https://tes5edit.github.io/fopdoc/ for FO3/FONV specific details.
+
+*/
+#ifndef ESM4_DOBJ_H
+#define ESM4_DOBJ_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Defaults
+    {
+        FormId stimpack;
+        FormId superStimpack;
+        FormId radX;
+        FormId radAway;
+        FormId morphine;
+        FormId perkParalysis;
+        FormId playerFaction;
+        FormId mysteriousStrangerNPC;
+        FormId mysteriousStrangerFaction;
+        FormId defaultMusic;
+        FormId battleMusic;
+        FormId deathMusic;
+        FormId successMusic;
+        FormId levelUpMusic;
+        FormId playerVoiceMale;
+        FormId playerVoiceMaleChild;
+        FormId playerVoiceFemale;
+        FormId playerVoiceFemaleChild;
+        FormId eatPackageDefaultFood;
+        FormId everyActorAbility;
+        FormId drugWearsOffImageSpace;
+        // below FONV only
+        FormId doctorsBag;
+        FormId missFortuneNPC;
+        FormId missFortuneFaction;
+        FormId meltdownExplosion;
+        FormId unarmedForwardPA;
+        FormId unarmedBackwardPA;
+        FormId unarmedLeftPA;
+        FormId unarmedRightPA;
+        FormId unarmedCrouchPA;
+        FormId unarmedCounterPA;
+        FormId spotterEffect;
+        FormId itemDetectedEfect;
+        FormId cateyeMobileEffectNYI;
+    };
+
+    struct DefaultObj
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+
+        Defaults mData;
+
+        DefaultObj();
+        virtual ~DefaultObj();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_DOBJ_H
diff --git a/components/esm4/loaddoor.cpp b/components/esm4/loaddoor.cpp
new file mode 100644
index 0000000000..45ac1f0b6c
--- /dev/null
+++ b/components/esm4/loaddoor.cpp
@@ -0,0 +1,93 @@
+/*
+  Copyright (C) 2016, 2018, 2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loaddoor.hpp"
+
+#include <stdexcept>
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Door::Door() : mFormId(0), mFlags(0), mBoundRadius(0.f), mDoorFlags(0), mScriptId(0),
+                     mOpenSound(0), mCloseSound(0), mLoopSound(0), mRandomTeleport(0)
+{
+    mEditorId.clear();
+    mFullName.clear();
+    mModel.clear();
+}
+
+ESM4::Door::~Door()
+{
+}
+
+void ESM4::Door::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_MODL: reader.getZString(mModel);     break;
+            case ESM4::SUB_SCRI: reader.getFormId(mScriptId);     break;
+            case ESM4::SUB_SNAM: reader.getFormId(mOpenSound);  break;
+            case ESM4::SUB_ANAM: reader.getFormId(mCloseSound); break;
+            case ESM4::SUB_BNAM: reader.getFormId(mLoopSound);  break;
+            case ESM4::SUB_FNAM: reader.get(mDoorFlags);        break;
+            case ESM4::SUB_TNAM: reader.getFormId(mRandomTeleport); break;
+            case ESM4::SUB_MODB: reader.get(mBoundRadius);      break;
+            case ESM4::SUB_MODT:
+            case ESM4::SUB_MODS:
+            case ESM4::SUB_OBND:
+            case ESM4::SUB_VMAD:
+            case ESM4::SUB_DEST: // FO3
+            case ESM4::SUB_DSTD: // FO3
+            case ESM4::SUB_DSTF: // FO3
+            case ESM4::SUB_DMDL: // FO3
+            case ESM4::SUB_DMDT: // FO3
+            {
+                //std::cout << "DOOR " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::DOOR::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Door::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Door::blank()
+//{
+//}
diff --git a/components/esm4/loaddoor.hpp b/components/esm4/loaddoor.hpp
new file mode 100644
index 0000000000..0a332339d5
--- /dev/null
+++ b/components/esm4/loaddoor.hpp
@@ -0,0 +1,76 @@
+/*
+  Copyright (C) 2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_DOOR_H
+#define ESM4_DOOR_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Door
+    {
+        enum Flags
+        {
+            Flag_OblivionGate  = 0x01,
+            Flag_AutomaticDoor = 0x02,
+            Flag_Hidden        = 0x04,
+            Flag_MinimalUse    = 0x08
+        };
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mFullName;
+        std::string mModel;
+
+        float mBoundRadius;
+
+        std::uint8_t mDoorFlags;
+        FormId mScriptId;
+        FormId mOpenSound;  // SNDR for TES5, SOUN for others
+        FormId mCloseSound; // SNDR for TES5, SOUN for others
+        FormId mLoopSound;
+        FormId mRandomTeleport;
+
+        Door();
+        virtual ~Door();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_DOOR_H
diff --git a/components/esm4/loadeyes.cpp b/components/esm4/loadeyes.cpp
new file mode 100644
index 0000000000..059bee6c37
--- /dev/null
+++ b/components/esm4/loadeyes.cpp
@@ -0,0 +1,74 @@
+/*
+  Copyright (C) 2016, 2018, 2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadeyes.hpp"
+
+#include <stdexcept>
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Eyes::Eyes() : mFormId(0), mFlags(0)
+{
+    mEditorId.clear();
+    mFullName.clear();
+    mIcon.clear();
+
+    mData.flags = 0;
+}
+
+ESM4::Eyes::~Eyes()
+{
+}
+
+void ESM4::Eyes::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_ICON: reader.getZString(mIcon); break;
+            case ESM4::SUB_DATA: reader.get(mData); break;
+            default:
+                throw std::runtime_error("ESM4::EYES::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Eyes::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Eyes::blank()
+//{
+//}
diff --git a/components/esm4/loadeyes.hpp b/components/esm4/loadeyes.hpp
new file mode 100644
index 0000000000..814e2a9647
--- /dev/null
+++ b/components/esm4/loadeyes.hpp
@@ -0,0 +1,68 @@
+/*
+  Copyright (C) 2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_EYES_H
+#define ESM4_EYES_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Eyes
+    {
+#pragma pack(push, 1)
+        struct Data
+        {
+            std::uint8_t flags; // 0x01 = playable?
+        };
+#pragma pack(pop)
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mFullName;
+        std::string mIcon;    // texture
+
+        Data mData;
+
+        Eyes();
+        virtual ~Eyes();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_EYES_H
diff --git a/components/esm4/loadflor.cpp b/components/esm4/loadflor.cpp
new file mode 100644
index 0000000000..fab6c3f0ed
--- /dev/null
+++ b/components/esm4/loadflor.cpp
@@ -0,0 +1,89 @@
+/*
+  Copyright (C) 2016, 2018, 2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadflor.hpp"
+
+#include <stdexcept>
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Flora::Flora() : mFormId(0), mFlags(0), mBoundRadius(0.f), mScriptId(0), mIngredient(0),
+                       mSound(0)
+{
+    mEditorId.clear();
+    mFullName.clear();
+    mModel.clear();
+}
+
+ESM4::Flora::~Flora()
+{
+}
+
+void ESM4::Flora::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_MODL: reader.getZString(mModel); break;
+            case ESM4::SUB_SCRI: reader.getFormId(mScriptId);     break;
+            case ESM4::SUB_PFIG: reader.getFormId(mIngredient); break;
+            case ESM4::SUB_PFPC: reader.get(mPercentHarvest);   break;
+            case ESM4::SUB_SNAM: reader.getFormId(mSound);      break;
+            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
+            case ESM4::SUB_MODT:
+            case ESM4::SUB_MODS:
+            case ESM4::SUB_FNAM:
+            case ESM4::SUB_OBND:
+            case ESM4::SUB_PNAM:
+            case ESM4::SUB_RNAM:
+            case ESM4::SUB_VMAD:
+            {
+                //std::cout << "FLOR " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::FLOR::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Flora::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Flora::blank()
+//{
+//}
diff --git a/components/esm4/loadflor.hpp b/components/esm4/loadflor.hpp
new file mode 100644
index 0000000000..2f9e22d548
--- /dev/null
+++ b/components/esm4/loadflor.hpp
@@ -0,0 +1,78 @@
+/*
+  Copyright (C) 2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_FLOR_H
+#define ESM4_FLOR_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Flora
+    {
+#pragma pack(push, 1)
+        struct Production
+        {
+            std::uint8_t spring;
+            std::uint8_t summer;
+            std::uint8_t autumn;
+            std::uint8_t winter;
+
+            Production() : spring(0), summer(0), autumn(0), winter(0) {}
+        };
+#pragma pack(pop)
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mFullName;
+        std::string mModel;
+
+        float mBoundRadius;
+
+        FormId mScriptId;
+        FormId mIngredient;
+        FormId mSound;
+        Production mPercentHarvest;
+
+        Flora();
+        virtual ~Flora();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_FLOR_H
diff --git a/components/esm4/loadflst.cpp b/components/esm4/loadflst.cpp
new file mode 100644
index 0000000000..32b23ff284
--- /dev/null
+++ b/components/esm4/loadflst.cpp
@@ -0,0 +1,81 @@
+/*
+  Copyright (C) 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadflst.hpp"
+
+#include <stdexcept>
+//#include <iostream> // FIXME: for debugging only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::FormIdList::FormIdList() : mFormId(0), mFlags(0)
+{
+    mEditorId.clear();
+}
+
+ESM4::FormIdList::~FormIdList()
+{
+}
+
+void ESM4::FormIdList::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId);  break;
+            case ESM4::SUB_LNAM:
+            {
+                FormId formId;
+                reader.getFormId(formId);
+
+                mObjects.push_back(formId);
+
+                break;
+            }
+            default:
+                //std::cout << "FLST " << ESM::printName(subHdr.typeId) << " skipping..."
+                          //<< subHdr.dataSize << std::endl;
+                //reader.skipSubRecordData();
+                throw std::runtime_error("ESM4::FLST::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+    //std::cout << "flst " << mEditorId << " " << mObjects.size() << std::endl; // FIXME
+}
+
+//void ESM4::FormIdList::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::FormIdList::blank()
+//{
+//}
diff --git a/components/esm4/loadflst.hpp b/components/esm4/loadflst.hpp
new file mode 100644
index 0000000000..6fd381aa44
--- /dev/null
+++ b/components/esm4/loadflst.hpp
@@ -0,0 +1,60 @@
+/*
+  Copyright (C) 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_FLST_H
+#define ESM4_FLST_H
+
+#include <cstdint>
+#include <string>
+#include <vector>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct FormIdList
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+
+        std::vector<FormId> mObjects;
+
+        FormIdList();
+        virtual ~FormIdList();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_FLST_H
diff --git a/components/esm4/loadfurn.cpp b/components/esm4/loadfurn.cpp
new file mode 100644
index 0000000000..6fba8bc3ce
--- /dev/null
+++ b/components/esm4/loadfurn.cpp
@@ -0,0 +1,98 @@
+/*
+  Copyright (C) 2016, 2018, 2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadfurn.hpp"
+
+#include <stdexcept>
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Furniture::Furniture() : mFormId(0), mFlags(0), mBoundRadius(0.f), mScriptId(0),
+                               mActiveMarkerFlags(0)
+{
+    mEditorId.clear();
+    mFullName.clear();
+    mModel.clear();
+}
+
+ESM4::Furniture::~Furniture()
+{
+}
+
+void ESM4::Furniture::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_MODL: reader.getZString(mModel); break;
+            case ESM4::SUB_SCRI: reader.getFormId(mScriptId); break;
+            case ESM4::SUB_MNAM: reader.get(mActiveMarkerFlags); break;
+            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
+            case ESM4::SUB_MODT:
+            case ESM4::SUB_DEST:
+            case ESM4::SUB_DSTD:
+            case ESM4::SUB_DSTF:
+            case ESM4::SUB_ENAM:
+            case ESM4::SUB_FNAM:
+            case ESM4::SUB_FNMK:
+            case ESM4::SUB_FNPR:
+            case ESM4::SUB_KNAM:
+            case ESM4::SUB_KSIZ:
+            case ESM4::SUB_KWDA:
+            case ESM4::SUB_MODS:
+            case ESM4::SUB_NAM0:
+            case ESM4::SUB_OBND:
+            case ESM4::SUB_PNAM:
+            case ESM4::SUB_VMAD:
+            case ESM4::SUB_WBDT:
+            case ESM4::SUB_XMRK:
+            {
+                //std::cout << "FURN " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::FURN::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Furniture::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Furniture::blank()
+//{
+//}
diff --git a/components/esm4/loadfurn.hpp b/components/esm4/loadfurn.hpp
new file mode 100644
index 0000000000..89da61ebf9
--- /dev/null
+++ b/components/esm4/loadfurn.hpp
@@ -0,0 +1,64 @@
+/*
+  Copyright (C) 2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_FURN_H
+#define ESM4_FURN_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Furniture
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mFullName;
+        std::string mModel;
+
+        float mBoundRadius;
+
+        FormId mScriptId;
+        std::uint32_t mActiveMarkerFlags;
+
+        Furniture();
+        virtual ~Furniture();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_FURN_H
diff --git a/components/esm4/loadglob.cpp b/components/esm4/loadglob.cpp
new file mode 100644
index 0000000000..6a2fa8b00a
--- /dev/null
+++ b/components/esm4/loadglob.cpp
@@ -0,0 +1,82 @@
+/*
+  Copyright (C) 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadglob.hpp"
+
+#include <stdexcept>
+#include <iostream> // FIXME
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::GlobalVariable::GlobalVariable() : mFormId(0), mFlags(0), mType(0), mValue(0.f)
+{
+    mEditorId.clear();
+}
+
+ESM4::GlobalVariable::~GlobalVariable()
+{
+}
+
+void ESM4::GlobalVariable::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_FNAM: reader.get(mType);  break;
+            case ESM4::SUB_FLTV: reader.get(mValue);  break;
+            case ESM4::SUB_FULL:
+            case ESM4::SUB_MODL:
+            case ESM4::SUB_MODB:
+            case ESM4::SUB_ICON:
+            case ESM4::SUB_DATA:
+            case ESM4::SUB_OBND: // TES5
+            case ESM4::SUB_VMAD: // TES5
+            {
+                //std::cout << "GLOB " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::GLOB::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::GlobalVariable::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::GlobalVariable::blank()
+//{
+//}
diff --git a/components/esm4/loadglob.hpp b/components/esm4/loadglob.hpp
new file mode 100644
index 0000000000..15cf4a07ac
--- /dev/null
+++ b/components/esm4/loadglob.hpp
@@ -0,0 +1,60 @@
+/*
+  Copyright (C) 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_GLOB_H
+#define ESM4_GLOB_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct GlobalVariable
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+
+        std::uint8_t mType;
+        float mValue;
+
+        GlobalVariable();
+        virtual ~GlobalVariable();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_GLOB_H
diff --git a/components/esm4/loadgras.cpp b/components/esm4/loadgras.cpp
new file mode 100644
index 0000000000..3818654fc1
--- /dev/null
+++ b/components/esm4/loadgras.cpp
@@ -0,0 +1,78 @@
+/*
+  Copyright (C) 2016, 2018 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadgras.hpp"
+
+#include <stdexcept>
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Grass::Grass() : mFormId(0), mFlags(0), mBoundRadius(0.f)
+{
+    mEditorId.clear();
+    mModel.clear();
+}
+
+ESM4::Grass::~Grass()
+{
+}
+
+void ESM4::Grass::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_MODL: reader.getZString(mModel); break;
+            case ESM4::SUB_DATA: reader.get(mData);         break;
+            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
+            case ESM4::SUB_MODT:
+            case ESM4::SUB_OBND:
+            {
+                //std::cout << "GRAS " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::GRAS::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Grass::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Grass::blank()
+//{
+//}
diff --git a/components/esm4/loadgras.hpp b/components/esm4/loadgras.hpp
new file mode 100644
index 0000000000..d7754d03d9
--- /dev/null
+++ b/components/esm4/loadgras.hpp
@@ -0,0 +1,98 @@
+/*
+  Copyright (C) 2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_GRAS_H
+#define ESM4_GRAS_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Grass
+    {
+#pragma pack(push, 1)
+        // unused fields are probably packing
+        struct Data
+        {
+            std::uint8_t  density;
+            std::uint8_t  minSlope;
+            std::uint8_t  maxSlope;
+            std::uint8_t  unused;
+            std::uint16_t distanceFromWater;
+            std::uint16_t unused2;
+            /*
+            1 Above - At Least
+            2 Above - At Most
+            3 Below - At Least
+            4 Below - At Most
+            5 Either - At Least
+            6 Either - At Most
+            7 Either - At Most Above
+            8 Either - At Most Below
+            */
+            std::uint32_t waterDistApplication;
+            float positionRange;
+            float heightRange;
+            float colorRange;
+            float wavePeriod;
+            /*
+            0x01 Vertex Lighting
+            0x02 Uniform Scaling
+            0x04 Fit to Slope
+            */
+            std::uint8_t  flags;
+            std::uint8_t  unused3;
+            std::uint16_t unused4;
+        };
+#pragma pack(pop)
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mModel;
+
+        float mBoundRadius;
+
+        Data mData;
+
+        Grass();
+        virtual ~Grass();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_GRAS_H
diff --git a/components/esm4/loadgrup.hpp b/components/esm4/loadgrup.hpp
new file mode 100644
index 0000000000..8eb53a0e58
--- /dev/null
+++ b/components/esm4/loadgrup.hpp
@@ -0,0 +1,158 @@
+/*
+  Copyright (C) 2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_GRUP_H
+#define ESM4_GRUP_H
+
+#include <cstdint>
+#include <vector>
+
+#include "common.hpp" // GroupLabel
+
+namespace ESM4
+{
+    // http://www.uesp.net/wiki/Tes4Mod:Mod_File_Format#Hierarchical_Top_Groups
+    //
+    //  Type | Info                                 |
+    // ------+--------------------------------------+-------------------
+    //   2   | Interior Cell Block                  |
+    //   3   |   Interior Cell Sub-Block            |
+    //     R |     CELL                             |
+    //   6   |     Cell Childen                     |
+    //   8   |       Persistent children            |
+    //     R |         REFR, ACHR, ACRE             |
+    //  10   |       Visible distant children       |
+    //     R |         REFR, ACHR, ACRE             |
+    //   9   |       Temp Children                  |
+    //     R |         PGRD                         |
+    //     R |         REFR, ACHR, ACRE             |
+    //       |                                      |
+    //   0   | Top (Type)                           |
+    //     R |   WRLD                               |
+    //   1   |   World Children                     |
+    //     R |     ROAD                             |
+    //     R |     CELL                             |
+    //   6   |     Cell Childen                     |
+    //   8   |       Persistent children            |
+    //     R |         REFR, ACHR, ACRE             |
+    //  10   |       Visible distant children       |
+    //     R |         REFR, ACHR, ACRE             |
+    //   9   |       Temp Children                  |
+    //     R |         PGRD                         |
+    //     R |         REFR, ACHR, ACRE             |
+    //   4   |       Exterior World Block           |
+    //   5   |         Exterior World Sub-block     |
+    //     R |           CELL                       |
+    //   6   |           Cell Childen               |
+    //   8   |             Persistent children      |
+    //     R |               REFR, ACHR, ACRE       |
+    //  10   |             Visible distant children |
+    //     R |               REFR, ACHR, ACRE       |
+    //   9   |             Temp Children            |
+    //     R |               LAND                   |
+    //     R |               PGRD                   |
+    //     R |               REFR, ACHR, ACRE       |
+    //
+    struct WorldGroup
+    {
+        FormId mWorld; // WRLD record for this group
+
+        // occurs only after World Child (type 1)
+        // since GRUP label may not be reliable, need to keep the formid of the current WRLD in
+        // the reader's context
+        FormId mRoad;
+
+        std::vector<FormId> mCells; // FIXME should this be CellGroup* instead?
+
+        WorldGroup() : mWorld(0), mRoad(0) {}
+    };
+
+    // http://www.uesp.net/wiki/Tes4Mod:Mod_File_Format/CELL
+    //
+    // The block and subblock groups for an interior cell are determined by the last two decimal
+    // digits of the lower 3 bytes of the cell form ID (the modindex is not included in the
+    // calculation). For example, for form ID 0x000CF2=3314, the block is 4 and the subblock is 1.
+    //
+    // The block and subblock groups for an exterior cell are determined by the X-Y coordinates of
+    // the cell. Each block contains 16 subblocks (4x4) and each subblock contains 64 cells (8x8).
+    // So each block contains 1024 cells (32x32).
+    //
+    // NOTE: There may be many CELL records in one subblock
+    struct CellGroup
+    {
+        FormId mCell;      // CELL record for this cell group
+        int mCellModIndex; // from which file to get the CELL record (e.g. may have been updated)
+
+        // For retrieving parent group size (for lazy loading or skipping) and sub-block number / grid
+        // NOTE: There can be more than one file that adds/modifies records to this cell group
+        //
+        // Use Case 1: To quickly get only the visble when distant records:
+        //
+        //   - Find the FormId of the CELL (maybe WRLD/X/Y grid lookup or from XTEL of a REFR)
+        //   - search a map of CELL FormId to CellGroup
+        //   - load CELL and its child groups (or load the visible distant only, or whatever)
+        //
+        // Use Case 2: Scan the files but don't load CELL or cell group
+        //
+        //   - Load referenceables and other records up front, updating them as required
+        //   - Don't load CELL, LAND, PGRD or ROAD (keep FormId's and file index, and file
+        //     context then skip the rest of the group)
+        //
+        std::vector<GroupTypeHeader> mHeaders; // FIXME: is this needed?
+
+        // FIXME: should these be pairs?  i.e. <FormId, modindex> so that we know from which file
+        //        the formid came (it may have been updated by a mod)
+        //        but does it matter?  the record itself keeps track of whether it is base,
+        //        added or modified anyway
+        // FIXME: should these be maps? e.g. std::map<FormId, std::uint8_t>
+        //        or vector for storage with a corresponding map of index?
+
+        // cache (modindex adjusted) formId's of children
+        // FIXME: also need file index + file context of all those that has type 8 GRUP
+        GroupTypeHeader mHdrPersist;
+        std::vector<FormId> mPersistent;  // REFR, ACHR, ACRE
+        std::vector<FormId> mdelPersistent;
+
+        // FIXME: also need file index + file context of all those that has type 10 GRUP
+        GroupTypeHeader mHdrVisDist;
+        std::vector<FormId> mVisibleDist; // REFR, ACHR, ACRE
+        std::vector<FormId> mdelVisibleDist;
+
+        // FIXME: also need file index + file context of all those that has type 9 GRUP
+        GroupTypeHeader mHdrTemp;
+        FormId mLand; // if present, assume only one LAND per exterior CELL
+        FormId mPgrd; // if present, seems to be the first record after LAND in Temp Cell Child GRUP
+        std::vector<FormId> mTemporary;   // REFR, ACHR, ACRE
+        std::vector<FormId> mdelTemporary;
+
+        // need to keep modindex and context for lazy loading (of all the files that contribute
+        // to this group)
+
+        CellGroup() : mCell(0), mLand(0), mPgrd(0) {}
+    };
+}
+
+#endif // ESM4_GRUP_H
diff --git a/components/esm4/loadhair.cpp b/components/esm4/loadhair.cpp
new file mode 100644
index 0000000000..661c333cbd
--- /dev/null
+++ b/components/esm4/loadhair.cpp
@@ -0,0 +1,84 @@
+/*
+  Copyright (C) 2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadhair.hpp"
+
+#include <stdexcept>
+//#include <iostream> // FIXME: for debugging only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Hair::Hair() : mFormId(0), mFlags(0), mBoundRadius(0.f)
+{
+    mEditorId.clear();
+    mFullName.clear();
+    mModel.clear();
+    mIcon.clear();
+
+    mData.flags = 0;
+}
+
+ESM4::Hair::~Hair()
+{
+}
+
+void ESM4::Hair::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_FULL: reader.getZString(mFullName); break;
+            case ESM4::SUB_MODL: reader.getZString(mModel); break;
+            case ESM4::SUB_ICON: reader.getZString(mIcon);  break;
+            case ESM4::SUB_DATA: reader.get(mData);         break;
+            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
+            case ESM4::SUB_MODT:
+            {
+                //std::cout << "HAIR " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::HAIR::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Hair::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Hair::blank()
+//{
+//}
diff --git a/components/esm4/loadhair.hpp b/components/esm4/loadhair.hpp
new file mode 100644
index 0000000000..c9a4fc2756
--- /dev/null
+++ b/components/esm4/loadhair.hpp
@@ -0,0 +1,71 @@
+/*
+  Copyright (C) 2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_HAIR
+#define ESM4_HAIR
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Hair
+    {
+#pragma pack(push, 1)
+        struct Data
+        {
+            std::uint8_t flags; // 0x01 = not playable, 0x02 = not male, 0x04 = not female, ?? = fixed
+        };
+#pragma pack(pop)
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mFullName;
+        std::string mModel;   // mesh
+        std::string mIcon;    // texture
+
+        float mBoundRadius;
+
+        Data mData;
+
+        Hair();
+        virtual ~Hair();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_HAIR
diff --git a/components/esm4/loadhdpt.cpp b/components/esm4/loadhdpt.cpp
new file mode 100644
index 0000000000..f188890246
--- /dev/null
+++ b/components/esm4/loadhdpt.cpp
@@ -0,0 +1,104 @@
+/*
+  Copyright (C) 2019-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadhdpt.hpp"
+
+#include <stdexcept>
+//#include <iostream> // FIXME: testing only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::HeadPart::HeadPart() : mFormId(0), mFlags(0), mData(0), mAdditionalPart(0), mBaseTexture(0)
+{
+    mEditorId.clear();
+    mFullName.clear();
+    mModel.clear();
+
+    mTriFile.resize(3);
+}
+
+ESM4::HeadPart::~HeadPart()
+{
+}
+
+void ESM4::HeadPart::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    std::uint32_t type;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_DATA: reader.get(mData); break;
+            case ESM4::SUB_MODL: reader.getZString(mModel); break;
+            case ESM4::SUB_HNAM: reader.getFormId(mAdditionalPart); break;
+            case ESM4::SUB_NAM0: // TES5
+            {
+                reader.get(type);
+
+                break;
+            }
+            case ESM4::SUB_NAM1: // TES5
+            {
+                std::string file;
+                reader.getZString(file);
+
+                // FIXME: check type >= 0 && type < 3
+                mTriFile[type] = std::move(file);
+
+                break;
+            }
+            case ESM4::SUB_TNAM: reader.getFormId(mBaseTexture); break;
+            case ESM4::SUB_PNAM:
+            case ESM4::SUB_MODS:
+            case ESM4::SUB_MODT:
+            case ESM4::SUB_RNAM:
+            {
+                //std::cout << "HDPT " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::HDPT::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::HeadPart::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::HeadPart::blank()
+//{
+//}
diff --git a/components/esm4/loadhdpt.hpp b/components/esm4/loadhdpt.hpp
new file mode 100644
index 0000000000..d93411bb7e
--- /dev/null
+++ b/components/esm4/loadhdpt.hpp
@@ -0,0 +1,66 @@
+/*
+  Copyright (C) 2019, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_HDPT_H
+#define ESM4_HDPT_H
+
+#include <cstdint>
+#include <vector>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct HeadPart
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mFullName;
+        std::string mModel;
+
+        std::uint8_t mData;
+
+        FormId mAdditionalPart;
+
+        std::vector<std::string> mTriFile;
+        FormId mBaseTexture;
+
+        HeadPart();
+        virtual ~HeadPart();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_HDPT_H
diff --git a/components/esm4/loadidle.cpp b/components/esm4/loadidle.cpp
new file mode 100644
index 0000000000..3d45b76e82
--- /dev/null
+++ b/components/esm4/loadidle.cpp
@@ -0,0 +1,84 @@
+/*
+  Copyright (C) 2016, 2018 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadidle.hpp"
+
+#include <stdexcept>
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::IdleAnimation::IdleAnimation() : mFormId(0), mFlags(0), mParent(0), mPrevious(0)
+{
+    mEditorId.clear();
+    mCollision.clear();
+    mEvent.clear();
+}
+
+ESM4::IdleAnimation::~IdleAnimation()
+{
+}
+
+void ESM4::IdleAnimation::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId);  break;
+            case ESM4::SUB_DNAM: reader.getZString(mCollision); break;
+            case ESM4::SUB_ENAM: reader.getZString(mEvent);     break;
+            case ESM4::SUB_ANAM:
+            {
+                reader.get(mParent);
+                reader.get(mPrevious);
+                break;
+            }
+            case ESM4::SUB_CTDA: // formId
+            case ESM4::SUB_DATA: // formId
+            {
+                //std::cout << "IDLE " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::IDLE::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::IdleAnimation::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::IdleAnimation::blank()
+//{
+//}
diff --git a/components/esm4/loadidle.hpp b/components/esm4/loadidle.hpp
new file mode 100644
index 0000000000..cadd056122
--- /dev/null
+++ b/components/esm4/loadidle.hpp
@@ -0,0 +1,62 @@
+/*
+  Copyright (C) 2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_IDLE_H
+#define ESM4_IDLE_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct IdleAnimation
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mCollision;
+        std::string mEvent;
+
+        FormId      mParent;  // IDLE or AACT
+        FormId      mPrevious;
+
+        IdleAnimation();
+        virtual ~IdleAnimation();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_IDLE_H
diff --git a/components/esm4/loadidlm.cpp b/components/esm4/loadidlm.cpp
new file mode 100644
index 0000000000..ba823df300
--- /dev/null
+++ b/components/esm4/loadidlm.cpp
@@ -0,0 +1,103 @@
+/*
+  Copyright (C) 2019, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadidlm.hpp"
+
+#include <stdexcept>
+//#include <iostream> // FIXME: testing only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::IdleMarker::IdleMarker() : mFormId(0), mFlags(0), mIdleFlags(0), mIdleCount(0), mIdleTimer(0.f), mIdleAnim(0)
+{
+    mEditorId.clear();
+}
+
+ESM4::IdleMarker::~IdleMarker()
+{
+}
+
+void ESM4::IdleMarker::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    std::uint32_t esmVer = reader.esmVersion();
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_IDLF: reader.get(mIdleFlags);       break;
+            case ESM4::SUB_IDLC:
+            {
+                if (subHdr.dataSize != 1) // FO3 can have 4?
+                {
+                    reader.skipSubRecordData();
+                    break;
+                }
+
+                reader.get(mIdleCount);
+                break;
+            }
+            case ESM4::SUB_IDLT: reader.get(mIdleTimer);       break;
+            case ESM4::SUB_IDLA:
+            {
+                bool isFONV = esmVer == ESM::VER_132 || esmVer == ESM::VER_133 || esmVer == ESM::VER_134;
+                if (esmVer == ESM::VER_094 || isFONV) // FO3? 4 or 8 bytes
+                {
+                    reader.skipSubRecordData();
+                    break;
+                }
+
+                mIdleAnim.resize(mIdleCount);
+                for (unsigned int i = 0; i < static_cast<unsigned int>(mIdleCount); ++i)
+                    reader.get(mIdleAnim.at(i));
+                break;
+            }
+            case ESM4::SUB_OBND: // object bounds
+            {
+                //std::cout << "IDLM " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::IDLM::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::IdleMarker::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::IdleMarker::blank()
+//{
+//}
diff --git a/components/esm4/loadidlm.hpp b/components/esm4/loadidlm.hpp
new file mode 100644
index 0000000000..78d03a7024
--- /dev/null
+++ b/components/esm4/loadidlm.hpp
@@ -0,0 +1,63 @@
+/*
+  Copyright (C) 2019, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_IDLM_H
+#define ESM4_IDLM_H
+
+#include <cstdint>
+#include <vector>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct IdleMarker
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mModel;
+
+        std::uint8_t mIdleFlags;
+        std::uint8_t mIdleCount;
+        float mIdleTimer;
+        std::vector<FormId> mIdleAnim;
+
+        IdleMarker();
+        virtual ~IdleMarker();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_IDLM_H
diff --git a/components/esm4/loadimod.cpp b/components/esm4/loadimod.cpp
new file mode 100644
index 0000000000..9950c59b7b
--- /dev/null
+++ b/components/esm4/loadimod.cpp
@@ -0,0 +1,89 @@
+/*
+  Copyright (C) 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+  Also see https://tes5edit.github.io/fopdoc/ for FO3/FONV specific details.
+
+*/
+#include "loadimod.hpp"
+
+#include <stdexcept>
+#include <iostream> // FIXME: for debugging only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::ItemMod::ItemMod() : mFormId(0), mFlags(0)
+{
+    mEditorId.clear();
+}
+
+ESM4::ItemMod::~ItemMod()
+{
+}
+
+void ESM4::ItemMod::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId);  break;
+            case ESM4::SUB_OBND:
+            case ESM4::SUB_FULL:
+            case ESM4::SUB_MODL:
+            case ESM4::SUB_ICON:
+            case ESM4::SUB_MICO:
+            case ESM4::SUB_SCRI:
+            case ESM4::SUB_DESC:
+            case ESM4::SUB_YNAM:
+            case ESM4::SUB_ZNAM:
+            case ESM4::SUB_DATA:
+            {
+                //std::cout << "IMOD " << ESM::printName(subHdr.typeId) << " skipping..."
+                          //<< subHdr.dataSize << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                std::cout << "IMOD " << ESM::printName(subHdr.typeId) << " skipping..."
+                          << subHdr.dataSize << std::endl;
+                reader.skipSubRecordData();
+                //throw std::runtime_error("ESM4::IMOD::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::ItemMod::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::ItemMod::blank()
+//{
+//}
diff --git a/components/esm4/loadimod.hpp b/components/esm4/loadimod.hpp
new file mode 100644
index 0000000000..a72fbe472d
--- /dev/null
+++ b/components/esm4/loadimod.hpp
@@ -0,0 +1,59 @@
+/*
+  Copyright (C) 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+  Also see https://tes5edit.github.io/fopdoc/ for FO3/FONV specific details.
+
+*/
+#ifndef ESM4_IMOD_H
+#define ESM4_IMOD_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct ItemMod
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+
+        ItemMod();
+        virtual ~ItemMod();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_IMOD_H
diff --git a/components/esm4/loadinfo.cpp b/components/esm4/loadinfo.cpp
new file mode 100644
index 0000000000..a68774112b
--- /dev/null
+++ b/components/esm4/loadinfo.cpp
@@ -0,0 +1,222 @@
+/*
+  Copyright (C) 2020-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadinfo.hpp"
+
+#include <stdexcept>
+#include <cstring>
+#include <iostream> // FIXME: for debugging only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::DialogInfo::DialogInfo() : mFormId(0), mFlags(0), mQuest(0), mSound(0),
+    mDialType(0), mNextSpeaker(0), mInfoFlags(0), mParam3(0)
+{
+    std::memset(&mResponseData, 0, sizeof(TargetResponseData));
+    mResponse.clear();
+    mNotes.clear();
+    mEdits.clear();
+
+    std::memset(&mTargetCondition, 0, sizeof(TargetCondition));
+
+    std::memset(&mScript.scriptHeader, 0, sizeof(ScriptHeader));
+    mScript.scriptSource.clear();
+    mScript.globReference = 0;
+}
+
+ESM4::DialogInfo::~DialogInfo()
+{
+}
+
+void ESM4::DialogInfo::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    mEditorId = formIdToString(mFormId); // FIXME: quick workaround to use existing code
+
+    static ScriptLocalVariableData localVar;
+    bool ignore = false;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_QSTI: reader.getFormId(mQuest); break; // FormId quest id
+            case ESM4::SUB_SNDD: reader.getFormId(mSound); break; // FO3 (not used in FONV?)
+            case ESM4::SUB_TRDT:
+            {
+                if (subHdr.dataSize == 16) // TES4
+                    reader.get(&mResponseData, 16);
+                else if (subHdr.dataSize == 20) // FO3
+                    reader.get(&mResponseData, 20);
+                else // FO3/FONV
+                {
+                    reader.get(mResponseData);
+                    if (mResponseData.sound)
+                        reader.adjustFormId(mResponseData.sound);
+                }
+
+                break;
+            }
+            case ESM4::SUB_NAM1: reader.getZString(mResponse); break; // response text
+            case ESM4::SUB_NAM2: reader.getZString(mNotes); break; // actor notes
+            case ESM4::SUB_NAM3: reader.getZString(mEdits); break; // not in TES4
+            case ESM4::SUB_CTDA: // FIXME: how to detect if 1st/2nd param is a formid?
+            {
+                if (subHdr.dataSize == 24) // TES4
+                    reader.get(&mTargetCondition, 24);
+                else if (subHdr.dataSize == 20) // FO3
+                    reader.get(&mTargetCondition, 20);
+                else if (subHdr.dataSize == 28)
+                {
+                    reader.get(mTargetCondition); // FO3/FONV
+                    if (mTargetCondition.reference)
+                        reader.adjustFormId(mTargetCondition.reference);
+                }
+                else // TES5
+                {
+                    reader.get(&mTargetCondition, 20);
+                    if (subHdr.dataSize == 36)
+                        reader.getFormId(mParam3);
+                    reader.get(mTargetCondition.runOn);
+                    reader.get(mTargetCondition.reference);
+                    if (mTargetCondition.reference)
+                        reader.adjustFormId(mTargetCondition.reference);
+                    reader.skipSubRecordData(4); // unknown
+                }
+
+                break;
+            }
+            case ESM4::SUB_SCHR:
+            {
+                if (!ignore)
+                    reader.get(mScript.scriptHeader);
+                else
+                    reader.skipSubRecordData(); // TODO: does the second one ever used?
+
+                break;
+            }
+            case ESM4::SUB_SCDA: reader.skipSubRecordData(); break; // compiled script data
+            case ESM4::SUB_SCTX: reader.getString(mScript.scriptSource); break;
+            case ESM4::SUB_SCRO: reader.getFormId(mScript.globReference); break;
+            case ESM4::SUB_SLSD:
+            {
+                localVar.clear();
+                reader.get(localVar.index);
+                reader.get(localVar.unknown1);
+                reader.get(localVar.unknown2);
+                reader.get(localVar.unknown3);
+                reader.get(localVar.type);
+                reader.get(localVar.unknown4);
+                // WARN: assumes SCVR will follow immediately
+
+                break;
+            }
+            case ESM4::SUB_SCVR: // assumed always pair with SLSD
+            {
+                reader.getZString(localVar.variableName);
+
+                mScript.localVarData.push_back(localVar);
+
+                break;
+            }
+            case ESM4::SUB_SCRV:
+            {
+                std::uint32_t index;
+                reader.get(index);
+
+                mScript.localRefVarIndex.push_back(index);
+
+                break;
+            }
+            case ESM4::SUB_NEXT: // FO3/FONV marker for next script header
+            {
+                ignore = true;
+
+                break;
+            }
+            case ESM4::SUB_DATA: // always 3 for TES4 ?
+            {
+                if (subHdr.dataSize == 4) // FO3/FONV
+                {
+                    reader.get(mDialType);
+                    reader.get(mNextSpeaker);
+                    reader.get(mInfoFlags);
+                }
+                else
+                    reader.skipSubRecordData(); // FIXME
+                break;
+            }
+            case ESM4::SUB_NAME: // FormId add topic (not always present)
+            case ESM4::SUB_CTDT: // older version of CTDA? 20 bytes
+            case ESM4::SUB_SCHD: // 28 bytes
+            case ESM4::SUB_TCLT: // FormId choice
+            case ESM4::SUB_TCLF: // FormId
+            case ESM4::SUB_PNAM: // TES4 DLC
+            case ESM4::SUB_TPIC: // TES4 DLC
+            case ESM4::SUB_ANAM: // FO3 speaker formid
+            case ESM4::SUB_DNAM: // FO3 speech challenge
+            case ESM4::SUB_KNAM: // FO3 formid
+            case ESM4::SUB_LNAM: // FONV
+            case ESM4::SUB_TCFU: // FONV
+            case ESM4::SUB_TIFC: // TES5
+            case ESM4::SUB_TWAT: // TES5
+            case ESM4::SUB_CIS2: // TES5
+            case ESM4::SUB_CNAM: // TES5
+            case ESM4::SUB_ENAM: // TES5
+            case ESM4::SUB_EDID: // TES5
+            case ESM4::SUB_VMAD: // TES5
+            case ESM4::SUB_BNAM: // TES5
+            case ESM4::SUB_SNAM: // TES5
+            case ESM4::SUB_ONAM: // TES5
+            case ESM4::SUB_QNAM: // TES5 for mScript
+            case ESM4::SUB_RNAM: // TES5
+            {
+                //std::cout << "INFO " << ESM::printName(subHdr.typeId) << " skipping..."
+                        //<< subHdr.dataSize << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                std::cout << "INFO " << ESM::printName(subHdr.typeId) << " skipping..."
+                        << subHdr.dataSize << std::endl;
+                reader.skipSubRecordData();
+                //throw std::runtime_error("ESM4::INFO::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::DialogInfo::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::DialogInfo::blank()
+//{
+//}
diff --git a/components/esm4/loadinfo.hpp b/components/esm4/loadinfo.hpp
new file mode 100644
index 0000000000..be7090cd32
--- /dev/null
+++ b/components/esm4/loadinfo.hpp
@@ -0,0 +1,90 @@
+/*
+  Copyright (C) 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_INFO_H
+#define ESM4_INFO_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+#include "script.hpp" // TargetCondition
+#include "dialogue.hpp" // DialType
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    enum InfoFlag
+    {
+        INFO_Goodbye         = 0x0001,
+        INFO_Random          = 0x0002,
+        INFO_SayOnce         = 0x0004,
+        INFO_RunImmediately  = 0x0008,
+        INFO_InfoRefusal     = 0x0010,
+        INFO_RandomEnd       = 0x0020,
+        INFO_RunForRumors    = 0x0040,
+        INFO_SpeechChallenge = 0x0080,
+        INFO_SayOnceADay     = 0x0100,
+        INFO_AlwaysDarken    = 0x0200
+    };
+
+    struct DialogInfo
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId; // FIXME: no such record for INFO, but keep here to avoid extra work for now
+
+        FormId mQuest;
+        FormId mSound; // unused?
+
+        TargetResponseData mResponseData;
+        std::string mResponse;
+        std::string mNotes;
+        std::string mEdits;
+
+        std::uint8_t  mDialType;  // DialType
+        std::uint8_t  mNextSpeaker;
+        std::uint16_t mInfoFlags; // see above enum
+
+        TargetCondition mTargetCondition;
+        FormId mParam3; // TES5 only
+
+        ScriptDefinition mScript; // FIXME: ignoring the second one after the NEXT sub-record
+
+        DialogInfo();
+        virtual ~DialogInfo();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_INFO_H
diff --git a/components/esm4/loadingr.cpp b/components/esm4/loadingr.cpp
new file mode 100644
index 0000000000..03994dbfb4
--- /dev/null
+++ b/components/esm4/loadingr.cpp
@@ -0,0 +1,133 @@
+/*
+  Copyright (C) 2016, 2018, 2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadingr.hpp"
+
+#include <stdexcept>
+#include <cstring>
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Ingredient::Ingredient() : mFormId(0), mFlags(0), mBoundRadius(0.f), mScriptId(0)
+{
+    mEditorId.clear();
+    mFullName.clear();
+    mModel.clear();
+    mIcon.clear();
+
+    mData.value = 0;
+    mData.weight = 0.f;
+    mEnchantment.value = 0;
+    mEnchantment.flags = 0;
+
+    std::memset(&mEffect, 0, sizeof(ScriptEffect));
+}
+
+ESM4::Ingredient::~Ingredient()
+{
+}
+
+void ESM4::Ingredient::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_FULL:
+            {
+                if (mFullName.empty())
+                {
+                    reader.getLocalizedString(mFullName); break;
+                }
+                else // in TES4 subsequent FULL records are script effect names
+                {
+                    // FIXME: should be part of a struct?
+                    std::string scriptEffectName;
+                    if (!reader.getZString(scriptEffectName))
+                        throw std::runtime_error ("INGR FULL data read error");
+
+                    mScriptEffect.push_back(scriptEffectName);
+
+                    break;
+                }
+            }
+            case ESM4::SUB_DATA:
+            {
+                //if (reader.esmVersion() == ESM::VER_094 || reader.esmVersion() == ESM::VER_170)
+                if (subHdr.dataSize == 8) // FO3 is size 4 even though VER_094
+                    reader.get(mData);
+                else
+                    reader.get(mData.weight);
+
+                break;
+            }
+            case ESM4::SUB_ICON: reader.getZString(mIcon);  break;
+            case ESM4::SUB_MODL: reader.getZString(mModel); break;
+            case ESM4::SUB_SCRI: reader.getFormId(mScriptId); break;
+            case ESM4::SUB_ENIT: reader.get(mEnchantment);  break;
+            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
+            case ESM4::SUB_SCIT:
+            {
+                reader.get(mEffect);
+                reader.adjustFormId(mEffect.formId);
+                break;
+            }
+            case ESM4::SUB_MODT:
+            case ESM4::SUB_MODS: // Dragonborn only?
+            case ESM4::SUB_EFID:
+            case ESM4::SUB_EFIT:
+            case ESM4::SUB_OBND:
+            case ESM4::SUB_KSIZ:
+            case ESM4::SUB_KWDA:
+            case ESM4::SUB_VMAD:
+            case ESM4::SUB_YNAM:
+            case ESM4::SUB_ZNAM:
+            case ESM4::SUB_ETYP: // FO3
+            {
+                //std::cout << "INGR " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::INGR::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Ingredient::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Ingredient::blank()
+//{
+//}
diff --git a/components/esm4/loadingr.hpp b/components/esm4/loadingr.hpp
new file mode 100644
index 0000000000..44312eb24b
--- /dev/null
+++ b/components/esm4/loadingr.hpp
@@ -0,0 +1,83 @@
+/*
+  Copyright (C) 2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_INGR_H
+#define ESM4_INGR_H
+
+#include <cstdint>
+#include <vector>
+
+#include "effect.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Ingredient
+    {
+#pragma pack(push, 1)
+        struct Data
+        {
+            std::uint32_t value;
+            float         weight;
+        };
+
+        struct ENIT
+        {
+            std::uint32_t value;
+            std::uint32_t flags;
+        };
+#pragma pack(pop)
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mFullName;
+        std::string mModel;
+        std::string mIcon; // inventory
+
+        float mBoundRadius;
+
+        std::vector<std::string> mScriptEffect; // FIXME: prob. should be in a struct
+        FormId mScriptId;
+        ScriptEffect mEffect;
+        ENIT   mEnchantment;
+
+        Data mData;
+
+        Ingredient();
+        virtual ~Ingredient();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_INGR_H
diff --git a/components/esm4/loadkeym.cpp b/components/esm4/loadkeym.cpp
new file mode 100644
index 0000000000..a5aba621af
--- /dev/null
+++ b/components/esm4/loadkeym.cpp
@@ -0,0 +1,93 @@
+/*
+  Copyright (C) 2016, 2018, 2020-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadkeym.hpp"
+
+#include <stdexcept>
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Key::Key() : mFormId(0), mFlags(0), mPickUpSound(0), mDropSound(0), mBoundRadius(0.f), mScriptId(0)
+{
+    mEditorId.clear();
+    mFullName.clear();
+    mModel.clear();
+    mIcon.clear();
+    mMiniIcon.clear();
+
+    mData.value = 0;
+    mData.weight = 0.f;
+}
+
+ESM4::Key::~Key()
+{
+}
+
+void ESM4::Key::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_MODL: reader.getZString(mModel); break;
+            case ESM4::SUB_ICON: reader.getZString(mIcon);  break;
+            case ESM4::SUB_MICO: reader.getZString(mMiniIcon); break; // FO3
+            case ESM4::SUB_DATA: reader.get(mData);         break;
+            case ESM4::SUB_SCRI: reader.getFormId(mScriptId); break;
+            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
+            case ESM4::SUB_YNAM: reader.getFormId(mPickUpSound); break;
+            case ESM4::SUB_ZNAM: reader.getFormId(mDropSound); break;
+            case ESM4::SUB_MODT:
+            case ESM4::SUB_KSIZ:
+            case ESM4::SUB_KWDA:
+            case ESM4::SUB_OBND:
+            case ESM4::SUB_VMAD:
+            {
+                //std::cout << "KEYM " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::KEYM::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Key::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Key::blank()
+//{
+//}
diff --git a/components/esm4/loadkeym.hpp b/components/esm4/loadkeym.hpp
new file mode 100644
index 0000000000..d59b3826d5
--- /dev/null
+++ b/components/esm4/loadkeym.hpp
@@ -0,0 +1,77 @@
+/*
+  Copyright (C) 2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_KEYM_H
+#define ESM4_KEYM_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Key
+    {
+#pragma pack(push, 1)
+        struct Data
+        {
+            std::uint32_t value; // gold
+            float         weight;
+        };
+#pragma pack(pop)
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mFullName;
+        std::string mModel;
+        std::string mIcon; // inventory
+        std::string mMiniIcon; // inventory
+
+        FormId mPickUpSound;
+        FormId mDropSound;
+
+        float mBoundRadius;
+        FormId mScriptId;
+
+        Data mData;
+
+        Key();
+        virtual ~Key();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_KEYM_H
diff --git a/components/esm4/loadland.cpp b/components/esm4/loadland.cpp
new file mode 100644
index 0000000000..2bb260da33
--- /dev/null
+++ b/components/esm4/loadland.cpp
@@ -0,0 +1,255 @@
+/*
+  Copyright (C) 2015-2016, 2018, 2020-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadland.hpp"
+
+#ifdef NDEBUG // FIXME: debuggigng only
+#undef NDEBUG
+#endif
+
+#include <cassert>
+#include <stdexcept>
+
+#include <iostream> // FIXME: debug only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Land::Land() : mFormId(0), mFlags(0), mLandFlags(0), mDataTypes(0)
+{
+    for (int i = 0; i < 4; ++i)
+    {
+        mTextures[i].base.formId = 0;
+        mTextures[i].base.quadrant = 0;
+        mTextures[i].base.unknown1 = 0;
+        mTextures[i].base.unknown2 = 0;
+    }
+}
+
+ESM4::Land::~Land()
+{
+}
+
+//             overlap north
+//
+//         32
+//         31
+//         30
+// overlap  .
+//  west    .
+//          .
+//          2
+//          1
+//          0
+//           0 1 2 ... 30 31 32
+//
+//             overlap south
+//
+void ESM4::Land::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    TxtLayer layer;
+    std::int8_t currentAddQuad = -1; // for VTXT following ATXT
+
+    //std::map<FormId, int> uniqueTextures; // FIXME: for temp testing only
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_DATA:
+            {
+                reader.get(mLandFlags);
+                break;
+            }
+            case ESM4::SUB_VNML: // vertex normals, 33x33x(1+1+1) = 3267
+            {
+                reader.get(mVertNorm);
+                mDataTypes |= LAND_VNML;
+                break;
+            }
+            case ESM4::SUB_VHGT: // vertex height gradient, 4+33x33+3 = 4+1089+3 = 1096
+            {
+#if 0
+                reader.get(mHeightMap.heightOffset);
+                reader.get(mHeightMap.gradientData);
+                reader.get(mHeightMap.unknown1);
+                reader.get(mHeightMap.unknown2);
+#endif
+                reader.get(mHeightMap);
+                mDataTypes |= LAND_VHGT;
+                break;
+            }
+            case ESM4::SUB_VCLR: // vertex colours, 24bit RGB, 33x33x(1+1+1) = 3267
+            {
+                reader.get(mVertColr);
+                mDataTypes |= LAND_VCLR;
+                break;
+            }
+            case ESM4::SUA_BTXT:
+            {
+                BTXT base;
+                if (reader.getExact(base))
+                {
+                    assert(base.quadrant < 4 && base.quadrant >= 0 && "base texture quadrant index error");
+
+                    reader.adjustFormId(base.formId);
+                    mTextures[base.quadrant].base = std::move(base);
+#if 0
+                    std::cout << "Base Texture formid: 0x"
+                        << std::hex << mTextures[base.quadrant].base.formId
+                        << ", quad " << std::dec << (int)base.quadrant << std::endl;
+#endif
+                }
+                break;
+            }
+            case ESM4::SUB_ATXT:
+            {
+                if (currentAddQuad != -1)
+                {
+                    // FIXME: sometimes there are no VTXT following an ATXT?  Just add a dummy one for now
+                    std::cout << "ESM4::Land VTXT empty layer " << (int)layer.texture.layerIndex << std::endl;
+                    mTextures[currentAddQuad].layers.push_back(layer);
+                }
+                reader.get(layer.texture);
+                reader.adjustFormId(layer.texture.formId);
+                assert(layer.texture.quadrant < 4 && layer.texture.quadrant >= 0
+                       && "additional texture quadrant index error");
+#if 0
+                FormId txt = layer.texture.formId;
+                std::map<FormId, int>::iterator lb = uniqueTextures.lower_bound(txt);
+                if (lb != uniqueTextures.end() && !(uniqueTextures.key_comp()(txt, lb->first)))
+                {
+                    lb->second += 1;
+                }
+                else
+                    uniqueTextures.insert(lb, std::make_pair(txt, 1));
+#endif
+#if 0
+                std::cout << "Additional Texture formId: 0x"
+                    << std::hex << layer.texture.formId
+                    << ", quad " << std::dec << (int)layer.texture.quadrant << std::endl;
+                std::cout << "Additional Texture layer: "
+                    << std::dec << (int)layer.texture.layerIndex << std::endl;
+#endif
+                currentAddQuad = layer.texture.quadrant;
+                break;
+            }
+            case ESM4::SUB_VTXT:
+            {
+                assert(currentAddQuad != -1 && "VTXT without ATXT found");
+
+                int count = (int)reader.subRecordHeader().dataSize / sizeof(ESM4::Land::VTXT);
+                assert((reader.subRecordHeader().dataSize % sizeof(ESM4::Land::VTXT)) == 0
+                        && "ESM4::LAND VTXT data size error");
+
+                if (count)
+                {
+                    layer.data.resize(count);
+                    std::vector<ESM4::Land::VTXT>::iterator it = layer.data.begin();
+                    for (;it != layer.data.end(); ++it)
+                    {
+                        reader.get(*it);
+                        // FIXME: debug only
+                        //std::cout << "pos: " << std::dec << (int)(*it).position << std::endl;
+                    }
+                }
+                mTextures[currentAddQuad].layers.push_back(layer);
+
+                // Assumed that the layers are added in the correct sequence
+                // FIXME: Knights.esp doesn't seem to observe this - investigate more
+                //assert(layer.texture.layerIndex == mTextures[currentAddQuad].layers.size()-1
+                        //&& "additional texture layer index error");
+
+                currentAddQuad = -1;
+                layer.data.clear();
+                // FIXME: debug only
+                //std::cout << "VTXT: count " << std::dec << count << std::endl;
+                break;
+            }
+            case ESM4::SUB_VTEX: // only in Oblivion?
+            {
+                int count = (int)reader.subRecordHeader().dataSize / sizeof(FormId);
+                assert((reader.subRecordHeader().dataSize % sizeof(FormId)) == 0
+                        && "ESM4::LAND VTEX data size error");
+
+                if (count)
+                {
+                    mIds.resize(count);
+                    for (std::vector<FormId>::iterator it = mIds.begin(); it != mIds.end(); ++it)
+                    {
+                        reader.getFormId(*it);
+                        // FIXME: debug only
+                        //std::cout << "VTEX: " << std::hex << *it << std::endl;
+                    }
+                }
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::LAND::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+
+    if (currentAddQuad != -1)
+    {
+        // FIXME: not sure if it happens here as well
+        std::cout << "ESM4::Land VTXT empty layer " << (int)layer.texture.layerIndex << " quad " << (int)layer.texture.quadrant << std::endl;
+        mTextures[currentAddQuad].layers.push_back(layer);
+    }
+
+    bool missing = false;
+    for (int i = 0; i < 4; ++i)
+    {
+        if (mTextures[i].base.formId == 0)
+        {
+            //std::cout << "ESM4::LAND " << ESM4::formIdToString(mFormId) << " missing base, quad " << i << std::endl;
+            //std::cout << "layers " << mTextures[i].layers.size() << std::endl;
+            // NOTE: can't set the default here since FO3/FONV may have different defaults
+            //mTextures[i].base.formId = 0x000008C0; // TerrainHDDirt01.dds
+            missing = true;
+        }
+        //else
+        //{
+        //    std::cout << "ESM4::LAND " << ESM4::formIdToString(mFormId) << " base, quad " << i << std::endl;
+        //    std::cout << "layers " << mTextures[i].layers.size() << std::endl;
+        //}
+    }
+    // at least one of the quadrants do not have a base texture, return without setting the flag
+    if (!missing)
+        mDataTypes |= LAND_VTEX;
+}
+
+//void ESM4::Land::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Land::blank()
+//{
+//}
diff --git a/components/esm4/loadland.hpp b/components/esm4/loadland.hpp
new file mode 100644
index 0000000000..6d53a99ff2
--- /dev/null
+++ b/components/esm4/loadland.hpp
@@ -0,0 +1,136 @@
+/*
+  Copyright (C) 2015-2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_LAND_H
+#define ESM4_LAND_H
+
+#include <cstdint>
+#include <string>
+#include <vector>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+
+    struct Land
+    {
+        enum
+        {
+            LAND_VNML = 1,
+            LAND_VHGT = 2,
+            LAND_WNAM = 4, // only in TES3?
+            LAND_VCLR = 8,
+            LAND_VTEX = 16
+        };
+
+        // number of vertices per side
+        static const int VERTS_PER_SIDE = 33;
+
+        // cell terrain size in world coords
+        static const int REAL_SIZE = 4096;
+
+        // total number of vertices
+        static const int LAND_NUM_VERTS = VERTS_PER_SIDE * VERTS_PER_SIDE;
+
+        static const int HEIGHT_SCALE = 8;
+
+        // number of textures per side of a land quadrant
+        // (for TES4 - based on vanilla observations)
+        static const int QUAD_TEXTURE_PER_SIDE = 6;
+
+#pragma pack(push,1)
+        struct VHGT
+        {
+            float         heightOffset;
+            std::int8_t   gradientData[VERTS_PER_SIDE * VERTS_PER_SIDE];
+            std::uint16_t unknown1;
+            unsigned char unknown2;
+        };
+
+        struct BTXT
+        {
+            FormId        formId;
+            std::uint8_t  quadrant; // 0 = bottom left, 1 = bottom right, 2 = top left, 3 = top right
+            std::uint8_t  unknown1;
+            std::uint16_t unknown2;
+        };
+
+        struct ATXT
+        {
+            FormId        formId;
+            std::uint8_t  quadrant; // 0 = bottom left, 1 = bottom right, 2 = top left, 3 = top right
+            std::uint8_t  unknown;
+            std::uint16_t layerIndex; // texture layer, 0..7
+        };
+
+        struct VTXT
+        {
+            std::uint16_t position; // 0..288 (17x17 grid)
+            std::uint8_t  unknown1;
+            std::uint8_t  unknown2;
+            float         opacity;
+        };
+#pragma pack(pop)
+
+        struct TxtLayer
+        {
+            ATXT          texture;
+            std::vector<VTXT> data; // alpha data
+        };
+
+        struct Texture
+        {
+            BTXT          base;
+            std::vector<TxtLayer> layers;
+        };
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::uint32_t mLandFlags; // from DATA subrecord
+
+        // FIXME: lazy loading not yet implemented
+        int mDataTypes; // which data types are loaded
+
+        signed char   mVertNorm[VERTS_PER_SIDE * VERTS_PER_SIDE * 3]; // from VNML subrecord
+        signed char   mVertColr[VERTS_PER_SIDE * VERTS_PER_SIDE * 3]; // from VCLR subrecord
+        VHGT          mHeightMap;
+        Texture       mTextures[4]; // 0 = bottom left, 1 = bottom right, 2 = top left, 3 = top right
+        std::vector<FormId> mIds;   // land texture (LTEX) formids
+
+        Land();
+        virtual ~Land();
+
+        virtual void load(Reader& reader);
+        //virtual void save(Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_LAND_H
diff --git a/components/esm4/loadlgtm.cpp b/components/esm4/loadlgtm.cpp
new file mode 100644
index 0000000000..79867d4106
--- /dev/null
+++ b/components/esm4/loadlgtm.cpp
@@ -0,0 +1,105 @@
+/*
+  Copyright (C) 2020-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+  Also see https://tes5edit.github.io/fopdoc/ for FO3/FONV specific details.
+
+*/
+#include "loadlgtm.hpp"
+
+#include <stdexcept>
+#include <cfloat> // FLT_MAX for gcc
+//#include <iostream> // FIXME: for debugging only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::LightingTemplate::LightingTemplate() : mFormId(0), mFlags(0)
+{
+    mEditorId.clear();
+
+    mLighting.ambient = 0;
+    mLighting.directional = 0;
+    mLighting.fogColor = 0;
+    mLighting.fogNear = 0.f;
+    mLighting.fogFar = 0.f;
+    mLighting.rotationXY = 0;
+    mLighting.rotationZ = 0;
+    mLighting.fogDirFade = 0.f;
+    mLighting.fogClipDist = 0.f;
+    mLighting.fogPower = FLT_MAX; // hack way to detect TES4
+}
+
+ESM4::LightingTemplate::~LightingTemplate()
+{
+}
+
+void ESM4::LightingTemplate::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId);  break;
+            case ESM4::SUB_DATA:
+            {
+                if (subHdr.dataSize == 36) // TES4
+                    reader.get(&mLighting, 36);
+                if (subHdr.dataSize == 40) // FO3/FONV
+                    reader.get(mLighting);
+                else if (subHdr.dataSize == 92) // TES5
+                {
+                    reader.get(mLighting);
+                    reader.skipSubRecordData(52); // FIXME
+                }
+                else
+                    reader.skipSubRecordData(); // throw?
+
+                break;
+            }
+            case ESM4::SUB_DALC: // TES5
+            {
+                //std::cout << "LGTM " << ESM::printName(subHdr.typeId) << " skipping..."
+                          //<< subHdr.dataSize << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::LGTM::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::LightingTemplate::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::LightingTemplate::blank()
+//{
+//}
diff --git a/components/esm4/loadlgtm.hpp b/components/esm4/loadlgtm.hpp
new file mode 100644
index 0000000000..9724d8b16e
--- /dev/null
+++ b/components/esm4/loadlgtm.hpp
@@ -0,0 +1,63 @@
+/*
+  Copyright (C) 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+  Also see https://tes5edit.github.io/fopdoc/ for FO3/FONV specific details.
+
+*/
+#ifndef ESM4_LGTM_H
+#define ESM4_LGTM_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+#include "lighting.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+    typedef std::uint32_t FormId;
+
+    struct LightingTemplate
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+
+        Lighting mLighting;
+
+        LightingTemplate();
+        virtual ~LightingTemplate();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_LGTM_H
diff --git a/components/esm4/loadligh.cpp b/components/esm4/loadligh.cpp
new file mode 100644
index 0000000000..bdd125c6bb
--- /dev/null
+++ b/components/esm4/loadligh.cpp
@@ -0,0 +1,120 @@
+/*
+  Copyright (C) 2016, 2018, 2020-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadligh.hpp"
+
+#include <stdexcept>
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Light::Light() : mFormId(0), mFlags(0), mBoundRadius(0.f), mScriptId(0), mSound(0),
+                       mFade(0.f)
+{
+    mEditorId.clear();
+    mFullName.clear();
+    mModel.clear();
+    mIcon.clear();
+}
+
+ESM4::Light::~Light()
+{
+}
+
+void ESM4::Light::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+    std::uint32_t esmVer = reader.esmVersion();
+    bool isFONV = esmVer == ESM::VER_132 || esmVer == ESM::VER_133 || esmVer == ESM::VER_134;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_DATA:
+            {
+                // FIXME: TES4 might be uint32 as well, need to check
+                if (isFONV || (esmVer == ESM::VER_094 && subHdr.dataSize == 32)/*FO3*/)
+                {
+                    reader.get(mData.time);     // uint32
+                }
+                else
+                    reader.get(mData.duration); // float
+
+                reader.get(mData.radius);
+                reader.get(mData.colour);
+                reader.get(mData.flags);
+                //if (reader.esmVersion() == ESM::VER_094 || reader.esmVersion() == ESM::VER_170)
+                if (subHdr.dataSize == 48)
+                {
+                    reader.get(mData.falloff);
+                    reader.get(mData.FOV);
+                    reader.get(mData.nearClip);
+                    reader.get(mData.frequency);
+                    reader.get(mData.intensityAmplitude);
+                    reader.get(mData.movementAmplitude);
+                }
+                else if (subHdr.dataSize == 32) // TES4
+                {
+                    reader.get(mData.falloff);
+                    reader.get(mData.FOV);
+                }
+                reader.get(mData.value);
+                reader.get(mData.weight);
+                break;
+            }
+            case ESM4::SUB_MODL: reader.getZString(mModel); break;
+            case ESM4::SUB_ICON: reader.getZString(mIcon);  break;
+            case ESM4::SUB_SCRI: reader.getFormId(mScriptId); break;
+            case ESM4::SUB_SNAM: reader.getFormId(mSound);  break;
+            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
+            case ESM4::SUB_FNAM: reader.get(mFade);         break;
+            case ESM4::SUB_MODT:
+            case ESM4::SUB_OBND:
+            case ESM4::SUB_VMAD: // Dragonborn only?
+            {
+                //std::cout << "LIGH " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::LIGH::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Light::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Light::blank()
+//{
+//}
diff --git a/components/esm4/loadligh.hpp b/components/esm4/loadligh.hpp
new file mode 100644
index 0000000000..4a0120d71a
--- /dev/null
+++ b/components/esm4/loadligh.hpp
@@ -0,0 +1,101 @@
+/*
+  Copyright (C) 2016, 2018-2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_LIGH_H
+#define ESM4_LIGH_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Light
+    {
+        struct Data
+        {
+            std::uint32_t time;               // FO/FONV only
+            float         duration;
+            std::uint32_t radius;
+            std::uint32_t colour; // RGBA
+            // flags:
+            // 0x00000001 = Dynamic
+            // 0x00000002 = Can be Carried
+            // 0x00000004 = Negative
+            // 0x00000008 = Flicker
+            // 0x00000020 = Off By Default
+            // 0x00000040 = Flicker Slow
+            // 0x00000080 = Pulse
+            // 0x00000100 = Pulse Slow
+            // 0x00000200 = Spot Light
+            // 0x00000400 = Spot Shadow
+            std::int32_t  flags;
+            float         falloff;
+            float         FOV;
+            float         nearClip;           // TES5 only
+            float         frequency;          // TES5 only
+            float         intensityAmplitude; // TES5 only
+            float         movementAmplitude;  // TES5 only
+            std::uint32_t value;   // gold
+            float         weight;
+            Data() : duration(-1), radius(0), colour(0), flags(0), falloff(1.f), FOV(90),
+                     nearClip(0.f), frequency(0.f), intensityAmplitude(0.f), movementAmplitude(0.f),
+                     value(0), weight(0.f) // FIXME: FOV in degrees or radians?
+            {}
+        };
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mFullName;
+        std::string mModel;
+        std::string mIcon;
+
+        float mBoundRadius;
+
+        FormId mScriptId;
+        FormId mSound;
+
+        float mFade;
+
+        Data mData;
+
+        Light();
+        virtual ~Light();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_LIGH_H
diff --git a/components/esm4/loadltex.cpp b/components/esm4/loadltex.cpp
new file mode 100644
index 0000000000..577d5dc8e1
--- /dev/null
+++ b/components/esm4/loadltex.cpp
@@ -0,0 +1,107 @@
+/*
+  Copyright (C) 2015-2016, 2018 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadltex.hpp"
+
+#ifdef NDEBUG // FIXME: debuggigng only
+#undef NDEBUG
+#endif
+
+#include <cassert>
+#include <stdexcept>
+//#include <iostream> // FIXME: debugging only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::LandTexture::LandTexture() : mFormId(0), mFlags(0), mHavokFriction(0), mHavokRestitution(0),
+                                   mTextureSpecular(0), mGrass(0), mHavokMaterial(0), mTexture(0),
+                                   mMaterial(0)
+{
+    mEditorId.clear();
+    mTextureFile.clear();
+}
+
+ESM4::LandTexture::~LandTexture()
+{
+}
+
+void ESM4::LandTexture::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+    std::uint32_t esmVer = reader.esmVersion();
+    bool isFONV = esmVer == ESM::VER_132 || esmVer == ESM::VER_133 || esmVer == ESM::VER_134;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_HNAM:
+            {
+                if (isFONV)
+                {
+                    reader.skipSubRecordData(); // FIXME: skip FONV for now
+                    break;
+                }
+
+                if ((reader.esmVersion() == ESM::VER_094 || reader.esmVersion() == ESM::VER_170)
+                    && subHdr.dataSize == 2) // FO3 is VER_094 but dataSize 3
+                {
+                    //assert(subHdr.dataSize == 2 && "LTEX unexpected HNAM size");
+                    reader.get(mHavokFriction);
+                    reader.get(mHavokRestitution);
+                }
+                else
+                {
+                    assert(subHdr.dataSize == 3 && "LTEX unexpected HNAM size");
+                    reader.get(mHavokMaterial);
+                    reader.get(mHavokFriction);
+                    reader.get(mHavokRestitution);
+                }
+                break;
+            }
+            case ESM4::SUB_ICON: reader.getZString(mTextureFile); break; // Oblivion only?
+            case ESM4::SUB_SNAM: reader.get(mTextureSpecular); break;
+            case ESM4::SUB_GNAM: reader.getFormId(mGrass);     break;
+            case ESM4::SUB_TNAM: reader.getFormId(mTexture);   break; // TES5 only
+            case ESM4::SUB_MNAM: reader.getFormId(mMaterial);  break; // TES5 only
+            default:
+                throw std::runtime_error("ESM4::LTEX::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::LandTexture::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::LandTexture::blank()
+//{
+//}
diff --git a/components/esm4/loadltex.hpp b/components/esm4/loadltex.hpp
new file mode 100644
index 0000000000..934e7cc708
--- /dev/null
+++ b/components/esm4/loadltex.hpp
@@ -0,0 +1,75 @@
+/*
+  Copyright (C) 2015-2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_LTEX_H
+#define ESM4_LTEX_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct LandTexture
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+
+        std::uint8_t mHavokFriction;
+        std::uint8_t mHavokRestitution;
+
+        std::uint8_t mTextureSpecular; // default 30
+        FormId mGrass;
+
+        // ------ TES4 only -----
+
+        std::string mTextureFile;
+        std::uint8_t mHavokMaterial;
+
+        // ------ TES5 only -----
+
+        FormId mTexture;
+        FormId mMaterial;
+
+        // ----------------------
+
+        LandTexture();
+        virtual ~LandTexture();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_LTEX_H
diff --git a/components/esm4/loadlvlc.cpp b/components/esm4/loadlvlc.cpp
new file mode 100644
index 0000000000..0088446277
--- /dev/null
+++ b/components/esm4/loadlvlc.cpp
@@ -0,0 +1,130 @@
+/*
+  Copyright (C) 2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadlvlc.hpp"
+
+#include <stdexcept>
+//#include <iostream> // FIXME
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::LevelledCreature::LevelledCreature() : mFormId(0), mFlags(0), mScriptId(0), mTemplate(0),
+                                           mChanceNone(0), mLvlCreaFlags(0)
+{
+    mEditorId.clear();
+}
+
+ESM4::LevelledCreature::~LevelledCreature()
+{
+}
+
+void ESM4::LevelledCreature::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_SCRI: reader.getFormId(mScriptId);    break;
+            case ESM4::SUB_TNAM: reader.getFormId(mTemplate);  break;
+            case ESM4::SUB_LVLD: reader.get(mChanceNone);      break;
+            case ESM4::SUB_LVLF: reader.get(mLvlCreaFlags);    break;
+            case ESM4::SUB_LVLO:
+            {
+                static LVLO lvlo;
+                if (subHdr.dataSize != 12)
+                {
+                    if (subHdr.dataSize == 8)
+                    {
+                        reader.get(lvlo.level);
+                        reader.get(lvlo.item);
+                        reader.get(lvlo.count);
+                        //std::cout << "LVLC " << mEditorId << " LVLO lev " << lvlo.level << ", item " << lvlo.item
+                                  //<< ", count " << lvlo.count << std::endl;
+                        // FIXME: seems to happen only once, don't add to mLvlObject
+                        // LVLC TesKvatchCreature LVLO lev 1, item 1393819648, count 2
+                        // 0x0001, 0x5314 0000, 0x0002
+                        break;
+                    }
+                    else
+                        throw std::runtime_error("ESM4::LVLC::load - " + mEditorId + " LVLO size error");
+                }
+                else
+                    reader.get(lvlo);
+
+                reader.adjustFormId(lvlo.item);
+                mLvlObject.push_back(lvlo);
+                break;
+            }
+            case ESM4::SUB_OBND: // FO3
+            {
+                //std::cout << "LVLC " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::LVLC::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+bool ESM4::LevelledCreature::calcAllLvlLessThanPlayer() const
+{
+    if (mHasLvlCreaFlags)
+        return (mLvlCreaFlags & 0x01) != 0;
+    else
+        return (mChanceNone & 0x80) != 0; // FIXME: 0x80 is just a guess
+}
+
+bool ESM4::LevelledCreature::calcEachItemInCount() const
+{
+    if (mHasLvlCreaFlags)
+        return (mLvlCreaFlags & 0x02) != 0;
+    else
+        return true; // FIXME: just a guess
+}
+
+std::int8_t ESM4::LevelledCreature::chanceNone() const
+{
+    if (mHasLvlCreaFlags)
+        return mChanceNone;
+    else
+        return (mChanceNone & 0x7f); // FIXME: 0x80 is just a guess
+}
+
+//void ESM4::LevelledCreature::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::LevelledCreature::blank()
+//{
+//}
diff --git a/components/esm4/loadlvlc.hpp b/components/esm4/loadlvlc.hpp
new file mode 100644
index 0000000000..ccd08944b5
--- /dev/null
+++ b/components/esm4/loadlvlc.hpp
@@ -0,0 +1,71 @@
+/*
+  Copyright (C) 2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_LVLC_H
+#define ESM4_LVLC_H
+
+#include <cstdint>
+#include <vector>
+
+#include "formid.hpp"
+#include "inventory.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct LevelledCreature
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+
+        FormId mScriptId;
+        FormId mTemplate;
+        std::int8_t mChanceNone;
+
+        bool mHasLvlCreaFlags;
+        std::uint8_t mLvlCreaFlags;
+
+        std::vector<LVLO> mLvlObject;
+
+        bool calcAllLvlLessThanPlayer() const;
+        bool calcEachItemInCount() const;
+        std::int8_t chanceNone() const;
+
+        LevelledCreature();
+        virtual ~LevelledCreature();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_LVLC_H
diff --git a/components/esm4/loadlvli.cpp b/components/esm4/loadlvli.cpp
new file mode 100644
index 0000000000..1237a0add4
--- /dev/null
+++ b/components/esm4/loadlvli.cpp
@@ -0,0 +1,142 @@
+/*
+  Copyright (C) 2016, 2018-2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadlvli.hpp"
+
+#include <stdexcept>
+#include <iostream> // FIXME: for debugging
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::LevelledItem::LevelledItem() : mFormId(0), mFlags(0), mChanceNone(0), mHasLvlItemFlags(false),
+    mLvlItemFlags(0), mData(0)
+{
+    mEditorId.clear();
+}
+
+ESM4::LevelledItem::~LevelledItem()
+{
+}
+
+void ESM4::LevelledItem::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_LVLD: reader.get(mChanceNone); break;
+            case ESM4::SUB_LVLF: reader.get(mLvlItemFlags); mHasLvlItemFlags = true; break;
+            case ESM4::SUB_DATA: reader.get(mData); break;
+            case ESM4::SUB_LVLO:
+            {
+                static LVLO lvlo;
+                if (subHdr.dataSize != 12)
+                {
+                    if (subHdr.dataSize == 8)
+                    {
+                        reader.get(lvlo.level);
+                        reader.get(lvlo.item);
+                        reader.get(lvlo.count);
+//                        std::cout << "LVLI " << mEditorId << " LVLO lev " << lvlo.level << ", item " << lvlo.item
+//                                  << ", count " << lvlo.count << std::endl;
+                        break;
+                    }
+                    else
+                        throw std::runtime_error("ESM4::LVLI::load - " + mEditorId + " LVLO size error");
+                }
+                else
+                    reader.get(lvlo);
+
+                reader.adjustFormId(lvlo.item);
+                mLvlObject.push_back(lvlo);
+                break;
+            }
+            case ESM4::SUB_LLCT:
+            case ESM4::SUB_OBND: // FO3/FONV
+            case ESM4::SUB_COED: // FO3/FONV
+            case ESM4::SUB_LVLG: // FO3/FONV
+            {
+
+                //std::cout << "LVLI " << ESM::printName(subHdr.typeId) << " skipping..." << subHdr.dataSize << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::LVLI::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+
+    // FIXME: testing
+    //if (mHasLvlItemFlags && mChanceNone >= 90)
+        //std::cout << "LVLI " << mEditorId << " chance none " << int(mChanceNone) << std::endl;
+}
+
+bool ESM4::LevelledItem::calcAllLvlLessThanPlayer() const
+{
+    if (mHasLvlItemFlags)
+        return (mLvlItemFlags & 0x01) != 0;
+    else
+        return (mChanceNone & 0x80) != 0; // FIXME: 0x80 is just a guess
+}
+
+bool ESM4::LevelledItem::calcEachItemInCount() const
+{
+    if (mHasLvlItemFlags)
+        return (mLvlItemFlags & 0x02) != 0;
+    else
+        return mData != 0;
+}
+
+std::int8_t ESM4::LevelledItem::chanceNone() const
+{
+    if (mHasLvlItemFlags)
+        return mChanceNone;
+    else
+        return (mChanceNone & 0x7f); // FIXME: 0x80 is just a guess
+}
+
+bool ESM4::LevelledItem::useAll() const
+{
+    if (mHasLvlItemFlags)
+        return (mLvlItemFlags & 0x04) != 0;
+    else
+        return false;
+}
+
+//void ESM4::LevelledItem::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::LevelledItem::blank()
+//{
+//}
diff --git a/components/esm4/loadlvli.hpp b/components/esm4/loadlvli.hpp
new file mode 100644
index 0000000000..0964370e63
--- /dev/null
+++ b/components/esm4/loadlvli.hpp
@@ -0,0 +1,72 @@
+/*
+  Copyright (C) 2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_LVLI_H
+#define ESM4_LVLI_H
+
+#include <cstdint>
+#include <vector>
+
+#include "formid.hpp"
+#include "inventory.hpp" // LVLO
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct LevelledItem
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+
+        std::int8_t mChanceNone;
+
+        bool mHasLvlItemFlags;
+        std::uint8_t mLvlItemFlags;
+
+        std::uint8_t mData;
+
+        std::vector<LVLO> mLvlObject;
+
+        LevelledItem();
+        virtual ~LevelledItem();
+
+        bool calcAllLvlLessThanPlayer() const;
+        bool calcEachItemInCount() const;
+        bool useAll() const;
+        std::int8_t chanceNone() const;
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_LVLI_H
diff --git a/components/esm4/loadlvln.cpp b/components/esm4/loadlvln.cpp
new file mode 100644
index 0000000000..fdd860b9d9
--- /dev/null
+++ b/components/esm4/loadlvln.cpp
@@ -0,0 +1,114 @@
+/*
+  Copyright (C) 2019-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadlvln.hpp"
+
+#include <stdexcept>
+//#include <iostream> // FIXME: testing only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::LevelledNpc::LevelledNpc() : mFormId(0), mFlags(0), mChanceNone(0), mLvlActorFlags(0), mListCount(0)
+{
+    mEditorId.clear();
+    mModel.clear();
+}
+
+ESM4::LevelledNpc::~LevelledNpc()
+{
+}
+
+void ESM4::LevelledNpc::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+    //std::uint32_t esmVer = reader.esmVersion(); // currently unused
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_MODL: reader.getZString(mModel);    break;
+            case ESM4::SUB_LLCT: reader.get(mListCount);       break;
+            case ESM4::SUB_LVLD: reader.get(mChanceNone);      break;
+            case ESM4::SUB_LVLF: reader.get(mLvlActorFlags);   break;
+            case ESM4::SUB_LVLO:
+            {
+                static LVLO lvlo;
+                if (subHdr.dataSize != 12)
+                {
+                    if (subHdr.dataSize == 8)
+                    {
+                        reader.get(lvlo.level);
+                        reader.get(lvlo.item);
+                        reader.get(lvlo.count);
+                        break;
+                    }
+                    else
+                        throw std::runtime_error("ESM4::LVLN::load - " + mEditorId + " LVLO size error");
+                }
+//              else if (esmVer == ESM::VER_094 || esmVer == ESM::VER_170 || isFONV)
+//              {
+//                  std::uint32_t level;
+//                  reader.get(level);
+//                  lvlo.level = static_cast<std::uint16_t>(level);
+//                  reader.get(lvlo.item);
+//                  std::uint32_t count;
+//                  reader.get(count);
+//                  lvlo.count = static_cast<std::uint16_t>(count);
+//              }
+                else
+                    reader.get(lvlo);
+
+                reader.adjustFormId(lvlo.item);
+                mLvlObject.push_back(lvlo);
+                break;
+            }
+            case ESM4::SUB_COED: // owner
+            case ESM4::SUB_OBND: // object bounds
+            case ESM4::SUB_MODT: // model texture data
+            {
+                //std::cout << "LVLN " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::LVLN::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::LevelledNpc::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::LevelledNpc::blank()
+//{
+//}
diff --git a/components/esm4/loadlvln.hpp b/components/esm4/loadlvln.hpp
new file mode 100644
index 0000000000..057ed9581d
--- /dev/null
+++ b/components/esm4/loadlvln.hpp
@@ -0,0 +1,69 @@
+/*
+  Copyright (C) 2019, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_LVLN_H
+#define ESM4_LVLN_H
+
+#include <cstdint>
+#include <vector>
+
+#include "formid.hpp"
+#include "inventory.hpp" // LVLO
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct LevelledNpc
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mModel;
+
+        std::int8_t mChanceNone;
+        std::uint8_t mLvlActorFlags;
+
+        std::uint8_t mListCount;
+        std::vector<LVLO> mLvlObject;
+
+        LevelledNpc();
+        virtual ~LevelledNpc();
+
+        inline bool calcAllLvlLessThanPlayer() const { return (mLvlActorFlags & 0x01) != 0; }
+        inline bool calcEachItemInCount() const { return (mLvlActorFlags & 0x02) != 0; }
+        inline std::int8_t chanceNone() const { return mChanceNone; }
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_LVLN_H
diff --git a/components/esm4/loadmato.cpp b/components/esm4/loadmato.cpp
new file mode 100644
index 0000000000..fdbdc66ebc
--- /dev/null
+++ b/components/esm4/loadmato.cpp
@@ -0,0 +1,76 @@
+/*
+  Copyright (C) 2016, 2018 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadmato.hpp"
+
+#include <stdexcept>
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Material::Material() : mFormId(0), mFlags(0)
+{
+    mEditorId.clear();
+    mModel.clear();
+}
+
+ESM4::Material::~Material()
+{
+}
+
+void ESM4::Material::load(ESM4::Reader& reader)
+{
+    //mFormId = reader.adjustFormId(reader.hdr().record.id); // FIXME: use master adjusted?
+    mFormId = reader.hdr().record.id;
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_MODL: reader.getZString(mModel);    break;
+            case ESM4::SUB_DNAM:
+            case ESM4::SUB_DATA:
+            {
+                //std::cout << "MATO " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::MATO::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Material::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Material::blank()
+//{
+//}
diff --git a/components/esm4/loadmato.hpp b/components/esm4/loadmato.hpp
new file mode 100644
index 0000000000..9b0d6c3947
--- /dev/null
+++ b/components/esm4/loadmato.hpp
@@ -0,0 +1,58 @@
+/*
+  Copyright (C) 2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_MATO_H
+#define ESM4_MATO_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Material
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mModel;
+
+        Material();
+        virtual ~Material();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_MATO_H
diff --git a/components/esm4/loadmisc.cpp b/components/esm4/loadmisc.cpp
new file mode 100644
index 0000000000..ee3c10d0b6
--- /dev/null
+++ b/components/esm4/loadmisc.cpp
@@ -0,0 +1,95 @@
+/*
+  Copyright (C) 2016, 2018, 2020-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadmisc.hpp"
+
+#include <stdexcept>
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::MiscItem::MiscItem() : mFormId(0), mFlags(0), mPickUpSound(0), mDropSound(0), mBoundRadius(0.f), mScriptId(0)
+{
+    mEditorId.clear();
+    mFullName.clear();
+    mModel.clear();
+    mIcon.clear();
+    mMiniIcon.clear();
+
+    mData.value = 0;
+    mData.weight = 0.f;
+}
+
+ESM4::MiscItem::~MiscItem()
+{
+}
+
+void ESM4::MiscItem::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_MODL: reader.getZString(mModel); break;
+            case ESM4::SUB_ICON: reader.getZString(mIcon);  break;
+            case ESM4::SUB_MICO: reader.getZString(mMiniIcon); break; // FO3
+            case ESM4::SUB_SCRI: reader.getFormId(mScriptId); break;
+            case ESM4::SUB_DATA: reader.get(mData);         break;
+            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
+            case ESM4::SUB_YNAM: reader.getFormId(mPickUpSound); break;
+            case ESM4::SUB_ZNAM: reader.getFormId(mDropSound); break;
+            case ESM4::SUB_MODT:
+            case ESM4::SUB_KSIZ:
+            case ESM4::SUB_KWDA:
+            case ESM4::SUB_MODS:
+            case ESM4::SUB_OBND:
+            case ESM4::SUB_VMAD:
+            case ESM4::SUB_RNAM: // FONV
+            {
+                //std::cout << "MISC " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::MISC::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::MiscItem::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::MiscItem::blank()
+//{
+//}
diff --git a/components/esm4/loadmisc.hpp b/components/esm4/loadmisc.hpp
new file mode 100644
index 0000000000..94f09b1a23
--- /dev/null
+++ b/components/esm4/loadmisc.hpp
@@ -0,0 +1,77 @@
+/*
+  Copyright (C) 2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_MISC_H
+#define ESM4_MISC_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct MiscItem
+    {
+#pragma pack(push, 1)
+        struct Data
+        {
+            std::uint32_t value;   // gold
+            float         weight;
+        };
+#pragma pack(pop)
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mFullName;
+        std::string mModel;
+        std::string mIcon; // inventory
+        std::string mMiniIcon; // inventory
+
+        FormId mPickUpSound;
+        FormId mDropSound;
+
+        float mBoundRadius;
+        FormId mScriptId;
+
+        Data mData;
+
+        MiscItem();
+        virtual ~MiscItem();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_MISC_H
diff --git a/components/esm4/loadmset.cpp b/components/esm4/loadmset.cpp
new file mode 100644
index 0000000000..b7859f9fa5
--- /dev/null
+++ b/components/esm4/loadmset.cpp
@@ -0,0 +1,115 @@
+/*
+  Copyright (C) 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadmset.hpp"
+
+#include <stdexcept>
+#include <iostream> // FIXME: for debugging only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::MediaSet::MediaSet() : mFormId(0), mFlags(0), mSetType(-1), mEnabled(0),
+    mBoundaryDayOuter(0.f), mBoundaryDayMiddle(0.f), mBoundaryDayInner(0.f),
+    mBoundaryNightOuter(0.f), mBoundaryNightMiddle(0.f), mBoundaryNightInner(0.f),
+    mLevel8(0.f), mLevel9(0.f), mLevel0(0.f), mLevelA(0.f), mLevelB(0.f), mLevelC(0.f),
+    mTime1(0.f), mTime2(0.f), mTime3(0.f), mTime4(0.f),
+    mSoundIntro(0), mSoundOutro(0)
+{
+    mEditorId.clear();
+    mFullName.clear();
+
+    mSet2.clear();
+    mSet3.clear();
+    mSet4.clear();
+    mSet5.clear();
+    mSet6.clear();
+    mSet7.clear();
+}
+
+ESM4::MediaSet::~MediaSet()
+{
+}
+
+void ESM4::MediaSet::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId);  break;
+            case ESM4::SUB_FULL: reader.getZString(mFullName);  break;
+            case ESM4::SUB_NAM1: reader.get(mSetType); break;
+            case ESM4::SUB_PNAM: reader.get(mEnabled); break;
+            case ESM4::SUB_NAM2: reader.getZString(mSet2); break;
+            case ESM4::SUB_NAM3: reader.getZString(mSet3); break;
+            case ESM4::SUB_NAM4: reader.getZString(mSet4); break;
+            case ESM4::SUB_NAM5: reader.getZString(mSet5); break;
+            case ESM4::SUB_NAM6: reader.getZString(mSet6); break;
+            case ESM4::SUB_NAM7: reader.getZString(mSet7); break;
+            case ESM4::SUB_HNAM: reader.getFormId(mSoundIntro); break;
+            case ESM4::SUB_INAM: reader.getFormId(mSoundOutro); break;
+            case ESM4::SUB_NAM8: reader.get(mLevel8); break;
+            case ESM4::SUB_NAM9: reader.get(mLevel9); break;
+            case ESM4::SUB_NAM0: reader.get(mLevel0); break;
+            case ESM4::SUB_ANAM: reader.get(mLevelA); break;
+            case ESM4::SUB_BNAM: reader.get(mLevelB); break;
+            case ESM4::SUB_CNAM: reader.get(mLevelC); break;
+            case ESM4::SUB_JNAM: reader.get(mBoundaryDayOuter); break;
+            case ESM4::SUB_KNAM: reader.get(mBoundaryDayMiddle); break;
+            case ESM4::SUB_LNAM: reader.get(mBoundaryDayInner); break;
+            case ESM4::SUB_MNAM: reader.get(mBoundaryNightOuter); break;
+            case ESM4::SUB_NNAM: reader.get(mBoundaryNightMiddle); break;
+            case ESM4::SUB_ONAM: reader.get(mBoundaryNightInner); break;
+            case ESM4::SUB_DNAM: reader.get(mTime1); break;
+            case ESM4::SUB_ENAM: reader.get(mTime2); break;
+            case ESM4::SUB_FNAM: reader.get(mTime3); break;
+            case ESM4::SUB_GNAM: reader.get(mTime4); break;
+            case ESM4::SUB_DATA:
+            {
+                //std::cout << "MSET " << ESM::printName(subHdr.typeId) << " skipping..."
+                          //<< subHdr.dataSize << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::MSET::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::MediaSet::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::MediaSet::blank()
+//{
+//}
diff --git a/components/esm4/loadmset.hpp b/components/esm4/loadmset.hpp
new file mode 100644
index 0000000000..b13c4d6f64
--- /dev/null
+++ b/components/esm4/loadmset.hpp
@@ -0,0 +1,99 @@
+/*
+  Copyright (C) 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_MSET_H
+#define ESM4_MSET_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct MediaSet
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mFullName;
+
+        // -1 none, 0 battle, 1 location, 2 dungeon, 3 incidental
+        // Battle     - intro (HNAM), loop (NAM2), outro (INAM)
+        // Location   - day outer (NAM2), day middle (NAM3), day inner (NAM4),
+        //              night outer (NAM5), night middle (NAM6), night inner (NAM7)
+        // Dungeon    - intro (HNAM), battle (NAM2), explore (NAM3), suspence (NAM4), outro (INAM)
+        // Incidental - daytime (HNAM), nighttime (INAM)
+        std::int32_t mSetType;
+        // 0x01 day outer,   0x02 day middle,   0x04 day inner
+        // 0x08 night outer, 0x10 night middle, 0x20 night inner
+        std::uint8_t mEnabled; // for location
+
+        float mBoundaryDayOuter;    // %
+        float mBoundaryDayMiddle;   // %
+        float mBoundaryDayInner;    // %
+        float mBoundaryNightOuter;  // %
+        float mBoundaryNightMiddle; // %
+        float mBoundaryNightInner;  // %
+
+        // start at 2 to reduce confusion
+        std::string mSet2; // NAM2
+        std::string mSet3; // NAM3
+        std::string mSet4; // NAM4
+        std::string mSet5; // NAM5
+        std::string mSet6; // NAM6
+        std::string mSet7; // NAM7
+
+        float mLevel8; // dB
+        float mLevel9; // dB
+        float mLevel0; // dB
+        float mLevelA; // dB
+        float mLevelB; // dB
+        float mLevelC; // dB
+
+        float mTime1;
+        float mTime2;
+        float mTime3;
+        float mTime4;
+
+        FormId mSoundIntro; // HNAM
+        FormId mSoundOutro; // INAM
+
+        MediaSet();
+        virtual ~MediaSet();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_MSET_H
diff --git a/components/esm4/loadmstt.cpp b/components/esm4/loadmstt.cpp
new file mode 100644
index 0000000000..61d6147b2f
--- /dev/null
+++ b/components/esm4/loadmstt.cpp
@@ -0,0 +1,87 @@
+/*
+  Copyright (C) 2019, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadmstt.hpp"
+
+#include <stdexcept>
+//#include <iostream> // FIXME: testing only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::MovableStatic::MovableStatic() : mFormId(0), mFlags(0), mData(0), mLoopingSound(0)
+{
+    mEditorId.clear();
+    mModel.clear();
+}
+
+ESM4::MovableStatic::~MovableStatic()
+{
+}
+
+void ESM4::MovableStatic::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_MODL: reader.getZString(mModel);    break;
+            case ESM4::SUB_DATA: reader.get(mData);            break;
+            case ESM4::SUB_SNAM: reader.get(mLoopingSound);    break;
+            case ESM4::SUB_DEST: // destruction data
+            case ESM4::SUB_OBND: // object bounds
+            case ESM4::SUB_MODT: // model texture data
+            case ESM4::SUB_DMDL:
+            case ESM4::SUB_DMDT:
+            case ESM4::SUB_DSTD:
+            case ESM4::SUB_DSTF:
+            case ESM4::SUB_MODS:
+            case ESM4::SUB_FULL:
+            case ESM4::SUB_MODB:
+            {
+                //std::cout << "MSTT " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::MSTT::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::MovableStatic::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::MovableStatic::blank()
+//{
+//}
diff --git a/components/esm4/loadmstt.hpp b/components/esm4/loadmstt.hpp
new file mode 100644
index 0000000000..77dc453d35
--- /dev/null
+++ b/components/esm4/loadmstt.hpp
@@ -0,0 +1,60 @@
+/*
+  Copyright (C) 2019, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_MSTT_H
+#define ESM4_MSTT_H
+
+#include <cstdint>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct MovableStatic
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mModel;
+
+        std::int8_t mData;
+        FormId mLoopingSound;
+
+        MovableStatic();
+        virtual ~MovableStatic();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_MSTT_H
diff --git a/components/esm4/loadmusc.cpp b/components/esm4/loadmusc.cpp
new file mode 100644
index 0000000000..903bbb5a1f
--- /dev/null
+++ b/components/esm4/loadmusc.cpp
@@ -0,0 +1,86 @@
+/*
+  Copyright (C) 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+  Also see https://tes5edit.github.io/fopdoc/ for FO3/FONV specific details.
+
+*/
+#include "loadmusc.hpp"
+
+#include <stdexcept>
+//#include <iostream> // FIXME: for debugging only
+
+//#include "formid.hpp"
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Music::Music() : mFormId(0), mFlags(0)
+{
+    mEditorId.clear();
+    mMusicFile.clear();
+}
+
+ESM4::Music::~Music()
+{
+}
+
+void ESM4::Music::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_FNAM: reader.getZString(mMusicFile);
+                                 //std::cout << "music: " << /*formIdToString(mFormId)*/mEditorId << " " << mMusicFile << std::endl;
+                                 break;
+            case ESM4::SUB_ANAM: // FONV float (attenuation in db? loop if positive?)
+            case ESM4::SUB_WNAM: // TES5
+            case ESM4::SUB_PNAM: // TES5
+            case ESM4::SUB_TNAM: // TES5
+            {
+                //std::cout << "MUSC " << ESM::printName(subHdr.typeId) << " skipping..."
+                          //<< subHdr.dataSize << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::MUSC::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Music::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Music::blank()
+//{
+//}
diff --git a/components/esm4/loadmusc.hpp b/components/esm4/loadmusc.hpp
new file mode 100644
index 0000000000..ab3889a6c0
--- /dev/null
+++ b/components/esm4/loadmusc.hpp
@@ -0,0 +1,60 @@
+/*
+  Copyright (C) 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+  Also see https://tes5edit.github.io/fopdoc/ for FO3/FONV specific details.
+
+*/
+#ifndef ESM4_MUSC_H
+#define ESM4_MUSC_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Music
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mMusicFile;
+
+        Music();
+        virtual ~Music();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_MUSC_H
diff --git a/components/esm4/loadnavi.cpp b/components/esm4/loadnavi.cpp
new file mode 100644
index 0000000000..0655edb1e8
--- /dev/null
+++ b/components/esm4/loadnavi.cpp
@@ -0,0 +1,373 @@
+/*
+  Copyright (C) 2015-2016, 2018, 2020-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadnavi.hpp"
+
+#ifdef NDEBUG // FIXME: debuggigng only
+#undef NDEBUG
+#endif
+
+#include <cassert>
+#include <stdexcept>
+
+#include <iostream> // FIXME: debugging only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Navigation::Navigation()
+{
+    mEditorId.clear();
+}
+
+ESM4::Navigation::~Navigation()
+{
+}
+
+void ESM4::Navigation::IslandInfo::load(ESM4::Reader& reader)
+{
+    reader.get(minX);
+    reader.get(minY);
+    reader.get(minZ);
+    reader.get(maxX);
+    reader.get(maxY);
+    reader.get(maxZ);
+
+    std::uint32_t count;
+    reader.get(count); // countTriangle;
+    if (count)
+    {
+        triangles.resize(count);
+        //std::cout << "NVMI island triangles " << std::dec << count << std::endl; // FIXME
+        for (std::vector<Navigation::Triangle>::iterator it = triangles.begin(); it != triangles.end(); ++it)
+        {
+            reader.get(*it);
+        }
+    }
+
+    reader.get(count); // countVertex;
+    if (count)
+    {
+        verticies.resize(count);
+        for (std::vector<ESM4::Vertex>::iterator it = verticies.begin(); it != verticies.end(); ++it)
+        {
+            reader.get(*it);
+// FIXME: debugging only
+#if 0
+            std::string padding = "";
+            padding.insert(0, reader.stackSize()*2, ' ');
+            std::cout << padding << "NVMI vert " << std::dec << (*it).x << ", " << (*it).y << ", " << (*it).z << std::endl;
+#endif
+        }
+    }
+}
+
+void ESM4::Navigation::NavMeshInfo::load(ESM4::Reader& reader)
+{
+    std::uint32_t count;
+
+    reader.get(formId);
+    reader.get(flags);
+    reader.get(x);
+    reader.get(y);
+    reader.get(z);
+
+// FIXME: for debugging only
+#if 0
+    std::string padding = "";
+    if (flags == ESM4::FLG_Modified)
+        padding.insert(0, 2, '-');
+    else if (flags == ESM4::FLG_Unmodified)
+        padding.insert(0, 4, '.');
+
+    padding.insert(0, reader.stackSize()*2, ' ');
+    std::cout << padding << "NVMI formId: 0x" << std::hex << formId << std::endl;
+    std::cout << padding << "NVMI flags: " << std::hex << flags << std::endl;
+    std::cout << padding << "NVMI center: " << std::dec << x << ", " << y << ", " << z << std::endl;
+#endif
+
+    reader.get(flagPrefMerges);
+
+    reader.get(count); // countMerged;
+    if (count)
+    {
+        //std::cout << "NVMI countMerged " << std::dec << count << std::endl;
+        formIdMerged.resize(count);
+        for (std::vector<FormId>::iterator it = formIdMerged.begin(); it != formIdMerged.end(); ++it)
+        {
+            reader.get(*it);
+        }
+    }
+
+    reader.get(count); // countPrefMerged;
+    if (count)
+    {
+        //std::cout << "NVMI countPrefMerged " << std::dec << count << std::endl;
+        formIdPrefMerged.resize(count);
+        for (std::vector<FormId>::iterator it = formIdPrefMerged.begin(); it != formIdPrefMerged.end(); ++it)
+        {
+            reader.get(*it);
+        }
+    }
+
+    reader.get(count); // countLinkedDoors;
+    if (count)
+    {
+        //std::cout << "NVMI countLinkedDoors " << std::dec << count << std::endl;
+        linkedDoors.resize(count);
+        for (std::vector<DoorRef>::iterator it = linkedDoors.begin(); it != linkedDoors.end(); ++it)
+        {
+            reader.get(*it);
+        }
+    }
+
+    unsigned char island;
+    reader.get(island);
+    if (island)
+    {
+        Navigation::IslandInfo island2;
+        island2.load(reader);
+        islandInfo.push_back(island2); // Maybe don't use a vector for just one entry?
+    }
+    else if (flags == FLG_Island) // FIXME: debug only
+        std::cerr << "nvmi no island but has 0x20 flag" << std::endl;
+
+    reader.get(locationMarker);
+
+    reader.get(worldSpaceId);
+    //FLG_Tamriel    = 0x0000003c, // grid info follows, possibly Tamriel?
+    //FLG_Morrowind  = 0x01380000, // grid info follows, probably Skywind
+    if (worldSpaceId == 0x0000003c || worldSpaceId == 0x01380000)
+    {
+        reader.get(cellGrid.grid.y); // NOTE: reverse order
+        reader.get(cellGrid.grid.x);
+// FIXME: debugging only
+#if 0
+    std::string padding = "";
+    padding.insert(0, reader.stackSize()*2, ' ');
+    if (worldSpaceId == ESM4::FLG_Morrowind)
+        std::cout << padding << "NVMI MW: X " << std::dec << cellGrid.grid.x << ", Y " << cellGrid.grid.y << std::endl;
+    else
+        std::cout << padding << "NVMI SR: X " << std::dec << cellGrid.grid.x << ", Y " << cellGrid.grid.y << std::endl;
+#endif
+    }
+    else
+    {
+        reader.get(cellGrid.cellId);
+
+#if 0
+        if (worldSpaceId == 0) // interior
+            std::cout << "NVMI Interior: cellId " << std::hex << cellGrid.cellId << std::endl;
+        else
+            std::cout << "NVMI FormID: cellId " << std::hex << cellGrid.cellId << std::endl;
+#endif
+    }
+}
+
+// NVPP data seems to be organised this way (total is 0x64 = 100)
+//
+//  (0) total | 0x1 | formid (index 0) | count | formid's
+//  (1)                                | count | formid's
+//  (2)                                | count | formid's
+//  (3)                                | count | formid's
+//  (4)                                | count | formid's
+//  (5)                                | count | formid's
+//  (6)                                | count | formid's
+//  (7)                                | count | formid's
+//  (8)                                | count | formid's
+//  (9)                                | count | formid's
+// (10)       | 0x1 | formid (index 1) | count | formid's
+// (11)                                | count | formid's
+// (12)                                | count | formid's
+// (13)                                | count | formid's
+// (14)                                | count | formid's
+// (15)                                | count | formid's
+//  ...
+//
+// (88)                                | count | formid's
+// (89)                                | count | formid's
+//
+// Here the pattern changes (final count is 0xa = 10)
+//
+// (90)       | 0x1 | formid (index 9) | count | formid | index
+// (91)                                        | formid | index
+// (92)                                        | formid | index
+// (93)                                        | formid | index
+// (94)                                        | formid | index
+// (95)                                        | formid | index
+// (96)                                        | formid | index
+// (97)                                        | formid | index
+// (98)                                        | formid | index
+// (99)                                        | formid | index
+//
+// Note that the index values are not sequential, i.e. the first index value
+// (i.e. row 90) for Update.esm is 2.
+//
+// Also note that there's no list of formid's following the final node (index 9)
+//
+// The same 10 formids seem to be used for the indices, but not necessarily
+// with the same index value (but only Update.esm differs?)
+//
+// formid   cellid   X   Y Editor ID                   other formids in same X,Y    S U D D
+// -------- ------ --- --- --------------------------- ---------------------------- - - - -
+// 00079bbf 9639     5  -4 WhiterunExterior17          00079bc3                     0 6 0 0
+// 0010377b 8ed5     6  24 DawnstarWesternMineExterior                              1 1 1 1
+// 000a3f44 9577   -22   2 RoriksteadEdge                                           2 9 2 2
+// 00100f4b 8ea2    26  25 WinterholdExterior01        00100f4a, 00100f49           3 3 3 3
+// 00103120 bc8e    42 -22 (near Riften)                                            4 2 4 4
+// 00105e9a 929d   -18  24 SolitudeExterior03                                       5 0 5 5
+// 001030cb 7178   -40   1 SalviusFarmExterior01       (east of Markarth)           6 8 6 6
+// 00098776 980b     4 -19 HelgenExterior              000cce3d                     7 5 7 7
+// 000e88cc 93de    -9  14 (near Morthal)              0010519e, 0010519d, 000e88d2 8 7 8 8
+// 000b87df b51d    33   5 WindhelmAttackStart05                                    9 4 9 9
+//
+void ESM4::Navigation::load(ESM4::Reader& reader)
+{
+    //mFormId = reader.hdr().record.id;
+    //mFlags  = reader.hdr().record.flags;
+    std::uint32_t esmVer = reader.esmVersion();
+    bool isFONV = esmVer == ESM::VER_132 || esmVer == ESM::VER_133 || esmVer == ESM::VER_134;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: // seems to be unused?
+            {
+                if (!reader.getZString(mEditorId))
+                    throw std::runtime_error ("NAVI EDID data read error");
+                break;
+            }
+            case ESM4::SUB_NVPP:
+            {
+                std::uint32_t total;
+                std::uint32_t count;
+                reader.get(total);
+                if (!total)
+                {
+                    reader.get(count); // throw away
+                    break;
+                }
+
+                total -= 10; // HACK
+                std::uint32_t node;
+                for (std::uint32_t i = 0; i < total; ++i)
+                {
+                    std::vector<FormId> preferredPaths;
+                    reader.get(count);
+                    if (count == 1)
+                    {
+                        reader.get(node);
+                        reader.get(count);
+                    }
+                    if (count)
+                    {
+                        preferredPaths.resize(count);
+                        for (std::vector<FormId>::iterator it = preferredPaths.begin();
+                                it != preferredPaths.end(); ++it)
+                        {
+                            reader.get(*it);
+                        }
+                    }
+                    mPreferredPaths.push_back(std::make_pair(node, preferredPaths));
+#if 0
+                    std::cout << "node " << std::hex << node // FIXME: debugging only
+                        << ", count " << count << ", i " << std::dec << i << std::endl;
+#endif
+                }
+                reader.get(count);
+                assert(count == 1 && "expected separator");
+
+                reader.get(node); // HACK
+                std::vector<FormId> preferredPaths;
+                mPreferredPaths.push_back(std::make_pair(node, preferredPaths)); // empty
+#if 0
+                std::cout << "node " << std::hex << node // FIXME: debugging only
+                        << ", count " << 0 << std::endl;
+#endif
+
+                reader.get(count); // HACK
+                assert(count == 10 && "expected 0xa");
+                std::uint32_t index;
+                for (std::uint32_t i = 0; i < count; ++i)
+                {
+                    reader.get(node);
+                    reader.get(index);
+#if 0
+                    std::cout << "node " << std::hex << node // FIXME: debugging only
+                        << ", index " << index << ", i " << std::dec << total+i << std::endl;
+#endif
+                    //std::pair<std::map<FormId, std::uint32_t>::iterator, bool> res =
+                        mPathIndexMap.insert(std::make_pair(node, index));
+                    // FIXME: this throws if more than one file is being loaded
+                    //if (!res.second)
+                        //throw std::runtime_error ("node already exists in the preferred path index map");
+                }
+                break;
+            }
+            case ESM4::SUB_NVER:
+            {
+                std::uint32_t version; // always the same? (0x0c)
+                reader.get(version); // TODO: store this or use it for merging?
+                //std::cout << "NAVI version " << std::dec << version << std::endl;
+                break;
+            }
+            case ESM4::SUB_NVMI: // multiple
+            {
+                if (esmVer == ESM::VER_094 || esmVer == ESM::VER_170 || isFONV)
+                {
+                    reader.skipSubRecordData(); // FIXME: FO3/FONV have different form of NavMeshInfo
+                    break;
+                }
+
+                //std::cout << "\nNVMI start" << std::endl;
+                NavMeshInfo nvmi;
+                nvmi.load(reader);
+                mNavMeshInfo.push_back (nvmi);
+                break;
+            }
+            case ESM4::SUB_NVSI: // from Dawnguard onwards
+            case ESM4::SUB_NVCI: // FO3
+            {
+                reader.skipSubRecordData(); // FIXME:
+                break;
+            }
+            default:
+            {
+                throw std::runtime_error("ESM4::NAVI::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+            }
+        }
+    }
+}
+
+//void ESM4::Navigation::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Navigation::blank()
+//{
+//}
diff --git a/components/esm4/loadnavi.hpp b/components/esm4/loadnavi.hpp
new file mode 100644
index 0000000000..0db9650c4e
--- /dev/null
+++ b/components/esm4/loadnavi.hpp
@@ -0,0 +1,117 @@
+/*
+  Copyright (C) 2015-2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_NAVI_H
+#define ESM4_NAVI_H
+
+#include <cstdint>
+#include <vector>
+#include <map>
+
+#include "common.hpp" // CellGrid, Vertex
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Navigation
+    {
+#pragma pack(push,1)
+        struct DoorRef
+        {
+            std::uint32_t unknown;
+            FormId formId;
+        };
+
+        struct Triangle
+        {
+            std::uint16_t vertexIndex0;
+            std::uint16_t vertexIndex1;
+            std::uint16_t vertexIndex2;
+        };
+#pragma pack(pop)
+
+        struct IslandInfo
+        {
+            float minX;
+            float minY;
+            float minZ;
+            float maxX;
+            float maxY;
+            float maxZ;
+            std::vector<Triangle> triangles;
+            std::vector<Vertex> verticies;
+
+            void load(ESM4::Reader& reader);
+        };
+
+        enum Flags // NVMI island flags (not certain)
+        {
+            FLG_Island     = 0x00000020,
+            FLG_Modified   = 0x00000000, // not island
+            FLG_Unmodified = 0x00000040  // not island
+        };
+
+        struct NavMeshInfo
+        {
+            FormId formId;
+            std::uint32_t flags;
+            // center point of the navmesh
+            float x;
+            float y;
+            float z;
+            std::uint32_t flagPrefMerges;
+            std::vector<FormId> formIdMerged;
+            std::vector<FormId> formIdPrefMerged;
+            std::vector<DoorRef> linkedDoors;
+            std::vector<IslandInfo> islandInfo;
+            std::uint32_t locationMarker;
+            FormId worldSpaceId;
+            CellGrid cellGrid;
+
+            void load(ESM4::Reader& reader);
+        };
+
+        std::string mEditorId;
+
+        std::vector<NavMeshInfo> mNavMeshInfo;
+
+        std::vector<std::pair<std::uint32_t, std::vector<FormId> > > mPreferredPaths;
+
+        std::map<FormId, std::uint32_t> mPathIndexMap;
+
+        Navigation();
+        virtual ~Navigation();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_NAVI_H
diff --git a/components/esm4/loadnavm.cpp b/components/esm4/loadnavm.cpp
new file mode 100644
index 0000000000..1f3eebe434
--- /dev/null
+++ b/components/esm4/loadnavm.cpp
@@ -0,0 +1,270 @@
+/*
+  Copyright (C) 2015-2016, 2018, 2020-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadnavm.hpp"
+
+#include <stdexcept>
+#include <cassert>
+#include <cstring>
+
+#include <iostream> // FIXME: debugging only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::NavMesh::NavMesh() : mFormId(0), mFlags(0)
+{
+}
+
+ESM4::NavMesh::~NavMesh()
+{
+}
+
+void ESM4::NavMesh::NVNMstruct::load(ESM4::Reader& reader)
+{
+    //std::cout << "start: divisor " << std::dec << divisor << ", segments " << triSegments.size() << //std::endl;
+        //"this 0x" << this << std::endl; // FIXME
+
+    std::uint32_t count;
+
+    reader.get(unknownNVER);
+    reader.get(unknownLCTN);
+    reader.get(worldSpaceId);
+    //FLG_Tamriel    = 0x0000003c, // grid info follows, possibly Tamriel?
+    //FLG_Morrowind  = 0x01380000, // grid info follows, probably Skywind
+    if (worldSpaceId == 0x0000003c || worldSpaceId == 0x01380000)
+    {
+        //   ^
+        // Y |                   X Y Index
+        //     |                 0,0 0
+        //   1 |23               0,1 1
+        //   0 |01               1,0 2
+        //     +---              1,1 3
+        //      01 ->
+        //         X
+        //
+        // e.g. Dagonfel X:13,14,15,16 Y:43,44,45,46 (Morrowind X:7 Y:22)
+        //
+        // Skywind:   -4,-3 -2,-1 0,1 2,3 4,5 6,7
+        // Morrowind: -2    -1    0   1   2   3
+        //
+        // Formula seems to be floor(Skywind coord / 2) <cmath>
+        //
+        reader.get(cellGrid.grid.y); // NOTE: reverse order
+        reader.get(cellGrid.grid.x);
+// FIXME: debugging only
+#if 0
+        std::string padding = "";
+        padding.insert(0, reader.stackSize()*2, ' ');
+        if (worldSpaceId == ESM4::FLG_Morrowind)
+            std::cout << padding << "NVNM MW: X " << std::dec << cellGrid.grid.x << ", Y " << cellGrid.grid.y << std::endl;
+        else
+            std::cout << padding << "NVNM SR: X " << std::dec << cellGrid.grid.x << ", Y " << cellGrid.grid.y << std::endl;
+#endif
+    }
+    else
+    {
+        reader.get(cellGrid.cellId);
+
+#if 0
+        std::string padding = ""; // FIXME
+        padding.insert(0, reader.stackSize()*2, ' ');
+        if (worldSpaceId == 0) // interior
+            std::cout << padding << "NVNM Interior: cellId " << std::hex << cellGrid.cellId << std::endl;
+        else
+            std::cout << padding << "NVNM FormID: cellId " << std::hex << cellGrid.cellId << std::endl;
+#endif
+    }
+
+    reader.get(count); // numVerticies
+    if (count)
+    {
+        verticies.resize(count);
+        for (std::vector<Vertex>::iterator it = verticies.begin(); it != verticies.end(); ++it)
+        {
+            reader.get(*it);
+// FIXME: debugging only
+#if 0
+            //if (reader.hdr().record.id == 0x2004ecc) // FIXME
+            std::cout << "nvnm vert " << (*it).x << ", " << (*it).y << ", " << (*it).z << std::endl;
+#endif
+        }
+    }
+
+    reader.get(count); // numTriangles;
+    if (count)
+    {
+        triangles.resize(count);
+        for (std::vector<Triangle>::iterator it = triangles.begin(); it != triangles.end(); ++it)
+        {
+            reader.get(*it);
+        }
+    }
+
+    reader.get(count); // numExtConn;
+    if (count)
+    {
+        extConns.resize(count);
+        for (std::vector<ExtConnection>::iterator it = extConns.begin(); it != extConns.end(); ++it)
+        {
+            reader.get(*it);
+// FIXME: debugging only
+#if 0
+            std::cout << "nvnm ext 0x" << std::hex << (*it).navMesh << std::endl;
+#endif
+        }
+    }
+
+    reader.get(count); // numDoorTriangles;
+    if (count)
+    {
+        doorTriangles.resize(count);
+        for (std::vector<DoorTriangle>::iterator it = doorTriangles.begin(); it != doorTriangles.end(); ++it)
+        {
+            reader.get(*it);
+        }
+    }
+
+    reader.get(count); // numCoverTriangles;
+    if (count)
+    {
+        coverTriangles.resize(count);
+        for (std::vector<std::uint16_t>::iterator it = coverTriangles.begin(); it != coverTriangles.end(); ++it)
+        {
+            reader.get(*it);
+        }
+    }
+
+    // abs((maxX - minX) / divisor) = Max X Distance
+    reader.get(divisor); // FIXME: latest over-writes old
+
+    reader.get(maxXDist); // FIXME: update with formula
+    reader.get(maxYDist);
+    reader.get(minX); // FIXME: use std::min
+    reader.get(minY);
+    reader.get(minZ);
+    reader.get(maxX);
+    reader.get(maxY);
+    reader.get(maxZ);
+
+    // FIXME: should check remaining size here
+    // there are divisor^2 segments, each segment is a vector of triangle indices
+    for (unsigned int i = 0; i < divisor*divisor; ++i)
+    {
+        reader.get(count); // NOTE: count may be zero
+
+        std::vector<std::uint16_t> indices;
+        indices.resize(count);
+        for (std::vector<std::uint16_t>::iterator it = indices.begin(); it != indices.end(); ++it)
+        {
+            reader.get(*it);
+        }
+        triSegments.push_back(indices);
+    }
+    assert(triSegments.size() == divisor*divisor && "tiangle segments size is not the square of divisor");
+#if 0
+    if (triSegments.size() != divisor*divisor)
+        std::cout << "divisor " << std::dec << divisor << ", segments " << triSegments.size() << //std::endl;
+        "this 0x" << this << std::endl;
+#endif
+}
+
+void ESM4::NavMesh::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    mFlags  = reader.hdr().record.flags;
+
+    //std::cout << "NavMesh 0x" << std::hex << this << std::endl; // FIXME
+    std::uint32_t subSize = 0; // for XXXX sub record
+
+// FIXME: debugging only
+#if 0
+    std::string padding = "";
+    padding.insert(0, reader.stackSize()*2, ' ');
+    std::cout << padding << "NAVM flags 0x" << std::hex << reader.hdr().record.flags << std::endl;
+    std::cout << padding << "NAVM id 0x" << std::hex << reader.hdr().record.id << std::endl;
+#endif
+    while (reader.getSubRecordHeader())
+    {
+        switch (reader.subRecordHeader().typeId)
+        {
+            case ESM4::SUB_NVNM:
+            {
+                NVNMstruct nvnm;
+                nvnm.load(reader);
+                mData.push_back(nvnm); // FIXME try swap
+                break;
+            }
+            case ESM4::SUB_ONAM:
+            case ESM4::SUB_PNAM:
+            case ESM4::SUB_NNAM:
+            {
+                if (subSize)
+                {
+                    reader.skipSubRecordData(subSize); // special post XXXX
+                    reader.updateRecordRead(subSize); // WARNING: manual update
+                    subSize = 0;
+                }
+                else
+                    //const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+                    //std::cout << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                    reader.skipSubRecordData(); // FIXME: process the subrecord rather than skip
+
+                break;
+            }
+            case ESM4::SUB_XXXX:
+            {
+                reader.get(subSize);
+                break;
+            }
+            case ESM4::SUB_NVER: // FO3
+            case ESM4::SUB_DATA: // FO3
+            case ESM4::SUB_NVVX: // FO3
+            case ESM4::SUB_NVTR: // FO3
+            case ESM4::SUB_NVCA: // FO3
+            case ESM4::SUB_NVDP: // FO3
+            case ESM4::SUB_NVGD: // FO3
+            case ESM4::SUB_NVEX: // FO3
+            case ESM4::SUB_EDID: // FO3
+            {
+                reader.skipSubRecordData(); // FIXME:
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::NAVM::load - Unknown subrecord " +
+                                          ESM::printName(reader.subRecordHeader().typeId));
+        }
+    }
+    //std::cout << "num nvnm " << std::dec << mData.size() << std::endl; // FIXME
+}
+
+//void ESM4::NavMesh::save(ESM4::Writer& writer) const
+//{
+//}
+
+void ESM4::NavMesh::blank()
+{
+}
diff --git a/components/esm4/loadnavm.hpp b/components/esm4/loadnavm.hpp
new file mode 100644
index 0000000000..f5fb9b5e20
--- /dev/null
+++ b/components/esm4/loadnavm.hpp
@@ -0,0 +1,112 @@
+/*
+  Copyright (C) 2015, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_NAVM_H
+#define ESM4_NAVM_H
+
+#include <cstdint>
+#include <vector>
+
+#include "common.hpp" // CellGrid, Vertex
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct NavMesh
+    {
+#pragma pack(push,1)
+        struct Triangle
+        {
+            std::uint16_t vertexIndex0;
+            std::uint16_t vertexIndex1;
+            std::uint16_t vertexIndex2;
+            std::uint16_t edge0;
+            std::uint16_t edge1;
+            std::uint16_t edge2;
+            std::uint16_t coverMarker;
+            std::uint16_t coverFlags;
+        };
+
+        struct ExtConnection
+        {
+            std::uint32_t unknown;
+            FormId        navMesh;
+            std::uint16_t triangleIndex;
+        };
+
+        struct DoorTriangle
+        {
+            std::uint16_t triangleIndex;
+            std::uint32_t unknown;
+            FormId        doorRef;
+        };
+#pragma pack(pop)
+
+        struct NVNMstruct
+        {
+            std::uint32_t unknownNVER;
+            std::uint32_t unknownLCTN;
+            FormId        worldSpaceId;
+            CellGrid cellGrid;
+            std::vector<Vertex>        verticies;
+            std::vector<Triangle>      triangles;
+            std::vector<ExtConnection> extConns;
+            std::vector<DoorTriangle>  doorTriangles;
+            std::vector<std::uint16_t> coverTriangles;
+            std::uint32_t divisor;
+            float maxXDist;
+            float maxYDist;
+            float minX;
+            float minY;
+            float minZ;
+            float maxX;
+            float maxY;
+            float maxZ;
+            // there are divisor^2 segments, each segment is a vector of triangle indices
+            std::vector<std::vector<std::uint16_t> >  triSegments;
+
+            void load(ESM4::Reader& esm);
+        };
+
+        std::vector<NVNMstruct> mData; // Up to 4 skywind cells in one Morrowind cell
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        NavMesh();
+        virtual ~NavMesh();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        void blank();
+    };
+
+}
+
+#endif // ESM4_NAVM_H
diff --git a/components/esm4/loadnote.cpp b/components/esm4/loadnote.cpp
new file mode 100644
index 0000000000..ee897258b7
--- /dev/null
+++ b/components/esm4/loadnote.cpp
@@ -0,0 +1,86 @@
+/*
+  Copyright (C) 2019-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadnote.hpp"
+
+#include <stdexcept>
+//#include <iostream> // FIXME: testing only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Note::Note() : mFormId(0), mFlags(0)
+{
+    mEditorId.clear();
+    mFullName.clear();
+    mModel.clear();
+    mIcon.clear();
+}
+
+ESM4::Note::~Note()
+{
+}
+
+void ESM4::Note::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_MODL: reader.getZString(mModel); break;
+            case ESM4::SUB_ICON: reader.getZString(mIcon); break;
+            case ESM4::SUB_DATA:
+            case ESM4::SUB_MODB:
+            case ESM4::SUB_ONAM:
+            case ESM4::SUB_SNAM:
+            case ESM4::SUB_TNAM:
+            case ESM4::SUB_XNAM:
+            case ESM4::SUB_OBND:
+            {
+                //std::cout << "NOTE " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::NOTE::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Note::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Note::blank()
+//{
+//}
diff --git a/components/esm4/loadnote.hpp b/components/esm4/loadnote.hpp
new file mode 100644
index 0000000000..1ba9bfec24
--- /dev/null
+++ b/components/esm4/loadnote.hpp
@@ -0,0 +1,60 @@
+/*
+  Copyright (C) 2019, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_NOTE_H
+#define ESM4_NOTE_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Note
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mFullName;
+        std::string mModel;
+        std::string mIcon;
+
+        Note();
+        virtual ~Note();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_NOTE_H
diff --git a/components/esm4/loadnpc.cpp b/components/esm4/loadnpc.cpp
new file mode 100644
index 0000000000..e32ee6e90d
--- /dev/null
+++ b/components/esm4/loadnpc.cpp
@@ -0,0 +1,333 @@
+/*
+  Copyright (C) 2016-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadnpc.hpp"
+
+#include <stdexcept>
+#include <cstring>
+#include <string> // getline
+#include <iostream> // NOTE: for testing only
+#include <sstream> // NOTE: for testing only
+#include <iomanip>  // NOTE: for testing only
+
+//#include <boost/iostreams/filtering_streambuf.hpp>
+//#include <boost/iostreams/copy.hpp>
+#include <boost/scoped_array.hpp>
+
+#include "formid.hpp" // NOTE: for testing only
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Npc::Npc() : mFormId(0), mFlags(0), mIsTES4(false), mIsFONV(false), mRace(0), mClass(0), mHair(0),
+                   mEyes(0), mHairLength(0.f), mHairColourId(0), mDeathItem(0),
+                   mScriptId(0), mCombatStyle(0), mSoundBase(0), mSound(0), mSoundChance(0),
+                   mFootWeight(0.f), mBoundRadius(0.f), mBaseTemplate(0), mWornArmor(0),
+                   mDefaultOutfit(0), mSleepOutfit(0), mDefaultPkg(0), mFgRace(0)
+{
+    mEditorId.clear();
+    mFullName.clear();
+    mModel.clear();
+
+    mHairColour.red = 0;
+    mHairColour.green = 0;
+    mHairColour.blue = 0;
+    mHairColour.custom = 0;
+
+    std::memset(&mAIData, 0, sizeof(AIData));
+    std::memset(&mData, 0, sizeof(Data));
+    std::memset(&mBaseConfig, 0, sizeof(ActorBaseConfig));
+    std::memset(&mFaction, 0, sizeof(ActorFaction));
+}
+
+ESM4::Npc::~Npc()
+{
+}
+
+void ESM4::Npc::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    std::uint32_t esmVer = reader.esmVersion();
+    mIsTES4 = esmVer == ESM::VER_080 || esmVer == ESM::VER_100;
+    mIsFONV = esmVer == ESM::VER_132 || esmVer == ESM::VER_133 || esmVer == ESM::VER_134;
+    //mIsTES5 = esmVer == ESM::VER_094 || esmVer == ESM::VER_170; // WARN: FO3 is also VER_094
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_MODL: reader.getZString(mModel);    break; // not for TES5, see Race
+            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_CNTO:
+            {
+                static InventoryItem inv; // FIXME: use unique_ptr here?
+                reader.get(inv);
+                reader.adjustFormId(inv.item);
+                mInventory.push_back(inv);
+                break;
+            }
+            case ESM4::SUB_SPLO:
+            {
+                FormId id;
+                reader.getFormId(id);
+                mSpell.push_back(id);
+                break;
+            }
+            case ESM4::SUB_PKID:
+            {
+                FormId id;
+                reader.getFormId(id);
+                mAIPackages.push_back(id);
+                break;
+            }
+            case ESM4::SUB_SNAM:
+            {
+                reader.get(mFaction);
+                reader.adjustFormId(mFaction.faction);
+                break;
+            }
+            case ESM4::SUB_RNAM: reader.getFormId(mRace);      break;
+            case ESM4::SUB_CNAM: reader.getFormId(mClass);     break;
+            case ESM4::SUB_HNAM: reader.getFormId(mHair);      break; // not for TES5
+            case ESM4::SUB_ENAM: reader.getFormId(mEyes);      break;
+            //
+            case ESM4::SUB_INAM: reader.getFormId(mDeathItem); break;
+            case ESM4::SUB_SCRI: reader.getFormId(mScriptId);    break;
+            //
+            case ESM4::SUB_AIDT:
+            {
+                if (esmVer == ESM::VER_094 || esmVer == ESM::VER_170 || mIsFONV)
+                {
+                    reader.skipSubRecordData(); // FIXME: process the subrecord rather than skip
+                    break;
+                }
+
+                reader.get(mAIData); // TES4
+                break;
+            }
+            case ESM4::SUB_ACBS:
+            {
+                //if (esmVer == ESM::VER_094 || esmVer == ESM::VER_170 || mIsFONV)
+                if (subHdr.dataSize == 24)
+                    reader.get(mBaseConfig);
+                else
+                    reader.get(&mBaseConfig, 16); // TES4
+
+                break;
+            }
+            case ESM4::SUB_DATA:
+            {
+                if (esmVer == ESM::VER_094 || esmVer == ESM::VER_170 || mIsFONV)
+                {
+                    if (subHdr.dataSize != 0) // FIXME FO3
+                        reader.skipSubRecordData();
+                    break; // zero length
+                }
+
+                reader.get(&mData, 33); // FIXME: check packing
+                break;
+            }
+            case ESM4::SUB_ZNAM: reader.getFormId(mCombatStyle); break;
+            case ESM4::SUB_CSCR: reader.getFormId(mSoundBase);   break;
+            case ESM4::SUB_CSDI: reader.getFormId(mSound);       break;
+            case ESM4::SUB_CSDC: reader.get(mSoundChance); break;
+            case ESM4::SUB_WNAM:
+            {
+                if (reader.esmVersion() == ESM::VER_094 || reader.esmVersion() == ESM::VER_170)
+                    reader.get(mWornArmor);
+                else
+                    reader.get(mFootWeight);
+                break;
+            }
+            case ESM4::SUB_MODB: reader.get(mBoundRadius); break;
+            case ESM4::SUB_KFFZ:
+            {
+                std::string str;
+                if (!reader.getZString(str))
+                    throw std::runtime_error ("NPC_ KFFZ data read error");
+
+                // Seems to be only below 3, and only happens 3 times while loading TES4:
+                //   Forward_SheogorathWithCane.kf
+                //   TurnLeft_SheogorathWithCane.kf
+                //   TurnRight_SheogorathWithCane.kf
+                std::stringstream ss(str);
+                std::string file;
+                while (std::getline(ss, file, '\0')) // split the strings
+                    mKf.push_back(file);
+
+                break;
+            }
+            case ESM4::SUB_LNAM: reader.get(mHairLength); break;
+            case ESM4::SUB_HCLR:
+            {
+                reader.get(mHairColour.red);
+                reader.get(mHairColour.green);
+                reader.get(mHairColour.blue);
+                reader.get(mHairColour.custom);
+
+                break;
+            }
+            case ESM4::SUB_TPLT: reader.get(mBaseTemplate); break;
+            case ESM4::SUB_FGGS:
+            {
+                mSymShapeModeCoefficients.resize(50);
+                for (std::size_t i = 0; i < 50; ++i)
+                    reader.get(mSymShapeModeCoefficients.at(i));
+
+                break;
+            }
+            case ESM4::SUB_FGGA:
+            {
+                mAsymShapeModeCoefficients.resize(30);
+                for (std::size_t i = 0; i < 30; ++i)
+                    reader.get(mAsymShapeModeCoefficients.at(i));
+
+                break;
+            }
+            case ESM4::SUB_FGTS:
+            {
+                mSymTextureModeCoefficients.resize(50);
+                for (std::size_t i = 0; i < 50; ++i)
+                    reader.get(mSymTextureModeCoefficients.at(i));
+
+                break;
+            }
+            case ESM4::SUB_FNAM:
+            {
+                reader.get(mFgRace);
+                //std::cout << "race " << mEditorId << " " << mRace << std::endl; // FIXME
+                //std::cout << "fg race " << mEditorId << " " << mFgRace << std::endl; // FIXME
+                break;
+            }
+            case ESM4::SUB_PNAM: // FO3/FONV/TES5
+            {
+                FormId headPart;
+                reader.getFormId(headPart);
+                mHeadParts.push_back(headPart);
+
+                break;
+            }
+            case ESM4::SUB_HCLF: // TES5 hair colour
+            {
+                reader.getFormId(mHairColourId);
+
+                break;
+            }
+            case ESM4::SUB_COCT: // TES5
+            {
+                std::uint32_t count;
+                reader.get(count);
+
+                break;
+            }
+            case ESM4::SUB_DOFT: reader.getFormId(mDefaultOutfit); break;
+            case ESM4::SUB_SOFT: reader.getFormId(mSleepOutfit); break;
+            case ESM4::SUB_DPLT: reader.getFormId(mDefaultPkg); break; // AI package list
+            case ESM4::SUB_DEST:
+            case ESM4::SUB_DSTD:
+            case ESM4::SUB_DSTF:
+            {
+#if 1
+                boost::scoped_array<unsigned char> dataBuf(new unsigned char[subHdr.dataSize]);
+                reader.get(&dataBuf[0], subHdr.dataSize);
+
+                std::ostringstream ss;
+                ss << mEditorId << " " << ESM::printName(subHdr.typeId) << ":size " << subHdr.dataSize << "\n";
+                for (std::size_t i = 0; i < subHdr.dataSize; ++i)
+                {
+                    if (dataBuf[i] > 64 && dataBuf[i] < 91) // looks like printable ascii char
+                        ss << (char)(dataBuf[i]) << " ";
+                    else
+                        ss << std::setfill('0') << std::setw(2) << std::hex << (int)(dataBuf[i]);
+                    if ((i & 0x000f) == 0xf) // wrap around
+                        ss << "\n";
+                    else if (i < (size_t)(subHdr.dataSize-1)) // quiesce gcc
+                        ss << " ";
+                }
+                std::cout << ss.str() << std::endl;
+#else
+                //std::cout << "NPC_ " << ESM::printName(subHdr.typeId) << " skipping..."
+                          //<< subHdr.dataSize << std::endl;
+                reader.skipSubRecordData();
+#endif
+                break;
+            }
+            case ESM4::SUB_NAM6: // height mult
+            case ESM4::SUB_NAM7: // weight mult
+            case ESM4::SUB_ATKR:
+            case ESM4::SUB_CRIF:
+            case ESM4::SUB_CSDT:
+            case ESM4::SUB_DNAM:
+            case ESM4::SUB_ECOR:
+            case ESM4::SUB_ANAM:
+            case ESM4::SUB_ATKD:
+            case ESM4::SUB_ATKE:
+            case ESM4::SUB_FTST:
+            case ESM4::SUB_KSIZ:
+            case ESM4::SUB_KWDA:
+            case ESM4::SUB_NAM5:
+            case ESM4::SUB_NAM8:
+            case ESM4::SUB_NAM9:
+            case ESM4::SUB_NAMA:
+            case ESM4::SUB_OBND:
+            case ESM4::SUB_PRKR:
+            case ESM4::SUB_PRKZ:
+            case ESM4::SUB_QNAM:
+            case ESM4::SUB_SPCT:
+            case ESM4::SUB_TIAS:
+            case ESM4::SUB_TINC:
+            case ESM4::SUB_TINI:
+            case ESM4::SUB_TINV:
+            case ESM4::SUB_VMAD:
+            case ESM4::SUB_VTCK:
+            case ESM4::SUB_GNAM:
+            case ESM4::SUB_SHRT:
+            case ESM4::SUB_SPOR:
+            case ESM4::SUB_EAMT: // FO3
+            case ESM4::SUB_NAM4: // FO3
+            case ESM4::SUB_COED: // FO3
+            {
+                //std::cout << "NPC_ " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::NPC_::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Npc::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Npc::blank()
+//{
+//}
diff --git a/components/esm4/loadnpc.hpp b/components/esm4/loadnpc.hpp
new file mode 100644
index 0000000000..d30ca5f14f
--- /dev/null
+++ b/components/esm4/loadnpc.hpp
@@ -0,0 +1,230 @@
+/*
+  Copyright (C) 2016, 2018-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_NPC__H
+#define ESM4_NPC__H
+
+#include <cstdint>
+#include <string>
+#include <vector>
+
+#include "actor.hpp"
+#include "inventory.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Npc
+    {
+        enum ACBS_TES4
+        {
+            TES4_Female         = 0x000001,
+            TES4_Essential      = 0x000002,
+            TES4_Respawn        = 0x000008,
+            TES4_AutoCalcStats  = 0x000010,
+            TES4_PCLevelOffset  = 0x000080,
+            TES4_NoLowLevelProc = 0x000200,
+            TES4_NoRumors       = 0x002000,
+            TES4_Summonable     = 0x004000,
+            TES4_NoPersuasion   = 0x008000, // different meaning to crea
+            TES4_CanCorpseCheck = 0x100000  // opposite of crea
+        };
+
+        enum ACBS_FO3
+        {
+            FO3_Female         = 0x00000001,
+            FO3_Essential      = 0x00000002,
+            FO3_PresetFace     = 0x00000004, // Is CharGen Face Preset
+            FO3_Respawn        = 0x00000008,
+            FO3_AutoCalcStats  = 0x00000010,
+            FO3_PCLevelMult    = 0x00000080,
+            FO3_UseTemplate    = 0x00000100,
+            FO3_NoLowLevelProc = 0x00000200,
+            FO3_NoBloodSpray   = 0x00000800,
+            FO3_NoBloodDecal   = 0x00001000,
+            FO3_NoVATSMelee    = 0x00100000,
+            FO3_AnyRace        = 0x00400000,
+            FO3_AutoCalcServ   = 0x00800000,
+            FO3_NoKnockdown    = 0x04000000,
+            FO3_NotPushable    = 0x08000000,
+            FO3_NoRotateHead   = 0x40000000
+        };
+
+        enum ACBS_TES5
+        {
+            TES5_Female         = 0x00000001,
+            TES5_Essential      = 0x00000002,
+            TES5_PresetFace     = 0x00000004, // Is CharGen Face Preset
+            TES5_Respawn        = 0x00000008,
+            TES5_AutoCalcStats  = 0x00000010,
+            TES5_Unique         = 0x00000020,
+            TES5_NoStealth      = 0x00000040, // Doesn't affect stealth meter
+            TES5_PCLevelMult    = 0x00000080,
+          //TES5_Unknown        = 0x00000100, // Audio template?
+            TES5_Protected      = 0x00000800,
+            TES5_Summonable     = 0x00004000,
+            TES5_NoBleeding     = 0x00010000,
+            TES5_Owned          = 0x00040000, // owned/follow? (Horses, Atronachs, NOT Shadowmere)
+            TES5_GenderAnim     = 0x00080000, // Opposite Gender Anims
+            TES5_SimpleActor    = 0x00100000,
+            TES5_LoopedScript   = 0x00200000, // AAvenicci, Arcadia, Silvia, Afflicted, TortureVictims
+            TES5_LoopedAudio    = 0x10000000, // AAvenicci, Arcadia, Silvia, DA02 Cultists, Afflicted, TortureVictims
+            TES5_IsGhost        = 0x20000000, // Ghost/non-interactable (Ghosts, Nocturnal)
+            TES5_Invulnerable   = 0x80000000
+        };
+
+        enum Template_Flags
+        {
+            TES5_UseTraits    = 0x0001, // Destructible Object; Traits tab, including race, gender, height, weight,
+                                        // voice type, death item; Sounds tab; Animation tab; Character Gen tabs
+            TES5_UseStats     = 0x0002, // Stats tab, including level, autocalc, skills, health/magicka/stamina,
+                                        // speed, bleedout, class
+            TES5_UseFactions  = 0x0004, // both factions and assigned crime faction
+            TES5_UseSpellList = 0x0008, // both spells and perks
+            TES5_UseAIData    = 0x0010, // AI Data tab, including aggression/confidence/morality, combat style and
+                                        // gift filter
+            TES5_UseAIPackage = 0x0020, // only the basic Packages listed on the AI Packages tab;
+                                        // rest of tab controlled by Def Pack List
+            TES5_UseBaseData  = 0x0080, // including name and short name, and flags for Essential, Protected,
+                                        // Respawn, Summonable, Simple Actor, and Doesn't affect stealth meter
+            TES5_UseInventory = 0x0100, // Inventory tab, including all outfits and geared-up item
+                                        // -- but not death item
+            TES5_UseScript    = 0x0200,
+            TES5_UseDefined   = 0x0400, // Def Pack List (the dropdown-selected package lists on the AI Packages tab)
+            TES5_UseAtkData   = 0x0800, // Attack Data tab, including override from behavior graph race,
+                                        // events, and data)
+            TES5_UseKeywords  = 0x1000
+        };
+
+#pragma pack(push, 1)
+        struct SkillValues
+        {
+            std::uint8_t  armorer;
+            std::uint8_t  athletics;
+            std::uint8_t  blade;
+            std::uint8_t  block;
+            std::uint8_t  blunt;
+            std::uint8_t  handToHand;
+            std::uint8_t  heavyArmor;
+            std::uint8_t  alchemy;
+            std::uint8_t  alteration;
+            std::uint8_t  conjuration;
+            std::uint8_t  destruction;
+            std::uint8_t  illusion;
+            std::uint8_t  mysticism;
+            std::uint8_t  restoration;
+            std::uint8_t  acrobatics;
+            std::uint8_t  lightArmor;
+            std::uint8_t  marksman;
+            std::uint8_t  mercantile;
+            std::uint8_t  security;
+            std::uint8_t  sneak;
+            std::uint8_t  speechcraft;
+        };
+
+        struct HairColour
+        {
+            std::uint8_t red;
+            std::uint8_t green;
+            std::uint8_t blue;
+            std::uint8_t custom; // alpha?
+        };
+
+        struct Data
+        {
+            SkillValues   skills;
+            std::uint32_t health;
+            AttributeValues attribs;
+        };
+
+#pragma pack(pop)
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        bool mIsTES4;
+        bool mIsFONV;
+
+        std::string mEditorId;
+        std::string mFullName;
+        std::string mModel;  // skeleton model (can be a marker in FO3/FONV)
+
+        FormId mRace;
+        FormId mClass;
+        FormId mHair; // not for TES5, see mHeadParts
+        FormId mEyes;
+
+        std::vector<FormId> mHeadParts; // FO3/FONV/TES5
+
+        float mHairLength;
+        HairColour mHairColour; // TES4/FO3/FONV
+        FormId mHairColourId; // TES5
+
+        FormId mDeathItem;
+        std::vector<FormId> mSpell;
+        FormId mScriptId;
+
+        AIData mAIData;
+        std::vector<FormId> mAIPackages; // seems to be in priority order, 0 = highest priority
+        ActorBaseConfig mBaseConfig; // union
+        ActorFaction mFaction;
+        Data   mData;
+        FormId mCombatStyle;
+        FormId mSoundBase;
+        FormId mSound;
+        std::uint8_t mSoundChance;
+        float mFootWeight;
+
+        float mBoundRadius;
+        std::vector<std::string> mKf; // filenames only, get directory path from mModel
+
+        std::vector<InventoryItem> mInventory;
+
+        FormId mBaseTemplate; // FO3/FONV/TES5
+        FormId mWornArmor;    // TES5 only?
+
+        FormId mDefaultOutfit; // TES5 OTFT
+        FormId mSleepOutfit;   // TES5 OTFT
+        FormId mDefaultPkg;
+
+        std::vector<float> mSymShapeModeCoefficients;    // size 0 or 50
+        std::vector<float> mAsymShapeModeCoefficients;   // size 0 or 30
+        std::vector<float> mSymTextureModeCoefficients;  // size 0 or 50
+        std::int16_t mFgRace;
+
+        Npc();
+        virtual ~Npc();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_NPC__H
diff --git a/components/esm4/loadotft.cpp b/components/esm4/loadotft.cpp
new file mode 100644
index 0000000000..dec2a05666
--- /dev/null
+++ b/components/esm4/loadotft.cpp
@@ -0,0 +1,84 @@
+/*
+  Copyright (C) 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadotft.hpp"
+
+#include <stdexcept>
+//#include <iostream> // FIXME: for debugging only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Outfit::Outfit() : mFormId(0), mFlags(0)
+{
+    mEditorId.clear();
+}
+
+ESM4::Outfit::~Outfit()
+{
+}
+
+void ESM4::Outfit::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId);  break;
+            case ESM4::SUB_INAM:
+            {
+                std::size_t numObj = subHdr.dataSize / sizeof(FormId);
+                for (std::size_t i = 0; i < numObj; ++i)
+                {
+                    FormId formId;
+                    reader.getFormId(formId);
+
+                    mInventory.push_back(formId);
+                }
+
+                break;
+            }
+            default:
+                //std::cout << "OTFT " << ESM::printName(subHdr.typeId) << " skipping..."
+                          //<< subHdr.dataSize << std::endl;
+                //reader.skipSubRecordData();
+                throw std::runtime_error("ESM4::OTFT::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Outfit::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Outfit::blank()
+//{
+//}
diff --git a/components/esm4/loadotft.hpp b/components/esm4/loadotft.hpp
new file mode 100644
index 0000000000..3b1db34d0e
--- /dev/null
+++ b/components/esm4/loadotft.hpp
@@ -0,0 +1,60 @@
+/*
+  Copyright (C) 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_OTFT_H
+#define ESM4_OTFT_H
+
+#include <cstdint>
+#include <string>
+#include <vector>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Outfit
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+
+        std::vector<FormId> mInventory;
+
+        Outfit();
+        virtual ~Outfit();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_OTFT_H
diff --git a/components/esm4/loadpack.cpp b/components/esm4/loadpack.cpp
new file mode 100644
index 0000000000..241147df00
--- /dev/null
+++ b/components/esm4/loadpack.cpp
@@ -0,0 +1,200 @@
+/*
+  Copyright (C) 2020-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadpack.hpp"
+
+#include <stdexcept>
+#include <cstring>
+//#include <iostream> // FIXME: for debugging only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::AIPackage::AIPackage() : mFormId(0), mFlags(0)
+{
+    mEditorId.clear();
+
+    std::memset(&mData, 0, sizeof(PKDT));
+    std::memset(&mSchedule, 0, sizeof(PSDT));
+    std::memset(&mLocation, 0, sizeof(PLDT));
+    mLocation.type = 0xff; // default to indicate no location data
+    std::memset(&mTarget, 0, sizeof(PTDT));
+    mTarget.type = 0xff;   // default to indicate no target data
+
+    mConditions.clear();
+}
+
+ESM4::AIPackage::~AIPackage()
+{
+}
+
+void ESM4::AIPackage::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_PKDT:
+            {
+                if (subHdr.dataSize != sizeof(PKDT) && subHdr.dataSize == 4)
+                {
+                    //std::cout << "skip fallout" << mEditorId << std::endl; // FIXME
+                    reader.get(mData.flags);
+                    mData.type = 0; // FIXME
+                }
+                else if (subHdr.dataSize != sizeof(mData))
+                    reader.skipSubRecordData(); // FIXME: FO3
+                else
+                    reader.get(mData);
+
+                break;
+            }
+            case ESM4::SUB_PSDT: //reader.get(mSchedule); break;
+            {
+                if (subHdr.dataSize != sizeof(mSchedule))
+                    reader.skipSubRecordData(); // FIXME:
+                else
+                    reader.get(mSchedule); // TES4
+
+                break;
+            }
+            case ESM4::SUB_PLDT:
+            {
+                if (subHdr.dataSize != sizeof(mLocation))
+                    reader.skipSubRecordData(); // FIXME:
+                else
+                {
+                    reader.get(mLocation); // TES4
+                    if (mLocation.type != 5)
+                        reader.adjustFormId(mLocation.location);
+                }
+
+                break;
+            }
+            case ESM4::SUB_PTDT:
+            {
+                if (subHdr.dataSize != sizeof(mTarget))
+                    reader.skipSubRecordData(); // FIXME: FO3
+                else
+                {
+                    reader.get(mTarget); // TES4
+                    if (mLocation.type != 2)
+                        reader.adjustFormId(mTarget.target);
+                }
+
+                break;
+            }
+            case ESM4::SUB_CTDA:
+            {
+                if (subHdr.dataSize != sizeof(CTDA))
+                {
+                    reader.skipSubRecordData(); // FIXME: FO3
+                    break;
+                }
+
+                static CTDA condition;
+                reader.get(condition);
+                // FIXME: how to "unadjust" if not FormId?
+                //adjustFormId(condition.param1);
+                //adjustFormId(condition.param2);
+                mConditions.push_back(condition);
+
+                break;
+            }
+            case ESM4::SUB_CTDT: // always 20 for TES4
+            case ESM4::SUB_TNAM: // FO3
+            case ESM4::SUB_INAM: // FO3
+            case ESM4::SUB_CNAM: // FO3
+            case ESM4::SUB_SCHR: // FO3
+            case ESM4::SUB_POBA: // FO3
+            case ESM4::SUB_POCA: // FO3
+            case ESM4::SUB_POEA: // FO3
+            case ESM4::SUB_SCTX: // FO3
+            case ESM4::SUB_SCDA: // FO3
+            case ESM4::SUB_SCRO: // FO3
+            case ESM4::SUB_IDLA: // FO3
+            case ESM4::SUB_IDLC: // FO3
+            case ESM4::SUB_IDLF: // FO3
+            case ESM4::SUB_IDLT: // FO3
+            case ESM4::SUB_PKDD: // FO3
+            case ESM4::SUB_PKD2: // FO3
+            case ESM4::SUB_PKPT: // FO3
+            case ESM4::SUB_PKED: // FO3
+            case ESM4::SUB_PKE2: // FO3
+            case ESM4::SUB_PKAM: // FO3
+            case ESM4::SUB_PUID: // FO3
+            case ESM4::SUB_PKW3: // FO3
+            case ESM4::SUB_PTD2: // FO3
+            case ESM4::SUB_PLD2: // FO3
+            case ESM4::SUB_PKFD: // FO3
+            case ESM4::SUB_SLSD: // FO3
+            case ESM4::SUB_SCVR: // FO3
+            case ESM4::SUB_SCRV: // FO3
+            case ESM4::SUB_IDLB: // FO3
+            case ESM4::SUB_ANAM: // TES5
+            case ESM4::SUB_BNAM: // TES5
+            case ESM4::SUB_FNAM: // TES5
+            case ESM4::SUB_PNAM: // TES5
+            case ESM4::SUB_QNAM: // TES5
+            case ESM4::SUB_UNAM: // TES5
+            case ESM4::SUB_XNAM: // TES5
+            case ESM4::SUB_PDTO: // TES5
+            case ESM4::SUB_PTDA: // TES5
+            case ESM4::SUB_PFOR: // TES5
+            case ESM4::SUB_PFO2: // TES5
+            case ESM4::SUB_PRCB: // TES5
+            case ESM4::SUB_PKCU: // TES5
+            case ESM4::SUB_PKC2: // TES5
+            case ESM4::SUB_CITC: // TES5
+            case ESM4::SUB_CIS1: // TES5
+            case ESM4::SUB_CIS2: // TES5
+            case ESM4::SUB_VMAD: // TES5
+            case ESM4::SUB_TPIC: // TES5
+            {
+                //std::cout << "PACK " << ESM::printName(subHdr.typeId) << " skipping..."
+                        //<< subHdr.dataSize << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::PACK::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::AIPackage::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::AIPackage::blank()
+//{
+//}
diff --git a/components/esm4/loadpack.hpp b/components/esm4/loadpack.hpp
new file mode 100644
index 0000000000..93a9a8290c
--- /dev/null
+++ b/components/esm4/loadpack.hpp
@@ -0,0 +1,110 @@
+/*
+  Copyright (C) 2020-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_PACK_H
+#define ESM4_PACK_H
+
+#include <cstdint>
+#include <string>
+#include <vector>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct AIPackage
+    {
+#pragma pack(push, 1)
+        struct PKDT // data
+        {
+            std::uint32_t flags;
+            std::int32_t  type;
+        };
+
+        struct PSDT // schedule
+        {
+            std::uint8_t month;      // Any = 0xff
+            std::uint8_t dayOfWeek;  // Any = 0xff
+            std::uint8_t date;       // Any = 0
+            std::uint8_t time;       // Any = 0xff
+            std::uint32_t duration;
+        };
+
+        struct PLDT // location
+        {
+            std::int32_t type; // 0 = near ref, 1 = in cell, 2 = current loc, 3 = editor loc, 4 = obj id, 5 = obj type
+            FormId location;   // uint32_t if type = 5
+            std::int32_t radius;
+        };
+
+        struct PTDT // target
+        {
+            std::int32_t type; // 0 = specific ref, 1 = obj id, 2 = obj type
+            FormId target;   // uint32_t if type = 2
+            std::int32_t distance;
+        };
+
+        // NOTE: param1/param2 can be FormId or number, but assume FormId so that adjustFormId
+        // can be called
+        struct CTDA
+        {
+            std::uint8_t condition;
+            std::uint8_t unknown1; // probably padding
+            std::uint8_t unknown2; // probably padding
+            std::uint8_t unknown3; // probably padding
+            float compValue;
+            std::int32_t fnIndex;
+            FormId param1;
+            FormId param2;
+            std::uint32_t unknown4; // probably padding
+        };
+#pragma pack(pop)
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+
+        PKDT mData;
+        PSDT mSchedule;
+        PLDT mLocation;
+        PTDT mTarget;
+        std::vector<CTDA> mConditions;
+
+        AIPackage();
+        virtual ~AIPackage();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_PACK_H
diff --git a/components/esm4/loadpgrd.cpp b/components/esm4/loadpgrd.cpp
new file mode 100644
index 0000000000..a0bfc9b119
--- /dev/null
+++ b/components/esm4/loadpgrd.cpp
@@ -0,0 +1,177 @@
+/*
+  Copyright (C) 2020-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadpgrd.hpp"
+
+#include <stdexcept>
+//#include <iostream> // FIXME: for debugging only
+//#include <iomanip>  // FIXME: for debugging only
+
+//#include <boost/scoped_array.hpp> // FIXME for debugging only
+
+#include "formid.hpp" // FIXME: for mEditorId workaround
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Pathgrid::Pathgrid() : mFormId(0), mFlags(0), mData(0)
+{
+    mEditorId.clear();
+
+    mNodes.clear();
+    mLinks.clear();
+    mForeign.clear();
+    mObjects.clear();
+}
+
+ESM4::Pathgrid::~Pathgrid()
+{
+}
+
+void ESM4::Pathgrid::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    mEditorId = formIdToString(mFormId); // FIXME: quick workaround to use existing code
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_DATA: reader.get(mData); break;
+            case ESM4::SUB_PGRP:
+            {
+                std::size_t numNodes = subHdr.dataSize / sizeof(PGRP);
+                if (numNodes != std::size_t(mData)) // keep gcc quiet
+                    throw std::runtime_error("ESM4::PGRD::load numNodes mismatch");
+
+                mNodes.resize(numNodes);
+                for (std::size_t i = 0; i < numNodes; ++i)
+                {
+                    reader.get(mNodes.at(i));
+
+                    if (int(mNodes.at(i).z) % 2 == 0)
+                        mNodes.at(i).priority = 0;
+                    else
+                        mNodes.at(i).priority = 1;
+                }
+
+                break;
+            }
+            case ESM4::SUB_PGRR:
+            {
+                static PGRR link;
+
+                for (std::size_t i = 0; i < std::size_t(mData); ++i) // keep gcc quiet
+                {
+                    for (std::size_t j = 0; j < mNodes[i].numLinks; ++j)
+                    {
+                        link.startNode = std::int16_t(i);
+
+                        reader.get(link.endNode);
+                        if (link.endNode == -1)
+                            continue;
+
+                        // ICMarketDistrictTheBestDefenseBasement doesn't have a PGRR sub-record
+                        // CELL formId 00049E2A
+                        // PGRD formId 000304B7
+                        //if (mFormId == 0x0001C2C8)
+                            //std::cout << link.startNode << "," << link.endNode << std::endl;
+                        mLinks.push_back(link);
+                    }
+                }
+
+                break;
+            }
+            case ESM4::SUB_PGRI:
+            {
+                std::size_t numForeign = subHdr.dataSize / sizeof(PGRI);
+                mForeign.resize(numForeign);
+                for (std::size_t i = 0; i < numForeign; ++i)
+                {
+                    reader.get(mForeign.at(i));
+                    mForeign.at(i).localNode;// &= 0xffff; // some have junk high bits (maybe flags?)
+                }
+
+                break;
+            }
+            case ESM4::SUB_PGRL:
+            {
+                static PGRL objLink;
+                reader.get(objLink.object);
+                //                                        object             linkedNode
+                std::size_t numNodes = (subHdr.dataSize - sizeof(int32_t)) / sizeof(int32_t);
+
+                objLink.linkedNodes.resize(numNodes);
+                for (std::size_t i = 0; i < numNodes; ++i)
+                    reader.get(objLink.linkedNodes.at(i));
+
+                mObjects.push_back(objLink);
+
+                break;
+            }
+            case ESM4::SUB_PGAG:
+            {
+#if 0
+                boost::scoped_array<unsigned char> mDataBuf(new unsigned char[subHdr.dataSize]);
+                reader.get(&mDataBuf[0], subHdr.dataSize);
+
+                std::ostringstream ss;
+                ss << mEditorId << " " << ESM::printName(subHdr.typeId) << ":size " << subHdr.dataSize << "\n";
+                for (std::size_t i = 0; i < subHdr.dataSize; ++i)
+                {
+                    //if (mDataBuf[i] > 64 && mDataBuf[i] < 91) // looks like printable ascii char
+                        //ss << (char)(mDataBuf[i]) << " ";
+                    //else
+                        ss << std::setfill('0') << std::setw(2) << std::hex << (int)(mDataBuf[i]);
+                    if ((i & 0x000f) == 0xf) // wrap around
+                        ss << "\n";
+                    else if (i < subHdr.dataSize-1)
+                        ss << " ";
+                }
+                std::cout << ss.str() << std::endl;
+#else
+                //std::cout << "PGRD " << ESM::printName(subHdr.typeId) << " skipping..."
+                        //<< subHdr.dataSize << std::endl;
+                reader.skipSubRecordData();
+#endif
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::PGRD::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Pathgrid::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Pathgrid::blank()
+//{
+//}
diff --git a/components/esm4/loadpgrd.hpp b/components/esm4/loadpgrd.hpp
new file mode 100644
index 0000000000..9f522af5ca
--- /dev/null
+++ b/components/esm4/loadpgrd.hpp
@@ -0,0 +1,96 @@
+/*
+  Copyright (C) 2020 - 2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_PGRD_H
+#define ESM4_PGRD_H
+
+#include <cstdint>
+#include <string>
+#include <vector>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Pathgrid
+    {
+#pragma pack(push, 1)
+        struct PGRP
+        {
+            float x;
+            float y;
+            float z;
+            std::uint8_t  numLinks;
+            std::uint8_t  priority; // probably padding, repurposing
+            std::uint16_t unknown;  // probably padding
+        };
+
+        struct PGRR
+        {
+            std::int16_t startNode;
+            std::int16_t endNode;
+        };
+
+        struct PGRI
+        {
+            std::int32_t localNode;
+            float x; // foreign
+            float y; // foreign
+            float z; // foreign
+        };
+#pragma pack(pop)
+
+        struct PGRL
+        {
+            FormId object;
+            std::vector<std::int32_t> linkedNodes;
+        };
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId; // FIXME: no such record for PGRD, but keep here to avoid extra work for now
+
+        std::int16_t mData; // number of nodes
+        std::vector<PGRP> mNodes;
+        std::vector<PGRR> mLinks;
+        std::vector<PGRI> mForeign;
+        std::vector<PGRL> mObjects;
+
+        Pathgrid();
+        virtual ~Pathgrid();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_PGRD_H
diff --git a/components/esm4/loadpgre.cpp b/components/esm4/loadpgre.cpp
new file mode 100644
index 0000000000..9c3e745ab9
--- /dev/null
+++ b/components/esm4/loadpgre.cpp
@@ -0,0 +1,105 @@
+/*
+  Copyright (C) 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+  Also see https://tes5edit.github.io/fopdoc/ for FO3/FONV specific details.
+
+*/
+#include "loadpgre.hpp"
+
+#include <stdexcept>
+#include <iostream> // FIXME: for debugging only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::PlacedGrenade::PlacedGrenade() : mFormId(0), mFlags(0)
+{
+    mEditorId.clear();
+}
+
+ESM4::PlacedGrenade::~PlacedGrenade()
+{
+}
+
+void ESM4::PlacedGrenade::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId);  break;
+            case ESM4::SUB_NAME:
+            case ESM4::SUB_XEZN:
+            case ESM4::SUB_XRGD:
+            case ESM4::SUB_XRGB:
+            case ESM4::SUB_XPRD:
+            case ESM4::SUB_XPPA:
+            case ESM4::SUB_INAM:
+            case ESM4::SUB_TNAM:
+            case ESM4::SUB_XOWN:
+            case ESM4::SUB_XRNK:
+            case ESM4::SUB_XCNT:
+            case ESM4::SUB_XRDS:
+            case ESM4::SUB_XHLP:
+            case ESM4::SUB_XPWR:
+            case ESM4::SUB_XDCR:
+            case ESM4::SUB_XLKR:
+            case ESM4::SUB_XCLP:
+            case ESM4::SUB_XAPD:
+            case ESM4::SUB_XAPR:
+            case ESM4::SUB_XATO:
+            case ESM4::SUB_XESP:
+            case ESM4::SUB_XEMI:
+            case ESM4::SUB_XMBR:
+            case ESM4::SUB_XIBS:
+            case ESM4::SUB_XSCL:
+            case ESM4::SUB_DATA:
+            {
+                //std::cout << "PGRE " << ESM::printName(subHdr.typeId) << " skipping..."
+                          //<< subHdr.dataSize << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                std::cout << "PGRE " << ESM::printName(subHdr.typeId) << " skipping..."
+                          << subHdr.dataSize << std::endl;
+                reader.skipSubRecordData();
+                //throw std::runtime_error("ESM4::PGRE::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::PlacedGrenade::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::PlacedGrenade::blank()
+//{
+//}
diff --git a/components/esm4/loadpgre.hpp b/components/esm4/loadpgre.hpp
new file mode 100644
index 0000000000..bb36acfc37
--- /dev/null
+++ b/components/esm4/loadpgre.hpp
@@ -0,0 +1,59 @@
+/*
+  Copyright (C) 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+  Also see https://tes5edit.github.io/fopdoc/ for FO3/FONV specific details.
+
+*/
+#ifndef ESM4_PGRE_H
+#define ESM4_PGRE_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct PlacedGrenade
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+
+        PlacedGrenade();
+        virtual ~PlacedGrenade();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_PGRE_H
diff --git a/components/esm4/loadpwat.cpp b/components/esm4/loadpwat.cpp
new file mode 100644
index 0000000000..a88adcf4c2
--- /dev/null
+++ b/components/esm4/loadpwat.cpp
@@ -0,0 +1,82 @@
+/*
+  Copyright (C) 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+  Also see https://tes5edit.github.io/fopdoc/ for FO3/FONV specific details.
+
+*/
+#include "loadpwat.hpp"
+
+#include <stdexcept>
+#include <iostream> // FIXME: for debugging only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::PlaceableWater::PlaceableWater() : mFormId(0), mFlags(0)
+{
+    mEditorId.clear();
+}
+
+ESM4::PlaceableWater::~PlaceableWater()
+{
+}
+
+void ESM4::PlaceableWater::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId);  break;
+            case ESM4::SUB_OBND:
+            case ESM4::SUB_MODL:
+            case ESM4::SUB_DNAM:
+            {
+                //std::cout << "PWAT " << ESM::printName(subHdr.typeId) << " skipping..."
+                          //<< subHdr.dataSize << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                std::cout << "PWAT " << ESM::printName(subHdr.typeId) << " skipping..."
+                          << subHdr.dataSize << std::endl;
+                reader.skipSubRecordData();
+                //throw std::runtime_error("ESM4::PWAT::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::PlaceableWater::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::PlaceableWater::blank()
+//{
+//}
diff --git a/components/esm4/loadpwat.hpp b/components/esm4/loadpwat.hpp
new file mode 100644
index 0000000000..e1de91ab96
--- /dev/null
+++ b/components/esm4/loadpwat.hpp
@@ -0,0 +1,59 @@
+/*
+  Copyright (C) 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+  Also see https://tes5edit.github.io/fopdoc/ for FO3/FONV specific details.
+
+*/
+#ifndef ESM4_PWAT_H
+#define ESM4_PWAT_H
+
+#include <string>
+#include <cstdint>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct PlaceableWater
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+
+        PlaceableWater();
+        virtual ~PlaceableWater();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_PWAT_H
diff --git a/components/esm4/loadqust.cpp b/components/esm4/loadqust.cpp
new file mode 100644
index 0000000000..67e250ae76
--- /dev/null
+++ b/components/esm4/loadqust.cpp
@@ -0,0 +1,179 @@
+/*
+  Copyright (C) 2020-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadqust.hpp"
+
+#include <stdexcept>
+#include <cstring>
+#include <iostream> // FIXME: for debugging only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Quest::Quest() : mFormId(0), mFlags(0), mQuestScript(0)
+{
+    mEditorId.clear();
+    mQuestName.clear();
+    mFileName.clear();
+
+    std::memset(&mScript.scriptHeader, 0, sizeof(ScriptHeader));
+    mScript.scriptSource.clear();
+    mScript.globReference = 0;
+}
+
+ESM4::Quest::~Quest()
+{
+}
+
+void ESM4::Quest::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId);  break;
+            case ESM4::SUB_FULL: reader.getZString(mQuestName); break;
+            case ESM4::SUB_ICON: reader.getZString(mFileName); break; // TES4 (none in FO3/FONV)
+            case ESM4::SUB_DATA:
+            {
+                if (subHdr.dataSize == 2) // TES4
+                {
+                    reader.get(&mData, 2);
+                    mData.questDelay = 0.f; // unused in TES4 but keep it clean
+
+                    //if ((mData.flags & Flag_StartGameEnabled) != 0)
+                        //std::cout << "start quest " << mEditorId << std::endl;
+                }
+                else
+                    reader.get(mData); // FO3
+
+                break;
+            }
+            case ESM4::SUB_SCRI: reader.get(mQuestScript); break;
+            case ESM4::SUB_CTDA: // FIXME: how to detect if 1st/2nd param is a formid?
+            {
+                TargetCondition cond;
+
+                if (subHdr.dataSize == 24) // TES4
+                {
+                    reader.get(&cond, 24);
+                    cond.reference = 0; // unused in TES4 but keep it clean
+                }
+                else if (subHdr.dataSize == 28)
+                {
+                    reader.get(cond); // FO3/FONV
+                    if (cond.reference)
+                        reader.adjustFormId(cond.reference);
+                }
+                else
+                {
+                    // one record with size 20: EDID GenericSupMutBehemoth
+                    reader.skipSubRecordData(); // FIXME
+                }
+                // FIXME: support TES5
+
+                mTargetConditions.push_back(cond);
+
+                break;
+            }
+            case ESM4::SUB_SCHR: reader.get(mScript.scriptHeader); break;
+            case ESM4::SUB_SCDA: reader.skipSubRecordData(); break; // compiled script data
+            case ESM4::SUB_SCTX: reader.getString(mScript.scriptSource); break;
+            case ESM4::SUB_SCRO: reader.getFormId(mScript.globReference); break;
+            case ESM4::SUB_INDX:
+            case ESM4::SUB_QSDT:
+            case ESM4::SUB_CNAM:
+            case ESM4::SUB_QSTA:
+            case ESM4::SUB_NNAM: // FO3
+            case ESM4::SUB_QOBJ: // FO3
+            case ESM4::SUB_NAM0: // FO3
+            case ESM4::SUB_ANAM: // TES5
+            case ESM4::SUB_DNAM: // TES5
+            case ESM4::SUB_ENAM: // TES5
+            case ESM4::SUB_FNAM: // TES5
+            case ESM4::SUB_NEXT: // TES5
+            case ESM4::SUB_ALCA: // TES5
+            case ESM4::SUB_ALCL: // TES5
+            case ESM4::SUB_ALCO: // TES5
+            case ESM4::SUB_ALDN: // TES5
+            case ESM4::SUB_ALEA: // TES5
+            case ESM4::SUB_ALED: // TES5
+            case ESM4::SUB_ALEQ: // TES5
+            case ESM4::SUB_ALFA: // TES5
+            case ESM4::SUB_ALFC: // TES5
+            case ESM4::SUB_ALFD: // TES5
+            case ESM4::SUB_ALFE: // TES5
+            case ESM4::SUB_ALFI: // TES5
+            case ESM4::SUB_ALFL: // TES5
+            case ESM4::SUB_ALFR: // TES5
+            case ESM4::SUB_ALID: // TES5
+            case ESM4::SUB_ALLS: // TES5
+            case ESM4::SUB_ALNA: // TES5
+            case ESM4::SUB_ALNT: // TES5
+            case ESM4::SUB_ALPC: // TES5
+            case ESM4::SUB_ALRT: // TES5
+            case ESM4::SUB_ALSP: // TES5
+            case ESM4::SUB_ALST: // TES5
+            case ESM4::SUB_ALUA: // TES5
+            case ESM4::SUB_CIS2: // TES5
+            case ESM4::SUB_CNTO: // TES5
+            case ESM4::SUB_COCT: // TES5
+            case ESM4::SUB_ECOR: // TES5
+            case ESM4::SUB_FLTR: // TES5
+            case ESM4::SUB_KNAM: // TES5
+            case ESM4::SUB_KSIZ: // TES5
+            case ESM4::SUB_KWDA: // TES5
+            case ESM4::SUB_QNAM: // TES5
+            case ESM4::SUB_QTGL: // TES5
+            case ESM4::SUB_SPOR: // TES5
+            case ESM4::SUB_VMAD: // TES5
+            case ESM4::SUB_VTCK: // TES5
+            {
+                //std::cout << "QUST " << ESM::printName(subHdr.typeId) << " skipping..."
+                          //<< subHdr.dataSize << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::QUST::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+    //if (mEditorId == "DAConversations")
+        //std::cout << mEditorId << std::endl;
+}
+
+//void ESM4::Quest::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Quest::blank()
+//{
+//}
diff --git a/components/esm4/loadqust.hpp b/components/esm4/loadqust.hpp
new file mode 100644
index 0000000000..905a5cf0fa
--- /dev/null
+++ b/components/esm4/loadqust.hpp
@@ -0,0 +1,84 @@
+/*
+  Copyright (C) 2020-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_QUST_H
+#define ESM4_QUST_H
+
+#include <cstdint>
+
+#include "formid.hpp"
+#include "script.hpp" // TargetCondition, ScriptDefinition
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+#pragma pack(push, 1)
+    struct QuestData
+    {
+        std::uint8_t flags;    // Quest_Flags
+        std::uint8_t priority;
+        std::uint16_t padding; // FO3
+        float questDelay;      // FO3
+    };
+#pragma pack(pop)
+
+    struct Quest
+    {
+        // NOTE: these values are for TES4
+        enum Quest_Flags
+        {
+            Flag_StartGameEnabled     = 0x01,
+            Flag_AllowRepeatConvTopic = 0x04,
+            Flag_AllowRepeatStages    = 0x08
+        };
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mQuestName;
+        std::string mFileName; // texture file
+        FormId mQuestScript;
+
+        QuestData mData;
+
+        std::vector<TargetCondition> mTargetConditions;
+
+        ScriptDefinition mScript;
+
+        Quest();
+        virtual ~Quest();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_QUST_H
diff --git a/components/esm4/loadrace.cpp b/components/esm4/loadrace.cpp
new file mode 100644
index 0000000000..79f635bd48
--- /dev/null
+++ b/components/esm4/loadrace.cpp
@@ -0,0 +1,715 @@
+/*
+  Copyright (C) 2016, 2018-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadrace.hpp"
+
+#include <stdexcept>
+#include <cstring>
+#include <iostream> // FIXME: for debugging only
+#include <iomanip>  // FIXME: for debugging only
+
+#include "formid.hpp"
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Race::Race() : mFormId(0), mFlags(0), mIsTES5(false)
+                   , mHeightMale(1.f), mHeightFemale(1.f), mWeightMale(1.f), mWeightFemale(1.f)
+                   , mRaceFlags(0), mFaceGenMainClamp(0.f), mFaceGenFaceClamp(0.f), mNumKeywords(0)
+                   , mSkin(0)
+{
+    mEditorId.clear();
+    mFullName.clear();
+    mDesc.clear();
+    mModelMale.clear();
+    mModelFemale.clear();
+
+    std::memset(&mAttribMale, 0, sizeof(AttributeValues));
+    std::memset(&mAttribFemale, 0, sizeof(AttributeValues));
+
+    mVNAM.resize(2);
+    mDefaultHair.resize(2);
+
+    mBodyTemplate.bodyPart = 0;
+    mBodyTemplate.flags = 0;
+    mBodyTemplate.type = 0;
+}
+
+ESM4::Race::~Race()
+{
+}
+
+void ESM4::Race::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    std::uint32_t esmVer = reader.esmVersion();
+    bool isTES4 = esmVer == ESM::VER_080 || esmVer == ESM::VER_100;
+    bool isFONV = esmVer == ESM::VER_132 || esmVer == ESM::VER_133 || esmVer == ESM::VER_134;
+    bool isFO3 = false;
+
+    bool isMale = false;
+    int curr_part = -1; // 0 = head, 1 = body, 2 = egt, 3 = hkx
+    std::uint32_t currentIndex = 0xffffffff;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        //std::cout << "RACE " << ESM::printName(subHdr.typeId) << std::endl;
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID:
+            {
+                reader.getZString(mEditorId);
+                // TES4
+                // Sheogorath  0x0005308E
+                // GoldenSaint 0x0001208F
+                // DarkSeducer 0x0001208E
+                // VampireRace 0x00000019
+                // Dremora     0x00038010
+                // Argonian    0x00023FE9
+                // Nord        0x000224FD
+                // Breton      0x000224FC
+                // WoodElf     0x000223C8
+                // Khajiit     0x000223C7
+                // DarkElf     0x000191C1
+                // Orc         0x000191C0
+                // HighElf     0x00019204
+                // Redguard    0x00000D43
+                // Imperial    0x00000907
+                break;
+            }
+            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_DESC:
+            {
+                if (subHdr.dataSize == 1) // FO3?
+                {
+                    reader.skipSubRecordData();
+                    break;
+                }
+
+                reader.getLocalizedString(mDesc); break;
+            }
+            case ESM4::SUB_SPLO: // bonus spell formid (TES5 may have SPCT and multiple SPLO)
+            {
+                FormId magic;
+                reader.getFormId(magic);
+                mBonusSpells.push_back(magic);
+//              std::cout << "RACE " << printName(subHdr.typeId) << " " << formIdToString(magic) << std::endl;
+
+                break;
+            }
+            case ESM4::SUB_DATA: // ?? different length for TES5
+            {
+// DATA:size 128
+// 0f 0f ff 00 ff 00 ff 00 ff 00 ff 00 ff 00 00 00
+// 9a 99 99 3f 00 00 80 3f 00 00 80 3f 00 00 80 3f
+// 48 89 10 00 00 00 40 41 00 00 00 00 00 00 48 43
+// 00 00 48 43 00 00 80 3f 9a 99 19 3f 00 00 00 40
+// 01 00 00 00 ff ff ff ff ff ff ff ff 00 00 00 00
+// ff ff ff ff 00 00 00 00 00 00 20 41 00 00 a0 40
+// 00 00 a0 40 00 00 80 42 ff ff ff ff 00 00 00 00
+// 00 00 00 00 9a 99 99 3e 00 00 a0 40 02 00 00 00
+#if 0
+                unsigned char mDataBuf[256/*bufSize*/];
+                reader.get(&mDataBuf[0], subHdr.dataSize);
+
+                std::ostringstream ss;
+                ss << ESM::printName(subHdr.typeId) << ":size " << subHdr.dataSize << "\n";
+                for (unsigned int i = 0; i < subHdr.dataSize; ++i)
+                {
+                    //if (mDataBuf[i] > 64 && mDataBuf[i] < 91)
+                        //ss << (char)(mDataBuf[i]) << " ";
+                    //else
+                        ss << std::setfill('0') << std::setw(2) << std::hex << (int)(mDataBuf[i]);
+                    if ((i & 0x000f) == 0xf)
+                        ss << "\n";
+                    else if (i < 256/*bufSize*/-1)
+                        ss << " ";
+                }
+                std::cout << ss.str() << std::endl;
+#else
+                if (subHdr.dataSize == 36) // TES4/FO3/FONV
+                {
+                    if (!isTES4 && !isFONV && !mIsTES5)
+                        isFO3 = true;
+
+                    std::uint8_t skill;
+                    std::uint8_t bonus;
+                    for (unsigned int i = 0; i < 8; ++i)
+                    {
+                        reader.get(skill);
+                        reader.get(bonus);
+                        mSkillBonus[static_cast<SkillIndex>(skill)] = bonus;
+                    }
+                    reader.get(mHeightMale);
+                    reader.get(mHeightFemale);
+                    reader.get(mWeightMale);
+                    reader.get(mWeightFemale);
+                    reader.get(mRaceFlags);
+                }
+                else if (subHdr.dataSize >= 128 && subHdr.dataSize <= 164) // TES5
+                {
+                    mIsTES5 = true;
+
+                    std::uint8_t skill;
+                    std::uint8_t bonus;
+                    for (unsigned int i = 0; i < 7; ++i)
+                    {
+                        reader.get(skill);
+                        reader.get(bonus);
+                        mSkillBonus[static_cast<SkillIndex>(skill)] = bonus;
+                    }
+                    std::uint16_t unknown;
+                    reader.get(unknown);
+
+                    reader.get(mHeightMale);
+                    reader.get(mHeightFemale);
+                    reader.get(mWeightMale);
+                    reader.get(mWeightFemale);
+                    reader.get(mRaceFlags);
+
+                    // FIXME
+                    float dummy;
+                    reader.get(dummy); // starting health
+                    reader.get(dummy); // starting magicka
+                    reader.get(dummy); // starting stamina
+                    reader.get(dummy); // base carry weight
+                    reader.get(dummy); // base mass
+                    reader.get(dummy); // accleration rate
+                    reader.get(dummy); // decleration rate
+
+                    uint32_t dummy2;
+                    reader.get(dummy2); // size
+                    reader.get(dummy2); // head biped object
+                    reader.get(dummy2); // hair biped object
+                    reader.get(dummy);  // injured health % (0.f..1.f)
+                    reader.get(dummy2); // shield biped object
+                    reader.get(dummy);  // health regen
+                    reader.get(dummy);  // magicka regen
+                    reader.get(dummy);  // stamina regen
+                    reader.get(dummy);  // unarmed damage
+                    reader.get(dummy);  // unarmed reach
+                    reader.get(dummy2); // body biped object
+                    reader.get(dummy);  // aim angle tolerance
+                    reader.get(dummy2); // unknown
+                    reader.get(dummy);  // angular accleration rate
+                    reader.get(dummy);  // angular tolerance
+                    reader.get(dummy2); // flags
+
+                    if (subHdr.dataSize > 128)
+                    {
+                        reader.get(dummy2); // unknown 1
+                        reader.get(dummy2); // unknown 2
+                        reader.get(dummy2); // unknown 3
+                        reader.get(dummy2); // unknown 4
+                        reader.get(dummy2); // unknown 5
+                        reader.get(dummy2); // unknown 6
+                        reader.get(dummy2); // unknown 7
+                        reader.get(dummy2); // unknown 8
+                        reader.get(dummy2); // unknown 9
+                    }
+                }
+                else
+                {
+                    reader.skipSubRecordData();
+                    std::cout << "RACE " << ESM::printName(subHdr.typeId) << " skipping..."
+                        << subHdr.dataSize << std::endl;
+                }
+#endif
+                break;
+            }
+            case ESM4::SUB_DNAM:
+            {
+                reader.get(mDefaultHair[0]); // male
+                reader.get(mDefaultHair[1]); // female
+
+                break;
+            }
+            case ESM4::SUB_CNAM: // Only in TES4?
+            //              CNAM       SNAM                     VNAM
+            // Sheogorath   0x0  0000  98 2b  10011000 00101011
+            // Golden Saint 0x3  0011  26 46  00100110 01000110
+            // Dark Seducer 0xC  1100  df 55  11011111 01010101
+            // Vampire Race 0x0  0000  77 44  01110111 10001000
+            // Dremora      0x7  0111  bf 32  10111111 00110010
+            // Argonian     0x0  0000  dc 3c  11011100 00111100
+            // Nord         0x5  0101  b6 03  10110110 00000011
+            // Breton       0x5  0101  48 1d  01001000 00011101 00000000 00000907 (Imperial)
+            // Wood Elf     0xD  1101  2e 4a  00101110 01001010 00019204 00019204 (HighElf)
+            // khajiit      0x5  0101  54 5b  01010100 01011011 00023FE9 00023FE9 (Argonian)
+            // Dark Elf     0x0  0000  72 54  01110010 01010100 00019204 00019204 (HighElf)
+            // Orc          0xC  1100  74 09  01110100 00001001 000224FD 000224FD (Nord)
+            // High Elf     0xF  1111  e6 21  11100110 00100001
+            // Redguard     0xD  1101  a9 61  10101001 01100001
+            // Imperial     0xD  1101  8e 35  10001110 00110101
+            {
+                reader.skipSubRecordData();
+                break;
+            }
+            case ESM4::SUB_PNAM: reader.get(mFaceGenMainClamp); break; // 0x40A00000 = 5.f
+            case ESM4::SUB_UNAM: reader.get(mFaceGenFaceClamp); break; // 0x40400000 = 3.f
+            case ESM4::SUB_ATTR: // Only in TES4?
+            {
+                if (subHdr.dataSize == 2) // FO3?
+                {
+                    reader.skipSubRecordData();
+                    break;
+                }
+                reader.get(mAttribMale.strength);
+                reader.get(mAttribMale.intelligence);
+                reader.get(mAttribMale.willpower);
+                reader.get(mAttribMale.agility);
+                reader.get(mAttribMale.speed);
+                reader.get(mAttribMale.endurance);
+                reader.get(mAttribMale.personality);
+                reader.get(mAttribMale.luck);
+                reader.get(mAttribFemale.strength);
+                reader.get(mAttribFemale.intelligence);
+                reader.get(mAttribFemale.willpower);
+                reader.get(mAttribFemale.agility);
+                reader.get(mAttribFemale.speed);
+                reader.get(mAttribFemale.endurance);
+                reader.get(mAttribFemale.personality);
+                reader.get(mAttribFemale.luck);
+
+                break;
+            }
+            //        [0..9]-> ICON
+            // NAM0 -> INDX -> MODL --+
+            //          ^   -> MODB   |
+            //          |             |
+            //          +-------------+
+            //
+            case ESM4::SUB_NAM0: // start marker head data /* 1 */
+            {
+                curr_part = 0; // head part
+
+                if (isFO3 || isFONV)
+                {
+                    mHeadParts.resize(8);
+                    mHeadPartsFemale.resize(8);
+                }
+                else if (isTES4)
+                    mHeadParts.resize(9); // assumed based on Construction Set
+                else
+                {
+                    mHeadPartIdsMale.resize(5);
+                    mHeadPartIdsFemale.resize(5);
+                }
+
+                currentIndex = 0xffffffff;
+                break;
+            }
+            case ESM4::SUB_INDX:
+            {
+                reader.get(currentIndex);
+                // FIXME: below check is rather useless
+                //if (headpart)
+                //{
+                //    if (currentIndex > 8)
+                //        throw std::runtime_error("ESM4::RACE::load - too many head part " + currentIndex);
+                //}
+                //else // bodypart
+                //{
+                //    if (currentIndex > 4)
+                //        throw std::runtime_error("ESM4::RACE::load - too many body part " + currentIndex);
+                //}
+
+                break;
+            }
+            case ESM4::SUB_MODL:
+            {
+                if (curr_part == 0) // head part
+                {
+                    if (isMale || isTES4)
+                        reader.getZString(mHeadParts[currentIndex].mesh);
+                    else
+                        reader.getZString(mHeadPartsFemale[currentIndex].mesh); // TODO: check TES4
+
+                    // TES5 keeps head part formid in mHeadPartIdsMale and mHeadPartIdsFemale
+                }
+                else if (curr_part == 1) // body part
+                {
+                    if (isMale)
+                        reader.getZString(mBodyPartsMale[currentIndex].mesh);
+                    else
+                        reader.getZString(mBodyPartsFemale[currentIndex].mesh);
+
+                    // TES5 seems to have no body parts at all, instead keep EGT models
+                }
+                else if (curr_part == 2) // egt
+                {
+                    //std::cout << mEditorId << " egt " << currentIndex << std::endl; // FIXME
+                    reader.skipSubRecordData();  // FIXME TES5 egt
+                }
+                else
+                {
+                    //std::cout << mEditorId << " hkx " << currentIndex << std::endl; // FIXME
+                    reader.skipSubRecordData();  // FIXME TES5 hkx
+                }
+
+                break;
+            }
+            case ESM4::SUB_MODB: reader.skipSubRecordData(); break; // always 0x0000?
+            case ESM4::SUB_ICON:
+            {
+                if (curr_part == 0) // head part
+                {
+                    if (isMale || isTES4)
+                        reader.getZString(mHeadParts[currentIndex].texture);
+                    else
+                        reader.getZString(mHeadPartsFemale[currentIndex].texture); // TODO: check TES4
+                }
+                else if (curr_part == 1) // body part
+                {
+                    if (isMale)
+                        reader.getZString(mBodyPartsMale[currentIndex].texture);
+                    else
+                        reader.getZString(mBodyPartsFemale[currentIndex].texture);
+                }
+                else
+                    reader.skipSubRecordData();  // FIXME TES5
+
+                break;
+            }
+            //
+            case ESM4::SUB_NAM1: // start marker body data /* 4 */
+            {
+
+                if (isFO3 || isFONV)
+                {
+                    curr_part = 1; // body part
+
+                    mBodyPartsMale.resize(4);
+                    mBodyPartsFemale.resize(4);
+                }
+                else if (isTES4)
+                {
+                    curr_part = 1; // body part
+
+                    mBodyPartsMale.resize(5);   // 0 = upper body, 1 = legs, 2 = hands, 3 = feet, 4 = tail
+                    mBodyPartsFemale.resize(5); // 0 = upper body, 1 = legs, 2 = hands, 3 = feet, 4 = tail
+                }
+                else // TES5
+                    curr_part = 2; // for TES5 NAM1 indicates the start of EGT model
+
+                if (isTES4)
+                    currentIndex = 4; // FIXME: argonian tail mesh without preceeding INDX
+                else
+                    currentIndex = 0xffffffff;
+
+                break;
+            }
+            case ESM4::SUB_MNAM: isMale = true; break;  /* 2, 5, 7 */
+            case ESM4::SUB_FNAM: isMale = false; break; /* 3, 6, 8 */
+            //
+            case ESM4::SUB_HNAM:
+            {
+                std::size_t numHairChoices = subHdr.dataSize / sizeof(FormId);
+                mHairChoices.resize(numHairChoices);
+                for (unsigned int i = 0; i < numHairChoices; ++i)
+                    reader.get(mHairChoices.at(i));
+
+                break;
+            }
+            case ESM4::SUB_ENAM:
+            {
+                std::size_t numEyeChoices = subHdr.dataSize / sizeof(FormId);
+                mEyeChoices.resize(numEyeChoices);
+                for (unsigned int i = 0; i < numEyeChoices; ++i)
+                    reader.get(mEyeChoices.at(i));
+
+                break;
+            }
+            case ESM4::SUB_FGGS:
+            {
+                if (isMale || isTES4)
+                {
+                    mSymShapeModeCoefficients.resize(50);
+                    for (std::size_t i = 0; i < 50; ++i)
+                        reader.get(mSymShapeModeCoefficients.at(i));
+                }
+                else
+                {
+                    mSymShapeModeCoeffFemale.resize(50);
+                    for (std::size_t i = 0; i < 50; ++i)
+                        reader.get(mSymShapeModeCoeffFemale.at(i));
+                }
+
+                break;
+            }
+            case ESM4::SUB_FGGA:
+            {
+                if (isMale || isTES4)
+                {
+                    mAsymShapeModeCoefficients.resize(30);
+                    for (std::size_t i = 0; i < 30; ++i)
+                        reader.get(mAsymShapeModeCoefficients.at(i));
+                }
+                else
+                {
+                    mAsymShapeModeCoeffFemale.resize(30);
+                    for (std::size_t i = 0; i < 30; ++i)
+                        reader.get(mAsymShapeModeCoeffFemale.at(i));
+                }
+
+                break;
+            }
+            case ESM4::SUB_FGTS:
+            {
+                if (isMale || isTES4)
+                {
+                    mSymTextureModeCoefficients.resize(50);
+                    for (std::size_t i = 0; i < 50; ++i)
+                        reader.get(mSymTextureModeCoefficients.at(i));
+                }
+                else
+                {
+                    mSymTextureModeCoeffFemale.resize(50);
+                    for (std::size_t i = 0; i < 50; ++i)
+                        reader.get(mSymTextureModeCoeffFemale.at(i));
+                }
+
+                break;
+            }
+            //
+            case ESM4::SUB_SNAM: //skipping...2 // only in TES4?
+            {
+                reader.skipSubRecordData();
+                break;
+            }
+            case ESM4::SUB_XNAM:
+            {
+                FormId race;
+                std::int32_t adjustment;
+                reader.get(race);
+                reader.get(adjustment);
+                mDisposition[race] = adjustment;
+
+                break;
+            }
+            case ESM4::SUB_VNAM:
+            {
+                if (subHdr.dataSize == 8) // TES4
+                {
+                    reader.get(mVNAM[0]); // For TES4 seems to be 2 race formids
+                    reader.get(mVNAM[1]);
+                }
+                else if (subHdr.dataSize == 4) // TES5
+                {
+                    // equipment type flags meant to be uint32 ???  GLOB reference? shows up in
+                    // SCRO in sript records and CTDA in INFO records
+                    uint32_t dummy;
+                    reader.get(dummy);
+                }
+                else
+                {
+                    reader.skipSubRecordData();
+                    std::cout << "RACE " << ESM::printName(subHdr.typeId) << " skipping..."
+                        << subHdr.dataSize << std::endl;
+                }
+
+                break;
+            }
+            //
+            case ESM4::SUB_ANAM: // TES5
+            {
+                if (isMale)
+                    reader.getZString(mModelMale);
+                else
+                    reader.getZString(mModelFemale);
+                break;
+            }
+            case ESM4::SUB_KSIZ: reader.get(mNumKeywords); break;
+            case ESM4::SUB_KWDA:
+            {
+                std::uint32_t formid;
+                for (unsigned int i = 0; i < mNumKeywords; ++i)
+                    reader.getFormId(formid);
+                break;
+            }
+            //
+            case ESM4::SUB_WNAM: // ARMO FormId
+            {
+                reader.getFormId(mSkin);
+                //std::cout << mEditorId << " skin " << formIdToString(mSkin) << std::endl; // FIXME
+                break;
+            }
+            case ESM4::SUB_BODT: // body template
+            {
+                reader.get(mBodyTemplate.bodyPart);
+                reader.get(mBodyTemplate.flags);
+                reader.get(mBodyTemplate.unknown1); // probably padding
+                reader.get(mBodyTemplate.unknown2); // probably padding
+                reader.get(mBodyTemplate.unknown3); // probably padding
+                reader.get(mBodyTemplate.type);
+
+                break;
+            }
+            case ESM4::SUB_BOD2: // TES5
+            {
+                reader.get(mBodyTemplate.bodyPart);
+                mBodyTemplate.flags = 0;
+                mBodyTemplate.unknown1 = 0; // probably padding
+                mBodyTemplate.unknown2 = 0; // probably padding
+                mBodyTemplate.unknown3 = 0; // probably padding
+                reader.get(mBodyTemplate.type);
+
+                break;
+            }
+            case ESM4::SUB_HEAD: // TES5
+            {
+                FormId formId;
+                reader.getFormId(formId);
+
+                // FIXME: no order? head, mouth, eyes, brow, hair
+                if (isMale)
+                    mHeadPartIdsMale[currentIndex] = formId;
+                else
+                    mHeadPartIdsFemale[currentIndex] = formId;
+
+                //std::cout << mEditorId << (isMale ? " male head " : " female head ")
+                        //<< formIdToString(formId) << " " << currentIndex << std::endl; // FIXME
+
+                break;
+            }
+            case ESM4::SUB_NAM3: // start of hkx model
+            {
+                curr_part = 3; // for TES5 NAM3 indicates the start of hkx model
+
+                break;
+            }
+            // Not sure for what this is used - maybe to indicate which slots are in use? e.g.:
+            //
+            // ManakinRace HEAD
+            // ManakinRace Hair
+            // ManakinRace BODY
+            // ManakinRace Hands
+            // ManakinRace Forearms
+            // ManakinRace Amulet
+            // ManakinRace Ring
+            // ManakinRace Feet
+            // ManakinRace Calves
+            // ManakinRace SHIELD
+            // ManakinRace
+            // ManakinRace LongHair
+            // ManakinRace Circlet
+            // ManakinRace
+            // ManakinRace
+            // ManakinRace
+            // ManakinRace
+            // ManakinRace
+            // ManakinRace
+            // ManakinRace
+            // ManakinRace DecapitateHead
+            // ManakinRace Decapitate
+            // ManakinRace
+            // ManakinRace
+            // ManakinRace
+            // ManakinRace
+            // ManakinRace
+            // ManakinRace
+            // ManakinRace
+            // ManakinRace
+            // ManakinRace
+            // ManakinRace FX0
+            case ESM4::SUB_NAME: // TES5 biped object names (x32)
+            {
+                std::string name;
+                reader.getZString(name);
+                //std::cout << mEditorId << " " << name << std::endl;
+
+                break;
+            }
+            case ESM4::SUB_MTNM: // movement type
+            case ESM4::SUB_ATKD: // attack data
+            case ESM4::SUB_ATKE: // attach event
+            case ESM4::SUB_GNAM: // body part data
+            case ESM4::SUB_NAM4: // material type
+            case ESM4::SUB_NAM5: // unarmed impact?
+            case ESM4::SUB_LNAM: // close loot sound
+            case ESM4::SUB_QNAM: // equipment slot formid
+            case ESM4::SUB_HCLF: // default hair colour
+            case ESM4::SUB_UNES: // unarmed equipment slot formid
+            case ESM4::SUB_TINC:
+            case ESM4::SUB_TIND:
+            case ESM4::SUB_TINI:
+            case ESM4::SUB_TINL:
+            case ESM4::SUB_TINP:
+            case ESM4::SUB_TINT:
+            case ESM4::SUB_TINV:
+            case ESM4::SUB_TIRS:
+            case ESM4::SUB_PHWT:
+            case ESM4::SUB_AHCF:
+            case ESM4::SUB_AHCM:
+            case ESM4::SUB_MPAI:
+            case ESM4::SUB_MPAV:
+            case ESM4::SUB_DFTF:
+            case ESM4::SUB_DFTM:
+            case ESM4::SUB_FLMV:
+            case ESM4::SUB_FTSF:
+            case ESM4::SUB_FTSM:
+            case ESM4::SUB_MTYP:
+            case ESM4::SUB_NAM7:
+            case ESM4::SUB_NAM8:
+            case ESM4::SUB_PHTN:
+            case ESM4::SUB_RNAM:
+            case ESM4::SUB_RNMV:
+            case ESM4::SUB_RPRF:
+            case ESM4::SUB_RPRM:
+            case ESM4::SUB_SNMV:
+            case ESM4::SUB_SPCT:
+            case ESM4::SUB_SPED:
+            case ESM4::SUB_SWMV:
+            case ESM4::SUB_WKMV:
+            //
+            case ESM4::SUB_YNAM: // FO3
+            case ESM4::SUB_NAM2: // FO3
+            case ESM4::SUB_VTCK: // FO3
+            case ESM4::SUB_MODT: // FO3
+            case ESM4::SUB_MODD: // FO3
+            case ESM4::SUB_ONAM: // FO3
+            {
+
+                //std::cout << "RACE " << ESM::printName(subHdr.typeId) << " skipping..." << subHdr.dataSize << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::RACE::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Race::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Race::blank()
+//{
+//}
diff --git a/components/esm4/loadrace.hpp b/components/esm4/loadrace.hpp
new file mode 100644
index 0000000000..0cede13b0b
--- /dev/null
+++ b/components/esm4/loadrace.hpp
@@ -0,0 +1,174 @@
+/*
+  Copyright (C) 2016, 2018-2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_RACE
+#define ESM4_RACE
+
+#include <cstdint>
+#include <vector>
+#include <map>
+
+#include "formid.hpp"
+#include "actor.hpp" // AttributeValues, BodyTemplate
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+    typedef std::uint32_t FormId;
+
+    struct Race
+    {
+#pragma pack(push, 1)
+        struct Data
+        {
+            std::uint8_t flags; // 0x01 = not playable, 0x02 = not male, 0x04 = not female, ?? = fixed
+        };
+#pragma pack(pop)
+
+        enum SkillIndex
+        {
+            Skill_Armorer     = 0x0C,
+            Skill_Athletics   = 0x0D,
+            Skill_Blade       = 0x0E,
+            Skill_Block       = 0x0F,
+            Skill_Blunt       = 0x10,
+            Skill_HandToHand  = 0x11,
+            Skill_HeavyArmor  = 0x12,
+            Skill_Alchemy     = 0x13,
+            Skill_Alteration  = 0x14,
+            Skill_Conjuration = 0x15,
+            Skill_Destruction = 0x16,
+            Skill_Illusion    = 0x17,
+            Skill_Mysticism   = 0x18,
+            Skill_Restoration = 0x19,
+            Skill_Acrobatics  = 0x1A,
+            Skill_LightArmor  = 0x1B,
+            Skill_Marksman    = 0x1C,
+            Skill_Mercantile  = 0x1D,
+            Skill_Security    = 0x1E,
+            Skill_Sneak       = 0x1F,
+            Skill_Speechcraft = 0x20,
+            Skill_None        = 0xFF,
+            Skill_Unknown     = 0x00
+        };
+
+        enum HeadPartIndex // TES4
+        {
+            Head              = 0,
+            EarMale           = 1,
+            EarFemale         = 2,
+            Mouth             = 3,
+            TeethLower        = 4,
+            TeethUpper        = 5,
+            Tongue            = 6,
+            EyeLeft           = 7, // no texture
+            EyeRight          = 8, // no texture
+            NumHeadParts      = 9
+        };
+
+        enum BodyPartIndex // TES4
+        {
+            UpperBody         = 0,
+            LowerBody         = 1,
+            Hands             = 2,
+            Feet              = 3,
+            Tail              = 4,
+            NumBodyParts      = 5
+        };
+
+        struct BodyPart
+        {
+            std::string mesh;    // can be empty for arms, hands, etc
+            std::string texture; // can be empty e.g. eye left, eye right
+        };
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        bool mIsTES5;
+
+        std::string mEditorId;
+        std::string mFullName;
+        std::string mDesc;
+        std::string mModelMale;   // TES5 skeleton (in TES4 skeleton is found in npc_)
+        std::string mModelFemale; // TES5 skeleton (in TES4 skeleton is found in npc_)
+
+        AttributeValues mAttribMale;
+        AttributeValues mAttribFemale;
+        std::map<SkillIndex, std::uint8_t> mSkillBonus;
+
+        // DATA
+        float mHeightMale;
+        float mHeightFemale;
+        float mWeightMale;
+        float mWeightFemale;
+        std::uint32_t mRaceFlags; // 0x0001 = playable?
+
+        std::vector<BodyPart> mHeadParts;       // see HeadPartIndex
+        std::vector<BodyPart> mHeadPartsFemale; // see HeadPartIndex
+
+        std::vector<BodyPart> mBodyPartsMale;   // see BodyPartIndex
+        std::vector<BodyPart> mBodyPartsFemale; // see BodyPartIndex
+
+        std::vector<FormId> mEyeChoices;        // texture only
+        std::vector<FormId> mHairChoices; // not for TES5
+
+        float mFaceGenMainClamp;
+        float mFaceGenFaceClamp;
+        std::vector<float> mSymShapeModeCoefficients;   // should be 50
+        std::vector<float> mSymShapeModeCoeffFemale;    // should be 50
+        std::vector<float> mAsymShapeModeCoefficients;  // should be 30
+        std::vector<float> mAsymShapeModeCoeffFemale;   // should be 30
+        std::vector<float> mSymTextureModeCoefficients; // should be 50
+        std::vector<float> mSymTextureModeCoeffFemale;  // should be 50
+
+        std::map<FormId, std::int32_t> mDisposition; // race adjustments
+        std::vector<FormId> mBonusSpells;            // race ability/power
+        std::vector<FormId> mVNAM; // don't know what these are; 1 or 2 RACE FormIds
+        std::vector<FormId> mDefaultHair; // male/female (HAIR FormId for TES4)
+
+        std::uint32_t mNumKeywords;
+
+        FormId mSkin; // TES5
+        BodyTemplate mBodyTemplate; // TES5
+
+        // FIXME: there's no fixed order?
+        // head, mouth, eyes, brow, hair
+        std::vector<FormId> mHeadPartIdsMale;   // TES5
+        std::vector<FormId> mHeadPartIdsFemale; // TES5
+
+        Race();
+        virtual ~Race();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_RACE
diff --git a/components/esm4/loadrefr.cpp b/components/esm4/loadrefr.cpp
new file mode 100644
index 0000000000..4921fd16ca
--- /dev/null
+++ b/components/esm4/loadrefr.cpp
@@ -0,0 +1,349 @@
+/*
+  Copyright (C) 2015-2016, 2018, 2020-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadrefr.hpp"
+
+#include <stdexcept>
+#include <iostream> // FIXME: debug only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Reference::Reference() : mParent(0), mFormId(0), mFlags(0),
+                               mBaseObj(0), mScale(1.f), mOwner(0), mGlobal(0), mFactionRank(-1),
+                               mInitiallyDisabled(false), mIsMapMarker(false), mMapMarker(0), mCount(1),
+                               mAudioLocation(0), mIsLocked(false), mLockLevel(0), mKey(0), mTargetRef(0)
+{
+    mEditorId.clear();
+    mFullName.clear();
+
+    //mPlacement.
+
+    mEsp.parent = 0;
+    mEsp.flags = 0;
+
+    mRadio.rangeRadius = 0.f;
+    mRadio.broadcastRange = 0;
+    mRadio.staticPercentage = 0.f;
+    mRadio.posReference = 0;
+
+    mDoor.destDoor = 0;
+    //mDoor.destPos.
+    mDoor.flags = 0;
+}
+
+ESM4::Reference::~Reference()
+{
+}
+
+void ESM4::Reference::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+    mParent = reader.currCell(); // NOTE: only for persistent refs?
+
+    // TODO: Let the engine apply this? Saved games?
+    //mInitiallyDisabled = ((mFlags & ESM4::Rec_Disabled) != 0) ? true : false;
+    std::uint32_t esmVer = reader.esmVersion();
+    bool isFONV = esmVer == ESM::VER_132 || esmVer == ESM::VER_133 || esmVer == ESM::VER_134;
+
+    FormId mid;
+    FormId sid;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_NAME:
+            {
+                reader.getFormId(mBaseObj);
+#if 0
+                if (mFlags & ESM4::Rec_Disabled)
+                    std::cout << "REFR disable at start " << formIdToString(mFormId) <<
+                        " baseobj " << formIdToString(mBaseObj) <<
+                        " " << (mEditorId.empty() ? "" : mEditorId) << std::endl; // FIXME
+#endif
+                //if (mBaseObj == 0x20) // e.g. FO3 mFormId == 0x0007E90F
+                //if (mBaseObj == 0x17)
+                    //std::cout << mEditorId << std::endl;
+                break;
+            }
+            case ESM4::SUB_DATA: reader.get(mPlacement); break;
+            case ESM4::SUB_XSCL: reader.get(mScale);    break;
+            case ESM4::SUB_XOWN: reader.getFormId(mOwner);    break;
+            case ESM4::SUB_XGLB: reader.getFormId(mGlobal);   break;
+            case ESM4::SUB_XRNK: reader.get(mFactionRank); break;
+            case ESM4::SUB_XESP:
+            {
+                reader.get(mEsp);
+                reader.adjustFormId(mEsp.parent);
+                //std::cout << "REFR  parent: " << formIdToString(mEsp.parent) << " ref " << formIdToString(mFormId)
+                    //<< ", 0x" << std::hex << (mEsp.flags & 0xff) << std::endl;// FIXME
+                break;
+            }
+            case ESM4::SUB_XTEL:
+            {
+                reader.getFormId(mDoor.destDoor);
+                reader.get(mDoor.destPos);
+                if (esmVer == ESM::VER_094 || esmVer == ESM::VER_170 || isFONV)
+                    reader.get(mDoor.flags); // not in Obvlivion
+                //std::cout << "REFR  dest door: " << formIdToString(mDoor.destDoor) << std::endl;// FIXME
+                break;
+            }
+            case ESM4::SUB_XSED:
+            {
+                // 1 or 4 bytes
+                if (subHdr.dataSize == 1)
+                {
+                    uint8_t data;
+                    reader.get(data);
+                    //std::cout << "REFR XSED " << std::hex << (int)data << std::endl;
+                    break;
+                }
+                else if (subHdr.dataSize == 4)
+                {
+                    uint32_t data;
+                    reader.get(data);
+                    //std::cout << "REFR XSED " << std::hex << (int)data << std::endl;
+                    break;
+                }
+
+                //std::cout << "REFR XSED dataSize: " << subHdr.dataSize << std::endl;// FIXME
+                reader.skipSubRecordData();
+                break;
+            }
+            case ESM4::SUB_XLOD:
+            {
+                // 12 bytes
+                if (subHdr.dataSize == 12)
+                {
+                    float data, data2, data3;
+                    reader.get(data);
+                    reader.get(data2);
+                    reader.get(data3);
+                    //bool hasVisibleWhenDistantFlag = (mFlags & 0x00008000) != 0; // currently unused
+                    // some are trees, e.g. 000E03B6, mBaseObj 00022F32, persistent, visible when distant
+                    // some are doors, e.g. 000270F7, mBaseObj 000CD338, persistent, initially disabled
+                    // (this particular one is an Oblivion Gate)
+                    //std::cout << "REFR XLOD " << std::hex << (int)data << " " << (int)data2 << " " << (int)data3 << std::endl;
+                    break;
+                }
+                //std::cout << "REFR XLOD dataSize: " << subHdr.dataSize << std::endl;// FIXME
+                reader.skipSubRecordData();
+                break;
+            }
+            case ESM4::SUB_XACT:
+            {
+                if (subHdr.dataSize == 4)
+                {
+                    uint32_t data;
+                    reader.get(data);
+                    //std::cout << "REFR XACT " << std::hex << (int)data << std::endl;
+                    break;
+                }
+
+                //std::cout << "REFR XACT dataSize: " << subHdr.dataSize << std::endl;// FIXME
+                reader.skipSubRecordData();
+                break;
+            }
+            case ESM4::SUB_XRTM: // formId
+            {
+                // seems like another ref, e.g. 00064583 has base object 00000034 which is "XMarkerHeading"
+                // e.g. some are doors (prob. quest related)
+                //    MS94OblivionGateRef XRTM : 00097C88
+                //    MQ11SkingradGate    XRTM : 00064583
+                //    MQ11ChorrolGate     XRTM : 00188770
+                //    MQ11LeyawiinGate    XRTM : 0018AD7C
+                //    MQ11AnvilGate       XRTM : 0018D452
+                //    MQ11BravilGate      XRTM : 0018AE1B
+                // e.g. some are XMarkerHeading
+                //    XRTM : 000A4DD7 in OblivionRDCavesMiddleA05 (maybe spawn points?)
+                FormId marker;
+                reader.getFormId(marker);
+                //std::cout << "REFR " << mEditorId << " XRTM : " << formIdToString(marker) << std::endl;// FIXME
+                break;
+            }
+            case ESM4::SUB_TNAM: //reader.get(mMapMarker); break;
+            {
+                if (subHdr.dataSize != sizeof(mMapMarker))
+                    //reader.skipSubRecordData(); // FIXME: FO3
+                    reader.getFormId(mid);
+                else
+                    reader.get(mMapMarker); // TES4
+
+                break;
+            }
+            case ESM4::SUB_XMRK: mIsMapMarker = true; break; // all have mBaseObj 0x00000010 "MapMarker"
+            case ESM4::SUB_FNAM:
+            {
+                //std::cout << "REFR " << ESM::printName(subHdr.typeId) << " skipping..."
+                        //<< subHdr.dataSize << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            case ESM4::SUB_XTRG: // formId
+            {
+                reader.getFormId(mTargetRef);
+                //std::cout << "REFR XRTG : " << formIdToString(id) << std::endl;// FIXME
+                break;
+            }
+            case ESM4::SUB_CNAM: reader.getFormId(mAudioLocation); break; // FONV
+            case ESM4::SUB_XRDO: // FO3
+            {
+                reader.get(mRadio.rangeRadius);
+                reader.get(mRadio.broadcastRange);
+                reader.get(mRadio.staticPercentage);
+                reader.getFormId(mRadio.posReference);
+
+                break;
+            }
+            case ESM4::SUB_SCRO: // FO3
+            {
+                reader.getFormId(sid);
+                //if (mFormId == 0x0016b74B)
+                    //std::cout << "REFR SCRO : " << formIdToString(sid) << std::endl;// FIXME
+                break;
+            }
+            case ESM4::SUB_XLOC:
+            {
+                mIsLocked = true;
+                std::int8_t dummy; // FIXME: very poor code
+
+                reader.get(mLockLevel);
+                reader.get(dummy);
+                reader.get(dummy);
+                reader.get(dummy);
+                reader.getFormId(mKey);
+                reader.get(dummy); // flag?
+                reader.get(dummy);
+                reader.get(dummy);
+                reader.get(dummy);
+                if (subHdr.dataSize == 16)
+                    reader.skipSubRecordData(4); // Oblivion (sometimes), flag?
+                else if (subHdr.dataSize == 20)  // Skyrim, FO3
+                    reader.skipSubRecordData(8); // flag?
+
+                break;
+            }
+            // lighting
+            case ESM4::SUB_LNAM: // lighting template formId
+            case ESM4::SUB_XLIG: // struct, FOV, fade, etc
+            case ESM4::SUB_XEMI: // LIGH formId
+            case ESM4::SUB_XRDS: // Radius or Radiance
+            case ESM4::SUB_XRGB:
+            case ESM4::SUB_XRGD: // tangent data?
+            case ESM4::SUB_XALP: // alpha cutoff
+            //
+            case ESM4::SUB_XPCI: // formId
+            case ESM4::SUB_XLCM:
+            case ESM4::SUB_XCNT:
+            case ESM4::SUB_ONAM:
+            case ESM4::SUB_VMAD:
+            case ESM4::SUB_XPRM:
+            case ESM4::SUB_INAM:
+            case ESM4::SUB_PDTO:
+            case ESM4::SUB_SCHR:
+            case ESM4::SUB_SCTX:
+            case ESM4::SUB_XAPD:
+            case ESM4::SUB_XAPR:
+            case ESM4::SUB_XCVL:
+            case ESM4::SUB_XCZA:
+            case ESM4::SUB_XCZC:
+            case ESM4::SUB_XEZN:
+            case ESM4::SUB_XFVC:
+            case ESM4::SUB_XHTW:
+            case ESM4::SUB_XIS2:
+            case ESM4::SUB_XLCN:
+            case ESM4::SUB_XLIB:
+            case ESM4::SUB_XLKR:
+            case ESM4::SUB_XLRM:
+            case ESM4::SUB_XLRT:
+            case ESM4::SUB_XLTW:
+            case ESM4::SUB_XMBO:
+            case ESM4::SUB_XMBP:
+            case ESM4::SUB_XMBR:
+            case ESM4::SUB_XNDP:
+            case ESM4::SUB_XOCP:
+            case ESM4::SUB_XPOD:
+            case ESM4::SUB_XPPA:
+            case ESM4::SUB_XPRD:
+            case ESM4::SUB_XPWR:
+            case ESM4::SUB_XRMR:
+            case ESM4::SUB_XSPC:
+            case ESM4::SUB_XTNM:
+            case ESM4::SUB_XTRI:
+            case ESM4::SUB_XWCN:
+            case ESM4::SUB_XWCU:
+            case ESM4::SUB_XATR: // Dawnguard only?
+            case ESM4::SUB_XHLT: // Unofficial Oblivion Patch
+            case ESM4::SUB_XCHG: // thievery.exp
+            case ESM4::SUB_XHLP: // FO3
+            case ESM4::SUB_XAMT: // FO3
+            case ESM4::SUB_XAMC: // FO3
+            case ESM4::SUB_XRAD: // FO3
+            case ESM4::SUB_XIBS: // FO3
+            case ESM4::SUB_XORD: // FO3
+            case ESM4::SUB_XCLP: // FO3
+            case ESM4::SUB_SCDA: // FO3
+            case ESM4::SUB_RCLR: // FO3
+            case ESM4::SUB_BNAM: // FONV
+            case ESM4::SUB_MMRK: // FONV
+            case ESM4::SUB_MNAM: // FONV
+            case ESM4::SUB_NNAM: // FONV
+            case ESM4::SUB_XATO: // FONV
+            case ESM4::SUB_SCRV: // FONV
+            case ESM4::SUB_SCVR: // FONV
+            case ESM4::SUB_SLSD: // FONV
+            case ESM4::SUB_XSRF: // FONV
+            case ESM4::SUB_XSRD: // FONV
+            case ESM4::SUB_WMI1: // FONV
+            case ESM4::SUB_XLRL: // Unofficial Skyrim Patch
+            {
+                //if (mFormId == 0x0007e90f) // XPRM XPOD
+                //if (mBaseObj == 0x17) //XPRM XOCP occlusion plane data XMBO bound half extents
+                //std::cout << "REFR " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::REFR::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+    //if (mFormId == 0x0016B74B) // base is TACT vCasinoUltraLuxeRadio in cell ULCasino
+        //std::cout << "REFR SCRO " << formIdToString(sid) << std::endl;
+}
+
+//void ESM4::Reference::save(ESM4::Writer& writer) const
+//{
+//}
+
+void ESM4::Reference::blank()
+{
+}
diff --git a/components/esm4/loadrefr.hpp b/components/esm4/loadrefr.hpp
new file mode 100644
index 0000000000..d9c96cbf9f
--- /dev/null
+++ b/components/esm4/loadrefr.hpp
@@ -0,0 +1,119 @@
+/*
+  Copyright (C) 2015-2016, 2018, 2020-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_REFR_H
+#define ESM4_REFR_H
+
+#include <cstdint>
+
+#include "reference.hpp" // FormId, Placement, EnableParent
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    enum MapMarkerType
+    {
+        Map_None          = 0x00, // ?
+        Map_Camp          = 0x01,
+        Map_Cave          = 0x02,
+        Map_City          = 0x03,
+        Map_ElvenRuin     = 0x04,
+        Map_FortRuin      = 0x05,
+        Map_Mine          = 0x06,
+        Map_Landmark      = 0x07,
+        Map_Tavern        = 0x08,
+        Map_Settlement    = 0x09,
+        Map_DaedricShrine = 0x0A,
+        Map_OblivionGate  = 0x0B,
+        Map_Unknown       = 0x0C // ? (door icon)
+    };
+
+    struct TeleportDest
+    {
+        FormId   destDoor;
+        Placement destPos;
+        std::uint32_t flags; // 0x01 no alarm (only in TES5)
+    };
+
+    struct RadioStationData
+    {
+        float rangeRadius;
+        // 0 radius, 1 everywhere, 2 worldspace and linked int, 3 linked int, 4 current cell only
+        std::uint32_t broadcastRange;
+        float staticPercentage;
+        FormId posReference; // only used if broadcastRange == 0
+    };
+
+    struct Reference
+    {
+        FormId mParent;       // cell FormId (currently persistent refs only), from the loading sequence
+                              // NOTE: for exterior cells it will be the dummy cell FormId
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mFullName;
+        FormId      mBaseObj;
+
+        Placement mPlacement;
+        float    mScale;      // default 1.f
+        FormId   mOwner;
+        FormId   mGlobal;
+        std::int32_t mFactionRank;
+
+        bool mInitiallyDisabled; // TODO may need to check mFlags & 0x800 (initially disabled)
+        bool mIsMapMarker;
+        std::uint16_t mMapMarker;
+
+        EnableParent mEsp;
+
+        std::uint32_t mCount; // only if > 1 (default 1)
+
+        FormId mAudioLocation;
+
+        RadioStationData mRadio;
+
+        TeleportDest mDoor;
+        bool mIsLocked;
+        std::int8_t mLockLevel;
+        FormId mKey;
+
+        FormId mTargetRef;
+
+        Reference();
+        virtual ~Reference();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        void blank();
+    };
+}
+
+#endif // ESM4_REFR_H
diff --git a/components/esm4/loadregn.cpp b/components/esm4/loadregn.cpp
new file mode 100644
index 0000000000..6f871e8471
--- /dev/null
+++ b/components/esm4/loadregn.cpp
@@ -0,0 +1,164 @@
+/*
+  Copyright (C) 2015-2016, 2018, 2020-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadregn.hpp"
+
+#ifdef NDEBUG // FIXME: debuggigng only
+#undef NDEBUG
+#endif
+
+#include <cassert>
+#include <stdexcept>
+
+//#include <iostream> // FIXME: debug only
+//#include "formid.hpp"
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Region::Region() : mFormId(0), mFlags(0), mWorldId(0), mEdgeFalloff(0)
+{
+    mEditorId.clear();
+    mShader.clear();
+    mMapName.clear();
+}
+
+ESM4::Region::~Region()
+{
+}
+
+void ESM4::Region::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_RCLR: reader.get(mColour);        break;
+            case ESM4::SUB_WNAM: reader.getFormId(mWorldId); break;
+            case ESM4::SUB_ICON: reader.getZString(mShader); break;
+            case ESM4::SUB_RPLI: reader.get(mEdgeFalloff);   break;
+            case ESM4::SUB_RPLD:
+            {
+                mRPLD.resize(subHdr.dataSize/sizeof(std::uint32_t));
+                for (std::vector<std::uint32_t>::iterator it = mRPLD.begin(); it != mRPLD.end(); ++it)
+                {
+                    reader.get(*it);
+#if 0
+                    std::string padding = "";
+                    padding.insert(0, reader.stackSize()*2, ' ');
+                    std::cout << padding  << "RPLD: 0x" << std::hex << *it << std::endl;
+#endif
+                }
+
+                break;
+            }
+            case ESM4::SUB_RDAT: reader.get(mData); break;
+            case ESM4::SUB_RDMP:
+            {
+                assert(mData.type == RDAT_Map && "REGN unexpected data type");
+                reader.getLocalizedString(mMapName); break;
+            }
+            // FO3 only 2: DemoMegatonSound and DC01 (both 0 RDMD)
+            // FONV none
+            case ESM4::SUB_RDMD: // music type; 0 default, 1 public, 2 dungeon
+            {
+#if 0
+                int dummy;
+                reader.get(dummy);
+                std::cout << "REGN " << mEditorId << " " << dummy << std::endl;
+#else
+                reader.skipSubRecordData();
+#endif
+                break;
+            }
+            case ESM4::SUB_RDMO: // not seen in FO3/FONV?
+            {
+                //std::cout << "REGN " << ESM::printName(subHdr.typeId) << " skipping..."
+                          //<< subHdr.dataSize << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            case ESM4::SUB_RDSD: // Possibly the same as RDSA
+            {
+                //assert(mData.type == RDAT_Map && "REGN unexpected data type");
+                if (mData.type != RDAT_Sound)
+                    throw std::runtime_error("ESM4::REGN::load - unexpected data type " +
+                                              ESM::printName(subHdr.typeId));
+
+                std::size_t numSounds = subHdr.dataSize / sizeof(RegionSound);
+                mSounds.resize(numSounds);
+                for (std::size_t i = 0; i < numSounds; ++i)
+                    reader.get(mSounds.at(i));
+
+                break;
+            }
+            case ESM4::SUB_RDGS: // Only in Oblivion? (ToddTestRegion1) // formId
+            case ESM4::SUB_RDSA:
+            case ESM4::SUB_RDWT: // formId
+            case ESM4::SUB_RDOT: // formId
+            case ESM4::SUB_RDID: // FONV
+            case ESM4::SUB_RDSB: // FONV
+            case ESM4::SUB_RDSI: // FONV
+            case ESM4::SUB_NVMI: // TES5
+            {
+                //RDAT skipping... following is a map
+                //RDMP skipping... map name
+                //
+                //RDAT skipping... following is weather
+                //RDWT skipping... weather data
+                //
+                //RDAT skipping... following is sound
+                //RDMD skipping... unknown, maybe music data
+                //
+                //RDSD skipping... unknown, maybe sound data
+                //
+                //RDAT skipping... following is grass
+                //RDGS skipping... unknown, maybe grass
+
+                //std::cout << "REGN " << ESM::printName(subHdr.typeId) << " skipping..."
+                          //<< subHdr.dataSize << std::endl;
+                reader.skipSubRecordData(); // FIXME: process the subrecord rather than skip
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::REGN::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Region::save(ESM4::Writer& writer) const
+//{
+//}
+
+void ESM4::Region::blank()
+{
+}
diff --git a/components/esm4/loadregn.hpp b/components/esm4/loadregn.hpp
new file mode 100644
index 0000000000..36ed8eb9d5
--- /dev/null
+++ b/components/esm4/loadregn.hpp
@@ -0,0 +1,98 @@
+/*
+  Copyright (C) 2015-2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_REGN_H
+#define ESM4_REGN_H
+
+#include <cstdint>
+#include <string>
+#include <vector>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Region
+    {
+        enum RegionDataType
+        {
+            RDAT_None      = 0x00,
+            RDAT_Objects   = 0x02,
+            RDAT_Weather   = 0x03,
+            RDAT_Map       = 0x04,
+            RDAT_Landscape = 0x05,
+            RDAT_Grass     = 0x06,
+            RDAT_Sound     = 0x07,
+            RDAT_Imposter  = 0x08
+        };
+
+#pragma pack(push, 1)
+        struct RegionData
+        {
+            std::uint32_t type;
+            std::uint8_t  flag;
+            std::uint8_t  priority;
+            std::uint16_t unknown;
+        };
+
+        struct RegionSound
+        {
+            FormId sound;
+            std::uint32_t flags; // 0 pleasant, 1 cloudy, 2 rainy, 3 snowy
+            std::uint32_t chance;
+        };
+#pragma pack(pop)
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string   mEditorId;
+        std::uint32_t mColour; // RGBA
+        FormId  mWorldId;      // worldspace formid
+
+        std::string   mShader; //?? ICON
+        std::string   mMapName;
+
+        std::uint32_t mEdgeFalloff;
+        std::vector<std::uint32_t> mRPLD; // unknown, point data?
+
+        RegionData mData;
+        std::vector<RegionSound> mSounds;
+
+        Region();
+        virtual ~Region();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        void blank();
+    };
+}
+
+#endif // ESM4_REGN_H
diff --git a/components/esm4/loadroad.cpp b/components/esm4/loadroad.cpp
new file mode 100644
index 0000000000..cb7742eb7c
--- /dev/null
+++ b/components/esm4/loadroad.cpp
@@ -0,0 +1,123 @@
+/*
+  Copyright (C) 2020 - 2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadroad.hpp"
+
+#include <stdexcept>
+//#include <iostream> // FIXME: for debugging only
+
+#include "formid.hpp" // FIXME: for workaround
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Road::Road() : mFormId(0), mFlags(0)
+{
+    mEditorId.clear();
+
+    mNodes.clear();
+    mLinks.clear();
+}
+
+ESM4::Road::~Road()
+{
+}
+
+void ESM4::Road::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+    mParent = reader.currWorld();
+
+    mEditorId = formIdToString(mFormId); // FIXME: quick workaround to use existing code
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_PGRP:
+            {
+                std::size_t numNodes = subHdr.dataSize / sizeof(PGRP);
+
+                mNodes.resize(numNodes);
+                for (std::size_t i = 0; i < numNodes; ++i)
+                {
+                    reader.get(mNodes.at(i));
+                }
+
+                break;
+            }
+            case ESM4::SUB_PGRR:
+            {
+                static PGRR link;
+                static RDRP linkPt;
+
+                for (std::size_t i = 0; i < mNodes.size(); ++i)
+                {
+                    for (std::size_t j = 0; j < mNodes[i].numLinks; ++j)
+                    {
+                        link.startNode = std::int16_t(i);
+
+                        reader.get(linkPt);
+
+                        // FIXME: instead of looping each time, maybe use a map?
+                        bool found = false;
+                        for (std::size_t k = 0; k < mNodes.size(); ++k)
+                        {
+                            if (linkPt.x != mNodes[k].x || linkPt.y != mNodes[k].y || linkPt.z != mNodes[k].z)
+                                continue;
+                            else
+                            {
+                                link.endNode = std::int16_t(k);
+                                mLinks.push_back(link);
+
+                                found = true;
+                                break;
+                            }
+                        }
+
+                        if (!found)
+                            throw std::runtime_error("ESM4::ROAD::PGRR - Unknown link point "
+                                + std::to_string(j) + "at node " + std::to_string(i) + ".");
+                    }
+                }
+
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::ROAD::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Road::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Road::blank()
+//{
+//}
diff --git a/components/esm4/loadroad.hpp b/components/esm4/loadroad.hpp
new file mode 100644
index 0000000000..dad92e858c
--- /dev/null
+++ b/components/esm4/loadroad.hpp
@@ -0,0 +1,89 @@
+/*
+  Copyright (C) 2020 - 2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_ROAD_H
+#define ESM4_ROAD_H
+
+#include <cstdint>
+#include <string>
+#include <vector>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Road
+    {
+#pragma pack(push, 1)
+        // FIXME: duplicated from PGRD
+        struct PGRP
+        {
+            float x;
+            float y;
+            float z;
+            std::uint8_t  numLinks;
+            std::uint8_t  unknown1;
+            std::uint16_t unknown2;
+        };
+
+        // FIXME: duplicated from PGRD
+        struct PGRR
+        {
+            std::int16_t startNode;
+            std::int16_t endNode;
+        };
+
+        struct RDRP
+        {
+            float x;
+            float y;
+            float z;
+        };
+#pragma pack(pop)
+        FormId mParent;       // world FormId, from the loading sequence
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+
+        std::vector<PGRP> mNodes;
+        std::vector<PGRR> mLinks;
+
+        Road();
+        virtual ~Road();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_ROAD_H
diff --git a/components/esm4/loadsbsp.cpp b/components/esm4/loadsbsp.cpp
new file mode 100644
index 0000000000..c9af5b856e
--- /dev/null
+++ b/components/esm4/loadsbsp.cpp
@@ -0,0 +1,78 @@
+/*
+  Copyright (C) 2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadsbsp.hpp"
+
+#include <stdexcept>
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::SubSpace::SubSpace() : mFormId(0), mFlags(0)
+{
+    mEditorId.clear();
+
+    mDimension.x = 0.f;
+    mDimension.y = 0.f;
+    mDimension.z = 0.f;
+}
+
+ESM4::SubSpace::~SubSpace()
+{
+}
+
+void ESM4::SubSpace::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_DNAM:
+            {
+                reader.get(mDimension.x);
+                reader.get(mDimension.y);
+                reader.get(mDimension.z);
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::SBSP::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::SubSpace::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::SubSpace::blank()
+//{
+//}
diff --git a/components/esm4/loadsbsp.hpp b/components/esm4/loadsbsp.hpp
new file mode 100644
index 0000000000..c0ca7c5ddf
--- /dev/null
+++ b/components/esm4/loadsbsp.hpp
@@ -0,0 +1,64 @@
+/*
+  Copyright (C) 2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_SBSP_H
+#define ESM4_SBSP_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+
+    struct SubSpace
+    {
+        struct Dimension
+        {
+            float x;
+            float y;
+            float z;
+        };
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        Dimension mDimension;
+
+        SubSpace();
+        virtual ~SubSpace();
+
+        virtual void load(Reader& reader);
+        //virtual void save(Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_SBSP_H
diff --git a/components/esm4/loadscol.cpp b/components/esm4/loadscol.cpp
new file mode 100644
index 0000000000..1990af5f4b
--- /dev/null
+++ b/components/esm4/loadscol.cpp
@@ -0,0 +1,84 @@
+/*
+  Copyright (C) 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+  Also see https://tes5edit.github.io/fopdoc/ for FO3/FONV specific details.
+
+*/
+#include "loadscol.hpp"
+
+#include <stdexcept>
+#include <iostream> // FIXME: for debugging only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::StaticCollection::StaticCollection() : mFormId(0), mFlags(0)
+{
+    mEditorId.clear();
+}
+
+ESM4::StaticCollection::~StaticCollection()
+{
+}
+
+void ESM4::StaticCollection::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId);  break;
+            case ESM4::SUB_OBND:
+            case ESM4::SUB_MODL:
+            case ESM4::SUB_MODT:
+            case ESM4::SUB_ONAM:
+            case ESM4::SUB_DATA:
+            {
+                //std::cout << "SCOL " << ESM::printName(subHdr.typeId) << " skipping..."
+                          //<< subHdr.dataSize << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                std::cout << "SCOL " << ESM::printName(subHdr.typeId) << " skipping..."
+                          << subHdr.dataSize << std::endl;
+                reader.skipSubRecordData();
+                //throw std::runtime_error("ESM4::SCOL::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::StaticCollection::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::StaticCollection::blank()
+//{
+//}
diff --git a/components/esm4/loadscol.hpp b/components/esm4/loadscol.hpp
new file mode 100644
index 0000000000..c32cdd3ca9
--- /dev/null
+++ b/components/esm4/loadscol.hpp
@@ -0,0 +1,59 @@
+/*
+  Copyright (C) 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+  Also see https://tes5edit.github.io/fopdoc/ for FO3/FONV specific details.
+
+*/
+#ifndef ESM4_SCOL_H
+#define ESM4_SCOL_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct StaticCollection
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+
+        StaticCollection();
+        virtual ~StaticCollection();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_SCOL_H
diff --git a/components/esm4/loadscpt.cpp b/components/esm4/loadscpt.cpp
new file mode 100644
index 0000000000..cf4bdeb58a
--- /dev/null
+++ b/components/esm4/loadscpt.cpp
@@ -0,0 +1,173 @@
+/*
+  Copyright (C) 2019-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadscpt.hpp"
+
+#include <stdexcept>
+#include <iostream> // FIXME: debugging only
+#include <iomanip>
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Script::Script() : mFormId(0), mFlags(0)
+{
+    mEditorId.clear();
+}
+
+ESM4::Script::~Script()
+{
+}
+
+void ESM4::Script::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    static ScriptLocalVariableData localVar;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID:
+            {
+                reader.getZString(mEditorId);
+                break;
+            }
+            case ESM4::SUB_SCHR:
+            {
+    // For debugging only
+#if 0
+                unsigned char mDataBuf[256/*bufSize*/];
+                reader.get(&mDataBuf[0], subHdr.dataSize);
+
+                std::ostringstream ss;
+                for (unsigned int i = 0; i < subHdr.dataSize; ++i)
+                {
+                    //if (mDataBuf[i] > 64 && mDataBuf[i] < 91)
+                        //ss << (char)(mDataBuf[i]) << " ";
+                    //else
+                        ss << std::setfill('0') << std::setw(2) << std::hex << (int)(mDataBuf[i]);
+                    if ((i & 0x000f) == 0xf)
+                        ss << "\n";
+                    else if (i < 256/*bufSize*/-1)
+                        ss << " ";
+                }
+                std::cout << ss.str() << std::endl;
+#else
+                reader.get(mScript.scriptHeader);
+#endif
+                break;
+            }
+            case ESM4::SUB_SCTX: reader.getString(mScript.scriptSource);
+                //if (mEditorId == "CTrapLogs01SCRIPT")
+                    //std::cout << mScript.scriptSource << std::endl;
+                break;
+            case ESM4::SUB_SCDA: // compiled script data
+            {
+    // For debugging only
+#if 0
+                if (subHdr.dataSize >= 4096)
+                {
+                    std::cout << "Skipping " << mEditorId << std::endl;
+                    reader.skipSubRecordData();
+                    break;
+                }
+
+                std::cout << mEditorId << std::endl;
+
+                unsigned char mDataBuf[4096/*bufSize*/];
+                reader.get(&mDataBuf[0], subHdr.dataSize);
+
+                std::ostringstream ss;
+                for (unsigned int i = 0; i < subHdr.dataSize; ++i)
+                {
+                    //if (mDataBuf[i] > 64 && mDataBuf[i] < 91)
+                        //ss << (char)(mDataBuf[i]) << " ";
+                    //else
+                        ss << std::setfill('0') << std::setw(2) << std::hex << (int)(mDataBuf[i]);
+                    if ((i & 0x000f) == 0xf)
+                        ss << "\n";
+                    else if (i < 4096/*bufSize*/-1)
+                        ss << " ";
+                }
+                std::cout << ss.str() << std::endl;
+#else
+                reader.skipSubRecordData();
+#endif
+                break;
+            }
+            case ESM4::SUB_SCRO: reader.getFormId(mScript.globReference); break;
+            case ESM4::SUB_SLSD:
+            {
+                localVar.clear();
+                reader.get(localVar.index);
+                reader.get(localVar.unknown1);
+                reader.get(localVar.unknown2);
+                reader.get(localVar.unknown3);
+                reader.get(localVar.type);
+                reader.get(localVar.unknown4);
+                // WARN: assumes SCVR will follow immediately
+
+                break;
+            }
+            case ESM4::SUB_SCVR: // assumed always pair with SLSD
+            {
+                reader.getZString(localVar.variableName);
+
+                mScript.localVarData.push_back(localVar);
+
+                break;
+            }
+            case ESM4::SUB_SCRV:
+            {
+                std::uint32_t index;
+                reader.get(index);
+
+                mScript.localRefVarIndex.push_back(index);
+
+                break;
+            }
+            default:
+                //std::cout << "SCPT " << ESM::printName(subHdr.typeId) << " skipping..."
+                          //<< subHdr.dataSize << std::endl;
+                //reader.skipSubRecordData();
+                //break;
+                throw std::runtime_error("ESM4::SCPT::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Script::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Script::blank()
+//{
+//}
diff --git a/components/esm4/loadscpt.hpp b/components/esm4/loadscpt.hpp
new file mode 100644
index 0000000000..747f49444d
--- /dev/null
+++ b/components/esm4/loadscpt.hpp
@@ -0,0 +1,59 @@
+/*
+  Copyright (C) 2019, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_SCPT_H
+#define ESM4_SCPT_H
+
+#include <cstdint>
+
+#include "formid.hpp"
+#include "script.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Script
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+
+        ScriptDefinition mScript;
+
+        Script();
+        virtual ~Script();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_SCPT_H
diff --git a/components/esm4/loadscrl.cpp b/components/esm4/loadscrl.cpp
new file mode 100644
index 0000000000..c09147ce5e
--- /dev/null
+++ b/components/esm4/loadscrl.cpp
@@ -0,0 +1,99 @@
+/*
+  Copyright (C) 2019-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadscrl.hpp"
+
+#include <stdexcept>
+//#include <iostream> // FIXME: testing only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Scroll::Scroll() : mFormId(0), mFlags(0)
+{
+    mEditorId.clear();
+    mFullName.clear();
+    mModel.clear();
+    mText.clear();
+
+    mData.value = 0;
+    mData.weight = 0.f;
+}
+
+ESM4::Scroll::~Scroll()
+{
+}
+
+void ESM4::Scroll::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_DESC: reader.getLocalizedString(mText); break;
+            case ESM4::SUB_DATA:
+            {
+                reader.get(mData.value);
+                reader.get(mData.weight);
+                break;
+            }
+            case ESM4::SUB_MODL: reader.getZString(mModel); break;
+            //case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
+            case ESM4::SUB_OBND:
+            case ESM4::SUB_CTDA:
+            case ESM4::SUB_EFID:
+            case ESM4::SUB_EFIT:
+            case ESM4::SUB_ETYP:
+            case ESM4::SUB_KSIZ:
+            case ESM4::SUB_KWDA:
+            case ESM4::SUB_MDOB:
+            case ESM4::SUB_MODT:
+            case ESM4::SUB_SPIT:
+            {
+                //std::cout << "SCRL " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::SCRL::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Scroll::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Scroll::blank()
+//{
+//}
diff --git a/components/esm4/loadscrl.hpp b/components/esm4/loadscrl.hpp
new file mode 100644
index 0000000000..a88781a6f8
--- /dev/null
+++ b/components/esm4/loadscrl.hpp
@@ -0,0 +1,68 @@
+/*
+  Copyright (C) 2019, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_SCRL_H
+#define ESM4_SCRL_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Scroll
+    {
+        struct Data
+        {
+            std::uint32_t value;
+            float         weight;
+        };
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mFullName;
+        std::string mModel;
+        std::string mText;
+
+        Data mData;
+
+        Scroll();
+        virtual ~Scroll();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_SCRL_H
diff --git a/components/esm4/loadsgst.cpp b/components/esm4/loadsgst.cpp
new file mode 100644
index 0000000000..b46c6bad29
--- /dev/null
+++ b/components/esm4/loadsgst.cpp
@@ -0,0 +1,118 @@
+/*
+  Copyright (C) 2016, 2018, 2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadsgst.hpp"
+
+#include <stdexcept>
+#include <cstring>
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::SigilStone::SigilStone() : mFormId(0), mFlags(0), mBoundRadius(0.f), mScriptId(0)
+{
+    mEditorId.clear();
+    mFullName.clear();
+    mModel.clear();
+    mIcon.clear();
+
+    mData.uses = 0;
+    mData.value = 0;
+    mData.weight = 0.f;
+
+    std::memset(&mEffect, 0, sizeof(ScriptEffect));
+}
+
+ESM4::SigilStone::~SigilStone()
+{
+}
+
+void ESM4::SigilStone::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_FULL:
+            {
+                if (mFullName.empty())
+                {
+                    if (!reader.getZString(mFullName))
+                        throw std::runtime_error ("SGST FULL data read error");
+                }
+                else
+                {
+                    // FIXME: should be part of a struct?
+                    std::string scriptEffectName;
+                    if (!reader.getZString(scriptEffectName))
+                        throw std::runtime_error ("SGST FULL data read error");
+                    mScriptEffect.push_back(scriptEffectName);
+                }
+                break;
+            }
+            case ESM4::SUB_DATA:
+            {
+                reader.get(mData.uses);
+                reader.get(mData.value);
+                reader.get(mData.weight);
+                break;
+            }
+            case ESM4::SUB_MODL: reader.getZString(mModel); break;
+            case ESM4::SUB_ICON: reader.getZString(mIcon);  break;
+            case ESM4::SUB_SCRI: reader.getFormId(mScriptId); break;
+            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
+            case ESM4::SUB_SCIT:
+            {
+                reader.get(mEffect);
+                reader.adjustFormId(mEffect.formId);
+                break;
+            }
+            case ESM4::SUB_MODT:
+            case ESM4::SUB_EFID:
+            case ESM4::SUB_EFIT:
+            {
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::SGST::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::SigilStone::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::SigilStone::blank()
+//{
+//}
diff --git a/components/esm4/loadsgst.hpp b/components/esm4/loadsgst.hpp
new file mode 100644
index 0000000000..b0bbf9d800
--- /dev/null
+++ b/components/esm4/loadsgst.hpp
@@ -0,0 +1,75 @@
+/*
+  Copyright (C) 2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_SGST_H
+#define ESM4_SGST_H
+
+#include <cstdint>
+#include <vector>
+
+#include "effect.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct SigilStone
+    {
+        struct Data
+        {
+            std::uint8_t  uses;
+            std::uint32_t value; // gold
+            float         weight;
+        };
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mFullName;
+        std::string mModel;
+        std::string mIcon; // inventory
+
+        float mBoundRadius;
+
+        std::vector<std::string> mScriptEffect; // FIXME: prob. should be in a struct
+        FormId mScriptId;
+        ScriptEffect mEffect;
+
+        Data mData;
+
+        SigilStone();
+        virtual ~SigilStone();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_SGST_H
diff --git a/components/esm4/loadslgm.cpp b/components/esm4/loadslgm.cpp
new file mode 100644
index 0000000000..482c817802
--- /dev/null
+++ b/components/esm4/loadslgm.cpp
@@ -0,0 +1,91 @@
+/*
+  Copyright (C) 2016, 2018, 2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadslgm.hpp"
+
+#include <stdexcept>
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::SoulGem::SoulGem() : mFormId(0), mFlags(0), mBoundRadius(0.f), mScriptId(0), mSoul(0), mSoulCapacity(0)
+{
+    mEditorId.clear();
+    mFullName.clear();
+    mModel.clear();
+    mIcon.clear();
+
+    mData.value = 0;
+    mData.weight = 0.f;
+}
+
+ESM4::SoulGem::~SoulGem()
+{
+}
+
+void ESM4::SoulGem::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_MODL: reader.getZString(mModel); break;
+            case ESM4::SUB_ICON: reader.getZString(mIcon);  break;
+            case ESM4::SUB_DATA: reader.get(mData);         break;
+            case ESM4::SUB_SCRI: reader.getFormId(mScriptId); break;
+            case ESM4::SUB_SOUL: reader.get(mSoul);         break;
+            case ESM4::SUB_SLCP: reader.get(mSoulCapacity); break;
+            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
+            case ESM4::SUB_MODT:
+            case ESM4::SUB_KSIZ:
+            case ESM4::SUB_KWDA:
+            case ESM4::SUB_NAM0:
+            case ESM4::SUB_OBND:
+            {
+                //std::cout << "SLGM " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::SLGM::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::SoulGem::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::SoulGem::blank()
+//{
+//}
diff --git a/components/esm4/loadslgm.hpp b/components/esm4/loadslgm.hpp
new file mode 100644
index 0000000000..8724da13c1
--- /dev/null
+++ b/components/esm4/loadslgm.hpp
@@ -0,0 +1,76 @@
+/*
+  Copyright (C) 2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_SLGM_H
+#define ESM4_SLGM_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct SoulGem
+    {
+#pragma pack(push, 1)
+        struct Data
+        {
+            std::uint32_t value; // gold
+            float         weight;
+        };
+#pragma pack(pop)
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mFullName;
+        std::string mModel;
+        std::string mIcon; // inventory
+
+        float mBoundRadius;
+
+        FormId mScriptId;
+        std::uint8_t mSoul;         // 0 = None, 1 = Petty, 2 = Lesser, 3 = Common, 4 = Greater, 5 = Grand
+        std::uint8_t mSoulCapacity; // 0 = None, 1 = Petty, 2 = Lesser, 3 = Common, 4 = Greater, 5 = Grand
+
+        Data mData;
+
+        SoulGem();
+        virtual ~SoulGem();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_SLGM_H
diff --git a/components/esm4/loadsndr.cpp b/components/esm4/loadsndr.cpp
new file mode 100644
index 0000000000..25109e36b6
--- /dev/null
+++ b/components/esm4/loadsndr.cpp
@@ -0,0 +1,94 @@
+/*
+  Copyright (C) 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadsndr.hpp"
+
+#include <stdexcept>
+//#include <iostream> // FIXME: for debugging only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::SoundReference::SoundReference() : mFormId(0), mFlags(0), mSoundCategory(0), mSoundId(0), mOutputModel(0)
+{
+    mEditorId.clear();
+    mSoundFile.clear();
+}
+
+ESM4::SoundReference::~SoundReference()
+{
+}
+
+void ESM4::SoundReference::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId);  break;
+            case ESM4::SUB_CTDA:
+            {
+                reader.get(&mTargetCondition, 20);
+                reader.get(mTargetCondition.runOn);
+                reader.get(mTargetCondition.reference);
+                if (mTargetCondition.reference)
+                    reader.adjustFormId(mTargetCondition.reference);
+                reader.skipSubRecordData(4); // unknown
+
+                break;
+            }
+            case ESM4::SUB_GNAM: reader.getFormId(mSoundCategory); break;
+            case ESM4::SUB_SNAM: reader.getFormId(mSoundId); break;
+            case ESM4::SUB_ONAM: reader.getFormId(mOutputModel); break;
+            case ESM4::SUB_ANAM: reader.getZString(mSoundFile);  break;
+            case ESM4::SUB_LNAM: reader.get(mLoopInfo); break;
+            case ESM4::SUB_BNAM: reader.get(mData); break;
+            case ESM4::SUB_CNAM: // CRC32 hash
+            case ESM4::SUB_FNAM: // unknown
+            {
+                //std::cout << "SNDR " << ESM::printName(subHdr.typeId) << " skipping..."
+                          //<< subHdr.dataSize << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::SNDR::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::SoundReference::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::SoundReference::blank()
+//{
+//}
diff --git a/components/esm4/loadsndr.hpp b/components/esm4/loadsndr.hpp
new file mode 100644
index 0000000000..17f0491136
--- /dev/null
+++ b/components/esm4/loadsndr.hpp
@@ -0,0 +1,86 @@
+/*
+  Copyright (C) 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_SNDR_H
+#define ESM4_SNDR_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+#include "script.hpp" // TargetCondition
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+#pragma pack(push, 1)
+    struct LoopInfo
+    {
+        std::uint16_t flags;
+        std::uint8_t unknown;
+        std::uint8_t rumble;
+    };
+
+    struct SoundInfo
+    {
+        std::int8_t frequencyAdjustment; // %, signed
+        std::uint8_t frequencyVariance;  // %
+        std::uint8_t priority;           // default 128
+        std::uint8_t dBVriance;
+        std::uint16_t staticAttenuation; // divide by 100 to get value in dB
+    };
+#pragma pack(pop)
+
+    struct SoundReference
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+
+        FormId mSoundCategory; // SNCT
+        FormId mSoundId; // another SNDR
+        FormId mOutputModel; // SOPM
+
+        std::string mSoundFile;
+        LoopInfo mLoopInfo;
+        SoundInfo mData;
+
+        TargetCondition mTargetCondition;
+
+        SoundReference();
+        virtual ~SoundReference();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_SNDR_H
diff --git a/components/esm4/loadsoun.cpp b/components/esm4/loadsoun.cpp
new file mode 100644
index 0000000000..6441d8a799
--- /dev/null
+++ b/components/esm4/loadsoun.cpp
@@ -0,0 +1,95 @@
+/*
+  Copyright (C) 2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadsoun.hpp"
+
+#include <stdexcept>
+//#include <iostream> // FIXME
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Sound::Sound() : mFormId(0), mFlags(0)
+{
+    mEditorId.clear();
+    mSoundFile.clear();
+}
+
+ESM4::Sound::~Sound()
+{
+}
+
+void ESM4::Sound::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId);  break;
+            case ESM4::SUB_FNAM: reader.getZString(mSoundFile); break;
+            case ESM4::SUB_SNDX: reader.get(mData); break;
+            case ESM4::SUB_SNDD:
+            {
+                if (subHdr.dataSize == 8)
+                    reader.get(&mData, 8);
+                else
+                {
+                    reader.get(mData);
+                    reader.get(mExtra);
+                }
+
+                break;
+            }
+            case ESM4::SUB_OBND: // TES5 only
+            case ESM4::SUB_SDSC: // TES5 only
+            case ESM4::SUB_ANAM: // FO3
+            case ESM4::SUB_GNAM: // FO3
+            case ESM4::SUB_HNAM: // FO3
+            case ESM4::SUB_RNAM: // FONV
+            {
+                //std::cout << "SOUN " << ESM::printName(subHdr.typeId) << " skipping..."
+                          //<< subHdr.dataSize << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::SOUN::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Sound::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Sound::blank()
+//{
+//}
diff --git a/components/esm4/loadsoun.hpp b/components/esm4/loadsoun.hpp
new file mode 100644
index 0000000000..845f38c380
--- /dev/null
+++ b/components/esm4/loadsoun.hpp
@@ -0,0 +1,101 @@
+/*
+  Copyright (C) 2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_SOUN_H
+#define ESM4_SOUN_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Sound
+    {
+        enum Flags
+        {
+            Flag_RandomFreqShift = 0x0001,
+            Flag_PlayAtRandom    = 0x0002,
+            Flag_EnvIgnored      = 0x0004,
+            Flag_RandomLocation  = 0x0008,
+            Flag_Loop            = 0x0010,
+            Flag_MenuSound       = 0x0020,
+            Flag_2D              = 0x0040,
+            Flag_360LFE          = 0x0080
+        };
+
+#pragma pack(push, 1)
+        struct SNDX
+        {
+            std::uint8_t  minAttenuation; // distance?
+            std::uint8_t  maxAttenuation; // distance?
+            std::int8_t   freqAdjustment; // %, signed
+            std::uint8_t  unknown; // probably padding
+            std::uint16_t flags;
+            std::uint16_t unknown2; // probably padding
+            std::uint16_t staticAttenuation; // divide by 100 to get value in dB
+            std::uint8_t  stopTime;  // multiply by 1440/256 to get value in minutes
+            std::uint8_t  startTime; // multiply by 1440/256 to get value in minutes
+        };
+
+        struct SoundData
+        {
+            std::int16_t attenuationPoint1;
+            std::int16_t attenuationPoint2;
+            std::int16_t attenuationPoint3;
+            std::int16_t attenuationPoint4;
+            std::int16_t attenuationPoint5;
+            std::int16_t reverbAttenuationControl;
+            std::int32_t priority;
+            std::int32_t x;
+            std::int32_t y;
+        };
+#pragma pack(pop)
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+
+        std::string mSoundFile;
+        SNDX mData;
+        SoundData mExtra;
+
+        Sound();
+        virtual ~Sound();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_SOUN_H
diff --git a/components/esm4/loadstat.cpp b/components/esm4/loadstat.cpp
new file mode 100644
index 0000000000..de487147fe
--- /dev/null
+++ b/components/esm4/loadstat.cpp
@@ -0,0 +1,101 @@
+/*
+  Copyright (C) 2015-2016, 2018 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadstat.hpp"
+
+#include <stdexcept>
+#include <iostream> // FIXME: debug only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Static::Static() : mFormId(0), mFlags(0), mBoundRadius(0.f)
+{
+    mEditorId.clear();
+    mModel.clear();
+}
+
+ESM4::Static::~Static()
+{
+}
+
+void ESM4::Static::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_MODL: reader.getZString(mModel); break;
+            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
+            case ESM4::SUB_MODT:
+            {
+                // version is only availabe in TES5 (seems to be 27 or 28?)
+                //if (reader.esmVersion() == ESM::VER_094 || reader.esmVersion() == ESM::VER_170)
+                    //std::cout << "STAT MODT ver: " << std::hex << reader.hdr().record.version << std::endl;
+
+                // for TES4 these are just a sequence of bytes
+                mMODT.resize(subHdr.dataSize/sizeof(std::uint8_t));
+                for (std::vector<std::uint8_t>::iterator it = mMODT.begin(); it != mMODT.end(); ++it)
+                {
+                    reader.get(*it);
+#if 0
+                    std::string padding = "";
+                    padding.insert(0, reader.stackSize()*2, ' ');
+                    std::cout << padding  << "MODT: " << std::hex << *it << std::endl;
+#endif
+                }
+                break;
+            }
+            case ESM4::SUB_MODS:
+            case ESM4::SUB_OBND:
+            case ESM4::SUB_DNAM:
+            case ESM4::SUB_MNAM:
+            case ESM4::SUB_BRUS: // FONV
+            case ESM4::SUB_RNAM: // FONV
+            {
+                //std::cout << "STAT " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::STAT::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Static::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Static::blank()
+//{
+//}
diff --git a/components/esm4/loadstat.hpp b/components/esm4/loadstat.hpp
new file mode 100644
index 0000000000..966721ef37
--- /dev/null
+++ b/components/esm4/loadstat.hpp
@@ -0,0 +1,62 @@
+/*
+  Copyright (C) 2015-2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_STAT_H
+#define ESM4_STAT_H
+
+#include <cstdint>
+#include <string>
+#include <vector>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Static
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mModel;
+
+        float mBoundRadius;
+        std::vector<std::uint8_t> mMODT; // FIXME texture hash
+
+        Static();
+        virtual ~Static();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_STAT_H
diff --git a/components/esm4/loadtact.cpp b/components/esm4/loadtact.cpp
new file mode 100644
index 0000000000..c082048086
--- /dev/null
+++ b/components/esm4/loadtact.cpp
@@ -0,0 +1,89 @@
+/*
+  Copyright (C) 2019-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadtact.hpp"
+
+#include <stdexcept>
+#include <iostream> // FIXME: testing only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::TalkingActivator::TalkingActivator() : mFormId(0), mFlags(0), mScriptId(0), mVoiceType(0), mLoopSound(0),
+    mRadioTemplate(0)
+{
+    mEditorId.clear();
+    mFullName.clear();
+    mModel.clear();
+}
+
+ESM4::TalkingActivator::~TalkingActivator()
+{
+}
+
+void ESM4::TalkingActivator::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_SCRI: reader.getFormId(mScriptId); break;
+            case ESM4::SUB_VNAM: reader.getFormId(mVoiceType); break;
+            case ESM4::SUB_SNAM: reader.getFormId(mLoopSound); break;
+            case ESM4::SUB_INAM: reader.getFormId(mRadioTemplate); break; // FONV
+            case ESM4::SUB_MODL: reader.getZString(mModel); break;
+            case ESM4::SUB_DEST: // FO3 destruction
+            case ESM4::SUB_DSTD: // FO3 destruction
+            case ESM4::SUB_DSTF: // FO3 destruction
+            case ESM4::SUB_FNAM:
+            case ESM4::SUB_PNAM:
+            case ESM4::SUB_MODT: // texture file hash?
+            case ESM4::SUB_OBND:
+            {
+                //std::cout << "TACT " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::TACT::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::TalkingActivator::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::TalkingActivator::blank()
+//{
+//}
diff --git a/components/esm4/loadtact.hpp b/components/esm4/loadtact.hpp
new file mode 100644
index 0000000000..a1d15524be
--- /dev/null
+++ b/components/esm4/loadtact.hpp
@@ -0,0 +1,76 @@
+/*
+  Copyright (C) 2019, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_TACT_H
+#define ESM4_TACT_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    enum TalkingActivatorFlags
+    {
+         TACT_OnLocalMap      = 0x00000200,
+         TACT_QuestItem       = 0x00000400,
+         TACT_NoVoiceFilter   = 0x00002000,
+         TACT_RandomAnimStart = 0x00010000,
+         TACT_RadioStation    = 0x00020000,
+         TACT_NonProxy        = 0x10000000, // only valid if Radio Station
+         TACT_ContBroadcast   = 0x40000000  // only valid if Radio Station
+    };
+
+    struct TalkingActivator
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see above for details
+
+        std::string mEditorId;
+        std::string mFullName;
+
+        std::string mModel;
+
+        FormId mScriptId;
+        FormId mVoiceType;     // VTYP
+        FormId mLoopSound;     // SOUN
+        FormId mRadioTemplate; // SOUN
+
+        TalkingActivator();
+        virtual ~TalkingActivator();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_TACT_H
diff --git a/components/esm4/loadterm.cpp b/components/esm4/loadterm.cpp
new file mode 100644
index 0000000000..68a436d87c
--- /dev/null
+++ b/components/esm4/loadterm.cpp
@@ -0,0 +1,101 @@
+/*
+  Copyright (C) 2019-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadterm.hpp"
+
+#include <stdexcept>
+//#include <iostream> // FIXME: testing only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Terminal::Terminal() : mFormId(0), mFlags(0), mScriptId(0), mPasswordNote(0), mSound(0)
+{
+    mEditorId.clear();
+    mFullName.clear();
+    mText.clear();
+
+    mModel.clear();
+    mResultText.clear();
+}
+
+ESM4::Terminal::~Terminal()
+{
+}
+
+void ESM4::Terminal::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_DESC: reader.getLocalizedString(mText); break;
+            case ESM4::SUB_SCRI: reader.getFormId(mScriptId); break;
+            case ESM4::SUB_PNAM: reader.getFormId(mPasswordNote); break;
+            case ESM4::SUB_SNAM: reader.getFormId(mSound); break;
+            case ESM4::SUB_MODL: reader.getZString(mModel); break;
+            case ESM4::SUB_RNAM: reader.getZString(mResultText); break;
+            case ESM4::SUB_DNAM: // difficulty
+            case ESM4::SUB_ANAM: // flags
+            case ESM4::SUB_CTDA:
+            case ESM4::SUB_INAM:
+            case ESM4::SUB_ITXT:
+            case ESM4::SUB_MODT: // texture hash?
+            case ESM4::SUB_SCDA:
+            case ESM4::SUB_SCHR:
+            case ESM4::SUB_SCRO:
+            case ESM4::SUB_SCRV:
+            case ESM4::SUB_SCTX:
+            case ESM4::SUB_SCVR:
+            case ESM4::SUB_SLSD:
+            case ESM4::SUB_TNAM:
+            case ESM4::SUB_OBND:
+            case ESM4::SUB_MODS: // FONV
+            {
+                //std::cout << "TERM " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::TERM::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Terminal::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Terminal::blank()
+//{
+//}
diff --git a/components/esm4/loadterm.hpp b/components/esm4/loadterm.hpp
new file mode 100644
index 0000000000..9fb0ee60a8
--- /dev/null
+++ b/components/esm4/loadterm.hpp
@@ -0,0 +1,66 @@
+/*
+  Copyright (C) 2019, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_TERM_H
+#define ESM4_TERM_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Terminal
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mFullName;
+        std::string mText;
+
+        std::string mModel;
+        std::string mResultText;
+
+        FormId mScriptId;
+        FormId mPasswordNote;
+        FormId mSound;
+
+        Terminal();
+        virtual ~Terminal();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_TERM_H
diff --git a/components/esm4/loadtes4.cpp b/components/esm4/loadtes4.cpp
new file mode 100644
index 0000000000..42c4acde4e
--- /dev/null
+++ b/components/esm4/loadtes4.cpp
@@ -0,0 +1,113 @@
+/*
+  Copyright (C) 2015-2016, 2018, 2020-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadtes4.hpp"
+
+#ifdef NDEBUG // FIXME: debuggigng only
+#undef NDEBUG
+#endif
+
+#include <cassert>
+#include <stdexcept>
+
+#include <iostream> // FIXME: debugging only
+
+#include "common.hpp"
+#include "formid.hpp"
+#include "reader.hpp"
+//#include "writer.hpp"
+
+void ESM4::Header::load(ESM4::Reader& reader)
+{
+    mFlags = reader.hdr().record.flags; // 0x01 = Rec_ESM, 0x80 = Rec_Localized
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_HEDR:
+            {
+                if (!reader.getExact(mData.version) || !reader.getExact(mData.records) || !reader.getExact(mData.nextObjectId))
+                    throw std::runtime_error("TES4 HEDR data read error");
+
+                assert((size_t)subHdr.dataSize == sizeof(mData.version)+sizeof(mData.records)+sizeof(mData.nextObjectId)
+                        && "TES4 HEDR data size mismatch");
+                break;
+            }
+            case ESM4::SUB_CNAM: reader.getZString(mAuthor); break;
+            case ESM4::SUB_SNAM: reader.getZString(mDesc); break;
+            case ESM4::SUB_MAST: // multiple
+            {
+                ESM::MasterData m;
+                if (!reader.getZString(m.name))
+                    throw std::runtime_error("TES4 MAST data read error");
+
+                // NOTE: some mods do not have DATA following MAST so can't read DATA here
+
+                mMaster.push_back (m);
+                break;
+            }
+            case ESM4::SUB_DATA:
+            {
+                // WARNING: assumes DATA always follows MAST
+                if (!reader.getExact(mMaster.back().size))
+                    throw std::runtime_error("TES4 DATA data read error");
+                break;
+            }
+            case ESM4::SUB_ONAM:
+            {
+                mOverrides.resize(subHdr.dataSize/sizeof(FormId));
+                for (unsigned int & mOverride : mOverrides)
+                {
+                    if (!reader.getExact(mOverride))
+                        throw std::runtime_error("TES4 ONAM data read error");
+#if 0
+                    std::string padding = "";
+                    padding.insert(0, reader.stackSize()*2, ' ');
+                    std::cout << padding  << "ESM4::Header::ONAM overrides: " << formIdToString(mOverride) << std::endl;
+#endif
+                }
+                break;
+            }
+            case ESM4::SUB_INTV:
+            case ESM4::SUB_INCC:
+            case ESM4::SUB_OFST: // Oblivion only?
+            case ESM4::SUB_DELE: // Oblivion only?
+            {
+                //std::cout << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::Header::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Header::save(ESM4::Writer& writer)
+//{
+//}
diff --git a/components/esm4/loadtes4.hpp b/components/esm4/loadtes4.hpp
new file mode 100644
index 0000000000..6d84fe360b
--- /dev/null
+++ b/components/esm4/loadtes4.hpp
@@ -0,0 +1,69 @@
+/*
+  Copyright (C) 2015-2016, 2018, 2020-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_TES4_H
+#define ESM4_TES4_H
+
+#include <vector>
+
+#include "formid.hpp"
+#include "../esm/common.hpp" // ESMVersion, MasterData
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+#pragma pack(push, 1)
+    struct Data
+    {
+        ESM::ESMVersion version; // File format version.
+        std::int32_t    records; // Number of records
+        std::uint32_t   nextObjectId;
+    };
+#pragma pack(pop)
+
+    struct Header
+    {
+        std::uint32_t mFlags; // 0x01 esm, 0x80 localised strings
+
+        Data mData;
+        std::string mAuthor; // Author's name
+        std::string mDesc;   // File description
+        std::vector<ESM::MasterData> mMaster;
+
+        std::vector<FormId> mOverrides; // Skyrim only, cell children (ACHR, LAND, NAVM, PGRE, PHZD, REFR)
+
+        // position in the vector = mod index of master files above
+        // value = adjusted mod index based on all the files loaded so far
+        //std::vector<std::uint32_t> mModIndices;
+
+        void load (Reader& reader);
+        //void save (Writer& writer);
+    };
+}
+
+#endif // ESM4_TES4_H
diff --git a/components/esm4/loadtree.cpp b/components/esm4/loadtree.cpp
new file mode 100644
index 0000000000..7029222758
--- /dev/null
+++ b/components/esm4/loadtree.cpp
@@ -0,0 +1,85 @@
+/*
+  Copyright (C) 2016, 2018 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadtree.hpp"
+
+#include <stdexcept>
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Tree::Tree() : mFormId(0), mFlags(0), mBoundRadius(0.f)
+{
+    mEditorId.clear();
+    mModel.clear();
+    mLeafTexture.clear();
+}
+
+ESM4::Tree::~Tree()
+{
+}
+
+void ESM4::Tree::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_MODL: reader.getZString(mModel);    break;
+            case ESM4::SUB_ICON: reader.getZString(mLeafTexture); break;
+            case ESM4::SUB_MODB: reader.get(mBoundRadius);     break;
+            case ESM4::SUB_MODT:
+            case ESM4::SUB_CNAM:
+            case ESM4::SUB_BNAM:
+            case ESM4::SUB_SNAM:
+            case ESM4::SUB_FULL:
+            case ESM4::SUB_OBND:
+            case ESM4::SUB_PFIG:
+            case ESM4::SUB_PFPC:
+            {
+                //std::cout << "TREE " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::TREE::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Tree::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Tree::blank()
+//{
+//}
diff --git a/components/esm4/loadtree.hpp b/components/esm4/loadtree.hpp
new file mode 100644
index 0000000000..2069f93d95
--- /dev/null
+++ b/components/esm4/loadtree.hpp
@@ -0,0 +1,62 @@
+/*
+  Copyright (C) 2016, 2018, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_TREE_H
+#define ESM4_TREE_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Tree
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mModel;
+
+        float mBoundRadius;
+
+        std::string mLeafTexture;
+
+        Tree();
+        virtual ~Tree();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_TREE_H
diff --git a/components/esm4/loadtxst.cpp b/components/esm4/loadtxst.cpp
new file mode 100644
index 0000000000..ce281d4848
--- /dev/null
+++ b/components/esm4/loadtxst.cpp
@@ -0,0 +1,92 @@
+/*
+  Copyright (C) 2019, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadtxst.hpp"
+
+#include <stdexcept>
+#include <iostream> // FIXME: testing only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::TextureSet::TextureSet() : mFormId(0), mFlags(0)
+{
+    mEditorId.clear();
+    mDiffuse.clear();
+    mNormalMap.clear();
+    mEnvMask.clear();
+    mToneMap.clear();
+    mDetailMap.clear();
+    mEnvMap.clear();
+    mUnknown.clear();
+    mSpecular.clear();
+}
+
+ESM4::TextureSet::~TextureSet()
+{
+}
+
+void ESM4::TextureSet::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_TX00: reader.getZString(mDiffuse); break;
+            case ESM4::SUB_TX01: reader.getZString(mNormalMap); break;
+            case ESM4::SUB_TX02: reader.getZString(mEnvMask); break;
+            case ESM4::SUB_TX03: reader.getZString(mToneMap); break;
+            case ESM4::SUB_TX04: reader.getZString(mDetailMap); break;
+            case ESM4::SUB_TX05: reader.getZString(mEnvMap); break;
+            case ESM4::SUB_TX06: reader.getZString(mUnknown); break;
+            case ESM4::SUB_TX07: reader.getZString(mSpecular); break;
+            case ESM4::SUB_DNAM:
+            case ESM4::SUB_DODT:
+            case ESM4::SUB_OBND: // object bounds
+            {
+                //std::cout << "TXST " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::TXST::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::TextureSet::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::TextureSet::blank()
+//{
+//}
diff --git a/components/esm4/loadtxst.hpp b/components/esm4/loadtxst.hpp
new file mode 100644
index 0000000000..cc81923e1f
--- /dev/null
+++ b/components/esm4/loadtxst.hpp
@@ -0,0 +1,66 @@
+/*
+  Copyright (C) 2019, 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_TXST_H
+#define ESM4_TXST_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct TextureSet
+    {
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+
+        std::string mDiffuse; // includes alpha info
+        std::string mNormalMap; // includes specular info (alpha channel)
+        std::string mEnvMask;
+        std::string mToneMap;
+        std::string mDetailMap;
+        std::string mEnvMap;
+        std::string mUnknown;
+        std::string mSpecular;
+
+        TextureSet();
+        virtual ~TextureSet();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_TXST_H
diff --git a/components/esm4/loadweap.cpp b/components/esm4/loadweap.cpp
new file mode 100644
index 0000000000..b56e01171c
--- /dev/null
+++ b/components/esm4/loadweap.cpp
@@ -0,0 +1,188 @@
+/*
+  Copyright (C) 2016, 2018-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadweap.hpp"
+
+#include <stdexcept>
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::Weapon::Weapon() : mFormId(0), mFlags(0), mPickUpSound(0), mDropSound(0), mBoundRadius(0.f), mScriptId(0),
+                         mEnchantmentPoints(0), mEnchantment(0)
+{
+    mEditorId.clear();
+    mFullName.clear();
+    mModel.clear();
+    mText.clear();
+    mIcon.clear();
+    mMiniIcon.clear();
+}
+
+ESM4::Weapon::~Weapon()
+{
+}
+
+void ESM4::Weapon::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+    std::uint32_t esmVer = reader.esmVersion();
+    bool isFONV = esmVer == ESM::VER_132 || esmVer == ESM::VER_133 || esmVer == ESM::VER_134;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_DATA:
+            {
+                //if (reader.esmVersion() == ESM::VER_094 || reader.esmVersion() == ESM::VER_170)
+                if (subHdr.dataSize == 10) // FO3 has 15 bytes even though VER_094
+                {
+                    reader.get(mData.value);
+                    reader.get(mData.weight);
+                    reader.get(mData.damage);
+                }
+                else if (isFONV || subHdr.dataSize == 15)
+                {
+                    reader.get(mData.value);
+                    reader.get(mData.health);
+                    reader.get(mData.weight);
+                    reader.get(mData.damage);
+                    reader.get(mData.clipSize);
+                }
+                else
+                {
+                    reader.get(mData.type);
+                    reader.get(mData.speed);
+                    reader.get(mData.reach);
+                    reader.get(mData.flags);
+                    reader.get(mData.value);
+                    reader.get(mData.health);
+                    reader.get(mData.weight);
+                    reader.get(mData.damage);
+                }
+                break;
+            }
+            case ESM4::SUB_MODL: reader.getZString(mModel); break;
+            case ESM4::SUB_ICON: reader.getZString(mIcon);  break;
+            case ESM4::SUB_MICO: reader.getZString(mMiniIcon); break; // FO3
+            case ESM4::SUB_SCRI: reader.getFormId(mScriptId); break;
+            case ESM4::SUB_ANAM: reader.get(mEnchantmentPoints); break;
+            case ESM4::SUB_ENAM: reader.getFormId(mEnchantment); break;
+            case ESM4::SUB_MODB: reader.get(mBoundRadius);  break;
+            case ESM4::SUB_DESC: reader.getLocalizedString(mText); break;
+            case ESM4::SUB_YNAM: reader.getFormId(mPickUpSound); break;
+            case ESM4::SUB_ZNAM: reader.getFormId(mDropSound); break;
+            case ESM4::SUB_MODT:
+            case ESM4::SUB_BAMT:
+            case ESM4::SUB_BIDS:
+            case ESM4::SUB_INAM:
+            case ESM4::SUB_CNAM:
+            case ESM4::SUB_CRDT:
+            case ESM4::SUB_DNAM:
+            case ESM4::SUB_EAMT:
+            case ESM4::SUB_EITM:
+            case ESM4::SUB_ETYP:
+            case ESM4::SUB_KSIZ:
+            case ESM4::SUB_KWDA:
+            case ESM4::SUB_NAM8:
+            case ESM4::SUB_NAM9:
+            case ESM4::SUB_OBND:
+            case ESM4::SUB_SNAM:
+            case ESM4::SUB_TNAM:
+            case ESM4::SUB_UNAM:
+            case ESM4::SUB_VMAD:
+            case ESM4::SUB_VNAM:
+            case ESM4::SUB_WNAM:
+            case ESM4::SUB_XNAM: // Dawnguard only?
+            case ESM4::SUB_NNAM:
+            case ESM4::SUB_MODS:
+            case ESM4::SUB_NAM0: // FO3
+            case ESM4::SUB_REPL: // FO3
+            case ESM4::SUB_MOD2: // FO3
+            case ESM4::SUB_MO2T: // FO3
+            case ESM4::SUB_MO2S: // FO3
+            case ESM4::SUB_NAM6: // FO3
+            case ESM4::SUB_MOD4: // FO3
+            case ESM4::SUB_MO4T: // FO3
+            case ESM4::SUB_MO4S: // FO3
+            case ESM4::SUB_BIPL: // FO3
+            case ESM4::SUB_NAM7: // FO3
+            case ESM4::SUB_MOD3: // FO3
+            case ESM4::SUB_MO3T: // FO3
+            case ESM4::SUB_MO3S: // FO3
+            case ESM4::SUB_MODD: // FO3
+          //case ESM4::SUB_MOSD: // FO3
+            case ESM4::SUB_DEST: // FO3
+            case ESM4::SUB_DSTD: // FO3
+            case ESM4::SUB_DSTF: // FO3
+            case ESM4::SUB_DMDL: // FO3
+            case ESM4::SUB_DMDT: // FO3
+            case ESM4::SUB_VATS: // FONV
+            case ESM4::SUB_VANM: // FONV
+            case ESM4::SUB_MWD1: // FONV
+            case ESM4::SUB_MWD2: // FONV
+            case ESM4::SUB_MWD3: // FONV
+            case ESM4::SUB_MWD4: // FONV
+            case ESM4::SUB_MWD5: // FONV
+            case ESM4::SUB_MWD6: // FONV
+            case ESM4::SUB_MWD7: // FONV
+            case ESM4::SUB_WMI1: // FONV
+            case ESM4::SUB_WMI2: // FONV
+            case ESM4::SUB_WMI3: // FONV
+            case ESM4::SUB_WMS1: // FONV
+            case ESM4::SUB_WMS2: // FONV
+            case ESM4::SUB_WNM1: // FONV
+            case ESM4::SUB_WNM2: // FONV
+            case ESM4::SUB_WNM3: // FONV
+            case ESM4::SUB_WNM4: // FONV
+            case ESM4::SUB_WNM5: // FONV
+            case ESM4::SUB_WNM6: // FONV
+            case ESM4::SUB_WNM7: // FONV
+            case ESM4::SUB_EFSD: // FONV DeadMoney
+            {
+                //std::cout << "WEAP " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData();
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::WEAP::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+    }
+}
+
+//void ESM4::Weapon::save(ESM4::Writer& writer) const
+//{
+//}
+
+//void ESM4::Weapon::blank()
+//{
+//}
diff --git a/components/esm4/loadweap.hpp b/components/esm4/loadweap.hpp
new file mode 100644
index 0000000000..dae2da1e7e
--- /dev/null
+++ b/components/esm4/loadweap.hpp
@@ -0,0 +1,96 @@
+/*
+  Copyright (C) 2016, 2018-2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_WEAP_H
+#define ESM4_WEAP_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct Weapon
+    {
+        struct Data
+        {
+            // type
+            // 0 = Blade One Hand
+            // 1 = Blade Two Hand
+            // 2 = Blunt One Hand
+            // 3 = Blunt Two Hand
+            // 4 = Staff
+            // 5 = Bow
+            std::uint32_t type;
+            float         speed;
+            float         reach;
+            std::uint32_t flags;
+            std::uint32_t value; // gold
+            std::uint32_t health;
+            float         weight;
+            std::uint16_t damage;
+            std::uint8_t  clipSize; // FO3/FONV only
+
+            Data() : type(0), speed(0.f), reach(0.f), flags(0), value(0),
+                     health(0), weight(0.f), damage(0), clipSize(0) {}
+        };
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string mEditorId;
+        std::string mFullName;
+        std::string mModel;
+        std::string mText;
+        std::string mIcon;
+        std::string mMiniIcon;
+
+        FormId mPickUpSound;
+        FormId mDropSound;
+
+        float mBoundRadius;
+
+        FormId mScriptId;
+        std::uint16_t mEnchantmentPoints;
+        FormId      mEnchantment;
+
+        Data mData;
+
+        Weapon();
+        virtual ~Weapon();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+
+        //void blank();
+    };
+}
+
+#endif // ESM4_WEAP_H
diff --git a/components/esm4/loadwrld.cpp b/components/esm4/loadwrld.cpp
new file mode 100644
index 0000000000..ec01556338
--- /dev/null
+++ b/components/esm4/loadwrld.cpp
@@ -0,0 +1,205 @@
+/*
+  Copyright (C) 2015-2016, 2018-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#include "loadwrld.hpp"
+
+#include <stdexcept>
+//#include <iostream> // FIXME: debug only
+
+#include "reader.hpp"
+//#include "writer.hpp"
+
+ESM4::World::World() : mFormId(0), mFlags(0), mParent(0), mWorldFlags(0), mClimate(0), mWater(0),
+                       mLandLevel(0.f), mWaterLevel(0.f), // -2700.f and -14000.f for TES5
+                       mMinX(0), mMinY(0), mMaxX(0), mMaxY(0), mSound(0), mMusic(0), mParentUseFlags(0)
+{
+    mEditorId.clear();
+    mFullName.clear();
+    mMapFile.clear();
+
+    mMap.width = 0;
+    mMap.height = 0;
+    mMap.NWcellX = 0;
+    mMap.NWcellY = 0;
+    mMap.SEcellX = 0;
+    mMap.SEcellY = 0;
+    mMap.minHeight = 0.f;
+    mMap.maxHeight = 0.f;
+    mMap.initialPitch = 0.f;
+}
+
+ESM4::World::~World()
+{
+}
+
+void ESM4::World::load(ESM4::Reader& reader)
+{
+    mFormId = reader.hdr().record.id;
+    reader.adjustFormId(mFormId);
+    mFlags  = reader.hdr().record.flags;
+
+    // It should be possible to save the current world formId automatically while reading in
+    // the record header rather than doing it manually here but possibly less efficient (may
+    // need to check each record?).
+    //
+    // Alternatively it may be possible to figure it out by examining the group headers, but
+    // apparently the label field is not reliable so the parent world formid may have been
+    // corrupted by the use of ignore flag (TODO: should check to verify).
+    reader.setCurrWorld(mFormId); // save for CELL later
+
+    std::uint32_t subSize = 0; // for XXXX sub record
+
+    std::uint32_t esmVer = reader.esmVersion();
+    //bool isTES4 = (esmVer == ESM::VER_080 || esmVer == ESM::VER_100);
+    //bool isFONV = (esmVer == ESM::VER_132 || esmVer == ESM::VER_133 || esmVer == ESM::VER_134);
+    bool isTES5 = (esmVer == ESM::VER_094 || esmVer == ESM::VER_170); // WARN: FO3 is also VER_094
+    bool usingDefaultLevels = true;
+
+    while (reader.getSubRecordHeader())
+    {
+        const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
+        switch (subHdr.typeId)
+        {
+            case ESM4::SUB_EDID: reader.getZString(mEditorId); break;
+            case ESM4::SUB_FULL: reader.getLocalizedString(mFullName); break;
+            case ESM4::SUB_WCTR: reader.get(mCenterCell);   break; // Center cell, TES5 only
+            case ESM4::SUB_WNAM: reader.getFormId(mParent); break;
+            case ESM4::SUB_SNAM: reader.get(mSound);        break; // sound, Oblivion only?
+            case ESM4::SUB_ICON: reader.getZString(mMapFile); break; // map filename, Oblivion only?
+            case ESM4::SUB_CNAM: reader.get(mClimate);      break;
+            case ESM4::SUB_NAM2: reader.getFormId(mWater);  break;
+            case ESM4::SUB_NAM0:
+            {
+                reader.get(mMinX);
+                reader.get(mMinY);
+                break;
+            }
+            case ESM4::SUB_NAM9:
+            {
+                reader.get(mMaxX);
+                reader.get(mMaxY);
+                break;
+            }
+            case ESM4::SUB_DATA: reader.get(mWorldFlags);   break;
+            case ESM4::SUB_MNAM:
+            {
+                reader.get(mMap.width);
+                reader.get(mMap.height);
+                reader.get(mMap.NWcellX);
+                reader.get(mMap.NWcellY);
+                reader.get(mMap.SEcellX);
+                reader.get(mMap.SEcellY);
+
+                if (subHdr.dataSize == 28) // Skyrim?
+                {
+                    reader.get(mMap.minHeight);
+                    reader.get(mMap.maxHeight);
+                    reader.get(mMap.initialPitch);
+                }
+
+                break;
+            }
+            case ESM4::SUB_DNAM: // defaults
+            {
+                reader.get(mLandLevel);  //  -2700.f for TES5
+                reader.get(mWaterLevel); // -14000.f for TES5
+                usingDefaultLevels = false;
+
+                break;
+            }
+            // Only a few worlds in FO3 have music (I'm guessing 00090908 "explore" is the default?)
+            // 00090906 public  WRLD: 00000A74 MegatonWorld
+            // 00090CE7 base    WRLD: 0001A25D DCWorld18 (Arlington National Cemeteray)
+            // 00090CE7 base    WRLD: 0001A266 DCWorld09 (The Mall)
+            // 00090CE7 base    WRLD: 0001A267 DCWorld08 (Pennsylvania Avenue)
+            // 000BAD30 tranquilitylane WRLD: 000244A7 TranquilityLane
+            // 00090CE7 base    WRLD: 000271C0 MonumentWorld (The Washington Monument)
+            // 00090907 dungeon WRLD: 0004C4D1 MamaDolcesWorld (Mama Dolce's Loading Yard)
+            //
+            // FONV has only 3 (note the different format, also can't find the files?):
+            // 00119D2E freeside\freeside_01.mp3 0010BEEA FreesideWorld (Freeside)
+            // 00119D2E freeside\freeside_01.mp3 0012D94D FreesideNorthWorld (Freeside)
+            // 00119D2E freeside\freeside_01.mp3 0012D94E FreesideFortWorld (Old Mormon Fort)
+            // NOTE: FONV DefaultObjectManager has 00090908 "explore" as the default music
+            case ESM4::SUB_ZNAM: reader.getFormId(mMusic); break;
+            case ESM4::SUB_PNAM: reader.get(mParentUseFlags); break;
+            case ESM4::SUB_RNAM: // multiple
+            case ESM4::SUB_MHDT:
+            case ESM4::SUB_LTMP:
+            case ESM4::SUB_XEZN:
+            case ESM4::SUB_XLCN:
+            case ESM4::SUB_NAM3:
+            case ESM4::SUB_NAM4:
+            case ESM4::SUB_MODL:
+            case ESM4::SUB_NAMA:
+            case ESM4::SUB_ONAM:
+            case ESM4::SUB_TNAM:
+            case ESM4::SUB_UNAM:
+            case ESM4::SUB_XWEM:
+            case ESM4::SUB_MODT: // from Dragonborn onwards?
+            case ESM4::SUB_INAM: // FO3
+            case ESM4::SUB_NNAM: // FO3
+            case ESM4::SUB_XNAM: // FO3
+            case ESM4::SUB_IMPS: // FO3 Anchorage
+            case ESM4::SUB_IMPF: // FO3 Anchorage
+            {
+                //std::cout << "WRLD " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
+                reader.skipSubRecordData(); // FIXME: process the subrecord rather than skip
+                break;
+            }
+            case ESM4::SUB_OFST:
+            {
+                if (subSize)
+                {
+                    reader.skipSubRecordData(subSize); // special post XXXX
+                    reader.updateRecordRead(subSize); // WARNING: manually update
+                    subSize = 0;
+                }
+                else
+                    reader.skipSubRecordData(); // FIXME: process the subrecord rather than skip
+
+                break;
+            }
+            case ESM4::SUB_XXXX:
+            {
+                reader.get(subSize);
+                break;
+            }
+            default:
+                throw std::runtime_error("ESM4::WRLD::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
+        }
+
+        if (isTES5 && usingDefaultLevels)
+        {
+            mLandLevel = -2700.f;
+            mWaterLevel = -14000.f;
+        }
+    }
+}
+
+//void ESM4::World::save(ESM4::Writer& writer) const
+//{
+//}
diff --git a/components/esm4/loadwrld.hpp b/components/esm4/loadwrld.hpp
new file mode 100644
index 0000000000..0105dc12f4
--- /dev/null
+++ b/components/esm4/loadwrld.hpp
@@ -0,0 +1,137 @@
+/*
+  Copyright (C) 2015-2016, 2018-2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_WRLD_H
+#define ESM4_WRLD_H
+
+#include <cstdint>
+#include <vector>
+#include <string>
+
+#include "common.hpp"
+
+namespace ESM4
+{
+    class Reader;
+    class Writer;
+
+    struct World
+    {
+        enum WorldFlags                 // TES4                 TES5
+        {                               // -------------------- -----------------
+            WLD_Small          = 0x01,  // Small World          Small World
+            WLD_NoFastTravel   = 0x02,  // Can't Fast Travel    Can't Fast Travel
+            WLD_Oblivion       = 0x04,  // Oblivion worldspace
+            WLD_NoLODWater     = 0x08,  //                      No LOD Water
+            WLD_NoLandscpe     = 0x10,  // No LOD Water         No Landscape
+            WLD_NoSky          = 0x20,  //                      No Sky
+            wLD_FixedDimension = 0x40,  //                      Fixed Dimensions
+            WLD_NoGrass        = 0x80   //                      No Grass
+        };
+
+        struct REFRcoord
+        {
+            FormId       formId;
+            std::int16_t unknown1;
+            std::int16_t unknown2;
+        };
+
+        struct RNAMstruct
+        {
+            std::int16_t unknown1;
+            std::int16_t unknown2;
+            std::vector<REFRcoord> refrs;
+        };
+
+        //Map size	struct	16 or 28 byte structure
+        struct Map
+        {
+            std::uint32_t width;  // usable width of the map
+            std::uint32_t height; // usable height of the map
+            std::int16_t  NWcellX;
+            std::int16_t  NWcellY;
+            std::int16_t  SEcellX;
+            std::int16_t  SEcellY;
+            float minHeight; // Camera Data (default 50000), new as of Skyrim 1.8, purpose is not yet known.
+            float maxHeight; // Camera Data (default 80000)
+            float initialPitch;
+        };
+
+        FormId mFormId;       // from the header
+        std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
+
+        std::string  mEditorId;
+        std::string  mFullName;
+        FormId       mParent;       // parent worldspace formid
+        std::uint8_t mWorldFlags;
+        FormId       mClimate;
+        FormId       mWater;
+        float        mLandLevel;
+        float        mWaterLevel;
+
+        Map mMap;
+
+        std::int32_t mMinX;
+        std::int32_t mMinY;
+        std::int32_t mMaxX;
+        std::int32_t mMaxY;
+
+        // ------ TES4 only -----
+
+        std::int32_t mSound;   // 0 = no record, 1 = Public, 2 = Dungeon
+        std::string mMapFile;
+
+        // ------ TES5 only -----
+
+        Grid mCenterCell;
+        RNAMstruct mData;
+
+        // ----------------------
+        FormId mMusic;
+
+        // 0x01 use Land data
+        // 0x02 use LOD data
+        // 0x04 use Map data
+        // 0x08 use Water data
+        // 0x10 use Climate data
+        // 0x20 use Image Space data (Climate for TES5)
+        // 0x40 use SkyCell (TES5)
+        // 0x80 needs water adjustment (this isn't for parent I think? FONV only set for wastelandnv)
+        std::uint16_t mParentUseFlags; // FO3/FONV
+
+        // cache formId's of children (e.g. CELL, ROAD)
+        std::vector<FormId> mCells;
+        std::vector<FormId> mRoads;
+
+        World();
+        virtual ~World();
+
+        virtual void load(ESM4::Reader& reader);
+        //virtual void save(ESM4::Writer& writer) const;
+    };
+}
+
+#endif // ESM4_WRLD_H
diff --git a/components/esm4/reader.cpp b/components/esm4/reader.cpp
new file mode 100644
index 0000000000..f4fe8def68
--- /dev/null
+++ b/components/esm4/reader.cpp
@@ -0,0 +1,639 @@
+/*
+  Copyright (C) 2015-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+*/
+#include "reader.hpp"
+
+#ifdef NDEBUG // FIXME: debugging only
+#undef NDEBUG
+#endif
+
+#undef DEBUG_GROUPSTACK
+
+#include <cassert>
+#include <stdexcept>
+#include <unordered_map>
+#include <iostream> // for debugging
+#include <sstream>  // for debugging
+#include <iomanip>  // for debugging
+
+#if defined(_MSC_VER)
+    #pragma warning (push)
+    #pragma warning (disable : 4706)
+    #include <boost/iostreams/filter/zlib.hpp>
+    #pragma warning (pop)
+#else
+    #include <boost/iostreams/filter/zlib.hpp>
+#endif
+#include <boost/iostreams/filtering_streambuf.hpp>
+#include <boost/iostreams/copy.hpp>
+#include <boost/algorithm/string.hpp>
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
+
+#include <components/bsa/memorystream.hpp>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+
+ReaderContext::ReaderContext() : modIndex(0), recHeaderSize(sizeof(RecordHeader)),
+    filePos(0), recordRead(0), currWorld(0), currCell(0), cellGridValid(false)
+{
+    currCellGrid.cellId = 0;
+    currCellGrid.grid.x = 0;
+    currCellGrid.grid.y = 0;
+}
+
+Reader::Reader(Files::IStreamPtr esmStream, const std::string& filename)
+    : mEncoder(nullptr), mFileSize(0), mStream(esmStream)
+{
+    // used by ESMReader only?
+    mCtx.filename = filename;
+
+    mCtx.fileRead = 0;
+    mStream->seekg(0, mStream->end);
+    mFileSize = mStream->tellg();
+    mStream->seekg(20); // go to the start but skip the "TES4" record header
+
+    mSavedStream.reset();
+
+    // determine header size
+    std::uint32_t subRecName = 0;
+    mStream->read((char*)&subRecName, sizeof(subRecName));
+    if (subRecName == 0x52444548) // "HEDR"
+        mCtx.recHeaderSize = sizeof(RecordHeader) - 4; // TES4 header size is 4 bytes smaller than TES5 header
+    else
+        mCtx.recHeaderSize = sizeof(RecordHeader);
+
+    // restart from the beginning (i.e. "TES4" record header)
+    mStream->seekg(0, mStream->beg);
+#if 0
+    unsigned int esmVer = mHeader.mData.version.ui;
+    bool isTes4 = esmVer == ESM::VER_080 || esmVer == ESM::VER_100;
+    //bool isTes5 = esmVer == ESM::VER_094 || esmVer == ESM::VER_170;
+    //bool isFONV = esmVer == ESM::VER_132 || esmVer == ESM::VER_133 || esmVer == ESM::VER_134;
+
+    // TES4 header size is 4 bytes smaller than TES5 header
+    mCtx.recHeaderSize = isTes4 ? sizeof(ESM4::RecordHeader) - 4 : sizeof(ESM4::RecordHeader);
+#endif
+    getRecordHeader();
+    if (mCtx.recordHeader.record.typeId == REC_TES4)
+    {
+        mHeader.load(*this);
+        mCtx.fileRead += mCtx.recordHeader.record.dataSize;
+
+        buildLStringIndex(); // for localised strings in Skyrim
+    }
+    else
+        fail("Unknown file format");
+}
+
+Reader::~Reader()
+{
+    close();
+}
+
+// Since the record data may have been compressed, it is not always possible to use seek() to
+// go to a position of a sub record.
+//
+// The record header needs to be saved in the context or the header needs to be re-loaded after
+// restoring the context. The latter option was chosen.
+ReaderContext Reader::getContext()
+{
+    mCtx.filePos = mStream->tellg();
+    mCtx.filePos -= mCtx.recHeaderSize; // update file position
+    return mCtx;
+}
+
+// NOTE: Assumes that the caller has reopened the file if necessary
+bool Reader::restoreContext(const ReaderContext& ctx)
+{
+    if (mSavedStream) // TODO: doesn't seem to ever happen
+    {
+        mStream = mSavedStream;
+        mSavedStream.reset();
+    }
+
+    mCtx.groupStack.clear(); // probably not necessary since it will be overwritten
+    mCtx = ctx;
+    mStream->seekg(ctx.filePos); // update file position
+
+    return getRecordHeader();
+}
+
+void Reader::close()
+{
+    mStream.reset();
+    //clearCtx();
+    //mHeader.blank();
+}
+
+void Reader::openRaw(Files::IStreamPtr esmStream, const std::string& filename)
+{
+    close();
+
+    mStream = esmStream;
+    mCtx.filename = filename;
+    mCtx.fileRead = 0;
+    mStream->seekg(0, mStream->end);
+    mFileSize = mStream->tellg();
+    mStream->seekg(0, mStream->beg);
+
+}
+
+void Reader::open(Files::IStreamPtr esmStream, const std::string &filename)
+{
+    openRaw(esmStream, filename);
+
+    // should at least have the size of ESM3 record header (20 or 24 bytes for ESM4)
+    assert (mFileSize >= 16);
+    std::uint32_t modVer = 0;
+    if (getExact(modVer)) // get the first 4 bytes of the record header only
+    {
+        // FIXME: need to setup header/context
+        if (modVer == REC_TES4)
+        {
+        }
+        else
+        {
+        }
+    }
+
+    throw std::runtime_error("Unknown file format"); // can't yet use fail() as mCtx is not setup
+}
+
+void Reader::setRecHeaderSize(const std::size_t size)
+{
+    mCtx.recHeaderSize = size;
+}
+
+// FIXME: only "English" strings supported for now
+void Reader::buildLStringIndex()
+{
+    if ((mHeader.mFlags & Rec_ESM) == 0 || (mHeader.mFlags & Rec_Localized) == 0)
+        return;
+
+    boost::filesystem::path p(mCtx.filename);
+    std::string filename = p.stem().filename().string();
+
+    buildLStringIndex("Strings/" + filename + "_English.STRINGS",   Type_Strings);
+    buildLStringIndex("Strings/" + filename + "_English.ILSTRINGS", Type_ILStrings);
+    buildLStringIndex("Strings/" + filename + "_English.DLSTRINGS", Type_DLStrings);
+}
+
+void Reader::buildLStringIndex(const std::string& stringFile, LocalizedStringType stringType)
+{
+    std::uint32_t numEntries;
+    std::uint32_t dataSize;
+    std::uint32_t stringId;
+    LStringOffset sp;
+    sp.type = stringType;
+
+    // TODO: possibly check if the resource exists?
+    Files::IStreamPtr filestream = Files::IStreamPtr(Files::openConstrainedFileStream(stringFile.c_str()));
+
+    filestream->seekg(0, std::ios::end);
+    std::size_t fileSize = filestream->tellg();
+    filestream->seekg(0, std::ios::beg);
+
+    switch (stringType)
+    {
+        case Type_Strings:   mStrings =   filestream; break;
+        case Type_ILStrings: mILStrings = filestream; break;
+        case Type_DLStrings: mDLStrings = filestream; break;
+        default:
+            throw std::runtime_error("ESM4::Reader::unknown localised string type");
+    }
+
+    filestream->read((char*)&numEntries, sizeof(numEntries));
+    filestream->read((char*)&dataSize, sizeof(dataSize));
+    std::size_t dataStart = fileSize - dataSize;
+    for (unsigned int i = 0; i < numEntries; ++i)
+    {
+        filestream->read((char*)&stringId, sizeof(stringId));
+        filestream->read((char*)&sp.offset, sizeof(sp.offset));
+        sp.offset += (std::uint32_t)dataStart;
+        mLStringIndex[stringId] = sp;
+    }
+    //assert (dataStart - filestream->tell() == 0 && "String file start of data section mismatch");
+}
+
+void Reader::getLocalizedString(std::string& str)
+{
+    if (!hasLocalizedStrings())
+        return (void)getZString(str);
+
+    std::uint32_t stringId; // FormId
+    get(stringId);
+    if (stringId) // TES5 FoxRace, BOOK
+        getLocalizedStringImpl(stringId, str);
+}
+
+// FIXME: very messy and probably slow/inefficient
+void Reader::getLocalizedStringImpl(const FormId stringId, std::string& str)
+{
+    const std::map<FormId, LStringOffset>::const_iterator it = mLStringIndex.find(stringId);
+
+    if (it != mLStringIndex.end())
+    {
+        Files::IStreamPtr filestream;
+
+        switch (it->second.type)
+        {
+            case Type_Strings: // no string size provided
+            {
+                filestream = mStrings;
+                filestream->seekg(it->second.offset);
+
+                char ch;
+                std::vector<char> data;
+                do {
+                    filestream->read(&ch, sizeof(ch));
+                    data.push_back(ch);
+                } while (ch != 0);
+
+                str = std::string(data.data());
+                return;
+            }
+            case Type_ILStrings: filestream = mILStrings; break;
+            case Type_DLStrings: filestream = mDLStrings; break;
+            default:
+                throw std::runtime_error("ESM4::Reader::getLocalizedString unknown string type");
+        }
+
+        // get ILStrings or DLStrings (they provide string size)
+        filestream->seekg(it->second.offset);
+        std::uint32_t size = 0;
+        filestream->read((char*)&size, sizeof(size));
+        getStringImpl(str, size, filestream, mEncoder, true); // expect null terminated string
+    }
+    else
+        throw std::runtime_error("ESM4::Reader::getLocalizedString localized string not found");
+}
+
+bool Reader::getRecordHeader()
+{
+    // FIXME: this seems very hacky but we may have skipped subrecords from within an inflated data block
+    if (/*mStream->eof() && */mSavedStream)
+    {
+        mStream = mSavedStream;
+        mSavedStream.reset();
+    }
+
+    mStream->read((char*)&mCtx.recordHeader, mCtx.recHeaderSize);
+    std::size_t bytesRead = (std::size_t)mStream->gcount();
+
+    // keep track of data left to read from the file
+    mCtx.fileRead += mCtx.recHeaderSize;
+
+    mCtx.recordRead = 0; // for keeping track of sub records
+
+    // After reading the record header we can cache a WRLD or CELL formId for convenient access later.
+    // FIXME: currently currWorld and currCell are set manually when loading the WRLD and CELL records
+
+    // HACK: mCtx.groupStack.back() is updated before the record data are read/skipped
+    //       N.B. the data must be fully read/skipped for this to work
+    if (mCtx.recordHeader.record.typeId != REC_GRUP && !mCtx.groupStack.empty())
+    {
+        mCtx.groupStack.back().second += (std::uint32_t)mCtx.recHeaderSize + mCtx.recordHeader.record.dataSize;
+
+        // keep track of data left to read from the file
+        mCtx.fileRead += mCtx.recordHeader.record.dataSize;
+    }
+
+    return bytesRead == mCtx.recHeaderSize;
+}
+
+void Reader::getRecordData(bool dump)
+{
+    std::uint32_t uncompressedSize = 0;
+
+    if ((mCtx.recordHeader.record.flags & Rec_Compressed) != 0)
+    {
+        mStream->read(reinterpret_cast<char*>(&uncompressedSize), sizeof(std::uint32_t));
+
+        std::size_t recordSize = mCtx.recordHeader.record.dataSize - sizeof(std::uint32_t);
+        Bsa::MemoryInputStream compressedRecord(recordSize);
+        mStream->read(compressedRecord.getRawData(), recordSize);
+        std::istream *fileStream = (std::istream*)&compressedRecord;
+        mSavedStream = mStream;
+
+        mCtx.recordHeader.record.dataSize = uncompressedSize - sizeof(uncompressedSize);
+
+        std::shared_ptr<Bsa::MemoryInputStream> memoryStreamPtr
+            = std::make_shared<Bsa::MemoryInputStream>(uncompressedSize);
+
+        boost::iostreams::filtering_streambuf<boost::iostreams::input> inputStreamBuf;
+        inputStreamBuf.push(boost::iostreams::zlib_decompressor());
+        inputStreamBuf.push(*fileStream);
+
+        boost::iostreams::basic_array_sink<char> sr(memoryStreamPtr->getRawData(), uncompressedSize);
+        boost::iostreams::copy(inputStreamBuf, sr);
+
+    // For debugging only
+//#if 0
+if (dump)
+{
+        std::ostringstream ss;
+        char* data = memoryStreamPtr->getRawData();
+        for (unsigned int i = 0; i < uncompressedSize; ++i)
+        {
+            if (data[i] > 64 && data[i] < 91)
+                ss << (char)(data[i]) << " ";
+            else
+                ss << std::setfill('0') << std::setw(2) << std::hex << (int)(data[i]);
+            if ((i & 0x000f) == 0xf)
+                ss << "\n";
+            else if (i < uncompressedSize-1)
+                ss << " ";
+        }
+        std::cout << ss.str() << std::endl;
+}
+//#endif
+        mStream = std::shared_ptr<std::istream>(memoryStreamPtr, (std::istream*)memoryStreamPtr.get());
+    }
+}
+
+void Reader::skipRecordData()
+{
+    assert (mCtx.recordRead <= mCtx.recordHeader.record.dataSize && "Skipping after reading more than available");
+    mStream->ignore(mCtx.recordHeader.record.dataSize - mCtx.recordRead);
+    mCtx.recordRead = mCtx.recordHeader.record.dataSize; // for getSubRecordHeader()
+}
+
+bool Reader::getSubRecordHeader()
+{
+    bool result = false;
+    // NOTE: some SubRecords have 0 dataSize (e.g. SUB_RDSD in one of REC_REGN records in Oblivion.esm).
+    // Also SUB_XXXX has zero dataSize and the following 4 bytes represent the actual dataSize
+    // - hence it require manual updtes to mCtx.recordRead via updateRecordRead()
+    // See ESM4::NavMesh and ESM4::World.
+    if (mCtx.recordHeader.record.dataSize - mCtx.recordRead >= sizeof(mCtx.subRecordHeader))
+    {
+        result = getExact(mCtx.subRecordHeader);
+        // HACK: below assumes sub-record data will be read or skipped in full;
+        //       this hack aims to avoid updating mCtx.recordRead each time anything is read
+        mCtx.recordRead += (sizeof(mCtx.subRecordHeader) + mCtx.subRecordHeader.dataSize);
+    }
+    else if (mCtx.recordRead > mCtx.recordHeader.record.dataSize)
+    {
+        // try to correct any overshoot, seek to the end of the expected data
+        // this will only work if mCtx.subRecordHeader.dataSize was fully read or skipped
+        // (i.e. it will only correct mCtx.subRecordHeader.dataSize being incorrect)
+        // TODO: not tested
+        std::uint32_t overshoot = (std::uint32_t)mCtx.recordRead - mCtx.recordHeader.record.dataSize;
+
+        std::size_t pos = mStream->tellg();
+        mStream->seekg(pos - overshoot);
+
+        return false;
+    }
+
+    return result;
+}
+
+void Reader::skipSubRecordData()
+{
+    mStream->ignore(mCtx.subRecordHeader.dataSize);
+}
+
+void Reader::skipSubRecordData(std::uint32_t size)
+{
+    mStream->ignore(size);
+}
+
+void Reader::enterGroup()
+{
+#ifdef DEBUG_GROUPSTACK
+    std::string padding = ""; // FIXME: debugging only
+    padding.insert(0, mCtx.groupStack.size()*2, ' ');
+    std::cout << padding << "Starting record group "
+              << printLabel(mCtx.recordHeader.group.label, mCtx.recordHeader.group.type) << std::endl;
+#endif
+    // empty group if the group size is same as the header size
+    if (mCtx.recordHeader.group.groupSize == (std::uint32_t)mCtx.recHeaderSize)
+    {
+#ifdef DEBUG_GROUPSTACK
+        std::cout << padding << "Ignoring record group " // FIXME: debugging only
+            << printLabel(mCtx.recordHeader.group.label, mCtx.recordHeader.group.type)
+            << " (empty)" << std::endl;
+#endif
+        if (!mCtx.groupStack.empty()) // top group may be empty (e.g. HAIR in Skyrim)
+        {
+            // don't put on the stack, exitGroupCheck() may not get called before recursing into this method
+            mCtx.groupStack.back().second += mCtx.recordHeader.group.groupSize;
+            exitGroupCheck();
+        }
+
+        return; // don't push an empty group, just return
+    }
+
+    // push group
+    mCtx.groupStack.push_back(std::make_pair(mCtx.recordHeader.group, (std::uint32_t)mCtx.recHeaderSize));
+}
+
+void Reader::exitGroupCheck()
+{
+    if (mCtx.groupStack.empty())
+        return;
+
+    // pop finished groups (note reading too much is allowed here)
+    std::uint32_t lastGroupSize = mCtx.groupStack.back().first.groupSize;
+    while (mCtx.groupStack.back().second >= lastGroupSize)
+    {
+#ifdef DEBUG_GROUPSTACK
+        GroupTypeHeader grp = mCtx.groupStack.back().first; // FIXME: grp is for debugging only
+#endif
+        // try to correct any overshoot
+        // TODO: not tested
+        std::uint32_t overshoot = mCtx.groupStack.back().second - lastGroupSize;
+        if (overshoot > 0)
+        {
+            std::size_t pos = mStream->tellg();
+            mStream->seekg(pos - overshoot);
+        }
+
+        mCtx.groupStack.pop_back();
+#ifdef DEBUG_GROUPSTACK
+        std::string padding = ""; // FIXME: debugging only
+        padding.insert(0, mCtx.groupStack.size()*2, ' ');
+        std::cout << padding << "Finished record group " << printLabel(grp.label, grp.type) << std::endl;
+#endif
+        // if the previous group was the final one no need to do below
+        if (mCtx.groupStack.empty())
+            return;
+
+        mCtx.groupStack.back().second += lastGroupSize;
+        lastGroupSize = mCtx.groupStack.back().first.groupSize;
+
+        assert (lastGroupSize >= mCtx.groupStack.back().second && "Read more records than available");
+//#if 0
+        if (mCtx.groupStack.back().second > lastGroupSize) // FIXME: debugging only
+            std::cerr << printLabel(mCtx.groupStack.back().first.label,
+                                          mCtx.groupStack.back().first.type)
+                      << " read more records than available" << std::endl;
+//#endif
+    }
+}
+
+// WARNING: this method should be used after first calling enterGroup()
+// else the method may try to dereference an element that does not exist
+const GroupTypeHeader& Reader::grp(std::size_t pos) const
+{
+    assert (pos <= mCtx.groupStack.size()-1 && "ESM4::Reader::grp - exceeded stack depth");
+
+    return (*(mCtx.groupStack.end()-pos-1)).first;
+}
+
+void Reader::skipGroupData()
+{
+    assert (!mCtx.groupStack.empty() && "Skipping group with an empty stack");
+
+    // subtract what was already read/skipped
+    std::uint32_t skipSize = mCtx.groupStack.back().first.groupSize - mCtx.groupStack.back().second;
+
+    mStream->ignore(skipSize);
+
+    // keep track of data left to read from the file
+    mCtx.fileRead += skipSize;
+
+    mCtx.groupStack.back().second = mCtx.groupStack.back().first.groupSize;
+}
+
+void Reader::skipGroup()
+{
+#ifdef DEBUG_GROUPSTACK
+    std::string padding = ""; // FIXME: debugging only
+    padding.insert(0, mCtx.groupStack.size()*2, ' ');
+    std::cout << padding << "Skipping record group "
+              << printLabel(mCtx.recordHeader.group.label, mCtx.recordHeader.group.type) << std::endl;
+#endif
+    // subtract the size of header already read before skipping
+    std::uint32_t skipSize = mCtx.recordHeader.group.groupSize - (std::uint32_t)mCtx.recHeaderSize;
+    mStream->ignore(skipSize);
+
+    // keep track of data left to read from the file
+    mCtx.fileRead += skipSize;
+
+    // NOTE: mCtx.groupStack.back().second already has mCtx.recHeaderSize from enterGroup()
+    if (!mCtx.groupStack.empty())
+        mCtx.groupStack.back().second += mCtx.recordHeader.group.groupSize;
+}
+
+const CellGrid& Reader::currCellGrid() const
+{
+    // Maybe should throw an exception instead?
+    assert (mCtx.cellGridValid && "Attempt to use an invalid cell grid");
+
+    return mCtx.currCellGrid;
+}
+
+// NOTE: the parameter 'files' must have the file names in the loaded order
+void Reader::updateModIndices(const std::vector<std::string>& files)
+{
+    if (files.size() >= 0xff)
+        throw std::runtime_error("ESM4::Reader::updateModIndices too many files"); // 0xff is reserved
+
+    // NOTE: this map is rebuilt each time this method is called (i.e. each time a file is loaded)
+    // Perhaps there is an opportunity to optimize this by saving the result somewhere.
+    // But then, the number of files is at most around 250 so perhaps keeping it simple might be better.
+
+    // build a lookup map
+    std::unordered_map<std::string, size_t> fileIndex;
+
+    for (size_t i = 0; i < files.size(); ++i) // ATTENTION: assumes current file is not included
+        fileIndex[boost::to_lower_copy<std::string>(files[i])] = i;
+
+    mCtx.parentFileIndices.resize(mHeader.mMaster.size());
+    for (unsigned int i = 0; i < mHeader.mMaster.size(); ++i)
+    {
+        // locate the position of the dependency in already loaded files
+        std::unordered_map<std::string, size_t>::const_iterator it
+            = fileIndex.find(boost::to_lower_copy<std::string>(mHeader.mMaster[i].name));
+
+        if (it != fileIndex.end())
+            mCtx.parentFileIndices[i] = (std::uint32_t)((it->second << 24) & 0xff000000);
+        else
+            throw std::runtime_error("ESM4::Reader::updateModIndices required dependency file not loaded");
+#if 0
+        std::cout << "Master Mod: " << mCtx.header.mMaster[i].name << ", " // FIXME: debugging only
+                  << formIdToString(mCtx.parentFileIndices[i]) << std::endl;
+#endif
+    }
+
+    if (!mCtx.parentFileIndices.empty() &&  mCtx.parentFileIndices[0] != 0)
+        throw std::runtime_error("ESM4::Reader::updateModIndices base modIndex is not zero");
+}
+
+// ModIndex adjusted formId according to master file dependencies
+// (see http://www.uesp.net/wiki/Tes4Mod:FormID_Fixup)
+// NOTE: need to update modindex to parentFileIndices.size() before saving
+//
+// FIXME: probably should add a parameter to check for mCtx.header::mOverrides
+//        (ACHR, LAND, NAVM, PGRE, PHZD, REFR), but not sure what exactly overrides mean
+//        i.e. use the modindx of its master?
+// FIXME: Apparently ModIndex '00' in an ESP means the object is defined in one of its masters.
+//        This means we may need to search multiple times to get the correct id.
+//        (see https://www.uesp.net/wiki/Tes4Mod:Formid#ModIndex_Zero)
+void Reader::adjustFormId(FormId& id)
+{
+    if (mCtx.parentFileIndices.empty())
+        return;
+
+    std::size_t index = (id >> 24) & 0xff;
+
+    if (index < mCtx.parentFileIndices.size())
+        id = mCtx.parentFileIndices[index] | (id & 0x00ffffff);
+    else
+        id = mCtx.modIndex | (id & 0x00ffffff);
+}
+
+bool Reader::getFormId(FormId& id)
+{
+    if (!getExact(id))
+        return false;
+
+    adjustFormId(id);
+    return true;
+}
+
+void Reader::adjustGRUPFormId()
+{
+    adjustFormId(mCtx.recordHeader.group.label.value);
+}
+
+[[noreturn]] void Reader::fail(const std::string& msg)
+{
+    std::stringstream ss;
+
+    ss << "ESM Error: " << msg;
+    ss << "\n  File: " << mCtx.filename;
+    ss << "\n  Record: " << ESM::printName(mCtx.recordHeader.record.typeId);
+    ss << "\n  Subrecord: " << ESM::printName(mCtx.subRecordHeader.typeId);
+    if (mStream.get())
+        ss << "\n  Offset: 0x" << std::hex << mStream->tellg();
+
+    throw std::runtime_error(ss.str());
+}
+
+}
diff --git a/components/esm4/reader.hpp b/components/esm4/reader.hpp
new file mode 100644
index 0000000000..b3f1070495
--- /dev/null
+++ b/components/esm4/reader.hpp
@@ -0,0 +1,298 @@
+/*
+  Copyright (C) 2015-2016, 2018, 2020-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+*/
+#ifndef ESM4_READER_H
+#define ESM4_READER_H
+
+#include <map>
+#include <cstddef>
+#include <memory>
+
+#include "common.hpp"
+#include "loadtes4.hpp"
+#include "../esm/reader.hpp"
+
+namespace ESM4 {
+    //                                                   bytes read from group, updated by
+    //                                                   getRecordHeader() in advance
+    //                                                     |
+    //                                                     v
+    typedef std::vector<std::pair<ESM4::GroupTypeHeader, std::uint32_t> > GroupStack;
+
+    struct ReaderContext {
+        std::string filename;         // in case we need to reopen to restore the context
+        std::uint32_t modIndex;         // the sequential position of this file in the load order:
+        //  0x00 reserved, 0xFF in-game (see notes below)
+
+        // position in the vector = mod index of master files above
+        // value = adjusted mod index based on all the files loaded so far
+        std::vector<std::uint32_t> parentFileIndices;
+
+        std::size_t recHeaderSize;    // normally should be already set correctly, but just in
+        //  case the file was re-opened.  default = TES5 size,
+        //  can be reduced for TES4 by setRecHeaderSize()
+
+        std::size_t filePos;          // assume that the record header will be re-read once
+        //  the context is restored
+
+        // for keeping track of things
+        std::size_t fileRead;         // number of bytes read, incl. the current record
+
+        GroupStack groupStack;       // keep track of bytes left to find when a group is done
+        RecordHeader recordHeader;     // header of the current record or group being processed
+        SubRecordHeader subRecordHeader;  // header of the current sub record being processed
+        std::uint32_t recordRead;       // bytes read from the sub records, incl. the current one
+
+        FormId currWorld;        // formId of current world - for grouping CELL records
+        FormId currCell;         // formId of current cell
+        // FIXME: try to get rid of these two members, seem like massive hacks
+        CellGrid currCellGrid;     // TODO: should keep a map of cell formids
+        bool cellGridValid;
+
+        ReaderContext();
+    };
+
+    class Reader : public ESM::Reader
+    {
+        Header               mHeader;     // ESM4 header
+
+        ReaderContext        mCtx;
+
+        ToUTF8::Utf8Encoder* mEncoder;
+
+        std::size_t          mFileSize;
+
+        Files::IStreamPtr    mStream;
+        Files::IStreamPtr    mSavedStream; // mStream is saved here while using deflated memory stream
+
+        Files::IStreamPtr    mStrings;
+        Files::IStreamPtr    mILStrings;
+        Files::IStreamPtr    mDLStrings;
+
+        enum LocalizedStringType
+        {
+            Type_Strings   = 0,
+            Type_ILStrings = 1,
+            Type_DLStrings = 2
+        };
+
+        struct LStringOffset
+        {
+            LocalizedStringType type;
+            std::uint32_t offset;
+        };
+
+        std::map<FormId, LStringOffset> mLStringIndex;
+
+        void buildLStringIndex(const std::string& stringFile, LocalizedStringType stringType);
+
+        inline bool hasLocalizedStrings() const { return (mHeader.mFlags & Rec_Localized) != 0; }
+
+        void getLocalizedStringImpl(const FormId stringId, std::string& str);
+
+        // Close the file, resets all information.
+        // After calling close() the structure may be reused to load a new file.
+        //void close();
+
+        // Raw opening. Opens the file and sets everything up but doesn't parse the header.
+        void openRaw(Files::IStreamPtr esmStream, const std::string& filename);
+
+        // Load ES file from a new stream, parses the header.
+        // Closes the currently open file first, if any.
+        void open(Files::IStreamPtr esmStream, const std::string& filename);
+
+        Reader() = default;
+
+    public:
+
+        Reader(Files::IStreamPtr esmStream, const std::string& filename);
+        ~Reader();
+
+        // FIXME: should be private but ESMTool uses it
+        void openRaw(const std::string& filename) {
+            openRaw(Files::openConstrainedFileStream(filename.c_str()), filename);
+        }
+
+        void open(const std::string& filename) {
+            open(Files::openConstrainedFileStream (filename.c_str ()), filename);
+        }
+
+        void close() final;
+
+        inline bool isEsm4() const final { return true; }
+
+        inline void setEncoder(ToUTF8::Utf8Encoder* encoder) final { mEncoder = encoder; };
+
+        const std::vector<ESM::MasterData>& getGameFiles() const final { return mHeader.mMaster; }
+
+        inline int getRecordCount() const final { return mHeader.mData.records; }
+        inline const std::string getAuthor() const final { return mHeader.mAuthor; }
+        inline int getFormat() const final { return 0; }; // prob. not relevant for ESM4
+        inline const std::string getDesc() const final { return mHeader.mDesc; }
+
+        inline std::string getFileName() const final { return mCtx.filename; }; // not used
+
+        inline bool hasMoreRecs() const final { return (mFileSize - mCtx.fileRead) > 0; }
+
+        // Methods added for updating loading progress bars
+        inline std::size_t getFileSize() const { return mFileSize; }
+        inline std::size_t getFileOffset() const { return mStream->tellg(); }
+
+        // Methods added for saving/restoring context
+        ReaderContext getContext(); // WARN: must be called immediately after reading the record header
+
+        bool restoreContext(const ReaderContext& ctx); // returns the result of re-reading the header
+
+        template<typename T>
+        inline void get(T& t) { mStream->read((char*)&t, sizeof(T)); }
+
+        template<typename T>
+        bool getExact(T& t) {
+            mStream->read((char*)&t, sizeof(T));
+            return mStream->gcount() == sizeof(T); // FIXME: try/catch block needed?
+        }
+
+        // for arrays
+        inline bool get(void* p, std::size_t size) {
+            mStream->read((char*)p, size);
+            return mStream->gcount() == (std::streamsize)size; // FIXME: try/catch block needed?
+        }
+
+        // NOTE: must be called before calling getRecordHeader()
+        void setRecHeaderSize(const std::size_t size);
+
+        inline unsigned int esmVersion() const { return mHeader.mData.version.ui; }
+        inline unsigned int numRecords() const { return mHeader.mData.records; }
+
+        void buildLStringIndex();
+        void getLocalizedString(std::string& str);
+
+        // Read 24 bytes of header. The caller can then decide whether to process or skip the data.
+        bool getRecordHeader();
+
+        inline const RecordHeader& hdr() const { return mCtx.recordHeader; }
+
+        const GroupTypeHeader& grp(std::size_t pos = 0) const;
+
+        // The object setting up this reader needs to supply the file's load order index
+        // so that the formId's in this file can be adjusted with the file (i.e. mod) index.
+        void setModIndex(std::uint32_t index) final { mCtx.modIndex = (index << 24) & 0xff000000; }
+        void updateModIndices(const std::vector<std::string>& files);
+
+        // Maybe should throw an exception if called when not valid?
+        const CellGrid& currCellGrid() const;
+
+        inline bool hasCellGrid() const { return mCtx.cellGridValid; }
+
+        // This is set while loading a CELL record (XCLC sub record) and invalidated
+        // each time loading a CELL (see clearCellGrid())
+        inline void setCurrCellGrid(const CellGrid& currCell) {
+            mCtx.cellGridValid = true;
+            mCtx.currCellGrid = currCell;
+        }
+
+        // FIXME: This is called each time a new CELL record is read.  Rather than calling this
+        // methos explicitly, mCellGridValid should be set automatically somehow.
+        //
+        // Cell 2c143 is loaded immedicatly after 1bdb1 and can mistakely appear to have grid 0, 1.
+        inline void clearCellGrid() { mCtx.cellGridValid = false; }
+
+        // Should be set at the beginning of a CELL load
+        inline void setCurrCell(FormId formId) { mCtx.currCell = formId; }
+
+        inline FormId currCell() const { return mCtx.currCell; }
+
+        // Should be set at the beginning of a WRLD load
+        inline void setCurrWorld(FormId formId) { mCtx.currWorld = formId; }
+
+        inline FormId currWorld() const { return mCtx.currWorld; }
+
+        // Get the data part of a record
+        // Note: assumes the header was read correctly and nothing else was read
+        void getRecordData(bool dump = false);
+
+        // Skip the data part of a record
+        // Note: assumes the header was read correctly (partial skip is allowed)
+        void skipRecordData();
+
+        // Skip the remaining part of the group
+        // Note: assumes the header was read correctly and group was pushed onto the stack
+        void skipGroupData();
+
+        // Skip the group without pushing onto the stack
+        // Note: assumes the header was read correctly and group was not pushed onto the stack
+        // (expected to be used during development only while some groups are not yet supported)
+        void skipGroup();
+
+        // Read 6 bytes of header. The caller can then decide whether to process or skip the data.
+        bool getSubRecordHeader();
+
+        // Manally update (i.e. increase) the bytes read after SUB_XXXX
+        inline void updateRecordRead(std::uint32_t subSize) { mCtx.recordRead += subSize; }
+
+        inline const SubRecordHeader& subRecordHeader() const { return mCtx.subRecordHeader; }
+
+        // Skip the data part of a subrecord
+        // Note: assumes the header was read correctly and nothing else was read
+        void skipSubRecordData();
+
+        // Special for a subrecord following a XXXX subrecord
+        void skipSubRecordData(std::uint32_t size);
+
+        // Get a subrecord of a particular type and data type
+        template<typename T>
+        bool getSubRecord(const ESM4::SubRecordTypes type, T& t)
+        {
+            ESM4::SubRecordHeader hdr;
+            if (!getExact(hdr) || (hdr.typeId != type) || (hdr.dataSize != sizeof(T)))
+                return false;
+
+            return get(t);
+        }
+
+        // ModIndex adjusted formId according to master file dependencies
+        void adjustFormId(FormId& id);
+
+        bool getFormId(FormId& id);
+
+        void adjustGRUPFormId();
+
+        // Note: uses the string size from the subrecord header rather than checking null termination
+        bool getZString(std::string& str) {
+            return getStringImpl(str, mCtx.subRecordHeader.dataSize, mStream, mEncoder, true);
+        }
+        bool getString(std::string& str) {
+            return getStringImpl(str, mCtx.subRecordHeader.dataSize, mStream, mEncoder);
+        }
+
+        void enterGroup();
+        void exitGroupCheck();
+
+        // for debugging only
+        size_t stackSize() const { return mCtx.groupStack.size(); }
+
+        // Used for error handling
+        [[noreturn]] void fail(const std::string& msg);
+    };
+}
+
+#endif // ESM4_READER_H
diff --git a/components/esm4/records.hpp b/components/esm4/records.hpp
new file mode 100644
index 0000000000..d212091adb
--- /dev/null
+++ b/components/esm4/records.hpp
@@ -0,0 +1,74 @@
+#ifndef ESM4_RECORDS_H
+#define ESM4_RECORDS_H
+
+#include <extern/esm4/hair.hpp>
+#include <extern/esm4/eyes.hpp>
+#include <extern/esm4/race.hpp>
+#include <extern/esm4/achr.hpp>
+#include <extern/esm4/acre.hpp>
+#include <extern/esm4/soun.hpp>
+#include <extern/esm4/ltex.hpp>
+#include <extern/esm4/acti.hpp>
+#include <extern/esm4/appa.hpp>
+#include <extern/esm4/armo.hpp>
+#include <extern/esm4/book.hpp>
+#include <extern/esm4/clot.hpp>
+#include <extern/esm4/cont.hpp>
+#include <extern/esm4/door.hpp>
+#include <extern/esm4/ingr.hpp>
+#include <extern/esm4/ligh.hpp>
+#include <extern/esm4/misc.hpp>
+#include <extern/esm4/stat.hpp>
+#include <extern/esm4/gras.hpp>
+#include <extern/esm4/tree.hpp>
+#include <extern/esm4/flor.hpp>
+#include <extern/esm4/furn.hpp>
+#include <extern/esm4/weap.hpp>
+#include <extern/esm4/ammo.hpp>
+#include <extern/esm4/npc_.hpp>
+#include <extern/esm4/crea.hpp>
+#include <extern/esm4/lvlc.hpp>
+#include <extern/esm4/slgm.hpp>
+#include <extern/esm4/keym.hpp>
+#include <extern/esm4/alch.hpp>
+#include <extern/esm4/sbsp.hpp>
+#include <extern/esm4/sgst.hpp>
+#include <extern/esm4/lvli.hpp>
+#include <extern/esm4/lvln.hpp>
+#include <extern/esm4/idlm.hpp>
+#include <extern/esm4/mstt.hpp>
+#include <extern/esm4/txst.hpp>
+#include <extern/esm4/scrl.hpp>
+#include <extern/esm4/arma.hpp>
+#include <extern/esm4/hdpt.hpp>
+#include <extern/esm4/term.hpp>
+#include <extern/esm4/tact.hpp>
+#include <extern/esm4/note.hpp>
+#include <extern/esm4/bptd.hpp>
+#include <extern/esm4/scpt.hpp>
+#include <extern/esm4/regn.hpp>
+#include <extern/esm4/land.hpp>
+#include <extern/esm4/anio.hpp>
+#include <extern/esm4/dial.hpp>
+#include <extern/esm4/info.hpp>
+#include <extern/esm4/pgrd.hpp>
+#include <extern/esm4/road.hpp>
+#include <extern/esm4/qust.hpp>
+#include <extern/esm4/pack.hpp>
+#include <extern/esm4/lgtm.hpp>
+#include <extern/esm4/pgre.hpp>
+#include <extern/esm4/aspc.hpp>
+#include <extern/esm4/imod.hpp>
+#include <extern/esm4/pwat.hpp>
+#include <extern/esm4/scol.hpp>
+#include <extern/esm4/musc.hpp>
+#include <extern/esm4/aloc.hpp>
+#include <extern/esm4/mset.hpp>
+#include <extern/esm4/dobj.hpp>
+#include <extern/esm4/clfm.hpp>
+#include <extern/esm4/otft.hpp>
+#include <extern/esm4/flst.hpp>
+#include <extern/esm4/sndr.hpp>
+#include <extern/esm4/glob.hpp>
+
+#endif // ESM4_RECORDS_H
diff --git a/components/esm4/reference.hpp b/components/esm4/reference.hpp
new file mode 100644
index 0000000000..5ac94b8519
--- /dev/null
+++ b/components/esm4/reference.hpp
@@ -0,0 +1,68 @@
+/*
+  Copyright (C) 2020 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+*/
+#ifndef ESM4_REFERENCE_H
+#define ESM4_REFERENCE_H
+
+#include <cstdint>
+#include <string>
+
+#include "formid.hpp"
+
+namespace ESM4
+{
+#pragma pack(push, 1)
+    struct Vector3
+    {
+        float x;
+        float y;
+        float z;
+    };
+
+    // REFR, ACHR, ACRE
+    struct Placement
+    {
+        Vector3 pos;
+        Vector3 rot; // angles are in radian, rz applied first and rx applied last
+    };
+
+    // REFR, ACHR, ACRE
+    struct EnableParent
+    {
+        FormId        parent;
+        std::uint32_t flags; //0x0001 = Set Enable State Opposite Parent, 0x0002 = Pop In
+    };
+#pragma pack(pop)
+
+    struct LODReference
+    {
+        FormId baseObj;
+        Placement placement;
+        float scale;
+    };
+}
+
+#endif // ESM4_REFERENCE_H
diff --git a/components/esm4/script.hpp b/components/esm4/script.hpp
new file mode 100644
index 0000000000..8ba8c0025c
--- /dev/null
+++ b/components/esm4/script.hpp
@@ -0,0 +1,384 @@
+/*
+  Copyright (C) 2020-2021 cc9cii
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  cc9cii cc9c@iinet.net.au
+
+  Much of the information on the data structures are based on the information
+  from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
+  trial & error.  See http://en.uesp.net/wiki for details.
+
+  Also see https://tes5edit.github.io/fopdoc/ for FO3/FONV specific details.
+
+*/
+#ifndef ESM4_SCRIPT_H
+#define ESM4_SCRIPT_H
+
+#include <cstdint>
+#include <string>
+#include <vector>
+
+namespace ESM4
+{
+    enum EmotionType
+    {
+        EMO_Neutral  = 0,
+        EMO_Anger    = 1,
+        EMO_Disgust  = 2,
+        EMO_Fear     = 3,
+        EMO_Sad      = 4,
+        EMO_Happy    = 5,
+        EMO_Surprise = 6,
+        EMO_Pained   = 7 // FO3/FONV
+    };
+
+    enum ConditionTypeAndFlag
+    {
+        // flag
+        CTF_Combine     = 0x01,
+        CTF_RunOnTarget = 0x02,
+        CTF_UseGlobal   = 0x04,
+        // condition
+        CTF_EqualTo     = 0x00,
+        CTF_NotEqualTo  = 0x20,
+        CTF_GreaterThan = 0x40,
+        CTF_GrThOrEqTo  = 0x60,
+        CTF_LessThan    = 0x80,
+        CTF_LeThOrEqTo  = 0xA0
+    };
+
+    enum FunctionIndices
+    {
+        FUN_GetDistance      = 1,
+        FUN_GetLocked        = 5,
+        FUN_GetPos           = 6,
+        FUN_GetAngle         = 8,
+        FUN_GetStartingPos   = 10,
+        FUN_GetStartingAngle = 11,
+        FUN_GetSecondsPassed = 12,
+        FUN_GetActorValue    = 14,
+        FUN_GetCurrentTime   = 18,
+        FUN_GetScale         = 24,
+        FUN_IsMoving         = 25,
+        FUN_IsTurning        = 26,
+        FUN_GetLineOfSight   = 27,
+        FUN_GetIsInSameCell  = 32,
+        FUN_GetDisabled      = 35,
+        FUN_GetMenuMode      = 36,
+        FUN_GetDisease       = 39,
+        FUN_GetVampire       = 40,
+        FUN_GetClothingValue = 41,
+        FUN_SameFaction      = 42,
+        FUN_SameRace         = 43,
+        FUN_SameSex          = 44,
+        FUN_GetDetected      = 45,
+        FUN_GetDead          = 46,
+        FUN_GetItemCount     = 47,
+        FUN_GetGold          = 48,
+        FUN_GetSleeping      = 49,
+        FUN_GetTalkedToPC    = 50,
+        FUN_GetScriptVariable = 53,
+        FUN_GetQuestRunning  = 56,
+        FUN_GetStage         = 58,
+        FUN_GetStageDone     = 59,
+        FUN_GetFactionRankDifference = 60,
+        FUN_GetAlarmed       = 61,
+        FUN_IsRaining        = 62,
+        FUN_GetAttacked      = 63,
+        FUN_GetIsCreature    = 64,
+        FUN_GetLockLevel     = 65,
+        FUN_GetShouldAttack  = 66,
+        FUN_GetInCell        = 67,
+        FUN_GetIsClass       = 68,
+        FUN_GetIsRace        = 69,
+        FUN_GetIsSex         = 70,
+        FUN_GetInFaction     = 71,
+        FUN_GetIsID          = 72,
+        FUN_GetFactionRank   = 73,
+        FUN_GetGlobalValue   = 74,
+        FUN_IsSnowing        = 75,
+        FUN_GetDisposition   = 76,
+        FUN_GetRandomPercent = 77,
+        FUN_GetQuestVariable = 79,
+        FUN_GetLevel         = 80,
+        FUN_GetArmorRating   = 81,
+        FUN_GetDeadCount     = 84,
+        FUN_GetIsAlerted     = 91,
+        FUN_GetPlayerControlsDisabled = 98,
+        FUN_GetHeadingAngle  = 99,
+        FUN_IsWeaponOut      = 101,
+        FUN_IsTorchOut       = 102,
+        FUN_IsShieldOut      = 103,
+        FUN_IsFacingUp       = 106,
+        FUN_GetKnockedState  = 107,
+        FUN_GetWeaponAnimType = 108,
+        FUN_IsWeaponSkillType = 109,
+        FUN_GetCurrentAIPackage = 110,
+        FUN_IsWaiting        = 111,
+        FUN_IsIdlePlaying    = 112,
+        FUN_GetMinorCrimeCount = 116,
+        FUN_GetMajorCrimeCount = 117,
+        FUN_GetActorAggroRadiusViolated = 118,
+        FUN_GetCrime         = 122,
+        FUN_IsGreetingPlayer = 123,
+        FUN_IsGuard          = 125,
+        FUN_HasBeenEaten     = 127,
+        FUN_GetFatiguePercentage = 128,
+        FUN_GetPCIsClass     = 129,
+        FUN_GetPCIsRace      = 130,
+        FUN_GetPCIsSex       = 131,
+        FUN_GetPCInFaction   = 132,
+        FUN_SameFactionAsPC  = 133,
+        FUN_SameRaceAsPC     = 134,
+        FUN_SameSexAsPC      = 135,
+        FUN_GetIsReference   = 136,
+        FUN_IsTalking        = 141,
+        FUN_GetWalkSpeed     = 142,
+        FUN_GetCurrentAIProcedure = 143,
+        FUN_GetTrespassWarningLevel = 144,
+        FUN_IsTrespassing    = 145,
+        FUN_IsInMyOwnedCell  = 146,
+        FUN_GetWindSpeed     = 147,
+        FUN_GetCurrentWeatherPercent = 148,
+        FUN_GetIsCurrentWeather = 149,
+        FUN_IsContinuingPackagePCNear = 150,
+        FUN_CanHaveFlames    = 153,
+        FUN_HasFlames        = 154,
+        FUN_GetOpenState     = 157,
+        FUN_GetSitting       = 159,
+        FUN_GetFurnitureMarkerID = 160,
+        FUN_GetIsCurrentPackage = 161,
+        FUN_IsCurrentFurnitureRef = 162,
+        FUN_IsCurrentFurnitureObj = 163,
+        FUN_GetDayofWeek     = 170,
+        FUN_GetTalkedToPCParam = 172,
+        FUN_IsPCSleeping     = 175,
+        FUN_IsPCAMurderer    = 176,
+        FUN_GetDetectionLevel = 180,
+        FUN_GetEquipped      = 182,
+        FUN_IsSwimming       = 185,
+        FUN_GetAmountSoldStolen = 190,
+        FUN_GetIgnoreCrime   = 192,
+        FUN_GetPCExpelled    = 193,
+        FUN_GetPCFactionMurder = 195,
+        FUN_GetPCEnemyofFaction = 197,
+        FUN_GetPCFactionAttack = 199,
+        FUN_GetDestroyed     = 203,
+        FUN_HasMagicEffect   = 214,
+        FUN_GetDefaultOpen   = 215,
+        FUN_GetAnimAction    = 219,
+        FUN_IsSpellTarget    = 223,
+        FUN_GetVATSMode      = 224,
+        FUN_GetPersuasionNumber = 225,
+        FUN_GetSandman       = 226,
+        FUN_GetCannibal      = 227,
+        FUN_GetIsClassDefault = 228,
+        FUN_GetClassDefaultMatch = 229,
+        FUN_GetInCellParam   = 230,
+        FUN_GetVatsTargetHeight = 235,
+        FUN_GetIsGhost       = 237,
+        FUN_GetUnconscious   = 242,
+        FUN_GetRestrained    = 244,
+        FUN_GetIsUsedItem    = 246,
+        FUN_GetIsUsedItemType = 247,
+        FUN_GetIsPlayableRace = 254,
+        FUN_GetOffersServicesNow = 255,
+        FUN_GetUsedItemLevel = 258,
+        FUN_GetUsedItemActivate = 259,
+        FUN_GetBarterGold    = 264,
+        FUN_IsTimePassing    = 265,
+        FUN_IsPleasant       = 266,
+        FUN_IsCloudy         = 267,
+        FUN_GetArmorRatingUpperBody = 274,
+        FUN_GetBaseActorValue = 277,
+        FUN_IsOwner          = 278,
+        FUN_IsCellOwner      = 280,
+        FUN_IsHorseStolen    = 282,
+        FUN_IsLeftUp         = 285,
+        FUN_IsSneaking       = 286,
+        FUN_IsRunning        = 287,
+        FUN_GetFriendHit     = 288,
+        FUN_IsInCombat       = 289,
+        FUN_IsInInterior     = 300,
+        FUN_IsWaterObject    = 304,
+        FUN_IsActorUsingATorch = 306,
+        FUN_IsXBox           = 309,
+        FUN_GetInWorldspace  = 310,
+        FUN_GetPCMiscStat    = 312,
+        FUN_IsActorEvil      = 313,
+        FUN_IsActorAVictim   = 314,
+        FUN_GetTotalPersuasionNumber = 315,
+        FUN_GetIdleDoneOnce  = 318,
+        FUN_GetNoRumors      = 320,
+        FUN_WhichServiceMenu = 323,
+        FUN_IsRidingHorse    = 327,
+        FUN_IsInDangerousWater = 332,
+        FUN_GetIgnoreFriendlyHits = 338,
+        FUN_IsPlayersLastRiddenHorse = 339,
+        FUN_IsActor          = 353,
+        FUN_IsEssential      = 354,
+        FUN_IsPlayerMovingIntoNewSpace = 358,
+        FUN_GetTimeDead      = 361,
+        FUN_GetPlayerHasLastRiddenHorse = 362,
+        FUN_IsChild          = 365,
+        FUN_GetLastPlayerAction = 367,
+        FUN_IsPlayerActionActive = 368,
+        FUN_IsTalkingActivatorActor = 370,
+        FUN_IsInList         = 372,
+        FUN_GetHasNote       = 382,
+        FUN_GetHitLocation   = 391,
+        FUN_IsPC1stPerson    = 392,
+        FUN_GetCauseofDeath  = 397,
+        FUN_IsLimbGone       = 398,
+        FUN_IsWeaponInList   = 399,
+        FUN_HasFriendDisposition = 403,
+        FUN_GetVATSValue     = 408,
+        FUN_IsKiller         = 409,
+        FUN_IsKillerObject   = 410,
+        FUN_GetFactionCombatReaction = 411,
+        FUN_Exists           = 415,
+        FUN_GetGroupMemberCount = 416,
+        FUN_GetGroupTargetCount = 417,
+        FUN_GetObjectiveCompleted = 420,
+        FUN_GetObjectiveDisplayed = 421,
+        FUN_GetIsVoiceType   = 427,
+        FUN_GetPlantedExplosive = 428,
+        FUN_IsActorTalkingThroughActivator = 430,
+        FUN_GetHealthPercentage = 431,
+        FUN_GetIsObjectType  = 433,
+        FUN_GetDialogueEmotion = 435,
+        FUN_GetDialogueEmotionValue = 436,
+        FUN_GetIsCreatureType = 438,
+        FUN_GetInZone        = 446,
+        FUN_HasPerk          = 449,
+        FUN_GetFactionRelation = 450,
+        FUN_IsLastIdlePlayed = 451,
+        FUN_GetPlayerTeammate = 454,
+        FUN_GetPlayerTeammateCount = 455,
+        FUN_GetActorCrimePlayerEnemy = 459,
+        FUN_GetActorFactionPlayerEnemy = 460,
+        FUN_IsPlayerTagSkill = 462,
+        FUN_IsPlayerGrabbedRef = 464,
+        FUN_GetDestructionStage = 471,
+        FUN_GetIsAlignment   = 474,
+        FUN_GetThreatRatio   = 478,
+        FUN_GetIsUsedItemEquipType = 480,
+        FUN_GetConcussed     = 489,
+        FUN_GetMapMarkerVisible = 492,
+        FUN_GetPermanentActorValue = 495,
+        FUN_GetKillingBlowLimb = 496,
+        FUN_GetWeaponHealthPerc = 500,
+        FUN_GetRadiationLevel = 503,
+        FUN_GetLastHitCritical = 510,
+        FUN_IsCombatTarget   = 515,
+        FUN_GetVATSRightAreaFree = 518,
+        FUN_GetVATSLeftAreaFree = 519,
+        FUN_GetVATSBackAreaFree = 520,
+        FUN_GetVATSFrontAreaFree = 521,
+        FUN_GetIsLockBroken  = 522,
+        FUN_IsPS3            = 523,
+        FUN_IsWin32          = 524,
+        FUN_GetVATSRightTargetVisible = 525,
+        FUN_GetVATSLeftTargetVisible = 526,
+        FUN_GetVATSBackTargetVisible = 527,
+        FUN_GetVATSFrontTargetVisible = 528,
+        FUN_IsInCriticalStage = 531,
+        FUN_GetXPForNextLevel = 533,
+        FUN_GetQuestCompleted = 546,
+        FUN_IsGoreDisabled   = 550,
+        FUN_GetSpellUsageNum = 555,
+        FUN_GetActorsInHigh  = 557,
+        FUN_HasLoaded3D      = 558,
+        FUN_GetReputation    = 573,
+        FUN_GetReputationPct = 574,
+        FUN_GetReputationThreshold = 575,
+        FUN_IsHardcore       = 586,
+        FUN_GetForceHitReaction = 601,
+        FUN_ChallengeLocked  = 607,
+        FUN_GetCasinoWinningStage = 610,
+        FUN_PlayerInRegion   = 612,
+        FUN_GetChallengeCompleted = 614,
+        FUN_IsAlwaysHardcore = 619
+    };
+
+#pragma pack(push, 1)
+    struct TargetResponseData
+    {
+        std::uint32_t emoType; // EmotionType
+        std::int32_t  emoValue;
+        std::uint32_t unknown1;
+        std::uint32_t responseNo; // 1 byte + padding
+        // below FO3/FONV
+        FormId sound; // when 20 bytes usually 0 but there are exceptions (FO3 INFO FormId = 0x0002241f)
+        std::uint32_t flags; // 1 byte + padding (0x01 = use emotion anim)
+    };
+
+    struct TargetCondition
+    {
+        std::uint32_t condition; // ConditionTypeAndFlag + padding
+        float comparison; // WARN: can be GLOB FormId if flag set
+        std::uint32_t functionIndex;
+        std::uint32_t param1; // FIXME: if formid needs modindex adjustment or not?
+        std::uint32_t param2;
+        std::uint32_t runOn; // 0 subject, 1 target, 2 reference, 3 combat target, 4 linked reference
+        // below FO3/FONV/TES5
+        FormId reference;
+    };
+
+    struct ScriptHeader
+    {
+        std::uint32_t unused;
+        std::uint32_t refCount;
+        std::uint32_t compiledSize;
+        std::uint32_t variableCount;
+        std::uint16_t type; // 0 object, 1 quest, 0x100 effect
+        std::uint16_t flag; // 0x01 enabled
+    };
+#pragma pack(pop)
+
+    struct ScriptLocalVariableData
+    {
+        // SLSD
+        std::uint32_t index;
+        std::uint32_t unknown1;
+        std::uint32_t unknown2;
+        std::uint32_t unknown3;
+        std::uint32_t type;
+        std::uint32_t unknown4;
+        // SCVR
+        std::string variableName;
+
+        void clear() {
+            index = 0;
+            type = 0;
+            variableName.clear();
+        }
+    };
+
+    struct ScriptDefinition
+    {
+        ScriptHeader scriptHeader;
+        // SDCA compiled source
+        std::string scriptSource;
+        std::vector<ScriptLocalVariableData> localVarData;
+        std::vector<std::uint32_t> localRefVarIndex;
+        FormId globReference;
+    };
+}
+
+#endif // ESM4_SCRIPT_H
diff --git a/components/to_utf8/to_utf8.cpp b/components/to_utf8/to_utf8.cpp
index f7dc33fcbf..04edfda09d 100644
--- a/components/to_utf8/to_utf8.cpp
+++ b/components/to_utf8/to_utf8.cpp
@@ -84,6 +84,15 @@ std::string Utf8Encoder::getUtf8(const char* input, size_t size)
     // is also ok.)
     assert(input[size] == 0);
 
+    std::string inputString(input, size);
+    std::string output;
+    toUtf8(inputString, output, size);
+
+    return output;
+}
+
+void Utf8Encoder::toUtf8(std::string& input, std::string& output, size_t size)
+{
     // Note: The rest of this function is designed for single-character
     // input encodings only. It also assumes that the input encoding
     // shares its first 128 values (0-127) with ASCII. There are no plans
@@ -93,29 +102,36 @@ std::string Utf8Encoder::getUtf8(const char* input, size_t size)
     // Compute output length, and check for pure ascii input at the same
     // time.
     bool ascii;
-    size_t outlen = getLength(input, ascii);
+    size_t outlen = getLength(input.c_str(), ascii);
 
     // If we're pure ascii, then don't bother converting anything.
     if(ascii)
-        return std::string(input, outlen);
+    {
+        std::swap(input, output);
+        return;
+    }
 
     // Make sure the output is large enough
-    resize(outlen);
-    char *out = &mOutput[0];
+    if (output.size() <= outlen)
+        // Add some extra padding to reduce the chance of having to resize
+        // again later.
+        output.resize(3*outlen);
+
+    // And make sure the string is zero terminated
+    output[outlen] = 0;
+    char *in = &input[0];
+    char *out = &output[0];
 
     // Translate
-    while (*input)
-        copyFromArray(*(input++), out);
+    while (*in)
+        copyFromArray(*(in++), out);
 
     // Make sure that we wrote the correct number of bytes
-    assert((out-&mOutput[0]) == (int)outlen);
+    assert((out-&output[0]) == (int)outlen);
 
     // And make extra sure the output is null terminated
-    assert(mOutput.size() > outlen);
-    assert(mOutput[outlen] == 0);
-
-    // Return a string
-    return std::string(&mOutput[0], outlen);
+    assert(output.size() > outlen);
+    assert(output[outlen] == 0);
 }
 
 std::string Utf8Encoder::getLegacyEnc(const char *input, size_t size)
diff --git a/components/to_utf8/to_utf8.hpp b/components/to_utf8/to_utf8.hpp
index d8c9f09d5d..23dc09c06e 100644
--- a/components/to_utf8/to_utf8.hpp
+++ b/components/to_utf8/to_utf8.hpp
@@ -34,6 +34,9 @@ namespace ToUTF8
                 return getUtf8(str.c_str(), str.size());
             }
 
+            // Convert input to UTF8 to the given output string
+            void toUtf8(std::string& input, std::string& output, size_t size);
+
             std::string getLegacyEnc(const char *input, size_t size);
             inline std::string getLegacyEnc(const std::string &str)
             {
diff --git a/components/translation/translation.cpp b/components/translation/translation.cpp
index ef0f432075..37068fd70d 100644
--- a/components/translation/translation.cpp
+++ b/components/translation/translation.cpp
@@ -53,13 +53,14 @@ namespace Translation
 
             if (!line.empty())
             {
-                line = mEncoder->getUtf8(line);
+                std::string utf8Line;
+                mEncoder->toUtf8(line, utf8Line, line.size());
 
-                size_t tab_pos = line.find('\t');
-                if (tab_pos != std::string::npos && tab_pos > 0 && tab_pos < line.size() - 1)
+                size_t tab_pos = utf8Line.find('\t');
+                if (tab_pos != std::string::npos && tab_pos > 0 && tab_pos < utf8Line.size() - 1)
                 {
-                    std::string key = line.substr(0, tab_pos);
-                    std::string value = line.substr(tab_pos + 1);
+                    std::string key = utf8Line.substr(0, tab_pos);
+                    std::string value = utf8Line.substr(tab_pos + 1);
 
                     if (!key.empty() && !value.empty())
                         container.insert(std::make_pair(key, value));

From 8113620dce5ac188347d688e7fb5894cbeb5c14b Mon Sep 17 00:00:00 2001
From: Bret Curtis <bret.curtis@gmail.com>
Date: Sun, 30 Jan 2022 20:26:35 +0100
Subject: [PATCH 2023/2859] handle a few wearnings raised as errors

---
 components/esm4/loadpgrd.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/esm4/loadpgrd.cpp b/components/esm4/loadpgrd.cpp
index a0bfc9b119..c9c3048605 100644
--- a/components/esm4/loadpgrd.cpp
+++ b/components/esm4/loadpgrd.cpp
@@ -115,7 +115,7 @@ void ESM4::Pathgrid::load(ESM4::Reader& reader)
                 for (std::size_t i = 0; i < numForeign; ++i)
                 {
                     reader.get(mForeign.at(i));
-                    mForeign.at(i).localNode;// &= 0xffff; // some have junk high bits (maybe flags?)
+                    // mForeign.at(i).localNode;// &= 0xffff; // some have junk high bits (maybe flags?)
                 }
 
                 break;

From 899199c8ed0eb9c13658e1fd44b8e2f3d00c7697 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Mon, 31 Jan 2022 22:40:27 +0100
Subject: [PATCH 2024/2859] Add range to "aux_util.findNearestTo".

---
 files/builtin_scripts/openmw_aux/util.lua | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/files/builtin_scripts/openmw_aux/util.lua b/files/builtin_scripts/openmw_aux/util.lua
index 8d4f7c1fd7..c442178b5e 100644
--- a/files/builtin_scripts/openmw_aux/util.lua
+++ b/files/builtin_scripts/openmw_aux/util.lua
@@ -13,19 +13,24 @@ local aux_util = {}
 -- @function [parent=#util] findNearestTo
 -- @param openmw.util#Vector3 point
 -- @param openmw.core#ObjectList objectList
+-- @param #number minDist (optional) ignore objects that are closer than minDist
+-- @param #number maxDist (optional) ignore objects that are farther than maxDist
 -- @return openmw.core#GameObject, #number the nearest object and the distance
-function aux_util.findNearestTo(point, objectList)
+function aux_util.findNearestTo(point, objectList, minDist, maxDist)
     local res = nil
     local resDist = nil
+    local minDist = minDist or 0
     for i = 1, #objectList do
         local obj = objectList[i]
         local dist = (obj.position - point):length()
-        if i == 1 or dist < resDist then
+        if dist >= minDist and (not res or dist < resDist) then
             res = obj
             resDist = dist
         end
     end
-    return res, resDist
+    if res and (not maxDist or resDist <= maxDist) then
+        return res, resDist
+    end
 end
 
 return aux_util

From c31dedb89cd9391b4700f6f1a7f26eee724a7969 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Tue, 1 Feb 2022 18:47:20 +0000
Subject: [PATCH 2025/2859] Implement Yaw, Pitch and Use (attack / cast spell)
 in Lua self.controls

---
 apps/openmw/mwbase/luamanager.hpp         |  4 +++-
 apps/openmw/mwlua/localscripts.cpp        |  4 +++-
 apps/openmw/mwlua/luabindings.cpp         |  2 +-
 apps/openmw/mwmechanics/actors.cpp        | 13 ++++++----
 apps/openmw/mwmechanics/aicombat.cpp      | 12 +++++-----
 apps/openmw/mwmechanics/aicombat.hpp      |  2 +-
 apps/openmw/mwmechanics/character.cpp     | 29 ++++++++++++-----------
 apps/openmw/mwmechanics/character.hpp     |  6 +++--
 apps/openmw/mwmechanics/creaturestats.cpp |  1 +
 apps/openmw/mwmechanics/creaturestats.hpp |  5 ++--
 apps/openmw/mwrender/npcanimation.cpp     |  2 +-
 apps/openmw/mwworld/player.cpp            |  9 +------
 apps/openmw/mwworld/player.hpp            |  2 --
 files/lua_api/openmw/self.lua             |  4 +++-
 14 files changed, 50 insertions(+), 45 deletions(-)

diff --git a/apps/openmw/mwbase/luamanager.hpp b/apps/openmw/mwbase/luamanager.hpp
index cc479a2937..8c0c5d61de 100644
--- a/apps/openmw/mwbase/luamanager.hpp
+++ b/apps/openmw/mwbase/luamanager.hpp
@@ -56,7 +56,9 @@ namespace MWBase
             bool mRun = false;
             float mMovement = 0;
             float mSideMovement = 0;
-            float mTurn = 0;
+            float mPitchChange = 0;
+            float mYawChange = 0;
+            int mUse = 0;
         };
 
         virtual ActorControls* getActorControls(const MWWorld::Ptr&) const = 0;
diff --git a/apps/openmw/mwlua/localscripts.cpp b/apps/openmw/mwlua/localscripts.cpp
index 98cf0a0b1a..918970dc54 100644
--- a/apps/openmw/mwlua/localscripts.cpp
+++ b/apps/openmw/mwlua/localscripts.cpp
@@ -27,9 +27,11 @@ namespace MWLua
                                            [](ActorControls& c, const TYPE& v) { c.FIELD = v; c.mChanged = true; })
         controls["movement"] = CONTROL(float, mMovement);
         controls["sideMovement"] = CONTROL(float, mSideMovement);
-        controls["turn"] = CONTROL(float, mTurn);
+        controls["pitchChange"] = CONTROL(float, mPitchChange);
+        controls["yawChange"] = CONTROL(float, mYawChange);
         controls["run"] = CONTROL(bool, mRun);
         controls["jump"] = CONTROL(bool, mJump);
+        controls["use"] = CONTROL(int, mUse);
 #undef CONTROL
 
         sol::usertype<SelfObject> selfAPI =
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index cf60e00728..309ab51c08 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -49,7 +49,7 @@ namespace MWLua
     {
         auto* lua = context.mLua;
         sol::table api(lua->sol(), sol::create);
-        api["API_REVISION"] = 14;
+        api["API_REVISION"] = 15;
         api["quit"] = [lua]()
         {
             Log(Debug::Warning) << "Quit requested by a Lua script.\n" << lua->debugTraceback();
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 7c94c4e604..c567ea464c 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1401,9 +1401,6 @@ namespace MWMechanics
                 // AI processing is only done within given distance to the player.
                 bool inProcessingRange = distSqr <= mActorsProcessingRange*mActorsProcessingRange;
 
-                if (isPlayer)
-                    ctrl->setAttackingOrSpell(world->getPlayer().getAttackingOrSpell());
-
                 // If dead or no longer in combat, no longer store any actors who attempted to hit us. Also remove for the player.
                 if (iter->first != player && (iter->first.getClass().getCreatureStats(iter->first).isDead()
                     || !iter->first.getClass().getCreatureStats(iter->first).getAiSequence().isInCombat()
@@ -1524,25 +1521,31 @@ namespace MWMechanics
                         CreatureStats& stats = iter->first.getClass().getCreatureStats(iter->first);
                         float speedFactor = isPlayer ? 1.f : mov.mSpeedFactor;
                         osg::Vec2f movement = osg::Vec2f(mov.mPosition[0], mov.mPosition[1]) * speedFactor;
+                        float rotationX = mov.mRotation[0];
                         float rotationZ = mov.mRotation[2];
                         bool jump = mov.mPosition[2] == 1;
                         bool runFlag = stats.getMovementFlag(MWMechanics::CreatureStats::Flag_Run);
+                        bool attackingOrSpell = stats.getAttackingOrSpell();
                         if (luaControls->mChanged)
                         {
                             mov.mPosition[0] = luaControls->mSideMovement;
                             mov.mPosition[1] = luaControls->mMovement;
                             mov.mPosition[2] = luaControls->mJump ? 1 : 0;
+                            mov.mRotation[0] = luaControls->mPitchChange;
                             mov.mRotation[1] = 0;
-                            mov.mRotation[2] = luaControls->mTurn;
+                            mov.mRotation[2] = luaControls->mYawChange;
                             mov.mSpeedFactor = osg::Vec2(luaControls->mMovement, luaControls->mSideMovement).length();
                             stats.setMovementFlag(MWMechanics::CreatureStats::Flag_Run, luaControls->mRun);
+                            stats.setAttackingOrSpell(luaControls->mUse == 1);
                             luaControls->mChanged = false;
                         }
                         luaControls->mSideMovement = movement.x();
                         luaControls->mMovement = movement.y();
-                        luaControls->mTurn = rotationZ;
+                        luaControls->mPitchChange = rotationX;
+                        luaControls->mYawChange = rotationZ;
                         luaControls->mJump = jump;
                         luaControls->mRun = runFlag;
+                        luaControls->mUse = attackingOrSpell ? luaControls->mUse | 1 : luaControls->mUse & ~1;
                     }
                 }
             }
diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index 46f04b6f97..83ff795545 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -141,7 +141,7 @@ namespace MWMechanics
             if (storage.mReadyToAttack) updateActorsMovement(actor, duration, storage);
             if (storage.mRotateMove)
                 return false;
-            storage.updateAttack(characterController);
+            storage.updateAttack(actor, characterController);
         }
         else
         {
@@ -168,7 +168,7 @@ namespace MWMechanics
         if (!canFight(actor, target))
         {
             storage.stopAttack();
-            characterController.setAttackingOrSpell(false);
+            actor.getClass().getCreatureStats(actor).setAttackingOrSpell(false);
             storage.mActionCooldown = 0.f;
             // Continue combat if target is player or player follower/escorter and an attack has been attempted
             const std::list<MWWorld::Ptr>& playerFollowersAndEscorters = MWBase::Environment::get().getMechanicsManager()->getActorsSidingWith(MWMechanics::getPlayer());
@@ -299,7 +299,7 @@ namespace MWMechanics
                 {
                     storage.mUseCustomDestination = false;
                     storage.stopAttack();
-                    characterController.setAttackingOrSpell(false);
+                    actor.getClass().getCreatureStats(actor).setAttackingOrSpell(false);
                     currentAction.reset(new ActionFlee());
                     actionCooldown = currentAction->getActionCooldown();
                     storage.startFleeing();
@@ -575,7 +575,7 @@ namespace MWMechanics
             if (mAttackCooldown <= 0)
             {
                 mAttack = true; // attack starts just now
-                characterController.setAttackingOrSpell(true);
+                actor.getClass().getCreatureStats(actor).setAttackingOrSpell(true);
 
                 if (!distantCombat)
                     characterController.setAIAttackType(chooseBestAttack(weapon));
@@ -603,13 +603,13 @@ namespace MWMechanics
         }
     }
 
-    void AiCombatStorage::updateAttack(CharacterController& characterController)
+    void AiCombatStorage::updateAttack(const MWWorld::Ptr& actor, CharacterController& characterController)
     {
         if (mAttack && (characterController.getAttackStrength() >= mStrength || characterController.readyToPrepareAttack()))
         {
             mAttack = false;
         }
-        characterController.setAttackingOrSpell(mAttack);
+        actor.getClass().getCreatureStats(actor).setAttackingOrSpell(mAttack);
     }
 
     void AiCombatStorage::stopAttack()
diff --git a/apps/openmw/mwmechanics/aicombat.hpp b/apps/openmw/mwmechanics/aicombat.hpp
index 34e726412c..c783994b97 100644
--- a/apps/openmw/mwmechanics/aicombat.hpp
+++ b/apps/openmw/mwmechanics/aicombat.hpp
@@ -88,7 +88,7 @@ namespace MWMechanics
         void stopCombatMove();
         void startAttackIfReady(const MWWorld::Ptr& actor, CharacterController& characterController,
             const ESM::Weapon* weapon, bool distantCombat);
-        void updateAttack(CharacterController& characterController);
+        void updateAttack(const MWWorld::Ptr& actor, CharacterController& characterController);
         void stopAttack();
 
         void startFleeing();
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 6c33f86c76..0f8e2ebd97 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -854,7 +854,6 @@ CharacterController::CharacterController(const MWWorld::Ptr &ptr, MWRender::Anim
     , mSecondsOfSwimming(0)
     , mSecondsOfRunning(0)
     , mTurnAnimationThreshold(0)
-    , mAttackingOrSpell(false)
     , mCastingManualSpell(false)
     , mTimeUntilWake(0.f)
     , mIsMovingBackward(false)
@@ -1138,7 +1137,7 @@ bool CharacterController::updateCreatureState()
             mAnimation->disable(mCurrentWeapon);
     }
 
-    if(mAttackingOrSpell)
+    if(getAttackingOrSpell())
     {
         if(mUpperBodyState == UpperCharState_Nothing && mHitState == CharState_None)
         {
@@ -1202,7 +1201,7 @@ bool CharacterController::updateCreatureState()
             }
         }
 
-        mAttackingOrSpell = false;
+        setAttackingOrSpell(false);
     }
 
     bool animPlaying = mAnimation->getInfo(mCurrentWeapon);
@@ -1277,11 +1276,10 @@ bool CharacterController::updateWeaponState(CharacterState& idle)
     {
         forcestateupdate = true;
         mUpperBodyState = UpperCharState_WeapEquiped;
-        mAttackingOrSpell = false;
+        setAttackingOrSpell(false);
         mAnimation->disable(mCurrentWeapon);
         mAnimation->showWeapons(true);
-        if (mPtr == getPlayer())
-            MWBase::Environment::get().getWorld()->getPlayer().setAttackingOrSpell(false);
+        stats.setAttackingOrSpell(false);
     }
 
     if(!isKnockedOut() && !isKnockedDown() && !isRecovery())
@@ -1456,7 +1454,7 @@ bool CharacterController::updateWeaponState(CharacterState& idle)
     float complete;
     bool animPlaying;
     ESM::WeaponType::Class weapclass = getWeaponType(mWeaponType)->mWeaponClass;
-    if(mAttackingOrSpell)
+    if(getAttackingOrSpell())
     {
         MWWorld::Ptr player = getPlayer();
 
@@ -1478,11 +1476,9 @@ bool CharacterController::updateWeaponState(CharacterState& idle)
             {
                 // Unset casting flag, otherwise pressing the mouse button down would
                 // continue casting every frame if there is no animation
-                mAttackingOrSpell = false;
+                setAttackingOrSpell(false);
                 if (mPtr == player)
                 {
-                    MWBase::Environment::get().getWorld()->getPlayer().setAttackingOrSpell(false);
-
                     // For the player, set the spell we want to cast
                     // This has to be done at the start of the casting animation,
                     // *not* when selecting a spell in the GUI (otherwise you could change the spell mid-animation)
@@ -1791,7 +1787,7 @@ bool CharacterController::updateWeaponState(CharacterState& idle)
                     // Note: if the "min attack"->"max attack" is a stub, "play" it anyway. Attack strength will be random.
                     float minAttackTime = mAnimation->getTextKeyTime(mCurrentWeapon+": "+mAttackType+" "+"min attack");
                     float maxAttackTime = mAnimation->getTextKeyTime(mCurrentWeapon+": "+mAttackType+" "+"max attack");
-                    if (mAttackingOrSpell || minAttackTime == maxAttackTime)
+                    if (getAttackingOrSpell() || minAttackTime == maxAttackTime)
                     {
                         start = mAttackType+" min attack";
                         stop = mAttackType+" max attack";
@@ -2647,7 +2643,7 @@ void CharacterController::forceStateUpdate()
     // Make sure we canceled the current attack or spellcasting,
     // because we disabled attack animations anyway.
     mCastingManualSpell = false;
-    mAttackingOrSpell = false;
+    setAttackingOrSpell(false);
     if (mUpperBodyState != UpperCharState_Nothing)
         mUpperBodyState = UpperCharState_WeapEquiped;
 
@@ -2845,12 +2841,12 @@ bool CharacterController::isRunning() const
 
 void CharacterController::setAttackingOrSpell(bool attackingOrSpell)
 {
-    mAttackingOrSpell = attackingOrSpell;
+    mPtr.getClass().getCreatureStats(mPtr).setAttackingOrSpell(attackingOrSpell);
 }
 
 void CharacterController::castSpell(const std::string& spellId, bool manualSpell)
 {
-    mAttackingOrSpell = true;
+    setAttackingOrSpell(true);
     mCastingManualSpell = manualSpell;
     ActionSpell action = ActionSpell(spellId);
     action.prepare(mPtr);
@@ -2894,6 +2890,11 @@ float CharacterController::getAttackStrength() const
     return mAttackStrength;
 }
 
+bool CharacterController::getAttackingOrSpell()
+{
+    return mPtr.getClass().getCreatureStats(mPtr).getAttackingOrSpell();
+}
+
 void CharacterController::setActive(int active)
 {
     mAnimation->setActive(active);
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index adeaa739af..1647980541 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -188,7 +188,6 @@ class CharacterController : public MWRender::Animation::TextKeyListener
 
     std::string mAttackType; // slash, chop or thrust
 
-    bool mAttackingOrSpell;
     bool mCastingManualSpell;
 
     float mTimeUntilWake;
@@ -235,6 +234,10 @@ class CharacterController : public MWRender::Animation::TextKeyListener
 
     std::string getWeaponAnimation(int weaponType) const;
 
+    bool getAttackingOrSpell();
+    void setAttackingOrSpell(bool attackingOrSpell);
+
+
 public:
     CharacterController(const MWWorld::Ptr &ptr, MWRender::Animation *anim);
     virtual ~CharacterController();
@@ -285,7 +288,6 @@ public:
     bool isAttackingOrSpell() const;
 
     void setVisibility(float visibility);
-    void setAttackingOrSpell(bool attackingOrSpell);
     void castSpell(const std::string& spellId, bool manualSpell=false);
     void setAIAttackType(const std::string& attackType);
     static void setAttackTypeRandomly(std::string& attackType);
diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index 03c2d3f41f..9611f5b34a 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -24,6 +24,7 @@ namespace MWMechanics
           mHitRecovery(false), mBlock(false), mMovementFlags(0),
           mFallHeight(0), mLastRestock(0,0), mGoldPool(0), mActorId(-1), mHitAttemptActorId(-1),
           mDeathAnimation(-1), mTimeOfDeath(), mSideMovementAngle(0), mLevel (0)
+        , mAttackingOrSpell(false)
     {
         for (int i=0; i<4; ++i)
             mAiSettings[i] = 0;
diff --git a/apps/openmw/mwmechanics/creaturestats.hpp b/apps/openmw/mwmechanics/creaturestats.hpp
index 002991e004..2bcb452292 100644
--- a/apps/openmw/mwmechanics/creaturestats.hpp
+++ b/apps/openmw/mwmechanics/creaturestats.hpp
@@ -92,6 +92,7 @@ namespace MWMechanics
 
     protected:
         int mLevel;
+        bool mAttackingOrSpell;
 
     public:
         CreatureStats();
@@ -124,7 +125,7 @@ namespace MWMechanics
 
         const MagicEffects & getMagicEffects() const;
 
-        bool getAttackingOrSpell() const;
+        bool getAttackingOrSpell() const { return mAttackingOrSpell; }
 
         int getLevel() const;
 
@@ -149,7 +150,7 @@ namespace MWMechanics
         /// Set Modifier for each magic effect according to \a effects. Does not touch Base values.
         void modifyMagicEffects(const MagicEffects &effects);
 
-        void setAttackingOrSpell(bool attackingOrSpell);
+        void setAttackingOrSpell(bool attackingOrSpell) { mAttackingOrSpell = attackingOrSpell; }
 
         void setLevel(int level);
 
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index da361aec25..308762045c 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -957,7 +957,7 @@ void NpcAnimation::showWeapons(bool showWeapon)
         removeIndividualPart(ESM::PRT_Weapon);
         // If we remove/hide weapon from player, we should reset attack animation as well
         if (mPtr == MWMechanics::getPlayer())
-            MWBase::Environment::get().getWorld()->getPlayer().setAttackingOrSpell(false);
+            mPtr.getClass().getCreatureStats(mPtr).setAttackingOrSpell(false);
     }
 
     updateHolsteredWeapon(!mShowWeapons);
diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp
index 3902a409e5..7062366697 100644
--- a/apps/openmw/mwworld/player.cpp
+++ b/apps/openmw/mwworld/player.cpp
@@ -39,7 +39,6 @@ namespace MWWorld
         mTeleported(false),
         mCurrentCrimeId(-1),
         mPaidCrimeId(-1),
-        mAttackingOrSpell(false),
         mJumping(false)
     {
         ESM::CellRef cellRef;
@@ -266,12 +265,7 @@ namespace MWWorld
 
     void Player::setAttackingOrSpell(bool attackingOrSpell)
     {
-        mAttackingOrSpell = attackingOrSpell;
-    }
-
-    bool Player::getAttackingOrSpell() const
-    {
-        return mAttackingOrSpell;
+        getPlayer().getClass().getCreatureStats(getPlayer()).setAttackingOrSpell(attackingOrSpell);
     }
 
     void Player::setJumping(bool jumping)
@@ -314,7 +308,6 @@ namespace MWWorld
         mAutoMove = false;
         mForwardBackward = 0;
         mTeleported = false;
-        mAttackingOrSpell = false;
         mJumping = false;
         mCurrentCrimeId = -1;
         mPaidCrimeId = -1;
diff --git a/apps/openmw/mwworld/player.hpp b/apps/openmw/mwworld/player.hpp
index 2770042969..4add58541e 100644
--- a/apps/openmw/mwworld/player.hpp
+++ b/apps/openmw/mwworld/player.hpp
@@ -56,7 +56,6 @@ namespace MWWorld
         float mSaveSkills[ESM::Skill::Length];
         float mSaveAttributes[ESM::Attribute::Length];
 
-        bool mAttackingOrSpell;
         bool mJumping;
 
     public:
@@ -112,7 +111,6 @@ namespace MWWorld
         void setTeleported(bool teleported);
 
         void setAttackingOrSpell(bool attackingOrSpell);
-        bool getAttackingOrSpell() const;
 
         void setJumping(bool jumping);
         bool getJumping() const;
diff --git a/files/lua_api/openmw/self.lua b/files/lua_api/openmw/self.lua
index 98f1071cf6..1228a92a87 100644
--- a/files/lua_api/openmw/self.lua
+++ b/files/lua_api/openmw/self.lua
@@ -30,9 +30,11 @@
 -- @type ActorControls
 -- @field [parent=#ActorControls] #number movement +1 - move forward, -1 - move backward
 -- @field [parent=#ActorControls] #number sideMovement +1 - move right, -1 - move left
--- @field [parent=#ActorControls] #number turn Turn right (radians); if negative - turn left
+-- @field [parent=#ActorControls] #number yawChange Turn right (radians); if negative - turn left
+-- @field [parent=#ActorControls] #number pitchChange Look down (radians); if negative - look up
 -- @field [parent=#ActorControls] #boolean run true - run, false - walk
 -- @field [parent=#ActorControls] #boolean jump If true - initiate a jump
+-- @field [parent=#ActorControls] #number use if 1 - activates the readied weapon/spell. For weapons, keeping at 1 will charge the attack until set to 0.
 
 -------------------------------------------------------------------------------
 -- Enables or disables standart AI (enabled by default).

From fba82eb1a7fca59420f69577224116d093ae4567 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Tue, 25 Jan 2022 21:53:00 +0100
Subject: [PATCH 2026/2859] Script settings tab

---
 apps/openmw/mwgui/settingswindow.cpp      | 85 +++++++++++++++++++++--
 apps/openmw/mwgui/settingswindow.hpp      | 10 +++
 apps/openmw/mwlua/uibindings.cpp          | 17 ++++-
 components/CMakeLists.txt                 |  2 +-
 components/lua_ui/scriptsettings.cpp      | 37 ++++++++++
 components/lua_ui/scriptsettings.hpp      | 25 +++++++
 components/lua_ui/util.cpp                |  2 +
 files/mygui/openmw_settings_window.layout | 13 ++++
 8 files changed, 183 insertions(+), 8 deletions(-)
 create mode 100644 components/lua_ui/scriptsettings.cpp
 create mode 100644 components/lua_ui/scriptsettings.hpp

diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index 69d09f7260..8c3740d15d 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -1,18 +1,20 @@
 #include "settingswindow.hpp"
 
+#include <regex>
+#include <iomanip>
+#include <numeric>
+#include <array>
+
 #include <MyGUI_ScrollBar.h>
 #include <MyGUI_Window.h>
 #include <MyGUI_ComboBox.h>
 #include <MyGUI_ScrollView.h>
 #include <MyGUI_Gui.h>
 #include <MyGUI_TabControl.h>
+#include <MyGUI_TabItem.h>
 
 #include <SDL_video.h>
 
-#include <iomanip>
-#include <numeric>
-#include <array>
-
 #include <components/debug/debuglog.hpp>
 #include <components/misc/stringops.hpp>
 #include <components/misc/constants.hpp>
@@ -21,6 +23,7 @@
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/lightmanager.hpp>
+#include <components/lua_ui/scriptsettings.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
@@ -33,7 +36,6 @@
 
 namespace
 {
-
     std::string textureMipmappingToStr(const std::string& val)
     {
         if (val == "linear")  return "Trilinear";
@@ -236,6 +238,10 @@ namespace MWGui
         getWidget(mLightingMethodButton, "LightingMethodButton");
         getWidget(mLightsResetButton, "LightsResetButton");
         getWidget(mMaxLights, "MaxLights");
+        getWidget(mScriptFilter, "ScriptFilter");
+        getWidget(mScriptList, "ScriptList");
+        getWidget(mScriptView, "ScriptView");
+        getWidget(mScriptDisabled, "ScriptDisabled");
 
 #ifndef WIN32
         // hide gamma controls since it currently does not work under Linux
@@ -321,9 +327,12 @@ namespace MWGui
 
         mKeyboardSwitch->setStateSelected(true);
         mControllerSwitch->setStateSelected(false);
+
+        mScriptFilter->eventEditTextChange += MyGUI::newDelegate(this, &SettingsWindow::onScriptFilterChange);
+        mScriptList->eventListMouseItemActivate += MyGUI::newDelegate(this, &SettingsWindow::onScriptListSelection);
     }
 
-    void SettingsWindow::onTabChanged(MyGUI::TabControl* /*_sender*/, size_t /*index*/)
+    void SettingsWindow::onTabChanged(MyGUI::TabControl* /*_sender*/, size_t index)
     {
         resetScrollbars();
     }
@@ -699,6 +708,67 @@ namespace MWGui
         mControlsBox->setVisibleVScroll(true);
     }
 
+    void SettingsWindow::resizeScriptSettings()
+    {
+        static int minListWidth = 150;
+        static float relativeListWidth = 0.2f;
+        MyGUI::IntSize parentSize = mScriptFilter->getParent()->getClientCoord().size();
+        int listWidth = std::max(minListWidth, static_cast<int>(parentSize.width * relativeListWidth));
+        int filterHeight = mScriptFilter->getSize().height;
+        int listBorder = (mScriptList->getSize().height - mScriptList->getClientCoord().height) / 2;
+        int listHeight = parentSize.height - listBorder - mScriptList->getPosition().top;
+        mScriptFilter->setSize({ listWidth, filterHeight });
+        mScriptList->setSize({ listWidth, listHeight });
+        mScriptView->setPosition({ listWidth, 0 });
+        mScriptView->setSize({ parentSize.width - listWidth, parentSize.height });
+        mScriptDisabled->setPosition({0, 0});
+        mScriptDisabled->setSize(parentSize);
+    }
+
+    void SettingsWindow::renderScriptSettings()
+    {
+        while (mScriptView->getChildCount() > 0)
+            mScriptView->getChildAt(0)->detachFromWidget();
+        mScriptList->removeAllItems();
+
+        std::string filter(".*");
+        filter += mScriptFilter->getCaption();
+        filter += ".*";
+        auto flags = std::regex_constants::icase;
+        std::regex filterRegex(filter, flags);
+
+        auto scriptSettings = LuaUi::scriptSettings();
+        for (size_t i = 0; i < scriptSettings.size(); ++i)
+        {
+            LuaUi::ScriptSettings script = scriptSettings[i];
+            if (std::regex_match(script.mName, filterRegex) || std::regex_match(script.mSearchHints, filterRegex))
+                mScriptList->addItem(script.mName, i);
+        }
+
+        // Hide script settings tab when the game world isn't loaded and scripts couldn't add their settings
+        bool disabled = scriptSettings.empty();
+        mScriptDisabled->setVisible(disabled);
+        mScriptFilter->setVisible(!disabled);
+        mScriptList->setVisible(!disabled);
+        mScriptView->setVisible(!disabled);
+    }
+
+    void SettingsWindow::onScriptFilterChange(MyGUI::Widget*)
+    {
+        renderScriptSettings();
+    }
+
+    void SettingsWindow::onScriptListSelection(MyGUI::Widget*, size_t index)
+    {
+        while (mScriptView->getChildCount() > 0)
+            mScriptView->getChildAt(0)->detachFromWidget();
+        if (index >= mScriptList->getItemCount())
+            return;
+        size_t scriptIndex = *mScriptList->getItemDataAt<size_t>(index);
+        LuaUi::ScriptSettings script = LuaUi::scriptSettings()[scriptIndex];
+        LuaUi::attachToWidget(script, mScriptView);
+    }
+
     void SettingsWindow::onRebindAction(MyGUI::Widget* _sender)
     {
         int actionId = *_sender->getUserData<int>();
@@ -744,12 +814,15 @@ namespace MWGui
         updateControlsBox();
         updateLightSettings();
         resetScrollbars();
+        renderScriptSettings();
+        resizeScriptSettings();
         MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mOkButton);
     }
 
     void SettingsWindow::onWindowResize(MyGUI::Window *_sender)
     {
         layoutControlsBox();
+        resizeScriptSettings();
     }
 
     void SettingsWindow::computeMinimumWindowSize()
diff --git a/apps/openmw/mwgui/settingswindow.hpp b/apps/openmw/mwgui/settingswindow.hpp
index d58e94e84a..f002a67306 100644
--- a/apps/openmw/mwgui/settingswindow.hpp
+++ b/apps/openmw/mwgui/settingswindow.hpp
@@ -44,6 +44,11 @@ namespace MWGui
             MyGUI::Button* mControllerSwitch;
             bool mKeyboardMode; //if true, setting up the keyboard. Otherwise, it's controller
 
+            MyGUI::EditBox* mScriptFilter;
+            MyGUI::ListBox* mScriptList;
+            MyGUI::Widget* mScriptView;
+            MyGUI::EditBox* mScriptDisabled;
+
             void onTabChanged(MyGUI::TabControl* _sender, size_t index);
             void onOkButtonClicked(MyGUI::Widget* _sender);
             void onTextureFilteringChanged(MyGUI::ComboBox* _sender, size_t pos);
@@ -71,12 +76,17 @@ namespace MWGui
 
             void onWindowResize(MyGUI::Window* _sender);
 
+            void onScriptFilterChange(MyGUI::Widget*);
+            void onScriptListSelection(MyGUI::Widget*, size_t index);
+
             void apply();
 
             void configureWidgets(MyGUI::Widget* widget, bool init);
             void updateSliderLabel(MyGUI::ScrollBar* scroller, const std::string& value);
 
             void layoutControlsBox();
+            void resizeScriptSettings();
+            void renderScriptSettings();
 
             void computeMinimumWindowSize();
         
diff --git a/apps/openmw/mwlua/uibindings.cpp b/apps/openmw/mwlua/uibindings.cpp
index 61e7c471c1..5fe54a4d35 100644
--- a/apps/openmw/mwlua/uibindings.cpp
+++ b/apps/openmw/mwlua/uibindings.cpp
@@ -2,6 +2,7 @@
 #include <components/lua_ui/element.hpp>
 #include <components/lua_ui/layers.hpp>
 #include <components/lua_ui/content.hpp>
+#include <components/lua_ui/scriptsettings.hpp>
 
 #include "context.hpp"
 #include "actions.hpp"
@@ -43,7 +44,7 @@ namespace MWLua
                                 break;
                         }
                     }
-                    catch (std::exception& e)
+                    catch (std::exception&)
                     {
                         // prevent any actions on a potentially corrupted widget
                         mElement->mRoot = nullptr;
@@ -238,6 +239,20 @@ namespace MWLua
             typeTable.set(it.second, it.first);
         api["TYPE"] = LuaUtil::makeReadOnly(typeTable);
 
+        api["registerSettings"] = [](sol::table options)
+        {
+            LuaUi::ScriptSettings script;
+            script.mName = options.get_or("name", std::string());
+            if (script.mName.empty())
+                throw std::logic_error("No name provided for script settings");
+            script.mSearchHints = options.get_or("searchHints", std::string());
+            auto element = options.get_or<std::shared_ptr<LuaUi::Element>>("element", nullptr);
+            if (!element)
+                throw std::logic_error("No UI element provided for script settings");
+            script.mElement = element.get();
+            LuaUi::registerSettings(script);
+        };
+
         return LuaUtil::makeReadOnly(api);
     }
 }
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 2d986660bc..3526386e69 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -165,7 +165,7 @@ add_component_dir (queries
     )
     
 add_component_dir (lua_ui
-    properties widget element util layers content
+    properties widget element util layers content scriptsettings
     text textedit window image
     )
 
diff --git a/components/lua_ui/scriptsettings.cpp b/components/lua_ui/scriptsettings.cpp
new file mode 100644
index 0000000000..071ded1b5d
--- /dev/null
+++ b/components/lua_ui/scriptsettings.cpp
@@ -0,0 +1,37 @@
+#include "scriptsettings.hpp"
+
+#include <map>
+
+#include "element.hpp"
+
+namespace LuaUi
+{
+    namespace
+    {
+        std::vector<ScriptSettings> allSettings;
+    }
+
+    const std::vector<ScriptSettings>& scriptSettings()
+    {
+        return allSettings;
+    }
+
+    void registerSettings(const ScriptSettings& script)
+    {
+        allSettings.push_back(script);
+    }
+
+    void clearSettings()
+    {
+        allSettings.clear();
+    }
+
+    void attachToWidget(const ScriptSettings& script, MyGUI::Widget* widget)
+    {
+        WidgetExtension* root = script.mElement->mRoot;
+        if (!root)
+            return;
+        root->widget()->attachToWidget(widget);
+        root->updateCoord();
+    }
+}
diff --git a/components/lua_ui/scriptsettings.hpp b/components/lua_ui/scriptsettings.hpp
new file mode 100644
index 0000000000..eadcec430f
--- /dev/null
+++ b/components/lua_ui/scriptsettings.hpp
@@ -0,0 +1,25 @@
+#ifndef OPENMW_LUAUI_SCRIPTSETTINGS
+#define OPENMW_LUAUI_SCRIPTSETTINGS
+
+#include <vector>
+#include <string>
+#include <string_view>
+
+#include <MyGUI_Widget.h>
+
+namespace LuaUi
+{
+    class Element;
+    struct ScriptSettings
+    {
+        std::string mName;
+        std::string mSearchHints;
+        Element* mElement; // TODO: figure out if this can lead to use after free
+    };
+    const std::vector<ScriptSettings>& scriptSettings();
+    void registerSettings(const ScriptSettings& script);
+    void clearSettings();
+    void attachToWidget(const ScriptSettings& script, MyGUI::Widget* widget);
+}
+
+#endif // !OPENMW_LUAUI_SCRIPTSETTINGS
diff --git a/components/lua_ui/util.cpp b/components/lua_ui/util.cpp
index 1e13c97a80..3987765617 100644
--- a/components/lua_ui/util.cpp
+++ b/components/lua_ui/util.cpp
@@ -9,6 +9,7 @@
 #include "image.hpp"
 
 #include "element.hpp"
+#include "scriptsettings.hpp"
 
 namespace LuaUi
 {
@@ -37,6 +38,7 @@ namespace LuaUi
 
     void clearUserInterface()
     {
+        clearSettings();
         while (!Element::sAllElements.empty())
             Element::sAllElements.begin()->second->destroy();
     }
diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index 8e81764f60..6a276ddd22 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -656,6 +656,19 @@
                     -->
                 </Widget>
             </Widget>
+            <Widget type="TabItem" skin="" position="4 32 360 308">
+                <Property key="Caption" value="  Scripts  "/>
+                <Widget name="ScriptFilter" type="EditBox" skin="MW_TextEdit" position="0 0 150 40" />
+                <Widget name="ScriptList" type="ListBox" skin="MW_List" position="0 40 150 268" />
+                <Widget name="ScriptView" type="Widget" skin="" position="0 0 360 308" />
+                <Widget name="ScriptDisabled" type="EditBox" skin="SandText" position="0 0 360 308" align="Center" visible="false">
+                    <Property key="Caption" value="Scripts settings are only available when a game is loaded."/>
+                    <Property key="TextAlign" value="Center" />
+                    <Property key="MultiLine" value="true" />
+                    <Property key="WordWrap" value="true" />
+                    <Property key="Static" value="true"/>
+                </Widget>
+            </Widget>
         </Widget>
         <Widget type="AutoSizedButton" skin="MW_Button" position="320 420 56 24" align="Right Bottom" name="OkButton">
             <Property key="ExpandDirection" value="Left"/>

From 64df4f54c649c1f9a381db0c99b61d665e766afa Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Thu, 27 Jan 2022 23:12:30 +0100
Subject: [PATCH 2027/2859] Add scrolling to the script settings view

---
 apps/openmw/mwgui/settingswindow.cpp      | 25 +++++++++++++++--------
 apps/openmw/mwgui/settingswindow.hpp      |  3 ++-
 files/mygui/openmw_scroll.skin.xml        |  7 +++++++
 files/mygui/openmw_settings_window.layout | 14 +++++++++----
 4 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index 8c3740d15d..567e603e53 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -240,6 +240,7 @@ namespace MWGui
         getWidget(mMaxLights, "MaxLights");
         getWidget(mScriptFilter, "ScriptFilter");
         getWidget(mScriptList, "ScriptList");
+        getWidget(mScriptBox, "ScriptBox");
         getWidget(mScriptView, "ScriptView");
         getWidget(mScriptDisabled, "ScriptDisabled");
 
@@ -332,7 +333,7 @@ namespace MWGui
         mScriptList->eventListMouseItemActivate += MyGUI::newDelegate(this, &SettingsWindow::onScriptListSelection);
     }
 
-    void SettingsWindow::onTabChanged(MyGUI::TabControl* /*_sender*/, size_t index)
+    void SettingsWindow::onTabChanged(MyGUI::TabControl* /*_sender*/, size_t /*index*/)
     {
         resetScrollbars();
     }
@@ -710,26 +711,28 @@ namespace MWGui
 
     void SettingsWindow::resizeScriptSettings()
     {
-        static int minListWidth = 150;
-        static float relativeListWidth = 0.2f;
+        static const int minListWidth = 150;
+        static const float relativeListWidth = 0.2f;
+        static const int padding = 2;
+        static const int outerPadding = padding * 2;
         MyGUI::IntSize parentSize = mScriptFilter->getParent()->getClientCoord().size();
         int listWidth = std::max(minListWidth, static_cast<int>(parentSize.width * relativeListWidth));
         int filterHeight = mScriptFilter->getSize().height;
-        int listBorder = (mScriptList->getSize().height - mScriptList->getClientCoord().height) / 2;
-        int listHeight = parentSize.height - listBorder - mScriptList->getPosition().top;
+        int listHeight = parentSize.height - mScriptList->getPosition().top - outerPadding;
         mScriptFilter->setSize({ listWidth, filterHeight });
         mScriptList->setSize({ listWidth, listHeight });
-        mScriptView->setPosition({ listWidth, 0 });
-        mScriptView->setSize({ parentSize.width - listWidth, parentSize.height });
+        mScriptBox->setPosition({ listWidth + padding, 0 });
+        mScriptBox->setSize({ parentSize.width - listWidth - padding, parentSize.height - outerPadding });
         mScriptDisabled->setPosition({0, 0});
         mScriptDisabled->setSize(parentSize);
     }
-
+         
     void SettingsWindow::renderScriptSettings()
     {
         while (mScriptView->getChildCount() > 0)
             mScriptView->getChildAt(0)->detachFromWidget();
         mScriptList->removeAllItems();
+        mScriptView->setCanvasSize({0, 0});
 
         std::string filter(".*");
         filter += mScriptFilter->getCaption();
@@ -750,7 +753,7 @@ namespace MWGui
         mScriptDisabled->setVisible(disabled);
         mScriptFilter->setVisible(!disabled);
         mScriptList->setVisible(!disabled);
-        mScriptView->setVisible(!disabled);
+        mScriptBox->setVisible(!disabled);
     }
 
     void SettingsWindow::onScriptFilterChange(MyGUI::Widget*)
@@ -767,6 +770,10 @@ namespace MWGui
         size_t scriptIndex = *mScriptList->getItemDataAt<size_t>(index);
         LuaUi::ScriptSettings script = LuaUi::scriptSettings()[scriptIndex];
         LuaUi::attachToWidget(script, mScriptView);
+        MyGUI::IntSize canvasSize;
+        if (mScriptView->getChildCount() > 0)
+            canvasSize = mScriptView->getChildAt(0)->getSize();
+        mScriptView->setCanvasSize(canvasSize);
     }
 
     void SettingsWindow::onRebindAction(MyGUI::Widget* _sender)
diff --git a/apps/openmw/mwgui/settingswindow.hpp b/apps/openmw/mwgui/settingswindow.hpp
index f002a67306..c7ba1e8ece 100644
--- a/apps/openmw/mwgui/settingswindow.hpp
+++ b/apps/openmw/mwgui/settingswindow.hpp
@@ -46,7 +46,8 @@ namespace MWGui
 
             MyGUI::EditBox* mScriptFilter;
             MyGUI::ListBox* mScriptList;
-            MyGUI::Widget* mScriptView;
+            MyGUI::Widget* mScriptBox;
+            MyGUI::ScrollView* mScriptView;
             MyGUI::EditBox* mScriptDisabled;
 
             void onTabChanged(MyGUI::TabControl* _sender, size_t index);
diff --git a/files/mygui/openmw_scroll.skin.xml b/files/mygui/openmw_scroll.skin.xml
index f946a61ac9..a2c2cd9150 100644
--- a/files/mygui/openmw_scroll.skin.xml
+++ b/files/mygui/openmw_scroll.skin.xml
@@ -14,4 +14,11 @@
         <Child type="ScrollBar" skin="MW_HScroll" offset="3 498 513 14" align="Left Bottom HStretch" name="HScroll"/>
     </Resource>
 
+    <Resource type="ResourceSkin" name="MW_ScrollViewVH" size="516 516">
+        <Property key="NeedKey" value="false"/>
+        <Child type="Widget" skin="" offset="0 0 502 502" align="Stretch" name="Client"/>
+        <Child type="ScrollBar" skin="MW_VScroll" offset="498 3 14 492" align="Right Top VStretch" name="VScroll"/>
+        <Child type="ScrollBar" skin="MW_HScroll" offset="3 498 492 14" align="Left Bottom HStretch" name="HScroll"/>
+    </Resource>
+
 </MyGUI>
diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index 6a276ddd22..cf55550fbe 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -658,10 +658,16 @@
             </Widget>
             <Widget type="TabItem" skin="" position="4 32 360 308">
                 <Property key="Caption" value="  Scripts  "/>
-                <Widget name="ScriptFilter" type="EditBox" skin="MW_TextEdit" position="0 0 150 40" />
-                <Widget name="ScriptList" type="ListBox" skin="MW_List" position="0 40 150 268" />
-                <Widget name="ScriptView" type="Widget" skin="" position="0 0 360 308" />
-                <Widget name="ScriptDisabled" type="EditBox" skin="SandText" position="0 0 360 308" align="Center" visible="false">
+                <Widget name="ScriptFilter" type="EditBox" skin="MW_TextEdit" position="0 0 150 40"/>
+                <Widget name="ScriptList" type="ListBox" skin="MW_List" position="0 40 150 268"/>
+                <Widget name="ScriptBox" type="Widget" skin="MW_Box" position="150 0 250 250" name="ScriptBox">
+                    <Widget name="ScriptView" type="ScrollView" skin="MW_ScrollViewVH" position="2 2 246 246" align="Stretch">
+                        <Property key="CanvasAlign" value="Left Top"/>
+                        <Property key="CanvasSize" value="246 246"/>
+                    </Widget>
+                </Widget>
+                <Widget name="ScriptDisabled" type="EditBox" skin="SandText" position="0 0 360 308" align="Center">
+                    <Property key="Visible" value="false"/>
                     <Property key="Caption" value="Scripts settings are only available when a game is loaded."/>
                     <Property key="TextAlign" value="Center" />
                     <Property key="MultiLine" value="true" />

From a972a54ea9f2e000d6054c66eaadf599a56ad5a9 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Fri, 28 Jan 2022 21:35:05 +0100
Subject: [PATCH 2028/2859] Allow changing element root widget type, prevent
 use after free in script settings

---
 apps/openmw/mwgui/settingswindow.cpp | 20 +++++-----
 apps/openmw/mwgui/settingswindow.hpp |  1 +
 components/lua_ui/element.cpp        | 60 ++++++++++++++++++++++++----
 components/lua_ui/element.hpp        |  7 +++-
 components/lua_ui/scriptsettings.cpp |  9 ++---
 components/lua_ui/scriptsettings.hpp |  2 +-
 6 files changed, 73 insertions(+), 26 deletions(-)

diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index 567e603e53..3ea60b92bb 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -207,9 +207,9 @@ namespace MWGui
         }
     }
 
-    SettingsWindow::SettingsWindow() :
-        WindowBase("openmw_settings_window.layout"),
-        mKeyboardMode(true)
+    SettingsWindow::SettingsWindow() : WindowBase("openmw_settings_window.layout")
+        , mKeyboardMode(true)
+        , mCurrentPage(-1)
     {
         bool terrain = Settings::Manager::getBool("distant terrain", "Terrain");
         const std::string widgetName = terrain ? "RenderingDistanceSlider" : "LargeRenderingDistanceSlider";
@@ -729,8 +729,8 @@ namespace MWGui
          
     void SettingsWindow::renderScriptSettings()
     {
-        while (mScriptView->getChildCount() > 0)
-            mScriptView->getChildAt(0)->detachFromWidget();
+        LuaUi::attachToWidget(mCurrentPage);
+        mCurrentPage = -1;
         mScriptList->removeAllItems();
         mScriptView->setCanvasSize({0, 0});
 
@@ -763,13 +763,13 @@ namespace MWGui
 
     void SettingsWindow::onScriptListSelection(MyGUI::Widget*, size_t index)
     {
-        while (mScriptView->getChildCount() > 0)
-            mScriptView->getChildAt(0)->detachFromWidget();
+        if (mCurrentPage >= 0)
+            LuaUi::attachToWidget(mCurrentPage);
+        mCurrentPage = -1;
         if (index >= mScriptList->getItemCount())
             return;
-        size_t scriptIndex = *mScriptList->getItemDataAt<size_t>(index);
-        LuaUi::ScriptSettings script = LuaUi::scriptSettings()[scriptIndex];
-        LuaUi::attachToWidget(script, mScriptView);
+        mCurrentPage = *mScriptList->getItemDataAt<size_t>(index);
+        LuaUi::attachToWidget(mCurrentPage, mScriptView);
         MyGUI::IntSize canvasSize;
         if (mScriptView->getChildCount() > 0)
             canvasSize = mScriptView->getChildAt(0)->getSize();
diff --git a/apps/openmw/mwgui/settingswindow.hpp b/apps/openmw/mwgui/settingswindow.hpp
index c7ba1e8ece..2db8f2e19c 100644
--- a/apps/openmw/mwgui/settingswindow.hpp
+++ b/apps/openmw/mwgui/settingswindow.hpp
@@ -49,6 +49,7 @@ namespace MWGui
             MyGUI::Widget* mScriptBox;
             MyGUI::ScrollView* mScriptView;
             MyGUI::EditBox* mScriptDisabled;
+            int mCurrentPage;
 
             void onTabChanged(MyGUI::TabControl* _sender, size_t index);
             void onOkButtonClicked(MyGUI::Widget* _sender);
diff --git a/components/lua_ui/element.cpp b/components/lua_ui/element.cpp
index c9e0fc309e..5baddb98d8 100644
--- a/components/lua_ui/element.cpp
+++ b/components/lua_ui/element.cpp
@@ -138,7 +138,7 @@ namespace LuaUi
         ext->setChildren(updateContent(ext->children(), layout.get<sol::object>(LayoutKeys::content)));
     }
 
-    void setLayer(WidgetExtension* ext, const sol::table& layout)
+    std::string setLayer(WidgetExtension* ext, const sol::table& layout)
     {
         MyGUI::ILayer* layerNode = ext->widget()->getLayer();
         std::string currentLayer = layerNode ? layerNode->getName() : std::string();
@@ -149,15 +149,18 @@ namespace LuaUi
         {
             MyGUI::LayerManager::getInstance().attachToLayerNode(newLayer, ext->widget());
         }
+        return newLayer;
     }
 
     std::map<Element*, std::shared_ptr<Element>> Element::sAllElements;
 
     Element::Element(sol::table layout)
-        : mRoot{ nullptr }
-        , mLayout{ std::move(layout) }
-        , mUpdate{ false }
-        , mDestroy{ false }
+        : mRoot(nullptr)
+        , mAttachedTo(nullptr)
+        , mLayout(std::move(layout))
+        , mLayer()
+        , mUpdate(false)
+        , mDestroy(false)
     {}
 
 
@@ -174,7 +177,8 @@ namespace LuaUi
         if (!mRoot)
         {
             mRoot = createWidget(mLayout);
-            setLayer(mRoot, mLayout);
+            mLayer = setLayer(mRoot, mLayout);
+            updateAttachment();
         }
     }
 
@@ -182,8 +186,17 @@ namespace LuaUi
     {
         if (mRoot && mUpdate)
         {
-            updateWidget(mRoot, mLayout);
-            setLayer(mRoot, mLayout);
+            if (mRoot->widget()->getTypeName() != widgetType(mLayout))
+            {
+                destroyWidget(mRoot);
+                mRoot = createWidget(mLayout);
+            }
+            else
+            {
+                updateWidget(mRoot, mLayout);
+            }
+            mLayer = setLayer(mRoot, mLayout);
+            updateAttachment();
         }
         mUpdate = false;
     }
@@ -195,4 +208,35 @@ namespace LuaUi
         mRoot = nullptr;
         sAllElements.erase(this);
     }
+
+    void Element::attachToWidget(MyGUI::Widget* w)
+    {
+        if (mAttachedTo && w)
+            throw std::logic_error("A UI element can't be attached to two widgets at once");
+        mAttachedTo = w;
+        updateAttachment();
+    }
+
+    void Element::updateAttachment()
+    {
+        if (!mRoot)
+            return;
+        if (mAttachedTo)
+        {
+            if (!mLayer.empty())
+                Log(Debug::Warning) << "Ignoring element's layer " << mLayer << " because it's attached to a widget";
+            if (mRoot->widget()->getParent() != mAttachedTo)
+            {
+                mRoot->widget()->attachToWidget(mAttachedTo);
+                mRoot->updateCoord();
+            }
+        }
+        else
+        {
+            if (mRoot->widget()->getParent() != nullptr)
+            {
+                mRoot->widget()->detachFromWidget();
+            }
+        }
+    }
 }
diff --git a/components/lua_ui/element.hpp b/components/lua_ui/element.hpp
index daaf340660..95d0aa2ebc 100644
--- a/components/lua_ui/element.hpp
+++ b/components/lua_ui/element.hpp
@@ -9,8 +9,10 @@ namespace LuaUi
     {
         static std::shared_ptr<Element> make(sol::table layout);
 
-        LuaUi::WidgetExtension* mRoot;
+        WidgetExtension* mRoot;
+        MyGUI::Widget* mAttachedTo;
         sol::table mLayout;
+        std::string mLayer;
         bool mUpdate;
         bool mDestroy;
 
@@ -22,9 +24,12 @@ namespace LuaUi
 
         friend void clearUserInterface();
 
+        void attachToWidget(MyGUI::Widget* w = nullptr);
+
         private:
             Element(sol::table layout);
             static std::map<Element*, std::shared_ptr<Element>> sAllElements;
+            void updateAttachment();
     };
 }
 
diff --git a/components/lua_ui/scriptsettings.cpp b/components/lua_ui/scriptsettings.cpp
index 071ded1b5d..c8a7d849c9 100644
--- a/components/lua_ui/scriptsettings.cpp
+++ b/components/lua_ui/scriptsettings.cpp
@@ -26,12 +26,9 @@ namespace LuaUi
         allSettings.clear();
     }
 
-    void attachToWidget(const ScriptSettings& script, MyGUI::Widget* widget)
+    void attachToWidget(size_t index, MyGUI::Widget* widget)
     {
-        WidgetExtension* root = script.mElement->mRoot;
-        if (!root)
-            return;
-        root->widget()->attachToWidget(widget);
-        root->updateCoord();
+        if (0 <= index && index < allSettings.size())
+            allSettings[index].mElement->attachToWidget(widget);
     }
 }
diff --git a/components/lua_ui/scriptsettings.hpp b/components/lua_ui/scriptsettings.hpp
index eadcec430f..b13bfc578c 100644
--- a/components/lua_ui/scriptsettings.hpp
+++ b/components/lua_ui/scriptsettings.hpp
@@ -19,7 +19,7 @@ namespace LuaUi
     const std::vector<ScriptSettings>& scriptSettings();
     void registerSettings(const ScriptSettings& script);
     void clearSettings();
-    void attachToWidget(const ScriptSettings& script, MyGUI::Widget* widget);
+    void attachToWidget(size_t index, MyGUI::Widget* widget = nullptr);
 }
 
 #endif // !OPENMW_LUAUI_SCRIPTSETTINGS

From e78b8402fac084f40ae82a86060820b8ea0c17a3 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Fri, 28 Jan 2022 21:45:13 +0100
Subject: [PATCH 2029/2859] Fix warnings

---
 apps/openmw/mwgui/settingswindow.cpp | 7 ++++---
 apps/openmw/mwgui/settingswindow.hpp | 4 ++--
 components/lua_ui/scriptsettings.cpp | 2 +-
 components/lua_ui/scriptsettings.hpp | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index 3ea60b92bb..f5d35bc13f 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -729,7 +729,8 @@ namespace MWGui
          
     void SettingsWindow::renderScriptSettings()
     {
-        LuaUi::attachToWidget(mCurrentPage);
+        if (mCurrentPage >= 0)
+            LuaUi::attachToWidget(mCurrentPage);
         mCurrentPage = -1;
         mScriptList->removeAllItems();
         mScriptView->setCanvasSize({0, 0});
@@ -756,12 +757,12 @@ namespace MWGui
         mScriptBox->setVisible(!disabled);
     }
 
-    void SettingsWindow::onScriptFilterChange(MyGUI::Widget*)
+    void SettingsWindow::onScriptFilterChange(MyGUI::EditBox*)
     {
         renderScriptSettings();
     }
 
-    void SettingsWindow::onScriptListSelection(MyGUI::Widget*, size_t index)
+    void SettingsWindow::onScriptListSelection(MyGUI::ListBox*, size_t index)
     {
         if (mCurrentPage >= 0)
             LuaUi::attachToWidget(mCurrentPage);
diff --git a/apps/openmw/mwgui/settingswindow.hpp b/apps/openmw/mwgui/settingswindow.hpp
index 2db8f2e19c..ff86c96f60 100644
--- a/apps/openmw/mwgui/settingswindow.hpp
+++ b/apps/openmw/mwgui/settingswindow.hpp
@@ -78,8 +78,8 @@ namespace MWGui
 
             void onWindowResize(MyGUI::Window* _sender);
 
-            void onScriptFilterChange(MyGUI::Widget*);
-            void onScriptListSelection(MyGUI::Widget*, size_t index);
+            void onScriptFilterChange(MyGUI::EditBox*);
+            void onScriptListSelection(MyGUI::ListBox*, size_t index);
 
             void apply();
 
diff --git a/components/lua_ui/scriptsettings.cpp b/components/lua_ui/scriptsettings.cpp
index c8a7d849c9..1bc93f4e84 100644
--- a/components/lua_ui/scriptsettings.cpp
+++ b/components/lua_ui/scriptsettings.cpp
@@ -28,7 +28,7 @@ namespace LuaUi
 
     void attachToWidget(size_t index, MyGUI::Widget* widget)
     {
-        if (0 <= index && index < allSettings.size())
+        if (index < allSettings.size())
             allSettings[index].mElement->attachToWidget(widget);
     }
 }
diff --git a/components/lua_ui/scriptsettings.hpp b/components/lua_ui/scriptsettings.hpp
index b13bfc578c..7075a3b189 100644
--- a/components/lua_ui/scriptsettings.hpp
+++ b/components/lua_ui/scriptsettings.hpp
@@ -9,7 +9,7 @@
 
 namespace LuaUi
 {
-    class Element;
+    struct Element;
     struct ScriptSettings
     {
         std::string mName;

From a005f25c4b0d3e4beef00df534f42295b920a325 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sat, 29 Jan 2022 13:22:08 +0100
Subject: [PATCH 2030/2859] Use page terminology for script settings

---
 apps/openmw/mwgui/settingswindow.cpp |  8 ++++----
 apps/openmw/mwlua/uibindings.cpp     | 18 +++++++++---------
 components/lua_ui/scriptsettings.cpp | 16 ++++++++--------
 components/lua_ui/scriptsettings.hpp |  6 +++---
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index f5d35bc13f..646fe0d19b 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -741,12 +741,12 @@ namespace MWGui
         auto flags = std::regex_constants::icase;
         std::regex filterRegex(filter, flags);
 
-        auto scriptSettings = LuaUi::scriptSettings();
+        auto scriptSettings = LuaUi::scriptSettingsPages();
         for (size_t i = 0; i < scriptSettings.size(); ++i)
         {
-            LuaUi::ScriptSettings script = scriptSettings[i];
-            if (std::regex_match(script.mName, filterRegex) || std::regex_match(script.mSearchHints, filterRegex))
-                mScriptList->addItem(script.mName, i);
+            LuaUi::ScriptSettingsPage page = scriptSettings[i];
+            if (std::regex_match(page.mName, filterRegex) || std::regex_match(page.mSearchHints, filterRegex))
+                mScriptList->addItem(page.mName, i);
         }
 
         // Hide script settings tab when the game world isn't loaded and scripts couldn't add their settings
diff --git a/apps/openmw/mwlua/uibindings.cpp b/apps/openmw/mwlua/uibindings.cpp
index 5fe54a4d35..7737f36ec4 100644
--- a/apps/openmw/mwlua/uibindings.cpp
+++ b/apps/openmw/mwlua/uibindings.cpp
@@ -239,18 +239,18 @@ namespace MWLua
             typeTable.set(it.second, it.first);
         api["TYPE"] = LuaUtil::makeReadOnly(typeTable);
 
-        api["registerSettings"] = [](sol::table options)
+        api["registerSettingsPage"] = [](sol::table options)
         {
-            LuaUi::ScriptSettings script;
-            script.mName = options.get_or("name", std::string());
-            if (script.mName.empty())
-                throw std::logic_error("No name provided for script settings");
-            script.mSearchHints = options.get_or("searchHints", std::string());
+            LuaUi::ScriptSettingsPage page;
+            page.mName = options.get_or("name", std::string());
+            if (page.mName.empty())
+                throw std::logic_error("No name provided for the settings page");
+            page.mSearchHints = options.get_or("searchHints", std::string());
             auto element = options.get_or<std::shared_ptr<LuaUi::Element>>("element", nullptr);
             if (!element)
-                throw std::logic_error("No UI element provided for script settings");
-            script.mElement = element.get();
-            LuaUi::registerSettings(script);
+                throw std::logic_error("No UI element provided for the settings page");
+            page.mElement = element.get();
+            LuaUi::registerSettingsPage(page);
         };
 
         return LuaUtil::makeReadOnly(api);
diff --git a/components/lua_ui/scriptsettings.cpp b/components/lua_ui/scriptsettings.cpp
index 1bc93f4e84..1a016381cd 100644
--- a/components/lua_ui/scriptsettings.cpp
+++ b/components/lua_ui/scriptsettings.cpp
@@ -8,27 +8,27 @@ namespace LuaUi
 {
     namespace
     {
-        std::vector<ScriptSettings> allSettings;
+        std::vector<ScriptSettingsPage> allPages;
     }
 
-    const std::vector<ScriptSettings>& scriptSettings()
+    const std::vector<ScriptSettingsPage>& scriptSettingsPages()
     {
-        return allSettings;
+        return allPages;
     }
 
-    void registerSettings(const ScriptSettings& script)
+    void registerSettingsPage(const ScriptSettingsPage& page)
     {
-        allSettings.push_back(script);
+        allPages.push_back(page);
     }
 
     void clearSettings()
     {
-        allSettings.clear();
+        allPages.clear();
     }
 
     void attachToWidget(size_t index, MyGUI::Widget* widget)
     {
-        if (index < allSettings.size())
-            allSettings[index].mElement->attachToWidget(widget);
+        if (index < allPages.size())
+            allPages[index].mElement->attachToWidget(widget);
     }
 }
diff --git a/components/lua_ui/scriptsettings.hpp b/components/lua_ui/scriptsettings.hpp
index 7075a3b189..852e0df1ec 100644
--- a/components/lua_ui/scriptsettings.hpp
+++ b/components/lua_ui/scriptsettings.hpp
@@ -10,14 +10,14 @@
 namespace LuaUi
 {
     struct Element;
-    struct ScriptSettings
+    struct ScriptSettingsPage
     {
         std::string mName;
         std::string mSearchHints;
         Element* mElement; // TODO: figure out if this can lead to use after free
     };
-    const std::vector<ScriptSettings>& scriptSettings();
-    void registerSettings(const ScriptSettings& script);
+    const std::vector<ScriptSettingsPage>& scriptSettingsPages();
+    void registerSettingsPage(const ScriptSettingsPage& page);
     void clearSettings();
     void attachToWidget(size_t index, MyGUI::Widget* widget = nullptr);
 }

From 5f7ab4988072a4a2a4e6f2ba34885566e1b9b406 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sat, 29 Jan 2022 16:59:43 +0100
Subject: [PATCH 2031/2859] Implement script setting pages' descriptions

---
 apps/openmw/mwgui/settingswindow.cpp      | 35 ++++++++++++++++++-----
 apps/openmw/mwgui/settingswindow.hpp      |  6 ++++
 apps/openmw/mwlua/uibindings.cpp          |  2 +-
 components/lua_ui/scriptsettings.hpp      |  2 +-
 files/mygui/openmw_settings_window.layout |  8 ++++++
 5 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index 646fe0d19b..dfd0e6d9df 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -243,6 +243,8 @@ namespace MWGui
         getWidget(mScriptBox, "ScriptBox");
         getWidget(mScriptView, "ScriptView");
         getWidget(mScriptDisabled, "ScriptDisabled");
+        getWidget(mScriptDescription, "ScriptDescription");
+        mScriptChild = nullptr;
 
 #ifndef WIN32
         // hide gamma controls since it currently does not work under Linux
@@ -331,6 +333,7 @@ namespace MWGui
 
         mScriptFilter->eventEditTextChange += MyGUI::newDelegate(this, &SettingsWindow::onScriptFilterChange);
         mScriptList->eventListMouseItemActivate += MyGUI::newDelegate(this, &SettingsWindow::onScriptListSelection);
+        mScriptList->eventListMouseItemFocus += MyGUI::newDelegate(this, &SettingsWindow::onScriptListFocus);
     }
 
     void SettingsWindow::onTabChanged(MyGUI::TabControl* /*_sender*/, size_t /*index*/)
@@ -745,7 +748,7 @@ namespace MWGui
         for (size_t i = 0; i < scriptSettings.size(); ++i)
         {
             LuaUi::ScriptSettingsPage page = scriptSettings[i];
-            if (std::regex_match(page.mName, filterRegex) || std::regex_match(page.mSearchHints, filterRegex))
+            if (std::regex_match(page.mName, filterRegex) || std::regex_match(page.mDescription, filterRegex))
                 mScriptList->addItem(page.mName, i);
         }
 
@@ -767,14 +770,32 @@ namespace MWGui
         if (mCurrentPage >= 0)
             LuaUi::attachToWidget(mCurrentPage);
         mCurrentPage = -1;
+        if (index < mScriptList->getItemCount())
+        {
+            mCurrentPage = *mScriptList->getItemDataAt<size_t>(index);
+            LuaUi::attachToWidget(mCurrentPage, mScriptView);
+        }
+        mScriptChild = mScriptView->getChildCount() > 0 ? mScriptView->getChildAt(0) : nullptr;
+        MyGUI::IntSize canvasSize = mScriptChild ? mScriptChild->getSize() : MyGUI::IntSize();
+        if (mScriptChild)
+            mScriptChild->setVisible(mScriptView->isVisible());
+        mScriptView->setCanvasSize(canvasSize);
+    }
+
+    void SettingsWindow::onScriptListFocus(MyGUI::ListBox*, size_t index)
+    {
         if (index >= mScriptList->getItemCount())
+        {
+            mScriptDescription->setVisible(false);
+            mScriptView->setVisible(true);
+            if (mScriptChild)
+                mScriptChild->setVisible(true);
             return;
-        mCurrentPage = *mScriptList->getItemDataAt<size_t>(index);
-        LuaUi::attachToWidget(mCurrentPage, mScriptView);
-        MyGUI::IntSize canvasSize;
-        if (mScriptView->getChildCount() > 0)
-            canvasSize = mScriptView->getChildAt(0)->getSize();
-        mScriptView->setCanvasSize(canvasSize);
+        }
+        size_t page = *mScriptList->getItemDataAt<size_t>(index);
+        mScriptDescription->setCaption(LuaUi::scriptSettingsPages()[page].mDescription);
+        mScriptDescription->setVisible(true);
+        mScriptView->setVisible(false);
     }
 
     void SettingsWindow::onRebindAction(MyGUI::Widget* _sender)
diff --git a/apps/openmw/mwgui/settingswindow.hpp b/apps/openmw/mwgui/settingswindow.hpp
index ff86c96f60..22308f02b6 100644
--- a/apps/openmw/mwgui/settingswindow.hpp
+++ b/apps/openmw/mwgui/settingswindow.hpp
@@ -49,8 +49,13 @@ namespace MWGui
             MyGUI::Widget* mScriptBox;
             MyGUI::ScrollView* mScriptView;
             MyGUI::EditBox* mScriptDisabled;
+            MyGUI::EditBox* mScriptDescription;
             int mCurrentPage;
 
+            // only necessary to work around a MyGUI bug
+            // adding a child to an invisible widget doesn't make the child invisible
+            MyGUI::Widget* mScriptChild;
+
             void onTabChanged(MyGUI::TabControl* _sender, size_t index);
             void onOkButtonClicked(MyGUI::Widget* _sender);
             void onTextureFilteringChanged(MyGUI::ComboBox* _sender, size_t pos);
@@ -80,6 +85,7 @@ namespace MWGui
 
             void onScriptFilterChange(MyGUI::EditBox*);
             void onScriptListSelection(MyGUI::ListBox*, size_t index);
+            void onScriptListFocus(MyGUI::ListBox*, size_t index);
 
             void apply();
 
diff --git a/apps/openmw/mwlua/uibindings.cpp b/apps/openmw/mwlua/uibindings.cpp
index 7737f36ec4..7b11e1770c 100644
--- a/apps/openmw/mwlua/uibindings.cpp
+++ b/apps/openmw/mwlua/uibindings.cpp
@@ -245,7 +245,7 @@ namespace MWLua
             page.mName = options.get_or("name", std::string());
             if (page.mName.empty())
                 throw std::logic_error("No name provided for the settings page");
-            page.mSearchHints = options.get_or("searchHints", std::string());
+            page.mDescription = options.get_or("description", std::string());
             auto element = options.get_or<std::shared_ptr<LuaUi::Element>>("element", nullptr);
             if (!element)
                 throw std::logic_error("No UI element provided for the settings page");
diff --git a/components/lua_ui/scriptsettings.hpp b/components/lua_ui/scriptsettings.hpp
index 852e0df1ec..28525bb1da 100644
--- a/components/lua_ui/scriptsettings.hpp
+++ b/components/lua_ui/scriptsettings.hpp
@@ -13,7 +13,7 @@ namespace LuaUi
     struct ScriptSettingsPage
     {
         std::string mName;
-        std::string mSearchHints;
+        std::string mDescription;
         Element* mElement; // TODO: figure out if this can lead to use after free
     };
     const std::vector<ScriptSettingsPage>& scriptSettingsPages();
diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index cf55550fbe..da64735c79 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -665,6 +665,14 @@
                         <Property key="CanvasAlign" value="Left Top"/>
                         <Property key="CanvasSize" value="246 246"/>
                     </Widget>
+                    <Widget name="ScriptDescription" type = "EditBox" skin="SandText" position="2 2 246 246" align="Stretch">
+                        <Property key="Visible" value="false"/>
+                        <Property key="Caption" value="Scripts settings are only available when a game is loaded."/>
+                        <Property key="TextAlign" value="Center" />
+                        <Property key="MultiLine" value="true" />
+                        <Property key="WordWrap" value="true" />
+                        <Property key="Static" value="true"/>
+                    </Widget>
                 </Widget>
                 <Widget name="ScriptDisabled" type="EditBox" skin="SandText" position="0 0 360 308" align="Center">
                     <Property key="Visible" value="false"/>

From 1455aa3e026f1a71ff511a387e0f92a895b0907a Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sat, 29 Jan 2022 18:33:14 +0100
Subject: [PATCH 2032/2859] Allow changing script settings pages after
 registering them

---
 apps/openmw/mwgui/settingswindow.cpp |  9 ++++----
 apps/openmw/mwlua/uibindings.cpp     | 11 +--------
 components/lua_ui/scriptsettings.cpp | 34 +++++++++++++++++++++++-----
 components/lua_ui/scriptsettings.hpp |  5 ++--
 4 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index dfd0e6d9df..d41d9cc4f0 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -744,16 +744,15 @@ namespace MWGui
         auto flags = std::regex_constants::icase;
         std::regex filterRegex(filter, flags);
 
-        auto scriptSettings = LuaUi::scriptSettingsPages();
-        for (size_t i = 0; i < scriptSettings.size(); ++i)
+        for (size_t i = 0; i < LuaUi::scriptSettingsPageCount(); ++i)
         {
-            LuaUi::ScriptSettingsPage page = scriptSettings[i];
+            LuaUi::ScriptSettingsPage page = LuaUi::scriptSettingsPageAt(i);
             if (std::regex_match(page.mName, filterRegex) || std::regex_match(page.mDescription, filterRegex))
                 mScriptList->addItem(page.mName, i);
         }
 
         // Hide script settings tab when the game world isn't loaded and scripts couldn't add their settings
-        bool disabled = scriptSettings.empty();
+        bool disabled = LuaUi::scriptSettingsPageCount() == 0;
         mScriptDisabled->setVisible(disabled);
         mScriptFilter->setVisible(!disabled);
         mScriptList->setVisible(!disabled);
@@ -793,7 +792,7 @@ namespace MWGui
             return;
         }
         size_t page = *mScriptList->getItemDataAt<size_t>(index);
-        mScriptDescription->setCaption(LuaUi::scriptSettingsPages()[page].mDescription);
+        mScriptDescription->setCaption(LuaUi::scriptSettingsPageAt(page).mDescription);
         mScriptDescription->setVisible(true);
         mScriptView->setVisible(false);
     }
diff --git a/apps/openmw/mwlua/uibindings.cpp b/apps/openmw/mwlua/uibindings.cpp
index 7b11e1770c..bd19dde114 100644
--- a/apps/openmw/mwlua/uibindings.cpp
+++ b/apps/openmw/mwlua/uibindings.cpp
@@ -241,16 +241,7 @@ namespace MWLua
 
         api["registerSettingsPage"] = [](sol::table options)
         {
-            LuaUi::ScriptSettingsPage page;
-            page.mName = options.get_or("name", std::string());
-            if (page.mName.empty())
-                throw std::logic_error("No name provided for the settings page");
-            page.mDescription = options.get_or("description", std::string());
-            auto element = options.get_or<std::shared_ptr<LuaUi::Element>>("element", nullptr);
-            if (!element)
-                throw std::logic_error("No UI element provided for the settings page");
-            page.mElement = element.get();
-            LuaUi::registerSettingsPage(page);
+            LuaUi::registerSettingsPage(options);
         };
 
         return LuaUtil::makeReadOnly(api);
diff --git a/components/lua_ui/scriptsettings.cpp b/components/lua_ui/scriptsettings.cpp
index 1a016381cd..2695b9f25d 100644
--- a/components/lua_ui/scriptsettings.cpp
+++ b/components/lua_ui/scriptsettings.cpp
@@ -8,17 +8,35 @@ namespace LuaUi
 {
     namespace
     {
-        std::vector<ScriptSettingsPage> allPages;
+        std::vector<sol::table> allPages;
+        ScriptSettingsPage parse(const sol::table& options)
+        {
+            auto name = options.get_or("name", std::string());
+            auto description = options.get_or("description", std::string());
+            auto element = options.get_or<std::shared_ptr<LuaUi::Element>>("element", nullptr);
+            if (name.empty())
+                Log(Debug::Warning) << "A script settings page has an empty name";
+            if (!element.get())
+                Log(Debug::Warning) << "A script settings page has no UI element assigned";
+            return {
+                name, description, element.get()
+            };
+        }
     }
 
-    const std::vector<ScriptSettingsPage>& scriptSettingsPages()
+    size_t scriptSettingsPageCount()
     {
-        return allPages;
+        return allPages.size();
     }
 
-    void registerSettingsPage(const ScriptSettingsPage& page)
+    ScriptSettingsPage scriptSettingsPageAt(size_t index)
     {
-        allPages.push_back(page);
+        return parse(allPages[index]);
+    }
+
+    void registerSettingsPage(const sol::table& options)
+    {
+        allPages.push_back(options);
     }
 
     void clearSettings()
@@ -29,6 +47,10 @@ namespace LuaUi
     void attachToWidget(size_t index, MyGUI::Widget* widget)
     {
         if (index < allPages.size())
-            allPages[index].mElement->attachToWidget(widget);
+        {
+            ScriptSettingsPage page = parse(allPages[index]);
+            if (page.mElement)
+                page.mElement->attachToWidget(widget);
+        }
     }
 }
diff --git a/components/lua_ui/scriptsettings.hpp b/components/lua_ui/scriptsettings.hpp
index 28525bb1da..3b51aff901 100644
--- a/components/lua_ui/scriptsettings.hpp
+++ b/components/lua_ui/scriptsettings.hpp
@@ -16,8 +16,9 @@ namespace LuaUi
         std::string mDescription;
         Element* mElement; // TODO: figure out if this can lead to use after free
     };
-    const std::vector<ScriptSettingsPage>& scriptSettingsPages();
-    void registerSettingsPage(const ScriptSettingsPage& page);
+    size_t scriptSettingsPageCount();
+    ScriptSettingsPage scriptSettingsPageAt(size_t index);
+    void registerSettingsPage(const sol::table& options);
     void clearSettings();
     void attachToWidget(size_t index, MyGUI::Widget* widget = nullptr);
 }

From db9e734a6ad6ca112914cf87f4fd934f322d4118 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sat, 29 Jan 2022 18:46:07 +0100
Subject: [PATCH 2033/2859] Fix warning

---
 apps/openmw/mwgui/settingswindow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index d41d9cc4f0..2abea56064 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -777,7 +777,7 @@ namespace MWGui
         mScriptChild = mScriptView->getChildCount() > 0 ? mScriptView->getChildAt(0) : nullptr;
         MyGUI::IntSize canvasSize = mScriptChild ? mScriptChild->getSize() : MyGUI::IntSize();
         if (mScriptChild)
-            mScriptChild->setVisible(mScriptView->isVisible());
+            mScriptChild->setVisible(mScriptView->getVisible());
         mScriptView->setCanvasSize(canvasSize);
     }
 

From 086a7d9bc5fdb8bbff60348257d916df107e31ea Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sat, 29 Jan 2022 23:06:43 +0100
Subject: [PATCH 2034/2859] Wrap Lua settings widgets into an Adapter widget

---
 apps/openmw/mwgui/settingswindow.cpp      | 28 ++++------
 apps/openmw/mwgui/settingswindow.hpp      |  7 ++-
 components/CMakeLists.txt                 |  2 +-
 components/lua_ui/adapter.cpp             | 65 +++++++++++++++++++++++
 components/lua_ui/adapter.hpp             | 29 ++++++++++
 components/lua_ui/element.cpp             | 38 ++++++++-----
 components/lua_ui/element.hpp             |  5 +-
 components/lua_ui/scriptsettings.cpp      | 11 ++--
 components/lua_ui/scriptsettings.hpp      |  6 +--
 components/lua_ui/util.cpp                |  2 +
 components/lua_ui/widget.cpp              |  9 ++++
 components/lua_ui/widget.hpp              |  9 ++++
 files/mygui/openmw_settings_window.layout |  1 +
 13 files changed, 168 insertions(+), 44 deletions(-)
 create mode 100644 components/lua_ui/adapter.cpp
 create mode 100644 components/lua_ui/adapter.hpp

diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index 2abea56064..f556bbdd5b 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -242,9 +242,9 @@ namespace MWGui
         getWidget(mScriptList, "ScriptList");
         getWidget(mScriptBox, "ScriptBox");
         getWidget(mScriptView, "ScriptView");
+        getWidget(mScriptAdapter, "ScriptAdapter");
         getWidget(mScriptDisabled, "ScriptDisabled");
         getWidget(mScriptDescription, "ScriptDescription");
-        mScriptChild = nullptr;
 
 #ifndef WIN32
         // hide gamma controls since it currently does not work under Linux
@@ -732,8 +732,7 @@ namespace MWGui
          
     void SettingsWindow::renderScriptSettings()
     {
-        if (mCurrentPage >= 0)
-            LuaUi::attachToWidget(mCurrentPage);
+        mScriptAdapter->detach();
         mCurrentPage = -1;
         mScriptList->removeAllItems();
         mScriptView->setCanvasSize({0, 0});
@@ -766,18 +765,14 @@ namespace MWGui
 
     void SettingsWindow::onScriptListSelection(MyGUI::ListBox*, size_t index)
     {
-        if (mCurrentPage >= 0)
-            LuaUi::attachToWidget(mCurrentPage);
+        mScriptAdapter->detach();
         mCurrentPage = -1;
         if (index < mScriptList->getItemCount())
         {
             mCurrentPage = *mScriptList->getItemDataAt<size_t>(index);
-            LuaUi::attachToWidget(mCurrentPage, mScriptView);
+            LuaUi::attachPageAt(mCurrentPage, mScriptAdapter);
         }
-        mScriptChild = mScriptView->getChildCount() > 0 ? mScriptView->getChildAt(0) : nullptr;
-        MyGUI::IntSize canvasSize = mScriptChild ? mScriptChild->getSize() : MyGUI::IntSize();
-        if (mScriptChild)
-            mScriptChild->setVisible(mScriptView->getVisible());
+        MyGUI::IntSize canvasSize = mScriptAdapter->getSize();
         mScriptView->setCanvasSize(canvasSize);
     }
 
@@ -787,14 +782,13 @@ namespace MWGui
         {
             mScriptDescription->setVisible(false);
             mScriptView->setVisible(true);
-            if (mScriptChild)
-                mScriptChild->setVisible(true);
-            return;
         }
-        size_t page = *mScriptList->getItemDataAt<size_t>(index);
-        mScriptDescription->setCaption(LuaUi::scriptSettingsPageAt(page).mDescription);
-        mScriptDescription->setVisible(true);
-        mScriptView->setVisible(false);
+        else {
+            size_t page = *mScriptList->getItemDataAt<size_t>(index);
+            mScriptDescription->setCaption(LuaUi::scriptSettingsPageAt(page).mDescription);
+            mScriptDescription->setVisible(true);
+            mScriptView->setVisible(false);
+        }
     }
 
     void SettingsWindow::onRebindAction(MyGUI::Widget* _sender)
diff --git a/apps/openmw/mwgui/settingswindow.hpp b/apps/openmw/mwgui/settingswindow.hpp
index 22308f02b6..217dcf3051 100644
--- a/apps/openmw/mwgui/settingswindow.hpp
+++ b/apps/openmw/mwgui/settingswindow.hpp
@@ -1,6 +1,8 @@
 #ifndef MWGUI_SETTINGS_H
 #define MWGUI_SETTINGS_H
 
+#include <components/lua_ui/adapter.hpp>
+
 #include "windowbase.hpp"
 
 namespace MWGui
@@ -48,14 +50,11 @@ namespace MWGui
             MyGUI::ListBox* mScriptList;
             MyGUI::Widget* mScriptBox;
             MyGUI::ScrollView* mScriptView;
+            LuaUi::LuaAdapter* mScriptAdapter;
             MyGUI::EditBox* mScriptDisabled;
             MyGUI::EditBox* mScriptDescription;
             int mCurrentPage;
 
-            // only necessary to work around a MyGUI bug
-            // adding a child to an invisible widget doesn't make the child invisible
-            MyGUI::Widget* mScriptChild;
-
             void onTabChanged(MyGUI::TabControl* _sender, size_t index);
             void onOkButtonClicked(MyGUI::Widget* _sender);
             void onTextureFilteringChanged(MyGUI::ComboBox* _sender, size_t pos);
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 3526386e69..58e6d52ead 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -166,7 +166,7 @@ add_component_dir (queries
     
 add_component_dir (lua_ui
     properties widget element util layers content scriptsettings
-    text textedit window image
+    adapter text textedit window image
     )
 
 
diff --git a/components/lua_ui/adapter.cpp b/components/lua_ui/adapter.cpp
new file mode 100644
index 0000000000..9a109d5d1f
--- /dev/null
+++ b/components/lua_ui/adapter.cpp
@@ -0,0 +1,65 @@
+#include "adapter.hpp"
+
+#include <MyGUI_Gui.h>
+
+#include "element.hpp"
+
+namespace LuaUi
+{
+    namespace
+    {
+        sol::state luaState;
+    }
+
+    LuaAdapter::LuaAdapter()
+        : mElement(nullptr)
+        , mContent(nullptr)
+    {
+        MyGUI::Widget* widget = MyGUI::Gui::getInstancePtr()->createWidgetT(
+            "LuaWidget", "",
+            MyGUI::IntCoord(), MyGUI::Align::Default,
+            std::string(), "");
+
+        mContent = dynamic_cast<WidgetExtension*>(widget);
+        if (!mContent)
+            throw std::runtime_error("Invalid widget!");
+        mContent->initialize(luaState, widget);
+        mContent->onSizeChange([this](MyGUI::IntSize size)
+        {
+            setSize(size);
+        });
+        mContent->widget()->attachToWidget(this);
+    }
+
+    void LuaAdapter::attach(const std::shared_ptr<Element>& element)
+    {
+        detachElement();
+        mElement = element;
+        attachElement();
+        setSize(mContent->widget()->getSize());
+
+        // workaround for MyGUI bug
+        // parent visibility doesn't affect added children
+        setVisible(!getVisible());
+        setVisible(!getVisible());
+    }
+
+    void LuaAdapter::detach()
+    {
+        detachElement();
+        setSize({ 0, 0 });
+    }
+
+    void LuaAdapter::attachElement()
+    {
+        if (mElement.get())
+            mElement->attachToWidget(mContent);
+    }
+
+    void LuaAdapter::detachElement()
+    {
+        if (mElement.get())
+            mElement->detachFromWidget();
+        mElement = nullptr;
+    }
+}
diff --git a/components/lua_ui/adapter.hpp b/components/lua_ui/adapter.hpp
new file mode 100644
index 0000000000..2ff206464d
--- /dev/null
+++ b/components/lua_ui/adapter.hpp
@@ -0,0 +1,29 @@
+#ifndef OPENMW_LUAUI_ADAPTER
+#define OPENMW_LUAUI_ADAPTER
+
+#include <MyGUI_Widget.h>
+
+namespace LuaUi
+{
+    class WidgetExtension;
+    struct Element;
+    class LuaAdapter : public MyGUI::Widget
+    {
+        MYGUI_RTTI_DERIVED(LuaAdapter)
+
+        public:
+            LuaAdapter();
+
+            void attach(const std::shared_ptr<Element>& element);
+            void detach();
+            bool empty() { return mElement.get() == nullptr; }
+
+        private:
+            WidgetExtension* mContent;
+            std::shared_ptr<Element> mElement;
+            void attachElement();
+            void detachElement();
+    };
+}
+
+#endif // !OPENMW_LUAUI_ADAPTER
diff --git a/components/lua_ui/element.cpp b/components/lua_ui/element.cpp
index 5baddb98d8..9baec82269 100644
--- a/components/lua_ui/element.cpp
+++ b/components/lua_ui/element.cpp
@@ -4,6 +4,7 @@
 
 #include "content.hpp"
 #include "util.hpp"
+#include "widget.hpp"
 
 namespace LuaUi
 {
@@ -209,14 +210,26 @@ namespace LuaUi
         sAllElements.erase(this);
     }
 
-    void Element::attachToWidget(MyGUI::Widget* w)
+    void Element::attachToWidget(WidgetExtension* w)
     {
-        if (mAttachedTo && w)
+        if (mAttachedTo)
             throw std::logic_error("A UI element can't be attached to two widgets at once");
         mAttachedTo = w;
         updateAttachment();
     }
 
+    void Element::detachFromWidget()
+    {
+        if (mRoot)
+        {
+            mRoot->onSizeChange({});
+            mRoot->widget()->detachFromWidget();
+        }
+        if (mAttachedTo)
+            mAttachedTo->setChildren({});
+        mAttachedTo = nullptr;
+    }
+
     void Element::updateAttachment()
     {
         if (!mRoot)
@@ -225,18 +238,17 @@ namespace LuaUi
         {
             if (!mLayer.empty())
                 Log(Debug::Warning) << "Ignoring element's layer " << mLayer << " because it's attached to a widget";
-            if (mRoot->widget()->getParent() != mAttachedTo)
-            {
-                mRoot->widget()->attachToWidget(mAttachedTo);
-                mRoot->updateCoord();
-            }
-        }
-        else
-        {
-            if (mRoot->widget()->getParent() != nullptr)
+            mAttachedTo->setChildren({ mRoot });
+            auto callback = [this](MyGUI::IntSize size)
             {
-                mRoot->widget()->detachFromWidget();
-            }
+                if (!mAttachedTo)
+                    return;
+                mAttachedTo->setForcedSize(mRoot->widget()->getSize());
+                mAttachedTo->updateCoord();
+            };
+            mRoot->onSizeChange(callback);
+            mRoot->updateCoord();
+            callback(mRoot->widget()->getSize());
         }
     }
 }
diff --git a/components/lua_ui/element.hpp b/components/lua_ui/element.hpp
index 95d0aa2ebc..13f4ea052d 100644
--- a/components/lua_ui/element.hpp
+++ b/components/lua_ui/element.hpp
@@ -10,7 +10,7 @@ namespace LuaUi
         static std::shared_ptr<Element> make(sol::table layout);
 
         WidgetExtension* mRoot;
-        MyGUI::Widget* mAttachedTo;
+        WidgetExtension* mAttachedTo;
         sol::table mLayout;
         std::string mLayer;
         bool mUpdate;
@@ -24,7 +24,8 @@ namespace LuaUi
 
         friend void clearUserInterface();
 
-        void attachToWidget(MyGUI::Widget* w = nullptr);
+        void attachToWidget(WidgetExtension* w);
+        void detachFromWidget();
 
         private:
             Element(sol::table layout);
diff --git a/components/lua_ui/scriptsettings.cpp b/components/lua_ui/scriptsettings.cpp
index 2695b9f25d..bf7788597a 100644
--- a/components/lua_ui/scriptsettings.cpp
+++ b/components/lua_ui/scriptsettings.cpp
@@ -1,8 +1,10 @@
 #include "scriptsettings.hpp"
 
 #include <map>
+#include <sol/sol.hpp>
 
 #include "element.hpp"
+#include "adapter.hpp"
 
 namespace LuaUi
 {
@@ -19,7 +21,7 @@ namespace LuaUi
             if (!element.get())
                 Log(Debug::Warning) << "A script settings page has no UI element assigned";
             return {
-                name, description, element.get()
+                name, description, element
             };
         }
     }
@@ -44,13 +46,14 @@ namespace LuaUi
         allPages.clear();
     }
 
-    void attachToWidget(size_t index, MyGUI::Widget* widget)
+    void attachPageAt(size_t index, LuaAdapter* adapter)
     {
         if (index < allPages.size())
         {
             ScriptSettingsPage page = parse(allPages[index]);
-            if (page.mElement)
-                page.mElement->attachToWidget(widget);
+            adapter->detach();
+            if (page.mElement.get())
+                adapter->attach(page.mElement);
         }
     }
 }
diff --git a/components/lua_ui/scriptsettings.hpp b/components/lua_ui/scriptsettings.hpp
index 3b51aff901..050722c249 100644
--- a/components/lua_ui/scriptsettings.hpp
+++ b/components/lua_ui/scriptsettings.hpp
@@ -1,7 +1,6 @@
 #ifndef OPENMW_LUAUI_SCRIPTSETTINGS
 #define OPENMW_LUAUI_SCRIPTSETTINGS
 
-#include <vector>
 #include <string>
 #include <string_view>
 
@@ -9,18 +8,19 @@
 
 namespace LuaUi
 {
+    class LuaAdapter;
     struct Element;
     struct ScriptSettingsPage
     {
         std::string mName;
         std::string mDescription;
-        Element* mElement; // TODO: figure out if this can lead to use after free
+        std::shared_ptr<Element> mElement;
     };
     size_t scriptSettingsPageCount();
     ScriptSettingsPage scriptSettingsPageAt(size_t index);
     void registerSettingsPage(const sol::table& options);
     void clearSettings();
-    void attachToWidget(size_t index, MyGUI::Widget* widget = nullptr);
+    void attachPageAt(size_t index, LuaAdapter* adapter);
 }
 
 #endif // !OPENMW_LUAUI_SCRIPTSETTINGS
diff --git a/components/lua_ui/util.cpp b/components/lua_ui/util.cpp
index 3987765617..24a1442a53 100644
--- a/components/lua_ui/util.cpp
+++ b/components/lua_ui/util.cpp
@@ -2,6 +2,7 @@
 
 #include <MyGUI_FactoryManager.h>
 
+#include "adapter.hpp"
 #include "widget.hpp"
 #include "text.hpp"
 #include "textedit.hpp"
@@ -16,6 +17,7 @@ namespace LuaUi
 
     void registerAllWidgets()
     {
+        MyGUI::FactoryManager::getInstance().registerFactory<LuaAdapter>("Widget");
         MyGUI::FactoryManager::getInstance().registerFactory<LuaWidget>("Widget");
         MyGUI::FactoryManager::getInstance().registerFactory<LuaText>("Widget");
         MyGUI::FactoryManager::getInstance().registerFactory<LuaTextEdit>("Widget");
diff --git a/components/lua_ui/widget.cpp b/components/lua_ui/widget.cpp
index 027adc44ca..4224598ca1 100644
--- a/components/lua_ui/widget.cpp
+++ b/components/lua_ui/widget.cpp
@@ -194,6 +194,11 @@ namespace LuaUi
         mForcedCoord = offset;
     }
 
+    void WidgetExtension::setForcedSize(const MyGUI::IntSize& size)
+    {
+        mForcedCoord = size;
+    }
+
     void WidgetExtension::updateCoord()
     {
         MyGUI::IntCoord oldCoord = mWidget->getCoord();
@@ -202,7 +207,11 @@ namespace LuaUi
         if (oldCoord != newCoord)
             mWidget->setCoord(newCoord);
         if (oldCoord.size() != newCoord.size())
+        {
             updateChildrenCoord();
+            if (mOnSizeChange.has_value())
+                mOnSizeChange.value()(newCoord.size());
+        }
     }
 
     void WidgetExtension::setProperties(sol::object props)
diff --git a/components/lua_ui/widget.hpp b/components/lua_ui/widget.hpp
index 4085963137..1eff2a113b 100644
--- a/components/lua_ui/widget.hpp
+++ b/components/lua_ui/widget.hpp
@@ -2,6 +2,7 @@
 #define OPENMW_LUAUI_WIDGET
 
 #include <map>
+#include <functional>
 
 #include <MyGUI_Widget.h>
 #include <sol/sol.hpp>
@@ -44,6 +45,7 @@ namespace LuaUi
 
         MyGUI::IntCoord forcedCoord();
         void setForcedCoord(const MyGUI::IntCoord& offset);
+        void setForcedSize(const MyGUI::IntSize& size);
         void updateCoord();
 
         const sol::table& getLayout() { return mLayout; }
@@ -55,6 +57,11 @@ namespace LuaUi
             return parseExternal(mExternal, name, defaultValue);
         }
 
+        void onSizeChange(const std::optional<std::function<void(MyGUI::IntSize)>>& callback)
+        {
+            mOnSizeChange = callback;
+        }
+
     protected:
         virtual void initialize();
         sol::table makeTable() const;
@@ -119,6 +126,8 @@ namespace LuaUi
         void mouseRelease(MyGUI::Widget*, int, int, MyGUI::MouseButton);
         void focusGain(MyGUI::Widget*, MyGUI::Widget*);
         void focusLoss(MyGUI::Widget*, MyGUI::Widget*);
+
+        std::optional<std::function<void(MyGUI::IntSize)>> mOnSizeChange;
     };
 
     class LuaWidget : public MyGUI::Widget, public WidgetExtension
diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index da64735c79..d6ac4f43fa 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -664,6 +664,7 @@
                     <Widget name="ScriptView" type="ScrollView" skin="MW_ScrollViewVH" position="2 2 246 246" align="Stretch">
                         <Property key="CanvasAlign" value="Left Top"/>
                         <Property key="CanvasSize" value="246 246"/>
+                        <Widget name="ScriptAdapter" type="LuaAdapter" position="0 0 246 246"/>
                     </Widget>
                     <Widget name="ScriptDescription" type = "EditBox" skin="SandText" position="2 2 246 246" align="Stretch">
                         <Property key="Visible" value="false"/>

From f07f05ddd37389413128a0f12a0342360eee17d7 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sat, 29 Jan 2022 23:40:31 +0100
Subject: [PATCH 2035/2859] Add Container widget type, use it to make Adapter
 code less hacky

---
 components/CMakeLists.txt       |  2 +-
 components/lua_ui/adapter.cpp   | 17 ++++++---------
 components/lua_ui/adapter.hpp   |  4 ++--
 components/lua_ui/container.cpp | 35 ++++++++++++++++++++++++++++++
 components/lua_ui/container.hpp | 21 ++++++++++++++++++
 components/lua_ui/element.cpp   | 12 -----------
 components/lua_ui/util.cpp      |  3 +++
 components/lua_ui/widget.cpp    | 38 +++++++++++++++++++++++++--------
 components/lua_ui/widget.hpp    | 10 +++++++++
 9 files changed, 107 insertions(+), 35 deletions(-)
 create mode 100644 components/lua_ui/container.cpp
 create mode 100644 components/lua_ui/container.hpp

diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 58e6d52ead..3ca08c4b7b 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -166,7 +166,7 @@ add_component_dir (queries
     
 add_component_dir (lua_ui
     properties widget element util layers content scriptsettings
-    adapter text textedit window image
+    adapter text textedit window image container
     )
 
 
diff --git a/components/lua_ui/adapter.cpp b/components/lua_ui/adapter.cpp
index 9a109d5d1f..9d37e2cb1a 100644
--- a/components/lua_ui/adapter.cpp
+++ b/components/lua_ui/adapter.cpp
@@ -3,6 +3,7 @@
 #include <MyGUI_Gui.h>
 
 #include "element.hpp"
+#include "container.hpp"
 
 namespace LuaUi
 {
@@ -15,18 +16,12 @@ namespace LuaUi
         : mElement(nullptr)
         , mContent(nullptr)
     {
-        MyGUI::Widget* widget = MyGUI::Gui::getInstancePtr()->createWidgetT(
-            "LuaWidget", "",
-            MyGUI::IntCoord(), MyGUI::Align::Default,
-            std::string(), "");
-
-        mContent = dynamic_cast<WidgetExtension*>(widget);
-        if (!mContent)
-            throw std::runtime_error("Invalid widget!");
-        mContent->initialize(luaState, widget);
-        mContent->onSizeChange([this](MyGUI::IntSize size)
+        mContent = MyGUI::Gui::getInstancePtr()->createWidget<LuaContainer>(
+            "", MyGUI::IntCoord(), MyGUI::Align::Default, "", "");
+        mContent->initialize(luaState, mContent);
+        mContent->onCoordChange([this](WidgetExtension* ext, MyGUI::IntCoord coord)
         {
-            setSize(size);
+            setSize(coord.size());
         });
         mContent->widget()->attachToWidget(this);
     }
diff --git a/components/lua_ui/adapter.hpp b/components/lua_ui/adapter.hpp
index 2ff206464d..e18f04c1f9 100644
--- a/components/lua_ui/adapter.hpp
+++ b/components/lua_ui/adapter.hpp
@@ -5,7 +5,7 @@
 
 namespace LuaUi
 {
-    class WidgetExtension;
+    class LuaContainer;
     struct Element;
     class LuaAdapter : public MyGUI::Widget
     {
@@ -19,7 +19,7 @@ namespace LuaUi
             bool empty() { return mElement.get() == nullptr; }
 
         private:
-            WidgetExtension* mContent;
+            LuaContainer* mContent;
             std::shared_ptr<Element> mElement;
             void attachElement();
             void detachElement();
diff --git a/components/lua_ui/container.cpp b/components/lua_ui/container.cpp
new file mode 100644
index 0000000000..867378744b
--- /dev/null
+++ b/components/lua_ui/container.cpp
@@ -0,0 +1,35 @@
+#include "container.hpp"
+
+#include <algorithm>
+
+namespace LuaUi
+{
+    void LuaContainer::updateChildren()
+    {
+        WidgetExtension::updateChildren();
+        for (auto w : children())
+        {
+            w->onCoordChange([this](WidgetExtension* child, MyGUI::IntCoord coord)
+                { updateSizeToFit(); });
+        }
+        updateSizeToFit();
+    }
+
+    MyGUI::IntSize LuaContainer::childScalingSize()
+    {
+        return MyGUI::IntSize();
+    }
+
+    void LuaContainer::updateSizeToFit()
+    {
+        MyGUI::IntSize size;
+        for (auto w : children())
+        {
+            MyGUI::IntCoord coord = w->widget()->getCoord();
+            size.width = std::max(size.width, coord.left + coord.width);
+            size.height = std::max(size.height, coord.top + coord.height);
+        }
+        setForcedSize(size);
+        updateCoord();
+    }
+}
diff --git a/components/lua_ui/container.hpp b/components/lua_ui/container.hpp
new file mode 100644
index 0000000000..a005b7ae53
--- /dev/null
+++ b/components/lua_ui/container.hpp
@@ -0,0 +1,21 @@
+#ifndef OPENMW_LUAUI_CONTAINER
+#define OPENMW_LUAUI_CONTAINER
+
+#include "widget.hpp"
+
+namespace LuaUi
+{
+    class LuaContainer : public WidgetExtension, public MyGUI::Widget
+    {
+        MYGUI_RTTI_DERIVED(LuaContainer)
+
+        protected:
+            virtual void updateChildren() override;
+            virtual MyGUI::IntSize childScalingSize() override;
+
+        private:
+            void updateSizeToFit();
+    };
+}
+
+#endif // !OPENMW_LUAUI_CONTAINER
diff --git a/components/lua_ui/element.cpp b/components/lua_ui/element.cpp
index 9baec82269..59a3b13d55 100644
--- a/components/lua_ui/element.cpp
+++ b/components/lua_ui/element.cpp
@@ -221,10 +221,7 @@ namespace LuaUi
     void Element::detachFromWidget()
     {
         if (mRoot)
-        {
-            mRoot->onSizeChange({});
             mRoot->widget()->detachFromWidget();
-        }
         if (mAttachedTo)
             mAttachedTo->setChildren({});
         mAttachedTo = nullptr;
@@ -239,16 +236,7 @@ namespace LuaUi
             if (!mLayer.empty())
                 Log(Debug::Warning) << "Ignoring element's layer " << mLayer << " because it's attached to a widget";
             mAttachedTo->setChildren({ mRoot });
-            auto callback = [this](MyGUI::IntSize size)
-            {
-                if (!mAttachedTo)
-                    return;
-                mAttachedTo->setForcedSize(mRoot->widget()->getSize());
-                mAttachedTo->updateCoord();
-            };
-            mRoot->onSizeChange(callback);
             mRoot->updateCoord();
-            callback(mRoot->widget()->getSize());
         }
     }
 }
diff --git a/components/lua_ui/util.cpp b/components/lua_ui/util.cpp
index 24a1442a53..7e81fc579c 100644
--- a/components/lua_ui/util.cpp
+++ b/components/lua_ui/util.cpp
@@ -8,6 +8,7 @@
 #include "textedit.hpp"
 #include "window.hpp"
 #include "image.hpp"
+#include "container.hpp"
 
 #include "element.hpp"
 #include "scriptsettings.hpp"
@@ -23,6 +24,7 @@ namespace LuaUi
         MyGUI::FactoryManager::getInstance().registerFactory<LuaTextEdit>("Widget");
         MyGUI::FactoryManager::getInstance().registerFactory<LuaWindow>("Widget");
         MyGUI::FactoryManager::getInstance().registerFactory<LuaImage>("Widget");
+        MyGUI::FactoryManager::getInstance().registerFactory<LuaContainer>("Widget");
         MyGUI::FactoryManager::getInstance().registerFactory<LuaTileRect>("BasisSkin");
     }
 
@@ -34,6 +36,7 @@ namespace LuaUi
             { "LuaTextEdit", "TextEdit" },
             { "LuaWindow", "Window" },
             { "LuaImage", "Image" },
+            { "LuaContainer", "Container" },
         };
         return types;
     }
diff --git a/components/lua_ui/widget.cpp b/components/lua_ui/widget.cpp
index 4224598ca1..b021c688fa 100644
--- a/components/lua_ui/widget.cpp
+++ b/components/lua_ui/widget.cpp
@@ -14,10 +14,11 @@ namespace LuaUi
         , mAbsoluteCoord()
         , mRelativeCoord()
         , mAnchor()
-        , mLua{ nullptr }
-        , mWidget{ nullptr }
+        , mLua(nullptr)
+        , mWidget(nullptr)
         , mSlot(this)
-        , mLayout{ sol::nil }
+        , mParent(nullptr)
+        , mLayout(sol::nil)
     {}
 
     void WidgetExtension::initialize(lua_State* lua, MyGUI::Widget* self)
@@ -64,6 +65,8 @@ namespace LuaUi
         mWidget->eventKeySetFocus.clear();
         mWidget->eventKeyLostFocus.clear();
 
+        mOnSizeChange.reset();
+
         for (WidgetExtension* w : mChildren)
             w->deinitialize();
         for (WidgetExtension* w : mTemplateChildren)
@@ -72,6 +75,7 @@ namespace LuaUi
 
     void WidgetExtension::attach(WidgetExtension* ext)
     {
+        ext->mParent = this;
         ext->widget()->attachToWidget(mSlot->widget());
         ext->updateCoord();
     }
@@ -150,6 +154,7 @@ namespace LuaUi
             mChildren[i] = children[i];
             attach(mChildren[i]);
         }
+        updateChildren();
     }
 
     void WidgetExtension::setTemplateChildren(const std::vector<WidgetExtension*>& children)
@@ -212,6 +217,8 @@ namespace LuaUi
             if (mOnSizeChange.has_value())
                 mOnSizeChange.value()(newCoord.size());
         }
+        if (oldCoord != newCoord && mOnCoordChange.has_value())
+            mOnCoordChange.value()(this, newCoord);
     }
 
     void WidgetExtension::setProperties(sol::object props)
@@ -240,23 +247,31 @@ namespace LuaUi
             w->updateCoord();
     }
 
+    MyGUI::IntSize WidgetExtension::parentSize()
+    {
+        if (mParent)
+            return mParent->childScalingSize();
+        else
+            return widget()->getParentSize();
+    }
+
     MyGUI::IntSize WidgetExtension::calculateSize()
     {
-        const MyGUI::IntSize& parentSize = mWidget->getParentSize();
+        MyGUI::IntSize pSize = parentSize();
         MyGUI::IntSize newSize;
         newSize = mAbsoluteCoord.size() + mForcedCoord.size();
-        newSize.width += mRelativeCoord.width * parentSize.width;
-        newSize.height += mRelativeCoord.height * parentSize.height;
+        newSize.width += mRelativeCoord.width * pSize.width;
+        newSize.height += mRelativeCoord.height * pSize.height;
         return newSize;
     }
 
     MyGUI::IntPoint WidgetExtension::calculatePosition(const MyGUI::IntSize& size)
     {
-        const MyGUI::IntSize& parentSize = mWidget->getParentSize();
+        MyGUI::IntSize pSize = parentSize();
         MyGUI::IntPoint newPosition;
         newPosition = mAbsoluteCoord.point() + mForcedCoord.point();
-        newPosition.left += mRelativeCoord.left * parentSize.width - mAnchor.width * size.width;
-        newPosition.top += mRelativeCoord.top * parentSize.height - mAnchor.height * size.height;
+        newPosition.left += mRelativeCoord.left * pSize.width - mAnchor.width * size.width;
+        newPosition.top += mRelativeCoord.top * pSize.height - mAnchor.height * size.height;
         return newPosition;
     }
 
@@ -268,6 +283,11 @@ namespace LuaUi
         return newCoord;
     }
 
+    MyGUI::IntSize WidgetExtension::childScalingSize()
+    {
+        return widget()->getSize();
+    }
+
     void WidgetExtension::triggerEvent(std::string_view name, const sol::object& argument = sol::nil) const
     {
         auto it = mCallbacks.find(name);
diff --git a/components/lua_ui/widget.hpp b/components/lua_ui/widget.hpp
index 1eff2a113b..a5adb33130 100644
--- a/components/lua_ui/widget.hpp
+++ b/components/lua_ui/widget.hpp
@@ -57,6 +57,11 @@ namespace LuaUi
             return parseExternal(mExternal, name, defaultValue);
         }
 
+        void onCoordChange(const std::optional<std::function<void(WidgetExtension*, MyGUI::IntCoord)>>& callback)
+        {
+            mOnCoordChange = callback;
+        }
+
         void onSizeChange(const std::optional<std::function<void(MyGUI::IntSize)>>& callback)
         {
             mOnSizeChange = callback;
@@ -68,9 +73,11 @@ namespace LuaUi
         sol::object keyEvent(MyGUI::KeyCode) const;
         sol::object mouseEvent(int left, int top, MyGUI::MouseButton button) const;
 
+        MyGUI::IntSize parentSize();
         virtual MyGUI::IntSize calculateSize();
         virtual MyGUI::IntPoint calculatePosition(const MyGUI::IntSize& size);
         MyGUI::IntCoord calculateCoord();
+        virtual MyGUI::IntSize childScalingSize();
 
         template<typename T>
         T propertyValue(std::string_view name, const T& defaultValue)
@@ -83,6 +90,7 @@ namespace LuaUi
 
         virtual void updateTemplate();
         virtual void updateProperties();
+        virtual void updateChildren() {};
 
         void triggerEvent(std::string_view name, const sol::object& argument) const;
 
@@ -108,6 +116,7 @@ namespace LuaUi
         sol::object mProperties;
         sol::object mTemplateProperties;
         sol::object mExternal;
+        WidgetExtension* mParent;
 
         void attach(WidgetExtension* ext);
 
@@ -127,6 +136,7 @@ namespace LuaUi
         void focusGain(MyGUI::Widget*, MyGUI::Widget*);
         void focusLoss(MyGUI::Widget*, MyGUI::Widget*);
 
+        std::optional<std::function<void(WidgetExtension*, MyGUI::IntCoord)>> mOnCoordChange;
         std::optional<std::function<void(MyGUI::IntSize)>> mOnSizeChange;
     };
 

From 67641dcdb7106cf7ea528ae305aef4a61186c142 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sat, 29 Jan 2022 23:43:08 +0100
Subject: [PATCH 2036/2859] Fix compile errors

---
 apps/openmw/mwlua/uibindings.cpp             |  2 +-
 components/CMakeLists.txt                    |  3 ++-
 components/lua_ui/adapter.cpp                | 14 +++++++-------
 components/lua_ui/adapter.hpp                |  6 ++++--
 components/lua_ui/registerscriptsettings.hpp | 13 +++++++++++++
 components/lua_ui/scriptsettings.cpp         |  1 +
 components/lua_ui/scriptsettings.hpp         |  3 +--
 components/lua_ui/util.cpp                   |  2 +-
 components/lua_ui/widget.cpp                 |  2 +-
 9 files changed, 31 insertions(+), 15 deletions(-)
 create mode 100644 components/lua_ui/registerscriptsettings.hpp

diff --git a/apps/openmw/mwlua/uibindings.cpp b/apps/openmw/mwlua/uibindings.cpp
index bd19dde114..073ecc7822 100644
--- a/apps/openmw/mwlua/uibindings.cpp
+++ b/apps/openmw/mwlua/uibindings.cpp
@@ -2,7 +2,7 @@
 #include <components/lua_ui/element.hpp>
 #include <components/lua_ui/layers.hpp>
 #include <components/lua_ui/content.hpp>
-#include <components/lua_ui/scriptsettings.hpp>
+#include <components/lua_ui/registerscriptsettings.hpp>
 
 #include "context.hpp"
 #include "actions.hpp"
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 3ca08c4b7b..9a1ffc847c 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -165,7 +165,8 @@ add_component_dir (queries
     )
     
 add_component_dir (lua_ui
-    properties widget element util layers content scriptsettings
+    registerscriptsettings scriptsettings
+    properties widget element util layers content
     adapter text textedit window image container
     )
 
diff --git a/components/lua_ui/adapter.cpp b/components/lua_ui/adapter.cpp
index 9d37e2cb1a..aa04f4c374 100644
--- a/components/lua_ui/adapter.cpp
+++ b/components/lua_ui/adapter.cpp
@@ -14,16 +14,16 @@ namespace LuaUi
 
     LuaAdapter::LuaAdapter()
         : mElement(nullptr)
-        , mContent(nullptr)
+        , mContainer(nullptr)
     {
-        mContent = MyGUI::Gui::getInstancePtr()->createWidget<LuaContainer>(
+        mContainer = MyGUI::Gui::getInstancePtr()->createWidget<LuaContainer>(
             "", MyGUI::IntCoord(), MyGUI::Align::Default, "", "");
-        mContent->initialize(luaState, mContent);
-        mContent->onCoordChange([this](WidgetExtension* ext, MyGUI::IntCoord coord)
+        mContainer->initialize(luaState, mContainer);
+        mContainer->onCoordChange([this](WidgetExtension* ext, MyGUI::IntCoord coord)
         {
             setSize(coord.size());
         });
-        mContent->widget()->attachToWidget(this);
+        mContainer->widget()->attachToWidget(this);
     }
 
     void LuaAdapter::attach(const std::shared_ptr<Element>& element)
@@ -31,7 +31,7 @@ namespace LuaUi
         detachElement();
         mElement = element;
         attachElement();
-        setSize(mContent->widget()->getSize());
+        setSize(mContainer->widget()->getSize());
 
         // workaround for MyGUI bug
         // parent visibility doesn't affect added children
@@ -48,7 +48,7 @@ namespace LuaUi
     void LuaAdapter::attachElement()
     {
         if (mElement.get())
-            mElement->attachToWidget(mContent);
+            mElement->attachToWidget(mContainer);
     }
 
     void LuaAdapter::detachElement()
diff --git a/components/lua_ui/adapter.hpp b/components/lua_ui/adapter.hpp
index e18f04c1f9..2cb08b7367 100644
--- a/components/lua_ui/adapter.hpp
+++ b/components/lua_ui/adapter.hpp
@@ -1,6 +1,8 @@
 #ifndef OPENMW_LUAUI_ADAPTER
 #define OPENMW_LUAUI_ADAPTER
 
+#include <memory>
+
 #include <MyGUI_Widget.h>
 
 namespace LuaUi
@@ -16,11 +18,11 @@ namespace LuaUi
 
             void attach(const std::shared_ptr<Element>& element);
             void detach();
-            bool empty() { return mElement.get() == nullptr; }
 
         private:
-            LuaContainer* mContent;
             std::shared_ptr<Element> mElement;
+            LuaContainer* mContainer;
+
             void attachElement();
             void detachElement();
     };
diff --git a/components/lua_ui/registerscriptsettings.hpp b/components/lua_ui/registerscriptsettings.hpp
new file mode 100644
index 0000000000..fb794468da
--- /dev/null
+++ b/components/lua_ui/registerscriptsettings.hpp
@@ -0,0 +1,13 @@
+#ifndef OPENMW_LUAUI_REGISTERSCRIPTSETTINGS
+#define OPENMW_LUAUI_REGISTERSCRIPTSETTINGS
+
+#include <sol/sol.hpp>
+
+namespace LuaUi
+{
+    // implemented in scriptsettings.cpp
+    void registerSettingsPage(const sol::table& options);
+    void clearSettings();
+}
+
+#endif // !OPENMW_LUAUI_REGISTERSCRIPTSETTINGS
diff --git a/components/lua_ui/scriptsettings.cpp b/components/lua_ui/scriptsettings.cpp
index bf7788597a..a1671186a4 100644
--- a/components/lua_ui/scriptsettings.cpp
+++ b/components/lua_ui/scriptsettings.cpp
@@ -3,6 +3,7 @@
 #include <map>
 #include <sol/sol.hpp>
 
+#include "registerscriptsettings.hpp"
 #include "element.hpp"
 #include "adapter.hpp"
 
diff --git a/components/lua_ui/scriptsettings.hpp b/components/lua_ui/scriptsettings.hpp
index 050722c249..245c3e0449 100644
--- a/components/lua_ui/scriptsettings.hpp
+++ b/components/lua_ui/scriptsettings.hpp
@@ -3,6 +3,7 @@
 
 #include <string>
 #include <string_view>
+#include <memory>
 
 #include <MyGUI_Widget.h>
 
@@ -18,8 +19,6 @@ namespace LuaUi
     };
     size_t scriptSettingsPageCount();
     ScriptSettingsPage scriptSettingsPageAt(size_t index);
-    void registerSettingsPage(const sol::table& options);
-    void clearSettings();
     void attachPageAt(size_t index, LuaAdapter* adapter);
 }
 
diff --git a/components/lua_ui/util.cpp b/components/lua_ui/util.cpp
index 7e81fc579c..8a7fd4b65b 100644
--- a/components/lua_ui/util.cpp
+++ b/components/lua_ui/util.cpp
@@ -11,7 +11,7 @@
 #include "container.hpp"
 
 #include "element.hpp"
-#include "scriptsettings.hpp"
+#include "registerscriptsettings.hpp"
 
 namespace LuaUi
 {
diff --git a/components/lua_ui/widget.cpp b/components/lua_ui/widget.cpp
index b021c688fa..f9f6dc41ff 100644
--- a/components/lua_ui/widget.cpp
+++ b/components/lua_ui/widget.cpp
@@ -17,8 +17,8 @@ namespace LuaUi
         , mLua(nullptr)
         , mWidget(nullptr)
         , mSlot(this)
-        , mParent(nullptr)
         , mLayout(sol::nil)
+        , mParent(nullptr)
     {}
 
     void WidgetExtension::initialize(lua_State* lua, MyGUI::Widget* self)

From 01d65a14f125fd652a33b8eb859a5b4a43beb5a4 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sun, 30 Jan 2022 14:25:20 +0100
Subject: [PATCH 2037/2859] Implement more advanced search, sort script setting
 pages by alphabet and filter match quality

---
 apps/openmw/mwgui/settingswindow.cpp | 60 ++++++++++++++++++++++++----
 1 file changed, 52 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index f556bbdd5b..a8c430f2a2 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -729,6 +729,42 @@ namespace MWGui
         mScriptDisabled->setPosition({0, 0});
         mScriptDisabled->setSize(parentSize);
     }
+
+    namespace
+    {
+        std::string escapeRegex(const std::string& str)
+        {
+            static std::regex specialChars(R"r([\^\.\[\$\(\)\|\*\+\?\{])r", std::regex_constants::extended);
+            return std::regex_replace(str, specialChars, R"(\$&)");
+        }
+
+        std::regex wordSearch(const std::string& query)
+        {
+            static std::regex wordsRegex(R"([^[:space:]]+)", std::regex_constants::extended);
+            auto wordsBegin = std::sregex_iterator(query.begin(), query.end(), wordsRegex);
+            auto wordsEnd = std::sregex_iterator();
+            std::string searchRegex("(");
+            for (auto it = wordsBegin; it != wordsEnd; ++it)
+            {
+                if (it != wordsBegin)
+                    searchRegex += '|';
+                searchRegex += escapeRegex(query.substr(it->position(), it->length()));
+            }
+            searchRegex += ')';
+            // query had only whitespace characters
+            if (searchRegex == "()")
+                searchRegex = "^(.*)$";
+            static auto flags = std::regex_constants::icase | std::regex_constants::extended;
+            return std::regex(searchRegex, flags);
+        }
+
+        int weightedSearch(const std::regex& regex, const std::string& text)
+        {
+            std::smatch matches;
+            std::regex_search(text, matches, regex);
+            return matches.size();
+        }
+    }
          
     void SettingsWindow::renderScriptSettings()
     {
@@ -737,18 +773,26 @@ namespace MWGui
         mScriptList->removeAllItems();
         mScriptView->setCanvasSize({0, 0});
 
-        std::string filter(".*");
-        filter += mScriptFilter->getCaption();
-        filter += ".*";
-        auto flags = std::regex_constants::icase;
-        std::regex filterRegex(filter, flags);
-
+        std::regex searchRegex = wordSearch(mScriptFilter->getCaption());
+        std::vector<std::tuple<size_t, LuaUi::ScriptSettingsPage, int>> weightedPages;
+        weightedPages.reserve(LuaUi::scriptSettingsPageCount());
         for (size_t i = 0; i < LuaUi::scriptSettingsPageCount(); ++i)
         {
             LuaUi::ScriptSettingsPage page = LuaUi::scriptSettingsPageAt(i);
-            if (std::regex_match(page.mName, filterRegex) || std::regex_match(page.mDescription, filterRegex))
-                mScriptList->addItem(page.mName, i);
+            int nameSearch = 2 * weightedSearch(searchRegex, page.mName);
+            int descriptionSearch = weightedSearch(searchRegex, page.mDescription);
+            int search = nameSearch + descriptionSearch;
+            if (search > 0)
+                weightedPages.push_back({ i, page, search });
         }
+        std::sort(weightedPages.begin(), weightedPages.end(), [](const auto& a, const auto& b)
+        {
+            const auto& [iA, pageA, weightA] = a;
+            const auto& [iB, pageB, weightB] = b;
+            return weightA == weightB ? pageA.mName < pageB.mName : weightA > weightB;
+        });
+        for (const auto & [i, page, weight] : weightedPages)
+            mScriptList->addItem(page.mName, i);
 
         // Hide script settings tab when the game world isn't loaded and scripts couldn't add their settings
         bool disabled = LuaUi::scriptSettingsPageCount() == 0;

From 7f796d148e042ba362de0dcab413ef1800566969 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sun, 30 Jan 2022 15:50:04 +0100
Subject: [PATCH 2038/2859] Clean up

---
 components/lua_ui/util.cpp   | 1 -
 components/lua_ui/widget.cpp | 6 +-----
 components/lua_ui/widget.hpp | 6 ------
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/components/lua_ui/util.cpp b/components/lua_ui/util.cpp
index 8a7fd4b65b..cd2cb2c077 100644
--- a/components/lua_ui/util.cpp
+++ b/components/lua_ui/util.cpp
@@ -36,7 +36,6 @@ namespace LuaUi
             { "LuaTextEdit", "TextEdit" },
             { "LuaWindow", "Window" },
             { "LuaImage", "Image" },
-            { "LuaContainer", "Container" },
         };
         return types;
     }
diff --git a/components/lua_ui/widget.cpp b/components/lua_ui/widget.cpp
index f9f6dc41ff..70ed6b64fe 100644
--- a/components/lua_ui/widget.cpp
+++ b/components/lua_ui/widget.cpp
@@ -65,7 +65,7 @@ namespace LuaUi
         mWidget->eventKeySetFocus.clear();
         mWidget->eventKeyLostFocus.clear();
 
-        mOnSizeChange.reset();
+        mOnCoordChange.reset();
 
         for (WidgetExtension* w : mChildren)
             w->deinitialize();
@@ -212,11 +212,7 @@ namespace LuaUi
         if (oldCoord != newCoord)
             mWidget->setCoord(newCoord);
         if (oldCoord.size() != newCoord.size())
-        {
             updateChildrenCoord();
-            if (mOnSizeChange.has_value())
-                mOnSizeChange.value()(newCoord.size());
-        }
         if (oldCoord != newCoord && mOnCoordChange.has_value())
             mOnCoordChange.value()(this, newCoord);
     }
diff --git a/components/lua_ui/widget.hpp b/components/lua_ui/widget.hpp
index a5adb33130..63af5b3cae 100644
--- a/components/lua_ui/widget.hpp
+++ b/components/lua_ui/widget.hpp
@@ -62,11 +62,6 @@ namespace LuaUi
             mOnCoordChange = callback;
         }
 
-        void onSizeChange(const std::optional<std::function<void(MyGUI::IntSize)>>& callback)
-        {
-            mOnSizeChange = callback;
-        }
-
     protected:
         virtual void initialize();
         sol::table makeTable() const;
@@ -137,7 +132,6 @@ namespace LuaUi
         void focusLoss(MyGUI::Widget*, MyGUI::Widget*);
 
         std::optional<std::function<void(WidgetExtension*, MyGUI::IntCoord)>> mOnCoordChange;
-        std::optional<std::function<void(MyGUI::IntSize)>> mOnSizeChange;
     };
 
     class LuaWidget : public MyGUI::Widget, public WidgetExtension

From ef1e72dc17900a882c7dd8993ab80b08c4dc73b9 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Tue, 1 Feb 2022 19:20:47 +0100
Subject: [PATCH 2039/2859] Revert from settings description to searchHints

---
 apps/openmw/mwgui/settingswindow.cpp      | 19 +------------------
 apps/openmw/mwgui/settingswindow.hpp      |  2 --
 components/lua_ui/scriptsettings.cpp      |  4 ++--
 components/lua_ui/scriptsettings.hpp      |  2 +-
 files/mygui/openmw_settings_window.layout |  8 --------
 5 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index a8c430f2a2..14587513df 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -244,7 +244,6 @@ namespace MWGui
         getWidget(mScriptView, "ScriptView");
         getWidget(mScriptAdapter, "ScriptAdapter");
         getWidget(mScriptDisabled, "ScriptDisabled");
-        getWidget(mScriptDescription, "ScriptDescription");
 
 #ifndef WIN32
         // hide gamma controls since it currently does not work under Linux
@@ -333,7 +332,6 @@ namespace MWGui
 
         mScriptFilter->eventEditTextChange += MyGUI::newDelegate(this, &SettingsWindow::onScriptFilterChange);
         mScriptList->eventListMouseItemActivate += MyGUI::newDelegate(this, &SettingsWindow::onScriptListSelection);
-        mScriptList->eventListMouseItemFocus += MyGUI::newDelegate(this, &SettingsWindow::onScriptListFocus);
     }
 
     void SettingsWindow::onTabChanged(MyGUI::TabControl* /*_sender*/, size_t /*index*/)
@@ -780,7 +778,7 @@ namespace MWGui
         {
             LuaUi::ScriptSettingsPage page = LuaUi::scriptSettingsPageAt(i);
             int nameSearch = 2 * weightedSearch(searchRegex, page.mName);
-            int descriptionSearch = weightedSearch(searchRegex, page.mDescription);
+            int descriptionSearch = weightedSearch(searchRegex, page.mSearchHints);
             int search = nameSearch + descriptionSearch;
             if (search > 0)
                 weightedPages.push_back({ i, page, search });
@@ -820,21 +818,6 @@ namespace MWGui
         mScriptView->setCanvasSize(canvasSize);
     }
 
-    void SettingsWindow::onScriptListFocus(MyGUI::ListBox*, size_t index)
-    {
-        if (index >= mScriptList->getItemCount())
-        {
-            mScriptDescription->setVisible(false);
-            mScriptView->setVisible(true);
-        }
-        else {
-            size_t page = *mScriptList->getItemDataAt<size_t>(index);
-            mScriptDescription->setCaption(LuaUi::scriptSettingsPageAt(page).mDescription);
-            mScriptDescription->setVisible(true);
-            mScriptView->setVisible(false);
-        }
-    }
-
     void SettingsWindow::onRebindAction(MyGUI::Widget* _sender)
     {
         int actionId = *_sender->getUserData<int>();
diff --git a/apps/openmw/mwgui/settingswindow.hpp b/apps/openmw/mwgui/settingswindow.hpp
index 217dcf3051..1a888257a8 100644
--- a/apps/openmw/mwgui/settingswindow.hpp
+++ b/apps/openmw/mwgui/settingswindow.hpp
@@ -52,7 +52,6 @@ namespace MWGui
             MyGUI::ScrollView* mScriptView;
             LuaUi::LuaAdapter* mScriptAdapter;
             MyGUI::EditBox* mScriptDisabled;
-            MyGUI::EditBox* mScriptDescription;
             int mCurrentPage;
 
             void onTabChanged(MyGUI::TabControl* _sender, size_t index);
@@ -84,7 +83,6 @@ namespace MWGui
 
             void onScriptFilterChange(MyGUI::EditBox*);
             void onScriptListSelection(MyGUI::ListBox*, size_t index);
-            void onScriptListFocus(MyGUI::ListBox*, size_t index);
 
             void apply();
 
diff --git a/components/lua_ui/scriptsettings.cpp b/components/lua_ui/scriptsettings.cpp
index a1671186a4..f2ab84bde0 100644
--- a/components/lua_ui/scriptsettings.cpp
+++ b/components/lua_ui/scriptsettings.cpp
@@ -15,14 +15,14 @@ namespace LuaUi
         ScriptSettingsPage parse(const sol::table& options)
         {
             auto name = options.get_or("name", std::string());
-            auto description = options.get_or("description", std::string());
+            auto searchHints = options.get_or("searchHints", std::string());
             auto element = options.get_or<std::shared_ptr<LuaUi::Element>>("element", nullptr);
             if (name.empty())
                 Log(Debug::Warning) << "A script settings page has an empty name";
             if (!element.get())
                 Log(Debug::Warning) << "A script settings page has no UI element assigned";
             return {
-                name, description, element
+                name, searchHints, element
             };
         }
     }
diff --git a/components/lua_ui/scriptsettings.hpp b/components/lua_ui/scriptsettings.hpp
index 245c3e0449..c468f9eb0b 100644
--- a/components/lua_ui/scriptsettings.hpp
+++ b/components/lua_ui/scriptsettings.hpp
@@ -14,7 +14,7 @@ namespace LuaUi
     struct ScriptSettingsPage
     {
         std::string mName;
-        std::string mDescription;
+        std::string mSearchHints;
         std::shared_ptr<Element> mElement;
     };
     size_t scriptSettingsPageCount();
diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index d6ac4f43fa..13f5ada24b 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -666,14 +666,6 @@
                         <Property key="CanvasSize" value="246 246"/>
                         <Widget name="ScriptAdapter" type="LuaAdapter" position="0 0 246 246"/>
                     </Widget>
-                    <Widget name="ScriptDescription" type = "EditBox" skin="SandText" position="2 2 246 246" align="Stretch">
-                        <Property key="Visible" value="false"/>
-                        <Property key="Caption" value="Scripts settings are only available when a game is loaded."/>
-                        <Property key="TextAlign" value="Center" />
-                        <Property key="MultiLine" value="true" />
-                        <Property key="WordWrap" value="true" />
-                        <Property key="Static" value="true"/>
-                    </Widget>
                 </Widget>
                 <Widget name="ScriptDisabled" type="EditBox" skin="SandText" position="0 0 360 308" align="Center">
                     <Property key="Visible" value="false"/>

From 2185fd29c5ecd149fabeea83f84a82b6beb54d6a Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Tue, 1 Feb 2022 19:26:05 +0100
Subject: [PATCH 2040/2859] Document ui.registerSettingsPage

---
 files/lua_api/openmw/ui.lua | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/files/lua_api/openmw/ui.lua b/files/lua_api/openmw/ui.lua
index c60a4e1abd..997c39780e 100644
--- a/files/lua_api/openmw/ui.lua
+++ b/files/lua_api/openmw/ui.lua
@@ -36,6 +36,11 @@
 -- @param #Layout layout
 -- @return #Element
 
+---
+-- Adds a settings page to main menu setting's Scripts tab.
+-- @function [parent=#ui] regregisterSettingsPageister
+-- @param #SettingsPage page
+
 ---
 -- Layout
 -- @type Layout
@@ -137,4 +142,11 @@
 -- @field openmw.util#Vector2 offset Position of the mouse cursor relative to the widget
 -- @field #number button Mouse button which triggered the event (could be nil)
 
+---
+-- Settings page parameters, passed as an argument to uyi.registerSettingsPage
+-- @type SettingsPage
+-- @field #string name Name of the page, displayed in the list, used for search
+-- @field #string searchHints Additional keywords used in search, not displayed anywhere
+-- @field #Element element The page's UI, which will be attached to the settings tab. The root widget has to have a fixed size (set `size` field in `props`, see Widget documentation, `relativeSize` is ignored)
+
 return nil

From 8752f78fa45ebd1212cd2874ed0e105739369c23 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Tue, 11 Jan 2022 21:03:10 +0100
Subject: [PATCH 2041/2859] Remove weaponless, non-biped distinction

---
 CHANGELOG.md                          |   1 +
 apps/openmw/mwmechanics/character.cpp | 106 +-------------------------
 apps/openmw/mwmechanics/character.hpp |   1 -
 3 files changed, 4 insertions(+), 104 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2baee6552..710d0bff12 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@
     Bug #4700: Editor: Incorrect command implementation
     Bug #4744: Invisible particles must still be processed
     Bug #4949: Incorrect particle lighting
+    Bug #5054: Non-biped creatures don't use spellcast equip/unequip animations
     Bug #5088: Sky abruptly changes direction during certain weather transitions
     Bug #5100: Persuasion doesn't always clamp the resulting disposition
     Bug #5120: Scripted object spawning updates physics system
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 0f8e2ebd97..820bfad07b 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -707,9 +707,7 @@ void CharacterController::refreshCurrentAnims(CharacterState idle, CharacterStat
     if (mPtr.getClass().isActor())
         refreshHitRecoilAnims(idle);
 
-    std::string weap;
-    if (mPtr.getClass().hasInventoryStore(mPtr))
-        weap = getWeaponType(mWeaponType)->mShortGroup;
+    std::string weap = getWeaponType(mWeaponType)->mShortGroup;
 
     refreshJumpAnims(weap, jump, idle, force);
     refreshMovementAnims(weap, movement, idle, force);
@@ -1119,97 +1117,6 @@ void CharacterController::updateIdleStormState(bool inwater)
     }
 }
 
-bool CharacterController::updateCreatureState()
-{
-    const MWWorld::Class &cls = mPtr.getClass();
-    CreatureStats &stats = cls.getCreatureStats(mPtr);
-
-    int weapType = ESM::Weapon::None;
-    if(stats.getDrawState() == DrawState_Weapon)
-        weapType = ESM::Weapon::HandToHand;
-    else if (stats.getDrawState() == DrawState_Spell)
-        weapType = ESM::Weapon::Spell;
-
-    if (weapType != mWeaponType)
-    {
-        mWeaponType = weapType;
-        if (mAnimation->isPlaying(mCurrentWeapon))
-            mAnimation->disable(mCurrentWeapon);
-    }
-
-    if(getAttackingOrSpell())
-    {
-        if(mUpperBodyState == UpperCharState_Nothing && mHitState == CharState_None)
-        {
-            MWBase::Environment::get().getWorld()->breakInvisibility(mPtr);
-
-            std::string startKey = "start";
-            std::string stopKey = "stop";
-            if (weapType == ESM::Weapon::Spell)
-            {
-                const std::string spellid = stats.getSpells().getSelectedSpell();
-                bool canCast = mCastingManualSpell || MWBase::Environment::get().getWorld()->startSpellCast(mPtr);
-
-                if (!spellid.empty() && canCast)
-                {
-                    MWMechanics::CastSpell cast(mPtr, nullptr, false, mCastingManualSpell);
-                    cast.playSpellCastingEffects(spellid, false);
-
-                    if (!mAnimation->hasAnimation("spellcast"))
-                    {
-                        MWBase::Environment::get().getWorld()->castSpell(mPtr, mCastingManualSpell); // No "release" text key to use, so cast immediately
-                        mCastingManualSpell = false;
-                    }
-                    else
-                    {
-                        const ESM::Spell *spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find(spellid);
-                        const ESM::ENAMstruct &effectentry = spell->mEffects.mList.at(0);
-
-                        switch(effectentry.mRange)
-                        {
-                            case 0: mAttackType = "self"; break;
-                            case 1: mAttackType = "touch"; break;
-                            case 2: mAttackType = "target"; break;
-                        }
-
-                        startKey = mAttackType + " " + startKey;
-                        stopKey = mAttackType + " " + stopKey;
-                        mCurrentWeapon = "spellcast";
-                    }
-                }
-                else
-                    mCurrentWeapon = "";
-            }
-
-            if (weapType != ESM::Weapon::Spell || !mAnimation->hasAnimation("spellcast")) // Not all creatures have a dedicated spellcast animation
-            {
-                mCurrentWeapon = chooseRandomAttackAnimation();
-            }
-
-            if (!mCurrentWeapon.empty())
-            {
-                mAnimation->play(mCurrentWeapon, Priority_Weapon,
-                                 MWRender::Animation::BlendMask_All, true,
-                                 1, startKey, stopKey,
-                                 0.0f, 0);
-                mUpperBodyState = UpperCharState_StartToMinAttack;
-
-                mAttackStrength = std::min(1.f, 0.1f + Misc::Rng::rollClosedProbability());
-
-                if (weapType == ESM::Weapon::HandToHand)
-                    playSwishSound(0.0f);
-            }
-        }
-
-        setAttackingOrSpell(false);
-    }
-
-    bool animPlaying = mAnimation->getInfo(mCurrentWeapon);
-    if (!animPlaying)
-        mUpperBodyState = UpperCharState_Nothing;
-    return false;
-}
-
 bool CharacterController::updateCarriedLeftVisible(const int weaptype) const
 {
     // Shields/torches shouldn't be visible during any operation involving two hands
@@ -2346,11 +2253,7 @@ void CharacterController::update(float duration)
 
         if (!mSkipAnim)
         {
-            // bipedal means hand-to-hand could be used (which is handled in updateWeaponState). an existing InventoryStore means an actual weapon could be used.
-            if(cls.isBipedal(mPtr) || cls.hasInventoryStore(mPtr))
-                forcestateupdate = updateWeaponState(idlestate) || forcestateupdate;
-            else
-                forcestateupdate = updateCreatureState() || forcestateupdate;
+            forcestateupdate = updateWeaponState(idlestate) || forcestateupdate;
 
             refreshCurrentAnims(idlestate, movestate, jumpstate, forcestateupdate);
             updateIdleStormState(inwater);
@@ -2879,10 +2782,7 @@ bool CharacterController::readyToStartAttack() const
     if (mHitState != CharState_None && mHitState != CharState_Block)
         return false;
 
-    if (mPtr.getClass().hasInventoryStore(mPtr) || mPtr.getClass().isBipedal(mPtr))
-        return mUpperBodyState == UpperCharState_WeapEquiped;
-    else
-        return mUpperBodyState == UpperCharState_Nothing;
+    return mUpperBodyState == UpperCharState_WeapEquiped;
 }
 
 float CharacterController::getAttackStrength() const
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index 1647980541..8c410bba25 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -206,7 +206,6 @@ class CharacterController : public MWRender::Animation::TextKeyListener
     void clearAnimQueue(bool clearPersistAnims = false);
 
     bool updateWeaponState(CharacterState& idle);
-    bool updateCreatureState();
     void updateIdleStormState(bool inwater);
 
     std::string chooseRandomAttackAnimation() const;

From f68c0c41a9875cfa7413b3e89ff33d4bb28d8d9f Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Tue, 1 Feb 2022 22:03:01 +0100
Subject: [PATCH 2042/2859] Prioritize setting pages with hits in the name when
 searching

---
 apps/openmw/mwgui/settingswindow.cpp | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index 14587513df..80a034fd2a 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -756,7 +756,8 @@ namespace MWGui
             return std::regex(searchRegex, flags);
         }
 
-        int weightedSearch(const std::regex& regex, const std::string& text)
+        // use double to guarantee no overflow when casting from size_t
+        double weightedSearch(const std::regex& regex, const std::string& text)
         {
             std::smatch matches;
             std::regex_search(text, matches, regex);
@@ -772,24 +773,23 @@ namespace MWGui
         mScriptView->setCanvasSize({0, 0});
 
         std::regex searchRegex = wordSearch(mScriptFilter->getCaption());
-        std::vector<std::tuple<size_t, LuaUi::ScriptSettingsPage, int>> weightedPages;
+        std::vector<std::tuple<size_t, LuaUi::ScriptSettingsPage, double, double>> weightedPages;
         weightedPages.reserve(LuaUi::scriptSettingsPageCount());
         for (size_t i = 0; i < LuaUi::scriptSettingsPageCount(); ++i)
         {
             LuaUi::ScriptSettingsPage page = LuaUi::scriptSettingsPageAt(i);
-            int nameSearch = 2 * weightedSearch(searchRegex, page.mName);
-            int descriptionSearch = weightedSearch(searchRegex, page.mSearchHints);
-            int search = nameSearch + descriptionSearch;
-            if (search > 0)
-                weightedPages.push_back({ i, page, search });
+            double nameSearch = 2 * weightedSearch(searchRegex, page.mName);
+            double hintSearch = weightedSearch(searchRegex, page.mSearchHints);
+            if ((nameSearch + hintSearch) > 0)
+                weightedPages.push_back({ i, page, -nameSearch, -hintSearch });
         }
         std::sort(weightedPages.begin(), weightedPages.end(), [](const auto& a, const auto& b)
         {
-            const auto& [iA, pageA, weightA] = a;
-            const auto& [iB, pageB, weightB] = b;
-            return weightA == weightB ? pageA.mName < pageB.mName : weightA > weightB;
+            const auto& [iA, pageA, nameA, hintA] = a;
+            const auto& [iB, pageB, nameB, hintB] = b;
+            return std::tie(nameA, hintA, pageA.mName) < std::tie(nameB, hintB, pageB.mName);
         });
-        for (const auto & [i, page, weight] : weightedPages)
+        for (const auto & [i, page, name, hint] : weightedPages)
             mScriptList->addItem(page.mName, i);
 
         // Hide script settings tab when the game world isn't loaded and scripts couldn't add their settings
@@ -814,8 +814,7 @@ namespace MWGui
             mCurrentPage = *mScriptList->getItemDataAt<size_t>(index);
             LuaUi::attachPageAt(mCurrentPage, mScriptAdapter);
         }
-        MyGUI::IntSize canvasSize = mScriptAdapter->getSize();
-        mScriptView->setCanvasSize(canvasSize);
+        mScriptView->setCanvasSize(mScriptAdapter->getSize());
     }
 
     void SettingsWindow::onRebindAction(MyGUI::Widget* _sender)

From 47c37e5849a91969ec191a28383559cdeeb6159d Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Tue, 1 Feb 2022 23:42:56 +0000
Subject: [PATCH 2043/2859] Lua command `object:activateBy(actor)` and handler
 `onActivate`

---
 AUTHORS.md                                    |  2 +-
 apps/openmw/mwbase/luamanager.hpp             |  1 +
 apps/openmw/mwlua/actions.cpp                 | 31 ++++++++++++++++---
 apps/openmw/mwlua/actions.hpp                 | 14 +++++++++
 apps/openmw/mwlua/localscripts.cpp            |  6 +++-
 apps/openmw/mwlua/localscripts.hpp            |  7 ++++-
 apps/openmw/mwlua/luamanagerimp.cpp           |  5 +++
 apps/openmw/mwlua/luamanagerimp.hpp           |  1 +
 apps/openmw/mwlua/objectbindings.cpp          |  8 +++++
 apps/openmw/mwscript/interpretercontext.cpp   |  2 ++
 apps/openmw/mwworld/worldimp.cpp              |  3 +-
 .../lua-scripting/engine_handlers.rst         |  6 ++++
 files/lua_api/openmw/core.lua                 |  8 +++++
 13 files changed, 86 insertions(+), 8 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index 2ddaa03cf6..ecfc03dc1e 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -218,6 +218,7 @@ Programmers
     tlmullis
     tri4ng1e
     Thoronador
+    Tobias Tribble (zackogenic)
     Tom Lowe (Vulpen)
     Tom Mason (wheybags)
     Torben Leif Carrington (TorbenC)
@@ -234,7 +235,6 @@ Programmers
     Yuri Krupenin
     zelurker
     Noah Gooder
-    
 
 Documentation
 -------------
diff --git a/apps/openmw/mwbase/luamanager.hpp b/apps/openmw/mwbase/luamanager.hpp
index 8c0c5d61de..7fa8b6df58 100644
--- a/apps/openmw/mwbase/luamanager.hpp
+++ b/apps/openmw/mwbase/luamanager.hpp
@@ -36,6 +36,7 @@ namespace MWBase
         virtual void objectAddedToScene(const MWWorld::Ptr& ptr) = 0;
         virtual void objectRemovedFromScene(const MWWorld::Ptr& ptr) = 0;
         virtual void appliedToObject(const MWWorld::Ptr& toPtr, std::string_view recordId, const MWWorld::Ptr& fromPtr) = 0;
+        virtual void objectActivated(const MWWorld::Ptr& object, const MWWorld::Ptr& actor) = 0;
         // TODO: notify LuaManager about other events
         // virtual void objectOnHit(const MWWorld::Ptr &ptr, float damage, bool ishealth, const MWWorld::Ptr &object,
         //                          const MWWorld::Ptr &attacker, const osg::Vec3f &hitPosition, bool successful) = 0;
diff --git a/apps/openmw/mwlua/actions.cpp b/apps/openmw/mwlua/actions.cpp
index dda237fb4e..8135d14299 100644
--- a/apps/openmw/mwlua/actions.cpp
+++ b/apps/openmw/mwlua/actions.cpp
@@ -6,10 +6,13 @@
 #include <components/lua/luastate.hpp>
 #include <components/settings/settings.hpp>
 
-#include "../mwworld/cellstore.hpp"
-#include "../mwworld/class.hpp"
-#include "../mwworld/inventorystore.hpp"
-#include "../mwworld/player.hpp"
+#include <apps/openmw/mwbase/luamanager.hpp>
+
+#include <apps/openmw/mwworld/action.hpp>
+#include <apps/openmw/mwworld/cellstore.hpp>
+#include <apps/openmw/mwworld/class.hpp>
+#include <apps/openmw/mwworld/inventorystore.hpp>
+#include <apps/openmw/mwworld/player.hpp>
 
 namespace MWLua
 {
@@ -145,4 +148,24 @@ namespace MWLua
                 tryEquipToSlot(anySlot, item);
     }
 
+    void ActivateAction::apply(WorldView& worldView) const
+    {
+        MWWorld::Ptr object = worldView.getObjectRegistry()->getPtr(mObject, true);
+        if (object.isEmpty())
+            throw std::runtime_error(std::string("Object not found: " + idToString(mObject)));
+        MWWorld::Ptr actor = worldView.getObjectRegistry()->getPtr(mActor, true);
+        if (actor.isEmpty())
+            throw std::runtime_error(std::string("Actor not found: " + idToString(mActor)));
+
+        MWBase::Environment::get().getLuaManager()->objectActivated(object, actor);
+        std::shared_ptr<MWWorld::Action> action = object.getClass().activate(object, actor);
+        action->execute(actor);
+    }
+
+    std::string ActivateAction::toString() const
+    {
+        return std::string("ActivateAction object=") + idToString(mObject) +
+               std::string(" actor=") + idToString(mActor);
+    }
+
 }
diff --git a/apps/openmw/mwlua/actions.hpp b/apps/openmw/mwlua/actions.hpp
index e88b39e83c..97da953437 100644
--- a/apps/openmw/mwlua/actions.hpp
+++ b/apps/openmw/mwlua/actions.hpp
@@ -65,6 +65,20 @@ namespace MWLua
         Equipment mEquipment;
     };
 
+    class ActivateAction final : public Action
+    {
+    public:
+        ActivateAction(LuaUtil::LuaState* state, ObjectId object, ObjectId actor)
+            : Action(state), mObject(object), mActor(actor) {}
+
+        void apply(WorldView&) const override;
+        std::string toString() const override;
+
+    private:
+        ObjectId mObject;
+        ObjectId mActor;
+    };
+
 }
 
 #endif // MWLUA_ACTIONS_H
diff --git a/apps/openmw/mwlua/localscripts.cpp b/apps/openmw/mwlua/localscripts.cpp
index 918970dc54..2b492c5c17 100644
--- a/apps/openmw/mwlua/localscripts.cpp
+++ b/apps/openmw/mwlua/localscripts.cpp
@@ -88,7 +88,7 @@ namespace MWLua
         : LuaUtil::ScriptsContainer(lua, "L" + idToString(obj.id()), autoStartMode), mData(obj)
     {
         this->addPackage("openmw.self", sol::make_object(lua->sol(), &mData));
-        registerEngineHandlers({&mOnActiveHandlers, &mOnInactiveHandlers, &mOnConsumeHandlers});
+        registerEngineHandlers({&mOnActiveHandlers, &mOnInactiveHandlers, &mOnConsumeHandlers, &mOnActivatedHandlers});
     }
 
     void LocalScripts::receiveEngineEvent(const EngineEvent& event)
@@ -106,6 +106,10 @@ namespace MWLua
                 mData.mIsActive = false;
                 callEngineHandlers(mOnInactiveHandlers);
             }
+            else if constexpr (std::is_same_v<EventT, OnActivated>)
+            {
+                callEngineHandlers(mOnActivatedHandlers, arg.mActivatingActor);
+            }
             else
             {
                 static_assert(std::is_same_v<EventT, OnConsume>);
diff --git a/apps/openmw/mwlua/localscripts.hpp b/apps/openmw/mwlua/localscripts.hpp
index 68da0b8b03..10b9cd53af 100644
--- a/apps/openmw/mwlua/localscripts.hpp
+++ b/apps/openmw/mwlua/localscripts.hpp
@@ -33,11 +33,15 @@ namespace MWLua
 
         struct OnActive {};
         struct OnInactive {};
+        struct OnActivated
+        {
+           LObject mActivatingActor;
+        };
         struct OnConsume
         {
             std::string mRecordId;
         };
-        using EngineEvent = std::variant<OnActive, OnInactive, OnConsume>;
+        using EngineEvent = std::variant<OnActive, OnInactive, OnConsume, OnActivated>;
 
         void receiveEngineEvent(const EngineEvent&);
 
@@ -48,6 +52,7 @@ namespace MWLua
         EngineHandlerList mOnActiveHandlers{"onActive"};
         EngineHandlerList mOnInactiveHandlers{"onInactive"};
         EngineHandlerList mOnConsumeHandlers{"onConsume"};
+        EngineHandlerList mOnActivatedHandlers{"onActivated"};
     };
 
 }
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 58784a4629..e9146b8af4 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -352,6 +352,11 @@ namespace MWLua
         mLocalEngineEvents.push_back({getId(toPtr), LocalScripts::OnConsume{std::string(recordId)}});
     }
 
+    void LuaManager::objectActivated(const MWWorld::Ptr& object, const MWWorld::Ptr& actor)
+    {
+        mLocalEngineEvents.push_back({getId(object), LocalScripts::OnActivated{LObject(getId(actor), mWorldView.getObjectRegistry())}});
+    }
+
     MWBase::LuaManager::ActorControls* LuaManager::getActorControls(const MWWorld::Ptr& ptr) const
     {
         LocalScripts* localScripts = ptr.getRefData().getLuaScripts();
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index 753cc6ca49..b292eb3c1b 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -49,6 +49,7 @@ namespace MWLua
         void deregisterObject(const MWWorld::Ptr& ptr) override;
         void inputEvent(const InputEvent& event) override { mInputEvents.push_back(event); }
         void appliedToObject(const MWWorld::Ptr& toPtr, std::string_view recordId, const MWWorld::Ptr& fromPtr) override;
+        void objectActivated(const MWWorld::Ptr& object, const MWWorld::Ptr& actor) override;
 
         MWBase::LuaManager::ActorControls* getActorControls(const MWWorld::Ptr&) const override;
 
diff --git a/apps/openmw/mwlua/objectbindings.cpp b/apps/openmw/mwlua/objectbindings.cpp
index 9857170b32..9543e306c1 100644
--- a/apps/openmw/mwlua/objectbindings.cpp
+++ b/apps/openmw/mwlua/objectbindings.cpp
@@ -137,6 +137,14 @@ namespace MWLua
             const MWWorld::Class& cls = o.ptr().getClass();
             return cls.getWalkSpeed(o.ptr());
         };
+        objectT["activateBy"] = [context](const ObjectT& o, const ObjectT& actor)
+        {
+            uint32_t esmRecordType = actor.ptr().getType();
+            if (esmRecordType != ESM::REC_CREA && esmRecordType != ESM::REC_NPC_)
+                throw std::runtime_error("The argument of `activateBy` must be an actor who activates the object. Got: " +
+                                         ptrToString(actor.ptr()));
+            context.mLuaManager->addAction(std::make_unique<ActivateAction>(context.mLua, o.id(), actor.id()));
+        };
 
         if constexpr (std::is_same_v<ObjectT, GObject>)
         {  // Only for global scripts
diff --git a/apps/openmw/mwscript/interpretercontext.cpp b/apps/openmw/mwscript/interpretercontext.cpp
index 6d7dcdda1d..0b9833e097 100644
--- a/apps/openmw/mwscript/interpretercontext.cpp
+++ b/apps/openmw/mwscript/interpretercontext.cpp
@@ -12,6 +12,7 @@
 #include "../mwbase/scriptmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/inputmanager.hpp"
+#include "../mwbase/luamanager.hpp"
 
 #include "../mwworld/action.hpp"
 #include "../mwworld/class.hpp"
@@ -417,6 +418,7 @@ namespace MWScript
 
     void InterpreterContext::executeActivation(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor)
     {
+        MWBase::Environment::get().getLuaManager()->objectActivated(ptr, actor);
         std::shared_ptr<MWWorld::Action> action = (ptr.getClass().activate(ptr, actor));
         action->execute (actor);
         if (action->getTarget() != MWWorld::Ptr() && action->getTarget() != ptr)
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 1aebe94b87..706ce4859f 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -3827,7 +3827,8 @@ namespace MWWorld
 
         if (object.getRefData().activate())
         {
-            std::shared_ptr<MWWorld::Action> action = (object.getClass().activate(object, actor));
+            MWBase::Environment::get().getLuaManager()->objectActivated(object, actor);
+            std::shared_ptr<MWWorld::Action> action = object.getClass().activate(object, actor);
             action->execute (actor);
         }
     }
diff --git a/docs/source/reference/lua-scripting/engine_handlers.rst b/docs/source/reference/lua-scripting/engine_handlers.rst
index 46e648d620..d247803c08 100644
--- a/docs/source/reference/lua-scripting/engine_handlers.rst
+++ b/docs/source/reference/lua-scripting/engine_handlers.rst
@@ -43,6 +43,12 @@ Engine handler is a function defined by a script, that can be called by the engi
 |                                  | | can not access anything nearby, but it is possible to send         |
 |                                  | | an event to global scripts.                                        |
 +----------------------------------+----------------------------------------------------------------------+
+| onActivated(actor)               | | Called on an object when an actor activates it. Note that picking  |
+|                                  | | up an item is also an activation and works this way: (1) a copy of |
+|                                  | | the item is placed to the actor's inventory, (2) count of          |
+|                                  | | the original item is set to zero, (3) and only then onActivated is |
+|                                  | | called on the original item, so self.count is already zero.        |
++----------------------------------+----------------------------------------------------------------------+
 | onConsume(recordId)              | | Called if `recordId` (e.g. a potion) is consumed.                  |
 +----------------------------------+----------------------------------------------------------------------+
 | **Only for local scripts attached to a player**                                                         |
diff --git a/files/lua_api/openmw/core.lua b/files/lua_api/openmw/core.lua
index 8415690067..95732af837 100644
--- a/files/lua_api/openmw/core.lua
+++ b/files/lua_api/openmw/core.lua
@@ -217,6 +217,14 @@
 -- @param #string eventName
 -- @param eventData
 
+-------------------------------------------------------------------------------
+-- Activate the object.
+-- @function [parent=#GameObject] activateBy
+-- @param self
+-- @param #GameObject actor The actor who activates the object
+-- @usage local self = require('openmw.self')
+-- object:activateBy(self)
+
 -------------------------------------------------------------------------------
 -- Returns `true` if the item is equipped on the object.
 -- @function [parent=#GameObject] isEquipped

From aaea2bc0f6436ed5bdd82d37440383334967d556 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Tue, 1 Feb 2022 00:58:49 +0300
Subject: [PATCH 2044/2859] Implement transformBoundingSphere for both sphere
 types (bug #6579)

---
 CHANGELOG.md                  |  1 +
 components/sceneutil/util.cpp | 31 -------------------------------
 components/sceneutil/util.hpp | 32 +++++++++++++++++++++++++++++++-
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2baee6552..56d0910d22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -100,6 +100,7 @@
     Bug #6519: Effects tooltips for ingredients work incorrectly
     Bug #6523: Disintegrate Weapon is resisted by Resist Magicka instead of Sanctuary
     Bug #6544: Far from world origin objects jitter when camera is still
+    Bug #6579: OpenMW compilation error when using OSG doubles for BoundingSphere
     Feature #890: OpenMW-CS: Column filtering
     Feature #1465: "Reset" argument for AI functions
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
diff --git a/components/sceneutil/util.cpp b/components/sceneutil/util.cpp
index 33d8f1c8a6..b70a0e2481 100644
--- a/components/sceneutil/util.cpp
+++ b/components/sceneutil/util.cpp
@@ -188,37 +188,6 @@ private:
     osg::ref_ptr<osg::FrameBufferObject> mMsaaFbo;
 };
 
-void transformBoundingSphere (const osg::Matrixf& matrix, osg::BoundingSphere& bsphere)
-{
-    osg::BoundingSphere::vec_type xdash = bsphere._center;
-    xdash.x() += bsphere._radius;
-    xdash = xdash*matrix;
-
-    osg::BoundingSphere::vec_type ydash = bsphere._center;
-    ydash.y() += bsphere._radius;
-    ydash = ydash*matrix;
-
-    osg::BoundingSphere::vec_type zdash = bsphere._center;
-    zdash.z() += bsphere._radius;
-    zdash = zdash*matrix;
-
-    bsphere._center = bsphere._center*matrix;
-
-    xdash -= bsphere._center;
-    osg::BoundingSphere::value_type sqrlen_xdash = xdash.length2();
-
-    ydash -= bsphere._center;
-    osg::BoundingSphere::value_type sqrlen_ydash = ydash.length2();
-
-    zdash -= bsphere._center;
-    osg::BoundingSphere::value_type sqrlen_zdash = zdash.length2();
-
-    bsphere._radius = sqrlen_xdash;
-    if (bsphere._radius<sqrlen_ydash) bsphere._radius = sqrlen_ydash;
-    if (bsphere._radius<sqrlen_zdash) bsphere._radius = sqrlen_zdash;
-    bsphere._radius = sqrtf(bsphere._radius);
-}
-
 osg::Vec4f colourFromRGB(unsigned int clr)
 {
     osg::Vec4f colour(((clr >> 0) & 0xFF) / 255.0f,
diff --git a/components/sceneutil/util.hpp b/components/sceneutil/util.hpp
index 89d3a12e97..18bf8c7728 100644
--- a/components/sceneutil/util.hpp
+++ b/components/sceneutil/util.hpp
@@ -49,7 +49,37 @@ namespace SceneUtil
     // Transform a bounding sphere by a matrix
     // based off private code in osg::Transform
     // TODO: patch osg to make public
-    void transformBoundingSphere (const osg::Matrixf& matrix, osg::BoundingSphere& bsphere);
+    template<typename VT>
+    inline void transformBoundingSphere (const osg::Matrixf& matrix, osg::BoundingSphereImpl<VT>& bsphere)
+    {
+        VT xdash = bsphere._center;
+        xdash.x() += bsphere._radius;
+        xdash = xdash*matrix;
+
+        VT ydash = bsphere._center;
+        ydash.y() += bsphere._radius;
+        ydash = ydash*matrix;
+
+        VT zdash = bsphere._center;
+        zdash.z() += bsphere._radius;
+        zdash = zdash*matrix;
+
+        bsphere._center = bsphere._center*matrix;
+
+        xdash -= bsphere._center;
+        typename VT::value_type sqrlen_xdash = xdash.length2();
+
+        ydash -= bsphere._center;
+        typename VT::value_type sqrlen_ydash = ydash.length2();
+
+        zdash -= bsphere._center;
+        typename VT::value_type sqrlen_zdash = zdash.length2();
+
+        bsphere._radius = sqrlen_xdash;
+        if (bsphere._radius<sqrlen_ydash) bsphere._radius = sqrlen_ydash;
+        if (bsphere._radius<sqrlen_zdash) bsphere._radius = sqrlen_zdash;
+        bsphere._radius = sqrtf(bsphere._radius);
+    }
 
     osg::Vec4f colourFromRGB (unsigned int clr);
 

From 142b6fdf2f59e999d593cec1971ae7b7b68dfe11 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Wed, 2 Feb 2022 16:57:59 +0300
Subject: [PATCH 2045/2859] Fix double precision bound issues in
 std::max/std::clamp

---
 apps/openmw/mwrender/localmap.cpp     | 6 ++++--
 components/sceneutil/lightmanager.cpp | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index 9a645312d5..66d41a47e4 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -460,8 +460,10 @@ void LocalMap::requestInteriorMap(const MWWorld::CellStore* cell)
                 yOffset++;
                 mBounds.yMin() = fog->mBounds.mMinY - yOffset * mMapWorldSize;
             }
-            mBounds.xMax() = std::max(mBounds.xMax(), fog->mBounds.mMaxX);
-            mBounds.yMax() = std::max(mBounds.yMax(), fog->mBounds.mMaxY);
+            if (fog->mBounds.mMaxX > mBounds.xMax())
+                mBounds.xMax() = fog->mBounds.mMaxX;
+            if (fog->mBounds.mMaxY > mBounds.yMax())
+                mBounds.yMax() = fog->mBounds.mMaxY;
 
             if(xOffset != 0 || yOffset != 0)
                 Log(Debug::Warning) << "Warning: expanding fog by " << xOffset << ", " << yOffset;
diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 29907c542d..45738bcad8 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -1109,7 +1109,8 @@ namespace SceneUtil
                 if (transform.mLightSource->getLastAppliedFrame() != frameNum && mPointLightFadeEnd != 0.f)
                 {
                     const float fadeDelta = mPointLightFadeEnd - mPointLightFadeStart;
-                    float fade = 1 - std::clamp((viewBound.center().length() - mPointLightFadeStart) / fadeDelta, 0.f, 1.f);
+                    const float viewDelta = viewBound.center().length() - mPointLightFadeStart;
+                    float fade = 1 - std::clamp(viewDelta / fadeDelta, 0.f, 1.f);
                     if (fade == 0.f)
                         continue;
 

From 946b8b804cca2a004a80b5391102c436b914bef7 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Wed, 2 Feb 2022 15:27:48 +0100
Subject: [PATCH 2046/2859] MR feedback

---
 apps/openmw/mwgui/settingswindow.cpp | 51 +++++++++++++++-------------
 apps/openmw/mwlua/uibindings.cpp     |  5 +--
 files/lua_api/openmw/ui.lua          |  4 +--
 3 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index 80a034fd2a..e79132f0ab 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -712,10 +712,10 @@ namespace MWGui
 
     void SettingsWindow::resizeScriptSettings()
     {
-        static const int minListWidth = 150;
-        static const float relativeListWidth = 0.2f;
-        static const int padding = 2;
-        static const int outerPadding = padding * 2;
+        constexpr int minListWidth = 150;
+        constexpr float relativeListWidth = 0.2f;
+        constexpr int padding = 2;
+        constexpr int outerPadding = padding * 2;
         MyGUI::IntSize parentSize = mScriptFilter->getParent()->getClientCoord().size();
         int listWidth = std::max(minListWidth, static_cast<int>(parentSize.width * relativeListWidth));
         int filterHeight = mScriptFilter->getSize().height;
@@ -732,13 +732,13 @@ namespace MWGui
     {
         std::string escapeRegex(const std::string& str)
         {
-            static std::regex specialChars(R"r([\^\.\[\$\(\)\|\*\+\?\{])r", std::regex_constants::extended);
+            static const std::regex specialChars(R"r([\^\.\[\$\(\)\|\*\+\?\{])r", std::regex_constants::extended);
             return std::regex_replace(str, specialChars, R"(\$&)");
         }
 
         std::regex wordSearch(const std::string& query)
         {
-            static std::regex wordsRegex(R"([^[:space:]]+)", std::regex_constants::extended);
+            static const std::regex wordsRegex(R"([^[:space:]]+)", std::regex_constants::extended);
             auto wordsBegin = std::sregex_iterator(query.begin(), query.end(), wordsRegex);
             auto wordsEnd = std::sregex_iterator();
             std::string searchRegex("(");
@@ -752,16 +752,15 @@ namespace MWGui
             // query had only whitespace characters
             if (searchRegex == "()")
                 searchRegex = "^(.*)$";
-            static auto flags = std::regex_constants::icase | std::regex_constants::extended;
-            return std::regex(searchRegex, flags);
+            return std::regex(searchRegex, std::regex_constants::extended | std::regex_constants::icase);
         }
 
-        // use double to guarantee no overflow when casting from size_t
         double weightedSearch(const std::regex& regex, const std::string& text)
         {
             std::smatch matches;
             std::regex_search(text, matches, regex);
-            return matches.size();
+            // need a signed value, so cast to double (not an integer type to guarantee no overflow)
+            return static_cast<double>(matches.size());
         }
     }
          
@@ -772,25 +771,31 @@ namespace MWGui
         mScriptList->removeAllItems();
         mScriptView->setCanvasSize({0, 0});
 
+        struct WeightedPage {
+            size_t mIndex;
+            std::string mName;
+            double mNameWeight;
+            double mHintWeight;
+
+            constexpr auto tie() const { return std::tie(mNameWeight, mHintWeight, mName); }
+
+            constexpr bool operator<(const WeightedPage& rhs) const { return tie() < rhs.tie(); }
+        };
+
         std::regex searchRegex = wordSearch(mScriptFilter->getCaption());
-        std::vector<std::tuple<size_t, LuaUi::ScriptSettingsPage, double, double>> weightedPages;
+        std::vector<WeightedPage> weightedPages;
         weightedPages.reserve(LuaUi::scriptSettingsPageCount());
         for (size_t i = 0; i < LuaUi::scriptSettingsPageCount(); ++i)
         {
             LuaUi::ScriptSettingsPage page = LuaUi::scriptSettingsPageAt(i);
-            double nameSearch = 2 * weightedSearch(searchRegex, page.mName);
-            double hintSearch = weightedSearch(searchRegex, page.mSearchHints);
-            if ((nameSearch + hintSearch) > 0)
-                weightedPages.push_back({ i, page, -nameSearch, -hintSearch });
+            double nameWeight = weightedSearch(searchRegex, page.mName);
+            double hintWeight = weightedSearch(searchRegex, page.mSearchHints);
+            if ((nameWeight + hintWeight) > 0)
+                weightedPages.push_back({ i, page.mName, -nameWeight, -hintWeight });
         }
-        std::sort(weightedPages.begin(), weightedPages.end(), [](const auto& a, const auto& b)
-        {
-            const auto& [iA, pageA, nameA, hintA] = a;
-            const auto& [iB, pageB, nameB, hintB] = b;
-            return std::tie(nameA, hintA, pageA.mName) < std::tie(nameB, hintB, pageB.mName);
-        });
-        for (const auto & [i, page, name, hint] : weightedPages)
-            mScriptList->addItem(page.mName, i);
+        std::sort(weightedPages.begin(), weightedPages.end());
+        for (const WeightedPage& weightedPage : weightedPages)
+            mScriptList->addItem(weightedPage.mName, weightedPage.mIndex);
 
         // Hide script settings tab when the game world isn't loaded and scripts couldn't add their settings
         bool disabled = LuaUi::scriptSettingsPageCount() == 0;
diff --git a/apps/openmw/mwlua/uibindings.cpp b/apps/openmw/mwlua/uibindings.cpp
index 073ecc7822..6f1d34072a 100644
--- a/apps/openmw/mwlua/uibindings.cpp
+++ b/apps/openmw/mwlua/uibindings.cpp
@@ -239,10 +239,7 @@ namespace MWLua
             typeTable.set(it.second, it.first);
         api["TYPE"] = LuaUtil::makeReadOnly(typeTable);
 
-        api["registerSettingsPage"] = [](sol::table options)
-        {
-            LuaUi::registerSettingsPage(options);
-        };
+        api["registerSettingsPage"] = &LuaUi::registerSettingsPage;
 
         return LuaUtil::makeReadOnly(api);
     }
diff --git a/files/lua_api/openmw/ui.lua b/files/lua_api/openmw/ui.lua
index 997c39780e..8049df860a 100644
--- a/files/lua_api/openmw/ui.lua
+++ b/files/lua_api/openmw/ui.lua
@@ -38,7 +38,7 @@
 
 ---
 -- Adds a settings page to main menu setting's Scripts tab.
--- @function [parent=#ui] regregisterSettingsPageister
+-- @function [parent=#ui] registerSettingsPage
 -- @param #SettingsPage page
 
 ---
@@ -143,7 +143,7 @@
 -- @field #number button Mouse button which triggered the event (could be nil)
 
 ---
--- Settings page parameters, passed as an argument to uyi.registerSettingsPage
+-- Settings page parameters, passed as an argument to ui.registerSettingsPage
 -- @type SettingsPage
 -- @field #string name Name of the page, displayed in the list, used for search
 -- @field #string searchHints Additional keywords used in search, not displayed anywhere

From 2945f6238e922a0a110c8226cee4f83c6a24f83c Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Wed, 2 Feb 2022 20:30:28 +0000
Subject: [PATCH 2047/2859] Fix util.color docs

---
 files/lua_api/openmw/util.lua | 90 ++++++++++++++++++-----------------
 1 file changed, 47 insertions(+), 43 deletions(-)

diff --git a/files/lua_api/openmw/util.lua b/files/lua_api/openmw/util.lua
index ea7d037daa..dca1683d45 100644
--- a/files/lua_api/openmw/util.lua
+++ b/files/lua_api/openmw/util.lua
@@ -1,11 +1,11 @@
--------------------------------------------------------------------------------
+---
 -- `openmw.util` defines utility functions and classes like 3D vectors, that don't depend on the game world.
 -- @module util
 -- @usage local util = require('openmw.util')
 
 
 
--------------------------------------------------------------------------------
+---
 -- Limits given value to the interval [`from`, `to`].
 -- @function [parent=#util] clamp
 -- @param #number value
@@ -13,20 +13,20 @@
 -- @param #number to
 -- @return #number min(max(value, from), to)
 
--------------------------------------------------------------------------------
+---
 -- Adds `2pi*k` and puts the angle in range `[-pi, pi]`.
 -- @function [parent=#util] normalizeAngle
 -- @param #number angle Angle in radians
 -- @return #number Angle in range `[-pi, pi]`
 
--------------------------------------------------------------------------------
+---
 -- Makes a table read only.
 -- @function [parent=#util] makeReadOnly
 -- @param #table table Any table.
 -- @return #table The same table wrapped with read only userdata.
 
 
--------------------------------------------------------------------------------
+---
 -- Immutable 2D vector
 -- @type Vector2
 -- @field #number x
@@ -46,26 +46,26 @@
 -- v1 * x         -- multiplication by a number
 -- v1 / x         -- division by a number
 
--------------------------------------------------------------------------------
+---
 -- Creates a new 2D vector. Vectors are immutable and can not be changed after creation.
 -- @function [parent=#util] vector2
 -- @param #number x.
 -- @param #number y.
 -- @return #Vector2.
 
--------------------------------------------------------------------------------
+---
 -- Length of the vector.
 -- @function [parent=#Vector2] length
 -- @param self
 -- @return #number
 
--------------------------------------------------------------------------------
+---
 -- Square of the length of the vector.
 -- @function [parent=#Vector2] length2
 -- @param self
 -- @return #number
 
--------------------------------------------------------------------------------
+---
 -- Normalizes vector.
 -- Returns two values: normalized vector and the length of the original vector.
 -- It doesn't change the original vector. 
@@ -73,14 +73,14 @@
 -- @param self
 -- @return #Vector2, #number
 
--------------------------------------------------------------------------------
+---
 -- Rotates 2D vector clockwise.
 -- @function [parent=#Vector2] rotate
 -- @param self
 -- @param #number angle Angle in radians
 -- @return #Vector2 Rotated vector.
 
--------------------------------------------------------------------------------
+---
 -- Dot product.
 -- @function [parent=#Vector2] dot
 -- @param self
@@ -88,7 +88,7 @@
 -- @return #number
 
 
--------------------------------------------------------------------------------
+---
 -- Immutable 3D vector
 -- @type Vector3
 -- @field #number x
@@ -110,7 +110,7 @@
 -- v1 * x         -- multiplication by a number
 -- v1 / x         -- division by a number
 
--------------------------------------------------------------------------------
+---
 -- Creates a new 3D vector. Vectors are immutable and can not be changed after creation.
 -- @function [parent=#util] vector3
 -- @param #number x.
@@ -118,19 +118,19 @@
 -- @param #number z.
 -- @return #Vector3.
 
--------------------------------------------------------------------------------
+---
 -- Length of the vector
 -- @function [parent=#Vector3] length
 -- @param self
 -- @return #number
 
--------------------------------------------------------------------------------
+---
 -- Square of the length of the vector
 -- @function [parent=#Vector3] length2
 -- @param self
 -- @return #number
 
--------------------------------------------------------------------------------
+---
 -- Normalizes vector.
 -- Returns two values: normalized vector and the length of the original vector.
 -- It doesn't change the original vector.
@@ -138,14 +138,14 @@
 -- @param self
 -- @return #Vector3, #number
 
--------------------------------------------------------------------------------
+---
 -- Dot product.
 -- @function [parent=#Vector3] dot
 -- @param self
 -- @param #Vector3 v
 -- @return #number
 
--------------------------------------------------------------------------------
+---
 -- Cross product.
 -- @function [parent=#Vector3] cross
 -- @param self
@@ -153,7 +153,7 @@
 -- @return #Vector3
 
 
--------------------------------------------------------------------------------
+---
 -- Immutable 4D vector.
 -- @type Vector4
 -- @field #number x
@@ -174,7 +174,7 @@
 -- v1 * x         -- multiplication by a number
 -- v1 / x         -- division by a number
 
--------------------------------------------------------------------------------
+---
 -- Creates a new 4D vector. Vectors are immutable and can not be changed after creation.
 -- @function [parent=#util] vector4
 -- @param #number x.
@@ -183,19 +183,19 @@
 -- @param #number w.
 -- @return #Vector4.
 
--------------------------------------------------------------------------------
+---
 -- Length of the vector
 -- @function [parent=#Vector4] length
 -- @param self
 -- @return #number
 
--------------------------------------------------------------------------------
+---
 -- Square of the length of the vector
 -- @function [parent=#Vector4] length2
 -- @param self
 -- @return #number
 
--------------------------------------------------------------------------------
+---
 -- Normalizes vector.
 -- Returns two values: normalized vector and the length of the original vector.
 -- It doesn't change the original vector.
@@ -203,14 +203,14 @@
 -- @param self
 -- @return #Vector4, #number
 
--------------------------------------------------------------------------------
+---
 -- Dot product.
 -- @function [parent=#Vector4] dot
 -- @param self
 -- @param #Vector4 v
 -- @return #number
 
--------------------------------------------------------------------------------
+---
 -- Color in RGBA format. All of the component values are in the range [0, 1].
 -- @type Color
 -- @field #number r Red component
@@ -218,29 +218,33 @@
 -- @field #number b Blue component
 -- @field #number a Alpha (transparency) component
 
--------------------------------------------------------------------------------
+---
 -- Returns a Vector4 with RGBA components of the Color.
 -- @function [parent=#Color] asRgba
 -- @param self
 -- @return #Vector4
 
--------------------------------------------------------------------------------
+---
 -- Returns a Vector3 with RGB components of the Color.
 -- @function [parent=#Color] asRgb
 -- @param self
 -- @return #Vector3
 
--------------------------------------------------------------------------------
+---
 -- Converts the color into a HEX string.
 -- @function [parent=#Color] asHex
 -- @param self
 -- @return #string
 
--------------------------------------------------------------------------------
+---
+-- Methods for creating #Color values from different formats.
 -- @type COLOR
--- @field [parent=#util] #COLOR color Methods for creating #Color values from different formats.
 
--------------------------------------------------------------------------------
+---
+-- Methods for creating #Color values from different formats.
+-- @field [parent=#util] #COLOR color
+
+---
 -- Creates a Color from RGBA format
 -- @function [parent=#COLOR] rgba
 -- @param #number r
@@ -249,7 +253,7 @@
 -- @param #number a
 -- @return #Color
 
--------------------------------------------------------------------------------
+---
 -- Creates a Color from RGB format. Equivalent to calling util.rgba with a = 1.
 -- @function [parent=#COLOR] rgb
 -- @param #number r
@@ -257,26 +261,26 @@
 -- @param #number b
 -- @return #Color
 
--------------------------------------------------------------------------------
+---
 -- Parses a hex color string into a Color.
 -- @function [parent=#COLOR] hex
 -- @param #string hex A hex color string in RRGGBB format (e. g. "ff0000").
 -- @return #Color
 
--------------------------------------------------------------------------------
+---
 -- @type Transform
 
--------------------------------------------------------------------------------
+---
 -- Returns the inverse transform.
 -- @function [parent=#Transform] inverse
 -- @param self
 -- @return #Transform.
 
--------------------------------------------------------------------------------
+---
 -- @type TRANSFORM
 -- @field [parent=#TRANSFORM] #Transform identity Empty transform.
 
--------------------------------------------------------------------------------
+---
 -- Movement by given vector.
 -- @function [parent=#TRANSFORM] move
 -- @param #Vector3 offset.
@@ -286,7 +290,7 @@
 -- util.transform.move(x, y, z)
 -- util.transform.move(util.vector3(x, y, z))
 
--------------------------------------------------------------------------------
+---
 -- Scale transform.
 -- @function [parent=#TRANSFORM] scale
 -- @param #number scaleX.
@@ -299,32 +303,32 @@
 -- util.transform.scale(util.vector3(x, y, z))
 
 
--------------------------------------------------------------------------------
+---
 -- Rotation around a vector (counterclockwise if the vector points to us).
 -- @function [parent=#TRANSFORM] rotate
 -- @param #number angle
 -- @param #Vector3 axis.
 -- @return #Transform.
 
--------------------------------------------------------------------------------
+---
 -- X-axis rotation (equivalent to `rotate(angle, vector3(-1, 0, 0))`).
 -- @function [parent=#TRANSFORM] rotateX
 -- @param #number angle
 -- @return #Transform.
 
--------------------------------------------------------------------------------
+---
 -- Y-axis rotation (equivalent to `rotate(angle, vector3(0, -1, 0))`).
 -- @function [parent=#TRANSFORM] rotateY
 -- @param #number angle
 -- @return #Transform.
 
--------------------------------------------------------------------------------
+---
 -- Z-axis rotation (equivalent to `rotate(angle, vector3(0, 0, -1))`).
 -- @function [parent=#TRANSFORM] rotateZ
 -- @param #number angle
 -- @return #Transform.
 
--------------------------------------------------------------------------------
+---
 -- 3D transforms (scale/move/rotate) that can be applied to 3D vectors.
 -- Several transforms can be combined and applied to a vector using multiplication.
 -- Combined transforms apply in reverse order (from right to left).

From dd5ba5c57b88a1000a1cd8f781e84d2a3b33f8f5 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Thu, 13 Jan 2022 00:20:16 +0100
Subject: [PATCH 2048/2859] Redirect log only after parsing configuration

---
 apps/opencs/editor.cpp         |  2 +
 apps/opencs/main.cpp           |  2 +-
 apps/openmw/main.cpp           |  4 +-
 components/debug/debugging.cpp | 80 ++++++++++++++++++----------------
 components/debug/debugging.hpp |  7 ++-
 5 files changed, 54 insertions(+), 41 deletions(-)

diff --git a/apps/opencs/editor.cpp b/apps/opencs/editor.cpp
index 862d1c545f..7d5230f894 100644
--- a/apps/opencs/editor.cpp
+++ b/apps/opencs/editor.cpp
@@ -5,6 +5,7 @@
 #include <QLocalSocket>
 #include <QMessageBox>
 
+#include <components/debug/debugging.hpp>
 #include <components/debug/debuglog.hpp>
 #include <components/fallback/validate.hpp>
 #include <components/misc/rng.hpp>
@@ -105,6 +106,7 @@ std::pair<Files::PathContainer, std::vector<std::string> > CS::Editor::readConfi
     boost::program_options::notify(variables);
 
     mCfgMgr.readConfiguration(variables, desc, false);
+    setupLogging(mCfgMgr.getLogPath().string(), "OpenMW-CS");
 
     Fallback::Map::init(variables["fallback"].as<FallbackMap>().mMap);
 
diff --git a/apps/opencs/main.cpp b/apps/opencs/main.cpp
index c7d57a256e..1e6e718983 100644
--- a/apps/opencs/main.cpp
+++ b/apps/opencs/main.cpp
@@ -79,5 +79,5 @@ int runApplication(int argc, char *argv[])
 
 int main(int argc, char *argv[])
 {
-    return wrapApplication(&runApplication, argc, argv, "OpenMW-CS");
+    return wrapApplication(&runApplication, argc, argv, "OpenMW-CS", false);
 }
diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index d5bed4ba25..6b92fa78f5 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -65,6 +65,8 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     cfgMgr.readConfiguration(variables, desc);
     Files::mergeComposingVariables(variables, composingVariables, desc);
 
+    setupLogging(cfgMgr.getLogPath().string(), "OpenMW");
+
     Version::Version v = Version::getOpenmwVersion(variables["resources"].as<Files::MaybeQuotedPath>().string());
     Log(Debug::Info) << v.describe();
 
@@ -230,7 +232,7 @@ extern "C" int SDL_main(int argc, char**argv)
 int main(int argc, char**argv)
 #endif
 {
-    return wrapApplication(&runApplication, argc, argv, "OpenMW");
+    return wrapApplication(&runApplication, argc, argv, "OpenMW", false);
 }
 
 // Platform specific for Windows when there is no console built into the executable.
diff --git a/components/debug/debugging.cpp b/components/debug/debugging.cpp
index 0e372942f2..c84bb39d3d 100644
--- a/components/debug/debugging.cpp
+++ b/components/debug/debugging.cpp
@@ -137,61 +137,65 @@ namespace Debug
 }
 
 static std::unique_ptr<std::ostream> rawStdout = nullptr;
+static std::unique_ptr<std::ostream> rawStderr = nullptr;
+static boost::filesystem::ofstream logfile;
+
+#if defined(_WIN32) && defined(_DEBUG)
+static boost::iostreams::stream_buffer<Debug::DebugOutput> sb;
+#else
+static boost::iostreams::stream_buffer<Debug::Tee> coutsb;
+static boost::iostreams::stream_buffer<Debug::Tee> cerrsb;
+#endif
 
 std::ostream& getRawStdout()
 {
     return rawStdout ? *rawStdout : std::cout;
 }
 
-int wrapApplication(int (*innerApplication)(int argc, char *argv[]), int argc, char *argv[], const std::string& appName)
+// Redirect cout and cerr to the log file
+void setupLogging(const std::string& logDir, const std::string& appName, std::ios_base::openmode mode)
 {
-#if defined _WIN32
-    (void)Debug::attachParentConsole();
-#endif
-    rawStdout = std::make_unique<std::ostream>(std::cout.rdbuf());
-
-    // Some objects used to redirect cout and cerr
-    // Scope must be here, so this still works inside the catch block for logging exceptions
-    std::streambuf* cout_rdbuf = std::cout.rdbuf ();
-    std::streambuf* cerr_rdbuf = std::cerr.rdbuf ();
-
 #if defined(_WIN32) && defined(_DEBUG)
-    boost::iostreams::stream_buffer<Debug::DebugOutput> sb;
+    // Redirect cout and cerr to VS debug output when running in debug mode
+    sb.open(Debug::DebugOutput());
+    std::cout.rdbuf(&sb);
+    std::cerr.rdbuf(&sb);
 #else
-    boost::iostreams::stream_buffer<Debug::Tee> coutsb;
-    boost::iostreams::stream_buffer<Debug::Tee> cerrsb;
-    std::ostream oldcout(cout_rdbuf);
-    std::ostream oldcerr(cerr_rdbuf);
+    const std::string logName = Misc::StringUtils::lowerCase(appName) + ".log";
+    logfile.open(boost::filesystem::path(logDir) / logName, mode);
+
+    coutsb.open(Debug::Tee(logfile, *rawStdout));
+    cerrsb.open(Debug::Tee(logfile, *rawStderr));
+
+    std::cout.rdbuf(&coutsb);
+    std::cerr.rdbuf(&cerrsb);
 #endif
+}
 
-    const std::string logName = Misc::StringUtils::lowerCase(appName) + ".log";
-    boost::filesystem::ofstream logfile;
+int wrapApplication(int (*innerApplication)(int argc, char *argv[]), int argc, char *argv[],
+                    const std::string& appName, bool autoSetupLogging)
+{
+#if defined _WIN32
+    (void)Debug::attachParentConsole();
+#endif
+    rawStdout = std::make_unique<std::ostream>(std::cout.rdbuf());
+    rawStderr = std::make_unique<std::ostream>(std::cerr.rdbuf());
 
     int ret = 0;
     try
     {
         Files::ConfigurationManager cfgMgr;
 
-#if defined(_WIN32) && defined(_DEBUG)
-        // Redirect cout and cerr to VS debug output when running in debug mode
-        sb.open(Debug::DebugOutput());
-        std::cout.rdbuf (&sb);
-        std::cerr.rdbuf (&sb);
-#else
-        // Redirect cout and cerr to the log file
-        // If we are collecting a stack trace, append to existing log file
-        std::ios_base::openmode mode = std::ios::out;
-        if(argc == 2 && strcmp(argv[1], crash_switch) == 0)
-            mode |= std::ios::app;
-
-        logfile.open (boost::filesystem::path(cfgMgr.getLogPath() / logName), mode);
+        if (autoSetupLogging)
+        {
+            std::ios_base::openmode mode = std::ios::out;
 
-        coutsb.open (Debug::Tee(logfile, oldcout));
-        cerrsb.open (Debug::Tee(logfile, oldcerr));
+            // If we are collecting a stack trace, append to existing log file
+            if (argc == 2 && strcmp(argv[1], crash_switch) == 0)
+                mode |= std::ios::app;
 
-        std::cout.rdbuf (&coutsb);
-        std::cerr.rdbuf (&cerrsb);
-#endif
+            setupLogging(cfgMgr.getLogPath().string(), appName, mode);
+        }
 
 #if defined(_WIN32)
         const std::string crashLogName = Misc::StringUtils::lowerCase(appName) + "-crash.dmp";
@@ -217,8 +221,8 @@ int wrapApplication(int (*innerApplication)(int argc, char *argv[]), int argc, c
     }
 
     // Restore cout and cerr
-    std::cout.rdbuf(cout_rdbuf);
-    std::cerr.rdbuf(cerr_rdbuf);
+    std::cout.rdbuf(rawStdout->rdbuf());
+    std::cerr.rdbuf(rawStderr->rdbuf());
     Debug::CurrentDebugLevel = Debug::NoLevel;
 
     return ret;
diff --git a/components/debug/debugging.hpp b/components/debug/debugging.hpp
index d8849cd896..a2c5ae9e6c 100644
--- a/components/debug/debugging.hpp
+++ b/components/debug/debugging.hpp
@@ -133,11 +133,16 @@ namespace Debug
         std::map<Level, int> mColors;
     };
 #endif
+
+
 }
 
 // Can be used to print messages without timestamps
 std::ostream& getRawStdout();
 
-int wrapApplication(int (*innerApplication)(int argc, char *argv[]), int argc, char *argv[], const std::string& appName);
+void setupLogging(const std::string& logDir, const std::string& appName, std::ios_base::openmode = std::ios::out);
+
+int wrapApplication(int (*innerApplication)(int argc, char *argv[]), int argc, char *argv[],
+                    const std::string& appName, bool autoSetupLogging = true);
 
 #endif

From 5ca56a4f8ad12fa0f67fa8cb468540b0034717b9 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Thu, 13 Jan 2022 23:10:09 +0100
Subject: [PATCH 2049/2859] New option "config" for specifying additional
 config directories.

---
 apps/essimporter/main.cpp                     |   1 +
 apps/navmeshtool/main.cpp                     |   1 +
 apps/opencs/editor.cpp                        |   1 +
 apps/openmw/main.cpp                          |   3 +-
 apps/openmw_test_suite/mwworld/test_store.cpp |   1 +
 components/files/configurationmanager.cpp     | 127 +++++++++++++-----
 components/files/configurationmanager.hpp     |  18 ++-
 files/openmw.cfg                              |   1 +
 files/openmw.cfg.local                        |   1 +
 9 files changed, 112 insertions(+), 42 deletions(-)

diff --git a/apps/essimporter/main.cpp b/apps/essimporter/main.cpp
index e81368c607..bc5d34bc03 100644
--- a/apps/essimporter/main.cpp
+++ b/apps/essimporter/main.cpp
@@ -25,6 +25,7 @@ int main(int argc, char** argv)
             ("encoding", boost::program_options::value<std::string>()->default_value("win1252"), "encoding of the save file")
         ;
         p_desc.add("mwsave", 1).add("output", 1);
+        Files::ConfigurationManager::addCommonOptions(desc);
 
         bpo::variables_map variables;
 
diff --git a/apps/navmeshtool/main.cpp b/apps/navmeshtool/main.cpp
index 8e46170e63..ce3cb10b20 100644
--- a/apps/navmeshtool/main.cpp
+++ b/apps/navmeshtool/main.cpp
@@ -84,6 +84,7 @@ namespace NavMeshTool
                 ("process-interior-cells", bpo::value<bool>()->implicit_value(true)
                     ->default_value(false), "build navmesh for interior cells")
             ;
+            Files::ConfigurationManager::addCommonOptions(result);
 
             return result;
         }
diff --git a/apps/opencs/editor.cpp b/apps/opencs/editor.cpp
index 7d5230f894..3db201874a 100644
--- a/apps/opencs/editor.cpp
+++ b/apps/opencs/editor.cpp
@@ -102,6 +102,7 @@ std::pair<Files::PathContainer, std::vector<std::string> > CS::Editor::readConfi
         ->multitoken(), "exclude specified script from the verifier (if the use of the blacklist is enabled)")
     ("script-blacklist-use", boost::program_options::value<bool>()->implicit_value(true)
         ->default_value(true), "enable script blacklisting");
+    Files::ConfigurationManager::addCommonOptions(desc);
 
     boost::program_options::notify(variables);
 
diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index 6b92fa78f5..456fe23b60 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -40,6 +40,7 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     typedef std::vector<std::string> StringsVector;
 
     bpo::options_description desc = OpenMW::makeOptionsDescription();
+    Files::ConfigurationManager::addCommonOptions(desc);
 
     bpo::variables_map variables;
 
@@ -61,9 +62,7 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
         return false;
     }
 
-    bpo::variables_map composingVariables = Files::separateComposingVariables(variables, desc);
     cfgMgr.readConfiguration(variables, desc);
-    Files::mergeComposingVariables(variables, composingVariables, desc);
 
     setupLogging(cfgMgr.getLogPath().string(), "OpenMW");
 
diff --git a/apps/openmw_test_suite/mwworld/test_store.cpp b/apps/openmw_test_suite/mwworld/test_store.cpp
index 10003cfdfd..bf1a40f7d9 100644
--- a/apps/openmw_test_suite/mwworld/test_store.cpp
+++ b/apps/openmw_test_suite/mwworld/test_store.cpp
@@ -58,6 +58,7 @@ struct ContentFileTest : public ::testing::Test
         ("content", boost::program_options::value<std::vector<std::string>>()->default_value(std::vector<std::string>(), "")
             ->multitoken()->composing(), "content file(s): esm/esp, or omwgame/omwaddon")
         ("data-local", boost::program_options::value<Files::MaybeQuotedPathContainer::value_type>()->default_value(Files::MaybeQuotedPathContainer::value_type(), ""));
+        Files::ConfigurationManager::addCommonOptions(desc);
 
         boost::program_options::notify(variables);
 
diff --git a/components/files/configurationmanager.cpp b/components/files/configurationmanager.cpp
index c2cd44960f..739c7f7b43 100644
--- a/components/files/configurationmanager.cpp
+++ b/components/files/configurationmanager.cpp
@@ -20,6 +20,7 @@ static const char* const applicationName = "openmw";
 #endif
 
 const char* const localToken = "?local?";
+const char* const userConfigToken = "?userconfig?";
 const char* const userDataToken = "?userdata?";
 const char* const globalToken = "?global?";
 
@@ -50,6 +51,7 @@ ConfigurationManager::~ConfigurationManager()
 void ConfigurationManager::setupTokensMapping()
 {
     mTokensMapping.insert(std::make_pair(localToken, &FixedPath<>::getLocalPath));
+    mTokensMapping.insert(std::make_pair(userConfigToken, &FixedPath<>::getUserConfigPath));
     mTokensMapping.insert(std::make_pair(userDataToken, &FixedPath<>::getUserDataPath));
     mTokensMapping.insert(std::make_pair(globalToken, &FixedPath<>::getGlobalDataPath));
 }
@@ -57,31 +59,92 @@ void ConfigurationManager::setupTokensMapping()
 void ConfigurationManager::readConfiguration(boost::program_options::variables_map& variables,
     boost::program_options::options_description& description, bool quiet)
 {
+    using ParsedConfigFile = bpo::basic_parsed_options<char>;
     bool silent = mSilent;
     mSilent = quiet;
-    
-    // User config has the highest priority.
-    auto composingVariables = separateComposingVariables(variables, description);
-    loadConfig(mFixedPath.getUserConfigPath(), variables, description);
-    mergeComposingVariables(variables, composingVariables, description);
-    boost::program_options::notify(variables);
 
-    // read either local or global config depending on type of installation
-    composingVariables = separateComposingVariables(variables, description);
-    bool loaded = loadConfig(mFixedPath.getLocalPath(), variables, description);
-    mergeComposingVariables(variables, composingVariables, description);
-    boost::program_options::notify(variables);
-    if (!loaded)
+    std::optional<ParsedConfigFile> config = loadConfig(mFixedPath.getLocalPath(), description);
+    if (config)
+        mActiveConfigPaths.push_back(mFixedPath.getLocalPath());
+    else
+    {
+        mActiveConfigPaths.push_back(mFixedPath.getGlobalConfigPath());
+        config = loadConfig(mFixedPath.getGlobalConfigPath(), description);
+    }
+    if (!config)
     {
-        composingVariables = separateComposingVariables(variables, description);
-        loadConfig(mFixedPath.getGlobalConfigPath(), variables, description);
+        if (!quiet)
+            Log(Debug::Error) << "Neither local config nor global config are available.";
+        mSilent = silent;
+        return;
+    }
+
+    std::stack<boost::filesystem::path> extraConfigDirs;
+    addExtraConfigDirs(extraConfigDirs, variables);
+    addExtraConfigDirs(extraConfigDirs, *config);
+
+    std::vector<ParsedConfigFile> parsedOptions{*std::move(config)};
+    std::set<boost::filesystem::path> alreadyParsedPaths;  // needed to prevent infinite loop in case of a circular link
+    alreadyParsedPaths.insert(boost::filesystem::path(mActiveConfigPaths.front()));
+
+    while (!extraConfigDirs.empty())
+    {
+        boost::filesystem::path path = extraConfigDirs.top();
+        extraConfigDirs.pop();
+        if (alreadyParsedPaths.count(path) > 0)
+        {
+            if (!quiet)
+                Log(Debug::Warning) << "Repeated config dir: " << path;
+            continue;
+        }
+        alreadyParsedPaths.insert(path);
+        mActiveConfigPaths.push_back(path);
+        config = loadConfig(path, description);
+        if (!config)
+            continue;
+        addExtraConfigDirs(extraConfigDirs, *config);
+        parsedOptions.push_back(*std::move(config));
+    }
+
+    for (auto it = parsedOptions.rbegin(); it != parsedOptions.rend(); ++it)
+    {
+        auto composingVariables = separateComposingVariables(variables, description);
+        boost::program_options::store(std::move(*it), variables);
         mergeComposingVariables(variables, composingVariables, description);
-        boost::program_options::notify(variables);
     }
 
+    mLogPath = mActiveConfigPaths.back();
     mSilent = silent;
 }
 
+void ConfigurationManager::addExtraConfigDirs(std::stack<boost::filesystem::path>& dirs,
+                                              const bpo::basic_parsed_options<char>& options) const
+{
+    boost::program_options::variables_map variables;
+    boost::program_options::store(options, variables);
+    boost::program_options::notify(variables);
+    addExtraConfigDirs(dirs, variables);
+}
+
+void ConfigurationManager::addExtraConfigDirs(std::stack<boost::filesystem::path>& dirs,
+                                              const boost::program_options::variables_map& variables) const
+{
+    auto configIt = variables.find("config");
+    if (configIt == variables.end())
+        return;
+    Files::PathContainer newDirs = asPathContainer(configIt->second.as<Files::MaybeQuotedPathContainer>());
+    processPaths(newDirs);
+    for (auto it = newDirs.rbegin(); it != newDirs.rend(); ++it)
+        dirs.push(*it);
+}
+
+void ConfigurationManager::addCommonOptions(boost::program_options::options_description& description)
+{
+    description.add_options()
+        ("config", bpo::value<Files::MaybeQuotedPathContainer>()->default_value(Files::MaybeQuotedPathContainer(), "config")
+            ->multitoken()->composing(), "additional config directories");
+}
+
 boost::program_options::variables_map separateComposingVariables(boost::program_options::variables_map & variables,
     boost::program_options::options_description& description)
 {
@@ -107,7 +170,7 @@ void mergeComposingVariables(boost::program_options::variables_map& first, boost
     if (description.find_nothrow("replace", false))
     {
         auto replace = second["replace"];
-        if (!replace.defaulted() && !replace.empty())
+        if (!replace.empty())
         {
             std::vector<std::string> replaceVector = replace.as<std::vector<std::string>>();
             replacedVariables.insert(replaceVector.begin(), replaceVector.end());
@@ -132,7 +195,7 @@ void mergeComposingVariables(boost::program_options::variables_map& first, boost
                 continue;
             }
 
-            if (second[name].defaulted() || second[name].empty())
+            if (second[name].empty())
                 continue;
 
             boost::any& firstValue = firstPosition->second.value();
@@ -142,7 +205,6 @@ void mergeComposingVariables(boost::program_options::variables_map& first, boost
             {
                 auto& firstPathContainer = boost::any_cast<Files::MaybeQuotedPathContainer&>(firstValue);
                 const auto& secondPathContainer = boost::any_cast<const Files::MaybeQuotedPathContainer&>(secondValue);
-
                 firstPathContainer.insert(firstPathContainer.end(), secondPathContainer.begin(), secondPathContainer.end());
             }
             else if (firstValue.type() == typeid(std::vector<std::string>))
@@ -165,10 +227,10 @@ void mergeComposingVariables(boost::program_options::variables_map& first, boost
                 Log(Debug::Error) << "Unexpected composing variable type. Curse boost and their blasted arcane templates.";
         }
     }
-
+    boost::program_options::notify(first);
 }
 
-void ConfigurationManager::processPaths(Files::PathContainer& dataDirs, bool create)
+void ConfigurationManager::processPaths(Files::PathContainer& dataDirs, bool create) const
 {
     std::string path;
     for (Files::PathContainer::iterator it = dataDirs.begin(); it != dataDirs.end(); ++it)
@@ -181,7 +243,7 @@ void ConfigurationManager::processPaths(Files::PathContainer& dataDirs, bool cre
             std::string::size_type pos = path.find('?', 1);
             if (pos != std::string::npos && pos != 0)
             {
-                TokensMappingContainer::iterator tokenIt = mTokensMapping.find(path.substr(0, pos + 1));
+                auto tokenIt = mTokensMapping.find(path.substr(0, pos + 1));
                 if (tokenIt != mTokensMapping.end())
                 {
                     boost::filesystem::path tempPath(((mFixedPath).*(tokenIt->second))());
@@ -224,8 +286,8 @@ void ConfigurationManager::processPaths(Files::PathContainer& dataDirs, bool cre
         std::bind(&boost::filesystem::path::empty, std::placeholders::_1)), dataDirs.end());
 }
 
-bool ConfigurationManager::loadConfig(const boost::filesystem::path& path,
-    boost::program_options::variables_map& variables,
+std::optional<bpo::basic_parsed_options<char>> ConfigurationManager::loadConfig(
+    const boost::filesystem::path& path,
     boost::program_options::options_description& description)
 {
     boost::filesystem::path cfgFile(path);
@@ -238,20 +300,11 @@ bool ConfigurationManager::loadConfig(const boost::filesystem::path& path,
         boost::filesystem::ifstream configFileStream(cfgFile);
 
         if (configFileStream.is_open())
-        {
-            parseConfig(configFileStream, variables, description);
-
-            return true;
-        }
-        else
-        {
-            if (!mSilent)
-                Log(Debug::Error) << "Loading failed.";
-
-            return false;
-        }
+            return Files::parse_config_file(configFileStream, description, true);
+        else if (!mSilent)
+            Log(Debug::Error) << "Loading failed.";
     }
-    return false;
+    return std::nullopt;
 }
 
 const boost::filesystem::path& ConfigurationManager::getGlobalPath() const
@@ -344,4 +397,4 @@ PathContainer asPathContainer(const MaybeQuotedPathContainer& MaybeQuotedPathCon
     return PathContainer(MaybeQuotedPathContainer.begin(), MaybeQuotedPathContainer.end());
 }
 
-} /* namespace Cfg */
+} /* namespace Files */
diff --git a/components/files/configurationmanager.hpp b/components/files/configurationmanager.hpp
index 4b641c12fd..07a9300305 100644
--- a/components/files/configurationmanager.hpp
+++ b/components/files/configurationmanager.hpp
@@ -2,6 +2,8 @@
 #define COMPONENTS_FILES_CONFIGURATIONMANAGER_HPP
 
 #include <map>
+#include <optional>
+#include <stack>
 
 #include <boost/program_options.hpp>
 
@@ -25,7 +27,7 @@ struct ConfigurationManager
     void readConfiguration(boost::program_options::variables_map& variables,
         boost::program_options::options_description& description, bool quiet=false);
 
-    void processPaths(Files::PathContainer& dataDirs, bool create = false);
+    void processPaths(Files::PathContainer& dataDirs, bool create = false) const;
     ///< \param create Try creating the directory, if it does not exist.
 
     /**< Fixed paths */
@@ -37,24 +39,34 @@ struct ConfigurationManager
     const boost::filesystem::path& getUserDataPath() const;
     const boost::filesystem::path& getLocalDataPath() const;
     const boost::filesystem::path& getInstallPath() const;
+    const std::vector<boost::filesystem::path>& getActiveConfigPaths() const { return mActiveConfigPaths; }
 
     const boost::filesystem::path& getCachePath() const;
 
     const boost::filesystem::path& getLogPath() const;
     const boost::filesystem::path& getScreenshotPath() const;
 
+    static void addCommonOptions(boost::program_options::options_description& description);
+
     private:
         typedef Files::FixedPath<> FixedPathType;
 
         typedef const boost::filesystem::path& (FixedPathType::*path_type_f)() const;
         typedef std::map<std::string, path_type_f> TokensMappingContainer;
 
-        bool loadConfig(const boost::filesystem::path& path,
-            boost::program_options::variables_map& variables,
+        std::optional<boost::program_options::basic_parsed_options<char>> loadConfig(
+            const boost::filesystem::path& path,
             boost::program_options::options_description& description);
 
+        void addExtraConfigDirs(std::stack<boost::filesystem::path>& dirs,
+            const boost::program_options::variables_map& variables) const;
+        void addExtraConfigDirs(std::stack<boost::filesystem::path>& dirs,
+            const boost::program_options::basic_parsed_options<char>& options) const;
+
         void setupTokensMapping();
 
+        std::vector<boost::filesystem::path> mActiveConfigPaths;
+
         FixedPathType mFixedPath;
 
         boost::filesystem::path mLogPath;
diff --git a/files/openmw.cfg b/files/openmw.cfg
index f524911489..7bd70c3e5e 100644
--- a/files/openmw.cfg
+++ b/files/openmw.cfg
@@ -4,6 +4,7 @@
 
 content=builtin.omwscripts
 data-local="?userdata?data"
+config="?userconfig?"
 resources=${OPENMW_RESOURCE_FILES}
 script-blacklist=Museum
 script-blacklist=MockChangeScript
diff --git a/files/openmw.cfg.local b/files/openmw.cfg.local
index bed9b9b10a..79ab9e6156 100644
--- a/files/openmw.cfg.local
+++ b/files/openmw.cfg.local
@@ -4,6 +4,7 @@
 
 content=builtin.omwscripts
 data-local="?userdata?data"
+config="?userconfig?"
 resources=./resources
 script-blacklist=Museum
 script-blacklist=MockChangeScript

From 1bcc4a8bcc6cfbf3570a276c5647bcd294773a7c Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Fri, 14 Jan 2022 00:54:54 +0100
Subject: [PATCH 2050/2859] Read settings.cfg from all active config dirs

---
 CHANGELOG.md                     |  1 +
 apps/openmw/engine.cpp           | 28 +++++++++++++++++-----------
 components/settings/parser.cpp   |  7 +++++--
 components/settings/parser.hpp   |  3 ++-
 components/settings/settings.cpp |  4 ++--
 components/settings/settings.hpp |  2 +-
 6 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56d0910d22..a181a35098 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -103,6 +103,7 @@
     Bug #6579: OpenMW compilation error when using OSG doubles for BoundingSphere
     Feature #890: OpenMW-CS: Column filtering
     Feature #1465: "Reset" argument for AI functions
+    Feature #2491: Ability to make OpenMW "portable"
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
     Feature #2780: A way to see current OpenMW version in the console
     Feature #3616: Allow Zoom levels on the World Map
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 9e2e1aedad..50053b8b76 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -520,20 +520,26 @@ void OMW::Engine::setSkipMenu (bool skipMenu, bool newGame)
 
 std::string OMW::Engine::loadSettings (Settings::Manager & settings)
 {
-    // Create the settings manager and load default settings file
-    const std::string localdefault = (mCfgMgr.getLocalPath() / "defaults.bin").string();
-    const std::string globaldefault = (mCfgMgr.getGlobalPath() / "defaults.bin").string();
+    const std::vector<boost::filesystem::path>& paths = mCfgMgr.getActiveConfigPaths();
+    if (paths.empty())
+        throw std::runtime_error("No config dirs! ConfigurationManager::readConfiguration must be called first.");
 
-    // prefer local
-    if (boost::filesystem::exists(localdefault))
-        settings.loadDefault(localdefault);
-    else if (boost::filesystem::exists(globaldefault))
-        settings.loadDefault(globaldefault);
-    else
+    // Create the settings manager and load default settings file.
+    const std::string defaultsBin = (paths.front() / "defaults.bin").string();
+    if (!boost::filesystem::exists(defaultsBin))
         throw std::runtime_error ("No default settings file found! Make sure the file \"defaults.bin\" was properly installed.");
+    settings.loadDefault(defaultsBin);
+
+    // Load "settings.cfg" from every config dir except the last one as additional default settings.
+    for (int i = 0; i < static_cast<int>(paths.size()) - 1; ++i)
+    {
+        const std::string additionalDefaults = (paths[i] / "settings.cfg").string();
+        if (boost::filesystem::exists(additionalDefaults))
+            settings.loadDefault(additionalDefaults, true);
+    }
 
-    // load user settings if they exist
-    std::string settingspath = (mCfgMgr.getUserConfigPath() / "settings.cfg").string();
+    // Load "settings.cfg" from the last config as user settings if they exist. This path will be used to save modified settings.
+    std::string settingspath = (paths.back() / "settings.cfg").string();
     if (boost::filesystem::exists(settingspath))
         settings.loadUser(settingspath);
 
diff --git a/components/settings/parser.cpp b/components/settings/parser.cpp
index f2419dfdd6..dd1b8c1a20 100644
--- a/components/settings/parser.cpp
+++ b/components/settings/parser.cpp
@@ -9,7 +9,8 @@
 
 #include <Base64.h>
 
-void Settings::SettingsFileParser::loadSettingsFile(const std::string& file, CategorySettingValueMap& settings, bool base64Encoded)
+void Settings::SettingsFileParser::loadSettingsFile(const std::string& file, CategorySettingValueMap& settings,
+                                                    bool base64Encoded, bool overrideExisting)
 {
     mFile = file;
     boost::filesystem::ifstream fstream;
@@ -73,7 +74,9 @@ void Settings::SettingsFileParser::loadSettingsFile(const std::string& file, Cat
         std::string value = line.substr(valueBegin);
         Misc::StringUtils::trim(value);
 
-        if (settings.insert(std::make_pair(std::make_pair(currentCategory, setting), value)).second == false)
+        if (overrideExisting)
+            settings[std::make_pair(currentCategory, setting)] = value;
+        else if (settings.insert(std::make_pair(std::make_pair(currentCategory, setting), value)).second == false)
             fail(std::string("duplicate setting: [" + currentCategory + "] " + setting));
     }
 }
diff --git a/components/settings/parser.hpp b/components/settings/parser.hpp
index 45b1a18f72..c934fbea07 100644
--- a/components/settings/parser.hpp
+++ b/components/settings/parser.hpp
@@ -10,7 +10,8 @@ namespace Settings
     class SettingsFileParser
     {
     public:
-        void loadSettingsFile(const std::string& file, CategorySettingValueMap& settings, bool base64encoded = false);
+        void loadSettingsFile(const std::string& file, CategorySettingValueMap& settings,
+                              bool base64encoded = false, bool overrideExisting = false);
 
         void saveSettingsFile(const std::string& file, const CategorySettingValueMap& settings);
 
diff --git a/components/settings/settings.cpp b/components/settings/settings.cpp
index 7fa625e4ab..09e74b348b 100644
--- a/components/settings/settings.cpp
+++ b/components/settings/settings.cpp
@@ -19,10 +19,10 @@ void Manager::clear()
     mChangedSettings.clear();
 }
 
-void Manager::loadDefault(const std::string &file)
+void Manager::loadDefault(const std::string &file, bool overrideExisting)
 {
     SettingsFileParser parser;
-    parser.loadSettingsFile(file, mDefaultSettings, true);
+    parser.loadSettingsFile(file, mDefaultSettings, true, overrideExisting);
 }
 
 void Manager::loadUser(const std::string &file)
diff --git a/components/settings/settings.hpp b/components/settings/settings.hpp
index a4b1cf3a54..84e7066fbd 100644
--- a/components/settings/settings.hpp
+++ b/components/settings/settings.hpp
@@ -26,7 +26,7 @@ namespace Settings
         void clear();
         ///< clears all settings and default settings
 
-        void loadDefault (const std::string& file);
+        void loadDefault (const std::string& file, bool overrideExisting = false);
         ///< load file as the default settings (can be overridden by user settings)
 
         void loadUser (const std::string& file);

From a453e5c19884e716a66abb10175fd351dc243d36 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 16 Jan 2022 01:59:20 +0100
Subject: [PATCH 2051/2859] Reuse the same code to load settings in
 apps/openmw, apps/launcher, apps/opencs

---
 apps/launcher/maindialog.cpp      | 62 +++++++------------------------
 apps/navmeshtool/main.cpp         | 19 +---------
 apps/opencs/editor.cpp            | 11 +++++-
 apps/opencs/editor.hpp            |  3 ++
 apps/opencs/model/prefs/state.cpp | 17 +--------
 apps/openmw/engine.cpp            | 31 +---------------
 components/settings/settings.cpp  | 32 ++++++++++++----
 components/settings/settings.hpp  | 12 +++---
 8 files changed, 61 insertions(+), 126 deletions(-)

diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp
index d335d7cded..167f6b9c26 100644
--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@@ -414,57 +414,23 @@ bool Launcher::MainDialog::setupGameData()
 
 bool Launcher::MainDialog::setupGraphicsSettings()
 {
-    // This method is almost a copy of OMW::Engine::loadSettings().  They should definitely
-    // remain consistent, and possibly be merged into a shared component.  At the very least
-    // the filenames should be in the CfgMgr component.
-
-    // Ensure to clear previous settings in case we had already loaded settings.
-    mEngineSettings.clear();
-
-    // Create the settings manager and load default settings file
-    const std::string localDefault = (mCfgMgr.getLocalPath() / "defaults.bin").string();
-    const std::string globalDefault = (mCfgMgr.getGlobalPath() / "defaults.bin").string();
-    std::string defaultPath;
-
-    // Prefer the defaults.bin in the current directory.
-    if (boost::filesystem::exists(localDefault))
-        defaultPath = localDefault;
-    else if (boost::filesystem::exists(globalDefault))
-        defaultPath = globalDefault;
-    // 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 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;
-    }
-
-    // Load the default settings, report any parsing errors.
-    try {
-        mEngineSettings.loadDefault(defaultPath);
-    }
-    catch (std::exception& e) {
-        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;
-    }
-
-    // Load user settings if they exist
-    const std::string userPath = (mCfgMgr.getUserConfigPath() / "settings.cfg").string();
-    // User settings are not required to exist, so if they don't we're done.
-    if (!boost::filesystem::exists(userPath)) return true;
-
-    try {
-        mEngineSettings.loadUser(userPath);
+    mEngineSettings.clear();  // Ensure to clear previous settings in case we had already loaded settings.
+    try
+    {
+        boost::program_options::variables_map variables;
+        boost::program_options::options_description desc;
+        mCfgMgr.addCommonOptions(desc);
+        mCfgMgr.readConfiguration(variables, desc, true);
+        mEngineSettings.load(mCfgMgr);
+        return true;
     }
-    catch (std::exception& e) {
-        std::string msg = std::string("<br><b>Error reading settings.cfg</b><br><br>") + e.what();
-        cfgError(tr("Error reading OpenMW configuration file"), tr(msg.c_str()));
+    catch (std::exception& e)
+    {
+        cfgError(tr("Error reading OpenMW configuration files"),
+                 tr("<br>The problem may be due to an incomplete installation of OpenMW.<br> \
+                     Reinstalling OpenMW may resolve the problem.<br>") + e.what());
         return false;
     }
-
-    return true;
 }
 
 void Launcher::MainDialog::loadSettings()
diff --git a/apps/navmeshtool/main.cpp b/apps/navmeshtool/main.cpp
index ce3cb10b20..f89e80e542 100644
--- a/apps/navmeshtool/main.cpp
+++ b/apps/navmeshtool/main.cpp
@@ -89,23 +89,6 @@ namespace NavMeshTool
             return result;
         }
 
-        void loadSettings(const Files::ConfigurationManager& config, Settings::Manager& settings)
-        {
-            const std::string localDefault = (config.getLocalPath() / "defaults.bin").string();
-            const std::string globalDefault = (config.getGlobalPath() / "defaults.bin").string();
-
-            if (boost::filesystem::exists(localDefault))
-                settings.loadDefault(localDefault);
-            else if (boost::filesystem::exists(globalDefault))
-                settings.loadDefault(globalDefault);
-            else
-                throw std::runtime_error("No default settings file found! Make sure the file \"defaults.bin\" was properly installed.");
-
-            const std::string settingsPath = (config.getUserConfigPath() / "settings.cfg").string();
-            if (boost::filesystem::exists(settingsPath))
-                settings.loadUser(settingsPath);
-        }
-
         int runNavMeshTool(int argc, char *argv[])
         {
             bpo::options_description desc = makeOptionsDescription();
@@ -166,7 +149,7 @@ namespace NavMeshTool
             VFS::registerArchives(&vfs, fileCollections, archives, true);
 
             Settings::Manager settings;
-            loadSettings(config, settings);
+            settings.load(config);
 
             const osg::Vec3f agentHalfExtents = Settings::Manager::getVector3("default actor pathfind half extents", "Game");
 
diff --git a/apps/opencs/editor.cpp b/apps/opencs/editor.cpp
index 3db201874a..1d5934fe5d 100644
--- a/apps/opencs/editor.cpp
+++ b/apps/opencs/editor.cpp
@@ -21,7 +21,7 @@
 using namespace Fallback;
 
 CS::Editor::Editor (int argc, char **argv)
-: mSettingsState (mCfgMgr), mDocumentManager (mCfgMgr),
+: mConfigVariables(readConfiguration()), mSettingsState (mCfgMgr), mDocumentManager (mCfgMgr),
   mPid(""), mLock(), mMerge (mDocumentManager),
   mIpcServerName ("org.openmw.OpenCS"), mServer(nullptr), mClientSocket(nullptr)
 {
@@ -83,7 +83,7 @@ CS::Editor::~Editor ()
         remove(mPid.string().c_str())); // ignore any error
 }
 
-std::pair<Files::PathContainer, std::vector<std::string> > CS::Editor::readConfig(bool quiet)
+boost::program_options::variables_map CS::Editor::readConfiguration()
 {
     boost::program_options::variables_map variables;
     boost::program_options::options_description desc("Syntax: openmw-cs <options>\nAllowed options");
@@ -109,6 +109,13 @@ std::pair<Files::PathContainer, std::vector<std::string> > CS::Editor::readConfi
     mCfgMgr.readConfiguration(variables, desc, false);
     setupLogging(mCfgMgr.getLogPath().string(), "OpenMW-CS");
 
+    return variables;
+}
+
+std::pair<Files::PathContainer, std::vector<std::string> > CS::Editor::readConfig(bool quiet)
+{
+    boost::program_options::variables_map& variables = mConfigVariables;
+
     Fallback::Map::init(variables["fallback"].as<FallbackMap>().mMap);
 
     mEncodingName = variables["encoding"].as<std::string>();
diff --git a/apps/opencs/editor.hpp b/apps/opencs/editor.hpp
index 1c93427613..7b258c8049 100644
--- a/apps/opencs/editor.hpp
+++ b/apps/opencs/editor.hpp
@@ -40,6 +40,7 @@ namespace CS
             Q_OBJECT
 
             Files::ConfigurationManager mCfgMgr;
+            boost::program_options::variables_map mConfigVariables;
             CSMPrefs::State mSettingsState;
             CSMDoc::DocumentManager mDocumentManager;
             CSVDoc::StartupDialogue mStartup;
@@ -58,6 +59,8 @@ namespace CS
             Files::PathContainer mDataDirs;
             std::string mEncodingName;
 
+            boost::program_options::variables_map readConfiguration();
+            ///< Calls mCfgMgr.readConfiguration; should be used before initialization of mSettingsState as it depends on the configuration.
             std::pair<Files::PathContainer, std::vector<std::string> > readConfig(bool quiet=false);
             ///< \return data paths
 
diff --git a/apps/opencs/model/prefs/state.cpp b/apps/opencs/model/prefs/state.cpp
index 06dc1f4a2e..ee0cbbed5a 100644
--- a/apps/opencs/model/prefs/state.cpp
+++ b/apps/opencs/model/prefs/state.cpp
@@ -16,22 +16,7 @@ CSMPrefs::State *CSMPrefs::State::sThis = nullptr;
 
 void CSMPrefs::State::load()
 {
-    // default settings file
-    boost::filesystem::path local = mConfigurationManager.getLocalPath() / mDefaultConfigFile;
-    boost::filesystem::path global = mConfigurationManager.getGlobalPath() / mDefaultConfigFile;
-
-    if (boost::filesystem::exists (local))
-        mSettings.loadDefault (local.string());
-    else if (boost::filesystem::exists (global))
-        mSettings.loadDefault (global.string());
-    else
-        throw std::runtime_error ("No default settings file found! Make sure the file \"" + mDefaultConfigFile + "\" was properly installed.");
-
-    // user settings file
-    boost::filesystem::path user = mConfigurationManager.getUserConfigPath() / mConfigFile;
-
-    if (boost::filesystem::exists (user))
-        mSettings.loadUser (user.string());
+    mSettings.load(mConfigurationManager);
 }
 
 void CSMPrefs::State::declare()
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 50053b8b76..cd32cb3b0d 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -518,34 +518,6 @@ void OMW::Engine::setSkipMenu (bool skipMenu, bool newGame)
     mNewGame = newGame;
 }
 
-std::string OMW::Engine::loadSettings (Settings::Manager & settings)
-{
-    const std::vector<boost::filesystem::path>& paths = mCfgMgr.getActiveConfigPaths();
-    if (paths.empty())
-        throw std::runtime_error("No config dirs! ConfigurationManager::readConfiguration must be called first.");
-
-    // Create the settings manager and load default settings file.
-    const std::string defaultsBin = (paths.front() / "defaults.bin").string();
-    if (!boost::filesystem::exists(defaultsBin))
-        throw std::runtime_error ("No default settings file found! Make sure the file \"defaults.bin\" was properly installed.");
-    settings.loadDefault(defaultsBin);
-
-    // Load "settings.cfg" from every config dir except the last one as additional default settings.
-    for (int i = 0; i < static_cast<int>(paths.size()) - 1; ++i)
-    {
-        const std::string additionalDefaults = (paths[i] / "settings.cfg").string();
-        if (boost::filesystem::exists(additionalDefaults))
-            settings.loadDefault(additionalDefaults, true);
-    }
-
-    // Load "settings.cfg" from the last config as user settings if they exist. This path will be used to save modified settings.
-    std::string settingspath = (paths.back() / "settings.cfg").string();
-    if (boost::filesystem::exists(settingspath))
-        settings.loadUser(settingspath);
-
-    return settingspath;
-}
-
 void OMW::Engine::createWindow(Settings::Manager& settings)
 {
     int screen = settings.getInt("screen", "Video");
@@ -981,8 +953,7 @@ void OMW::Engine::go()
 
     // Load settings
     Settings::Manager settings;
-    std::string settingspath;
-    settingspath = loadSettings (settings);
+    std::string settingspath = settings.load(mCfgMgr);
 
     MWClass::registerClasses();
 
diff --git a/components/settings/settings.cpp b/components/settings/settings.cpp
index 09e74b348b..b8ff700492 100644
--- a/components/settings/settings.cpp
+++ b/components/settings/settings.cpp
@@ -3,6 +3,7 @@
 
 #include <sstream>
 
+#include <components/files/configurationmanager.hpp>
 #include <components/misc/stringops.hpp>
 
 namespace Settings
@@ -19,16 +20,33 @@ void Manager::clear()
     mChangedSettings.clear();
 }
 
-void Manager::loadDefault(const std::string &file, bool overrideExisting)
+std::string Manager::load(const Files::ConfigurationManager& cfgMgr)
 {
     SettingsFileParser parser;
-    parser.loadSettingsFile(file, mDefaultSettings, true, overrideExisting);
-}
+    const std::vector<boost::filesystem::path>& paths = cfgMgr.getActiveConfigPaths();
+    if (paths.empty())
+        throw std::runtime_error("No config dirs! ConfigurationManager::readConfiguration must be called first.");
+
+    // Create the settings manager and load default settings file.
+    const std::string defaultsBin = (paths.front() / "defaults.bin").string();
+    if (!boost::filesystem::exists(defaultsBin))
+        throw std::runtime_error ("No default settings file found! Make sure the file \"defaults.bin\" was properly installed.");
+    parser.loadSettingsFile(defaultsBin, mDefaultSettings, true, false);
+
+    // Load "settings.cfg" from every config dir except the last one as additional default settings.
+    for (int i = 0; i < static_cast<int>(paths.size()) - 1; ++i)
+    {
+        const std::string additionalDefaults = (paths[i] / "settings.cfg").string();
+        if (boost::filesystem::exists(additionalDefaults))
+            parser.loadSettingsFile(additionalDefaults, mDefaultSettings, false, true);
+    }
 
-void Manager::loadUser(const std::string &file)
-{
-    SettingsFileParser parser;
-    parser.loadSettingsFile(file, mUserSettings);
+    // Load "settings.cfg" from the last config as user settings if they exist. This path will be used to save modified settings.
+    std::string settingspath = (paths.back() / "settings.cfg").string();
+    if (boost::filesystem::exists(settingspath))
+        parser.loadSettingsFile(settingspath, mUserSettings, false, false);
+
+    return settingspath;
 }
 
 void Manager::saveUser(const std::string &file)
diff --git a/components/settings/settings.hpp b/components/settings/settings.hpp
index 84e7066fbd..04831ef171 100644
--- a/components/settings/settings.hpp
+++ b/components/settings/settings.hpp
@@ -9,6 +9,11 @@
 #include <osg/Vec2f>
 #include <osg/Vec3f>
 
+namespace Files
+{
+    struct ConfigurationManager;
+}
+
 namespace Settings
 {
     ///
@@ -26,11 +31,8 @@ namespace Settings
         void clear();
         ///< clears all settings and default settings
 
-        void loadDefault (const std::string& file, bool overrideExisting = false);
-        ///< load file as the default settings (can be overridden by user settings)
-
-        void loadUser (const std::string& file);
-        ///< load file as user settings
+        std::string load(const Files::ConfigurationManager& cfgMgr);
+        ///< load settings from all active config dirs. Returns the path of the last loaded file.
 
         void saveUser (const std::string& file);
         ///< save user settings to file

From 5ff2fc55ac6976750c9f096ea84085a03782ac4e Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 16 Jan 2022 02:10:13 +0100
Subject: [PATCH 2052/2859] Make ConfigurationManager::getUserConfigPath to
 return the actual config path where the settings, logs, and Lua storage are
 stored.

---
 components/files/configurationmanager.cpp | 5 ++++-
 components/files/configurationmanager.hpp | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/components/files/configurationmanager.cpp b/components/files/configurationmanager.cpp
index 739c7f7b43..b814da18ff 100644
--- a/components/files/configurationmanager.cpp
+++ b/components/files/configurationmanager.cpp
@@ -314,7 +314,10 @@ const boost::filesystem::path& ConfigurationManager::getGlobalPath() const
 
 const boost::filesystem::path& ConfigurationManager::getUserConfigPath() const
 {
-    return mFixedPath.getUserConfigPath();
+    if (mActiveConfigPaths.empty())
+        return mFixedPath.getUserConfigPath();
+    else
+        return mActiveConfigPaths.back();
 }
 
 const boost::filesystem::path& ConfigurationManager::getUserDataPath() const
diff --git a/components/files/configurationmanager.hpp b/components/files/configurationmanager.hpp
index 07a9300305..fcbb0d5ff5 100644
--- a/components/files/configurationmanager.hpp
+++ b/components/files/configurationmanager.hpp
@@ -32,10 +32,10 @@ struct ConfigurationManager
 
     /**< Fixed paths */
     const boost::filesystem::path& getGlobalPath() const;
-    const boost::filesystem::path& getUserConfigPath() const;
     const boost::filesystem::path& getLocalPath() const;
 
     const boost::filesystem::path& getGlobalDataPath() const;
+    const boost::filesystem::path& getUserConfigPath() const;
     const boost::filesystem::path& getUserDataPath() const;
     const boost::filesystem::path& getLocalDataPath() const;
     const boost::filesystem::path& getInstallPath() const;

From 9c1ff16b6202b00d3df706e0fb4965ee0730827f Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Thu, 20 Jan 2022 18:20:28 +0100
Subject: [PATCH 2053/2859] Add config variable `user-data="?userdata?"`.
 Allows to override paths to saves and screenshots.

---
 components/files/configurationmanager.cpp | 124 +++++++++++++---------
 components/files/configurationmanager.hpp |   2 +
 files/openmw.cfg                          |   1 +
 files/openmw.cfg.local                    |   1 +
 4 files changed, 76 insertions(+), 52 deletions(-)

diff --git a/components/files/configurationmanager.cpp b/components/files/configurationmanager.cpp
index b814da18ff..4101c4ef54 100644
--- a/components/files/configurationmanager.cpp
+++ b/components/files/configurationmanager.cpp
@@ -30,18 +30,10 @@ ConfigurationManager::ConfigurationManager(bool silent)
 {
     setupTokensMapping();
 
-    boost::filesystem::create_directories(mFixedPath.getUserConfigPath());
-    boost::filesystem::create_directories(mFixedPath.getUserDataPath());
-
+    // Initialize with fixed paths, will be overridden in `readConfiguration`.
     mLogPath = mFixedPath.getUserConfigPath();
-
+    mUserDataPath = mFixedPath.getUserDataPath();
     mScreenshotPath = mFixedPath.getUserDataPath() / "screenshots";
-
-    // probably not necessary but validate the creation of the screenshots directory and fallback to the original behavior if it fails
-    boost::system::error_code dirErr;
-    if (!boost::filesystem::create_directories(mScreenshotPath, dirErr) && !boost::filesystem::is_directory(mScreenshotPath)) {
-        mScreenshotPath = mFixedPath.getUserDataPath();
-    }
 }
 
 ConfigurationManager::~ConfigurationManager()
@@ -114,6 +106,30 @@ void ConfigurationManager::readConfiguration(boost::program_options::variables_m
     }
 
     mLogPath = mActiveConfigPaths.back();
+    mUserDataPath = variables["user-data"].as<Files::MaybeQuotedPath>();
+    if (mUserDataPath.empty())
+    {
+        if (!quiet)
+            Log(Debug::Warning) << "Error: `user-data` is not specified";
+        mUserDataPath = mFixedPath.getUserDataPath();
+    }
+    processPath(mUserDataPath, true);
+    mScreenshotPath = mUserDataPath / "screenshots";
+
+    boost::filesystem::create_directories(getUserConfigPath());
+    boost::filesystem::create_directories(mScreenshotPath);
+
+    // probably not necessary but validate the creation of the screenshots directory and fallback to the original behavior if it fails
+    if (!boost::filesystem::is_directory(mScreenshotPath))
+        mScreenshotPath = mUserDataPath;
+
+    if (!quiet)
+    {
+        Log(Debug::Info) << "Logs dir: " << getUserConfigPath().string();
+        Log(Debug::Info) << "User data dir: " << mUserDataPath.string();
+        Log(Debug::Info) << "Screenshots dir: " << mScreenshotPath.string();
+    }
+
     mSilent = silent;
 }
 
@@ -141,8 +157,9 @@ void ConfigurationManager::addExtraConfigDirs(std::stack<boost::filesystem::path
 void ConfigurationManager::addCommonOptions(boost::program_options::options_description& description)
 {
     description.add_options()
-        ("config", bpo::value<Files::MaybeQuotedPathContainer>()->default_value(Files::MaybeQuotedPathContainer(), "config")
-            ->multitoken()->composing(), "additional config directories");
+        ("config", bpo::value<Files::MaybeQuotedPathContainer>()->multitoken()->composing(), "additional config directories")
+        ("user-data", bpo::value<Files::MaybeQuotedPath>(),
+            "set user data directory (used for saves, screenshots, etc)");
 }
 
 boost::program_options::variables_map separateComposingVariables(boost::program_options::variables_map & variables,
@@ -230,54 +247,57 @@ void mergeComposingVariables(boost::program_options::variables_map& first, boost
     boost::program_options::notify(first);
 }
 
-void ConfigurationManager::processPaths(Files::PathContainer& dataDirs, bool create) const
+void ConfigurationManager::processPath(boost::filesystem::path& path, bool create) const
 {
-    std::string path;
-    for (Files::PathContainer::iterator it = dataDirs.begin(); it != dataDirs.end(); ++it)
-    {
-        path = it->string();
+    std::string str = path.string();
+
+    // Do nothing if the path doesn't start with a token
+    if (str.empty() || str[0] != '?')
+        return;
 
-        // Check if path contains a token
-        if (!path.empty() && *path.begin() == '?')
+    std::string::size_type pos = str.find('?', 1);
+    if (pos != std::string::npos && pos != 0)
+    {
+        auto tokenIt = mTokensMapping.find(str.substr(0, pos + 1));
+        if (tokenIt != mTokensMapping.end())
         {
-            std::string::size_type pos = path.find('?', 1);
-            if (pos != std::string::npos && pos != 0)
+            boost::filesystem::path tempPath(((mFixedPath).*(tokenIt->second))());
+            if (pos < str.length() - 1)
             {
-                auto tokenIt = mTokensMapping.find(path.substr(0, pos + 1));
-                if (tokenIt != mTokensMapping.end())
-                {
-                    boost::filesystem::path tempPath(((mFixedPath).*(tokenIt->second))());
-                    if (pos < path.length() - 1)
-                    {
-                        // There is something after the token, so we should
-                        // append it to the path
-                        tempPath /= path.substr(pos + 1, path.length() - pos);
-                    }
-
-                    *it = tempPath;
-                }
-                else
-                {
-                    // Clean invalid / unknown token, it will be removed outside the loop
-                    (*it).clear();
-                }
+                // There is something after the token, so we should
+                // append it to the path
+                tempPath /= str.substr(pos + 1, str.length() - pos);
             }
+
+            path = tempPath;
+        }
+        else
+        {
+            if (!mSilent)
+                Log(Debug::Warning) << "Path starts with unknown token: " << path;
+            path.clear();
         }
+    }
 
-        if (!boost::filesystem::is_directory(*it))
+    if (!boost::filesystem::is_directory(path) && create)
+    {
+        try
         {
-            if (create)
-            {
-                try
-                {
-                    boost::filesystem::create_directories (*it);
-                }
-                catch (...) {}
-
-                if (boost::filesystem::is_directory(*it))
-                    continue;
-            }
+            boost::filesystem::create_directories(path);
+        }
+        catch (...) {}
+    }
+}
 
+void ConfigurationManager::processPaths(Files::PathContainer& dataDirs, bool create) const
+{
+    for (Files::PathContainer::iterator it = dataDirs.begin(); it != dataDirs.end(); ++it)
+    {
+        processPath(*it, create);
+        if (!boost::filesystem::is_directory(*it))
+        {
+            if (!mSilent)
+                Log(Debug::Warning) << "No such dir: " << *it;
             (*it).clear();
         }
     }
@@ -322,7 +342,7 @@ const boost::filesystem::path& ConfigurationManager::getUserConfigPath() const
 
 const boost::filesystem::path& ConfigurationManager::getUserDataPath() const
 {
-    return mFixedPath.getUserDataPath();
+    return mUserDataPath;
 }
 
 const boost::filesystem::path& ConfigurationManager::getLocalPath() const
diff --git a/components/files/configurationmanager.hpp b/components/files/configurationmanager.hpp
index fcbb0d5ff5..49844cca41 100644
--- a/components/files/configurationmanager.hpp
+++ b/components/files/configurationmanager.hpp
@@ -27,6 +27,7 @@ struct ConfigurationManager
     void readConfiguration(boost::program_options::variables_map& variables,
         boost::program_options::options_description& description, bool quiet=false);
 
+    void processPath(boost::filesystem::path& path, bool create = false) const;
     void processPaths(Files::PathContainer& dataDirs, bool create = false) const;
     ///< \param create Try creating the directory, if it does not exist.
 
@@ -70,6 +71,7 @@ struct ConfigurationManager
         FixedPathType mFixedPath;
 
         boost::filesystem::path mLogPath;
+        boost::filesystem::path mUserDataPath;
         boost::filesystem::path mScreenshotPath;
 
         TokensMappingContainer mTokensMapping;
diff --git a/files/openmw.cfg b/files/openmw.cfg
index 7bd70c3e5e..d1ecd6f8a3 100644
--- a/files/openmw.cfg
+++ b/files/openmw.cfg
@@ -4,6 +4,7 @@
 
 content=builtin.omwscripts
 data-local="?userdata?data"
+user-data="?userdata?"
 config="?userconfig?"
 resources=${OPENMW_RESOURCE_FILES}
 script-blacklist=Museum
diff --git a/files/openmw.cfg.local b/files/openmw.cfg.local
index 79ab9e6156..f928113002 100644
--- a/files/openmw.cfg.local
+++ b/files/openmw.cfg.local
@@ -4,6 +4,7 @@
 
 content=builtin.omwscripts
 data-local="?userdata?data"
+user-data="?userdata?"
 config="?userconfig?"
 resources=./resources
 script-blacklist=Museum

From 5b23ba3faf36c0aebe5de58a3a5decb2b600d779 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Wed, 2 Feb 2022 00:20:32 +0100
Subject: [PATCH 2054/2859] Fix `defaulted` in
 ConfigurationManager::mergeComposingVariables

---
 components/files/configurationmanager.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/files/configurationmanager.cpp b/components/files/configurationmanager.cpp
index 4101c4ef54..4ffd9013b7 100644
--- a/components/files/configurationmanager.cpp
+++ b/components/files/configurationmanager.cpp
@@ -187,7 +187,7 @@ void mergeComposingVariables(boost::program_options::variables_map& first, boost
     if (description.find_nothrow("replace", false))
     {
         auto replace = second["replace"];
-        if (!replace.empty())
+        if (!replace.defaulted() && !replace.empty())
         {
             std::vector<std::string> replaceVector = replace.as<std::vector<std::string>>();
             replacedVariables.insert(replaceVector.begin(), replaceVector.end());
@@ -206,13 +206,13 @@ void mergeComposingVariables(boost::program_options::variables_map& first, boost
                 continue;
             }
 
-            if (replacedVariables.count(name))
+            if (replacedVariables.count(name) || firstPosition->second.defaulted() || firstPosition->second.empty())
             {
                 firstPosition->second = second[name];
                 continue;
             }
 
-            if (second[name].empty())
+            if (second[name].defaulted() || second[name].empty())
                 continue;
 
             boost::any& firstValue = firstPosition->second.value();

From 6084dbfc3a64feaee7305b2f710c5855f8f34678 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Thu, 3 Feb 2022 00:07:30 +0100
Subject: [PATCH 2055/2859] Add a warning if replace==config is used.

---
 components/files/configurationmanager.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/components/files/configurationmanager.cpp b/components/files/configurationmanager.cpp
index 4ffd9013b7..87f4cd4943 100644
--- a/components/files/configurationmanager.cpp
+++ b/components/files/configurationmanager.cpp
@@ -123,6 +123,18 @@ void ConfigurationManager::readConfiguration(boost::program_options::variables_m
     if (!boost::filesystem::is_directory(mScreenshotPath))
         mScreenshotPath = mUserDataPath;
 
+    if (!quiet && !variables["replace"].empty())
+    {
+        for (const std::string& var : variables["replace"].as<std::vector<std::string>>())
+        {
+            if (var == "config")
+            {
+                Log(Debug::Warning) << "replace=config is not allowed and was ignored";
+                break;
+            }
+        }
+    }
+
     if (!quiet)
     {
         Log(Debug::Info) << "Logs dir: " << getUserConfigPath().string();

From 16cfdfec19145ac2b890e5a30ad4075092f06da8 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 3 Feb 2022 00:04:28 +0100
Subject: [PATCH 2056/2859] Avoid unnecessary computation

And fix UBSAN error:

/home/elsid/dev/openmw/apps/openmw/mwrender/renderingmanager.cpp:659:81: runtime error: division by zero
    #0 0x556eac16f4dc in MWRender::RenderingManager::configureAmbient(ESM::Cell const*) /home/elsid/dev/openmw/apps/openmw/mwrender/renderingmanager.cpp:659
    #1 0x556eadfd3d60 in MWWorld::Scene::loadCell(MWWorld::CellStore*, Loading::Listener*, bool, osg::Vec3f const&) /home/elsid/dev/openmw/apps/openmw/mwworld/scene.cpp:467
    #2 0x556eadfe3047 in MWWorld::Scene::changeToInteriorCell(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, ESM::Position const&, bool, bool) /home/elsid/dev/openmw/apps/openmw/mwworld/scene.cpp:830
    #3 0x556eadeb8fb3 in MWWorld::World::changeToInteriorCell(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, ESM::Position const&, bool, bool) /home/elsid/dev/openmw/apps/openmw/mwworld/worldimp.cpp:978
    #4 0x556eadeba5f1 in MWWorld::World::changeToCell(ESM::CellId const&, ESM::Position const&, bool, bool) /home/elsid/dev/openmw/apps/openmw/mwworld/worldimp.cpp:1008
    #5 0x556eaeb852dd in MWState::StateManager::loadGame(MWState::Character const*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) /home/elsid/dev/openmw/apps/openmw/mwstate/statemanagerimp.cpp:533
    #6 0x556eaeb81674 in MWState::StateManager::loadGame(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) /home/elsid/dev/openmw/apps/openmw/mwstate/statemanagerimp.cpp:366
    #7 0x556eaebd2aae in OMW::Engine::go() /home/elsid/dev/openmw/apps/openmw/engine.cpp:1025
    #8 0x556eaeba810a in runApplication(int, char**) /home/elsid/dev/openmw/apps/openmw/main.cpp:221
    #9 0x556eaf865e9a in wrapApplication(int (*)(int, char**), int, char**, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) /home/elsid/dev/openmw/components/debug/debugging.cpp:205
    #10 0x556eaeba8368 in main /home/elsid/dev/openmw/apps/openmw/main.cpp:233
    #11 0x7f89773b3b24 in __libc_start_main (/usr/lib/libc.so.6+0x27b24)
    #12 0x556eac13c09d in _start (/home/elsid/dev/openmw/build/gcc/ubsan/openmw+0x669c09d)
---
 apps/openmw/mwrender/renderingmanager.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 6c9ff173ae..90fe0877ec 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -656,11 +656,10 @@ namespace MWRender
             if (relativeLuminance < mMinimumAmbientLuminance)
             {
                 // brighten ambient so it reaches the minimum threshold but no more, we want to mess with content data as least we can
-                float targetBrightnessIncreaseFactor = mMinimumAmbientLuminance / relativeLuminance;
                 if (ambient.r() == 0.f && ambient.g() == 0.f && ambient.b() == 0.f)
                     ambient = osg::Vec4(mMinimumAmbientLuminance, mMinimumAmbientLuminance, mMinimumAmbientLuminance, ambient.a());
                 else
-                    ambient *= targetBrightnessIncreaseFactor;
+                    ambient *= mMinimumAmbientLuminance / relativeLuminance;
             }
         }
 

From 6e4f6288664888a6d70da26a248c155c1f73c463 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Tue, 1 Feb 2022 00:32:26 +0100
Subject: [PATCH 2057/2859] Replace `inventory:get<Type>()` with
 `inventory:getAll(<Type>)`

---
 apps/openmw/mwlua/luabindings.cpp    |  13 +-
 apps/openmw/mwlua/object.cpp         |  32 ++---
 apps/openmw/mwlua/object.hpp         |  25 ++++
 apps/openmw/mwlua/objectbindings.cpp |  61 ++++-----
 files/lua_api/openmw/core.lua        | 182 +++++++++------------------
 5 files changed, 141 insertions(+), 172 deletions(-)

diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index 309ab51c08..084de7d5e1 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -16,10 +16,10 @@
 namespace MWLua
 {
 
-    static sol::table definitionList(LuaUtil::LuaState& lua, std::initializer_list<std::string> values)
+    static sol::table definitionList(LuaUtil::LuaState& lua, std::initializer_list<std::string_view> values)
     {
         sol::table res(lua.sol(), sol::create);
-        for (const std::string& v : values)
+        for (const std::string_view& v : values)
             res[v] = v;
         return LuaUtil::makeReadOnly(res);
     }
@@ -49,7 +49,7 @@ namespace MWLua
     {
         auto* lua = context.mLua;
         sol::table api(lua->sol(), sol::create);
-        api["API_REVISION"] = 15;
+        api["API_REVISION"] = 16;
         api["quit"] = [lua]()
         {
             Log(Debug::Warning) << "Quit requested by a Lua script.\n" << lua->debugTraceback();
@@ -62,8 +62,11 @@ namespace MWLua
         addTimeBindings(api, context, false);
         api["OBJECT_TYPE"] = definitionList(*lua,
         {
-            "Activator", "Armor", "Book", "Clothing", "Creature", "Door", "Ingredient",
-            "Light", "Miscellaneous", "NPC", "Player", "Potion", "Static", "Weapon"
+            ObjectTypeName::Activator, ObjectTypeName::Armor, ObjectTypeName::Book, ObjectTypeName::Clothing,
+            ObjectTypeName::Creature, ObjectTypeName::Door, ObjectTypeName::Ingredient, ObjectTypeName::Light,
+            ObjectTypeName::MiscItem, ObjectTypeName::NPC, ObjectTypeName::Player, ObjectTypeName::Potion,
+            ObjectTypeName::Static, ObjectTypeName::Weapon, ObjectTypeName::Activator, ObjectTypeName::Lockpick,
+            ObjectTypeName::Probe, ObjectTypeName::Repair
         });
         api["EQUIPMENT_SLOT"] = LuaUtil::makeReadOnly(context.mLua->tableFromPairs<std::string_view, int>({
             {"Helmet", MWWorld::InventoryStore::Slot_Helmet},
diff --git a/apps/openmw/mwlua/object.cpp b/apps/openmw/mwlua/object.cpp
index 93a4709efb..816ec6712b 100644
--- a/apps/openmw/mwlua/object.cpp
+++ b/apps/openmw/mwlua/object.cpp
@@ -17,20 +17,24 @@ namespace MWLua
     };
 
     const static std::unordered_map<ESM::RecNameInts, LuaObjectTypeInfo> luaObjectTypeInfo = {
-        {ESM::REC_ACTI, {"Activator", ESM::LuaScriptCfg::sActivator}},
-        {ESM::REC_ARMO, {"Armor", ESM::LuaScriptCfg::sArmor}},
-        {ESM::REC_BOOK, {"Book", ESM::LuaScriptCfg::sBook}},
-        {ESM::REC_CLOT, {"Clothing", ESM::LuaScriptCfg::sClothing}},
-        {ESM::REC_CONT, {"Container", ESM::LuaScriptCfg::sContainer}},
-        {ESM::REC_CREA, {"Creature", ESM::LuaScriptCfg::sCreature}},
-        {ESM::REC_DOOR, {"Door", ESM::LuaScriptCfg::sDoor}},
-        {ESM::REC_INGR, {"Ingredient", ESM::LuaScriptCfg::sIngredient}},
-        {ESM::REC_LIGH, {"Light", ESM::LuaScriptCfg::sLight}},
-        {ESM::REC_MISC, {"Miscellaneous", ESM::LuaScriptCfg::sMiscItem}},
-        {ESM::REC_NPC_, {"NPC", ESM::LuaScriptCfg::sNPC}},
-        {ESM::REC_ALCH, {"Potion", ESM::LuaScriptCfg::sPotion}},
-        {ESM::REC_STAT, {"Static"}},
-        {ESM::REC_WEAP, {"Weapon", ESM::LuaScriptCfg::sWeapon}},
+        {ESM::REC_ACTI, {ObjectTypeName::Activator, ESM::LuaScriptCfg::sActivator}},
+        {ESM::REC_ARMO, {ObjectTypeName::Armor, ESM::LuaScriptCfg::sArmor}},
+        {ESM::REC_BOOK, {ObjectTypeName::Book, ESM::LuaScriptCfg::sBook}},
+        {ESM::REC_CLOT, {ObjectTypeName::Clothing, ESM::LuaScriptCfg::sClothing}},
+        {ESM::REC_CONT, {ObjectTypeName::Container, ESM::LuaScriptCfg::sContainer}},
+        {ESM::REC_CREA, {ObjectTypeName::Creature, ESM::LuaScriptCfg::sCreature}},
+        {ESM::REC_DOOR, {ObjectTypeName::Door, ESM::LuaScriptCfg::sDoor}},
+        {ESM::REC_INGR, {ObjectTypeName::Ingredient, ESM::LuaScriptCfg::sIngredient}},
+        {ESM::REC_LIGH, {ObjectTypeName::Light, ESM::LuaScriptCfg::sLight}},
+        {ESM::REC_MISC, {ObjectTypeName::MiscItem, ESM::LuaScriptCfg::sMiscItem}},
+        {ESM::REC_NPC_, {ObjectTypeName::NPC, ESM::LuaScriptCfg::sNPC}},
+        {ESM::REC_ALCH, {ObjectTypeName::Potion, ESM::LuaScriptCfg::sPotion}},
+        {ESM::REC_STAT, {ObjectTypeName::Static}},
+        {ESM::REC_WEAP, {ObjectTypeName::Weapon, ESM::LuaScriptCfg::sWeapon}},
+        {ESM::REC_APPA, {ObjectTypeName::Apparatus}},
+        {ESM::REC_LOCK, {ObjectTypeName::Lockpick}},
+        {ESM::REC_PROB, {ObjectTypeName::Probe}},
+        {ESM::REC_REPA, {ObjectTypeName::Repair}},
     };
 
     std::string_view getLuaObjectTypeName(ESM::RecNameInts type, std::string_view fallback)
diff --git a/apps/openmw/mwlua/object.hpp b/apps/openmw/mwlua/object.hpp
index e87721e381..0b51da17c3 100644
--- a/apps/openmw/mwlua/object.hpp
+++ b/apps/openmw/mwlua/object.hpp
@@ -14,6 +14,31 @@
 
 namespace MWLua
 {
+    namespace ObjectTypeName
+    {
+        // Names of object types in Lua.
+        // These names are part of OpenMW Lua API.
+        constexpr std::string_view Activator = "Activator";
+        constexpr std::string_view Armor = "Armor";
+        constexpr std::string_view Book = "Book";
+        constexpr std::string_view Clothing = "Clothing";
+        constexpr std::string_view Container = "Container";
+        constexpr std::string_view Creature = "Creature";
+        constexpr std::string_view Door = "Door";
+        constexpr std::string_view Ingredient = "Ingredient";
+        constexpr std::string_view Light = "Light";
+        constexpr std::string_view MiscItem = "Miscellaneous";
+        constexpr std::string_view NPC = "NPC";
+        constexpr std::string_view Player = "Player";
+        constexpr std::string_view Potion = "Potion";
+        constexpr std::string_view Static = "Static";
+        constexpr std::string_view Weapon = "Weapon";
+        constexpr std::string_view Apparatus = "Apparatus";
+        constexpr std::string_view Lockpick = "Lockpick";
+        constexpr std::string_view Probe = "Probe";
+        constexpr std::string_view Repair = "Repair";
+    }
+
     // ObjectId is a unique identifier of a game object.
     // It can change only if the order of content files was change.
     using ObjectId = ESM::RefNum;
diff --git a/apps/openmw/mwlua/objectbindings.cpp b/apps/openmw/mwlua/objectbindings.cpp
index 9543e306c1..ef0482f9fe 100644
--- a/apps/openmw/mwlua/objectbindings.cpp
+++ b/apps/openmw/mwlua/objectbindings.cpp
@@ -309,8 +309,38 @@ namespace MWLua
         inventoryT[sol::meta_function::to_string] =
             [](const InventoryT& inv) { return "Inventory[" + inv.mObj.toString() + "]"; };
 
-        auto getWithMask = [context](const InventoryT& inventory, int mask)
+        inventoryT["getAll"] = [worldView=context.mWorldView](const InventoryT& inventory, sol::optional<std::string_view> type)
         {
+            int mask;
+            if (!type.has_value())
+                mask = MWWorld::ContainerStore::Type_All;
+            else if (*type == ObjectTypeName::Potion)
+                mask = MWWorld::ContainerStore::Type_Potion;
+            else if (*type == ObjectTypeName::Armor)
+                mask = MWWorld::ContainerStore::Type_Armor;
+            else if (*type == ObjectTypeName::Book)
+                mask = MWWorld::ContainerStore::Type_Book;
+            else if (*type == ObjectTypeName::Clothing)
+                mask = MWWorld::ContainerStore::Type_Clothing;
+            else if (*type == ObjectTypeName::Ingredient)
+                mask = MWWorld::ContainerStore::Type_Ingredient;
+            else if (*type == ObjectTypeName::Light)
+                mask = MWWorld::ContainerStore::Type_Light;
+            else if (*type == ObjectTypeName::MiscItem)
+                mask = MWWorld::ContainerStore::Type_Miscellaneous;
+            else if (*type == ObjectTypeName::Weapon)
+                mask = MWWorld::ContainerStore::Type_Weapon;
+            else if (*type == ObjectTypeName::Apparatus)
+                mask = MWWorld::ContainerStore::Type_Apparatus;
+            else if (*type == ObjectTypeName::Lockpick)
+                mask = MWWorld::ContainerStore::Type_Lockpick;
+            else if (*type == ObjectTypeName::Probe)
+                mask = MWWorld::ContainerStore::Type_Probe;
+            else if (*type == ObjectTypeName::Repair)
+                mask = MWWorld::ContainerStore::Type_Repair;
+            else
+                throw std::runtime_error(std::string("inventory:getAll doesn't support type " + std::string(*type)));
+
             const MWWorld::Ptr& ptr = inventory.mObj.ptr();
             MWWorld::ContainerStore& store = ptr.getClass().getContainerStore(ptr);
             ObjectIdList list = std::make_shared<std::vector<ObjectId>>();
@@ -318,39 +348,12 @@ namespace MWLua
             while (it.getType() != -1)
             {
                 const MWWorld::Ptr& item = *(it++);
-                context.mWorldView->getObjectRegistry()->registerPtr(item);
+                worldView->getObjectRegistry()->registerPtr(item);
                 list->push_back(getId(item));
             }
             return ObjectList<ObjectT>{list};
         };
 
-        inventoryT["getAll"] =
-            [getWithMask](const InventoryT& inventory) { return getWithMask(inventory, MWWorld::ContainerStore::Type_All); };
-        inventoryT["getPotions"] =
-            [getWithMask](const InventoryT& inventory) { return getWithMask(inventory, MWWorld::ContainerStore::Type_Potion); };
-        inventoryT["getApparatuses"] =
-            [getWithMask](const InventoryT& inventory) { return getWithMask(inventory, MWWorld::ContainerStore::Type_Apparatus); };
-        inventoryT["getArmor"] =
-            [getWithMask](const InventoryT& inventory) { return getWithMask(inventory, MWWorld::ContainerStore::Type_Armor); };
-        inventoryT["getBooks"] =
-            [getWithMask](const InventoryT& inventory) { return getWithMask(inventory, MWWorld::ContainerStore::Type_Book); };
-        inventoryT["getClothing"] =
-            [getWithMask](const InventoryT& inventory) { return getWithMask(inventory, MWWorld::ContainerStore::Type_Clothing); };
-        inventoryT["getIngredients"] =
-            [getWithMask](const InventoryT& inventory) { return getWithMask(inventory, MWWorld::ContainerStore::Type_Ingredient); };
-        inventoryT["getLights"] =
-            [getWithMask](const InventoryT& inventory) { return getWithMask(inventory, MWWorld::ContainerStore::Type_Light); };
-        inventoryT["getLockpicks"] =
-            [getWithMask](const InventoryT& inventory) { return getWithMask(inventory, MWWorld::ContainerStore::Type_Lockpick); };
-        inventoryT["getMiscellaneous"] =
-            [getWithMask](const InventoryT& inventory) { return getWithMask(inventory, MWWorld::ContainerStore::Type_Miscellaneous); };
-        inventoryT["getProbes"] =
-            [getWithMask](const InventoryT& inventory) { return getWithMask(inventory, MWWorld::ContainerStore::Type_Probe); };
-        inventoryT["getRepairKits"] =
-            [getWithMask](const InventoryT& inventory) { return getWithMask(inventory, MWWorld::ContainerStore::Type_Repair); };
-        inventoryT["getWeapons"] =
-            [getWithMask](const InventoryT& inventory) { return getWithMask(inventory, MWWorld::ContainerStore::Type_Weapon); };
-            
         inventoryT["countOf"] = [](const InventoryT& inventory, const std::string& recordId)
         {
             const MWWorld::Ptr& ptr = inventory.mObj.ptr();
diff --git a/files/lua_api/openmw/core.lua b/files/lua_api/openmw/core.lua
index 95732af837..07309edca8 100644
--- a/files/lua_api/openmw/core.lua
+++ b/files/lua_api/openmw/core.lua
@@ -88,21 +88,24 @@
 
 -------------------------------------------------------------------------------
 -- @type OBJECT_TYPE
--- @field [parent=#OBJECT_TYPE] #string Activator "Activator"
--- @field [parent=#OBJECT_TYPE] #string Armor "Armor"
--- @field [parent=#OBJECT_TYPE] #string Book "Book"
--- @field [parent=#OBJECT_TYPE] #string Clothing "Clothing"
--- @field [parent=#OBJECT_TYPE] #string Container "Container"
--- @field [parent=#OBJECT_TYPE] #string Creature "Creature"
--- @field [parent=#OBJECT_TYPE] #string Door "Door"
--- @field [parent=#OBJECT_TYPE] #string Ingredient "Ingredient"
--- @field [parent=#OBJECT_TYPE] #string Light "Light"
--- @field [parent=#OBJECT_TYPE] #string Miscellaneous "Miscellaneous"
--- @field [parent=#OBJECT_TYPE] #string NPC "NPC"
--- @field [parent=#OBJECT_TYPE] #string Player "Player"
--- @field [parent=#OBJECT_TYPE] #string Potion "Potion"
--- @field [parent=#OBJECT_TYPE] #string Static "Static"
--- @field [parent=#OBJECT_TYPE] #string Weapon "Weapon"
+-- @field #string Activator "Activator"
+-- @field #string Armor "Armor"
+-- @field #string Book "Book"
+-- @field #string Clothing "Clothing"
+-- @field #string Container "Container"
+-- @field #string Creature "Creature"
+-- @field #string Door "Door"
+-- @field #string Ingredient "Ingredient"
+-- @field #string Light "Light"
+-- @field #string Miscellaneous "Miscellaneous"
+-- @field #string NPC "NPC"
+-- @field #string Player "Player"
+-- @field #string Potion "Potion"
+-- @field #string Static "Static"
+-- @field #string Apparatus "Apparatus"
+-- @field #string Lockpick "Lockpick"
+-- @field #string Probe "Probe"
+-- @field #string Repair "Repair"
 
 -------------------------------------------------------------------------------
 -- Possible `object.type` values.
@@ -111,25 +114,25 @@
 
 -------------------------------------------------------------------------------
 -- @type EQUIPMENT_SLOT
--- @field [parent=#EQUIPMENT_SLOT] #number Helmet
--- @field [parent=#EQUIPMENT_SLOT] #number Cuirass
--- @field [parent=#EQUIPMENT_SLOT] #number Greaves
--- @field [parent=#EQUIPMENT_SLOT] #number LeftPauldron
--- @field [parent=#EQUIPMENT_SLOT] #number RightPauldron
--- @field [parent=#EQUIPMENT_SLOT] #number LeftGauntlet
--- @field [parent=#EQUIPMENT_SLOT] #number RightGauntlet
--- @field [parent=#EQUIPMENT_SLOT] #number Boots
--- @field [parent=#EQUIPMENT_SLOT] #number Shirt
--- @field [parent=#EQUIPMENT_SLOT] #number Pants
--- @field [parent=#EQUIPMENT_SLOT] #number Skirt
--- @field [parent=#EQUIPMENT_SLOT] #number Robe
--- @field [parent=#EQUIPMENT_SLOT] #number LeftRing
--- @field [parent=#EQUIPMENT_SLOT] #number RightRing
--- @field [parent=#EQUIPMENT_SLOT] #number Amulet
--- @field [parent=#EQUIPMENT_SLOT] #number Belt
--- @field [parent=#EQUIPMENT_SLOT] #number CarriedRight
--- @field [parent=#EQUIPMENT_SLOT] #number CarriedLeft
--- @field [parent=#EQUIPMENT_SLOT] #number Ammunition
+-- @field #number Helmet
+-- @field #number Cuirass
+-- @field #number Greaves
+-- @field #number LeftPauldron
+-- @field #number RightPauldron
+-- @field #number LeftGauntlet
+-- @field #number RightGauntlet
+-- @field #number Boots
+-- @field #number Shirt
+-- @field #number Pants
+-- @field #number Skirt
+-- @field #number Robe
+-- @field #number LeftRing
+-- @field #number RightRing
+-- @field #number Amulet
+-- @field #number Belt
+-- @field #number CarriedRight
+-- @field #number CarriedLeft
+-- @field #number Ammunition
 
 -------------------------------------------------------------------------------
 -- Available equipment slots. Used in `object:getEquipment` and `object:setEquipment`.
@@ -140,17 +143,17 @@
 -- Any object that exists in the game world and has a specific location.
 -- Player, actors, items, and statics are game objects.
 -- @type GameObject
--- @field [parent=#GameObject] openmw.util#Vector3 position Object position.
--- @field [parent=#GameObject] openmw.util#Vector3 rotation Object rotation (ZXY order).
--- @field [parent=#GameObject] #Cell cell The cell where the object currently is. During loading a game and for objects in an inventory or a container `cell` is nil.
--- @field [parent=#GameObject] #string type Type of the object (see @{openmw.core#OBJECT_TYPE}).
--- @field [parent=#GameObject] #number count Count (makes sense if holded in a container).
--- @field [parent=#GameObject] #string recordId Record ID.
--- @field [parent=#GameObject] #Inventory inventory Inventory of an Player/NPC or content of an container.
--- @field [parent=#GameObject] #boolean isTeleport `True` if it is a teleport door (only if `object.type` == "Door").
--- @field [parent=#GameObject] openmw.util#Vector3 destPosition Destination (only if a teleport door).
--- @field [parent=#GameObject] openmw.util#Vector3 destRotation Destination rotation (only if a teleport door).
--- @field [parent=#GameObject] #string destCell Destination cell (only if a teleport door).
+-- @field openmw.util#Vector3 position Object position.
+-- @field openmw.util#Vector3 rotation Object rotation (ZXY order).
+-- @field #Cell cell The cell where the object currently is. During loading a game and for objects in an inventory or a container `cell` is nil.
+-- @field #string type Type of the object (see @{openmw.core#OBJECT_TYPE}).
+-- @field #number count Count (makes sense if holded in a container).
+-- @field #string recordId Record ID.
+-- @field #Inventory inventory Inventory of an Player/NPC or content of an container.
+-- @field #boolean isTeleport `True` if it is a teleport door (only if `object.type` == "Door").
+-- @field openmw.util#Vector3 destPosition Destination (only if a teleport door).
+-- @field openmw.util#Vector3 destRotation Destination rotation (only if a teleport door).
+-- @field #string destCell Destination cell (only if a teleport door).
 
 -------------------------------------------------------------------------------
 -- Is the object still exists/available.
@@ -306,12 +309,12 @@
 -------------------------------------------------------------------------------
 -- A cell of the game world.
 -- @type Cell
--- @field [parent=#Cell] #string name Name of the cell (can be empty string).
--- @field [parent=#Cell] #string region Region of the cell.
--- @field [parent=#Cell] #boolean isExterior Is it exterior or interior.
--- @field [parent=#Cell] #number gridX Index of the cell by X (only for exteriors).
--- @field [parent=#Cell] #number gridY Index of the cell by Y (only for exteriors).
--- @field [parent=#Cell] #boolean hasWater True if the cell contains water.
+-- @field #string name Name of the cell (can be empty string).
+-- @field #string region Region of the cell.
+-- @field #boolean isExterior Is it exterior or interior.
+-- @field #number gridX Index of the cell by X (only for exteriors).
+-- @field #number gridY Index of the cell by Y (only for exteriors).
+-- @field #boolean hasWater True if the cell contains water.
 
 -------------------------------------------------------------------------------
 -- Returns true either if the cell contains the object or if the cell is an exterior and the object is also in an exterior.
@@ -347,82 +350,13 @@
 -- @return #number
 
 -------------------------------------------------------------------------------
--- Get all content of the inventory.
+-- Get all items of given type from the inventory.
 -- @function [parent=#Inventory] getAll
 -- @param self
+-- @param type (optional) items type (see @{openmw.core#OBJECT_TYPE})
 -- @return #ObjectList
-
--------------------------------------------------------------------------------
--- Get all potions.
--- @function [parent=#Inventory] getPotions
--- @param self
--- @return #ObjectList
-
--------------------------------------------------------------------------------
--- Get all apparatuses.
--- @function [parent=#Inventory] getApparatuses
--- @param self
--- @return #ObjectList
-
--------------------------------------------------------------------------------
--- Get all armor.
--- @function [parent=#Inventory] getArmor
--- @param self
--- @return #ObjectList
-
--------------------------------------------------------------------------------
--- Get all books.
--- @function [parent=#Inventory] getBooks
--- @param self
--- @return #ObjectList
-
--------------------------------------------------------------------------------
--- Get all clothing.
--- @function [parent=#Inventory] getClothing
--- @param self
--- @return #ObjectList
-
--------------------------------------------------------------------------------
--- Get all ingredients.
--- @function [parent=#Inventory] getIngredients
--- @param self
--- @return #ObjectList
-
--------------------------------------------------------------------------------
--- Get all lights.
--- @function [parent=#Inventory] getLights
--- @param self
--- @return #ObjectList
-
--------------------------------------------------------------------------------
--- Get all lockpicks.
--- @function [parent=#Inventory] getLockpicks
--- @param self
--- @return #ObjectList
-
--------------------------------------------------------------------------------
--- Get all miscellaneous items.
--- @function [parent=#Inventory] getMiscellaneous
--- @param self
--- @return #ObjectList
-
--------------------------------------------------------------------------------
--- Get all probes.
--- @function [parent=#Inventory] getProbes
--- @param self
--- @return #ObjectList
-
--------------------------------------------------------------------------------
--- Get all repair kits.
--- @function [parent=#Inventory] getRepairKits
--- @param self
--- @return #ObjectList
-
--------------------------------------------------------------------------------
--- Get all weapon.
--- @function [parent=#Inventory] getWeapons
--- @param self
--- @return #ObjectList
+-- @usage local all = inventory:getAll()
+-- local weapons = inventory:getAll(core.OBJECT_TYPE.Weapon)
 
 
 return nil

From 542717394a7f18553843bcaf0ee4b976b5baf2e8 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 1 Feb 2022 21:48:06 +0100
Subject: [PATCH 2058/2859] Remove objects, water and heightfields when no
 longer required

---
 .../detournavigator/navigator.cpp             | 12 ++++++++++
 .../tilecachedrecastmeshmanager.cpp           |  4 ++--
 .../tilecachedrecastmeshmanager.cpp           | 22 ++++++++++++++++---
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index 09a2be58ee..50bf1fe735 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -1132,4 +1132,16 @@ namespace
             Vec3fEq(306, 56.66666412353515625, -2.6667339801788330078125)
         )) << mPath;
     }
+
+    TEST_F(DetourNavigatorNavigatorTest, only_one_water_per_cell_is_allowed)
+    {
+        const int cellSize1 = 100;
+        const float level1 = 1;
+        const int cellSize2 = 200;
+        const float level2 = 2;
+
+        mNavigator->addAgent(mAgentHalfExtents);
+        EXPECT_TRUE(mNavigator->addWater(mCellPosition, cellSize1, level1));
+        EXPECT_FALSE(mNavigator->addWater(mCellPosition, cellSize2, level2));
+    }
 }
diff --git a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
index c44ebc5155..c637d35424 100644
--- a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -63,7 +63,7 @@ namespace
         EXPECT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground));
     }
 
-    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, add_object_for_existing_object_should_return_false)
+    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, add_object_for_existing_object_should_throw_exception)
     {
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
@@ -225,7 +225,7 @@ namespace
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
         manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
         const auto beforeAddRevision = manager.getRevision();
-        manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
+        EXPECT_FALSE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground));
         EXPECT_EQ(manager.getRevision(), beforeAddRevision);
     }
 
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.cpp b/components/detournavigator/tilecachedrecastmeshmanager.cpp
index 17ba7afc39..d1f586f85c 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -33,6 +33,9 @@ namespace DetourNavigator
     bool TileCachedRecastMeshManager::addObject(const ObjectId id, const CollisionShape& shape,
                                                 const btTransform& transform, const AreaType areaType)
     {
+        const auto it = mObjectsTilesPositions.find(id);
+        if (it != mObjectsTilesPositions.end())
+            return false;
         std::vector<TilePosition> tilesPositions;
         {
             const std::lock_guard lock(mMutex);
@@ -46,7 +49,7 @@ namespace DetourNavigator
         if (tilesPositions.empty())
             return false;
         std::sort(tilesPositions.begin(), tilesPositions.end());
-        mObjectsTilesPositions.insert_or_assign(id, std::move(tilesPositions));
+        mObjectsTilesPositions.emplace_hint(it, id, std::move(tilesPositions));
         ++mRevision;
         return true;
     }
@@ -66,6 +69,7 @@ namespace DetourNavigator
                     result = removed;
             }
         }
+        mObjectsTilesPositions.erase(object);
         if (result)
             ++mRevision;
         return result;
@@ -73,7 +77,12 @@ namespace DetourNavigator
 
     bool TileCachedRecastMeshManager::addWater(const osg::Vec2i& cellPosition, int cellSize, float level)
     {
-        auto& tilesPositions = mWaterTilesPositions[cellPosition];
+        const auto it = mWaterTilesPositions.find(cellPosition);
+        if (it != mWaterTilesPositions.end())
+            return false;
+
+        std::vector<TilePosition>& tilesPositions = mWaterTilesPositions.emplace_hint(
+            it, cellPosition, std::vector<TilePosition>())->second;
 
         bool result = false;
 
@@ -138,6 +147,7 @@ namespace DetourNavigator
             if (tileResult && !result)
                 result = tileResult;
         }
+        mWaterTilesPositions.erase(object);
         if (result)
             ++mRevision;
         return result;
@@ -146,8 +156,13 @@ namespace DetourNavigator
     bool TileCachedRecastMeshManager::addHeightfield(const osg::Vec2i& cellPosition, int cellSize,
         const HeightfieldShape& shape)
     {
+        const auto it = mHeightfieldTilesPositions.find(cellPosition);
+        if (it != mHeightfieldTilesPositions.end())
+            return false;
+
+        std::vector<TilePosition>& tilesPositions = mHeightfieldTilesPositions.emplace_hint(
+            it, cellPosition, std::vector<TilePosition>())->second;
         const btVector3 shift = getHeightfieldShift(shape, cellPosition, cellSize);
-        auto& tilesPositions = mHeightfieldTilesPositions[cellPosition];
 
         bool result = false;
 
@@ -196,6 +211,7 @@ namespace DetourNavigator
             if (tileResult && !result)
                 result = tileResult;
         }
+        mHeightfieldTilesPositions.erase(object);
         if (result)
             ++mRevision;
         return result;

From 783411fa1f6e958c473d14ad69f818464c56ea90 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 31 Jan 2022 22:33:42 +0100
Subject: [PATCH 2059/2859] Use new player position when updating navigator on
 cell loading

---
 apps/openmw/mwworld/scene.cpp | 14 ++++++++------
 apps/openmw/mwworld/scene.hpp |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 0d2db8b99a..3b2f9cd608 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -360,7 +360,7 @@ namespace MWWorld
         mActiveCells.erase(cell);
     }
 
-    void Scene::loadCell(CellStore *cell, Loading::Listener* loadingListener, bool respawn)
+    void Scene::loadCell(CellStore *cell, Loading::Listener* loadingListener, bool respawn, const osg::Vec3f& position)
     {
         using DetourNavigator::HeightfieldShape;
 
@@ -461,7 +461,7 @@ namespace MWWorld
             mPhysics->traceDown(player, player.getRefData().getPosition().asVec3(), 10.f);
         }
 
-        mNavigator.update(player.getRefData().getPosition().asVec3());
+        mNavigator.update(position);
 
         if (!cell->isExterior() && !(cell->getCell()->mData.mFlags & ESM::Cell::QuasiEx))
             mRendering.configureAmbient(cell->getCell());
@@ -608,7 +608,7 @@ namespace MWWorld
             if (!isCellInCollection(x, y, mActiveCells))
             {
                 CellStore *cell = MWBase::Environment::get().getWorld()->getExterior(x, y);
-                loadCell (cell, loadingListener, changeEvent);
+                loadCell(cell, loadingListener, changeEvent, pos);
             }
         }
 
@@ -641,7 +641,7 @@ namespace MWWorld
             loadingListener->setLabel("Testing exterior cells ("+std::to_string(i)+"/"+std::to_string(cells.getExtSize())+")...");
 
             CellStore *cell = MWBase::Environment::get().getWorld()->getExterior(it->mData.mX, it->mData.mY);
-            loadCell(cell, nullptr, false);
+            loadCell(cell, nullptr, false, osg::Vec3f(it->mData.mX + 0.5f, it->mData.mY + 0.5f, 0) * Constants::CellSizeInUnits);
 
             auto iter = mActiveCells.begin();
             while (iter != mActiveCells.end())
@@ -686,7 +686,9 @@ namespace MWWorld
             loadingListener->setLabel("Testing interior cells ("+std::to_string(i)+"/"+std::to_string(cells.getIntSize())+")...");
 
             CellStore *cell = MWBase::Environment::get().getWorld()->getInterior(it->mName);
-            loadCell(cell, nullptr, false);
+            ESM::Position position;
+            MWBase::Environment::get().getWorld()->findInteriorPosition(it->mName, position);
+            loadCell(cell, nullptr, false, position.asVec3());
 
             auto iter = mActiveCells.begin();
             while (iter != mActiveCells.end())
@@ -821,7 +823,7 @@ namespace MWWorld
 
         // Load cell.
         mPagedRefs.clear();
-        loadCell(cell, loadingListener, changeEvent);
+        loadCell(cell, loadingListener, changeEvent, position.asVec3());
 
         changePlayerCell(cell, position, adjustPlayerPos);
 
diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp
index 623bddbc82..c0b6f5ae46 100644
--- a/apps/openmw/mwworld/scene.hpp
+++ b/apps/openmw/mwworld/scene.hpp
@@ -116,7 +116,7 @@ namespace MWWorld
             osg::Vec2i getNewGridCenter(const osg::Vec3f &pos, const osg::Vec2i *currentGridCenter = nullptr) const;
 
             void unloadCell(CellStore* cell);
-            void loadCell(CellStore *cell, Loading::Listener* loadingListener, bool respawn);
+            void loadCell(CellStore *cell, Loading::Listener* loadingListener, bool respawn, const osg::Vec3f& position);
 
         public:
 

From 1a52a2a02909707a84e6afac6ea54a1926bc6f4f Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 1 Feb 2022 00:24:56 +0100
Subject: [PATCH 2060/2859] Clamp tile position

---
 components/detournavigator/settingsutils.hpp | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/components/detournavigator/settingsutils.hpp b/components/detournavigator/settingsutils.hpp
index 285920e5a0..a4c68e3cd5 100644
--- a/components/detournavigator/settingsutils.hpp
+++ b/components/detournavigator/settingsutils.hpp
@@ -50,12 +50,24 @@ namespace DetourNavigator
         return static_cast<float>(settings.mTileSize) * settings.mCellSize;
     }
 
+    inline int getTilePosition(const RecastSettings& settings, float position)
+    {
+        const float v = std::floor(position / getTileSize(settings));
+        if (v < static_cast<float>(std::numeric_limits<int>::min()))
+            return std::numeric_limits<int>::min();
+        if (v > static_cast<float>(std::numeric_limits<int>::max() - 1))
+            return std::numeric_limits<int>::max() - 1;
+        return static_cast<int>(v);
+    }
+
+    inline TilePosition getTilePosition(const RecastSettings& settings, const osg::Vec2f& position)
+    {
+        return TilePosition(getTilePosition(settings, position.x()), getTilePosition(settings, position.y()));
+    }
+
     inline TilePosition getTilePosition(const RecastSettings& settings, const osg::Vec3f& position)
     {
-        return TilePosition(
-            static_cast<int>(std::floor(position.x() / getTileSize(settings))),
-            static_cast<int>(std::floor(position.z() / getTileSize(settings)))
-        );
+        return getTilePosition(settings, osg::Vec2f(position.x(), position.z()));
     }
 
     inline TileBounds makeTileBounds(const RecastSettings& settings, const TilePosition& tilePosition)

From 1b2954f2db6545c68e7f4f2eaaecdbfbb1b6239a Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 1 Feb 2022 00:22:53 +0100
Subject: [PATCH 2061/2859] Remove unused z coordinate

---
 apps/navmeshtool/navmesh.cpp                  |  4 ++--
 .../detournavigator/gettilespositions.cpp     | 14 ++++++------
 .../detournavigator/gettilespositions.cpp     | 22 ++++++++-----------
 .../detournavigator/gettilespositions.hpp     |  6 ++---
 components/detournavigator/tilebounds.hpp     | 13 +++++++++++
 components/misc/convert.hpp                   |  7 +++++-
 6 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/apps/navmeshtool/navmesh.cpp b/apps/navmeshtool/navmesh.cpp
index 39f2b2f37c..ca614d0cf6 100644
--- a/apps/navmeshtool/navmesh.cpp
+++ b/apps/navmeshtool/navmesh.cpp
@@ -177,8 +177,8 @@ namespace NavMeshTool
 
             DetourNavigator::getTilesPositions(
                 DetourNavigator::makeTilesPositionsRange(
-                    Misc::Convert::toOsg(input->mAabb.m_min),
-                    Misc::Convert::toOsg(input->mAabb.m_max),
+                    Misc::Convert::toOsgXY(input->mAabb.m_min),
+                    Misc::Convert::toOsgXY(input->mAabb.m_max),
                     settings.mRecast
                 ),
                 [&] (const TilePosition& tilePosition) { worldspaceTiles.push_back(tilePosition); }
diff --git a/apps/openmw_test_suite/detournavigator/gettilespositions.cpp b/apps/openmw_test_suite/detournavigator/gettilespositions.cpp
index 8121c19205..70c6ef9a09 100644
--- a/apps/openmw_test_suite/detournavigator/gettilespositions.cpp
+++ b/apps/openmw_test_suite/detournavigator/gettilespositions.cpp
@@ -37,35 +37,35 @@ namespace
 
     TEST_F(DetourNavigatorGetTilesPositionsTest, for_object_in_single_tile_should_return_one_tile)
     {
-        getTilesPositions(makeTilesPositionsRange(osg::Vec3f(2, 2, 0), osg::Vec3f(31, 31, 1), mSettings), mCollect);
+        getTilesPositions(makeTilesPositionsRange(osg::Vec2f(2, 2), osg::Vec2f(31, 31), mSettings), mCollect);
 
         EXPECT_THAT(mTilesPositions, ElementsAre(TilePosition(0, 0)));
     }
 
     TEST_F(DetourNavigatorGetTilesPositionsTest, for_object_with_x_bounds_in_two_tiles_should_return_two_tiles)
     {
-        getTilesPositions(makeTilesPositionsRange(osg::Vec3f(0, 0, 0), osg::Vec3f(32, 31, 1), mSettings), mCollect);
+        getTilesPositions(makeTilesPositionsRange(osg::Vec2f(0, 0), osg::Vec2f(32, 31), mSettings), mCollect);
 
         EXPECT_THAT(mTilesPositions, ElementsAre(TilePosition(0, 0), TilePosition(1, 0)));
     }
 
     TEST_F(DetourNavigatorGetTilesPositionsTest, for_object_with_y_bounds_in_two_tiles_should_return_two_tiles)
     {
-        getTilesPositions(makeTilesPositionsRange(osg::Vec3f(0, 0, 0), osg::Vec3f(31, 32, 1), mSettings), mCollect);
+        getTilesPositions(makeTilesPositionsRange(osg::Vec2f(0, 0), osg::Vec2f(31, 32), mSettings), mCollect);
 
         EXPECT_THAT(mTilesPositions, ElementsAre(TilePosition(0, 0), TilePosition(0, 1)));
     }
 
     TEST_F(DetourNavigatorGetTilesPositionsTest, tiling_works_only_for_x_and_y_coordinates)
     {
-        getTilesPositions(makeTilesPositionsRange(osg::Vec3f(0, 0, 0), osg::Vec3f(31, 31, 32), mSettings), mCollect);
+        getTilesPositions(makeTilesPositionsRange(osg::Vec2f(0, 0), osg::Vec2f(31, 31), mSettings), mCollect);
 
         EXPECT_THAT(mTilesPositions, ElementsAre(TilePosition(0, 0)));
     }
 
     TEST_F(DetourNavigatorGetTilesPositionsTest, tiling_should_work_with_negative_coordinates)
     {
-        getTilesPositions(makeTilesPositionsRange(osg::Vec3f(-31, -31, 0), osg::Vec3f(31, 31, 1), mSettings), mCollect);
+        getTilesPositions(makeTilesPositionsRange(osg::Vec2f(-31, -31), osg::Vec2f(31, 31), mSettings), mCollect);
 
         EXPECT_THAT(mTilesPositions, ElementsAre(
             TilePosition(-1, -1),
@@ -79,7 +79,7 @@ namespace
     {
         mSettings.mBorderSize = 1;
 
-        getTilesPositions(makeTilesPositionsRange(osg::Vec3f(0, 0, 0), osg::Vec3f(31.5, 31.5, 1), mSettings), mCollect);
+        getTilesPositions(makeTilesPositionsRange(osg::Vec2f(0, 0), osg::Vec2f(31.5, 31.5), mSettings), mCollect);
 
         EXPECT_THAT(mTilesPositions, ElementsAre(
             TilePosition(-1, -1),
@@ -98,7 +98,7 @@ namespace
     {
         mSettings.mRecastScaleFactor = 0.5;
 
-        getTilesPositions(makeTilesPositionsRange(osg::Vec3f(0, 0, 0), osg::Vec3f(32, 32, 1), mSettings), mCollect);
+        getTilesPositions(makeTilesPositionsRange(osg::Vec2f(0, 0), osg::Vec2f(32, 32), mSettings), mCollect);
 
         EXPECT_THAT(mTilesPositions, ElementsAre(TilePosition(0, 0)));
     }
diff --git a/components/detournavigator/gettilespositions.cpp b/components/detournavigator/gettilespositions.cpp
index d427eb3e12..4bf5159a88 100644
--- a/components/detournavigator/gettilespositions.cpp
+++ b/components/detournavigator/gettilespositions.cpp
@@ -2,6 +2,7 @@
 #include "settings.hpp"
 #include "settingsutils.hpp"
 #include "tileposition.hpp"
+#include "tilebounds.hpp"
 
 #include <components/misc/convert.hpp>
 
@@ -9,15 +10,15 @@
 
 namespace DetourNavigator
 {
-    TilesPositionsRange makeTilesPositionsRange(const osg::Vec3f& aabbMin, const osg::Vec3f& aabbMax,
+    TilesPositionsRange makeTilesPositionsRange(const osg::Vec2f& aabbMin, const osg::Vec2f& aabbMax,
         const RecastSettings& settings)
     {
-        osg::Vec3f min = toNavMeshCoordinates(settings, aabbMin);
-        osg::Vec3f max = toNavMeshCoordinates(settings, aabbMax);
+        osg::Vec2f min = toNavMeshCoordinates(settings, aabbMin);
+        osg::Vec2f max = toNavMeshCoordinates(settings, aabbMax);
 
         const float border = getBorderSize(settings);
-        min -= osg::Vec3f(border, border, border);
-        max += osg::Vec3f(border, border, border);
+        min -= osg::Vec2f(border, border);
+        max += osg::Vec2f(border, border);
 
         TilePosition minTile = getTilePosition(settings, min);
         TilePosition maxTile = getTilePosition(settings, max);
@@ -34,18 +35,13 @@ namespace DetourNavigator
     TilesPositionsRange makeTilesPositionsRange(const btCollisionShape& shape, const btTransform& transform,
         const RecastSettings& settings)
     {
-        btVector3 aabbMin;
-        btVector3 aabbMax;
-        shape.getAabb(transform, aabbMin, aabbMax);
-
-        return makeTilesPositionsRange(Misc::Convert::toOsg(aabbMin), Misc::Convert::toOsg(aabbMax), settings);
+        const TileBounds bounds = makeObjectTileBounds(shape, transform);
+        return makeTilesPositionsRange(bounds.mMin, bounds.mMax, settings);
     }
 
     TilesPositionsRange makeTilesPositionsRange(const int cellSize, const btVector3& shift,
         const RecastSettings& settings)
     {
-        using Misc::Convert::toOsg;
-
         const int halfCellSize = cellSize / 2;
         const btTransform transform(btMatrix3x3::getIdentity(), shift);
         btVector3 aabbMin = transform(btVector3(-halfCellSize, -halfCellSize, 0));
@@ -57,6 +53,6 @@ namespace DetourNavigator
         aabbMax.setX(std::max(aabbMin.x(), aabbMax.x()));
         aabbMax.setY(std::max(aabbMin.y(), aabbMax.y()));
 
-        return makeTilesPositionsRange(toOsg(aabbMin), toOsg(aabbMax), settings);
+        return makeTilesPositionsRange(Misc::Convert::toOsgXY(aabbMin), Misc::Convert::toOsgXY(aabbMax), settings);
     }
 }
diff --git a/components/detournavigator/gettilespositions.hpp b/components/detournavigator/gettilespositions.hpp
index 946f3e64f2..8a8b2b7c32 100644
--- a/components/detournavigator/gettilespositions.hpp
+++ b/components/detournavigator/gettilespositions.hpp
@@ -9,7 +9,7 @@ class btCollisionShape;
 
 namespace osg
 {
-    class Vec3f;
+    class Vec2f;
 }
 
 namespace DetourNavigator
@@ -22,8 +22,8 @@ namespace DetourNavigator
         TilePosition mMax;
     };
 
-    TilesPositionsRange makeTilesPositionsRange(const osg::Vec3f& aabbMin,
-        const osg::Vec3f& aabbMax, const RecastSettings& settings);
+    TilesPositionsRange makeTilesPositionsRange(const osg::Vec2f& aabbMin,
+        const osg::Vec2f& aabbMax, const RecastSettings& settings);
 
     TilesPositionsRange makeTilesPositionsRange(const btCollisionShape& shape,
         const btTransform& transform, const RecastSettings& settings);
diff --git a/components/detournavigator/tilebounds.hpp b/components/detournavigator/tilebounds.hpp
index 693a382740..79f6370ff2 100644
--- a/components/detournavigator/tilebounds.hpp
+++ b/components/detournavigator/tilebounds.hpp
@@ -1,9 +1,14 @@
 #ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_TILEBOUNDS_H
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_TILEBOUNDS_H
 
+#include <components/misc/convert.hpp>
+
 #include <osg/Vec2f>
 #include <osg/Vec2i>
 
+#include <BulletCollision/CollisionShapes/btCollisionShape.h>
+#include <LinearMath/btTransform.h>
+
 #include <algorithm>
 #include <optional>
 #include <tuple>
@@ -41,6 +46,14 @@ namespace DetourNavigator
             osg::Vec2f(position.x() + 1, position.y() + 1) * size
         };
     }
+
+    inline TileBounds makeObjectTileBounds(const btCollisionShape& shape, const btTransform& transform)
+    {
+        btVector3 aabbMin;
+        btVector3 aabbMax;
+        shape.getAabb(transform, aabbMin, aabbMax);
+        return TileBounds {Misc::Convert::toOsgXY(aabbMin), Misc::Convert::toOsgXY(aabbMax)};
+    }
 }
 
 #endif
diff --git a/components/misc/convert.hpp b/components/misc/convert.hpp
index f31f1cc08e..0b84c32059 100644
--- a/components/misc/convert.hpp
+++ b/components/misc/convert.hpp
@@ -70,6 +70,11 @@ namespace Misc::Convert
     {
         return btTransform(makeBulletQuaternion(position), toBullet(position.asVec3()));
     }
+
+    inline osg::Vec2f toOsgXY(const btVector3& value)
+    {
+        return osg::Vec2f(static_cast<float>(value.x()), static_cast<float>(value.y()));
+    }
 }
 
-#endif
\ No newline at end of file
+#endif

From a5b078e9a714ef0c078bf74ab041b02ded8c07e2 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 1 Feb 2022 00:35:03 +0100
Subject: [PATCH 2062/2859] Allow to represent empty range with
 TilesPositionsRange

---
 components/detournavigator/gettilespositions.cpp |  2 +-
 components/detournavigator/gettilespositions.hpp | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/detournavigator/gettilespositions.cpp b/components/detournavigator/gettilespositions.cpp
index 4bf5159a88..7a179aff24 100644
--- a/components/detournavigator/gettilespositions.cpp
+++ b/components/detournavigator/gettilespositions.cpp
@@ -29,7 +29,7 @@ namespace DetourNavigator
         if (minTile.y() > maxTile.y())
             std::swap(minTile.y(), maxTile.y());
 
-        return {minTile, maxTile};
+        return {minTile, maxTile + osg::Vec2i(1, 1)};
     }
 
     TilesPositionsRange makeTilesPositionsRange(const btCollisionShape& shape, const btTransform& transform,
diff --git a/components/detournavigator/gettilespositions.hpp b/components/detournavigator/gettilespositions.hpp
index 8a8b2b7c32..db88708314 100644
--- a/components/detournavigator/gettilespositions.hpp
+++ b/components/detournavigator/gettilespositions.hpp
@@ -18,8 +18,8 @@ namespace DetourNavigator
 
     struct TilesPositionsRange
     {
-        TilePosition mMin;
-        TilePosition mMax;
+        TilePosition mBegin;
+        TilePosition mEnd;
     };
 
     TilesPositionsRange makeTilesPositionsRange(const osg::Vec2f& aabbMin,
@@ -32,10 +32,10 @@ namespace DetourNavigator
         const RecastSettings& settings);
 
     template <class Callback>
-    void getTilesPositions(const TilesPositionsRange& range, Callback&& callback)
+    inline void getTilesPositions(const TilesPositionsRange& range, Callback&& callback)
     {
-        for (int tileX = range.mMin.x(); tileX <= range.mMax.x(); ++tileX)
-            for (int tileY = range.mMin.y(); tileY <= range.mMax.y(); ++tileY)
+        for (int tileX = range.mBegin.x(); tileX < range.mEnd.x(); ++tileX)
+            for (int tileY = range.mBegin.y(); tileY < range.mEnd.y(); ++tileY)
                 callback(TilePosition {tileX, tileY});
     }
 }

From 563f3f87dd2dd6f174eb00c72853204ae432ca0b Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 1 Feb 2022 00:42:03 +0100
Subject: [PATCH 2063/2859] Reduce critical sections size

---
 components/detournavigator/tilecachedrecastmeshmanager.cpp | 3 ++-
 components/detournavigator/tilecachedrecastmeshmanager.hpp | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/components/detournavigator/tilecachedrecastmeshmanager.cpp b/components/detournavigator/tilecachedrecastmeshmanager.cpp
index d1f586f85c..314e7641e3 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -38,8 +38,9 @@ namespace DetourNavigator
             return false;
         std::vector<TilePosition> tilesPositions;
         {
+            const TilesPositionsRange range = makeTilesPositionsRange(shape.getShape(), transform, mSettings);
             const std::lock_guard lock(mMutex);
-            getTilesPositions(makeTilesPositionsRange(shape.getShape(), transform, mSettings),
+            getTilesPositions(range,
                 [&] (const TilePosition& tilePosition)
                 {
                     if (addTile(id, shape, transform, areaType, tilePosition, mTiles))
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.hpp b/components/detournavigator/tilecachedrecastmeshmanager.hpp
index 88face24ce..efd70477d3 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.hpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.hpp
@@ -38,7 +38,6 @@ namespace DetourNavigator
             bool changed = false;
             std::vector<TilePosition> newTiles;
             {
-                const std::lock_guard lock(mMutex);
                 const auto onTilePosition = [&] (const TilePosition& tilePosition)
                 {
                     if (std::binary_search(currentTiles.begin(), currentTiles.end(), tilePosition))
@@ -57,7 +56,9 @@ namespace DetourNavigator
                         changed = true;
                     }
                 };
-                getTilesPositions(makeTilesPositionsRange(shape.getShape(), transform, mSettings), onTilePosition);
+                const TilesPositionsRange range = makeTilesPositionsRange(shape.getShape(), transform, mSettings);
+                const std::lock_guard lock(mMutex);
+                getTilesPositions(range, onTilePosition);
                 std::sort(newTiles.begin(), newTiles.end());
                 for (const auto& tile : currentTiles)
                 {

From 05b54cbfb86ec12e35278e0a69c108fabd4fb4b2 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 1 Feb 2022 01:21:47 +0100
Subject: [PATCH 2064/2859] Cull navmesh objects by scene bounds

If object is too big iteration over all tiles covering it can take too much
time. Limit bounds to a square around a player position to cover only tiles
that will be present in navmesh based on max tiles number option.

Each object is associated with a set of tiles its present in. Culling can
reduce this set but it has to be update when bounds change position. Do this
in TileCachedRecastMeshManager::setBounds updating the set and adding/removing
objects to the corresponding CachedRecastMeshManagers.
---
 apps/navmeshtool/worldspacedata.cpp           |   6 +-
 apps/openmw/mwworld/scene.cpp                 |   4 +
 .../detournavigator/asyncnavmeshupdater.cpp   |   2 +-
 .../detournavigator/operators.hpp             |   8 --
 .../tilecachedrecastmeshmanager.cpp           | 127 ++++++++++++------
 .../detournavigator/asyncnavmeshupdater.hpp   |  24 +---
 components/detournavigator/changetype.hpp     |  33 +++++
 .../detournavigator/gettilespositions.cpp     |  21 +++
 .../detournavigator/gettilespositions.hpp     |  17 +++
 components/detournavigator/navigator.hpp      |   6 +
 components/detournavigator/navigatorimpl.cpp  |   6 +
 components/detournavigator/navigatorimpl.hpp  |   2 +
 components/detournavigator/navigatorstub.hpp  |   2 +
 components/detournavigator/navmeshmanager.cpp |  43 +++++-
 components/detournavigator/navmeshmanager.hpp |   2 +
 components/detournavigator/settingsutils.hpp  |   5 +
 components/detournavigator/tilebounds.hpp     |  17 ++-
 .../tilecachedrecastmeshmanager.cpp           | 107 +++++++++++----
 .../tilecachedrecastmeshmanager.hpp           |  73 +++++++---
 19 files changed, 378 insertions(+), 127 deletions(-)
 create mode 100644 components/detournavigator/changetype.hpp

diff --git a/apps/navmeshtool/worldspacedata.cpp b/apps/navmeshtool/worldspacedata.cpp
index 742e6d775d..81bbd857f5 100644
--- a/apps/navmeshtool/worldspacedata.cpp
+++ b/apps/navmeshtool/worldspacedata.cpp
@@ -298,12 +298,14 @@ namespace NavMeshTool
                     const ObjectId objectId(++objectsCounter);
                     const CollisionShape shape(object.getShapeInstance(), *object.getCollisionObject().getCollisionShape(), object.getObjectTransform());
 
-                    navMeshInput.mTileCachedRecastMeshManager.addObject(objectId, shape, transform, DetourNavigator::AreaType_ground);
+                    navMeshInput.mTileCachedRecastMeshManager.addObject(objectId, shape, transform,
+                        DetourNavigator::AreaType_ground, [] (const auto&) {});
 
                     if (const btCollisionShape* avoid = object.getShapeInstance()->mAvoidCollisionShape.get())
                     {
                         const CollisionShape avoidShape(object.getShapeInstance(), *avoid, object.getObjectTransform());
-                        navMeshInput.mTileCachedRecastMeshManager.addObject(objectId, avoidShape, transform, DetourNavigator::AreaType_null);
+                        navMeshInput.mTileCachedRecastMeshManager.addObject(objectId, avoidShape, transform,
+                            DetourNavigator::AreaType_null, [] (const auto&) {});
                     }
 
                     data.mObjects.emplace_back(std::move(object));
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 3b2f9cd608..1cb80389ce 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -534,6 +534,8 @@ namespace MWWorld
                 unloadCell (cell);
         }
 
+        mNavigator.updateBounds(pos);
+
         mCurrentGridCenter = osg::Vec2i(playerCellX, playerCellY);
         osg::Vec4i newGrid = gridCenterToBounds(mCurrentGridCenter);
         mRendering.setActiveGrid(newGrid);
@@ -821,6 +823,8 @@ namespace MWWorld
 
         loadingListener->setProgressRange(cell->count());
 
+        mNavigator.updateBounds(position.asVec3());
+
         // Load cell.
         mPagedRefs.clear();
         loadCell(cell, loadingListener, changeEvent, position.asVec3());
diff --git a/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp b/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp
index b23446cea7..71c013d9f4 100644
--- a/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp
+++ b/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp
@@ -40,7 +40,7 @@ namespace
             osg::ref_ptr<Resource::BulletShapeInstance>(new Resource::BulletShapeInstance(bulletShape)),
             shape, objectTransform
         );
-        recastMeshManager.addObject(id, collisionShape, btTransform::getIdentity(), AreaType_ground);
+        recastMeshManager.addObject(id, collisionShape, btTransform::getIdentity(), AreaType_ground, [] (auto) {});
     }
 
     struct DetourNavigatorAsyncNavMeshUpdaterTest : Test
diff --git a/apps/openmw_test_suite/detournavigator/operators.hpp b/apps/openmw_test_suite/detournavigator/operators.hpp
index fb6fcc5c39..60e1400764 100644
--- a/apps/openmw_test_suite/detournavigator/operators.hpp
+++ b/apps/openmw_test_suite/detournavigator/operators.hpp
@@ -12,14 +12,6 @@
 
 #include <gtest/gtest.h>
 
-namespace DetourNavigator
-{
-    static inline bool operator ==(const TileBounds& lhs, const TileBounds& rhs)
-    {
-        return lhs.mMin == rhs.mMin && lhs.mMax == rhs.mMax;
-    }
-}
-
 namespace
 {
     template <class T>
diff --git a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
index c637d35424..4803f452b3 100644
--- a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -16,7 +16,8 @@ namespace
     struct DetourNavigatorTileCachedRecastMeshManagerTest : Test
     {
         RecastSettings mSettings;
-        std::vector<TilePosition> mChangedTiles;
+        std::vector<TilePosition> mAddedTiles;
+        std::vector<std::pair<TilePosition, ChangeType>> mChangedTiles;
         const ObjectTransform mObjectTransform {ESM::Position {{0, 0, 0}, {0, 0, 0}}, 0.0f};
         const osg::ref_ptr<const Resource::BulletShape> mShape = new Resource::BulletShape;
         const osg::ref_ptr<const Resource::BulletShapeInstance> mInstance = new Resource::BulletShapeInstance(mShape);
@@ -29,9 +30,14 @@ namespace
             mSettings.mTileSize = 64;
         }
 
-        void onChangedTile(const TilePosition& tilePosition)
+        void onAddedTile(const TilePosition& tilePosition)
         {
-            mChangedTiles.push_back(tilePosition);
+            mAddedTiles.push_back(tilePosition);
+        }
+
+        void onChangedTile(const TilePosition& tilePosition, ChangeType changeType)
+        {
+            mChangedTiles.emplace_back(tilePosition, changeType);
         }
     };
 
@@ -60,16 +66,16 @@ namespace
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
-        EXPECT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground));
+        EXPECT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {}));
     }
 
-    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, add_object_for_existing_object_should_throw_exception)
+    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, add_object_for_existing_object_should_return_false)
     {
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
-        manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
-        EXPECT_FALSE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground));
+        manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {});
+        EXPECT_FALSE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {}));
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, add_object_should_add_tiles)
@@ -78,26 +84,47 @@ namespace
         manager.setWorldspace("worldspace");
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
-        ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground));
+        ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {}));
         for (int x = -1; x < 1; ++x)
             for (int y = -1; y < 1; ++y)
                 ASSERT_NE(manager.getMesh("worldspace", TilePosition(x, y)), nullptr);
     }
 
+    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, add_object_should_return_added_tiles)
+    {
+        TileCachedRecastMeshManager manager(mSettings);
+        const btBoxShape boxShape(btVector3(20, 20, 100));
+        const CollisionShape shape(mInstance, boxShape, mObjectTransform);
+        TileBounds bounds;
+        bounds.mMin = osg::Vec2f(182, 182);
+        bounds.mMax = osg::Vec2f(1000, 1000);
+        manager.setBounds(bounds);
+        manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground,
+                          [&] (const auto& v) { onAddedTile(v); });
+        EXPECT_THAT(mAddedTiles, ElementsAre(TilePosition(0, 0)));
+    }
+
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, update_object_for_changed_object_should_return_changed_tiles)
     {
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const btTransform transform(btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
-        manager.addObject(ObjectId(&boxShape), shape, transform, AreaType::AreaType_ground);
+        TileBounds bounds;
+        bounds.mMin = osg::Vec2f(-1000, -1000);
+        bounds.mMax = osg::Vec2f(1000, 1000);
+        manager.setBounds(bounds);
+        manager.addObject(ObjectId(&boxShape), shape, transform, AreaType::AreaType_ground, [] (auto) {});
         EXPECT_TRUE(manager.updateObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground,
-                                         [&] (const auto& v) { onChangedTile(v); }));
-        EXPECT_THAT(
-            mChangedTiles,
-            ElementsAre(TilePosition(-1, -1), TilePosition(-1, 0), TilePosition(0, -1), TilePosition(0, 0),
-                        TilePosition(1, -1), TilePosition(1, 0))
-        );
+                                         [&] (const auto& ... v) { onChangedTile(v ...); }));
+        EXPECT_THAT(mChangedTiles, ElementsAre(
+            std::pair(TilePosition(-1, -1), ChangeType::add),
+            std::pair(TilePosition(-1, 0), ChangeType::add),
+            std::pair(TilePosition(0, -1), ChangeType::update),
+            std::pair(TilePosition(0, 0), ChangeType::update),
+            std::pair(TilePosition(1, -1), ChangeType::remove),
+            std::pair(TilePosition(1, 0), ChangeType::remove)
+        ));
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, update_object_for_not_changed_object_should_return_empty)
@@ -105,10 +132,10 @@ namespace
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
-        manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
+        manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {});
         EXPECT_FALSE(manager.updateObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground,
-                                          [&] (const auto& v) { onChangedTile(v); }));
-        EXPECT_EQ(mChangedTiles, std::vector<TilePosition>());
+                                          [&] (const auto& ... v) { onChangedTile(v ...); }));
+        EXPECT_THAT(mChangedTiles, IsEmpty());
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, get_mesh_after_add_object_should_return_recast_mesh_for_each_used_tile)
@@ -117,7 +144,7 @@ namespace
         manager.setWorldspace("worldspace");
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
-        manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
+        manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {});
         EXPECT_NE(manager.getMesh("worldspace", TilePosition(-1, -1)), nullptr);
         EXPECT_NE(manager.getMesh("worldspace", TilePosition(-1, 0)), nullptr);
         EXPECT_NE(manager.getMesh("worldspace", TilePosition(0, -1)), nullptr);
@@ -130,26 +157,30 @@ namespace
         manager.setWorldspace("worldspace");
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
-        manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
+        manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {});
         EXPECT_EQ(manager.getMesh("worldspace", TilePosition(1, 0)), nullptr);
     }
 
     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, get_mesh_for_moved_object_should_return_recast_mesh_for_each_used_tile)
     {
         TileCachedRecastMeshManager manager(mSettings);
+        TileBounds bounds;
+        bounds.mMin = osg::Vec2f(-1000, -1000);
+        bounds.mMax = osg::Vec2f(1000, 1000);
+        manager.setBounds(bounds);
         manager.setWorldspace("worldspace");
 
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const btTransform transform(btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
 
-        manager.addObject(ObjectId(&boxShape), shape, transform, AreaType::AreaType_ground);
+        manager.addObject(ObjectId(&boxShape), shape, transform, AreaType::AreaType_ground, [] (auto) {});
         EXPECT_NE(manager.getMesh("worldspace", TilePosition(0, -1)), nullptr);
         EXPECT_NE(manager.getMesh("worldspace", TilePosition(0, 0)), nullptr);
         EXPECT_NE(manager.getMesh("worldspace", TilePosition(1, 0)), nullptr);
         EXPECT_NE(manager.getMesh("worldspace", TilePosition(1, -1)), nullptr);
 
-        manager.updateObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {});
+        manager.updateObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto, auto) {});
         EXPECT_NE(manager.getMesh("worldspace", TilePosition(-1, -1)), nullptr);
         EXPECT_NE(manager.getMesh("worldspace", TilePosition(-1, 0)), nullptr);
         EXPECT_NE(manager.getMesh("worldspace", TilePosition(0, -1)), nullptr);
@@ -165,11 +196,11 @@ namespace
         const btTransform transform(btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
 
-        manager.addObject(ObjectId(&boxShape), shape, transform, AreaType::AreaType_ground);
+        manager.addObject(ObjectId(&boxShape), shape, transform, AreaType::AreaType_ground, [] (auto) {});
         EXPECT_EQ(manager.getMesh("worldspace", TilePosition(-1, -1)), nullptr);
         EXPECT_EQ(manager.getMesh("worldspace", TilePosition(-1, 0)), nullptr);
 
-        manager.updateObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {});
+        manager.updateObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto, auto) {});
         EXPECT_EQ(manager.getMesh("worldspace", TilePosition(1, 0)), nullptr);
         EXPECT_EQ(manager.getMesh("worldspace", TilePosition(1, -1)), nullptr);
     }
@@ -180,7 +211,7 @@ namespace
         manager.setWorldspace("worldspace");
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
-        manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
+        manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {});
         manager.removeObject(ObjectId(&boxShape));
         EXPECT_EQ(manager.getMesh("worldspace", TilePosition(-1, -1)), nullptr);
         EXPECT_EQ(manager.getMesh("worldspace", TilePosition(-1, 0)), nullptr);
@@ -195,13 +226,13 @@ namespace
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
 
-        manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
+        manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {});
         EXPECT_NE(manager.getMesh("worldspace", TilePosition(-1, -1)), nullptr);
         EXPECT_NE(manager.getMesh("worldspace", TilePosition(-1, 0)), nullptr);
         EXPECT_NE(manager.getMesh("worldspace", TilePosition(0, -1)), nullptr);
         EXPECT_NE(manager.getMesh("worldspace", TilePosition(0, 0)), nullptr);
 
-        manager.updateObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {});
+        manager.updateObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto, auto) {});
         EXPECT_NE(manager.getMesh("worldspace", TilePosition(-1, -1)), nullptr);
         EXPECT_NE(manager.getMesh("worldspace", TilePosition(-1, 0)), nullptr);
         EXPECT_NE(manager.getMesh("worldspace", TilePosition(0, -1)), nullptr);
@@ -214,7 +245,7 @@ namespace
         const auto initialRevision = manager.getRevision();
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
-        manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
+        manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {});
         EXPECT_EQ(manager.getRevision(), initialRevision + 1);
     }
 
@@ -223,9 +254,9 @@ namespace
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
-        manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
+        manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {});
         const auto beforeAddRevision = manager.getRevision();
-        EXPECT_FALSE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground));
+        EXPECT_FALSE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {}));
         EXPECT_EQ(manager.getRevision(), beforeAddRevision);
     }
 
@@ -235,9 +266,9 @@ namespace
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const btTransform transform(btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
-        manager.addObject(ObjectId(&boxShape), shape, transform, AreaType::AreaType_ground);
+        manager.addObject(ObjectId(&boxShape), shape, transform, AreaType::AreaType_ground, [] (auto) {});
         const auto beforeUpdateRevision = manager.getRevision();
-        manager.updateObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {});
+        manager.updateObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto, auto) {});
         EXPECT_EQ(manager.getRevision(), beforeUpdateRevision + 1);
     }
 
@@ -247,9 +278,9 @@ namespace
         manager.setWorldspace("worldspace");
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
-        manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
+        manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {});
         const auto beforeUpdateRevision = manager.getRevision();
-        manager.updateObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {});
+        manager.updateObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto, auto) {});
         EXPECT_EQ(manager.getRevision(), beforeUpdateRevision);
     }
 
@@ -258,7 +289,7 @@ namespace
         TileCachedRecastMeshManager manager(mSettings);
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
-        manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground);
+        manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {});
         const auto beforeRemoveRevision = manager.getRevision();
         manager.removeObject(ObjectId(&boxShape));
         EXPECT_EQ(manager.getRevision(), beforeRemoveRevision + 1);
@@ -298,7 +329,7 @@ namespace
         manager.setWorldspace("worldspace");
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
-        ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground));
+        ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {}));
         const osg::Vec2i cellPosition(0, 0);
         const int cellSize = std::numeric_limits<int>::max();
         ASSERT_TRUE(manager.addWater(cellPosition, cellSize, 0.0f));
@@ -343,7 +374,7 @@ namespace
         manager.setWorldspace("worldspace");
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
-        ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground));
+        ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {}));
         const osg::Vec2i cellPosition(0, 0);
         const int cellSize = 8192;
         ASSERT_TRUE(manager.addWater(cellPosition, cellSize, 0.0f));
@@ -361,7 +392,7 @@ namespace
         const int cellSize = 8192;
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(mInstance, boxShape, mObjectTransform);
-        ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground));
+        ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {}));
         ASSERT_TRUE(manager.addWater(cellPosition, cellSize, 0.0f));
         ASSERT_TRUE(manager.removeObject(ObjectId(&boxShape)));
         for (int x = -1; x < 12; ++x)
@@ -375,10 +406,28 @@ namespace
         manager.setWorldspace("worldspace");
         const btBoxShape boxShape(btVector3(20, 20, 100));
         const CollisionShape shape(nullptr, boxShape, mObjectTransform);
-        ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground));
+        ASSERT_TRUE(manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {}));
         manager.setWorldspace("other");
         for (int x = -1; x < 1; ++x)
             for (int y = -1; y < 1; ++y)
                 ASSERT_EQ(manager.getMesh("other", TilePosition(x, y)), nullptr);
     }
+
+    TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, set_bounds_should_return_changed_tiles)
+    {
+        TileCachedRecastMeshManager manager(mSettings);
+        const btBoxShape boxShape(btVector3(20, 20, 100));
+        const CollisionShape shape(mInstance, boxShape, mObjectTransform);
+        TileBounds bounds;
+        bounds.mMin = osg::Vec2f(182, 0);
+        bounds.mMax = osg::Vec2f(1000, 1000);
+        manager.setBounds(bounds);
+        manager.addObject(ObjectId(&boxShape), shape, btTransform::getIdentity(), AreaType::AreaType_ground, [] (auto) {});
+        bounds.mMin = osg::Vec2f(-1000, -1000);
+        bounds.mMax = osg::Vec2f(0, -182);
+        EXPECT_THAT(manager.setBounds(bounds), ElementsAre(
+            std::pair(TilePosition(-1, -1), ChangeType::add),
+            std::pair(TilePosition(0, 0), ChangeType::remove)
+        ));
+    }
 }
diff --git a/components/detournavigator/asyncnavmeshupdater.hpp b/components/detournavigator/asyncnavmeshupdater.hpp
index 31778f8c26..fa8cba03af 100644
--- a/components/detournavigator/asyncnavmeshupdater.hpp
+++ b/components/detournavigator/asyncnavmeshupdater.hpp
@@ -8,6 +8,7 @@
 #include "navmeshtilescache.hpp"
 #include "waitconditiontype.hpp"
 #include "navmeshdb.hpp"
+#include "changetype.hpp"
 
 #include <osg/Vec3f>
 
@@ -32,29 +33,6 @@ namespace Loading
 
 namespace DetourNavigator
 {
-    enum class ChangeType
-    {
-        remove = 0,
-        mixed = 1,
-        add = 2,
-        update = 3,
-    };
-
-    inline std::ostream& operator <<(std::ostream& stream, ChangeType value)
-    {
-        switch (value) {
-            case ChangeType::remove:
-                return stream << "ChangeType::remove";
-            case ChangeType::mixed:
-                return stream << "ChangeType::mixed";
-            case ChangeType::add:
-                return stream << "ChangeType::add";
-            case ChangeType::update:
-                return stream << "ChangeType::update";
-        }
-        return stream << "ChangeType::" << static_cast<int>(value);
-    }
-
     enum class JobState
     {
         Initial,
diff --git a/components/detournavigator/changetype.hpp b/components/detournavigator/changetype.hpp
new file mode 100644
index 0000000000..1ede6aec13
--- /dev/null
+++ b/components/detournavigator/changetype.hpp
@@ -0,0 +1,33 @@
+#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_CHANGETYPE_H
+#define OPENMW_COMPONENTS_DETOURNAVIGATOR_CHANGETYPE_H
+
+#include <ostream>
+
+namespace DetourNavigator
+{
+    enum class ChangeType
+    {
+        remove = 0,
+        mixed = 1,
+        add = 2,
+        update = 3,
+    };
+
+    inline std::ostream& operator <<(std::ostream& stream, ChangeType value)
+    {
+        switch (value)
+        {
+            case ChangeType::remove:
+                return stream << "ChangeType::remove";
+            case ChangeType::mixed:
+                return stream << "ChangeType::mixed";
+            case ChangeType::add:
+                return stream << "ChangeType::add";
+            case ChangeType::update:
+                return stream << "ChangeType::update";
+        }
+        return stream << "ChangeType::" << static_cast<int>(value);
+    }
+}
+
+#endif
diff --git a/components/detournavigator/gettilespositions.cpp b/components/detournavigator/gettilespositions.cpp
index 7a179aff24..2d42ec25bb 100644
--- a/components/detournavigator/gettilespositions.cpp
+++ b/components/detournavigator/gettilespositions.cpp
@@ -39,6 +39,14 @@ namespace DetourNavigator
         return makeTilesPositionsRange(bounds.mMin, bounds.mMax, settings);
     }
 
+    TilesPositionsRange makeTilesPositionsRange(const btCollisionShape& shape, const btTransform& transform,
+        const TileBounds& bounds, const RecastSettings& settings)
+    {
+        if (const auto intersection = getIntersection(bounds, makeObjectTileBounds(shape, transform)))
+            return makeTilesPositionsRange(intersection->mMin, intersection->mMax, settings);
+        return {};
+    }
+
     TilesPositionsRange makeTilesPositionsRange(const int cellSize, const btVector3& shift,
         const RecastSettings& settings)
     {
@@ -55,4 +63,17 @@ namespace DetourNavigator
 
         return makeTilesPositionsRange(Misc::Convert::toOsgXY(aabbMin), Misc::Convert::toOsgXY(aabbMax), settings);
     }
+
+    TilesPositionsRange getIntersection(const TilesPositionsRange& a, const TilesPositionsRange& b) noexcept
+    {
+        const int beginX = std::max(a.mBegin.x(), b.mBegin.x());
+        const int endX = std::min(a.mEnd.x(), b.mEnd.x());
+        if (beginX > endX)
+            return {};
+        const int beginY = std::max(a.mBegin.y(), b.mBegin.y());
+        const int endY = std::min(a.mEnd.y(), b.mEnd.y());
+        if (beginY > endY)
+            return {};
+        return TilesPositionsRange {TilePosition(beginX, beginY), TilePosition(endX, endY)};
+    }
 }
diff --git a/components/detournavigator/gettilespositions.hpp b/components/detournavigator/gettilespositions.hpp
index db88708314..79188868dc 100644
--- a/components/detournavigator/gettilespositions.hpp
+++ b/components/detournavigator/gettilespositions.hpp
@@ -1,6 +1,7 @@
 #ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_GETTILESPOSITIONS_H
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_GETTILESPOSITIONS_H
 
+#include "tilebounds.hpp"
 #include "tileposition.hpp"
 
 class btVector3;
@@ -28,6 +29,9 @@ namespace DetourNavigator
     TilesPositionsRange makeTilesPositionsRange(const btCollisionShape& shape,
         const btTransform& transform, const RecastSettings& settings);
 
+    TilesPositionsRange makeTilesPositionsRange(const btCollisionShape& shape,
+        const btTransform& transform, const TileBounds& bounds, const RecastSettings& settings);
+
     TilesPositionsRange makeTilesPositionsRange(const int cellSize, const btVector3& shift,
         const RecastSettings& settings);
 
@@ -38,6 +42,19 @@ namespace DetourNavigator
             for (int tileY = range.mBegin.y(); tileY < range.mEnd.y(); ++tileY)
                 callback(TilePosition {tileX, tileY});
     }
+
+    inline bool isInTilesPositionsRange(int begin, int end, int coordinate)
+    {
+        return begin <= coordinate && coordinate < end;
+    }
+
+    inline bool isInTilesPositionsRange(const TilesPositionsRange& range, const TilePosition& position)
+    {
+        return isInTilesPositionsRange(range.mBegin.x(), range.mEnd.x(), position.x())
+            && isInTilesPositionsRange(range.mBegin.y(), range.mEnd.y(), position.y());
+    }
+
+    TilesPositionsRange getIntersection(const TilesPositionsRange& a, const TilesPositionsRange& b) noexcept;
 }
 
 #endif
diff --git a/components/detournavigator/navigator.hpp b/components/detournavigator/navigator.hpp
index 14731fcc5b..65f7c43fc1 100644
--- a/components/detournavigator/navigator.hpp
+++ b/components/detournavigator/navigator.hpp
@@ -83,6 +83,12 @@ namespace DetourNavigator
          */
         virtual void setWorldspace(std::string_view worldspace) = 0;
 
+        /**
+         * @brief updateBounds should be called before adding object from loading cell
+         * @param playerPosition corresponds to the bounds center
+         */
+        virtual void updateBounds(const osg::Vec3f& playerPosition) = 0;
+
         /**
          * @brief addObject is used to add complex object with allowed to walk and avoided to walk shapes
          * @param id is used to distinguish different objects
diff --git a/components/detournavigator/navigatorimpl.cpp b/components/detournavigator/navigatorimpl.cpp
index 4f6ec79328..42cd8bd9d1 100644
--- a/components/detournavigator/navigatorimpl.cpp
+++ b/components/detournavigator/navigatorimpl.cpp
@@ -38,6 +38,11 @@ namespace DetourNavigator
         mNavMeshManager.setWorldspace(worldspace);
     }
 
+    void NavigatorImpl::updateBounds(const osg::Vec3f& playerPosition)
+    {
+        mNavMeshManager.updateBounds(playerPosition);
+    }
+
     bool NavigatorImpl::addObject(const ObjectId id, const ObjectShapes& shapes, const btTransform& transform)
     {
         const CollisionShape collisionShape(shapes.mShapeInstance, *shapes.mShapeInstance->mCollisionShape, shapes.mTransform);
@@ -158,6 +163,7 @@ namespace DetourNavigator
         const TilePosition tilePosition = getTilePosition(mSettings.mRecast, toNavMeshCoordinates(mSettings.mRecast, playerPosition));
         if (mLastPlayerPosition.has_value() && *mLastPlayerPosition == tilePosition)
             return;
+        mNavMeshManager.updateBounds(playerPosition);
         update(playerPosition);
         mLastPlayerPosition = tilePosition;
     }
diff --git a/components/detournavigator/navigatorimpl.hpp b/components/detournavigator/navigatorimpl.hpp
index 116817395c..58c4c6c05d 100644
--- a/components/detournavigator/navigatorimpl.hpp
+++ b/components/detournavigator/navigatorimpl.hpp
@@ -24,6 +24,8 @@ namespace DetourNavigator
 
         void setWorldspace(std::string_view worldspace) override;
 
+        void updateBounds(const osg::Vec3f& playerPosition) override;
+
         bool addObject(const ObjectId id, const ObjectShapes& shapes, const btTransform& transform) override;
 
         bool addObject(const ObjectId id, const DoorShapes& shapes, const btTransform& transform) override;
diff --git a/components/detournavigator/navigatorstub.hpp b/components/detournavigator/navigatorstub.hpp
index 6a320c1a08..466ff5c912 100644
--- a/components/detournavigator/navigatorstub.hpp
+++ b/components/detournavigator/navigatorstub.hpp
@@ -72,6 +72,8 @@ namespace DetourNavigator
 
         void update(const osg::Vec3f& /*playerPosition*/) override {}
 
+        void updateBounds(const osg::Vec3f& /*playerPosition*/) override {}
+
         void updatePlayerPosition(const osg::Vec3f& /*playerPosition*/) override {};
 
         void setUpdatesEnabled(bool /*enabled*/) override {}
diff --git a/components/detournavigator/navmeshmanager.cpp b/components/detournavigator/navmeshmanager.cpp
index 9fba4ad611..bbaf010807 100644
--- a/components/detournavigator/navmeshmanager.cpp
+++ b/components/detournavigator/navmeshmanager.cpp
@@ -42,6 +42,18 @@ namespace
 
 namespace DetourNavigator
 {
+    namespace
+    {
+        TileBounds makeBounds(const RecastSettings& settings, const osg::Vec2f& center, int maxTiles)
+        {
+            const float radius = fromNavMeshCoordinates(settings, std::ceil(std::sqrt(static_cast<float>(maxTiles) / osg::PIf) + 1) * getTileSize(settings));
+            TileBounds result;
+            result.mMin = center - osg::Vec2f(radius, radius);
+            result.mMax = center + osg::Vec2f(radius, radius);
+            return result;
+        }
+    }
+
     NavMeshManager::NavMeshManager(const Settings& settings, std::unique_ptr<NavMeshDb>&& db)
         : mSettings(settings)
         , mRecastMeshManager(settings.mRecast)
@@ -59,21 +71,37 @@ namespace DetourNavigator
         mWorldspace = worldspace;
     }
 
+    void NavMeshManager::updateBounds(const osg::Vec3f& playerPosition)
+    {
+        const TileBounds bounds = makeBounds(mSettings.mRecast, osg::Vec2f(playerPosition.x(), playerPosition.y()),
+                                             mSettings.mMaxTilesNumber);
+        const auto changedTiles = mRecastMeshManager.setBounds(bounds);
+        for (const auto& [agent, cache] : mCache)
+        {
+            auto& tiles = mChangedTiles[agent];
+            for (const auto& [tilePosition, changeType] : changedTiles)
+            {
+                auto tile = tiles.find(tilePosition);
+                if (tile == tiles.end())
+                    tiles.emplace_hint(tile, tilePosition, changeType);
+                else
+                    tile->second = addChangeType(tile->second, changeType);
+            }
+        }
+    }
+
     bool NavMeshManager::addObject(const ObjectId id, const CollisionShape& shape, const btTransform& transform,
                                    const AreaType areaType)
     {
-        const btCollisionShape& collisionShape = shape.getShape();
-        if (!mRecastMeshManager.addObject(id, shape, transform, areaType))
-            return false;
-        addChangedTiles(collisionShape, transform, ChangeType::add);
-        return true;
+        return mRecastMeshManager.addObject(id, shape, transform, areaType,
+            [&] (const TilePosition& tile) { addChangedTile(tile, ChangeType::add); });
     }
 
     bool NavMeshManager::updateObject(const ObjectId id, const CollisionShape& shape, const btTransform& transform,
                                       const AreaType areaType)
     {
         return mRecastMeshManager.updateObject(id, shape, transform, areaType,
-            [&] (const TilePosition& tile) { addChangedTile(tile, ChangeType::update); });
+            [&] (const TilePosition& tile, ChangeType changeType) { addChangedTile(tile, changeType); });
     }
 
     bool NavMeshManager::removeObject(const ObjectId id)
@@ -263,7 +291,8 @@ namespace DetourNavigator
     void NavMeshManager::addChangedTiles(const btCollisionShape& shape, const btTransform& transform,
             const ChangeType changeType)
     {
-        getTilesPositions(makeTilesPositionsRange(shape, transform, mSettings.mRecast),
+        const auto bounds = mRecastMeshManager.getBounds();
+        getTilesPositions(makeTilesPositionsRange(shape, transform, bounds, mSettings.mRecast),
             [&] (const TilePosition& v) { addChangedTile(v, changeType); });
     }
 
diff --git a/components/detournavigator/navmeshmanager.hpp b/components/detournavigator/navmeshmanager.hpp
index 3fd2d28d74..01937d22bd 100644
--- a/components/detournavigator/navmeshmanager.hpp
+++ b/components/detournavigator/navmeshmanager.hpp
@@ -26,6 +26,8 @@ namespace DetourNavigator
 
         void setWorldspace(std::string_view worldspace);
 
+        void updateBounds(const osg::Vec3f& playerPosition);
+
         bool addObject(const ObjectId id, const CollisionShape& shape, const btTransform& transform,
                        const AreaType areaType);
 
diff --git a/components/detournavigator/settingsutils.hpp b/components/detournavigator/settingsutils.hpp
index a4c68e3cd5..c1e611aaf8 100644
--- a/components/detournavigator/settingsutils.hpp
+++ b/components/detournavigator/settingsutils.hpp
@@ -37,6 +37,11 @@ namespace DetourNavigator
         };
     }
 
+    inline float fromNavMeshCoordinates(const RecastSettings& settings, float value)
+    {
+        return value / settings.mRecastScaleFactor;
+    }
+
     inline osg::Vec3f fromNavMeshCoordinates(const RecastSettings& settings, osg::Vec3f position)
     {
         const auto factor = 1.0f / settings.mRecastScaleFactor;
diff --git a/components/detournavigator/tilebounds.hpp b/components/detournavigator/tilebounds.hpp
index 79f6370ff2..2dc32292e8 100644
--- a/components/detournavigator/tilebounds.hpp
+++ b/components/detournavigator/tilebounds.hpp
@@ -21,9 +21,24 @@ namespace DetourNavigator
         osg::Vec2f mMax;
     };
 
+    inline auto tie(const TileBounds& value) noexcept
+    {
+        return std::tie(value.mMin, value.mMax);
+    }
+
     inline bool operator<(const TileBounds& lhs, const TileBounds& rhs) noexcept
     {
-        return std::tie(lhs.mMin, lhs.mMax) < std::tie(rhs.mMin, rhs.mMax);
+        return tie(lhs) < tie(rhs);
+    }
+
+    inline bool operator ==(const TileBounds& lhs, const TileBounds& rhs) noexcept
+    {
+        return tie(lhs) == tie(rhs);
+    }
+
+    inline bool operator !=(const TileBounds& lhs, const TileBounds& rhs) noexcept
+    {
+        return !(lhs == rhs);
     }
 
     inline std::optional<TileBounds> getIntersection(const TileBounds& a, const TileBounds& b) noexcept
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.cpp b/components/detournavigator/tilecachedrecastmeshmanager.cpp
index 314e7641e3..c7bd3bc867 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -2,19 +2,93 @@
 #include "makenavmesh.hpp"
 #include "gettilespositions.hpp"
 #include "settingsutils.hpp"
+#include "changetype.hpp"
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/convert.hpp>
 
 #include <algorithm>
 #include <vector>
+#include <limits>
 
 namespace DetourNavigator
 {
+    namespace
+    {
+        const TileBounds infiniteTileBounds {
+            osg::Vec2f(-std::numeric_limits<float>::max(), -std::numeric_limits<float>::max()),
+            osg::Vec2f(std::numeric_limits<float>::max(), std::numeric_limits<float>::max())
+        };
+    }
+
     TileCachedRecastMeshManager::TileCachedRecastMeshManager(const RecastSettings& settings)
         : mSettings(settings)
+        , mBounds(infiniteTileBounds)
+        , mRange(makeTilesPositionsRange(mBounds.mMin, mBounds.mMax, mSettings))
     {}
 
+    TileBounds TileCachedRecastMeshManager::getBounds() const
+    {
+        return mBounds;
+    }
+
+    std::vector<std::pair<TilePosition, ChangeType>> TileCachedRecastMeshManager::setBounds(const TileBounds& bounds)
+    {
+        std::vector<std::pair<TilePosition, ChangeType>> changedTiles;
+
+        if (mBounds == bounds)
+            return changedTiles;
+
+        const auto newRange = makeTilesPositionsRange(bounds.mMin, bounds.mMax, mSettings);
+
+        if (mBounds != infiniteTileBounds)
+        {
+            const std::lock_guard lock(mMutex);
+            for (auto& object : mObjects)
+            {
+                const ObjectId id = object.first;
+                ObjectData& data = object.second;
+                const TilesPositionsRange objectRange = makeTilesPositionsRange(data.mShape.getShape(), data.mTransform, mSettings);
+
+                const auto onOldTilePosition = [&] (const TilePosition& position)
+                {
+                    if (isInTilesPositionsRange(newRange, position))
+                        return;
+                    const auto it = data.mTiles.find(position);
+                    if (it == data.mTiles.end())
+                        return;
+                    data.mTiles.erase(it);
+                    if (removeTile(id, position, mTiles))
+                        changedTiles.emplace_back(position, ChangeType::remove);
+                };
+                getTilesPositions(getIntersection(mRange, objectRange), onOldTilePosition);
+
+                const auto onNewTilePosition = [&] (const TilePosition& position)
+                {
+                    if (data.mTiles.find(position) != data.mTiles.end())
+                        return;
+                    if (addTile(id, data.mShape, data.mTransform, data.mAreaType, position, mTiles))
+                    {
+                        data.mTiles.insert(position);
+                        changedTiles.emplace_back(position, ChangeType::add);
+                    }
+                };
+                getTilesPositions(getIntersection(newRange, objectRange), onNewTilePosition);
+            }
+
+            std::sort(changedTiles.begin(), changedTiles.end());
+            changedTiles.erase(std::unique(changedTiles.begin(), changedTiles.end()), changedTiles.end());
+        }
+
+        if (!changedTiles.empty())
+            ++mRevision;
+
+        mBounds = bounds;
+        mRange = newRange;
+
+        return changedTiles;
+    }
+
     std::string TileCachedRecastMeshManager::getWorldspace() const
     {
         const std::lock_guard lock(mMutex);
@@ -30,47 +104,22 @@ namespace DetourNavigator
         mWorldspace = worldspace;
     }
 
-    bool TileCachedRecastMeshManager::addObject(const ObjectId id, const CollisionShape& shape,
-                                                const btTransform& transform, const AreaType areaType)
-    {
-        const auto it = mObjectsTilesPositions.find(id);
-        if (it != mObjectsTilesPositions.end())
-            return false;
-        std::vector<TilePosition> tilesPositions;
-        {
-            const TilesPositionsRange range = makeTilesPositionsRange(shape.getShape(), transform, mSettings);
-            const std::lock_guard lock(mMutex);
-            getTilesPositions(range,
-                [&] (const TilePosition& tilePosition)
-                {
-                    if (addTile(id, shape, transform, areaType, tilePosition, mTiles))
-                        tilesPositions.push_back(tilePosition);
-                });
-        }
-        if (tilesPositions.empty())
-            return false;
-        std::sort(tilesPositions.begin(), tilesPositions.end());
-        mObjectsTilesPositions.emplace_hint(it, id, std::move(tilesPositions));
-        ++mRevision;
-        return true;
-    }
-
     std::optional<RemovedRecastMeshObject> TileCachedRecastMeshManager::removeObject(const ObjectId id)
     {
-        const auto object = mObjectsTilesPositions.find(id);
-        if (object == mObjectsTilesPositions.end())
+        const auto object = mObjects.find(id);
+        if (object == mObjects.end())
             return std::nullopt;
         std::optional<RemovedRecastMeshObject> result;
         {
             const std::lock_guard lock(mMutex);
-            for (const auto& tilePosition : object->second)
+            for (const auto& tilePosition : object->second.mTiles)
             {
                 const auto removed = removeTile(id, tilePosition, mTiles);
                 if (removed && !result)
                     result = removed;
             }
         }
-        mObjectsTilesPositions.erase(object);
+        mObjects.erase(object);
         if (result)
             ++mRevision;
         return result;
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.hpp b/components/detournavigator/tilecachedrecastmeshmanager.hpp
index efd70477d3..906355524e 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.hpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.hpp
@@ -7,11 +7,13 @@
 #include "gettilespositions.hpp"
 #include "version.hpp"
 #include "heightfieldshape.hpp"
+#include "changetype.hpp"
 
 #include <algorithm>
 #include <map>
 #include <mutex>
 #include <vector>
+#include <set>
 
 namespace DetourNavigator
 {
@@ -20,58 +22,85 @@ namespace DetourNavigator
     public:
         explicit TileCachedRecastMeshManager(const RecastSettings& settings);
 
+        TileBounds getBounds() const;
+
+        std::vector<std::pair<TilePosition, ChangeType>> setBounds(const TileBounds& bounds);
+
         std::string getWorldspace() const;
 
         void setWorldspace(std::string_view worldspace);
 
+        template <class OnChangedTile>
         bool addObject(const ObjectId id, const CollisionShape& shape, const btTransform& transform,
-                       const AreaType areaType);
+            const AreaType areaType, OnChangedTile&& onChangedTile)
+        {
+            auto it = mObjects.find(id);
+            if (it != mObjects.end())
+                return false;
+            const TilesPositionsRange objectRange = makeTilesPositionsRange(shape.getShape(), transform, mSettings);
+            const TilesPositionsRange range = getIntersection(mRange, objectRange);
+            std::set<TilePosition> tilesPositions;
+            if (range.mBegin != range.mEnd)
+            {
+                const std::lock_guard lock(mMutex);
+                getTilesPositions(range,
+                    [&] (const TilePosition& tilePosition)
+                    {
+                        if (addTile(id, shape, transform, areaType, tilePosition, mTiles))
+                            tilesPositions.insert(tilePosition);
+                    });
+            }
+            it = mObjects.emplace_hint(it, id, ObjectData {shape, transform, areaType, std::move(tilesPositions)});
+            std::for_each(it->second.mTiles.begin(), it->second.mTiles.end(), std::forward<OnChangedTile>(onChangedTile));
+            ++mRevision;
+            return true;
+        }
 
         template <class OnChangedTile>
         bool updateObject(const ObjectId id, const CollisionShape& shape, const btTransform& transform,
             const AreaType areaType, OnChangedTile&& onChangedTile)
         {
-            const auto object = mObjectsTilesPositions.find(id);
-            if (object == mObjectsTilesPositions.end())
+            const auto object = mObjects.find(id);
+            if (object == mObjects.end())
                 return false;
-            auto& currentTiles = object->second;
+            auto& data = object->second;
             bool changed = false;
-            std::vector<TilePosition> newTiles;
+            std::set<TilePosition> newTiles;
             {
                 const auto onTilePosition = [&] (const TilePosition& tilePosition)
                 {
-                    if (std::binary_search(currentTiles.begin(), currentTiles.end(), tilePosition))
+                    if (data.mTiles.find(tilePosition) != data.mTiles.end())
                     {
-                        newTiles.push_back(tilePosition);
+                        newTiles.insert(tilePosition);
                         if (updateTile(id, transform, areaType, tilePosition, mTiles))
                         {
-                            onChangedTile(tilePosition);
+                            onChangedTile(tilePosition, ChangeType::update);
                             changed = true;
                         }
                     }
                     else if (addTile(id, shape, transform, areaType, tilePosition, mTiles))
                     {
-                        newTiles.push_back(tilePosition);
-                        onChangedTile(tilePosition);
+                        newTiles.insert(tilePosition);
+                        onChangedTile(tilePosition, ChangeType::add);
                         changed = true;
                     }
                 };
-                const TilesPositionsRange range = makeTilesPositionsRange(shape.getShape(), transform, mSettings);
+                const TilesPositionsRange objectRange = makeTilesPositionsRange(shape.getShape(), transform, mSettings);
+                const TilesPositionsRange range = getIntersection(mRange, objectRange);
                 const std::lock_guard lock(mMutex);
                 getTilesPositions(range, onTilePosition);
-                std::sort(newTiles.begin(), newTiles.end());
-                for (const auto& tile : currentTiles)
+                for (const auto& tile : data.mTiles)
                 {
-                    if (!std::binary_search(newTiles.begin(), newTiles.end(), tile) && removeTile(id, tile, mTiles))
+                    if (newTiles.find(tile) == newTiles.end() && removeTile(id, tile, mTiles))
                     {
-                        onChangedTile(tile);
+                        onChangedTile(tile, ChangeType::remove);
                         changed = true;
                     }
                 }
             }
             if (changed)
             {
-                currentTiles = std::move(newTiles);
+                data.mTiles = std::move(newTiles);
                 ++mRevision;
             }
             return changed;
@@ -108,11 +137,21 @@ namespace DetourNavigator
     private:
         using TilesMap = std::map<TilePosition, std::shared_ptr<CachedRecastMeshManager>>;
 
+        struct ObjectData
+        {
+            const CollisionShape mShape;
+            const btTransform mTransform;
+            const AreaType mAreaType;
+            std::set<TilePosition> mTiles;
+        };
+
         const RecastSettings& mSettings;
         mutable std::mutex mMutex;
+        TileBounds mBounds;
+        TilesPositionsRange mRange;
         std::string mWorldspace;
         TilesMap mTiles;
-        std::unordered_map<ObjectId, std::vector<TilePosition>> mObjectsTilesPositions;
+        std::unordered_map<ObjectId, ObjectData> mObjects;
         std::map<osg::Vec2i, std::vector<TilePosition>> mWaterTilesPositions;
         std::map<osg::Vec2i, std::vector<TilePosition>> mHeightfieldTilesPositions;
         std::size_t mRevision = 0;

From 832ab103cb864eda905f4c0aa52fe90145dca864 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 2 Feb 2022 01:09:34 +0100
Subject: [PATCH 2065/2859] Filter out unchanged animated objects for navigator
 update

---
 apps/openmw/mwphysics/physicssystem.cpp | 9 +++++++--
 apps/openmw/mwphysics/physicssystem.hpp | 2 +-
 apps/openmw/mwworld/worldimp.cpp        | 7 ++++++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index ef7fffa034..f5f22529ff 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -490,7 +490,7 @@ namespace MWPhysics
         mObjects.emplace(ptr.mRef, obj);
 
         if (obj->isAnimated())
-            mAnimatedObjects.insert(obj.get());
+            mAnimatedObjects.emplace(obj.get(), false);
     }
 
     void PhysicsSystem::remove(const MWWorld::Ptr &ptr)
@@ -739,13 +739,18 @@ namespace MWPhysics
 
     void PhysicsSystem::stepSimulation(float dt, bool skipSimulation, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats)
     {
-        for (Object* animatedObject : mAnimatedObjects)
+        for (auto& [animatedObject, changed] : mAnimatedObjects)
         {
             if (animatedObject->animateCollisionShapes())
             {
                 auto obj = mObjects.find(animatedObject->getPtr().mRef);
                 assert(obj != mObjects.end());
                 mTaskScheduler->updateSingleAabb(obj->second);
+                changed = true;
+            }
+            else
+            {
+                changed = false;
             }
         }
 
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 1606ac084c..b165f10761 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -300,7 +300,7 @@ namespace MWPhysics
             using ObjectMap = std::unordered_map<const MWWorld::LiveCellRefBase*, std::shared_ptr<Object>>;
             ObjectMap mObjects;
 
-            std::set<Object*> mAnimatedObjects; // stores pointers to elements in mObjects
+            std::map<Object*, bool> mAnimatedObjects; // stores pointers to elements in mObjects
 
             ActorMap mActors;
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 706ce4859f..61abb7fcc2 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1525,7 +1525,12 @@ namespace MWWorld
 
     void World::updateNavigator()
     {
-        mPhysics->forEachAnimatedObject([&] (const MWPhysics::Object* object) { updateNavigatorObject(*object); });
+        mPhysics->forEachAnimatedObject([&] (const auto& pair)
+        {
+            const auto [object, changed] = pair;
+            if (changed)
+                updateNavigatorObject(*object);
+        });
 
         for (const auto& door : mDoorStates)
             if (const auto object = mPhysics->getObject(door.first))

From 3caeda7299508b8a80da254658bb3f73b11c66fd Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 2 Feb 2022 01:11:13 +0100
Subject: [PATCH 2066/2859] Consider animated object unchanged if no transform
 updates done

---
 apps/openmw/mwphysics/object.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwphysics/object.cpp b/apps/openmw/mwphysics/object.cpp
index 08fcc7e47d..76661b86a0 100644
--- a/apps/openmw/mwphysics/object.cpp
+++ b/apps/openmw/mwphysics/object.cpp
@@ -112,6 +112,7 @@ namespace MWPhysics
         assert (mShapeInstance->mCollisionShape->isCompound());
 
         btCompoundShape* compound = static_cast<btCompoundShape*>(mShapeInstance->mCollisionShape.get());
+        bool result = false;
         for (const auto& [recIndex, shapeIndex] : mShapeInstance->mAnimatedShapes)
         {
             auto nodePathFound = mRecIndexToNodePath.find(recIndex);
@@ -145,8 +146,11 @@ namespace MWPhysics
             // Note: we can not apply scaling here for now since we treat scaled shapes
             // as new shapes (btScaledBvhTriangleMeshShape) with 1.0 scale for now
             if (!(transform == compound->getChildTransform(shapeIndex)))
+            {
                 compound->updateChildTransform(shapeIndex, transform);
+                result = true;
+            }
         }
-        return true;
+        return result;
     }
 }

From 0b644a897e123370ea489cf43664a079fe532733 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 3 Feb 2022 22:24:26 +0100
Subject: [PATCH 2067/2859] Explicitly bind TileCachedRecastMeshManager with
 mutex

---
 .../tilecachedrecastmeshmanager.cpp           | 71 +++++++++----------
 .../tilecachedrecastmeshmanager.hpp           | 32 +++++----
 2 files changed, 54 insertions(+), 49 deletions(-)

diff --git a/components/detournavigator/tilecachedrecastmeshmanager.cpp b/components/detournavigator/tilecachedrecastmeshmanager.cpp
index c7bd3bc867..e7e46e96df 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.cpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.cpp
@@ -43,7 +43,7 @@ namespace DetourNavigator
 
         if (mBounds != infiniteTileBounds)
         {
-            const std::lock_guard lock(mMutex);
+            const auto locked = mWorldspaceTiles.lock();
             for (auto& object : mObjects)
             {
                 const ObjectId id = object.first;
@@ -58,7 +58,7 @@ namespace DetourNavigator
                     if (it == data.mTiles.end())
                         return;
                     data.mTiles.erase(it);
-                    if (removeTile(id, position, mTiles))
+                    if (removeTile(id, position, locked->mTiles))
                         changedTiles.emplace_back(position, ChangeType::remove);
                 };
                 getTilesPositions(getIntersection(mRange, objectRange), onOldTilePosition);
@@ -67,7 +67,7 @@ namespace DetourNavigator
                 {
                     if (data.mTiles.find(position) != data.mTiles.end())
                         return;
-                    if (addTile(id, data.mShape, data.mTransform, data.mAreaType, position, mTiles))
+                    if (addTile(id, data.mShape, data.mTransform, data.mAreaType, position, locked->mTiles))
                     {
                         data.mTiles.insert(position);
                         changedTiles.emplace_back(position, ChangeType::add);
@@ -91,17 +91,16 @@ namespace DetourNavigator
 
     std::string TileCachedRecastMeshManager::getWorldspace() const
     {
-        const std::lock_guard lock(mMutex);
-        return mWorldspace;
+        return mWorldspaceTiles.lockConst()->mWorldspace;
     }
 
     void TileCachedRecastMeshManager::setWorldspace(std::string_view worldspace)
     {
-        const std::lock_guard lock(mMutex);
-        if (mWorldspace == worldspace)
+        const auto locked = mWorldspaceTiles.lock();
+        if (locked->mWorldspace == worldspace)
             return;
-        mTiles.clear();
-        mWorldspace = worldspace;
+        locked->mTiles.clear();
+        locked->mWorldspace = worldspace;
     }
 
     std::optional<RemovedRecastMeshObject> TileCachedRecastMeshManager::removeObject(const ObjectId id)
@@ -111,10 +110,10 @@ namespace DetourNavigator
             return std::nullopt;
         std::optional<RemovedRecastMeshObject> result;
         {
-            const std::lock_guard lock(mMutex);
+            const auto locked = mWorldspaceTiles.lock();
             for (const auto& tilePosition : object->second.mTiles)
             {
-                const auto removed = removeTile(id, tilePosition, mTiles);
+                const auto removed = removeTile(id, tilePosition, locked->mTiles);
                 if (removed && !result)
                     result = removed;
             }
@@ -138,8 +137,8 @@ namespace DetourNavigator
 
         if (cellSize == std::numeric_limits<int>::max())
         {
-            const std::lock_guard lock(mMutex);
-            for (auto& tile : mTiles)
+            const auto locked = mWorldspaceTiles.lock();
+            for (auto& tile : locked->mTiles)
             {
                 if (tile.second->addWater(cellPosition, cellSize, level))
                 {
@@ -154,12 +153,12 @@ namespace DetourNavigator
             getTilesPositions(makeTilesPositionsRange(cellSize, shift, mSettings),
                 [&] (const TilePosition& tilePosition)
                 {
-                    const std::lock_guard lock(mMutex);
-                    auto tile = mTiles.find(tilePosition);
-                    if (tile == mTiles.end())
+                    const auto locked = mWorldspaceTiles.lock();
+                    auto tile = locked->mTiles.find(tilePosition);
+                    if (tile == locked->mTiles.end())
                     {
                         const TileBounds tileBounds = makeRealTileBoundsWithBorder(mSettings, tilePosition);
-                        tile = mTiles.emplace_hint(tile, tilePosition,
+                        tile = locked->mTiles.emplace_hint(tile, tilePosition,
                                 std::make_shared<CachedRecastMeshManager>(tileBounds, mTilesGeneration));
                     }
                     if (tile->second->addWater(cellPosition, cellSize, level))
@@ -184,14 +183,14 @@ namespace DetourNavigator
         std::optional<Water> result;
         for (const auto& tilePosition : object->second)
         {
-            const std::lock_guard lock(mMutex);
-            const auto tile = mTiles.find(tilePosition);
-            if (tile == mTiles.end())
+            const auto locked = mWorldspaceTiles.lock();
+            const auto tile = locked->mTiles.find(tilePosition);
+            if (tile == locked->mTiles.end())
                 continue;
             const auto tileResult = tile->second->removeWater(cellPosition);
             if (tile->second->isEmpty())
             {
-                mTiles.erase(tile);
+                locked->mTiles.erase(tile);
                 ++mTilesGeneration;
             }
             if (tileResult && !result)
@@ -219,12 +218,12 @@ namespace DetourNavigator
         getTilesPositions(makeTilesPositionsRange(cellSize, shift, mSettings),
             [&] (const TilePosition& tilePosition)
             {
-                const std::lock_guard lock(mMutex);
-                auto tile = mTiles.find(tilePosition);
-                if (tile == mTiles.end())
+                const auto locked = mWorldspaceTiles.lock();
+                auto tile = locked->mTiles.find(tilePosition);
+                if (tile == locked->mTiles.end())
                 {
                     const TileBounds tileBounds = makeRealTileBoundsWithBorder(mSettings, tilePosition);
-                    tile = mTiles.emplace_hint(tile, tilePosition,
+                    tile = locked->mTiles.emplace_hint(tile, tilePosition,
                             std::make_shared<CachedRecastMeshManager>(tileBounds, mTilesGeneration));
                 }
                 if (tile->second->addHeightfield(cellPosition, cellSize, shape))
@@ -248,14 +247,14 @@ namespace DetourNavigator
         std::optional<SizedHeightfieldShape> result;
         for (const auto& tilePosition : object->second)
         {
-            const std::lock_guard lock(mMutex);
-            const auto tile = mTiles.find(tilePosition);
-            if (tile == mTiles.end())
+            const auto locked = mWorldspaceTiles.lock();
+            const auto tile = locked->mTiles.find(tilePosition);
+            if (tile == locked->mTiles.end())
                 continue;
             const auto tileResult = tile->second->removeHeightfield(cellPosition);
             if (tile->second->isEmpty())
             {
-                mTiles.erase(tile);
+                locked->mTiles.erase(tile);
                 ++mTilesGeneration;
             }
             if (tileResult && !result)
@@ -295,9 +294,9 @@ namespace DetourNavigator
 
     void TileCachedRecastMeshManager::reportNavMeshChange(const TilePosition& tilePosition, Version recastMeshVersion, Version navMeshVersion) const
     {
-        const std::lock_guard lock(mMutex);
-        const auto it = mTiles.find(tilePosition);
-        if (it == mTiles.end())
+        const auto locked = mWorldspaceTiles.lockConst();
+        const auto it = locked->mTiles.find(tilePosition);
+        if (it == locked->mTiles.end())
             return;
         it->second->reportNavMeshChange(recastMeshVersion, navMeshVersion);
     }
@@ -341,11 +340,11 @@ namespace DetourNavigator
     std::shared_ptr<CachedRecastMeshManager> TileCachedRecastMeshManager::getManager(std::string_view worldspace,
         const TilePosition& tilePosition) const
     {
-        const std::lock_guard lock(mMutex);
-        if (mWorldspace != worldspace)
+        const auto locked = mWorldspaceTiles.lockConst();
+        if (locked->mWorldspace != worldspace)
             return nullptr;
-        const auto it = mTiles.find(tilePosition);
-        if (it == mTiles.end())
+        const auto it = locked->mTiles.find(tilePosition);
+        if (it == locked->mTiles.end())
             return nullptr;
         return it->second;
     }
diff --git a/components/detournavigator/tilecachedrecastmeshmanager.hpp b/components/detournavigator/tilecachedrecastmeshmanager.hpp
index 906355524e..5e168efc16 100644
--- a/components/detournavigator/tilecachedrecastmeshmanager.hpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.hpp
@@ -9,6 +9,8 @@
 #include "heightfieldshape.hpp"
 #include "changetype.hpp"
 
+#include <components/misc/guarded.hpp>
+
 #include <algorithm>
 #include <map>
 #include <mutex>
@@ -42,11 +44,11 @@ namespace DetourNavigator
             std::set<TilePosition> tilesPositions;
             if (range.mBegin != range.mEnd)
             {
-                const std::lock_guard lock(mMutex);
+                const auto locked = mWorldspaceTiles.lock();
                 getTilesPositions(range,
                     [&] (const TilePosition& tilePosition)
                     {
-                        if (addTile(id, shape, transform, areaType, tilePosition, mTiles))
+                        if (addTile(id, shape, transform, areaType, tilePosition, locked->mTiles))
                             tilesPositions.insert(tilePosition);
                     });
             }
@@ -67,31 +69,31 @@ namespace DetourNavigator
             bool changed = false;
             std::set<TilePosition> newTiles;
             {
+                const TilesPositionsRange objectRange = makeTilesPositionsRange(shape.getShape(), transform, mSettings);
+                const TilesPositionsRange range = getIntersection(mRange, objectRange);
+                const auto locked = mWorldspaceTiles.lock();
                 const auto onTilePosition = [&] (const TilePosition& tilePosition)
                 {
                     if (data.mTiles.find(tilePosition) != data.mTiles.end())
                     {
                         newTiles.insert(tilePosition);
-                        if (updateTile(id, transform, areaType, tilePosition, mTiles))
+                        if (updateTile(id, transform, areaType, tilePosition, locked->mTiles))
                         {
                             onChangedTile(tilePosition, ChangeType::update);
                             changed = true;
                         }
                     }
-                    else if (addTile(id, shape, transform, areaType, tilePosition, mTiles))
+                    else if (addTile(id, shape, transform, areaType, tilePosition, locked->mTiles))
                     {
                         newTiles.insert(tilePosition);
                         onChangedTile(tilePosition, ChangeType::add);
                         changed = true;
                     }
                 };
-                const TilesPositionsRange objectRange = makeTilesPositionsRange(shape.getShape(), transform, mSettings);
-                const TilesPositionsRange range = getIntersection(mRange, objectRange);
-                const std::lock_guard lock(mMutex);
                 getTilesPositions(range, onTilePosition);
                 for (const auto& tile : data.mTiles)
                 {
-                    if (newTiles.find(tile) == newTiles.end() && removeTile(id, tile, mTiles))
+                    if (newTiles.find(tile) == newTiles.end() && removeTile(id, tile, locked->mTiles))
                     {
                         onChangedTile(tile, ChangeType::remove);
                         changed = true;
@@ -125,8 +127,8 @@ namespace DetourNavigator
         template <class Function>
         void forEachTile(Function&& function) const
         {
-            const std::lock_guard lock(mMutex);
-            for (auto& [tilePosition, recastMeshManager] : mTiles)
+            const auto& locked = mWorldspaceTiles.lockConst();
+            for (const auto& [tilePosition, recastMeshManager] : locked->mTiles)
                 function(tilePosition, *recastMeshManager);
         }
 
@@ -145,12 +147,16 @@ namespace DetourNavigator
             std::set<TilePosition> mTiles;
         };
 
+        struct WorldspaceTiles
+        {
+            std::string mWorldspace;
+            TilesMap mTiles;
+        };
+
         const RecastSettings& mSettings;
-        mutable std::mutex mMutex;
         TileBounds mBounds;
         TilesPositionsRange mRange;
-        std::string mWorldspace;
-        TilesMap mTiles;
+        Misc::ScopeGuarded<WorldspaceTiles> mWorldspaceTiles;
         std::unordered_map<ObjectId, ObjectData> mObjects;
         std::map<osg::Vec2i, std::vector<TilePosition>> mWaterTilesPositions;
         std::map<osg::Vec2i, std::vector<TilePosition>> mHeightfieldTilesPositions;

From e7f3524924062eb12c4884db1517a681ee93da56 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 21 Nov 2021 15:28:40 +0100
Subject: [PATCH 2068/2859] Add a tool to load and print information about all
 bullet objects in all cells

---
 .gitlab-ci.yml                              |   2 +-
 CI/before_script.android.sh                 |   1 +
 CMakeLists.txt                              |  12 ++
 apps/bulletobjecttool/CMakeLists.txt        |  20 ++
 apps/bulletobjecttool/main.cpp              | 203 ++++++++++++++++++++
 components/CMakeLists.txt                   |   2 +-
 components/resource/foreachbulletobject.cpp | 161 ++++++++++++++++
 components/resource/foreachbulletobject.hpp |  48 +++++
 8 files changed, 447 insertions(+), 2 deletions(-)
 create mode 100644 apps/bulletobjecttool/CMakeLists.txt
 create mode 100644 apps/bulletobjecttool/main.cpp
 create mode 100644 components/resource/foreachbulletobject.cpp
 create mode 100644 components/resource/foreachbulletobject.hpp

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aaf7f233f0..6bd2226ef7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -287,7 +287,7 @@ macOS12_Xcode13:
     CCACHE_SIZE: 3G
 
 variables: &engine-targets
-  targets: "openmw,openmw-iniimporter,openmw-launcher,openmw-wizard,openmw-navmeshtool"
+  targets: "openmw,openmw-iniimporter,openmw-launcher,openmw-wizard,openmw-navmeshtool,openmw-bulletobjecttool"
   package: "Engine"
 
 variables: &cs-targets
diff --git a/CI/before_script.android.sh b/CI/before_script.android.sh
index 43422f68c1..80a3f11e57 100755
--- a/CI/before_script.android.sh
+++ b/CI/before_script.android.sh
@@ -23,6 +23,7 @@ cmake \
 -DBUILD_OPENCS=0 \
 -DBUILD_WIZARD=0 \
 -DBUILD_NAVMESHTOOL=OFF \
+-DBUILD_BULLETOBJECTTOOL=OFF \
 -DOPENMW_USE_SYSTEM_MYGUI=OFF \
 -DOPENMW_USE_SYSTEM_SQLITE3=OFF \
 ..
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 20c00fb757..bc4fa56e25 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,6 +40,7 @@ option(BUILD_WITH_CODE_COVERAGE "Enable code coverage with gconv" OFF)
 option(BUILD_UNITTESTS          "Enable Unittests with Google C++ Unittest" OFF)
 option(BUILD_BENCHMARKS         "Build benchmarks with Google Benchmark" OFF)
 option(BUILD_NAVMESHTOOL        "Build navmesh tool" ON)
+option(BUILD_BULLETOBJECTTOOL   "Build Bullet object tool" ON)
 
 set(OpenGL_GL_PREFERENCE LEGACY)  # Use LEGACY as we use GL2; GLNVD is for GL3 and up.
 
@@ -619,6 +620,10 @@ if (BUILD_NAVMESHTOOL)
   add_subdirectory(apps/navmeshtool)
 endif()
 
+if (BUILD_BULLETOBJECTTOOL)
+  add_subdirectory( apps/bulletobjecttool )
+endif()
+
 if (WIN32)
   if (MSVC)
     foreach( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} )
@@ -719,6 +724,10 @@ if (WIN32)
     if (BUILD_NAVMESHTOOL)
         set_target_properties(openmw-navmeshtool PROPERTIES COMPILE_FLAGS "${WARNINGS}")
     endif()
+
+    if (BUILD_BULLETOBJECTTOOL)
+        set_target_properties(openmw-bulletobjecttool PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}")
+    endif()
   endif(MSVC)
 
   # TODO: At some point release builds should not use the console but rather write to a log file
@@ -964,6 +973,9 @@ elseif(NOT APPLE)
         if(BUILD_NAVMESHTOOL)
             install(PROGRAMS "${INSTALL_SOURCE}/openmw-navmeshtool" DESTINATION "${BINDIR}" )
         endif()
+        IF(BUILD_BULLETOBJECTTOOL)
+            INSTALL(PROGRAMS "${INSTALL_SOURCE}/openmw-bulletobjecttool" DESTINATION "${BINDIR}" )
+        ENDIF(BUILD_BULLETOBJECTTOOL)
 
         # Install licenses
         INSTALL(FILES "files/mygui/DejaVuFontLicense.txt" DESTINATION "${LICDIR}" )
diff --git a/apps/bulletobjecttool/CMakeLists.txt b/apps/bulletobjecttool/CMakeLists.txt
new file mode 100644
index 0000000000..6beb411e20
--- /dev/null
+++ b/apps/bulletobjecttool/CMakeLists.txt
@@ -0,0 +1,20 @@
+set(BULLETMESHTOOL
+    main.cpp
+)
+source_group(apps\\bulletobjecttool FILES ${BULLETMESHTOOL})
+
+openmw_add_executable(openmw-bulletobjecttool ${BULLETMESHTOOL})
+
+target_link_libraries(openmw-bulletobjecttool
+    ${Boost_PROGRAM_OPTIONS_LIBRARY}
+    components
+)
+
+if (BUILD_WITH_CODE_COVERAGE)
+    add_definitions(--coverage)
+    target_link_libraries(openmw-bulletobjecttool gcov)
+endif()
+
+if (WIN32)
+    install(TARGETS openmw-bulletobjecttool RUNTIME DESTINATION ".")
+endif()
diff --git a/apps/bulletobjecttool/main.cpp b/apps/bulletobjecttool/main.cpp
new file mode 100644
index 0000000000..c80883fe78
--- /dev/null
+++ b/apps/bulletobjecttool/main.cpp
@@ -0,0 +1,203 @@
+#include <components/debug/debugging.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/loadcell.hpp>
+#include <components/esm3/variant.hpp>
+#include <components/esmloader/esmdata.hpp>
+#include <components/esmloader/load.hpp>
+#include <components/fallback/fallback.hpp>
+#include <components/fallback/validate.hpp>
+#include <components/files/configurationmanager.hpp>
+#include <components/resource/bulletshapemanager.hpp>
+#include <components/resource/foreachbulletobject.hpp>
+#include <components/resource/imagemanager.hpp>
+#include <components/resource/niffilemanager.hpp>
+#include <components/resource/scenemanager.hpp>
+#include <components/settings/settings.hpp>
+#include <components/to_utf8/to_utf8.hpp>
+#include <components/version/version.hpp>
+#include <components/vfs/manager.hpp>
+#include <components/vfs/registerarchives.hpp>
+
+#include <osg/Vec3f>
+
+#include <boost/filesystem.hpp>
+#include <boost/program_options.hpp>
+
+#include <charconv>
+#include <cstddef>
+#include <iomanip>
+#include <stdexcept>
+#include <string>
+#include <vector>
+
+namespace
+{
+    namespace bpo = boost::program_options;
+
+    using StringsVector = std::vector<std::string>;
+
+    bpo::options_description makeOptionsDescription()
+    {
+        using Fallback::FallbackMap;
+
+        bpo::options_description result;
+
+        result.add_options()
+            ("help", "print help message")
+
+            ("version", "print version information and quit")
+
+            ("data", bpo::value<Files::MaybeQuotedPathContainer>()->default_value(Files::MaybeQuotedPathContainer(), "data")
+                ->multitoken()->composing(), "set data directories (later directories have higher priority)")
+
+            ("data-local", bpo::value<Files::MaybeQuotedPathContainer::value_type>()->default_value(Files::MaybeQuotedPathContainer::value_type(), ""),
+                "set local data directory (highest priority)")
+
+            ("fallback-archive", bpo::value<StringsVector>()->default_value(StringsVector(), "fallback-archive")
+                ->multitoken()->composing(), "set fallback BSA archives (later archives have higher priority)")
+
+            ("resources", bpo::value<Files::MaybeQuotedPath>()->default_value(Files::MaybeQuotedPath(), "resources"),
+                "set resources directory")
+
+            ("content", bpo::value<StringsVector>()->default_value(StringsVector(), "")
+                ->multitoken()->composing(), "content file(s): esm/esp, or omwgame/omwaddon/omwscripts")
+
+            ("fs-strict", bpo::value<bool>()->implicit_value(true)
+                ->default_value(false), "strict file system handling (no case folding)")
+
+            ("encoding", bpo::value<std::string>()->
+                default_value("win1252"),
+                "Character encoding used in OpenMW game messages:\n"
+                "\n\twin1250 - Central and Eastern European such as Polish, Czech, Slovak, Hungarian, Slovene, Bosnian, Croatian, Serbian (Latin script), Romanian and Albanian languages\n"
+                "\n\twin1251 - Cyrillic alphabet such as Russian, Bulgarian, Serbian Cyrillic and other languages\n"
+                "\n\twin1252 - Western European (Latin) alphabet, used by default")
+
+            ("fallback", bpo::value<FallbackMap>()->default_value(FallbackMap(), "")
+                ->multitoken()->composing(), "fallback values")
+        ;
+
+        Files::ConfigurationManager::addCommonOptions(result);
+
+        return result;
+    }
+
+    struct WriteArray
+    {
+        const float (&mValue)[3];
+
+        friend std::ostream& operator <<(std::ostream& stream, const WriteArray& value)
+        {
+            for (std::size_t i = 0; i < 2; ++i)
+                stream << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.mValue[i] << ", ";
+            return stream << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.mValue[2];
+        }
+    };
+
+    std::string toHex(std::string_view value)
+    {
+        std::string buffer(value.size() * 2, '0');
+        char* out = buffer.data();
+        for (const char v : value)
+        {
+            const std::ptrdiff_t space = static_cast<std::ptrdiff_t>(static_cast<std::uint8_t>(v) <= 0xf);
+            const auto [ptr, ec] = std::to_chars(out + space, out + space + 2, static_cast<std::uint8_t>(v), 16);
+            if (ec != std::errc())
+                throw std::system_error(std::make_error_code(ec));
+            out += 2;
+        }
+        return buffer;
+    }
+
+    int runBulletObjectTool(int argc, char *argv[])
+    {
+        bpo::options_description desc = makeOptionsDescription();
+
+        bpo::parsed_options options = bpo::command_line_parser(argc, argv)
+            .options(desc).allow_unregistered().run();
+        bpo::variables_map variables;
+
+        bpo::store(options, variables);
+        bpo::notify(variables);
+
+        if (variables.find("help") != variables.end())
+        {
+            getRawStdout() << desc << std::endl;
+            return 0;
+        }
+
+        Files::ConfigurationManager config;
+
+        bpo::variables_map composingVariables = Files::separateComposingVariables(variables, desc);
+        config.readConfiguration(variables, desc);
+        Files::mergeComposingVariables(variables, composingVariables, desc);
+
+        const std::string encoding(variables["encoding"].as<std::string>());
+        Log(Debug::Info) << ToUTF8::encodingUsingMessage(encoding);
+        ToUTF8::Utf8Encoder encoder(ToUTF8::calculateEncoding(encoding));
+
+        Files::PathContainer dataDirs(asPathContainer(variables["data"].as<Files::MaybeQuotedPathContainer>()));
+
+        auto local = variables["data-local"].as<Files::MaybeQuotedPathContainer::value_type>();
+        if (!local.empty())
+            dataDirs.push_back(std::move(local));
+
+        config.processPaths(dataDirs);
+
+        const auto fsStrict = variables["fs-strict"].as<bool>();
+        const auto resDir = variables["resources"].as<Files::MaybeQuotedPath>();
+        Version::Version v = Version::getOpenmwVersion(resDir.string());
+        Log(Debug::Info) << v.describe();
+        dataDirs.insert(dataDirs.begin(), resDir / "vfs");
+        const auto fileCollections = Files::Collections(dataDirs, !fsStrict);
+        const auto archives = variables["fallback-archive"].as<StringsVector>();
+        const auto contentFiles = variables["content"].as<StringsVector>();
+
+        Fallback::Map::init(variables["fallback"].as<Fallback::FallbackMap>().mMap);
+
+        VFS::Manager vfs(fsStrict);
+
+        VFS::registerArchives(&vfs, fileCollections, archives, true);
+
+        Settings::Manager settings;
+        settings.load(config);
+
+        std::vector<ESM::ESMReader> readers(contentFiles.size());
+        EsmLoader::Query query;
+        query.mLoadActivators = true;
+        query.mLoadCells = true;
+        query.mLoadContainers = true;
+        query.mLoadDoors = true;
+        query.mLoadGameSettings = true;
+        query.mLoadLands = true;
+        query.mLoadStatics = true;
+        const EsmLoader::EsmData esmData = EsmLoader::loadEsmData(query, contentFiles, fileCollections, readers, &encoder);
+
+        Resource::ImageManager imageManager(&vfs);
+        Resource::NifFileManager nifFileManager(&vfs);
+        Resource::SceneManager sceneManager(&vfs, &imageManager, &nifFileManager);
+        Resource::BulletShapeManager bulletShapeManager(&vfs, &sceneManager, &nifFileManager);
+
+        Resource::forEachBulletObject(readers, vfs, bulletShapeManager, esmData,
+            [] (const ESM::Cell& cell, const Resource::BulletObject& object)
+            {
+                Log(Debug::Verbose) << "Found bullet object in " << (cell.isExterior() ? "exterior" : "interior")
+                    << " cell \"" << cell.getDescription() << "\":"
+                    << " fileName=\"" << object.mShape->mFileName << '"'
+                    << " fileHash=" << toHex(object.mShape->mFileHash)
+                    << " collisionShape=" << std::boolalpha << (object.mShape->mCollisionShape == nullptr)
+                    << " avoidCollisionShape=" << std::boolalpha << (object.mShape->mAvoidCollisionShape == nullptr)
+                    << " position=(" << WriteArray {object.mPosition.pos} << ')'
+                    << " rotation=(" << WriteArray {object.mPosition.rot} << ')'
+                    << " scale=" << std::setprecision(std::numeric_limits<float>::max_exponent10) << object.mScale;
+            });
+
+        Log(Debug::Info) << "Done";
+
+        return 0;
+    }
+}
+
+int main(int argc, char *argv[])
+{
+    return wrapApplication(runBulletObjectTool, argc, argv, "BulletObjectTool");
+}
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 9a1ffc847c..790cd6b646 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -46,7 +46,7 @@ add_component_dir (vfs
 
 add_component_dir (resource
     scenemanager keyframemanager imagemanager bulletshapemanager bulletshape niffilemanager objectcache multiobjectcache resourcesystem
-    resourcemanager stats animation
+    resourcemanager stats animation foreachbulletobject
     )
 
 add_component_dir (shader
diff --git a/components/resource/foreachbulletobject.cpp b/components/resource/foreachbulletobject.cpp
new file mode 100644
index 0000000000..aaaa6fa5f9
--- /dev/null
+++ b/components/resource/foreachbulletobject.cpp
@@ -0,0 +1,161 @@
+#include "foreachbulletobject.hpp"
+
+#include <components/debug/debuglog.hpp>
+#include <components/esm3/cellref.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/loadcell.hpp>
+#include <components/esm3/loadland.hpp>
+#include <components/esmloader/esmdata.hpp>
+#include <components/esmloader/lessbyid.hpp>
+#include <components/esmloader/record.hpp>
+#include <components/misc/resourcehelpers.hpp>
+#include <components/misc/stringops.hpp>
+#include <components/resource/bulletshapemanager.hpp>
+#include <components/settings/settings.hpp>
+#include <components/vfs/manager.hpp>
+
+#include <osg/ref_ptr>
+
+#include <algorithm>
+#include <memory>
+#include <stdexcept>
+#include <string>
+#include <string_view>
+#include <utility>
+#include <vector>
+
+namespace Resource
+{
+    namespace
+    {
+        struct CellRef
+        {
+            ESM::RecNameInts mType;
+            ESM::RefNum mRefNum;
+            std::string mRefId;
+            float mScale;
+            ESM::Position mPos;
+
+            CellRef(ESM::RecNameInts type, ESM::RefNum refNum, std::string&& refId, float scale, const ESM::Position& pos)
+                : mType(type), mRefNum(refNum), mRefId(std::move(refId)), mScale(scale), mPos(pos) {}
+        };
+
+        ESM::RecNameInts getType(const EsmLoader::EsmData& esmData, std::string_view refId)
+        {
+            const auto it = std::lower_bound(esmData.mRefIdTypes.begin(), esmData.mRefIdTypes.end(),
+                                             refId, EsmLoader::LessById {});
+            if (it == esmData.mRefIdTypes.end() || it->mId != refId)
+                return {};
+            return it->mType;
+        }
+
+        std::vector<CellRef> loadCellRefs(const ESM::Cell& cell, const EsmLoader::EsmData& esmData,
+            std::vector<ESM::ESMReader>& readers)
+        {
+            std::vector<EsmLoader::Record<CellRef>> cellRefs;
+
+            for (std::size_t i = 0; i < cell.mContextList.size(); i++)
+            {
+                ESM::ESMReader& reader = readers[static_cast<std::size_t>(cell.mContextList[i].index)];
+                cell.restore(reader, static_cast<int>(i));
+                ESM::CellRef cellRef;
+                bool deleted = false;
+                while (ESM::Cell::getNextRef(reader, cellRef, deleted))
+                {
+                    Misc::StringUtils::lowerCaseInPlace(cellRef.mRefID);
+                    const ESM::RecNameInts type = getType(esmData, cellRef.mRefID);
+                    if (type == ESM::RecNameInts {})
+                        continue;
+                    cellRefs.emplace_back(deleted, type, cellRef.mRefNum, std::move(cellRef.mRefID),
+                                        cellRef.mScale, cellRef.mPos);
+                }
+            }
+
+            Log(Debug::Debug) << "Loaded " << cellRefs.size() << " cell refs";
+
+            const auto getKey = [] (const EsmLoader::Record<CellRef>& v) -> const ESM::RefNum& { return v.mValue.mRefNum; };
+            std::vector<CellRef> result = prepareRecords(cellRefs, getKey);
+
+            Log(Debug::Debug) << "Prepared " << result.size() << " unique cell refs";
+
+            return result;
+        }
+
+        template <class F>
+        void forEachObject(const ESM::Cell& cell, const EsmLoader::EsmData& esmData, const VFS::Manager& vfs,
+            Resource::BulletShapeManager& bulletShapeManager, std::vector<ESM::ESMReader>& readers,
+            F&& f)
+        {
+            std::vector<CellRef> cellRefs = loadCellRefs(cell, esmData, readers);
+
+            Log(Debug::Debug) << "Prepared " << cellRefs.size() << " unique cell refs";
+
+            for (CellRef& cellRef : cellRefs)
+            {
+                std::string model(getModel(esmData, cellRef.mRefId, cellRef.mType));
+                if (model.empty())
+                    continue;
+
+                if (cellRef.mType != ESM::REC_STAT)
+                    model = Misc::ResourceHelpers::correctActorModelPath(model, &vfs);
+
+                osg::ref_ptr<const Resource::BulletShape> shape = [&]
+                {
+                    try
+                    {
+                        return bulletShapeManager.getShape("meshes/" + model);
+                    }
+                    catch (const std::exception& e)
+                    {
+                        Log(Debug::Warning) << "Failed to load cell ref \"" << cellRef.mRefId << "\" model \"" << model << "\": " << e.what();
+                        return osg::ref_ptr<const Resource::BulletShape>();
+                    }
+                } ();
+
+                if (shape == nullptr)
+                    continue;
+
+                switch (cellRef.mType)
+                {
+                    case ESM::REC_ACTI:
+                    case ESM::REC_CONT:
+                    case ESM::REC_DOOR:
+                    case ESM::REC_STAT:
+                        f(BulletObject {std::move(shape), cellRef.mPos, cellRef.mScale});
+                        break;
+                    default:
+                        break;
+                }
+            }
+        }
+    }
+
+    void forEachBulletObject(std::vector<ESM::ESMReader>& readers, const VFS::Manager& vfs,
+        Resource::BulletShapeManager& bulletShapeManager, const EsmLoader::EsmData& esmData,
+        std::function<void (const ESM::Cell& cell, const BulletObject& object)> callback)
+    {
+        Log(Debug::Info) << "Processing " << esmData.mCells.size() << " cells...";
+
+        for (std::size_t i = 0; i < esmData.mCells.size(); ++i)
+        {
+            const ESM::Cell& cell = esmData.mCells[i];
+            const bool exterior = cell.isExterior();
+
+            Log(Debug::Debug) << "Processing " << (exterior ? "exterior" : "interior")
+                << " cell (" << (i + 1) << "/" << esmData.mCells.size() << ") \"" << cell.getDescription() << "\"";
+
+            std::size_t objects = 0;
+
+            forEachObject(cell, esmData, vfs, bulletShapeManager, readers,
+                [&] (const BulletObject& object)
+                {
+                    callback(cell, object);
+                    ++objects;
+                });
+
+            Log(Debug::Info) << "Processed " << (exterior ? "exterior" : "interior")
+                << " cell (" << (i + 1) << "/" << esmData.mCells.size() << ") " << cell.getDescription()
+                << " with " << objects << " objects";
+        }
+    }
+}
diff --git a/components/resource/foreachbulletobject.hpp b/components/resource/foreachbulletobject.hpp
new file mode 100644
index 0000000000..5b1495e4cc
--- /dev/null
+++ b/components/resource/foreachbulletobject.hpp
@@ -0,0 +1,48 @@
+#ifndef OPENMW_COMPONENTS_RESOURCE_FOREACHBULLETOBJECT_H
+#define OPENMW_COMPONENTS_RESOURCE_FOREACHBULLETOBJECT_H
+
+#include <components/esm/defs.hpp>
+#include <components/misc/convert.hpp>
+#include <components/resource/bulletshape.hpp>
+
+#include <osg/ref_ptr>
+
+#include <functional>
+#include <vector>
+
+namespace ESM
+{
+    class ESMReader;
+    struct Cell;
+}
+
+namespace VFS
+{
+    class Manager;
+}
+
+namespace Resource
+{
+    class BulletShapeManager;
+}
+
+namespace EsmLoader
+{
+    struct EsmData;
+}
+
+namespace Resource
+{
+    struct BulletObject
+    {
+        osg::ref_ptr<const Resource::BulletShape> mShape;
+        ESM::Position mPosition;
+        float mScale;
+    };
+
+    void forEachBulletObject(std::vector<ESM::ESMReader>& readers, const VFS::Manager& vfs,
+        Resource::BulletShapeManager& bulletShapeManager, const EsmLoader::EsmData& esmData,
+        std::function<void (const ESM::Cell&, const BulletObject& object)> callback);
+}
+
+#endif

From a383d9dfdf9d2b89d95e264131ae441f4ac0520e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Sat, 29 Jan 2022 23:21:39 +0200
Subject: [PATCH 2069/2859] Make ownership explicit in Environment

---
 apps/openmw/engine.cpp             |  40 +++++------
 apps/openmw/mwbase/environment.cpp | 106 ++++++++++++-----------------
 apps/openmw/mwbase/environment.hpp |  50 +++++++-------
 3 files changed, 88 insertions(+), 108 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 9e2e1aedad..2a6b832c14 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -694,18 +694,18 @@ void OMW::Engine::setWindowIcon()
 void OMW::Engine::prepareEngine (Settings::Manager & settings)
 {
     mEnvironment.setStateManager (
-        new MWState::StateManager (mCfgMgr.getUserDataPath() / "saves", mContentFiles));
+        std::make_unique<MWState::StateManager> (mCfgMgr.getUserDataPath() / "saves", mContentFiles));
 
     createWindow(settings);
 
     osg::ref_ptr<osg::Group> rootNode (new osg::Group);
     mViewer->setSceneData(rootNode);
 
-    mVFS.reset(new VFS::Manager(mFSStrict));
+    mVFS = std::make_unique<VFS::Manager>(mFSStrict);
 
     VFS::registerArchives(mVFS.get(), mFileCollections, mArchives, true);
 
-    mResourceSystem.reset(new Resource::ResourceSystem(mVFS.get()));
+    mResourceSystem = std::make_unique<Resource::ResourceSystem>(mVFS.get());
     mResourceSystem->getSceneManager()->setUnRefImageDataAfterApply(false); // keep to Off for now to allow better state sharing
     mResourceSystem->getSceneManager()->setFilterSettings(
         Settings::Manager::getString("texture mag filter", "General"),
@@ -734,8 +734,9 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
 
     mViewer->addEventHandler(mScreenCaptureHandler);
 
-    mLuaManager = new MWLua::LuaManager(mVFS.get(), (mResDir / "lua_libs").string());
-    mEnvironment.setLuaManager(mLuaManager);
+    auto luaMgr = std::make_unique<MWLua::LuaManager>(mVFS.get(), (mResDir / "lua_libs").string());
+    mLuaManager = luaMgr.get();
+    mEnvironment.setLuaManager(std::move(luaMgr));
 
     // Create input and UI first to set up a bootstrapping environment for
     // showing a loading screen and keeping the window responsive while doing so
@@ -806,33 +807,35 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     guiRoot->setName("GUI Root");
     guiRoot->setNodeMask(MWRender::Mask_GUI);
     rootNode->addChild(guiRoot);
-    MWGui::WindowManager* window = new MWGui::WindowManager(mWindow, mViewer, guiRoot, mResourceSystem.get(), mWorkQueue.get(),
+
+    auto windowMgr = std::make_unique<MWGui::WindowManager>(mWindow, mViewer, guiRoot, mResourceSystem.get(), mWorkQueue.get(),
                 mCfgMgr.getLogPath().string() + std::string("/"), myguiResources,
                 mScriptConsoleMode, mTranslationDataStorage, mEncoding, mExportFonts,
                 Version::getOpenmwVersionDescription(mResDir.string()), mCfgMgr.getUserConfigPath().string(), shadersSupported);
-    mEnvironment.setWindowManager (window);
+    auto* windowMgrInternal = windowMgr.get();
+    mEnvironment.setWindowManager (std::move(windowMgr));
 
-    MWInput::InputManager* input = new MWInput::InputManager (mWindow, mViewer, mScreenCaptureHandler, mScreenCaptureOperation, keybinderUser, keybinderUserExists, userGameControllerdb, gameControllerdb, mGrab);
-    mEnvironment.setInputManager (input);
+    auto inputMgr = std::make_unique<MWInput::InputManager>(mWindow, mViewer, mScreenCaptureHandler, mScreenCaptureOperation, keybinderUser, keybinderUserExists, userGameControllerdb, gameControllerdb, mGrab);
+    mEnvironment.setInputManager (std::move(inputMgr));
 
     // Create sound system
-    mEnvironment.setSoundManager (new MWSound::SoundManager(mVFS.get(), mUseSound));
+    mEnvironment.setSoundManager (std::make_unique<MWSound::SoundManager>(mVFS.get(), mUseSound));
 
     if (!mSkipMenu)
     {
         const std::string& logo = Fallback::Map::getString("Movies_Company_Logo");
         if (!logo.empty())
-            window->playVideo(logo, true);
+            mEnvironment.getWindowManager()->playVideo(logo, true);
     }
 
     // Create the world
-    mEnvironment.setWorld( new MWWorld::World (mViewer, rootNode, mResourceSystem.get(), mWorkQueue.get(),
+    mEnvironment.setWorld(std::make_unique<MWWorld::World>(mViewer, rootNode, mResourceSystem.get(), mWorkQueue.get(),
         mFileCollections, mContentFiles, mGroundcoverFiles, mEncoder, mActivationDistanceOverride, mCellName,
         mStartupScript, mResDir.string(), mCfgMgr.getUserDataPath().string()));
     mEnvironment.getWorld()->setupPlayer();
 
-    window->setStore(mEnvironment.getWorld()->getStore());
-    window->initUI();
+    windowMgrInternal->setStore(mEnvironment.getWorld()->getStore());
+    windowMgrInternal->initUI();
 
     //Load translation data
     mTranslationDataStorage.setEncoder(mEncoder);
@@ -845,16 +848,15 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     mScriptContext = new MWScript::CompilerContext (MWScript::CompilerContext::Type_Full);
     mScriptContext->setExtensions (&mExtensions);
 
-    mEnvironment.setScriptManager (new MWScript::ScriptManager (mEnvironment.getWorld()->getStore(), *mScriptContext, mWarningsMode,
+    mEnvironment.setScriptManager (std::make_unique<MWScript::ScriptManager>(mEnvironment.getWorld()->getStore(), *mScriptContext, mWarningsMode,
         mScriptBlacklistUse ? mScriptBlacklist : std::vector<std::string>()));
 
     // Create game mechanics system
-    MWMechanics::MechanicsManager* mechanics = new MWMechanics::MechanicsManager;
-    mEnvironment.setMechanicsManager (mechanics);
+    mEnvironment.setMechanicsManager (std::make_unique<MWMechanics::MechanicsManager>());
 
     // Create dialog system
-    mEnvironment.setJournal (new MWDialogue::Journal);
-    mEnvironment.setDialogueManager (new MWDialogue::DialogueManager (mExtensions, mTranslationDataStorage));
+    mEnvironment.setJournal (std::make_unique<MWDialogue::Journal>());
+    mEnvironment.setDialogueManager (std::make_unique<MWDialogue::DialogueManager>(mExtensions, mTranslationDataStorage));
     mEnvironment.setResourceSystem(mResourceSystem.get());
 
     // scripts
diff --git a/apps/openmw/mwbase/environment.cpp b/apps/openmw/mwbase/environment.cpp
index 71940f67d2..1b212c73ab 100644
--- a/apps/openmw/mwbase/environment.cpp
+++ b/apps/openmw/mwbase/environment.cpp
@@ -18,68 +18,64 @@
 MWBase::Environment *MWBase::Environment::sThis = nullptr;
 
 MWBase::Environment::Environment()
-: mWorld (nullptr), mSoundManager (nullptr), mScriptManager (nullptr), mWindowManager (nullptr),
-  mMechanicsManager (nullptr),  mDialogueManager (nullptr), mJournal (nullptr), mInputManager (nullptr),
-    mStateManager (nullptr), mLuaManager (nullptr), mResourceSystem (nullptr),  mFrameDuration (0), mFrameRateLimit(0.f)
 {
-    assert (!sThis);
+    assert(!sThis);
     sThis = this;
 }
 
 MWBase::Environment::~Environment()
 {
-    cleanup();
     sThis = nullptr;
 }
 
-void MWBase::Environment::setWorld (World *world)
+void MWBase::Environment::setWorld (std::unique_ptr<World>&& world)
 {
-    mWorld = world;
+    mWorld = std::move(world);
 }
 
-void MWBase::Environment::setSoundManager (SoundManager *soundManager)
+void MWBase::Environment::setSoundManager (std::unique_ptr<SoundManager>&& soundManager)
 {
-    mSoundManager = soundManager;
+    mSoundManager = std::move(soundManager);
 }
 
-void MWBase::Environment::setScriptManager (ScriptManager *scriptManager)
+void MWBase::Environment::setScriptManager (std::unique_ptr<ScriptManager>&& scriptManager)
 {
-    mScriptManager = scriptManager;
+    mScriptManager = std::move(scriptManager);
 }
 
-void MWBase::Environment::setWindowManager (WindowManager *windowManager)
+void MWBase::Environment::setWindowManager (std::unique_ptr<WindowManager>&& windowManager)
 {
-    mWindowManager = windowManager;
+    mWindowManager = std::move(windowManager);
 }
 
-void MWBase::Environment::setMechanicsManager (MechanicsManager *mechanicsManager)
+void MWBase::Environment::setMechanicsManager (std::unique_ptr<MechanicsManager>&& mechanicsManager)
 {
-    mMechanicsManager = mechanicsManager;
+    mMechanicsManager = std::move(mechanicsManager);
 }
 
-void MWBase::Environment::setDialogueManager (DialogueManager *dialogueManager)
+void MWBase::Environment::setDialogueManager (std::unique_ptr<DialogueManager>&& dialogueManager)
 {
-    mDialogueManager = dialogueManager;
+    mDialogueManager = std::move(dialogueManager);
 }
 
-void MWBase::Environment::setJournal (Journal *journal)
+void MWBase::Environment::setJournal (std::unique_ptr<Journal>&& journal)
 {
-    mJournal = journal;
+    mJournal = std::move(journal);
 }
 
-void MWBase::Environment::setInputManager (InputManager *inputManager)
+void MWBase::Environment::setInputManager (std::unique_ptr<InputManager>&& inputManager)
 {
-    mInputManager = inputManager;
+    mInputManager = std::move(inputManager);
 }
 
-void MWBase::Environment::setStateManager (StateManager *stateManager)
+void MWBase::Environment::setStateManager (std::unique_ptr<StateManager>&& stateManager)
 {
-    mStateManager = stateManager;
+    mStateManager = std::move(stateManager);
 }
 
-void MWBase::Environment::setLuaManager (LuaManager *luaManager)
+void MWBase::Environment::setLuaManager (std::unique_ptr<LuaManager>&& luaManager)
 {
-    mLuaManager = luaManager;
+    mLuaManager = std::move(luaManager);
 }
 
 void MWBase::Environment::setResourceSystem (Resource::ResourceSystem *resourceSystem)
@@ -105,61 +101,61 @@ float MWBase::Environment::getFrameRateLimit() const
 MWBase::World *MWBase::Environment::getWorld() const
 {
     assert (mWorld);
-    return mWorld;
+    return mWorld.get();
 }
 
 MWBase::SoundManager *MWBase::Environment::getSoundManager() const
 {
     assert (mSoundManager);
-    return mSoundManager;
+    return mSoundManager.get();
 }
 
 MWBase::ScriptManager *MWBase::Environment::getScriptManager() const
 {
     assert (mScriptManager);
-    return mScriptManager;
+    return mScriptManager.get();
 }
 
 MWBase::WindowManager *MWBase::Environment::getWindowManager() const
 {
     assert (mWindowManager);
-    return mWindowManager;
+    return mWindowManager.get();
 }
 
 MWBase::MechanicsManager *MWBase::Environment::getMechanicsManager() const
 {
     assert (mMechanicsManager);
-    return mMechanicsManager;
+    return mMechanicsManager.get();
 }
 
 MWBase::DialogueManager *MWBase::Environment::getDialogueManager() const
 {
     assert (mDialogueManager);
-    return mDialogueManager;
+    return mDialogueManager.get();
 }
 
 MWBase::Journal *MWBase::Environment::getJournal() const
 {
     assert (mJournal);
-    return mJournal;
+    return mJournal.get();
 }
 
 MWBase::InputManager *MWBase::Environment::getInputManager() const
 {
     assert (mInputManager);
-    return mInputManager;
+    return mInputManager.get();
 }
 
 MWBase::StateManager *MWBase::Environment::getStateManager() const
 {
     assert (mStateManager);
-    return mStateManager;
+    return mStateManager.get();
 }
 
 MWBase::LuaManager *MWBase::Environment::getLuaManager() const
 {
     assert (mLuaManager);
-    return mLuaManager;
+    return mLuaManager.get();
 }
 
 Resource::ResourceSystem *MWBase::Environment::getResourceSystem() const
@@ -174,35 +170,17 @@ float MWBase::Environment::getFrameDuration() const
 
 void MWBase::Environment::cleanup()
 {
-    delete mMechanicsManager;
-    mMechanicsManager = nullptr;
-
-    delete mDialogueManager;
-    mDialogueManager = nullptr;
-
-    delete mJournal;
-    mJournal = nullptr;
-
-    delete mScriptManager;
-    mScriptManager = nullptr;
-
-    delete mWindowManager;
-    mWindowManager = nullptr;
-
-    delete mWorld;
-    mWorld = nullptr;
-
-    delete mSoundManager;
-    mSoundManager = nullptr;
-
-    delete mInputManager;
-    mInputManager = nullptr;
-
-    delete mStateManager;
-    mStateManager = nullptr;
-
-    delete mLuaManager;
-    mLuaManager = nullptr;
+    mMechanicsManager.reset();
+    mDialogueManager.reset();
+    mJournal.reset();
+    mScriptManager.reset();
+    mWindowManager.reset();
+    mWorld.reset();
+    mSoundManager.reset();
+    mInputManager.reset();
+    mStateManager.reset();
+    mLuaManager.reset();
+    mResourceSystem = nullptr;
 }
 
 const MWBase::Environment& MWBase::Environment::get()
diff --git a/apps/openmw/mwbase/environment.hpp b/apps/openmw/mwbase/environment.hpp
index b2600e7dd5..00af5d2869 100644
--- a/apps/openmw/mwbase/environment.hpp
+++ b/apps/openmw/mwbase/environment.hpp
@@ -1,6 +1,8 @@
 #ifndef GAME_BASE_ENVIRONMENT_H
 #define GAME_BASE_ENVIRONMENT_H
 
+#include <memory>
+
 namespace osg
 {
     class Stats;
@@ -28,25 +30,23 @@ namespace MWBase
     ///
     /// This class allows each mw-subsystem to access any others subsystem's top-level manager class.
     ///
-    /// \attention Environment takes ownership of the manager class instances it is handed over in
-    /// the set* functions.
     class Environment
     {
             static Environment *sThis;
 
-            World *mWorld;
-            SoundManager *mSoundManager;
-            ScriptManager *mScriptManager;
-            WindowManager *mWindowManager;
-            MechanicsManager *mMechanicsManager;
-            DialogueManager *mDialogueManager;
-            Journal *mJournal;
-            InputManager *mInputManager;
-            StateManager *mStateManager;
-            LuaManager *mLuaManager;
-            Resource::ResourceSystem *mResourceSystem;
-            float mFrameDuration;
-            float mFrameRateLimit;
+            std::unique_ptr<World> mWorld;
+            std::unique_ptr<SoundManager> mSoundManager;
+            std::unique_ptr<ScriptManager> mScriptManager;
+            std::unique_ptr<WindowManager> mWindowManager;
+            std::unique_ptr<MechanicsManager> mMechanicsManager;
+            std::unique_ptr<DialogueManager> mDialogueManager;
+            std::unique_ptr<Journal> mJournal;
+            std::unique_ptr<InputManager> mInputManager;
+            std::unique_ptr<StateManager> mStateManager;
+            std::unique_ptr<LuaManager> mLuaManager;
+            Resource::ResourceSystem* mResourceSystem{};
+            float mFrameDuration{};
+            float mFrameRateLimit{};
 
             Environment (const Environment&);
             ///< not implemented
@@ -60,25 +60,25 @@ namespace MWBase
 
             ~Environment();
 
-            void setWorld (World *world);
+            void setWorld (std::unique_ptr<World>&& world);
 
-            void setSoundManager (SoundManager *soundManager);
+            void setSoundManager (std::unique_ptr<SoundManager>&& soundManager);
 
-            void setScriptManager (MWBase::ScriptManager *scriptManager);
+            void setScriptManager (std::unique_ptr<ScriptManager>&& scriptManager);
 
-            void setWindowManager (WindowManager *windowManager);
+            void setWindowManager (std::unique_ptr<WindowManager>&& windowManager);
 
-            void setMechanicsManager (MechanicsManager *mechanicsManager);
+            void setMechanicsManager (std::unique_ptr<MechanicsManager>&& mechanicsManager);
 
-            void setDialogueManager (DialogueManager *dialogueManager);
+            void setDialogueManager (std::unique_ptr<DialogueManager>&& dialogueManager);
 
-            void setJournal (Journal *journal);
+            void setJournal (std::unique_ptr<Journal>&& journal);
 
-            void setInputManager (InputManager *inputManager);
+            void setInputManager (std::unique_ptr<InputManager>&& inputManager);
 
-            void setStateManager (StateManager *stateManager);
+            void setStateManager (std::unique_ptr<StateManager>&& stateManager);
 
-            void setLuaManager (LuaManager *luaManager);
+            void setLuaManager (std::unique_ptr<LuaManager>&& luaManager);
 
             void setResourceSystem (Resource::ResourceSystem *resourceSystem);
 

From 5ebcd37da109629041502cf630e76946b0b4c153 Mon Sep 17 00:00:00 2001
From: unknown <malusluminis@hotmail.com>
Date: Sat, 5 Feb 2022 19:07:44 +0100
Subject: [PATCH 2070/2859] Rename method and restore swish sounds

---
 apps/openmw/mwmechanics/character.cpp | 16 ++++++++++------
 apps/openmw/mwmechanics/character.hpp |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 820bfad07b..815f3b30cb 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -1125,7 +1125,7 @@ bool CharacterController::updateCarriedLeftVisible(const int weaptype) const
     return mAnimation->updateCarriedLeftVisible(weaptype);
 }
 
-bool CharacterController::updateWeaponState(CharacterState& idle)
+bool CharacterController::updateState(CharacterState& idle)
 {
     const MWWorld::Class &cls = mPtr.getClass();
     CreatureStats &stats = cls.getCreatureStats(mPtr);
@@ -1363,20 +1363,24 @@ bool CharacterController::updateWeaponState(CharacterState& idle)
     ESM::WeaponType::Class weapclass = getWeaponType(mWeaponType)->mWeaponClass;
     if(getAttackingOrSpell())
     {
-        MWWorld::Ptr player = getPlayer();
-
         bool resetIdle = ammunition;
         if(mUpperBodyState == UpperCharState_WeapEquiped && (mHitState == CharState_None || mHitState == CharState_Block))
         {
             MWBase::Environment::get().getWorld()->breakInvisibility(mPtr);
             mAttackStrength = 0;
 
-            // Randomize attacks for non-bipedal creatures with Weapon flag
+            // Randomize attacks for non-bipedal creatures
             if (mPtr.getClass().getType() == ESM::Creature::sRecordId &&
                 !mPtr.getClass().isBipedal(mPtr) &&
                 (!mAnimation->hasAnimation(mCurrentWeapon) || isRandomAttackAnimation(mCurrentWeapon)))
             {
                 mCurrentWeapon = chooseRandomAttackAnimation();
+                if (!mPtr.getClass().hasInventoryStore(mPtr))
+                {
+                    mAttackStrength = std::min(1.f, 0.1f + Misc::Rng::rollClosedProbability());
+                    if (mWeaponType == ESM::Weapon::HandToHand)
+                        playSwishSound(0.0f);
+                }
             }
 
             if(mWeaponType == ESM::Weapon::Spell)
@@ -1384,7 +1388,7 @@ bool CharacterController::updateWeaponState(CharacterState& idle)
                 // Unset casting flag, otherwise pressing the mouse button down would
                 // continue casting every frame if there is no animation
                 setAttackingOrSpell(false);
-                if (mPtr == player)
+                if (mPtr == getPlayer())
                 {
                     // For the player, set the spell we want to cast
                     // This has to be done at the start of the casting animation,
@@ -2253,7 +2257,7 @@ void CharacterController::update(float duration)
 
         if (!mSkipAnim)
         {
-            forcestateupdate = updateWeaponState(idlestate) || forcestateupdate;
+            forcestateupdate = updateState(idlestate) || forcestateupdate;
 
             refreshCurrentAnims(idlestate, movestate, jumpstate, forcestateupdate);
             updateIdleStormState(inwater);
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index 8c410bba25..1a0fd42fba 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -205,7 +205,7 @@ class CharacterController : public MWRender::Animation::TextKeyListener
 
     void clearAnimQueue(bool clearPersistAnims = false);
 
-    bool updateWeaponState(CharacterState& idle);
+    bool updateState(CharacterState& idle);
     void updateIdleStormState(bool inwater);
 
     std::string chooseRandomAttackAnimation() const;

From 020e0b2ea5c5da26322119df8196c2a1ca5ab1c9 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 5 Feb 2022 22:50:04 +0100
Subject: [PATCH 2071/2859] Don't allow non-bipedal actors to play hand-to-hand
 animations

---
 apps/openmw/mwmechanics/character.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 815f3b30cb..3ea09569ba 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -435,6 +435,8 @@ std::string CharacterController::getWeaponAnimation(int weaponType) const
         else if (isRealWeapon)
             weaponGroup = oneHandFallback;
     }
+    else if (weaponType == ESM::Weapon::HandToHand && !mPtr.getClass().isBipedal(mPtr))
+        return "attack1";
 
     return weaponGroup;
 }
@@ -1293,7 +1295,7 @@ bool CharacterController::updateState(CharacterState& idle)
                 }
 
                 mWeaponType = weaptype;
-                mCurrentWeapon = getWeaponAnimation(mWeaponType);
+                mCurrentWeapon = weapgroup;
 
                 if(!upSoundId.empty() && !isStillWeapon)
                 {
@@ -1376,11 +1378,7 @@ bool CharacterController::updateState(CharacterState& idle)
             {
                 mCurrentWeapon = chooseRandomAttackAnimation();
                 if (!mPtr.getClass().hasInventoryStore(mPtr))
-                {
                     mAttackStrength = std::min(1.f, 0.1f + Misc::Rng::rollClosedProbability());
-                    if (mWeaponType == ESM::Weapon::HandToHand)
-                        playSwishSound(0.0f);
-                }
             }
 
             if(mWeaponType == ESM::Weapon::Spell)
@@ -1561,7 +1559,11 @@ bool CharacterController::updateState(CharacterState& idle)
                                  weapSpeed, startKey, stopKey,
                                  0.0f, 0);
                 if(mAnimation->getCurrentTime(mCurrentWeapon) != -1.f)
+                {
                     mUpperBodyState = UpperCharState_StartToMinAttack;
+                    if (mWeaponType == ESM::Weapon::HandToHand && !mPtr.getClass().isBipedal(mPtr))
+                        playSwishSound(0.0f);
+                }
             }
         }
 

From 4657060d2caef27f3a7d67fb8995c969dc8a7440 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 6 Feb 2022 11:08:47 +0100
Subject: [PATCH 2072/2859] Extend swish and strength changes to all random
 attacks

---
 apps/openmw/mwmechanics/character.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 3ea09569ba..90a175af51 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -1377,8 +1377,6 @@ bool CharacterController::updateState(CharacterState& idle)
                 (!mAnimation->hasAnimation(mCurrentWeapon) || isRandomAttackAnimation(mCurrentWeapon)))
             {
                 mCurrentWeapon = chooseRandomAttackAnimation();
-                if (!mPtr.getClass().hasInventoryStore(mPtr))
-                    mAttackStrength = std::min(1.f, 0.1f + Misc::Rng::rollClosedProbability());
             }
 
             if(mWeaponType == ESM::Weapon::Spell)
@@ -1561,8 +1559,11 @@ bool CharacterController::updateState(CharacterState& idle)
                 if(mAnimation->getCurrentTime(mCurrentWeapon) != -1.f)
                 {
                     mUpperBodyState = UpperCharState_StartToMinAttack;
-                    if (mWeaponType == ESM::Weapon::HandToHand && !mPtr.getClass().isBipedal(mPtr))
+                    if (isRandomAttackAnimation(mCurrentWeapon))
+                    {
+                        mAttackStrength = std::min(1.f, 0.1f + Misc::Rng::rollClosedProbability());
                         playSwishSound(0.0f);
+                    }
                 }
             }
         }

From 6c56436809f608853367f1851f3bf9b5790d6122 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 23 Jan 2022 20:49:42 +0100
Subject: [PATCH 2073/2859] Control AI packages from Lua

---
 apps/openmw/mwlua/localscripts.cpp            | 102 +++++++++++-
 apps/openmw/mwlua/luabindings.cpp             |   2 +-
 apps/openmw/mwmechanics/actors.cpp            |   6 +-
 apps/openmw/mwmechanics/aisequence.cpp        |  12 +-
 apps/openmw/mwmechanics/aisequence.hpp        |  10 +-
 docs/source/generate_luadoc.sh                |   1 +
 .../reference/lua-scripting/aipackages.rst    | 145 ++++++++++++++++++
 docs/source/reference/lua-scripting/api.rst   |   7 +
 .../source/reference/lua-scripting/events.rst |  13 ++
 .../reference/lua-scripting/interface_ai.rst  |   6 +
 .../reference/lua-scripting/overview.rst      |   8 +-
 files/builtin_scripts/builtin.omwscripts      |   1 +
 files/builtin_scripts/scripts/omw/ai.lua      | 116 ++++++++++++++
 files/lua_api/openmw/self.lua                 |  19 +--
 14 files changed, 401 insertions(+), 47 deletions(-)
 create mode 100644 docs/source/reference/lua-scripting/aipackages.rst
 create mode 100644 docs/source/reference/lua-scripting/events.rst
 create mode 100644 docs/source/reference/lua-scripting/interface_ai.rst
 create mode 100644 files/builtin_scripts/scripts/omw/ai.lua

diff --git a/apps/openmw/mwlua/localscripts.cpp b/apps/openmw/mwlua/localscripts.cpp
index 2b492c5c17..552ce77541 100644
--- a/apps/openmw/mwlua/localscripts.cpp
+++ b/apps/openmw/mwlua/localscripts.cpp
@@ -1,9 +1,17 @@
 #include "localscripts.hpp"
 
+#include <components/esm3/loadcell.hpp>
+
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwmechanics/aisequence.hpp"
 #include "../mwmechanics/aicombat.hpp"
+#include "../mwmechanics/aiescort.hpp"
+#include "../mwmechanics/aifollow.hpp"
+#include "../mwmechanics/aipursue.hpp"
+#include "../mwmechanics/aitravel.hpp"
+#include "../mwmechanics/aiwander.hpp"
+#include "../mwmechanics/aipackage.hpp"
 
 #include "luamanagerimp.hpp"
 
@@ -60,28 +68,106 @@ namespace MWLua
             }
             context.mLuaManager->addAction(std::make_unique<SetEquipmentAction>(context.mLua, obj.id(), std::move(eqp)));
         };
-        selfAPI["getCombatTarget"] = [worldView=context.mWorldView](SelfObject& self) -> sol::optional<LObject>
+
+        using AiPackage = MWMechanics::AiPackage;
+        sol::usertype<AiPackage> aiPackage = context.mLua->sol().new_usertype<AiPackage>("AiPackage");
+        aiPackage["type"] = sol::readonly_property([](const AiPackage& p) -> std::string_view
+        {
+            switch (p.getTypeId())
+            {
+                case MWMechanics::AiPackageTypeId::Wander: return "Wander";
+                case MWMechanics::AiPackageTypeId::Travel: return "Travel";
+                case MWMechanics::AiPackageTypeId::Escort: return "Escort";
+                case MWMechanics::AiPackageTypeId::Follow: return "Follow";
+                case MWMechanics::AiPackageTypeId::Activate: return "Activate";
+                case MWMechanics::AiPackageTypeId::Combat: return "Combat";
+                case MWMechanics::AiPackageTypeId::Pursue: return "Pursue";
+                case MWMechanics::AiPackageTypeId::AvoidDoor: return "AvoidDoor";
+                case MWMechanics::AiPackageTypeId::Face: return "Face";
+                case MWMechanics::AiPackageTypeId::Breathe: return "Breathe";
+                case MWMechanics::AiPackageTypeId::Cast: return "Cast";
+                default: return "Unknown";
+            }
+        });
+        aiPackage["target"] = sol::readonly_property([worldView=context.mWorldView](const AiPackage& p) -> sol::optional<LObject>
+        {
+            MWWorld::Ptr target = p.getTarget();
+            if (target.isEmpty())
+                return sol::nullopt;
+            else
+                return LObject(getId(target), worldView->getObjectRegistry());
+        });
+        aiPackage["sideWithTarget"] = sol::readonly_property([](const AiPackage& p) { return p.sideWithTarget(); });
+        aiPackage["destination"] = sol::readonly_property([](const AiPackage& p) { return p.getDestination(); });
+
+        selfAPI["_getActiveAiPackage"] = [](SelfObject& self) -> sol::optional<std::shared_ptr<AiPackage>>
         {
             const MWWorld::Ptr& ptr = self.ptr();
             MWMechanics::AiSequence& ai = ptr.getClass().getCreatureStats(ptr).getAiSequence();
-            MWWorld::Ptr target;
-            if (ai.getCombatTarget(target))
-                return LObject(getId(target), worldView->getObjectRegistry());
+            if (ai.isEmpty())
+                return sol::nullopt;
             else
-                return {};
+                return *ai.begin();
         };
-        selfAPI["stopCombat"] = [](SelfObject& self)
+        selfAPI["_iterateAndFilterAiSequence"] = [](SelfObject& self, sol::function callback)
         {
             const MWWorld::Ptr& ptr = self.ptr();
             MWMechanics::AiSequence& ai = ptr.getClass().getCreatureStats(ptr).getAiSequence();
-            ai.stopCombat();
+            std::list<std::shared_ptr<AiPackage>>& list = ai.getUnderlyingList();
+            for (auto it = list.begin(); it != list.end();)
+            {
+                bool keep = LuaUtil::call(callback, *it).get<bool>();
+                if (keep)
+                    ++it;
+                else
+                    it = list.erase(it);
+            }
         };
-        selfAPI["startCombat"] = [](SelfObject& self, const LObject& target)
+        selfAPI["_startAiCombat"] = [](SelfObject& self, const LObject& target)
         {
             const MWWorld::Ptr& ptr = self.ptr();
             MWMechanics::AiSequence& ai = ptr.getClass().getCreatureStats(ptr).getAiSequence();
             ai.stack(MWMechanics::AiCombat(target.ptr()), ptr);
         };
+        selfAPI["_startAiPursue"] = [](SelfObject& self, const LObject& target)
+        {
+            const MWWorld::Ptr& ptr = self.ptr();
+            MWMechanics::AiSequence& ai = ptr.getClass().getCreatureStats(ptr).getAiSequence();
+            ai.stack(MWMechanics::AiPursue(target.ptr()), ptr);
+        };
+        selfAPI["_startAiFollow"] = [](SelfObject& self, const LObject& target)
+        {
+            const MWWorld::Ptr& ptr = self.ptr();
+            MWMechanics::AiSequence& ai = ptr.getClass().getCreatureStats(ptr).getAiSequence();
+            ai.stack(MWMechanics::AiFollow(target.ptr()), ptr);
+        };
+        selfAPI["_startAiEscort"] = [](SelfObject& self, const LObject& target, LCell cell,
+                                       float duration, const osg::Vec3f& dest)
+        {
+            const MWWorld::Ptr& ptr = self.ptr();
+            MWMechanics::AiSequence& ai = ptr.getClass().getCreatureStats(ptr).getAiSequence();
+            // TODO: change AiEscort implementation to accept ptr instead of a non-unique refId.
+            const std::string& refId = target.ptr().getCellRef().getRefId();
+            int gameHoursDuration = static_cast<int>(std::ceil(duration / 3600.0));
+            const ESM::Cell* esmCell = cell.mStore->getCell();
+            if (esmCell->isExterior())
+                ai.stack(MWMechanics::AiEscort(refId, gameHoursDuration, dest.x(), dest.y(), dest.z(), false), ptr);
+            else
+                ai.stack(MWMechanics::AiEscort(refId, esmCell->mName, gameHoursDuration, dest.x(), dest.y(), dest.z(), false), ptr);
+        };
+        selfAPI["_startAiWander"] = [](SelfObject& self, int distance, float duration)
+        {
+            const MWWorld::Ptr& ptr = self.ptr();
+            MWMechanics::AiSequence& ai = ptr.getClass().getCreatureStats(ptr).getAiSequence();
+            int gameHoursDuration = static_cast<int>(std::ceil(duration / 3600.0));
+            ai.stack(MWMechanics::AiWander(distance, gameHoursDuration, 0, {}, false), ptr);
+        };
+        selfAPI["_startAiTravel"] = [](SelfObject& self, const osg::Vec3f& target)
+        {
+            const MWWorld::Ptr& ptr = self.ptr();
+            MWMechanics::AiSequence& ai = ptr.getClass().getCreatureStats(ptr).getAiSequence();
+            ai.stack(MWMechanics::AiTravel(target.x(), target.y(), target.z(), false), ptr);
+        };
     }
 
     LocalScripts::LocalScripts(LuaUtil::LuaState* lua, const LObject& obj, ESM::LuaScriptCfg::Flags autoStartMode)
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index 084de7d5e1..06ba6d5c5a 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -49,7 +49,7 @@ namespace MWLua
     {
         auto* lua = context.mLua;
         sol::table api(lua->sol(), sol::create);
-        api["API_REVISION"] = 16;
+        api["API_REVISION"] = 17;
         api["quit"] = [lua]()
         {
             Log(Debug::Warning) << "Quit requested by a Lua script.\n" << lua->debugTraceback();
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index c567ea464c..2f447e12d6 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -2013,7 +2013,7 @@ namespace MWMechanics
     std::list<MWWorld::Ptr> Actors::getActorsFollowing(const MWWorld::Ptr& actor)
     {
         std::list<MWWorld::Ptr> list;
-        forEachFollowingPackage(mActors, actor, getPlayer(), [&] (auto& iter, const std::unique_ptr<AiPackage>& package)
+        forEachFollowingPackage(mActors, actor, getPlayer(), [&] (auto& iter, const std::shared_ptr<AiPackage>& package)
         {
             if (package->followTargetThroughDoors() && package->getTarget() == actor)
                 list.push_back(iter.first);
@@ -2064,7 +2064,7 @@ namespace MWMechanics
     std::list<int> Actors::getActorsFollowingIndices(const MWWorld::Ptr &actor)
     {
         std::list<int> list;
-        forEachFollowingPackage(mActors, actor, getPlayer(), [&] (auto& iter, const std::unique_ptr<AiPackage>& package)
+        forEachFollowingPackage(mActors, actor, getPlayer(), [&] (auto& iter, const std::shared_ptr<AiPackage>& package)
         {
             if (package->followTargetThroughDoors() && package->getTarget() == actor)
             {
@@ -2081,7 +2081,7 @@ namespace MWMechanics
     std::map<int, MWWorld::Ptr> Actors::getActorsFollowingByIndex(const MWWorld::Ptr &actor)
     {
         std::map<int, MWWorld::Ptr> map;
-        forEachFollowingPackage(mActors, actor, getPlayer(), [&] (auto& iter, const std::unique_ptr<AiPackage>& package)
+        forEachFollowingPackage(mActors, actor, getPlayer(), [&] (auto& iter, const std::shared_ptr<AiPackage>& package)
         {
             if (package->followTargetThroughDoors() && package->getTarget() == actor)
             {
diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index b9efcb1cde..86bc714964 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -87,17 +87,7 @@ bool AiSequence::getCombatTargets(std::vector<MWWorld::Ptr> &targetActors) const
     return !targetActors.empty();
 }
 
-std::list<std::unique_ptr<AiPackage>>::const_iterator AiSequence::begin() const
-{
-    return mPackages.begin();
-}
-
-std::list<std::unique_ptr<AiPackage>>::const_iterator AiSequence::end() const
-{
-    return mPackages.end();
-}
-
-void AiSequence::erase(std::list<std::unique_ptr<AiPackage>>::const_iterator package)
+void AiSequence::erase(std::list<std::shared_ptr<AiPackage>>::const_iterator package)
 {
     // Not sure if manually terminated packages should trigger mDone, probably not?
     for(auto it = mPackages.begin(); it != mPackages.end(); ++it)
diff --git a/apps/openmw/mwmechanics/aisequence.hpp b/apps/openmw/mwmechanics/aisequence.hpp
index 853509ed80..6cbfcf045d 100644
--- a/apps/openmw/mwmechanics/aisequence.hpp
+++ b/apps/openmw/mwmechanics/aisequence.hpp
@@ -38,7 +38,7 @@ namespace MWMechanics
     class AiSequence
     {
             ///AiPackages to run though
-            std::list<std::unique_ptr<AiPackage>> mPackages;
+            std::list<std::shared_ptr<AiPackage>> mPackages;
 
             ///Finished with top AIPackage, set for one frame
             bool mDone;
@@ -63,10 +63,12 @@ namespace MWMechanics
             virtual ~AiSequence();
 
             /// Iterator may be invalidated by any function calls other than begin() or end().
-            std::list<std::unique_ptr<AiPackage>>::const_iterator begin() const;
-            std::list<std::unique_ptr<AiPackage>>::const_iterator end() const;
+            std::list<std::shared_ptr<AiPackage>>::const_iterator begin() const { return mPackages.begin(); }
+            std::list<std::shared_ptr<AiPackage>>::const_iterator end() const { return mPackages.end(); }
 
-            void erase(std::list<std::unique_ptr<AiPackage>>::const_iterator package);
+            void erase(std::list<std::shared_ptr<AiPackage>>::const_iterator package);
+
+            std::list<std::shared_ptr<AiPackage>>& getUnderlyingList() { return mPackages; }
 
             /// Returns currently executing AiPackage type
             /** \see enum class AiPackageTypeId **/
diff --git a/docs/source/generate_luadoc.sh b/docs/source/generate_luadoc.sh
index 067a1ad4cf..99e387cf0f 100755
--- a/docs/source/generate_luadoc.sh
+++ b/docs/source/generate_luadoc.sh
@@ -65,5 +65,6 @@ $DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR openmw/*lua
 
 cd $FILES_DIR/builtin_scripts
 $DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR openmw_aux/*lua
+$DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR scripts/omw/ai.lua
 $DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR scripts/omw/camera.lua
 
diff --git a/docs/source/reference/lua-scripting/aipackages.rst b/docs/source/reference/lua-scripting/aipackages.rst
new file mode 100644
index 0000000000..4570be712e
--- /dev/null
+++ b/docs/source/reference/lua-scripting/aipackages.rst
@@ -0,0 +1,145 @@
+Built-in AI packages
+====================
+
+Combat
+------
+
+Attack another actor.
+
+**Arguments**
+
+.. list-table::
+  :header-rows: 1
+  :widths: 20 20 60
+
+  * - name
+    - type
+    - description
+  * - target
+    - `GameObject <openmw_core.html##(GameObject)>`_ [required]
+    - the actor to attack
+
+**Examples**
+
+.. code-block:: Lua
+
+    -- from local script add package to self
+    local AI = require('openmw.interfaces').AI
+    AI.startPackage({type='Combat', target=anotherActor})
+
+    -- via event to any actor
+    actor:sendEvent('StartAIPackage', {type='Combat', target=anotherActor})
+
+Pursue
+------
+
+Pursue another actor.
+
+**Arguments**
+
+.. list-table::
+  :header-rows: 1
+  :widths: 20 20 60
+
+  * - name
+    - type
+    - description
+  * - target
+    - `GameObject <openmw_core.html##(GameObject)>`_ [required]
+    - the actor to pursue
+
+Follow
+------
+
+Follow another actor.
+
+**Arguments**
+
+.. list-table::
+  :header-rows: 1
+  :widths: 20 20 60
+
+  * - name
+    - type
+    - description
+  * - target
+    - `GameObject <openmw_core.html##(GameObject)>`_ [required]
+    - the actor to follow
+
+Escort
+------
+
+Escort another actor to the given location.
+
+**Arguments**
+
+.. list-table::
+  :header-rows: 1
+  :widths: 20 20 60
+
+  * - name
+    - type
+    - description
+  * - target
+    - `GameObject <openmw_core.html##(GameObject)>`_ [required]
+    - the actor to follow
+  * - destPosition
+    - `3d vector <openmw_util.html##(Vector3)>`_ [required]
+    - the destination point
+  * - destCell
+    - Cell [optional]
+    - the destination cell
+  * - duration
+    - number [optional]
+    - duration in game time (will be rounded up to the next hour)
+
+**Example**
+
+.. code-block:: Lua
+
+    actor:sendEvent('StartAIPackage', {
+        type = 'Escort',
+        target = object.self,
+        destPosition = util.vector3(x, y, z),
+        duration = 3 * time.hour,
+    })
+
+Wander
+------
+
+Wander nearby current position.
+
+**Arguments**
+
+.. list-table::
+  :header-rows: 1
+  :widths: 20 20 60
+
+  * - name
+    - type
+    - description
+  * - distance
+    - float [default=0]
+    - the actor to follow
+  * - duration
+    - number [optional]
+    - duration in game time (will be rounded up to the next hour)
+
+Travel
+------
+
+Go to given location.
+
+**Arguments**
+
+.. list-table::
+  :header-rows: 1
+  :widths: 20 20 60
+
+  * - name
+    - type
+    - description
+  * - destPosition
+    - `3d vector <openmw_util.html##(Vector3)>`_ [required]
+    - the point to travel to
+
diff --git a/docs/source/reference/lua-scripting/api.rst b/docs/source/reference/lua-scripting/api.rst
index ef831e734a..41fd52253f 100644
--- a/docs/source/reference/lua-scripting/api.rst
+++ b/docs/source/reference/lua-scripting/api.rst
@@ -7,6 +7,8 @@ Lua API reference
 
     engine_handlers
     user_interface
+    aipackages
+    events
     openmw_util
     openmw_storage
     openmw_core
@@ -21,6 +23,7 @@ Lua API reference
     openmw_aux_calendar
     openmw_aux_util
     openmw_aux_time
+    interface_ai
     interface_camera
 
 
@@ -28,6 +31,8 @@ Lua API reference
 - :ref:`User interface reference <User interface reference>`
 - `Game object reference <openmw_core.html##(GameObject)>`_
 - `Cell reference <openmw_core.html##(Cell)>`_
+- :ref:`Built-in AI packages`
+- :ref:`Built-in events`
 
 **API packages**
 
@@ -87,6 +92,8 @@ Sources can be found in ``resources/vfs/openmw_aux``. In theory mods can overrid
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 | Interface                                               | Can be used        | Description                                                   |
 +=========================================================+====================+===============================================================+
+|:ref:`AI <Interface AI>`                                 | by local scripts   | | Control basic AI of NPCs and creatures.                     |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`Camera <Interface Camera>`                         | by player scripts  | | Allows to alter behavior of the built-in camera script      |
 |                                                         |                    | | without overriding the script completely.                   |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
diff --git a/docs/source/reference/lua-scripting/events.rst b/docs/source/reference/lua-scripting/events.rst
new file mode 100644
index 0000000000..3d443b2811
--- /dev/null
+++ b/docs/source/reference/lua-scripting/events.rst
@@ -0,0 +1,13 @@
+Built-in events
+===============
+
+Any script can send to any actor (except player, for player will be ignored) events ``StartAIPackage`` and ``RemoveAIPackages``.
+The effect is equivalent to calling ``interfaces.AI.startPackage`` or ``interfaces.AI.removePackages`` in a local script on this actor.
+
+Examples:
+
+.. code-block:: Lua
+
+    actor:sendEvent('StartAIPackage', {type='Combat', target=self.object})
+    actor:sendEvent('RemoveAIPackages', 'Pursue')
+
diff --git a/docs/source/reference/lua-scripting/interface_ai.rst b/docs/source/reference/lua-scripting/interface_ai.rst
new file mode 100644
index 0000000000..ec79b50d5d
--- /dev/null
+++ b/docs/source/reference/lua-scripting/interface_ai.rst
@@ -0,0 +1,6 @@
+Interface AI
+============
+
+.. raw:: html
+   :file: generated_html/scripts_omw_ai.html
+
diff --git a/docs/source/reference/lua-scripting/overview.rst b/docs/source/reference/lua-scripting/overview.rst
index 1bfdf33c42..02c76d094c 100644
--- a/docs/source/reference/lua-scripting/overview.rst
+++ b/docs/source/reference/lua-scripting/overview.rst
@@ -452,6 +452,8 @@ The order in which the scripts are started is important. So if one mod should ov
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 | Interface                                               | Can be used        | Description                                                   |
 +=========================================================+====================+===============================================================+
+|:ref:`AI <Interface AI>`                                 | by local scripts   | | Control basic AI of NPCs and creatures.                     |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`Camera <Interface Camera>`                         | by player scripts  | | Allows to alter behavior of the built-in camera script      |
 |                                                         |                    | | without overriding the script completely.                   |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
@@ -484,7 +486,7 @@ At some moment it will send the 'DamagedByDarkPower' event to all nearby actors:
     local self = require('openmw.self')
     local nearby = require('openmw.nearby')
 
-    local function onActivate()
+    local function onActivated()
         for i, actor in nearby.actors:ipairs() do
             local dist = (self.position - actor.position):length()
             if dist < 500 then
@@ -494,7 +496,7 @@ At some moment it will send the 'DamagedByDarkPower' event to all nearby actors:
         end
     end
 
-    return { engineHandlers = { ... } }
+    return { engineHandlers = { onActivated = onActivated } }
 
 And every actor should have a local script that processes this event:
 
@@ -526,6 +528,8 @@ The protection mod attaches an additional local script to every actor. The scrip
 
 In order to be able to intercept the event, the protection script should be placed in the load order below the original script.
 
+See :ref:`the list of events <Built-in events>` that are used by built-in scripts.
+
 
 Timers
 ======
diff --git a/files/builtin_scripts/builtin.omwscripts b/files/builtin_scripts/builtin.omwscripts
index 30fccad9fa..2ffe7007f2 100644
--- a/files/builtin_scripts/builtin.omwscripts
+++ b/files/builtin_scripts/builtin.omwscripts
@@ -1 +1,2 @@
 PLAYER: scripts/omw/camera.lua
+NPC,CREATURE: scripts/omw/ai.lua
diff --git a/files/builtin_scripts/scripts/omw/ai.lua b/files/builtin_scripts/scripts/omw/ai.lua
new file mode 100644
index 0000000000..5d76a7d9be
--- /dev/null
+++ b/files/builtin_scripts/scripts/omw/ai.lua
@@ -0,0 +1,116 @@
+local self = require('openmw.self')
+local interfaces = require('openmw.interfaces')
+
+local function startPackage(args)
+    if args.type == 'Combat' then
+        if not args.target then error("target required") end
+        self:_startAiCombat(args.target)
+    elseif args.type == 'Pursue' then
+        if not args.target then error("target required") end
+        self:_startAiPursue(args.target)
+    elseif args.type == 'Follow' then
+        if not args.target then error("target required") end
+        self:_startAiFollow(args.target)
+    elseif args.type == 'Escort' then
+        if not args.target then error("target required") end
+        if not args.destPosition then error("destPosition required") end
+        self:_startAiEscort(args.target, args.destCell or self.cell, args.duration or 0, args.destPosition)
+    elseif args.type == 'Wander' then
+        self:_startAiWander(args.distance or 0, args.duration or 0)
+    elseif args.type == 'Travel' then
+        if not args.destPosition then error("destPosition required") end
+        self:_startAiTravel(args.destPosition)
+    else
+        error('Unsupported AI Package: '..args.type)
+    end
+end
+
+local function filterPackages(filter)
+    self:_iterateAndFilterAiSequence(filter)
+end
+
+return {
+    interfaceName = 'AI',
+    --- Basic AI interface
+    -- @module AI
+    -- @usage require('openmw.interfaces').AI
+    interface = {
+        --- Interface version
+        -- @field [parent=#AI] #number version
+        version = 0,
+
+        --- AI Package
+        -- @type Package
+        -- @field #string type Type of the AI package.
+        -- @field openmw.core#GameObject target Target (usually an actor) of the AI package (can be nil).
+        -- @field #boolean sideWithTarget Whether to help the target in combat (true or false).
+        -- @field openmw.util#Vector3 position Destination point of the AI package (can be nil).
+
+        --- Return the currently active AI package (or `nil` if there are no AI packages).
+        -- @function [parent=#AI] getActivePackage
+        -- @return #Package
+        getActivePackage = function() return self:_getActiveAiPackage() end,
+
+        --- Start new AI package.
+        -- @function [parent=#AI] startPackage
+        -- @param #table options See the "Built-in AI packages" page.
+        startPackage = startPackage,
+
+        --- Iterate over all packages starting from the active one and remove those where `filterCallback` returns false.
+        -- @function [parent=#AI] filterPackages
+        -- @param #function filterCallback
+        filterPackages = filterPackages,
+
+        --- Iterate over all packages and run `callback` for each starting from the active one.
+        -- The same as `filterPackage`, but without removal.
+        -- @function [parent=#AI] forEachPackage
+        -- @param #function callback
+        forEachPackage = function(callback)
+            local filter = function(p)
+                callback(p)
+                return true
+            end
+            filterPackages(filter)
+        end,
+
+        --- Remove packages of given type (remove all packages if the type is not specified).
+        -- @function [parent=#AI] removePackages
+        -- @param #string packageType (optional) The type of packages to remove.
+        removePackages = function(packageType)
+            filterPackages(function(p) return packageType and p.type ~= packageType end)
+        end,
+
+        --- Return the target of the active package if the package has given type
+        -- @function [parent=#AI] getActiveTarget
+        -- @param #string packageType The expected type of the active package
+        -- @return openmw.core#GameObject The target (can be nil if the package has no target or has another type)
+        getActiveTarget = function(packageType)
+            local p = self:_getActiveAiPackage()
+            if p and p.type == packageType then
+                return p.target
+            else
+                return nil
+            end
+        end,
+
+        --- Get list of targets of all packages of the given type.
+        -- @function [parent=#AI] getTargets
+        -- @param #string packageType
+        -- @return #list<openmw.core#GameObject>
+        getTargets = function(packageType)
+            local res = {}
+            filterPackages(function(p)
+                if p.type == packageType and p.target then
+                    res[#res + 1] = p.target
+                end
+                return true
+            end)
+            return res
+        end,
+    },
+    eventHandlers = {
+        StartAIPackage = function(options) interfaces.AI.startPackage(options) end,
+        RemoveAIPackages = function(packageType) interfaces.AI.removePackages(packageType) end,
+    },
+}
+
diff --git a/files/lua_api/openmw/self.lua b/files/lua_api/openmw/self.lua
index 1228a92a87..d6f01412eb 100644
--- a/files/lua_api/openmw/self.lua
+++ b/files/lua_api/openmw/self.lua
@@ -37,27 +37,10 @@
 -- @field [parent=#ActorControls] #number use if 1 - activates the readied weapon/spell. For weapons, keeping at 1 will charge the attack until set to 0.
 
 -------------------------------------------------------------------------------
--- Enables or disables standart AI (enabled by default).
+-- Enables or disables standard AI (enabled by default).
 -- @function [parent=#self] enableAI
 -- @param self
 -- @param #boolean v
 
--------------------------------------------------------------------------------
--- Returns current target or nil if not in combat
--- @function [parent=#self] getCombatTarget
--- @param self
--- @return openmw.core#GameObject
-
--------------------------------------------------------------------------------
--- Remove all combat packages from the actor.
--- @function [parent=#self] stopCombat
--- @param self
-
--------------------------------------------------------------------------------
--- Attack `target`.
--- @function [parent=#self] startCombat
--- @param self
--- @param openmw.core#GameObject target
-
 return nil
 

From 60aa57c8d8fafee95974a0ba8654d31bef872a87 Mon Sep 17 00:00:00 2001
From: Abdu Sharif <narukomanroom@gmail.com>
Date: Sun, 6 Feb 2022 18:18:20 +0000
Subject: [PATCH 2074/2859] Update water.rst

---
 docs/source/reference/modding/settings/water.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/reference/modding/settings/water.rst b/docs/source/reference/modding/settings/water.rst
index fb3b755c6f..5057870353 100644
--- a/docs/source/reference/modding/settings/water.rst
+++ b/docs/source/reference/modding/settings/water.rst
@@ -82,7 +82,7 @@ rain ripple detail
 
 :Type:		integer
 :Range:		0, 1, 2
-:Default:	2
+:Default:	1
 
 Controls how detailed the raindrop ripples on water are.
 

From ebaee9d08c1051b3fce00176a153e837ec51e0b2 Mon Sep 17 00:00:00 2001
From: Abdu Sharif <narukomanroom@gmail.com>
Date: Sun, 6 Feb 2022 18:20:31 +0000
Subject: [PATCH 2075/2859] Update settings-default.cfg

---
 files/settings-default.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index cec1dc3432..3d461d2dce 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -654,7 +654,7 @@ reflection detail = 2
 
 # Whether to use fully detailed raindrop ripples. (0, 1, 2).
 # 0 = rings only; 1 = sparse, high detail; 2 = dense, high detail
-rain ripple detail = 2
+rain ripple detail = 1
 
 # Overrides the value in '[Camera] small feature culling pixel size' specifically for water reflection/refraction textures.
 small feature culling pixel size = 20.0

From ac5cd6c80a6d5bc214bce4b1a4db16f22e852add Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 6 Feb 2022 21:07:14 +0100
Subject: [PATCH 2076/2859] Add default value for `user-data` in openmw.cfg

---
 apps/openmw/options.cpp                   | 2 +-
 components/files/configurationmanager.cpp | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/options.cpp b/apps/openmw/options.cpp
index c78dc395d9..dbf910b70f 100644
--- a/apps/openmw/options.cpp
+++ b/apps/openmw/options.cpp
@@ -27,7 +27,7 @@ namespace OpenMW
             ("data", bpo::value<Files::MaybeQuotedPathContainer>()->default_value(Files::MaybeQuotedPathContainer(), "data")
                 ->multitoken()->composing(), "set data directories (later directories have higher priority)")
 
-            ("data-local", bpo::value<Files::MaybeQuotedPathContainer::value_type>()->default_value(Files::MaybeQuotedPathContainer::value_type(), ""),
+            ("data-local", bpo::value<Files::MaybeQuotedPath>()->default_value(Files::MaybeQuotedPath(), ""),
                 "set local data directory (highest priority)")
 
             ("fallback-archive", bpo::value<StringsVector>()->default_value(StringsVector(), "fallback-archive")
diff --git a/components/files/configurationmanager.cpp b/components/files/configurationmanager.cpp
index 87f4cd4943..0c5ba40882 100644
--- a/components/files/configurationmanager.cpp
+++ b/components/files/configurationmanager.cpp
@@ -168,9 +168,12 @@ void ConfigurationManager::addExtraConfigDirs(std::stack<boost::filesystem::path
 
 void ConfigurationManager::addCommonOptions(boost::program_options::options_description& description)
 {
+    Files::MaybeQuotedPath defaultUserData;
+    static_cast<boost::filesystem::path&>(defaultUserData) = boost::filesystem::path("?userdata?");
+
     description.add_options()
         ("config", bpo::value<Files::MaybeQuotedPathContainer>()->multitoken()->composing(), "additional config directories")
-        ("user-data", bpo::value<Files::MaybeQuotedPath>(),
+        ("user-data", bpo::value<Files::MaybeQuotedPath>()->default_value(defaultUserData, ""),
             "set user data directory (used for saves, screenshots, etc)");
 }
 

From 581c3f48829983cedea3f072a3194ce2be9270b3 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sun, 6 Feb 2022 20:22:38 +0000
Subject: [PATCH 2077/2859] Update and document Lua Text and TextEdit widget
 types, fix some issues with Lua UI

---
 apps/openmw/mwlua/uibindings.cpp              |   7 +
 components/CMakeLists.txt                     |   2 +-
 components/lua_ui/alignment.cpp               |  18 +++
 components/lua_ui/alignment.hpp               |  18 +++
 components/lua_ui/container.hpp               |   4 +-
 components/lua_ui/element.cpp                 |   2 +
 components/lua_ui/image.cpp                   |   4 +-
 components/lua_ui/image.hpp                   |   2 +-
 components/lua_ui/properties.hpp              |  11 ++
 components/lua_ui/text.cpp                    |  28 +++-
 components/lua_ui/text.hpp                    |   9 +-
 components/lua_ui/textedit.cpp                |  34 ++++-
 components/lua_ui/textedit.hpp                |   8 +-
 components/lua_ui/widget.cpp                  |  37 +++--
 components/lua_ui/widget.hpp                  |   7 +-
 components/lua_ui/window.cpp                  |   7 +-
 components/lua_ui/window.hpp                  |   4 +-
 .../lua-scripting/user_interface.rst          | 137 ++++++------------
 .../reference/lua-scripting/widgets/text.rst  |  44 ++++++
 .../lua-scripting/widgets/textedit.rst        |  51 +++++++
 files/lua_api/openmw/ui.lua                   |  26 +++-
 files/mygui/CMakeLists.txt                    |   1 +
 files/mygui/core.skin                         |   4 -
 files/mygui/core.xml                          |   1 +
 files/mygui/openmw_lua.xml                    |  15 ++
 25 files changed, 338 insertions(+), 143 deletions(-)
 create mode 100644 components/lua_ui/alignment.cpp
 create mode 100644 components/lua_ui/alignment.hpp
 create mode 100644 docs/source/reference/lua-scripting/widgets/text.rst
 create mode 100644 docs/source/reference/lua-scripting/widgets/textedit.rst
 create mode 100644 files/mygui/openmw_lua.xml

diff --git a/apps/openmw/mwlua/uibindings.cpp b/apps/openmw/mwlua/uibindings.cpp
index 6f1d34072a..4333ae5072 100644
--- a/apps/openmw/mwlua/uibindings.cpp
+++ b/apps/openmw/mwlua/uibindings.cpp
@@ -3,6 +3,7 @@
 #include <components/lua_ui/layers.hpp>
 #include <components/lua_ui/content.hpp>
 #include <components/lua_ui/registerscriptsettings.hpp>
+#include <components/lua_ui/alignment.hpp>
 
 #include "context.hpp"
 #include "actions.hpp"
@@ -239,6 +240,12 @@ namespace MWLua
             typeTable.set(it.second, it.first);
         api["TYPE"] = LuaUtil::makeReadOnly(typeTable);
 
+        api["ALIGNMENT"] = LuaUtil::makeReadOnly(context.mLua->tableFromPairs<std::string_view, LuaUi::Alignment>({
+            { "Start", LuaUi::Alignment::Start },
+            { "Center", LuaUi::Alignment::Center },
+            { "End", LuaUi::Alignment::End }
+        }));
+
         api["registerSettingsPage"] = &LuaUi::registerSettingsPage;
 
         return LuaUtil::makeReadOnly(api);
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 9a1ffc847c..b6d40931be 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -166,7 +166,7 @@ add_component_dir (queries
     
 add_component_dir (lua_ui
     registerscriptsettings scriptsettings
-    properties widget element util layers content
+    properties widget element util layers content alignment
     adapter text textedit window image container
     )
 
diff --git a/components/lua_ui/alignment.cpp b/components/lua_ui/alignment.cpp
new file mode 100644
index 0000000000..dfd09b752d
--- /dev/null
+++ b/components/lua_ui/alignment.cpp
@@ -0,0 +1,18 @@
+#include "alignment.hpp"
+
+namespace LuaUi
+{
+    MyGUI::Align alignmentToMyGui(Alignment horizontal, Alignment vertical)
+    {
+        MyGUI::Align align(MyGUI::Align::Center);
+        if (horizontal == Alignment::Start)
+            align |= MyGUI::Align::Left;
+        if (horizontal == Alignment::End)
+            align |= MyGUI::Align::Right;
+        if (horizontal == Alignment::Start)
+            align |= MyGUI::Align::Top;
+        if (horizontal == Alignment::End)
+            align |= MyGUI::Align::Bottom;
+        return align;
+    }
+}
diff --git a/components/lua_ui/alignment.hpp b/components/lua_ui/alignment.hpp
new file mode 100644
index 0000000000..8503ffba03
--- /dev/null
+++ b/components/lua_ui/alignment.hpp
@@ -0,0 +1,18 @@
+#ifndef OPENMW_LUAUI_ALIGNMENT
+#define OPENMW_LUAUI_ALIGNMENT
+
+#include <MyGUI_Align.h>
+
+namespace LuaUi
+{
+    enum class Alignment
+    {
+        Start = 0,
+        Center = 1,
+        End = 2
+    };
+
+    MyGUI::Align alignmentToMyGui(Alignment horizontal, Alignment vertical);
+}
+
+#endif // !OPENMW_LUAUI_PROPERTIES
diff --git a/components/lua_ui/container.hpp b/components/lua_ui/container.hpp
index a005b7ae53..664fb08ea2 100644
--- a/components/lua_ui/container.hpp
+++ b/components/lua_ui/container.hpp
@@ -10,8 +10,8 @@ namespace LuaUi
         MYGUI_RTTI_DERIVED(LuaContainer)
 
         protected:
-            virtual void updateChildren() override;
-            virtual MyGUI::IntSize childScalingSize() override;
+            void updateChildren() override;
+            MyGUI::IntSize childScalingSize() override;
 
         private:
             void updateSizeToFit();
diff --git a/components/lua_ui/element.cpp b/components/lua_ui/element.cpp
index 59a3b13d55..d2074ecfc2 100644
--- a/components/lua_ui/element.cpp
+++ b/components/lua_ui/element.cpp
@@ -130,6 +130,8 @@ namespace LuaUi
 
     void updateWidget(WidgetExtension* ext, const sol::table& layout)
     {
+        ext->resetSlot(); // otherwise if template gets changed, all non-template children will get destroyed
+
         ext->setLayout(layout);
         ext->setExternal(layout.get<sol::object>(LayoutKeys::external));
         setTemplate(ext, layout.get<sol::object>(LayoutKeys::templateLayout));
diff --git a/components/lua_ui/image.cpp b/components/lua_ui/image.cpp
index c8fdafbb66..c72bac21e9 100644
--- a/components/lua_ui/image.cpp
+++ b/components/lua_ui/image.cpp
@@ -19,9 +19,9 @@ namespace LuaUi
 
         // mCoord could be zero, prevent division by 0
         // use arbitrary large numbers to prevent performance issues
-        if (mTileSize.width == 0)
+        if (mTileSize.width <= 0)
             mTileSize.width = 1e7;
-        if (mTileSize.height == 0)
+        if (mTileSize.height <= 0)
             mTileSize.height = 1e7;
     }
 
diff --git a/components/lua_ui/image.hpp b/components/lua_ui/image.hpp
index 4073d1bd2a..e841e55fdb 100644
--- a/components/lua_ui/image.hpp
+++ b/components/lua_ui/image.hpp
@@ -29,7 +29,7 @@ namespace LuaUi
             LuaImage();
 
         protected:
-            virtual void updateProperties() override;
+            void updateProperties() override;
             LuaTileRect* mTileRect;
     };
 }
diff --git a/components/lua_ui/properties.hpp b/components/lua_ui/properties.hpp
index 7c47291b84..ade25156e3 100644
--- a/components/lua_ui/properties.hpp
+++ b/components/lua_ui/properties.hpp
@@ -6,6 +6,7 @@
 #include <osg/Vec2>
 
 #include <components/lua/luastate.hpp>
+#include <components/misc/color.hpp>
 
 namespace LuaUi
 {
@@ -18,6 +19,12 @@ namespace LuaUi
             std::is_same<T, MyGUI::FloatSize>();
     }
 
+    template <typename T>
+    constexpr bool isMyGuiColor()
+    {
+        return std::is_same<T, MyGUI::Colour>();
+    }
+
     template <typename T, typename LuaT>
     sol::optional<T> parseValue(
         sol::object table,
@@ -41,6 +48,8 @@ namespace LuaUi
         LuaT luaT = opt.as<LuaT>();
         if constexpr (isMyGuiVector<T>())
             return T(luaT.x(), luaT.y());
+        else if constexpr (isMyGuiColor<T>())
+            return T(luaT.r(), luaT.g(), luaT.b(), luaT.a());
         else
             return luaT;
     }
@@ -53,6 +62,8 @@ namespace LuaUi
     {
         if constexpr (isMyGuiVector<T>())
             return parseValue<T, osg::Vec2f>(table, field, errorPrefix);
+        else if constexpr (isMyGuiColor<T>())
+            return parseValue<T, Misc::Color>(table, field, errorPrefix);
         else
             return parseValue<T, T>(table, field, errorPrefix);
     }
diff --git a/components/lua_ui/text.cpp b/components/lua_ui/text.cpp
index 47e2b574cc..3a56ad68af 100644
--- a/components/lua_ui/text.cpp
+++ b/components/lua_ui/text.cpp
@@ -1,18 +1,40 @@
-
 #include "text.hpp"
 
+#include "alignment.hpp"
+
 namespace LuaUi
 {
     LuaText::LuaText()
         : mAutoSized(true)
+    {}
+
+    void LuaText::initialize()
     {
-        changeWidgetSkin("NormalText");
+        changeWidgetSkin("SandText");
+        setEditStatic(true);
+        setVisibleHScroll(false);
+        setVisibleVScroll(false);
+
+        WidgetExtension::initialize();
     }
 
     void LuaText::updateProperties()
     {
-        setCaption(propertyValue("caption", std::string()));
         mAutoSized = propertyValue("autoSize", true);
+
+        setCaption(propertyValue("text", std::string()));
+        setFontHeight(propertyValue("textSize", 10));
+        setTextColour(propertyValue("textColor", MyGUI::Colour(0, 0, 0, 1)));
+        setEditMultiLine(propertyValue("multiline", false));
+        setEditWordWrap(propertyValue("wordWrap", false));
+
+        Alignment horizontal(propertyValue("textAlignH", Alignment::Start));
+        Alignment vertical(propertyValue("textAlignV", Alignment::Start));
+        setTextAlign(alignmentToMyGui(horizontal, vertical));
+
+        setTextShadow(propertyValue("textShadow", false));
+        setTextShadowColour(propertyValue("textShadowColor", MyGUI::Colour(0, 0, 0, 1)));
+
         WidgetExtension::updateProperties();
     }
 
diff --git a/components/lua_ui/text.hpp b/components/lua_ui/text.hpp
index c435f6687a..e42b6f9935 100644
--- a/components/lua_ui/text.hpp
+++ b/components/lua_ui/text.hpp
@@ -1,26 +1,27 @@
 #ifndef OPENMW_LUAUI_TEXT
 #define OPENMW_LUAUI_TEXT
 
-#include <MyGUI_TextBox.h>
+#include <MyGUI_EditBox.h>
 
 #include "widget.hpp"
 
 namespace LuaUi
 {
-    class LuaText : public MyGUI::TextBox, public WidgetExtension
+    class LuaText : public MyGUI::EditBox, public WidgetExtension
     {
         MYGUI_RTTI_DERIVED(LuaText)
 
         public:
             LuaText();
-            virtual void updateProperties() override;
+            void initialize() override;
+            void updateProperties() override;
             void setCaption(const MyGUI::UString& caption) override;
 
         private:
             bool mAutoSized;
 
         protected:
-            virtual MyGUI::IntSize calculateSize() override;
+            MyGUI::IntSize calculateSize() override;
     };
 }
 
diff --git a/components/lua_ui/textedit.cpp b/components/lua_ui/textedit.cpp
index 5fbdf3e6d8..ac44872f21 100644
--- a/components/lua_ui/textedit.cpp
+++ b/components/lua_ui/textedit.cpp
@@ -1,11 +1,43 @@
 #include "textedit.hpp"
 
+#include "alignment.hpp"
+
 namespace LuaUi
 {
+    void LuaTextEdit::initialize()
+    {
+        changeWidgetSkin("LuaTextEdit");
+
+        eventEditTextChange += MyGUI::newDelegate(this, &LuaTextEdit::textChange);
+
+        WidgetExtension::initialize();
+    }
+
+    void LuaTextEdit::deinitialize()
+    {
+        eventEditTextChange -= MyGUI::newDelegate(this, &LuaTextEdit::textChange);
+        WidgetExtension::deinitialize();
+    }
+
     void LuaTextEdit::updateProperties()
     {
-        setCaption(propertyValue("caption", std::string()));
+        setCaption(propertyValue("text", std::string()));
+        setFontHeight(propertyValue("textSize", 10));
+        setTextColour(propertyValue("textColor", MyGUI::Colour(0, 0, 0, 1)));
+        setEditMultiLine(propertyValue("multiline", false));
+        setEditWordWrap(propertyValue("wordWrap", false));
+
+        Alignment horizontal(propertyValue("textAlignH", Alignment::Start));
+        Alignment vertical(propertyValue("textAlignV", Alignment::Start));
+        setTextAlign(alignmentToMyGui(horizontal, vertical));
+
+        setEditStatic(propertyValue("readOnly", false));
 
         WidgetExtension::updateProperties();
     }
+
+    void LuaTextEdit::textChange(MyGUI::EditBox*)
+    {
+        triggerEvent("textChanged", sol::make_object(lua(), getCaption().asUTF8()));
+    }
 }
diff --git a/components/lua_ui/textedit.hpp b/components/lua_ui/textedit.hpp
index dfc649994a..208240283c 100644
--- a/components/lua_ui/textedit.hpp
+++ b/components/lua_ui/textedit.hpp
@@ -11,7 +11,13 @@ namespace LuaUi
     {
         MYGUI_RTTI_DERIVED(LuaTextEdit)
 
-        virtual void updateProperties() override;
+        protected:
+            void initialize() override;
+            void deinitialize() override;
+            void updateProperties() override;
+
+        private:
+            void textChange(MyGUI::EditBox*);
     };
 }
 
diff --git a/components/lua_ui/widget.cpp b/components/lua_ui/widget.cpp
index 70ed6b64fe..4364a0c362 100644
--- a/components/lua_ui/widget.cpp
+++ b/components/lua_ui/widget.cpp
@@ -10,14 +10,13 @@
 namespace LuaUi
 {
     WidgetExtension::WidgetExtension()
-        : mForcedCoord()
-        , mAbsoluteCoord()
-        , mRelativeCoord()
-        , mAnchor()
-        , mLua(nullptr)
+        : mLua(nullptr)
         , mWidget(nullptr)
         , mSlot(this)
         , mLayout(sol::nil)
+        , mProperties(sol::nil)
+        , mTemplateProperties(sol::nil)
+        , mExternal(sol::nil)
         , mParent(nullptr)
     {}
 
@@ -80,16 +79,22 @@ namespace LuaUi
         ext->updateCoord();
     }
 
-    WidgetExtension* WidgetExtension::findFirst(std::string_view flagName)
+    void WidgetExtension::attachTemplate(WidgetExtension* ext)
+    {
+        ext->widget()->attachToWidget(widget());
+        ext->updateCoord();
+    }
+
+    WidgetExtension* WidgetExtension::findDeep(std::string_view flagName)
     {
-        if (externalValue(flagName, false))
-            return this;
         for (WidgetExtension* w : mChildren)
         {
-            WidgetExtension* result = w->findFirst(flagName);
+            WidgetExtension* result = w->findDeep(flagName);
             if (result != nullptr)
                 return result;
         }
+        if (externalValue(flagName, false))
+            return this;
         return nullptr;
     }
 
@@ -101,11 +106,11 @@ namespace LuaUi
             w->findAll(flagName, result);
     }
 
-    WidgetExtension* WidgetExtension::findFirstInTemplates(std::string_view flagName)
+    WidgetExtension* WidgetExtension::findDeepInTemplates(std::string_view flagName)
     {
         for (WidgetExtension* w : mTemplateChildren)
         {
-            WidgetExtension* result = w->findFirst(flagName);
+            WidgetExtension* result = w->findDeep(flagName);
             if (result != nullptr)
                 return result;
         }
@@ -163,7 +168,7 @@ namespace LuaUi
         for (size_t i = 0; i < children.size(); ++i)
         {
             mTemplateChildren[i] = children[i];
-            mTemplateChildren[i]->widget()->attachToWidget(mWidget);
+            attachTemplate(mTemplateChildren[i]);
         }
         updateTemplate();
     }
@@ -171,9 +176,11 @@ namespace LuaUi
     void WidgetExtension::updateTemplate()
     {
         WidgetExtension* oldSlot = mSlot;
-        mSlot = findFirstInTemplates("slot");
-        if (mSlot == nullptr)
+        WidgetExtension* slot = findDeepInTemplates("slot");
+        if (slot == nullptr)
             mSlot = this;
+        else
+            mSlot = slot->mSlot;
         if (mSlot != oldSlot)
             for (WidgetExtension* w : mChildren)
                 attach(w);
@@ -281,7 +288,7 @@ namespace LuaUi
 
     MyGUI::IntSize WidgetExtension::childScalingSize()
     {
-        return widget()->getSize();
+        return mSlot->widget()->getSize();
     }
 
     void WidgetExtension::triggerEvent(std::string_view name, const sol::object& argument = sol::nil) const
diff --git a/components/lua_ui/widget.hpp b/components/lua_ui/widget.hpp
index 63af5b3cae..9037443676 100644
--- a/components/lua_ui/widget.hpp
+++ b/components/lua_ui/widget.hpp
@@ -50,6 +50,7 @@ namespace LuaUi
 
         const sol::table& getLayout() { return mLayout; }
         void setLayout(const sol::table& layout) { mLayout = layout; }
+        void resetSlot() { mSlot = this; }
 
         template <typename T>
         T externalValue(std::string_view name, const T& defaultValue)
@@ -80,13 +81,14 @@ namespace LuaUi
             return parseProperty(mProperties, mTemplateProperties, name, defaultValue);
         }
 
-        WidgetExtension* findFirstInTemplates(std::string_view flagName);
+        WidgetExtension* findDeepInTemplates(std::string_view flagName);
         std::vector<WidgetExtension*> findAllInTemplates(std::string_view flagName);
 
         virtual void updateTemplate();
         virtual void updateProperties();
         virtual void updateChildren() {};
 
+        lua_State* lua() { return mLua; }
         void triggerEvent(std::string_view name, const sol::object& argument) const;
 
         // offsets the position and size, used only in C++ widget code
@@ -114,8 +116,9 @@ namespace LuaUi
         WidgetExtension* mParent;
 
         void attach(WidgetExtension* ext);
+        void attachTemplate(WidgetExtension* ext);
 
-        WidgetExtension* findFirst(std::string_view name);
+        WidgetExtension* findDeep(std::string_view name);
         void findAll(std::string_view flagName, std::vector<WidgetExtension*>& result);
 
         void updateChildrenCoord();
diff --git a/components/lua_ui/window.cpp b/components/lua_ui/window.cpp
index 6e6b80bf22..41281208d4 100644
--- a/components/lua_ui/window.cpp
+++ b/components/lua_ui/window.cpp
@@ -5,10 +5,7 @@
 namespace LuaUi
 {
     LuaWindow::LuaWindow()
-        : mCaption()
-        , mPreviousMouse()
-        , mChangeScale()
-        , mMoveResize()
+        : mCaption(nullptr)
     {}
 
     void LuaWindow::updateTemplate()
@@ -20,7 +17,7 @@ namespace LuaUi
         }
         mActionWidgets.clear();
 
-        WidgetExtension* captionWidget = findFirstInTemplates("caption");
+        WidgetExtension* captionWidget = findDeepInTemplates("caption");
         mCaption = dynamic_cast<LuaText*>(captionWidget);
 
         if (mCaption)
diff --git a/components/lua_ui/window.hpp b/components/lua_ui/window.hpp
index be3b3e2c23..8c466e73d1 100644
--- a/components/lua_ui/window.hpp
+++ b/components/lua_ui/window.hpp
@@ -14,8 +14,8 @@ namespace LuaUi
 
         public:
             LuaWindow();
-            virtual void updateTemplate() override;
-            virtual void updateProperties() override;
+            void updateTemplate() override;
+            void updateProperties() override;
 
         private:
             LuaText* mCaption;
diff --git a/docs/source/reference/lua-scripting/user_interface.rst b/docs/source/reference/lua-scripting/user_interface.rst
index 13420d318c..bb4a3a3d53 100644
--- a/docs/source/reference/lua-scripting/user_interface.rst
+++ b/docs/source/reference/lua-scripting/user_interface.rst
@@ -1,11 +1,6 @@
 User interface reference
 ========================
 
-.. toctree::
-    :hidden:
-
-    widgets/widget
-
 Layouts
 -------
 
@@ -79,103 +74,57 @@ Events
 Widget types
 ------------
 
-.. list-table::
-   :widths: 30 70
+.. toctree::
+   :maxdepth: 1
 
-   * - :ref:`Widget`
-     - Base widget type, all the other widget inherit its properties and events.
-   * - `Text`
-     - Displays text.
-   * - EditText
-     - Accepts text input from the user.
-   * - Window
-     - Can be moved and resized by the user.
+   Widget: Base widget type, all the other widgets inherit its properties and events. <widgets/widget>
+   Text: Displays text. <widgets/text>
+   TextEdit: Accepts text input from the user. <widgets/textedit>
 
 Example
 -------
 
-*scripts/requirePassword.lua*
+*scripts/clock.lua*
 
 .. code-block:: Lua
 
-   local core = require('openmw.core')
-   local async = require('openmw.async')
-   local ui = require('openmw.ui')
-   local v2 = require('openmw.util').vector2
-
-   local layout = {
-      layers = 'Windows',
-      type = ui.TYPE.Window,
-      template = { skin = 'MW_Window' }, -- TODO: replace all skins here when they are re-implemented in Lua
-      props = {
-         size = v2(200, 250),
-         -- put the window in the middle of the screen
-         relativePosition = v2(0.5, 0.5),
-         anchor = v2(0.5, 0.5),
-      },
-      content = ui.content {
-         {
-            type = ui.TYPE.Text,
-            template = { skin = 'SandText' },
-            props = {
-               caption = 'Input password',
-               relativePosition = v2(0.5, 0),
-               anchor = v2(0.5, 0),
-            },
-         },
-         {
-            name = 'input',
-            type = ui.TYPE.TextEdit,
-            template = { skin = "MW_TextEdit" },
-            props = {
-               caption = '',
-               relativePosition = v2(0.5, 0.5),
-               anchor = v2(0.5, 0.5),
-               size = v2(125, 50),
-            },
-            events = {}
-         },
-         {
-            name = 'submit',
-            type = ui.TYPE.Text, -- TODO: replace with button when implemented
-            template = { skin = "MW_Button" },
-            props = {
-               caption = 'Submit',
-               -- position at the bottom
-               relativePosition = v2(0.5, 1.0),
-               anchor = v2(0.5, 1.0),
-               autoSize = false,
-               size = v2(75, 50),
-            },
-            events = {},
-         },
-      },
-   }
-
-   local element = nil
-
-   local input = layout.content.input
-   -- TODO: replace with a better event when TextEdit is finished
-   input.events.textInput = async:callback(function(text)
-      input.props.caption = input.props.caption .. text
-   end)
-
-   local submit = layout.content.submit
-   submit.events.mouseClick = async:callback(function()
-      if input.props.caption == 'very secret password' then
-         if element then
-            element:destroy()
-         end
-      else
-         print('wrong password', input.props.caption)
-         core.quit()
-      end
-   end)
-
-   element = ui.create(layout)
-
-*requirePassword.omwscripts*
+  local ui = require('openmw.ui')
+  local util = require('openmw.util')
+  local calendar = require('openmw_aux.calendar')
+  local time = require('openmw_aux.time')
+
+  local element = ui.create {
+    -- important not to forget the layer
+    -- by default widgets are not attached to any layer and are not visible
+    layer = 'HUD',
+    type = ui.TYPE.Text,
+    props = {
+      -- position in the top right corner
+      relativePosition = util.vector2(1, 0),
+      -- position is for the top left corner of the widget by default
+      -- change it to align exactly to the top right corner of the screen
+      anchor = util.vector2(1, 0),
+      text = calendar.formatGameTime('%H:%M'),
+      textSize = 24,
+      -- default black text color isn't always visible
+      textColor = util.color.rgb(0, 1, 0),
+    },
+  }
+
+  local function updateTime()
+    -- formatGameTime uses current time by default
+    -- otherwise we could get it by calling `core.getGameTime()`
+    element.layout.props.text = calendar.formatGameTime('%H:%M')
+    -- the layout changes won't affect the widget unless we request an update
+    element:update()
+  end
+
+  -- we are showing game time in hours and minutes
+  -- so no need to update more often than ones a game minute
+  time.runRepeatedly(updateTime, 1 * time.minute, { type = time.GameTime })
+
+*clock.omwscripts*
 
 ::
 
-  PLAYER: scripts/requirePassword.lua
+  PLAYER: scripts/clock.lua
diff --git a/docs/source/reference/lua-scripting/widgets/text.rst b/docs/source/reference/lua-scripting/widgets/text.rst
new file mode 100644
index 0000000000..074100577a
--- /dev/null
+++ b/docs/source/reference/lua-scripting/widgets/text.rst
@@ -0,0 +1,44 @@
+Text Widget
+===========
+
+Properties
+----------
+
+.. list-table::
+  :header-rows: 1
+  :widths: 20 20 60
+
+  * - name
+    - type (default value)
+    - description
+  * - autoSize
+    - boolean (true)
+    - | Adjusts this widget's size to fit the text exactly.
+      | Ignores `size` and `relativeSize`.
+  * - text
+    - string ('')
+    - The text to display.
+  * - textSize
+    - number (10)
+    - The size of the text.
+  * - textColor
+    - util.color (0, 0, 0, 1)
+    - The color of the text.
+  * - multiline
+    - boolean (false)
+    - Whether to render text on multiple lines.
+  * - wordWrap
+    - boolean (false)
+    - Whether to break text into lines to fit the widget's width.
+  * - textAlignH
+    - ui.ALIGNMENT (Start)
+    - Horizontal alignment of the text.
+  * - textAlignV
+    - ui.ALIGNMENT (Start)
+    - Vertical alignment of the text.
+  * - textShadow
+    - boolean (false)
+    - Whether to render a shadow behind the text.
+  * - textShadowColor
+    - util.color (0, 0, 0, 1)
+    - The color of the text shadow.
diff --git a/docs/source/reference/lua-scripting/widgets/textedit.rst b/docs/source/reference/lua-scripting/widgets/textedit.rst
new file mode 100644
index 0000000000..16e640d1b0
--- /dev/null
+++ b/docs/source/reference/lua-scripting/widgets/textedit.rst
@@ -0,0 +1,51 @@
+TextEdit Widget
+===============
+
+Properties
+----------
+
+.. list-table::
+  :header-rows: 1
+  :widths: 20 20 60
+
+  * - name
+    - type (default value)
+    - description
+  * - text
+    - string ('')
+    - The text to display.
+  * - textSize
+    - number (10)
+    - The size of the text.
+  * - textColor
+    - util.color (0, 0, 0, 1)
+    - The color of the text.
+  * - multiline
+    - boolean (false)
+    - Whether to render text on multiple lines.
+  * - wordWrap
+    - boolean (false)
+    - Whether to break text into lines to fit the widget's width.
+  * - textAlignH
+    - ui.ALIGNMENT (Start)
+    - Horizontal alignment of the text.
+  * - textAlignV
+    - ui.ALIGNMENT (Start)
+    - Vertical alignment of the text.
+  * - readOnly
+    - boolean (false)
+    - Whether the text can be edited.
+
+Events
+------
+
+.. list-table::
+  :header-rows: 1
+  :widths: 20 20 60
+
+  * - name
+    - first argument type
+    - description
+  * - textChanged
+    - string
+    - Displayed text changed (e. g. by user input)
diff --git a/files/lua_api/openmw/ui.lua b/files/lua_api/openmw/ui.lua
index 8049df860a..d4f305b96e 100644
--- a/files/lua_api/openmw/ui.lua
+++ b/files/lua_api/openmw/ui.lua
@@ -6,18 +6,32 @@
 -- local ui = require('openmw.ui')
 
 ---
--- @field [parent=#ui] #WIDGET_TYPE WIDGET_TYPE
+-- Widget types
+-- @field [parent=#ui] #TYPE TYPE
+
+---
+-- Alignment values (left to right, top to bottom)
+-- @field [parent=#ui] #ALIGNMENT ALIGNMENT
 
 ---
 -- Tools for working with layers
 -- @field [parent=#ui] #Layers layers
 
 ---
--- @type WIDGET_TYPE
--- @field [parent=#WIDGET_TYPE] Widget Base widget type
--- @field [parent=#WIDGET_TYPE] Text Display text
--- @field [parent=#WIDGET_TYPE] TextEdit Accepts user text input
--- @field [parent=#WIDGET_TYPE] Window Can be moved and resized by the user
+-- All available widget types
+-- @type TYPE
+-- @field Widget Base widget type
+-- @field Text Display text
+-- @field TextEdit Accepts user text input
+-- @field Window Can be moved and resized by the user
+
+---
+-- Alignment values (details depend on the specific property).
+-- For horizontal alignment the order is left to right, for vertical alignment the order is top to bottom.
+-- @type ALIGNMENT
+-- @field Start
+-- @field Center
+-- @field End
 
 ---
 -- Shows given message at the bottom of the screen.
diff --git a/files/mygui/CMakeLists.txt b/files/mygui/CMakeLists.txt
index bdf7558cf7..1edfbca806 100644
--- a/files/mygui/CMakeLists.txt
+++ b/files/mygui/CMakeLists.txt
@@ -43,6 +43,7 @@ set(MYGUI_FILES
     openmw_journal.layout
     openmw_journal.skin.xml
     openmw_layers.xml
+    openmw_lua.xml
     openmw_list.skin.xml
     openmw_mainmenu.layout
     openmw_mainmenu.skin.xml
diff --git a/files/mygui/core.skin b/files/mygui/core.skin
index 5cf02a99e5..ee9135554e 100644
--- a/files/mygui/core.skin
+++ b/files/mygui/core.skin
@@ -15,8 +15,4 @@
     <Resource type="ResourceSkin" name="ImageBox" size="16 16">
         <BasisSkin type="MainSkin" offset="0 0 16 16"/>
     </Resource>
-
-    <Resource type="ResourceSkin" name="LuaImage">
-        <BasisSkin type="LuaTileRect"/>
-    </Resource>
 </MyGUI>
diff --git a/files/mygui/core.xml b/files/mygui/core.xml
index 23697890dc..54e2aecd27 100644
--- a/files/mygui/core.xml
+++ b/files/mygui/core.xml
@@ -5,6 +5,7 @@
         <List file="openmw_layers.xml" />
         <List file="openmw_pointer.xml" />
         <List file="openmw_settings.xml" />
+        <List file="openmw_lua.xml" />
     </MyGUI>
 </MyGUI>
 
diff --git a/files/mygui/openmw_lua.xml b/files/mygui/openmw_lua.xml
new file mode 100644
index 0000000000..cb0af2b4a9
--- /dev/null
+++ b/files/mygui/openmw_lua.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<MyGUI type="Resource" version="1.1">
+    <Resource type="ResourceSkin" name="LuaImage">
+        <BasisSkin type="LuaTileRect"/>
+    </Resource>
+    
+    <Resource type="ResourceSkin" name="LuaTextEdit" size="512 20">
+        <Property key="FontName" value="Default"/>
+        <Property key="TextAlign" value="Left VCenter"/>
+        <Property key="TextColour" value="#{fontcolour=normal}"/>
+
+        <Child type="TextBox" skin="MW_TextEditClient" offset="0 0 502 20" align="Stretch" name="Client"/>
+    </Resource>
+</MyGUI>
\ No newline at end of file

From 8e330653c7caa1e3de5740919e6f9a0e6320fed4 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 6 Feb 2022 22:16:37 +0100
Subject: [PATCH 2078/2859] Fix #6590

---
 apps/openmw/mwlua/luamanagerimp.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index e9146b8af4..0dcd72d359 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -114,6 +114,7 @@ namespace MWLua
 
     void LuaManager::update()
     {
+        static const bool luaDebug = Settings::Manager::getBool("lua debug", "Lua");
         if (mPlayer.isEmpty())
             return;  // The game is not started yet.
 
@@ -172,7 +173,8 @@ namespace MWLua
             LObject obj(e.mDest, objectRegistry);
             if (!obj.isValid())
             {
-                Log(Debug::Verbose) << "Can not call engine handlers: object" << idToString(e.mDest) << " is not found";
+                if (luaDebug)
+                    Log(Debug::Verbose) << "Can not call engine handlers: object" << idToString(e.mDest) << " is not found";
                 continue;
             }
             LocalScripts* scripts = obj.ptr().getRefData().getLuaScripts();
@@ -204,7 +206,7 @@ namespace MWLua
             GObject obj(id, objectRegistry);
             if (obj.isValid())
                 mGlobalScripts.actorActive(obj);
-            else
+            else if (luaDebug)
                 Log(Debug::Verbose) << "Can not call onActorActive engine handler: object" << idToString(id) << " is already removed";
         }
         mActorAddedEvents.clear();

From 5f74df75c6efbdf4f5ea679759c30b09d640faa9 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 6 Feb 2022 23:09:06 +0100
Subject: [PATCH 2079/2859] Add default value for `config`.

---
 components/files/configurationmanager.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/files/configurationmanager.cpp b/components/files/configurationmanager.cpp
index 0c5ba40882..80426586fe 100644
--- a/components/files/configurationmanager.cpp
+++ b/components/files/configurationmanager.cpp
@@ -172,7 +172,8 @@ void ConfigurationManager::addCommonOptions(boost::program_options::options_desc
     static_cast<boost::filesystem::path&>(defaultUserData) = boost::filesystem::path("?userdata?");
 
     description.add_options()
-        ("config", bpo::value<Files::MaybeQuotedPathContainer>()->multitoken()->composing(), "additional config directories")
+        ("config", bpo::value<Files::MaybeQuotedPathContainer>()->default_value(Files::MaybeQuotedPathContainer(), "")
+            ->multitoken()->composing(), "additional config directories")
         ("user-data", bpo::value<Files::MaybeQuotedPath>()->default_value(defaultUserData, ""),
             "set user data directory (used for saves, screenshots, etc)");
 }

From a294adcdaf03b5df3aae526ae3d78ae2883b0a1d Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 6 Feb 2022 22:10:20 +0000
Subject: [PATCH 2080/2859] Proper support of `pairs` and `ipairs` in Lua; fix
 bug in `makeReadOnly`.

---
 apps/openmw/mwlua/luabindings.cpp             |  2 +-
 apps/openmw/mwlua/objectbindings.cpp          |  2 +-
 apps/openmw_test_suite/lua/test_lua.cpp       |  2 +
 components/lua/luastate.cpp                   | 61 ++++++++++++-------
 components/lua/scriptscontainer.cpp           |  3 -
 .../reference/lua-scripting/overview.rst      | 15 ++++-
 files/lua_api/openmw/core.lua                 |  5 --
 7 files changed, 57 insertions(+), 33 deletions(-)

diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index 084de7d5e1..06ba6d5c5a 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -49,7 +49,7 @@ namespace MWLua
     {
         auto* lua = context.mLua;
         sol::table api(lua->sol(), sol::create);
-        api["API_REVISION"] = 16;
+        api["API_REVISION"] = 17;
         api["quit"] = [lua]()
         {
             Log(Debug::Warning) << "Quit requested by a Lua script.\n" << lua->debugTraceback();
diff --git a/apps/openmw/mwlua/objectbindings.cpp b/apps/openmw/mwlua/objectbindings.cpp
index ef0482f9fe..3ae9035271 100644
--- a/apps/openmw/mwlua/objectbindings.cpp
+++ b/apps/openmw/mwlua/objectbindings.cpp
@@ -72,7 +72,7 @@ namespace MWLua
             else
                 throw std::runtime_error("Index out of range");
         };
-        listT["ipairs"] = [registry](const ListT& list)
+        listT[sol::meta_function::ipairs] = [registry](const ListT& list)
         {
             auto iter = [registry](const ListT& l, int64_t i) -> sol::optional<std::tuple<int64_t, ObjectT>>
             {
diff --git a/apps/openmw_test_suite/lua/test_lua.cpp b/apps/openmw_test_suite/lua/test_lua.cpp
index fe3cf14d25..539390f2af 100644
--- a/apps/openmw_test_suite/lua/test_lua.cpp
+++ b/apps/openmw_test_suite/lua/test_lua.cpp
@@ -39,6 +39,7 @@ return {
     -- should throw an error
     incorrectRequire = function() require('counter') end,
     modifySystemLib = function() math.sin = 5 end,
+    modifySystemLib2 = function() math.__index.sin = 5 end,
     rawsetSystemLib = function() rawset(math, 'sin', 5) end,
     callLoadstring = function() loadstring('print(1)') end,
     setSqr = function() require('sqrlib').sqr = math.sin end,
@@ -119,6 +120,7 @@ return {
         // but read-only object can not be modified even with rawset
         EXPECT_ERROR(LuaUtil::call(script["rawsetSystemLib"]), "bad argument #1 to 'rawset' (table expected, got userdata)");
         EXPECT_ERROR(LuaUtil::call(script["modifySystemLib"]), "a userdata value");
+        EXPECT_ERROR(LuaUtil::call(script["modifySystemLib2"]), "a nil value");
 
         EXPECT_EQ(LuaUtil::getMutableFromReadOnly(LuaUtil::makeReadOnly(script)), script);
     }
diff --git a/components/lua/luastate.cpp b/components/lua/luastate.cpp
index bfe9cb513c..bda39d270d 100644
--- a/components/lua/luastate.cpp
+++ b/components/lua/luastate.cpp
@@ -58,20 +58,41 @@ namespace LuaUtil
         mLua["math"]["randomseed"] = []{};
 
         mLua["writeToLog"] = [](std::string_view s) { Log(Debug::Level::Info) << s; };
-        mLua.script(R"(printToLog = function(name, ...)
-            local msg = name
-            for _, v in ipairs({...}) do
-                msg = msg .. '\t' .. tostring(v)
+        mLua["cmetatable"] = [](const sol::table& v) -> sol::object { return v[sol::metatable_key]; };
+        mLua.script(R"(
+            local _pairs = pairs
+            local _ipairs = ipairs
+            local _tostring = tostring
+            local _write = writeToLog
+            local printToLog = function(name, ...)
+                local msg = name
+                for _, v in _ipairs({...}) do
+                    msg = msg .. '\t' .. _tostring(v)
+                end
+                return _write(msg)
             end
-            return writeToLog(msg)
-        end)");
-        mLua.script("printGen = function(name) return function(...) return printToLog(name, ...) end end");
+            printGen = function(name) return function(...) return printToLog(name, ...) end end
+
+            local _cmeta = cmetatable
+            function pairsForReadOnly(v) return _pairs(_cmeta(v).__index) end
+            function ipairsForReadOnly(v) return _ipairs(_cmeta(v).__index) end
+        )");
 
         // Some fixes for compatibility between different Lua versions
         if (mLua["unpack"] == sol::nil)
             mLua["unpack"] = mLua["table"]["unpack"];
         else if (mLua["table"]["unpack"] == sol::nil)
             mLua["table"]["unpack"] = mLua["unpack"];
+        if (LUA_VERSION_NUM <= 501)
+        {
+            mLua.script(R"(
+                local _pairs = pairs
+                local _ipairs = ipairs
+                local _cmeta = cmetatable
+                pairs = function(v) return ((_cmeta(v) or v).__pairs or _pairs)(v) end
+                ipairs = function(v) return ((_cmeta(v) or v).__ipairs or _ipairs)(v) end
+            )");
+        }
 
         mSandboxEnv = sol::table(mLua, sol::create);
         mSandboxEnv["_VERSION"] = mLua["_VERSION"];
@@ -106,24 +127,22 @@ namespace LuaUtil
         if (table.is<sol::userdata>())
             return table;  // it is already userdata, no sense to wrap it again
 
-        lua_State* lua = table.lua_state();
-        table[sol::meta_function::index] = table;
-        lua_newuserdata(lua, 0);
-        sol::stack::push(lua, std::move(table));
-        lua_setmetatable(lua, -2);
-        return sol::stack::pop<sol::table>(lua);
+        lua_State* luaState = table.lua_state();
+        sol::state_view lua(luaState);
+        sol::table meta(lua, sol::create);
+        meta["__index"] = table;
+        meta["__pairs"] = lua["pairsForReadOnly"];
+        meta["__ipairs"] = lua["ipairsForReadOnly"];
+
+        lua_newuserdata(luaState, 0);
+        sol::stack::push(luaState, meta);
+        lua_setmetatable(luaState, -2);
+        return sol::stack::pop<sol::table>(luaState);
     }
 
     sol::table getMutableFromReadOnly(const sol::userdata& ro)
     {
-        lua_State* lua = ro.lua_state();
-        sol::stack::push(lua, ro);
-        int ok = lua_getmetatable(lua, -1);
-        assert(ok);
-        (void)ok;
-        sol::table res = sol::stack::pop<sol::table>(lua);
-        lua_pop(lua, 1);
-        return res;
+        return ro[sol::metatable_key].get<sol::table>()["__index"];
     }
 
     void LuaState::addCommonPackage(std::string packageName, sol::object package)
diff --git a/components/lua/scriptscontainer.cpp b/components/lua/scriptscontainer.cpp
index 780d10cebd..11ca28de08 100644
--- a/components/lua/scriptscontainer.cpp
+++ b/components/lua/scriptscontainer.cpp
@@ -439,10 +439,7 @@ namespace LuaUtil
         mEventHandlers.clear();
         mSimulationTimersQueue.clear();
         mGameTimersQueue.clear();
-
         mPublicInterfaces.clear();
-        // Assigned by LuaUtil::makeReadOnly, but `clear` removes it, so we need to assign it again.
-        mPublicInterfaces[sol::meta_function::index] = mPublicInterfaces;
     }
 
     ScriptsContainer::Script& ScriptsContainer::getScript(int scriptId)
diff --git a/docs/source/reference/lua-scripting/overview.rst b/docs/source/reference/lua-scripting/overview.rst
index 1bfdf33c42..e38e8948ec 100644
--- a/docs/source/reference/lua-scripting/overview.rst
+++ b/docs/source/reference/lua-scripting/overview.rst
@@ -4,7 +4,7 @@ Overview of Lua scripting
 Language and sandboxing
 =======================
 
-OpenMW supports scripts written in Lua 5.1.
+OpenMW supports scripts written in Lua 5.1 with some extensions (see below) from Lua 5.2.
 There are no plans to switch to any newer version of the language, because newer versions are not supported by LuaJIT.
 
 Here are starting points for learning Lua:
@@ -24,11 +24,22 @@ These libraries are loaded automatically and are always available.
 Allowed `basic functions <https://www.lua.org/manual/5.1/manual.html#5.1>`__:
 ``assert``, ``error``, ``ipairs``, ``next``, ``pairs``, ``pcall``, ``print``, ``select``, ``tonumber``, ``tostring``, ``type``, ``unpack``, ``xpcall``, ``rawequal``, ``rawget``, ``rawset``, ``getmetatable``, ``setmetatable``.
 
+Supported Lua 5.2 features:
+
+- ``goto`` and ``::labels::``;
+- hex escapes ``\x3F`` and ``\*`` escape in strings;
+- ``math.log(x [,base])``;
+- ``string.rep(s, n [,sep])``;
+- in ``string.format()``: ``%q`` is reversible, ``%s`` uses ``__tostring``, ``%a`` and ``%A`` are added;
+- String matching pattern ``%g``;
+- ``__pairs`` and ``__ipairs`` metamethods;
+- Function ``table.unpack`` (alias to Lua 5.1 ``unpack``).
+
 Loading libraries with ``require('library_name')`` is allowed, but limited. It works this way:
 
 1. If `library_name` is one of the standard libraries, then return the library.
 2. If `library_name` is one of the built-in `API packages`_, then return the package.
-3. Otherwise search for a Lua source file with such name in :ref:`data folders <Multiple data folders>`. For example ``require('my_lua_library.something')`` will try to open the file ``my_lua_library/something.lua``.
+3. Otherwise search for a Lua source file with such name in :ref:`data folders <Multiple data folders>`. For example ``require('my_lua_library.something')`` will try to open one of the files ``my_lua_library/something.lua`` or ``my_lua_library/something/init.lua``.
 
 Loading DLLs and precompiled Lua files is intentionally prohibited for compatibility and security reasons.
 
diff --git a/files/lua_api/openmw/core.lua b/files/lua_api/openmw/core.lua
index 07309edca8..e7e657a853 100644
--- a/files/lua_api/openmw/core.lua
+++ b/files/lua_api/openmw/core.lua
@@ -293,11 +293,6 @@
 -- @type ObjectList
 -- @extends #list<#GameObject>
 
--------------------------------------------------------------------------------
--- Create iterator.
--- @function [parent=#ObjectList] ipairs
--- @param self
-
 -------------------------------------------------------------------------------
 -- Filter list with a Query.
 -- @function [parent=#ObjectList] select

From bbc9c53423a414b702cb4f951db5b7f5439691f2 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Mon, 7 Feb 2022 11:51:59 -0800
Subject: [PATCH 2081/2859] support morrowind stenciling

---
 CHANGELOG.md                              |  1 +
 apps/openmw/mwrender/npcanimation.cpp     |  6 ++--
 apps/openmw/mwrender/postprocessor.cpp    | 18 +++++-----
 apps/openmw/mwrender/renderingmanager.cpp |  2 ++
 components/nifosg/nifloader.cpp           | 44 ++++++++++++++++++++---
 5 files changed, 55 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a181a35098..64af236875 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -129,6 +129,7 @@
     Feature #6288: Preserve the "blocked" record flag for referenceable objects.
     Feature #6380: Commas are treated as whitespace in vanilla
     Feature #6419: Topics shouldn't be greyed out if they can produce another topic reference
+    Feature #6443: NiStencilProperty is not fully supported
     Feature #6534: Shader-based object texture blending
     Task #6201: Remove the "Note: No relevant classes found. No output generated" warnings
     Task #6264: Remove the old classes in animation.cpp
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 308762045c..47aeaf53af 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -333,12 +333,12 @@ public:
 
             osg::FrameBufferAttachment(postProcessor->getFirstPersonRBProxy()).attach(*state, GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, ext);
 
-            glClear(GL_DEPTH_BUFFER_BIT);
+            glClear(GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
             // color accumulation pass
             bin->drawImplementation(renderInfo, previous);
 
             auto primaryFBO = postProcessor->getMsaaFbo() ? postProcessor->getMsaaFbo() : postProcessor->getFbo();
-            primaryFBO->getAttachment(osg::FrameBufferObject::BufferComponent::DEPTH_BUFFER).attach(*state, GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, ext);
+            primaryFBO->getAttachment(osg::FrameBufferObject::BufferComponent::PACKED_DEPTH_STENCIL_BUFFER).attach(*state, GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, ext);
 
             state->pushStateSet(mStateSet);
             state->apply();
@@ -349,7 +349,7 @@ public:
         else
         {
             // fallback to standard depth clear when we are not rendering our main scene via an intermediate FBO
-            glClear(GL_DEPTH_BUFFER_BIT);
+            glClear(GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
             bin->drawImplementation(renderInfo, previous);
         }
     }
diff --git a/apps/openmw/mwrender/postprocessor.cpp b/apps/openmw/mwrender/postprocessor.cpp
index 6db01444ad..afdec4f1b5 100644
--- a/apps/openmw/mwrender/postprocessor.cpp
+++ b/apps/openmw/mwrender/postprocessor.cpp
@@ -1,5 +1,7 @@
 #include "postprocessor.hpp"
 
+#include <SDL_opengl_glext.h>
+
 #include <osg/Group>
 #include <osg/Camera>
 #include <osg/Callback>
@@ -155,7 +157,7 @@ namespace MWRender
     PostProcessor::PostProcessor(osgViewer::Viewer* viewer, osg::Group* rootNode)
         : mViewer(viewer)
         , mRootNode(new osg::Group)
-        , mDepthFormat(GL_DEPTH_COMPONENT24)
+        , mDepthFormat(GL_DEPTH24_STENCIL8_EXT)
     {
         bool softParticles = Settings::Manager::getBool("soft particles", "Shaders");
 
@@ -183,9 +185,9 @@ namespace MWRender
         if (SceneUtil::AutoDepth::isReversed())
         {
             if (osg::isGLExtensionSupported(contextID, "GL_ARB_depth_buffer_float"))
-                mDepthFormat = GL_DEPTH_COMPONENT32F;
+                mDepthFormat = GL_DEPTH32F_STENCIL8;
             else if (osg::isGLExtensionSupported(contextID, "GL_NV_depth_buffer_float"))
-                mDepthFormat = GL_DEPTH_COMPONENT32F_NV;
+                mDepthFormat = GL_DEPTH32F_STENCIL8_NV;
             else
             {
                 // TODO: Once we have post-processing implemented we want to skip this return and continue with setup.
@@ -213,7 +215,7 @@ namespace MWRender
         mViewer->getCamera()->addCullCallback(new CullCallback);
         mViewer->getCamera()->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT);
         mViewer->getCamera()->attach(osg::Camera::COLOR_BUFFER0, mSceneTex);
-        mViewer->getCamera()->attach(osg::Camera::DEPTH_BUFFER, mDepthTex);
+        mViewer->getCamera()->attach(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, mDepthTex);
 
         mViewer->getCamera()->getGraphicsContext()->setResizedCallback(new ResizedCallback(this));
         mViewer->getCamera()->setUserData(this);
@@ -236,7 +238,7 @@ namespace MWRender
 
         mFbo = new osg::FrameBufferObject;
         mFbo->setAttachment(osg::Camera::COLOR_BUFFER0, osg::FrameBufferAttachment(mSceneTex));
-        mFbo->setAttachment(osg::Camera::DEPTH_BUFFER, osg::FrameBufferAttachment(mDepthTex));
+        mFbo->setAttachment(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, osg::FrameBufferAttachment(mDepthTex));
 
         // When MSAA is enabled we must first render to a render buffer, then
         // blit the result to the FBO which is either passed to the main frame
@@ -247,7 +249,7 @@ namespace MWRender
             osg::ref_ptr<osg::RenderBuffer> colorRB = new osg::RenderBuffer(width, height, mSceneTex->getInternalFormat(), samples);
             osg::ref_ptr<osg::RenderBuffer> depthRB = new osg::RenderBuffer(width, height, mDepthTex->getInternalFormat(), samples);
             mMsaaFbo->setAttachment(osg::Camera::COLOR_BUFFER0, osg::FrameBufferAttachment(colorRB));
-            mMsaaFbo->setAttachment(osg::Camera::DEPTH_BUFFER, osg::FrameBufferAttachment(depthRB));
+            mMsaaFbo->setAttachment(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, osg::FrameBufferAttachment(depthRB));
         }
 
         if (const auto depthProxy = std::getenv("OPENMW_ENABLE_DEPTH_CLEAR_PROXY"))
@@ -264,8 +266,8 @@ namespace MWRender
     {
         mDepthTex = new osg::Texture2D;
         mDepthTex->setTextureSize(width, height);
-        mDepthTex->setSourceFormat(GL_DEPTH_COMPONENT);
-        mDepthTex->setSourceType(SceneUtil::isFloatingPointDepthFormat(getDepthFormat()) ? GL_FLOAT : GL_UNSIGNED_INT);
+        mDepthTex->setSourceFormat(GL_DEPTH_STENCIL_EXT);
+        mDepthTex->setSourceType(SceneUtil::isFloatingPointDepthFormat(getDepthFormat()) ? GL_FLOAT_32_UNSIGNED_INT_24_8_REV : GL_UNSIGNED_INT_24_8_EXT);
         mDepthTex->setInternalFormat(mDepthFormat);
         mDepthTex->setFilter(osg::Texture2D::MIN_FILTER, osg::Texture2D::NEAREST);
         mDepthTex->setFilter(osg::Texture2D::MAG_FILTER, osg::Texture2D::NEAREST);
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 90fe0877ec..4ec44f0141 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -538,6 +538,8 @@ namespace MWRender
         SceneUtil::setCameraClearDepth(mViewer->getCamera());
 
         updateProjectionMatrix();
+
+        mViewer->getCamera()->setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
     }
 
     RenderingManager::~RenderingManager()
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 36f474a223..db1dbc4d2c 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -218,6 +218,7 @@ namespace NifOsg
 
         bool mHasNightDayLabel = false;
         bool mHasHerbalismLabel = false;
+        bool mHasStencilProperty = false;
 
         // This is used to queue emitters that weren't attached to their node yet.
         std::vector<std::pair<size_t, osg::ref_ptr<Emitter>>> mEmitterQueue;
@@ -309,6 +310,18 @@ namespace NifOsg
             if (mHasHerbalismLabel)
                 created->getOrCreateUserDataContainer()->addDescription(Constants::HerbalismLabel);
 
+            // Morrowind is particular about draw order with stenciling, there is no real way around not using traversal order drawing.
+            static osg::ref_ptr<osgUtil::RenderBin> traversalOrderBin;
+
+            if (!traversalOrderBin)
+            {
+                traversalOrderBin = new osgUtil::RenderBin(osgUtil::RenderBin::TRAVERSAL_ORDER);
+                osgUtil::RenderBin::addRenderBinPrototype("TraversalOrder", traversalOrderBin);
+            }
+
+            if (mHasStencilProperty)
+                created->getOrCreateStateSet()->setRenderBinDetails(2, "TraversalOrder");
+
             // Attach particle emitters to their nodes which should all be loaded by now.
             handleQueuedParticleEmitters(created, nif);
 
@@ -334,6 +347,21 @@ namespace NifOsg
         void applyNodeProperties(const Nif::Node *nifNode, osg::Node *applyTo, SceneUtil::CompositeStateSetUpdater* composite, Resource::ImageManager* imageManager, std::vector<unsigned int>& boundTextures, int animflags)
         {
             const Nif::PropertyList& props = nifNode->props;
+
+            bool hasStencilProperty = false;
+
+            for (size_t i = 0; i <props.length(); ++i)
+            {
+                if (props[i].empty())
+                    continue;
+
+                if (props[i].getPtr()->recType == Nif::RC_NiStencilProperty)
+                {
+                    hasStencilProperty = true;
+                    break;
+                }
+            }
+
             for (size_t i = 0; i <props.length(); ++i)
             {
                 if (!props[i].empty())
@@ -350,14 +378,14 @@ namespace NifOsg
                         if (props[i].getPtr()->recIndex == mFirstRootTextureIndex)
                             applyTo->setUserValue("overrideFx", 1);
                     }
-                    handleProperty(props[i].getPtr(), applyTo, composite, imageManager, boundTextures, animflags);
+                    handleProperty(props[i].getPtr(), applyTo, composite, imageManager, boundTextures, animflags, hasStencilProperty);
                 }
             }
 
             auto geometry = dynamic_cast<const Nif::NiGeometry*>(nifNode);
             // NiGeometry's NiAlphaProperty doesn't get handled here because it's a drawable property
             if (geometry && !geometry->shaderprop.empty())
-                handleProperty(geometry->shaderprop.getPtr(), applyTo, composite, imageManager, boundTextures, animflags);
+                handleProperty(geometry->shaderprop.getPtr(), applyTo, composite, imageManager, boundTextures, animflags, hasStencilProperty);
         }
 
         static void setupController(const Nif::Controller* ctrl, SceneUtil::Controller* toSetup, int animflags)
@@ -1347,7 +1375,7 @@ namespace NifOsg
             case 4: return osg::Stencil::GREATER;
             case 5: return osg::Stencil::NOTEQUAL;
             case 6: return osg::Stencil::GEQUAL;
-            case 7: return osg::Stencil::NEVER; // NifSkope says this is GL_ALWAYS, but in MW it's GL_NEVER
+            case 7: return osg::Stencil::ALWAYS;
             default:
                 Log(Debug::Info) << "Unexpected stencil function: " << func << " in " << mFilename;
                 return osg::Stencil::NEVER;
@@ -1772,7 +1800,7 @@ namespace NifOsg
         }
 
         void handleProperty(const Nif::Property *property,
-                            osg::Node *node, SceneUtil::CompositeStateSetUpdater* composite, Resource::ImageManager* imageManager, std::vector<unsigned int>& boundTextures, int animflags)
+                            osg::Node *node, SceneUtil::CompositeStateSetUpdater* composite, Resource::ImageManager* imageManager, std::vector<unsigned int>& boundTextures, int animflags, bool hasStencilProperty)
         {
             switch (property->recType)
             {
@@ -1800,6 +1828,7 @@ namespace NifOsg
 
                 if (stencilprop->data.enabled != 0)
                 {
+                    mHasStencilProperty = true;
                     osg::ref_ptr<osg::Stencil> stencil = new osg::Stencil;
                     stencil->setFunction(getStencilFunction(stencilprop->data.compareFunc), stencilprop->data.stencilRef, stencilprop->data.stencilMask);
                     stencil->setStencilFailOperation(getStencilOperation(stencilprop->data.failAction));
@@ -1831,7 +1860,9 @@ namespace NifOsg
                 osg::ref_ptr<osg::Depth> depth = new osg::Depth;
                 // Depth write flag
                 depth->setWriteMask((zprop->flags>>1)&1);
-                // Morrowind ignores depth test function
+                // Morrowind ignores depth test function, unless a NiStencilProperty is present, in which case it uses a fixed depth function of GL_ALWAYS.
+                if (hasStencilProperty)
+                    depth->setFunction(osg::Depth::ALWAYS);
                 depth = shareAttribute(depth);
                 stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
                 break;
@@ -2049,7 +2080,10 @@ namespace NifOsg
 
                         bool noSort = (alphaprop->flags>>13)&1;
                         if (!noSort)
+                        {
                             node->getOrCreateStateSet()->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
+                            node->getOrCreateStateSet()->setNestRenderBins(false);
+                        }
                         else
                             node->getOrCreateStateSet()->setRenderBinToInherit();
                     }

From 8c2c322d9237b4ce15a75e9ddec99e6079c2fe0a Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Mon, 7 Feb 2022 14:35:15 -0800
Subject: [PATCH 2082/2859] add stencil to water RTTs, reword some comments

---
 apps/openmw/mwrender/localmap.cpp          |  2 +-
 apps/openmw/mwrender/screenshotmanager.cpp |  2 +-
 components/nifosg/nifloader.cpp            | 12 ++----------
 components/sceneutil/rtt.cpp               | 14 +++++++-------
 components/sceneutil/rtt.hpp               |  2 +-
 5 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index 66d41a47e4..a3c8d6b2ce 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -187,7 +187,7 @@ osg::ref_ptr<osg::Camera> LocalMap::createOrthographicCamera(float x, float y, f
     camera->setReferenceFrame(osg::Camera::ABSOLUTE_RF_INHERIT_VIEWPOINT);
     camera->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT, osg::Camera::PIXEL_BUFFER_RTT);
     camera->setClearColor(osg::Vec4(0.f, 0.f, 0.f, 1.f));
-    camera->setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+    camera->setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
     camera->setRenderOrder(osg::Camera::PRE_RENDER);
 
     camera->setCullMask(Mask_Scene | Mask_SimpleWater | Mask_Terrain | Mask_Object | Mask_Static);
diff --git a/apps/openmw/mwrender/screenshotmanager.cpp b/apps/openmw/mwrender/screenshotmanager.cpp
index 5c3d925c9b..90e6eec124 100644
--- a/apps/openmw/mwrender/screenshotmanager.cpp
+++ b/apps/openmw/mwrender/screenshotmanager.cpp
@@ -348,7 +348,7 @@ namespace MWRender
 
         rttCamera->setCullMask(mViewer->getCamera()->getCullMask() & ~(Mask_GUI|Mask_FirstPerson));
 
-        rttCamera->setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+        rttCamera->setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
 
         renderCameraToImage(rttCamera.get(),image,w,h);
     }
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index db1dbc4d2c..87ffeb232c 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -310,17 +310,9 @@ namespace NifOsg
             if (mHasHerbalismLabel)
                 created->getOrCreateUserDataContainer()->addDescription(Constants::HerbalismLabel);
 
-            // Morrowind is particular about draw order with stenciling, there is no real way around not using traversal order drawing.
-            static osg::ref_ptr<osgUtil::RenderBin> traversalOrderBin;
-
-            if (!traversalOrderBin)
-            {
-                traversalOrderBin = new osgUtil::RenderBin(osgUtil::RenderBin::TRAVERSAL_ORDER);
-                osgUtil::RenderBin::addRenderBinPrototype("TraversalOrder", traversalOrderBin);
-            }
-
+            // When dealing with stencil buffer, draw order is especially sensitive. Make sure such objects are drawn with traversal order.
             if (mHasStencilProperty)
-                created->getOrCreateStateSet()->setRenderBinDetails(2, "TraversalOrder");
+                created->getOrCreateStateSet()->setRenderBinDetails(2, "TraversalOrderBin");
 
             // Attach particle emitters to their nodes which should all be loaded by now.
             handleQueuedParticleEmitters(created, nif);
diff --git a/components/sceneutil/rtt.cpp b/components/sceneutil/rtt.cpp
index 0765a2e835..9fe9a44516 100644
--- a/components/sceneutil/rtt.cpp
+++ b/components/sceneutil/rtt.cpp
@@ -50,7 +50,7 @@ namespace SceneUtil
 
     osg::Texture* RTTNode::getDepthTexture(osgUtil::CullVisitor* cv)
     {
-        return getViewDependentData(cv)->mCamera->getBufferAttachmentMap()[osg::Camera::DEPTH_BUFFER]._texture;
+        return getViewDependentData(cv)->mCamera->getBufferAttachmentMap()[osg::Camera::PACKED_DEPTH_STENCIL_BUFFER]._texture;
     }
 
     RTTNode::ViewDependentData* RTTNode::getViewDependentData(osgUtil::CullVisitor* cv)
@@ -67,7 +67,7 @@ namespace SceneUtil
             mViewDependentDataMap[cv]->mCamera = camera;
 
             camera->setRenderOrder(osg::Camera::PRE_RENDER, mRenderOrderNum);
-            camera->setClearMask(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
+            camera->setClearMask(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
             camera->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT);
             camera->setViewport(0, 0, mTextureWidth, mTextureHeight);
             SceneUtil::setCameraClearDepth(camera);
@@ -88,18 +88,18 @@ namespace SceneUtil
                 SceneUtil::attachAlphaToCoverageFriendlyFramebufferToCamera(camera, osg::Camera::COLOR_BUFFER, colorBuffer);
             }
 
-            if (camera->getBufferAttachmentMap().count(osg::Camera::DEPTH_BUFFER) == 0)
+            if (camera->getBufferAttachmentMap().count(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER) == 0)
             {
                 auto depthBuffer = new osg::Texture2D;
                 depthBuffer->setTextureSize(mTextureWidth, mTextureHeight);
-                depthBuffer->setSourceFormat(GL_DEPTH_COMPONENT);
-                depthBuffer->setInternalFormat(GL_DEPTH_COMPONENT24);
+                depthBuffer->setSourceFormat(GL_DEPTH_STENCIL_EXT);
+                depthBuffer->setInternalFormat(GL_DEPTH24_STENCIL8_EXT);
                 depthBuffer->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
                 depthBuffer->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
-                depthBuffer->setSourceType(GL_UNSIGNED_INT);
+                depthBuffer->setSourceType(GL_UNSIGNED_INT_24_8_EXT);
                 depthBuffer->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
                 depthBuffer->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
-                camera->attach(osg::Camera::DEPTH_BUFFER, depthBuffer);
+                camera->attach(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, depthBuffer);
             }
         }
 
diff --git a/components/sceneutil/rtt.hpp b/components/sceneutil/rtt.hpp
index 7adfa098eb..c587006c96 100644
--- a/components/sceneutil/rtt.hpp
+++ b/components/sceneutil/rtt.hpp
@@ -27,7 +27,7 @@ namespace SceneUtil
     /// @par Camera settings should be effectuated by overriding the setDefaults() and apply() methods, following a pattern similar to SceneUtil::StateSetUpdater
     /// @par When using the RTT texture in your statesets, it is recommended to use SceneUtil::StateSetUpdater as a cull callback to handle this as the appropriate
     ///     textures can be retrieved during SceneUtil::StateSetUpdater::Apply()
-    /// @par For any of COLOR_BUFFER or DEPTH_BUFFER not added during setDefaults(), RTTNode will attach a default buffer. The default color buffer has an internal format of GL_RGB.
+    /// @par For any of COLOR_BUFFER or PACKED_DEPTH_STENCIL_BUFFER not added during setDefaults(), RTTNode will attach a default buffer. The default color buffer has an internal format of GL_RGB.
     ///     The default depth buffer has internal format GL_DEPTH_COMPONENT24, source format GL_DEPTH_COMPONENT, and source type GL_UNSIGNED_INT. Default wrap is CLAMP_TO_EDGE and filter LINEAR.
     class RTTNode : public osg::Node
     {

From 88f02913d53b922e038e69cf97f140cab9daf4ac Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Mon, 7 Feb 2022 19:46:42 -0800
Subject: [PATCH 2083/2859] use vertex emitters on array particle controllers
 when appropriate

---
 CHANGELOG.md                    |   1 +
 components/nif/node.hpp         |   3 +
 components/nifosg/nifloader.cpp |  24 ++++---
 components/nifosg/particle.cpp  | 118 ++++++++++++++++++++++++++------
 components/nifosg/particle.hpp  |  15 +++-
 5 files changed, 129 insertions(+), 32 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a181a35098..16509efca3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -130,6 +130,7 @@
     Feature #6380: Commas are treated as whitespace in vanilla
     Feature #6419: Topics shouldn't be greyed out if they can produce another topic reference
     Feature #6534: Shader-based object texture blending
+    Feature #6592: Missing support for NiTriShape particle emitters
     Task #6201: Remove the "Note: No relevant classes found. No output generated" warnings
     Task #6264: Remove the old classes in animation.cpp
     Task #6553: Simplify interpreter instruction registration
diff --git a/components/nif/node.hpp b/components/nif/node.hpp
index 31eb63144c..fb57e07739 100644
--- a/components/nif/node.hpp
+++ b/components/nif/node.hpp
@@ -211,6 +211,9 @@ struct NiNode : Node
     enum ControllerFlags {
         ControllerFlag_Active = 0x8
     };
+    enum BSPArrayController {
+        BSPArrayController_AtVertex = 0x10
+    };
 
     void read(NIFStream *nif) override
     {
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 36f474a223..d003940a93 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -51,8 +51,7 @@ namespace
 
     void getAllNiNodes(const Nif::Node* node, std::vector<int>& outIndices)
     {
-        const Nif::NiNode* ninode = dynamic_cast<const Nif::NiNode*>(node);
-        if (ninode)
+        if (const Nif::NiNode* ninode = dynamic_cast<const Nif::NiNode*>(node))
         {
             outIndices.push_back(ninode->recIndex);
             for (unsigned int i=0; i<ninode->children.length(); ++i)
@@ -976,7 +975,8 @@ namespace NifOsg
         osg::ref_ptr<Emitter> handleParticleEmitter(const Nif::NiParticleSystemController* partctrl)
         {
             std::vector<int> targets;
-            if (partctrl->recType == Nif::RC_NiBSPArrayController)
+            const bool atVertex = (partctrl->flags & Nif::NiNode::BSPArrayController_AtVertex);
+            if (partctrl->recType == Nif::RC_NiBSPArrayController && !atVertex)
             {
                 getAllNiNodes(partctrl->emitter.getPtr(), targets);
             }
@@ -1000,12 +1000,20 @@ namespace NifOsg
                                                            partctrl->lifetime, partctrl->lifetimeRandom);
             emitter->setShooter(shooter);
 
-            osgParticle::BoxPlacer* placer = new osgParticle::BoxPlacer;
-            placer->setXRange(-partctrl->offsetRandom.x() / 2.f, partctrl->offsetRandom.x() / 2.f);
-            placer->setYRange(-partctrl->offsetRandom.y() / 2.f, partctrl->offsetRandom.y() / 2.f);
-            placer->setZRange(-partctrl->offsetRandom.z() / 2.f, partctrl->offsetRandom.z() / 2.f);
+            if (atVertex && (partctrl->recType == Nif::RC_NiBSPArrayController))
+            {
+                emitter->setUseGeometryEmitter(true);
+                emitter->setGeometryEmitterTarget(partctrl->emitter->recIndex);
+            }
+            else
+            {
+                osgParticle::BoxPlacer* placer = new osgParticle::BoxPlacer;
+                placer->setXRange(-partctrl->offsetRandom.x() / 2.f, partctrl->offsetRandom.x() / 2.f);
+                placer->setYRange(-partctrl->offsetRandom.y() / 2.f, partctrl->offsetRandom.y() / 2.f);
+                placer->setZRange(-partctrl->offsetRandom.z() / 2.f, partctrl->offsetRandom.z() / 2.f);
+                emitter->setPlacer(placer);
+            }
 
-            emitter->setPlacer(placer);
             return emitter;
         }
 
diff --git a/components/nifosg/particle.cpp b/components/nifosg/particle.cpp
index 7821b9c2b8..493143a7a3 100644
--- a/components/nifosg/particle.cpp
+++ b/components/nifosg/particle.cpp
@@ -11,6 +11,52 @@
 #include <components/misc/rng.hpp>
 #include <components/nif/controlled.hpp>
 #include <components/nif/data.hpp>
+#include <components/sceneutil/morphgeometry.hpp>
+#include <components/sceneutil/riggeometry.hpp>
+
+namespace
+{
+    class FindFirstGeometry : public osg::NodeVisitor
+    {
+    public:
+        FindFirstGeometry()
+            : osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN)
+            , mGeometry(nullptr)
+        {
+        }
+
+        void apply(osg::Node& node) override
+        {
+            if (mGeometry)
+                return;
+
+            traverse(node);
+        }
+
+        void apply(osg::Drawable& drawable) override
+        {
+            if (auto morph = dynamic_cast<SceneUtil::MorphGeometry*>(&drawable))
+            {
+                mGeometry = morph->getSourceGeometry();
+                return;
+            }
+            else if (auto rig = dynamic_cast<SceneUtil::RigGeometry*>(&drawable))
+            {
+                mGeometry = rig->getSourceGeometry();
+                return;
+            }
+
+            traverse(drawable);
+        }
+
+        void apply(osg::Geometry& geometry) override
+        {
+            mGeometry = &geometry;
+        }
+
+        osg::Geometry* mGeometry;
+    };
+}
 
 namespace NifOsg
 {
@@ -264,6 +310,8 @@ void GravityAffector::operate(osgParticle::Particle *particle, double dt)
 
 Emitter::Emitter()
     : osgParticle::Emitter()
+    , mUseGeometryEmitter(false)
+    , mGeometryEmitterTarget(std::nullopt)
 {
 }
 
@@ -274,29 +322,19 @@ Emitter::Emitter(const Emitter &copy, const osg::CopyOp &copyop)
     , mShooter(copy.mShooter)
     // need a deep copy because the remainder is stored in the object
     , mCounter(static_cast<osgParticle::Counter*>(copy.mCounter->clone(osg::CopyOp::DEEP_COPY_ALL)))
+    , mUseGeometryEmitter(copy.mUseGeometryEmitter)
+    , mGeometryEmitterTarget(copy.mGeometryEmitterTarget)
+    , mCachedGeometryEmitter(copy.mCachedGeometryEmitter)
 {
 }
 
 Emitter::Emitter(const std::vector<int> &targets)
     : mTargets(targets)
+    , mUseGeometryEmitter(false)
+    , mGeometryEmitterTarget(std::nullopt)
 {
 }
 
-void Emitter::setShooter(osgParticle::Shooter *shooter)
-{
-    mShooter = shooter;
-}
-
-void Emitter::setPlacer(osgParticle::Placer *placer)
-{
-    mPlacer = placer;
-}
-
-void Emitter::setCounter(osgParticle::Counter *counter)
-{
-    mCounter = counter;
-}
-
 void Emitter::emitParticles(double dt)
 {
     int n = mCounter->numParticlesToCreate(dt);
@@ -316,21 +354,53 @@ void Emitter::emitParticles(double dt)
     const osg::Matrix& ltw = getLocalToWorldMatrix();
     osg::Matrix emitterToPs = ltw * worldToPs;
 
-    if (!mTargets.empty())
+    osg::ref_ptr<osg::Vec3Array> geometryVertices = nullptr;
+
+    if (mUseGeometryEmitter || !mTargets.empty())
     {
-        int randomIndex = Misc::Rng::rollClosedProbability() * (mTargets.size() - 1);
-        int randomRecIndex = mTargets[randomIndex];
+        int recIndex;
+
+        if (mUseGeometryEmitter)
+        {
+            if (!mGeometryEmitterTarget.has_value())
+                return;
+
+            recIndex = mGeometryEmitterTarget.value();
+        }
+        else
+        {
+            int randomIndex = Misc::Rng::rollClosedProbability() * (mTargets.size() - 1);
+            recIndex = mTargets[randomIndex];
+        }
 
         // we could use a map here for faster lookup
-        FindGroupByRecIndex visitor(randomRecIndex);
+        FindGroupByRecIndex visitor(recIndex);
         getParent(0)->accept(visitor);
 
         if (!visitor.mFound)
         {
-            Log(Debug::Info) << "Can't find emitter node" << randomRecIndex;
+            Log(Debug::Info) << "Can't find emitter node" << recIndex;
             return;
         }
 
+        if (mUseGeometryEmitter)
+        {
+            if (!mCachedGeometryEmitter.lock(geometryVertices))
+            {
+                FindFirstGeometry geometryVisitor;
+                visitor.mFound->accept(geometryVisitor);
+
+                if (geometryVisitor.mGeometry)
+                {
+                    if (auto* vertices = dynamic_cast<osg::Vec3Array*>(geometryVisitor.mGeometry->getVertexArray()))
+                    {
+                        mCachedGeometryEmitter = osg::observer_ptr<osg::Vec3Array>(vertices);
+                        geometryVertices = vertices;
+                    }
+                }
+            }
+        }
+
         osg::NodePath path = visitor.mFoundPath;
         path.erase(path.begin());
         emitterToPs = osg::computeLocalToWorld(path) * emitterToPs;
@@ -338,12 +408,18 @@ void Emitter::emitParticles(double dt)
 
     emitterToPs.orthoNormalize(emitterToPs);
 
+    if (mUseGeometryEmitter && (!geometryVertices.valid() || geometryVertices->empty()))
+        return;
+
     for (int i=0; i<n; ++i)
     {
         osgParticle::Particle* P = getParticleSystem()->createParticle(nullptr);
         if (P)
         {
-            mPlacer->place(P);
+            if (mUseGeometryEmitter)
+                P->setPosition((*geometryVertices)[Misc::Rng::rollDice(geometryVertices->getNumElements())]);
+            else if (mPlacer)
+                mPlacer->place(P);
 
             mShooter->shoot(P);
 
diff --git a/components/nifosg/particle.hpp b/components/nifosg/particle.hpp
index 8b724545f4..9e68cdf347 100644
--- a/components/nifosg/particle.hpp
+++ b/components/nifosg/particle.hpp
@@ -1,6 +1,8 @@
 #ifndef OPENMW_COMPONENTS_NIFOSG_PARTICLE_H
 #define OPENMW_COMPONENTS_NIFOSG_PARTICLE_H
 
+#include <optional>
+
 #include <osgParticle/Particle>
 #include <osgParticle/Shooter>
 #include <osgParticle/Operator>
@@ -233,9 +235,12 @@ namespace NifOsg
 
         void emitParticles(double dt) override;
 
-        void setShooter(osgParticle::Shooter* shooter);
-        void setPlacer(osgParticle::Placer* placer);
-        void setCounter(osgParticle::Counter* counter);
+        void setShooter(osgParticle::Shooter* shooter) { mShooter = shooter; }
+        void setPlacer(osgParticle::Placer* placer) { mPlacer = placer; }
+        void setCounter(osgParticle::Counter* counter) { mCounter = counter;}
+
+        void setUseGeometryEmitter(bool useGeometryEmitter) { mUseGeometryEmitter = useGeometryEmitter; }
+        void setGeometryEmitterTarget(std::optional<int> recIndex) { mGeometryEmitterTarget = recIndex; }
 
     private:
         // NIF Record indices
@@ -244,6 +249,10 @@ namespace NifOsg
         osg::ref_ptr<osgParticle::Placer> mPlacer;
         osg::ref_ptr<osgParticle::Shooter> mShooter;
         osg::ref_ptr<osgParticle::Counter> mCounter;
+
+        bool mUseGeometryEmitter;
+        std::optional<int> mGeometryEmitterTarget;
+        osg::observer_ptr<osg::Vec3Array> mCachedGeometryEmitter;
     };
 
 }

From a05e029aa040d8af4b27eacd0a250a46b7d34be8 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Tue, 8 Feb 2022 13:49:05 -0800
Subject: [PATCH 2084/2859] search for stencil enabled flag correctly

---
 components/nifosg/nifloader.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 87ffeb232c..11f8fb4661 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -349,8 +349,12 @@ namespace NifOsg
 
                 if (props[i].getPtr()->recType == Nif::RC_NiStencilProperty)
                 {
-                    hasStencilProperty = true;
-                    break;
+                    const Nif::NiStencilProperty* stencilprop = static_cast<const Nif::NiStencilProperty*>(props[i].getPtr());
+                    if (stencilprop->data.enabled != 0)
+                    {
+                        hasStencilProperty = true;
+                        break;
+                    }
                 }
             }
 

From 27d2daabc15d114229d1b19e53b7fdf1cc658f92 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Tue, 8 Feb 2022 14:12:17 -0800
Subject: [PATCH 2085/2859] move depth define to header, missing on mac

---
 components/sceneutil/depth.cpp | 4 ----
 components/sceneutil/depth.hpp | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/sceneutil/depth.cpp b/components/sceneutil/depth.cpp
index 5d53b97726..ee95f8c7ec 100644
--- a/components/sceneutil/depth.cpp
+++ b/components/sceneutil/depth.cpp
@@ -6,10 +6,6 @@
 
 #include <components/settings/settings.hpp>
 
-#ifndef GL_DEPTH32F_STENCIL8_NV
-#define GL_DEPTH32F_STENCIL8_NV 0x8DAC
-#endif
-
 namespace SceneUtil
 {
     void setCameraClearDepth(osg::Camera* camera)
diff --git a/components/sceneutil/depth.hpp b/components/sceneutil/depth.hpp
index 11a863ef7a..1f4ba55297 100644
--- a/components/sceneutil/depth.hpp
+++ b/components/sceneutil/depth.hpp
@@ -5,6 +5,10 @@
 
 #include "util.hpp"
 
+#ifndef GL_DEPTH32F_STENCIL8_NV
+#define GL_DEPTH32F_STENCIL8_NV 0x8DAC
+#endif
+
 namespace SceneUtil
 {
     // Sets camera clear depth to 0 if reversed depth buffer is in use, 1 otherwise.

From ee2235c5c1d83a1abb0e319b817a8f26d21132cf Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Tue, 8 Feb 2022 23:43:44 +0000
Subject: [PATCH 2086/2859] Copy scripts/omw/ai.lua to vfs (was added in !1604,
 but I forgot to modify CMakeLists.txt)

---
 files/builtin_scripts/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/files/builtin_scripts/CMakeLists.txt b/files/builtin_scripts/CMakeLists.txt
index 1ef67a2e15..90c3c2a503 100644
--- a/files/builtin_scripts/CMakeLists.txt
+++ b/files/builtin_scripts/CMakeLists.txt
@@ -17,6 +17,7 @@ set(DDIRRELATIVE resources/vfs/openmw_aux)
 copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_ROOT} ${DDIRRELATIVE} "${LUA_AUX_FILES}")
 
 set(LUA_SCRIPTS_FILES
+    scripts/omw/ai.lua
     scripts/omw/camera.lua
     scripts/omw/head_bobbing.lua
     scripts/omw/third_person.lua

From 85053941b358a9398c80b053b9219c95e6d23a61 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Wed, 9 Feb 2022 13:55:32 +0300
Subject: [PATCH 2087/2859] Properly postprocess NiSortAdjustNode

---
 components/nif/node.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/nif/node.hpp b/components/nif/node.hpp
index fb57e07739..837a4a0e30 100644
--- a/components/nif/node.hpp
+++ b/components/nif/node.hpp
@@ -460,6 +460,7 @@ struct NiSortAdjustNode : NiNode
     }
     void post(NIFFile *nif) override
     {
+        NiNode::post(nif);
         mSubSorter.post(nif);
     }
 };

From 5aef14eccdc944478f4efe30bb858eebe47bbefd Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 10 Feb 2022 20:28:27 +0100
Subject: [PATCH 2088/2859] Prevent division by 0

---
 apps/openmw/mwdialogue/filter.cpp | 11 ++++++-----
 apps/openmw/mwgui/hud.cpp         |  3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwdialogue/filter.cpp b/apps/openmw/mwdialogue/filter.cpp
index a47334a2dd..7ae9f14a7a 100644
--- a/apps/openmw/mwdialogue/filter.cpp
+++ b/apps/openmw/mwdialogue/filter.cpp
@@ -257,9 +257,9 @@ bool MWDialogue::Filter::testSelectStructNumeric (const SelectWrapper& select) c
         case SelectWrapper::Function_PcHealthPercent:
         {
             MWWorld::Ptr player = MWMechanics::getPlayer();
-
-            float ratio = player.getClass().getCreatureStats (player).getHealth().getCurrent() /
-                player.getClass().getCreatureStats (player).getHealth().getModified();
+            float ratio = player.getClass().getCreatureStats(player).getHealth().getModified();
+            if(ratio > 0)
+                ratio = player.getClass().getCreatureStats(player).getHealth().getCurrent() / ratio;
 
             return select.selectCompare (static_cast<int>(ratio*100));
         }
@@ -276,8 +276,9 @@ bool MWDialogue::Filter::testSelectStructNumeric (const SelectWrapper& select) c
 
         case SelectWrapper::Function_HealthPercent:
         {
-            float ratio = mActor.getClass().getCreatureStats (mActor).getHealth().getCurrent() /
-                mActor.getClass().getCreatureStats (mActor).getHealth().getModified();
+            float ratio = mActor.getClass().getCreatureStats(mActor).getHealth().getModified();
+            if(ratio > 0)
+                ratio = mActor.getClass().getCreatureStats(mActor).getHealth().getCurrent() / ratio;
 
             return select.selectCompare (static_cast<int>(ratio*100));
         }
diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp
index 4ed54c38d6..5af85b34ae 100644
--- a/apps/openmw/mwgui/hud.cpp
+++ b/apps/openmw/mwgui/hud.cpp
@@ -608,7 +608,8 @@ namespace MWGui
         mEnemyHealth->setProgressRange(100);
         // Health is usually cast to int before displaying. Actors die whenever they are < 1 health.
         // Therefore any value < 1 should show as an empty health bar. We do the same in statswindow :)
-        mEnemyHealth->setProgressPosition(static_cast<size_t>(stats.getHealth().getCurrent() / stats.getHealth().getModified() * 100));
+        float health = stats.getHealth().getModified();
+        mEnemyHealth->setProgressPosition(health == 0.f ? 0 : static_cast<size_t>(stats.getHealth().getCurrent() / health * 100));
 
         static const float fNPCHealthBarFade = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fNPCHealthBarFade")->mValue.getFloat();
         if (fNPCHealthBarFade > 0.f)

From 4e52c96cf58e7b0c8b59db490e12c850bed2f7ca Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 10 Feb 2022 20:31:27 +0100
Subject: [PATCH 2089/2859] Make Set/Mod[DynamicStat] work with negative values
 as in vanilla

---
 apps/openmw/mwgui/statswindow.cpp        |  2 +-
 apps/openmw/mwscript/statsextensions.cpp | 23 +++++++++++------------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/apps/openmw/mwgui/statswindow.cpp b/apps/openmw/mwgui/statswindow.cpp
index 0830af0744..49ee7698ee 100644
--- a/apps/openmw/mwgui/statswindow.cpp
+++ b/apps/openmw/mwgui/statswindow.cpp
@@ -179,7 +179,7 @@ namespace MWGui
     void StatsWindow::setValue (const std::string& id, const MWMechanics::DynamicStat<float>& value)
     {
         int current = static_cast<int>(value.getCurrent());
-        int modified = static_cast<int>(value.getModified());
+        int modified = static_cast<int>(value.getModified(false));
 
         // Fatigue can be negative
         if (id != "FBar")
diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp
index 78195b3693..f127b2bc4b 100644
--- a/apps/openmw/mwscript/statsextensions.cpp
+++ b/apps/openmw/mwscript/statsextensions.cpp
@@ -218,8 +218,8 @@ namespace MWScript
                     MWMechanics::DynamicStat<float> stat (ptr.getClass().getCreatureStats (ptr)
                         .getDynamic (mIndex));
 
-                    stat.setModified (value, 0);
-                    stat.setCurrent(value);
+                    stat.setBase(value);
+                    stat.setCurrent(value, true);
 
                     ptr.getClass().getCreatureStats (ptr).setDynamic (mIndex, stat);
                 }
@@ -259,19 +259,18 @@ namespace MWScript
                         }
                     }
 
-                    MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats (ptr);
+                    MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
 
-                    Interpreter::Type_Float current = stats.getDynamic(mIndex).getCurrent();
+                    MWMechanics::DynamicStat<float> stat = stats.getDynamic(mIndex);
 
-                    MWMechanics::DynamicStat<float> stat (ptr.getClass().getCreatureStats (ptr)
-                        .getDynamic (mIndex));
+                    float current = stat.getCurrent();
+                    float base = diff + stat.getBase();
+                    if(mIndex != 2)
+                        base = std::max(base, 0.f);
+                    stat.setBase(base);
+                    stat.setCurrent(diff + current, true);
 
-                    stat.setModified (diff + stat.getModified(), 0);
-                    stat.setCurrentModified (diff + stat.getCurrentModified());
-
-                    stat.setCurrent (diff + current);
-
-                    ptr.getClass().getCreatureStats (ptr).setDynamic (mIndex, stat);
+                    stats.setDynamic (mIndex, stat);
                 }
         };
 

From dc495a685ae50cebfa96637e8cdcf8370aa9c4b6 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 10 Feb 2022 20:32:59 +0100
Subject: [PATCH 2090/2859] Remove a member variable that doesn't get saved and
 remove fortify maximum health code

---
 apps/openmw/mwgui/race.cpp                    |   2 +-
 apps/openmw/mwgui/widgets.hpp                 |   4 -
 apps/openmw/mwmechanics/creaturestats.cpp     |  15 +-
 .../mwmechanics/mechanicsmanagerimp.cpp       |   4 +-
 apps/openmw/mwmechanics/spelleffects.cpp      |   3 +-
 apps/openmw/mwmechanics/stat.cpp              | 168 +-----------------
 apps/openmw/mwmechanics/stat.hpp              |  56 ++----
 apps/openmw/mwworld/magiceffects.cpp          |   6 +-
 8 files changed, 36 insertions(+), 222 deletions(-)

diff --git a/apps/openmw/mwgui/race.cpp b/apps/openmw/mwgui/race.cpp
index d30eb65eb3..efa4cea981 100644
--- a/apps/openmw/mwgui/race.cpp
+++ b/apps/openmw/mwgui/race.cpp
@@ -399,7 +399,7 @@ namespace MWGui
             skillWidget = mSkillList->createWidget<Widgets::MWSkill>("MW_StatNameValue", coord1, MyGUI::Align::Default,
                                                            std::string("Skill") + MyGUI::utility::toString(i));
             skillWidget->setSkillNumber(skillId);
-            skillWidget->setSkillValue(Widgets::MWSkill::SkillValue(static_cast<float>(race->mData.mBonus[i].mBonus)));
+            skillWidget->setSkillValue(Widgets::MWSkill::SkillValue(static_cast<float>(race->mData.mBonus[i].mBonus), 0.f));
             ToolTips::createSkillToolTip(skillWidget, skillId);
 
 
diff --git a/apps/openmw/mwgui/widgets.hpp b/apps/openmw/mwgui/widgets.hpp
index 2f27cc029c..e430872487 100644
--- a/apps/openmw/mwgui/widgets.hpp
+++ b/apps/openmw/mwgui/widgets.hpp
@@ -181,8 +181,6 @@ namespace MWGui
         public:
             MWSpell();
 
-            typedef MWMechanics::Stat<int> SpellValue;
-
             void setSpellId(const std::string &id);
 
             /**
@@ -215,8 +213,6 @@ namespace MWGui
         public:
             MWEffectList();
 
-            typedef MWMechanics::Stat<int> EnchantmentValue;
-
             enum EffectFlags
             {
                 EF_NoTarget = 0x01, // potions have no target (target is always the player)
diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index 9611f5b34a..a53caf1451 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -26,8 +26,6 @@ namespace MWMechanics
           mDeathAnimation(-1), mTimeOfDeath(), mSideMovementAngle(0), mLevel (0)
         , mAttackingOrSpell(false)
     {
-        for (int i=0; i<4; ++i)
-            mAiSettings[i] = 0;
     }
 
     const AiSequence& CreatureStats::getAiSequence() const
@@ -158,9 +156,8 @@ namespace MWMechanics
                 float agility      = getAttribute(ESM::Attribute::Agility).getModified();
                 float endurance    = getAttribute(ESM::Attribute::Endurance).getModified();
                 DynamicStat<float> fatigue = getFatigue();
-                float diff = (strength+willpower+agility+endurance) - fatigue.getBase();
                 float currentToBaseRatio = fatigue.getBase() > 0 ? (fatigue.getCurrent() / fatigue.getBase()) : 0;
-                fatigue.setModified(fatigue.getModified() + diff, 0);
+                fatigue.setBase(std::max(0.f, strength + willpower + agility + endurance));
                 fatigue.setCurrent(fatigue.getBase() * currentToBaseRatio, false, true);
                 setFatigue(fatigue);
             }
@@ -196,8 +193,6 @@ namespace MWMechanics
 
             mDead = true;
 
-            mDynamic[index].setModifier(0);
-            mDynamic[index].setCurrentModifier(0);
             mDynamic[index].setCurrent(0);
         }
     }
@@ -281,10 +276,7 @@ namespace MWMechanics
     {
         if (mDead)
         {
-            if (mDynamic[0].getModified() < 1)
-                mDynamic[0].setModified(1, 0);
-
-            mDynamic[0].setCurrent(mDynamic[0].getModified());
+            mDynamic[0].setCurrent(mDynamic[0].getBase());
             mDead = false;
             mDeathAnimationFinished = false;
         }
@@ -415,9 +407,8 @@ namespace MWMechanics
         double magickaFactor = base + mMagicEffects.get(EffectKey(ESM::MagicEffect::FortifyMaximumMagicka)).getMagnitude() * 0.1;
 
         DynamicStat<float> magicka = getMagicka();
-        float diff = (static_cast<int>(magickaFactor*intelligence)) - magicka.getBase();
         float currentToBaseRatio = magicka.getBase() > 0 ? magicka.getCurrent() / magicka.getBase() : 0;
-        magicka.setModified(magicka.getModified() + diff, 0);
+        magicka.setBase(magickaFactor * intelligence);
         magicka.setCurrent(magicka.getBase() * currentToBaseRatio, false, true);
         setMagicka(magicka);
     }
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 0816445271..5c41e8142d 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -255,7 +255,7 @@ namespace MWMechanics
         for (int i=0; i<3; ++i)
         {
             DynamicStat<float> stat = creatureStats.getDynamic (i);
-            stat.setCurrent (stat.getModified());
+            stat.setCurrent(stat.getModified());
             creatureStats.setDynamic (i, stat);
         }
 
@@ -1450,7 +1450,7 @@ namespace MWMechanics
                 std::string script = target.getClass().getScript(target);
                 if (!script.empty() && target.getRefData().getLocals().hasVar(script, "onpchitme") && attacker == player)
                 {
-                    int fight = std::max(0, target.getClass().getCreatureStats(target).getAiSetting(CreatureStats::AI_Fight).getModified());
+                    int fight = target.getClass().getCreatureStats(target).getAiSetting(CreatureStats::AI_Fight).getModified();
                     peaceful = (fight == 0);
                 }
 
diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp
index d0584791a5..42c27c7931 100644
--- a/apps/openmw/mwmechanics/spelleffects.cpp
+++ b/apps/openmw/mwmechanics/spelleffects.cpp
@@ -64,8 +64,7 @@ namespace
         auto& creatureStats = target.getClass().getCreatureStats(target);
         auto stat = creatureStats.getDynamic(index);
         float current = stat.getCurrent();
-        stat.setModified(stat.getModified() + magnitude, 0);
-        stat.setCurrentModified(stat.getCurrentModified() + magnitude);
+        stat.setBase(std::max(0.f, stat.getBase() + magnitude));
         stat.setCurrent(current + magnitude);
         creatureStats.setDynamic(index, stat);
     }
diff --git a/apps/openmw/mwmechanics/stat.cpp b/apps/openmw/mwmechanics/stat.cpp
index 263c867aea..9d62eb7873 100644
--- a/apps/openmw/mwmechanics/stat.cpp
+++ b/apps/openmw/mwmechanics/stat.cpp
@@ -5,174 +5,41 @@
 namespace MWMechanics
 {
     template<typename T>
-    Stat<T>::Stat() : mBase (0), mModified (0), mCurrentModified (0) {}
+    Stat<T>::Stat() : mBase (0), mModifier (0) {}
     template<typename T>
-    Stat<T>::Stat(T base) : mBase (base), mModified (base), mCurrentModified (base) {}
-    template<typename T>
-    Stat<T>::Stat(T base, T modified) : mBase (base), mModified (modified), mCurrentModified (modified) {}
-
-    template<typename T>
-    const T& Stat<T>::getBase() const
-    {
-        return mBase;
-    }
+    Stat<T>::Stat(T base, T modified) : mBase (base), mModifier (modified) {}
 
     template<typename T>
     T Stat<T>::getModified(bool capped) const
     {
-        if(!capped)
-            return mModified;
-        return std::max(static_cast<T>(0), mModified);
-    }
-
-    template<typename T>
-    T Stat<T>::getCurrentModified() const
-    {
-        return mCurrentModified;
-    }
-
-    template<typename T>
-    T Stat<T>::getModifier() const
-    {
-        return mModified-mBase;
-    }
-
-    template<typename T>
-    T Stat<T>::getCurrentModifier() const
-    {
-        return mCurrentModified - mModified;
-    }
-
-    template<typename T>
-    void Stat<T>::set (const T& value)
-    {
-        T diff = value - mBase;
-        mBase = mModified = value;
-        mCurrentModified += diff;
-    }
-
-    template<typename T>
-    void Stat<T>::setBase (const T& value)
-    {
-        T diff = value - mBase;
-        mBase = value;
-        mModified += diff;
-        mCurrentModified += diff;
-    }
-
-    template<typename T>
-    void Stat<T>::setModified (T value, const T& min, const T& max)
-    {
-        T diff = value - mModified;
-
-        if (mBase+diff<min)
-        {
-            value = min + (mModified - mBase);
-            diff = value - mModified;
-        }
-        else if (mBase+diff>max)
-        {
-            value = max + (mModified - mBase);
-            diff = value - mModified;
-        }
-
-        mModified = value;
-        mBase += diff;
-        mCurrentModified += diff;
-    }
-
-    template<typename T>
-    void Stat<T>::setCurrentModified(T value)
-    {
-        mCurrentModified = value;
-    }
-
-    template<typename T>
-    void Stat<T>::setModifier (const T& modifier)
-    {
-        mModified = mBase + modifier;
-    }
-
-    template<typename T>
-    void Stat<T>::setCurrentModifier(const T& modifier)
-    {
-        mCurrentModified = mModified + modifier;
+        if(capped)
+            return std::max({}, mModifier + mBase);
+        return mModifier + mBase;
     }
 
     template<typename T>
     void Stat<T>::writeState (ESM::StatState<T>& state) const
     {
         state.mBase = mBase;
-        state.mMod = mCurrentModified;
+        state.mMod = mModifier;
     }
     template<typename T>
     void Stat<T>::readState (const ESM::StatState<T>& state)
     {
         mBase = state.mBase;
-        mModified = state.mBase;
-        mCurrentModified = state.mMod;
+        mModifier = state.mMod;
     }
 
 
     template<typename T>
-    DynamicStat<T>::DynamicStat() : mStatic (0), mCurrent (0) {}
+    DynamicStat<T>::DynamicStat() : mStatic(0, 0), mCurrent(0) {}
     template<typename T>
-    DynamicStat<T>::DynamicStat(T base) : mStatic (base), mCurrent (base) {}
+    DynamicStat<T>::DynamicStat(T base) : mStatic(base, 0), mCurrent(base) {}
     template<typename T>
     DynamicStat<T>::DynamicStat(T base, T modified, T current) : mStatic(base, modified), mCurrent (current) {}
     template<typename T>
     DynamicStat<T>::DynamicStat(const Stat<T> &stat, T current) : mStatic(stat), mCurrent (current) {}
 
-
-    template<typename T>
-    const T& DynamicStat<T>::getBase() const
-    {
-        return mStatic.getBase();
-    }
-    template<typename T>
-    T DynamicStat<T>::getModified() const
-    {
-        return mStatic.getModified();
-    }
-    template<typename T>
-    T DynamicStat<T>::getCurrentModified() const
-    {
-        return mStatic.getCurrentModified();
-    }
-
-    template<typename T>
-    const T& DynamicStat<T>::getCurrent() const
-    {
-        return mCurrent;
-    }
-
-    template<typename T>
-    void DynamicStat<T>::set (const T& value)
-    {
-        mStatic.set (value);
-        mCurrent = value;
-    }
-    template<typename T>
-    void DynamicStat<T>::setBase (const T& value)
-    {
-        mStatic.setBase (value);
-
-        if (mCurrent>getModified())
-            mCurrent = getModified();
-    }
-    template<typename T>
-    void DynamicStat<T>::setModified (T value, const T& min, const T& max)
-    {
-        mStatic.setModified (value, min, max);
-
-        if (mCurrent>getModified())
-            mCurrent = getModified();
-    }
-    template<typename T>
-    void DynamicStat<T>::setCurrentModified(T value)
-    {
-        mStatic.setCurrentModified(value);
-    }
     template<typename T>
     void DynamicStat<T>::setCurrent (const T& value, bool allowDecreaseBelowZero, bool allowIncreaseAboveModified)
     {
@@ -197,23 +64,6 @@ namespace MWMechanics
             mCurrent = 0;
         }
     }
-    template<typename T>
-    void DynamicStat<T>::setModifier (const T& modifier, bool allowCurrentDecreaseBelowZero)
-    {
-        T diff =  modifier - mStatic.getModifier();
-        mStatic.setModifier (modifier);
-        setCurrent (getCurrent()+diff, allowCurrentDecreaseBelowZero);
-    }
-
-    template<typename T>
-    void DynamicStat<T>::setCurrentModifier(const T& modifier, bool allowCurrentDecreaseBelowZero)
-    {
-        T diff = modifier - mStatic.getCurrentModifier();
-        mStatic.setCurrentModifier(modifier);
-
-        // The (modifier > 0) check here allows increase over modified only if the modifier is positive (a fortify effect is active).
-        setCurrent (getCurrent() + diff, allowCurrentDecreaseBelowZero, (modifier > 0));
-    }
 
     template<typename T>
     void DynamicStat<T>::writeState (ESM::StatState<T>& state) const
diff --git a/apps/openmw/mwmechanics/stat.hpp b/apps/openmw/mwmechanics/stat.hpp
index c80c5b1b70..e08d0af71e 100644
--- a/apps/openmw/mwmechanics/stat.hpp
+++ b/apps/openmw/mwmechanics/stat.hpp
@@ -16,38 +16,22 @@ namespace MWMechanics
     class Stat
     {
             T mBase;
-            T mModified;
-            T mCurrentModified;
+            T mModifier;
 
         public:
             typedef T Type;
 
             Stat();
-            Stat(T base);
             Stat(T base, T modified);
 
-            const T& getBase() const;
+            const T& getBase() const { return mBase; };
 
             T getModified(bool capped = true) const;
-            T getCurrentModified() const;
-            T getModifier() const;
-            T getCurrentModifier() const;
+            T getModifier() const { return mModifier; };
 
-            /// Set base and modified to \a value.
-            void set (const T& value);
+            void setBase(const T& value) { mBase = value; };
 
-            /// Set base and adjust modified accordingly.
-            void setBase (const T& value);
-
-            /// Set modified value and adjust base accordingly.
-            void setModified (T value, const T& min, const T& max = std::numeric_limits<T>::max());
-
-            /// Set "current modified," used for drain and fortify. Unlike the regular modifier
-            /// this just adds and subtracts from the current value without changing the maximum.
-            void setCurrentModified(T value);
-
-            void setModifier (const T& modifier);
-            void setCurrentModifier (const T& modifier);
+            void setModifier(const T& modifier) { mModifier = modifier; };
 
             void writeState (ESM::StatState<T>& state) const;
             void readState (const ESM::StatState<T>& state);
@@ -57,7 +41,7 @@ namespace MWMechanics
     inline bool operator== (const Stat<T>& left, const Stat<T>& right)
     {
         return left.getBase()==right.getBase() &&
-            left.getModified()==right.getModified();
+            left.getModifier()==right.getModifier();
     }
 
     template<typename T>
@@ -80,27 +64,17 @@ namespace MWMechanics
             DynamicStat(T base, T modified, T current);
             DynamicStat(const Stat<T> &stat, T current);
 
-            const T& getBase() const;
-            T getModified() const;
-            T getCurrentModified() const;
-            const T& getCurrent() const;
-
-            /// Set base, modified and current to \a value.
-            void set (const T& value);
+            const T& getBase() const { return mStatic.getBase(); };
+            T getModified(bool capped = true) const { return mStatic.getModified(capped); };
+            const T& getCurrent() const { return mCurrent; };
 
-            /// Set base and adjust modified accordingly.
-            void setBase (const T& value);
-
-            /// Set modified value and adjust base accordingly.
-            void setModified (T value, const T& min, const T& max = std::numeric_limits<T>::max());
-
-            /// Set "current modified," used for drain and fortify. Unlike the regular modifier
-            /// this just adds and subtracts from the current value without changing the maximum.
-            void setCurrentModified(T value);
+            /// Set base and adjust current accordingly.
+            void setBase(const T& value) { mStatic.setBase(value); };
 
             void setCurrent (const T& value, bool allowDecreaseBelowZero = false, bool allowIncreaseAboveModified = false);
-            void setModifier (const T& modifier, bool allowCurrentToDecreaseBelowZero=false);
-            void setCurrentModifier (const T& modifier, bool allowCurrentToDecreaseBelowZero = false);
+
+            T getModifier() const { return mStatic.getModifier(); }
+            void setModifier(T value) { mStatic.setModifier(value); }
 
             void writeState (ESM::StatState<T>& state) const;
             void readState (const ESM::StatState<T>& state);
@@ -110,7 +84,7 @@ namespace MWMechanics
     inline bool operator== (const DynamicStat<T>& left, const DynamicStat<T>& right)
     {
         return left.getBase()==right.getBase() &&
-            left.getModified()==right.getModified() &&
+            left.getModifier()==right.getModifier() &&
             left.getCurrent()==right.getCurrent();
     }
 
diff --git a/apps/openmw/mwworld/magiceffects.cpp b/apps/openmw/mwworld/magiceffects.cpp
index 9c257d9093..1138a55238 100644
--- a/apps/openmw/mwworld/magiceffects.cpp
+++ b/apps/openmw/mwworld/magiceffects.cpp
@@ -198,7 +198,11 @@ namespace MWWorld
         for(std::size_t i = 0; i < ESM::Attribute::Length; ++i)
             creatureStats.mAttributes[i].mMod = 0.f;
         for(std::size_t i = 0; i < 3; ++i)
-            creatureStats.mDynamic[i].mMod = 0.f;
+        {
+            auto& dynamic = creatureStats.mDynamic[i];
+            dynamic.mCurrent -= dynamic.mMod - dynamic.mBase;
+            dynamic.mMod = 0.f;
+        }
         for(std::size_t i = 0; i < 4; ++i)
             creatureStats.mAiSettings[i].mMod = 0.f;
         if(npcStats)

From ede9d27437da965dbffcfa6c5931516a67bbc54e Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Thu, 10 Feb 2022 19:43:27 +0000
Subject: [PATCH 2091/2859] Element-wise multiplication and division of Lua
 vectors

---
 .../lua/test_utilpackage.cpp                  | 12 ++++++
 components/lua/utilpackage.cpp                | 41 ++++++++++--------
 files/lua_api/openmw/util.lua                 | 43 +++++++++++++++++++
 3 files changed, 78 insertions(+), 18 deletions(-)

diff --git a/apps/openmw_test_suite/lua/test_utilpackage.cpp b/apps/openmw_test_suite/lua/test_utilpackage.cpp
index ba19cca383..5e27b36916 100644
--- a/apps/openmw_test_suite/lua/test_utilpackage.cpp
+++ b/apps/openmw_test_suite/lua/test_utilpackage.cpp
@@ -39,6 +39,10 @@ namespace
         EXPECT_TRUE(get<bool>(lua, "v2 == util.vector2(3/5, 4/5)"));
         lua.safe_script("_, len = util.vector2(0, 0):normalize()");
         EXPECT_FLOAT_EQ(get<float>(lua, "len"), 0);
+        lua.safe_script("ediv0 = util.vector2(1, 0):ediv(util.vector2(0, 0))");
+        EXPECT_TRUE(get<bool>(lua, "ediv0.x == math.huge and ediv0.y ~= ediv0.y"));
+        EXPECT_TRUE(get<bool>(lua, "util.vector2(1, 2):emul(util.vector2(3, 4)) == util.vector2(3, 8)"));
+        EXPECT_TRUE(get<bool>(lua, "util.vector2(4, 6):ediv(util.vector2(2, 3)) == util.vector2(2, 2)"));
     }
 
     TEST(LuaUtilPackageTest, Vector3)
@@ -68,6 +72,10 @@ namespace
         EXPECT_TRUE(get<bool>(lua, "v2 == util.vector3(3/5, 4/5, 0)"));
         lua.safe_script("_, len = util.vector3(0, 0, 0):normalize()");
         EXPECT_FLOAT_EQ(get<float>(lua, "len"), 0);
+        lua.safe_script("ediv0 = util.vector3(1, 1, 1):ediv(util.vector3(0, 0, 0))");
+        EXPECT_TRUE(get<bool>(lua, "ediv0.z == math.huge"));
+        EXPECT_TRUE(get<bool>(lua, "util.vector3(1, 2, 3):emul(util.vector3(3, 4, 5)) == util.vector3(3, 8, 15)"));
+        EXPECT_TRUE(get<bool>(lua, "util.vector3(4, 6, 8):ediv(util.vector3(2, 3, 4)) == util.vector3(2, 2, 2)"));
     }
 
     TEST(LuaUtilPackageTest, Vector4)
@@ -95,6 +103,10 @@ namespace
         EXPECT_TRUE(get<bool>(lua, "v2 == util.vector4(3/5, 0, 0, 4/5)"));
         lua.safe_script("_, len = util.vector4(0, 0, 0, 0):normalize()");
         EXPECT_FLOAT_EQ(get<float>(lua, "len"), 0);
+        lua.safe_script("ediv0 = util.vector4(1, 1, 1, -1):ediv(util.vector4(0, 0, 0, 0))");
+        EXPECT_TRUE(get<bool>(lua, "ediv0.w == -math.huge"));
+        EXPECT_TRUE(get<bool>(lua, "util.vector4(1, 2, 3, 4):emul(util.vector4(3, 4, 5, 6)) == util.vector4(3, 8, 15, 24)"));
+        EXPECT_TRUE(get<bool>(lua, "util.vector4(4, 6, 8, 9):ediv(util.vector4(2, 3, 4, 3)) == util.vector4(2, 2, 2, 3)"));
     }
 
     TEST(LuaUtilPackageTest, Color)
diff --git a/components/lua/utilpackage.cpp b/components/lua/utilpackage.cpp
index c51b00a7d5..d31a8259be 100644
--- a/components/lua/utilpackage.cpp
+++ b/components/lua/utilpackage.cpp
@@ -55,6 +55,29 @@ namespace LuaUtil
                 else
                     return std::make_tuple(v * (1.f / len), len);
             };
+            vectorType["emul"] = [](const T& a, const T& b)
+            {
+                T result;
+                for (int i = 0; i < T::num_components; ++i)
+                    result[i] = a[i] * b[i];
+                return result;
+            };
+            vectorType["ediv"] = [](const T& a, const T& b)
+            {
+                T result;
+                for (int i = 0; i < T::num_components; ++i)
+                    result[i] = a[i] / b[i];
+                return result;
+            };
+            vectorType[sol::meta_function::to_string] = [](const T& v)
+            {
+                std::stringstream ss;
+                ss << "(" << v[0];
+                for (int i = 1; i < T::num_components; ++i)
+                    ss << ", " << v[i];
+                ss << ")";
+                return ss.str();
+            };
         }
     }
 
@@ -67,12 +90,6 @@ namespace LuaUtil
         sol::usertype<Vec2> vec2Type = lua.new_usertype<Vec2>("Vec2");
         vec2Type["x"] = sol::readonly_property([](const Vec2& v) -> float { return v.x(); } );
         vec2Type["y"] = sol::readonly_property([](const Vec2& v) -> float { return v.y(); } );
-        vec2Type[sol::meta_function::to_string] = [](const Vec2& v)
-        {
-            std::stringstream ss;
-            ss << "(" << v.x() << ", " << v.y() << ")";
-            return ss.str();
-        };
         addVectorMethods<Vec2>(vec2Type);
         vec2Type["rotate"] = &Misc::rotateVec2f;
 
@@ -82,12 +99,6 @@ namespace LuaUtil
         vec3Type["x"] = sol::readonly_property([](const Vec3& v) -> float { return v.x(); } );
         vec3Type["y"] = sol::readonly_property([](const Vec3& v) -> float { return v.y(); } );
         vec3Type["z"] = sol::readonly_property([](const Vec3& v) -> float { return v.z(); } );
-        vec3Type[sol::meta_function::to_string] = [](const Vec3& v)
-        {
-            std::stringstream ss;
-            ss << "(" << v.x() << ", " << v.y() << ", " << v.z() << ")";
-            return ss.str();
-        };
         addVectorMethods<Vec3>(vec3Type);
         vec3Type[sol::meta_function::involution] = [](const Vec3& a, const Vec3& b) { return a ^ b; };
         vec3Type["cross"] = [](const Vec3& a, const Vec3& b) { return a ^ b; };
@@ -100,12 +111,6 @@ namespace LuaUtil
         vec4Type["y"] = sol::readonly_property([](const Vec4& v) -> float { return v.y(); });
         vec4Type["z"] = sol::readonly_property([](const Vec4& v) -> float { return v.z(); });
         vec4Type["w"] = sol::readonly_property([](const Vec4& v) -> float { return v.w(); });
-        vec4Type[sol::meta_function::to_string] = [](const Vec4& v)
-        {
-            std::stringstream ss;
-            ss << "(" << v.x() << ", " << v.y() << ", " << v.z() << ", " << v.w() << ")";
-            return ss.str();
-        };
         addVectorMethods<Vec4>(vec4Type);
 
         // Lua bindings for Color
diff --git a/files/lua_api/openmw/util.lua b/files/lua_api/openmw/util.lua
index dca1683d45..4ea0ee4b0d 100644
--- a/files/lua_api/openmw/util.lua
+++ b/files/lua_api/openmw/util.lua
@@ -87,6 +87,20 @@
 -- @param #Vector2 v
 -- @return #number
 
+---
+-- Element-wise multiplication
+-- @function [parent=#Vector2] emul
+-- @param self
+-- @param #Vector2 v
+-- @return #Vector2
+
+---
+-- Element-wise division
+-- @function [parent=#Vector2] ediv
+-- @param self
+-- @param #Vector2 v
+-- @return #Vector2
+
 
 ---
 -- Immutable 3D vector
@@ -152,6 +166,20 @@
 -- @param #Vector3 v
 -- @return #Vector3
 
+---
+-- Element-wise multiplication
+-- @function [parent=#Vector3] emul
+-- @param self
+-- @param #Vector3 v
+-- @return #Vector3
+
+---
+-- Element-wise division
+-- @function [parent=#Vector3] ediv
+-- @param self
+-- @param #Vector3 v
+-- @return #Vector3
+
 
 ---
 -- Immutable 4D vector.
@@ -210,6 +238,21 @@
 -- @param #Vector4 v
 -- @return #number
 
+---
+-- Element-wise multiplication
+-- @function [parent=#Vector4] emul
+-- @param self
+-- @param #Vector4 v
+-- @return #Vector4
+
+---
+-- Element-wise division
+-- @function [parent=#Vector4] ediv
+-- @param self
+-- @param #Vector4 v
+-- @return #Vector4
+
+
 ---
 -- Color in RGBA format. All of the component values are in the range [0, 1].
 -- @type Color

From 6b203892fc55cf5bb1c0eac15cffd3b6009c4eb8 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 10 Feb 2022 20:46:20 +0100
Subject: [PATCH 2092/2859] Fix mod not increasing fortified values

---
 apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 2 +-
 apps/openmw/mwscript/statsextensions.cpp        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 5c41e8142d..d2ebef45e7 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -255,7 +255,7 @@ namespace MWMechanics
         for (int i=0; i<3; ++i)
         {
             DynamicStat<float> stat = creatureStats.getDynamic (i);
-            stat.setCurrent(stat.getModified());
+            stat.setCurrent (stat.getModified());
             creatureStats.setDynamic (i, stat);
         }
 
diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp
index f127b2bc4b..f2de338fb3 100644
--- a/apps/openmw/mwscript/statsextensions.cpp
+++ b/apps/openmw/mwscript/statsextensions.cpp
@@ -219,7 +219,7 @@ namespace MWScript
                         .getDynamic (mIndex));
 
                     stat.setBase(value);
-                    stat.setCurrent(value, true);
+                    stat.setCurrent(stat.getModified(false), true, true);
 
                     ptr.getClass().getCreatureStats (ptr).setDynamic (mIndex, stat);
                 }
@@ -268,7 +268,7 @@ namespace MWScript
                     if(mIndex != 2)
                         base = std::max(base, 0.f);
                     stat.setBase(base);
-                    stat.setCurrent(diff + current, true);
+                    stat.setCurrent(diff + current, true, true);
 
                     stats.setDynamic (mIndex, stat);
                 }

From 712107de2da596aad598bf97eb6d18dc68708100 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Thu, 10 Feb 2022 11:59:49 -0800
Subject: [PATCH 2093/2859] nisortadjust support

---
 CHANGELOG.md                    |  1 +
 components/nif/niffile.cpp      |  2 +-
 components/nif/record.hpp       |  3 +-
 components/nifosg/nifloader.cpp | 94 +++++++++++++++++++++++++++++----
 4 files changed, 89 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b26d758847..ccdfec178a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -132,6 +132,7 @@
     Feature #6443: NiStencilProperty is not fully supported
     Feature #6534: Shader-based object texture blending
     Feature #6592: Missing support for NiTriShape particle emitters
+    Feature #6600: Support NiSortAdjustNode
     Task #6201: Remove the "Note: No relevant classes found. No output generated" warnings
     Task #6264: Remove the old classes in animation.cpp
     Task #6553: Simplify interpreter instruction registration
diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index 1a1bbd7217..37fb82dd04 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -153,7 +153,7 @@ static std::map<std::string,RecordFactoryEntry> makeFactory()
     factory["bhkRigidBody"]                 = {&construct <bhkRigidBody>                , RC_bhkRigidBody               };
     factory["bhkRigidBodyT"]                = {&construct <bhkRigidBody>                , RC_bhkRigidBodyT              };
     factory["BSLightingShaderProperty"]     = {&construct <BSLightingShaderProperty>    , RC_BSLightingShaderProperty   };
-    factory["NiSortAdjustNode"]             = {&construct <NiSortAdjustNode>            , RC_NiNode                     };
+    factory["NiSortAdjustNode"]             = {&construct <NiSortAdjustNode>            , RC_NiSortAdjustNode           };
     factory["NiClusterAccumulator"]         = {&construct <NiClusterAccumulator>        , RC_NiClusterAccumulator       };
     factory["NiAlphaAccumulator"]           = {&construct <NiAlphaAccumulator>          , RC_NiAlphaAccumulator         };
     return factory;
diff --git a/components/nif/record.hpp b/components/nif/record.hpp
index 937ce1d1e9..2ce1ff0743 100644
--- a/components/nif/record.hpp
+++ b/components/nif/record.hpp
@@ -142,7 +142,8 @@ enum RecordType
   RC_bhkRigidBodyT,
   RC_BSLightingShaderProperty,
   RC_NiClusterAccumulator,
-  RC_NiAlphaAccumulator
+  RC_NiAlphaAccumulator,
+  RC_NiSortAdjustNode
 };
 
 /// Base class for all records
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 206bbf2092..b61681e04e 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -219,6 +219,9 @@ namespace NifOsg
         bool mHasHerbalismLabel = false;
         bool mHasStencilProperty = false;
 
+        const Nif::NiSortAdjustNode* mPushedSorter = nullptr;
+        const Nif::NiSortAdjustNode* mLastAppliedNoInheritSorter = nullptr;
+
         // This is used to queue emitters that weren't attached to their node yet.
         std::vector<std::pair<size_t, osg::ref_ptr<Emitter>>> mEmitterQueue;
 
@@ -309,10 +312,6 @@ namespace NifOsg
             if (mHasHerbalismLabel)
                 created->getOrCreateUserDataContainer()->addDescription(Constants::HerbalismLabel);
 
-            // When dealing with stencil buffer, draw order is especially sensitive. Make sure such objects are drawn with traversal order.
-            if (mHasStencilProperty)
-                created->getOrCreateStateSet()->setRenderBinDetails(2, "TraversalOrderBin");
-
             // Attach particle emitters to their nodes which should all be loaded by now.
             handleQueuedParticleEmitters(created, nif);
 
@@ -597,6 +596,22 @@ namespace NifOsg
             if (nifNode->recType == Nif::RC_NiBSAnimationNode || nifNode->recType == Nif::RC_NiBSParticleNode)
                 animflags = nifNode->flags;
 
+            if (nifNode->recType == Nif::RC_NiSortAdjustNode)
+            {
+                auto sortNode = static_cast<const Nif::NiSortAdjustNode*>(nifNode);
+
+                if (sortNode->mSubSorter.empty())
+                {
+                    Log(Debug::Warning) << "Empty accumulator found in '" << nifNode->recName << "' node " << nifNode->recIndex;
+                }
+                else
+                {
+                    if (mPushedSorter && !mPushedSorter->mSubSorter.empty() && mPushedSorter->mMode != Nif::NiSortAdjustNode::SortingMode_Inherit)
+                        mLastAppliedNoInheritSorter = mPushedSorter;
+                    mPushedSorter = sortNode;
+                }
+            }
+
             // Hide collision shapes, but don't skip the subgraph
             // We still need to animate the hidden bones so the physics system can access them
             if (nifNode->recType == Nif::RC_RootCollisionNode)
@@ -2008,6 +2023,13 @@ namespace NifOsg
             mat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
 
             bool hasMatCtrl = false;
+            bool hasSortAlpha = false;
+            osg::StateSet* blendFuncStateSet = nullptr;
+
+            auto setBin_Transparent = [] (osg::StateSet* ss) { ss->setRenderingHint(osg::StateSet::TRANSPARENT_BIN); };
+            auto setBin_BackToFront = [] (osg::StateSet* ss) { ss->setRenderBinDetails(0, "SORT_BACK_TO_FRONT"); };
+            auto setBin_Traversal = [] (osg::StateSet* ss) { ss->setRenderBinDetails(2, "TraversalOrderBin"); };
+            auto setBin_Inherit = [] (osg::StateSet* ss) { ss->setRenderBinToInherit(); };
 
             int lightmode = 1;
             float emissiveMult = 1.f;
@@ -2085,17 +2107,23 @@ namespace NifOsg
                         bool noSort = (alphaprop->flags>>13)&1;
                         if (!noSort)
                         {
-                            node->getOrCreateStateSet()->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
-                            node->getOrCreateStateSet()->setNestRenderBins(false);
+                            hasSortAlpha = true;
+                            if (!mPushedSorter)
+                                setBin_Transparent(node->getStateSet());
                         }
                         else
-                            node->getOrCreateStateSet()->setRenderBinToInherit();
+                        {
+                            if (!mPushedSorter)
+                                setBin_Inherit(node->getStateSet());
+                        }
                     }
                     else if (osg::StateSet* stateset = node->getStateSet())
                     {
                         stateset->removeAttribute(osg::StateAttribute::BLENDFUNC);
                         stateset->removeMode(GL_BLEND);
-                        stateset->setRenderBinToInherit();
+                        blendFuncStateSet = stateset;
+                        if (!mPushedSorter)
+                            blendFuncStateSet->setRenderBinToInherit();
                     }
 
                     if((alphaprop->flags>>9)&1)
@@ -2158,7 +2186,10 @@ namespace NifOsg
                 mat->setColorMode(osg::Material::OFF);
             }
 
-            if (!hasMatCtrl && mat->getColorMode() == osg::Material::OFF
+            if (!mPushedSorter && !hasSortAlpha && mHasStencilProperty)
+                setBin_Traversal(node->getOrCreateStateSet());
+
+            if (!mPushedSorter && !hasMatCtrl && mat->getColorMode() == osg::Material::OFF
                     && mat->getEmission(osg::Material::FRONT_AND_BACK) == osg::Vec4f(0,0,0,1)
                     && mat->getDiffuse(osg::Material::FRONT_AND_BACK) == osg::Vec4f(1,1,1,1)
                     && mat->getAmbient(osg::Material::FRONT_AND_BACK) == osg::Vec4f(1,1,1,1)
@@ -2177,6 +2208,51 @@ namespace NifOsg
                 stateset->addUniform(new osg::Uniform("emissiveMult", emissiveMult));
             if (specStrength != 1.f)
                 stateset->addUniform(new osg::Uniform("specStrength", specStrength));
+
+            if (!mPushedSorter)
+                return;
+
+            auto assignBin = [&] (int mode, int type) {
+                if (mode == Nif::NiSortAdjustNode::SortingMode_Off)
+                {
+                    setBin_Traversal(stateset);
+                    return;
+                }
+
+                if (type == Nif::RC_NiAlphaAccumulator)
+                {
+                    if (hasSortAlpha)
+                        setBin_BackToFront(stateset);
+                    else
+                        setBin_Traversal(stateset);
+                }
+                else if (type == Nif::RC_NiClusterAccumulator)
+                    setBin_BackToFront(stateset);
+                else
+                    Log(Debug::Error) << "Unrecognized NiAccumulator in " << mFilename;
+            };
+
+            switch (mPushedSorter->mMode)
+            {
+                case Nif::NiSortAdjustNode::SortingMode_Inherit:
+                {
+                    if (mLastAppliedNoInheritSorter)
+                        assignBin(mLastAppliedNoInheritSorter->mMode, mLastAppliedNoInheritSorter->mSubSorter->recType);
+                    else
+                        assignBin(mPushedSorter->mMode, Nif::RC_NiAlphaAccumulator);
+                    break;
+                }
+                case Nif::NiSortAdjustNode::SortingMode_Off:
+                {
+                    setBin_Traversal(stateset);
+                    break;
+                }
+                case Nif::NiSortAdjustNode::SortingMode_Subsort:
+                {
+                    assignBin(mPushedSorter->mMode, mPushedSorter->mSubSorter->recType);
+                    break;
+                }
+            }
         }
 
     };

From 054d8babc48cfe30e344ca65df85c411a0569569 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 10 Feb 2022 22:10:46 +0100
Subject: [PATCH 2094/2859] Add getRatio method

---
 apps/openmw/mwdialogue/filter.cpp          | 12 ++----------
 apps/openmw/mwgui/hud.cpp                  |  3 +--
 apps/openmw/mwmechanics/aicombataction.cpp |  3 +--
 apps/openmw/mwmechanics/stat.cpp           | 13 +++++++++++++
 apps/openmw/mwmechanics/stat.hpp           |  1 +
 apps/openmw/mwscript/statsextensions.cpp   | 12 ++----------
 6 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/apps/openmw/mwdialogue/filter.cpp b/apps/openmw/mwdialogue/filter.cpp
index 7ae9f14a7a..e90ba79481 100644
--- a/apps/openmw/mwdialogue/filter.cpp
+++ b/apps/openmw/mwdialogue/filter.cpp
@@ -257,11 +257,7 @@ bool MWDialogue::Filter::testSelectStructNumeric (const SelectWrapper& select) c
         case SelectWrapper::Function_PcHealthPercent:
         {
             MWWorld::Ptr player = MWMechanics::getPlayer();
-            float ratio = player.getClass().getCreatureStats(player).getHealth().getModified();
-            if(ratio > 0)
-                ratio = player.getClass().getCreatureStats(player).getHealth().getCurrent() / ratio;
-
-            return select.selectCompare (static_cast<int>(ratio*100));
+            return select.selectCompare(static_cast<int>(player.getClass().getCreatureStats(player).getHealth().getRatio() * 100));
         }
 
         case SelectWrapper::Function_PcDynamicStat:
@@ -276,11 +272,7 @@ bool MWDialogue::Filter::testSelectStructNumeric (const SelectWrapper& select) c
 
         case SelectWrapper::Function_HealthPercent:
         {
-            float ratio = mActor.getClass().getCreatureStats(mActor).getHealth().getModified();
-            if(ratio > 0)
-                ratio = mActor.getClass().getCreatureStats(mActor).getHealth().getCurrent() / ratio;
-
-            return select.selectCompare (static_cast<int>(ratio*100));
+            return select.selectCompare(static_cast<int>(mActor.getClass().getCreatureStats(mActor).getHealth().getRatio() * 100));
         }
 
         default:
diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp
index 5af85b34ae..e591163731 100644
--- a/apps/openmw/mwgui/hud.cpp
+++ b/apps/openmw/mwgui/hud.cpp
@@ -608,8 +608,7 @@ namespace MWGui
         mEnemyHealth->setProgressRange(100);
         // Health is usually cast to int before displaying. Actors die whenever they are < 1 health.
         // Therefore any value < 1 should show as an empty health bar. We do the same in statswindow :)
-        float health = stats.getHealth().getModified();
-        mEnemyHealth->setProgressPosition(health == 0.f ? 0 : static_cast<size_t>(stats.getHealth().getCurrent() / health * 100));
+        mEnemyHealth->setProgressPosition(static_cast<size_t>(stats.getHealth().getRatio() * 100));
 
         static const float fNPCHealthBarFade = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fNPCHealthBarFade")->mValue.getFloat();
         if (fNPCHealthBarFade > 0.f)
diff --git a/apps/openmw/mwmechanics/aicombataction.cpp b/apps/openmw/mwmechanics/aicombataction.cpp
index 3be68f8394..43b43eb9f9 100644
--- a/apps/openmw/mwmechanics/aicombataction.cpp
+++ b/apps/openmw/mwmechanics/aicombataction.cpp
@@ -476,8 +476,7 @@ namespace MWMechanics
         static const float fAIFleeHealthMult = gmst.find("fAIFleeHealthMult")->mValue.getFloat();
         static const float fAIFleeFleeMult = gmst.find("fAIFleeFleeMult")->mValue.getFloat();
 
-        float healthPercentage = (stats.getHealth().getModified() == 0.0f)
-                                    ? 1.0f : stats.getHealth().getCurrent() / stats.getHealth().getModified();
+        float healthPercentage = stats.getHealth().getRatio(false);
         float rating = (1.0f - healthPercentage) * fAIFleeHealthMult + flee * fAIFleeFleeMult;
 
         static const int iWereWolfLevelToAttack = gmst.find("iWereWolfLevelToAttack")->mValue.getInteger();
diff --git a/apps/openmw/mwmechanics/stat.cpp b/apps/openmw/mwmechanics/stat.cpp
index 9d62eb7873..eacfca98ae 100644
--- a/apps/openmw/mwmechanics/stat.cpp
+++ b/apps/openmw/mwmechanics/stat.cpp
@@ -65,6 +65,19 @@ namespace MWMechanics
         }
     }
 
+    template<typename T>
+    T DynamicStat<T>::getRatio(bool nanIsZero) const
+    {
+        T modified = getModified();
+        if(modified == T{})
+        {
+            if(nanIsZero)
+                return modified;
+            return {1};
+        }
+        return getCurrent() / modified;
+    }
+
     template<typename T>
     void DynamicStat<T>::writeState (ESM::StatState<T>& state) const
     {
diff --git a/apps/openmw/mwmechanics/stat.hpp b/apps/openmw/mwmechanics/stat.hpp
index e08d0af71e..1e9bb100d0 100644
--- a/apps/openmw/mwmechanics/stat.hpp
+++ b/apps/openmw/mwmechanics/stat.hpp
@@ -67,6 +67,7 @@ namespace MWMechanics
             const T& getBase() const { return mStatic.getBase(); };
             T getModified(bool capped = true) const { return mStatic.getModified(capped); };
             const T& getCurrent() const { return mCurrent; };
+            T getRatio(bool nanIsZero = true) const;
 
             /// Set base and adjust current accordingly.
             void setBase(const T& value) { mStatic.setBase(value); };
diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp
index f2de338fb3..a62d40065d 100644
--- a/apps/openmw/mwscript/statsextensions.cpp
+++ b/apps/openmw/mwscript/statsextensions.cpp
@@ -324,17 +324,9 @@ namespace MWScript
                 void execute (Interpreter::Runtime& runtime) override
                 {
                     MWWorld::Ptr ptr = R()(runtime);
+                    const MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
 
-                    MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats (ptr);
-
-                    Interpreter::Type_Float value = 0;
-
-                    Interpreter::Type_Float max = stats.getDynamic(mIndex).getModified();
-
-                    if (max>0)
-                        value = stats.getDynamic(mIndex).getCurrent() / max;
-
-                    runtime.push (value);
+                    runtime.push(stats.getDynamic(mIndex).getRatio());
                 }
         };
 

From 6cd12823e88bd9e6cc503146bd0227557b4aac48 Mon Sep 17 00:00:00 2001
From: Niek Wilting <NiekWilting@hotmail.com>
Date: Fri, 11 Feb 2022 19:26:13 +0100
Subject: [PATCH 2095/2859] Fix always-use-best-attack rounding

---
 apps/openmw/mwmechanics/character.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 0f8e2ebd97..a1d686baaa 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -55,9 +55,9 @@ namespace
 
 std::string getBestAttack (const ESM::Weapon* weapon)
 {
-    int slash = (weapon->mData.mSlash[0] + weapon->mData.mSlash[1])/2;
-    int chop = (weapon->mData.mChop[0] + weapon->mData.mChop[1])/2;
-    int thrust = (weapon->mData.mThrust[0] + weapon->mData.mThrust[1])/2;
+    int slash = weapon->mData.mSlash[0] + weapon->mData.mSlash[1];
+    int chop = weapon->mData.mChop[0] + weapon->mData.mChop[1];
+    int thrust = weapon->mData.mThrust[0] + weapon->mData.mThrust[1];
     if (slash == chop && slash == thrust)
         return "slash";
     else if (thrust >= chop && thrust >= slash)

From 32e710b11325ab4da8c078a8dae8f01e5da24cc7 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Fri, 11 Feb 2022 18:57:59 +0000
Subject: [PATCH 2096/2859] Add missing `i18n/Calendar/en.lua` in
 CMakeLists.txt

---
 files/builtin_scripts/CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/files/builtin_scripts/CMakeLists.txt b/files/builtin_scripts/CMakeLists.txt
index 90c3c2a503..1f140a4af1 100644
--- a/files/builtin_scripts/CMakeLists.txt
+++ b/files/builtin_scripts/CMakeLists.txt
@@ -25,3 +25,6 @@ set(LUA_SCRIPTS_FILES
 
 set(DDIRRELATIVE resources/vfs/scripts/omw)
 copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_ROOT} ${DDIRRELATIVE} "${LUA_SCRIPTS_FILES}")
+
+set(DDIRRELATIVE resources/vfs/i18n/Calendar)
+copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_ROOT} ${DDIRRELATIVE} "i18n/Calendar/en.lua")

From d097c16206077933234aac566957ef513f1459ae Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 11 Feb 2022 20:40:38 +0100
Subject: [PATCH 2097/2859] Use unique_ptr to manage nif record lifetime

---
 components/nif/niffile.cpp | 20 +++++++-------------
 components/nif/niffile.hpp |  6 ++----
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index 1a1bbd7217..e976a9d96a 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -17,17 +17,11 @@ NIFFile::NIFFile(Files::IStreamPtr stream, const std::string &name)
     parse(stream);
 }
 
-NIFFile::~NIFFile()
-{
-    for (Record* record : records)
-        delete record;
-}
-
-template <typename NodeType> static Record* construct() { return new NodeType; }
+template <typename NodeType> static std::unique_ptr<Record> construct() { return std::make_unique<NodeType>(); }
 
 struct RecordFactoryEntry {
 
-    using create_t = Record* (*)();
+    using create_t = std::unique_ptr<Record> (*)();
 
     create_t        mCreate;
     RecordType      mType;
@@ -290,7 +284,7 @@ void NIFFile::parse(Files::IStreamPtr stream)
     const bool hasRecordSeparators = ver >= NIFStream::generateVersion(10,0,0,0) && ver < NIFStream::generateVersion(10,2,0,0);
     for (std::size_t i = 0; i < recNum; i++)
     {
-        Record *r = nullptr;
+        std::unique_ptr<Record> r;
 
         std::string rec = hasRecTypeListings ? recTypes[recTypeIndices[i]] : nif.getString();
         if(rec.empty())
@@ -315,7 +309,7 @@ void NIFFile::parse(Files::IStreamPtr stream)
 
         if (entry != factories.end())
         {
-            r = entry->second.mCreate ();
+            r = entry->second.mCreate();
             r->recType = entry->second.mType;
         }
         else
@@ -328,8 +322,8 @@ void NIFFile::parse(Files::IStreamPtr stream)
         assert(r->recType != RC_MISSING);
         r->recName = rec;
         r->recIndex = i;
-        records[i] = r;
         r->read(&nif);
+        records[i] = std::move(r);
     }
 
     const std::size_t rootNum = nif.getUInt();
@@ -341,7 +335,7 @@ void NIFFile::parse(Files::IStreamPtr stream)
         int idx = nif.getInt();
         if (idx >= 0 && static_cast<std::size_t>(idx) < records.size())
         {
-            roots[i] = records[idx];
+            roots[i] = records[idx].get();
         }
         else
         {
@@ -351,7 +345,7 @@ void NIFFile::parse(Files::IStreamPtr stream)
     }
 
     // Once parsing is done, do post-processing.
-    for (Record* record : records)
+    for (const auto& record : records)
         record->post(this);
 }
 
diff --git a/components/nif/niffile.hpp b/components/nif/niffile.hpp
index 6884f51d58..d9f46795c1 100644
--- a/components/nif/niffile.hpp
+++ b/components/nif/niffile.hpp
@@ -55,7 +55,7 @@ class NIFFile final : public File
     std::string hash;
 
     /// Record list
-    std::vector<Record*> records;
+    std::vector<std::unique_ptr<Record>> records;
 
     /// Root list.  This is a select portion of the pointers from records
     std::vector<Record*> roots;
@@ -107,13 +107,11 @@ public:
 
     /// Open a NIF stream. The name is used for error messages.
     NIFFile(Files::IStreamPtr stream, const std::string &name);
-    ~NIFFile();
 
     /// Get a given record
     Record *getRecord(size_t index) const override
     {
-        Record *res = records.at(index);
-        return res;
+        return records.at(index).get();
     }
     /// Number of records
     size_t numRecords() const override { return records.size(); }

From 082810f9244b6666ee5c2f5e3e27ef314328ed83 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 11 Feb 2022 21:17:11 +0100
Subject: [PATCH 2098/2859] Store record type as a part of construct function
 type

---
 components/nif/niffile.cpp | 272 ++++++++++++++++++-------------------
 1 file changed, 134 insertions(+), 138 deletions(-)

diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index e976a9d96a..f3355c4e77 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -17,144 +17,143 @@ NIFFile::NIFFile(Files::IStreamPtr stream, const std::string &name)
     parse(stream);
 }
 
-template <typename NodeType> static std::unique_ptr<Record> construct() { return std::make_unique<NodeType>(); }
-
-struct RecordFactoryEntry {
-
-    using create_t = std::unique_ptr<Record> (*)();
-
-    create_t        mCreate;
-    RecordType      mType;
+template <typename NodeType, RecordType recordType>
+static std::unique_ptr<Record> construct()
+{
+    auto result = std::make_unique<NodeType>();
+    result->recType = recordType;
+    return result;
+}
 
-};
+using CreateRecord = std::unique_ptr<Record> (*)();
 
 ///These are all the record types we know how to read.
-static std::map<std::string,RecordFactoryEntry> makeFactory()
+static std::map<std::string, CreateRecord> makeFactory()
 {
-    std::map<std::string,RecordFactoryEntry> factory;
-    factory["NiNode"]                       = {&construct <NiNode>                      , RC_NiNode                     };
-    factory["NiSwitchNode"]                 = {&construct <NiSwitchNode>                , RC_NiSwitchNode               };
-    factory["NiLODNode"]                    = {&construct <NiLODNode>                   , RC_NiLODNode                  };
-    factory["AvoidNode"]                    = {&construct <NiNode>                      , RC_AvoidNode                  };
-    factory["NiCollisionSwitch"]            = {&construct <NiNode>                      , RC_NiCollisionSwitch          };
-    factory["NiBSParticleNode"]             = {&construct <NiNode>                      , RC_NiBSParticleNode           };
-    factory["NiBSAnimationNode"]            = {&construct <NiNode>                      , RC_NiBSAnimationNode          };
-    factory["NiBillboardNode"]              = {&construct <NiNode>                      , RC_NiBillboardNode            };
-    factory["NiTriShape"]                   = {&construct <NiTriShape>                  , RC_NiTriShape                 };
-    factory["NiTriStrips"]                  = {&construct <NiTriStrips>                 , RC_NiTriStrips                };
-    factory["NiLines"]                      = {&construct <NiLines>                     , RC_NiLines                    };
-    factory["NiParticles"]                  = {&construct <NiParticles>                 , RC_NiParticles                };
-    factory["NiRotatingParticles"]          = {&construct <NiParticles>                 , RC_NiParticles                };
-    factory["NiAutoNormalParticles"]        = {&construct <NiParticles>                 , RC_NiParticles                };
-    factory["NiCamera"]                     = {&construct <NiCamera>                    , RC_NiCamera                   };
-    factory["RootCollisionNode"]            = {&construct <NiNode>                      , RC_RootCollisionNode          };
-    factory["NiTexturingProperty"]          = {&construct <NiTexturingProperty>         , RC_NiTexturingProperty        };
-    factory["NiFogProperty"]                = {&construct <NiFogProperty>               , RC_NiFogProperty              };
-    factory["NiMaterialProperty"]           = {&construct <NiMaterialProperty>          , RC_NiMaterialProperty         };
-    factory["NiZBufferProperty"]            = {&construct <NiZBufferProperty>           , RC_NiZBufferProperty          };
-    factory["NiAlphaProperty"]              = {&construct <NiAlphaProperty>             , RC_NiAlphaProperty            };
-    factory["NiVertexColorProperty"]        = {&construct <NiVertexColorProperty>       , RC_NiVertexColorProperty      };
-    factory["NiShadeProperty"]              = {&construct <NiShadeProperty>             , RC_NiShadeProperty            };
-    factory["NiDitherProperty"]             = {&construct <NiDitherProperty>            , RC_NiDitherProperty           };
-    factory["NiWireframeProperty"]          = {&construct <NiWireframeProperty>         , RC_NiWireframeProperty        };
-    factory["NiSpecularProperty"]           = {&construct <NiSpecularProperty>          , RC_NiSpecularProperty         };
-    factory["NiStencilProperty"]            = {&construct <NiStencilProperty>           , RC_NiStencilProperty          };
-    factory["NiVisController"]              = {&construct <NiVisController>             , RC_NiVisController            };
-    factory["NiGeomMorpherController"]      = {&construct <NiGeomMorpherController>     , RC_NiGeomMorpherController    };
-    factory["NiKeyframeController"]         = {&construct <NiKeyframeController>        , RC_NiKeyframeController       };
-    factory["NiAlphaController"]            = {&construct <NiAlphaController>           , RC_NiAlphaController          };
-    factory["NiRollController"]             = {&construct <NiRollController>            , RC_NiRollController           };
-    factory["NiUVController"]               = {&construct <NiUVController>              , RC_NiUVController             };
-    factory["NiPathController"]             = {&construct <NiPathController>            , RC_NiPathController           };
-    factory["NiMaterialColorController"]    = {&construct <NiMaterialColorController>   , RC_NiMaterialColorController  };
-    factory["NiBSPArrayController"]         = {&construct <NiBSPArrayController>        , RC_NiBSPArrayController       };
-    factory["NiParticleSystemController"]   = {&construct <NiParticleSystemController>  , RC_NiParticleSystemController };
-    factory["NiFlipController"]             = {&construct <NiFlipController>            , RC_NiFlipController           };
-    factory["NiAmbientLight"]               = {&construct <NiLight>                     , RC_NiLight                    };
-    factory["NiDirectionalLight"]           = {&construct <NiLight>                     , RC_NiLight                    };
-    factory["NiPointLight"]                 = {&construct <NiPointLight>                , RC_NiLight                    };
-    factory["NiSpotLight"]                  = {&construct <NiSpotLight>                 , RC_NiLight                    };
-    factory["NiTextureEffect"]              = {&construct <NiTextureEffect>             , RC_NiTextureEffect            };
-    factory["NiExtraData"]                  = {&construct <NiExtraData>                 , RC_NiExtraData                };
-    factory["NiVertWeightsExtraData"]       = {&construct <NiVertWeightsExtraData>      , RC_NiVertWeightsExtraData     };
-    factory["NiTextKeyExtraData"]           = {&construct <NiTextKeyExtraData>          , RC_NiTextKeyExtraData         };
-    factory["NiStringExtraData"]            = {&construct <NiStringExtraData>           , RC_NiStringExtraData          };
-    factory["NiGravity"]                    = {&construct <NiGravity>                   , RC_NiGravity                  };
-    factory["NiPlanarCollider"]             = {&construct <NiPlanarCollider>            , RC_NiPlanarCollider           };
-    factory["NiSphericalCollider"]          = {&construct <NiSphericalCollider>         , RC_NiSphericalCollider        };
-    factory["NiParticleGrowFade"]           = {&construct <NiParticleGrowFade>          , RC_NiParticleGrowFade         };
-    factory["NiParticleColorModifier"]      = {&construct <NiParticleColorModifier>     , RC_NiParticleColorModifier    };
-    factory["NiParticleRotation"]           = {&construct <NiParticleRotation>          , RC_NiParticleRotation         };
-    factory["NiFloatData"]                  = {&construct <NiFloatData>                 , RC_NiFloatData                };
-    factory["NiTriShapeData"]               = {&construct <NiTriShapeData>              , RC_NiTriShapeData             };
-    factory["NiTriStripsData"]              = {&construct <NiTriStripsData>             , RC_NiTriStripsData            };
-    factory["NiLinesData"]                  = {&construct <NiLinesData>                 , RC_NiLinesData                };
-    factory["NiVisData"]                    = {&construct <NiVisData>                   , RC_NiVisData                  };
-    factory["NiColorData"]                  = {&construct <NiColorData>                 , RC_NiColorData                };
-    factory["NiPixelData"]                  = {&construct <NiPixelData>                 , RC_NiPixelData                };
-    factory["NiMorphData"]                  = {&construct <NiMorphData>                 , RC_NiMorphData                };
-    factory["NiKeyframeData"]               = {&construct <NiKeyframeData>              , RC_NiKeyframeData             };
-    factory["NiSkinData"]                   = {&construct <NiSkinData>                  , RC_NiSkinData                 };
-    factory["NiUVData"]                     = {&construct <NiUVData>                    , RC_NiUVData                   };
-    factory["NiPosData"]                    = {&construct <NiPosData>                   , RC_NiPosData                  };
-    factory["NiParticlesData"]              = {&construct <NiParticlesData>             , RC_NiParticlesData            };
-    factory["NiRotatingParticlesData"]      = {&construct <NiRotatingParticlesData>     , RC_NiParticlesData            };
-    factory["NiAutoNormalParticlesData"]    = {&construct <NiParticlesData>             , RC_NiParticlesData            };
-    factory["NiSequenceStreamHelper"]       = {&construct <NiSequenceStreamHelper>      , RC_NiSequenceStreamHelper     };
-    factory["NiSourceTexture"]              = {&construct <NiSourceTexture>             , RC_NiSourceTexture            };
-    factory["NiSkinInstance"]               = {&construct <NiSkinInstance>              , RC_NiSkinInstance             };
-    factory["NiLookAtController"]           = {&construct <NiLookAtController>          , RC_NiLookAtController         };
-    factory["NiPalette"]                    = {&construct <NiPalette>                   , RC_NiPalette                  };
-    factory["NiIntegerExtraData"]           = {&construct <NiIntegerExtraData>          , RC_NiIntegerExtraData         };
-    factory["NiIntegersExtraData"]          = {&construct <NiIntegersExtraData>         , RC_NiIntegersExtraData        };
-    factory["NiBinaryExtraData"]            = {&construct <NiBinaryExtraData>           , RC_NiBinaryExtraData          };
-    factory["NiBooleanExtraData"]           = {&construct <NiBooleanExtraData>          , RC_NiBooleanExtraData         };
-    factory["NiVectorExtraData"]            = {&construct <NiVectorExtraData>           , RC_NiVectorExtraData          };
-    factory["NiColorExtraData"]             = {&construct <NiVectorExtraData>           , RC_NiColorExtraData           };
-    factory["NiFloatExtraData"]             = {&construct <NiFloatExtraData>            , RC_NiFloatExtraData           };
-    factory["NiFloatsExtraData"]            = {&construct <NiFloatsExtraData>           , RC_NiFloatsExtraData          };
-    factory["NiStringPalette"]              = {&construct <NiStringPalette>             , RC_NiStringPalette            };
-    factory["NiBoolData"]                   = {&construct <NiBoolData>                  , RC_NiBoolData                 };
-    factory["NiSkinPartition"]              = {&construct <NiSkinPartition>             , RC_NiSkinPartition            };
-    factory["BSXFlags"]                     = {&construct <NiIntegerExtraData>          , RC_BSXFlags                   };
-    factory["BSBound"]                      = {&construct <BSBound>                     , RC_BSBound                    };
-    factory["NiTransformData"]              = {&construct <NiKeyframeData>              , RC_NiKeyframeData             };
-    factory["BSFadeNode"]                   = {&construct <NiNode>                      , RC_NiNode                     };
-    factory["bhkBlendController"]           = {&construct <bhkBlendController>          , RC_bhkBlendController         };
-    factory["NiFloatInterpolator"]          = {&construct <NiFloatInterpolator>         , RC_NiFloatInterpolator        };
-    factory["NiBoolInterpolator"]           = {&construct <NiBoolInterpolator>          , RC_NiBoolInterpolator         };
-    factory["NiPoint3Interpolator"]         = {&construct <NiPoint3Interpolator>        , RC_NiPoint3Interpolator       };
-    factory["NiTransformController"]        = {&construct <NiKeyframeController>        , RC_NiKeyframeController       };
-    factory["NiTransformInterpolator"]      = {&construct <NiTransformInterpolator>     , RC_NiTransformInterpolator    };
-    factory["NiColorInterpolator"]          = {&construct <NiColorInterpolator>         , RC_NiColorInterpolator        };
-    factory["BSShaderTextureSet"]           = {&construct <BSShaderTextureSet>          , RC_BSShaderTextureSet         };
-    factory["BSLODTriShape"]                = {&construct <BSLODTriShape>               , RC_BSLODTriShape              };
-    factory["BSShaderProperty"]             = {&construct <BSShaderProperty>            , RC_BSShaderProperty           };
-    factory["BSShaderPPLightingProperty"]   = {&construct <BSShaderPPLightingProperty>  , RC_BSShaderPPLightingProperty };
-    factory["BSShaderNoLightingProperty"]   = {&construct <BSShaderNoLightingProperty>  , RC_BSShaderNoLightingProperty };
-    factory["BSFurnitureMarker"]            = {&construct <BSFurnitureMarker>           , RC_BSFurnitureMarker          };
-    factory["NiCollisionObject"]            = {&construct <NiCollisionObject>           , RC_NiCollisionObject          };
-    factory["bhkCollisionObject"]           = {&construct <bhkCollisionObject>          , RC_bhkCollisionObject         };
-    factory["BSDismemberSkinInstance"]      = {&construct <BSDismemberSkinInstance>     , RC_BSDismemberSkinInstance    };
-    factory["NiControllerManager"]          = {&construct <NiControllerManager>         , RC_NiControllerManager        };
-    factory["bhkMoppBvTreeShape"]           = {&construct <bhkMoppBvTreeShape>          , RC_bhkMoppBvTreeShape         };
-    factory["bhkNiTriStripsShape"]          = {&construct <bhkNiTriStripsShape>         , RC_bhkNiTriStripsShape        };
-    factory["bhkPackedNiTriStripsShape"]    = {&construct <bhkPackedNiTriStripsShape>   , RC_bhkPackedNiTriStripsShape  };
-    factory["hkPackedNiTriStripsData"]      = {&construct <hkPackedNiTriStripsData>     , RC_hkPackedNiTriStripsData    };
-    factory["bhkConvexVerticesShape"]       = {&construct <bhkConvexVerticesShape>      , RC_bhkConvexVerticesShape     };
-    factory["bhkBoxShape"]                  = {&construct <bhkBoxShape>                 , RC_bhkBoxShape                };
-    factory["bhkListShape"]                 = {&construct <bhkListShape>                , RC_bhkListShape               };
-    factory["bhkRigidBody"]                 = {&construct <bhkRigidBody>                , RC_bhkRigidBody               };
-    factory["bhkRigidBodyT"]                = {&construct <bhkRigidBody>                , RC_bhkRigidBodyT              };
-    factory["BSLightingShaderProperty"]     = {&construct <BSLightingShaderProperty>    , RC_BSLightingShaderProperty   };
-    factory["NiSortAdjustNode"]             = {&construct <NiSortAdjustNode>            , RC_NiNode                     };
-    factory["NiClusterAccumulator"]         = {&construct <NiClusterAccumulator>        , RC_NiClusterAccumulator       };
-    factory["NiAlphaAccumulator"]           = {&construct <NiAlphaAccumulator>          , RC_NiAlphaAccumulator         };
-    return factory;
+    return {
+        {"NiNode"                       , &construct <NiNode                      , RC_NiNode                     >},
+        {"NiSwitchNode"                 , &construct <NiSwitchNode                , RC_NiSwitchNode               >},
+        {"NiLODNode"                    , &construct <NiLODNode                   , RC_NiLODNode                  >},
+        {"AvoidNode"                    , &construct <NiNode                      , RC_AvoidNode                  >},
+        {"NiCollisionSwitch"            , &construct <NiNode                      , RC_NiCollisionSwitch          >},
+        {"NiBSParticleNode"             , &construct <NiNode                      , RC_NiBSParticleNode           >},
+        {"NiBSAnimationNode"            , &construct <NiNode                      , RC_NiBSAnimationNode          >},
+        {"NiBillboardNode"              , &construct <NiNode                      , RC_NiBillboardNode            >},
+        {"NiTriShape"                   , &construct <NiTriShape                  , RC_NiTriShape                 >},
+        {"NiTriStrips"                  , &construct <NiTriStrips                 , RC_NiTriStrips                >},
+        {"NiLines"                      , &construct <NiLines                     , RC_NiLines                    >},
+        {"NiParticles"                  , &construct <NiParticles                 , RC_NiParticles                >},
+        {"NiRotatingParticles"          , &construct <NiParticles                 , RC_NiParticles                >},
+        {"NiAutoNormalParticles"        , &construct <NiParticles                 , RC_NiParticles                >},
+        {"NiCamera"                     , &construct <NiCamera                    , RC_NiCamera                   >},
+        {"RootCollisionNode"            , &construct <NiNode                      , RC_RootCollisionNode          >},
+        {"NiTexturingProperty"          , &construct <NiTexturingProperty         , RC_NiTexturingProperty        >},
+        {"NiFogProperty"                , &construct <NiFogProperty               , RC_NiFogProperty              >},
+        {"NiMaterialProperty"           , &construct <NiMaterialProperty          , RC_NiMaterialProperty         >},
+        {"NiZBufferProperty"            , &construct <NiZBufferProperty           , RC_NiZBufferProperty          >},
+        {"NiAlphaProperty"              , &construct <NiAlphaProperty             , RC_NiAlphaProperty            >},
+        {"NiVertexColorProperty"        , &construct <NiVertexColorProperty       , RC_NiVertexColorProperty      >},
+        {"NiShadeProperty"              , &construct <NiShadeProperty             , RC_NiShadeProperty            >},
+        {"NiDitherProperty"             , &construct <NiDitherProperty            , RC_NiDitherProperty           >},
+        {"NiWireframeProperty"          , &construct <NiWireframeProperty         , RC_NiWireframeProperty        >},
+        {"NiSpecularProperty"           , &construct <NiSpecularProperty          , RC_NiSpecularProperty         >},
+        {"NiStencilProperty"            , &construct <NiStencilProperty           , RC_NiStencilProperty          >},
+        {"NiVisController"              , &construct <NiVisController             , RC_NiVisController            >},
+        {"NiGeomMorpherController"      , &construct <NiGeomMorpherController     , RC_NiGeomMorpherController    >},
+        {"NiKeyframeController"         , &construct <NiKeyframeController        , RC_NiKeyframeController       >},
+        {"NiAlphaController"            , &construct <NiAlphaController           , RC_NiAlphaController          >},
+        {"NiRollController"             , &construct <NiRollController            , RC_NiRollController           >},
+        {"NiUVController"               , &construct <NiUVController              , RC_NiUVController             >},
+        {"NiPathController"             , &construct <NiPathController            , RC_NiPathController           >},
+        {"NiMaterialColorController"    , &construct <NiMaterialColorController   , RC_NiMaterialColorController  >},
+        {"NiBSPArrayController"         , &construct <NiBSPArrayController        , RC_NiBSPArrayController       >},
+        {"NiParticleSystemController"   , &construct <NiParticleSystemController  , RC_NiParticleSystemController >},
+        {"NiFlipController"             , &construct <NiFlipController            , RC_NiFlipController           >},
+        {"NiAmbientLight"               , &construct <NiLight                     , RC_NiLight                    >},
+        {"NiDirectionalLight"           , &construct <NiLight                     , RC_NiLight                    >},
+        {"NiPointLight"                 , &construct <NiPointLight                , RC_NiLight                    >},
+        {"NiSpotLight"                  , &construct <NiSpotLight                 , RC_NiLight                    >},
+        {"NiTextureEffect"              , &construct <NiTextureEffect             , RC_NiTextureEffect            >},
+        {"NiExtraData"                  , &construct <NiExtraData                 , RC_NiExtraData                >},
+        {"NiVertWeightsExtraData"       , &construct <NiVertWeightsExtraData      , RC_NiVertWeightsExtraData     >},
+        {"NiTextKeyExtraData"           , &construct <NiTextKeyExtraData          , RC_NiTextKeyExtraData         >},
+        {"NiStringExtraData"            , &construct <NiStringExtraData           , RC_NiStringExtraData          >},
+        {"NiGravity"                    , &construct <NiGravity                   , RC_NiGravity                  >},
+        {"NiPlanarCollider"             , &construct <NiPlanarCollider            , RC_NiPlanarCollider           >},
+        {"NiSphericalCollider"          , &construct <NiSphericalCollider         , RC_NiSphericalCollider        >},
+        {"NiParticleGrowFade"           , &construct <NiParticleGrowFade          , RC_NiParticleGrowFade         >},
+        {"NiParticleColorModifier"      , &construct <NiParticleColorModifier     , RC_NiParticleColorModifier    >},
+        {"NiParticleRotation"           , &construct <NiParticleRotation          , RC_NiParticleRotation         >},
+        {"NiFloatData"                  , &construct <NiFloatData                 , RC_NiFloatData                >},
+        {"NiTriShapeData"               , &construct <NiTriShapeData              , RC_NiTriShapeData             >},
+        {"NiTriStripsData"              , &construct <NiTriStripsData             , RC_NiTriStripsData            >},
+        {"NiLinesData"                  , &construct <NiLinesData                 , RC_NiLinesData                >},
+        {"NiVisData"                    , &construct <NiVisData                   , RC_NiVisData                  >},
+        {"NiColorData"                  , &construct <NiColorData                 , RC_NiColorData                >},
+        {"NiPixelData"                  , &construct <NiPixelData                 , RC_NiPixelData                >},
+        {"NiMorphData"                  , &construct <NiMorphData                 , RC_NiMorphData                >},
+        {"NiKeyframeData"               , &construct <NiKeyframeData              , RC_NiKeyframeData             >},
+        {"NiSkinData"                   , &construct <NiSkinData                  , RC_NiSkinData                 >},
+        {"NiUVData"                     , &construct <NiUVData                    , RC_NiUVData                   >},
+        {"NiPosData"                    , &construct <NiPosData                   , RC_NiPosData                  >},
+        {"NiParticlesData"              , &construct <NiParticlesData             , RC_NiParticlesData            >},
+        {"NiRotatingParticlesData"      , &construct <NiRotatingParticlesData     , RC_NiParticlesData            >},
+        {"NiAutoNormalParticlesData"    , &construct <NiParticlesData             , RC_NiParticlesData            >},
+        {"NiSequenceStreamHelper"       , &construct <NiSequenceStreamHelper      , RC_NiSequenceStreamHelper     >},
+        {"NiSourceTexture"              , &construct <NiSourceTexture             , RC_NiSourceTexture            >},
+        {"NiSkinInstance"               , &construct <NiSkinInstance              , RC_NiSkinInstance             >},
+        {"NiLookAtController"           , &construct <NiLookAtController          , RC_NiLookAtController         >},
+        {"NiPalette"                    , &construct <NiPalette                   , RC_NiPalette                  >},
+        {"NiIntegerExtraData"           , &construct <NiIntegerExtraData          , RC_NiIntegerExtraData         >},
+        {"NiIntegersExtraData"          , &construct <NiIntegersExtraData         , RC_NiIntegersExtraData        >},
+        {"NiBinaryExtraData"            , &construct <NiBinaryExtraData           , RC_NiBinaryExtraData          >},
+        {"NiBooleanExtraData"           , &construct <NiBooleanExtraData          , RC_NiBooleanExtraData         >},
+        {"NiVectorExtraData"            , &construct <NiVectorExtraData           , RC_NiVectorExtraData          >},
+        {"NiColorExtraData"             , &construct <NiVectorExtraData           , RC_NiColorExtraData           >},
+        {"NiFloatExtraData"             , &construct <NiFloatExtraData            , RC_NiFloatExtraData           >},
+        {"NiFloatsExtraData"            , &construct <NiFloatsExtraData           , RC_NiFloatsExtraData          >},
+        {"NiStringPalette"              , &construct <NiStringPalette             , RC_NiStringPalette            >},
+        {"NiBoolData"                   , &construct <NiBoolData                  , RC_NiBoolData                 >},
+        {"NiSkinPartition"              , &construct <NiSkinPartition             , RC_NiSkinPartition            >},
+        {"BSXFlags"                     , &construct <NiIntegerExtraData          , RC_BSXFlags                   >},
+        {"BSBound"                      , &construct <BSBound                     , RC_BSBound                    >},
+        {"NiTransformData"              , &construct <NiKeyframeData              , RC_NiKeyframeData             >},
+        {"BSFadeNode"                   , &construct <NiNode                      , RC_NiNode                     >},
+        {"bhkBlendController"           , &construct <bhkBlendController          , RC_bhkBlendController         >},
+        {"NiFloatInterpolator"          , &construct <NiFloatInterpolator         , RC_NiFloatInterpolator        >},
+        {"NiBoolInterpolator"           , &construct <NiBoolInterpolator          , RC_NiBoolInterpolator         >},
+        {"NiPoint3Interpolator"         , &construct <NiPoint3Interpolator        , RC_NiPoint3Interpolator       >},
+        {"NiTransformController"        , &construct <NiKeyframeController        , RC_NiKeyframeController       >},
+        {"NiTransformInterpolator"      , &construct <NiTransformInterpolator     , RC_NiTransformInterpolator    >},
+        {"NiColorInterpolator"          , &construct <NiColorInterpolator         , RC_NiColorInterpolator        >},
+        {"BSShaderTextureSet"           , &construct <BSShaderTextureSet          , RC_BSShaderTextureSet         >},
+        {"BSLODTriShape"                , &construct <BSLODTriShape               , RC_BSLODTriShape              >},
+        {"BSShaderProperty"             , &construct <BSShaderProperty            , RC_BSShaderProperty           >},
+        {"BSShaderPPLightingProperty"   , &construct <BSShaderPPLightingProperty  , RC_BSShaderPPLightingProperty >},
+        {"BSShaderNoLightingProperty"   , &construct <BSShaderNoLightingProperty  , RC_BSShaderNoLightingProperty >},
+        {"BSFurnitureMarker"            , &construct <BSFurnitureMarker           , RC_BSFurnitureMarker          >},
+        {"NiCollisionObject"            , &construct <NiCollisionObject           , RC_NiCollisionObject          >},
+        {"bhkCollisionObject"           , &construct <bhkCollisionObject          , RC_bhkCollisionObject         >},
+        {"BSDismemberSkinInstance"      , &construct <BSDismemberSkinInstance     , RC_BSDismemberSkinInstance    >},
+        {"NiControllerManager"          , &construct <NiControllerManager         , RC_NiControllerManager        >},
+        {"bhkMoppBvTreeShape"           , &construct <bhkMoppBvTreeShape          , RC_bhkMoppBvTreeShape         >},
+        {"bhkNiTriStripsShape"          , &construct <bhkNiTriStripsShape         , RC_bhkNiTriStripsShape        >},
+        {"bhkPackedNiTriStripsShape"    , &construct <bhkPackedNiTriStripsShape   , RC_bhkPackedNiTriStripsShape  >},
+        {"hkPackedNiTriStripsData"      , &construct <hkPackedNiTriStripsData     , RC_hkPackedNiTriStripsData    >},
+        {"bhkConvexVerticesShape"       , &construct <bhkConvexVerticesShape      , RC_bhkConvexVerticesShape     >},
+        {"bhkBoxShape"                  , &construct <bhkBoxShape                 , RC_bhkBoxShape                >},
+        {"bhkListShape"                 , &construct <bhkListShape                , RC_bhkListShape               >},
+        {"bhkRigidBody"                 , &construct <bhkRigidBody                , RC_bhkRigidBody               >},
+        {"bhkRigidBodyT"                , &construct <bhkRigidBody                , RC_bhkRigidBodyT              >},
+        {"BSLightingShaderProperty"     , &construct <BSLightingShaderProperty    , RC_BSLightingShaderProperty   >},
+        {"NiSortAdjustNode"             , &construct <NiSortAdjustNode            , RC_NiNode                     >},
+        {"NiClusterAccumulator"         , &construct <NiClusterAccumulator        , RC_NiClusterAccumulator       >},
+        {"NiAlphaAccumulator"           , &construct <NiAlphaAccumulator          , RC_NiAlphaAccumulator         >},
+    };
 }
 
 ///Make the factory map used for parsing the file
-static const std::map<std::string,RecordFactoryEntry> factories = makeFactory();
+static const std::map<std::string, CreateRecord> factories = makeFactory();
 
 std::string NIFFile::printVersion(unsigned int version)
 {
@@ -305,16 +304,13 @@ void NIFFile::parse(Files::IStreamPtr stream)
             }
         }
 
-        std::map<std::string,RecordFactoryEntry>::const_iterator entry = factories.find(rec);
+        const auto entry = factories.find(rec);
 
-        if (entry != factories.end())
-        {
-            r = entry->second.mCreate();
-            r->recType = entry->second.mType;
-        }
-        else
+        if (entry == factories.end())
             fail("Unknown record type " + rec);
 
+        r = entry->second();
+
         if (!supported)
             Log(Debug::Verbose) << "NIF Debug: Reading record of type " << rec << ", index " << i << " (" << filename << ")";
 

From fbd95516f4a7ffadc2fb1baee5f56c3fcea8229f Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 11 Feb 2022 21:28:24 +0100
Subject: [PATCH 2099/2859] Repalce raw for-loops by corresponding algorithms

---
 components/nif/niffile.cpp | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index f3355c4e77..bf604f5adf 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -6,6 +6,7 @@
 #include <array>
 #include <map>
 #include <sstream>
+#include <algorithm>
 
 namespace Nif
 {
@@ -181,18 +182,11 @@ void NIFFile::parse(Files::IStreamPtr stream)
         "NetImmerse File Format",
         "Gamebryo File Format"
     };
-    bool supported = false;
-    for (const std::string& verString : verStrings)
-    {
-        supported = (head.compare(0, verString.size(), verString) == 0);
-        if (supported)
-            break;
-    }
-    if (!supported)
+    const bool supportedHeader = std::any_of(verStrings.begin(), verStrings.end(),
+        [&] (const std::string& verString) { return head.compare(0, verString.size(), verString) == 0; });
+    if (!supportedHeader)
         fail("Invalid NIF header: " + head);
 
-    supported = false;
-
     // Get BCD version
     ver = nif.getUInt();
     // 4.0.0.0 is an older, practically identical version of the format.
@@ -202,13 +196,8 @@ void NIFFile::parse(Files::IStreamPtr stream)
         NIFStream::generateVersion(4,0,0,0),
         VER_MW
     };
-    for (uint32_t supportedVer : supportedVers)
-    {
-        supported = (ver == supportedVer);
-        if (supported)
-            break;
-    }
-    if (!supported)
+    const bool supportedVersion = std::find(supportedVers.begin(), supportedVers.end(), ver) != supportedVers.end();
+    if (!supportedVersion)
     {
         if (sLoadUnsupportedFiles)
             warn("Unsupported NIF version: " + printVersion(ver) + ". Proceed with caution!");
@@ -311,7 +300,7 @@ void NIFFile::parse(Files::IStreamPtr stream)
 
         r = entry->second();
 
-        if (!supported)
+        if (!supportedVersion)
             Log(Debug::Verbose) << "NIF Debug: Reading record of type " << rec << ", index " << i << " (" << filename << ")";
 
         assert(r != nullptr);

From 283b68025cf4cd532c86f08861b78af9d9ba9267 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 11 Feb 2022 21:36:08 +0100
Subject: [PATCH 2100/2859] Avoid possible race condition on
 NIFFile::sLoadUnsupportedFiles

Its value is written from the main thread but other threads read it.
---
 components/nif/niffile.cpp | 2 +-
 components/nif/niffile.hpp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index bf604f5adf..8b17680cf3 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -344,7 +344,7 @@ bool NIFFile::getUseSkinning() const
     return mUseSkinning;
 }
 
-bool NIFFile::sLoadUnsupportedFiles = false;
+std::atomic_bool NIFFile::sLoadUnsupportedFiles = false;
 
 void NIFFile::setLoadUnsupportedFiles(bool load)
 {
diff --git a/components/nif/niffile.hpp b/components/nif/niffile.hpp
index d9f46795c1..def2b8870d 100644
--- a/components/nif/niffile.hpp
+++ b/components/nif/niffile.hpp
@@ -5,6 +5,7 @@
 
 #include <stdexcept>
 #include <vector>
+#include <atomic>
 
 #include <components/debug/debuglog.hpp>
 #include <components/files/constrainedfilestream.hpp>
@@ -65,7 +66,7 @@ class NIFFile final : public File
 
     bool mUseSkinning = false;
 
-    static bool sLoadUnsupportedFiles;
+    static std::atomic_bool sLoadUnsupportedFiles;
 
     /// Parse the file
     void parse(Files::IStreamPtr stream);

From e1fe5010134550088a937b81d8eafbad720eb0da Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 11 Feb 2022 21:52:00 +0100
Subject: [PATCH 2101/2859] Use proper type for Record::recType

---
 components/nif/record.hpp       | 2 +-
 components/nifosg/nifloader.cpp | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/components/nif/record.hpp b/components/nif/record.hpp
index 937ce1d1e9..f18a639aae 100644
--- a/components/nif/record.hpp
+++ b/components/nif/record.hpp
@@ -149,7 +149,7 @@ enum RecordType
 struct Record
 {
     // Record type and type name
-    int recType{RC_MISSING};
+    RecordType recType{RC_MISSING};
     std::string recName;
     unsigned int recIndex{~0u};
 
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 206bbf2092..a543b7a67f 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -2122,6 +2122,8 @@ namespace NifOsg
                     specStrength = shaderprop->mSpecStrength;
                     break;
                 }
+                default:
+                    break;
                 }
             }
 

From 2a87cf1720b80197a78fac069aefc1f3ec694506 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 11 Feb 2022 22:08:13 +0100
Subject: [PATCH 2102/2859] Replace unordered_map by switch statement

Add handling for missing Nif::BSLightingShaderType::ShaderType_SkinTint. Use
string_view instead of string to avoid lifetime issues for returning value.
osg::Object::setUserValue will anyway copy string.
---
 components/nifosg/nifloader.cpp | 106 +++++++++++++++-----------------
 1 file changed, 49 insertions(+), 57 deletions(-)

diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index a543b7a67f..73bd2068fb 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -1,6 +1,7 @@
 #include "nifloader.hpp"
 
 #include <mutex>
+#include <string_view>
 
 #include <osg/Matrixf>
 #include <osg/Geometry>
@@ -1743,64 +1744,55 @@ namespace NifOsg
             }
         }
 
-        const std::string& getBSShaderPrefix(unsigned int type) const
+        std::string_view getBSShaderPrefix(unsigned int type) const
         {
-            static const std::unordered_map<Nif::BSShaderType, std::string> mapping =
-            {
-                {Nif::BSShaderType::ShaderType_TallGrass,    std::string()},
-                {Nif::BSShaderType::ShaderType_Default,       "nv_default"},
-                {Nif::BSShaderType::ShaderType_Sky,          std::string()},
-                {Nif::BSShaderType::ShaderType_Skin,         std::string()},
-                {Nif::BSShaderType::ShaderType_Water,        std::string()},
-                {Nif::BSShaderType::ShaderType_Lighting30,   std::string()},
-                {Nif::BSShaderType::ShaderType_Tile,         std::string()},
-                {Nif::BSShaderType::ShaderType_NoLighting, "nv_nolighting"},
-            };
-            auto prefix = mapping.find(static_cast<Nif::BSShaderType>(type));
-            if (prefix == mapping.end())
-                Log(Debug::Warning) << "Unknown BSShaderType " << type << " in " << mFilename;
-            else if (prefix->second.empty())
-                Log(Debug::Warning) << "Unhandled BSShaderType " << type << " in " << mFilename;
-            else
-                return prefix->second;
-
-            return mapping.at(Nif::BSShaderType::ShaderType_Default);
+            switch (static_cast<Nif::BSShaderType>(type))
+            {
+                case Nif::BSShaderType::ShaderType_Default: return "nv_default";
+                case Nif::BSShaderType::ShaderType_NoLighting: return "nv_nolighting";
+                case Nif::BSShaderType::ShaderType_TallGrass:
+                case Nif::BSShaderType::ShaderType_Sky:
+                case Nif::BSShaderType::ShaderType_Skin:
+                case Nif::BSShaderType::ShaderType_Water:
+                case Nif::BSShaderType::ShaderType_Lighting30:
+                case Nif::BSShaderType::ShaderType_Tile:
+                    Log(Debug::Warning) << "Unhandled BSShaderType " << type << " in " << mFilename;
+                    return std::string_view();
+            }
+            Log(Debug::Warning) << "Unknown BSShaderType " << type << " in " << mFilename;
+            return std::string_view();
         }
 
-        const std::string& getBSLightingShaderPrefix(unsigned int type) const
+        std::string_view getBSLightingShaderPrefix(unsigned int type) const
         {
-            static const std::unordered_map<Nif::BSLightingShaderType, std::string> mapping =
-            {
-                {Nif::BSLightingShaderType::ShaderType_Default,                "nv_default"},
-                {Nif::BSLightingShaderType::ShaderType_EnvMap,                std::string()},
-                {Nif::BSLightingShaderType::ShaderType_Glow,                  std::string()},
-                {Nif::BSLightingShaderType::ShaderType_Parallax,              std::string()},
-                {Nif::BSLightingShaderType::ShaderType_FaceTint,              std::string()},
-                {Nif::BSLightingShaderType::ShaderType_HairTint,              std::string()},
-                {Nif::BSLightingShaderType::ShaderType_ParallaxOcc,           std::string()},
-                {Nif::BSLightingShaderType::ShaderType_MultitexLand,          std::string()},
-                {Nif::BSLightingShaderType::ShaderType_LODLand,               std::string()},
-                {Nif::BSLightingShaderType::ShaderType_Snow,                  std::string()},
-                {Nif::BSLightingShaderType::ShaderType_MultiLayerParallax,    std::string()},
-                {Nif::BSLightingShaderType::ShaderType_TreeAnim,              std::string()},
-                {Nif::BSLightingShaderType::ShaderType_LODObjects,            std::string()},
-                {Nif::BSLightingShaderType::ShaderType_SparkleSnow,           std::string()},
-                {Nif::BSLightingShaderType::ShaderType_LODObjectsHD,          std::string()},
-                {Nif::BSLightingShaderType::ShaderType_EyeEnvmap,             std::string()},
-                {Nif::BSLightingShaderType::ShaderType_Cloud,                 std::string()},
-                {Nif::BSLightingShaderType::ShaderType_LODNoise,              std::string()},
-                {Nif::BSLightingShaderType::ShaderType_MultitexLandLODBlend,  std::string()},
-                {Nif::BSLightingShaderType::ShaderType_Dismemberment,         std::string()}
-            };
-            auto prefix = mapping.find(static_cast<Nif::BSLightingShaderType>(type));
-            if (prefix == mapping.end())
-                Log(Debug::Warning) << "Unknown BSLightingShaderType " << type << " in " << mFilename;
-            else if (prefix->second.empty())
-                Log(Debug::Warning) << "Unhandled BSLightingShaderType " << type << " in " << mFilename;
-            else
-                return prefix->second;
-
-            return mapping.at(Nif::BSLightingShaderType::ShaderType_Default);
+            switch (static_cast<Nif::BSLightingShaderType>(type))
+            {
+                case Nif::BSLightingShaderType::ShaderType_Default: return "nv_default";
+                case Nif::BSLightingShaderType::ShaderType_EnvMap:
+                case Nif::BSLightingShaderType::ShaderType_Glow:
+                case Nif::BSLightingShaderType::ShaderType_Parallax:
+                case Nif::BSLightingShaderType::ShaderType_FaceTint:
+                case Nif::BSLightingShaderType::ShaderType_SkinTint:
+                case Nif::BSLightingShaderType::ShaderType_HairTint:
+                case Nif::BSLightingShaderType::ShaderType_ParallaxOcc:
+                case Nif::BSLightingShaderType::ShaderType_MultitexLand:
+                case Nif::BSLightingShaderType::ShaderType_LODLand:
+                case Nif::BSLightingShaderType::ShaderType_Snow:
+                case Nif::BSLightingShaderType::ShaderType_MultiLayerParallax:
+                case Nif::BSLightingShaderType::ShaderType_TreeAnim:
+                case Nif::BSLightingShaderType::ShaderType_LODObjects:
+                case Nif::BSLightingShaderType::ShaderType_SparkleSnow:
+                case Nif::BSLightingShaderType::ShaderType_LODObjectsHD:
+                case Nif::BSLightingShaderType::ShaderType_EyeEnvmap:
+                case Nif::BSLightingShaderType::ShaderType_Cloud:
+                case Nif::BSLightingShaderType::ShaderType_LODNoise:
+                case Nif::BSLightingShaderType::ShaderType_MultitexLandLODBlend:
+                case Nif::BSLightingShaderType::ShaderType_Dismemberment:
+                    Log(Debug::Warning) << "Unhandled BSLightingShaderType " << type << " in " << mFilename;
+                    return std::string_view();
+            }
+            Log(Debug::Warning) << "Unknown BSLightingShaderType " << type << " in " << mFilename;
+            return std::string_view();
         }
 
         void handleProperty(const Nif::Property *property,
@@ -1895,7 +1887,7 @@ namespace NifOsg
             {
                 auto texprop = static_cast<const Nif::BSShaderPPLightingProperty*>(property);
                 bool shaderRequired = true;
-                node->setUserValue("shaderPrefix", getBSShaderPrefix(texprop->type));
+                node->setUserValue("shaderPrefix", std::string(getBSShaderPrefix(texprop->type)));
                 node->setUserValue("shaderRequired", shaderRequired);
                 osg::StateSet* stateset = node->getOrCreateStateSet();
                 if (!texprop->textureSet.empty())
@@ -1910,7 +1902,7 @@ namespace NifOsg
             {
                 auto texprop = static_cast<const Nif::BSShaderNoLightingProperty*>(property);
                 bool shaderRequired = true;
-                node->setUserValue("shaderPrefix", getBSShaderPrefix(texprop->type));
+                node->setUserValue("shaderPrefix", std::string(getBSShaderPrefix(texprop->type)));
                 node->setUserValue("shaderRequired", shaderRequired);
                 osg::StateSet* stateset = node->getOrCreateStateSet();
                 if (!texprop->filename.empty())
@@ -1952,7 +1944,7 @@ namespace NifOsg
             {
                 auto texprop = static_cast<const Nif::BSLightingShaderProperty*>(property);
                 bool shaderRequired = true;
-                node->setUserValue("shaderPrefix", getBSLightingShaderPrefix(texprop->type));
+                node->setUserValue("shaderPrefix", std::string(getBSLightingShaderPrefix(texprop->type)));
                 node->setUserValue("shaderRequired", shaderRequired);
                 osg::StateSet* stateset = node->getOrCreateStateSet();
                 if (!texprop->mTextureSet.empty())

From fdfde836fe58e127521ee5306e4e9c4f6f0c3259 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 12 Feb 2022 01:03:12 +0100
Subject: [PATCH 2103/2859] Expect recent saves to store the modified value

---
 apps/openmw/mwmechanics/stat.cpp     | 4 ++--
 apps/openmw/mwworld/magiceffects.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwmechanics/stat.cpp b/apps/openmw/mwmechanics/stat.cpp
index eacfca98ae..585808645a 100644
--- a/apps/openmw/mwmechanics/stat.cpp
+++ b/apps/openmw/mwmechanics/stat.cpp
@@ -21,13 +21,13 @@ namespace MWMechanics
     void Stat<T>::writeState (ESM::StatState<T>& state) const
     {
         state.mBase = mBase;
-        state.mMod = mModifier;
+        state.mMod = mModifier + mBase;
     }
     template<typename T>
     void Stat<T>::readState (const ESM::StatState<T>& state)
     {
         mBase = state.mBase;
-        mModifier = state.mMod;
+        mModifier = state.mMod - mBase;
     }
 
 
diff --git a/apps/openmw/mwworld/magiceffects.cpp b/apps/openmw/mwworld/magiceffects.cpp
index 1138a55238..f52a61af52 100644
--- a/apps/openmw/mwworld/magiceffects.cpp
+++ b/apps/openmw/mwworld/magiceffects.cpp
@@ -201,10 +201,10 @@ namespace MWWorld
         {
             auto& dynamic = creatureStats.mDynamic[i];
             dynamic.mCurrent -= dynamic.mMod - dynamic.mBase;
-            dynamic.mMod = 0.f;
+            dynamic.mMod = dynamic.mBase;
         }
         for(std::size_t i = 0; i < 4; ++i)
-            creatureStats.mAiSettings[i].mMod = 0.f;
+            creatureStats.mAiSettings[i].mMod = creatureStats.mAiSettings[i].mBase;
         if(npcStats)
         {
             for(std::size_t i = 0; i < ESM::Skill::Length; ++i)

From 68768517666a90c4a02e8a25b2a2b04ec1128b5d Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sat, 12 Feb 2022 11:59:39 +0100
Subject: [PATCH 2104/2859] Allow `require` to return not a table in Lua

---
 components/lua/luastate.cpp | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/components/lua/luastate.cpp b/components/lua/luastate.cpp
index bda39d270d..13e1421116 100644
--- a/components/lua/luastate.cpp
+++ b/components/lua/luastate.cpp
@@ -162,26 +162,27 @@ namespace LuaUtil
         std::string envName = namePrefix + "[" + path + "]:";
         env["print"] = mLua["printGen"](envName);
 
+        auto maybeRunLoader = [&hiddenData](const sol::object& package) -> sol::object
+        {
+            if (package.is<sol::function>())
+                return call(package.as<sol::function>(), hiddenData);
+            else
+                return package;
+        };
         sol::table loaded(mLua, sol::create);
         for (const auto& [key, value] : mCommonPackages)
-            loaded[key] = value;
+            loaded[key] = maybeRunLoader(value);
         for (const auto& [key, value] : packages)
-            loaded[key] = value;
-        env["require"] = [this, env, loaded, hiddenData](std::string_view packageName)
+            loaded[key] = maybeRunLoader(value);
+        env["require"] = [this, env, loaded, hiddenData](std::string_view packageName) mutable
         {
-            sol::table packages = loaded;
-            sol::object package = packages[packageName];
-            if (package == sol::nil)
-            {
-                sol::protected_function packageLoader = loadScriptAndCache(packageNameToVfsPath(packageName, mVFS));
-                sol::set_environment(env, packageLoader);
-                package = call(packageLoader, packageName);
-                if (!package.is<sol::table>())
-                    throw std::runtime_error("Lua package must return a table.");
-                packages[packageName] = package;
-            }
-            else if (package.is<sol::function>())
-                package = packages[packageName] = call(package.as<sol::protected_function>(), hiddenData);
+            sol::object package = loaded[packageName];
+            if (package != sol::nil)
+                return package;
+            sol::protected_function packageLoader = loadScriptAndCache(packageNameToVfsPath(packageName, mVFS));
+            sol::set_environment(env, packageLoader);
+            package = call(packageLoader, packageName);
+            loaded[packageName] = package;
             return package;
         };
 

From c382910c1fe6ef0d5bb301708e93a700b66a78ef Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 12 Feb 2022 13:25:27 +0100
Subject: [PATCH 2105/2859] Restart all quests with the same name when a quest
 is restarted

---
 CHANGELOG.md                          |  1 +
 apps/openmw/mwdialogue/journalimp.cpp | 13 +++++++++-
 apps/openmw/mwdialogue/quest.cpp      | 37 +++++++++++----------------
 apps/openmw/mwdialogue/quest.hpp      |  5 ++--
 apps/openmw/mwdialogue/topic.cpp      |  5 ++--
 apps/openmw/mwdialogue/topic.hpp      |  2 +-
 6 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b26d758847..2cc4fee33b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -273,6 +273,7 @@
     Bug #6142: Groundcover plugins change cells flags
     Bug #6276: Deleted groundcover instances are not deleted in game
     Bug #6294: Game crashes with empty pathgrid
+    Bug #6606: Quests with multiple IDs cannot always be restarted
     Feature #390: 3rd person look "over the shoulder"
     Feature #832: OpenMW-CS: Handle deleted references
     Feature #1536: Show more information about level on menu
diff --git a/apps/openmw/mwdialogue/journalimp.cpp b/apps/openmw/mwdialogue/journalimp.cpp
index 9f4c8c3689..41b30a95ce 100644
--- a/apps/openmw/mwdialogue/journalimp.cpp
+++ b/apps/openmw/mwdialogue/journalimp.cpp
@@ -7,6 +7,8 @@
 #include <components/esm3/queststate.hpp>
 #include <components/esm3/journalentry.hpp>
 
+#include <components/misc/stringops.hpp>
+
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/class.hpp"
 
@@ -93,7 +95,16 @@ namespace MWDialogue
         StampedJournalEntry entry = StampedJournalEntry::makeFromQuest (id, index, actor);
 
         Quest& quest = getQuest (id);
-        quest.addEntry (entry); // we are doing slicing on purpose here
+        if(quest.addEntry(entry)) // we are doing slicing on purpose here
+        {
+            // Restart all "other" quests with the same name as well
+            std::string name = quest.getName();
+            for(auto& it : mQuests)
+            {
+                if(it.second.isFinished() && Misc::StringUtils::ciEqual(it.second.getName(), name))
+                    it.second.setFinished(false);
+            }
+        }
 
         // there is no need to show empty entries in journal
         if (!entry.getText().empty())
diff --git a/apps/openmw/mwdialogue/quest.cpp b/apps/openmw/mwdialogue/quest.cpp
index 16e229ca7f..ce05676965 100644
--- a/apps/openmw/mwdialogue/quest.cpp
+++ b/apps/openmw/mwdialogue/quest.cpp
@@ -1,5 +1,7 @@
 #include "quest.hpp"
 
+#include <algorithm>
+
 #include <components/esm3/queststate.hpp>
 
 #include "../mwworld/esmstore.hpp"
@@ -50,42 +52,33 @@ namespace MWDialogue
         return mFinished;
     }
 
-    void Quest::addEntry (const JournalEntry& entry)
+    void Quest::setFinished(bool finished)
     {
-        int index = -1;
+        mFinished = finished;
+    }
 
+    bool Quest::addEntry (const JournalEntry& entry)
+    {
         const ESM::Dialogue *dialogue =
             MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>().find (entry.mTopic);
 
-        for (ESM::Dialogue::InfoContainer::const_iterator iter (dialogue->mInfo.begin());
-            iter!=dialogue->mInfo.end(); ++iter)
-            if (iter->mId == entry.mInfoId)
-            {
-                index = iter->mData.mJournalIndex;
-                break;
-            }
+        auto info = std::find_if(dialogue->mInfo.begin(), dialogue->mInfo.end(), [&](const auto& info) { return info.mId == entry.mInfoId; });
 
-        if (index==-1)
+        if (info == dialogue->mInfo.end() || info->mData.mJournalIndex == -1)
             throw std::runtime_error ("unknown journal entry for topic " + mTopic);
 
-        for (auto &info : dialogue->mInfo)
-        {
-            if (info.mData.mJournalIndex == index
-            && (info.mQuestStatus == ESM::DialInfo::QS_Finished || info.mQuestStatus == ESM::DialInfo::QS_Restart))
-            {
-                mFinished = (info.mQuestStatus == ESM::DialInfo::QS_Finished);
-                break;
-            }
-        }
+        if (info->mQuestStatus == ESM::DialInfo::QS_Finished || info->mQuestStatus == ESM::DialInfo::QS_Restart)
+            mFinished = info->mQuestStatus == ESM::DialInfo::QS_Finished;
 
-        if (index > mIndex)
-            mIndex = index;
+        if (info->mData.mJournalIndex > mIndex)
+            mIndex = info->mData.mJournalIndex;
 
         for (TEntryIter iter (mEntries.begin()); iter!=mEntries.end(); ++iter)
             if (iter->mInfoId==entry.mInfoId)
-                return;
+                return info->mQuestStatus == ESM::DialInfo::QS_Restart;
 
         mEntries.push_back (entry); // we want slicing here
+        return info->mQuestStatus == ESM::DialInfo::QS_Restart;
     }
 
     void Quest::write (ESM::QuestState& state) const
diff --git a/apps/openmw/mwdialogue/quest.hpp b/apps/openmw/mwdialogue/quest.hpp
index 712f94fae4..53b4d02f65 100644
--- a/apps/openmw/mwdialogue/quest.hpp
+++ b/apps/openmw/mwdialogue/quest.hpp
@@ -33,9 +33,10 @@ namespace MWDialogue
             ///< Calling this function with a non-existent index will throw an exception.
 
             bool isFinished() const;
+            void setFinished(bool finished);
 
-            void addEntry (const JournalEntry& entry) override;
-            ///< Add entry and adjust index accordingly.
+            bool addEntry (const JournalEntry& entry) override;
+            ///< Add entry and adjust index accordingly. Returns true if the quest should be restarted.
             ///
             /// \note Redundant entries are ignored, but the index is still adjusted.
 
diff --git a/apps/openmw/mwdialogue/topic.cpp b/apps/openmw/mwdialogue/topic.cpp
index eb7fbdc1de..9d56028184 100644
--- a/apps/openmw/mwdialogue/topic.cpp
+++ b/apps/openmw/mwdialogue/topic.cpp
@@ -18,7 +18,7 @@ namespace MWDialogue
     Topic::~Topic()
     {}
 
-    void Topic::addEntry (const JournalEntry& entry)
+    bool Topic::addEntry (const JournalEntry& entry)
     {
         if (entry.mTopic!=mTopic)
             throw std::runtime_error ("topic does not match: " + mTopic);
@@ -27,10 +27,11 @@ namespace MWDialogue
         for (Topic::TEntryIter it = mEntries.begin(); it != mEntries.end(); ++it)
         {
             if (it->mInfoId == entry.mInfoId)
-                return;
+                return false;
         }
 
         mEntries.push_back (entry); // we want slicing here
+        return false;
     }
 
     void Topic::insertEntry (const ESM::JournalEntry& entry)
diff --git a/apps/openmw/mwdialogue/topic.hpp b/apps/openmw/mwdialogue/topic.hpp
index 72486ef8af..12df484aa7 100644
--- a/apps/openmw/mwdialogue/topic.hpp
+++ b/apps/openmw/mwdialogue/topic.hpp
@@ -35,7 +35,7 @@ namespace MWDialogue
 
             virtual ~Topic();
 
-            virtual void addEntry (const JournalEntry& entry);
+            virtual bool addEntry (const JournalEntry& entry);
             ///< Add entry
             ///
             /// \note Redundant entries are ignored.

From c9c7fb7e49aa65b65005c6e9280b3e8cadf52b25 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 12 Feb 2022 11:52:52 +0100
Subject: [PATCH 2106/2859] Remove redundant functions from Utf8Encoder
 interface

---
 components/esm3/esmreader.cpp  |  2 +-
 components/to_utf8/to_utf8.cpp | 30 ++++++++++++++++++------------
 components/to_utf8/to_utf8.hpp | 15 ++++-----------
 3 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/components/esm3/esmreader.cpp b/components/esm3/esmreader.cpp
index a10eba2378..667132c60f 100644
--- a/components/esm3/esmreader.cpp
+++ b/components/esm3/esmreader.cpp
@@ -320,7 +320,7 @@ std::string ESMReader::getString(int size)
 
     // Convert to UTF8 and return
     if (mEncoder)
-        return mEncoder->getUtf8(ptr, size);
+        return mEncoder->getUtf8(std::string_view(ptr, size));
 
     return std::string (ptr, size);
 }
diff --git a/components/to_utf8/to_utf8.cpp b/components/to_utf8/to_utf8.cpp
index f7dc33fcbf..3c4421c605 100644
--- a/components/to_utf8/to_utf8.cpp
+++ b/components/to_utf8/to_utf8.cpp
@@ -77,12 +77,15 @@ Utf8Encoder::Utf8Encoder(const FromType sourceEncoding):
     }
 }
 
-std::string Utf8Encoder::getUtf8(const char* input, size_t size)
+std::string Utf8Encoder::getUtf8(std::string_view input)
 {
+    if (input.empty())
+        return input;
+
     // Double check that the input string stops at some point (it might
     // contain zero terminators before this, inside its own data, which
     // is also ok.)
-    assert(input[size] == 0);
+    assert(input[input.size()] == 0);
 
     // Note: The rest of this function is designed for single-character
     // input encodings only. It also assumes that the input encoding
@@ -93,19 +96,19 @@ std::string Utf8Encoder::getUtf8(const char* input, size_t size)
     // Compute output length, and check for pure ascii input at the same
     // time.
     bool ascii;
-    size_t outlen = getLength(input, ascii);
+    size_t outlen = getLength(input.data(), ascii);
 
     // If we're pure ascii, then don't bother converting anything.
     if(ascii)
-        return std::string(input, outlen);
+        return std::string(input.data(), outlen);
 
     // Make sure the output is large enough
     resize(outlen);
     char *out = &mOutput[0];
 
     // Translate
-    while (*input)
-        copyFromArray(*(input++), out);
+    for (const char* ptr = input.data(); *ptr;)
+        copyFromArray(*(ptr++), out);
 
     // Make sure that we wrote the correct number of bytes
     assert((out-&mOutput[0]) == (int)outlen);
@@ -118,12 +121,15 @@ std::string Utf8Encoder::getUtf8(const char* input, size_t size)
     return std::string(&mOutput[0], outlen);
 }
 
-std::string Utf8Encoder::getLegacyEnc(const char *input, size_t size)
+std::string Utf8Encoder::getLegacyEnc(std::string_view input)
 {
+    if (input.empty())
+        return input;
+
     // Double check that the input string stops at some point (it might
     // contain zero terminators before this, inside its own data, which
     // is also ok.)
-    assert(input[size] == 0);
+    assert(input[input.size()] == 0);
 
     // TODO: The rest of this function is designed for single-character
     // input encodings only. It also assumes that the input the input
@@ -134,19 +140,19 @@ std::string Utf8Encoder::getLegacyEnc(const char *input, size_t size)
     // Compute output length, and check for pure ascii input at the same
     // time.
     bool ascii;
-    size_t outlen = getLength2(input, ascii);
+    size_t outlen = getLength2(input.data(), ascii);
 
     // If we're pure ascii, then don't bother converting anything.
     if(ascii)
-        return std::string(input, outlen);
+        return std::string(input.data(), outlen);
 
     // Make sure the output is large enough
     resize(outlen);
     char *out = &mOutput[0];
 
     // Translate
-    while(*input)
-        copyFromArray2(input, out);
+    for (const char* ptr = input.data(); *ptr;)
+        copyFromArray2(ptr, out);
 
     // Make sure that we wrote the correct number of bytes
     assert((out-&mOutput[0]) == (int)outlen);
diff --git a/components/to_utf8/to_utf8.hpp b/components/to_utf8/to_utf8.hpp
index d8c9f09d5d..07960ae3f9 100644
--- a/components/to_utf8/to_utf8.hpp
+++ b/components/to_utf8/to_utf8.hpp
@@ -4,6 +4,7 @@
 #include <string>
 #include <cstring>
 #include <vector>
+#include <string_view>
 
 namespace ToUTF8
 {
@@ -28,17 +29,9 @@ namespace ToUTF8
             Utf8Encoder(FromType sourceEncoding);
 
             // Convert to UTF8 from the previously given code page.
-            std::string getUtf8(const char *input, size_t size);
-            inline std::string getUtf8(const std::string &str)
-            {
-                return getUtf8(str.c_str(), str.size());
-            }
-
-            std::string getLegacyEnc(const char *input, size_t size);
-            inline std::string getLegacyEnc(const std::string &str)
-            {
-                return getLegacyEnc(str.c_str(), str.size());
-            }
+            std::string getUtf8(std::string_view input);
+
+            std::string getLegacyEnc(std::string_view input);
 
         private:
             void resize(size_t size);

From 4502569660d0f1a8bc0aebb89fdf3cd2c7a80a38 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sat, 12 Feb 2022 18:31:52 +0300
Subject: [PATCH 2107/2859] Clarify stretch menu background documentation
 (#5880)

---
 docs/source/reference/modding/settings/GUI.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/reference/modding/settings/GUI.rst b/docs/source/reference/modding/settings/GUI.rst
index 00f99e47bc..91d2e67d6c 100644
--- a/docs/source/reference/modding/settings/GUI.rst
+++ b/docs/source/reference/modding/settings/GUI.rst
@@ -70,7 +70,7 @@ stretch menu background
 Stretch or shrink the main menu screen, loading splash screens, introductory movie,
 and cut scenes to fill the specified video resolution, distorting their aspect ratio.
 The Bethesda provided assets have a 4:3 aspect ratio, but other assets are permitted to have other aspect ratios.
-If this setting is false, the assets will be centered in their correct aspect ratio,
+If this setting is false, the assets will be centered in the mentioned 4:3 aspect ratio,
 with black bars filling the remainder of the screen.
 
 This setting can be configured in the Interface section of Advanced tab of the launcher.

From c75e938c46a660253a6dd76c3545f82ce40f8eb9 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 12 Feb 2022 12:00:35 +0100
Subject: [PATCH 2108/2859] Return string_view from Utf8Encoder functions

To avoid redundant std::string constructions.
---
 components/esm3/esmreader.cpp        |  2 +-
 components/esm3/esmwriter.cpp        |  4 ++--
 components/fontloader/fontloader.cpp | 21 ++++++++++++++-------
 components/to_utf8/to_utf8.cpp       | 14 ++++++--------
 components/to_utf8/to_utf8.hpp       | 12 ++++++++----
 5 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/components/esm3/esmreader.cpp b/components/esm3/esmreader.cpp
index 667132c60f..165263d6e4 100644
--- a/components/esm3/esmreader.cpp
+++ b/components/esm3/esmreader.cpp
@@ -320,7 +320,7 @@ std::string ESMReader::getString(int size)
 
     // Convert to UTF8 and return
     if (mEncoder)
-        return mEncoder->getUtf8(std::string_view(ptr, size));
+        return std::string(mEncoder->getUtf8(std::string_view(ptr, size)));
 
     return std::string (ptr, size);
 }
diff --git a/components/esm3/esmwriter.cpp b/components/esm3/esmwriter.cpp
index f65340f703..d0137c5131 100644
--- a/components/esm3/esmwriter.cpp
+++ b/components/esm3/esmwriter.cpp
@@ -193,9 +193,9 @@ namespace ESM
         else
         {
             // Convert to UTF8 and return
-            std::string string = mEncoder ? mEncoder->getLegacyEnc(data) : data;
+            const std::string_view string = mEncoder != nullptr ? mEncoder->getLegacyEnc(data) : data;
 
-            write(string.c_str(), string.size());
+            write(string.data(), string.size());
         }
     }
 
diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index 76f554bec7..36174d0b7e 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -1,6 +1,8 @@
 #include "fontloader.hpp"
 
 #include <stdexcept>
+#include <string_view>
+#include <array>
 
 #include <osg/Image>
 
@@ -26,7 +28,7 @@
 
 namespace
 {
-    unsigned long utf8ToUnicode(const std::string& utf8)
+    unsigned long utf8ToUnicode(std::string_view utf8)
     {
         size_t i = 0;
         unsigned long unicode;
@@ -116,16 +118,21 @@ namespace
         }
     }
 
-    // getUtf8, aka the worst function ever written.
-    // This includes various hacks for dealing with Morrowind's .fnt files that are *mostly*
+    // getUnicode includes various hacks for dealing with Morrowind's .fnt files that are *mostly*
     // in the expected win12XX encoding, but also have randomly swapped characters sometimes.
     // Looks like the Morrowind developers found standard encodings too boring and threw in some twists for fun.
-    std::string getUtf8 (unsigned char c, ToUTF8::Utf8Encoder& encoder, ToUTF8::FromType encoding)
+    unsigned long getUnicode(unsigned char c, ToUTF8::Utf8Encoder& encoder, ToUTF8::FromType encoding)
     {
         if (encoding == ToUTF8::WINDOWS_1250) // Hack for polish font
-            return encoder.getUtf8(std::string(1, mapUtf8Char(c)));
+        {
+            const std::array<char, 2> str {static_cast<char>(mapUtf8Char(c)), '\0'};
+            return utf8ToUnicode(encoder.getUtf8(std::string_view(str.data(), 1)));
+        }
         else
-            return encoder.getUtf8(std::string(1, c));
+        {
+            const std::array<char, 2> str {static_cast<char>(c), '\0'};
+            return utf8ToUnicode(encoder.getUtf8(std::string_view(str.data(), 1)));
+        }
     }
 
     [[noreturn]] void fail (Files::IStreamPtr file, const std::string& fileName, const std::string& message)
@@ -355,7 +362,7 @@ namespace Gui
             float h  = data[i].bottom_left.y*height - y1;
 
             ToUTF8::Utf8Encoder encoder(mEncoding);
-            unsigned long unicodeVal = utf8ToUnicode(getUtf8(i, encoder, mEncoding));
+            unsigned long unicodeVal = getUnicode(i, encoder, mEncoding);
 
             MyGUI::xml::ElementPtr code = codes->createChild("Code");
             code->addAttribute("index", unicodeVal);
diff --git a/components/to_utf8/to_utf8.cpp b/components/to_utf8/to_utf8.cpp
index 3c4421c605..7fd0e3cd88 100644
--- a/components/to_utf8/to_utf8.cpp
+++ b/components/to_utf8/to_utf8.cpp
@@ -77,7 +77,7 @@ Utf8Encoder::Utf8Encoder(const FromType sourceEncoding):
     }
 }
 
-std::string Utf8Encoder::getUtf8(std::string_view input)
+std::string_view Utf8Encoder::getUtf8(std::string_view input)
 {
     if (input.empty())
         return input;
@@ -100,7 +100,7 @@ std::string Utf8Encoder::getUtf8(std::string_view input)
 
     // If we're pure ascii, then don't bother converting anything.
     if(ascii)
-        return std::string(input.data(), outlen);
+        return std::string_view(input.data(), outlen);
 
     // Make sure the output is large enough
     resize(outlen);
@@ -117,11 +117,10 @@ std::string Utf8Encoder::getUtf8(std::string_view input)
     assert(mOutput.size() > outlen);
     assert(mOutput[outlen] == 0);
 
-    // Return a string
-    return std::string(&mOutput[0], outlen);
+    return std::string_view(mOutput.data(), outlen);
 }
 
-std::string Utf8Encoder::getLegacyEnc(std::string_view input)
+std::string_view Utf8Encoder::getLegacyEnc(std::string_view input)
 {
     if (input.empty())
         return input;
@@ -144,7 +143,7 @@ std::string Utf8Encoder::getLegacyEnc(std::string_view input)
 
     // If we're pure ascii, then don't bother converting anything.
     if(ascii)
-        return std::string(input.data(), outlen);
+        return std::string_view(input.data(), outlen);
 
     // Make sure the output is large enough
     resize(outlen);
@@ -161,8 +160,7 @@ std::string Utf8Encoder::getLegacyEnc(std::string_view input)
     assert(mOutput.size() > outlen);
     assert(mOutput[outlen] == 0);
 
-    // Return a string
-    return std::string(&mOutput[0], outlen);
+    return std::string_view(mOutput.data(), outlen);
 }
 
 // Make sure the output vector is large enough for 'size' bytes,
diff --git a/components/to_utf8/to_utf8.hpp b/components/to_utf8/to_utf8.hpp
index 07960ae3f9..0e9db01e1d 100644
--- a/components/to_utf8/to_utf8.hpp
+++ b/components/to_utf8/to_utf8.hpp
@@ -28,10 +28,14 @@ namespace ToUTF8
         public:
             Utf8Encoder(FromType sourceEncoding);
 
-            // Convert to UTF8 from the previously given code page.
-            std::string getUtf8(std::string_view input);
-
-            std::string getLegacyEnc(std::string_view input);
+            /// Convert to UTF8 from the previously given code page.
+            /// Returns a view to internal buffer invalidate by next getUtf8 or getLegacyEnc call if input is not
+            /// ASCII-only string. Otherwise returns a view to the input.
+            std::string_view getUtf8(std::string_view input);
+
+            /// Returns a view to internal buffer invalidate by next getUtf8 or getLegacyEnc call if input is not
+            /// ASCII-only string. Otherwise returns a view to the input.
+            std::string_view getLegacyEnc(std::string_view input);
 
         private:
             void resize(size_t size);

From 367bdcf0cc5678951b35953d4b8d2722020ab362 Mon Sep 17 00:00:00 2001
From: Matt <3397065-ZehMatt@users.noreply.gitlab.com>
Date: Sat, 12 Feb 2022 23:50:41 +0000
Subject: [PATCH 2109/2859] #6091: Optimize isInCombat

---
 apps/openmw/mwlua/localscripts.cpp            |  13 +-
 apps/openmw/mwmechanics/actors.cpp            |  21 +-
 apps/openmw/mwmechanics/aisequence.cpp        | 258 ++++++++++--------
 apps/openmw/mwmechanics/aisequence.hpp        |  56 +++-
 .../mwmechanics/mechanicsmanagerimp.cpp       |   8 +-
 apps/openmw/mwmechanics/spelleffects.cpp      |   4 +-
 6 files changed, 209 insertions(+), 151 deletions(-)

diff --git a/apps/openmw/mwlua/localscripts.cpp b/apps/openmw/mwlua/localscripts.cpp
index 552ce77541..c95eae43a7 100644
--- a/apps/openmw/mwlua/localscripts.cpp
+++ b/apps/openmw/mwlua/localscripts.cpp
@@ -113,15 +113,12 @@ namespace MWLua
         {
             const MWWorld::Ptr& ptr = self.ptr();
             MWMechanics::AiSequence& ai = ptr.getClass().getCreatureStats(ptr).getAiSequence();
-            std::list<std::shared_ptr<AiPackage>>& list = ai.getUnderlyingList();
-            for (auto it = list.begin(); it != list.end();)
+
+            ai.erasePackagesIf([&](auto& entry)
             {
-                bool keep = LuaUtil::call(callback, *it).get<bool>();
-                if (keep)
-                    ++it;
-                else
-                    it = list.erase(it);
-            }
+                bool keep = LuaUtil::call(callback, entry).template get<bool>();
+                return !keep;
+            });
         };
         selfAPI["_startAiCombat"] = [](SelfObject& self, const LObject& target)
         {
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 2f447e12d6..b6275070e0 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -73,23 +73,20 @@ bool isCommanded(const MWWorld::Ptr& actor)
 // Check for command effects having ended and remove package if necessary
 void adjustCommandedActor (const MWWorld::Ptr& actor)
 {
-    MWMechanics::CreatureStats& stats = actor.getClass().getCreatureStats(actor);
+    if (!isCommanded(actor))
+        return;
 
-    bool hasCommandPackage = false;
+    MWMechanics::CreatureStats& stats = actor.getClass().getCreatureStats(actor);
 
-    auto it = stats.getAiSequence().begin();
-    for (; it != stats.getAiSequence().end(); ++it)
+    stats.getAiSequence().erasePackageIf([](auto& entry)
     {
-        if ((*it)->getTypeId() == MWMechanics::AiPackageTypeId::Follow &&
-                static_cast<const MWMechanics::AiFollow*>(it->get())->isCommanded())
+        if (entry->getTypeId() == MWMechanics::AiPackageTypeId::Follow &&
+            static_cast<const MWMechanics::AiFollow*>(entry.get())->isCommanded())
         {
-            hasCommandPackage = true;
-            break;
+            return true;
         }
-    }
-
-    if (!isCommanded(actor) && hasCommandPackage)
-        stats.getAiSequence().erase(it);
+        return false;
+    });
 }
 
 void getRestorationPerHourOfSleep (const MWWorld::Ptr& ptr, float& health, float& magicka)
diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index 86bc714964..a1f2b5c3e3 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -1,6 +1,7 @@
 #include "aisequence.hpp"
 
 #include <limits>
+#include <algorithm>
 
 #include <components/debug/debuglog.hpp>
 #include <components/esm3/aisequence.hpp>
@@ -29,6 +30,9 @@ void AiSequence::copy (const AiSequence& sequence)
     // We need to keep an AiWander storage, if present - it has a state machine.
     // Not sure about another temporary storages
     sequence.mAiState.copy<AiWanderStorage>(mAiState);
+
+    mNumCombatPackages = sequence.mNumCombatPackages;
+    mNumPursuitPackages = sequence.mNumPursuitPackages;
 }
 
 AiSequence::AiSequence() : mDone (false), mLastAiPackage(AiPackageTypeId::None) {}
@@ -58,6 +62,28 @@ AiSequence::~AiSequence()
     clear();
 }
 
+void AiSequence::onPackageAdded(const AiPackage& package)
+{
+    if (package.getTypeId() == AiPackageTypeId::Combat)
+        mNumCombatPackages++;
+    else if (package.getTypeId() == AiPackageTypeId::Pursue)
+        mNumPursuitPackages++;
+
+    assert(mNumCombatPackages >= 0);
+    assert(mNumPursuitPackages >= 0);
+}
+
+void AiSequence::onPackageRemoved(const AiPackage& package)
+{
+    if (package.getTypeId() == AiPackageTypeId::Combat)
+        mNumCombatPackages--;
+    else if (package.getTypeId() == AiPackageTypeId::Pursue)
+        mNumPursuitPackages--;
+
+    assert(mNumCombatPackages >= 0);
+    assert(mNumPursuitPackages >= 0);
+}
+
 AiPackageTypeId AiSequence::getTypeId() const
 {
     if (mPackages.empty())
@@ -87,32 +113,30 @@ bool AiSequence::getCombatTargets(std::vector<MWWorld::Ptr> &targetActors) const
     return !targetActors.empty();
 }
 
-void AiSequence::erase(std::list<std::shared_ptr<AiPackage>>::const_iterator package)
+AiPackages::iterator AiSequence::erase(AiPackages::iterator package)
 {
     // Not sure if manually terminated packages should trigger mDone, probably not?
-    for(auto it = mPackages.begin(); it != mPackages.end(); ++it)
-    {
-        if (package == it)
-        {
-            mPackages.erase(it);
-            return;
-        }
-    }
-    throw std::runtime_error("can't find package to erase");
+    auto& ptr = *package;
+    onPackageRemoved(*ptr);
+
+    return mPackages.erase(package);
 }
 
 bool AiSequence::isInCombat() const
 {
-    for (auto it = mPackages.begin(); it != mPackages.end(); ++it)
-    {
-        if ((*it)->getTypeId() == AiPackageTypeId::Combat)
-            return true;
-    }
-    return false;
+    return mNumCombatPackages > 0;
+}
+
+bool AiSequence::isInPursuit() const
+{
+    return mNumPursuitPackages > 0;
 }
 
 bool AiSequence::isEngagedWithActor() const
 {
+    if (!isInCombat())
+        return false;
+
     for (auto it = mPackages.begin(); it != mPackages.end(); ++it)
     {
         if ((*it)->getTypeId() == AiPackageTypeId::Combat)
@@ -127,16 +151,18 @@ bool AiSequence::isEngagedWithActor() const
 
 bool AiSequence::hasPackage(AiPackageTypeId typeId) const
 {
-    for (auto it = mPackages.begin(); it != mPackages.end(); ++it)
+    auto it = std::find_if(mPackages.begin(), mPackages.end(), [typeId](const auto& package)
     {
-        if ((*it)->getTypeId() == typeId)
-            return true;
-    }
-    return false;
+        return package->getTypeId() == typeId;
+    });
+    return it != mPackages.end();
 }
 
 bool AiSequence::isInCombat(const MWWorld::Ptr &actor) const
 {
+    if (!isInCombat())
+        return false;
+
     for (auto it = mPackages.begin(); it != mPackages.end(); ++it)
     {
         if ((*it)->getTypeId() == AiPackageTypeId::Combat)
@@ -148,27 +174,31 @@ bool AiSequence::isInCombat(const MWWorld::Ptr &actor) const
     return false;
 }
 
-// TODO: use std::list::remove_if for all these methods when we switch to C++20
-void AiSequence::stopCombat()
+void AiSequence::removePackagesById(AiPackageTypeId id)
 {
-    for(auto it = mPackages.begin(); it != mPackages.end(); )
+    for (auto it = mPackages.begin(); it != mPackages.end(); )
     {
-        if ((*it)->getTypeId() == AiPackageTypeId::Combat)
+        if ((*it)->getTypeId() == id)
         {
-            it = mPackages.erase(it);
+            it = erase(it);
         }
         else
             ++it;
     }
 }
 
+void AiSequence::stopCombat()
+{
+    removePackagesById(AiPackageTypeId::Combat);
+}
+
 void AiSequence::stopCombat(const std::vector<MWWorld::Ptr>& targets)
 {
     for(auto it = mPackages.begin(); it != mPackages.end(); )
     {
         if ((*it)->getTypeId() == AiPackageTypeId::Combat && std::find(targets.begin(), targets.end(), (*it)->getTarget()) != targets.end())
         {
-            it = mPackages.erase(it);
+            it = erase(it);
         }
         else
             ++it;
@@ -177,15 +207,7 @@ void AiSequence::stopCombat(const std::vector<MWWorld::Ptr>& targets)
 
 void AiSequence::stopPursuit()
 {
-    for(auto it = mPackages.begin(); it != mPackages.end(); )
-    {
-        if ((*it)->getTypeId() == AiPackageTypeId::Pursue)
-        {
-            it = mPackages.erase(it);
-        }
-        else
-            ++it;
-    }
+    removePackagesById(AiPackageTypeId::Pursue);
 }
 
 bool AiSequence::isPackageDone() const
@@ -204,112 +226,117 @@ namespace
 
 void AiSequence::execute (const MWWorld::Ptr& actor, CharacterController& characterController, float duration, bool outOfRange)
 {
-    if(actor != getPlayer())
+    if (actor == getPlayer())
     {
-        if (mPackages.empty())
-        {
-            mLastAiPackage = AiPackageTypeId::None;
-            return;
-        }
+        // Players don't use this.
+        return;
+    }
 
-        auto packageIt = mPackages.begin();
-        MWMechanics::AiPackage* package = packageIt->get();
-        if (!package->alwaysActive() && outOfRange)
-            return;
+    if (mPackages.empty())
+    {
+        mLastAiPackage = AiPackageTypeId::None;
+        return;
+    }
 
-        auto packageTypeId = package->getTypeId();
-        // workaround ai packages not being handled as in the vanilla engine
-        if (isActualAiPackage(packageTypeId))
-            mLastAiPackage = packageTypeId;
-        // if active package is combat one, choose nearest target
-        if (packageTypeId == AiPackageTypeId::Combat)
-        {
-            auto itActualCombat = mPackages.end();
+    auto packageIt = mPackages.begin();
+    MWMechanics::AiPackage* package = packageIt->get();
+    if (!package->alwaysActive() && outOfRange)
+        return;
+
+    auto packageTypeId = package->getTypeId();
+    // workaround ai packages not being handled as in the vanilla engine
+    if (isActualAiPackage(packageTypeId))
+        mLastAiPackage = packageTypeId;
+    // if active package is combat one, choose nearest target
+    if (packageTypeId == AiPackageTypeId::Combat)
+    {
+        auto itActualCombat = mPackages.end();
 
-            float nearestDist = std::numeric_limits<float>::max();
-            osg::Vec3f vActorPos = actor.getRefData().getPosition().asVec3();
+        float nearestDist = std::numeric_limits<float>::max();
+        osg::Vec3f vActorPos = actor.getRefData().getPosition().asVec3();
 
-            float bestRating = 0.f;
+        float bestRating = 0.f;
 
-            for (auto it = mPackages.begin(); it != mPackages.end();)
-            {
-                if ((*it)->getTypeId() != AiPackageTypeId::Combat) break;
+        for (auto it = mPackages.begin(); it != mPackages.end();)
+        {
+            if ((*it)->getTypeId() != AiPackageTypeId::Combat) break;
 
-                MWWorld::Ptr target = (*it)->getTarget();
+            MWWorld::Ptr target = (*it)->getTarget();
 
-                // target disappeared (e.g. summoned creatures)
-                if (target.isEmpty())
-                {
-                    it = mPackages.erase(it);
-                }
-                else
-                {
-                    float rating = MWMechanics::getBestActionRating(actor, target);
+            // target disappeared (e.g. summoned creatures)
+            if (target.isEmpty())
+            {
+                it = erase(it);
+            }
+            else
+            {
+                float rating = MWMechanics::getBestActionRating(actor, target);
 
-                    const ESM::Position &targetPos = target.getRefData().getPosition();
+                const ESM::Position &targetPos = target.getRefData().getPosition();
 
-                    float distTo = (targetPos.asVec3() - vActorPos).length2();
+                float distTo = (targetPos.asVec3() - vActorPos).length2();
 
-                    // Small threshold for changing target
-                    if (it == mPackages.begin())
-                        distTo = std::max(0.f, distTo - 2500.f);
+                // Small threshold for changing target
+                if (it == mPackages.begin())
+                    distTo = std::max(0.f, distTo - 2500.f);
 
-                    // if a target has higher priority than current target or has same priority but closer
-                    if (rating > bestRating || ((distTo < nearestDist) && rating == bestRating))
-                    {
-                        nearestDist = distTo;
-                        itActualCombat = it;
-                        bestRating = rating;
-                    }
-                    ++it;
+                // if a target has higher priority than current target or has same priority but closer
+                if (rating > bestRating || ((distTo < nearestDist) && rating == bestRating))
+                {
+                    nearestDist = distTo;
+                    itActualCombat = it;
+                    bestRating = rating;
                 }
+                ++it;
             }
+        }
 
-            assert(!mPackages.empty());
+        assert(!mPackages.empty());
 
-            if (nearestDist < std::numeric_limits<float>::max() && mPackages.begin() != itActualCombat)
-            {
-                assert(itActualCombat != mPackages.end());
-                // move combat package with nearest target to the front
-                mPackages.splice(mPackages.begin(), mPackages, itActualCombat);
-            }
-
-            packageIt = mPackages.begin();
-            package = packageIt->get();
-            packageTypeId = package->getTypeId();
+        if (nearestDist < std::numeric_limits<float>::max() && mPackages.begin() != itActualCombat)
+        {
+            assert(itActualCombat != mPackages.end());
+            // move combat package with nearest target to the front
+            std::rotate(mPackages.begin(), itActualCombat, std::next(itActualCombat));
         }
 
-        try
+        packageIt = mPackages.begin();
+        package = packageIt->get();
+        packageTypeId = package->getTypeId();
+    }
+
+    try
+    {
+        if (package->execute(actor, characterController, mAiState, duration))
         {
-            if (package->execute(actor, characterController, mAiState, duration))
-            {
-                // Put repeating noncombat AI packages on the end of the stack so they can be used again
-                if (isActualAiPackage(packageTypeId) && package->getRepeat())
-                {
-                    package->reset();
-                    mPackages.push_back(package->clone());
-                }
-                // To account for the rare case where AiPackage::execute() queued another AI package
-                // (e.g. AiPursue executing a dialogue script that uses startCombat)
-                mPackages.erase(packageIt);
-                if (isActualAiPackage(packageTypeId))
-                    mDone = true;
-            }
-            else
+            // Put repeating noncombat AI packages on the end of the stack so they can be used again
+            if (isActualAiPackage(packageTypeId) && package->getRepeat())
             {
-                mDone = false;
+                package->reset();
+                mPackages.push_back(package->clone());
             }
+            // To account for the rare case where AiPackage::execute() queued another AI package
+            // (e.g. AiPursue executing a dialogue script that uses startCombat)
+            erase(packageIt);
+            if (isActualAiPackage(packageTypeId))
+                mDone = true;
         }
-        catch (std::exception& e)
+        else
         {
-            Log(Debug::Error) << "Error during AiSequence::execute: " << e.what();
+            mDone = false;
         }
     }
+    catch (std::exception& e)
+    {
+        Log(Debug::Error) << "Error during AiSequence::execute: " << e.what();
+    }
 }
 
 void AiSequence::clear()
 {
     mPackages.clear();
+    mNumCombatPackages = 0;
+    mNumPursuitPackages = 0;
 }
 
 void AiSequence::stack (const AiPackage& package, const MWWorld::Ptr& actor, bool cancelOther)
@@ -353,7 +380,7 @@ void AiSequence::stack (const AiPackage& package, const MWWorld::Ptr& actor, boo
         {
             if((*it)->canCancel())
             {
-                it = mPackages.erase(it);
+                it = erase(it);
             }
             else
                 ++it;
@@ -373,11 +400,13 @@ void AiSequence::stack (const AiPackage& package, const MWWorld::Ptr& actor, boo
 
         if((*it)->getPriority() <= package.getPriority())
         {
+            onPackageAdded(package);
             mPackages.insert(it, package.clone());
             return;
         }
     }
 
+    onPackageAdded(package);
     mPackages.push_back(package.clone());
 
     // Make sure that temporary storage is empty
@@ -435,6 +464,8 @@ void AiSequence::fill(const ESM::AIPackageList &list)
             ESM::AITarget data = esmPackage.mTarget;
             package = std::make_unique<MWMechanics::AiFollow>(data.mId.toStringView(), data.mDuration, data.mX, data.mY, data.mZ, data.mShouldRepeat != 0);
         }
+
+        onPackageAdded(*package);
         mPackages.push_back(std::move(package));
     }
 }
@@ -504,6 +535,7 @@ void AiSequence::readState(const ESM::AiSequence::AiSequence &sequence)
         if (!package.get())
             continue;
 
+        onPackageAdded(*package);
         mPackages.push_back(std::move(package));
     }
 
diff --git a/apps/openmw/mwmechanics/aisequence.hpp b/apps/openmw/mwmechanics/aisequence.hpp
index 6cbfcf045d..0d23207b63 100644
--- a/apps/openmw/mwmechanics/aisequence.hpp
+++ b/apps/openmw/mwmechanics/aisequence.hpp
@@ -1,8 +1,9 @@
 #ifndef GAME_MWMECHANICS_AISEQUENCE_H
 #define GAME_MWMECHANICS_AISEQUENCE_H
 
-#include <list>
 #include <memory>
+#include <vector>
+#include <algorithm>
 
 #include "aistate.hpp"
 #include "aipackagetypeid.hpp"
@@ -22,8 +23,6 @@ namespace ESM
     }
 }
 
-
-
 namespace MWMechanics
 {
     class AiPackage;
@@ -33,15 +32,20 @@ namespace MWMechanics
     struct AiTemporaryBase;
     typedef DerivedClassStorage<AiTemporaryBase> AiState;
 
+    using AiPackages = std::vector<std::shared_ptr<AiPackage>>;
+
     /// \brief Sequence of AI-packages for a single actor
     /** The top-most AI package is run each frame. When completed, it is removed from the stack. **/
     class AiSequence
     {
             ///AiPackages to run though
-            std::list<std::shared_ptr<AiPackage>> mPackages;
+            AiPackages mPackages;
 
             ///Finished with top AIPackage, set for one frame
-            bool mDone;
+            bool mDone{};
+
+            int mNumCombatPackages{};
+            int mNumPursuitPackages{};
 
             ///Copy AiSequence
             void copy (const AiSequence& sequence);
@@ -50,6 +54,11 @@ namespace MWMechanics
             AiPackageTypeId mLastAiPackage;
             AiState mAiState;
 
+            void onPackageAdded(const AiPackage& package);
+            void onPackageRemoved(const AiPackage& package);
+
+            AiPackages::iterator erase(AiPackages::iterator package);
+
         public:
             ///Default constructor
             AiSequence();
@@ -63,12 +72,31 @@ namespace MWMechanics
             virtual ~AiSequence();
 
             /// Iterator may be invalidated by any function calls other than begin() or end().
-            std::list<std::shared_ptr<AiPackage>>::const_iterator begin() const { return mPackages.begin(); }
-            std::list<std::shared_ptr<AiPackage>>::const_iterator end() const { return mPackages.end(); }
-
-            void erase(std::list<std::shared_ptr<AiPackage>>::const_iterator package);
-
-            std::list<std::shared_ptr<AiPackage>>& getUnderlyingList() { return mPackages; }
+            AiPackages::const_iterator begin() const { return mPackages.begin(); }
+            AiPackages::const_iterator end() const { return mPackages.end(); }
+
+            /// Removes all packages controlled by the predicate.
+            template<typename F>
+            void erasePackagesIf(const F&& pred)
+            {
+                mPackages.erase(std::remove_if(mPackages.begin(), mPackages.end(), [&](auto& entry)
+                {
+                    const bool doRemove = pred(entry);
+                    if (doRemove)
+                        onPackageRemoved(*entry);
+                    return doRemove;
+                }), mPackages.end());
+            }
+
+            /// Removes a single package controlled by the predicate.
+            template<typename F>
+            void erasePackageIf(const F&& pred)
+            {
+                auto it = std::find_if(mPackages.begin(), mPackages.end(), pred);
+                if (it == mPackages.end())
+                    return;
+                erase(it);
+            }
 
             /// Returns currently executing AiPackage type
             /** \see enum class AiPackageTypeId **/
@@ -89,6 +117,12 @@ namespace MWMechanics
             /// Is there any combat package?
             bool isInCombat () const;
 
+            /// Is there any pursuit package.
+            bool isInPursuit() const;
+
+            /// Removes all packages using the specified id.
+            void removePackagesById(AiPackageTypeId id);
+
             /// Are we in combat with any other actor, who's also engaging us?
             bool isEngagedWithActor () const;
 
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 0816445271..dc349a1e6b 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -1318,7 +1318,7 @@ namespace MWMechanics
                 // once the bounty has been paid.
                 actor.getClass().getNpcStats(actor).setCrimeId(id);
 
-                if (!actor.getClass().getCreatureStats(actor).getAiSequence().hasPackage(AiPackageTypeId::Pursue))
+                if (!actor.getClass().getCreatureStats(actor).getAiSequence().isInPursuit())
                 {
                     actor.getClass().getCreatureStats(actor).getAiSequence().stack(AiPursue(player), actor);
                 }
@@ -1396,7 +1396,7 @@ namespace MWMechanics
             {
                 // Attacker is in combat with us, but we are not in combat with the attacker yet. Time to fight back.
                 // Note: accidental or collateral damage attacks are ignored.
-                if (!victim.getClass().getCreatureStats(victim).getAiSequence().hasPackage(AiPackageTypeId::Pursue))
+                if (!victim.getClass().getCreatureStats(victim).getAiSequence().isInPursuit())
                     startCombat(victim, player);
 
                 // Set the crime ID, which we will use to calm down participants
@@ -1442,7 +1442,7 @@ namespace MWMechanics
         {
             // Attacker is in combat with us, but we are not in combat with the attacker yet. Time to fight back.
             // Note: accidental or collateral damage attacks are ignored.
-            if (!target.getClass().getCreatureStats(target).getAiSequence().hasPackage(AiPackageTypeId::Pursue))
+            if (!target.getClass().getCreatureStats(target).getAiSequence().isInPursuit())
             {
                 // If an actor has OnPCHitMe declared in his script, his Fight = 0 and the attacker is player,
                 // he will attack the player only if we will force him (e.g. via StartCombat console command)
@@ -1467,7 +1467,7 @@ namespace MWMechanics
         const MWMechanics::AiSequence& seq = target.getClass().getCreatureStats(target).getAiSequence();
         return target.getClass().isNpc() && !attacker.isEmpty() && !seq.isInCombat(attacker)
                 && !isAggressive(target, attacker) && !seq.isEngagedWithActor()
-                && !target.getClass().getCreatureStats(target).getAiSequence().hasPackage(AiPackageTypeId::Pursue);
+                && !target.getClass().getCreatureStats(target).getAiSequence().isInPursuit();
     }
 
     void MechanicsManager::actorKilled(const MWWorld::Ptr &victim, const MWWorld::Ptr &attacker)
diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp
index d0584791a5..3ae6de23da 100644
--- a/apps/openmw/mwmechanics/spelleffects.cpp
+++ b/apps/openmw/mwmechanics/spelleffects.cpp
@@ -980,12 +980,10 @@ void removeMagicEffect(const MWWorld::Ptr& target, ActiveSpells::ActiveSpellPara
             if(magnitudes.get(effect.mEffectId).getMagnitude() <= 0.f)
             {
                 auto& seq = target.getClass().getCreatureStats(target).getAiSequence();
-                auto it = std::find_if(seq.begin(), seq.end(), [&](const auto& package)
+                seq.erasePackageIf([&](const auto& package)
                 {
                     return package->getTypeId() == MWMechanics::AiPackageTypeId::Follow && static_cast<const MWMechanics::AiFollow*>(package.get())->isCommanded();
                 });
-                if(it != seq.end())
-                    seq.erase(it);
             }
             break;
         case ESM::MagicEffect::ExtraSpell:

From 2d4d28fb8e9765cf2a5724a4ed60f26d45c0d095 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matja=C5=BE=20Lamut?= <matjaz.lamut@gmail.com>
Date: Sun, 13 Feb 2022 15:30:21 +0000
Subject: [PATCH 2110/2859] Documentation how to get an Animated creature in
 OpenMW

---
 .../reference/modding/custom-models/index.rst |   2 +-
 ...pipeline-blender-collada-animated-creature | 221 ++++++++++++++++++
 2 files changed, 222 insertions(+), 1 deletion(-)
 create mode 100644 docs/source/reference/modding/custom-models/pipeline-blender-collada-animated-creature

diff --git a/docs/source/reference/modding/custom-models/index.rst b/docs/source/reference/modding/custom-models/index.rst
index 8b6c5d87f7..b2d92032c5 100644
--- a/docs/source/reference/modding/custom-models/index.rst
+++ b/docs/source/reference/modding/custom-models/index.rst
@@ -18,7 +18,7 @@ Below is a quick overview of supported formats, followed by separate articles wi
 	:caption: Table of Contents
 	:maxdepth: 1
 
-	pipeline-blender-collada
 	pipeline-blender-collada-static-models
+	pipeline-blender-collada-animated-creature
 	pipeline-blender-osgnative
 	pipeline-blender-nif
diff --git a/docs/source/reference/modding/custom-models/pipeline-blender-collada-animated-creature b/docs/source/reference/modding/custom-models/pipeline-blender-collada-animated-creature
new file mode 100644
index 0000000000..b759bf9a02
--- /dev/null
+++ b/docs/source/reference/modding/custom-models/pipeline-blender-collada-animated-creature
@@ -0,0 +1,221 @@
+#############################
+Animated Creature via COLLADA
+#############################
+
+This tutorial shows how to get an animated creature from Blender to OpenMW using 
+the COLLADA format. It does not cover using Blender itself, as there are many 
+better resources for that. The focus is solely on the animation pipeline and its 
+specific requirements. Most of them are related to how the model, rig, and 
+animations are set up in Blender.
+
+.. note::
+    This tutorial builds upon the :doc:`pipeline-blender-collada-static-models` tutorial. All fundamentals of exporting static objects apply to animated ones as well.
+
+Requirements
+************
+
+To use the Blender to OpenMW pipeline via COLLADA, you will need the following.
+
+* `OpenMW 0.48 <https://openmw.org/downloads/>`_ or later
+* `Blender 2.83 <https://www.blender.org/download/>`_ or later. Latest confirmed, working version is Blender 3.0
+* `OpenMW COLLADA Exporter <https://github.com/openmw/collada-exporter>`_
+* An animated model you would like to export. In our case the flamboyant Land Racer!
+
+The Land Racer
+**************
+
+The creature, and its revelant files, are available from the `Example Suite repository <https://gitlab.com/OpenMW/example-suite/-/tree/master/example_animated_creature>`_.
+This should be useful for further study of how to set things up in case this 
+tutorial is not clear on any particular thing.
+
+* ``data/meshes/land_racer.dae`` – exported model
+* ``data/meshes/land_racer.txt`` – animation textkeys
+* ``data/textures/land_racer.dds`` – diffuse texture
+* ``data/textures/land_racer_n.dds`` - normal map
+* ``source_assets/land_racer.blend`` – source file configured as this tutorial specifies
+
+Model
+*****
+
+The model needs to be a child of the rig and have an Armature modifier asigned. 
+Bone weights are limited to a maximum of 4 bones per vertex. The model needs to 
+have default location, rotation, and scale.
+
+.. image:: https://gitlab.com/OpenMW/openmw-docs/-/raw/master/docs/source/reference/modding/custom-models/_static/landracer-in-blender.jpg
+    :align: center
+
+
+Collision Shape
+***************
+
+Collision is set up with an empty named ``Collision`` or ``collision`` with a 
+single child mesh. OpenMW will use the bounding box of this mesh for physics 
+collision shape so a simple, cuboid mesh is enough. If no collision shape is 
+defined, the bounding box of the animated model will be used instead.
+
+.. image:: https://gitlab.com/OpenMW/openmw-docs/-/raw/master/docs/source/reference/modding/custom-models/_static/landracer-collision-shape.jpg
+    :align: center
+
+
+Armature / Rig
+**************
+
+.. note::
+  Only a single rig object should be included in the exported file. Exporting multiple rigs is not reliably supported and can lead to errors.
+
+Root
+----
+
+The rig needs to be structured in a specific way. There should be a single top 
+bone in the rig’s hierarchy, the root bone named ``Bip01``. The name is 
+required so OpenMW recognizes and uses it for root movement. For this same 
+reason, the bone should be by default aligned with the world. The root bone 
+needs to have its ``Deform`` flag **enabled**.
+
+.. image:: https://gitlab.com/OpenMW/openmw-docs/-/raw/master/docs/source/reference/modding/custom-models/_static/landracer-root-bone.jpg
+    :align: center
+
+
+Deform Bones
+------------
+
+Below the root bone, the bones are divided into two branches. One branch 
+contains the deform bones which get included in the final exported file. These 
+are otherwise not animated directly but inherit motion from other bones via 
+constraints. They have their ``Deform`` flag **enabled**. For creatures, the 
+deform bones can be named as you desire and don’t need to follow the naming 
+convention used for NPC and player models.
+
+.. image:: https://gitlab.com/OpenMW/openmw-docs/-/raw/master/docs/source/reference/modding/custom-models/_static/landracer-rig-hierarchy.jpg
+    :align: center
+
+Control Bones
+-------------
+
+The other branch holds control and helper bones that enable comfortable 
+animation in Blender, but are neither required nor included in the exported 
+file. They have their ``Deform`` flag **disabled**. How these bones are 
+structured is a big separate topic on its own that this tutorial does not cover, 
+but you can study the provided source file.
+
+  
+Animations
+**********
+
+A creature in OpenMW is expected to have a set of animations to display its 
+various actions. These animations are recognized and used by their name. 
+
+.. list-table:: 
+   :widths: 25 25 50
+   :header-rows: 1
+
+   * - Animation name
+     - Possible variations
+     - Purpose
+   * - attack1
+     - attack2, attack3
+     - The creature performs an attack
+   * - death1
+     - death2 - death5
+     - The creature dies while upright
+   * - hit1
+     - hit2 - hit5
+     - The creature is hit in combat
+   * - idle
+     - idle2 - idle9
+     - Flavour animations when the creature does nothing in particular
+   * - knockout
+     - /
+     - When creature's fatigue goes below 0 and it staggers to the ground
+   * - deathknockout
+     - /
+     - The creature dies while knocked out
+   * - knockdown
+     - /
+     - When the creatures receives a heavy hit in combat or lands from a considerable height
+   * - deathknockdown
+     - /
+     - The creature dies while knocked down 
+   * - runforward
+     - /
+     - Moving forward fast
+   * - walkforward
+     - /
+     - Moving forward at regular speed
+
+Animating in Blender is done at 30 fps. Specific to how OpenMW works, each 
+exported animation needs to take a unique range on the timeline. To achieve 
+this, actions are placed as strips in the NLA editor with an obligatory one 
+frame gap between them.
+
+.. image:: https://gitlab.com/OpenMW/openmw-docs/-/raw/master/docs/source/reference/modding/custom-models/_static/landracer-nla-strips.jpg
+    :align: center
+    
+NLA strips affect the exported result based on their scale, name, frame range, 
+repetition, or any other factor affecting the end animation result. It's
+*What you see is what you get* principle.
+
+Root movement is required for animations such as ``walkforward`` and 
+``runforward`` and is likely to work for other animations if needed.
+Root movement works only when the root bone is named ``Bip01``.
+
+Textkeys
+********
+
+The exported COLLADA file requires a corresponding textkeys file for OpenMW to 
+properly read the animations. Textkeys is a ``.txt`` file containing animation 
+definitions and events. At a minimum it needs to include at least animation 
+``start`` and ``stop`` values in a format as shown in this example.
+    
+.. code::
+
+    idle: start 0.033333
+    idle: stop 2.033333
+    walkforward: start 2.066667
+    walkforward: stop 3.666667
+    runforward: start 3.7
+    runforward: stop 4.433333
+    attack1: start 4.466667
+    attack1: stop 5.433333
+    ...
+
+The textkeys file is placed in the same folder as the model and matches the model's name.
+
+* ``meshes/land_racer.dae``
+* ``meshes/land_racer.txt``
+
+While it's possible to write it by hand, OpenMW's Collada Exporter offers a 
+convenient option to export a textkeys file based on Blender's timeline markers 
+(not to be confused with pose markers which are contained per action). What you 
+need to do is create properly named timeline markers for each animation and 
+enable the ``Export Textkeys`` option in the exporter.
+
+.. image:: https://gitlab.com/OpenMW/openmw-docs/-/raw/master/docs/source/reference/modding/custom-models/_static/landracer-textkey-markers.jpg
+    :align: center
+
+In the example of ``walkforward`` the timeline markers should be named 
+``walkforward: start`` and ``walkforward: stop``.
+
+
+Exporter Settings
+*****************
+
+For animated models, use the following exporter settings. Before export, select 
+all objects you wish to include in the exported file and have the ``Selected 
+Objects`` option enabled. Without this, the exporter could fail.
+
+.. image:: https://gitlab.com/OpenMW/openmw-docs/-/raw/master/docs/source/reference/modding/custom-models/_static/landracer-exporter-settings.jpg
+    :align: center
+
+
+Getting the Model In-game
+*************************
+
+Once the Land Racer is exported, both of its ``.dae`` and ``.txt`` files need to 
+be placed in the correct folder where OpenMW will read it. Afterwards in 
+OpenMW-CS, it should be visible in the Assets->Meshes table and can be assigned 
+to the ``Model/Animation`` field of a creature.
+
+.. image:: https://gitlab.com/OpenMW/openmw-docs/-/raw/master/docs/source/reference/modding/custom-models/_static/landracer-in-openmwcs.jpg
+    :align: center
+

From 7884a0102632694b524a19ebe21d3e1438742907 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 13 Feb 2022 16:38:49 +0100
Subject: [PATCH 2111/2859] Add tests for Utf8Encoder

---
 apps/openmw_test_suite/CMakeLists.txt         |   6 +-
 .../toutf8/data}/french-utf8.txt              |   0
 .../toutf8/data}/french-win1252.txt           |   0
 .../toutf8/data}/russian-utf8.txt             |   0
 .../toutf8/data}/russian-win1251.txt          |   0
 apps/openmw_test_suite/toutf8/toutf8.cpp      | 139 ++++++++++++++++++
 components/to_utf8/tests/.gitignore           |   1 -
 .../to_utf8/tests/output/to_utf8_test.out     |   4 -
 components/to_utf8/tests/test.sh              |  18 ---
 components/to_utf8/tests/to_utf8_test.cpp     |  59 --------
 components/to_utf8/to_utf8.cpp                | 139 +++++++++---------
 components/to_utf8/to_utf8.hpp                |  10 +-
 12 files changed, 219 insertions(+), 157 deletions(-)
 rename {components/to_utf8/tests/test_data => apps/openmw_test_suite/toutf8/data}/french-utf8.txt (100%)
 rename {components/to_utf8/tests/test_data => apps/openmw_test_suite/toutf8/data}/french-win1252.txt (100%)
 rename {components/to_utf8/tests/test_data => apps/openmw_test_suite/toutf8/data}/russian-utf8.txt (100%)
 rename {components/to_utf8/tests/test_data => apps/openmw_test_suite/toutf8/data}/russian-win1251.txt (100%)
 create mode 100644 apps/openmw_test_suite/toutf8/toutf8.cpp
 delete mode 100644 components/to_utf8/tests/.gitignore
 delete mode 100644 components/to_utf8/tests/output/to_utf8_test.out
 delete mode 100755 components/to_utf8/tests/test.sh
 delete mode 100644 components/to_utf8/tests/to_utf8_test.cpp

diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index 2ee34186d8..16d820c4f9 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -70,6 +70,8 @@ if (GTEST_FOUND AND GMOCK_FOUND)
         esmloader/esmdata.cpp
 
         files/hash.cpp
+
+        toutf8/toutf8.cpp
     )
 
     source_group(apps\\openmw_test_suite FILES openmw_test_suite.cpp ${UNITTEST_SRC_FILES})
@@ -93,6 +95,8 @@ if (GTEST_FOUND AND GMOCK_FOUND)
         EXPECTED_MD5 bf3691034a38611534c74c3b89a7d2c3
     )
 
-    target_compile_definitions(openmw_test_suite PRIVATE OPENMW_DATA_DIR="${CMAKE_CURRENT_BINARY_DIR}/data")
+    target_compile_definitions(openmw_test_suite
+        PRIVATE OPENMW_DATA_DIR="${CMAKE_CURRENT_BINARY_DIR}/data"
+                OPENMW_TEST_SUITE_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
 
 endif()
diff --git a/components/to_utf8/tests/test_data/french-utf8.txt b/apps/openmw_test_suite/toutf8/data/french-utf8.txt
similarity index 100%
rename from components/to_utf8/tests/test_data/french-utf8.txt
rename to apps/openmw_test_suite/toutf8/data/french-utf8.txt
diff --git a/components/to_utf8/tests/test_data/french-win1252.txt b/apps/openmw_test_suite/toutf8/data/french-win1252.txt
similarity index 100%
rename from components/to_utf8/tests/test_data/french-win1252.txt
rename to apps/openmw_test_suite/toutf8/data/french-win1252.txt
diff --git a/components/to_utf8/tests/test_data/russian-utf8.txt b/apps/openmw_test_suite/toutf8/data/russian-utf8.txt
similarity index 100%
rename from components/to_utf8/tests/test_data/russian-utf8.txt
rename to apps/openmw_test_suite/toutf8/data/russian-utf8.txt
diff --git a/components/to_utf8/tests/test_data/russian-win1251.txt b/apps/openmw_test_suite/toutf8/data/russian-win1251.txt
similarity index 100%
rename from components/to_utf8/tests/test_data/russian-win1251.txt
rename to apps/openmw_test_suite/toutf8/data/russian-win1251.txt
diff --git a/apps/openmw_test_suite/toutf8/toutf8.cpp b/apps/openmw_test_suite/toutf8/toutf8.cpp
new file mode 100644
index 0000000000..bad4f34fd5
--- /dev/null
+++ b/apps/openmw_test_suite/toutf8/toutf8.cpp
@@ -0,0 +1,139 @@
+#include <components/to_utf8/to_utf8.hpp>
+
+#include <gtest/gtest.h>
+
+#include <fstream>
+
+#ifndef OPENMW_TEST_SUITE_SOURCE_DIR
+#define OPENMW_TEST_SUITE_SOURCE_DIR ""
+#endif
+
+namespace
+{
+    using namespace testing;
+    using namespace ToUTF8;
+
+    struct Params
+    {
+        FromType mLegacyEncoding;
+        std::string mLegacyEncodingFileName;
+        std::string mUtf8FileName;
+    };
+
+    std::string readContent(const std::string& fileName)
+    {
+        std::ifstream file;
+        file.exceptions(std::ios::failbit | std::ios::badbit);
+        file.open(std::string(OPENMW_TEST_SUITE_SOURCE_DIR) + "/toutf8/data/" + fileName);
+        std::stringstream buffer;
+        buffer << file.rdbuf();
+        return buffer.str();
+    }
+
+    struct Utf8EncoderTest : TestWithParam<Params> {};
+
+    TEST(Utf8EncoderTest, getUtf8ShouldReturnEmptyAsIs)
+    {
+        Utf8Encoder encoder(FromType::CP437);
+        EXPECT_EQ(encoder.getUtf8(std::string_view()), std::string_view());
+    }
+
+    TEST(Utf8EncoderTest, getUtf8ShouldReturnAsciiOnlyAsIs)
+    {
+        std::string input;
+        for (int c = 1; c <= std::numeric_limits<char>::max(); ++c)
+            input.push_back(c);
+        Utf8Encoder encoder(FromType::CP437);
+        const std::string_view result = encoder.getUtf8(input);
+        EXPECT_EQ(result.data(), input.data());
+        EXPECT_EQ(result.size(), input.size());
+    }
+
+    TEST(Utf8EncoderTest, getUtf8ShouldLookUpUntilZero)
+    {
+        const std::string input("a\0b");
+        Utf8Encoder encoder(FromType::CP437);
+        const std::string_view result = encoder.getUtf8(input);
+        EXPECT_EQ(result, "a");
+    }
+
+    TEST(Utf8EncoderTest, getUtf8ShouldLookUpUntilEndOfInputForAscii)
+    {
+        const std::string input("abc");
+        Utf8Encoder encoder(FromType::CP437);
+        const std::string_view result = encoder.getUtf8(std::string_view(input.data(), 2));
+        EXPECT_EQ(result, "ab");
+    }
+
+    TEST(Utf8EncoderTest, getUtf8ShouldLookUpUntilEndOfInputForNonAscii)
+    {
+        const std::string input("a\x92" "b");
+        Utf8Encoder encoder(FromType::WINDOWS_1252);
+        const std::string_view result = encoder.getUtf8(std::string_view(input.data(), 2));
+        EXPECT_EQ(result, "a\xE2\x80\x99");
+    }
+
+    TEST_P(Utf8EncoderTest, getUtf8ShouldConvertFromLegacyEncodingToUtf8)
+    {
+        const std::string input(readContent(GetParam().mLegacyEncodingFileName));
+        const std::string expected(readContent(GetParam().mUtf8FileName));
+        Utf8Encoder encoder(GetParam().mLegacyEncoding);
+        const std::string_view result = encoder.getUtf8(input);
+        EXPECT_EQ(result, expected);
+    }
+
+    TEST(Utf8EncoderTest, getLegacyEncShouldReturnEmptyAsIs)
+    {
+        Utf8Encoder encoder(FromType::CP437);
+        EXPECT_EQ(encoder.getLegacyEnc(std::string_view()), std::string_view());
+    }
+
+    TEST(Utf8EncoderTest, getLegacyEncShouldReturnAsciiOnlyAsIs)
+    {
+        std::string input;
+        for (int c = 1; c <= std::numeric_limits<char>::max(); ++c)
+            input.push_back(c);
+        Utf8Encoder encoder(FromType::CP437);
+        const std::string_view result = encoder.getLegacyEnc(input);
+        EXPECT_EQ(result.data(), input.data());
+        EXPECT_EQ(result.size(), input.size());
+    }
+
+    TEST(Utf8EncoderTest, getLegacyEncShouldLookUpUntilZero)
+    {
+        const std::string input("a\0b");
+        Utf8Encoder encoder(FromType::CP437);
+        const std::string_view result = encoder.getLegacyEnc(input);
+        EXPECT_EQ(result, "a");
+    }
+
+    TEST(Utf8EncoderTest, getLegacyEncShouldLookUpUntilEndOfInputForAscii)
+    {
+        const std::string input("abc");
+        Utf8Encoder encoder(FromType::CP437);
+        const std::string_view result = encoder.getLegacyEnc(std::string_view(input.data(), 2));
+        EXPECT_EQ(result, "ab");
+    }
+
+    TEST(Utf8EncoderTest, getLegacyEncShouldStripIncompleteCharacters)
+    {
+        const std::string input("a\xc3\xa2\xe2\x80\x99");
+        Utf8Encoder encoder(FromType::WINDOWS_1252);
+        const std::string_view result = encoder.getLegacyEnc(std::string_view(input.data(), 5));
+        EXPECT_EQ(result, "a\xe2");
+    }
+
+    TEST_P(Utf8EncoderTest, getLegacyEncShouldConvertFromUtf8ToLegacyEncoding)
+    {
+        const std::string input(readContent(GetParam().mUtf8FileName));
+        const std::string expected(readContent(GetParam().mLegacyEncodingFileName));
+        Utf8Encoder encoder(GetParam().mLegacyEncoding);
+        const std::string_view result = encoder.getLegacyEnc(input);
+        EXPECT_EQ(result, expected);
+    }
+
+    INSTANTIATE_TEST_SUITE_P(Files, Utf8EncoderTest, Values(
+        Params {ToUTF8::WINDOWS_1251, "russian-win1251.txt", "russian-utf8.txt"},
+        Params {ToUTF8::WINDOWS_1252, "french-win1252.txt", "french-utf8.txt"}
+    ));
+}
diff --git a/components/to_utf8/tests/.gitignore b/components/to_utf8/tests/.gitignore
deleted file mode 100644
index 8144904045..0000000000
--- a/components/to_utf8/tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*_test
diff --git a/components/to_utf8/tests/output/to_utf8_test.out b/components/to_utf8/tests/output/to_utf8_test.out
deleted file mode 100644
index dcb32359ab..0000000000
--- a/components/to_utf8/tests/output/to_utf8_test.out
+++ /dev/null
@@ -1,4 +0,0 @@
-original:  Без вопросов отдаете ему рулет, зная, что позже вы сможете привести с собой своих друзей и тогда он получит по заслугам?
-converted: Без вопросов отдаете ему рулет, зная, что позже вы сможете привести с собой своих друзей и тогда он получит по заслугам?
-original:  Vous lui donnez le gâteau sans protester avant d’aller chercher tous vos amis et de revenir vous venger.
-converted: Vous lui donnez le gâteau sans protester avant d’aller chercher tous vos amis et de revenir vous venger.
diff --git a/components/to_utf8/tests/test.sh b/components/to_utf8/tests/test.sh
deleted file mode 100755
index 2d07708adc..0000000000
--- a/components/to_utf8/tests/test.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-make || exit
-
-mkdir -p output
-
-PROGS=*_test
-
-for a in $PROGS; do
-    if [ -f "output/$a.out" ]; then
-        echo "Running $a:"
-        ./$a | diff output/$a.out -
-    else
-        echo "Creating $a.out"
-        ./$a > "output/$a.out"
-        git add "output/$a.out"
-    fi
-done
diff --git a/components/to_utf8/tests/to_utf8_test.cpp b/components/to_utf8/tests/to_utf8_test.cpp
deleted file mode 100644
index 3fcddd1581..0000000000
--- a/components/to_utf8/tests/to_utf8_test.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-#include <iostream>
-#include <fstream>
-#include <cassert>
-#include <stdexcept>
-
-#include "../to_utf8.hpp"
-
-std::string getFirstLine(const std::string &filename);
-void testEncoder(ToUTF8::FromType encoding, const std::string &legacyEncFile,
-                 const std::string &utf8File);
-
-/// Test character encoding conversion to and from UTF-8
-void testEncoder(ToUTF8::FromType encoding, const std::string &legacyEncFile,
-                 const std::string &utf8File)
-{
-    // get some test data
-    std::string legacyEncLine = getFirstLine(legacyEncFile);
-    std::string utf8Line = getFirstLine(utf8File);
-
-    // create an encoder for specified character encoding
-    ToUTF8::Utf8Encoder encoder (encoding);
-
-    // convert text to UTF-8
-    std::string convertedUtf8Line = encoder.getUtf8(legacyEncLine);
-
-    std::cout << "original:  " << utf8Line          << std::endl;
-    std::cout << "converted: " << convertedUtf8Line << std::endl;
-
-    // check correctness
-    assert(convertedUtf8Line == utf8Line);
-
-    // convert UTF-8 text to legacy encoding
-    std::string convertedLegacyEncLine = encoder.getLegacyEnc(utf8Line);
-    // check correctness
-    assert(convertedLegacyEncLine == legacyEncLine);
-}
-
-std::string getFirstLine(const std::string &filename)
-{
-    std::string line;
-    std::ifstream text (filename.c_str());
-
-    if (!text.is_open())
-    {
-        throw std::runtime_error("Unable to open file " + filename);
-    }
-
-    std::getline(text, line);
-    text.close();
-
-    return line;
-}
-
-int main()
-{
-    testEncoder(ToUTF8::WINDOWS_1251, "test_data/russian-win1251.txt", "test_data/russian-utf8.txt");
-    testEncoder(ToUTF8::WINDOWS_1252, "test_data/french-win1252.txt", "test_data/french-utf8.txt");
-    return 0;
-}
diff --git a/components/to_utf8/to_utf8.cpp b/components/to_utf8/to_utf8.cpp
index 7fd0e3cd88..1f0a81ad10 100644
--- a/components/to_utf8/to_utf8.cpp
+++ b/components/to_utf8/to_utf8.cpp
@@ -3,6 +3,7 @@
 #include <vector>
 #include <cassert>
 #include <stdexcept>
+#include <algorithm>
 
 #include <components/debug/debuglog.hpp>
 
@@ -44,6 +45,14 @@
 
 using namespace ToUTF8;
 
+namespace
+{
+    std::string_view::iterator skipAscii(std::string_view input)
+    {
+        return std::find_if(input.begin(), input.end(), [] (unsigned char v) { return v == 0 || v >= 128; });
+    }
+}
+
 Utf8Encoder::Utf8Encoder(const FromType sourceEncoding):
     mOutput(50*1024)
 {
@@ -82,11 +91,6 @@ std::string_view Utf8Encoder::getUtf8(std::string_view input)
     if (input.empty())
         return input;
 
-    // Double check that the input string stops at some point (it might
-    // contain zero terminators before this, inside its own data, which
-    // is also ok.)
-    assert(input[input.size()] == 0);
-
     // Note: The rest of this function is designed for single-character
     // input encodings only. It also assumes that the input encoding
     // shares its first 128 values (0-127) with ASCII. There are no plans
@@ -95,8 +99,7 @@ std::string_view Utf8Encoder::getUtf8(std::string_view input)
 
     // Compute output length, and check for pure ascii input at the same
     // time.
-    bool ascii;
-    size_t outlen = getLength(input.data(), ascii);
+    const auto [outlen, ascii] = getLength(input);
 
     // If we're pure ascii, then don't bother converting anything.
     if(ascii)
@@ -107,8 +110,8 @@ std::string_view Utf8Encoder::getUtf8(std::string_view input)
     char *out = &mOutput[0];
 
     // Translate
-    for (const char* ptr = input.data(); *ptr;)
-        copyFromArray(*(ptr++), out);
+    for (auto it = input.begin(); it != input.end() && *it != 0; ++it)
+        copyFromArray(*it, out);
 
     // Make sure that we wrote the correct number of bytes
     assert((out-&mOutput[0]) == (int)outlen);
@@ -125,11 +128,6 @@ std::string_view Utf8Encoder::getLegacyEnc(std::string_view input)
     if (input.empty())
         return input;
 
-    // Double check that the input string stops at some point (it might
-    // contain zero terminators before this, inside its own data, which
-    // is also ok.)
-    assert(input[input.size()] == 0);
-
     // TODO: The rest of this function is designed for single-character
     // input encodings only. It also assumes that the input the input
     // encoding shares its first 128 values (0-127) with ASCII. These
@@ -138,8 +136,7 @@ std::string_view Utf8Encoder::getLegacyEnc(std::string_view input)
 
     // Compute output length, and check for pure ascii input at the same
     // time.
-    bool ascii;
-    size_t outlen = getLength2(input.data(), ascii);
+    const auto [outlen, ascii] = getLengthLegacyEnc(input);
 
     // If we're pure ascii, then don't bother converting anything.
     if(ascii)
@@ -150,8 +147,8 @@ std::string_view Utf8Encoder::getLegacyEnc(std::string_view input)
     char *out = &mOutput[0];
 
     // Translate
-    for (const char* ptr = input.data(); *ptr;)
-        copyFromArray2(ptr, out);
+    for (auto it = input.begin(); it != input.end() && *it != 0;)
+        copyFromArrayLegacyEnc(it, input.end(), out);
 
     // Make sure that we wrote the correct number of bytes
     assert((out-&mOutput[0]) == (int)outlen);
@@ -186,34 +183,30 @@ void Utf8Encoder::resize(size_t size)
   is the case, then the ascii parameter is set to true, and the
   caller can optimize for this case.
  */
-size_t Utf8Encoder::getLength(const char* input, bool &ascii) const
+std::pair<std::size_t, bool> Utf8Encoder::getLength(std::string_view input) const
 {
-    ascii = true;
-    size_t len = 0;
-    const char* ptr = input;
-    unsigned char inp = *ptr;
-
     // Do away with the ascii part of the string first (this is almost
     // always the entire string.)
-    while (inp && inp < 128)
-        inp = *(++ptr);
-    len += (ptr-input);
+    auto it = skipAscii(input);
 
     // If we're not at the null terminator at this point, then there
     // were some non-ascii characters to deal with. Go to slow-mode for
     // the rest of the string.
-    if (inp)
+    if (it == input.end() || *it == 0)
+        return {it - input.begin(), true};
+
+    std::size_t len = it - input.begin();
+
+    do
     {
-        ascii = false;
-        while (inp)
-        {
-            // Find the translated length of this character in the
-            // lookup table.
-            len += translationArray[inp*6];
-            inp = *(++ptr);
-        }
+        // Find the translated length of this character in the
+        // lookup table.
+        len += translationArray[static_cast<unsigned char>(*it) * 6];
+        ++it;
     }
-    return len;
+    while (it != input.end() && *it != 0);
+
+    return {len, false};
 }
 
 // Translate one character 'ch' using the translation array 'arr', and
@@ -233,51 +226,52 @@ void Utf8Encoder::copyFromArray(unsigned char ch, char* &out) const
     out += len;
 }
 
-size_t Utf8Encoder::getLength2(const char* input, bool &ascii) const
+std::pair<std::size_t, bool> Utf8Encoder::getLengthLegacyEnc(std::string_view input) const
 {
-    ascii = true;
-    size_t len = 0;
-    const char* ptr = input;
-    unsigned char inp = *ptr;
-
     // Do away with the ascii part of the string first (this is almost
     // always the entire string.)
-    while (inp && inp < 128)
-        inp = *(++ptr);
-    len += (ptr-input);
+    auto it = skipAscii(input);
 
     // If we're not at the null terminator at this point, then there
     // were some non-ascii characters to deal with. Go to slow-mode for
     // the rest of the string.
-    if (inp)
+    if (it == input.end() || *it == 0)
+        return {it - input.begin(), true};
+
+    std::size_t len = it - input.begin();
+    std::size_t symbolLen = 0;
+
+    do
     {
-        ascii = false;
-        while(inp)
+        symbolLen += 1;
+        // Find the translated length of this character in the
+        // lookup table.
+        switch (static_cast<unsigned char>(*it))
         {
-            len += 1;
-            // Find the translated length of this character in the
-            // lookup table.
-            switch(inp)
-            {
-                case 0xe2: len -= 2; break;
-                case 0xc2:
-                case 0xcb:
-                case 0xc4:
-                case 0xc6:
-                case 0xc3:
-                case 0xd0:
-                case 0xd1:
-                case 0xd2:
-                case 0xc5: len -= 1; break;
-            }
-
-            inp = *(++ptr);
+            case 0xe2: symbolLen -= 2; break;
+            case 0xc2:
+            case 0xcb:
+            case 0xc4:
+            case 0xc6:
+            case 0xc3:
+            case 0xd0:
+            case 0xd1:
+            case 0xd2:
+            case 0xc5: symbolLen -= 1; break;
+            default:
+                len += symbolLen;
+                symbolLen = 0;
+                break;
         }
+
+        ++it;
     }
-    return len;
+    while (it != input.end() && *it != 0);
+
+    return {len, false};
 }
 
-void Utf8Encoder::copyFromArray2(const char*& chp, char* &out) const
+void Utf8Encoder::copyFromArrayLegacyEnc(std::string_view::iterator& chp, std::string_view::iterator end, char* &out) const
 {
     unsigned char ch = *(chp++);
     // Optimize for ASCII values
@@ -308,10 +302,17 @@ void Utf8Encoder::copyFromArray2(const char*& chp, char* &out) const
         return;
     }
 
+    if (chp == end)
+        return;
+
     unsigned char ch2 = *(chp++);
     unsigned char ch3 = '\0';
     if (len == 3)
+    {
+        if (chp == end)
+            return;
         ch3 = *(chp++);
+    }
 
     for (int i = 128; i < 256; i++)
     {
diff --git a/components/to_utf8/to_utf8.hpp b/components/to_utf8/to_utf8.hpp
index 0e9db01e1d..794c9148e5 100644
--- a/components/to_utf8/to_utf8.hpp
+++ b/components/to_utf8/to_utf8.hpp
@@ -38,11 +38,11 @@ namespace ToUTF8
             std::string_view getLegacyEnc(std::string_view input);
 
         private:
-            void resize(size_t size);
-            size_t getLength(const char* input, bool &ascii) const;
-            void copyFromArray(unsigned char chp, char* &out) const;
-            size_t getLength2(const char* input, bool &ascii) const;
-            void copyFromArray2(const char*& chp, char* &out) const;
+            inline void resize(std::size_t size);
+            inline std::pair<std::size_t, bool> getLength(std::string_view input) const;
+            inline void copyFromArray(unsigned char chp, char* &out) const;
+            inline std::pair<std::size_t, bool> getLengthLegacyEnc(std::string_view input) const;
+            inline void copyFromArrayLegacyEnc(std::string_view::iterator& chp, std::string_view::iterator end, char* &out) const;
 
             std::vector<char> mOutput;
             const signed char* translationArray;

From b43eb29465014eec2a7a8e195925a025392fc346 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 13 Feb 2022 20:13:14 +0100
Subject: [PATCH 2112/2859] Log duration of writing save game file

---
 apps/openmw/mwstate/statemanagerimp.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index 3b459ec2ce..634dcdab53 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -188,6 +188,8 @@ void MWState::StateManager::saveGame (const std::string& description, const Slot
 
     try
     {
+        const auto start = std::chrono::steady_clock::now();
+
         if (!character)
         {
             MWWorld::ConstPtr player = MWMechanics::getPlayer();
@@ -302,6 +304,11 @@ void MWState::StateManager::saveGame (const std::string& description, const Slot
 
         Settings::Manager::setString ("character", "Saves",
             slot->mPath.parent_path().filename().string());
+
+        const auto finish = std::chrono::steady_clock::now();
+
+        Log(Debug::Info) << '\'' << description << "' is saved in "
+            << std::chrono::duration_cast<std::chrono::duration<float, std::milli>>(finish - start).count() << "ms";
     }
     catch (const std::exception& e)
     {

From a4d7b7251122d1b31194ffb69053ef5343c71c7c Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 13 Feb 2022 20:45:05 +0100
Subject: [PATCH 2113/2859] Write png image of the global map for save
 asynchronously

Write global map to the save file last to give more time for async job to
finish.
---
 apps/openmw/mwbase/windowmanager.hpp    |  2 +
 apps/openmw/mwgui/mapwindow.cpp         |  8 +++-
 apps/openmw/mwgui/mapwindow.hpp         |  4 +-
 apps/openmw/mwgui/windowmanagerimp.cpp  |  5 +++
 apps/openmw/mwgui/windowmanagerimp.hpp  |  2 +
 apps/openmw/mwrender/globalmap.cpp      | 59 +++++++++++++++++++------
 apps/openmw/mwrender/globalmap.hpp      |  5 +++
 apps/openmw/mwstate/statemanagerimp.cpp |  8 ++--
 8 files changed, 74 insertions(+), 19 deletions(-)

diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index 3044e13e9b..eeb2d6a56b 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -358,6 +358,8 @@ namespace MWBase
 
             virtual void onDeleteCustomData(const MWWorld::Ptr& ptr) = 0;
             virtual void forceLootMode(const MWWorld::Ptr& ptr) = 0;
+
+            virtual void asyncPrepareSaveMap() = 0;
     };
 }
 
diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index 2aa1b51950..b5f281d333 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -759,7 +759,7 @@ namespace MWGui
         , mGlobal(Settings::Manager::getBool("global", "Map"))
         , mEventBoxGlobal(nullptr)
         , mEventBoxLocal(nullptr)
-        , mGlobalMapRender(new MWRender::GlobalMap(localMapRender->getRoot(), workQueue))
+        , mGlobalMapRender(std::make_unique<MWRender::GlobalMap>(localMapRender->getRoot(), workQueue))
         , mEditNoteDialog()
     {
         static bool registered = false;
@@ -1028,7 +1028,6 @@ namespace MWGui
 
     MapWindow::~MapWindow()
     {
-        delete mGlobalMapRender;
     }
 
     void MapWindow::setCellName(const std::string& cellName)
@@ -1357,6 +1356,11 @@ namespace MWGui
         marker->eventMouseWheel += MyGUI::newDelegate(this, &MapWindow::onMapZoomed);
     }
 
+    void MapWindow::asyncPrepareSaveMap()
+    {
+        mGlobalMapRender->asyncWritePng();
+    }
+
     // -------------------------------------------------------------------
 
     EditNoteDialog::EditNoteDialog()
diff --git a/apps/openmw/mwgui/mapwindow.hpp b/apps/openmw/mwgui/mapwindow.hpp
index 9f6ea1339d..c50a92dac3 100644
--- a/apps/openmw/mwgui/mapwindow.hpp
+++ b/apps/openmw/mwgui/mapwindow.hpp
@@ -260,6 +260,8 @@ namespace MWGui
         void write (ESM::ESMWriter& writer, Loading::Listener& progress);
         void readRecord (ESM::ESMReader& reader, uint32_t type);
 
+        void asyncPrepareSaveMap();
+
     private:
         void onDragStart(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id);
         void onMouseDrag(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id);
@@ -304,7 +306,7 @@ namespace MWGui
         MyGUI::Button* mEventBoxLocal;
 
         float mGlobalMapZoom = 1.0f;
-        MWRender::GlobalMap* mGlobalMapRender;
+        std::unique_ptr<MWRender::GlobalMap> mGlobalMapRender;
 
         struct MapMarkerType
         {
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index c2f7785da3..04e48fb280 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -2263,4 +2263,9 @@ namespace MWGui
         for(auto* window : mWindows)
             window->onDeleteCustomData(ptr);
     }
+
+    void WindowManager::asyncPrepareSaveMap()
+    {
+        mMap->asyncPrepareSaveMap();
+    }
 }
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index ef19329cdf..11d10ab45e 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -392,6 +392,8 @@ namespace MWGui
     void onDeleteCustomData(const MWWorld::Ptr& ptr) override;
     void forceLootMode(const MWWorld::Ptr& ptr) override;
 
+    void asyncPrepareSaveMap() override;
+
   private:
     unsigned int mOldUpdateMask; unsigned int mOldCullMask;
 
diff --git a/apps/openmw/mwrender/globalmap.cpp b/apps/openmw/mwrender/globalmap.cpp
index 5da79ec037..3d0a066451 100644
--- a/apps/openmw/mwrender/globalmap.cpp
+++ b/apps/openmw/mwrender/globalmap.cpp
@@ -93,6 +93,26 @@ namespace
         MWRender::GlobalMap* mParent;
     };
 
+    std::vector<char> writePng(const osg::Image& overlayImage)
+    {
+        std::ostringstream ostream;
+        osgDB::ReaderWriter* readerwriter = osgDB::Registry::instance()->getReaderWriterForExtension("png");
+        if (!readerwriter)
+        {
+            Log(Debug::Error) << "Error: Can't write map overlay: no png readerwriter found";
+            return std::vector<char>();
+        }
+
+        osgDB::ReaderWriter::WriteResult result = readerwriter->writeImage(overlayImage, ostream);
+        if (!result.success())
+        {
+            Log(Debug::Warning) << "Error: Can't write map overlay: " << result.message() << " code " << result.status();
+            return std::vector<char>();
+        }
+
+        std::string data = ostream.str();
+        return std::vector<char>(data.begin(), data.end());
+    }
 }
 
 namespace MWRender
@@ -221,6 +241,20 @@ namespace MWRender
         osg::ref_ptr<osg::Texture2D> mOverlayTexture;
     };
 
+    struct GlobalMap::WritePng final : public SceneUtil::WorkItem
+    {
+        osg::ref_ptr<const osg::Image> mOverlayImage;
+        std::vector<char> mImageData;
+
+        explicit WritePng(osg::ref_ptr<const osg::Image> overlayImage)
+            : mOverlayImage(std::move(overlayImage)) {}
+
+        void doWork() override
+        {
+            mImageData = writePng(*mOverlayImage);
+        }
+    };
+
     GlobalMap::GlobalMap(osg::Group* root, SceneUtil::WorkQueue* workQueue)
         : mRoot(root)
         , mWorkQueue(workQueue)
@@ -400,23 +434,15 @@ namespace MWRender
         map.mBounds.mMinY = mMinY;
         map.mBounds.mMaxY = mMaxY;
 
-        std::ostringstream ostream;
-        osgDB::ReaderWriter* readerwriter = osgDB::Registry::instance()->getReaderWriterForExtension("png");
-        if (!readerwriter)
-        {
-            Log(Debug::Error) << "Error: Can't write map overlay: no png readerwriter found";
-            return;
-        }
-
-        osgDB::ReaderWriter::WriteResult result = readerwriter->writeImage(*mOverlayImage, ostream);
-        if (!result.success())
+        if (mWritePng != nullptr)
         {
-            Log(Debug::Warning) << "Error: Can't write map overlay: " << result.message() << " code " << result.status();
+            mWritePng->waitTillDone();
+            map.mImageData = std::move(mWritePng->mImageData);
+            mWritePng = nullptr;
             return;
         }
 
-        std::string data = ostream.str();
-        map.mImageData = std::vector<char>(data.begin(), data.end());
+        map.mImageData = writePng(*mOverlayImage);
     }
 
     struct Box
@@ -606,4 +632,11 @@ namespace MWRender
         cam->removeChildren(0, cam->getNumChildren());
         mRoot->removeChild(cam);
     }
+
+    void GlobalMap::asyncWritePng()
+    {
+        // Use deep copy to avoid any sychronization
+        mWritePng = new WritePng(new osg::Image(*mOverlayImage, osg::CopyOp::DEEP_COPY_ALL));
+        mWorkQueue->addWorkItem(mWritePng, /*front=*/true);
+    }
 }
diff --git a/apps/openmw/mwrender/globalmap.hpp b/apps/openmw/mwrender/globalmap.hpp
index fd8a8d1016..28531f14df 100644
--- a/apps/openmw/mwrender/globalmap.hpp
+++ b/apps/openmw/mwrender/globalmap.hpp
@@ -72,7 +72,11 @@ namespace MWRender
 
         void ensureLoaded();
 
+        void asyncWritePng();
+
     private:
+        struct WritePng;
+
         /**
          * Request rendering a 2d quad onto mOverlayTexture.
          * x, y, width and height are the destination coordinates (top-left coordinate origin)
@@ -121,6 +125,7 @@ namespace MWRender
 
         osg::ref_ptr<SceneUtil::WorkQueue> mWorkQueue;
         osg::ref_ptr<CreateMapWorkItem> mWorkItem;
+        osg::ref_ptr<WritePng> mWritePng;
 
         int mWidth;
         int mHeight;
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index 634dcdab53..c8cd53a331 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -190,6 +190,8 @@ void MWState::StateManager::saveGame (const std::string& description, const Slot
     {
         const auto start = std::chrono::steady_clock::now();
 
+        MWBase::Environment::get().getWindowManager()->asyncPrepareSaveMap();
+
         if (!character)
         {
             MWWorld::ConstPtr player = MWMechanics::getPlayer();
@@ -257,9 +259,9 @@ void MWState::StateManager::saveGame (const std::string& description, const Slot
                 +MWBase::Environment::get().getWorld()->countSavedGameRecords()
                 +MWBase::Environment::get().getScriptManager()->getGlobalScripts().countSavedGameRecords()
                 +MWBase::Environment::get().getDialogueManager()->countSavedGameRecords()
-                +MWBase::Environment::get().getWindowManager()->countSavedGameRecords()
                 +MWBase::Environment::get().getMechanicsManager()->countSavedGameRecords()
-                +MWBase::Environment::get().getInputManager()->countSavedGameRecords();
+                +MWBase::Environment::get().getInputManager()->countSavedGameRecords()
+                +MWBase::Environment::get().getWindowManager()->countSavedGameRecords();
         writer.setRecordCount (recordCount);
 
         writer.save (stream);
@@ -282,9 +284,9 @@ void MWState::StateManager::saveGame (const std::string& description, const Slot
         MWBase::Environment::get().getLuaManager()->write(writer, listener);
         MWBase::Environment::get().getWorld()->write (writer, listener);
         MWBase::Environment::get().getScriptManager()->getGlobalScripts().write (writer, listener);
-        MWBase::Environment::get().getWindowManager()->write(writer, listener);
         MWBase::Environment::get().getMechanicsManager()->write(writer, listener);
         MWBase::Environment::get().getInputManager()->write(writer, listener);
+        MWBase::Environment::get().getWindowManager()->write(writer, listener);
 
         // Ensure we have written the number of records that was estimated
         if (writer.getRecordCount() != recordCount+1) // 1 extra for TES3 record

From d787317df91de048008e7c5ad767bec7a0355f25 Mon Sep 17 00:00:00 2001
From: David Nagy <nagydav90@gmail.com>
Date: Mon, 14 Feb 2022 11:14:41 +0000
Subject: [PATCH 2114/2859] Update overview.rst (#6598)

---
 AUTHORS.md                                    |  1 +
 .../reference/lua-scripting/overview.rst      | 35 ++++++++-----------
 files/builtin_scripts/openmw_aux/time.lua     |  2 +-
 3 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index ecfc03dc1e..3edba5f25c 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -249,6 +249,7 @@ Documentation
     Joakim Berg (lysol90)
     Ryan Tucker (Ravenwing)
     sir_herrbatka
+    David Nagy (zuzaman)
 
 Packagers
 ---------
diff --git a/docs/source/reference/lua-scripting/overview.rst b/docs/source/reference/lua-scripting/overview.rst
index f270def2fa..e6024a27a1 100644
--- a/docs/source/reference/lua-scripting/overview.rst
+++ b/docs/source/reference/lua-scripting/overview.rst
@@ -546,10 +546,10 @@ Timers
 ======
 
 Timers are in the :ref:`openmw.async <Package openmw.async>` package.
-They can be set either in game seconds or in game hours.
+They can be set either in simulation time or in game time.
 
-- `Game seconds`: the number of seconds in the game world (i.e. seconds when the game is not paused), passed from starting a new game.
-- `Game hours`: current time of the game world in hours. The number of seconds in a game hour is not guaranteed to be fixed.
+- `Simulation time`: the number of seconds in the game world (i.e. seconds when the game is not paused), passed from starting a new game.
+- `Game time`: current time of the game world in seconds. Note that game time generally goes faster than the simulation time.
 
 When the game is paused, all timers are paused as well.
 
@@ -578,7 +578,7 @@ An example:
     end)
 
     local function teleportWithDelay(delay, actor, cellName, pos)
-        async:newTimerInSeconds(delay, teleportWithDelayCallback, {
+        async:newSimulationTimer(delay, teleportWithDelayCallback, {
             actor = actor,
             destCellName = cellName,
             destPos = pos,
@@ -603,7 +603,7 @@ An example:
         engineHandlers = {
             onKeyPress = function(key)
                 if key.symbol == 'x' then
-                    async:newUnsavableTimerInSeconds(
+                    async:newUnsavableSimulationTimer(
                         10,
                         function()
                             ui.showMessage('You have pressed "X" 10 seconds ago')
@@ -613,28 +613,21 @@ An example:
         }
     }
 
-Also in `openmw_aux`_ are the helper functions ``runEveryNSeconds`` and ``runEveryNHours``, they are implemented on top of unsavable timers:
+Also in `openmw_aux`_ is the helper function ``runRepeatedly``, it is implemented on top of unsavable timers:
 
 .. code-block:: Lua
 
-    local async = require('openmw.async')
     local core = require('openmw.core')
+    local time = require('openmw_aux.time')
 
-    -- call `doSomething()` at the end of every game day.
-    -- `timeBeforeMidnight` is a delay before the first call. `24` is an interval.
+    -- call `doSomething()` at the end of every game day. 
+    -- the second argument (`time.day`) is the interval.
     -- the periodical evaluation can be stopped at any moment by calling `stopFn()`
-    local timeBeforeMidnight = 24 - math.fmod(core.getGameTimeInHours(), 24)
-    local stopFn = aux_util.runEveryNHours(24, doSomething, timeBeforeMidnight)
-
-    return {
-        engineHandlers = {
-            onLoad = function()
-                -- the timer is unsavable, so we need to restart it in `onLoad`.
-                timeBeforeMidnight = 24 - math.fmod(core.getGameTimeInHours(), 24)
-                stopFn = aux_util.runEveryNHours(24, doSomething, timeBeforeMidnight)
-            end,
-        }
-    }
+    local timeBeforeMidnight = time.day - core.getGameTime() % time.day
+    local stopFn = time.runRepeatedly(doSomething, time.day, {
+        initialDelay = timeBeforeMidnight,
+        type = time.GameTime,
+    })
 
 
 Queries
diff --git a/files/builtin_scripts/openmw_aux/time.lua b/files/builtin_scripts/openmw_aux/time.lua
index a6aac0fa1a..1c543c53b8 100644
--- a/files/builtin_scripts/openmw_aux/time.lua
+++ b/files/builtin_scripts/openmw_aux/time.lua
@@ -66,7 +66,7 @@ end
 --     function() print('Test2') end, 5 * time.minute,
 --     { initialDelay = 30 * time.second })
 -- @usage
--- local timeBeforeMidnight = time.day - time.gameTime() % time.day
+-- local timeBeforeMidnight = time.day - core.getGameTime() % time.day
 -- time.runRepeatedly(doSomething, time.day, {
 --     initialDelay = timeBeforeMidnight,
 --     type = time.GameTime,

From 649c2f828659f559a821209a9f30c4f85cab2dcf Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 14 Feb 2022 18:38:37 +0100
Subject: [PATCH 2115/2859] Fix stats not working right for saves started
 before version 17

---
 apps/openmw/mwmechanics/stat.cpp     |  4 ++--
 apps/openmw/mwworld/cellstore.cpp    |  5 +++++
 apps/openmw/mwworld/magiceffects.cpp | 13 +++++++++++--
 apps/openmw/mwworld/magiceffects.hpp |  2 ++
 apps/openmw/mwworld/player.cpp       |  2 ++
 components/esm3/savedgame.cpp        |  2 +-
 6 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwmechanics/stat.cpp b/apps/openmw/mwmechanics/stat.cpp
index 585808645a..eacfca98ae 100644
--- a/apps/openmw/mwmechanics/stat.cpp
+++ b/apps/openmw/mwmechanics/stat.cpp
@@ -21,13 +21,13 @@ namespace MWMechanics
     void Stat<T>::writeState (ESM::StatState<T>& state) const
     {
         state.mBase = mBase;
-        state.mMod = mModifier + mBase;
+        state.mMod = mModifier;
     }
     template<typename T>
     void Stat<T>::readState (const ESM::StatState<T>& state)
     {
         mBase = state.mBase;
-        mModifier = state.mMod - mBase;
+        mModifier = state.mMod;
     }
 
 
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index b0c2ea3a23..75136eb915 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -185,6 +185,11 @@ namespace
             else if constexpr (std::is_same_v<T, ESM::NPC>)
                 MWWorld::convertMagicEffects(state.mCreatureStats, state.mInventory, &state.mNpcStats);
         }
+        else if(state.mVersion < 20)
+        {
+            if constexpr (std::is_same_v<T, ESM::Creature> || std::is_same_v<T, ESM::NPC>)
+                MWWorld::convertStats(state.mCreatureStats);
+        }
 
         if (state.mRef.mRefNum.hasContentFile())
         {
diff --git a/apps/openmw/mwworld/magiceffects.cpp b/apps/openmw/mwworld/magiceffects.cpp
index f52a61af52..44c4061832 100644
--- a/apps/openmw/mwworld/magiceffects.cpp
+++ b/apps/openmw/mwworld/magiceffects.cpp
@@ -201,14 +201,23 @@ namespace MWWorld
         {
             auto& dynamic = creatureStats.mDynamic[i];
             dynamic.mCurrent -= dynamic.mMod - dynamic.mBase;
-            dynamic.mMod = dynamic.mBase;
+            dynamic.mMod = 0.f;
         }
         for(std::size_t i = 0; i < 4; ++i)
-            creatureStats.mAiSettings[i].mMod = creatureStats.mAiSettings[i].mBase;
+            creatureStats.mAiSettings[i].mMod = 0.f;
         if(npcStats)
         {
             for(std::size_t i = 0; i < ESM::Skill::Length; ++i)
                 npcStats->mSkills[i].mMod = 0.f;
         }
     }
+
+    // Versions 17-19 wrote different modifiers to the savegame depending on whether the save had upgraded from a pre-17 version or not
+    void convertStats(ESM::CreatureStats& creatureStats)
+    {
+        for(std::size_t i = 0; i < 3; ++i)
+            creatureStats.mDynamic[i].mMod = 0.f;
+        for(std::size_t i = 0; i < 4; ++i)
+            creatureStats.mAiSettings[i].mMod = 0.f;
+    }
 }
diff --git a/apps/openmw/mwworld/magiceffects.hpp b/apps/openmw/mwworld/magiceffects.hpp
index 31d5ed2038..fdcc578e53 100644
--- a/apps/openmw/mwworld/magiceffects.hpp
+++ b/apps/openmw/mwworld/magiceffects.hpp
@@ -12,6 +12,8 @@ namespace MWWorld
 {
     void convertMagicEffects(ESM::CreatureStats& creatureStats, ESM::InventoryState& inventory,
         ESM::NpcStats* npcStats = nullptr);
+
+    void convertStats(ESM::CreatureStats& creatureStats);
 }
 
 #endif
diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp
index 7062366697..45e87a7942 100644
--- a/apps/openmw/mwworld/player.cpp
+++ b/apps/openmw/mwworld/player.cpp
@@ -383,6 +383,8 @@ namespace MWWorld
             }
             if (reader.getFormat() < 17)
                 convertMagicEffects(player.mObject.mCreatureStats, player.mObject.mInventory, &player.mObject.mNpcStats);
+            else if(reader.getFormat() < 20)
+                convertStats(player.mObject.mCreatureStats);
 
             if (!player.mObject.mEnabled)
             {
diff --git a/components/esm3/savedgame.cpp b/components/esm3/savedgame.cpp
index 6cecf26489..18498abe2c 100644
--- a/components/esm3/savedgame.cpp
+++ b/components/esm3/savedgame.cpp
@@ -4,7 +4,7 @@
 #include "esmwriter.hpp"
 
 unsigned int ESM::SavedGame::sRecordId = ESM::REC_SAVE;
-int ESM::SavedGame::sCurrentFormat = 19;
+int ESM::SavedGame::sCurrentFormat = 20;
 
 void ESM::SavedGame::load (ESMReader &esm)
 {

From 071ab3f6508890080ae38a7b13a141f9292276a2 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 14 Feb 2022 19:56:50 +0100
Subject: [PATCH 2116/2859] Fix out of bounds access for std::string_view

---
 components/fontloader/fontloader.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index 36174d0b7e..d0125398f1 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -30,6 +30,8 @@ namespace
 {
     unsigned long utf8ToUnicode(std::string_view utf8)
     {
+        if (utf8.empty())
+            return 0;
         size_t i = 0;
         unsigned long unicode;
         size_t numbytes;

From fbbf8710673057801b7063d4b7d6d36baf1c4e11 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 14 Feb 2022 22:36:07 +0100
Subject: [PATCH 2117/2859] Avoid extra copy for Utf8Encoder::getUtf8 result

---
 apps/mwiniimporter/importer.cpp        | 36 ++++++++++++++------------
 components/translation/translation.cpp | 12 ++++-----
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/apps/mwiniimporter/importer.cpp b/apps/mwiniimporter/importer.cpp
index 35d9701803..f7523b11cf 100644
--- a/apps/mwiniimporter/importer.cpp
+++ b/apps/mwiniimporter/importer.cpp
@@ -663,49 +663,51 @@ MwIniImporter::multistrmap MwIniImporter::loadIniFile(const boost::filesystem::p
     std::string line;
     while (std::getline(file, line)) {
 
-        line = encoder.getUtf8(line);
+        std::string_view utf8 = encoder.getUtf8(line);
 
         // unify Unix-style and Windows file ending
-        if (!(line.empty()) && (line[line.length()-1]) == '\r') {
-            line = line.substr(0, line.length()-1);
+        if (!(utf8.empty()) && (utf8[utf8.length()-1]) == '\r') {
+            utf8 = utf8.substr(0, utf8.length()-1);
         }
 
-        if(line.empty()) {
+        if(utf8.empty()) {
             continue;
         }
 
-        if(line[0] == '[') {
-            int pos = static_cast<int>(line.find(']'));
+        if(utf8[0] == '[') {
+            int pos = static_cast<int>(utf8.find(']'));
             if(pos < 2) {
-                std::cout << "Warning: ini file wrongly formatted (" << line << "). Line ignored." << std::endl;
+                std::cout << "Warning: ini file wrongly formatted (" << utf8 << "). Line ignored." << std::endl;
                 continue;
             }
 
-            section = line.substr(1, line.find(']')-1);
+            section = utf8.substr(1, utf8.find(']')-1);
             continue;
         }
 
-        int comment_pos = static_cast<int>(line.find(';'));
+        int comment_pos = static_cast<int>(utf8.find(';'));
         if(comment_pos > 0) {
-            line = line.substr(0,comment_pos);
+            utf8 = utf8.substr(0,comment_pos);
         }
 
-        int pos = static_cast<int>(line.find('='));
+        int pos = static_cast<int>(utf8.find('='));
         if(pos < 1) {
             continue;
         }
 
-        std::string key(section + ":" + line.substr(0,pos));
-        std::string value(line.substr(pos+1));
+        std::string key(section + ":" + std::string(utf8.substr(0, pos)));
+        const std::string_view value(utf8.substr(pos+1));
         if(value.empty()) {
             std::cout << "Warning: ignored empty value for key '" << key << "'." << std::endl;
             continue;
         }
 
-        if(map.find(key) == map.end()) {
-            map.insert( std::make_pair (key, std::vector<std::string>() ) );
-        }
-        map[key].push_back(value);
+        auto it = map.find(key);
+
+        if (it == map.end())
+            it = map.emplace_hint(it, std::move(key), std::vector<std::string>());
+
+        it->second.push_back(std::string(value));
     }
 
     return map;
diff --git a/components/translation/translation.cpp b/components/translation/translation.cpp
index ef0f432075..f2cdd803e7 100644
--- a/components/translation/translation.cpp
+++ b/components/translation/translation.cpp
@@ -53,16 +53,16 @@ namespace Translation
 
             if (!line.empty())
             {
-                line = mEncoder->getUtf8(line);
+                const std::string_view utf8 = mEncoder->getUtf8(line);
 
-                size_t tab_pos = line.find('\t');
-                if (tab_pos != std::string::npos && tab_pos > 0 && tab_pos < line.size() - 1)
+                size_t tab_pos = utf8.find('\t');
+                if (tab_pos != std::string::npos && tab_pos > 0 && tab_pos < utf8.size() - 1)
                 {
-                    std::string key = line.substr(0, tab_pos);
-                    std::string value = line.substr(tab_pos + 1);
+                    const std::string_view key = utf8.substr(0, tab_pos);
+                    const std::string_view value = utf8.substr(tab_pos + 1);
 
                     if (!key.empty() && !value.empty())
-                        container.insert(std::make_pair(key, value));
+                        container.emplace(key, value);
                 }
             }
         }

From c044bef6a77edeea44d35ac908841cbe49610b75 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 14 Feb 2022 22:26:01 +0100
Subject: [PATCH 2118/2859] Add StatelessUtf8Encoder to support caller provided
 buffer for output

---
 apps/opencs/editor.cpp                        |   2 +-
 .../contentselector/model/contentmodel.cpp    |   3 +-
 components/to_utf8/to_utf8.cpp                | 131 ++++++++++--------
 components/to_utf8/to_utf8.hpp                |  41 ++++--
 4 files changed, 105 insertions(+), 72 deletions(-)

diff --git a/apps/opencs/editor.cpp b/apps/opencs/editor.cpp
index 1d5934fe5d..07154f6d55 100644
--- a/apps/opencs/editor.cpp
+++ b/apps/opencs/editor.cpp
@@ -370,7 +370,7 @@ int CS::Editor::run()
     else
     {
         ESM::ESMReader fileReader;
-        ToUTF8::Utf8Encoder encoder = ToUTF8::calculateEncoding(mEncodingName);
+        ToUTF8::Utf8Encoder encoder(ToUTF8::calculateEncoding(mEncodingName));
         fileReader.setEncoder(&encoder);
         fileReader.open(mFileToLoad.string());
 
diff --git a/components/contentselector/model/contentmodel.cpp b/components/contentselector/model/contentmodel.cpp
index 57dfe0f87e..f7cedc83a4 100644
--- a/components/contentselector/model/contentmodel.cpp
+++ b/components/contentselector/model/contentmodel.cpp
@@ -445,8 +445,7 @@ void ContentSelectorModel::ContentModel::addFiles(const QString &path)
 
         try {
             ESM::ESMReader fileReader;
-            ToUTF8::Utf8Encoder encoder =
-            ToUTF8::calculateEncoding(mEncoding.toStdString());
+            ToUTF8::Utf8Encoder encoder(ToUTF8::calculateEncoding(mEncoding.toStdString()));
             fileReader.setEncoder(&encoder);
             fileReader.open(std::string(dir.absoluteFilePath(path2).toUtf8().constData()));
 
diff --git a/components/to_utf8/to_utf8.cpp b/components/to_utf8/to_utf8.cpp
index 1f0a81ad10..a193e6375d 100644
--- a/components/to_utf8/to_utf8.cpp
+++ b/components/to_utf8/to_utf8.cpp
@@ -51,42 +51,52 @@ namespace
     {
         return std::find_if(input.begin(), input.end(), [] (unsigned char v) { return v == 0 || v >= 128; });
     }
-}
 
-Utf8Encoder::Utf8Encoder(const FromType sourceEncoding):
-    mOutput(50*1024)
-{
-    switch (sourceEncoding)
+    std::basic_string_view<signed char> getTranslationArray(FromType sourceEncoding)
     {
-        case ToUTF8::WINDOWS_1252:
+        switch (sourceEncoding)
         {
-            translationArray = ToUTF8::windows_1252;
-            break;
-        }
-        case ToUTF8::WINDOWS_1250:
-        {
-            translationArray = ToUTF8::windows_1250;
-            break;
-        }
-        case ToUTF8::WINDOWS_1251:
-        {
-            translationArray = ToUTF8::windows_1251;
-            break;
-        }
-        case ToUTF8::CP437:
-        {
-            translationArray = ToUTF8::cp437;
-            break;
+            case ToUTF8::WINDOWS_1252:
+                return ToUTF8::windows_1252;
+            case ToUTF8::WINDOWS_1250:
+                return ToUTF8::windows_1250;
+            case ToUTF8::WINDOWS_1251:
+                return ToUTF8::windows_1251;
+            case ToUTF8::CP437:
+                return ToUTF8::cp437;
         }
+        throw std::logic_error("Invalid source encoding: " + std::to_string(sourceEncoding));
+    }
 
-        default:
+    // Make sure the output vector is large enough for 'size' bytes,
+    // including a terminating zero after it.
+    void resize(std::size_t size, BufferAllocationPolicy bufferAllocationPolicy, std::string& buffer)
+    {
+        if (buffer.size() >= size)
+            return;
+
+        switch (bufferAllocationPolicy)
         {
-            assert(0);
+            case BufferAllocationPolicy::FitToRequiredSize:
+                buffer.resize(size);
+                break;
+            case BufferAllocationPolicy::UseGrowFactor:
+                // Add some extra padding to reduce the chance of having to resize
+                // again later.
+                buffer.resize(3 * size);
+                // And make sure the string is zero terminated
+                buffer[size] = 0;
+                break;
         }
     }
 }
 
-std::string_view Utf8Encoder::getUtf8(std::string_view input)
+StatelessUtf8Encoder::StatelessUtf8Encoder(FromType sourceEncoding)
+    : mTranslationArray(getTranslationArray(sourceEncoding))
+{
+}
+
+std::string_view StatelessUtf8Encoder::getUtf8(std::string_view input, BufferAllocationPolicy bufferAllocationPolicy, std::string& buffer) const
 {
     if (input.empty())
         return input;
@@ -106,24 +116,24 @@ std::string_view Utf8Encoder::getUtf8(std::string_view input)
         return std::string_view(input.data(), outlen);
 
     // Make sure the output is large enough
-    resize(outlen);
-    char *out = &mOutput[0];
+    resize(outlen, bufferAllocationPolicy, buffer);
+    char *out = buffer.data();
 
     // Translate
     for (auto it = input.begin(); it != input.end() && *it != 0; ++it)
         copyFromArray(*it, out);
 
     // Make sure that we wrote the correct number of bytes
-    assert((out-&mOutput[0]) == (int)outlen);
+    assert((out - buffer.data()) == (int)outlen);
 
     // And make extra sure the output is null terminated
-    assert(mOutput.size() > outlen);
-    assert(mOutput[outlen] == 0);
+    assert(buffer.size() >= outlen);
+    assert(buffer[outlen] == 0);
 
-    return std::string_view(mOutput.data(), outlen);
+    return std::string_view(buffer.data(), outlen);
 }
 
-std::string_view Utf8Encoder::getLegacyEnc(std::string_view input)
+std::string_view StatelessUtf8Encoder::getLegacyEnc(std::string_view input, BufferAllocationPolicy bufferAllocationPolicy, std::string& buffer) const
 {
     if (input.empty())
         return input;
@@ -143,34 +153,21 @@ std::string_view Utf8Encoder::getLegacyEnc(std::string_view input)
         return std::string_view(input.data(), outlen);
 
     // Make sure the output is large enough
-    resize(outlen);
-    char *out = &mOutput[0];
+    resize(outlen, bufferAllocationPolicy, buffer);
+    char *out = buffer.data();
 
     // Translate
     for (auto it = input.begin(); it != input.end() && *it != 0;)
         copyFromArrayLegacyEnc(it, input.end(), out);
 
     // Make sure that we wrote the correct number of bytes
-    assert((out-&mOutput[0]) == (int)outlen);
+    assert((out - buffer.data()) == static_cast<int>(outlen));
 
     // And make extra sure the output is null terminated
-    assert(mOutput.size() > outlen);
-    assert(mOutput[outlen] == 0);
+    assert(buffer.size() >= outlen);
+    assert(buffer[outlen] == 0);
 
-    return std::string_view(mOutput.data(), outlen);
-}
-
-// Make sure the output vector is large enough for 'size' bytes,
-// including a terminating zero after it.
-void Utf8Encoder::resize(size_t size)
-{
-    if (mOutput.size() <= size)
-        // Add some extra padding to reduce the chance of having to resize
-        // again later.
-        mOutput.resize(3*size);
-
-    // And make sure the string is zero terminated
-    mOutput[size] = 0;
+    return std::string_view(buffer.data(), outlen);
 }
 
 /** Get the total length length needed to decode the given string with
@@ -183,7 +180,7 @@ void Utf8Encoder::resize(size_t size)
   is the case, then the ascii parameter is set to true, and the
   caller can optimize for this case.
  */
-std::pair<std::size_t, bool> Utf8Encoder::getLength(std::string_view input) const
+std::pair<std::size_t, bool> StatelessUtf8Encoder::getLength(std::string_view input) const
 {
     // Do away with the ascii part of the string first (this is almost
     // always the entire string.)
@@ -201,7 +198,7 @@ std::pair<std::size_t, bool> Utf8Encoder::getLength(std::string_view input) cons
     {
         // Find the translated length of this character in the
         // lookup table.
-        len += translationArray[static_cast<unsigned char>(*it) * 6];
+        len += mTranslationArray[static_cast<unsigned char>(*it) * 6];
         ++it;
     }
     while (it != input.end() && *it != 0);
@@ -211,7 +208,7 @@ std::pair<std::size_t, bool> Utf8Encoder::getLength(std::string_view input) cons
 
 // Translate one character 'ch' using the translation array 'arr', and
 // advance the output pointer accordingly.
-void Utf8Encoder::copyFromArray(unsigned char ch, char* &out) const
+void StatelessUtf8Encoder::copyFromArray(unsigned char ch, char* &out) const
 {
     // Optimize for ASCII values
     if (ch < 128)
@@ -220,13 +217,13 @@ void Utf8Encoder::copyFromArray(unsigned char ch, char* &out) const
         return;
     }
 
-    const signed char *in = translationArray + ch*6;
+    const signed char *in = &mTranslationArray[ch * 6];
     int len = *(in++);
     memcpy(out, in, len);
     out += len;
 }
 
-std::pair<std::size_t, bool> Utf8Encoder::getLengthLegacyEnc(std::string_view input) const
+std::pair<std::size_t, bool> StatelessUtf8Encoder::getLengthLegacyEnc(std::string_view input) const
 {
     // Do away with the ascii part of the string first (this is almost
     // always the entire string.)
@@ -271,7 +268,7 @@ std::pair<std::size_t, bool> Utf8Encoder::getLengthLegacyEnc(std::string_view in
     return {len, false};
 }
 
-void Utf8Encoder::copyFromArrayLegacyEnc(std::string_view::iterator& chp, std::string_view::iterator end, char* &out) const
+void StatelessUtf8Encoder::copyFromArrayLegacyEnc(std::string_view::iterator& chp, std::string_view::iterator end, char* &out) const
 {
     unsigned char ch = *(chp++);
     // Optimize for ASCII values
@@ -316,7 +313,7 @@ void Utf8Encoder::copyFromArrayLegacyEnc(std::string_view::iterator& chp, std::s
 
     for (int i = 128; i < 256; i++)
     {
-        unsigned char b1 = translationArray[i*6 + 1], b2 = translationArray[i*6 + 2], b3 = translationArray[i*6 + 3];
+        unsigned char b1 = mTranslationArray[i*6 + 1], b2 = mTranslationArray[i*6 + 2], b3 = mTranslationArray[i*6 + 3];
         if (b1 == ch && b2 == ch2 && (len != 3 || b3 == ch3))
         {
             *(out++) = (char)i;
@@ -329,6 +326,22 @@ void Utf8Encoder::copyFromArrayLegacyEnc(std::string_view::iterator& chp, std::s
     *(out++) = ch; // Could not find glyph, just put whatever
 }
 
+Utf8Encoder::Utf8Encoder(FromType sourceEncoding)
+    : mBuffer(50 * 1024, '\0')
+    , mImpl(sourceEncoding)
+{
+}
+
+std::string_view Utf8Encoder::getUtf8(std::string_view input)
+{
+    return mImpl.getUtf8(input, BufferAllocationPolicy::UseGrowFactor, mBuffer);
+}
+
+std::string_view Utf8Encoder::getLegacyEnc(std::string_view input)
+{
+    return mImpl.getLegacyEnc(input, BufferAllocationPolicy::UseGrowFactor, mBuffer);
+}
+
 ToUTF8::FromType ToUTF8::calculateEncoding(const std::string& encodingName)
 {
     if (encodingName == "win1250")
diff --git a/components/to_utf8/to_utf8.hpp b/components/to_utf8/to_utf8.hpp
index 794c9148e5..037e3ea3bf 100644
--- a/components/to_utf8/to_utf8.hpp
+++ b/components/to_utf8/to_utf8.hpp
@@ -18,34 +18,55 @@ namespace ToUTF8
         CP437           // Used for fonts (*.fnt) if data files encoding is 1252. Otherwise, uses the same encoding as the data files.
     };
 
+    enum class BufferAllocationPolicy
+    {
+        FitToRequiredSize,
+        UseGrowFactor,
+    };
+
     FromType calculateEncoding(const std::string& encodingName);
     std::string encodingUsingMessage(const std::string& encodingName);
 
-    // class
+    class StatelessUtf8Encoder
+    {
+        public:
+            explicit StatelessUtf8Encoder(FromType sourceEncoding);
+
+            /// Convert to UTF8 from the previously given code page.
+            /// Returns a view to passed buffer that will be resized to fit output if it's too small.
+            std::string_view getUtf8(std::string_view input, BufferAllocationPolicy bufferAllocationPolicy, std::string& buffer) const;
+
+            /// Convert from UTF-8 to sourceEncoding.
+            /// Returns a view to passed buffer that will be resized to fit output if it's too small.
+            std::string_view getLegacyEnc(std::string_view input, BufferAllocationPolicy bufferAllocationPolicy, std::string& buffer) const;
+
+        private:
+            inline std::pair<std::size_t, bool> getLength(std::string_view input) const;
+            inline void copyFromArray(unsigned char chp, char* &out) const;
+            inline std::pair<std::size_t, bool> getLengthLegacyEnc(std::string_view input) const;
+            inline void copyFromArrayLegacyEnc(std::string_view::iterator& chp, std::string_view::iterator end, char* &out) const;
+
+            const std::basic_string_view<signed char> mTranslationArray;
+    };
 
     class Utf8Encoder
     {
         public:
-            Utf8Encoder(FromType sourceEncoding);
+            explicit Utf8Encoder(FromType sourceEncoding);
 
             /// Convert to UTF8 from the previously given code page.
             /// Returns a view to internal buffer invalidate by next getUtf8 or getLegacyEnc call if input is not
             /// ASCII-only string. Otherwise returns a view to the input.
             std::string_view getUtf8(std::string_view input);
 
+            /// Convert from UTF-8 to sourceEncoding.
             /// Returns a view to internal buffer invalidate by next getUtf8 or getLegacyEnc call if input is not
             /// ASCII-only string. Otherwise returns a view to the input.
             std::string_view getLegacyEnc(std::string_view input);
 
         private:
-            inline void resize(std::size_t size);
-            inline std::pair<std::size_t, bool> getLength(std::string_view input) const;
-            inline void copyFromArray(unsigned char chp, char* &out) const;
-            inline std::pair<std::size_t, bool> getLengthLegacyEnc(std::string_view input) const;
-            inline void copyFromArrayLegacyEnc(std::string_view::iterator& chp, std::string_view::iterator end, char* &out) const;
-
-            std::vector<char> mOutput;
-            const signed char* translationArray;
+            std::string mBuffer;
+            StatelessUtf8Encoder mImpl;
     };
 }
 

From 3305b400dcbeff24c39247c3317f1a88be1d296b Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 28 Jan 2022 18:40:17 +0100
Subject: [PATCH 2119/2859] Use ESM::NAME instead of const char* and
 std::string as argument type

---
 apps/esmtool/esmtool.cpp                      |  6 +--
 .../esm/test_fixed_string.cpp                 | 31 ++++++++------
 components/esm/esmcommon.hpp                  | 42 +++++++++++++++++++
 components/esm3/activespells.cpp              |  4 +-
 components/esm3/aipackage.cpp                 |  2 +-
 components/esm3/cellref.cpp                   |  8 ++--
 components/esm3/cellref.hpp                   |  5 ++-
 components/esm3/esmreader.cpp                 | 16 +++----
 components/esm3/esmreader.hpp                 | 22 +++++-----
 components/esm3/esmwriter.cpp                 | 31 +++++---------
 components/esm3/esmwriter.hpp                 | 32 +++++++-------
 components/esm3/loadlevlist.hpp               | 16 ++++---
 components/esm3/weatherstate.cpp              | 22 +++++-----
 13 files changed, 137 insertions(+), 100 deletions(-)

diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp
index 4fe0b248af..a7946c77a6 100644
--- a/apps/esmtool/esmtool.cpp
+++ b/apps/esmtool/esmtool.cpp
@@ -484,9 +484,9 @@ int clone(Arguments& info)
         if (i <= 0)
             break;
 
-        const ESM::NAME& typeName = record->getType();
+        const ESM::NAME typeName = record->getType();
 
-        esm.startRecord(typeName.toString(), record->getFlags());
+        esm.startRecord(typeName, record->getFlags());
 
         record->save(esm);
         if (typeName.toInt() == ESM::REC_CELL) {
@@ -498,7 +498,7 @@ int clone(Arguments& info)
             }
         }
 
-        esm.endRecord(typeName.toString());
+        esm.endRecord(typeName);
 
         saved++;
         int perc = recordCount == 0 ? 100 : (int)((saved / (float)recordCount)*100);
diff --git a/apps/openmw_test_suite/esm/test_fixed_string.cpp b/apps/openmw_test_suite/esm/test_fixed_string.cpp
index 26fb1590d5..1189f667e5 100644
--- a/apps/openmw_test_suite/esm/test_fixed_string.cpp
+++ b/apps/openmw_test_suite/esm/test_fixed_string.cpp
@@ -1,12 +1,12 @@
 #include <gtest/gtest.h>
 #include "components/esm/esmcommon.hpp"
+#include "components/esm/defs.hpp"
 
 TEST(EsmFixedString, operator__eq_ne)
 {
     {
         SCOPED_TRACE("asdc == asdc");
-        ESM::NAME name;
-        name.assign("asdc");
+        constexpr ESM::NAME name("asdc");
         char s[4] = {'a', 's', 'd', 'c'};
         std::string ss(s, 4);
 
@@ -16,8 +16,7 @@ TEST(EsmFixedString, operator__eq_ne)
     }
     {
         SCOPED_TRACE("asdc == asdcx");
-        ESM::NAME name;
-        name.assign("asdc");
+        constexpr ESM::NAME name("asdc");
         char s[5] = {'a', 's', 'd', 'c', 'x'};
         std::string ss(s, 5);
 
@@ -27,8 +26,7 @@ TEST(EsmFixedString, operator__eq_ne)
     }
     {
         SCOPED_TRACE("asdc == asdc[NULL]");
-        ESM::NAME name;
-        name.assign("asdc");
+        const ESM::NAME name("asdc");
         char s[5] = {'a', 's', 'd', 'c', '\0'};
         std::string ss(s, 5);
 
@@ -41,8 +39,7 @@ TEST(EsmFixedString, operator__eq_ne_const)
 {
     {
         SCOPED_TRACE("asdc == asdc (const)");
-        ESM::NAME name;
-        name.assign("asdc");
+        constexpr ESM::NAME name("asdc");
         const char s[4] = { 'a', 's', 'd', 'c' };
         std::string ss(s, 4);
 
@@ -52,8 +49,7 @@ TEST(EsmFixedString, operator__eq_ne_const)
     }
     {
         SCOPED_TRACE("asdc == asdcx (const)");
-        ESM::NAME name;
-        name.assign("asdc");
+        constexpr ESM::NAME name("asdc");
         const char s[5] = { 'a', 's', 'd', 'c', 'x' };
         std::string ss(s, 5);
 
@@ -63,8 +59,7 @@ TEST(EsmFixedString, operator__eq_ne_const)
     }
     {
         SCOPED_TRACE("asdc == asdc[NULL] (const)");
-        ESM::NAME name;
-        name.assign("asdc");
+        constexpr ESM::NAME name("asdc");
         const char s[5] = { 'a', 's', 'd', 'c', '\0' };
         std::string ss(s, 5);
 
@@ -148,3 +143,15 @@ TEST(EsmFixedString, assignment_operator_is_supported_for_uint32)
     value = static_cast<uint32_t>(0xFEDCBA98u);
     EXPECT_EQ(value, static_cast<uint32_t>(0xFEDCBA98u)) << value.toInt();
 }
+
+TEST(EsmFixedString, construction_from_uint32_is_supported)
+{
+    constexpr ESM::NAME value(0xFEDCBA98u);
+    EXPECT_EQ(value, static_cast<std::uint32_t>(0xFEDCBA98u)) << value.toInt();
+}
+
+TEST(EsmFixedString, construction_from_RecNameInts_is_supported)
+{
+    constexpr ESM::NAME value(ESM::RecNameInts::REC_ACTI);
+    EXPECT_EQ(value, static_cast<std::uint32_t>(ESM::RecNameInts::REC_ACTI)) << value.toInt();
+}
diff --git a/components/esm/esmcommon.hpp b/components/esm/esmcommon.hpp
index 921eeed744..7ca059020f 100644
--- a/components/esm/esmcommon.hpp
+++ b/components/esm/esmcommon.hpp
@@ -6,6 +6,8 @@
 #include <vector>
 #include <string_view>
 #include <cstdint>
+#include <cassert>
+#include <limits>
 
 namespace ESM
 {
@@ -30,6 +32,41 @@ struct FixedString
 
     char mData[capacity];
 
+    FixedString() = default;
+
+    template <std::size_t size>
+    constexpr FixedString(const char (&value)[size]) noexcept
+        : mData()
+    {
+        if constexpr (capacity == sizeof(std::uint32_t))
+        {
+            static_assert(capacity == size || capacity + 1 == size);
+            if constexpr (capacity + 1 == size)
+                assert(value[capacity] == '\0');
+            for (std::size_t i = 0; i < capacity; ++i)
+                mData[i] = value[i];
+        }
+        else
+        {
+            const std::size_t length = std::min(capacity, size);
+            for (std::size_t i = 0; i < length; ++i)
+                mData[i] = value[i];
+            mData[std::min(capacity - 1, length)] = '\0';
+        }
+    }
+
+    constexpr explicit FixedString(std::uint32_t value) noexcept
+        : mData()
+    {
+        static_assert(capacity == sizeof(std::uint32_t));
+        for (std::size_t i = 0; i < capacity; ++i)
+            mData[i] = static_cast<char>((value >> (i * std::numeric_limits<std::uint8_t>::digits)) & std::numeric_limits<std::uint8_t>::max());
+    }
+
+    template <class T>
+    constexpr explicit FixedString(T value) noexcept
+        : FixedString(static_cast<std::uint32_t>(value)) {}
+
     std::string_view toStringView() const noexcept
     {
         return std::string_view(mData, strnlen(mData, capacity));
@@ -116,6 +153,11 @@ inline bool operator==(const FixedString<4>& lhs, std::uint32_t rhs) noexcept
     return lhs.toInt() == rhs;
 }
 
+inline bool operator==(const FixedString<4>& lhs, const FixedString<4>& rhs) noexcept
+{
+    return lhs.toInt() == rhs.toInt();
+}
+
 template <std::size_t capacity, class Rhs>
 inline bool operator!=(const FixedString<capacity>& lhs, const Rhs& rhs) noexcept
 {
diff --git a/components/esm3/activespells.cpp b/components/esm3/activespells.cpp
index 22f862b6e4..61be6a7838 100644
--- a/components/esm3/activespells.cpp
+++ b/components/esm3/activespells.cpp
@@ -5,7 +5,7 @@
 
 namespace
 {
-    void save(ESM::ESMWriter& esm, const std::vector<ESM::ActiveSpells::ActiveSpellParams>& spells, const std::string& tag)
+    void save(ESM::ESMWriter& esm, const std::vector<ESM::ActiveSpells::ActiveSpellParams>& spells, ESM::NAME tag)
     {
         for (const auto& params : spells)
         {
@@ -38,7 +38,7 @@ namespace
         }
     }
 
-    void load(ESM::ESMReader& esm, std::vector<ESM::ActiveSpells::ActiveSpellParams>& spells, const char* tag)
+    void load(ESM::ESMReader& esm, std::vector<ESM::ActiveSpells::ActiveSpellParams>& spells, ESM::NAME tag)
     {
         int format = esm.getFormat();
 
diff --git a/components/esm3/aipackage.cpp b/components/esm3/aipackage.cpp
index fa20d271c0..5a95e58ca8 100644
--- a/components/esm3/aipackage.cpp
+++ b/components/esm3/aipackage.cpp
@@ -65,7 +65,7 @@ namespace ESM
 
             case AI_Escort:
             case AI_Follow: {
-                const char *name = (it->mType == AI_Escort) ? "AI_E" : "AI_F";
+                const ESM::NAME name = (it->mType == AI_Escort) ? ESM::NAME("AI_E") : ESM::NAME("AI_F");
                 esm.writeHNT(name, it->mTarget, sizeof(it->mTarget));
                 esm.writeHNOCString("CNDT", it->mCellName);
                 break;
diff --git a/components/esm3/cellref.cpp b/components/esm3/cellref.cpp
index 002a885d92..8487b3c0f0 100644
--- a/components/esm3/cellref.cpp
+++ b/components/esm3/cellref.cpp
@@ -5,15 +5,15 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
-void ESM::RefNum::load (ESMReader& esm, bool wide, const std::string& tag)
+void ESM::RefNum::load(ESMReader& esm, bool wide, ESM::NAME tag)
 {
     if (wide)
-        esm.getHNT (*this, tag.c_str(), 8);
+        esm.getHNT(*this, tag, 8);
     else
-        esm.getHNT (mIndex, tag.c_str());
+        esm.getHNT(mIndex, tag);
 }
 
-void ESM::RefNum::save (ESMWriter &esm, bool wide, const std::string& tag) const
+void ESM::RefNum::save(ESMWriter &esm, bool wide, ESM::NAME tag) const
 {
     if (wide)
         esm.writeHNT (tag, *this, 8);
diff --git a/components/esm3/cellref.hpp b/components/esm3/cellref.hpp
index 55e4b700fc..cff635f455 100644
--- a/components/esm3/cellref.hpp
+++ b/components/esm3/cellref.hpp
@@ -5,6 +5,7 @@
 #include <string>
 
 #include "components/esm/defs.hpp"
+#include "components/esm/esmcommon.hpp"
 
 namespace ESM
 {
@@ -18,9 +19,9 @@ namespace ESM
         unsigned int mIndex;
         int mContentFile;
 
-        void load (ESMReader& esm, bool wide = false, const std::string& tag = "FRMR");
+        void load(ESMReader& esm, bool wide = false, ESM::NAME tag = "FRMR");
 
-        void save (ESMWriter &esm, bool wide = false, const std::string& tag = "FRMR") const;
+        void save(ESMWriter &esm, bool wide = false, ESM::NAME tag = "FRMR") const;
 
         inline bool hasContentFile() const { return mContentFile >= 0; }
 
diff --git a/components/esm3/esmreader.cpp b/components/esm3/esmreader.cpp
index 165263d6e4..47974e45a8 100644
--- a/components/esm3/esmreader.cpp
+++ b/components/esm3/esmreader.cpp
@@ -113,14 +113,14 @@ void ESMReader::open(const std::string &file)
     open (Files::openConstrainedFileStream (file.c_str ()), file);
 }
 
-std::string ESMReader::getHNOString(const char* name)
+std::string ESMReader::getHNOString(NAME name)
 {
     if (isNextSub(name))
         return getHString();
     return "";
 }
 
-std::string ESMReader::getHNString(const char* name)
+std::string ESMReader::getHNString(NAME name)
 {
     getSubNameIs(name);
     return getHString();
@@ -156,21 +156,21 @@ void ESMReader::getHExact(void*p, int size)
 }
 
 // Read the given number of bytes from a named subrecord
-void ESMReader::getHNExact(void*p, int size, const char* name)
+void ESMReader::getHNExact(void*p, int size, NAME name)
 {
     getSubNameIs(name);
     getHExact(p, size);
 }
 
 // Get the next subrecord name and check if it matches the parameter
-void ESMReader::getSubNameIs(const char* name)
+void ESMReader::getSubNameIs(NAME name)
 {
     getSubName();
     if (mCtx.subName != name)
-        fail("Expected subrecord " + std::string(name) + " but got " + mCtx.subName.toString());
+        fail("Expected subrecord " + name.toString() + " but got " + mCtx.subName.toString());
 }
 
-bool ESMReader::isNextSub(const char* name)
+bool ESMReader::isNextSub(NAME name)
 {
     if (!hasMoreSubs())
         return false;
@@ -185,7 +185,7 @@ bool ESMReader::isNextSub(const char* name)
     return !mCtx.subCached;
 }
 
-bool ESMReader::peekNextSub(const char *name)
+bool ESMReader::peekNextSub(NAME name)
 {
     if (!hasMoreSubs())
         return false;
@@ -226,7 +226,7 @@ void ESMReader::skipHSubSize(int size)
         reportSubSizeMismatch(mCtx.leftSub, size);
 }
 
-void ESMReader::skipHSubUntil(const char *name)
+void ESMReader::skipHSubUntil(NAME name)
 {
     while (hasMoreSubs() && !isNextSub(name))
     {
diff --git a/components/esm3/esmreader.hpp b/components/esm3/esmreader.hpp
index 3b384dc603..e370946ee9 100644
--- a/components/esm3/esmreader.hpp
+++ b/components/esm3/esmreader.hpp
@@ -98,7 +98,7 @@ public:
 
   // Read data of a given type, stored in a subrecord of a given name
   template <typename X>
-  void getHNT(X &x, const char* name)
+  void getHNT(X &x, NAME name)
   {
     getSubNameIs(name);
     getHT(x);
@@ -106,7 +106,7 @@ public:
 
   // Optional version of getHNT
   template <typename X>
-  void getHNOT(X &x, const char* name)
+  void getHNOT(X &x, NAME name)
   {
       if(isNextSub(name))
           getHT(x);
@@ -115,7 +115,7 @@ public:
   // Version with extra size checking, to make sure the compiler
   // doesn't mess up our struct padding.
   template <typename X>
-  void getHNT(X &x, const char* name, int size)
+  void getHNT(X &x, NAME name, int size)
   {
       assert(sizeof(X) == size);
       getSubNameIs(name);
@@ -123,7 +123,7 @@ public:
   }
 
   template <typename X>
-  void getHNOT(X &x, const char* name, int size)
+  void getHNOT(X &x, NAME name, int size)
   {
       assert(sizeof(X) == size);
       if(isNextSub(name))
@@ -150,10 +150,10 @@ public:
   }
 
   // Read a string by the given name if it is the next record.
-  std::string getHNOString(const char* name);
+  std::string getHNOString(NAME name);
 
   // Read a string with the given sub-record name
-  std::string getHNString(const char* name);
+  std::string getHNString(NAME name);
 
   // Read a string, including the sub-record header (but not the name)
   std::string getHString();
@@ -162,7 +162,7 @@ public:
   void getHExact(void*p, int size);
 
   // Read the given number of bytes from a named subrecord
-  void getHNExact(void*p, int size, const char* name);
+  void getHNExact(void*p, int size, NAME name);
 
   /*************************************************************************
    *
@@ -171,16 +171,16 @@ public:
    *************************************************************************/
 
   // Get the next subrecord name and check if it matches the parameter
-  void getSubNameIs(const char* name);
+  void getSubNameIs(NAME name);
 
   /** Checks if the next sub record name matches the parameter. If it
       does, it is read into 'subName' just as if getSubName() was
       called. If not, the read name will still be available for future
       calls to getSubName(), isNextSub() and getSubNameIs().
    */
-  bool isNextSub(const char* name);
+  bool isNextSub(NAME name);
 
-  bool peekNextSub(const char* name);
+  bool peekNextSub(NAME name);
 
   // Store the current subrecord name for the next call of getSubName()
   void cacheSubName() {mCtx.subCached = true; };
@@ -197,7 +197,7 @@ public:
   void skipHSubSize(int size);
 
   // Skip all subrecords until the given subrecord or no more subrecords remaining
-  void skipHSubUntil(const char* name);
+  void skipHSubUntil(NAME name);
 
   /* Sub-record header. This updates leftRec beyond the current
      sub-record as well. leftSub contains size of current sub-record.
diff --git a/components/esm3/esmwriter.cpp b/components/esm3/esmwriter.cpp
index d0137c5131..77ba5fc6aa 100644
--- a/components/esm3/esmwriter.cpp
+++ b/components/esm3/esmwriter.cpp
@@ -86,7 +86,7 @@ namespace ESM
             throw std::runtime_error ("Unclosed record remaining");
     }
 
-    void ESMWriter::startRecord(const std::string& name, uint32_t flags)
+    void ESMWriter::startRecord(ESM::NAME name, uint32_t flags)
     {
         mRecordCount++;
 
@@ -105,15 +105,10 @@ namespace ESM
 
     void ESMWriter::startRecord (uint32_t name, uint32_t flags)
     {
-        std::string type;
-        for (int i=0; i<4; ++i)
-            /// \todo make endianess agnostic
-            type += reinterpret_cast<const char *> (&name)[i];
-
-        startRecord (type, flags);
+        startRecord(ESM::NAME(name), flags);
     }
 
-    void ESMWriter::startSubRecord(const std::string& name)
+    void ESMWriter::startSubRecord(ESM::NAME name)
     {
         // Sub-record hierarchies are not properly supported in ESMReader. This should be fixed later.
         assert (mRecords.size() <= 1);
@@ -129,7 +124,7 @@ namespace ESM
         assert(mRecords.back().size == 0);
     }
 
-    void ESMWriter::endRecord(const std::string& name)
+    void ESMWriter::endRecord(ESM::NAME name)
     {
         RecordData rec = mRecords.back();
         assert(rec.name == name);
@@ -147,22 +142,17 @@ namespace ESM
 
     void ESMWriter::endRecord (uint32_t name)
     {
-        std::string type;
-        for (int i=0; i<4; ++i)
-            /// \todo make endianess agnostic
-            type += reinterpret_cast<const char *> (&name)[i];
-
-        endRecord (type);
+        endRecord(ESM::NAME(name));
     }
 
-    void ESMWriter::writeHNString(const std::string& name, const std::string& data)
+    void ESMWriter::writeHNString(ESM::NAME name, const std::string& data)
     {
         startSubRecord(name);
         writeHString(data);
         endRecord(name);
     }
 
-    void ESMWriter::writeHNString(const std::string& name, const std::string& data, size_t size)
+    void ESMWriter::writeHNString(ESM::NAME name, const std::string& data, size_t size)
     {
         assert(data.size() <= size);
         startSubRecord(name);
@@ -177,7 +167,7 @@ namespace ESM
         endRecord(name);
     }
 
-    void ESMWriter::writeFixedSizeString(const std::string &data, int size)
+    void ESMWriter::writeFixedSizeString(const std::string& data, int size)
     {
         std::string string;
         if (!data.empty())
@@ -206,10 +196,9 @@ namespace ESM
             write("\0", 1);
     }
 
-    void ESMWriter::writeName(const std::string& name)
+    void ESMWriter::writeName(ESM::NAME name)
     {
-        assert((name.size() == 4 && name[3] != '\0'));
-        write(name.c_str(), name.size());
+        write(name.mData, ESM::NAME::sCapacity);
     }
 
     void ESMWriter::write(const char* data, size_t size)
diff --git a/components/esm3/esmwriter.hpp b/components/esm3/esmwriter.hpp
index 3073daf15e..8ee507f39d 100644
--- a/components/esm3/esmwriter.hpp
+++ b/components/esm3/esmwriter.hpp
@@ -19,7 +19,7 @@ class ESMWriter
 {
         struct RecordData
         {
-            std::string name;
+            ESM::NAME name;
             std::streampos position;
             uint32_t size;
         };
@@ -56,27 +56,27 @@ class ESMWriter
         void close();
         ///< \note Does not close the stream.
 
-        void writeHNString(const std::string& name, const std::string& data);
-        void writeHNString(const std::string& name, const std::string& data, size_t size);
-        void writeHNCString(const std::string& name, const std::string& data)
+        void writeHNString(ESM::NAME name, const std::string& data);
+        void writeHNString(ESM::NAME name, const std::string& data, size_t size);
+        void writeHNCString(ESM::NAME name, const std::string& data)
         {
             startSubRecord(name);
             writeHCString(data);
             endRecord(name);
         }
-        void writeHNOString(const std::string& name, const std::string& data)
+        void writeHNOString(ESM::NAME name, const std::string& data)
         {
             if (!data.empty())
                 writeHNString(name, data);
         }
-        void writeHNOCString(const std::string& name, const std::string& data)
+        void writeHNOCString(ESM::NAME name, const std::string& data)
         {
             if (!data.empty())
                 writeHNCString(name, data);
         }
 
         template<typename T>
-        void writeHNT(const std::string& name, const T& data)
+        void writeHNT(ESM::NAME name, const T& data)
         {
             startSubRecord(name);
             writeT(data);
@@ -84,7 +84,7 @@ class ESMWriter
         }
 
         template<typename T, std::size_t size>
-        void writeHNT(const std::string& name, const T (&data)[size])
+        void writeHNT(ESM::NAME name, const T (&data)[size])
         {
             startSubRecord(name);
             writeT(data);
@@ -94,15 +94,15 @@ class ESMWriter
         // Prevent using writeHNT with strings. This already happened by accident and results in
         // state being discarded without any error on writing or reading it. :(
         // writeHNString and friends must be used instead.
-        void writeHNT(const std::string& name, const std::string& data) = delete;
+        void writeHNT(ESM::NAME name, const std::string& data) = delete;
 
-        void writeT(const std::string& data) = delete;
+        void writeT(ESM::NAME data) = delete;
 
         template<typename T, std::size_t size>
-        void writeHNT(const std::string& name, const T (&data)[size], int) = delete;
+        void writeHNT(ESM::NAME name, const T (&data)[size], int) = delete;
 
         template<typename T>
-        void writeHNT(const std::string& name, const T& data, int size)
+        void writeHNT(ESM::NAME name, const T& data, int size)
         {
             startSubRecord(name);
             writeT(data, size);
@@ -129,16 +129,16 @@ class ESMWriter
             write((char*)&data, size);
         }
 
-        void startRecord(const std::string& name, uint32_t flags = 0);
+        void startRecord(ESM::NAME name, uint32_t flags = 0);
         void startRecord(uint32_t name, uint32_t flags = 0);
         /// @note Sub-record hierarchies are not properly supported in ESMReader. This should be fixed later.
-        void startSubRecord(const std::string& name);
-        void endRecord(const std::string& name);
+        void startSubRecord(ESM::NAME name);
+        void endRecord(ESM::NAME name);
         void endRecord(uint32_t name);
         void writeFixedSizeString(const std::string& data, int size);
         void writeHString(const std::string& data);
         void writeHCString(const std::string& data);
-        void writeName(const std::string& data);
+        void writeName(ESM::NAME data);
         void write(const char* data, size_t size);
 
     private:
diff --git a/components/esm3/loadlevlist.hpp b/components/esm3/loadlevlist.hpp
index 0ebd7a64cb..aea85b20e0 100644
--- a/components/esm3/loadlevlist.hpp
+++ b/components/esm3/loadlevlist.hpp
@@ -4,6 +4,8 @@
 #include <string>
 #include <vector>
 
+#include <components/esm/esmcommon.hpp>
+
 namespace ESM
 {
 
@@ -27,7 +29,7 @@ struct LevelledListBase
 
     // Record name used to read references. Must be set before load() is
     // called.
-    const char *mRecName;
+    ESM::NAME mRecName;
 
     struct LevelItem
     {
@@ -37,6 +39,8 @@ struct LevelledListBase
 
     std::vector<LevelItem> mList;
 
+    explicit LevelledListBase(ESM::NAME recName) : mRecName(recName) {}
+
     void load(ESMReader &esm, bool &isDeleted);
     void save(ESMWriter &esm, bool isDeleted = false) const;
 
@@ -58,10 +62,7 @@ struct CreatureLevList: LevelledListBase
                           // player.
     };
 
-    CreatureLevList()
-    {
-        mRecName = "CNAM";
-    }
+    CreatureLevList() : LevelledListBase("CNAM") {}
 };
 
 struct ItemLevList: LevelledListBase
@@ -84,10 +85,7 @@ struct ItemLevList: LevelledListBase
                           // player.
     };
 
-    ItemLevList()
-    {
-        mRecName = "INAM";
-    }
+    ItemLevList() : LevelledListBase("INAM") {}
 };
 
 }
diff --git a/components/esm3/weatherstate.cpp b/components/esm3/weatherstate.cpp
index cd1a82b0b7..c791aac145 100644
--- a/components/esm3/weatherstate.cpp
+++ b/components/esm3/weatherstate.cpp
@@ -5,17 +5,17 @@
 
 namespace
 {
-    const char* currentRegionRecord     = "CREG";
-    const char* timePassedRecord        = "TMPS";
-    const char* fastForwardRecord       = "FAST";
-    const char* weatherUpdateTimeRecord = "WUPD";
-    const char* transitionFactorRecord  = "TRFC";
-    const char* currentWeatherRecord    = "CWTH";
-    const char* nextWeatherRecord       = "NWTH";
-    const char* queuedWeatherRecord     = "QWTH";
-    const char* regionNameRecord        = "RGNN";
-    const char* regionWeatherRecord     = "RGNW";
-    const char* regionChanceRecord      = "RGNC";
+    constexpr ESM::NAME currentRegionRecord     = "CREG";
+    constexpr ESM::NAME timePassedRecord        = "TMPS";
+    constexpr ESM::NAME fastForwardRecord       = "FAST";
+    constexpr ESM::NAME weatherUpdateTimeRecord = "WUPD";
+    constexpr ESM::NAME transitionFactorRecord  = "TRFC";
+    constexpr ESM::NAME currentWeatherRecord    = "CWTH";
+    constexpr ESM::NAME nextWeatherRecord       = "NWTH";
+    constexpr ESM::NAME queuedWeatherRecord     = "QWTH";
+    constexpr ESM::NAME regionNameRecord        = "RGNN";
+    constexpr ESM::NAME regionWeatherRecord     = "RGNW";
+    constexpr ESM::NAME regionChanceRecord      = "RGNC";
 }
 
 namespace ESM

From f9da792386eb4692dcc3a87e0665ecb2d2da7cc6 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Tue, 15 Feb 2022 17:25:07 +0100
Subject: [PATCH 2120/2859] Force a scale update when changing view modes

---
 apps/openmw/mwbase/world.hpp          | 2 +-
 apps/openmw/mwrender/npcanimation.cpp | 2 +-
 apps/openmw/mwworld/worldimp.cpp      | 6 +++---
 apps/openmw/mwworld/worldimp.hpp      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 1d9e4fae2d..0b55484278 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -293,7 +293,7 @@ namespace MWBase
             virtual MWWorld::Ptr moveObjectBy(const MWWorld::Ptr &ptr, const osg::Vec3f& vec) = 0;
             ///< @return an updated Ptr
 
-            virtual void scaleObject (const MWWorld::Ptr& ptr, float scale) = 0;
+            virtual void scaleObject (const MWWorld::Ptr& ptr, float scale, bool force = false) = 0;
 
             virtual void rotateObject(const MWWorld::Ptr& ptr, const osg::Vec3f& rot, RotationFlags flags = RotationFlag_inverseOrder) = 0;
 
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 47aeaf53af..3fdfaed72d 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -296,7 +296,7 @@ void NpcAnimation::setViewMode(NpcAnimation::ViewMode viewMode)
         return;
 
     mViewMode = viewMode;
-    MWBase::Environment::get().getWorld()->scaleObject(mPtr, mPtr.getCellRef().getScale()); // apply race height after view change
+    MWBase::Environment::get().getWorld()->scaleObject(mPtr, mPtr.getCellRef().getScale(), true); // apply race height after view change
 
     mAmmunition.reset();
     rebuild();
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 61abb7fcc2..a5ab0968ee 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1281,9 +1281,9 @@ namespace MWWorld
         return moveObject(ptr, newpos);
     }
 
-    void World::scaleObject (const Ptr& ptr, float scale)
+    void World::scaleObject (const Ptr& ptr, float scale, bool force)
     {
-        if (scale == ptr.getCellRef().getScale())
+        if (!force && scale == ptr.getCellRef().getScale())
             return;
         if (mPhysics->getActor(ptr))
             mNavigator->removeAgent(getPathfindingHalfExtents(ptr));
@@ -2482,7 +2482,7 @@ namespace MWWorld
         player.getClass().getInventoryStore(player).setInvListener(anim, player);
         player.getClass().getInventoryStore(player).setContListener(anim);
 
-        scaleObject(player, player.getCellRef().getScale()); // apply race height
+        scaleObject(player, player.getCellRef().getScale(), true); // apply race height
         rotateObject(player, osg::Vec3f(), MWBase::RotationFlag_inverseOrder | MWBase::RotationFlag_adjust);
 
         MWBase::Environment::get().getMechanicsManager()->add(getPlayerPtr());
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 84d97ce37c..61154afb59 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -377,7 +377,7 @@ namespace MWWorld
             MWWorld::Ptr moveObjectBy(const Ptr& ptr, const osg::Vec3f& vec) override;
             ///< @return an updated Ptr
 
-            void scaleObject (const Ptr& ptr, float scale) override;
+            void scaleObject (const Ptr& ptr, float scale, bool force = false) override;
 
             /// World rotates object, uses radians
             /// @note Rotations via this method use a different rotation order than the initial rotations in the CS. This

From 875d9dcead1490406e42276fd7e52f53b342fff9 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 15 Feb 2022 22:54:23 +0100
Subject: [PATCH 2121/2859] Fix buffer resizing by StatelessUtf8Encoder

---
 apps/openmw_test_suite/toutf8/toutf8.cpp | 20 ++++++++++++++++++++
 components/to_utf8/to_utf8.cpp           |  8 +++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/apps/openmw_test_suite/toutf8/toutf8.cpp b/apps/openmw_test_suite/toutf8/toutf8.cpp
index bad4f34fd5..d1cf6b2851 100644
--- a/apps/openmw_test_suite/toutf8/toutf8.cpp
+++ b/apps/openmw_test_suite/toutf8/toutf8.cpp
@@ -136,4 +136,24 @@ namespace
         Params {ToUTF8::WINDOWS_1251, "russian-win1251.txt", "russian-utf8.txt"},
         Params {ToUTF8::WINDOWS_1252, "french-win1252.txt", "french-utf8.txt"}
     ));
+
+    TEST(StatelessUtf8EncoderTest, shouldCleanupBuffer)
+    {
+        std::string buffer;
+        StatelessUtf8Encoder encoder(FromType::WINDOWS_1252);
+        encoder.getUtf8(std::string_view("long string\x92"), BufferAllocationPolicy::UseGrowFactor, buffer);
+        const std::string shortString("short\x92");
+        ASSERT_GT(buffer.size(), shortString.size());
+        const std::string_view shortUtf8 = encoder.getUtf8(shortString, BufferAllocationPolicy::UseGrowFactor, buffer);
+        ASSERT_GE(buffer.size(), shortUtf8.size());
+        EXPECT_EQ(buffer[shortUtf8.size()], '\0') << buffer;
+    }
+
+    TEST(StatelessUtf8EncoderTest, withFitToRequiredSizeShouldResizeBuffer)
+    {
+        std::string buffer;
+        StatelessUtf8Encoder encoder(FromType::WINDOWS_1252);
+        const std::string_view utf8 = encoder.getUtf8(std::string_view("long string\x92"), BufferAllocationPolicy::FitToRequiredSize, buffer);
+        EXPECT_EQ(buffer.size(), utf8.size());
+    }
 }
diff --git a/components/to_utf8/to_utf8.cpp b/components/to_utf8/to_utf8.cpp
index a193e6375d..f4b52b644b 100644
--- a/components/to_utf8/to_utf8.cpp
+++ b/components/to_utf8/to_utf8.cpp
@@ -72,7 +72,13 @@ namespace
     // including a terminating zero after it.
     void resize(std::size_t size, BufferAllocationPolicy bufferAllocationPolicy, std::string& buffer)
     {
-        if (buffer.size() >= size)
+        if (buffer.size() > size)
+        {
+            buffer[size] = 0;
+            return;
+        }
+
+        if (buffer.size() == size)
             return;
 
         switch (bufferAllocationPolicy)

From 2e38f0b641c44ef8ff3139d2b93fd288c487871e Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 16 Feb 2022 02:58:21 +0100
Subject: [PATCH 2122/2859] Fix btAABB initialization

---
 apps/navmeshtool/worldspacedata.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/navmeshtool/worldspacedata.cpp b/apps/navmeshtool/worldspacedata.cpp
index 81bbd857f5..50e529c6e5 100644
--- a/apps/navmeshtool/worldspacedata.cpp
+++ b/apps/navmeshtool/worldspacedata.cpp
@@ -178,7 +178,7 @@ namespace NavMeshTool
                 static_cast<btScalar>(cellPosition.y() * ESM::Land::REAL_SIZE),
                 minHeight
             );
-            aabb.m_min = btVector3(
+            aabb.m_max = btVector3(
                 static_cast<btScalar>((cellPosition.x() + 1) * ESM::Land::REAL_SIZE),
                 static_cast<btScalar>((cellPosition.y() + 1) * ESM::Land::REAL_SIZE),
                 maxHeight

From 4a06351c3b0745b7f38955e0ba56f612eaa22462 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 16 Feb 2022 10:48:49 +0100
Subject: [PATCH 2123/2859] update to_utf8 and translation to make use of new
 stateless utf8

---
 components/to_utf8/to_utf8.cpp         | 280 +++++++++++++------------
 components/to_utf8/to_utf8.hpp         |  63 +++---
 components/translation/translation.cpp |  11 +-
 3 files changed, 185 insertions(+), 169 deletions(-)

diff --git a/components/to_utf8/to_utf8.cpp b/components/to_utf8/to_utf8.cpp
index 04edfda09d..a193e6375d 100644
--- a/components/to_utf8/to_utf8.cpp
+++ b/components/to_utf8/to_utf8.cpp
@@ -3,6 +3,7 @@
 #include <vector>
 #include <cassert>
 #include <stdexcept>
+#include <algorithm>
 
 #include <components/debug/debuglog.hpp>
 
@@ -44,55 +45,62 @@
 
 using namespace ToUTF8;
 
-Utf8Encoder::Utf8Encoder(const FromType sourceEncoding):
-    mOutput(50*1024)
+namespace
 {
-    switch (sourceEncoding)
+    std::string_view::iterator skipAscii(std::string_view input)
     {
-        case ToUTF8::WINDOWS_1252:
-        {
-            translationArray = ToUTF8::windows_1252;
-            break;
-        }
-        case ToUTF8::WINDOWS_1250:
-        {
-            translationArray = ToUTF8::windows_1250;
-            break;
-        }
-        case ToUTF8::WINDOWS_1251:
-        {
-            translationArray = ToUTF8::windows_1251;
-            break;
-        }
-        case ToUTF8::CP437:
+        return std::find_if(input.begin(), input.end(), [] (unsigned char v) { return v == 0 || v >= 128; });
+    }
+
+    std::basic_string_view<signed char> getTranslationArray(FromType sourceEncoding)
+    {
+        switch (sourceEncoding)
         {
-            translationArray = ToUTF8::cp437;
-            break;
+            case ToUTF8::WINDOWS_1252:
+                return ToUTF8::windows_1252;
+            case ToUTF8::WINDOWS_1250:
+                return ToUTF8::windows_1250;
+            case ToUTF8::WINDOWS_1251:
+                return ToUTF8::windows_1251;
+            case ToUTF8::CP437:
+                return ToUTF8::cp437;
         }
+        throw std::logic_error("Invalid source encoding: " + std::to_string(sourceEncoding));
+    }
+
+    // Make sure the output vector is large enough for 'size' bytes,
+    // including a terminating zero after it.
+    void resize(std::size_t size, BufferAllocationPolicy bufferAllocationPolicy, std::string& buffer)
+    {
+        if (buffer.size() >= size)
+            return;
 
-        default:
+        switch (bufferAllocationPolicy)
         {
-            assert(0);
+            case BufferAllocationPolicy::FitToRequiredSize:
+                buffer.resize(size);
+                break;
+            case BufferAllocationPolicy::UseGrowFactor:
+                // Add some extra padding to reduce the chance of having to resize
+                // again later.
+                buffer.resize(3 * size);
+                // And make sure the string is zero terminated
+                buffer[size] = 0;
+                break;
         }
     }
 }
 
-std::string Utf8Encoder::getUtf8(const char* input, size_t size)
+StatelessUtf8Encoder::StatelessUtf8Encoder(FromType sourceEncoding)
+    : mTranslationArray(getTranslationArray(sourceEncoding))
 {
-    // Double check that the input string stops at some point (it might
-    // contain zero terminators before this, inside its own data, which
-    // is also ok.)
-    assert(input[size] == 0);
-
-    std::string inputString(input, size);
-    std::string output;
-    toUtf8(inputString, output, size);
-
-    return output;
 }
 
-void Utf8Encoder::toUtf8(std::string& input, std::string& output, size_t size)
+std::string_view StatelessUtf8Encoder::getUtf8(std::string_view input, BufferAllocationPolicy bufferAllocationPolicy, std::string& buffer) const
 {
+    if (input.empty())
+        return input;
+
     // Note: The rest of this function is designed for single-character
     // input encodings only. It also assumes that the input encoding
     // shares its first 128 values (0-127) with ASCII. There are no plans
@@ -101,45 +109,34 @@ void Utf8Encoder::toUtf8(std::string& input, std::string& output, size_t size)
 
     // Compute output length, and check for pure ascii input at the same
     // time.
-    bool ascii;
-    size_t outlen = getLength(input.c_str(), ascii);
+    const auto [outlen, ascii] = getLength(input);
 
     // If we're pure ascii, then don't bother converting anything.
     if(ascii)
-    {
-        std::swap(input, output);
-        return;
-    }
+        return std::string_view(input.data(), outlen);
 
     // Make sure the output is large enough
-    if (output.size() <= outlen)
-        // Add some extra padding to reduce the chance of having to resize
-        // again later.
-        output.resize(3*outlen);
-
-    // And make sure the string is zero terminated
-    output[outlen] = 0;
-    char *in = &input[0];
-    char *out = &output[0];
+    resize(outlen, bufferAllocationPolicy, buffer);
+    char *out = buffer.data();
 
     // Translate
-    while (*in)
-        copyFromArray(*(in++), out);
+    for (auto it = input.begin(); it != input.end() && *it != 0; ++it)
+        copyFromArray(*it, out);
 
     // Make sure that we wrote the correct number of bytes
-    assert((out-&output[0]) == (int)outlen);
+    assert((out - buffer.data()) == (int)outlen);
 
     // And make extra sure the output is null terminated
-    assert(output.size() > outlen);
-    assert(output[outlen] == 0);
+    assert(buffer.size() >= outlen);
+    assert(buffer[outlen] == 0);
+
+    return std::string_view(buffer.data(), outlen);
 }
 
-std::string Utf8Encoder::getLegacyEnc(const char *input, size_t size)
+std::string_view StatelessUtf8Encoder::getLegacyEnc(std::string_view input, BufferAllocationPolicy bufferAllocationPolicy, std::string& buffer) const
 {
-    // Double check that the input string stops at some point (it might
-    // contain zero terminators before this, inside its own data, which
-    // is also ok.)
-    assert(input[size] == 0);
+    if (input.empty())
+        return input;
 
     // TODO: The rest of this function is designed for single-character
     // input encodings only. It also assumes that the input the input
@@ -149,43 +146,28 @@ std::string Utf8Encoder::getLegacyEnc(const char *input, size_t size)
 
     // Compute output length, and check for pure ascii input at the same
     // time.
-    bool ascii;
-    size_t outlen = getLength2(input, ascii);
+    const auto [outlen, ascii] = getLengthLegacyEnc(input);
 
     // If we're pure ascii, then don't bother converting anything.
     if(ascii)
-        return std::string(input, outlen);
+        return std::string_view(input.data(), outlen);
 
     // Make sure the output is large enough
-    resize(outlen);
-    char *out = &mOutput[0];
+    resize(outlen, bufferAllocationPolicy, buffer);
+    char *out = buffer.data();
 
     // Translate
-    while(*input)
-        copyFromArray2(input, out);
+    for (auto it = input.begin(); it != input.end() && *it != 0;)
+        copyFromArrayLegacyEnc(it, input.end(), out);
 
     // Make sure that we wrote the correct number of bytes
-    assert((out-&mOutput[0]) == (int)outlen);
+    assert((out - buffer.data()) == static_cast<int>(outlen));
 
     // And make extra sure the output is null terminated
-    assert(mOutput.size() > outlen);
-    assert(mOutput[outlen] == 0);
-
-    // Return a string
-    return std::string(&mOutput[0], outlen);
-}
-
-// Make sure the output vector is large enough for 'size' bytes,
-// including a terminating zero after it.
-void Utf8Encoder::resize(size_t size)
-{
-    if (mOutput.size() <= size)
-        // Add some extra padding to reduce the chance of having to resize
-        // again later.
-        mOutput.resize(3*size);
+    assert(buffer.size() >= outlen);
+    assert(buffer[outlen] == 0);
 
-    // And make sure the string is zero terminated
-    mOutput[size] = 0;
+    return std::string_view(buffer.data(), outlen);
 }
 
 /** Get the total length length needed to decode the given string with
@@ -198,39 +180,35 @@ void Utf8Encoder::resize(size_t size)
   is the case, then the ascii parameter is set to true, and the
   caller can optimize for this case.
  */
-size_t Utf8Encoder::getLength(const char* input, bool &ascii) const
+std::pair<std::size_t, bool> StatelessUtf8Encoder::getLength(std::string_view input) const
 {
-    ascii = true;
-    size_t len = 0;
-    const char* ptr = input;
-    unsigned char inp = *ptr;
-
     // Do away with the ascii part of the string first (this is almost
     // always the entire string.)
-    while (inp && inp < 128)
-        inp = *(++ptr);
-    len += (ptr-input);
+    auto it = skipAscii(input);
 
     // If we're not at the null terminator at this point, then there
     // were some non-ascii characters to deal with. Go to slow-mode for
     // the rest of the string.
-    if (inp)
+    if (it == input.end() || *it == 0)
+        return {it - input.begin(), true};
+
+    std::size_t len = it - input.begin();
+
+    do
     {
-        ascii = false;
-        while (inp)
-        {
-            // Find the translated length of this character in the
-            // lookup table.
-            len += translationArray[inp*6];
-            inp = *(++ptr);
-        }
+        // Find the translated length of this character in the
+        // lookup table.
+        len += mTranslationArray[static_cast<unsigned char>(*it) * 6];
+        ++it;
     }
-    return len;
+    while (it != input.end() && *it != 0);
+
+    return {len, false};
 }
 
 // Translate one character 'ch' using the translation array 'arr', and
 // advance the output pointer accordingly.
-void Utf8Encoder::copyFromArray(unsigned char ch, char* &out) const
+void StatelessUtf8Encoder::copyFromArray(unsigned char ch, char* &out) const
 {
     // Optimize for ASCII values
     if (ch < 128)
@@ -239,57 +217,58 @@ void Utf8Encoder::copyFromArray(unsigned char ch, char* &out) const
         return;
     }
 
-    const signed char *in = translationArray + ch*6;
+    const signed char *in = &mTranslationArray[ch * 6];
     int len = *(in++);
     memcpy(out, in, len);
     out += len;
 }
 
-size_t Utf8Encoder::getLength2(const char* input, bool &ascii) const
+std::pair<std::size_t, bool> StatelessUtf8Encoder::getLengthLegacyEnc(std::string_view input) const
 {
-    ascii = true;
-    size_t len = 0;
-    const char* ptr = input;
-    unsigned char inp = *ptr;
-
     // Do away with the ascii part of the string first (this is almost
     // always the entire string.)
-    while (inp && inp < 128)
-        inp = *(++ptr);
-    len += (ptr-input);
+    auto it = skipAscii(input);
 
     // If we're not at the null terminator at this point, then there
     // were some non-ascii characters to deal with. Go to slow-mode for
     // the rest of the string.
-    if (inp)
+    if (it == input.end() || *it == 0)
+        return {it - input.begin(), true};
+
+    std::size_t len = it - input.begin();
+    std::size_t symbolLen = 0;
+
+    do
     {
-        ascii = false;
-        while(inp)
+        symbolLen += 1;
+        // Find the translated length of this character in the
+        // lookup table.
+        switch (static_cast<unsigned char>(*it))
         {
-            len += 1;
-            // Find the translated length of this character in the
-            // lookup table.
-            switch(inp)
-            {
-                case 0xe2: len -= 2; break;
-                case 0xc2:
-                case 0xcb:
-                case 0xc4:
-                case 0xc6:
-                case 0xc3:
-                case 0xd0:
-                case 0xd1:
-                case 0xd2:
-                case 0xc5: len -= 1; break;
-            }
-
-            inp = *(++ptr);
+            case 0xe2: symbolLen -= 2; break;
+            case 0xc2:
+            case 0xcb:
+            case 0xc4:
+            case 0xc6:
+            case 0xc3:
+            case 0xd0:
+            case 0xd1:
+            case 0xd2:
+            case 0xc5: symbolLen -= 1; break;
+            default:
+                len += symbolLen;
+                symbolLen = 0;
+                break;
         }
+
+        ++it;
     }
-    return len;
+    while (it != input.end() && *it != 0);
+
+    return {len, false};
 }
 
-void Utf8Encoder::copyFromArray2(const char*& chp, char* &out) const
+void StatelessUtf8Encoder::copyFromArrayLegacyEnc(std::string_view::iterator& chp, std::string_view::iterator end, char* &out) const
 {
     unsigned char ch = *(chp++);
     // Optimize for ASCII values
@@ -320,14 +299,21 @@ void Utf8Encoder::copyFromArray2(const char*& chp, char* &out) const
         return;
     }
 
+    if (chp == end)
+        return;
+
     unsigned char ch2 = *(chp++);
     unsigned char ch3 = '\0';
     if (len == 3)
+    {
+        if (chp == end)
+            return;
         ch3 = *(chp++);
+    }
 
     for (int i = 128; i < 256; i++)
     {
-        unsigned char b1 = translationArray[i*6 + 1], b2 = translationArray[i*6 + 2], b3 = translationArray[i*6 + 3];
+        unsigned char b1 = mTranslationArray[i*6 + 1], b2 = mTranslationArray[i*6 + 2], b3 = mTranslationArray[i*6 + 3];
         if (b1 == ch && b2 == ch2 && (len != 3 || b3 == ch3))
         {
             *(out++) = (char)i;
@@ -340,6 +326,22 @@ void Utf8Encoder::copyFromArray2(const char*& chp, char* &out) const
     *(out++) = ch; // Could not find glyph, just put whatever
 }
 
+Utf8Encoder::Utf8Encoder(FromType sourceEncoding)
+    : mBuffer(50 * 1024, '\0')
+    , mImpl(sourceEncoding)
+{
+}
+
+std::string_view Utf8Encoder::getUtf8(std::string_view input)
+{
+    return mImpl.getUtf8(input, BufferAllocationPolicy::UseGrowFactor, mBuffer);
+}
+
+std::string_view Utf8Encoder::getLegacyEnc(std::string_view input)
+{
+    return mImpl.getLegacyEnc(input, BufferAllocationPolicy::UseGrowFactor, mBuffer);
+}
+
 ToUTF8::FromType ToUTF8::calculateEncoding(const std::string& encodingName)
 {
     if (encodingName == "win1250")
diff --git a/components/to_utf8/to_utf8.hpp b/components/to_utf8/to_utf8.hpp
index 23dc09c06e..037e3ea3bf 100644
--- a/components/to_utf8/to_utf8.hpp
+++ b/components/to_utf8/to_utf8.hpp
@@ -4,6 +4,7 @@
 #include <string>
 #include <cstring>
 #include <vector>
+#include <string_view>
 
 namespace ToUTF8
 {
@@ -17,41 +18,55 @@ namespace ToUTF8
         CP437           // Used for fonts (*.fnt) if data files encoding is 1252. Otherwise, uses the same encoding as the data files.
     };
 
+    enum class BufferAllocationPolicy
+    {
+        FitToRequiredSize,
+        UseGrowFactor,
+    };
+
     FromType calculateEncoding(const std::string& encodingName);
     std::string encodingUsingMessage(const std::string& encodingName);
 
-    // class
+    class StatelessUtf8Encoder
+    {
+        public:
+            explicit StatelessUtf8Encoder(FromType sourceEncoding);
+
+            /// Convert to UTF8 from the previously given code page.
+            /// Returns a view to passed buffer that will be resized to fit output if it's too small.
+            std::string_view getUtf8(std::string_view input, BufferAllocationPolicy bufferAllocationPolicy, std::string& buffer) const;
+
+            /// Convert from UTF-8 to sourceEncoding.
+            /// Returns a view to passed buffer that will be resized to fit output if it's too small.
+            std::string_view getLegacyEnc(std::string_view input, BufferAllocationPolicy bufferAllocationPolicy, std::string& buffer) const;
+
+        private:
+            inline std::pair<std::size_t, bool> getLength(std::string_view input) const;
+            inline void copyFromArray(unsigned char chp, char* &out) const;
+            inline std::pair<std::size_t, bool> getLengthLegacyEnc(std::string_view input) const;
+            inline void copyFromArrayLegacyEnc(std::string_view::iterator& chp, std::string_view::iterator end, char* &out) const;
+
+            const std::basic_string_view<signed char> mTranslationArray;
+    };
 
     class Utf8Encoder
     {
         public:
-            Utf8Encoder(FromType sourceEncoding);
-
-            // Convert to UTF8 from the previously given code page.
-            std::string getUtf8(const char *input, size_t size);
-            inline std::string getUtf8(const std::string &str)
-            {
-                return getUtf8(str.c_str(), str.size());
-            }
+            explicit Utf8Encoder(FromType sourceEncoding);
 
-            // Convert input to UTF8 to the given output string
-            void toUtf8(std::string& input, std::string& output, size_t size);
+            /// Convert to UTF8 from the previously given code page.
+            /// Returns a view to internal buffer invalidate by next getUtf8 or getLegacyEnc call if input is not
+            /// ASCII-only string. Otherwise returns a view to the input.
+            std::string_view getUtf8(std::string_view input);
 
-            std::string getLegacyEnc(const char *input, size_t size);
-            inline std::string getLegacyEnc(const std::string &str)
-            {
-                return getLegacyEnc(str.c_str(), str.size());
-            }
+            /// Convert from UTF-8 to sourceEncoding.
+            /// Returns a view to internal buffer invalidate by next getUtf8 or getLegacyEnc call if input is not
+            /// ASCII-only string. Otherwise returns a view to the input.
+            std::string_view getLegacyEnc(std::string_view input);
 
         private:
-            void resize(size_t size);
-            size_t getLength(const char* input, bool &ascii) const;
-            void copyFromArray(unsigned char chp, char* &out) const;
-            size_t getLength2(const char* input, bool &ascii) const;
-            void copyFromArray2(const char*& chp, char* &out) const;
-
-            std::vector<char> mOutput;
-            const signed char* translationArray;
+            std::string mBuffer;
+            StatelessUtf8Encoder mImpl;
     };
 }
 
diff --git a/components/translation/translation.cpp b/components/translation/translation.cpp
index 37068fd70d..ef0f432075 100644
--- a/components/translation/translation.cpp
+++ b/components/translation/translation.cpp
@@ -53,14 +53,13 @@ namespace Translation
 
             if (!line.empty())
             {
-                std::string utf8Line;
-                mEncoder->toUtf8(line, utf8Line, line.size());
+                line = mEncoder->getUtf8(line);
 
-                size_t tab_pos = utf8Line.find('\t');
-                if (tab_pos != std::string::npos && tab_pos > 0 && tab_pos < utf8Line.size() - 1)
+                size_t tab_pos = line.find('\t');
+                if (tab_pos != std::string::npos && tab_pos > 0 && tab_pos < line.size() - 1)
                 {
-                    std::string key = utf8Line.substr(0, tab_pos);
-                    std::string value = utf8Line.substr(tab_pos + 1);
+                    std::string key = line.substr(0, tab_pos);
+                    std::string value = line.substr(tab_pos + 1);
 
                     if (!key.empty() && !value.empty())
                         container.insert(std::make_pair(key, value));

From 139ae9325ada954222cc691144926b519ae7abb1 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 14 Feb 2022 23:28:44 +0100
Subject: [PATCH 2124/2859] Fix compile errors by using StatelessUtf8Encoder

---
 components/esm/reader.cpp  | 38 +++++---------------------------------
 components/esm/reader.hpp  |  4 ++--
 components/esm4/reader.hpp |  4 ++--
 3 files changed, 9 insertions(+), 37 deletions(-)

diff --git a/components/esm/reader.cpp b/components/esm/reader.cpp
index 1f22b95b47..7fcc2cce3a 100644
--- a/components/esm/reader.cpp
+++ b/components/esm/reader.cpp
@@ -38,45 +38,17 @@ namespace ESM
     }
 
     bool Reader::getStringImpl(std::string& str, std::size_t size,
-            Files::IStreamPtr filestream, ToUTF8::Utf8Encoder* encoder, bool hasNull)
+            Files::IStreamPtr filestream, ToUTF8::StatelessUtf8Encoder* encoder, bool hasNull)
     {
         std::size_t newSize = size;
 
         if (encoder)
         {
-            if (!hasNull)
-                newSize += 1; // Utf8Encoder::getLength() expects a null terminator
-
-            std::string tmp;
-            tmp.resize(newSize);
-            filestream->read(&tmp[0], size);
-            if ((std::size_t)filestream->gcount() == size)
+            std::string input(size, '\0');
+            filestream->read(input.data(), size);
+            if (filestream->gcount() == static_cast<std::streamsize>(size))
             {
-                if (hasNull)
-                {
-                    assert (tmp[newSize - 1] == '\0'
-                            && "ESM4::Reader::getString string is not terminated with a null");
-                }
-                else
-                {
-                    // NOTE: script text of some mods have terminating null;
-                    //       unfortunately we just have to deal with it
-                    //if (tmp[newSize - 2] != '\0')
-                    tmp[newSize - 1] = '\0'; // for Utf8Encoder::getLength()
-                }
-
-                encoder->toUtf8(tmp, str, newSize - 1);
-                // NOTE: the encoder converts “keep” as “keep†which increases the length,
-                //       which results in below resize() truncating the string
-                if (str.size() == newSize)   // ascii
-                    str.resize(newSize - 1); // don't want the null terminator
-                else
-                {
-                    // this is a horrible hack but fortunately there's only a few like this
-                    std::string tmp2(str.data());
-                    str.swap(tmp2);
-                }
-
+                encoder->getUtf8(input, ToUTF8::BufferAllocationPolicy::FitToRequiredSize, str);
                 return true;
             }
         }
diff --git a/components/esm/reader.hpp b/components/esm/reader.hpp
index a5e3dd516b..5356d9bd01 100644
--- a/components/esm/reader.hpp
+++ b/components/esm/reader.hpp
@@ -31,7 +31,7 @@ namespace ESM
 
         virtual inline bool hasMoreRecs() const = 0;
 
-        virtual inline void setEncoder(ToUTF8::Utf8Encoder* encoder) = 0;
+        virtual inline void setEncoder(ToUTF8::StatelessUtf8Encoder* encoder) = 0;
 
         // used to check for dependencies e.g. CS::Editor::run()
         virtual inline const std::vector<ESM::MasterData>& getGameFiles() const = 0;
@@ -53,7 +53,7 @@ namespace ESM
 
     protected:
         bool getStringImpl(std::string& str, std::size_t size,
-                Files::IStreamPtr filestream, ToUTF8::Utf8Encoder* encoder, bool hasNull = false);
+                Files::IStreamPtr filestream, ToUTF8::StatelessUtf8Encoder* encoder, bool hasNull = false);
     };
 }
 
diff --git a/components/esm4/reader.hpp b/components/esm4/reader.hpp
index b3f1070495..c1bf808dd5 100644
--- a/components/esm4/reader.hpp
+++ b/components/esm4/reader.hpp
@@ -77,7 +77,7 @@ namespace ESM4 {
 
         ReaderContext        mCtx;
 
-        ToUTF8::Utf8Encoder* mEncoder;
+        ToUTF8::StatelessUtf8Encoder* mEncoder;
 
         std::size_t          mFileSize;
 
@@ -140,7 +140,7 @@ namespace ESM4 {
 
         inline bool isEsm4() const final { return true; }
 
-        inline void setEncoder(ToUTF8::Utf8Encoder* encoder) final { mEncoder = encoder; };
+        inline void setEncoder(ToUTF8::StatelessUtf8Encoder* encoder) final { mEncoder = encoder; };
 
         const std::vector<ESM::MasterData>& getGameFiles() const final { return mHeader.mMaster; }
 

From b96c41df075d90ea3aba940ebe6bd297925d39ac Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 16 Feb 2022 17:08:39 +0100
Subject: [PATCH 2125/2859] Initialize string_view with explicit size

Otherwise size is detected by null terminating character.
---
 components/to_utf8/to_utf8.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/to_utf8/to_utf8.cpp b/components/to_utf8/to_utf8.cpp
index f4b52b644b..7e7d3101fc 100644
--- a/components/to_utf8/to_utf8.cpp
+++ b/components/to_utf8/to_utf8.cpp
@@ -57,13 +57,13 @@ namespace
         switch (sourceEncoding)
         {
             case ToUTF8::WINDOWS_1252:
-                return ToUTF8::windows_1252;
+                return {ToUTF8::windows_1252, std::size(ToUTF8::windows_1252)};
             case ToUTF8::WINDOWS_1250:
-                return ToUTF8::windows_1250;
+                return {ToUTF8::windows_1250, std::size(ToUTF8::windows_1250)};
             case ToUTF8::WINDOWS_1251:
-                return ToUTF8::windows_1251;
+                return {ToUTF8::windows_1251, std::size(ToUTF8::windows_1251)};
             case ToUTF8::CP437:
-                return ToUTF8::cp437;
+                return {ToUTF8::cp437, std::size(ToUTF8::cp437)};
         }
         throw std::logic_error("Invalid source encoding: " + std::to_string(sourceEncoding));
     }

From 83be3826ff398e98f9926db77e67dc61cdbb6336 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Wed, 16 Feb 2022 18:19:10 +0200
Subject: [PATCH 2126/2859] Fix #6618: Crash due to iterator invalidation

---
 apps/openmw/mwmechanics/aisequence.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index a1f2b5c3e3..0bece95088 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -309,12 +309,18 @@ void AiSequence::execute (const MWWorld::Ptr& actor, CharacterController& charac
     {
         if (package->execute(actor, characterController, mAiState, duration))
         {
-            // Put repeating noncombat AI packages on the end of the stack so they can be used again
+            const auto packageIdx = std::distance(mPackages.begin(), packageIt);
+
+            // Put repeating non-combat AI packages on the end of the stack so they can be used again
             if (isActualAiPackage(packageTypeId) && package->getRepeat())
             {
                 package->reset();
                 mPackages.push_back(package->clone());
             }
+
+            // Iterator may have been invalidated by push back ensure its correct.
+            packageIt = mPackages.begin() + packageIdx;
+
             // To account for the rare case where AiPackage::execute() queued another AI package
             // (e.g. AiPursue executing a dialogue script that uses startCombat)
             erase(packageIt);

From e60e0b55ebd9688adc6902b88d2950b4fc573e79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Wed, 16 Feb 2022 18:19:55 +0200
Subject: [PATCH 2127/2859] Fix potential another crash

---
 apps/openmw/mwmechanics/aisequence.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index 0bece95088..8506e1daf0 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -291,7 +291,8 @@ void AiSequence::execute (const MWWorld::Ptr& actor, CharacterController& charac
             }
         }
 
-        assert(!mPackages.empty());
+        if (mPackages.empty())
+            return;
 
         if (nearestDist < std::numeric_limits<float>::max() && mPackages.begin() != itActualCombat)
         {

From 0ce29a61314f088202274e631b0ec6720a57a781 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Wed, 16 Feb 2022 20:21:10 +0200
Subject: [PATCH 2128/2859] Simplify logic in AiSequence::execute

---
 apps/openmw/mwmechanics/aisequence.cpp | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index 8506e1daf0..0cb1e97603 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -238,8 +238,7 @@ void AiSequence::execute (const MWWorld::Ptr& actor, CharacterController& charac
         return;
     }
 
-    auto packageIt = mPackages.begin();
-    MWMechanics::AiPackage* package = packageIt->get();
+    auto* package = mPackages.front().get();
     if (!package->alwaysActive() && outOfRange)
         return;
 
@@ -301,8 +300,7 @@ void AiSequence::execute (const MWWorld::Ptr& actor, CharacterController& charac
             std::rotate(mPackages.begin(), itActualCombat, std::next(itActualCombat));
         }
 
-        packageIt = mPackages.begin();
-        package = packageIt->get();
+        package = mPackages.front().get();
         packageTypeId = package->getTypeId();
     }
 
@@ -310,8 +308,6 @@ void AiSequence::execute (const MWWorld::Ptr& actor, CharacterController& charac
     {
         if (package->execute(actor, characterController, mAiState, duration))
         {
-            const auto packageIdx = std::distance(mPackages.begin(), packageIt);
-
             // Put repeating non-combat AI packages on the end of the stack so they can be used again
             if (isActualAiPackage(packageTypeId) && package->getRepeat())
             {
@@ -319,12 +315,9 @@ void AiSequence::execute (const MWWorld::Ptr& actor, CharacterController& charac
                 mPackages.push_back(package->clone());
             }
 
-            // Iterator may have been invalidated by push back ensure its correct.
-            packageIt = mPackages.begin() + packageIdx;
-
             // To account for the rare case where AiPackage::execute() queued another AI package
             // (e.g. AiPursue executing a dialogue script that uses startCombat)
-            erase(packageIt);
+            erase(mPackages.begin());
             if (isActualAiPackage(packageTypeId))
                 mDone = true;
         }

From 7bd4971e0c17ab8567aa4b4296c1106ba67ce611 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 16 Feb 2022 21:58:22 +0100
Subject: [PATCH 2129/2859] Disallow non-bipedal hand-to-hand refreshes

---
 apps/openmw/mwmechanics/character.cpp | 6 ++++--
 apps/openmw/mwmechanics/character.hpp | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 5f1c3c2d92..25a5ac6aa0 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -709,7 +709,9 @@ void CharacterController::refreshCurrentAnims(CharacterState idle, CharacterStat
     if (mPtr.getClass().isActor())
         refreshHitRecoilAnims(idle);
 
-    std::string weap = getWeaponType(mWeaponType)->mShortGroup;
+    std::string weap;
+    if (mWeaponType != ESM::Weapon::HandToHand || mPtr.getClass().isBipedal(mPtr))
+        weap = getWeaponType(mWeaponType)->mShortGroup;
 
     refreshJumpAnims(weap, jump, idle, force);
     refreshMovementAnims(weap, movement, idle, force);
@@ -1127,7 +1129,7 @@ bool CharacterController::updateCarriedLeftVisible(const int weaptype) const
     return mAnimation->updateCarriedLeftVisible(weaptype);
 }
 
-bool CharacterController::updateState(CharacterState& idle)
+bool CharacterController::updateState(CharacterState idle)
 {
     const MWWorld::Class &cls = mPtr.getClass();
     CreatureStats &stats = cls.getCreatureStats(mPtr);
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index 1a0fd42fba..e7f445054e 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -205,7 +205,7 @@ class CharacterController : public MWRender::Animation::TextKeyListener
 
     void clearAnimQueue(bool clearPersistAnims = false);
 
-    bool updateState(CharacterState& idle);
+    bool updateState(CharacterState idle);
     void updateIdleStormState(bool inwater);
 
     std::string chooseRandomAttackAnimation() const;

From de7f9f643994bc7bf1801c1678969895ae3f4866 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 16 Feb 2022 17:24:56 +0100
Subject: [PATCH 2130/2859] Replace raw for loop by algorithm
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

To fix compilation error with -D_GLIBCXX_DEBUG:
/home/elsid/dev/openmw/apps/openmw/mwdialogue/dialoguemanagerimp.cpp: In member function ‘virtual void MWDialogue::DialogueManager::write(ESM::ESMWriter&, Loading::Listener&) const’:
/home/elsid/dev/openmw/apps/openmw/mwdialogue/dialoguemanagerimp.cpp:679:78: error: no matching function for call to ‘__gnu_debug::_Safe_iterator<std::_Rb_tree_const_iterator<std::__cxx11::basic_string<char> >, std::__debug::set<std::__cxx11::basic_string<char> >, std::bidirectional_iterator_tag>::_Safe_iterator(std::__debug::set<std::__cxx11::basic_string<char>, Misc::StringUtils::CiComp>::const_iterator)’
  679 |         for (std::set<std::string>::const_iterator iter (mKnownTopics.begin());
      |                                                                              ^
---
 apps/openmw/mwdialogue/dialoguemanagerimp.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index 4612e2bdfd..feb3c22035 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -676,11 +676,8 @@ namespace MWDialogue
     {
         ESM::DialogueState state;
 
-        for (std::set<std::string>::const_iterator iter (mKnownTopics.begin());
-            iter!=mKnownTopics.end(); ++iter)
-        {
-            state.mKnownTopics.push_back (*iter);
-        }
+        state.mKnownTopics.reserve(mKnownTopics.size());
+        std::copy(mKnownTopics.begin(), mKnownTopics.end(), std::back_inserter(state.mKnownTopics));
 
         state.mChangedFactionReaction = mChangedFactionReaction;
 

From d96e2037e39f335c0c40a89fa9dd05a6f34da92b Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 17 Feb 2022 01:27:25 +0100
Subject: [PATCH 2131/2859] Build tests by gcc with enabled stdlibc++
 assertions in debug mode

This can catch some problems in the code like out of bounds access for
string_view element via operator[] when it refers a buffer larger than the
view.
---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aaf7f233f0..4c5223c212 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -116,11 +116,12 @@ Ubuntu_GCC_tests:
 Ubuntu_GCC_tests_Debug:
   extends: Ubuntu_GCC
   cache:
-    key: Ubuntu_GCC_tests_Debug.v1
+    key: Ubuntu_GCC_tests_Debug.v2
   variables:
     CCACHE_SIZE: 1G
     BUILD_TESTS_ONLY: 1
     CMAKE_BUILD_TYPE: Debug
+    CMAKE_CXX_FLAGS_DEBUG: -g -O0 -D_GLIBCXX_ASSERTIONS
   artifacts:
     paths: []
     expire_in: 1 minute

From dd473d06dffc3edc66e9311257a15da65ea4d048 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sat, 8 Jan 2022 05:53:10 +0300
Subject: [PATCH 2132/2859] Implement gloss-mapping (feature #6541)

---
 CHANGELOG.md                        |  1 +
 components/nifosg/nifloader.cpp     | 17 ++++++++++-------
 components/shader/shadervisitor.cpp | 10 +++++++++-
 files/shaders/objects_fragment.glsl | 15 +++++++++++++--
 files/shaders/objects_vertex.glsl   |  8 ++++++++
 5 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ebd3b07e3..dd2ad0fd57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -132,6 +132,7 @@
     Feature #6419: Topics shouldn't be greyed out if they can produce another topic reference
     Feature #6443: NiStencilProperty is not fully supported
     Feature #6534: Shader-based object texture blending
+    Feature #6541: Gloss-mapping
     Feature #6592: Missing support for NiTriShape particle emitters
     Feature #6600: Support NiSortAdjustNode
     Task #6201: Remove the "Note: No relevant classes found. No output generated" warnings
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 8e0a5c08ac..3007bc6cf2 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -1552,14 +1552,8 @@ namespace NifOsg
                         case Nif::NiTexturingProperty::BumpTexture:
                         case Nif::NiTexturingProperty::DetailTexture:
                         case Nif::NiTexturingProperty::DecalTexture:
-                            break;
                         case Nif::NiTexturingProperty::GlossTexture:
-                        {
-                            // Not used by the vanilla engine. MCP (Morrowind Code Patch) adds an option to use Gloss maps:
-                            // "- Gloss map fix. Morrowind removed gloss map entries from model files after loading them. This stops Morrowind from removing them."
-                            // Log(Debug::Info) << "NiTexturingProperty::GlossTexture in " << mFilename << " not currently used.";
-                            continue;
-                        }
+                            break;
                         default:
                         {
                             Log(Debug::Info) << "Unhandled texture stage " << i << " on shape \"" << nodeName << "\" in " << mFilename;
@@ -1651,6 +1645,12 @@ namespace NifOsg
                         stateset->addUniform(new osg::Uniform("bumpMapMatrix", bumpMapMatrix));
                         stateset->addUniform(new osg::Uniform("envMapLumaBias", texprop->envMapLumaBias));
                     }
+                    else if (i == Nif::NiTexturingProperty::GlossTexture)
+                    {
+                        // A gloss map is an environment map mask.
+                        // Gloss maps are only implemented in the object shaders as well.
+                        stateset->setTextureMode(texUnit, GL_TEXTURE_2D, osg::StateAttribute::OFF);
+                    }
                     else if (i == Nif::NiTexturingProperty::DecalTexture)
                     {
                         // This is only an inaccurate imitation of the original implementation,
@@ -1694,6 +1694,9 @@ namespace NifOsg
                     case Nif::NiTexturingProperty::DecalTexture:
                         texture2d->setName("decalMap");
                         break;
+                    case Nif::NiTexturingProperty::GlossTexture:
+                        texture2d->setName("glossMap");
+                        break;
                     default:
                         break;
                     }
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 107665369c..d8bbeeadc2 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -244,7 +244,7 @@ namespace Shader
         addedState->setName("addedState");
     }
 
-    const char* defaultTextures[] = { "diffuseMap", "normalMap", "emissiveMap", "darkMap", "detailMap", "envMap", "specularMap", "decalMap", "bumpMap" };
+    const char* defaultTextures[] = { "diffuseMap", "normalMap", "emissiveMap", "darkMap", "detailMap", "envMap", "specularMap", "decalMap", "bumpMap", "glossMap" };
     bool isTextureNameRecognized(const std::string& name)
     {
         for (unsigned int i=0; i<sizeof(defaultTextures)/sizeof(defaultTextures[0]); ++i)
@@ -325,6 +325,14 @@ namespace Shader
                             {
                                 mRequirements.back().mShaderRequired = true;
                             }
+                            else if (texName == "glossMap")
+                            {
+                                mRequirements.back().mShaderRequired = true;
+                                if (!writableStateSet)
+                                    writableStateSet = getWritableStateSet(node);
+                                // As well as gloss maps
+                                writableStateSet->setTextureMode(unit, GL_TEXTURE_2D, osg::StateAttribute::ON);
+                            }
                         }
                         else
                             Log(Debug::Error) << "ShaderVisitor encountered unknown texture " << texture;
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index 9b60e7c6a4..85950c7468 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -58,6 +58,11 @@ uniform vec2 envMapLumaBias;
 uniform mat2 bumpMapMatrix;
 #endif
 
+#if @glossMap
+uniform sampler2D glossMap;
+varying vec2 glossMapUV;
+#endif
+
 uniform bool simpleWater;
 
 varying float euclideanDepth;
@@ -168,8 +173,14 @@ void main()
     envLuma = clamp(bumpTex.b * envMapLumaBias.x + envMapLumaBias.y, 0.0, 1.0);
 #endif
 
+    vec3 envEffect = texture2D(envMap, envTexCoordGen).xyz * envMapColor.xyz * envLuma;
+
+#if @glossMap
+    envEffect *= texture2D(glossMap, glossMapUV).xyz;
+#endif
+
 #if @preLightEnv
-    gl_FragData[0].xyz += texture2D(envMap, envTexCoordGen).xyz * envMapColor.xyz * envLuma;
+    gl_FragData[0].xyz += envEffect;
 #endif
 
 #endif
@@ -189,7 +200,7 @@ void main()
     gl_FragData[0].xyz *= lighting;
 
 #if @envMap && !@preLightEnv
-    gl_FragData[0].xyz += texture2D(envMap, envTexCoordGen).xyz * envMapColor.xyz * envLuma;
+    gl_FragData[0].xyz += envEffect;
 #endif
 
 #if @emissiveMap
diff --git a/files/shaders/objects_vertex.glsl b/files/shaders/objects_vertex.glsl
index 969fe5903e..77c7fef391 100644
--- a/files/shaders/objects_vertex.glsl
+++ b/files/shaders/objects_vertex.glsl
@@ -47,6 +47,10 @@ varying vec2 bumpMapUV;
 varying vec2 specularMapUV;
 #endif
 
+#if @glossMap
+varying vec2 glossMapUV;
+#endif
+
 varying float euclideanDepth;
 varying float linearDepth;
 
@@ -120,6 +124,10 @@ void main(void)
     specularMapUV = (gl_TextureMatrix[@specularMapUV] * gl_MultiTexCoord@specularMapUV).xy;
 #endif
 
+#if @glossMap
+    glossMapUV = (gl_TextureMatrix[@glossMapUV] * gl_MultiTexCoord@glossMapUV).xy;
+#endif
+
     passColor = gl_Color;
     passViewPos = viewPos.xyz;
     passNormal = gl_Normal.xyz;

From 9584cb7ac2083ab01e8c05cb7cde00cd5a77b55f Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 5 Feb 2022 16:24:57 +0100
Subject: [PATCH 2133/2859] Use fixed size types for serialization

---
 apps/openmw_test_suite/serialization/format.hpp | 5 +++--
 components/serialization/format.hpp             | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/apps/openmw_test_suite/serialization/format.hpp b/apps/openmw_test_suite/serialization/format.hpp
index 8f61838fde..603d2790e0 100644
--- a/apps/openmw_test_suite/serialization/format.hpp
+++ b/apps/openmw_test_suite/serialization/format.hpp
@@ -5,6 +5,7 @@
 
 #include <utility>
 #include <type_traits>
+#include <cstdint>
 
 namespace SerializationTesting
 {
@@ -20,7 +21,7 @@ namespace SerializationTesting
         }
     };
 
-    enum Enum
+    enum Enum : std::int32_t
     {
         A,
         B,
@@ -30,7 +31,7 @@ namespace SerializationTesting
     struct Composite
     {
         short mFloatArray[3] = {0};
-        std::vector<int> mIntVector;
+        std::vector<std::int32_t> mIntVector;
         std::vector<Enum> mEnumVector;
         std::vector<Pod> mPodVector;
         std::size_t mPodDataSize = 0;
diff --git a/components/serialization/format.hpp b/components/serialization/format.hpp
index 595afd0dad..956345149c 100644
--- a/components/serialization/format.hpp
+++ b/components/serialization/format.hpp
@@ -7,6 +7,7 @@
 #include <type_traits>
 #include <utility>
 #include <vector>
+#include <cstdint>
 
 namespace Serialization
 {
@@ -51,13 +52,13 @@ namespace Serialization
             -> std::enable_if_t<isContiguousContainer<T>>
         {
             if constexpr (mode == Mode::Write)
-                visitor(self(), value.size());
+                visitor(self(), static_cast<std::uint64_t>(value.size()));
             else
             {
                 static_assert(mode == Mode::Read);
-                std::size_t size = 0;
+                std::uint64_t size = 0;
                 visitor(self(), size);
-                value.resize(size);
+                value.resize(static_cast<std::size_t>(size));
             }
             self()(std::forward<Visitor>(visitor), value.data(), value.size());
         }

From 52b3a87dae5df9b4fcacd2dc2e61a730b7352abd Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 5 Feb 2022 16:32:40 +0100
Subject: [PATCH 2134/2859] Make constexpr variable defined in header inline

---
 components/serialization/format.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/serialization/format.hpp b/components/serialization/format.hpp
index 956345149c..29fc0ec42d 100644
--- a/components/serialization/format.hpp
+++ b/components/serialization/format.hpp
@@ -27,7 +27,7 @@ namespace Serialization
     struct IsContiguousContainer<std::array<T, n>> : std::true_type {};
 
     template <class T>
-    constexpr bool isContiguousContainer = IsContiguousContainer<std::decay_t<T>>::value;
+    inline constexpr bool isContiguousContainer = IsContiguousContainer<std::decay_t<T>>::value;
 
     template <Mode mode, class Derived>
     struct Format

From 67741402b5ef92ca8aad11325bea7878dbf3f7b9 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 18 Feb 2022 21:45:50 +0100
Subject: [PATCH 2135/2859] Replace reference to const std::string by
 std::string_view for navmeshdb related arguments

---
 apps/navmeshtool/navmesh.cpp                  |  5 +++--
 apps/navmeshtool/navmesh.hpp                  |  1 -
 .../detournavigator/generatenavmeshtile.hpp   |  4 ++--
 components/detournavigator/navmeshdb.cpp      | 21 +++++++++----------
 components/detournavigator/navmeshdb.hpp      | 21 +++++++++----------
 components/detournavigator/navmeshdbutils.cpp |  5 +++--
 6 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/apps/navmeshtool/navmesh.cpp b/apps/navmeshtool/navmesh.cpp
index ca614d0cf6..cf18d7edc3 100644
--- a/apps/navmeshtool/navmesh.cpp
+++ b/apps/navmeshtool/navmesh.cpp
@@ -24,6 +24,7 @@
 #include <utility>
 #include <vector>
 #include <random>
+#include <string_view>
 
 namespace NavMeshTool
 {
@@ -81,7 +82,7 @@ namespace NavMeshTool
                 return DetourNavigator::resolveMeshSource(mDb, source, mNextShapeId);
             }
 
-            std::optional<NavMeshTileInfo> find(const std::string& worldspace, const TilePosition &tilePosition,
+            std::optional<NavMeshTileInfo> find(std::string_view worldspace, const TilePosition &tilePosition,
                 const std::vector<std::byte> &input) override
             {
                 std::optional<NavMeshTileInfo> result;
@@ -98,7 +99,7 @@ namespace NavMeshTool
 
             void ignore() override { report(); }
 
-            void insert(const std::string& worldspace, const TilePosition& tilePosition, std::int64_t version,
+            void insert(std::string_view worldspace, const TilePosition& tilePosition, std::int64_t version,
                 const std::vector<std::byte>& input, PreparedNavMeshData& data) override
             {
                 data.mUserId = static_cast<unsigned>(mNextTileId);
diff --git a/apps/navmeshtool/navmesh.hpp b/apps/navmeshtool/navmesh.hpp
index 725f0cd6a4..ff837eebe7 100644
--- a/apps/navmeshtool/navmesh.hpp
+++ b/apps/navmeshtool/navmesh.hpp
@@ -4,7 +4,6 @@
 #include <osg/Vec3f>
 
 #include <cstddef>
-#include <string_view>
 
 namespace DetourNavigator
 {
diff --git a/components/detournavigator/generatenavmeshtile.hpp b/components/detournavigator/generatenavmeshtile.hpp
index 511b8dfb8f..69afe426bc 100644
--- a/components/detournavigator/generatenavmeshtile.hpp
+++ b/components/detournavigator/generatenavmeshtile.hpp
@@ -36,12 +36,12 @@ namespace DetourNavigator
 
         virtual std::int64_t resolveMeshSource(const MeshSource& source) = 0;
 
-        virtual std::optional<NavMeshTileInfo> find(const std::string& worldspace, const TilePosition& tilePosition,
+        virtual std::optional<NavMeshTileInfo> find(std::string_view worldspace, const TilePosition& tilePosition,
             const std::vector<std::byte>& input) = 0;
 
         virtual void ignore() = 0;
 
-        virtual void insert(const std::string& worldspace, const TilePosition& tilePosition,
+        virtual void insert(std::string_view worldspace, const TilePosition& tilePosition,
                             std::int64_t version, const std::vector<std::byte>& input, PreparedNavMeshData& data) = 0;
 
         virtual void update(std::int64_t tileId, std::int64_t version, PreparedNavMeshData& data) = 0;
diff --git a/components/detournavigator/navmeshdb.cpp b/components/detournavigator/navmeshdb.cpp
index ebff250ee0..425cf7d434 100644
--- a/components/detournavigator/navmeshdb.cpp
+++ b/components/detournavigator/navmeshdb.cpp
@@ -10,7 +10,6 @@
 #include <sqlite3.h>
 
 #include <cstddef>
-#include <string>
 #include <string_view>
 #include <vector>
 
@@ -136,7 +135,7 @@ namespace DetourNavigator
         return tileId;
     }
 
-    std::optional<Tile> NavMeshDb::findTile(const std::string& worldspace,
+    std::optional<Tile> NavMeshDb::findTile(std::string_view worldspace,
         const TilePosition& tilePosition, const std::vector<std::byte>& input)
     {
         Tile result;
@@ -147,7 +146,7 @@ namespace DetourNavigator
         return result;
     }
 
-    std::optional<TileData> NavMeshDb::getTileData(const std::string& worldspace,
+    std::optional<TileData> NavMeshDb::getTileData(std::string_view worldspace,
         const TilePosition& tilePosition, const std::vector<std::byte>& input)
     {
         TileData result;
@@ -159,7 +158,7 @@ namespace DetourNavigator
         return result;
     }
 
-    int NavMeshDb::insertTile(TileId tileId, const std::string& worldspace, const TilePosition& tilePosition,
+    int NavMeshDb::insertTile(TileId tileId, std::string_view worldspace, const TilePosition& tilePosition,
         TileVersion version, const std::vector<std::byte>& input, const std::vector<std::byte>& data)
     {
         const std::vector<std::byte> compressedInput = Misc::compress(input);
@@ -180,7 +179,7 @@ namespace DetourNavigator
         return shapeId;
     }
 
-    std::optional<ShapeId> NavMeshDb::findShapeId(const std::string& name, ShapeType type,
+    std::optional<ShapeId> NavMeshDb::findShapeId(std::string_view name, ShapeType type,
         const Sqlite3::ConstBlob& hash)
     {
         ShapeId shapeId;
@@ -189,7 +188,7 @@ namespace DetourNavigator
         return shapeId;
     }
 
-    int NavMeshDb::insertShape(ShapeId shapeId, const std::string& name, ShapeType type,
+    int NavMeshDb::insertShape(ShapeId shapeId, std::string_view name, ShapeType type,
         const Sqlite3::ConstBlob& hash)
     {
         return execute(*mDb, mInsertShape, shapeId, name, type, hash);
@@ -207,7 +206,7 @@ namespace DetourNavigator
             return findTileQuery;
         }
 
-        void FindTile::bind(sqlite3& db, sqlite3_stmt& statement, const std::string& worldspace,
+        void FindTile::bind(sqlite3& db, sqlite3_stmt& statement, std::string_view worldspace,
             const TilePosition& tilePosition, const std::vector<std::byte>& input)
         {
             Sqlite3::bindParameter(db, statement, ":worldspace", worldspace);
@@ -221,7 +220,7 @@ namespace DetourNavigator
             return getTileDataQuery;
         }
 
-        void GetTileData::bind(sqlite3& db, sqlite3_stmt& statement, const std::string& worldspace,
+        void GetTileData::bind(sqlite3& db, sqlite3_stmt& statement, std::string_view worldspace,
             const TilePosition& tilePosition, const std::vector<std::byte>& input)
         {
             Sqlite3::bindParameter(db, statement, ":worldspace", worldspace);
@@ -235,7 +234,7 @@ namespace DetourNavigator
             return insertTileQuery;
         }
 
-        void InsertTile::bind(sqlite3& db, sqlite3_stmt& statement, TileId tileId, const std::string& worldspace,
+        void InsertTile::bind(sqlite3& db, sqlite3_stmt& statement, TileId tileId, std::string_view worldspace,
             const TilePosition& tilePosition, TileVersion version, const std::vector<std::byte>& input,
             const std::vector<std::byte>& data)
         {
@@ -271,7 +270,7 @@ namespace DetourNavigator
             return findShapeIdQuery;
         }
 
-        void FindShapeId::bind(sqlite3& db, sqlite3_stmt& statement, const std::string& name,
+        void FindShapeId::bind(sqlite3& db, sqlite3_stmt& statement, std::string_view name,
             ShapeType type, const Sqlite3::ConstBlob& hash)
         {
             Sqlite3::bindParameter(db, statement, ":name", name);
@@ -284,7 +283,7 @@ namespace DetourNavigator
             return insertShapeQuery;
         }
 
-        void InsertShape::bind(sqlite3& db, sqlite3_stmt& statement, ShapeId shapeId, const std::string& name,
+        void InsertShape::bind(sqlite3& db, sqlite3_stmt& statement, ShapeId shapeId, std::string_view name,
             ShapeType type, const Sqlite3::ConstBlob& hash)
         {
             Sqlite3::bindParameter(db, statement, ":shape_id", shapeId);
diff --git a/components/detournavigator/navmeshdb.hpp b/components/detournavigator/navmeshdb.hpp
index 636f1de000..09604e5706 100644
--- a/components/detournavigator/navmeshdb.hpp
+++ b/components/detournavigator/navmeshdb.hpp
@@ -15,7 +15,6 @@
 #include <cstring>
 #include <optional>
 #include <stdexcept>
-#include <string>
 #include <string_view>
 #include <tuple>
 #include <utility>
@@ -64,21 +63,21 @@ namespace DetourNavigator
         struct FindTile
         {
             static std::string_view text() noexcept;
-            static void bind(sqlite3& db, sqlite3_stmt& statement, const std::string& worldspace,
+            static void bind(sqlite3& db, sqlite3_stmt& statement, std::string_view worldspace,
                 const TilePosition& tilePosition, const std::vector<std::byte>& input);
         };
 
         struct GetTileData
         {
             static std::string_view text() noexcept;
-            static void bind(sqlite3& db, sqlite3_stmt& statement, const std::string& worldspace,
+            static void bind(sqlite3& db, sqlite3_stmt& statement, std::string_view worldspace,
                 const TilePosition& tilePosition, const std::vector<std::byte>& input);
         };
 
         struct InsertTile
         {
             static std::string_view text() noexcept;
-            static void bind(sqlite3& db, sqlite3_stmt& statement, TileId tileId, const std::string& worldspace,
+            static void bind(sqlite3& db, sqlite3_stmt& statement, TileId tileId, std::string_view worldspace,
                 const TilePosition& tilePosition, TileVersion version, const std::vector<std::byte>& input,
                 const std::vector<std::byte>& data);
         };
@@ -99,14 +98,14 @@ namespace DetourNavigator
         struct FindShapeId
         {
             static std::string_view text() noexcept;
-            static void bind(sqlite3& db, sqlite3_stmt& statement, const std::string& name,
+            static void bind(sqlite3& db, sqlite3_stmt& statement, std::string_view name,
                 ShapeType type, const Sqlite3::ConstBlob& hash);
         };
 
         struct InsertShape
         {
             static std::string_view text() noexcept;
-            static void bind(sqlite3& db, sqlite3_stmt& statement, ShapeId shapeId, const std::string& name,
+            static void bind(sqlite3& db, sqlite3_stmt& statement, ShapeId shapeId, std::string_view name,
                 ShapeType type, const Sqlite3::ConstBlob& hash);
         };
     }
@@ -120,22 +119,22 @@ namespace DetourNavigator
 
         TileId getMaxTileId();
 
-        std::optional<Tile> findTile(const std::string& worldspace,
+        std::optional<Tile> findTile(std::string_view worldspace,
             const TilePosition& tilePosition, const std::vector<std::byte>& input);
 
-        std::optional<TileData> getTileData(const std::string& worldspace,
+        std::optional<TileData> getTileData(std::string_view worldspace,
             const TilePosition& tilePosition, const std::vector<std::byte>& input);
 
-        int insertTile(TileId tileId, const std::string& worldspace, const TilePosition& tilePosition,
+        int insertTile(TileId tileId, std::string_view worldspace, const TilePosition& tilePosition,
             TileVersion version, const std::vector<std::byte>& input, const std::vector<std::byte>& data);
 
         int updateTile(TileId tileId, TileVersion version, const std::vector<std::byte>& data);
 
         ShapeId getMaxShapeId();
 
-        std::optional<ShapeId> findShapeId(const std::string& name, ShapeType type, const Sqlite3::ConstBlob& hash);
+        std::optional<ShapeId> findShapeId(std::string_view name, ShapeType type, const Sqlite3::ConstBlob& hash);
 
-        int insertShape(ShapeId shapeId, const std::string& name, ShapeType type, const Sqlite3::ConstBlob& hash);
+        int insertShape(ShapeId shapeId, std::string_view name, ShapeType type, const Sqlite3::ConstBlob& hash);
 
     private:
         Sqlite3::Db mDb;
diff --git a/components/detournavigator/navmeshdbutils.cpp b/components/detournavigator/navmeshdbutils.cpp
index 86f81bfc51..71873972b9 100644
--- a/components/detournavigator/navmeshdbutils.cpp
+++ b/components/detournavigator/navmeshdbutils.cpp
@@ -6,19 +6,20 @@
 
 #include <cassert>
 #include <optional>
+#include <string_view>
 
 namespace DetourNavigator
 {
     namespace
     {
-        std::optional<ShapeId> findShapeId(NavMeshDb& db, const std::string& name, ShapeType type,
+        std::optional<ShapeId> findShapeId(NavMeshDb& db, std::string_view name, ShapeType type,
             const std::string& hash)
         {
             const Sqlite3::ConstBlob hashData {hash.data(), static_cast<int>(hash.size())};
             return db.findShapeId(name, type, hashData);
         }
 
-        ShapeId getShapeId(NavMeshDb& db, const std::string& name, ShapeType type,
+        ShapeId getShapeId(NavMeshDb& db, std::string_view name, ShapeType type,
             const std::string& hash, ShapeId& nextShapeId)
         {
             const Sqlite3::ConstBlob hashData {hash.data(), static_cast<int>(hash.size())};

From ab1a6e034ee822d9ca6b664e5b72a3a45bde97e0 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 18 Feb 2022 21:35:09 +0100
Subject: [PATCH 2136/2859] Add navmeshtool flag to remove unused tiles from
 navmesh disk cache

* Remove tiles outside processing range. Useful when new content profile map
  has different bounds.
* Remove ignored tiles. For a case when content profile maps have intersection
  but there is no more data for navmesh.
* Remove older tiles at the same worldspace position. If navmesh tile data has
  changed with new content, the old ones unlikely to be used.
* Vacuum the database when there are modifications. SQLite leaves empty pages
  in the file on database modification. Vacuum cleans up unused pages reducing
  the file size.
---
 apps/navmeshtool/main.cpp                     |   7 +-
 apps/navmeshtool/navmesh.cpp                  | 102 +++++++++++++----
 apps/navmeshtool/navmesh.hpp                  |   3 +-
 .../detournavigator/navmeshdb.cpp             |  57 ++++++++++
 .../detournavigator/generatenavmeshtile.cpp   |  12 +-
 .../detournavigator/generatenavmeshtile.hpp   |   8 +-
 .../detournavigator/gettilespositions.hpp     |   7 +-
 components/detournavigator/navmeshdb.cpp      | 103 ++++++++++++++++++
 components/detournavigator/navmeshdb.hpp      |  41 +++++++
 .../detournavigator/tilespositionsrange.hpp   |  15 +++
 10 files changed, 322 insertions(+), 33 deletions(-)
 create mode 100644 components/detournavigator/tilespositionsrange.hpp

diff --git a/apps/navmeshtool/main.cpp b/apps/navmeshtool/main.cpp
index f89e80e542..894ec6b3b1 100644
--- a/apps/navmeshtool/main.cpp
+++ b/apps/navmeshtool/main.cpp
@@ -83,6 +83,9 @@ namespace NavMeshTool
 
                 ("process-interior-cells", bpo::value<bool>()->implicit_value(true)
                     ->default_value(false), "build navmesh for interior cells")
+
+                ("remove-unused-tiles", bpo::value<bool>()->implicit_value(true)
+                    ->default_value(false), "remove tiles from cache that will not be used with current content profile")
             ;
             Files::ConfigurationManager::addCommonOptions(result);
 
@@ -141,6 +144,7 @@ namespace NavMeshTool
             }
 
             const bool processInteriorCells = variables["process-interior-cells"].as<bool>();
+            const bool removeUnusedTiles = variables["remove-unused-tiles"].as<bool>();
 
             Fallback::Map::init(variables["fallback"].as<Fallback::FallbackMap>().mMap);
 
@@ -177,7 +181,8 @@ namespace NavMeshTool
             WorldspaceData cellsData = gatherWorldspaceData(navigatorSettings, readers, vfs, bulletShapeManager,
                                                             esmData, processInteriorCells);
 
-            generateAllNavMeshTiles(agentHalfExtents, navigatorSettings, threadsNumber, cellsData, std::move(db));
+            generateAllNavMeshTiles(agentHalfExtents, navigatorSettings, threadsNumber, removeUnusedTiles,
+                                    cellsData, std::move(db));
 
             Log(Debug::Info) << "Done";
 
diff --git a/apps/navmeshtool/navmesh.cpp b/apps/navmeshtool/navmesh.cpp
index cf18d7edc3..3161192cf9 100644
--- a/apps/navmeshtool/navmesh.cpp
+++ b/apps/navmeshtool/navmesh.cpp
@@ -41,6 +41,7 @@ namespace NavMeshTool
         using DetourNavigator::TileId;
         using DetourNavigator::TilePosition;
         using DetourNavigator::TileVersion;
+        using DetourNavigator::TilesPositionsRange;
         using Sqlite3::Transaction;
 
         void logGeneratedTiles(std::size_t provided, std::size_t expected)
@@ -63,8 +64,9 @@ namespace NavMeshTool
         public:
             std::atomic_size_t mExpected {0};
 
-            explicit NavMeshTileConsumer(NavMeshDb&& db)
+            explicit NavMeshTileConsumer(NavMeshDb&& db, bool removeUnusedTiles)
                 : mDb(std::move(db))
+                , mRemoveUnusedTiles(removeUnusedTiles)
                 , mTransaction(mDb.startTransaction())
                 , mNextTileId(mDb.getMaxTileId() + 1)
                 , mNextShapeId(mDb.getMaxShapeId() + 1)
@@ -76,6 +78,12 @@ namespace NavMeshTool
 
             std::size_t getUpdated() const { return mUpdated.load(); }
 
+            std::size_t getDeleted() const
+            {
+                const std::lock_guard lock(mMutex);
+                return mDeleted;
+            }
+
             std::int64_t resolveMeshSource(const MeshSource& source) override
             {
                 const std::lock_guard lock(mMutex);
@@ -97,11 +105,34 @@ namespace NavMeshTool
                 return result;
             }
 
-            void ignore() override { report(); }
+            void ignore(std::string_view worldspace, const TilePosition& tilePosition) override
+            {
+                if (mRemoveUnusedTiles)
+                {
+                    std::lock_guard lock(mMutex);
+                    mDeleted += static_cast<std::size_t>(mDb.deleteTilesAt(worldspace, tilePosition));
+                }
+                report();
+            }
+
+            void identity(std::string_view worldspace, const TilePosition& tilePosition, std::int64_t tileId) override
+            {
+                if (mRemoveUnusedTiles)
+                {
+                    std::lock_guard lock(mMutex);
+                    mDeleted += static_cast<std::size_t>(mDb.deleteTilesAtExcept(worldspace, tilePosition, TileId {tileId}));
+                }
+                report();
+            }
 
-            void insert(std::string_view worldspace, const TilePosition& tilePosition, std::int64_t version,
-                const std::vector<std::byte>& input, PreparedNavMeshData& data) override
+            void insert(std::string_view worldspace, const TilePosition& tilePosition,
+                std::int64_t version, const std::vector<std::byte>& input, PreparedNavMeshData& data) override
             {
+                if (mRemoveUnusedTiles)
+                {
+                    std::lock_guard lock(mMutex);
+                    mDeleted += static_cast<std::size_t>(mDb.deleteTilesAt(worldspace, tilePosition));
+                }
                 data.mUserId = static_cast<unsigned>(mNextTileId);
                 {
                     std::lock_guard lock(mMutex);
@@ -112,11 +143,14 @@ namespace NavMeshTool
                 report();
             }
 
-            void update(std::int64_t tileId, std::int64_t version, PreparedNavMeshData& data) override
+            void update(std::string_view worldspace, const TilePosition& tilePosition,
+                std::int64_t tileId, std::int64_t version, PreparedNavMeshData& data) override
             {
                 data.mUserId = static_cast<unsigned>(tileId);
                 {
                     std::lock_guard lock(mMutex);
+                    if (mRemoveUnusedTiles)
+                        mDeleted += static_cast<std::size_t>(mDb.deleteTilesAtExcept(worldspace, tilePosition, TileId {tileId}));
                     mDb.updateTile(TileId {tileId}, TileVersion {version}, serialize(data));
                 }
                 ++mUpdated;
@@ -141,49 +175,66 @@ namespace NavMeshTool
 
             void commit() { mTransaction.commit(); }
 
+            void vacuum() { mDb.vacuum(); }
+
+            void removeTilesOutsideRange(std::string_view worldspace, const TilesPositionsRange& range)
+            {
+                const std::lock_guard lock(mMutex);
+                mTransaction.commit();
+                Log(Debug::Info) << "Removing tiles outside processed range for worldspace \"" << worldspace << "\"...";
+                mDeleted += static_cast<std::size_t>(mDb.deleteTilesOutsideRange(worldspace, range));
+                mTransaction = mDb.startTransaction();
+            }
+
         private:
             std::atomic_size_t mProvided {0};
             std::atomic_size_t mInserted {0};
             std::atomic_size_t mUpdated {0};
-            std::mutex mMutex;
+            std::size_t mDeleted = 0;
+            mutable std::mutex mMutex;
             NavMeshDb mDb;
+            const bool mRemoveUnusedTiles;
             Transaction mTransaction;
             TileId mNextTileId;
             std::condition_variable mHasTile;
             Misc::ProgressReporter<LogGeneratedTiles> mReporter;
             ShapeId mNextShapeId;
+            std::mutex mReportMutex;
 
             void report()
             {
-                mReporter(mProvided + 1, mExpected);
-                ++mProvided;
+                const std::size_t provided = mProvided.fetch_add(1, std::memory_order_relaxed) + 1;
+                mReporter(provided, mExpected);
                 mHasTile.notify_one();
             }
         };
     }
 
     void generateAllNavMeshTiles(const osg::Vec3f& agentHalfExtents, const Settings& settings,
-        const std::size_t threadsNumber, WorldspaceData& data, NavMeshDb&& db)
+        std::size_t threadsNumber, bool removeUnusedTiles, WorldspaceData& data, NavMeshDb&& db)
     {
         Log(Debug::Info) << "Generating navmesh tiles by " << threadsNumber << " parallel workers...";
 
         SceneUtil::WorkQueue workQueue(threadsNumber);
-        auto navMeshTileConsumer = std::make_shared<NavMeshTileConsumer>(std::move(db));
+        auto navMeshTileConsumer = std::make_shared<NavMeshTileConsumer>(std::move(db), removeUnusedTiles);
         std::size_t tiles = 0;
         std::mt19937_64 random;
 
         for (const std::unique_ptr<WorldspaceNavMeshInput>& input : data.mNavMeshInputs)
         {
+            const auto range = DetourNavigator::makeTilesPositionsRange(
+                Misc::Convert::toOsgXY(input->mAabb.m_min),
+                Misc::Convert::toOsgXY(input->mAabb.m_max),
+                settings.mRecast
+            );
+
+            if (removeUnusedTiles)
+                navMeshTileConsumer->removeTilesOutsideRange(input->mWorldspace, range);
+
             std::vector<TilePosition> worldspaceTiles;
 
-            DetourNavigator::getTilesPositions(
-                DetourNavigator::makeTilesPositionsRange(
-                    Misc::Convert::toOsgXY(input->mAabb.m_min),
-                    Misc::Convert::toOsgXY(input->mAabb.m_max),
-                    settings.mRecast
-                ),
-                [&] (const TilePosition& tilePosition) { worldspaceTiles.push_back(tilePosition); }
-            );
+            DetourNavigator::getTilesPositions(range,
+                [&] (const TilePosition& tilePosition) { worldspaceTiles.push_back(tilePosition); });
 
             tiles += worldspaceTiles.size();
 
@@ -205,8 +256,19 @@ namespace NavMeshTool
         navMeshTileConsumer->wait();
         navMeshTileConsumer->commit();
 
+        const auto inserted = navMeshTileConsumer->getInserted();
+        const auto updated = navMeshTileConsumer->getUpdated();
+        const auto deleted = navMeshTileConsumer->getDeleted();
+
         Log(Debug::Info) << "Generated navmesh for " << navMeshTileConsumer->getProvided() << " tiles, "
-            << navMeshTileConsumer->getInserted() << " are inserted and "
-            << navMeshTileConsumer->getUpdated() << " updated";
+            << inserted << " are inserted, "
+            << updated << " updated and "
+            << deleted << " deleted";
+
+        if (inserted + updated + deleted > 0)
+        {
+            Log(Debug::Info) << "Vacuuming the database...";
+            navMeshTileConsumer->vacuum();
+        }
     }
 }
diff --git a/apps/navmeshtool/navmesh.hpp b/apps/navmeshtool/navmesh.hpp
index ff837eebe7..3d0e9e4665 100644
--- a/apps/navmeshtool/navmesh.hpp
+++ b/apps/navmeshtool/navmesh.hpp
@@ -16,7 +16,8 @@ namespace NavMeshTool
     struct WorldspaceData;
 
     void generateAllNavMeshTiles(const osg::Vec3f& agentHalfExtents, const DetourNavigator::Settings& settings,
-        const std::size_t threadsNumber, WorldspaceData& cellsData, DetourNavigator::NavMeshDb&& db);
+        std::size_t threadsNumber, bool removeUnusedTiles, WorldspaceData& cellsData,
+        DetourNavigator::NavMeshDb&& db);
 }
 
 #endif
diff --git a/apps/openmw_test_suite/detournavigator/navmeshdb.cpp b/apps/openmw_test_suite/detournavigator/navmeshdb.cpp
index ba008f50ff..a17f5132c5 100644
--- a/apps/openmw_test_suite/detournavigator/navmeshdb.cpp
+++ b/apps/openmw_test_suite/detournavigator/navmeshdb.cpp
@@ -109,4 +109,61 @@ namespace
         EXPECT_THROW(mDb.insertTile(tileId, worldspace, tilePosition, version, input, data), std::runtime_error);
         EXPECT_NO_THROW(insertTile(TileId {54}, version));
     }
+
+    TEST_F(DetourNavigatorNavMeshDbTest, delete_tiles_at_should_remove_all_tiles_with_given_worldspace_and_position)
+    {
+        const TileVersion version {1};
+        const std::string worldspace = "sys::default";
+        const TilePosition tilePosition {3, 4};
+        const std::vector<std::byte> input1 = generateData();
+        const std::vector<std::byte> input2 = generateData();
+        const std::vector<std::byte> data = generateData();
+        ASSERT_EQ(mDb.insertTile(TileId {53}, worldspace, tilePosition, version, input1, data), 1);
+        ASSERT_EQ(mDb.insertTile(TileId {54}, worldspace, tilePosition, version, input2, data), 1);
+        ASSERT_EQ(mDb.deleteTilesAt(worldspace, tilePosition), 2);
+        EXPECT_FALSE(mDb.findTile(worldspace, tilePosition, input1).has_value());
+        EXPECT_FALSE(mDb.findTile(worldspace, tilePosition, input2).has_value());
+    }
+
+    TEST_F(DetourNavigatorNavMeshDbTest, delete_tiles_at_except_should_leave_tile_with_given_id)
+    {
+        const TileId leftTileId {53};
+        const TileId removedTileId {54};
+        const TileVersion version {1};
+        const std::string worldspace = "sys::default";
+        const TilePosition tilePosition {3, 4};
+        const std::vector<std::byte> leftInput = generateData();
+        const std::vector<std::byte> removedInput = generateData();
+        const std::vector<std::byte> data = generateData();
+        ASSERT_EQ(mDb.insertTile(leftTileId, worldspace, tilePosition, version, leftInput, data), 1);
+        ASSERT_EQ(mDb.insertTile(removedTileId, worldspace, tilePosition, version, removedInput, data), 1);
+        ASSERT_EQ(mDb.deleteTilesAtExcept(worldspace, tilePosition, leftTileId), 1);
+        const auto left = mDb.findTile(worldspace, tilePosition, leftInput);
+        ASSERT_TRUE(left.has_value());
+        EXPECT_EQ(left->mTileId, leftTileId);
+        EXPECT_FALSE(mDb.findTile(worldspace, tilePosition, removedInput).has_value());
+    }
+
+    TEST_F(DetourNavigatorNavMeshDbTest, delete_tiles_outside_range_should_leave_tiles_inside_given_rectangle)
+    {
+        TileId tileId {1};
+        const TileVersion version {1};
+        const std::string worldspace = "sys::default";
+        const std::vector<std::byte> input = generateData();
+        const std::vector<std::byte> data = generateData();
+        for (int x = -2; x <= 2; ++x)
+        {
+            for (int y = -2; y <= 2; ++y)
+            {
+                ASSERT_EQ(mDb.insertTile(tileId, worldspace, TilePosition {x, y}, version, input, data), 1);
+                ++tileId.t;
+            }
+        }
+        const TilesPositionsRange range {TilePosition {-1, -1}, TilePosition {2, 2}};
+        ASSERT_EQ(mDb.deleteTilesOutsideRange(worldspace, range), 16);
+        for (int x = -2; x <= 2; ++x)
+            for (int y = -2; y <= 2; ++y)
+                ASSERT_EQ(mDb.findTile(worldspace, TilePosition {x, y}, input).has_value(),
+                          -1 <= x && x <= 1 && -1 <= y && y <= 1) << "x=" << x << " y=" << y;
+    }
 }
diff --git a/components/detournavigator/generatenavmeshtile.cpp b/components/detournavigator/generatenavmeshtile.cpp
index ad8978cd4b..360c05931f 100644
--- a/components/detournavigator/generatenavmeshtile.cpp
+++ b/components/detournavigator/generatenavmeshtile.cpp
@@ -25,12 +25,14 @@ namespace DetourNavigator
     {
         struct Ignore
         {
+            std::string_view mWorldspace;
+            const TilePosition& mTilePosition;
             std::shared_ptr<NavMeshTileConsumer> mConsumer;
 
             ~Ignore() noexcept
             {
                 if (mConsumer != nullptr)
-                    mConsumer->ignore();
+                    mConsumer->ignore(mWorldspace, mTilePosition);
             }
         };
     }
@@ -59,7 +61,7 @@ namespace DetourNavigator
 
         try
         {
-            Ignore ignore {consumer};
+            Ignore ignore {mWorldspace, mTilePosition, consumer};
 
             const std::shared_ptr<RecastMesh> recastMesh = mRecastMeshProvider.getMesh(mWorldspace, mTilePosition);
 
@@ -72,7 +74,11 @@ namespace DetourNavigator
             const std::optional<NavMeshTileInfo> info = consumer->find(mWorldspace, mTilePosition, input);
 
             if (info.has_value() && info->mVersion == mSettings.mNavMeshVersion)
+            {
+                consumer->identity(mWorldspace, mTilePosition, info->mTileId);
+                ignore.mConsumer = nullptr;
                 return;
+            }
 
             const auto data = prepareNavMeshTileData(*recastMesh, mTilePosition, mAgentHalfExtents, mSettings.mRecast);
 
@@ -80,7 +86,7 @@ namespace DetourNavigator
                 return;
 
             if (info.has_value())
-                consumer->update(info->mTileId, mSettings.mNavMeshVersion, *data);
+                consumer->update(mWorldspace, mTilePosition, info->mTileId, mSettings.mNavMeshVersion, *data);
             else
                 consumer->insert(mWorldspace, mTilePosition, mSettings.mNavMeshVersion, input, *data);
 
diff --git a/components/detournavigator/generatenavmeshtile.hpp b/components/detournavigator/generatenavmeshtile.hpp
index 69afe426bc..e6d9e26c1d 100644
--- a/components/detournavigator/generatenavmeshtile.hpp
+++ b/components/detournavigator/generatenavmeshtile.hpp
@@ -39,12 +39,16 @@ namespace DetourNavigator
         virtual std::optional<NavMeshTileInfo> find(std::string_view worldspace, const TilePosition& tilePosition,
             const std::vector<std::byte>& input) = 0;
 
-        virtual void ignore() = 0;
+        virtual void ignore(std::string_view worldspace, const TilePosition& tilePosition) = 0;
+
+        virtual void identity(std::string_view worldspace, const TilePosition& tilePosition,
+                              std::int64_t tileId) = 0;
 
         virtual void insert(std::string_view worldspace, const TilePosition& tilePosition,
                             std::int64_t version, const std::vector<std::byte>& input, PreparedNavMeshData& data) = 0;
 
-        virtual void update(std::int64_t tileId, std::int64_t version, PreparedNavMeshData& data) = 0;
+        virtual void update(std::string_view worldspace, const TilePosition& tilePosition,
+                            std::int64_t tileId, std::int64_t version, PreparedNavMeshData& data) = 0;
     };
 
     class GenerateNavMeshTile final : public SceneUtil::WorkItem
diff --git a/components/detournavigator/gettilespositions.hpp b/components/detournavigator/gettilespositions.hpp
index 79188868dc..33c1131176 100644
--- a/components/detournavigator/gettilespositions.hpp
+++ b/components/detournavigator/gettilespositions.hpp
@@ -3,6 +3,7 @@
 
 #include "tilebounds.hpp"
 #include "tileposition.hpp"
+#include "tilespositionsrange.hpp"
 
 class btVector3;
 class btTransform;
@@ -17,12 +18,6 @@ namespace DetourNavigator
 {
     struct RecastSettings;
 
-    struct TilesPositionsRange
-    {
-        TilePosition mBegin;
-        TilePosition mEnd;
-    };
-
     TilesPositionsRange makeTilesPositionsRange(const osg::Vec2f& aabbMin,
         const osg::Vec2f& aabbMax, const RecastSettings& settings);
 
diff --git a/components/detournavigator/navmeshdb.cpp b/components/detournavigator/navmeshdb.cpp
index 425cf7d434..621c97f390 100644
--- a/components/detournavigator/navmeshdb.cpp
+++ b/components/detournavigator/navmeshdb.cpp
@@ -34,6 +34,9 @@ namespace DetourNavigator
             CREATE UNIQUE INDEX IF NOT EXISTS index_unique_tiles_by_worldspace_and_tile_position_and_input
                 ON tiles (worldspace, tile_position_x, tile_position_y, input);
 
+            CREATE INDEX IF NOT EXISTS index_tiles_by_worldspace_and_tile_position
+                ON tiles (worldspace, tile_position_x, tile_position_y);
+
             CREATE TABLE IF NOT EXISTS shapes (
                 shape_id INTEGER PRIMARY KEY,
                 name TEXT NOT NULL,
@@ -82,6 +85,31 @@ namespace DetourNavigator
              WHERE tile_id = :tile_id
         )";
 
+        constexpr std::string_view deleteTilesAtQuery = R"(
+            DELETE FROM tiles
+             WHERE worldspace = :worldspace
+               AND tile_position_x = :tile_position_x
+               AND tile_position_y = :tile_position_y
+        )";
+
+        constexpr std::string_view deleteTilesAtExceptQuery = R"(
+            DELETE FROM tiles
+             WHERE worldspace = :worldspace
+               AND tile_position_x = :tile_position_x
+               AND tile_position_y = :tile_position_y
+               AND tile_id != :exclude_tile_id
+        )";
+
+        constexpr std::string_view deleteTilesOutsideRangeQuery = R"(
+            DELETE FROM tiles
+             WHERE worldspace = :worldspace
+               AND (   tile_position_x < :begin_tile_position_x
+                    OR tile_position_y < :begin_tile_position_y
+                    OR tile_position_x >= :end_tile_position_x
+                    OR tile_position_y >= :end_tile_position_y
+                   )
+        )";
+
         constexpr std::string_view getMaxShapeIdQuery = R"(
             SELECT max(shape_id) FROM shapes
         )";
@@ -98,6 +126,10 @@ namespace DetourNavigator
             INSERT INTO shapes ( shape_id,  name,  type,  hash)
                    VALUES      (:shape_id, :name, :type, :hash)
         )";
+
+        constexpr std::string_view vacuumQuery = R"(
+            VACUUM;
+        )";
     }
 
     std::ostream& operator<<(std::ostream& stream, ShapeType value)
@@ -117,9 +149,13 @@ namespace DetourNavigator
         , mGetTileData(*mDb, DbQueries::GetTileData {})
         , mInsertTile(*mDb, DbQueries::InsertTile {})
         , mUpdateTile(*mDb, DbQueries::UpdateTile {})
+        , mDeleteTilesAt(*mDb, DbQueries::DeleteTilesAt {})
+        , mDeleteTilesAtExcept(*mDb, DbQueries::DeleteTilesAtExcept {})
+        , mDeleteTilesOutsideRange(*mDb, DbQueries::DeleteTilesOutsideRange {})
         , mGetMaxShapeId(*mDb, DbQueries::GetMaxShapeId {})
         , mFindShapeId(*mDb, DbQueries::FindShapeId {})
         , mInsertShape(*mDb, DbQueries::InsertShape {})
+        , mVacuum(*mDb, DbQueries::Vacuum {})
     {
     }
 
@@ -172,6 +208,21 @@ namespace DetourNavigator
         return execute(*mDb, mUpdateTile, tileId, version, compressedData);
     }
 
+    int NavMeshDb::deleteTilesAt(std::string_view worldspace, const TilePosition& tilePosition)
+    {
+        return execute(*mDb, mDeleteTilesAt, worldspace, tilePosition);
+    }
+
+    int NavMeshDb::deleteTilesAtExcept(std::string_view worldspace, const TilePosition& tilePosition, TileId excludeTileId)
+    {
+        return execute(*mDb, mDeleteTilesAtExcept, worldspace, tilePosition, excludeTileId);
+    }
+
+    int NavMeshDb::deleteTilesOutsideRange(std::string_view worldspace, const TilesPositionsRange& range)
+    {
+        return execute(*mDb, mDeleteTilesOutsideRange, worldspace, range);
+    }
+
     ShapeId NavMeshDb::getMaxShapeId()
     {
         ShapeId shapeId {0};
@@ -194,6 +245,11 @@ namespace DetourNavigator
         return execute(*mDb, mInsertShape, shapeId, name, type, hash);
     }
 
+    void NavMeshDb::vacuum()
+    {
+        execute(*mDb, mVacuum);
+    }
+
     namespace DbQueries
     {
         std::string_view GetMaxTileId::text() noexcept
@@ -260,6 +316,48 @@ namespace DetourNavigator
             Sqlite3::bindParameter(db, statement, ":data", data);
         }
 
+        std::string_view DeleteTilesAt::text() noexcept
+        {
+            return deleteTilesAtQuery;
+        }
+
+        void DeleteTilesAt::bind(sqlite3& db, sqlite3_stmt& statement, std::string_view worldspace,
+            const TilePosition& tilePosition)
+        {
+            Sqlite3::bindParameter(db, statement, ":worldspace", worldspace);
+            Sqlite3::bindParameter(db, statement, ":tile_position_x", tilePosition.x());
+            Sqlite3::bindParameter(db, statement, ":tile_position_y", tilePosition.y());
+        }
+
+        std::string_view DeleteTilesAtExcept::text() noexcept
+        {
+            return deleteTilesAtExceptQuery;
+        }
+
+        void DeleteTilesAtExcept::bind(sqlite3& db, sqlite3_stmt& statement, std::string_view worldspace,
+            const TilePosition& tilePosition, TileId excludeTileId)
+        {
+            Sqlite3::bindParameter(db, statement, ":worldspace", worldspace);
+            Sqlite3::bindParameter(db, statement, ":tile_position_x", tilePosition.x());
+            Sqlite3::bindParameter(db, statement, ":tile_position_y", tilePosition.y());
+            Sqlite3::bindParameter(db, statement, ":exclude_tile_id", excludeTileId);
+        }
+
+        std::string_view DeleteTilesOutsideRange::text() noexcept
+        {
+            return deleteTilesOutsideRangeQuery;
+        }
+
+        void DeleteTilesOutsideRange::bind(sqlite3& db, sqlite3_stmt& statement, std::string_view worldspace,
+            const TilesPositionsRange& range)
+        {
+            Sqlite3::bindParameter(db, statement, ":worldspace", worldspace);
+            Sqlite3::bindParameter(db, statement, ":begin_tile_position_x", range.mBegin.x());
+            Sqlite3::bindParameter(db, statement, ":begin_tile_position_y", range.mBegin.y());
+            Sqlite3::bindParameter(db, statement, ":end_tile_position_x", range.mEnd.x());
+            Sqlite3::bindParameter(db, statement, ":end_tile_position_y", range.mEnd.y());
+        }
+
         std::string_view GetMaxShapeId::text() noexcept
         {
             return getMaxShapeIdQuery;
@@ -291,5 +389,10 @@ namespace DetourNavigator
             Sqlite3::bindParameter(db, statement, ":type", static_cast<int>(type));
             Sqlite3::bindParameter(db, statement, ":hash", hash);
         }
+
+        std::string_view Vacuum::text() noexcept
+        {
+            return vacuumQuery;
+        }
     }
 }
diff --git a/components/detournavigator/navmeshdb.hpp b/components/detournavigator/navmeshdb.hpp
index 09604e5706..f10a3a3288 100644
--- a/components/detournavigator/navmeshdb.hpp
+++ b/components/detournavigator/navmeshdb.hpp
@@ -3,6 +3,8 @@
 
 #include "tileposition.hpp"
 
+#include <components/detournavigator/tilespositionsrange.hpp>
+
 #include <components/sqlite3/db.hpp>
 #include <components/sqlite3/statement.hpp>
 #include <components/sqlite3/transaction.hpp>
@@ -89,6 +91,27 @@ namespace DetourNavigator
                 const std::vector<std::byte>& data);
         };
 
+        struct DeleteTilesAt
+        {
+            static std::string_view text() noexcept;
+            static void bind(sqlite3& db, sqlite3_stmt& statement, std::string_view worldspace,
+                const TilePosition& tilePosition);
+        };
+
+        struct DeleteTilesAtExcept
+        {
+            static std::string_view text() noexcept;
+            static void bind(sqlite3& db, sqlite3_stmt& statement, std::string_view worldspace,
+                const TilePosition& tilePosition, TileId excludeTileId);
+        };
+
+        struct DeleteTilesOutsideRange
+        {
+            static std::string_view text() noexcept;
+            static void bind(sqlite3& db, sqlite3_stmt& statement, std::string_view worldspace,
+                const TilesPositionsRange& range);
+        };
+
         struct GetMaxShapeId
         {
             static std::string_view text() noexcept;
@@ -108,6 +131,12 @@ namespace DetourNavigator
             static void bind(sqlite3& db, sqlite3_stmt& statement, ShapeId shapeId, std::string_view name,
                 ShapeType type, const Sqlite3::ConstBlob& hash);
         };
+
+        struct Vacuum
+        {
+            static std::string_view text() noexcept;
+            static void bind(sqlite3&, sqlite3_stmt&) {}
+        };
     }
 
     class NavMeshDb
@@ -130,12 +159,20 @@ namespace DetourNavigator
 
         int updateTile(TileId tileId, TileVersion version, const std::vector<std::byte>& data);
 
+        int deleteTilesAt(std::string_view worldspace, const TilePosition& tilePosition);
+
+        int deleteTilesAtExcept(std::string_view worldspace, const TilePosition& tilePosition, TileId excludeTileId);
+
+        int deleteTilesOutsideRange(std::string_view worldspace, const TilesPositionsRange& range);
+
         ShapeId getMaxShapeId();
 
         std::optional<ShapeId> findShapeId(std::string_view name, ShapeType type, const Sqlite3::ConstBlob& hash);
 
         int insertShape(ShapeId shapeId, std::string_view name, ShapeType type, const Sqlite3::ConstBlob& hash);
 
+        void vacuum();
+
     private:
         Sqlite3::Db mDb;
         Sqlite3::Statement<DbQueries::GetMaxTileId> mGetMaxTileId;
@@ -143,9 +180,13 @@ namespace DetourNavigator
         Sqlite3::Statement<DbQueries::GetTileData> mGetTileData;
         Sqlite3::Statement<DbQueries::InsertTile> mInsertTile;
         Sqlite3::Statement<DbQueries::UpdateTile> mUpdateTile;
+        Sqlite3::Statement<DbQueries::DeleteTilesAt> mDeleteTilesAt;
+        Sqlite3::Statement<DbQueries::DeleteTilesAtExcept> mDeleteTilesAtExcept;
+        Sqlite3::Statement<DbQueries::DeleteTilesOutsideRange> mDeleteTilesOutsideRange;
         Sqlite3::Statement<DbQueries::GetMaxShapeId> mGetMaxShapeId;
         Sqlite3::Statement<DbQueries::FindShapeId> mFindShapeId;
         Sqlite3::Statement<DbQueries::InsertShape> mInsertShape;
+        Sqlite3::Statement<DbQueries::Vacuum> mVacuum;
     };
 }
 
diff --git a/components/detournavigator/tilespositionsrange.hpp b/components/detournavigator/tilespositionsrange.hpp
new file mode 100644
index 0000000000..d5f2622ba1
--- /dev/null
+++ b/components/detournavigator/tilespositionsrange.hpp
@@ -0,0 +1,15 @@
+#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_TILESPOSITIONSRANGE_H
+#define OPENMW_COMPONENTS_DETOURNAVIGATOR_TILESPOSITIONSRANGE_H
+
+#include "tileposition.hpp"
+
+namespace DetourNavigator
+{
+    struct TilesPositionsRange
+    {
+        TilePosition mBegin;
+        TilePosition mEnd;
+    };
+}
+
+#endif

From a7e76c6f3dab07621a22feb2c8f641e4b60e96b6 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 27 Jan 2022 21:17:47 +0100
Subject: [PATCH 2137/2859] Remove redundant include

---
 apps/openmw_test_suite/sqlite3/request.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/openmw_test_suite/sqlite3/request.cpp b/apps/openmw_test_suite/sqlite3/request.cpp
index e0094827d1..3bcf658c0d 100644
--- a/apps/openmw_test_suite/sqlite3/request.cpp
+++ b/apps/openmw_test_suite/sqlite3/request.cpp
@@ -1,7 +1,6 @@
 #include <components/sqlite3/db.hpp>
 #include <components/sqlite3/request.hpp>
 #include <components/sqlite3/statement.hpp>
-#include <components/sqlite3/transaction.hpp>
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>

From 76ba5025e38fa3185247290c7ac540b936832d84 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Fri, 18 Feb 2022 20:48:15 +0300
Subject: [PATCH 2138/2859] Clarify root node transformation discard

---
 components/nif/node.hpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/nif/node.hpp b/components/nif/node.hpp
index 837a4a0e30..34ac12e490 100644
--- a/components/nif/node.hpp
+++ b/components/nif/node.hpp
@@ -225,9 +225,10 @@ struct NiNode : Node
         // Discard transformations for the root node, otherwise some meshes
         // occasionally get wrong orientation. Only for NiNode-s for now, but
         // can be expanded if needed.
+        // FIXME: if node 0 is *not* the only root node, this must not happen.
         if (0 == recIndex && !Misc::StringUtils::ciEqual(name, "bip01"))
         {
-            static_cast<Nif::Node*>(this)->trafo = Nif::Transformation::getIdentity();
+            trafo = Nif::Transformation::getIdentity();
         }
     }
 

From 59130366380b234707be1974cf44b7f7ec6b5618 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 27 Jan 2022 21:17:56 +0100
Subject: [PATCH 2139/2859] Use SQLITE_OPEN_NOMUTEX

---
 components/sqlite3/db.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/components/sqlite3/db.cpp b/components/sqlite3/db.cpp
index 54a156057d..b1e3afb1ae 100644
--- a/components/sqlite3/db.cpp
+++ b/components/sqlite3/db.cpp
@@ -16,7 +16,10 @@ namespace Sqlite3
     Db makeDb(std::string_view path, const char* schema)
     {
         sqlite3* handle = nullptr;
-        const int flags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE;
+        // All uses of NavMeshDb are protected by a mutex (navmeshtool) or serialized in a single thread (DbWorker)
+        // so additional synchronization between threads is not required and SQLITE_OPEN_NOMUTEX can be used.
+        // This is unsafe to use NavMeshDb without external synchronization because of internal state.
+        const int flags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_NOMUTEX;
         if (const int ec = sqlite3_open_v2(std::string(path).c_str(), &handle, flags, nullptr); ec != SQLITE_OK)
         {
             const std::string message(sqlite3_errmsg(handle));

From 8b4362ece7853077847f780e24caca31b53aa614 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 27 Jan 2022 21:18:01 +0100
Subject: [PATCH 2140/2859] Disable navmesh disk cache when db is failed to
 open

---
 components/detournavigator/navigator.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/components/detournavigator/navigator.cpp b/components/detournavigator/navigator.cpp
index cf3c4ba5b3..5b9341523c 100644
--- a/components/detournavigator/navigator.cpp
+++ b/components/detournavigator/navigator.cpp
@@ -3,6 +3,8 @@
 #include "navigatorstub.hpp"
 #include "recastglobalallocator.hpp"
 
+#include <components/debug/debuglog.hpp>
+
 namespace DetourNavigator
 {
     std::unique_ptr<Navigator> makeNavigator(const Settings& settings, const std::string& userDataPath)
@@ -11,7 +13,16 @@ namespace DetourNavigator
 
         std::unique_ptr<NavMeshDb> db;
         if (settings.mEnableNavMeshDiskCache)
-            db = std::make_unique<NavMeshDb>(userDataPath + "/navmesh.db");
+        {
+            try
+            {
+                db = std::make_unique<NavMeshDb>(userDataPath + "/navmesh.db");
+            }
+            catch (const std::exception& e)
+            {
+                Log(Debug::Error) << e.what() << ", navigation mesh disk cache will be disabled";
+            }
+        }
 
         return std::make_unique<NavigatorImpl>(settings, std::move(db));
     }

From 54df5031b7c0184a135b250bae863919f839c73e Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Fri, 18 Feb 2022 20:47:34 +0300
Subject: [PATCH 2141/2859] Add XYZ rotation axis order support

---
 components/nif/data.cpp          |  3 +--
 components/nif/data.hpp          | 15 +++++++++++++++
 components/nifosg/controller.cpp | 32 ++++++++++++++++++++++++++++----
 components/nifosg/controller.hpp |  2 ++
 4 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/components/nif/data.cpp b/components/nif/data.cpp
index 1b6d302d68..36a123fdfa 100644
--- a/components/nif/data.cpp
+++ b/components/nif/data.cpp
@@ -439,9 +439,8 @@ void NiKeyframeData::read(NIFStream *nif)
     mRotations->read(nif);
     if(mRotations->mInterpolationType == InterpolationType_XYZ)
     {
-        //Chomp unused float
         if (nif->getVersion() <= NIFStream::generateVersion(10,1,0,0))
-            nif->getFloat();
+            mAxisOrder = static_cast<AxisOrder>(nif->getInt());
         mXRotations = std::make_shared<FloatKeyMap>();
         mYRotations = std::make_shared<FloatKeyMap>();
         mZRotations = std::make_shared<FloatKeyMap>();
diff --git a/components/nif/data.hpp b/components/nif/data.hpp
index 70171ac47c..919e442665 100644
--- a/components/nif/data.hpp
+++ b/components/nif/data.hpp
@@ -240,6 +240,21 @@ struct NiKeyframeData : public Record
     Vector3KeyMapPtr mTranslations;
     FloatKeyMapPtr mScales;
 
+    enum class AxisOrder
+    {
+        Order_XYZ = 0,
+        Order_XZY = 1,
+        Order_YZX = 2,
+        Order_YXZ = 3,
+        Order_ZXY = 4,
+        Order_ZYX = 5,
+        Order_XYX = 6,
+        Order_YZY = 7,
+        Order_ZXZ = 8
+    };
+
+    AxisOrder mAxisOrder{AxisOrder::Order_XYZ};
+
     void read(NIFStream *nif) override;
 };
 
diff --git a/components/nifosg/controller.cpp b/components/nifosg/controller.cpp
index 07134532e9..91bd94c74f 100644
--- a/components/nifosg/controller.cpp
+++ b/components/nifosg/controller.cpp
@@ -79,6 +79,7 @@ KeyframeController::KeyframeController(const KeyframeController &copy, const osg
     , mZRotations(copy.mZRotations)
     , mTranslations(copy.mTranslations)
     , mScales(copy.mScales)
+    , mAxisOrder(copy.mAxisOrder)
 {
 }
 
@@ -95,6 +96,7 @@ KeyframeController::KeyframeController(const Nif::NiKeyframeController *keyctrl)
             mZRotations = FloatInterpolator(interp->data->mZRotations);
             mTranslations = Vec3Interpolator(interp->data->mTranslations, interp->defaultPos);
             mScales = FloatInterpolator(interp->data->mScales, interp->defaultScale);
+            mAxisOrder = interp->data->mAxisOrder;
         }
         else
         {
@@ -112,6 +114,7 @@ KeyframeController::KeyframeController(const Nif::NiKeyframeController *keyctrl)
         mZRotations = FloatInterpolator(keydata->mZRotations);
         mTranslations = Vec3Interpolator(keydata->mTranslations);
         mScales = FloatInterpolator(keydata->mScales, 1.f);
+        mAxisOrder = keydata->mAxisOrder;
     }
 }
 
@@ -124,10 +127,31 @@ osg::Quat KeyframeController::getXYZRotation(float time) const
         yrot = mYRotations.interpKey(time);
     if (!mZRotations.empty())
         zrot = mZRotations.interpKey(time);
-    osg::Quat xr(xrot, osg::Vec3f(1,0,0));
-    osg::Quat yr(yrot, osg::Vec3f(0,1,0));
-    osg::Quat zr(zrot, osg::Vec3f(0,0,1));
-    return (xr*yr*zr);
+    osg::Quat xr(xrot, osg::X_AXIS);
+    osg::Quat yr(yrot, osg::Y_AXIS);
+    osg::Quat zr(zrot, osg::Z_AXIS);
+    switch (mAxisOrder)
+    {
+        case Nif::NiKeyframeData::AxisOrder::Order_XYZ:
+            return xr * yr * zr;
+        case Nif::NiKeyframeData::AxisOrder::Order_XZY:
+            return xr * zr * yr;
+        case Nif::NiKeyframeData::AxisOrder::Order_YZX:
+            return yr * zr * xr;
+        case Nif::NiKeyframeData::AxisOrder::Order_YXZ:
+            return yr * xr * zr;
+        case Nif::NiKeyframeData::AxisOrder::Order_ZXY:
+            return zr * xr * yr;
+        case Nif::NiKeyframeData::AxisOrder::Order_ZYX:
+            return zr * yr * xr;
+        case Nif::NiKeyframeData::AxisOrder::Order_XYX:
+            return xr * yr * xr;
+        case Nif::NiKeyframeData::AxisOrder::Order_YZY:
+            return yr * zr * yr;
+        case Nif::NiKeyframeData::AxisOrder::Order_ZXZ:
+            return zr * xr * zr;
+    }
+    return xr * yr * zr;
 }
 
 osg::Vec3f KeyframeController::getTranslation(float time) const
diff --git a/components/nifosg/controller.hpp b/components/nifosg/controller.hpp
index a5f887ebe6..acd96afd1e 100644
--- a/components/nifosg/controller.hpp
+++ b/components/nifosg/controller.hpp
@@ -255,6 +255,8 @@ namespace NifOsg
         Vec3Interpolator mTranslations;
         FloatInterpolator mScales;
 
+        Nif::NiKeyframeData::AxisOrder mAxisOrder{Nif::NiKeyframeData::AxisOrder::Order_XYZ};
+
         osg::Quat getXYZRotation(float time) const;
     };
 

From cccfb14785a27053c1375f0d36c6f56660213d1a Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 19 Feb 2022 02:07:41 +0100
Subject: [PATCH 2142/2859] Remove user-defined constructor from ESM4::Quest

To avoid explicit initialization. It should happen in the load functions anyway.
---
 components/esm4/loadqust.cpp | 11 -----------
 components/esm4/loadqust.hpp |  1 -
 2 files changed, 12 deletions(-)

diff --git a/components/esm4/loadqust.cpp b/components/esm4/loadqust.cpp
index 67e250ae76..5588f90580 100644
--- a/components/esm4/loadqust.cpp
+++ b/components/esm4/loadqust.cpp
@@ -33,17 +33,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Quest::Quest() : mFormId(0), mFlags(0), mQuestScript(0)
-{
-    mEditorId.clear();
-    mQuestName.clear();
-    mFileName.clear();
-
-    std::memset(&mScript.scriptHeader, 0, sizeof(ScriptHeader));
-    mScript.scriptSource.clear();
-    mScript.globReference = 0;
-}
-
 ESM4::Quest::~Quest()
 {
 }
diff --git a/components/esm4/loadqust.hpp b/components/esm4/loadqust.hpp
index 905a5cf0fa..853805900c 100644
--- a/components/esm4/loadqust.hpp
+++ b/components/esm4/loadqust.hpp
@@ -71,7 +71,6 @@ namespace ESM4
 
         ScriptDefinition mScript;
 
-        Quest();
         virtual ~Quest();
 
         virtual void load(ESM4::Reader& reader);

From 96463cbb02c419c7581c34c080afb367e530bb78 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 19 Feb 2022 02:49:06 +0100
Subject: [PATCH 2143/2859] Remove malformed and unused esm4/records.hpp file

---
 components/esm4/records.hpp | 74 -------------------------------------
 1 file changed, 74 deletions(-)
 delete mode 100644 components/esm4/records.hpp

diff --git a/components/esm4/records.hpp b/components/esm4/records.hpp
deleted file mode 100644
index d212091adb..0000000000
--- a/components/esm4/records.hpp
+++ /dev/null
@@ -1,74 +0,0 @@
-#ifndef ESM4_RECORDS_H
-#define ESM4_RECORDS_H
-
-#include <extern/esm4/hair.hpp>
-#include <extern/esm4/eyes.hpp>
-#include <extern/esm4/race.hpp>
-#include <extern/esm4/achr.hpp>
-#include <extern/esm4/acre.hpp>
-#include <extern/esm4/soun.hpp>
-#include <extern/esm4/ltex.hpp>
-#include <extern/esm4/acti.hpp>
-#include <extern/esm4/appa.hpp>
-#include <extern/esm4/armo.hpp>
-#include <extern/esm4/book.hpp>
-#include <extern/esm4/clot.hpp>
-#include <extern/esm4/cont.hpp>
-#include <extern/esm4/door.hpp>
-#include <extern/esm4/ingr.hpp>
-#include <extern/esm4/ligh.hpp>
-#include <extern/esm4/misc.hpp>
-#include <extern/esm4/stat.hpp>
-#include <extern/esm4/gras.hpp>
-#include <extern/esm4/tree.hpp>
-#include <extern/esm4/flor.hpp>
-#include <extern/esm4/furn.hpp>
-#include <extern/esm4/weap.hpp>
-#include <extern/esm4/ammo.hpp>
-#include <extern/esm4/npc_.hpp>
-#include <extern/esm4/crea.hpp>
-#include <extern/esm4/lvlc.hpp>
-#include <extern/esm4/slgm.hpp>
-#include <extern/esm4/keym.hpp>
-#include <extern/esm4/alch.hpp>
-#include <extern/esm4/sbsp.hpp>
-#include <extern/esm4/sgst.hpp>
-#include <extern/esm4/lvli.hpp>
-#include <extern/esm4/lvln.hpp>
-#include <extern/esm4/idlm.hpp>
-#include <extern/esm4/mstt.hpp>
-#include <extern/esm4/txst.hpp>
-#include <extern/esm4/scrl.hpp>
-#include <extern/esm4/arma.hpp>
-#include <extern/esm4/hdpt.hpp>
-#include <extern/esm4/term.hpp>
-#include <extern/esm4/tact.hpp>
-#include <extern/esm4/note.hpp>
-#include <extern/esm4/bptd.hpp>
-#include <extern/esm4/scpt.hpp>
-#include <extern/esm4/regn.hpp>
-#include <extern/esm4/land.hpp>
-#include <extern/esm4/anio.hpp>
-#include <extern/esm4/dial.hpp>
-#include <extern/esm4/info.hpp>
-#include <extern/esm4/pgrd.hpp>
-#include <extern/esm4/road.hpp>
-#include <extern/esm4/qust.hpp>
-#include <extern/esm4/pack.hpp>
-#include <extern/esm4/lgtm.hpp>
-#include <extern/esm4/pgre.hpp>
-#include <extern/esm4/aspc.hpp>
-#include <extern/esm4/imod.hpp>
-#include <extern/esm4/pwat.hpp>
-#include <extern/esm4/scol.hpp>
-#include <extern/esm4/musc.hpp>
-#include <extern/esm4/aloc.hpp>
-#include <extern/esm4/mset.hpp>
-#include <extern/esm4/dobj.hpp>
-#include <extern/esm4/clfm.hpp>
-#include <extern/esm4/otft.hpp>
-#include <extern/esm4/flst.hpp>
-#include <extern/esm4/sndr.hpp>
-#include <extern/esm4/glob.hpp>
-
-#endif // ESM4_RECORDS_H

From 57c1f2e231c22ee5e5e6c0b8210ac744a6dd6058 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 19 Feb 2022 02:49:22 +0100
Subject: [PATCH 2144/2859] Make sure everything compiles in ESM4

---
 apps/openmw_test_suite/CMakeLists.txt    |  2 +
 apps/openmw_test_suite/esm4/includes.cpp | 89 ++++++++++++++++++++++
 components/CMakeLists.txt                | 97 ++++++++++++++++++++++--
 3 files changed, 181 insertions(+), 7 deletions(-)
 create mode 100644 apps/openmw_test_suite/esm4/includes.cpp

diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index 16d820c4f9..73e7af1d9e 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -72,6 +72,8 @@ if (GTEST_FOUND AND GMOCK_FOUND)
         files/hash.cpp
 
         toutf8/toutf8.cpp
+
+        esm4/includes.cpp
     )
 
     source_group(apps\\openmw_test_suite FILES openmw_test_suite.cpp ${UNITTEST_SRC_FILES})
diff --git a/apps/openmw_test_suite/esm4/includes.cpp b/apps/openmw_test_suite/esm4/includes.cpp
new file mode 100644
index 0000000000..8272571099
--- /dev/null
+++ b/apps/openmw_test_suite/esm4/includes.cpp
@@ -0,0 +1,89 @@
+#include <components/esm4/acti.hpp>
+#include <components/esm4/actor.hpp>
+#include <components/esm4/common.hpp>
+#include <components/esm4/dialogue.hpp>
+#include <components/esm4/effect.hpp>
+#include <components/esm4/formid.hpp>
+#include <components/esm4/inventory.hpp>
+#include <components/esm4/lighting.hpp>
+#include <components/esm4/loadachr.hpp>
+#include <components/esm4/loadacre.hpp>
+#include <components/esm4/loadalch.hpp>
+#include <components/esm4/loadaloc.hpp>
+#include <components/esm4/loadammo.hpp>
+#include <components/esm4/loadanio.hpp>
+#include <components/esm4/loadappa.hpp>
+#include <components/esm4/loadarma.hpp>
+#include <components/esm4/loadarmo.hpp>
+#include <components/esm4/loadaspc.hpp>
+#include <components/esm4/loadbook.hpp>
+#include <components/esm4/loadbptd.hpp>
+#include <components/esm4/loadcell.hpp>
+#include <components/esm4/loadclas.hpp>
+#include <components/esm4/loadclfm.hpp>
+#include <components/esm4/loadclot.hpp>
+#include <components/esm4/loadcont.hpp>
+#include <components/esm4/loadcrea.hpp>
+#include <components/esm4/loaddial.hpp>
+#include <components/esm4/loaddobj.hpp>
+#include <components/esm4/loaddoor.hpp>
+#include <components/esm4/loadeyes.hpp>
+#include <components/esm4/loadflor.hpp>
+#include <components/esm4/loadflst.hpp>
+#include <components/esm4/loadfurn.hpp>
+#include <components/esm4/loadglob.hpp>
+#include <components/esm4/loadgras.hpp>
+#include <components/esm4/loadgrup.hpp>
+#include <components/esm4/loadhair.hpp>
+#include <components/esm4/loadhdpt.hpp>
+#include <components/esm4/loadidle.hpp>
+#include <components/esm4/loadidlm.hpp>
+#include <components/esm4/loadimod.hpp>
+#include <components/esm4/loadinfo.hpp>
+#include <components/esm4/loadingr.hpp>
+#include <components/esm4/loadkeym.hpp>
+#include <components/esm4/loadland.hpp>
+#include <components/esm4/loadlgtm.hpp>
+#include <components/esm4/loadligh.hpp>
+#include <components/esm4/loadltex.hpp>
+#include <components/esm4/loadlvlc.hpp>
+#include <components/esm4/loadlvli.hpp>
+#include <components/esm4/loadlvln.hpp>
+#include <components/esm4/loadmato.hpp>
+#include <components/esm4/loadmisc.hpp>
+#include <components/esm4/loadmset.hpp>
+#include <components/esm4/loadmstt.hpp>
+#include <components/esm4/loadmusc.hpp>
+#include <components/esm4/loadnavi.hpp>
+#include <components/esm4/loadnavm.hpp>
+#include <components/esm4/loadnote.hpp>
+#include <components/esm4/loadnpc.hpp>
+#include <components/esm4/loadotft.hpp>
+#include <components/esm4/loadpack.hpp>
+#include <components/esm4/loadpgrd.hpp>
+#include <components/esm4/loadpgre.hpp>
+#include <components/esm4/loadpwat.hpp>
+#include <components/esm4/loadqust.hpp>
+#include <components/esm4/loadrace.hpp>
+#include <components/esm4/loadrefr.hpp>
+#include <components/esm4/loadregn.hpp>
+#include <components/esm4/loadroad.hpp>
+#include <components/esm4/loadsbsp.hpp>
+#include <components/esm4/loadscol.hpp>
+#include <components/esm4/loadscpt.hpp>
+#include <components/esm4/loadscrl.hpp>
+#include <components/esm4/loadsgst.hpp>
+#include <components/esm4/loadslgm.hpp>
+#include <components/esm4/loadsndr.hpp>
+#include <components/esm4/loadsoun.hpp>
+#include <components/esm4/loadstat.hpp>
+#include <components/esm4/loadtact.hpp>
+#include <components/esm4/loadterm.hpp>
+#include <components/esm4/loadtes4.hpp>
+#include <components/esm4/loadtree.hpp>
+#include <components/esm4/loadtxst.hpp>
+#include <components/esm4/loadweap.hpp>
+#include <components/esm4/loadwrld.hpp>
+#include <components/esm4/reader.hpp>
+#include <components/esm4/reference.hpp>
+#include <components/esm4/script.hpp>
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index a0cc7ce2ce..8ab71b4cdf 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -95,13 +95,96 @@ add_component_dir (esm3terrain
     )
 
 add_component_dir (esm4
-    loadachr loadacre loadacti loadalch loadaloc loadammo loadanio loadappa loadarma loadarmo loadaspc loadbook
-    loadbptd loadcell loadclas loadclfm loadclot common loadcont loadcrea loaddial loaddobj loaddoor loadeyes
-    loadflor loadflst formid loadfurn loadglob loadgras loadhair loadhdpt loadidle loadidlm loadimod loadinfo
-    loadingr loadkeym loadland loadlgtm loadligh loadltex loadlvlc loadlvli loadlvln loadmato loadmisc loadmset
-    loadmstt loadmusc loadnavi loadnavm loadnote loadnpc loadotft loadpack loadpgrd loadpgre loadpwat loadqust
-    loadrace loadrefr loadregn loadroad loadsbsp loadscol loadscpt loadscrl loadsgst loadslgm loadsndr
-    loadsoun loadstat loadtact loadterm loadtes4 loadtree loadtxst loadweap loadwrld reader
+    acti
+    actor
+    common
+    dialogue
+    effect
+    formid
+    inventory
+    lighting
+    loadachr
+    loadacre
+    loadacti
+    loadalch
+    loadaloc
+    loadammo
+    loadanio
+    loadappa
+    loadarma
+    loadarmo
+    loadaspc
+    loadbook
+    loadbptd
+    loadcell
+    loadclas
+    loadclfm
+    loadclot
+    loadcont
+    loadcrea
+    loaddial
+    loaddobj
+    loaddoor
+    loadeyes
+    loadflor
+    loadflst
+    loadfurn
+    loadglob
+    loadgras
+    loadgrup
+    loadhair
+    loadhdpt
+    loadidle
+    loadidlm
+    loadimod
+    loadinfo
+    loadingr
+    loadkeym
+    loadland
+    loadlgtm
+    loadligh
+    loadltex
+    loadlvlc
+    loadlvli
+    loadlvln
+    loadmato
+    loadmisc
+    loadmset
+    loadmstt
+    loadmusc
+    loadnavi
+    loadnavm
+    loadnote
+    loadnpc
+    loadotft
+    loadpack
+    loadpgrd
+    loadpgre
+    loadpwat
+    loadqust
+    loadrace
+    loadrefr
+    loadregn
+    loadroad
+    loadsbsp
+    loadscol
+    loadscpt
+    loadscrl
+    loadsgst
+    loadslgm
+    loadsndr
+    loadsoun
+    loadstat
+    loadtact
+    loadterm
+    loadtes4
+    loadtree
+    loadtxst
+    loadweap
+    loadwrld
+    reader
+    reference
+    script
 )
 
 add_component_dir (misc

From b997e28e57413a68cdda4271c559a69000cf9152 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Sat, 19 Feb 2022 14:56:51 +0200
Subject: [PATCH 2145/2859] Fix #6633: AiSequence packages being removed
 incorrectly

---
 apps/openmw/mwmechanics/aisequence.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index 0cb1e97603..bf01936f90 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -315,9 +315,16 @@ void AiSequence::execute (const MWWorld::Ptr& actor, CharacterController& charac
                 mPackages.push_back(package->clone());
             }
 
-            // To account for the rare case where AiPackage::execute() queued another AI package
-            // (e.g. AiPursue executing a dialogue script that uses startCombat)
-            erase(mPackages.begin());
+            // The active package is typically the first entry, this is however not always the case
+            // e.g. AiPursue executing a dialogue script that uses startCombat adds a combat package to the front
+            // due to the priority.
+            auto activePackageIt = std::find_if(mPackages.begin(), mPackages.end(), [&](auto& entry)
+                {
+                    return entry.get() == package;
+                });
+
+            erase(activePackageIt);
+
             if (isActualAiPackage(packageTypeId))
                 mDone = true;
         }

From 6fd251e8f7f246df7bf8446ae7b0f380bab643ed Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 19 Feb 2022 21:41:40 +0100
Subject: [PATCH 2146/2859] Avoid starting async png writing when overlay image
 is null

---
 apps/openmw/mwrender/globalmap.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/openmw/mwrender/globalmap.cpp b/apps/openmw/mwrender/globalmap.cpp
index 3d0a066451..acd566ff18 100644
--- a/apps/openmw/mwrender/globalmap.cpp
+++ b/apps/openmw/mwrender/globalmap.cpp
@@ -635,6 +635,8 @@ namespace MWRender
 
     void GlobalMap::asyncWritePng()
     {
+        if (mOverlayImage == nullptr)
+            return;
         // Use deep copy to avoid any sychronization
         mWritePng = new WritePng(new osg::Image(*mOverlayImage, osg::CopyOp::DEEP_COPY_ALL));
         mWorkQueue->addWorkItem(mWritePng, /*front=*/true);

From 79c3b2e1a3d9796de8c2d41aadc945605d27767b Mon Sep 17 00:00:00 2001
From: Lamoot <matjaz.lamut@gmail.com>
Date: Sat, 19 Feb 2022 22:20:26 +0100
Subject: [PATCH 2147/2859] Cleanup and fix articles connected with the collada
 asset workflow.

---
 ...ine-blender-collada-animated-creature.rst} |   6 +-
 ...pipeline-blender-collada-static-models.rst |   3 +-
 .../pipeline-blender-collada.rst              | 127 ------------------
 .../reference/modding/settings/models.rst     |  46 +++++--
 4 files changed, 40 insertions(+), 142 deletions(-)
 rename docs/source/reference/modding/custom-models/{pipeline-blender-collada-animated-creature => pipeline-blender-collada-animated-creature.rst} (99%)
 delete mode 100644 docs/source/reference/modding/custom-models/pipeline-blender-collada.rst

diff --git a/docs/source/reference/modding/custom-models/pipeline-blender-collada-animated-creature b/docs/source/reference/modding/custom-models/pipeline-blender-collada-animated-creature.rst
similarity index 99%
rename from docs/source/reference/modding/custom-models/pipeline-blender-collada-animated-creature
rename to docs/source/reference/modding/custom-models/pipeline-blender-collada-animated-creature.rst
index b759bf9a02..096af20932 100644
--- a/docs/source/reference/modding/custom-models/pipeline-blender-collada-animated-creature
+++ b/docs/source/reference/modding/custom-models/pipeline-blender-collada-animated-creature.rst
@@ -64,7 +64,7 @@ Armature / Rig
   Only a single rig object should be included in the exported file. Exporting multiple rigs is not reliably supported and can lead to errors.
 
 Root
-----
+====
 
 The rig needs to be structured in a specific way. There should be a single top 
 bone in the rig’s hierarchy, the root bone named ``Bip01``. The name is 
@@ -77,7 +77,7 @@ needs to have its ``Deform`` flag **enabled**.
 
 
 Deform Bones
-------------
+============
 
 Below the root bone, the bones are divided into two branches. One branch 
 contains the deform bones which get included in the final exported file. These 
@@ -90,7 +90,7 @@ convention used for NPC and player models.
     :align: center
 
 Control Bones
--------------
+=============
 
 The other branch holds control and helper bones that enable comfortable 
 animation in Blender, but are neither required nor included in the exported 
diff --git a/docs/source/reference/modding/custom-models/pipeline-blender-collada-static-models.rst b/docs/source/reference/modding/custom-models/pipeline-blender-collada-static-models.rst
index 5cb336a305..860993273a 100644
--- a/docs/source/reference/modding/custom-models/pipeline-blender-collada-static-models.rst
+++ b/docs/source/reference/modding/custom-models/pipeline-blender-collada-static-models.rst
@@ -19,7 +19,8 @@ To use the Blender to OpenMW pipeline via COLLADA, you will need the following.
 * A model you would like to export. In our case, it's a barrel.
 
 The Barrel
-********
+**********
+
 The barrel shown in this tutorial, and its revelant files, are available from 
 the `Example Suite repository <https://gitlab.com/OpenMW/example-suite/-/tree/master/example_static_props>`_.
 This should be useful for further study of how to set up a static prop in case
diff --git a/docs/source/reference/modding/custom-models/pipeline-blender-collada.rst b/docs/source/reference/modding/custom-models/pipeline-blender-collada.rst
deleted file mode 100644
index 47096a83e7..0000000000
--- a/docs/source/reference/modding/custom-models/pipeline-blender-collada.rst
+++ /dev/null
@@ -1,127 +0,0 @@
-##############################
-Blender to OpenMW with COLLADA
-##############################
-
-Requirements
-************
-To use the Blender to OpenMW pipeline via COLLADA, you will need the following.
-
-* `OpenMW 0.47 <https://openmw.org/downloads/>`_ or later
-* `Blender 2.81 <https://www.blender.org/download/>`_ or later. Latest confirmed, working version is Blender 2.91
-* `Better COLLADA Exporter <https://github.com/unelsson/collada-exporter>`_ tuned for OpenMW
-* A model you would like to export
-
-
-Static Models
-*************
-Static models are those that don't have any animations included in the exported file. First, let's take a look at how the fundamental properties of a scene in Blender translate to a COLLADA model suitable for use in OpenMW. These apply the same to static and animated models.
-
-Location
-========
-
-Objects keep their visual location and origin they had in the original scene.
-
-Rotation
-========
-
-* Blender’s +Z axis is up axis in OpenMW
-* Blender’s +Y axis is front axis in OpenMW
-* Blender’s X axis is left-right axis in OpenMW
-
-Scale
-=====
-
-Scale ratio between Blender and OpenMW is 70 to 1. This means 70 units in Blender translate to 1 m in OpenMW.
-
-However, a scale factor like this is impractical to work with. A better approach is to work with a scale of 1 Blender unit = 1 m and apply the 70 scale factor at export. The exporter will automatically scale all object, mesh, armature and animation data.
-
-Materials
-=========
-
-OpenMW uses the classic, specular material setup and currently doesn't use the more mainstream `PBR <https://en.wikipedia.org/wiki/Physically_based_rendering>`_ way. In Blender, the mesh needs a default material with a diffuse texture connected to the ``Base Color`` socket. This is enough for the material to be included in the exported COLLADA file.
-
-Additional texture types, such as specular or normal maps, will be automatically recognized and used by OpenMW. They need an identical base name as the diffuse texture, a suffix, and be in the same folder. How to enable this and what suffix is used for what texture type is covered in more detail in :doc:`../../modding/texture-modding/texture-basics`.
-
-Collision Shapes
-================
-
-In Blender, create an empty and name it ``collision``. Any mesh that is a child of this empty will be used for physics collision and will not be visible. There can be multiple child meshes under ``collision`` and they will all contribute to the collision shapes. The meshes themselves can have an arbitrary name, it's only the name of the empty that is important. The ``tcb`` command in OpenMW's in-game console will make the collision shapes visible and you will be able to inspect them.
-
-Exporter Settings
-=================
-
-For static models, use the following exporter settings. Before export, select all objects you wish to include in the exported file and have the "Selected Objects" option enabled. Without this, the exporter could fail.
-
-
-.. image:: https://gitlab.com/OpenMW/openmw-docs/-/raw/master/docs/source/reference/modding/custom-models/_static/dae_exporter_static.jpg
-    :align: center
-
-
-Animated Models
-***************
-
-Animated models are those where a hierarchy of bones, known as armature, deforms the mesh and makes things move. Besides the topics covered above, the following requirements apply.
-
-Armature
-========
-
-* A single armature per COLLADA file is advised to avoid any potential problems.
-* There needs to be a single top-most bone in the armature’s hierarchy, where both the deformation and control bones fall under it.
-* Not all bones need to be exported. By disabing the bone’s “Deform” property and using the corresponding option in the exporter, it is possible to export only the bones needed for animation.
-
-
-Animations
-==========
-
-Every action in Blender is exported as its own animation clip in COLLADA. Actions you don't wish to export need to have "-noexp" added to their name, with the corresponding option enabled in the exporter.
-
-Due to current limitations of the format and exporter, the keyframes of individual actions must not overlap with other actions. The keyframes need to be manually offset to a unique range on the timeline as shown in this example.
-
-.. image:: https://gitlab.com/OpenMW/openmw-docs/-/raw/master/docs/source/reference/modding/custom-models/_static/dae_animations_on_timeline.jpg
-    :align: center
-
-Textkeys
---------
-
-The exported COLLADA file requires a corresponding textkeys file for OpenMW to properly read the animations. Textkeys is a .txt file containing animation definitions. Textkeys file is placed in the same folder as the model and uses a name matching the model. 
-
-    - ``OpenMWDude.dae``
-    - ``OpenMWDude.txt``
-
-Textkeys use a simple format as shown in the example. Name, start and stop values can be taken from the corresponding COLLADA file for each ``<animation_clip>``.
-    
-.. code::
-
-    idle: start 0.03333333333333333
-    idle: stop 2.033333333333333
-    runforward: start 2.0666666666666664
-    runforward: stop 3.0666666666666664
-    runback: start 3.1
-    runback: stop 4.1
-    ...
-    
-
-Root Motion
-===========
-
-OpenMW can read the movement of the root (top-most in hierarchy) bone and use it to move objects in the game world. For this to work, the root bone must be animated to move through space. The root bone must, in its default pose, be alligned with the world.
-
-.. image:: https://gitlab.com/OpenMW/openmw-docs/-/raw/master/docs/source/reference/modding/custom-models/_static/dae_rig_root.jpg
-    :align: center
-
-
-Exporter Settings
-=================
-
-For animated models, use the following exporter settings. Before export, select all objects you wish to include in the exported file and have the "Selected Objects" option enabled. Without this, the exporter could fail.
-
-.. image:: https://gitlab.com/OpenMW/openmw-docs/-/raw/master/docs/source/reference/modding/custom-models/_static/dae_exporter_animated.jpg
-    :align: center
-
-
-
-
-
- 
- 
-
diff --git a/docs/source/reference/modding/settings/models.rst b/docs/source/reference/modding/settings/models.rst
index c0192067a7..b870268567 100644
--- a/docs/source/reference/modding/settings/models.rst
+++ b/docs/source/reference/modding/settings/models.rst
@@ -37,10 +37,15 @@ xbaseanim
 :Range:		
 :Default:	meshes/xbase_anim.nif
 
-Path to the file used for 3rd person base animation model that looks also for the corresponding kf-file.
+Path to the file used for 3rd person base animation model that looks also for 
+the corresponding kf-file.
 
 .. note::
-	If you are using the COLLADA format, you don't need to separate the files as they are separated between .nif and .kf files. It works if you plug the same COLLADA file into all animation-related entries, just make sure there is a corresponding textkeys file. You can read more about the textkeys in :doc:`../../modding/custom-models/pipeline-blender-collada`.
+	If you are using the COLLADA format, you don't need to separate the files as 
+	they are separated between .nif and .kf files. It works if you plug the same 
+	COLLADA file into all animation-related entries, just make sure there is a 
+	corresponding textkeys file. You can read more about the textkeys in 
+	:doc:`../../modding/custom-models/pipeline-blender-collada-animated-creature`.
 
 baseanim
 --------
@@ -58,7 +63,8 @@ xbaseanim1st
 :Range:		
 :Default:	meshes/xbase_anim.1st.nif
 
-Path to the file used for 1st person base animation model that looks also for corresponding kf-file.
+Path to the file used for 1st person base animation model that looks also for 
+corresponding kf-file.
 
 baseanimkna
 -----------
@@ -175,7 +181,9 @@ skyatmosphere
 :Range:		
 :Default:	meshes/sky_atmosphere.nif
 
-Path to the file used for the sky atmosphere mesh, which is one of the three meshes needed to render the sky. It's used to make the top half of the sky blue and renders in front of the background color.
+Path to the file used for the sky atmosphere mesh, which is one of the three 
+meshes needed to render the sky. It's used to make the top half of the sky blue 
+and renders in front of the background color.
 
 skyclouds
 ---------
@@ -184,7 +192,9 @@ skyclouds
 :Range:		
 :Default:	meshes/sky_clouds_01.nif.
 
-Path to the file used for the sky clouds mesh, which is one of the three meshes needed to render the sky. It displays a scrolling texture of clouds in front of the atmosphere mesh and background color
+Path to the file used for the sky clouds mesh, which is one of the three meshes 
+needed to render the sky. It displays a scrolling texture of clouds in front of 
+the atmosphere mesh and background color
 
 skynight01
 ----------
@@ -193,7 +203,10 @@ skynight01
 :Range:		
 :Default:	meshes/sky_night_01.nif
 
-Path to the file used for the sky stars mesh, which is one of the three meshes needed to render the sky. During night, it displays a texture with stars in front of the atmosphere and behind the clouds. If skynight02 is present, skynight01 will not be used.
+Path to the file used for the sky stars mesh, which is one of the three meshes 
+needed to render the sky. During night, it displays a texture with stars in 
+front of the atmosphere and behind the clouds. If skynight02 is present, 
+skynight01 will not be used.
 
 skynight02
 ----------
@@ -202,7 +215,10 @@ skynight02
 :Range:		
 :Default:	meshes/sky_night_02.nif
 
-Path to the file used for the sky stars mesh, which is one of the three meshes needed to render the sky. During night, it displays a texture with stars in front of the atmosphere and behind the clouds. If it's present it will be used instead of skynight01.
+Path to the file used for the sky stars mesh, which is one of the three meshes 
+needed to render the sky. During night, it displays a texture with stars in 
+front of the atmosphere and behind the clouds. If it's present it will be used 
+instead of skynight01.
 
 weatherashcloud
 ---------------
@@ -211,7 +227,9 @@ weatherashcloud
 :Range:		
 :Default:	meshes/ashcloud.nif
 
-Path to the file used for the ash clouds weather effect in Morrowind. OpenMW doesn't use this file, instead it renders a similar looking particle effect. Changing this won't have any effect.
+Path to the file used for the ash clouds weather effect in Morrowind. OpenMW 
+doesn't use this file, instead it renders a similar looking particle effect. 
+Changing this won't have any effect.
 
 weatherblightcloud
 ------------------
@@ -220,7 +238,9 @@ weatherblightcloud
 :Range:		
 :Default:	meshes/blightcloud.nif
 
-Path to the file used for the blight clouds weather effect in Morrowind. OpenMW doesn't use this file, instead it renders a similar looking particle effect. Changing this won't have any effect.
+Path to the file used for the blight clouds weather effect in Morrowind. OpenMW 
+doesn't use this file, instead it renders a similar looking particle effect. 
+Changing this won't have any effect.
 
 weathersnow
 -----------
@@ -229,7 +249,9 @@ weathersnow
 :Range:		
 :Default:	meshes/snow.nif
 
-Path to the file used for the snow falling weather effect in Morrowind. OpenMW doesn't use this file, instead it renders a similar looking particle effect. Changing this won't have any effect.
+Path to the file used for the snow falling weather effect in Morrowind. OpenMW 
+doesn't use this file, instead it renders a similar looking particle effect. 
+Changing this won't have any effect.
 
 weatherblizzard
 ---------------
@@ -238,4 +260,6 @@ weatherblizzard
 :Range:		
 :Default:	meshes/blizzard.nif
 
-Path to the file used for the blizzard clouds weather effect in Morrowind. OpenMW doesn't use this file, instead it renders a similar looking particle effect. Changing this won't have any effect.
+Path to the file used for the blizzard clouds weather effect in Morrowind. 
+OpenMW doesn't use this file, instead it renders a similar looking particle 
+effect. Changing this won't have any effect.

From cc6dce544386f459c19d414ef3c43cbabcddd6c0 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Mon, 21 Feb 2022 19:49:00 +0000
Subject: [PATCH 2148/2859] Support controller touchpads (Resolves
 https://gitlab.com/OpenMW/openmw/-/issues/6639)

---
 apps/openmw/CMakeLists.txt                    |   2 +-
 apps/openmw/mwbase/luamanager.hpp             |  15 +-
 apps/openmw/mwinput/controllermanager.cpp     |  18 ++
 apps/openmw/mwinput/controllermanager.hpp     |   4 +
 apps/openmw/mwlua/inputbindings.cpp           |  12 ++
 apps/openmw/mwlua/playerscripts.hpp           |  23 ++-
 components/sdlutil/events.hpp                 |  32 +++-
 components/sdlutil/sdlinputwrapper.cpp        |  14 ++
 .../lua-scripting/engine_handlers.rst         | 162 ++++++++++--------
 files/lua_api/openmw/input.lua                |   8 +
 10 files changed, 207 insertions(+), 83 deletions(-)

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 3c8a0a4d9a..71c138eee9 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -58,7 +58,7 @@ add_openmw_dir (mwscript
 
 add_openmw_dir (mwlua
     luamanagerimp actions object worldview userdataserializer eventqueue query
-    luabindings localscripts objectbindings cellbindings asyncbindings settingsbindings
+    luabindings localscripts playerscripts objectbindings cellbindings asyncbindings settingsbindings
     camerabindings uibindings inputbindings nearbybindings
     )
 
diff --git a/apps/openmw/mwbase/luamanager.hpp b/apps/openmw/mwbase/luamanager.hpp
index 7fa8b6df58..5ed751ffed 100644
--- a/apps/openmw/mwbase/luamanager.hpp
+++ b/apps/openmw/mwbase/luamanager.hpp
@@ -4,6 +4,8 @@
 #include <variant>
 #include <SDL_events.h>
 
+#include <components/sdlutil/events.hpp>
+
 namespace MWWorld
 {
     class Ptr;
@@ -43,8 +45,17 @@ namespace MWBase
 
         struct InputEvent
         {
-            enum {KeyPressed, KeyReleased, ControllerPressed, ControllerReleased, Action} mType;
-            std::variant<SDL_Keysym, int> mValue;
+            enum {
+                KeyPressed,
+                KeyReleased,
+                ControllerPressed,
+                ControllerReleased,
+                Action,
+                TouchPressed,
+                TouchReleased,
+                TouchMoved,
+            } mType;
+            std::variant<SDL_Keysym, int, SDLUtil::TouchEvent> mValue;
         };
         virtual void inputEvent(const InputEvent& event) = 0;
 
diff --git a/apps/openmw/mwinput/controllermanager.cpp b/apps/openmw/mwinput/controllermanager.cpp
index 6c6549face..f4d307e7d0 100644
--- a/apps/openmw/mwinput/controllermanager.cpp
+++ b/apps/openmw/mwinput/controllermanager.cpp
@@ -433,4 +433,22 @@ namespace MWInput
         #endif
         return std::array<float, 3>({gyro[0], gyro[1], gyro[2]});
     }
+
+    void ControllerManager::touchpadMoved(int deviceId, const SDLUtil::TouchEvent& arg)
+    {
+        MWBase::Environment::get().getLuaManager()->inputEvent(
+            { MWBase::LuaManager::InputEvent::TouchMoved, arg });
+    }
+
+    void ControllerManager::touchpadPressed(int deviceId, const SDLUtil::TouchEvent& arg)
+    {
+        MWBase::Environment::get().getLuaManager()->inputEvent(
+            { MWBase::LuaManager::InputEvent::TouchPressed, arg });
+    }
+
+    void ControllerManager::touchpadReleased(int deviceId, const SDLUtil::TouchEvent& arg)
+    {
+        MWBase::Environment::get().getLuaManager()->inputEvent(
+            { MWBase::LuaManager::InputEvent::TouchReleased, arg });
+    }
 }
diff --git a/apps/openmw/mwinput/controllermanager.hpp b/apps/openmw/mwinput/controllermanager.hpp
index 8df6ee5c9f..2472128c26 100644
--- a/apps/openmw/mwinput/controllermanager.hpp
+++ b/apps/openmw/mwinput/controllermanager.hpp
@@ -31,6 +31,10 @@ namespace MWInput
         void controllerAdded(int deviceID, const SDL_ControllerDeviceEvent &arg) override;
         void controllerRemoved(const SDL_ControllerDeviceEvent &arg) override;
 
+        void touchpadMoved(int deviceId, const SDLUtil::TouchEvent& arg) override;
+        void touchpadPressed(int deviceId, const SDLUtil::TouchEvent& arg) override;
+        void touchpadReleased(int deviceId, const SDLUtil::TouchEvent& arg) override;
+
         void processChangedSettings(const Settings::CategorySettingVector& changed);
 
         void setJoystickLastUsed(bool enabled) { mJoystickLastUsed = enabled; }
diff --git a/apps/openmw/mwlua/inputbindings.cpp b/apps/openmw/mwlua/inputbindings.cpp
index 9ca2d94770..a8487557ba 100644
--- a/apps/openmw/mwlua/inputbindings.cpp
+++ b/apps/openmw/mwlua/inputbindings.cpp
@@ -4,6 +4,8 @@
 #include <SDL_gamecontroller.h>
 #include <SDL_mouse.h>
 
+#include <components/sdlutil/events.hpp>
+
 #include "../mwbase/inputmanager.hpp"
 #include "../mwinput/actions.hpp"
 
@@ -32,6 +34,16 @@ namespace MWLua
         keyEvent["withAlt"] = sol::readonly_property([](const SDL_Keysym& e) -> bool { return e.mod & KMOD_ALT; });
         keyEvent["withSuper"] = sol::readonly_property([](const SDL_Keysym& e) -> bool { return e.mod & KMOD_GUI; });
 
+        auto touchpadEvent = context.mLua->sol().new_usertype<SDLUtil::TouchEvent>("TouchpadEvent");
+        touchpadEvent["device"] = sol::readonly_property(
+            [](const SDLUtil::TouchEvent& e) -> int { return e.mDevice; });
+        touchpadEvent["finger"] = sol::readonly_property(
+            [](const SDLUtil::TouchEvent& e) -> int { return e.mFinger; });
+        touchpadEvent["position"] = sol::readonly_property(
+            [](const SDLUtil::TouchEvent& e) -> osg::Vec2f { return osg::Vec2f(e.mX, e.mY);});
+        touchpadEvent["pressure"] = sol::readonly_property(
+            [](const SDLUtil::TouchEvent& e) -> float { return e.mPressure; });
+
         MWBase::InputManager* input = MWBase::Environment::get().getInputManager();
         sol::table api(context.mLua->sol(), sol::create);
 
diff --git a/apps/openmw/mwlua/playerscripts.hpp b/apps/openmw/mwlua/playerscripts.hpp
index e8cdd120ac..15ab451792 100644
--- a/apps/openmw/mwlua/playerscripts.hpp
+++ b/apps/openmw/mwlua/playerscripts.hpp
@@ -3,6 +3,8 @@
 
 #include <SDL_events.h>
 
+#include <components/sdlutil/events.hpp>
+
 #include "../mwbase/luamanager.hpp"
 
 #include "localscripts.hpp"
@@ -15,9 +17,12 @@ namespace MWLua
     public:
         PlayerScripts(LuaUtil::LuaState* lua, const LObject& obj) : LocalScripts(lua, obj, ESM::LuaScriptCfg::sPlayer)
         {
-            registerEngineHandlers({&mKeyPressHandlers, &mKeyReleaseHandlers,
-                                    &mControllerButtonPressHandlers, &mControllerButtonReleaseHandlers,
-                                    &mActionHandlers, &mInputUpdateHandlers});
+            registerEngineHandlers({
+                &mKeyPressHandlers, &mKeyReleaseHandlers,
+                &mControllerButtonPressHandlers, &mControllerButtonReleaseHandlers,
+                &mActionHandlers, &mInputUpdateHandlers,
+                &mTouchpadPressed, &mTouchpadReleased, &mTouchpadMoved
+            });
         }
 
         void processInputEvent(const MWBase::LuaManager::InputEvent& event)
@@ -40,6 +45,15 @@ namespace MWLua
             case InputEvent::Action:
                 callEngineHandlers(mActionHandlers, std::get<int>(event.mValue));
                 break;
+            case InputEvent::TouchPressed:
+                callEngineHandlers(mTouchpadPressed, std::get<SDLUtil::TouchEvent>(event.mValue));
+                break;
+            case InputEvent::TouchReleased:
+                callEngineHandlers(mTouchpadReleased, std::get<SDLUtil::TouchEvent>(event.mValue));
+                break;
+            case InputEvent::TouchMoved:
+                callEngineHandlers(mTouchpadMoved, std::get<SDLUtil::TouchEvent>(event.mValue));
+                break;
             }
         }
 
@@ -52,6 +66,9 @@ namespace MWLua
         EngineHandlerList mControllerButtonReleaseHandlers{"onControllerButtonRelease"};
         EngineHandlerList mActionHandlers{"onInputAction"};
         EngineHandlerList mInputUpdateHandlers{"onInputUpdate"};
+        EngineHandlerList mTouchpadPressed{ "onTouchPress" };
+        EngineHandlerList mTouchpadReleased{ "onTouchRelease" };
+        EngineHandlerList mTouchpadMoved{ "onTouchMove" };
     };
 
 }
diff --git a/components/sdlutil/events.hpp b/components/sdlutil/events.hpp
index a0dd11acec..ce71f04457 100644
--- a/components/sdlutil/events.hpp
+++ b/components/sdlutil/events.hpp
@@ -1,6 +1,7 @@
 #ifndef _SFO_EVENTS_H
 #define _SFO_EVENTS_H
 
+#include <SDL_version.h>
 #include <SDL_types.h>
 #include <SDL_events.h>
 
@@ -18,6 +19,24 @@ struct MouseMotionEvent : SDL_MouseMotionEvent {
     Sint32 z;
 };
 
+struct TouchEvent {
+    int mDevice;
+    int mFinger;
+    float mX;
+    float mY;
+    float mPressure;
+
+    #if SDL_VERSION_ATLEAST(2, 0, 14)
+    explicit TouchEvent(const SDL_ControllerTouchpadEvent& arg)
+        : mDevice(arg.touchpad)
+        , mFinger(arg.finger)
+        , mX(arg.x)
+        , mY(arg.y)
+        , mPressure(arg.pressure)
+    {}
+    #endif
+};
+
 
 ///////////////
 // Listeners //
@@ -50,25 +69,24 @@ public:
     virtual void keyReleased(const SDL_KeyboardEvent &arg) = 0;
 };
 
+
 class ControllerListener
 {
 public:
     virtual ~ControllerListener() {}
-    /** @remarks Joystick button down event */
-    virtual void buttonPressed(int deviceID, const SDL_ControllerButtonEvent &evt) = 0;
 
-    /** @remarks Joystick button up event */
+    virtual void buttonPressed(int deviceID, const SDL_ControllerButtonEvent &evt) = 0;
     virtual void buttonReleased(int deviceID, const SDL_ControllerButtonEvent &evt) = 0;
 
-    /** @remarks Joystick axis moved event */
     virtual void axisMoved(int deviceID, const SDL_ControllerAxisEvent &arg) = 0;
 
-    /** @remarks Joystick Added **/
     virtual void controllerAdded(int deviceID, const SDL_ControllerDeviceEvent &arg) = 0;
-
-    /** @remarks Joystick Removed **/
     virtual void controllerRemoved(const SDL_ControllerDeviceEvent &arg) = 0;
 
+    virtual void touchpadMoved(int deviceId, const TouchEvent& arg) = 0;
+    virtual void touchpadPressed(int deviceId, const TouchEvent& arg) = 0;
+    virtual void touchpadReleased(int deviceId, const TouchEvent& arg) = 0;
+
 };
 
 class WindowListener
diff --git a/components/sdlutil/sdlinputwrapper.cpp b/components/sdlutil/sdlinputwrapper.cpp
index 42276cc2a1..3bd74f569a 100644
--- a/components/sdlutil/sdlinputwrapper.cpp
+++ b/components/sdlutil/sdlinputwrapper.cpp
@@ -146,6 +146,20 @@ InputWrapper::InputWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> v
                     if(mConListener)
                         mConListener->axisMoved(1, evt.caxis);
                     break;
+                #if SDL_VERSION_ATLEAST(2, 0, 14)
+                case SDL_CONTROLLERSENSORUPDATE:
+                    // controller sensor data is received on demand
+                    break;
+                case SDL_CONTROLLERTOUCHPADDOWN:
+                    mConListener->touchpadPressed(1, TouchEvent(evt.ctouchpad));
+                    break;
+                case SDL_CONTROLLERTOUCHPADMOTION:
+                    mConListener->touchpadMoved(1, TouchEvent(evt.ctouchpad));
+                    break;
+                case SDL_CONTROLLERTOUCHPADUP:
+                    mConListener->touchpadReleased(1, TouchEvent(evt.ctouchpad));
+                    break;
+                #endif
                 case SDL_WINDOWEVENT:
                     handleWindowEvent(evt);
                     break;
diff --git a/docs/source/reference/lua-scripting/engine_handlers.rst b/docs/source/reference/lua-scripting/engine_handlers.rst
index d247803c08..adc07d25fe 100644
--- a/docs/source/reference/lua-scripting/engine_handlers.rst
+++ b/docs/source/reference/lua-scripting/engine_handlers.rst
@@ -3,74 +3,96 @@ Engine handlers reference
 
 Engine handler is a function defined by a script, that can be called by the engine.
 
-+---------------------------------------------------------------------------------------------------------+
-| **Can be defined by any script**                                                                        |
-+----------------------------------+----------------------------------------------------------------------+
-| onInit(initData)                 | | Called once when the script is created (not loaded). `InitData can`|
-|                                  | | `be assigned to a script in openmw-cs (not yet implemented)`.      |
-|                                  | | ``onInterfaceOverride`` can be called before ``onInit``.           |
-+----------------------------------+----------------------------------------------------------------------+
-| onUpdate(dt)                     | | Called every frame if the game is not paused. `dt` is the time     |
-|                                  | | from the last update in seconds.                                   |
-+----------------------------------+----------------------------------------------------------------------+
-| onSave() -> savedData            | | Called when the game is saving. May be called in inactive          |
-|                                  | | state, so it shouldn't use `openmw.nearby`.                        |
-+----------------------------------+----------------------------------------------------------------------+
-| onLoad(savedData, initData)      | | Called on loading with the data previosly returned by              |
-|                                  | | onSave. During loading the object is always inactive. initData is  |
-|                                  | | the same as in onInit.                                             |
-|                                  | | Note that onLoad means loading a script rather than loading a game.|
-|                                  | | If a script did not exist when a game was saved onLoad will not be |
-|                                  | | called, but onInit will.                                           |
-+----------------------------------+----------------------------------------------------------------------+
-| onInterfaceOverride(base)        | | Called if the current script has an interface and overrides an     |
-|                                  | | interface (``base``) of another script.                            |
-+----------------------------------+----------------------------------------------------------------------+
-| **Only for global scripts**                                                                             |
-+----------------------------------+----------------------------------------------------------------------+
-| onNewGame()                      | New game is started                                                  |
-+----------------------------------+----------------------------------------------------------------------+
-| onPlayerAdded(player)            | Player added to the game world. The argument is a `Game object`.     |
-+----------------------------------+----------------------------------------------------------------------+
-| onActorActive(actor)             | Actor (NPC or Creature) becomes active.                              |
-+----------------------------------+----------------------------------------------------------------------+
-| **Only for local scripts**                                                                              |
-+----------------------------------+----------------------------------------------------------------------+
-| onActive()                       | | Called when the object becomes active (either a player             |
-|                                  | | came to this cell again, or a save was loaded).                    |
-+----------------------------------+----------------------------------------------------------------------+
-| onInactive()                     | | Object became inactive. Since it is inactive the handler           |
-|                                  | | can not access anything nearby, but it is possible to send         |
-|                                  | | an event to global scripts.                                        |
-+----------------------------------+----------------------------------------------------------------------+
-| onActivated(actor)               | | Called on an object when an actor activates it. Note that picking  |
-|                                  | | up an item is also an activation and works this way: (1) a copy of |
-|                                  | | the item is placed to the actor's inventory, (2) count of          |
-|                                  | | the original item is set to zero, (3) and only then onActivated is |
-|                                  | | called on the original item, so self.count is already zero.        |
-+----------------------------------+----------------------------------------------------------------------+
-| onConsume(recordId)              | | Called if `recordId` (e.g. a potion) is consumed.                  |
-+----------------------------------+----------------------------------------------------------------------+
-| **Only for local scripts attached to a player**                                                         |
-+----------------------------------+----------------------------------------------------------------------+
-| onInputUpdate(dt)                | | Called every frame (if the game is not paused) right after         |
-|                                  | | processing user input. Use it only for latency-critical stuff.     |
-+----------------------------------+----------------------------------------------------------------------+
-| onKeyPress(key)                  | | `Key <openmw_input.html##(KeyboardEvent)>`_ is pressed.            |
-|                                  | | Usage example: ``if key.symbol == 'z' and key.withShift then ...`` |
-+----------------------------------+----------------------------------------------------------------------+
-| onKeyRelease(key)                | | `Key <openmw_input.html##(KeyboardEvent)>`_ is released.           |
-|                                  | | Usage example: ``if key.symbol == 'z' and key.withShift then ...`` |
-+----------------------------------+----------------------------------------------------------------------+
-| onControllerButtonPress(id)      | | A `button <openmw_input.html##(CONTROLLER_BUTTON)>`_ on a game     |
-|                                  |   controller is pressed. Usage example:                              |
-|                                  | | ``if id == input.CONTROLLER_BUTTON.LeftStick then ...``            |
-+----------------------------------+----------------------------------------------------------------------+
-| onControllerButtonRelease(id)    | | A `button <openmw_input.html##(CONTROLLER_BUTTON)>`_ on a game     |
-|                                  |   controller is released. Usage example:                             |
-|                                  | | ``if id == input.CONTROLLER_BUTTON.LeftStick then ...``            |
-+----------------------------------+----------------------------------------------------------------------+
-| onInputAction(id)                | | `Game control <openmw_input.html##(ACTION)>`_ is pressed.          |
-|                                  | | Usage example: ``if id == input.ACTION.ToggleWeapon then ...``     |
-+----------------------------------+----------------------------------------------------------------------+
 
+
+**Can be defined by any script**
+
+.. list-table::
+  :widths: 20 80
+
+  * - onInit(initData)
+    - | Called once when the script is created (not loaded). `InitData can be`
+      | `assigned to a script in openmw-cs (not yet implemented).`
+      | ``onInterfaceOverride`` can be called before ``onInit``.
+  * - onUpdate(dt)
+    - | Called every frame if the game is not paused. `dt` is the time
+      | from the last update in seconds.
+  * - onSave() -> savedData
+    - | Called when the game is saving. May be called in inactive state,
+      | so it shouldn't use `openmw.nearby`.
+  * - onLoad(savedData, initData)
+    - | Called on loading with the data previosly returned by
+      | ``onSave``. During loading the object is always inactive. ``initData`` is
+      | the same as in ``onInit``.
+      | Note that ``onLoad`` means loading a script rather than loading a game.
+      | If a script did not exist when a game was saved onLoad will not be
+      | called, but ``onInit`` will.
+  * - onInterfaceOverride(base)
+    - | Called if the current script has an interface and overrides an interface
+      | (``base``) of another script.
+
+**Only for global scripts**
+
+.. list-table::
+  :widths: 20 80
+
+  * - onNewGame()
+    - New game is started
+  * - onPlayerAdded(player)
+    - Player added to the game world. The argument is a `Game object`.
+  * - onActorActive(actor)
+    - Actor (NPC or Creature) becomes active.
+
+**Only for local scripts**
+
+.. list-table::
+  :widths: 20 80
+
+  * - onActive()
+    - | Called when the object becomes active
+      | (either a player came to this cell again, or a save was loaded).
+  * - onInactive()
+    - | Object became inactive. Since it is inactive the handler
+      | can not access anything nearby, but it is possible to send
+      | an event to global scripts.
+  * - onActivated(actor)
+    - | Called on an object when an actor activates it. Note that picking
+      | up an item is also an activation and works this way: (1) a copy of
+      | the item is placed to the actor's inventory, (2) count of
+      | the original item is set to zero, (3) and only then onActivated is
+      | called on the original item, so self.count is already zero.
+  * - onConsume(recordId)
+    - Called if `recordId` (e.g. a potion) is consumed.
+
+**Only for local scripts attached to a player**
+
+.. list-table::
+  :widths: 20 80
+
+  * - onInputUpdate(dt)
+    - | Called every frame (if the game is not paused) right after processing
+      | user input. Use it only for latency-critical stuff.
+  * - onKeyPress(key)
+    - | `Key <openmw_input.html##(KeyboardEvent)>`_ is pressed.
+      | Usage example: ``if key.symbol == 'z' and key.withShift then ...``
+  * - onKeyRelease(key)
+    - | `Key <openmw_input.html##(KeyboardEvent)>`_ is released.
+      | Usage example: ``if key.symbol == 'z' and key.withShift then ...``
+  * - onControllerButtonPress(id)
+    - | A `button <openmw_input.html##(CONTROLLER_BUTTON)>`_ on a game controller is pressed.
+      | Usage example: ``if id == input.CONTROLLER_BUTTON.LeftStick then ...``
+  * - onControllerButtonRelease(id)
+    - | A `button <openmw_input.html##(CONTROLLER_BUTTON)>`_ on a game controller is released.
+      | Usage example: ``if id == input.CONTROLLER_BUTTON.LeftStick then ...``
+  * - onInputAction(id)
+    - | `Game control <openmw_input.html##(ACTION)>`_ is pressed.
+      | Usage example: ``if id == input.ACTION.ToggleWeapon then ...``
+  * - onTouchPress(touchEvent)
+    - | A finger pressed on a touch device.
+      | `Touch event <openmw_input.html##(TouchEvent)>`_.
+  * - onTouchRelease(touchEvent)
+    - | A finger released a touch device.
+      | `Touch event <openmw_input.html##(TouchEvent)>`_.
+  * - onTouchMove(touchEvent)
+    - | A finger moved on a touch device.
+      | `Touch event <openmw_input.html##(TouchEvent)>`_.
\ No newline at end of file
diff --git a/files/lua_api/openmw/input.lua b/files/lua_api/openmw/input.lua
index 361073e79d..5ebaa46e1f 100644
--- a/files/lua_api/openmw/input.lua
+++ b/files/lua_api/openmw/input.lua
@@ -313,5 +313,13 @@
 -- @field [parent=#KeyboardEvent] #boolean withAlt Is `Alt` key pressed.
 -- @field [parent=#KeyboardEvent] #boolean withSuper Is `Super`/`Win` key pressed.
 
+---
+-- The argument of onTouchPress/onTouchRelease/onTouchMove engine handlers.
+-- @type TouchEvent
+-- @field [parent=#TouchEvent] #number device Device id (there might be multiple touch devices connected). Note: the specific device ids are not guaranteed. Always use previous user input (onTouch... handlers) to get a valid device id (e. g. in your script's settings page).
+-- @field [parent=#TouchEvent] #number finger Finger id (the device might support multitouch).
+-- @field [parent=#TouchEvent] openmw.util#Vector2 position Relative position on the touch device (0 to 1 from top left corner),
+-- @field [parent=#TouchEvent] #number pressure Pressure of the finger.
+
 return nil
 

From a1abc84f5911677dd8a34beb92d16b3344c42c82 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Mon, 21 Feb 2022 20:43:27 +0000
Subject: [PATCH 2149/2859] Implement pairs and ipairs for ui.content and
 ui.layers. Document all iterable types in a uniform way.

---
 apps/openmw/mwlua/uibindings.cpp              | 30 +++++++++++
 components/lua/luastate.cpp                   | 33 ++++++------
 docs/source/generate_luadoc.sh                |  1 -
 docs/source/reference/lua-scripting/api.rst   |  1 +
 .../reference/lua-scripting/iterables.rst     | 50 +++++++++++++++++++
 .../reference/lua-scripting/overview.rst      |  2 +-
 files/lua_api/openmw/core.lua                 |  4 +-
 files/lua_api/openmw/ui.lua                   |  9 +++-
 8 files changed, 108 insertions(+), 22 deletions(-)
 create mode 100644 docs/source/reference/lua-scripting/iterables.rst

diff --git a/apps/openmw/mwlua/uibindings.cpp b/apps/openmw/mwlua/uibindings.cpp
index 4333ae5072..248f82f28a 100644
--- a/apps/openmw/mwlua/uibindings.cpp
+++ b/apps/openmw/mwlua/uibindings.cpp
@@ -166,6 +166,21 @@ namespace MWLua
             else
                 return sol::nullopt;
         };
+        {
+            auto pairs = [](LuaUi::Content& content)
+            {
+                auto next = [](LuaUi::Content& content, size_t i) -> sol::optional<std::tuple<size_t, sol::table>>
+                {
+                    if (i < content.size())
+                        return std::make_tuple(i + 1, content.at(i));
+                    else
+                        return sol::nullopt;
+                };
+                return std::make_tuple(next, content, 0);
+            };
+            uiContent[sol::meta_function::ipairs] = pairs;
+            uiContent[sol::meta_function::pairs] = pairs;
+        }
 
         auto element = context.mLua->sol().new_usertype<LuaUi::Element>("Element");
         element["layout"] = sol::property(
@@ -233,6 +248,21 @@ namespace MWLua
             options.mInteractive = LuaUtil::getValueOrDefault(LuaUtil::getFieldOrNil(opt, "interactive"), true);
             context.mLuaManager->addAction(std::make_unique<LayerAction>(name, afterName, options, context.mLua));
         };
+        {
+            auto pairs = [layers](const sol::object&)
+            {
+                auto next = [](const sol::table& l, size_t i) -> sol::optional<std::tuple<size_t, std::string>>
+                {
+                    if (i < LuaUi::Layers::size())
+                        return std::make_tuple(i + 1, LuaUi::Layers::at(i));
+                    else
+                        return sol::nullopt;
+                };
+                return std::make_tuple(next, layers, 0);
+            };
+            layers[sol::meta_function::pairs] = pairs;
+            layers[sol::meta_function::ipairs] = pairs;
+        }
         api["layers"] = LuaUtil::makeReadOnly(layers);
 
         sol::table typeTable = context.mLua->newTable();
diff --git a/components/lua/luastate.cpp b/components/lua/luastate.cpp
index 13e1421116..dbd792224f 100644
--- a/components/lua/luastate.cpp
+++ b/components/lua/luastate.cpp
@@ -59,6 +59,23 @@ namespace LuaUtil
 
         mLua["writeToLog"] = [](std::string_view s) { Log(Debug::Level::Info) << s; };
         mLua["cmetatable"] = [](const sol::table& v) -> sol::object { return v[sol::metatable_key]; };
+
+        // Some fixes for compatibility between different Lua versions
+        if (mLua["unpack"] == sol::nil)
+            mLua["unpack"] = mLua["table"]["unpack"];
+        else if (mLua["table"]["unpack"] == sol::nil)
+            mLua["table"]["unpack"] = mLua["unpack"];
+        if (LUA_VERSION_NUM <= 501)
+        {
+            mLua.script(R"(
+                local _pairs = pairs
+                local _ipairs = ipairs
+                local _cmeta = cmetatable
+                pairs = function(v) return ((_cmeta(v) or v).__pairs or _pairs)(v) end
+                ipairs = function(v) return ((_cmeta(v) or v).__ipairs or _ipairs)(v) end
+            )");
+        }
+
         mLua.script(R"(
             local _pairs = pairs
             local _ipairs = ipairs
@@ -78,22 +95,6 @@ namespace LuaUtil
             function ipairsForReadOnly(v) return _ipairs(_cmeta(v).__index) end
         )");
 
-        // Some fixes for compatibility between different Lua versions
-        if (mLua["unpack"] == sol::nil)
-            mLua["unpack"] = mLua["table"]["unpack"];
-        else if (mLua["table"]["unpack"] == sol::nil)
-            mLua["table"]["unpack"] = mLua["unpack"];
-        if (LUA_VERSION_NUM <= 501)
-        {
-            mLua.script(R"(
-                local _pairs = pairs
-                local _ipairs = ipairs
-                local _cmeta = cmetatable
-                pairs = function(v) return ((_cmeta(v) or v).__pairs or _pairs)(v) end
-                ipairs = function(v) return ((_cmeta(v) or v).__ipairs or _ipairs)(v) end
-            )");
-        }
-
         mSandboxEnv = sol::table(mLua, sol::create);
         mSandboxEnv["_VERSION"] = mLua["_VERSION"];
         for (const std::string& s : safeFunctions)
diff --git a/docs/source/generate_luadoc.sh b/docs/source/generate_luadoc.sh
index 99e387cf0f..b3ec10ba97 100755
--- a/docs/source/generate_luadoc.sh
+++ b/docs/source/generate_luadoc.sh
@@ -67,4 +67,3 @@ cd $FILES_DIR/builtin_scripts
 $DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR openmw_aux/*lua
 $DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR scripts/omw/ai.lua
 $DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR scripts/omw/camera.lua
-
diff --git a/docs/source/reference/lua-scripting/api.rst b/docs/source/reference/lua-scripting/api.rst
index 41fd52253f..0681c63dea 100644
--- a/docs/source/reference/lua-scripting/api.rst
+++ b/docs/source/reference/lua-scripting/api.rst
@@ -25,6 +25,7 @@ Lua API reference
     openmw_aux_time
     interface_ai
     interface_camera
+    iterables
 
 
 - :ref:`Engine handlers reference`
diff --git a/docs/source/reference/lua-scripting/iterables.rst b/docs/source/reference/lua-scripting/iterables.rst
new file mode 100644
index 0000000000..208b7f1c92
--- /dev/null
+++ b/docs/source/reference/lua-scripting/iterables.rst
@@ -0,0 +1,50 @@
+Iterable types
+==============
+
+List Iterable
+-------------
+
+An iterable with defined size and order.
+
+.. code-block:: Lua
+
+   -- can iterate over the list with pairs
+   for i, v in pairs(list) do
+   -- ...
+   end
+
+.. code-block:: Lua
+
+   -- can iterate over the list with ipairs
+   for i, v in ipairs(list) do
+   -- ...
+   end
+
+.. code-block:: Lua
+
+   -- can get total size with the size # operator
+   local length = #list
+
+.. code-block:: Lua
+
+   -- can index the list with numbers
+   for i = 1, length do
+   list[i]
+   end
+
+Map Iterable
+------------
+
+An iterable with undefined order.
+
+.. code-block:: Lua
+
+   -- can iterate over the map with pairs
+   for k, v in pairs(map) do
+   -- ...
+   end
+
+.. code-block:: Lua
+
+   -- can index the map by key
+   map[key]
diff --git a/docs/source/reference/lua-scripting/overview.rst b/docs/source/reference/lua-scripting/overview.rst
index e6024a27a1..e07abee899 100644
--- a/docs/source/reference/lua-scripting/overview.rst
+++ b/docs/source/reference/lua-scripting/overview.rst
@@ -498,7 +498,7 @@ At some moment it will send the 'DamagedByDarkPower' event to all nearby actors:
     local nearby = require('openmw.nearby')
 
     local function onActivated()
-        for i, actor in nearby.actors:ipairs() do
+        for i, actor in ipairs(nearby.actors) do
             local dist = (self.position - actor.position):length()
             if dist < 500 then
                 local damage = (1 - dist / 500) * 200
diff --git a/files/lua_api/openmw/core.lua b/files/lua_api/openmw/core.lua
index e7e657a853..84e2b4faae 100644
--- a/files/lua_api/openmw/core.lua
+++ b/files/lua_api/openmw/core.lua
@@ -289,9 +289,9 @@
 
 
 -------------------------------------------------------------------------------
--- List of GameObjects.
+-- List of GameObjects. Implements [iterables#List](iterables.html#List) of #GameObject
 -- @type ObjectList
--- @extends #list<#GameObject>
+-- @list <#GameObject>
 
 -------------------------------------------------------------------------------
 -- Filter list with a Query.
diff --git a/files/lua_api/openmw/ui.lua b/files/lua_api/openmw/ui.lua
index d4f305b96e..478b9235a5 100644
--- a/files/lua_api/openmw/ui.lua
+++ b/files/lua_api/openmw/ui.lua
@@ -64,12 +64,16 @@
 -- @field #Content content Optional @{openmw.ui#Content} of children layouts
 
 ---
--- Layers
+-- Layers. Implements [iterables#List](iterables.html#List) of #string.
 -- @type Layers
+-- @list <#string>
 -- @usage
 -- ui.layers.insertAfter('HUD', 'NewLayer', { interactive = true })
 -- local fourthLayerName = ui.layers[4]
 -- local windowsIndex = ui.layers.indexOf('Windows')
+-- for i, name in ipairs(ui.layers) do
+--   print('layer', i, name)
+-- end
 
 ---
 -- Index of the layer with the givent name. Returns nil if the layer doesn't exist
@@ -85,7 +89,8 @@
 -- @param #table options Table with a boolean `interactive` field (default is true). Layers with interactive = false will ignore all mouse interactions.
 
 ---
--- Content. An array-like container, which allows to reference elements by their name
+-- Content. An array-like container, which allows to reference elements by their name.
+-- Implements [iterables#List](iterables.html#List) of #Layout and [iterables#Map](iterables.html#Map) of #string to #Layout.
 -- @type Content
 -- @list <#Layout>
 -- @usage

From 56b9e29093679abbf089087a4486693306b09ff0 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 19 Feb 2022 01:06:04 +0100
Subject: [PATCH 2150/2859] Provide unit tests reports and coverage from CI

Use https://docs.gitlab.com/ee/ci/unit_test_reports.html#googletest for unit tests reports.
Use https://docs.gitlab.com/ee/user/project/merge_requests/test_coverage_visualization.html#cc-example
for coverage reports.
---
 .gitlab-ci.yml            | 63 ++++++++++++++++++++++++++++++++-------
 CI/before_script.linux.sh |  6 ++++
 CI/install_debian_deps.sh |  2 ++
 3 files changed, 61 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4c5223c212..8799ac660a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,8 +35,8 @@ variables:
     - 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
+    - if [[ "${BUILD_TESTS_ONLY}" ]]; then ./openmw_test_suite --gtest_output="xml:tests.xml"; fi
+    - if [[ "${BUILD_TESTS_ONLY}" && ! "${BUILD_WITH_CODE_COVERAGE}" ]]; then ./openmw_detournavigator_navmeshtilescache_benchmark; fi
     - ccache -s
   artifacts:
     paths:
@@ -111,7 +111,10 @@ Ubuntu_GCC_tests:
     BUILD_TESTS_ONLY: 1
   artifacts:
     paths: []
-    expire_in: 1 minute
+    name: ${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHA}
+    when: always
+    reports:
+      junit: build/tests.xml
 
 Ubuntu_GCC_tests_Debug:
   extends: Ubuntu_GCC
@@ -124,7 +127,10 @@ Ubuntu_GCC_tests_Debug:
     CMAKE_CXX_FLAGS_DEBUG: -g -O0 -D_GLIBCXX_ASSERTIONS
   artifacts:
     paths: []
-    expire_in: 1 minute
+    name: ${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHA}
+    when: always
+    reports:
+      junit: build/tests.xml
 
 Ubuntu_GCC_tests_asan:
   extends: Ubuntu_GCC
@@ -139,7 +145,10 @@ Ubuntu_GCC_tests_asan:
     ASAN_OPTIONS: halt_on_error=1:strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1
   artifacts:
     paths: []
-    expire_in: 1 minute
+    name: ${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHA}
+    when: always
+    reports:
+      junit: build/tests.xml
 
 Ubuntu_GCC_tests_ubsan:
   extends: Ubuntu_GCC
@@ -153,7 +162,10 @@ Ubuntu_GCC_tests_ubsan:
     UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1
   artifacts:
     paths: []
-    expire_in: 1 minute
+    name: ${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHA}
+    when: always
+    reports:
+      junit: build/tests.xml
 
 Ubuntu_GCC_tests_tsan:
   extends: Ubuntu_GCC
@@ -168,7 +180,29 @@ Ubuntu_GCC_tests_tsan:
     TSAN_OPTIONS: second_deadlock_stack=1:halt_on_error=1
   artifacts:
     paths: []
-    expire_in: 1 minute
+    name: ${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHA}
+    when: always
+    reports:
+      junit: build/tests.xml
+
+Ubuntu_GCC_tests_coverage:
+  extends: Ubuntu_GCC_tests_Debug
+  cache:
+    key: Ubuntu_GCC_tests_coverage.v1
+  variables:
+    BUILD_WITH_CODE_COVERAGE: 1
+  before_script:
+    - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic openmw-coverage
+  after_script:
+    - gcovr --xml-pretty --exclude-unreachable-branches --print-summary --root ${CI_PROJECT_DIR} -j $(nproc) -o coverage.xml
+  coverage: /^\s*lines:\s*\d+.\d+\%/
+  artifacts:
+    paths: []
+    name: ${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHA}
+    when: always
+    reports:
+      cobertura: coverage.xml
+      junit: build/tests.xml
 
 Ubuntu_Static_Deps:
   extends: Ubuntu_Clang
@@ -206,7 +240,10 @@ Ubuntu_Static_Deps_tests:
     CXXFLAGS: -O0
   artifacts:
     paths: []
-    expire_in: 1 minute
+    name: ${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHA}
+    when: always
+    reports:
+      junit: build/tests.xml
 
 Ubuntu_Clang:
   extends: .Ubuntu
@@ -230,7 +267,10 @@ Ubuntu_Clang_tests:
     BUILD_TESTS_ONLY: 1
   artifacts:
     paths: []
-    expire_in: 1 minute
+    name: ${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHA}
+    when: always
+    reports:
+      junit: build/tests.xml
 
 Ubuntu_Clang_tests_Debug:
   extends: Ubuntu_Clang
@@ -242,7 +282,10 @@ Ubuntu_Clang_tests_Debug:
     CMAKE_BUILD_TYPE: Debug
   artifacts:
     paths: []
-    expire_in: 1 minute
+    name: ${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHA}
+    when: always
+    reports:
+      junit: build/tests.xml
 
 .MacOS:
   image: macos-11-xcode-12
diff --git a/CI/before_script.linux.sh b/CI/before_script.linux.sh
index 386b25bbe6..41d271fc70 100755
--- a/CI/before_script.linux.sh
+++ b/CI/before_script.linux.sh
@@ -64,6 +64,12 @@ if [[ "${CMAKE_EXE_LINKER_FLAGS}" ]]; then
     )
 fi
 
+if [[ "${BUILD_WITH_CODE_COVERAGE}" ]]; then
+    CMAKE_CONF_OPTS+=(
+        -DBUILD_WITH_CODE_COVERAGE="${BUILD_WITH_CODE_COVERAGE}"
+    )
+fi
+
 mkdir -p build
 cd build
 
diff --git a/CI/install_debian_deps.sh b/CI/install_debian_deps.sh
index 74b0746ac0..93f701d011 100755
--- a/CI/install_debian_deps.sh
+++ b/CI/install_debian_deps.sh
@@ -40,6 +40,8 @@ declare -rA GROUPED_DEPS=(
     libcollada-dom-dev libfreetype6-dev libjpeg-dev libpng-dev
     libsdl2-dev libboost-system-dev libboost-filesystem-dev libgl-dev
   "
+
+  [openmw-coverage]="gcovr"
 )
 
 if [[ $# -eq 0 ]]; then

From de3092f014b75dcf800113944703b7a3fbfc4be5 Mon Sep 17 00:00:00 2001
From: Abdu Sharif <narukomanroom@gmail.com>
Date: Tue, 22 Feb 2022 04:04:08 +0000
Subject: [PATCH 2151/2859] Revert "Merge branch 'offset_the_deads' into
 'master'"

This reverts commit 7dd02076f5a05528d0df308bf68e6bd733bd1b43
---
 apps/openmw/mwphysics/actor.hpp          | 6 +++---
 apps/openmw/mwphysics/movementsolver.cpp | 4 ++++
 apps/openmw/mwphysics/physicssystem.cpp  | 3 +--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index cdf49eeb54..01d8037f6b 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -158,9 +158,6 @@ namespace MWPhysics
 
         bool canMoveToWaterSurface(float waterlevel, const btCollisionWorld* world) const;
 
-        /// Returns the mesh translation, scaled and rotated as necessary
-        osg::Vec3f getScaledMeshTranslation() const;
-
     private:
         MWWorld::Ptr mStandingOnPtr;
         /// Removes then re-adds the collision object to the dynamics world
@@ -168,6 +165,9 @@ namespace MWPhysics
         void addCollisionMask(int collisionMask);
         int getCollisionMask() const;
 
+        /// Returns the mesh translation, scaled and rotated as necessary
+        osg::Vec3f getScaledMeshTranslation() const;
+
         bool mCanWaterWalk;
         bool mWalkingOnWater;
 
diff --git a/apps/openmw/mwphysics/movementsolver.cpp b/apps/openmw/mwphysics/movementsolver.cpp
index 8987c8d8a3..fd8a7f2b05 100644
--- a/apps/openmw/mwphysics/movementsolver.cpp
+++ b/apps/openmw/mwphysics/movementsolver.cpp
@@ -134,6 +134,8 @@ namespace MWPhysics
 
         // Adjust for collision mesh offset relative to actor's "location"
         // (doTrace doesn't take local/interior collision shape translation into account, so we have to do it on our own)
+        // for compatibility with vanilla assets, we have to derive this from the vertical half extent instead of from internal hull translation
+        // if not for this hack, the "correct" collision hull position would be physicActor->getScaledMeshTranslation()
         actor.mPosition.z() += actor.mHalfExtentsZ; // vanilla-accurate
 
         float swimlevel = actor.mSwimLevel + actor.mHalfExtentsZ;
@@ -463,6 +465,8 @@ namespace MWPhysics
             }
         }
 
+        // use vanilla-accurate collision hull position hack (do same hitbox offset hack as movement solver)
+        // if vanilla compatibility didn't matter, the "correct" collision hull position would be physicActor->getScaledMeshTranslation()
         const auto verticalHalfExtent = osg::Vec3f(0.0, 0.0, actor.mHalfExtentsZ);
 
         // use a 3d approximation of the movement vector to better judge player intent
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index f5f22529ff..bbd3447b6a 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -939,8 +939,7 @@ namespace MWPhysics
         , mRotation()
         , mMovement(actor.velocity())
         , mWaterlevel(waterlevel)
-        // for compatibility with vanilla assets, mesh offset is the actor halfextent for dead actors
-        , mHalfExtentsZ(actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isDead() ? actor.getHalfExtents().z() : actor.getScaledMeshTranslation().z())
+        , mHalfExtentsZ(actor.getHalfExtents().z())
         , mOldHeight(0)
         , mStuckFrames(0)
         , mFlying(MWBase::Environment::get().getWorld()->isFlying(actor.getPtr()))

From f516e34688b08b4d18874884f2a9ffdea65d1c4d Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 19 Feb 2022 01:54:34 +0100
Subject: [PATCH 2152/2859] Remove used-defined constructors from ESM4 types

To avoid explicit initialization. It should happen in the load functions anyway.

* Move all non-zero initializations to corresponding class definition.
* Replace std::vector by std::array when it has constant size.
---
 components/esm4/acti.hpp     |  1 -
 components/esm4/lighting.hpp |  3 ++-
 components/esm4/loadachr.cpp | 10 ----------
 components/esm4/loadachr.hpp |  3 +--
 components/esm4/loadacre.cpp |  9 ---------
 components/esm4/loadacre.hpp |  3 +--
 components/esm4/loadacti.cpp | 10 ----------
 components/esm4/loadalch.cpp | 13 -------------
 components/esm4/loadaloc.cpp |  9 ---------
 components/esm4/loadammo.cpp | 10 ----------
 components/esm4/loadammo.hpp |  1 -
 components/esm4/loadanio.cpp |  7 -------
 components/esm4/loadanio.hpp |  1 -
 components/esm4/loadappa.cpp | 14 --------------
 components/esm4/loadappa.hpp |  1 -
 components/esm4/loadarma.cpp |  9 ---------
 components/esm4/loadarma.hpp |  1 -
 components/esm4/loadarmo.cpp | 22 ----------------------
 components/esm4/loadarmo.hpp |  1 -
 components/esm4/loadaspc.cpp |  6 ------
 components/esm4/loadaspc.hpp |  1 -
 components/esm4/loadbook.cpp | 16 ----------------
 components/esm4/loadbook.hpp |  1 -
 components/esm4/loadbptd.cpp |  7 -------
 components/esm4/loadbptd.hpp |  1 -
 components/esm4/loadcell.cpp | 22 ----------------------
 components/esm4/loadcell.hpp |  1 -
 components/esm4/loadclas.cpp |  8 --------
 components/esm4/loadclas.hpp |  1 -
 components/esm4/loadclfm.cpp | 11 -----------
 components/esm4/loadclfm.hpp |  1 -
 components/esm4/loadclot.cpp | 16 ----------------
 components/esm4/loadclot.hpp |  1 -
 components/esm4/loadcont.cpp |  8 --------
 components/esm4/loadcont.hpp |  1 -
 components/esm4/loadcrea.cpp | 22 ----------------------
 components/esm4/loadcrea.hpp |  1 -
 components/esm4/loaddial.cpp |  9 ---------
 components/esm4/loaddial.hpp |  1 -
 components/esm4/loaddobj.cpp |  7 -------
 components/esm4/loaddobj.hpp |  1 -
 components/esm4/loaddoor.cpp |  8 --------
 components/esm4/loaddoor.hpp |  1 -
 components/esm4/loadeyes.cpp |  9 ---------
 components/esm4/loadeyes.hpp |  1 -
 components/esm4/loadflor.cpp |  8 --------
 components/esm4/loadflor.hpp |  1 -
 components/esm4/loadflst.cpp |  5 -----
 components/esm4/loadflst.hpp |  1 -
 components/esm4/loadfurn.cpp |  8 --------
 components/esm4/loadfurn.hpp |  1 -
 components/esm4/loadglob.cpp |  5 -----
 components/esm4/loadglob.hpp |  1 -
 components/esm4/loadgras.cpp |  6 ------
 components/esm4/loadgras.hpp |  1 -
 components/esm4/loadhair.cpp | 10 ----------
 components/esm4/loadhair.hpp |  1 -
 components/esm4/loadhdpt.cpp |  9 ---------
 components/esm4/loadhdpt.hpp |  4 ++--
 components/esm4/loadidle.cpp |  7 -------
 components/esm4/loadidle.hpp |  1 -
 components/esm4/loadidlm.cpp |  5 -----
 components/esm4/loadidlm.hpp |  1 -
 components/esm4/loadimod.cpp |  5 -----
 components/esm4/loadimod.hpp |  1 -
 components/esm4/loadinfo.cpp | 15 ---------------
 components/esm4/loadinfo.hpp |  1 -
 components/esm4/loadingr.cpp | 15 ---------------
 components/esm4/loadingr.hpp |  1 -
 components/esm4/loadkeym.cpp | 12 ------------
 components/esm4/loadkeym.hpp |  1 -
 components/esm4/loadland.cpp | 11 -----------
 components/esm4/loadland.hpp |  1 -
 components/esm4/loadlgtm.cpp | 16 ----------------
 components/esm4/loadlgtm.hpp |  1 -
 components/esm4/loadligh.cpp |  9 ---------
 components/esm4/loadligh.hpp | 11 +++--------
 components/esm4/loadltex.cpp |  8 --------
 components/esm4/loadltex.hpp |  1 -
 components/esm4/loadlvlc.cpp |  6 ------
 components/esm4/loadlvlc.hpp |  1 -
 components/esm4/loadlvli.cpp |  6 ------
 components/esm4/loadlvli.hpp |  1 -
 components/esm4/loadlvln.cpp |  6 ------
 components/esm4/loadlvln.hpp |  1 -
 components/esm4/loadmato.cpp |  6 ------
 components/esm4/loadmato.hpp |  1 -
 components/esm4/loadmisc.cpp | 12 ------------
 components/esm4/loadmisc.hpp |  1 -
 components/esm4/loadmset.cpp | 18 ------------------
 components/esm4/loadmset.hpp |  3 +--
 components/esm4/loadmstt.cpp |  6 ------
 components/esm4/loadmusc.cpp |  6 ------
 components/esm4/loadmusc.hpp |  1 -
 components/esm4/loadnavi.cpp |  5 -----
 components/esm4/loadnavi.hpp |  1 -
 components/esm4/loadnavm.cpp |  4 ----
 components/esm4/loadnavm.hpp |  1 -
 components/esm4/loadnote.cpp |  8 --------
 components/esm4/loadnote.hpp |  1 -
 components/esm4/loadnpc.cpp  | 21 ---------------------
 components/esm4/loadnpc.hpp  |  1 -
 components/esm4/loadotft.cpp |  5 -----
 components/esm4/loadotft.hpp |  1 -
 components/esm4/loadpack.cpp | 14 --------------
 components/esm4/loadpack.hpp |  4 ++--
 components/esm4/loadpgrd.cpp | 10 ----------
 components/esm4/loadpgre.cpp |  5 -----
 components/esm4/loadpwat.cpp |  5 -----
 components/esm4/loadrace.cpp | 22 ----------------------
 components/esm4/loadrace.hpp | 14 +++++++-------
 components/esm4/loadrefr.cpp | 23 -----------------------
 components/esm4/loadrefr.hpp |  7 +++----
 components/esm4/loadregn.cpp |  7 -------
 components/esm4/loadregn.hpp |  1 -
 components/esm4/loadroad.cpp |  8 --------
 components/esm4/loadroad.hpp |  1 -
 components/esm4/loadsbsp.cpp |  9 ---------
 components/esm4/loadsbsp.hpp |  1 -
 components/esm4/loadscol.cpp |  5 -----
 components/esm4/loadscol.hpp |  1 -
 components/esm4/loadscpt.cpp |  5 -----
 components/esm4/loadscpt.hpp |  1 -
 components/esm4/loadscrl.cpp | 11 -----------
 components/esm4/loadscrl.hpp |  1 -
 components/esm4/loadsgst.cpp | 14 --------------
 components/esm4/loadsgst.hpp |  1 -
 components/esm4/loadslgm.cpp | 11 -----------
 components/esm4/loadslgm.hpp |  1 -
 components/esm4/loadsndr.cpp |  6 ------
 components/esm4/loadsndr.hpp |  1 -
 components/esm4/loadsoun.cpp |  6 ------
 components/esm4/loadsoun.hpp |  1 -
 components/esm4/loadstat.cpp |  6 ------
 components/esm4/loadstat.hpp |  1 -
 components/esm4/loadtact.cpp |  8 --------
 components/esm4/loadtact.hpp |  1 -
 components/esm4/loadterm.cpp | 10 ----------
 components/esm4/loadterm.hpp |  1 -
 components/esm4/loadtree.cpp |  7 -------
 components/esm4/loadtree.hpp |  1 -
 components/esm4/loadtxst.cpp | 13 -------------
 components/esm4/loadtxst.hpp |  1 -
 components/esm4/loadweap.cpp | 11 -----------
 components/esm4/loadweap.hpp |  1 -
 components/esm4/loadwrld.cpp | 19 -------------------
 components/esm4/loadwrld.hpp |  1 -
 147 files changed, 22 insertions(+), 852 deletions(-)

diff --git a/components/esm4/acti.hpp b/components/esm4/acti.hpp
index 4ec3fe1e5e..f86a4aa370 100644
--- a/components/esm4/acti.hpp
+++ b/components/esm4/acti.hpp
@@ -57,7 +57,6 @@ namespace ESM4
 
         std::string mActivationPrompt;
 
-        Activator();
         virtual ~Activator();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/lighting.hpp b/components/esm4/lighting.hpp
index 42e76eceee..a139ae630e 100644
--- a/components/esm4/lighting.hpp
+++ b/components/esm4/lighting.hpp
@@ -28,6 +28,7 @@
 #define ESM4_LIGHTING_H
 
 #include <cstdint>
+#include <limits>
 
 namespace ESM4
 {
@@ -44,7 +45,7 @@ namespace ESM4
         std::int32_t  rotationZ;   // rotation z    | 00 00 00 00 = 0
         float         fogDirFade;  // Fog dir fade  | 00 00 80 3F = 1.f
         float         fogClipDist; // Fog clip dist | 00 80 3B 45 = 3000.f
-        float         fogPower;
+        float         fogPower = std::numeric_limits<float>::max();
     };
 
     struct Lighting_TES5
diff --git a/components/esm4/loadachr.cpp b/components/esm4/loadachr.cpp
index fe03fcb59e..e006588475 100644
--- a/components/esm4/loadachr.cpp
+++ b/components/esm4/loadachr.cpp
@@ -32,16 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::ActorCharacter::ActorCharacter() : mFormId(0), mFlags(0), mBaseObj(0),
-                                         mScale(1.f), mOwner(0), mGlobal(0), mInitiallyDisabled(false)
-{
-    mEditorId.clear();
-    mFullName.clear();
-
-    mEsp.parent = 0;
-    mEsp.flags = 0;
-}
-
 ESM4::ActorCharacter::~ActorCharacter()
 {
 }
diff --git a/components/esm4/loadachr.hpp b/components/esm4/loadachr.hpp
index a8656ea926..7f78aa32d1 100644
--- a/components/esm4/loadachr.hpp
+++ b/components/esm4/loadachr.hpp
@@ -49,7 +49,7 @@ namespace ESM4
         FormId      mBaseObj;
 
         Placement mPlacement;
-        float    mScale;      // default 1.f
+        float    mScale = 1.0f;
         FormId   mOwner;
         FormId   mGlobal;
 
@@ -57,7 +57,6 @@ namespace ESM4
 
         EnableParent mEsp;
 
-        ActorCharacter();
         virtual ~ActorCharacter();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadacre.cpp b/components/esm4/loadacre.cpp
index 3510986d3c..9eb0cc7e5f 100644
--- a/components/esm4/loadacre.cpp
+++ b/components/esm4/loadacre.cpp
@@ -32,15 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::ActorCreature::ActorCreature() : mFormId(0), mFlags(0), mBaseObj(0), mScale(1.f),
-                                       mOwner(0), mGlobal(0), mFactionRank(0), mInitiallyDisabled(false)
-{
-    mEditorId.clear();
-
-    mEsp.parent = 0;
-    mEsp.flags = 0;
-}
-
 ESM4::ActorCreature::~ActorCreature()
 {
 }
diff --git a/components/esm4/loadacre.hpp b/components/esm4/loadacre.hpp
index 26cab34a4e..0b436d762b 100644
--- a/components/esm4/loadacre.hpp
+++ b/components/esm4/loadacre.hpp
@@ -45,7 +45,7 @@ namespace ESM4
         FormId      mBaseObj;
 
         Placement mPlacement;
-        float    mScale;      // default 1.f
+        float    mScale = 1.0f;
         FormId   mOwner;
         FormId   mGlobal;
         std::uint32_t mFactionRank;
@@ -54,7 +54,6 @@ namespace ESM4
 
         EnableParent mEsp;
 
-        ActorCreature();
         virtual ~ActorCreature();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadacti.cpp b/components/esm4/loadacti.cpp
index abbe901014..cdfd6972fc 100644
--- a/components/esm4/loadacti.cpp
+++ b/components/esm4/loadacti.cpp
@@ -32,16 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Activator::Activator() : mFormId(0), mFlags(0), mScriptId(0), mLoopingSound(0), mActivationSound(0),
-    mBoundRadius(0.f), mRadioTemplate(0), mRadioStation(0)
-{
-    mEditorId.clear();
-    mFullName.clear();
-    mModel.clear();
-
-    mActivationPrompt.clear();
-}
-
 ESM4::Activator::~Activator()
 {
 }
diff --git a/components/esm4/loadalch.cpp b/components/esm4/loadalch.cpp
index b720b740ca..2c346d71b9 100644
--- a/components/esm4/loadalch.cpp
+++ b/components/esm4/loadalch.cpp
@@ -33,19 +33,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Potion::Potion() : mFormId(0), mFlags(0), mPickUpSound(0), mDropSound(0), mScriptId(0), mBoundRadius(0.f)
-{
-    mEditorId.clear();
-    mFullName.clear();
-    mModel.clear();
-    mIcon.clear();
-    mMiniIcon.clear();
-
-    mData.weight = 0.f;
-
-    std::memset(&mEffect, 0, sizeof(ScriptEffect));
-}
-
 ESM4::Potion::~Potion()
 {
 }
diff --git a/components/esm4/loadaloc.cpp b/components/esm4/loadaloc.cpp
index a84e56592d..9907e5908b 100644
--- a/components/esm4/loadaloc.cpp
+++ b/components/esm4/loadaloc.cpp
@@ -38,15 +38,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::MediaLocationController::MediaLocationController() : mFormId(0), mFlags(0),
-    mConditionalFaction(0), mLocationDelay(0.f), mRetriggerDelay(0.f), mDayStart(0), mNightStart(0)
-{
-    mEditorId.clear();
-    mFullName.clear();
-
-    std::memset(&mMediaFlags, 0, sizeof(MLC_Flags));
-}
-
 ESM4::MediaLocationController::~MediaLocationController()
 {
 }
diff --git a/components/esm4/loadammo.cpp b/components/esm4/loadammo.cpp
index 7ccf8e1582..3c30a7a73b 100644
--- a/components/esm4/loadammo.cpp
+++ b/components/esm4/loadammo.cpp
@@ -31,16 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Ammunition::Ammunition() : mFormId(0), mFlags(0), mPickUpSound(0), mDropSound(0), mBoundRadius(0.f)
-{
-    mEditorId.clear();
-    mFullName.clear();
-    mModel.clear();
-    mText.clear();
-    mIcon.clear();
-    mMiniIcon.clear();
-}
-
 ESM4::Ammunition::~Ammunition()
 {
 }
diff --git a/components/esm4/loadammo.hpp b/components/esm4/loadammo.hpp
index 8ff9cd9390..c31d38c10c 100644
--- a/components/esm4/loadammo.hpp
+++ b/components/esm4/loadammo.hpp
@@ -71,7 +71,6 @@ namespace ESM4
 
         Data mData;
 
-        Ammunition();
         virtual ~Ammunition();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadanio.cpp b/components/esm4/loadanio.cpp
index b6b97a1a47..15847fbbda 100644
--- a/components/esm4/loadanio.cpp
+++ b/components/esm4/loadanio.cpp
@@ -31,13 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::AnimObject::AnimObject() : mFormId(0), mFlags(0), mBoundRadius(0.f), mIdleAnim(0)
-{
-    mEditorId.clear();
-    mModel.clear();
-    mUnloadEvent.clear();
-}
-
 ESM4::AnimObject::~AnimObject()
 {
 }
diff --git a/components/esm4/loadanio.hpp b/components/esm4/loadanio.hpp
index 4259abe7b3..f7e85f613b 100644
--- a/components/esm4/loadanio.hpp
+++ b/components/esm4/loadanio.hpp
@@ -50,7 +50,6 @@ namespace ESM4
         FormId mIdleAnim;         // only in TES4
         std::string mUnloadEvent; // only in TES5
 
-        AnimObject();
         virtual ~AnimObject();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadappa.cpp b/components/esm4/loadappa.cpp
index 7ad7635927..c0561322b0 100644
--- a/components/esm4/loadappa.cpp
+++ b/components/esm4/loadappa.cpp
@@ -31,20 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Apparatus::Apparatus() : mFormId(0), mFlags(0), mBoundRadius(0.f), mScriptId(0)
-{
-    mEditorId.clear();
-    mFullName.clear();
-    mModel.clear();
-    mText.clear();
-    mIcon.clear();
-
-    mData.type = 0;
-    mData.value = 0;
-    mData.weight = 0.f;
-    mData.quality = 0.f;
-}
-
 ESM4::Apparatus::~Apparatus()
 {
 }
diff --git a/components/esm4/loadappa.hpp b/components/esm4/loadappa.hpp
index 1723c969ee..f3b2966518 100644
--- a/components/esm4/loadappa.hpp
+++ b/components/esm4/loadappa.hpp
@@ -62,7 +62,6 @@ namespace ESM4
 
         Data mData;
 
-        Apparatus();
         virtual ~Apparatus();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadarma.cpp b/components/esm4/loadarma.cpp
index 8b29000bb3..6306845689 100644
--- a/components/esm4/loadarma.cpp
+++ b/components/esm4/loadarma.cpp
@@ -32,15 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::ArmorAddon::ArmorAddon() : mFormId(0), mFlags(0), mTextureMale(0), mTextureFemale(0),
-                                 mRacePrimary(0)
-{
-    mEditorId.clear();
-
-    mModelMale.clear();
-    mModelFemale.clear();
-}
-
 ESM4::ArmorAddon::~ArmorAddon()
 {
 }
diff --git a/components/esm4/loadarma.hpp b/components/esm4/loadarma.hpp
index 59c4550b7f..f7abb404a1 100644
--- a/components/esm4/loadarma.hpp
+++ b/components/esm4/loadarma.hpp
@@ -57,7 +57,6 @@ namespace ESM4
 
         BodyTemplate mBodyTemplate; // TES5
 
-        ArmorAddon();
         virtual ~ArmorAddon();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadarmo.cpp b/components/esm4/loadarmo.cpp
index bc0765c869..c6237f326d 100644
--- a/components/esm4/loadarmo.cpp
+++ b/components/esm4/loadarmo.cpp
@@ -32,28 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Armor::Armor() : mFormId(0), mFlags(0), mIsTES4(false), mIsFO3(false), mIsFONV(false),
-                       mPickUpSound(0), mDropSound(0), mBoundRadius(0.f),
-                       mArmorFlags(0), mGeneralFlags(0), mScriptId(0), mEnchantmentPoints(0), mEnchantment(0)
-{
-    mEditorId.clear();
-    mFullName.clear();
-    mModelMale.clear();
-    mModelMaleWorld.clear();
-    mModelFemale.clear();
-    mModelFemaleWorld.clear();
-    mText.clear();
-    mIconMale.clear();
-    mMiniIconMale.clear();
-    mIconFemale.clear();
-    mMiniIconFemale.clear();
-
-    mData.armor = 0;
-    mData.value = 0;
-    mData.health = 0;
-    mData.weight = 0.f;
-}
-
 ESM4::Armor::~Armor()
 {
 }
diff --git a/components/esm4/loadarmo.hpp b/components/esm4/loadarmo.hpp
index f17521f507..b44ba1a973 100644
--- a/components/esm4/loadarmo.hpp
+++ b/components/esm4/loadarmo.hpp
@@ -183,7 +183,6 @@ namespace ESM4
         std::vector<FormId> mAddOns; // TES5 ARMA
         Data mData;
 
-        Armor();
         virtual ~Armor();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadaspc.cpp b/components/esm4/loadaspc.cpp
index a4cb6f3939..8fb9d70c71 100644
--- a/components/esm4/loadaspc.cpp
+++ b/components/esm4/loadaspc.cpp
@@ -32,12 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::AcousticSpace::AcousticSpace() : mFormId(0), mFlags(0), mEnvironmentType(0), mSoundRegion(0),
-    mIsInterior(0)
-{
-    mEditorId.clear();
-}
-
 ESM4::AcousticSpace::~AcousticSpace()
 {
 }
diff --git a/components/esm4/loadaspc.hpp b/components/esm4/loadaspc.hpp
index 3ab1a8484d..179297a604 100644
--- a/components/esm4/loadaspc.hpp
+++ b/components/esm4/loadaspc.hpp
@@ -53,7 +53,6 @@ namespace ESM4
 
         std::uint32_t mIsInterior; // if true only use mAmbientLoopSounds[0]
 
-        AcousticSpace();
         virtual ~AcousticSpace();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadbook.cpp b/components/esm4/loadbook.cpp
index 0ffc69ef0e..939888fc43 100644
--- a/components/esm4/loadbook.cpp
+++ b/components/esm4/loadbook.cpp
@@ -31,22 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Book::Book() : mFormId(0), mFlags(0), mBoundRadius(0.f), mScriptId(0),
-                     mEnchantmentPoints(0), mEnchantment(0), mPickUpSound(0), mDropSound(0)
-{
-    mEditorId.clear();
-    mFullName.clear();
-    mModel.clear();
-    mText.clear();
-    mIcon.clear();
-
-    mData.flags = 0;
-    mData.type = 0;
-    mData.bookSkill = 0;
-    mData.value = 0;
-    mData.weight = 0.f;
-}
-
 ESM4::Book::~Book()
 {
 }
diff --git a/components/esm4/loadbook.hpp b/components/esm4/loadbook.hpp
index c5c1a3529f..9cb5358bdb 100644
--- a/components/esm4/loadbook.hpp
+++ b/components/esm4/loadbook.hpp
@@ -101,7 +101,6 @@ namespace ESM4
         FormId mPickUpSound;
         FormId mDropSound;
 
-        Book();
         virtual ~Book();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadbptd.cpp b/components/esm4/loadbptd.cpp
index 6c6c1bc26c..a65d2dd482 100644
--- a/components/esm4/loadbptd.cpp
+++ b/components/esm4/loadbptd.cpp
@@ -43,13 +43,6 @@ void ESM4::BodyPartData::BodyPart::clear()
     mGoreEffectsTarget.clear();
 }
 
-ESM4::BodyPartData::BodyPartData() : mFormId(0), mFlags(0)
-{
-    mEditorId.clear();
-    mFullName.clear();
-    mModel.clear();
-}
-
 ESM4::BodyPartData::~BodyPartData()
 {
 }
diff --git a/components/esm4/loadbptd.hpp b/components/esm4/loadbptd.hpp
index 0a29cd22cb..0b971ca083 100644
--- a/components/esm4/loadbptd.hpp
+++ b/components/esm4/loadbptd.hpp
@@ -115,7 +115,6 @@ namespace ESM4
 
         std::vector<BodyPart> mBodyParts;
 
-        BodyPartData();
         virtual ~BodyPartData();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadcell.cpp b/components/esm4/loadcell.cpp
index eb1f864b92..0b90a7cdbf 100644
--- a/components/esm4/loadcell.cpp
+++ b/components/esm4/loadcell.cpp
@@ -39,28 +39,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Cell::Cell() : mParent(0), mFormId(0), mFlags(0), mCellFlags(0), mX(0), mY(0), mOwner(0),
-                     mGlobal(0), mClimate(0), mWater(0), mWaterHeight(0.f),
-                     mLightingTemplate(0), mLightingTemplateFlags(0), mMusic(0), mAcousticSpace(0),
-                     mMusicType(0), mPreloaded(false)
-{
-    mEditorId.clear();
-    mFullName.clear();
-
-    mLighting.ambient = 0;
-    mLighting.directional = 0;
-    mLighting.fogColor = 0;
-    mLighting.fogNear = 0.f;
-    mLighting.fogFar = 0.f;
-    mLighting.rotationXY = 0;
-    mLighting.rotationZ = 0;
-    mLighting.fogDirFade = 0.f;
-    mLighting.fogClipDist = 0.f;
-    mLighting.fogPower = FLT_MAX; // hack way to detect TES4
-
-    mRegions.clear();
-}
-
 ESM4::Cell::~Cell()
 {
 }
diff --git a/components/esm4/loadcell.hpp b/components/esm4/loadcell.hpp
index 70dc94e73a..c2274fcbe9 100644
--- a/components/esm4/loadcell.hpp
+++ b/components/esm4/loadcell.hpp
@@ -91,7 +91,6 @@ namespace ESM4
 
         CellGroup *mCellGroup;
 
-        Cell();
         virtual ~Cell();
 
         void init(ESM4::Reader& reader); // common setup for both preload() and load()
diff --git a/components/esm4/loadclas.cpp b/components/esm4/loadclas.cpp
index 2948976709..80c9fc2b0f 100644
--- a/components/esm4/loadclas.cpp
+++ b/components/esm4/loadclas.cpp
@@ -36,14 +36,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Class::Class()
-{
-    mEditorId.clear();
-    mFullName.clear();
-    mDesc.clear();
-    mIcon.clear();
-}
-
 ESM4::Class::~Class()
 {
 }
diff --git a/components/esm4/loadclas.hpp b/components/esm4/loadclas.hpp
index 83e8372f4a..c68a1c1ae5 100644
--- a/components/esm4/loadclas.hpp
+++ b/components/esm4/loadclas.hpp
@@ -53,7 +53,6 @@ namespace ESM4
         std::string mIcon;
         Data mData;
 
-        Class();
         ~Class();
 
         void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadclfm.cpp b/components/esm4/loadclfm.cpp
index b926cb93fd..7ad9f56615 100644
--- a/components/esm4/loadclfm.cpp
+++ b/components/esm4/loadclfm.cpp
@@ -32,17 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Colour::Colour() : mFormId(0), mFlags(0), mPlayable(0)
-{
-    mEditorId.clear();
-    mFullName.clear();
-
-    mColour.red = 0;
-    mColour.green = 0;
-    mColour.blue = 0;
-    mColour.custom = 0;
-}
-
 ESM4::Colour::~Colour()
 {
 }
diff --git a/components/esm4/loadclfm.hpp b/components/esm4/loadclfm.hpp
index 2a18e42cd6..35d4a28686 100644
--- a/components/esm4/loadclfm.hpp
+++ b/components/esm4/loadclfm.hpp
@@ -57,7 +57,6 @@ namespace ESM4
         ColourRGB mColour;
         std::uint32_t mPlayable;
 
-        Colour();
         virtual ~Colour();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadclot.cpp b/components/esm4/loadclot.cpp
index da6473c393..8f43cf2ac6 100644
--- a/components/esm4/loadclot.cpp
+++ b/components/esm4/loadclot.cpp
@@ -32,22 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Clothing::Clothing() : mFormId(0), mFlags(0), mBoundRadius(0.f), mClothingFlags(0),
-                             mScriptId(0), mEnchantmentPoints(0), mEnchantment(0)
-{
-    mEditorId.clear();
-    mFullName.clear();
-    mModelMale.clear();
-    mModelMaleWorld.clear();
-    mModelFemale.clear();
-    mModelFemaleWorld.clear();
-    mIconMale.clear();
-    mIconFemale.clear();
-
-    mData.value = 0;
-    mData.weight = 0.f;
-}
-
 ESM4::Clothing::~Clothing()
 {
 }
diff --git a/components/esm4/loadclot.hpp b/components/esm4/loadclot.hpp
index 06e019137b..8870c58a45 100644
--- a/components/esm4/loadclot.hpp
+++ b/components/esm4/loadclot.hpp
@@ -70,7 +70,6 @@ namespace ESM4
 
         Data mData;
 
-        Clothing();
         virtual ~Clothing();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadcont.cpp b/components/esm4/loadcont.cpp
index 06366c88cc..6ddb6c17f9 100644
--- a/components/esm4/loadcont.cpp
+++ b/components/esm4/loadcont.cpp
@@ -31,14 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Container::Container() : mFormId(0), mFlags(0), mBoundRadius(0.f), mDataFlags(0), mWeight(0.f),
-                               mOpenSound(0), mCloseSound(0), mScriptId(0)
-{
-    mEditorId.clear();
-    mFullName.clear();
-    mModel.clear();
-}
-
 ESM4::Container::~Container()
 {
 }
diff --git a/components/esm4/loadcont.hpp b/components/esm4/loadcont.hpp
index e059d9a361..7218da9729 100644
--- a/components/esm4/loadcont.hpp
+++ b/components/esm4/loadcont.hpp
@@ -58,7 +58,6 @@ namespace ESM4
 
         std::vector<InventoryItem> mInventory;
 
-        Container();
         virtual ~Container();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadcrea.cpp b/components/esm4/loadcrea.cpp
index 5fdd414256..a78aadd82d 100644
--- a/components/esm4/loadcrea.cpp
+++ b/components/esm4/loadcrea.cpp
@@ -40,28 +40,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Creature::Creature() : mFormId(0), mFlags(0), mDeathItem(0), mScriptId(0), mCombatStyle(0),
-                             mSoundBase(0), mSound(0), mSoundChance(0), mBaseScale(0.f),
-                             mTurningSpeed(0.f), mFootWeight(0.f), mBoundRadius(0.f)
-{
-    mEditorId.clear();
-    mFullName.clear();
-    mModel.clear();
-
-    mBloodSpray.clear();
-    mBloodDecal.clear();
-
-    mAIData.aggression = 0;
-    mAIData.confidence = 0;
-    mAIData.energyLevel = 0;
-    mAIData.responsibility = 0;
-    mAIData.aiFlags = 0;
-    mAIData.trainSkill = 0;
-    mAIData.trainLevel = 0;
-
-    std::memset(&mData, 0, sizeof(Data));
-}
-
 ESM4::Creature::~Creature()
 {
 }
diff --git a/components/esm4/loadcrea.hpp b/components/esm4/loadcrea.hpp
index c2889d1713..8062a670d0 100644
--- a/components/esm4/loadcrea.hpp
+++ b/components/esm4/loadcrea.hpp
@@ -138,7 +138,6 @@ namespace ESM4
         FormId mBaseTemplate;           // FO3/FONV
         std::vector<FormId> mBodyParts; // FO3/FONV
 
-        Creature();
         virtual ~Creature();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loaddial.cpp b/components/esm4/loaddial.cpp
index 716da441d5..28176e7c52 100644
--- a/components/esm4/loaddial.cpp
+++ b/components/esm4/loaddial.cpp
@@ -33,15 +33,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Dialogue::Dialogue() : mFormId(0), mFlags(0), mDoAllBeforeRepeat(false),
-                             mDialType(0), mDialFlags(0), mPriority(0.f)
-{
-    mEditorId.clear();
-    mTopicName.clear();
-
-    mTextDumb.clear(); // FIXME: temp name
-}
-
 ESM4::Dialogue::~Dialogue()
 {
 }
diff --git a/components/esm4/loaddial.hpp b/components/esm4/loaddial.hpp
index ef44c841fc..6463da4f19 100644
--- a/components/esm4/loaddial.hpp
+++ b/components/esm4/loaddial.hpp
@@ -57,7 +57,6 @@ namespace ESM4
 
         float mPriority;
 
-        Dialogue();
         virtual ~Dialogue();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loaddobj.cpp b/components/esm4/loaddobj.cpp
index 307674a5db..b81e29c9fc 100644
--- a/components/esm4/loaddobj.cpp
+++ b/components/esm4/loaddobj.cpp
@@ -37,13 +37,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::DefaultObj::DefaultObj() : mFormId(0), mFlags(0)
-{
-    mEditorId.clear();
-
-    std::memset(&mData, 0, sizeof(Defaults));
-}
-
 ESM4::DefaultObj::~DefaultObj()
 {
 }
diff --git a/components/esm4/loaddobj.hpp b/components/esm4/loaddobj.hpp
index 6d708fcbbc..b9557bbb05 100644
--- a/components/esm4/loaddobj.hpp
+++ b/components/esm4/loaddobj.hpp
@@ -87,7 +87,6 @@ namespace ESM4
 
         Defaults mData;
 
-        DefaultObj();
         virtual ~DefaultObj();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loaddoor.cpp b/components/esm4/loaddoor.cpp
index 45ac1f0b6c..7af92fa870 100644
--- a/components/esm4/loaddoor.cpp
+++ b/components/esm4/loaddoor.cpp
@@ -31,14 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Door::Door() : mFormId(0), mFlags(0), mBoundRadius(0.f), mDoorFlags(0), mScriptId(0),
-                     mOpenSound(0), mCloseSound(0), mLoopSound(0), mRandomTeleport(0)
-{
-    mEditorId.clear();
-    mFullName.clear();
-    mModel.clear();
-}
-
 ESM4::Door::~Door()
 {
 }
diff --git a/components/esm4/loaddoor.hpp b/components/esm4/loaddoor.hpp
index 0a332339d5..71e7ae70ac 100644
--- a/components/esm4/loaddoor.hpp
+++ b/components/esm4/loaddoor.hpp
@@ -63,7 +63,6 @@ namespace ESM4
         FormId mLoopSound;
         FormId mRandomTeleport;
 
-        Door();
         virtual ~Door();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadeyes.cpp b/components/esm4/loadeyes.cpp
index 059bee6c37..d4f4fc4bbb 100644
--- a/components/esm4/loadeyes.cpp
+++ b/components/esm4/loadeyes.cpp
@@ -31,15 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Eyes::Eyes() : mFormId(0), mFlags(0)
-{
-    mEditorId.clear();
-    mFullName.clear();
-    mIcon.clear();
-
-    mData.flags = 0;
-}
-
 ESM4::Eyes::~Eyes()
 {
 }
diff --git a/components/esm4/loadeyes.hpp b/components/esm4/loadeyes.hpp
index 814e2a9647..dfc5d5e983 100644
--- a/components/esm4/loadeyes.hpp
+++ b/components/esm4/loadeyes.hpp
@@ -55,7 +55,6 @@ namespace ESM4
 
         Data mData;
 
-        Eyes();
         virtual ~Eyes();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadflor.cpp b/components/esm4/loadflor.cpp
index fab6c3f0ed..fcc7fa05c1 100644
--- a/components/esm4/loadflor.cpp
+++ b/components/esm4/loadflor.cpp
@@ -31,14 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Flora::Flora() : mFormId(0), mFlags(0), mBoundRadius(0.f), mScriptId(0), mIngredient(0),
-                       mSound(0)
-{
-    mEditorId.clear();
-    mFullName.clear();
-    mModel.clear();
-}
-
 ESM4::Flora::~Flora()
 {
 }
diff --git a/components/esm4/loadflor.hpp b/components/esm4/loadflor.hpp
index 2f9e22d548..f4961adf9c 100644
--- a/components/esm4/loadflor.hpp
+++ b/components/esm4/loadflor.hpp
@@ -65,7 +65,6 @@ namespace ESM4
         FormId mSound;
         Production mPercentHarvest;
 
-        Flora();
         virtual ~Flora();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadflst.cpp b/components/esm4/loadflst.cpp
index 32b23ff284..f73f883148 100644
--- a/components/esm4/loadflst.cpp
+++ b/components/esm4/loadflst.cpp
@@ -32,11 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::FormIdList::FormIdList() : mFormId(0), mFlags(0)
-{
-    mEditorId.clear();
-}
-
 ESM4::FormIdList::~FormIdList()
 {
 }
diff --git a/components/esm4/loadflst.hpp b/components/esm4/loadflst.hpp
index 6fd381aa44..c7e098b9ba 100644
--- a/components/esm4/loadflst.hpp
+++ b/components/esm4/loadflst.hpp
@@ -47,7 +47,6 @@ namespace ESM4
 
         std::vector<FormId> mObjects;
 
-        FormIdList();
         virtual ~FormIdList();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadfurn.cpp b/components/esm4/loadfurn.cpp
index 6fba8bc3ce..046f105451 100644
--- a/components/esm4/loadfurn.cpp
+++ b/components/esm4/loadfurn.cpp
@@ -31,14 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Furniture::Furniture() : mFormId(0), mFlags(0), mBoundRadius(0.f), mScriptId(0),
-                               mActiveMarkerFlags(0)
-{
-    mEditorId.clear();
-    mFullName.clear();
-    mModel.clear();
-}
-
 ESM4::Furniture::~Furniture()
 {
 }
diff --git a/components/esm4/loadfurn.hpp b/components/esm4/loadfurn.hpp
index 89da61ebf9..c04f78f462 100644
--- a/components/esm4/loadfurn.hpp
+++ b/components/esm4/loadfurn.hpp
@@ -51,7 +51,6 @@ namespace ESM4
         FormId mScriptId;
         std::uint32_t mActiveMarkerFlags;
 
-        Furniture();
         virtual ~Furniture();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadglob.cpp b/components/esm4/loadglob.cpp
index 6a2fa8b00a..3435726d76 100644
--- a/components/esm4/loadglob.cpp
+++ b/components/esm4/loadglob.cpp
@@ -32,11 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::GlobalVariable::GlobalVariable() : mFormId(0), mFlags(0), mType(0), mValue(0.f)
-{
-    mEditorId.clear();
-}
-
 ESM4::GlobalVariable::~GlobalVariable()
 {
 }
diff --git a/components/esm4/loadglob.hpp b/components/esm4/loadglob.hpp
index 15cf4a07ac..59e2c1fbd0 100644
--- a/components/esm4/loadglob.hpp
+++ b/components/esm4/loadglob.hpp
@@ -47,7 +47,6 @@ namespace ESM4
         std::uint8_t mType;
         float mValue;
 
-        GlobalVariable();
         virtual ~GlobalVariable();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadgras.cpp b/components/esm4/loadgras.cpp
index 3818654fc1..81be002bc9 100644
--- a/components/esm4/loadgras.cpp
+++ b/components/esm4/loadgras.cpp
@@ -31,12 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Grass::Grass() : mFormId(0), mFlags(0), mBoundRadius(0.f)
-{
-    mEditorId.clear();
-    mModel.clear();
-}
-
 ESM4::Grass::~Grass()
 {
 }
diff --git a/components/esm4/loadgras.hpp b/components/esm4/loadgras.hpp
index d7754d03d9..f142779637 100644
--- a/components/esm4/loadgras.hpp
+++ b/components/esm4/loadgras.hpp
@@ -85,7 +85,6 @@ namespace ESM4
 
         Data mData;
 
-        Grass();
         virtual ~Grass();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadhair.cpp b/components/esm4/loadhair.cpp
index 661c333cbd..f558a46521 100644
--- a/components/esm4/loadhair.cpp
+++ b/components/esm4/loadhair.cpp
@@ -32,16 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Hair::Hair() : mFormId(0), mFlags(0), mBoundRadius(0.f)
-{
-    mEditorId.clear();
-    mFullName.clear();
-    mModel.clear();
-    mIcon.clear();
-
-    mData.flags = 0;
-}
-
 ESM4::Hair::~Hair()
 {
 }
diff --git a/components/esm4/loadhair.hpp b/components/esm4/loadhair.hpp
index c9a4fc2756..22ae6ef605 100644
--- a/components/esm4/loadhair.hpp
+++ b/components/esm4/loadhair.hpp
@@ -58,7 +58,6 @@ namespace ESM4
 
         Data mData;
 
-        Hair();
         virtual ~Hair();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadhdpt.cpp b/components/esm4/loadhdpt.cpp
index f188890246..ce579f5371 100644
--- a/components/esm4/loadhdpt.cpp
+++ b/components/esm4/loadhdpt.cpp
@@ -32,15 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::HeadPart::HeadPart() : mFormId(0), mFlags(0), mData(0), mAdditionalPart(0), mBaseTexture(0)
-{
-    mEditorId.clear();
-    mFullName.clear();
-    mModel.clear();
-
-    mTriFile.resize(3);
-}
-
 ESM4::HeadPart::~HeadPart()
 {
 }
diff --git a/components/esm4/loadhdpt.hpp b/components/esm4/loadhdpt.hpp
index d93411bb7e..9b67b0fce8 100644
--- a/components/esm4/loadhdpt.hpp
+++ b/components/esm4/loadhdpt.hpp
@@ -28,7 +28,7 @@
 #define ESM4_HDPT_H
 
 #include <cstdint>
-#include <vector>
+#include <array>
 
 #include "formid.hpp"
 
@@ -50,7 +50,7 @@ namespace ESM4
 
         FormId mAdditionalPart;
 
-        std::vector<std::string> mTriFile;
+        std::array<std::string, 3> mTriFile;
         FormId mBaseTexture;
 
         HeadPart();
diff --git a/components/esm4/loadidle.cpp b/components/esm4/loadidle.cpp
index 3d45b76e82..16bcfcf9dc 100644
--- a/components/esm4/loadidle.cpp
+++ b/components/esm4/loadidle.cpp
@@ -31,13 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::IdleAnimation::IdleAnimation() : mFormId(0), mFlags(0), mParent(0), mPrevious(0)
-{
-    mEditorId.clear();
-    mCollision.clear();
-    mEvent.clear();
-}
-
 ESM4::IdleAnimation::~IdleAnimation()
 {
 }
diff --git a/components/esm4/loadidle.hpp b/components/esm4/loadidle.hpp
index cadd056122..d41d715906 100644
--- a/components/esm4/loadidle.hpp
+++ b/components/esm4/loadidle.hpp
@@ -49,7 +49,6 @@ namespace ESM4
         FormId      mParent;  // IDLE or AACT
         FormId      mPrevious;
 
-        IdleAnimation();
         virtual ~IdleAnimation();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadidlm.cpp b/components/esm4/loadidlm.cpp
index ba823df300..0aada6a3a3 100644
--- a/components/esm4/loadidlm.cpp
+++ b/components/esm4/loadidlm.cpp
@@ -32,11 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::IdleMarker::IdleMarker() : mFormId(0), mFlags(0), mIdleFlags(0), mIdleCount(0), mIdleTimer(0.f), mIdleAnim(0)
-{
-    mEditorId.clear();
-}
-
 ESM4::IdleMarker::~IdleMarker()
 {
 }
diff --git a/components/esm4/loadidlm.hpp b/components/esm4/loadidlm.hpp
index 78d03a7024..717aade9c3 100644
--- a/components/esm4/loadidlm.hpp
+++ b/components/esm4/loadidlm.hpp
@@ -50,7 +50,6 @@ namespace ESM4
         float mIdleTimer;
         std::vector<FormId> mIdleAnim;
 
-        IdleMarker();
         virtual ~IdleMarker();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadimod.cpp b/components/esm4/loadimod.cpp
index 9950c59b7b..7be99fbae0 100644
--- a/components/esm4/loadimod.cpp
+++ b/components/esm4/loadimod.cpp
@@ -34,11 +34,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::ItemMod::ItemMod() : mFormId(0), mFlags(0)
-{
-    mEditorId.clear();
-}
-
 ESM4::ItemMod::~ItemMod()
 {
 }
diff --git a/components/esm4/loadimod.hpp b/components/esm4/loadimod.hpp
index a72fbe472d..2fee4f3156 100644
--- a/components/esm4/loadimod.hpp
+++ b/components/esm4/loadimod.hpp
@@ -46,7 +46,6 @@ namespace ESM4
 
         std::string mEditorId;
 
-        ItemMod();
         virtual ~ItemMod();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadinfo.cpp b/components/esm4/loadinfo.cpp
index a68774112b..d72051e8a7 100644
--- a/components/esm4/loadinfo.cpp
+++ b/components/esm4/loadinfo.cpp
@@ -33,21 +33,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::DialogInfo::DialogInfo() : mFormId(0), mFlags(0), mQuest(0), mSound(0),
-    mDialType(0), mNextSpeaker(0), mInfoFlags(0), mParam3(0)
-{
-    std::memset(&mResponseData, 0, sizeof(TargetResponseData));
-    mResponse.clear();
-    mNotes.clear();
-    mEdits.clear();
-
-    std::memset(&mTargetCondition, 0, sizeof(TargetCondition));
-
-    std::memset(&mScript.scriptHeader, 0, sizeof(ScriptHeader));
-    mScript.scriptSource.clear();
-    mScript.globReference = 0;
-}
-
 ESM4::DialogInfo::~DialogInfo()
 {
 }
diff --git a/components/esm4/loadinfo.hpp b/components/esm4/loadinfo.hpp
index be7090cd32..be7e77efc4 100644
--- a/components/esm4/loadinfo.hpp
+++ b/components/esm4/loadinfo.hpp
@@ -77,7 +77,6 @@ namespace ESM4
 
         ScriptDefinition mScript; // FIXME: ignoring the second one after the NEXT sub-record
 
-        DialogInfo();
         virtual ~DialogInfo();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadingr.cpp b/components/esm4/loadingr.cpp
index 03994dbfb4..38f38463d0 100644
--- a/components/esm4/loadingr.cpp
+++ b/components/esm4/loadingr.cpp
@@ -32,21 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Ingredient::Ingredient() : mFormId(0), mFlags(0), mBoundRadius(0.f), mScriptId(0)
-{
-    mEditorId.clear();
-    mFullName.clear();
-    mModel.clear();
-    mIcon.clear();
-
-    mData.value = 0;
-    mData.weight = 0.f;
-    mEnchantment.value = 0;
-    mEnchantment.flags = 0;
-
-    std::memset(&mEffect, 0, sizeof(ScriptEffect));
-}
-
 ESM4::Ingredient::~Ingredient()
 {
 }
diff --git a/components/esm4/loadingr.hpp b/components/esm4/loadingr.hpp
index 44312eb24b..c011ff54cf 100644
--- a/components/esm4/loadingr.hpp
+++ b/components/esm4/loadingr.hpp
@@ -70,7 +70,6 @@ namespace ESM4
 
         Data mData;
 
-        Ingredient();
         virtual ~Ingredient();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadkeym.cpp b/components/esm4/loadkeym.cpp
index a5aba621af..85d348465f 100644
--- a/components/esm4/loadkeym.cpp
+++ b/components/esm4/loadkeym.cpp
@@ -31,18 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Key::Key() : mFormId(0), mFlags(0), mPickUpSound(0), mDropSound(0), mBoundRadius(0.f), mScriptId(0)
-{
-    mEditorId.clear();
-    mFullName.clear();
-    mModel.clear();
-    mIcon.clear();
-    mMiniIcon.clear();
-
-    mData.value = 0;
-    mData.weight = 0.f;
-}
-
 ESM4::Key::~Key()
 {
 }
diff --git a/components/esm4/loadkeym.hpp b/components/esm4/loadkeym.hpp
index d59b3826d5..6a31395618 100644
--- a/components/esm4/loadkeym.hpp
+++ b/components/esm4/loadkeym.hpp
@@ -64,7 +64,6 @@ namespace ESM4
 
         Data mData;
 
-        Key();
         virtual ~Key();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadland.cpp b/components/esm4/loadland.cpp
index 2bb260da33..aadc2f3aaf 100644
--- a/components/esm4/loadland.cpp
+++ b/components/esm4/loadland.cpp
@@ -38,17 +38,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Land::Land() : mFormId(0), mFlags(0), mLandFlags(0), mDataTypes(0)
-{
-    for (int i = 0; i < 4; ++i)
-    {
-        mTextures[i].base.formId = 0;
-        mTextures[i].base.quadrant = 0;
-        mTextures[i].base.unknown1 = 0;
-        mTextures[i].base.unknown2 = 0;
-    }
-}
-
 ESM4::Land::~Land()
 {
 }
diff --git a/components/esm4/loadland.hpp b/components/esm4/loadland.hpp
index 6d53a99ff2..80a2490855 100644
--- a/components/esm4/loadland.hpp
+++ b/components/esm4/loadland.hpp
@@ -123,7 +123,6 @@ namespace ESM4
         Texture       mTextures[4]; // 0 = bottom left, 1 = bottom right, 2 = top left, 3 = top right
         std::vector<FormId> mIds;   // land texture (LTEX) formids
 
-        Land();
         virtual ~Land();
 
         virtual void load(Reader& reader);
diff --git a/components/esm4/loadlgtm.cpp b/components/esm4/loadlgtm.cpp
index 79867d4106..74486c3615 100644
--- a/components/esm4/loadlgtm.cpp
+++ b/components/esm4/loadlgtm.cpp
@@ -35,22 +35,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::LightingTemplate::LightingTemplate() : mFormId(0), mFlags(0)
-{
-    mEditorId.clear();
-
-    mLighting.ambient = 0;
-    mLighting.directional = 0;
-    mLighting.fogColor = 0;
-    mLighting.fogNear = 0.f;
-    mLighting.fogFar = 0.f;
-    mLighting.rotationXY = 0;
-    mLighting.rotationZ = 0;
-    mLighting.fogDirFade = 0.f;
-    mLighting.fogClipDist = 0.f;
-    mLighting.fogPower = FLT_MAX; // hack way to detect TES4
-}
-
 ESM4::LightingTemplate::~LightingTemplate()
 {
 }
diff --git a/components/esm4/loadlgtm.hpp b/components/esm4/loadlgtm.hpp
index 9724d8b16e..9e54bf53d9 100644
--- a/components/esm4/loadlgtm.hpp
+++ b/components/esm4/loadlgtm.hpp
@@ -50,7 +50,6 @@ namespace ESM4
 
         Lighting mLighting;
 
-        LightingTemplate();
         virtual ~LightingTemplate();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadligh.cpp b/components/esm4/loadligh.cpp
index bdd125c6bb..c4f0a94d51 100644
--- a/components/esm4/loadligh.cpp
+++ b/components/esm4/loadligh.cpp
@@ -31,15 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Light::Light() : mFormId(0), mFlags(0), mBoundRadius(0.f), mScriptId(0), mSound(0),
-                       mFade(0.f)
-{
-    mEditorId.clear();
-    mFullName.clear();
-    mModel.clear();
-    mIcon.clear();
-}
-
 ESM4::Light::~Light()
 {
 }
diff --git a/components/esm4/loadligh.hpp b/components/esm4/loadligh.hpp
index 4a0120d71a..b1c642eb27 100644
--- a/components/esm4/loadligh.hpp
+++ b/components/esm4/loadligh.hpp
@@ -42,7 +42,7 @@ namespace ESM4
         struct Data
         {
             std::uint32_t time;               // FO/FONV only
-            float         duration;
+            float         duration = -1;
             std::uint32_t radius;
             std::uint32_t colour; // RGBA
             // flags:
@@ -57,18 +57,14 @@ namespace ESM4
             // 0x00000200 = Spot Light
             // 0x00000400 = Spot Shadow
             std::int32_t  flags;
-            float         falloff;
-            float         FOV;
+            float         falloff = 1.f;
+            float         FOV = 90; // FIXME: FOV in degrees or radians?
             float         nearClip;           // TES5 only
             float         frequency;          // TES5 only
             float         intensityAmplitude; // TES5 only
             float         movementAmplitude;  // TES5 only
             std::uint32_t value;   // gold
             float         weight;
-            Data() : duration(-1), radius(0), colour(0), flags(0), falloff(1.f), FOV(90),
-                     nearClip(0.f), frequency(0.f), intensityAmplitude(0.f), movementAmplitude(0.f),
-                     value(0), weight(0.f) // FIXME: FOV in degrees or radians?
-            {}
         };
 
         FormId mFormId;       // from the header
@@ -88,7 +84,6 @@ namespace ESM4
 
         Data mData;
 
-        Light();
         virtual ~Light();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadltex.cpp b/components/esm4/loadltex.cpp
index 577d5dc8e1..7b442ef8df 100644
--- a/components/esm4/loadltex.cpp
+++ b/components/esm4/loadltex.cpp
@@ -37,14 +37,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::LandTexture::LandTexture() : mFormId(0), mFlags(0), mHavokFriction(0), mHavokRestitution(0),
-                                   mTextureSpecular(0), mGrass(0), mHavokMaterial(0), mTexture(0),
-                                   mMaterial(0)
-{
-    mEditorId.clear();
-    mTextureFile.clear();
-}
-
 ESM4::LandTexture::~LandTexture()
 {
 }
diff --git a/components/esm4/loadltex.hpp b/components/esm4/loadltex.hpp
index 934e7cc708..6347df2827 100644
--- a/components/esm4/loadltex.hpp
+++ b/components/esm4/loadltex.hpp
@@ -62,7 +62,6 @@ namespace ESM4
 
         // ----------------------
 
-        LandTexture();
         virtual ~LandTexture();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadlvlc.cpp b/components/esm4/loadlvlc.cpp
index 0088446277..cef4c0aff9 100644
--- a/components/esm4/loadlvlc.cpp
+++ b/components/esm4/loadlvlc.cpp
@@ -32,12 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::LevelledCreature::LevelledCreature() : mFormId(0), mFlags(0), mScriptId(0), mTemplate(0),
-                                           mChanceNone(0), mLvlCreaFlags(0)
-{
-    mEditorId.clear();
-}
-
 ESM4::LevelledCreature::~LevelledCreature()
 {
 }
diff --git a/components/esm4/loadlvlc.hpp b/components/esm4/loadlvlc.hpp
index ccd08944b5..61f2d90e24 100644
--- a/components/esm4/loadlvlc.hpp
+++ b/components/esm4/loadlvlc.hpp
@@ -58,7 +58,6 @@ namespace ESM4
         bool calcEachItemInCount() const;
         std::int8_t chanceNone() const;
 
-        LevelledCreature();
         virtual ~LevelledCreature();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadlvli.cpp b/components/esm4/loadlvli.cpp
index 1237a0add4..44395e92ea 100644
--- a/components/esm4/loadlvli.cpp
+++ b/components/esm4/loadlvli.cpp
@@ -32,12 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::LevelledItem::LevelledItem() : mFormId(0), mFlags(0), mChanceNone(0), mHasLvlItemFlags(false),
-    mLvlItemFlags(0), mData(0)
-{
-    mEditorId.clear();
-}
-
 ESM4::LevelledItem::~LevelledItem()
 {
 }
diff --git a/components/esm4/loadlvli.hpp b/components/esm4/loadlvli.hpp
index 0964370e63..479d556d5c 100644
--- a/components/esm4/loadlvli.hpp
+++ b/components/esm4/loadlvli.hpp
@@ -54,7 +54,6 @@ namespace ESM4
 
         std::vector<LVLO> mLvlObject;
 
-        LevelledItem();
         virtual ~LevelledItem();
 
         bool calcAllLvlLessThanPlayer() const;
diff --git a/components/esm4/loadlvln.cpp b/components/esm4/loadlvln.cpp
index fdd860b9d9..f4782a9c40 100644
--- a/components/esm4/loadlvln.cpp
+++ b/components/esm4/loadlvln.cpp
@@ -32,12 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::LevelledNpc::LevelledNpc() : mFormId(0), mFlags(0), mChanceNone(0), mLvlActorFlags(0), mListCount(0)
-{
-    mEditorId.clear();
-    mModel.clear();
-}
-
 ESM4::LevelledNpc::~LevelledNpc()
 {
 }
diff --git a/components/esm4/loadlvln.hpp b/components/esm4/loadlvln.hpp
index 057ed9581d..7c82a44ded 100644
--- a/components/esm4/loadlvln.hpp
+++ b/components/esm4/loadlvln.hpp
@@ -52,7 +52,6 @@ namespace ESM4
         std::uint8_t mListCount;
         std::vector<LVLO> mLvlObject;
 
-        LevelledNpc();
         virtual ~LevelledNpc();
 
         inline bool calcAllLvlLessThanPlayer() const { return (mLvlActorFlags & 0x01) != 0; }
diff --git a/components/esm4/loadmato.cpp b/components/esm4/loadmato.cpp
index fdbdc66ebc..839a6211df 100644
--- a/components/esm4/loadmato.cpp
+++ b/components/esm4/loadmato.cpp
@@ -31,12 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Material::Material() : mFormId(0), mFlags(0)
-{
-    mEditorId.clear();
-    mModel.clear();
-}
-
 ESM4::Material::~Material()
 {
 }
diff --git a/components/esm4/loadmato.hpp b/components/esm4/loadmato.hpp
index 9b0d6c3947..8f60824bd8 100644
--- a/components/esm4/loadmato.hpp
+++ b/components/esm4/loadmato.hpp
@@ -45,7 +45,6 @@ namespace ESM4
         std::string mEditorId;
         std::string mModel;
 
-        Material();
         virtual ~Material();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadmisc.cpp b/components/esm4/loadmisc.cpp
index ee3c10d0b6..8231df28f5 100644
--- a/components/esm4/loadmisc.cpp
+++ b/components/esm4/loadmisc.cpp
@@ -31,18 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::MiscItem::MiscItem() : mFormId(0), mFlags(0), mPickUpSound(0), mDropSound(0), mBoundRadius(0.f), mScriptId(0)
-{
-    mEditorId.clear();
-    mFullName.clear();
-    mModel.clear();
-    mIcon.clear();
-    mMiniIcon.clear();
-
-    mData.value = 0;
-    mData.weight = 0.f;
-}
-
 ESM4::MiscItem::~MiscItem()
 {
 }
diff --git a/components/esm4/loadmisc.hpp b/components/esm4/loadmisc.hpp
index 94f09b1a23..308a6ec326 100644
--- a/components/esm4/loadmisc.hpp
+++ b/components/esm4/loadmisc.hpp
@@ -64,7 +64,6 @@ namespace ESM4
 
         Data mData;
 
-        MiscItem();
         virtual ~MiscItem();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadmset.cpp b/components/esm4/loadmset.cpp
index b7859f9fa5..67ee5666d1 100644
--- a/components/esm4/loadmset.cpp
+++ b/components/esm4/loadmset.cpp
@@ -32,24 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::MediaSet::MediaSet() : mFormId(0), mFlags(0), mSetType(-1), mEnabled(0),
-    mBoundaryDayOuter(0.f), mBoundaryDayMiddle(0.f), mBoundaryDayInner(0.f),
-    mBoundaryNightOuter(0.f), mBoundaryNightMiddle(0.f), mBoundaryNightInner(0.f),
-    mLevel8(0.f), mLevel9(0.f), mLevel0(0.f), mLevelA(0.f), mLevelB(0.f), mLevelC(0.f),
-    mTime1(0.f), mTime2(0.f), mTime3(0.f), mTime4(0.f),
-    mSoundIntro(0), mSoundOutro(0)
-{
-    mEditorId.clear();
-    mFullName.clear();
-
-    mSet2.clear();
-    mSet3.clear();
-    mSet4.clear();
-    mSet5.clear();
-    mSet6.clear();
-    mSet7.clear();
-}
-
 ESM4::MediaSet::~MediaSet()
 {
 }
diff --git a/components/esm4/loadmset.hpp b/components/esm4/loadmset.hpp
index b13c4d6f64..c66273bc6c 100644
--- a/components/esm4/loadmset.hpp
+++ b/components/esm4/loadmset.hpp
@@ -51,7 +51,7 @@ namespace ESM4
         //              night outer (NAM5), night middle (NAM6), night inner (NAM7)
         // Dungeon    - intro (HNAM), battle (NAM2), explore (NAM3), suspence (NAM4), outro (INAM)
         // Incidental - daytime (HNAM), nighttime (INAM)
-        std::int32_t mSetType;
+        std::int32_t mSetType = -1;
         // 0x01 day outer,   0x02 day middle,   0x04 day inner
         // 0x08 night outer, 0x10 night middle, 0x20 night inner
         std::uint8_t mEnabled; // for location
@@ -86,7 +86,6 @@ namespace ESM4
         FormId mSoundIntro; // HNAM
         FormId mSoundOutro; // INAM
 
-        MediaSet();
         virtual ~MediaSet();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadmstt.cpp b/components/esm4/loadmstt.cpp
index 61d6147b2f..35c69c8a31 100644
--- a/components/esm4/loadmstt.cpp
+++ b/components/esm4/loadmstt.cpp
@@ -32,12 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::MovableStatic::MovableStatic() : mFormId(0), mFlags(0), mData(0), mLoopingSound(0)
-{
-    mEditorId.clear();
-    mModel.clear();
-}
-
 ESM4::MovableStatic::~MovableStatic()
 {
 }
diff --git a/components/esm4/loadmusc.cpp b/components/esm4/loadmusc.cpp
index 903bbb5a1f..a328fbce1e 100644
--- a/components/esm4/loadmusc.cpp
+++ b/components/esm4/loadmusc.cpp
@@ -36,12 +36,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Music::Music() : mFormId(0), mFlags(0)
-{
-    mEditorId.clear();
-    mMusicFile.clear();
-}
-
 ESM4::Music::~Music()
 {
 }
diff --git a/components/esm4/loadmusc.hpp b/components/esm4/loadmusc.hpp
index ab3889a6c0..2ec10abc8c 100644
--- a/components/esm4/loadmusc.hpp
+++ b/components/esm4/loadmusc.hpp
@@ -47,7 +47,6 @@ namespace ESM4
         std::string mEditorId;
         std::string mMusicFile;
 
-        Music();
         virtual ~Music();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadnavi.cpp b/components/esm4/loadnavi.cpp
index 0655edb1e8..818a8e98aa 100644
--- a/components/esm4/loadnavi.cpp
+++ b/components/esm4/loadnavi.cpp
@@ -38,11 +38,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Navigation::Navigation()
-{
-    mEditorId.clear();
-}
-
 ESM4::Navigation::~Navigation()
 {
 }
diff --git a/components/esm4/loadnavi.hpp b/components/esm4/loadnavi.hpp
index 0db9650c4e..ff0d033f3b 100644
--- a/components/esm4/loadnavi.hpp
+++ b/components/esm4/loadnavi.hpp
@@ -104,7 +104,6 @@ namespace ESM4
 
         std::map<FormId, std::uint32_t> mPathIndexMap;
 
-        Navigation();
         virtual ~Navigation();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadnavm.cpp b/components/esm4/loadnavm.cpp
index 1f3eebe434..1e84a9ffee 100644
--- a/components/esm4/loadnavm.cpp
+++ b/components/esm4/loadnavm.cpp
@@ -35,10 +35,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::NavMesh::NavMesh() : mFormId(0), mFlags(0)
-{
-}
-
 ESM4::NavMesh::~NavMesh()
 {
 }
diff --git a/components/esm4/loadnavm.hpp b/components/esm4/loadnavm.hpp
index f5fb9b5e20..7910b1373d 100644
--- a/components/esm4/loadnavm.hpp
+++ b/components/esm4/loadnavm.hpp
@@ -98,7 +98,6 @@ namespace ESM4
         FormId mFormId;       // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
-        NavMesh();
         virtual ~NavMesh();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadnote.cpp b/components/esm4/loadnote.cpp
index ee897258b7..90e39811af 100644
--- a/components/esm4/loadnote.cpp
+++ b/components/esm4/loadnote.cpp
@@ -32,14 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Note::Note() : mFormId(0), mFlags(0)
-{
-    mEditorId.clear();
-    mFullName.clear();
-    mModel.clear();
-    mIcon.clear();
-}
-
 ESM4::Note::~Note()
 {
 }
diff --git a/components/esm4/loadnote.hpp b/components/esm4/loadnote.hpp
index 1ba9bfec24..506674081f 100644
--- a/components/esm4/loadnote.hpp
+++ b/components/esm4/loadnote.hpp
@@ -47,7 +47,6 @@ namespace ESM4
         std::string mModel;
         std::string mIcon;
 
-        Note();
         virtual ~Note();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadnpc.cpp b/components/esm4/loadnpc.cpp
index e32ee6e90d..51d1d0b181 100644
--- a/components/esm4/loadnpc.cpp
+++ b/components/esm4/loadnpc.cpp
@@ -41,27 +41,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Npc::Npc() : mFormId(0), mFlags(0), mIsTES4(false), mIsFONV(false), mRace(0), mClass(0), mHair(0),
-                   mEyes(0), mHairLength(0.f), mHairColourId(0), mDeathItem(0),
-                   mScriptId(0), mCombatStyle(0), mSoundBase(0), mSound(0), mSoundChance(0),
-                   mFootWeight(0.f), mBoundRadius(0.f), mBaseTemplate(0), mWornArmor(0),
-                   mDefaultOutfit(0), mSleepOutfit(0), mDefaultPkg(0), mFgRace(0)
-{
-    mEditorId.clear();
-    mFullName.clear();
-    mModel.clear();
-
-    mHairColour.red = 0;
-    mHairColour.green = 0;
-    mHairColour.blue = 0;
-    mHairColour.custom = 0;
-
-    std::memset(&mAIData, 0, sizeof(AIData));
-    std::memset(&mData, 0, sizeof(Data));
-    std::memset(&mBaseConfig, 0, sizeof(ActorBaseConfig));
-    std::memset(&mFaction, 0, sizeof(ActorFaction));
-}
-
 ESM4::Npc::~Npc()
 {
 }
diff --git a/components/esm4/loadnpc.hpp b/components/esm4/loadnpc.hpp
index d30ca5f14f..1bd38e189c 100644
--- a/components/esm4/loadnpc.hpp
+++ b/components/esm4/loadnpc.hpp
@@ -217,7 +217,6 @@ namespace ESM4
         std::vector<float> mSymTextureModeCoefficients;  // size 0 or 50
         std::int16_t mFgRace;
 
-        Npc();
         virtual ~Npc();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadotft.cpp b/components/esm4/loadotft.cpp
index dec2a05666..d1b1bb23a7 100644
--- a/components/esm4/loadotft.cpp
+++ b/components/esm4/loadotft.cpp
@@ -32,11 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Outfit::Outfit() : mFormId(0), mFlags(0)
-{
-    mEditorId.clear();
-}
-
 ESM4::Outfit::~Outfit()
 {
 }
diff --git a/components/esm4/loadotft.hpp b/components/esm4/loadotft.hpp
index 3b1db34d0e..b982a3c468 100644
--- a/components/esm4/loadotft.hpp
+++ b/components/esm4/loadotft.hpp
@@ -47,7 +47,6 @@ namespace ESM4
 
         std::vector<FormId> mInventory;
 
-        Outfit();
         virtual ~Outfit();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadpack.cpp b/components/esm4/loadpack.cpp
index 241147df00..5ab9555cd6 100644
--- a/components/esm4/loadpack.cpp
+++ b/components/esm4/loadpack.cpp
@@ -33,20 +33,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::AIPackage::AIPackage() : mFormId(0), mFlags(0)
-{
-    mEditorId.clear();
-
-    std::memset(&mData, 0, sizeof(PKDT));
-    std::memset(&mSchedule, 0, sizeof(PSDT));
-    std::memset(&mLocation, 0, sizeof(PLDT));
-    mLocation.type = 0xff; // default to indicate no location data
-    std::memset(&mTarget, 0, sizeof(PTDT));
-    mTarget.type = 0xff;   // default to indicate no target data
-
-    mConditions.clear();
-}
-
 ESM4::AIPackage::~AIPackage()
 {
 }
diff --git a/components/esm4/loadpack.hpp b/components/esm4/loadpack.hpp
index 93a9a8290c..b7fe895941 100644
--- a/components/esm4/loadpack.hpp
+++ b/components/esm4/loadpack.hpp
@@ -58,14 +58,14 @@ namespace ESM4
 
         struct PLDT // location
         {
-            std::int32_t type; // 0 = near ref, 1 = in cell, 2 = current loc, 3 = editor loc, 4 = obj id, 5 = obj type
+            std::int32_t type = 0xff; // 0 = near ref, 1 = in cell, 2 = current loc, 3 = editor loc, 4 = obj id, 5 = obj type, 0xff = no location data
             FormId location;   // uint32_t if type = 5
             std::int32_t radius;
         };
 
         struct PTDT // target
         {
-            std::int32_t type; // 0 = specific ref, 1 = obj id, 2 = obj type
+            std::int32_t type = 0xff; // 0 = specific ref, 1 = obj id, 2 = obj type, 0xff = no target data
             FormId target;   // uint32_t if type = 2
             std::int32_t distance;
         };
diff --git a/components/esm4/loadpgrd.cpp b/components/esm4/loadpgrd.cpp
index c9c3048605..4a95c8af0a 100644
--- a/components/esm4/loadpgrd.cpp
+++ b/components/esm4/loadpgrd.cpp
@@ -36,16 +36,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Pathgrid::Pathgrid() : mFormId(0), mFlags(0), mData(0)
-{
-    mEditorId.clear();
-
-    mNodes.clear();
-    mLinks.clear();
-    mForeign.clear();
-    mObjects.clear();
-}
-
 ESM4::Pathgrid::~Pathgrid()
 {
 }
diff --git a/components/esm4/loadpgre.cpp b/components/esm4/loadpgre.cpp
index 9c3e745ab9..665b07e523 100644
--- a/components/esm4/loadpgre.cpp
+++ b/components/esm4/loadpgre.cpp
@@ -34,11 +34,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::PlacedGrenade::PlacedGrenade() : mFormId(0), mFlags(0)
-{
-    mEditorId.clear();
-}
-
 ESM4::PlacedGrenade::~PlacedGrenade()
 {
 }
diff --git a/components/esm4/loadpwat.cpp b/components/esm4/loadpwat.cpp
index a88adcf4c2..52852b0e8a 100644
--- a/components/esm4/loadpwat.cpp
+++ b/components/esm4/loadpwat.cpp
@@ -34,11 +34,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::PlaceableWater::PlaceableWater() : mFormId(0), mFlags(0)
-{
-    mEditorId.clear();
-}
-
 ESM4::PlaceableWater::~PlaceableWater()
 {
 }
diff --git a/components/esm4/loadrace.cpp b/components/esm4/loadrace.cpp
index 79f635bd48..3fa9661122 100644
--- a/components/esm4/loadrace.cpp
+++ b/components/esm4/loadrace.cpp
@@ -35,28 +35,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Race::Race() : mFormId(0), mFlags(0), mIsTES5(false)
-                   , mHeightMale(1.f), mHeightFemale(1.f), mWeightMale(1.f), mWeightFemale(1.f)
-                   , mRaceFlags(0), mFaceGenMainClamp(0.f), mFaceGenFaceClamp(0.f), mNumKeywords(0)
-                   , mSkin(0)
-{
-    mEditorId.clear();
-    mFullName.clear();
-    mDesc.clear();
-    mModelMale.clear();
-    mModelFemale.clear();
-
-    std::memset(&mAttribMale, 0, sizeof(AttributeValues));
-    std::memset(&mAttribFemale, 0, sizeof(AttributeValues));
-
-    mVNAM.resize(2);
-    mDefaultHair.resize(2);
-
-    mBodyTemplate.bodyPart = 0;
-    mBodyTemplate.flags = 0;
-    mBodyTemplate.type = 0;
-}
-
 ESM4::Race::~Race()
 {
 }
diff --git a/components/esm4/loadrace.hpp b/components/esm4/loadrace.hpp
index 0cede13b0b..c5912b719b 100644
--- a/components/esm4/loadrace.hpp
+++ b/components/esm4/loadrace.hpp
@@ -30,6 +30,7 @@
 #include <cstdint>
 #include <vector>
 #include <map>
+#include <array>
 
 #include "formid.hpp"
 #include "actor.hpp" // AttributeValues, BodyTemplate
@@ -122,10 +123,10 @@ namespace ESM4
         std::map<SkillIndex, std::uint8_t> mSkillBonus;
 
         // DATA
-        float mHeightMale;
-        float mHeightFemale;
-        float mWeightMale;
-        float mWeightFemale;
+        float mHeightMale = 1.0f;
+        float mHeightFemale = 1.0f;
+        float mWeightMale = 1.0f;
+        float mWeightFemale = 1.0f;
         std::uint32_t mRaceFlags; // 0x0001 = playable?
 
         std::vector<BodyPart> mHeadParts;       // see HeadPartIndex
@@ -148,8 +149,8 @@ namespace ESM4
 
         std::map<FormId, std::int32_t> mDisposition; // race adjustments
         std::vector<FormId> mBonusSpells;            // race ability/power
-        std::vector<FormId> mVNAM; // don't know what these are; 1 or 2 RACE FormIds
-        std::vector<FormId> mDefaultHair; // male/female (HAIR FormId for TES4)
+        std::array<FormId, 2> mVNAM; // don't know what these are; 1 or 2 RACE FormIds
+        std::array<FormId, 2> mDefaultHair; // male/female (HAIR FormId for TES4)
 
         std::uint32_t mNumKeywords;
 
@@ -161,7 +162,6 @@ namespace ESM4
         std::vector<FormId> mHeadPartIdsMale;   // TES5
         std::vector<FormId> mHeadPartIdsFemale; // TES5
 
-        Race();
         virtual ~Race();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadrefr.cpp b/components/esm4/loadrefr.cpp
index 4921fd16ca..24cd3d5cde 100644
--- a/components/esm4/loadrefr.cpp
+++ b/components/esm4/loadrefr.cpp
@@ -32,29 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Reference::Reference() : mParent(0), mFormId(0), mFlags(0),
-                               mBaseObj(0), mScale(1.f), mOwner(0), mGlobal(0), mFactionRank(-1),
-                               mInitiallyDisabled(false), mIsMapMarker(false), mMapMarker(0), mCount(1),
-                               mAudioLocation(0), mIsLocked(false), mLockLevel(0), mKey(0), mTargetRef(0)
-{
-    mEditorId.clear();
-    mFullName.clear();
-
-    //mPlacement.
-
-    mEsp.parent = 0;
-    mEsp.flags = 0;
-
-    mRadio.rangeRadius = 0.f;
-    mRadio.broadcastRange = 0;
-    mRadio.staticPercentage = 0.f;
-    mRadio.posReference = 0;
-
-    mDoor.destDoor = 0;
-    //mDoor.destPos.
-    mDoor.flags = 0;
-}
-
 ESM4::Reference::~Reference()
 {
 }
diff --git a/components/esm4/loadrefr.hpp b/components/esm4/loadrefr.hpp
index d9c96cbf9f..b631b334ee 100644
--- a/components/esm4/loadrefr.hpp
+++ b/components/esm4/loadrefr.hpp
@@ -82,10 +82,10 @@ namespace ESM4
         FormId      mBaseObj;
 
         Placement mPlacement;
-        float    mScale;      // default 1.f
+        float    mScale = 1.0f;
         FormId   mOwner;
         FormId   mGlobal;
-        std::int32_t mFactionRank;
+        std::int32_t mFactionRank = -1;
 
         bool mInitiallyDisabled; // TODO may need to check mFlags & 0x800 (initially disabled)
         bool mIsMapMarker;
@@ -93,7 +93,7 @@ namespace ESM4
 
         EnableParent mEsp;
 
-        std::uint32_t mCount; // only if > 1 (default 1)
+        std::uint32_t mCount = 1; // only if > 1
 
         FormId mAudioLocation;
 
@@ -106,7 +106,6 @@ namespace ESM4
 
         FormId mTargetRef;
 
-        Reference();
         virtual ~Reference();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadregn.cpp b/components/esm4/loadregn.cpp
index 6f871e8471..7acda43350 100644
--- a/components/esm4/loadregn.cpp
+++ b/components/esm4/loadregn.cpp
@@ -39,13 +39,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Region::Region() : mFormId(0), mFlags(0), mWorldId(0), mEdgeFalloff(0)
-{
-    mEditorId.clear();
-    mShader.clear();
-    mMapName.clear();
-}
-
 ESM4::Region::~Region()
 {
 }
diff --git a/components/esm4/loadregn.hpp b/components/esm4/loadregn.hpp
index 36ed8eb9d5..86b5ca5799 100644
--- a/components/esm4/loadregn.hpp
+++ b/components/esm4/loadregn.hpp
@@ -85,7 +85,6 @@ namespace ESM4
         RegionData mData;
         std::vector<RegionSound> mSounds;
 
-        Region();
         virtual ~Region();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadroad.cpp b/components/esm4/loadroad.cpp
index cb7742eb7c..fca11db779 100644
--- a/components/esm4/loadroad.cpp
+++ b/components/esm4/loadroad.cpp
@@ -33,14 +33,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Road::Road() : mFormId(0), mFlags(0)
-{
-    mEditorId.clear();
-
-    mNodes.clear();
-    mLinks.clear();
-}
-
 ESM4::Road::~Road()
 {
 }
diff --git a/components/esm4/loadroad.hpp b/components/esm4/loadroad.hpp
index dad92e858c..85745d000a 100644
--- a/components/esm4/loadroad.hpp
+++ b/components/esm4/loadroad.hpp
@@ -76,7 +76,6 @@ namespace ESM4
         std::vector<PGRP> mNodes;
         std::vector<PGRR> mLinks;
 
-        Road();
         virtual ~Road();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadsbsp.cpp b/components/esm4/loadsbsp.cpp
index c9af5b856e..9daef0f89c 100644
--- a/components/esm4/loadsbsp.cpp
+++ b/components/esm4/loadsbsp.cpp
@@ -31,15 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::SubSpace::SubSpace() : mFormId(0), mFlags(0)
-{
-    mEditorId.clear();
-
-    mDimension.x = 0.f;
-    mDimension.y = 0.f;
-    mDimension.z = 0.f;
-}
-
 ESM4::SubSpace::~SubSpace()
 {
 }
diff --git a/components/esm4/loadsbsp.hpp b/components/esm4/loadsbsp.hpp
index c0ca7c5ddf..601b2b0cb7 100644
--- a/components/esm4/loadsbsp.hpp
+++ b/components/esm4/loadsbsp.hpp
@@ -51,7 +51,6 @@ namespace ESM4
         std::string mEditorId;
         Dimension mDimension;
 
-        SubSpace();
         virtual ~SubSpace();
 
         virtual void load(Reader& reader);
diff --git a/components/esm4/loadscol.cpp b/components/esm4/loadscol.cpp
index 1990af5f4b..23a3cad1a3 100644
--- a/components/esm4/loadscol.cpp
+++ b/components/esm4/loadscol.cpp
@@ -34,11 +34,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::StaticCollection::StaticCollection() : mFormId(0), mFlags(0)
-{
-    mEditorId.clear();
-}
-
 ESM4::StaticCollection::~StaticCollection()
 {
 }
diff --git a/components/esm4/loadscol.hpp b/components/esm4/loadscol.hpp
index c32cdd3ca9..dc1bf296e1 100644
--- a/components/esm4/loadscol.hpp
+++ b/components/esm4/loadscol.hpp
@@ -46,7 +46,6 @@ namespace ESM4
 
         std::string mEditorId;
 
-        StaticCollection();
         virtual ~StaticCollection();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadscpt.cpp b/components/esm4/loadscpt.cpp
index cf4bdeb58a..c95a212e75 100644
--- a/components/esm4/loadscpt.cpp
+++ b/components/esm4/loadscpt.cpp
@@ -33,11 +33,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Script::Script() : mFormId(0), mFlags(0)
-{
-    mEditorId.clear();
-}
-
 ESM4::Script::~Script()
 {
 }
diff --git a/components/esm4/loadscpt.hpp b/components/esm4/loadscpt.hpp
index 747f49444d..459c552876 100644
--- a/components/esm4/loadscpt.hpp
+++ b/components/esm4/loadscpt.hpp
@@ -46,7 +46,6 @@ namespace ESM4
 
         ScriptDefinition mScript;
 
-        Script();
         virtual ~Script();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadscrl.cpp b/components/esm4/loadscrl.cpp
index c09147ce5e..c09c38ae90 100644
--- a/components/esm4/loadscrl.cpp
+++ b/components/esm4/loadscrl.cpp
@@ -32,17 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Scroll::Scroll() : mFormId(0), mFlags(0)
-{
-    mEditorId.clear();
-    mFullName.clear();
-    mModel.clear();
-    mText.clear();
-
-    mData.value = 0;
-    mData.weight = 0.f;
-}
-
 ESM4::Scroll::~Scroll()
 {
 }
diff --git a/components/esm4/loadscrl.hpp b/components/esm4/loadscrl.hpp
index a88781a6f8..d4feded5d8 100644
--- a/components/esm4/loadscrl.hpp
+++ b/components/esm4/loadscrl.hpp
@@ -55,7 +55,6 @@ namespace ESM4
 
         Data mData;
 
-        Scroll();
         virtual ~Scroll();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadsgst.cpp b/components/esm4/loadsgst.cpp
index b46c6bad29..9453cdc27d 100644
--- a/components/esm4/loadsgst.cpp
+++ b/components/esm4/loadsgst.cpp
@@ -32,20 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::SigilStone::SigilStone() : mFormId(0), mFlags(0), mBoundRadius(0.f), mScriptId(0)
-{
-    mEditorId.clear();
-    mFullName.clear();
-    mModel.clear();
-    mIcon.clear();
-
-    mData.uses = 0;
-    mData.value = 0;
-    mData.weight = 0.f;
-
-    std::memset(&mEffect, 0, sizeof(ScriptEffect));
-}
-
 ESM4::SigilStone::~SigilStone()
 {
 }
diff --git a/components/esm4/loadsgst.hpp b/components/esm4/loadsgst.hpp
index b0bbf9d800..3a2d32850d 100644
--- a/components/esm4/loadsgst.hpp
+++ b/components/esm4/loadsgst.hpp
@@ -62,7 +62,6 @@ namespace ESM4
 
         Data mData;
 
-        SigilStone();
         virtual ~SigilStone();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadslgm.cpp b/components/esm4/loadslgm.cpp
index 482c817802..97bbab9569 100644
--- a/components/esm4/loadslgm.cpp
+++ b/components/esm4/loadslgm.cpp
@@ -31,17 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::SoulGem::SoulGem() : mFormId(0), mFlags(0), mBoundRadius(0.f), mScriptId(0), mSoul(0), mSoulCapacity(0)
-{
-    mEditorId.clear();
-    mFullName.clear();
-    mModel.clear();
-    mIcon.clear();
-
-    mData.value = 0;
-    mData.weight = 0.f;
-}
-
 ESM4::SoulGem::~SoulGem()
 {
 }
diff --git a/components/esm4/loadslgm.hpp b/components/esm4/loadslgm.hpp
index 8724da13c1..e101fbf8a5 100644
--- a/components/esm4/loadslgm.hpp
+++ b/components/esm4/loadslgm.hpp
@@ -63,7 +63,6 @@ namespace ESM4
 
         Data mData;
 
-        SoulGem();
         virtual ~SoulGem();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadsndr.cpp b/components/esm4/loadsndr.cpp
index 25109e36b6..4c0bf30b24 100644
--- a/components/esm4/loadsndr.cpp
+++ b/components/esm4/loadsndr.cpp
@@ -32,12 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::SoundReference::SoundReference() : mFormId(0), mFlags(0), mSoundCategory(0), mSoundId(0), mOutputModel(0)
-{
-    mEditorId.clear();
-    mSoundFile.clear();
-}
-
 ESM4::SoundReference::~SoundReference()
 {
 }
diff --git a/components/esm4/loadsndr.hpp b/components/esm4/loadsndr.hpp
index 17f0491136..fba1912264 100644
--- a/components/esm4/loadsndr.hpp
+++ b/components/esm4/loadsndr.hpp
@@ -73,7 +73,6 @@ namespace ESM4
 
         TargetCondition mTargetCondition;
 
-        SoundReference();
         virtual ~SoundReference();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadsoun.cpp b/components/esm4/loadsoun.cpp
index 6441d8a799..bcb776e100 100644
--- a/components/esm4/loadsoun.cpp
+++ b/components/esm4/loadsoun.cpp
@@ -32,12 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Sound::Sound() : mFormId(0), mFlags(0)
-{
-    mEditorId.clear();
-    mSoundFile.clear();
-}
-
 ESM4::Sound::~Sound()
 {
 }
diff --git a/components/esm4/loadsoun.hpp b/components/esm4/loadsoun.hpp
index 845f38c380..b766aa5534 100644
--- a/components/esm4/loadsoun.hpp
+++ b/components/esm4/loadsoun.hpp
@@ -88,7 +88,6 @@ namespace ESM4
         SNDX mData;
         SoundData mExtra;
 
-        Sound();
         virtual ~Sound();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadstat.cpp b/components/esm4/loadstat.cpp
index de487147fe..d08812b4ee 100644
--- a/components/esm4/loadstat.cpp
+++ b/components/esm4/loadstat.cpp
@@ -32,12 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Static::Static() : mFormId(0), mFlags(0), mBoundRadius(0.f)
-{
-    mEditorId.clear();
-    mModel.clear();
-}
-
 ESM4::Static::~Static()
 {
 }
diff --git a/components/esm4/loadstat.hpp b/components/esm4/loadstat.hpp
index 966721ef37..9c689462ef 100644
--- a/components/esm4/loadstat.hpp
+++ b/components/esm4/loadstat.hpp
@@ -49,7 +49,6 @@ namespace ESM4
         float mBoundRadius;
         std::vector<std::uint8_t> mMODT; // FIXME texture hash
 
-        Static();
         virtual ~Static();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadtact.cpp b/components/esm4/loadtact.cpp
index c082048086..f82e70c483 100644
--- a/components/esm4/loadtact.cpp
+++ b/components/esm4/loadtact.cpp
@@ -32,14 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::TalkingActivator::TalkingActivator() : mFormId(0), mFlags(0), mScriptId(0), mVoiceType(0), mLoopSound(0),
-    mRadioTemplate(0)
-{
-    mEditorId.clear();
-    mFullName.clear();
-    mModel.clear();
-}
-
 ESM4::TalkingActivator::~TalkingActivator()
 {
 }
diff --git a/components/esm4/loadtact.hpp b/components/esm4/loadtact.hpp
index a1d15524be..f3fd91a433 100644
--- a/components/esm4/loadtact.hpp
+++ b/components/esm4/loadtact.hpp
@@ -63,7 +63,6 @@ namespace ESM4
         FormId mLoopSound;     // SOUN
         FormId mRadioTemplate; // SOUN
 
-        TalkingActivator();
         virtual ~TalkingActivator();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadterm.cpp b/components/esm4/loadterm.cpp
index 68a436d87c..e9eedc3651 100644
--- a/components/esm4/loadterm.cpp
+++ b/components/esm4/loadterm.cpp
@@ -32,16 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Terminal::Terminal() : mFormId(0), mFlags(0), mScriptId(0), mPasswordNote(0), mSound(0)
-{
-    mEditorId.clear();
-    mFullName.clear();
-    mText.clear();
-
-    mModel.clear();
-    mResultText.clear();
-}
-
 ESM4::Terminal::~Terminal()
 {
 }
diff --git a/components/esm4/loadterm.hpp b/components/esm4/loadterm.hpp
index 9fb0ee60a8..1b1486d7a2 100644
--- a/components/esm4/loadterm.hpp
+++ b/components/esm4/loadterm.hpp
@@ -53,7 +53,6 @@ namespace ESM4
         FormId mPasswordNote;
         FormId mSound;
 
-        Terminal();
         virtual ~Terminal();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadtree.cpp b/components/esm4/loadtree.cpp
index 7029222758..c70863a51b 100644
--- a/components/esm4/loadtree.cpp
+++ b/components/esm4/loadtree.cpp
@@ -31,13 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Tree::Tree() : mFormId(0), mFlags(0), mBoundRadius(0.f)
-{
-    mEditorId.clear();
-    mModel.clear();
-    mLeafTexture.clear();
-}
-
 ESM4::Tree::~Tree()
 {
 }
diff --git a/components/esm4/loadtree.hpp b/components/esm4/loadtree.hpp
index 2069f93d95..2c88812b46 100644
--- a/components/esm4/loadtree.hpp
+++ b/components/esm4/loadtree.hpp
@@ -49,7 +49,6 @@ namespace ESM4
 
         std::string mLeafTexture;
 
-        Tree();
         virtual ~Tree();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadtxst.cpp b/components/esm4/loadtxst.cpp
index ce281d4848..51f58c9816 100644
--- a/components/esm4/loadtxst.cpp
+++ b/components/esm4/loadtxst.cpp
@@ -32,19 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::TextureSet::TextureSet() : mFormId(0), mFlags(0)
-{
-    mEditorId.clear();
-    mDiffuse.clear();
-    mNormalMap.clear();
-    mEnvMask.clear();
-    mToneMap.clear();
-    mDetailMap.clear();
-    mEnvMap.clear();
-    mUnknown.clear();
-    mSpecular.clear();
-}
-
 ESM4::TextureSet::~TextureSet()
 {
 }
diff --git a/components/esm4/loadtxst.hpp b/components/esm4/loadtxst.hpp
index cc81923e1f..71251c2dcb 100644
--- a/components/esm4/loadtxst.hpp
+++ b/components/esm4/loadtxst.hpp
@@ -53,7 +53,6 @@ namespace ESM4
         std::string mUnknown;
         std::string mSpecular;
 
-        TextureSet();
         virtual ~TextureSet();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadweap.cpp b/components/esm4/loadweap.cpp
index b56e01171c..463496187e 100644
--- a/components/esm4/loadweap.cpp
+++ b/components/esm4/loadweap.cpp
@@ -31,17 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Weapon::Weapon() : mFormId(0), mFlags(0), mPickUpSound(0), mDropSound(0), mBoundRadius(0.f), mScriptId(0),
-                         mEnchantmentPoints(0), mEnchantment(0)
-{
-    mEditorId.clear();
-    mFullName.clear();
-    mModel.clear();
-    mText.clear();
-    mIcon.clear();
-    mMiniIcon.clear();
-}
-
 ESM4::Weapon::~Weapon()
 {
 }
diff --git a/components/esm4/loadweap.hpp b/components/esm4/loadweap.hpp
index dae2da1e7e..7128e26ec9 100644
--- a/components/esm4/loadweap.hpp
+++ b/components/esm4/loadweap.hpp
@@ -83,7 +83,6 @@ namespace ESM4
 
         Data mData;
 
-        Weapon();
         virtual ~Weapon();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadwrld.cpp b/components/esm4/loadwrld.cpp
index ec01556338..ca8e5fd2c5 100644
--- a/components/esm4/loadwrld.cpp
+++ b/components/esm4/loadwrld.cpp
@@ -32,25 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::World::World() : mFormId(0), mFlags(0), mParent(0), mWorldFlags(0), mClimate(0), mWater(0),
-                       mLandLevel(0.f), mWaterLevel(0.f), // -2700.f and -14000.f for TES5
-                       mMinX(0), mMinY(0), mMaxX(0), mMaxY(0), mSound(0), mMusic(0), mParentUseFlags(0)
-{
-    mEditorId.clear();
-    mFullName.clear();
-    mMapFile.clear();
-
-    mMap.width = 0;
-    mMap.height = 0;
-    mMap.NWcellX = 0;
-    mMap.NWcellY = 0;
-    mMap.SEcellX = 0;
-    mMap.SEcellY = 0;
-    mMap.minHeight = 0.f;
-    mMap.maxHeight = 0.f;
-    mMap.initialPitch = 0.f;
-}
-
 ESM4::World::~World()
 {
 }
diff --git a/components/esm4/loadwrld.hpp b/components/esm4/loadwrld.hpp
index 0105dc12f4..5937670daf 100644
--- a/components/esm4/loadwrld.hpp
+++ b/components/esm4/loadwrld.hpp
@@ -126,7 +126,6 @@ namespace ESM4
         std::vector<FormId> mCells;
         std::vector<FormId> mRoads;
 
-        World();
         virtual ~World();
 
         virtual void load(ESM4::Reader& reader);

From 1a15ad216d57d127d2b287c48bbb44e4f6e6596f Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sun, 20 Feb 2022 05:53:57 +0300
Subject: [PATCH 2153/2859] =?UTF-8?q?Increase=20the=20base=20angular=20vel?=
 =?UTF-8?q?ocity=20to=20900=C2=B0/sec=20(#5192)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                         | 1 +
 apps/openmw/mwmechanics/steering.hpp | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ebd3b07e3..a51c785f48 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@
     Bug #5088: Sky abruptly changes direction during certain weather transitions
     Bug #5100: Persuasion doesn't always clamp the resulting disposition
     Bug #5120: Scripted object spawning updates physics system
+    Bug #5192: Actor turn rate is too slow
     Bug #5207: Loose summons can be present in scene
     Bug #5377: console does not appear after using menutest in inventory
     Bug #5379: Wandering NPCs falling through cantons
diff --git a/apps/openmw/mwmechanics/steering.hpp b/apps/openmw/mwmechanics/steering.hpp
index f305a6961c..99fa1387db 100644
--- a/apps/openmw/mwmechanics/steering.hpp
+++ b/apps/openmw/mwmechanics/steering.hpp
@@ -16,9 +16,11 @@ namespace MWMechanics
 // Max rotating speed, radian/sec
 inline float getAngularVelocity(const float actorSpeed)
 {
-    const float baseAngluarVelocity = 10;
+    constexpr float degreesPerFrame = 15.f;
+    constexpr int framesPerSecond = 60;
+    const float baseAngularVelocity = osg::DegreesToRadians(degreesPerFrame * framesPerSecond);
     const float baseSpeed = 200;
-    return baseAngluarVelocity * std::max(actorSpeed / baseSpeed, 1.0f);
+    return baseAngularVelocity * std::max(actorSpeed / baseSpeed, 1.0f);
 }
 
 /// configure rotation settings for an actor to reach this target angle (eventually)

From 595c2e0a8e23391a56a2352f70e6ad739f9ce5b1 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 23 Feb 2022 00:39:30 +0100
Subject: [PATCH 2154/2859] Use unique_ptr to manage AiPackage lifetime

---
 apps/openmw/mwmechanics/aiactivate.cpp |  4 +--
 apps/openmw/mwmechanics/aicombat.cpp   |  4 +--
 apps/openmw/mwmechanics/aiescort.cpp   |  4 +--
 apps/openmw/mwmechanics/aifollow.cpp   |  4 +--
 apps/openmw/mwmechanics/aipursue.cpp   |  4 +--
 apps/openmw/mwmechanics/aisequence.cpp | 20 ++++++------
 apps/openmw/mwmechanics/aitravel.cpp   |  4 +--
 apps/openmw/mwmechanics/aiwander.cpp   |  4 +--
 components/esm3/aisequence.cpp         | 44 +++++++++++---------------
 components/esm3/aisequence.hpp         |  4 +--
 10 files changed, 45 insertions(+), 51 deletions(-)

diff --git a/apps/openmw/mwmechanics/aiactivate.cpp b/apps/openmw/mwmechanics/aiactivate.cpp
index 42cff3642e..c2bcab2297 100644
--- a/apps/openmw/mwmechanics/aiactivate.cpp
+++ b/apps/openmw/mwmechanics/aiactivate.cpp
@@ -52,8 +52,8 @@ namespace MWMechanics
 
         ESM::AiSequence::AiPackageContainer package;
         package.mType = ESM::AiSequence::Ai_Activate;
-        package.mPackage = activate.release();
-        sequence.mPackages.push_back(package);
+        package.mPackage = std::move(activate);
+        sequence.mPackages.push_back(std::move(package));
     }
 
     AiActivate::AiActivate(const ESM::AiSequence::AiActivate *activate)
diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index 83ff795545..231597f9e0 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -460,8 +460,8 @@ namespace MWMechanics
 
         ESM::AiSequence::AiPackageContainer package;
         package.mType = ESM::AiSequence::Ai_Combat;
-        package.mPackage = combat.release();
-        sequence.mPackages.push_back(package);
+        package.mPackage = std::move(combat);
+        sequence.mPackages.push_back(std::move(package));
     }
 
     void AiCombatStorage::startCombatMove(bool isDistantCombat, float distToTarget, float rangeAttack, const MWWorld::Ptr& actor, const MWWorld::Ptr& target)
diff --git a/apps/openmw/mwmechanics/aiescort.cpp b/apps/openmw/mwmechanics/aiescort.cpp
index a1c0bd0471..2e7d55712f 100644
--- a/apps/openmw/mwmechanics/aiescort.cpp
+++ b/apps/openmw/mwmechanics/aiescort.cpp
@@ -109,8 +109,8 @@ namespace MWMechanics
 
         ESM::AiSequence::AiPackageContainer package;
         package.mType = ESM::AiSequence::Ai_Escort;
-        package.mPackage = escort.release();
-        sequence.mPackages.push_back(package);
+        package.mPackage = std::move(escort);
+        sequence.mPackages.push_back(std::move(package));
     }
 
     void AiEscort::fastForward(const MWWorld::Ptr& actor, AiState &state)
diff --git a/apps/openmw/mwmechanics/aifollow.cpp b/apps/openmw/mwmechanics/aifollow.cpp
index cdb8ac8c1d..9444303821 100644
--- a/apps/openmw/mwmechanics/aifollow.cpp
+++ b/apps/openmw/mwmechanics/aifollow.cpp
@@ -217,8 +217,8 @@ void AiFollow::writeState(ESM::AiSequence::AiSequence &sequence) const
 
     ESM::AiSequence::AiPackageContainer package;
     package.mType = ESM::AiSequence::Ai_Follow;
-    package.mPackage = follow.release();
-    sequence.mPackages.push_back(package);
+    package.mPackage = std::move(follow);
+    sequence.mPackages.push_back(std::move(package));
 }
 
 int AiFollow::getFollowIndex() const
diff --git a/apps/openmw/mwmechanics/aipursue.cpp b/apps/openmw/mwmechanics/aipursue.cpp
index 3343b3cec0..252bff58f8 100644
--- a/apps/openmw/mwmechanics/aipursue.cpp
+++ b/apps/openmw/mwmechanics/aipursue.cpp
@@ -81,8 +81,8 @@ void AiPursue::writeState(ESM::AiSequence::AiSequence &sequence) const
 
     ESM::AiSequence::AiPackageContainer package;
     package.mType = ESM::AiSequence::Ai_Pursue;
-    package.mPackage = pursue.release();
-    sequence.mPackages.push_back(package);
+    package.mPackage = std::move(pursue);
+    sequence.mPackages.push_back(std::move(package));
 }
 
 } // namespace MWMechanics
diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index bf01936f90..c59b3e39fe 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -498,41 +498,41 @@ void AiSequence::readState(const ESM::AiSequence::AiSequence &sequence)
         {
         case ESM::AiSequence::Ai_Wander:
         {
-            package.reset(new AiWander(static_cast<ESM::AiSequence::AiWander*>(container.mPackage)));
+            package.reset(new AiWander(&static_cast<const ESM::AiSequence::AiWander&>(*container.mPackage)));
             break;
         }
         case ESM::AiSequence::Ai_Travel:
         {
-            const auto source = static_cast<const ESM::AiSequence::AiTravel*>(container.mPackage);
-            if (source->mHidden)
-                package.reset(new AiInternalTravel(source));
+            const ESM::AiSequence::AiTravel& source = static_cast<const ESM::AiSequence::AiTravel&>(*container.mPackage);
+            if (source.mHidden)
+                package.reset(new AiInternalTravel(&source));
             else
-                package.reset(new AiTravel(source));
+                package.reset(new AiTravel(&source));
             break;
         }
         case ESM::AiSequence::Ai_Escort:
         {
-            package.reset(new AiEscort(static_cast<ESM::AiSequence::AiEscort*>(container.mPackage)));
+            package.reset(new AiEscort(&static_cast<const ESM::AiSequence::AiEscort&>(*container.mPackage)));
             break;
         }
         case ESM::AiSequence::Ai_Follow:
         {
-            package.reset(new AiFollow(static_cast<ESM::AiSequence::AiFollow*>(container.mPackage)));
+            package.reset(new AiFollow(&static_cast<const ESM::AiSequence::AiFollow&>(*container.mPackage)));
             break;
         }
         case ESM::AiSequence::Ai_Activate:
         {
-            package.reset(new AiActivate(static_cast<ESM::AiSequence::AiActivate*>(container.mPackage)));
+            package.reset(new AiActivate(&static_cast<const ESM::AiSequence::AiActivate&>(*container.mPackage)));
             break;
         }
         case ESM::AiSequence::Ai_Combat:
         {
-            package.reset(new AiCombat(static_cast<ESM::AiSequence::AiCombat*>(container.mPackage)));
+            package.reset(new AiCombat(&static_cast<const ESM::AiSequence::AiCombat&>(*container.mPackage)));
             break;
         }
         case ESM::AiSequence::Ai_Pursue:
         {
-            package.reset(new AiPursue(static_cast<ESM::AiSequence::AiPursue*>(container.mPackage)));
+            package.reset(new AiPursue(&static_cast<const ESM::AiSequence::AiPursue&>(*container.mPackage)));
             break;
         }
         default:
diff --git a/apps/openmw/mwmechanics/aitravel.cpp b/apps/openmw/mwmechanics/aitravel.cpp
index d420771bd4..4a2df475f4 100644
--- a/apps/openmw/mwmechanics/aitravel.cpp
+++ b/apps/openmw/mwmechanics/aitravel.cpp
@@ -129,8 +129,8 @@ namespace MWMechanics
 
         ESM::AiSequence::AiPackageContainer package;
         package.mType = ESM::AiSequence::Ai_Travel;
-        package.mPackage = travel.release();
-        sequence.mPackages.push_back(package);
+        package.mPackage = std::move(travel);
+        sequence.mPackages.push_back(std::move(package));
     }
 
     AiInternalTravel::AiInternalTravel(float x, float y, float z)
diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index c2f0beb179..c63a4c0270 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -888,8 +888,8 @@ namespace MWMechanics
 
         ESM::AiSequence::AiPackageContainer package;
         package.mType = ESM::AiSequence::Ai_Wander;
-        package.mPackage = wander.release();
-        sequence.mPackages.push_back(package);
+        package.mPackage = std::move(wander);
+        sequence.mPackages.push_back(std::move(package));
     }
 
     AiWander::AiWander (const ESM::AiSequence::AiWander* wander)
diff --git a/components/esm3/aisequence.cpp b/components/esm3/aisequence.cpp
index b99cac3ade..a9670a598d 100644
--- a/components/esm3/aisequence.cpp
+++ b/components/esm3/aisequence.cpp
@@ -152,12 +152,6 @@ namespace AiSequence
         esm.writeHNT ("TARG", mTargetActorId);
     }
 
-    AiSequence::~AiSequence()
-    {
-        for (std::vector<AiPackageContainer>::iterator it = mPackages.begin(); it != mPackages.end(); ++it)
-            delete it->mPackage;
-    }
-
     void AiSequence::save(ESMWriter &esm) const
     {
         for (std::vector<AiPackageContainer>::const_iterator it = mPackages.begin(); it != mPackages.end(); ++it)
@@ -166,25 +160,25 @@ namespace AiSequence
             switch (it->mType)
             {
             case Ai_Wander:
-                static_cast<const AiWander*>(it->mPackage)->save(esm);
+                static_cast<const AiWander&>(*it->mPackage).save(esm);
                 break;
             case Ai_Travel:
-                static_cast<const AiTravel*>(it->mPackage)->save(esm);
+                static_cast<const AiTravel&>(*it->mPackage).save(esm);
                 break;
             case Ai_Escort:
-                static_cast<const AiEscort*>(it->mPackage)->save(esm);
+                static_cast<const AiEscort&>(*it->mPackage).save(esm);
                 break;
             case Ai_Follow:
-                static_cast<const AiFollow*>(it->mPackage)->save(esm);
+                static_cast<const AiFollow&>(*it->mPackage).save(esm);
                 break;
             case Ai_Activate:
-                static_cast<const AiActivate*>(it->mPackage)->save(esm);
+                static_cast<const AiActivate&>(*it->mPackage).save(esm);
                 break;
             case Ai_Combat:
-                static_cast<const AiCombat*>(it->mPackage)->save(esm);
+                static_cast<const AiCombat&>(*it->mPackage).save(esm);
                 break;
             case Ai_Pursue:
-                static_cast<const AiPursue*>(it->mPackage)->save(esm);
+                static_cast<const AiPursue&>(*it->mPackage).save(esm);
                 break;
 
             default:
@@ -212,7 +206,7 @@ namespace AiSequence
             {
                 std::unique_ptr<AiWander> ptr = std::make_unique<AiWander>();
                 ptr->load(esm);
-                mPackages.back().mPackage = ptr.release();
+                mPackages.back().mPackage = std::move(ptr);
                 ++count;
                 break;
             }
@@ -220,7 +214,7 @@ namespace AiSequence
             {
                 std::unique_ptr<AiTravel> ptr = std::make_unique<AiTravel>();
                 ptr->load(esm);
-                mPackages.back().mPackage = ptr.release();
+                mPackages.back().mPackage = std::move(ptr);
                 ++count;
                 break;
             }
@@ -228,7 +222,7 @@ namespace AiSequence
             {
                 std::unique_ptr<AiEscort> ptr = std::make_unique<AiEscort>();
                 ptr->load(esm);
-                mPackages.back().mPackage = ptr.release();
+                mPackages.back().mPackage = std::move(ptr);
                 ++count;
                 break;
             }
@@ -236,7 +230,7 @@ namespace AiSequence
             {
                 std::unique_ptr<AiFollow> ptr = std::make_unique<AiFollow>();
                 ptr->load(esm);
-                mPackages.back().mPackage = ptr.release();
+                mPackages.back().mPackage = std::move(ptr);
                 ++count;
                 break;
             }
@@ -244,7 +238,7 @@ namespace AiSequence
             {
                 std::unique_ptr<AiActivate> ptr = std::make_unique<AiActivate>();
                 ptr->load(esm);
-                mPackages.back().mPackage = ptr.release();
+                mPackages.back().mPackage = std::move(ptr);
                 ++count;
                 break;
             }
@@ -252,14 +246,14 @@ namespace AiSequence
             {
                 std::unique_ptr<AiCombat> ptr = std::make_unique<AiCombat>();
                 ptr->load(esm);
-                mPackages.back().mPackage = ptr.release();
+                mPackages.back().mPackage = std::move(ptr);
                 break;
             }
             case Ai_Pursue:
             {
                 std::unique_ptr<AiPursue> ptr = std::make_unique<AiPursue>();
                 ptr->load(esm);
-                mPackages.back().mPackage = ptr.release();
+                mPackages.back().mPackage = std::move(ptr);
                 break;
             }
             default:
@@ -274,15 +268,15 @@ namespace AiSequence
             for(auto& pkg : mPackages)
             {
                 if(pkg.mType == Ai_Wander)
-                    static_cast<AiWander*>(pkg.mPackage)->mData.mShouldRepeat = true;
+                    static_cast<AiWander&>(*pkg.mPackage).mData.mShouldRepeat = true;
                 else if(pkg.mType == Ai_Travel)
-                    static_cast<AiTravel*>(pkg.mPackage)->mRepeat = true;
+                    static_cast<AiTravel&>(*pkg.mPackage).mRepeat = true;
                 else if(pkg.mType == Ai_Escort)
-                    static_cast<AiEscort*>(pkg.mPackage)->mRepeat = true;
+                    static_cast<AiEscort&>(*pkg.mPackage).mRepeat = true;
                 else if(pkg.mType == Ai_Follow)
-                    static_cast<AiFollow*>(pkg.mPackage)->mRepeat = true;
+                    static_cast<AiFollow&>(*pkg.mPackage).mRepeat = true;
                 else if(pkg.mType == Ai_Activate)
-                    static_cast<AiActivate*>(pkg.mPackage)->mRepeat = true;
+                    static_cast<AiActivate&>(*pkg.mPackage).mRepeat = true;
             }
         }
     }
diff --git a/components/esm3/aisequence.hpp b/components/esm3/aisequence.hpp
index b5a003678b..3dcecc1cb0 100644
--- a/components/esm3/aisequence.hpp
+++ b/components/esm3/aisequence.hpp
@@ -3,6 +3,7 @@
 
 #include <vector>
 #include <string>
+#include <memory>
 
 #include "components/esm/defs.hpp"
 
@@ -149,7 +150,7 @@ namespace ESM
     {
         int mType;
 
-        AiPackage* mPackage;
+        std::unique_ptr<AiPackage> mPackage;
     };
 
     struct AiSequence
@@ -158,7 +159,6 @@ namespace ESM
         {
             mLastAiPackage = -1;
         }
-        ~AiSequence();
 
         std::vector<AiPackageContainer> mPackages;
         int mLastAiPackage;

From b6bddbfae22b63f9ce4b008c11cc88df8b8f0c24 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 23 Feb 2022 01:56:55 +0100
Subject: [PATCH 2155/2859] Support regexp_match for hist_threshold and hist

---
 scripts/osg_stats.py | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/scripts/osg_stats.py b/scripts/osg_stats.py
index 275e70dcff..d74df94a5c 100755
--- a/scripts/osg_stats.py
+++ b/scripts/osg_stats.py
@@ -19,7 +19,8 @@ import re
 @click.option('--print_keys', is_flag=True,
               help='Print a list of all present keys in the input file.')
 @click.option('--regexp_match', is_flag=True,
-              help='Use all metric that match given key. Can be used with stats and timeseries.')
+              help='Use all metric that match given key. '
+                   'Can be used with stats, timeseries, commulative_timeseries, hist, hist_threshold')
 @click.option('--timeseries', type=str, multiple=True,
               help='Show a graph for given metric over time.')
 @click.option('--commulative_timeseries', type=str, multiple=True,
@@ -72,14 +73,18 @@ def main(print_keys, regexp_match, timeseries, hist, hist_ratio, stdev_hist, plo
     if print_keys:
         for v in keys:
             print(v)
+    def matching_keys(patterns):
+        if regexp_match:
+            return [key for pattern in patterns for key in keys if re.search(pattern, key)]
+        return keys
     if timeseries:
-        draw_timeseries(sources=frames, keys=matching_keys(keys, timeseries, regexp_match), add_sum=timeseries_sum,
+        draw_timeseries(sources=frames, keys=matching_keys(timeseries), add_sum=timeseries_sum,
                         begin_frame=begin_frame, end_frame=end_frame)
     if commulative_timeseries:
-        draw_commulative_timeseries(sources=frames, keys=matching_keys(keys, commulative_timeseries, regexp_match), add_sum=commulative_timeseries_sum,
+        draw_commulative_timeseries(sources=frames, keys=matching_keys(commulative_timeseries), add_sum=commulative_timeseries_sum,
                                     begin_frame=begin_frame, end_frame=end_frame)
     if hist:
-        draw_hists(sources=frames, keys=hist)
+        draw_hists(sources=frames, keys=matching_keys(hist))
     if hist_ratio:
         draw_hist_ratio(sources=frames, pairs=hist_ratio)
     if stdev_hist:
@@ -87,9 +92,9 @@ def main(print_keys, regexp_match, timeseries, hist, hist_ratio, stdev_hist, plo
     if plot:
         draw_plots(sources=frames, plots=plot)
     if stats:
-        print_stats(sources=frames, keys=matching_keys(keys, stats, regexp_match), stats_sum=stats_sum, precision=precision)
+        print_stats(sources=frames, keys=matching_keys(stats), stats_sum=stats_sum, precision=precision)
     if hist_threshold:
-        draw_hist_threshold(sources=frames, keys=hist_threshold, begin_frame=begin_frame,
+        draw_hist_threshold(sources=frames, keys=matching_keys(hist_threshold), begin_frame=begin_frame,
                             threshold_name=threshold_name, threshold_value=threshold_value)
     matplotlib.pyplot.show()
 
@@ -145,12 +150,6 @@ def collect_unique_keys(sources):
     return sorted(result)
 
 
-def matching_keys(keys, patterns, regexp_match):
-    if regexp_match:
-        return { key for pattern in patterns for key in keys if re.search(pattern, key) }
-    return keys
-
-
 def draw_timeseries(sources, keys, add_sum, begin_frame, end_frame):
     fig, ax = matplotlib.pyplot.subplots()
     x = numpy.array(range(begin_frame, end_frame))

From 5f71afa274a896a568b206593906dbefad48df86 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 23 Feb 2022 01:57:37 +0100
Subject: [PATCH 2156/2859] Fix matlab deprecation warning

scripts/osg_stats.py:163: MatplotlibDeprecationWarning:
The set_window_title function was deprecated in Matplotlib 3.4 and will be removed two minor releases later. Use manager.set_window_title or GUI-specific methods instead.
  fig.canvas.set_window_title('timeseries')
---
 scripts/osg_stats.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/osg_stats.py b/scripts/osg_stats.py
index d74df94a5c..cc4314cd04 100755
--- a/scripts/osg_stats.py
+++ b/scripts/osg_stats.py
@@ -160,7 +160,7 @@ def draw_timeseries(sources, keys, add_sum, begin_frame, end_frame):
             ax.plot(x, numpy.sum(list(frames[k] for k in keys), axis=0), label=f'sum:{name}')
     ax.grid(True)
     ax.legend()
-    fig.canvas.set_window_title('timeseries')
+    fig.canvas.manager.set_window_title('timeseries')
 
 
 def draw_commulative_timeseries(sources, keys, add_sum, begin_frame, end_frame):
@@ -173,7 +173,7 @@ def draw_commulative_timeseries(sources, keys, add_sum, begin_frame, end_frame):
             ax.plot(x, numpy.cumsum(numpy.sum(list(frames[k] for k in keys), axis=0)), label=f'sum:{name}')
     ax.grid(True)
     ax.legend()
-    fig.canvas.set_window_title('commulative_timeseries')
+    fig.canvas.manager.set_window_title('commulative_timeseries')
 
 
 def draw_hists(sources, keys):
@@ -189,7 +189,7 @@ def draw_hists(sources, keys):
     ax.set_xticks(bins)
     ax.grid(True)
     ax.legend()
-    fig.canvas.set_window_title('hists')
+    fig.canvas.manager.set_window_title('hists')
 
 
 def draw_hist_ratio(sources, pairs):
@@ -205,7 +205,7 @@ def draw_hist_ratio(sources, pairs):
     ax.set_xticks(bins)
     ax.grid(True)
     ax.legend()
-    fig.canvas.set_window_title('hists_ratio')
+    fig.canvas.manager.set_window_title('hists_ratio')
 
 
 def draw_stdev_hists(sources, stdev_hists):
@@ -224,7 +224,7 @@ def draw_stdev_hists(sources, stdev_hists):
         ax.set_xticks(bins)
         ax.grid(True)
         ax.legend()
-        fig.canvas.set_window_title('stdev_hists')
+        fig.canvas.manager.set_window_title('stdev_hists')
 
 
 def draw_plots(sources, plots):
@@ -249,7 +249,7 @@ def draw_plots(sources, plots):
                 )
     ax.grid(True)
     ax.legend()
-    fig.canvas.set_window_title('plots')
+    fig.canvas.manager.set_window_title('plots')
 
 
 def print_stats(sources, keys, stats_sum, precision):
@@ -285,7 +285,7 @@ def draw_hist_threshold(sources, keys, begin_frame, threshold_name, threshold_va
         ax.xaxis.set_major_formatter(matplotlib.pyplot.FixedFormatter(numbers))
         ax.grid(True)
         ax.legend()
-        fig.canvas.set_window_title(f'hist_threshold:{name}')
+        fig.canvas.manager.set_window_title(f'hist_threshold:{name}')
 
 
 def filter_not_none(values):

From fdd9e6a79386d498a8ae2bca45567feb30e75a6e Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Wed, 23 Feb 2022 10:10:50 +0300
Subject: [PATCH 2157/2859] Always reduce weapon condition by the raw damage
 (bug #6559)

---
 CHANGELOG.md                       |  1 +
 apps/openmw/mwclass/creature.cpp   |  2 +-
 apps/openmw/mwclass/npc.cpp        |  2 +-
 apps/openmw/mwmechanics/combat.cpp | 18 +++++++++++-------
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ebd3b07e3..0e98247686 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -101,6 +101,7 @@
     Bug #6519: Effects tooltips for ingredients work incorrectly
     Bug #6523: Disintegrate Weapon is resisted by Resist Magicka instead of Sanctuary
     Bug #6544: Far from world origin objects jitter when camera is still
+    Bug #6559: Weapon condition inconsistency between melee and ranged critical / sneak / KO attacks
     Bug #6579: OpenMW compilation error when using OSG doubles for BoundingSphere
     Feature #890: OpenMW-CS: Column filtering
     Feature #1465: "Reset" argument for AI functions
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index ba13f5f6d9..49b3627952 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -305,8 +305,8 @@ namespace MWClass
             {
                 damage = attack[0] + ((attack[1]-attack[0])*attackStrength);
                 MWMechanics::adjustWeaponDamage(damage, weapon, ptr);
-                MWMechanics::resistNormalWeapon(victim, ptr, weapon, damage);
                 MWMechanics::reduceWeaponCondition(damage, true, weapon, ptr);
+                MWMechanics::resistNormalWeapon(victim, ptr, weapon, damage);
             }
 
             // Apply "On hit" enchanted weapons
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 4cf191de9c..bfae090545 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -607,9 +607,9 @@ namespace MWClass
                 damage  = attack[0] + ((attack[1]-attack[0])*attackStrength);
             }
             MWMechanics::adjustWeaponDamage(damage, weapon, ptr);
+            MWMechanics::reduceWeaponCondition(damage, true, weapon, ptr);
             MWMechanics::resistNormalWeapon(victim, ptr, weapon, damage);
             MWMechanics::applyWerewolfDamageMult(victim, weapon, damage);
-            MWMechanics::reduceWeaponCondition(damage, true, weapon, ptr);
             healthdmg = true;
         }
         else
diff --git a/apps/openmw/mwmechanics/combat.cpp b/apps/openmw/mwmechanics/combat.cpp
index 2962a25ede..0eccd6688c 100644
--- a/apps/openmw/mwmechanics/combat.cpp
+++ b/apps/openmw/mwmechanics/combat.cpp
@@ -200,17 +200,17 @@ namespace MWMechanics
 
         bool validVictim = !victim.isEmpty() && victim.getClass().isActor();
 
+        int weaponSkill = ESM::Skill::Marksman;
+        if (!weapon.isEmpty())
+            weaponSkill = weapon.getClass().getEquipmentSkill(weapon);
+
         float damage = 0.f;
         if (validVictim)
         {
             if (attacker == getPlayer())
                 MWBase::Environment::get().getWindowManager()->setEnemy(victim);
 
-            int weaponSkill = ESM::Skill::Marksman;
-            if (!weapon.isEmpty())
-                weaponSkill = weapon.getClass().getEquipmentSkill(weapon);
-
-            int skillValue = attacker.getClass().getSkill(attacker, weapon.getClass().getEquipmentSkill(weapon));
+            int skillValue = attacker.getClass().getSkill(attacker, weaponSkill);
 
             if (Misc::Rng::roll0to99() >= getHitChance(attacker, victim, skillValue))
             {
@@ -228,6 +228,12 @@ namespace MWMechanics
             damage += attack[0] + ((attack[1] - attack[0]) * attackStrength);
 
             adjustWeaponDamage(damage, weapon, attacker);
+        }
+
+        reduceWeaponCondition(damage, validVictim, weapon, attacker);
+
+        if (validVictim)
+        {
             if (weapon == projectile || Settings::Manager::getBool("only appropriate ammunition bypasses resistance", "Game") || isNormalWeapon(weapon))
                 resistNormalWeapon(victim, attacker, projectile, damage);
             applyWerewolfDamageMult(victim, projectile, damage);
@@ -247,8 +253,6 @@ namespace MWMechanics
             }
         }
 
-        reduceWeaponCondition(damage, validVictim, weapon, attacker);
-
         // Apply "On hit" effect of the projectile
         bool appliedEnchantment = applyOnStrikeEnchantment(attacker, victim, projectile, hitPosition, true);
 

From 3c66a927d83575522ecd1dfd8828e3ea3db8eff5 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 23 Feb 2022 20:06:29 +0100
Subject: [PATCH 2158/2859] Fix coverity issue about uninitialized members of
 LevelledListBase

* Remove explicit constructor.
* Use static constexpr where possible.
* Use CRTP to get RecName.
---
 components/esm3/loadlevlist.cpp | 12 ++++--------
 components/esm3/loadlevlist.hpp | 34 +++++++++++++++++----------------
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/components/esm3/loadlevlist.cpp b/components/esm3/loadlevlist.cpp
index 1de278761b..2aa209fadb 100644
--- a/components/esm3/loadlevlist.cpp
+++ b/components/esm3/loadlevlist.cpp
@@ -6,7 +6,7 @@
 
 namespace ESM
 {
-    void LevelledListBase::load(ESMReader &esm, bool &isDeleted)
+    void LevelledListBase::load(ESMReader& esm, ESM::NAME recName, bool& isDeleted)
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
@@ -43,7 +43,7 @@ namespace ESM
                     for (size_t i = 0; i < mList.size(); i++)
                     {
                         LevelItem &li = mList[i];
-                        li.mId = esm.getHNString(mRecName);
+                        li.mId = esm.getHNString(recName);
                         esm.getHNT(li.mLevel, "INTV");
                     }
 
@@ -75,7 +75,7 @@ namespace ESM
             esm.fail("Missing NAME subrecord");
     }
 
-    void LevelledListBase::save(ESMWriter &esm, bool isDeleted) const
+    void LevelledListBase::save(ESMWriter& esm, ESM::NAME recName, bool isDeleted) const
     {
         esm.writeHNCString("NAME", mId);
 
@@ -91,7 +91,7 @@ namespace ESM
 
         for (std::vector<LevelItem>::const_iterator it = mList.begin(); it != mList.end(); ++it)
         {
-            esm.writeHNCString(mRecName, it->mId);
+            esm.writeHNCString(recName, it->mId);
             esm.writeHNT("INTV", it->mLevel);
         }
     }
@@ -102,8 +102,4 @@ namespace ESM
         mChanceNone = 0;
         mList.clear();
     }
-
-    unsigned int CreatureLevList::sRecordId = REC_LEVC;
-
-    unsigned int ItemLevList::sRecordId = REC_LEVI;
 }
diff --git a/components/esm3/loadlevlist.hpp b/components/esm3/loadlevlist.hpp
index aea85b20e0..3e75ad7c70 100644
--- a/components/esm3/loadlevlist.hpp
+++ b/components/esm3/loadlevlist.hpp
@@ -5,6 +5,7 @@
 #include <vector>
 
 #include <components/esm/esmcommon.hpp>
+#include <components/esm/defs.hpp>
 
 namespace ESM
 {
@@ -27,10 +28,6 @@ struct LevelledListBase
     unsigned int mRecordFlags;
     std::string mId;
 
-    // Record name used to read references. Must be set before load() is
-    // called.
-    ESM::NAME mRecName;
-
     struct LevelItem
     {
         std::string mId;
@@ -39,18 +36,25 @@ struct LevelledListBase
 
     std::vector<LevelItem> mList;
 
-    explicit LevelledListBase(ESM::NAME recName) : mRecName(recName) {}
-
-    void load(ESMReader &esm, bool &isDeleted);
-    void save(ESMWriter &esm, bool isDeleted = false) const;
+    void load(ESMReader& esm, ESM::NAME recName, bool& isDeleted);
+    void save(ESMWriter& esm, ESM::NAME recName, bool isDeleted) const;
 
     void blank();
     ///< Set record to default state (does not touch the ID).
 };
 
-struct CreatureLevList: LevelledListBase
+template <class Base>
+struct CustomLevelledListBase : LevelledListBase
 {
-    static unsigned int sRecordId;
+    void load(ESMReader &esm, bool& isDeleted) { LevelledListBase::load(esm, Base::sRecName, isDeleted); }
+    void save(ESMWriter &esm, bool isDeleted = false) const { LevelledListBase::save(esm, Base::sRecName, isDeleted); }
+};
+
+struct CreatureLevList : CustomLevelledListBase<CreatureLevList>
+{
+    /// Record name used to read references.
+    static constexpr ESM::NAME sRecName {"CNAM"};
+    static constexpr RecNameInts sRecordId = RecNameInts::REC_LEVC;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "CreatureLevList"; }
 
@@ -61,13 +65,13 @@ struct CreatureLevList: LevelledListBase
                           // level, not just the closest below
                           // player.
     };
-
-    CreatureLevList() : LevelledListBase("CNAM") {}
 };
 
-struct ItemLevList: LevelledListBase
+struct ItemLevList : CustomLevelledListBase<ItemLevList>
 {
-    static unsigned int sRecordId;
+    /// Record name used to read references.
+    static constexpr ESM::NAME sRecName {"INAM"};
+    static constexpr RecNameInts sRecordId = RecNameInts::REC_LEVI;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "ItemLevList"; }
 
@@ -84,8 +88,6 @@ struct ItemLevList: LevelledListBase
                           // level, not just the closest below
                           // player.
     };
-
-    ItemLevList() : LevelledListBase("INAM") {}
 };
 
 }

From c0f095a4626b7269be32c5a54064633bcb819278 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Wed, 23 Feb 2022 22:02:28 +0100
Subject: [PATCH 2159/2859] Fix typos

---
 docs/source/reference/lua-scripting/overview.rst       | 2 +-
 docs/source/reference/lua-scripting/user_interface.rst | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/source/reference/lua-scripting/overview.rst b/docs/source/reference/lua-scripting/overview.rst
index e07abee899..8fa255bac0 100644
--- a/docs/source/reference/lua-scripting/overview.rst
+++ b/docs/source/reference/lua-scripting/overview.rst
@@ -150,7 +150,7 @@ The order of lines determines the script load order (i.e. script priorities).
 
 Possible flags are:
 
-- ``GLOBAL`` - a global script; always active, can not by stopped;
+- ``GLOBAL`` - a global script; always active, can not be stopped;
 - ``CUSTOM`` - dynamic local script that can be started or stopped by a global script;
 - ``PLAYER`` - an auto started player script;
 - ``ACTIVATOR`` - a local script that will be automatically attached to any activator;
diff --git a/docs/source/reference/lua-scripting/user_interface.rst b/docs/source/reference/lua-scripting/user_interface.rst
index bb4a3a3d53..e00aa8bf63 100644
--- a/docs/source/reference/lua-scripting/user_interface.rst
+++ b/docs/source/reference/lua-scripting/user_interface.rst
@@ -23,7 +23,7 @@ Every widget is defined by a layout, which is a Lua table with the following fie
 
 Layers
 ------
-Layers control how widgets overlap - layers with higher indexes cover render over layers with lower indexes.
+Layers control how widgets overlap - layers with higher indexes render over layers with lower indexes.
 Widgets within the same layer which were added later overlap the ones created earlier.
 A layer can also be set as non-interactive, which prevents all mouse interactions with the widgets in that layer.
 
@@ -120,7 +120,7 @@ Example
   end
 
   -- we are showing game time in hours and minutes
-  -- so no need to update more often than ones a game minute
+  -- so no need to update more often than once a game minute
   time.runRepeatedly(updateTime, 1 * time.minute, { type = time.GameTime })
 
 *clock.omwscripts*

From 4a0b7846993b439b7925f619b6c31e7d5c195539 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Wed, 23 Feb 2022 22:08:50 +0100
Subject: [PATCH 2160/2859] Use reasonable Luadoc comment headers

---
 files/lua_api/openmw/async.lua  | 14 +++---
 files/lua_api/openmw/camera.lua | 60 +++++++++++------------
 files/lua_api/openmw/core.lua   | 84 ++++++++++++++++-----------------
 files/lua_api/openmw/input.lua  | 54 ++++++++++-----------
 files/lua_api/openmw/nearby.lua | 22 ++++-----
 files/lua_api/openmw/query.lua  | 42 ++++++++---------
 files/lua_api/openmw/self.lua   | 12 ++---
 files/lua_api/openmw/world.lua  | 22 ++++-----
 8 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/files/lua_api/openmw/async.lua b/files/lua_api/openmw/async.lua
index 61d5763a0b..64080ed96a 100644
--- a/files/lua_api/openmw/async.lua
+++ b/files/lua_api/openmw/async.lua
@@ -1,4 +1,4 @@
--------------------------------------------------------------------------------
+---
 -- `openmw.async` contains timers and coroutine utils. All functions require
 -- the package itself as a first argument.
 -- @module async
@@ -6,7 +6,7 @@
 
 
 
--------------------------------------------------------------------------------
+---
 -- Register a function as a timer callback.
 -- @function [parent=#async] registerTimerCallback
 -- @param self
@@ -14,7 +14,7 @@
 -- @param #function func
 -- @return #TimerCallback
 
--------------------------------------------------------------------------------
+---
 -- Calls callback(arg) in `delay` simulation seconds.
 -- Callback must be registered in advance.
 -- @function [parent=#async] newSimulationTimer
@@ -23,7 +23,7 @@
 -- @param #TimerCallback callback A callback returned by `registerTimerCallback`
 -- @param arg An argument for `callback`; can be `nil`.
 
--------------------------------------------------------------------------------
+---
 -- Calls callback(arg) in `delay` game seconds.
 -- Callback must be registered in advance.
 -- @function [parent=#async] newGameTimer
@@ -32,7 +32,7 @@
 -- @param #TimerCallback callback A callback returned by `registerTimerCallback`
 -- @param arg An argument for `callback`; can be `nil`.
 
--------------------------------------------------------------------------------
+---
 -- Calls `func()` in `delay` simulation seconds.
 -- The timer will be lost if the game is saved and loaded.
 -- @function [parent=#async] newUnsavableSimulationTimer
@@ -40,7 +40,7 @@
 -- @param #number delay
 -- @param #function func
 
--------------------------------------------------------------------------------
+---
 -- Calls `func()` in `delay` game seconds.
 -- The timer will be lost if the game is saved and loaded.
 -- @function [parent=#async] newUnsavableGameTimer
@@ -48,7 +48,7 @@
 -- @param #number delay
 -- @param #function func
 
--------------------------------------------------------------------------------
+---
 -- Wraps Lua function with `Callback` object that can be used in async API calls.
 -- @function [parent=#async] callback
 -- @param self
diff --git a/files/lua_api/openmw/camera.lua b/files/lua_api/openmw/camera.lua
index 0d72214414..1d09bdf7ad 100644
--- a/files/lua_api/openmw/camera.lua
+++ b/files/lua_api/openmw/camera.lua
@@ -1,11 +1,11 @@
--------------------------------------------------------------------------------
+---
 -- `openmw.camera` controls camera.
 -- Can be used only by player scripts.
 -- @module camera
 -- @usage local camera = require('openmw.camera')
 
 
--------------------------------------------------------------------------------
+---
 -- @type MODE Camera modes.
 -- @field #number Static Camera doesn't track player; player inputs doesn't affect camera; use `setStaticPosition` to move the camera.
 -- @field #number FirstPerson First person mode.
@@ -13,126 +13,126 @@
 -- @field #number Vanity Similar to Preview; camera slowly moves around the player.
 -- @field #number Preview Third person mode, but player character doesn't turn to the view direction.
 
--------------------------------------------------------------------------------
+---
 -- Camera modes.
 -- @field [parent=#camera] #MODE MODE
 
--------------------------------------------------------------------------------
+---
 -- Return the current @{openmw.camera#MODE}.
 -- @function [parent=#camera] getMode
 -- @return #MODE
 
--------------------------------------------------------------------------------
+---
 -- Return the mode the camera will switch to after the end of the current animation. Can be nil.
 -- @function [parent=#camera] getQueuedMode
 -- @return #MODE
 
--------------------------------------------------------------------------------
+---
 -- Change @{openmw.camera#MODE}; if the second (optional, true by default) argument is set to false, the switching can be delayed (see `getQueuedMode`).
 -- @function [parent=#camera] setMode
 -- @param #MODE mode
 -- @param #boolean force
 
--------------------------------------------------------------------------------
+---
 -- If set to true then after switching from Preview to ThirdPerson the player character turns to the camera view direction. Otherwise the camera turns to the character view direction.
 -- @function [parent=#camera] allowCharacterDeferredRotation
 -- @param #boolean boolValue
 
--------------------------------------------------------------------------------
+---
 -- Show/hide crosshair.
 -- @function [parent=#camera] showCrosshair
 -- @param #boolean boolValue
 
--------------------------------------------------------------------------------
+---
 -- Current position of the tracked object (the characters head if there is no animation).
 -- @function [parent=#camera] getTrackedPosition
 -- @return openmw.util#Vector3
 
--------------------------------------------------------------------------------
+---
 -- Current position of the camera.
 -- @function [parent=#camera] getPosition
 -- @return openmw.util#Vector3
 
--------------------------------------------------------------------------------
+---
 -- Camera pitch angle (radians) without taking extraPitch into account.
 -- Full pitch is `getPitch()+getExtraPitch()`.
 -- @function [parent=#camera] getPitch
 -- @return #number
 
--------------------------------------------------------------------------------
+---
 -- Force the pitch angle to the given value (radians); player input on this axis is ignored in this frame.
 -- @function [parent=#camera] setPitch
 -- @param #number value
 
--------------------------------------------------------------------------------
+---
 -- Camera yaw angle (radians) without taking extraYaw into account.
 -- Full yaw is `getYaw()+getExtraYaw()`.
 -- @function [parent=#camera] getYaw
 -- @return #number
 
--------------------------------------------------------------------------------
+---
 -- Force the yaw angle to the given value (radians); player input on this axis is ignored in this frame.
 -- @function [parent=#camera] setYaw
 -- @param #number value
 
--------------------------------------------------------------------------------
+---
 -- Get camera roll angle (radians).
 -- @function [parent=#camera] getRoll
 -- @return #number
 
--------------------------------------------------------------------------------
+---
 -- Set camera roll angle (radians).
 -- @function [parent=#camera] setRoll
 -- @param #number value
 
--------------------------------------------------------------------------------
+---
 -- Additional summand for the pitch angle that is not affected by player input.
 -- Full pitch is `getPitch()+getExtraPitch()`.
 -- @function [parent=#camera] getExtraPitch
 -- @return #number
 
--------------------------------------------------------------------------------
+---
 -- Additional summand for the pitch angle; useful for camera shaking effects.
 -- Setting extra pitch doesn't block player input.
 -- Full pitch is `getPitch()+getExtraPitch()`.
 -- @function [parent=#camera] setExtraPitch
 -- @param #number value
 
--------------------------------------------------------------------------------
+---
 -- Additional summand for the yaw angle that is not affected by player input.
 -- Full yaw is `getYaw()+getExtraYaw()`.
 -- @function [parent=#camera] getExtraYaw
 -- @return #number
 
--------------------------------------------------------------------------------
+---
 -- Additional summand for the yaw angle; useful for camera shaking effects.
 -- Setting extra pitch doesn't block player input.
 -- Full yaw is `getYaw()+getExtraYaw()`.
 -- @function [parent=#camera] setExtraYaw
 -- @param #number value
 
--------------------------------------------------------------------------------
+---
 -- Set camera position; can be used only if camera is in Static mode.
 -- @function [parent=#camera] setStaticPosition
 -- @param openmw.util#Vector3 pos
 
--------------------------------------------------------------------------------
+---
 -- The offset between the characters head and the camera in first person mode (3d vector).
 -- @function [parent=#camera] getFirstPersonOffset
 -- @return openmw.util#Vector3
 
--------------------------------------------------------------------------------
+---
 -- Set the offset between the characters head and the camera in first person mode (3d vector).
 -- @function [parent=#camera] setFirstPersonOffset
 -- @param openmw.util#Vector3 offset
 
--------------------------------------------------------------------------------
+---
 -- Preferred offset between tracked position (see `getTrackedPosition`) and the camera focal point (the center of the screen) in third person mode.
 -- See `setFocalPreferredOffset`.
 -- @function [parent=#camera] getFocalPreferredOffset
 -- @return openmw.util#Vector2
 
--------------------------------------------------------------------------------
+---
 -- Set preferred offset between tracked position (see `getTrackedPosition`) and the camera focal point (the center of the screen) in third person mode.
 -- The offset is a 2d vector (X, Y) where X is horizontal (to the right from the character) and Y component is vertical (upward).
 -- The real offset can differ from the preferred one during smooth transition of if blocked by an obstacle.
@@ -140,29 +140,29 @@
 -- @function [parent=#camera] setFocalPreferredOffset
 -- @param openmw.util#Vector2 offset
 
--------------------------------------------------------------------------------
+---
 -- The actual distance between the camera and the character in third person mode; can differ from the preferred one if there is an obstacle.
 -- @function [parent=#camera] getThirdPersonDistance
 -- @return #number
 
--------------------------------------------------------------------------------
+---
 -- Set preferred distance between the camera and the character in third person mode.
 -- @function [parent=#camera] setPreferredThirdPersonDistance
 -- @param #number distance
 
--------------------------------------------------------------------------------
+---
 -- The current speed coefficient of focal point (the center of the screen in third person mode) smooth transition.
 -- @function [parent=#camera] getFocalTransitionSpeed
 -- @return #number
 
--------------------------------------------------------------------------------
+---
 -- Set the speed coefficient of focal point (the center of the screen in third person mode) smooth transition.
 -- Smooth transition happens by default every time when the preferred offset was changed. Use `instantTransition()` to skip the current transition.
 -- @function [parent=#camera] setFocalTransitionSpeed
 -- Set the speed coefficient 
 -- @param #number speed
 
--------------------------------------------------------------------------------
+---
 -- Make instant the current transition of camera focal point and the current deferred rotation (see `allowCharacterDeferredRotation`).
 -- @function [parent=#camera] instantTransition
 
diff --git a/files/lua_api/openmw/core.lua b/files/lua_api/openmw/core.lua
index 84e2b4faae..d57b6a405e 100644
--- a/files/lua_api/openmw/core.lua
+++ b/files/lua_api/openmw/core.lua
@@ -1,4 +1,4 @@
--------------------------------------------------------------------------------
+---
 -- `openmw.core` defines functions and types that are available in both local
 -- and global scripts.
 -- @module core
@@ -6,53 +6,53 @@
 
 
 
--------------------------------------------------------------------------------
+---
 -- The revision of OpenMW Lua API. It is an integer that is incremented every time the API is changed.
 -- @field [parent=#core] #number API_REVISION
 
--------------------------------------------------------------------------------
+---
 -- Terminates the game and quits to the OS. Should be used only for testing purposes.
 -- @function [parent=#core] quit
 
--------------------------------------------------------------------------------
+---
 -- Send an event to global scripts.
 -- @function [parent=#core] sendGlobalEvent
 -- @param #string eventName
 -- @param eventData
 
--------------------------------------------------------------------------------
+---
 -- Simulation time in seconds.
 -- The number of simulation seconds passed in the game world since starting a new game.
 -- @function [parent=#core] getSimulationTime
 -- @return #number
 
--------------------------------------------------------------------------------
+---
 -- The scale of simulation time relative to real time.
 -- @function [parent=#core] getSimulationTimeScale
 -- @return #number
 
--------------------------------------------------------------------------------
+---
 -- Game time in seconds.
 -- @function [parent=#core] getGameTime
 -- @return #number
 
--------------------------------------------------------------------------------
+---
 -- The scale of game time relative to simulation time.
 -- @function [parent=#core] getGameTimeScale
 -- @return #number
 
--------------------------------------------------------------------------------
+---
 -- Whether the world is paused (onUpdate doesn't work when the world is paused).
 -- @function [parent=#core] isWorldPaused
 -- @return #boolean
 
--------------------------------------------------------------------------------
+---
 -- Get a GMST setting from content files.
 -- @function [parent=#core] getGMST
 -- @param #string setting Setting name
 -- @return #any
 
--------------------------------------------------------------------------------
+---
 -- Return i18n formatting function for the given context.
 -- It is based on `i18n.lua` library.
 -- Language files should be stored in VFS as `i18n/<ContextName>/<Lang>.lua`.
@@ -86,7 +86,7 @@
 -- print( myMsg('Hello %{name}!', {name='World'}) )
 
 
--------------------------------------------------------------------------------
+---
 -- @type OBJECT_TYPE
 -- @field #string Activator "Activator"
 -- @field #string Armor "Armor"
@@ -107,12 +107,12 @@
 -- @field #string Probe "Probe"
 -- @field #string Repair "Repair"
 
--------------------------------------------------------------------------------
+---
 -- Possible `object.type` values.
 -- @field [parent=#core] #OBJECT_TYPE OBJECT_TYPE
 
 
--------------------------------------------------------------------------------
+---
 -- @type EQUIPMENT_SLOT
 -- @field #number Helmet
 -- @field #number Cuirass
@@ -134,12 +134,12 @@
 -- @field #number CarriedLeft
 -- @field #number Ammunition
 
--------------------------------------------------------------------------------
+---
 -- Available equipment slots. Used in `object:getEquipment` and `object:setEquipment`.
 -- @field [parent=#core] #EQUIPMENT_SLOT EQUIPMENT_SLOT
 
 
--------------------------------------------------------------------------------
+---
 -- Any object that exists in the game world and has a specific location.
 -- Player, actors, items, and statics are game objects.
 -- @type GameObject
@@ -155,7 +155,7 @@
 -- @field openmw.util#Vector3 destRotation Destination rotation (only if a teleport door).
 -- @field #string destCell Destination cell (only if a teleport door).
 
--------------------------------------------------------------------------------
+---
 -- Is the object still exists/available.
 -- Returns true if the object exists and loaded, and false otherwise. If false, then every
 -- access to the object will raise an error.
@@ -163,7 +163,7 @@
 -- @param self
 -- @return #boolean
 
--------------------------------------------------------------------------------
+---
 -- Returns true if the object is an actor and is able to move. For dead, paralized,
 -- or knocked down actors in returns false.
 -- access to the object will raise an error.
@@ -171,56 +171,56 @@
 -- @param self
 -- @return #boolean
 
--------------------------------------------------------------------------------
+---
 -- Speed of running. Returns 0 if not an actor, but for dead actors it still returns a positive value.
 -- @function [parent=#GameObject] getRunSpeed
 -- @param self
 -- @return #number
 
--------------------------------------------------------------------------------
+---
 -- Speed of walking. Returns 0 if not an actor, but for dead actors it still returns a positive value.
 -- @function [parent=#GameObject] getWalkSpeed
 -- @param self
 -- @return #number
 
--------------------------------------------------------------------------------
+---
 -- Current speed. Can be called only from a local script.
 -- @function [parent=#GameObject] getCurrentSpeed
 -- @param self
 -- @return #number
 
--------------------------------------------------------------------------------
+---
 -- Is the actor standing on ground. Can be called only from a local script.
 -- @function [parent=#GameObject] isOnGround
 -- @param self
 -- @return #boolean
 
--------------------------------------------------------------------------------
+---
 -- Is the actor in water. Can be called only from a local script.
 -- @function [parent=#GameObject] isSwimming
 -- @param self
 -- @return #boolean
 
--------------------------------------------------------------------------------
+---
 -- Is the actor in weapon stance. Can be called only from a local script.
 -- @function [parent=#GameObject] isInWeaponStance
 -- @param self
 -- @return #boolean
 
--------------------------------------------------------------------------------
+---
 -- Is the actor in magic stance. Can be called only from a local script.
 -- @function [parent=#GameObject] isInMagicStance
 -- @param self
 -- @return #boolean
 
--------------------------------------------------------------------------------
+---
 -- Send local event to the object.
 -- @function [parent=#GameObject] sendEvent
 -- @param self
 -- @param #string eventName
 -- @param eventData
 
--------------------------------------------------------------------------------
+---
 -- Activate the object.
 -- @function [parent=#GameObject] activateBy
 -- @param self
@@ -228,14 +228,14 @@
 -- @usage local self = require('openmw.self')
 -- object:activateBy(self)
 
--------------------------------------------------------------------------------
+---
 -- Returns `true` if the item is equipped on the object.
 -- @function [parent=#GameObject] isEquipped
 -- @param self
 -- @param #GameObject item
 -- @return #boolean
 
--------------------------------------------------------------------------------
+---
 -- Get equipment.
 -- Returns a table `slot` -> `GameObject` of currently equipped items.
 -- See @{openmw.core#EQUIPMENT_SLOT}. Returns empty table if the object doesn't have
@@ -244,7 +244,7 @@
 -- @param self
 -- @return #map<#number,#GameObject>
 
--------------------------------------------------------------------------------
+---
 -- Set equipment.
 -- Keys in the table are equipment slots (see @{openmw.core#EQUIPMENT_SLOT}). Each
 -- value can be either a `GameObject` or recordId. Raises an error if
@@ -254,7 +254,7 @@
 -- @param self
 -- @param equipment
 
--------------------------------------------------------------------------------
+---
 -- Add new local script to the object.
 -- Can be called only from a global script. Script should be specified in a content
 -- file (omwgame/omwaddon/omwscripts) with a CUSTOM flag.
@@ -262,7 +262,7 @@
 -- @param self
 -- @param #string scriptPath Path to the script in OpenMW virtual filesystem.
 
--------------------------------------------------------------------------------
+---
 -- Whether a script with given path is attached to this object.
 -- Can be called only from a global script.
 -- @function [parent=#GameObject] hasScript
@@ -270,14 +270,14 @@
 -- @param #string scriptPath Path to the script in OpenMW virtual filesystem.
 -- @return #boolean
 
--------------------------------------------------------------------------------
+---
 -- Removes script that was attached by `addScript`
 -- Can be called only from a global script.
 -- @function [parent=#GameObject] removeScript
 -- @param self
 -- @param #string scriptPath Path to the script in OpenMW virtual filesystem.
 
--------------------------------------------------------------------------------
+---
 -- Moves object to given cell and position.
 -- The effect is not immediate: the position will be updated only in the next
 -- frame. Can be called only from a global script.
@@ -288,12 +288,12 @@
 -- @param openmw.util#Vector3 rotation New rotation. Optional argument. If missed, then the current rotation is used.
 
 
--------------------------------------------------------------------------------
+---
 -- List of GameObjects. Implements [iterables#List](iterables.html#List) of #GameObject
 -- @type ObjectList
 -- @list <#GameObject>
 
--------------------------------------------------------------------------------
+---
 -- Filter list with a Query.
 -- @function [parent=#ObjectList] select
 -- @param self
@@ -301,7 +301,7 @@
 -- @return #ObjectList
 
 
--------------------------------------------------------------------------------
+---
 -- A cell of the game world.
 -- @type Cell
 -- @field #string name Name of the cell (can be empty string).
@@ -311,7 +311,7 @@
 -- @field #number gridY Index of the cell by Y (only for exteriors).
 -- @field #boolean hasWater True if the cell contains water.
 
--------------------------------------------------------------------------------
+---
 -- Returns true either if the cell contains the object or if the cell is an exterior and the object is also in an exterior.
 -- @function [parent=#Cell] isInSameSpace
 -- @param self
@@ -324,7 +324,7 @@
 --     -- the distance can't be calculated because the coordinates are in different spaces
 -- end
 
--------------------------------------------------------------------------------
+---
 -- Select objects from the cell with a Query (only in global scripts).
 -- Returns an empty list if the cell is not loaded.
 -- @function [parent=#Cell] selectObjects
@@ -333,18 +333,18 @@
 -- @return #ObjectList
 
 
--------------------------------------------------------------------------------
+---
 -- Inventory of a player/NPC or a content of a container.
 -- @type Inventory
 
--------------------------------------------------------------------------------
+---
 -- The number of items with given recordId.
 -- @function [parent=#Inventory] countOf
 -- @param self
 -- @param #string recordId
 -- @return #number
 
--------------------------------------------------------------------------------
+---
 -- Get all items of given type from the inventory.
 -- @function [parent=#Inventory] getAll
 -- @param self
diff --git a/files/lua_api/openmw/input.lua b/files/lua_api/openmw/input.lua
index 5ebaa46e1f..12ea5c94b3 100644
--- a/files/lua_api/openmw/input.lua
+++ b/files/lua_api/openmw/input.lua
@@ -1,95 +1,95 @@
--------------------------------------------------------------------------------
+---
 -- `openmw.input` can be used only in scripts attached to a player.
 -- @module input
 -- @usage local input = require('openmw.input')
 
 
 
--------------------------------------------------------------------------------
+---
 -- Is player idle.
 -- @function [parent=#input] isIdle
 -- @return #boolean
 
--------------------------------------------------------------------------------
+---
 -- Is a specific control currently pressed.
 -- Input bindings can be changed ingame using Options/Controls menu.
 -- @function [parent=#input] isActionPressed
 -- @param #number actionId One of @{openmw.input#ACTION}
 -- @return #boolean
 
--------------------------------------------------------------------------------
+---
 -- Is a keyboard button currently pressed.
 -- @function [parent=#input] isKeyPressed
 -- @param #number keyCode Key code (see @{openmw.input#KEY})
 -- @return #boolean
 
--------------------------------------------------------------------------------
+---
 -- Is a controller button currently pressed.
 -- @function [parent=#input] isControllerButtonPressed
 -- @param #number buttonId Button index (see @{openmw.input#CONTROLLER_BUTTON})
 -- @return #boolean
 
--------------------------------------------------------------------------------
+---
 -- Is `Shift` key pressed.
 -- @function [parent=#input] isShiftPressed
 -- @return #boolean
 
--------------------------------------------------------------------------------
+---
 -- Is `Ctrl` key pressed.
 -- @function [parent=#input] isCtrlPressed
 -- @return #boolean
 
--------------------------------------------------------------------------------
+---
 -- Is `Alt` key pressed.
 -- @function [parent=#input] isAltPressed
 -- @return #boolean
 
--------------------------------------------------------------------------------
+---
 -- Is `Super`/`Win` key pressed.
 -- @function [parent=#input] isSuperPressed
 -- @return #boolean
 
--------------------------------------------------------------------------------
+---
 -- Is a mouse button currently pressed.
 -- @function [parent=#input] isMouseButtonPressed
 -- @param #number buttonId Button index (1 - left, 2 - middle, 3 - right, 4 - X1, 5 - X2)
 -- @return #boolean
 
--------------------------------------------------------------------------------
+---
 -- Horizontal mouse movement during the last frame.
 -- @function [parent=#input] getMouseMoveX
 -- @return #number
 
--------------------------------------------------------------------------------
+---
 -- Vertical mouse movement during the last frame.
 -- @function [parent=#input] getMouseMoveY
 -- @return #number
 
--------------------------------------------------------------------------------
+---
 -- Get value of an axis of a game controller.
 -- @function [parent=#input] getAxisValue
 -- @param #number axisId Index of a controller axis, one of @{openmw.input#CONTROLLER_AXIS}.
 -- @return #number Value in range [-1, 1].
 
--------------------------------------------------------------------------------
+---
 -- Get state of a control switch. I.e. is player able to move/fight/jump/etc.
 -- @function [parent=#input] getControlSwitch
 -- @param #string key Control type (see @{openmw.input#CONTROL_SWITCH})
 -- @return #boolean
 
--------------------------------------------------------------------------------
+---
 -- Set state of a control switch. I.e. forbid or allow player to move/fight/jump/etc.
 -- @function [parent=#input] setControlSwitch
 -- @param #string key Control type (see @{openmw.input#CONTROL_SWITCH})
 -- @param #boolean value
 
--------------------------------------------------------------------------------
+---
 -- Returns a human readable name for the given key code
 -- @function [parent=#input] getKeyName
 -- @param #number code A key code (see @{openmw.input#KEY})
 -- @return #string
 
--------------------------------------------------------------------------------
+---
 -- @type CONTROL_SWITCH
 -- @field [parent=#CONTROL_SWITCH] #string Controls Ability to move
 -- @field [parent=#CONTROL_SWITCH] #string Fighting Ability to attack
@@ -99,11 +99,11 @@
 -- @field [parent=#CONTROL_SWITCH] #string ViewMode Ability to toggle 1st/3rd person view
 -- @field [parent=#CONTROL_SWITCH] #string VanityMode Vanity view if player doesn't touch controls for a long time
 
--------------------------------------------------------------------------------
+---
 -- Values that can be used with getControlSwitch/setControlSwitch.
 -- @field [parent=#input] #CONTROL_SWITCH CONTROL_SWITCH
 
--------------------------------------------------------------------------------
+---
 -- @type ACTION
 -- @field [parent=#ACTION] #number GameMenu
 -- @field [parent=#ACTION] #number Screenshot
@@ -150,11 +150,11 @@
 -- @field [parent=#ACTION] #number ZoomIn
 -- @field [parent=#ACTION] #number ZoomOut
 
--------------------------------------------------------------------------------
+---
 -- Values that can be used with isActionPressed.
 -- @field [parent=#input] #ACTION ACTION
 
--------------------------------------------------------------------------------
+---
 -- @type CONTROLLER_BUTTON
 -- @field [parent=#CONTROLLER_BUTTON] #number A
 -- @field [parent=#CONTROLLER_BUTTON] #number B
@@ -172,11 +172,11 @@
 -- @field [parent=#CONTROLLER_BUTTON] #number DPadLeft
 -- @field [parent=#CONTROLLER_BUTTON] #number DPadRight
 
--------------------------------------------------------------------------------
+---
 -- Values that can be passed to onControllerButtonPress/onControllerButtonRelease engine handlers.
 -- @field [parent=#input] #CONTROLLER_BUTTON CONTROLLER_BUTTON
 
--------------------------------------------------------------------------------
+---
 -- Ids of game controller axises. Used as an argument in getAxisValue.
 -- @type CONTROLLER_AXIS
 -- @field [parent=#CONTROLLER_AXIS] #number LeftX Left stick horizontal axis (from -1 to 1)
@@ -190,11 +190,11 @@
 -- @field [parent=#CONTROLLER_AXIS] #number MoveForwardBackward Movement forward/backward (LeftY by default, can be mapped to another axis in Options/Controls menu)
 -- @field [parent=#CONTROLLER_AXIS] #number MoveLeftRight Side movement (LeftX by default, can be mapped to another axis in Options/Controls menu)
 
--------------------------------------------------------------------------------
+---
 -- Values that can be used with getAxisValue.
 -- @field [parent=#input] #CONTROLLER_AXIS CONTROLLER_AXIS
 
--------------------------------------------------------------------------------
+---
 -- @type KEY
 -- @field #number _0
 -- @field #number _1
@@ -299,11 +299,11 @@
 -- @field #number Space
 -- @field #number Tab
 
--------------------------------------------------------------------------------
+---
 -- Key codes.
 -- @field [parent=#input] #KEY KEY
 
--------------------------------------------------------------------------------
+---
 -- The argument of `onKeyPress`/`onKeyRelease` engine handlers.
 -- @type KeyboardEvent
 -- @field [parent=#KeyboardEvent] #string symbol The pressed symbol (1-symbol string if can be represented or an empty string otherwise).
diff --git a/files/lua_api/openmw/nearby.lua b/files/lua_api/openmw/nearby.lua
index f1aeb07b24..c3403ded0c 100644
--- a/files/lua_api/openmw/nearby.lua
+++ b/files/lua_api/openmw/nearby.lua
@@ -1,4 +1,4 @@
--------------------------------------------------------------------------------
+---
 -- `openmw.nearby` provides read-only access to the nearest area of the game world.
 -- Can be used only from local scripts.
 -- @module nearby
@@ -6,33 +6,33 @@
 
 
 
--------------------------------------------------------------------------------
+---
 -- List of nearby activators.
 -- @field [parent=#nearby] openmw.core#ObjectList activators
 
--------------------------------------------------------------------------------
+---
 -- List of nearby actors.
 -- @field [parent=#nearby] openmw.core#ObjectList actors
 
--------------------------------------------------------------------------------
+---
 -- List of nearby containers.
 -- @field [parent=#nearby] openmw.core#ObjectList containers
 
--------------------------------------------------------------------------------
+---
 -- List of nearby doors.
 -- @field [parent=#nearby] openmw.core#ObjectList doors
 
--------------------------------------------------------------------------------
+---
 -- Everything that can be picked up in the nearby.
 -- @field [parent=#nearby] openmw.core#ObjectList items
 
--------------------------------------------------------------------------------
+---
 -- Evaluates a Query.
 -- @function [parent=#nearby] selectObjects
 -- @param openmw.query#Query query
 -- @return openmw.core#ObjectList
 
--------------------------------------------------------------------------------
+---
 -- @type COLLISION_TYPE
 -- @field [parent=#COLLISION_TYPE] #number World
 -- @field [parent=#COLLISION_TYPE] #number Door
@@ -42,12 +42,12 @@
 -- @field [parent=#COLLISION_TYPE] #number Water
 -- @field [parent=#COLLISION_TYPE] #number Default Used by deafult: World+Door+Actor+HeightMap
 
--------------------------------------------------------------------------------
+---
 -- Collision types that are used in `castRay`.
 -- Several types can be combined with '+'.
 -- @field [parent=#nearby] #COLLISION_TYPE COLLISION_TYPE
 
--------------------------------------------------------------------------------
+---
 -- Result of raycasing
 -- @type RayCastingResult
 -- @field [parent=#RayCastingResult] #boolean hit Is there a collision? (true/false)
@@ -55,7 +55,7 @@
 -- @field [parent=#RayCastingResult] openmw.util#Vector3 hitNormal Normal to the surface in the collision point (nil if no collision)
 -- @field [parent=#RayCastingResult] openmw.core#GameObject hitObject The object the ray has collided with (can be nil)
 
--------------------------------------------------------------------------------
+---
 -- Cast ray from one point to another and return the first collision.
 -- @function [parent=#nearby] castRay
 -- @param openmw.util#Vector3 from Start point of the ray.
diff --git a/files/lua_api/openmw/query.lua b/files/lua_api/openmw/query.lua
index 9684fb372c..b5cea061ff 100644
--- a/files/lua_api/openmw/query.lua
+++ b/files/lua_api/openmw/query.lua
@@ -1,22 +1,22 @@
--------------------------------------------------------------------------------
+---
 -- `openmw.query` constructs queries that can be used in `world.selectObjects` and `nearby.selectObjects`.
 -- @module query
 -- @usage local query = require('openmw.query')
 
 
 
--------------------------------------------------------------------------------
+---
 -- Query. A Query itself can no return objects. It only holds search conditions.
 -- @type Query
 
--------------------------------------------------------------------------------
+---
 -- Add condition.
 -- @function [parent=#Query] where
 -- @param self
 -- @param condition
 -- @return #Query
 
--------------------------------------------------------------------------------
+---
 -- Limit result size.
 -- @function [parent=#Query] limit
 -- @param self
@@ -24,91 +24,91 @@
 -- @return #Query
 
 
--------------------------------------------------------------------------------
+---
 -- A field that can be used in a condition
 -- @type Field
 
--------------------------------------------------------------------------------
+---
 -- Equal
 -- @function [parent=#Field] eq
 -- @param self
 -- @param value
 
--------------------------------------------------------------------------------
+---
 -- Not equal
 -- @function [parent=#Field] neq
 -- @param self
 -- @param value
 
--------------------------------------------------------------------------------
+---
 -- Lesser
 -- @function [parent=#Field] lt
 -- @param self
 -- @param value
 
--------------------------------------------------------------------------------
+---
 -- Lesser or equal
 -- @function [parent=#Field] lte
 -- @param self
 -- @param value
 
--------------------------------------------------------------------------------
+---
 -- Greater
 -- @function [parent=#Field] gt
 -- @param self
 -- @param value
 
--------------------------------------------------------------------------------
+---
 -- Greater or equal
 -- @function [parent=#Field] gte
 -- @param self
 -- @param value
 
 
--------------------------------------------------------------------------------
+---
 -- @type OBJECT
 -- @field [parent=#OBJECT] #Field type
 -- @field [parent=#OBJECT] #Field recordId
 -- @field [parent=#OBJECT] #Field count
 -- @field [parent=#OBJECT] #CellFields cell
 
--------------------------------------------------------------------------------
+---
 -- Fields that can be used with any object.
 -- @field [parent=#query] #OBJECT OBJECT
 
--------------------------------------------------------------------------------
+---
 -- @type DOOR
 -- @field [parent=#DOOR] #Field isTeleport
 -- @field [parent=#DOOR] #CellFields destCell
 
--------------------------------------------------------------------------------
+---
 -- Fields that can be used only when search for doors.
 -- @field [parent=#query] #DOOR DOOR
 
--------------------------------------------------------------------------------
+---
 -- @type CellFields
 -- @field [parent=#CellFields] #Field name
 -- @field [parent=#CellFields] #Field region
 -- @field [parent=#CellFields] #Field isExterior
 
 
--------------------------------------------------------------------------------
+---
 -- Base Query to select activators.
 -- @field [parent=#query] #Query activators
 
--------------------------------------------------------------------------------
+---
 -- Base Query to select actors.
 -- @field [parent=#query] #Query actors
 
--------------------------------------------------------------------------------
+---
 -- Base Query to select containers.
 -- @field [parent=#query] #Query containers
 
--------------------------------------------------------------------------------
+---
 -- Base Query to select doors.
 -- @field [parent=#query] #Query doors
 
--------------------------------------------------------------------------------
+---
 -- Base Query to select items.
 -- @field [parent=#query] #Query items
 
diff --git a/files/lua_api/openmw/self.lua b/files/lua_api/openmw/self.lua
index d6f01412eb..06be20ee64 100644
--- a/files/lua_api/openmw/self.lua
+++ b/files/lua_api/openmw/self.lua
@@ -1,4 +1,4 @@
--------------------------------------------------------------------------------
+---
 -- `openmw.self` provides full access to the object the script is attached to.
 -- Can be used only from local scripts. All fields and function of `GameObject` are also available for `openmw.self`.
 -- @module self
@@ -10,22 +10,22 @@
 
 
 
--------------------------------------------------------------------------------
+---
 -- Returns true if the script isActive (the object it is attached to is in an active cell).
 -- If it is not active, then `openmw.nearby` can not be used.
 -- @function [parent=#self] isActive
 -- @param self
 -- @return #boolean
 
--------------------------------------------------------------------------------
+---
 -- The object the script is attached to (readonly)
 -- @field [parent=#self] openmw.core#GameObject object
 
--------------------------------------------------------------------------------
+---
 -- Movement controls (only for actors)
 -- @field [parent=#self] #ActorControls controls
 
--------------------------------------------------------------------------------
+---
 -- Allows to view and/or modify controls of an actor. All fields are mutable.
 -- @type ActorControls
 -- @field [parent=#ActorControls] #number movement +1 - move forward, -1 - move backward
@@ -36,7 +36,7 @@
 -- @field [parent=#ActorControls] #boolean jump If true - initiate a jump
 -- @field [parent=#ActorControls] #number use if 1 - activates the readied weapon/spell. For weapons, keeping at 1 will charge the attack until set to 0.
 
--------------------------------------------------------------------------------
+---
 -- Enables or disables standard AI (enabled by default).
 -- @function [parent=#self] enableAI
 -- @param self
diff --git a/files/lua_api/openmw/world.lua b/files/lua_api/openmw/world.lua
index 690f0bd566..127c41c064 100644
--- a/files/lua_api/openmw/world.lua
+++ b/files/lua_api/openmw/world.lua
@@ -1,4 +1,4 @@
--------------------------------------------------------------------------------
+---
 -- `openmw.world` is an interface to the game world for global scripts.
 -- Can not be used from local scripts.
 -- @module world
@@ -6,56 +6,56 @@
 
 
 
--------------------------------------------------------------------------------
+---
 -- List of currently active actors.
 -- @field [parent=#world] openmw.core#ObjectList activeActors
 
--------------------------------------------------------------------------------
+---
 -- Evaluates a Query.
 -- @function [parent=#world] selectObjects
 -- @param openmw.query#Query query
 -- @return openmw.core#ObjectList
 
--------------------------------------------------------------------------------
+---
 -- Loads a named cell
 -- @function [parent=#world] getCellByName
 -- @param #string cellName
 -- @return openmw.core#Cell
 
--------------------------------------------------------------------------------
+---
 -- Loads an exterior cell by grid indices
 -- @function [parent=#world] getExteriorCell
 -- @param #number gridX
 -- @param #number gridY
 -- @return openmw.core#Cell
 
--------------------------------------------------------------------------------
+---
 -- Simulation time in seconds.
 -- The number of simulation seconds passed in the game world since starting a new game.
 -- @function [parent=#core] getSimulationTime
 -- @return #number
 
--------------------------------------------------------------------------------
+---
 -- The scale of simulation time relative to real time.
 -- @function [parent=#core] getSimulationTimeScale
 -- @return #number
 
--------------------------------------------------------------------------------
+---
 -- Game time in seconds.
 -- @function [parent=#core] getGameTime
 -- @return #number
 
--------------------------------------------------------------------------------
+---
 -- The scale of game time relative to simulation time.
 -- @function [parent=#core] getGameTimeScale
 -- @return #number
 
--------------------------------------------------------------------------------
+---
 -- Set the ratio of game time speed to simulation time speed.
 -- @function [parent=#world] setGameTimeScale
 -- @param #number ratio
 
--------------------------------------------------------------------------------
+---
 -- Whether the world is paused (onUpdate doesn't work when the world is paused).
 -- @function [parent=#world] isWorldPaused
 -- @return #boolean

From 62aac3cc772eec4e54fa4745f7dd3bd2aacf94c2 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Wed, 23 Feb 2022 22:09:08 +0100
Subject: [PATCH 2161/2859] Fix Lua Camera module declaration

---
 files/builtin_scripts/scripts/omw/camera.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/files/builtin_scripts/scripts/omw/camera.lua b/files/builtin_scripts/scripts/omw/camera.lua
index cd4d0dccfb..4b5911930e 100644
--- a/files/builtin_scripts/scripts/omw/camera.lua
+++ b/files/builtin_scripts/scripts/omw/camera.lua
@@ -172,7 +172,8 @@ end
 
 return {
     interfaceName = 'Camera',
-    --- @module Camera
+    ---
+    -- @module Camera
     -- @usage require('openmw.interfaces').Camera
     interface = {
         --- Interface version

From 42d6032c8bbae732ac603529dfa671856c38772c Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 24 Feb 2022 00:24:41 +0100
Subject: [PATCH 2162/2859] Support compilation with c++20

---
 apps/navmeshtool/navmesh.cpp                  |  2 +-
 apps/openmw/mwphysics/actor.cpp               |  2 +-
 .../detournavigator/navmeshdb.cpp             |  2 +-
 apps/openmw_test_suite/openmw/options.cpp     | 17 +++++++--
 .../detournavigator/asyncnavmeshupdater.cpp   |  4 +-
 components/detournavigator/navmeshdb.hpp      | 11 +++---
 components/detournavigator/navmeshdbutils.cpp |  2 +-
 components/misc/strongtypedef.hpp             | 38 +++++++++++++++++++
 components/sceneutil/mwshadowtechnique.cpp    |  2 +-
 9 files changed, 63 insertions(+), 17 deletions(-)
 create mode 100644 components/misc/strongtypedef.hpp

diff --git a/apps/navmeshtool/navmesh.cpp b/apps/navmeshtool/navmesh.cpp
index 3161192cf9..8b85029949 100644
--- a/apps/navmeshtool/navmesh.cpp
+++ b/apps/navmeshtool/navmesh.cpp
@@ -137,7 +137,7 @@ namespace NavMeshTool
                 {
                     std::lock_guard lock(mMutex);
                     mDb.insertTile(mNextTileId, worldspace, tilePosition, TileVersion {version}, input, serialize(data));
-                    ++mNextTileId.t;
+                    ++mNextTileId;
                 }
                 ++mInserted;
                 report();
diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index 568da999bc..a1f5a48388 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -163,7 +163,7 @@ bool Actor::setPosition(const osg::Vec3f& position)
 {
     std::scoped_lock lock(mPositionMutex);
     applyOffsetChange();
-    bool hasChanged = (mPosition != position && !mSkipSimulation) || mWorldPositionChanged;
+    bool hasChanged = (mPosition.operator!=(position) && !mSkipSimulation) || mWorldPositionChanged;
     if (!mSkipSimulation)
     {
         mPreviousPosition = mPosition;
diff --git a/apps/openmw_test_suite/detournavigator/navmeshdb.cpp b/apps/openmw_test_suite/detournavigator/navmeshdb.cpp
index a17f5132c5..f7d9327e65 100644
--- a/apps/openmw_test_suite/detournavigator/navmeshdb.cpp
+++ b/apps/openmw_test_suite/detournavigator/navmeshdb.cpp
@@ -156,7 +156,7 @@ namespace
             for (int y = -2; y <= 2; ++y)
             {
                 ASSERT_EQ(mDb.insertTile(tileId, worldspace, TilePosition {x, y}, version, input, data), 1);
-                ++tileId.t;
+                ++tileId;
             }
         }
         const TilesPositionsRange range {TilePosition {-1, -1}, TilePosition {2, 2}};
diff --git a/apps/openmw_test_suite/openmw/options.cpp b/apps/openmw_test_suite/openmw/options.cpp
index 04c209e8a4..b65da5d157 100644
--- a/apps/openmw_test_suite/openmw/options.cpp
+++ b/apps/openmw_test_suite/openmw/options.cpp
@@ -17,9 +17,18 @@ namespace
 
     namespace bpo = boost::program_options;
 
-    std::vector<std::string> generateSupportedCharacters(std::vector<std::string>&& base = {})
+    template <class T, std::size_t size>
+    std::string makeString(const T (&range)[size])
     {
-        std::vector<std::string> result = std::move(base);
+        static_assert(size > 0);
+        return std::string(std::begin(range), std::end(range) - 1);
+    }
+
+    template <class ... Args>
+    std::vector<std::string> generateSupportedCharacters(Args&& ... args)
+    {
+        std::vector<std::string> result;
+        (result.emplace_back(makeString(args)) , ...);
         for (int i = 1; i <= std::numeric_limits<char>::max(); ++i)
             if (i != '&' && i != '"' && i != ' ' && i != '\n')
                 result.push_back(std::string(1, i));
@@ -193,7 +202,7 @@ namespace
     INSTANTIATE_TEST_SUITE_P(
         SupportedCharacters,
         OpenMWOptionsFromArgumentsStrings,
-        ValuesIn(generateSupportedCharacters({u8"👍", u8"Ъ", u8"Ǽ", "\n"}))
+        ValuesIn(generateSupportedCharacters(u8"👍", u8"Ъ", u8"Ǽ", "\n"))
     );
 
     TEST(OpenMWOptionsFromConfig, should_support_single_word_load_savegame_path)
@@ -381,6 +390,6 @@ namespace
     INSTANTIATE_TEST_SUITE_P(
         SupportedCharacters,
         OpenMWOptionsFromConfigStrings,
-        ValuesIn(generateSupportedCharacters({u8"👍", u8"Ъ", u8"Ǽ"}))
+        ValuesIn(generateSupportedCharacters(u8"👍", u8"Ъ", u8"Ǽ"))
     );
 }
diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index 657befd9d7..4af229da8a 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -733,7 +733,7 @@ namespace DetourNavigator
     {
         Stats result;
         result.mJobs = mQueue.size();
-        result.mGetTileCount = mGetTileCount.load(std::memory_order::memory_order_relaxed);
+        result.mGetTileCount = mGetTileCount.load(std::memory_order_relaxed);
         return result;
     }
 
@@ -857,6 +857,6 @@ namespace DetourNavigator
         Log(Debug::Debug) << "Insert db tile by job " << job->mId;
         mDb->insertTile(mNextTileId, job->mWorldspace, job->mChangedTile,
                         mVersion, job->mInput, serialize(*job->mGeneratedNavMeshData));
-        ++mNextTileId.t;
+        ++mNextTileId;
     }
 }
diff --git a/components/detournavigator/navmeshdb.hpp b/components/detournavigator/navmeshdb.hpp
index f10a3a3288..35aaeaf677 100644
--- a/components/detournavigator/navmeshdb.hpp
+++ b/components/detournavigator/navmeshdb.hpp
@@ -4,14 +4,13 @@
 #include "tileposition.hpp"
 
 #include <components/detournavigator/tilespositionsrange.hpp>
+#include <components/misc/strongtypedef.hpp>
 
 #include <components/sqlite3/db.hpp>
 #include <components/sqlite3/statement.hpp>
 #include <components/sqlite3/transaction.hpp>
 #include <components/sqlite3/types.hpp>
 
-#include <boost/serialization/strong_typedef.hpp>
-
 #include <cstddef>
 #include <cstdint>
 #include <cstring>
@@ -28,10 +27,10 @@ struct sqlite3_stmt;
 
 namespace DetourNavigator
 {
-    BOOST_STRONG_TYPEDEF(std::int64_t, TileId)
-    BOOST_STRONG_TYPEDEF(std::int64_t, TileRevision)
-    BOOST_STRONG_TYPEDEF(std::int64_t, TileVersion)
-    BOOST_STRONG_TYPEDEF(std::int64_t, ShapeId)
+    using TileId = Misc::StrongTypedef<std::int64_t, struct TiledIdTag>;
+    using TileRevision = Misc::StrongTypedef<std::int64_t, struct TileRevisionTag>;
+    using TileVersion = Misc::StrongTypedef<std::int64_t, struct TileVersionTag>;
+    using ShapeId = Misc::StrongTypedef<std::int64_t, struct ShapeIdTag>;
 
     struct Tile
     {
diff --git a/components/detournavigator/navmeshdbutils.cpp b/components/detournavigator/navmeshdbutils.cpp
index 71873972b9..d2379c4e53 100644
--- a/components/detournavigator/navmeshdbutils.cpp
+++ b/components/detournavigator/navmeshdbutils.cpp
@@ -28,7 +28,7 @@ namespace DetourNavigator
             const ShapeId newShapeId = nextShapeId;
             db.insertShape(newShapeId, name, type, hashData);
             Log(Debug::Verbose) << "Added " << name << " " << type << " shape to navmeshdb with id " << newShapeId;
-            ++nextShapeId.t;
+            ++nextShapeId;
             return newShapeId;
         }
     }
diff --git a/components/misc/strongtypedef.hpp b/components/misc/strongtypedef.hpp
new file mode 100644
index 0000000000..2a9e4c3a8b
--- /dev/null
+++ b/components/misc/strongtypedef.hpp
@@ -0,0 +1,38 @@
+#ifndef OPENMW_COMPONENTS_MISC_STRONGTYPEDEF_H
+#define OPENMW_COMPONENTS_MISC_STRONGTYPEDEF_H
+
+#include <utility>
+
+namespace Misc
+{
+    template <class T, class>
+    struct StrongTypedef
+    {
+        T mValue;
+
+        StrongTypedef() = default;
+
+        explicit StrongTypedef(const T& value) : mValue(value) {}
+
+        explicit StrongTypedef(T&& value) : mValue(std::move(value)) {}
+
+        operator const T&() const { return mValue; }
+
+        operator T&() { return mValue; }
+
+        StrongTypedef& operator++()
+        {
+            ++mValue;
+            return *this;
+        }
+
+        StrongTypedef operator++(int)
+        {
+            StrongTypedef copy(*this);
+            operator++();
+            return copy;
+        }
+    };
+}
+
+#endif
diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
index d56708e46c..1bdc0e5693 100644
--- a/components/sceneutil/mwshadowtechnique.cpp
+++ b/components/sceneutil/mwshadowtechnique.cpp
@@ -493,7 +493,7 @@ void MWShadowTechnique::LightData::setLightData(osg::RefMatrix* lm, const osg::L
         lightDir.set(-lightPos.x(), -lightPos.y(), -lightPos.z());
         lightDir.normalize();
         OSG_INFO<<"   Directional light, lightPos="<<lightPos<<", lightDir="<<lightDir<<std::endl;
-        if (lightMatrix.valid() && *lightMatrix != osg::Matrixf(modelViewMatrix))
+        if (lightMatrix.valid() && lightMatrix->operator==(osg::Matrixf(modelViewMatrix)))
         {
             OSG_INFO<<"   Light matrix "<<*lightMatrix<<std::endl;
             osg::Matrix lightToLocalMatrix(*lightMatrix * osg::Matrix::inverse(modelViewMatrix) );

From eca405e5c79f620f77a20380a971b252f2652e84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Fri, 25 Feb 2022 04:02:21 +0200
Subject: [PATCH 2163/2859] Use std::vector instead of std::list

---
 apps/openmw/mwbase/mechanicsmanager.hpp       | 11 ++++----
 apps/openmw/mwmechanics/actors.cpp            | 28 +++++++++----------
 apps/openmw/mwmechanics/actors.hpp            | 10 +++----
 apps/openmw/mwmechanics/aicombat.cpp          |  2 +-
 .../mwmechanics/mechanicsmanagerimp.cpp       | 10 +++----
 .../mwmechanics/mechanicsmanagerimp.hpp       | 10 +++----
 6 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/apps/openmw/mwbase/mechanicsmanager.hpp b/apps/openmw/mwbase/mechanicsmanager.hpp
index fb9197782b..5b41ff7fda 100644
--- a/apps/openmw/mwbase/mechanicsmanager.hpp
+++ b/apps/openmw/mwbase/mechanicsmanager.hpp
@@ -3,7 +3,6 @@
 
 #include <string>
 #include <vector>
-#include <list>
 #include <set>
 #include <cstdint>
 
@@ -199,16 +198,16 @@ namespace MWBase
 
             ///Returns the list of actors which are siding with the given actor in fights
             /**ie AiFollow or AiEscort is active and the target is the actor **/
-            virtual std::list<MWWorld::Ptr> getActorsSidingWith(const MWWorld::Ptr& actor) = 0;
-            virtual std::list<MWWorld::Ptr> getActorsFollowing(const MWWorld::Ptr& actor) = 0;
-            virtual std::list<int> getActorsFollowingIndices(const MWWorld::Ptr& actor) = 0;
+            virtual std::vector<MWWorld::Ptr> getActorsSidingWith(const MWWorld::Ptr& actor) = 0;
+            virtual std::vector<MWWorld::Ptr> getActorsFollowing(const MWWorld::Ptr& actor) = 0;
+            virtual std::vector<int> getActorsFollowingIndices(const MWWorld::Ptr& actor) = 0;
             virtual std::map<int, MWWorld::Ptr> getActorsFollowingByIndex(const MWWorld::Ptr& actor) = 0;
 
             ///Returns a list of actors who are fighting the given actor within the fAlarmDistance
             /** ie AiCombat is active and the target is the actor **/
-            virtual std::list<MWWorld::Ptr> getActorsFighting(const MWWorld::Ptr& actor) = 0;
+            virtual std::vector<MWWorld::Ptr> getActorsFighting(const MWWorld::Ptr& actor) = 0;
 
-            virtual std::list<MWWorld::Ptr> getEnemiesNearby(const MWWorld::Ptr& actor) = 0;
+            virtual std::vector<MWWorld::Ptr> getEnemiesNearby(const MWWorld::Ptr& actor) = 0;
 
             /// Recursive versions of above methods
             virtual void getActorsFollowing(const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out) = 0;
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index b6275070e0..80ae4c6e54 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1969,9 +1969,9 @@ namespace MWMechanics
         return false;
     }
 
-    std::list<MWWorld::Ptr> Actors::getActorsSidingWith(const MWWorld::Ptr& actor)
+    std::vector<MWWorld::Ptr> Actors::getActorsSidingWith(const MWWorld::Ptr& actor)
     {
-        std::list<MWWorld::Ptr> list;
+        std::vector<MWWorld::Ptr> list;
         for(PtrActorMap::iterator iter = mActors.begin(); iter != mActors.end(); ++iter)
         {
             const MWWorld::Ptr &iteratedActor = iter->first;
@@ -2007,9 +2007,9 @@ namespace MWMechanics
         return list;
     }
 
-    std::list<MWWorld::Ptr> Actors::getActorsFollowing(const MWWorld::Ptr& actor)
+    std::vector<MWWorld::Ptr> Actors::getActorsFollowing(const MWWorld::Ptr& actor)
     {
-        std::list<MWWorld::Ptr> list;
+        std::vector<MWWorld::Ptr> list;
         forEachFollowingPackage(mActors, actor, getPlayer(), [&] (auto& iter, const std::shared_ptr<AiPackage>& package)
         {
             if (package->followTargetThroughDoors() && package->getTarget() == actor)
@@ -2022,14 +2022,14 @@ namespace MWMechanics
     }
 
     void Actors::getActorsFollowing(const MWWorld::Ptr &actor, std::set<MWWorld::Ptr>& out) {
-        std::list<MWWorld::Ptr> followers = getActorsFollowing(actor);
+        auto followers = getActorsFollowing(actor);
         for(const MWWorld::Ptr &follower : followers)
             if (out.insert(follower).second)
                 getActorsFollowing(follower, out);
     }
 
     void Actors::getActorsSidingWith(const MWWorld::Ptr &actor, std::set<MWWorld::Ptr>& out) {
-        std::list<MWWorld::Ptr> followers = getActorsSidingWith(actor);
+        auto followers = getActorsSidingWith(actor);
         for(const MWWorld::Ptr &follower : followers)
             if (out.insert(follower).second)
                 getActorsSidingWith(follower, out);
@@ -2042,7 +2042,7 @@ namespace MWMechanics
             out.insert(search->second.begin(), search->second.end());
         else
         {
-            std::list<MWWorld::Ptr> followers = getActorsSidingWith(actor);
+            auto followers = getActorsSidingWith(actor);
             for (const MWWorld::Ptr &follower : followers)
                 if (out.insert(follower).second)
                     getActorsSidingWith(follower, out, cachedAllies);
@@ -2058,9 +2058,9 @@ namespace MWMechanics
         }
     }
 
-    std::list<int> Actors::getActorsFollowingIndices(const MWWorld::Ptr &actor)
+    std::vector<int> Actors::getActorsFollowingIndices(const MWWorld::Ptr &actor)
     {
-        std::list<int> list;
+        std::vector<int> list;
         forEachFollowingPackage(mActors, actor, getPlayer(), [&] (auto& iter, const std::shared_ptr<AiPackage>& package)
         {
             if (package->followTargetThroughDoors() && package->getTarget() == actor)
@@ -2093,8 +2093,8 @@ namespace MWMechanics
         return map;
     }
 
-    std::list<MWWorld::Ptr> Actors::getActorsFighting(const MWWorld::Ptr& actor) {
-        std::list<MWWorld::Ptr> list;
+    std::vector<MWWorld::Ptr> Actors::getActorsFighting(const MWWorld::Ptr& actor) {
+        std::vector<MWWorld::Ptr> list;
         std::vector<MWWorld::Ptr> neighbors;
         osg::Vec3f position (actor.getRefData().getPosition().asVec3());
         getObjectsInRange(position, mActorsProcessingRange, neighbors);
@@ -2108,14 +2108,14 @@ namespace MWMechanics
                 continue;
 
             if (stats.getAiSequence().isInCombat(actor))
-                list.push_front(neighbor);
+                list.push_back(neighbor);
         }
         return list;
     }
 
-    std::list<MWWorld::Ptr> Actors::getEnemiesNearby(const MWWorld::Ptr& actor)
+    std::vector<MWWorld::Ptr> Actors::getEnemiesNearby(const MWWorld::Ptr& actor)
     {
-        std::list<MWWorld::Ptr> list;
+        std::vector<MWWorld::Ptr> list;
         std::vector<MWWorld::Ptr> neighbors;
         osg::Vec3f position (actor.getRefData().getPosition().asVec3());
         getObjectsInRange(position, mActorsProcessingRange, neighbors);
diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index f922be6556..f1985377e8 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -164,8 +164,8 @@ namespace MWMechanics
 
             ///Returns the list of actors which are siding with the given actor in fights
             /**ie AiFollow or AiEscort is active and the target is the actor **/
-            std::list<MWWorld::Ptr> getActorsSidingWith(const MWWorld::Ptr& actor);
-            std::list<MWWorld::Ptr> getActorsFollowing(const MWWorld::Ptr& actor);
+            std::vector<MWWorld::Ptr> getActorsSidingWith(const MWWorld::Ptr& actor);
+            std::vector<MWWorld::Ptr> getActorsFollowing(const MWWorld::Ptr& actor);
 
             /// Recursive version of getActorsFollowing
             void getActorsFollowing(const MWWorld::Ptr &actor, std::set<MWWorld::Ptr>& out);
@@ -175,15 +175,15 @@ namespace MWMechanics
             void getActorsSidingWith(const MWWorld::Ptr &actor, std::set<MWWorld::Ptr>& out, std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr> >& cachedAllies);
 
             /// Get the list of AiFollow::mFollowIndex for all actors following this target
-            std::list<int> getActorsFollowingIndices(const MWWorld::Ptr& actor);
+            std::vector<int> getActorsFollowingIndices(const MWWorld::Ptr& actor);
             std::map<int, MWWorld::Ptr> getActorsFollowingByIndex(const MWWorld::Ptr& actor);
 
             ///Returns the list of actors which are fighting the given actor
             /**ie AiCombat is active and the target is the actor **/
-            std::list<MWWorld::Ptr> getActorsFighting(const MWWorld::Ptr& actor);
+            std::vector<MWWorld::Ptr> getActorsFighting(const MWWorld::Ptr& actor);
 
             /// Unlike getActorsFighting, also returns actors that *would* fight the given actor if they saw him.
-            std::list<MWWorld::Ptr> getEnemiesNearby(const MWWorld::Ptr& actor);
+            std::vector<MWWorld::Ptr> getEnemiesNearby(const MWWorld::Ptr& actor);
 
             void write (ESM::ESMWriter& writer, Loading::Listener& listener) const;
 
diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index 83ff795545..ecf53bf2d8 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -171,7 +171,7 @@ namespace MWMechanics
             actor.getClass().getCreatureStats(actor).setAttackingOrSpell(false);
             storage.mActionCooldown = 0.f;
             // Continue combat if target is player or player follower/escorter and an attack has been attempted
-            const std::list<MWWorld::Ptr>& playerFollowersAndEscorters = MWBase::Environment::get().getMechanicsManager()->getActorsSidingWith(MWMechanics::getPlayer());
+            const auto& playerFollowersAndEscorters = MWBase::Environment::get().getMechanicsManager()->getActorsSidingWith(MWMechanics::getPlayer());
             bool targetSidesWithPlayer = (std::find(playerFollowersAndEscorters.begin(), playerFollowersAndEscorters.end(), target) != playerFollowersAndEscorters.end());
             if ((target == MWMechanics::getPlayer() || targetSidesWithPlayer)
                 && ((actor.getClass().getCreatureStats(actor).getHitAttemptActorId() == target.getClass().getCreatureStats(target).getActorId())
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 6a1f9f2b19..658c5c85c6 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -1639,17 +1639,17 @@ namespace MWMechanics
         return mActors.isAnyObjectInRange(position, radius);
     }
 
-    std::list<MWWorld::Ptr> MechanicsManager::getActorsSidingWith(const MWWorld::Ptr& actor)
+    std::vector<MWWorld::Ptr> MechanicsManager::getActorsSidingWith(const MWWorld::Ptr& actor)
     {
         return mActors.getActorsSidingWith(actor);
     }
 
-    std::list<MWWorld::Ptr> MechanicsManager::getActorsFollowing(const MWWorld::Ptr& actor)
+    std::vector<MWWorld::Ptr> MechanicsManager::getActorsFollowing(const MWWorld::Ptr& actor)
     {
         return mActors.getActorsFollowing(actor);
     }
 
-    std::list<int> MechanicsManager::getActorsFollowingIndices(const MWWorld::Ptr& actor)
+    std::vector<int> MechanicsManager::getActorsFollowingIndices(const MWWorld::Ptr& actor)
     {
         return mActors.getActorsFollowingIndices(actor);
     }
@@ -1659,11 +1659,11 @@ namespace MWMechanics
         return mActors.getActorsFollowingByIndex(actor);
     }
 
-    std::list<MWWorld::Ptr> MechanicsManager::getActorsFighting(const MWWorld::Ptr& actor) {
+    std::vector<MWWorld::Ptr> MechanicsManager::getActorsFighting(const MWWorld::Ptr& actor) {
         return mActors.getActorsFighting(actor);
     }
 
-    std::list<MWWorld::Ptr> MechanicsManager::getEnemiesNearby(const MWWorld::Ptr& actor) {
+    std::vector<MWWorld::Ptr> MechanicsManager::getEnemiesNearby(const MWWorld::Ptr& actor) {
         return mActors.getEnemiesNearby(actor);
     }
 
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
index 0f4c2e606a..6128b8bf52 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
@@ -149,13 +149,13 @@ namespace MWMechanics
             /// Check if there are actors in selected range
             bool isAnyActorInRange(const osg::Vec3f &position, float radius) override;
 
-            std::list<MWWorld::Ptr> getActorsSidingWith(const MWWorld::Ptr& actor) override;
-            std::list<MWWorld::Ptr> getActorsFollowing(const MWWorld::Ptr& actor) override;
-            std::list<int> getActorsFollowingIndices(const MWWorld::Ptr& actor) override;
+            std::vector<MWWorld::Ptr> getActorsSidingWith(const MWWorld::Ptr& actor) override;
+            std::vector<MWWorld::Ptr> getActorsFollowing(const MWWorld::Ptr& actor) override;
+            std::vector<int> getActorsFollowingIndices(const MWWorld::Ptr& actor) override;
             std::map<int, MWWorld::Ptr> getActorsFollowingByIndex(const MWWorld::Ptr& actor) override;
 
-            std::list<MWWorld::Ptr> getActorsFighting(const MWWorld::Ptr& actor) override;
-            std::list<MWWorld::Ptr> getEnemiesNearby(const MWWorld::Ptr& actor) override;
+            std::vector<MWWorld::Ptr> getActorsFighting(const MWWorld::Ptr& actor) override;
+            std::vector<MWWorld::Ptr> getEnemiesNearby(const MWWorld::Ptr& actor) override;
 
             /// Recursive version of getActorsFollowing
             void getActorsFollowing(const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out) override;

From 7f3058d501481bdc6d6e642ef14a635d43f99927 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Fri, 25 Feb 2022 17:40:27 +0100
Subject: [PATCH 2164/2859] Use toStringView in esmtool instead of toString

---
 apps/esmtool/esmtool.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp
index a7946c77a6..a968dcb464 100644
--- a/apps/esmtool/esmtool.cpp
+++ b/apps/esmtool/esmtool.cpp
@@ -293,7 +293,7 @@ void printRaw(ESM::ESMReader &esm)
     while(esm.hasMoreRecs())
     {
         ESM::NAME n = esm.getRecName();
-        std::cout << "Record: " << n.toString() << '\n';
+        std::cout << "Record: " << n.toStringView() << '\n';
         esm.getRecHeader();
         while(esm.hasMoreSubs())
         {
@@ -302,7 +302,7 @@ void printRaw(ESM::ESMReader &esm)
             esm.skipHSub();
             n = esm.retSubName();
             std::ios::fmtflags f(std::cout.flags());
-            std::cout << "    " << n.toString() << " - " << esm.getSubSize()
+            std::cout << "    " << n.toStringView() << " - " << esm.getSubSize()
                  << " bytes @ 0x" << std::hex << offs << '\n';
             std::cout.flags(f);
         }
@@ -367,9 +367,9 @@ int load(Arguments& info)
             auto record = EsmTool::RecordBase::create(n);
             if (record == nullptr)
             {
-                if (skipped.count(n.toInt()) == 0)
+                if (!quiet && skipped.count(n.toInt()) == 0)
                 {
-                    std::cout << "Skipping " << n.toString() << " records.\n";
+                    std::cout << "Skipping " << n.toStringView() << " records.\n";
                     skipped.emplace(n.toInt());
                 }
 
@@ -389,7 +389,7 @@ int load(Arguments& info)
             if (!info.types.empty())
             {
                 std::vector<std::string>::iterator match;
-                match = std::find(info.types.begin(), info.types.end(), n.toString());
+                match = std::find(info.types.begin(), info.types.end(), n.toStringView());
                 if (match == info.types.end()) interested = false;
             }
 
@@ -398,7 +398,7 @@ int load(Arguments& info)
 
             if(!quiet && interested)
             {
-                std::cout << "\nRecord: " << n.toString() << " '" << record->getId() << "'\n";
+                std::cout << "\nRecord: " << n.toStringView() << " '" << record->getId() << "'\n";
                 record->print();
             }
 
@@ -454,7 +454,7 @@ int clone(Arguments& info)
         ESM::NAME name;
         name = stat.first;
         int amount = stat.second;
-        std::cout << std::setw(digitCount) << amount << " " << name.toString() << "  ";
+        std::cout << std::setw(digitCount) << amount << " " << name.toStringView() << "  ";
         if (++i % 3 == 0)
             std::cout << '\n';
     }

From e092ee2624376c5235594cdabb1b0f3c2df7af86 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Mon, 7 Feb 2022 23:37:08 +0100
Subject: [PATCH 2165/2859] Document the Lua Image widget, add UI texture
 resources

---
 apps/openmw/mwlua/luamanagerimp.cpp           |  2 +
 apps/openmw/mwlua/luamanagerimp.hpp           |  6 ++
 apps/openmw/mwlua/uibindings.cpp              | 88 +++++++++++--------
 components/CMakeLists.txt                     |  2 +-
 components/lua_ui/image.cpp                   | 23 ++++-
 components/lua_ui/resources.cpp               | 23 +++++
 components/lua_ui/resources.hpp               | 55 ++++++++++++
 .../lua-scripting/user_interface.rst          |  1 +
 .../reference/lua-scripting/widgets/image.rst | 22 +++++
 files/lua_api/openmw/ui.lua                   | 30 +++++--
 10 files changed, 209 insertions(+), 43 deletions(-)
 create mode 100644 components/lua_ui/resources.cpp
 create mode 100644 components/lua_ui/resources.hpp
 create mode 100644 docs/source/reference/lua-scripting/widgets/image.rst

diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 0dcd72d359..3319e975cc 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -37,6 +37,8 @@ namespace MWLua
         mLocalLoader = createUserdataSerializer(true, mWorldView.getObjectRegistry(), &mContentFileMapping);
 
         mGlobalScripts.setSerializer(mGlobalSerializer.get());
+
+        mUiResourceManager = std::make_unique<LuaUi::ResourceManager>(vfs);
     }
 
     void LuaManager::initConfiguration()
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index b292eb3c1b..fecb9478e0 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -8,6 +8,8 @@
 #include <components/lua/luastate.hpp>
 #include <components/lua/storage.hpp>
 
+#include <components/lua_ui/resources.hpp>
+
 #include "../mwbase/luamanager.hpp"
 
 #include "actions.hpp"
@@ -89,10 +91,14 @@ namespace MWLua
             return [this, c](Arg arg) { this->queueCallback(c, sol::make_object(c.mFunc.lua_state(), arg)); };
         }
 
+        LuaUi::ResourceManager* uiResourceManager() { return mUiResourceManager.get(); }
+
     private:
         void initConfiguration();
         LocalScripts* createLocalScripts(const MWWorld::Ptr& ptr, ESM::LuaScriptCfg::Flags);
 
+        std::unique_ptr<LuaUi::ResourceManager> mUiResourceManager;
+
         bool mInitialized = false;
         bool mGlobalScriptsStarted = false;
         LuaUtil::ScriptsConfiguration mConfiguration;
diff --git a/apps/openmw/mwlua/uibindings.cpp b/apps/openmw/mwlua/uibindings.cpp
index 248f82f28a..0572365b57 100644
--- a/apps/openmw/mwlua/uibindings.cpp
+++ b/apps/openmw/mwlua/uibindings.cpp
@@ -4,6 +4,7 @@
 #include <components/lua_ui/content.hpp>
 #include <components/lua_ui/registerscriptsettings.hpp>
 #include <components/lua_ui/alignment.hpp>
+#include <components/lua_ui/resources.hpp>
 
 #include "context.hpp"
 #include "actions.hpp"
@@ -77,45 +78,45 @@ namespace MWLua
                 std::shared_ptr<LuaUi::Element> mElement;
         };
 
-        // Lua arrays index from 1
-        inline size_t fromLuaIndex(size_t i) { return i - 1; }
-        inline size_t toLuaIndex(size_t i) { return i + 1; }
-    }
+        class LayerAction final : public Action
+        {
+            public:
+                LayerAction(std::string_view name, std::string_view afterName,
+                    LuaUi::Layers::Options options, LuaUtil::LuaState* state)
+                    : Action(state)
+                    , mName(name)
+                    , mAfterName(afterName)
+                    , mOptions(options)
+                {}
 
-    class LayerAction final : public Action
-    {
-        public:
-            LayerAction(std::string_view name, std::string_view afterName,
-                LuaUi::Layers::Options options, LuaUtil::LuaState* state)
-                : Action(state)
-                , mName(name)
-                , mAfterName(afterName)
-                , mOptions(options)
-            {}
+                void apply(WorldView&) const override
+                {
+                    size_t index = LuaUi::Layers::indexOf(mAfterName);
+                    if (index == LuaUi::Layers::size())
+                        throw std::logic_error(std::string("Layer not found"));
+                    LuaUi::Layers::insert(index, mName, mOptions);
+                }
 
-            void apply(WorldView&) const override
-            {
-                size_t index = LuaUi::Layers::indexOf(mAfterName);
-                if (index == LuaUi::Layers::size())
-                    throw std::logic_error(std::string("Layer not found"));
-                LuaUi::Layers::insert(index, mName, mOptions);
-            }
+                std::string toString() const override
+                {
+                    std::string result("Insert UI layer \"");
+                    result += mName;
+                    result += "\" after \"";
+                    result += mAfterName;
+                    result += "\"";
+                    return result;
+                }
 
-            std::string toString() const override
-            {
-                std::string result("Insert UI layer \"");
-                result += mName;
-                result += "\" after \"";
-                result += mAfterName;
-                result += "\"";
-                return result;
-            }
+            private:
+                std::string mName;
+                std::string mAfterName;
+                LuaUi::Layers::Options mOptions;
+        };
 
-        private:
-            std::string mName;
-            std::string mAfterName;
-            LuaUi::Layers::Options mOptions;
-    };
+        // Lua arrays index from 1
+        inline size_t fromLuaIndex(size_t i) { return i - 1; }
+        inline size_t toLuaIndex(size_t i) { return i + 1; }
+    }
 
     sol::table initUserInterfacePackage(const Context& context)
     {
@@ -278,6 +279,23 @@ namespace MWLua
 
         api["registerSettingsPage"] = &LuaUi::registerSettingsPage;
 
+        api["texture"] = [luaManager=context.mLuaManager](const sol::table& options)
+        {
+            LuaUi::TextureData data;
+            sol::object path = LuaUtil::getFieldOrNil(options, "path");
+            if (path.is<std::string>() and !path.as<std::string>().empty())
+                data.mPath = path.as<std::string>();
+            else
+                throw sol::error("Invalid texture path");
+            sol::object offset = LuaUtil::getFieldOrNil(options, "offset");
+            if (offset.is<osg::Vec2f>())
+                data.mOffset = offset.as<osg::Vec2f>();
+            sol::object size = LuaUtil::getFieldOrNil(options, "size");
+            if (size.is<osg::Vec2f>())
+                data.mSize = size.as<osg::Vec2f>();
+            return luaManager->uiResourceManager()->registerTexture(data);
+        };
+
         return LuaUtil::makeReadOnly(api);
     }
 }
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 929df9b20d..e183d54a95 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -259,7 +259,7 @@ add_component_dir (queries
     
 add_component_dir (lua_ui
     registerscriptsettings scriptsettings
-    properties widget element util layers content alignment
+    properties widget element util layers content alignment resources
     adapter text textedit window image container
     )
 
diff --git a/components/lua_ui/image.cpp b/components/lua_ui/image.cpp
index c72bac21e9..9dab34868e 100644
--- a/components/lua_ui/image.cpp
+++ b/components/lua_ui/image.cpp
@@ -2,6 +2,8 @@
 
 #include <MyGUI_RenderManager.h>
 
+#include "resources.hpp"
+
 namespace LuaUi
 {
     void LuaTileRect::_setAlign(const MyGUI::IntSize& _oldsize)
@@ -33,19 +35,38 @@ namespace LuaUi
 
     void LuaImage::updateProperties()
     {
-        setImageTexture(propertyValue("path", std::string()));
+        TextureResource* resource = propertyValue<TextureResource*>("resource", nullptr);
+        MyGUI::IntCoord atlasCoord;
+        if (resource)
+        {
+            auto& data = resource->data();
+            atlasCoord = MyGUI::IntCoord(
+                static_cast<int>(data.mOffset.x()),
+                static_cast<int>(data.mOffset.y()),
+                static_cast<int>(data.mSize.x()),
+                static_cast<int>(data.mSize.y()));
+            setImageTexture(data.mPath);
+        }
 
         bool tileH = propertyValue("tileH", false);
         bool tileV = propertyValue("tileV", false);
+
         MyGUI::ITexture* texture = MyGUI::RenderManager::getInstance().getTexture(_getTextureName());
         MyGUI::IntSize textureSize;
         if (texture != nullptr)
             textureSize = MyGUI::IntSize(texture->getWidth(), texture->getHeight());
+
         mTileRect->updateSize(MyGUI::IntSize(
             tileH ? textureSize.width : 0,
             tileV ? textureSize.height : 0
         ));
 
+        if (atlasCoord.width == 0)
+            atlasCoord.width = textureSize.width;
+        if (atlasCoord.height == 0)
+            atlasCoord.height = textureSize.height;
+        setImageCoord(atlasCoord);
+
         WidgetExtension::updateProperties();
     }
 }
diff --git a/components/lua_ui/resources.cpp b/components/lua_ui/resources.cpp
new file mode 100644
index 0000000000..421375f9cb
--- /dev/null
+++ b/components/lua_ui/resources.cpp
@@ -0,0 +1,23 @@
+#include "resources.hpp"
+
+#include <components/vfs/manager.hpp>
+
+namespace LuaUi
+{
+    std::shared_ptr<TextureResource> ResourceManager::registerTexture(TextureData data)
+    {
+        std::string normalizedPath = vfs()->normalizeFilename(data.mPath);
+        if (!vfs()->exists(normalizedPath))
+        {
+            std::string error("Texture with path \"");
+            error += data.mPath;
+            error += "\" doesn't exist";
+            throw std::logic_error(error);
+        }
+        data.mPath = normalizedPath;
+        
+        TextureResources& list = mTextures[normalizedPath];
+        list.push_back(std::make_shared<TextureResource>(data));
+        return list.back();
+    }
+}
diff --git a/components/lua_ui/resources.hpp b/components/lua_ui/resources.hpp
new file mode 100644
index 0000000000..6bad0b0337
--- /dev/null
+++ b/components/lua_ui/resources.hpp
@@ -0,0 +1,55 @@
+#ifndef OPENMW_LUAUI_RESOURCES
+#define OPENMW_LUAUI_RESOURCES
+
+#include <string>
+#include <unordered_map>
+#include <vector>
+#include <memory>
+
+#include <osg/Vec2f>
+
+namespace VFS
+{
+    class Manager;
+}
+
+namespace LuaUi
+{
+    struct TextureData
+    {
+        std::string mPath;
+        osg::Vec2f mOffset;
+        osg::Vec2f mSize;
+    };
+
+    class TextureResource
+    {
+        public:
+            TextureResource(TextureData data)
+                : mData(data)
+                {}
+
+            const TextureData& data() { return mData; }
+        private:
+            TextureData mData;
+    };
+
+    class ResourceManager {
+        public:
+            ResourceManager(const VFS::Manager* vfs)
+                : mVfs(vfs)
+            {}
+
+            std::shared_ptr<TextureResource> registerTexture(TextureData data);
+
+        protected:
+            const VFS::Manager* vfs() const { return mVfs; }
+
+        private:
+            const VFS::Manager* mVfs;
+            using TextureResources = std::vector<std::shared_ptr<TextureResource>>;
+            std::unordered_map<std::string, TextureResources> mTextures;
+    };
+}
+
+#endif // OPENMW_LUAUI_LAYERS
diff --git a/docs/source/reference/lua-scripting/user_interface.rst b/docs/source/reference/lua-scripting/user_interface.rst
index e00aa8bf63..71ad61b410 100644
--- a/docs/source/reference/lua-scripting/user_interface.rst
+++ b/docs/source/reference/lua-scripting/user_interface.rst
@@ -80,6 +80,7 @@ Widget types
    Widget: Base widget type, all the other widgets inherit its properties and events. <widgets/widget>
    Text: Displays text. <widgets/text>
    TextEdit: Accepts text input from the user. <widgets/textedit>
+   Image: Renders a texture. <widgets/image>
 
 Example
 -------
diff --git a/docs/source/reference/lua-scripting/widgets/image.rst b/docs/source/reference/lua-scripting/widgets/image.rst
new file mode 100644
index 0000000000..cae8753d52
--- /dev/null
+++ b/docs/source/reference/lua-scripting/widgets/image.rst
@@ -0,0 +1,22 @@
+Image Widget
+============
+
+Properties
+----------
+
+.. list-table::
+  :header-rows: 1
+  :widths: 20 20 60
+
+  * - name
+    - type (default value)
+    - description
+  * - resource
+    - ui.texture
+    - The texture resource to display
+  * - tileH
+    - boolean (false)
+    - Whether to tile the texture horizontally
+  * - tileV
+    - boolean (false)
+    - Whether to tile the texture vertically
diff --git a/files/lua_api/openmw/ui.lua b/files/lua_api/openmw/ui.lua
index 478b9235a5..c9df230900 100644
--- a/files/lua_api/openmw/ui.lua
+++ b/files/lua_api/openmw/ui.lua
@@ -53,7 +53,15 @@
 ---
 -- Adds a settings page to main menu setting's Scripts tab.
 -- @function [parent=#ui] registerSettingsPage
--- @param #SettingsPage page
+-- @param #SettingsPageOptions page
+
+---
+-- Table with settings page options, passed as an argument to ui.registerSettingsPage
+-- @type SettingsPageOptions
+-- @field #string name Name of the page, displayed in the list, used for search
+-- @field #string searchHints Additional keywords used in search, not displayed anywhere
+-- @field #Element element The page's UI, which will be attached to the settings tab. The root widget has to have a fixed size (set `size` field in `props`, see Widget documentation, `relativeSize` is ignored)
+
 
 ---
 -- Layout
@@ -162,10 +170,20 @@
 -- @field #number button Mouse button which triggered the event (could be nil)
 
 ---
--- Settings page parameters, passed as an argument to ui.registerSettingsPage
--- @type SettingsPage
--- @field #string name Name of the page, displayed in the list, used for search
--- @field #string searchHints Additional keywords used in search, not displayed anywhere
--- @field #Element element The page's UI, which will be attached to the settings tab. The root widget has to have a fixed size (set `size` field in `props`, see Widget documentation, `relativeSize` is ignored)
+-- Register a new texture resource
+-- @function [parent=#ui] texture #TextureResource
+-- @param #TextureResourceOptions options
+
+---
+-- A texture ready to be used by UI widgets
+-- @type TextureResource
+
+---
+-- Table with argument passed to ui.texture
+-- @type TextureResourceOptions
+-- @field #string path Path to the texture file. Required
+-- @field openmw.util#Vector2 offset Offset of this resource in the texture. (0, 0) by default
+-- @field openmw.util#Vector2 size Size of the resource  in the texture. (0, 0) by default.
+-- 0 means the whole texture size is used.
 
 return nil

From fc50724f5c2306bc060bb500839b04263ebd98eb Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Tue, 8 Feb 2022 13:38:42 +0100
Subject: [PATCH 2166/2859] Render text and images correctly in templates with
 slots

---
 apps/openmw/mwlua/uibindings.cpp |  2 +-
 components/lua_ui/element.cpp    |  3 +--
 components/lua_ui/image.cpp      |  2 +-
 components/lua_ui/image.hpp      |  4 +---
 components/lua_ui/text.cpp       |  2 +-
 components/lua_ui/textedit.cpp   |  2 +-
 components/lua_ui/widget.cpp     | 21 +++++++++++++++++----
 components/lua_ui/widget.hpp     |  4 +++-
 files/mygui/openmw_lua.xml       | 10 ++++------
 9 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/apps/openmw/mwlua/uibindings.cpp b/apps/openmw/mwlua/uibindings.cpp
index 0572365b57..031bb67af0 100644
--- a/apps/openmw/mwlua/uibindings.cpp
+++ b/apps/openmw/mwlua/uibindings.cpp
@@ -283,7 +283,7 @@ namespace MWLua
         {
             LuaUi::TextureData data;
             sol::object path = LuaUtil::getFieldOrNil(options, "path");
-            if (path.is<std::string>() and !path.as<std::string>().empty())
+            if (path.is<std::string>() && !path.as<std::string>().empty())
                 data.mPath = path.as<std::string>();
             else
                 throw sol::error("Invalid texture path");
diff --git a/components/lua_ui/element.cpp b/components/lua_ui/element.cpp
index d2074ecfc2..47dd0a3d38 100644
--- a/components/lua_ui/element.cpp
+++ b/components/lua_ui/element.cpp
@@ -130,8 +130,7 @@ namespace LuaUi
 
     void updateWidget(WidgetExtension* ext, const sol::table& layout)
     {
-        ext->resetSlot(); // otherwise if template gets changed, all non-template children will get destroyed
-
+        ext->reset();
         ext->setLayout(layout);
         ext->setExternal(layout.get<sol::object>(LayoutKeys::external));
         setTemplate(ext, layout.get<sol::object>(LayoutKeys::templateLayout));
diff --git a/components/lua_ui/image.cpp b/components/lua_ui/image.cpp
index 9dab34868e..4a25416835 100644
--- a/components/lua_ui/image.cpp
+++ b/components/lua_ui/image.cpp
@@ -27,7 +27,7 @@ namespace LuaUi
             mTileSize.height = 1e7;
     }
 
-    LuaImage::LuaImage()
+    void LuaImage::initialize()
     {
         changeWidgetSkin("LuaImage");
         mTileRect = dynamic_cast<LuaTileRect*>(getSubWidgetMain());
diff --git a/components/lua_ui/image.hpp b/components/lua_ui/image.hpp
index e841e55fdb..f7df102440 100644
--- a/components/lua_ui/image.hpp
+++ b/components/lua_ui/image.hpp
@@ -25,10 +25,8 @@ namespace LuaUi
     {
         MYGUI_RTTI_DERIVED(LuaImage)
 
-        public:
-            LuaImage();
-
         protected:
+            void initialize() override;
             void updateProperties() override;
             LuaTileRect* mTileRect;
     };
diff --git a/components/lua_ui/text.cpp b/components/lua_ui/text.cpp
index 3a56ad68af..9ec31834f4 100644
--- a/components/lua_ui/text.cpp
+++ b/components/lua_ui/text.cpp
@@ -10,7 +10,7 @@ namespace LuaUi
 
     void LuaText::initialize()
     {
-        changeWidgetSkin("SandText");
+        changeWidgetSkin("LuaText");
         setEditStatic(true);
         setVisibleHScroll(false);
         setVisibleVScroll(false);
diff --git a/components/lua_ui/textedit.cpp b/components/lua_ui/textedit.cpp
index ac44872f21..5cb47ec34a 100644
--- a/components/lua_ui/textedit.cpp
+++ b/components/lua_ui/textedit.cpp
@@ -6,7 +6,7 @@ namespace LuaUi
 {
     void LuaTextEdit::initialize()
     {
-        changeWidgetSkin("LuaTextEdit");
+        changeWidgetSkin("LuaText");
 
         eventEditTextChange += MyGUI::newDelegate(this, &LuaTextEdit::textChange);
 
diff --git a/components/lua_ui/widget.cpp b/components/lua_ui/widget.cpp
index 4364a0c362..96a6d096bd 100644
--- a/components/lua_ui/widget.cpp
+++ b/components/lua_ui/widget.cpp
@@ -24,9 +24,8 @@ namespace LuaUi
     {
         mLua = lua;
         mWidget = self;
-        updateTemplate();
-
         initialize();
+        updateTemplate();
     }
 
     void WidgetExtension::initialize()
@@ -72,6 +71,13 @@ namespace LuaUi
             w->deinitialize();
     }
 
+    void WidgetExtension::reset()
+    {
+        // detach all children from the slot widget, in case it gets destroyed
+        for (auto& w: mChildren)
+            w->widget()->detachFromWidget();
+    }
+
     void WidgetExtension::attach(WidgetExtension* ext)
     {
         ext->mParent = this;
@@ -182,8 +188,15 @@ namespace LuaUi
         else
             mSlot = slot->mSlot;
         if (mSlot != oldSlot)
-            for (WidgetExtension* w : mChildren)
-                attach(w);
+        {
+            MyGUI::IntSize slotSize = mSlot->widget()->getSize();
+            MyGUI::IntPoint slotPosition = mSlot->widget()->getAbsolutePosition() - widget()->getAbsolutePosition();
+            MyGUI::IntCoord slotCoord(slotPosition, slotSize);
+            if (mWidget->getSubWidgetMain())
+                mWidget->getSubWidgetMain()->setCoord(slotCoord);
+            if (mWidget->getSubWidgetText())
+                mWidget->getSubWidgetText()->setCoord(slotCoord);
+        }
     }
 
     void WidgetExtension::setCallback(const std::string& name, const LuaUtil::Callback& callback)
diff --git a/components/lua_ui/widget.hpp b/components/lua_ui/widget.hpp
index 9037443676..827993d47d 100644
--- a/components/lua_ui/widget.hpp
+++ b/components/lua_ui/widget.hpp
@@ -28,6 +28,9 @@ namespace LuaUi
         virtual void deinitialize();
 
         MyGUI::Widget* widget() const { return mWidget; }
+        WidgetExtension* slot() const { return mSlot; }
+
+        void reset();
 
         const std::vector<WidgetExtension*>& children() { return mChildren; }
         void setChildren(const std::vector<WidgetExtension*>&);
@@ -50,7 +53,6 @@ namespace LuaUi
 
         const sol::table& getLayout() { return mLayout; }
         void setLayout(const sol::table& layout) { mLayout = layout; }
-        void resetSlot() { mSlot = this; }
 
         template <typename T>
         T externalValue(std::string_view name, const T& defaultValue)
diff --git a/files/mygui/openmw_lua.xml b/files/mygui/openmw_lua.xml
index cb0af2b4a9..588fc53014 100644
--- a/files/mygui/openmw_lua.xml
+++ b/files/mygui/openmw_lua.xml
@@ -4,12 +4,10 @@
     <Resource type="ResourceSkin" name="LuaImage">
         <BasisSkin type="LuaTileRect"/>
     </Resource>
-    
-    <Resource type="ResourceSkin" name="LuaTextEdit" size="512 20">
-        <Property key="FontName" value="Default"/>
-        <Property key="TextAlign" value="Left VCenter"/>
-        <Property key="TextColour" value="#{fontcolour=normal}"/>
 
-        <Child type="TextBox" skin="MW_TextEditClient" offset="0 0 502 20" align="Stretch" name="Client"/>
+    <Resource type="ResourceSkin" name="LuaText" size="16 16">
+        <Property key="FontName" value="Default"/>
+        <Property key="TextAlign" value="Left Top"/>
+        <BasisSkin type="SimpleText" offset="0 0 16 16" align="Stretch" />
     </Resource>
 </MyGUI>
\ No newline at end of file

From e7ed709e5ebd862207303ec26966be5617405bae Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Wed, 16 Feb 2022 21:48:21 +0100
Subject: [PATCH 2167/2859] Fix Lua TextEdit skin

---
 components/lua_ui/textedit.cpp |  2 +-
 files/mygui/openmw_lua.xml     | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/components/lua_ui/textedit.cpp b/components/lua_ui/textedit.cpp
index 5cb47ec34a..ac44872f21 100644
--- a/components/lua_ui/textedit.cpp
+++ b/components/lua_ui/textedit.cpp
@@ -6,7 +6,7 @@ namespace LuaUi
 {
     void LuaTextEdit::initialize()
     {
-        changeWidgetSkin("LuaText");
+        changeWidgetSkin("LuaTextEdit");
 
         eventEditTextChange += MyGUI::newDelegate(this, &LuaTextEdit::textChange);
 
diff --git a/files/mygui/openmw_lua.xml b/files/mygui/openmw_lua.xml
index 588fc53014..6e5e232a2a 100644
--- a/files/mygui/openmw_lua.xml
+++ b/files/mygui/openmw_lua.xml
@@ -8,6 +8,16 @@
     <Resource type="ResourceSkin" name="LuaText" size="16 16">
         <Property key="FontName" value="Default"/>
         <Property key="TextAlign" value="Left Top"/>
-        <BasisSkin type="SimpleText" offset="0 0 16 16" align="Stretch" />
+        <BasisSkin type="SimpleText" offset="0 0 16 16" align="Stretch" name="Client" />
+    </Resource>
+
+    <Resource type="ResourceSkin" name="LuaTextEditClient" size="16 16">
+        <BasisSkin type="EditText" offset="0 0 16 16" align="Stretch" name="Client" />
+    </Resource>
+
+    <Resource type="ResourceSkin" name="LuaTextEdit" size="16 16">
+        <Property key="FontName" value="Default"/>
+        <Property key="TextAlign" value="Left Top"/>
+        <Child type="TextBox" skin="LuaTextEditClient" offset="0 0 16 16" align="Stretch" name="Client"/>
     </Resource>
 </MyGUI>
\ No newline at end of file

From 94cc090f7340a0a085bf459985957e90bc7003b9 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Mon, 21 Feb 2022 15:31:54 +0100
Subject: [PATCH 2168/2859] PR feedack for documentation

---
 docs/source/reference/lua-scripting/widgets/image.rst | 4 ++--
 files/lua_api/openmw/ui.lua                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/source/reference/lua-scripting/widgets/image.rst b/docs/source/reference/lua-scripting/widgets/image.rst
index cae8753d52..bd68687cfe 100644
--- a/docs/source/reference/lua-scripting/widgets/image.rst
+++ b/docs/source/reference/lua-scripting/widgets/image.rst
@@ -16,7 +16,7 @@ Properties
     - The texture resource to display
   * - tileH
     - boolean (false)
-    - Whether to tile the texture horizontally
+    - Tile the texture horizontally
   * - tileV
     - boolean (false)
-    - Whether to tile the texture vertically
+    - Tile the texture vertically
diff --git a/files/lua_api/openmw/ui.lua b/files/lua_api/openmw/ui.lua
index c9df230900..d8f7d865e1 100644
--- a/files/lua_api/openmw/ui.lua
+++ b/files/lua_api/openmw/ui.lua
@@ -60,7 +60,7 @@
 -- @type SettingsPageOptions
 -- @field #string name Name of the page, displayed in the list, used for search
 -- @field #string searchHints Additional keywords used in search, not displayed anywhere
--- @field #Element element The page's UI, which will be attached to the settings tab. The root widget has to have a fixed size (set `size` field in `props`, see Widget documentation, `relativeSize` is ignored)
+-- @field #Element element The page's UI, which will be attached to the settings tab. The root widget has to have a fixed size. Set the `size` field in `props`, `relativeSize` is ignored.
 
 
 ---
@@ -183,7 +183,7 @@
 -- @type TextureResourceOptions
 -- @field #string path Path to the texture file. Required
 -- @field openmw.util#Vector2 offset Offset of this resource in the texture. (0, 0) by default
--- @field openmw.util#Vector2 size Size of the resource  in the texture. (0, 0) by default.
+-- @field openmw.util#Vector2 size Size of the resource in the texture. (0, 0) by default.
 -- 0 means the whole texture size is used.
 
 return nil

From e7474490a11b4dfadccea818c81c1ac434cf807a Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Mon, 21 Feb 2022 15:38:54 +0100
Subject: [PATCH 2169/2859] Document using ui.texture to create atlases

---
 files/lua_api/openmw/ui.lua | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/files/lua_api/openmw/ui.lua b/files/lua_api/openmw/ui.lua
index d8f7d865e1..6461588a69 100644
--- a/files/lua_api/openmw/ui.lua
+++ b/files/lua_api/openmw/ui.lua
@@ -170,20 +170,33 @@
 -- @field #number button Mouse button which triggered the event (could be nil)
 
 ---
--- Register a new texture resource
+-- Register a new texture resource. Can be used to manually atlas UI textures.
 -- @function [parent=#ui] texture #TextureResource
 -- @param #TextureResourceOptions options
+-- @usage
+-- local ui = require('openmw.ui')
+-- local vector2 = require('openmw.util').vector2
+-- local myAtlas = 'textures/my_atlas.dds' -- a 128x128 atlas
+-- local texture1 = ui.texture { -- texture in the top left corner of the atlas
+--     path = myAtlas,
+--     offset = vector2(0, 0),
+--     size = vector2(64, 64),
+-- }
+-- local texture2 = ui.texture { -- texture in the top right corner of the atlas
+--     path = myAtlas,
+--     offset = vector2(64, 0),
+--     size = vector2(64, 64),
+-- }
 
 ---
 -- A texture ready to be used by UI widgets
 -- @type TextureResource
 
 ---
--- Table with argument passed to ui.texture
+-- Table with arguments passed to ui.texture.
 -- @type TextureResourceOptions
 -- @field #string path Path to the texture file. Required
 -- @field openmw.util#Vector2 offset Offset of this resource in the texture. (0, 0) by default
--- @field openmw.util#Vector2 size Size of the resource in the texture. (0, 0) by default.
--- 0 means the whole texture size is used.
+-- @field openmw.util#Vector2 size Size of the resource in the texture. (0, 0) by default. 0 means the whole texture size is used.
 
 return nil

From a7bb87d8a150352415328703ee79306a43d647f9 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Mon, 21 Feb 2022 15:57:40 +0100
Subject: [PATCH 2170/2859] Use StringUtils::format

---
 components/lua_ui/resources.cpp | 5 ++---
 components/lua_ui/resources.hpp | 9 +++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/components/lua_ui/resources.cpp b/components/lua_ui/resources.cpp
index 421375f9cb..92318a8a46 100644
--- a/components/lua_ui/resources.cpp
+++ b/components/lua_ui/resources.cpp
@@ -1,6 +1,7 @@
 #include "resources.hpp"
 
 #include <components/vfs/manager.hpp>
+#include <components/misc/stringops.hpp>
 
 namespace LuaUi
 {
@@ -9,9 +10,7 @@ namespace LuaUi
         std::string normalizedPath = vfs()->normalizeFilename(data.mPath);
         if (!vfs()->exists(normalizedPath))
         {
-            std::string error("Texture with path \"");
-            error += data.mPath;
-            error += "\" doesn't exist";
+            auto error = Misc::StringUtils::format("Texture with path \"%s\" doesn't exist", data.mPath);
             throw std::logic_error(error);
         }
         data.mPath = normalizedPath;
diff --git a/components/lua_ui/resources.hpp b/components/lua_ui/resources.hpp
index 6bad0b0337..da9d566273 100644
--- a/components/lua_ui/resources.hpp
+++ b/components/lua_ui/resources.hpp
@@ -27,14 +27,16 @@ namespace LuaUi
         public:
             TextureResource(TextureData data)
                 : mData(data)
-                {}
+            {}
 
             const TextureData& data() { return mData; }
+
         private:
             TextureData mData;
     };
 
-    class ResourceManager {
+    class ResourceManager
+    {
         public:
             ResourceManager(const VFS::Manager* vfs)
                 : mVfs(vfs)
@@ -42,10 +44,9 @@ namespace LuaUi
 
             std::shared_ptr<TextureResource> registerTexture(TextureData data);
 
-        protected:
+        private:
             const VFS::Manager* vfs() const { return mVfs; }
 
-        private:
             const VFS::Manager* mVfs;
             using TextureResources = std::vector<std::shared_ptr<TextureResource>>;
             std::unordered_map<std::string, TextureResources> mTextures;

From fe13fa850ecffd20b21bf5ab943aaa6d8ce4d93a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Mocquillon?= <cedric.mocquillon@gmail.com>
Date: Sat, 26 Feb 2022 14:30:06 +0100
Subject: [PATCH 2171/2859] Fix bug on memorystream

---
 components/bsa/memorystream.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/bsa/memorystream.hpp b/components/bsa/memorystream.hpp
index 5aae448299..0b7e0da9e2 100644
--- a/components/bsa/memorystream.hpp
+++ b/components/bsa/memorystream.hpp
@@ -40,7 +40,7 @@ namespace Bsa
 
     Memory buffer is freed once the class instance is destroyed.
  */
-class MemoryInputStream : private std::vector<char>, public virtual Files::MemBuf, public std::istream {
+class MemoryInputStream : private std::vector<char>, public Files::MemBuf, public std::istream {
 public:
     explicit MemoryInputStream(size_t bufferSize)
         : std::vector<char>(bufferSize)

From 21a363d96ffef0ba0d66b9a7c2086a4ad746e43b Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sat, 26 Feb 2022 13:54:42 +0000
Subject: [PATCH 2172/2859] Refactor UI layers

---
 apps/openmw/mwgui/debugwindow.cpp             |  6 ------
 apps/openmw/mwgui/hud.cpp                     |  2 --
 apps/openmw/mwgui/layout.cpp                  |  6 +++---
 apps/openmw/mwgui/loadingscreen.cpp           | 21 +++++++------------
 apps/openmw/mwgui/loadingscreen.hpp           |  2 +-
 apps/openmw/mwgui/screenfader.cpp             |  3 ---
 apps/openmw/mwgui/windowmanagerimp.cpp        |  2 +-
 files/mygui/openmw_chargen_birth.layout       |  2 +-
 files/mygui/openmw_chargen_class.layout       |  2 +-
 .../openmw_chargen_class_description.layout   |  2 +-
 .../mygui/openmw_chargen_create_class.layout  |  2 +-
 ...penmw_chargen_generate_class_result.layout |  2 +-
 files/mygui/openmw_chargen_race.layout        |  2 +-
 files/mygui/openmw_chargen_review.layout      |  2 +-
 .../openmw_chargen_select_attribute.layout    |  2 +-
 .../mygui/openmw_chargen_select_skill.layout  |  2 +-
 files/mygui/openmw_confirmation_dialog.layout |  2 +-
 files/mygui/openmw_console.layout             |  2 +-
 files/mygui/openmw_count_window.layout        |  2 +-
 files/mygui/openmw_edit_effect.layout         |  2 +-
 files/mygui/openmw_edit_note.layout           |  2 +-
 files/mygui/openmw_infobox.layout             |  2 +-
 .../openmw_interactive_messagebox.layout      |  2 +-
 .../mygui/openmw_itemselection_dialog.layout  |  2 +-
 files/mygui/openmw_layers.xml                 | 15 ++++++-------
 files/mygui/openmw_loading_screen.layout      |  4 +++-
 .../mygui/openmw_magicselection_dialog.layout |  2 +-
 files/mygui/openmw_persuasion_dialog.layout   |  2 +-
 files/mygui/openmw_quickkeys_menu.layout      |  2 +-
 files/mygui/openmw_savegame_dialog.layout     |  2 +-
 files/mygui/openmw_screen_fader.layout        |  2 +-
 files/mygui/openmw_screen_fader_hit.layout    |  2 +-
 files/mygui/openmw_settings_window.layout     |  2 +-
 files/mygui/openmw_text_input.layout          |  2 +-
 files/mygui/openmw_tooltips.layout            |  2 +-
 files/mygui/openmw_windows.skin.xml           |  6 +-----
 36 files changed, 50 insertions(+), 69 deletions(-)

diff --git a/apps/openmw/mwgui/debugwindow.cpp b/apps/openmw/mwgui/debugwindow.cpp
index a29910f000..728e16b21a 100644
--- a/apps/openmw/mwgui/debugwindow.cpp
+++ b/apps/openmw/mwgui/debugwindow.cpp
@@ -2,7 +2,6 @@
 
 #include <MyGUI_TabControl.h>
 #include <MyGUI_TabItem.h>
-#include <MyGUI_RenderManager.h>
 #include <MyGUI_EditBox.h>
 
 #include <LinearMath/btQuickprof.h>
@@ -92,11 +91,6 @@ namespace MWGui
         MyGUI::TabItem* item = mTabControl->addItem("Physics Profiler");
         mBulletProfilerEdit = item->createWidgetReal<MyGUI::EditBox>
                 ("LogEdit", MyGUI::FloatCoord(0,0,1,1), MyGUI::Align::Stretch);
-
-        MyGUI::IntSize viewSize = MyGUI::RenderManager::getInstance().getViewSize();
-        mMainWidget->setSize(viewSize);
-
-
     }
 
     void DebugWindow::onFrame(float dt)
diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp
index e591163731..1aa0496ae9 100644
--- a/apps/openmw/mwgui/hud.cpp
+++ b/apps/openmw/mwgui/hud.cpp
@@ -99,8 +99,6 @@ namespace MWGui
         , mIsDrowning(false)
         , mDrowningFlashTheta(0.f)
     {
-        mMainWidget->setSize(MyGUI::RenderManager::getInstance().getViewSize());
-
         // Energy bars
         getWidget(mHealthFrame, "HealthFrame");
         getWidget(mHealth, "Health");
diff --git a/apps/openmw/mwgui/layout.cpp b/apps/openmw/mwgui/layout.cpp
index 9b9b9537f9..06577f780c 100644
--- a/apps/openmw/mwgui/layout.cpp
+++ b/apps/openmw/mwgui/layout.cpp
@@ -24,10 +24,10 @@ namespace MWGui
             for (MyGUI::Widget* widget : mListWindowRoot)
             {
                 if (widget->getName() == main_name)
-                {
                     mMainWidget = widget;
-                    break;
-                }
+
+                // Force the alignment to update immedeatly
+                widget->_setAlign(widget->getSize(), widget->getParentSize());
             }
             MYGUI_ASSERT(mMainWidget, "root widget name '" << MAIN_WINDOW << "' in layout '" << mLayoutName << "' not found.");
         }
diff --git a/apps/openmw/mwgui/loadingscreen.cpp b/apps/openmw/mwgui/loadingscreen.cpp
index ef8eea0104..1ea53a6ec7 100644
--- a/apps/openmw/mwgui/loadingscreen.cpp
+++ b/apps/openmw/mwgui/loadingscreen.cpp
@@ -8,7 +8,6 @@
 #include <osg/Texture2D>
 #include <osg/Version>
 
-#include <MyGUI_RenderManager.h>
 #include <MyGUI_ScrollBar.h>
 #include <MyGUI_Gui.h>
 #include <MyGUI_TextBox.h>
@@ -45,19 +44,14 @@ namespace MWGui
         , mProgress(0)
         , mShowWallpaper(true)
     {
-        mMainWidget->setSize(MyGUI::RenderManager::getInstance().getViewSize());
-
         getWidget(mLoadingText, "LoadingText");
         getWidget(mProgressBar, "ProgressBar");
         getWidget(mLoadingBox, "LoadingBox");
+        getWidget(mSceneImage, "Scene");
+        getWidget(mSplashImage, "Splash");
 
         mProgressBar->setScrollViewPage(1);
 
-        mBackgroundImage = MyGUI::Gui::getInstance().createWidgetReal<BackgroundImage>("ImageBox", 0,0,1,1,
-            MyGUI::Align::Stretch, "Menu");
-        mSceneImage = MyGUI::Gui::getInstance().createWidgetReal<BackgroundImage>("ImageBox", 0,0,1,1,
-            MyGUI::Align::Stretch, "Scene");
-
         findSplashScreens();
     }
 
@@ -100,7 +94,7 @@ namespace MWGui
     void LoadingScreen::setVisible(bool visible)
     {
         WindowBase::setVisible(visible);
-        mBackgroundImage->setVisible(visible);
+        mSplashImage->setVisible(visible);
         mSceneImage->setVisible(visible);
     }
 
@@ -207,7 +201,6 @@ namespace MWGui
         mViewer->getSceneData()->setComputeBoundingSphereCallback(nullptr);
         mViewer->getSceneData()->dirtyBound();
 
-        //std::cout << "loading took " << mTimer.time_m() - mLoadingOnTime << std::endl;
         setVisible(false);
 
         if (osgUtil::IncrementalCompileOperation* ico = mViewer->getIncrementalCompileOperation())
@@ -229,8 +222,8 @@ namespace MWGui
             // TODO: add option (filename pattern?) to use image aspect ratio instead of 4:3
             // we can't do this by default, because the Morrowind splash screens are 1024x1024, but should be displayed as 4:3
             bool stretch = Settings::Manager::getBool("stretch menu background", "GUI");
-            mBackgroundImage->setVisible(true);
-            mBackgroundImage->setBackgroundImage(randomSplash, true, stretch);
+            mSplashImage->setVisible(true);
+            mSplashImage->setBackgroundImage(randomSplash, true, stretch);
         }
         mSceneImage->setBackgroundImage("");
         mSceneImage->setVisible(false);
@@ -320,8 +313,8 @@ namespace MWGui
 #endif
         mCopyFramebufferToTextureCallback->reset();
 
-        mBackgroundImage->setBackgroundImage("");
-        mBackgroundImage->setVisible(false);
+        mSplashImage->setBackgroundImage("");
+        mSplashImage->setVisible(false);
 
         mSceneImage->setRenderItemTexture(mGuiTexture.get());
         mSceneImage->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 0.f, 1.f, 1.f));
diff --git a/apps/openmw/mwgui/loadingscreen.hpp b/apps/openmw/mwgui/loadingscreen.hpp
index c643965342..cfa97ed762 100644
--- a/apps/openmw/mwgui/loadingscreen.hpp
+++ b/apps/openmw/mwgui/loadingscreen.hpp
@@ -79,7 +79,7 @@ namespace MWGui
 
         MyGUI::TextBox* mLoadingText;
         MyGUI::ScrollBar* mProgressBar;
-        BackgroundImage* mBackgroundImage;
+        BackgroundImage* mSplashImage;
         BackgroundImage* mSceneImage;
 
         std::vector<std::string> mSplashScreens;
diff --git a/apps/openmw/mwgui/screenfader.cpp b/apps/openmw/mwgui/screenfader.cpp
index 619852a22b..aa47d0821c 100644
--- a/apps/openmw/mwgui/screenfader.cpp
+++ b/apps/openmw/mwgui/screenfader.cpp
@@ -1,6 +1,5 @@
 #include "screenfader.hpp"
 
-#include <MyGUI_RenderManager.h>
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_Gui.h>
 
@@ -91,8 +90,6 @@ namespace MWGui
     {
         MyGUI::Gui::getInstance().eventFrameStart += MyGUI::newDelegate(this, &ScreenFader::onFrameStart);
 
-        mMainWidget->setSize(MyGUI::RenderManager::getInstance().getViewSize());
-
         MyGUI::ImageBox* imageBox = mMainWidget->castType<MyGUI::ImageBox>(false);
         if (imageBox)
         {
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 04e48fb280..0be8f2c751 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -256,7 +256,7 @@ namespace MWGui
         MyGUI::PointerManager::getInstance().setVisible(false);
 
         mVideoBackground = MyGUI::Gui::getInstance().createWidgetReal<MyGUI::ImageBox>("ImageBox", 0,0,1,1,
-            MyGUI::Align::Default, "InputBlocker");
+            MyGUI::Align::Default, "Video");
         mVideoBackground->setImageTexture("black");
         mVideoBackground->setVisible(false);
         mVideoBackground->setNeedMouseFocus(true);
diff --git a/files/mygui/openmw_chargen_birth.layout b/files/mygui/openmw_chargen_birth.layout
index 18d4123407..206e559e45 100644
--- a/files/mygui/openmw_chargen_birth.layout
+++ b/files/mygui/openmw_chargen_birth.layout
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 527 378" align="Center" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Modal" position="0 0 527 378" align="Center" name="_Main">
 
         <!-- Birthsign list -->
         <Widget type="ListBox" skin="MW_List" position="8 8 232 137" name="BirthsignList"/>
diff --git a/files/mygui/openmw_chargen_class.layout b/files/mygui/openmw_chargen_class.layout
index 1402d9b5cf..cd01b836ca 100644
--- a/files/mygui/openmw_chargen_class.layout
+++ b/files/mygui/openmw_chargen_class.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 491 316" align="Center" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Modal" position="0 0 491 316" align="Center" name="_Main">
 
         <!-- Class list -->
         <Widget type="ListBox" skin="MW_List" position="8 8 194 138" name="ClassList"/>
diff --git a/files/mygui/openmw_chargen_class_description.layout b/files/mygui/openmw_chargen_class_description.layout
index 906ca23529..250df32d30 100644
--- a/files/mygui/openmw_chargen_class_description.layout
+++ b/files/mygui/openmw_chargen_class_description.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_DialogNoTransp" layer="Windows" position="0 0 244 248" align="Center" name="_Main">
+    <Widget type="Window" skin="MW_DialogNoTransp" layer="Modal" position="0 0 244 248" align="Center" name="_Main">
 
         <!-- Edit box -->
         <Widget type="Widget" skin="MW_Box" position="8 8 220 192" align="Stretch"/>
diff --git a/files/mygui/openmw_chargen_create_class.layout b/files/mygui/openmw_chargen_create_class.layout
index fe491eb6d3..17a5c8684b 100644
--- a/files/mygui/openmw_chargen_create_class.layout
+++ b/files/mygui/openmw_chargen_create_class.layout
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 498 198" align="Center" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Modal" position="0 0 498 198" align="Center" name="_Main">
 
         <!-- Class name -->
         <Widget type="TextBox" skin="NormalText" position="8 8 52 23" name="LabelT" align="Left Top">
diff --git a/files/mygui/openmw_chargen_generate_class_result.layout b/files/mygui/openmw_chargen_generate_class_result.layout
index 48a203b18f..42da935bf5 100644
--- a/files/mygui/openmw_chargen_generate_class_result.layout
+++ b/files/mygui/openmw_chargen_generate_class_result.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="VBox" skin="MW_Dialog" layer="Windows" position="0 0 289 256" align="Center" name="_Main">
+    <Widget type="VBox" skin="MW_Dialog" layer="Modal" position="0 0 289 256" align="Center" name="_Main">
         <Property key="AutoResize" value="true"/>
         <Property key="Padding" value="8"/>
         <Property key="Spacing" value="8"/>
diff --git a/files/mygui/openmw_chargen_race.layout b/files/mygui/openmw_chargen_race.layout
index 71f6dc476e..4f95dac5cb 100644
--- a/files/mygui/openmw_chargen_race.layout
+++ b/files/mygui/openmw_chargen_race.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 640 433" align="Center" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Modal" position="0 0 640 433" align="Center" name="_Main">
 
         <!-- Appearance -->
         <Widget type="TextBox" skin="HeaderText" position="8 16 241 18" name="AppearanceT" align="Left Top">
diff --git a/files/mygui/openmw_chargen_review.layout b/files/mygui/openmw_chargen_review.layout
index 927296fadc..2443115eb6 100644
--- a/files/mygui/openmw_chargen_review.layout
+++ b/files/mygui/openmw_chargen_review.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 541 428" align="Center" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Modal" position="0 0 541 428" align="Center" name="_Main">
 
         <!-- Player Name, Race, Class and Birthsign -->
         <Widget type="Widget" skin="MW_Box" position="8 8 265 126">
diff --git a/files/mygui/openmw_chargen_select_attribute.layout b/files/mygui/openmw_chargen_select_attribute.layout
index 57bd4ebc65..115c8642d6 100644
--- a/files/mygui/openmw_chargen_select_attribute.layout
+++ b/files/mygui/openmw_chargen_select_attribute.layout
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_DialogNoTransp" layer="Windows" position="0 0 247 231" align="Center" name="_Main">
+    <Widget type="Window" skin="MW_DialogNoTransp" layer="Modal" position="0 0 247 231" align="Center" name="_Main">
         <Widget type="Widget" skin="" position="14 14 216 204" align="HCenter VStretch">
 
             <!-- Label -->
diff --git a/files/mygui/openmw_chargen_select_skill.layout b/files/mygui/openmw_chargen_select_skill.layout
index 3737ea9043..009c2e96f4 100644
--- a/files/mygui/openmw_chargen_select_skill.layout
+++ b/files/mygui/openmw_chargen_select_skill.layout
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_DialogNoTransp" layer="Windows" position="0 0 487 275" align="Center" name="_Main">
+    <Widget type="Window" skin="MW_DialogNoTransp" layer="Modal" position="0 0 487 275" align="Center" name="_Main">
         <Widget type="Widget" skin="" position="17 14 457 246" align="Stretch">
 
             <!-- Label -->
diff --git a/files/mygui/openmw_confirmation_dialog.layout b/files/mygui/openmw_confirmation_dialog.layout
index 246c8aa8ff..beaa4bf339 100644
--- a/files/mygui/openmw_confirmation_dialog.layout
+++ b/files/mygui/openmw_confirmation_dialog.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_DialogNoTransp" layer="Windows" position="0 0 360 130" align="Center" name="_Main">
+    <Widget type="Window" skin="MW_DialogNoTransp" layer="Modal" position="0 0 360 130" align="Center" name="_Main">
         <Property key="Visible" value="false"/>
 
         <Widget type="EditBox" skin="MW_TextEditClient" position="16 8 338 130" name="Message" align="Center Top">
diff --git a/files/mygui/openmw_console.layout b/files/mygui/openmw_console.layout
index 7dba079eed..3584002e92 100644
--- a/files/mygui/openmw_console.layout
+++ b/files/mygui/openmw_console.layout
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout">
-  <Widget type="Window" skin="MW_Window" position="0 0 400 400" layer="Windows" name="_Main">
+  <Widget type="Window" skin="MW_Window" position="0 0 400 400" layer="Console" name="_Main">
     <Property key="Caption" value="#{sConsoleTitle}"/>
     <Property key="MinSize" value="40 40"/>
     <Property key="Visible" value="false"/>
diff --git a/files/mygui/openmw_count_window.layout b/files/mygui/openmw_count_window.layout
index d507ad31ad..c9e160cbb2 100644
--- a/files/mygui/openmw_count_window.layout
+++ b/files/mygui/openmw_count_window.layout
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout" version="3.2.0">
-    <Widget type="Window" skin="MW_DialogNoTransp" position="0 0 600 128" align="Center" layer="Windows" name="_Main">
+    <Widget type="Window" skin="MW_DialogNoTransp" position="0 0 600 128" align="Center" layer="Modal" name="_Main">
         <Property key="Visible" value="false"/>
         <Widget type="TextBox" skin="SandText" position="0 4 592 24" align="Left Top HStretch" name="LabelText">
             <Property key="TextAlign" value="Center"/>
diff --git a/files/mygui/openmw_edit_effect.layout b/files/mygui/openmw_edit_effect.layout
index cd6453c817..545cb66e47 100644
--- a/files/mygui/openmw_edit_effect.layout
+++ b/files/mygui/openmw_edit_effect.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_DialogNoTransp" layer="Windows" position="0 0 362 310" align="Center" name="_Main">
+    <Widget type="Window" skin="MW_DialogNoTransp" layer="Modal" position="0 0 362 310" align="Center" name="_Main">
 
         <Widget type="ImageBox" skin="ImageBox" position="8 12 16 16" name="EffectImage">
         </Widget>
diff --git a/files/mygui/openmw_edit_note.layout b/files/mygui/openmw_edit_note.layout
index edf53bde75..765315aa3f 100644
--- a/files/mygui/openmw_edit_note.layout
+++ b/files/mygui/openmw_edit_note.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_DialogNoTransp" layer="Windows" position="0 0 336 242" align="Center" name="_Main">
+    <Widget type="Window" skin="MW_DialogNoTransp" layer="Modal" position="0 0 336 242" align="Center" name="_Main">
 
         <Widget type="AutoSizedTextBox" skin="SandText" position="13 13 200 16">
             <Property key="Caption" value="#{sEditNote}"/>
diff --git a/files/mygui/openmw_infobox.layout b/files/mygui/openmw_infobox.layout
index 252a237cdb..21816a1303 100644
--- a/files/mygui/openmw_infobox.layout
+++ b/files/mygui/openmw_infobox.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 545 265" align="Center" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Modal" position="0 0 545 265" align="Center" name="_Main">
 
         <!-- Edit box -->
         <Widget type="Widget" skin="" position="14 14 516 70" name="TextBox" align="Top HCenter">
diff --git a/files/mygui/openmw_interactive_messagebox.layout b/files/mygui/openmw_interactive_messagebox.layout
index 410426656f..a9a50a3ad7 100644
--- a/files/mygui/openmw_interactive_messagebox.layout
+++ b/files/mygui/openmw_interactive_messagebox.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="MessageBox" position="0 0 500 400" align="Center" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Modal" position="0 0 500 400" align="Center" name="_Main">
         <Widget type="EditBox" skin="MW_TextEditClient" position="10 10 490 20" align="Left Top Stretch" name="message">
             <Property key="FontName" value="Default"/>
             <Property key="TextAlign" value="Center"/>
diff --git a/files/mygui/openmw_itemselection_dialog.layout b/files/mygui/openmw_itemselection_dialog.layout
index b2337b6690..636a864e1f 100644
--- a/files/mygui/openmw_itemselection_dialog.layout
+++ b/files/mygui/openmw_itemselection_dialog.layout
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_DialogNoTransp" position="0 0 380 285" layer="Windows" align="Center" name="_Main">
+    <Widget type="Window" skin="MW_DialogNoTransp" position="0 0 380 285" layer="Modal" align="Center" name="_Main">
 
         <Widget type="TextBox" skin="SandText" position="8 8 300 18" name="Label"/>
 
diff --git a/files/mygui/openmw_layers.xml b/files/mygui/openmw_layers.xml
index 4afa67f314..9c99526ec8 100644
--- a/files/mygui/openmw_layers.xml
+++ b/files/mygui/openmw_layers.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layer" version="1.0">
-    <Layer name="Scene" overlapped="false" pick="false"/>
-    <Layer name="Overlay" overlapped="false" pick="false"/>
-    <Layer name="AdditiveOverlay" type="AdditiveLayer" pick="false"/>
+    <Layer name="FadeToBlack" overlapped="false" pick="false"/>
+    <Layer name="HitOverlay" type="AdditiveLayer" pick="false"/>
     <Layer name="HUD" overlapped="false" pick="true"/>
-    <Layer name="Menu" overlapped="false" pick="true"/>
-    <Layer name="MainMenu" overlapped="true" pick="true"/>
     <Layer name="JournalBooks" type="ScalingLayer" pick="true">
         <Property key="Size" value="600 520"/>
     </Layer>
     <Layer name="Windows" overlapped="true" pick="true"/>
     <Layer name="Debug" overlapped="true" pick="true"/>
-    <Layer name="Popup" overlapped="true" pick="true"/>
+    <Layer name="Tooltip" overlapped="true" pick="true"/>
     <Layer name="Notification" overlapped="false" pick="false"/>
     <Layer name="DragAndDrop" overlapped="false" pick="false"/>
     <Layer name="DrowningBar" overlapped="false" pick="false"/>
+    <Layer name="MainMenu" overlapped="true" pick="true"/>
+    <Layer name="Console" overlapped="true" pick="true"/>
+    <Layer name="LoadingScreenBackground" overlapped="false" pick="true"/>
     <Layer name="LoadingScreen" overlapped="false" pick="true"/>
-    <Layer name="MessageBox" overlapped="false" pick="true"/>
+    <Layer name="Modal" overlapped="true" pick="true"/>
+    <Layer name="Video" overlapped="false" pick="true"/>
     <Layer name="InputBlocker" overlapped="false" pick="true"/>
     <Layer name="Pointer" overlapped="false" pick="false"/>
 </MyGUI>
diff --git a/files/mygui/openmw_loading_screen.layout b/files/mygui/openmw_loading_screen.layout
index 69df200221..ead825e279 100644
--- a/files/mygui/openmw_loading_screen.layout
+++ b/files/mygui/openmw_loading_screen.layout
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <!-- The entire screen -->
     <Widget type="Widget" layer="LoadingScreen" position="0 0 300 300" name="_Main" align="Stretch">
 
         <Widget type="Window" skin="MW_Dialog" position="0 245 300 48" align="Bottom HCenter" name="LoadingBox">
@@ -16,4 +15,7 @@
         </Widget>
 
     </Widget>
+
+    <Widget name="Scene" layer="LoadingScreenBackground" type="BackgroundImage" skin="ImageBox" position="0 0 300 300" align="Stretch" />
+    <Widget name="Splash" layer="LoadingScreenBackground" type="BackgroundImage" skin="ImageBox" position="0 0 300 300" align="Stretch" />
 </MyGUI>
diff --git a/files/mygui/openmw_magicselection_dialog.layout b/files/mygui/openmw_magicselection_dialog.layout
index 027250d7ac..870592a536 100644
--- a/files/mygui/openmw_magicselection_dialog.layout
+++ b/files/mygui/openmw_magicselection_dialog.layout
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_DialogNoTransp" position="0 0 330 370" layer="Windows" align="Center" name="_Main">
+    <Widget type="Window" skin="MW_DialogNoTransp" position="0 0 330 370" layer="Modal" align="Center" name="_Main">
 
         <Widget type="TextBox" skin="SandText" position="8 8 292 24">
             <Property key="Caption" value="#{sMagicSelectTitle}"/>
diff --git a/files/mygui/openmw_persuasion_dialog.layout b/files/mygui/openmw_persuasion_dialog.layout
index c66f9d0adc..3b10588ec8 100644
--- a/files/mygui/openmw_persuasion_dialog.layout
+++ b/files/mygui/openmw_persuasion_dialog.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_DialogNoTransp" layer="Windows" position="0 0 220 192" align="Center" name="_Main">
+    <Widget type="Window" skin="MW_DialogNoTransp" layer="Modal" position="0 0 220 192" align="Center" name="_Main">
 
         <Widget type="TextBox" skin="NormalText" position="0 4 220 24">
             <Property key="Caption" value="#{sPersuasionMenuTitle}"/>
diff --git a/files/mygui/openmw_quickkeys_menu.layout b/files/mygui/openmw_quickkeys_menu.layout
index 27bbbc190a..829c64d0c6 100644
--- a/files/mygui/openmw_quickkeys_menu.layout
+++ b/files/mygui/openmw_quickkeys_menu.layout
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" position="0 0 370 230" layer="Windows" align="Center" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" position="0 0 370 230" layer="Modal" align="Center" name="_Main">
 
         <Widget type="TextBox" skin="SandText" position="8 8 354 18">
             <Property key="Caption" value="#{sQuickMenuTitle}"/>
diff --git a/files/mygui/openmw_savegame_dialog.layout b/files/mygui/openmw_savegame_dialog.layout
index 236eaaa61d..22fa69aa5b 100644
--- a/files/mygui/openmw_savegame_dialog.layout
+++ b/files/mygui/openmw_savegame_dialog.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="VBox" skin="MW_DialogNoTransp" layer="Windows" position="0 0 600 400" align="Center" name="_Main">
+    <Widget type="VBox" skin="MW_DialogNoTransp" layer="Modal" position="0 0 600 400" align="Center" name="_Main">
         <Property key="Padding" value="8"/>
         <Property key="Spacing" value="8"/>
 
diff --git a/files/mygui/openmw_screen_fader.layout b/files/mygui/openmw_screen_fader.layout
index e9009d32a6..59f65aba14 100644
--- a/files/mygui/openmw_screen_fader.layout
+++ b/files/mygui/openmw_screen_fader.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="ImageBox" skin="ImageBox" layer="Overlay" position="0 0 300 200" name="_Main" align="Stretch">
+    <Widget type="ImageBox" skin="ImageBox" layer="FadeToBlack" position="0 0 300 200" name="_Main" align="Stretch">
         <Property key="ImageTexture" value="black"/>
     </Widget>
 </MyGUI>
diff --git a/files/mygui/openmw_screen_fader_hit.layout b/files/mygui/openmw_screen_fader_hit.layout
index 7e60f0ff5a..91bc036c8a 100644
--- a/files/mygui/openmw_screen_fader_hit.layout
+++ b/files/mygui/openmw_screen_fader_hit.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="ImageBox" skin="ImageBox" layer="AdditiveOverlay" position="0 0 300 200" name="_Main" align="Stretch">
+    <Widget type="ImageBox" skin="ImageBox" layer="HitOverlay" position="0 0 300 200" name="_Main" align="Stretch">
         <Property key="ImageTexture" value="black"/>
     </Widget>
 </MyGUI>
diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index 13f5ada24b..d0e2edfbf6 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout" version="3.2.0">
-    <Widget type="Window" skin="MW_Window" position="0 0 400 485" layer="Windows" name="_Main">
+    <Widget type="Window" skin="MW_Window" position="0 0 400 485" layer="MainMenu" name="_Main">
         <Property key="MinSize" value="430 446"/>
         <Widget type="TabControl" skin="TabControl" position="8 8 368 405" align="Stretch" name="SettingsTab">
             <Property key="ButtonAutoWidth" value="true"/>
diff --git a/files/mygui/openmw_text_input.layout b/files/mygui/openmw_text_input.layout
index 64ec61b025..85376060f4 100644
--- a/files/mygui/openmw_text_input.layout
+++ b/files/mygui/openmw_text_input.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 320 97" align="Center" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Modal" position="0 0 320 97" align="Center" name="_Main">
 
         <!-- Appearance -->
         <Widget type="TextBox" skin="ProgressText" position="6 6 300 18" name="LabelT" align="Left Top">
diff --git a/files/mygui/openmw_tooltips.layout b/files/mygui/openmw_tooltips.layout
index ce927038c2..fd87b5c0e0 100644
--- a/files/mygui/openmw_tooltips.layout
+++ b/files/mygui/openmw_tooltips.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Widget" layer="Popup" position="0 0 300 300" name="_Main">
+    <Widget type="Widget" layer="Tooltip" position="0 0 300 300" name="_Main">
 
         <!-- Dynamically constructed tooltip goes here -->
         <Widget type="Widget" skin="HUD_Box_NoTransp" position="0 0 300 300" align="Stretch" name="DynamicToolTipBox">
diff --git a/files/mygui/openmw_windows.skin.xml b/files/mygui/openmw_windows.skin.xml
index d6d747c4f9..14f6930b3c 100644
--- a/files/mygui/openmw_windows.skin.xml
+++ b/files/mygui/openmw_windows.skin.xml
@@ -453,11 +453,7 @@
         <Child type="Widget" skin="HB_ALL" offset="0 0 30 20" align="Right" name="Right"/>
     </Resource>
 
-<!-- ----------------------------------------------------
-
-                 WINDOW DEFINITION
-
------------------------------------------------------- -->
+<!-- WINDOW DEFINITION -->
 
     <Resource type="ResourceSkin" name="MW_Window" size="256 256">
         <Property key="TextAlign" value="Center"/>

From 67879bac55167b0fbba639ef02e0117c871a8a8c Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sat, 26 Feb 2022 12:10:55 +0100
Subject: [PATCH 2173/2859] MR feedack

---
 apps/openmw/mwlua/luamanagerimp.cpp | 11 +++++++----
 apps/openmw/mwlua/luamanagerimp.hpp |  5 ++---
 apps/openmw/mwlua/uibindings.cpp    | 12 ++++++------
 components/lua_ui/image.cpp         | 11 +++++------
 components/lua_ui/resources.cpp     |  9 +++++++--
 components/lua_ui/resources.hpp     | 17 +++--------------
 6 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 3319e975cc..716612f745 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -26,7 +26,10 @@
 namespace MWLua
 {
 
-    LuaManager::LuaManager(const VFS::Manager* vfs, const std::string& libsDir) : mLua(vfs, &mConfiguration), mI18n(vfs, &mLua)
+    LuaManager::LuaManager(const VFS::Manager* vfs, const std::string& libsDir)
+        : mLua(vfs, &mConfiguration)
+        , mUiResourceManager(vfs)
+        , mI18n(vfs, &mLua)
     {
         Log(Debug::Info) << "Lua version: " << LuaUtil::getLuaVersion();
         mLua.addInternalLibSearchPath(libsDir);
@@ -37,8 +40,6 @@ namespace MWLua
         mLocalLoader = createUserdataSerializer(true, mWorldView.getObjectRegistry(), &mContentFileMapping);
 
         mGlobalScripts.setSerializer(mGlobalSerializer.get());
-
-        mUiResourceManager = std::make_unique<LuaUi::ResourceManager>(vfs);
     }
 
     void LuaManager::initConfiguration()
@@ -250,6 +251,7 @@ namespace MWLua
     void LuaManager::clear()
     {
         LuaUi::clearUserInterface();
+        mUiResourceManager.clear();
         mActiveLocalScripts.clear();
         mLocalEvents.clear();
         mGlobalEvents.clear();
@@ -472,7 +474,8 @@ namespace MWLua
     {
         Log(Debug::Info) << "Reload Lua";
 
-        LuaUi::clearUserInterface(); 
+        LuaUi::clearUserInterface();
+        mUiResourceManager.clear();
         mLua.dropScriptCache();
         initConfiguration();
 
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index fecb9478e0..fed6dc9dc7 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -91,18 +91,17 @@ namespace MWLua
             return [this, c](Arg arg) { this->queueCallback(c, sol::make_object(c.mFunc.lua_state(), arg)); };
         }
 
-        LuaUi::ResourceManager* uiResourceManager() { return mUiResourceManager.get(); }
+        LuaUi::ResourceManager* uiResourceManager() { return &mUiResourceManager; }
 
     private:
         void initConfiguration();
         LocalScripts* createLocalScripts(const MWWorld::Ptr& ptr, ESM::LuaScriptCfg::Flags);
 
-        std::unique_ptr<LuaUi::ResourceManager> mUiResourceManager;
-
         bool mInitialized = false;
         bool mGlobalScriptsStarted = false;
         LuaUtil::ScriptsConfiguration mConfiguration;
         LuaUtil::LuaState mLua;
+        LuaUi::ResourceManager mUiResourceManager;
         LuaUtil::I18nManager mI18n;
         sol::table mNearbyPackage;
         sol::table mUserInterfacePackage;
diff --git a/apps/openmw/mwlua/uibindings.cpp b/apps/openmw/mwlua/uibindings.cpp
index 031bb67af0..b384994654 100644
--- a/apps/openmw/mwlua/uibindings.cpp
+++ b/apps/openmw/mwlua/uibindings.cpp
@@ -78,10 +78,10 @@ namespace MWLua
                 std::shared_ptr<LuaUi::Element> mElement;
         };
 
-        class LayerAction final : public Action
+        class InsertLayerAction final : public Action
         {
             public:
-                LayerAction(std::string_view name, std::string_view afterName,
+                InsertLayerAction(std::string_view name, std::string_view afterName,
                     LuaUi::Layers::Options options, LuaUtil::LuaState* state)
                     : Action(state)
                     , mName(name)
@@ -247,7 +247,7 @@ namespace MWLua
         {
             LuaUi::Layers::Options options;
             options.mInteractive = LuaUtil::getValueOrDefault(LuaUtil::getFieldOrNil(opt, "interactive"), true);
-            context.mLuaManager->addAction(std::make_unique<LayerAction>(name, afterName, options, context.mLua));
+            context.mLuaManager->addAction(std::make_unique<InsertLayerAction>(name, afterName, options, context.mLua));
         };
         {
             auto pairs = [layers](const sol::object&)
@@ -283,10 +283,10 @@ namespace MWLua
         {
             LuaUi::TextureData data;
             sol::object path = LuaUtil::getFieldOrNil(options, "path");
-            if (path.is<std::string>() && !path.as<std::string>().empty())
+            if (path.is<std::string>())
                 data.mPath = path.as<std::string>();
-            else
-                throw sol::error("Invalid texture path");
+            if (data.mPath.empty())
+                throw std::logic_error("Invalid texture path");
             sol::object offset = LuaUtil::getFieldOrNil(options, "offset");
             if (offset.is<osg::Vec2f>())
                 data.mOffset = offset.as<osg::Vec2f>();
diff --git a/components/lua_ui/image.cpp b/components/lua_ui/image.cpp
index 4a25416835..69bccac1ed 100644
--- a/components/lua_ui/image.cpp
+++ b/components/lua_ui/image.cpp
@@ -39,13 +39,12 @@ namespace LuaUi
         MyGUI::IntCoord atlasCoord;
         if (resource)
         {
-            auto& data = resource->data();
             atlasCoord = MyGUI::IntCoord(
-                static_cast<int>(data.mOffset.x()),
-                static_cast<int>(data.mOffset.y()),
-                static_cast<int>(data.mSize.x()),
-                static_cast<int>(data.mSize.y()));
-            setImageTexture(data.mPath);
+                static_cast<int>(resource->mOffset.x()),
+                static_cast<int>(resource->mOffset.y()),
+                static_cast<int>(resource->mSize.x()),
+                static_cast<int>(resource->mSize.y()));
+            setImageTexture(resource->mPath);
         }
 
         bool tileH = propertyValue("tileH", false);
diff --git a/components/lua_ui/resources.cpp b/components/lua_ui/resources.cpp
index 92318a8a46..605c9ba58b 100644
--- a/components/lua_ui/resources.cpp
+++ b/components/lua_ui/resources.cpp
@@ -7,8 +7,8 @@ namespace LuaUi
 {
     std::shared_ptr<TextureResource> ResourceManager::registerTexture(TextureData data)
     {
-        std::string normalizedPath = vfs()->normalizeFilename(data.mPath);
-        if (!vfs()->exists(normalizedPath))
+        std::string normalizedPath = mVfs->normalizeFilename(data.mPath);
+        if (!mVfs->exists(normalizedPath))
         {
             auto error = Misc::StringUtils::format("Texture with path \"%s\" doesn't exist", data.mPath);
             throw std::logic_error(error);
@@ -19,4 +19,9 @@ namespace LuaUi
         list.push_back(std::make_shared<TextureResource>(data));
         return list.back();
     }
+
+    void ResourceManager::clear()
+    {
+        mTextures.clear();
+    }
 }
diff --git a/components/lua_ui/resources.hpp b/components/lua_ui/resources.hpp
index da9d566273..cabcd63bf4 100644
--- a/components/lua_ui/resources.hpp
+++ b/components/lua_ui/resources.hpp
@@ -22,18 +22,8 @@ namespace LuaUi
         osg::Vec2f mSize;
     };
 
-    class TextureResource
-    {
-        public:
-            TextureResource(TextureData data)
-                : mData(data)
-            {}
-
-            const TextureData& data() { return mData; }
-
-        private:
-            TextureData mData;
-    };
+    // will have more/different data when automated atlasing is supported
+    using TextureResource = TextureData;
 
     class ResourceManager
     {
@@ -43,10 +33,9 @@ namespace LuaUi
             {}
 
             std::shared_ptr<TextureResource> registerTexture(TextureData data);
+            void clear();
 
         private:
-            const VFS::Manager* vfs() const { return mVfs; }
-
             const VFS::Manager* mVfs;
             using TextureResources = std::vector<std::shared_ptr<TextureResource>>;
             std::unordered_map<std::string, TextureResources> mTextures;

From 6845d681f23d64662d659d3c05257e135ed85e3d Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sun, 27 Feb 2022 11:59:55 +0000
Subject: [PATCH 2174/2859] Update hardcoded layers (hotfix for
 https://gitlab.com/OpenMW/openmw/-/merge_requests/1681)

---
 apps/openmw/mwgui/layout.cpp                              | 2 +-
 apps/openmw/mwgui/mainmenu.cpp                            | 6 +++---
 files/mygui/openmw_interactive_messagebox_notransp.layout | 2 +-
 files/mygui/openmw_layers.xml                             | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwgui/layout.cpp b/apps/openmw/mwgui/layout.cpp
index 06577f780c..9ac39f9a00 100644
--- a/apps/openmw/mwgui/layout.cpp
+++ b/apps/openmw/mwgui/layout.cpp
@@ -26,7 +26,7 @@ namespace MWGui
                 if (widget->getName() == main_name)
                     mMainWidget = widget;
 
-                // Force the alignment to update immedeatly
+                // Force the alignment to update immediately
                 widget->_setAlign(widget->getSize(), widget->getParentSize());
             }
             MYGUI_ASSERT(mMainWidget, "root widget name '" << MAIN_WINDOW << "' in layout '" << mLayoutName << "' not found.");
diff --git a/apps/openmw/mwgui/mainmenu.cpp b/apps/openmw/mwgui/mainmenu.cpp
index 4e695710ff..8fff838add 100644
--- a/apps/openmw/mwgui/mainmenu.cpp
+++ b/apps/openmw/mwgui/mainmenu.cpp
@@ -167,11 +167,11 @@ namespace MWGui
             {
                 // Use black background to correct aspect ratio
                 mVideoBackground = MyGUI::Gui::getInstance().createWidgetReal<MyGUI::ImageBox>("ImageBox", 0,0,1,1,
-                    MyGUI::Align::Default, "Menu");
+                    MyGUI::Align::Default, "MainMenuBackground");
                 mVideoBackground->setImageTexture("black");
 
                 mVideo = mVideoBackground->createWidget<VideoWidget>("ImageBox", 0,0,1,1,
-                    MyGUI::Align::Stretch, "Menu");
+                    MyGUI::Align::Stretch, "MainMenuBackground");
                 mVideo->setVFS(mVFS);
 
                 mVideo->playVideo("video\\menu_background.bik");
@@ -191,7 +191,7 @@ namespace MWGui
             if (!mBackground)
             {
                 mBackground = MyGUI::Gui::getInstance().createWidgetReal<BackgroundImage>("ImageBox", 0,0,1,1,
-                    MyGUI::Align::Stretch, "Menu");
+                    MyGUI::Align::Stretch, "MainMenuBackground");
                 mBackground->setBackgroundImage("textures\\menu_morrowind.dds", true, stretch);
             }
             mBackground->setVisible(true);
diff --git a/files/mygui/openmw_interactive_messagebox_notransp.layout b/files/mygui/openmw_interactive_messagebox_notransp.layout
index f5a462977b..3a31ee2501 100644
--- a/files/mygui/openmw_interactive_messagebox_notransp.layout
+++ b/files/mygui/openmw_interactive_messagebox_notransp.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_DialogNoTransp" layer="MessageBox" position="0 0 500 400" align="Center" name="_Main">
+    <Widget type="Window" skin="MW_DialogNoTransp" layer="Modal" position="0 0 500 400" align="Center" name="_Main">
         <Widget type="EditBox" skin="MW_TextEditClient" position="10 10 490 20" align="Left Top Stretch" name="message">
             <Property key="FontName" value="Default"/>
             <Property key="TextAlign" value="Center"/>
diff --git a/files/mygui/openmw_layers.xml b/files/mygui/openmw_layers.xml
index 9c99526ec8..3e267075ef 100644
--- a/files/mygui/openmw_layers.xml
+++ b/files/mygui/openmw_layers.xml
@@ -13,6 +13,7 @@
     <Layer name="Notification" overlapped="false" pick="false"/>
     <Layer name="DragAndDrop" overlapped="false" pick="false"/>
     <Layer name="DrowningBar" overlapped="false" pick="false"/>
+    <Layer name="MainMenuBackground" overlapped="true" pick="true"/>
     <Layer name="MainMenu" overlapped="true" pick="true"/>
     <Layer name="Console" overlapped="true" pick="true"/>
     <Layer name="LoadingScreenBackground" overlapped="false" pick="true"/>

From ff7ad93bace989af7cea0dbc1a7dd9e6e0e8a970 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Mocquillon?= <cedric.mocquillon@gmail.com>
Date: Sat, 26 Feb 2022 15:18:36 +0100
Subject: [PATCH 2175/2859] Avoid missusing of CompressedBSAFile with private
 inheritance

---
 apps/bsatool/bsatool.cpp             | 117 ++++++++++++++-------------
 components/bsa/bsa_file.hpp          |   2 +-
 components/bsa/compressedbsafile.hpp |   8 +-
 components/vfs/bsaarchive.cpp        |  49 +++++++----
 components/vfs/bsaarchive.hpp        |  10 ++-
 5 files changed, 107 insertions(+), 79 deletions(-)

diff --git a/apps/bsatool/bsatool.cpp b/apps/bsatool/bsatool.cpp
index 4057d627c4..24c98fd139 100644
--- a/apps/bsatool/bsatool.cpp
+++ b/apps/bsatool/bsatool.cpp
@@ -151,62 +151,11 @@ bool parseOptions (int argc, char** argv, Arguments &info)
     return true;
 }
 
-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)
-{
-    try
-    {
-        Arguments info;
-        if(!parseOptions (argc, argv, info))
-            return 1;
-
-        // Open file
-        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);
-        else if (info.mode == "extract")
-            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;
-            return 1;
-        }
-    }
-    catch (std::exception& e)
-    {
-        std::cerr << "ERROR reading BSA archive\nDetails:\n" << e.what() << std::endl;
-        return 2;
-    }
-}
-
-int list(std::unique_ptr<Bsa::BSAFile>& bsa, Arguments& info)
+template<typename File>
+int list(std::unique_ptr<File>& bsa, Arguments& info)
 {
     // List all files
-    const Bsa::BSAFile::FileList &files = bsa->getList();
+    const auto &files = bsa->getList();
     for (const auto& file : files)
     {
         if(info.longformat)
@@ -225,7 +174,8 @@ int list(std::unique_ptr<Bsa::BSAFile>& bsa, Arguments& info)
     return 0;
 }
 
-int extract(std::unique_ptr<Bsa::BSAFile>& bsa, Arguments& info)
+template<typename File>
+int extract(std::unique_ptr<File>& bsa, Arguments& info)
 {
     std::string archivePath = info.extractfile;
     Misc::StringUtils::replaceAll(archivePath, "/", "\\");
@@ -281,7 +231,8 @@ int extract(std::unique_ptr<Bsa::BSAFile>& bsa, Arguments& info)
     return 0;
 }
 
-int extractAll(std::unique_ptr<Bsa::BSAFile>& bsa, Arguments& info)
+template<typename File>
+int extractAll(std::unique_ptr<File>& bsa, Arguments& info)
 {
     for (const auto &file : bsa->getList())
     {
@@ -315,10 +266,62 @@ int extractAll(std::unique_ptr<Bsa::BSAFile>& bsa, Arguments& info)
     return 0;
 }
 
-int add(std::unique_ptr<Bsa::BSAFile>& bsa, Arguments& info)
+template<typename File>
+int add(std::unique_ptr<File>& 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;
 }
+
+template<typename File>
+int call(Arguments& info)
+{
+    std::unique_ptr<File> bsa = std::make_unique<File>();
+    if (info.mode == "create")
+    {
+        bsa->open(info.filename);
+        return 0;
+    }
+
+    bsa->open(info.filename);
+
+    if (info.mode == "list")
+        return list(bsa, info);
+    else if (info.mode == "extract")
+        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;
+        return 1;
+    }
+}
+
+int main(int argc, char** argv)
+{
+    try
+    {
+        Arguments info;
+        if (!parseOptions(argc, argv, info))
+            return 1;
+
+        // Open file
+
+        Bsa::BsaVersion bsaVersion = Bsa::CompressedBSAFile::detectVersion(info.filename);
+
+        if (bsaVersion == Bsa::BSAVER_COMPRESSED)
+            return call<Bsa::CompressedBSAFile>(info);
+        else
+            return call<Bsa::BSAFile>(info);
+    }
+    catch (std::exception& e)
+    {
+        std::cerr << "ERROR reading BSA archive\nDetails:\n" << e.what() << std::endl;
+        return 2;
+    }
+}
diff --git a/components/bsa/bsa_file.hpp b/components/bsa/bsa_file.hpp
index f6c5d03139..83e9ae954c 100644
--- a/components/bsa/bsa_file.hpp
+++ b/components/bsa/bsa_file.hpp
@@ -128,7 +128,7 @@ public:
         return Files::openConstrainedFileStream (mFilename.c_str (), file->offset, file->fileSize);
     }
 
-    virtual void addFile(const std::string& filename, std::istream& file);
+    void addFile(const std::string& filename, std::istream& file);
 
     /// Get a list of all files
     /// @note Thread safe.
diff --git a/components/bsa/compressedbsafile.hpp b/components/bsa/compressedbsafile.hpp
index f19815dcf3..2c0b3c0aac 100644
--- a/components/bsa/compressedbsafile.hpp
+++ b/components/bsa/compressedbsafile.hpp
@@ -39,7 +39,7 @@ namespace Bsa
         BSAVER_COMPRESSED = 0x415342 //B, S, A
     };
 
-    class CompressedBSAFile : public BSAFile
+    class CompressedBSAFile : private BSAFile
     {
     private:
         //special marker for invalid records,
@@ -85,6 +85,10 @@ namespace Bsa
         static std::uint64_t generateHash(std::string stem, std::string extension) ;
         Files::IStreamPtr getFile(const FileRecord& fileRecord);
     public:
+        using BSAFile::open;
+        using BSAFile::getList;
+        using BSAFile::getFilename;
+
         CompressedBSAFile();
         virtual ~CompressedBSAFile();
 
@@ -96,7 +100,7 @@ namespace Bsa
        
         Files::IStreamPtr getFile(const char* filePath);
         Files::IStreamPtr getFile(const FileStruct* fileStruct);
-        void addFile(const std::string& filename, std::istream& file) override;
+        void addFile(const std::string& filename, std::istream& file);
     };
 }
 
diff --git a/components/vfs/bsaarchive.cpp b/components/vfs/bsaarchive.cpp
index b0caa5c305..d4d1a5a38b 100644
--- a/components/vfs/bsaarchive.cpp
+++ b/components/vfs/bsaarchive.cpp
@@ -8,7 +8,7 @@ namespace VFS
 
 BsaArchive::BsaArchive(const std::string &filename)
 {
-    mFile = std::make_unique<Bsa::BSAFile>(Bsa::BSAFile());
+    mFile = std::make_unique<Bsa::BSAFile>();
     mFile->open(filename);
 
     const Bsa::BSAFile::FileList &filelist = mFile->getList();
@@ -53,17 +53,30 @@ std::string BsaArchive::getDescription() const
     return std::string{"BSA: "} + mFile->getFilename();
 }
 
+// ------------------------------------------------------------------------------
+
+BsaArchiveFile::BsaArchiveFile(const Bsa::BSAFile::FileStruct *info, Bsa::BSAFile* bsa)
+    : mInfo(info)
+    , mFile(bsa)
+{
+
+}
+
+Files::IStreamPtr BsaArchiveFile::open()
+{
+    return mFile->getFile(mInfo);
+}
+
 CompressedBsaArchive::CompressedBsaArchive(const std::string &filename)
-    : BsaArchive()
+    : Archive()
 {
-    mFile = std::make_unique<Bsa::BSAFile>(Bsa::CompressedBSAFile());
-    mFile->open(filename);
+    mCompressedFile = std::make_unique<Bsa::CompressedBSAFile>();
+    mCompressedFile->open(filename);
 
-    const Bsa::BSAFile::FileList &filelist = mFile->getList();
+    const Bsa::BSAFile::FileList &filelist = mCompressedFile->getList();
     for(Bsa::BSAFile::FileList::const_iterator it = filelist.begin();it != filelist.end();++it)
     {
-        mResources.emplace_back(&*it, mFile.get());
-        mCompressedResources.emplace_back(&*it, static_cast<Bsa::CompressedBSAFile*>(mFile.get()));
+        mCompressedResources.emplace_back(&*it, mCompressedFile.get());
     }
 }
 
@@ -78,22 +91,26 @@ void CompressedBsaArchive::listResources(std::map<std::string, File *> &out, cha
     }
 }
 
-// ------------------------------------------------------------------------------
-
-BsaArchiveFile::BsaArchiveFile(const Bsa::BSAFile::FileStruct *info, Bsa::BSAFile* bsa)
-    : mInfo(info)
-    , mFile(bsa)
+bool CompressedBsaArchive::contains(const std::string& file, char (*normalize_function)(char)) const
 {
-
+    for (const auto& it : mCompressedResources)
+    {
+        std::string ent = it.mInfo->name();
+        std::transform(ent.begin(), ent.end(), ent.begin(), normalize_function);
+        if(file == ent)
+            return true;
+    }
+    return false;
 }
 
-Files::IStreamPtr BsaArchiveFile::open()
+std::string CompressedBsaArchive::getDescription() const
 {
-    return mFile->getFile(mInfo);
+    return std::string{"BSA: "} + mCompressedFile->getFilename();
 }
 
+
 CompressedBsaArchiveFile::CompressedBsaArchiveFile(const Bsa::BSAFile::FileStruct *info, Bsa::CompressedBSAFile* bsa)
-    : BsaArchiveFile(info, bsa)
+    : mInfo(info)
     , mCompressedFile(bsa)
 {
 
diff --git a/components/vfs/bsaarchive.hpp b/components/vfs/bsaarchive.hpp
index 1015f8d220..1bf9cf4381 100644
--- a/components/vfs/bsaarchive.hpp
+++ b/components/vfs/bsaarchive.hpp
@@ -19,12 +19,14 @@ namespace VFS
         Bsa::BSAFile* mFile;
     };
 
-    class CompressedBsaArchiveFile : public BsaArchiveFile
+    class CompressedBsaArchiveFile : public File
     {
     public:
         CompressedBsaArchiveFile(const Bsa::BSAFile::FileStruct* info, Bsa::CompressedBSAFile* bsa);
 
         Files::IStreamPtr open() override;
+
+        const Bsa::BSAFile::FileStruct* mInfo;
         Bsa::CompressedBSAFile* mCompressedFile;
     };
 
@@ -44,12 +46,14 @@ namespace VFS
         std::vector<BsaArchiveFile> mResources;
     };
 
-    class CompressedBsaArchive : public BsaArchive
+    class CompressedBsaArchive : public Archive
     {
     public:
         CompressedBsaArchive(const std::string& filename);
-        void listResources(std::map<std::string, File*>& out, char (*normalize_function) (char)) override;
         virtual ~CompressedBsaArchive() {}
+        void listResources(std::map<std::string, File*>& out, char (*normalize_function) (char)) override;
+        bool contains(const std::string& file, char (*normalize_function) (char)) const override;
+        std::string getDescription() const override;
 
     private:
         std::unique_ptr<Bsa::CompressedBSAFile> mCompressedFile;

From 25feea9b160c674912e7b57b28fd4779a1d4d226 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 28 Feb 2022 16:42:22 +0100
Subject: [PATCH 2176/2859] Prevent write to empty vector element

---
 CHANGELOG.md                              |  1 +
 apps/openmw/mwgui/spellcreationdialog.cpp | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4fd3932e5c..085eaedaf9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -278,6 +278,7 @@
     Bug #6276: Deleted groundcover instances are not deleted in game
     Bug #6294: Game crashes with empty pathgrid
     Bug #6606: Quests with multiple IDs cannot always be restarted
+    Bug #6655: Constant effect absorb attribute causes the game to break
     Feature #390: 3rd person look "over the shoulder"
     Feature #832: OpenMW-CS: Handle deleted references
     Feature #1536: Show more information about level on menu
diff --git a/apps/openmw/mwgui/spellcreationdialog.cpp b/apps/openmw/mwgui/spellcreationdialog.cpp
index 398635b751..d3da26b8bf 100644
--- a/apps/openmw/mwgui/spellcreationdialog.cpp
+++ b/apps/openmw/mwgui/spellcreationdialog.cpp
@@ -109,10 +109,6 @@ namespace MWGui
     {
         bool allowSelf = (effect->mData.mFlags & ESM::MagicEffect::CastSelf) != 0;
         bool allowTouch = (effect->mData.mFlags & ESM::MagicEffect::CastTouch) && !mConstantEffect;
-        bool allowTarget = (effect->mData.mFlags & ESM::MagicEffect::CastTarget) && !mConstantEffect;
-
-        if (!allowSelf && !allowTouch && !allowTarget)
-            return; // TODO: Show an error message popup?
 
         setMagicEffect(effect);
         mEditing = false;
@@ -617,6 +613,13 @@ namespace MWGui
         const ESM::MagicEffect* effect =
             MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(mSelectedKnownEffectId);
 
+        bool allowSelf = (effect->mData.mFlags & ESM::MagicEffect::CastSelf) != 0;
+        bool allowTouch = (effect->mData.mFlags & ESM::MagicEffect::CastTouch) && !mConstantEffect;
+        bool allowTarget = (effect->mData.mFlags & ESM::MagicEffect::CastTarget) && !mConstantEffect;
+
+        if (!allowSelf && !allowTouch && !allowTarget)
+            return; // TODO: Show an error message popup?
+
         if (effect->mData.mFlags & ESM::MagicEffect::TargetSkill)
         {
             delete mSelectSkillDialog;

From 4b742dd461842db623c0d4edc04e4c29c45facf3 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Thu, 24 Feb 2022 16:01:40 +0100
Subject: [PATCH 2177/2859] explicit capture for lamda

---
 apps/opencs/view/world/tableheadermouseeventhandler.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/view/world/tableheadermouseeventhandler.cpp b/apps/opencs/view/world/tableheadermouseeventhandler.cpp
index 866c6149db..a9d34ce7ab 100644
--- a/apps/opencs/view/world/tableheadermouseeventhandler.cpp
+++ b/apps/opencs/view/world/tableheadermouseeventhandler.cpp
@@ -14,7 +14,7 @@ TableHeaderMouseEventHandler::TableHeaderMouseEventHandler(DragRecordTable * par
 {
     header.setContextMenuPolicy(Qt::ContextMenuPolicy::CustomContextMenu);
     connect(
-        &header, &QHeaderView::customContextMenuRequested, [=](const QPoint & position) { showContextMenu(position); });
+        &header, &QHeaderView::customContextMenuRequested, [this](const QPoint & position) { showContextMenu(position); });
 
     header.viewport()->installEventFilter(this);
 }
@@ -52,7 +52,7 @@ QMenu & TableHeaderMouseEventHandler::createContextMenu()
         action->setChecked(!table.isColumnHidden(i));
         menu->addAction(action);
 
-        connect(action, &QAction::triggered, [=]() {
+        connect(action, &QAction::triggered, [this, &action, &i]() {
             table.setColumnHidden(i, !action->isChecked());
             action->setChecked(!action->isChecked());
             action->toggle();

From ad11cc8d8a62991654e4c7865dfd75c6dd46acaf Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 25 Feb 2022 15:47:11 +0100
Subject: [PATCH 2178/2859] reinstall fontconfig as needed; const an imbigious
 == operator

---
 CI/before_install.osx.sh           | 2 +-
 apps/openmw/mwrender/globalmap.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index ec4ece6343..b3463aa9b8 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -9,7 +9,7 @@ brew update --quiet
 [ -z "${TRAVIS}" ] && brew uninstall --ignore-dependencies qt@6 || true
 
 # Some of these tools can come from places other than brew, so check before installing
-[ -z "${TRAVIS}" ] && brew install fontconfig
+[ -z "${TRAVIS}" ] && brew reinstall fontconfig
 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
diff --git a/apps/openmw/mwrender/globalmap.cpp b/apps/openmw/mwrender/globalmap.cpp
index acd566ff18..dca26a220f 100644
--- a/apps/openmw/mwrender/globalmap.cpp
+++ b/apps/openmw/mwrender/globalmap.cpp
@@ -453,7 +453,7 @@ namespace MWRender
             : mLeft(left), mTop(top), mRight(right), mBottom(bottom)
         {
         }
-        bool operator == (const Box& other)
+        bool operator == (const Box& other) const
         {
             return mLeft == other.mLeft && mTop == other.mTop && mRight == other.mRight && mBottom == other.mBottom;
         }

From 1927b1c6d9b0e60ff0ad202900155c0e2e3b35ae Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 25 Feb 2022 16:27:43 +0100
Subject: [PATCH 2179/2859] use static cast to handle: deprecated between
 enumerations of different types

---
 apps/openmw/mwlua/inputbindings.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwlua/inputbindings.cpp b/apps/openmw/mwlua/inputbindings.cpp
index a8487557ba..1be6e086fa 100644
--- a/apps/openmw/mwlua/inputbindings.cpp
+++ b/apps/openmw/mwlua/inputbindings.cpp
@@ -40,7 +40,7 @@ namespace MWLua
         touchpadEvent["finger"] = sol::readonly_property(
             [](const SDLUtil::TouchEvent& e) -> int { return e.mFinger; });
         touchpadEvent["position"] = sol::readonly_property(
-            [](const SDLUtil::TouchEvent& e) -> osg::Vec2f { return osg::Vec2f(e.mX, e.mY);});
+            [](const SDLUtil::TouchEvent& e) -> osg::Vec2f { return {e.mX, e.mY};});
         touchpadEvent["pressure"] = sol::readonly_property(
             [](const SDLUtil::TouchEvent& e) -> float { return e.mPressure; });
 
@@ -177,10 +177,10 @@ namespace MWLua
             {"TriggerLeft", SDL_CONTROLLER_AXIS_TRIGGERLEFT},
             {"TriggerRight", SDL_CONTROLLER_AXIS_TRIGGERRIGHT},
 
-            {"LookUpDown", SDL_CONTROLLER_AXIS_MAX + MWInput::A_LookUpDown},
-            {"LookLeftRight", SDL_CONTROLLER_AXIS_MAX + MWInput::A_LookLeftRight},
-            {"MoveForwardBackward", SDL_CONTROLLER_AXIS_MAX + MWInput::A_MoveForwardBackward},
-            {"MoveLeftRight", SDL_CONTROLLER_AXIS_MAX + MWInput::A_MoveLeftRight}
+            {"LookUpDown", SDL_CONTROLLER_AXIS_MAX + static_cast<int>(MWInput::A_LookUpDown)},
+            {"LookLeftRight", SDL_CONTROLLER_AXIS_MAX + static_cast<int>(MWInput::A_LookLeftRight)},
+            {"MoveForwardBackward", SDL_CONTROLLER_AXIS_MAX + static_cast<int>(MWInput::A_MoveForwardBackward)},
+            {"MoveLeftRight", SDL_CONTROLLER_AXIS_MAX + static_cast<int>(MWInput::A_MoveLeftRight)}
         }));
 
         api["KEY"] = LuaUtil::makeReadOnly(context.mLua->tableFromPairs<std::string_view, SDL_Scancode>({

From 6601274992fdb8671532fe97d420e171d8a536f0 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 25 Feb 2022 18:09:12 +0100
Subject: [PATCH 2180/2859] constify weakcache overloaded operators

---
 components/misc/weakcache.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/misc/weakcache.hpp b/components/misc/weakcache.hpp
index 022a722dba..3bbb0812cd 100644
--- a/components/misc/weakcache.hpp
+++ b/components/misc/weakcache.hpp
@@ -22,8 +22,8 @@ namespace Misc
         public:
             iterator(WeakCache* cache, typename Map::iterator current, typename Map::iterator end);
             iterator& operator++();
-            bool operator==(const iterator& other);
-            bool operator!=(const iterator& other);
+            bool operator==(const iterator& other) const;
+            bool operator!=(const iterator& other) const;
             StrongPtr operator*();
         private:
             WeakCache* mCache;
@@ -74,13 +74,13 @@ namespace Misc
     }
 
     template <typename Key, typename T>
-    bool WeakCache<Key, T>::iterator::operator==(const iterator& other)
+    bool WeakCache<Key, T>::iterator::operator==(const iterator& other) const
     {
         return mCurrent == other.mCurrent;
     }
 
     template <typename Key, typename T>
-    bool WeakCache<Key, T>::iterator::operator!=(const iterator& other)
+    bool WeakCache<Key, T>::iterator::operator!=(const iterator& other) const
     {
         return !(*this == other);
     }

From 32fd6f297a0e7efbdbd246355398ab1b94280fcb Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 25 Feb 2022 21:53:45 +0100
Subject: [PATCH 2181/2859] static_cast bitwise operation between different
 enumeration types

---
 apps/opencs/view/widget/colorpickerpopup.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/opencs/view/widget/colorpickerpopup.cpp b/apps/opencs/view/widget/colorpickerpopup.cpp
index 206a667276..3d69523924 100644
--- a/apps/opencs/view/widget/colorpickerpopup.cpp
+++ b/apps/opencs/view/widget/colorpickerpopup.cpp
@@ -11,7 +11,7 @@ CSVWidget::ColorPickerPopup::ColorPickerPopup(QWidget *parent)
     : QFrame(parent)
 {
     setWindowFlags(Qt::Popup);
-    setFrameStyle(QFrame::Box | QFrame::Plain);
+    setFrameStyle(QFrame::Box | static_cast<int>(QFrame::Plain));
     hide();
 
     mColorPicker = new QColorDialog(this);

From f6757ce1241b079a6f810c4ff650fb122a0d0967 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Wed, 2 Mar 2022 09:06:58 +0000
Subject: [PATCH 2182/2859] ccache for Windows

---
 .gitlab-ci.yml           | 16 ++++++++++++++--
 CI/before_script.msvc.sh |  9 +++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0225d08461..5579fcc76b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -352,6 +352,7 @@ variables: &tests-targets
   - 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 ccache -y
   - choco install cmake.install --installargs 'ADD_CMAKE_TO_PATH=System' -y
   - choco install vswhere -y
   - choco install ninja -y
@@ -374,10 +375,14 @@ variables: &tests-targets
     - $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
+    - $env:CCACHE_BASEDIR = Get-Location
+    - $env:CCACHE_DIR = "$(Get-Location)\ccache"
+    - New-Item -Type Directory -Force -Path $env:CCACHE_DIR
+    - sh CI/before_script.msvc.sh -c $config -p Win64 -v 2019 -k -V -N -b -t -C
     - cd MSVC2019_64_Ninja
     - .\ActivateMSVC.ps1
     - cmake --build . --config $config --target ($targets.Split(','))
+    - ccache --show-stats
     - 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
     - Get-ChildItem -Recurse *.ilk | Remove-Item
@@ -393,6 +398,7 @@ variables: &tests-targets
   cache:
     key: ninja-v2
     paths:
+    - ccache
     - deps
     - MSVC2019_64_Ninja/deps/Qt
   artifacts:
@@ -473,6 +479,7 @@ Windows_Ninja_Tests_RelWithDebInfo:
   - 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 ccache -y
   - choco install cmake.install --installargs 'ADD_CMAKE_TO_PATH=System' -y
   - choco install vswhere -y
   - choco install python -y
@@ -494,9 +501,13 @@ Windows_Ninja_Tests_RelWithDebInfo:
     - $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
+    - $env:CCACHE_BASEDIR = Get-Location
+    - $env:CCACHE_DIR = "$(Get-Location)\ccache"
+    - New-Item -Type Directory -Force -Path $env:CCACHE_DIR
+    - sh CI/before_script.msvc.sh -c $config -p Win64 -v 2019 -k -V -b -t -C
     - cd MSVC2019_64
     - cmake --build . --config $config --target ($targets.Split(','))
+    - ccache --show-stats
     - 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
     - Get-ChildItem -Recurse *.ilk | Remove-Item
@@ -512,6 +523,7 @@ Windows_Ninja_Tests_RelWithDebInfo:
   cache:
     key: msbuild-v2
     paths:
+    - ccache
     - deps
     - MSVC2019_64/deps/Qt
   artifacts:
diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index aaf459611e..563a65595b 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -62,6 +62,7 @@ VERBOSE=""
 STRIP=""
 SKIP_DOWNLOAD=""
 SKIP_EXTRACT=""
+USE_CCACHE=""
 KEEP=""
 UNITY_BUILD=""
 VS_VERSION=""
@@ -100,6 +101,8 @@ while [ $# -gt 0 ]; do
 			e )
 				SKIP_EXTRACT=true ;;
 
+			C )
+				USE_CCACHE=true ;;
 			k )
 				KEEP=true ;;
 
@@ -145,6 +148,8 @@ Options:
 		Set the configuration, can also be set with environment variable CONFIGURATION.
 		For mutli-config generators, this is ignored, and all configurations are set up.
 		For single-config generators, several configurations can be set up at once by specifying -c multiple times.
+	-C
+		Use ccache.
 	-d
 		Skip checking the downloads.
 	-e
@@ -503,6 +508,10 @@ if ! [ -z $UNITY_BUILD ]; then
 	add_cmake_opts "-DOPENMW_UNITY_BUILD=True"
 fi
 
+if ! [ -z $USE_CCACHE ]; then
+	add_cmake_opts "-DCMAKE_C_COMPILER_LAUNCHER=ccache  -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
+fi
+
 echo
 echo "==================================="
 echo "Starting prebuild on MSVC${MSVC_DISPLAY_YEAR} WIN${BITS}"

From 129d68e2999893e91ebd577dd03b76ca666980f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Thu, 3 Mar 2022 20:24:52 +0200
Subject: [PATCH 2183/2859] Fix #6660: Crash during intro video when closing
 the game

---
 apps/openmw/mwrender/landmanager.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/landmanager.cpp b/apps/openmw/mwrender/landmanager.cpp
index 560c1ba720..6af1d9782c 100644
--- a/apps/openmw/mwrender/landmanager.cpp
+++ b/apps/openmw/mwrender/landmanager.cpp
@@ -25,7 +25,10 @@ osg::ref_ptr<ESMTerrain::LandObject> LandManager::getLand(int x, int y)
         return static_cast<ESMTerrain::LandObject*>(obj.get());
     else
     {
-        const ESM::Land* land = MWBase::Environment::get().getWorld()->getStore().get<ESM::Land>().search(x,y);
+        const auto* world = MWBase::Environment::get().getWorld();
+        if (!world)
+            return nullptr;
+        const ESM::Land* land = world->getStore().get<ESM::Land>().search(x,y);
         if (!land)
             return nullptr;
         osg::ref_ptr<ESMTerrain::LandObject> landObj (new ESMTerrain::LandObject(land, mLoadFlags));

From 0b528d3bfb5e9ff4c7c113093b83df1ba16e8d7d Mon Sep 17 00:00:00 2001
From: Matt <3397065-ZehMatt@users.noreply.gitlab.com>
Date: Thu, 3 Mar 2022 20:39:53 +0000
Subject: [PATCH 2184/2859] Small improvement for headtracking

---
 apps/openmw/mwmechanics/actors.cpp | 32 ++++++++++++++++++------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index b6275070e0..267e674520 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1457,26 +1457,32 @@ namespace MWMechanics
 
                             MWMechanics::CreatureStats& stats = iter->first.getClass().getCreatureStats(iter->first);
                             bool firstPersonPlayer = isPlayer && world->isFirstPerson();
-                            bool inCombatOrPursue = stats.getAiSequence().isInCombat() || stats.getAiSequence().hasPackage(AiPackageTypeId::Pursue);
-                            MWWorld::Ptr activePackageTarget;
-
+  
                             // 1. Unconsious actor can not track target
                             // 2. Actors in combat and pursue mode do not bother to headtrack anyone except their target
                             // 3. Player character does not use headtracking in the 1st-person view
                             if (!stats.getKnockedDown() && !firstPersonPlayer)
                             {
+                                bool inCombatOrPursue = stats.getAiSequence().isInCombat() || stats.getAiSequence().isInPursuit();
                                 if (inCombatOrPursue)
-                                    activePackageTarget = stats.getAiSequence().getActivePackage().getTarget();
-
-                                for (PtrActorMap::iterator it(mActors.begin()); it != mActors.end(); ++it)
                                 {
-                                    if (it->first == iter->first)
-                                        continue;
-
-                                    if (inCombatOrPursue && it->first != activePackageTarget)
-                                        continue;
-
-                                    updateHeadTracking(iter->first, it->first, headTrackTarget, sqrHeadTrackDistance, inCombatOrPursue);
+                                    auto activePackageTarget = stats.getAiSequence().getActivePackage().getTarget();
+                                    if (!activePackageTarget.isEmpty())
+                                    {
+                                        // Track the specified target of package.
+                                        updateHeadTracking(iter->first, activePackageTarget, headTrackTarget, sqrHeadTrackDistance, inCombatOrPursue);
+                                    }
+                                }
+                                else
+                                {
+                                    // Find something nearby.
+                                    for (auto& [ptr, _] : mActors)
+                                    {
+                                        if (ptr == iter->first)
+                                            continue;
+
+                                        updateHeadTracking(iter->first, ptr, headTrackTarget, sqrHeadTrackDistance, inCombatOrPursue);
+                                    }
                                 }
                             }
 

From 96e48e549269c442b84aa49e1833a9093cdae7a5 Mon Sep 17 00:00:00 2001
From: Martin Otto <m_otto@hotmail.de>
Date: Fri, 4 Mar 2022 09:44:52 +0000
Subject: [PATCH 2185/2859] Make settings loader differentiate between engine
 and editor (fixes #6658).

---
 apps/opencs/model/prefs/state.cpp |  2 +-
 components/settings/settings.cpp  | 29 ++++++++++++++++++++++-------
 components/settings/settings.hpp  |  2 +-
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/apps/opencs/model/prefs/state.cpp b/apps/opencs/model/prefs/state.cpp
index ee0cbbed5a..0981ae4401 100644
--- a/apps/opencs/model/prefs/state.cpp
+++ b/apps/opencs/model/prefs/state.cpp
@@ -16,7 +16,7 @@ CSMPrefs::State *CSMPrefs::State::sThis = nullptr;
 
 void CSMPrefs::State::load()
 {
-    mSettings.load(mConfigurationManager);
+    mSettings.load(mConfigurationManager, true);
 }
 
 void CSMPrefs::State::declare()
diff --git a/components/settings/settings.cpp b/components/settings/settings.cpp
index b8ff700492..4c17394836 100644
--- a/components/settings/settings.cpp
+++ b/components/settings/settings.cpp
@@ -20,29 +20,44 @@ void Manager::clear()
     mChangedSettings.clear();
 }
 
-std::string Manager::load(const Files::ConfigurationManager& cfgMgr)
+std::string Manager::load(const Files::ConfigurationManager& cfgMgr, bool loadEditorSettings)
 {
     SettingsFileParser parser;
     const std::vector<boost::filesystem::path>& paths = cfgMgr.getActiveConfigPaths();
     if (paths.empty())
         throw std::runtime_error("No config dirs! ConfigurationManager::readConfiguration must be called first.");
 
+    // Create file name strings for either the engine or the editor.
+    std::string defaultSettingsFile = "";
+    std::string userSettingsFile = "";
+
+    if (!loadEditorSettings)
+    {
+        defaultSettingsFile = "defaults.bin";
+        userSettingsFile = "settings.cfg";
+    }
+    else
+    {
+        defaultSettingsFile = "defaults-cs.bin";
+        userSettingsFile = "openmw-cs.cfg";
+    }
+
     // Create the settings manager and load default settings file.
-    const std::string defaultsBin = (paths.front() / "defaults.bin").string();
+    const std::string defaultsBin = (paths.front() / defaultSettingsFile).string();
     if (!boost::filesystem::exists(defaultsBin))
-        throw std::runtime_error ("No default settings file found! Make sure the file \"defaults.bin\" was properly installed.");
+        throw std::runtime_error ("No default settings file found! Make sure the file \"" + defaultSettingsFile + "\" was properly installed.");
     parser.loadSettingsFile(defaultsBin, mDefaultSettings, true, false);
 
-    // Load "settings.cfg" from every config dir except the last one as additional default settings.
+    // Load "settings.cfg" or "openmw-cs.cfg" from every config dir except the last one as additional default settings.
     for (int i = 0; i < static_cast<int>(paths.size()) - 1; ++i)
     {
-        const std::string additionalDefaults = (paths[i] / "settings.cfg").string();
+        const std::string additionalDefaults = (paths[i] / userSettingsFile).string();
         if (boost::filesystem::exists(additionalDefaults))
             parser.loadSettingsFile(additionalDefaults, mDefaultSettings, false, true);
     }
 
-    // Load "settings.cfg" from the last config as user settings if they exist. This path will be used to save modified settings.
-    std::string settingspath = (paths.back() / "settings.cfg").string();
+    // Load "settings.cfg" or "openmw-cs.cfg" from the last config dir as user settings. This path will be used to save modified settings.
+    std::string settingspath = (paths.back() / userSettingsFile).string();
     if (boost::filesystem::exists(settingspath))
         parser.loadSettingsFile(settingspath, mUserSettings, false, false);
 
diff --git a/components/settings/settings.hpp b/components/settings/settings.hpp
index 04831ef171..c23d8d878e 100644
--- a/components/settings/settings.hpp
+++ b/components/settings/settings.hpp
@@ -31,7 +31,7 @@ namespace Settings
         void clear();
         ///< clears all settings and default settings
 
-        std::string load(const Files::ConfigurationManager& cfgMgr);
+        std::string load(const Files::ConfigurationManager& cfgMgr, bool loadEditorSettings = false);
         ///< load settings from all active config dirs. Returns the path of the last loaded file.
 
         void saveUser (const std::string& file);

From db5770b44c077bad1b35b85e1782a92e11f855e5 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Fri, 4 Mar 2022 17:31:52 +0100
Subject: [PATCH 2186/2859] Fix bugs introduced by layer refactor

---
 files/mygui/openmw_chargen_select_specialization.layout | 2 +-
 files/mygui/openmw_layers.xml                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/mygui/openmw_chargen_select_specialization.layout b/files/mygui/openmw_chargen_select_specialization.layout
index 47dc32f629..9c5b54557b 100644
--- a/files/mygui/openmw_chargen_select_specialization.layout
+++ b/files/mygui/openmw_chargen_select_specialization.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout">
     <!-- correct size is 247 144, adjust when skin is changed to a dialog -->
-    <Widget type="Window" skin="MW_DialogNoTransp" layer="Windows" position="0 0 247 144" align="Center" name="_Main">
+    <Widget type="Window" skin="MW_DialogNoTransp" layer="Modal" position="0 0 247 144" align="Center" name="_Main">
         <Widget type="Widget" skin="" position="14 14 216 116" align="Stretch">
 
             <!-- Label -->
diff --git a/files/mygui/openmw_layers.xml b/files/mygui/openmw_layers.xml
index 3e267075ef..4c93574edd 100644
--- a/files/mygui/openmw_layers.xml
+++ b/files/mygui/openmw_layers.xml
@@ -9,7 +9,6 @@
     </Layer>
     <Layer name="Windows" overlapped="true" pick="true"/>
     <Layer name="Debug" overlapped="true" pick="true"/>
-    <Layer name="Tooltip" overlapped="true" pick="true"/>
     <Layer name="Notification" overlapped="false" pick="false"/>
     <Layer name="DragAndDrop" overlapped="false" pick="false"/>
     <Layer name="DrowningBar" overlapped="false" pick="false"/>
@@ -19,6 +18,7 @@
     <Layer name="LoadingScreenBackground" overlapped="false" pick="true"/>
     <Layer name="LoadingScreen" overlapped="false" pick="true"/>
     <Layer name="Modal" overlapped="true" pick="true"/>
+    <Layer name="Tooltip" overlapped="true" pick="true"/>
     <Layer name="Video" overlapped="false" pick="true"/>
     <Layer name="InputBlocker" overlapped="false" pick="true"/>
     <Layer name="Pointer" overlapped="false" pick="false"/>

From 3bcbd4c17090fb67d38dac4ce6ae1df20c5dcbfe Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Fri, 4 Mar 2022 21:58:39 +0100
Subject: [PATCH 2187/2859] Fix quickkeys assign UI layer

---
 files/mygui/openmw_quickkeys_menu_assign.layout | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/mygui/openmw_quickkeys_menu_assign.layout b/files/mygui/openmw_quickkeys_menu_assign.layout
index 2c80fefcd8..649294e9d3 100644
--- a/files/mygui/openmw_quickkeys_menu_assign.layout
+++ b/files/mygui/openmw_quickkeys_menu_assign.layout
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_DialogNoTransp" position="0 0 16 154" layer="Windows" name="_Main">
+    <Widget type="Window" skin="MW_DialogNoTransp" position="0 0 16 154" layer="Modal" name="_Main">
 
         <Widget type="TextBox" skin="SandText" position="8 8 0 18" name="Label">
             <Property key="Caption" value="#{sQuickMenu1}"/>

From d83a381f79a7c157b7ee720fb0ae55e379b532cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Sun, 6 Mar 2022 15:58:16 +0200
Subject: [PATCH 2188/2859] Refactor and rename some things around Misc::Rng

---
 apps/openmw/mwmechanics/levelledlist.hpp | 10 +++---
 apps/openmw/mwworld/containerstore.cpp   | 28 ++++++++---------
 apps/openmw/mwworld/containerstore.hpp   |  6 ++--
 components/misc/rng.cpp                  | 38 +++++++++-------------
 components/misc/rng.hpp                  | 40 +++++++++---------------
 5 files changed, 51 insertions(+), 71 deletions(-)

diff --git a/apps/openmw/mwmechanics/levelledlist.hpp b/apps/openmw/mwmechanics/levelledlist.hpp
index 25064123ce..a1eb958ed1 100644
--- a/apps/openmw/mwmechanics/levelledlist.hpp
+++ b/apps/openmw/mwmechanics/levelledlist.hpp
@@ -19,14 +19,14 @@ namespace MWMechanics
 {
 
     /// @return ID of resulting item, or empty if none
-    inline std::string getLevelledItem (const ESM::LevelledListBase* levItem, bool creature, Misc::Rng::Seed& seed = Misc::Rng::getSeed())
+    inline std::string getLevelledItem (const ESM::LevelledListBase* levItem, bool creature, Misc::Rng::Generator& prng = Misc::Rng::getGenerator())
     {
         const std::vector<ESM::LevelledListBase::LevelItem>& items = levItem->mList;
 
         const MWWorld::Ptr& player = getPlayer();
         int playerLevel = player.getClass().getCreatureStats(player).getLevel();
 
-        if (Misc::Rng::roll0to99(seed) < levItem->mChanceNone)
+        if (Misc::Rng::roll0to99(prng) < levItem->mChanceNone)
             return std::string();
 
         std::vector<std::string> candidates;
@@ -55,7 +55,7 @@ namespace MWMechanics
         }
         if (candidates.empty())
             return std::string();
-        std::string item = candidates[Misc::Rng::rollDice(candidates.size(), seed)];
+        std::string item = candidates[Misc::Rng::rollDice(candidates.size(), prng)];
 
         // Vanilla doesn't fail on nonexistent items in levelled lists
         if (!MWBase::Environment::get().getWorld()->getStore().find(Misc::StringUtils::lowerCase(item)))
@@ -74,9 +74,9 @@ namespace MWMechanics
         else
         {
             if (ref.getPtr().getType() == ESM::ItemLevList::sRecordId)
-                return getLevelledItem(ref.getPtr().get<ESM::ItemLevList>()->mBase, false, seed);
+                return getLevelledItem(ref.getPtr().get<ESM::ItemLevList>()->mBase, false, prng);
             else
-                return getLevelledItem(ref.getPtr().get<ESM::CreatureLevList>()->mBase, true, seed);
+                return getLevelledItem(ref.getPtr().get<ESM::CreatureLevList>()->mBase, true, prng);
         }
     }
 
diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index 1bed36bf9c..a096231f2d 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -514,12 +514,12 @@ int MWWorld::ContainerStore::remove(const Ptr& item, int count, const Ptr& actor
     return count - toRemove;
 }
 
-void MWWorld::ContainerStore::fill (const ESM::InventoryList& items, const std::string& owner, Misc::Rng::Seed& seed)
+void MWWorld::ContainerStore::fill (const ESM::InventoryList& items, const std::string& owner, Misc::Rng::Generator& prng)
 {
     for (const ESM::ContItem& iter : items.mList)
     {
         std::string id = Misc::StringUtils::lowerCase(iter.mItem);
-        addInitialItem(id, owner, iter.mCount, &seed);
+        addInitialItem(id, owner, iter.mCount, &prng);
     }
 
     flagAsModified();
@@ -540,7 +540,7 @@ void MWWorld::ContainerStore::fillNonRandom (const ESM::InventoryList& items, co
 }
 
 void MWWorld::ContainerStore::addInitialItem (const std::string& id, const std::string& owner, int count,
-                                            Misc::Rng::Seed* seed, bool topLevel)
+                                            Misc::Rng::Generator* prng, bool topLevel)
 {
     if (count == 0) return; //Don't restock with nothing.
     try
@@ -548,13 +548,13 @@ void MWWorld::ContainerStore::addInitialItem (const std::string& id, const std::
         ManualRef ref (MWBase::Environment::get().getWorld()->getStore(), id, count);
         if (ref.getPtr().getClass().getScript(ref.getPtr()).empty())
         {
-            addInitialItemImp(ref.getPtr(), owner, count, seed, topLevel);
+            addInitialItemImp(ref.getPtr(), owner, count, prng, topLevel);
         }
         else
         {
             // Adding just one item per time to make sure there isn't a stack of scripted items
             for (int i = 0; i < std::abs(count); i++)
-                addInitialItemImp(ref.getPtr(), owner, count < 0 ? -1 : 1, seed, topLevel);
+                addInitialItemImp(ref.getPtr(), owner, count < 0 ? -1 : 1, prng, topLevel);
         }
     }
     catch (const std::exception& e)
@@ -564,26 +564,26 @@ void MWWorld::ContainerStore::addInitialItem (const std::string& id, const std::
 }
 
 void MWWorld::ContainerStore::addInitialItemImp(const MWWorld::Ptr& ptr, const std::string& owner, int count,
-                                               Misc::Rng::Seed* seed, bool topLevel)
+                                               Misc::Rng::Generator* prng, bool topLevel)
 {
     if (ptr.getType()==ESM::ItemLevList::sRecordId)
     {
-        if(!seed)
+        if(!prng)
             return;
         const ESM::ItemLevList* levItemList = ptr.get<ESM::ItemLevList>()->mBase;
 
         if (topLevel && std::abs(count) > 1 && levItemList->mFlags & ESM::ItemLevList::Each)
         {
             for (int i=0; i<std::abs(count); ++i)
-                addInitialItem(ptr.getCellRef().getRefId(), owner, count > 0 ? 1 : -1, seed, true);
+                addInitialItem(ptr.getCellRef().getRefId(), owner, count > 0 ? 1 : -1, prng, true);
             return;
         }
         else
         {
-            std::string itemId = MWMechanics::getLevelledItem(ptr.get<ESM::ItemLevList>()->mBase, false, *seed);
+            std::string itemId = MWMechanics::getLevelledItem(ptr.get<ESM::ItemLevList>()->mBase, false, *prng);
             if (itemId.empty())
                 return;
-            addInitialItem(itemId, owner, count, seed, false);
+            addInitialItem(itemId, owner, count, prng, false);
         }
     }
     else
@@ -619,8 +619,8 @@ void MWWorld::ContainerStore::resolve()
     {
         for(const auto&& ptr : *this)
             ptr.getRefData().setCount(0);
-        Misc::Rng::Seed seed{mSeed};
-        fill(mPtr.get<ESM::Container>()->mBase->mInventory, "", seed);
+        Misc::Rng::Generator prng{mSeed};
+        fill(mPtr.get<ESM::Container>()->mBase->mInventory, "", prng);
         addScripts(*this, mPtr.mCell);
     }
     mModified = true;
@@ -640,8 +640,8 @@ MWWorld::ResolutionHandle MWWorld::ContainerStore::resolveTemporarily()
     {
         for(const auto&& ptr : *this)
             ptr.getRefData().setCount(0);
-        Misc::Rng::Seed seed{mSeed};
-        fill(mPtr.get<ESM::Container>()->mBase->mInventory, "", seed);
+        Misc::Rng::Generator prng{mSeed};
+        fill(mPtr.get<ESM::Container>()->mBase->mInventory, "", prng);
         addScripts(*this, mPtr.mCell);
     }
     return {listener};
diff --git a/apps/openmw/mwworld/containerstore.hpp b/apps/openmw/mwworld/containerstore.hpp
index ef0d7b5e57..1951f0708e 100644
--- a/apps/openmw/mwworld/containerstore.hpp
+++ b/apps/openmw/mwworld/containerstore.hpp
@@ -126,8 +126,8 @@ namespace MWWorld
             std::weak_ptr<ResolutionListener> mResolutionListener;
 
             ContainerStoreIterator addImp (const Ptr& ptr, int count, bool markModified = true);
-            void addInitialItem (const std::string& id, const std::string& owner, int count, Misc::Rng::Seed* seed, bool topLevel=true);
-            void addInitialItemImp (const MWWorld::Ptr& ptr, const std::string& owner, int count, Misc::Rng::Seed* seed, bool topLevel=true);
+            void addInitialItem (const std::string& id, const std::string& owner, int count, Misc::Rng::Generator* prng, bool topLevel=true);
+            void addInitialItemImp (const MWWorld::Ptr& ptr, const std::string& owner, int count, Misc::Rng::Generator* prng, bool topLevel=true);
 
             template<typename T>
             ContainerStoreIterator getState (CellRefList<T>& collection,
@@ -221,7 +221,7 @@ namespace MWWorld
             virtual bool stacks (const ConstPtr& ptr1, const ConstPtr& ptr2) const;
             ///< @return true if the two specified objects can stack with each other
 
-            void fill (const ESM::InventoryList& items, const std::string& owner, Misc::Rng::Seed& seed = Misc::Rng::getSeed());
+            void fill (const ESM::InventoryList& items, const std::string& owner, Misc::Rng::Generator& seed = Misc::Rng::getGenerator());
             ///< Insert items into *this.
 
             void fillNonRandom (const ESM::InventoryList& items, const std::string& owner, unsigned int seed);
diff --git a/components/misc/rng.cpp b/components/misc/rng.cpp
index 113e7b1d5b..78c2a44434 100644
--- a/components/misc/rng.cpp
+++ b/components/misc/rng.cpp
@@ -3,50 +3,42 @@
 #include <chrono>
 #include <random>
 
-namespace
+namespace Misc::Rng
 {
-    Misc::Rng::Seed sSeed;
-}
-
-namespace Misc
-{
-    Rng::Seed::Seed(unsigned int seed)
-    {
-        mGenerator.seed(seed);
-    }
+    static Generator sGenerator;
 
-    Rng::Seed& Rng::getSeed()
+    Generator& getGenerator()
     {
-        return sSeed;
+        return sGenerator;
     }
 
-    void Rng::init(unsigned int seed)
+    void init(unsigned int seed)
     {
-        sSeed.mGenerator.seed(seed);
+        sGenerator.seed(seed);
     }
 
-    float Rng::rollProbability(Seed& seed)
+    float rollProbability(Generator& prng)
     {
-        return std::uniform_real_distribution<float>(0, 1 - std::numeric_limits<float>::epsilon())(seed.mGenerator);
+        return std::uniform_real_distribution<float>(0, 1 - std::numeric_limits<float>::epsilon())(prng);
     }
 
-    float Rng::rollClosedProbability(Seed& seed)
+    float rollClosedProbability(Generator& prng)
     {
-        return std::uniform_real_distribution<float>(0, 1)(seed.mGenerator);
+        return std::uniform_real_distribution<float>(0, 1)(prng);
     }
 
-    int Rng::rollDice(int max, Seed& seed)
+    int rollDice(int max, Generator& prng)
     {
-        return max > 0 ? std::uniform_int_distribution<int>(0, max - 1)(seed.mGenerator) : 0;
+        return max > 0 ? std::uniform_int_distribution<int>(0, max - 1)(prng) : 0;
     }
 
-    unsigned int Rng::generateDefaultSeed()
+    unsigned int generateDefaultSeed()
     {
         return static_cast<unsigned int>(std::chrono::high_resolution_clock::now().time_since_epoch().count());
     }
 
-    float Rng::deviate(float mean, float deviation, Seed& seed)
+    float deviate(float mean, float deviation, Generator& prng)
     {
-        return std::uniform_real_distribution<float>(mean - deviation, mean + deviation)(seed.mGenerator);
+        return std::uniform_real_distribution<float>(mean - deviation, mean + deviation)(prng);
     }
 }
diff --git a/components/misc/rng.hpp b/components/misc/rng.hpp
index 06e94897be..8d300f0913 100644
--- a/components/misc/rng.hpp
+++ b/components/misc/rng.hpp
@@ -4,47 +4,35 @@
 #include <cassert>
 #include <random>
 
-namespace Misc
-{
-
 /*
   Provides central implementation of the RNG logic
 */
-class Rng
+namespace Misc::Rng
 {
-public:
-    class Seed
-    {
-        std::mt19937 mGenerator;
-    public:
-        Seed() = default;
-        Seed(const Seed&) = delete;
-        Seed(unsigned int seed);
-        friend class Rng;
-    };
-
-    static Seed& getSeed();
+
+    using Generator = std::mt19937;
+
+    Generator& getGenerator();
+
+    /// returns default seed for RNG
+    unsigned int generateDefaultSeed();
 
     /// seed the RNG
-    static void init(unsigned int seed = generateDefaultSeed());
+    void init(unsigned int seed = generateDefaultSeed());
 
     /// return value in range [0.0f, 1.0f)  <- note open upper range.
-    static float rollProbability(Seed& seed = getSeed());
+    float rollProbability(Generator& prng = getGenerator());
   
     /// return value in range [0.0f, 1.0f]  <- note closed upper range.
-    static float rollClosedProbability(Seed& seed = getSeed());
+    float rollClosedProbability(Generator& prng = getGenerator());
 
     /// return value in range [0, max)  <- note open upper range.
-    static int rollDice(int max, Seed& seed = getSeed());
+    int rollDice(int max, Generator& prng = getGenerator());
 
     /// return value in range [0, 99]
-    static int roll0to99(Seed& seed = getSeed()) { return rollDice(100, seed); }
-
-    /// returns default seed for RNG
-    static unsigned int generateDefaultSeed();
+    inline int roll0to99(Generator& prng = getGenerator()) { return rollDice(100, prng); }
 
-    static float deviate(float mean, float deviation, Seed& seed = getSeed());
-};
+    float deviate(float mean, float deviation, Generator& prng = getGenerator());
 
 }
 

From 54e114d83e10022ef961d1a9a7342e38b7c5200d Mon Sep 17 00:00:00 2001
From: Matt <3397065-ZehMatt@users.noreply.gitlab.com>
Date: Sun, 6 Mar 2022 17:38:58 +0000
Subject: [PATCH 2189/2859] Avoid string copies for ESM::Variant::getString

---
 apps/openmw/mwgui/dialogue.cpp   | 24 ++++++++++++------------
 apps/openmw/mwgui/jailscreen.cpp |  2 +-
 components/esm3/variant.cpp      |  2 +-
 components/esm3/variant.hpp      |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp
index 86cad0fa7a..1e740abe22 100644
--- a/apps/openmw/mwgui/dialogue.cpp
+++ b/apps/openmw/mwgui/dialogue.cpp
@@ -368,15 +368,15 @@ namespace MWGui
 
         const MWWorld::Store<ESM::GameSetting> &gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
-        const std::string sPersuasion = gmst.find("sPersuasion")->mValue.getString();
-        const std::string sCompanionShare = gmst.find("sCompanionShare")->mValue.getString();
-        const std::string sBarter = gmst.find("sBarter")->mValue.getString();
-        const std::string sSpells = gmst.find("sSpells")->mValue.getString();
-        const std::string sTravel = gmst.find("sTravel")->mValue.getString();
-        const std::string sSpellMakingMenuTitle = gmst.find("sSpellMakingMenuTitle")->mValue.getString();
-        const std::string sEnchanting = gmst.find("sEnchanting")->mValue.getString();
-        const std::string sServiceTrainingTitle = gmst.find("sServiceTrainingTitle")->mValue.getString();
-        const std::string sRepair = gmst.find("sRepair")->mValue.getString();
+        const std::string& sPersuasion = gmst.find("sPersuasion")->mValue.getString();
+        const std::string& sCompanionShare = gmst.find("sCompanionShare")->mValue.getString();
+        const std::string& sBarter = gmst.find("sBarter")->mValue.getString();
+        const std::string& sSpells = gmst.find("sSpells")->mValue.getString();
+        const std::string& sTravel = gmst.find("sTravel")->mValue.getString();
+        const std::string& sSpellMakingMenuTitle = gmst.find("sSpellMakingMenuTitle")->mValue.getString();
+        const std::string& sEnchanting = gmst.find("sEnchanting")->mValue.getString();
+        const std::string& sServiceTrainingTitle = gmst.find("sServiceTrainingTitle")->mValue.getString();
+        const std::string& sRepair = gmst.find("sRepair")->mValue.getString();
 
         if (topic != sPersuasion && topic != sCompanionShare && topic != sBarter 
          && topic != sSpells && topic != sTravel && topic != sSpellMakingMenuTitle 
@@ -605,10 +605,10 @@ namespace MWGui
             Goodbye* link = new Goodbye();
             link->eventActivated += MyGUI::newDelegate(this, &DialogueWindow::onGoodbyeActivated);
             mLinks.push_back(link);
-            std::string goodbye = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("sGoodbye")->mValue.getString();
+            const std::string& goodbye = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("sGoodbye")->mValue.getString();
             BookTypesetter::Style* questionStyle = typesetter->createHotStyle(body, textColours.answer, textColours.answerOver,
-                                                                              textColours.answerPressed,
-                                                                              TypesetBook::InteractiveId(link));
+                textColours.answerPressed,
+                TypesetBook::InteractiveId(link));
             typesetter->lineBreak();
             typesetter->write(questionStyle, to_utf8_span(goodbye.c_str()));
         }
diff --git a/apps/openmw/mwgui/jailscreen.cpp b/apps/openmw/mwgui/jailscreen.cpp
index a029fe54b6..53219a29d6 100644
--- a/apps/openmw/mwgui/jailscreen.cpp
+++ b/apps/openmw/mwgui/jailscreen.cpp
@@ -109,7 +109,7 @@ namespace MWGui
 
         for (const int& skill : skills)
         {
-            std::string skillName = gmst.find(ESM::Skill::sSkillNameIds[skill])->mValue.getString();
+            const std::string& skillName = gmst.find(ESM::Skill::sSkillNameIds[skill])->mValue.getString();
             int skillValue = player.getClass().getNpcStats(player).getSkill(skill).getBase();
             std::string skillMsg = gmst.find("sNotifyMessage44")->mValue.getString();
             if (skill == ESM::Skill::Sneak || skill == ESM::Skill::Security)
diff --git a/components/esm3/variant.cpp b/components/esm3/variant.cpp
index a0f6ca7b41..732d7e7f29 100644
--- a/components/esm3/variant.cpp
+++ b/components/esm3/variant.cpp
@@ -48,7 +48,7 @@ namespace
     };
 }
 
-std::string ESM::Variant::getString() const
+const std::string& ESM::Variant::getString() const
 {
     return std::get<std::string>(mData);
 }
diff --git a/components/esm3/variant.hpp b/components/esm3/variant.hpp
index f0a16d4d53..3d706c163f 100644
--- a/components/esm3/variant.hpp
+++ b/components/esm3/variant.hpp
@@ -49,7 +49,7 @@ namespace ESM
 
             VarType getType() const { return mType; }
 
-            std::string getString() const;
+            const std::string& getString() const;
             ///< Will throw an exception, if value can not be represented as a string.
 
             int getInteger() const;

From 3a117cac2247c41a28b537a2e4cc494f2159dc78 Mon Sep 17 00:00:00 2001
From: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
Date: Mon, 7 Mar 2022 16:05:24 +0000
Subject: [PATCH 2190/2859] Switch to a constexpr for FourCC constant

Add static asssert on wrong size
---
 apps/essimporter/importer.cpp    |  16 ++--
 components/esm/defs.hpp          | 160 +++++++++++++++----------------
 components/esm3/aisequence.hpp   |  14 +--
 components/esm3/cellref.cpp      |  34 +++----
 components/esm3/debugprofile.cpp |   6 +-
 components/esm3/filter.cpp       |   4 +-
 components/esm3/loadacti.cpp     |   6 +-
 components/esm3/loadalch.cpp     |  12 +--
 components/esm3/loadappa.cpp     |  10 +-
 components/esm3/loadarmo.cpp     |  14 +--
 components/esm3/loadbody.cpp     |   6 +-
 components/esm3/loadbook.cpp     |  14 +--
 components/esm3/loadbsgn.cpp     |   8 +-
 components/esm3/loadcell.cpp     |  14 +--
 components/esm3/loadclas.cpp     |   6 +-
 components/esm3/loadclot.cpp     |  14 +--
 components/esm3/loadcont.cpp     |  12 +--
 components/esm3/loadcrea.cpp     |  26 ++---
 components/esm3/loaddial.cpp     |   2 +-
 components/esm3/loaddoor.cpp     |  10 +-
 components/esm3/loadench.cpp     |   4 +-
 components/esm3/loadfact.cpp     |   8 +-
 components/esm3/loadinfo.cpp     |  26 ++---
 components/esm3/loadingr.cpp     |  10 +-
 components/esm3/loadland.cpp     |  14 +--
 components/esm3/loadlevlist.cpp  |   6 +-
 components/esm3/loadligh.cpp     |  12 +--
 components/esm3/loadlock.cpp     |  10 +-
 components/esm3/loadltex.cpp     |   4 +-
 components/esm3/loadmgef.cpp     |  22 ++---
 components/esm3/loadmisc.cpp     |  10 +-
 components/esm3/loadnpc.cpp      |  30 +++---
 components/esm3/loadpgrd.cpp     |   6 +-
 components/esm3/loadprob.cpp     |  10 +-
 components/esm3/loadrace.cpp     |   8 +-
 components/esm3/loadregn.cpp     |  10 +-
 components/esm3/loadrepa.cpp     |  10 +-
 components/esm3/loadscpt.cpp     |   8 +-
 components/esm3/loadskil.cpp     |   6 +-
 components/esm3/loadsndg.cpp     |   6 +-
 components/esm3/loadsoun.cpp     |   4 +-
 components/esm3/loadspel.cpp     |   6 +-
 components/esm3/loadsscr.cpp     |   2 +-
 components/esm3/loadstat.cpp     |   2 +-
 components/esm3/loadweap.cpp     |  12 +--
 components/esm3/transport.cpp    |   4 +-
 components/esm3/variant.cpp      |   8 +-
 47 files changed, 323 insertions(+), 323 deletions(-)

diff --git a/apps/essimporter/importer.cpp b/apps/essimporter/importer.cpp
index 710c2e9ab2..9931385f8c 100644
--- a/apps/essimporter/importer.cpp
+++ b/apps/essimporter/importer.cpp
@@ -263,14 +263,14 @@ namespace ESSImport
         const ESM::Header& header = esm.getHeader();
         context.mPlayerCellName = header.mGameData.mCurrentCell.toString();
 
-        const unsigned int recREFR = ESM::FourCC<'R','E','F','R'>::value;
-        const unsigned int recPCDT = ESM::FourCC<'P','C','D','T'>::value;
-        const unsigned int recFMAP = ESM::FourCC<'F','M','A','P'>::value;
-        const unsigned int recKLST = ESM::FourCC<'K','L','S','T'>::value;
-        const unsigned int recSTLN = ESM::FourCC<'S','T','L','N'>::value;
-        const unsigned int recGAME = ESM::FourCC<'G','A','M','E'>::value;
-        const unsigned int recJOUR = ESM::FourCC<'J','O','U','R'>::value;
-        const unsigned int recSPLM = ESM::FourCC<'S','P','L','M'>::value;
+        const unsigned int recREFR = ESM::fourCC("REFR");
+        const unsigned int recPCDT = ESM::fourCC("PCDT");
+        const unsigned int recFMAP = ESM::fourCC("FMAP");
+        const unsigned int recKLST = ESM::fourCC("KLST");
+        const unsigned int recSTLN = ESM::fourCC("STLN");
+        const unsigned int recGAME = ESM::fourCC("GAME");
+        const unsigned int recJOUR = ESM::fourCC("JOUR");
+        const unsigned int recSPLM = ESM::fourCC("SPLM");
 
         std::map<unsigned int, std::shared_ptr<Converter> > converters;
         converters[ESM::REC_GLOB] = std::shared_ptr<Converter>(new ConvertGlobal());
diff --git a/components/esm/defs.hpp b/components/esm/defs.hpp
index a7d2f44dd7..f587fc6690 100644
--- a/components/esm/defs.hpp
+++ b/components/esm/defs.hpp
@@ -61,7 +61,7 @@ struct Position
 
     friend inline bool operator<(const Position& l, const Position& r)
     {
-        const auto tuple = [] (const Position& v) { return std::tuple(v.asVec3(), v.asRotationVec3()); };
+        const auto tuple = [](const Position& v) { return std::tuple(v.asVec3(), v.asRotationVec3()); };
         return tuple(l) < tuple(r);
     }
 };
@@ -86,100 +86,100 @@ bool inline operator!= (const Position& left, const Position& right) noexcept
            left.rot[2] != right.rot[2];
 }
 
-template <int a, int b, int c, int d>
-struct FourCC
-{
-    static constexpr unsigned int value = (((((d << 8) | c) << 8) | b) << 8) | a;
-};
+template<std::size_t len>
+constexpr unsigned int fourCC(const char(&name)[len]) {
+    static_assert(len == 5, "Constant must be 4 characters long. (Plus null terminator)");
+    return static_cast<unsigned char>(name[0]) | (static_cast<unsigned char>(name[1]) << 8) | (static_cast<unsigned char>(name[2]) << 16) | (static_cast<unsigned char>(name[3]) << 24);
+}
 
 enum RecNameInts : unsigned int
 {
     // format 0 / legacy
-    REC_ACTI = FourCC<'A','C','T','I'>::value,
-    REC_ALCH = FourCC<'A','L','C','H'>::value,
-    REC_APPA = FourCC<'A','P','P','A'>::value,
-    REC_ARMO = FourCC<'A','R','M','O'>::value,
-    REC_BODY = FourCC<'B','O','D','Y'>::value,
-    REC_BOOK = FourCC<'B','O','O','K'>::value,
-    REC_BSGN = FourCC<'B','S','G','N'>::value,
-    REC_CELL = FourCC<'C','E','L','L'>::value,
-    REC_CLAS = FourCC<'C','L','A','S'>::value,
-    REC_CLOT = FourCC<'C','L','O','T'>::value,
-    REC_CNTC = FourCC<'C','N','T','C'>::value,
-    REC_CONT = FourCC<'C','O','N','T'>::value,
-    REC_CREA = FourCC<'C','R','E','A'>::value,
-    REC_CREC = FourCC<'C','R','E','C'>::value,
-    REC_DIAL = FourCC<'D','I','A','L'>::value,
-    REC_DOOR = FourCC<'D','O','O','R'>::value,
-    REC_ENCH = FourCC<'E','N','C','H'>::value,
-    REC_FACT = FourCC<'F','A','C','T'>::value,
-    REC_GLOB = FourCC<'G','L','O','B'>::value,
-    REC_GMST = FourCC<'G','M','S','T'>::value,
-    REC_INFO = FourCC<'I','N','F','O'>::value,
-    REC_INGR = FourCC<'I','N','G','R'>::value,
-    REC_LAND = FourCC<'L','A','N','D'>::value,
-    REC_LEVC = FourCC<'L','E','V','C'>::value,
-    REC_LEVI = FourCC<'L','E','V','I'>::value,
-    REC_LIGH = FourCC<'L','I','G','H'>::value,
-    REC_LOCK = FourCC<'L','O','C','K'>::value,
-    REC_LTEX = FourCC<'L','T','E','X'>::value,
-    REC_MGEF = FourCC<'M','G','E','F'>::value,
-    REC_MISC = FourCC<'M','I','S','C'>::value,
-    REC_NPC_ = FourCC<'N','P','C','_'>::value,
-    REC_NPCC = FourCC<'N','P','C','C'>::value,
-    REC_PGRD = FourCC<'P','G','R','D'>::value,
-    REC_PROB = FourCC<'P','R','O','B'>::value,
-    REC_RACE = FourCC<'R','A','C','E'>::value,
-    REC_REGN = FourCC<'R','E','G','N'>::value,
-    REC_REPA = FourCC<'R','E','P','A'>::value,
-    REC_SCPT = FourCC<'S','C','P','T'>::value,
-    REC_SKIL = FourCC<'S','K','I','L'>::value,
-    REC_SNDG = FourCC<'S','N','D','G'>::value,
-    REC_SOUN = FourCC<'S','O','U','N'>::value,
-    REC_SPEL = FourCC<'S','P','E','L'>::value,
-    REC_SSCR = FourCC<'S','S','C','R'>::value,
-    REC_STAT = FourCC<'S','T','A','T'>::value,
-    REC_WEAP = FourCC<'W','E','A','P'>::value,
+    REC_ACTI = fourCC("ACTI"),
+    REC_ALCH = fourCC("ALCH"),
+    REC_APPA = fourCC("APPA"),
+    REC_ARMO = fourCC("ARMO"),
+    REC_BODY = fourCC("BODY"),
+    REC_BOOK = fourCC("BOOK"),
+    REC_BSGN = fourCC("BSGN"),
+    REC_CELL = fourCC("CELL"),
+    REC_CLAS = fourCC("CLAS"),
+    REC_CLOT = fourCC("CLOT"),
+    REC_CNTC = fourCC("CNTC"),
+    REC_CONT = fourCC("CONT"),
+    REC_CREA = fourCC("CREA"),
+    REC_CREC = fourCC("CREC"),
+    REC_DIAL = fourCC("DIAL"),
+    REC_DOOR = fourCC("DOOR"),
+    REC_ENCH = fourCC("ENCH"),
+    REC_FACT = fourCC("FACT"),
+    REC_GLOB = fourCC("GLOB"),
+    REC_GMST = fourCC("GMST"),
+    REC_INFO = fourCC("INFO"),
+    REC_INGR = fourCC("INGR"),
+    REC_LAND = fourCC("LAND"),
+    REC_LEVC = fourCC("LEVC"),
+    REC_LEVI = fourCC("LEVI"),
+    REC_LIGH = fourCC("LIGH"),
+    REC_LOCK = fourCC("LOCK"),
+    REC_LTEX = fourCC("LTEX"),
+    REC_MGEF = fourCC("MGEF"),
+    REC_MISC = fourCC("MISC"),
+    REC_NPC_ = fourCC("NPC_"),
+    REC_NPCC = fourCC("NPCC"),
+    REC_PGRD = fourCC("PGRD"),
+    REC_PROB = fourCC("PROB"),
+    REC_RACE = fourCC("RACE"),
+    REC_REGN = fourCC("REGN"),
+    REC_REPA = fourCC("REPA"),
+    REC_SCPT = fourCC("SCPT"),
+    REC_SKIL = fourCC("SKIL"),
+    REC_SNDG = fourCC("SNDG"),
+    REC_SOUN = fourCC("SOUN"),
+    REC_SPEL = fourCC("SPEL"),
+    REC_SSCR = fourCC("SSCR"),
+    REC_STAT = fourCC("STAT"),
+    REC_WEAP = fourCC("WEAP"),
 
     // format 0 - saved games
-    REC_SAVE = FourCC<'S','A','V','E'>::value,
-    REC_JOUR_LEGACY = FourCC<0xa4,'U','O','R'>::value, // "\xa4UOR", rather than "JOUR", little oversight when magic numbers were
-                                                       // calculated by hand, needs to be supported for older files now
-    REC_JOUR = FourCC<'J','O','U','R'>::value,
-    REC_QUES = FourCC<'Q','U','E','S'>::value,
-    REC_GSCR = FourCC<'G','S','C','R'>::value,
-    REC_PLAY = FourCC<'P','L','A','Y'>::value,
-    REC_CSTA = FourCC<'C','S','T','A'>::value,
-    REC_GMAP = FourCC<'G','M','A','P'>::value,
-    REC_DIAS = FourCC<'D','I','A','S'>::value,
-    REC_WTHR = FourCC<'W','T','H','R'>::value,
-    REC_KEYS = FourCC<'K','E','Y','S'>::value,
-    REC_DYNA = FourCC<'D','Y','N','A'>::value,
-    REC_ASPL = FourCC<'A','S','P','L'>::value,
-    REC_ACTC = FourCC<'A','C','T','C'>::value,
-    REC_MPRJ = FourCC<'M','P','R','J'>::value,
-    REC_PROJ = FourCC<'P','R','O','J'>::value,
-    REC_DCOU = FourCC<'D','C','O','U'>::value,
-    REC_MARK = FourCC<'M','A','R','K'>::value,
-    REC_ENAB = FourCC<'E','N','A','B'>::value,
-    REC_CAM_ = FourCC<'C','A','M','_'>::value,
-    REC_STLN = FourCC<'S','T','L','N'>::value,
-    REC_INPU = FourCC<'I','N','P','U'>::value,
+    REC_SAVE = fourCC("SAVE"),
+    REC_JOUR_LEGACY = fourCC("\xa4UOR"), // "\xa4UOR", rather than "JOUR", little oversight when magic numbers were
+                                         // calculated by hand, needs to be supported for older files now
+    REC_JOUR = fourCC("JOUR"),
+    REC_QUES = fourCC("QUES"),
+    REC_GSCR = fourCC("GSCR"),
+    REC_PLAY = fourCC("PLAY"),
+    REC_CSTA = fourCC("CSTA"),
+    REC_GMAP = fourCC("GMAP"),
+    REC_DIAS = fourCC("DIAS"),
+    REC_WTHR = fourCC("WTHR"),
+    REC_KEYS = fourCC("KEYS"),
+    REC_DYNA = fourCC("DYNA"),
+    REC_ASPL = fourCC("ASPL"),
+    REC_ACTC = fourCC("ACTC"),
+    REC_MPRJ = fourCC("MPRJ"),
+    REC_PROJ = fourCC("PROJ"),
+    REC_DCOU = fourCC("DCOU"),
+    REC_MARK = fourCC("MARK"),
+    REC_ENAB = fourCC("ENAB"),
+    REC_CAM_ = fourCC("CAM_"),
+    REC_STLN = fourCC("STLN"),
+    REC_INPU = fourCC("INPU"),
 
     // format 1
-    REC_FILT = FourCC<'F','I','L','T'>::value,
-    REC_DBGP = FourCC<'D','B','G','P'>::value, ///< only used in project files
-    REC_LUAL = FourCC<'L','U','A','L'>::value,  // LuaScriptsCfg
+    REC_FILT = fourCC("FILT"),
+    REC_DBGP = fourCC("DBGP"), ///< only used in project files
+    REC_LUAL = fourCC("LUAL"),  // LuaScriptsCfg
 
     // format 16 - Lua scripts in saved games
-    REC_LUAM = FourCC<'L','U','A','M'>::value,  // LuaManager data
+    REC_LUAM = fourCC("LUAM"),  // LuaManager data
 };
 
 /// Common subrecords
 enum SubRecNameInts
 {
-    SREC_DELE = ESM::FourCC<'D','E','L','E'>::value,
-    SREC_NAME = ESM::FourCC<'N','A','M','E'>::value
+    SREC_DELE = ESM::fourCC("DELE"),
+    SREC_NAME = ESM::fourCC("NAME")
 };
 
 }
diff --git a/components/esm3/aisequence.hpp b/components/esm3/aisequence.hpp
index 3dcecc1cb0..412c7401bf 100644
--- a/components/esm3/aisequence.hpp
+++ b/components/esm3/aisequence.hpp
@@ -22,13 +22,13 @@ namespace ESM
 
     enum AiPackages
     {
-        Ai_Wander = ESM::FourCC<'W','A','N','D'>::value,
-        Ai_Travel = ESM::FourCC<'T','R','A','V'>::value,
-        Ai_Escort = ESM::FourCC<'E','S','C','O'>::value,
-        Ai_Follow = ESM::FourCC<'F','O','L','L'>::value,
-        Ai_Activate = ESM::FourCC<'A','C','T','I'>::value,
-        Ai_Combat = ESM::FourCC<'C','O','M','B'>::value,
-        Ai_Pursue = ESM::FourCC<'P','U','R','S'>::value
+        Ai_Wander = ESM::fourCC("WAND"),
+        Ai_Travel = ESM::fourCC("TRAV"),
+        Ai_Escort = ESM::fourCC("ESCO"),
+        Ai_Follow = ESM::fourCC("FOLL"),
+        Ai_Activate = ESM::fourCC("ACTI"),
+        Ai_Combat = ESM::fourCC("COMB"),
+        Ai_Pursue = ESM::fourCC("PURS")
     };
 
 
diff --git a/components/esm3/cellref.cpp b/components/esm3/cellref.cpp
index 8487b3c0f0..1a0320d823 100644
--- a/components/esm3/cellref.cpp
+++ b/components/esm3/cellref.cpp
@@ -63,57 +63,57 @@ void ESM::CellRef::loadData(ESMReader &esm, bool &isDeleted)
         esm.getSubName();
         switch (esm.retSubName().toInt())
         {
-            case ESM::FourCC<'U','N','A','M'>::value:
+            case ESM::fourCC("UNAM"):
                 esm.getHT(mReferenceBlocked);
                 break;
-            case ESM::FourCC<'X','S','C','L'>::value:
+            case ESM::fourCC("XSCL"):
                 esm.getHT(mScale);
                 mScale = std::clamp(mScale, 0.5f, 2.0f);
                 break;
-            case ESM::FourCC<'A','N','A','M'>::value:
+            case ESM::fourCC("ANAM"):
                 mOwner = esm.getHString();
                 break;
-            case ESM::FourCC<'B','N','A','M'>::value:
+            case ESM::fourCC("BNAM"):
                 mGlobalVariable = esm.getHString();
                 break;
-            case ESM::FourCC<'X','S','O','L'>::value:
+            case ESM::fourCC("XSOL"):
                 mSoul = esm.getHString();
                 break;
-            case ESM::FourCC<'C','N','A','M'>::value:
+            case ESM::fourCC("CNAM"):
                 mFaction = esm.getHString();
                 break;
-            case ESM::FourCC<'I','N','D','X'>::value:
+            case ESM::fourCC("INDX"):
                 esm.getHT(mFactionRank);
                 break;
-            case ESM::FourCC<'X','C','H','G'>::value:
+            case ESM::fourCC("XCHG"):
                 esm.getHT(mEnchantmentCharge);
                 break;
-            case ESM::FourCC<'I','N','T','V'>::value:
+            case ESM::fourCC("INTV"):
                 esm.getHT(mChargeInt);
                 break;
-            case ESM::FourCC<'N','A','M','9'>::value:
+            case ESM::fourCC("NAM9"):
                 esm.getHT(mGoldValue);
                 break;
-            case ESM::FourCC<'D','O','D','T'>::value:
+            case ESM::fourCC("DODT"):
                 esm.getHT(mDoorDest);
                 mTeleport = true;
                 break;
-            case ESM::FourCC<'D','N','A','M'>::value:
+            case ESM::fourCC("DNAM"):
                 mDestCell = esm.getHString();
                 break;
-            case ESM::FourCC<'F','L','T','V'>::value:
+            case ESM::fourCC("FLTV"):
                 esm.getHT(mLockLevel);
                 break;
-            case ESM::FourCC<'K','N','A','M'>::value:
+            case ESM::fourCC("KNAM"):
                 mKey = esm.getHString();
                 break;
-            case ESM::FourCC<'T','N','A','M'>::value:
+            case ESM::fourCC("TNAM"):
                 mTrap = esm.getHString();
                 break;
-            case ESM::FourCC<'D','A','T','A'>::value:
+            case ESM::fourCC("DATA"):
                 esm.getHT(mPos, 24);
                 break;
-            case ESM::FourCC<'N','A','M','0'>::value:
+            case ESM::fourCC("NAM0"):
             {
                 esm.skipHSub();
                 break;
diff --git a/components/esm3/debugprofile.cpp b/components/esm3/debugprofile.cpp
index f862d4a289..87c3bd13ba 100644
--- a/components/esm3/debugprofile.cpp
+++ b/components/esm3/debugprofile.cpp
@@ -19,13 +19,13 @@ void ESM::DebugProfile::load (ESMReader& esm, bool &isDeleted)
             case ESM::SREC_NAME:
                 mId = esm.getHString();
                 break;
-            case ESM::FourCC<'D','E','S','C'>::value:
+            case ESM::fourCC("DESC"):
                 mDescription = esm.getHString();
                 break;
-            case ESM::FourCC<'S','C','R','P'>::value:
+            case ESM::fourCC("SCRP"):
                 mScriptText = esm.getHString();
                 break;
-            case ESM::FourCC<'F','L','A','G'>::value:
+            case ESM::fourCC("FLAG"):
                 esm.getHT(mFlags);
                 break;
             case ESM::SREC_DELE:
diff --git a/components/esm3/filter.cpp b/components/esm3/filter.cpp
index 03fa4ba278..a031e0f608 100644
--- a/components/esm3/filter.cpp
+++ b/components/esm3/filter.cpp
@@ -20,10 +20,10 @@ void ESM::Filter::load (ESMReader& esm, bool &isDeleted)
             case ESM::SREC_NAME:
                 mId = esm.getHString();
                 break;
-            case ESM::FourCC<'F','I','L','T'>::value:
+            case ESM::fourCC("FILT"):
                 mFilter = esm.getHString();
                 break;
-            case ESM::FourCC<'D','E','S','C'>::value:
+            case ESM::fourCC("DESC"):
                 mDescription = esm.getHString();
                 break;
             case ESM::SREC_DELE:
diff --git a/components/esm3/loadacti.cpp b/components/esm3/loadacti.cpp
index c4aa9cb6b8..d57ef44be2 100644
--- a/components/esm3/loadacti.cpp
+++ b/components/esm3/loadacti.cpp
@@ -23,13 +23,13 @@ namespace ESM
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::FourCC<'M','O','D','L'>::value:
+                case ESM::fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::FourCC<'F','N','A','M'>::value:
+                case ESM::fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::FourCC<'S','C','R','I'>::value:
+                case ESM::fourCC("SCRI"):
                     mScript = esm.getHString();
                     break;
                 case ESM::SREC_DELE:
diff --git a/components/esm3/loadalch.cpp b/components/esm3/loadalch.cpp
index 618e116cce..1aacfc8976 100644
--- a/components/esm3/loadalch.cpp
+++ b/components/esm3/loadalch.cpp
@@ -26,23 +26,23 @@ namespace ESM
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::FourCC<'M','O','D','L'>::value:
+                case ESM::fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::FourCC<'T','E','X','T'>::value: // not ITEX here for some reason
+                case ESM::fourCC("TEXT"): // not ITEX here for some reason
                     mIcon = esm.getHString();
                     break;
-                case ESM::FourCC<'S','C','R','I'>::value:
+                case ESM::fourCC("SCRI"):
                     mScript = esm.getHString();
                     break;
-                case ESM::FourCC<'F','N','A','M'>::value:
+                case ESM::fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::FourCC<'A','L','D','T'>::value:
+                case ESM::fourCC("ALDT"):
                     esm.getHT(mData, 12);
                     hasData = true;
                     break;
-                case ESM::FourCC<'E','N','A','M'>::value:
+                case ESM::fourCC("ENAM"):
                     mEffects.add(esm);
                     break;
                 case ESM::SREC_DELE:
diff --git a/components/esm3/loadappa.cpp b/components/esm3/loadappa.cpp
index 13ba0fbb42..f29e5bf4f9 100644
--- a/components/esm3/loadappa.cpp
+++ b/components/esm3/loadappa.cpp
@@ -24,20 +24,20 @@ namespace ESM
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::FourCC<'M','O','D','L'>::value:
+                case ESM::fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::FourCC<'F','N','A','M'>::value:
+                case ESM::fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::FourCC<'A','A','D','T'>::value:
+                case ESM::fourCC("AADT"):
                     esm.getHT(mData);
                     hasData = true;
                     break;
-                case ESM::FourCC<'S','C','R','I'>::value:
+                case ESM::fourCC("SCRI"):
                     mScript = esm.getHString();
                     break;
-                case ESM::FourCC<'I','T','E','X'>::value:
+                case ESM::fourCC("ITEX"):
                     mIcon = esm.getHString();
                     break;
                 case ESM::SREC_DELE:
diff --git a/components/esm3/loadarmo.cpp b/components/esm3/loadarmo.cpp
index 9c5164f8a6..b476e930a8 100644
--- a/components/esm3/loadarmo.cpp
+++ b/components/esm3/loadarmo.cpp
@@ -56,26 +56,26 @@ namespace ESM
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::FourCC<'M','O','D','L'>::value:
+                case ESM::fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::FourCC<'F','N','A','M'>::value:
+                case ESM::fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::FourCC<'A','O','D','T'>::value:
+                case ESM::fourCC("AODT"):
                     esm.getHT(mData, 24);
                     hasData = true;
                     break;
-                case ESM::FourCC<'S','C','R','I'>::value:
+                case ESM::fourCC("SCRI"):
                     mScript = esm.getHString();
                     break;
-                case ESM::FourCC<'I','T','E','X'>::value:
+                case ESM::fourCC("ITEX"):
                     mIcon = esm.getHString();
                     break;
-                case ESM::FourCC<'E','N','A','M'>::value:
+                case ESM::fourCC("ENAM"):
                     mEnchant = esm.getHString();
                     break;
-                case ESM::FourCC<'I','N','D','X'>::value:
+                case ESM::fourCC("INDX"):
                     mParts.add(esm);
                     break;
                 case ESM::SREC_DELE:
diff --git a/components/esm3/loadbody.cpp b/components/esm3/loadbody.cpp
index 1098941c25..148e80d94c 100644
--- a/components/esm3/loadbody.cpp
+++ b/components/esm3/loadbody.cpp
@@ -24,13 +24,13 @@ namespace ESM
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::FourCC<'M','O','D','L'>::value:
+                case ESM::fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::FourCC<'F','N','A','M'>::value:
+                case ESM::fourCC("FNAM"):
                     mRace = esm.getHString();
                     break;
-                case ESM::FourCC<'B','Y','D','T'>::value:
+                case ESM::fourCC("BYDT"):
                     esm.getHT(mData, 4);
                     hasData = true;
                     break;
diff --git a/components/esm3/loadbook.cpp b/components/esm3/loadbook.cpp
index c03046ed9f..72618f3ce8 100644
--- a/components/esm3/loadbook.cpp
+++ b/components/esm3/loadbook.cpp
@@ -24,26 +24,26 @@ namespace ESM
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::FourCC<'M','O','D','L'>::value:
+                case ESM::fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::FourCC<'F','N','A','M'>::value:
+                case ESM::fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::FourCC<'B','K','D','T'>::value:
+                case ESM::fourCC("BKDT"):
                     esm.getHT(mData, 20);
                     hasData = true;
                     break;
-                case ESM::FourCC<'S','C','R','I'>::value:
+                case ESM::fourCC("SCRI"):
                     mScript = esm.getHString();
                     break;
-                case ESM::FourCC<'I','T','E','X'>::value:
+                case ESM::fourCC("ITEX"):
                     mIcon = esm.getHString();
                     break;
-                case ESM::FourCC<'E','N','A','M'>::value:
+                case ESM::fourCC("ENAM"):
                     mEnchant = esm.getHString();
                     break;
-                case ESM::FourCC<'T','E','X','T'>::value:
+                case ESM::fourCC("TEXT"):
                     mText = esm.getHString();
                     break;
                 case ESM::SREC_DELE:
diff --git a/components/esm3/loadbsgn.cpp b/components/esm3/loadbsgn.cpp
index d02fc93914..c894918bb2 100644
--- a/components/esm3/loadbsgn.cpp
+++ b/components/esm3/loadbsgn.cpp
@@ -25,16 +25,16 @@ namespace ESM
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::FourCC<'F','N','A','M'>::value:
+                case ESM::fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::FourCC<'T','N','A','M'>::value:
+                case ESM::fourCC("TNAM"):
                     mTexture = esm.getHString();
                     break;
-                case ESM::FourCC<'D','E','S','C'>::value:
+                case ESM::fourCC("DESC"):
                     mDescription = esm.getHString();
                     break;
-                case ESM::FourCC<'N','P','C','S'>::value:
+                case ESM::fourCC("NPCS"):
                     mPowers.add(esm);
                     break;
                 case ESM::SREC_DELE:
diff --git a/components/esm3/loadcell.cpp b/components/esm3/loadcell.cpp
index 256be62898..6a4cd6ebf9 100644
--- a/components/esm3/loadcell.cpp
+++ b/components/esm3/loadcell.cpp
@@ -75,7 +75,7 @@ namespace ESM
                 case ESM::SREC_NAME:
                     mName = esm.getHString();
                     break;
-                case ESM::FourCC<'D','A','T','A'>::value:
+                case ESM::fourCC("DATA"):
                     esm.getHT(mData, 12);
                     hasData = true;
                     break;
@@ -119,13 +119,13 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::FourCC<'I','N','T','V'>::value:
+                case ESM::fourCC("INTV"):
                     int waterl;
                     esm.getHT(waterl);
                     mWater = static_cast<float>(waterl);
                     mWaterInt = true;
                     break;
-                case ESM::FourCC<'W','H','G','T'>::value:
+                case ESM::fourCC("WHGT"):
                     float waterLevel;
                     esm.getHT(waterLevel);
                     mWaterInt = false;
@@ -138,17 +138,17 @@ namespace ESM
                     else
                         mWater = waterLevel;
                     break;
-                case ESM::FourCC<'A','M','B','I'>::value:
+                case ESM::fourCC("AMBI"):
                     esm.getHT(mAmbi);
                     mHasAmbi = true;
                     break;
-                case ESM::FourCC<'R','G','N','N'>::value:
+                case ESM::fourCC("RGNN"):
                     mRegion = esm.getHString();
                     break;
-                case ESM::FourCC<'N','A','M','5'>::value:
+                case ESM::fourCC("NAM5"):
                     esm.getHT(mMapColor);
                     break;
-                case ESM::FourCC<'N','A','M','0'>::value:
+                case ESM::fourCC("NAM0"):
                     esm.getHT(mRefNumCounter);
                     break;
                 default:
diff --git a/components/esm3/loadclas.cpp b/components/esm3/loadclas.cpp
index 0bd966e752..ecd43796de 100644
--- a/components/esm3/loadclas.cpp
+++ b/components/esm3/loadclas.cpp
@@ -54,16 +54,16 @@ namespace ESM
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::FourCC<'F','N','A','M'>::value:
+                case ESM::fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::FourCC<'C','L','D','T'>::value:
+                case ESM::fourCC("CLDT"):
                     esm.getHT(mData, 60);
                     if (mData.mIsPlayable > 1)
                         esm.fail("Unknown bool value");
                     hasData = true;
                     break;
-                case ESM::FourCC<'D','E','S','C'>::value:
+                case ESM::fourCC("DESC"):
                     mDescription = esm.getHString();
                     break;
                 case ESM::SREC_DELE:
diff --git a/components/esm3/loadclot.cpp b/components/esm3/loadclot.cpp
index 05a895b0f4..1bd5db9655 100644
--- a/components/esm3/loadclot.cpp
+++ b/components/esm3/loadclot.cpp
@@ -26,26 +26,26 @@ namespace ESM
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::FourCC<'M','O','D','L'>::value:
+                case ESM::fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::FourCC<'F','N','A','M'>::value:
+                case ESM::fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::FourCC<'C','T','D','T'>::value:
+                case ESM::fourCC("CTDT"):
                     esm.getHT(mData, 12);
                     hasData = true;
                     break;
-                case ESM::FourCC<'S','C','R','I'>::value:
+                case ESM::fourCC("SCRI"):
                     mScript = esm.getHString();
                     break;
-                case ESM::FourCC<'I','T','E','X'>::value:
+                case ESM::fourCC("ITEX"):
                     mIcon = esm.getHString();
                     break;
-                case ESM::FourCC<'E','N','A','M'>::value:
+                case ESM::fourCC("ENAM"):
                     mEnchant = esm.getHString();
                     break;
-                case ESM::FourCC<'I','N','D','X'>::value:
+                case ESM::fourCC("INDX"):
                     mParts.add(esm);
                     break;
                 case ESM::SREC_DELE:
diff --git a/components/esm3/loadcont.cpp b/components/esm3/loadcont.cpp
index 19bb649125..5cbdd80428 100644
--- a/components/esm3/loadcont.cpp
+++ b/components/esm3/loadcont.cpp
@@ -48,17 +48,17 @@ namespace ESM
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::FourCC<'M','O','D','L'>::value:
+                case ESM::fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::FourCC<'F','N','A','M'>::value:
+                case ESM::fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::FourCC<'C','N','D','T'>::value:
+                case ESM::fourCC("CNDT"):
                     esm.getHT(mWeight, 4);
                     hasWeight = true;
                     break;
-                case ESM::FourCC<'F','L','A','G'>::value:
+                case ESM::fourCC("FLAG"):
                     esm.getHT(mFlags, 4);
                     if (mFlags & 0xf4)
                         esm.fail("Unknown flags");
@@ -66,10 +66,10 @@ namespace ESM
                         esm.fail("Flag 8 not set");
                     hasFlags = true;
                     break;
-                case ESM::FourCC<'S','C','R','I'>::value:
+                case ESM::fourCC("SCRI"):
                     mScript = esm.getHString();
                     break;
-                case ESM::FourCC<'N','P','C','O'>::value:
+                case ESM::fourCC("NPCO"):
                     mInventory.add(esm);
                     break;
                 case ESM::SREC_DELE:
diff --git a/components/esm3/loadcrea.cpp b/components/esm3/loadcrea.cpp
index 1cec61b3ab..f1203ed39e 100644
--- a/components/esm3/loadcrea.cpp
+++ b/components/esm3/loadcrea.cpp
@@ -37,43 +37,43 @@ namespace ESM {
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::FourCC<'M','O','D','L'>::value:
+                case ESM::fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::FourCC<'C','N','A','M'>::value:
+                case ESM::fourCC("CNAM"):
                     mOriginal = esm.getHString();
                     break;
-                case ESM::FourCC<'F','N','A','M'>::value:
+                case ESM::fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::FourCC<'S','C','R','I'>::value:
+                case ESM::fourCC("SCRI"):
                     mScript = esm.getHString();
                     break;
-                case ESM::FourCC<'N','P','D','T'>::value:
+                case ESM::fourCC("NPDT"):
                     esm.getHT(mData, 96);
                     hasNpdt = true;
                     break;
-                case ESM::FourCC<'F','L','A','G'>::value:
+                case ESM::fourCC("FLAG"):
                     int flags;
                     esm.getHT(flags);
                     mFlags = flags & 0xFF;
                     mBloodType = ((flags >> 8) & 0xFF) >> 2;
                     hasFlags = true;
                     break;
-                case ESM::FourCC<'X','S','C','L'>::value:
+                case ESM::fourCC("XSCL"):
                     esm.getHT(mScale);
                     break;
-                case ESM::FourCC<'N','P','C','O'>::value:
+                case ESM::fourCC("NPCO"):
                     mInventory.add(esm);
                     break;
-                case ESM::FourCC<'N','P','C','S'>::value:
+                case ESM::fourCC("NPCS"):
                     mSpells.add(esm);
                     break;
-                case ESM::FourCC<'A','I','D','T'>::value:
+                case ESM::fourCC("AIDT"):
                     esm.getHExact(&mAiData, sizeof(mAiData));
                     break;
-                case ESM::FourCC<'D','O','D','T'>::value:
-                case ESM::FourCC<'D','N','A','M'>::value:
+                case ESM::fourCC("DODT"):
+                case ESM::fourCC("DNAM"):
                     mTransport.add(esm);
                     break;
                 case AI_Wander:
@@ -88,7 +88,7 @@ namespace ESM {
                     esm.skipHSub();
                     isDeleted = true;
                     break;
-                case ESM::FourCC<'I','N','D','X'>::value:
+                case ESM::fourCC("INDX"):
                     // seems to occur only in .ESS files, unsure of purpose
                     int index;
                     esm.getHT(index);
diff --git a/components/esm3/loaddial.cpp b/components/esm3/loaddial.cpp
index 67696be821..0c985def5b 100644
--- a/components/esm3/loaddial.cpp
+++ b/components/esm3/loaddial.cpp
@@ -30,7 +30,7 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::FourCC<'D','A','T','A'>::value:
+                case ESM::fourCC("DATA"):
                 {
                     esm.getSubHeader();
                     int size = esm.getSubSize();
diff --git a/components/esm3/loaddoor.cpp b/components/esm3/loaddoor.cpp
index 48fa0faaf3..e059a1dc05 100644
--- a/components/esm3/loaddoor.cpp
+++ b/components/esm3/loaddoor.cpp
@@ -23,19 +23,19 @@ namespace ESM
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::FourCC<'M','O','D','L'>::value:
+                case ESM::fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::FourCC<'F','N','A','M'>::value:
+                case ESM::fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::FourCC<'S','C','R','I'>::value:
+                case ESM::fourCC("SCRI"):
                     mScript = esm.getHString();
                     break;
-                case ESM::FourCC<'S','N','A','M'>::value:
+                case ESM::fourCC("SNAM"):
                     mOpenSound = esm.getHString();
                     break;
-                case ESM::FourCC<'A','N','A','M'>::value:
+                case ESM::fourCC("ANAM"):
                     mCloseSound = esm.getHString();
                     break;
                 case ESM::SREC_DELE:
diff --git a/components/esm3/loadench.cpp b/components/esm3/loadench.cpp
index fae0aa211b..2e138444f3 100644
--- a/components/esm3/loadench.cpp
+++ b/components/esm3/loadench.cpp
@@ -25,11 +25,11 @@ namespace ESM
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::FourCC<'E','N','D','T'>::value:
+                case ESM::fourCC("ENDT"):
                     esm.getHT(mData, 16);
                     hasData = true;
                     break;
-                case ESM::FourCC<'E','N','A','M'>::value:
+                case ESM::fourCC("ENAM"):
                     mEffects.add(esm);
                     break;
                 case ESM::SREC_DELE:
diff --git a/components/esm3/loadfact.cpp b/components/esm3/loadfact.cpp
index 554c30e40e..4d4697d93b 100644
--- a/components/esm3/loadfact.cpp
+++ b/components/esm3/loadfact.cpp
@@ -47,21 +47,21 @@ namespace ESM
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::FourCC<'F','N','A','M'>::value:
+                case ESM::fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::FourCC<'R','N','A','M'>::value:
+                case ESM::fourCC("RNAM"):
                     if (rankCounter >= 10)
                         esm.fail("Rank out of range");
                     mRanks[rankCounter++] = esm.getHString();
                     break;
-                case ESM::FourCC<'F','A','D','T'>::value:
+                case ESM::fourCC("FADT"):
                     esm.getHT(mData, 240);
                     if (mData.mIsHidden > 1)
                         esm.fail("Unknown flag!");
                     hasData = true;
                     break;
-                case ESM::FourCC<'A','N','A','M'>::value:
+                case ESM::fourCC("ANAM"):
                 {
                     std::string faction = esm.getHString();
                     int reaction;
diff --git a/components/esm3/loadinfo.cpp b/components/esm3/loadinfo.cpp
index 5cc1f9a090..0b5030bb82 100644
--- a/components/esm3/loadinfo.cpp
+++ b/components/esm3/loadinfo.cpp
@@ -25,19 +25,19 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::FourCC<'D','A','T','A'>::value:
+                case ESM::fourCC("DATA"):
                     esm.getHT(mData, 12);
                     break;
-                case ESM::FourCC<'O','N','A','M'>::value:
+                case ESM::fourCC("ONAM"):
                     mActor = esm.getHString();
                     break;
-                case ESM::FourCC<'R','N','A','M'>::value:
+                case ESM::fourCC("RNAM"):
                     mRace = esm.getHString();
                     break;
-                case ESM::FourCC<'C','N','A','M'>::value:
+                case ESM::fourCC("CNAM"):
                     mClass = esm.getHString();
                     break;
-                case ESM::FourCC<'F','N','A','M'>::value:
+                case ESM::fourCC("FNAM"):
                 {
                     mFaction = esm.getHString();
                     if (mFaction == "FFFF")
@@ -46,19 +46,19 @@ namespace ESM
                     }
                     break;
                 }
-                case ESM::FourCC<'A','N','A','M'>::value:
+                case ESM::fourCC("ANAM"):
                     mCell = esm.getHString();
                     break;
-                case ESM::FourCC<'D','N','A','M'>::value:
+                case ESM::fourCC("DNAM"):
                     mPcFaction = esm.getHString();
                     break;
-                case ESM::FourCC<'S','N','A','M'>::value:
+                case ESM::fourCC("SNAM"):
                     mSound = esm.getHString();
                     break;
                 case ESM::SREC_NAME:
                     mResponse = esm.getHString();
                     break;
-                case ESM::FourCC<'S','C','V','R'>::value:
+                case ESM::fourCC("SCVR"):
                 {
                     SelectStruct ss;
                     ss.mSelectRule = esm.getHString();
@@ -66,18 +66,18 @@ namespace ESM
                     mSelects.push_back(ss);
                     break;
                 }
-                case ESM::FourCC<'B','N','A','M'>::value:
+                case ESM::fourCC("BNAM"):
                     mResultScript = esm.getHString();
                     break;
-                case ESM::FourCC<'Q','S','T','N'>::value:
+                case ESM::fourCC("QSTN"):
                     mQuestStatus = QS_Name;
                     esm.skipRecord();
                     break;
-                case ESM::FourCC<'Q','S','T','F'>::value:
+                case ESM::fourCC("QSTF"):
                     mQuestStatus = QS_Finished;
                     esm.skipRecord();
                     break;
-                case ESM::FourCC<'Q','S','T','R'>::value:
+                case ESM::fourCC("QSTR"):
                     mQuestStatus = QS_Restart;
                     esm.skipRecord();
                     break;
diff --git a/components/esm3/loadingr.cpp b/components/esm3/loadingr.cpp
index 652e381881..173e2c5636 100644
--- a/components/esm3/loadingr.cpp
+++ b/components/esm3/loadingr.cpp
@@ -24,20 +24,20 @@ namespace ESM
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::FourCC<'M','O','D','L'>::value:
+                case ESM::fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::FourCC<'F','N','A','M'>::value:
+                case ESM::fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::FourCC<'I','R','D','T'>::value:
+                case ESM::fourCC("IRDT"):
                     esm.getHT(mData, 56);
                     hasData = true;
                     break;
-                case ESM::FourCC<'S','C','R','I'>::value:
+                case ESM::fourCC("SCRI"):
                     mScript = esm.getHString();
                     break;
-                case ESM::FourCC<'I','T','E','X'>::value:
+                case ESM::fourCC("ITEX"):
                     mIcon = esm.getHString();
                     break;
                 case ESM::SREC_DELE:
diff --git a/components/esm3/loadland.cpp b/components/esm3/loadland.cpp
index 24cac7f015..f9563411a3 100644
--- a/components/esm3/loadland.cpp
+++ b/components/esm3/loadland.cpp
@@ -46,7 +46,7 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::FourCC<'I','N','T','V'>::value:
+                case ESM::fourCC("INTV"):
                     esm.getSubHeader();
                     if (esm.getSubSize() != 8)
                         esm.fail("Subrecord size is not equal to 8");
@@ -54,7 +54,7 @@ namespace ESM
                     esm.getT<int>(mY);
                     hasLocation = true;
                     break;
-                case ESM::FourCC<'D','A','T','A'>::value:
+                case ESM::fourCC("DATA"):
                     esm.getHT(mFlags);
                     break;
                 case ESM::SREC_DELE:
@@ -82,23 +82,23 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::FourCC<'V','N','M','L'>::value:
+                case ESM::fourCC("VNML"):
                     esm.skipHSub();
                     mDataTypes |= DATA_VNML;
                     break;
-                case ESM::FourCC<'V','H','G','T'>::value:
+                case ESM::fourCC("VHGT"):
                     esm.skipHSub();
                     mDataTypes |= DATA_VHGT;
                     break;
-                case ESM::FourCC<'W','N','A','M'>::value:
+                case ESM::fourCC("WNAM"):
                     esm.getHExact(mWnam, sizeof(mWnam));
                     mDataTypes |= DATA_WNAM;
                     break;
-                case ESM::FourCC<'V','C','L','R'>::value:
+                case ESM::fourCC("VCLR"):
                     esm.skipHSub();
                     mDataTypes |= DATA_VCLR;
                     break;
-                case ESM::FourCC<'V','T','E','X'>::value:
+                case ESM::fourCC("VTEX"):
                     esm.skipHSub();
                     mDataTypes |= DATA_VTEX;
                     break;
diff --git a/components/esm3/loadlevlist.cpp b/components/esm3/loadlevlist.cpp
index 2aa209fadb..ace5304152 100644
--- a/components/esm3/loadlevlist.cpp
+++ b/components/esm3/loadlevlist.cpp
@@ -22,13 +22,13 @@ namespace ESM
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::FourCC<'D','A','T','A'>::value:
+                case ESM::fourCC("DATA"):
                     esm.getHT(mFlags);
                     break;
-                case ESM::FourCC<'N','N','A','M'>::value:
+                case ESM::fourCC("NNAM"):
                     esm.getHT(mChanceNone);
                     break;
-                case ESM::FourCC<'I','N','D','X'>::value:
+                case ESM::fourCC("INDX"):
                 {
                     int length = 0;
                     esm.getHT(length);
diff --git a/components/esm3/loadligh.cpp b/components/esm3/loadligh.cpp
index 4e8c41fbb9..94c109e677 100644
--- a/components/esm3/loadligh.cpp
+++ b/components/esm3/loadligh.cpp
@@ -24,23 +24,23 @@ namespace ESM
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::FourCC<'M','O','D','L'>::value:
+                case ESM::fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::FourCC<'F','N','A','M'>::value:
+                case ESM::fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::FourCC<'I','T','E','X'>::value:
+                case ESM::fourCC("ITEX"):
                     mIcon = esm.getHString();
                     break;
-                case ESM::FourCC<'L','H','D','T'>::value:
+                case ESM::fourCC("LHDT"):
                     esm.getHT(mData, 24);
                     hasData = true;
                     break;
-                case ESM::FourCC<'S','C','R','I'>::value:
+                case ESM::fourCC("SCRI"):
                     mScript = esm.getHString();
                     break;
-                case ESM::FourCC<'S','N','A','M'>::value:
+                case ESM::fourCC("SNAM"):
                     mSound = esm.getHString();
                     break;
                 case ESM::SREC_DELE:
diff --git a/components/esm3/loadlock.cpp b/components/esm3/loadlock.cpp
index 10ac680ab5..50d27d4e1a 100644
--- a/components/esm3/loadlock.cpp
+++ b/components/esm3/loadlock.cpp
@@ -24,20 +24,20 @@ namespace ESM
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::FourCC<'M','O','D','L'>::value:
+                case ESM::fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::FourCC<'F','N','A','M'>::value:
+                case ESM::fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::FourCC<'L','K','D','T'>::value:
+                case ESM::fourCC("LKDT"):
                     esm.getHT(mData, 16);
                     hasData = true;
                     break;
-                case ESM::FourCC<'S','C','R','I'>::value:
+                case ESM::fourCC("SCRI"):
                     mScript = esm.getHString();
                     break;
-                case ESM::FourCC<'I','T','E','X'>::value:
+                case ESM::fourCC("ITEX"):
                     mIcon = esm.getHString();
                     break;
                 case ESM::SREC_DELE:
diff --git a/components/esm3/loadltex.cpp b/components/esm3/loadltex.cpp
index 3d01c4fe17..de5eb53e56 100644
--- a/components/esm3/loadltex.cpp
+++ b/components/esm3/loadltex.cpp
@@ -23,11 +23,11 @@ namespace ESM
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::FourCC<'I','N','T','V'>::value:
+                case ESM::fourCC("INTV"):
                     esm.getHT(mIndex);
                     hasIndex = true;
                     break;
-                case ESM::FourCC<'D','A','T','A'>::value:
+                case ESM::fourCC("DATA"):
                     mTexture = esm.getHString();
                     break;
                 case ESM::SREC_DELE:
diff --git a/components/esm3/loadmgef.cpp b/components/esm3/loadmgef.cpp
index e86907564c..f15d51def6 100644
--- a/components/esm3/loadmgef.cpp
+++ b/components/esm3/loadmgef.cpp
@@ -211,37 +211,37 @@ void MagicEffect::load(ESMReader &esm, bool &isDeleted)
         esm.getSubName();
         switch (esm.retSubName().toInt())
         {
-            case ESM::FourCC<'I','T','E','X'>::value:
+            case ESM::fourCC("ITEX"):
                 mIcon = esm.getHString();
                 break;
-            case ESM::FourCC<'P','T','E','X'>::value:
+            case ESM::fourCC("PTEX"):
                 mParticle = esm.getHString();
                 break;
-            case ESM::FourCC<'B','S','N','D'>::value:
+            case ESM::fourCC("BSND"):
                 mBoltSound = esm.getHString();
                 break;
-            case ESM::FourCC<'C','S','N','D'>::value:
+            case ESM::fourCC("CSND"):
                 mCastSound = esm.getHString();
                 break;
-            case ESM::FourCC<'H','S','N','D'>::value:
+            case ESM::fourCC("HSND"):
                 mHitSound = esm.getHString();
                 break;
-            case ESM::FourCC<'A','S','N','D'>::value:
+            case ESM::fourCC("ASND"):
                 mAreaSound = esm.getHString();
                 break;
-            case ESM::FourCC<'C','V','F','X'>::value:
+            case ESM::fourCC("CVFX"):
                 mCasting = esm.getHString();
                 break;
-            case ESM::FourCC<'B','V','F','X'>::value:
+            case ESM::fourCC("BVFX"):
                 mBolt = esm.getHString();
                 break;
-            case ESM::FourCC<'H','V','F','X'>::value:
+            case ESM::fourCC("HVFX"):
                 mHit = esm.getHString();
                 break;
-            case ESM::FourCC<'A','V','F','X'>::value:
+            case ESM::fourCC("AVFX"):
                 mArea = esm.getHString();
                 break;
-            case ESM::FourCC<'D','E','S','C'>::value:
+            case ESM::fourCC("DESC"):
                 mDescription = esm.getHString();
                 break;
             default:
diff --git a/components/esm3/loadmisc.cpp b/components/esm3/loadmisc.cpp
index 0405382cfd..eee46ac8b0 100644
--- a/components/esm3/loadmisc.cpp
+++ b/components/esm3/loadmisc.cpp
@@ -24,20 +24,20 @@ namespace ESM
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::FourCC<'M','O','D','L'>::value:
+                case ESM::fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::FourCC<'F','N','A','M'>::value:
+                case ESM::fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::FourCC<'M','C','D','T'>::value:
+                case ESM::fourCC("MCDT"):
                     esm.getHT(mData, 12);
                     hasData = true;
                     break;
-                case ESM::FourCC<'S','C','R','I'>::value:
+                case ESM::fourCC("SCRI"):
                     mScript = esm.getHString();
                     break;
-                case ESM::FourCC<'I','T','E','X'>::value:
+                case ESM::fourCC("ITEX"):
                     mIcon = esm.getHString();
                     break;
                 case ESM::SREC_DELE:
diff --git a/components/esm3/loadnpc.cpp b/components/esm3/loadnpc.cpp
index 07ee560b54..338b453a5a 100644
--- a/components/esm3/loadnpc.cpp
+++ b/components/esm3/loadnpc.cpp
@@ -32,31 +32,31 @@ namespace ESM
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::FourCC<'M','O','D','L'>::value:
+                case ESM::fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::FourCC<'F','N','A','M'>::value:
+                case ESM::fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::FourCC<'R','N','A','M'>::value:
+                case ESM::fourCC("RNAM"):
                     mRace = esm.getHString();
                     break;
-                case ESM::FourCC<'C','N','A','M'>::value:
+                case ESM::fourCC("CNAM"):
                     mClass = esm.getHString();
                     break;
-                case ESM::FourCC<'A','N','A','M'>::value:
+                case ESM::fourCC("ANAM"):
                     mFaction = esm.getHString();
                     break;
-                case ESM::FourCC<'B','N','A','M'>::value:
+                case ESM::fourCC("BNAM"):
                     mHead = esm.getHString();
                     break;
-                case ESM::FourCC<'K','N','A','M'>::value:
+                case ESM::fourCC("KNAM"):
                     mHair = esm.getHString();
                     break;
-                case ESM::FourCC<'S','C','R','I'>::value:
+                case ESM::fourCC("SCRI"):
                     mScript = esm.getHString();
                     break;
-                case ESM::FourCC<'N','P','D','T'>::value:
+                case ESM::fourCC("NPDT"):
                     hasNpdt = true;
                     esm.getSubHeader();
                     if (esm.getSubSize() == 52)
@@ -83,24 +83,24 @@ namespace ESM
                     else
                         esm.fail("NPC_NPDT must be 12 or 52 bytes long");
                     break;
-                case ESM::FourCC<'F','L','A','G'>::value:
+                case ESM::fourCC("FLAG"):
                     hasFlags = true;
                     int flags;
                     esm.getHT(flags);
                     mFlags = flags & 0xFF;
                     mBloodType = ((flags >> 8) & 0xFF) >> 2;
                     break;
-                case ESM::FourCC<'N','P','C','S'>::value:
+                case ESM::fourCC("NPCS"):
                     mSpells.add(esm);
                     break;
-                case ESM::FourCC<'N','P','C','O'>::value:
+                case ESM::fourCC("NPCO"):
                     mInventory.add(esm);
                     break;
-                case ESM::FourCC<'A','I','D','T'>::value:
+                case ESM::fourCC("AIDT"):
                     esm.getHExact(&mAiData, sizeof(mAiData));
                     break;
-                case ESM::FourCC<'D','O','D','T'>::value:
-                case ESM::FourCC<'D','N','A','M'>::value:
+                case ESM::fourCC("DODT"):
+                case ESM::fourCC("DNAM"):
                     mTransport.add(esm);
                     break;
                 case AI_Wander:
diff --git a/components/esm3/loadpgrd.cpp b/components/esm3/loadpgrd.cpp
index da90018619..9d0f3cf66c 100644
--- a/components/esm3/loadpgrd.cpp
+++ b/components/esm3/loadpgrd.cpp
@@ -51,11 +51,11 @@ namespace ESM
                 case ESM::SREC_NAME:
                     mCell = esm.getHString();
                     break;
-                case ESM::FourCC<'D','A','T','A'>::value:
+                case ESM::fourCC("DATA"):
                     esm.getHT(mData, 12);
                     hasData = true;
                     break;
-                case ESM::FourCC<'P','G','R','P'>::value:
+                case ESM::fourCC("PGRP"):
                 {
                     esm.getSubHeader();
                     int size = esm.getSubSize();
@@ -76,7 +76,7 @@ namespace ESM
                     }
                     break;
                 }
-                case ESM::FourCC<'P','G','R','C'>::value:
+                case ESM::fourCC("PGRC"):
                 {
                     esm.getSubHeader();
                     int size = esm.getSubSize();
diff --git a/components/esm3/loadprob.cpp b/components/esm3/loadprob.cpp
index 644abb6a39..10738c0863 100644
--- a/components/esm3/loadprob.cpp
+++ b/components/esm3/loadprob.cpp
@@ -24,20 +24,20 @@ namespace ESM
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::FourCC<'M','O','D','L'>::value:
+                case ESM::fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::FourCC<'F','N','A','M'>::value:
+                case ESM::fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::FourCC<'P','B','D','T'>::value:
+                case ESM::fourCC("PBDT"):
                     esm.getHT(mData, 16);
                     hasData = true;
                     break;
-                case ESM::FourCC<'S','C','R','I'>::value:
+                case ESM::fourCC("SCRI"):
                     mScript = esm.getHString();
                     break;
-                case ESM::FourCC<'I','T','E','X'>::value:
+                case ESM::fourCC("ITEX"):
                     mIcon = esm.getHString();
                     break;
                 case ESM::SREC_DELE:
diff --git a/components/esm3/loadrace.cpp b/components/esm3/loadrace.cpp
index 092d064cd8..ba0046bc9b 100644
--- a/components/esm3/loadrace.cpp
+++ b/components/esm3/loadrace.cpp
@@ -36,17 +36,17 @@ namespace ESM
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::FourCC<'F','N','A','M'>::value:
+                case ESM::fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::FourCC<'R','A','D','T'>::value:
+                case ESM::fourCC("RADT"):
                     esm.getHT(mData, 140);
                     hasData = true;
                     break;
-                case ESM::FourCC<'D','E','S','C'>::value:
+                case ESM::fourCC("DESC"):
                     mDescription = esm.getHString();
                     break;
-                case ESM::FourCC<'N','P','C','S'>::value:
+                case ESM::fourCC("NPCS"):
                     mPowers.add(esm);
                     break;
                 case ESM::SREC_DELE:
diff --git a/components/esm3/loadregn.cpp b/components/esm3/loadregn.cpp
index 9e8921e939..e2682e644e 100644
--- a/components/esm3/loadregn.cpp
+++ b/components/esm3/loadregn.cpp
@@ -23,10 +23,10 @@ namespace ESM
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::FourCC<'F','N','A','M'>::value:
+                case ESM::fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::FourCC<'W','E','A','T'>::value:
+                case ESM::fourCC("WEAT"):
                 {
                     esm.getSubHeader();
                     if (esm.getVer() == VER_12)
@@ -55,13 +55,13 @@ namespace ESM
                     }
                     break;
                 }
-                case ESM::FourCC<'B','N','A','M'>::value:
+                case ESM::fourCC("BNAM"):
                     mSleepList = esm.getHString();
                     break;
-                case ESM::FourCC<'C','N','A','M'>::value:
+                case ESM::fourCC("CNAM"):
                     esm.getHT(mMapColor);
                     break;
-                case ESM::FourCC<'S','N','A','M'>::value:
+                case ESM::fourCC("SNAM"):
                 {
                     esm.getSubHeader();
                     SoundRef sr;
diff --git a/components/esm3/loadrepa.cpp b/components/esm3/loadrepa.cpp
index f7349256f0..aaf518a1cd 100644
--- a/components/esm3/loadrepa.cpp
+++ b/components/esm3/loadrepa.cpp
@@ -24,20 +24,20 @@ namespace ESM
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::FourCC<'M','O','D','L'>::value:
+                case ESM::fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::FourCC<'F','N','A','M'>::value:
+                case ESM::fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::FourCC<'R','I','D','T'>::value:
+                case ESM::fourCC("RIDT"):
                     esm.getHT(mData, 16);
                     hasData = true;
                     break;
-                case ESM::FourCC<'S','C','R','I'>::value:
+                case ESM::fourCC("SCRI"):
                     mScript = esm.getHString();
                     break;
-                case ESM::FourCC<'I','T','E','X'>::value:
+                case ESM::fourCC("ITEX"):
                     mIcon = esm.getHString();
                     break;
                 case ESM::SREC_DELE:
diff --git a/components/esm3/loadscpt.cpp b/components/esm3/loadscpt.cpp
index a7e59f837e..f226d5f3be 100644
--- a/components/esm3/loadscpt.cpp
+++ b/components/esm3/loadscpt.cpp
@@ -93,7 +93,7 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::FourCC<'S','C','H','D'>::value:
+                case ESM::fourCC("SCHD"):
                 {
                     esm.getSubHeader();
                     mId = esm.getString(32);
@@ -102,11 +102,11 @@ namespace ESM
                     hasHeader = true;
                     break;
                 }
-                case ESM::FourCC<'S','C','V','R'>::value:
+                case ESM::fourCC("SCVR"):
                     // list of local variables
                     loadSCVR(esm);
                     break;
-                case ESM::FourCC<'S','C','D','T'>::value:
+                case ESM::fourCC("SCDT"):
                 {
                     // compiled script
                     esm.getSubHeader();
@@ -125,7 +125,7 @@ namespace ESM
                     esm.getExact(mScriptData.data(), mScriptData.size());
                     break;
                 }
-                case ESM::FourCC<'S','C','T','X'>::value:
+                case ESM::fourCC("SCTX"):
                     mScriptText = esm.getHString();
                     break;
                 case ESM::SREC_DELE:
diff --git a/components/esm3/loadskil.cpp b/components/esm3/loadskil.cpp
index 5843b3ddb5..902410fe5a 100644
--- a/components/esm3/loadskil.cpp
+++ b/components/esm3/loadskil.cpp
@@ -139,15 +139,15 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::FourCC<'I','N','D','X'>::value:
+                case ESM::fourCC("INDX"):
                     esm.getHT(mIndex);
                     hasIndex = true;
                     break;
-                case ESM::FourCC<'S','K','D','T'>::value:
+                case ESM::fourCC("SKDT"):
                     esm.getHT(mData, 24);
                     hasData = true;
                     break;
-                case ESM::FourCC<'D','E','S','C'>::value:
+                case ESM::fourCC("DESC"):
                     mDescription = esm.getHString();
                     break;
                 default:
diff --git a/components/esm3/loadsndg.cpp b/components/esm3/loadsndg.cpp
index 17423a061b..2f5dea1eb4 100644
--- a/components/esm3/loadsndg.cpp
+++ b/components/esm3/loadsndg.cpp
@@ -24,14 +24,14 @@ namespace ESM
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::FourCC<'D','A','T','A'>::value:
+                case ESM::fourCC("DATA"):
                     esm.getHT(mType, 4);
                     hasData = true;
                     break;
-                case ESM::FourCC<'C','N','A','M'>::value:
+                case ESM::fourCC("CNAM"):
                     mCreature = esm.getHString();
                     break;
-                case ESM::FourCC<'S','N','A','M'>::value:
+                case ESM::fourCC("SNAM"):
                     mSound = esm.getHString();
                     break;
                 case ESM::SREC_DELE:
diff --git a/components/esm3/loadsoun.cpp b/components/esm3/loadsoun.cpp
index 109d732da5..453d4eebfc 100644
--- a/components/esm3/loadsoun.cpp
+++ b/components/esm3/loadsoun.cpp
@@ -24,10 +24,10 @@ namespace ESM
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::FourCC<'F','N','A','M'>::value:
+                case ESM::fourCC("FNAM"):
                     mSound = esm.getHString();
                     break;
-                case ESM::FourCC<'D','A','T','A'>::value:
+                case ESM::fourCC("DATA"):
                     esm.getHT(mData, 3);
                     hasData = true;
                     break;
diff --git a/components/esm3/loadspel.cpp b/components/esm3/loadspel.cpp
index d113cdd194..aeed60a1cb 100644
--- a/components/esm3/loadspel.cpp
+++ b/components/esm3/loadspel.cpp
@@ -26,14 +26,14 @@ namespace ESM
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::FourCC<'F','N','A','M'>::value:
+                case ESM::fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::FourCC<'S','P','D','T'>::value:
+                case ESM::fourCC("SPDT"):
                     esm.getHT(mData, 12);
                     hasData = true;
                     break;
-                case ESM::FourCC<'E','N','A','M'>::value:
+                case ESM::fourCC("ENAM"):
                     ENAMstruct s;
                     esm.getHT(s, 24);
                     mEffects.mList.push_back(s);
diff --git a/components/esm3/loadsscr.cpp b/components/esm3/loadsscr.cpp
index 59d6eab58e..03c5b49380 100644
--- a/components/esm3/loadsscr.cpp
+++ b/components/esm3/loadsscr.cpp
@@ -24,7 +24,7 @@ namespace ESM
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::FourCC<'D','A','T','A'>::value:
+                case ESM::fourCC("DATA"):
                     mData = esm.getHString();
                     hasData = true;
                     break;
diff --git a/components/esm3/loadstat.cpp b/components/esm3/loadstat.cpp
index a4941f0895..fd557d37d5 100644
--- a/components/esm3/loadstat.cpp
+++ b/components/esm3/loadstat.cpp
@@ -25,7 +25,7 @@ namespace ESM
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::FourCC<'M','O','D','L'>::value:
+                case ESM::fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
                 case ESM::SREC_DELE:
diff --git a/components/esm3/loadweap.cpp b/components/esm3/loadweap.cpp
index e109096e09..e75ecf7516 100644
--- a/components/esm3/loadweap.cpp
+++ b/components/esm3/loadweap.cpp
@@ -24,23 +24,23 @@ namespace ESM
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::FourCC<'M','O','D','L'>::value:
+                case ESM::fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::FourCC<'F','N','A','M'>::value:
+                case ESM::fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::FourCC<'W','P','D','T'>::value:
+                case ESM::fourCC("WPDT"):
                     esm.getHT(mData, 32);
                     hasData = true;
                     break;
-                case ESM::FourCC<'S','C','R','I'>::value:
+                case ESM::fourCC("SCRI"):
                     mScript = esm.getHString();
                     break;
-                case ESM::FourCC<'I','T','E','X'>::value:
+                case ESM::fourCC("ITEX"):
                     mIcon = esm.getHString();
                     break;
-                case ESM::FourCC<'E','N','A','M'>::value:
+                case ESM::fourCC("ENAM"):
                     mEnchant = esm.getHString();
                     break;
                 case ESM::SREC_DELE:
diff --git a/components/esm3/transport.cpp b/components/esm3/transport.cpp
index 958ef6949a..40f831e748 100644
--- a/components/esm3/transport.cpp
+++ b/components/esm3/transport.cpp
@@ -10,13 +10,13 @@ namespace ESM
 
     void Transport::add(ESMReader &esm)
     {
-        if (esm.retSubName().toInt() == ESM::FourCC<'D','O','D','T'>::value)
+        if (esm.retSubName().toInt() == ESM::fourCC("DODT"))
         {
             Dest dodt;
             esm.getHExact(&dodt.mPos, 24);
             mList.push_back(dodt);
         }
-        else if (esm.retSubName().toInt() == ESM::FourCC<'D','N','A','M'>::value)
+        else if (esm.retSubName().toInt() == ESM::fourCC("DNAM"))
         {
             const std::string name = esm.getHString();
             if (mList.empty())
diff --git a/components/esm3/variant.cpp b/components/esm3/variant.cpp
index 732d7e7f29..c50581327d 100644
--- a/components/esm3/variant.cpp
+++ b/components/esm3/variant.cpp
@@ -10,10 +10,10 @@
 
 namespace
 {
-    constexpr uint32_t STRV = ESM::FourCC<'S','T','R','V'>::value;
-    constexpr uint32_t INTV = ESM::FourCC<'I','N','T','V'>::value;
-    constexpr uint32_t FLTV = ESM::FourCC<'F','L','T','V'>::value;
-    constexpr uint32_t STTV = ESM::FourCC<'S','T','T','V'>::value;
+    constexpr uint32_t STRV = ESM::fourCC("STRV");
+    constexpr uint32_t INTV = ESM::fourCC("INTV");
+    constexpr uint32_t FLTV = ESM::fourCC("FLTV");
+    constexpr uint32_t STTV = ESM::fourCC("STTV");
 
     template <typename T, bool orDefault = false>
     struct GetValue

From 688ca8b7fc57f4a7039c4c07bd8a9f44f502f224 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Tue, 8 Mar 2022 21:12:08 +0100
Subject: [PATCH 2191/2859] Revert "Rename Popup layer to Tooltip"

This reverts commit 543ee33f7eb4bec43761f784cfa19d3b13f5b3fd.
---
 files/mygui/openmw_layers.xml      | 2 +-
 files/mygui/openmw_tooltips.layout | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/mygui/openmw_layers.xml b/files/mygui/openmw_layers.xml
index 4c93574edd..4b170bf06e 100644
--- a/files/mygui/openmw_layers.xml
+++ b/files/mygui/openmw_layers.xml
@@ -18,7 +18,7 @@
     <Layer name="LoadingScreenBackground" overlapped="false" pick="true"/>
     <Layer name="LoadingScreen" overlapped="false" pick="true"/>
     <Layer name="Modal" overlapped="true" pick="true"/>
-    <Layer name="Tooltip" overlapped="true" pick="true"/>
+    <Layer name="Popup" overlapped="true" pick="true"/>
     <Layer name="Video" overlapped="false" pick="true"/>
     <Layer name="InputBlocker" overlapped="false" pick="true"/>
     <Layer name="Pointer" overlapped="false" pick="false"/>
diff --git a/files/mygui/openmw_tooltips.layout b/files/mygui/openmw_tooltips.layout
index fd87b5c0e0..ce927038c2 100644
--- a/files/mygui/openmw_tooltips.layout
+++ b/files/mygui/openmw_tooltips.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Widget" layer="Tooltip" position="0 0 300 300" name="_Main">
+    <Widget type="Widget" layer="Popup" position="0 0 300 300" name="_Main">
 
         <!-- Dynamically constructed tooltip goes here -->
         <Widget type="Widget" skin="HUD_Box_NoTransp" position="0 0 300 300" align="Stretch" name="DynamicToolTipBox">

From deefdd5620df7c1a2fe0f29029fedf2123448c67 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Tue, 8 Mar 2022 21:16:28 +0100
Subject: [PATCH 2192/2859] Layer Notifications over Popup

---
 files/mygui/openmw_layers.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/mygui/openmw_layers.xml b/files/mygui/openmw_layers.xml
index 4b170bf06e..0b70dbb000 100644
--- a/files/mygui/openmw_layers.xml
+++ b/files/mygui/openmw_layers.xml
@@ -9,7 +9,6 @@
     </Layer>
     <Layer name="Windows" overlapped="true" pick="true"/>
     <Layer name="Debug" overlapped="true" pick="true"/>
-    <Layer name="Notification" overlapped="false" pick="false"/>
     <Layer name="DragAndDrop" overlapped="false" pick="false"/>
     <Layer name="DrowningBar" overlapped="false" pick="false"/>
     <Layer name="MainMenuBackground" overlapped="true" pick="true"/>
@@ -19,6 +18,7 @@
     <Layer name="LoadingScreen" overlapped="false" pick="true"/>
     <Layer name="Modal" overlapped="true" pick="true"/>
     <Layer name="Popup" overlapped="true" pick="true"/>
+    <Layer name="Notification" overlapped="false" pick="false"/>
     <Layer name="Video" overlapped="false" pick="true"/>
     <Layer name="InputBlocker" overlapped="false" pick="true"/>
     <Layer name="Pointer" overlapped="false" pick="false"/>

From e2555c1bb71470cba65abd38cac420fde092ebbb Mon Sep 17 00:00:00 2001
From: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
Date: Tue, 8 Mar 2022 21:03:17 +0000
Subject: [PATCH 2193/2859] Add self to authors

---
 AUTHORS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS.md b/AUTHORS.md
index 3edba5f25c..84f465414e 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -71,6 +71,7 @@ Programmers
     David Teviotdale (dteviot)
     Diggory Hardy
     Dmitry Marakasov (AMDmi3)
+    Duncan Frost (duncans_pumpkin)
     Edmondo Tommasina (edmondo)
     Eduard Cot (trombonecot)
     Eli2

From 36c46ada6f89500ccd597daa3a828edafb6aafe9 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Mon, 14 Mar 2022 19:07:23 +0000
Subject: [PATCH 2194/2859] Pass unhandled Lua UI events to the parent

---
 components/lua/scriptscontainer.hpp           |  5 ++-
 components/lua_ui/widget.cpp                  | 45 +++++++++++--------
 components/lua_ui/widget.hpp                  | 27 ++++++++++-
 .../lua-scripting/widgets/widget.rst          |  7 +++
 4 files changed, 61 insertions(+), 23 deletions(-)

diff --git a/components/lua/scriptscontainer.hpp b/components/lua/scriptscontainer.hpp
index fcbd2ba0b7..d968c13a45 100644
--- a/components/lua/scriptscontainer.hpp
+++ b/components/lua/scriptscontainer.hpp
@@ -250,13 +250,14 @@ namespace LuaUtil
         sol::table mHiddenData;  // same object as Script::mHiddenData in ScriptsContainer
 
         template <typename... Args>
-        void operator()(Args&&... args) const
+        sol::object operator()(Args&&... args) const
         {
             if (mHiddenData[ScriptsContainer::sScriptIdKey] != sol::nil)
-                LuaUtil::call(mFunc, std::forward<Args>(args)...);
+                return LuaUtil::call(mFunc, std::forward<Args>(args)...);
             else
                 Log(Debug::Debug) << "Ignored callback to the removed script "
                                   << mHiddenData.get<std::string>(ScriptsContainer::sScriptDebugNameKey);
+            return sol::nil;
         }
     };
 
diff --git a/components/lua_ui/widget.cpp b/components/lua_ui/widget.cpp
index 96a6d096bd..a11d3db852 100644
--- a/components/lua_ui/widget.cpp
+++ b/components/lua_ui/widget.cpp
@@ -10,7 +10,8 @@
 namespace LuaUi
 {
     WidgetExtension::WidgetExtension()
-        : mLua(nullptr)
+        : mPropagateEvents(true)
+        , mLua(nullptr)
         , mWidget(nullptr)
         , mSlot(this)
         , mLayout(sol::nil)
@@ -18,6 +19,7 @@ namespace LuaUi
         , mTemplateProperties(sol::nil)
         , mExternal(sol::nil)
         , mParent(nullptr)
+        , mTemplateChild(false)
     {}
 
     void WidgetExtension::initialize(lua_State* lua, MyGUI::Widget* self)
@@ -81,12 +83,15 @@ namespace LuaUi
     void WidgetExtension::attach(WidgetExtension* ext)
     {
         ext->mParent = this;
+        ext->mTemplateChild = false;
         ext->widget()->attachToWidget(mSlot->widget());
         ext->updateCoord();
     }
 
     void WidgetExtension::attachTemplate(WidgetExtension* ext)
     {
+        ext->mParent = this;
+        ext->mTemplateChild = true;
         ext->widget()->attachToWidget(widget());
         ext->updateCoord();
     }
@@ -133,7 +138,7 @@ namespace LuaUi
 
     sol::table WidgetExtension::makeTable() const
     {
-        return sol::table(mLua, sol::create);
+        return sol::table(lua(), sol::create);
     }
 
     sol::object WidgetExtension::keyEvent(MyGUI::KeyCode code) const
@@ -142,7 +147,7 @@ namespace LuaUi
         keySym.sym = SDLUtil::myGuiKeyToSdl(code);
         keySym.scancode = SDL_GetScancodeFromKey(keySym.sym);
         keySym.mod = SDL_GetModState();
-        return sol::make_object(mLua, keySym);
+        return sol::make_object(lua(), keySym);
     }
 
     sol::object WidgetExtension::mouseEvent(int left, int top, MyGUI::MouseButton button = MyGUI::MouseButton::None) const
@@ -246,6 +251,7 @@ namespace LuaUi
 
     void WidgetExtension::updateProperties()
     {
+        mPropagateEvents = propertyValue("propagateEvents", true);
         mAbsoluteCoord = propertyValue("position", MyGUI::IntPoint());
         mAbsoluteCoord = propertyValue("size", MyGUI::IntSize());
         mRelativeCoord = propertyValue("relativePosition", MyGUI::FloatPoint());
@@ -265,7 +271,7 @@ namespace LuaUi
 
     MyGUI::IntSize WidgetExtension::parentSize()
     {
-        if (mParent)
+        if (mParent && !mTemplateChild)
             return mParent->childScalingSize();
         else
             return widget()->getParentSize();
@@ -304,7 +310,7 @@ namespace LuaUi
         return mSlot->widget()->getSize();
     }
 
-    void WidgetExtension::triggerEvent(std::string_view name, const sol::object& argument = sol::nil) const
+    void WidgetExtension::triggerEvent(std::string_view name, sol::object argument) const
     {
         auto it = mCallbacks.find(name);
         if (it != mCallbacks.end())
@@ -315,57 +321,58 @@ namespace LuaUi
     {
         if (code == MyGUI::KeyCode::None)
         {
-            // \todo decide how to handle unicode strings in Lua
-            MyGUI::UString uString;
-            uString.push_back(static_cast<MyGUI::UString::unicode_char>(ch));
-            triggerEvent("textInput", sol::make_object(mLua, uString.asUTF8()));
+            propagateEvent("textInput", [ch](auto w) {
+                MyGUI::UString uString;
+                uString.push_back(static_cast<MyGUI::UString::unicode_char>(ch));
+                return sol::make_object(w->lua(), uString.asUTF8());
+            });
         }
         else
-            triggerEvent("keyPress", keyEvent(code));
+            propagateEvent("keyPress", [code](auto w){ return w->keyEvent(code); });
     }
 
     void WidgetExtension::keyRelease(MyGUI::Widget*, MyGUI::KeyCode code)
     {
-        triggerEvent("keyRelease", keyEvent(code));
+        propagateEvent("keyRelease", [code](auto w) { return w->keyEvent(code); });
     }
 
     void WidgetExtension::mouseMove(MyGUI::Widget*, int left, int top)
     {
-        triggerEvent("mouseMove", mouseEvent(left, top));
+        propagateEvent("mouseMove", [left, top](auto w) { return w->mouseEvent(left, top); });
     }
 
     void WidgetExtension::mouseDrag(MyGUI::Widget*, int left, int top, MyGUI::MouseButton button)
     {
-        triggerEvent("mouseMove", mouseEvent(left, top, button));
+        propagateEvent("mouseMove", [left, top, button](auto w) { return w->mouseEvent(left, top, button); });
     }
 
     void WidgetExtension::mouseClick(MyGUI::Widget* _widget)
     {
-        triggerEvent("mouseClick");
+        propagateEvent("mouseClick", [](auto){ return sol::nil; });
     }
 
     void WidgetExtension::mouseDoubleClick(MyGUI::Widget* _widget)
     {
-        triggerEvent("mouseDoubleClick");
+        propagateEvent("mouseDoubleClick", [](auto){ return sol::nil; });
     }
 
     void WidgetExtension::mousePress(MyGUI::Widget*, int left, int top, MyGUI::MouseButton button)
     {
-        triggerEvent("mousePress", mouseEvent(left, top, button));
+        propagateEvent("mousePress", [left, top, button](auto w) { return w->mouseEvent(left, top, button); });
     }
 
     void WidgetExtension::mouseRelease(MyGUI::Widget*, int left, int top, MyGUI::MouseButton button)
     {
-        triggerEvent("mouseRelease", mouseEvent(left, top, button));
+        propagateEvent("mouseRelease", [left, top, button](auto w) { return w->mouseEvent(left, top, button); });
     }
 
     void WidgetExtension::focusGain(MyGUI::Widget*, MyGUI::Widget*)
     {
-        triggerEvent("focusGain");
+        propagateEvent("focusGain", [](auto){ return sol::nil; });
     }
 
     void WidgetExtension::focusLoss(MyGUI::Widget*, MyGUI::Widget*)
     {
-        triggerEvent("focusLoss");
+        propagateEvent("focusLoss", [](auto){ return sol::nil; });
     }
 }
diff --git a/components/lua_ui/widget.hpp b/components/lua_ui/widget.hpp
index 827993d47d..c712d18ccd 100644
--- a/components/lua_ui/widget.hpp
+++ b/components/lua_ui/widget.hpp
@@ -90,8 +90,28 @@ namespace LuaUi
         virtual void updateProperties();
         virtual void updateChildren() {};
 
-        lua_State* lua() { return mLua; }
-        void triggerEvent(std::string_view name, const sol::object& argument) const;
+        lua_State* lua() const { return mLua; }
+
+        void triggerEvent(std::string_view name, sol::object argument) const;
+        template<class ArgFactory>
+        void propagateEvent(std::string_view name, const ArgFactory& argumentFactory) const
+        {
+            const WidgetExtension* w = this;
+            while (w)
+            {
+                bool shouldPropagate = true;
+                auto it = w->mCallbacks.find(name);
+                if (it != w->mCallbacks.end())
+                {
+                    sol::object res = it->second(argumentFactory(w), w->mLayout);
+                    shouldPropagate = res.is<bool>() && res.as<bool>();
+                }
+                if (w->mParent && w->mPropagateEvents && shouldPropagate)
+                    w = w->mParent;
+                else
+                    w = nullptr;
+            }
+        }
 
         // offsets the position and size, used only in C++ widget code
         MyGUI::IntCoord mForcedCoord;
@@ -103,6 +123,8 @@ namespace LuaUi
         // used in combination with relative coord to align the widget, e. g. center it
         MyGUI::FloatSize mAnchor;
 
+        bool mPropagateEvents;
+
     private:
         // use lua_State* instead of sol::state_view because MyGUI requires a default constructor
         lua_State* mLua;
@@ -116,6 +138,7 @@ namespace LuaUi
         sol::object mTemplateProperties;
         sol::object mExternal;
         WidgetExtension* mParent;
+        bool mTemplateChild;
 
         void attach(WidgetExtension* ext);
         void attachTemplate(WidgetExtension* ext);
diff --git a/docs/source/reference/lua-scripting/widgets/widget.rst b/docs/source/reference/lua-scripting/widgets/widget.rst
index 36cc0917d9..d114d0957b 100644
--- a/docs/source/reference/lua-scripting/widgets/widget.rst
+++ b/docs/source/reference/lua-scripting/widgets/widget.rst
@@ -32,12 +32,19 @@ Properties
   * - visible
     - boolean (true)
     - Defines if the widget is visible
+  * - propagateEvents
+    - boolean (true)
+    - Allows base widget events to propagate to the widget's parent.
 
 .. TODO: document the mouse pointer property, when API for reading / adding pointer types is available
 
 Events
 ------
 
+Base widget events are special, they can propagate up to the parent widget.
+This can be prevented by changing the `propagateEvents` property, or by assigning an  event handler.
+The event is still allowed to propagate if the event handler returns `true`.
+
 .. list-table::
   :header-rows: 1
   :widths: 20 20 60

From af93ebf4334d01a72d49e68f78773597f8712de3 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Tue, 15 Feb 2022 19:38:47 +0100
Subject: [PATCH 2195/2859] [Lua] Move class-specific functions to
 `openmw.types`

---
 apps/openmw/CMakeLists.txt                    |   1 +
 apps/openmw/mwlua/localscripts.cpp            |  21 +--
 apps/openmw/mwlua/luabindings.cpp             |  74 ++++++---
 apps/openmw/mwlua/luabindings.hpp             |   9 +-
 apps/openmw/mwlua/luamanagerimp.cpp           |   1 +
 apps/openmw/mwlua/object.cpp                  |  15 +-
 apps/openmw/mwlua/object.hpp                  |  18 +++
 apps/openmw/mwlua/objectbindings.cpp          | 142 +-----------------
 apps/openmw/mwlua/types/actor.cpp             | 137 +++++++++++++++++
 apps/openmw/mwlua/types/door.cpp              |  34 +++++
 apps/openmw/mwlua/types/types.hpp             |  14 ++
 files/builtin_scripts/openmw_aux/calendar.lua |   2 +-
 files/builtin_scripts/scripts/omw/camera.lua  |   6 +-
 .../scripts/omw/head_bobbing.lua              |   6 +-
 .../scripts/omw/third_person.lua              |   6 +-
 15 files changed, 286 insertions(+), 200 deletions(-)
 create mode 100644 apps/openmw/mwlua/types/actor.cpp
 create mode 100644 apps/openmw/mwlua/types/door.cpp
 create mode 100644 apps/openmw/mwlua/types/types.hpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 71c138eee9..6b439bde80 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -60,6 +60,7 @@ add_openmw_dir (mwlua
     luamanagerimp actions object worldview userdataserializer eventqueue query
     luabindings localscripts playerscripts objectbindings cellbindings asyncbindings settingsbindings
     camerabindings uibindings inputbindings nearbybindings
+    types/types types/door types/actor
     )
 
 add_openmw_dir (mwsound
diff --git a/apps/openmw/mwlua/localscripts.cpp b/apps/openmw/mwlua/localscripts.cpp
index c95eae43a7..7cdb31f518 100644
--- a/apps/openmw/mwlua/localscripts.cpp
+++ b/apps/openmw/mwlua/localscripts.cpp
@@ -43,31 +43,12 @@ namespace MWLua
 #undef CONTROL
 
         sol::usertype<SelfObject> selfAPI =
-            context.mLua->sol().new_usertype<SelfObject>("SelfObject", sol::base_classes, sol::bases<LObject>());
+            context.mLua->sol().new_usertype<SelfObject>("SelfObject", sol::base_classes, sol::bases<LObject, Object>());
         selfAPI[sol::meta_function::to_string] = [](SelfObject& self) { return "openmw.self[" + self.toString() + "]"; };
         selfAPI["object"] = sol::readonly_property([](SelfObject& self) -> LObject { return LObject(self); });
         selfAPI["controls"] = sol::readonly_property([](SelfObject& self) { return &self.mControls; });
         selfAPI["isActive"] = [](SelfObject& self) { return &self.mIsActive; };
         selfAPI["enableAI"] = [](SelfObject& self, bool v) { self.mControls.mDisableAI = !v; };
-        selfAPI["setEquipment"] = [context](const SelfObject& obj, sol::table equipment)
-        {
-            if (!obj.ptr().getClass().hasInventoryStore(obj.ptr()))
-            {
-                if (!equipment.empty())
-                    throw std::runtime_error(ptrToString(obj.ptr()) + " has no equipment slots");
-                return;
-            }
-            SetEquipmentAction::Equipment eqp;
-            for (auto& [key, value] : equipment)
-            {
-                int slot = key.as<int>();
-                if (value.is<LObject>())
-                    eqp[slot] = value.as<LObject>().id();
-                else
-                    eqp[slot] = value.as<std::string>();
-            }
-            context.mLuaManager->addAction(std::make_unique<SetEquipmentAction>(context.mLua, obj.id(), std::move(eqp)));
-        };
 
         using AiPackage = MWMechanics::AiPackage;
         sol::usertype<AiPackage> aiPackage = context.mLua->sol().new_usertype<AiPackage>("AiPackage");
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index 06ba6d5c5a..2319872974 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -12,6 +12,7 @@
 
 #include "eventqueue.hpp"
 #include "worldview.hpp"
+#include "types/types.hpp"
 
 namespace MWLua
 {
@@ -45,11 +46,57 @@ namespace MWLua
         // api["resume"] = []() {};
     }
 
+    sol::table initTypesPackage(const Context& context)
+    {
+        auto* lua = context.mLua;
+        sol::table types(lua->sol(), sol::create);
+        auto addType = [&](std::string_view name, std::optional<std::string_view> base = std::nullopt) -> sol::table
+        {
+            sol::table t(lua->sol(), sol::create);
+            sol::table ro = LuaUtil::makeReadOnly(t);
+            sol::table meta = ro[sol::metatable_key];
+            meta[sol::meta_function::to_string] = [name]() { return name; };
+            if (base)
+            {
+                t[sol::metatable_key] = LuaUtil::getMutableFromReadOnly(types[*base]);
+                t["baseType"] = types[*base];
+            }
+            types[name] = ro;
+            return t;
+        };
+
+        addActorBindings(addType("Actor"), context);
+        addType("Item");
+
+        addType(ObjectTypeName::Creature, "Actor");
+        addType(ObjectTypeName::NPC, "Actor");
+        addType(ObjectTypeName::Player, ObjectTypeName::NPC);
+
+        addType(ObjectTypeName::Armor, "Item");
+        addType(ObjectTypeName::Book, "Item");
+        addType(ObjectTypeName::Clothing, "Item");
+        addType(ObjectTypeName::Ingredient, "Item");
+        addType(ObjectTypeName::Light, "Item");
+        addType(ObjectTypeName::MiscItem, "Item");
+        addType(ObjectTypeName::Potion, "Item");
+        addType(ObjectTypeName::Weapon, "Item");
+        addType(ObjectTypeName::Apparatus, "Item");
+        addType(ObjectTypeName::Lockpick, "Item");
+        addType(ObjectTypeName::Probe, "Item");
+        addType(ObjectTypeName::Repair, "Item");
+
+        addType(ObjectTypeName::Activator);
+        addDoorBindings(addType(ObjectTypeName::Door), context);
+        addType(ObjectTypeName::Static);
+
+        return LuaUtil::makeReadOnly(types);
+    }
+
     sol::table initCorePackage(const Context& context)
     {
         auto* lua = context.mLua;
         sol::table api(lua->sol(), sol::create);
-        api["API_REVISION"] = 17;
+        api["API_REVISION"] = 18;
         api["quit"] = [lua]()
         {
             Log(Debug::Warning) << "Quit requested by a Lua script.\n" << lua->debugTraceback();
@@ -60,35 +107,14 @@ namespace MWLua
             context.mGlobalEventQueue->push_back({std::move(eventName), LuaUtil::serialize(eventData, context.mSerializer)});
         };
         addTimeBindings(api, context, false);
-        api["OBJECT_TYPE"] = definitionList(*lua,
+        api["OBJECT_TYPE"] = definitionList(*lua,  // TODO: remove, use require('openmw.types') instead
         {
             ObjectTypeName::Activator, ObjectTypeName::Armor, ObjectTypeName::Book, ObjectTypeName::Clothing,
             ObjectTypeName::Creature, ObjectTypeName::Door, ObjectTypeName::Ingredient, ObjectTypeName::Light,
             ObjectTypeName::MiscItem, ObjectTypeName::NPC, ObjectTypeName::Player, ObjectTypeName::Potion,
-            ObjectTypeName::Static, ObjectTypeName::Weapon, ObjectTypeName::Activator, ObjectTypeName::Lockpick,
+            ObjectTypeName::Static, ObjectTypeName::Weapon, ObjectTypeName::Apparatus, ObjectTypeName::Lockpick,
             ObjectTypeName::Probe, ObjectTypeName::Repair
         });
-        api["EQUIPMENT_SLOT"] = LuaUtil::makeReadOnly(context.mLua->tableFromPairs<std::string_view, int>({
-            {"Helmet", MWWorld::InventoryStore::Slot_Helmet},
-            {"Cuirass", MWWorld::InventoryStore::Slot_Cuirass},
-            {"Greaves", MWWorld::InventoryStore::Slot_Greaves},
-            {"LeftPauldron", MWWorld::InventoryStore::Slot_LeftPauldron},
-            {"RightPauldron", MWWorld::InventoryStore::Slot_RightPauldron},
-            {"LeftGauntlet", MWWorld::InventoryStore::Slot_LeftGauntlet},
-            {"RightGauntlet", MWWorld::InventoryStore::Slot_RightGauntlet},
-            {"Boots", MWWorld::InventoryStore::Slot_Boots},
-            {"Shirt", MWWorld::InventoryStore::Slot_Shirt},
-            {"Pants", MWWorld::InventoryStore::Slot_Pants},
-            {"Skirt", MWWorld::InventoryStore::Slot_Skirt},
-            {"Robe", MWWorld::InventoryStore::Slot_Robe},
-            {"LeftRing", MWWorld::InventoryStore::Slot_LeftRing},
-            {"RightRing", MWWorld::InventoryStore::Slot_RightRing},
-            {"Amulet", MWWorld::InventoryStore::Slot_Amulet},
-            {"Belt", MWWorld::InventoryStore::Slot_Belt},
-            {"CarriedRight", MWWorld::InventoryStore::Slot_CarriedRight},
-            {"CarriedLeft", MWWorld::InventoryStore::Slot_CarriedLeft},
-            {"Ammunition", MWWorld::InventoryStore::Slot_Ammunition}
-        }));
         api["i18n"] = [i18n=context.mI18n](const std::string& context) { return i18n->getContext(context); };
         const MWWorld::Store<ESM::GameSetting>* gmst = &MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
         api["getGMST"] = [lua=context.mLua, gmst](const std::string& setting) -> sol::object
diff --git a/apps/openmw/mwlua/luabindings.hpp b/apps/openmw/mwlua/luabindings.hpp
index 377d6d1e4f..d80c649f4c 100644
--- a/apps/openmw/mwlua/luabindings.hpp
+++ b/apps/openmw/mwlua/luabindings.hpp
@@ -23,6 +23,7 @@ namespace MWLua
     sol::table initCorePackage(const Context&);
     sol::table initWorldPackage(const Context&);
     sol::table initQueryPackage(const Context&);
+    sol::table initTypesPackage(const Context&);
 
     sol::table initFieldGroup(const Context&, const QueryFieldGroup&);
 
@@ -38,14 +39,6 @@ namespace MWLua
     void initObjectBindingsForGlobalScripts(const Context&);
 
     // Implemented in cellbindings.cpp
-    struct LCell  // for local scripts
-    {
-        MWWorld::CellStore* mStore;
-    };
-    struct GCell  // for global scripts
-    {
-        MWWorld::CellStore* mStore;
-    };
     void initCellBindingsForLocalScripts(const Context&);
     void initCellBindingsForGlobalScripts(const Context&);
 
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 716612f745..cf1c69aa11 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -82,6 +82,7 @@ namespace MWLua
         mLua.addCommonPackage("openmw.util", LuaUtil::initUtilPackage(mLua.sol()));
         mLua.addCommonPackage("openmw.core", initCorePackage(context));
         mLua.addCommonPackage("openmw.query", initQueryPackage(context));
+        mLua.addCommonPackage("openmw.types", initTypesPackage(context));
         mGlobalScripts.addPackage("openmw.world", initWorldPackage(context));
         mGlobalScripts.addPackage("openmw.settings", initGlobalSettingsPackage(context));
         mGlobalScripts.addPackage("openmw.storage", initGlobalStoragePackage(context, &mGlobalStorage));
diff --git a/apps/openmw/mwlua/object.cpp b/apps/openmw/mwlua/object.cpp
index 816ec6712b..dc903845f4 100644
--- a/apps/openmw/mwlua/object.cpp
+++ b/apps/openmw/mwlua/object.cpp
@@ -60,7 +60,7 @@ namespace MWLua
         // for types that are not present in `luaObjectTypeInfo` (for such types result stability
         // is not necessary because they are not listed in OpenMW Lua documentation).
         if (ptr.getCellRef().getRefId() == "player")
-            return "Player";
+            return ObjectTypeName::Player;
         if (isMarker(ptr))
             return "Marker";
         return getLuaObjectTypeName(static_cast<ESM::RecNameInts>(ptr.getType()), /*fallback=*/ptr.getTypeDescription());
@@ -79,6 +79,19 @@ namespace MWLua
             return 0;
     }
 
+    const MWWorld::Ptr& verifyType(ESM::RecNameInts recordType, const MWWorld::Ptr& ptr)
+    {
+        if (ptr.getType() != recordType)
+        {
+            std::string msg = "Requires type '";
+            msg.append(getLuaObjectTypeName(recordType));
+            msg.append("', but applied to ");
+            msg.append(ptrToString(ptr));
+            throw std::runtime_error(msg);
+        }
+        return ptr;
+    }
+
     std::string ptrToString(const MWWorld::Ptr& ptr)
     {
         std::string res = "object";
diff --git a/apps/openmw/mwlua/object.hpp b/apps/openmw/mwlua/object.hpp
index 0b51da17c3..36744b8f93 100644
--- a/apps/openmw/mwlua/object.hpp
+++ b/apps/openmw/mwlua/object.hpp
@@ -3,6 +3,8 @@
 
 #include <typeindex>
 
+#include <sol/sol.hpp>
+
 #include <components/esm3/cellref.hpp>
 #include <components/esm/defs.hpp>
 #include <components/esm/luascripts.hpp>
@@ -48,6 +50,7 @@ namespace MWLua
     bool isMarker(const MWWorld::Ptr& ptr);
     std::string_view getLuaObjectTypeName(ESM::RecNameInts recordType, std::string_view fallback = "Unknown");
     std::string_view getLuaObjectTypeName(const MWWorld::Ptr& ptr);
+    const MWWorld::Ptr& verifyType(ESM::RecNameInts recordType, const MWWorld::Ptr& ptr);
 
     // Each script has a set of flags that controls to which objects the script should be
     // automatically attached. This function maps each object types to one of the flags. 
@@ -103,6 +106,9 @@ namespace MWLua
         // Returns `true` if calling `ptr()` is safe.
         bool isValid() const;
 
+        virtual sol::object getObject(lua_State* lua, ObjectId id) const = 0;  // returns LObject or GOBject
+        virtual sol::object getCell(lua_State* lua, MWWorld::CellStore* store) const = 0;  // returns LCell or GCell
+
     protected:
         virtual void updatePtr() const = 0;
 
@@ -114,17 +120,29 @@ namespace MWLua
     };
 
     // Used only in local scripts
+    struct LCell
+    {
+        MWWorld::CellStore* mStore;
+    };
     class LObject : public Object
     {
         using Object::Object;
         void updatePtr() const final { mPtr = mObjectRegistry->getPtr(mId, true); }
+        sol::object getObject(lua_State* lua, ObjectId id) const final { return sol::make_object<LObject>(lua, id, mObjectRegistry); }
+        sol::object getCell(lua_State* lua, MWWorld::CellStore* store) const final { return sol::make_object(lua, LCell{store}); }
     };
 
     // Used only in global scripts
+    struct GCell
+    {
+        MWWorld::CellStore* mStore;
+    };
     class GObject : public Object
     {
         using Object::Object;
         void updatePtr() const final { mPtr = mObjectRegistry->getPtr(mId, false); }
+        sol::object getObject(lua_State* lua, ObjectId id) const final { return sol::make_object<GObject>(lua, id, mObjectRegistry); }
+        sol::object getCell(lua_State* lua, MWWorld::CellStore* store) const final { return sol::make_object(lua, GCell{store}); }
     };
 
     using ObjectIdList = std::shared_ptr<std::vector<ObjectId>>;
diff --git a/apps/openmw/mwlua/objectbindings.cpp b/apps/openmw/mwlua/objectbindings.cpp
index 3ae9035271..0310541eee 100644
--- a/apps/openmw/mwlua/objectbindings.cpp
+++ b/apps/openmw/mwlua/objectbindings.cpp
@@ -42,19 +42,6 @@ namespace MWLua
     template <typename ObjT>
     using Cell = std::conditional_t<std::is_same_v<ObjT, LObject>, LCell, GCell>;
 
-    static const MWWorld::Ptr& requireRecord(ESM::RecNameInts recordType, const MWWorld::Ptr& ptr)
-    {
-        if (ptr.getType() != recordType)
-        {
-            std::string msg = "Requires type '";
-            msg.append(getLuaObjectTypeName(recordType));
-            msg.append("', but applied to ");
-            msg.append(ptrToString(ptr));
-            throw std::runtime_error(msg);
-        }
-        return ptr;
-    }
-
     template <class ObjectT>
     static void registerObjectList(const std::string& prefix, const Context& context)
     {
@@ -122,21 +109,6 @@ namespace MWLua
             context.mLocalEventQueue->push_back({dest.id(), std::move(eventName), LuaUtil::serialize(eventData, context.mSerializer)});
         };
 
-        objectT["canMove"] = [](const ObjectT& o)
-        {
-            const MWWorld::Class& cls = o.ptr().getClass();
-            return cls.getMaxSpeed(o.ptr()) > 0;
-        };
-        objectT["getRunSpeed"] = [](const ObjectT& o)
-        {
-            const MWWorld::Class& cls = o.ptr().getClass();
-            return cls.getRunSpeed(o.ptr());
-        };
-        objectT["getWalkSpeed"] = [](const ObjectT& o)
-        {
-            const MWWorld::Class& cls = o.ptr().getClass();
-            return cls.getWalkSpeed(o.ptr());
-        };
         objectT["activateBy"] = [context](const ObjectT& o, const ObjectT& actor)
         {
             uint32_t esmRecordType = actor.ptr().getType();
@@ -199,112 +171,14 @@ namespace MWLua
                     context.mLuaManager->addAction(std::move(action));
             };
         }
-        else
-        {  // Only for local scripts
-            objectT["isOnGround"] = [](const ObjectT& o)
-            {
-                return MWBase::Environment::get().getWorld()->isOnGround(o.ptr());
-            };
-            objectT["isSwimming"] = [](const ObjectT& o)
-            {
-                return MWBase::Environment::get().getWorld()->isSwimming(o.ptr());
-            };
-            objectT["isInWeaponStance"] = [](const ObjectT& o)
-            {
-                const MWWorld::Class& cls = o.ptr().getClass();
-                return cls.isActor() && cls.getCreatureStats(o.ptr()).getDrawState() == MWMechanics::DrawState_Weapon;
-            };
-            objectT["isInMagicStance"] = [](const ObjectT& o)
-            {
-                const MWWorld::Class& cls = o.ptr().getClass();
-                return cls.isActor() && cls.getCreatureStats(o.ptr()).getDrawState() == MWMechanics::DrawState_Spell;
-            };
-            objectT["getCurrentSpeed"] = [](const ObjectT& o)
-            {
-                const MWWorld::Class& cls = o.ptr().getClass();
-                return cls.getCurrentSpeed(o.ptr());
-            };
-        }
     }
 
-    template <class ObjectT>
-    static void addDoorBindings(sol::usertype<ObjectT>& objectT, const Context& context)
-    {
-        auto ptr = [](const ObjectT& o) -> const MWWorld::Ptr& { return requireRecord(ESM::REC_DOOR, o.ptr()); };
-
-        objectT["isTeleport"] = sol::readonly_property([ptr](const ObjectT& o)
-        {
-            return ptr(o).getCellRef().getTeleport();
-        });
-        objectT["destPosition"] = sol::readonly_property([ptr](const ObjectT& o) -> osg::Vec3f
-        {
-            return ptr(o).getCellRef().getDoorDest().asVec3();
-        });
-        objectT["destRotation"] = sol::readonly_property([ptr](const ObjectT& o) -> osg::Vec3f
-        {
-            return ptr(o).getCellRef().getDoorDest().asRotationVec3();
-        });
-        objectT["destCell"] = sol::readonly_property(
-            [ptr, worldView=context.mWorldView](const ObjectT& o) -> sol::optional<Cell<ObjectT>>
-        {
-            const MWWorld::CellRef& cellRef = ptr(o).getCellRef();
-            if (!cellRef.getTeleport())
-                return sol::nullopt;
-            MWWorld::CellStore* cell = worldView->findCell(cellRef.getDestCell(), cellRef.getDoorDest().asVec3());
-            if (cell)
-                return Cell<ObjectT>{cell};
-            else
-                return sol::nullopt;
-        });
-    }
-
-    static SetEquipmentAction::Equipment parseEquipmentTable(sol::table equipment)
-    {
-        SetEquipmentAction::Equipment eqp;
-        for (auto& [key, value] : equipment)
-        {
-            int slot = key.as<int>();
-            if (value.is<GObject>())
-                eqp[slot] = value.as<GObject>().id();
-            else
-                eqp[slot] = value.as<std::string>();
-        }
-        return eqp;
-    }
-    
     template <class ObjectT>
     static void addInventoryBindings(sol::usertype<ObjectT>& objectT, const std::string& prefix, const Context& context)
     {
         using InventoryT = Inventory<ObjectT>;
         sol::usertype<InventoryT> inventoryT = context.mLua->sol().new_usertype<InventoryT>(prefix + "Inventory");
 
-        objectT["getEquipment"] = [context](const ObjectT& o)
-        {
-            const MWWorld::Ptr& ptr = o.ptr();
-            sol::table equipment(context.mLua->sol(), sol::create);
-            if (!ptr.getClass().hasInventoryStore(ptr))
-                return equipment;
-
-            MWWorld::InventoryStore& store = ptr.getClass().getInventoryStore(ptr);
-            for (int slot = 0; slot < MWWorld::InventoryStore::Slots; ++slot)
-            {
-                auto it = store.getSlot(slot);
-                if (it == store.end())
-                    continue;
-                context.mWorldView->getObjectRegistry()->registerPtr(*it);
-                equipment[slot] = ObjectT(getId(*it), context.mWorldView->getObjectRegistry());
-            }
-            return equipment;
-        };
-        objectT["isEquipped"] = [](const ObjectT& actor, const ObjectT& item)
-        {
-            const MWWorld::Ptr& ptr = actor.ptr();
-            if (!ptr.getClass().hasInventoryStore(ptr))
-                return false;
-            MWWorld::InventoryStore& store = ptr.getClass().getInventoryStore(ptr);
-            return store.isEquipped(item.ptr());
-        };
-
         objectT["inventory"] = sol::readonly_property([](const ObjectT& o) { return InventoryT{o}; });
         inventoryT[sol::meta_function::to_string] =
             [](const InventoryT& inv) { return "Inventory[" + inv.mObj.toString() + "]"; };
@@ -363,18 +237,6 @@ namespace MWLua
 
         if constexpr (std::is_same_v<ObjectT, GObject>)
         {  // Only for global scripts
-            objectT["setEquipment"] = [context](const GObject& obj, sol::table equipment)
-            {
-                if (!obj.ptr().getClass().hasInventoryStore(obj.ptr()))
-                {
-                    if (!equipment.empty())
-                        throw std::runtime_error(ptrToString(obj.ptr()) + " has no equipment slots");
-                    return;
-                }
-                context.mLuaManager->addAction(std::make_unique<SetEquipmentAction>(
-                    context.mLua, obj.id(), parseEquipmentTable(equipment)));
-            };
-
             // TODO
             // obj.inventory:drop(obj2, [count])
             // obj.inventory:drop(recordId, [count])
@@ -390,9 +252,9 @@ namespace MWLua
     template <class ObjectT>
     static void initObjectBindings(const std::string& prefix, const Context& context)
     {
-        sol::usertype<ObjectT> objectT = context.mLua->sol().new_usertype<ObjectT>(prefix + "Object");
+        sol::usertype<ObjectT> objectT = context.mLua->sol().new_usertype<ObjectT>(
+            prefix + "Object", sol::base_classes, sol::bases<Object>());
         addBasicBindings<ObjectT>(objectT, context);
-        addDoorBindings<ObjectT>(objectT, context);
         addInventoryBindings<ObjectT>(objectT, prefix, context);
 
         registerObjectList<ObjectT>(prefix, context);
diff --git a/apps/openmw/mwlua/types/actor.cpp b/apps/openmw/mwlua/types/actor.cpp
new file mode 100644
index 0000000000..ba2c05a52d
--- /dev/null
+++ b/apps/openmw/mwlua/types/actor.cpp
@@ -0,0 +1,137 @@
+#include "types.hpp"
+
+#include <components/lua/luastate.hpp>
+
+#include <apps/openmw/mwmechanics/drawstate.hpp>
+#include <apps/openmw/mwworld/inventorystore.hpp>
+#include <apps/openmw/mwworld/class.hpp>
+
+#include "../actions.hpp"
+#include "../luabindings.hpp"
+#include "../localscripts.hpp"
+#include "../luamanagerimp.hpp"
+
+namespace MWLua
+{
+    using SelfObject = LocalScripts::SelfObject;
+
+    void addActorBindings(sol::table actor, const Context& context)
+    {
+        actor["STANCE"] = LuaUtil::makeReadOnly(context.mLua->tableFromPairs<std::string_view, int>({
+            {"Nothing", MWMechanics::DrawState_Nothing},
+            {"Weapon", MWMechanics::DrawState_Weapon},
+            {"Spell", MWMechanics::DrawState_Spell},
+        }));
+        actor["EQUIPMENT_SLOT"] = LuaUtil::makeReadOnly(context.mLua->tableFromPairs<std::string_view, int>({
+            {"Helmet", MWWorld::InventoryStore::Slot_Helmet},
+            {"Cuirass", MWWorld::InventoryStore::Slot_Cuirass},
+            {"Greaves", MWWorld::InventoryStore::Slot_Greaves},
+            {"LeftPauldron", MWWorld::InventoryStore::Slot_LeftPauldron},
+            {"RightPauldron", MWWorld::InventoryStore::Slot_RightPauldron},
+            {"LeftGauntlet", MWWorld::InventoryStore::Slot_LeftGauntlet},
+            {"RightGauntlet", MWWorld::InventoryStore::Slot_RightGauntlet},
+            {"Boots", MWWorld::InventoryStore::Slot_Boots},
+            {"Shirt", MWWorld::InventoryStore::Slot_Shirt},
+            {"Pants", MWWorld::InventoryStore::Slot_Pants},
+            {"Skirt", MWWorld::InventoryStore::Slot_Skirt},
+            {"Robe", MWWorld::InventoryStore::Slot_Robe},
+            {"LeftRing", MWWorld::InventoryStore::Slot_LeftRing},
+            {"RightRing", MWWorld::InventoryStore::Slot_RightRing},
+            {"Amulet", MWWorld::InventoryStore::Slot_Amulet},
+            {"Belt", MWWorld::InventoryStore::Slot_Belt},
+            {"CarriedRight", MWWorld::InventoryStore::Slot_CarriedRight},
+            {"CarriedLeft", MWWorld::InventoryStore::Slot_CarriedLeft},
+            {"Ammunition", MWWorld::InventoryStore::Slot_Ammunition}
+        }));
+
+        actor["stance"] = [](const Object& o)
+        {
+            const MWWorld::Class& cls = o.ptr().getClass();
+            if (cls.isActor())
+                return cls.getCreatureStats(o.ptr()).getDrawState();
+            else
+                throw std::runtime_error("Actor expected");
+        };
+
+        actor["canMove"] = [](const Object& o)
+        {
+            const MWWorld::Class& cls = o.ptr().getClass();
+            return cls.getMaxSpeed(o.ptr()) > 0;
+        };
+        actor["runSpeed"] = [](const Object& o)
+        {
+            const MWWorld::Class& cls = o.ptr().getClass();
+            return cls.getRunSpeed(o.ptr());
+        };
+        actor["walkSpeed"] = [](const Object& o)
+        {
+            const MWWorld::Class& cls = o.ptr().getClass();
+            return cls.getWalkSpeed(o.ptr());
+        };
+        actor["currentSpeed"] = [](const Object& o)
+        {
+            const MWWorld::Class& cls = o.ptr().getClass();
+            return cls.getCurrentSpeed(o.ptr());
+        };
+
+        actor["isOnGround"] = [](const LObject& o)
+        {
+            return MWBase::Environment::get().getWorld()->isOnGround(o.ptr());
+        };
+        actor["isSwimming"] = [](const LObject& o)
+        {
+            return MWBase::Environment::get().getWorld()->isSwimming(o.ptr());
+        };
+
+        actor["getEquipment"] = [context](const Object& o)
+        {
+            const MWWorld::Ptr& ptr = o.ptr();
+            sol::table equipment(context.mLua->sol(), sol::create);
+            if (!ptr.getClass().hasInventoryStore(ptr))
+                return equipment;
+
+            MWWorld::InventoryStore& store = ptr.getClass().getInventoryStore(ptr);
+            for (int slot = 0; slot < MWWorld::InventoryStore::Slots; ++slot)
+            {
+                auto it = store.getSlot(slot);
+                if (it == store.end())
+                    continue;
+                context.mWorldView->getObjectRegistry()->registerPtr(*it);
+                equipment[slot] = o.getObject(context.mLua->sol(), getId(*it));
+            }
+            return equipment;
+        };
+        actor["hasEquipped"] = [](const Object& o, const Object& item)
+        {
+            const MWWorld::Ptr& ptr = o.ptr();
+            if (!ptr.getClass().hasInventoryStore(ptr))
+                return false;
+            MWWorld::InventoryStore& store = ptr.getClass().getInventoryStore(ptr);
+            return store.isEquipped(item.ptr());
+        };
+        actor["setEquipment"] = [context](const sol::object& luaObj, const sol::table& equipment)
+        {
+            if (!luaObj.is<GObject>() && !luaObj.is<SelfObject>())
+                throw std::runtime_error("Incorrect type of the first argument. "
+                                         "Can be either self (in local scripts) or game object (in global scripts)");
+            const Object& obj = luaObj.as<Object>();
+            if (!obj.ptr().getClass().hasInventoryStore(obj.ptr()))
+            {
+                if (!equipment.empty())
+                    throw std::runtime_error(ptrToString(obj.ptr()) + " has no equipment slots");
+                return;
+            }
+            SetEquipmentAction::Equipment eqp;
+            for (auto& [key, value] : equipment)
+            {
+                int slot = key.as<int>();
+                if (value.is<Object>())
+                    eqp[slot] = value.as<Object>().id();
+                else
+                    eqp[slot] = value.as<std::string>();
+            }
+            context.mLuaManager->addAction(std::make_unique<SetEquipmentAction>(context.mLua, obj.id(), std::move(eqp)));
+        };
+    }
+
+}
diff --git a/apps/openmw/mwlua/types/door.cpp b/apps/openmw/mwlua/types/door.cpp
new file mode 100644
index 0000000000..efcf638360
--- /dev/null
+++ b/apps/openmw/mwlua/types/door.cpp
@@ -0,0 +1,34 @@
+#include "types.hpp"
+
+#include "../luabindings.hpp"
+
+namespace MWLua
+{
+
+    static const MWWorld::Ptr& doorPtr(const Object& o) { return verifyType(ESM::REC_DOOR, o.ptr()); }
+
+    void addDoorBindings(sol::table door, const Context& context)
+    {
+        door["isTeleport"] = [](const Object& o) { return doorPtr(o).getCellRef().getTeleport(); };
+        door["destPosition"] = [](const Object& o) -> osg::Vec3f
+        {
+            return doorPtr(o).getCellRef().getDoorDest().asVec3();
+        };
+        door["destRotation"] = [](const Object& o) -> osg::Vec3f
+        {
+            return doorPtr(o).getCellRef().getDoorDest().asRotationVec3();
+        };
+        door["destCell"] = [worldView=context.mWorldView](sol::this_state lua, const Object& o) -> sol::object
+        {
+            const MWWorld::CellRef& cellRef = doorPtr(o).getCellRef();
+            if (!cellRef.getTeleport())
+                return sol::nil;
+            MWWorld::CellStore* cell = worldView->findCell(cellRef.getDestCell(), cellRef.getDoorDest().asVec3());
+            if (cell)
+                return o.getCell(lua, cell);
+            else
+                return sol::nil;
+        };
+    }
+
+}
diff --git a/apps/openmw/mwlua/types/types.hpp b/apps/openmw/mwlua/types/types.hpp
new file mode 100644
index 0000000000..20fd208462
--- /dev/null
+++ b/apps/openmw/mwlua/types/types.hpp
@@ -0,0 +1,14 @@
+#ifndef MWLUA_TYPES_H
+#define MWLUA_TYPES_H
+
+#include <sol/sol.hpp>
+
+#include "../context.hpp"
+
+namespace MWLua
+{
+    void addDoorBindings(sol::table door, const Context& context);
+    void addActorBindings(sol::table actor, const Context& context);
+}
+
+#endif // MWLUA_TYPES_H
diff --git a/files/builtin_scripts/openmw_aux/calendar.lua b/files/builtin_scripts/openmw_aux/calendar.lua
index 58e7298f1d..181b133b83 100644
--- a/files/builtin_scripts/openmw_aux/calendar.lua
+++ b/files/builtin_scripts/openmw_aux/calendar.lua
@@ -91,7 +91,7 @@ local function formatGameTime(formatStr, timestamp)
         error('Unknown tag "'..tag..'"')
     end
 
-    res, _ = string.gsub(formatStr or '%c', '%%.', replFn)
+    local res, _ = string.gsub(formatStr or '%c', '%%.', replFn)
     return res
 end
 
diff --git a/files/builtin_scripts/scripts/omw/camera.lua b/files/builtin_scripts/scripts/omw/camera.lua
index 4b5911930e..40b25c6d13 100644
--- a/files/builtin_scripts/scripts/omw/camera.lua
+++ b/files/builtin_scripts/scripts/omw/camera.lua
@@ -5,6 +5,8 @@ local settings = require('openmw.settings')
 local util = require('openmw.util')
 local self = require('openmw.self')
 
+local Actor = require('openmw.types').Actor
+
 local head_bobbing = require('scripts.omw.head_bobbing')
 local third_person = require('scripts.omw.third_person')
 
@@ -77,7 +79,7 @@ local function updateVanity(dt)
 end
 
 local function updateSmoothedSpeed(dt)
-    local speed = self:getCurrentSpeed()
+    local speed = Actor.currentSpeed(self)
     speed = speed / (1 + speed / 500)
     local maxDelta = 300 * dt
     smoothedSpeed = smoothedSpeed + util.clamp(speed - smoothedSpeed, -maxDelta, maxDelta)
@@ -126,7 +128,7 @@ local function updateStandingPreview()
         third_person.standingPreview = false
         return
     end
-    local standingStill = self:getCurrentSpeed() == 0 and not self:isInWeaponStance() and not self:isInMagicStance()
+    local standingStill = Actor.currentSpeed(self) == 0 and Actor.stance(self) == Actor.STANCE.Nothing
     if standingStill and mode == MODE.ThirdPerson then
         third_person.standingPreview = true
         camera.setMode(MODE.Preview)
diff --git a/files/builtin_scripts/scripts/omw/head_bobbing.lua b/files/builtin_scripts/scripts/omw/head_bobbing.lua
index fe809fca8a..8e6ea0660f 100644
--- a/files/builtin_scripts/scripts/omw/head_bobbing.lua
+++ b/files/builtin_scripts/scripts/omw/head_bobbing.lua
@@ -3,6 +3,8 @@ local self = require('openmw.self')
 local settings = require('openmw.settings')
 local util = require('openmw.util')
 
+local Actor = require('openmw.types').Actor
+
 local doubleStepLength = settings._getFloatFromSettingsCfg('Camera', 'head bobbing step') * 2
 local stepHeight = settings._getFloatFromSettingsCfg('Camera', 'head bobbing height')
 local maxRoll = math.rad(settings._getFloatFromSettingsCfg('Camera', 'head bobbing roll'))
@@ -20,14 +22,14 @@ local sampleArc = function(x) return 1 - math.cos(x * halfArc) end
 local arcHeight = sampleArc(1)
 
 function M.update(dt, smoothedSpeed)
-    local speed = self:getCurrentSpeed()
+    local speed = Actor.currentSpeed(self)
     speed = speed / (1 + speed / 500)  -- limit bobbing frequency if the speed is very high
     totalMovement = totalMovement + speed * dt
     if not M.enabled or camera.getMode() ~= camera.MODE.FirstPerson then
         effectWeight = 0
         return
     end
-    if self:isOnGround() then
+    if Actor.isOnGround(self) then
         effectWeight = math.min(1, effectWeight + dt * 5)
     else
         effectWeight = math.max(0, effectWeight - dt * 5)
diff --git a/files/builtin_scripts/scripts/omw/third_person.lua b/files/builtin_scripts/scripts/omw/third_person.lua
index ca00ef5ee9..95f872b15f 100644
--- a/files/builtin_scripts/scripts/omw/third_person.lua
+++ b/files/builtin_scripts/scripts/omw/third_person.lua
@@ -4,6 +4,8 @@ local util = require('openmw.util')
 local self = require('openmw.self')
 local nearby = require('openmw.nearby')
 
+local Actor = require('openmw.types').Actor
+
 local MODE = camera.MODE
 local STATE = { RightShoulder = 0, LeftShoulder = 1, Combat = 2, Swimming = 3 }
 
@@ -70,9 +72,9 @@ local noThirdPersonLastFrame = true
 local function updateState()
     local mode = camera.getMode()
     local oldState = state
-    if (self:isInWeaponStance() or self:isInMagicStance()) and mode == MODE.ThirdPerson then
+    if Actor.stance(self) ~= Actor.STANCE.Nothing and mode == MODE.ThirdPerson then
         state = STATE.Combat
-    elseif self:isSwimming() then
+    elseif Actor.isSwimming(self) then
         state = STATE.Swimming
     elseif oldState == STATE.Combat or oldState == STATE.Swimming then
         state = defaultShoulder

From d251c4e2a1c10e55a85d02b08736256305b2b542 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Mon, 21 Feb 2022 00:03:40 +0100
Subject: [PATCH 2196/2859] [Lua] Change behavior of `obj.type`

---
 apps/openmw/mwlua/luabindings.cpp    |  62 ----
 apps/openmw/mwlua/luabindings.hpp    |   1 -
 apps/openmw/mwlua/luamanagerimp.cpp  |   2 +
 apps/openmw/mwlua/object.cpp         |  78 +----
 apps/openmw/mwlua/object.hpp         |  33 ---
 apps/openmw/mwlua/objectbindings.cpp | 409 ++++++++++++++-------------
 apps/openmw/mwlua/types/types.cpp    | 193 +++++++++++++
 apps/openmw/mwlua/types/types.hpp    |  17 ++
 apps/openmw/mwworld/ptr.hpp          |  17 ++
 components/esm/defs.hpp              |   5 +
 10 files changed, 452 insertions(+), 365 deletions(-)
 create mode 100644 apps/openmw/mwlua/types/types.cpp

diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index 2319872974..655c7f6989 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -17,14 +17,6 @@
 namespace MWLua
 {
 
-    static sol::table definitionList(LuaUtil::LuaState& lua, std::initializer_list<std::string_view> values)
-    {
-        sol::table res(lua.sol(), sol::create);
-        for (const std::string_view& v : values)
-            res[v] = v;
-        return LuaUtil::makeReadOnly(res);
-    }
-
     static void addTimeBindings(sol::table& api, const Context& context, bool global)
     {
         api["getSimulationTime"] = [world=context.mWorldView]() { return world->getSimulationTime(); };
@@ -46,52 +38,6 @@ namespace MWLua
         // api["resume"] = []() {};
     }
 
-    sol::table initTypesPackage(const Context& context)
-    {
-        auto* lua = context.mLua;
-        sol::table types(lua->sol(), sol::create);
-        auto addType = [&](std::string_view name, std::optional<std::string_view> base = std::nullopt) -> sol::table
-        {
-            sol::table t(lua->sol(), sol::create);
-            sol::table ro = LuaUtil::makeReadOnly(t);
-            sol::table meta = ro[sol::metatable_key];
-            meta[sol::meta_function::to_string] = [name]() { return name; };
-            if (base)
-            {
-                t[sol::metatable_key] = LuaUtil::getMutableFromReadOnly(types[*base]);
-                t["baseType"] = types[*base];
-            }
-            types[name] = ro;
-            return t;
-        };
-
-        addActorBindings(addType("Actor"), context);
-        addType("Item");
-
-        addType(ObjectTypeName::Creature, "Actor");
-        addType(ObjectTypeName::NPC, "Actor");
-        addType(ObjectTypeName::Player, ObjectTypeName::NPC);
-
-        addType(ObjectTypeName::Armor, "Item");
-        addType(ObjectTypeName::Book, "Item");
-        addType(ObjectTypeName::Clothing, "Item");
-        addType(ObjectTypeName::Ingredient, "Item");
-        addType(ObjectTypeName::Light, "Item");
-        addType(ObjectTypeName::MiscItem, "Item");
-        addType(ObjectTypeName::Potion, "Item");
-        addType(ObjectTypeName::Weapon, "Item");
-        addType(ObjectTypeName::Apparatus, "Item");
-        addType(ObjectTypeName::Lockpick, "Item");
-        addType(ObjectTypeName::Probe, "Item");
-        addType(ObjectTypeName::Repair, "Item");
-
-        addType(ObjectTypeName::Activator);
-        addDoorBindings(addType(ObjectTypeName::Door), context);
-        addType(ObjectTypeName::Static);
-
-        return LuaUtil::makeReadOnly(types);
-    }
-
     sol::table initCorePackage(const Context& context)
     {
         auto* lua = context.mLua;
@@ -107,14 +53,6 @@ namespace MWLua
             context.mGlobalEventQueue->push_back({std::move(eventName), LuaUtil::serialize(eventData, context.mSerializer)});
         };
         addTimeBindings(api, context, false);
-        api["OBJECT_TYPE"] = definitionList(*lua,  // TODO: remove, use require('openmw.types') instead
-        {
-            ObjectTypeName::Activator, ObjectTypeName::Armor, ObjectTypeName::Book, ObjectTypeName::Clothing,
-            ObjectTypeName::Creature, ObjectTypeName::Door, ObjectTypeName::Ingredient, ObjectTypeName::Light,
-            ObjectTypeName::MiscItem, ObjectTypeName::NPC, ObjectTypeName::Player, ObjectTypeName::Potion,
-            ObjectTypeName::Static, ObjectTypeName::Weapon, ObjectTypeName::Apparatus, ObjectTypeName::Lockpick,
-            ObjectTypeName::Probe, ObjectTypeName::Repair
-        });
         api["i18n"] = [i18n=context.mI18n](const std::string& context) { return i18n->getContext(context); };
         const MWWorld::Store<ESM::GameSetting>* gmst = &MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
         api["getGMST"] = [lua=context.mLua, gmst](const std::string& setting) -> sol::object
diff --git a/apps/openmw/mwlua/luabindings.hpp b/apps/openmw/mwlua/luabindings.hpp
index d80c649f4c..f7a405b437 100644
--- a/apps/openmw/mwlua/luabindings.hpp
+++ b/apps/openmw/mwlua/luabindings.hpp
@@ -23,7 +23,6 @@ namespace MWLua
     sol::table initCorePackage(const Context&);
     sol::table initWorldPackage(const Context&);
     sol::table initQueryPackage(const Context&);
-    sol::table initTypesPackage(const Context&);
 
     sol::table initFieldGroup(const Context&, const QueryFieldGroup&);
 
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index cf1c69aa11..5b21d46427 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -22,6 +22,7 @@
 
 #include "luabindings.hpp"
 #include "userdataserializer.hpp"
+#include "types/types.hpp"
 
 namespace MWLua
 {
@@ -86,6 +87,7 @@ namespace MWLua
         mGlobalScripts.addPackage("openmw.world", initWorldPackage(context));
         mGlobalScripts.addPackage("openmw.settings", initGlobalSettingsPackage(context));
         mGlobalScripts.addPackage("openmw.storage", initGlobalStoragePackage(context, &mGlobalStorage));
+
         mCameraPackage = initCameraPackage(localContext);
         mUserInterfacePackage = initUserInterfacePackage(localContext);
         mInputPackage = initInputPackage(localContext);
diff --git a/apps/openmw/mwlua/object.cpp b/apps/openmw/mwlua/object.cpp
index dc903845f4..e81a6fbcc6 100644
--- a/apps/openmw/mwlua/object.cpp
+++ b/apps/openmw/mwlua/object.cpp
@@ -2,6 +2,8 @@
 
 #include <unordered_map>
 
+#include "types/types.hpp"
+
 namespace MWLua
 {
 
@@ -10,88 +12,12 @@ namespace MWLua
         return std::to_string(id.mIndex) + "_" + std::to_string(id.mContentFile);
     }
 
-    struct LuaObjectTypeInfo
-    {
-        std::string_view mName;
-        ESM::LuaScriptCfg::Flags mFlag = 0;
-    };
-
-    const static std::unordered_map<ESM::RecNameInts, LuaObjectTypeInfo> luaObjectTypeInfo = {
-        {ESM::REC_ACTI, {ObjectTypeName::Activator, ESM::LuaScriptCfg::sActivator}},
-        {ESM::REC_ARMO, {ObjectTypeName::Armor, ESM::LuaScriptCfg::sArmor}},
-        {ESM::REC_BOOK, {ObjectTypeName::Book, ESM::LuaScriptCfg::sBook}},
-        {ESM::REC_CLOT, {ObjectTypeName::Clothing, ESM::LuaScriptCfg::sClothing}},
-        {ESM::REC_CONT, {ObjectTypeName::Container, ESM::LuaScriptCfg::sContainer}},
-        {ESM::REC_CREA, {ObjectTypeName::Creature, ESM::LuaScriptCfg::sCreature}},
-        {ESM::REC_DOOR, {ObjectTypeName::Door, ESM::LuaScriptCfg::sDoor}},
-        {ESM::REC_INGR, {ObjectTypeName::Ingredient, ESM::LuaScriptCfg::sIngredient}},
-        {ESM::REC_LIGH, {ObjectTypeName::Light, ESM::LuaScriptCfg::sLight}},
-        {ESM::REC_MISC, {ObjectTypeName::MiscItem, ESM::LuaScriptCfg::sMiscItem}},
-        {ESM::REC_NPC_, {ObjectTypeName::NPC, ESM::LuaScriptCfg::sNPC}},
-        {ESM::REC_ALCH, {ObjectTypeName::Potion, ESM::LuaScriptCfg::sPotion}},
-        {ESM::REC_STAT, {ObjectTypeName::Static}},
-        {ESM::REC_WEAP, {ObjectTypeName::Weapon, ESM::LuaScriptCfg::sWeapon}},
-        {ESM::REC_APPA, {ObjectTypeName::Apparatus}},
-        {ESM::REC_LOCK, {ObjectTypeName::Lockpick}},
-        {ESM::REC_PROB, {ObjectTypeName::Probe}},
-        {ESM::REC_REPA, {ObjectTypeName::Repair}},
-    };
-
-    std::string_view getLuaObjectTypeName(ESM::RecNameInts type, std::string_view fallback)
-    {
-        auto it = luaObjectTypeInfo.find(type);
-        if (it != luaObjectTypeInfo.end())
-            return it->second.mName;
-        else
-            return fallback;
-    }
-
     bool isMarker(const MWWorld::Ptr& ptr)
     {
         std::string_view id = ptr.getCellRef().getRefId();
         return id == "prisonmarker" || id == "divinemarker" || id == "templemarker" || id == "northmarker";
     }
 
-    std::string_view getLuaObjectTypeName(const MWWorld::Ptr& ptr)
-    {
-        // Behaviour of this function is a part of OpenMW Lua API. We can not just return
-        // `ptr.getTypeDescription()` because its implementation is distributed over many files
-        // and can be accidentally changed. We use `ptr.getTypeDescription()` only as a fallback
-        // for types that are not present in `luaObjectTypeInfo` (for such types result stability
-        // is not necessary because they are not listed in OpenMW Lua documentation).
-        if (ptr.getCellRef().getRefId() == "player")
-            return ObjectTypeName::Player;
-        if (isMarker(ptr))
-            return "Marker";
-        return getLuaObjectTypeName(static_cast<ESM::RecNameInts>(ptr.getType()), /*fallback=*/ptr.getTypeDescription());
-    }
-
-    ESM::LuaScriptCfg::Flags getLuaScriptFlag(const MWWorld::Ptr& ptr)
-    {
-        if (ptr.getCellRef().getRefId() == "player")
-            return ESM::LuaScriptCfg::sPlayer;
-        if (isMarker(ptr))
-            return 0;
-        auto it = luaObjectTypeInfo.find(static_cast<ESM::RecNameInts>(ptr.getType()));
-        if (it != luaObjectTypeInfo.end())
-            return it->second.mFlag;
-        else
-            return 0;
-    }
-
-    const MWWorld::Ptr& verifyType(ESM::RecNameInts recordType, const MWWorld::Ptr& ptr)
-    {
-        if (ptr.getType() != recordType)
-        {
-            std::string msg = "Requires type '";
-            msg.append(getLuaObjectTypeName(recordType));
-            msg.append("', but applied to ");
-            msg.append(ptrToString(ptr));
-            throw std::runtime_error(msg);
-        }
-        return ptr;
-    }
-
     std::string ptrToString(const MWWorld::Ptr& ptr)
     {
         std::string res = "object";
diff --git a/apps/openmw/mwlua/object.hpp b/apps/openmw/mwlua/object.hpp
index 36744b8f93..1685d7506d 100644
--- a/apps/openmw/mwlua/object.hpp
+++ b/apps/openmw/mwlua/object.hpp
@@ -16,31 +16,6 @@
 
 namespace MWLua
 {
-    namespace ObjectTypeName
-    {
-        // Names of object types in Lua.
-        // These names are part of OpenMW Lua API.
-        constexpr std::string_view Activator = "Activator";
-        constexpr std::string_view Armor = "Armor";
-        constexpr std::string_view Book = "Book";
-        constexpr std::string_view Clothing = "Clothing";
-        constexpr std::string_view Container = "Container";
-        constexpr std::string_view Creature = "Creature";
-        constexpr std::string_view Door = "Door";
-        constexpr std::string_view Ingredient = "Ingredient";
-        constexpr std::string_view Light = "Light";
-        constexpr std::string_view MiscItem = "Miscellaneous";
-        constexpr std::string_view NPC = "NPC";
-        constexpr std::string_view Player = "Player";
-        constexpr std::string_view Potion = "Potion";
-        constexpr std::string_view Static = "Static";
-        constexpr std::string_view Weapon = "Weapon";
-        constexpr std::string_view Apparatus = "Apparatus";
-        constexpr std::string_view Lockpick = "Lockpick";
-        constexpr std::string_view Probe = "Probe";
-        constexpr std::string_view Repair = "Repair";
-    }
-
     // ObjectId is a unique identifier of a game object.
     // It can change only if the order of content files was change.
     using ObjectId = ESM::RefNum;
@@ -48,13 +23,6 @@ namespace MWLua
     std::string idToString(const ObjectId& id);
     std::string ptrToString(const MWWorld::Ptr& ptr);
     bool isMarker(const MWWorld::Ptr& ptr);
-    std::string_view getLuaObjectTypeName(ESM::RecNameInts recordType, std::string_view fallback = "Unknown");
-    std::string_view getLuaObjectTypeName(const MWWorld::Ptr& ptr);
-    const MWWorld::Ptr& verifyType(ESM::RecNameInts recordType, const MWWorld::Ptr& ptr);
-
-    // Each script has a set of flags that controls to which objects the script should be
-    // automatically attached. This function maps each object types to one of the flags. 
-    ESM::LuaScriptCfg::Flags getLuaScriptFlag(const MWWorld::Ptr& ptr);
 
     // Holds a mapping ObjectId -> MWWord::Ptr.
     class ObjectRegistry
@@ -98,7 +66,6 @@ namespace MWLua
         ObjectId id() const { return mId; }
 
         std::string toString() const;
-        std::string_view type() const { return getLuaObjectTypeName(ptr()); }
 
         // Updates and returns the underlying Ptr. Throws an exception if object is not available.
         const MWWorld::Ptr& ptr() const;
diff --git a/apps/openmw/mwlua/objectbindings.cpp b/apps/openmw/mwlua/objectbindings.cpp
index 0310541eee..092a8d5151 100644
--- a/apps/openmw/mwlua/objectbindings.cpp
+++ b/apps/openmw/mwlua/objectbindings.cpp
@@ -10,6 +10,7 @@
 
 #include "eventqueue.hpp"
 #include "luamanagerimp.hpp"
+#include "types/types.hpp"
 
 namespace MWLua
 {
@@ -39,226 +40,248 @@ namespace sol
 namespace MWLua
 {
 
-    template <typename ObjT>
-    using Cell = std::conditional_t<std::is_same_v<ObjT, LObject>, LCell, GCell>;
+    namespace {
 
-    template <class ObjectT>
-    static void registerObjectList(const std::string& prefix, const Context& context)
-    {
-        using ListT = ObjectList<ObjectT>;
-        sol::state& lua = context.mLua->sol();
-        ObjectRegistry* registry = context.mWorldView->getObjectRegistry();
-        sol::usertype<ListT> listT = lua.new_usertype<ListT>(prefix + "ObjectList");
-        listT[sol::meta_function::to_string] =
-            [](const ListT& list) { return "{" + std::to_string(list.mIds->size()) + " objects}"; };
-        listT[sol::meta_function::length] = [](const ListT& list) { return list.mIds->size(); };
-        listT[sol::meta_function::index] = [registry](const ListT& list, size_t index)
-        {
-            if (index > 0 && index <= list.mIds->size())
-                return ObjectT((*list.mIds)[index - 1], registry);
-            else
-                throw std::runtime_error("Index out of range");
-        };
-        listT[sol::meta_function::ipairs] = [registry](const ListT& list)
+        template <typename ObjT>
+        using Cell = std::conditional_t<std::is_same_v<ObjT, LObject>, LCell, GCell>;
+
+        template <class ObjectT>
+        void registerObjectList(const std::string& prefix, const Context& context)
         {
-            auto iter = [registry](const ListT& l, int64_t i) -> sol::optional<std::tuple<int64_t, ObjectT>>
+            using ListT = ObjectList<ObjectT>;
+            sol::state& lua = context.mLua->sol();
+            ObjectRegistry* registry = context.mWorldView->getObjectRegistry();
+            sol::usertype<ListT> listT = lua.new_usertype<ListT>(prefix + "ObjectList");
+            listT[sol::meta_function::to_string] =
+                [](const ListT& list) { return "{" + std::to_string(list.mIds->size()) + " objects}"; };
+            listT[sol::meta_function::length] = [](const ListT& list) { return list.mIds->size(); };
+            listT[sol::meta_function::index] = [registry](const ListT& list, size_t index)
             {
-                if (i >= 0 && i < static_cast<int64_t>(l.mIds->size()))
-                    return std::make_tuple(i + 1, ObjectT((*l.mIds)[i], registry));
+                if (index > 0 && index <= list.mIds->size())
+                    return ObjectT((*list.mIds)[index - 1], registry);
                 else
-                    return sol::nullopt;
+                    throw std::runtime_error("Index out of range");
             };
-            return std::make_tuple(iter, list, 0);
-        };
-        listT["select"] = [context](const ListT& list, const Queries::Query& query)
-        {
-            return ListT{selectObjectsFromList(query, list.mIds, context)};
-        };
-    }
-
-    template <class ObjectT>
-    static void addBasicBindings(sol::usertype<ObjectT>& objectT, const Context& context)
-    {
-        objectT["isValid"] = [](const ObjectT& o) { return o.isValid(); };
-        objectT["recordId"] = sol::readonly_property([](const ObjectT& o) -> std::string
-        {
-            return o.ptr().getCellRef().getRefId();
-        });
-        objectT["cell"] = sol::readonly_property([](const ObjectT& o) -> sol::optional<Cell<ObjectT>>
-        {
-            const MWWorld::Ptr& ptr = o.ptr();
-            if (ptr.isInCell())
-                return Cell<ObjectT>{ptr.getCell()};
+            if constexpr (std::is_same_v<ObjectT, GObject>)
+            {
+                // GObject and LObject iterators are in separate branches because if they share source code
+                // there is a collision in sol and only one iterator can be mapped to Lua.
+                auto iter = sol::make_object(lua, [registry](const GObjectList& l, int64_t i) -> sol::optional<std::tuple<int64_t, GObject>>
+                {
+                    if (i >= 0 && i < static_cast<int64_t>(l.mIds->size()))
+                        return std::make_tuple(i + 1, GObject((*l.mIds)[i], registry));
+                    else
+                        return sol::nullopt;
+                });
+                listT[sol::meta_function::ipairs] = [iter](const GObjectList& list) { return std::make_tuple(iter, list, 0); };
+            }
             else
-                return sol::nullopt;
-        });
-        objectT["position"] = sol::readonly_property([](const ObjectT& o) -> osg::Vec3f
-        {
-            return o.ptr().getRefData().getPosition().asVec3();
-        });
-        objectT["rotation"] = sol::readonly_property([](const ObjectT& o) -> osg::Vec3f
-        {
-            return o.ptr().getRefData().getPosition().asRotationVec3();
-        });
-        objectT["type"] = sol::readonly_property(&ObjectT::type);
-        objectT["count"] = sol::readonly_property([](const ObjectT& o) { return o.ptr().getRefData().getCount(); });
-        objectT[sol::meta_function::equal_to] = [](const ObjectT& a, const ObjectT& b) { return a.id() == b.id(); };
-        objectT[sol::meta_function::to_string] = &ObjectT::toString;
-        objectT["sendEvent"] = [context](const ObjectT& dest, std::string eventName, const sol::object& eventData)
-        {
-            context.mLocalEventQueue->push_back({dest.id(), std::move(eventName), LuaUtil::serialize(eventData, context.mSerializer)});
-        };
+            {
+                auto iter = sol::make_object(lua, [registry](const LObjectList& l, int64_t i) -> sol::optional<std::tuple<int64_t, LObject>>
+                {
+                    if (i >= 0 && i < static_cast<int64_t>(l.mIds->size()))
+                        return std::make_tuple(i + 1, LObject((*l.mIds)[i], registry));
+                    else
+                        return sol::nullopt;
+                });
+                listT[sol::meta_function::ipairs] = [iter](const LObjectList& list) { return std::make_tuple(iter, list, 0); };
+            }
+            listT["select"] = [context](const ListT& list, const Queries::Query& query)
+            {
+                return ListT{selectObjectsFromList(query, list.mIds, context)};
+            };
+        }
 
-        objectT["activateBy"] = [context](const ObjectT& o, const ObjectT& actor)
+        template <class ObjectT>
+        void addBasicBindings(sol::usertype<ObjectT>& objectT, const Context& context)
         {
-            uint32_t esmRecordType = actor.ptr().getType();
-            if (esmRecordType != ESM::REC_CREA && esmRecordType != ESM::REC_NPC_)
-                throw std::runtime_error("The argument of `activateBy` must be an actor who activates the object. Got: " +
-                                         ptrToString(actor.ptr()));
-            context.mLuaManager->addAction(std::make_unique<ActivateAction>(context.mLua, o.id(), actor.id()));
-        };
-
-        if constexpr (std::is_same_v<ObjectT, GObject>)
-        {  // Only for global scripts
-            objectT["addScript"] = [lua=context.mLua, luaManager=context.mLuaManager](const GObject& object, std::string_view path)
+            objectT["isValid"] = [](const ObjectT& o) { return o.isValid(); };
+            objectT["recordId"] = sol::readonly_property([](const ObjectT& o) -> std::string
             {
-                const LuaUtil::ScriptsConfiguration& cfg = lua->getConfiguration();
-                std::optional<int> scriptId = cfg.findId(path);
-                if (!scriptId)
-                    throw std::runtime_error("Unknown script: " + std::string(path));
-                if (!(cfg[*scriptId].mFlags & ESM::LuaScriptCfg::sCustom))
-                    throw std::runtime_error("Script without CUSTOM tag can not be added dynamically: " + std::string(path));
-                luaManager->addCustomLocalScript(object.ptr(), *scriptId);
-            };
-            objectT["hasScript"] = [lua=context.mLua](const GObject& object, std::string_view path)
+                return o.ptr().getCellRef().getRefId();
+            });
+            objectT["cell"] = sol::readonly_property([](const ObjectT& o) -> sol::optional<Cell<ObjectT>>
             {
-                const LuaUtil::ScriptsConfiguration& cfg = lua->getConfiguration();
-                std::optional<int> scriptId = cfg.findId(path);
-                if (!scriptId)
-                    return false;
-                MWWorld::Ptr ptr = object.ptr();
-                LocalScripts* localScripts = ptr.getRefData().getLuaScripts();
-                if (localScripts)
-                    return localScripts->hasScript(*scriptId);
+                const MWWorld::Ptr& ptr = o.ptr();
+                if (ptr.isInCell())
+                    return Cell<ObjectT>{ptr.getCell()};
                 else
-                    return false;
-            };
-            objectT["removeScript"] = [lua=context.mLua](const GObject& object, std::string_view path)
+                    return sol::nullopt;
+            });
+            objectT["position"] = sol::readonly_property([](const ObjectT& o) -> osg::Vec3f
+            {
+                return o.ptr().getRefData().getPosition().asVec3();
+            });
+            objectT["rotation"] = sol::readonly_property([](const ObjectT& o) -> osg::Vec3f
             {
-                const LuaUtil::ScriptsConfiguration& cfg = lua->getConfiguration();
-                std::optional<int> scriptId = cfg.findId(path);
-                if (!scriptId)
-                    throw std::runtime_error("Unknown script: " + std::string(path));
-                MWWorld::Ptr ptr = object.ptr();
-                LocalScripts* localScripts = ptr.getRefData().getLuaScripts();
-                if (!localScripts || !localScripts->hasScript(*scriptId))
-                    throw std::runtime_error("There is no script " + std::string(path) + " on " + ptrToString(ptr));
-                ESM::LuaScriptCfg::Flags flags = cfg[*scriptId].mFlags;
-                if ((flags & (localScripts->getAutoStartMode() | ESM::LuaScriptCfg::sCustom)) != ESM::LuaScriptCfg::sCustom)
-                    throw std::runtime_error("Autostarted script can not be removed: " + std::string(path));
-                localScripts->removeScript(*scriptId);
+                return o.ptr().getRefData().getPosition().asRotationVec3();
+            });
+
+            objectT["type"] = sol::readonly_property([types=getTypeToPackageTable(context.mLua->sol())](const ObjectT& o) mutable
+            {
+                return types[o.ptr().getLuaType()];
+            });
+
+            objectT["count"] = sol::readonly_property([](const ObjectT& o) { return o.ptr().getRefData().getCount(); });
+            objectT[sol::meta_function::equal_to] = [](const ObjectT& a, const ObjectT& b) { return a.id() == b.id(); };
+            objectT[sol::meta_function::to_string] = &ObjectT::toString;
+            objectT["sendEvent"] = [context](const ObjectT& dest, std::string eventName, const sol::object& eventData)
+            {
+                context.mLocalEventQueue->push_back({dest.id(), std::move(eventName), LuaUtil::serialize(eventData, context.mSerializer)});
             };
 
-            objectT["teleport"] = [context](const GObject& object, std::string_view cell,
-                                            const osg::Vec3f& pos, const sol::optional<osg::Vec3f>& optRot)
+            objectT["activateBy"] = [context](const ObjectT& o, const ObjectT& actor)
             {
-                MWWorld::Ptr ptr = object.ptr();
-                osg::Vec3f rot = optRot ? *optRot : ptr.getRefData().getPosition().asRotationVec3();
-                auto action = std::make_unique<TeleportAction>(context.mLua, object.id(), std::string(cell), pos, rot);
-                if (ptr == MWBase::Environment::get().getWorld()->getPlayerPtr())
-                    context.mLuaManager->addTeleportPlayerAction(std::move(action));
-                else
-                    context.mLuaManager->addAction(std::move(action));
+                uint32_t esmRecordType = actor.ptr().getType();
+                if (esmRecordType != ESM::REC_CREA && esmRecordType != ESM::REC_NPC_)
+                    throw std::runtime_error("The argument of `activateBy` must be an actor who activates the object. Got: " +
+                                             ptrToString(actor.ptr()));
+                context.mLuaManager->addAction(std::make_unique<ActivateAction>(context.mLua, o.id(), actor.id()));
             };
-        }
-    }
 
-    template <class ObjectT>
-    static void addInventoryBindings(sol::usertype<ObjectT>& objectT, const std::string& prefix, const Context& context)
-    {
-        using InventoryT = Inventory<ObjectT>;
-        sol::usertype<InventoryT> inventoryT = context.mLua->sol().new_usertype<InventoryT>(prefix + "Inventory");
+            if constexpr (std::is_same_v<ObjectT, GObject>)
+            {  // Only for global scripts
+                objectT["addScript"] = [lua=context.mLua, luaManager=context.mLuaManager](const GObject& object, std::string_view path)
+                {
+                    const LuaUtil::ScriptsConfiguration& cfg = lua->getConfiguration();
+                    std::optional<int> scriptId = cfg.findId(path);
+                    if (!scriptId)
+                        throw std::runtime_error("Unknown script: " + std::string(path));
+                    if (!(cfg[*scriptId].mFlags & ESM::LuaScriptCfg::sCustom))
+                        throw std::runtime_error("Script without CUSTOM tag can not be added dynamically: " + std::string(path));
+                    luaManager->addCustomLocalScript(object.ptr(), *scriptId);
+                };
+                objectT["hasScript"] = [lua=context.mLua](const GObject& object, std::string_view path)
+                {
+                    const LuaUtil::ScriptsConfiguration& cfg = lua->getConfiguration();
+                    std::optional<int> scriptId = cfg.findId(path);
+                    if (!scriptId)
+                        return false;
+                    MWWorld::Ptr ptr = object.ptr();
+                    LocalScripts* localScripts = ptr.getRefData().getLuaScripts();
+                    if (localScripts)
+                        return localScripts->hasScript(*scriptId);
+                    else
+                        return false;
+                };
+                objectT["removeScript"] = [lua=context.mLua](const GObject& object, std::string_view path)
+                {
+                    const LuaUtil::ScriptsConfiguration& cfg = lua->getConfiguration();
+                    std::optional<int> scriptId = cfg.findId(path);
+                    if (!scriptId)
+                        throw std::runtime_error("Unknown script: " + std::string(path));
+                    MWWorld::Ptr ptr = object.ptr();
+                    LocalScripts* localScripts = ptr.getRefData().getLuaScripts();
+                    if (!localScripts || !localScripts->hasScript(*scriptId))
+                        throw std::runtime_error("There is no script " + std::string(path) + " on " + ptrToString(ptr));
+                    ESM::LuaScriptCfg::Flags flags = cfg[*scriptId].mFlags;
+                    if ((flags & (localScripts->getAutoStartMode() | ESM::LuaScriptCfg::sCustom)) != ESM::LuaScriptCfg::sCustom)
+                        throw std::runtime_error("Autostarted script can not be removed: " + std::string(path));
+                    localScripts->removeScript(*scriptId);
+                };
 
-        objectT["inventory"] = sol::readonly_property([](const ObjectT& o) { return InventoryT{o}; });
-        inventoryT[sol::meta_function::to_string] =
-            [](const InventoryT& inv) { return "Inventory[" + inv.mObj.toString() + "]"; };
+                objectT["teleport"] = [context](const GObject& object, std::string_view cell,
+                                                const osg::Vec3f& pos, const sol::optional<osg::Vec3f>& optRot)
+                {
+                    MWWorld::Ptr ptr = object.ptr();
+                    osg::Vec3f rot = optRot ? *optRot : ptr.getRefData().getPosition().asRotationVec3();
+                    auto action = std::make_unique<TeleportAction>(context.mLua, object.id(), std::string(cell), pos, rot);
+                    if (ptr == MWBase::Environment::get().getWorld()->getPlayerPtr())
+                        context.mLuaManager->addTeleportPlayerAction(std::move(action));
+                    else
+                        context.mLuaManager->addAction(std::move(action));
+                };
+            }
+        }
 
-        inventoryT["getAll"] = [worldView=context.mWorldView](const InventoryT& inventory, sol::optional<std::string_view> type)
+        template <class ObjectT>
+        void addInventoryBindings(sol::usertype<ObjectT>& objectT, const std::string& prefix, const Context& context)
         {
-            int mask;
-            if (!type.has_value())
-                mask = MWWorld::ContainerStore::Type_All;
-            else if (*type == ObjectTypeName::Potion)
-                mask = MWWorld::ContainerStore::Type_Potion;
-            else if (*type == ObjectTypeName::Armor)
-                mask = MWWorld::ContainerStore::Type_Armor;
-            else if (*type == ObjectTypeName::Book)
-                mask = MWWorld::ContainerStore::Type_Book;
-            else if (*type == ObjectTypeName::Clothing)
-                mask = MWWorld::ContainerStore::Type_Clothing;
-            else if (*type == ObjectTypeName::Ingredient)
-                mask = MWWorld::ContainerStore::Type_Ingredient;
-            else if (*type == ObjectTypeName::Light)
-                mask = MWWorld::ContainerStore::Type_Light;
-            else if (*type == ObjectTypeName::MiscItem)
-                mask = MWWorld::ContainerStore::Type_Miscellaneous;
-            else if (*type == ObjectTypeName::Weapon)
-                mask = MWWorld::ContainerStore::Type_Weapon;
-            else if (*type == ObjectTypeName::Apparatus)
-                mask = MWWorld::ContainerStore::Type_Apparatus;
-            else if (*type == ObjectTypeName::Lockpick)
-                mask = MWWorld::ContainerStore::Type_Lockpick;
-            else if (*type == ObjectTypeName::Probe)
-                mask = MWWorld::ContainerStore::Type_Probe;
-            else if (*type == ObjectTypeName::Repair)
-                mask = MWWorld::ContainerStore::Type_Repair;
-            else
-                throw std::runtime_error(std::string("inventory:getAll doesn't support type " + std::string(*type)));
+            using InventoryT = Inventory<ObjectT>;
+            sol::usertype<InventoryT> inventoryT = context.mLua->sol().new_usertype<InventoryT>(prefix + "Inventory");
 
-            const MWWorld::Ptr& ptr = inventory.mObj.ptr();
-            MWWorld::ContainerStore& store = ptr.getClass().getContainerStore(ptr);
-            ObjectIdList list = std::make_shared<std::vector<ObjectId>>();
-            auto it = store.begin(mask);
-            while (it.getType() != -1)
+            objectT["inventory"] = sol::readonly_property([](const ObjectT& o) { return InventoryT{o}; });
+            inventoryT[sol::meta_function::to_string] =
+                [](const InventoryT& inv) { return "Inventory[" + inv.mObj.toString() + "]"; };
+
+            inventoryT["getAll"] = [worldView=context.mWorldView, ids=getPackageToTypeTable(context.mLua->sol())](
+                const InventoryT& inventory, sol::optional<sol::table> type)
             {
-                const MWWorld::Ptr& item = *(it++);
-                worldView->getObjectRegistry()->registerPtr(item);
-                list->push_back(getId(item));
-            }
-            return ObjectList<ObjectT>{list};
-        };
+                int mask = -1;
+                sol::optional<uint32_t> typeId = sol::nullopt;
+                if (type.has_value())
+                    typeId = ids[*type];
+                else
+                    mask = MWWorld::ContainerStore::Type_All;
 
-        inventoryT["countOf"] = [](const InventoryT& inventory, const std::string& recordId)
-        {
-            const MWWorld::Ptr& ptr = inventory.mObj.ptr();
-            MWWorld::ContainerStore& store = ptr.getClass().getContainerStore(ptr);
-            return store.count(recordId);
-        };
+                if (typeId.has_value())
+                {
+                    switch (*typeId)
+                    {
+                        case ESM::REC_ALCH: mask = MWWorld::ContainerStore::Type_Potion; break;
+                        case ESM::REC_ARMO: mask = MWWorld::ContainerStore::Type_Armor; break;
+                        case ESM::REC_BOOK: mask = MWWorld::ContainerStore::Type_Book; break;
+                        case ESM::REC_CLOT: mask = MWWorld::ContainerStore::Type_Clothing; break;
+                        case ESM::REC_INGR: mask = MWWorld::ContainerStore::Type_Ingredient; break;
+                        case ESM::REC_LIGH: mask = MWWorld::ContainerStore::Type_Light; break;
+                        case ESM::REC_MISC: mask = MWWorld::ContainerStore::Type_Miscellaneous; break;
+                        case ESM::REC_WEAP: mask = MWWorld::ContainerStore::Type_Weapon; break;
+                        case ESM::REC_APPA: mask = MWWorld::ContainerStore::Type_Apparatus; break;
+                        case ESM::REC_LOCK: mask = MWWorld::ContainerStore::Type_Lockpick; break;
+                        case ESM::REC_PROB: mask = MWWorld::ContainerStore::Type_Probe; break;
+                        case ESM::REC_REPA: mask = MWWorld::ContainerStore::Type_Repair; break;
+                        default:;
+                    }
+                }
+
+                if (mask == -1)
+                    throw std::runtime_error(std::string("Incorrect type argument in inventory:getAll: " + LuaUtil::toString(*type)));
+
+                const MWWorld::Ptr& ptr = inventory.mObj.ptr();
+                MWWorld::ContainerStore& store = ptr.getClass().getContainerStore(ptr);
+                ObjectIdList list = std::make_shared<std::vector<ObjectId>>();
+                auto it = store.begin(mask);
+                while (it.getType() != -1)
+                {
+                    const MWWorld::Ptr& item = *(it++);
+                    worldView->getObjectRegistry()->registerPtr(item);
+                    list->push_back(getId(item));
+                }
+                return ObjectList<ObjectT>{list};
+            };
+
+            inventoryT["countOf"] = [](const InventoryT& inventory, const std::string& recordId)
+            {
+                const MWWorld::Ptr& ptr = inventory.mObj.ptr();
+                MWWorld::ContainerStore& store = ptr.getClass().getContainerStore(ptr);
+                return store.count(recordId);
+            };
 
-        if constexpr (std::is_same_v<ObjectT, GObject>)
-        {  // Only for global scripts
-            // TODO
-            // obj.inventory:drop(obj2, [count])
-            // obj.inventory:drop(recordId, [count])
-            // obj.inventory:addNew(recordId, [count])
-            // obj.inventory:remove(obj/recordId, [count])
-            /*objectT["moveInto"] = [](const GObject& obj, const InventoryT& inventory) {};
-            inventoryT["drop"] = [](const InventoryT& inventory) {};
-            inventoryT["addNew"] = [](const InventoryT& inventory) {};
-            inventoryT["remove"] = [](const InventoryT& inventory) {};*/
+            if constexpr (std::is_same_v<ObjectT, GObject>)
+            {  // Only for global scripts
+                // TODO
+                // obj.inventory:drop(obj2, [count])
+                // obj.inventory:drop(recordId, [count])
+                // obj.inventory:addNew(recordId, [count])
+                // obj.inventory:remove(obj/recordId, [count])
+                /*objectT["moveInto"] = [](const GObject& obj, const InventoryT& inventory) {};
+                inventoryT["drop"] = [](const InventoryT& inventory) {};
+                inventoryT["addNew"] = [](const InventoryT& inventory) {};
+                inventoryT["remove"] = [](const InventoryT& inventory) {};*/
+            }
         }
-    }
 
-    template <class ObjectT>
-    static void initObjectBindings(const std::string& prefix, const Context& context)
-    {
-        sol::usertype<ObjectT> objectT = context.mLua->sol().new_usertype<ObjectT>(
-            prefix + "Object", sol::base_classes, sol::bases<Object>());
-        addBasicBindings<ObjectT>(objectT, context);
-        addInventoryBindings<ObjectT>(objectT, prefix, context);
+        template <class ObjectT>
+        void initObjectBindings(const std::string& prefix, const Context& context)
+        {
+            sol::usertype<ObjectT> objectT = context.mLua->sol().new_usertype<ObjectT>(
+                prefix + "Object", sol::base_classes, sol::bases<Object>());
+            addBasicBindings<ObjectT>(objectT, context);
+            addInventoryBindings<ObjectT>(objectT, prefix, context);
 
-        registerObjectList<ObjectT>(prefix, context);
-    }
+            registerObjectList<ObjectT>(prefix, context);
+        }
+    }  // namespace
 
     void initObjectBindingsForLocalScripts(const Context& context)
     {
diff --git a/apps/openmw/mwlua/types/types.cpp b/apps/openmw/mwlua/types/types.cpp
new file mode 100644
index 0000000000..f91400d5ea
--- /dev/null
+++ b/apps/openmw/mwlua/types/types.cpp
@@ -0,0 +1,193 @@
+#include "types.hpp"
+
+#include <components/lua/luastate.hpp>
+
+namespace MWLua
+{
+    namespace ObjectTypeName
+    {
+        // Names of object types in Lua.
+        // These names are part of OpenMW Lua API.
+        constexpr std::string_view Actor = "Actor";  // base type for NPC, Creature, Player
+        constexpr std::string_view Item = "Item";  // base type for all items
+
+        constexpr std::string_view Activator = "Activator";
+        constexpr std::string_view Armor = "Armor";
+        constexpr std::string_view Book = "Book";
+        constexpr std::string_view Clothing = "Clothing";
+        constexpr std::string_view Container = "Container";
+        constexpr std::string_view Creature = "Creature";
+        constexpr std::string_view Door = "Door";
+        constexpr std::string_view Ingredient = "Ingredient";
+        constexpr std::string_view Light = "Light";
+        constexpr std::string_view MiscItem = "Miscellaneous";
+        constexpr std::string_view NPC = "NPC";
+        constexpr std::string_view Player = "Player";
+        constexpr std::string_view Potion = "Potion";
+        constexpr std::string_view Static = "Static";
+        constexpr std::string_view Weapon = "Weapon";
+        constexpr std::string_view Apparatus = "Apparatus";
+        constexpr std::string_view Lockpick = "Lockpick";
+        constexpr std::string_view Probe = "Probe";
+        constexpr std::string_view Repair = "Repair";
+        constexpr std::string_view Marker = "Marker";
+    }
+
+    namespace
+    {
+        struct LuaObjectTypeInfo
+        {
+            std::string_view mName;
+            ESM::LuaScriptCfg::Flags mFlag = 0;
+        };
+
+        const static std::unordered_map<ESM::RecNameInts, LuaObjectTypeInfo> luaObjectTypeInfo = {
+            {ESM::REC_INTERNAL_PLAYER, {ObjectTypeName::Player, ESM::LuaScriptCfg::sPlayer}},
+            {ESM::REC_INTERNAL_MARKER, {ObjectTypeName::Marker}},
+            {ESM::REC_ACTI, {ObjectTypeName::Activator, ESM::LuaScriptCfg::sActivator}},
+            {ESM::REC_ARMO, {ObjectTypeName::Armor, ESM::LuaScriptCfg::sArmor}},
+            {ESM::REC_BOOK, {ObjectTypeName::Book, ESM::LuaScriptCfg::sBook}},
+            {ESM::REC_CLOT, {ObjectTypeName::Clothing, ESM::LuaScriptCfg::sClothing}},
+            {ESM::REC_CONT, {ObjectTypeName::Container, ESM::LuaScriptCfg::sContainer}},
+            {ESM::REC_CREA, {ObjectTypeName::Creature, ESM::LuaScriptCfg::sCreature}},
+            {ESM::REC_DOOR, {ObjectTypeName::Door, ESM::LuaScriptCfg::sDoor}},
+            {ESM::REC_INGR, {ObjectTypeName::Ingredient, ESM::LuaScriptCfg::sIngredient}},
+            {ESM::REC_LIGH, {ObjectTypeName::Light, ESM::LuaScriptCfg::sLight}},
+            {ESM::REC_MISC, {ObjectTypeName::MiscItem, ESM::LuaScriptCfg::sMiscItem}},
+            {ESM::REC_NPC_, {ObjectTypeName::NPC, ESM::LuaScriptCfg::sNPC}},
+            {ESM::REC_ALCH, {ObjectTypeName::Potion, ESM::LuaScriptCfg::sPotion}},
+            {ESM::REC_STAT, {ObjectTypeName::Static}},
+            {ESM::REC_WEAP, {ObjectTypeName::Weapon, ESM::LuaScriptCfg::sWeapon}},
+            {ESM::REC_APPA, {ObjectTypeName::Apparatus}},
+            {ESM::REC_LOCK, {ObjectTypeName::Lockpick}},
+            {ESM::REC_PROB, {ObjectTypeName::Probe}},
+            {ESM::REC_REPA, {ObjectTypeName::Repair}},
+        };
+
+    }
+
+    std::string_view getLuaObjectTypeName(ESM::RecNameInts type, std::string_view fallback)
+    {
+        auto it = luaObjectTypeInfo.find(type);
+        if (it != luaObjectTypeInfo.end())
+            return it->second.mName;
+        else
+            return fallback;
+    }
+
+    std::string_view getLuaObjectTypeName(const MWWorld::Ptr& ptr)
+    {
+        return getLuaObjectTypeName(static_cast<ESM::RecNameInts>(ptr.getLuaType()), /*fallback=*/ptr.getTypeDescription());
+    }
+
+    ESM::LuaScriptCfg::Flags getLuaScriptFlag(const MWWorld::Ptr& ptr)
+    {
+        auto it = luaObjectTypeInfo.find(static_cast<ESM::RecNameInts>(ptr.getLuaType()));
+        if (it != luaObjectTypeInfo.end())
+            return it->second.mFlag;
+        else
+            return 0;
+    }
+
+    const MWWorld::Ptr& verifyType(ESM::RecNameInts recordType, const MWWorld::Ptr& ptr)
+    {
+        if (ptr.getType() != recordType)
+        {
+            std::string msg = "Requires type '";
+            msg.append(getLuaObjectTypeName(recordType));
+            msg.append("', but applied to ");
+            msg.append(ptrToString(ptr));
+            throw std::runtime_error(msg);
+        }
+        return ptr;
+    }
+
+    sol::table getTypeToPackageTable(lua_State* L)
+    {
+        constexpr std::string_view key = "typeToPackage";
+        sol::state_view lua(L);
+        if (lua[key] == sol::nil)
+            lua[key] = sol::table(lua, sol::create);
+        return lua[key];
+    }
+
+    sol::table getPackageToTypeTable(lua_State* L)
+    {
+        constexpr std::string_view key = "packageToType";
+        sol::state_view lua(L);
+        if (lua[key] == sol::nil)
+            lua[key] = sol::table(lua, sol::create);
+        return lua[key];
+    }
+
+    sol::table initTypesPackage(const Context& context)
+    {
+        auto* lua = context.mLua;
+        sol::table types(lua->sol(), sol::create);
+        auto addType = [&](std::string_view name, std::vector<ESM::RecNameInts> recTypes,
+                           std::optional<std::string_view> base = std::nullopt) -> sol::table
+        {
+            sol::table t(lua->sol(), sol::create);
+            sol::table ro = LuaUtil::makeReadOnly(t);
+            sol::table meta = ro[sol::metatable_key];
+            meta[sol::meta_function::to_string] = [name]() { return name; };
+            if (base)
+            {
+                t["baseType"] = types[*base];
+                sol::table baseMeta(lua->sol(), sol::create);
+                baseMeta[sol::meta_function::index] = LuaUtil::getMutableFromReadOnly(types[*base]);
+                t[sol::metatable_key] = baseMeta;
+            }
+            t["objectIsInstance"] = [types=recTypes](const Object& o)
+            {
+                unsigned int type = o.ptr().getLuaType();
+                for (ESM::RecNameInts t : types)
+                    if (t == type)
+                        return true;
+                return false;
+            };
+            types[name] = ro;
+            return t;
+        };
+
+        addActorBindings(addType(ObjectTypeName::Actor, {ESM::REC_INTERNAL_PLAYER, ESM::REC_CREA, ESM::REC_NPC_}), context);
+        addType(ObjectTypeName::Item, {ESM::REC_ARMO, ESM::REC_BOOK, ESM::REC_CLOT, ESM::REC_INGR,
+                                       ESM::REC_LIGH, ESM::REC_MISC, ESM::REC_ALCH, ESM::REC_WEAP,
+                                       ESM::REC_APPA, ESM::REC_LOCK, ESM::REC_PROB, ESM::REC_REPA});
+
+        addType(ObjectTypeName::Creature, {ESM::REC_CREA}, ObjectTypeName::Actor);
+        addType(ObjectTypeName::NPC, {ESM::REC_INTERNAL_PLAYER, ESM::REC_NPC_}, ObjectTypeName::Actor);
+        addType(ObjectTypeName::Player, {ESM::REC_INTERNAL_PLAYER}, ObjectTypeName::NPC);
+
+        addType(ObjectTypeName::Armor, {ESM::REC_ARMO}, ObjectTypeName::Item);
+        addType(ObjectTypeName::Book, {ESM::REC_BOOK}, ObjectTypeName::Item);
+        addType(ObjectTypeName::Clothing, {ESM::REC_CLOT}, ObjectTypeName::Item);
+        addType(ObjectTypeName::Ingredient, {ESM::REC_INGR}, ObjectTypeName::Item);
+        addType(ObjectTypeName::Light, {ESM::REC_LIGH}, ObjectTypeName::Item);
+        addType(ObjectTypeName::MiscItem, {ESM::REC_MISC}, ObjectTypeName::Item);
+        addType(ObjectTypeName::Potion, {ESM::REC_ALCH}, ObjectTypeName::Item);
+        addType(ObjectTypeName::Weapon, {ESM::REC_WEAP}, ObjectTypeName::Item);
+        addType(ObjectTypeName::Apparatus, {ESM::REC_APPA}, ObjectTypeName::Item);
+        addType(ObjectTypeName::Lockpick, {ESM::REC_LOCK}, ObjectTypeName::Item);
+        addType(ObjectTypeName::Probe, {ESM::REC_PROB}, ObjectTypeName::Item);
+        addType(ObjectTypeName::Repair, {ESM::REC_REPA}, ObjectTypeName::Item);
+
+        addType(ObjectTypeName::Activator, {ESM::REC_ACTI});
+        addType(ObjectTypeName::Container, {ESM::REC_CONT});
+        addDoorBindings(addType(ObjectTypeName::Door, {ESM::REC_DOOR}), context);
+        addType(ObjectTypeName::Static, {ESM::REC_STAT});
+
+        sol::table typeToPackage = getTypeToPackageTable(context.mLua->sol());
+        sol::table packageToType = getPackageToTypeTable(context.mLua->sol());
+        for (const auto& [type, v] : luaObjectTypeInfo)
+        {
+            sol::object t = types[v.mName];
+            if (t == sol::nil)
+                continue;
+            typeToPackage[type] = t;
+            packageToType[t] = type;
+        }
+
+        return LuaUtil::makeReadOnly(types);
+    }
+}
diff --git a/apps/openmw/mwlua/types/types.hpp b/apps/openmw/mwlua/types/types.hpp
index 20fd208462..63d3cb4db5 100644
--- a/apps/openmw/mwlua/types/types.hpp
+++ b/apps/openmw/mwlua/types/types.hpp
@@ -3,10 +3,27 @@
 
 #include <sol/sol.hpp>
 
+#include <components/esm/defs.hpp>
+#include <components/esm/luascripts.hpp>
+
 #include "../context.hpp"
 
 namespace MWLua
 {
+    std::string_view getLuaObjectTypeName(ESM::RecNameInts type, std::string_view fallback = "Unknown");
+    std::string_view getLuaObjectTypeName(const MWWorld::Ptr& ptr);
+    const MWWorld::Ptr& verifyType(ESM::RecNameInts type, const MWWorld::Ptr& ptr);
+
+    sol::table getTypeToPackageTable(lua_State* L);
+    sol::table getPackageToTypeTable(lua_State* L);
+
+    // Each script has a set of flags that controls to which objects the script should be
+    // automatically attached. This function maps each object types to one of the flags. 
+    ESM::LuaScriptCfg::Flags getLuaScriptFlag(const MWWorld::Ptr& ptr);
+
+    sol::table initTypesPackage(const Context& context);
+
+    // used in initTypesPackage
     void addDoorBindings(sol::table door, const Context& context);
     void addActorBindings(sol::table actor, const Context& context);
 }
diff --git a/apps/openmw/mwworld/ptr.hpp b/apps/openmw/mwworld/ptr.hpp
index 4dbdfa5545..33e062df90 100644
--- a/apps/openmw/mwworld/ptr.hpp
+++ b/apps/openmw/mwworld/ptr.hpp
@@ -47,6 +47,23 @@ namespace MWWorld
                 throw std::runtime_error("Can't get type name from an empty object.");
             }
 
+            // `getType()` is not exactly what we usually mean by "type" because some refids have special meaning.
+            // This function handles these special refids (and by this adds some performance overhead).
+            // We use this "fixed" type in Lua because we don't want to expose the weirdness of Morrowind internals to our API.
+            // TODO: Implement https://gitlab.com/OpenMW/openmw/-/issues/6617 and make `getType` work the same as `getLuaType`.
+            unsigned int getLuaType() const
+            {
+                if(mRef == nullptr)
+                    throw std::runtime_error("Can't get type name from an empty object.");
+                std::string_view id = mRef->mRef.getRefId();
+                if (id == "player")
+                    return ESM::REC_INTERNAL_PLAYER;
+                else if (id == "prisonmarker" || id == "divinemarker" || id == "templemarker" || id == "northmarker")
+                    return ESM::REC_INTERNAL_MARKER;
+                else
+                    return mRef->getType();
+            }
+
             std::string_view getTypeDescription() const
             {
                 return mRef ? mRef->getTypeDescription() : "nullptr";
diff --git a/components/esm/defs.hpp b/components/esm/defs.hpp
index f587fc6690..45a8cf0f56 100644
--- a/components/esm/defs.hpp
+++ b/components/esm/defs.hpp
@@ -94,6 +94,11 @@ constexpr unsigned int fourCC(const char(&name)[len]) {
 
 enum RecNameInts : unsigned int
 {
+    // Special values. Can not be used in any ESM.
+    // Added to this enum to guarantee that the values don't collide with any records.
+    REC_INTERNAL_PLAYER = 0,
+    REC_INTERNAL_MARKER = 1,
+
     // format 0 / legacy
     REC_ACTI = fourCC("ACTI"),
     REC_ALCH = fourCC("ALCH"),

From 43bed7f0d2add7ccdd51a8cfad40b868b1dc1c08 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Thu, 10 Mar 2022 00:31:44 +0100
Subject: [PATCH 2197/2859] [Lua] Split obj.inventory into Actor.inventory(obj)
 and Container.content(obj)

---
 apps/openmw/CMakeLists.txt            |  2 +-
 apps/openmw/mwlua/luamanagerimp.cpp   |  1 +
 apps/openmw/mwlua/object.hpp          |  3 +++
 apps/openmw/mwlua/objectbindings.cpp  | 12 ++----------
 apps/openmw/mwlua/types/actor.cpp     | 12 ++++++------
 apps/openmw/mwlua/types/container.cpp | 18 ++++++++++++++++++
 apps/openmw/mwlua/types/types.cpp     |  2 +-
 apps/openmw/mwlua/types/types.hpp     |  1 +
 8 files changed, 33 insertions(+), 18 deletions(-)
 create mode 100644 apps/openmw/mwlua/types/container.cpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 6b439bde80..c29b33b28c 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -60,7 +60,7 @@ add_openmw_dir (mwlua
     luamanagerimp actions object worldview userdataserializer eventqueue query
     luabindings localscripts playerscripts objectbindings cellbindings asyncbindings settingsbindings
     camerabindings uibindings inputbindings nearbybindings
-    types/types types/door types/actor
+    types/types types/door types/actor types/container
     )
 
 add_openmw_dir (mwsound
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 5b21d46427..9c5c210e4d 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -391,6 +391,7 @@ namespace MWLua
     {
         assert(mInitialized);
         assert(flag != ESM::LuaScriptCfg::sGlobal);
+        assert(ptr.getType() != ESM::REC_STAT);
         std::shared_ptr<LocalScripts> scripts;
         if (flag == ESM::LuaScriptCfg::sPlayer)
         {
diff --git a/apps/openmw/mwlua/object.hpp b/apps/openmw/mwlua/object.hpp
index 1685d7506d..499c21c7e7 100644
--- a/apps/openmw/mwlua/object.hpp
+++ b/apps/openmw/mwlua/object.hpp
@@ -118,6 +118,9 @@ namespace MWLua
     using GObjectList = ObjectList<GObject>;
     using LObjectList = ObjectList<LObject>;
 
+    template <typename Obj>
+    struct Inventory { Obj mObj; };
+
 }
 
 #endif  // MWLUA_OBJECT_H
diff --git a/apps/openmw/mwlua/objectbindings.cpp b/apps/openmw/mwlua/objectbindings.cpp
index 092a8d5151..6bcf355fde 100644
--- a/apps/openmw/mwlua/objectbindings.cpp
+++ b/apps/openmw/mwlua/objectbindings.cpp
@@ -12,15 +12,6 @@
 #include "luamanagerimp.hpp"
 #include "types/types.hpp"
 
-namespace MWLua
-{
-    template <typename ObjectT>
-    struct Inventory
-    {
-        ObjectT mObj;
-    };
-}
-
 namespace sol
 {
     template <>
@@ -149,6 +140,8 @@ namespace MWLua
                         throw std::runtime_error("Unknown script: " + std::string(path));
                     if (!(cfg[*scriptId].mFlags & ESM::LuaScriptCfg::sCustom))
                         throw std::runtime_error("Script without CUSTOM tag can not be added dynamically: " + std::string(path));
+                    if (object.ptr().getType() == ESM::REC_STAT)
+                        throw std::runtime_error("Attaching scripts to Static is not allowed: " + std::string(path));
                     luaManager->addCustomLocalScript(object.ptr(), *scriptId);
                 };
                 objectT["hasScript"] = [lua=context.mLua](const GObject& object, std::string_view path)
@@ -200,7 +193,6 @@ namespace MWLua
             using InventoryT = Inventory<ObjectT>;
             sol::usertype<InventoryT> inventoryT = context.mLua->sol().new_usertype<InventoryT>(prefix + "Inventory");
 
-            objectT["inventory"] = sol::readonly_property([](const ObjectT& o) { return InventoryT{o}; });
             inventoryT[sol::meta_function::to_string] =
                 [](const InventoryT& inv) { return "Inventory[" + inv.mObj.toString() + "]"; };
 
diff --git a/apps/openmw/mwlua/types/actor.cpp b/apps/openmw/mwlua/types/actor.cpp
index ba2c05a52d..d620472095 100644
--- a/apps/openmw/mwlua/types/actor.cpp
+++ b/apps/openmw/mwlua/types/actor.cpp
@@ -83,7 +83,11 @@ namespace MWLua
             return MWBase::Environment::get().getWorld()->isSwimming(o.ptr());
         };
 
-        actor["getEquipment"] = [context](const Object& o)
+        actor["inventory"] = sol::overload(
+            [](const LObject& o) { return Inventory<LObject>{o}; },
+            [](const GObject& o) { return Inventory<GObject>{o}; }
+        );
+        actor["equipment"] = [context](const Object& o)
         {
             const MWWorld::Ptr& ptr = o.ptr();
             sol::table equipment(context.mLua->sol(), sol::create);
@@ -109,12 +113,8 @@ namespace MWLua
             MWWorld::InventoryStore& store = ptr.getClass().getInventoryStore(ptr);
             return store.isEquipped(item.ptr());
         };
-        actor["setEquipment"] = [context](const sol::object& luaObj, const sol::table& equipment)
+        actor["setEquipment"] = [context](const SelfObject& obj, const sol::table& equipment)
         {
-            if (!luaObj.is<GObject>() && !luaObj.is<SelfObject>())
-                throw std::runtime_error("Incorrect type of the first argument. "
-                                         "Can be either self (in local scripts) or game object (in global scripts)");
-            const Object& obj = luaObj.as<Object>();
             if (!obj.ptr().getClass().hasInventoryStore(obj.ptr()))
             {
                 if (!equipment.empty())
diff --git a/apps/openmw/mwlua/types/container.cpp b/apps/openmw/mwlua/types/container.cpp
new file mode 100644
index 0000000000..b603b6d3f4
--- /dev/null
+++ b/apps/openmw/mwlua/types/container.cpp
@@ -0,0 +1,18 @@
+#include "types.hpp"
+
+#include "../luabindings.hpp"
+
+namespace MWLua
+{
+
+    static const MWWorld::Ptr& containerPtr(const Object& o) { return verifyType(ESM::REC_CONT, o.ptr()); }
+
+    void addContainerBindings(sol::table container, const Context& context)
+    {
+        container["content"] = sol::overload(
+            [](const LObject& o) { containerPtr(o); return Inventory<LObject>{o}; },
+            [](const GObject& o) { containerPtr(o); return Inventory<GObject>{o}; }
+        );
+    }
+
+}
diff --git a/apps/openmw/mwlua/types/types.cpp b/apps/openmw/mwlua/types/types.cpp
index f91400d5ea..556c13963f 100644
--- a/apps/openmw/mwlua/types/types.cpp
+++ b/apps/openmw/mwlua/types/types.cpp
@@ -173,7 +173,7 @@ namespace MWLua
         addType(ObjectTypeName::Repair, {ESM::REC_REPA}, ObjectTypeName::Item);
 
         addType(ObjectTypeName::Activator, {ESM::REC_ACTI});
-        addType(ObjectTypeName::Container, {ESM::REC_CONT});
+        addContainerBindings(addType(ObjectTypeName::Container, {ESM::REC_CONT}), context);
         addDoorBindings(addType(ObjectTypeName::Door, {ESM::REC_DOOR}), context);
         addType(ObjectTypeName::Static, {ESM::REC_STAT});
 
diff --git a/apps/openmw/mwlua/types/types.hpp b/apps/openmw/mwlua/types/types.hpp
index 63d3cb4db5..966e32ccf2 100644
--- a/apps/openmw/mwlua/types/types.hpp
+++ b/apps/openmw/mwlua/types/types.hpp
@@ -24,6 +24,7 @@ namespace MWLua
     sol::table initTypesPackage(const Context& context);
 
     // used in initTypesPackage
+    void addContainerBindings(sol::table door, const Context& context);
     void addDoorBindings(sol::table door, const Context& context);
     void addActorBindings(sol::table actor, const Context& context);
 }

From 0f84bfde51ce9cd8ec9036486c183eab732ec727 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sat, 5 Mar 2022 19:53:39 +0100
Subject: [PATCH 2198/2859] [Lua] Replace cell.selectObjects with cell.getAll

---
 apps/openmw/mwlua/cellbindings.cpp | 60 +++++++++++++++++++++++++++++-
 1 file changed, 58 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwlua/cellbindings.cpp b/apps/openmw/mwlua/cellbindings.cpp
index dbcbbab644..3d0c4d26df 100644
--- a/apps/openmw/mwlua/cellbindings.cpp
+++ b/apps/openmw/mwlua/cellbindings.cpp
@@ -3,6 +3,7 @@
 #include <components/esm3/loadcell.hpp>
 
 #include "../mwworld/cellstore.hpp"
+#include "types/types.hpp"
 
 namespace sol
 {
@@ -50,9 +51,64 @@ namespace MWLua
         
         if constexpr (std::is_same_v<CellT, GCell>)
         {  // only for global scripts
-            cellT["selectObjects"] = [context](const CellT& cell, const Queries::Query& query)
+            cellT["getAll"] = [worldView=context.mWorldView, ids=getPackageToTypeTable(context.mLua->sol())](
+                const CellT& cell, sol::optional<sol::table> type)
             {
-                return GObjectList{selectObjectsFromCellStore(query, cell.mStore, context)};
+                ObjectIdList res = std::make_shared<std::vector<ObjectId>>();
+                auto visitor = [&](const MWWorld::Ptr& ptr)
+                {
+                    worldView->getObjectRegistry()->registerPtr(ptr);
+                    if (ptr.getLuaType() == ptr.getType())
+                        res->push_back(getId(ptr));
+                    return true;
+                };
+
+                bool ok = false;
+                sol::optional<uint32_t> typeId = sol::nullopt;
+                if (type.has_value())
+                    typeId = ids[*type];
+                else
+                {
+                    ok = true;
+                    cell.mStore->forEach(std::move(visitor));
+                }
+                if (typeId.has_value())
+                {
+                    ok = true;
+                    switch (*typeId)
+                    {
+                        case ESM::REC_INTERNAL_PLAYER:
+                            {
+                                MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
+                                if (player.getCell() == cell.mStore)
+                                    res->push_back(getId(player));
+                            }
+                            break;
+
+                        case ESM::REC_CREA: cell.mStore->template forEachType<ESM::Creature>(visitor); break;
+                        case ESM::REC_NPC_: cell.mStore->template forEachType<ESM::NPC>(visitor); break;
+                        case ESM::REC_ACTI: cell.mStore->template forEachType<ESM::Activator>(visitor); break;
+                        case ESM::REC_DOOR: cell.mStore->template forEachType<ESM::Door>(visitor); break;
+                        case ESM::REC_CONT: cell.mStore->template forEachType<ESM::Container>(visitor); break;
+
+                        case ESM::REC_ALCH: cell.mStore->template forEachType<ESM::Potion>(visitor); break;
+                        case ESM::REC_ARMO: cell.mStore->template forEachType<ESM::Armor>(visitor); break;
+                        case ESM::REC_BOOK: cell.mStore->template forEachType<ESM::Book>(visitor); break;
+                        case ESM::REC_CLOT: cell.mStore->template forEachType<ESM::Clothing>(visitor); break;
+                        case ESM::REC_INGR: cell.mStore->template forEachType<ESM::Ingredient>(visitor); break;
+                        case ESM::REC_LIGH: cell.mStore->template forEachType<ESM::Light>(visitor); break;
+                        case ESM::REC_MISC: cell.mStore->template forEachType<ESM::Miscellaneous>(visitor); break;
+                        case ESM::REC_WEAP: cell.mStore->template forEachType<ESM::Weapon>(visitor); break;
+                        case ESM::REC_APPA: cell.mStore->template forEachType<ESM::Apparatus>(visitor); break;
+                        case ESM::REC_LOCK: cell.mStore->template forEachType<ESM::Lockpick>(visitor); break;
+                        case ESM::REC_PROB: cell.mStore->template forEachType<ESM::Probe>(visitor); break;
+                        case ESM::REC_REPA: cell.mStore->template forEachType<ESM::Repair>(visitor); break;
+                        default: ok = false;
+                    }
+                }
+                if (!ok)
+                    throw std::runtime_error(std::string("Incorrect type argument in cell:getAll: " + LuaUtil::toString(*type)));
+                return GObjectList{res};
             };
         }
     }

From 9af49cfa687f775c561ff071d6c4be86de29c72c Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 13 Mar 2022 00:38:36 +0100
Subject: [PATCH 2199/2859] [Lua] Update documentation

---
 docs/source/reference/lua-scripting/api.rst   |   3 +
 .../reference/lua-scripting/openmw_types.rst  |   5 +
 .../reference/lua-scripting/overview.rst      |   2 +
 files/lua_api/CMakeLists.txt                  |   1 +
 files/lua_api/openmw/core.lua                 | 161 +------
 files/lua_api/openmw/types.lua                | 456 ++++++++++++++++++
 6 files changed, 483 insertions(+), 145 deletions(-)
 create mode 100644 docs/source/reference/lua-scripting/openmw_types.rst
 create mode 100644 files/lua_api/openmw/types.lua

diff --git a/docs/source/reference/lua-scripting/api.rst b/docs/source/reference/lua-scripting/api.rst
index 0681c63dea..4518028073 100644
--- a/docs/source/reference/lua-scripting/api.rst
+++ b/docs/source/reference/lua-scripting/api.rst
@@ -12,6 +12,7 @@ Lua API reference
     openmw_util
     openmw_storage
     openmw_core
+    openmw_types
     openmw_async
     openmw_query
     openmw_world
@@ -56,6 +57,8 @@ Player scripts are local scripts that are attached to a player.
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.core <Package openmw.core>`                 | everywhere         | | Functions that are common for both global and local scripts |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.types <Package openmw.types>`               | everywhere         | | Functions for specific types of game objects.               |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.async <Package openmw.async>`               | everywhere         | | Timers (implemented) and coroutine utils (not implemented)  |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.query <Package openmw.query>`               | everywhere         | | Tools for constructing queries: base queries and fields.    |
diff --git a/docs/source/reference/lua-scripting/openmw_types.rst b/docs/source/reference/lua-scripting/openmw_types.rst
new file mode 100644
index 0000000000..1819b1a6ce
--- /dev/null
+++ b/docs/source/reference/lua-scripting/openmw_types.rst
@@ -0,0 +1,5 @@
+Package openmw.types
+====================
+
+.. raw:: html
+   :file: generated_html/openmw_types.html
diff --git a/docs/source/reference/lua-scripting/overview.rst b/docs/source/reference/lua-scripting/overview.rst
index 8fa255bac0..a819235e2a 100644
--- a/docs/source/reference/lua-scripting/overview.rst
+++ b/docs/source/reference/lua-scripting/overview.rst
@@ -353,6 +353,8 @@ Player scripts are local scripts that are attached to a player.
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.core <Package openmw.core>`                 | everywhere         | | Functions that are common for both global and local scripts |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.types <Package openmw.types>`               | everywhere         | | Functions for specific types of game objects.               |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.async <Package openmw.async>`               | everywhere         | | Timers (implemented) and coroutine utils (not implemented)  |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.query <Package openmw.query>`               | everywhere         | | Tools for constructing queries: base queries and fields.    |
diff --git a/files/lua_api/CMakeLists.txt b/files/lua_api/CMakeLists.txt
index 8c5b46e8db..2988f38552 100644
--- a/files/lua_api/CMakeLists.txt
+++ b/files/lua_api/CMakeLists.txt
@@ -13,6 +13,7 @@ set(LUA_API_FILES
     openmw/ui.lua
     openmw/util.lua
     openmw/world.lua
+    openmw/types.lua
 )
 
 foreach (f ${LUA_API_FILES})
diff --git a/files/lua_api/openmw/core.lua b/files/lua_api/openmw/core.lua
index d57b6a405e..afb0d2f5bb 100644
--- a/files/lua_api/openmw/core.lua
+++ b/files/lua_api/openmw/core.lua
@@ -86,59 +86,6 @@
 -- print( myMsg('Hello %{name}!', {name='World'}) )
 
 
----
--- @type OBJECT_TYPE
--- @field #string Activator "Activator"
--- @field #string Armor "Armor"
--- @field #string Book "Book"
--- @field #string Clothing "Clothing"
--- @field #string Container "Container"
--- @field #string Creature "Creature"
--- @field #string Door "Door"
--- @field #string Ingredient "Ingredient"
--- @field #string Light "Light"
--- @field #string Miscellaneous "Miscellaneous"
--- @field #string NPC "NPC"
--- @field #string Player "Player"
--- @field #string Potion "Potion"
--- @field #string Static "Static"
--- @field #string Apparatus "Apparatus"
--- @field #string Lockpick "Lockpick"
--- @field #string Probe "Probe"
--- @field #string Repair "Repair"
-
----
--- Possible `object.type` values.
--- @field [parent=#core] #OBJECT_TYPE OBJECT_TYPE
-
-
----
--- @type EQUIPMENT_SLOT
--- @field #number Helmet
--- @field #number Cuirass
--- @field #number Greaves
--- @field #number LeftPauldron
--- @field #number RightPauldron
--- @field #number LeftGauntlet
--- @field #number RightGauntlet
--- @field #number Boots
--- @field #number Shirt
--- @field #number Pants
--- @field #number Skirt
--- @field #number Robe
--- @field #number LeftRing
--- @field #number RightRing
--- @field #number Amulet
--- @field #number Belt
--- @field #number CarriedRight
--- @field #number CarriedLeft
--- @field #number Ammunition
-
----
--- Available equipment slots. Used in `object:getEquipment` and `object:setEquipment`.
--- @field [parent=#core] #EQUIPMENT_SLOT EQUIPMENT_SLOT
-
-
 ---
 -- Any object that exists in the game world and has a specific location.
 -- Player, actors, items, and statics are game objects.
@@ -146,73 +93,18 @@
 -- @field openmw.util#Vector3 position Object position.
 -- @field openmw.util#Vector3 rotation Object rotation (ZXY order).
 -- @field #Cell cell The cell where the object currently is. During loading a game and for objects in an inventory or a container `cell` is nil.
--- @field #string type Type of the object (see @{openmw.core#OBJECT_TYPE}).
--- @field #number count Count (makes sense if holded in a container).
+-- @field #table type Type of the object (one of the tables from the package @{openmw.types#types}).
+-- @field #number count Count (makes sense if stored in a container).
 -- @field #string recordId Record ID.
--- @field #Inventory inventory Inventory of an Player/NPC or content of an container.
--- @field #boolean isTeleport `True` if it is a teleport door (only if `object.type` == "Door").
--- @field openmw.util#Vector3 destPosition Destination (only if a teleport door).
--- @field openmw.util#Vector3 destRotation Destination rotation (only if a teleport door).
--- @field #string destCell Destination cell (only if a teleport door).
 
 ---
--- Is the object still exists/available.
+-- Does the object still exist and is available.
 -- Returns true if the object exists and loaded, and false otherwise. If false, then every
 -- access to the object will raise an error.
 -- @function [parent=#GameObject] isValid
 -- @param self
 -- @return #boolean
 
----
--- Returns true if the object is an actor and is able to move. For dead, paralized,
--- or knocked down actors in returns false.
--- access to the object will raise an error.
--- @function [parent=#GameObject] canMove
--- @param self
--- @return #boolean
-
----
--- Speed of running. Returns 0 if not an actor, but for dead actors it still returns a positive value.
--- @function [parent=#GameObject] getRunSpeed
--- @param self
--- @return #number
-
----
--- Speed of walking. Returns 0 if not an actor, but for dead actors it still returns a positive value.
--- @function [parent=#GameObject] getWalkSpeed
--- @param self
--- @return #number
-
----
--- Current speed. Can be called only from a local script.
--- @function [parent=#GameObject] getCurrentSpeed
--- @param self
--- @return #number
-
----
--- Is the actor standing on ground. Can be called only from a local script.
--- @function [parent=#GameObject] isOnGround
--- @param self
--- @return #boolean
-
----
--- Is the actor in water. Can be called only from a local script.
--- @function [parent=#GameObject] isSwimming
--- @param self
--- @return #boolean
-
----
--- Is the actor in weapon stance. Can be called only from a local script.
--- @function [parent=#GameObject] isInWeaponStance
--- @param self
--- @return #boolean
-
----
--- Is the actor in magic stance. Can be called only from a local script.
--- @function [parent=#GameObject] isInMagicStance
--- @param self
--- @return #boolean
-
 ---
 -- Send local event to the object.
 -- @function [parent=#GameObject] sendEvent
@@ -228,36 +120,10 @@
 -- @usage local self = require('openmw.self')
 -- object:activateBy(self)
 
----
--- Returns `true` if the item is equipped on the object.
--- @function [parent=#GameObject] isEquipped
--- @param self
--- @param #GameObject item
--- @return #boolean
-
----
--- Get equipment.
--- Returns a table `slot` -> `GameObject` of currently equipped items.
--- See @{openmw.core#EQUIPMENT_SLOT}. Returns empty table if the object doesn't have
--- equipment slots.
--- @function [parent=#GameObject] getEquipment
--- @param self
--- @return #map<#number,#GameObject>
-
----
--- Set equipment.
--- Keys in the table are equipment slots (see @{openmw.core#EQUIPMENT_SLOT}). Each
--- value can be either a `GameObject` or recordId. Raises an error if
--- the object doesn't have equipment slots and table is not empty. Can be
--- called only on self or from a global script.
--- @function [parent=#GameObject] setEquipment
--- @param self
--- @param equipment
-
 ---
 -- Add new local script to the object.
 -- Can be called only from a global script. Script should be specified in a content
--- file (omwgame/omwaddon/omwscripts) with a CUSTOM flag.
+-- file (omwgame/omwaddon/omwscripts) with a CUSTOM flag. Scripts can not be attached to Statics.
 -- @function [parent=#GameObject] addScript
 -- @param self
 -- @param #string scriptPath Path to the script in OpenMW virtual filesystem.
@@ -325,12 +191,15 @@
 -- end
 
 ---
--- Select objects from the cell with a Query (only in global scripts).
--- Returns an empty list if the cell is not loaded.
--- @function [parent=#Cell] selectObjects
+-- Get all objects of given type from the cell.
+-- @function [parent=#Cell] getAll
 -- @param self
--- @param openmw.query#Query query
+-- @param type (optional) object type (see @{openmw.types#types})
 -- @return #ObjectList
+-- @usage
+-- local type = require('openmw.types')
+-- local all = cell:getAll()
+-- local weapons = cell:getAll(types.Weapon)
 
 
 ---
@@ -348,10 +217,12 @@
 -- Get all items of given type from the inventory.
 -- @function [parent=#Inventory] getAll
 -- @param self
--- @param type (optional) items type (see @{openmw.core#OBJECT_TYPE})
+-- @param type (optional) items type (see @{openmw.types#types})
 -- @return #ObjectList
--- @usage local all = inventory:getAll()
--- local weapons = inventory:getAll(core.OBJECT_TYPE.Weapon)
+-- @usage
+-- local type = require('openmw.types')
+-- local all = inventory:getAll()
+-- local weapons = inventory:getAll(types.Weapon)
 
 
 return nil
diff --git a/files/lua_api/openmw/types.lua b/files/lua_api/openmw/types.lua
new file mode 100644
index 0000000000..82dbded2e8
--- /dev/null
+++ b/files/lua_api/openmw/types.lua
@@ -0,0 +1,456 @@
+---
+-- `openmw.types` defines functions for specific types of game objects.
+-- @module types
+-- @usage local types = require('openmw.types')
+
+--- Common @{#Actor} functions for Creature, NPC, and Player.
+-- @field [parent=#types] #Actor Actor
+
+--- Common functions for Creature, NPC, and Player.
+-- @type Actor
+
+---
+-- Whether the object is an actor.
+-- @function [parent=#Actor] objectIsInstance
+-- @param openmw.core#GameObject object
+-- @return #boolean
+
+---
+-- Actor inventory.
+-- @function [parent=#Actor] inventory
+-- @param openmw.core#GameObject actor
+-- @return openmw.core#Inventory
+
+---
+-- @type EQUIPMENT_SLOT
+-- @field #number Helmet
+-- @field #number Cuirass
+-- @field #number Greaves
+-- @field #number LeftPauldron
+-- @field #number RightPauldron
+-- @field #number LeftGauntlet
+-- @field #number RightGauntlet
+-- @field #number Boots
+-- @field #number Shirt
+-- @field #number Pants
+-- @field #number Skirt
+-- @field #number Robe
+-- @field #number LeftRing
+-- @field #number RightRing
+-- @field #number Amulet
+-- @field #number Belt
+-- @field #number CarriedRight
+-- @field #number CarriedLeft
+-- @field #number Ammunition
+
+---
+-- Available @{#EQUIPMENT_SLOT} values. Used in `Actor.equipment(obj)` and `Actor.setEquipment(obj, eqp)`.
+-- @field [parent=#Actor] #EQUIPMENT_SLOT EQUIPMENT_SLOT
+
+---
+-- @type STANCE
+-- @field #number Nothing Default stance
+-- @field #number Weapon Weapon stance
+-- @field #number Spell Magic stance
+
+--- @{#STANCE}
+-- @field [parent=#Actor] #STANCE STANCE
+
+---
+-- Returns true if the object is an actor and is able to move. For dead, paralyzed,
+-- or knocked down actors it returns false.
+-- @function [parent=#Actor] canMove
+-- @param openmw.core#GameObject object
+-- @return #boolean
+
+---
+-- Speed of running. For dead actors it still returns a positive value.
+-- @function [parent=#Actor] runSpeed
+-- @param openmw.core#GameObject actor
+-- @return #number
+
+---
+-- Speed of walking. For dead actors it still returns a positive value.
+-- @function [parent=#Actor] walkSpeed
+-- @param openmw.core#GameObject actor
+-- @return #number
+
+---
+-- Current speed.
+-- @function [parent=#Actor] currentSpeed
+-- @param openmw.core#GameObject actor
+-- @return #number
+
+---
+-- Is the actor standing on ground. Can be called only from a local script.
+-- @function [parent=#Actor] isOnGround
+-- @param openmw.core#GameObject actor
+-- @return #boolean
+
+---
+-- Is the actor in water. Can be called only from a local script.
+-- @function [parent=#Actor] isSwimming
+-- @param openmw.core#GameObject actor
+-- @return #boolean
+
+---
+-- Returns the current stance (whether a weapon/spell is readied), see the list of @{#STANCE} values.
+-- @function [parent=#Actor] stance
+-- @param openmw.core#GameObject actor
+-- @return #number
+
+---
+-- Returns `true` if the item is equipped on the actor.
+-- @function [parent=#Actor] isEquipped
+-- @param openmw.core#GameObject actor
+-- @param openmw.core#GameObject item
+-- @return #boolean
+
+---
+-- Get equipment.
+-- Returns a table `slot` -> @{openmw.core#GameObject} of currently equipped items.
+-- See @{#EQUIPMENT_SLOT}. Returns empty table if the actor doesn't have
+-- equipment slots.
+-- @function [parent=#Actor] equipment
+-- @param openmw.core#GameObject actor
+-- @return #map<#number,openmw.core#GameObject>
+
+---
+-- Set equipment.
+-- Keys in the table are equipment slots (see @{#EQUIPMENT_SLOT}). Each
+-- value can be either a `GameObject` or recordId. Raises an error if
+-- the actor doesn't have equipment slots and table is not empty. Can be
+-- used only in local scripts and only on self.
+-- @function [parent=#Actor] setEquipment
+-- @param openmw.core#GameObject actor
+-- @param equipment
+-- @usage local self = require('openmw.self')
+-- local Actor = require('openmw.types').Actor
+-- Actor.setEquipment(self, {}) -- unequip all
+
+
+
+--- @{#Item} functions (all pickable items that can be placed to an inventory or container)
+-- @field [parent=#types] #Item Item
+
+--- Functions for pickable items that can be placed to an inventory or container
+-- @type Item
+
+---
+-- Whether the object is an item.
+-- @function [parent=#Item] objectIsInstance
+-- @param openmw.core#GameObject object
+-- @return #boolean
+
+
+
+--- @{#Creature} functions
+-- @field [parent=#types] #Creature Creature
+
+---
+-- @type Creature
+-- @extends #Actor
+-- @field #Actor baseType @{#Actor}
+
+---
+-- Whether the object is a creature.
+-- @function [parent=#Creature] objectIsInstance
+-- @param openmw.core#GameObject object
+-- @return #boolean
+
+
+
+--- @{#NPC} functions
+-- @field [parent=#types] #NPC NPC
+
+---
+-- @type NPC
+-- @extends #Actor
+-- @field #Actor baseType @{#Actor}
+
+---
+-- Whether the object is an NPC or a Player.
+-- @function [parent=#NPC] objectIsInstance
+-- @param openmw.core#GameObject object
+-- @return #boolean
+
+
+
+--- @{#Player} functions
+-- @field [parent=#types] #Player Player
+
+---
+-- @type Player
+-- @extends #NPC
+-- @field #NPC baseType @{#NPC}
+
+---
+-- Whether the object is a player.
+-- @function [parent=#Player] objectIsInstance
+-- @param openmw.core#GameObject object
+-- @return #boolean
+
+
+
+--- @{#Armor} functions
+-- @field [parent=#types] #Armor Armor
+
+---
+-- @type Armor
+-- @extends #Item
+-- @field #Item baseType @{#Item}
+
+---
+-- Whether the object is an Armor.
+-- @function [parent=#Armor] objectIsInstance
+-- @param openmw.core#GameObject object
+-- @return #boolean
+
+
+
+--- @{#Book} functions
+-- @field [parent=#types] #Book Book
+
+---
+-- @type Book
+-- @extends #Item
+-- @field #Item baseType @{#Item}
+
+---
+-- Whether the object is a Book.
+-- @function [parent=#Book] objectIsInstance
+-- @param openmw.core#GameObject object
+-- @return #boolean
+
+--- @{#Clothing} functions
+
+
+-- @field [parent=#types] #Clothing Clothing
+
+---
+-- @type Clothing
+-- @extends #Item
+-- @field #Item baseType @{#Item}
+
+---
+-- Whether the object is a Clothing.
+-- @function [parent=#Clothing] objectIsInstance
+-- @param openmw.core#GameObject object
+-- @return #boolean
+
+
+
+--- @{#Ingredient} functions
+-- @field [parent=#types] #Ingredient Ingredient
+
+---
+-- @type Ingredient
+-- @extends #Item
+-- @field #Item baseType @{#Item}
+
+---
+-- Whether the object is an Ingredient.
+-- @function [parent=#Ingredient] objectIsInstance
+-- @param openmw.core#GameObject object
+-- @return #boolean
+
+
+
+--- @{#Light} functions
+-- @field [parent=#types] #Light Light
+
+---
+-- @type Light
+-- @extends #Item
+-- @field #Item baseType @{#Item}
+
+---
+-- Whether the object is a Light.
+-- @function [parent=#Light] objectIsInstance
+-- @param openmw.core#GameObject object
+-- @return #boolean
+
+
+
+--- Functions for @{#Miscellaneous} objects
+-- @field [parent=#types] #Miscellaneous Miscellaneous
+
+---
+-- @type Miscellaneous
+-- @extends #Item
+-- @field #Item baseType @{#Item}
+
+---
+-- Whether the object is a Miscellaneous.
+-- @function [parent=#Miscellaneous] objectIsInstance
+-- @param openmw.core#GameObject object
+-- @return #boolean
+
+
+
+--- @{#Potion} functions
+-- @field [parent=#types] #Potion Potion
+
+---
+-- @type Potion
+-- @extends #Item
+-- @field #Item baseType @{#Item}
+
+---
+-- Whether the object is a Potion.
+-- @function [parent=#Potion] objectIsInstance
+-- @param openmw.core#GameObject object
+-- @return #boolean
+
+
+
+--- @{#Weapon} functions
+-- @field [parent=#types] #Weapon Weapon
+
+---
+-- @type Weapon
+-- @extends #Item
+-- @field #Item baseType @{#Item}
+
+---
+-- Whether the object is a Weapon.
+-- @function [parent=#Weapon] objectIsInstance
+-- @param openmw.core#GameObject object
+-- @return #boolean
+
+--- @{#Apparatus} functions
+-- @field [parent=#types] #Apparatus Apparatus
+
+---
+-- @type Apparatus
+-- @extends #Item
+-- @field #Item baseType @{#Item}
+
+---
+-- Whether the object is an Apparatus.
+-- @function [parent=#Apparatus] objectIsInstance
+-- @param openmw.core#GameObject object
+-- @return #boolean
+
+--- @{#Lockpick} functions
+-- @field [parent=#types] #Lockpick Lockpick
+
+---
+-- @type Lockpick
+-- @extends #Item
+-- @field #Item baseType @{#Item}
+
+---
+-- Whether the object is a Lockpick.
+-- @function [parent=#Lockpick] objectIsInstance
+-- @param openmw.core#GameObject object
+-- @return #boolean
+
+--- @{#Probe} functions
+-- @field [parent=#types] #Probe Probe
+
+---
+-- @type Probe
+-- @extends #Item
+-- @field #Item baseType @{#Item}
+
+---
+-- Whether the object is a Probe.
+-- @function [parent=#Probe] objectIsInstance
+-- @param openmw.core#GameObject object
+-- @return #boolean
+
+--- @{#Repair} functions
+-- @field [parent=#types] #Repair Repair
+
+---
+-- @type Repair
+-- @extends #Item
+-- @field #Item baseType @{#Item}
+
+---
+-- Whether the object is a Repair.
+-- @function [parent=#Repair] objectIsInstance
+-- @param openmw.core#GameObject object
+-- @return #boolean
+
+--- @{#Activator} functions
+-- @field [parent=#types] #Activator Activator
+
+---
+-- @type Activator
+
+---
+-- Whether the object is an Activator.
+-- @function [parent=#Activator] objectIsInstance
+-- @param openmw.core#GameObject object
+-- @return #boolean
+
+--- @{#Container} functions
+-- @field [parent=#types] #Container Container
+
+---
+-- @type Container
+
+---
+-- Container content.
+-- @function [parent=#Container] content
+-- @param openmw.core#GameObject object
+-- @return openmw.core#Inventory
+
+---
+-- Whether the object is a Container.
+-- @function [parent=#Container] objectIsInstance
+-- @param openmw.core#GameObject object
+-- @return #boolean
+
+--- @{#Door} functions
+-- @field [parent=#types] #Door Door
+
+---
+-- @type Door
+
+---
+-- Whether the object is a Door.
+-- @function [parent=#Door] objectIsInstance
+-- @param openmw.core#GameObject object
+-- @return #boolean
+
+---
+-- Whether the door is a teleport.
+-- @function [parent=#Door] isTeleport
+-- @param openmw.core#GameObject object
+-- @return #boolean
+
+---
+-- Destination (only if a teleport door).
+-- @function [parent=#Door] destPosition
+-- @param openmw.core#GameObject object
+-- @return openmw.util#Vector3
+
+---
+-- Destination rotation (only if a teleport door).
+-- @function [parent=#Door] destRotation
+-- @param openmw.core#GameObject object
+-- @return openmw.util#Vector3
+
+---
+-- Destination cell (only if a teleport door).
+-- @function [parent=#Door] destCell
+-- @param openmw.core#GameObject object
+-- @return openmw.core#Cell
+
+--- Functions for @{#Static} objects
+-- @field [parent=#types] #Static Static
+
+---
+-- @type Static
+
+---
+-- Whether the object is a Static.
+-- @function [parent=#Static] objectIsInstance
+-- @param openmw.core#GameObject object
+-- @return #boolean
+
+return nil
+

From fa115418eb97568b118d0c0851d7b4e1bbfb44ee Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sat, 5 Mar 2022 20:11:17 +0100
Subject: [PATCH 2200/2859] [Lua] Remove queries

---
 apps/openmw/CMakeLists.txt                    |   2 +-
 apps/openmw/mwlua/luabindings.cpp             |  50 -----
 apps/openmw/mwlua/luabindings.hpp             |   4 -
 apps/openmw/mwlua/luamanagerimp.cpp           |   1 -
 apps/openmw/mwlua/nearbybindings.cpp          |  19 --
 apps/openmw/mwlua/objectbindings.cpp          |   8 +-
 apps/openmw/mwlua/query.cpp                   | 191 ------------------
 apps/openmw/mwlua/query.hpp                   |  39 ----
 apps/openmw_test_suite/CMakeLists.txt         |   1 -
 .../lua/test_querypackage.cpp                 |  29 ---
 components/CMakeLists.txt                     |   4 -
 components/queries/luabindings.cpp            | 118 -----------
 components/queries/luabindings.hpp            |   9 -
 components/queries/query.cpp                  | 185 -----------------
 components/queries/query.hpp                  |  99 ---------
 docs/source/reference/lua-scripting/api.rst   |   3 -
 .../reference/lua-scripting/openmw_query.rst  |   5 -
 .../reference/lua-scripting/overview.rst      |  94 ---------
 files/lua_api/CMakeLists.txt                  |   1 -
 files/lua_api/openmw/core.lua                 |   7 -
 files/lua_api/openmw/nearby.lua               |   6 -
 files/lua_api/openmw/query.lua                | 116 -----------
 files/lua_api/openmw/world.lua                |   6 -
 23 files changed, 2 insertions(+), 995 deletions(-)
 delete mode 100644 apps/openmw/mwlua/query.cpp
 delete mode 100644 apps/openmw/mwlua/query.hpp
 delete mode 100644 apps/openmw_test_suite/lua/test_querypackage.cpp
 delete mode 100644 components/queries/luabindings.cpp
 delete mode 100644 components/queries/luabindings.hpp
 delete mode 100644 components/queries/query.cpp
 delete mode 100644 components/queries/query.hpp
 delete mode 100644 docs/source/reference/lua-scripting/openmw_query.rst
 delete mode 100644 files/lua_api/openmw/query.lua

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index c29b33b28c..9a83a5cdb7 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -57,7 +57,7 @@ add_openmw_dir (mwscript
     )
 
 add_openmw_dir (mwlua
-    luamanagerimp actions object worldview userdataserializer eventqueue query
+    luamanagerimp actions object worldview userdataserializer eventqueue
     luabindings localscripts playerscripts objectbindings cellbindings asyncbindings settingsbindings
     camerabindings uibindings inputbindings nearbybindings
     types/types types/door types/actor types/container
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index 655c7f6989..a46435b2ca 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -2,7 +2,6 @@
 
 #include <components/lua/luastate.hpp>
 #include <components/lua/i18n.hpp>
-#include <components/queries/luabindings.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/statemanager.hpp"
@@ -90,59 +89,10 @@ namespace MWLua
                 return sol::nullopt;
         };
         api["activeActors"] = GObjectList{worldView->getActorsInScene()};
-        api["selectObjects"] = [context](const Queries::Query& query)
-        {
-            ObjectIdList list;
-            WorldView* worldView = context.mWorldView;
-            if (query.mQueryType == "activators")
-                list = worldView->getActivatorsInScene();
-            else if (query.mQueryType == "actors")
-                list = worldView->getActorsInScene();
-            else if (query.mQueryType == "containers")
-                list = worldView->getContainersInScene();
-            else if (query.mQueryType == "doors")
-                list = worldView->getDoorsInScene();
-            else if (query.mQueryType == "items")
-                list = worldView->getItemsInScene();
-            return GObjectList{selectObjectsFromList(query, list, context)};
-            // TODO: Use sqlite to search objects that are not in the scene
-            // return GObjectList{worldView->selectObjects(query, false)};
-        };
         // TODO: add world.placeNewObject(recordId, cell, pos, [rot])
         return LuaUtil::makeReadOnly(api);
     }
 
-    sol::table initQueryPackage(const Context& context)
-    {
-        Queries::registerQueryBindings(context.mLua->sol());
-        sol::table query(context.mLua->sol(), sol::create);
-        for (std::string_view t : ObjectQueryTypes::types)
-            query[t] = Queries::Query(std::string(t));
-        for (const QueryFieldGroup& group : getBasicQueryFieldGroups())
-            query[group.mName] = initFieldGroup(context, group);
-        return query;  // makeReadOnly is applied by LuaState::addCommonPackage
-    }
-
-    sol::table initFieldGroup(const Context& context, const QueryFieldGroup& group)
-    {
-        sol::table res(context.mLua->sol(), sol::create);
-        for (const Queries::Field* field : group.mFields)
-        {
-            sol::table subgroup = res;
-            if (field->path().empty())
-                throw std::logic_error("Empty path in Queries::Field");
-            for (size_t i = 0; i < field->path().size() - 1; ++i)
-            {
-                const std::string& name = field->path()[i];
-                if (subgroup[name] == sol::nil)
-                    subgroup[name] = LuaUtil::makeReadOnly(context.mLua->newTable());
-                subgroup = LuaUtil::getMutableFromReadOnly(subgroup[name]);
-            }
-            subgroup[field->path().back()] = field;
-        }
-        return LuaUtil::makeReadOnly(res);
-    }
-
     sol::table initGlobalStoragePackage(const Context& context, LuaUtil::LuaStorage* globalStorage)
     {
         sol::table res(context.mLua->sol(), sol::create);
diff --git a/apps/openmw/mwlua/luabindings.hpp b/apps/openmw/mwlua/luabindings.hpp
index f7a405b437..41bc8b29ae 100644
--- a/apps/openmw/mwlua/luabindings.hpp
+++ b/apps/openmw/mwlua/luabindings.hpp
@@ -9,7 +9,6 @@
 #include "context.hpp"
 #include "eventqueue.hpp"
 #include "object.hpp"
-#include "query.hpp"
 #include "worldview.hpp"
 
 namespace MWWorld
@@ -22,9 +21,6 @@ namespace MWLua
 
     sol::table initCorePackage(const Context&);
     sol::table initWorldPackage(const Context&);
-    sol::table initQueryPackage(const Context&);
-
-    sol::table initFieldGroup(const Context&, const QueryFieldGroup&);
 
     sol::table initGlobalStoragePackage(const Context&, LuaUtil::LuaStorage* globalStorage);
     sol::table initLocalStoragePackage(const Context&, LuaUtil::LuaStorage* globalStorage);
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 9c5c210e4d..df49862df6 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -82,7 +82,6 @@ namespace MWLua
         mLua.addCommonPackage("openmw.async", getAsyncPackageInitializer(context));
         mLua.addCommonPackage("openmw.util", LuaUtil::initUtilPackage(mLua.sol()));
         mLua.addCommonPackage("openmw.core", initCorePackage(context));
-        mLua.addCommonPackage("openmw.query", initQueryPackage(context));
         mLua.addCommonPackage("openmw.types", initTypesPackage(context));
         mGlobalScripts.addPackage("openmw.world", initWorldPackage(context));
         mGlobalScripts.addPackage("openmw.settings", initGlobalSettingsPackage(context));
diff --git a/apps/openmw/mwlua/nearbybindings.cpp b/apps/openmw/mwlua/nearbybindings.cpp
index 624cf69da6..05bc52c5cc 100644
--- a/apps/openmw/mwlua/nearbybindings.cpp
+++ b/apps/openmw/mwlua/nearbybindings.cpp
@@ -1,7 +1,6 @@
 #include "luabindings.hpp"
 
 #include <components/lua/luastate.hpp>
-#include <components/queries/luabindings.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
@@ -98,24 +97,6 @@ namespace MWLua
         api["containers"] = LObjectList{worldView->getContainersInScene()};
         api["doors"] = LObjectList{worldView->getDoorsInScene()};
         api["items"] = LObjectList{worldView->getItemsInScene()};
-        api["selectObjects"] = [context](const Queries::Query& query)
-        {
-            ObjectIdList list;
-            WorldView* worldView = context.mWorldView;
-            if (query.mQueryType == "activators")
-                list = worldView->getActivatorsInScene();
-            else if (query.mQueryType == "actors")
-                list = worldView->getActorsInScene();
-            else if (query.mQueryType == "containers")
-                list = worldView->getContainersInScene();
-            else if (query.mQueryType == "doors")
-                list = worldView->getDoorsInScene();
-            else if (query.mQueryType == "items")
-                list = worldView->getItemsInScene();
-            return LObjectList{selectObjectsFromList(query, list, context)};
-            // TODO: Maybe use sqlite
-            // return LObjectList{worldView->selectObjects(query, true)};
-        };
         return LuaUtil::makeReadOnly(api);
     }
 }
diff --git a/apps/openmw/mwlua/objectbindings.cpp b/apps/openmw/mwlua/objectbindings.cpp
index 6bcf355fde..08435583df 100644
--- a/apps/openmw/mwlua/objectbindings.cpp
+++ b/apps/openmw/mwlua/objectbindings.cpp
@@ -1,10 +1,8 @@
 #include "luabindings.hpp"
 
 #include <components/lua/luastate.hpp>
-#include <components/queries/query.hpp>
-
-#include "../mwclass/door.hpp"
 
+#include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/inventorystore.hpp"
 
@@ -77,10 +75,6 @@ namespace MWLua
                 });
                 listT[sol::meta_function::ipairs] = [iter](const LObjectList& list) { return std::make_tuple(iter, list, 0); };
             }
-            listT["select"] = [context](const ListT& list, const Queries::Query& query)
-            {
-                return ListT{selectObjectsFromList(query, list.mIds, context)};
-            };
         }
 
         template <class ObjectT>
diff --git a/apps/openmw/mwlua/query.cpp b/apps/openmw/mwlua/query.cpp
deleted file mode 100644
index c357e56884..0000000000
--- a/apps/openmw/mwlua/query.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-#include "query.hpp"
-
-#include <sol/sol.hpp>
-
-#include <components/lua/luastate.hpp>
-
-#include "../mwclass/container.hpp"
-#include "../mwworld/cellstore.hpp"
-
-#include "worldview.hpp"
-
-namespace MWLua
-{
-
-    static std::vector<QueryFieldGroup> initBasicFieldGroups()
-    {
-        auto createGroup = [](std::string name, const auto& arr) -> QueryFieldGroup
-        {
-            std::vector<const Queries::Field*> fieldPtrs;
-            fieldPtrs.reserve(arr.size());
-            for (const Queries::Field& field : arr)
-                fieldPtrs.push_back(&field);
-            return {std::move(name), std::move(fieldPtrs)};
-        };
-        static std::array objectFields = {
-            Queries::Field({"type"}, typeid(std::string)),
-            Queries::Field({"recordId"}, typeid(std::string)),
-            Queries::Field({"cell", "name"}, typeid(std::string)),
-            Queries::Field({"cell", "region"}, typeid(std::string)),
-            Queries::Field({"cell", "isExterior"}, typeid(bool)),
-            Queries::Field({"count"}, typeid(int32_t)),
-        };
-        static std::array doorFields = {
-            Queries::Field({"isTeleport"}, typeid(bool)),
-            Queries::Field({"destCell", "name"}, typeid(std::string)),
-            Queries::Field({"destCell", "region"}, typeid(std::string)),
-            Queries::Field({"destCell", "isExterior"}, typeid(bool)),
-        };
-        return std::vector<QueryFieldGroup>{
-            createGroup("OBJECT", objectFields),
-            createGroup("DOOR", doorFields),
-        };
-    }
-
-    const std::vector<QueryFieldGroup>& getBasicQueryFieldGroups()
-    {
-        static std::vector<QueryFieldGroup> fieldGroups = initBasicFieldGroups();
-        return fieldGroups;
-    }
-
-    bool checkQueryConditions(const Queries::Query& query, const ObjectId& id, const Context& context)
-    {
-        auto compareFn = [](auto&& a, auto&& b, Queries::Condition::Type t)
-        {
-            switch (t)
-            {
-                case Queries::Condition::EQUAL: return a == b;
-                case Queries::Condition::NOT_EQUAL: return a != b;
-                case Queries::Condition::GREATER: return a > b;
-                case Queries::Condition::GREATER_OR_EQUAL: return a >= b;
-                case Queries::Condition::LESSER: return a < b;
-                case Queries::Condition::LESSER_OR_EQUAL: return a <= b;
-                default:
-                    throw std::runtime_error("Unsupported condition type");
-            }
-        };
-        sol::object obj;
-        MWWorld::Ptr ptr;
-        if (context.mIsGlobal)
-        {
-            GObject g(id, context.mWorldView->getObjectRegistry());
-            if (!g.isValid())
-                return false;
-            ptr = g.ptr();
-            obj = sol::make_object(context.mLua->sol(), g);
-        }
-        else
-        {
-            LObject l(id, context.mWorldView->getObjectRegistry());
-            if (!l.isValid())
-                return false;
-            ptr = l.ptr();
-            obj = sol::make_object(context.mLua->sol(), l);
-        }
-        if (ptr.getRefData().getCount() == 0)
-            return false;
-
-        // It is important to exclude all markers before checking what class it is.
-        // For example "prisonmarker" has class "Door" despite that it is only an invisible marker.
-        if (isMarker(ptr))
-            return false;
-
-        const MWWorld::Class& cls = ptr.getClass();
-        if (cls.isActivator() != (query.mQueryType == ObjectQueryTypes::ACTIVATORS))
-            return false;
-        if (cls.isActor() != (query.mQueryType == ObjectQueryTypes::ACTORS))
-            return false;
-        if (cls.isDoor() != (query.mQueryType == ObjectQueryTypes::DOORS))
-            return false;
-        if ((typeid(cls) == typeid(MWClass::Container)) != (query.mQueryType == ObjectQueryTypes::CONTAINERS))
-            return false;
-
-        std::vector<char> condStack;
-        for (const Queries::Operation& op : query.mFilter.mOperations)
-        {
-            switch(op.mType)
-            {
-                case Queries::Operation::PUSH:
-                {
-                    const Queries::Condition& cond = query.mFilter.mConditions[op.mConditionIndex];
-                    sol::object fieldObj = obj;
-                    for (const std::string& field : cond.mField->path())
-                        fieldObj = LuaUtil::getFieldOrNil(fieldObj, field);
-                    bool c;
-                    if (fieldObj == sol::nil)
-                        c = false;
-                    else if (cond.mField->type() == typeid(std::string))
-                        c = compareFn(fieldObj.as<std::string_view>(), std::get<std::string>(cond.mValue), cond.mType);
-                    else if (cond.mField->type() == typeid(float))
-                        c = compareFn(fieldObj.as<float>(), std::get<float>(cond.mValue), cond.mType);
-                    else if (cond.mField->type() == typeid(double))
-                        c = compareFn(fieldObj.as<double>(), std::get<double>(cond.mValue), cond.mType);
-                    else if (cond.mField->type() == typeid(bool))
-                        c = compareFn(fieldObj.as<bool>(), std::get<bool>(cond.mValue), cond.mType);
-                    else if (cond.mField->type() == typeid(int32_t))
-                        c = compareFn(fieldObj.as<int32_t>(), std::get<int32_t>(cond.mValue), cond.mType);
-                    else if (cond.mField->type() == typeid(int64_t))
-                        c = compareFn(fieldObj.as<int64_t>(), std::get<int64_t>(cond.mValue), cond.mType);
-                    else
-                        throw std::runtime_error("Unknown field type");
-                    condStack.push_back(c);
-                    break;
-                }
-                case Queries::Operation::NOT:
-                    condStack.back() = !condStack.back();
-                    break;
-                case Queries::Operation::AND:
-                {
-                    bool v = condStack.back();
-                    condStack.pop_back();
-                    condStack.back() = condStack.back() && v;
-                    break;
-                }
-                case Queries::Operation::OR:
-                {
-                    bool v = condStack.back();
-                    condStack.pop_back();
-                    condStack.back() = condStack.back() || v;
-                    break;
-                }
-            }
-        }
-        return condStack.empty() || condStack.back() != 0;
-    }
-
-    ObjectIdList selectObjectsFromList(const Queries::Query& query, const ObjectIdList& list, const Context& context)
-    {
-        if (!query.mOrderBy.empty() || !query.mGroupBy.empty() || query.mOffset > 0)
-            throw std::runtime_error("OrderBy, GroupBy, and Offset are not supported");
-
-        ObjectIdList res = std::make_shared<std::vector<ObjectId>>();
-        for (const ObjectId& id : *list)
-        {
-            if (static_cast<int64_t>(res->size()) == query.mLimit)
-                break;
-            if (checkQueryConditions(query, id, context))
-                res->push_back(id);
-        }
-        return res;
-    }
-
-    ObjectIdList selectObjectsFromCellStore(const Queries::Query& query, MWWorld::CellStore* store, const Context& context)
-    {
-        if (!query.mOrderBy.empty() || !query.mGroupBy.empty() || query.mOffset > 0)
-            throw std::runtime_error("OrderBy, GroupBy, and Offset are not supported");
-
-        ObjectIdList res = std::make_shared<std::vector<ObjectId>>();
-        auto visitor = [&](const MWWorld::Ptr& ptr)
-        {
-            if (static_cast<int64_t>(res->size()) == query.mLimit)
-                return false;
-            context.mWorldView->getObjectRegistry()->registerPtr(ptr);
-            if (checkQueryConditions(query, getId(ptr), context))
-                res->push_back(getId(ptr));
-            return static_cast<int64_t>(res->size()) != query.mLimit;
-        };
-        store->forEach(std::move(visitor));  // TODO: maybe use store->forEachType<TYPE> depending on query.mType
-        return res;
-    }
-
-}
diff --git a/apps/openmw/mwlua/query.hpp b/apps/openmw/mwlua/query.hpp
deleted file mode 100644
index 65bf0c5105..0000000000
--- a/apps/openmw/mwlua/query.hpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef MWLUA_QUERY_H
-#define MWLUA_QUERY_H
-
-#include <string>
-
-#include <components/queries/query.hpp>
-
-#include "context.hpp"
-#include "object.hpp"
-
-namespace MWLua
-{
-
-    struct ObjectQueryTypes
-    {
-        static constexpr std::string_view ACTIVATORS = "activators";
-        static constexpr std::string_view ACTORS = "actors";
-        static constexpr std::string_view CONTAINERS = "containers";
-        static constexpr std::string_view DOORS = "doors";
-        static constexpr std::string_view ITEMS = "items";
-
-        static constexpr std::string_view types[] = {ACTIVATORS, ACTORS, CONTAINERS, DOORS, ITEMS};
-    };
-
-    struct QueryFieldGroup
-    {
-        std::string mName;
-        std::vector<const Queries::Field*> mFields;
-    };
-    const std::vector<QueryFieldGroup>& getBasicQueryFieldGroups();
-
-    // TODO: Implement custom fields. QueryFieldGroup registerCustomFields(...);
-
-    ObjectIdList selectObjectsFromList(const Queries::Query& query, const ObjectIdList& list, const Context&);
-    ObjectIdList selectObjectsFromCellStore(const Queries::Query& query, MWWorld::CellStore* store, const Context&);
-
-}
-
-#endif // MWLUA_QUERY_H
diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index 73e7af1d9e..767eebe6c8 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -21,7 +21,6 @@ if (GTEST_FOUND AND GMOCK_FOUND)
         lua/test_scriptscontainer.cpp
         lua/test_utilpackage.cpp
         lua/test_serialization.cpp
-        lua/test_querypackage.cpp
         lua/test_configuration.cpp
         lua/test_i18n.cpp
         lua/test_storage.cpp
diff --git a/apps/openmw_test_suite/lua/test_querypackage.cpp b/apps/openmw_test_suite/lua/test_querypackage.cpp
deleted file mode 100644
index aeaf992db0..0000000000
--- a/apps/openmw_test_suite/lua/test_querypackage.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "gmock/gmock.h"
-#include <gtest/gtest.h>
-
-#include <components/queries/luabindings.hpp>
-
-namespace
-{
-    using namespace testing;
-
-    TEST(LuaQueryPackageTest, basic)
-    {
-        sol::state lua;
-        lua.open_libraries(sol::lib::base, sol::lib::string);
-        Queries::registerQueryBindings(lua);
-        lua["query"] = Queries::Query("test");
-        lua["fieldX"] = Queries::Field({ "x" }, typeid(std::string));
-        lua["fieldY"] = Queries::Field({ "y" }, typeid(int));
-        lua.safe_script("t = query:where(fieldX:eq('abc') + fieldX:like('%abcd%'))");
-        lua.safe_script("t = t:where(fieldY:gt(5))");
-        lua.safe_script("t = t:orderBy(fieldX)");
-        lua.safe_script("t = t:orderByDesc(fieldY)");
-        lua.safe_script("t = t:groupBy(fieldY)");
-        lua.safe_script("t = t:limit(10):offset(5)");
-        EXPECT_EQ(
-            lua.safe_script("return tostring(t)").get<std::string>(),
-            "SELECT test WHERE ((x == \"abc\") OR (x LIKE \"%abcd%\")) AND (y > 5) ORDER BY x, y DESC GROUP BY y LIMIT 10 OFFSET 5");
-    }
-}
-
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index e183d54a95..efc80081e3 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -253,10 +253,6 @@ add_component_dir (fallback
     fallback validate
     )
 
-add_component_dir (queries
-    query luabindings
-    )
-    
 add_component_dir (lua_ui
     registerscriptsettings scriptsettings
     properties widget element util layers content alignment resources
diff --git a/components/queries/luabindings.cpp b/components/queries/luabindings.cpp
deleted file mode 100644
index c830a140f7..0000000000
--- a/components/queries/luabindings.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-#include "luabindings.hpp"
-
-namespace sol
-{
-    template <>
-    struct is_automagical<Queries::Field> : std::false_type {};
-
-    template <>
-    struct is_automagical<Queries::Filter> : std::false_type {};
-
-    template <>
-    struct is_automagical<Queries::Query> : std::false_type {};
-}
-
-namespace Queries
-{
-    template <Condition::Type type>
-    struct CondBuilder
-    {
-        Filter operator()(const Field& field, const sol::object& o)
-        {
-            FieldValue value;
-            if (field.type() == typeid(bool) && o.is<bool>())
-                value = o.as<bool>();
-            else if (field.type() == typeid(int32_t) && o.is<int32_t>())
-                value = o.as<int32_t>();
-            else if (field.type() == typeid(int64_t) && o.is<int64_t>())
-                value = o.as<int64_t>();
-            else if (field.type() == typeid(float) && o.is<float>())
-                value = o.as<float>();
-            else if (field.type() == typeid(double) && o.is<double>())
-                value = o.as<double>();
-            else if (field.type() == typeid(std::string) && o.is<std::string>())
-                value = o.as<std::string>();
-            else
-                throw std::logic_error("Invalid value for field " + field.toString());
-            Filter filter;
-            filter.add({&field, type, value});
-            return filter;
-        }
-    };
-
-    void registerQueryBindings(sol::state& lua)
-    {
-        sol::usertype<Field> field = lua.new_usertype<Field>("QueryField");
-        sol::usertype<Filter> filter = lua.new_usertype<Filter>("QueryFilter");
-        sol::usertype<Query> query = lua.new_usertype<Query>("Query");
-
-        field[sol::meta_function::to_string] = [](const Field& f) { return f.toString(); };
-        field["eq"] = CondBuilder<Condition::EQUAL>();
-        field["neq"] = CondBuilder<Condition::NOT_EQUAL>();
-        field["lt"] = CondBuilder<Condition::LESSER>();
-        field["lte"] = CondBuilder<Condition::LESSER_OR_EQUAL>();
-        field["gt"] = CondBuilder<Condition::GREATER>();
-        field["gte"] = CondBuilder<Condition::GREATER_OR_EQUAL>();
-        field["like"] = CondBuilder<Condition::LIKE>();
-
-        filter[sol::meta_function::to_string] = [](const Filter& filter) { return filter.toString(); };
-        filter[sol::meta_function::multiplication] = [](const Filter& a, const Filter& b)
-        {
-            Filter res = a;
-            res.add(b, Operation::AND);
-            return res;
-        };
-        filter[sol::meta_function::addition] = [](const Filter& a, const Filter& b)
-        {
-            Filter res = a;
-            res.add(b, Operation::OR);
-            return res;
-        };
-        filter[sol::meta_function::unary_minus] = [](const Filter& a)
-        {
-            Filter res = a;
-            if (!a.mConditions.empty())
-                res.mOperations.push_back({Operation::NOT, 0});
-            return res;
-        };
-
-        query[sol::meta_function::to_string] = [](const Query& q) { return q.toString(); };
-        query["where"] = [](const Query& q, const Filter& filter)
-        {
-            Query res = q;
-            res.mFilter.add(filter, Operation::AND);
-            return res;
-        };
-        query["orderBy"] = [](const Query& q, const Field& field)
-        {
-            Query res = q;
-            res.mOrderBy.push_back({&field, false});
-            return res;
-        };
-        query["orderByDesc"] = [](const Query& q, const Field& field)
-        {
-            Query res = q;
-            res.mOrderBy.push_back({&field, true});
-            return res;
-        };
-        query["groupBy"] = [](const Query& q, const Field& field)
-        {
-            Query res = q;
-            res.mGroupBy.push_back(&field);
-            return res;
-        };
-        query["offset"] = [](const Query& q, int64_t offset)
-        {
-            Query res = q;
-            res.mOffset = offset;
-            return res;
-        };
-        query["limit"] = [](const Query& q, int64_t limit)
-        {
-            Query res = q;
-            res.mLimit = limit;
-            return res;
-        };
-    }
-}
-
diff --git a/components/queries/luabindings.hpp b/components/queries/luabindings.hpp
deleted file mode 100644
index 16d1a822be..0000000000
--- a/components/queries/luabindings.hpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <limits> // missing from sol/sol.hpp
-#include <sol/sol.hpp>
-
-#include "query.hpp"
-
-namespace Queries
-{
-    void registerQueryBindings(sol::state& lua);
-}
diff --git a/components/queries/query.cpp b/components/queries/query.cpp
deleted file mode 100644
index 3c7f1517ee..0000000000
--- a/components/queries/query.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-#include "query.hpp"
-
-#include <sstream>
-#include <iomanip>
-
-namespace Queries
-{
-    Field::Field(std::vector<std::string> path, std::type_index type)
-        : mPath(std::move(path))
-        , mType(type) {}
-
-    std::string Field::toString() const
-    {
-        std::string result;
-        for (const std::string& segment : mPath)
-        {
-            if (!result.empty())
-                result += ".";
-            result += segment;
-        }
-        return result;
-    }
-
-    std::string toString(const FieldValue& value)
-    {
-        return std::visit([](auto&& arg) -> std::string
-        {
-            using T = std::decay_t<decltype(arg)>;
-            if constexpr (std::is_same_v<T, std::string>)
-            {
-                std::ostringstream oss;
-                oss << std::quoted(arg);
-                return oss.str();
-            }
-            else if constexpr (std::is_same_v<T, bool>)
-                return arg ? "true" : "false";
-            else
-                return std::to_string(arg);
-        }, value);
-    }
-
-    std::string Condition::toString() const
-    {
-        std::string res;
-        res += mField->toString();
-        switch (mType)
-        {
-            case Condition::EQUAL: res += " == "; break;
-            case Condition::NOT_EQUAL: res += " != "; break;
-            case Condition::LESSER: res += " < "; break;
-            case Condition::LESSER_OR_EQUAL: res += " <= "; break;
-            case Condition::GREATER: res += " > "; break;
-            case Condition::GREATER_OR_EQUAL: res += " >= "; break;
-            case Condition::LIKE: res += " LIKE "; break;
-        }
-        res += Queries::toString(mValue);
-        return res;
-    }
-
-    void Filter::add(const Condition& c, Operation::Type op)
-    {
-        mOperations.push_back({Operation::PUSH, mConditions.size()});
-        mConditions.push_back(c);
-        if (mConditions.size() > 1)
-            mOperations.push_back({op, 0});
-    }
-
-    void Filter::add(const Filter& f, Operation::Type op)
-    {
-        size_t conditionOffset = mConditions.size();
-        size_t operationsBefore = mOperations.size();
-        mConditions.insert(mConditions.end(), f.mConditions.begin(), f.mConditions.end());
-        mOperations.insert(mOperations.end(), f.mOperations.begin(), f.mOperations.end());
-        for (size_t i = operationsBefore; i < mOperations.size(); ++i)
-            mOperations[i].mConditionIndex += conditionOffset;
-        if (conditionOffset > 0 && !f.mConditions.empty())
-            mOperations.push_back({op, 0});
-    }
-
-    std::string Filter::toString() const
-    {
-        if(mOperations.empty())
-            return "";
-        std::vector<std::string> stack;
-        auto pop = [&stack](){ auto v = stack.back(); stack.pop_back(); return v; };
-        auto push = [&stack](const std::string& s) { stack.push_back(s); };
-        for (const Operation& op : mOperations)
-        {
-            if(op.mType == Operation::PUSH)
-                push(mConditions[op.mConditionIndex].toString());
-            else if(op.mType == Operation::AND)
-            {
-                auto rhs = pop();
-                auto lhs = pop();
-                std::string res;
-                res += "(";
-                res += lhs;
-                res += ") AND (";
-                res += rhs;
-                res += ")";
-                push(res);
-            }
-            else if (op.mType == Operation::OR)
-            {
-                auto rhs = pop();
-                auto lhs = pop();
-                std::string res;
-                res += "(";
-                res += lhs;
-                res += ") OR (";
-                res += rhs;
-                res += ")";
-                push(res);
-            }
-            else if (op.mType == Operation::NOT)
-            {
-                std::string res;
-                res += "NOT (";
-                res += pop();
-                res += ")";
-                push(res);
-            }
-            else
-                throw std::logic_error("Unknown operation type!");
-        }
-        return pop();
-    }
-
-    std::string Query::toString() const
-    {
-        std::string res;
-        res += "SELECT ";
-        res += mQueryType;
-
-        std::string filter = mFilter.toString();
-        if(!filter.empty())
-        {
-            res += " WHERE ";
-            res += filter;
-        }
-
-        std::string order;
-        for(const OrderBy& ord : mOrderBy)
-        {
-            if(!order.empty())
-                order += ", ";
-            order += ord.mField->toString();
-            if(ord.mDescending)
-                order += " DESC";
-        }
-        if (!order.empty())
-        {
-            res += " ORDER BY ";
-            res += order;
-        }
-
-        std::string group;
-        for (const Field* f: mGroupBy)
-        {
-            if (!group.empty())
-                group += " ,";
-            group += f->toString();
-        }
-        if (!group.empty())
-        {
-            res += " GROUP BY ";
-            res += group;
-        }
-
-        if (mLimit != sNoLimit)
-        {
-            res += " LIMIT ";
-            res += std::to_string(mLimit);
-        }
-
-        if (mOffset != 0)
-        {
-            res += " OFFSET ";
-            res += std::to_string(mOffset);
-        }
-
-        return res;
-    }
-}
-
diff --git a/components/queries/query.hpp b/components/queries/query.hpp
deleted file mode 100644
index 45144fed62..0000000000
--- a/components/queries/query.hpp
+++ /dev/null
@@ -1,99 +0,0 @@
-#ifndef COMPONENTS_QUERIES_QUERY
-#define COMPONENTS_QUERIES_QUERY
-
-#include <string>
-#include <vector>
-#include <typeindex>
-#include <variant>
-#include <stdexcept>
-
-namespace Queries
-{
-    class Field
-    {
-        public:
-            Field(std::vector<std::string> path, std::type_index type);
-
-            const std::vector<std::string>& path() const { return mPath; }
-            const std::type_index type() const { return mType; }
-
-            std::string toString() const;
-
-        private:
-            std::vector<std::string> mPath;
-            std::type_index mType;
-    };
-
-    struct OrderBy
-    {
-        const Field* mField;
-        bool mDescending;
-    };
-
-    using FieldValue = std::variant<bool, int32_t, int64_t, float, double, std::string>;
-    std::string toString(const FieldValue& value);
-
-    struct Condition
-    {
-        enum Type
-        {
-            EQUAL = 0,
-            NOT_EQUAL = 1,
-            GREATER = 2,
-            GREATER_OR_EQUAL = 3,
-            LESSER = 4,
-            LESSER_OR_EQUAL = 5,
-            LIKE = 6,
-        };
-
-        std::string toString() const;
-
-        const Field* mField;
-        Type mType;
-        FieldValue mValue;
-    };
-
-    struct Operation
-    {
-        enum Type
-        {
-            PUSH = 0, // push condition on stack
-            NOT = 1, // invert top condition on stack
-            AND = 2, // logic AND for two top conditions
-            OR = 3, // logic OR for two top conditions
-        };
-
-        Type mType;
-        size_t mConditionIndex; // used only if mType == PUSH
-    };
-
-    struct Filter
-    {
-        std::string toString() const;
-
-        // combines with given condition or filter using operation `AND` or `OR`.
-        void add(const Condition& c, Operation::Type op = Operation::AND);
-        void add(const Filter& f, Operation::Type op = Operation::AND);
-
-        std::vector<Condition> mConditions;
-        std::vector<Operation> mOperations; // operations on conditions in reverse polish notation
-    };
-
-    struct Query
-    {
-        static constexpr int64_t sNoLimit = -1;
-
-        Query(std::string type) : mQueryType(std::move(type)) {}
-        std::string toString() const;
-
-        std::string mQueryType;
-        Filter mFilter;
-        std::vector<OrderBy> mOrderBy;
-        std::vector<const Field*> mGroupBy;
-        int64_t mOffset = 0;
-        int64_t mLimit = sNoLimit;
-    };
-}
-
-#endif // !COMPONENTS_QUERIES_QUERY
-
diff --git a/docs/source/reference/lua-scripting/api.rst b/docs/source/reference/lua-scripting/api.rst
index 4518028073..cf071534d9 100644
--- a/docs/source/reference/lua-scripting/api.rst
+++ b/docs/source/reference/lua-scripting/api.rst
@@ -14,7 +14,6 @@ Lua API reference
     openmw_core
     openmw_types
     openmw_async
-    openmw_query
     openmw_world
     openmw_self
     openmw_nearby
@@ -61,8 +60,6 @@ Player scripts are local scripts that are attached to a player.
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.async <Package openmw.async>`               | everywhere         | | Timers (implemented) and coroutine utils (not implemented)  |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.query <Package openmw.query>`               | everywhere         | | Tools for constructing queries: base queries and fields.    |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.world <Package openmw.world>`               | by global scripts  | | Read-write access to the game world.                        |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.self <Package openmw.self>`                 | by local scripts   | | Full access to the object the script is attached to.        |
diff --git a/docs/source/reference/lua-scripting/openmw_query.rst b/docs/source/reference/lua-scripting/openmw_query.rst
deleted file mode 100644
index ea0932e8f0..0000000000
--- a/docs/source/reference/lua-scripting/openmw_query.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Package openmw.query
-====================
-
-.. raw:: html
-   :file: generated_html/openmw_query.html
diff --git a/docs/source/reference/lua-scripting/overview.rst b/docs/source/reference/lua-scripting/overview.rst
index a819235e2a..91c0a071e0 100644
--- a/docs/source/reference/lua-scripting/overview.rst
+++ b/docs/source/reference/lua-scripting/overview.rst
@@ -357,8 +357,6 @@ Player scripts are local scripts that are attached to a player.
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.async <Package openmw.async>`               | everywhere         | | Timers (implemented) and coroutine utils (not implemented)  |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.query <Package openmw.query>`               | everywhere         | | Tools for constructing queries: base queries and fields.    |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.world <Package openmw.world>`               | by global scripts  | | Read-write access to the game world.                        |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw.self <Package openmw.self>`                 | by local scripts   | | Full access to the object the script is attached to.        |
@@ -632,98 +630,6 @@ Also in `openmw_aux`_ is the helper function ``runRepeatedly``, it is implemente
     })
 
 
-Queries
-=======
-
-`openmw.query` contains base queries of each type (e.g. `query.doors`, `query.containers`...), which return all of the objects of given type in no particular order. You can then modify that query to filter the results, sort them, group them, etc. Queries are immutable, so any operations on them return a new copy, leaving the original unchanged.
-
-`openmw.world.selectObjects` and `openmw.nearby.selectObjects` both accept a query and return objects that match it. However, `nearby.selectObjects` is only available in local scripts, and returns only objects from currently active cells, while `world.selectObjects` is only available in global scripts, and returns objects regardless of them being in active cells.
-**TODO:** describe how to filter out inactive objects from world queries
-
-An example of an object query:
-
-.. code-block:: Lua
-
-    local query = require('openmw.query')
-    local nearby = require('openmw.nearby')
-    local ui = require('openmw.ui')
-
-    local function selectDoors(namePattern)
-        local query = query.doors:where(query.DOOR.destCell.name:like(namePattern))
-        return nearby.selectObjects(query)
-    end
-
-    local function showGuildDoors()
-        ui.showMessage('Here are all the entrances to guilds!')
-        for _, door in selectDoors("%Guild%"):ipairs() do
-            local pos = door.position
-            local message = string.format("%.0f;%.0f;%.0f", pos.x, pos.y, pos.z)
-            ui.showMessage(message)
-        end
-    end
-
-    return {
-        engineHandlers = {
-            onKeyPress = function(key)
-                if key.symbol == 'e' then
-                    showGuildDoors()
-                end
-            end
-        }
-    }
-
-.. warning::
-    The example above uses operation `like` that is not implemented yet.
-
-**TODO:** add non-object queries, explain how relations work, and define what a field is
-
-Queries are constructed through the following method calls: (if you've used SQL before, you will find them familiar)
-
-- `:where(filter)` - filters the results to match the combination of conditions passed as the argument
-- `:orderBy(field)` and `:orderByDesc(field)` sort the result by the `field` argument. Sorts in descending order in case of `:orderByDesc`. Multiple calls can be chained, with the first call having priority. (i. e. if the first field is equal, objects are sorted by the second one...) **(not implemented yet)**
-- `:groupBy(field)` returns only one result for each value of the `field` argument. The choice of the result is arbitrary. Useful for counting only unique objects, or checking if certain objects exist. **(not implemented yet)**
-- `:limit(number)` will only return `number` of results (or fewer)
-- `:offset(number)` skips the first `number` results. Particularly useful in combination with `:limit` **(not implemented yet)**
-
-Filters consist of conditions, which are combined with "and" (operator `*`), "or" (operator `+`), "not" (operator `-`) and braces `()`.
-
-To make a condition, take a field from the `openmw.query` package and call any of the following methods:
-
-- `:eq` equal to
-- `:neq` not equal to
-- `:gt` greater than
-- `:gte` greater or equal to
-- `:lt` less than
-- `:lte` less or equal to
-- `:like` matches a pattern. Only applicable to text (strings) **(not implemented yet)**
-
-**TODO:** describe the pattern format
-
-All the condition methods are type sensitive, and will throw an error if you pass a value of the wrong type into them.
-
-A few examples of filters:
-
-.. warning::
-    `openmw.query.ACTOR` is not implemented yet
-
-.. code-block:: Lua
-
-    local query = require('openmw.query')
-    local ACTOR = query.ACTOR
-
-    local strong_guys_from_capital = (ACTOR.stats.level:gt(10) + ACTOR.stats.strength:gt(70))
-        * ACTOR.cell.name:eq("Default city")
-
-    -- could also write like this:
-    local strong_guys = ACTOR.stats.level:gt(10) + ACTOR.stats.strength:gt(70)
-    local guys_from_capital = ACTOR.cell.name:eq("Default city")
-    local strong_guys_from_capital_2 = strong_guys * guys_from_capital
-
-    local DOOR = query.DOOR
-
-    local interestingDoors = -DOOR.name:eq("") * DOOR.isTeleport:eq(true) * Door.destCell.isExterior:eq(false)
-
-
 Using IDE for Lua scripting
 ===========================
 
diff --git a/files/lua_api/CMakeLists.txt b/files/lua_api/CMakeLists.txt
index 2988f38552..88efc8195c 100644
--- a/files/lua_api/CMakeLists.txt
+++ b/files/lua_api/CMakeLists.txt
@@ -8,7 +8,6 @@ set(LUA_API_FILES
     openmw/async.lua
     openmw/core.lua
     openmw/nearby.lua
-    openmw/query.lua
     openmw/self.lua
     openmw/ui.lua
     openmw/util.lua
diff --git a/files/lua_api/openmw/core.lua b/files/lua_api/openmw/core.lua
index afb0d2f5bb..43b2d29a70 100644
--- a/files/lua_api/openmw/core.lua
+++ b/files/lua_api/openmw/core.lua
@@ -159,13 +159,6 @@
 -- @type ObjectList
 -- @list <#GameObject>
 
----
--- Filter list with a Query.
--- @function [parent=#ObjectList] select
--- @param self
--- @param openmw.query#Query query
--- @return #ObjectList
-
 
 ---
 -- A cell of the game world.
diff --git a/files/lua_api/openmw/nearby.lua b/files/lua_api/openmw/nearby.lua
index c3403ded0c..3ba3d7e6fb 100644
--- a/files/lua_api/openmw/nearby.lua
+++ b/files/lua_api/openmw/nearby.lua
@@ -26,12 +26,6 @@
 -- Everything that can be picked up in the nearby.
 -- @field [parent=#nearby] openmw.core#ObjectList items
 
----
--- Evaluates a Query.
--- @function [parent=#nearby] selectObjects
--- @param openmw.query#Query query
--- @return openmw.core#ObjectList
-
 ---
 -- @type COLLISION_TYPE
 -- @field [parent=#COLLISION_TYPE] #number World
diff --git a/files/lua_api/openmw/query.lua b/files/lua_api/openmw/query.lua
deleted file mode 100644
index b5cea061ff..0000000000
--- a/files/lua_api/openmw/query.lua
+++ /dev/null
@@ -1,116 +0,0 @@
----
--- `openmw.query` constructs queries that can be used in `world.selectObjects` and `nearby.selectObjects`.
--- @module query
--- @usage local query = require('openmw.query')
-
-
-
----
--- Query. A Query itself can no return objects. It only holds search conditions.
--- @type Query
-
----
--- Add condition.
--- @function [parent=#Query] where
--- @param self
--- @param condition
--- @return #Query
-
----
--- Limit result size.
--- @function [parent=#Query] limit
--- @param self
--- @param #number maxCount
--- @return #Query
-
-
----
--- A field that can be used in a condition
--- @type Field
-
----
--- Equal
--- @function [parent=#Field] eq
--- @param self
--- @param value
-
----
--- Not equal
--- @function [parent=#Field] neq
--- @param self
--- @param value
-
----
--- Lesser
--- @function [parent=#Field] lt
--- @param self
--- @param value
-
----
--- Lesser or equal
--- @function [parent=#Field] lte
--- @param self
--- @param value
-
----
--- Greater
--- @function [parent=#Field] gt
--- @param self
--- @param value
-
----
--- Greater or equal
--- @function [parent=#Field] gte
--- @param self
--- @param value
-
-
----
--- @type OBJECT
--- @field [parent=#OBJECT] #Field type
--- @field [parent=#OBJECT] #Field recordId
--- @field [parent=#OBJECT] #Field count
--- @field [parent=#OBJECT] #CellFields cell
-
----
--- Fields that can be used with any object.
--- @field [parent=#query] #OBJECT OBJECT
-
----
--- @type DOOR
--- @field [parent=#DOOR] #Field isTeleport
--- @field [parent=#DOOR] #CellFields destCell
-
----
--- Fields that can be used only when search for doors.
--- @field [parent=#query] #DOOR DOOR
-
----
--- @type CellFields
--- @field [parent=#CellFields] #Field name
--- @field [parent=#CellFields] #Field region
--- @field [parent=#CellFields] #Field isExterior
-
-
----
--- Base Query to select activators.
--- @field [parent=#query] #Query activators
-
----
--- Base Query to select actors.
--- @field [parent=#query] #Query actors
-
----
--- Base Query to select containers.
--- @field [parent=#query] #Query containers
-
----
--- Base Query to select doors.
--- @field [parent=#query] #Query doors
-
----
--- Base Query to select items.
--- @field [parent=#query] #Query items
-
-return nil
-
diff --git a/files/lua_api/openmw/world.lua b/files/lua_api/openmw/world.lua
index 127c41c064..1f5d9a539b 100644
--- a/files/lua_api/openmw/world.lua
+++ b/files/lua_api/openmw/world.lua
@@ -10,12 +10,6 @@
 -- List of currently active actors.
 -- @field [parent=#world] openmw.core#ObjectList activeActors
 
----
--- Evaluates a Query.
--- @function [parent=#world] selectObjects
--- @param openmw.query#Query query
--- @return openmw.core#ObjectList
-
 ---
 -- Loads a named cell
 -- @function [parent=#world] getCellByName

From 484a7c7b7ebcaefba3003a1bb50029232cd3a498 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 16 Mar 2022 18:09:21 +0100
Subject: [PATCH 2201/2859] Base dialogue order solely on mPrev

---
 CHANGELOG.md                 |  1 +
 components/esm3/loaddial.cpp | 43 +++++++++---------------------------
 2 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 085eaedaf9..b5bd4d8923 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -279,6 +279,7 @@
     Bug #6294: Game crashes with empty pathgrid
     Bug #6606: Quests with multiple IDs cannot always be restarted
     Bug #6655: Constant effect absorb attribute causes the game to break
+    Bug #6670: Dialogue order is incorrect
     Feature #390: 3rd person look "over the shoulder"
     Feature #832: OpenMW-CS: Handle deleted references
     Feature #1536: Show more information about level on menu
diff --git a/components/esm3/loaddial.cpp b/components/esm3/loaddial.cpp
index 0c985def5b..a4b21cd1b3 100644
--- a/components/esm3/loaddial.cpp
+++ b/components/esm3/loaddial.cpp
@@ -86,49 +86,28 @@ namespace ESM
             return;
         }
 
-        InfoContainer::iterator it = mInfo.end();
-
-        LookupMap::iterator lookup;
-        lookup = mLookup.find(info.mId);
+        LookupMap::iterator lookup = mLookup.find(info.mId);
 
         if (lookup != mLookup.end())
         {
-            it = lookup->second.first;
+            auto it = lookup->second.first;
             // Since the new version of this record may have changed the next/prev linked list connection, we need to re-insert the record
             mInfo.erase(it);
             mLookup.erase(lookup);
         }
 
-        if (info.mNext.empty())
-        {
-            mLookup[info.mId] = std::make_pair(mInfo.insert(mInfo.end(), info), isDeleted);
-            return;
-        }
-        if (info.mPrev.empty())
-        {
-            mLookup[info.mId] = std::make_pair(mInfo.insert(mInfo.begin(), info), isDeleted);
-            return;
-        }
-
-        lookup = mLookup.find(info.mPrev);
-        if (lookup != mLookup.end())
-        {
-            it = lookup->second.first;
-
-            mLookup[info.mId] = std::make_pair(mInfo.insert(++it, info), isDeleted);
-            return;
-        }
-
-        lookup = mLookup.find(info.mNext);
-        if (lookup != mLookup.end())
+        if (!info.mPrev.empty())
         {
-            it = lookup->second.first;
+            lookup = mLookup.find(info.mPrev);
+            if (lookup != mLookup.end())
+            {
+                auto it = lookup->second.first;
 
-            mLookup[info.mId] = std::make_pair(mInfo.insert(it, info), isDeleted);
-            return;
+                mLookup[info.mId] = std::make_pair(mInfo.insert(++it, info), isDeleted);
+                return;
+            }
         }
-
-        Log(Debug::Warning) << "Warning: Failed to insert info " << info.mId;
+        mLookup[info.mId] = std::make_pair(mInfo.insert(mInfo.begin(), info), isDeleted);
     }
 
     void Dialogue::clearDeletedInfos()

From 12f6530ab320d02ac3dd6a49b7d571d415f31f2e Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 16 Mar 2022 19:24:36 +0100
Subject: [PATCH 2202/2859] Relocate changelog entries

---
 CHANGELOG.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5bd4d8923..f6eb3f5738 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -104,6 +104,9 @@
     Bug #6544: Far from world origin objects jitter when camera is still
     Bug #6559: Weapon condition inconsistency between melee and ranged critical / sneak / KO attacks
     Bug #6579: OpenMW compilation error when using OSG doubles for BoundingSphere
+    Bug #6606: Quests with multiple IDs cannot always be restarted
+    Bug #6655: Constant effect absorb attribute causes the game to break
+    Bug #6670: Dialogue order is incorrect
     Feature #890: OpenMW-CS: Column filtering
     Feature #1465: "Reset" argument for AI functions
     Feature #2491: Ability to make OpenMW "portable"
@@ -277,9 +280,6 @@
     Bug #6142: Groundcover plugins change cells flags
     Bug #6276: Deleted groundcover instances are not deleted in game
     Bug #6294: Game crashes with empty pathgrid
-    Bug #6606: Quests with multiple IDs cannot always be restarted
-    Bug #6655: Constant effect absorb attribute causes the game to break
-    Bug #6670: Dialogue order is incorrect
     Feature #390: 3rd person look "over the shoulder"
     Feature #832: OpenMW-CS: Handle deleted references
     Feature #1536: Show more information about level on menu

From 5b9dd10cbe2ec0c82b9e532b2056992b25fe9bba Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 10 Mar 2022 18:34:35 +0100
Subject: [PATCH 2203/2859] Limit max navmeshdb file size

Use "pragma max_page_count" to define max allowed file size in combination with
"pragma page_size" based on a new setting "max navmeshdb file size".

* Stop navmeshtool on the first db error.
* Disable writes to db in the engine on first "database or disk is full"
  SQLite3 error. There is no special error code for this error.
* Change default "write to navmeshdb" to true.
* Use time intervals for transaction duration instead of number of changes.
---
 apps/navmeshtool/main.cpp                     |  3 +-
 apps/navmeshtool/navmesh.cpp                  | 54 ++++++++-----
 .../detournavigator/asyncnavmeshupdater.cpp   | 49 ++++++++++--
 .../detournavigator/navigator.cpp             |  5 +-
 .../detournavigator/navmeshdb.cpp             | 14 +++-
 .../detournavigator/asyncnavmeshupdater.cpp   | 80 ++++++++++++++-----
 .../detournavigator/asyncnavmeshupdater.hpp   |  8 +-
 .../detournavigator/generatenavmeshtile.cpp   |  1 +
 .../detournavigator/generatenavmeshtile.hpp   |  2 +
 components/detournavigator/navigator.cpp      |  2 +-
 components/detournavigator/navmeshdb.cpp      | 30 ++++++-
 components/detournavigator/navmeshdb.hpp      |  4 +-
 components/detournavigator/settings.cpp       |  1 +
 components/detournavigator/settings.hpp       |  1 +
 components/sqlite3/db.cpp                     |  2 +-
 components/sqlite3/transaction.cpp            | 28 +++++--
 components/sqlite3/transaction.hpp            | 10 ++-
 .../reference/modding/settings/navigator.rst  | 11 ++-
 files/settings-default.cfg                    |  5 +-
 19 files changed, 242 insertions(+), 68 deletions(-)

diff --git a/apps/navmeshtool/main.cpp b/apps/navmeshtool/main.cpp
index 894ec6b3b1..af411f03dd 100644
--- a/apps/navmeshtool/main.cpp
+++ b/apps/navmeshtool/main.cpp
@@ -156,8 +156,9 @@ namespace NavMeshTool
             settings.load(config);
 
             const osg::Vec3f agentHalfExtents = Settings::Manager::getVector3("default actor pathfind half extents", "Game");
+            const std::uint64_t maxDbFileSize = static_cast<std::uint64_t>(Settings::Manager::getInt64("max navmeshdb file size", "Navigator"));
 
-            DetourNavigator::NavMeshDb db((config.getUserDataPath() / "navmesh.db").string());
+            DetourNavigator::NavMeshDb db((config.getUserDataPath() / "navmesh.db").string(), maxDbFileSize);
 
             std::vector<ESM::ESMReader> readers(contentFiles.size());
             EsmLoader::Query query;
diff --git a/apps/navmeshtool/navmesh.cpp b/apps/navmeshtool/navmesh.cpp
index 8b85029949..3acddb821d 100644
--- a/apps/navmeshtool/navmesh.cpp
+++ b/apps/navmeshtool/navmesh.cpp
@@ -67,7 +67,7 @@ namespace NavMeshTool
             explicit NavMeshTileConsumer(NavMeshDb&& db, bool removeUnusedTiles)
                 : mDb(std::move(db))
                 , mRemoveUnusedTiles(removeUnusedTiles)
-                , mTransaction(mDb.startTransaction())
+                , mTransaction(mDb.startTransaction(Sqlite3::TransactionMode::Immediate))
                 , mNextTileId(mDb.getMaxTileId() + 1)
                 , mNextShapeId(mDb.getMaxShapeId() + 1)
             {}
@@ -128,14 +128,11 @@ namespace NavMeshTool
             void insert(std::string_view worldspace, const TilePosition& tilePosition,
                 std::int64_t version, const std::vector<std::byte>& input, PreparedNavMeshData& data) override
             {
-                if (mRemoveUnusedTiles)
-                {
-                    std::lock_guard lock(mMutex);
-                    mDeleted += static_cast<std::size_t>(mDb.deleteTilesAt(worldspace, tilePosition));
-                }
-                data.mUserId = static_cast<unsigned>(mNextTileId);
                 {
                     std::lock_guard lock(mMutex);
+                    if (mRemoveUnusedTiles)
+                        mDeleted += static_cast<std::size_t>(mDb.deleteTilesAt(worldspace, tilePosition));
+                    data.mUserId = static_cast<unsigned>(mNextTileId);
                     mDb.insertTile(mNextTileId, worldspace, tilePosition, TileVersion {version}, input, serialize(data));
                     ++mNextTileId;
                 }
@@ -157,25 +154,44 @@ namespace NavMeshTool
                 report();
             }
 
-            void wait()
+            void cancel() override
+            {
+                std::unique_lock lock(mMutex);
+                mCancelled = true;
+                mHasTile.notify_one();
+            }
+
+            bool wait()
             {
-                constexpr std::size_t tilesPerTransaction = 3000;
+                constexpr std::chrono::seconds transactionInterval(1);
                 std::unique_lock lock(mMutex);
-                while (mProvided < mExpected)
+                auto start = std::chrono::steady_clock::now();
+                while (mProvided < mExpected && !mCancelled)
                 {
                     mHasTile.wait(lock);
-                    if (mProvided % tilesPerTransaction == 0)
+                    const auto now = std::chrono::steady_clock::now();
+                    if (now - start > transactionInterval)
                     {
                         mTransaction.commit();
-                        mTransaction = mDb.startTransaction();
+                        mTransaction = mDb.startTransaction(Sqlite3::TransactionMode::Immediate);
+                        start = now;
                     }
                 }
                 logGeneratedTiles(mProvided, mExpected);
+                return !mCancelled;
             }
 
-            void commit() { mTransaction.commit(); }
+            void commit()
+            {
+                const std::lock_guard lock(mMutex);
+                mTransaction.commit();
+            }
 
-            void vacuum() { mDb.vacuum(); }
+            void vacuum()
+            {
+                const std::lock_guard lock(mMutex);
+                mDb.vacuum();
+            }
 
             void removeTilesOutsideRange(std::string_view worldspace, const TilesPositionsRange& range)
             {
@@ -183,7 +199,7 @@ namespace NavMeshTool
                 mTransaction.commit();
                 Log(Debug::Info) << "Removing tiles outside processed range for worldspace \"" << worldspace << "\"...";
                 mDeleted += static_cast<std::size_t>(mDb.deleteTilesOutsideRange(worldspace, range));
-                mTransaction = mDb.startTransaction();
+                mTransaction = mDb.startTransaction(Sqlite3::TransactionMode::Immediate);
             }
 
         private:
@@ -191,6 +207,7 @@ namespace NavMeshTool
             std::atomic_size_t mInserted {0};
             std::atomic_size_t mUpdated {0};
             std::size_t mDeleted = 0;
+            bool mCancelled = false;
             mutable std::mutex mMutex;
             NavMeshDb mDb;
             const bool mRemoveUnusedTiles;
@@ -211,7 +228,8 @@ namespace NavMeshTool
     }
 
     void generateAllNavMeshTiles(const osg::Vec3f& agentHalfExtents, const Settings& settings,
-        std::size_t threadsNumber, bool removeUnusedTiles, WorldspaceData& data, NavMeshDb&& db)
+        std::size_t threadsNumber, bool removeUnusedTiles, WorldspaceData& data,
+        NavMeshDb&& db)
     {
         Log(Debug::Info) << "Generating navmesh tiles by " << threadsNumber << " parallel workers...";
 
@@ -253,8 +271,8 @@ namespace NavMeshTool
                 ));
         }
 
-        navMeshTileConsumer->wait();
-        navMeshTileConsumer->commit();
+        if (navMeshTileConsumer->wait())
+            navMeshTileConsumer->commit();
 
         const auto inserted = navMeshTileConsumer->getInserted();
         const auto updated = navMeshTileConsumer->getUpdated();
diff --git a/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp b/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp
index 71c013d9f4..1f7125d1f2 100644
--- a/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp
+++ b/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp
@@ -12,6 +12,7 @@
 #include <gtest/gtest.h>
 
 #include <map>
+#include <limits>
 
 namespace
 {
@@ -19,9 +20,8 @@ namespace
     using namespace DetourNavigator;
     using namespace DetourNavigator::Tests;
 
-    void addHeightFieldPlane(TileCachedRecastMeshManager& recastMeshManager)
+    void addHeightFieldPlane(TileCachedRecastMeshManager& recastMeshManager, const osg::Vec2i cellPosition = osg::Vec2i(0, 0))
     {
-        const osg::Vec2i cellPosition(0, 0);
         const int cellSize = 8192;
         recastMeshManager.addHeightfield(cellPosition, cellSize, HeightfieldPlane {0});
     }
@@ -130,7 +130,7 @@ namespace
         mRecastMeshManager.setWorldspace(mWorldspace);
         addHeightFieldPlane(mRecastMeshManager);
         addObject(mBox, mRecastMeshManager);
-        auto db = std::make_unique<NavMeshDb>(":memory:");
+        auto db = std::make_unique<NavMeshDb>(":memory:", std::numeric_limits<std::uint64_t>::max());
         NavMeshDb* const dbPtr = db.get();
         AsyncNavMeshUpdater updater(mSettings, mRecastMeshManager, mOffMeshConnectionsManager, std::move(db));
         const auto navMeshCacheItem = std::make_shared<GuardedNavMeshCacheItem>(makeEmptyNavMesh(mSettings), 1);
@@ -138,6 +138,7 @@ namespace
         const std::map<TilePosition, ChangeType> changedTiles {{tilePosition, ChangeType::add}};
         updater.post(mAgentHalfExtents, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
         updater.wait(mListener, WaitConditionType::allJobsDone);
+        updater.stop();
         const auto recastMesh = mRecastMeshManager.getMesh(mWorldspace, tilePosition);
         ASSERT_NE(recastMesh, nullptr);
         ShapeId nextShapeId {1};
@@ -154,7 +155,7 @@ namespace
         mRecastMeshManager.setWorldspace(mWorldspace);
         addHeightFieldPlane(mRecastMeshManager);
         addObject(mBox, mRecastMeshManager);
-        auto db = std::make_unique<NavMeshDb>(":memory:");
+        auto db = std::make_unique<NavMeshDb>(":memory:", std::numeric_limits<std::uint64_t>::max());
         NavMeshDb* const dbPtr = db.get();
         mSettings.mWriteToNavMeshDb = false;
         AsyncNavMeshUpdater updater(mSettings, mRecastMeshManager, mOffMeshConnectionsManager, std::move(db));
@@ -163,6 +164,7 @@ namespace
         const std::map<TilePosition, ChangeType> changedTiles {{tilePosition, ChangeType::add}};
         updater.post(mAgentHalfExtents, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
         updater.wait(mListener, WaitConditionType::allJobsDone);
+        updater.stop();
         const auto recastMesh = mRecastMeshManager.getMesh(mWorldspace, tilePosition);
         ASSERT_NE(recastMesh, nullptr);
         ShapeId nextShapeId {1};
@@ -177,7 +179,7 @@ namespace
         mRecastMeshManager.setWorldspace(mWorldspace);
         addHeightFieldPlane(mRecastMeshManager);
         addObject(mBox, mRecastMeshManager);
-        auto db = std::make_unique<NavMeshDb>(":memory:");
+        auto db = std::make_unique<NavMeshDb>(":memory:", std::numeric_limits<std::uint64_t>::max());
         NavMeshDb* const dbPtr = db.get();
         mSettings.mWriteToNavMeshDb = false;
         AsyncNavMeshUpdater updater(mSettings, mRecastMeshManager, mOffMeshConnectionsManager, std::move(db));
@@ -186,6 +188,7 @@ namespace
         const std::map<TilePosition, ChangeType> changedTiles {{tilePosition, ChangeType::add}};
         updater.post(mAgentHalfExtents, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
         updater.wait(mListener, WaitConditionType::allJobsDone);
+        updater.stop();
         const auto recastMesh = mRecastMeshManager.getMesh(mWorldspace, tilePosition);
         ASSERT_NE(recastMesh, nullptr);
         const auto objects = makeDbRefGeometryObjects(recastMesh->getMeshSources(),
@@ -198,7 +201,8 @@ namespace
         mRecastMeshManager.setWorldspace(mWorldspace);
         addHeightFieldPlane(mRecastMeshManager);
         mSettings.mMaxNavMeshTilesCacheSize = 0;
-        AsyncNavMeshUpdater updater(mSettings, mRecastMeshManager, mOffMeshConnectionsManager, std::make_unique<NavMeshDb>(":memory:"));
+        AsyncNavMeshUpdater updater(mSettings, mRecastMeshManager, mOffMeshConnectionsManager,
+                                    std::make_unique<NavMeshDb>(":memory:", std::numeric_limits<std::uint64_t>::max()));
         const auto navMeshCacheItem = std::make_shared<GuardedNavMeshCacheItem>(makeEmptyNavMesh(mSettings), 1);
         const std::map<TilePosition, ChangeType> changedTiles {{TilePosition {0, 0}, ChangeType::add}};
         updater.post(mAgentHalfExtents, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
@@ -239,4 +243,37 @@ namespace
         updater.wait(mListener, WaitConditionType::allJobsDone);
         EXPECT_EQ(navMeshCacheItem->lockConst()->getImpl().getTileRefAt(0, 0, 0), 0);
     }
+
+    TEST_F(DetourNavigatorAsyncNavMeshUpdaterTest, should_stop_writing_to_db_when_size_limit_is_reached)
+    {
+        mRecastMeshManager.setWorldspace(mWorldspace);
+        for (int x = -1; x <= 1; ++x)
+            for (int y = -1; y <= 1; ++y)
+                addHeightFieldPlane(mRecastMeshManager, osg::Vec2i(x, y));
+        addObject(mBox, mRecastMeshManager);
+        auto db = std::make_unique<NavMeshDb>(":memory:", 4097);
+        NavMeshDb* const dbPtr = db.get();
+        AsyncNavMeshUpdater updater(mSettings, mRecastMeshManager, mOffMeshConnectionsManager, std::move(db));
+        const auto navMeshCacheItem = std::make_shared<GuardedNavMeshCacheItem>(makeEmptyNavMesh(mSettings), 1);
+        std::map<TilePosition, ChangeType> changedTiles;
+        for (int x = -5; x <= 5; ++x)
+            for (int y = -5; y <= 5; ++y)
+                changedTiles.emplace(TilePosition {x, y}, ChangeType::add);
+        updater.post(mAgentHalfExtents, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
+        updater.wait(mListener, WaitConditionType::allJobsDone);
+        updater.stop();
+        for (int x = -5; x <= 5; ++x)
+            for (int y = -5; y <= 5; ++y)
+            {
+                const TilePosition tilePosition(x, y);
+                const auto recastMesh = mRecastMeshManager.getMesh(mWorldspace, tilePosition);
+                ASSERT_NE(recastMesh, nullptr);
+                const std::optional<std::vector<DbRefGeometryObject>> objects = makeDbRefGeometryObjects(recastMesh->getMeshSources(),
+                    [&] (const MeshSource& v) { return resolveMeshSource(*dbPtr, v); });
+                if (!objects.has_value())
+                    continue;
+                EXPECT_FALSE(dbPtr->findTile(mWorldspace, tilePosition, serialize(mSettings.mRecast, *recastMesh, *objects)).has_value())
+                    << tilePosition.x() << " " << tilePosition.y();
+            }
+    }
 }
diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index 50bf1fe735..ec4b669692 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -23,6 +23,7 @@
 #include <array>
 #include <deque>
 #include <memory>
+#include <limits>
 
 MATCHER_P3(Vec3fEq, x, y, z, "")
 {
@@ -64,7 +65,7 @@ namespace
             , mOut(mPath)
             , mStepSize(28.333332061767578125f)
         {
-            mNavigator.reset(new NavigatorImpl(mSettings, std::make_unique<NavMeshDb>(":memory:")));
+            mNavigator.reset(new NavigatorImpl(mSettings, std::make_unique<NavMeshDb>(":memory:", std::numeric_limits<std::uint64_t>::max())));
         }
     };
 
@@ -831,7 +832,7 @@ namespace
     TEST_F(DetourNavigatorNavigatorTest, multiple_threads_should_lock_tiles)
     {
         mSettings.mAsyncNavMeshUpdaterThreads = 2;
-        mNavigator.reset(new NavigatorImpl(mSettings, std::make_unique<NavMeshDb>(":memory:")));
+        mNavigator.reset(new NavigatorImpl(mSettings, std::make_unique<NavMeshDb>(":memory:", std::numeric_limits<std::uint64_t>::max())));
 
         const std::array<float, 5 * 5> heightfieldData {{
             0,   0,    0,    0,    0,
diff --git a/apps/openmw_test_suite/detournavigator/navmeshdb.cpp b/apps/openmw_test_suite/detournavigator/navmeshdb.cpp
index f7d9327e65..55d26e3b78 100644
--- a/apps/openmw_test_suite/detournavigator/navmeshdb.cpp
+++ b/apps/openmw_test_suite/detournavigator/navmeshdb.cpp
@@ -10,6 +10,7 @@
 
 #include <numeric>
 #include <random>
+#include <limits>
 
 namespace
 {
@@ -27,7 +28,7 @@ namespace
 
     struct DetourNavigatorNavMeshDbTest : Test
     {
-        NavMeshDb mDb {":memory:"};
+        NavMeshDb mDb {":memory:", std::numeric_limits<std::uint64_t>::max()};
         std::minstd_rand mRandom;
 
         std::vector<std::byte> generateData()
@@ -166,4 +167,15 @@ namespace
                 ASSERT_EQ(mDb.findTile(worldspace, TilePosition {x, y}, input).has_value(),
                           -1 <= x && x <= 1 && -1 <= y && y <= 1) << "x=" << x << " y=" << y;
     }
+
+    TEST_F(DetourNavigatorNavMeshDbTest, should_support_file_size_limit)
+    {
+        mDb = NavMeshDb(":memory:", 4096);
+        const auto f = [&]
+        {
+            for (std::int64_t i = 1; i <= 100; ++i)
+                insertTile(TileId {i}, TileVersion {1});
+        };
+        EXPECT_THROW(f(), std::runtime_error);
+    }
 }
diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index 4af229da8a..18bffae131 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -140,15 +140,7 @@ namespace DetourNavigator
 
     AsyncNavMeshUpdater::~AsyncNavMeshUpdater()
     {
-        mShouldStop = true;
-        if (mDbWorker != nullptr)
-            mDbWorker->stop();
-        std::unique_lock<std::mutex> lock(mMutex);
-        mWaiting.clear();
-        mHasJob.notify_all();
-        lock.unlock();
-        for (auto& thread : mThreads)
-            thread.join();
+        stop();
     }
 
     void AsyncNavMeshUpdater::post(const osg::Vec3f& agentHalfExtents, const SharedNavMeshCacheItem& navMeshCacheItem,
@@ -235,6 +227,20 @@ namespace DetourNavigator
         }
     }
 
+    void AsyncNavMeshUpdater::stop()
+    {
+        mShouldStop = true;
+        if (mDbWorker != nullptr)
+            mDbWorker->stop();
+        std::unique_lock<std::mutex> lock(mMutex);
+        mWaiting.clear();
+        mHasJob.notify_all();
+        lock.unlock();
+        for (auto& thread : mThreads)
+            if (thread.joinable())
+                thread.join();
+    }
+
     int AsyncNavMeshUpdater::waitUntilJobsDoneForNotPresentTiles(const std::size_t initialJobsLeft, std::size_t& maxProgress, Loading::Listener& listener)
     {
         std::size_t prevJobsLeft = initialJobsLeft;
@@ -672,10 +678,10 @@ namespace DetourNavigator
         mHasJob.notify_all();
     }
 
-    std::optional<JobIt> DbJobQueue::pop()
+    std::optional<JobIt> DbJobQueue::pop(std::chrono::steady_clock::duration timeout)
     {
         std::unique_lock lock(mMutex);
-        mHasJob.wait(lock, [&] { return mShouldStop || !mJobs.empty(); });
+        mHasJob.wait_for(lock, timeout, [&] { return mShouldStop || !mJobs.empty(); });
         if (mJobs.empty())
             return std::nullopt;
         const JobIt job = mJobs.front();
@@ -720,7 +726,6 @@ namespace DetourNavigator
     DbWorker::~DbWorker()
     {
         stop();
-        mThread.join();
     }
 
     void DbWorker::enqueueJob(JobIt job)
@@ -741,23 +746,35 @@ namespace DetourNavigator
     {
         mShouldStop = true;
         mQueue.stop();
+        if (mThread.joinable())
+            mThread.join();
     }
 
     void DbWorker::run() noexcept
     {
-        constexpr std::size_t writesPerTransaction = 100;
-        auto transaction = mDb->startTransaction();
+        constexpr std::chrono::seconds transactionInterval(1);
+        auto transaction = mDb->startTransaction(Sqlite3::TransactionMode::Immediate);
+        auto start = std::chrono::steady_clock::now();
         while (!mShouldStop)
         {
             try
             {
-                if (const auto job = mQueue.pop())
+                if (const auto job = mQueue.pop(transactionInterval))
                     processJob(*job);
-                if (mWrites > writesPerTransaction)
+                const auto now = std::chrono::steady_clock::now();
+                if (mHasChanges && now - start > transactionInterval)
                 {
-                    mWrites = 0;
-                    transaction.commit();
-                    transaction = mDb->startTransaction();
+                    mHasChanges = false;
+                    try
+                    {
+                        transaction.commit();
+                    }
+                    catch (const std::exception& e)
+                    {
+                        Log(Debug::Error) << "DbWorker exception on commit: " << e.what();
+                    }
+                    transaction = mDb->startTransaction(Sqlite3::TransactionMode::Immediate);
+                    start = now;
                 }
             }
             catch (const std::exception& e)
@@ -765,7 +782,15 @@ namespace DetourNavigator
                 Log(Debug::Error) << "DbWorker exception: " << e.what();
             }
         }
-        transaction.commit();
+        if (mHasChanges)
+            try
+            {
+                transaction.commit();
+            }
+            catch (const std::exception& e)
+            {
+                Log(Debug::Error) << "DbWorker exception on final commit: " << e.what();
+            }
     }
 
     void DbWorker::processJob(JobIt job)
@@ -779,6 +804,11 @@ namespace DetourNavigator
             catch (const std::exception& e)
             {
                 Log(Debug::Error) << "DbWorker exception while processing job " << job->mId << ": " << e.what();
+                if (std::string_view(e.what()).find("database or disk is full") != std::string_view::npos)
+                {
+                    mWriteToDb = false;
+                    Log(Debug::Warning) << "Writes to navmeshdb are disabled because file size limit is reached or disk is full";
+                }
             }
         };
 
@@ -807,7 +837,7 @@ namespace DetourNavigator
                 const auto objects = makeDbRefGeometryObjects(job->mRecastMesh->getMeshSources(),
                     [&] (const MeshSource& v) { return resolveMeshSource(*mDb, v, mNextShapeId); });
                 if (shapeId != mNextShapeId)
-                    ++mWrites;
+                    mHasChanges = true;
                 job->mInput = serialize(mRecastSettings, *job->mRecastMesh, objects);
             }
             else
@@ -826,7 +856,11 @@ namespace DetourNavigator
 
     void DbWorker::processWritingJob(JobIt job)
     {
-        ++mWrites;
+        if (!mWriteToDb)
+        {
+            Log(Debug::Debug) << "Ignored db write job " << job->mId;
+            return;
+        }
 
         Log(Debug::Debug) << "Processing db write job " << job->mId;
 
@@ -843,6 +877,7 @@ namespace DetourNavigator
             Log(Debug::Debug) << "Update db tile by job " << job->mId;
             job->mGeneratedNavMeshData->mUserId = cachedTileData->mTileId;
             mDb->updateTile(cachedTileData->mTileId, mVersion, serialize(*job->mGeneratedNavMeshData));
+            mHasChanges = true;
             return;
         }
 
@@ -858,5 +893,6 @@ namespace DetourNavigator
         mDb->insertTile(mNextTileId, job->mWorldspace, job->mChangedTile,
                         mVersion, job->mInput, serialize(*job->mGeneratedNavMeshData));
         ++mNextTileId;
+        mHasChanges = true;
     }
 }
diff --git a/components/detournavigator/asyncnavmeshupdater.hpp b/components/detournavigator/asyncnavmeshupdater.hpp
index fa8cba03af..dc6e9b5a81 100644
--- a/components/detournavigator/asyncnavmeshupdater.hpp
+++ b/components/detournavigator/asyncnavmeshupdater.hpp
@@ -87,7 +87,7 @@ namespace DetourNavigator
     public:
         void push(JobIt job);
 
-        std::optional<JobIt> pop();
+        std::optional<JobIt> pop(std::chrono::steady_clock::duration timeout);
 
         void update(TilePosition playerTile, int maxTiles);
 
@@ -131,13 +131,13 @@ namespace DetourNavigator
         const RecastSettings& mRecastSettings;
         const std::unique_ptr<NavMeshDb> mDb;
         const TileVersion mVersion;
-        const bool mWriteToDb;
+        bool mWriteToDb;
         TileId mNextTileId;
         ShapeId mNextShapeId;
         DbJobQueue mQueue;
         std::atomic_bool mShouldStop {false};
         std::atomic_size_t mGetTileCount {0};
-        std::size_t mWrites = 0;
+        bool mHasChanges = false;
         std::thread mThread;
 
         inline void run() noexcept;
@@ -173,6 +173,8 @@ namespace DetourNavigator
 
         void wait(Loading::Listener& listener, WaitConditionType waitConditionType);
 
+        void stop();
+
         Stats getStats() const;
 
         void enqueueJob(JobIt job);
diff --git a/components/detournavigator/generatenavmeshtile.cpp b/components/detournavigator/generatenavmeshtile.cpp
index 360c05931f..a725c5bc23 100644
--- a/components/detournavigator/generatenavmeshtile.cpp
+++ b/components/detournavigator/generatenavmeshtile.cpp
@@ -96,6 +96,7 @@ namespace DetourNavigator
         {
             Log(Debug::Warning) << "Failed to generate navmesh for worldspace \"" << mWorldspace
                                 << "\" tile " << mTilePosition << ": " << e.what();
+            consumer->cancel();
         }
     }
 }
diff --git a/components/detournavigator/generatenavmeshtile.hpp b/components/detournavigator/generatenavmeshtile.hpp
index e6d9e26c1d..2cd669c8ec 100644
--- a/components/detournavigator/generatenavmeshtile.hpp
+++ b/components/detournavigator/generatenavmeshtile.hpp
@@ -49,6 +49,8 @@ namespace DetourNavigator
 
         virtual void update(std::string_view worldspace, const TilePosition& tilePosition,
                             std::int64_t tileId, std::int64_t version, PreparedNavMeshData& data) = 0;
+
+        virtual void cancel() = 0;
     };
 
     class GenerateNavMeshTile final : public SceneUtil::WorkItem
diff --git a/components/detournavigator/navigator.cpp b/components/detournavigator/navigator.cpp
index 5b9341523c..d40f330771 100644
--- a/components/detournavigator/navigator.cpp
+++ b/components/detournavigator/navigator.cpp
@@ -16,7 +16,7 @@ namespace DetourNavigator
         {
             try
             {
-                db = std::make_unique<NavMeshDb>(userDataPath + "/navmesh.db");
+                db = std::make_unique<NavMeshDb>(userDataPath + "/navmesh.db", settings.mMaxDbFileSize);
             }
             catch (const std::exception& e)
             {
diff --git a/components/detournavigator/navmeshdb.cpp b/components/detournavigator/navmeshdb.cpp
index 621c97f390..4d9ab3dafa 100644
--- a/components/detournavigator/navmeshdb.cpp
+++ b/components/detournavigator/navmeshdb.cpp
@@ -4,6 +4,7 @@
 #include <components/misc/compression.hpp>
 #include <components/sqlite3/db.hpp>
 #include <components/sqlite3/request.hpp>
+#include <components/misc/stringops.hpp>
 
 #include <DetourAlloc.h>
 
@@ -130,6 +131,27 @@ namespace DetourNavigator
         constexpr std::string_view vacuumQuery = R"(
             VACUUM;
         )";
+
+        struct GetPageSize
+        {
+            static std::string_view text() noexcept { return "pragma page_size;"; }
+            static void bind(sqlite3&, sqlite3_stmt&) {}
+        };
+
+        std::uint64_t getPageSize(sqlite3& db)
+        {
+            Sqlite3::Statement<GetPageSize> statement(db);
+            std::uint64_t value = 0;
+            request(db, statement, &value, 1);
+            return value;
+        }
+
+        void setMaxPageCount(sqlite3& db, std::uint64_t value)
+        {
+            const auto query = Misc::StringUtils::format("pragma max_page_count = %lu;", value);
+            if (const int ec = sqlite3_exec(&db, query.c_str(), nullptr, nullptr, nullptr); ec != SQLITE_OK)
+                throw std::runtime_error("Failed set max page count: " + std::string(sqlite3_errmsg(&db)));
+        }
     }
 
     std::ostream& operator<<(std::ostream& stream, ShapeType value)
@@ -142,7 +164,7 @@ namespace DetourNavigator
         return stream << "unknown shape type (" << static_cast<std::underlying_type_t<ShapeType>>(value) << ")";
     }
 
-    NavMeshDb::NavMeshDb(std::string_view path)
+    NavMeshDb::NavMeshDb(std::string_view path, std::uint64_t maxFileSize)
         : mDb(Sqlite3::makeDb(path, schema))
         , mGetMaxTileId(*mDb, DbQueries::GetMaxTileId {})
         , mFindTile(*mDb, DbQueries::FindTile {})
@@ -157,11 +179,13 @@ namespace DetourNavigator
         , mInsertShape(*mDb, DbQueries::InsertShape {})
         , mVacuum(*mDb, DbQueries::Vacuum {})
     {
+        const auto dbPageSize = getPageSize(*mDb);
+        setMaxPageCount(*mDb, maxFileSize / dbPageSize + static_cast<std::uint64_t>((maxFileSize % dbPageSize) != 0));
     }
 
-    Sqlite3::Transaction NavMeshDb::startTransaction()
+    Sqlite3::Transaction NavMeshDb::startTransaction(Sqlite3::TransactionMode mode)
     {
-        return Sqlite3::Transaction(*mDb);
+        return Sqlite3::Transaction(*mDb, mode);
     }
 
     TileId NavMeshDb::getMaxTileId()
diff --git a/components/detournavigator/navmeshdb.hpp b/components/detournavigator/navmeshdb.hpp
index 35aaeaf677..812452206e 100644
--- a/components/detournavigator/navmeshdb.hpp
+++ b/components/detournavigator/navmeshdb.hpp
@@ -141,9 +141,9 @@ namespace DetourNavigator
     class NavMeshDb
     {
     public:
-        explicit NavMeshDb(std::string_view path);
+        explicit NavMeshDb(std::string_view path, std::uint64_t maxFileSize);
 
-        Sqlite3::Transaction startTransaction();
+        Sqlite3::Transaction startTransaction(Sqlite3::TransactionMode mode = Sqlite3::TransactionMode::Default);
 
         TileId getMaxTileId();
 
diff --git a/components/detournavigator/settings.cpp b/components/detournavigator/settings.cpp
index cc2c685992..040a0a7b29 100644
--- a/components/detournavigator/settings.cpp
+++ b/components/detournavigator/settings.cpp
@@ -64,6 +64,7 @@ namespace DetourNavigator
         result.mNavMeshVersion = ::Settings::Manager::getInt("nav mesh version", "Navigator");
         result.mEnableNavMeshDiskCache = ::Settings::Manager::getBool("enable nav mesh disk cache", "Navigator");
         result.mWriteToNavMeshDb = ::Settings::Manager::getBool("write to navmeshdb", "Navigator");
+        result.mMaxDbFileSize = static_cast<std::uint64_t>(::Settings::Manager::getInt64("max navmeshdb file size", "Navigator"));
 
         return result;
     }
diff --git a/components/detournavigator/settings.hpp b/components/detournavigator/settings.hpp
index e6be8017d5..b107a6eb85 100644
--- a/components/detournavigator/settings.hpp
+++ b/components/detournavigator/settings.hpp
@@ -51,6 +51,7 @@ namespace DetourNavigator
         std::string mNavMeshPathPrefix;
         std::chrono::milliseconds mMinUpdateInterval;
         std::int64_t mNavMeshVersion = 0;
+        std::uint64_t mMaxDbFileSize = 0;
     };
 
     RecastSettings makeRecastSettingsFromSettingsManager();
diff --git a/components/sqlite3/db.cpp b/components/sqlite3/db.cpp
index b1e3afb1ae..f341fef064 100644
--- a/components/sqlite3/db.cpp
+++ b/components/sqlite3/db.cpp
@@ -10,7 +10,7 @@ namespace Sqlite3
 {
     void CloseSqlite3::operator()(sqlite3* handle) const noexcept
     {
-        sqlite3_close(handle);
+        sqlite3_close_v2(handle);
     }
 
     Db makeDb(std::string_view path, const char* schema)
diff --git a/components/sqlite3/transaction.cpp b/components/sqlite3/transaction.cpp
index 3012538652..bafd6e8d32 100644
--- a/components/sqlite3/transaction.cpp
+++ b/components/sqlite3/transaction.cpp
@@ -9,25 +9,43 @@
 
 namespace Sqlite3
 {
+    namespace
+    {
+        const char* getBeginStatement(TransactionMode mode)
+        {
+            switch (mode)
+            {
+                case TransactionMode::Default: return "BEGIN";
+                case TransactionMode::Deferred: return "BEGIN DEFERRED";
+                case TransactionMode::Immediate: return "BEGIN IMMEDIATE";
+                case TransactionMode::Exclusive: return "BEGIN EXCLUSIVE";
+            }
+            throw std::logic_error("Invalid transaction mode: " + std::to_string(static_cast<std::underlying_type_t<TransactionMode>>(mode)));
+        }
+    }
+
     void Rollback::operator()(sqlite3* db) const
     {
         if (db == nullptr)
             return;
         if (const int ec = sqlite3_exec(db, "ROLLBACK", nullptr, nullptr, nullptr); ec != SQLITE_OK)
-            Log(Debug::Warning) << "Failed to rollback SQLite3 transaction: " << std::string(sqlite3_errmsg(db));
+            Log(Debug::Debug) << "Failed to rollback SQLite3 transaction: " << sqlite3_errmsg(db) << " (" << ec << ")";
     }
 
-    Transaction::Transaction(sqlite3& db)
+    Transaction::Transaction(sqlite3& db, TransactionMode mode)
         : mDb(&db)
     {
-        if (const int ec = sqlite3_exec(mDb.get(), "BEGIN", nullptr, nullptr, nullptr); ec != SQLITE_OK)
-            throw std::runtime_error("Failed to start transaction: " + std::string(sqlite3_errmsg(mDb.get())));
+        if (const int ec = sqlite3_exec(&db, getBeginStatement(mode), nullptr, nullptr, nullptr); ec != SQLITE_OK)
+        {
+            (void) mDb.release();
+            throw std::runtime_error("Failed to start transaction: " + std::string(sqlite3_errmsg(&db)) + " (" + std::to_string(ec) + ")");
+        }
     }
 
     void Transaction::commit()
     {
         if (const int ec = sqlite3_exec(mDb.get(), "COMMIT", nullptr, nullptr, nullptr); ec != SQLITE_OK)
-            throw std::runtime_error("Failed to commit transaction: " + std::string(sqlite3_errmsg(mDb.get())));
+            throw std::runtime_error("Failed to commit transaction: " + std::string(sqlite3_errmsg(mDb.get())) + " (" + std::to_string(ec) + ")");
         (void) mDb.release();
     }
 }
diff --git a/components/sqlite3/transaction.hpp b/components/sqlite3/transaction.hpp
index 88b780a0a5..ff23bc03b5 100644
--- a/components/sqlite3/transaction.hpp
+++ b/components/sqlite3/transaction.hpp
@@ -12,10 +12,18 @@ namespace Sqlite3
         void operator()(sqlite3* handle) const;
     };
 
+    enum class TransactionMode
+    {
+        Default,
+        Deferred,
+        Immediate,
+        Exclusive,
+    };
+
     class Transaction
     {
     public:
-        Transaction(sqlite3& db);
+        explicit Transaction(sqlite3& db, TransactionMode mode = TransactionMode::Default);
 
         void commit();
 
diff --git a/docs/source/reference/modding/settings/navigator.rst b/docs/source/reference/modding/settings/navigator.rst
index 6d00c770bc..85924ca8cc 100644
--- a/docs/source/reference/modding/settings/navigator.rst
+++ b/docs/source/reference/modding/settings/navigator.rst
@@ -70,10 +70,19 @@ write to navmeshdb
 
 :Type:		boolean
 :Range:		True/False
-:Default:	False
+:Default:	True
 
 If true generated navmesh tiles will be stored into disk cache while game is running.
 
+max navmeshdb file size
+-----------------------
+
+:Type:		integer
+:Range:		> 0
+:Default:	2147483648
+
+Approximate maximum file size of navigation mesh cache stored on disk in bytes (value > 0).
+
 Advanced settings
 *****************
 
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 3d461d2dce..f76b67a7e5 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -938,7 +938,10 @@ nav mesh version = 1
 enable nav mesh disk cache = true
 
 # Cache navigation mesh tiles to disk (true, false)
-write to navmeshdb = false
+write to navmeshdb = true
+
+# Approximate maximum file size of navigation mesh cache stored on disk in bytes (value > 0)
+max navmeshdb file size = 2147483648
 
 [Shadows]
 

From d7d1a851431a688401178c728e2b27e8da12d4f6 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 19 Mar 2022 12:02:26 +0100
Subject: [PATCH 2204/2859] Restore dialogue autocompletion in the console

---
 apps/openmw/mwworld/store.cpp | 7 +++++++
 apps/openmw/mwworld/store.hpp | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index d35746dfff..1a6fdaf215 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -1072,6 +1072,13 @@ namespace MWWorld
         return true;
     }
 
+    void Store<ESM::Dialogue>::listIdentifier(std::vector<std::string>& list) const
+    {
+        list.reserve(list.size() + getSize());
+        for (const auto& dialogue : mShared)
+            list.push_back(dialogue->mId);
+    }
+
     const MWDialogue::KeywordSearch<std::string, int>& Store<ESM::Dialogue>::getDialogIdKeywordSearch() const
     {
         if (mKeywordSearchModFlag)
diff --git a/apps/openmw/mwworld/store.hpp b/apps/openmw/mwworld/store.hpp
index 1ec51ad5fd..36860f291a 100644
--- a/apps/openmw/mwworld/store.hpp
+++ b/apps/openmw/mwworld/store.hpp
@@ -474,6 +474,8 @@ namespace MWWorld
 
         RecordId load(ESM::ESMReader &esm) override;
 
+        void listIdentifier(std::vector<std::string> &list) const override;
+
         const MWDialogue::KeywordSearch<std::string, int>& getDialogIdKeywordSearch() const;
     };
 

From 8e81b6c645010807b92ad5807e3a12a391488eff Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sat, 19 Mar 2022 21:26:02 +0100
Subject: [PATCH 2205/2859] Fix updating UI image resource

---
 components/lua_ui/image.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/lua_ui/image.cpp b/components/lua_ui/image.cpp
index 69bccac1ed..7eeca1dc0e 100644
--- a/components/lua_ui/image.cpp
+++ b/components/lua_ui/image.cpp
@@ -35,6 +35,7 @@ namespace LuaUi
 
     void LuaImage::updateProperties()
     {
+        deleteAllItems();
         TextureResource* resource = propertyValue<TextureResource*>("resource", nullptr);
         MyGUI::IntCoord atlasCoord;
         if (resource)
@@ -59,6 +60,7 @@ namespace LuaUi
             tileH ? textureSize.width : 0,
             tileV ? textureSize.height : 0
         ));
+        setImageTile(textureSize);
 
         if (atlasCoord.width == 0)
             atlasCoord.width = textureSize.width;

From d185cb6dce015ca3dd4645ebc9d62cf70efe0ddf Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 20 Mar 2022 00:16:41 +0100
Subject: [PATCH 2206/2859] Add Lua function `ui.screenSize()`

---
 apps/openmw/mwlua/uibindings.cpp | 10 ++++++++++
 files/lua_api/openmw/ui.lua      |  5 +++++
 2 files changed, 15 insertions(+)

diff --git a/apps/openmw/mwlua/uibindings.cpp b/apps/openmw/mwlua/uibindings.cpp
index b384994654..4c26c904f3 100644
--- a/apps/openmw/mwlua/uibindings.cpp
+++ b/apps/openmw/mwlua/uibindings.cpp
@@ -6,6 +6,8 @@
 #include <components/lua_ui/alignment.hpp>
 #include <components/lua_ui/resources.hpp>
 
+#include <components/settings/settings.hpp>
+
 #include "context.hpp"
 #include "actions.hpp"
 #include "luamanagerimp.hpp"
@@ -296,6 +298,14 @@ namespace MWLua
             return luaManager->uiResourceManager()->registerTexture(data);
         };
 
+        api["screenSize"] = []()
+        {
+            return osg::Vec2f(
+                Settings::Manager::getInt("resolution x", "Video"),
+                Settings::Manager::getInt("resolution y", "Video")
+            );
+        };
+
         return LuaUtil::makeReadOnly(api);
     }
 }
diff --git a/files/lua_api/openmw/ui.lua b/files/lua_api/openmw/ui.lua
index 6461588a69..57be0da501 100644
--- a/files/lua_api/openmw/ui.lua
+++ b/files/lua_api/openmw/ui.lua
@@ -38,6 +38,11 @@
 -- @function [parent=#ui] showMessage
 -- @param #string msg
 
+---
+-- Returns the size of the OpenMW window in pixels as a 2D vector.
+-- @function [parent=#ui] screenSize
+-- @return openmw.util#Vector2
+
 ---
 -- Converts a given table of tables into an @{openmw.ui#Content}
 -- @function [parent=#ui] content

From 7afa7841de72d387be90000f6707adbd54fb3a75 Mon Sep 17 00:00:00 2001
From: mriesewijk3 <riesewij21@gmail.com>
Date: Sun, 20 Mar 2022 10:57:18 +0100
Subject: [PATCH 2207/2859] CONTRIBUTE.md: fix typo and consistency

---
 CONTRIBUTING.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 264db49cc1..4cdb164a3b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -22,9 +22,9 @@ 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://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
+* Summary of the changes made.
+* Reasoning / motivation behind the change.
+* What testing you have carried out to verify the change.
 
 Furthermore, we advise to:
 
@@ -51,9 +51,9 @@ OpenMW, in its default configuration, is meant to be a faithful reimplementation
 
 That said, we may sometimes evaluate such issues on an individual basis. Common exceptions to the above would be:
 
-* Issues so glaring that they would severely limit the capabilities of the engine in the future (for example, the scripting engine not being allowed to access objects in remote cells)
-* Bugs where the intent is very obvious, and that have little to no balancing impact (e.g. the bug were being tired made it easier to repair items, instead of harder)
-* Bugs that were fixed in an official patch for Morrowind 
+* Issues so glaring that they would severely limit the capabilities of the engine in the future (for example, the scripting engine not being allowed to access objects in remote cells).
+* Bugs where the intent is very obvious, and that have little to no balancing impact (e.g. the bug were being tired made it easier to repair items, instead of harder).
+* Bugs that were fixed in an official patch for Morrowind.
 
 Feature additions policy
 =====================
@@ -99,7 +99,7 @@ Code Review
 Merging
 =======
 
-To be able to merge PRs, commit priviledges are required. If you do not have the priviledges, just ping someone that does have them with a short comment like "Looks good to me @user".
+To be able to merge PRs, commit privileges are required. If you do not have the privileges, just ping someone that does have them with a short comment like "Looks good to me @user".
 
 The person to merge the PR may either use github's Merge button or if using the command line, use the ```--no-ff``` flag (so a merge commit is created, just like with Github's merge button) and include the pull request number in the commit description.
 

From 1b1e81b90e6191af4f047a9378b988fcfc653a76 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 20 Mar 2022 15:39:48 +0000
Subject: [PATCH 2208/2859] Lua bindings for ESM::Door and ESM::Weapon records

---
 apps/openmw/CMakeLists.txt         |  2 +-
 apps/openmw/mwlua/types/door.cpp   | 24 ++++++++++
 apps/openmw/mwlua/types/types.cpp  |  2 +-
 apps/openmw/mwlua/types/types.hpp  |  3 +-
 apps/openmw/mwlua/types/weapon.cpp | 68 ++++++++++++++++++++++++++++
 apps/openmw/mwworld/store.hpp      |  7 +++
 files/lua_api/openmw/types.lua     | 71 ++++++++++++++++++++++++++++++
 7 files changed, 174 insertions(+), 3 deletions(-)
 create mode 100644 apps/openmw/mwlua/types/weapon.cpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 9a83a5cdb7..b823674d31 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -60,7 +60,7 @@ add_openmw_dir (mwlua
     luamanagerimp actions object worldview userdataserializer eventqueue
     luabindings localscripts playerscripts objectbindings cellbindings asyncbindings settingsbindings
     camerabindings uibindings inputbindings nearbybindings
-    types/types types/door types/actor types/container
+    types/types types/door types/actor types/container types/weapon
     )
 
 add_openmw_dir (mwsound
diff --git a/apps/openmw/mwlua/types/door.cpp b/apps/openmw/mwlua/types/door.cpp
index efcf638360..5c13e27f9e 100644
--- a/apps/openmw/mwlua/types/door.cpp
+++ b/apps/openmw/mwlua/types/door.cpp
@@ -1,7 +1,17 @@
 #include "types.hpp"
 
+#include <components/esm3/loaddoor.hpp>
+
+#include <apps/openmw/mwworld/esmstore.hpp>
+
 #include "../luabindings.hpp"
 
+namespace sol
+{
+    template <>
+    struct is_automagical<ESM::Door> : std::false_type {};
+}
+
 namespace MWLua
 {
 
@@ -29,6 +39,20 @@ namespace MWLua
             else
                 return sol::nil;
         };
+
+        const MWWorld::Store<ESM::Door>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Door>();
+        door["record"] = sol::overload(
+            [](const Object& obj) -> const ESM::Door* { return obj.ptr().get<ESM::Door>()->mBase; },
+            [store](const std::string& recordId) -> const ESM::Door* { return store->find(recordId); });
+        sol::usertype<ESM::Door> record = context.mLua->sol().new_usertype<ESM::Door>("ESM3_Door");
+        record[sol::meta_function::to_string] = sol::readonly_property(
+            [](const ESM::Door& rec) -> std::string { return "ESM3_Door[" + rec.mId + "]"; });
+        record["id"] = sol::readonly_property([](const ESM::Door& rec) -> std::string { return rec.mId; });
+        record["name"] = sol::readonly_property([](const ESM::Door& rec) -> std::string { return rec.mName; });
+        record["model"] = sol::readonly_property([](const ESM::Door& rec) -> std::string { return rec.mModel; });
+        record["mwscript"] = sol::readonly_property([](const ESM::Door& rec) -> std::string { return rec.mScript; });
+        record["openSound"] = sol::readonly_property([](const ESM::Door& rec) -> std::string { return rec.mOpenSound; });
+        record["closeSound"] = sol::readonly_property([](const ESM::Door& rec) -> std::string { return rec.mCloseSound; });
     }
 
 }
diff --git a/apps/openmw/mwlua/types/types.cpp b/apps/openmw/mwlua/types/types.cpp
index 556c13963f..a175031058 100644
--- a/apps/openmw/mwlua/types/types.cpp
+++ b/apps/openmw/mwlua/types/types.cpp
@@ -166,7 +166,7 @@ namespace MWLua
         addType(ObjectTypeName::Light, {ESM::REC_LIGH}, ObjectTypeName::Item);
         addType(ObjectTypeName::MiscItem, {ESM::REC_MISC}, ObjectTypeName::Item);
         addType(ObjectTypeName::Potion, {ESM::REC_ALCH}, ObjectTypeName::Item);
-        addType(ObjectTypeName::Weapon, {ESM::REC_WEAP}, ObjectTypeName::Item);
+        addWeaponBindings(addType(ObjectTypeName::Weapon, {ESM::REC_WEAP}, ObjectTypeName::Item), context);
         addType(ObjectTypeName::Apparatus, {ESM::REC_APPA}, ObjectTypeName::Item);
         addType(ObjectTypeName::Lockpick, {ESM::REC_LOCK}, ObjectTypeName::Item);
         addType(ObjectTypeName::Probe, {ESM::REC_PROB}, ObjectTypeName::Item);
diff --git a/apps/openmw/mwlua/types/types.hpp b/apps/openmw/mwlua/types/types.hpp
index 966e32ccf2..af861c0bb4 100644
--- a/apps/openmw/mwlua/types/types.hpp
+++ b/apps/openmw/mwlua/types/types.hpp
@@ -24,9 +24,10 @@ namespace MWLua
     sol::table initTypesPackage(const Context& context);
 
     // used in initTypesPackage
-    void addContainerBindings(sol::table door, const Context& context);
+    void addContainerBindings(sol::table container, const Context& context);
     void addDoorBindings(sol::table door, const Context& context);
     void addActorBindings(sol::table actor, const Context& context);
+    void addWeaponBindings(sol::table weapon, const Context& context);
 }
 
 #endif // MWLUA_TYPES_H
diff --git a/apps/openmw/mwlua/types/weapon.cpp b/apps/openmw/mwlua/types/weapon.cpp
new file mode 100644
index 0000000000..746536cc69
--- /dev/null
+++ b/apps/openmw/mwlua/types/weapon.cpp
@@ -0,0 +1,68 @@
+#include "types.hpp"
+
+#include <components/esm3/loadweap.hpp>
+
+#include <apps/openmw/mwworld/esmstore.hpp>
+
+#include "../luabindings.hpp"
+
+namespace sol
+{
+    template <>
+    struct is_automagical<ESM::Weapon> : std::false_type {};
+}
+
+namespace MWLua
+{
+    void addWeaponBindings(sol::table weapon, const Context& context)
+    {
+        weapon["TYPE"] = LuaUtil::makeReadOnly(context.mLua->tableFromPairs<std::string_view, int>({
+            {"ShortBladeOneHand", ESM::Weapon::ShortBladeOneHand},
+            {"LongBladeOneHand", ESM::Weapon::LongBladeOneHand},
+            {"LongBladeTwoHand", ESM::Weapon::LongBladeTwoHand},
+            {"BluntOneHand", ESM::Weapon::BluntOneHand},
+            {"BluntTwoClose", ESM::Weapon::BluntTwoClose},
+            {"BluntTwoWide", ESM::Weapon::BluntTwoWide},
+            {"SpearTwoWide", ESM::Weapon::SpearTwoWide},
+            {"AxeOneHand", ESM::Weapon::AxeOneHand},
+            {"AxeTwoHand", ESM::Weapon::AxeTwoHand},
+            {"MarksmanBow", ESM::Weapon::MarksmanBow},
+            {"MarksmanCrossbow", ESM::Weapon::MarksmanCrossbow},
+            {"MarksmanThrown", ESM::Weapon::MarksmanThrown},
+            {"Arrow", ESM::Weapon::Arrow},
+            {"Bolt", ESM::Weapon::Bolt},
+        }));
+
+        const MWWorld::Store<ESM::Weapon>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Weapon>();
+        weapon["record"] = sol::overload(
+            [](const Object& obj) -> const ESM::Weapon* { return obj.ptr().get<ESM::Weapon>()->mBase; },
+            [store](const std::string& recordId) -> const ESM::Weapon* { return store->find(recordId); });
+        sol::usertype<ESM::Weapon> record = context.mLua->sol().new_usertype<ESM::Weapon>("ESM3_Weapon");
+        record[sol::meta_function::to_string] = sol::readonly_property(
+            [](const ESM::Weapon& rec) -> std::string { return "ESM3_Weapon[" + rec.mId + "]"; });
+        record["id"] = sol::readonly_property([](const ESM::Weapon& rec) -> std::string { return rec.mId; });
+        record["name"] = sol::readonly_property([](const ESM::Weapon& rec) -> std::string { return rec.mName; });
+        record["model"] = sol::readonly_property([](const ESM::Weapon& rec) -> std::string { return rec.mModel; });
+        record["icon"] = sol::readonly_property([](const ESM::Weapon& rec) -> std::string { return rec.mIcon; });
+        record["enchant"] = sol::readonly_property([](const ESM::Weapon& rec) -> std::string { return rec.mEnchant; });
+        record["mwscript"] = sol::readonly_property([](const ESM::Weapon& rec) -> std::string { return rec.mScript; });
+        record["isMagical"] = sol::readonly_property(
+            [](const ESM::Weapon& rec) -> bool { return rec.mData.mFlags & ESM::Weapon::Magical; });
+        record["isSilver"] = sol::readonly_property(
+            [](const ESM::Weapon& rec) -> bool { return rec.mData.mFlags & ESM::Weapon::Silver; });
+        record["weight"] = sol::readonly_property([](const ESM::Weapon& rec) -> float { return rec.mData.mWeight; });
+        record["value"] = sol::readonly_property([](const ESM::Weapon& rec) -> int { return rec.mData.mValue; });
+        record["type"] = sol::readonly_property([](const ESM::Weapon& rec) -> int { return rec.mData.mType; });
+        record["health"] = sol::readonly_property([](const ESM::Weapon& rec) -> int { return rec.mData.mHealth; });
+        record["speed"] = sol::readonly_property([](const ESM::Weapon& rec) -> float { return rec.mData.mSpeed; });
+        record["reach"] = sol::readonly_property([](const ESM::Weapon& rec) -> float { return rec.mData.mReach; });
+        record["enchant"] = sol::readonly_property([](const ESM::Weapon& rec) -> float { return rec.mData.mEnchant * 0.1f; });
+        record["chopMinDamage"] = sol::readonly_property([](const ESM::Weapon& rec) -> int { return rec.mData.mChop[0]; });
+        record["chopMaxDamage"] = sol::readonly_property([](const ESM::Weapon& rec) -> int { return rec.mData.mChop[1]; });
+        record["slashMinDamage"] = sol::readonly_property([](const ESM::Weapon& rec) -> int { return rec.mData.mSlash[0]; });
+        record["slashMaxDamage"] = sol::readonly_property([](const ESM::Weapon& rec) -> int { return rec.mData.mSlash[1]; });
+        record["thrustMinDamage"] = sol::readonly_property([](const ESM::Weapon& rec) -> int { return rec.mData.mThrust[0]; });
+        record["thrustMaxDamage"] = sol::readonly_property([](const ESM::Weapon& rec) -> int { return rec.mData.mThrust[1]; });
+    }
+
+}
diff --git a/apps/openmw/mwworld/store.hpp b/apps/openmw/mwworld/store.hpp
index 36860f291a..b352eaa311 100644
--- a/apps/openmw/mwworld/store.hpp
+++ b/apps/openmw/mwworld/store.hpp
@@ -77,6 +77,8 @@ namespace MWWorld
         void setUp();
 
         const T *search(int index) const;
+
+        // calls `search` and throws an exception if not found
         const T *find(int index) const;
     };
 
@@ -183,6 +185,7 @@ namespace MWWorld
         /** Returns a random record that starts with the named ID, or nullptr if not found. */
         const T *searchRandom(const std::string &id) const;
 
+        // calls `search` and throws an exception if not found
         const T *find(const std::string &id) const;
 
         iterator begin() const;
@@ -408,6 +411,8 @@ namespace MWWorld
         Store();
 
         const ESM::Attribute *search(size_t index) const;
+
+        // calls `search` and throws an exception if not found
         const ESM::Attribute *find(size_t index) const;
 
         void setUp();
@@ -428,6 +433,8 @@ namespace MWWorld
         Store();
 
         const ESM::WeaponType *search(const int id) const;
+
+        // calls `search` and throws an exception if not found
         const ESM::WeaponType *find(const int id) const;
 
         RecordId load(ESM::ESMReader &esm) override { return RecordId({}, false); }
diff --git a/files/lua_api/openmw/types.lua b/files/lua_api/openmw/types.lua
index 82dbded2e8..917a83ee8c 100644
--- a/files/lua_api/openmw/types.lua
+++ b/files/lua_api/openmw/types.lua
@@ -318,6 +318,58 @@
 -- @param openmw.core#GameObject object
 -- @return #boolean
 
+--- Weapon.TYPE
+-- @type WeaponTYPE
+-- @field #number ShortBladeOneHand
+-- @field #number LongBladeOneHand
+-- @field #number LongBladeTwoHand
+-- @field #number BluntOneHand
+-- @field #number BluntTwoClose
+-- @field #number BluntTwoWide
+-- @field #number SpearTwoWide
+-- @field #number AxeOneHand
+-- @field #number AxeTwoHand
+-- @field #number MarksmanBow
+-- @field #number MarksmanCrossbow
+-- @field #number MarksmanThrown
+-- @field #number Arrow
+-- @field #number Bolt
+
+--- @{#WeaponTYPE}
+-- @field [parent=#Weapon] #WeaponTYPE TYPE
+
+---
+-- Returns the read-only @{#WeaponRecord} of a weapon
+-- @function [parent=#Weapon] record
+-- @param #any objectOrRecordId
+-- @return #WeaponRecord
+
+---
+-- @type WeaponRecord
+-- @field #string id Record id
+-- @field #string name Human-readable name
+-- @field #string model VFS path to the model
+-- @field #string mwscript MWScript on this door (can be empty)
+-- @field #string icon
+-- @field #string enchant
+-- @field #boolean isMagical
+-- @field #boolean isSilver
+-- @field #number weight
+-- @field #number value
+-- @field #number type See @{#Weapon.TYPE}
+-- @field #number health
+-- @field #number speed
+-- @field #number reach
+-- @field #number enchant
+-- @field #number chopMinDamage
+-- @field #number chopMaxDamage
+-- @field #number slashMinDamage
+-- @field #number slashMaxDamage
+-- @field #number thrustMinDamage
+-- @field #number thrustMaxDamage
+
+
+
 --- @{#Apparatus} functions
 -- @field [parent=#types] #Apparatus Apparatus
 
@@ -404,6 +456,8 @@
 -- @param openmw.core#GameObject object
 -- @return #boolean
 
+
+
 --- @{#Door} functions
 -- @field [parent=#types] #Door Door
 
@@ -440,6 +494,23 @@
 -- @param openmw.core#GameObject object
 -- @return openmw.core#Cell
 
+---
+-- Returns the read-only @{#DoorRecord} of a door
+-- @function [parent=#Door] record
+-- @param #any objectOrRecordId
+-- @return #DoorRecord
+
+---
+-- @type DoorRecord
+-- @field #string id Record id
+-- @field #string name Human-readable name
+-- @field #string model VFS path to the model
+-- @field #string mwscript MWScript on this door (can be empty)
+-- @field #string openSound VFS path to the sound of opening
+-- @field #string closeSound VFS path to the sound of closing
+
+
+
 --- Functions for @{#Static} objects
 -- @field [parent=#types] #Static Static
 

From b502dc12f0883cf21a698bdfc0234359e1fd8ac4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Sun, 6 Mar 2022 20:02:03 +0200
Subject: [PATCH 2209/2859] Add prng to World instance and serialize state in
 Save

---
 apps/openmw/mwbase/world.hpp     |  3 +++
 apps/openmw/mwworld/worldimp.cpp | 20 ++++++++++++++++++++
 apps/openmw/mwworld/worldimp.hpp |  5 ++++-
 components/esm/defs.hpp          |  3 +++
 components/esm3/savedgame.cpp    |  2 +-
 5 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 0b55484278..23e687be5a 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -9,6 +9,7 @@
 #include <deque>
 
 #include <components/esm3/cellid.hpp>
+#include <components/misc/rng.hpp>
 
 #include <osg/Timer>
 
@@ -658,6 +659,8 @@ namespace MWBase
             virtual void reportStats(unsigned int frameNumber, osg::Stats& stats) const = 0;
 
             virtual std::vector<MWWorld::Ptr> getAll(const std::string& id) = 0;
+
+            virtual Misc::Rng::Generator& getPrng() = 0;
     };
 }
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index a5ab0968ee..afb248bf08 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -359,6 +359,12 @@ namespace MWWorld
         writer.writeHNT("LEVT", mLevitationEnabled);
         writer.endRecord(ESM::REC_ENAB);
 
+        std::stringstream ssPrng;
+        ssPrng << mPrng;
+        writer.startRecord(ESM::REC_RAND);
+        writer.writeHString(ssPrng.str());
+        writer.endRecord(ESM::REC_RAND);
+
         writer.startRecord(ESM::REC_CAM_);
         writer.writeHNT("FIRS", isFirstPerson());
         writer.endRecord(ESM::REC_CAM_);
@@ -376,6 +382,14 @@ namespace MWWorld
                 reader.getHNT(mTeleportEnabled, "TELE");
                 reader.getHNT(mLevitationEnabled, "LEVT");
                 return;
+            case ESM::REC_RAND:
+                {
+                    std::stringstream ssPrng;
+                    ssPrng << reader.getHString();
+                    ssPrng.seekg(0);
+                    ssPrng >> mPrng;
+                }
+                break;
             case ESM::REC_PLAY:
                 mStore.checkPlayer();
                 mPlayer->readRecord(reader, type);
@@ -3999,4 +4013,10 @@ namespace MWWorld
     {
         return mCells.getAll(id);
     }
+
+    Misc::Rng::Generator& World::getPrng()
+    {
+        return mPrng;
+    }
+
 }
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 61154afb59..eb089f04d7 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -4,6 +4,7 @@
 #include <osg/ref_ptr>
 
 #include <components/settings/settings.hpp>
+#include <components/misc/rng.hpp>
 
 #include "../mwbase/world.hpp"
 
@@ -84,7 +85,7 @@ namespace MWWorld
             GroundcoverStore mGroundcoverStore;
             LocalScripts mLocalScripts;
             MWWorld::Globals mGlobalVariables;
-
+            Misc::Rng::Generator mPrng;
             Cells mCells;
 
             std::string mCurrentWorldSpace;
@@ -736,6 +737,8 @@ namespace MWWorld
             void reportStats(unsigned int frameNumber, osg::Stats& stats) const override;
 
             std::vector<MWWorld::Ptr> getAll(const std::string& id) override;
+
+            Misc::Rng::Generator& getPrng() override;
     };
 }
 
diff --git a/components/esm/defs.hpp b/components/esm/defs.hpp
index f587fc6690..60d34a9355 100644
--- a/components/esm/defs.hpp
+++ b/components/esm/defs.hpp
@@ -173,6 +173,9 @@ enum RecNameInts : unsigned int
 
     // format 16 - Lua scripts in saved games
     REC_LUAM = fourCC("LUAM"),  // LuaManager data
+
+    // format 21 - Random state in saved games.
+    REC_RAND = fourCC("RAND"),  // Random state.
 };
 
 /// Common subrecords
diff --git a/components/esm3/savedgame.cpp b/components/esm3/savedgame.cpp
index 18498abe2c..667dbdfbce 100644
--- a/components/esm3/savedgame.cpp
+++ b/components/esm3/savedgame.cpp
@@ -4,7 +4,7 @@
 #include "esmwriter.hpp"
 
 unsigned int ESM::SavedGame::sRecordId = ESM::REC_SAVE;
-int ESM::SavedGame::sCurrentFormat = 20;
+int ESM::SavedGame::sCurrentFormat = 21;
 
 void ESM::SavedGame::load (ESMReader &esm)
 {

From 08fae7be6e9e09381d1b69d0c5966ac78821f892 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Sun, 6 Mar 2022 21:56:02 +0200
Subject: [PATCH 2210/2859] Pass the prng from world where appropriate

---
 apps/openmw/mwclass/activator.cpp             | 10 ++--
 apps/openmw/mwclass/book.cpp                  |  3 +-
 apps/openmw/mwclass/container.cpp             |  6 ++-
 apps/openmw/mwclass/creature.cpp              | 18 ++++---
 apps/openmw/mwclass/creaturelevlist.cpp       |  3 +-
 apps/openmw/mwclass/npc.cpp                   | 19 ++++---
 apps/openmw/mwgui/jailscreen.cpp              |  3 +-
 apps/openmw/mwgui/pickpocketitemmodel.cpp     |  4 +-
 apps/openmw/mwgui/waitdialog.cpp              |  2 +-
 apps/openmw/mwmechanics/actor.cpp             |  5 ++
 apps/openmw/mwmechanics/actor.hpp             |  7 +--
 apps/openmw/mwmechanics/actors.cpp            |  2 +-
 apps/openmw/mwmechanics/aiavoiddoor.cpp       |  3 +-
 apps/openmw/mwmechanics/aicombat.cpp          | 51 +++++++++++++++----
 apps/openmw/mwmechanics/aicombat.hpp          | 24 +--------
 apps/openmw/mwmechanics/aipackage.cpp         |  1 +
 apps/openmw/mwmechanics/aitimer.hpp           | 15 ++++--
 apps/openmw/mwmechanics/aitravel.cpp          |  3 ++
 apps/openmw/mwmechanics/aiwander.cpp          | 42 +++++++++++----
 apps/openmw/mwmechanics/aiwander.hpp          | 13 +----
 apps/openmw/mwmechanics/alchemy.cpp           |  7 +--
 apps/openmw/mwmechanics/character.cpp         | 23 ++++++---
 apps/openmw/mwmechanics/combat.cpp            | 13 +++--
 apps/openmw/mwmechanics/disease.hpp           |  3 +-
 apps/openmw/mwmechanics/enchanting.cpp        |  3 +-
 apps/openmw/mwmechanics/levelledlist.hpp      |  2 +-
 .../mwmechanics/mechanicsmanagerimp.cpp       |  7 +--
 apps/openmw/mwmechanics/pickpocket.cpp        |  3 +-
 apps/openmw/mwmechanics/recharge.cpp          |  3 +-
 apps/openmw/mwmechanics/repair.cpp            |  3 +-
 apps/openmw/mwmechanics/security.cpp          |  6 ++-
 apps/openmw/mwmechanics/spellcasting.cpp      |  9 ++--
 apps/openmw/mwmechanics/spelleffects.cpp      | 15 ++++--
 apps/openmw/mwmechanics/spellresistance.cpp   |  3 +-
 apps/openmw/mwmechanics/trading.cpp           |  3 +-
 apps/openmw/mwscript/containerextensions.cpp  |  3 +-
 apps/openmw/mwscript/miscextensions.cpp       |  3 +-
 apps/openmw/mwstate/statemanagerimp.cpp       |  1 +
 apps/openmw/mwworld/class.cpp                 |  3 +-
 apps/openmw/mwworld/containerstore.hpp        |  2 +-
 apps/openmw/mwworld/store.cpp                 |  4 +-
 apps/openmw/mwworld/store.hpp                 |  3 +-
 components/misc/timer.hpp                     |  4 +-
 43 files changed, 222 insertions(+), 138 deletions(-)

diff --git a/apps/openmw/mwclass/activator.cpp b/apps/openmw/mwclass/activator.cpp
index a60c44265c..0b4edf4e1a 100644
--- a/apps/openmw/mwclass/activator.cpp
+++ b/apps/openmw/mwclass/activator.cpp
@@ -120,7 +120,8 @@ namespace MWClass
         if(actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
         {
             const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
-            const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfActivator");
+            auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+            const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfActivator", prng);
 
             std::shared_ptr<MWWorld::Action> action(new MWWorld::FailedAction("#{sWerewolfRefusal}"));
             if(sound) action->setSound(sound->mId);
@@ -156,6 +157,7 @@ namespace MWClass
         int type = getSndGenTypeFromName(name);
 
         std::vector<const ESM::SoundGenerator*> fallbacksounds;
+        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
         if (!creatureId.empty())
         {
             std::vector<const ESM::SoundGenerator*> sounds;
@@ -168,9 +170,9 @@ namespace MWClass
             }
 
             if (!sounds.empty())
-                return sounds[Misc::Rng::rollDice(sounds.size())]->mSound;
+                return sounds[Misc::Rng::rollDice(sounds.size(), prng)]->mSound;
             if (!fallbacksounds.empty())
-                return fallbacksounds[Misc::Rng::rollDice(fallbacksounds.size())]->mSound;
+                return fallbacksounds[Misc::Rng::rollDice(fallbacksounds.size(), prng)]->mSound;
         }
         else
         {
@@ -180,7 +182,7 @@ namespace MWClass
                     fallbacksounds.push_back(&*sound);
 
             if (!fallbacksounds.empty())
-                return fallbacksounds[Misc::Rng::rollDice(fallbacksounds.size())]->mSound;
+                return fallbacksounds[Misc::Rng::rollDice(fallbacksounds.size(), prng)]->mSound;
         }
 
         return std::string();
diff --git a/apps/openmw/mwclass/book.cpp b/apps/openmw/mwclass/book.cpp
index 3fcd7368d6..f9350222f1 100644
--- a/apps/openmw/mwclass/book.cpp
+++ b/apps/openmw/mwclass/book.cpp
@@ -56,7 +56,8 @@ namespace MWClass
         if(actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
         {
             const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
-            const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfItem");
+            auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+            const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfItem", prng);
 
             std::shared_ptr<MWWorld::Action> action(new MWWorld::FailedAction("#{sWerewolfRefusal}"));
             if(sound) action->setSound(sound->mId);
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index 09d33af414..e319cdf410 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -32,7 +32,8 @@ namespace MWClass
 {
     ContainerCustomData::ContainerCustomData(const ESM::Container& container, MWWorld::CellStore* cell)
     {
-        unsigned int seed = Misc::Rng::rollDice(std::numeric_limits<int>::max());
+        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+        unsigned int seed = Misc::Rng::rollDice(std::numeric_limits<int>::max(), prng);
         // setting ownership not needed, since taking items from a container inherits the
         // container's owner automatically
         mStore.fillNonRandom(container.mInventory, "", seed);
@@ -139,7 +140,8 @@ namespace MWClass
         if(actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
         {
             const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
-            const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfContainer");
+            auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+            const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfContainer", prng);
 
             std::shared_ptr<MWWorld::Action> action(new MWWorld::FailedAction("#{sWerewolfRefusal}"));
             if(sound) action->setSound(sound->mId);
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 49b3627952..6a633bc668 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -159,7 +159,8 @@ namespace MWClass
 
             resetter.mPtr = {};
 
-            getContainerStore(ptr).fill(ref->mBase->mInventory, ptr.getCellRef().getRefId());
+            auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+            getContainerStore(ptr).fill(ref->mBase->mInventory, ptr.getCellRef().getRefId(), prng);
 
             if (hasInventory)
                 getInventoryStore(ptr).autoEquip(ptr);
@@ -264,8 +265,8 @@ namespace MWClass
         osg::Vec3f hitPosition (result.second);
 
         float hitchance = MWMechanics::getHitChance(ptr, victim, ref->mBase->mData.mCombat);
-
-        if(Misc::Rng::roll0to99() >= hitchance)
+        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+        if(Misc::Rng::roll0to99(prng) >= hitchance)
         {
             victim.getClass().onHit(victim, 0.0f, false, MWWorld::Ptr(), ptr, osg::Vec3f(), false);
             MWMechanics::reduceWeaponCondition(0.f, false, weapon, ptr);
@@ -392,7 +393,8 @@ namespace MWClass
                 float agilityTerm = stats.getAttribute(ESM::Attribute::Agility).getModified() * getGmst().fKnockDownMult->mValue.getFloat();
                 float knockdownTerm = stats.getAttribute(ESM::Attribute::Agility).getModified()
                         * getGmst().iKnockDownOddsMult->mValue.getInteger() * 0.01f + getGmst().iKnockDownOddsBase->mValue.getInteger();
-                if (ishealth && agilityTerm <= damage && knockdownTerm <= Misc::Rng::roll0to99())
+                auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+                if (ishealth && agilityTerm <= damage && knockdownTerm <= Misc::Rng::roll0to99(prng))
                     stats.setKnockedDown(true);
                 else
                     stats.setHitRecovery(true); // Is this supposed to always occur?
@@ -429,7 +431,8 @@ namespace MWClass
         if(actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
         {
             const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
-            const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfCreature");
+            auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+            const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfCreature", prng);
 
             std::shared_ptr<MWWorld::Action> action(new MWWorld::FailedAction("#{sWerewolfRefusal}"));
             if(sound) action->setSound(sound->mId);
@@ -642,10 +645,11 @@ namespace MWClass
             }
         }
 
+        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
         if (!sounds.empty())
-            return sounds[Misc::Rng::rollDice(sounds.size())]->mSound;
+            return sounds[Misc::Rng::rollDice(sounds.size(), prng)]->mSound;
         if (!fallbacksounds.empty())
-            return fallbacksounds[Misc::Rng::rollDice(fallbacksounds.size())]->mSound;
+            return fallbacksounds[Misc::Rng::rollDice(fallbacksounds.size(), prng)]->mSound;
 
         return std::string();
     }
diff --git a/apps/openmw/mwclass/creaturelevlist.cpp b/apps/openmw/mwclass/creaturelevlist.cpp
index 66e35e5bf8..de40030a80 100644
--- a/apps/openmw/mwclass/creaturelevlist.cpp
+++ b/apps/openmw/mwclass/creaturelevlist.cpp
@@ -127,7 +127,8 @@ namespace MWClass
         MWWorld::LiveCellRef<ESM::CreatureLevList> *ref =
             ptr.get<ESM::CreatureLevList>();
 
-        std::string id = MWMechanics::getLevelledItem(ref->mBase, true);
+        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+        std::string id = MWMechanics::getLevelledItem(ref->mBase, true, prng);
 
         if (!id.empty())
         {
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index bfae090545..94027e5039 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -394,7 +394,8 @@ namespace MWClass
 
             // inventory
             // setting ownership is used to make the NPC auto-equip his initial equipment only, and not bartered items
-            getInventoryStore(ptr).fill(ref->mBase->mInventory, ptr.getCellRef().getRefId());
+            auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+            getInventoryStore(ptr).fill(ref->mBase->mInventory, ptr.getCellRef().getRefId(), prng);
 
             getInventoryStore(ptr).autoEquip(ptr);
         }
@@ -584,7 +585,7 @@ namespace MWClass
 
         float hitchance = MWMechanics::getHitChance(ptr, victim, getSkill(ptr, weapskill));
 
-        if (Misc::Rng::roll0to99() >= hitchance)
+        if (Misc::Rng::roll0to99(world->getPrng()) >= hitchance)
         {
             othercls.onHit(victim, 0.0f, false, weapon, ptr, osg::Vec3f(), false);
             MWMechanics::reduceWeaponCondition(0.f, false, weapon, ptr);
@@ -726,15 +727,16 @@ namespace MWClass
             const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
             const GMST& gmst = getGmst();
 
-            int chance = store.get<ESM::GameSetting>().find("iVoiceHitOdds")->mValue.getInteger();
-            if (Misc::Rng::roll0to99() < chance)
+            int chance = store.get<ESM::GameSetting>().find("iVoiceHitOdds")->mValue.getInteger(); 
+            auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+            if (Misc::Rng::roll0to99(prng) < chance)
                 MWBase::Environment::get().getDialogueManager()->say(ptr, "hit");
 
             // Check for knockdown
             float agilityTerm = stats.getAttribute(ESM::Attribute::Agility).getModified() * gmst.fKnockDownMult->mValue.getFloat();
             float knockdownTerm = stats.getAttribute(ESM::Attribute::Agility).getModified()
                     * gmst.iKnockDownOddsMult->mValue.getInteger() * 0.01f + gmst.iKnockDownOddsBase->mValue.getInteger();
-            if (ishealth && agilityTerm <= damage && knockdownTerm <= Misc::Rng::roll0to99())
+            if (ishealth && agilityTerm <= damage && knockdownTerm <= Misc::Rng::roll0to99(prng))
                 stats.setKnockedDown(true);
             else
                 stats.setHitRecovery(true); // Is this supposed to always occur?
@@ -757,7 +759,7 @@ namespace MWClass
                     MWWorld::InventoryStore::Slot_RightPauldron, MWWorld::InventoryStore::Slot_RightPauldron,
                     MWWorld::InventoryStore::Slot_LeftGauntlet, MWWorld::InventoryStore::Slot_RightGauntlet
                 };
-                int hitslot = hitslots[Misc::Rng::rollDice(20)];
+                int hitslot = hitslots[Misc::Rng::rollDice(20, prng)];
 
                 float unmitigatedDamage = damage;
                 float x = damage / (damage + getArmorRating(ptr));
@@ -773,7 +775,7 @@ namespace MWClass
                 // If there's no item in the carried left slot or if it is not a shield redistribute the hit.
                 if (!hasArmor && hitslot == MWWorld::InventoryStore::Slot_CarriedLeft)
                 {
-                    if (Misc::Rng::rollDice(2) == 0)
+                    if (Misc::Rng::rollDice(2, prng) == 0)
                         hitslot = MWWorld::InventoryStore::Slot_Cuirass;
                     else
                         hitslot = MWWorld::InventoryStore::Slot_LeftPauldron;
@@ -865,7 +867,8 @@ namespace MWClass
         if(actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
         {
             const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
-            const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfNPC");
+            auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+            const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfNPC", prng);
 
             std::shared_ptr<MWWorld::Action> action(new MWWorld::FailedAction("#{sWerewolfRefusal}"));
             if(sound) action->setSound(sound->mId);
diff --git a/apps/openmw/mwgui/jailscreen.cpp b/apps/openmw/mwgui/jailscreen.cpp
index 53219a29d6..92c0fc9edc 100644
--- a/apps/openmw/mwgui/jailscreen.cpp
+++ b/apps/openmw/mwgui/jailscreen.cpp
@@ -87,7 +87,8 @@ namespace MWGui
         std::set<int> skills;
         for (int day=0; day<mDays; ++day)
         {
-            int skill = Misc::Rng::rollDice(ESM::Skill::Length);
+            auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+            int skill = Misc::Rng::rollDice(ESM::Skill::Length, prng);
             skills.insert(skill);
 
             MWMechanics::SkillValue& value = player.getClass().getNpcStats(player).getSkill(skill);
diff --git a/apps/openmw/mwgui/pickpocketitemmodel.cpp b/apps/openmw/mwgui/pickpocketitemmodel.cpp
index 5ba1b4aafa..2b4d474059 100644
--- a/apps/openmw/mwgui/pickpocketitemmodel.cpp
+++ b/apps/openmw/mwgui/pickpocketitemmodel.cpp
@@ -24,13 +24,13 @@ namespace MWGui
         float chance = player.getClass().getSkill(player, ESM::Skill::Sneak);
 
         mSourceModel->update();
-
         // build list of items that player is unable to find when attempts to pickpocket.
         if (hideItems)
         {
+            auto& prng = MWBase::Environment::get().getWorld()->getPrng();
             for (size_t i = 0; i<mSourceModel->getItemCount(); ++i)
             {
-                if (Misc::Rng::roll0to99() > chance)
+                if (Misc::Rng::roll0to99(prng) > chance)
                     mHiddenItems.push_back(mSourceModel->getItem(i));
             }
         }
diff --git a/apps/openmw/mwgui/waitdialog.cpp b/apps/openmw/mwgui/waitdialog.cpp
index 42a70dcfa7..754777c507 100644
--- a/apps/openmw/mwgui/waitdialog.cpp
+++ b/apps/openmw/mwgui/waitdialog.cpp
@@ -191,7 +191,7 @@ namespace MWGui
                 if (!region->mSleepList.empty())
                 {
                     // figure out if player will be woken while sleeping
-                    int x = Misc::Rng::rollDice(hoursToWait);
+                    int x = Misc::Rng::rollDice(hoursToWait, world->getPrng());
                     float fSleepRandMod = world->getStore().get<ESM::GameSetting>().find("fSleepRandMod")->mValue.getFloat();
                     if (x < fSleepRandMod * hoursToWait)
                     {
diff --git a/apps/openmw/mwmechanics/actor.cpp b/apps/openmw/mwmechanics/actor.cpp
index 5801ea751d..d1d37eeb56 100644
--- a/apps/openmw/mwmechanics/actor.cpp
+++ b/apps/openmw/mwmechanics/actor.cpp
@@ -60,6 +60,11 @@ namespace MWMechanics
         mIsTurningToPlayer = turning;
     }
 
+    Misc::TimerStatus Actor::updateEngageCombatTimer(float duration)
+    {
+        return mEngageCombat.update(duration, MWBase::Environment::get().getWorld()->getPrng());
+    }
+
     void Actor::setPositionAdjusted(bool adjusted)
     {
         mPositionAdjusted = adjusted;
diff --git a/apps/openmw/mwmechanics/actor.hpp b/apps/openmw/mwmechanics/actor.hpp
index c25fc1cb73..231c756810 100644
--- a/apps/openmw/mwmechanics/actor.hpp
+++ b/apps/openmw/mwmechanics/actor.hpp
@@ -43,10 +43,7 @@ namespace MWMechanics
         bool isTurningToPlayer() const;
         void setTurningToPlayer(bool turning);
 
-        Misc::TimerStatus updateEngageCombatTimer(float duration)
-        {
-            return mEngageCombat.update(duration);
-        }
+        Misc::TimerStatus updateEngageCombatTimer(float duration);
 
         void setPositionAdjusted(bool adjusted);
         bool getPositionAdjusted() const;
@@ -57,7 +54,7 @@ namespace MWMechanics
         float mTargetAngleRadians{0.f};
         GreetingState mGreetingState{Greet_None};
         bool mIsTurningToPlayer{false};
-        Misc::DeviatingPeriodicTimer mEngageCombat{1.0f, 0.25f, Misc::Rng::deviate(0, 0.25f)};
+        Misc::DeviatingPeriodicTimer mEngageCombat{1.0f, 0.25f, Misc::Rng::deviate(0, 0.25f, MWBase::Environment::get().getWorld()->getPrng())};
         bool mPositionAdjusted;
     };
 
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index f13afb02d6..b7b83ed562 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -305,7 +305,7 @@ namespace MWMechanics
         // We chose to use the chance MW would have when run at 60 FPS with the default value of the GMST.
         const float delta = MWBase::Environment::get().getFrameDuration() * 6.f;
         static const float fVoiceIdleOdds = world->getStore().get<ESM::GameSetting>().find("fVoiceIdleOdds")->mValue.getFloat();
-        if (Misc::Rng::rollProbability() * 10000.f < fVoiceIdleOdds * delta && world->getLOS(getPlayer(), actor))
+        if (Misc::Rng::rollProbability(world->getPrng()) * 10000.f < fVoiceIdleOdds * delta && world->getLOS(getPlayer(), actor))
             MWBase::Environment::get().getDialogueManager()->say(actor, "idle");
     }
 
diff --git a/apps/openmw/mwmechanics/aiavoiddoor.cpp b/apps/openmw/mwmechanics/aiavoiddoor.cpp
index 6a59ae2bfb..e8cb71add0 100644
--- a/apps/openmw/mwmechanics/aiavoiddoor.cpp
+++ b/apps/openmw/mwmechanics/aiavoiddoor.cpp
@@ -80,7 +80,8 @@ bool MWMechanics::AiAvoidDoor::isStuck(const osg::Vec3f& actorPos) const
 
 void MWMechanics::AiAvoidDoor::adjustDirection()
 {
-    mDirection = Misc::Rng::rollDice(MAX_DIRECTIONS);
+    auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+    mDirection = Misc::Rng::rollDice(MAX_DIRECTIONS, prng);
 }
 
 float MWMechanics::AiAvoidDoor::getAdjustedAngle() const
diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index 9776bb8891..12671d50dd 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -370,7 +370,8 @@ namespace MWMechanics
 
                             if (!points.empty())
                             {
-                                ESM::Pathgrid::Point dest = points[Misc::Rng::rollDice(points.size())];
+                                auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+                                ESM::Pathgrid::Point dest = points[Misc::Rng::rollDice(points.size(), prng)];
                                 coords.toWorld(dest);
 
                                 state = AiCombatStorage::FleeState_RunToDestination;
@@ -464,8 +465,38 @@ namespace MWMechanics
         sequence.mPackages.push_back(std::move(package));
     }
 
+
+    AiCombatStorage::AiCombatStorage() :
+        mAttackCooldown(0.0f),
+        mReaction(MWBase::Environment::get().getWorld()->getPrng()),
+        mTimerCombatMove(0.0f),
+        mReadyToAttack(false),
+        mAttack(false),
+        mAttackRange(0.0f),
+        mCombatMove(false),
+        mRotateMove(false),
+        mLastTargetPos(0, 0, 0),
+        mCell(nullptr),
+        mCurrentAction(),
+        mActionCooldown(0.0f),
+        mStrength(),
+        mForceNoShortcut(false),
+        mShortcutFailPos(),
+        mMovement(),
+        mFleeState(FleeState_None),
+        mLOS(false),
+        mUpdateLOSTimer(0.0f),
+        mFleeBlindRunTimer(0.0f),
+        mUseCustomDestination(false),
+        mCustomDestination()
+    {
+
+    }
+
     void AiCombatStorage::startCombatMove(bool isDistantCombat, float distToTarget, float rangeAttack, const MWWorld::Ptr& actor, const MWWorld::Ptr& target)
     {
+        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+
         // get the range of the target's weapon
         MWWorld::Ptr targetWeapon = MWWorld::Ptr();
         const MWWorld::Class& targetClass = target.getClass();
@@ -483,7 +514,7 @@ namespace MWMechanics
         
         if (mMovement.mPosition[0] || mMovement.mPosition[1])
         {
-            mTimerCombatMove = 0.1f + 0.1f * Misc::Rng::rollClosedProbability();
+            mTimerCombatMove = 0.1f + 0.1f * Misc::Rng::rollClosedProbability(prng);
             mCombatMove = true;
         }
         else if (isDistantCombat)
@@ -537,11 +568,11 @@ namespace MWMechanics
             // if actor is within range of target's weapon.
             if (std::abs(angleToTarget) > osg::PI / 4)
                 moveDuration = 0.2f;
-            else if (distToTarget <= rangeAttackOfTarget && Misc::Rng::rollClosedProbability() < 0.25)
-                moveDuration = 0.1f + 0.1f * Misc::Rng::rollClosedProbability();
+            else if (distToTarget <= rangeAttackOfTarget && Misc::Rng::rollClosedProbability(prng) < 0.25)
+                moveDuration = 0.1f + 0.1f * Misc::Rng::rollClosedProbability(prng);
             if (moveDuration > 0)
             {
-                mMovement.mPosition[0] = Misc::Rng::rollProbability() < 0.5 ? 1.0f : -1.0f; // to the left/right
+                mMovement.mPosition[0] = Misc::Rng::rollProbability(prng) < 0.5 ? 1.0f : -1.0f; // to the left/right
                 mTimerCombatMove = moveDuration;
                 mCombatMove = true;
             }
@@ -580,7 +611,8 @@ namespace MWMechanics
                 if (!distantCombat)
                     characterController.setAIAttackType(chooseBestAttack(weapon));
 
-                mStrength = Misc::Rng::rollClosedProbability();
+                auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+                mStrength = Misc::Rng::rollClosedProbability(prng);
 
                 const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
 
@@ -592,11 +624,11 @@ namespace MWMechanics
 
                 // Say a provoking combat phrase
                 const int iVoiceAttackOdds = store.get<ESM::GameSetting>().find("iVoiceAttackOdds")->mValue.getInteger();
-                if (Misc::Rng::roll0to99() < iVoiceAttackOdds)
+                if (Misc::Rng::roll0to99(prng) < iVoiceAttackOdds)
                 {
                     MWBase::Environment::get().getDialogueManager()->say(actor, "attack");
                 }
-                mAttackCooldown = std::min(baseDelay + 0.01 * Misc::Rng::roll0to99(), baseDelay + 0.9);
+                mAttackCooldown = std::min(baseDelay + 0.01 * Misc::Rng::roll0to99(prng), baseDelay + 0.9);
             }
             else
                 mAttackCooldown -= AI_REACTION_TIME;
@@ -657,7 +689,8 @@ std::string chooseBestAttack(const ESM::Weapon* weapon)
         int chop = (weapon->mData.mChop[0] + weapon->mData.mChop[1])/2;
         int thrust = (weapon->mData.mThrust[0] + weapon->mData.mThrust[1])/2;
 
-        float roll = Misc::Rng::rollClosedProbability() * (slash + chop + thrust);
+        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+        float roll = Misc::Rng::rollClosedProbability(prng) * (slash + chop + thrust);
         if(roll <= slash)
             attackType = "slash";
         else if(roll <= (slash + thrust))
diff --git a/apps/openmw/mwmechanics/aicombat.hpp b/apps/openmw/mwmechanics/aicombat.hpp
index c783994b97..566ec354d6 100644
--- a/apps/openmw/mwmechanics/aicombat.hpp
+++ b/apps/openmw/mwmechanics/aicombat.hpp
@@ -59,29 +59,7 @@ namespace MWMechanics
         bool mUseCustomDestination;
         osg::Vec3f mCustomDestination;
 
-        AiCombatStorage():
-        mAttackCooldown(0.0f),
-        mTimerCombatMove(0.0f),
-        mReadyToAttack(false),
-        mAttack(false),
-        mAttackRange(0.0f),
-        mCombatMove(false),
-        mRotateMove(false),
-        mLastTargetPos(0,0,0),
-        mCell(nullptr),
-        mCurrentAction(),
-        mActionCooldown(0.0f),
-        mStrength(),
-        mForceNoShortcut(false),
-        mShortcutFailPos(),
-        mMovement(),
-        mFleeState(FleeState_None),
-        mLOS(false),
-        mUpdateLOSTimer(0.0f),
-        mFleeBlindRunTimer(0.0f),
-        mUseCustomDestination(false),
-        mCustomDestination()
-        {}
+        AiCombatStorage();
 
         void startCombatMove(bool isDistantCombat, float distToTarget, float rangeAttack, const MWWorld::Ptr& actor, const MWWorld::Ptr& target);
         void updateCombatMove(float duration);
diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index e8e03daad6..1a674d444a 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -43,6 +43,7 @@ namespace
 
 MWMechanics::AiPackage::AiPackage(AiPackageTypeId typeId, const Options& options) :
     mTypeId(typeId),
+    mReaction(MWBase::Environment::get().getWorld()->getPrng()),
     mOptions(options),
     mTargetActorRefId(""),
     mTargetActorId(-1),
diff --git a/apps/openmw/mwmechanics/aitimer.hpp b/apps/openmw/mwmechanics/aitimer.hpp
index 804cda1bd2..e4bc07e52d 100644
--- a/apps/openmw/mwmechanics/aitimer.hpp
+++ b/apps/openmw/mwmechanics/aitimer.hpp
@@ -13,13 +13,20 @@ namespace MWMechanics
         public:
             static constexpr float sDeviation = 0.1f;
 
-            Misc::TimerStatus update(float duration) { return mImpl.update(duration); }
+            AiReactionTimer(Misc::Rng::Generator& prng)
+                : mPrng{ prng }
+                , mImpl{ AI_REACTION_TIME, sDeviation, Misc::Rng::deviate(0, sDeviation, prng) }
+            {
+            }
 
-            void reset() { mImpl.reset(Misc::Rng::deviate(0, sDeviation)); }
+            Misc::TimerStatus update(float duration) { return mImpl.update(duration, mPrng); }
+
+            void reset() { mImpl.reset(Misc::Rng::deviate(0, sDeviation, mPrng)); }
 
         private:
-            Misc::DeviatingPeriodicTimer mImpl {AI_REACTION_TIME, sDeviation,
-                                                Misc::Rng::deviate(0, sDeviation)};
+            Misc::Rng::Generator& mPrng;
+            Misc::DeviatingPeriodicTimer mImpl;
+
     };
 }
 
diff --git a/apps/openmw/mwmechanics/aitravel.cpp b/apps/openmw/mwmechanics/aitravel.cpp
index 4a2df475f4..919685e93d 100644
--- a/apps/openmw/mwmechanics/aitravel.cpp
+++ b/apps/openmw/mwmechanics/aitravel.cpp
@@ -36,11 +36,13 @@ namespace MWMechanics
 {
     AiTravel::AiTravel(float x, float y, float z, bool repeat, AiTravel*)
         : TypedAiPackage<AiTravel>(repeat), mX(x), mY(y), mZ(z), mHidden(false)
+        , mDestinationCheck(MWBase::Environment::get().getWorld()->getPrng())
     {
     }
 
     AiTravel::AiTravel(float x, float y, float z, AiInternalTravel* derived)
         : TypedAiPackage<AiTravel>(derived), mX(x), mY(y), mZ(z), mHidden(true)
+        , mDestinationCheck(MWBase::Environment::get().getWorld()->getPrng())
     {
     }
 
@@ -51,6 +53,7 @@ namespace MWMechanics
 
     AiTravel::AiTravel(const ESM::AiSequence::AiTravel *travel)
         : TypedAiPackage<AiTravel>(travel->mRepeat), mX(travel->mData.mX), mY(travel->mData.mY), mZ(travel->mData.mZ), mHidden(false)
+        , mDestinationCheck(MWBase::Environment::get().getWorld()->getPrng())
     {
         // Hidden ESM::AiSequence::AiTravel package should be converted into MWMechanics::AiInternalTravel type
         assert(!travel->mHidden);
diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index c63a4c0270..ebaff54f20 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -59,7 +59,8 @@ namespace MWMechanics
 
         osg::Vec3f getRandomPointAround(const osg::Vec3f& position, const float distance)
         {
-            const float randomDirection = Misc::Rng::rollClosedProbability() * 2.0f * osg::PI;
+            auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+            const float randomDirection = Misc::Rng::rollClosedProbability(prng) * 2.0f * osg::PI;
             osg::Matrixf rotation;
             rotation.makeRotate(randomDirection, osg::Vec3f(0.0, 0.0, 1.0));
             return position + osg::Vec3f(distance, 0.0, 0.0) * rotation;
@@ -102,6 +103,22 @@ namespace MWMechanics
         {
             return std::vector<unsigned char>(std::begin(idle), std::end(idle));
         }
+
+    }
+
+    AiWanderStorage::AiWanderStorage() :
+        mState(Wander_ChooseAction),
+        mIsWanderingManually(false),
+        mCanWanderAlongPathGrid(true),
+        mIdleAnimation(0),
+        mBadIdles(),
+        mPopulateAvailableNodes(true),
+        mAllowedNodes(),
+        mTrimCurrentNode(false),
+        mCheckIdlePositionTimer(0),
+        mStuckCount(0),
+        mReaction(MWBase::Environment::get().getWorld()->getPrng())
+    {
     }
 
     AiWander::AiWander(int distance, int duration, int timeOfDay, const std::vector<unsigned char>& idle, bool repeat):
@@ -250,9 +267,10 @@ namespace MWMechanics
             getAllowedNodes(actor, actor.getCell()->getCell(), storage);
         }
 
+        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
         if (canActorMoveByZAxis(actor) && mDistance > 0) {
             // Typically want to idle for a short time before the next wander
-            if (Misc::Rng::rollDice(100) >= 92 && storage.mState != AiWanderStorage::Wander_Walking) {
+            if (Misc::Rng::rollDice(100, prng) >= 92 && storage.mState != AiWanderStorage::Wander_Walking) {
                 wanderNearStart(actor, storage, mDistance);
             }
 
@@ -262,7 +280,7 @@ namespace MWMechanics
         // randomly idle or wander near spawn point
         else if(storage.mAllowedNodes.empty() && mDistance > 0 && !storage.mIsWanderingManually) {
             // Typically want to idle for a short time before the next wander
-            if (Misc::Rng::rollDice(100) >= 96) {
+            if (Misc::Rng::rollDice(100, prng) >= 96) {
                 wanderNearStart(actor, storage, mDistance);
             } else {
                 storage.setState(AiWanderStorage::Wander_IdleNow);
@@ -330,10 +348,12 @@ namespace MWMechanics
         const auto navigator = world->getNavigator();
         const auto navigatorFlags = getNavigatorFlags(actor);
         const auto areaCosts = getAreaCosts(actor);
+        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
 
         do {
+
             // Determine a random location within radius of original position
-            const float wanderRadius = (0.2f + Misc::Rng::rollClosedProbability() * 0.8f) * wanderDistance;
+            const float wanderRadius = (0.2f + Misc::Rng::rollClosedProbability(prng) * 0.8f) * wanderDistance;
             if (!isWaterCreature && !isFlyingCreature)
             {
                 // findRandomPointAroundCircle uses wanderDistance as limit for random and not as exact distance
@@ -544,7 +564,8 @@ namespace MWMechanics
 
     void AiWander::setPathToAnAllowedNode(const MWWorld::Ptr& actor, AiWanderStorage& storage, const ESM::Position& actorPos)
     {
-        unsigned int randNode = Misc::Rng::rollDice(storage.mAllowedNodes.size());
+        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+        unsigned int randNode = Misc::Rng::rollDice(storage.mAllowedNodes.size(), prng);
         ESM::Pathgrid::Point dest(storage.mAllowedNodes[randNode]);
 
         ToWorldCoordinates(dest, actor.getCell()->getCell());
@@ -650,11 +671,11 @@ namespace MWMechanics
 
         for(unsigned int counter = 0; counter < mIdle.size(); counter++)
         {
-            static float fIdleChanceMultiplier = MWBase::Environment::get().getWorld()->getStore()
-                .get<ESM::GameSetting>().find("fIdleChanceMultiplier")->mValue.getFloat();
+            MWBase::World* world = MWBase::Environment::get().getWorld();
+            static float fIdleChanceMultiplier = world->getStore().get<ESM::GameSetting>().find("fIdleChanceMultiplier")->mValue.getFloat();
 
             unsigned short idleChance = static_cast<unsigned short>(fIdleChanceMultiplier * mIdle[counter]);
-            unsigned short randSelect = (int)(Misc::Rng::rollProbability() * int(100 / fIdleChanceMultiplier));
+            unsigned short randSelect = (int)(Misc::Rng::rollProbability(world->getPrng()) * int(100 / fIdleChanceMultiplier));
             if(randSelect < idleChance && randSelect > idleRoll)
             {
                 selectedAnimation = counter + GroupIndex_MinIdle;
@@ -678,7 +699,8 @@ namespace MWMechanics
         if (storage.mAllowedNodes.empty())
             return;
 
-        int index = Misc::Rng::rollDice(storage.mAllowedNodes.size());
+        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+        int index = Misc::Rng::rollDice(storage.mAllowedNodes.size(), prng);
         ESM::Pathgrid::Point dest = storage.mAllowedNodes[index];
         ESM::Pathgrid::Point worldDest = dest;
         ToWorldCoordinates(worldDest, actor.getCell()->getCell());
@@ -700,7 +722,7 @@ namespace MWMechanics
             // AI will try to move the NPC towards every neighboring node until suitable place will be found
             for (int i = 0; i < initialSize; i++)
             {
-                int randomIndex = Misc::Rng::rollDice(points.size());
+                int randomIndex = Misc::Rng::rollDice(points.size(), prng);
                 ESM::Pathgrid::Point connDest = points[randomIndex];
 
                 // add an offset towards random neighboring node
diff --git a/apps/openmw/mwmechanics/aiwander.hpp b/apps/openmw/mwmechanics/aiwander.hpp
index f8506ff594..02a1054363 100644
--- a/apps/openmw/mwmechanics/aiwander.hpp
+++ b/apps/openmw/mwmechanics/aiwander.hpp
@@ -55,18 +55,7 @@ namespace MWMechanics
         float mCheckIdlePositionTimer;
         int mStuckCount;
 
-        AiWanderStorage():
-            mState(Wander_ChooseAction),
-            mIsWanderingManually(false),
-            mCanWanderAlongPathGrid(true),
-            mIdleAnimation(0),
-            mBadIdles(),
-            mPopulateAvailableNodes(true),
-            mAllowedNodes(),
-            mTrimCurrentNode(false),
-            mCheckIdlePositionTimer(0),
-            mStuckCount(0)
-            {};
+        AiWanderStorage();
 
         void setState(const WanderState wanderState, const bool isManualWander = false)
         {
diff --git a/apps/openmw/mwmechanics/alchemy.cpp b/apps/openmw/mwmechanics/alchemy.cpp
index f513554c12..d60eac15de 100644
--- a/apps/openmw/mwmechanics/alchemy.cpp
+++ b/apps/openmw/mwmechanics/alchemy.cpp
@@ -289,7 +289,8 @@ void MWMechanics::Alchemy::addPotion (const std::string& name)
 
     newRecord.mName = name;
 
-    int index = Misc::Rng::rollDice(6);
+    auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+    int index = Misc::Rng::rollDice(6, prng);
     assert (index>=0 && index<6);
 
     static const char *meshes[] = { "standard", "bargain", "cheap", "fresh", "exclusive", "quality" };
@@ -527,8 +528,8 @@ MWMechanics::Alchemy::Result MWMechanics::Alchemy::createSingle ()
         removeIngredients();
         return Result_RandomFailure;
     }
-
-    if (getAlchemyFactor() < Misc::Rng::roll0to99())
+    auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+    if (getAlchemyFactor() < Misc::Rng::roll0to99(prng))
     {
         removeIngredients();
         return Result_RandomFailure;
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 25a5ac6aa0..1c0a4f2c85 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -193,11 +193,13 @@ public:
 
 std::string CharacterController::chooseRandomGroup (const std::string& prefix, int* num) const
 {
+    auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+
     int numAnims=0;
     while (mAnimation->hasAnimation(prefix + std::to_string(numAnims+1)))
         ++numAnims;
 
-    int roll = Misc::Rng::rollDice(numAnims) + 1; // [1, numAnims]
+    int roll = Misc::Rng::rollDice(numAnims, prng) + 1; // [1, numAnims]
     if (num)
         *num = roll;
     return prefix + std::to_string(roll);
@@ -209,12 +211,13 @@ void CharacterController::refreshHitRecoilAnims(CharacterState& idle)
     bool knockdown = mPtr.getClass().getCreatureStats(mPtr).getKnockedDown();
     bool block = mPtr.getClass().getCreatureStats(mPtr).getBlock();
     bool isSwimming = MWBase::Environment::get().getWorld()->isSwimming(mPtr);
+    auto& prng = MWBase::Environment::get().getWorld()->getPrng();
     if(mHitState == CharState_None)
     {
         if ((mPtr.getClass().getCreatureStats(mPtr).getFatigue().getCurrent() < 0
                 || mPtr.getClass().getCreatureStats(mPtr).getFatigue().getBase() == 0))
         {
-            mTimeUntilWake = Misc::Rng::rollClosedProbability() * 2 + 1; // Wake up after 1 to 3 seconds
+            mTimeUntilWake = Misc::Rng::rollClosedProbability(prng) * 2 + 1; // Wake up after 1 to 3 seconds
             if (isSwimming && mAnimation->hasAnimation("swimknockout"))
             {
                 mHitState = CharState_SwimKnockOut;
@@ -678,7 +681,8 @@ void CharacterController::refreshIdleAnims(const std::string& weapShortGroup, Ch
 
                 // play until the Loop Stop key 2 to 5 times, then play until the Stop key
                 // this replicates original engine behavior for the "Idle1h" 1st-person animation
-                numLoops = 1 + Misc::Rng::rollDice(4); 
+                auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+                numLoops = 1 + Misc::Rng::rollDice(4, prng); 
             }
         }
 
@@ -1131,6 +1135,8 @@ bool CharacterController::updateCarriedLeftVisible(const int weaptype) const
 
 bool CharacterController::updateState(CharacterState idle)
 {
+    auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+
     const MWWorld::Class &cls = mPtr.getClass();
     CreatureStats &stats = cls.getCreatureStats(mPtr);
     int weaptype = ESM::Weapon::None;
@@ -1288,7 +1294,7 @@ bool CharacterController::updateState(CharacterState idle)
                 if(isWerewolf)
                 {
                     const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
-                    const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfEquip");
+                    const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfEquip", prng);
                     if(sound)
                     {
                         MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
@@ -1563,7 +1569,7 @@ bool CharacterController::updateState(CharacterState idle)
                     mUpperBodyState = UpperCharState_StartToMinAttack;
                     if (isRandomAttackAnimation(mCurrentWeapon))
                     {
-                        mAttackStrength = std::min(1.f, 0.1f + Misc::Rng::rollClosedProbability());
+                        mAttackStrength = std::min(1.f, 0.1f + Misc::Rng::rollClosedProbability(prng));
                         playSwishSound(0.0f);
                     }
                 }
@@ -1596,7 +1602,7 @@ bool CharacterController::updateState(CharacterState idle)
                 // most creatures don't actually have an attack wind-up animation, so use a uniform random value
                 // (even some creatures that can use weapons don't have a wind-up animation either, e.g. Rieklings)
                 // Note: vanilla MW uses a random value for *all* non-player actors, but we probably don't need to go that far.
-                attackStrength = std::min(1.f, 0.1f + Misc::Rng::rollClosedProbability());
+                attackStrength = std::min(1.f, 0.1f + Misc::Rng::rollClosedProbability(prng));
             }
 
             if(weapclass != ESM::WeaponType::Ranged && weapclass != ESM::WeaponType::Thrown)
@@ -1606,7 +1612,7 @@ bool CharacterController::updateState(CharacterState idle)
                 if(isWerewolf)
                 {
                     const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
-                    const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfSwing");
+                    const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfSwing", prng);
                     if(sound)
                         sndMgr->playSound3D(mPtr, sound->mId, 1.0f, 1.0f);
                 }
@@ -2771,7 +2777,8 @@ void CharacterController::setAIAttackType(const std::string& attackType)
 
 void CharacterController::setAttackTypeRandomly(std::string& attackType)
 {
-    float random = Misc::Rng::rollProbability();
+    MWBase::World* world = MWBase::Environment::get().getWorld();
+    float random = Misc::Rng::rollProbability(world->getPrng());
     if (random >= 2/3.f)
         attackType = "thrust";
     else if (random >= 1/3.f)
diff --git a/apps/openmw/mwmechanics/combat.cpp b/apps/openmw/mwmechanics/combat.cpp
index 0eccd6688c..27582840df 100644
--- a/apps/openmw/mwmechanics/combat.cpp
+++ b/apps/openmw/mwmechanics/combat.cpp
@@ -117,7 +117,8 @@ namespace MWMechanics
         const int iBlockMinChance = gmst.find("iBlockMinChance")->mValue.getInteger();
         int x = std::clamp<int>(blockerTerm - attackerTerm, iBlockMinChance, iBlockMaxChance);
 
-        if (Misc::Rng::roll0to99() < x)
+        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+        if (Misc::Rng::roll0to99(prng) < x)
         {
             // Reduce shield durability by incoming damage
             int shieldhealth = shield->getClass().getItemHealth(*shield);
@@ -212,7 +213,7 @@ namespace MWMechanics
 
             int skillValue = attacker.getClass().getSkill(attacker, weaponSkill);
 
-            if (Misc::Rng::roll0to99() >= getHitChance(attacker, victim, skillValue))
+            if (Misc::Rng::roll0to99(world->getPrng()) >= getHitChance(attacker, victim, skillValue))
             {
                 victim.getClass().onHit(victim, damage, false, projectile, attacker, osg::Vec3f(), false);
                 MWMechanics::reduceWeaponCondition(damage, false, weapon, attacker);
@@ -262,7 +263,7 @@ namespace MWMechanics
             if (victim != getPlayer() && !appliedEnchantment)
             {
                 float fProjectileThrownStoreChance = gmst.find("fProjectileThrownStoreChance")->mValue.getFloat();
-                if (Misc::Rng::rollProbability() < fProjectileThrownStoreChance / 100.f)
+                if (Misc::Rng::rollProbability(world->getPrng()) < fProjectileThrownStoreChance / 100.f)
                     victim.getClass().getContainerStore(victim).add(projectile, 1, victim);
             }
 
@@ -315,6 +316,7 @@ namespace MWMechanics
         bool godmode = attacker == getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState();
         if (godmode)
             return;
+        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
         for (int i=0; i<3; ++i)
         {
             float magnitude = victim.getClass().getCreatureStats(victim).getMagicEffects().get(ESM::MagicEffect::FireShield+i).getMagnitude();
@@ -334,7 +336,7 @@ namespace MWMechanics
 
             saveTerm *= 1.25f * normalisedFatigue;
 
-            float x = std::max(0.f, saveTerm - Misc::Rng::roll0to99());
+            float x = std::max(0.f, saveTerm - Misc::Rng::roll0to99(prng));
 
             int element = ESM::MagicEffect::FireDamage;
             if (i == 1)
@@ -444,7 +446,8 @@ namespace MWMechanics
         MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
         if(isWerewolf)
         {
-            const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfHit");
+            auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+            const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfHit", prng);
             if(sound)
                 sndMgr->playSound3D(victim, sound->mId, 1.0f, 1.0f);
         }
diff --git a/apps/openmw/mwmechanics/disease.hpp b/apps/openmw/mwmechanics/disease.hpp
index 426a66ecf2..82c5236ca4 100644
--- a/apps/openmw/mwmechanics/disease.hpp
+++ b/apps/openmw/mwmechanics/disease.hpp
@@ -52,7 +52,8 @@ namespace MWMechanics
                 continue;
 
             int x = static_cast<int>(fDiseaseXferChance * 100 * resist);
-            if (Misc::Rng::rollDice(10000) < x)
+            auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+            if (Misc::Rng::rollDice(10000, prng) < x)
             {
                 // Contracted disease!
                 actor.getClass().getCreatureStats(actor).getSpells().add(spell);
diff --git a/apps/openmw/mwmechanics/enchanting.cpp b/apps/openmw/mwmechanics/enchanting.cpp
index a1870cbdb0..7ed58f0d25 100644
--- a/apps/openmw/mwmechanics/enchanting.cpp
+++ b/apps/openmw/mwmechanics/enchanting.cpp
@@ -76,7 +76,8 @@ namespace MWMechanics
 
         if(mSelfEnchanting)
         {
-            if(getEnchantChance() <= (Misc::Rng::roll0to99()))
+            auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+            if(getEnchantChance() <= (Misc::Rng::roll0to99(prng)))
                 return false;
 
             mEnchanter.getClass().skillUsageSucceeded (mEnchanter, ESM::Skill::Enchant, 2);
diff --git a/apps/openmw/mwmechanics/levelledlist.hpp b/apps/openmw/mwmechanics/levelledlist.hpp
index a1eb958ed1..be5c5962bb 100644
--- a/apps/openmw/mwmechanics/levelledlist.hpp
+++ b/apps/openmw/mwmechanics/levelledlist.hpp
@@ -19,7 +19,7 @@ namespace MWMechanics
 {
 
     /// @return ID of resulting item, or empty if none
-    inline std::string getLevelledItem (const ESM::LevelledListBase* levItem, bool creature, Misc::Rng::Generator& prng = Misc::Rng::getGenerator())
+    inline std::string getLevelledItem (const ESM::LevelledListBase* levItem, bool creature, Misc::Rng::Generator& prng)
     {
         const std::vector<ESM::LevelledListBase::LevelItem>& items = levItem->mList;
 
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 658c5c85c6..8cf6126cba 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -651,7 +651,8 @@ namespace MWMechanics
         float x = 0;
         float y = 0;
 
-        int roll = Misc::Rng::roll0to99();
+        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+        int roll = Misc::Rng::roll0to99(prng);
 
         if (type == PT_Admire)
         {
@@ -1570,8 +1571,8 @@ namespace MWMechanics
         }
 
         float target = x - y;
-
-        return (Misc::Rng::roll0to99() >= target);
+        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+        return (Misc::Rng::roll0to99(prng) >= target);
     }
 
     void MechanicsManager::startCombat(const MWWorld::Ptr &ptr, const MWWorld::Ptr &target)
diff --git a/apps/openmw/mwmechanics/pickpocket.cpp b/apps/openmw/mwmechanics/pickpocket.cpp
index 038753f7d1..1b638eadd2 100644
--- a/apps/openmw/mwmechanics/pickpocket.cpp
+++ b/apps/openmw/mwmechanics/pickpocket.cpp
@@ -41,7 +41,8 @@ namespace MWMechanics
         int iPickMaxChance = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>()
                 .find("iPickMaxChance")->mValue.getInteger();
 
-        int roll = Misc::Rng::roll0to99();
+        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+        int roll = Misc::Rng::roll0to99(prng);
         if (t < pcSneak / iPickMinChance)
         {
             return (roll > int(pcSneak / iPickMinChance));
diff --git a/apps/openmw/mwmechanics/recharge.cpp b/apps/openmw/mwmechanics/recharge.cpp
index 51c78e1e3b..1f92466e04 100644
--- a/apps/openmw/mwmechanics/recharge.cpp
+++ b/apps/openmw/mwmechanics/recharge.cpp
@@ -49,7 +49,8 @@ bool rechargeItem(const MWWorld::Ptr &item, const MWWorld::Ptr &gem)
         intelligenceTerm = 1;
 
     float x = (player.getClass().getSkill(player, ESM::Skill::Enchant) + intelligenceTerm + luckTerm) * stats.getFatigueTerm();
-    int roll = Misc::Rng::roll0to99();
+    auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+    int roll = Misc::Rng::roll0to99(prng);
     if (roll < x)
     {
         std::string soul = gem.getCellRef().getSoul();
diff --git a/apps/openmw/mwmechanics/repair.cpp b/apps/openmw/mwmechanics/repair.cpp
index 81886ed9b0..ac6cc5b414 100644
--- a/apps/openmw/mwmechanics/repair.cpp
+++ b/apps/openmw/mwmechanics/repair.cpp
@@ -44,7 +44,8 @@ void Repair::repair(const MWWorld::Ptr &itemToRepair)
 
     float x = (0.1f * pcStrength + 0.1f * pcLuck + armorerSkill) * fatigueTerm;
 
-    int roll = Misc::Rng::roll0to99();
+    auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+    int roll = Misc::Rng::roll0to99(prng);
     if (roll <= x)
     {
         int y = static_cast<int>(fRepairAmountMult * toolQuality * roll);
diff --git a/apps/openmw/mwmechanics/security.cpp b/apps/openmw/mwmechanics/security.cpp
index e642a7bb4b..bfb48dd754 100644
--- a/apps/openmw/mwmechanics/security.cpp
+++ b/apps/openmw/mwmechanics/security.cpp
@@ -54,7 +54,8 @@ namespace MWMechanics
             resultMessage = "#{sLockImpossible}";
         else
         {
-            if (Misc::Rng::roll0to99() <= x)
+            auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+            if (Misc::Rng::roll0to99(prng) <= x)
             {
                 lock.getCellRef().unlock();
                 resultMessage = "#{sLockSuccess}";
@@ -98,7 +99,8 @@ namespace MWMechanics
             resultMessage = "#{sTrapImpossible}";
         else
         {
-            if (Misc::Rng::roll0to99() <= x)
+            auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+            if (Misc::Rng::roll0to99(prng) <= x)
             {
                 trap.getCellRef().setTrap("");
 
diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index c99eee43d5..b92cbc74fb 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -87,7 +87,8 @@ namespace MWMechanics
                 : ESM::MagicEffect::ResistBlightDisease;
             float x = target.getClass().getCreatureStats(target).getMagicEffects().get(requiredResistance).getMagnitude();
 
-            if (Misc::Rng::roll0to99() <= x)
+            auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+            if (Misc::Rng::roll0to99(prng) <= x)
             {
                 // Fully resisted, show message
                 if (target == getPlayer())
@@ -339,7 +340,8 @@ namespace MWMechanics
 
                 // Check success
                 float successChance = getSpellSuccessChance(spell, mCaster, nullptr, true, false);
-                if (Misc::Rng::roll0to99() >= successChance)
+                auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+                if (Misc::Rng::roll0to99(prng) >= successChance)
                 {
                     if (mCaster == getPlayer())
                         MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicSkillFail}");
@@ -403,7 +405,8 @@ namespace MWMechanics
                     + 0.1f * creatureStats.getAttribute (ESM::Attribute::Luck).getModified())
                     * creatureStats.getFatigueTerm();
 
-        int roll = Misc::Rng::roll0to99();
+        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+        int roll = Misc::Rng::roll0to99(prng);
         if (roll > x)
         {
             // "X has no effect on you"
diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp
index befe182cb5..ae18c6ae0c 100644
--- a/apps/openmw/mwmechanics/spelleffects.cpp
+++ b/apps/openmw/mwmechanics/spelleffects.cpp
@@ -35,7 +35,8 @@ namespace
     {
         if(effect.mMinMagnitude == effect.mMaxMagnitude)
             return effect.mMinMagnitude;
-        return effect.mMinMagnitude + Misc::Rng::rollDice(effect.mMaxMagnitude - effect.mMinMagnitude + 1);
+        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+        return effect.mMinMagnitude + Misc::Rng::rollDice(effect.mMaxMagnitude - effect.mMinMagnitude + 1, prng);
     }
 
     void modifyAiSetting(const MWWorld::Ptr& target, const ESM::ActiveEffect& effect, ESM::MagicEffect::Effects creatureEffect, MWMechanics::CreatureStats::AiSetting setting, float magnitude, bool& invalid)
@@ -305,6 +306,7 @@ namespace
             bool canAbsorb = !(effect.mFlags & ESM::ActiveEffect::Flag_Ignore_SpellAbsorption) && magnitudes.get(ESM::MagicEffect::SpellAbsorption).getMagnitude() > 0.f;
             if(canReflect || canAbsorb)
             {
+                auto& prng = MWBase::Environment::get().getWorld()->getPrng();
                 for(const auto& activeParam : stats.getActiveSpells())
                 {
                     for(const auto& activeEffect : activeParam.getEffects())
@@ -313,14 +315,14 @@ namespace
                             continue;
                         if(activeEffect.mEffectId == ESM::MagicEffect::Reflect)
                         {
-                            if(canReflect && Misc::Rng::roll0to99() < activeEffect.mMagnitude)
+                            if(canReflect && Misc::Rng::roll0to99(prng) < activeEffect.mMagnitude)
                             {
                                 return MWMechanics::MagicApplicationResult::REFLECTED;
                             }
                         }
                         else if(activeEffect.mEffectId == ESM::MagicEffect::SpellAbsorption)
                         {
-                            if(canAbsorb && Misc::Rng::roll0to99() < activeEffect.mMagnitude)
+                            if(canAbsorb && Misc::Rng::roll0to99(prng) < activeEffect.mMagnitude)
                             {
                                 absorbSpell(spellParams.getId(), caster, target);
                                 return MWMechanics::MagicApplicationResult::REMOVED;
@@ -405,8 +407,11 @@ void applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, co
                 if(params.getType() == ESM::ActiveSpells::Type_Temporary)
                 {
                     const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(params.getId());
-                    if(spell && spell->mData.mType == ESM::Spell::ST_Spell)
-                        return Misc::Rng::roll0to99() < magnitude;
+                    if (spell && spell->mData.mType == ESM::Spell::ST_Spell)
+                    {
+                        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+                        return Misc::Rng::roll0to99(prng) < magnitude;
+                    }
                 }
                 return false;
             }, target);
diff --git a/apps/openmw/mwmechanics/spellresistance.cpp b/apps/openmw/mwmechanics/spellresistance.cpp
index 1edf140915..bb39255b43 100644
--- a/apps/openmw/mwmechanics/spellresistance.cpp
+++ b/apps/openmw/mwmechanics/spellresistance.cpp
@@ -51,7 +51,8 @@ namespace MWMechanics
         if (castChance > 0)
             x *= 50 / castChance;
 
-        float roll = Misc::Rng::rollClosedProbability() * 100;
+        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+        float roll = Misc::Rng::rollClosedProbability(prng) * 100;
         if (magicEffect->mData.mFlags & ESM::MagicEffect::NoMagnitude)
             roll -= resistance;
 
diff --git a/apps/openmw/mwmechanics/trading.cpp b/apps/openmw/mwmechanics/trading.cpp
index d9ec66bab2..a40b745d21 100644
--- a/apps/openmw/mwmechanics/trading.cpp
+++ b/apps/openmw/mwmechanics/trading.cpp
@@ -57,7 +57,8 @@ namespace MWMechanics
             + gmst.find("fBargainOfferBase")->mValue.getFloat()
             + int(pcTerm - npcTerm);
 
-        int roll = Misc::Rng::rollDice(100) + 1;
+        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+        int roll = Misc::Rng::rollDice(100, prng) + 1;
 
         // reject if roll fails
         // (or if player tries to buy things and get money)
diff --git a/apps/openmw/mwscript/containerextensions.cpp b/apps/openmw/mwscript/containerextensions.cpp
index 01f59fd69c..40ad3b7835 100644
--- a/apps/openmw/mwscript/containerextensions.cpp
+++ b/apps/openmw/mwscript/containerextensions.cpp
@@ -61,7 +61,8 @@ namespace
             }
             else
             {
-                std::string itemId = MWMechanics::getLevelledItem(itemPtr.get<ESM::ItemLevList>()->mBase, false);
+                auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+                std::string itemId = MWMechanics::getLevelledItem(itemPtr.get<ESM::ItemLevList>()->mBase, false, prng);
                 if (itemId.empty())
                     return;
                 MWWorld::ManualRef manualRef(MWBase::Environment::get().getWorld()->getStore(), itemId, 1);
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index 0c5a47e029..38da34201b 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -111,7 +111,8 @@ namespace MWScript
                         throw std::runtime_error (
                             "random: argument out of range (Don't be so negative!)");
 
-                    runtime.push (static_cast<Interpreter::Type_Float>(::Misc::Rng::rollDice(limit))); // [o, limit)
+                    auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+                    runtime.push (static_cast<Interpreter::Type_Float>(::Misc::Rng::rollDice(limit, prng))); // [o, limit)
                 }
         };
 
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index c8cd53a331..50a3a48ad8 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -466,6 +466,7 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
                 case ESM::REC_LEVI:
                 case ESM::REC_CREA:
                 case ESM::REC_CONT:
+                case ESM::REC_RAND:
                     MWBase::Environment::get().getWorld()->readRecord(reader, n.toInt(), contentFileMap);
                     break;
 
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index ac78114932..34a2b49c7b 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -333,7 +333,8 @@ namespace MWWorld
         if(actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
         {
             const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
-            const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfItem");
+            auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+            const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfItem", prng);
 
             std::shared_ptr<MWWorld::Action> action(new MWWorld::FailedAction("#{sWerewolfRefusal}"));
             if(sound) action->setSound(sound->mId);
diff --git a/apps/openmw/mwworld/containerstore.hpp b/apps/openmw/mwworld/containerstore.hpp
index 1951f0708e..92c28bbcb5 100644
--- a/apps/openmw/mwworld/containerstore.hpp
+++ b/apps/openmw/mwworld/containerstore.hpp
@@ -221,7 +221,7 @@ namespace MWWorld
             virtual bool stacks (const ConstPtr& ptr1, const ConstPtr& ptr2) const;
             ///< @return true if the two specified objects can stack with each other
 
-            void fill (const ESM::InventoryList& items, const std::string& owner, Misc::Rng::Generator& seed = Misc::Rng::getGenerator());
+            void fill (const ESM::InventoryList& items, const std::string& owner, Misc::Rng::Generator& seed);
             ///< Insert items into *this.
 
             void fillNonRandom (const ESM::InventoryList& items, const std::string& owner, unsigned int seed);
diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index d35746dfff..095c40697e 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -125,7 +125,7 @@ namespace MWWorld
         return (dit != mDynamic.end());
     }
     template<typename T>
-    const T *Store<T>::searchRandom(const std::string &id) const
+    const T *Store<T>::searchRandom(const std::string &id, Misc::Rng::Generator& prng) const
     {
         std::vector<const T*> results;
         std::copy_if(mShared.begin(), mShared.end(), std::back_inserter(results),
@@ -134,7 +134,7 @@ namespace MWWorld
                     return Misc::StringUtils::ciCompareLen(id, item->mId, id.size()) == 0;
                 });
         if(!results.empty())
-            return results[Misc::Rng::rollDice(results.size())];
+            return results[Misc::Rng::rollDice(results.size(), prng)];
         return nullptr;
     }
     template<typename T>
diff --git a/apps/openmw/mwworld/store.hpp b/apps/openmw/mwworld/store.hpp
index 1ec51ad5fd..bcd744c23c 100644
--- a/apps/openmw/mwworld/store.hpp
+++ b/apps/openmw/mwworld/store.hpp
@@ -10,6 +10,7 @@
 
 #include <components/esm/records.hpp>
 #include <components/misc/stringops.hpp>
+#include <components/misc/rng.hpp>
 
 #include "../mwdialogue/keywordsearch.hpp"
 
@@ -181,7 +182,7 @@ namespace MWWorld
         bool isDynamic(const std::string &id) const;
 
         /** Returns a random record that starts with the named ID, or nullptr if not found. */
-        const T *searchRandom(const std::string &id) const;
+        const T *searchRandom(const std::string &id, Misc::Rng::Generator& prng) const;
 
         const T *find(const std::string &id) const;
 
diff --git a/components/misc/timer.hpp b/components/misc/timer.hpp
index 81a2ca073c..910d45bc03 100644
--- a/components/misc/timer.hpp
+++ b/components/misc/timer.hpp
@@ -18,7 +18,7 @@ namespace Misc
                 : mPeriod(period), mDeviation(deviation), mTimeLeft(timeLeft)
             {}
 
-            TimerStatus update(float duration)
+            TimerStatus update(float duration, Rng::Generator& prng)
             {
                 if (mTimeLeft > 0)
                 {
@@ -26,7 +26,7 @@ namespace Misc
                     return TimerStatus::Waiting;
                 }
 
-                mTimeLeft = Rng::deviate(mPeriod, mDeviation);
+                mTimeLeft = Rng::deviate(mPeriod, mDeviation, prng);
                 return TimerStatus::Elapsed;
             }
 

From 151770ccf145495de5a0b04f4e04e10eda8909c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Mon, 7 Mar 2022 12:03:13 +0200
Subject: [PATCH 2211/2859] Separate global vs world rng functions and use
 custom prng

---
 apps/openmw/mwworld/worldimp.cpp | 22 +++++++-------
 components/misc/rng.cpp          | 28 ++++++++++++++++--
 components/misc/rng.hpp          | 51 +++++++++++++++++++++++++++-----
 3 files changed, 81 insertions(+), 20 deletions(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index afb248bf08..16eb5f3b9b 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -338,6 +338,10 @@ namespace MWWorld
 
     void World::write (ESM::ESMWriter& writer, Loading::Listener& progress) const
     {
+        writer.startRecord(ESM::REC_RAND);
+        writer.writeHNT("RAND", mPrng.getSeed());
+        writer.endRecord(ESM::REC_RAND);
+
         // Active cells could have a dirty fog of war, sync it to the CellStore first
         for (CellStore* cellstore : mWorldScene->getActiveCells())
         {
@@ -359,12 +363,6 @@ namespace MWWorld
         writer.writeHNT("LEVT", mLevitationEnabled);
         writer.endRecord(ESM::REC_ENAB);
 
-        std::stringstream ssPrng;
-        ssPrng << mPrng;
-        writer.startRecord(ESM::REC_RAND);
-        writer.writeHString(ssPrng.str());
-        writer.endRecord(ESM::REC_RAND);
-
         writer.startRecord(ESM::REC_CAM_);
         writer.writeHNT("FIRS", isFirstPerson());
         writer.endRecord(ESM::REC_CAM_);
@@ -384,10 +382,11 @@ namespace MWWorld
                 return;
             case ESM::REC_RAND:
                 {
-                    std::stringstream ssPrng;
-                    ssPrng << reader.getHString();
-                    ssPrng.seekg(0);
-                    ssPrng >> mPrng;
+                    Misc::Rng::Generator::result_type seed{};
+                    reader.getHNT(seed, "RAND");
+                    Log(Debug::Info) << "---- World random state: " << seed << " ----";
+                    mPrng.seed(seed);
+                    Misc::Rng::getGenerator().seed(seed);
                 }
                 break;
             case ESM::REC_PLAY:
@@ -3723,9 +3722,10 @@ namespace MWWorld
         static int iNumberCreatures = mStore.get<ESM::GameSetting>().find("iNumberCreatures")->mValue.getInteger();
         int numCreatures = 1 + Misc::Rng::rollDice(iNumberCreatures); // [1, iNumberCreatures]
 
+        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
         for (int i=0; i<numCreatures; ++i)
         {
-            std::string selectedCreature = MWMechanics::getLevelledItem(list, true);
+            std::string selectedCreature = MWMechanics::getLevelledItem(list, true, prng);
             if (selectedCreature.empty())
                 continue;
 
diff --git a/components/misc/rng.cpp b/components/misc/rng.cpp
index 78c2a44434..b44c6c2785 100644
--- a/components/misc/rng.cpp
+++ b/components/misc/rng.cpp
@@ -3,6 +3,8 @@
 #include <chrono>
 #include <random>
 
+#include <components/debug/debuglog.hpp>
+
 namespace Misc::Rng
 {
     static Generator sGenerator;
@@ -12,29 +14,51 @@ namespace Misc::Rng
         return sGenerator;
     }
 
+    unsigned int generateDefaultSeed()
+    {
+        auto res = static_cast<unsigned int>(std::chrono::high_resolution_clock::now().time_since_epoch().count());
+        Log(Debug::Info) << __FUNCTION__ << ": " << res;
+        return res;
+    }
+
     void init(unsigned int seed)
     {
         sGenerator.seed(seed);
     }
 
+    float rollProbability()
+    {
+        return std::uniform_real_distribution<float>(0, 1 - std::numeric_limits<float>::epsilon())(getGenerator());
+    }
+
     float rollProbability(Generator& prng)
     {
         return std::uniform_real_distribution<float>(0, 1 - std::numeric_limits<float>::epsilon())(prng);
     }
 
+    float rollClosedProbability()
+    {
+        return std::uniform_real_distribution<float>(0, 1)(getGenerator());
+    }
+
     float rollClosedProbability(Generator& prng)
     {
         return std::uniform_real_distribution<float>(0, 1)(prng);
     }
 
+    int rollDice(int max)
+    {
+        return max > 0 ? std::uniform_int_distribution<int>(0, max - 1)(getGenerator()) : 0;
+    }
+
     int rollDice(int max, Generator& prng)
     {
         return max > 0 ? std::uniform_int_distribution<int>(0, max - 1)(prng) : 0;
     }
 
-    unsigned int generateDefaultSeed()
+    float deviate(float mean, float deviation)
     {
-        return static_cast<unsigned int>(std::chrono::high_resolution_clock::now().time_since_epoch().count());
+        return std::uniform_real_distribution<float>(mean - deviation, mean + deviation)(getGenerator());
     }
 
     float deviate(float mean, float deviation, Generator& prng)
diff --git a/components/misc/rng.hpp b/components/misc/rng.hpp
index 8d300f0913..1b7831e3c6 100644
--- a/components/misc/rng.hpp
+++ b/components/misc/rng.hpp
@@ -9,8 +9,41 @@
 */
 namespace Misc::Rng
 {
+    class Generator
+    {
+        uint32_t mState{};
 
-    using Generator = std::mt19937;
+    public:
+        using result_type = uint32_t;
+
+        constexpr Generator() = default;
+        constexpr Generator(result_type seed) : mState{ seed } {}
+        constexpr result_type operator()() noexcept
+        {
+            mState = (214013 * mState + 2531011);
+            return (mState >> 16) & max();
+        }
+
+        static constexpr result_type min() noexcept
+        {
+            return 0u;
+        }
+
+        static constexpr result_type max() noexcept
+        {
+            return 0x7FFFu;
+        }        
+        
+        void seed(result_type val) noexcept
+        {
+            mState = val;
+        }
+
+        uint32_t getSeed() const noexcept
+        {
+            return mState;
+        }
+    };
 
     Generator& getGenerator();
 
@@ -21,19 +54,23 @@ namespace Misc::Rng
     void init(unsigned int seed = generateDefaultSeed());
 
     /// return value in range [0.0f, 1.0f)  <- note open upper range.
-    float rollProbability(Generator& prng = getGenerator());
+    float rollProbability();
+    float rollProbability(Generator& prng);
   
     /// return value in range [0.0f, 1.0f]  <- note closed upper range.
-    float rollClosedProbability(Generator& prng = getGenerator());
+    float rollClosedProbability();
+    float rollClosedProbability(Generator& prng);
 
     /// return value in range [0, max)  <- note open upper range.
-    int rollDice(int max, Generator& prng = getGenerator());
+    int rollDice(int max);
+    int rollDice(int max, Generator& prng);
 
     /// return value in range [0, 99]
-    inline int roll0to99(Generator& prng = getGenerator()) { return rollDice(100, prng); }
-
-    float deviate(float mean, float deviation, Generator& prng = getGenerator());
+    inline int roll0to99(Generator& prng) { return rollDice(100, prng); }
+    inline int roll0to99() { return rollDice(100); }
 
+    float deviate(float mean, float deviation);
+    float deviate(float mean, float deviation, Generator& prng);
 }
 
 #endif

From 0611a8c3a76a4113aed9c0a6629ec75db378098c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Thu, 17 Mar 2022 14:30:00 +0200
Subject: [PATCH 2212/2859] Start new game with specified seed in options

---
 apps/openmw/mwbase/world.hpp     |  3 +++
 apps/openmw/mwworld/worldimp.cpp | 10 +++++++++-
 apps/openmw/mwworld/worldimp.hpp |  4 ++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 23e687be5a..f86f24310a 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -112,6 +112,9 @@ namespace MWBase
 
             virtual ~World() {}
 
+            virtual void setRandomSeed(uint32_t seed) = 0;
+            ///< \param seed The seed used when starting a new game.
+
             virtual void startNewGame (bool bypass) = 0;
             ///< \param bypass Bypass regular game start.
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 16eb5f3b9b..fb48707a8e 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -283,6 +283,9 @@ namespace MWWorld
 
         MWBase::Environment::get().getWindowManager()->updatePlayer();
         mCurrentDate->setup(mGlobalVariables);
+
+        // Initial seed.
+        mPrng.seed(mRandomSeed);
     }
 
     void World::clear()
@@ -557,7 +560,12 @@ namespace MWWorld
         mProjectileManager->clear();
     }
 
-    const ESM::Cell *World::getExterior (const std::string& cellName) const
+    void World::setRandomSeed(uint32_t seed)
+    {
+        mRandomSeed = seed;
+    }
+
+    const ESM::Cell* World::getExterior(const std::string& cellName) const
     {
         // first try named cells
         const ESM::Cell *cell = mStore.get<ESM::Cell>().searchExtByName (cellName);
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index eb089f04d7..6eeda94ef3 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -130,6 +130,8 @@ namespace MWWorld
             std::map<MWWorld::Ptr, MWWorld::DoorState> mDoorStates;
             ///< only holds doors that are currently moving. 1 = opening, 2 = closing
 
+            uint32_t mRandomSeed{};
+
             // not implemented
             World (const World&);
             World& operator= (const World&);
@@ -194,6 +196,8 @@ namespace MWWorld
 
             virtual ~World();
 
+            void setRandomSeed(uint32_t seed) override;
+
             void startNewGame (bool bypass) override;
             ///< \param bypass Bypass regular game start.
 

From f8f3bb242188fc433fba71550ce9fba5b7e18a24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Thu, 17 Mar 2022 17:35:34 +0200
Subject: [PATCH 2213/2859] Use std::minstd_rand and split serialization from
 save/load

---
 apps/openmw/mwworld/worldimp.cpp |  9 +++----
 components/misc/rng.cpp          | 19 +++++++++++++++
 components/misc/rng.hpp          | 40 ++++----------------------------
 3 files changed, 27 insertions(+), 41 deletions(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index fb48707a8e..6517694f15 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -342,7 +342,7 @@ namespace MWWorld
     void World::write (ESM::ESMWriter& writer, Loading::Listener& progress) const
     {
         writer.startRecord(ESM::REC_RAND);
-        writer.writeHNT("RAND", mPrng.getSeed());
+        writer.writeHNOString("RAND", Misc::Rng::serialize(mPrng));
         writer.endRecord(ESM::REC_RAND);
 
         // Active cells could have a dirty fog of war, sync it to the CellStore first
@@ -385,11 +385,8 @@ namespace MWWorld
                 return;
             case ESM::REC_RAND:
                 {
-                    Misc::Rng::Generator::result_type seed{};
-                    reader.getHNT(seed, "RAND");
-                    Log(Debug::Info) << "---- World random state: " << seed << " ----";
-                    mPrng.seed(seed);
-                    Misc::Rng::getGenerator().seed(seed);
+                    auto data = reader.getHNOString("RAND");
+                    Misc::Rng::deserialize(data, mPrng);
                 }
                 break;
             case ESM::REC_PLAY:
diff --git a/components/misc/rng.cpp b/components/misc/rng.cpp
index b44c6c2785..01044040a0 100644
--- a/components/misc/rng.cpp
+++ b/components/misc/rng.cpp
@@ -2,6 +2,7 @@
 
 #include <chrono>
 #include <random>
+#include <sstream>
 
 #include <components/debug/debuglog.hpp>
 
@@ -14,6 +15,23 @@ namespace Misc::Rng
         return sGenerator;
     }
 
+    std::string serialize(const Generator& prng)
+    {
+        std::stringstream ss;
+        ss << prng;
+
+        return ss.str();
+    }
+
+    void deserialize(std::string_view data, Generator& prng)
+    {
+        std::stringstream ss;
+        ss << data;
+
+        ss.seekg(0);
+        ss >> prng;
+    }
+
     unsigned int generateDefaultSeed()
     {
         auto res = static_cast<unsigned int>(std::chrono::high_resolution_clock::now().time_since_epoch().count());
@@ -65,4 +83,5 @@ namespace Misc::Rng
     {
         return std::uniform_real_distribution<float>(mean - deviation, mean + deviation)(prng);
     }
+
 }
diff --git a/components/misc/rng.hpp b/components/misc/rng.hpp
index 1b7831e3c6..d7ab7f3e7a 100644
--- a/components/misc/rng.hpp
+++ b/components/misc/rng.hpp
@@ -3,50 +3,20 @@
 
 #include <cassert>
 #include <random>
+#include <string_view>
 
 /*
   Provides central implementation of the RNG logic
 */
 namespace Misc::Rng
 {
-    class Generator
-    {
-        uint32_t mState{};
-
-    public:
-        using result_type = uint32_t;
-
-        constexpr Generator() = default;
-        constexpr Generator(result_type seed) : mState{ seed } {}
-        constexpr result_type operator()() noexcept
-        {
-            mState = (214013 * mState + 2531011);
-            return (mState >> 16) & max();
-        }
-
-        static constexpr result_type min() noexcept
-        {
-            return 0u;
-        }
-
-        static constexpr result_type max() noexcept
-        {
-            return 0x7FFFu;
-        }        
-        
-        void seed(result_type val) noexcept
-        {
-            mState = val;
-        }
-
-        uint32_t getSeed() const noexcept
-        {
-            return mState;
-        }
-    };
+    using Generator = std::minstd_rand;
 
     Generator& getGenerator();
 
+    std::string serialize(const Generator& prng);
+    void deserialize(std::string_view data, Generator& prng);
+
     /// returns default seed for RNG
     unsigned int generateDefaultSeed();
 

From 8103ff2e6f2f8f30783db13ed095e50a8d50fdf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Mon, 21 Mar 2022 10:01:56 +0200
Subject: [PATCH 2214/2859] Make the CI happy

---
 apps/openmw/mwmechanics/aipackage.cpp | 2 +-
 apps/openmw/mwmechanics/aiwander.cpp  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index 1a674d444a..e532e71478 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -43,8 +43,8 @@ namespace
 
 MWMechanics::AiPackage::AiPackage(AiPackageTypeId typeId, const Options& options) :
     mTypeId(typeId),
-    mReaction(MWBase::Environment::get().getWorld()->getPrng()),
     mOptions(options),
+    mReaction(MWBase::Environment::get().getWorld()->getPrng()),
     mTargetActorRefId(""),
     mTargetActorId(-1),
     mRotateOnTheRunChecks(0),
diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index ebaff54f20..6cfe1e5fcd 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -107,6 +107,7 @@ namespace MWMechanics
     }
 
     AiWanderStorage::AiWanderStorage() :
+        mReaction(MWBase::Environment::get().getWorld()->getPrng()),
         mState(Wander_ChooseAction),
         mIsWanderingManually(false),
         mCanWanderAlongPathGrid(true),
@@ -116,8 +117,7 @@ namespace MWMechanics
         mAllowedNodes(),
         mTrimCurrentNode(false),
         mCheckIdlePositionTimer(0),
-        mStuckCount(0),
-        mReaction(MWBase::Environment::get().getWorld()->getPrng())
+        mStuckCount(0)
     {
     }
 

From 5df76f50518dfa781cd944339427fc4407631946 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Mon, 21 Mar 2022 10:33:22 +0200
Subject: [PATCH 2215/2859] Remove unnecessary debug output

---
 components/misc/rng.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/misc/rng.cpp b/components/misc/rng.cpp
index 01044040a0..c1ed4ed95b 100644
--- a/components/misc/rng.cpp
+++ b/components/misc/rng.cpp
@@ -35,7 +35,6 @@ namespace Misc::Rng
     unsigned int generateDefaultSeed()
     {
         auto res = static_cast<unsigned int>(std::chrono::high_resolution_clock::now().time_since_epoch().count());
-        Log(Debug::Info) << __FUNCTION__ << ": " << res;
         return res;
     }
 

From 769be88d439be75b6667a7612cb0428e0ac0e577 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Mon, 21 Mar 2022 10:41:03 +0200
Subject: [PATCH 2216/2859] Adjust DetourNavigatorNavigatorTest to the new prng
 values

---
 apps/openmw_test_suite/detournavigator/navigator.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index 50bf1fe735..6cf53dd6e2 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -820,12 +820,12 @@ namespace
 
         const auto result = findRandomPointAroundCircle(*mNavigator, mAgentHalfExtents, mStart, 100.0, Flag_walk);
 
-        ASSERT_THAT(result, Optional(Vec3fEq(69.6253509521484375, 531.29852294921875, -2.6667339801788330078125)))
+        ASSERT_THAT(result, Optional(Vec3fEq(70.35845947265625, 335.592041015625, -2.6667339801788330078125)))
             << (result ? *result : osg::Vec3f());
 
         const auto distance = (*result - mStart).length();
 
-        EXPECT_FLOAT_EQ(distance, 73.536231994628906) << distance;
+        EXPECT_FLOAT_EQ(distance, 125.80865478515625) << distance;
     }
 
     TEST_F(DetourNavigatorNavigatorTest, multiple_threads_should_lock_tiles)

From 26c7e308edd21c97e0fda8432d66d91c35f9b1b6 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Mon, 21 Mar 2022 22:00:32 -0700
Subject: [PATCH 2217/2859] mygui bindings for color and alpha

---
 components/lua_ui/image.cpp                            | 2 ++
 components/lua_ui/widget.cpp                           | 2 ++
 docs/source/reference/lua-scripting/widgets/image.rst  | 3 +++
 docs/source/reference/lua-scripting/widgets/widget.rst | 8 ++++++++
 4 files changed, 15 insertions(+)

diff --git a/components/lua_ui/image.cpp b/components/lua_ui/image.cpp
index 7eeca1dc0e..6bcc4a5846 100644
--- a/components/lua_ui/image.cpp
+++ b/components/lua_ui/image.cpp
@@ -68,6 +68,8 @@ namespace LuaUi
             atlasCoord.height = textureSize.height;
         setImageCoord(atlasCoord);
 
+        setColour(propertyValue("color", MyGUI::Colour(1,1,1,1)));
+
         WidgetExtension::updateProperties();
     }
 }
diff --git a/components/lua_ui/widget.cpp b/components/lua_ui/widget.cpp
index a11d3db852..74ac8640e0 100644
--- a/components/lua_ui/widget.cpp
+++ b/components/lua_ui/widget.cpp
@@ -259,6 +259,8 @@ namespace LuaUi
         mAnchor = propertyValue("anchor", MyGUI::FloatSize());
         mWidget->setVisible(propertyValue("visible", true));
         mWidget->setPointer(propertyValue("pointer", std::string("arrow")));
+        mWidget->setAlpha(propertyValue("alpha", 1.f));
+        mWidget->setInheritsAlpha(propertyValue("inheritAlpha", true));
     }
 
     void WidgetExtension::updateChildrenCoord()
diff --git a/docs/source/reference/lua-scripting/widgets/image.rst b/docs/source/reference/lua-scripting/widgets/image.rst
index bd68687cfe..c461a69a65 100644
--- a/docs/source/reference/lua-scripting/widgets/image.rst
+++ b/docs/source/reference/lua-scripting/widgets/image.rst
@@ -20,3 +20,6 @@ Properties
   * - tileV
     - boolean (false)
     - Tile the texture vertically
+  * - color
+    - util.color (1, 1, 1)
+    - Modulate constant color with the color of the image texture.
diff --git a/docs/source/reference/lua-scripting/widgets/widget.rst b/docs/source/reference/lua-scripting/widgets/widget.rst
index d114d0957b..99596a6b9b 100644
--- a/docs/source/reference/lua-scripting/widgets/widget.rst
+++ b/docs/source/reference/lua-scripting/widgets/widget.rst
@@ -35,6 +35,14 @@ Properties
   * - propagateEvents
     - boolean (true)
     - Allows base widget events to propagate to the widget's parent.
+  * - alpha
+    - number (1.0)
+    - | Set the opacity of the widget and its contents.
+      | If `inheritAlpha` is set to `true`, this becomes the maximum alpha value the widget can take.
+  * - inheritAlpha
+    - boolean (true)
+    - | Modulate `alpha` with parents `alpha`.
+      | If the parent has `inheritAlpha` set to `true`, the value after modulating is passed to the child.
 
 .. TODO: document the mouse pointer property, when API for reading / adding pointer types is available
 

From b3e0275e89171f8d927df81ceddc1698ce626a44 Mon Sep 17 00:00:00 2001
From: Cody Glassman <glassmancody.info@gmail.com>
Date: Tue, 22 Mar 2022 05:41:26 +0000
Subject: [PATCH 2218/2859] Lua UI API: Let image manager handle missing
 textures

---
 components/lua_ui/resources.cpp | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/components/lua_ui/resources.cpp b/components/lua_ui/resources.cpp
index 605c9ba58b..0f9890c523 100644
--- a/components/lua_ui/resources.cpp
+++ b/components/lua_ui/resources.cpp
@@ -7,15 +7,9 @@ namespace LuaUi
 {
     std::shared_ptr<TextureResource> ResourceManager::registerTexture(TextureData data)
     {
-        std::string normalizedPath = mVfs->normalizeFilename(data.mPath);
-        if (!mVfs->exists(normalizedPath))
-        {
-            auto error = Misc::StringUtils::format("Texture with path \"%s\" doesn't exist", data.mPath);
-            throw std::logic_error(error);
-        }
-        data.mPath = normalizedPath;
-        
-        TextureResources& list = mTextures[normalizedPath];
+        data.mPath = mVfs->normalizeFilename(data.mPath);
+
+        TextureResources& list = mTextures[data.mPath];
         list.push_back(std::make_shared<TextureResource>(data));
         return list.back();
     }

From d7de17a1ac44084ecdd9ecea526563198143c7a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Tue, 22 Mar 2022 17:09:36 +0200
Subject: [PATCH 2219/2859] Add a comment explaining the pick of the prng

---
 components/misc/rng.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/misc/rng.hpp b/components/misc/rng.hpp
index d7ab7f3e7a..5663b86a02 100644
--- a/components/misc/rng.hpp
+++ b/components/misc/rng.hpp
@@ -10,6 +10,7 @@
 */
 namespace Misc::Rng
 {
+    /// The use of a rather minimalistic prng is preferred to avoid saving a lot of state in the save game.
     using Generator = std::minstd_rand;
 
     Generator& getGenerator();

From 5d1fe6c2bc1ba2a58e270cb29bdc643660c100b0 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Tue, 22 Mar 2022 17:59:53 +0100
Subject: [PATCH 2220/2859] Add layer size, make layers API more flexible

---
 apps/openmw/mwlua/uibindings.cpp | 59 ++++++++++++++-------
 components/lua_ui/layers.cpp     | 29 +++++++++++
 components/lua_ui/layers.hpp     | 89 ++++++++++++++++++--------------
 files/lua_api/openmw/ui.lua      | 22 ++++++--
 4 files changed, 136 insertions(+), 63 deletions(-)
 create mode 100644 components/lua_ui/layers.cpp

diff --git a/apps/openmw/mwlua/uibindings.cpp b/apps/openmw/mwlua/uibindings.cpp
index 4c26c904f3..fdad57b13d 100644
--- a/apps/openmw/mwlua/uibindings.cpp
+++ b/apps/openmw/mwlua/uibindings.cpp
@@ -7,6 +7,7 @@
 #include <components/lua_ui/resources.hpp>
 
 #include <components/settings/settings.hpp>
+#include <components/misc/stringops.hpp>
 
 #include "context.hpp"
 #include "actions.hpp"
@@ -83,36 +84,33 @@ namespace MWLua
         class InsertLayerAction final : public Action
         {
             public:
-                InsertLayerAction(std::string_view name, std::string_view afterName,
-                    LuaUi::Layers::Options options, LuaUtil::LuaState* state)
+                InsertLayerAction(std::string_view name, size_t index,
+                    LuaUi::Layer::Options options, LuaUtil::LuaState* state)
                     : Action(state)
                     , mName(name)
-                    , mAfterName(afterName)
+                    , mIndex(index)
                     , mOptions(options)
                 {}
 
                 void apply(WorldView&) const override
                 {
-                    size_t index = LuaUi::Layers::indexOf(mAfterName);
-                    if (index == LuaUi::Layers::size())
-                        throw std::logic_error(std::string("Layer not found"));
-                    LuaUi::Layers::insert(index, mName, mOptions);
+                    LuaUi::Layer::insert(mIndex, mName, mOptions);
                 }
 
                 std::string toString() const override
                 {
                     std::string result("Insert UI layer \"");
                     result += mName;
-                    result += "\" after \"";
-                    result += mAfterName;
+                    result += "\" at \"";
+                    result += mIndex;
                     result += "\"";
                     return result;
                 }
 
             private:
                 std::string mName;
-                std::string mAfterName;
-                LuaUi::Layers::Options mOptions;
+                size_t mIndex;
+                LuaUi::Layer::Options mOptions;
         };
 
         // Lua arrays index from 1
@@ -227,37 +225,58 @@ namespace MWLua
             return element;
         };
 
+        auto uiLayer = context.mLua->sol().new_usertype<LuaUi::Layer>("UiLayer");
+        uiLayer["name"] = sol::property([](LuaUi::Layer& self) { return self.name(); });
+        uiLayer["size"] = sol::property([](LuaUi::Layer& self) { return self.size(); });
+        uiLayer[sol::meta_function::to_string] = [](LuaUi::Layer& self)
+        {
+            return Misc::StringUtils::format("UiLayer(%s)", self.name());
+        };
+
         sol::table layers = context.mLua->newTable();
         layers[sol::meta_function::length] = []()
         {
-            return LuaUi::Layers::size();
+            return LuaUi::Layer::count();
         };
         layers[sol::meta_function::index] = [](size_t index)
         {
             index = fromLuaIndex(index);
-            return LuaUi::Layers::at(index);
+            return LuaUi::Layer(index);
         };
         layers["indexOf"] = [](std::string_view name) -> sol::optional<size_t>
         {
-            size_t index = LuaUi::Layers::indexOf(name);
-            if (index == LuaUi::Layers::size())
+            size_t index = LuaUi::Layer::indexOf(name);
+            if (index == LuaUi::Layer::count())
                 return sol::nullopt;
             else
                 return toLuaIndex(index);
         };
         layers["insertAfter"] = [context](std::string_view afterName, std::string_view name, const sol::object& opt)
         {
-            LuaUi::Layers::Options options;
+            LuaUi::Layer::Options options;
+            options.mInteractive = LuaUtil::getValueOrDefault(LuaUtil::getFieldOrNil(opt, "interactive"), true);
+            size_t index = LuaUi::Layer::indexOf(afterName);
+            if (index == LuaUi::Layer::count())
+                throw std::logic_error(std::string("Layer not found"));
+            index++;
+            context.mLuaManager->addAction(std::make_unique<InsertLayerAction>(name, index, options, context.mLua));
+        };
+        layers["insertBefore"] = [context](std::string_view beforename, std::string_view name, const sol::object& opt)
+        {
+            LuaUi::Layer::Options options;
             options.mInteractive = LuaUtil::getValueOrDefault(LuaUtil::getFieldOrNil(opt, "interactive"), true);
-            context.mLuaManager->addAction(std::make_unique<InsertLayerAction>(name, afterName, options, context.mLua));
+            size_t index = LuaUi::Layer::indexOf(beforename);
+            if (index == LuaUi::Layer::count())
+                throw std::logic_error(std::string("Layer not found"));
+            context.mLuaManager->addAction(std::make_unique<InsertLayerAction>(name, index, options, context.mLua));
         };
         {
             auto pairs = [layers](const sol::object&)
             {
-                auto next = [](const sol::table& l, size_t i) -> sol::optional<std::tuple<size_t, std::string>>
+                auto next = [](const sol::table& l, size_t i) -> sol::optional<std::tuple<size_t, LuaUi::Layer>>
                 {
-                    if (i < LuaUi::Layers::size())
-                        return std::make_tuple(i + 1, LuaUi::Layers::at(i));
+                    if (i < LuaUi::Layer::count())
+                        return std::make_tuple(i + 1, LuaUi::Layer(i));
                     else
                         return sol::nullopt;
                 };
diff --git a/components/lua_ui/layers.cpp b/components/lua_ui/layers.cpp
new file mode 100644
index 0000000000..645c44f69f
--- /dev/null
+++ b/components/lua_ui/layers.cpp
@@ -0,0 +1,29 @@
+#include "layers.hpp"
+
+#include <components/debug/debuglog.hpp>
+
+namespace LuaUi
+{
+    size_t Layer::indexOf(std::string_view name)
+    {
+        for (size_t i = 0; i < count(); i++)
+            if (at(i)->getName() == name)
+                return i;
+        return count();
+    }
+
+    void Layer::insert(size_t index, std::string_view name, Options options)
+    {
+        if (index > count())
+            throw std::logic_error("Invalid layer index");
+        if (indexOf(name) < count())
+            Log(Debug::Error) << "Layer \"" << name << "\" already exists";
+        else
+        {
+            auto layer = MyGUI::LayerManager::getInstance()
+                .createLayerAt(std::string(name), "OverlappedLayer", index);
+            auto overlappedLayer = dynamic_cast<MyGUI::OverlappedLayer*>(layer);
+            overlappedLayer->setPick(options.mInteractive);
+        }
+    }
+}
diff --git a/components/lua_ui/layers.hpp b/components/lua_ui/layers.hpp
index 6fe7fc9c16..bb07e13c69 100644
--- a/components/lua_ui/layers.hpp
+++ b/components/lua_ui/layers.hpp
@@ -6,50 +6,63 @@
 
 #include <MyGUI_LayerManager.h>
 #include <MyGUI_OverlappedLayer.h>
+#include <osg/Vec2f>
 
 namespace LuaUi
 {
-    namespace Layers
+    // this wrapper is necessary, because the MyGUI LayerManager
+    // stores layers in a vector and their indices could change
+    class Layer
     {
-        struct Options {
-            bool mInteractive;
-        };
-
-        size_t size()
-        {
-            return MyGUI::LayerManager::getInstance().getLayerCount();
-        }
-
-        std::string at(size_t index)
-        {
-            if (index >= size())
-                throw std::logic_error("Invalid layer index");
-            return MyGUI::LayerManager::getInstance().getLayer(index)->getName();
-        }
-
-        size_t indexOf(std::string_view name)
-        {
-            for (size_t i = 0; i < size(); i++)
-                if (at(i) == name)
-                    return i;
-            return size();
-        }
-
-        void insert(size_t index, std::string_view name, Options options)
-        {
-            if (index > size())
-                throw std::logic_error("Invalid layer index");
-            if (indexOf(name) < size())
-                Log(Debug::Error) << "Layer \"" << name << "\" already exists";
-            else
+        public:
+            Layer(size_t index)
+                : mName(at(index)->getName())
+                , mCachedIndex(index)
+            {}
+
+            const std::string& name() const noexcept { return mName; };
+            const osg::Vec2f size()
+            {
+                MyGUI::ILayer* p = refresh();
+                MyGUI::IntSize size = p->getSize();
+                return osg::Vec2f(size.width, size.height);
+            }
+
+            struct Options
+            {
+                bool mInteractive;
+            };
+
+            static size_t count()
+            {
+                return MyGUI::LayerManager::getInstance().getLayerCount();
+            }
+
+            static size_t indexOf(std::string_view name);
+
+            static void insert(size_t index, std::string_view name, Options options);
+
+        private:
+            static MyGUI::ILayer* at(size_t index)
+            {
+                if (index >= count())
+                    throw std::logic_error("Invalid layer index");
+                return MyGUI::LayerManager::getInstance().getLayer(index);
+            }
+
+            MyGUI::ILayer* refresh()
             {
-                auto layer = MyGUI::LayerManager::getInstance()
-                                 .createLayerAt(std::string(name), "OverlappedLayer", index);
-                auto overlappedLayer = dynamic_cast<MyGUI::OverlappedLayer*>(layer);
-                overlappedLayer->setPick(options.mInteractive);
+                MyGUI::ILayer* p = at(mCachedIndex);
+                if (p->getName() != mName)
+                {
+                    mCachedIndex = indexOf(mName);
+                    p = at(mCachedIndex);
+                }
+                return p;
             }
-        }
-    }
+            std::string mName;
+            size_t mCachedIndex;
+    };
 }
 
 #endif // OPENMW_LUAUI_LAYERS
diff --git a/files/lua_api/openmw/ui.lua b/files/lua_api/openmw/ui.lua
index 57be0da501..0ef35a61a5 100644
--- a/files/lua_api/openmw/ui.lua
+++ b/files/lua_api/openmw/ui.lua
@@ -77,15 +77,20 @@
 -- @field #Content content Optional @{openmw.ui#Content} of children layouts
 
 ---
--- Layers. Implements [iterables#List](iterables.html#List) of #string.
+-- @type Layer
+-- @field #string name Name of the layer
+-- @field openmw.util#vector2 size Size of the layer in pixels
+
+---
+-- Layers. Implements [iterables#List](iterables.html#List) of #Layer.
 -- @type Layers
--- @list <#string>
+-- @list <#Layer>
 -- @usage
 -- ui.layers.insertAfter('HUD', 'NewLayer', { interactive = true })
--- local fourthLayerName = ui.layers[4]
+-- local fourthLayer = ui.layers[4]
 -- local windowsIndex = ui.layers.indexOf('Windows')
--- for i, name in ipairs(ui.layers) do
---   print('layer', i, name)
+-- for i, layer in ipairs(ui.layers) do
+--   print('layer', i, layer.name, layer.size)
 -- end
 
 ---
@@ -101,6 +106,13 @@
 -- @param #string name Name of the new layer
 -- @param #table options Table with a boolean `interactive` field (default is true). Layers with interactive = false will ignore all mouse interactions.
 
+---
+-- Creates a layer and inserts it before another layer (shifts indexes of some other layers).
+-- @function [parent=#Layers] insertBefore
+-- @param #string beforeName Name of the layer before which the new layer will be inserted
+-- @param #string name Name of the new layer
+-- @param #table options Table with a boolean `interactive` field (default is true). Layers with interactive = false will ignore all mouse interactions.
+
 ---
 -- Content. An array-like container, which allows to reference elements by their name.
 -- Implements [iterables#List](iterables.html#List) of #Layout and [iterables#Map](iterables.html#Map) of #string to #Layout.

From dcdba227f70fc6304687063cdf157ce519c116c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Fri, 25 Mar 2022 20:42:01 +0200
Subject: [PATCH 2221/2859] Use vector for mUsedPowers for deterministic order

---
 apps/openmw/mwmechanics/spells.cpp | 12 +++++++++---
 apps/openmw/mwmechanics/spells.hpp |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwmechanics/spells.cpp b/apps/openmw/mwmechanics/spells.cpp
index 133fc5e931..09390425f6 100644
--- a/apps/openmw/mwmechanics/spells.cpp
+++ b/apps/openmw/mwmechanics/spells.cpp
@@ -185,13 +185,19 @@ namespace MWMechanics
 
     bool Spells::canUsePower(const ESM::Spell* spell) const
     {
-        const auto it = mUsedPowers.find(spell);
+        const auto it = std::find_if(std::begin(mUsedPowers), std::end(mUsedPowers), [&](auto& pair) { return pair.first == spell; });
         return it == mUsedPowers.end() || it->second + 24 <= MWBase::Environment::get().getWorld()->getTimeStamp();
     }
 
     void Spells::usePower(const ESM::Spell* spell)
     {
-        mUsedPowers[spell] = MWBase::Environment::get().getWorld()->getTimeStamp();
+        // Updates or inserts a new entry with the current timestamp.
+        const auto it = std::find_if(std::begin(mUsedPowers), std::end(mUsedPowers), [&](auto& pair) { return pair.first == spell; });
+        const auto timestamp = MWBase::Environment::get().getWorld()->getTimeStamp();
+        if (it == mUsedPowers.end())
+            mUsedPowers.emplace_back(spell, timestamp);
+        else
+            it->second = timestamp;
     }
 
     void Spells::readState(const ESM::SpellState &state, CreatureStats* creatureStats)
@@ -223,7 +229,7 @@ namespace MWMechanics
             const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(it->first);
             if (!spell)
                 continue;
-            mUsedPowers[spell] = MWWorld::TimeStamp(it->second);
+            mUsedPowers.emplace_back(spell, MWWorld::TimeStamp(it->second));
         }
 
         // Permanent effects are used only to keep the custom magnitude of corprus spells effects (after cure too), and only in old saves. Convert data to the new approach.
diff --git a/apps/openmw/mwmechanics/spells.hpp b/apps/openmw/mwmechanics/spells.hpp
index 29f505d369..89e24c4eb5 100644
--- a/apps/openmw/mwmechanics/spells.hpp
+++ b/apps/openmw/mwmechanics/spells.hpp
@@ -34,7 +34,7 @@ namespace MWMechanics
             // Note: this is the spell that's about to be cast, *not* the spell selected in the GUI (which may be different)
             std::string mSelectedSpell;
 
-            std::map<const ESM::Spell*, MWWorld::TimeStamp> mUsedPowers;
+            std::vector<std::pair<const ESM::Spell*, MWWorld::TimeStamp>> mUsedPowers;
 
             bool hasDisease(const ESM::Spell::SpellType type) const;
 

From edca5ac0b879b200f670ae94b2f56db2b46226aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Fri, 25 Mar 2022 20:47:43 +0200
Subject: [PATCH 2222/2859] Rename hasDisease to hasSpellType and refactor
 function

---
 apps/openmw/mwmechanics/spells.cpp | 18 ++++++++----------
 apps/openmw/mwmechanics/spells.hpp |  2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/apps/openmw/mwmechanics/spells.cpp b/apps/openmw/mwmechanics/spells.cpp
index 09390425f6..e3e8e849e4 100644
--- a/apps/openmw/mwmechanics/spells.cpp
+++ b/apps/openmw/mwmechanics/spells.cpp
@@ -112,25 +112,23 @@ namespace MWMechanics
         return mSelectedSpell;
     }
 
-    bool Spells::hasDisease(const ESM::Spell::SpellType type) const
+    bool Spells::hasSpellType(const ESM::Spell::SpellType type) const
     {
-        for (const auto spell : mSpells)
-        {
-            if (spell->mData.mType == type)
-                return true;
-        }
-
-        return false;
+        auto it = std::find_if(std::begin(mSpells), std::end(mSpells), [=](const ESM::Spell* spell)
+            {
+                return spell->mData.mType == type;
+            });
+        return it != std::end(mSpells);
     }
 
     bool Spells::hasCommonDisease() const
     {
-        return hasDisease(ESM::Spell::ST_Disease);
+        return hasSpellType(ESM::Spell::ST_Disease);
     }
 
     bool Spells::hasBlightDisease() const
     {
-        return hasDisease(ESM::Spell::ST_Blight);
+        return hasSpellType(ESM::Spell::ST_Blight);
     }
 
     void Spells::purge(const SpellFilter& filter)
diff --git a/apps/openmw/mwmechanics/spells.hpp b/apps/openmw/mwmechanics/spells.hpp
index 89e24c4eb5..25dab0c9d4 100644
--- a/apps/openmw/mwmechanics/spells.hpp
+++ b/apps/openmw/mwmechanics/spells.hpp
@@ -36,7 +36,7 @@ namespace MWMechanics
 
             std::vector<std::pair<const ESM::Spell*, MWWorld::TimeStamp>> mUsedPowers;
 
-            bool hasDisease(const ESM::Spell::SpellType type) const;
+            bool hasSpellType(const ESM::Spell::SpellType type) const;
 
             using SpellFilter = bool (*)(const ESM::Spell*);
             void purge(const SpellFilter& filter);

From 93d195646ce7a9d60a319c6f70fc9fa30fa467e7 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Fri, 25 Mar 2022 20:03:13 +0000
Subject: [PATCH 2223/2859] Lua stats

---
 apps/openmw/CMakeLists.txt         |   4 +-
 apps/openmw/mwlua/actions.cpp      |   9 +
 apps/openmw/mwlua/actions.hpp      |  10 +
 apps/openmw/mwlua/localscripts.cpp |   7 +
 apps/openmw/mwlua/localscripts.hpp |  24 ++
 apps/openmw/mwlua/luabindings.cpp  |   2 +-
 apps/openmw/mwlua/stats.cpp        | 369 +++++++++++++++++++++++++++++
 apps/openmw/mwlua/stats.hpp        |  12 +
 apps/openmw/mwlua/types/actor.cpp  |   3 +
 apps/openmw/mwlua/types/npc.cpp    |  11 +
 apps/openmw/mwlua/types/types.cpp  |   2 +-
 apps/openmw/mwlua/types/types.hpp  |   1 +
 files/lua_api/openmw/types.lua     | 282 ++++++++++++++++++++++
 13 files changed, 732 insertions(+), 4 deletions(-)
 create mode 100644 apps/openmw/mwlua/stats.cpp
 create mode 100644 apps/openmw/mwlua/stats.hpp
 create mode 100644 apps/openmw/mwlua/types/npc.cpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index b823674d31..3d6469fa33 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -59,8 +59,8 @@ add_openmw_dir (mwscript
 add_openmw_dir (mwlua
     luamanagerimp actions object worldview userdataserializer eventqueue
     luabindings localscripts playerscripts objectbindings cellbindings asyncbindings settingsbindings
-    camerabindings uibindings inputbindings nearbybindings
-    types/types types/door types/actor types/container types/weapon
+    camerabindings uibindings inputbindings nearbybindings stats
+    types/types types/door types/actor types/container types/weapon types/npc
     )
 
 add_openmw_dir (mwsound
diff --git a/apps/openmw/mwlua/actions.cpp b/apps/openmw/mwlua/actions.cpp
index 8135d14299..404bae6c6d 100644
--- a/apps/openmw/mwlua/actions.cpp
+++ b/apps/openmw/mwlua/actions.cpp
@@ -1,5 +1,7 @@
 #include "actions.hpp"
 
+#include "localscripts.hpp"
+
 #include <cstring>
 
 #include <components/debug/debuglog.hpp>
@@ -168,4 +170,11 @@ namespace MWLua
                std::string(" actor=") + idToString(mActor);
     }
 
+    void StatUpdateAction::apply(WorldView& worldView) const
+    {
+        LObject obj(mId, worldView.getObjectRegistry());
+        LocalScripts* scripts = obj.ptr().getRefData().getLuaScripts();
+        if (scripts)
+            scripts->applyStatsCache();
+    }
 }
diff --git a/apps/openmw/mwlua/actions.hpp b/apps/openmw/mwlua/actions.hpp
index 97da953437..30211b6e53 100644
--- a/apps/openmw/mwlua/actions.hpp
+++ b/apps/openmw/mwlua/actions.hpp
@@ -79,6 +79,16 @@ namespace MWLua
         ObjectId mActor;
     };
 
+    class StatUpdateAction final : public Action
+    {
+        ObjectId mId;
+    public:
+        StatUpdateAction(LuaUtil::LuaState* state, ObjectId id) : Action(state), mId(id) {}
+
+        void apply(WorldView& worldView) const override;
+
+        std::string toString() const override { return "StatUpdateAction"; }
+    };
 }
 
 #endif // MWLUA_ACTIONS_H
diff --git a/apps/openmw/mwlua/localscripts.cpp b/apps/openmw/mwlua/localscripts.cpp
index 7cdb31f518..948bc1e869 100644
--- a/apps/openmw/mwlua/localscripts.cpp
+++ b/apps/openmw/mwlua/localscripts.cpp
@@ -182,4 +182,11 @@ namespace MWLua
         }, event);
     }
 
+    void LocalScripts::applyStatsCache()
+    {
+        const auto& ptr = mData.ptr();
+        for (auto& [stat, value] : mData.mStatsCache)
+            stat(ptr, value);
+        mData.mStatsCache.clear();
+    }
 }
diff --git a/apps/openmw/mwlua/localscripts.hpp b/apps/openmw/mwlua/localscripts.hpp
index 10b9cd53af..b5bd8f95c8 100644
--- a/apps/openmw/mwlua/localscripts.hpp
+++ b/apps/openmw/mwlua/localscripts.hpp
@@ -26,8 +26,31 @@ namespace MWLua
 
         struct SelfObject : public LObject
         {
+            class CachedStat
+            {
+            public:
+                using Setter = void(*)(int, std::string_view, const MWWorld::Ptr&, const sol::object&);
+            private:
+                Setter mSetter; // Function that updates a stat's property
+                int mIndex; // Optional index to disambiguate the stat
+                std::string_view mProp; // Name of the stat's property
+            public:
+                CachedStat(Setter setter, int index, std::string_view prop) : mSetter(setter), mIndex(index), mProp(std::move(prop)) {}
+
+                void operator()(const MWWorld::Ptr& ptr, const sol::object& object) const
+                {
+                    mSetter(mIndex, mProp, ptr, object);
+                }
+
+                bool operator<(const CachedStat& other) const
+                {
+                    return std::tie(mSetter, mIndex, mProp) < std::tie(other.mSetter, other.mIndex, other.mProp);
+                }
+            };
+
             SelfObject(const LObject& obj) : LObject(obj), mIsActive(false) {}
             MWBase::LuaManager::ActorControls mControls;
+            std::map<CachedStat, sol::object> mStatsCache;
             bool mIsActive;
         };
 
@@ -45,6 +68,7 @@ namespace MWLua
 
         void receiveEngineEvent(const EngineEvent&);
 
+        void applyStatsCache();
     protected:
         SelfObject mData;
 
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index a46435b2ca..9f35866f89 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -41,7 +41,7 @@ namespace MWLua
     {
         auto* lua = context.mLua;
         sol::table api(lua->sol(), sol::create);
-        api["API_REVISION"] = 18;
+        api["API_REVISION"] = 19;
         api["quit"] = [lua]()
         {
             Log(Debug::Warning) << "Quit requested by a Lua script.\n" << lua->debugTraceback();
diff --git a/apps/openmw/mwlua/stats.cpp b/apps/openmw/mwlua/stats.cpp
new file mode 100644
index 0000000000..36d7cf6538
--- /dev/null
+++ b/apps/openmw/mwlua/stats.cpp
@@ -0,0 +1,369 @@
+#include "stats.hpp"
+
+#include <memory>
+#include <optional>
+#include <string_view>
+#include <variant>
+
+#include <components/lua/luastate.hpp>
+#include <components/misc/stringops.hpp>
+
+#include "localscripts.hpp"
+#include "luamanagerimp.hpp"
+
+#include "../mwmechanics/creaturestats.hpp"
+#include "../mwmechanics/npcstats.hpp"
+#include "../mwworld/class.hpp"
+#include "../mwworld/esmstore.hpp"
+
+namespace
+{
+    template<class T>
+    auto addIndexedAccessor(int index)
+    {
+        return sol::overload(
+            [index](MWLua::LocalScripts::SelfObject& o) { return T::create(&o, index); },
+            [index](const MWLua::LObject& o) { return T::create(o, index); },
+            [index](const MWLua::GObject& o) { return T::create(o, index); }
+        );
+    }
+
+    template<class T, class G>
+    void addProp(const MWLua::Context& context, sol::usertype<T>& type, std::string_view prop, G getter, bool readOnly = false)
+    {
+        if(readOnly)
+            type[prop] = sol::property([=](const T& stat) { return stat.get(context, prop, getter); });
+        else
+            type[prop] = sol::property(
+                [=](const T& stat) { return stat.get(context, prop, getter); },
+                [=](const T& stat, const sol::object& value) { stat.cache(context, prop, value); });
+    }
+
+    using SelfObject = MWLua::LocalScripts::SelfObject;
+    using StatObject = std::variant<SelfObject*, MWLua::LObject, MWLua::GObject>;
+
+    const MWLua::Object* getObject(const StatObject& obj)
+    {
+        return std::visit([] (auto&& variant) -> const MWLua::Object*
+        {
+            using T = std::decay_t<decltype(variant)>;
+            if constexpr(std::is_same_v<T, SelfObject*>)
+                return variant;
+            else if constexpr(std::is_same_v<T, MWLua::LObject>)
+                return &variant;
+            else if constexpr(std::is_same_v<T, MWLua::GObject>)
+                return &variant;
+        }, obj);
+    }
+
+    template<class G>
+    sol::object getValue(const MWLua::Context& context, const StatObject& obj, SelfObject::CachedStat::Setter setter, int index, std::string_view prop, G getter)
+    {
+        return std::visit([&] (auto&& variant)
+        {
+            using T = std::decay_t<decltype(variant)>;
+            if constexpr(std::is_same_v<T, SelfObject*>)
+            {
+                auto it = variant->mStatsCache.find({ setter, index, prop });
+                if(it != variant->mStatsCache.end())
+                    return it->second;
+                return sol::make_object(context.mLua->sol(), getter(variant));
+            }
+            else if constexpr(std::is_same_v<T, MWLua::LObject>)
+                return sol::make_object(context.mLua->sol(), getter(&variant));
+            else if constexpr(std::is_same_v<T, MWLua::GObject>)
+                return sol::make_object(context.mLua->sol(), getter(&variant));
+        }, obj);
+    }
+}
+
+namespace MWLua
+{
+    class LevelStat
+    {
+        StatObject mObject;
+
+        LevelStat(StatObject object) : mObject(std::move(object)) {}
+    public:
+        sol::object getCurrent(const Context& context) const
+        {
+            return getValue(context, mObject, &LevelStat::setValue, 0, "current", [](const MWLua::Object* obj)
+            {
+                const auto& ptr = obj->ptr();
+                return ptr.getClass().getCreatureStats(ptr).getLevel();
+            });
+        }
+
+        void setCurrent(const Context& context, const sol::object& value) const
+        {
+            SelfObject* obj = std::get<SelfObject*>(mObject);
+            if(obj->mStatsCache.empty())
+                context.mLuaManager->addAction(std::make_unique<StatUpdateAction>(context.mLua, obj->id()));
+            obj->mStatsCache[SelfObject::CachedStat{&LevelStat::setValue, 0, "current"}] = value;
+        }
+
+        sol::object getProgress(const Context& context) const
+        {
+            const auto& ptr = getObject(mObject)->ptr();
+            if(!ptr.getClass().isNpc())
+                return sol::nil;
+            return sol::make_object(context.mLua->sol(), ptr.getClass().getNpcStats(ptr).getLevelProgress());
+        }
+
+        static std::optional<LevelStat> create(StatObject object, int index)
+        {
+            if(!getObject(object)->ptr().getClass().isActor())
+                return {};
+            return LevelStat{std::move(object)};
+        }
+
+        static void setValue(int, std::string_view prop, const MWWorld::Ptr& ptr, const sol::object& value)
+        {
+            auto& stats = ptr.getClass().getCreatureStats(ptr);
+            if(prop == "current")
+                stats.setLevel(value.as<int>());
+        }
+    };
+
+    class DynamicStat
+    {
+        StatObject mObject;
+        int mIndex;
+
+        DynamicStat(StatObject object, int index) : mObject(std::move(object)), mIndex(index) {}
+    public:
+        template<class G>
+        sol::object get(const Context& context, std::string_view prop, G getter) const
+        {
+            return getValue(context, mObject, &DynamicStat::setValue, mIndex, prop, [=](const MWLua::Object* obj)
+            {
+                const auto& ptr = obj->ptr();
+                return (ptr.getClass().getCreatureStats(ptr).getDynamic(mIndex).*getter)();
+            });
+        }
+
+        static std::optional<DynamicStat> create(StatObject object, int index)
+        {
+            if(!getObject(object)->ptr().getClass().isActor())
+                return {};
+            return DynamicStat{std::move(object), index};
+        }
+
+        void cache(const Context& context, std::string_view prop, const sol::object& value) const
+        {
+            SelfObject* obj = std::get<SelfObject*>(mObject);
+            if(obj->mStatsCache.empty())
+                context.mLuaManager->addAction(std::make_unique<StatUpdateAction>(context.mLua, obj->id()));
+            obj->mStatsCache[SelfObject::CachedStat{&DynamicStat::setValue, mIndex, prop}] = value;
+        }
+
+        static void setValue(int index, std::string_view prop, const MWWorld::Ptr& ptr, const sol::object& value)
+        {
+            auto& stats = ptr.getClass().getCreatureStats(ptr);
+            auto stat = stats.getDynamic(index);
+            float floatValue = value.as<float>();
+            if(prop == "base")
+                stat.setBase(floatValue);
+            else if(prop == "current")
+                stat.setCurrent(floatValue, true, true);
+            else if(prop == "modifier")
+                stat.setModifier(floatValue);
+            stats.setDynamic(index, stat);
+        }
+    };
+
+    class AttributeStat
+    {
+        StatObject mObject;
+        int mIndex;
+
+        AttributeStat(StatObject object, int index) : mObject(std::move(object)), mIndex(index) {}
+    public:
+        template<class G>
+        sol::object get(const Context& context, std::string_view prop, G getter) const
+        {
+            return getValue(context, mObject, &AttributeStat::setValue, mIndex, prop, [=](const MWLua::Object* obj)
+            {
+                const auto& ptr = obj->ptr();
+                return (ptr.getClass().getCreatureStats(ptr).getAttribute(mIndex).*getter)();
+            });
+        }
+
+        static std::optional<AttributeStat> create(StatObject object, int index)
+        {
+            if(!getObject(object)->ptr().getClass().isActor())
+                return {};
+            return AttributeStat{std::move(object), index};
+        }
+
+        void cache(const Context& context, std::string_view prop, const sol::object& value) const
+        {
+            SelfObject* obj = std::get<SelfObject*>(mObject);
+            if(obj->mStatsCache.empty())
+                context.mLuaManager->addAction(std::make_unique<StatUpdateAction>(context.mLua, obj->id()));
+            obj->mStatsCache[SelfObject::CachedStat{&AttributeStat::setValue, mIndex, prop}] = value;
+        }
+
+        static void setValue(int index, std::string_view prop, const MWWorld::Ptr& ptr, const sol::object& value)
+        {
+            auto& stats = ptr.getClass().getCreatureStats(ptr);
+            auto stat = stats.getAttribute(index);
+            float floatValue = value.as<float>();
+            if(prop == "base")
+                stat.setBase(floatValue);
+            else if(prop == "damage")
+            {
+                stat.restore(stat.getDamage());
+                stat.damage(floatValue);
+            }
+            else if(prop == "modifier")
+                stat.setModifier(floatValue);
+            stats.setAttribute(index, stat);
+        }
+    };
+
+    class SkillStat
+    {
+        StatObject mObject;
+        int mIndex;
+
+        SkillStat(StatObject object, int index) : mObject(std::move(object)), mIndex(index) {}
+
+        static float getProgress(const MWWorld::Ptr& ptr, int index, const MWMechanics::SkillValue& stat)
+        {
+            float progress = stat.getProgress();
+            if(progress != 0.f)
+                progress /= getMaxProgress(ptr, index, stat);
+            return progress;
+        }
+
+        static float getMaxProgress(const MWWorld::Ptr& ptr, int index, const MWMechanics::SkillValue& stat) {
+            const auto& store = MWBase::Environment::get().getWorld()->getStore();
+            const auto cl = store.get<ESM::Class>().find(ptr.get<ESM::NPC>()->mBase->mClass);
+            return ptr.getClass().getNpcStats(ptr).getSkillProgressRequirement(index, *cl);
+        }
+    public:
+        template<class G>
+        sol::object get(const Context& context, std::string_view prop, G getter) const
+        {
+            return getValue(context, mObject, &SkillStat::setValue, mIndex, prop, [=](const MWLua::Object* obj)
+            {
+                const auto& ptr = obj->ptr();
+                return (ptr.getClass().getNpcStats(ptr).getSkill(mIndex).*getter)();
+            });
+        }
+
+        sol::object getProgress(const Context& context) const
+        {
+            return getValue(context, mObject, &SkillStat::setValue, mIndex, "progress", [=](const MWLua::Object* obj)
+            {
+                const auto& ptr = obj->ptr();
+                return getProgress(ptr, mIndex, ptr.getClass().getNpcStats(ptr).getSkill(mIndex));
+            });
+        }
+
+        static std::optional<SkillStat> create(StatObject object, int index)
+        {
+            if(!getObject(object)->ptr().getClass().isNpc())
+                return {};
+            return SkillStat{std::move(object), index};
+        }
+
+        void cache(const Context& context, std::string_view prop, const sol::object& value) const
+        {
+            SelfObject* obj = std::get<SelfObject*>(mObject);
+            if(obj->mStatsCache.empty())
+                context.mLuaManager->addAction(std::make_unique<StatUpdateAction>(context.mLua, obj->id()));
+            obj->mStatsCache[SelfObject::CachedStat{&SkillStat::setValue, mIndex, prop}] = value;
+        }
+
+        static void setValue(int index, std::string_view prop, const MWWorld::Ptr& ptr, const sol::object& value)
+        {
+            auto& stats = ptr.getClass().getNpcStats(ptr);
+            auto stat = stats.getSkill(index);
+            float floatValue = value.as<float>();
+            if(prop == "base")
+                stat.setBase(floatValue);
+            else if(prop == "damage")
+            {
+                stat.restore(stat.getDamage());
+                stat.damage(floatValue);
+            }
+            else if(prop == "modifier")
+                stat.setModifier(floatValue);
+            else if(prop == "progress")
+                stat.setProgress(floatValue * getMaxProgress(ptr, index, stat));
+            stats.setSkill(index, stat);
+        }
+    };
+}
+
+namespace sol
+{
+    template <>
+    struct is_automagical<MWLua::LevelStat> : std::false_type {};
+    template <>
+    struct is_automagical<MWLua::DynamicStat> : std::false_type {};
+    template <>
+    struct is_automagical<MWLua::AttributeStat> : std::false_type {};
+    template <>
+    struct is_automagical<MWLua::SkillStat> : std::false_type {};
+}
+
+namespace MWLua
+{
+    void addActorStatsBindings(sol::table& actor, const Context& context)
+    {
+        sol::table stats(context.mLua->sol(), sol::create);
+        actor["stats"] = LuaUtil::makeReadOnly(stats);
+
+        auto levelStatT = context.mLua->sol().new_usertype<LevelStat>("LevelStat");
+        levelStatT["current"] = sol::property(
+            [context](const LevelStat& stat) { return stat.getCurrent(context); },
+            [context](const LevelStat& stat, const sol::object& value) { stat.setCurrent(context, value); });
+        levelStatT["progress"] = sol::property([context](const LevelStat& stat) { return stat.getProgress(context); });
+        stats["level"] = addIndexedAccessor<LevelStat>(0);
+
+        auto dynamicStatT = context.mLua->sol().new_usertype<DynamicStat>("DynamicStat");
+        addProp(context, dynamicStatT, "base", &MWMechanics::DynamicStat<float>::getBase);
+        addProp(context, dynamicStatT, "current", &MWMechanics::DynamicStat<float>::getCurrent);
+        addProp(context, dynamicStatT, "modifier", &MWMechanics::DynamicStat<float>::getModifier);
+        sol::table dynamic(context.mLua->sol(), sol::create);
+        stats["dynamic"] = LuaUtil::makeReadOnly(dynamic);
+        dynamic["health"] = addIndexedAccessor<DynamicStat>(0);
+        dynamic["magicka"] = addIndexedAccessor<DynamicStat>(1);
+        dynamic["fatigue"] = addIndexedAccessor<DynamicStat>(2);
+
+        auto attributeStatT = context.mLua->sol().new_usertype<AttributeStat>("AttributeStat");
+        addProp(context, attributeStatT, "base", &MWMechanics::AttributeValue::getBase);
+        addProp(context, attributeStatT, "damage", &MWMechanics::AttributeValue::getDamage);
+        addProp(context, attributeStatT, "modified", &MWMechanics::AttributeValue::getModified, true);
+        addProp(context, attributeStatT, "modifier", &MWMechanics::AttributeValue::getModifier);
+        sol::table attributes(context.mLua->sol(), sol::create);
+        stats["attributes"] = LuaUtil::makeReadOnly(attributes);
+        for(int id = ESM::Attribute::Strength; id < ESM::Attribute::Length; ++id)
+            attributes[Misc::StringUtils::lowerCase(ESM::Attribute::sAttributeNames[id])] = addIndexedAccessor<AttributeStat>(id);
+    }
+
+    void addNpcStatsBindings(sol::table& npc, const Context& context)
+    {
+        sol::table npcStats(context.mLua->sol(), sol::create);
+        sol::table baseMeta(context.mLua->sol(), sol::create);
+        baseMeta[sol::meta_function::index] = LuaUtil::getMutableFromReadOnly(npc["baseType"]["stats"]);
+        npcStats[sol::metatable_key] = baseMeta;
+        npc["stats"] = LuaUtil::makeReadOnly(npcStats);
+
+        auto skillStatT = context.mLua->sol().new_usertype<SkillStat>("SkillStat");
+        addProp(context, skillStatT, "base", &MWMechanics::SkillValue::getBase);
+        addProp(context, skillStatT, "damage", &MWMechanics::SkillValue::getDamage);
+        addProp(context, skillStatT, "modified", &MWMechanics::SkillValue::getModified, true);
+        addProp(context, skillStatT, "modifier", &MWMechanics::SkillValue::getModifier);
+        skillStatT["progress"] = sol::property(
+            [context](const SkillStat& stat) { return stat.getProgress(context); },
+            [context](const SkillStat& stat, const sol::object& value) { stat.cache(context, "progress", value); });
+        sol::table skills(context.mLua->sol(), sol::create);
+        npcStats["skills"] = LuaUtil::makeReadOnly(skills);
+        for(int id = ESM::Skill::Block; id < ESM::Skill::Length; ++id)
+            skills[Misc::StringUtils::lowerCase(ESM::Skill::sSkillNames[id])] = addIndexedAccessor<SkillStat>(id);
+    }
+}
diff --git a/apps/openmw/mwlua/stats.hpp b/apps/openmw/mwlua/stats.hpp
new file mode 100644
index 0000000000..5108b710bf
--- /dev/null
+++ b/apps/openmw/mwlua/stats.hpp
@@ -0,0 +1,12 @@
+#ifndef MWLUA_STATS_H
+#define MWLUA_STATS_H
+
+#include "context.hpp"
+
+namespace MWLua
+{
+    void addActorStatsBindings(sol::table& actor, const Context& context);
+    void addNpcStatsBindings(sol::table& npc, const Context& context);
+}
+
+#endif
diff --git a/apps/openmw/mwlua/types/actor.cpp b/apps/openmw/mwlua/types/actor.cpp
index d620472095..321aaa20e6 100644
--- a/apps/openmw/mwlua/types/actor.cpp
+++ b/apps/openmw/mwlua/types/actor.cpp
@@ -10,6 +10,7 @@
 #include "../luabindings.hpp"
 #include "../localscripts.hpp"
 #include "../luamanagerimp.hpp"
+#include "../stats.hpp"
 
 namespace MWLua
 {
@@ -132,6 +133,8 @@ namespace MWLua
             }
             context.mLuaManager->addAction(std::make_unique<SetEquipmentAction>(context.mLua, obj.id(), std::move(eqp)));
         };
+
+        addActorStatsBindings(actor, context);
     }
 
 }
diff --git a/apps/openmw/mwlua/types/npc.cpp b/apps/openmw/mwlua/types/npc.cpp
new file mode 100644
index 0000000000..8dafbe1e8a
--- /dev/null
+++ b/apps/openmw/mwlua/types/npc.cpp
@@ -0,0 +1,11 @@
+#include "types.hpp"
+
+#include "../stats.hpp"
+
+namespace MWLua
+{
+    void addNpcBindings(sol::table npc, const Context& context)
+    {
+        addNpcStatsBindings(npc, context);
+    }
+}
diff --git a/apps/openmw/mwlua/types/types.cpp b/apps/openmw/mwlua/types/types.cpp
index a175031058..d696fb9715 100644
--- a/apps/openmw/mwlua/types/types.cpp
+++ b/apps/openmw/mwlua/types/types.cpp
@@ -156,7 +156,7 @@ namespace MWLua
                                        ESM::REC_APPA, ESM::REC_LOCK, ESM::REC_PROB, ESM::REC_REPA});
 
         addType(ObjectTypeName::Creature, {ESM::REC_CREA}, ObjectTypeName::Actor);
-        addType(ObjectTypeName::NPC, {ESM::REC_INTERNAL_PLAYER, ESM::REC_NPC_}, ObjectTypeName::Actor);
+        addNpcBindings(addType(ObjectTypeName::NPC, {ESM::REC_INTERNAL_PLAYER, ESM::REC_NPC_}, ObjectTypeName::Actor), context);
         addType(ObjectTypeName::Player, {ESM::REC_INTERNAL_PLAYER}, ObjectTypeName::NPC);
 
         addType(ObjectTypeName::Armor, {ESM::REC_ARMO}, ObjectTypeName::Item);
diff --git a/apps/openmw/mwlua/types/types.hpp b/apps/openmw/mwlua/types/types.hpp
index af861c0bb4..cb345b7d01 100644
--- a/apps/openmw/mwlua/types/types.hpp
+++ b/apps/openmw/mwlua/types/types.hpp
@@ -28,6 +28,7 @@ namespace MWLua
     void addDoorBindings(sol::table door, const Context& context);
     void addActorBindings(sol::table actor, const Context& context);
     void addWeaponBindings(sol::table weapon, const Context& context);
+    void addNpcBindings(sol::table npc, const Context& context);
 }
 
 #endif // MWLUA_TYPES_H
diff --git a/files/lua_api/openmw/types.lua b/files/lua_api/openmw/types.lua
index 917a83ee8c..b9b5df44d6 100644
--- a/files/lua_api/openmw/types.lua
+++ b/files/lua_api/openmw/types.lua
@@ -128,6 +128,287 @@
 -- local Actor = require('openmw.types').Actor
 -- Actor.setEquipment(self, {}) -- unequip all
 
+---
+-- @type LevelStat
+-- @field #number current The actor's current level.
+-- @field #number progress The NPC's level progress (read-only.)
+
+---
+-- @type DynamicStat
+-- @field #number base
+-- @field #number current
+-- @field #number modifier
+
+---
+-- @type AttributeStat
+-- @field #number base The actor's base attribute value.
+-- @field #number damage The amount the attribute has been damaged.
+-- @field #number modified The actor's current attribute value (read-only.)
+-- @field #number modifier The attribute's modifier.
+
+---
+-- @type SkillStat
+-- @field #number base The NPC's base skill value.
+-- @field #number damage The amount the skill has been damaged.
+-- @field #number modified The NPC's current skill value (read-only.)
+-- @field #number modifier The skill's modifier.
+-- @field #number progress [0-1] The NPC's skill progress.
+
+---
+-- @type DynamicStats
+
+---
+-- Health (returns @{#DynamicStat})
+-- @function [parent=#DynamicStats] health
+-- @param openmw.core#GameObject actor
+-- @return #DynamicStat
+
+---
+-- Magicka (returns @{#DynamicStat})
+-- @function [parent=#DynamicStats] magicka
+-- @param openmw.core#GameObject actor
+-- @return #DynamicStat
+
+---
+-- Fatigue (returns @{#DynamicStat})
+-- @function [parent=#DynamicStats] fatigue
+-- @param openmw.core#GameObject actor
+-- @return #DynamicStat
+
+---
+-- @type AttributeStats
+
+---
+-- Strength (returns @{#AttributeStat})
+-- @function [parent=#AttributeStats] strength
+-- @param openmw.core#GameObject actor
+-- @return #AttributeStat
+
+---
+-- Intelligence (returns @{#AttributeStat})
+-- @function [parent=#AttributeStats] intelligence
+-- @param openmw.core#GameObject actor
+-- @return #AttributeStat
+
+---
+-- Willpower (returns @{#AttributeStat})
+-- @function [parent=#AttributeStats] willpower
+-- @param openmw.core#GameObject actor
+-- @return #AttributeStat
+
+---
+-- Agility (returns @{#AttributeStat})
+-- @function [parent=#AttributeStats] agility
+-- @param openmw.core#GameObject actor
+-- @return #AttributeStat
+
+---
+-- Speed (returns @{#AttributeStat})
+-- @function [parent=#AttributeStats] speed
+-- @param openmw.core#GameObject actor
+-- @return #AttributeStat
+
+---
+-- Endurance (returns @{#AttributeStat})
+-- @function [parent=#AttributeStats] endurance
+-- @param openmw.core#GameObject actor
+-- @return #AttributeStat
+
+---
+-- Personality (returns @{#AttributeStat})
+-- @function [parent=#AttributeStats] personality
+-- @param openmw.core#GameObject actor
+-- @return #AttributeStat
+
+---
+-- Luck (returns @{#AttributeStat})
+-- @function [parent=#AttributeStats] luck
+-- @param openmw.core#GameObject actor
+-- @return #AttributeStat
+
+---
+-- @type SkillStats
+
+---
+-- Block (returns @{#SkillStat})
+-- @function [parent=#SkillStats] block
+-- @param openmw.core#GameObject actor
+-- @return #SkillStat
+
+---
+-- Armorer (returns @{#SkillStat})
+-- @function [parent=#SkillStats] armorer
+-- @param openmw.core#GameObject actor
+-- @return #SkillStat
+
+---
+-- Medium Armor (returns @{#SkillStat})
+-- @function [parent=#SkillStats] mediumarmor
+-- @param openmw.core#GameObject actor
+-- @return #SkillStat
+
+---
+-- Heavy Armor (returns @{#SkillStat})
+-- @function [parent=#SkillStats] heavyarmor
+-- @param openmw.core#GameObject actor
+-- @return #SkillStat
+
+---
+-- Blunt Weapon (returns @{#SkillStat})
+-- @function [parent=#SkillStats] bluntweapon
+-- @param openmw.core#GameObject actor
+-- @return #SkillStat
+
+---
+-- Long Blade (returns @{#SkillStat})
+-- @function [parent=#SkillStats] longblade
+-- @param openmw.core#GameObject actor
+-- @return #SkillStat
+
+---
+-- Axe (returns @{#SkillStat})
+-- @function [parent=#SkillStats] axe
+-- @param openmw.core#GameObject actor
+-- @return #SkillStat
+
+---
+-- Spear (returns @{#SkillStat})
+-- @function [parent=#SkillStats] spear
+-- @param openmw.core#GameObject actor
+-- @return #SkillStat
+
+---
+-- Athletics (returns @{#SkillStat})
+-- @function [parent=#SkillStats] athletics
+-- @param openmw.core#GameObject actor
+-- @return #SkillStat
+
+---
+-- Enchant (returns @{#SkillStat})
+-- @function [parent=#SkillStats] enchant
+-- @param openmw.core#GameObject actor
+-- @return #SkillStat
+
+---
+-- Destruction (returns @{#SkillStat})
+-- @function [parent=#SkillStats] destruction
+-- @param openmw.core#GameObject actor
+-- @return #SkillStat
+
+---
+-- Alteration (returns @{#SkillStat})
+-- @function [parent=#SkillStats] alteration
+-- @param openmw.core#GameObject actor
+-- @return #SkillStat
+
+---
+-- Illusion (returns @{#SkillStat})
+-- @function [parent=#SkillStats] illusion
+-- @param openmw.core#GameObject actor
+-- @return #SkillStat
+
+---
+-- Conjuration (returns @{#SkillStat})
+-- @function [parent=#SkillStats] conjuration
+-- @param openmw.core#GameObject actor
+-- @return #SkillStat
+
+---
+-- Mysticism (returns @{#SkillStat})
+-- @function [parent=#SkillStats] mysticism
+-- @param openmw.core#GameObject actor
+-- @return #SkillStat
+
+---
+-- Restoration (returns @{#SkillStat})
+-- @function [parent=#SkillStats] restoration
+-- @param openmw.core#GameObject actor
+-- @return #SkillStat
+
+---
+-- Alchemy (returns @{#SkillStat})
+-- @function [parent=#SkillStats] alchemy
+-- @param openmw.core#GameObject actor
+-- @return #SkillStat
+
+---
+-- Unarmored (returns @{#SkillStat})
+-- @function [parent=#SkillStats] unarmored
+-- @param openmw.core#GameObject actor
+-- @return #SkillStat
+
+---
+-- Security (returns @{#SkillStat})
+-- @function [parent=#SkillStats] security
+-- @param openmw.core#GameObject actor
+-- @return #SkillStat
+
+---
+-- Sneak (returns @{#SkillStat})
+-- @function [parent=#SkillStats] sneak
+-- @param openmw.core#GameObject actor
+-- @return #SkillStat
+
+---
+-- Acrobatics (returns @{#SkillStat})
+-- @function [parent=#SkillStats] acrobatics
+-- @param openmw.core#GameObject actor
+-- @return #SkillStat
+
+---
+-- Light Armor (returns @{#SkillStat})
+-- @function [parent=#SkillStats] lightarmor
+-- @param openmw.core#GameObject actor
+-- @return #SkillStat
+
+---
+-- Short Blade (returns @{#SkillStat})
+-- @function [parent=#SkillStats] shortblade
+-- @param openmw.core#GameObject actor
+-- @return #SkillStat
+
+---
+-- Marksman (returns @{#SkillStat})
+-- @function [parent=#SkillStats] marksman
+-- @param openmw.core#GameObject actor
+-- @return #SkillStat
+
+---
+-- Mercantile (returns @{#SkillStat})
+-- @function [parent=#SkillStats] mercantile
+-- @param openmw.core#GameObject actor
+-- @return #SkillStat
+
+---
+-- Speechcraft (returns @{#SkillStat})
+-- @function [parent=#SkillStats] speechcraft
+-- @param openmw.core#GameObject actor
+-- @return #SkillStat
+
+---
+-- Hand To Hand (returns @{#SkillStat})
+-- @function [parent=#SkillStats] handtohand
+-- @param openmw.core#GameObject actor
+-- @return #SkillStat
+
+---
+-- @type ActorStats
+-- @field #DynamicStats dynamic
+-- @field #AttributeStats attributes
+
+---
+-- Level (returns @{#LevelStat})
+-- @function [parent=#ActorStats] level
+-- @param openmw.core#GameObject actor
+-- @return #LevelStat
+
+--- The actor's stats.
+-- @field [parent=#Actor] #ActorStats stats
+
+---
+-- @type NpcStats
+-- @extends ActorStats
+-- @field #SkillStats skills
 
 
 --- @{#Item} functions (all pickable items that can be placed to an inventory or container)
@@ -167,6 +448,7 @@
 -- @type NPC
 -- @extends #Actor
 -- @field #Actor baseType @{#Actor}
+-- @field [parent=#NPC] #NpcStats stats
 
 ---
 -- Whether the object is an NPC or a Player.

From 6869fa18e4da0b058502900bea1e38cbc605fa3e Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Sat, 26 Mar 2022 15:16:22 +0000
Subject: [PATCH 2224/2859] Fix unsafe memory access at object.cpp

---
 CHANGELOG.md                     | 1 +
 apps/openmw/mwrender/objects.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5ad085e9b..67245dc1ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -107,6 +107,7 @@
     Bug #6606: Quests with multiple IDs cannot always be restarted
     Bug #6655: Constant effect absorb attribute causes the game to break
     Bug #6670: Dialogue order is incorrect
+    Bug #6680: object.cpp handles nodetree unsafely, memory access with dangling pointer
     Feature #890: OpenMW-CS: Column filtering
     Feature #1465: "Reset" argument for AI functions
     Feature #2491: Ability to make OpenMW "portable"
diff --git a/apps/openmw/mwrender/objects.cpp b/apps/openmw/mwrender/objects.cpp
index e208d7191e..7e3433bd92 100644
--- a/apps/openmw/mwrender/objects.cpp
+++ b/apps/openmw/mwrender/objects.cpp
@@ -164,7 +164,7 @@ void Objects::removeCell(const MWWorld::CellStore* store)
 
 void Objects::updatePtr(const MWWorld::Ptr &old, const MWWorld::Ptr &cur)
 {
-    osg::Node* objectNode = cur.getRefData().getBaseNode();
+    osg::ref_ptr<osg::Node> objectNode = cur.getRefData().getBaseNode();
     if (!objectNode)
         return;
 

From 7695f03c4c825eba5ff7f96f18931601e135ff88 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 27 Mar 2022 17:20:22 +0200
Subject: [PATCH 2225/2859] Remove unused variable

---
 apps/openmw/mwmechanics/creaturestats.cpp | 22 ----------------------
 apps/openmw/mwmechanics/creaturestats.hpp |  4 ----
 2 files changed, 26 deletions(-)

diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index a53caf1451..2cb66e78d5 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -597,28 +597,6 @@ namespace MWMechanics
         mAiSequence.readState(state.mAiSequence);
         mMagicEffects.readState(state.mMagicEffects);
 
-        // Rebuild the bound item cache
-        for(int effectId = ESM::MagicEffect::BoundDagger; effectId <= ESM::MagicEffect::BoundGloves; effectId++)
-        {
-            if(mMagicEffects.get(effectId).getMagnitude() > 0)
-                mBoundItems.insert(effectId);
-            else
-            {
-                // Check active spell effects
-                // We can't use mActiveSpells::getMagicEffects here because it doesn't include expired effects
-                auto spell = std::find_if(mActiveSpells.begin(), mActiveSpells.end(), [&] (const auto& spell)
-                {
-                    const auto& effects = spell.getEffects();
-                    return std::find_if(effects.begin(), effects.end(), [&] (const auto& effect)
-                    {
-                        return effect.mEffectId == effectId;
-                    }) != effects.end();
-                });
-                if(spell != mActiveSpells.end())
-                    mBoundItems.insert(effectId);
-            }
-        }
-
         mSummonedCreatures = state.mSummonedCreatures;
         mSummonGraveyard = state.mSummonGraveyard;
 
diff --git a/apps/openmw/mwmechanics/creaturestats.hpp b/apps/openmw/mwmechanics/creaturestats.hpp
index 2bcb452292..46f3410912 100644
--- a/apps/openmw/mwmechanics/creaturestats.hpp
+++ b/apps/openmw/mwmechanics/creaturestats.hpp
@@ -261,10 +261,6 @@ namespace MWMechanics
         void setHitAttemptActorId(const int actorId);
         int getHitAttemptActorId() const;
 
-        // Note, this is just a cache to avoid checking the whole container store every frame. We don't need to store it in saves.
-        // TODO: Put it somewhere else?
-        std::set<int> mBoundItems;
-
         void writeState (ESM::CreatureStats& state) const;
 
         void readState (const ESM::CreatureStats& state);

From c1d700f770b5cdffebd004e25f77a02b7afdf45a Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 28 Mar 2022 11:40:46 +0000
Subject: [PATCH 2226/2859] Don't reset last hit object if the ID doesn't match

---
 CHANGELOG.md                              | 1 +
 apps/openmw/mwmechanics/creaturestats.cpp | 5 +++++
 apps/openmw/mwmechanics/creaturestats.hpp | 1 +
 apps/openmw/mwscript/miscextensions.cpp   | 7 ++++---
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 67245dc1ff..2c665740ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -108,6 +108,7 @@
     Bug #6655: Constant effect absorb attribute causes the game to break
     Bug #6670: Dialogue order is incorrect
     Bug #6680: object.cpp handles nodetree unsafely, memory access with dangling pointer
+    Bug #6682: HitOnMe doesn't fire as intended
     Feature #890: OpenMW-CS: Column filtering
     Feature #1465: "Reset" argument for AI functions
     Feature #2491: Ability to make OpenMW "portable"
diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index a53caf1451..90817b1e2d 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -347,6 +347,11 @@ namespace MWMechanics
         mLastHitObject = objectid;
     }
 
+    void CreatureStats::clearLastHitObject()
+    {
+        mLastHitObject.clear();
+    }
+
     const std::string &CreatureStats::getLastHitObject() const
     {
         return mLastHitObject;
diff --git a/apps/openmw/mwmechanics/creaturestats.hpp b/apps/openmw/mwmechanics/creaturestats.hpp
index 2bcb452292..719b2ff65c 100644
--- a/apps/openmw/mwmechanics/creaturestats.hpp
+++ b/apps/openmw/mwmechanics/creaturestats.hpp
@@ -255,6 +255,7 @@ namespace MWMechanics
         bool getStance (Stance flag) const;
 
         void setLastHitObject(const std::string &objectid);
+        void clearLastHitObject();
         const std::string &getLastHitObject() const;
         void setLastHitAttemptObject(const std::string &objectid);
         const std::string &getLastHitAttemptObject() const;
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index 38da34201b..2b557fc9b6 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -977,9 +977,10 @@ namespace MWScript
                     runtime.pop();
 
                     MWMechanics::CreatureStats &stats = ptr.getClass().getCreatureStats(ptr);
-                    runtime.push(::Misc::StringUtils::ciEqual(objectID, stats.getLastHitObject()));
-
-                    stats.setLastHitObject(std::string());
+                    bool hit = ::Misc::StringUtils::ciEqual(objectID, stats.getLastHitObject());
+                    runtime.push(hit);
+                    if(hit)
+                        stats.clearLastHitObject();
                 }
         };
 

From f5b527e4456e45f08c3477b7615cf879cee7dab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Mon, 28 Mar 2022 16:07:20 +0300
Subject: [PATCH 2227/2859] Restructure function isCommanded

---
 apps/openmw/mwmechanics/actors.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index b7b83ed562..73b479dd20 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -56,14 +56,17 @@ bool isConscious(const MWWorld::Ptr& ptr)
 
 bool isCommanded(const MWWorld::Ptr& actor)
 {
-    const auto& stats = actor.getClass().getCreatureStats(actor);
-    for(const auto& params : stats.getActiveSpells())
+    const auto& actorClass = actor.getClass();
+    const auto& stats = actorClass.getCreatureStats(actor);
+    const bool isActorNpc = actorClass.isNpc();
+    const auto level = stats.getLevel();
+    for (const auto& params : stats.getActiveSpells())
     {
-        for(const auto& effect : params.getEffects())
+        for (const auto& effect : params.getEffects())
         {
-            if(((effect.mEffectId == ESM::MagicEffect::CommandHumanoid && actor.getClass().isNpc())
-                || (effect.mEffectId == ESM::MagicEffect::CommandCreature && !actor.getClass().isNpc()))
-                && effect.mMagnitude >= stats.getLevel())
+            if (((effect.mEffectId == ESM::MagicEffect::CommandHumanoid && isActorNpc)
+                || (effect.mEffectId == ESM::MagicEffect::CommandCreature && !isActorNpc))
+                && effect.mMagnitude >= level)
                 return true;
         }
     }

From cba51e5e1cb082ff7e6ac505524f3db1189440a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Mon, 28 Mar 2022 16:13:40 +0300
Subject: [PATCH 2228/2859] Restructure function updateHeadTracking

---
 apps/openmw/mwmechanics/actors.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 73b479dd20..95a40c0554 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -249,7 +249,8 @@ namespace MWMechanics
                                     MWWorld::Ptr& headTrackTarget, float& sqrHeadTrackDistance,
                                     bool inCombatOrPursue)
     {
-        if (!actor.getRefData().getBaseNode())
+        const auto& actorRefData = actor.getRefData();
+        if (!actorRefData.getBaseNode())
             return;
 
         if (targetActor.getClass().getCreatureStats(targetActor).isDead())
@@ -264,7 +265,7 @@ namespace MWMechanics
         if (!currentCell->isExterior() && !(currentCell->mData.mFlags & ESM::Cell::QuasiEx))
             maxDistance *= fInteriorHeadTrackMult;
 
-        const osg::Vec3f actor1Pos(actor.getRefData().getPosition().asVec3());
+        const osg::Vec3f actor1Pos(actorRefData.getPosition().asVec3());
         const osg::Vec3f actor2Pos(targetActor.getRefData().getPosition().asVec3());
         float sqrDist = (actor1Pos - actor2Pos).length2();
 
@@ -272,7 +273,7 @@ namespace MWMechanics
             return;
 
         // stop tracking when target is behind the actor
-        osg::Vec3f actorDirection = actor.getRefData().getBaseNode()->getAttitude() * osg::Vec3f(0,1,0);
+        osg::Vec3f actorDirection = actorRefData.getBaseNode()->getAttitude() * osg::Vec3f(0,1,0);
         osg::Vec3f targetDirection(actor2Pos - actor1Pos);
         actorDirection.z() = 0;
         targetDirection.z() = 0;

From 23615e653a8733103930d8e512be07a163c0a9a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Mon, 28 Mar 2022 16:17:42 +0300
Subject: [PATCH 2229/2859] Mark getActivePackage const

---
 apps/openmw/mwmechanics/aisequence.cpp | 2 +-
 apps/openmw/mwmechanics/aisequence.hpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index c59b3e39fe..f138d8dc97 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -430,7 +430,7 @@ bool MWMechanics::AiSequence::isEmpty() const
     return mPackages.empty();
 }
 
-const AiPackage& MWMechanics::AiSequence::getActivePackage()
+const AiPackage& MWMechanics::AiSequence::getActivePackage() const
 {
     if(mPackages.empty())
         throw std::runtime_error(std::string("No AI Package!"));
diff --git a/apps/openmw/mwmechanics/aisequence.hpp b/apps/openmw/mwmechanics/aisequence.hpp
index 0d23207b63..5c6a43b9b8 100644
--- a/apps/openmw/mwmechanics/aisequence.hpp
+++ b/apps/openmw/mwmechanics/aisequence.hpp
@@ -163,7 +163,7 @@ namespace MWMechanics
 
             /// Return the current active package.
             /** If there is no active package, it will throw an exception **/
-            const AiPackage& getActivePackage();
+            const AiPackage& getActivePackage() const;
 
             /// Fills the AiSequence with packages
             /** Typically used for loading from the ESM

From 5e44dd41ebad06e19ea45f18bae9b3d56b6054a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Mon, 28 Mar 2022 16:20:24 +0300
Subject: [PATCH 2230/2859] Restructure function updateMovementSpeed

---
 apps/openmw/mwmechanics/actors.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 95a40c0554..418ed577fa 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -318,8 +318,9 @@ namespace MWMechanics
         if (mSmoothMovement)
             return;
 
-        CreatureStats &stats = actor.getClass().getCreatureStats(actor);
-        MWMechanics::AiSequence& seq = stats.getAiSequence();
+        const auto& actorClass = actor.getClass();
+        const CreatureStats &stats = actorClass.getCreatureStats(actor);
+        const MWMechanics::AiSequence& seq = stats.getAiSequence();
 
         if (!seq.isEmpty() && seq.getActivePackage().useVariableSpeed())
         {
@@ -330,7 +331,7 @@ namespace MWMechanics
             if (distance < DECELERATE_DISTANCE)
             {
                 float speedCoef = std::max(0.7f, 0.2f + 0.8f * distance / DECELERATE_DISTANCE);
-                auto& movement = actor.getClass().getMovementSettings(actor);
+                auto& movement = actorClass.getMovementSettings(actor);
                 movement.mPosition[0] *= speedCoef;
                 movement.mPosition[1] *= speedCoef;
             }

From 8631b96680adbd230c2166a005167cded8b8e65e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Mon, 28 Mar 2022 16:25:33 +0300
Subject: [PATCH 2231/2859] Restructure function updateGreetingState

---
 apps/openmw/mwmechanics/actors.cpp | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 418ed577fa..6ae9c9d87e 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -340,11 +340,12 @@ namespace MWMechanics
 
     void Actors::updateGreetingState(const MWWorld::Ptr& actor, Actor& actorState, bool turnOnly)
     {
-        if (!actor.getClass().isActor() || actor == getPlayer())
+        const auto& actorClass = actor.getClass();
+        if (!actorClass.isActor() || actor == getPlayer())
             return;
 
-        CreatureStats &stats = actor.getClass().getCreatureStats(actor);
-        const MWMechanics::AiSequence& seq = stats.getAiSequence();
+        const CreatureStats& actorStats = actorClass.getCreatureStats(actor);
+        const MWMechanics::AiSequence& seq = actorStats.getAiSequence();
         const auto packageId = seq.getTypeId();
 
         if (seq.isInCombat() ||
@@ -371,7 +372,7 @@ namespace MWMechanics
             {
                 actorState.setTurningToPlayer(false);
                 // An original engine launches an endless idle2 when an actor greets player.
-                playAnimationGroup (actor, "idle2", 0, std::numeric_limits<int>::max(), false);
+                playAnimationGroup(actor, "idle2", 0, std::numeric_limits<int>::max(), false);
             }
         }
 
@@ -382,14 +383,15 @@ namespace MWMechanics
         static int iGreetDistanceMultiplier = MWBase::Environment::get().getWorld()->getStore()
             .get<ESM::GameSetting>().find("iGreetDistanceMultiplier")->mValue.getInteger();
 
-        float helloDistance = static_cast<float>(stats.getAiSetting(CreatureStats::AI_Hello).getModified() * iGreetDistanceMultiplier);
+        float helloDistance = static_cast<float>(actorStats.getAiSetting(CreatureStats::AI_Hello).getModified() * iGreetDistanceMultiplier);
+        const auto& playerStats = player.getClass().getCreatureStats(player);
 
         int greetingTimer = actorState.getGreetingTimer();
         GreetingState greetingState = actorState.getGreetingState();
         if (greetingState == Greet_None)
         {
-            if ((playerPos - actorPos).length2() <= helloDistance*helloDistance &&
-                !player.getClass().getCreatureStats(player).isDead() && !actor.getClass().getCreatureStats(actor).isParalyzed()
+            if ((playerPos - actorPos).length2() <= helloDistance * helloDistance &&
+                !playerStats.isDead() && !actorStats.isParalyzed()
                 && MWBase::Environment::get().getWorld()->getLOS(player, actor)
                 && MWBase::Environment::get().getMechanicsManager()->awarenessCheck(player, actor))
                 greetingTimer++;
@@ -406,7 +408,7 @@ namespace MWMechanics
         {
             greetingTimer++;
 
-            if (!stats.getMovementFlag(CreatureStats::Flag_ForceJump) && !stats.getMovementFlag(CreatureStats::Flag_ForceSneak)
+            if (!actorStats.getMovementFlag(CreatureStats::Flag_ForceJump) && !actorStats.getMovementFlag(CreatureStats::Flag_ForceSneak)
                 && (greetingTimer <= GREETING_SHOULD_END || MWBase::Environment::get().getSoundManager()->sayActive(actor)))
                 turnActorToFacePlayer(actor, actorState, dir);
 
@@ -420,7 +422,7 @@ namespace MWMechanics
         if (greetingState == Greet_Done)
         {
             float resetDist = 2 * helloDistance;
-            if ((playerPos - actorPos).length2() >= resetDist*resetDist)
+            if ((playerPos - actorPos).length2() >= resetDist * resetDist)
                 greetingState = Greet_None;
         }
 

From 0b306bc1eaa75b8cef44d8314f87ce83e3b607a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Mon, 28 Mar 2022 16:32:56 +0300
Subject: [PATCH 2232/2859] Restructure function engageCombat

---
 apps/openmw/mwmechanics/actors.cpp | 41 ++++++++++++++++--------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 6ae9c9d87e..10c69c947a 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -432,8 +432,9 @@ namespace MWMechanics
 
     void Actors::turnActorToFacePlayer(const MWWorld::Ptr& actor, Actor& actorState, const osg::Vec3f& dir)
     {
-        actor.getClass().getMovementSettings(actor).mPosition[1] = 0;
-        actor.getClass().getMovementSettings(actor).mPosition[0] = 0;
+        auto& movementSettings = actor.getClass().getMovementSettings();
+        movementSettings.mPosition[1] = 0;
+        movementSettings.mPosition[0] = 0;
 
         if (!actorState.isTurningToPlayer())
         {
@@ -464,7 +465,7 @@ namespace MWMechanics
         }
     }
 
-    void Actors::engageCombat (const MWWorld::Ptr& actor1, const MWWorld::Ptr& actor2, std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr> >& cachedAllies, bool againstPlayer)
+    void Actors::engageCombat(const MWWorld::Ptr& actor1, const MWWorld::Ptr& actor2, std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr> >& cachedAllies, bool againstPlayer)
     {
         // No combat for totally static creatures
         if (!actor1.getClass().isMobile(actor1))
@@ -480,9 +481,9 @@ namespace MWMechanics
 
         const osg::Vec3f actor1Pos(actor1.getRefData().getPosition().asVec3());
         const osg::Vec3f actor2Pos(actor2.getRefData().getPosition().asVec3());
-        float sqrDist = (actor1Pos - actor2Pos).length2();
+        const float sqrDist = (actor1Pos - actor2Pos).length2();
 
-        if (sqrDist > mActorsProcessingRange*mActorsProcessingRange)
+        if (sqrDist > mActorsProcessingRange * mActorsProcessingRange)
             return;
 
         // If this is set to true, actor1 will start combat with actor2 if the awareness check at the end of the method returns true
@@ -494,15 +495,16 @@ namespace MWMechanics
 
         getActorsSidingWith(actor1, allies1, cachedAllies);
 
+        auto* mechanicsManager = MWBase::Environment::get().getMechanicsManager();
         // If an ally of actor1 has been attacked by actor2 or has attacked actor2, start combat between actor1 and actor2
-        for (const MWWorld::Ptr &ally : allies1)
+        for (const MWWorld::Ptr& ally : allies1)
         {
             if (creatureStats1.getAiSequence().isInCombat(ally))
                 continue;
 
             if (creatureStats2.matchesActorId(ally.getClass().getCreatureStats(ally).getHitAttemptActorId()))
             {
-                MWBase::Environment::get().getMechanicsManager()->startCombat(actor1, actor2);
+                mechanicsManager->startCombat(actor1, actor2);
                 // Also set the same hit attempt actor. Otherwise, if fighting the player, they may stop combat
                 // if the player gets out of reach, while the ally would continue combat with the player
                 creatureStats1.setHitAttemptActorId(ally.getClass().getCreatureStats(ally).getHitAttemptActorId());
@@ -524,21 +526,21 @@ namespace MWMechanics
         if (!aggressive && !isPlayerFollowerOrEscorter)
         {
             // Check that actor2 is in combat with actor1
-            if (actor2.getClass().getCreatureStats(actor2).getAiSequence().isInCombat(actor1))
+            if (creatureStats2.getAiSequence().isInCombat(actor1))
             {
                 std::set<MWWorld::Ptr> allies2;
 
                 getActorsSidingWith(actor2, allies2, cachedAllies);
 
                 // Check that an ally of actor2 is also in combat with actor1
-                for (const MWWorld::Ptr &ally2 : allies2)
+                for (const MWWorld::Ptr& ally2 : allies2)
                 {
                     if (ally2.getClass().getCreatureStats(ally2).getAiSequence().isInCombat(actor1))
                     {
-                        MWBase::Environment::get().getMechanicsManager()->startCombat(actor1, actor2);
+                        mechanicsManager->startCombat(actor1, actor2);
                         // Also have actor1's allies start combat
                         for (const MWWorld::Ptr& ally1 : allies1)
-                            MWBase::Environment::get().getMechanicsManager()->startCombat(ally1, actor2);
+                            mechanicsManager->startCombat(ally1, actor2);
                         return;
                     }
                 }
@@ -553,13 +555,13 @@ namespace MWMechanics
         static const bool followersAttackOnSight = Settings::Manager::getBool("followers attack on sight", "Game");
         if (!aggressive && isPlayerFollowerOrEscorter && followersAttackOnSight)
         {
-            if (actor2.getClass().getCreatureStats(actor2).getAiSequence().isInCombat(actor1))
+            if (creatureStats2.getAiSequence().isInCombat(actor1))
                 aggressive = true;
             else
             {
-                for (const MWWorld::Ptr &ally : allies1)
+                for (const MWWorld::Ptr& ally : allies1)
                 {
-                    if (actor2.getClass().getCreatureStats(actor2).getAiSequence().isInCombat(ally))
+                    if (creatureStats2.getAiSequence().isInCombat(ally))
                     {
                         aggressive = true;
                         break;
@@ -576,15 +578,16 @@ namespace MWMechanics
                 // Player followers and escorters with high fight should not initiate combat with the player or with
                 // other player followers or escorters
                 if (!isPlayerFollowerOrEscorter)
-                    aggressive = MWBase::Environment::get().getMechanicsManager()->isAggressive(actor1, actor2);
+                    aggressive = mechanicsManager->isAggressive(actor1, actor2);
             }
         }
 
         // Make guards go aggressive with creatures that are in combat, unless the creature is a follower or escorter
+        auto* world = MWBase::Environment::get().getWorld();
         if (!aggressive && actor1.getClass().isClass(actor1, "Guard") && !actor2.getClass().isNpc() && creatureStats2.getAiSequence().isInCombat())
         {
             // Check if the creature is too far
-            static const float fAlarmRadius = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fAlarmRadius")->mValue.getFloat();
+            static const float fAlarmRadius = world->getStore().get<ESM::GameSetting>().find("fAlarmRadius")->mValue.getFloat();
             if (sqrDist > fAlarmRadius * fAlarmRadius)
                 return;
 
@@ -607,11 +610,11 @@ namespace MWMechanics
         // If any of the above conditions turned actor1 aggressive towards actor2, do an awareness check. If it passes, start combat with actor2.
         if (aggressive)
         {
-            bool LOS = MWBase::Environment::get().getWorld()->getLOS(actor1, actor2)
-                    && MWBase::Environment::get().getMechanicsManager()->awarenessCheck(actor2, actor1);
+            bool LOS = world->getLOS(actor1, actor2) &&
+                mechanicsManager->awarenessCheck(actor2, actor1);
 
             if (LOS)
-                MWBase::Environment::get().getMechanicsManager()->startCombat(actor1, actor2);
+                mechanicsManager->startCombat(actor1, actor2);
         }
     }
 

From 127366a948487e588d79367fb15bf0cf3e8bcbef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Mon, 28 Mar 2022 16:38:39 +0300
Subject: [PATCH 2233/2859] Restructure function updateDrowning

---
 apps/openmw/mwmechanics/actors.cpp | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 10c69c947a..ee3f0fe3e3 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -801,7 +801,8 @@ namespace MWMechanics
 
     void Actors::updateDrowning(const MWWorld::Ptr& ptr, float duration, bool isKnockedOut, bool isPlayer)
     {
-        NpcStats &stats = ptr.getClass().getNpcStats(ptr);
+        auto& actorClass = ptr.getClass();
+        NpcStats& stats = actorClass.getNpcStats(ptr);
 
         // When npc stats are just initialized, mTimeToStartDrowning == -1 and we should get value from GMST
         static const float fHoldBreathTime = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fHoldBreathTime")->mValue.getFloat();
@@ -810,43 +811,43 @@ namespace MWMechanics
 
         if (!isPlayer && stats.getTimeToStartDrowning() < fHoldBreathTime / 2)
         {
-            AiSequence& seq = ptr.getClass().getCreatureStats(ptr).getAiSequence();
+            AiSequence& seq = actorClass.getCreatureStats(ptr).getAiSequence();
             if (seq.getTypeId() != AiPackageTypeId::Breathe) //Only add it once
                 seq.stack(AiBreathe(), ptr);
         }
 
-        MWBase::World *world = MWBase::Environment::get().getWorld();
+        MWBase::World* world = MWBase::Environment::get().getWorld();
         bool knockedOutUnderwater = (isKnockedOut && world->isUnderwater(ptr.getCell(), osg::Vec3f(ptr.getRefData().getPosition().asVec3())));
-        if((world->isSubmerged(ptr) || knockedOutUnderwater)
-           && stats.getMagicEffects().get(ESM::MagicEffect::WaterBreathing).getMagnitude() == 0)
+        if ((world->isSubmerged(ptr) || knockedOutUnderwater)
+            && stats.getMagicEffects().get(ESM::MagicEffect::WaterBreathing).getMagnitude() == 0)
         {
             float timeLeft = 0.0f;
-            if(knockedOutUnderwater)
+            if (knockedOutUnderwater)
                 stats.setTimeToStartDrowning(0);
             else
             {
                 timeLeft = stats.getTimeToStartDrowning() - duration;
-                if(timeLeft < 0.0f)
+                if (timeLeft < 0.0f)
                     timeLeft = 0.0f;
                 stats.setTimeToStartDrowning(timeLeft);
             }
 
-            bool godmode = isPlayer && MWBase::Environment::get().getWorld()->getGodModeState();
+            bool godmode = isPlayer && world->getGodModeState();
 
-            if(timeLeft == 0.0f && !godmode)
+            if (timeLeft == 0.0f && !godmode)
             {
                 // If drowning, apply 3 points of damage per second
                 static const float fSuffocationDamage = world->getStore().get<ESM::GameSetting>().find("fSuffocationDamage")->mValue.getFloat();
                 DynamicStat<float> health = stats.getHealth();
-                health.setCurrent(health.getCurrent() - fSuffocationDamage*duration);
+                health.setCurrent(health.getCurrent() - fSuffocationDamage * duration);
                 stats.setHealth(health);
 
                 // Play a drowning sound
-                MWBase::SoundManager *sndmgr = MWBase::Environment::get().getSoundManager();
-                if(!sndmgr->getSoundPlaying(ptr, "drown"))
+                MWBase::SoundManager* sndmgr = MWBase::Environment::get().getSoundManager();
+                if (!sndmgr->getSoundPlaying(ptr, "drown"))
                     sndmgr->playSound3D(ptr, "drown", 1.0f, 1.0f);
 
-                if(isPlayer)
+                if (isPlayer)
                     MWBase::Environment::get().getWindowManager()->activateHitOverlay(false);
             }
         }

From 9821982944d3de8c08482e40175db46861d2e322 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Mon, 28 Mar 2022 16:48:16 +0300
Subject: [PATCH 2234/2859] Restructure function updateEquippedLight

---
 apps/openmw/mwmechanics/actors.cpp | 41 ++++++++++++++----------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index ee3f0fe3e3..79ef8f56d4 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -432,7 +432,7 @@ namespace MWMechanics
 
     void Actors::turnActorToFacePlayer(const MWWorld::Ptr& actor, Actor& actorState, const osg::Vec3f& dir)
     {
-        auto& movementSettings = actor.getClass().getMovementSettings();
+        auto& movementSettings = actor.getClass().getMovementSettings(actor);
         movementSettings.mPosition[1] = 0;
         movementSettings.mPosition[0] = 0;
 
@@ -855,34 +855,30 @@ namespace MWMechanics
             stats.setTimeToStartDrowning(fHoldBreathTime);
     }
 
-    void Actors::updateEquippedLight (const MWWorld::Ptr& ptr, float duration, bool mayEquip)
+    void Actors::updateEquippedLight(const MWWorld::Ptr& ptr, float duration, bool mayEquip)
     {
-        bool isPlayer = (ptr == getPlayer());
+        const bool isPlayer = (ptr == getPlayer());
+
+        auto& actorClass = ptr.getClass();
+        auto& inventoryStore = actorClass.getInventoryStore(ptr);
+
+        auto heldIter = inventoryStore.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
 
-        MWWorld::InventoryStore &inventoryStore = ptr.getClass().getInventoryStore(ptr);
-        MWWorld::ContainerStoreIterator heldIter =
-                inventoryStore.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
         /**
          * Automatically equip NPCs torches at night and unequip them at day
          */
         if (!isPlayer)
         {
-            MWWorld::ContainerStoreIterator torch = inventoryStore.end();
-            for (MWWorld::ContainerStoreIterator it = inventoryStore.begin(); it != inventoryStore.end(); ++it)
-            {
-                if (it->getType() == ESM::Light::sRecordId &&
-                    it->getClass().canBeEquipped(*it, ptr).first)
+            auto torchIter = std::find_if(std::begin(inventoryStore), std::end(inventoryStore), [&](auto entry)
                 {
-                    torch = it;
-                    break;
-                }
-            }
-
+                    return entry.getType() == ESM::Light::sRecordId &&
+                        entry.getClass().canBeEquipped(entry, ptr).first;
+                });
             if (mayEquip)
             {
-                if (torch != inventoryStore.end())
+                if (torchIter != inventoryStore.end())
                 {
-                    if (!ptr.getClass().getCreatureStats (ptr).getAiSequence().isInCombat())
+                    if (!actorClass.getCreatureStats(ptr).getAiSequence().isInCombat())
                     {
                         // For non-hostile NPCs, unequip whatever is in the left slot in favor of a light.
                         if (heldIter != inventoryStore.end() && heldIter->getType() != ESM::Light::sRecordId)
@@ -892,7 +888,7 @@ namespace MWMechanics
                     {
                         // For hostile NPCs, see if they have anything better to equip first
                         auto shield = inventoryStore.getPreferredShield(ptr);
-                        if(shield != inventoryStore.end())
+                        if (shield != inventoryStore.end())
                             inventoryStore.equip(MWWorld::InventoryStore::Slot_CarriedLeft, shield, ptr);
                     }
 
@@ -901,7 +897,7 @@ namespace MWMechanics
                     // If we have a torch and can equip it, then equip it now.
                     if (heldIter == inventoryStore.end())
                     {
-                        inventoryStore.equip(MWWorld::InventoryStore::Slot_CarriedLeft, torch, ptr);
+                        inventoryStore.equip(MWWorld::InventoryStore::Slot_CarriedLeft, torchIter, ptr);
                     }
                 }
             }
@@ -921,11 +917,12 @@ namespace MWMechanics
         //If holding a light...
         if(heldIter.getType() == MWWorld::ContainerStore::Type_Light)
         {
+            auto* world = MWBase::Environment::get().getWorld();
             // Use time from the player's light
             if(isPlayer)
             {
                 // But avoid using it up if the light source is hidden
-                MWRender::Animation *anim = MWBase::Environment::get().getWorld()->getAnimation(ptr);
+                MWRender::Animation *anim = world->getAnimation(ptr);
                 if (anim && anim->getCarriedLeftShown())
                 {
                     float timeRemaining = heldIter->getClass().getRemainingUsageTime(*heldIter);
@@ -946,7 +943,7 @@ namespace MWMechanics
             }
 
             // Both NPC and player lights extinguish in water.
-            if(MWBase::Environment::get().getWorld()->isSwimming(ptr))
+            if(world->isSwimming(ptr))
             {
                 inventoryStore.remove(*heldIter, 1, ptr); // remove it
 

From 33706923a3f2ac6a0413750040c2ec908f120bef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Mon, 28 Mar 2022 17:25:22 +0300
Subject: [PATCH 2235/2859] Restructure function updateCrimePursuit

---
 apps/openmw/mwmechanics/actors.cpp | 99 ++++++++++++++++--------------
 1 file changed, 54 insertions(+), 45 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 79ef8f56d4..a024507cf3 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -958,59 +958,68 @@ namespace MWMechanics
     void Actors::updateCrimePursuit(const MWWorld::Ptr& ptr, float duration)
     {
         MWWorld::Ptr player = getPlayer();
-        if (ptr != player && ptr.getClass().isNpc())
-        {
-            // get stats of witness
-            CreatureStats& creatureStats = ptr.getClass().getCreatureStats(ptr);
-            NpcStats& npcStats = ptr.getClass().getNpcStats(ptr);
+        if (ptr == player)
+            return;
 
-            if (player.getClass().getNpcStats(player).isWerewolf())
-                return;
+        auto& actorClass = ptr.getClass();
+        if (!actorClass.isNpc())
+            return;
 
-            if (ptr.getClass().isClass(ptr, "Guard") && creatureStats.getAiSequence().getTypeId() != AiPackageTypeId::Pursue && !creatureStats.getAiSequence().isInCombat()
-                && creatureStats.getMagicEffects().get(ESM::MagicEffect::CalmHumanoid).getMagnitude() == 0)
+        // get stats of witness
+        CreatureStats& creatureStats = ptr.getClass().getCreatureStats(ptr);
+        NpcStats& npcStats = ptr.getClass().getNpcStats(ptr);
+
+        const auto& playerClass = player.getClass();
+        const auto& playerStats = playerClass.getNpcStats(player);
+        if (playerStats.isWerewolf())
+            return;
+
+        auto* mechanicsManager = MWBase::Environment::get().getMechanicsManager();
+        auto* world = MWBase::Environment::get().getWorld();
+
+        if (actorClass.isClass(ptr, "Guard") && creatureStats.getAiSequence().isInPursuit() && !creatureStats.getAiSequence().isInCombat()
+            && creatureStats.getMagicEffects().get(ESM::MagicEffect::CalmHumanoid).getMagnitude() == 0)
+        {
+            const MWWorld::ESMStore& esmStore = world->getStore();
+            static const int cutoff = esmStore.get<ESM::GameSetting>().find("iCrimeThreshold")->mValue.getInteger();
+            // Force dialogue on sight if bounty is greater than the cutoff
+            // In vanilla morrowind, the greeting dialogue is scripted to either arrest the player (< 5000 bounty) or attack (>= 5000 bounty)
+            if (playerStats.getBounty() >= cutoff
+                // TODO: do not run these two every frame. keep an Aware state for each actor and update it every 0.2 s or so?
+                && world->getLOS(ptr, player)
+                && mechanicsManager->awarenessCheck(player, ptr))
             {
-                const MWWorld::ESMStore& esmStore = MWBase::Environment::get().getWorld()->getStore();
-                static const int cutoff = esmStore.get<ESM::GameSetting>().find("iCrimeThreshold")->mValue.getInteger();
-                // Force dialogue on sight if bounty is greater than the cutoff
-                // In vanilla morrowind, the greeting dialogue is scripted to either arrest the player (< 5000 bounty) or attack (>= 5000 bounty)
-                if (   player.getClass().getNpcStats(player).getBounty() >= cutoff
-                       // TODO: do not run these two every frame. keep an Aware state for each actor and update it every 0.2 s or so?
-                    && MWBase::Environment::get().getWorld()->getLOS(ptr, player)
-                    && MWBase::Environment::get().getMechanicsManager()->awarenessCheck(player, ptr))
+                static const int iCrimeThresholdMultiplier = esmStore.get<ESM::GameSetting>().find("iCrimeThresholdMultiplier")->mValue.getInteger();
+                if (playerStats.getBounty() >= cutoff * iCrimeThresholdMultiplier)
                 {
-                    static const int iCrimeThresholdMultiplier = esmStore.get<ESM::GameSetting>().find("iCrimeThresholdMultiplier")->mValue.getInteger();
-                    if (player.getClass().getNpcStats(player).getBounty() >= cutoff * iCrimeThresholdMultiplier)
-                    {
-                        MWBase::Environment::get().getMechanicsManager()->startCombat(ptr, player);
-                        creatureStats.setHitAttemptActorId(player.getClass().getCreatureStats(player).getActorId()); // Stops the guard from quitting combat if player is unreachable
-                    }
-                    else
-                        creatureStats.getAiSequence().stack(AiPursue(player), ptr);
-                    creatureStats.setAlarmed(true);
-                    npcStats.setCrimeId(MWBase::Environment::get().getWorld()->getPlayer().getNewCrimeId());
+                    mechanicsManager->startCombat(ptr, player);
+                    creatureStats.setHitAttemptActorId(playerClass.getCreatureStats(player).getActorId()); // Stops the guard from quitting combat if player is unreachable
                 }
+                else
+                    creatureStats.getAiSequence().stack(AiPursue(player), ptr);
+                creatureStats.setAlarmed(true);
+                npcStats.setCrimeId(world->getPlayer().getNewCrimeId());
             }
+        }
 
-            // if I was a witness to a crime
-            if (npcStats.getCrimeId() != -1)
+        // if I was a witness to a crime
+        if (npcStats.getCrimeId() != -1)
+        {
+            // if you've paid for your crimes and I havent noticed
+            if (npcStats.getCrimeId() <= world->getPlayer().getCrimeId())
             {
-                // if you've paid for your crimes and I havent noticed
-                if( npcStats.getCrimeId() <= MWBase::Environment::get().getWorld()->getPlayer().getCrimeId() )
-                {
-                    // Calm witness down
-                    if (ptr.getClass().isClass(ptr, "Guard"))
-                        creatureStats.getAiSequence().stopPursuit();
-                    stopCombat(ptr);
-
-                    // Reset factors to attack
-                    creatureStats.setAttacked(false);
-                    creatureStats.setAlarmed(false);
-                    creatureStats.setAiSetting(CreatureStats::AI_Fight, ptr.getClass().getBaseFightRating(ptr));
-
-                    // Update witness crime id
-                    npcStats.setCrimeId(-1);
-                }
+                // Calm witness down
+                if (ptr.getClass().isClass(ptr, "Guard"))
+                    creatureStats.getAiSequence().stopPursuit();
+                stopCombat(ptr);
+
+                // Reset factors to attack
+                creatureStats.setAttacked(false);
+                creatureStats.setAlarmed(false);
+                creatureStats.setAiSetting(CreatureStats::AI_Fight, ptr.getClass().getBaseFightRating(ptr));
+
+                // Update witness crime id
+                npcStats.setCrimeId(-1);
             }
         }
     }

From c3d02492df890bd134afbc26d1eb59c63394d02f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Tue, 29 Mar 2022 19:49:02 +0300
Subject: [PATCH 2236/2859] Cleanup stopMovement

---
 apps/openmw/mwmechanics/aiwander.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 6cfe1e5fcd..378e5a6351 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -88,8 +88,9 @@ namespace MWMechanics
 
         void stopMovement(const MWWorld::Ptr& actor)
         {
-            actor.getClass().getMovementSettings(actor).mPosition[0] = 0;
-            actor.getClass().getMovementSettings(actor).mPosition[1] = 0;
+            auto& movementSettings = actor.getClass().getMovementSettings(actor);
+            movementSettings.mPosition[0] = 0;
+            movementSettings.mPosition[1] = 0;
         }
 
         std::vector<unsigned char> getInitialIdle(const std::vector<unsigned char>& idle)

From a21c17ab26ea114c365282592d14b5ffcee2b224 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 20 Dec 2021 20:40:04 +0100
Subject: [PATCH 2237/2859] Use crash catcher in launcher

---
 apps/launcher/main.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/apps/launcher/main.cpp b/apps/launcher/main.cpp
index 9c9acb4a17..4e054867f4 100644
--- a/apps/launcher/main.cpp
+++ b/apps/launcher/main.cpp
@@ -4,6 +4,8 @@
 #include <QTextCodec>
 #include <QDir>
 
+#include <components/debug/debugging.hpp>
+
 #ifdef MAC_OS_X_VERSION_MIN_REQUIRED
 #undef MAC_OS_X_VERSION_MIN_REQUIRED
 // We need to do this because of Qt: https://bugreports.qt-project.org/browse/QTBUG-22154
@@ -12,7 +14,7 @@
 
 #include "maindialog.hpp"
 
-int main(int argc, char *argv[])
+int runLauncher(int argc, char *argv[])
 {
     try
     {
@@ -49,3 +51,8 @@ int main(int argc, char *argv[])
         return 0;
     }
 }
+
+int main(int argc, char *argv[])
+{
+    return wrapApplication(runLauncher, argc, argv, "Launcher");
+}

From 2d5ccc804b72ebd86155cab94ff7ac321e66001e Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 19 Dec 2021 22:49:41 +0100
Subject: [PATCH 2238/2859] Exchange binary messages between navmeshtool and
 launcher

---
 apps/launcher/datafilespage.cpp               | 141 +++++++++++++---
 apps/launcher/datafilespage.hpp               |  13 +-
 apps/navmeshtool/main.cpp                     |  18 +-
 apps/navmeshtool/navmesh.cpp                  |  29 +++-
 apps/navmeshtool/navmesh.hpp                  |   2 +-
 apps/navmeshtool/worldspacedata.cpp           |  23 ++-
 apps/navmeshtool/worldspacedata.hpp           |   2 +-
 .../serialization/binaryreader.cpp            |  23 +++
 components/CMakeLists.txt                     |   4 +
 components/debug/debugging.cpp                |  12 ++
 components/debug/debugging.hpp                |   5 +
 components/misc/guarded.hpp                   |  13 +-
 components/navmeshtool/protocol.cpp           | 159 ++++++++++++++++++
 components/navmeshtool/protocol.hpp           |  78 +++++++++
 components/serialization/binaryreader.hpp     |  11 +-
 components/serialization/binarywriter.hpp     |   9 +-
 16 files changed, 494 insertions(+), 48 deletions(-)
 create mode 100644 components/navmeshtool/protocol.cpp
 create mode 100644 components/navmeshtool/protocol.hpp

diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index c1fecf86db..e8b61cb079 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -20,11 +20,73 @@
 #include <components/config/gamesettings.hpp>
 #include <components/config/launchersettings.hpp>
 
-#include "utils/textinputdialog.hpp"
+#include <components/navmeshtool/protocol.hpp>
 
+#include "utils/textinputdialog.hpp"
 
 const char *Launcher::DataFilesPage::mDefaultContentListName = "Default";
 
+namespace Launcher
+{
+    namespace
+    {
+        struct HandleNavMeshToolMessage
+        {
+            int mCellsCount;
+            int mExpectedMaxProgress;
+            int mMaxProgress;
+            int mProgress;
+
+            HandleNavMeshToolMessage operator()(NavMeshTool::ExpectedCells&& message) const
+            {
+                return HandleNavMeshToolMessage {
+                    static_cast<int>(message.mCount),
+                    mExpectedMaxProgress,
+                    static_cast<int>(message.mCount) * 100,
+                    mProgress
+                };
+            }
+
+            HandleNavMeshToolMessage operator()(NavMeshTool::ProcessedCells&& message) const
+            {
+                return HandleNavMeshToolMessage {
+                    mCellsCount,
+                    mExpectedMaxProgress,
+                    mMaxProgress,
+                    std::max(mProgress, static_cast<int>(message.mCount))
+                };
+            }
+
+            HandleNavMeshToolMessage operator()(NavMeshTool::ExpectedTiles&& message) const
+            {
+                const int expectedMaxProgress = mCellsCount + static_cast<int>(message.mCount);
+                return HandleNavMeshToolMessage {
+                    mCellsCount,
+                    expectedMaxProgress,
+                    std::max(mMaxProgress, expectedMaxProgress),
+                    mProgress
+                };
+            }
+
+            HandleNavMeshToolMessage operator()(NavMeshTool::GeneratedTiles&& message) const
+            {
+                int progress = mCellsCount + static_cast<int>(message.mCount);
+                if (mExpectedMaxProgress < mMaxProgress)
+                    progress += static_cast<int>(std::round(
+                        (mMaxProgress - mExpectedMaxProgress)
+                        * (static_cast<float>(progress) / static_cast<float>(mExpectedMaxProgress))
+                    ));
+                return HandleNavMeshToolMessage {
+                    mCellsCount,
+                    mExpectedMaxProgress,
+                    mMaxProgress,
+                    std::max(mProgress, progress)
+                };
+            }
+        };
+    }
+}
+
 Launcher::DataFilesPage::DataFilesPage(Files::ConfigurationManager &cfg, Config::GameSettings &gameSettings,
                                        Config::LauncherSettings &launcherSettings, MainDialog *parent)
     : QWidget(parent)
@@ -95,8 +157,8 @@ void Launcher::DataFilesPage::buildView()
     connect(ui.updateNavMeshButton, SIGNAL(clicked()), this, SLOT(startNavMeshTool()));
     connect(ui.cancelNavMeshButton, SIGNAL(clicked()), this, SLOT(killNavMeshTool()));
 
-    connect(mNavMeshToolInvoker->getProcess(), SIGNAL(readyReadStandardOutput()), this, SLOT(updateNavMeshProgress()));
-    connect(mNavMeshToolInvoker->getProcess(), SIGNAL(readyReadStandardError()), this, SLOT(updateNavMeshProgress()));
+    connect(mNavMeshToolInvoker->getProcess(), SIGNAL(readyReadStandardOutput()), this, SLOT(readNavMeshToolStdout()));
+    connect(mNavMeshToolInvoker->getProcess(), SIGNAL(readyReadStandardError()), this, SLOT(readNavMeshToolStderr()));
     connect(mNavMeshToolInvoker->getProcess(), SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(navMeshToolFinished(int, QProcess::ExitStatus)));
 }
 
@@ -429,7 +491,9 @@ void Launcher::DataFilesPage::startNavMeshTool()
     ui.navMeshProgressBar->setValue(0);
     ui.navMeshProgressBar->setMaximum(1);
 
-    if (!mNavMeshToolInvoker->startProcess(QLatin1String("openmw-navmeshtool")))
+    mNavMeshToolProgress = NavMeshToolProgress {};
+
+    if (!mNavMeshToolInvoker->startProcess(QLatin1String("openmw-navmeshtool"), QStringList({"--write-binary-log"})))
         return;
 
     ui.cancelNavMeshButton->setEnabled(true);
@@ -441,39 +505,60 @@ void Launcher::DataFilesPage::killNavMeshTool()
     mNavMeshToolInvoker->killProcess();
 }
 
-void Launcher::DataFilesPage::updateNavMeshProgress()
+void Launcher::DataFilesPage::readNavMeshToolStderr()
+{
+    updateNavMeshProgress(4096);
+}
+
+void Launcher::DataFilesPage::updateNavMeshProgress(int minDataSize)
 {
     QProcess& process = *mNavMeshToolInvoker->getProcess();
-    QString text;
-    while (process.canReadLine())
+    mNavMeshToolProgress.mMessagesData.append(process.readAllStandardError());
+    if (mNavMeshToolProgress.mMessagesData.size() < minDataSize)
+        return;
+    const std::byte* const begin = reinterpret_cast<const std::byte*>(mNavMeshToolProgress.mMessagesData.constData());
+    const std::byte* const end = begin + mNavMeshToolProgress.mMessagesData.size();
+    const std::byte* position = begin;
+    HandleNavMeshToolMessage handle {
+        mNavMeshToolProgress.mCellsCount,
+        mNavMeshToolProgress.mExpectedMaxProgress,
+        ui.navMeshProgressBar->maximum(),
+        ui.navMeshProgressBar->value(),
+    };
+    while (true)
     {
-        const QByteArray line = process.readLine();
-        const auto end = std::find_if(line.rbegin(), line.rend(), [] (auto v) { return v != '\n' && v != '\r'; });
-        text = QString::fromUtf8(line.mid(0, line.size() - (end - line.rbegin())));
-        ui.navMeshLogPlainTextEdit->appendPlainText(text);
+        NavMeshTool::Message message;
+        const std::byte* const nextPosition = NavMeshTool::deserialize(position, end, message);
+        if (nextPosition == position)
+            break;
+        position = nextPosition;
+        handle = std::visit(handle, NavMeshTool::decode(message));
     }
-    const QRegularExpression pattern(R"([\( ](\d+)/(\d+)[\) ])");
-    QRegularExpressionMatch match = pattern.match(text);
-    if (!match.hasMatch())
+    if (position != begin)
+        mNavMeshToolProgress.mMessagesData = mNavMeshToolProgress.mMessagesData.mid(position - begin);
+    mNavMeshToolProgress.mCellsCount = handle.mCellsCount;
+    mNavMeshToolProgress.mExpectedMaxProgress = handle.mExpectedMaxProgress;
+    ui.navMeshProgressBar->setMaximum(handle.mMaxProgress);
+    ui.navMeshProgressBar->setValue(handle.mProgress);
+}
+
+void Launcher::DataFilesPage::readNavMeshToolStdout()
+{
+    QProcess& process = *mNavMeshToolInvoker->getProcess();
+    QByteArray& logData = mNavMeshToolProgress.mLogData;
+    logData.append(process.readAllStandardOutput());
+    const int lineEnd = logData.lastIndexOf('\n');
+    if (lineEnd == -1)
         return;
-    int value = match.captured(1).toInt();
-    const int maximum = match.captured(2).toInt();
-    if (text.contains("cell"))
-        ui.navMeshProgressBar->setMaximum(maximum * 100);
-    else if (maximum > ui.navMeshProgressBar->maximum())
-        ui.navMeshProgressBar->setMaximum(maximum);
-    else
-        value += static_cast<int>(std::round(
-            (ui.navMeshProgressBar->maximum() - maximum)
-            * (static_cast<float>(value) / static_cast<float>(maximum))
-        ));
-    ui.navMeshProgressBar->setValue(value);
+    const int size = logData.size() >= lineEnd && logData[lineEnd - 1] == '\r' ? lineEnd - 1 : lineEnd;
+    ui.navMeshLogPlainTextEdit->appendPlainText(QString::fromUtf8(logData.data(), size));
+    logData = logData.mid(lineEnd + 1);
 }
 
 void Launcher::DataFilesPage::navMeshToolFinished(int exitCode, QProcess::ExitStatus exitStatus)
 {
-    updateNavMeshProgress();
-    ui.navMeshLogPlainTextEdit->appendPlainText(QString::fromUtf8(mNavMeshToolInvoker->getProcess()->readAll()));
+    updateNavMeshProgress(0);
+    ui.navMeshLogPlainTextEdit->appendPlainText(QString::fromUtf8(mNavMeshToolInvoker->getProcess()->readAllStandardOutput()));
     if (exitCode == 0 && exitStatus == QProcess::ExitStatus::NormalExit)
         ui.navMeshProgressBar->setValue(ui.navMeshProgressBar->maximum());
     ui.cancelNavMeshButton->setEnabled(false);
diff --git a/apps/launcher/datafilespage.hpp b/apps/launcher/datafilespage.hpp
index 36b69d4f8e..e004ca7542 100644
--- a/apps/launcher/datafilespage.hpp
+++ b/apps/launcher/datafilespage.hpp
@@ -73,7 +73,8 @@ namespace Launcher
 
         void startNavMeshTool();
         void killNavMeshTool();
-        void updateNavMeshProgress();
+        void readNavMeshToolStdout();
+        void readNavMeshToolStderr();
         void navMeshToolFinished(int exitCode, QProcess::ExitStatus exitStatus);
 
     public:
@@ -81,6 +82,14 @@ namespace Launcher
         const static char *mDefaultContentListName;
 
     private:
+        struct NavMeshToolProgress
+        {
+            QByteArray mLogData;
+            QByteArray mMessagesData;
+            std::map<std::uint64_t, std::string> mWorldspaces;
+            int mCellsCount = 0;
+            int mExpectedMaxProgress = 0;
+        };
 
         MainDialog *mMainDialog;
         TextInputDialog *mNewProfileDialog;
@@ -96,6 +105,7 @@ namespace Launcher
         QString mDataLocal;
 
         Process::ProcessInvoker* mNavMeshToolInvoker;
+        NavMeshToolProgress mNavMeshToolProgress;
 
         void buildView();
         void setProfile (int index, bool savePrevious);
@@ -107,6 +117,7 @@ namespace Launcher
         void populateFileViews(const QString& contentModelName);
         void reloadCells(QStringList selectedFiles);
         void refreshDataFilesView ();
+        void updateNavMeshProgress(int minDataSize);
 
         class PathIterator
         {
diff --git a/apps/navmeshtool/main.cpp b/apps/navmeshtool/main.cpp
index af411f03dd..643c14af0a 100644
--- a/apps/navmeshtool/main.cpp
+++ b/apps/navmeshtool/main.cpp
@@ -31,6 +31,11 @@
 #include <thread>
 #include <vector>
 
+#ifdef WIN32
+#include <fcntl.h>
+#include <io.h>
+#endif
+
 namespace NavMeshTool
 {
     namespace
@@ -86,6 +91,9 @@ namespace NavMeshTool
 
                 ("remove-unused-tiles", bpo::value<bool>()->implicit_value(true)
                     ->default_value(false), "remove tiles from cache that will not be used with current content profile")
+
+                ("write-binary-log", bpo::value<bool>()->implicit_value(true)
+                    ->default_value(false), "write progress in binary messages to be consumed by the launcher")
             ;
             Files::ConfigurationManager::addCommonOptions(result);
 
@@ -145,6 +153,12 @@ namespace NavMeshTool
 
             const bool processInteriorCells = variables["process-interior-cells"].as<bool>();
             const bool removeUnusedTiles = variables["remove-unused-tiles"].as<bool>();
+            const bool writeBinaryLog = variables["write-binary-log"].as<bool>();
+
+#ifdef WIN32
+            if (writeBinaryLog)
+                _setmode(_fileno(stderr), _O_BINARY);
+#endif
 
             Fallback::Map::init(variables["fallback"].as<Fallback::FallbackMap>().mMap);
 
@@ -180,10 +194,10 @@ namespace NavMeshTool
             navigatorSettings.mRecast.mSwimHeightScale = EsmLoader::getGameSetting(esmData.mGameSettings, "fSwimHeightScale").getFloat();
 
             WorldspaceData cellsData = gatherWorldspaceData(navigatorSettings, readers, vfs, bulletShapeManager,
-                                                            esmData, processInteriorCells);
+                                                            esmData, processInteriorCells, writeBinaryLog);
 
             generateAllNavMeshTiles(agentHalfExtents, navigatorSettings, threadsNumber, removeUnusedTiles,
-                                    cellsData, std::move(db));
+                                    writeBinaryLog, cellsData, std::move(db));
 
             Log(Debug::Info) << "Done";
 
diff --git a/apps/navmeshtool/navmesh.cpp b/apps/navmeshtool/navmesh.cpp
index 3acddb821d..975f697a20 100644
--- a/apps/navmeshtool/navmesh.cpp
+++ b/apps/navmeshtool/navmesh.cpp
@@ -15,6 +15,8 @@
 #include <components/misc/progressreporter.hpp>
 #include <components/sceneutil/workqueue.hpp>
 #include <components/sqlite3/transaction.hpp>
+#include <components/debug/debugging.hpp>
+#include <components/navmeshtool/protocol.hpp>
 
 #include <osg/Vec3f>
 
@@ -51,6 +53,18 @@ namespace NavMeshTool
                 << "%) navmesh tiles are generated";
         }
 
+        template <class T>
+        void serializeToStderr(const T& value)
+        {
+            const std::vector<std::byte> data = serialize(value);
+            getLockedRawStderr()->write(reinterpret_cast<const char*>(data.data()), static_cast<std::streamsize>(data.size()));
+        }
+
+        void logGeneratedTilesMessage(std::size_t number)
+        {
+            serializeToStderr(GeneratedTiles {static_cast<std::uint64_t>(number)});
+        }
+
         struct LogGeneratedTiles
         {
             void operator()(std::size_t provided, std::size_t expected) const
@@ -64,9 +78,10 @@ namespace NavMeshTool
         public:
             std::atomic_size_t mExpected {0};
 
-            explicit NavMeshTileConsumer(NavMeshDb&& db, bool removeUnusedTiles)
+            explicit NavMeshTileConsumer(NavMeshDb&& db, bool removeUnusedTiles, bool writeBinaryLog)
                 : mDb(std::move(db))
                 , mRemoveUnusedTiles(removeUnusedTiles)
+                , mWriteBinaryLog(writeBinaryLog)
                 , mTransaction(mDb.startTransaction(Sqlite3::TransactionMode::Immediate))
                 , mNextTileId(mDb.getMaxTileId() + 1)
                 , mNextShapeId(mDb.getMaxShapeId() + 1)
@@ -178,6 +193,8 @@ namespace NavMeshTool
                     }
                 }
                 logGeneratedTiles(mProvided, mExpected);
+                if (mWriteBinaryLog)
+                    logGeneratedTilesMessage(mProvided);
                 return !mCancelled;
             }
 
@@ -211,6 +228,7 @@ namespace NavMeshTool
             mutable std::mutex mMutex;
             NavMeshDb mDb;
             const bool mRemoveUnusedTiles;
+            const bool mWriteBinaryLog;
             Transaction mTransaction;
             TileId mNextTileId;
             std::condition_variable mHasTile;
@@ -223,18 +241,20 @@ namespace NavMeshTool
                 const std::size_t provided = mProvided.fetch_add(1, std::memory_order_relaxed) + 1;
                 mReporter(provided, mExpected);
                 mHasTile.notify_one();
+                if (mWriteBinaryLog)
+                    logGeneratedTilesMessage(provided);
             }
         };
     }
 
     void generateAllNavMeshTiles(const osg::Vec3f& agentHalfExtents, const Settings& settings,
-        std::size_t threadsNumber, bool removeUnusedTiles, WorldspaceData& data,
+        std::size_t threadsNumber, bool removeUnusedTiles, bool writeBinaryLog, WorldspaceData& data,
         NavMeshDb&& db)
     {
         Log(Debug::Info) << "Generating navmesh tiles by " << threadsNumber << " parallel workers...";
 
         SceneUtil::WorkQueue workQueue(threadsNumber);
-        auto navMeshTileConsumer = std::make_shared<NavMeshTileConsumer>(std::move(db), removeUnusedTiles);
+        auto navMeshTileConsumer = std::make_shared<NavMeshTileConsumer>(std::move(db), removeUnusedTiles, writeBinaryLog);
         std::size_t tiles = 0;
         std::mt19937_64 random;
 
@@ -256,6 +276,9 @@ namespace NavMeshTool
 
             tiles += worldspaceTiles.size();
 
+            if (writeBinaryLog)
+                serializeToStderr(ExpectedTiles {static_cast<std::uint64_t>(tiles)});
+
             navMeshTileConsumer->mExpected = tiles;
 
             std::shuffle(worldspaceTiles.begin(), worldspaceTiles.end(), random);
diff --git a/apps/navmeshtool/navmesh.hpp b/apps/navmeshtool/navmesh.hpp
index 3d0e9e4665..e25f1dd845 100644
--- a/apps/navmeshtool/navmesh.hpp
+++ b/apps/navmeshtool/navmesh.hpp
@@ -16,7 +16,7 @@ namespace NavMeshTool
     struct WorldspaceData;
 
     void generateAllNavMeshTiles(const osg::Vec3f& agentHalfExtents, const DetourNavigator::Settings& settings,
-        std::size_t threadsNumber, bool removeUnusedTiles, WorldspaceData& cellsData,
+        std::size_t threadsNumber, bool removeUnusedTiles, bool writeBinaryLog, WorldspaceData& cellsData,
         DetourNavigator::NavMeshDb&& db);
 }
 
diff --git a/apps/navmeshtool/worldspacedata.cpp b/apps/navmeshtool/worldspacedata.cpp
index 50e529c6e5..fae58c363e 100644
--- a/apps/navmeshtool/worldspacedata.cpp
+++ b/apps/navmeshtool/worldspacedata.cpp
@@ -18,6 +18,8 @@
 #include <components/resource/bulletshapemanager.hpp>
 #include <components/settings/settings.hpp>
 #include <components/vfs/manager.hpp>
+#include <components/debug/debugging.hpp>
+#include <components/navmeshtool/protocol.hpp>
 
 #include <LinearMath/btVector3.h>
 
@@ -214,6 +216,13 @@ namespace NavMeshTool
             surface.mSize = static_cast<std::size_t>(ESM::Land::LAND_SIZE);
             return {surface, landData.mMinHeight, landData.mMaxHeight};
         }
+
+        template <class T>
+        void serializeToStderr(const T& value)
+        {
+            const std::vector<std::byte> data = serialize(value);
+            getRawStderr().write(reinterpret_cast<const char*>(data.data()), static_cast<std::streamsize>(data.size()));
+        }
     }
 
     WorldspaceNavMeshInput::WorldspaceNavMeshInput(std::string worldspace, const DetourNavigator::RecastSettings& settings)
@@ -226,7 +235,7 @@ namespace NavMeshTool
 
     WorldspaceData gatherWorldspaceData(const DetourNavigator::Settings& settings, std::vector<ESM::ESMReader>& readers,
         const VFS::Manager& vfs, Resource::BulletShapeManager& bulletShapeManager, const EsmLoader::EsmData& esmData,
-        bool processInteriorCells)
+        bool processInteriorCells, bool writeBinaryLog)
     {
         Log(Debug::Info) << "Processing " << esmData.mCells.size() << " cells...";
 
@@ -235,6 +244,9 @@ namespace NavMeshTool
 
         std::size_t objectsCounter = 0;
 
+        if (writeBinaryLog)
+            serializeToStderr(ExpectedCells {static_cast<std::uint64_t>(esmData.mCells.size())});
+
         for (std::size_t i = 0; i < esmData.mCells.size(); ++i)
         {
             const ESM::Cell& cell = esmData.mCells[i];
@@ -242,6 +254,8 @@ namespace NavMeshTool
 
             if (!exterior && !processInteriorCells)
             {
+                if (writeBinaryLog)
+                    serializeToStderr(ProcessedCells {static_cast<std::uint64_t>(i + 1)});
                 Log(Debug::Info) << "Skipped interior"
                     << " cell (" << (i + 1) << "/" << esmData.mCells.size() << ") \"" << cell.getDescription() << "\"";
                 continue;
@@ -311,8 +325,13 @@ namespace NavMeshTool
                     data.mObjects.emplace_back(std::move(object));
                 });
 
+            const auto cellDescription = cell.getDescription();
+
+            if (writeBinaryLog)
+                serializeToStderr(ProcessedCells {static_cast<std::uint64_t>(i + 1)});
+
             Log(Debug::Info) << "Processed " << (exterior ? "exterior" : "interior")
-                << " cell (" << (i + 1) << "/" << esmData.mCells.size() << ") " << cell.getDescription()
+                << " cell (" << (i + 1) << "/" << esmData.mCells.size() << ") " << cellDescription
                 << " with " << (data.mObjects.size() - cellObjectsBegin) << " objects";
         }
 
diff --git a/apps/navmeshtool/worldspacedata.hpp b/apps/navmeshtool/worldspacedata.hpp
index 2efb0954e0..dc2ca30c73 100644
--- a/apps/navmeshtool/worldspacedata.hpp
+++ b/apps/navmeshtool/worldspacedata.hpp
@@ -91,7 +91,7 @@ namespace NavMeshTool
 
     WorldspaceData gatherWorldspaceData(const DetourNavigator::Settings& settings, std::vector<ESM::ESMReader>& readers,
         const VFS::Manager& vfs, Resource::BulletShapeManager& bulletShapeManager, const EsmLoader::EsmData& esmData,
-        bool processInteriorCells);
+        bool processInteriorCells, bool writeBinaryLog);
 }
 
 #endif
diff --git a/apps/openmw_test_suite/serialization/binaryreader.cpp b/apps/openmw_test_suite/serialization/binaryreader.cpp
index cb4f5c57bd..071cfabb8f 100644
--- a/apps/openmw_test_suite/serialization/binaryreader.cpp
+++ b/apps/openmw_test_suite/serialization/binaryreader.cpp
@@ -64,4 +64,27 @@ namespace
         const TestFormat<Mode::Read> format;
         EXPECT_THROW(binaryReader(format, values.data(), values.size()), std::runtime_error);
     }
+
+    TEST(DetourNavigatorSerializationBinaryReaderTest, shouldSetPointerToCurrentBufferPosition)
+    {
+        std::vector<std::byte> data(8);
+        BinaryReader binaryReader(data.data(), data.data() + data.size());
+        const std::byte* ptr = nullptr;
+        const TestFormat<Mode::Read> format;
+        binaryReader(format, ptr);
+        EXPECT_EQ(ptr, data.data());
+    }
+
+    TEST(DetourNavigatorSerializationBinaryReaderTest, shouldNotAdvanceAfterPointer)
+    {
+        std::vector<std::byte> data(8);
+        BinaryReader binaryReader(data.data(), data.data() + data.size());
+        const std::byte* ptr1 = nullptr;
+        const std::byte* ptr2 = nullptr;
+        const TestFormat<Mode::Read> format;
+        binaryReader(format, ptr1);
+        binaryReader(format, ptr2);
+        EXPECT_EQ(ptr1, data.data());
+        EXPECT_EQ(ptr2, data.data());
+    }
 }
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index efc80081e3..d0d823a3eb 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -319,6 +319,10 @@ add_component_dir(esmloader
     esmdata
 )
 
+add_component_dir(navmeshtool
+    protocol
+    )
+
 set (ESM_UI ${CMAKE_SOURCE_DIR}/files/ui/contentselector.ui
     )
 
diff --git a/components/debug/debugging.cpp b/components/debug/debugging.cpp
index c84bb39d3d..65589bd6b4 100644
--- a/components/debug/debugging.cpp
+++ b/components/debug/debugging.cpp
@@ -138,6 +138,7 @@ namespace Debug
 
 static std::unique_ptr<std::ostream> rawStdout = nullptr;
 static std::unique_ptr<std::ostream> rawStderr = nullptr;
+static std::unique_ptr<std::mutex> rawStderrMutex = nullptr;
 static boost::filesystem::ofstream logfile;
 
 #if defined(_WIN32) && defined(_DEBUG)
@@ -152,6 +153,16 @@ std::ostream& getRawStdout()
     return rawStdout ? *rawStdout : std::cout;
 }
 
+std::ostream& getRawStderr()
+{
+    return rawStderr ? *rawStderr : std::cerr;
+}
+
+Misc::Locked<std::ostream&> getLockedRawStderr()
+{
+    return Misc::Locked<std::ostream&>(*rawStderrMutex, getRawStderr());
+}
+
 // Redirect cout and cerr to the log file
 void setupLogging(const std::string& logDir, const std::string& appName, std::ios_base::openmode mode)
 {
@@ -180,6 +191,7 @@ int wrapApplication(int (*innerApplication)(int argc, char *argv[]), int argc, c
 #endif
     rawStdout = std::make_unique<std::ostream>(std::cout.rdbuf());
     rawStderr = std::make_unique<std::ostream>(std::cerr.rdbuf());
+    rawStderrMutex = std::make_unique<std::mutex>();
 
     int ret = 0;
     try
diff --git a/components/debug/debugging.hpp b/components/debug/debugging.hpp
index a2c5ae9e6c..d0af6d8f25 100644
--- a/components/debug/debugging.hpp
+++ b/components/debug/debugging.hpp
@@ -5,6 +5,7 @@
 #include <boost/iostreams/stream.hpp>
 
 #include <components/files/configurationmanager.hpp>
+#include <components/misc/guarded.hpp>
 
 #include <SDL_messagebox.h>
 
@@ -140,6 +141,10 @@ namespace Debug
 // Can be used to print messages without timestamps
 std::ostream& getRawStdout();
 
+std::ostream& getRawStderr();
+
+Misc::Locked<std::ostream&> getLockedRawStderr();
+
 void setupLogging(const std::string& logDir, const std::string& appName, std::ios_base::openmode = std::ios::out);
 
 int wrapApplication(int (*innerApplication)(int argc, char *argv[]), int argc, char *argv[],
diff --git a/components/misc/guarded.hpp b/components/misc/guarded.hpp
index 7f1005fc3a..a06789773d 100644
--- a/components/misc/guarded.hpp
+++ b/components/misc/guarded.hpp
@@ -4,6 +4,7 @@
 #include <mutex>
 #include <memory>
 #include <condition_variable>
+#include <type_traits>
 
 namespace Misc
 {
@@ -11,28 +12,28 @@ namespace Misc
     class Locked
     {
         public:
-            Locked(std::mutex& mutex, T& value)
+            Locked(std::mutex& mutex, std::remove_reference_t<T>& value)
                 : mLock(mutex), mValue(value)
             {}
 
-            T& get() const
+            std::remove_reference_t<T>& get() const
             {
                 return mValue.get();
             }
 
-            T* operator ->() const
+            std::remove_reference_t<T>* operator ->() const
             {
-                return std::addressof(get());
+                return &get();
             }
 
-            T& operator *() const
+            std::remove_reference_t<T>& operator *() const
             {
                 return get();
             }
 
         private:
             std::unique_lock<std::mutex> mLock;
-            std::reference_wrapper<T> mValue;
+            std::reference_wrapper<std::remove_reference_t<T>> mValue;
     };
 
     template <class T>
diff --git a/components/navmeshtool/protocol.cpp b/components/navmeshtool/protocol.cpp
new file mode 100644
index 0000000000..656d5ab4d6
--- /dev/null
+++ b/components/navmeshtool/protocol.cpp
@@ -0,0 +1,159 @@
+#include "protocol.hpp"
+
+#include <components/serialization/format.hpp>
+#include <components/serialization/sizeaccumulator.hpp>
+#include <components/serialization/binarywriter.hpp>
+#include <components/serialization/binaryreader.hpp>
+
+#include <stdexcept>
+#include <string>
+
+namespace NavMeshTool
+{
+    namespace
+    {
+        template <Serialization::Mode mode>
+        struct Format : Serialization::Format<mode, Format<mode>>
+        {
+            using Serialization::Format<mode, Format<mode>>::operator();
+
+            template <class Visitor, class T>
+            auto operator()(Visitor&& visitor, T& value) const
+                -> std::enable_if_t<std::is_same_v<std::decay_t<T>, Message>>
+            {
+                if constexpr (mode == Serialization::Mode::Write)
+                    visitor(*this, messageMagic);
+                else
+                {
+                    static_assert(mode == Serialization::Mode::Read);
+                    char magic[std::size(messageMagic)];
+                    visitor(*this, magic);
+                    if (std::memcmp(magic, messageMagic, sizeof(magic)) != 0)
+                        throw BadMessageMagic();
+                }
+                visitor(*this, value.mType);
+                visitor(*this, value.mSize);
+                if constexpr (mode == Serialization::Mode::Write)
+                    visitor(*this, value.mData, value.mSize);
+                else
+                    visitor(*this, value.mData);
+            }
+
+            template <class Visitor, class T>
+            auto operator()(Visitor&& visitor, T& value) const
+                -> std::enable_if_t<std::is_same_v<std::decay_t<T>, ExpectedCells>>
+            {
+                visitor(*this, value.mCount);
+            }
+
+            template <class Visitor, class T>
+            auto operator()(Visitor&& visitor, T& value) const
+                -> std::enable_if_t<std::is_same_v<std::decay_t<T>, ProcessedCells>>
+            {
+                visitor(*this, value.mCount);
+            }
+
+            template <class Visitor, class T>
+            auto operator()(Visitor&& visitor, T& value) const
+                -> std::enable_if_t<std::is_same_v<std::decay_t<T>, ExpectedTiles>>
+            {
+                visitor(*this, value.mCount);
+            }
+
+            template <class Visitor, class T>
+            auto operator()(Visitor&& visitor, T& value) const
+                -> std::enable_if_t<std::is_same_v<std::decay_t<T>, GeneratedTiles>>
+            {
+                visitor(*this, value.mCount);
+            }
+        };
+
+        template <class T>
+        std::vector<std::byte> serializeToVector(const T& value)
+        {
+            constexpr Format<Serialization::Mode::Write> format;
+            Serialization::SizeAccumulator sizeAccumulator;
+            format(sizeAccumulator, value);
+            std::vector<std::byte> buffer(sizeAccumulator.value());
+            format(Serialization::BinaryWriter(buffer.data(), buffer.data() + buffer.size()), value);
+            return buffer;
+        }
+
+        template <class T>
+        std::vector<std::byte> serializeImpl(const T& value)
+        {
+            const auto data = serializeToVector(value);
+            const Message message {static_cast<std::uint64_t>(T::sMessageType), static_cast<std::uint64_t>(data.size()), data.data()};
+            return serializeToVector(message);
+        }
+    }
+
+    std::vector<std::byte> serialize(const ExpectedCells& value)
+    {
+        return serializeImpl(value);
+    }
+
+    std::vector<std::byte> serialize(const ProcessedCells& value)
+    {
+        return serializeImpl(value);
+    }
+
+    std::vector<std::byte> serialize(const ExpectedTiles& value)
+    {
+        return serializeImpl(value);
+    }
+
+    std::vector<std::byte> serialize(const GeneratedTiles& value)
+    {
+        return serializeImpl(value);
+    }
+
+    const std::byte* deserialize(const std::byte* begin, const std::byte* end, Message& message)
+    {
+        try
+        {
+            constexpr Format<Serialization::Mode::Read> format;
+            Serialization::BinaryReader reader(begin, end);
+            format(reader, message);
+            return message.mData + message.mSize;
+        }
+        catch (const Serialization::NotEnoughData&)
+        {
+            return begin;
+        }
+    }
+
+    TypedMessage decode(const Message& message)
+    {
+        constexpr Format<Serialization::Mode::Read> format;
+        Serialization::BinaryReader reader(message.mData, message.mData + message.mSize);
+        switch (static_cast<MessageType>(message.mType))
+        {
+            case MessageType::ExpectedCells:
+            {
+                ExpectedCells value;
+                format(reader, value);
+                return value;
+            }
+            case MessageType::ProcessedCells:
+            {
+                ProcessedCells value;
+                format(reader, value);
+                return value;
+            }
+            case MessageType::ExpectedTiles:
+            {
+                ExpectedTiles value;
+                format(reader, value);
+                return value;
+            }
+            case MessageType::GeneratedTiles:
+            {
+                GeneratedTiles value;
+                format(reader, value);
+                return value;
+            }
+        }
+        throw std::logic_error("Unsupported message type: " + std::to_string(message.mType));
+    }
+}
diff --git a/components/navmeshtool/protocol.hpp b/components/navmeshtool/protocol.hpp
new file mode 100644
index 0000000000..ddb68a716c
--- /dev/null
+++ b/components/navmeshtool/protocol.hpp
@@ -0,0 +1,78 @@
+#ifndef OPENMW_COMPONENTS_NAVMESHTOOL_PROTOCOL_H
+#define OPENMW_COMPONENTS_NAVMESHTOOL_PROTOCOL_H
+
+#include <cstddef>
+#include <cstdint>
+#include <stdexcept>
+#include <variant>
+#include <vector>
+
+namespace NavMeshTool
+{
+    inline constexpr char messageMagic[] = {'n', 'v', 't', 'm'};
+
+    struct BadMessageMagic : std::runtime_error
+    {
+        BadMessageMagic() : std::runtime_error("Bad Message magic") {}
+    };
+
+    enum class MessageType : std::uint64_t
+    {
+        ExpectedCells = 1,
+        ProcessedCells = 2,
+        ExpectedTiles = 3,
+        GeneratedTiles = 4,
+    };
+
+    struct Message
+    {
+        std::uint64_t mType = 0;
+        std::uint64_t mSize = 0;
+        const std::byte* mData = nullptr;
+    };
+
+    struct ExpectedCells
+    {
+        static constexpr MessageType sMessageType = MessageType::ExpectedCells;
+        std::uint64_t mCount = 0;
+    };
+
+    struct ProcessedCells
+    {
+        static constexpr MessageType sMessageType = MessageType::ProcessedCells;
+        std::uint64_t mCount = 0;
+    };
+
+    struct ExpectedTiles
+    {
+        static constexpr MessageType sMessageType = MessageType::ExpectedTiles;
+        std::uint64_t mCount = 0;
+    };
+
+    struct GeneratedTiles
+    {
+        static constexpr MessageType sMessageType = MessageType::GeneratedTiles;
+        std::uint64_t mCount = 0;
+    };
+
+    using TypedMessage = std::variant<
+        ExpectedCells,
+        ProcessedCells,
+        ExpectedTiles,
+        GeneratedTiles
+    >;
+
+    std::vector<std::byte> serialize(const ExpectedCells& value);
+
+    std::vector<std::byte> serialize(const ProcessedCells& value);
+
+    std::vector<std::byte> serialize(const ExpectedTiles& value);
+
+    std::vector<std::byte> serialize(const GeneratedTiles& value);
+
+    const std::byte* deserialize(const std::byte* begin, const std::byte* end, Message& message);
+
+    TypedMessage decode(const Message& message);
+}
+
+#endif
diff --git a/components/serialization/binaryreader.hpp b/components/serialization/binaryreader.hpp
index 66e09f6ffb..79776a26a7 100644
--- a/components/serialization/binaryreader.hpp
+++ b/components/serialization/binaryreader.hpp
@@ -12,6 +12,11 @@
 
 namespace Serialization
 {
+    struct NotEnoughData : std::runtime_error
+    {
+        NotEnoughData() : std::runtime_error("Not enough data") {}
+    };
+
     class BinaryReader
     {
     public:
@@ -31,11 +36,13 @@ namespace Serialization
             else if constexpr (std::is_arithmetic_v<T>)
             {
                 if (mEnd - mPos < static_cast<std::ptrdiff_t>(sizeof(T)))
-                    throw std::runtime_error("Not enough data");
+                    throw NotEnoughData();
                 std::memcpy(&value, mPos, sizeof(T));
                 mPos += sizeof(T);
                 value = Misc::toLittleEndian(value);
             }
+            else if constexpr (std::is_pointer_v<T>)
+                value = reinterpret_cast<T>(mPos);
             else
             {
                 format(*this, value);
@@ -51,7 +58,7 @@ namespace Serialization
             {
                 const std::size_t size = sizeof(T) * count;
                 if (mEnd - mPos < static_cast<std::ptrdiff_t>(size))
-                    throw std::runtime_error("Not enough data");
+                    throw NotEnoughData();
                 std::memcpy(data, mPos, size);
                 mPos += size;
                 if constexpr (!Misc::IS_LITTLE_ENDIAN)
diff --git a/components/serialization/binarywriter.hpp b/components/serialization/binarywriter.hpp
index 199f208da9..64ec00d5bf 100644
--- a/components/serialization/binarywriter.hpp
+++ b/components/serialization/binarywriter.hpp
@@ -12,6 +12,11 @@
 
 namespace Serialization
 {
+    struct NotEnoughSpace : std::runtime_error
+    {
+        NotEnoughSpace() : std::runtime_error("Not enough space") {}
+    };
+
     struct BinaryWriter
     {
     public:
@@ -31,7 +36,7 @@ namespace Serialization
             else if constexpr (std::is_arithmetic_v<T>)
             {
                 if (mEnd - mDest < static_cast<std::ptrdiff_t>(sizeof(T)))
-                    throw std::runtime_error("Not enough space");
+                    throw NotEnoughSpace();
                 writeValue(value);
             }
             else
@@ -49,7 +54,7 @@ namespace Serialization
             {
                 const std::size_t size = sizeof(T) * count;
                 if (mEnd - mDest < static_cast<std::ptrdiff_t>(size))
-                    throw std::runtime_error("Not enough space");
+                    throw NotEnoughSpace();
                 if constexpr (Misc::IS_LITTLE_ENDIAN)
                 {
                     std::memcpy(mDest, data, size);

From 3878a12ed31961e77ad94607c164ac08fe541043 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 6 Sep 2021 00:40:13 +0200
Subject: [PATCH 2239/2859] Delay cell grid change until scene update

This allows proper profiling. Changing cell grid is not a part of physics
system, it's a part of world system.
---
 apps/openmw/mwworld/scene.cpp | 14 +++++++++++++-
 apps/openmw/mwworld/scene.hpp | 13 ++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 1cb80389ce..07a613db4a 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -296,6 +296,13 @@ namespace MWWorld
 
     void Scene::update (float duration, bool paused)
     {
+        if (mChangeCellGridRequest.has_value())
+        {
+            changeCellGrid(mChangeCellGridRequest->mPosition, mChangeCellGridRequest->mCell.x(),
+                           mChangeCellGridRequest->mCell.y(), mChangeCellGridRequest->mChangeEvent);
+            mChangeCellGridRequest.reset();
+        }
+
         mPreloader->updateCache(mRendering.getReferenceTime());
         preloadCells(duration);
 
@@ -515,7 +522,12 @@ namespace MWWorld
 
         osg::Vec2i newCell = getNewGridCenter(pos, &mCurrentGridCenter);
         if (newCell != mCurrentGridCenter)
-            changeCellGrid(pos, newCell.x(), newCell.y());
+            requestChangeCellGrid(pos, newCell);
+    }
+
+    void Scene::requestChangeCellGrid(const osg::Vec3f &position, const osg::Vec2i& cell, bool changeEvent)
+    {
+        mChangeCellGridRequest = ChangeCellGridRequest {position, cell, changeEvent};
     }
 
     void Scene::changeCellGrid (const osg::Vec3f &pos, int playerCellX, int playerCellY, bool changeEvent)
diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp
index c0b6f5ae46..464088f223 100644
--- a/apps/openmw/mwworld/scene.hpp
+++ b/apps/openmw/mwworld/scene.hpp
@@ -12,6 +12,7 @@
 #include <memory>
 #include <unordered_map>
 #include <vector>
+#include <optional>
 
 #include <components/misc/constants.hpp>
 
@@ -74,6 +75,12 @@ namespace MWWorld
             using CellStoreCollection = std::set<CellStore *>;
 
         private:
+            struct ChangeCellGridRequest
+            {
+                osg::Vec3f mPosition;
+                osg::Vec2i mCell;
+                bool mChangeEvent;
+            };
 
             CellStore* mCurrentCell; // the cell the player is in
             CellStoreCollection mActiveCells;
@@ -99,12 +106,16 @@ namespace MWWorld
 
             std::vector<osg::ref_ptr<SceneUtil::WorkItem>> mWorkItems;
 
+            std::optional<ChangeCellGridRequest> mChangeCellGridRequest;
+
             void insertCell(CellStore &cell, Loading::Listener* loadingListener);
             osg::Vec2i mCurrentGridCenter;
 
             // Load and unload cells as necessary to create a cell grid with "X" and "Y" in the center
             void changeCellGrid (const osg::Vec3f &pos, int playerCellX, int playerCellY, bool changeEvent = true);
 
+            void requestChangeCellGrid(const osg::Vec3f &position, const osg::Vec2i& cell, bool changeEvent = true);
+
             typedef std::pair<osg::Vec3f, osg::Vec4i> PositionCellGrid;
 
             void preloadCells(float dt);
@@ -131,7 +142,7 @@ namespace MWWorld
 
             void playerMoved (const osg::Vec3f& pos);
 
-            void changePlayerCell (CellStore* newCell, const ESM::Position& position, bool adjustPlayerPos);
+            void changePlayerCell(CellStore* newCell, const ESM::Position& position, bool adjustPlayerPos);
 
             CellStore *getCurrentCell();
 

From 6d7c8f25fc05eb6dd1c9f7073205f7db06d318b3 Mon Sep 17 00:00:00 2001
From: Vidi_Aquam <89811652+VidiAquam@users.noreply.github.com>
Date: Sat, 2 Apr 2022 19:25:57 -0500
Subject: [PATCH 2240/2859] Implement grid snapping and angle snapping in
 OpenMW-CS

Adds configurable snap settings for instance movement, rotation and scaling, used with the secondary edit button
---
 apps/opencs/model/prefs/state.cpp             |   3 +
 apps/opencs/view/render/instancedragmodes.hpp |   5 +-
 apps/opencs/view/render/instancemode.cpp      | 123 ++++++++++++++++--
 apps/opencs/view/render/instancemode.hpp      |   2 +
 apps/opencs/view/render/instancemovemode.cpp  |   3 +-
 5 files changed, 119 insertions(+), 17 deletions(-)

diff --git a/apps/opencs/model/prefs/state.cpp b/apps/opencs/model/prefs/state.cpp
index 0981ae4401..97039df2eb 100644
--- a/apps/opencs/model/prefs/state.cpp
+++ b/apps/opencs/model/prefs/state.cpp
@@ -243,6 +243,9 @@ void CSMPrefs::State::declare()
     secondarySelectAction.add (SelectOnly).add (SelectAdd).add (SelectRemove).add (selectInvert);
 
     declareCategory ("3D Scene Editing");
+    declareDouble("gridsnap-movement", "Grid snap size", 16);
+    declareDouble("gridsnap-rotation", "Angle snap size", 15);
+    declareDouble("gridsnap-scale", "Scale snap size", 0.25);
     declareInt ("distance", "Drop Distance", 50).
         setTooltip ("If an instance drop can not be placed against another object at the "
             "insert point, it will be placed by this distance from the insert point instead");
diff --git a/apps/opencs/view/render/instancedragmodes.hpp b/apps/opencs/view/render/instancedragmodes.hpp
index 01547545ae..2629a9d2f9 100644
--- a/apps/opencs/view/render/instancedragmodes.hpp
+++ b/apps/opencs/view/render/instancedragmodes.hpp
@@ -12,7 +12,10 @@ namespace CSVRender
         DragMode_Select_Only,
         DragMode_Select_Add,
         DragMode_Select_Remove,
-        DragMode_Select_Invert
+        DragMode_Select_Invert,
+        DragMode_Move_Snap,
+        DragMode_Rotate_Snap,
+        DragMode_Scale_Snap
     };
 }
 #endif
diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index ebb7f46fa5..f19d1051b1 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -64,6 +64,11 @@ osg::Quat CSVRender::InstanceMode::eulerToQuat(const osg::Vec3f& euler) const
     return zr * yr * xr;
 }
 
+float CSVRender::InstanceMode::roundFloatToMult(const float val, const double mult) const
+{
+    return round(val / mult) * mult;
+}
+
 osg::Vec3f CSVRender::InstanceMode::getSelectionCenter(const std::vector<osg::ref_ptr<TagBase> >& selection) const
 {
     osg::Vec3f center = osg::Vec3f(0, 0, 0);
@@ -156,15 +161,13 @@ void CSVRender::InstanceMode::activate (CSVWidget::SceneToolbar *toolbar)
             "<ul><li>Use {scene-edit-primary} to rotate instances freely</li>"
             "<li>Use {scene-edit-secondary} to rotate instances within the grid</li>"
             "<li>The center of the view acts as the axis of rotation</li>"
-            "</ul>"
-            "<font color=Red>Grid rotate not implemented yet</font color>");
+            "</ul>");
         mSubMode->addButton (":scenetoolbar/transform-scale", "scale",
             "Scale selected instances"
             "<ul><li>Use {scene-edit-primary} to scale instances freely</li>"
             "<li>Use {scene-edit-secondary} to scale instances along the grid</li>"
             "<li>The scaling rate is based on how close the start of a drag is to the center of the screen</li>"
-            "</ul>"
-            "<font color=Red>Grid scale not implemented yet</font color>");
+            "</ul>");
 
         mSubMode->setButton (mSubModeId);
 
@@ -351,10 +354,81 @@ bool CSVRender::InstanceMode::primaryEditStartDrag (const QPoint& pos)
 
 bool CSVRender::InstanceMode::secondaryEditStartDrag (const QPoint& pos)
 {
-    if (mLocked)
+    if (mDragMode != DragMode_None || mLocked)
         return false;
 
-    return false;
+    WorldspaceHitResult hit = getWorldspaceWidget().mousePick(pos, getWorldspaceWidget().getInteractionMask());
+
+    std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection(Mask_Reference);
+    if (selection.empty())
+    {
+        // Only change selection at the start of drag if no object is already selected
+        if (hit.tag && CSMPrefs::get()["3D Scene Input"]["context-select"].isTrue())
+        {
+            getWorldspaceWidget().clearSelection(Mask_Reference);
+            if (CSVRender::ObjectTag* objectTag = dynamic_cast<CSVRender::ObjectTag*> (hit.tag.get()))
+            {
+                CSVRender::Object* object = objectTag->mObject;
+                object->setSelected(true);
+            }
+        }
+
+        selection = getWorldspaceWidget().getSelection(Mask_Reference);
+        if (selection.empty())
+            return false;
+    }
+
+    mObjectsAtDragStart.clear();
+
+    for (std::vector<osg::ref_ptr<TagBase> >::iterator iter(selection.begin());
+        iter != selection.end(); ++iter)
+    {
+        if (CSVRender::ObjectTag* objectTag = dynamic_cast<CSVRender::ObjectTag*> (iter->get()))
+        {
+            if (mSubModeId == "move")
+            {
+                objectTag->mObject->setEdited(Object::Override_Position);
+                float x = objectTag->mObject->getPosition().pos[0];
+                float y = objectTag->mObject->getPosition().pos[1];
+                float z = objectTag->mObject->getPosition().pos[2];
+                osg::Vec3f thisPoint(x, y, z);
+
+                mDragStart = getMousePlaneCoords(pos, getProjectionSpaceCoords(thisPoint));
+                mObjectsAtDragStart.emplace_back(thisPoint);
+                mDragMode = DragMode_Move_Snap;
+            }
+            else if (mSubModeId == "rotate")
+            {
+                objectTag->mObject->setEdited(Object::Override_Rotation);
+                mDragMode = DragMode_Rotate_Snap;
+            }
+            else if (mSubModeId == "scale")
+            {
+                objectTag->mObject->setEdited(Object::Override_Scale);
+                mDragMode = DragMode_Scale_Snap;
+
+                // Calculate scale factor
+                std::vector<osg::ref_ptr<TagBase> > editedSelection = getWorldspaceWidget().getEdited(Mask_Reference);
+                osg::Vec3f center = getScreenCoords(getSelectionCenter(editedSelection));
+
+                int widgetHeight = getWorldspaceWidget().height();
+
+                float dx = pos.x() - center.x();
+                float dy = (widgetHeight - pos.y()) - center.y();
+
+                mUnitScaleDist = std::sqrt(dx * dx + dy * dy);
+            }
+        }
+    }
+
+    if (CSVRender::ObjectMarkerTag* objectTag = dynamic_cast<CSVRender::ObjectMarkerTag*> (hit.tag.get()))
+    {
+        mDragAxis = objectTag->mAxis;
+    }
+    else
+        mDragAxis = -1;
+
+    return true;
 }
 
 bool CSVRender::InstanceMode::primarySelectStartDrag (const QPoint& pos)
@@ -400,8 +474,8 @@ void CSVRender::InstanceMode::drag (const QPoint& pos, int diffX, int diffY, dou
 
     std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getEdited (Mask_Reference);
 
-    if (mDragMode == DragMode_Move) {}
-    else if (mDragMode == DragMode_Rotate)
+    if (mDragMode == DragMode_Move || mDragMode == DragMode_Move_Snap) {}
+    else if (mDragMode == DragMode_Rotate || mDragMode == DragMode_Rotate_Snap)
     {
         osg::Vec3f eye, centre, up;
         getWorldspaceWidget().getCamera()->getViewMatrix().getLookAt (eye, centre, up);
@@ -465,7 +539,7 @@ void CSVRender::InstanceMode::drag (const QPoint& pos, int diffX, int diffY, dou
 
         rotation = osg::Quat(angle, axis);
     }
-    else if (mDragMode == DragMode_Scale)
+    else if (mDragMode == DragMode_Scale || mDragMode == DragMode_Scale_Snap)
     {
         osg::Vec3f center = getScreenCoords(getSelectionCenter(selection));
 
@@ -507,7 +581,7 @@ void CSVRender::InstanceMode::drag (const QPoint& pos, int diffX, int diffY, dou
     {
         if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (iter->get()))
         {
-            if (mDragMode == DragMode_Move)
+            if (mDragMode == DragMode_Move || mDragMode == DragMode_Move_Snap)
             {
                 ESM::Position position = objectTag->mObject->getPosition();
                 osg::Vec3f mousePos = getMousePlaneCoords(pos, getProjectionSpaceCoords(mDragStart));
@@ -518,6 +592,13 @@ void CSVRender::InstanceMode::drag (const QPoint& pos, int diffX, int diffY, dou
                 position.pos[1] = mObjectsAtDragStart[i].y() + addToY;
                 position.pos[2] = mObjectsAtDragStart[i].z() + addToZ;
 
+                if (mDragMode == DragMode_Move_Snap) 
+                {
+                    position.pos[0] = CSVRender::InstanceMode::roundFloatToMult(position.pos[0], CSMPrefs::get()["3D Scene Editing"]["gridsnap-movement"].toDouble());
+                    position.pos[1] = CSVRender::InstanceMode::roundFloatToMult(position.pos[1], CSMPrefs::get()["3D Scene Editing"]["gridsnap-movement"].toDouble());
+                    position.pos[2] = CSVRender::InstanceMode::roundFloatToMult(position.pos[2], CSMPrefs::get()["3D Scene Editing"]["gridsnap-movement"].toDouble());
+                }
+
                 // XYZ-locking
                 if (mDragAxis != -1)
                 {
@@ -530,7 +611,7 @@ void CSVRender::InstanceMode::drag (const QPoint& pos, int diffX, int diffY, dou
 
                 objectTag->mObject->setPosition(position.pos);
             }
-            else if (mDragMode == DragMode_Rotate)
+            else if (mDragMode == DragMode_Rotate || mDragMode == DragMode_Rotate_Snap)
             {
                 ESM::Position position = objectTag->mObject->getPosition();
 
@@ -546,9 +627,16 @@ void CSVRender::InstanceMode::drag (const QPoint& pos, int diffX, int diffY, dou
                     position.rot[2] = euler.z();
                 }
 
+                if (mDragMode == DragMode_Rotate_Snap)
+                {
+                    position.rot[0] = CSVRender::InstanceMode::roundFloatToMult(position.rot[0], osg::DegreesToRadians(CSMPrefs::get()["3D Scene Editing"]["gridsnap-rotation"].toDouble()));
+                    position.rot[1] = CSVRender::InstanceMode::roundFloatToMult(position.rot[1], osg::DegreesToRadians(CSMPrefs::get()["3D Scene Editing"]["gridsnap-rotation"].toDouble()));
+                    position.rot[2] = CSVRender::InstanceMode::roundFloatToMult(position.rot[2], osg::DegreesToRadians(CSMPrefs::get()["3D Scene Editing"]["gridsnap-rotation"].toDouble()));
+                }
+
                 objectTag->mObject->setRotation(position.rot);
             }
-            else if (mDragMode == DragMode_Scale)
+            else if (mDragMode == DragMode_Scale || mDragMode == DragMode_Scale_Snap)
             {
                 // Reset scale
                 objectTag->mObject->setEdited(0);
@@ -557,6 +645,11 @@ void CSVRender::InstanceMode::drag (const QPoint& pos, int diffX, int diffY, dou
                 float scale = objectTag->mObject->getScale();
                 scale *= offset.x();
 
+                if (mDragMode == DragMode_Scale_Snap)
+                {
+                    scale = CSVRender::InstanceMode::roundFloatToMult(scale, CSMPrefs::get()["3D Scene Editing"]["gridsnap-scale"].toDouble());
+                }
+
                 objectTag->mObject->setScale (scale);
             }
         }
@@ -593,7 +686,9 @@ void CSVRender::InstanceMode::dragCompleted(const QPoint& pos)
             handleSelectDrag(pos);
             return;
             break;
-
+        case DragMode_Move_Snap: description = "Move Instances"; break;
+        case DragMode_Rotate_Snap: description = "Rotate Instances"; break;
+        case DragMode_Scale_Snap: description = "Scale Instances"; break;
         case DragMode_None: break;
     }
 
@@ -621,7 +716,7 @@ void CSVRender::InstanceMode::dragAborted()
 
 void CSVRender::InstanceMode::dragWheel (int diff, double speedFactor)
 {
-    if (mDragMode==DragMode_Move)
+    if (mDragMode==DragMode_Move || mDragMode==DragMode_Move_Snap)
     {
         osg::Vec3f eye;
         osg::Vec3f centre;
diff --git a/apps/opencs/view/render/instancemode.hpp b/apps/opencs/view/render/instancemode.hpp
index 4ece934e93..feb307807a 100644
--- a/apps/opencs/view/render/instancemode.hpp
+++ b/apps/opencs/view/render/instancemode.hpp
@@ -53,6 +53,8 @@ namespace CSVRender
             osg::Vec3f quatToEuler(const osg::Quat& quat) const;
             osg::Quat eulerToQuat(const osg::Vec3f& euler) const;
 
+            float roundFloatToMult(const float val, const double mult) const;
+
             osg::Vec3f getSelectionCenter(const std::vector<osg::ref_ptr<TagBase> >& selection) const;
             osg::Vec3f getScreenCoords(const osg::Vec3f& pos);
             osg::Vec3f getProjectionSpaceCoords(const osg::Vec3f& pos);
diff --git a/apps/opencs/view/render/instancemovemode.cpp b/apps/opencs/view/render/instancemovemode.cpp
index 723af811de..5591035492 100644
--- a/apps/opencs/view/render/instancemovemode.cpp
+++ b/apps/opencs/view/render/instancemovemode.cpp
@@ -6,7 +6,6 @@ CSVRender::InstanceMoveMode::InstanceMoveMode (QWidget *parent)
   "Move selected instances"
   "<ul><li>Use {scene-edit-primary} to move instances around freely</li>"
   "<li>Use {scene-edit-secondary} to move instances around within the grid</li>"
-  "</ul>"
-  "<font color=Red>Grid move not implemented yet</font color>",
+  "</ul>",
   parent)
 {}

From abf0c8048ed3b9b9655c7b872d49b28aba8bc308 Mon Sep 17 00:00:00 2001
From: Vidi_Aquam <89811652+VidiAquam@users.noreply.github.com>
Date: Sun, 3 Apr 2022 09:04:12 -0500
Subject: [PATCH 2241/2859] Change reading of settings and add missing logic to
 mouse wheel drag

---
 apps/opencs/view/render/instancemode.cpp | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index f19d1051b1..e9a375f10d 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -594,9 +594,10 @@ void CSVRender::InstanceMode::drag (const QPoint& pos, int diffX, int diffY, dou
 
                 if (mDragMode == DragMode_Move_Snap) 
                 {
-                    position.pos[0] = CSVRender::InstanceMode::roundFloatToMult(position.pos[0], CSMPrefs::get()["3D Scene Editing"]["gridsnap-movement"].toDouble());
-                    position.pos[1] = CSVRender::InstanceMode::roundFloatToMult(position.pos[1], CSMPrefs::get()["3D Scene Editing"]["gridsnap-movement"].toDouble());
-                    position.pos[2] = CSVRender::InstanceMode::roundFloatToMult(position.pos[2], CSMPrefs::get()["3D Scene Editing"]["gridsnap-movement"].toDouble());
+                    double snap = CSMPrefs::get()["3D Scene Editing"]["gridsnap-movement"].toDouble();
+                    position.pos[0] = CSVRender::InstanceMode::roundFloatToMult(position.pos[0], snap);
+                    position.pos[1] = CSVRender::InstanceMode::roundFloatToMult(position.pos[1], snap);
+                    position.pos[2] = CSVRender::InstanceMode::roundFloatToMult(position.pos[2], snap);
                 }
 
                 // XYZ-locking
@@ -629,9 +630,10 @@ void CSVRender::InstanceMode::drag (const QPoint& pos, int diffX, int diffY, dou
 
                 if (mDragMode == DragMode_Rotate_Snap)
                 {
-                    position.rot[0] = CSVRender::InstanceMode::roundFloatToMult(position.rot[0], osg::DegreesToRadians(CSMPrefs::get()["3D Scene Editing"]["gridsnap-rotation"].toDouble()));
-                    position.rot[1] = CSVRender::InstanceMode::roundFloatToMult(position.rot[1], osg::DegreesToRadians(CSMPrefs::get()["3D Scene Editing"]["gridsnap-rotation"].toDouble()));
-                    position.rot[2] = CSVRender::InstanceMode::roundFloatToMult(position.rot[2], osg::DegreesToRadians(CSMPrefs::get()["3D Scene Editing"]["gridsnap-rotation"].toDouble()));
+                    double snap = CSMPrefs::get()["3D Scene Editing"]["gridsnap-rotation"].toDouble();
+                    position.rot[0] = CSVRender::InstanceMode::roundFloatToMult(position.rot[0], osg::DegreesToRadians(snap));
+                    position.rot[1] = CSVRender::InstanceMode::roundFloatToMult(position.rot[1], osg::DegreesToRadians(snap));
+                    position.rot[2] = CSVRender::InstanceMode::roundFloatToMult(position.rot[2], osg::DegreesToRadians(snap));
                 }
 
                 objectTag->mObject->setRotation(position.rot);
@@ -741,6 +743,15 @@ void CSVRender::InstanceMode::dragWheel (int diff, double speedFactor)
                 ESM::Position position = objectTag->mObject->getPosition();
                 for (int i=0; i<3; ++i)
                     position.pos[i] += offset[i];
+
+                if (mDragMode == DragMode_Move_Snap)
+                {
+                    double snap = CSMPrefs::get()["3D Scene Editing"]["gridsnap-movement"].toDouble();
+                    position.pos[0] = CSVRender::InstanceMode::roundFloatToMult(position.pos[0], snap);
+                    position.pos[1] = CSVRender::InstanceMode::roundFloatToMult(position.pos[1], snap);
+                    position.pos[2] = CSVRender::InstanceMode::roundFloatToMult(position.pos[2], snap);
+                }
+
                 objectTag->mObject->setPosition (position.pos);
                 osg::Vec3f thisPoint(position.pos[0], position.pos[1], position.pos[2]);
                 mDragStart = getMousePlaneCoords(getWorldspaceWidget().mapFromGlobal(QCursor::pos()), getProjectionSpaceCoords(thisPoint));

From a8020d8076985f6a357f2e1d842ac7ec147cb430 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sat, 2 Apr 2022 14:25:12 +0000
Subject: [PATCH 2242/2859] Make use of Gitlab's SAST

https://docs.gitlab.com/ee/user/application_security/sast/
---
 .gitlab-ci.yml            |  6 ++++
 .gitlab/sast-ruleset.toml | 71 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 .gitlab/sast-ruleset.toml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5579fcc76b..5c0acda625 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,10 @@
+include:
+  - template: Security/SAST.gitlab-ci.yml
+
 # Note: We set `needs` on each job to control the job DAG.
 # See https://docs.gitlab.com/ee/ci/yaml/#needs
 stages:
+  - test
   - build
 
 # https://blog.nimbleways.com/let-s-make-faster-gitlab-ci-cd-pipelines/
@@ -10,6 +14,8 @@ variables:
   # These can be specified per job or per pipeline
   ARTIFACT_COMPRESSION_LEVEL: "fast"
   CACHE_COMPRESSION_LEVEL: "fast"
+  SAST_EXCLUDED_ANALYZERS: bandit,eslint
+  SAST_EXCLUDED_PATHS: spec,test,tests,tmp,extern
 
 .Ubuntu_Image:
   tags:
diff --git a/.gitlab/sast-ruleset.toml b/.gitlab/sast-ruleset.toml
new file mode 100644
index 0000000000..fb111405fa
--- /dev/null
+++ b/.gitlab/sast-ruleset.toml
@@ -0,0 +1,71 @@
+[flawfinder]
+	[[flawfinder.ruleset]]
+		disable = true
+		[flawfinder.ruleset.identifier]
+			type = "flawfinder_func_name"
+			value = "readlink"  # openmw isn't a privileged process
+	[[flawfinder.ruleset]]
+		disable = true
+		[flawfinder.ruleset.identifier]
+			type = "flawfinder_func_name"
+			value = "access"  # openmw isn't a privileged process
+	[[flawfinder.ruleset]]
+		disable = true
+		[flawfinder.ruleset.identifier]
+			type = "flawfinder_func_name"
+			value = "random"  # duh.
+	[[flawfinder.ruleset]]
+		disable = true
+		[flawfinder.ruleset.identifier]
+			type = "flawfinder_func_name"
+			value = "getenv"  # duh.
+	[[flawfinder.ruleset]]
+		disable = true
+		[flawfinder.ruleset.identifier]
+			type = "flawfinder_func_name"
+			value = "open" # openmw isn't a privileged process
+	[[flawfinder.ruleset]]
+		disable = true
+		[flawfinder.ruleset.identifier]
+			type = "flawfinder_func_name"
+			value = "char"  # too many false positives
+	[[flawfinder.ruleset]]
+		disable = true
+		[flawfinder.ruleset.identifier]
+			type = "flawfinder_func_name"
+			value = "read"  # too many false positives
+	[[flawfinder.ruleset]]
+		disable = true
+		[flawfinder.ruleset.identifier]
+			type = "flawfinder_func_name"
+			value = "snprintf"  # too many false positives
+	[[flawfinder.ruleset]]
+		disable = true
+		[flawfinder.ruleset.identifier]
+			type = "flawfinder_func_name"
+			value = "strlen"  # too many false positives
+	[[flawfinder.ruleset]]
+		disable = true
+		[flawfinder.ruleset.identifier]
+			type = "flawfinder_func_name"
+			value = "mkstemp"  # openmw doesn't run on old Unix systems
+	[[flawfinder.ruleset]]
+		disable = true
+		[flawfinder.ruleset.identifier]
+			type = "flawfinder_func_name"
+			value = "fopen"   # openmw isn't a privileged process
+	[[flawfinder.ruleset]]
+		disable = true
+		[flawfinder.ruleset.identifier]
+			type = "flawfinder_func_name"
+			value = "equal"  # only false positives, sigh
+	[[flawfinder.ruleset]]
+		disable = true
+		[flawfinder.ruleset.identifier]
+			type = "flawfinder_func_name"
+			value = "_snprintf"  # only false positives, sigh
+	[[flawfinder.ruleset]]
+		disable = true
+		[flawfinder.ruleset.identifier]
+			type = "flawfinder_func_name"
+			value = "printf"  # only false positives, sigh

From 6e0d660dd51154c8d7923f11c63220cace5838a7 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 3 Apr 2022 17:38:33 +0000
Subject: [PATCH 2243/2859] Check whether model is empty before trying to
 insert object

---
 apps/openmw/mwclass/activator.cpp |  3 +--
 apps/openmw/mwclass/actor.cpp     |  9 +++------
 apps/openmw/mwclass/container.cpp |  3 +--
 apps/openmw/mwclass/door.cpp      |  3 +--
 apps/openmw/mwclass/light.cpp     |  2 +-
 apps/openmw/mwclass/static.cpp    |  3 +--
 apps/openmw/mwworld/scene.cpp     | 13 +++++++++----
 7 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/apps/openmw/mwclass/activator.cpp b/apps/openmw/mwclass/activator.cpp
index 0b4edf4e1a..b1660559e6 100644
--- a/apps/openmw/mwclass/activator.cpp
+++ b/apps/openmw/mwclass/activator.cpp
@@ -45,8 +45,7 @@ namespace MWClass
 
     void Activator::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const
     {
-        if(!model.empty())
-            physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World);
+        physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World);
     }
 
     std::string Activator::getModel(const MWWorld::ConstPtr &ptr) const
diff --git a/apps/openmw/mwclass/actor.cpp b/apps/openmw/mwclass/actor.cpp
index 9b5e10e1c7..8b291c5882 100644
--- a/apps/openmw/mwclass/actor.cpp
+++ b/apps/openmw/mwclass/actor.cpp
@@ -24,12 +24,9 @@ namespace MWClass
 
     void Actor::insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const
     {
-        if (!model.empty())
-        {
-            physics.addActor(ptr, model);
-            if (getCreatureStats(ptr).isDead() && getCreatureStats(ptr).isDeathAnimationFinished())
-                MWBase::Environment::get().getWorld()->enableActorCollision(ptr, false);
-        }
+        physics.addActor(ptr, model);
+        if (getCreatureStats(ptr).isDead() && getCreatureStats(ptr).isDeathAnimationFinished())
+            MWBase::Environment::get().getWorld()->enableActorCollision(ptr, false);
     }
 
     bool Actor::useAnim() const
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index e319cdf410..b98ba43df4 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -111,8 +111,7 @@ namespace MWClass
 
     void Container::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const
     {
-        if(!model.empty())
-            physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World);
+        physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World);
     }
 
     std::string Container::getModel(const MWWorld::ConstPtr &ptr) const
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index 81a45f3a30..da8eb193d5 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -72,8 +72,7 @@ namespace MWClass
 
     void Door::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const
     {
-        if(!model.empty())
-            physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_Door);
+        physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_Door);
     }
 
     bool Door::isDoor() const
diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index 26f41d30f7..070b769b83 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -50,7 +50,7 @@ namespace MWClass
     void Light::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const
     {
         // TODO: add option somewhere to enable collision for placeable objects
-        if (!model.empty() && (ptr.get<ESM::Light>()->mBase->mData.mFlags & ESM::Light::Carry) == 0)
+        if ((ptr.get<ESM::Light>()->mBase->mData.mFlags & ESM::Light::Carry) == 0)
             physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World);
     }
 
diff --git a/apps/openmw/mwclass/static.cpp b/apps/openmw/mwclass/static.cpp
index 0b77a5630d..1fa445e428 100644
--- a/apps/openmw/mwclass/static.cpp
+++ b/apps/openmw/mwclass/static.cpp
@@ -30,8 +30,7 @@ namespace MWClass
 
     void Static::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const
     {
-        if(!model.empty())
-            physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World);
+        physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World);
     }
 
     std::string Static::getModel(const MWWorld::ConstPtr &ptr) const
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 07a613db4a..f24316045b 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -125,7 +125,8 @@ namespace
         // Restore effect particles
         MWBase::Environment::get().getWorld()->applyLoopingParticles(ptr);
 
-        ptr.getClass().insertObject (ptr, model, rotation, physics);
+        if (!model.empty())
+            ptr.getClass().insertObject(ptr, model, rotation, physics);
 
         MWBase::Environment::get().getLuaManager()->objectAddedToScene(ptr);
     }
@@ -584,10 +585,14 @@ namespace MWWorld
                 if(ptr.mRef->mData.mPhysicsPostponed)
                 {
                     ptr.mRef->mData.mPhysicsPostponed = false;
-                    if(ptr.mRef->mData.isEnabled() && ptr.mRef->mData.getCount() > 0) {
+                    if (ptr.mRef->mData.isEnabled() && ptr.mRef->mData.getCount() > 0)
+                    {
                         std::string model = getModel(ptr, MWBase::Environment::get().getResourceSystem()->getVFS());
-                        const auto rotation = makeNodeRotation(ptr, RotationOrder::direct);
-                        ptr.getClass().insertObjectPhysics(ptr, model, rotation, *mPhysics);
+                        if (!model.empty())
+                        {
+                            const auto rotation = makeNodeRotation(ptr, RotationOrder::direct);
+                            ptr.getClass().insertObjectPhysics(ptr, model, rotation, *mPhysics);
+                        }
                     }
                 }
                 return true;

From 14b5bef64f49925106689355b8f4046ad124d3ec Mon Sep 17 00:00:00 2001
From: Eris Caffee <eris-caffee@eldalin.com>
Date: Sun, 3 Apr 2022 22:46:39 -0500
Subject: [PATCH 2244/2859] Issue 6558 Move away from md5 in cmake

Updated CMakeLists.txt files to use sha512 instead of md5 to verify downloads
---
 apps/openmw_test_suite/CMakeLists.txt |  2 +-
 extern/CMakeLists.txt                 | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index 767eebe6c8..854526dc8c 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -93,7 +93,7 @@ if (GTEST_FOUND AND GMOCK_FOUND)
     file(DOWNLOAD
         https://gitlab.com/OpenMW/example-suite/-/raw/8966dab24692555eec720c854fb0f73d108070cd/data/template.omwgame
         ${CMAKE_CURRENT_BINARY_DIR}/data/template.omwgame
-        EXPECTED_MD5 bf3691034a38611534c74c3b89a7d2c3
+        EXPECTED_HASH SHA512=6e38642bcf013c5f496a9cb0bf3ec7c9553b6e86b836e7844824c5a05f556c9391167214469b6318401684b702d7569896bf743c85aee4198612b3315ba778d6
     )
 
     target_compile_definitions(openmw_test_suite
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index b4bfe2e3bd..5f4712ea3d 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -50,7 +50,7 @@ if(NOT OPENMW_USE_SYSTEM_BULLET)
     include(FetchContent)
     FetchContent_Declare(bullet
         URL https://github.com/bulletphysics/bullet3/archive/refs/tags/3.17.tar.gz
-        URL_HASH MD5=7711bce9a49c289a08ecda34eaa0f32e
+        URL_HASH SHA512=a5105bf5f1dd365a64a350755c7d2c97942f74897a18dcdb3651e6732fd55cc1030a096f5808cf50575281f05e3ac09aa50a48d271a47b94cd61f5167a72b7cc
         SOURCE_DIR fetched/bullet
     )
     FetchContent_MakeAvailableExcludeFromAll(bullet)
@@ -85,7 +85,7 @@ if(NOT OPENMW_USE_SYSTEM_MYGUI)
     include(FetchContent)
     FetchContent_Declare(mygui
         URL https://github.com/MyGUI/mygui/archive/59c1388b942721887d18743ada15f1906ff11a1f.zip
-        URL_HASH MD5=0a64c9cccc8f96dc8c08172175e68e1c
+        URL_HASH SHA512=56b112b261fdc4c9b782de8ef8a9d239af3a75b8cfaa617daecc77c38ecd6521624cf5c17e6ac839b0870be5c31608d4f2a1574165d9d049f14f9e6ae03a8f98
         SOURCE_DIR fetched/mygui
     )
     FetchContent_MakeAvailableExcludeFromAll(mygui)
@@ -151,7 +151,7 @@ if(NOT OPENMW_USE_SYSTEM_OSG)
     include(FetchContent)
     FetchContent_Declare(osg
         URL https://github.com/OpenMW/osg/archive/01cc2b585c8456a4ff843066b7e1a8715558289f.zip
-        URL_HASH MD5=f1496c5ce32f733581e84568cf2712af
+        URL_HASH SHA512=9b0a94c1c1d99c767f1857629d43c7a53bfcb74ef760993a121567831e168a1ebbfc10b0c67d7f2241c7b6c6dab2d0e6b876d9f17aca0fabe1a8c86b2279f956
         SOURCE_DIR fetched/osg
     )
     FetchContent_MakeAvailableExcludeFromAll(osg)
@@ -183,7 +183,7 @@ if(NOT OPENMW_USE_SYSTEM_RECASTNAVIGATION)
     include(FetchContent)
     FetchContent_Declare(recastnavigation
         URL https://github.com/recastnavigation/recastnavigation/archive/e75adf86f91eb3082220085e42dda62679f9a3ea.zip
-        URL_HASH MD5=af905d121ef9d1cdfa979b0495cba059
+        URL_HASH SHA512=93a19490cdfa55e98a6af9cc050e94af88fdb95fae2059ceeff28b62f3b48515f5fdd2c806c910550933b6861a4f6a91173ee0ed1b61c1396f7b34d4c78f0793
         SOURCE_DIR fetched/recastnavigation
     )
     FetchContent_MakeAvailableExcludeFromAll(recastnavigation)
@@ -193,7 +193,7 @@ if (NOT OPENMW_USE_SYSTEM_SQLITE3)
     include(FetchContent)
     FetchContent_Declare(sqlite3
         URL https://www.sqlite.org/2021/sqlite-amalgamation-3360000.zip
-        URL_HASH MD5=c5d360c74111bafae1b704721ff18fe6
+        URL_HASH SHA512=5c18f158a599b1e91d95c91de3aa5c5de52f986845ad0cb49dfd56b650587e55e24d469571b5b864229b870d0eaf85d78893f61ef950b95389cb41692be37f58
         SOURCE_DIR fetched/sqlite3
     )
     FetchContent_MakeAvailableExcludeFromAll(sqlite3)
@@ -221,7 +221,7 @@ if (BUILD_BENCHMARKS AND NOT OPENMW_USE_SYSTEM_BENCHMARK)
     include(FetchContent)
     FetchContent_Declare(benchmark
         URL https://github.com/google/benchmark/archive/refs/tags/v1.5.2.zip
-        URL_HASH MD5=49395b757a7c4656d70f1328d93efd00
+        URL_HASH SHA512=1146deca3b424703800933012ef75805d4657309d58b3484498bb51a99025bd405a69855a75af59c23fc3684bfa027224513999b8d7beaab3320c96fb6d6c540
         SOURCE_DIR fetched/benchmark
     )
     FetchContent_MakeAvailableExcludeFromAll(benchmark)

From 21e4c10fa940309282681be74fa9894652b6cdd4 Mon Sep 17 00:00:00 2001
From: Matt <3397065-ZehMatt@users.noreply.gitlab.com>
Date: Mon, 4 Apr 2022 13:56:19 +0000
Subject: [PATCH 2245/2859] Introduce IndexedVector

---
 apps/openmw/mwmechanics/actors.cpp            |  10 +-
 apps/openmw/mwmechanics/actors.hpp            |   3 +-
 apps/openmw/mwphysics/physicssystem.hpp       |   9 +-
 apps/openmw/mwworld/ptr.hpp                   |  15 ++
 apps/openmw_test_suite/CMakeLists.txt         |   1 +
 .../misc/test_indexedvector.cpp               |  88 +++++++++
 components/CMakeLists.txt                     |   2 +-
 components/misc/indexedvector.hpp             | 186 ++++++++++++++++++
 8 files changed, 305 insertions(+), 9 deletions(-)
 create mode 100644 apps/openmw_test_suite/misc/test_indexedvector.cpp
 create mode 100644 components/misc/indexedvector.hpp

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index a024507cf3..6c2354def2 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1057,9 +1057,11 @@ namespace MWMechanics
         MWRender::Animation *anim = MWBase::Environment::get().getWorld()->getAnimation(ptr);
         if (!anim)
             return;
-        mActors.emplace(ptr, new Actor(ptr, anim));
 
-        CharacterController* ctrl = mActors[ptr]->getCharacterController();
+        auto* newActor = new Actor(ptr, anim);
+        mActors.emplace(ptr, newActor);
+
+        CharacterController* ctrl = newActor->getCharacterController();
         if (updateImmediately)
             ctrl->update(0);
 
@@ -1160,7 +1162,7 @@ namespace MWMechanics
             mActors.erase(iter);
 
             actor->updatePtr(ptr);
-            mActors.insert(std::make_pair(ptr, actor));
+            mActors.emplace(ptr, actor);
         }
     }
 
@@ -1173,7 +1175,7 @@ namespace MWMechanics
             {
                 removeTemporaryEffects(iter->first);
                 delete iter->second;
-                mActors.erase(iter++);
+                iter = mActors.erase(iter);
             }
             else
                 ++iter;
diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index f1985377e8..e6ec6c1021 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -6,6 +6,7 @@
 #include <string>
 #include <list>
 #include <map>
+#include <components/misc/indexedvector.hpp>
 
 #include "../mwmechanics/actorutil.hpp"
 
@@ -62,7 +63,7 @@ namespace MWMechanics
             Actors();
             ~Actors();
 
-            typedef std::map<MWWorld::Ptr,Actor*> PtrActorMap;
+            using PtrActorMap = Misc::IndexedVector<MWWorld::Ptr, Actor*, MWWorld::PtrHash>;
 
             PtrActorMap::const_iterator begin() { return mActors.begin(); }
             PtrActorMap::const_iterator end() { return mActors.end(); }
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index b165f10761..30c1aa47c0 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -11,6 +11,8 @@
 #include <optional>
 #include <functional>
 
+#include <components/misc/indexedvector.hpp>
+
 #include <osg/Quat>
 #include <osg/BoundingBox>
 #include <osg/ref_ptr>
@@ -55,7 +57,7 @@ namespace MWPhysics
     class PhysicsTaskScheduler;
     class Projectile;
 
-    using ActorMap = std::unordered_map<const MWWorld::LiveCellRefBase*, std::shared_ptr<Actor>>;
+    using ActorMap = Misc::IndexedVector<const MWWorld::LiveCellRefBase*, std::shared_ptr<Actor>>;
 
     struct ContactPoint
     {
@@ -299,8 +301,9 @@ namespace MWPhysics
 
             using ObjectMap = std::unordered_map<const MWWorld::LiveCellRefBase*, std::shared_ptr<Object>>;
             ObjectMap mObjects;
-
-            std::map<Object*, bool> mAnimatedObjects; // stores pointers to elements in mObjects
+            
+            using AnimatedObjectMap = Misc::IndexedVector<Object*, bool>;
+            AnimatedObjectMap mAnimatedObjects; // stores pointers to elements in mObjects
 
             ActorMap mActors;
 
diff --git a/apps/openmw/mwworld/ptr.hpp b/apps/openmw/mwworld/ptr.hpp
index 33e062df90..911f62dac0 100644
--- a/apps/openmw/mwworld/ptr.hpp
+++ b/apps/openmw/mwworld/ptr.hpp
@@ -6,6 +6,7 @@
 #include <string>
 #include <string_view>
 #include <sstream>
+#include <functional>
 
 #include "livecellref.hpp"
 
@@ -161,6 +162,20 @@ namespace MWWorld
         ConstPtr(const LiveCellRefBase *liveCellRef=nullptr, const CellStoreType *cell=nullptr) : PtrBase(liveCellRef, cell, nullptr) {}
     };
 
+    struct PtrHash
+    {
+        size_t operator()(const Ptr& ptr) const noexcept
+        {
+            const void* p = ptr;
+            return std::hash<const void*>{}(p);
+        }
+        size_t operator()(const ConstPtr& ptr) const noexcept
+        {
+            const void* p = ptr;
+            return std::hash<const void*>{}(p);
+        }
+    };
+
 }
 
 #endif
diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index 767eebe6c8..943b430e21 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -30,6 +30,7 @@ if (GTEST_FOUND AND GMOCK_FOUND)
         misc/test_stringops.cpp
         misc/test_endianness.cpp
         misc/test_resourcehelpers.cpp
+        misc/test_indexedvector.cpp
         misc/progressreporter.cpp
         misc/compression.cpp
 
diff --git a/apps/openmw_test_suite/misc/test_indexedvector.cpp b/apps/openmw_test_suite/misc/test_indexedvector.cpp
new file mode 100644
index 0000000000..7039aed1fb
--- /dev/null
+++ b/apps/openmw_test_suite/misc/test_indexedvector.cpp
@@ -0,0 +1,88 @@
+#include <components/misc/indexedvector.hpp>
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+#include <cstdint>
+#include <vector>
+
+namespace
+{
+    TEST(IndexedVectorTests, basicInsert)
+    {
+        std::vector<std::pair<int, int>> vec;
+        Misc::IndexedVector<int, int> map;
+
+        for (int i = 0; i < 10000; i++)
+        {
+            vec.emplace_back(i, i << 13);
+            map.emplace(i, i << 13);
+        }
+
+        ASSERT_EQ(vec.size(), map.size());
+
+        auto itVec = vec.begin();
+        auto itMap = map.begin();
+        while (itMap != map.end() && itVec != vec.end())
+        {
+            ASSERT_EQ(itVec->first, itMap->first);
+            ASSERT_EQ(itVec->second, itMap->second);
+            itMap++;
+            itVec++;
+        }
+    }
+
+    TEST(IndexedVectorTests, duplicateInsert)
+    {
+        Misc::IndexedVector<int, int> map;
+
+        auto pairVal = map.emplace(1, 5);
+        ASSERT_EQ(map.size(), 1);
+        ASSERT_EQ(pairVal.first, map.begin());
+        ASSERT_EQ(pairVal.first->second, 5);
+        ASSERT_EQ(pairVal.second, true);
+
+        pairVal = map.emplace(1, 10);
+        ASSERT_EQ(map.size(), 1);
+        ASSERT_EQ(pairVal.first, map.begin());
+        ASSERT_EQ(pairVal.first->second, 5);
+        ASSERT_EQ(pairVal.second, false);
+    }
+
+    TEST(IndexedVectorTests, testErase)
+    {
+        Misc::IndexedVector<int, int> map;
+        for (int i = 0; i < 10000; i++)
+        {
+            map.emplace(i, i);
+        }
+
+        auto itA = map.find(100);
+        ASSERT_NE(itA, map.end());
+        ASSERT_EQ(itA->second, 100);
+
+        itA = map.erase(itA);
+        ASSERT_EQ(map.size(), 10000 - 1);
+        ASSERT_NE(itA, map.end());
+        ASSERT_EQ(itA->second, 101);
+    }
+
+    TEST(IndexedVectorTests, testLookup)
+    {
+        Misc::IndexedVector<int, int> map;
+        for (int i = 0; i < 10000; i++)
+        {
+            map.emplace(i, i);
+        }
+
+        auto itA = map.find(100);
+        ASSERT_NE(itA, map.end());
+        ASSERT_EQ(itA->second, 100);
+
+        map.erase(itA);
+        ASSERT_EQ(map.size(), 10000 - 1);
+        itA = map.find(101);
+        ASSERT_NE(itA, map.end());
+        ASSERT_EQ(itA->second, 101);
+    }
+}
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index efc80081e3..b9a5cfa2ee 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -189,7 +189,7 @@ add_component_dir (esm4
 
 add_component_dir (misc
     constants utf8stream stringops resourcehelpers rng messageformatparser weakcache thread
-    compression osguservalues errorMarker color
+    compression osguservalues errorMarker color indexedvector
     )
 
 add_component_dir (debug
diff --git a/components/misc/indexedvector.hpp b/components/misc/indexedvector.hpp
new file mode 100644
index 0000000000..9ade1e1e5e
--- /dev/null
+++ b/components/misc/indexedvector.hpp
@@ -0,0 +1,186 @@
+#ifndef OPENMW_COMPONENTS_FLATMAP_HPP
+#define OPENMW_COMPONENTS_FLATMAP_HPP
+
+#include <memory>
+#include <list>
+#include <unordered_map>
+#include <algorithm>
+#include <utility>
+
+namespace Misc
+{
+    /// \class IndexedVector
+    /// Works like std::unordered_map but storage is std::vector and uses insertion order.
+    template <typename Key, typename T, typename THasher = std::hash<Key>>
+    class IndexedVector
+    {
+        using ElementType = std::pair<Key, T>;
+
+    private:
+        using Storage = std::vector<ElementType>;
+        using LookupTable = std::unordered_map<Key, typename Storage::difference_type, THasher>;
+
+    public:
+        using iterator = typename Storage::iterator;
+        using const_iterator = typename Storage::const_iterator;
+        using value_type = typename Storage::value_type;
+
+        void clear()
+        {
+            mData.clear();
+            mLookup.clear();
+        }
+
+        size_t size() const noexcept
+        {
+            return mData.size();
+        }
+
+        /// Inserts the element at the back with move semantics.
+        std::pair<iterator, bool> insert(const value_type& value)
+        {
+            auto it = find(value.first);
+            if (it != std::end(mData))
+            {
+                return { it, false };
+            }
+            else
+            {
+                const auto& key = value.first;
+                it = mData.emplace(std::end(mData), value);
+                mLookup.emplace(key, std::distance(std::begin(mData), it));
+                return { it, true };
+            }
+        }
+
+        std::pair<iterator, bool> insert(value_type&& value)
+        {
+            auto it = find(value.first);
+            if (it != std::end(mData))
+            {
+                return { it, false };
+            }
+            else
+            {
+                const auto& key = value.first;
+                it = mData.emplace(std::end(mData), std::move(value));
+                mLookup.emplace(key, std::distance(std::begin(mData), it));
+                return { it, true };
+            }
+        }
+
+        /// Inserts the element at the back
+        template<typename ...TArgs>
+        std::pair<iterator, bool> emplace(TArgs&& ...args)
+        {
+            value_type value{ std::forward<TArgs>(args)... };
+            auto it = find(value.first);
+            if (it != std::end(mData))
+            {
+                return { it, false };
+            }
+            else
+            {
+                const auto& key = value.first;
+                it = mData.emplace(std::end(mData), std::move(value));
+                mLookup.emplace(key, std::distance(std::begin(mData), it));
+                return { it, true };
+            }
+        }
+
+        /// Erases a single element, iterators are invalidated after this call.
+        /// The returned iterator points to the value after the removed element.
+        iterator erase(iterator it) noexcept
+        {
+            return eraseImpl(it);
+        }
+
+        iterator erase(const_iterator it) noexcept
+        {
+            return eraseImpl(it);
+        }
+
+        /// Erases a single element by key, iterators are invalidated after this call.
+        /// The returned iterator points to the value after the removed element.
+        iterator erase(const Key& key) noexcept
+        {
+            auto it = find(key);
+            if (it == end())
+                return it;
+            return erase(it);
+        }
+
+        template<class K>
+        iterator find(const K& key)
+        {
+            auto it = mLookup.find(key);
+            if (it == std::end(mLookup))
+                return end();
+            return std::begin(mData) + it->second;
+        }
+
+        template<class K>
+        const_iterator find(const K& key) const
+        {
+            auto it = mLookup.find(key);
+            if (it == std::end(mLookup))
+                return end();
+            return std::begin(mData) + it->second;
+        }
+
+        iterator begin()
+        {
+            return mData.begin();
+        }
+
+        const_iterator begin() const
+        {
+            return mData.begin();
+        }
+
+        const_iterator cbegin() const
+        {
+            return mData.cbegin();
+        }
+
+        iterator end()
+        {
+            return mData.end();
+        }
+
+        const_iterator end() const
+        {
+            return mData.end();
+        }
+
+        const_iterator cend() const
+        {
+            return mData.cend();
+        }
+
+    private:
+        template<typename TIterator>
+        iterator eraseImpl(TIterator&& it) noexcept
+        {
+            const auto lookupIt = mLookup.find(it->first);
+            if (lookupIt == std::end(mLookup))
+                return end();
+            const auto index = lookupIt->second;
+            mLookup.erase(lookupIt);
+            // Adjust indices by one.
+            for (auto& [_, idx] : mLookup)
+            {
+                if (idx > index)
+                    idx--;
+            }
+            return mData.erase(it);
+        }
+
+    private:
+        Storage mData;
+        LookupTable mLookup;
+    };
+
+}
+
+#endif

From 49e21e121ab8d6200a0f0a4d3c5b6425a0485d2e Mon Sep 17 00:00:00 2001
From: Matt <3397065-ZehMatt@users.noreply.gitlab.com>
Date: Mon, 4 Apr 2022 17:09:52 +0000
Subject: [PATCH 2246/2859] Revert "Merge branch 'refactor/6677-2' into
 'master'"

This reverts merge request !1733
---
 apps/openmw/mwmechanics/actors.cpp            |  10 +-
 apps/openmw/mwmechanics/actors.hpp            |   3 +-
 apps/openmw/mwphysics/physicssystem.hpp       |   9 +-
 apps/openmw/mwworld/ptr.hpp                   |  15 --
 apps/openmw_test_suite/CMakeLists.txt         |   1 -
 .../misc/test_indexedvector.cpp               |  88 ---------
 components/CMakeLists.txt                     |   2 +-
 components/misc/indexedvector.hpp             | 186 ------------------
 8 files changed, 9 insertions(+), 305 deletions(-)
 delete mode 100644 apps/openmw_test_suite/misc/test_indexedvector.cpp
 delete mode 100644 components/misc/indexedvector.hpp

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 6c2354def2..a024507cf3 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1057,11 +1057,9 @@ namespace MWMechanics
         MWRender::Animation *anim = MWBase::Environment::get().getWorld()->getAnimation(ptr);
         if (!anim)
             return;
+        mActors.emplace(ptr, new Actor(ptr, anim));
 
-        auto* newActor = new Actor(ptr, anim);
-        mActors.emplace(ptr, newActor);
-
-        CharacterController* ctrl = newActor->getCharacterController();
+        CharacterController* ctrl = mActors[ptr]->getCharacterController();
         if (updateImmediately)
             ctrl->update(0);
 
@@ -1162,7 +1160,7 @@ namespace MWMechanics
             mActors.erase(iter);
 
             actor->updatePtr(ptr);
-            mActors.emplace(ptr, actor);
+            mActors.insert(std::make_pair(ptr, actor));
         }
     }
 
@@ -1175,7 +1173,7 @@ namespace MWMechanics
             {
                 removeTemporaryEffects(iter->first);
                 delete iter->second;
-                iter = mActors.erase(iter);
+                mActors.erase(iter++);
             }
             else
                 ++iter;
diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index e6ec6c1021..f1985377e8 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -6,7 +6,6 @@
 #include <string>
 #include <list>
 #include <map>
-#include <components/misc/indexedvector.hpp>
 
 #include "../mwmechanics/actorutil.hpp"
 
@@ -63,7 +62,7 @@ namespace MWMechanics
             Actors();
             ~Actors();
 
-            using PtrActorMap = Misc::IndexedVector<MWWorld::Ptr, Actor*, MWWorld::PtrHash>;
+            typedef std::map<MWWorld::Ptr,Actor*> PtrActorMap;
 
             PtrActorMap::const_iterator begin() { return mActors.begin(); }
             PtrActorMap::const_iterator end() { return mActors.end(); }
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 30c1aa47c0..b165f10761 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -11,8 +11,6 @@
 #include <optional>
 #include <functional>
 
-#include <components/misc/indexedvector.hpp>
-
 #include <osg/Quat>
 #include <osg/BoundingBox>
 #include <osg/ref_ptr>
@@ -57,7 +55,7 @@ namespace MWPhysics
     class PhysicsTaskScheduler;
     class Projectile;
 
-    using ActorMap = Misc::IndexedVector<const MWWorld::LiveCellRefBase*, std::shared_ptr<Actor>>;
+    using ActorMap = std::unordered_map<const MWWorld::LiveCellRefBase*, std::shared_ptr<Actor>>;
 
     struct ContactPoint
     {
@@ -301,9 +299,8 @@ namespace MWPhysics
 
             using ObjectMap = std::unordered_map<const MWWorld::LiveCellRefBase*, std::shared_ptr<Object>>;
             ObjectMap mObjects;
-            
-            using AnimatedObjectMap = Misc::IndexedVector<Object*, bool>;
-            AnimatedObjectMap mAnimatedObjects; // stores pointers to elements in mObjects
+
+            std::map<Object*, bool> mAnimatedObjects; // stores pointers to elements in mObjects
 
             ActorMap mActors;
 
diff --git a/apps/openmw/mwworld/ptr.hpp b/apps/openmw/mwworld/ptr.hpp
index 911f62dac0..33e062df90 100644
--- a/apps/openmw/mwworld/ptr.hpp
+++ b/apps/openmw/mwworld/ptr.hpp
@@ -6,7 +6,6 @@
 #include <string>
 #include <string_view>
 #include <sstream>
-#include <functional>
 
 #include "livecellref.hpp"
 
@@ -162,20 +161,6 @@ namespace MWWorld
         ConstPtr(const LiveCellRefBase *liveCellRef=nullptr, const CellStoreType *cell=nullptr) : PtrBase(liveCellRef, cell, nullptr) {}
     };
 
-    struct PtrHash
-    {
-        size_t operator()(const Ptr& ptr) const noexcept
-        {
-            const void* p = ptr;
-            return std::hash<const void*>{}(p);
-        }
-        size_t operator()(const ConstPtr& ptr) const noexcept
-        {
-            const void* p = ptr;
-            return std::hash<const void*>{}(p);
-        }
-    };
-
 }
 
 #endif
diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index 3f3a134b45..854526dc8c 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -30,7 +30,6 @@ if (GTEST_FOUND AND GMOCK_FOUND)
         misc/test_stringops.cpp
         misc/test_endianness.cpp
         misc/test_resourcehelpers.cpp
-        misc/test_indexedvector.cpp
         misc/progressreporter.cpp
         misc/compression.cpp
 
diff --git a/apps/openmw_test_suite/misc/test_indexedvector.cpp b/apps/openmw_test_suite/misc/test_indexedvector.cpp
deleted file mode 100644
index 7039aed1fb..0000000000
--- a/apps/openmw_test_suite/misc/test_indexedvector.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-#include <components/misc/indexedvector.hpp>
-
-#include <gtest/gtest.h>
-#include <gmock/gmock.h>
-
-#include <cstdint>
-#include <vector>
-
-namespace
-{
-    TEST(IndexedVectorTests, basicInsert)
-    {
-        std::vector<std::pair<int, int>> vec;
-        Misc::IndexedVector<int, int> map;
-
-        for (int i = 0; i < 10000; i++)
-        {
-            vec.emplace_back(i, i << 13);
-            map.emplace(i, i << 13);
-        }
-
-        ASSERT_EQ(vec.size(), map.size());
-
-        auto itVec = vec.begin();
-        auto itMap = map.begin();
-        while (itMap != map.end() && itVec != vec.end())
-        {
-            ASSERT_EQ(itVec->first, itMap->first);
-            ASSERT_EQ(itVec->second, itMap->second);
-            itMap++;
-            itVec++;
-        }
-    }
-
-    TEST(IndexedVectorTests, duplicateInsert)
-    {
-        Misc::IndexedVector<int, int> map;
-
-        auto pairVal = map.emplace(1, 5);
-        ASSERT_EQ(map.size(), 1);
-        ASSERT_EQ(pairVal.first, map.begin());
-        ASSERT_EQ(pairVal.first->second, 5);
-        ASSERT_EQ(pairVal.second, true);
-
-        pairVal = map.emplace(1, 10);
-        ASSERT_EQ(map.size(), 1);
-        ASSERT_EQ(pairVal.first, map.begin());
-        ASSERT_EQ(pairVal.first->second, 5);
-        ASSERT_EQ(pairVal.second, false);
-    }
-
-    TEST(IndexedVectorTests, testErase)
-    {
-        Misc::IndexedVector<int, int> map;
-        for (int i = 0; i < 10000; i++)
-        {
-            map.emplace(i, i);
-        }
-
-        auto itA = map.find(100);
-        ASSERT_NE(itA, map.end());
-        ASSERT_EQ(itA->second, 100);
-
-        itA = map.erase(itA);
-        ASSERT_EQ(map.size(), 10000 - 1);
-        ASSERT_NE(itA, map.end());
-        ASSERT_EQ(itA->second, 101);
-    }
-
-    TEST(IndexedVectorTests, testLookup)
-    {
-        Misc::IndexedVector<int, int> map;
-        for (int i = 0; i < 10000; i++)
-        {
-            map.emplace(i, i);
-        }
-
-        auto itA = map.find(100);
-        ASSERT_NE(itA, map.end());
-        ASSERT_EQ(itA->second, 100);
-
-        map.erase(itA);
-        ASSERT_EQ(map.size(), 10000 - 1);
-        itA = map.find(101);
-        ASSERT_NE(itA, map.end());
-        ASSERT_EQ(itA->second, 101);
-    }
-}
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index b9a5cfa2ee..efc80081e3 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -189,7 +189,7 @@ add_component_dir (esm4
 
 add_component_dir (misc
     constants utf8stream stringops resourcehelpers rng messageformatparser weakcache thread
-    compression osguservalues errorMarker color indexedvector
+    compression osguservalues errorMarker color
     )
 
 add_component_dir (debug
diff --git a/components/misc/indexedvector.hpp b/components/misc/indexedvector.hpp
deleted file mode 100644
index 9ade1e1e5e..0000000000
--- a/components/misc/indexedvector.hpp
+++ /dev/null
@@ -1,186 +0,0 @@
-#ifndef OPENMW_COMPONENTS_FLATMAP_HPP
-#define OPENMW_COMPONENTS_FLATMAP_HPP
-
-#include <memory>
-#include <list>
-#include <unordered_map>
-#include <algorithm>
-#include <utility>
-
-namespace Misc
-{
-    /// \class IndexedVector
-    /// Works like std::unordered_map but storage is std::vector and uses insertion order.
-    template <typename Key, typename T, typename THasher = std::hash<Key>>
-    class IndexedVector
-    {
-        using ElementType = std::pair<Key, T>;
-
-    private:
-        using Storage = std::vector<ElementType>;
-        using LookupTable = std::unordered_map<Key, typename Storage::difference_type, THasher>;
-
-    public:
-        using iterator = typename Storage::iterator;
-        using const_iterator = typename Storage::const_iterator;
-        using value_type = typename Storage::value_type;
-
-        void clear()
-        {
-            mData.clear();
-            mLookup.clear();
-        }
-
-        size_t size() const noexcept
-        {
-            return mData.size();
-        }
-
-        /// Inserts the element at the back with move semantics.
-        std::pair<iterator, bool> insert(const value_type& value)
-        {
-            auto it = find(value.first);
-            if (it != std::end(mData))
-            {
-                return { it, false };
-            }
-            else
-            {
-                const auto& key = value.first;
-                it = mData.emplace(std::end(mData), value);
-                mLookup.emplace(key, std::distance(std::begin(mData), it));
-                return { it, true };
-            }
-        }
-
-        std::pair<iterator, bool> insert(value_type&& value)
-        {
-            auto it = find(value.first);
-            if (it != std::end(mData))
-            {
-                return { it, false };
-            }
-            else
-            {
-                const auto& key = value.first;
-                it = mData.emplace(std::end(mData), std::move(value));
-                mLookup.emplace(key, std::distance(std::begin(mData), it));
-                return { it, true };
-            }
-        }
-
-        /// Inserts the element at the back
-        template<typename ...TArgs>
-        std::pair<iterator, bool> emplace(TArgs&& ...args)
-        {
-            value_type value{ std::forward<TArgs>(args)... };
-            auto it = find(value.first);
-            if (it != std::end(mData))
-            {
-                return { it, false };
-            }
-            else
-            {
-                const auto& key = value.first;
-                it = mData.emplace(std::end(mData), std::move(value));
-                mLookup.emplace(key, std::distance(std::begin(mData), it));
-                return { it, true };
-            }
-        }
-
-        /// Erases a single element, iterators are invalidated after this call.
-        /// The returned iterator points to the value after the removed element.
-        iterator erase(iterator it) noexcept
-        {
-            return eraseImpl(it);
-        }
-
-        iterator erase(const_iterator it) noexcept
-        {
-            return eraseImpl(it);
-        }
-
-        /// Erases a single element by key, iterators are invalidated after this call.
-        /// The returned iterator points to the value after the removed element.
-        iterator erase(const Key& key) noexcept
-        {
-            auto it = find(key);
-            if (it == end())
-                return it;
-            return erase(it);
-        }
-
-        template<class K>
-        iterator find(const K& key)
-        {
-            auto it = mLookup.find(key);
-            if (it == std::end(mLookup))
-                return end();
-            return std::begin(mData) + it->second;
-        }
-
-        template<class K>
-        const_iterator find(const K& key) const
-        {
-            auto it = mLookup.find(key);
-            if (it == std::end(mLookup))
-                return end();
-            return std::begin(mData) + it->second;
-        }
-
-        iterator begin()
-        {
-            return mData.begin();
-        }
-
-        const_iterator begin() const
-        {
-            return mData.begin();
-        }
-
-        const_iterator cbegin() const
-        {
-            return mData.cbegin();
-        }
-
-        iterator end()
-        {
-            return mData.end();
-        }
-
-        const_iterator end() const
-        {
-            return mData.end();
-        }
-
-        const_iterator cend() const
-        {
-            return mData.cend();
-        }
-
-    private:
-        template<typename TIterator>
-        iterator eraseImpl(TIterator&& it) noexcept
-        {
-            const auto lookupIt = mLookup.find(it->first);
-            if (lookupIt == std::end(mLookup))
-                return end();
-            const auto index = lookupIt->second;
-            mLookup.erase(lookupIt);
-            // Adjust indices by one.
-            for (auto& [_, idx] : mLookup)
-            {
-                if (idx > index)
-                    idx--;
-            }
-            return mData.erase(it);
-        }
-
-    private:
-        Storage mData;
-        LookupTable mLookup;
-    };
-
-}
-
-#endif

From 788745e0047aa6b50b02003866f839ea70b11e8d Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Mon, 4 Apr 2022 23:10:03 +0200
Subject: [PATCH 2247/2859] Make coordinate calculation more robust, implement
 Flex widget type

---
 components/CMakeLists.txt       |   2 +-
 components/lua_ui/alignment.cpp |   4 +-
 components/lua_ui/container.cpp |   2 +-
 components/lua_ui/element.cpp   |   2 +-
 components/lua_ui/flex.cpp      | 106 ++++++++++++++++++++++++++++++++
 components/lua_ui/flex.hpp      |  27 ++++++++
 components/lua_ui/util.cpp      |   5 +-
 components/lua_ui/widget.cpp    |  34 +++++++---
 components/lua_ui/widget.hpp    |  14 +++--
 components/lua_ui/window.cpp    |  10 +--
 10 files changed, 181 insertions(+), 25 deletions(-)
 create mode 100644 components/lua_ui/flex.cpp
 create mode 100644 components/lua_ui/flex.hpp

diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index efc80081e3..96e64459db 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -256,7 +256,7 @@ add_component_dir (fallback
 add_component_dir (lua_ui
     registerscriptsettings scriptsettings
     properties widget element util layers content alignment resources
-    adapter text textedit window image container
+    adapter text textedit window image container flex
     )
 
 
diff --git a/components/lua_ui/alignment.cpp b/components/lua_ui/alignment.cpp
index dfd09b752d..358c5ba14b 100644
--- a/components/lua_ui/alignment.cpp
+++ b/components/lua_ui/alignment.cpp
@@ -9,9 +9,9 @@ namespace LuaUi
             align |= MyGUI::Align::Left;
         if (horizontal == Alignment::End)
             align |= MyGUI::Align::Right;
-        if (horizontal == Alignment::Start)
+        if (vertical == Alignment::Start)
             align |= MyGUI::Align::Top;
-        if (horizontal == Alignment::End)
+        if (vertical == Alignment::End)
             align |= MyGUI::Align::Bottom;
         return align;
     }
diff --git a/components/lua_ui/container.cpp b/components/lua_ui/container.cpp
index 867378744b..11b9c1b360 100644
--- a/components/lua_ui/container.cpp
+++ b/components/lua_ui/container.cpp
@@ -29,7 +29,7 @@ namespace LuaUi
             size.width = std::max(size.width, coord.left + coord.width);
             size.height = std::max(size.height, coord.top + coord.height);
         }
-        setForcedSize(size);
+        forceSize(size);
         updateCoord();
     }
 }
diff --git a/components/lua_ui/element.cpp b/components/lua_ui/element.cpp
index 47dd0a3d38..a939ccdc51 100644
--- a/components/lua_ui/element.cpp
+++ b/components/lua_ui/element.cpp
@@ -136,8 +136,8 @@ namespace LuaUi
         setTemplate(ext, layout.get<sol::object>(LayoutKeys::templateLayout));
         ext->setProperties(layout.get<sol::object>(LayoutKeys::props));
         setEventCallbacks(ext, layout.get<sol::object>(LayoutKeys::events));
-
         ext->setChildren(updateContent(ext->children(), layout.get<sol::object>(LayoutKeys::content)));
+        ext->updateCoord();
     }
 
     std::string setLayer(WidgetExtension* ext, const sol::table& layout)
diff --git a/components/lua_ui/flex.cpp b/components/lua_ui/flex.cpp
new file mode 100644
index 0000000000..bbbf70cb98
--- /dev/null
+++ b/components/lua_ui/flex.cpp
@@ -0,0 +1,106 @@
+#include "flex.hpp"
+
+namespace LuaUi
+{
+    void LuaFlex::updateProperties()
+    {
+        mHorizontal = propertyValue("horizontal", false);
+        mAutoSized = propertyValue("autoSize", true);
+        mAlign = propertyValue("align", Alignment::Start);
+        mArrange = propertyValue("arrange", Alignment::Start);
+        WidgetExtension::updateProperties();
+    }
+
+    namespace
+    {
+        MyGUI::IntPoint alignSize(const MyGUI::IntSize& container, const MyGUI::IntSize& content, Alignment alignment)
+        {
+            MyGUI::IntPoint alignedPosition;
+            {
+                MyGUI::IntSize alignSize = container;
+                switch (alignment)
+                {
+                case Alignment::Start:
+                    alignedPosition = MyGUI::IntPoint(0, 0);
+                    break;
+                case Alignment::Center:
+                    alignSize -= content;
+                    alignedPosition = { alignSize.width / 2, alignSize.height / 2 };
+                    break;
+                case Alignment::End:
+                    alignSize -= content;
+                    alignedPosition = { alignSize.width, alignSize.height };
+                    break;
+                }
+            }
+            return alignedPosition;
+        }
+    }
+
+    void LuaFlex::updateChildren()
+    {
+        float totalGrow = 0;
+        MyGUI::IntSize childrenSize;
+        for (auto* w: children())
+        {
+            w->clearForced();
+            childrenSize += w->calculateSize();
+            totalGrow += w->externalValue("grow", 0.0f);
+        }
+        mChildrenSize = childrenSize;
+
+        MyGUI::IntSize flexSize = calculateSize();
+        MyGUI::IntSize growSize;
+        MyGUI::FloatSize growFactor;
+        if (totalGrow > 0)
+        {
+            growSize = flexSize - childrenSize;
+            growFactor = { growSize.width / totalGrow, growSize.height / totalGrow };
+        }
+        if (mHorizontal)
+            flexSize.width -= growSize.width;
+        else
+            flexSize.height-= growSize.height;
+
+        MyGUI::IntPoint alignedPosition = alignSize(flexSize, childrenSize, mAlign);
+        MyGUI::IntPoint arrangedPosition = alignSize(flexSize, childrenSize, mArrange);
+        MyGUI::IntPoint childPosition;
+        if (mHorizontal)
+            childPosition = { alignedPosition.left, arrangedPosition.top };
+        else
+            childPosition = { arrangedPosition.left, alignedPosition.top };
+        for (auto* w : children())
+        {
+            w->forcePosition(childPosition);
+            float grow = w->externalValue("grow", 0);
+            MyGUI::IntSize growth(growFactor.width * grow, growFactor.height * grow);
+            if (mHorizontal)
+            {
+                int width = w->widget()->getWidth();
+                width += growth.width;
+                w->forceSize({width, w->widget()->getHeight()});
+                childPosition.left += width;
+            }
+            else
+            {
+                int height = w->widget()->getHeight();
+                height += growth.height;
+                w->forceSize({ w->widget()->getWidth(), height });
+                childPosition.top += height;
+            }
+        }
+        WidgetExtension::updateProperties();
+    }
+
+    MyGUI::IntSize LuaFlex::calculateSize()
+    {
+        MyGUI::IntSize size = WidgetExtension::calculateSize();
+        if (mAutoSized) {
+            if (mHorizontal)
+                size.width = mChildrenSize.width;
+            else
+                size.height = mChildrenSize.height;
+        }
+        return size;
+    }
+}
diff --git a/components/lua_ui/flex.hpp b/components/lua_ui/flex.hpp
new file mode 100644
index 0000000000..6cff6f0695
--- /dev/null
+++ b/components/lua_ui/flex.hpp
@@ -0,0 +1,27 @@
+#ifndef OPENMW_LUAUI_FLEX
+#define OPENMW_LUAUI_FLEX
+
+#include "widget.hpp"
+#include "alignment.hpp"
+
+namespace LuaUi
+{
+    class LuaFlex : public MyGUI::Widget, public WidgetExtension
+    {
+        MYGUI_RTTI_DERIVED(LuaFlex)
+
+        protected:
+            MyGUI::IntSize calculateSize() override;
+            void updateProperties() override;
+            void updateChildren() override;
+
+        private:
+            bool mHorizontal;
+            bool mAutoSized;
+            MyGUI::IntSize mChildrenSize;
+            Alignment mAlign;
+            Alignment mArrange;
+    };
+}
+
+#endif // OPENMW_LUAUI_FLEX
diff --git a/components/lua_ui/util.cpp b/components/lua_ui/util.cpp
index cd2cb2c077..d7e7390647 100644
--- a/components/lua_ui/util.cpp
+++ b/components/lua_ui/util.cpp
@@ -9,6 +9,7 @@
 #include "window.hpp"
 #include "image.hpp"
 #include "container.hpp"
+#include "flex.hpp"
 
 #include "element.hpp"
 #include "registerscriptsettings.hpp"
@@ -24,8 +25,9 @@ namespace LuaUi
         MyGUI::FactoryManager::getInstance().registerFactory<LuaTextEdit>("Widget");
         MyGUI::FactoryManager::getInstance().registerFactory<LuaWindow>("Widget");
         MyGUI::FactoryManager::getInstance().registerFactory<LuaImage>("Widget");
-        MyGUI::FactoryManager::getInstance().registerFactory<LuaContainer>("Widget");
         MyGUI::FactoryManager::getInstance().registerFactory<LuaTileRect>("BasisSkin");
+        MyGUI::FactoryManager::getInstance().registerFactory<LuaContainer>("Widget");
+        MyGUI::FactoryManager::getInstance().registerFactory<LuaFlex>("Widget");
     }
 
     const std::unordered_map<std::string, std::string>& widgetTypeToName()
@@ -36,6 +38,7 @@ namespace LuaUi
             { "LuaTextEdit", "TextEdit" },
             { "LuaWindow", "Window" },
             { "LuaImage", "Image" },
+            { "LuaFlex", "Flex" },
         };
         return types;
     }
diff --git a/components/lua_ui/widget.cpp b/components/lua_ui/widget.cpp
index 74ac8640e0..87b1636d74 100644
--- a/components/lua_ui/widget.cpp
+++ b/components/lua_ui/widget.cpp
@@ -10,7 +10,9 @@
 namespace LuaUi
 {
     WidgetExtension::WidgetExtension()
-        : mPropagateEvents(true)
+        : mForcePosition(false)
+        , mForceSize(false)
+        , mPropagateEvents(true)
         , mLua(nullptr)
         , mWidget(nullptr)
         , mSlot(this)
@@ -85,7 +87,6 @@ namespace LuaUi
         ext->mParent = this;
         ext->mTemplateChild = false;
         ext->widget()->attachToWidget(mSlot->widget());
-        ext->updateCoord();
     }
 
     void WidgetExtension::attachTemplate(WidgetExtension* ext)
@@ -93,7 +94,6 @@ namespace LuaUi
         ext->mParent = this;
         ext->mTemplateChild = true;
         ext->widget()->attachToWidget(widget());
-        ext->updateCoord();
     }
 
     WidgetExtension* WidgetExtension::findDeep(std::string_view flagName)
@@ -219,16 +219,30 @@ namespace LuaUi
         return mForcedCoord;
     }
 
-    void WidgetExtension::setForcedCoord(const MyGUI::IntCoord& offset)
+    void WidgetExtension::forceCoord(const MyGUI::IntCoord& offset)
     {
+        mForcePosition = true;
+        mForceSize = true;
         mForcedCoord = offset;
     }
 
-    void WidgetExtension::setForcedSize(const MyGUI::IntSize& size)
+    void WidgetExtension::forcePosition(const MyGUI::IntPoint& pos)
     {
+        mForcePosition = true;
+        mForcedCoord = pos;
+    }
+
+    void WidgetExtension::forceSize(const MyGUI::IntSize& size)
+    {
+        mForceSize = true;
         mForcedCoord = size;
     }
 
+    void WidgetExtension::clearForced() {
+        mForcePosition = false;
+        mForceSize = false;
+    }
+
     void WidgetExtension::updateCoord()
     {
         MyGUI::IntCoord oldCoord = mWidget->getCoord();
@@ -246,7 +260,6 @@ namespace LuaUi
     {
         mProperties = props;
         updateProperties();
-        updateCoord();
     }
 
     void WidgetExtension::updateProperties()
@@ -281,9 +294,12 @@ namespace LuaUi
 
     MyGUI::IntSize WidgetExtension::calculateSize()
     {
+        if (mForceSize)
+            return mForcedCoord.size();
+
         MyGUI::IntSize pSize = parentSize();
         MyGUI::IntSize newSize;
-        newSize = mAbsoluteCoord.size() + mForcedCoord.size();
+        newSize = mAbsoluteCoord.size();
         newSize.width += mRelativeCoord.width * pSize.width;
         newSize.height += mRelativeCoord.height * pSize.height;
         return newSize;
@@ -291,9 +307,11 @@ namespace LuaUi
 
     MyGUI::IntPoint WidgetExtension::calculatePosition(const MyGUI::IntSize& size)
     {
+        if (mForcePosition)
+            return mForcedCoord.point();
         MyGUI::IntSize pSize = parentSize();
         MyGUI::IntPoint newPosition;
-        newPosition = mAbsoluteCoord.point() + mForcedCoord.point();
+        newPosition = mAbsoluteCoord.point();
         newPosition.left += mRelativeCoord.left * pSize.width - mAnchor.width * size.width;
         newPosition.top += mRelativeCoord.top * pSize.height - mAnchor.height * size.height;
         return newPosition;
diff --git a/components/lua_ui/widget.hpp b/components/lua_ui/widget.hpp
index c712d18ccd..33bf52cd78 100644
--- a/components/lua_ui/widget.hpp
+++ b/components/lua_ui/widget.hpp
@@ -47,8 +47,11 @@ namespace LuaUi
         void setExternal(sol::object external) { mExternal = external; }
 
         MyGUI::IntCoord forcedCoord();
-        void setForcedCoord(const MyGUI::IntCoord& offset);
-        void setForcedSize(const MyGUI::IntSize& size);
+        void forceCoord(const MyGUI::IntCoord& offset);
+        void forceSize(const MyGUI::IntSize& size);
+        void forcePosition(const MyGUI::IntPoint& pos);
+        void clearForced();
+
         void updateCoord();
 
         const sol::table& getLayout() { return mLayout; }
@@ -65,6 +68,9 @@ namespace LuaUi
             mOnCoordChange = callback;
         }
 
+        virtual MyGUI::IntSize calculateSize();
+        virtual MyGUI::IntPoint calculatePosition(const MyGUI::IntSize& size);
+
     protected:
         virtual void initialize();
         sol::table makeTable() const;
@@ -72,8 +78,6 @@ namespace LuaUi
         sol::object mouseEvent(int left, int top, MyGUI::MouseButton button) const;
 
         MyGUI::IntSize parentSize();
-        virtual MyGUI::IntSize calculateSize();
-        virtual MyGUI::IntPoint calculatePosition(const MyGUI::IntSize& size);
         MyGUI::IntCoord calculateCoord();
         virtual MyGUI::IntSize childScalingSize();
 
@@ -113,6 +117,8 @@ namespace LuaUi
             }
         }
 
+        bool mForcePosition;
+        bool mForceSize;
         // offsets the position and size, used only in C++ widget code
         MyGUI::IntCoord mForcedCoord;
         // position and size in pixels
diff --git a/components/lua_ui/window.cpp b/components/lua_ui/window.cpp
index 41281208d4..a9fff5ff47 100644
--- a/components/lua_ui/window.cpp
+++ b/components/lua_ui/window.cpp
@@ -39,8 +39,7 @@ namespace LuaUi
         if (mCaption)
             mCaption->setCaption(propertyValue("caption", std::string()));
         mMoveResize = MyGUI::IntCoord();
-        setForcedCoord(mMoveResize);
-
+        clearForced();
         WidgetExtension::updateProperties();
     }
 
@@ -70,11 +69,8 @@ namespace LuaUi
         change.width *= (left - mPreviousMouse.left);
         change.height *= (top - mPreviousMouse.top);
 
-        mMoveResize = mMoveResize + change.size();
-        setForcedCoord(mMoveResize);
-        // position can change based on size changes
-        mMoveResize = mMoveResize + change.point() + getPosition() - calculateCoord().point();
-        setForcedCoord(mMoveResize);
+        mMoveResize = mMoveResize + change;
+        forceCoord(mMoveResize);
         updateCoord();
 
         mPreviousMouse.left = left;

From 9d8f6064a171aaeb908913706db05b3d28a68b2f Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sun, 3 Apr 2022 22:35:29 +0300
Subject: [PATCH 2248/2859] Detail the unused parts of controlled.cpp defs

---
 components/nif/controlled.cpp | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/components/nif/controlled.cpp b/components/nif/controlled.cpp
index c8116ce74e..73359aeb2a 100644
--- a/components/nif/controlled.cpp
+++ b/components/nif/controlled.cpp
@@ -34,11 +34,12 @@ namespace Nif
         mipmap = nif->getUInt();
         alpha = nif->getUInt();
 
-        nif->getChar(); // always 1
+        // Renderer hints, typically of no use for us
+        /* bool mIsStatic = */nif->getChar();
         if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,103))
-            nif->getBoolean(); // Direct rendering
+            /* bool mDirectRendering = */nif->getBoolean();
         if (nif->getVersion() >= NIFStream::generateVersion(20,2,0,4))
-            nif->getBoolean(); // NiPersistentSrcTextureRendererData is used instead of NiPixelData
+            /* bool mPersistRenderData = */nif->getBoolean();
     }
 
     void NiSourceTexture::post(NIFFile *nif)
@@ -99,22 +100,21 @@ namespace Nif
         NiParticleModifier::read(nif);
 
         mBounceFactor = nif->getFloat();
-        if (nif->getVersion() >= NIFStream::generateVersion(4,2,2,0))
+        if (nif->getVersion() >= NIFStream::generateVersion(4,2,0,2))
         {
             // Unused in NifSkope. Need to figure out what these do.
-            /*bool spawnOnCollision = */nif->getBoolean();
-            /*bool dieOnCollision = */nif->getBoolean();
+            /*bool mSpawnOnCollision = */nif->getBoolean();
+            /*bool mDieOnCollision = */nif->getBoolean();
         }
     }
 
     void NiPlanarCollider::read(NIFStream *nif)
     {
         NiParticleCollider::read(nif);
-
-        /*unknown*/nif->getFloat();
-
-        for (int i=0;i<10;++i)
-            /*unknown*/nif->getFloat();
+        /* osg::Vec2f mExtents = */nif->getVector2();
+        /* osg::Vec3f mPosition = */nif->getVector3();
+        /* osg::Vec3f mXVector = */nif->getVector3();
+        /* osg::Vec3f mYVector = */nif->getVector3();
 
         mPlaneNormal = nif->getVector3();
         mPlaneDistance = nif->getFloat();
@@ -124,12 +124,9 @@ namespace Nif
     {
         NiParticleModifier::read(nif);
 
-        /*
-           byte (0 or 1)
-           float (1)
-           float*3
-        */
-        nif->skip(17);
+        /* bool mRandomInitialAxis = */nif->getChar();
+        /* osg::Vec3f mInitialAxis = */nif->getVector3();
+        /* float mRotationSpeed = */nif->getFloat();
     }
 
     void NiSphericalCollider::read(NIFStream* nif)

From c28f997c8723cdf0ae561f205229e5b4d2fcf7fe Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Sun, 3 Apr 2022 23:05:01 +0300
Subject: [PATCH 2249/2859] Make NiPlanarCollider finite-size

---
 components/nif/controlled.cpp  |  8 ++---
 components/nif/controlled.hpp  |  7 +++--
 components/nifosg/particle.cpp | 57 ++++++++++++++++++++++++----------
 components/nifosg/particle.hpp | 11 ++++---
 4 files changed, 57 insertions(+), 26 deletions(-)

diff --git a/components/nif/controlled.cpp b/components/nif/controlled.cpp
index 73359aeb2a..0491dd7d98 100644
--- a/components/nif/controlled.cpp
+++ b/components/nif/controlled.cpp
@@ -111,11 +111,11 @@ namespace Nif
     void NiPlanarCollider::read(NIFStream *nif)
     {
         NiParticleCollider::read(nif);
-        /* osg::Vec2f mExtents = */nif->getVector2();
-        /* osg::Vec3f mPosition = */nif->getVector3();
-        /* osg::Vec3f mXVector = */nif->getVector3();
-        /* osg::Vec3f mYVector = */nif->getVector3();
 
+        mExtents = nif->getVector2();
+        mPosition = nif->getVector3();
+        mXVector = nif->getVector3();
+        mYVector = nif->getVector3();
         mPlaneNormal = nif->getVector3();
         mPlaneDistance = nif->getFloat();
     }
diff --git a/components/nif/controlled.hpp b/components/nif/controlled.hpp
index 0d93381eab..5094f1fd87 100644
--- a/components/nif/controlled.hpp
+++ b/components/nif/controlled.hpp
@@ -131,10 +131,13 @@ struct NiParticleCollider : public NiParticleModifier
 // NiPinaColada
 struct NiPlanarCollider : public NiParticleCollider
 {
-    void read(NIFStream *nif) override;
-
+    osg::Vec2f mExtents;
+    osg::Vec3f mPosition;
+    osg::Vec3f mXVector, mYVector;
     osg::Vec3f mPlaneNormal;
     float mPlaneDistance;
+
+    void read(NIFStream *nif) override;
 };
 
 struct NiSphericalCollider : public NiParticleCollider
diff --git a/components/nifosg/particle.cpp b/components/nifosg/particle.cpp
index 493143a7a3..3b66a956e8 100644
--- a/components/nifosg/particle.cpp
+++ b/components/nifosg/particle.cpp
@@ -468,18 +468,24 @@ void FindGroupByRecIndex::applyNode(osg::Node &searchNode)
 
 PlanarCollider::PlanarCollider(const Nif::NiPlanarCollider *collider)
     : mBounceFactor(collider->mBounceFactor)
+    , mExtents(collider->mExtents)
+    , mPosition(collider->mPosition)
+    , mXVector(collider->mXVector)
+    , mYVector(collider->mYVector)
     , mPlane(-collider->mPlaneNormal, collider->mPlaneDistance)
 {
 }
 
-PlanarCollider::PlanarCollider()
-    : mBounceFactor(0.f)
-{
-}
-
 PlanarCollider::PlanarCollider(const PlanarCollider &copy, const osg::CopyOp &copyop)
     : osgParticle::Operator(copy, copyop)
     , mBounceFactor(copy.mBounceFactor)
+    , mExtents(copy.mExtents)
+    , mPosition(copy.mPosition)
+    , mPositionInParticleSpace(copy.mPositionInParticleSpace)
+    , mXVector(copy.mXVector)
+    , mXVectorInParticleSpace(copy.mXVectorInParticleSpace)
+    , mYVector(copy.mYVector)
+    , mYVectorInParticleSpace(copy.mYVectorInParticleSpace)
     , mPlane(copy.mPlane)
     , mPlaneInParticleSpace(copy.mPlaneInParticleSpace)
 {
@@ -487,25 +493,44 @@ PlanarCollider::PlanarCollider(const PlanarCollider &copy, const osg::CopyOp &co
 
 void PlanarCollider::beginOperate(osgParticle::Program *program)
 {
+    mPositionInParticleSpace = mPosition;
     mPlaneInParticleSpace = mPlane;
+    mXVectorInParticleSpace = mXVector;
+    mYVectorInParticleSpace = mYVector;
     if (program->getReferenceFrame() == osgParticle::ParticleProcessor::ABSOLUTE_RF)
+    {
+        mPositionInParticleSpace = program->transformLocalToWorld(mPosition);
         mPlaneInParticleSpace.transform(program->getLocalToWorldMatrix());
+        mXVectorInParticleSpace = program->rotateLocalToWorld(mXVector);
+        mYVectorInParticleSpace = program->rotateLocalToWorld(mYVector);
+    }
 }
 
 void PlanarCollider::operate(osgParticle::Particle *particle, double dt)
 {
-    float dotproduct = particle->getVelocity() * mPlaneInParticleSpace.getNormal();
+    // Does the particle in question move towards the collider?
+    float velDotProduct = particle->getVelocity() * mPlaneInParticleSpace.getNormal();
+    if (velDotProduct <= 0)
+        return;
 
-    if (dotproduct > 0)
-    {
-        osg::BoundingSphere bs(particle->getPosition(), 0.f);
-        if (mPlaneInParticleSpace.intersect(bs) == 1)
-        {
-            osg::Vec3 reflectedVelocity = particle->getVelocity() - mPlaneInParticleSpace.getNormal() * (2 * dotproduct);
-            reflectedVelocity *= mBounceFactor;
-            particle->setVelocity(reflectedVelocity);
-        }
-    }
+    // Does it intersect the collider's plane?
+    osg::BoundingSphere bs(particle->getPosition(), 0.f);
+    if (mPlaneInParticleSpace.intersect(bs) != 1)
+        return;
+
+    // Is it inside the collider's bounds?
+    osg::Vec3f relativePos = particle->getPosition() - mPositionInParticleSpace;
+    float xDotProduct = relativePos * mXVectorInParticleSpace;
+    float yDotProduct = relativePos * mYVectorInParticleSpace;
+    if (-mExtents.x() * 0.5f > xDotProduct || mExtents.x() * 0.5f < xDotProduct)
+        return;
+    if (-mExtents.y() * 0.5f > yDotProduct || mExtents.y() * 0.5f < yDotProduct)
+        return;
+
+    // Deflect the particle
+    osg::Vec3 reflectedVelocity = particle->getVelocity() - mPlaneInParticleSpace.getNormal() * (2 * velDotProduct);
+    reflectedVelocity *= mBounceFactor;
+    particle->setVelocity(reflectedVelocity);
 }
 
 SphericalCollider::SphericalCollider(const Nif::NiSphericalCollider* collider)
diff --git a/components/nifosg/particle.hpp b/components/nifosg/particle.hpp
index 9e68cdf347..155d35ad2c 100644
--- a/components/nifosg/particle.hpp
+++ b/components/nifosg/particle.hpp
@@ -104,7 +104,7 @@ namespace NifOsg
     {
     public:
         PlanarCollider(const Nif::NiPlanarCollider* collider);
-        PlanarCollider();
+        PlanarCollider() = default;
         PlanarCollider(const PlanarCollider& copy, const osg::CopyOp& copyop);
 
         META_Object(NifOsg, PlanarCollider)
@@ -113,9 +113,12 @@ namespace NifOsg
         void operate(osgParticle::Particle* particle, double dt) override;
 
     private:
-        float mBounceFactor;
-        osg::Plane mPlane;
-        osg::Plane mPlaneInParticleSpace;
+        float mBounceFactor{0.f};
+        osg::Vec2f mExtents;
+        osg::Vec3f mPosition, mPositionInParticleSpace;
+        osg::Vec3f mXVector, mXVectorInParticleSpace;
+        osg::Vec3f mYVector, mYVectorInParticleSpace;
+        osg::Plane mPlane, mPlaneInParticleSpace;
     };
 
     class SphericalCollider : public osgParticle::Operator

From 3c74a20335109e16600144679327b5aa3e9db029 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Tue, 5 Apr 2022 17:26:55 +0200
Subject: [PATCH 2250/2859] Refactor horizontal/vertical cases in Flex

---
 components/lua_ui/flex.cpp | 67 +++++++++++++-------------------------
 components/lua_ui/flex.hpp | 64 ++++++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+), 44 deletions(-)

diff --git a/components/lua_ui/flex.cpp b/components/lua_ui/flex.cpp
index bbbf70cb98..eb37a05fbf 100644
--- a/components/lua_ui/flex.cpp
+++ b/components/lua_ui/flex.cpp
@@ -13,23 +13,20 @@ namespace LuaUi
 
     namespace
     {
-        MyGUI::IntPoint alignSize(const MyGUI::IntSize& container, const MyGUI::IntSize& content, Alignment alignment)
+        int alignSize(int container, int content, Alignment alignment)
         {
-            MyGUI::IntPoint alignedPosition;
+            int alignedPosition = 0;
             {
-                MyGUI::IntSize alignSize = container;
                 switch (alignment)
                 {
                 case Alignment::Start:
-                    alignedPosition = MyGUI::IntPoint(0, 0);
+                    alignedPosition = 0;
                     break;
                 case Alignment::Center:
-                    alignSize -= content;
-                    alignedPosition = { alignSize.width / 2, alignSize.height / 2 };
+                    alignedPosition = (container - content) / 2;
                     break;
                 case Alignment::End:
-                    alignSize -= content;
-                    alignedPosition = { alignSize.width, alignSize.height };
+                    alignedPosition = container - content;
                     break;
                 }
             }
@@ -44,50 +41,34 @@ namespace LuaUi
         for (auto* w: children())
         {
             w->clearForced();
-            childrenSize += w->calculateSize();
-            totalGrow += w->externalValue("grow", 0.0f);
+            MyGUI::IntSize size = w->calculateSize();
+            setPrimary(childrenSize, getPrimary(childrenSize) + getPrimary(size));
+            setSecondary(childrenSize, std::max(getSecondary(childrenSize), getSecondary(size)));
+            totalGrow += std::max(0.0f, w->externalValue("grow", 0.0f));
         }
         mChildrenSize = childrenSize;
 
         MyGUI::IntSize flexSize = calculateSize();
-        MyGUI::IntSize growSize;
-        MyGUI::FloatSize growFactor;
+        int growSize = 0;
+        float growFactor = 0;
         if (totalGrow > 0)
         {
-            growSize = flexSize - childrenSize;
-            growFactor = { growSize.width / totalGrow, growSize.height / totalGrow };
+            growSize = getPrimary(flexSize) - getPrimary(childrenSize);
+            growFactor = growSize / totalGrow;
         }
-        if (mHorizontal)
-            flexSize.width -= growSize.width;
-        else
-            flexSize.height-= growSize.height;
+        setPrimary(flexSize, getPrimary(flexSize) - growSize);
 
-        MyGUI::IntPoint alignedPosition = alignSize(flexSize, childrenSize, mAlign);
-        MyGUI::IntPoint arrangedPosition = alignSize(flexSize, childrenSize, mArrange);
         MyGUI::IntPoint childPosition;
-        if (mHorizontal)
-            childPosition = { alignedPosition.left, arrangedPosition.top };
-        else
-            childPosition = { arrangedPosition.left, alignedPosition.top };
+        setPrimary(childPosition, alignSize(getPrimary(flexSize), getPrimary(childrenSize), mAlign));
+        setSecondary(childPosition, alignSize(getSecondary(flexSize), getSecondary(childrenSize), mArrange));
         for (auto* w : children())
         {
             w->forcePosition(childPosition);
-            float grow = w->externalValue("grow", 0);
-            MyGUI::IntSize growth(growFactor.width * grow, growFactor.height * grow);
-            if (mHorizontal)
-            {
-                int width = w->widget()->getWidth();
-                width += growth.width;
-                w->forceSize({width, w->widget()->getHeight()});
-                childPosition.left += width;
-            }
-            else
-            {
-                int height = w->widget()->getHeight();
-                height += growth.height;
-                w->forceSize({ w->widget()->getWidth(), height });
-                childPosition.top += height;
-            }
+            MyGUI::IntSize size = w->widget()->getSize();
+            float grow = std::max(0.0f, w->externalValue("grow", 0.0f));
+            setPrimary(size, getPrimary(size) + static_cast<int>(growFactor * grow));
+            w->forceSize(size);
+            setPrimary(childPosition, getPrimary(childPosition) + getPrimary(size));
         }
         WidgetExtension::updateProperties();
     }
@@ -96,10 +77,8 @@ namespace LuaUi
     {
         MyGUI::IntSize size = WidgetExtension::calculateSize();
         if (mAutoSized) {
-            if (mHorizontal)
-                size.width = mChildrenSize.width;
-            else
-                size.height = mChildrenSize.height;
+            setPrimary(size, getPrimary(mChildrenSize));
+            setSecondary(size, std::max(getSecondary(size), getSecondary(mChildrenSize)));
         }
         return size;
     }
diff --git a/components/lua_ui/flex.hpp b/components/lua_ui/flex.hpp
index 6cff6f0695..0ac8963f73 100644
--- a/components/lua_ui/flex.hpp
+++ b/components/lua_ui/flex.hpp
@@ -14,6 +14,10 @@ namespace LuaUi
             MyGUI::IntSize calculateSize() override;
             void updateProperties() override;
             void updateChildren() override;
+            MyGUI::IntSize childScalingSize() override
+            {
+                return MyGUI::IntSize();
+            }
 
         private:
             bool mHorizontal;
@@ -21,6 +25,66 @@ namespace LuaUi
             MyGUI::IntSize mChildrenSize;
             Alignment mAlign;
             Alignment mArrange;
+
+            template<typename T>
+            inline T getPrimary(const MyGUI::types::TPoint<T>& point)
+            {
+                return mHorizontal ? point.left : point.top;
+            }
+
+            template<typename T>
+            inline T getSecondary(const MyGUI::types::TPoint<T>& point)
+            {
+                return mHorizontal ? point.top : point.left;
+            }
+
+            template<typename T>
+            inline void setPrimary(MyGUI::types::TPoint<T>& point, T value)
+            {
+                if (mHorizontal)
+                    point.left = value;
+                else
+                    point.top = value;
+            }
+
+            template<typename T>
+            inline void setSecondary(MyGUI::types::TPoint<T>& point, T value)
+            {
+                if (mHorizontal)
+                    point.top = value;
+                else
+                    point.left = value;
+            }
+
+            template<typename T>
+            inline T getPrimary(const MyGUI::types::TSize<T>& point)
+            {
+                return mHorizontal ? point.width : point.height;
+            }
+
+            template<typename T>
+            inline T getSecondary(const MyGUI::types::TSize<T>& point)
+            {
+                return mHorizontal ? point.height : point.width;
+            }
+
+            template<typename T>
+            inline void setPrimary(MyGUI::types::TSize<T>& point, T value)
+            {
+                if (mHorizontal)
+                    point.width = value;
+                else
+                    point.height = value;
+            }
+
+            template<typename T>
+            inline void setSecondary(MyGUI::types::TSize<T>& point, T value)
+            {
+                if (mHorizontal)
+                    point.height = value;
+                else
+                    point.width = value;
+            }
     };
 }
 

From 3580f8ab437a82b6afa6fb15b76d8f719547f8f2 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Tue, 5 Apr 2022 17:52:23 +0200
Subject: [PATCH 2251/2859] Add Flex widget documentation

---
 .../lua-scripting/user_interface.rst          |  1 +
 .../reference/lua-scripting/widgets/flex.rst  | 43 +++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 docs/source/reference/lua-scripting/widgets/flex.rst

diff --git a/docs/source/reference/lua-scripting/user_interface.rst b/docs/source/reference/lua-scripting/user_interface.rst
index 71ad61b410..394c53e688 100644
--- a/docs/source/reference/lua-scripting/user_interface.rst
+++ b/docs/source/reference/lua-scripting/user_interface.rst
@@ -81,6 +81,7 @@ Widget types
    Text: Displays text. <widgets/text>
    TextEdit: Accepts text input from the user. <widgets/textedit>
    Image: Renders a texture. <widgets/image>
+   Flex: Aligns children in a column/row <widgets/flex>
 
 Example
 -------
diff --git a/docs/source/reference/lua-scripting/widgets/flex.rst b/docs/source/reference/lua-scripting/widgets/flex.rst
new file mode 100644
index 0000000000..359d0d4394
--- /dev/null
+++ b/docs/source/reference/lua-scripting/widgets/flex.rst
@@ -0,0 +1,43 @@
+Flex Widget
+===========
+
+Aligns its children along either a column or a row, depending on the `horizontal` property.
+
+Properties
+----------
+
+.. list-table::
+  :header-rows: 1
+  :widths: 20 20 60
+
+  * - name
+    - type (default value)
+    - description
+  * - horizontal
+    - bool (false)
+    - Flex aligns its children in a row if true, otherwise in a column.
+  * - autoSize
+    - bool (true)
+    - | If true, Flex will automatically resize to fit its contents.
+      | Children can't be relatively position/sized when true.
+  * - align
+    - ui.ALIGNMENT (Start)
+    - Where to align the children in the main axis.
+  * - arrange
+    - ui.ALIGNMETN (Start)
+    - How to arrange the children in the cross axis.
+
+External
+--------
+.. list-table::
+  :header-rows: 1
+  :widths: 20 20 60
+
+  * - name
+    - type (default value)
+    - description
+  * - grow
+    - float (0)
+    - | Grow factor for the child. If there is unused space in the Flex,
+      | it will be split between widgets according to this value.
+      | Has no effect if `autoSize` is `true`.

From 52743dadf311ad002f38bae3c707cd21c0cc408e Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Tue, 5 Apr 2022 18:35:09 +0000
Subject: [PATCH 2252/2859] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5c0acda625..5cde48b096 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@ variables:
   # These can be specified per job or per pipeline
   ARTIFACT_COMPRESSION_LEVEL: "fast"
   CACHE_COMPRESSION_LEVEL: "fast"
-  SAST_EXCLUDED_ANALYZERS: bandit,eslint
+  SAST_EXCLUDED_ANALYZERS: "bandit"
   SAST_EXCLUDED_PATHS: spec,test,tests,tmp,extern
 
 .Ubuntu_Image:

From 81e9212db9369028427235f4a8c26bbb9222a503 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Wed, 6 Apr 2022 05:44:03 +0300
Subject: [PATCH 2253/2859] Slightly optimize MergeGroupsVisitor's xenophobia

---
 components/sceneutil/optimizer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/sceneutil/optimizer.cpp b/components/sceneutil/optimizer.cpp
index 748ceee952..ae0985d57c 100644
--- a/components/sceneutil/optimizer.cpp
+++ b/components/sceneutil/optimizer.cpp
@@ -1935,8 +1935,8 @@ bool Optimizer::MergeGroupsVisitor::isOperationPermissible(osg::Group& node)
     return !node.getCullCallback() &&
            !node.getEventCallback() &&
            !node.getUpdateCallback() &&
-            isOperationPermissibleForObject(&node) &&
-           typeid(node)==typeid(osg::Group);
+           typeid(node)==typeid(osg::Group) &&
+            isOperationPermissibleForObject(&node);
 }
 
 void Optimizer::MergeGroupsVisitor::apply(osg::LOD &lod)

From eafa66ff40eabc8006ea221da64470a63ed5d047 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Wed, 6 Apr 2022 06:42:06 +0300
Subject: [PATCH 2254/2859] Don't consider NiCollisionSwitch unoptimizeable

---
 components/nifosg/nifloader.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 3007bc6cf2..8ed17f3901 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -517,13 +517,6 @@ namespace NifOsg
             if (!node)
                 node = new NifOsg::MatrixTransform(nifNode->trafo);
 
-            if (nifNode->recType == Nif::RC_NiCollisionSwitch && !(nifNode->flags & Nif::NiNode::Flag_ActiveCollision))
-            {
-                node->setNodeMask(Loader::getIntersectionDisabledNodeMask());
-                // This node must not be combined with another node.
-                dataVariance = osg::Object::DYNAMIC;
-            }
-
             node->setDataVariance(dataVariance);
 
             return node;
@@ -639,6 +632,9 @@ namespace NifOsg
                 node->setNodeMask(Loader::getHiddenNodeMask());
             }
 
+            if (nifNode->recType == Nif::RC_NiCollisionSwitch && !(nifNode->flags & Nif::NiNode::Flag_ActiveCollision))
+                node->setNodeMask(Loader::getIntersectionDisabledNodeMask());
+
             osg::ref_ptr<SceneUtil::CompositeStateSetUpdater> composite = new SceneUtil::CompositeStateSetUpdater;
 
             applyNodeProperties(nifNode, node, composite, imageManager, boundTextures, animflags);

From 98b2ddfd4ca5d02b54619725b1caa955078adb2a Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Wed, 6 Apr 2022 15:27:05 +0300
Subject: [PATCH 2255/2859] Make console and maximized window defaults mimic
 Morrowind

---
 CHANGELOG.md                                  |   1 +
 .../reference/modding/settings/windows.rst    |  58 ++++-----
 files/settings-default.cfg                    | 114 +++++++++---------
 3 files changed, 87 insertions(+), 86 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c665740ac..03777cbf87 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -105,6 +105,7 @@
     Bug #6559: Weapon condition inconsistency between melee and ranged critical / sneak / KO attacks
     Bug #6579: OpenMW compilation error when using OSG doubles for BoundingSphere
     Bug #6606: Quests with multiple IDs cannot always be restarted
+    Bug #6653: With default settings the in-game console doesn't fit into screen
     Bug #6655: Constant effect absorb attribute causes the game to break
     Bug #6670: Dialogue order is incorrect
     Bug #6680: object.cpp handles nodetree unsafely, memory access with dangling pointer
diff --git a/docs/source/reference/modding/settings/windows.rst b/docs/source/reference/modding/settings/windows.rst
index 2a60745c2e..00ee78a86d 100644
--- a/docs/source/reference/modding/settings/windows.rst
+++ b/docs/source/reference/modding/settings/windows.rst
@@ -16,8 +16,8 @@ For example, to configure the alchemy window, the actual settings would be::
 
 	alchemy x = 0.25
 	alchemy y = 0.25
-	alchemy h = 0.5
 	alchemy w = 0.5
+	alchemy h = 0.5
 
 Each window in the GUI mode remembers it's previous location when exiting the game.
 By far the easiest way to configure these settings is to simply move the windows around in game.
@@ -49,9 +49,9 @@ stats
 
 	y = 0.015
 
-	h = 0.45
+	w = 0.45
 
-	w = 0.4275
+	h = 0.4275
 
 	pin = false
 
@@ -66,9 +66,9 @@ spells
 
 	y = 0.39
 
-	h = 0.36
+	w = 0.36
 
-	w = 0.51
+	h = 0.51
 
 	pin = false
 
@@ -83,9 +83,9 @@ map
 
 	y = 0.015
 
-	h = 0.36
+	w = 0.36
 
-	w = 0.37
+	h = 0.37
 
 	pin = false
 
@@ -100,9 +100,9 @@ inventory
 
 	y = 0.54
 
-	h = 0.45
+	w = 0.45
 
-	w = 0.38
+	h = 0.38
 
 	pin = false
 
@@ -117,9 +117,9 @@ inventory container
 
 	y = 0.54
 
-	h = 0.45
+	w = 0.45
 
-	w = 0.38
+	h = 0.38
 
 The player's inventory window while searching a container, showing the contents of the character's inventory.
 Activated by clicking on a container. The same window is used for searching dead bodies, and pickpocketing people.
@@ -132,9 +132,9 @@ inventory barter
 
 	y = 0.54
 
-	h = 0.45
+	w = 0.45
 
-	w = 0.38
+	h = 0.38
 
 The player's inventory window while bartering. It displays goods owned by the character while bartering.
 Activated by clicking on the Barter choice in the dialog window for an NPC.
@@ -147,9 +147,9 @@ inventory companion
 
 	y = 0.54
 
-	h = 0.45
+	w = 0.45
 
-	w = 0.38
+	h = 0.38
 
 The player's inventory window while interacting with a companion.
 The companion windows were added in the Tribunal expansion, but are available everywhere in the OpenMW engine.
@@ -162,9 +162,9 @@ container
 
 	y = 0.54
 
-	h = 0.39
+	w = 0.39
 
-	w = 0.38
+	h = 0.38
 
 The container window, showing the contents of the container. Activated by clicking on a container.
 The same window is used for searching dead bodies, and pickpocketing people.
@@ -177,9 +177,9 @@ barter
 
 	y = 0.27
 
-	h = 0.38
+	w = 0.38
 
-	w = 0.63
+	h = 0.63
 
 The NPC bartering window, displaying goods owned by the shopkeeper while bartering.
 Activated by clicking on the Barter choice in the dialog window for an NPC.
@@ -192,9 +192,9 @@ companion
 
 	y = 0.27
 
-	h = 0.38
+	w = 0.38
 
-	w = 0.63
+	h = 0.63
 
 The NPC's inventory window while interacting with a companion.
 The companion windows were added in the Tribunal expansion, but are available everywhere in the OpenMW engine.
@@ -207,9 +207,9 @@ dialogue
 
 	y = 0.5
 
-	h = 0.7
+	w = 0.7
 
-	w = 0.45
+	h = 0.45
 
 The dialogue window, for talking with NPCs.
 Activated by clicking on a NPC.
@@ -222,10 +222,10 @@ alchemy
 
 	y = 0.25
 
-	h = 0.5
-
 	w = 0.5
 
+	h = 0.5
+
 The alchemy window, for crafting potions.
 Activated by dragging an alchemy tool on to the rag doll.
 Unlike most other windows, this window hides all other windows when opened.
@@ -234,13 +234,13 @@ console
 -------
 
 :Default:
-	x = 0.015
+	x = 0.255
 
-	y = 0.015
+	y = 0.215
 
-	h = 1.0
+	w = 0.49
 
-	w = 0.5
+	h = 0.3125
 
 The console command window.
 Activated by pressing the tilde (~) key.
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index f76b67a7e5..ecf5e1ec40 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -672,10 +672,10 @@ stats x = 0.015
 stats y = 0.015
 stats w = 0.4275
 stats h = 0.45
-stats maximized x = 0.0
-stats maximized y = 0.0
-stats maximized w = 1.0
-stats maximized h = 1.0
+stats maximized x = 0.255
+stats maximized y = 0.275
+stats maximized w = 0.4275
+stats maximized h = 0.45
 stats pin = false
 stats hidden = false
 stats maximized = false
@@ -685,10 +685,10 @@ spells x = 0.63
 spells y = 0.39
 spells w = 0.36
 spells h = 0.51
-spells maximized x = 0.0
-spells maximized y = 0.0
-spells maximized w = 1.0
-spells maximized h = 1.0
+spells maximized x = 0.32
+spells maximized y = 0.02
+spells maximized w = 0.36
+spells maximized h = 0.88
 spells pin = false
 spells hidden = false
 spells maximized = false
@@ -698,23 +698,23 @@ map x = 0.63
 map y = 0.015
 map w = 0.36
 map h = 0.37
-map maximized x = 0.0
-map maximized y = 0.0
-map maximized w = 1.0
-map maximized h = 1.0
+map maximized x = 0.015
+map maximized y = 0.02
+map maximized w = 0.97
+map maximized h = 0.875
 map pin = false
 map hidden = false
 map maximized = false
 
 # Player inventory window when explicitly opened.
-inventory x = 0.0
+inventory x = 0.015
 inventory y = 0.54
 inventory w = 0.45
 inventory h = 0.38
-inventory maximized x = 0.0
-inventory maximized y = 0.0
-inventory maximized w = 1.0
-inventory maximized h = 1.0
+inventory maximized x = 0.015
+inventory maximized y = 0.02
+inventory maximized w = 0.97
+inventory maximized h = 0.875
 inventory pin = false
 inventory hidden = false
 inventory maximized = false
@@ -724,10 +724,10 @@ inventory container x = 0.015
 inventory container y = 0.54
 inventory container w = 0.45
 inventory container h = 0.38
-inventory container maximized x = 0.0
-inventory container maximized y = 0.5
-inventory container maximized w = 1.0
-inventory container maximized h = 0.5
+inventory container maximized x = 0.015
+inventory container maximized y = 0.02
+inventory container maximized w = 0.97
+inventory container maximized h = 0.875
 inventory container maximized = false
 
 # Player inventory window when bartering with a shopkeeper.
@@ -735,10 +735,10 @@ inventory barter x = 0.015
 inventory barter y = 0.54
 inventory barter w = 0.45
 inventory barter h = 0.38
-inventory barter maximized x = 0.0
-inventory barter maximized y = 0.5
-inventory barter maximized w = 1.0
-inventory barter maximized h = 0.5
+inventory barter maximized x = 0.015
+inventory barter maximized y = 0.02
+inventory barter maximized w = 0.97
+inventory barter maximized h = 0.875
 inventory barter maximized = false
 
 # Player inventory window when trading with a companion.
@@ -746,10 +746,10 @@ inventory companion x = 0.015
 inventory companion y = 0.54
 inventory companion w = 0.45
 inventory companion h = 0.38
-inventory companion maximized x = 0.0
-inventory companion maximized y = 0.5
-inventory companion maximized w = 1.0
-inventory companion maximized h = 0.5
+inventory companion maximized x = 0.015
+inventory companion maximized y = 0.02
+inventory companion maximized w = 0.97
+inventory companion maximized h = 0.875
 inventory companion maximized = false
 
 # Dialog window for talking with NPCs.
@@ -757,10 +757,10 @@ dialogue x = 0.15
 dialogue y = 0.5
 dialogue w = 0.7
 dialogue h = 0.45
-dialogue maximized x = 0.0
-dialogue maximized y = 0.0
-dialogue maximized w = 1.0
-dialogue maximized h = 1.0
+dialogue maximized x = 0.015
+dialogue maximized y = 0.02
+dialogue maximized w = 0.97
+dialogue maximized h = 0.875
 dialogue maximized = false
 
 # Alchemy window for crafting potions.
@@ -768,21 +768,21 @@ alchemy x = 0.25
 alchemy y = 0.25
 alchemy w = 0.5
 alchemy h = 0.5
-alchemy maximized x = 0.0
-alchemy maximized y = 0.0
-alchemy maximized w = 1.0
-alchemy maximized h = 1.0
+alchemy maximized x = 0.015
+alchemy maximized y = 0.02
+alchemy maximized w = 0.97
+alchemy maximized h = 0.875
 alchemy maximized = false
 
 # Console command window for debugging commands.
-console x = 0.015
-console y = 0.015
-console w = 1.0
-console h = 0.5
-console maximized x = 0.0
-console maximized y = 0.0
-console maximized w = 1.0
-console maximized h = 1.0
+console x = 0.255
+console y = 0.215
+console w = 0.49
+console h = 0.3125
+console maximized x = 0.015
+console maximized y = 0.02
+console maximized w = 0.97
+console maximized h = 0.875
 console maximized = false
 
 # Container inventory when searching a container.
@@ -790,10 +790,10 @@ container x = 0.49
 container y = 0.54
 container w = 0.39
 container h = 0.38
-container maximized x = 0.0
-container maximized y = 0.0
-container maximized w = 1.0
-container maximized h = 0.5
+container maximized x = 0.015
+container maximized y = 0.02
+container maximized w = 0.97
+container maximized h = 0.875
 container maximized = false
 
 # NPC inventory window when bartering with a shopkeeper.
@@ -801,10 +801,10 @@ barter x = 0.6
 barter y = 0.27
 barter w = 0.38
 barter h = 0.63
-barter maximized x = 0.0
-barter maximized y = 0.0
-barter maximized w = 1.0
-barter maximized h = 0.5
+barter maximized x = 0.015
+barter maximized y = 0.02
+barter maximized w = 0.97
+barter maximized h = 0.875
 barter maximized = false
 
 # NPC inventory window when trading with a companion.
@@ -812,10 +812,10 @@ companion x = 0.6
 companion y = 0.27
 companion w = 0.38
 companion h = 0.63
-companion maximized x = 0.0
-companion maximized y = 0.0
-companion maximized w = 1.0
-companion maximized h = 0.5
+companion maximized x = 0.015
+companion maximized y = 0.02
+companion maximized w = 0.97
+companion maximized h = 0.875
 companion maximized = false
 
 [Navigator]

From dc20e799e174959b1692eb3c6b10f174e34d5262 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 4 Apr 2022 02:44:53 +0200
Subject: [PATCH 2256/2859] Use static object to register classes

---
 apps/openmw/mwclass/activator.cpp       | 11 ++++-------
 apps/openmw/mwclass/activator.hpp       | 10 +++++-----
 apps/openmw/mwclass/actor.hpp           |  2 +-
 apps/openmw/mwclass/apparatus.cpp       | 11 ++++-------
 apps/openmw/mwclass/apparatus.hpp       |  9 +++++----
 apps/openmw/mwclass/armor.cpp           | 11 ++++-------
 apps/openmw/mwclass/armor.hpp           | 10 ++++++----
 apps/openmw/mwclass/bodypart.cpp        | 11 ++++-------
 apps/openmw/mwclass/bodypart.hpp        | 10 ++++++----
 apps/openmw/mwclass/book.cpp            | 11 ++++-------
 apps/openmw/mwclass/book.hpp            | 10 ++++++----
 apps/openmw/mwclass/clothing.cpp        | 11 ++++-------
 apps/openmw/mwclass/clothing.hpp        | 10 ++++++----
 apps/openmw/mwclass/container.cpp       | 10 ++--------
 apps/openmw/mwclass/container.hpp       | 14 +++++++-------
 apps/openmw/mwclass/creature.cpp        | 12 +++++-------
 apps/openmw/mwclass/creature.hpp        | 10 +++++++---
 apps/openmw/mwclass/creaturelevlist.cpp | 12 +++++-------
 apps/openmw/mwclass/creaturelevlist.hpp | 12 +++++++-----
 apps/openmw/mwclass/door.cpp            | 12 +++++-------
 apps/openmw/mwclass/door.hpp            | 10 ++++++----
 apps/openmw/mwclass/ingredient.cpp      | 11 ++++-------
 apps/openmw/mwclass/ingredient.hpp      | 10 ++++++----
 apps/openmw/mwclass/itemlevlist.cpp     | 11 ++++-------
 apps/openmw/mwclass/itemlevlist.hpp     | 10 ++++++----
 apps/openmw/mwclass/light.cpp           | 11 ++++-------
 apps/openmw/mwclass/light.hpp           | 10 ++++++----
 apps/openmw/mwclass/lockpick.cpp        | 11 ++++-------
 apps/openmw/mwclass/lockpick.hpp        | 10 ++++++----
 apps/openmw/mwclass/misc.cpp            | 12 +++++-------
 apps/openmw/mwclass/misc.hpp            | 10 ++++++----
 apps/openmw/mwclass/npc.cpp             | 10 ++++------
 apps/openmw/mwclass/npc.hpp             | 10 +++++++---
 apps/openmw/mwclass/potion.cpp          | 11 ++++-------
 apps/openmw/mwclass/potion.hpp          | 10 ++++++----
 apps/openmw/mwclass/probe.cpp           | 11 ++++-------
 apps/openmw/mwclass/probe.hpp           | 10 ++++++----
 apps/openmw/mwclass/repair.cpp          | 11 ++++-------
 apps/openmw/mwclass/repair.hpp          | 10 ++++++----
 apps/openmw/mwclass/static.cpp          | 11 ++++-------
 apps/openmw/mwclass/static.hpp          | 10 ++++++----
 apps/openmw/mwclass/weapon.cpp          | 11 ++++-------
 apps/openmw/mwclass/weapon.hpp          |  9 +++++----
 apps/openmw/mwworld/class.cpp           | 16 ++++++++++------
 apps/openmw/mwworld/class.hpp           |  9 +++++----
 apps/openmw/mwworld/registeredclass.hpp | 23 +++++++++++++++++++++++
 46 files changed, 252 insertions(+), 245 deletions(-)
 create mode 100644 apps/openmw/mwworld/registeredclass.hpp

diff --git a/apps/openmw/mwclass/activator.cpp b/apps/openmw/mwclass/activator.cpp
index b1660559e6..ad9a6c76d9 100644
--- a/apps/openmw/mwclass/activator.cpp
+++ b/apps/openmw/mwclass/activator.cpp
@@ -28,6 +28,10 @@
 
 namespace MWClass
 {
+    Activator::Activator()
+        : MWWorld::RegisteredClass<Activator>(ESM::Activator::sRecordId)
+    {
+    }
 
     void Activator::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
@@ -84,13 +88,6 @@ namespace MWClass
         return ref->mBase->mScript;
     }
 
-    void Activator::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Activator);
-
-        registerClass (ESM::Activator::sRecordId, instance);
-    }
-
     bool Activator::hasToolTip (const MWWorld::ConstPtr& ptr) const
     {
         return !getName(ptr).empty();
diff --git a/apps/openmw/mwclass/activator.hpp b/apps/openmw/mwclass/activator.hpp
index 48a679e0b7..d5c251d9d1 100644
--- a/apps/openmw/mwclass/activator.hpp
+++ b/apps/openmw/mwclass/activator.hpp
@@ -1,19 +1,21 @@
 #ifndef GAME_MWCLASS_ACTIVATOR_H
 #define GAME_MWCLASS_ACTIVATOR_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
-    class Activator : public MWWorld::Class
+    class Activator final : public MWWorld::RegisteredClass<Activator>
     {
+            friend MWWorld::RegisteredClass<Activator>;
+
+            Activator();
 
             MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
 
             static int getSndGenTypeFromName(const std::string &name);
 
         public:
-
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
@@ -36,8 +38,6 @@ namespace MWClass
             std::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
             ///< Generate action for activation
 
-            static void registerSelf();
-
             std::string getModel(const MWWorld::ConstPtr &ptr) const override;
 
             bool useAnim() const override;
diff --git a/apps/openmw/mwclass/actor.hpp b/apps/openmw/mwclass/actor.hpp
index 82055e2500..f2d080a64f 100644
--- a/apps/openmw/mwclass/actor.hpp
+++ b/apps/openmw/mwclass/actor.hpp
@@ -17,7 +17,7 @@ namespace MWClass
     {
     protected:
 
-        Actor() = default;
+        explicit Actor(unsigned type) : Class(type) {}
 
         template <class GMST>
         float getSwimSpeedImpl(const MWWorld::Ptr& ptr, const GMST& gmst, const MWMechanics::MagicEffects& mageffects, float baseSpeed) const
diff --git a/apps/openmw/mwclass/apparatus.cpp b/apps/openmw/mwclass/apparatus.cpp
index 76bee280bc..021e81346d 100644
--- a/apps/openmw/mwclass/apparatus.cpp
+++ b/apps/openmw/mwclass/apparatus.cpp
@@ -18,6 +18,10 @@
 
 namespace MWClass
 {
+    Apparatus::Apparatus()
+        : MWWorld::RegisteredClass<Apparatus>(ESM::Apparatus::sRecordId)
+    {
+    }
 
     void Apparatus::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
@@ -65,13 +69,6 @@ namespace MWClass
         return ref->mBase->mData.mValue;
     }
 
-    void Apparatus::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Apparatus);
-
-        registerClass (ESM::Apparatus::sRecordId, instance);
-    }
-
     std::string Apparatus::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
         return std::string("Item Apparatus Up");
diff --git a/apps/openmw/mwclass/apparatus.hpp b/apps/openmw/mwclass/apparatus.hpp
index 828abef25e..ec84a75196 100644
--- a/apps/openmw/mwclass/apparatus.hpp
+++ b/apps/openmw/mwclass/apparatus.hpp
@@ -1,12 +1,15 @@
 #ifndef GAME_MWCLASS_APPARATUS_H
 #define GAME_MWCLASS_APPARATUS_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
-    class Apparatus : public MWWorld::Class
+    class Apparatus : public MWWorld::RegisteredClass<Apparatus>
     {
+            friend MWWorld::RegisteredClass<Apparatus>;
+
+            Apparatus();
 
             MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
 
@@ -33,8 +36,6 @@ namespace MWClass
             MWGui::ToolTipInfo getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const override;
             ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
 
-            static void registerSelf();
-
             std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const override;
             ///< Return the pick up sound Id
 
diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index 5dfc5e12f1..cffc112641 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -26,6 +26,10 @@
 
 namespace MWClass
 {
+    Armor::Armor()
+        : MWWorld::RegisteredClass<Armor>(ESM::Armor::sRecordId)
+    {
+    }
 
     void Armor::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
@@ -159,13 +163,6 @@ namespace MWClass
         return ref->mBase->mData.mValue;
     }
 
-    void Armor::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Armor);
-
-        registerClass (ESM::Armor::sRecordId, instance);
-    }
-
     std::string Armor::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
         int es = getEquipmentSkill(ptr);
diff --git a/apps/openmw/mwclass/armor.hpp b/apps/openmw/mwclass/armor.hpp
index f64f138a29..00fb23defa 100644
--- a/apps/openmw/mwclass/armor.hpp
+++ b/apps/openmw/mwclass/armor.hpp
@@ -1,12 +1,16 @@
 #ifndef GAME_MWCLASS_ARMOR_H
 #define GAME_MWCLASS_ARMOR_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
-    class Armor : public MWWorld::Class
+    class Armor : public MWWorld::RegisteredClass<Armor>
     {
+            friend MWWorld::RegisteredClass<Armor>;
+
+            Armor();
+
             MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
 
         public:
@@ -46,8 +50,6 @@ namespace MWClass
             int getValue (const MWWorld::ConstPtr& ptr) const override;
             ///< Return trade value of the object. Throws an exception, if the object can't be traded.
 
-            static void registerSelf();
-
             std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const override;
             ///< Return the pick up sound Id
 
diff --git a/apps/openmw/mwclass/bodypart.cpp b/apps/openmw/mwclass/bodypart.cpp
index 06b460f75c..ecc59f5459 100644
--- a/apps/openmw/mwclass/bodypart.cpp
+++ b/apps/openmw/mwclass/bodypart.cpp
@@ -7,6 +7,10 @@
 
 namespace MWClass
 {
+    BodyPart::BodyPart()
+        : MWWorld::RegisteredClass<BodyPart>(ESM::BodyPart::sRecordId)
+    {
+    }
 
     MWWorld::Ptr BodyPart::copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const
     {
@@ -32,13 +36,6 @@ namespace MWClass
         return false;
     }
 
-    void BodyPart::registerSelf()
-    {
-        std::shared_ptr<MWWorld::Class> instance (new BodyPart);
-
-        registerClass (ESM::BodyPart::sRecordId, instance);
-    }
-
     std::string BodyPart::getModel(const MWWorld::ConstPtr &ptr) const
     {
         const MWWorld::LiveCellRef<ESM::BodyPart> *ref = ptr.get<ESM::BodyPart>();
diff --git a/apps/openmw/mwclass/bodypart.hpp b/apps/openmw/mwclass/bodypart.hpp
index 0e372b884a..fb6c813f53 100644
--- a/apps/openmw/mwclass/bodypart.hpp
+++ b/apps/openmw/mwclass/bodypart.hpp
@@ -1,13 +1,17 @@
 #ifndef GAME_MWCLASS_BODYPART_H
 #define GAME_MWCLASS_BODYPART_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
 
-    class BodyPart : public MWWorld::Class
+    class BodyPart : public MWWorld::RegisteredClass<BodyPart>
     {
+        friend MWWorld::RegisteredClass<BodyPart>;
+
+        BodyPart();
+
         MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
 
     public:
@@ -21,8 +25,6 @@ namespace MWClass
         bool hasToolTip (const MWWorld::ConstPtr& ptr) const override;
         ///< @return true if this object has a tooltip when focused (default implementation: true)
 
-        static void registerSelf();
-
         std::string getModel(const MWWorld::ConstPtr &ptr) const override;
     };
 
diff --git a/apps/openmw/mwclass/book.cpp b/apps/openmw/mwclass/book.cpp
index f9350222f1..1c826a049d 100644
--- a/apps/openmw/mwclass/book.cpp
+++ b/apps/openmw/mwclass/book.cpp
@@ -23,6 +23,10 @@
 
 namespace MWClass
 {
+    Book::Book()
+        : MWWorld::RegisteredClass<Book>(ESM::Book::sRecordId)
+    {
+    }
 
     void Book::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
@@ -82,13 +86,6 @@ namespace MWClass
         return ref->mBase->mData.mValue;
     }
 
-    void Book::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Book);
-
-        registerClass (ESM::Book::sRecordId, instance);
-    }
-
     std::string Book::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
         return std::string("Item Book Up");
diff --git a/apps/openmw/mwclass/book.hpp b/apps/openmw/mwclass/book.hpp
index f3d34c5168..d78d9c7500 100644
--- a/apps/openmw/mwclass/book.hpp
+++ b/apps/openmw/mwclass/book.hpp
@@ -1,12 +1,16 @@
 #ifndef GAME_MWCLASS_BOOK_H
 #define GAME_MWCLASS_BOOK_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
-    class Book : public MWWorld::Class
+    class Book : public MWWorld::RegisteredClass<Book>
     {
+            friend MWWorld::RegisteredClass<Book>;
+
+            Book();
+
             MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
 
         public:
@@ -30,8 +34,6 @@ namespace MWClass
             int getValue (const MWWorld::ConstPtr& ptr) const override;
             ///< Return trade value of the object. Throws an exception, if the object can't be traded.
 
-            static void registerSelf();
-
             std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const override;
             ///< Return the pick up sound Id
 
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index a5f5d828c9..02ab337a2b 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -21,6 +21,10 @@
 
 namespace MWClass
 {
+    Clothing::Clothing()
+        : MWWorld::RegisteredClass<Clothing>(ESM::Clothing::sRecordId)
+    {
+    }
 
     void Clothing::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
@@ -117,13 +121,6 @@ namespace MWClass
         return ref->mBase->mData.mValue;
     }
 
-    void Clothing::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Clothing);
-
-        registerClass (ESM::Clothing::sRecordId, instance);
-    }
-
     std::string Clothing::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Clothing> *ref = ptr.get<ESM::Clothing>();
diff --git a/apps/openmw/mwclass/clothing.hpp b/apps/openmw/mwclass/clothing.hpp
index 3d5c162aa4..a044b13804 100644
--- a/apps/openmw/mwclass/clothing.hpp
+++ b/apps/openmw/mwclass/clothing.hpp
@@ -1,12 +1,16 @@
 #ifndef GAME_MWCLASS_CLOTHING_H
 #define GAME_MWCLASS_CLOTHING_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
-    class Clothing : public MWWorld::Class
+    class Clothing : public MWWorld::RegisteredClass<Clothing>
     {
+            friend MWWorld::RegisteredClass<Clothing>;
+
+            Clothing();
+
             MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
 
         public:
@@ -38,8 +42,6 @@ namespace MWClass
             int getValue (const MWWorld::ConstPtr& ptr) const override;
             ///< Return trade value of the object. Throws an exception, if the object can't be traded.
 
-            static void registerSelf();
-
             std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const override;
             ///< Return the pick up sound Id
 
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index b98ba43df4..296813f155 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -54,8 +54,9 @@ namespace MWClass
     }
 
     Container::Container()
+        : MWWorld::RegisteredClass<Container>(ESM::Container::sRecordId)
+        , mHarvestEnabled(Settings::Manager::getBool("graphic herbalism", "Game"))
     {
-        mHarvestEnabled = Settings::Manager::getBool("graphic herbalism", "Game");
     }
 
     void Container::ensureCustomData (const MWWorld::Ptr& ptr) const
@@ -236,13 +237,6 @@ namespace MWClass
         return ref->mBase->mScript;
     }
 
-    void Container::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Container);
-
-        registerClass (ESM::Container::sRecordId, instance);
-    }
-
     bool Container::hasToolTip (const MWWorld::ConstPtr& ptr) const
     {
         if (const MWWorld::CustomData* data = ptr.getRefData().getCustomData())
diff --git a/apps/openmw/mwclass/container.hpp b/apps/openmw/mwclass/container.hpp
index 0b290a73e1..0da53508d2 100644
--- a/apps/openmw/mwclass/container.hpp
+++ b/apps/openmw/mwclass/container.hpp
@@ -1,7 +1,7 @@
 #ifndef GAME_MWCLASS_CONTAINER_H
 #define GAME_MWCLASS_CONTAINER_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/customdata.hpp"
 
@@ -26,9 +26,13 @@ namespace MWClass
         friend class Container;
     };
 
-    class Container : public MWWorld::Class
+    class Container : public MWWorld::RegisteredClass<Container>
     {
-            bool mHarvestEnabled;
+            friend MWWorld::RegisteredClass<Container>;
+
+            const bool mHarvestEnabled;
+
+            Container();
 
             void ensureCustomData (const MWWorld::Ptr& ptr) const;
 
@@ -37,8 +41,6 @@ namespace MWClass
             bool canBeHarvested(const MWWorld::ConstPtr& ptr) const;
 
         public:
-            Container();
-
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
@@ -81,8 +83,6 @@ namespace MWClass
             void writeAdditionalState (const MWWorld::ConstPtr& ptr, ESM::ObjectState& state) const override;
             ///< Write additional state from \a ptr into \a state.
 
-            static void registerSelf();
-
             void respawn (const MWWorld::Ptr& ptr) const override;
 
             std::string getModel(const MWWorld::ConstPtr &ptr) const override;
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 6a633bc668..68aea5730f 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -78,6 +78,11 @@ namespace MWClass
     {
     }
 
+    Creature::Creature()
+        : MWWorld::RegisteredClass<Creature, Actor>(ESM::Creature::sRecordId)
+    {
+    }
+
     const Creature::GMST& Creature::getGmst()
     {
         static const GMST staticGmst = []
@@ -496,13 +501,6 @@ namespace MWClass
         return isFlagBitSet(ptr, ESM::Creature::Essential);
     }
 
-    void Creature::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Creature);
-
-        registerClass (ESM::Creature::sRecordId, instance);
-    }
-
     float Creature::getMaxSpeed(const MWWorld::Ptr &ptr) const
     {
         const MWMechanics::CreatureStats& stats = getCreatureStats(ptr);
diff --git a/apps/openmw/mwclass/creature.hpp b/apps/openmw/mwclass/creature.hpp
index 5bb5030348..3b1c070ce7 100644
--- a/apps/openmw/mwclass/creature.hpp
+++ b/apps/openmw/mwclass/creature.hpp
@@ -1,6 +1,8 @@
 #ifndef GAME_MWCLASS_CREATURE_H
 #define GAME_MWCLASS_CREATURE_H
 
+#include "../mwworld/registeredclass.hpp"
+
 #include "actor.hpp"
 
 namespace ESM
@@ -10,8 +12,12 @@ namespace ESM
 
 namespace MWClass
 {
-    class Creature : public Actor
+    class Creature : public MWWorld::RegisteredClass<Creature, Actor>
     {
+            friend MWWorld::RegisteredClass<Creature, Actor>;
+
+            Creature();
+
             void ensureCustomData (const MWWorld::Ptr& ptr) const;
 
             MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
@@ -96,8 +102,6 @@ namespace MWClass
 
             float getMaxSpeed (const MWWorld::Ptr& ptr) const override;
 
-            static void registerSelf();
-
             std::string getModel(const MWWorld::ConstPtr &ptr) const override;
 
             void getModelsToPreload(const MWWorld::Ptr& ptr, std::vector<std::string>& models) const override;
diff --git a/apps/openmw/mwclass/creaturelevlist.cpp b/apps/openmw/mwclass/creaturelevlist.cpp
index de40030a80..f22fbaebaa 100644
--- a/apps/openmw/mwclass/creaturelevlist.cpp
+++ b/apps/openmw/mwclass/creaturelevlist.cpp
@@ -28,6 +28,11 @@ namespace MWClass
         }
     };
 
+    CreatureLevList::CreatureLevList()
+        : MWWorld::RegisteredClass<CreatureLevList>(ESM::CreatureLevList::sRecordId)
+    {
+    }
+
     MWWorld::Ptr CreatureLevList::copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const
     {
         const MWWorld::LiveCellRef<ESM::CreatureLevList> *ref = ptr.get<ESM::CreatureLevList>();
@@ -91,13 +96,6 @@ namespace MWClass
             customData.mSpawn = true;
     }
 
-    void CreatureLevList::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new CreatureLevList);
-
-        registerClass (ESM::CreatureLevList::sRecordId, instance);
-    }
-
     void CreatureLevList::getModelsToPreload(const MWWorld::Ptr &ptr, std::vector<std::string> &models) const
     {
         // disable for now, too many false positives
diff --git a/apps/openmw/mwclass/creaturelevlist.hpp b/apps/openmw/mwclass/creaturelevlist.hpp
index b3a940682c..81c2f80070 100644
--- a/apps/openmw/mwclass/creaturelevlist.hpp
+++ b/apps/openmw/mwclass/creaturelevlist.hpp
@@ -1,13 +1,17 @@
 #ifndef GAME_MWCLASS_CREATURELEVLIST_H
 #define GAME_MWCLASS_CREATURELEVLIST_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
-    class CreatureLevList : public MWWorld::Class
+    class CreatureLevList : public MWWorld::RegisteredClass<CreatureLevList>
     {
-        void ensureCustomData (const MWWorld::Ptr& ptr) const;
+            friend MWWorld::RegisteredClass<CreatureLevList>;
+
+            CreatureLevList();
+
+            void ensureCustomData (const MWWorld::Ptr& ptr) const;
 
         public:
 
@@ -17,8 +21,6 @@ namespace MWClass
             bool hasToolTip (const MWWorld::ConstPtr& ptr) const override;
             ///< @return true if this object has a tooltip when focused (default implementation: true)
 
-            static void registerSelf();
-
             void getModelsToPreload(const MWWorld::Ptr& ptr, std::vector<std::string>& models) const override;
             ///< Get a list of models to preload that this object may use (directly or indirectly). default implementation: list getModel().
 
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index da8eb193d5..ff4efbc1ba 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -46,6 +46,11 @@ namespace MWClass
         }
     };
 
+    Door::Door()
+        : MWWorld::RegisteredClass<Door>(ESM::Door::sRecordId)
+    {
+    }
+
     void Door::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
         if (!model.empty())
@@ -259,13 +264,6 @@ namespace MWClass
         return ref->mBase->mScript;
     }
 
-    void Door::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Door);
-
-        registerClass (ESM::Door::sRecordId, instance);
-    }
-
     MWGui::ToolTipInfo Door::getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const
     {
         const MWWorld::LiveCellRef<ESM::Door> *ref = ptr.get<ESM::Door>();
diff --git a/apps/openmw/mwclass/door.hpp b/apps/openmw/mwclass/door.hpp
index e09d0de6c0..fd824c4732 100644
--- a/apps/openmw/mwclass/door.hpp
+++ b/apps/openmw/mwclass/door.hpp
@@ -3,12 +3,16 @@
 
 #include <components/esm3/loaddoor.hpp>
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
-    class Door : public MWWorld::Class
+    class Door : public MWWorld::RegisteredClass<Door>
     {
+            friend MWWorld::RegisteredClass<Door>;
+
+            Door();
+
             void ensureCustomData (const MWWorld::Ptr& ptr) const;
 
             MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
@@ -46,8 +50,6 @@ namespace MWClass
             std::string getScript (const MWWorld::ConstPtr& ptr) const override;
             ///< Return name of the script attached to ptr
 
-            static void registerSelf();
-
             std::string getModel(const MWWorld::ConstPtr &ptr) const override;
 
             MWWorld::DoorState getDoorState (const MWWorld::ConstPtr &ptr) const override;
diff --git a/apps/openmw/mwclass/ingredient.cpp b/apps/openmw/mwclass/ingredient.cpp
index 424996e417..e0e71902c7 100644
--- a/apps/openmw/mwclass/ingredient.cpp
+++ b/apps/openmw/mwclass/ingredient.cpp
@@ -20,6 +20,10 @@
 
 namespace MWClass
 {
+    Ingredient::Ingredient()
+        : MWWorld::RegisteredClass<Ingredient>(ESM::Ingredient::sRecordId)
+    {
+    }
 
     void Ingredient::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
@@ -77,13 +81,6 @@ namespace MWClass
         return action;
     }
 
-    void Ingredient::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Ingredient);
-
-        registerClass (ESM::Ingredient::sRecordId, instance);
-    }
-
     std::string Ingredient::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
         return std::string("Item Ingredient Up");
diff --git a/apps/openmw/mwclass/ingredient.hpp b/apps/openmw/mwclass/ingredient.hpp
index 2aa831f868..2abb2f343c 100644
--- a/apps/openmw/mwclass/ingredient.hpp
+++ b/apps/openmw/mwclass/ingredient.hpp
@@ -1,12 +1,16 @@
 #ifndef GAME_MWCLASS_INGREDIENT_H
 #define GAME_MWCLASS_INGREDIENT_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
-    class Ingredient : public MWWorld::Class
+    class Ingredient : public MWWorld::RegisteredClass<Ingredient>
     {
+            friend MWWorld::RegisteredClass<Ingredient>;
+
+            Ingredient();
+
             MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
 
         public:
@@ -32,8 +36,6 @@ namespace MWClass
 
             std::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
             ///< Generate action for using via inventory menu
-            
-            static void registerSelf();
 
             std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const override;
             ///< Return the pick up sound Id
diff --git a/apps/openmw/mwclass/itemlevlist.cpp b/apps/openmw/mwclass/itemlevlist.cpp
index 920c6a5d22..2624be4aa8 100644
--- a/apps/openmw/mwclass/itemlevlist.cpp
+++ b/apps/openmw/mwclass/itemlevlist.cpp
@@ -4,6 +4,10 @@
 
 namespace MWClass
 {
+    ItemLevList::ItemLevList()
+        : MWWorld::RegisteredClass<ItemLevList>(ESM::ItemLevList::sRecordId)
+    {
+    }
 
     std::string ItemLevList::getName (const MWWorld::ConstPtr& ptr) const
     {
@@ -14,11 +18,4 @@ namespace MWClass
     {
         return false;
     }
-
-    void ItemLevList::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new ItemLevList);
-
-        registerClass (ESM::ItemLevList::sRecordId, instance);
-    }
 }
diff --git a/apps/openmw/mwclass/itemlevlist.hpp b/apps/openmw/mwclass/itemlevlist.hpp
index 771f8b7a76..d7377bbcb4 100644
--- a/apps/openmw/mwclass/itemlevlist.hpp
+++ b/apps/openmw/mwclass/itemlevlist.hpp
@@ -1,12 +1,16 @@
 #ifndef GAME_MWCLASS_ITEMLEVLIST_H
 #define GAME_MWCLASS_ITEMLEVLIST_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
-    class ItemLevList : public MWWorld::Class
+    class ItemLevList : public MWWorld::RegisteredClass<ItemLevList>
     {
+            friend MWWorld::RegisteredClass<ItemLevList>;
+
+            ItemLevList();
+
         public:
 
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
@@ -14,8 +18,6 @@ namespace MWClass
 
             bool hasToolTip (const MWWorld::ConstPtr& ptr) const override;
             ///< @return true if this object has a tooltip when focused (default implementation: true)
-
-            static void registerSelf();
     };
 }
 
diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index 070b769b83..90080784a9 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -23,6 +23,10 @@
 
 namespace MWClass
 {
+    Light::Light()
+        : MWWorld::RegisteredClass<Light>(ESM::Light::sRecordId)
+    {
+    }
 
     void Light::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
@@ -120,13 +124,6 @@ namespace MWClass
         return ref->mBase->mData.mValue;
     }
 
-    void Light::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Light);
-
-        registerClass (ESM::Light::sRecordId, instance);
-    }
-
     std::string Light::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
         return std::string("Item Misc Up");
diff --git a/apps/openmw/mwclass/light.hpp b/apps/openmw/mwclass/light.hpp
index e8aa4e5878..7a7f670a2a 100644
--- a/apps/openmw/mwclass/light.hpp
+++ b/apps/openmw/mwclass/light.hpp
@@ -1,12 +1,16 @@
 #ifndef GAME_MWCLASS_LIGHT_H
 #define GAME_MWCLASS_LIGHT_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
-    class Light : public MWWorld::Class
+    class Light : public MWWorld::RegisteredClass<Light>
     {
+            friend MWWorld::RegisteredClass<Light>;
+
+            Light();
+
             MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
 
         public:
@@ -44,8 +48,6 @@ namespace MWClass
             int getValue (const MWWorld::ConstPtr& ptr) const override;
             ///< Return trade value of the object. Throws an exception, if the object can't be traded.
 
-            static void registerSelf();
-
             std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const override;
             ///< Return the pick up sound Id
 
diff --git a/apps/openmw/mwclass/lockpick.cpp b/apps/openmw/mwclass/lockpick.cpp
index b97093ae2c..1e451ca7fe 100644
--- a/apps/openmw/mwclass/lockpick.cpp
+++ b/apps/openmw/mwclass/lockpick.cpp
@@ -20,6 +20,10 @@
 
 namespace MWClass
 {
+    Lockpick::Lockpick()
+        : MWWorld::RegisteredClass<Lockpick>(ESM::Lockpick::sRecordId)
+    {
+    }
 
     void Lockpick::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
@@ -76,13 +80,6 @@ namespace MWClass
         return ref->mBase->mData.mValue;
     }
 
-    void Lockpick::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Lockpick);
-
-        registerClass (ESM::Lockpick::sRecordId, instance);
-    }
-
     std::string Lockpick::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
         return std::string("Item Lockpick Up");
diff --git a/apps/openmw/mwclass/lockpick.hpp b/apps/openmw/mwclass/lockpick.hpp
index d4b265e397..b51aaa05a6 100644
--- a/apps/openmw/mwclass/lockpick.hpp
+++ b/apps/openmw/mwclass/lockpick.hpp
@@ -1,12 +1,16 @@
 #ifndef GAME_MWCLASS_LOCKPICK_H
 #define GAME_MWCLASS_LOCKPICK_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
-    class Lockpick : public MWWorld::Class
+    class Lockpick : public MWWorld::RegisteredClass<Lockpick>
     {
+            friend MWWorld::RegisteredClass<Lockpick>;
+
+            Lockpick();
+
             MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
 
         public:
@@ -34,8 +38,6 @@ namespace MWClass
             int getValue (const MWWorld::ConstPtr& ptr) const override;
             ///< Return trade value of the object. Throws an exception, if the object can't be traded.
 
-            static void registerSelf();
-
             std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const override;
             ///< Return the pick up sound Id
 
diff --git a/apps/openmw/mwclass/misc.cpp b/apps/openmw/mwclass/misc.cpp
index 4fbe8ea04e..759eea5ccc 100644
--- a/apps/openmw/mwclass/misc.cpp
+++ b/apps/openmw/mwclass/misc.cpp
@@ -21,6 +21,11 @@
 
 namespace MWClass
 {
+    Miscellaneous::Miscellaneous()
+        : MWWorld::RegisteredClass<Miscellaneous>(ESM::Miscellaneous::sRecordId)
+    {
+    }
+
     bool Miscellaneous::isGold (const MWWorld::ConstPtr& ptr) const
     {
         return Misc::StringUtils::ciEqual(ptr.getCellRef().getRefId(), "gold_001")
@@ -102,13 +107,6 @@ namespace MWClass
         return value;
     }
 
-    void Miscellaneous::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Miscellaneous);
-
-        registerClass (ESM::Miscellaneous::sRecordId, instance);
-    }
-
     std::string Miscellaneous::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
         if (isGold(ptr))
diff --git a/apps/openmw/mwclass/misc.hpp b/apps/openmw/mwclass/misc.hpp
index 18788c7ed8..59c31a219c 100644
--- a/apps/openmw/mwclass/misc.hpp
+++ b/apps/openmw/mwclass/misc.hpp
@@ -1,12 +1,16 @@
 #ifndef GAME_MWCLASS_MISC_H
 #define GAME_MWCLASS_MISC_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
-    class Miscellaneous : public MWWorld::Class
+    class Miscellaneous : public MWWorld::RegisteredClass<Miscellaneous>
     {
+            friend MWWorld::RegisteredClass<Miscellaneous>;
+
+            Miscellaneous();
+
         public:
 
             MWWorld::Ptr copyToCell(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell, int count) const override;
@@ -30,8 +34,6 @@ namespace MWClass
             int getValue (const MWWorld::ConstPtr& ptr) const override;
             ///< Return trade value of the object. Throws an exception, if the object can't be traded.
 
-            static void registerSelf();
-
             std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const override;
             ///< Return the pick up sound Id
 
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 94027e5039..cc4b3f7528 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -245,6 +245,10 @@ namespace
 
 namespace MWClass
 {
+    Npc::Npc()
+        : MWWorld::RegisteredClass<Npc, Actor>(ESM::NPC::sRecordId)
+    {
+    }
 
     class NpcCustomData : public MWWorld::TypedCustomData<NpcCustomData>
     {
@@ -1039,12 +1043,6 @@ namespace MWClass
         return (ref->mBase->mFlags & ESM::NPC::Essential) != 0;
     }
 
-    void Npc::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Npc);
-        registerClass (ESM::NPC::sRecordId, instance);
-    }
-
     bool Npc::hasToolTip(const MWWorld::ConstPtr& ptr) const
     {
         if (!ptr.getRefData().getCustomData() || MWBase::Environment::get().getWindowManager()->isGuiMode())
diff --git a/apps/openmw/mwclass/npc.hpp b/apps/openmw/mwclass/npc.hpp
index 612763d12e..574d133934 100644
--- a/apps/openmw/mwclass/npc.hpp
+++ b/apps/openmw/mwclass/npc.hpp
@@ -1,6 +1,8 @@
 #ifndef GAME_MWCLASS_NPC_H
 #define GAME_MWCLASS_NPC_H
 
+#include "../mwworld/registeredclass.hpp"
+
 #include "actor.hpp"
 
 namespace ESM
@@ -10,8 +12,12 @@ namespace ESM
 
 namespace MWClass
 {
-    class Npc : public Actor
+    class Npc : public MWWorld::RegisteredClass<Npc, Actor>
     {
+            friend MWWorld::RegisteredClass<Npc, Actor>;
+
+            Npc();
+
             void ensureCustomData (const MWWorld::Ptr& ptr) const;
 
             MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
@@ -125,8 +131,6 @@ namespace MWClass
 
             std::string getSoundIdFromSndGen(const MWWorld::Ptr &ptr, const std::string &name) const override;
 
-            static void registerSelf();
-
             std::string getModel(const MWWorld::ConstPtr &ptr) const override;
 
             float getSkill(const MWWorld::Ptr& ptr, int skill) const override;
diff --git a/apps/openmw/mwclass/potion.cpp b/apps/openmw/mwclass/potion.cpp
index 9e7aeffbe5..6357d8938a 100644
--- a/apps/openmw/mwclass/potion.cpp
+++ b/apps/openmw/mwclass/potion.cpp
@@ -22,6 +22,10 @@
 
 namespace MWClass
 {
+    Potion::Potion()
+        : MWWorld::RegisteredClass<Potion>(ESM::Potion::sRecordId)
+    {
+    }
 
     void Potion::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
@@ -70,13 +74,6 @@ namespace MWClass
         return ref->mBase->mData.mValue;
     }
 
-    void Potion::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Potion);
-
-        registerClass (ESM::Potion::sRecordId, instance);
-    }
-
     std::string Potion::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
         return std::string("Item Potion Up");
diff --git a/apps/openmw/mwclass/potion.hpp b/apps/openmw/mwclass/potion.hpp
index 75b962164b..2b979e2f37 100644
--- a/apps/openmw/mwclass/potion.hpp
+++ b/apps/openmw/mwclass/potion.hpp
@@ -1,12 +1,16 @@
 #ifndef GAME_MWCLASS_POTION_H
 #define GAME_MWCLASS_POTION_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
-    class Potion : public MWWorld::Class
+    class Potion : public MWWorld::RegisteredClass<Potion>
     {
+            friend MWWorld::RegisteredClass<Potion>;
+
+            Potion();
+
             MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
 
         public:
@@ -33,8 +37,6 @@ namespace MWClass
             std::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
             ///< Generate action for using via inventory menu
 
-            static void registerSelf();
-
             std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const override;
             ///< Return the pick up sound Id
 
diff --git a/apps/openmw/mwclass/probe.cpp b/apps/openmw/mwclass/probe.cpp
index f705e51435..7db6a3e955 100644
--- a/apps/openmw/mwclass/probe.cpp
+++ b/apps/openmw/mwclass/probe.cpp
@@ -20,6 +20,10 @@
 
 namespace MWClass
 {
+    Probe::Probe()
+        : MWWorld::RegisteredClass<Probe>(ESM::Probe::sRecordId)
+    {
+    }
 
     void Probe::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
@@ -76,13 +80,6 @@ namespace MWClass
         return ref->mBase->mData.mValue;
     }
 
-    void Probe::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Probe);
-
-        registerClass (ESM::Probe::sRecordId, instance);
-    }
-
     std::string Probe::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
         return std::string("Item Probe Up");
diff --git a/apps/openmw/mwclass/probe.hpp b/apps/openmw/mwclass/probe.hpp
index ef9273a379..06bd2ababb 100644
--- a/apps/openmw/mwclass/probe.hpp
+++ b/apps/openmw/mwclass/probe.hpp
@@ -1,12 +1,16 @@
 #ifndef GAME_MWCLASS_PROBE_H
 #define GAME_MWCLASS_PROBE_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
-    class Probe : public MWWorld::Class
+    class Probe : public MWWorld::RegisteredClass<Probe>
     {
+            friend MWWorld::RegisteredClass<Probe>;
+
+            Probe();
+
             MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
 
         public:
@@ -34,8 +38,6 @@ namespace MWClass
             int getValue (const MWWorld::ConstPtr& ptr) const override;
             ///< Return trade value of the object. Throws an exception, if the object can't be traded.
 
-            static void registerSelf();
-
             std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const override;
             ///< Return the pick up sound Id
 
diff --git a/apps/openmw/mwclass/repair.cpp b/apps/openmw/mwclass/repair.cpp
index 64fcd08d78..463257696c 100644
--- a/apps/openmw/mwclass/repair.cpp
+++ b/apps/openmw/mwclass/repair.cpp
@@ -17,6 +17,10 @@
 
 namespace MWClass
 {
+    Repair::Repair()
+        : MWWorld::RegisteredClass<Repair>(ESM::Repair::sRecordId)
+    {
+    }
 
     void Repair::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
@@ -65,13 +69,6 @@ namespace MWClass
         return ref->mBase->mData.mValue;
     }
 
-    void Repair::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Repair);
-
-        registerClass (ESM::Repair::sRecordId, instance);
-    }
-
     std::string Repair::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
         return std::string("Item Repair Up");
diff --git a/apps/openmw/mwclass/repair.hpp b/apps/openmw/mwclass/repair.hpp
index c403449e18..b79ad2b124 100644
--- a/apps/openmw/mwclass/repair.hpp
+++ b/apps/openmw/mwclass/repair.hpp
@@ -1,12 +1,16 @@
 #ifndef GAME_MWCLASS_REPAIR_H
 #define GAME_MWCLASS_REPAIR_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
-    class Repair : public MWWorld::Class
+    class Repair : public MWWorld::RegisteredClass<Repair>
     {
+            friend MWWorld::RegisteredClass<Repair>;
+
+            Repair();
+
             MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
 
         public:
@@ -30,8 +34,6 @@ namespace MWClass
             int getValue (const MWWorld::ConstPtr& ptr) const override;
             ///< Return trade value of the object. Throws an exception, if the object can't be traded.
 
-            static void registerSelf();
-
             std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const override;
             ///< Return the pick up sound Id
 
diff --git a/apps/openmw/mwclass/static.cpp b/apps/openmw/mwclass/static.cpp
index 1fa445e428..8b793dbc67 100644
--- a/apps/openmw/mwclass/static.cpp
+++ b/apps/openmw/mwclass/static.cpp
@@ -13,6 +13,10 @@
 
 namespace MWClass
 {
+    Static::Static()
+        : MWWorld::RegisteredClass<Static>(ESM::Static::sRecordId)
+    {
+    }
 
     void Static::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
@@ -54,13 +58,6 @@ namespace MWClass
         return false;
     }
 
-    void Static::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Static);
-
-        registerClass (ESM::Static::sRecordId, instance);
-    }
-
     MWWorld::Ptr Static::copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const
     {
         const MWWorld::LiveCellRef<ESM::Static> *ref = ptr.get<ESM::Static>();
diff --git a/apps/openmw/mwclass/static.hpp b/apps/openmw/mwclass/static.hpp
index c747eebf2f..6dbeb46662 100644
--- a/apps/openmw/mwclass/static.hpp
+++ b/apps/openmw/mwclass/static.hpp
@@ -1,12 +1,16 @@
 #ifndef GAME_MWCLASS_STATIC_H
 #define GAME_MWCLASS_STATIC_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
-    class Static : public MWWorld::Class
+    class Static : public MWWorld::RegisteredClass<Static>
     {
+            friend MWWorld::RegisteredClass<Static>;
+
+            Static();
+
             MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
 
         public:
@@ -23,8 +27,6 @@ namespace MWClass
             bool hasToolTip (const MWWorld::ConstPtr& ptr) const override;
             ///< @return true if this object has a tooltip when focused (default implementation: true)
 
-            static void registerSelf();
-
             std::string getModel(const MWWorld::ConstPtr &ptr) const override;
     };
 }
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index a0ec4bd0e5..261ada1e75 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -26,6 +26,10 @@
 
 namespace MWClass
 {
+    Weapon::Weapon()
+        : MWWorld::RegisteredClass<Weapon>(ESM::Weapon::sRecordId)
+    {
+    }
 
     void Weapon::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
@@ -121,13 +125,6 @@ namespace MWClass
         return ref->mBase->mData.mValue;
     }
 
-    void Weapon::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Weapon);
-
-        registerClass (ESM::Weapon::sRecordId, instance);
-    }
-
     std::string Weapon::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Weapon> *ref = ptr.get<ESM::Weapon>();
diff --git a/apps/openmw/mwclass/weapon.hpp b/apps/openmw/mwclass/weapon.hpp
index db17e6b70f..61b2a70c26 100644
--- a/apps/openmw/mwclass/weapon.hpp
+++ b/apps/openmw/mwclass/weapon.hpp
@@ -1,16 +1,19 @@
 #ifndef GAME_MWCLASS_WEAPON_H
 #define GAME_MWCLASS_WEAPON_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
-    class Weapon : public MWWorld::Class
+    class Weapon : public MWWorld::RegisteredClass<Weapon>
     {
+            friend MWWorld::RegisteredClass<Weapon>;
+
             MWWorld::Ptr
             copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
 
         public:
+            Weapon();
 
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
@@ -45,8 +48,6 @@ namespace MWClass
             int getValue (const MWWorld::ConstPtr& ptr) const override;
             ///< Return trade value of the object. Throws an exception, if the object can't be traded.
 
-            static void registerSelf();
-
             std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const override;
             ///< Return the pick up sound Id
 
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index 34a2b49c7b..b67f173ee5 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -21,7 +21,11 @@
 
 namespace MWWorld
 {
-    std::map<unsigned int, std::shared_ptr<Class> > Class::sClasses;
+    std::map<unsigned, Class*>& Class::getClasses()
+    {
+        static std::map<unsigned, Class*> values;
+        return values;
+    }
 
     void Class::insertObjectRendering (const Ptr& ptr, const std::string& mesh, MWRender::RenderingInterface& renderingInterface) const
     {
@@ -228,9 +232,10 @@ namespace MWWorld
 
     const Class& Class::get (unsigned int key)
     {
-        auto iter = sClasses.find (key);
+        const auto& classes = getClasses();
+        auto iter = classes.find(key);
 
-        if (iter==sClasses.end())
+        if (iter == classes.end())
             throw std::logic_error ("Class::get(): unknown class key: " + std::to_string(key));
 
         return *iter->second;
@@ -241,10 +246,9 @@ namespace MWWorld
         throw std::runtime_error ("class does not support persistence");
     }
 
-    void Class::registerClass(unsigned int key, std::shared_ptr<Class> instance)
+    void Class::registerClass(Class& instance)
     {
-        instance->mType = key;
-        sClasses.insert(std::make_pair(key, instance));
+        getClasses().emplace(instance.getType(), &instance);
     }
 
     std::string Class::getUpSoundId (const ConstPtr& ptr) const
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index 64ac873960..f12b7ba192 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -54,12 +54,13 @@ namespace MWWorld
     /// \brief Base class for referenceable esm records
     class Class
     {
-            static std::map<unsigned int, std::shared_ptr<Class> > sClasses;
-            unsigned int mType;
+            const unsigned mType;
+
+            static std::map<unsigned, Class*>& getClasses();
 
         protected:
 
-            Class() = default;
+            explicit Class(unsigned type) : mType(type) {}
 
             std::shared_ptr<Action> defaultItemActivate(const Ptr &ptr, const Ptr &actor) const;
             ///< Generate default action for activating inventory items
@@ -340,7 +341,7 @@ namespace MWWorld
             static const Class& get (unsigned int key);
             ///< If there is no class for this \a key, an exception is thrown.
 
-            static void registerClass (unsigned int key,  std::shared_ptr<Class> instance);
+            static void registerClass(Class& instance);
 
             virtual int getBaseGold(const MWWorld::ConstPtr& ptr) const;
 
diff --git a/apps/openmw/mwworld/registeredclass.hpp b/apps/openmw/mwworld/registeredclass.hpp
new file mode 100644
index 0000000000..7ed9632129
--- /dev/null
+++ b/apps/openmw/mwworld/registeredclass.hpp
@@ -0,0 +1,23 @@
+#ifndef GAME_MWWORLD_REGISTEREDCLASS_H
+#define GAME_MWWORLD_REGISTEREDCLASS_H
+
+#include "class.hpp"
+
+namespace MWWorld
+{
+    template <class Derived, class Base = Class>
+    class RegisteredClass : public Base
+    {
+        public:
+            static void registerSelf()
+            {
+                static Derived instance;
+                Base::registerClass(instance);
+            }
+
+        protected:
+            explicit RegisteredClass(unsigned type) : Base(type) {}
+    };
+}
+
+#endif

From a0590d91ceeff9b5c45bbed73b8ffe60cb58508b Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 3 Apr 2022 20:06:16 +0200
Subject: [PATCH 2257/2859] Refactor files/builtin_scripts/CMakeLists.txt

---
 files/builtin_scripts/CMakeLists.txt | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/files/builtin_scripts/CMakeLists.txt b/files/builtin_scripts/CMakeLists.txt
index 1f140a4af1..4e1c08ee8d 100644
--- a/files/builtin_scripts/CMakeLists.txt
+++ b/files/builtin_scripts/CMakeLists.txt
@@ -2,29 +2,22 @@ if (NOT DEFINED OPENMW_RESOURCES_ROOT)
     return()
 endif()
 
-# Copy resource files into the build directory
-set(SDIR ${CMAKE_CURRENT_SOURCE_DIR})
-set(DDIRRELATIVE resources/vfs)
-copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_ROOT} ${DDIRRELATIVE} "builtin.omwscripts")
+set(LUA_BUILTIN_FILES
+    builtin.omwscripts
 
-set(LUA_AUX_FILES
     openmw_aux/util.lua
     openmw_aux/time.lua
     openmw_aux/calendar.lua
-)
-
-set(DDIRRELATIVE resources/vfs/openmw_aux)
-copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_ROOT} ${DDIRRELATIVE} "${LUA_AUX_FILES}")
 
-set(LUA_SCRIPTS_FILES
     scripts/omw/ai.lua
     scripts/omw/camera.lua
     scripts/omw/head_bobbing.lua
     scripts/omw/third_person.lua
+
+    i18n/Calendar/en.lua
 )
 
-set(DDIRRELATIVE resources/vfs/scripts/omw)
-copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_ROOT} ${DDIRRELATIVE} "${LUA_SCRIPTS_FILES}")
+foreach (f ${LUA_BUILTIN_FILES})
+    copy_resource_file("${CMAKE_CURRENT_SOURCE_DIR}/${f}" "${OPENMW_RESOURCES_ROOT}" "resources/vfs/${f}")
+endforeach (f)
 
-set(DDIRRELATIVE resources/vfs/i18n/Calendar)
-copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_ROOT} ${DDIRRELATIVE} "i18n/Calendar/en.lua")

From eca64b48e8081763272c3158497b5e73c570b8f5 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 3 Apr 2022 20:07:09 +0200
Subject: [PATCH 2258/2859] Bitwise operations in Lua

---
 components/lua/luastate.cpp    |  2 +-
 components/lua/utilpackage.cpp | 31 +++++++++++++++++++++++++++++++
 files/lua_api/openmw/util.lua  | 27 +++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/components/lua/luastate.cpp b/components/lua/luastate.cpp
index dbd792224f..4ede81cc02 100644
--- a/components/lua/luastate.cpp
+++ b/components/lua/luastate.cpp
@@ -51,7 +51,7 @@ namespace LuaUtil
 
     LuaState::LuaState(const VFS::Manager* vfs, const ScriptsConfiguration* conf) : mConf(conf), mVFS(vfs)
     {
-        mLua.open_libraries(sol::lib::base, sol::lib::coroutine, sol::lib::math,
+        mLua.open_libraries(sol::lib::base, sol::lib::coroutine, sol::lib::math, sol::lib::bit32,
                             sol::lib::string, sol::lib::table, sol::lib::os, sol::lib::debug);
 
         mLua["math"]["randomseed"](static_cast<unsigned>(std::time(nullptr)));
diff --git a/components/lua/utilpackage.cpp b/components/lua/utilpackage.cpp
index d31a8259be..2eda03dc52 100644
--- a/components/lua/utilpackage.cpp
+++ b/components/lua/utilpackage.cpp
@@ -216,6 +216,37 @@ namespace LuaUtil
         util["normalizeAngle"] = &Misc::normalizeAngle;
         util["makeReadOnly"] = &makeReadOnly;
 
+        if (lua["bit32"] != sol::nil)
+        {
+            sol::table bit = lua["bit32"];
+            util["bitOr"] = bit["bor"];
+            util["bitAnd"] = bit["band"];
+            util["bitXor"] = bit["bxor"];
+            util["bitNot"] = bit["bnot"];
+        }
+        else
+        {
+            util["bitOr"] = [](unsigned a, sol::variadic_args va)
+            {
+                for (auto v : va)
+                    a |= v.as<unsigned>();
+                return a;
+            };
+            util["bitAnd"] = [](unsigned a, sol::variadic_args va)
+            {
+                for (auto v : va)
+                    a &= v.as<unsigned>();
+                return a;
+            };
+            util["bitXor"] = [](unsigned a, sol::variadic_args va)
+            {
+                for (auto v : va)
+                    a ^= v.as<unsigned>();
+                return a;
+            };
+            util["bitNot"] = [](unsigned a) { return ~a; };
+        }
+
         return util;
     }
     
diff --git a/files/lua_api/openmw/util.lua b/files/lua_api/openmw/util.lua
index 4ea0ee4b0d..dbb1cbd8ae 100644
--- a/files/lua_api/openmw/util.lua
+++ b/files/lua_api/openmw/util.lua
@@ -25,6 +25,33 @@
 -- @param #table table Any table.
 -- @return #table The same table wrapped with read only userdata.
 
+---
+-- Bitwise And (supports any number of arguments).
+-- @function [parent=#util] bitAnd
+-- @param #number A First argument (integer).
+-- @param #number B Second argument (integer).
+-- @return #number Bitwise And of A and B.
+
+---
+-- Bitwise Or (supports any number of arguments).
+-- @function [parent=#util] bitOr
+-- @param #number A First argument (integer).
+-- @param #number B Second argument (integer).
+-- @return #number Bitwise Or of A and B.
+
+---
+-- Bitwise Xor (supports any number of arguments).
+-- @function [parent=#util] bitXor
+-- @param #number A First argument (integer).
+-- @param #number B Second argument (integer).
+-- @return #number Bitwise Xor of A and B.
+
+---
+-- Bitwise inversion.
+-- @function [parent=#util] bitNot
+-- @param #number A Argument (integer).
+-- @return #number Bitwise Not of A.
+
 
 ---
 -- Immutable 2D vector

From 5ed22c4c7a015f854b667f2f83c1080b1bc07a3e Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 3 Apr 2022 20:07:47 +0200
Subject: [PATCH 2259/2859] Minor fix in actors.cpp

---
 apps/openmw/mwmechanics/actors.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index a024507cf3..963fd7b806 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1556,7 +1556,7 @@ namespace MWMechanics
                             mov.mRotation[2] = luaControls->mYawChange;
                             mov.mSpeedFactor = osg::Vec2(luaControls->mMovement, luaControls->mSideMovement).length();
                             stats.setMovementFlag(MWMechanics::CreatureStats::Flag_Run, luaControls->mRun);
-                            stats.setAttackingOrSpell(luaControls->mUse == 1);
+                            stats.setAttackingOrSpell((luaControls->mUse & 1) == 1);
                             luaControls->mChanged = false;
                         }
                         luaControls->mSideMovement = movement.x();

From 7186ea8ab4f36743fdc9e004cab38988748875eb Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Mon, 4 Apr 2022 22:08:44 +0200
Subject: [PATCH 2260/2859] [Lua] New overload `Actor.equipment(actor, slot)`.

---
 apps/openmw/mwlua/types/actor.cpp | 16 +++++++++++++++-
 files/lua_api/openmw/types.lua    |  8 +++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwlua/types/actor.cpp b/apps/openmw/mwlua/types/actor.cpp
index 321aaa20e6..335ba517d5 100644
--- a/apps/openmw/mwlua/types/actor.cpp
+++ b/apps/openmw/mwlua/types/actor.cpp
@@ -88,7 +88,7 @@ namespace MWLua
             [](const LObject& o) { return Inventory<LObject>{o}; },
             [](const GObject& o) { return Inventory<GObject>{o}; }
         );
-        actor["equipment"] = [context](const Object& o)
+        auto getAllEquipment = [context](const Object& o)
         {
             const MWWorld::Ptr& ptr = o.ptr();
             sol::table equipment(context.mLua->sol(), sol::create);
@@ -106,6 +106,20 @@ namespace MWLua
             }
             return equipment;
         };
+        auto getEquipmentFromSlot = [context](const Object& o, int slot) -> sol::object
+        {
+            const MWWorld::Ptr& ptr = o.ptr();
+            sol::table equipment(context.mLua->sol(), sol::create);
+            if (!ptr.getClass().hasInventoryStore(ptr))
+                return sol::nil;
+            MWWorld::InventoryStore& store = ptr.getClass().getInventoryStore(ptr);
+            auto it = store.getSlot(slot);
+            if (it == store.end())
+                return sol::nil;
+            context.mWorldView->getObjectRegistry()->registerPtr(*it);
+            return o.getObject(context.mLua->sol(), getId(*it));
+        };
+        actor["equipment"] = sol::overload(getAllEquipment, getEquipmentFromSlot);
         actor["hasEquipped"] = [](const Object& o, const Object& item)
         {
             const MWWorld::Ptr& ptr = o.ptr();
diff --git a/files/lua_api/openmw/types.lua b/files/lua_api/openmw/types.lua
index b9b5df44d6..d62d92169d 100644
--- a/files/lua_api/openmw/types.lua
+++ b/files/lua_api/openmw/types.lua
@@ -108,12 +108,14 @@
 
 ---
 -- Get equipment.
--- Returns a table `slot` -> @{openmw.core#GameObject} of currently equipped items.
+-- Has two overloads:  
+-- 1) With single argument: returns a table `slot` -> @{openmw.core#GameObject} of currently equipped items.
 -- See @{#EQUIPMENT_SLOT}. Returns empty table if the actor doesn't have
--- equipment slots.
+-- equipment slots.  
+-- 2) With two arguments: returns an item equipped to the given slot.
 -- @function [parent=#Actor] equipment
 -- @param openmw.core#GameObject actor
--- @return #map<#number,openmw.core#GameObject>
+-- @param #number slot (optional argument)
 
 ---
 -- Set equipment.

From 3af8ea5dfc4ecf8397947a4f186bfb12bb52cf1a Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 3 Apr 2022 20:42:19 +0200
Subject: [PATCH 2261/2859] Update Lua bindings for the camera

---
 apps/openmw/mwbase/world.hpp                  |  3 ++
 apps/openmw/mwlua/camerabindings.cpp          | 30 +++++++++++++++++++
 apps/openmw/mwlua/luabindings.cpp             |  2 +-
 apps/openmw/mwrender/camera.cpp               |  9 +++---
 apps/openmw/mwrender/camera.hpp               |  8 +++++
 apps/openmw/mwrender/renderingmanager.cpp     | 19 ++++++++++--
 apps/openmw/mwrender/renderingmanager.hpp     |  3 ++
 apps/openmw/mwworld/worldimp.hpp              |  2 ++
 files/builtin_scripts/scripts/omw/camera.lua  |  3 ++
 .../scripts/omw/third_person.lua              |  2 ++
 files/lua_api/openmw/camera.lua               | 30 +++++++++++++++++++
 11 files changed, 104 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index f86f24310a..625758d640 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -64,6 +64,7 @@ namespace MWRender
 {
     class Animation;
     class Camera;
+    class RenderingManager;
 }
 
 namespace MWMechanics
@@ -664,6 +665,8 @@ namespace MWBase
             virtual std::vector<MWWorld::Ptr> getAll(const std::string& id) = 0;
 
             virtual Misc::Rng::Generator& getPrng() = 0;
+
+            virtual MWRender::RenderingManager* getRenderingManager() = 0;
     };
 }
 
diff --git a/apps/openmw/mwlua/camerabindings.cpp b/apps/openmw/mwlua/camerabindings.cpp
index abbd806cef..4e865374cf 100644
--- a/apps/openmw/mwlua/camerabindings.cpp
+++ b/apps/openmw/mwlua/camerabindings.cpp
@@ -1,6 +1,10 @@
 #include "luabindings.hpp"
 
+#include <components/lua/utilpackage.hpp>
+#include <components/settings/settings.hpp>
+
 #include "../mwrender/camera.hpp"
+#include "../mwrender/renderingmanager.hpp"
 
 namespace MWLua
 {
@@ -10,6 +14,7 @@ namespace MWLua
     sol::table initCameraPackage(const Context& context)
     {
         MWRender::Camera* camera = MWBase::Environment::get().getWorld()->getCamera();
+        MWRender::RenderingManager* renderingManager = MWBase::Environment::get().getWorld()->getRenderingManager();
 
         sol::table api(context.mLua->sol(), sol::create);
         api["MODE"] = LuaUtil::makeReadOnly(context.mLua->sol().create_table_with(
@@ -77,6 +82,31 @@ namespace MWLua
         api["setFocalTransitionSpeed"] = [camera](float v) { camera->setFocalPointTransitionSpeed(v); };
         api["instantTransition"] = [camera]() { camera->instantTransition(); };
 
+        api["getCollisionType"] = [camera]() { return camera->getCollisionType(); };
+        api["setCollisionType"] = [camera](int collisionType) { camera->setCollisionType(collisionType); };
+
+        api["getBaseFieldOfView"] = []()
+        {
+            return osg::DegreesToRadians(std::clamp(Settings::Manager::getFloat("field of view", "Camera"), 1.f, 179.f));
+        };
+        api["getFieldOfView"] = [renderingManager]() { return osg::DegreesToRadians(renderingManager->getFieldOfView()); };
+        api["setFieldOfView"] = [renderingManager](float v) { renderingManager->setFieldOfView(osg::RadiansToDegrees(v)); };
+
+        api["getViewTransform"] = [camera]() { return LuaUtil::TransformM{camera->getViewMatrix()}; };
+
+        api["viewportToWorldVector"] = [camera, renderingManager](osg::Vec2f pos) -> osg::Vec3f
+        {
+            double width = Settings::Manager::getInt("resolution x", "Video");
+            double height = Settings::Manager::getInt("resolution y", "Video");
+            double aspect = (height == 0.0) ? 1.0 : width / height;
+            double fovTan = std::tan(osg::DegreesToRadians(renderingManager->getFieldOfView()) / 2);
+            osg::Matrixf invertedViewMatrix;
+            invertedViewMatrix.invert(camera->getViewMatrix());
+            float x = (pos.x() * 2 - 1) * aspect * fovTan;
+            float y = (1 - pos.y() * 2) * fovTan;
+            return invertedViewMatrix.preMult(osg::Vec3f(x, y, -1)) - camera->getPosition();
+        };
+
         return LuaUtil::makeReadOnly(api);
     }
 
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index 9f35866f89..b47e1f2dec 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -41,7 +41,7 @@ namespace MWLua
     {
         auto* lua = context.mLua;
         sol::table api(lua->sol(), sol::create);
-        api["API_REVISION"] = 19;
+        api["API_REVISION"] = 20;
         api["quit"] = [lua]()
         {
             Log(Debug::Warning) << "Quit requested by a Lua script.\n" << lua->debugTraceback();
diff --git a/apps/openmw/mwrender/camera.cpp b/apps/openmw/mwrender/camera.cpp
index 5ca102bc39..7e83a08493 100644
--- a/apps/openmw/mwrender/camera.cpp
+++ b/apps/openmw/mwrender/camera.cpp
@@ -53,6 +53,7 @@ namespace MWRender
 
     Camera::Camera (osg::Camera* camera)
     : mHeightScale(1.f),
+      mCollisionType(MWPhysics::CollisionType::CollisionType_Default & ~MWPhysics::CollisionType::CollisionType_Actor),
       mCamera(camera),
       mAnimation(nullptr),
       mFirstPersonView(true),
@@ -127,6 +128,7 @@ namespace MWRender
             pos = calculateFirstPersonPosition(recalculatedTrackedPosition);
         }
         cam->setViewMatrixAsLookAt(pos, pos + forward, up);
+        mViewMatrix = cam->getViewMatrix();
     }
 
     void Camera::update(float duration, bool paused)
@@ -174,7 +176,6 @@ namespace MWRender
         constexpr float focalObstacleLimit = 10.f;
 
         const auto* rayCasting = MWBase::Environment::get().getWorld()->getRayCasting();
-        constexpr int collisionType = (MWPhysics::CollisionType::CollisionType_Default & ~MWPhysics::CollisionType::CollisionType_Actor);
 
         // Adjust focal point to prevent clipping.
         osg::Vec3d focalOffset = getFocalPointOffset();
@@ -184,7 +185,7 @@ namespace MWRender
         float offsetLen = focalOffset.length();
         if (offsetLen > 0)
         {
-            MWPhysics::RayCastingResult result = rayCasting->castSphere(focal - focalOffset, focal, focalObstacleLimit, collisionType);
+            MWPhysics::RayCastingResult result = rayCasting->castSphere(focal - focalOffset, focal, focalObstacleLimit, mCollisionType);
             if (result.mHit)
             {
                 double adjustmentCoef = -(result.mHitPos + result.mHitNormal * focalObstacleLimit - focal).length() / offsetLen;
@@ -196,7 +197,7 @@ namespace MWRender
         mCameraDistance = mPreferredCameraDistance;
         osg::Quat orient =  osg::Quat(mPitch + mExtraPitch, osg::Vec3d(1,0,0)) * osg::Quat(mYaw + mExtraYaw, osg::Vec3d(0,0,1));
         osg::Vec3d offset = orient * osg::Vec3d(0.f, -mCameraDistance, 0.f);
-        MWPhysics::RayCastingResult result = rayCasting->castSphere(focal, focal + offset, cameraObstacleLimit, collisionType);
+        MWPhysics::RayCastingResult result = rayCasting->castSphere(focal, focal + offset, cameraObstacleLimit, mCollisionType);
         if (result.mHit)
         {
             mCameraDistance = (result.mHitPos + result.mHitNormal * cameraObstacleLimit - focal).length();
@@ -211,7 +212,7 @@ namespace MWRender
         if (mMode == newMode)
             return;
         Mode oldMode = mMode;
-        if (!force && (newMode == Mode::FirstPerson || oldMode == Mode::FirstPerson) && !mAnimation->upperBodyReady())
+        if (!force && (newMode == Mode::FirstPerson || oldMode == Mode::FirstPerson) && mAnimation && !mAnimation->upperBodyReady())
         {
             // Changing the view will stop all playing animations, so if we are playing
             // anything important, queue the view change for later
diff --git a/apps/openmw/mwrender/camera.hpp b/apps/openmw/mwrender/camera.hpp
index 280d309256..ba815a7e60 100644
--- a/apps/openmw/mwrender/camera.hpp
+++ b/apps/openmw/mwrender/camera.hpp
@@ -5,6 +5,7 @@
 #include <string>
 
 #include <osg/ref_ptr>
+#include <osg/Matrix>
 #include <osg/Vec3>
 #include <osg/Vec3d>
 
@@ -95,11 +96,17 @@ namespace MWRender
         void setFirstPersonOffset(const osg::Vec3f& v) { mFirstPersonOffset = v; }
         osg::Vec3f getFirstPersonOffset() const { return mFirstPersonOffset; }
 
+        int getCollisionType() const { return mCollisionType; }
+        void setCollisionType(int collisionType) { mCollisionType = collisionType; }
+
+        const osg::Matrixf& getViewMatrix() const { return mViewMatrix; }
+
     private:
         MWWorld::Ptr mTrackingPtr;
         osg::ref_ptr<const osg::Node> mTrackingNode;
         osg::Vec3d mTrackedPosition;
         float mHeightScale;
+        int mCollisionType;
 
         osg::ref_ptr<osg::Camera> mCamera;
 
@@ -121,6 +128,7 @@ namespace MWRender
         float mExtraPitch = 0, mExtraYaw = 0;
         bool mLockPitch = false, mLockYaw = false;
         osg::Vec3d mPosition;
+        osg::Matrixf mViewMatrix;
 
         float mCameraDistance, mPreferredCameraDistance;
 
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 4ec44f0141..a504a42faf 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -817,6 +817,11 @@ namespace MWRender
         updateNavMesh();
         updateRecastMesh();
 
+        if (mUpdateProjectionMatrix)
+        {
+            mUpdateProjectionMatrix = false;
+            updateProjectionMatrix();
+        }
         mCamera->update(dt, paused);
 
         bool isUnderwater = mWater->isUnderwater(mCamera->getPosition());
@@ -1161,8 +1166,7 @@ namespace MWRender
 
         // Since our fog is not radial yet, we should take FOV in account, otherwise terrain near viewing distance may disappear.
         // Limit FOV here just for sure, otherwise viewing distance can be too high.
-        fov = std::min(mFieldOfView, 140.f);
-        float distanceMult = std::cos(osg::DegreesToRadians(fov)/2.f);
+        float distanceMult = std::cos(osg::DegreesToRadians(std::min(fov, 140.f))/2.f);
         mTerrain->setViewDistance(mViewDistance * (distanceMult ? 1.f/distanceMult : 1.f));
     }
 
@@ -1300,6 +1304,17 @@ namespace MWRender
         }
     }
 
+    void RenderingManager::setFieldOfView(float val)
+    {
+        mFieldOfView = val;
+        mUpdateProjectionMatrix = true;
+    }
+
+    float RenderingManager::getFieldOfView() const
+    {
+        return mFieldOfViewOverridden ? mFieldOfViewOverridden : mFieldOfView;
+    }
+
     osg::Vec3f RenderingManager::getHalfExtents(const MWWorld::ConstPtr& object) const
     {
         osg::Vec3f halfExtents(0, 0, 0);
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index 119c85f82f..b25e675748 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -214,6 +214,8 @@ namespace MWRender
 
         /// temporarily override the field of view with given value.
         void overrideFieldOfView(float val);
+        void setFieldOfView(float val);
+        float getFieldOfView() const;
         /// reset a previous overrideFieldOfView() call, i.e. revert to field of view specified in the settings file.
         void resetFieldOfView();
 
@@ -301,6 +303,7 @@ namespace MWRender
         float mFieldOfViewOverride;
         float mFieldOfView;
         float mFirstPersonFieldOfView;
+        bool mUpdateProjectionMatrix = false;
 
         void operator = (const RenderingManager&);
         RenderingManager(const RenderingManager&);
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 6eeda94ef3..dc07a9117b 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -743,6 +743,8 @@ namespace MWWorld
             std::vector<MWWorld::Ptr> getAll(const std::string& id) override;
 
             Misc::Rng::Generator& getPrng() override;
+
+            MWRender::RenderingManager* getRenderingManager() override { return mRendering.get(); }
     };
 }
 
diff --git a/files/builtin_scripts/scripts/omw/camera.lua b/files/builtin_scripts/scripts/omw/camera.lua
index 40b25c6d13..04252e1b47 100644
--- a/files/builtin_scripts/scripts/omw/camera.lua
+++ b/files/builtin_scripts/scripts/omw/camera.lua
@@ -4,6 +4,7 @@ local input = require('openmw.input')
 local settings = require('openmw.settings')
 local util = require('openmw.util')
 local self = require('openmw.self')
+local nearby = require('openmw.nearby')
 
 local Actor = require('openmw.types').Actor
 
@@ -23,6 +24,8 @@ local noHeadBobbing = 0
 local noZoom = 0
 
 local function init()
+    camera.setCollisionType(util.bitAnd(nearby.COLLISION_TYPE.Default, util.bitNot(nearby.COLLISION_TYPE.Actor)))
+    camera.setFieldOfView(camera.getBaseFieldOfView())
     camera.allowCharacterDeferredRotation(settings._getBoolFromSettingsCfg('Camera', 'deferred preview rotation'))
     if camera.getMode() == MODE.FirstPerson then
         primaryMode = MODE.FirstPerson
diff --git a/files/builtin_scripts/scripts/omw/third_person.lua b/files/builtin_scripts/scripts/omw/third_person.lua
index 95f872b15f..1b833d2322 100644
--- a/files/builtin_scripts/scripts/omw/third_person.lua
+++ b/files/builtin_scripts/scripts/omw/third_person.lua
@@ -78,6 +78,8 @@ local function updateState()
         state = STATE.Swimming
     elseif oldState == STATE.Combat or oldState == STATE.Swimming then
         state = defaultShoulder
+    elseif not state then
+        state = defaultShoulder
     end
     if autoSwitchShoulder and (mode == MODE.ThirdPerson or state ~= oldState or noThirdPersonLastFrame)
        and (state == STATE.LeftShoulder or state == STATE.RightShoulder) then
diff --git a/files/lua_api/openmw/camera.lua b/files/lua_api/openmw/camera.lua
index 1d09bdf7ad..f744dcbc5c 100644
--- a/files/lua_api/openmw/camera.lua
+++ b/files/lua_api/openmw/camera.lua
@@ -166,6 +166,36 @@
 -- Make instant the current transition of camera focal point and the current deferred rotation (see `allowCharacterDeferredRotation`).
 -- @function [parent=#camera] instantTransition
 
+--- Get current camera collision type (see @{openmw.nearby#COLLISION_TYPE}).
+-- @function [parent=#camera] getCollisionType
+-- @return #number
+
+--- Set camera collision type (see @{openmw.nearby#COLLISION_TYPE}).
+-- @function [parent=#camera] setCollisionType
+-- @param #number collisionType
+
+--- Return base field of view vertical angle in radians
+-- @function [parent=#camera] getBaseFieldOfView
+-- @return #number
+
+--- Return current field of view vertical angle in radians
+-- @function [parent=#camera] getFieldOfView
+-- @return #number
+
+--- Set field of view
+-- @function [parent=#camera] setFieldOfView
+-- @param #number fov Field of view vertical angle in radians
+
+--- Get world to local transform for the camera.
+-- @function [parent=#camera] getViewTransform
+-- @return openmw.util#Transform
+
+--- Get vector from the camera to the world for the given point in viewport.
+-- (0, 0) is the top left corner of the screen.
+-- @function [parent=#camera] viewportToWorldVector
+-- @param openmw.util#Vector2 normalizedScreenPos
+-- @return openmw.util#Vector3
+
 
 return nil
 

From a46714df673fc0e1777ba0d9fbe394682a62cf69 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 6 Apr 2022 23:00:13 +0200
Subject: [PATCH 2262/2859] Replace boost::variant by std::variant

---
 apps/openmw/mwscript/globalscripts.cpp | 20 ++++++++++----------
 apps/openmw/mwscript/globalscripts.hpp |  5 ++---
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/apps/openmw/mwscript/globalscripts.cpp b/apps/openmw/mwscript/globalscripts.cpp
index 680fd145a0..4a38d09bd0 100644
--- a/apps/openmw/mwscript/globalscripts.cpp
+++ b/apps/openmw/mwscript/globalscripts.cpp
@@ -16,7 +16,7 @@
 
 namespace
 {
-    struct ScriptCreatingVisitor : public boost::static_visitor<ESM::GlobalScript>
+    struct ScriptCreatingVisitor
     {
         ESM::GlobalScript operator()(const MWWorld::Ptr &ptr) const
         {
@@ -46,7 +46,7 @@ namespace
         }
     };
 
-    struct PtrGettingVisitor : public boost::static_visitor<const MWWorld::Ptr*>
+    struct PtrGettingVisitor
     {
         const MWWorld::Ptr* operator()(const MWWorld::Ptr &ptr) const
         {
@@ -59,7 +59,7 @@ namespace
         }
     };
 
-    struct PtrResolvingVisitor : public boost::static_visitor<MWWorld::Ptr>
+    struct PtrResolvingVisitor
     {
         MWWorld::Ptr operator()(const MWWorld::Ptr &ptr) const
         {
@@ -76,7 +76,7 @@ namespace
         }
     };
 
-    class MatchPtrVisitor : public boost::static_visitor<bool>
+    class MatchPtrVisitor
     {
         const MWWorld::Ptr& mPtr;
     public:
@@ -93,7 +93,7 @@ namespace
         }
     };
 
-    struct IdGettingVisitor : public boost::static_visitor<std::string>
+    struct IdGettingVisitor
     {
         std::string operator()(const MWWorld::Ptr& ptr) const
         {
@@ -115,19 +115,19 @@ namespace MWScript
 
     const MWWorld::Ptr* GlobalScriptDesc::getPtrIfPresent() const
     {
-        return boost::apply_visitor(PtrGettingVisitor(), mTarget);
+        return std::visit(PtrGettingVisitor(), mTarget);
     }
 
     MWWorld::Ptr GlobalScriptDesc::getPtr()
     {
-        MWWorld::Ptr ptr = boost::apply_visitor(PtrResolvingVisitor(), mTarget);
+        MWWorld::Ptr ptr = std::visit(PtrResolvingVisitor {}, mTarget);
         mTarget = ptr;
         return ptr;
     }
 
     std::string GlobalScriptDesc::getId() const
     {
-        return boost::apply_visitor(IdGettingVisitor(), mTarget);
+        return std::visit(IdGettingVisitor {}, mTarget);
     }
 
 
@@ -239,7 +239,7 @@ namespace MWScript
     {
         for (const auto& iter : mScripts)
         {
-            ESM::GlobalScript script = boost::apply_visitor (ScriptCreatingVisitor(), iter.second->mTarget);
+            ESM::GlobalScript script = std::visit (ScriptCreatingVisitor {}, iter.second->mTarget);
 
             script.mId = iter.first;
 
@@ -338,7 +338,7 @@ namespace MWScript
         MatchPtrVisitor visitor(base);
         for (const auto& script : mScripts)
         {
-            if (boost::apply_visitor (visitor, script.second->mTarget))
+            if (std::visit (visitor, script.second->mTarget))
                 script.second->mTarget = updated;
         }
     }
diff --git a/apps/openmw/mwscript/globalscripts.hpp b/apps/openmw/mwscript/globalscripts.hpp
index f0eaf88739..8725959e66 100644
--- a/apps/openmw/mwscript/globalscripts.hpp
+++ b/apps/openmw/mwscript/globalscripts.hpp
@@ -1,12 +1,11 @@
 #ifndef GAME_SCRIPT_GLOBALSCRIPTS_H
 #define GAME_SCRIPT_GLOBALSCRIPTS_H
 
-#include <boost/variant/variant.hpp>
-
 #include <string>
 #include <map>
 #include <memory>
 #include <utility>
+#include <variant>
 
 #include <cstdint>
 
@@ -37,7 +36,7 @@ namespace MWScript
     {
         bool mRunning;
         Locals mLocals;
-        boost::variant<MWWorld::Ptr, std::pair<ESM::RefNum, std::string> > mTarget; // Used to start targeted script
+        std::variant<MWWorld::Ptr, std::pair<ESM::RefNum, std::string>> mTarget; // Used to start targeted script
 
         GlobalScriptDesc();
 

From 02bbd226b8ec3af52e300247394c86423d2eb25e Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Wed, 6 Apr 2022 23:36:44 +0200
Subject: [PATCH 2263/2859] Less primary/secondary coordinate boilerplate in
 Flex

---
 components/lua_ui/flex.cpp | 29 ++++++++++++-----------
 components/lua_ui/flex.hpp | 48 +++++---------------------------------
 2 files changed, 22 insertions(+), 55 deletions(-)

diff --git a/components/lua_ui/flex.cpp b/components/lua_ui/flex.cpp
index eb37a05fbf..13acfb3990 100644
--- a/components/lua_ui/flex.cpp
+++ b/components/lua_ui/flex.cpp
@@ -32,6 +32,11 @@ namespace LuaUi
             }
             return alignedPosition;
         }
+
+        float getGrow(WidgetExtension* w)
+        {
+            return std::max(0.0f, w->externalValue("grow", 0.0f));
+        }
     }
 
     void LuaFlex::updateChildren()
@@ -42,9 +47,9 @@ namespace LuaUi
         {
             w->clearForced();
             MyGUI::IntSize size = w->calculateSize();
-            setPrimary(childrenSize, getPrimary(childrenSize) + getPrimary(size));
-            setSecondary(childrenSize, std::max(getSecondary(childrenSize), getSecondary(size)));
-            totalGrow += std::max(0.0f, w->externalValue("grow", 0.0f));
+            primary(childrenSize) += primary(size);
+            secondary(childrenSize) = std::max(secondary(childrenSize), secondary(size));
+            totalGrow += getGrow(w);
         }
         mChildrenSize = childrenSize;
 
@@ -53,22 +58,20 @@ namespace LuaUi
         float growFactor = 0;
         if (totalGrow > 0)
         {
-            growSize = getPrimary(flexSize) - getPrimary(childrenSize);
+            growSize = primary(flexSize) - primary(childrenSize);
             growFactor = growSize / totalGrow;
-        }
-        setPrimary(flexSize, getPrimary(flexSize) - growSize);
+        }   
 
         MyGUI::IntPoint childPosition;
-        setPrimary(childPosition, alignSize(getPrimary(flexSize), getPrimary(childrenSize), mAlign));
-        setSecondary(childPosition, alignSize(getSecondary(flexSize), getSecondary(childrenSize), mArrange));
+        primary(childPosition) = alignSize(primary(flexSize) - growSize, primary(childrenSize), mAlign);
+        secondary(childPosition) = alignSize(secondary(flexSize), secondary(childrenSize), mArrange);
         for (auto* w : children())
         {
             w->forcePosition(childPosition);
             MyGUI::IntSize size = w->widget()->getSize();
-            float grow = std::max(0.0f, w->externalValue("grow", 0.0f));
-            setPrimary(size, getPrimary(size) + static_cast<int>(growFactor * grow));
+            primary(size) += static_cast<int>(growFactor * getGrow(w));
             w->forceSize(size);
-            setPrimary(childPosition, getPrimary(childPosition) + getPrimary(size));
+            primary(childPosition) += primary(size);
         }
         WidgetExtension::updateProperties();
     }
@@ -77,8 +80,8 @@ namespace LuaUi
     {
         MyGUI::IntSize size = WidgetExtension::calculateSize();
         if (mAutoSized) {
-            setPrimary(size, getPrimary(mChildrenSize));
-            setSecondary(size, std::max(getSecondary(size), getSecondary(mChildrenSize)));
+            primary(size) = primary(mChildrenSize);
+            secondary(size) = std::max(secondary(size), secondary(mChildrenSize));
         }
         return size;
     }
diff --git a/components/lua_ui/flex.hpp b/components/lua_ui/flex.hpp
index 0ac8963f73..9ac85213f6 100644
--- a/components/lua_ui/flex.hpp
+++ b/components/lua_ui/flex.hpp
@@ -27,63 +27,27 @@ namespace LuaUi
             Alignment mArrange;
 
             template<typename T>
-            inline T getPrimary(const MyGUI::types::TPoint<T>& point)
+            T& primary(MyGUI::types::TPoint<T>& point)
             {
                 return mHorizontal ? point.left : point.top;
             }
 
             template<typename T>
-            inline T getSecondary(const MyGUI::types::TPoint<T>& point)
+            T& secondary(MyGUI::types::TPoint<T>& point)
             {
                 return mHorizontal ? point.top : point.left;
             }
 
             template<typename T>
-            inline void setPrimary(MyGUI::types::TPoint<T>& point, T value)
+            T& primary(MyGUI::types::TSize<T>& size)
             {
-                if (mHorizontal)
-                    point.left = value;
-                else
-                    point.top = value;
+                return mHorizontal ? size.width : size.height;
             }
 
             template<typename T>
-            inline void setSecondary(MyGUI::types::TPoint<T>& point, T value)
+            T& secondary(MyGUI::types::TSize<T>& size)
             {
-                if (mHorizontal)
-                    point.top = value;
-                else
-                    point.left = value;
-            }
-
-            template<typename T>
-            inline T getPrimary(const MyGUI::types::TSize<T>& point)
-            {
-                return mHorizontal ? point.width : point.height;
-            }
-
-            template<typename T>
-            inline T getSecondary(const MyGUI::types::TSize<T>& point)
-            {
-                return mHorizontal ? point.height : point.width;
-            }
-
-            template<typename T>
-            inline void setPrimary(MyGUI::types::TSize<T>& point, T value)
-            {
-                if (mHorizontal)
-                    point.width = value;
-                else
-                    point.height = value;
-            }
-
-            template<typename T>
-            inline void setSecondary(MyGUI::types::TSize<T>& point, T value)
-            {
-                if (mHorizontal)
-                    point.height = value;
-                else
-                    point.width = value;
+                return mHorizontal ? size.height : size.width;
             }
     };
 }

From ead73fce312a215374fecde6f401761b87f7e793 Mon Sep 17 00:00:00 2001
From: Wolfgang Lieff <wolfgang.lieff@internode.on.net>
Date: Tue, 29 Mar 2022 21:47:37 +0200
Subject: [PATCH 2264/2859] initial NiFltAnimationNode support

---
 apps/openmw/mwrender/objectpaging.cpp | 13 +++++++++++++
 components/nif/niffile.cpp            |  1 +
 components/nif/node.hpp               | 11 +++++++++++
 components/nif/record.hpp             |  1 +
 components/nifosg/nifloader.cpp       | 19 +++++++++++++++++++
 components/sceneutil/optimizer.cpp    | 16 +++++++++++++++-
 components/sceneutil/optimizer.hpp    |  2 ++
 7 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index 4748491dd4..4865f1088e 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -5,6 +5,7 @@
 #include <osg/Version>
 #include <osg/LOD>
 #include <osg/Switch>
+#include <osg/Sequence>
 #include <osg/MatrixTransform>
 #include <osg/Material>
 #include <osgUtil/IncrementalCompileOperation>
@@ -152,6 +153,13 @@ namespace MWRender
                 n->setDataVariance(osg::Object::STATIC);
                 return n;
             }
+            if (const osg::Sequence* sq = dynamic_cast<const osg::Sequence*>(node))
+            {
+                osg::Group* n = new osg::Group;
+                n->addChild(operator()(sq->getChild(sq->getValue())));
+                n->setDataVariance(osg::Object::STATIC);
+                return n;
+            }
 
             mNodePath.push_back(node);
 
@@ -301,6 +309,11 @@ namespace MWRender
                         traverse(*lod->getChild(i));
                 return;
             }
+            if (osg::Sequence* sq = dynamic_cast<osg::Sequence*>(&node))
+            {
+                traverse(*sq->getChild(sq->getValue()));
+                return;
+            }
 
             traverse(node);
         }
diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index 0a1acde5b5..57d1ce6457 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -36,6 +36,7 @@ static std::map<std::string, CreateRecord> makeFactory()
         {"NiNode"                       , &construct <NiNode                      , RC_NiNode                     >},
         {"NiSwitchNode"                 , &construct <NiSwitchNode                , RC_NiSwitchNode               >},
         {"NiLODNode"                    , &construct <NiLODNode                   , RC_NiLODNode                  >},
+        {"NiFltAnimationNode"           , &construct <NiFltAnimationNode          , RC_NiFltAnimationNode         >},
         {"AvoidNode"                    , &construct <NiNode                      , RC_AvoidNode                  >},
         {"NiCollisionSwitch"            , &construct <NiNode                      , RC_NiCollisionSwitch          >},
         {"NiBSParticleNode"             , &construct <NiNode                      , RC_NiBSParticleNode           >},
diff --git a/components/nif/node.hpp b/components/nif/node.hpp
index 34ac12e490..6452e2b8af 100644
--- a/components/nif/node.hpp
+++ b/components/nif/node.hpp
@@ -431,6 +431,17 @@ struct NiLODNode : public NiSwitchNode
     }
 };
 
+struct NiFltAnimationNode : public NiSwitchNode
+{
+    float Interval;
+
+    void read(NIFStream *nif) override
+    {
+        NiSwitchNode::read(nif);
+        Interval = nif->getFloat();
+    }
+};
+
 // Abstract
 struct NiAccumulator : Record
 {
diff --git a/components/nif/record.hpp b/components/nif/record.hpp
index 133c393ab5..37084af44e 100644
--- a/components/nif/record.hpp
+++ b/components/nif/record.hpp
@@ -38,6 +38,7 @@ enum RecordType
   RC_NiNode,
   RC_NiSwitchNode,
   RC_NiLODNode,
+  RC_NiFltAnimationNode,
   RC_NiBillboardNode,
   RC_AvoidNode,
   RC_NiCollisionSwitch,
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 3007bc6cf2..9d66d3f4b6 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -8,6 +8,7 @@
 #include <osg/Array>
 #include <osg/LOD>
 #include <osg/Switch>
+#include <osg/Sequence>
 #include <osg/TexGen>
 #include <osg/ValueObject>
 
@@ -416,6 +417,17 @@ namespace NifOsg
             return switchNode;
         }
 
+        static osg::ref_ptr<osg::Sequence> handleSequenceNode(const Nif::NiFltAnimationNode* niFltAnimationNode)
+        {
+            osg::ref_ptr<osg::Sequence> sequenceNode (new osg::Sequence);
+            sequenceNode->setName(niFltAnimationNode->name);
+            sequenceNode->setDefaultTime(niFltAnimationNode->Interval);
+            sequenceNode->setInterval(osg::Sequence::LOOP, 0,-1);
+            sequenceNode->setDuration( -1.0f, -1);
+            sequenceNode->setMode(osg::Sequence::START);
+            return sequenceNode;
+        }
+
         osg::ref_ptr<osg::Image> handleSourceTexture(const Nif::NiSourceTexture* st, Resource::ImageManager* imageManager)
         {
             if (!st)
@@ -711,6 +723,13 @@ namespace NifOsg
                 node->addChild(lodNode);
                 currentNode = lodNode;
             }
+            else if (nifNode->recType == Nif::RC_NiFltAnimationNode)
+            {
+                const Nif::NiFltAnimationNode* niFltAnimationNode = static_cast<const Nif::NiFltAnimationNode*>(nifNode);
+                osg::ref_ptr<osg::Sequence> sequenceNode = handleSequenceNode(niFltAnimationNode);
+                node->addChild(sequenceNode);
+                currentNode = sequenceNode;
+            }
 
             const Nif::NiNode *ninode = dynamic_cast<const Nif::NiNode*>(nifNode);
             if(ninode)
diff --git a/components/sceneutil/optimizer.cpp b/components/sceneutil/optimizer.cpp
index 748ceee952..00e113afb9 100644
--- a/components/sceneutil/optimizer.cpp
+++ b/components/sceneutil/optimizer.cpp
@@ -23,6 +23,7 @@
 #include <osg/MatrixTransform>
 #include <osg/PositionAttitudeTransform>
 #include <osg/LOD>
+#include <osg/Sequence>
 #include <osg/Billboard>
 #include <osg/Geometry>
 #include <osg/Notify>
@@ -845,7 +846,7 @@ void Optimizer::RemoveEmptyNodesVisitor::removeEmptyNodes()
                 ++pitr)
             {
                 osg::Group* parent = *pitr;
-                if (!parent->asSwitch() && !dynamic_cast<osg::LOD*>(parent))
+                if (!parent->asSwitch() && !dynamic_cast<osg::LOD*>(parent) && !dynamic_cast<osg::Sequence*>(parent))
                 {
                     parent->removeChild(nodeToRemove.get());
                     if (parent->getNumChildren()==0 && isOperationPermissibleForObject(parent)) newEmptyGroups.insert(parent);
@@ -887,6 +888,13 @@ void Optimizer::RemoveRedundantNodesVisitor::apply(osg::Switch& switchNode)
         traverse(*switchNode.getChild(i));
 }
 
+void Optimizer::RemoveRedundantNodesVisitor::apply(osg::Sequence& sequenceNode)
+{
+    // We should keep all sequence child nodes since they reflect different sequence states.
+    for (unsigned int i=0; i<sequenceNode.getNumChildren(); ++i)
+        traverse(*sequenceNode.getChild(i));
+}
+
 void Optimizer::RemoveRedundantNodesVisitor::apply(osg::Group& group)
 {
     if (typeid(group)==typeid(osg::Group) &&
@@ -1951,6 +1959,12 @@ void Optimizer::MergeGroupsVisitor::apply(osg::Switch &switchNode)
     traverse(switchNode);
 }
 
+void Optimizer::MergeGroupsVisitor::apply(osg::Sequence &sequenceNode)
+{
+    // We should keep all sequence child nodes since they reflect different sequence states.
+    traverse(sequenceNode);
+}
+
 void Optimizer::MergeGroupsVisitor::apply(osg::Group &group)
 {
     if (group.getNumChildren() <= 1)
diff --git a/components/sceneutil/optimizer.hpp b/components/sceneutil/optimizer.hpp
index 5191bcf322..196180f112 100644
--- a/components/sceneutil/optimizer.hpp
+++ b/components/sceneutil/optimizer.hpp
@@ -362,6 +362,7 @@ class Optimizer
                 void apply(osg::Transform& transform) override;
                 void apply(osg::LOD& lod) override;
                 void apply(osg::Switch& switchNode) override;
+                void apply(osg::Sequence& sequenceNode) override;
                 void apply(osg::Geometry&) override { }
 
                 bool isOperationPermissible(osg::Node& node);
@@ -385,6 +386,7 @@ class Optimizer
             void apply(osg::Group& group) override;
             void apply(osg::LOD& lod) override;
             void apply(osg::Switch& switchNode) override;
+            void apply(osg::Sequence& sequenceNode) override;
         };
 
         class MergeGeometryVisitor : public BaseOptimizerVisitor

From 0db541597650d7954aff8ea17cf9478e469d1d9e Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 30 Mar 2022 09:27:00 +0200
Subject: [PATCH 2265/2859] refactor to use mInternal, support Flag_Reverse and
 updated changelog/authors.md

---
 AUTHORS.md                            | 5 +++--
 CHANGELOG.md                          | 3 ++-
 apps/openmw/mwrender/objectpaging.cpp | 3 +--
 components/nif/node.hpp               | 9 +++++++--
 components/nifosg/nifloader.cpp       | 8 +++++---
 5 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index 84f465414e..264ffe2668 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -164,6 +164,7 @@ Programmers
     Nialsy
     Nick Crawford (nighthawk469)
     Nikolay Kasyanov (corristo)
+    Noah Gooder
     nobrakal
     Nolan Poe (nopoe)
     Nurivan Gomez (Nuri-G)
@@ -228,14 +229,14 @@ Programmers
     viadanna
     Vincent Heuken
     Vladimir Panteleev (CyberShadow)
+    vocollapse
     Wang Ryu (bzzt)
     Will Herrmann (Thunderforge)
-    vocollapse
+    Wolfgang Lieff
     xyzz
     Yohaulticetl
     Yuri Krupenin
     zelurker
-    Noah Gooder
 
 Documentation
 -------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03777cbf87..952dce3495 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -138,11 +138,12 @@
     Feature #6288: Preserve the "blocked" record flag for referenceable objects.
     Feature #6380: Commas are treated as whitespace in vanilla
     Feature #6419: Topics shouldn't be greyed out if they can produce another topic reference
-    Feature #6443: NiStencilProperty is not fully supported
+    Feature #6443: Support NiStencilProperty
     Feature #6534: Shader-based object texture blending
     Feature #6541: Gloss-mapping
     Feature #6592: Missing support for NiTriShape particle emitters
     Feature #6600: Support NiSortAdjustNode
+    Feature #6684: Support NiFltAnimationNode
     Task #6201: Remove the "Note: No relevant classes found. No output generated" warnings
     Task #6264: Remove the old classes in animation.cpp
     Task #6553: Simplify interpreter instruction registration
diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index 4865f1088e..57040eca98 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -2,7 +2,6 @@
 
 #include <unordered_map>
 
-#include <osg/Version>
 #include <osg/LOD>
 #include <osg/Switch>
 #include <osg/Sequence>
@@ -66,7 +65,7 @@ namespace MWRender
           case ESM::REC_CONT:
             return store.get<ESM::Container>().searchStatic(id)->mModel;
           default:
-            return std::string();
+            return {};
         }
     }
 
diff --git a/components/nif/node.hpp b/components/nif/node.hpp
index 6452e2b8af..2f64e39a75 100644
--- a/components/nif/node.hpp
+++ b/components/nif/node.hpp
@@ -433,12 +433,17 @@ struct NiLODNode : public NiSwitchNode
 
 struct NiFltAnimationNode : public NiSwitchNode
 {
-    float Interval;
+    float mInterval;
+    enum Flags
+    {
+        Flag_Reverse = 0x40
+    };
+
 
     void read(NIFStream *nif) override
     {
         NiSwitchNode::read(nif);
-        Interval = nif->getFloat();
+        mInterval = nif->getFloat();
     }
 };
 
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 9d66d3f4b6..8406db3839 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -421,10 +421,12 @@ namespace NifOsg
         {
             osg::ref_ptr<osg::Sequence> sequenceNode (new osg::Sequence);
             sequenceNode->setName(niFltAnimationNode->name);
-            sequenceNode->setDefaultTime(niFltAnimationNode->Interval);
-            sequenceNode->setInterval(osg::Sequence::LOOP, 0,-1);
-            sequenceNode->setDuration( -1.0f, -1);
+            sequenceNode->setDefaultTime(niFltAnimationNode->mInterval);
             sequenceNode->setMode(osg::Sequence::START);
+            if (!niFltAnimationNode->flags & Nif::NiFltAnimationNode::Flag_Reverse)
+                sequenceNode->setDuration(-1.0f, -1);
+            else
+                sequenceNode->setDuration(1.0f, -1);
             return sequenceNode;
         }
 

From af41560c3fc67d6113a4ab58d66a994a02dbfe2b Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 30 Mar 2022 15:51:21 +0200
Subject: [PATCH 2266/2859] reverse the reverse flag check; set duration to
 0.2f which matches openmw to morrowind speed which is measured in 1/5 seconds

---
 components/nifosg/nifloader.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 8406db3839..9cd2685747 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -423,10 +423,10 @@ namespace NifOsg
             sequenceNode->setName(niFltAnimationNode->name);
             sequenceNode->setDefaultTime(niFltAnimationNode->mInterval);
             sequenceNode->setMode(osg::Sequence::START);
-            if (!niFltAnimationNode->flags & Nif::NiFltAnimationNode::Flag_Reverse)
-                sequenceNode->setDuration(-1.0f, -1);
+            if (niFltAnimationNode->flags & Nif::NiFltAnimationNode::Flag_Reverse)
+                sequenceNode->setDuration(0.2f, -1);
             else
-                sequenceNode->setDuration(1.0f, -1);
+                sequenceNode->setDuration(-0.2f, -1);
             return sequenceNode;
         }
 

From c376f3793e1bdc52600efa68e2924c0d3910625e Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Thu, 31 Mar 2022 21:55:14 +0200
Subject: [PATCH 2267/2859] check that the index is now -1; otherwise bad
 things happen

---
 apps/openmw/mwrender/objectpaging.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index 57040eca98..d2b66b78d9 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -155,7 +155,7 @@ namespace MWRender
             if (const osg::Sequence* sq = dynamic_cast<const osg::Sequence*>(node))
             {
                 osg::Group* n = new osg::Group;
-                n->addChild(operator()(sq->getChild(sq->getValue())));
+                n->addChild(operator()(sq->getChild(sq->getValue() != -1 ? sq->getValue() : 0)));
                 n->setDataVariance(osg::Object::STATIC);
                 return n;
             }
@@ -310,7 +310,7 @@ namespace MWRender
             }
             if (osg::Sequence* sq = dynamic_cast<osg::Sequence*>(&node))
             {
-                traverse(*sq->getChild(sq->getValue()));
+                traverse(*sq->getChild(sq->getValue() != -1 ? sq->getValue() : 0));
                 return;
             }
 

From 373776170dc749cce60c21918138eeceecd87f70 Mon Sep 17 00:00:00 2001
From: Wolfgang Lieff <wolfgang.lieff@internode.on.net>
Date: Thu, 7 Apr 2022 00:49:08 +0200
Subject: [PATCH 2268/2859] refactor for NiFltAnimationNode

---
 components/nif/node.hpp         |  6 +++---
 components/nifosg/nifloader.cpp | 34 ++++++++++++++++++++++++---------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/components/nif/node.hpp b/components/nif/node.hpp
index 2f64e39a75..b63fc03804 100644
--- a/components/nif/node.hpp
+++ b/components/nif/node.hpp
@@ -433,17 +433,17 @@ struct NiLODNode : public NiSwitchNode
 
 struct NiFltAnimationNode : public NiSwitchNode
 {
-    float mInterval;
+    float mDuration;
     enum Flags
     {
-        Flag_Reverse = 0x40
+        Flag_Swing = 0x40
     };
 
 
     void read(NIFStream *nif) override
     {
         NiSwitchNode::read(nif);
-        mInterval = nif->getFloat();
+        mDuration = nif->getFloat();
     }
 };
 
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 9cd2685747..403fc8fef8 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -417,19 +417,33 @@ namespace NifOsg
             return switchNode;
         }
 
-        static osg::ref_ptr<osg::Sequence> handleSequenceNode(const Nif::NiFltAnimationNode* niFltAnimationNode)
+        static osg::ref_ptr<osg::Sequence> prepareSequenceNode(const Nif::Node* nifNode)
         {
+            const Nif::NiFltAnimationNode* niFltAnimationNode = static_cast<const Nif::NiFltAnimationNode*>(nifNode);
             osg::ref_ptr<osg::Sequence> sequenceNode (new osg::Sequence);
             sequenceNode->setName(niFltAnimationNode->name);
-            sequenceNode->setDefaultTime(niFltAnimationNode->mInterval);
-            sequenceNode->setMode(osg::Sequence::START);
-            if (niFltAnimationNode->flags & Nif::NiFltAnimationNode::Flag_Reverse)
-                sequenceNode->setDuration(0.2f, -1);
-            else
-                sequenceNode->setDuration(-0.2f, -1);
+            if (niFltAnimationNode->children.length()!=0)
+            {
+                if (niFltAnimationNode->flags & Nif::NiFltAnimationNode::Flag_Swing)
+                    sequenceNode->setDefaultTime(niFltAnimationNode->mDuration/(niFltAnimationNode->children.length()*2));
+                else
+                    sequenceNode->setDefaultTime(niFltAnimationNode->mDuration/niFltAnimationNode->children.length());
+            }
             return sequenceNode;
         }
 
+        static void activateSequenceNode(osg::Group* osgNode, const Nif::Node* nifNode)
+        {
+            const Nif::NiFltAnimationNode* niFltAnimationNode = static_cast<const Nif::NiFltAnimationNode*>(nifNode);
+            osg::Sequence* sequenceNode = static_cast<osg::Sequence*>(osgNode);
+            if (niFltAnimationNode->flags & Nif::NiFltAnimationNode::Flag_Swing)
+                sequenceNode->setInterval(osg::Sequence::SWING, 0,-1);
+            else
+                sequenceNode->setInterval(osg::Sequence::LOOP, 0,-1);
+            sequenceNode->setDuration(1.0f, -1);
+            sequenceNode->setMode(osg::Sequence::START);
+        }
+
         osg::ref_ptr<osg::Image> handleSourceTexture(const Nif::NiSourceTexture* st, Resource::ImageManager* imageManager)
         {
             if (!st)
@@ -727,8 +741,7 @@ namespace NifOsg
             }
             else if (nifNode->recType == Nif::RC_NiFltAnimationNode)
             {
-                const Nif::NiFltAnimationNode* niFltAnimationNode = static_cast<const Nif::NiFltAnimationNode*>(nifNode);
-                osg::ref_ptr<osg::Sequence> sequenceNode = handleSequenceNode(niFltAnimationNode);
+                osg::ref_ptr<osg::Sequence> sequenceNode = prepareSequenceNode(nifNode);
                 node->addChild(sequenceNode);
                 currentNode = sequenceNode;
             }
@@ -752,6 +765,9 @@ namespace NifOsg
                 }
             }
 
+            if (nifNode->recType == Nif::RC_NiFltAnimationNode)
+                activateSequenceNode(currentNode,nifNode);
+
             return node;
         }
 

From 1baee5ddba4ba99f403f815ad586ccd7c00bd23e Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 7 Apr 2022 15:54:39 +0200
Subject: [PATCH 2269/2859] Add check box to remove unused tiles

---
 apps/launcher/datafilespage.cpp |  6 +++++-
 files/ui/datafilespage.ui       | 10 ++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index e8b61cb079..d86c9b15b6 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -493,7 +493,11 @@ void Launcher::DataFilesPage::startNavMeshTool()
 
     mNavMeshToolProgress = NavMeshToolProgress {};
 
-    if (!mNavMeshToolInvoker->startProcess(QLatin1String("openmw-navmeshtool"), QStringList({"--write-binary-log"})))
+    QStringList arguments({"--write-binary-log"});
+    if (ui.navMeshRemoveUnusedTilesCheckBox->checkState() == Qt::Checked)
+        arguments.append("--remove-unused-tiles");
+
+    if (!mNavMeshToolInvoker->startProcess(QLatin1String("openmw-navmeshtool"), arguments))
         return;
 
     ui.cancelNavMeshButton->setEnabled(true);
diff --git a/files/ui/datafilespage.ui b/files/ui/datafilespage.ui
index ff330391d2..5d04ab1ed8 100644
--- a/files/ui/datafilespage.ui
+++ b/files/ui/datafilespage.ui
@@ -74,6 +74,16 @@
          </item>
         </layout>
        </item>
+       <item>
+        <widget class="QCheckBox" name="navMeshRemoveUnusedTilesCheckBox">
+         <property name="text">
+          <string>Remove unused tiles</string>
+         </property>
+         <property name="checked">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
        <item>
         <widget class="QPlainTextEdit" name="navMeshLogPlainTextEdit">
          <property name="enabled">

From 7038c826908f33d34b637ca673362a58e652b4ff Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 7 Apr 2022 16:35:18 +0200
Subject: [PATCH 2270/2859] Configure mav navmeshdb file size from the launcher

---
 apps/launcher/datafilespage.cpp  | 20 +++++++++++++++-----
 components/settings/settings.cpp |  9 ++++++++-
 components/settings/settings.hpp |  1 +
 files/ui/datafilespage.ui        | 24 ++++++++++++++++++++++++
 4 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index d86c9b15b6..58a20c7853 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -84,6 +84,11 @@ namespace Launcher
                 };
             }
         };
+
+        int getMaxNavMeshDbFileSizeMiB()
+        {
+            return static_cast<int>(Settings::Manager::getInt64("max navmeshdb file size", "Navigator") / (1024 * 1024));
+        }
     }
 }
 
@@ -164,6 +169,8 @@ void Launcher::DataFilesPage::buildView()
 
 bool Launcher::DataFilesPage::loadSettings()
 {
+    ui.navMeshMaxSizeSpinBox->setValue(getMaxNavMeshDbFileSizeMiB());
+
     QStringList profiles = mLauncherSettings.getContentLists();
     QString currentProfile = mLauncherSettings.getCurrentContentListName();
 
@@ -217,13 +224,16 @@ QStringList Launcher::DataFilesPage::filesInProfile(const QString& profileName,
 
 void Launcher::DataFilesPage::saveSettings(const QString &profile)
 {
-   QString profileName = profile;
+    if (const int value = ui.navMeshMaxSizeSpinBox->value(); value != getMaxNavMeshDbFileSizeMiB())
+        Settings::Manager::setInt64("max navmeshdb file size", "Navigator", static_cast<std::int64_t>(value) * 1024 * 1024);
 
-   if (profileName.isEmpty())
-       profileName = ui.profilesComboBox->currentText();
+    QString profileName = profile;
 
-   //retrieve the files selected for the profile
-   ContentSelectorModel::ContentFileList items = mSelector->selectedFiles();
+    if (profileName.isEmpty())
+        profileName = ui.profilesComboBox->currentText();
+
+    //retrieve the files selected for the profile
+    ContentSelectorModel::ContentFileList items = mSelector->selectedFiles();
 
     //set the value of the current profile (not necessarily the profile being saved!)
     mLauncherSettings.setCurrentContentListName(ui.profilesComboBox->currentText());
diff --git a/components/settings/settings.cpp b/components/settings/settings.cpp
index 4c17394836..ecd25dbd4e 100644
--- a/components/settings/settings.cpp
+++ b/components/settings/settings.cpp
@@ -116,7 +116,7 @@ std::int64_t Manager::getInt64 (const std::string& setting, const std::string& c
 {
     const std::string& value = getString(setting, category);
     std::stringstream stream(value);
-    std::size_t number = 0;
+    std::int64_t number = 0;
     stream >> number;
     return number;
 }
@@ -172,6 +172,13 @@ void Manager::setInt (const std::string& setting, const std::string& category, c
     setString(setting, category, stream.str());
 }
 
+void Manager::setInt64 (const std::string& setting, const std::string& category, const std::int64_t value)
+{
+    std::ostringstream stream;
+    stream << value;
+    setString(setting, category, stream.str());
+}
+
 void Manager::setFloat (const std::string &setting, const std::string &category, const float value)
 {
     std::ostringstream stream;
diff --git a/components/settings/settings.hpp b/components/settings/settings.hpp
index c23d8d878e..d5d9c2d9f6 100644
--- a/components/settings/settings.hpp
+++ b/components/settings/settings.hpp
@@ -62,6 +62,7 @@ namespace Settings
         static osg::Vec3f getVector3 (const std::string& setting, const std::string& category);
 
         static void setInt (const std::string& setting, const std::string& category, int value);
+        static void setInt64 (const std::string& setting, const std::string& category, std::int64_t value);
         static void setFloat (const std::string& setting, const std::string& category, float value);
         static void setDouble (const std::string& setting, const std::string& category, double value);
         static void setString (const std::string& setting, const std::string& category, const std::string& value);
diff --git a/files/ui/datafilespage.ui b/files/ui/datafilespage.ui
index 5d04ab1ed8..e942cd652b 100644
--- a/files/ui/datafilespage.ui
+++ b/files/ui/datafilespage.ui
@@ -84,6 +84,30 @@
          </property>
         </widget>
        </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_2">
+         <item>
+          <widget class="QLabel" name="label">
+           <property name="text">
+            <string>Max size</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QSpinBox" name="navMeshMaxSizeSpinBox">
+           <property name="suffix">
+            <string> MiB</string>
+           </property>
+           <property name="maximum">
+            <number>2147483647</number>
+           </property>
+           <property name="value">
+            <number>2048</number>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
        <item>
         <widget class="QPlainTextEdit" name="navMeshLogPlainTextEdit">
          <property name="enabled">

From 5156ee94be4ac937653718091498b3d81b85b64b Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 8 Apr 2022 00:54:41 +0200
Subject: [PATCH 2271/2859] Store static id key in lower case

---
 apps/openmw/mwrender/objectpaging.cpp | 12 ++++++++++--
 apps/openmw/mwworld/esmstore.cpp      |  3 ++-
 apps/openmw/mwworld/esmstore.hpp      |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index d2b66b78d9..cf1d689911 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -440,7 +440,10 @@ namespace MWRender
                             if (moved)
                                 continue;
 
-                            if (std::find(cell->mMovedRefs.begin(), cell->mMovedRefs.end(), ref.mRefNum) != cell->mMovedRefs.end()) continue;
+                            if (std::find(cell->mMovedRefs.begin(), cell->mMovedRefs.end(), ref.mRefNum) != cell->mMovedRefs.end())
+                                continue;
+
+                            Misc::StringUtils::lowerCaseInPlace(ref.mRefID);
                             int type = store.findStatic(ref.mRefID);
                             if (!typeFilter(type,size>=2)) continue;
                             if (deleted) { refs.erase(ref.mRefNum); continue; }
@@ -454,7 +457,12 @@ namespace MWRender
                 }
                 for (auto [ref, deleted] : cell->mLeasedRefs)
                 {
-                    if (deleted) { refs.erase(ref.mRefNum); continue; }
+                    if (deleted)
+                    {
+                        refs.erase(ref.mRefNum);
+                        continue;
+                    }
+                    Misc::StringUtils::lowerCaseInPlace(ref.mRefID);
                     int type = store.findStatic(ref.mRefID);
                     if (!typeFilter(type,size>=2)) continue;
                     refs[ref.mRefNum] = std::move(ref);
diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index 6308c9a547..c670bead9c 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -257,7 +257,8 @@ void ESMStore::setUp(bool validateRecords)
     }
 
     if (mStaticIds.empty())
-        mStaticIds = mIds;
+        for (const auto& [k, v] : mIds)
+            mStaticIds.emplace(Misc::StringUtils::lowerCase(k), v);
 
     mSkills.setUp();
     mMagicEffects.setUp();
diff --git a/apps/openmw/mwworld/esmstore.hpp b/apps/openmw/mwworld/esmstore.hpp
index 8582a1daca..07f860e6de 100644
--- a/apps/openmw/mwworld/esmstore.hpp
+++ b/apps/openmw/mwworld/esmstore.hpp
@@ -77,7 +77,7 @@ namespace MWWorld
         // maps the id name to the record type.
         using IDMap = std::unordered_map<std::string, int, Misc::StringUtils::CiHash, Misc::StringUtils::CiEqual>;
         IDMap mIds;
-        IDMap mStaticIds;
+        std::unordered_map<std::string, int> mStaticIds;
 
         std::unordered_map<std::string, int> mRefCount;
 

From ec3674b40a2272b74abfc6b89f463ab703914690 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 6 Apr 2022 17:06:55 +0200
Subject: [PATCH 2272/2859] Use unique_ptr instead of shared_ptr

for MWWorld::Action, ProjectileManager and ESSImport::Converter.

shared_ptr has additional cost of reference counter and requires additional
allocation when constructed as shared_ptr<T>(new T).
---
 apps/essimporter/importer.cpp                | 66 ++++++++++----------
 apps/openmw/mwclass/activator.cpp            |  6 +-
 apps/openmw/mwclass/activator.hpp            |  2 +-
 apps/openmw/mwclass/apparatus.cpp            |  6 +-
 apps/openmw/mwclass/apparatus.hpp            |  4 +-
 apps/openmw/mwclass/armor.cpp                |  6 +-
 apps/openmw/mwclass/armor.hpp                |  4 +-
 apps/openmw/mwclass/book.cpp                 | 10 +--
 apps/openmw/mwclass/book.hpp                 |  4 +-
 apps/openmw/mwclass/clothing.cpp             |  6 +-
 apps/openmw/mwclass/clothing.hpp             |  4 +-
 apps/openmw/mwclass/container.cpp            | 14 ++---
 apps/openmw/mwclass/container.hpp            |  2 +-
 apps/openmw/mwclass/creature.cpp             | 14 ++---
 apps/openmw/mwclass/creature.hpp             |  2 +-
 apps/openmw/mwclass/door.cpp                 | 14 ++---
 apps/openmw/mwclass/door.hpp                 |  2 +-
 apps/openmw/mwclass/ingredient.cpp           |  6 +-
 apps/openmw/mwclass/ingredient.hpp           |  4 +-
 apps/openmw/mwclass/light.cpp                | 10 +--
 apps/openmw/mwclass/light.hpp                |  4 +-
 apps/openmw/mwclass/lockpick.cpp             |  6 +-
 apps/openmw/mwclass/lockpick.hpp             |  4 +-
 apps/openmw/mwclass/misc.cpp                 |  8 +--
 apps/openmw/mwclass/misc.hpp                 |  4 +-
 apps/openmw/mwclass/npc.cpp                  | 20 +++---
 apps/openmw/mwclass/npc.hpp                  |  2 +-
 apps/openmw/mwclass/potion.cpp               |  6 +-
 apps/openmw/mwclass/potion.hpp               |  4 +-
 apps/openmw/mwclass/probe.cpp                |  6 +-
 apps/openmw/mwclass/probe.hpp                |  4 +-
 apps/openmw/mwclass/repair.cpp               |  6 +-
 apps/openmw/mwclass/repair.hpp               |  4 +-
 apps/openmw/mwclass/weapon.cpp               |  6 +-
 apps/openmw/mwclass/weapon.hpp               |  4 +-
 apps/openmw/mwgui/inventorywindow.cpp        |  2 +-
 apps/openmw/mwgui/sortfilteritemmodel.cpp    |  2 +-
 apps/openmw/mwlua/actions.cpp                |  2 +-
 apps/openmw/mwmechanics/aicombat.cpp         |  2 +-
 apps/openmw/mwmechanics/aicombat.hpp         |  2 +-
 apps/openmw/mwmechanics/aicombataction.cpp   |  4 +-
 apps/openmw/mwmechanics/aicombataction.hpp   |  2 +-
 apps/openmw/mwscript/containerextensions.cpp |  2 +-
 apps/openmw/mwscript/interpretercontext.cpp  |  2 +-
 apps/openmw/mwworld/class.cpp                | 16 ++---
 apps/openmw/mwworld/class.hpp                |  6 +-
 apps/openmw/mwworld/worldimp.cpp             |  2 +-
 apps/openmw/mwworld/worldimp.hpp             |  2 +-
 48 files changed, 160 insertions(+), 160 deletions(-)

diff --git a/apps/essimporter/importer.cpp b/apps/essimporter/importer.cpp
index 9931385f8c..a683bf7047 100644
--- a/apps/essimporter/importer.cpp
+++ b/apps/essimporter/importer.cpp
@@ -272,39 +272,39 @@ namespace ESSImport
         const unsigned int recJOUR = ESM::fourCC("JOUR");
         const unsigned int recSPLM = ESM::fourCC("SPLM");
 
-        std::map<unsigned int, std::shared_ptr<Converter> > converters;
-        converters[ESM::REC_GLOB] = std::shared_ptr<Converter>(new ConvertGlobal());
-        converters[ESM::REC_BOOK] = std::shared_ptr<Converter>(new ConvertBook());
-        converters[ESM::REC_NPC_] = std::shared_ptr<Converter>(new ConvertNPC());
-        converters[ESM::REC_CREA] = std::shared_ptr<Converter>(new ConvertCREA());
-        converters[ESM::REC_NPCC] = std::shared_ptr<Converter>(new ConvertNPCC());
-        converters[ESM::REC_CREC] = std::shared_ptr<Converter>(new ConvertCREC());
-        converters[recREFR      ] = std::shared_ptr<Converter>(new ConvertREFR());
-        converters[recPCDT      ] = std::shared_ptr<Converter>(new ConvertPCDT());
-        converters[recFMAP      ] = std::shared_ptr<Converter>(new ConvertFMAP());
-        converters[recKLST      ] = std::shared_ptr<Converter>(new ConvertKLST());
-        converters[recSTLN      ] = std::shared_ptr<Converter>(new ConvertSTLN());
-        converters[recGAME      ] = std::shared_ptr<Converter>(new ConvertGAME());
-        converters[ESM::REC_CELL] = std::shared_ptr<Converter>(new ConvertCell());
-        converters[ESM::REC_ALCH] = std::shared_ptr<Converter>(new DefaultConverter<ESM::Potion>());
-        converters[ESM::REC_CLAS] = std::shared_ptr<Converter>(new ConvertClass());
-        converters[ESM::REC_SPEL] = std::shared_ptr<Converter>(new DefaultConverter<ESM::Spell>());
-        converters[ESM::REC_ARMO] = std::shared_ptr<Converter>(new DefaultConverter<ESM::Armor>());
-        converters[ESM::REC_WEAP] = std::shared_ptr<Converter>(new DefaultConverter<ESM::Weapon>());
-        converters[ESM::REC_CLOT] = std::shared_ptr<Converter>(new DefaultConverter<ESM::Clothing>());
-        converters[ESM::REC_ENCH] = std::shared_ptr<Converter>(new DefaultConverter<ESM::Enchantment>());
-        converters[ESM::REC_WEAP] = std::shared_ptr<Converter>(new DefaultConverter<ESM::Weapon>());
-        converters[ESM::REC_LEVC] = std::shared_ptr<Converter>(new DefaultConverter<ESM::CreatureLevList>());
-        converters[ESM::REC_LEVI] = std::shared_ptr<Converter>(new DefaultConverter<ESM::ItemLevList>());
-        converters[ESM::REC_CNTC] = std::shared_ptr<Converter>(new ConvertCNTC());
-        converters[ESM::REC_FACT] = std::shared_ptr<Converter>(new ConvertFACT());
-        converters[ESM::REC_INFO] = std::shared_ptr<Converter>(new ConvertINFO());
-        converters[ESM::REC_DIAL] = std::shared_ptr<Converter>(new ConvertDIAL());
-        converters[ESM::REC_QUES] = std::shared_ptr<Converter>(new ConvertQUES());
-        converters[recJOUR      ] = std::shared_ptr<Converter>(new ConvertJOUR());
-        converters[ESM::REC_SCPT] = std::shared_ptr<Converter>(new ConvertSCPT());
-        converters[ESM::REC_PROJ] = std::shared_ptr<Converter>(new ConvertPROJ());
-        converters[recSPLM] = std::shared_ptr<Converter>(new ConvertSPLM());
+        std::map<unsigned int, std::unique_ptr<Converter>> converters;
+        converters[ESM::REC_GLOB] = std::unique_ptr<Converter>(new ConvertGlobal());
+        converters[ESM::REC_BOOK] = std::unique_ptr<Converter>(new ConvertBook());
+        converters[ESM::REC_NPC_] = std::unique_ptr<Converter>(new ConvertNPC());
+        converters[ESM::REC_CREA] = std::unique_ptr<Converter>(new ConvertCREA());
+        converters[ESM::REC_NPCC] = std::unique_ptr<Converter>(new ConvertNPCC());
+        converters[ESM::REC_CREC] = std::unique_ptr<Converter>(new ConvertCREC());
+        converters[recREFR      ] = std::unique_ptr<Converter>(new ConvertREFR());
+        converters[recPCDT      ] = std::unique_ptr<Converter>(new ConvertPCDT());
+        converters[recFMAP      ] = std::unique_ptr<Converter>(new ConvertFMAP());
+        converters[recKLST      ] = std::unique_ptr<Converter>(new ConvertKLST());
+        converters[recSTLN      ] = std::unique_ptr<Converter>(new ConvertSTLN());
+        converters[recGAME      ] = std::unique_ptr<Converter>(new ConvertGAME());
+        converters[ESM::REC_CELL] = std::unique_ptr<Converter>(new ConvertCell());
+        converters[ESM::REC_ALCH] = std::unique_ptr<Converter>(new DefaultConverter<ESM::Potion>());
+        converters[ESM::REC_CLAS] = std::unique_ptr<Converter>(new ConvertClass());
+        converters[ESM::REC_SPEL] = std::unique_ptr<Converter>(new DefaultConverter<ESM::Spell>());
+        converters[ESM::REC_ARMO] = std::unique_ptr<Converter>(new DefaultConverter<ESM::Armor>());
+        converters[ESM::REC_WEAP] = std::unique_ptr<Converter>(new DefaultConverter<ESM::Weapon>());
+        converters[ESM::REC_CLOT] = std::unique_ptr<Converter>(new DefaultConverter<ESM::Clothing>());
+        converters[ESM::REC_ENCH] = std::unique_ptr<Converter>(new DefaultConverter<ESM::Enchantment>());
+        converters[ESM::REC_WEAP] = std::unique_ptr<Converter>(new DefaultConverter<ESM::Weapon>());
+        converters[ESM::REC_LEVC] = std::unique_ptr<Converter>(new DefaultConverter<ESM::CreatureLevList>());
+        converters[ESM::REC_LEVI] = std::unique_ptr<Converter>(new DefaultConverter<ESM::ItemLevList>());
+        converters[ESM::REC_CNTC] = std::unique_ptr<Converter>(new ConvertCNTC());
+        converters[ESM::REC_FACT] = std::unique_ptr<Converter>(new ConvertFACT());
+        converters[ESM::REC_INFO] = std::unique_ptr<Converter>(new ConvertINFO());
+        converters[ESM::REC_DIAL] = std::unique_ptr<Converter>(new ConvertDIAL());
+        converters[ESM::REC_QUES] = std::unique_ptr<Converter>(new ConvertQUES());
+        converters[recJOUR      ] = std::unique_ptr<Converter>(new ConvertJOUR());
+        converters[ESM::REC_SCPT] = std::unique_ptr<Converter>(new ConvertSCPT());
+        converters[ESM::REC_PROJ] = std::unique_ptr<Converter>(new ConvertPROJ());
+        converters[recSPLM] = std::unique_ptr<Converter>(new ConvertSPLM());
 
         // TODO:
         // - REGN (weather in certain regions?)
diff --git a/apps/openmw/mwclass/activator.cpp b/apps/openmw/mwclass/activator.cpp
index ad9a6c76d9..2d386addb8 100644
--- a/apps/openmw/mwclass/activator.cpp
+++ b/apps/openmw/mwclass/activator.cpp
@@ -111,7 +111,7 @@ namespace MWClass
         return info;
     }
 
-    std::shared_ptr<MWWorld::Action> Activator::activate(const MWWorld::Ptr &ptr, const MWWorld::Ptr &actor) const
+    std::unique_ptr<MWWorld::Action> Activator::activate(const MWWorld::Ptr &ptr, const MWWorld::Ptr &actor) const
     {
         if(actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
         {
@@ -119,12 +119,12 @@ namespace MWClass
             auto& prng = MWBase::Environment::get().getWorld()->getPrng();
             const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfActivator", prng);
 
-            std::shared_ptr<MWWorld::Action> action(new MWWorld::FailedAction("#{sWerewolfRefusal}"));
+            std::unique_ptr<MWWorld::Action> action(new MWWorld::FailedAction("#{sWerewolfRefusal}"));
             if(sound) action->setSound(sound->mId);
 
             return action;
         }
-        return std::shared_ptr<MWWorld::Action>(new MWWorld::NullAction);
+        return std::unique_ptr<MWWorld::Action>(new MWWorld::NullAction);
     }
 
 
diff --git a/apps/openmw/mwclass/activator.hpp b/apps/openmw/mwclass/activator.hpp
index d5c251d9d1..e34786a1f0 100644
--- a/apps/openmw/mwclass/activator.hpp
+++ b/apps/openmw/mwclass/activator.hpp
@@ -35,7 +35,7 @@ namespace MWClass
             std::string getScript (const MWWorld::ConstPtr& ptr) const override;
             ///< Return name of the script attached to ptr
 
-            std::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
+            std::unique_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
             ///< Generate action for activation
 
             std::string getModel(const MWWorld::ConstPtr &ptr) const override;
diff --git a/apps/openmw/mwclass/apparatus.cpp b/apps/openmw/mwclass/apparatus.cpp
index 021e81346d..99a2d7887b 100644
--- a/apps/openmw/mwclass/apparatus.cpp
+++ b/apps/openmw/mwclass/apparatus.cpp
@@ -49,7 +49,7 @@ namespace MWClass
         return !name.empty() ? name : ref->mBase->mId;
     }
 
-    std::shared_ptr<MWWorld::Action> Apparatus::activate (const MWWorld::Ptr& ptr,
+    std::unique_ptr<MWWorld::Action> Apparatus::activate (const MWWorld::Ptr& ptr,
         const MWWorld::Ptr& actor) const
     {
         return defaultItemActivate(ptr, actor);
@@ -108,9 +108,9 @@ namespace MWClass
         return info;
     }
 
-    std::shared_ptr<MWWorld::Action> Apparatus::use (const MWWorld::Ptr& ptr, bool force) const
+    std::unique_ptr<MWWorld::Action> Apparatus::use (const MWWorld::Ptr& ptr, bool force) const
     {
-        return std::shared_ptr<MWWorld::Action>(new MWWorld::ActionAlchemy(force));
+        return std::unique_ptr<MWWorld::Action>(new MWWorld::ActionAlchemy(force));
     }
 
     MWWorld::Ptr Apparatus::copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const
diff --git a/apps/openmw/mwclass/apparatus.hpp b/apps/openmw/mwclass/apparatus.hpp
index ec84a75196..ef21928075 100644
--- a/apps/openmw/mwclass/apparatus.hpp
+++ b/apps/openmw/mwclass/apparatus.hpp
@@ -23,7 +23,7 @@ namespace MWClass
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
-            std::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
+            std::unique_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
                 const MWWorld::Ptr& actor) const override;
             ///< Generate action for activation
 
@@ -45,7 +45,7 @@ namespace MWClass
             std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const override;
             ///< Return name of inventory icon.
 
-            std::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
+            std::unique_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
             ///< Generate action for using via inventory menu
 
             std::string getModel(const MWWorld::ConstPtr &ptr) const override;
diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index cffc112641..22c46bf579 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -57,7 +57,7 @@ namespace MWClass
         return !name.empty() ? name : ref->mBase->mId;
     }
 
-    std::shared_ptr<MWWorld::Action> Armor::activate (const MWWorld::Ptr& ptr,
+    std::unique_ptr<MWWorld::Action> Armor::activate (const MWWorld::Ptr& ptr,
         const MWWorld::Ptr& actor) const
     {
         return defaultItemActivate(ptr, actor);
@@ -332,9 +332,9 @@ namespace MWClass
         return std::make_pair(1,"");
     }
 
-    std::shared_ptr<MWWorld::Action> Armor::use (const MWWorld::Ptr& ptr, bool force) const
+    std::unique_ptr<MWWorld::Action> Armor::use (const MWWorld::Ptr& ptr, bool force) const
     {
-        std::shared_ptr<MWWorld::Action> action(new MWWorld::ActionEquip(ptr, force));
+        std::unique_ptr<MWWorld::Action> action(new MWWorld::ActionEquip(ptr, force));
 
         action->setSound(getUpSoundId(ptr));
 
diff --git a/apps/openmw/mwclass/armor.hpp b/apps/openmw/mwclass/armor.hpp
index 00fb23defa..b185596c08 100644
--- a/apps/openmw/mwclass/armor.hpp
+++ b/apps/openmw/mwclass/armor.hpp
@@ -23,7 +23,7 @@ namespace MWClass
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
-            std::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
+            std::unique_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
                 const MWWorld::Ptr& actor) const override;
             ///< Generate action for activation
 
@@ -69,7 +69,7 @@ namespace MWClass
             ///< Return 0 if player cannot equip item. 1 if can equip. 2 if it's twohanded weapon. 3 if twohanded weapon conflicts with that. \n
             ///  Second item in the pair specifies the error message
 
-            std::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
+            std::unique_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
             ///< Generate action for using via inventory menu
 
             std::string getModel(const MWWorld::ConstPtr &ptr) const override;
diff --git a/apps/openmw/mwclass/book.cpp b/apps/openmw/mwclass/book.cpp
index 1c826a049d..c8a05a132e 100644
--- a/apps/openmw/mwclass/book.cpp
+++ b/apps/openmw/mwclass/book.cpp
@@ -54,7 +54,7 @@ namespace MWClass
         return !name.empty() ? name : ref->mBase->mId;
     }
 
-    std::shared_ptr<MWWorld::Action> Book::activate (const MWWorld::Ptr& ptr,
+    std::unique_ptr<MWWorld::Action> Book::activate (const MWWorld::Ptr& ptr,
         const MWWorld::Ptr& actor) const
     {
         if(actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
@@ -63,13 +63,13 @@ namespace MWClass
             auto& prng = MWBase::Environment::get().getWorld()->getPrng();
             const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfItem", prng);
 
-            std::shared_ptr<MWWorld::Action> action(new MWWorld::FailedAction("#{sWerewolfRefusal}"));
+            std::unique_ptr<MWWorld::Action> action(new MWWorld::FailedAction("#{sWerewolfRefusal}"));
             if(sound) action->setSound(sound->mId);
 
             return action;
         }
 
-        return std::shared_ptr<MWWorld::Action>(new MWWorld::ActionRead(ptr));
+        return std::unique_ptr<MWWorld::Action>(new MWWorld::ActionRead(ptr));
     }
 
     std::string Book::getScript (const MWWorld::ConstPtr& ptr) const
@@ -149,9 +149,9 @@ namespace MWClass
         return record->mId;
     }
 
-    std::shared_ptr<MWWorld::Action> Book::use (const MWWorld::Ptr& ptr, bool force) const
+    std::unique_ptr<MWWorld::Action> Book::use (const MWWorld::Ptr& ptr, bool force) const
     {
-        return std::shared_ptr<MWWorld::Action>(new MWWorld::ActionRead(ptr));
+        return std::unique_ptr<MWWorld::Action>(new MWWorld::ActionRead(ptr));
     }
 
     MWWorld::Ptr Book::copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const
diff --git a/apps/openmw/mwclass/book.hpp b/apps/openmw/mwclass/book.hpp
index d78d9c7500..a5152fa812 100644
--- a/apps/openmw/mwclass/book.hpp
+++ b/apps/openmw/mwclass/book.hpp
@@ -21,7 +21,7 @@ namespace MWClass
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
-            std::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
+            std::unique_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
                 const MWWorld::Ptr& actor) const override;
             ///< Generate action for activation
 
@@ -49,7 +49,7 @@ namespace MWClass
             std::string applyEnchantment(const MWWorld::ConstPtr &ptr, const std::string& enchId, int enchCharge, const std::string& newName) const override;
             ///< Creates a new record using \a ptr as template, with the given name and the given enchantment applied to it.
 
-            std::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
+            std::unique_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
             ///< Generate action for using via inventory menu
 
             std::string getModel(const MWWorld::ConstPtr &ptr) const override;
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index 02ab337a2b..32396cae35 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -52,7 +52,7 @@ namespace MWClass
         return !name.empty() ? name : ref->mBase->mId;
     }
 
-    std::shared_ptr<MWWorld::Action> Clothing::activate (const MWWorld::Ptr& ptr,
+    std::unique_ptr<MWWorld::Action> Clothing::activate (const MWWorld::Ptr& ptr,
             const MWWorld::Ptr& actor) const
     {
         return defaultItemActivate(ptr, actor);
@@ -228,9 +228,9 @@ namespace MWClass
         return std::make_pair (1, "");
     }
 
-    std::shared_ptr<MWWorld::Action> Clothing::use (const MWWorld::Ptr& ptr, bool force) const
+    std::unique_ptr<MWWorld::Action> Clothing::use (const MWWorld::Ptr& ptr, bool force) const
     {
-        std::shared_ptr<MWWorld::Action> action(new MWWorld::ActionEquip(ptr, force));
+        std::unique_ptr<MWWorld::Action> action(new MWWorld::ActionEquip(ptr, force));
 
         action->setSound(getUpSoundId(ptr));
 
diff --git a/apps/openmw/mwclass/clothing.hpp b/apps/openmw/mwclass/clothing.hpp
index a044b13804..8e0a0c90bd 100644
--- a/apps/openmw/mwclass/clothing.hpp
+++ b/apps/openmw/mwclass/clothing.hpp
@@ -21,7 +21,7 @@ namespace MWClass
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
-            std::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
+            std::unique_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
                 const MWWorld::Ptr& actor) const override;
             ///< Generate action for activation
 
@@ -61,7 +61,7 @@ namespace MWClass
             ///< Return 0 if player cannot equip item. 1 if can equip. 2 if it's twohanded weapon. 3 if twohanded weapon conflicts with that.
             ///  Second item in the pair specifies the error message
 
-            std::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
+            std::unique_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
             ///< Generate action for using via inventory menu
 
             std::string getModel(const MWWorld::ConstPtr &ptr) const override;
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index 296813f155..ad0b6169a9 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -131,11 +131,11 @@ namespace MWClass
         return true;
     }
 
-    std::shared_ptr<MWWorld::Action> Container::activate (const MWWorld::Ptr& ptr,
+    std::unique_ptr<MWWorld::Action> Container::activate (const MWWorld::Ptr& ptr,
         const MWWorld::Ptr& actor) const
     {
         if (!MWBase::Environment::get().getWindowManager()->isAllowed(MWGui::GW_Inventory))
-            return std::shared_ptr<MWWorld::Action> (new MWWorld::NullAction ());
+            return std::unique_ptr<MWWorld::Action> (new MWWorld::NullAction ());
 
         if(actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
         {
@@ -143,7 +143,7 @@ namespace MWClass
             auto& prng = MWBase::Environment::get().getWorld()->getPrng();
             const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfContainer", prng);
 
-            std::shared_ptr<MWWorld::Action> action(new MWWorld::FailedAction("#{sWerewolfRefusal}"));
+            std::unique_ptr<MWWorld::Action> action(new MWWorld::FailedAction("#{sWerewolfRefusal}"));
             if(sound) action->setSound(sound->mId);
 
             return action;
@@ -191,24 +191,24 @@ namespace MWClass
             {
                 if (canBeHarvested(ptr))
                 {
-                    std::shared_ptr<MWWorld::Action> action (new MWWorld::ActionHarvest(ptr));
+                    std::unique_ptr<MWWorld::Action> action (new MWWorld::ActionHarvest(ptr));
                     return action;
                 }
 
-                std::shared_ptr<MWWorld::Action> action (new MWWorld::ActionOpen(ptr));
+                std::unique_ptr<MWWorld::Action> action (new MWWorld::ActionOpen(ptr));
                 return action;
             }
             else
             {
                 // Activate trap
-                std::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTrap(ptr.getCellRef().getTrap(), ptr));
+                std::unique_ptr<MWWorld::Action> action(new MWWorld::ActionTrap(ptr.getCellRef().getTrap(), ptr));
                 action->setSound(trapActivationSound);
                 return action;
             }
         }
         else
         {
-            std::shared_ptr<MWWorld::Action> action(new MWWorld::FailedAction(std::string(), ptr));
+            std::unique_ptr<MWWorld::Action> action(new MWWorld::FailedAction(std::string(), ptr));
             action->setSound(lockedSound);
             return action;
         }
diff --git a/apps/openmw/mwclass/container.hpp b/apps/openmw/mwclass/container.hpp
index 0da53508d2..9ecf323b71 100644
--- a/apps/openmw/mwclass/container.hpp
+++ b/apps/openmw/mwclass/container.hpp
@@ -50,7 +50,7 @@ namespace MWClass
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
-            std::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
+            std::unique_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
                 const MWWorld::Ptr& actor) const override;
             ///< Generate action for activation
 
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 68aea5730f..fc3504b947 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -430,7 +430,7 @@ namespace MWClass
         }
     }
 
-    std::shared_ptr<MWWorld::Action> Creature::activate (const MWWorld::Ptr& ptr,
+    std::unique_ptr<MWWorld::Action> Creature::activate (const MWWorld::Ptr& ptr,
         const MWWorld::Ptr& actor) const
     {
         if(actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
@@ -439,7 +439,7 @@ namespace MWClass
             auto& prng = MWBase::Environment::get().getWorld()->getPrng();
             const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfCreature", prng);
 
-            std::shared_ptr<MWWorld::Action> action(new MWWorld::FailedAction("#{sWerewolfRefusal}"));
+            std::unique_ptr<MWWorld::Action> action(new MWWorld::FailedAction("#{sWerewolfRefusal}"));
             if(sound) action->setSound(sound->mId);
 
             return action;
@@ -453,20 +453,20 @@ namespace MWClass
 
             // by default user can loot friendly actors during death animation
             if (canLoot && !stats.getAiSequence().isInCombat())
-                return std::shared_ptr<MWWorld::Action>(new MWWorld::ActionOpen(ptr));
+                return std::unique_ptr<MWWorld::Action>(new MWWorld::ActionOpen(ptr));
 
             // otherwise wait until death animation
             if(stats.isDeathAnimationFinished())
-                return std::shared_ptr<MWWorld::Action>(new MWWorld::ActionOpen(ptr));
+                return std::unique_ptr<MWWorld::Action>(new MWWorld::ActionOpen(ptr));
         }
         else if (!stats.getAiSequence().isInCombat() && !stats.getKnockedDown())
-            return std::shared_ptr<MWWorld::Action>(new MWWorld::ActionTalk(ptr));
+            return std::unique_ptr<MWWorld::Action>(new MWWorld::ActionTalk(ptr));
 
         // Tribunal and some mod companions oddly enough must use open action as fallback
         if (!getScript(ptr).empty() && ptr.getRefData().getLocals().getIntVar(getScript(ptr), "companion"))
-            return std::shared_ptr<MWWorld::Action>(new MWWorld::ActionOpen(ptr));
+            return std::unique_ptr<MWWorld::Action>(new MWWorld::ActionOpen(ptr));
 
-        return std::shared_ptr<MWWorld::Action>(new MWWorld::FailedAction(""));
+        return std::unique_ptr<MWWorld::Action>(new MWWorld::FailedAction(""));
     }
 
     MWWorld::ContainerStore& Creature::getContainerStore (const MWWorld::Ptr& ptr) const
diff --git a/apps/openmw/mwclass/creature.hpp b/apps/openmw/mwclass/creature.hpp
index 3b1c070ce7..558ea00643 100644
--- a/apps/openmw/mwclass/creature.hpp
+++ b/apps/openmw/mwclass/creature.hpp
@@ -65,7 +65,7 @@ namespace MWClass
 
             void onHit(const MWWorld::Ptr &ptr, float damage, bool ishealth, const MWWorld::Ptr &object, const MWWorld::Ptr &attacker, const osg::Vec3f &hitPosition, bool successful) const override;
 
-            std::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
+            std::unique_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
                 const MWWorld::Ptr& actor) const override;
             ///< Generate action for activation
 
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index ff4efbc1ba..17f0cadbb6 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -109,7 +109,7 @@ namespace MWClass
         return !name.empty() ? name : ref->mBase->mId;
     }
 
-    std::shared_ptr<MWWorld::Action> Door::activate (const MWWorld::Ptr& ptr,
+    std::unique_ptr<MWWorld::Action> Door::activate (const MWWorld::Ptr& ptr,
         const MWWorld::Ptr& actor) const
     {
         MWWorld::LiveCellRef<ESM::Door> *ref = ptr.get<ESM::Door>();
@@ -130,7 +130,7 @@ namespace MWClass
         // Make such activation a no-op for now, like how it is in the vanilla game.
         if (actor != MWMechanics::getPlayer() && ptr.getCellRef().getTeleport())
         {
-            std::shared_ptr<MWWorld::Action> action(new MWWorld::FailedAction(std::string(), ptr));
+            std::unique_ptr<MWWorld::Action> action(new MWWorld::FailedAction(std::string(), ptr));
             action->setSound(lockedSound);
             return action;
         }
@@ -181,7 +181,7 @@ namespace MWClass
             if(isTrapped)
             {
                 // Trap activation
-                std::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTrap(ptr.getCellRef().getTrap(), ptr));
+                std::unique_ptr<MWWorld::Action> action(new MWWorld::ActionTrap(ptr.getCellRef().getTrap(), ptr));
                 action->setSound(trapActivationSound);
                 return action;
             }
@@ -191,12 +191,12 @@ namespace MWClass
                 if (actor == MWMechanics::getPlayer() && MWBase::Environment::get().getWorld()->getDistanceToFacedObject() > MWBase::Environment::get().getWorld()->getMaxActivationDistance())
                 {
                     // player activated teleport door with telekinesis
-                    std::shared_ptr<MWWorld::Action> action(new MWWorld::FailedAction);
+                    std::unique_ptr<MWWorld::Action> action(new MWWorld::FailedAction);
                     return action;
                 }
                 else
                 {
-                    std::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTeleport (ptr.getCellRef().getDestCell(), ptr.getCellRef().getDoorDest(), true));
+                    std::unique_ptr<MWWorld::Action> action(new MWWorld::ActionTeleport (ptr.getCellRef().getDestCell(), ptr.getCellRef().getDoorDest(), true));
                     action->setSound(openSound);
                     return action;
                 }
@@ -204,7 +204,7 @@ namespace MWClass
             else
             {
                 // animated door
-                std::shared_ptr<MWWorld::Action> action(new MWWorld::ActionDoor(ptr));
+                std::unique_ptr<MWWorld::Action> action(new MWWorld::ActionDoor(ptr));
                 const auto doorState = getDoorState(ptr);
                 bool opening = true;
                 float doorRot = ptr.getRefData().getPosition().rot[2] - ptr.getCellRef().getPosition().rot[2];
@@ -238,7 +238,7 @@ namespace MWClass
         else
         {
             // locked, and we can't open.
-            std::shared_ptr<MWWorld::Action> action(new MWWorld::FailedAction(std::string(), ptr));
+            std::unique_ptr<MWWorld::Action> action(new MWWorld::FailedAction(std::string(), ptr));
             action->setSound(lockedSound);
             return action;
         }
diff --git a/apps/openmw/mwclass/door.hpp b/apps/openmw/mwclass/door.hpp
index fd824c4732..d3a369d89e 100644
--- a/apps/openmw/mwclass/door.hpp
+++ b/apps/openmw/mwclass/door.hpp
@@ -32,7 +32,7 @@ namespace MWClass
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
-            std::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
+            std::unique_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
                 const MWWorld::Ptr& actor) const override;
             ///< Generate action for activation
 
diff --git a/apps/openmw/mwclass/ingredient.cpp b/apps/openmw/mwclass/ingredient.cpp
index e0e71902c7..2331361477 100644
--- a/apps/openmw/mwclass/ingredient.cpp
+++ b/apps/openmw/mwclass/ingredient.cpp
@@ -51,7 +51,7 @@ namespace MWClass
         return !name.empty() ? name : ref->mBase->mId;
     }
 
-    std::shared_ptr<MWWorld::Action> Ingredient::activate (const MWWorld::Ptr& ptr,
+    std::unique_ptr<MWWorld::Action> Ingredient::activate (const MWWorld::Ptr& ptr,
         const MWWorld::Ptr& actor) const
     {
         return defaultItemActivate(ptr, actor);
@@ -72,9 +72,9 @@ namespace MWClass
     }
 
 
-    std::shared_ptr<MWWorld::Action> Ingredient::use (const MWWorld::Ptr& ptr, bool force) const
+    std::unique_ptr<MWWorld::Action> Ingredient::use (const MWWorld::Ptr& ptr, bool force) const
     {
-        std::shared_ptr<MWWorld::Action> action (new MWWorld::ActionEat (ptr));
+        std::unique_ptr<MWWorld::Action> action (new MWWorld::ActionEat (ptr));
 
         action->setSound ("Swallow");
 
diff --git a/apps/openmw/mwclass/ingredient.hpp b/apps/openmw/mwclass/ingredient.hpp
index 2abb2f343c..95b3d94e5e 100644
--- a/apps/openmw/mwclass/ingredient.hpp
+++ b/apps/openmw/mwclass/ingredient.hpp
@@ -21,7 +21,7 @@ namespace MWClass
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
-            std::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
+            std::unique_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
                 const MWWorld::Ptr& actor) const override;
             ///< Generate action for activation
 
@@ -34,7 +34,7 @@ namespace MWClass
             int getValue (const MWWorld::ConstPtr& ptr) const override;
             ///< Return trade value of the object. Throws an exception, if the object can't be traded.
 
-            std::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
+            std::unique_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
             ///< Generate action for using via inventory menu
 
             std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const override;
diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index 90080784a9..a7d49da54a 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -85,15 +85,15 @@ namespace MWClass
         return !name.empty() ? name : ref->mBase->mId;
     }
 
-    std::shared_ptr<MWWorld::Action> Light::activate (const MWWorld::Ptr& ptr,
+    std::unique_ptr<MWWorld::Action> Light::activate (const MWWorld::Ptr& ptr,
         const MWWorld::Ptr& actor) const
     {
         if(!MWBase::Environment::get().getWindowManager()->isAllowed(MWGui::GW_Inventory))
-            return std::shared_ptr<MWWorld::Action>(new MWWorld::NullAction());
+            return std::unique_ptr<MWWorld::Action>(new MWWorld::NullAction());
 
         MWWorld::LiveCellRef<ESM::Light> *ref = ptr.get<ESM::Light>();
         if(!(ref->mBase->mData.mFlags&ESM::Light::Carry))
-            return std::shared_ptr<MWWorld::Action>(new MWWorld::FailedAction());
+            return std::unique_ptr<MWWorld::Action>(new MWWorld::FailedAction());
 
         return defaultItemActivate(ptr, actor);
     }
@@ -184,9 +184,9 @@ namespace MWClass
         return Class::showsInInventory(ptr);
     }
 
-    std::shared_ptr<MWWorld::Action> Light::use (const MWWorld::Ptr& ptr, bool force) const
+    std::unique_ptr<MWWorld::Action> Light::use (const MWWorld::Ptr& ptr, bool force) const
     {
-        std::shared_ptr<MWWorld::Action> action(new MWWorld::ActionEquip(ptr, force));
+        std::unique_ptr<MWWorld::Action> action(new MWWorld::ActionEquip(ptr, force));
 
         action->setSound(getUpSoundId(ptr));
 
diff --git a/apps/openmw/mwclass/light.hpp b/apps/openmw/mwclass/light.hpp
index 7a7f670a2a..0104e88b6b 100644
--- a/apps/openmw/mwclass/light.hpp
+++ b/apps/openmw/mwclass/light.hpp
@@ -34,7 +34,7 @@ namespace MWClass
 
             bool showsInInventory (const MWWorld::ConstPtr& ptr) const override;
 
-            std::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
+            std::unique_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
                 const MWWorld::Ptr& actor) const override;
             ///< Generate action for activation
 
@@ -57,7 +57,7 @@ namespace MWClass
             std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const override;
             ///< Return name of inventory icon.
 
-            std::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
+            std::unique_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
             ///< Generate action for using via inventory menu
 
             void setRemainingUsageTime (const MWWorld::Ptr& ptr, float duration) const override;
diff --git a/apps/openmw/mwclass/lockpick.cpp b/apps/openmw/mwclass/lockpick.cpp
index 1e451ca7fe..c8860df4ce 100644
--- a/apps/openmw/mwclass/lockpick.cpp
+++ b/apps/openmw/mwclass/lockpick.cpp
@@ -51,7 +51,7 @@ namespace MWClass
         return !name.empty() ? name : ref->mBase->mId;
     }
 
-    std::shared_ptr<MWWorld::Action> Lockpick::activate (const MWWorld::Ptr& ptr,
+    std::unique_ptr<MWWorld::Action> Lockpick::activate (const MWWorld::Ptr& ptr,
         const MWWorld::Ptr& actor) const
     {
         return defaultItemActivate(ptr, actor);
@@ -124,9 +124,9 @@ namespace MWClass
         return info;
     }
 
-    std::shared_ptr<MWWorld::Action> Lockpick::use (const MWWorld::Ptr& ptr, bool force) const
+    std::unique_ptr<MWWorld::Action> Lockpick::use (const MWWorld::Ptr& ptr, bool force) const
     {
-        std::shared_ptr<MWWorld::Action> action(new MWWorld::ActionEquip(ptr, force));
+        std::unique_ptr<MWWorld::Action> action(new MWWorld::ActionEquip(ptr, force));
 
         action->setSound(getUpSoundId(ptr));
 
diff --git a/apps/openmw/mwclass/lockpick.hpp b/apps/openmw/mwclass/lockpick.hpp
index b51aaa05a6..3aac0c70b7 100644
--- a/apps/openmw/mwclass/lockpick.hpp
+++ b/apps/openmw/mwclass/lockpick.hpp
@@ -21,7 +21,7 @@ namespace MWClass
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
-            std::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
+            std::unique_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
                 const MWWorld::Ptr& actor) const override;
             ///< Generate action for activation
 
@@ -49,7 +49,7 @@ namespace MWClass
 
             std::pair<int, std::string> canBeEquipped(const MWWorld::ConstPtr &ptr, const MWWorld::Ptr &npc) const override;
 
-            std::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
+            std::unique_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
             ///< Generate action for using via inventory menu
 
             std::string getModel(const MWWorld::ConstPtr &ptr) const override;
diff --git a/apps/openmw/mwclass/misc.cpp b/apps/openmw/mwclass/misc.cpp
index 759eea5ccc..51e75650fb 100644
--- a/apps/openmw/mwclass/misc.cpp
+++ b/apps/openmw/mwclass/misc.cpp
@@ -61,7 +61,7 @@ namespace MWClass
         return !name.empty() ? name : ref->mBase->mId;
     }
 
-    std::shared_ptr<MWWorld::Action> Miscellaneous::activate (const MWWorld::Ptr& ptr,
+    std::unique_ptr<MWWorld::Action> Miscellaneous::activate (const MWWorld::Ptr& ptr,
         const MWWorld::Ptr& actor) const
     {
         return defaultItemActivate(ptr, actor);
@@ -203,12 +203,12 @@ namespace MWClass
         return newPtr;
     }
 
-    std::shared_ptr<MWWorld::Action> Miscellaneous::use (const MWWorld::Ptr& ptr, bool force) const
+    std::unique_ptr<MWWorld::Action> Miscellaneous::use (const MWWorld::Ptr& ptr, bool force) const
     {
         if (ptr.getCellRef().getSoul().empty() || !MWBase::Environment::get().getWorld()->getStore().get<ESM::Creature>().search(ptr.getCellRef().getSoul()))
-            return std::shared_ptr<MWWorld::Action>(new MWWorld::NullAction());
+            return std::unique_ptr<MWWorld::Action>(new MWWorld::NullAction());
         else
-            return std::shared_ptr<MWWorld::Action>(new MWWorld::ActionSoulgem(ptr));
+            return std::unique_ptr<MWWorld::Action>(new MWWorld::ActionSoulgem(ptr));
     }
 
     bool Miscellaneous::canSell (const MWWorld::ConstPtr& item, int npcServices) const
diff --git a/apps/openmw/mwclass/misc.hpp b/apps/openmw/mwclass/misc.hpp
index 59c31a219c..ebf38b10be 100644
--- a/apps/openmw/mwclass/misc.hpp
+++ b/apps/openmw/mwclass/misc.hpp
@@ -21,7 +21,7 @@ namespace MWClass
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
-            std::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
+            std::unique_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
                 const MWWorld::Ptr& actor) const override;
             ///< Generate action for activation
 
@@ -45,7 +45,7 @@ namespace MWClass
 
             std::string getModel(const MWWorld::ConstPtr &ptr) const override;
 
-            std::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
+            std::unique_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
             ///< Generate action for using via inventory menu
 
             float getWeight (const MWWorld::ConstPtr& ptr) const override;
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index cc4b3f7528..f3fcb848fd 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -860,12 +860,12 @@ namespace MWClass
         }
     }
 
-    std::shared_ptr<MWWorld::Action> Npc::activate (const MWWorld::Ptr& ptr,
+    std::unique_ptr<MWWorld::Action> Npc::activate (const MWWorld::Ptr& ptr,
         const MWWorld::Ptr& actor) const
     {
         // player got activated by another NPC
         if(ptr == MWMechanics::getPlayer())
-            return std::shared_ptr<MWWorld::Action>(new MWWorld::ActionTalk(actor));
+            return std::unique_ptr<MWWorld::Action>(new MWWorld::ActionTalk(actor));
 
         // Werewolfs can't activate NPCs
         if(actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
@@ -874,7 +874,7 @@ namespace MWClass
             auto& prng = MWBase::Environment::get().getWorld()->getPrng();
             const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfNPC", prng);
 
-            std::shared_ptr<MWWorld::Action> action(new MWWorld::FailedAction("#{sWerewolfRefusal}"));
+            std::unique_ptr<MWWorld::Action> action(new MWWorld::FailedAction("#{sWerewolfRefusal}"));
             if(sound) action->setSound(sound->mId);
 
             return action;
@@ -888,33 +888,33 @@ namespace MWClass
 
             // by default user can loot friendly actors during death animation
             if (canLoot && !stats.getAiSequence().isInCombat())
-                return std::shared_ptr<MWWorld::Action>(new MWWorld::ActionOpen(ptr));
+                return std::unique_ptr<MWWorld::Action>(new MWWorld::ActionOpen(ptr));
 
             // otherwise wait until death animation
             if(stats.isDeathAnimationFinished())
-                return std::shared_ptr<MWWorld::Action>(new MWWorld::ActionOpen(ptr));
+                return std::unique_ptr<MWWorld::Action>(new MWWorld::ActionOpen(ptr));
         }
         else if (!stats.getAiSequence().isInCombat())
         {
             if (stats.getKnockedDown() || MWBase::Environment::get().getMechanicsManager()->isSneaking(actor))
-                return std::shared_ptr<MWWorld::Action>(new MWWorld::ActionOpen(ptr)); // stealing
+                return std::unique_ptr<MWWorld::Action>(new MWWorld::ActionOpen(ptr)); // stealing
 
             // Can't talk to werewolves
             if (!getNpcStats(ptr).isWerewolf())
-                return std::shared_ptr<MWWorld::Action>(new MWWorld::ActionTalk(ptr));
+                return std::unique_ptr<MWWorld::Action>(new MWWorld::ActionTalk(ptr));
         }
         else // In combat
         {
             const bool stealingInCombat = Settings::Manager::getBool ("always allow stealing from knocked out actors", "Game");
             if (stealingInCombat && stats.getKnockedDown())
-                return std::shared_ptr<MWWorld::Action>(new MWWorld::ActionOpen(ptr)); // stealing
+                return std::unique_ptr<MWWorld::Action>(new MWWorld::ActionOpen(ptr)); // stealing
         }
 
         // Tribunal and some mod companions oddly enough must use open action as fallback
         if (!getScript(ptr).empty() && ptr.getRefData().getLocals().getIntVar(getScript(ptr), "companion"))
-            return std::shared_ptr<MWWorld::Action>(new MWWorld::ActionOpen(ptr));
+            return std::unique_ptr<MWWorld::Action>(new MWWorld::ActionOpen(ptr));
 
-        return std::shared_ptr<MWWorld::Action> (new MWWorld::FailedAction(""));
+        return std::unique_ptr<MWWorld::Action> (new MWWorld::FailedAction(""));
     }
 
     MWWorld::ContainerStore& Npc::getContainerStore (const MWWorld::Ptr& ptr)
diff --git a/apps/openmw/mwclass/npc.hpp b/apps/openmw/mwclass/npc.hpp
index 574d133934..ba937a4cfa 100644
--- a/apps/openmw/mwclass/npc.hpp
+++ b/apps/openmw/mwclass/npc.hpp
@@ -83,7 +83,7 @@ namespace MWClass
             void getModelsToPreload(const MWWorld::Ptr& ptr, std::vector<std::string>& models) const override;
             ///< Get a list of models to preload that this object may use (directly or indirectly). default implementation: list getModel().
 
-            std::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
+            std::unique_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
                 const MWWorld::Ptr& actor) const override;
             ///< Generate action for activation
 
diff --git a/apps/openmw/mwclass/potion.cpp b/apps/openmw/mwclass/potion.cpp
index 6357d8938a..2267f24b37 100644
--- a/apps/openmw/mwclass/potion.cpp
+++ b/apps/openmw/mwclass/potion.cpp
@@ -53,7 +53,7 @@ namespace MWClass
         return !name.empty() ? name : ref->mBase->mId;
     }
 
-    std::shared_ptr<MWWorld::Action> Potion::activate (const MWWorld::Ptr& ptr,
+    std::unique_ptr<MWWorld::Action> Potion::activate (const MWWorld::Ptr& ptr,
         const MWWorld::Ptr& actor) const
     {
         return defaultItemActivate(ptr, actor);
@@ -123,12 +123,12 @@ namespace MWClass
         return info;
     }
 
-    std::shared_ptr<MWWorld::Action> Potion::use (const MWWorld::Ptr& ptr, bool force) const
+    std::unique_ptr<MWWorld::Action> Potion::use (const MWWorld::Ptr& ptr, bool force) const
     {
         MWWorld::LiveCellRef<ESM::Potion> *ref =
             ptr.get<ESM::Potion>();
 
-        std::shared_ptr<MWWorld::Action> action (
+        std::unique_ptr<MWWorld::Action> action (
             new MWWorld::ActionApply (ptr, ref->mBase->mId));
 
         action->setSound ("Drink");
diff --git a/apps/openmw/mwclass/potion.hpp b/apps/openmw/mwclass/potion.hpp
index 2b979e2f37..d5964cff85 100644
--- a/apps/openmw/mwclass/potion.hpp
+++ b/apps/openmw/mwclass/potion.hpp
@@ -21,7 +21,7 @@ namespace MWClass
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
-            std::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
+            std::unique_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
                 const MWWorld::Ptr& actor) const override;
             ///< Generate action for activation
 
@@ -34,7 +34,7 @@ namespace MWClass
             int getValue (const MWWorld::ConstPtr& ptr) const override;
             ///< Return trade value of the object. Throws an exception, if the object can't be traded.
 
-            std::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
+            std::unique_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
             ///< Generate action for using via inventory menu
 
             std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const override;
diff --git a/apps/openmw/mwclass/probe.cpp b/apps/openmw/mwclass/probe.cpp
index 7db6a3e955..369f5efd6d 100644
--- a/apps/openmw/mwclass/probe.cpp
+++ b/apps/openmw/mwclass/probe.cpp
@@ -50,7 +50,7 @@ namespace MWClass
 
         return !name.empty() ? name : ref->mBase->mId;
     }
-    std::shared_ptr<MWWorld::Action> Probe::activate (const MWWorld::Ptr& ptr,
+    std::unique_ptr<MWWorld::Action> Probe::activate (const MWWorld::Ptr& ptr,
         const MWWorld::Ptr& actor) const
     {
         return defaultItemActivate(ptr, actor);
@@ -124,9 +124,9 @@ namespace MWClass
         return info;
     }
 
-    std::shared_ptr<MWWorld::Action> Probe::use (const MWWorld::Ptr& ptr, bool force) const
+    std::unique_ptr<MWWorld::Action> Probe::use (const MWWorld::Ptr& ptr, bool force) const
     {
-        std::shared_ptr<MWWorld::Action> action(new MWWorld::ActionEquip(ptr, force));
+        std::unique_ptr<MWWorld::Action> action(new MWWorld::ActionEquip(ptr, force));
 
         action->setSound(getUpSoundId(ptr));
 
diff --git a/apps/openmw/mwclass/probe.hpp b/apps/openmw/mwclass/probe.hpp
index 06bd2ababb..b048b37f92 100644
--- a/apps/openmw/mwclass/probe.hpp
+++ b/apps/openmw/mwclass/probe.hpp
@@ -21,7 +21,7 @@ namespace MWClass
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
-            std::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
+            std::unique_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
                 const MWWorld::Ptr& actor) const override;
             ///< Generate action for activation
 
@@ -49,7 +49,7 @@ namespace MWClass
 
             std::pair<int, std::string> canBeEquipped(const MWWorld::ConstPtr &ptr, const MWWorld::Ptr &npc) const override;
 
-            std::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
+            std::unique_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
             ///< Generate action for using via inventory menu
 
             std::string getModel(const MWWorld::ConstPtr &ptr) const override;
diff --git a/apps/openmw/mwclass/repair.cpp b/apps/openmw/mwclass/repair.cpp
index 463257696c..c3a67a6086 100644
--- a/apps/openmw/mwclass/repair.cpp
+++ b/apps/openmw/mwclass/repair.cpp
@@ -48,7 +48,7 @@ namespace MWClass
         return !name.empty() ? name : ref->mBase->mId;
     }
 
-    std::shared_ptr<MWWorld::Action> Repair::activate (const MWWorld::Ptr& ptr,
+    std::unique_ptr<MWWorld::Action> Repair::activate (const MWWorld::Ptr& ptr,
         const MWWorld::Ptr& actor) const
     {
         return defaultItemActivate(ptr, actor);
@@ -132,9 +132,9 @@ namespace MWClass
         return MWWorld::Ptr(cell.insert(ref), &cell);
     }
 
-    std::shared_ptr<MWWorld::Action> Repair::use (const MWWorld::Ptr& ptr, bool force) const
+    std::unique_ptr<MWWorld::Action> Repair::use (const MWWorld::Ptr& ptr, bool force) const
     {
-        return std::shared_ptr<MWWorld::Action>(new MWWorld::ActionRepair(ptr, force));
+        return std::unique_ptr<MWWorld::Action>(new MWWorld::ActionRepair(ptr, force));
     }
 
     bool Repair::canSell (const MWWorld::ConstPtr& item, int npcServices) const
diff --git a/apps/openmw/mwclass/repair.hpp b/apps/openmw/mwclass/repair.hpp
index b79ad2b124..4ca0dd2511 100644
--- a/apps/openmw/mwclass/repair.hpp
+++ b/apps/openmw/mwclass/repair.hpp
@@ -21,7 +21,7 @@ namespace MWClass
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
-            std::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
+            std::unique_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
                 const MWWorld::Ptr& actor) const override;
             ///< Generate action for activation
 
@@ -45,7 +45,7 @@ namespace MWClass
 
             std::string getModel(const MWWorld::ConstPtr &ptr) const override;
 
-            std::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
+            std::unique_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
             ///< Generate action for using via inventory menu (default implementation: return a
             /// null action).
 
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index 261ada1e75..9290c19d80 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -57,7 +57,7 @@ namespace MWClass
         return !name.empty() ? name : ref->mBase->mId;
     }
 
-    std::shared_ptr<MWWorld::Action> Weapon::activate (const MWWorld::Ptr& ptr,
+    std::unique_ptr<MWWorld::Action> Weapon::activate (const MWWorld::Ptr& ptr,
         const MWWorld::Ptr& actor) const
     {
         return defaultItemActivate(ptr, actor);
@@ -299,9 +299,9 @@ namespace MWClass
         return std::make_pair(1, "");
     }
 
-    std::shared_ptr<MWWorld::Action> Weapon::use (const MWWorld::Ptr& ptr, bool force) const
+    std::unique_ptr<MWWorld::Action> Weapon::use (const MWWorld::Ptr& ptr, bool force) const
     {
-        std::shared_ptr<MWWorld::Action> action(new MWWorld::ActionEquip(ptr, force));
+        std::unique_ptr<MWWorld::Action> action(new MWWorld::ActionEquip(ptr, force));
 
         action->setSound(getUpSoundId(ptr));
 
diff --git a/apps/openmw/mwclass/weapon.hpp b/apps/openmw/mwclass/weapon.hpp
index 61b2a70c26..f09c590183 100644
--- a/apps/openmw/mwclass/weapon.hpp
+++ b/apps/openmw/mwclass/weapon.hpp
@@ -21,7 +21,7 @@ namespace MWClass
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
             ///< \return name or ID; can return an empty string.
 
-            std::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
+            std::unique_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
                 const MWWorld::Ptr& actor) const override;
             ///< Generate action for activation
 
@@ -67,7 +67,7 @@ namespace MWClass
             ///< Return 0 if player cannot equip item. 1 if can equip. 2 if it's twohanded weapon. 3 if twohanded weapon conflicts with that.
             ///  Second item in the pair specifies the error message
 
-            std::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
+            std::unique_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
             ///< Generate action for using via inventory menu
 
             std::string getModel(const MWWorld::ConstPtr &ptr) const override;
diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index 80e922fb66..680356b353 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -561,7 +561,7 @@ namespace MWGui
                 ptr.getRefData().getLocals().setVarByInt(script, "pcskipequip", 1);
         }
 
-        std::shared_ptr<MWWorld::Action> action = ptr.getClass().use(ptr, force);
+        std::unique_ptr<MWWorld::Action> action = ptr.getClass().use(ptr, force);
         action->execute(player);
 
         if (isVisible())
diff --git a/apps/openmw/mwgui/sortfilteritemmodel.cpp b/apps/openmw/mwgui/sortfilteritemmodel.cpp
index c804eafb72..acb324baca 100644
--- a/apps/openmw/mwgui/sortfilteritemmodel.cpp
+++ b/apps/openmw/mwgui/sortfilteritemmodel.cpp
@@ -256,7 +256,7 @@ namespace MWGui
 
         if ((mFilter & Filter_OnlyUsableItems) && base.getClass().getScript(base).empty())
         {
-            std::shared_ptr<MWWorld::Action> actionOnUse = base.getClass().use(base);
+            std::unique_ptr<MWWorld::Action> actionOnUse = base.getClass().use(base);
             if (!actionOnUse || actionOnUse->isNullAction())
                 return false;
         }
diff --git a/apps/openmw/mwlua/actions.cpp b/apps/openmw/mwlua/actions.cpp
index 404bae6c6d..0934b92226 100644
--- a/apps/openmw/mwlua/actions.cpp
+++ b/apps/openmw/mwlua/actions.cpp
@@ -160,7 +160,7 @@ namespace MWLua
             throw std::runtime_error(std::string("Actor not found: " + idToString(mActor)));
 
         MWBase::Environment::get().getLuaManager()->objectActivated(object, actor);
-        std::shared_ptr<MWWorld::Action> action = object.getClass().activate(object, actor);
+        std::unique_ptr<MWWorld::Action> action = object.getClass().activate(object, actor);
         action->execute(actor);
     }
 
diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index 12671d50dd..cbd62d37ff 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -185,7 +185,7 @@ namespace MWMechanics
         actorClass.getCreatureStats(actor).setMovementFlag(CreatureStats::Flag_Run, true);
 
         float& actionCooldown = storage.mActionCooldown;
-        std::shared_ptr<Action>& currentAction = storage.mCurrentAction;
+        std::unique_ptr<Action>& currentAction = storage.mCurrentAction;
 
         if (!forceFlee)
         {
diff --git a/apps/openmw/mwmechanics/aicombat.hpp b/apps/openmw/mwmechanics/aicombat.hpp
index 566ec354d6..a51393647c 100644
--- a/apps/openmw/mwmechanics/aicombat.hpp
+++ b/apps/openmw/mwmechanics/aicombat.hpp
@@ -36,7 +36,7 @@ namespace MWMechanics
         bool mRotateMove;
         osg::Vec3f mLastTargetPos;
         const MWWorld::CellStore* mCell;
-        std::shared_ptr<Action> mCurrentAction;
+        std::unique_ptr<Action> mCurrentAction;
         float mActionCooldown;
         float mStrength;
         bool mForceNoShortcut;
diff --git a/apps/openmw/mwmechanics/aicombataction.cpp b/apps/openmw/mwmechanics/aicombataction.cpp
index 43b43eb9f9..30573c131e 100644
--- a/apps/openmw/mwmechanics/aicombataction.cpp
+++ b/apps/openmw/mwmechanics/aicombataction.cpp
@@ -141,14 +141,14 @@ namespace MWMechanics
         return mWeapon.get<ESM::Weapon>()->mBase;
     }
 
-    std::shared_ptr<Action> prepareNextAction(const MWWorld::Ptr &actor, const MWWorld::Ptr &enemy)
+    std::unique_ptr<Action> prepareNextAction(const MWWorld::Ptr &actor, const MWWorld::Ptr &enemy)
     {
         Spells& spells = actor.getClass().getCreatureStats(actor).getSpells();
 
         float bestActionRating = 0.f;
         float antiFleeRating = 0.f;
         // Default to hand-to-hand combat
-        std::shared_ptr<Action> bestAction (new ActionWeapon(MWWorld::Ptr()));
+        std::unique_ptr<Action> bestAction (new ActionWeapon(MWWorld::Ptr()));
         if (actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
         {
             bestAction->prepare(actor);
diff --git a/apps/openmw/mwmechanics/aicombataction.hpp b/apps/openmw/mwmechanics/aicombataction.hpp
index d17d5a3137..56d2247e99 100644
--- a/apps/openmw/mwmechanics/aicombataction.hpp
+++ b/apps/openmw/mwmechanics/aicombataction.hpp
@@ -85,7 +85,7 @@ namespace MWMechanics
         const ESM::Weapon* getWeapon() const override;
     };
 
-    std::shared_ptr<Action> prepareNextAction (const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy);
+    std::unique_ptr<Action> prepareNextAction (const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy);
     float getBestActionRating(const MWWorld::Ptr &actor, const MWWorld::Ptr &enemy);
 
     float getDistanceMinusHalfExtents(const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy, bool minusZDist=false);
diff --git a/apps/openmw/mwscript/containerextensions.cpp b/apps/openmw/mwscript/containerextensions.cpp
index 40ad3b7835..8db1c04551 100644
--- a/apps/openmw/mwscript/containerextensions.cpp
+++ b/apps/openmw/mwscript/containerextensions.cpp
@@ -320,7 +320,7 @@ namespace MWScript
                         MWBase::Environment::get().getWindowManager()->useItem(*it, true);
                     else
                     {
-                        std::shared_ptr<MWWorld::Action> action = it->getClass().use(*it, true);
+                        std::unique_ptr<MWWorld::Action> action = it->getClass().use(*it, true);
                         action->execute(ptr, true);
                     }
                 }
diff --git a/apps/openmw/mwscript/interpretercontext.cpp b/apps/openmw/mwscript/interpretercontext.cpp
index 0b9833e097..72922aa5f3 100644
--- a/apps/openmw/mwscript/interpretercontext.cpp
+++ b/apps/openmw/mwscript/interpretercontext.cpp
@@ -419,7 +419,7 @@ namespace MWScript
     void InterpreterContext::executeActivation(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor)
     {
         MWBase::Environment::get().getLuaManager()->objectActivated(ptr, actor);
-        std::shared_ptr<MWWorld::Action> action = (ptr.getClass().activate(ptr, actor));
+        std::unique_ptr<MWWorld::Action> action = (ptr.getClass().activate(ptr, actor));
         action->execute (actor);
         if (action->getTarget() != MWWorld::Ptr() && action->getTarget() != ptr)
         {
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index b67f173ee5..9dc8ba5631 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -115,14 +115,14 @@ namespace MWWorld
         throw std::runtime_error("class cannot be hit");
     }
 
-    std::shared_ptr<Action> Class::activate (const Ptr& ptr, const Ptr& actor) const
+    std::unique_ptr<Action> Class::activate (const Ptr& ptr, const Ptr& actor) const
     {
-        return std::shared_ptr<Action> (new NullAction);
+        return std::unique_ptr<Action> (new NullAction);
     }
 
-    std::shared_ptr<Action> Class::use (const Ptr& ptr, bool force) const
+    std::unique_ptr<Action> Class::use (const Ptr& ptr, bool force) const
     {
-        return std::shared_ptr<Action> (new NullAction);
+        return std::unique_ptr<Action> (new NullAction);
     }
 
     ContainerStore& Class::getContainerStore (const Ptr& ptr) const
@@ -329,10 +329,10 @@ namespace MWWorld
     {
     }
 
-    std::shared_ptr<Action> Class::defaultItemActivate(const Ptr &ptr, const Ptr &actor) const
+    std::unique_ptr<Action> Class::defaultItemActivate(const Ptr &ptr, const Ptr &actor) const
     {
         if(!MWBase::Environment::get().getWindowManager()->isAllowed(MWGui::GW_Inventory))
-            return std::shared_ptr<Action>(new NullAction());
+            return std::unique_ptr<Action>(new NullAction());
 
         if(actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
         {
@@ -340,13 +340,13 @@ namespace MWWorld
             auto& prng = MWBase::Environment::get().getWorld()->getPrng();
             const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfItem", prng);
 
-            std::shared_ptr<MWWorld::Action> action(new MWWorld::FailedAction("#{sWerewolfRefusal}"));
+            std::unique_ptr<MWWorld::Action> action(new MWWorld::FailedAction("#{sWerewolfRefusal}"));
             if(sound) action->setSound(sound->mId);
 
             return action;
         }
 
-        std::shared_ptr<MWWorld::Action> action(new ActionTake(ptr));
+        std::unique_ptr<MWWorld::Action> action(new ActionTake(ptr));
         action->setSound(getUpSoundId(ptr));
 
         return action;
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index f12b7ba192..8c52021256 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -62,7 +62,7 @@ namespace MWWorld
 
             explicit Class(unsigned type) : mType(type) {}
 
-            std::shared_ptr<Action> defaultItemActivate(const Ptr &ptr, const Ptr &actor) const;
+            std::unique_ptr<Action> defaultItemActivate(const Ptr &ptr, const Ptr &actor) const;
             ///< Generate default action for activating inventory items
 
             virtual Ptr copyToCellImpl(const ConstPtr &ptr, CellStore &cell) const;
@@ -139,10 +139,10 @@ namespace MWWorld
             ///< Play the appropriate sound for a blocked attack, depending on the currently equipped shield
             /// (default implementation: throw an exception)
 
-            virtual std::shared_ptr<Action> activate (const Ptr& ptr, const Ptr& actor) const;
+            virtual std::unique_ptr<Action> activate (const Ptr& ptr, const Ptr& actor) const;
             ///< Generate action for activation (default implementation: return a null action).
 
-            virtual std::shared_ptr<Action> use (const Ptr& ptr, bool force=false)
+            virtual std::unique_ptr<Action> use (const Ptr& ptr, bool force=false)
                 const;
             ///< Generate action for using via inventory menu (default implementation: return a
             /// null action).
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 6517694f15..7f652d9520 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -3852,7 +3852,7 @@ namespace MWWorld
         if (object.getRefData().activate())
         {
             MWBase::Environment::get().getLuaManager()->objectActivated(object, actor);
-            std::shared_ptr<MWWorld::Action> action = object.getClass().activate(object, actor);
+            std::unique_ptr<MWWorld::Action> action = object.getClass().activate(object, actor);
             action->execute (actor);
         }
     }
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index dc07a9117b..399b7232de 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -97,7 +97,7 @@ namespace MWWorld
             std::unique_ptr<MWWorld::Scene> mWorldScene;
             std::unique_ptr<MWWorld::WeatherManager> mWeatherManager;
             std::unique_ptr<MWWorld::DateTimeManager> mCurrentDate;
-            std::shared_ptr<ProjectileManager> mProjectileManager;
+            std::unique_ptr<ProjectileManager> mProjectileManager;
 
             bool mSky;
             bool mGodMode;

From bbfdb347bdebf379a64feff2636b0bde62befd9d Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 8 Apr 2022 17:08:18 +0200
Subject: [PATCH 2273/2859] Skip load cell ref when there is no need

Primarily to avoid temporary allocations by ESMReader::getHString.
---
 apps/openmw/mwrender/objectpaging.cpp |   2 +-
 apps/openmw/mwworld/cellstore.cpp     |   4 +-
 apps/openmw/mwworld/store.cpp         |   2 +-
 components/esm3/cellref.cpp           | 248 ++++++++++++++++----------
 components/esm3/cellref.hpp           |   2 +
 components/esm3/esmreader.cpp         |  26 +++
 components/esm3/esmreader.hpp         |  16 ++
 components/esm3/loadcell.cpp          |  12 +-
 components/esm3/loadcell.hpp          |  10 +-
 9 files changed, 219 insertions(+), 103 deletions(-)

diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index cf1d689911..7afb1bd4ba 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -435,7 +435,7 @@ namespace MWRender
                         cMRef.mRefNum.mIndex = 0;
                         bool deleted = false;
                         bool moved = false;
-                        while(cell->getNextRef(esm[index], ref, deleted, cMRef, moved))
+                        while (ESM::Cell::getNextRef(esm[index], ref, deleted, cMRef, moved, ESM::Cell::GetNextRefMode::LoadOnlyNotMoved))
                         {
                             if (moved)
                                 continue;
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 75136eb915..594bdcf6f2 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -568,7 +568,7 @@ namespace MWWorld
                 cMRef.mRefNum.mIndex = 0;
                 bool deleted = false;
                 bool moved = false;
-                while(mCell->getNextRef(esm[index], ref, deleted, cMRef, moved))
+                while (ESM::Cell::getNextRef(esm[index], ref, deleted, cMRef, moved, ESM::Cell::GetNextRefMode::LoadOnlyNotMoved))
                 {
                     if (deleted || moved)
                         continue;
@@ -628,7 +628,7 @@ namespace MWWorld
                 cMRef.mRefNum.mIndex = 0;
                 bool deleted = false;
                 bool moved = false;
-                while(mCell->getNextRef(esm[index], ref, deleted, cMRef, moved))
+                while (ESM::Cell::getNextRef(esm[index], ref, deleted, cMRef, moved, ESM::Cell::GetNextRefMode::LoadOnlyNotMoved))
                 {
                     if (moved)
                         continue;
diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index 3139d05a51..80cf3b87a1 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -448,7 +448,7 @@ namespace MWWorld
         //
         // Get regular moved reference data. Adapted from CellStore::loadRefs. Maybe we can optimize the following
         //  implementation when the oher implementation works as well.
-        while (cell->getNextRef(esm, ref, deleted, cMRef, moved))
+        while (ESM::Cell::getNextRef(esm, ref, deleted, cMRef, moved, ESM::Cell::GetNextRefMode::LoadOnlyMoved))
         {
             if (!moved)
                 continue;
diff --git a/components/esm3/cellref.cpp b/components/esm3/cellref.cpp
index 1a0320d823..2efa3b845d 100644
--- a/components/esm3/cellref.cpp
+++ b/components/esm3/cellref.cpp
@@ -5,6 +5,148 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
+namespace ESM
+{
+    namespace
+    {
+        template <bool load>
+        void loadIdImpl(ESMReader& esm, bool wideRefNum, CellRef& cellRef)
+        {
+            // According to Hrnchamd, this does not belong to the actual ref. Instead, it is a marker indicating that
+            // the following refs are part of a "temp refs" section. A temp ref is not being tracked by the moved references system.
+            // Its only purpose is a performance optimization for "immovable" things. We don't need this, and it's problematic anyway,
+            // because any item can theoretically be moved by a script.
+            if (esm.isNextSub("NAM0"))
+                esm.skipHSub();
+
+            if constexpr (load)
+            {
+                cellRef.blank();
+                cellRef.mRefNum.load (esm, wideRefNum);
+                cellRef.mRefID = esm.getHNOString("NAME");
+
+                if (cellRef.mRefID.empty())
+                    Log(Debug::Warning) << "Warning: got CellRef with empty RefId in " << esm.getName() << " 0x" << std::hex << esm.getFileOffset();
+            }
+            else
+            {
+                RefNum {}.load(esm, wideRefNum);
+                esm.skipHNOString("NAME");
+            }
+        }
+
+        template <bool load>
+        void loadDataImpl(ESMReader &esm, bool &isDeleted, CellRef& cellRef)
+        {
+            const auto getHStringOrSkip = [&] (std::string& value)
+            {
+                if constexpr (load)
+                    value = esm.getHString();
+                else
+                    esm.skipHString();
+            };
+
+            const auto getHTOrSkip = [&] (auto& value)
+            {
+                if constexpr (load)
+                    esm.getHT(value);
+                else
+                    esm.skipHT<std::decay_t<decltype(value)>>();
+            };
+
+            if constexpr (load)
+                isDeleted = false;
+
+            bool isLoaded = false;
+            while (!isLoaded && esm.hasMoreSubs())
+            {
+                esm.getSubName();
+                switch (esm.retSubName().toInt())
+                {
+                    case ESM::fourCC("UNAM"):
+                        getHTOrSkip(cellRef.mReferenceBlocked);
+                        break;
+                    case ESM::fourCC("XSCL"):
+                        getHTOrSkip(cellRef.mScale);
+                        if constexpr (load)
+                            cellRef.mScale = std::clamp(cellRef.mScale, 0.5f, 2.0f);
+                        break;
+                    case ESM::fourCC("ANAM"):
+                        getHStringOrSkip(cellRef.mOwner);
+                        break;
+                    case ESM::fourCC("BNAM"):
+                        getHStringOrSkip(cellRef.mGlobalVariable);
+                        break;
+                    case ESM::fourCC("XSOL"):
+                        getHStringOrSkip(cellRef.mSoul);
+                        break;
+                    case ESM::fourCC("CNAM"):
+                        getHStringOrSkip(cellRef.mFaction);
+                        break;
+                    case ESM::fourCC("INDX"):
+                        getHTOrSkip(cellRef.mFactionRank);
+                        break;
+                    case ESM::fourCC("XCHG"):
+                        getHTOrSkip(cellRef.mEnchantmentCharge);
+                        break;
+                    case ESM::fourCC("INTV"):
+                        getHTOrSkip(cellRef.mChargeInt);
+                        break;
+                    case ESM::fourCC("NAM9"):
+                        getHTOrSkip(cellRef.mGoldValue);
+                        break;
+                    case ESM::fourCC("DODT"):
+                        getHTOrSkip(cellRef.mDoorDest);
+                        if constexpr (load)
+                            cellRef.mTeleport = true;
+                        break;
+                    case ESM::fourCC("DNAM"):
+                        getHStringOrSkip(cellRef.mDestCell);
+                        break;
+                    case ESM::fourCC("FLTV"):
+                        getHTOrSkip(cellRef.mLockLevel);
+                        break;
+                    case ESM::fourCC("KNAM"):
+                        getHStringOrSkip(cellRef.mKey);
+                        break;
+                    case ESM::fourCC("TNAM"):
+                        getHStringOrSkip(cellRef.mTrap);
+                        break;
+                    case ESM::fourCC("DATA"):
+                        if constexpr (load)
+                            esm.getHT(cellRef.mPos, 24);
+                        else
+                            esm.skip(24);
+                        break;
+                    case ESM::fourCC("NAM0"):
+                    {
+                        esm.skipHSub();
+                        break;
+                    }
+                    case ESM::SREC_DELE:
+                        esm.skipHSub();
+                        if constexpr (load)
+                            isDeleted = true;
+                        break;
+                    default:
+                        esm.cacheSubName();
+                        isLoaded = true;
+                        break;
+                }
+            }
+
+            if constexpr (load)
+            {
+                if (cellRef.mLockLevel == 0 && !cellRef.mKey.empty())
+                {
+                    cellRef.mLockLevel = UnbreakableLock;
+                    cellRef.mTrap.clear();
+                }
+            }
+        }
+    }
+}
+
 void ESM::RefNum::load(ESMReader& esm, bool wide, ESM::NAME tag)
 {
     if (wide)
@@ -26,7 +168,6 @@ void ESM::RefNum::save(ESMWriter &esm, bool wide, ESM::NAME tag) const
     }
 }
 
-
 void ESM::CellRef::load (ESMReader& esm, bool &isDeleted, bool wideRefNum)
 {
     loadId(esm, wideRefNum);
@@ -35,105 +176,12 @@ void ESM::CellRef::load (ESMReader& esm, bool &isDeleted, bool wideRefNum)
 
 void ESM::CellRef::loadId (ESMReader& esm, bool wideRefNum)
 {
-    // According to Hrnchamd, this does not belong to the actual ref. Instead, it is a marker indicating that
-    // the following refs are part of a "temp refs" section. A temp ref is not being tracked by the moved references system.
-    // Its only purpose is a performance optimization for "immovable" things. We don't need this, and it's problematic anyway,
-    // because any item can theoretically be moved by a script.
-    if (esm.isNextSub ("NAM0"))
-        esm.skipHSub();
-
-    blank();
-
-    mRefNum.load (esm, wideRefNum);
-
-    mRefID = esm.getHNOString ("NAME");
-    if (mRefID.empty())
-    {
-        Log(Debug::Warning) << "Warning: got CellRef with empty RefId in " << esm.getName() << " 0x" << std::hex << esm.getFileOffset();
-    }
+    loadIdImpl<true>(esm, wideRefNum, *this);
 }
 
 void ESM::CellRef::loadData(ESMReader &esm, bool &isDeleted)
 {
-    isDeleted = false;
-
-    bool isLoaded = false;
-    while (!isLoaded && esm.hasMoreSubs())
-    {
-        esm.getSubName();
-        switch (esm.retSubName().toInt())
-        {
-            case ESM::fourCC("UNAM"):
-                esm.getHT(mReferenceBlocked);
-                break;
-            case ESM::fourCC("XSCL"):
-                esm.getHT(mScale);
-                mScale = std::clamp(mScale, 0.5f, 2.0f);
-                break;
-            case ESM::fourCC("ANAM"):
-                mOwner = esm.getHString();
-                break;
-            case ESM::fourCC("BNAM"):
-                mGlobalVariable = esm.getHString();
-                break;
-            case ESM::fourCC("XSOL"):
-                mSoul = esm.getHString();
-                break;
-            case ESM::fourCC("CNAM"):
-                mFaction = esm.getHString();
-                break;
-            case ESM::fourCC("INDX"):
-                esm.getHT(mFactionRank);
-                break;
-            case ESM::fourCC("XCHG"):
-                esm.getHT(mEnchantmentCharge);
-                break;
-            case ESM::fourCC("INTV"):
-                esm.getHT(mChargeInt);
-                break;
-            case ESM::fourCC("NAM9"):
-                esm.getHT(mGoldValue);
-                break;
-            case ESM::fourCC("DODT"):
-                esm.getHT(mDoorDest);
-                mTeleport = true;
-                break;
-            case ESM::fourCC("DNAM"):
-                mDestCell = esm.getHString();
-                break;
-            case ESM::fourCC("FLTV"):
-                esm.getHT(mLockLevel);
-                break;
-            case ESM::fourCC("KNAM"):
-                mKey = esm.getHString();
-                break;
-            case ESM::fourCC("TNAM"):
-                mTrap = esm.getHString();
-                break;
-            case ESM::fourCC("DATA"):
-                esm.getHT(mPos, 24);
-                break;
-            case ESM::fourCC("NAM0"):
-            {
-                esm.skipHSub();
-                break;
-            }
-            case ESM::SREC_DELE:
-                esm.skipHSub();
-                isDeleted = true;
-                break;
-            default:
-                esm.cacheSubName();
-                isLoaded = true;
-                break;
-        }
-    }
-
-    if (mLockLevel == 0 && !mKey.empty())
-    {
-        mLockLevel = UnbreakableLock;
-        mTrap.clear();
-    }
+    loadDataImpl<true>(esm, isDeleted, *this);
 }
 
 void ESM::CellRef::save (ESMWriter &esm, bool wideRefNum, bool inInventory, bool isDeleted) const
@@ -227,3 +275,11 @@ void ESM::CellRef::blank()
         mPos.rot[i] = 0;
     }
 }
+
+void ESM::skipLoadCellRef(ESMReader& esm, bool wideRefNum)
+{
+    CellRef cellRef;
+    loadIdImpl<false>(esm, wideRefNum, cellRef);
+    bool isDeleted;
+    loadDataImpl<false>(esm, isDeleted, cellRef);
+}
diff --git a/components/esm3/cellref.hpp b/components/esm3/cellref.hpp
index cff635f455..07d4e0c80a 100644
--- a/components/esm3/cellref.hpp
+++ b/components/esm3/cellref.hpp
@@ -116,6 +116,8 @@ namespace ESM
             void blank();
     };
 
+    void skipLoadCellRef(ESMReader& esm, bool wideRefNum = false);
+
     inline bool operator== (const RefNum& left, const RefNum& right)
     {
         return left.mIndex==right.mIndex && left.mContentFile==right.mContentFile;
diff --git a/components/esm3/esmreader.cpp b/components/esm3/esmreader.cpp
index 47974e45a8..2cf0cd29ce 100644
--- a/components/esm3/esmreader.cpp
+++ b/components/esm3/esmreader.cpp
@@ -120,6 +120,12 @@ std::string ESMReader::getHNOString(NAME name)
     return "";
 }
 
+void ESMReader::skipHNOString(NAME name)
+{
+    if (isNextSub(name))
+        skipHString();
+}
+
 std::string ESMReader::getHNString(NAME name)
 {
     getSubNameIs(name);
@@ -147,6 +153,26 @@ std::string ESMReader::getHString()
     return getString(mCtx.leftSub);
 }
 
+void ESMReader::skipHString()
+{
+    getSubHeader();
+
+    // Hack to make MultiMark.esp load. Zero-length strings do not
+    // occur in any of the official mods, but MultiMark makes use of
+    // them. For some reason, they break the rules, and contain a byte
+    // (value 0) even if the header says there is no data. If
+    // Morrowind accepts it, so should we.
+    if (mCtx.leftSub == 0 && hasMoreSubs() && !mEsm->peek())
+    {
+        // Skip the following zero byte
+        mCtx.leftRec--;
+        skipT<char>();
+        return;
+    }
+
+    skip(mCtx.leftSub);
+}
+
 void ESMReader::getHExact(void*p, int size)
 {
     getSubHeader();
diff --git a/components/esm3/esmreader.hpp b/components/esm3/esmreader.hpp
index e370946ee9..464925d936 100644
--- a/components/esm3/esmreader.hpp
+++ b/components/esm3/esmreader.hpp
@@ -140,6 +140,15 @@ public:
       getT(x);
   }
 
+  template <typename T>
+  void skipHT()
+  {
+      getSubHeader();
+      if (mCtx.leftSub != sizeof(T))
+          reportSubSizeMismatch(sizeof(T), mCtx.leftSub);
+      skipT<T>();
+  }
+
   // Version with extra size checking, to make sure the compiler
   // doesn't mess up our struct padding.
   template <typename X>
@@ -152,12 +161,16 @@ public:
   // Read a string by the given name if it is the next record.
   std::string getHNOString(NAME name);
 
+  void skipHNOString(NAME name);
+
   // Read a string with the given sub-record name
   std::string getHNString(NAME name);
 
   // Read a string, including the sub-record header (but not the name)
   std::string getHString();
 
+  void skipHString();
+
   // Read the given number of bytes from a subrecord
   void getHExact(void*p, int size);
 
@@ -237,6 +250,9 @@ public:
   template <typename X>
   void getT(X &x) { getExact(&x, sizeof(X)); }
 
+  template <typename T>
+  void skipT() { skip(sizeof(T)); }
+
   void getExact(void* x, int size) { mEsm->read((char*)x, size); }
   void getName(NAME &name) { getT(name); }
   void getUint(uint32_t &u) { getT(u); }
diff --git a/components/esm3/loadcell.cpp b/components/esm3/loadcell.cpp
index 6a4cd6ebf9..1a4fe1db8f 100644
--- a/components/esm3/loadcell.cpp
+++ b/components/esm3/loadcell.cpp
@@ -17,7 +17,7 @@
 namespace
 {
     ///< Translate 8bit/24bit code (stored in refNum.mIndex) into a proper refNum
-    void adjustRefNum (ESM::RefNum& refNum, ESM::ESMReader& reader)
+    void adjustRefNum (ESM::RefNum& refNum, const ESM::ESMReader& reader)
     {
         unsigned int local = (refNum.mIndex & 0xff000000) >> 24;
 
@@ -271,7 +271,8 @@ namespace ESM
         return false;
     }
 
-    bool Cell::getNextRef(ESMReader& esm, CellRef& cellRef, bool& deleted, MovedCellRef& movedCellRef, bool& moved)
+    bool Cell::getNextRef(ESMReader& esm, CellRef& cellRef, bool& deleted, MovedCellRef& movedCellRef, bool& moved,
+        GetNextRefMode mode)
     {
         deleted = false;
         moved = false;
@@ -288,6 +289,13 @@ namespace ESM
         if (!esm.peekNextSub("FRMR"))
             return false;
 
+        if ((!moved && mode == GetNextRefMode::LoadOnlyMoved)
+                || (moved && mode == GetNextRefMode::LoadOnlyNotMoved))
+        {
+            skipLoadCellRef(esm);
+            return true;
+        }
+
         cellRef.load(esm, deleted);
         adjustRefNum(cellRef.mRefNum, esm);
 
diff --git a/components/esm3/loadcell.hpp b/components/esm3/loadcell.hpp
index 61f9fb54a3..13c14b30e9 100644
--- a/components/esm3/loadcell.hpp
+++ b/components/esm3/loadcell.hpp
@@ -67,6 +67,13 @@ struct Cell
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Cell"; }
 
+    enum class GetNextRefMode
+    {
+        LoadAll,
+        LoadOnlyMoved,
+        LoadOnlyNotMoved,
+    };
+
   enum Flags
     {
       Interior  = 0x01, // Interior cell
@@ -183,7 +190,8 @@ struct Cell
   */
     static bool getNextRef(ESMReader& esm, CellRef& ref, bool& deleted);
 
-    static bool getNextRef(ESMReader& esm, CellRef& cellRef, bool& deleted, MovedCellRef& movedCellRef, bool& moved);
+    static bool getNextRef(ESMReader& esm, CellRef& cellRef, bool& deleted, MovedCellRef& movedCellRef, bool& moved,
+        GetNextRefMode mode = GetNextRefMode::LoadAll);
 
   /* This fetches an MVRF record, which is used to track moved references.
    * Since they are comparably rare, we use a separate method for this.

From df092b558b326cbcb43c343242e09b9b1d7f6efd Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 8 Apr 2022 22:04:32 +0200
Subject: [PATCH 2274/2859] Replace shared_ptr by unique_ptr

---
 apps/openmw/mwgui/mapwindow.hpp                |  6 ++++--
 apps/openmw/mwrender/animation.hpp             |  4 ++--
 apps/openmw/mwrender/localmap.cpp              |  4 ++--
 apps/openmw/mwrender/npcanimation.cpp          | 12 ++++++------
 apps/openmw/mwsound/movieaudiofactory.cpp      |  4 ++--
 apps/openmw/mwsound/movieaudiofactory.hpp      |  2 +-
 apps/openmw/mwworld/cellstore.cpp              |  4 ++--
 apps/openmw/mwworld/cellstore.hpp              |  6 +++---
 extern/osg-ffmpeg-videoplayer/audiofactory.hpp |  2 +-
 extern/osg-ffmpeg-videoplayer/videostate.hpp   |  2 +-
 10 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/apps/openmw/mwgui/mapwindow.hpp b/apps/openmw/mwgui/mapwindow.hpp
index c50a92dac3..37c971cd19 100644
--- a/apps/openmw/mwgui/mapwindow.hpp
+++ b/apps/openmw/mwgui/mapwindow.hpp
@@ -6,6 +6,8 @@
 
 #include <osg/Vec2f>
 
+#include <MyGUI_ITexture.h>
+
 #include "windowpinnablebase.hpp"
 
 #include <components/esm3/cellid.hpp>
@@ -142,8 +144,8 @@ namespace MWGui
 
             MyGUI::ImageBox* mMapWidget;
             MyGUI::ImageBox* mFogWidget;
-            std::shared_ptr<MyGUI::ITexture> mMapTexture;
-            std::shared_ptr<MyGUI::ITexture> mFogTexture;
+            std::unique_ptr<MyGUI::ITexture> mMapTexture;
+            std::unique_ptr<MyGUI::ITexture> mFogTexture;
             int mCellX;
             int mCellY;
         };
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index d37d548dd3..1bad0f8d95 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -61,7 +61,7 @@ public:
 
     ~PartHolder();
 
-    osg::ref_ptr<osg::Node> getNode()
+    const osg::ref_ptr<osg::Node>& getNode() const
     {
         return mNode;
     }
@@ -72,7 +72,7 @@ private:
     void operator= (const PartHolder&);
     PartHolder(const PartHolder&);
 };
-typedef std::shared_ptr<PartHolder> PartHolderPtr;
+using PartHolderPtr = std::unique_ptr<PartHolder>;
 
 struct EffectParams
 {
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index a3c8d6b2ce..98eebf0b75 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -135,7 +135,7 @@ void LocalMap::saveFogOfWar(MWWorld::CellStore* cell)
 
             segment.saveFogOfWar(fog->mFogTextures.back());
 
-            cell->setFog(fog.release());
+            cell->setFog(std::move(fog));
         }
     }
     else
@@ -169,7 +169,7 @@ void LocalMap::saveFogOfWar(MWWorld::CellStore* cell)
             }
         }
 
-        cell->setFog(fog.release());
+        cell->setFog(std::move(fog));
     }
 }
 
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 3fdfaed72d..a1a0dafb02 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -425,8 +425,8 @@ int NpcAnimation::getSlot(const osg::NodePath &path) const
 {
     for (int i=0; i<ESM::PRT_Count; ++i)
     {
-        PartHolderPtr part = mObjectParts[i];
-        if (!part.get())
+        const PartHolder* const part = mObjectParts[i].get();
+        if (part == nullptr)
             continue;
         if (std::find(path.begin(), path.end(), part->getNode().get()) != path.end())
         {
@@ -1023,8 +1023,8 @@ void NpcAnimation::releaseArrow(float attackStrength)
 
 osg::Group* NpcAnimation::getArrowBone()
 {
-    PartHolderPtr part = mObjectParts[ESM::PRT_Weapon];
-    if (!part)
+    const PartHolder* const part = mObjectParts[ESM::PRT_Weapon].get();
+    if (part == nullptr)
         return nullptr;
 
     const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
@@ -1048,8 +1048,8 @@ osg::Group* NpcAnimation::getArrowBone()
 
 osg::Node* NpcAnimation::getWeaponNode()
 {
-    PartHolderPtr part = mObjectParts[ESM::PRT_Weapon];
-    if (!part)
+    const PartHolder* const part = mObjectParts[ESM::PRT_Weapon].get();
+    if (part == nullptr)
         return nullptr;
     return part->getNode();
 }
diff --git a/apps/openmw/mwsound/movieaudiofactory.cpp b/apps/openmw/mwsound/movieaudiofactory.cpp
index d8c1c928ee..83f8398e8b 100644
--- a/apps/openmw/mwsound/movieaudiofactory.cpp
+++ b/apps/openmw/mwsound/movieaudiofactory.cpp
@@ -153,9 +153,9 @@ namespace MWSound
 
 
 
-    std::shared_ptr<Video::MovieAudioDecoder> MovieAudioFactory::createDecoder(Video::VideoState* videoState)
+    std::unique_ptr<Video::MovieAudioDecoder> MovieAudioFactory::createDecoder(Video::VideoState* videoState)
     {
-        std::shared_ptr<MWSound::MovieAudioDecoder> decoder(new MWSound::MovieAudioDecoder(videoState));
+        std::unique_ptr<MWSound::MovieAudioDecoder> decoder(new MWSound::MovieAudioDecoder(videoState));
         decoder->setupFormat();
 
         MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
diff --git a/apps/openmw/mwsound/movieaudiofactory.hpp b/apps/openmw/mwsound/movieaudiofactory.hpp
index 63b8fd7e90..0af1066af5 100644
--- a/apps/openmw/mwsound/movieaudiofactory.hpp
+++ b/apps/openmw/mwsound/movieaudiofactory.hpp
@@ -8,7 +8,7 @@ namespace MWSound
 
     class MovieAudioFactory : public Video::MovieAudioFactory
     {
-        std::shared_ptr<Video::MovieAudioDecoder> createDecoder(Video::VideoState* videoState) override;
+        std::unique_ptr<Video::MovieAudioDecoder> createDecoder(Video::VideoState* videoState) override;
     };
 
 }
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 594bdcf6f2..0c7cc631b7 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -1029,9 +1029,9 @@ namespace MWWorld
         return !(left==right);
     }
 
-    void CellStore::setFog(ESM::FogState *fog)
+    void CellStore::setFog(std::unique_ptr<ESM::FogState>&& fog)
     {
-        mFogState.reset(fog);
+        mFogState = std::move(fog);
     }
 
     ESM::FogState* CellStore::getFog() const
diff --git a/apps/openmw/mwworld/cellstore.hpp b/apps/openmw/mwworld/cellstore.hpp
index 551924857b..7eea398f6e 100644
--- a/apps/openmw/mwworld/cellstore.hpp
+++ b/apps/openmw/mwworld/cellstore.hpp
@@ -31,6 +31,7 @@
 #include <components/esm3/loadnpc.hpp>
 #include <components/esm3/loadmisc.hpp>
 #include <components/esm3/loadbody.hpp>
+#include <components/esm3/fogstate.hpp>
 
 #include "timestamp.hpp"
 #include "ptr.hpp"
@@ -39,7 +40,6 @@ namespace ESM
 {
     struct Cell;
     struct CellState;
-    struct FogState;
     struct CellId;
     struct RefNum;
 }
@@ -66,7 +66,7 @@ namespace MWWorld
             // Even though fog actually belongs to the player and not cells,
             // it makes sense to store it here since we need it once for each cell.
             // Note this is nullptr until the cell is explored to save some memory
-            std::shared_ptr<ESM::FogState> mFogState;
+            std::unique_ptr<ESM::FogState> mFogState;
 
             const ESM::Cell *mCell;
             State mState;
@@ -254,7 +254,7 @@ namespace MWWorld
 
             void setWaterLevel (float level);
 
-            void setFog (ESM::FogState* fog);
+            void setFog(std::unique_ptr<ESM::FogState>&& fog);
             ///< \note Takes ownership of the pointer
 
             ESM::FogState* getFog () const;
diff --git a/extern/osg-ffmpeg-videoplayer/audiofactory.hpp b/extern/osg-ffmpeg-videoplayer/audiofactory.hpp
index 023d536e2d..803c7e9cfb 100644
--- a/extern/osg-ffmpeg-videoplayer/audiofactory.hpp
+++ b/extern/osg-ffmpeg-videoplayer/audiofactory.hpp
@@ -10,7 +10,7 @@ namespace Video
 class MovieAudioFactory
 {
 public:
-    virtual std::shared_ptr<MovieAudioDecoder> createDecoder(VideoState* videoState) = 0;
+    virtual std::unique_ptr<MovieAudioDecoder> createDecoder(VideoState* videoState) = 0;
     virtual ~MovieAudioFactory() {}
 };
 
diff --git a/extern/osg-ffmpeg-videoplayer/videostate.hpp b/extern/osg-ffmpeg-videoplayer/videostate.hpp
index d1592bd910..8fdbbe64bf 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.hpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.hpp
@@ -161,7 +161,7 @@ struct VideoState {
     osg::ref_ptr<osg::Texture2D> mTexture;
 
     MovieAudioFactory* mAudioFactory;
-    std::shared_ptr<MovieAudioDecoder> mAudioDecoder;
+    std::unique_ptr<MovieAudioDecoder> mAudioDecoder;
 
     ExternalClock mExternalClock;
 

From 4509b05bc8bf3dfc2f1f8de3f00ebb7a3657040e Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 3 Apr 2022 23:23:25 +0200
Subject: [PATCH 2275/2859] Use std::make_shared instead of new

make_shared allocates single storage for ref counter and the object.
std::shared_ptr<T>(new T) allocates 2 storages.
---
 apps/opencs/model/filter/parser.cpp        | 14 +++++++-------
 apps/openmw/mwrender/actoranimation.cpp    |  4 +---
 apps/openmw/mwrender/animation.cpp         |  9 ++++-----
 apps/openmw/mwrender/creatureanimation.cpp |  2 +-
 apps/openmw/mwrender/effectmanager.cpp     |  2 +-
 apps/openmw/mwrender/npcanimation.cpp      |  6 +++---
 apps/openmw/mwrender/ripplesimulation.cpp  |  2 +-
 apps/openmw/mwrender/sky.cpp               |  2 +-
 apps/openmw/mwrender/water.cpp             |  2 +-
 apps/openmw/mwsound/movieaudiofactory.cpp  |  2 +-
 apps/openmw/mwworld/projectilemanager.cpp  |  2 +-
 components/nifosg/nifloader.cpp            |  4 ++--
 12 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/apps/opencs/model/filter/parser.cpp b/apps/opencs/model/filter/parser.cpp
index 6f185d60fa..c69a54726d 100644
--- a/apps/opencs/model/filter/parser.cpp
+++ b/apps/opencs/model/filter/parser.cpp
@@ -260,11 +260,11 @@ std::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseImp (bool allowEmpty, b
             {
                 case Token::Type_Keyword_True:
 
-                    return std::shared_ptr<CSMFilter::Node> (new BooleanNode (true));
+                    return std::make_shared<BooleanNode>(true);
 
                 case Token::Type_Keyword_False:
 
-                    return std::shared_ptr<CSMFilter::Node> (new BooleanNode (false));
+                    return std::make_shared<BooleanNode>(false);
 
                 case Token::Type_Keyword_And:
                 case Token::Type_Keyword_Or:
@@ -278,7 +278,7 @@ std::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseImp (bool allowEmpty, b
                     if (mError)
                         return std::shared_ptr<Node>();
 
-                    return std::shared_ptr<CSMFilter::Node> (new NotNode (node));
+                    return std::make_shared<NotNode>(node);
                 }
 
                 case Token::Type_Keyword_Text:
@@ -340,8 +340,8 @@ std::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseNAry (const Token& keyw
 
     switch (keyword.mType)
     {
-        case Token::Type_Keyword_And: return std::shared_ptr<CSMFilter::Node> (new AndNode (nodes));
-        case Token::Type_Keyword_Or: return std::shared_ptr<CSMFilter::Node> (new OrNode (nodes));
+        case Token::Type_Keyword_And: return std::make_shared<AndNode>(nodes);
+        case Token::Type_Keyword_Or: return std::make_shared<OrNode>(nodes);
         default: error(); return std::shared_ptr<Node>();
     }
 }
@@ -407,7 +407,7 @@ std::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseText()
         return std::shared_ptr<Node>();
     }
 
-    return std::shared_ptr<Node> (new TextNode (columnId, text));
+    return std::make_shared<TextNode>(columnId, text);
 }
 
 std::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseValue()
@@ -532,7 +532,7 @@ std::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseValue()
         return std::shared_ptr<Node>();
     }
 
-    return std::shared_ptr<Node> (new ValueNode (columnId, lowerType, upperType, lower, upper));
+    return std::make_shared<ValueNode>(columnId, lowerType, upperType, lower, upper);
 }
 
 void CSMFilter::Parser::error()
diff --git a/apps/openmw/mwrender/actoranimation.cpp b/apps/openmw/mwrender/actoranimation.cpp
index 88e1d10d81..b3d76d423c 100644
--- a/apps/openmw/mwrender/actoranimation.cpp
+++ b/apps/openmw/mwrender/actoranimation.cpp
@@ -330,9 +330,7 @@ void ActorAnimation::resetControllers(osg::Node* node)
     if (node == nullptr)
         return;
 
-    std::shared_ptr<SceneUtil::ControllerSource> src;
-    src.reset(new NullAnimationTime);
-    SceneUtil::ForceControllerSourcesVisitor removeVisitor(src);
+    SceneUtil::ForceControllerSourcesVisitor removeVisitor(std::make_shared<NullAnimationTime>());
     node->accept(removeVisitor);
 }
 
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index b1c7bc89c4..cb4c074586 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -521,7 +521,7 @@ namespace MWRender
         , mAlpha(1.f)
     {
         for(size_t i = 0;i < sNumBlendMasks;i++)
-            mAnimationTimePtr[i].reset(new AnimationTime);
+            mAnimationTimePtr[i] = std::make_shared<AnimationTime>();
 
         mLightListCallback = new SceneUtil::LightListCallback;
     }
@@ -630,8 +630,7 @@ namespace MWRender
         if(!mResourceSystem->getVFS()->exists(kfname))
             return;
 
-        std::shared_ptr<AnimSource> animsrc;
-        animsrc.reset(new AnimSource);
+        auto animsrc = std::make_shared<AnimSource>();
         animsrc->mKeyframes = mResourceSystem->getKeyframeManager()->get(kfname);
 
         if (!animsrc->mKeyframes || animsrc->mKeyframes->mTextKeys.empty() || animsrc->mKeyframes->mKeyframeControllers.empty())
@@ -660,7 +659,7 @@ namespace MWRender
             animsrc->mControllerMap[blendMask].insert(std::make_pair(bonename, cloned));
         }
 
-        mAnimSources.push_back(animsrc);
+        mAnimSources.push_back(std::move(animsrc));
 
         SceneUtil::AssignControllerSourcesVisitor assignVisitor(mAnimationTimePtr[0]);
         mObjectRoot->accept(assignVisitor);
@@ -1574,7 +1573,7 @@ namespace MWRender
         params.mLoop = loop;
         params.mEffectId = effectId;
         params.mBoneName = bonename;
-        params.mAnimTime = std::shared_ptr<EffectAnimationTime>(new EffectAnimationTime);
+        params.mAnimTime = std::make_shared<EffectAnimationTime>();
         trans->addUpdateCallback(new UpdateVfxCallback(params));
 
         SceneUtil::AssignControllerSourcesVisitor assignVisitor(std::shared_ptr<SceneUtil::ControllerSource>(params.mAnimTime));
diff --git a/apps/openmw/mwrender/creatureanimation.cpp b/apps/openmw/mwrender/creatureanimation.cpp
index 627b200b71..78a524b74f 100644
--- a/apps/openmw/mwrender/creatureanimation.cpp
+++ b/apps/openmw/mwrender/creatureanimation.cpp
@@ -63,7 +63,7 @@ CreatureWeaponAnimation::CreatureWeaponAnimation(const MWWorld::Ptr &ptr, const
         updateParts();
     }
 
-    mWeaponAnimationTime = std::shared_ptr<WeaponAnimationTime>(new WeaponAnimationTime(this));
+    mWeaponAnimationTime = std::make_shared<WeaponAnimationTime>(this);
 }
 
 void CreatureWeaponAnimation::showWeapons(bool showWeapon)
diff --git a/apps/openmw/mwrender/effectmanager.cpp b/apps/openmw/mwrender/effectmanager.cpp
index 3e785a769e..d5d01a5e41 100644
--- a/apps/openmw/mwrender/effectmanager.cpp
+++ b/apps/openmw/mwrender/effectmanager.cpp
@@ -32,7 +32,7 @@ void EffectManager::addEffect(const std::string &model, const std::string& textu
     node->setNodeMask(Mask_Effect);
 
     Effect effect;
-    effect.mAnimTime.reset(new EffectAnimationTime);
+    effect.mAnimTime = std::make_shared<EffectAnimationTime>();
 
     SceneUtil::FindMaxControllerLengthVisitor findMaxLengthVisitor;
     node->accept(findMaxLengthVisitor);
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 3fdfaed72d..1ae792f60c 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -275,8 +275,8 @@ NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, osg::ref_ptr<osg::Group> par
 {
     mNpc = mPtr.get<ESM::NPC>()->mBase;
 
-    mHeadAnimationTime = std::shared_ptr<HeadAnimationTime>(new HeadAnimationTime(mPtr));
-    mWeaponAnimationTime = std::shared_ptr<WeaponAnimationTime>(new WeaponAnimationTime(this));
+    mHeadAnimationTime = std::make_shared<HeadAnimationTime>(mPtr);
+    mWeaponAnimationTime = std::make_shared<WeaponAnimationTime>(this);
 
     for(size_t i = 0;i < ESM::PRT_Count;i++)
     {
@@ -846,7 +846,7 @@ bool NpcAnimation::addOrReplaceIndividualPart(ESM::PartReferenceType type, int g
             if (type == ESM::PRT_Weapon)
                 src = mWeaponAnimationTime;
             else
-                src.reset(new NullAnimationTime);
+                src = std::make_shared<NullAnimationTime>();
             SceneUtil::AssignControllerSourcesVisitor assignVisitor(src);
             node->accept(assignVisitor);
         }
diff --git a/apps/openmw/mwrender/ripplesimulation.cpp b/apps/openmw/mwrender/ripplesimulation.cpp
index 1045594c20..d1a8ea1ecd 100644
--- a/apps/openmw/mwrender/ripplesimulation.cpp
+++ b/apps/openmw/mwrender/ripplesimulation.cpp
@@ -48,7 +48,7 @@ namespace
         }
 
         osg::ref_ptr<NifOsg::FlipController> controller (new NifOsg::FlipController(0, 0.3f/rippleFrameCount, textures));
-        controller->setSource(std::shared_ptr<SceneUtil::ControllerSource>(new SceneUtil::FrameTimeSource));
+        controller->setSource(std::make_shared<SceneUtil::FrameTimeSource>());
         node->addUpdateCallback(controller);
 
         osg::ref_ptr<osg::StateSet> stateset (new osg::StateSet);
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index 8e4353f2ef..a9c56bdf19 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -642,7 +642,7 @@ namespace MWRender
 
                 mParticleEffect = mSceneManager->getInstance(mCurrentParticleEffect, mParticleNode);
 
-                SceneUtil::AssignControllerSourcesVisitor assignVisitor = std::shared_ptr<SceneUtil::ControllerSource>(new SceneUtil::FrameTimeSource);
+                SceneUtil::AssignControllerSourcesVisitor assignVisitor(std::make_shared<SceneUtil::FrameTimeSource>());
                 mParticleEffect->accept(assignVisitor);
 
                 SetupVisitor alphaFaderSetupVisitor(mPrecipitationAlpha);
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index 47e60245ba..7d9aca9b76 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -599,7 +599,7 @@ void Water::createSimpleWaterStateSet(osg::Node* node, float alpha)
     float fps = Fallback::Map::getFloat("Water_SurfaceFPS");
 
     osg::ref_ptr<NifOsg::FlipController> controller (new NifOsg::FlipController(0, 1.f/fps, textures));
-    controller->setSource(std::shared_ptr<SceneUtil::ControllerSource>(new SceneUtil::FrameTimeSource));
+    controller->setSource(std::make_shared<SceneUtil::FrameTimeSource>());
     node->setUpdateCallback(controller);
 
     stateset->setTextureAttributeAndModes(0, textures[0], osg::StateAttribute::ON);
diff --git a/apps/openmw/mwsound/movieaudiofactory.cpp b/apps/openmw/mwsound/movieaudiofactory.cpp
index d8c1c928ee..233b3c79ea 100644
--- a/apps/openmw/mwsound/movieaudiofactory.cpp
+++ b/apps/openmw/mwsound/movieaudiofactory.cpp
@@ -38,8 +38,8 @@ namespace MWSound
     public:
         MovieAudioDecoder(Video::VideoState *videoState)
             : Video::MovieAudioDecoder(videoState), mAudioTrack(nullptr)
+            , mDecoderBridge(std::make_shared<MWSoundDecoderBridge>(this))
         {
-            mDecoderBridge.reset(new MWSoundDecoderBridge(this));
         }
 
         size_t getSampleOffset()
diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index 5e60154a89..e931afa07b 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -244,7 +244,7 @@ namespace MWWorld
 
         mParent->addChild(state.mNode);
 
-        state.mEffectAnimationTime.reset(new MWRender::EffectAnimationTime);
+        state.mEffectAnimationTime = std::make_shared<MWRender::EffectAnimationTime>();
 
         SceneUtil::AssignControllerSourcesVisitor assignVisitor (state.mEffectAnimationTime);
         state.mNode->accept(assignVisitor);
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 67e8782296..17bd381a3d 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -388,9 +388,9 @@ namespace NifOsg
         {
             bool autoPlay = animflags & Nif::NiNode::AnimFlag_AutoPlay;
             if (autoPlay)
-                toSetup->setSource(std::shared_ptr<SceneUtil::ControllerSource>(new SceneUtil::FrameTimeSource));
+                toSetup->setSource(std::make_shared<SceneUtil::FrameTimeSource>());
 
-            toSetup->setFunction(std::shared_ptr<ControllerFunction>(new ControllerFunction(ctrl)));
+            toSetup->setFunction(std::make_shared<ControllerFunction>(ctrl));
         }
 
         static osg::ref_ptr<osg::LOD> handleLodNode(const Nif::NiLODNode* niLodNode)

From 25b26f6fa7305ff99a8de4487b15565ded8750ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Sat, 9 Apr 2022 01:06:15 +0300
Subject: [PATCH 2276/2859] Reduce calls in
 CharacterController::refreshHitRecoilAnims

---
 apps/openmw/mwmechanics/character.cpp | 29 ++++++++++++++-------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 1c0a4f2c85..affd25f60e 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -207,15 +207,17 @@ std::string CharacterController::chooseRandomGroup (const std::string& prefix, i
 
 void CharacterController::refreshHitRecoilAnims(CharacterState& idle)
 {
-    bool recovery = mPtr.getClass().getCreatureStats(mPtr).getHitRecovery();
-    bool knockdown = mPtr.getClass().getCreatureStats(mPtr).getKnockedDown();
-    bool block = mPtr.getClass().getCreatureStats(mPtr).getBlock();
-    bool isSwimming = MWBase::Environment::get().getWorld()->isSwimming(mPtr);
-    auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+    auto* world = MWBase::Environment::get().getWorld();
+    auto& charClass = mPtr.getClass();
+    auto& stats = charClass.getCreatureStats(mPtr);
+    bool recovery = stats.getHitRecovery();
+    bool knockdown = stats.getKnockedDown();
+    bool block = stats.getBlock();
+    bool isSwimming = world->isSwimming(mPtr);
+    auto& prng = world->getPrng();
     if(mHitState == CharState_None)
     {
-        if ((mPtr.getClass().getCreatureStats(mPtr).getFatigue().getCurrent() < 0
-                || mPtr.getClass().getCreatureStats(mPtr).getFatigue().getBase() == 0))
+        if (stats.getFatigue().getCurrent() < 0 || stats.getFatigue().getBase() == 0)
         {
             mTimeUntilWake = Misc::Rng::rollClosedProbability(prng) * 2 + 1; // Wake up after 1 to 3 seconds
             if (isSwimming && mAnimation->hasAnimation("swimknockout"))
@@ -236,7 +238,7 @@ void CharacterController::refreshHitRecoilAnims(CharacterState& idle)
                 mCurrentHit.erase();
             }
 
-            mPtr.getClass().getCreatureStats(mPtr).setKnockedDown(true);
+            stats.setKnockedDown(true);
         }
         else if (knockdown)
         {
@@ -255,7 +257,7 @@ void CharacterController::refreshHitRecoilAnims(CharacterState& idle)
             else
             {
                 // Knockdown animation is missing. Cancel knockdown state.
-                mPtr.getClass().getCreatureStats(mPtr).setKnockedDown(false);
+                stats.setKnockedDown(false);
             }
         }
         else if (recovery)
@@ -311,15 +313,14 @@ void CharacterController::refreshHitRecoilAnims(CharacterState& idle)
     {
         mCurrentHit.erase();
         if (knockdown)
-            mPtr.getClass().getCreatureStats(mPtr).setKnockedDown(false);
+            stats.setKnockedDown(false);
         if (recovery)
-            mPtr.getClass().getCreatureStats(mPtr).setHitRecovery(false);
+            stats.setHitRecovery(false);
         if (block)
-            mPtr.getClass().getCreatureStats(mPtr).setBlock(false);
+            stats.setBlock(false);
         mHitState = CharState_None;
     }
-    else if (isKnockedOut() && mPtr.getClass().getCreatureStats(mPtr).getFatigue().getCurrent() > 0 
-            && mTimeUntilWake <= 0)
+    else if (isKnockedOut() && stats.getFatigue().getCurrent() > 0 && mTimeUntilWake <= 0)
     {
         mHitState = isSwimming ? CharState_SwimKnockDown : CharState_KnockDown;
         mAnimation->disable(mCurrentHit);

From e85a979f10b5f348a4da4703c373f5ad694e8ae6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Sat, 9 Apr 2022 01:20:53 +0300
Subject: [PATCH 2277/2859] Reduce calls in CharacterController::handleTextKey

---
 apps/openmw/mwmechanics/character.cpp | 30 ++++++++++++++-------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index affd25f60e..1d2ce8d44b 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -959,6 +959,8 @@ void CharacterController::handleTextKey(const std::string &groupname, SceneUtil:
         sndMgr->playSound3D(mPtr, evt.substr(7), 1.0f, 1.0f);
         return;
     }
+
+    auto& charClass = mPtr.getClass();
     if(evt.compare(0, 10, "soundgen: ") == 0)
     {
         std::string soundgen = evt.substr(10);
@@ -984,7 +986,7 @@ void CharacterController::handleTextKey(const std::string &groupname, SceneUtil:
             }
         }
 
-        std::string sound = mPtr.getClass().getSoundIdFromSndGen(mPtr, soundgen);
+        std::string sound = charClass.getSoundIdFromSndGen(mPtr, soundgen);
         if(!sound.empty())
         {
             MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
@@ -1007,8 +1009,8 @@ void CharacterController::handleTextKey(const std::string &groupname, SceneUtil:
         // Not ours, skip it
         return;
     }
-    size_t off = groupname.size()+2;
-    size_t len = evt.size() - off;
+    const size_t off = groupname.size()+2;
+    const size_t len = evt.size() - off;
 
     if(groupname == "shield" && evt.compare(off, len, "equip attach") == 0)
         mAnimation->showCarriedLeft(true);
@@ -1019,21 +1021,21 @@ void CharacterController::handleTextKey(const std::string &groupname, SceneUtil:
     else if(evt.compare(off, len, "unequip detach") == 0)
         mAnimation->showWeapons(false);
     else if(evt.compare(off, len, "chop hit") == 0)
-        mPtr.getClass().hit(mPtr, mAttackStrength, ESM::Weapon::AT_Chop);
+        charClass.hit(mPtr, mAttackStrength, ESM::Weapon::AT_Chop);
     else if(evt.compare(off, len, "slash hit") == 0)
-        mPtr.getClass().hit(mPtr, mAttackStrength, ESM::Weapon::AT_Slash);
+        charClass.hit(mPtr, mAttackStrength, ESM::Weapon::AT_Slash);
     else if(evt.compare(off, len, "thrust hit") == 0)
-        mPtr.getClass().hit(mPtr, mAttackStrength, ESM::Weapon::AT_Thrust);
+        charClass.hit(mPtr, mAttackStrength, ESM::Weapon::AT_Thrust);
     else if(evt.compare(off, len, "hit") == 0)
     {
         if (groupname == "attack1" || groupname == "swimattack1")
-            mPtr.getClass().hit(mPtr, mAttackStrength, ESM::Weapon::AT_Chop);
+            charClass.hit(mPtr, mAttackStrength, ESM::Weapon::AT_Chop);
         else if (groupname == "attack2" || groupname == "swimattack2")
-            mPtr.getClass().hit(mPtr, mAttackStrength, ESM::Weapon::AT_Slash);
+            charClass.hit(mPtr, mAttackStrength, ESM::Weapon::AT_Slash);
         else if (groupname == "attack3" || groupname == "swimattack3")
-            mPtr.getClass().hit(mPtr, mAttackStrength, ESM::Weapon::AT_Thrust);
+            charClass.hit(mPtr, mAttackStrength, ESM::Weapon::AT_Thrust);
         else
-            mPtr.getClass().hit(mPtr, mAttackStrength);
+            charClass.hit(mPtr, mAttackStrength);
     }
     else if (!groupname.empty()
              && (groupname.compare(0, groupname.size()-1, "attack") == 0 || groupname.compare(0, groupname.size()-1, "swimattack") == 0)
@@ -1057,11 +1059,11 @@ void CharacterController::handleTextKey(const std::string &groupname, SceneUtil:
         if (!hasHitKey)
         {
             if (groupname == "attack1" || groupname == "swimattack1")
-                mPtr.getClass().hit(mPtr, mAttackStrength, ESM::Weapon::AT_Chop);
+                charClass.hit(mPtr, mAttackStrength, ESM::Weapon::AT_Chop);
             else if (groupname == "attack2" || groupname == "swimattack2")
-                mPtr.getClass().hit(mPtr, mAttackStrength, ESM::Weapon::AT_Slash);
+                charClass.hit(mPtr, mAttackStrength, ESM::Weapon::AT_Slash);
             else if (groupname == "attack3" || groupname == "swimattack3")
-                mPtr.getClass().hit(mPtr, mAttackStrength, ESM::Weapon::AT_Thrust);
+                charClass.hit(mPtr, mAttackStrength, ESM::Weapon::AT_Thrust);
         }
     }
     else if (evt.compare(off, len, "shoot attach") == 0)
@@ -1081,7 +1083,7 @@ void CharacterController::handleTextKey(const std::string &groupname, SceneUtil:
     }
 
     else if (groupname == "shield" && evt.compare(off, len, "block hit") == 0)
-        mPtr.getClass().block(mPtr);
+        charClass.block(mPtr);
     else if (groupname == "containeropen" && evt.compare(off, len, "loot") == 0)
         MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Container, mPtr);
 }

From dd222b9ef16785277ede71040442be63879f5b6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Sat, 9 Apr 2022 01:21:34 +0300
Subject: [PATCH 2278/2859] Reduce calls in
 CharacterController::updateIdleStormState

---
 apps/openmw/mwmechanics/character.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 1d2ce8d44b..8e29f2a5b1 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -1101,9 +1101,10 @@ void CharacterController::updateIdleStormState(bool inwater)
         return;
     }
 
-    if (MWBase::Environment::get().getWorld()->isInStorm())
+    auto* world = MWBase::Environment::get().getWorld();
+    if (world->isInStorm())
     {
-        osg::Vec3f stormDirection = MWBase::Environment::get().getWorld()->getStormDirection();
+        osg::Vec3f stormDirection = world->getStormDirection();
         osg::Vec3f characterDirection = mPtr.getRefData().getBaseNode()->getAttitude() * osg::Vec3f(0,1,0);
         stormDirection.normalize();
         characterDirection.normalize();

From 058da82823eca29de6af2c27603a087206d34a9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Sat, 9 Apr 2022 01:52:52 +0300
Subject: [PATCH 2279/2859] Reduce calls in CharacterController::updateState

---
 apps/openmw/mwmechanics/character.cpp | 59 ++++++++++++---------------
 1 file changed, 27 insertions(+), 32 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 8e29f2a5b1..b2eb316e24 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -1139,7 +1139,9 @@ bool CharacterController::updateCarriedLeftVisible(const int weaptype) const
 
 bool CharacterController::updateState(CharacterState idle)
 {
-    auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+    auto* world = MWBase::Environment::get().getWorld();
+    auto& prng = world->getPrng();
+    MWBase::SoundManager* sndMgr = MWBase::Environment::get().getSoundManager();
 
     const MWWorld::Class &cls = mPtr.getClass();
     CreatureStats &stats = cls.getCreatureStats(mPtr);
@@ -1154,7 +1156,7 @@ bool CharacterController::updateState(CharacterState idle)
     std::string upSoundId;
     std::string downSoundId;
     bool weaponChanged = false;
-    if (mPtr.getClass().hasInventoryStore(mPtr))
+    if (cls.hasInventoryStore(mPtr))
     {
         MWWorld::InventoryStore &inv = cls.getInventoryStore(mPtr);
         MWWorld::ContainerStoreIterator weapon = getActiveWeapon(mPtr, &weaptype);
@@ -1182,13 +1184,13 @@ bool CharacterController::updateState(CharacterState idle)
 
     // For biped actors, blend weapon animations with lower body animations with higher priority
     MWRender::Animation::AnimPriority priorityWeapon(Priority_Weapon);
-    if (mPtr.getClass().isBipedal(mPtr))
+    if (cls.isBipedal(mPtr))
         priorityWeapon[MWRender::Animation::BoneGroup_LowerBody] = Priority_WeaponLowerBody;
 
     bool forcestateupdate = false;
 
     // We should not play equipping animation and sound during weapon->weapon transition
-    bool isStillWeapon = weaptype != ESM::Weapon::HandToHand && weaptype != ESM::Weapon::Spell && weaptype != ESM::Weapon::None &&
+    const bool isStillWeapon = weaptype != ESM::Weapon::HandToHand && weaptype != ESM::Weapon::Spell && weaptype != ESM::Weapon::None &&
                             mWeaponType != ESM::Weapon::HandToHand && mWeaponType != ESM::Weapon::Spell && mWeaponType != ESM::Weapon::None;
 
     // If the current weapon type was changed in the middle of attack (e.g. by Equip console command or when bound spell expires),
@@ -1241,7 +1243,6 @@ bool CharacterController::updateState(CharacterState idle)
 
             if(!downSoundId.empty())
             {
-                MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
                 sndMgr->playSound3D(mPtr, downSoundId, 1.0f, 1.0f);
             }
         }
@@ -1297,11 +1298,10 @@ bool CharacterController::updateState(CharacterState idle)
 
                 if(isWerewolf)
                 {
-                    const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
+                    const MWWorld::ESMStore &store = world->getStore();
                     const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfEquip", prng);
                     if(sound)
                     {
-                        MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
                         sndMgr->playSound3D(mPtr, sound->mId, 1.0f, 1.0f);
                     }
                 }
@@ -1311,7 +1311,6 @@ bool CharacterController::updateState(CharacterState idle)
 
                 if(!upSoundId.empty() && !isStillWeapon)
                 {
-                    MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
                     sndMgr->playSound3D(mPtr, upSoundId, 1.0f, 1.0f);
                 }
             }
@@ -1329,10 +1328,9 @@ bool CharacterController::updateState(CharacterState idle)
 
     if(isWerewolf)
     {
-        MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
-        if(cls.getCreatureStats(mPtr).getStance(MWMechanics::CreatureStats::Stance_Run)
+        if(stats.getStance(MWMechanics::CreatureStats::Stance_Run)
             && mHasMovedInXY
-            && !MWBase::Environment::get().getWorld()->isSwimming(mPtr)
+            && !world->isSwimming(mPtr)
             && mWeaponType == ESM::Weapon::None)
         {
             if(!sndMgr->getSoundPlaying(mPtr, "WolfRun"))
@@ -1347,7 +1345,7 @@ bool CharacterController::updateState(CharacterState idle)
     bool ammunition = true;
     bool isWeapon = false;
     float weapSpeed = 1.f;
-    if (mPtr.getClass().hasInventoryStore(mPtr))
+    if (cls.hasInventoryStore(mPtr))
     {
         MWWorld::InventoryStore &inv = cls.getInventoryStore(mPtr);
         MWWorld::ConstContainerStoreIterator weapon = getActiveWeapon(mPtr, &weaptype);
@@ -1380,12 +1378,12 @@ bool CharacterController::updateState(CharacterState idle)
         bool resetIdle = ammunition;
         if(mUpperBodyState == UpperCharState_WeapEquiped && (mHitState == CharState_None || mHitState == CharState_Block))
         {
-            MWBase::Environment::get().getWorld()->breakInvisibility(mPtr);
+            world->breakInvisibility(mPtr);
             mAttackStrength = 0;
 
             // Randomize attacks for non-bipedal creatures
-            if (mPtr.getClass().getType() == ESM::Creature::sRecordId &&
-                !mPtr.getClass().isBipedal(mPtr) &&
+            if (cls.getType() == ESM::Creature::sRecordId &&
+                !cls.isBipedal(mPtr) &&
                 (!mAnimation->hasAnimation(mCurrentWeapon) || isRandomAttackAnimation(mCurrentWeapon)))
             {
                 mCurrentWeapon = chooseRandomAttackAnimation();
@@ -1406,13 +1404,13 @@ bool CharacterController::updateState(CharacterState idle)
                 }
                 std::string spellid = stats.getSpells().getSelectedSpell();
                 bool isMagicItem = false;
-                bool canCast = mCastingManualSpell || MWBase::Environment::get().getWorld()->startSpellCast(mPtr);
+                bool canCast = mCastingManualSpell || world->startSpellCast(mPtr);
 
                 if (spellid.empty())
                 {
-                    if (mPtr.getClass().hasInventoryStore(mPtr))
+                    if (cls.hasInventoryStore(mPtr))
                     {
-                        MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
+                        MWWorld::InventoryStore& inv = cls.getInventoryStore(mPtr);
                         if (inv.getSelectedEnchantItem() != inv.end())
                         {
                             const MWWorld::Ptr& enchantItem = *inv.getSelectedEnchantItem();
@@ -1426,7 +1424,7 @@ bool CharacterController::updateState(CharacterState idle)
                 if (isMagicItem && !useCastingAnimations)
                 {
                     // Enchanted items by default do not use casting animations
-                    MWBase::Environment::get().getWorld()->castSpell(mPtr);
+                    world->castSpell(mPtr);
                     resetIdle = false;
                 }
                 else if(!spellid.empty() && canCast)
@@ -1435,7 +1433,7 @@ bool CharacterController::updateState(CharacterState idle)
                     cast.playSpellCastingEffects(spellid, isMagicItem);
 
                     std::vector<ESM::ENAMstruct> effects;
-                    const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
+                    const MWWorld::ESMStore &store = world->getStore();
                     if (isMagicItem)
                     {
                         const ESM::Enchantment *enchantment = store.get<ESM::Enchantment>().find(spellid);
@@ -1449,7 +1447,7 @@ bool CharacterController::updateState(CharacterState idle)
 
                     const ESM::MagicEffect *effect = store.get<ESM::MagicEffect>().find(effects.back().mEffectID); // use last effect of list for color of VFX_Hands
 
-                    const ESM::Static* castStatic = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>().find ("VFX_Hands");
+                    const ESM::Static* castStatic = world->getStore().get<ESM::Static>().find ("VFX_Hands");
 
                     for (size_t iter = 0; iter < effects.size(); ++iter) // play hands vfx for each effect
                     {
@@ -1468,7 +1466,7 @@ bool CharacterController::updateState(CharacterState idle)
                     {
                         startKey = "start";
                         stopKey = "stop";
-                        MWBase::Environment::get().getWorld()->castSpell(mPtr, mCastingManualSpell); // No "release" text key to use, so cast immediately
+                        world->castSpell(mPtr, mCastingManualSpell); // No "release" text key to use, so cast immediately
                         mCastingManualSpell = false;
                     }
                     else
@@ -1497,10 +1495,10 @@ bool CharacterController::updateState(CharacterState idle)
             }
             else if(mWeaponType == ESM::Weapon::PickProbe)
             {
-                MWWorld::ContainerStoreIterator weapon = mPtr.getClass().getInventoryStore(mPtr).getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
+                MWWorld::ContainerStoreIterator weapon = cls.getInventoryStore(mPtr).getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
                 MWWorld::Ptr item = *weapon;
                 // TODO: this will only work for the player, and needs to be fixed if NPCs should ever use lockpicks/probes.
-                MWWorld::Ptr target = MWBase::Environment::get().getWorld()->getFacedObject();
+                MWWorld::Ptr target = world->getFacedObject();
                 std::string resultMessage, resultSound;
 
                 if(!target.isEmpty())
@@ -1518,8 +1516,7 @@ bool CharacterController::updateState(CharacterState idle)
                 if(!resultMessage.empty())
                     MWBase::Environment::get().getWindowManager()->messageBox(resultMessage);
                 if(!resultSound.empty())
-                    MWBase::Environment::get().getSoundManager()->playSound3D(target, resultSound,
-                                                                              1.0f, 1.0f);
+                    sndMgr->playSound3D(target, resultSound, 1.0f, 1.0f);
             }
             else if (ammunition)
             {
@@ -1545,7 +1542,7 @@ bool CharacterController::updateState(CharacterState idle)
                         {
                             if (isWeapon)
                             {
-                                MWWorld::ConstContainerStoreIterator weapon = mPtr.getClass().getInventoryStore(mPtr).getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
+                                MWWorld::ConstContainerStoreIterator weapon = cls.getInventoryStore(mPtr).getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
                                 mAttackType = getBestAttack(weapon->get<ESM::Weapon>()->mBase);
                             }
                             else
@@ -1611,11 +1608,9 @@ bool CharacterController::updateState(CharacterState idle)
 
             if(weapclass != ESM::WeaponType::Ranged && weapclass != ESM::WeaponType::Thrown)
             {
-                MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
-
                 if(isWerewolf)
                 {
-                    const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
+                    const MWWorld::ESMStore &store = world->getStore();
                     const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfSwing", prng);
                     if(sound)
                         sndMgr->playSound3D(mPtr, sound->mId, 1.0f, 1.0f);
@@ -1785,9 +1780,9 @@ bool CharacterController::updateState(CharacterState idle)
         mUpperBodyState = UpperCharState_WeapEquiped;
     }
 
-    if (mPtr.getClass().hasInventoryStore(mPtr))
+    if (cls.hasInventoryStore(mPtr))
     {
-        const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
+        const MWWorld::InventoryStore& inv = cls.getInventoryStore(mPtr);
         MWWorld::ConstContainerStoreIterator torch = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
         if(torch != inv.end() && torch->getType() == ESM::Light::sRecordId
                 && updateCarriedLeftVisible(mWeaponType))

From 21ffbcc4b466963b677b8b51d11d342f4c9e82db Mon Sep 17 00:00:00 2001
From: Benjamin Winger <bmw@disroot.org>
Date: Sun, 10 Apr 2022 07:57:02 +0000
Subject: [PATCH 2280/2859] Lua i18n updates

---
 CI/before_install.osx.sh                      |   2 +
 CI/before_script.android.sh                   |  17 ++
 CI/before_script.msvc.sh                      |  26 ++
 CI/install_debian_deps.sh                     |   2 +-
 CMakeLists.txt                                |  18 ++
 apps/openmw/mwlua/context.hpp                 |   4 +-
 apps/openmw/mwlua/luabindings.cpp             |   9 +-
 apps/openmw/mwlua/luamanagerimp.cpp           |  12 +-
 apps/openmw/mwlua/luamanagerimp.hpp           |   4 +-
 apps/openmw_test_suite/CMakeLists.txt         |   2 +-
 apps/openmw_test_suite/lua/test_i18n.cpp      | 110 -------
 apps/openmw_test_suite/lua/test_l10n.cpp      | 157 ++++++++++
 components/CMakeLists.txt                     |   8 +-
 components/l10n/messagebundles.cpp            | 167 +++++++++++
 components/l10n/messagebundles.hpp            |  55 ++++
 components/lua/i18n.cpp                       | 111 -------
 components/lua/i18n.hpp                       |  41 ---
 components/lua/l10n.cpp                       | 136 +++++++++
 components/lua/l10n.hpp                       |  42 +++
 .../reference/modding/settings/general.rst    |  18 ++
 .../source/reference/modding/settings/lua.rst |  12 -
 extern/CMakeLists.txt                         |  63 ++++
 extern/i18n.lua/CMakeLists.txt                |  17 --
 extern/i18n.lua/LICENSE                       |  22 --
 extern/i18n.lua/README.md                     | 164 ----------
 extern/i18n.lua/i18n/init.lua                 | 188 ------------
 extern/i18n.lua/i18n/interpolate.lua          |  60 ----
 extern/i18n.lua/i18n/plural.lua               | 280 ------------------
 extern/i18n.lua/i18n/variants.lua             |  49 ---
 extern/i18n.lua/i18n/version.lua              |   1 -
 files/CMakeLists.txt                          |   1 -
 files/builtin_scripts/CMakeLists.txt          |   2 +-
 files/builtin_scripts/i18n/Calendar/en.lua    |  42 ---
 files/builtin_scripts/l10n/Calendar/en.yaml   |  39 +++
 files/builtin_scripts/openmw_aux/calendar.lua |  18 +-
 files/lua_api/openmw/core.lua                 |  84 ++++--
 files/settings-default.cfg                    |   9 +-
 37 files changed, 839 insertions(+), 1153 deletions(-)
 delete mode 100644 apps/openmw_test_suite/lua/test_i18n.cpp
 create mode 100644 apps/openmw_test_suite/lua/test_l10n.cpp
 create mode 100644 components/l10n/messagebundles.cpp
 create mode 100644 components/l10n/messagebundles.hpp
 delete mode 100644 components/lua/i18n.cpp
 delete mode 100644 components/lua/i18n.hpp
 create mode 100644 components/lua/l10n.cpp
 create mode 100644 components/lua/l10n.hpp
 delete mode 100644 extern/i18n.lua/CMakeLists.txt
 delete mode 100644 extern/i18n.lua/LICENSE
 delete mode 100644 extern/i18n.lua/README.md
 delete mode 100644 extern/i18n.lua/i18n/init.lua
 delete mode 100644 extern/i18n.lua/i18n/interpolate.lua
 delete mode 100644 extern/i18n.lua/i18n/plural.lua
 delete mode 100644 extern/i18n.lua/i18n/variants.lua
 delete mode 100644 extern/i18n.lua/i18n/version.lua
 delete mode 100644 files/builtin_scripts/i18n/Calendar/en.lua
 create mode 100644 files/builtin_scripts/l10n/Calendar/en.yaml

diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index b3463aa9b8..b5bb35957f 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -13,6 +13,8 @@ brew update --quiet
 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
+command -v pkgdata >/dev/null 2>&1 || brew install icu4c
+brew install yaml-cpp
 export PATH="/usr/local/opt/qt@5/bin:$PATH"  # needed to use qmake in none default path as qt now points to qt6
 
 ccache --version
diff --git a/CI/before_script.android.sh b/CI/before_script.android.sh
index 80a3f11e57..47655f8ace 100755
--- a/CI/before_script.android.sh
+++ b/CI/before_script.android.sh
@@ -6,6 +6,20 @@ sed -i s/"NOT FFVER_OK"/"FALSE"/ CMakeLists.txt
 mkdir -p build
 cd build
 
+# Build a version of ICU for the host so that it can use the tools during the cross-compilation
+mkdir -p icu-host-build
+cd icu-host-build
+if [ -r ../extern/fetched/icu/icu4c/source/configure ]; then
+    ICU_SOURCE_DIR=../extern/fetched/icu/icu4c/source
+else
+    wget https://github.com/unicode-org/icu/archive/refs/tags/release-70-1.zip
+    unzip release-70-1.zip
+    ICU_SOURCE_DIR=./icu-release-70-1/icu4c/source
+fi
+${ICU_SOURCE_DIR}/configure --disable-tests --disable-samples --disable-icuio --disable-extras CC="ccache gcc" CXX="ccache g++"
+make -j $(nproc)
+cd ..
+
 cmake \
 -DCMAKE_TOOLCHAIN_FILE=/android-ndk-r22/build/cmake/android.toolchain.cmake \
 -DANDROID_ABI=arm64-v8a \
@@ -26,4 +40,7 @@ cmake \
 -DBUILD_BULLETOBJECTTOOL=OFF \
 -DOPENMW_USE_SYSTEM_MYGUI=OFF \
 -DOPENMW_USE_SYSTEM_SQLITE3=OFF \
+-DOPENMW_USE_SYSTEM_YAML_CPP=OFF \
+-DOPENMW_USE_SYSTEM_ICU=OFF \
+-DOPENMW_ICU_HOST_BUILD_DIR="$(pwd)/icu-host-build" \
 ..
diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 563a65595b..5cfff39b3d 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -512,6 +512,8 @@ if ! [ -z $USE_CCACHE ]; then
 	add_cmake_opts "-DCMAKE_C_COMPILER_LAUNCHER=ccache  -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
 fi
 
+ICU_VER="70_1"
+
 echo
 echo "==================================="
 echo "Starting prebuild on MSVC${MSVC_DISPLAY_YEAR} WIN${BITS}"
@@ -598,6 +600,11 @@ if [ -z $SKIP_DOWNLOAD ]; then
 			git clone -b release-1.10.0 https://github.com/google/googletest.git
 		fi
 	fi
+
+    # ICU
+    download "ICU ${ICU_VER/_/.}"\
+        "https://github.com/unicode-org/icu/releases/download/release-${ICU_VER/_/-}/icu4c-${ICU_VER}-Win${BITS}-MSVC2019.zip" \
+        "icu4c-${ICU_VER}-Win${BITS}-MSVC2019.zip"
 fi
 
 cd .. #/..
@@ -1027,6 +1034,24 @@ if [ ! -z $TEST_FRAMEWORK ]; then
 
 fi
 
+cd $DEPS
+echo
+# ICU
+printf "ICU ${ICU_VER/_/.}... "
+{
+	if [ -d ICU ]; then
+		printf "Exists. "
+	elif [ -z $SKIP_EXTRACT ]; then
+		rm -rf ICU
+		eval 7z x -y icu4c-${ICU_VER}-Win${BITS}-MSVC2019.zip -o$(real_pwd)/ICU $STRIP
+	fi
+	export ICU_ROOT="$(real_pwd)/ICU"
+	add_cmake_opts -DICU_INCLUDE_DIR="${ICU_ROOT}/include" \
+		-DICU_LIBRARY="${ICU_ROOT}/lib${BITS}/icuuc.lib " \
+        -DICU_DEBUG=ON
+	echo Done.
+}
+
 echo
 cd $DEPS_INSTALL/..
 echo
@@ -1034,6 +1059,7 @@ echo "Setting up OpenMW build..."
 add_cmake_opts -DOPENMW_MP_BUILD=on
 add_cmake_opts -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}"
 add_cmake_opts -DOPENMW_USE_SYSTEM_SQLITE3=OFF
+add_cmake_opts -DOPENMW_USE_SYSTEM_YAML_CPP=OFF
 if [ ! -z $CI ]; then
 	case $STEP in
 		components )
diff --git a/CI/install_debian_deps.sh b/CI/install_debian_deps.sh
index 93f701d011..c089558208 100755
--- a/CI/install_debian_deps.sh
+++ b/CI/install_debian_deps.sh
@@ -20,7 +20,7 @@ declare -rA GROUPED_DEPS=(
     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 libluajit-5.1-dev
-    librecast-dev libsqlite3-dev ca-certificates
+    librecast-dev libsqlite3-dev ca-certificates libicu-dev libyaml-cpp-dev
   "
 
   # These dependencies can alternatively be built and linked statically.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc4fa56e25..dbb88e14f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -248,6 +248,23 @@ set(USED_OSG_PLUGINS
     osgdb_serializers_osg
     osgdb_tga)
 
+
+option(OPENMW_USE_SYSTEM_ICU "Use system ICU library instead of internal. If disabled, requires autotools" ON)
+if(OPENMW_USE_SYSTEM_ICU)
+    find_package(ICU COMPONENTS uc i18n)
+endif()
+
+option(OPENMW_USE_SYSTEM_YAML_CPP "Use system yaml-cpp library instead of internal." ON)
+if(OPENMW_USE_SYSTEM_YAML_CPP)
+    set(_yaml_cpp_static_default OFF)
+else()
+    set(_yaml_cpp_static_default ON)
+endif()
+option(YAML_CPP_STATIC "Link static build of yaml-cpp into the binaries" ${_yaml_cpp_static_default})
+if (OPENMW_USE_SYSTEM_YAML_CPP)
+    find_package(yaml-cpp)
+endif()
+
 add_subdirectory(extern)
 
 # Sound setup
@@ -442,6 +459,7 @@ include_directories(
     ${LUA_INCLUDE_DIR}
     ${SOL_INCLUDE_DIR}
     ${SOL_CONFIG_DIR}
+    ${ICU_INCLUDE_DIRS}
 )
 
 link_directories(${SDL2_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS})
diff --git a/apps/openmw/mwlua/context.hpp b/apps/openmw/mwlua/context.hpp
index 7ff584d8cc..124e7f06be 100644
--- a/apps/openmw/mwlua/context.hpp
+++ b/apps/openmw/mwlua/context.hpp
@@ -7,7 +7,7 @@ namespace LuaUtil
 {
     class LuaState;
     class UserdataSerializer;
-    class I18nManager;
+    class L10nManager;
 }
 
 namespace MWLua
@@ -21,7 +21,7 @@ namespace MWLua
         LuaManager* mLuaManager;
         LuaUtil::LuaState* mLua;
         LuaUtil::UserdataSerializer* mSerializer;
-        LuaUtil::I18nManager* mI18n;
+        LuaUtil::L10nManager* mL10n;
         WorldView* mWorldView;
         LocalEventQueue* mLocalEventQueue;
         GlobalEventQueue* mGlobalEventQueue;
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index b47e1f2dec..c88045ae84 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -1,7 +1,7 @@
 #include "luabindings.hpp"
 
 #include <components/lua/luastate.hpp>
-#include <components/lua/i18n.hpp>
+#include <components/lua/l10n.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/statemanager.hpp"
@@ -52,7 +52,12 @@ namespace MWLua
             context.mGlobalEventQueue->push_back({std::move(eventName), LuaUtil::serialize(eventData, context.mSerializer)});
         };
         addTimeBindings(api, context, false);
-        api["i18n"] = [i18n=context.mI18n](const std::string& context) { return i18n->getContext(context); };
+        api["l10n"] = [l10n=context.mL10n](const std::string& context, const sol::object &fallbackLocale) {
+            if (fallbackLocale == sol::nil)
+                return l10n->getContext(context);
+            else
+                return l10n->getContext(context, fallbackLocale.as<std::string>());
+        };
         const MWWorld::Store<ESM::GameSetting>* gmst = &MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
         api["getGMST"] = [lua=context.mLua, gmst](const std::string& setting) -> sol::object
         {
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index df49862df6..e2037049d8 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -30,7 +30,7 @@ namespace MWLua
     LuaManager::LuaManager(const VFS::Manager* vfs, const std::string& libsDir)
         : mLua(vfs, &mConfiguration)
         , mUiResourceManager(vfs)
-        , mI18n(vfs, &mLua)
+        , mL10n(vfs, &mLua)
     {
         Log(Debug::Info) << "Lua version: " << LuaUtil::getLuaVersion();
         mLua.addInternalLibSearchPath(libsDir);
@@ -57,7 +57,7 @@ namespace MWLua
         context.mIsGlobal = true;
         context.mLuaManager = this;
         context.mLua = &mLua;
-        context.mI18n = &mI18n;
+        context.mL10n = &mL10n;
         context.mWorldView = &mWorldView;
         context.mLocalEventQueue = &mLocalEvents;
         context.mGlobalEventQueue = &mGlobalEvents;
@@ -67,10 +67,10 @@ namespace MWLua
         localContext.mIsGlobal = false;
         localContext.mSerializer = mLocalSerializer.get();
 
-        mI18n.init();
-        std::vector<std::string> preferredLanguages;
-        Misc::StringUtils::split(Settings::Manager::getString("i18n preferred languages", "Lua"), preferredLanguages, ", ");
-        mI18n.setPreferredLanguages(preferredLanguages);
+        mL10n.init();
+        std::vector<std::string> preferredLocales;
+        Misc::StringUtils::split(Settings::Manager::getString("preferred locales", "General"), preferredLocales, ", ");
+        mL10n.setPreferredLocales(preferredLocales);
 
         initObjectBindingsForGlobalScripts(context);
         initCellBindingsForGlobalScripts(context);
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index fed6dc9dc7..e6f5af78be 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -4,7 +4,7 @@
 #include <map>
 #include <set>
 
-#include <components/lua/i18n.hpp>
+#include <components/lua/l10n.hpp>
 #include <components/lua/luastate.hpp>
 #include <components/lua/storage.hpp>
 
@@ -102,7 +102,7 @@ namespace MWLua
         LuaUtil::ScriptsConfiguration mConfiguration;
         LuaUtil::LuaState mLua;
         LuaUi::ResourceManager mUiResourceManager;
-        LuaUtil::I18nManager mI18n;
+        LuaUtil::L10nManager mL10n;
         sol::table mNearbyPackage;
         sol::table mUserInterfacePackage;
         sol::table mCameraPackage;
diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index 854526dc8c..3b12e7c227 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -22,7 +22,7 @@ if (GTEST_FOUND AND GMOCK_FOUND)
         lua/test_utilpackage.cpp
         lua/test_serialization.cpp
         lua/test_configuration.cpp
-        lua/test_i18n.cpp
+        lua/test_l10n.cpp
         lua/test_storage.cpp
 
         lua/test_ui_content.cpp
diff --git a/apps/openmw_test_suite/lua/test_i18n.cpp b/apps/openmw_test_suite/lua/test_i18n.cpp
deleted file mode 100644
index 427482be64..0000000000
--- a/apps/openmw_test_suite/lua/test_i18n.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-#include "gmock/gmock.h"
-#include <gtest/gtest.h>
-
-#include <components/files/fixedpath.hpp>
-
-#include <components/lua/luastate.hpp>
-#include <components/lua/i18n.hpp>
-
-#include "testing_util.hpp"
-
-namespace
-{
-    using namespace testing;
-
-    TestFile invalidScript("not a script");
-    TestFile incorrectScript("return { incorrectSection = {}, engineHandlers = { incorrectHandler = function() end } }");
-    TestFile emptyScript("");
-    
-    TestFile test1En(R"X(
-return {
-    good_morning = "Good morning.",
-    you_have_arrows = {
-      one = "You have one arrow.",
-      other = "You have %{count} arrows.",
-    },
-}
-)X");
-
-    TestFile test1De(R"X(
-return {
-    good_morning = "Guten Morgen.",
-    you_have_arrows = {
-      one = "Du hast ein Pfeil.",
-      other = "Du hast %{count} Pfeile.",
-    },
-    ["Hello %{name}!"] = "Hallo %{name}!",
-}
-)X");
-
-TestFile test2En(R"X(
-return {
-    good_morning = "Morning!",
-    you_have_arrows = "Arrows count: %{count}",
-}
-)X");
-
-    TestFile invalidTest2De(R"X(
-require('math')
-return {}
-)X");
-
-    struct LuaI18nTest : Test
-    {
-        std::unique_ptr<VFS::Manager> mVFS = createTestVFS({
-            {"i18n/Test1/en.lua", &test1En},
-            {"i18n/Test1/de.lua", &test1De},
-            {"i18n/Test2/en.lua", &test2En},
-            {"i18n/Test2/de.lua", &invalidTest2De},
-        });
-
-        LuaUtil::ScriptsConfiguration mCfg;
-        std::string mLibsPath = (Files::TargetPathType("openmw_test_suite").getLocalPath() / "resources" / "lua_libs").string();
-    };
-
-    TEST_F(LuaI18nTest, I18n)
-    {
-        internal::CaptureStdout();
-        LuaUtil::LuaState lua{mVFS.get(), &mCfg};
-        sol::state& l = lua.sol();
-        LuaUtil::I18nManager i18n(mVFS.get(), &lua);
-        lua.addInternalLibSearchPath(mLibsPath);
-        i18n.init();
-        i18n.setPreferredLanguages({"de", "en"});
-        EXPECT_THAT(internal::GetCapturedStdout(), "I18n preferred languages: de en\n");
-
-        internal::CaptureStdout();
-        l["t1"] = i18n.getContext("Test1");
-        EXPECT_THAT(internal::GetCapturedStdout(), "Language file \"i18n/Test1/de.lua\" is enabled\n");
-
-        internal::CaptureStdout();
-        l["t2"] = i18n.getContext("Test2");
-        {
-            std::string output = internal::GetCapturedStdout();
-            EXPECT_THAT(output, HasSubstr("Can not load i18n/Test2/de.lua"));
-            EXPECT_THAT(output, HasSubstr("Language file \"i18n/Test2/en.lua\" is enabled"));
-        }
-
-        EXPECT_EQ(get<std::string>(l, "t1('good_morning')"), "Guten Morgen.");
-        EXPECT_EQ(get<std::string>(l, "t1('you_have_arrows', {count=1})"), "Du hast ein Pfeil.");
-        EXPECT_EQ(get<std::string>(l, "t1('you_have_arrows', {count=5})"), "Du hast 5 Pfeile.");
-        EXPECT_EQ(get<std::string>(l, "t1('Hello %{name}!', {name='World'})"), "Hallo World!");
-        EXPECT_EQ(get<std::string>(l, "t2('good_morning')"), "Morning!");
-        EXPECT_EQ(get<std::string>(l, "t2('you_have_arrows', {count=3})"), "Arrows count: 3");
-
-        internal::CaptureStdout();
-        i18n.setPreferredLanguages({"en", "de"});
-        EXPECT_THAT(internal::GetCapturedStdout(),
-            "I18n preferred languages: en de\n"
-            "Language file \"i18n/Test1/en.lua\" is enabled\n"
-            "Language file \"i18n/Test2/en.lua\" is enabled\n");
-
-        EXPECT_EQ(get<std::string>(l, "t1('good_morning')"), "Good morning.");
-        EXPECT_EQ(get<std::string>(l, "t1('you_have_arrows', {count=1})"), "You have one arrow.");
-        EXPECT_EQ(get<std::string>(l, "t1('you_have_arrows', {count=5})"), "You have 5 arrows.");
-        EXPECT_EQ(get<std::string>(l, "t1('Hello %{name}!', {name='World'})"), "Hello World!");
-        EXPECT_EQ(get<std::string>(l, "t2('good_morning')"), "Morning!");
-        EXPECT_EQ(get<std::string>(l, "t2('you_have_arrows', {count=3})"), "Arrows count: 3");
-    }
-
-}
diff --git a/apps/openmw_test_suite/lua/test_l10n.cpp b/apps/openmw_test_suite/lua/test_l10n.cpp
new file mode 100644
index 0000000000..c989d56e72
--- /dev/null
+++ b/apps/openmw_test_suite/lua/test_l10n.cpp
@@ -0,0 +1,157 @@
+#include "gmock/gmock.h"
+#include <gtest/gtest.h>
+
+#include <components/files/fixedpath.hpp>
+
+#include <components/lua/luastate.hpp>
+#include <components/lua/l10n.hpp>
+
+#include "testing_util.hpp"
+
+namespace
+{
+    using namespace testing;
+
+    TestFile invalidScript("not a script");
+    TestFile incorrectScript("return { incorrectSection = {}, engineHandlers = { incorrectHandler = function() end } }");
+    TestFile emptyScript("");
+    
+    TestFile test1En(R"X(
+good_morning: "Good morning."
+you_have_arrows: |-
+  {count, plural,
+    =0{You have no arrows.}
+    one{You have one arrow.}
+    other{You have {count} arrows.}
+  }
+pc_must_come: |-
+  {PCGender, select,
+     male {He is}
+     female {She is}
+     other {They are}
+  } coming with us.
+quest_completion: "The quest is {done, number, percent} complete."
+ordinal: "You came in {num, ordinal} place."
+spellout: "There {num, plural, one{is {num, spellout} thing} other{are {num, spellout} things}}."
+duration: "It took {num, duration}"
+numbers: "{int} and {double, number, integer} are integers, but {double} is a double"
+rounding: "{value, number, :: .00}"
+)X");
+
+    TestFile test1De(R"X(
+good_morning: "Guten Morgen."
+you_have_arrows: |-
+  {count, plural,
+    one{Du hast ein Pfeil.}
+    other{Du hast {count} Pfeile.}
+  }
+"Hello {name}!": "Hallo {name}!"
+)X");
+
+     TestFile test1EnUS(R"X(
+currency: "You have {money, number, currency}"
+)X");
+
+TestFile test2En(R"X(
+good_morning: "Morning!"
+you_have_arrows: "Arrows count: {count}"
+)X");
+
+    struct LuaL10nTest : Test
+    {
+        std::unique_ptr<VFS::Manager> mVFS = createTestVFS({
+            {"l10n/Test1/en.yaml", &test1En},
+            {"l10n/Test1/en_US.yaml", &test1EnUS},
+            {"l10n/Test1/de.yaml", &test1De},
+            {"l10n/Test2/en.yaml", &test2En},
+            {"l10n/Test3/en.yaml", &test1En},
+            {"l10n/Test3/de.yaml", &test1De},
+        });
+
+        LuaUtil::ScriptsConfiguration mCfg;
+    };
+
+    TEST_F(LuaL10nTest, L10n)
+    {
+        internal::CaptureStdout();
+        LuaUtil::LuaState lua{mVFS.get(), &mCfg};
+        sol::state& l = lua.sol();
+        LuaUtil::L10nManager l10n(mVFS.get(), &lua);
+        l10n.init();
+        l10n.setPreferredLocales({"de", "en"});
+        EXPECT_THAT(internal::GetCapturedStdout(), "Preferred locales: de en\n");
+
+        internal::CaptureStdout();
+        l["t1"] = l10n.getContext("Test1");
+        EXPECT_THAT(internal::GetCapturedStdout(),
+            "Fallback locale: en\n"
+            "Language file \"l10n/Test1/de.yaml\" is enabled\n"
+            "Language file \"l10n/Test1/en.yaml\" is enabled\n");
+
+        internal::CaptureStdout();
+        l["t2"] = l10n.getContext("Test2");
+        {
+            std::string output = internal::GetCapturedStdout();
+            EXPECT_THAT(output, HasSubstr("Language file \"l10n/Test2/en.yaml\" is enabled"));
+        }
+
+        EXPECT_EQ(get<std::string>(l, "t1('good_morning')"), "Guten Morgen.");
+        EXPECT_EQ(get<std::string>(l, "t1('you_have_arrows', {count=1})"), "Du hast ein Pfeil.");
+        EXPECT_EQ(get<std::string>(l, "t1('you_have_arrows', {count=5})"), "Du hast 5 Pfeile.");
+        EXPECT_EQ(get<std::string>(l, "t1('Hello {name}!', {name='World'})"), "Hallo World!");
+        EXPECT_EQ(get<std::string>(l, "t2('good_morning')"), "Morning!");
+        EXPECT_EQ(get<std::string>(l, "t2('you_have_arrows', {count=3})"), "Arrows count: 3");
+
+        internal::CaptureStdout();
+        l10n.setPreferredLocales({"en", "de"});
+        EXPECT_THAT(internal::GetCapturedStdout(),
+            "Preferred locales: en de\n"
+            "Language file \"l10n/Test1/en.yaml\" is enabled\n"
+            "Language file \"l10n/Test1/de.yaml\" is enabled\n"
+            "Language file \"l10n/Test2/en.yaml\" is enabled\n");
+
+        EXPECT_EQ(get<std::string>(l, "t1('good_morning')"), "Good morning.");
+        EXPECT_EQ(get<std::string>(l, "t1('you_have_arrows', {count=1})"), "You have one arrow.");
+        EXPECT_EQ(get<std::string>(l, "t1('you_have_arrows', {count=5})"), "You have 5 arrows.");
+        EXPECT_EQ(get<std::string>(l, "t1('pc_must_come', {PCGender=\"male\"})"), "He is coming with us.");
+        EXPECT_EQ(get<std::string>(l, "t1('pc_must_come', {PCGender=\"female\"})"), "She is coming with us.");
+        EXPECT_EQ(get<std::string>(l, "t1('pc_must_come', {PCGender=\"blah\"})"), "They are coming with us.");
+        EXPECT_EQ(get<std::string>(l, "t1('pc_must_come', {PCGender=\"other\"})"), "They are coming with us.");
+        EXPECT_EQ(get<std::string>(l, "t1('quest_completion', {done=0.1})"), "The quest is 10% complete.");
+        EXPECT_EQ(get<std::string>(l, "t1('quest_completion', {done=1})"), "The quest is 100% complete.");
+        EXPECT_EQ(get<std::string>(l, "t1('ordinal', {num=1})"), "You came in 1st place.");
+        EXPECT_EQ(get<std::string>(l, "t1('ordinal', {num=100})"), "You came in 100th place.");
+        EXPECT_EQ(get<std::string>(l, "t1('spellout', {num=1})"), "There is one thing.");
+        EXPECT_EQ(get<std::string>(l, "t1('spellout', {num=100})"), "There are one hundred things.");
+        EXPECT_EQ(get<std::string>(l, "t1('duration', {num=100})"), "It took 1:40");
+        EXPECT_EQ(get<std::string>(l, "t1('numbers', {int=123, double=123.456})"), "123 and 123 are integers, but 123.456 is a double");
+        EXPECT_EQ(get<std::string>(l, "t1('rounding', {value=123.456789})"), "123.46");
+        // Check that failed messages display the key instead of an empty string
+        EXPECT_EQ(get<std::string>(l, "t1('{mismatched_braces')"), "{mismatched_braces");
+        EXPECT_EQ(get<std::string>(l, "t1('{unknown_arg}')"), "{unknown_arg}");
+        EXPECT_EQ(get<std::string>(l, "t1('{num, integer}', {num=1})"), "{num, integer}");
+        // Doesn't give a valid currency symbol with `en`. Not that openmw is designed for real world currency.
+        l10n.setPreferredLocales({"en-US", "de"});
+        EXPECT_EQ(get<std::string>(l, "t1('currency', {money=10000.10})"), "You have $10,000.10");
+        // Note: Not defined in English localisation file, so we fall back to the German before falling back to the key
+        EXPECT_EQ(get<std::string>(l, "t1('Hello {name}!', {name='World'})"), "Hallo World!");
+        EXPECT_EQ(get<std::string>(l, "t2('good_morning')"), "Morning!");
+        EXPECT_EQ(get<std::string>(l, "t2('you_have_arrows', {count=3})"), "Arrows count: 3");
+
+        // Test that locales with variants and country codes fall back to more generic locales
+        internal::CaptureStdout();
+        l10n.setPreferredLocales({"en-GB-oed", "de"});
+        EXPECT_THAT(internal::GetCapturedStdout(),
+            "Preferred locales: en_GB_OED de\n"
+            "Language file \"l10n/Test1/en.yaml\" is enabled\n"
+            "Language file \"l10n/Test1/de.yaml\" is enabled\n"
+            "Language file \"l10n/Test2/en.yaml\" is enabled\n");
+        EXPECT_EQ(get<std::string>(l, "t2('you_have_arrows', {count=3})"), "Arrows count: 3");
+
+        // Test setting fallback language
+        l["t3"] = l10n.getContext("Test3", "de");
+        l10n.setPreferredLocales({"en"});
+        EXPECT_EQ(get<std::string>(l, "t3('Hello {name}!', {name='World'})"), "Hallo World!");
+    }
+
+}
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index af56b37dea..5a3292228e 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -29,7 +29,11 @@ endif (GIT_CHECKOUT)
 # source files
 
 add_component_dir (lua
-    luastate scriptscontainer utilpackage serialization configuration i18n storage
+    luastate scriptscontainer utilpackage serialization configuration l10n storage
+    )
+
+add_component_dir (l10n
+    messagebundles
     )
 
 add_component_dir (settings
@@ -395,6 +399,8 @@ target_link_libraries(components
     Base64
     SQLite::SQLite3
     smhasher
+    ${ICU_LIBRARIES}
+    yaml-cpp
     )
 
 target_link_libraries(components ${BULLET_LIBRARIES})
diff --git a/components/l10n/messagebundles.cpp b/components/l10n/messagebundles.cpp
new file mode 100644
index 0000000000..9560e60d3b
--- /dev/null
+++ b/components/l10n/messagebundles.cpp
@@ -0,0 +1,167 @@
+#include "messagebundles.hpp"
+
+#include <cstring>
+#include <unicode/errorcode.h>
+#include <unicode/calendar.h>
+#include <yaml-cpp/yaml.h>
+
+#include <components/debug/debuglog.hpp>
+
+namespace l10n
+{
+    MessageBundles::MessageBundles(const std::vector<icu::Locale> &preferredLocales, icu::Locale &fallbackLocale) :
+            mFallbackLocale(fallbackLocale)
+    {
+        setPreferredLocales(preferredLocales);
+    }
+
+    void MessageBundles::setPreferredLocales(const std::vector<icu::Locale> &preferredLocales)
+    {
+        mPreferredLocales.clear();
+        mPreferredLocaleStrings.clear();
+        for (const icu::Locale &loc: preferredLocales)
+        {
+            mPreferredLocales.push_back(loc);
+            mPreferredLocaleStrings.push_back(loc.getName());
+            // Try without variant or country if they are specified, starting with the most specific
+            if (strcmp(loc.getVariant(), "") != 0)
+            {
+                icu::Locale withoutVariant(loc.getLanguage(), loc.getCountry());
+                mPreferredLocales.push_back(withoutVariant);
+                mPreferredLocaleStrings.push_back(withoutVariant.getName());
+            }
+            if (strcmp(loc.getCountry(), "") != 0)
+            {
+                icu::Locale withoutCountry(loc.getLanguage());
+                mPreferredLocales.push_back(withoutCountry);
+                mPreferredLocaleStrings.push_back(withoutCountry.getName());
+            }
+        }
+    }
+
+    std::string getErrorText(const UParseError &parseError)
+    {
+        icu::UnicodeString preContext(parseError.preContext), postContext(parseError.postContext);
+        std::string parseErrorString;
+        preContext.toUTF8String(parseErrorString);
+        postContext.toUTF8String(parseErrorString);
+        return parseErrorString;
+    }
+
+    static bool checkSuccess(const icu::ErrorCode &status, const std::string &message, const UParseError parseError = UParseError())
+    {
+        if (status.isFailure())
+        {
+            std::string errorText = getErrorText(parseError);
+            if (errorText.size())
+            {
+                Log(Debug::Error) << message << ": " << status.errorName() << " in \"" << errorText << "\"";
+            }
+            else
+            {
+                Log(Debug::Error) << message << ": " << status.errorName();
+            }
+        }
+        return status.isSuccess();
+    }
+
+    void MessageBundles::load(std::istream &input, const icu::Locale& lang, const std::string &path)
+    {
+        try
+        {
+            YAML::Node data = YAML::Load(input);
+            std::string localeName = lang.getName();
+            for (const auto& it: data)
+            {
+                std::string key = it.first.as<std::string>();
+                std::string value = it.second.as<std::string>();
+                icu::UnicodeString pattern = icu::UnicodeString::fromUTF8(value);
+                icu::ErrorCode status;
+                UParseError parseError;
+                icu::MessageFormat message(pattern, lang, parseError, status);
+                if (checkSuccess(status, std::string("Failed to create message ")
+                            + key + " for locale " + lang.getName(), parseError))
+                {
+                    mBundles[localeName].insert(std::make_pair(key, message));
+                }
+            }
+        }
+        catch (std::exception& e)
+        {
+            Log(Debug::Error) << "Can not load " << path << ": " << e.what();
+        }
+    }
+
+    const icu::MessageFormat * MessageBundles::findMessage(std::string_view key, const std::string &localeName) const
+    {
+        auto iter = mBundles.find(localeName);
+        if (iter != mBundles.end())
+        {
+            auto message = iter->second.find(key.data());
+            if (message != iter->second.end())
+            {
+                return &(message->second);
+            }
+        }
+        return nullptr;
+    }
+
+    std::string MessageBundles::formatMessage(std::string_view key, const std::map<std::string, icu::Formattable> &args) const
+    {
+        std::vector<icu::UnicodeString> argNames;
+        std::vector<icu::Formattable> argValues;
+        for (auto& [key, value] : args)
+        {
+            argNames.push_back(icu::UnicodeString::fromUTF8(key));
+            argValues.push_back(value);
+        }
+        return formatMessage(key, argNames, argValues);
+    }
+
+    std::string MessageBundles::formatMessage(std::string_view key, const std::vector<icu::UnicodeString> &argNames, const std::vector<icu::Formattable> &args) const
+    {
+        icu::UnicodeString result;
+        std::string resultString;
+        icu::ErrorCode success;
+
+        const icu::MessageFormat *message = nullptr;
+        for (auto &loc: mPreferredLocaleStrings)
+        {
+            message = findMessage(key, loc);
+            if (message)
+                break;
+        }
+        // If no requested locales included the message, try the fallback locale
+        if (!message)
+            message = findMessage(key, mFallbackLocale.getName());
+
+        if (message)
+        {
+            if (args.size() > 0 && argNames.size() > 0)
+                message->format(&argNames[0], &args[0], args.size(), result, success);
+            else
+                message->format(nullptr, nullptr, args.size(), result, success);
+            checkSuccess(success, std::string("Failed to format message ") + key.data());
+            result.toUTF8String(resultString);
+            return resultString;
+        }
+        icu::Locale defaultLocale(NULL);
+        if (mPreferredLocales.size() > 0)
+        {
+             defaultLocale = mPreferredLocales[0];
+        }
+        UParseError parseError;
+        icu::MessageFormat defaultMessage(icu::UnicodeString::fromUTF8(key), defaultLocale, parseError, success);
+        if (!checkSuccess(success, std::string("Failed to create message ") + key.data(), parseError))
+            // If we can't parse the key as a pattern, just return the key
+            return std::string(key);
+
+        if (args.size() > 0 && argNames.size() > 0)
+            defaultMessage.format(&argNames[0], &args[0], args.size(), result, success);
+        else
+            defaultMessage.format(nullptr, nullptr, args.size(), result, success);
+        checkSuccess(success, std::string("Failed to format message ") + key.data());
+        result.toUTF8String(resultString);
+        return resultString;
+    }
+}
diff --git a/components/l10n/messagebundles.hpp b/components/l10n/messagebundles.hpp
new file mode 100644
index 0000000000..02333fad2c
--- /dev/null
+++ b/components/l10n/messagebundles.hpp
@@ -0,0 +1,55 @@
+#ifndef COMPONENTS_L10N_MESSAGEBUNDLES_H
+#define COMPONENTS_L10N_MESSAGEBUNDLES_H
+
+#include <string_view>
+#include <map>
+#include <unordered_map>
+#include <vector>
+
+#include <unicode/locid.h>
+#include <unicode/msgfmt.h>
+
+namespace l10n
+{
+    /**
+     * @brief A collection of Message Bundles
+     *
+     * Class handling localised message storage and lookup, including fallback locales when messages are missing.
+     *
+     * If no fallback locale is provided (or a message fails to be found), the key will be formatted instead,
+     * or returned verbatim if formatting fails.
+     *
+     */
+    class MessageBundles
+    {
+    public:
+        /* @brief Constructs an empty MessageBundles
+         *
+         * @param preferredLocales user-requested locales, in order of priority
+         *        Each locale will be checked when looking up messages, in case some resource files are incomplete.
+         *        For each locale which contains a country code or a variant, the locales obtained by removing first
+         *        the variant, then the country code, will also be checked before moving on to the next locale in the list.
+         * @param fallbackLocale the fallback locale which should be used if messages cannot be found for the user
+         *        preferred locales
+         */
+        MessageBundles(const std::vector<icu::Locale> &preferredLocales, icu::Locale &fallbackLocale);
+        std::string formatMessage(std::string_view key, const std::map<std::string, icu::Formattable> &args) const;
+        std::string formatMessage(std::string_view key, const std::vector<icu::UnicodeString> &argNames, const std::vector<icu::Formattable> &args) const;
+        void setPreferredLocales(const std::vector<icu::Locale> &preferredLocales);
+        const std::vector<icu::Locale> & getPreferredLocales() const { return mPreferredLocales; }
+        void load(std::istream &input, const icu::Locale &lang, const std::string &path);
+        bool isLoaded(icu::Locale loc) const { return mBundles.find(loc.getName()) != mBundles.end(); }
+        const icu::Locale & getFallbackLocale() const { return mFallbackLocale; }
+
+    private:
+        // icu::Locale isn't hashable (or comparable), so we use the string form instead, which is canonicalized
+        std::unordered_map<std::string, std::unordered_map<std::string, icu::MessageFormat>> mBundles;
+        const icu::Locale mFallbackLocale;
+        std::vector<std::string> mPreferredLocaleStrings;
+        std::vector<icu::Locale> mPreferredLocales;
+        const icu::MessageFormat * findMessage(std::string_view key, const std::string &localeName) const;
+    };
+
+}
+
+#endif // COMPONENTS_L10N_MESSAGEBUNDLES_H
diff --git a/components/lua/i18n.cpp b/components/lua/i18n.cpp
deleted file mode 100644
index e4d8e3ba78..0000000000
--- a/components/lua/i18n.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-#include "i18n.hpp"
-
-#include <components/debug/debuglog.hpp>
-
-namespace sol
-{
-    template <>
-    struct is_automagical<LuaUtil::I18nManager::Context> : std::false_type {};
-}
-
-namespace LuaUtil
-{
-
-    void I18nManager::init()
-    {
-        mPreferredLanguages.push_back("en");
-        sol::usertype<Context> ctx = mLua->sol().new_usertype<Context>("I18nContext");
-        ctx[sol::meta_function::call] = &Context::translate;
-        try
-        {
-            mI18nLoader = mLua->loadInternalLib("i18n");
-            sol::set_environment(mLua->newInternalLibEnvironment(), mI18nLoader);
-        }
-        catch (std::exception& e)
-        {
-            Log(Debug::Error) << "LuaUtil::I18nManager initialization failed: " << e.what();
-        }
-    }
-
-    void I18nManager::setPreferredLanguages(const std::vector<std::string>& langs)
-    {
-        {
-            Log msg(Debug::Info);
-            msg << "I18n preferred languages:";
-            for (const std::string& l : langs)
-                msg << " " << l;
-        }
-        mPreferredLanguages = langs;
-        for (auto& [_, context] : mContexts)
-            context.updateLang(this);
-    }
-
-    void I18nManager::Context::readLangData(I18nManager* manager, const std::string& lang)
-    {
-        std::string path = "i18n/";
-        path.append(mName);
-        path.append("/");
-        path.append(lang);
-        path.append(".lua");
-        if (!manager->mVFS->exists(path))
-            return;
-        try
-        {
-            sol::protected_function dataFn = manager->mLua->loadFromVFS(path);
-            sol::environment emptyEnv(manager->mLua->sol(), sol::create);
-            sol::set_environment(emptyEnv, dataFn);
-            sol::table data = manager->mLua->newTable();
-            data[lang] = call(dataFn);
-            call(mI18n["load"], data);
-            mLoadedLangs[lang] = true;
-        }
-        catch (std::exception& e)
-        {
-            Log(Debug::Error) << "Can not load " << path << ": " << e.what();
-        }
-    }
-
-    sol::object I18nManager::Context::translate(std::string_view key, const sol::object& data)
-    {
-        sol::object res = call(mI18n["translate"], key, data);
-        if (res != sol::nil)
-            return res;
-
-        // If not found in a language file - register the key itself as a message.
-        std::string composedKey = call(mI18n["getLocale"]).get<std::string>();
-        composedKey.push_back('.');
-        composedKey.append(key);
-        call(mI18n["set"], composedKey, key);
-        return call(mI18n["translate"], key, data);
-    }
-
-    void I18nManager::Context::updateLang(I18nManager* manager)
-    {
-        for (const std::string& lang : manager->mPreferredLanguages)
-        {
-            if (mLoadedLangs[lang] == sol::nil)
-                readLangData(manager, lang);
-            if (mLoadedLangs[lang] != sol::nil)
-            {
-                Log(Debug::Verbose) << "Language file \"i18n/" << mName << "/" << lang << ".lua\" is enabled";
-                call(mI18n["setLocale"], lang);
-                return;
-            }
-        }
-        Log(Debug::Warning) << "No language files for the preferred languages found in \"i18n/" << mName << "\"";
-    }
-
-    sol::object I18nManager::getContext(const std::string& contextName)
-    {
-        if (mI18nLoader == sol::nil)
-            throw std::runtime_error("LuaUtil::I18nManager is not initialized");
-        auto it = mContexts.find(contextName);
-        if (it != mContexts.end())
-            return sol::make_object(mLua->sol(), it->second);
-        Context ctx{contextName, mLua->newTable(), call(mI18nLoader, "i18n.init")};
-        ctx.updateLang(this);
-        mContexts.emplace(contextName, ctx);
-        return sol::make_object(mLua->sol(), ctx);
-    }
-
-}
diff --git a/components/lua/i18n.hpp b/components/lua/i18n.hpp
deleted file mode 100644
index 4bc7c624f1..0000000000
--- a/components/lua/i18n.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef COMPONENTS_LUA_I18N_H
-#define COMPONENTS_LUA_I18N_H
-
-#include "luastate.hpp"
-
-namespace LuaUtil
-{
-
-    class I18nManager
-    {
-    public:
-        I18nManager(const VFS::Manager* vfs, LuaState* lua) : mVFS(vfs), mLua(lua) {}
-        void init();
-
-        void setPreferredLanguages(const std::vector<std::string>& langs);
-        const std::vector<std::string>& getPreferredLanguages() const { return mPreferredLanguages; }
-
-        sol::object getContext(const std::string& contextName);
-
-    private:
-        struct Context
-        {
-            std::string mName;
-            sol::table mLoadedLangs;
-            sol::table mI18n;
-
-            void updateLang(I18nManager* manager);
-            void readLangData(I18nManager* manager, const std::string& lang);
-            sol::object translate(std::string_view key, const sol::object& data);
-        };
-
-        const VFS::Manager* mVFS;
-        LuaState* mLua;
-        sol::object mI18nLoader = sol::nil;
-        std::vector<std::string> mPreferredLanguages;
-        std::map<std::string, Context> mContexts;
-    };
-
-}
-
-#endif // COMPONENTS_LUA_I18N_H
\ No newline at end of file
diff --git a/components/lua/l10n.cpp b/components/lua/l10n.cpp
new file mode 100644
index 0000000000..94d46f2522
--- /dev/null
+++ b/components/lua/l10n.cpp
@@ -0,0 +1,136 @@
+#include "l10n.hpp"
+
+#include <unicode/errorcode.h>
+
+#include <components/debug/debuglog.hpp>
+
+namespace sol
+{
+    template <>
+    struct is_automagical<LuaUtil::L10nManager::Context> : std::false_type {};
+}
+
+namespace LuaUtil
+{
+    void L10nManager::init()
+    {
+        sol::usertype<Context> ctx = mLua->sol().new_usertype<Context>("L10nContext");
+        ctx[sol::meta_function::call] = &Context::translate;
+    }
+
+    void L10nManager::setPreferredLocales(const std::vector<std::string>& langs)
+    {
+        mPreferredLocales.clear();
+        for (const auto &lang : langs)
+            mPreferredLocales.push_back(icu::Locale(lang.c_str()));
+        {
+            Log msg(Debug::Info);
+            msg << "Preferred locales:";
+            for (const icu::Locale& l : mPreferredLocales)
+                msg << " " << l.getName();
+        }
+        for (auto& [_, context] : mContexts)
+            context.updateLang(this);
+    }
+
+    void L10nManager::Context::readLangData(L10nManager* manager, const icu::Locale& lang)
+    {
+        std::string path = "l10n/";
+        path.append(mName);
+        path.append("/");
+        path.append(lang.getName());
+        path.append(".yaml");
+        if (!manager->mVFS->exists(path))
+            return;
+
+        mMessageBundles->load(*manager->mVFS->get(path), lang, path);
+    }
+
+    std::pair<std::vector<icu::Formattable>, std::vector<icu::UnicodeString>> getICUArgs(std::string_view messageId, const sol::table &table)
+    {
+        std::vector<icu::Formattable> args;
+        std::vector<icu::UnicodeString> argNames;
+           for (auto elem : table)
+        for (auto& [key, value] : table)
+        {
+            // Argument values
+            if (value.is<std::string>())
+                args.push_back(icu::Formattable(value.as<std::string>().c_str()));
+            // Note: While we pass all numbers as doubles, they still seem to be handled appropriately.
+            // Numbers can be forced to be integers using the argType number and argStyle integer
+            //     E.g. {var, number, integer}
+            else if (value.is<double>())
+                args.push_back(icu::Formattable(value.as<double>()));
+            else
+            {
+                Log(Debug::Error) << "Unrecognized argument type for key \"" << key.as<std::string>()
+                    << "\" when formatting message \"" << messageId << "\"";
+            }
+
+            // Argument names
+            argNames.push_back(icu::UnicodeString::fromUTF8(key.as<std::string>()));
+        }
+        return std::make_pair(args, argNames);
+    }
+
+    std::string L10nManager::Context::translate(std::string_view key, const sol::object& data)
+    {
+        std::vector<icu::Formattable> args;
+        std::vector<icu::UnicodeString> argNames;
+
+        if (data.is<sol::table>()) {
+            sol::table dataTable = data.as<sol::table>();
+            auto argData = getICUArgs(key, dataTable);
+            args = argData.first;
+            argNames = argData.second;
+        }
+
+        return mMessageBundles->formatMessage(key, argNames, args);
+    }
+
+    void L10nManager::Context::updateLang(L10nManager* manager)
+    {
+        icu::Locale fallbackLocale = mMessageBundles->getFallbackLocale();
+        mMessageBundles->setPreferredLocales(manager->mPreferredLocales);
+        int localeCount = 0;
+        bool fallbackLocaleInPreferred = false;
+        for (const icu::Locale& loc: mMessageBundles->getPreferredLocales())
+        {
+            if (!mMessageBundles->isLoaded(loc))
+                readLangData(manager, loc);
+            if (mMessageBundles->isLoaded(loc))
+            {
+                localeCount++;
+                Log(Debug::Verbose) << "Language file \"l10n/" << mName << "/" << loc.getName() << ".yaml\" is enabled";
+                if (loc == fallbackLocale)
+                    fallbackLocaleInPreferred = true;
+            }
+        }
+        if (!mMessageBundles->isLoaded(fallbackLocale))
+            readLangData(manager, fallbackLocale);
+        if (mMessageBundles->isLoaded(fallbackLocale) && !fallbackLocaleInPreferred)
+            Log(Debug::Verbose) << "Fallback language file \"l10n/" << mName << "/" << fallbackLocale.getName() << ".yaml\" is enabled";
+
+        if (localeCount == 0)
+        {
+            Log(Debug::Warning) << "No language files for the preferred languages found in \"l10n/" << mName << "\"";
+        }
+    }
+
+    sol::object L10nManager::getContext(const std::string& contextName, const std::string& fallbackLocaleName)
+    {
+        auto it = mContexts.find(contextName);
+        if (it != mContexts.end())
+            return sol::make_object(mLua->sol(), it->second);
+        icu::Locale fallbackLocale(fallbackLocaleName.c_str());
+        Context ctx{contextName, std::make_shared<l10n::MessageBundles>(mPreferredLocales, fallbackLocale)};
+        {
+            Log msg(Debug::Verbose);
+            msg << "Fallback locale: " << fallbackLocale.getName();
+        }
+        ctx.updateLang(this);
+        mContexts.emplace(contextName, ctx);
+        return sol::make_object(mLua->sol(), ctx);
+    }
+
+}
diff --git a/components/lua/l10n.hpp b/components/lua/l10n.hpp
new file mode 100644
index 0000000000..04a3ad9c2c
--- /dev/null
+++ b/components/lua/l10n.hpp
@@ -0,0 +1,42 @@
+#ifndef COMPONENTS_LUA_I18N_H
+#define COMPONENTS_LUA_I18N_H
+
+#include "luastate.hpp"
+
+#include <components/l10n/messagebundles.hpp>
+
+namespace LuaUtil
+{
+
+    class L10nManager
+    {
+    public:
+        L10nManager(const VFS::Manager* vfs, LuaState* lua) : mVFS(vfs), mLua(lua) {}
+        void init();
+
+        void setPreferredLocales(const std::vector<std::string>& locales);
+        const std::vector<icu::Locale>& getPreferredLocales() const { return mPreferredLocales; }
+
+        sol::object getContext(const std::string& contextName, const std::string& fallbackLocale = "en");
+
+    private:
+        struct Context
+        {
+            const std::string mName;
+            // Must be a shared pointer so that sol::make_object copies the pointer, not the data structure.
+            std::shared_ptr<l10n::MessageBundles> mMessageBundles;
+
+            void updateLang(L10nManager* manager);
+            void readLangData(L10nManager* manager, const icu::Locale& lang);
+            std::string translate(std::string_view key, const sol::object& data);
+        };
+
+        const VFS::Manager* mVFS;
+        LuaState* mLua;
+        std::vector<icu::Locale> mPreferredLocales;
+        std::map<std::string, Context> mContexts;
+    };
+
+}
+
+#endif // COMPONENTS_LUA_I18N_H
diff --git a/docs/source/reference/modding/settings/general.rst b/docs/source/reference/modding/settings/general.rst
index ee5b908b4a..ae2448c38b 100644
--- a/docs/source/reference/modding/settings/general.rst
+++ b/docs/source/reference/modding/settings/general.rst
@@ -68,3 +68,21 @@ notify on saved screenshot
 :Default:	False
 
 Show message box when screenshot is saved to a file.
+
+preferred locales
+-----------------
+
+:Type:		string
+:Default:	en
+
+List of the preferred locales separated by comma.
+For example "de,en" means German as the first prority and English as a fallback.
+
+Each locale must consist of a two-letter language code (e.g. "de" or "en") and
+can also optionally include a two-letter country code (e.g. "en_US", "fr_CA").
+Locales with country codes can match locales without one (e.g. specifying "en_US"
+will match "en"), so is recommended that you include the country codes where possible,
+since if the country code isn't specified the generic language-code only locale might
+refer to any of the country-specific variants.
+
+This setting can only be configured by editing the settings configuration file.
diff --git a/docs/source/reference/modding/settings/lua.rst b/docs/source/reference/modding/settings/lua.rst
index 919d530d18..4433067952 100644
--- a/docs/source/reference/modding/settings/lua.rst
+++ b/docs/source/reference/modding/settings/lua.rst
@@ -26,15 +26,3 @@ If one, a separate thread is used.
 Values >1 are not yet supported.
 
 This setting can only be configured by editing the settings configuration file.
-
-i18n preferred languages
-------------------------
-
-:Type:		string
-:Default:	en
-
-List of the preferred languages separated by comma.
-For example "de,en" means German as the first prority and English as a fallback.
-
-This setting can only be configured by editing the settings configuration file.
-
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 5f4712ea3d..1c051bff61 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -226,3 +226,66 @@ if (BUILD_BENCHMARKS AND NOT OPENMW_USE_SYSTEM_BENCHMARK)
     )
     FetchContent_MakeAvailableExcludeFromAll(benchmark)
 endif()
+
+if (NOT OPENMW_USE_SYSTEM_YAML_CPP)
+    if(YAML_CPP_STATIC)
+        set(YAML_BUILD_SHARED_LIBS OFF)
+    else()
+        set(YAML_BUILD_SHARED_LIBS ON)
+    endif()
+
+    include(FetchContent)
+    FetchContent_Declare(yaml-cpp
+        URL https://github.com/jbeder/yaml-cpp/archive/refs/tags/yaml-cpp-0.7.0.zip
+        URL_HASH MD5=1e8ca0d6ccf99f3ed9506c1f6937d0ec
+        SOURCE_DIR fetched/yaml-cpp
+    )
+    FetchContent_MakeAvailableExcludeFromAll(yaml-cpp)
+endif()
+
+if (NOT OPENMW_USE_SYSTEM_ICU)
+    if (ANDROID)
+        # Note: Must be a build directory, not an install root, since the configure script
+        # looks for a configuration file which does not get installed.
+        set(OPENMW_ICU_HOST_BUILD_DIR "" CACHE STRING "A pre-built ICU build directory for the host system if cross-compiling")
+        # We need a host version of ICU so that the tools can be run when building the data library.
+        set(NDK_STANDARD_ROOT ${CMAKE_ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64)
+        string(REPLACE "android-" "" ANDROIDVER ${ANDROID_PLATFORM})
+        set(ICU_ENV
+            "CC=ccache ${NDK_STANDARD_ROOT}/bin/aarch64-linux-android${ANDROIDVER}-clang"
+            "CXX=ccache ${NDK_STANDARD_ROOT}/bin/aarch64-linux-android${ANDROIDVER}-clang"
+            "RANLIB=${NDK_STANDARD_ROOT}/bin/aarch64-linux-android-ranlib"
+            "AR=${NDK_STANDARD_ROOT}/bin/aarch64-linux-android-ar"
+            "CPPFLAGS=${ANDROID_COMPILER_FLAGS}"
+            "LDFLAGS=${ANDROID_LINKER_FLAGS} -lc -lstdc++"
+            )
+        # Wants a triple such as aarch64-linux-android, excluding a trailing
+        # -clang etc.
+        string(REGEX MATCH "^[^-]\+-[^-]+-[^-]+" ICU_TOOLCHAIN_NAME ${ANDROID_TOOLCHAIN_NAME})
+        set(ICU_ADDITIONAL_OPTS --host=${ICU_TOOLCHAIN_NAME}${ANDROIDVER} --with-cross-build=${OPENMW_ICU_HOST_BUILD_DIR})
+    endif()
+    include(ExternalProject)
+    ExternalProject_Add(icu
+        URL https://github.com/unicode-org/icu/archive/refs/tags/release-70-1.zip
+        URL_HASH MD5=49d5e2e5bab93ae1a4b56e916150544c
+        SOURCE_DIR fetched/icu
+        CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env ${ICU_ENV}
+            <SOURCE_DIR>/icu4c/source/configure --enable-static --disable-shared
+            --disable-tests --disable-samples --disable-icuio --disable-extras ${ICU_ADDITIONAL_OPTS}
+        BUILD_COMMAND make
+        INSTALL_COMMAND ""
+    )
+    ExternalProject_Get_Property(icu SOURCE_DIR BINARY_DIR)
+    set(ICU_INCLUDE_DIRS
+        ${SOURCE_DIR}/icu4c/source/common
+        ${SOURCE_DIR}/icu4c/source/i18n
+        PARENT_SCOPE
+    )
+    foreach(ICULIB data uc i18n)
+        add_library(ICU::${ICULIB} STATIC IMPORTED GLOBAL)
+        set_target_properties(ICU::${ICULIB} PROPERTIES IMPORTED_LOCATION
+            ${BINARY_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}icu${ICULIB}${CMAKE_STATIC_LIBRARY_SUFFIX})
+        add_dependencies(ICU::${ICULIB} icu)
+    endforeach()
+    set(ICU_LIBRARIES ICU::i18n ICU::uc ICU::data PARENT_SCOPE)
+endif()
diff --git a/extern/i18n.lua/CMakeLists.txt b/extern/i18n.lua/CMakeLists.txt
deleted file mode 100644
index 1f7a71a2c2..0000000000
--- a/extern/i18n.lua/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-if (NOT DEFINED OPENMW_RESOURCES_ROOT)
-    return()
-endif()
-
-# Copy resource files into the build directory
-set(SDIR ${CMAKE_CURRENT_SOURCE_DIR})
-set(DDIRRELATIVE resources/lua_libs/i18n)
-
-set(I18N_LUA_FILES
-    i18n/init.lua
-    i18n/interpolate.lua
-    i18n/plural.lua
-    i18n/variants.lua
-    i18n/version.lua
-)
-
-copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_ROOT} ${DDIRRELATIVE} "${I18N_LUA_FILES}")
diff --git a/extern/i18n.lua/LICENSE b/extern/i18n.lua/LICENSE
deleted file mode 100644
index ddf484685b..0000000000
--- a/extern/i18n.lua/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-MIT License Terms
-=================
-
-Copyright (c) 2012 Enrique García Cota.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/extern/i18n.lua/README.md b/extern/i18n.lua/README.md
deleted file mode 100644
index 8b3271c321..0000000000
--- a/extern/i18n.lua/README.md
+++ /dev/null
@@ -1,164 +0,0 @@
-i18n.lua
-========
-
-[![Build Status](https://travis-ci.org/kikito/i18n.lua.png?branch=master)](https://travis-ci.org/kikito/i18n.lua)
-
-A very complete i18n lib for Lua
-
-Description
-===========
-
-``` lua
-i18n = require 'i18n'
-
--- loading stuff
-i18n.set('en.welcome', 'welcome to this program')
-i18n.load({
-  en = {
-    good_bye = "good-bye!",
-    age_msg = "your age is %{age}.",
-    phone_msg = {
-      one = "you have one new message.",
-      other = "you have %{count} new messages."
-    }
-  }
-})
-i18n.loadFile('path/to/your/project/i18n/de.lua') -- load German language file
-i18n.loadFile('path/to/your/project/i18n/fr.lua') -- load French language file
-…         -- section 'using language files' below describes structure of files
-
--- setting the translation context
-i18n.setLocale('en') -- English is the default locale anyway
-
--- getting translations
-i18n.translate('welcome') -- Welcome to this program
-i18n('welcome') -- Welcome to this program
-i18n('age_msg', {age = 18}) -- Your age is 18.
-i18n('phone_msg', {count = 1}) -- You have one new message.
-i18n('phone_msg', {count = 2}) -- You have 2 new messages.
-i18n('good_bye') -- Good-bye!
-
-```
-
-Interpolation
-=============
-
-You can interpolate variables in 3 different ways:
-
-``` lua
--- the most usual one
-i18n.set('variables', 'Interpolating variables: %{name} %{age}')
-i18n('variables', {name='john', 'age'=10}) -- Interpolating variables: john 10
-
-i18n.set('lua', 'Traditional Lua way: %d %s')
-i18n('lua', {1, 'message'}) -- Traditional Lua way: 1 message
-
-i18n.set('combined', 'Combined: %<name>.q %<age>.d %<age>.o')
-i18n('combined', {name='john', 'age'=10}) -- Combined: john 10 12k
-```
-
-
-
-Pluralization
-=============
-
-This lib implements the [unicode.org plural rules](http://cldr.unicode.org/index/cldr-spec/plural-rules). Just set the locale you want to use and it will deduce the appropiate pluralization rules:
-
-``` lua
-i18n = require 'i18n'
-
-i18n.load({
-  en = {
-    msg = {
-      one   = "one message",
-      other = "%{count} messages"
-    }
-  },
-  ru = {
-    msg = {
-      one   = "1 сообщение",
-      few   = "%{count} сообщения",
-      many  = "%{count} сообщений",
-      other = "%{count} сообщения"
-    }
-  }
-})
-
-i18n('msg', {count = 1}) -- one message
-i18n.setLocale('ru')
-i18n('msg', {count = 5}) -- 5 сообщений
-```
-
-The appropiate rule is chosen by finding the 'root' of the locale used: for example if the current locale is 'fr-CA', the 'fr' rules will be applied.
-
-If the provided functions are not enough (i.e. invented languages) it's possible to specify a custom pluralization function in the second parameter of setLocale. This function must return 'one', 'few', 'other', etc given a number.
-
-Fallbacks
-=========
-
-When a value is not found, the lib has several fallback mechanisms:
-
-* First, it will look in the current locale's parents. For example, if the locale was set to 'en-US' and the key 'msg' was not found there, it will be looked over in 'en'.
-* Second, if the value is not found in the locale ancestry, a 'fallback locale' (by default: 'en') can be used. If the fallback locale has any parents, they will be looked over too.
-* Third, if all the locales have failed, but there is a param called 'default' on the provided data, it will be used.
-* Otherwise the translation will return nil.
-
-The parents of a locale are found by splitting the locale by its hyphens. Other separation characters (spaces, underscores, etc) are not supported.
-
-Using language files
-====================
-
-It might be a good idea to store each translation in a different file. This is supported via the 'i18n.loadFile' directive:
-
-``` lua
-…
-i18n.loadFile('path/to/your/project/i18n/de.lua') -- German translation
-i18n.loadFile('path/to/your/project/i18n/en.lua') -- English translation
-i18n.loadFile('path/to/your/project/i18n/fr.lua') -- French translation
-…
-```
-
-The German language file 'de.lua' should read:
-
-``` lua
-return {
-  de = {
-    good_bye = "Auf Wiedersehen!",
-    age_msg = "Ihr Alter beträgt %{age}.",
-    phone_msg = {
-      one = "Sie haben eine neue Nachricht.",
-      other = "Sie haben %{count} neue Nachrichten."
-    }
-  }
-}
-```
-
-If desired, you can also store all translations in one single file (eg. 'translations.lua'):
-
-``` lua
-return {
-  de = {
-    good_bye = "Auf Wiedersehen!",
-    age_msg = "Ihr Alter beträgt %{age}.",
-    phone_msg = {
-      one = "Sie haben eine neue Nachricht.",
-      other = "Sie haben %{count} neue Nachrichten."
-    }
-  },
-  fr = {
-    good_bye = "Au revoir !",
-    age_msg = "Vous avez %{age} ans.",
-    phone_msg = {
-      one = "Vous avez une noveau message.",
-      other = "Vous avez %{count} noveaux messages."
-    }
-  },
-  …
-}
-```
-
-Specs
-=====
-This project uses [busted](https://github.com/Olivine-Labs/busted) for its specs. If you want to run the specs, you will have to install it first. Then just execute the following from the root inspect folder:
-
-    busted
diff --git a/extern/i18n.lua/i18n/init.lua b/extern/i18n.lua/i18n/init.lua
deleted file mode 100644
index 6bcccd0572..0000000000
--- a/extern/i18n.lua/i18n/init.lua
+++ /dev/null
@@ -1,188 +0,0 @@
-local i18n = {}
-
-local store
-local locale
-local pluralizeFunction
-local defaultLocale = 'en'
-local fallbackLocale = defaultLocale
-
-local currentFilePath = (...):gsub("%.init$","")
-
-local plural      = require(currentFilePath .. '.plural')
-local interpolate = require(currentFilePath .. '.interpolate')
-local variants    = require(currentFilePath .. '.variants')
-local version     = require(currentFilePath .. '.version')
-
-i18n.plural, i18n.interpolate, i18n.variants, i18n.version, i18n._VERSION =
-  plural, interpolate, variants, version, version
-
--- private stuff
-
-local function dotSplit(str)
-  local fields, length = {},0
-    str:gsub("[^%.]+", function(c)
-    length = length + 1
-    fields[length] = c
-  end)
-  return fields, length
-end
-
-local function isPluralTable(t)
-  return type(t) == 'table' and type(t.other) == 'string'
-end
-
-local function isPresent(str)
-  return type(str) == 'string' and #str > 0
-end
-
-local function assertPresent(functionName, paramName, value)
-  if isPresent(value) then return end
-
-  local msg = "i18n.%s requires a non-empty string on its %s. Got %s (a %s value)."
-  error(msg:format(functionName, paramName, tostring(value), type(value)))
-end
-
-local function assertPresentOrPlural(functionName, paramName, value)
-  if isPresent(value) or isPluralTable(value) then return end
-
-  local msg = "i18n.%s requires a non-empty string or plural-form table on its %s. Got %s (a %s value)."
-  error(msg:format(functionName, paramName, tostring(value), type(value)))
-end
-
-local function assertPresentOrTable(functionName, paramName, value)
-  if isPresent(value) or type(value) == 'table' then return end
-
-  local msg = "i18n.%s requires a non-empty string or table on its %s. Got %s (a %s value)."
-  error(msg:format(functionName, paramName, tostring(value), type(value)))
-end
-
-local function assertFunctionOrNil(functionName, paramName, value)
-  if value == nil or type(value) == 'function' then return end
-
-  local msg = "i18n.%s requires a function (or nil) on param %s. Got %s (a %s value)."
-  error(msg:format(functionName, paramName, tostring(value), type(value)))
-end
-
-local function defaultPluralizeFunction(count)
-  return plural.get(variants.root(i18n.getLocale()), count)
-end
-
-local function pluralize(t, data)
-  assertPresentOrPlural('interpolatePluralTable', 't', t)
-  data = data or {}
-  local count = data.count or 1
-  local plural_form = pluralizeFunction(count)
-  return t[plural_form]
-end
-
-local function treatNode(node, data)
-  if type(node) == 'string' then
-    return interpolate(node, data)
-  elseif isPluralTable(node) then
-    return interpolate(pluralize(node, data), data)
-  end
-  return node
-end
-
-local function recursiveLoad(currentContext, data)
-  local composedKey
-  for k,v in pairs(data) do
-    composedKey = (currentContext and (currentContext .. '.') or "") .. tostring(k)
-    assertPresent('load', composedKey, k)
-    assertPresentOrTable('load', composedKey, v)
-    if type(v) == 'string' then
-      i18n.set(composedKey, v)
-    else
-      recursiveLoad(composedKey, v)
-    end
-  end
-end
-
-local function localizedTranslate(key, loc, data)
-  local path, length = dotSplit(loc .. "." .. key)
-  local node = store
-
-  for i=1, length do
-    node = node[path[i]]
-    if not node then return nil end
-  end
-
-  return treatNode(node, data)
-end
-
--- public interface
-
-function i18n.set(key, value)
-  assertPresent('set', 'key', key)
-  assertPresentOrPlural('set', 'value', value)
-
-  local path, length = dotSplit(key)
-  local node = store
-
-  for i=1, length-1 do
-    key = path[i]
-    node[key] = node[key] or {}
-    node = node[key]
-  end
-
-  local lastKey = path[length]
-  node[lastKey] = value
-end
-
-function i18n.translate(key, data)
-  assertPresent('translate', 'key', key)
-
-  data = data or {}
-  local usedLocale = data.locale or locale
-
-  local fallbacks = variants.fallbacks(usedLocale, fallbackLocale)
-  for i=1, #fallbacks do
-    local value = localizedTranslate(key, fallbacks[i], data)
-    if value then return value end
-  end
-
-  return data.default
-end
-
-function i18n.setLocale(newLocale, newPluralizeFunction)
-  assertPresent('setLocale', 'newLocale', newLocale)
-  assertFunctionOrNil('setLocale', 'newPluralizeFunction', newPluralizeFunction)
-  locale = newLocale
-  pluralizeFunction = newPluralizeFunction or defaultPluralizeFunction
-end
-
-function i18n.setFallbackLocale(newFallbackLocale)
-  assertPresent('setFallbackLocale', 'newFallbackLocale', newFallbackLocale)
-  fallbackLocale = newFallbackLocale
-end
-
-function i18n.getFallbackLocale()
-  return fallbackLocale
-end
-
-function i18n.getLocale()
-  return locale
-end
-
-function i18n.reset()
-  store = {}
-  plural.reset()
-  i18n.setLocale(defaultLocale)
-  i18n.setFallbackLocale(defaultLocale)
-end
-
-function i18n.load(data)
-  recursiveLoad(nil, data)
-end
-
-function i18n.loadFile(path)
-  local chunk = assert(loadfile(path))
-  local data = chunk()
-  i18n.load(data)
-end
-
-setmetatable(i18n, {__call = function(_, ...) return i18n.translate(...) end})
-
-i18n.reset()
-
-return i18n
diff --git a/extern/i18n.lua/i18n/interpolate.lua b/extern/i18n.lua/i18n/interpolate.lua
deleted file mode 100644
index c6bb242f05..0000000000
--- a/extern/i18n.lua/i18n/interpolate.lua
+++ /dev/null
@@ -1,60 +0,0 @@
-local unpack = unpack or table.unpack -- lua 5.2 compat
-
-local FORMAT_CHARS = { c=1, d=1, E=1, e=1, f=1, g=1, G=1, i=1, o=1, u=1, X=1, x=1, s=1, q=1, ['%']=1 }
-
--- matches a string of type %{age}
-local function interpolateValue(string, variables)
-  return string:gsub("(.?)%%{%s*(.-)%s*}",
-    function (previous, key)
-      if previous == "%" then
-        return
-      else
-        return previous .. tostring(variables[key])
-      end
-    end)
-end
-
--- matches a string of type %<age>.d
-local function interpolateField(string, variables)
-  return string:gsub("(.?)%%<%s*(.-)%s*>%.([cdEefgGiouXxsq])",
-    function (previous, key, format)
-      if previous == "%" then
-        return
-      else
-        return previous .. string.format("%" .. format, variables[key] or "nil")
-      end
-    end)
-end
-
-local function escapePercentages(string)
-  return string:gsub("(%%)(.?)", function(_, char)
-    if FORMAT_CHARS[char] then
-      return "%" .. char
-    else
-      return "%%" .. char
-    end
-  end)
-end
-
-local function unescapePercentages(string)
-  return string:gsub("(%%%%)(.?)", function(_, char)
-    if FORMAT_CHARS[char] then
-      return "%" .. char
-    else
-      return "%%" .. char
-    end
-  end)
-end
-
-local function interpolate(pattern, variables)
-  variables = variables or {}
-  local result = pattern
-  result = interpolateValue(result, variables)
-  result = interpolateField(result, variables)
-  result = escapePercentages(result)
-  result = string.format(result, unpack(variables))
-  result = unescapePercentages(result)
-  return result
-end
-
-return interpolate
diff --git a/extern/i18n.lua/i18n/plural.lua b/extern/i18n.lua/i18n/plural.lua
deleted file mode 100644
index bb99804ee8..0000000000
--- a/extern/i18n.lua/i18n/plural.lua
+++ /dev/null
@@ -1,280 +0,0 @@
-local plural = {}
-local defaultFunction = nil
--- helper functions
-
-local function assertPresentString(functionName, paramName, value)
-  if type(value) ~= 'string' or #value == 0 then
-    local msg = "Expected param %s of function %s to be a string, but got %s (a value of type %s) instead"
-    error(msg:format(paramName, functionName, tostring(value), type(value)))
-  end
-end
-
-local function assertNumber(functionName, paramName, value)
-  if type(value) ~= 'number' then
-    local msg = "Expected param %s of function %s to be a number, but got %s (a value of type %s) instead"
-    error(msg:format(paramName, functionName, tostring(value), type(value)))
-  end
-end
-
--- transforms "foo bar baz" into {'foo','bar','baz'}
-local function words(str)
-  local result, length = {}, 0
-  str:gsub("%S+", function(word)
-    length = length + 1
-    result[length] = word
-  end)
-  return result
-end
-
-local function isInteger(n)
-  return n == math.floor(n)
-end
-
-local function between(value, min, max)
-  return value >= min and value <= max
-end
-
-local function inside(v, list)
-  for i=1, #list do
-    if v == list[i] then return true end
-  end
-  return false
-end
-
-
--- pluralization functions
-
-local pluralization = {}
-
-local f1 = function(n)
-  return n == 1 and "one" or "other"
-end
-pluralization[f1] = words([[
-  af asa bem bez bg bn brx ca cgg chr da de dv ee el
-  en eo es et eu fi fo fur fy gl gsw gu ha haw he is
-  it jmc kaj kcg kk kl ksb ku lb lg mas ml mn mr nah
-  nb nd ne nl nn no nr ny nyn om or pa pap ps pt rm
-  rof rwk saq seh sn so sq ss ssy st sv sw syr ta te
-  teo tig tk tn ts ur ve vun wae xh xog zu
-]])
-
-local f2 = function(n)
-  return (n == 0 or n == 1) and "one" or "other"
-end
-pluralization[f2] = words("ak am bh fil guw hi ln mg nso ti tl wa")
-
-local f3 = function(n)
-  if not isInteger(n) then return 'other' end
-  return (n == 0 and "zero") or
-         (n == 1 and "one") or
-         (n == 2 and "two") or
-         (between(n % 100, 3, 10) and "few") or
-         (between(n % 100, 11, 99) and "many") or
-         "other"
-end
-pluralization[f3] = {'ar'}
-
-local f4 = function()
-  return "other"
-end
-pluralization[f4] = words([[
-  az bm bo dz fa hu id ig ii ja jv ka kde kea km kn
-  ko lo ms my root sah ses sg th to tr vi wo yo zh
-]])
-
-local f5 = function(n)
-  if not isInteger(n) then return 'other' end
-  local n_10, n_100 = n % 10, n % 100
-  return (n_10 == 1 and n_100 ~= 11 and 'one') or
-         (between(n_10, 2, 4) and not between(n_100, 12, 14) and 'few') or
-         ((n_10 == 0 or between(n_10, 5, 9) or between(n_100, 11, 14)) and 'many') or
-         'other'
-end
-pluralization[f5] = words('be bs hr ru sh sr uk')
-
-local f6 = function(n)
-  if not isInteger(n) then return 'other' end
-  local n_10, n_100 = n % 10, n % 100
-  return (n_10 == 1 and not inside(n_100, {11,71,91}) and 'one') or
-         (n_10 == 2 and not inside(n_100, {12,72,92}) and 'two') or
-         (inside(n_10, {3,4,9}) and
-          not between(n_100, 10, 19) and
-          not between(n_100, 70, 79) and
-          not between(n_100, 90, 99)
-          and 'few') or
-         (n ~= 0 and n % 1000000 == 0 and 'many') or
-         'other'
-end
-pluralization[f6] = {'br'}
-
-local f7 = function(n)
-  return (n == 1 and 'one') or
-         ((n == 2 or n == 3 or n == 4) and 'few') or
-         'other'
-end
-pluralization[f7] = {'cz', 'sk'}
-
-local f8 = function(n)
-  return (n == 0 and 'zero') or
-         (n == 1 and 'one') or
-         (n == 2 and 'two') or
-         (n == 3 and 'few') or
-         (n == 6 and 'many') or
-         'other'
-end
-pluralization[f8] = {'cy'}
-
-local f9 = function(n)
-  return (n >= 0 and n < 2 and 'one') or
-         'other'
-end
-pluralization[f9] = {'ff', 'fr', 'kab'}
-
-local f10 = function(n)
-  return (n == 1 and 'one') or
-         (n == 2 and 'two') or
-         ((n == 3 or n == 4 or n == 5 or n == 6) and 'few') or
-         ((n == 7 or n == 8 or n == 9 or n == 10) and 'many') or
-         'other'
-end
-pluralization[f10] = {'ga'}
-
-local f11 = function(n)
-  return ((n == 1 or n == 11) and 'one') or
-         ((n == 2 or n == 12) and 'two') or
-         (isInteger(n) and (between(n, 3, 10) or between(n, 13, 19)) and 'few') or
-         'other'
-end
-pluralization[f11] = {'gd'}
-
-local f12 = function(n)
-  local n_10 = n % 10
-  return ((n_10 == 1 or n_10 == 2 or n % 20 == 0) and 'one') or
-         'other'
-end
-pluralization[f12] = {'gv'}
-
-local f13 = function(n)
-  return (n == 1 and 'one') or
-         (n == 2 and 'two') or
-         'other'
-end
-pluralization[f13] = words('iu kw naq se sma smi smj smn sms')
-
-local f14 = function(n)
-  return (n == 0 and 'zero') or
-         (n == 1 and 'one') or
-         'other'
-end
-pluralization[f14] = {'ksh'}
-
-local f15 = function(n)
-  return (n == 0 and 'zero') or
-         (n > 0 and n < 2 and 'one') or
-         'other'
-end
-pluralization[f15] = {'lag'}
-
-local f16 = function(n)
-  if not isInteger(n) then return 'other' end
-  if between(n % 100, 11, 19) then return 'other' end
-  local n_10 = n % 10
-  return (n_10 == 1 and 'one') or
-         (between(n_10, 2, 9) and 'few') or
-         'other'
-end
-pluralization[f16] = {'lt'}
-
-local f17 = function(n)
-  return (n == 0 and 'zero') or
-         ((n % 10 == 1 and n % 100 ~= 11) and 'one') or
-         'other'
-end
-pluralization[f17] = {'lv'}
-
-local f18 = function(n)
-  return((n % 10 == 1 and n ~= 11) and 'one') or
-         'other'
-end
-pluralization[f18] = {'mk'}
-
-local f19 = function(n)
-  return (n == 1 and 'one') or
-         ((n == 0 or
-          (n ~= 1 and isInteger(n) and between(n % 100, 1, 19)))
-          and 'few') or
-         'other'
-end
-pluralization[f19] = {'mo', 'ro'}
-
-local f20 = function(n)
-  if n == 1 then return 'one' end
-  if not isInteger(n) then return 'other' end
-  local n_100 = n % 100
-  return ((n == 0 or between(n_100, 2, 10)) and 'few') or
-         (between(n_100, 11, 19) and 'many') or
-         'other'
-end
-pluralization[f20] = {'mt'}
-
-local f21 = function(n)
-  if n == 1 then return 'one' end
-  if not isInteger(n) then return 'other' end
-  local n_10, n_100 = n % 10, n % 100
-
-  return ((between(n_10, 2, 4) and not between(n_100, 12, 14)) and 'few') or
-         ((n_10 == 0 or n_10 == 1 or between(n_10, 5, 9) or between(n_100, 12, 14)) and 'many') or
-         'other'
-end
-pluralization[f21] = {'pl'}
-
-local f22 = function(n)
-  return (n == 0 or n == 1) and 'one' or
-         'other'
-end
-pluralization[f22] = {'shi'}
-
-local f23 = function(n)
-  local n_100 = n % 100
-  return (n_100 == 1 and 'one') or
-         (n_100 == 2 and 'two') or
-         ((n_100 == 3 or n_100 == 4) and 'few') or
-         'other'
-end
-pluralization[f23] = {'sl'}
-
-local f24 = function(n)
-  return (isInteger(n) and (n == 0 or n == 1 or between(n, 11, 99)) and 'one')
-         or 'other'
-end
-pluralization[f24] = {'tzm'}
-
-local pluralizationFunctions = {}
-for f,locales in pairs(pluralization) do
-  for _,locale in ipairs(locales) do
-    pluralizationFunctions[locale] = f
-  end
-end
-
--- public interface
-
-function plural.get(locale, n)
-  assertPresentString('i18n.plural.get', 'locale', locale)
-  assertNumber('i18n.plural.get', 'n', n)
-
-  local f = pluralizationFunctions[locale] or defaultFunction
-
-  return f(math.abs(n))
-end
-
-function plural.setDefaultFunction(f)
-  defaultFunction = f
-end
-
-function plural.reset()
-  defaultFunction = pluralizationFunctions['en']
-end
-
-plural.reset()
-
-return plural
diff --git a/extern/i18n.lua/i18n/variants.lua b/extern/i18n.lua/i18n/variants.lua
deleted file mode 100644
index 0cfad42f6c..0000000000
--- a/extern/i18n.lua/i18n/variants.lua
+++ /dev/null
@@ -1,49 +0,0 @@
-local variants = {}
-
-local function reverse(arr, length)
-  local result = {}
-  for i=1, length do result[i] = arr[length-i+1] end
-  return result, length
-end
-
-local function concat(arr1, len1, arr2, len2)
-  for i = 1, len2 do
-    arr1[len1 + i] = arr2[i]
-  end
-  return arr1, len1 + len2
-end
-
-function variants.ancestry(locale)
-  local result, length, accum = {},0,nil
-  locale:gsub("[^%-]+", function(c)
-    length = length + 1
-    accum = accum and (accum .. '-' .. c) or c
-    result[length] = accum
-  end)
-  return reverse(result, length)
-end
-
-function variants.isParent(parent, child)
-  return not not child:match("^".. parent .. "%-")
-end
-
-function variants.root(locale)
-  return locale:match("[^%-]+")
-end
-
-function variants.fallbacks(locale, fallbackLocale)
-  if locale == fallbackLocale or
-     variants.isParent(fallbackLocale, locale) then
-     return variants.ancestry(locale)
-  end
-  if variants.isParent(locale, fallbackLocale) then
-    return variants.ancestry(fallbackLocale)
-  end
-
-  local ancestry1, length1 = variants.ancestry(locale)
-  local ancestry2, length2 = variants.ancestry(fallbackLocale)
-
-  return concat(ancestry1, length1, ancestry2, length2)
-end
-
-return variants
diff --git a/extern/i18n.lua/i18n/version.lua b/extern/i18n.lua/i18n/version.lua
deleted file mode 100644
index eb788884ac..0000000000
--- a/extern/i18n.lua/i18n/version.lua
+++ /dev/null
@@ -1 +0,0 @@
-return '0.9.2'
diff --git a/files/CMakeLists.txt b/files/CMakeLists.txt
index 607ddeca49..cea33f0f40 100644
--- a/files/CMakeLists.txt
+++ b/files/CMakeLists.txt
@@ -3,4 +3,3 @@ add_subdirectory(shaders)
 add_subdirectory(vfs)
 add_subdirectory(builtin_scripts)
 add_subdirectory(lua_api)
-add_subdirectory(../extern/i18n.lua ${CMAKE_CURRENT_BINARY_DIR}/files)
diff --git a/files/builtin_scripts/CMakeLists.txt b/files/builtin_scripts/CMakeLists.txt
index 4e1c08ee8d..7afcd7f529 100644
--- a/files/builtin_scripts/CMakeLists.txt
+++ b/files/builtin_scripts/CMakeLists.txt
@@ -14,7 +14,7 @@ set(LUA_BUILTIN_FILES
     scripts/omw/head_bobbing.lua
     scripts/omw/third_person.lua
 
-    i18n/Calendar/en.lua
+    l10n/Calendar/en.yaml
 )
 
 foreach (f ${LUA_BUILTIN_FILES})
diff --git a/files/builtin_scripts/i18n/Calendar/en.lua b/files/builtin_scripts/i18n/Calendar/en.lua
deleted file mode 100644
index a4e8183a92..0000000000
--- a/files/builtin_scripts/i18n/Calendar/en.lua
+++ /dev/null
@@ -1,42 +0,0 @@
--- source: https://en.uesp.net/wiki/Lore:Calendar
-
-return {
-    month1 = "Morning Star",
-    month2 = "Sun's Dawn",
-    month3 = "First Seed",
-    month4 = "Rain's Hand",
-    month5 = "Second Seed",
-    month6 = "Midyear",
-    month7 = "Sun's Height",
-    month8 = "Last Seed",
-    month9 = "Hearthfire",
-    month10 = "Frostfall",
-    month11 = "Sun's Dusk",
-    month12 = "Evening Star",
-
-    -- The variant of month names in the context "day X of month Y".
-    -- In English it is the same, but some languages require a different form.
-    monthInGenitive1 = "Morning Star",
-    monthInGenitive2 = "Sun's Dawn",
-    monthInGenitive3 = "First Seed",
-    monthInGenitive4 = "Rain's Hand",
-    monthInGenitive5 = "Second Seed",
-    monthInGenitive6 = "Midyear",
-    monthInGenitive7 = "Sun's Height",
-    monthInGenitive8 = "Last Seed",
-    monthInGenitive9 = "Hearthfire",
-    monthInGenitive10 = "Frostfall",
-    monthInGenitive11 = "Sun's Dusk",
-    monthInGenitive12 = "Evening Star",
-
-    dateFormat = "day %{day} of %{monthInGenitive} %{year}",
-
-    weekday1 = "Sundas",
-    weekday2 = "Morndas",
-    weekday3 = "Tirdas",
-    weekday4 = "Middas",
-    weekday5 = "Turdas",
-    weekday6 = "Fredas",
-    weekday7 = "Loredas",
-}
-
diff --git a/files/builtin_scripts/l10n/Calendar/en.yaml b/files/builtin_scripts/l10n/Calendar/en.yaml
new file mode 100644
index 0000000000..0b009f4c57
--- /dev/null
+++ b/files/builtin_scripts/l10n/Calendar/en.yaml
@@ -0,0 +1,39 @@
+# source: https://en.uesp.net/wiki/Lore:Calendar
+
+month1: "Morning Star"
+month2: "Sun's Dawn"
+month3: "First Seed"
+month4: "Rain's Hand"
+month5: "Second Seed"
+month6: "Midyear"
+month7: "Sun's Height"
+month8: "Last Seed"
+month9: "Hearthfire"
+month10: "Frostfall"
+month11: "Sun's Dusk"
+month12: "Evening Star"
+
+# The variant of month names in the context "day X of month Y".
+# In English it is the same, but some languages require a different form.
+monthInGenitive1: "Morning Star"
+monthInGenitive2: "Sun's Dawn"
+monthInGenitive3: "First Seed"
+monthInGenitive4: "Rain's Hand"
+monthInGenitive5: "Second Seed"
+monthInGenitive6: "Midyear"
+monthInGenitive7: "Sun's Height"
+monthInGenitive8: "Last Seed"
+monthInGenitive9: "Hearthfire"
+monthInGenitive10: "Frostfall"
+monthInGenitive11: "Sun's Dusk"
+monthInGenitive12: "Evening Star"
+
+dateFormat: "day {day} of {monthInGenitive} {year}"
+
+weekday1: "Sundas"
+weekday2: "Morndas"
+weekday3: "Tirdas"
+weekday4: "Middas"
+weekday5: "Turdas"
+weekday6: "Fredas"
+weekday7: "Loredas"
diff --git a/files/builtin_scripts/openmw_aux/calendar.lua b/files/builtin_scripts/openmw_aux/calendar.lua
index 181b133b83..85b9db8e49 100644
--- a/files/builtin_scripts/openmw_aux/calendar.lua
+++ b/files/builtin_scripts/openmw_aux/calendar.lua
@@ -6,7 +6,7 @@
 
 local core = require('openmw.core')
 local time = require('openmw_aux.time')
-local i18n = core.i18n('Calendar')
+local l10n = core.l10n('Calendar')
 
 local monthsDuration = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}
 local daysInWeek = 7
@@ -31,10 +31,10 @@ local function gameTime(t)
 end
 
 local function defaultDateFormat(t)
-    return i18n('dateFormat', {
+    return l10n('dateFormat', {
         day = t.day,
-        month = i18n('month' .. t.month),
-        monthInGenitive = i18n('monthInGenitive' .. t.month),
+        month = l10n('month' .. t.month),
+        monthInGenitive = l10n('monthInGenitive' .. t.month),
         year = t.year,
     })
 end
@@ -63,8 +63,8 @@ local function formatGameTime(formatStr, timestamp)
     if formatStr == '*t' then return t end
 
     local replFn = function(tag)
-        if tag == '%a' or tag == '%A' then return i18n('weekday' .. t.wday) end
-        if tag == '%b' or tag == '%B' then return i18n('monthInGenitive' .. t.month) end
+        if tag == '%a' or tag == '%A' then return l10n('weekday' .. t.wday) end
+        if tag == '%b' or tag == '%B' then return l10n('monthInGenitive' .. t.month) end
         if tag == '%c' then
             return string.format('%02d:%02d %s', t.hour, t.min, defaultDateFormat(t))
         end
@@ -137,7 +137,7 @@ return {
     -- @param monthIndex
     -- @return #string
     monthName = function(m)
-        return i18n('month' .. ((m-1) % #monthsDuration + 1))
+        return l10n('month' .. ((m-1) % #monthsDuration + 1))
     end,
 
     --- The name of a month in genitive (for English is the same as `monthName`, but in some languages the form can differ).
@@ -145,7 +145,7 @@ return {
     -- @param monthIndex
     -- @return #string
     monthNameInGenitive = function(m)
-        return i18n('monthInGenitive' .. ((m-1) % #monthsDuration + 1))
+        return l10n('monthInGenitive' .. ((m-1) % #monthsDuration + 1))
     end,
 
     --- The name of a weekday
@@ -153,7 +153,7 @@ return {
     -- @param dayIndex
     -- @return #string
     weekdayName = function(d)
-        return i18n('weekday' .. ((d-1) % daysInWeek + 1))
+        return l10n('weekday' .. ((d-1) % daysInWeek + 1))
     end,
 }
 
diff --git a/files/lua_api/openmw/core.lua b/files/lua_api/openmw/core.lua
index 43b2d29a70..b1a10b9cfb 100644
--- a/files/lua_api/openmw/core.lua
+++ b/files/lua_api/openmw/core.lua
@@ -53,37 +53,71 @@
 -- @return #any
 
 ---
--- Return i18n formatting function for the given context.
--- It is based on `i18n.lua` library.
--- Language files should be stored in VFS as `i18n/<ContextName>/<Lang>.lua`.
--- See https://github.com/kikito/i18n.lua for format details.
--- @function [parent=#core] i18n
--- @param #string context I18n context; recommended to use the name of the mod.
+-- Return l10n formatting function for the given context.
+-- Language files should be stored in VFS as `l10n/<ContextName>/<Locale>.yaml`.
+--
+-- Locales usually have the form {lang}_{COUNTRY},
+-- where {lang} is a lowercase two-letter language code and {COUNTRY} is an uppercase
+-- two-letter country code. Capitalization and the separator must have exactly
+-- this format for language files to be recognized, but when users request a
+-- locale they do not need to match capitalization and can use hyphens instead of
+-- underscores.
+--
+-- Locales may also contain variants and keywords. See https://unicode-org.github.io/icu/userguide/locale/#language-code
+-- for full details.
+--
+-- Messages have the form of ICU MessageFormat strings.
+-- See https://unicode-org.github.io/icu/userguide/format_parse/messages/
+-- for a guide to MessageFormat, and see 
+-- https://unicode-org.github.io/icu-docs/apidoc/released/icu4c/classicu_1_1MessageFormat.html
+-- for full details of the MessageFormat syntax.
+-- @function [parent=#core] l10n
+-- @param #string context l10n context; recommended to use the name of the mod.
+-- @param #string fallbackLocale The source locale containing the default messages
+--                               If omitted defaults to "en"
 -- @return #function
 -- @usage
--- -- DataFiles/i18n/MyMod/en.lua
--- return {
---     good_morning = 'Good morning.',
---     you_have_arrows = {
---       one = 'You have one arrow.',
---       other = 'You have %{count} arrows.',
---     },
--- }
+-- # DataFiles/l10n/MyMod/en.yaml
+-- good_morning: 'Good morning.'
+--
+-- you_have_arrows: |- {count, plural,
+--     one {You have one arrow.}
+--     other {You have {count} arrows.}
+--   }
 -- @usage
--- -- DataFiles/i18n/MyMod/de.lua
--- return {
---     good_morning = "Guten Morgen.",
---     you_have_arrows = {
---       one = "Du hast ein Pfeil.",
---       other = "Du hast %{count} Pfeile.",
---     },
---     ["Hello %{name}!"] = "Hallo %{name}!",
--- }
+-- # DataFiles/l10n/MyMod/de.yaml
+-- good_morning: "Guten Morgen."
+-- you_have_arrows: |- {count, plural,
+--     one {Du hast ein Pfeil.}
+--     other {Du hast {count} Pfeile.}
+--   }
+-- "Hello {name}!": "Hallo {name}!"
 -- @usage
--- local myMsg = core.i18n('MyMod')
+-- # DataFiles/l10n/AdvancedExample/en.yaml
+-- # More complicated patterns
+-- # select rules can be used to match arbitrary string arguments
+-- # The default keyword other must always be provided
+-- pc_must_come: {PCGender, select,
+--     male {He is}
+--     female {She is}
+--     other {They are}
+--   } coming with us.
+-- # Numbers have various formatting options
+-- quest_completion: "The quest is {done, number, percent} complete.",
+-- # E.g. "You came in 4th place"
+-- ordinal: "You came in {num, ordinal} place."
+-- # E.g. "There is one thing", "There are one hundred things"
+-- spellout: "There {num, plural, one{is {num, spellout} thing} other{are {num, spellout} things}}."
+-- numbers: "{int} and {double, number, integer} are integers, but {double} is a double"
+-- # Numbers can be formatted with custom patterns
+-- # See https://unicode-org.github.io/icu/userguide/format_parse/numbers/skeletons.html#syntax
+-- rounding: "{value, number, :: .00}"
+-- @usage
+-- -- Usage in Lua
+-- local myMsg = core.l10n('MyMod', 'en')
 -- print( myMsg('good_morning') )
 -- print( myMsg('you_have_arrows', {count=5}) )
--- print( myMsg('Hello %{name}!', {name='World'}) )
+-- print( myMsg('Hello {name}!', {name='World'}) )
 
 
 ---
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index ecf5e1ec40..50214668d1 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -396,6 +396,10 @@ texture mipmap = nearest
 # Show message box when screenshot is saved to a file.
 notify on saved screenshot = false
 
+# List of the preferred languages separated by comma.
+# For example "de,en" means German as the first prority and English as a fallback.
+preferred locales = en
+
 [Shaders]
 
 # Force rendering with shaders. By default, only bump-mapped objects will use shaders.
@@ -1125,8 +1129,3 @@ lua debug = false
 # Set the maximum number of threads used for Lua scripts.
 # If zero, Lua scripts are processed in the main thread.
 lua num threads = 1
-
-# List of the preferred languages separated by comma.
-# For example "de,en" means German as the first prority and English as a fallback.
-i18n preferred languages = en
-

From 8bd16179a6709d3b770c8673d090e346266094d6 Mon Sep 17 00:00:00 2001
From: Benjamin Winger <bmw@disroot.org>
Date: Sun, 10 Apr 2022 12:39:03 -0400
Subject: [PATCH 2281/2859] Allow CMake to find the ICU version installed
 through homebrew

---
 CI/before_install.osx.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index b5bb35957f..6871787e22 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -13,9 +13,10 @@ brew update --quiet
 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
-command -v pkgdata >/dev/null 2>&1 || brew install icu4c
+brew install icu4c
 brew install yaml-cpp
 export PATH="/usr/local/opt/qt@5/bin:$PATH"  # needed to use qmake in none default path as qt now points to qt6
+export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig"
 
 ccache --version
 cmake --version

From 6b464a9330270d8df86d35271c11e8aba7abdc6f Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 10 Apr 2022 13:35:00 +0200
Subject: [PATCH 2282/2859] Check ESMReader value size in compile time

---
 apps/essimporter/converter.cpp     |  2 +-
 apps/essimporter/importcellref.cpp |  4 ++--
 apps/essimporter/importplayer.cpp  |  2 +-
 components/esm3/cellid.cpp         |  2 +-
 components/esm3/cellref.cpp        |  4 ++--
 components/esm3/effectlist.cpp     |  2 +-
 components/esm3/esmreader.hpp      | 25 +++++++++++--------------
 components/esm3/loadalch.cpp       |  2 +-
 components/esm3/loadarmo.cpp       |  2 +-
 components/esm3/loadbody.cpp       |  2 +-
 components/esm3/loadbook.cpp       |  2 +-
 components/esm3/loadcell.cpp       |  2 +-
 components/esm3/loadclas.cpp       |  2 +-
 components/esm3/loadclot.cpp       |  2 +-
 components/esm3/loadcont.cpp       |  4 ++--
 components/esm3/loadcrea.cpp       |  2 +-
 components/esm3/loadench.cpp       |  2 +-
 components/esm3/loadfact.cpp       |  2 +-
 components/esm3/loadinfo.cpp       |  2 +-
 components/esm3/loadingr.cpp       |  2 +-
 components/esm3/loadligh.cpp       |  2 +-
 components/esm3/loadlock.cpp       |  2 +-
 components/esm3/loadmgef.cpp       |  2 +-
 components/esm3/loadmisc.cpp       |  2 +-
 components/esm3/loadpgrd.cpp       |  2 +-
 components/esm3/loadprob.cpp       |  2 +-
 components/esm3/loadrace.cpp       |  2 +-
 components/esm3/loadrepa.cpp       |  2 +-
 components/esm3/loadskil.cpp       |  2 +-
 components/esm3/loadsndg.cpp       |  2 +-
 components/esm3/loadsoun.cpp       |  2 +-
 components/esm3/loadspel.cpp       |  4 ++--
 components/esm3/loadweap.cpp       |  2 +-
 components/esm3/player.cpp         |  4 ++--
 components/esm3/savedgame.cpp      |  2 +-
 35 files changed, 50 insertions(+), 53 deletions(-)

diff --git a/apps/essimporter/converter.cpp b/apps/essimporter/converter.cpp
index ad28a9295f..0d5b391112 100644
--- a/apps/essimporter/converter.cpp
+++ b/apps/essimporter/converter.cpp
@@ -278,7 +278,7 @@ namespace ESSImport
         while (esm.isNextSub("MPCD"))
         {
             float notepos[3];
-            esm.getHT(notepos, 3*sizeof(float));
+            esm.getHTSized<3 * sizeof(float)>(notepos);
 
             // Markers seem to be arranged in a 32*32 grid, notepos has grid-indices.
             // This seems to be the reason markers can't be placed everywhere in interior cells,
diff --git a/apps/essimporter/importcellref.cpp b/apps/essimporter/importcellref.cpp
index e6c62cc812..22af1af5fa 100644
--- a/apps/essimporter/importcellref.cpp
+++ b/apps/essimporter/importcellref.cpp
@@ -35,8 +35,8 @@ namespace ESSImport
         // DATA should occur for all references, except levelled creature spawners
         // I've seen DATA *twice* on a creature record, and with the exact same content too! weird
         // alarmvoi0000.ess
-        esm.getHNOT(mPos, "DATA", 24);
-        esm.getHNOT(mPos, "DATA", 24);
+        esm.getHNOTSized<24>(mPos, "DATA");
+        esm.getHNOTSized<24>(mPos, "DATA");
 
         mDeleted = 0;
         if (esm.isNextSub("DELE"))
diff --git a/apps/essimporter/importplayer.cpp b/apps/essimporter/importplayer.cpp
index 52e4a9b7d0..f2ec57ab3f 100644
--- a/apps/essimporter/importplayer.cpp
+++ b/apps/essimporter/importplayer.cpp
@@ -13,7 +13,7 @@ namespace ESSImport
 
         mActorData.load(esm);
 
-        esm.getHNOT(mPos, "DATA", 24);
+        esm.getHNOTSized<24>(mPos, "DATA");
     }
 
     void PCDT::load(ESM::ESMReader &esm)
diff --git a/components/esm3/cellid.cpp b/components/esm3/cellid.cpp
index ad91d30e04..87ad0cc21c 100644
--- a/components/esm3/cellid.cpp
+++ b/components/esm3/cellid.cpp
@@ -11,7 +11,7 @@ void ESM::CellId::load (ESMReader &esm)
 
     if (esm.isNextSub ("CIDX"))
     {
-        esm.getHT (mIndex, 8);
+        esm.getHTSized<8>(mIndex);
         mPaged = true;
     }
     else
diff --git a/components/esm3/cellref.cpp b/components/esm3/cellref.cpp
index 2efa3b845d..9b46bf182a 100644
--- a/components/esm3/cellref.cpp
+++ b/components/esm3/cellref.cpp
@@ -114,7 +114,7 @@ namespace ESM
                         break;
                     case ESM::fourCC("DATA"):
                         if constexpr (load)
-                            esm.getHT(cellRef.mPos, 24);
+                            esm.getHTSized<24>(cellRef.mPos);
                         else
                             esm.skip(24);
                         break;
@@ -150,7 +150,7 @@ namespace ESM
 void ESM::RefNum::load(ESMReader& esm, bool wide, ESM::NAME tag)
 {
     if (wide)
-        esm.getHNT(*this, tag, 8);
+        esm.getHNTSized<8>(*this, tag);
     else
         esm.getHNT(mIndex, tag);
 }
diff --git a/components/esm3/effectlist.cpp b/components/esm3/effectlist.cpp
index f6d5a6e071..1cfb25618d 100644
--- a/components/esm3/effectlist.cpp
+++ b/components/esm3/effectlist.cpp
@@ -16,7 +16,7 @@ void EffectList::load(ESMReader &esm)
 void EffectList::add(ESMReader &esm)
 {
     ENAMstruct s;
-    esm.getHT(s, 24);
+    esm.getHTSized<24>(s);
     mList.push_back(s);
 }
 
diff --git a/components/esm3/esmreader.hpp b/components/esm3/esmreader.hpp
index 464925d936..e931cde42a 100644
--- a/components/esm3/esmreader.hpp
+++ b/components/esm3/esmreader.hpp
@@ -2,7 +2,6 @@
 #define OPENMW_ESM_READER_H
 
 #include <cstdint>
-#include <cassert>
 #include <vector>
 #include <sstream>
 
@@ -114,20 +113,18 @@ public:
 
   // Version with extra size checking, to make sure the compiler
   // doesn't mess up our struct padding.
-  template <typename X>
-  void getHNT(X &x, NAME name, int size)
+  template <std::size_t size, typename X>
+  void getHNTSized(X &x, NAME name)
   {
-      assert(sizeof(X) == size);
-      getSubNameIs(name);
-      getHT(x);
+      static_assert(sizeof(X) == size);
+      getHNT(x, name);
   }
 
-  template <typename X>
-  void getHNOT(X &x, NAME name, int size)
+  template <std::size_t size, typename X>
+  void getHNOTSized(X &x, NAME name)
   {
-      assert(sizeof(X) == size);
-      if(isNextSub(name))
-          getHT(x);
+      static_assert(sizeof(X) == size);
+      getHNOT(x, name);
   }
 
   // Get data of a given type/size, including subrecord header
@@ -151,10 +148,10 @@ public:
 
   // Version with extra size checking, to make sure the compiler
   // doesn't mess up our struct padding.
-  template <typename X>
-  void getHT(X &x, int size)
+  template <std::size_t size, typename X>
+  void getHTSized(X &x)
   {
-      assert(sizeof(X) == size);
+      static_assert(sizeof(X) == size);
       getHT(x);
   }
 
diff --git a/components/esm3/loadalch.cpp b/components/esm3/loadalch.cpp
index 1aacfc8976..7173090e4b 100644
--- a/components/esm3/loadalch.cpp
+++ b/components/esm3/loadalch.cpp
@@ -39,7 +39,7 @@ namespace ESM
                     mName = esm.getHString();
                     break;
                 case ESM::fourCC("ALDT"):
-                    esm.getHT(mData, 12);
+                    esm.getHTSized<12>(mData);
                     hasData = true;
                     break;
                 case ESM::fourCC("ENAM"):
diff --git a/components/esm3/loadarmo.cpp b/components/esm3/loadarmo.cpp
index b476e930a8..7176f82f1e 100644
--- a/components/esm3/loadarmo.cpp
+++ b/components/esm3/loadarmo.cpp
@@ -63,7 +63,7 @@ namespace ESM
                     mName = esm.getHString();
                     break;
                 case ESM::fourCC("AODT"):
-                    esm.getHT(mData, 24);
+                    esm.getHTSized<24>(mData);
                     hasData = true;
                     break;
                 case ESM::fourCC("SCRI"):
diff --git a/components/esm3/loadbody.cpp b/components/esm3/loadbody.cpp
index 148e80d94c..55aa5b7bf5 100644
--- a/components/esm3/loadbody.cpp
+++ b/components/esm3/loadbody.cpp
@@ -31,7 +31,7 @@ namespace ESM
                     mRace = esm.getHString();
                     break;
                 case ESM::fourCC("BYDT"):
-                    esm.getHT(mData, 4);
+                    esm.getHTSized<4>(mData);
                     hasData = true;
                     break;
                 case ESM::SREC_DELE:
diff --git a/components/esm3/loadbook.cpp b/components/esm3/loadbook.cpp
index 72618f3ce8..7e5f75e055 100644
--- a/components/esm3/loadbook.cpp
+++ b/components/esm3/loadbook.cpp
@@ -31,7 +31,7 @@ namespace ESM
                     mName = esm.getHString();
                     break;
                 case ESM::fourCC("BKDT"):
-                    esm.getHT(mData, 20);
+                    esm.getHTSized<20>(mData);
                     hasData = true;
                     break;
                 case ESM::fourCC("SCRI"):
diff --git a/components/esm3/loadcell.cpp b/components/esm3/loadcell.cpp
index 1a4fe1db8f..b36f066501 100644
--- a/components/esm3/loadcell.cpp
+++ b/components/esm3/loadcell.cpp
@@ -76,7 +76,7 @@ namespace ESM
                     mName = esm.getHString();
                     break;
                 case ESM::fourCC("DATA"):
-                    esm.getHT(mData, 12);
+                    esm.getHTSized<12>(mData);
                     hasData = true;
                     break;
                 case ESM::SREC_DELE:
diff --git a/components/esm3/loadclas.cpp b/components/esm3/loadclas.cpp
index ecd43796de..718ba6c3ac 100644
--- a/components/esm3/loadclas.cpp
+++ b/components/esm3/loadclas.cpp
@@ -58,7 +58,7 @@ namespace ESM
                     mName = esm.getHString();
                     break;
                 case ESM::fourCC("CLDT"):
-                    esm.getHT(mData, 60);
+                    esm.getHTSized<60>(mData);
                     if (mData.mIsPlayable > 1)
                         esm.fail("Unknown bool value");
                     hasData = true;
diff --git a/components/esm3/loadclot.cpp b/components/esm3/loadclot.cpp
index 1bd5db9655..5b6fa4210b 100644
--- a/components/esm3/loadclot.cpp
+++ b/components/esm3/loadclot.cpp
@@ -33,7 +33,7 @@ namespace ESM
                     mName = esm.getHString();
                     break;
                 case ESM::fourCC("CTDT"):
-                    esm.getHT(mData, 12);
+                    esm.getHTSized<12>(mData);
                     hasData = true;
                     break;
                 case ESM::fourCC("SCRI"):
diff --git a/components/esm3/loadcont.cpp b/components/esm3/loadcont.cpp
index 5cbdd80428..6477bb9301 100644
--- a/components/esm3/loadcont.cpp
+++ b/components/esm3/loadcont.cpp
@@ -55,11 +55,11 @@ namespace ESM
                     mName = esm.getHString();
                     break;
                 case ESM::fourCC("CNDT"):
-                    esm.getHT(mWeight, 4);
+                    esm.getHTSized<4>(mWeight);
                     hasWeight = true;
                     break;
                 case ESM::fourCC("FLAG"):
-                    esm.getHT(mFlags, 4);
+                    esm.getHTSized<4>(mFlags);
                     if (mFlags & 0xf4)
                         esm.fail("Unknown flags");
                     if (!(mFlags & 0x8))
diff --git a/components/esm3/loadcrea.cpp b/components/esm3/loadcrea.cpp
index f1203ed39e..f82c488c63 100644
--- a/components/esm3/loadcrea.cpp
+++ b/components/esm3/loadcrea.cpp
@@ -50,7 +50,7 @@ namespace ESM {
                     mScript = esm.getHString();
                     break;
                 case ESM::fourCC("NPDT"):
-                    esm.getHT(mData, 96);
+                    esm.getHTSized<96>(mData);
                     hasNpdt = true;
                     break;
                 case ESM::fourCC("FLAG"):
diff --git a/components/esm3/loadench.cpp b/components/esm3/loadench.cpp
index 2e138444f3..4280b3a8af 100644
--- a/components/esm3/loadench.cpp
+++ b/components/esm3/loadench.cpp
@@ -26,7 +26,7 @@ namespace ESM
                     hasName = true;
                     break;
                 case ESM::fourCC("ENDT"):
-                    esm.getHT(mData, 16);
+                    esm.getHTSized<16>(mData);
                     hasData = true;
                     break;
                 case ESM::fourCC("ENAM"):
diff --git a/components/esm3/loadfact.cpp b/components/esm3/loadfact.cpp
index 4d4697d93b..9fc5410164 100644
--- a/components/esm3/loadfact.cpp
+++ b/components/esm3/loadfact.cpp
@@ -56,7 +56,7 @@ namespace ESM
                     mRanks[rankCounter++] = esm.getHString();
                     break;
                 case ESM::fourCC("FADT"):
-                    esm.getHT(mData, 240);
+                    esm.getHTSized<240>(mData);
                     if (mData.mIsHidden > 1)
                         esm.fail("Unknown flag!");
                     hasData = true;
diff --git a/components/esm3/loadinfo.cpp b/components/esm3/loadinfo.cpp
index 0b5030bb82..fb32f80188 100644
--- a/components/esm3/loadinfo.cpp
+++ b/components/esm3/loadinfo.cpp
@@ -26,7 +26,7 @@ namespace ESM
             switch (esm.retSubName().toInt())
             {
                 case ESM::fourCC("DATA"):
-                    esm.getHT(mData, 12);
+                    esm.getHTSized<12>(mData);
                     break;
                 case ESM::fourCC("ONAM"):
                     mActor = esm.getHString();
diff --git a/components/esm3/loadingr.cpp b/components/esm3/loadingr.cpp
index 173e2c5636..d7317a8dc4 100644
--- a/components/esm3/loadingr.cpp
+++ b/components/esm3/loadingr.cpp
@@ -31,7 +31,7 @@ namespace ESM
                     mName = esm.getHString();
                     break;
                 case ESM::fourCC("IRDT"):
-                    esm.getHT(mData, 56);
+                    esm.getHTSized<56>(mData);
                     hasData = true;
                     break;
                 case ESM::fourCC("SCRI"):
diff --git a/components/esm3/loadligh.cpp b/components/esm3/loadligh.cpp
index 94c109e677..7b3c6e8787 100644
--- a/components/esm3/loadligh.cpp
+++ b/components/esm3/loadligh.cpp
@@ -34,7 +34,7 @@ namespace ESM
                     mIcon = esm.getHString();
                     break;
                 case ESM::fourCC("LHDT"):
-                    esm.getHT(mData, 24);
+                    esm.getHTSized<24>(mData);
                     hasData = true;
                     break;
                 case ESM::fourCC("SCRI"):
diff --git a/components/esm3/loadlock.cpp b/components/esm3/loadlock.cpp
index 50d27d4e1a..0bdcbba635 100644
--- a/components/esm3/loadlock.cpp
+++ b/components/esm3/loadlock.cpp
@@ -31,7 +31,7 @@ namespace ESM
                     mName = esm.getHString();
                     break;
                 case ESM::fourCC("LKDT"):
-                    esm.getHT(mData, 16);
+                    esm.getHTSized<16>(mData);
                     hasData = true;
                     break;
                 case ESM::fourCC("SCRI"):
diff --git a/components/esm3/loadmgef.cpp b/components/esm3/loadmgef.cpp
index f15d51def6..b528e8bf9a 100644
--- a/components/esm3/loadmgef.cpp
+++ b/components/esm3/loadmgef.cpp
@@ -195,7 +195,7 @@ void MagicEffect::load(ESMReader &esm, bool &isDeleted)
 
     mId = indexToId (mIndex);
 
-    esm.getHNT(mData, "MEDT", 36);
+    esm.getHNTSized<36>(mData, "MEDT");
     if (esm.getFormat() == 0)
     {
         // don't allow mods to change fixed flags in the legacy format
diff --git a/components/esm3/loadmisc.cpp b/components/esm3/loadmisc.cpp
index eee46ac8b0..bbf1ac0635 100644
--- a/components/esm3/loadmisc.cpp
+++ b/components/esm3/loadmisc.cpp
@@ -31,7 +31,7 @@ namespace ESM
                     mName = esm.getHString();
                     break;
                 case ESM::fourCC("MCDT"):
-                    esm.getHT(mData, 12);
+                    esm.getHTSized<12>(mData);
                     hasData = true;
                     break;
                 case ESM::fourCC("SCRI"):
diff --git a/components/esm3/loadpgrd.cpp b/components/esm3/loadpgrd.cpp
index 9d0f3cf66c..ed2ab2c5d3 100644
--- a/components/esm3/loadpgrd.cpp
+++ b/components/esm3/loadpgrd.cpp
@@ -52,7 +52,7 @@ namespace ESM
                     mCell = esm.getHString();
                     break;
                 case ESM::fourCC("DATA"):
-                    esm.getHT(mData, 12);
+                    esm.getHTSized<12>(mData);
                     hasData = true;
                     break;
                 case ESM::fourCC("PGRP"):
diff --git a/components/esm3/loadprob.cpp b/components/esm3/loadprob.cpp
index 10738c0863..f084732775 100644
--- a/components/esm3/loadprob.cpp
+++ b/components/esm3/loadprob.cpp
@@ -31,7 +31,7 @@ namespace ESM
                     mName = esm.getHString();
                     break;
                 case ESM::fourCC("PBDT"):
-                    esm.getHT(mData, 16);
+                    esm.getHTSized<16>(mData);
                     hasData = true;
                     break;
                 case ESM::fourCC("SCRI"):
diff --git a/components/esm3/loadrace.cpp b/components/esm3/loadrace.cpp
index ba0046bc9b..9520b792ed 100644
--- a/components/esm3/loadrace.cpp
+++ b/components/esm3/loadrace.cpp
@@ -40,7 +40,7 @@ namespace ESM
                     mName = esm.getHString();
                     break;
                 case ESM::fourCC("RADT"):
-                    esm.getHT(mData, 140);
+                    esm.getHTSized<140>(mData);
                     hasData = true;
                     break;
                 case ESM::fourCC("DESC"):
diff --git a/components/esm3/loadrepa.cpp b/components/esm3/loadrepa.cpp
index aaf518a1cd..16dd296a25 100644
--- a/components/esm3/loadrepa.cpp
+++ b/components/esm3/loadrepa.cpp
@@ -31,7 +31,7 @@ namespace ESM
                     mName = esm.getHString();
                     break;
                 case ESM::fourCC("RIDT"):
-                    esm.getHT(mData, 16);
+                    esm.getHTSized<16>(mData);
                     hasData = true;
                     break;
                 case ESM::fourCC("SCRI"):
diff --git a/components/esm3/loadskil.cpp b/components/esm3/loadskil.cpp
index 902410fe5a..f7bb0c49d6 100644
--- a/components/esm3/loadskil.cpp
+++ b/components/esm3/loadskil.cpp
@@ -144,7 +144,7 @@ namespace ESM
                     hasIndex = true;
                     break;
                 case ESM::fourCC("SKDT"):
-                    esm.getHT(mData, 24);
+                    esm.getHTSized<24>(mData);
                     hasData = true;
                     break;
                 case ESM::fourCC("DESC"):
diff --git a/components/esm3/loadsndg.cpp b/components/esm3/loadsndg.cpp
index 2f5dea1eb4..5519d835b4 100644
--- a/components/esm3/loadsndg.cpp
+++ b/components/esm3/loadsndg.cpp
@@ -25,7 +25,7 @@ namespace ESM
                     hasName = true;
                     break;
                 case ESM::fourCC("DATA"):
-                    esm.getHT(mType, 4);
+                    esm.getHTSized<4>(mType);
                     hasData = true;
                     break;
                 case ESM::fourCC("CNAM"):
diff --git a/components/esm3/loadsoun.cpp b/components/esm3/loadsoun.cpp
index 453d4eebfc..0ddda2d6b2 100644
--- a/components/esm3/loadsoun.cpp
+++ b/components/esm3/loadsoun.cpp
@@ -28,7 +28,7 @@ namespace ESM
                     mSound = esm.getHString();
                     break;
                 case ESM::fourCC("DATA"):
-                    esm.getHT(mData, 3);
+                    esm.getHTSized<3>(mData);
                     hasData = true;
                     break;
                 case ESM::SREC_DELE:
diff --git a/components/esm3/loadspel.cpp b/components/esm3/loadspel.cpp
index aeed60a1cb..f2891c2b6c 100644
--- a/components/esm3/loadspel.cpp
+++ b/components/esm3/loadspel.cpp
@@ -30,12 +30,12 @@ namespace ESM
                     mName = esm.getHString();
                     break;
                 case ESM::fourCC("SPDT"):
-                    esm.getHT(mData, 12);
+                    esm.getHTSized<12>(mData);
                     hasData = true;
                     break;
                 case ESM::fourCC("ENAM"):
                     ENAMstruct s;
-                    esm.getHT(s, 24);
+                    esm.getHTSized<24>(s);
                     mEffects.mList.push_back(s);
                     break;
                 case ESM::SREC_DELE:
diff --git a/components/esm3/loadweap.cpp b/components/esm3/loadweap.cpp
index e75ecf7516..452036cb95 100644
--- a/components/esm3/loadweap.cpp
+++ b/components/esm3/loadweap.cpp
@@ -31,7 +31,7 @@ namespace ESM
                     mName = esm.getHString();
                     break;
                 case ESM::fourCC("WPDT"):
-                    esm.getHT(mData, 32);
+                    esm.getHTSized<32>(mData);
                     hasData = true;
                     break;
                 case ESM::fourCC("SCRI"):
diff --git a/components/esm3/player.cpp b/components/esm3/player.cpp
index 028a042809..1839a45749 100644
--- a/components/esm3/player.cpp
+++ b/components/esm3/player.cpp
@@ -10,12 +10,12 @@ void ESM::Player::load (ESMReader &esm)
 
     mCellId.load (esm);
 
-    esm.getHNT (mLastKnownExteriorPosition, "LKEP", 12);
+    esm.getHNTSized<12>(mLastKnownExteriorPosition, "LKEP");
 
     if (esm.isNextSub ("MARK"))
     {
         mHasMark = true;
-        esm.getHT (mMarkedPosition, 24);
+        esm.getHTSized<24>(mMarkedPosition);
         mMarkedCell.load (esm);
     }
     else
diff --git a/components/esm3/savedgame.cpp b/components/esm3/savedgame.cpp
index 667dbdfbce..94ea075759 100644
--- a/components/esm3/savedgame.cpp
+++ b/components/esm3/savedgame.cpp
@@ -15,7 +15,7 @@ void ESM::SavedGame::load (ESMReader &esm)
     mPlayerClassName = esm.getHNOString("PLCN");
 
     mPlayerCell = esm.getHNString("PLCE");
-    esm.getHNT (mInGameTime, "TSTM", 16);
+    esm.getHNTSized<16>(mInGameTime, "TSTM");
     esm.getHNT (mTimePlayed, "TIME");
     mDescription = esm.getHNString ("DESC");
 

From 0790af962eacc39e5c119a5b9a90f8d276b2776b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Sat, 9 Apr 2022 03:16:27 +0300
Subject: [PATCH 2283/2859] Cleanup code in mwshadowtechnique.cpp

---
 components/sceneutil/mwshadowtechnique.cpp | 225 +++++++++------------
 1 file changed, 98 insertions(+), 127 deletions(-)

diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
index 1bdc0e5693..f4c5bc1041 100644
--- a/components/sceneutil/mwshadowtechnique.cpp
+++ b/components/sceneutil/mwshadowtechnique.cpp
@@ -26,6 +26,8 @@
 #include <osg/ClipControl>
 
 #include <sstream>
+#include <deque>
+#include <vector>
 
 #include "shadowsbin.hpp"
 
@@ -1945,8 +1947,9 @@ bool MWShadowTechnique::computeShadowCameraSettings(Frustum& frustum, LightData&
 struct ConvexHull
 {
     typedef std::vector<osg::Vec3d> Vertices;
-    typedef std::pair< osg::Vec3d, osg::Vec3d > Edge;
-    typedef std::list< Edge > Edges;
+    typedef std::pair<osg::Vec3d, osg::Vec3d> Edge;
+    typedef std::vector<Edge> Edges;
+    typedef std::vector<osg::Vec3d> VertexSet;
 
     Edges _edges;
 
@@ -1954,20 +1957,20 @@ struct ConvexHull
 
     void setToFrustum(MWShadowTechnique::Frustum& frustum)
     {
-        _edges.push_back( Edge(frustum.corners[0],frustum.corners[1]) );
-        _edges.push_back( Edge(frustum.corners[1],frustum.corners[2]) );
-        _edges.push_back( Edge(frustum.corners[2],frustum.corners[3]) );
-        _edges.push_back( Edge(frustum.corners[3],frustum.corners[0]) );
+        _edges.emplace_back(frustum.corners[0], frustum.corners[1]);
+        _edges.emplace_back(frustum.corners[1], frustum.corners[2]);
+        _edges.emplace_back(frustum.corners[2], frustum.corners[3]);
+        _edges.emplace_back(frustum.corners[3], frustum.corners[0]);
 
-        _edges.push_back( Edge(frustum.corners[4],frustum.corners[5]) );
-        _edges.push_back( Edge(frustum.corners[5],frustum.corners[6]) );
-        _edges.push_back( Edge(frustum.corners[6],frustum.corners[7]) );
-        _edges.push_back( Edge(frustum.corners[7],frustum.corners[4]) );
+        _edges.emplace_back(frustum.corners[4], frustum.corners[5]);
+        _edges.emplace_back(frustum.corners[5], frustum.corners[6]);
+        _edges.emplace_back(frustum.corners[6], frustum.corners[7]);
+        _edges.emplace_back(frustum.corners[7], frustum.corners[4]);
 
-        _edges.push_back( Edge(frustum.corners[0],frustum.corners[4]) );
-        _edges.push_back( Edge(frustum.corners[1],frustum.corners[5]) );
-        _edges.push_back( Edge(frustum.corners[2],frustum.corners[6]) );
-        _edges.push_back( Edge(frustum.corners[3],frustum.corners[7]) );
+        _edges.emplace_back(frustum.corners[0], frustum.corners[4]);
+        _edges.emplace_back(frustum.corners[1], frustum.corners[5]);
+        _edges.emplace_back(frustum.corners[2], frustum.corners[6]);
+        _edges.emplace_back(frustum.corners[3], frustum.corners[7]);
     }
 
     struct ConvexHull2D
@@ -1981,22 +1984,22 @@ struct ConvexHull
         }
 
         // Calculates the 2D convex hull and returns it as a vector containing the points in CCW order with the first and last point being the same.
-        static std::vector<Point> convexHull(std::set<Point> &P)
+        static Vertices convexHull(const VertexSet &P)
         {
             size_t n = P.size(), k = 0;
             if (n <= 3)
-                return std::vector<Point>(P.cbegin(), P.cend());
+                return Vertices(P.cbegin(), P.cend());
 
-            std::vector<Point> H(2 * n);
+            Vertices H(2 * n);
 
             // Points are already sorted in a std::set
 
             // Build lower hull
-            for (auto pItr = P.cbegin(); pItr != P.cend(); ++pItr)
+            for(const auto& vert : P)
             {
-                while (k >= 2 && cross(H[k - 2], H[k - 1], *pItr) <= 0)
+                while (k >= 2 && cross(H[k - 2], H[k - 1], vert) <= 0)
                     k--;
-                H[k++] = *pItr;
+                H[k++] = vert;
             }
 
             // Build upper hull
@@ -2053,38 +2056,39 @@ struct ConvexHull
 
     void extendTowardsNegativeZ()
     {
-        typedef std::set<osg::Vec3d> VertexSet;
-
         // Collect the set of vertices
         VertexSet vertices;
         for (const Edge& edge : _edges)
         {
-            vertices.insert(edge.first);
-            vertices.insert(edge.second);
+            vertices.emplace_back(edge.first);
+            vertices.emplace_back(edge.second);
         }
 
+        // Sort and make unique.
+        std::sort(vertices.begin(), vertices.end());
+        vertices.erase(std::unique(vertices.begin(), vertices.end()), vertices.end());
+
         if (vertices.size() == 0)
             return;
 
         // Get the vertices contributing to the 2D convex hull
         Vertices extremeVertices = ConvexHull2D::convexHull(vertices);
-        VertexSet extremeVerticesSet(extremeVertices.cbegin(), extremeVertices.cend());
 
         // Add their extrusions to the final edge collection
         // We extrude as far as -1.5 as the coordinate space shouldn't ever put any shadow casters further than -1.0
         Edges finalEdges;
         // Add edges towards -Z
-        for (auto vertex : extremeVertices)
-            finalEdges.push_back(Edge(vertex, osg::Vec3d(vertex.x(), vertex.y(), -1.5)));
+        for (const auto& vertex : extremeVertices)
+            finalEdges.emplace_back(vertex, osg::Vec3d(vertex.x(), vertex.y(), -1.5));
         // Add edge loop to 'seal' the hull
         for (auto itr = extremeVertices.cbegin(); itr != extremeVertices.cend() - 1; ++itr)
-            finalEdges.push_back(Edge(osg::Vec3d(itr->x(), itr->y(), -1.5), osg::Vec3d((itr + 1)->x(), (itr + 1)->y(), -1.5)));
+            finalEdges.emplace_back(osg::Vec3d(itr->x(), itr->y(), -1.5), osg::Vec3d((itr + 1)->x(), (itr + 1)->y(), -1.5));
         // The convex hull algorithm we are using sometimes places a point at both ends of the vector, so we don't always need to add the last edge separately.
         if (extremeVertices.front() != extremeVertices.back())
-            finalEdges.push_back(Edge(osg::Vec3d(extremeVertices.front().x(), extremeVertices.front().y(), -1.5), osg::Vec3d(extremeVertices.back().x(), extremeVertices.back().y(), -1.5)));
+            finalEdges.emplace_back(osg::Vec3d(extremeVertices.front().x(), extremeVertices.front().y(), -1.5), osg::Vec3d(extremeVertices.back().x(), extremeVertices.back().y(), -1.5));
 
         // Remove internal edges connected to extreme vertices
-        for (auto vertex : extremeVertices)
+        for (const auto& vertex : extremeVertices)
         {
             Vertices connectedVertices;
             for (const Edge& edge : _edges)
@@ -2094,37 +2098,35 @@ struct ConvexHull
                 else if (edge.second == vertex)
                     connectedVertices.push_back(edge.first);
             }
-            connectedVertices.push_back(osg::Vec3d(vertex.x(), vertex.y(), -1.5));
+            connectedVertices.emplace_back(vertex.x(), vertex.y(), -1.5);
 
             Vertices unwantedEdgeEnds = findInternalEdges(vertex, connectedVertices);
-            for (auto edgeEnd : unwantedEdgeEnds)
+            for (const auto& edgeEnd : unwantedEdgeEnds)
             {
-                for (auto itr = _edges.begin(); itr != _edges.end();)
-                {
-                    if (*itr == Edge(vertex, edgeEnd))
+                const auto edgeA = Edge(vertex, edgeEnd);
+                const auto edgeB = Edge(edgeEnd, vertex);
+                _edges.erase(std::remove_if(_edges.begin(), _edges.end(), [&](const auto& elem)
                     {
-                        itr = _edges.erase(itr);
-                        break;
-                    }
-                    else if (*itr == Edge(edgeEnd, vertex))
-                    {
-                        itr = _edges.erase(itr);
-                        break;
-                    }
-                    else
-                        ++itr;
-                }
+                        return elem == edgeA || elem == edgeB;
+                    }), _edges.end());
             }
         }
 
         // Gather connected vertices
-        VertexSet unprocessedConnectedVertices(extremeVertices.begin(), extremeVertices.end());
+        std::deque<osg::Vec3d> unprocessedConnectedVertices(extremeVertices.begin(), extremeVertices.end());
+
         VertexSet connectedVertices;
+        const auto containsVertex = [&](const auto& vert)
+        {
+            return std::find(connectedVertices.begin(), connectedVertices.end(), vert) != connectedVertices.end();
+        };
+
         while (unprocessedConnectedVertices.size() > 0)
         {
-            osg::Vec3d vertex = *unprocessedConnectedVertices.begin();
-            unprocessedConnectedVertices.erase(unprocessedConnectedVertices.begin());
-            connectedVertices.insert(vertex);
+            osg::Vec3d vertex = unprocessedConnectedVertices.front();
+            unprocessedConnectedVertices.pop_front();
+
+            connectedVertices.emplace_back(vertex);
             for (const Edge& edge : _edges)
             {
                 osg::Vec3d otherEnd;
@@ -2135,16 +2137,16 @@ struct ConvexHull
                 else
                     continue;
 
-                if (connectedVertices.count(otherEnd))
+                if (containsVertex(otherEnd))
                     continue;
 
-                unprocessedConnectedVertices.insert(otherEnd);
+                unprocessedConnectedVertices.emplace_back(otherEnd);
             }
         }
 
         for (const Edge& edge : _edges)
         {
-            if (connectedVertices.count(edge.first) || connectedVertices.count(edge.second))
+            if (containsVertex(edge.first) || containsVertex(edge.second))
                 finalEdges.push_back(edge);
         }
 
@@ -2153,12 +2155,10 @@ struct ConvexHull
 
     void transform(const osg::Matrixd& m)
     {
-        for(Edges::iterator itr = _edges.begin();
-            itr != _edges.end();
-            ++itr)
+        for (auto& edge : _edges)
         {
-            itr->first = itr->first * m;
-            itr->second = itr->second * m;
+            edge.first = edge.first * m;
+            edge.second = edge.second * m;
         }
     }
 
@@ -2167,18 +2167,14 @@ struct ConvexHull
         Vertices intersections;
 
         // OSG_NOTICE<<"clip("<<plane<<") edges.size()="<<_edges.size()<<std::endl;
-        for(Edges::iterator itr = _edges.begin();
-            itr != _edges.end();
-            )
+        for(auto itr = _edges.begin(); itr != _edges.end();)
         {
             double d0 = plane.distance(itr->first);
             double d1 = plane.distance(itr->second);
             if (d0<0.0 && d1<0.0)
             {
                 // OSG_NOTICE<<"  Edge completely outside, removing"<<std::endl;
-                Edges::iterator to_delete_itr = itr;
-                ++itr;
-                _edges.erase(to_delete_itr);
+                itr = _edges.erase(itr);
             }
             else if (d0>=0.0 && d1>=0.0)
             {
@@ -2215,15 +2211,15 @@ struct ConvexHull
 
         if (intersections.size() == 2)
         {
-            _edges.push_back( Edge(intersections[0], intersections[1]) );
+            _edges.emplace_back(intersections[0], intersections[1]);
             return;
         }
 
         if (intersections.size() == 3)
         {
-            _edges.push_back( Edge(intersections[0], intersections[1]) );
-            _edges.push_back( Edge(intersections[1], intersections[2]) );
-            _edges.push_back( Edge(intersections[2], intersections[0]) );
+            _edges.emplace_back(intersections[0], intersections[1]);
+            _edges.emplace_back(intersections[1], intersections[2]);
+            _edges.emplace_back(intersections[2], intersections[0]);
             return;
         }
 
@@ -2241,11 +2237,9 @@ struct ConvexHull
         up.normalize();
 
         osg::Vec3d center;
-        for(Vertices::iterator itr = intersections.begin();
-            itr != intersections.end();
-            ++itr)
+        for(auto& vertex : intersections)
         {
-            center += *itr;
+            center += vertex;
 
             center.x() = osg::maximum(center.x(), -dbl_max);
             center.y() = osg::maximum(center.y(), -dbl_max);
@@ -2260,11 +2254,9 @@ struct ConvexHull
 
         typedef std::map<double, std::list<std::pair<osg::Vec3d, double>>> VertexMap;
         VertexMap vertexMap;
-        for(Vertices::iterator itr = intersections.begin();
-            itr != intersections.end();
-            ++itr)
+        for (const auto& vertex : intersections)
         {
-            osg::Vec3d dv = (*itr-center);
+            osg::Vec3d dv = vertex - center;
             double h = dv * side;
             double v = dv * up;
             double angle = atan2(h,v);
@@ -2285,20 +2277,18 @@ struct ConvexHull
                 auto listItr = vertexMap[angle].begin();
                 while (listItr != vertexMap[angle].end() && listItr->second < sortValue)
                     ++listItr;
-                vertexMap[angle].insert(listItr, std::make_pair(*itr, sortValue));
+                vertexMap[angle].emplace(listItr, std::make_pair(vertex, sortValue));
             }
             else
-                vertexMap[angle].push_back(std::make_pair(*itr, sortValue));
+                vertexMap[angle].emplace_back(vertex, sortValue);
         }
 
         osg::Vec3d previous_v = vertexMap.rbegin()->second.back().first;
-        for(VertexMap::iterator itr = vertexMap.begin();
-            itr != vertexMap.end();
-            ++itr)
+        for (auto itr = vertexMap.begin(); itr != vertexMap.end(); ++itr)
         {
-            for (auto vertex : itr->second)
+            for (const auto& vertex : itr->second)
             {
-                _edges.push_back(Edge(previous_v, vertex.first));
+                _edges.emplace_back(previous_v, vertex.first);
                 previous_v = vertex.first;
             }
         }
@@ -2309,24 +2299,19 @@ struct ConvexHull
     void clip(const osg::Polytope& polytope)
     {
         const osg::Polytope::PlaneList& planes = polytope.getPlaneList();
-        for(osg::Polytope::PlaneList::const_iterator itr = planes.begin();
-            itr != planes.end();
-            ++itr)
+        for(const auto& plane : planes)
         {
-            clip(*itr);
+            clip(plane);
         }
     }
 
     double min(unsigned int index) const
     {
         double m = dbl_max;
-        for(Edges::const_iterator itr = _edges.begin();
-            itr != _edges.end();
-            ++itr)
+        for(const auto& edge : _edges)
         {
-            const Edge& edge = *itr;
-            if (edge.first[index]<m) m = edge.first[index];
-            if (edge.second[index]<m) m = edge.second[index];
+            if (edge.first[index] < m) m = edge.first[index];
+            if (edge.second[index] < m) m = edge.second[index];
         }
         return m;
     }
@@ -2334,13 +2319,10 @@ struct ConvexHull
     double max(unsigned int index) const
     {
         double m = -dbl_max;
-        for(Edges::const_iterator itr = _edges.begin();
-            itr != _edges.end();
-            ++itr)
+        for (const auto& edge : _edges)
         {
-            const Edge& edge = *itr;
-            if (edge.first[index]>m) m = edge.first[index];
-            if (edge.second[index]>m) m = edge.second[index];
+            if (edge.first[index] > m) m = edge.first[index];
+            if (edge.second[index] > m) m = edge.second[index];
         }
         return m;
     }
@@ -2350,19 +2332,15 @@ struct ConvexHull
         double m = dbl_max;
         osg::Vec3d delta;
         double ratio;
-        for(Edges::const_iterator itr = _edges.begin();
-            itr != _edges.end();
-            ++itr)
+        for (const auto& edge : _edges)
         {
-            const Edge& edge = *itr;
-
-            delta = edge.first-eye;
-            ratio = delta[index]/delta[1];
-            if (ratio<m) m = ratio;
+            delta = edge.first - eye;
+            ratio = delta[index] / delta[1];
+            if (ratio < m) m = ratio;
 
-            delta = edge.second-eye;
-            ratio = delta[index]/delta[1];
-            if (ratio<m) m = ratio;
+            delta = edge.second - eye;
+            ratio = delta[index] / delta[1];
+            if (ratio < m) m = ratio;
         }
         return m;
     }
@@ -2372,32 +2350,25 @@ struct ConvexHull
         double m = -dbl_max;
         osg::Vec3d delta;
         double ratio;
-        for(Edges::const_iterator itr = _edges.begin();
-            itr != _edges.end();
-            ++itr)
+        for (const auto& edge : _edges)
         {
-            const Edge& edge = *itr;
-
-            delta = edge.first-eye;
-            ratio = delta[index]/delta[1];
-            if (ratio>m) m = ratio;
+            delta = edge.first - eye;
+            ratio = delta[index] / delta[1];
+            if (ratio > m) m = ratio;
 
-            delta = edge.second-eye;
-            ratio = delta[index]/delta[1];
-            if (ratio>m) m = ratio;
+            delta = edge.second - eye;
+            ratio = delta[index] / delta[1];
+            if (ratio > m) m = ratio;
         }
         return m;
     }
 
     void output(std::ostream& out)
     {
-        out<<"ConvexHull"<<std::endl;
-        for(Edges::const_iterator itr = _edges.begin();
-            itr != _edges.end();
-            ++itr)
+        out << "ConvexHull" << std::endl;
+        for (const auto& edge : _edges)
         {
-            const Edge& edge = *itr;
-            out<<"   edge ("<<edge.first<<") ("<<edge.second<<")"<<std::endl;
+            out << "   edge (" << edge.first << ") (" << edge.second << ")" << std::endl;
         }
     }
 };

From c3a924de2384922b154ad6d460aac4a5ca466ac9 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 10 Apr 2022 13:35:54 +0200
Subject: [PATCH 2284/2859] Fix skip DATA in cell ref loading

---
 components/esm3/cellref.cpp   | 2 +-
 components/esm3/esmreader.hpp | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/components/esm3/cellref.cpp b/components/esm3/cellref.cpp
index 9b46bf182a..d5ed0b4003 100644
--- a/components/esm3/cellref.cpp
+++ b/components/esm3/cellref.cpp
@@ -116,7 +116,7 @@ namespace ESM
                         if constexpr (load)
                             esm.getHTSized<24>(cellRef.mPos);
                         else
-                            esm.skip(24);
+                            esm.skipHTSized<24, decltype(cellRef.mPos)>();
                         break;
                     case ESM::fourCC("NAM0"):
                     {
diff --git a/components/esm3/esmreader.hpp b/components/esm3/esmreader.hpp
index e931cde42a..ffa7a94d7b 100644
--- a/components/esm3/esmreader.hpp
+++ b/components/esm3/esmreader.hpp
@@ -155,6 +155,13 @@ public:
       getHT(x);
   }
 
+  template <std::size_t size, typename T>
+  void skipHTSized()
+  {
+      static_assert(sizeof(T) == size);
+      skipHT<T>();
+  }
+
   // Read a string by the given name if it is the next record.
   std::string getHNOString(NAME name);
 

From 19df9c3d171822ba417980165dabe11bad3bef49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Sun, 10 Apr 2022 20:38:59 +0300
Subject: [PATCH 2285/2859] Use vector for edge queue

---
 components/sceneutil/mwshadowtechnique.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
index f4c5bc1041..63010f6469 100644
--- a/components/sceneutil/mwshadowtechnique.cpp
+++ b/components/sceneutil/mwshadowtechnique.cpp
@@ -2113,7 +2113,7 @@ struct ConvexHull
         }
 
         // Gather connected vertices
-        std::deque<osg::Vec3d> unprocessedConnectedVertices(extremeVertices.begin(), extremeVertices.end());
+        VertexSet unprocessedConnectedVertices = extremeVertices;
 
         VertexSet connectedVertices;
         const auto containsVertex = [&](const auto& vert)
@@ -2121,10 +2121,10 @@ struct ConvexHull
             return std::find(connectedVertices.begin(), connectedVertices.end(), vert) != connectedVertices.end();
         };
 
-        while (unprocessedConnectedVertices.size() > 0)
+        while (!unprocessedConnectedVertices.empty())
         {
-            osg::Vec3d vertex = unprocessedConnectedVertices.front();
-            unprocessedConnectedVertices.pop_front();
+            osg::Vec3d vertex = unprocessedConnectedVertices.back();
+            unprocessedConnectedVertices.pop_back();
 
             connectedVertices.emplace_back(vertex);
             for (const Edge& edge : _edges)

From b39aea434661f50ed7b0988944c31e46fb512c9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Sun, 10 Apr 2022 20:56:52 +0300
Subject: [PATCH 2286/2859] Move extremeEdges into queue instead of copying

---
 components/sceneutil/mwshadowtechnique.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
index 63010f6469..931b316347 100644
--- a/components/sceneutil/mwshadowtechnique.cpp
+++ b/components/sceneutil/mwshadowtechnique.cpp
@@ -2113,7 +2113,7 @@ struct ConvexHull
         }
 
         // Gather connected vertices
-        VertexSet unprocessedConnectedVertices = extremeVertices;
+        VertexSet unprocessedConnectedVertices = std::move(extremeVertices);
 
         VertexSet connectedVertices;
         const auto containsVertex = [&](const auto& vert)

From 2c5a4e64160111936b634e07cfa76f279cbd8c41 Mon Sep 17 00:00:00 2001
From: Benjamin Winger <bmw@disroot.org>
Date: Sun, 10 Apr 2022 15:26:25 -0400
Subject: [PATCH 2287/2859] Set ICU_ROOT instead of PKG_CONFIG_PATH to find ICU
 on macos

---
 CI/before_install.osx.sh | 1 -
 CI/before_script.osx.sh  | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index 6871787e22..ba269ae0e0 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -16,7 +16,6 @@ command -v qmake >/dev/null 2>&1 || brew install qt@5
 brew install icu4c
 brew install yaml-cpp
 export PATH="/usr/local/opt/qt@5/bin:$PATH"  # needed to use qmake in none default path as qt now points to qt6
-export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig"
 
 ccache --version
 cmake --version
diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh
index 8b2c9c6f01..c4bb1d1a64 100755
--- a/CI/before_script.osx.sh
+++ b/CI/before_script.osx.sh
@@ -26,5 +26,6 @@ cmake \
 -D BUILD_BSATOOL=TRUE \
 -D BUILD_ESSIMPORTER=TRUE \
 -D BUILD_NIFTEST=TRUE \
+-D ICU_ROOT="/usr/local/opt/icu4c"
 -G"Unix Makefiles" \
 ..

From e3cedb5bfcf0dd86ad9c76ff45994e9199cbd407 Mon Sep 17 00:00:00 2001
From: Benjamin Winger <bmw@disroot.org>
Date: Sun, 10 Apr 2022 15:26:41 -0400
Subject: [PATCH 2288/2859] Set yaml-cpp and ICU as REQUIRED

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dbb88e14f8..0cbd7a1a99 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -251,7 +251,7 @@ set(USED_OSG_PLUGINS
 
 option(OPENMW_USE_SYSTEM_ICU "Use system ICU library instead of internal. If disabled, requires autotools" ON)
 if(OPENMW_USE_SYSTEM_ICU)
-    find_package(ICU COMPONENTS uc i18n)
+    find_package(ICU REQUIRED COMPONENTS uc i18n)
 endif()
 
 option(OPENMW_USE_SYSTEM_YAML_CPP "Use system yaml-cpp library instead of internal." ON)
@@ -262,7 +262,7 @@ else()
 endif()
 option(YAML_CPP_STATIC "Link static build of yaml-cpp into the binaries" ${_yaml_cpp_static_default})
 if (OPENMW_USE_SYSTEM_YAML_CPP)
-    find_package(yaml-cpp)
+    find_package(yaml-cpp REQUIRED)
 endif()
 
 add_subdirectory(extern)

From db44f91fd56e06810c62768f7da2ed63e9d15814 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 10 Apr 2022 18:33:42 +0200
Subject: [PATCH 2289/2859] Remove redundant include from esm3/esmreader.hpp

---
 apps/essimporter/converter.hpp         | 1 +
 apps/opencs/model/doc/savingstages.cpp | 2 ++
 apps/opencs/model/world/regionmap.cpp  | 1 +
 apps/opencs/view/filter/editwidget.cpp | 2 ++
 apps/openmw/mwworld/store.cpp          | 1 +
 components/esm3/esmreader.cpp          | 1 +
 components/esm3/esmreader.hpp          | 1 -
 components/esm3/loadscpt.cpp           | 2 ++
 components/esm3/variantimp.cpp         | 1 +
 components/esmloader/load.cpp          | 1 +
 10 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/apps/essimporter/converter.hpp b/apps/essimporter/converter.hpp
index 8b71775759..ac891e78df 100644
--- a/apps/essimporter/converter.hpp
+++ b/apps/essimporter/converter.hpp
@@ -2,6 +2,7 @@
 #define OPENMW_ESSIMPORT_CONVERTER_H
 
 #include <limits>
+#include <sstream>
 
 #include <osg/Image>
 #include <osg/ref_ptr>
diff --git a/apps/opencs/model/doc/savingstages.cpp b/apps/opencs/model/doc/savingstages.cpp
index 08bd6c81e8..df3d0cb980 100644
--- a/apps/opencs/model/doc/savingstages.cpp
+++ b/apps/opencs/model/doc/savingstages.cpp
@@ -1,5 +1,7 @@
 #include "savingstages.hpp"
 
+#include <sstream>
+
 #include <boost/filesystem.hpp>
 
 #include <components/esm3/loaddial.hpp>
diff --git a/apps/opencs/model/world/regionmap.cpp b/apps/opencs/model/world/regionmap.cpp
index 6dbbac97fb..557a8303b5 100644
--- a/apps/opencs/model/world/regionmap.cpp
+++ b/apps/opencs/model/world/regionmap.cpp
@@ -2,6 +2,7 @@
 
 #include <cmath>
 #include <algorithm>
+#include <sstream>
 
 #include <QBrush>
 
diff --git a/apps/opencs/view/filter/editwidget.cpp b/apps/opencs/view/filter/editwidget.cpp
index 2c2f4443df..78dfef704b 100644
--- a/apps/opencs/view/filter/editwidget.cpp
+++ b/apps/opencs/view/filter/editwidget.cpp
@@ -1,5 +1,7 @@
 #include "editwidget.hpp"
 
+#include <sstream>
+
 #include <QAbstractItemModel>
 #include <QAction>
 #include <QContextMenuEvent>
diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index 80cf3b87a1..ba33703668 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -10,6 +10,7 @@
 
 #include <iterator>
 #include <stdexcept>
+#include <sstream>
 
 namespace MWWorld
 {
diff --git a/components/esm3/esmreader.cpp b/components/esm3/esmreader.cpp
index 2cf0cd29ce..187b2d5bae 100644
--- a/components/esm3/esmreader.cpp
+++ b/components/esm3/esmreader.cpp
@@ -4,6 +4,7 @@
 #include <components/misc/stringops.hpp>
 
 #include <stdexcept>
+#include <sstream>
 
 namespace ESM
 {
diff --git a/components/esm3/esmreader.hpp b/components/esm3/esmreader.hpp
index ffa7a94d7b..7b75458d25 100644
--- a/components/esm3/esmreader.hpp
+++ b/components/esm3/esmreader.hpp
@@ -3,7 +3,6 @@
 
 #include <cstdint>
 #include <vector>
-#include <sstream>
 
 #include <components/files/constrainedfilestream.hpp>
 
diff --git a/components/esm3/loadscpt.cpp b/components/esm3/loadscpt.cpp
index f226d5f3be..b97a148963 100644
--- a/components/esm3/loadscpt.cpp
+++ b/components/esm3/loadscpt.cpp
@@ -1,5 +1,7 @@
 #include "loadscpt.hpp"
 
+#include <sstream>
+
 #include <components/debug/debuglog.hpp>
 
 #include "esmreader.hpp"
diff --git a/components/esm3/variantimp.cpp b/components/esm3/variantimp.cpp
index b9cd9a8536..df491e7cec 100644
--- a/components/esm3/variantimp.cpp
+++ b/components/esm3/variantimp.cpp
@@ -2,6 +2,7 @@
 
 #include <stdexcept>
 #include <cmath>
+#include <sstream>
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
diff --git a/components/esmloader/load.cpp b/components/esmloader/load.cpp
index 14478a6c85..95011e221c 100644
--- a/components/esmloader/load.cpp
+++ b/components/esmloader/load.cpp
@@ -28,6 +28,7 @@
 #include <type_traits>
 #include <utility>
 #include <vector>
+#include <sstream>
 
 namespace EsmLoader
 {

From fa29b9d6f75e4a3337d65bcc29018b76f13beec0 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 10 Apr 2022 22:31:09 +0200
Subject: [PATCH 2290/2859] Fix #6627

---
 apps/wizard/mainwizard.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/wizard/mainwizard.cpp b/apps/wizard/mainwizard.cpp
index 7987d9b08d..8c61cdd202 100644
--- a/apps/wizard/mainwizard.cpp
+++ b/apps/wizard/mainwizard.cpp
@@ -55,6 +55,9 @@ Wizard::MainWizard::MainWizard(QWidget *parent) :
                    <p>Please make sure you have the right permissions \
                    and try again.</p></body></html>");
 
+    boost::filesystem::create_directories(mCfgMgr.getUserConfigPath());
+    boost::filesystem::create_directories(mCfgMgr.getUserDataPath());
+
     setupLog();
     setupGameSettings();
     setupLauncherSettings();

From 5eb8c4aebec9ceba26f1a5f22890610fab6150e5 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 10 Apr 2022 17:25:26 +0200
Subject: [PATCH 2291/2859] Avoid redundant conversion to const char* and use
 make_shared

---
 apps/niftest/niftest.cpp                   |  2 +-
 apps/openmw_test_suite/files/hash.cpp      |  2 +-
 components/bsa/bsa_file.hpp                |  2 +-
 components/bsa/compressedbsafile.cpp       |  4 ++--
 components/esm/reader.cpp                  |  2 +-
 components/esm3/esmreader.cpp              |  4 ++--
 components/esm4/reader.cpp                 |  2 +-
 components/esm4/reader.hpp                 | 10 ++++++----
 components/files/constrainedfilestream.cpp |  8 +++-----
 components/files/constrainedfilestream.hpp |  5 ++++-
 components/vfs/filesystemarchive.cpp       |  2 +-
 11 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/apps/niftest/niftest.cpp b/apps/niftest/niftest.cpp
index f857dbde37..8f8f9c979e 100644
--- a/apps/niftest/niftest.cpp
+++ b/apps/niftest/niftest.cpp
@@ -131,7 +131,7 @@ int main(int argc, char **argv)
             if(isNIF(name))
             {
                 //std::cout << "Decoding: " << name << std::endl;
-                Nif::NIFFile temp_nif(Files::openConstrainedFileStream(name.c_str()),name);
+                Nif::NIFFile temp_nif(Files::openConstrainedFileStream(name), name);
              }
              else if(isBSA(name))
              {
diff --git a/apps/openmw_test_suite/files/hash.cpp b/apps/openmw_test_suite/files/hash.cpp
index e6dbc8f6cc..f87edd4e6e 100644
--- a/apps/openmw_test_suite/files/hash.cpp
+++ b/apps/openmw_test_suite/files/hash.cpp
@@ -39,7 +39,7 @@ namespace
         std::fill_n(std::back_inserter(content), GetParam().mSize, 'a');
         std::fstream(fileName, std::ios_base::out | std::ios_base::binary)
             .write(content.data(), static_cast<std::streamsize>(content.size()));
-        const auto stream = Files::openConstrainedFileStream(fileName.data(), 0, content.size());
+        const auto stream = Files::openConstrainedFileStream(fileName, 0, content.size());
         EXPECT_EQ(getHash(fileName, *stream), GetParam().mHash);
     }
 
diff --git a/components/bsa/bsa_file.hpp b/components/bsa/bsa_file.hpp
index 83e9ae954c..66c8234bbd 100644
--- a/components/bsa/bsa_file.hpp
+++ b/components/bsa/bsa_file.hpp
@@ -125,7 +125,7 @@ public:
     */
     Files::IStreamPtr getFile(const FileStruct *file)
     {
-        return Files::openConstrainedFileStream (mFilename.c_str (), file->offset, file->fileSize);
+        return Files::openConstrainedFileStream(mFilename, file->offset, file->fileSize);
     }
 
     void addFile(const std::string& filename, std::istream& file);
diff --git a/components/bsa/compressedbsafile.cpp b/components/bsa/compressedbsafile.cpp
index ae8209a39a..a3f3c08864 100644
--- a/components/bsa/compressedbsafile.cpp
+++ b/components/bsa/compressedbsafile.cpp
@@ -355,7 +355,7 @@ Files::IStreamPtr CompressedBSAFile::getFile(const FileRecord& fileRecord)
     size_t size = fileRecord.getSizeWithoutCompressionFlag();
     size_t uncompressedSize = size;
     bool compressed = fileRecord.isCompressed(mCompressedByDefault);
-    Files::IStreamPtr streamPtr = Files::openConstrainedFileStream(mFilename.c_str(), fileRecord.offset, size);
+    Files::IStreamPtr streamPtr = Files::openConstrainedFileStream(mFilename, fileRecord.offset, size);
     std::istream* fileStream = streamPtr.get();
     if (mEmbeddedFileNames)
     {
@@ -458,7 +458,7 @@ void CompressedBSAFile::convertCompressedSizesToUncompressed()
             continue;
         }
 
-        Files::IStreamPtr dataBegin = Files::openConstrainedFileStream(mFilename.c_str(), fileRecord.offset, fileRecord.getSizeWithoutCompressionFlag());
+        Files::IStreamPtr dataBegin = Files::openConstrainedFileStream(mFilename, fileRecord.offset, fileRecord.getSizeWithoutCompressionFlag());
 
         if (mEmbeddedFileNames)
         {
diff --git a/components/esm/reader.cpp b/components/esm/reader.cpp
index 7fcc2cce3a..d3732abb1e 100644
--- a/components/esm/reader.cpp
+++ b/components/esm/reader.cpp
@@ -16,7 +16,7 @@ namespace ESM
 {
     Reader* Reader::getReader(const std::string &filename)
     {
-        Files::IStreamPtr esmStream(Files::openConstrainedFileStream (filename.c_str ()));
+        Files::IStreamPtr esmStream(Files::openConstrainedFileStream(filename));
 
         std::uint32_t modVer = 0; // get the first 4 bytes of the record header only
         esmStream->read((char*)&modVer, sizeof(modVer));
diff --git a/components/esm3/esmreader.cpp b/components/esm3/esmreader.cpp
index 2cf0cd29ce..abe6cf9d71 100644
--- a/components/esm3/esmreader.cpp
+++ b/components/esm3/esmreader.cpp
@@ -93,7 +93,7 @@ void ESMReader::openRaw(Files::IStreamPtr _esm, const std::string& name)
 
 void ESMReader::openRaw(const std::string& filename)
 {
-    openRaw(Files::openConstrainedFileStream(filename.c_str()), filename);
+    openRaw(Files::openConstrainedFileStream(filename), filename);
 }
 
 void ESMReader::open(Files::IStreamPtr _esm, const std::string &name)
@@ -110,7 +110,7 @@ void ESMReader::open(Files::IStreamPtr _esm, const std::string &name)
 
 void ESMReader::open(const std::string &file)
 {
-    open (Files::openConstrainedFileStream (file.c_str ()), file);
+    open (Files::openConstrainedFileStream(file), file);
 }
 
 std::string ESMReader::getHNOString(NAME name)
diff --git a/components/esm4/reader.cpp b/components/esm4/reader.cpp
index f4fe8def68..1a8fff789a 100644
--- a/components/esm4/reader.cpp
+++ b/components/esm4/reader.cpp
@@ -210,7 +210,7 @@ void Reader::buildLStringIndex(const std::string& stringFile, LocalizedStringTyp
     sp.type = stringType;
 
     // TODO: possibly check if the resource exists?
-    Files::IStreamPtr filestream = Files::IStreamPtr(Files::openConstrainedFileStream(stringFile.c_str()));
+    Files::IStreamPtr filestream = Files::IStreamPtr(Files::openConstrainedFileStream(stringFile));
 
     filestream->seekg(0, std::ios::end);
     std::size_t fileSize = filestream->tellg();
diff --git a/components/esm4/reader.hpp b/components/esm4/reader.hpp
index c1bf808dd5..60676b116b 100644
--- a/components/esm4/reader.hpp
+++ b/components/esm4/reader.hpp
@@ -128,12 +128,14 @@ namespace ESM4 {
         ~Reader();
 
         // FIXME: should be private but ESMTool uses it
-        void openRaw(const std::string& filename) {
-            openRaw(Files::openConstrainedFileStream(filename.c_str()), filename);
+        void openRaw(const std::string& filename)
+        {
+            openRaw(Files::openConstrainedFileStream(filename), filename);
         }
 
-        void open(const std::string& filename) {
-            open(Files::openConstrainedFileStream (filename.c_str ()), filename);
+        void open(const std::string& filename)
+        {
+            open(Files::openConstrainedFileStream(filename), filename);
         }
 
         void close() final;
diff --git a/components/files/constrainedfilestream.cpp b/components/files/constrainedfilestream.cpp
index b9968038d1..0beaf5facc 100644
--- a/components/files/constrainedfilestream.cpp
+++ b/components/files/constrainedfilestream.cpp
@@ -27,7 +27,7 @@ namespace Files
         ConstrainedFileStreamBuf(const std::string &fname, size_t start, size_t length)
         {
             mFile.open (fname.c_str ());
-            mSize  = length != 0xFFFFFFFF ? length : mFile.size () - start;
+            mSize  = length != std::numeric_limits<std::size_t>::max() ? length : mFile.size () - start;
 
             if (start != 0)
                 mFile.seek(start);
@@ -109,10 +109,8 @@ namespace Files
     {
     }
 
-    IStreamPtr openConstrainedFileStream(const char *filename,
-                                                       size_t start, size_t length)
+    IStreamPtr openConstrainedFileStream(const std::string& filename, std::size_t start, std::size_t length)
     {
-        auto buf = std::unique_ptr<std::streambuf>(new ConstrainedFileStreamBuf(filename, start, length));
-        return IStreamPtr(new ConstrainedFileStream(std::move(buf)));
+        return std::make_shared<ConstrainedFileStream>(std::make_unique<ConstrainedFileStreamBuf>(filename, start, length));
     }
 }
diff --git a/components/files/constrainedfilestream.hpp b/components/files/constrainedfilestream.hpp
index bf67c7b973..b828f0f6f1 100644
--- a/components/files/constrainedfilestream.hpp
+++ b/components/files/constrainedfilestream.hpp
@@ -3,6 +3,8 @@
 
 #include <istream>
 #include <memory>
+#include <limits>
+#include <string>
 
 namespace Files
 {
@@ -20,7 +22,8 @@ private:
 
 typedef std::shared_ptr<std::istream> IStreamPtr;
 
-IStreamPtr openConstrainedFileStream(const char *filename, size_t start=0, size_t length=0xFFFFFFFF);
+IStreamPtr openConstrainedFileStream(const std::string& filename, std::size_t start = 0,
+    std::size_t length = std::numeric_limits<std::size_t>::max());
 
 }
 
diff --git a/components/vfs/filesystemarchive.cpp b/components/vfs/filesystemarchive.cpp
index 7766a74f49..839f84de57 100644
--- a/components/vfs/filesystemarchive.cpp
+++ b/components/vfs/filesystemarchive.cpp
@@ -78,7 +78,7 @@ namespace VFS
 
     Files::IStreamPtr FileSystemArchiveFile::open()
     {
-        return Files::openConstrainedFileStream(mPath.c_str());
+        return Files::openConstrainedFileStream(mPath);
     }
 
 }

From 6481324eb17facebce712bd799db44840700c18c Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 11 Apr 2022 01:44:07 +0200
Subject: [PATCH 2292/2859] Read when need to skip few bytes

---
 components/esm3/esmreader.hpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/components/esm3/esmreader.hpp b/components/esm3/esmreader.hpp
index ffa7a94d7b..85e3f8a59a 100644
--- a/components/esm3/esmreader.hpp
+++ b/components/esm3/esmreader.hpp
@@ -265,7 +265,14 @@ public:
   // them from native encoding to UTF8 in the process.
   std::string getString(int size);
 
-  void skip(int bytes) { mEsm->seekg(getFileOffset()+bytes); };
+    void skip(std::size_t bytes)
+    {
+        char buffer[4096];
+        if (bytes > std::size(buffer))
+            mEsm->seekg(getFileOffset() + bytes);
+        else
+            mEsm->read(buffer, bytes);
+    }
 
   /// Used for error handling
   [[noreturn]] void fail(const std::string &msg);

From db3f9da08a5b2bc0d9aff0e10809d135261b8238 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Mon, 11 Apr 2022 14:37:22 +0200
Subject: [PATCH 2293/2859] coverity fixes and other bits

---
 components/l10n/messagebundles.cpp | 26 +++++++++++++-------------
 components/l10n/messagebundles.hpp |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/components/l10n/messagebundles.cpp b/components/l10n/messagebundles.cpp
index 9560e60d3b..18036a6136 100644
--- a/components/l10n/messagebundles.cpp
+++ b/components/l10n/messagebundles.cpp
@@ -22,19 +22,19 @@ namespace l10n
         for (const icu::Locale &loc: preferredLocales)
         {
             mPreferredLocales.push_back(loc);
-            mPreferredLocaleStrings.push_back(loc.getName());
+            mPreferredLocaleStrings.emplace_back(loc.getName());
             // Try without variant or country if they are specified, starting with the most specific
             if (strcmp(loc.getVariant(), "") != 0)
             {
                 icu::Locale withoutVariant(loc.getLanguage(), loc.getCountry());
                 mPreferredLocales.push_back(withoutVariant);
-                mPreferredLocaleStrings.push_back(withoutVariant.getName());
+                mPreferredLocaleStrings.emplace_back(withoutVariant.getName());
             }
             if (strcmp(loc.getCountry(), "") != 0)
             {
                 icu::Locale withoutCountry(loc.getLanguage());
                 mPreferredLocales.push_back(withoutCountry);
-                mPreferredLocaleStrings.push_back(withoutCountry.getName());
+                mPreferredLocaleStrings.emplace_back(withoutCountry.getName());
             }
         }
     }
@@ -53,7 +53,7 @@ namespace l10n
         if (status.isFailure())
         {
             std::string errorText = getErrorText(parseError);
-            if (errorText.size())
+            if (!errorText.empty())
             {
                 Log(Debug::Error) << message << ": " << status.errorName() << " in \"" << errorText << "\"";
             }
@@ -73,8 +73,8 @@ namespace l10n
             std::string localeName = lang.getName();
             for (const auto& it: data)
             {
-                std::string key = it.first.as<std::string>();
-                std::string value = it.second.as<std::string>();
+                auto key = it.first.as<std::string>();
+                auto value = it.second.as<std::string>();
                 icu::UnicodeString pattern = icu::UnicodeString::fromUTF8(value);
                 icu::ErrorCode status;
                 UParseError parseError;
@@ -110,10 +110,10 @@ namespace l10n
     {
         std::vector<icu::UnicodeString> argNames;
         std::vector<icu::Formattable> argValues;
-        for (auto& [key, value] : args)
+        for (auto& [k, v] : args)
         {
-            argNames.push_back(icu::UnicodeString::fromUTF8(key));
-            argValues.push_back(value);
+            argNames.push_back(icu::UnicodeString::fromUTF8(k));
+            argValues.push_back(v);
         }
         return formatMessage(key, argNames, argValues);
     }
@@ -137,7 +137,7 @@ namespace l10n
 
         if (message)
         {
-            if (args.size() > 0 && argNames.size() > 0)
+            if (!args.empty() && !argNames.empty())
                 message->format(&argNames[0], &args[0], args.size(), result, success);
             else
                 message->format(nullptr, nullptr, args.size(), result, success);
@@ -145,8 +145,8 @@ namespace l10n
             result.toUTF8String(resultString);
             return resultString;
         }
-        icu::Locale defaultLocale(NULL);
-        if (mPreferredLocales.size() > 0)
+        icu::Locale defaultLocale(nullptr);
+        if (!mPreferredLocales.empty())
         {
              defaultLocale = mPreferredLocales[0];
         }
@@ -156,7 +156,7 @@ namespace l10n
             // If we can't parse the key as a pattern, just return the key
             return std::string(key);
 
-        if (args.size() > 0 && argNames.size() > 0)
+        if (!args.empty() && !argNames.empty())
             defaultMessage.format(&argNames[0], &args[0], args.size(), result, success);
         else
             defaultMessage.format(nullptr, nullptr, args.size(), result, success);
diff --git a/components/l10n/messagebundles.hpp b/components/l10n/messagebundles.hpp
index 02333fad2c..1a4636c95a 100644
--- a/components/l10n/messagebundles.hpp
+++ b/components/l10n/messagebundles.hpp
@@ -38,7 +38,7 @@ namespace l10n
         void setPreferredLocales(const std::vector<icu::Locale> &preferredLocales);
         const std::vector<icu::Locale> & getPreferredLocales() const { return mPreferredLocales; }
         void load(std::istream &input, const icu::Locale &lang, const std::string &path);
-        bool isLoaded(icu::Locale loc) const { return mBundles.find(loc.getName()) != mBundles.end(); }
+        bool isLoaded(const icu::Locale& loc) const { return mBundles.find(loc.getName()) != mBundles.end(); }
         const icu::Locale & getFallbackLocale() const { return mFallbackLocale; }
 
     private:

From 035fe778b2974987ca342ed1b4ccccf173d08cff Mon Sep 17 00:00:00 2001
From: Vidi_Aquam <89811652+VidiAquam@users.noreply.github.com>
Date: Mon, 11 Apr 2022 08:12:38 -0500
Subject: [PATCH 2294/2859] Temporary workaround for angle snapping

Made the angle snap only apply to an object when the drag is finished, which is much more usable until the rotation system can be fixed completely
---
 apps/opencs/view/render/instancemode.cpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index e9a375f10d..a84b26ca51 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -628,14 +628,6 @@ void CSVRender::InstanceMode::drag (const QPoint& pos, int diffX, int diffY, dou
                     position.rot[2] = euler.z();
                 }
 
-                if (mDragMode == DragMode_Rotate_Snap)
-                {
-                    double snap = CSMPrefs::get()["3D Scene Editing"]["gridsnap-rotation"].toDouble();
-                    position.rot[0] = CSVRender::InstanceMode::roundFloatToMult(position.rot[0], osg::DegreesToRadians(snap));
-                    position.rot[1] = CSVRender::InstanceMode::roundFloatToMult(position.rot[1], osg::DegreesToRadians(snap));
-                    position.rot[2] = CSVRender::InstanceMode::roundFloatToMult(position.rot[2], osg::DegreesToRadians(snap));
-                }
-
                 objectTag->mObject->setRotation(position.rot);
             }
             else if (mDragMode == DragMode_Scale || mDragMode == DragMode_Scale_Snap)
@@ -702,6 +694,17 @@ void CSVRender::InstanceMode::dragCompleted(const QPoint& pos)
     {
         if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (iter->get()))
         {
+            if (mDragMode == DragMode_Rotate_Snap)
+            {
+                ESM::Position position = objectTag->mObject->getPosition();
+                double snap = CSMPrefs::get()["3D Scene Editing"]["gridsnap-rotation"].toDouble();
+                position.rot[0] = CSVRender::InstanceMode::roundFloatToMult(position.rot[0], osg::DegreesToRadians(snap));
+                position.rot[1] = CSVRender::InstanceMode::roundFloatToMult(position.rot[1], osg::DegreesToRadians(snap));
+                position.rot[2] = CSVRender::InstanceMode::roundFloatToMult(position.rot[2], osg::DegreesToRadians(snap));
+
+                objectTag->mObject->setRotation(position.rot);
+            }
+
             objectTag->mObject->apply (macro);
         }
     }

From 7fe6c39aa21b5fb24295261d511cae3b7aa6d843 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Mon, 11 Apr 2022 16:59:46 +0200
Subject: [PATCH 2295/2859] const the key/value

---
 components/l10n/messagebundles.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/l10n/messagebundles.cpp b/components/l10n/messagebundles.cpp
index 18036a6136..d02735313e 100644
--- a/components/l10n/messagebundles.cpp
+++ b/components/l10n/messagebundles.cpp
@@ -73,8 +73,8 @@ namespace l10n
             std::string localeName = lang.getName();
             for (const auto& it: data)
             {
-                auto key = it.first.as<std::string>();
-                auto value = it.second.as<std::string>();
+                const auto key = it.first.as<std::string>();
+                const auto value = it.second.as<std::string>();
                 icu::UnicodeString pattern = icu::UnicodeString::fromUTF8(value);
                 icu::ErrorCode status;
                 UParseError parseError;

From e2f393cbdb02287f00bc663b30e1b3c732697882 Mon Sep 17 00:00:00 2001
From: VidiAquam <11267882-VidiAquam@users.noreply.gitlab.com>
Date: Mon, 11 Apr 2022 15:36:05 +0000
Subject: [PATCH 2296/2859] Update CHANGELOG.md, AUTHORS.md

---
 AUTHORS.md   | 1 +
 CHANGELOG.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/AUTHORS.md b/AUTHORS.md
index 84f465414e..b2050ef0bb 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -226,6 +226,7 @@ Programmers
     unelsson
     uramer
     viadanna
+    Vidi_Aquam
     Vincent Heuken
     Vladimir Panteleev (CyberShadow)
     Wang Ryu (bzzt)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c665740ac..7401894d25 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -114,6 +114,7 @@
     Feature #2491: Ability to make OpenMW "portable"
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
     Feature #2780: A way to see current OpenMW version in the console
+    Feature #3245: Grid and angle snapping for the OpenMW-CS
     Feature #3616: Allow Zoom levels on the World Map
     Feature #4297: Implement APPLIED_ONCE flag for magic effects
     Feature #4414: Handle duration of EXTRA SPELL magic effect

From 39da3bfef8c7d26087787b9c6d14caa222d656b9 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 11 Apr 2022 19:30:54 +0200
Subject: [PATCH 2297/2859] Ignore player when checking whether AiTravel
 destination is occupied by other actor

---
 apps/openmw/mwbase/world.hpp                  |  3 +-
 apps/openmw/mwmechanics/aitravel.cpp          |  2 +-
 apps/openmw/mwmechanics/obstacle.cpp          | 12 +++++--
 apps/openmw/mwmechanics/obstacle.hpp          |  2 +-
 .../mwphysics/hasspherecollisioncallback.hpp  | 12 +++----
 apps/openmw/mwphysics/physicssystem.cpp       | 27 +++++++++-----
 apps/openmw/mwphysics/physicssystem.hpp       |  4 ++-
 apps/openmw/mwworld/worldimp.cpp              |  2 +-
 apps/openmw/mwworld/worldimp.hpp              |  2 +-
 components/misc/span.hpp                      | 36 +++++++++++++++++++
 10 files changed, 80 insertions(+), 22 deletions(-)
 create mode 100644 components/misc/span.hpp

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 625758d640..6479a1a404 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -10,6 +10,7 @@
 
 #include <components/esm3/cellid.hpp>
 #include <components/misc/rng.hpp>
+#include <components/misc/span.hpp>
 
 #include <osg/Timer>
 
@@ -658,7 +659,7 @@ namespace MWBase
             virtual bool hasCollisionWithDoor(const MWWorld::ConstPtr& door, const osg::Vec3f& position, const osg::Vec3f& destination) const = 0;
 
             virtual bool isAreaOccupiedByOtherActor(const osg::Vec3f& position, const float radius,
-                const MWWorld::ConstPtr& ignore, std::vector<MWWorld::Ptr>* occupyingActors = nullptr) const = 0;
+                const Misc::Span<const MWWorld::ConstPtr>& ignore, std::vector<MWWorld::Ptr>* occupyingActors = nullptr) const = 0;
 
             virtual void reportStats(unsigned int frameNumber, osg::Stats& stats) const = 0;
 
diff --git a/apps/openmw/mwmechanics/aitravel.cpp b/apps/openmw/mwmechanics/aitravel.cpp
index 919685e93d..770d2f7ba6 100644
--- a/apps/openmw/mwmechanics/aitravel.cpp
+++ b/apps/openmw/mwmechanics/aitravel.cpp
@@ -83,7 +83,7 @@ namespace MWMechanics
         if (mDestinationCheck.update(duration) == Misc::TimerStatus::Elapsed)
         {
             std::vector<MWWorld::Ptr> occupyingActors;
-            if (isAreaOccupiedByOtherActor(actor, targetPos, &occupyingActors))
+            if (isAreaOccupiedByOtherActor(actor, targetPos, true, &occupyingActors))
             {
                 const float actorRadius = getActorRadius(actor);
                 const float distanceToTarget = distance(actorPos, targetPos);
diff --git a/apps/openmw/mwmechanics/obstacle.cpp b/apps/openmw/mwmechanics/obstacle.cpp
index 344cc82058..3d64eae862 100644
--- a/apps/openmw/mwmechanics/obstacle.cpp
+++ b/apps/openmw/mwmechanics/obstacle.cpp
@@ -1,5 +1,7 @@
 #include "obstacle.hpp"
 
+#include <array>
+
 #include <components/sceneutil/positionattitudetransform.hpp>
 
 #include "../mwworld/class.hpp"
@@ -74,13 +76,19 @@ namespace MWMechanics
         return MWWorld::Ptr(); // none found
     }
 
-    bool isAreaOccupiedByOtherActor(const MWWorld::ConstPtr& actor, const osg::Vec3f& destination,
+    bool isAreaOccupiedByOtherActor(const MWWorld::ConstPtr& actor, const osg::Vec3f& destination, bool ignorePlayer,
         std::vector<MWWorld::Ptr>* occupyingActors)
     {
         const auto world = MWBase::Environment::get().getWorld();
         const osg::Vec3f halfExtents = world->getPathfindingHalfExtents(actor);
         const auto maxHalfExtent = std::max(halfExtents.x(), std::max(halfExtents.y(), halfExtents.z()));
-        return world->isAreaOccupiedByOtherActor(destination, 2 * maxHalfExtent, actor, occupyingActors);
+        if (ignorePlayer)
+        {
+            const std::array ignore {actor, world->getPlayerConstPtr()};
+            return world->isAreaOccupiedByOtherActor(destination, 2 * maxHalfExtent, ignore, occupyingActors);
+        }
+        const std::array ignore {actor};
+        return world->isAreaOccupiedByOtherActor(destination, 2 * maxHalfExtent, ignore, occupyingActors);
     }
 
     ObstacleCheck::ObstacleCheck()
diff --git a/apps/openmw/mwmechanics/obstacle.hpp b/apps/openmw/mwmechanics/obstacle.hpp
index 24bd5ed1c1..2026f22129 100644
--- a/apps/openmw/mwmechanics/obstacle.hpp
+++ b/apps/openmw/mwmechanics/obstacle.hpp
@@ -24,7 +24,7 @@ namespace MWMechanics
     /** \return Pointer to the door, or empty pointer if none exists **/
     const MWWorld::Ptr getNearbyDoor(const MWWorld::Ptr& actor, float minDist);
 
-    bool isAreaOccupiedByOtherActor(const MWWorld::ConstPtr& actor, const osg::Vec3f& destination,
+    bool isAreaOccupiedByOtherActor(const MWWorld::ConstPtr& actor, const osg::Vec3f& destination, bool ignorePlayer = false,
         std::vector<MWWorld::Ptr>* occupyingActors = nullptr);
 
     class ObstacleCheck
diff --git a/apps/openmw/mwphysics/hasspherecollisioncallback.hpp b/apps/openmw/mwphysics/hasspherecollisioncallback.hpp
index a01ab96301..2d271a8fba 100644
--- a/apps/openmw/mwphysics/hasspherecollisioncallback.hpp
+++ b/apps/openmw/mwphysics/hasspherecollisioncallback.hpp
@@ -22,15 +22,15 @@ namespace MWPhysics
         return nearest.distance(position) < radius;
     }
 
-    template <class OnCollision>
+    template <class Ignore, class OnCollision>
     class HasSphereCollisionCallback final : public btBroadphaseAabbCallback
     {
     public:
-        HasSphereCollisionCallback(const btVector3& position, const btScalar radius, btCollisionObject* object,
-                const int mask, const int group, OnCollision* onCollision)
+        HasSphereCollisionCallback(const btVector3& position, const btScalar radius, const int mask, const int group,
+                                   const Ignore& ignore, OnCollision* onCollision)
             : mPosition(position),
               mRadius(radius),
-              mCollisionObject(object),
+              mIgnore(ignore),
               mCollisionFilterMask(mask),
               mCollisionFilterGroup(group),
               mOnCollision(onCollision)
@@ -42,7 +42,7 @@ namespace MWPhysics
             if (mResult && mOnCollision == nullptr)
                 return false;
             const auto collisionObject = static_cast<btCollisionObject*>(proxy->m_clientObject);
-            if (collisionObject == mCollisionObject
+            if (mIgnore(collisionObject)
                 || !needsCollision(*proxy)
                 || !testAabbAgainstSphere(proxy->m_aabbMin, proxy->m_aabbMax, mPosition, mRadius))
                 return true;
@@ -63,7 +63,7 @@ namespace MWPhysics
     private:
         btVector3 mPosition;
         btScalar mRadius;
-        btCollisionObject* mCollisionObject;
+        Ignore mIgnore;
         int mCollisionFilterMask;
         int mCollisionFilterGroup;
         OnCollision* mOnCollision;
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index bbd3447b6a..06c2420df1 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -2,7 +2,11 @@
 
 #include <LinearMath/btIDebugDraw.h>
 #include <LinearMath/btVector3.h>
+
 #include <memory>
+#include <algorithm>
+#include <vector>
+
 #include <osg/Group>
 #include <osg/Stats>
 #include <osg/Timer>
@@ -884,12 +888,19 @@ namespace MWPhysics
     }
 
     bool PhysicsSystem::isAreaOccupiedByOtherActor(const osg::Vec3f& position, const float radius,
-        const MWWorld::ConstPtr& ignore, std::vector<MWWorld::Ptr>* occupyingActors) const
-    {
-        btCollisionObject* object = nullptr;
-        const auto it = mActors.find(ignore.mRef);
-        if (it != mActors.end())
-            object = it->second->getCollisionObject();
+        const Misc::Span<const MWWorld::ConstPtr>& ignore, std::vector<MWWorld::Ptr>* occupyingActors) const
+    {
+        std::vector<const btCollisionObject*> ignoredObjects;
+        ignoredObjects.reserve(ignore.size());
+        for (const auto& v : ignore)
+            if (const auto it = mActors.find(v.mRef); it != mActors.end())
+                ignoredObjects.push_back(it->second->getCollisionObject());
+        std::sort(ignoredObjects.begin(), ignoredObjects.end());
+        ignoredObjects.erase(std::unique(ignoredObjects.begin(), ignoredObjects.end()), ignoredObjects.end());
+        const auto ignoreFilter = [&] (const btCollisionObject* v)
+        {
+            return std::binary_search(ignoredObjects.begin(), ignoredObjects.end(), v);
+        };
         const auto bulletPosition = Misc::Convert::toBullet(position);
         const auto aabbMin = bulletPosition - btVector3(radius, radius, radius);
         const auto aabbMax = bulletPosition + btVector3(radius, radius, radius);
@@ -897,7 +908,7 @@ namespace MWPhysics
         const int group = 0xff;
         if (occupyingActors == nullptr)
         {
-            HasSphereCollisionCallback callback(bulletPosition, radius, object, mask, group,
+            HasSphereCollisionCallback callback(bulletPosition, radius, mask, group, ignoreFilter,
                                                 static_cast<void (*)(const btCollisionObject*)>(nullptr));
             mTaskScheduler->aabbTest(aabbMin, aabbMax, callback);
             return callback.getResult();
@@ -907,7 +918,7 @@ namespace MWPhysics
             if (PtrHolder* holder = static_cast<PtrHolder*>(object->getUserPointer()))
                 occupyingActors->push_back(holder->getPtr());
         };
-        HasSphereCollisionCallback callback(bulletPosition, radius, object, mask, group, &onCollision);
+        HasSphereCollisionCallback callback(bulletPosition, radius, mask, group, ignoreFilter, &onCollision);
         mTaskScheduler->aabbTest(aabbMin, aabbMax, callback);
         return callback.getResult();
     }
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index b165f10761..4afafede4f 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -16,6 +16,8 @@
 #include <osg/ref_ptr>
 #include <osg/Timer>
 
+#include <components/misc/span.hpp>
+
 #include "../mwworld/ptr.hpp"
 
 #include "collisiontype.hpp"
@@ -277,7 +279,7 @@ namespace MWPhysics
             }
 
             bool isAreaOccupiedByOtherActor(const osg::Vec3f& position, const float radius,
-                const MWWorld::ConstPtr& ignore, std::vector<MWWorld::Ptr>* occupyingActors) const;
+                const Misc::Span<const MWWorld::ConstPtr>& ignore, std::vector<MWWorld::Ptr>* occupyingActors) const;
 
             void reportStats(unsigned int frameNumber, osg::Stats& stats) const;
             void reportCollision(const btVector3& position, const btVector3& normal);
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 7f652d9520..ea2441847f 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -3997,7 +3997,7 @@ namespace MWWorld
     }
 
     bool World::isAreaOccupiedByOtherActor(const osg::Vec3f& position, const float radius,
-        const MWWorld::ConstPtr& ignore, std::vector<MWWorld::Ptr>* occupyingActors) const
+        const Misc::Span<const MWWorld::ConstPtr>& ignore, std::vector<MWWorld::Ptr>* occupyingActors) const
     {
         return mPhysics->isAreaOccupiedByOtherActor(position, radius, ignore, occupyingActors);
     }
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 399b7232de..0dd79fb778 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -736,7 +736,7 @@ namespace MWWorld
             bool hasCollisionWithDoor(const MWWorld::ConstPtr& door, const osg::Vec3f& position, const osg::Vec3f& destination) const override;
 
             bool isAreaOccupiedByOtherActor(const osg::Vec3f& position, const float radius,
-                const MWWorld::ConstPtr& ignore, std::vector<MWWorld::Ptr>* occupyingActors) const override;
+                const Misc::Span<const MWWorld::ConstPtr>& ignore, std::vector<MWWorld::Ptr>* occupyingActors) const override;
 
             void reportStats(unsigned int frameNumber, osg::Stats& stats) const override;
 
diff --git a/components/misc/span.hpp b/components/misc/span.hpp
new file mode 100644
index 0000000000..83a424a674
--- /dev/null
+++ b/components/misc/span.hpp
@@ -0,0 +1,36 @@
+#ifndef OPENMW_COMPONENTS_MISC_SPAN_H
+#define OPENMW_COMPONENTS_MISC_SPAN_H
+
+#include <cstddef>
+
+namespace Misc
+{
+    template <class T>
+    class Span
+    {
+        public:
+            constexpr Span() = default;
+
+            constexpr Span(T* pointer, std::size_t size)
+                : mPointer(pointer)
+                , mSize(size)
+            {}
+
+            template <class Range>
+            constexpr Span(Range& range)
+                : Span(range.data(), range.size())
+            {}
+
+            constexpr T* begin() const { return mPointer; }
+
+            constexpr T* end() const { return mPointer + mSize; }
+
+            constexpr std::size_t size() const { return mSize; }
+
+        private:
+            T* mPointer = nullptr;
+            std::size_t mSize = 0;
+    };
+}
+
+#endif

From a65f8ebbc611667e71b10d10d1fcafc9d6151599 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Mon, 11 Apr 2022 01:04:55 +0200
Subject: [PATCH 2298/2859] Reorganize delayed Lua actions

---
 apps/openmw/CMakeLists.txt           |   2 +-
 apps/openmw/mwlua/actions.cpp        | 180 ---------------------------
 apps/openmw/mwlua/actions.hpp        |  94 --------------
 apps/openmw/mwlua/luamanagerimp.cpp  |  46 +++++++
 apps/openmw/mwlua/luamanagerimp.hpp  |  26 +++-
 apps/openmw/mwlua/objectbindings.cpp |  80 ++++++++++++
 apps/openmw/mwlua/stats.cpp          |  20 +++
 apps/openmw/mwlua/types/actor.cpp    |  97 ++++++++++++++-
 apps/openmw/mwlua/uibindings.cpp     |   5 +-
 9 files changed, 267 insertions(+), 283 deletions(-)
 delete mode 100644 apps/openmw/mwlua/actions.cpp
 delete mode 100644 apps/openmw/mwlua/actions.hpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 3d6469fa33..f67c991958 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -57,7 +57,7 @@ add_openmw_dir (mwscript
     )
 
 add_openmw_dir (mwlua
-    luamanagerimp actions object worldview userdataserializer eventqueue
+    luamanagerimp object worldview userdataserializer eventqueue
     luabindings localscripts playerscripts objectbindings cellbindings asyncbindings settingsbindings
     camerabindings uibindings inputbindings nearbybindings stats
     types/types types/door types/actor types/container types/weapon types/npc
diff --git a/apps/openmw/mwlua/actions.cpp b/apps/openmw/mwlua/actions.cpp
deleted file mode 100644
index 0934b92226..0000000000
--- a/apps/openmw/mwlua/actions.cpp
+++ /dev/null
@@ -1,180 +0,0 @@
-#include "actions.hpp"
-
-#include "localscripts.hpp"
-
-#include <cstring>
-
-#include <components/debug/debuglog.hpp>
-#include <components/lua/luastate.hpp>
-#include <components/settings/settings.hpp>
-
-#include <apps/openmw/mwbase/luamanager.hpp>
-
-#include <apps/openmw/mwworld/action.hpp>
-#include <apps/openmw/mwworld/cellstore.hpp>
-#include <apps/openmw/mwworld/class.hpp>
-#include <apps/openmw/mwworld/inventorystore.hpp>
-#include <apps/openmw/mwworld/player.hpp>
-
-namespace MWLua
-{
-    Action::Action(LuaUtil::LuaState* state)
-    {
-        static const bool luaDebug = Settings::Manager::getBool("lua debug", "Lua");
-        if (luaDebug)
-            mCallerTraceback = state->debugTraceback();
-    }
-
-    void Action::safeApply(WorldView& w) const
-    {
-        try
-        {
-            apply(w);
-        }
-        catch (const std::exception& e)
-        {
-            Log(Debug::Error) << "Error in " << this->toString() << ": " << e.what();
-
-            if (mCallerTraceback.empty())
-                Log(Debug::Error) << "Set 'lua_debug=true' in settings.cfg to enable action tracebacks";
-            else
-                Log(Debug::Error) << "Caller " << mCallerTraceback;
-        }
-    }
-
-    void TeleportAction::apply(WorldView& worldView) const
-    {
-        MWWorld::CellStore* cell = worldView.findCell(mCell, mPos);
-        if (!cell)
-            throw std::runtime_error(std::string("cell not found: '") + mCell + "'");
-
-        MWBase::World* world = MWBase::Environment::get().getWorld();
-        MWWorld::Ptr obj = worldView.getObjectRegistry()->getPtr(mObject, false);
-        const MWWorld::Class& cls = obj.getClass();
-        bool isPlayer = obj == world->getPlayerPtr();
-        if (cls.isActor())
-            cls.getCreatureStats(obj).land(isPlayer);
-        if (isPlayer)
-        {
-            ESM::Position esmPos;
-            static_assert(sizeof(esmPos) == sizeof(osg::Vec3f) * 2);
-            std::memcpy(esmPos.pos, &mPos, sizeof(osg::Vec3f));
-            std::memcpy(esmPos.rot, &mRot, sizeof(osg::Vec3f));
-            world->getPlayer().setTeleported(true);
-            if (cell->isExterior())
-                world->changeToExteriorCell(esmPos, true);
-            else
-                world->changeToInteriorCell(mCell, esmPos, true);
-        }
-        else
-        {
-            MWWorld::Ptr newObj = world->moveObject(obj, cell, mPos);
-            world->rotateObject(newObj, mRot);
-        }
-    }
-
-    void SetEquipmentAction::apply(WorldView& worldView) const
-    {
-        MWWorld::Ptr actor = worldView.getObjectRegistry()->getPtr(mActor, false);
-        MWWorld::InventoryStore& store = actor.getClass().getInventoryStore(actor);
-        std::array<bool, MWWorld::InventoryStore::Slots> usedSlots;
-        std::fill(usedSlots.begin(), usedSlots.end(), false);
-
-        static constexpr int anySlot = -1;
-        auto tryEquipToSlot = [&actor, &store, &usedSlots, &worldView](int slot, const Item& item) -> bool
-        {
-            auto old_it = slot != anySlot ? store.getSlot(slot) : store.end();
-            MWWorld::Ptr itemPtr;
-            if (std::holds_alternative<ObjectId>(item))
-            {
-                itemPtr = worldView.getObjectRegistry()->getPtr(std::get<ObjectId>(item), false);
-                if (old_it != store.end() && *old_it == itemPtr)
-                    return true;  // already equipped
-                if (itemPtr.isEmpty() || itemPtr.getRefData().getCount() == 0 ||
-                    itemPtr.getContainerStore() != static_cast<const MWWorld::ContainerStore*>(&store))
-                {
-                    Log(Debug::Warning) << "Object" << idToString(std::get<ObjectId>(item)) << " is not in inventory";
-                    return false;
-                }
-            }
-            else
-            {
-                const std::string& recordId = std::get<std::string>(item);
-                if (old_it != store.end() && old_it->getCellRef().getRefId() == recordId)
-                    return true;  // already equipped
-                itemPtr = store.search(recordId);
-                if (itemPtr.isEmpty() || itemPtr.getRefData().getCount() == 0)
-                {
-                    Log(Debug::Warning) << "There is no object with recordId='" << recordId << "' in inventory";
-                    return false;
-                }
-            }
-
-            auto [allowedSlots, _] = itemPtr.getClass().getEquipmentSlots(itemPtr);
-            bool requestedSlotIsAllowed = std::find(allowedSlots.begin(), allowedSlots.end(), slot) != allowedSlots.end();
-            if (!requestedSlotIsAllowed)
-            {
-                auto firstAllowed = std::find_if(allowedSlots.begin(), allowedSlots.end(), [&](int s) { return !usedSlots[s]; });
-                if (firstAllowed == allowedSlots.end())
-                {
-                    Log(Debug::Warning) << "No suitable slot for " << ptrToString(itemPtr);
-                    return false;
-                }
-                slot = *firstAllowed;
-            }
-
-            // TODO: Refactor InventoryStore to accept Ptr and get rid of this linear search.
-            MWWorld::ContainerStoreIterator it = std::find(store.begin(), store.end(), itemPtr);
-            if (it == store.end())  // should never happen
-                throw std::logic_error("Item not found in container");
-
-            store.equip(slot, it, actor);
-            return requestedSlotIsAllowed;  // return true if equipped to requested slot and false if slot was changed
-        };
-
-        for (int slot = 0; slot < MWWorld::InventoryStore::Slots; ++slot)
-        {
-            auto old_it = store.getSlot(slot);
-            auto new_it = mEquipment.find(slot);
-            if (new_it == mEquipment.end())
-            {
-                if (old_it != store.end())
-                    store.unequipSlot(slot, actor);
-                continue;
-            }
-            if (tryEquipToSlot(slot, new_it->second))
-                usedSlots[slot] = true;
-        }
-        for (const auto& [slot, item] : mEquipment)
-            if (slot >= MWWorld::InventoryStore::Slots)
-                tryEquipToSlot(anySlot, item);
-    }
-
-    void ActivateAction::apply(WorldView& worldView) const
-    {
-        MWWorld::Ptr object = worldView.getObjectRegistry()->getPtr(mObject, true);
-        if (object.isEmpty())
-            throw std::runtime_error(std::string("Object not found: " + idToString(mObject)));
-        MWWorld::Ptr actor = worldView.getObjectRegistry()->getPtr(mActor, true);
-        if (actor.isEmpty())
-            throw std::runtime_error(std::string("Actor not found: " + idToString(mActor)));
-
-        MWBase::Environment::get().getLuaManager()->objectActivated(object, actor);
-        std::unique_ptr<MWWorld::Action> action = object.getClass().activate(object, actor);
-        action->execute(actor);
-    }
-
-    std::string ActivateAction::toString() const
-    {
-        return std::string("ActivateAction object=") + idToString(mObject) +
-               std::string(" actor=") + idToString(mActor);
-    }
-
-    void StatUpdateAction::apply(WorldView& worldView) const
-    {
-        LObject obj(mId, worldView.getObjectRegistry());
-        LocalScripts* scripts = obj.ptr().getRefData().getLuaScripts();
-        if (scripts)
-            scripts->applyStatsCache();
-    }
-}
diff --git a/apps/openmw/mwlua/actions.hpp b/apps/openmw/mwlua/actions.hpp
deleted file mode 100644
index 30211b6e53..0000000000
--- a/apps/openmw/mwlua/actions.hpp
+++ /dev/null
@@ -1,94 +0,0 @@
-#ifndef MWLUA_ACTIONS_H
-#define MWLUA_ACTIONS_H
-
-#include <variant>
-
-#include "object.hpp"
-#include "worldview.hpp"
-
-namespace LuaUtil
-{
-    class LuaState;
-}
-
-namespace MWLua
-{
-
-    // Some changes to the game world can not be done from the scripting thread (because it runs in parallel with OSG Cull),
-    // so we need to queue it and apply from the main thread. All such changes should be implemented as classes inherited
-    // from MWLua::Action.
-
-    class Action
-    {
-    public:
-        Action(LuaUtil::LuaState* state);
-        virtual ~Action() {}
-
-        void safeApply(WorldView&) const;
-        virtual void apply(WorldView&) const = 0;
-        virtual std::string toString() const = 0;
-
-    private:
-        std::string mCallerTraceback;
-    };
-
-    class TeleportAction final : public Action
-    {
-    public:
-        TeleportAction(LuaUtil::LuaState* state, ObjectId object, std::string cell, const osg::Vec3f& pos, const osg::Vec3f& rot)
-            : Action(state), mObject(object), mCell(std::move(cell)), mPos(pos), mRot(rot) {}
-
-        void apply(WorldView&) const override;
-        std::string toString() const override { return "TeleportAction"; }
-
-    private:
-        ObjectId mObject;
-        std::string mCell;
-        osg::Vec3f mPos;
-        osg::Vec3f mRot;
-    };
-
-    class SetEquipmentAction final : public Action
-    {
-    public:
-        using Item = std::variant<std::string, ObjectId>;  // recordId or ObjectId
-        using Equipment = std::map<int, Item>;  // slot to item
-
-        SetEquipmentAction(LuaUtil::LuaState* state, ObjectId actor, Equipment equipment)
-            : Action(state), mActor(actor), mEquipment(std::move(equipment)) {}
-
-        void apply(WorldView&) const override;
-        std::string toString() const override { return "SetEquipmentAction"; }
-
-    private:
-        ObjectId mActor;
-        Equipment mEquipment;
-    };
-
-    class ActivateAction final : public Action
-    {
-    public:
-        ActivateAction(LuaUtil::LuaState* state, ObjectId object, ObjectId actor)
-            : Action(state), mObject(object), mActor(actor) {}
-
-        void apply(WorldView&) const override;
-        std::string toString() const override;
-
-    private:
-        ObjectId mObject;
-        ObjectId mActor;
-    };
-
-    class StatUpdateAction final : public Action
-    {
-        ObjectId mId;
-    public:
-        StatUpdateAction(LuaUtil::LuaState* state, ObjectId id) : Action(state), mId(id) {}
-
-        void apply(WorldView& worldView) const override;
-
-        std::string toString() const override { return "StatUpdateAction"; }
-    };
-}
-
-#endif // MWLUA_ACTIONS_H
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index e2037049d8..692b089bdb 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -501,4 +501,50 @@ namespace MWLua
             scripts->receiveEngineEvent(LocalScripts::OnActive());
     }
 
+    LuaManager::Action::Action(LuaUtil::LuaState* state)
+    {
+        static const bool luaDebug = Settings::Manager::getBool("lua debug", "Lua");
+        if (luaDebug)
+            mCallerTraceback = state->debugTraceback();
+    }
+
+    void LuaManager::Action::safeApply(WorldView& w) const
+    {
+        try
+        {
+            apply(w);
+        }
+        catch (const std::exception& e)
+        {
+            Log(Debug::Error) << "Error in " << this->toString() << ": " << e.what();
+
+            if (mCallerTraceback.empty())
+                Log(Debug::Error) << "Set 'lua_debug=true' in settings.cfg to enable action tracebacks";
+            else
+                Log(Debug::Error) << "Caller " << mCallerTraceback;
+        }
+    }
+
+    namespace
+    {
+        class FunctionAction final : public LuaManager::Action
+        {
+        public:
+            FunctionAction(LuaUtil::LuaState* state, std::function<void()> fn, std::string_view name)
+                : Action(state), mFn(std::move(fn)), mName(name) {}
+
+            void apply(WorldView&) const override { mFn(); }
+            std::string toString() const override { return "FunctionAction " + mName; }
+
+        private:
+            std::function<void()> mFn;
+            std::string mName;
+        };
+    }
+
+    void LuaManager::addAction(std::function<void()> action, std::string_view name)
+    {
+        mActionQueue.push_back(std::make_unique<FunctionAction>(&mLua, std::move(action), name));
+    }
+
 }
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index e6f5af78be..43f5d9c3b6 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -12,7 +12,6 @@
 
 #include "../mwbase/luamanager.hpp"
 
-#include "actions.hpp"
 #include "object.hpp"
 #include "eventqueue.hpp"
 #include "globalscripts.hpp"
@@ -60,9 +59,28 @@ namespace MWLua
 
         // Used only in Lua bindings
         void addCustomLocalScript(const MWWorld::Ptr&, int scriptId);
-        void addAction(std::unique_ptr<Action>&& action) { mActionQueue.push_back(std::move(action)); }
-        void addTeleportPlayerAction(std::unique_ptr<TeleportAction>&& action) { mTeleportPlayerAction = std::move(action); }
         void addUIMessage(std::string_view message) { mUIMessages.emplace_back(message); }
+        
+        // Some changes to the game world can not be done from the scripting thread (because it runs in parallel with OSG Cull),
+        // so we need to queue it and apply from the main thread. All such changes should be implemented as classes inherited
+        // from MWLua::Action.
+        class Action
+        {
+        public:
+            Action(LuaUtil::LuaState* state);
+            virtual ~Action() {}
+
+            void safeApply(WorldView&) const;
+            virtual void apply(WorldView&) const = 0;
+            virtual std::string toString() const = 0;
+
+        private:
+            std::string mCallerTraceback;
+        };
+
+        void addAction(std::function<void()> action, std::string_view name = "");
+        void addAction(std::unique_ptr<Action>&& action) { mActionQueue.push_back(std::move(action)); }
+        void addTeleportPlayerAction(std::unique_ptr<Action>&& action) { mTeleportPlayerAction = std::move(action); }
 
         // Saving
         void write(ESM::ESMWriter& writer, Loading::Listener& progress) override;
@@ -149,7 +167,7 @@ namespace MWLua
 
         // Queued actions that should be done in main thread. Processed by applyQueuedChanges().
         std::vector<std::unique_ptr<Action>> mActionQueue;
-        std::unique_ptr<TeleportAction> mTeleportPlayerAction;
+        std::unique_ptr<Action> mTeleportPlayerAction;
         std::vector<std::string> mUIMessages;
 
         LuaUtil::LuaStorage mGlobalStorage{mLua.sol()};
diff --git a/apps/openmw/mwlua/objectbindings.cpp b/apps/openmw/mwlua/objectbindings.cpp
index 08435583df..0bf3fc99c5 100644
--- a/apps/openmw/mwlua/objectbindings.cpp
+++ b/apps/openmw/mwlua/objectbindings.cpp
@@ -2,9 +2,12 @@
 
 #include <components/lua/luastate.hpp>
 
+#include "../mwworld/action.hpp"
+#include "../mwworld/cellstore.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/inventorystore.hpp"
+#include "../mwworld/player.hpp"
 
 #include "eventqueue.hpp"
 #include "luamanagerimp.hpp"
@@ -31,6 +34,83 @@ namespace MWLua
 
     namespace {
 
+        class TeleportAction final : public LuaManager::Action
+        {
+        public:
+            TeleportAction(LuaUtil::LuaState* state, ObjectId object, std::string cell, const osg::Vec3f& pos, const osg::Vec3f& rot)
+                : Action(state), mObject(object), mCell(std::move(cell)), mPos(pos), mRot(rot) {}
+
+            void apply(WorldView& worldView) const override
+            {
+                MWWorld::CellStore* cell = worldView.findCell(mCell, mPos);
+                if (!cell)
+                    throw std::runtime_error(std::string("cell not found: '") + mCell + "'");
+
+                MWBase::World* world = MWBase::Environment::get().getWorld();
+                MWWorld::Ptr obj = worldView.getObjectRegistry()->getPtr(mObject, false);
+                const MWWorld::Class& cls = obj.getClass();
+                bool isPlayer = obj == world->getPlayerPtr();
+                if (cls.isActor())
+                    cls.getCreatureStats(obj).land(isPlayer);
+                if (isPlayer)
+                {
+                    ESM::Position esmPos;
+                    static_assert(sizeof(esmPos) == sizeof(osg::Vec3f) * 2);
+                    std::memcpy(esmPos.pos, &mPos, sizeof(osg::Vec3f));
+                    std::memcpy(esmPos.rot, &mRot, sizeof(osg::Vec3f));
+                    world->getPlayer().setTeleported(true);
+                    if (cell->isExterior())
+                        world->changeToExteriorCell(esmPos, true);
+                    else
+                        world->changeToInteriorCell(mCell, esmPos, true);
+                }
+                else
+                {
+                    MWWorld::Ptr newObj = world->moveObject(obj, cell, mPos);
+                    world->rotateObject(newObj, mRot);
+                }
+            }
+
+            std::string toString() const override { return "TeleportAction"; }
+
+        private:
+            ObjectId mObject;
+            std::string mCell;
+            osg::Vec3f mPos;
+            osg::Vec3f mRot;
+        };
+
+        class ActivateAction final : public LuaManager::Action
+        {
+        public:
+            ActivateAction(LuaUtil::LuaState* state, ObjectId object, ObjectId actor)
+                : Action(state), mObject(object), mActor(actor) {}
+
+            void apply(WorldView& worldView) const override
+            {
+                MWWorld::Ptr object = worldView.getObjectRegistry()->getPtr(mObject, true);
+                if (object.isEmpty())
+                    throw std::runtime_error(std::string("Object not found: " + idToString(mObject)));
+                MWWorld::Ptr actor = worldView.getObjectRegistry()->getPtr(mActor, true);
+                if (actor.isEmpty())
+                    throw std::runtime_error(std::string("Actor not found: " + idToString(mActor)));
+
+                MWBase::Environment::get().getLuaManager()->objectActivated(object, actor);
+                std::unique_ptr<MWWorld::Action> action = object.getClass().activate(object, actor);
+                action->execute(actor);
+            }
+
+            std::string toString() const override
+            {
+                return std::string("ActivateAction object=") + idToString(mObject) +
+                       std::string(" actor=") + idToString(mActor);
+            }
+
+        private:
+            ObjectId mObject;
+            ObjectId mActor;
+        };
+    
         template <typename ObjT>
         using Cell = std::conditional_t<std::is_same_v<ObjT, LObject>, LCell, GCell>;
 
diff --git a/apps/openmw/mwlua/stats.cpp b/apps/openmw/mwlua/stats.cpp
index 36d7cf6538..f81293513d 100644
--- a/apps/openmw/mwlua/stats.cpp
+++ b/apps/openmw/mwlua/stats.cpp
@@ -79,6 +79,26 @@ namespace
 
 namespace MWLua
 {
+    namespace
+    {
+        class StatUpdateAction final : public LuaManager::Action
+        {
+            ObjectId mId;
+        public:
+            StatUpdateAction(LuaUtil::LuaState* state, ObjectId id) : Action(state), mId(id) {}
+
+            void apply(WorldView& worldView) const override
+            {
+                LObject obj(mId, worldView.getObjectRegistry());
+                LocalScripts* scripts = obj.ptr().getRefData().getLuaScripts();
+                if (scripts)
+                    scripts->applyStatsCache();
+            }
+
+            std::string toString() const override { return "StatUpdateAction"; }
+        };
+    }
+
     class LevelStat
     {
         StatObject mObject;
diff --git a/apps/openmw/mwlua/types/actor.cpp b/apps/openmw/mwlua/types/actor.cpp
index 335ba517d5..98ff5148d5 100644
--- a/apps/openmw/mwlua/types/actor.cpp
+++ b/apps/openmw/mwlua/types/actor.cpp
@@ -6,7 +6,6 @@
 #include <apps/openmw/mwworld/inventorystore.hpp>
 #include <apps/openmw/mwworld/class.hpp>
 
-#include "../actions.hpp"
 #include "../luabindings.hpp"
 #include "../localscripts.hpp"
 #include "../luamanagerimp.hpp"
@@ -14,6 +13,102 @@
 
 namespace MWLua
 {
+    namespace
+    {
+        class SetEquipmentAction final : public LuaManager::Action
+        {
+        public:
+            using Item = std::variant<std::string, ObjectId>;  // recordId or ObjectId
+            using Equipment = std::map<int, Item>;  // slot to item
+
+            SetEquipmentAction(LuaUtil::LuaState* state, ObjectId actor, Equipment equipment)
+                : Action(state), mActor(actor), mEquipment(std::move(equipment)) {}
+
+            void apply(WorldView& worldView) const override
+            {
+                MWWorld::Ptr actor = worldView.getObjectRegistry()->getPtr(mActor, false);
+                MWWorld::InventoryStore& store = actor.getClass().getInventoryStore(actor);
+                std::array<bool, MWWorld::InventoryStore::Slots> usedSlots;
+                std::fill(usedSlots.begin(), usedSlots.end(), false);
+
+                static constexpr int anySlot = -1;
+                auto tryEquipToSlot = [&actor, &store, &usedSlots, &worldView](int slot, const Item& item) -> bool
+                {
+                    auto old_it = slot != anySlot ? store.getSlot(slot) : store.end();
+                    MWWorld::Ptr itemPtr;
+                    if (std::holds_alternative<ObjectId>(item))
+                    {
+                        itemPtr = worldView.getObjectRegistry()->getPtr(std::get<ObjectId>(item), false);
+                        if (old_it != store.end() && *old_it == itemPtr)
+                            return true;  // already equipped
+                        if (itemPtr.isEmpty() || itemPtr.getRefData().getCount() == 0 ||
+                            itemPtr.getContainerStore() != static_cast<const MWWorld::ContainerStore*>(&store))
+                        {
+                            Log(Debug::Warning) << "Object" << idToString(std::get<ObjectId>(item)) << " is not in inventory";
+                            return false;
+                        }
+                    }
+                    else
+                    {
+                        const std::string& recordId = std::get<std::string>(item);
+                        if (old_it != store.end() && old_it->getCellRef().getRefId() == recordId)
+                            return true;  // already equipped
+                        itemPtr = store.search(recordId);
+                        if (itemPtr.isEmpty() || itemPtr.getRefData().getCount() == 0)
+                        {
+                            Log(Debug::Warning) << "There is no object with recordId='" << recordId << "' in inventory";
+                            return false;
+                        }
+                    }
+
+                    auto [allowedSlots, _] = itemPtr.getClass().getEquipmentSlots(itemPtr);
+                    bool requestedSlotIsAllowed = std::find(allowedSlots.begin(), allowedSlots.end(), slot) != allowedSlots.end();
+                    if (!requestedSlotIsAllowed)
+                    {
+                        auto firstAllowed = std::find_if(allowedSlots.begin(), allowedSlots.end(), [&](int s) { return !usedSlots[s]; });
+                        if (firstAllowed == allowedSlots.end())
+                        {
+                            Log(Debug::Warning) << "No suitable slot for " << ptrToString(itemPtr);
+                            return false;
+                        }
+                        slot = *firstAllowed;
+                    }
+
+                    // TODO: Refactor InventoryStore to accept Ptr and get rid of this linear search.
+                    MWWorld::ContainerStoreIterator it = std::find(store.begin(), store.end(), itemPtr);
+                    if (it == store.end())  // should never happen
+                        throw std::logic_error("Item not found in container");
+
+                    store.equip(slot, it, actor);
+                    return requestedSlotIsAllowed;  // return true if equipped to requested slot and false if slot was changed
+                };
+
+                for (int slot = 0; slot < MWWorld::InventoryStore::Slots; ++slot)
+                {
+                    auto old_it = store.getSlot(slot);
+                    auto new_it = mEquipment.find(slot);
+                    if (new_it == mEquipment.end())
+                    {
+                        if (old_it != store.end())
+                            store.unequipSlot(slot, actor);
+                        continue;
+                    }
+                    if (tryEquipToSlot(slot, new_it->second))
+                        usedSlots[slot] = true;
+                }
+                for (const auto& [slot, item] : mEquipment)
+                    if (slot >= MWWorld::InventoryStore::Slots)
+                        tryEquipToSlot(anySlot, item);
+            }
+
+            std::string toString() const override { return "SetEquipmentAction"; }
+
+        private:
+            ObjectId mActor;
+            Equipment mEquipment;
+        };
+    }
+    
     using SelfObject = LocalScripts::SelfObject;
 
     void addActorBindings(sol::table actor, const Context& context)
diff --git a/apps/openmw/mwlua/uibindings.cpp b/apps/openmw/mwlua/uibindings.cpp
index fdad57b13d..f82dd3db00 100644
--- a/apps/openmw/mwlua/uibindings.cpp
+++ b/apps/openmw/mwlua/uibindings.cpp
@@ -10,14 +10,13 @@
 #include <components/misc/stringops.hpp>
 
 #include "context.hpp"
-#include "actions.hpp"
 #include "luamanagerimp.hpp"
 
 namespace MWLua
 {
     namespace
     {
-        class UiAction final : public Action
+        class UiAction final : public LuaManager::Action
         {
             public:
                 enum Type
@@ -81,7 +80,7 @@ namespace MWLua
                 std::shared_ptr<LuaUi::Element> mElement;
         };
 
-        class InsertLayerAction final : public Action
+        class InsertLayerAction final : public LuaManager::Action
         {
             public:
                 InsertLayerAction(std::string_view name, size_t index,

From 51845e95536bdb29c86569c3c6481c06446215d4 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Fri, 18 Mar 2022 00:27:16 +0100
Subject: [PATCH 2299/2859] Rendering raycasts in Lua

---
 apps/openmw/mwbase/world.hpp         |  4 ++++
 apps/openmw/mwlua/luabindings.cpp    |  2 +-
 apps/openmw/mwlua/luamanagerimp.cpp  |  2 ++
 apps/openmw/mwlua/luamanagerimp.hpp  |  3 +++
 apps/openmw/mwlua/nearbybindings.cpp | 22 ++++++++++++++++++++++
 apps/openmw/mwphysics/raycasting.hpp | 11 ++++++-----
 apps/openmw/mwworld/worldimp.cpp     | 19 +++++++++++++++++++
 apps/openmw/mwworld/worldimp.hpp     |  3 +++
 files/lua_api/openmw/nearby.lua      | 17 +++++++++++++++++
 9 files changed, 77 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 625758d640..f90794fc52 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -57,6 +57,7 @@ namespace ESM
 
 namespace MWPhysics
 {
+    class RayCastingResult;
     class RayCastingInterface;
 }
 
@@ -331,6 +332,9 @@ namespace MWBase
 
             virtual bool castRay(const osg::Vec3f& from, const osg::Vec3f& to, int mask, const MWWorld::ConstPtr& ignore) = 0;
 
+            virtual bool castRenderingRay(MWPhysics::RayCastingResult& res, const osg::Vec3f& from, const osg::Vec3f& to,
+                                          bool ignorePlayer, bool ignoreActors) = 0;
+
             virtual void setActorCollisionMode(const MWWorld::Ptr& ptr, bool internal, bool external) = 0;
             virtual bool isActorCollisionEnabled(const MWWorld::Ptr& ptr) = 0;
 
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index c88045ae84..3c2023ff5f 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -41,7 +41,7 @@ namespace MWLua
     {
         auto* lua = context.mLua;
         sol::table api(lua->sol(), sol::create);
-        api["API_REVISION"] = 20;
+        api["API_REVISION"] = 21;
         api["quit"] = [lua]()
         {
             Log(Debug::Warning) << "Quit requested by a Lua script.\n" << lua->debugTraceback();
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 692b089bdb..aa2d5baa6f 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -226,6 +226,7 @@ namespace MWLua
             return;  // The game is not started yet.
 
         // We apply input events in `synchronizedUpdate` rather than in `update` in order to reduce input latency.
+        mProcessingInputEvents = true;
         PlayerScripts* playerScripts = dynamic_cast<PlayerScripts*>(mPlayer.getRefData().getLuaScripts());
         if (playerScripts && !MWBase::Environment::get().getWindowManager()->containsMode(MWGui::GM_MainMenu))
         {
@@ -235,6 +236,7 @@ namespace MWLua
         mInputEvents.clear();
         if (playerScripts && !mWorldView.isPaused())
             playerScripts->inputUpdate(MWBase::Environment::get().getFrameDuration());
+        mProcessingInputEvents = false;
 
         MWBase::WindowManager* windowManager = MWBase::Environment::get().getWindowManager();
         for (const std::string& message : mUIMessages)
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index 43f5d9c3b6..fd9ec8b172 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -111,12 +111,15 @@ namespace MWLua
 
         LuaUi::ResourceManager* uiResourceManager() { return &mUiResourceManager; }
 
+        bool isProcessingInputEvents() const { return mProcessingInputEvents; }
+
     private:
         void initConfiguration();
         LocalScripts* createLocalScripts(const MWWorld::Ptr& ptr, ESM::LuaScriptCfg::Flags);
 
         bool mInitialized = false;
         bool mGlobalScriptsStarted = false;
+        bool mProcessingInputEvents = false;
         LuaUtil::ScriptsConfiguration mConfiguration;
         LuaUtil::LuaState mLua;
         LuaUi::ResourceManager mUiResourceManager;
diff --git a/apps/openmw/mwlua/nearbybindings.cpp b/apps/openmw/mwlua/nearbybindings.cpp
index 05bc52c5cc..6ce78e569f 100644
--- a/apps/openmw/mwlua/nearbybindings.cpp
+++ b/apps/openmw/mwlua/nearbybindings.cpp
@@ -6,6 +6,7 @@
 #include "../mwbase/world.hpp"
 #include "../mwphysics/raycasting.hpp"
 
+#include "luamanagerimp.hpp"
 #include "worldview.hpp"
 
 namespace sol
@@ -91,6 +92,27 @@ namespace MWLua
             //       and use this callback from the main thread at the beginning of the next frame processing.
             rayCasting->asyncCastRay(callback, from, to, ignore, std::vector<MWWorld::Ptr>(), collisionType);
         };*/
+        api["castRenderingRay"] = [manager=context.mLuaManager](const osg::Vec3f& from, const osg::Vec3f& to)
+        {
+            if (!manager->isProcessingInputEvents())
+            {
+                throw std::logic_error("castRenderingRay can be used only in player scripts during processing of input events; "
+                                       "use asyncCastRenderingRay instead.");
+            }
+            MWPhysics::RayCastingResult res;
+            MWBase::Environment::get().getWorld()->castRenderingRay(res, from, to, false, false);
+            return res;
+        };
+        api["asyncCastRenderingRay"] =
+            [manager=context.mLuaManager](const LuaUtil::Callback& callback, const osg::Vec3f& from, const osg::Vec3f& to)
+        {
+            manager->addAction([manager, callback, from, to]
+            {
+                MWPhysics::RayCastingResult res;
+                MWBase::Environment::get().getWorld()->castRenderingRay(res, from, to, false, false);
+                manager->queueCallback(callback, sol::make_object(callback.mFunc.lua_state(), res));
+            });
+        };
 
         api["activators"] = LObjectList{worldView->getActivatorsInScene()};
         api["actors"] = LObjectList{worldView->getActorsInScene()};
diff --git a/apps/openmw/mwphysics/raycasting.hpp b/apps/openmw/mwphysics/raycasting.hpp
index d00f23e2c4..848f17a01a 100644
--- a/apps/openmw/mwphysics/raycasting.hpp
+++ b/apps/openmw/mwphysics/raycasting.hpp
@@ -9,12 +9,13 @@
 
 namespace MWPhysics
 {
-    struct RayCastingResult
+    class RayCastingResult
     {
-        bool mHit;
-        osg::Vec3f mHitPos;
-        osg::Vec3f mHitNormal;
-        MWWorld::Ptr mHitObject;
+        public:
+            bool mHit;
+            osg::Vec3f mHitPos;
+            osg::Vec3f mHitNormal;
+            MWWorld::Ptr mHitObject;
     };
 
     class RayCastingInterface
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 7f652d9520..4d3f4aa7ec 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -2042,6 +2042,25 @@ namespace MWWorld
         return facedObject;
     }
 
+    bool World::castRenderingRay(MWPhysics::RayCastingResult& res, const osg::Vec3f& from, const osg::Vec3f& to,
+                                 bool ignorePlayer, bool ignoreActors)
+    {
+        MWRender::RenderingManager::RayResult rayRes = mRendering->castRay(from, to, ignorePlayer, ignoreActors);
+        res.mHit = rayRes.mHit;
+        res.mHitPos = rayRes.mHitPointWorld;
+        res.mHitNormal = rayRes.mHitNormalWorld;
+        res.mHitObject = rayRes.mHitObject;
+        if (res.mHitObject.isEmpty() && rayRes.mHitRefnum.isSet())
+        {
+            for (CellStore* cellstore : mWorldScene->getActiveCells())
+            {
+                res.mHitObject = cellstore->searchViaRefNum(rayRes.mHitRefnum);
+                if (!res.mHitObject.isEmpty()) break;
+            }
+        }
+        return res.mHit;
+    }
+
     bool World::isCellExterior() const
     {
         const CellStore *currentCell = mWorldScene->getCurrentCell();
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 399b7232de..8cf83eb3aa 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -421,6 +421,9 @@ namespace MWWorld
 
             bool castRay(const osg::Vec3f& from, const osg::Vec3f& to, int mask, const MWWorld::ConstPtr& ignore) override;
 
+            bool castRenderingRay(MWPhysics::RayCastingResult& res, const osg::Vec3f& from, const osg::Vec3f& to,
+                                  bool ignorePlayer, bool ignoreActors) override;
+
             void setActorCollisionMode(const Ptr& ptr, bool internal, bool external) override;
             bool isActorCollisionEnabled(const Ptr& ptr) override;
 
diff --git a/files/lua_api/openmw/nearby.lua b/files/lua_api/openmw/nearby.lua
index 3ba3d7e6fb..ba27269700 100644
--- a/files/lua_api/openmw/nearby.lua
+++ b/files/lua_api/openmw/nearby.lua
@@ -68,5 +68,22 @@
 --     radius = 10,
 -- })
 
+---
+-- Cast ray from one point to another and find the first visual intersection with anything in the scene.
+-- As opposite to `castRay` can find an intersection with an object without collisions.
+-- In order to avoid threading issues can be used only in player scripts only in `onInputUpdate` or
+-- in engine handlers for user input. In other cases use `asyncCastRenderingRay` instead.
+-- @function [parent=#nearby] castRenderingRay
+-- @param openmw.util#Vector3 from Start point of the ray.
+-- @param openmw.util#Vector3 to End point of the ray.
+-- @return #RayCastingResult
+
+---
+-- Asynchronously cast ray from one point to another and find the first visual intersection with anything in the scene.
+-- @function [parent=#nearby] asyncCastRenderingRay
+-- @param openmw.async#Callback callback The callback to pass the result to (should accept a single argument @{openmw.nearby#RayCastingResult}).
+-- @param openmw.util#Vector3 from Start point of the ray.
+-- @param openmw.util#Vector3 to End point of the ray.
+
 return nil
 

From 4447ab0ed75b6d0ee39d3769c68baf52213d1d4e Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 12 Apr 2022 00:18:39 +0200
Subject: [PATCH 2300/2859] Remove ESM:: namespace qualifier in
 components/esm3/ and tests

---
 apps/openmw_test_suite/esm/variant.cpp |   6 +-
 components/esm3/activespells.cpp       |  24 ++--
 components/esm3/aipackage.cpp          |   2 +-
 components/esm3/aisequence.hpp         |  18 +--
 components/esm3/cellid.cpp             |  17 ++-
 components/esm3/cellref.cpp            |  55 ++++-----
 components/esm3/cellref.hpp            |   4 +-
 components/esm3/cellstate.cpp          |   9 +-
 components/esm3/cellstate.hpp          |   2 +-
 components/esm3/containerstate.cpp     |   9 +-
 components/esm3/controlsstate.cpp      |  11 +-
 components/esm3/creaturestate.cpp      |  11 +-
 components/esm3/creaturestats.cpp      |  11 +-
 components/esm3/creaturestats.hpp      |   4 +-
 components/esm3/custommarkerstate.cpp  |   4 +-
 components/esm3/custommarkerstate.hpp  |   6 +-
 components/esm3/debugprofile.cpp       |  23 ++--
 components/esm3/dialoguestate.cpp      |   9 +-
 components/esm3/effectlist.cpp         |   3 +-
 components/esm3/esmreader.hpp          |   3 +-
 components/esm3/esmwriter.cpp          |  18 +--
 components/esm3/esmwriter.hpp          |  37 +++---
 components/esm3/filter.cpp             |  21 ++--
 components/esm3/fogstate.cpp           |  12 +-
 components/esm3/globalmap.cpp          |  11 +-
 components/esm3/globalscript.cpp       |   9 +-
 components/esm3/inventorystate.cpp     |   9 +-
 components/esm3/journalentry.cpp       |   9 +-
 components/esm3/loadacti.cpp           |  10 +-
 components/esm3/loadalch.cpp           |  16 +--
 components/esm3/loadappa.cpp           |  14 +--
 components/esm3/loadarmo.cpp           |  18 +--
 components/esm3/loadbody.cpp           |  10 +-
 components/esm3/loadbook.cpp           |  18 +--
 components/esm3/loadbsgn.cpp           |  12 +-
 components/esm3/loadcell.cpp           |  25 +++--
 components/esm3/loadclas.cpp           |  10 +-
 components/esm3/loadclot.cpp           |  18 +--
 components/esm3/loadcont.cpp           |  16 +--
 components/esm3/loadcrea.cpp           |  33 +++---
 components/esm3/loaddial.cpp           |   6 +-
 components/esm3/loaddial.hpp           |   2 +-
 components/esm3/loaddoor.cpp           |  14 +--
 components/esm3/loadench.cpp           |   8 +-
 components/esm3/loadfact.cpp           |  12 +-
 components/esm3/loadfact.hpp           |   2 +-
 components/esm3/loadglob.cpp           |   6 +-
 components/esm3/loadgmst.cpp           |   6 +-
 components/esm3/loadinfo.cpp           |  30 ++---
 components/esm3/loadingr.cpp           |  14 +--
 components/esm3/loadland.cpp           |  24 ++--
 components/esm3/loadland.hpp           |   4 +-
 components/esm3/loadlevlist.cpp        |  14 +--
 components/esm3/loadlevlist.hpp        |   8 +-
 components/esm3/loadligh.cpp           |  16 +--
 components/esm3/loadlock.cpp           |  14 +--
 components/esm3/loadltex.cpp           |   8 +-
 components/esm3/loadmgef.cpp           |  27 +++--
 components/esm3/loadmgef.hpp           |   4 +-
 components/esm3/loadmisc.cpp           |  14 +--
 components/esm3/loadnpc.cpp            |  34 +++---
 components/esm3/loadnpc.hpp            |   3 +-
 components/esm3/loadpgrd.cpp           |  10 +-
 components/esm3/loadprob.cpp           |  14 +--
 components/esm3/loadrace.cpp           |  12 +-
 components/esm3/loadregn.cpp           |  14 +--
 components/esm3/loadrepa.cpp           |  14 +--
 components/esm3/loadscpt.cpp           |  10 +-
 components/esm3/loadskil.cpp           |   6 +-
 components/esm3/loadskil.hpp           |   3 +-
 components/esm3/loadsndg.cpp           |  10 +-
 components/esm3/loadsoun.cpp           |   8 +-
 components/esm3/loadspel.cpp           |  10 +-
 components/esm3/loadsscr.cpp           |   6 +-
 components/esm3/loadstat.cpp           |  10 +-
 components/esm3/loadstat.hpp           |   3 +-
 components/esm3/loadtes3.cpp           |  13 ++-
 components/esm3/loadweap.cpp           |  16 +--
 components/esm3/loadweap.hpp           |   2 +-
 components/esm3/locals.cpp             |   9 +-
 components/esm3/mappings.cpp           | 150 ++++++++++++-------------
 components/esm3/mappings.hpp           |   6 +-
 components/esm3/npcstate.cpp           |  11 +-
 components/esm3/npcstats.cpp           |  21 ++--
 components/esm3/objectstate.cpp        |  33 +++---
 components/esm3/objectstate.hpp        |   4 +-
 components/esm3/player.cpp             |  15 ++-
 components/esm3/player.hpp             |   6 +-
 components/esm3/projectilestate.cpp    |   2 +-
 components/esm3/queststate.cpp         |   9 +-
 components/esm3/savedgame.cpp          |  13 ++-
 components/esm3/spelllist.cpp          |   3 +-
 components/esm3/statstate.cpp          |   6 +-
 components/esm3/stolenitems.hpp        |   4 +-
 components/esm3/transport.cpp          |   4 +-
 components/esm3/variant.cpp            |  36 +++---
 components/esm3/variantimp.cpp         |  17 ++-
 components/esm3/weatherstate.cpp       |  25 +++--
 98 files changed, 752 insertions(+), 610 deletions(-)

diff --git a/apps/openmw_test_suite/esm/variant.cpp b/apps/openmw_test_suite/esm/variant.cpp
index 6991a8b4a8..287540c1e0 100644
--- a/apps/openmw_test_suite/esm/variant.cpp
+++ b/apps/openmw_test_suite/esm/variant.cpp
@@ -425,7 +425,7 @@ namespace
     std::string write(const Variant& variant, const Variant::Format format)
     {
         std::ostringstream out;
-        ESM::ESMWriter writer;
+        ESMWriter writer;
         writer.save(out);
         variant.write(writer, format);
         writer.close();
@@ -435,7 +435,7 @@ namespace
     Variant read(const Variant::Format format, const std::string& data)
     {
         Variant result;
-        ESM::ESMReader reader;
+        ESMReader reader;
         reader.open(std::make_shared<std::istringstream>(data), "");
         result.read(reader, format);
         return result;
@@ -490,7 +490,7 @@ namespace
     {
         const auto param = GetParam();
         std::ostringstream out;
-        ESM::ESMWriter writer;
+        ESMWriter writer;
         writer.save(out);
         ASSERT_THROW(param.mVariant.write(writer, param.mFormat), std::runtime_error);
     }
diff --git a/components/esm3/activespells.cpp b/components/esm3/activespells.cpp
index 61be6a7838..014c5c2e77 100644
--- a/components/esm3/activespells.cpp
+++ b/components/esm3/activespells.cpp
@@ -3,9 +3,11 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
+namespace ESM
+{
 namespace
 {
-    void save(ESM::ESMWriter& esm, const std::vector<ESM::ActiveSpells::ActiveSpellParams>& spells, ESM::NAME tag)
+    void saveImpl(ESMWriter& esm, const std::vector<ActiveSpells::ActiveSpellParams>& spells, NAME tag)
     {
         for (const auto& params : spells)
         {
@@ -38,19 +40,19 @@ namespace
         }
     }
 
-    void load(ESM::ESMReader& esm, std::vector<ESM::ActiveSpells::ActiveSpellParams>& spells, ESM::NAME tag)
+    void loadImpl(ESMReader& esm, std::vector<ActiveSpells::ActiveSpellParams>& spells, NAME tag)
     {
         int format = esm.getFormat();
 
         while (esm.isNextSub(tag))
         {
-            ESM::ActiveSpells::ActiveSpellParams params;
+            ActiveSpells::ActiveSpellParams params;
             params.mId = esm.getHString();
             esm.getHNT (params.mCasterActorId, "CAST");
             params.mDisplayName = esm.getHNString ("DISP");
             params.mItem.unset();
             if (format < 17)
-                params.mType = ESM::ActiveSpells::Type_Temporary;
+                params.mType = ActiveSpells::Type_Temporary;
             else
             {
                 esm.getHNT (params.mType, "TYPE");
@@ -71,7 +73,7 @@ namespace
 
             while (esm.isNextSub("MGEF"))
             {
-                ESM::ActiveEffect effect;
+                ActiveEffect effect;
                 esm.getHT(effect.mEffectId);
                 effect.mArg = -1;
                 esm.getHNOT(effect.mArg, "ARG_");
@@ -94,7 +96,7 @@ namespace
                 else
                     esm.getHNT (effect.mTimeLeft, "LEFT");
                 if (format < 17)
-                    effect.mFlags = ESM::ActiveEffect::Flag_None;
+                    effect.mFlags = ActiveEffect::Flag_None;
                 else
                     esm.getHNT (effect.mFlags, "FLAG");
 
@@ -104,19 +106,19 @@ namespace
         }
     }
 }
+}
 
 namespace ESM
 {
-
     void ActiveSpells::save(ESMWriter &esm) const
     {
-        ::save(esm, mSpells, "ID__");
-        ::save(esm, mQueue, "QID_");
+        saveImpl(esm, mSpells, "ID__");
+        saveImpl(esm, mQueue, "QID_");
     }
 
     void ActiveSpells::load(ESMReader &esm)
     {
-        ::load(esm, mSpells, "ID__");
-        ::load(esm, mQueue, "QID_");
+        loadImpl(esm, mSpells, "ID__");
+        loadImpl(esm, mQueue, "QID_");
     }
 }
diff --git a/components/esm3/aipackage.cpp b/components/esm3/aipackage.cpp
index 5a95e58ca8..55ee64db9c 100644
--- a/components/esm3/aipackage.cpp
+++ b/components/esm3/aipackage.cpp
@@ -65,7 +65,7 @@ namespace ESM
 
             case AI_Escort:
             case AI_Follow: {
-                const ESM::NAME name = (it->mType == AI_Escort) ? ESM::NAME("AI_E") : ESM::NAME("AI_F");
+                const NAME name = (it->mType == AI_Escort) ? NAME("AI_E") : NAME("AI_F");
                 esm.writeHNT(name, it->mTarget, sizeof(it->mTarget));
                 esm.writeHNOCString("CNDT", it->mCellName);
                 break;
diff --git a/components/esm3/aisequence.hpp b/components/esm3/aisequence.hpp
index 412c7401bf..f71771a4d5 100644
--- a/components/esm3/aisequence.hpp
+++ b/components/esm3/aisequence.hpp
@@ -22,13 +22,13 @@ namespace ESM
 
     enum AiPackages
     {
-        Ai_Wander = ESM::fourCC("WAND"),
-        Ai_Travel = ESM::fourCC("TRAV"),
-        Ai_Escort = ESM::fourCC("ESCO"),
-        Ai_Follow = ESM::fourCC("FOLL"),
-        Ai_Activate = ESM::fourCC("ACTI"),
-        Ai_Combat = ESM::fourCC("COMB"),
-        Ai_Pursue = ESM::fourCC("PURS")
+        Ai_Wander = fourCC("WAND"),
+        Ai_Travel = fourCC("TRAV"),
+        Ai_Escort = fourCC("ESCO"),
+        Ai_Follow = fourCC("FOLL"),
+        Ai_Activate = fourCC("ACTI"),
+        Ai_Combat = fourCC("COMB"),
+        Ai_Pursue = fourCC("PURS")
     };
 
 
@@ -67,10 +67,10 @@ namespace ESM
     struct AiWander : AiPackage
     {
         AiWanderData mData;
-        AiWanderDuration mDurationData; // was ESM::TimeStamp mStartTime
+        AiWanderDuration mDurationData; // was TimeStamp mStartTime
 
         bool mStoredInitialActorPosition;
-        ESM::Vector3 mInitialActorPosition;
+        Vector3 mInitialActorPosition;
 
         /// \todo add more AiWander state
 
diff --git a/components/esm3/cellid.cpp b/components/esm3/cellid.cpp
index 87ad0cc21c..154ef53056 100644
--- a/components/esm3/cellid.cpp
+++ b/components/esm3/cellid.cpp
@@ -3,9 +3,12 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
-const std::string ESM::CellId::sDefaultWorldspace = "sys::default";
+namespace ESM
+{
+
+const std::string CellId::sDefaultWorldspace = "sys::default";
 
-void ESM::CellId::load (ESMReader &esm)
+void CellId::load (ESMReader &esm)
 {
     mWorldspace = esm.getHNString ("SPAC");
 
@@ -18,7 +21,7 @@ void ESM::CellId::load (ESMReader &esm)
         mPaged = false;
 }
 
-void ESM::CellId::save (ESMWriter &esm) const
+void CellId::save (ESMWriter &esm) const
 {
     esm.writeHNString ("SPAC", mWorldspace);
 
@@ -26,18 +29,18 @@ void ESM::CellId::save (ESMWriter &esm) const
         esm.writeHNT ("CIDX", mIndex, 8);
 }
 
-bool ESM::operator== (const CellId& left, const CellId& right)
+bool operator== (const CellId& left, const CellId& right)
 {
     return left.mWorldspace==right.mWorldspace && left.mPaged==right.mPaged &&
         (!left.mPaged || (left.mIndex.mX==right.mIndex.mX && left.mIndex.mY==right.mIndex.mY));
 }
 
-bool ESM::operator!= (const CellId& left, const CellId& right)
+bool operator!= (const CellId& left, const CellId& right)
 {
     return !(left==right);
 }
 
-bool ESM::operator < (const CellId& left, const CellId& right)
+bool operator < (const CellId& left, const CellId& right)
 {
     if (left.mPaged < right.mPaged)
         return true;
@@ -59,3 +62,5 @@ bool ESM::operator < (const CellId& left, const CellId& right)
 
     return left.mWorldspace < right.mWorldspace;
 }
+
+}
diff --git a/components/esm3/cellref.cpp b/components/esm3/cellref.cpp
index d5ed0b4003..770680b8e2 100644
--- a/components/esm3/cellref.cpp
+++ b/components/esm3/cellref.cpp
@@ -63,67 +63,67 @@ namespace ESM
                 esm.getSubName();
                 switch (esm.retSubName().toInt())
                 {
-                    case ESM::fourCC("UNAM"):
+                    case fourCC("UNAM"):
                         getHTOrSkip(cellRef.mReferenceBlocked);
                         break;
-                    case ESM::fourCC("XSCL"):
+                    case fourCC("XSCL"):
                         getHTOrSkip(cellRef.mScale);
                         if constexpr (load)
                             cellRef.mScale = std::clamp(cellRef.mScale, 0.5f, 2.0f);
                         break;
-                    case ESM::fourCC("ANAM"):
+                    case fourCC("ANAM"):
                         getHStringOrSkip(cellRef.mOwner);
                         break;
-                    case ESM::fourCC("BNAM"):
+                    case fourCC("BNAM"):
                         getHStringOrSkip(cellRef.mGlobalVariable);
                         break;
-                    case ESM::fourCC("XSOL"):
+                    case fourCC("XSOL"):
                         getHStringOrSkip(cellRef.mSoul);
                         break;
-                    case ESM::fourCC("CNAM"):
+                    case fourCC("CNAM"):
                         getHStringOrSkip(cellRef.mFaction);
                         break;
-                    case ESM::fourCC("INDX"):
+                    case fourCC("INDX"):
                         getHTOrSkip(cellRef.mFactionRank);
                         break;
-                    case ESM::fourCC("XCHG"):
+                    case fourCC("XCHG"):
                         getHTOrSkip(cellRef.mEnchantmentCharge);
                         break;
-                    case ESM::fourCC("INTV"):
+                    case fourCC("INTV"):
                         getHTOrSkip(cellRef.mChargeInt);
                         break;
-                    case ESM::fourCC("NAM9"):
+                    case fourCC("NAM9"):
                         getHTOrSkip(cellRef.mGoldValue);
                         break;
-                    case ESM::fourCC("DODT"):
+                    case fourCC("DODT"):
                         getHTOrSkip(cellRef.mDoorDest);
                         if constexpr (load)
                             cellRef.mTeleport = true;
                         break;
-                    case ESM::fourCC("DNAM"):
+                    case fourCC("DNAM"):
                         getHStringOrSkip(cellRef.mDestCell);
                         break;
-                    case ESM::fourCC("FLTV"):
+                    case fourCC("FLTV"):
                         getHTOrSkip(cellRef.mLockLevel);
                         break;
-                    case ESM::fourCC("KNAM"):
+                    case fourCC("KNAM"):
                         getHStringOrSkip(cellRef.mKey);
                         break;
-                    case ESM::fourCC("TNAM"):
+                    case fourCC("TNAM"):
                         getHStringOrSkip(cellRef.mTrap);
                         break;
-                    case ESM::fourCC("DATA"):
+                    case fourCC("DATA"):
                         if constexpr (load)
                             esm.getHTSized<24>(cellRef.mPos);
                         else
                             esm.skipHTSized<24, decltype(cellRef.mPos)>();
                         break;
-                    case ESM::fourCC("NAM0"):
+                    case fourCC("NAM0"):
                     {
                         esm.skipHSub();
                         break;
                     }
-                    case ESM::SREC_DELE:
+                    case SREC_DELE:
                         esm.skipHSub();
                         if constexpr (load)
                             isDeleted = true;
@@ -145,9 +145,8 @@ namespace ESM
             }
         }
     }
-}
 
-void ESM::RefNum::load(ESMReader& esm, bool wide, ESM::NAME tag)
+void RefNum::load(ESMReader& esm, bool wide, NAME tag)
 {
     if (wide)
         esm.getHNTSized<8>(*this, tag);
@@ -155,7 +154,7 @@ void ESM::RefNum::load(ESMReader& esm, bool wide, ESM::NAME tag)
         esm.getHNT(mIndex, tag);
 }
 
-void ESM::RefNum::save(ESMWriter &esm, bool wide, ESM::NAME tag) const
+void RefNum::save(ESMWriter &esm, bool wide, NAME tag) const
 {
     if (wide)
         esm.writeHNT (tag, *this, 8);
@@ -168,23 +167,23 @@ void ESM::RefNum::save(ESMWriter &esm, bool wide, ESM::NAME tag) const
     }
 }
 
-void ESM::CellRef::load (ESMReader& esm, bool &isDeleted, bool wideRefNum)
+void CellRef::load (ESMReader& esm, bool &isDeleted, bool wideRefNum)
 {
     loadId(esm, wideRefNum);
     loadData(esm, isDeleted);
 }
 
-void ESM::CellRef::loadId (ESMReader& esm, bool wideRefNum)
+void CellRef::loadId (ESMReader& esm, bool wideRefNum)
 {
     loadIdImpl<true>(esm, wideRefNum, *this);
 }
 
-void ESM::CellRef::loadData(ESMReader &esm, bool &isDeleted)
+void CellRef::loadData(ESMReader &esm, bool &isDeleted)
 {
     loadDataImpl<true>(esm, isDeleted, *this);
 }
 
-void ESM::CellRef::save (ESMWriter &esm, bool wideRefNum, bool inInventory, bool isDeleted) const
+void CellRef::save (ESMWriter &esm, bool wideRefNum, bool inInventory, bool isDeleted) const
 {
     mRefNum.save (esm, wideRefNum);
 
@@ -246,7 +245,7 @@ void ESM::CellRef::save (ESMWriter &esm, bool wideRefNum, bool inInventory, bool
         esm.writeHNT("DATA", mPos, 24);
 }
 
-void ESM::CellRef::blank()
+void CellRef::blank()
 {
     mRefNum.unset();
     mRefID.clear();
@@ -276,10 +275,12 @@ void ESM::CellRef::blank()
     }
 }
 
-void ESM::skipLoadCellRef(ESMReader& esm, bool wideRefNum)
+void skipLoadCellRef(ESMReader& esm, bool wideRefNum)
 {
     CellRef cellRef;
     loadIdImpl<false>(esm, wideRefNum, cellRef);
     bool isDeleted;
     loadDataImpl<false>(esm, isDeleted, cellRef);
 }
+
+}
diff --git a/components/esm3/cellref.hpp b/components/esm3/cellref.hpp
index 07d4e0c80a..f710167afc 100644
--- a/components/esm3/cellref.hpp
+++ b/components/esm3/cellref.hpp
@@ -19,9 +19,9 @@ namespace ESM
         unsigned int mIndex;
         int mContentFile;
 
-        void load(ESMReader& esm, bool wide = false, ESM::NAME tag = "FRMR");
+        void load(ESMReader& esm, bool wide = false, NAME tag = "FRMR");
 
-        void save(ESMWriter &esm, bool wide = false, ESM::NAME tag = "FRMR") const;
+        void save(ESMWriter &esm, bool wide = false, NAME tag = "FRMR") const;
 
         inline bool hasContentFile() const { return mContentFile >= 0; }
 
diff --git a/components/esm3/cellstate.cpp b/components/esm3/cellstate.cpp
index 83b130dcd9..d5773d5f26 100644
--- a/components/esm3/cellstate.cpp
+++ b/components/esm3/cellstate.cpp
@@ -3,7 +3,10 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
-void ESM::CellState::load (ESMReader &esm)
+namespace ESM
+{
+
+void CellState::load (ESMReader &esm)
 {
     mWaterLevel = 0;
     esm.getHNOT (mWaterLevel, "WLVL");
@@ -16,7 +19,7 @@ void ESM::CellState::load (ESMReader &esm)
     esm.getHNOT (mLastRespawn, "RESP");
 }
 
-void ESM::CellState::save (ESMWriter &esm) const
+void CellState::save (ESMWriter &esm) const
 {
     if (!mId.mPaged)
         esm.writeHNT ("WLVL", mWaterLevel);
@@ -25,3 +28,5 @@ void ESM::CellState::save (ESMWriter &esm) const
 
     esm.writeHNT ("RESP", mLastRespawn);
 }
+
+}
diff --git a/components/esm3/cellstate.hpp b/components/esm3/cellstate.hpp
index 9c0427f76b..bf332ae5e8 100644
--- a/components/esm3/cellstate.hpp
+++ b/components/esm3/cellstate.hpp
@@ -21,7 +21,7 @@ namespace ESM
 
         int mHasFogOfWar; // Do we have fog of war state (0 or 1)? (see fogstate.hpp)
 
-        ESM::TimeStamp mLastRespawn;
+        TimeStamp mLastRespawn;
 
         void load (ESMReader &esm);
         void save (ESMWriter &esm) const;
diff --git a/components/esm3/containerstate.cpp b/components/esm3/containerstate.cpp
index 301549d597..b54736cb8b 100644
--- a/components/esm3/containerstate.cpp
+++ b/components/esm3/containerstate.cpp
@@ -1,15 +1,20 @@
 #include "containerstate.hpp"
 
-void ESM::ContainerState::load (ESMReader &esm)
+namespace ESM
+{
+
+void ContainerState::load (ESMReader &esm)
 {
     ObjectState::load (esm);
 
     mInventory.load (esm);
 }
 
-void ESM::ContainerState::save (ESMWriter &esm, bool inInventory) const
+void ContainerState::save (ESMWriter &esm, bool inInventory) const
 {
     ObjectState::save (esm, inInventory);
 
     mInventory.save (esm);
 }
+
+}
diff --git a/components/esm3/controlsstate.cpp b/components/esm3/controlsstate.cpp
index ae4e1dff16..c985c23f15 100644
--- a/components/esm3/controlsstate.cpp
+++ b/components/esm3/controlsstate.cpp
@@ -3,7 +3,10 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
-ESM::ControlsState::ControlsState()
+namespace ESM
+{
+
+ControlsState::ControlsState()
     : mViewSwitchDisabled(false),
       mControlsDisabled(false),
       mJumpingDisabled(false),
@@ -14,7 +17,7 @@ ESM::ControlsState::ControlsState()
 {
 }
 
-void ESM::ControlsState::load(ESM::ESMReader& esm)
+void ControlsState::load(ESMReader& esm)
 {
     int flags;
     esm.getHNT(flags, "CFLG");
@@ -28,7 +31,7 @@ void ESM::ControlsState::load(ESM::ESMReader& esm)
     mSpellDrawingDisabled = flags & SpellDrawingDisabled;
 }
 
-void ESM::ControlsState::save(ESM::ESMWriter& esm) const
+void ControlsState::save(ESMWriter& esm) const
 {
     int flags = 0;
     if (mViewSwitchDisabled) flags |= ViewSwitchDisabled;
@@ -41,3 +44,5 @@ void ESM::ControlsState::save(ESM::ESMWriter& esm) const
 
     esm.writeHNT("CFLG", flags);
 }
+
+}
diff --git a/components/esm3/creaturestate.cpp b/components/esm3/creaturestate.cpp
index bffa4e5e45..e9a9f52cf1 100644
--- a/components/esm3/creaturestate.cpp
+++ b/components/esm3/creaturestate.cpp
@@ -1,6 +1,9 @@
 #include "creaturestate.hpp"
 
-void ESM::CreatureState::load (ESMReader &esm)
+namespace ESM
+{
+
+void CreatureState::load (ESMReader &esm)
 {
     ObjectState::load (esm);
 
@@ -12,7 +15,7 @@ void ESM::CreatureState::load (ESMReader &esm)
     }
 }
 
-void ESM::CreatureState::save (ESMWriter &esm, bool inInventory) const
+void CreatureState::save (ESMWriter &esm, bool inInventory) const
 {
     ObjectState::save (esm, inInventory);
 
@@ -24,8 +27,10 @@ void ESM::CreatureState::save (ESMWriter &esm, bool inInventory) const
     }
 }
 
-void ESM::CreatureState::blank()
+void CreatureState::blank()
 {
     ObjectState::blank();
     mCreatureStats.blank();
 }
+
+}
diff --git a/components/esm3/creaturestats.cpp b/components/esm3/creaturestats.cpp
index 0f404ba58b..1a1eabd2ab 100644
--- a/components/esm3/creaturestats.cpp
+++ b/components/esm3/creaturestats.cpp
@@ -4,7 +4,10 @@
 
 #include <limits>
 
-void ESM::CreatureStats::load (ESMReader &esm)
+namespace ESM
+{
+
+void CreatureStats::load (ESMReader &esm)
 {
     bool intFallback = esm.getFormat() < 11;
     for (int i=0; i<8; ++i)
@@ -174,7 +177,7 @@ void ESM::CreatureStats::load (ESMReader &esm)
     }
 }
 
-void ESM::CreatureStats::save (ESMWriter &esm) const
+void CreatureStats::save (ESMWriter &esm) const
 {
     for (int i=0; i<8; ++i)
         mAttributes[i].save (esm);
@@ -259,7 +262,7 @@ void ESM::CreatureStats::save (ESMWriter &esm) const
         esm.writeHNT("NOAC", mMissingACDT);
 }
 
-void ESM::CreatureStats::blank()
+void CreatureStats::blank()
 {
     mTradeTime.mHour = 0;
     mTradeTime.mDay = 0;
@@ -287,3 +290,5 @@ void ESM::CreatureStats::blank()
     mCorprusSpells.clear();
     mMissingACDT = false;
 }
+
+}
diff --git a/components/esm3/creaturestats.hpp b/components/esm3/creaturestats.hpp
index d47a283630..7ad168b12f 100644
--- a/components/esm3/creaturestats.hpp
+++ b/components/esm3/creaturestats.hpp
@@ -43,7 +43,7 @@ namespace ESM
         std::multimap<int, int> mSummonedCreatures;
         std::vector<int> mSummonGraveyard;
 
-        ESM::TimeStamp mTradeTime;
+        TimeStamp mTradeTime;
         int mGoldPool;
         int mActorId;
         //int mHitAttemptActorId;
@@ -83,7 +83,7 @@ namespace ESM
         bool mRecalcDynamicStats;
         int mDrawState;
         signed char mDeathAnimation;
-        ESM::TimeStamp mTimeOfDeath;
+        TimeStamp mTimeOfDeath;
         int mLevel;
         bool mMissingACDT;
 
diff --git a/components/esm3/custommarkerstate.cpp b/components/esm3/custommarkerstate.cpp
index dc81c123d4..7752cc146f 100644
--- a/components/esm3/custommarkerstate.cpp
+++ b/components/esm3/custommarkerstate.cpp
@@ -6,7 +6,7 @@
 namespace ESM
 {
 
-void CustomMarker::save(ESM::ESMWriter &esm) const
+void CustomMarker::save(ESMWriter &esm) const
 {
     esm.writeHNT("POSX", mWorldX);
     esm.writeHNT("POSY", mWorldY);
@@ -15,7 +15,7 @@ void CustomMarker::save(ESM::ESMWriter &esm) const
         esm.writeHNString("NOTE", mNote);
 }
 
-void CustomMarker::load(ESM::ESMReader &esm)
+void CustomMarker::load(ESMReader &esm)
 {
     esm.getHNT(mWorldX, "POSX");
     esm.getHNT(mWorldY, "POSY");
diff --git a/components/esm3/custommarkerstate.hpp b/components/esm3/custommarkerstate.hpp
index 2be43c53bf..0b527c0a92 100644
--- a/components/esm3/custommarkerstate.hpp
+++ b/components/esm3/custommarkerstate.hpp
@@ -12,7 +12,7 @@ struct CustomMarker
     float mWorldX;
     float mWorldY;
 
-    ESM::CellId mCell;
+    CellId mCell;
 
     std::string mNote;
 
@@ -21,8 +21,8 @@ struct CustomMarker
         return mNote == other.mNote && mCell == other.mCell && mWorldX == other.mWorldX && mWorldY == other.mWorldY;
     }
 
-    void load (ESM::ESMReader& reader);
-    void save (ESM::ESMWriter& writer) const;
+    void load (ESMReader& reader);
+    void save (ESMWriter& writer) const;
 };
 
 }
diff --git a/components/esm3/debugprofile.cpp b/components/esm3/debugprofile.cpp
index 87c3bd13ba..cdbd47bce4 100644
--- a/components/esm3/debugprofile.cpp
+++ b/components/esm3/debugprofile.cpp
@@ -4,9 +4,12 @@
 #include "esmwriter.hpp"
 #include "components/esm/defs.hpp"
 
-unsigned int ESM::DebugProfile::sRecordId = REC_DBGP;
+namespace ESM
+{
+
+unsigned int DebugProfile::sRecordId = REC_DBGP;
 
-void ESM::DebugProfile::load (ESMReader& esm, bool &isDeleted)
+void DebugProfile::load (ESMReader& esm, bool &isDeleted)
 {
     isDeleted = false;
     mRecordFlags = esm.getRecordFlags();
@@ -16,19 +19,19 @@ void ESM::DebugProfile::load (ESMReader& esm, bool &isDeleted)
         esm.getSubName();
         switch (esm.retSubName().toInt())
         {
-            case ESM::SREC_NAME:
+            case SREC_NAME:
                 mId = esm.getHString();
                 break;
-            case ESM::fourCC("DESC"):
+            case fourCC("DESC"):
                 mDescription = esm.getHString();
                 break;
-            case ESM::fourCC("SCRP"):
+            case fourCC("SCRP"):
                 mScriptText = esm.getHString();
                 break;
-            case ESM::fourCC("FLAG"):
+            case fourCC("FLAG"):
                 esm.getHT(mFlags);
                 break;
-            case ESM::SREC_DELE:
+            case SREC_DELE:
                 esm.skipHSub();
                 isDeleted = true;
                 break;
@@ -39,7 +42,7 @@ void ESM::DebugProfile::load (ESMReader& esm, bool &isDeleted)
     }
 }
 
-void ESM::DebugProfile::save (ESMWriter& esm, bool isDeleted) const
+void DebugProfile::save (ESMWriter& esm, bool isDeleted) const
 {
     esm.writeHNCString ("NAME", mId);
 
@@ -54,9 +57,11 @@ void ESM::DebugProfile::save (ESMWriter& esm, bool isDeleted) const
     esm.writeHNT ("FLAG", mFlags);
 }
 
-void ESM::DebugProfile::blank()
+void DebugProfile::blank()
 {
     mDescription.clear();
     mScriptText.clear();
     mFlags = 0;
 }
+
+}
diff --git a/components/esm3/dialoguestate.cpp b/components/esm3/dialoguestate.cpp
index 2b1887e4eb..bdae1dbf4c 100644
--- a/components/esm3/dialoguestate.cpp
+++ b/components/esm3/dialoguestate.cpp
@@ -3,7 +3,10 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
-void ESM::DialogueState::load (ESMReader &esm)
+namespace ESM
+{
+
+void DialogueState::load (ESMReader &esm)
 {
     while (esm.isNextSub ("TOPI"))
         mKnownTopics.push_back (esm.getHString());
@@ -30,7 +33,7 @@ void ESM::DialogueState::load (ESMReader &esm)
     }
 }
 
-void ESM::DialogueState::save (ESMWriter &esm) const
+void DialogueState::save (ESMWriter &esm) const
 {
     for (std::vector<std::string>::const_iterator iter (mKnownTopics.begin());
         iter!=mKnownTopics.end(); ++iter)
@@ -51,3 +54,5 @@ void ESM::DialogueState::save (ESMWriter &esm) const
         }
     }
 }
+
+}
diff --git a/components/esm3/effectlist.cpp b/components/esm3/effectlist.cpp
index 1cfb25618d..c578e4095a 100644
--- a/components/esm3/effectlist.cpp
+++ b/components/esm3/effectlist.cpp
@@ -3,7 +3,8 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
-namespace ESM {
+namespace ESM
+{
 
 void EffectList::load(ESMReader &esm)
 {
diff --git a/components/esm3/esmreader.hpp b/components/esm3/esmreader.hpp
index a91a1f1978..7994899db9 100644
--- a/components/esm3/esmreader.hpp
+++ b/components/esm3/esmreader.hpp
@@ -13,7 +13,8 @@
 #include "components/esm/esmcommon.hpp"
 #include "loadtes3.hpp"
 
-namespace ESM {
+namespace ESM
+{
 
 class ESMReader
 {
diff --git a/components/esm3/esmwriter.cpp b/components/esm3/esmwriter.cpp
index 77ba5fc6aa..351de8612a 100644
--- a/components/esm3/esmwriter.cpp
+++ b/components/esm3/esmwriter.cpp
@@ -86,7 +86,7 @@ namespace ESM
             throw std::runtime_error ("Unclosed record remaining");
     }
 
-    void ESMWriter::startRecord(ESM::NAME name, uint32_t flags)
+    void ESMWriter::startRecord(NAME name, uint32_t flags)
     {
         mRecordCount++;
 
@@ -105,10 +105,10 @@ namespace ESM
 
     void ESMWriter::startRecord (uint32_t name, uint32_t flags)
     {
-        startRecord(ESM::NAME(name), flags);
+        startRecord(NAME(name), flags);
     }
 
-    void ESMWriter::startSubRecord(ESM::NAME name)
+    void ESMWriter::startSubRecord(NAME name)
     {
         // Sub-record hierarchies are not properly supported in ESMReader. This should be fixed later.
         assert (mRecords.size() <= 1);
@@ -124,7 +124,7 @@ namespace ESM
         assert(mRecords.back().size == 0);
     }
 
-    void ESMWriter::endRecord(ESM::NAME name)
+    void ESMWriter::endRecord(NAME name)
     {
         RecordData rec = mRecords.back();
         assert(rec.name == name);
@@ -142,17 +142,17 @@ namespace ESM
 
     void ESMWriter::endRecord (uint32_t name)
     {
-        endRecord(ESM::NAME(name));
+        endRecord(NAME(name));
     }
 
-    void ESMWriter::writeHNString(ESM::NAME name, const std::string& data)
+    void ESMWriter::writeHNString(NAME name, const std::string& data)
     {
         startSubRecord(name);
         writeHString(data);
         endRecord(name);
     }
 
-    void ESMWriter::writeHNString(ESM::NAME name, const std::string& data, size_t size)
+    void ESMWriter::writeHNString(NAME name, const std::string& data, size_t size)
     {
         assert(data.size() <= size);
         startSubRecord(name);
@@ -196,9 +196,9 @@ namespace ESM
             write("\0", 1);
     }
 
-    void ESMWriter::writeName(ESM::NAME name)
+    void ESMWriter::writeName(NAME name)
     {
-        write(name.mData, ESM::NAME::sCapacity);
+        write(name.mData, NAME::sCapacity);
     }
 
     void ESMWriter::write(const char* data, size_t size)
diff --git a/components/esm3/esmwriter.hpp b/components/esm3/esmwriter.hpp
index 8ee507f39d..264dc1c877 100644
--- a/components/esm3/esmwriter.hpp
+++ b/components/esm3/esmwriter.hpp
@@ -13,13 +13,14 @@ namespace ToUTF8
     class Utf8Encoder;
 }
 
-namespace ESM {
+namespace ESM
+{
 
 class ESMWriter
 {
         struct RecordData
         {
-            ESM::NAME name;
+            NAME name;
             std::streampos position;
             uint32_t size;
         };
@@ -30,7 +31,7 @@ class ESMWriter
 
         unsigned int getVersion() const;
 
-        // Set various header data (ESM::Header::Data). All of the below functions must be called before writing,
+        // Set various header data (Header::Data). All of the below functions must be called before writing,
         // otherwise this data will be left uninitialized.
         void setVersion(unsigned int ver = 0x3fa66666);
         void setType(int type);
@@ -56,27 +57,27 @@ class ESMWriter
         void close();
         ///< \note Does not close the stream.
 
-        void writeHNString(ESM::NAME name, const std::string& data);
-        void writeHNString(ESM::NAME name, const std::string& data, size_t size);
-        void writeHNCString(ESM::NAME name, const std::string& data)
+        void writeHNString(NAME name, const std::string& data);
+        void writeHNString(NAME name, const std::string& data, size_t size);
+        void writeHNCString(NAME name, const std::string& data)
         {
             startSubRecord(name);
             writeHCString(data);
             endRecord(name);
         }
-        void writeHNOString(ESM::NAME name, const std::string& data)
+        void writeHNOString(NAME name, const std::string& data)
         {
             if (!data.empty())
                 writeHNString(name, data);
         }
-        void writeHNOCString(ESM::NAME name, const std::string& data)
+        void writeHNOCString(NAME name, const std::string& data)
         {
             if (!data.empty())
                 writeHNCString(name, data);
         }
 
         template<typename T>
-        void writeHNT(ESM::NAME name, const T& data)
+        void writeHNT(NAME name, const T& data)
         {
             startSubRecord(name);
             writeT(data);
@@ -84,7 +85,7 @@ class ESMWriter
         }
 
         template<typename T, std::size_t size>
-        void writeHNT(ESM::NAME name, const T (&data)[size])
+        void writeHNT(NAME name, const T (&data)[size])
         {
             startSubRecord(name);
             writeT(data);
@@ -94,15 +95,15 @@ class ESMWriter
         // Prevent using writeHNT with strings. This already happened by accident and results in
         // state being discarded without any error on writing or reading it. :(
         // writeHNString and friends must be used instead.
-        void writeHNT(ESM::NAME name, const std::string& data) = delete;
+        void writeHNT(NAME name, const std::string& data) = delete;
 
-        void writeT(ESM::NAME data) = delete;
+        void writeT(NAME data) = delete;
 
         template<typename T, std::size_t size>
-        void writeHNT(ESM::NAME name, const T (&data)[size], int) = delete;
+        void writeHNT(NAME name, const T (&data)[size], int) = delete;
 
         template<typename T>
-        void writeHNT(ESM::NAME name, const T& data, int size)
+        void writeHNT(NAME name, const T& data, int size)
         {
             startSubRecord(name);
             writeT(data, size);
@@ -129,16 +130,16 @@ class ESMWriter
             write((char*)&data, size);
         }
 
-        void startRecord(ESM::NAME name, uint32_t flags = 0);
+        void startRecord(NAME name, uint32_t flags = 0);
         void startRecord(uint32_t name, uint32_t flags = 0);
         /// @note Sub-record hierarchies are not properly supported in ESMReader. This should be fixed later.
-        void startSubRecord(ESM::NAME name);
-        void endRecord(ESM::NAME name);
+        void startSubRecord(NAME name);
+        void endRecord(NAME name);
         void endRecord(uint32_t name);
         void writeFixedSizeString(const std::string& data, int size);
         void writeHString(const std::string& data);
         void writeHCString(const std::string& data);
-        void writeName(ESM::NAME data);
+        void writeName(NAME data);
         void write(const char* data, size_t size);
 
     private:
diff --git a/components/esm3/filter.cpp b/components/esm3/filter.cpp
index a031e0f608..d432f789d3 100644
--- a/components/esm3/filter.cpp
+++ b/components/esm3/filter.cpp
@@ -4,9 +4,12 @@
 #include "esmwriter.hpp"
 #include "components/esm/defs.hpp"
 
-unsigned int ESM::Filter::sRecordId = REC_FILT;
+namespace ESM
+{
+
+unsigned int Filter::sRecordId = REC_FILT;
 
-void ESM::Filter::load (ESMReader& esm, bool &isDeleted)
+void Filter::load (ESMReader& esm, bool &isDeleted)
 {
     isDeleted = false;
     mRecordFlags = esm.getRecordFlags();
@@ -17,16 +20,16 @@ void ESM::Filter::load (ESMReader& esm, bool &isDeleted)
         uint32_t name = esm.retSubName().toInt();
         switch (name)
         {
-            case ESM::SREC_NAME:
+            case SREC_NAME:
                 mId = esm.getHString();
                 break;
-            case ESM::fourCC("FILT"):
+            case fourCC("FILT"):
                 mFilter = esm.getHString();
                 break;
-            case ESM::fourCC("DESC"):
+            case fourCC("DESC"):
                 mDescription = esm.getHString();
                 break;
-            case ESM::SREC_DELE:
+            case SREC_DELE:
                 esm.skipHSub();
                 isDeleted = true;
                 break;
@@ -37,7 +40,7 @@ void ESM::Filter::load (ESMReader& esm, bool &isDeleted)
     }
 }
 
-void ESM::Filter::save (ESMWriter& esm, bool isDeleted) const
+void Filter::save (ESMWriter& esm, bool isDeleted) const
 {
     esm.writeHNCString ("NAME", mId);
 
@@ -51,8 +54,10 @@ void ESM::Filter::save (ESMWriter& esm, bool isDeleted) const
     esm.writeHNCString ("DESC", mDescription);
 }
 
-void ESM::Filter::blank()
+void Filter::blank()
 {
     mFilter.clear();
     mDescription.clear();
 }
+
+}
diff --git a/components/esm3/fogstate.cpp b/components/esm3/fogstate.cpp
index ff20f339f9..8b072d1ce9 100644
--- a/components/esm3/fogstate.cpp
+++ b/components/esm3/fogstate.cpp
@@ -10,6 +10,10 @@
 
 #include "savedgame.hpp"
 
+namespace ESM
+{
+namespace
+{
 void convertFogOfWar(std::vector<char>& imageData)
 {
     if (imageData.empty())
@@ -52,7 +56,9 @@ void convertFogOfWar(std::vector<char>& imageData)
     imageData = std::vector<char>(str.begin(), str.end());
 }
 
-void ESM::FogState::load (ESMReader &esm)
+}
+
+void FogState::load (ESMReader &esm)
 {
     esm.getHNOT(mBounds, "BOUN");
     esm.getHNOT(mNorthMarkerAngle, "ANGL");
@@ -76,7 +82,7 @@ void ESM::FogState::load (ESMReader &esm)
     }
 }
 
-void ESM::FogState::save (ESMWriter &esm, bool interiorCell) const
+void FogState::save (ESMWriter &esm, bool interiorCell) const
 {
     if (interiorCell)
     {
@@ -92,3 +98,5 @@ void ESM::FogState::save (ESMWriter &esm, bool interiorCell) const
         esm.endRecord("FTEX");
     }
 }
+
+}
diff --git a/components/esm3/globalmap.cpp b/components/esm3/globalmap.cpp
index 3005349d26..8eb4aebd8b 100644
--- a/components/esm3/globalmap.cpp
+++ b/components/esm3/globalmap.cpp
@@ -4,9 +4,12 @@
 #include "esmwriter.hpp"
 #include "components/esm/defs.hpp"
 
-unsigned int ESM::GlobalMap::sRecordId = ESM::REC_GMAP;
+namespace ESM
+{
+
+unsigned int GlobalMap::sRecordId = REC_GMAP;
 
-void ESM::GlobalMap::load (ESMReader &esm)
+void GlobalMap::load (ESMReader &esm)
 {
     esm.getHNT(mBounds, "BNDS");
 
@@ -25,7 +28,7 @@ void ESM::GlobalMap::load (ESMReader &esm)
     }
 }
 
-void ESM::GlobalMap::save (ESMWriter &esm) const
+void GlobalMap::save (ESMWriter &esm) const
 {
     esm.writeHNT("BNDS", mBounds);
 
@@ -41,3 +44,5 @@ void ESM::GlobalMap::save (ESMWriter &esm) const
         esm.endRecord("MRK_");
     }
 }
+
+}
diff --git a/components/esm3/globalscript.cpp b/components/esm3/globalscript.cpp
index a8a8e79cf5..0eb1e31e9c 100644
--- a/components/esm3/globalscript.cpp
+++ b/components/esm3/globalscript.cpp
@@ -3,7 +3,10 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
-void ESM::GlobalScript::load (ESMReader &esm)
+namespace ESM
+{
+
+void GlobalScript::load (ESMReader &esm)
 {
     mId = esm.getHNString ("NAME");
 
@@ -18,7 +21,7 @@ void ESM::GlobalScript::load (ESMReader &esm)
         mTargetRef.load(esm, true, "FRMR");
 }
 
-void ESM::GlobalScript::save (ESMWriter &esm) const
+void GlobalScript::save (ESMWriter &esm) const
 {
     esm.writeHNString ("NAME", mId);
 
@@ -34,3 +37,5 @@ void ESM::GlobalScript::save (ESMWriter &esm) const
             mTargetRef.save (esm, true, "FRMR");
     }
 }
+
+}
diff --git a/components/esm3/inventorystate.cpp b/components/esm3/inventorystate.cpp
index 980d67f7ef..b43a7b7233 100644
--- a/components/esm3/inventorystate.cpp
+++ b/components/esm3/inventorystate.cpp
@@ -5,7 +5,10 @@
 
 #include <components/misc/stringops.hpp>
 
-void ESM::InventoryState::load (ESMReader &esm)
+namespace ESM
+{
+
+void InventoryState::load (ESMReader &esm)
 {
     // obsolete
     int index = 0;
@@ -123,7 +126,7 @@ void ESM::InventoryState::load (ESMReader &esm)
     }
 }
 
-void ESM::InventoryState::save (ESMWriter &esm) const
+void InventoryState::save (ESMWriter &esm) const
 {
     int itemsCount = static_cast<int>(mItems.size());
     if (itemsCount > 0)
@@ -170,3 +173,5 @@ void ESM::InventoryState::save (ESMWriter &esm) const
     if (mSelectedEnchantItem != -1)
         esm.writeHNT ("SELE", mSelectedEnchantItem);
 }
+
+}
diff --git a/components/esm3/journalentry.cpp b/components/esm3/journalentry.cpp
index 93011e581b..869a5df29e 100644
--- a/components/esm3/journalentry.cpp
+++ b/components/esm3/journalentry.cpp
@@ -3,7 +3,10 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
-void ESM::JournalEntry::load (ESMReader &esm)
+namespace ESM
+{
+
+void JournalEntry::load (ESMReader &esm)
 {
     esm.getHNOT (mType, "JETY");
     mTopic = esm.getHNString ("YETO");
@@ -20,7 +23,7 @@ void ESM::JournalEntry::load (ESMReader &esm)
         mActorName = esm.getHNOString("ACT_");
 }
 
-void ESM::JournalEntry::save (ESMWriter &esm) const
+void JournalEntry::save (ESMWriter &esm) const
 {
     esm.writeHNT ("JETY", mType);
     esm.writeHNString ("YETO", mTopic);
@@ -36,3 +39,5 @@ void ESM::JournalEntry::save (ESMWriter &esm) const
     else if (mType==Type_Topic)
         esm.writeHNString ("ACT_", mActorName);
 }
+
+}
diff --git a/components/esm3/loadacti.cpp b/components/esm3/loadacti.cpp
index d57ef44be2..a8689bf78c 100644
--- a/components/esm3/loadacti.cpp
+++ b/components/esm3/loadacti.cpp
@@ -19,20 +19,20 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::SREC_NAME:
+                case SREC_NAME:
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::fourCC("MODL"):
+                case fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::fourCC("FNAM"):
+                case fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::fourCC("SCRI"):
+                case fourCC("SCRI"):
                     mScript = esm.getHString();
                     break;
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
diff --git a/components/esm3/loadalch.cpp b/components/esm3/loadalch.cpp
index 7173090e4b..888e049079 100644
--- a/components/esm3/loadalch.cpp
+++ b/components/esm3/loadalch.cpp
@@ -22,30 +22,30 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::SREC_NAME:
+                case SREC_NAME:
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::fourCC("MODL"):
+                case fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::fourCC("TEXT"): // not ITEX here for some reason
+                case fourCC("TEXT"): // not ITEX here for some reason
                     mIcon = esm.getHString();
                     break;
-                case ESM::fourCC("SCRI"):
+                case fourCC("SCRI"):
                     mScript = esm.getHString();
                     break;
-                case ESM::fourCC("FNAM"):
+                case fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::fourCC("ALDT"):
+                case fourCC("ALDT"):
                     esm.getHTSized<12>(mData);
                     hasData = true;
                     break;
-                case ESM::fourCC("ENAM"):
+                case fourCC("ENAM"):
                     mEffects.add(esm);
                     break;
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
diff --git a/components/esm3/loadappa.cpp b/components/esm3/loadappa.cpp
index f29e5bf4f9..8bf87f1e69 100644
--- a/components/esm3/loadappa.cpp
+++ b/components/esm3/loadappa.cpp
@@ -20,27 +20,27 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::SREC_NAME:
+                case SREC_NAME:
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::fourCC("MODL"):
+                case fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::fourCC("FNAM"):
+                case fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::fourCC("AADT"):
+                case fourCC("AADT"):
                     esm.getHT(mData);
                     hasData = true;
                     break;
-                case ESM::fourCC("SCRI"):
+                case fourCC("SCRI"):
                     mScript = esm.getHString();
                     break;
-                case ESM::fourCC("ITEX"):
+                case fourCC("ITEX"):
                     mIcon = esm.getHString();
                     break;
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
diff --git a/components/esm3/loadarmo.cpp b/components/esm3/loadarmo.cpp
index 7176f82f1e..77cfd2ff39 100644
--- a/components/esm3/loadarmo.cpp
+++ b/components/esm3/loadarmo.cpp
@@ -52,33 +52,33 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::SREC_NAME:
+                case SREC_NAME:
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::fourCC("MODL"):
+                case fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::fourCC("FNAM"):
+                case fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::fourCC("AODT"):
+                case fourCC("AODT"):
                     esm.getHTSized<24>(mData);
                     hasData = true;
                     break;
-                case ESM::fourCC("SCRI"):
+                case fourCC("SCRI"):
                     mScript = esm.getHString();
                     break;
-                case ESM::fourCC("ITEX"):
+                case fourCC("ITEX"):
                     mIcon = esm.getHString();
                     break;
-                case ESM::fourCC("ENAM"):
+                case fourCC("ENAM"):
                     mEnchant = esm.getHString();
                     break;
-                case ESM::fourCC("INDX"):
+                case fourCC("INDX"):
                     mParts.add(esm);
                     break;
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
diff --git a/components/esm3/loadbody.cpp b/components/esm3/loadbody.cpp
index 55aa5b7bf5..0275f3a63e 100644
--- a/components/esm3/loadbody.cpp
+++ b/components/esm3/loadbody.cpp
@@ -20,21 +20,21 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::SREC_NAME:
+                case SREC_NAME:
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::fourCC("MODL"):
+                case fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::fourCC("FNAM"):
+                case fourCC("FNAM"):
                     mRace = esm.getHString();
                     break;
-                case ESM::fourCC("BYDT"):
+                case fourCC("BYDT"):
                     esm.getHTSized<4>(mData);
                     hasData = true;
                     break;
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
diff --git a/components/esm3/loadbook.cpp b/components/esm3/loadbook.cpp
index 7e5f75e055..2845e67622 100644
--- a/components/esm3/loadbook.cpp
+++ b/components/esm3/loadbook.cpp
@@ -20,33 +20,33 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::SREC_NAME:
+                case SREC_NAME:
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::fourCC("MODL"):
+                case fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::fourCC("FNAM"):
+                case fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::fourCC("BKDT"):
+                case fourCC("BKDT"):
                     esm.getHTSized<20>(mData);
                     hasData = true;
                     break;
-                case ESM::fourCC("SCRI"):
+                case fourCC("SCRI"):
                     mScript = esm.getHString();
                     break;
-                case ESM::fourCC("ITEX"):
+                case fourCC("ITEX"):
                     mIcon = esm.getHString();
                     break;
-                case ESM::fourCC("ENAM"):
+                case fourCC("ENAM"):
                     mEnchant = esm.getHString();
                     break;
-                case ESM::fourCC("TEXT"):
+                case fourCC("TEXT"):
                     mText = esm.getHString();
                     break;
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
diff --git a/components/esm3/loadbsgn.cpp b/components/esm3/loadbsgn.cpp
index c894918bb2..5be175e72e 100644
--- a/components/esm3/loadbsgn.cpp
+++ b/components/esm3/loadbsgn.cpp
@@ -21,23 +21,23 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::SREC_NAME:
+                case SREC_NAME:
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::fourCC("FNAM"):
+                case fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::fourCC("TNAM"):
+                case fourCC("TNAM"):
                     mTexture = esm.getHString();
                     break;
-                case ESM::fourCC("DESC"):
+                case fourCC("DESC"):
                     mDescription = esm.getHString();
                     break;
-                case ESM::fourCC("NPCS"):
+                case fourCC("NPCS"):
                     mPowers.add(esm);
                     break;
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
diff --git a/components/esm3/loadcell.cpp b/components/esm3/loadcell.cpp
index b36f066501..9ab9eacba1 100644
--- a/components/esm3/loadcell.cpp
+++ b/components/esm3/loadcell.cpp
@@ -14,10 +14,12 @@
 #include "components/esm/defs.hpp"
 #include "cellid.hpp"
 
+namespace ESM
+{
 namespace
 {
     ///< Translate 8bit/24bit code (stored in refNum.mIndex) into a proper refNum
-    void adjustRefNum (ESM::RefNum& refNum, const ESM::ESMReader& reader)
+    void adjustRefNum (RefNum& refNum, const ESMReader& reader)
     {
         unsigned int local = (refNum.mIndex & 0xff000000) >> 24;
 
@@ -37,6 +39,7 @@ namespace
         }
     }
 }
+}
 
 namespace ESM
 {
@@ -72,14 +75,14 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::SREC_NAME:
+                case SREC_NAME:
                     mName = esm.getHString();
                     break;
-                case ESM::fourCC("DATA"):
+                case fourCC("DATA"):
                     esm.getHTSized<12>(mData);
                     hasData = true;
                     break;
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
@@ -97,7 +100,7 @@ namespace ESM
 
         if (mCellId.mPaged)
         {
-            mCellId.mWorldspace = ESM::CellId::sDefaultWorldspace;
+            mCellId.mWorldspace = CellId::sDefaultWorldspace;
             mCellId.mIndex.mX = mData.mX;
             mCellId.mIndex.mY = mData.mY;
         }
@@ -119,13 +122,13 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::fourCC("INTV"):
+                case fourCC("INTV"):
                     int waterl;
                     esm.getHT(waterl);
                     mWater = static_cast<float>(waterl);
                     mWaterInt = true;
                     break;
-                case ESM::fourCC("WHGT"):
+                case fourCC("WHGT"):
                     float waterLevel;
                     esm.getHT(waterLevel);
                     mWaterInt = false;
@@ -138,17 +141,17 @@ namespace ESM
                     else
                         mWater = waterLevel;
                     break;
-                case ESM::fourCC("AMBI"):
+                case fourCC("AMBI"):
                     esm.getHT(mAmbi);
                     mHasAmbi = true;
                     break;
-                case ESM::fourCC("RGNN"):
+                case fourCC("RGNN"):
                     mRegion = esm.getHString();
                     break;
-                case ESM::fourCC("NAM5"):
+                case fourCC("NAM5"):
                     esm.getHT(mMapColor);
                     break;
-                case ESM::fourCC("NAM0"):
+                case fourCC("NAM0"):
                     esm.getHT(mRefNumCounter);
                     break;
                 default:
diff --git a/components/esm3/loadclas.cpp b/components/esm3/loadclas.cpp
index 718ba6c3ac..9b34fbd541 100644
--- a/components/esm3/loadclas.cpp
+++ b/components/esm3/loadclas.cpp
@@ -50,23 +50,23 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::SREC_NAME:
+                case SREC_NAME:
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::fourCC("FNAM"):
+                case fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::fourCC("CLDT"):
+                case fourCC("CLDT"):
                     esm.getHTSized<60>(mData);
                     if (mData.mIsPlayable > 1)
                         esm.fail("Unknown bool value");
                     hasData = true;
                     break;
-                case ESM::fourCC("DESC"):
+                case fourCC("DESC"):
                     mDescription = esm.getHString();
                     break;
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
diff --git a/components/esm3/loadclot.cpp b/components/esm3/loadclot.cpp
index 5b6fa4210b..ea87d1566b 100644
--- a/components/esm3/loadclot.cpp
+++ b/components/esm3/loadclot.cpp
@@ -22,33 +22,33 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::SREC_NAME:
+                case SREC_NAME:
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::fourCC("MODL"):
+                case fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::fourCC("FNAM"):
+                case fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::fourCC("CTDT"):
+                case fourCC("CTDT"):
                     esm.getHTSized<12>(mData);
                     hasData = true;
                     break;
-                case ESM::fourCC("SCRI"):
+                case fourCC("SCRI"):
                     mScript = esm.getHString();
                     break;
-                case ESM::fourCC("ITEX"):
+                case fourCC("ITEX"):
                     mIcon = esm.getHString();
                     break;
-                case ESM::fourCC("ENAM"):
+                case fourCC("ENAM"):
                     mEnchant = esm.getHString();
                     break;
-                case ESM::fourCC("INDX"):
+                case fourCC("INDX"):
                     mParts.add(esm);
                     break;
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
diff --git a/components/esm3/loadcont.cpp b/components/esm3/loadcont.cpp
index 6477bb9301..b74f9f2ba2 100644
--- a/components/esm3/loadcont.cpp
+++ b/components/esm3/loadcont.cpp
@@ -44,21 +44,21 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::SREC_NAME:
+                case SREC_NAME:
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::fourCC("MODL"):
+                case fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::fourCC("FNAM"):
+                case fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::fourCC("CNDT"):
+                case fourCC("CNDT"):
                     esm.getHTSized<4>(mWeight);
                     hasWeight = true;
                     break;
-                case ESM::fourCC("FLAG"):
+                case fourCC("FLAG"):
                     esm.getHTSized<4>(mFlags);
                     if (mFlags & 0xf4)
                         esm.fail("Unknown flags");
@@ -66,13 +66,13 @@ namespace ESM
                         esm.fail("Flag 8 not set");
                     hasFlags = true;
                     break;
-                case ESM::fourCC("SCRI"):
+                case fourCC("SCRI"):
                     mScript = esm.getHString();
                     break;
-                case ESM::fourCC("NPCO"):
+                case fourCC("NPCO"):
                     mInventory.add(esm);
                     break;
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
diff --git a/components/esm3/loadcrea.cpp b/components/esm3/loadcrea.cpp
index f82c488c63..c9d4e6ad14 100644
--- a/components/esm3/loadcrea.cpp
+++ b/components/esm3/loadcrea.cpp
@@ -6,7 +6,8 @@
 #include "esmwriter.hpp"
 #include "components/esm/defs.hpp"
 
-namespace ESM {
+namespace ESM
+{
 
     unsigned int Creature::sRecordId = REC_CREA;
 
@@ -33,47 +34,47 @@ namespace ESM {
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::SREC_NAME:
+                case SREC_NAME:
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::fourCC("MODL"):
+                case fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::fourCC("CNAM"):
+                case fourCC("CNAM"):
                     mOriginal = esm.getHString();
                     break;
-                case ESM::fourCC("FNAM"):
+                case fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::fourCC("SCRI"):
+                case fourCC("SCRI"):
                     mScript = esm.getHString();
                     break;
-                case ESM::fourCC("NPDT"):
+                case fourCC("NPDT"):
                     esm.getHTSized<96>(mData);
                     hasNpdt = true;
                     break;
-                case ESM::fourCC("FLAG"):
+                case fourCC("FLAG"):
                     int flags;
                     esm.getHT(flags);
                     mFlags = flags & 0xFF;
                     mBloodType = ((flags >> 8) & 0xFF) >> 2;
                     hasFlags = true;
                     break;
-                case ESM::fourCC("XSCL"):
+                case fourCC("XSCL"):
                     esm.getHT(mScale);
                     break;
-                case ESM::fourCC("NPCO"):
+                case fourCC("NPCO"):
                     mInventory.add(esm);
                     break;
-                case ESM::fourCC("NPCS"):
+                case fourCC("NPCS"):
                     mSpells.add(esm);
                     break;
-                case ESM::fourCC("AIDT"):
+                case fourCC("AIDT"):
                     esm.getHExact(&mAiData, sizeof(mAiData));
                     break;
-                case ESM::fourCC("DODT"):
-                case ESM::fourCC("DNAM"):
+                case fourCC("DODT"):
+                case fourCC("DNAM"):
                     mTransport.add(esm);
                     break;
                 case AI_Wander:
@@ -84,11 +85,11 @@ namespace ESM {
                 case AI_CNDT:
                     mAiPackage.add(esm);
                     break;
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
-                case ESM::fourCC("INDX"):
+                case fourCC("INDX"):
                     // seems to occur only in .ESS files, unsure of purpose
                     int index;
                     esm.getHT(index);
diff --git a/components/esm3/loaddial.cpp b/components/esm3/loaddial.cpp
index a4b21cd1b3..b3b42b9989 100644
--- a/components/esm3/loaddial.cpp
+++ b/components/esm3/loaddial.cpp
@@ -30,7 +30,7 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::fourCC("DATA"):
+                case fourCC("DATA"):
                 {
                     esm.getSubHeader();
                     int size = esm.getSubSize();
@@ -44,7 +44,7 @@ namespace ESM
                     }
                     break;
                 }
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     mType = Unknown;
                     isDeleted = true;
@@ -76,7 +76,7 @@ namespace ESM
 
     void Dialogue::readInfo(ESMReader &esm, bool merge)
     {
-        ESM::DialInfo info;
+        DialInfo info;
         bool isDeleted = false;
         info.load(esm, isDeleted);
 
diff --git a/components/esm3/loaddial.hpp b/components/esm3/loaddial.hpp
index 7adc8b1cf8..7998623998 100644
--- a/components/esm3/loaddial.hpp
+++ b/components/esm3/loaddial.hpp
@@ -61,7 +61,7 @@ struct Dialogue
 
     /// Read the next info record
     /// @param merge Merge with existing list, or just push each record to the end of the list?
-    void readInfo (ESM::ESMReader& esm, bool merge);
+    void readInfo (ESMReader& esm, bool merge);
 
     void blank();
     ///< Set record to default state (does not touch the ID and does not change the type).
diff --git a/components/esm3/loaddoor.cpp b/components/esm3/loaddoor.cpp
index e059a1dc05..c866fc96c0 100644
--- a/components/esm3/loaddoor.cpp
+++ b/components/esm3/loaddoor.cpp
@@ -19,26 +19,26 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::SREC_NAME:
+                case SREC_NAME:
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::fourCC("MODL"):
+                case fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::fourCC("FNAM"):
+                case fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::fourCC("SCRI"):
+                case fourCC("SCRI"):
                     mScript = esm.getHString();
                     break;
-                case ESM::fourCC("SNAM"):
+                case fourCC("SNAM"):
                     mOpenSound = esm.getHString();
                     break;
-                case ESM::fourCC("ANAM"):
+                case fourCC("ANAM"):
                     mCloseSound = esm.getHString();
                     break;
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
diff --git a/components/esm3/loadench.cpp b/components/esm3/loadench.cpp
index 4280b3a8af..533ba154b7 100644
--- a/components/esm3/loadench.cpp
+++ b/components/esm3/loadench.cpp
@@ -21,18 +21,18 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::SREC_NAME:
+                case SREC_NAME:
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::fourCC("ENDT"):
+                case fourCC("ENDT"):
                     esm.getHTSized<16>(mData);
                     hasData = true;
                     break;
-                case ESM::fourCC("ENAM"):
+                case fourCC("ENAM"):
                     mEffects.add(esm);
                     break;
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
diff --git a/components/esm3/loadfact.cpp b/components/esm3/loadfact.cpp
index 9fc5410164..513f8c3199 100644
--- a/components/esm3/loadfact.cpp
+++ b/components/esm3/loadfact.cpp
@@ -43,25 +43,25 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::SREC_NAME:
+                case SREC_NAME:
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::fourCC("FNAM"):
+                case fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::fourCC("RNAM"):
+                case fourCC("RNAM"):
                     if (rankCounter >= 10)
                         esm.fail("Rank out of range");
                     mRanks[rankCounter++] = esm.getHString();
                     break;
-                case ESM::fourCC("FADT"):
+                case fourCC("FADT"):
                     esm.getHTSized<240>(mData);
                     if (mData.mIsHidden > 1)
                         esm.fail("Unknown flag!");
                     hasData = true;
                     break;
-                case ESM::fourCC("ANAM"):
+                case fourCC("ANAM"):
                 {
                     std::string faction = esm.getHString();
                     int reaction;
@@ -69,7 +69,7 @@ namespace ESM
                     mReactions[faction] = reaction;
                     break;
                 }
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
diff --git a/components/esm3/loadfact.hpp b/components/esm3/loadfact.hpp
index da01c004e9..d47ff5a43e 100644
--- a/components/esm3/loadfact.hpp
+++ b/components/esm3/loadfact.hpp
@@ -45,7 +45,7 @@ struct Faction
         RankData mRankData[10];
 
         int mSkills[7]; // IDs of skills this faction require
-                        // Each element will either contain an ESM::Skill index, or -1.
+                        // Each element will either contain an Skill index, or -1.
 
         int mIsHidden; // 1 - hidden from player
 
diff --git a/components/esm3/loadglob.cpp b/components/esm3/loadglob.cpp
index fd4ee05665..cc2188a5b5 100644
--- a/components/esm3/loadglob.cpp
+++ b/components/esm3/loadglob.cpp
@@ -22,7 +22,7 @@ namespace ESM
         }
         else
         {
-            mValue.read (esm, ESM::Variant::Format_Global);
+            mValue.read (esm, Variant::Format_Global);
         }
     }
 
@@ -36,13 +36,13 @@ namespace ESM
         }
         else
         {
-            mValue.write (esm, ESM::Variant::Format_Global);
+            mValue.write (esm, Variant::Format_Global);
         }
     }
 
     void Global::blank()
     {
-        mValue.setType (ESM::VT_None);
+        mValue.setType (VT_None);
     }
 
     bool operator== (const Global& left, const Global& right)
diff --git a/components/esm3/loadgmst.cpp b/components/esm3/loadgmst.cpp
index 1bcf6a1fa4..31439dc268 100644
--- a/components/esm3/loadgmst.cpp
+++ b/components/esm3/loadgmst.cpp
@@ -14,18 +14,18 @@ namespace ESM
         mRecordFlags = esm.getRecordFlags();
 
         mId = esm.getHNString("NAME");
-        mValue.read (esm, ESM::Variant::Format_Gmst);
+        mValue.read (esm, Variant::Format_Gmst);
     }
 
     void GameSetting::save (ESMWriter &esm, bool /*isDeleted*/) const
     {
         esm.writeHNCString("NAME", mId);
-        mValue.write (esm, ESM::Variant::Format_Gmst);
+        mValue.write (esm, Variant::Format_Gmst);
     }
 
     void GameSetting::blank()
     {
-        mValue.setType (ESM::VT_None);
+        mValue.setType (VT_None);
     }
 
     bool operator== (const GameSetting& left, const GameSetting& right)
diff --git a/components/esm3/loadinfo.cpp b/components/esm3/loadinfo.cpp
index fb32f80188..0c7c4db61a 100644
--- a/components/esm3/loadinfo.cpp
+++ b/components/esm3/loadinfo.cpp
@@ -25,19 +25,19 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::fourCC("DATA"):
+                case fourCC("DATA"):
                     esm.getHTSized<12>(mData);
                     break;
-                case ESM::fourCC("ONAM"):
+                case fourCC("ONAM"):
                     mActor = esm.getHString();
                     break;
-                case ESM::fourCC("RNAM"):
+                case fourCC("RNAM"):
                     mRace = esm.getHString();
                     break;
-                case ESM::fourCC("CNAM"):
+                case fourCC("CNAM"):
                     mClass = esm.getHString();
                     break;
-                case ESM::fourCC("FNAM"):
+                case fourCC("FNAM"):
                 {
                     mFaction = esm.getHString();
                     if (mFaction == "FFFF")
@@ -46,19 +46,19 @@ namespace ESM
                     }
                     break;
                 }
-                case ESM::fourCC("ANAM"):
+                case fourCC("ANAM"):
                     mCell = esm.getHString();
                     break;
-                case ESM::fourCC("DNAM"):
+                case fourCC("DNAM"):
                     mPcFaction = esm.getHString();
                     break;
-                case ESM::fourCC("SNAM"):
+                case fourCC("SNAM"):
                     mSound = esm.getHString();
                     break;
-                case ESM::SREC_NAME:
+                case SREC_NAME:
                     mResponse = esm.getHString();
                     break;
-                case ESM::fourCC("SCVR"):
+                case fourCC("SCVR"):
                 {
                     SelectStruct ss;
                     ss.mSelectRule = esm.getHString();
@@ -66,22 +66,22 @@ namespace ESM
                     mSelects.push_back(ss);
                     break;
                 }
-                case ESM::fourCC("BNAM"):
+                case fourCC("BNAM"):
                     mResultScript = esm.getHString();
                     break;
-                case ESM::fourCC("QSTN"):
+                case fourCC("QSTN"):
                     mQuestStatus = QS_Name;
                     esm.skipRecord();
                     break;
-                case ESM::fourCC("QSTF"):
+                case fourCC("QSTF"):
                     mQuestStatus = QS_Finished;
                     esm.skipRecord();
                     break;
-                case ESM::fourCC("QSTR"):
+                case fourCC("QSTR"):
                     mQuestStatus = QS_Restart;
                     esm.skipRecord();
                     break;
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
diff --git a/components/esm3/loadingr.cpp b/components/esm3/loadingr.cpp
index d7317a8dc4..ea10da42b9 100644
--- a/components/esm3/loadingr.cpp
+++ b/components/esm3/loadingr.cpp
@@ -20,27 +20,27 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::SREC_NAME:
+                case SREC_NAME:
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::fourCC("MODL"):
+                case fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::fourCC("FNAM"):
+                case fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::fourCC("IRDT"):
+                case fourCC("IRDT"):
                     esm.getHTSized<56>(mData);
                     hasData = true;
                     break;
-                case ESM::fourCC("SCRI"):
+                case fourCC("SCRI"):
                     mScript = esm.getHString();
                     break;
-                case ESM::fourCC("ITEX"):
+                case fourCC("ITEX"):
                     mIcon = esm.getHString();
                     break;
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
diff --git a/components/esm3/loadland.cpp b/components/esm3/loadland.cpp
index f9563411a3..71b020f767 100644
--- a/components/esm3/loadland.cpp
+++ b/components/esm3/loadland.cpp
@@ -46,7 +46,7 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::fourCC("INTV"):
+                case fourCC("INTV"):
                     esm.getSubHeader();
                     if (esm.getSubSize() != 8)
                         esm.fail("Subrecord size is not equal to 8");
@@ -54,10 +54,10 @@ namespace ESM
                     esm.getT<int>(mY);
                     hasLocation = true;
                     break;
-                case ESM::fourCC("DATA"):
+                case fourCC("DATA"):
                     esm.getHT(mFlags);
                     break;
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
@@ -82,23 +82,23 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::fourCC("VNML"):
+                case fourCC("VNML"):
                     esm.skipHSub();
                     mDataTypes |= DATA_VNML;
                     break;
-                case ESM::fourCC("VHGT"):
+                case fourCC("VHGT"):
                     esm.skipHSub();
                     mDataTypes |= DATA_VHGT;
                     break;
-                case ESM::fourCC("WNAM"):
+                case fourCC("WNAM"):
                     esm.getHExact(mWnam, sizeof(mWnam));
                     mDataTypes |= DATA_WNAM;
                     break;
-                case ESM::fourCC("VCLR"):
+                case fourCC("VCLR"):
                     esm.skipHSub();
                     mDataTypes |= DATA_VCLR;
                     break;
-                case ESM::fourCC("VTEX"):
+                case fourCC("VTEX"):
                     esm.skipHSub();
                     mDataTypes |= DATA_VTEX;
                     break;
@@ -162,12 +162,12 @@ namespace ESM
                 signed char wnam[LAND_GLOBAL_MAP_LOD_SIZE];
                 constexpr float max = std::numeric_limits<signed char>::max();
                 constexpr float min = std::numeric_limits<signed char>::min();
-                constexpr float vertMult = static_cast<float>(ESM::Land::LAND_SIZE - 1) / LAND_GLOBAL_MAP_LOD_SIZE_SQRT;
+                constexpr float vertMult = static_cast<float>(Land::LAND_SIZE - 1) / LAND_GLOBAL_MAP_LOD_SIZE_SQRT;
                 for (int row = 0; row < LAND_GLOBAL_MAP_LOD_SIZE_SQRT; ++row)
                 {
                     for (int col = 0; col < LAND_GLOBAL_MAP_LOD_SIZE_SQRT; ++col)
                     {
-                        float height = mLandData->mHeights[int(row * vertMult) * ESM::Land::LAND_SIZE + int(col * vertMult)];
+                        float height = mLandData->mHeights[int(row * vertMult) * Land::LAND_SIZE + int(col * vertMult)];
                         height /= height > 0 ? 128.f : 16.f;
                         height = std::clamp(height, min, max);
                         wnam[row * LAND_GLOBAL_MAP_LOD_SIZE_SQRT + col] = static_cast<signed char>(height);
@@ -246,7 +246,7 @@ namespace ESM
             return;
         }
 
-        ESM::ESMReader reader;
+        ESMReader reader;
         reader.restoreContext(mContext);
 
         if (reader.isNextSub("VNML")) {
@@ -306,7 +306,7 @@ namespace ESM
         }
     }
 
-    bool Land::condLoad(ESM::ESMReader& reader, int flags, int& targetFlags, int dataFlag, void *ptr, unsigned int size) const
+    bool Land::condLoad(ESMReader& reader, int flags, int& targetFlags, int dataFlag, void *ptr, unsigned int size) const
     {
         if ((targetFlags & dataFlag) == 0 && (flags & dataFlag) != 0) {
             reader.getHExact(ptr, size);
diff --git a/components/esm3/loadland.hpp b/components/esm3/loadland.hpp
index 1244a955cf..28bd36b8c7 100644
--- a/components/esm3/loadland.hpp
+++ b/components/esm3/loadland.hpp
@@ -109,7 +109,7 @@ struct Land
         // 24-bit normals, these aren't always correct though. Edge and corner normals may be garbage.
         VNML mNormals[LAND_NUM_VERTS * 3];
 
-        // 2D array of texture indices. An index can be used to look up an ESM::LandTexture,
+        // 2D array of texture indices. An index can be used to look up an LandTexture,
         // but to do so you must subtract 1 from the index first!
         // An index of 0 indicates the default texture.
         uint16_t mTextures[LAND_NUM_TEXTURES];
@@ -179,7 +179,7 @@ struct Land
         /// Loads data and marks it as loaded
         /// \return true if data is actually loaded from file, false otherwise
         /// including the case when data is already loaded
-        bool condLoad(ESM::ESMReader& reader, int flags, int& targetFlags, int dataFlag, void *ptr, unsigned int size) const;
+        bool condLoad(ESMReader& reader, int flags, int& targetFlags, int dataFlag, void *ptr, unsigned int size) const;
 
         mutable LandData *mLandData;
 };
diff --git a/components/esm3/loadlevlist.cpp b/components/esm3/loadlevlist.cpp
index ace5304152..51055103bf 100644
--- a/components/esm3/loadlevlist.cpp
+++ b/components/esm3/loadlevlist.cpp
@@ -6,7 +6,7 @@
 
 namespace ESM
 {
-    void LevelledListBase::load(ESMReader& esm, ESM::NAME recName, bool& isDeleted)
+    void LevelledListBase::load(ESMReader& esm, NAME recName, bool& isDeleted)
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
@@ -18,17 +18,17 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::SREC_NAME:
+                case SREC_NAME:
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::fourCC("DATA"):
+                case fourCC("DATA"):
                     esm.getHT(mFlags);
                     break;
-                case ESM::fourCC("NNAM"):
+                case fourCC("NNAM"):
                     esm.getHT(mChanceNone);
                     break;
-                case ESM::fourCC("INDX"):
+                case fourCC("INDX"):
                 {
                     int length = 0;
                     esm.getHT(length);
@@ -50,7 +50,7 @@ namespace ESM
                     hasList = true;
                     break;
                 }
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
@@ -75,7 +75,7 @@ namespace ESM
             esm.fail("Missing NAME subrecord");
     }
 
-    void LevelledListBase::save(ESMWriter& esm, ESM::NAME recName, bool isDeleted) const
+    void LevelledListBase::save(ESMWriter& esm, NAME recName, bool isDeleted) const
     {
         esm.writeHNCString("NAME", mId);
 
diff --git a/components/esm3/loadlevlist.hpp b/components/esm3/loadlevlist.hpp
index 3e75ad7c70..d73003fdda 100644
--- a/components/esm3/loadlevlist.hpp
+++ b/components/esm3/loadlevlist.hpp
@@ -36,8 +36,8 @@ struct LevelledListBase
 
     std::vector<LevelItem> mList;
 
-    void load(ESMReader& esm, ESM::NAME recName, bool& isDeleted);
-    void save(ESMWriter& esm, ESM::NAME recName, bool isDeleted) const;
+    void load(ESMReader& esm, NAME recName, bool& isDeleted);
+    void save(ESMWriter& esm, NAME recName, bool isDeleted) const;
 
     void blank();
     ///< Set record to default state (does not touch the ID).
@@ -53,7 +53,7 @@ struct CustomLevelledListBase : LevelledListBase
 struct CreatureLevList : CustomLevelledListBase<CreatureLevList>
 {
     /// Record name used to read references.
-    static constexpr ESM::NAME sRecName {"CNAM"};
+    static constexpr NAME sRecName {"CNAM"};
     static constexpr RecNameInts sRecordId = RecNameInts::REC_LEVC;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "CreatureLevList"; }
@@ -70,7 +70,7 @@ struct CreatureLevList : CustomLevelledListBase<CreatureLevList>
 struct ItemLevList : CustomLevelledListBase<ItemLevList>
 {
     /// Record name used to read references.
-    static constexpr ESM::NAME sRecName {"INAM"};
+    static constexpr NAME sRecName {"INAM"};
     static constexpr RecNameInts sRecordId = RecNameInts::REC_LEVI;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "ItemLevList"; }
diff --git a/components/esm3/loadligh.cpp b/components/esm3/loadligh.cpp
index 7b3c6e8787..da45674e85 100644
--- a/components/esm3/loadligh.cpp
+++ b/components/esm3/loadligh.cpp
@@ -20,30 +20,30 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::SREC_NAME:
+                case SREC_NAME:
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::fourCC("MODL"):
+                case fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::fourCC("FNAM"):
+                case fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::fourCC("ITEX"):
+                case fourCC("ITEX"):
                     mIcon = esm.getHString();
                     break;
-                case ESM::fourCC("LHDT"):
+                case fourCC("LHDT"):
                     esm.getHTSized<24>(mData);
                     hasData = true;
                     break;
-                case ESM::fourCC("SCRI"):
+                case fourCC("SCRI"):
                     mScript = esm.getHString();
                     break;
-                case ESM::fourCC("SNAM"):
+                case fourCC("SNAM"):
                     mSound = esm.getHString();
                     break;
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
diff --git a/components/esm3/loadlock.cpp b/components/esm3/loadlock.cpp
index 0bdcbba635..e298001cb6 100644
--- a/components/esm3/loadlock.cpp
+++ b/components/esm3/loadlock.cpp
@@ -20,27 +20,27 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::SREC_NAME:
+                case SREC_NAME:
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::fourCC("MODL"):
+                case fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::fourCC("FNAM"):
+                case fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::fourCC("LKDT"):
+                case fourCC("LKDT"):
                     esm.getHTSized<16>(mData);
                     hasData = true;
                     break;
-                case ESM::fourCC("SCRI"):
+                case fourCC("SCRI"):
                     mScript = esm.getHString();
                     break;
-                case ESM::fourCC("ITEX"):
+                case fourCC("ITEX"):
                     mIcon = esm.getHString();
                     break;
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
diff --git a/components/esm3/loadltex.cpp b/components/esm3/loadltex.cpp
index de5eb53e56..26ce41c5b3 100644
--- a/components/esm3/loadltex.cpp
+++ b/components/esm3/loadltex.cpp
@@ -19,18 +19,18 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::SREC_NAME:
+                case SREC_NAME:
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::fourCC("INTV"):
+                case fourCC("INTV"):
                     esm.getHT(mIndex);
                     hasIndex = true;
                     break;
-                case ESM::fourCC("DATA"):
+                case fourCC("DATA"):
                     mTexture = esm.getHString();
                     break;
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
diff --git a/components/esm3/loadmgef.cpp b/components/esm3/loadmgef.cpp
index b528e8bf9a..9707f2f255 100644
--- a/components/esm3/loadmgef.cpp
+++ b/components/esm3/loadmgef.cpp
@@ -6,9 +6,11 @@
 #include "esmwriter.hpp"
 #include "components/esm/defs.hpp"
 
+namespace ESM
+{
 namespace
 {
-    static const char *sIds[ESM::MagicEffect::Length] =
+    static const char *sIds[MagicEffect::Length] =
     {
         "WaterBreathing",
         "SwiftSwim",
@@ -181,6 +183,7 @@ namespace
         0x11c8, 0x1048, 0x1048, 0x1048, 0x1048, 0x1048, 0x1048
     };
 }
+}
 
 namespace ESM
 {
@@ -211,37 +214,37 @@ void MagicEffect::load(ESMReader &esm, bool &isDeleted)
         esm.getSubName();
         switch (esm.retSubName().toInt())
         {
-            case ESM::fourCC("ITEX"):
+            case fourCC("ITEX"):
                 mIcon = esm.getHString();
                 break;
-            case ESM::fourCC("PTEX"):
+            case fourCC("PTEX"):
                 mParticle = esm.getHString();
                 break;
-            case ESM::fourCC("BSND"):
+            case fourCC("BSND"):
                 mBoltSound = esm.getHString();
                 break;
-            case ESM::fourCC("CSND"):
+            case fourCC("CSND"):
                 mCastSound = esm.getHString();
                 break;
-            case ESM::fourCC("HSND"):
+            case fourCC("HSND"):
                 mHitSound = esm.getHString();
                 break;
-            case ESM::fourCC("ASND"):
+            case fourCC("ASND"):
                 mAreaSound = esm.getHString();
                 break;
-            case ESM::fourCC("CVFX"):
+            case fourCC("CVFX"):
                 mCasting = esm.getHString();
                 break;
-            case ESM::fourCC("BVFX"):
+            case fourCC("BVFX"):
                 mBolt = esm.getHString();
                 break;
-            case ESM::fourCC("HVFX"):
+            case fourCC("HVFX"):
                 mHit = esm.getHString();
                 break;
-            case ESM::fourCC("AVFX"):
+            case fourCC("AVFX"):
                 mArea = esm.getHString();
                 break;
-            case ESM::fourCC("DESC"):
+            case fourCC("DESC"):
                 mDescription = esm.getHString();
                 break;
             default:
diff --git a/components/esm3/loadmgef.hpp b/components/esm3/loadmgef.hpp
index 00cadf99c0..64d89dab39 100644
--- a/components/esm3/loadmgef.hpp
+++ b/components/esm3/loadmgef.hpp
@@ -83,8 +83,8 @@ struct MagicEffect
     MEDTstruct mData;
 
     std::string mIcon, mParticle; // Textures
-    std::string mCasting, mHit, mArea; // ESM::Static
-    std::string mBolt; // ESM::Weapon
+    std::string mCasting, mHit, mArea; // Static
+    std::string mBolt; // Weapon
     std::string mCastSound, mBoltSound, mHitSound, mAreaSound; // Sounds
     std::string mDescription;
 
diff --git a/components/esm3/loadmisc.cpp b/components/esm3/loadmisc.cpp
index bbf1ac0635..db6a050a24 100644
--- a/components/esm3/loadmisc.cpp
+++ b/components/esm3/loadmisc.cpp
@@ -20,27 +20,27 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::SREC_NAME:
+                case SREC_NAME:
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::fourCC("MODL"):
+                case fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::fourCC("FNAM"):
+                case fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::fourCC("MCDT"):
+                case fourCC("MCDT"):
                     esm.getHTSized<12>(mData);
                     hasData = true;
                     break;
-                case ESM::fourCC("SCRI"):
+                case fourCC("SCRI"):
                     mScript = esm.getHString();
                     break;
-                case ESM::fourCC("ITEX"):
+                case fourCC("ITEX"):
                     mIcon = esm.getHString();
                     break;
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
diff --git a/components/esm3/loadnpc.cpp b/components/esm3/loadnpc.cpp
index 338b453a5a..6c0b8d0a68 100644
--- a/components/esm3/loadnpc.cpp
+++ b/components/esm3/loadnpc.cpp
@@ -28,35 +28,35 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::SREC_NAME:
+                case SREC_NAME:
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::fourCC("MODL"):
+                case fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::fourCC("FNAM"):
+                case fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::fourCC("RNAM"):
+                case fourCC("RNAM"):
                     mRace = esm.getHString();
                     break;
-                case ESM::fourCC("CNAM"):
+                case fourCC("CNAM"):
                     mClass = esm.getHString();
                     break;
-                case ESM::fourCC("ANAM"):
+                case fourCC("ANAM"):
                     mFaction = esm.getHString();
                     break;
-                case ESM::fourCC("BNAM"):
+                case fourCC("BNAM"):
                     mHead = esm.getHString();
                     break;
-                case ESM::fourCC("KNAM"):
+                case fourCC("KNAM"):
                     mHair = esm.getHString();
                     break;
-                case ESM::fourCC("SCRI"):
+                case fourCC("SCRI"):
                     mScript = esm.getHString();
                     break;
-                case ESM::fourCC("NPDT"):
+                case fourCC("NPDT"):
                     hasNpdt = true;
                     esm.getSubHeader();
                     if (esm.getSubSize() == 52)
@@ -83,24 +83,24 @@ namespace ESM
                     else
                         esm.fail("NPC_NPDT must be 12 or 52 bytes long");
                     break;
-                case ESM::fourCC("FLAG"):
+                case fourCC("FLAG"):
                     hasFlags = true;
                     int flags;
                     esm.getHT(flags);
                     mFlags = flags & 0xFF;
                     mBloodType = ((flags >> 8) & 0xFF) >> 2;
                     break;
-                case ESM::fourCC("NPCS"):
+                case fourCC("NPCS"):
                     mSpells.add(esm);
                     break;
-                case ESM::fourCC("NPCO"):
+                case fourCC("NPCO"):
                     mInventory.add(esm);
                     break;
-                case ESM::fourCC("AIDT"):
+                case fourCC("AIDT"):
                     esm.getHExact(&mAiData, sizeof(mAiData));
                     break;
-                case ESM::fourCC("DODT"):
-                case ESM::fourCC("DNAM"):
+                case fourCC("DODT"):
+                case fourCC("DNAM"):
                     mTransport.add(esm);
                     break;
                 case AI_Wander:
@@ -111,7 +111,7 @@ namespace ESM
                 case AI_CNDT:
                     mAiPackage.add(esm);
                     break;
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
diff --git a/components/esm3/loadnpc.hpp b/components/esm3/loadnpc.hpp
index 24752beb11..b215a346bc 100644
--- a/components/esm3/loadnpc.hpp
+++ b/components/esm3/loadnpc.hpp
@@ -11,7 +11,8 @@
 #include "loadskil.hpp"
 #include "transport.hpp"
 
-namespace ESM {
+namespace ESM
+{
 
 class ESMReader;
 class ESMWriter;
diff --git a/components/esm3/loadpgrd.cpp b/components/esm3/loadpgrd.cpp
index ed2ab2c5d3..f9204175fb 100644
--- a/components/esm3/loadpgrd.cpp
+++ b/components/esm3/loadpgrd.cpp
@@ -48,14 +48,14 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::SREC_NAME:
+                case SREC_NAME:
                     mCell = esm.getHString();
                     break;
-                case ESM::fourCC("DATA"):
+                case fourCC("DATA"):
                     esm.getHTSized<12>(mData);
                     hasData = true;
                     break;
-                case ESM::fourCC("PGRP"):
+                case fourCC("PGRP"):
                 {
                     esm.getSubHeader();
                     int size = esm.getSubSize();
@@ -76,7 +76,7 @@ namespace ESM
                     }
                     break;
                 }
-                case ESM::fourCC("PGRC"):
+                case fourCC("PGRC"):
                 {
                     esm.getSubHeader();
                     int size = esm.getSubSize();
@@ -113,7 +113,7 @@ namespace ESM
                     }
                     break;
                 }
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
diff --git a/components/esm3/loadprob.cpp b/components/esm3/loadprob.cpp
index f084732775..6299286ea8 100644
--- a/components/esm3/loadprob.cpp
+++ b/components/esm3/loadprob.cpp
@@ -20,27 +20,27 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::SREC_NAME:
+                case SREC_NAME:
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::fourCC("MODL"):
+                case fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::fourCC("FNAM"):
+                case fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::fourCC("PBDT"):
+                case fourCC("PBDT"):
                     esm.getHTSized<16>(mData);
                     hasData = true;
                     break;
-                case ESM::fourCC("SCRI"):
+                case fourCC("SCRI"):
                     mScript = esm.getHString();
                     break;
-                case ESM::fourCC("ITEX"):
+                case fourCC("ITEX"):
                     mIcon = esm.getHString();
                     break;
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
diff --git a/components/esm3/loadrace.cpp b/components/esm3/loadrace.cpp
index 9520b792ed..e2b5a1fcf8 100644
--- a/components/esm3/loadrace.cpp
+++ b/components/esm3/loadrace.cpp
@@ -32,24 +32,24 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::SREC_NAME:
+                case SREC_NAME:
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::fourCC("FNAM"):
+                case fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::fourCC("RADT"):
+                case fourCC("RADT"):
                     esm.getHTSized<140>(mData);
                     hasData = true;
                     break;
-                case ESM::fourCC("DESC"):
+                case fourCC("DESC"):
                     mDescription = esm.getHString();
                     break;
-                case ESM::fourCC("NPCS"):
+                case fourCC("NPCS"):
                     mPowers.add(esm);
                     break;
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
diff --git a/components/esm3/loadregn.cpp b/components/esm3/loadregn.cpp
index e2682e644e..99f09b7fad 100644
--- a/components/esm3/loadregn.cpp
+++ b/components/esm3/loadregn.cpp
@@ -19,14 +19,14 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::SREC_NAME:
+                case SREC_NAME:
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::fourCC("FNAM"):
+                case fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::fourCC("WEAT"):
+                case fourCC("WEAT"):
                 {
                     esm.getSubHeader();
                     if (esm.getVer() == VER_12)
@@ -55,13 +55,13 @@ namespace ESM
                     }
                     break;
                 }
-                case ESM::fourCC("BNAM"):
+                case fourCC("BNAM"):
                     mSleepList = esm.getHString();
                     break;
-                case ESM::fourCC("CNAM"):
+                case fourCC("CNAM"):
                     esm.getHT(mMapColor);
                     break;
-                case ESM::fourCC("SNAM"):
+                case fourCC("SNAM"):
                 {
                     esm.getSubHeader();
                     SoundRef sr;
@@ -70,7 +70,7 @@ namespace ESM
                     mSoundList.push_back(sr);
                     break;
                 }
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
diff --git a/components/esm3/loadrepa.cpp b/components/esm3/loadrepa.cpp
index 16dd296a25..8d09083cad 100644
--- a/components/esm3/loadrepa.cpp
+++ b/components/esm3/loadrepa.cpp
@@ -20,27 +20,27 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::SREC_NAME:
+                case SREC_NAME:
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::fourCC("MODL"):
+                case fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::fourCC("FNAM"):
+                case fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::fourCC("RIDT"):
+                case fourCC("RIDT"):
                     esm.getHTSized<16>(mData);
                     hasData = true;
                     break;
-                case ESM::fourCC("SCRI"):
+                case fourCC("SCRI"):
                     mScript = esm.getHString();
                     break;
-                case ESM::fourCC("ITEX"):
+                case fourCC("ITEX"):
                     mIcon = esm.getHString();
                     break;
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
diff --git a/components/esm3/loadscpt.cpp b/components/esm3/loadscpt.cpp
index b97a148963..1e5d342fa3 100644
--- a/components/esm3/loadscpt.cpp
+++ b/components/esm3/loadscpt.cpp
@@ -95,7 +95,7 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::fourCC("SCHD"):
+                case fourCC("SCHD"):
                 {
                     esm.getSubHeader();
                     mId = esm.getString(32);
@@ -104,11 +104,11 @@ namespace ESM
                     hasHeader = true;
                     break;
                 }
-                case ESM::fourCC("SCVR"):
+                case fourCC("SCVR"):
                     // list of local variables
                     loadSCVR(esm);
                     break;
-                case ESM::fourCC("SCDT"):
+                case fourCC("SCDT"):
                 {
                     // compiled script
                     esm.getSubHeader();
@@ -127,10 +127,10 @@ namespace ESM
                     esm.getExact(mScriptData.data(), mScriptData.size());
                     break;
                 }
-                case ESM::fourCC("SCTX"):
+                case fourCC("SCTX"):
                     mScriptText = esm.getHString();
                     break;
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
diff --git a/components/esm3/loadskil.cpp b/components/esm3/loadskil.cpp
index f7bb0c49d6..86ffda4fd9 100644
--- a/components/esm3/loadskil.cpp
+++ b/components/esm3/loadskil.cpp
@@ -139,15 +139,15 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::fourCC("INDX"):
+                case fourCC("INDX"):
                     esm.getHT(mIndex);
                     hasIndex = true;
                     break;
-                case ESM::fourCC("SKDT"):
+                case fourCC("SKDT"):
                     esm.getHTSized<24>(mData);
                     hasData = true;
                     break;
-                case ESM::fourCC("DESC"):
+                case fourCC("DESC"):
                     mDescription = esm.getHString();
                     break;
                 default:
diff --git a/components/esm3/loadskil.hpp b/components/esm3/loadskil.hpp
index cd4cad6a71..58e1fa6deb 100644
--- a/components/esm3/loadskil.hpp
+++ b/components/esm3/loadskil.hpp
@@ -6,7 +6,8 @@
 
 #include "components/esm/defs.hpp"
 
-namespace ESM {
+namespace ESM
+{
 
 class ESMReader;
 class ESMWriter;
diff --git a/components/esm3/loadsndg.cpp b/components/esm3/loadsndg.cpp
index 5519d835b4..9113d1ac3d 100644
--- a/components/esm3/loadsndg.cpp
+++ b/components/esm3/loadsndg.cpp
@@ -20,21 +20,21 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::SREC_NAME:
+                case SREC_NAME:
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::fourCC("DATA"):
+                case fourCC("DATA"):
                     esm.getHTSized<4>(mType);
                     hasData = true;
                     break;
-                case ESM::fourCC("CNAM"):
+                case fourCC("CNAM"):
                     mCreature = esm.getHString();
                     break;
-                case ESM::fourCC("SNAM"):
+                case fourCC("SNAM"):
                     mSound = esm.getHString();
                     break;
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
diff --git a/components/esm3/loadsoun.cpp b/components/esm3/loadsoun.cpp
index 0ddda2d6b2..9904d5d0fb 100644
--- a/components/esm3/loadsoun.cpp
+++ b/components/esm3/loadsoun.cpp
@@ -20,18 +20,18 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::SREC_NAME:
+                case SREC_NAME:
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::fourCC("FNAM"):
+                case fourCC("FNAM"):
                     mSound = esm.getHString();
                     break;
-                case ESM::fourCC("DATA"):
+                case fourCC("DATA"):
                     esm.getHTSized<3>(mData);
                     hasData = true;
                     break;
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
diff --git a/components/esm3/loadspel.cpp b/components/esm3/loadspel.cpp
index f2891c2b6c..bb0c866c5e 100644
--- a/components/esm3/loadspel.cpp
+++ b/components/esm3/loadspel.cpp
@@ -22,23 +22,23 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::SREC_NAME:
+                case SREC_NAME:
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::fourCC("FNAM"):
+                case fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::fourCC("SPDT"):
+                case fourCC("SPDT"):
                     esm.getHTSized<12>(mData);
                     hasData = true;
                     break;
-                case ESM::fourCC("ENAM"):
+                case fourCC("ENAM"):
                     ENAMstruct s;
                     esm.getHTSized<24>(s);
                     mEffects.mList.push_back(s);
                     break;
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
diff --git a/components/esm3/loadsscr.cpp b/components/esm3/loadsscr.cpp
index 03c5b49380..3f7a4fe19d 100644
--- a/components/esm3/loadsscr.cpp
+++ b/components/esm3/loadsscr.cpp
@@ -20,15 +20,15 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::SREC_NAME:
+                case SREC_NAME:
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::fourCC("DATA"):
+                case fourCC("DATA"):
                     mData = esm.getHString();
                     hasData = true;
                     break;
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
diff --git a/components/esm3/loadstat.cpp b/components/esm3/loadstat.cpp
index fd557d37d5..cb7c9fa2df 100644
--- a/components/esm3/loadstat.cpp
+++ b/components/esm3/loadstat.cpp
@@ -12,8 +12,8 @@ namespace ESM
     {
         isDeleted = false;
         mRecordFlags = esm.getRecordFlags();
-        //bool isBlocked = (mRecordFlags & ESM::FLAG_Blocked) != 0;
-        //bool isPersistent = (mRecordFlags & ESM::FLAG_Persistent) != 0;
+        //bool isBlocked = (mRecordFlags & FLAG_Blocked) != 0;
+        //bool isPersistent = (mRecordFlags & FLAG_Persistent) != 0;
 
         bool hasName = false;
         while (esm.hasMoreSubs())
@@ -21,14 +21,14 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::SREC_NAME:
+                case SREC_NAME:
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::fourCC("MODL"):
+                case fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
diff --git a/components/esm3/loadstat.hpp b/components/esm3/loadstat.hpp
index 26d8fda3a8..71f927d21c 100644
--- a/components/esm3/loadstat.hpp
+++ b/components/esm3/loadstat.hpp
@@ -3,7 +3,8 @@
 
 #include <string>
 
-namespace ESM {
+namespace ESM
+{
 
 class ESMReader;
 class ESMWriter;
diff --git a/components/esm3/loadtes3.cpp b/components/esm3/loadtes3.cpp
index e39d65298c..0c3ccf232e 100644
--- a/components/esm3/loadtes3.cpp
+++ b/components/esm3/loadtes3.cpp
@@ -5,9 +5,12 @@
 #include "esmwriter.hpp"
 #include "components/esm/defs.hpp"
 
-void ESM::Header::blank()
+namespace ESM
 {
-    mData.version = ESM::VER_13;
+
+void Header::blank()
+{
+    mData.version = VER_13;
     mData.type = 0;
     mData.author.clear();
     mData.desc.clear();
@@ -16,7 +19,7 @@ void ESM::Header::blank()
     mMaster.clear();
 }
 
-void ESM::Header::load (ESMReader &esm)
+void Header::load (ESMReader &esm)
 {
     if (esm.isNextSub ("FORM"))
     {
@@ -65,7 +68,7 @@ void ESM::Header::load (ESMReader &esm)
     }
 }
 
-void ESM::Header::save (ESMWriter &esm)
+void Header::save (ESMWriter &esm)
 {
     if (mFormat>0)
         esm.writeHNT ("FORM", mFormat);
@@ -84,3 +87,5 @@ void ESM::Header::save (ESMWriter &esm)
         esm.writeHNT ("DATA", data.size);
     }
 }
+
+}
diff --git a/components/esm3/loadweap.cpp b/components/esm3/loadweap.cpp
index 452036cb95..696194f969 100644
--- a/components/esm3/loadweap.cpp
+++ b/components/esm3/loadweap.cpp
@@ -20,30 +20,30 @@ namespace ESM
             esm.getSubName();
             switch (esm.retSubName().toInt())
             {
-                case ESM::SREC_NAME:
+                case SREC_NAME:
                     mId = esm.getHString();
                     hasName = true;
                     break;
-                case ESM::fourCC("MODL"):
+                case fourCC("MODL"):
                     mModel = esm.getHString();
                     break;
-                case ESM::fourCC("FNAM"):
+                case fourCC("FNAM"):
                     mName = esm.getHString();
                     break;
-                case ESM::fourCC("WPDT"):
+                case fourCC("WPDT"):
                     esm.getHTSized<32>(mData);
                     hasData = true;
                     break;
-                case ESM::fourCC("SCRI"):
+                case fourCC("SCRI"):
                     mScript = esm.getHString();
                     break;
-                case ESM::fourCC("ITEX"):
+                case fourCC("ITEX"):
                     mIcon = esm.getHString();
                     break;
-                case ESM::fourCC("ENAM"):
+                case fourCC("ENAM"):
                     mEnchant = esm.getHString();
                     break;
-                case ESM::SREC_DELE:
+                case SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
                     break;
diff --git a/components/esm3/loadweap.hpp b/components/esm3/loadweap.hpp
index 98ba57b8b8..e75e12d685 100644
--- a/components/esm3/loadweap.hpp
+++ b/components/esm3/loadweap.hpp
@@ -105,7 +105,7 @@ struct WeaponType
     std::string mSoundId;
     std::string mAttachBone;
     std::string mSheathingBone;
-    ESM::Skill::SkillEnum mSkill;
+    Skill::SkillEnum mSkill;
     Class mWeaponClass;
     int mAmmoType;
     int mFlags;
diff --git a/components/esm3/locals.cpp b/components/esm3/locals.cpp
index 4149695fe9..7db0e544ec 100644
--- a/components/esm3/locals.cpp
+++ b/components/esm3/locals.cpp
@@ -3,7 +3,10 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
-void ESM::Locals::load (ESMReader &esm)
+namespace ESM
+{
+
+void Locals::load (ESMReader &esm)
 {
     while (esm.isNextSub ("LOCA"))
     {
@@ -16,7 +19,7 @@ void ESM::Locals::load (ESMReader &esm)
     }
 }
 
-void ESM::Locals::save (ESMWriter &esm) const
+void Locals::save (ESMWriter &esm) const
 {
     for (std::vector<std::pair<std::string, Variant> >::const_iterator iter (mVariables.begin());
         iter!=mVariables.end(); ++iter)
@@ -25,3 +28,5 @@ void ESM::Locals::save (ESMWriter &esm) const
         iter->second.write (esm, Variant::Format_Local);
     }
 }
+
+}
diff --git a/components/esm3/mappings.cpp b/components/esm3/mappings.cpp
index 440e735739..4553c1396f 100644
--- a/components/esm3/mappings.cpp
+++ b/components/esm3/mappings.cpp
@@ -4,128 +4,128 @@
 
 namespace ESM
 {
-    ESM::BodyPart::MeshPart getMeshPart(ESM::PartReferenceType type)
+    BodyPart::MeshPart getMeshPart(PartReferenceType type)
     {
         switch(type)
         {
-            case ESM::PRT_Head:
-                return ESM::BodyPart::MP_Head;
-            case ESM::PRT_Hair:
-                return ESM::BodyPart::MP_Hair;
-            case ESM::PRT_Neck:
-                return ESM::BodyPart::MP_Neck;
-            case ESM::PRT_Cuirass:
-                return ESM::BodyPart::MP_Chest;
-            case ESM::PRT_Groin:
-                return ESM::BodyPart::MP_Groin;
-            case ESM::PRT_RHand:
-                return ESM::BodyPart::MP_Hand;
-            case ESM::PRT_LHand:
-                return ESM::BodyPart::MP_Hand;
-            case ESM::PRT_RWrist:
-                return ESM::BodyPart::MP_Wrist;
-            case ESM::PRT_LWrist:
-                return ESM::BodyPart::MP_Wrist;
-            case ESM::PRT_RForearm:
-                return ESM::BodyPart::MP_Forearm;
-            case ESM::PRT_LForearm:
-                return ESM::BodyPart::MP_Forearm;
-            case ESM::PRT_RUpperarm:
-                return ESM::BodyPart::MP_Upperarm;
-            case ESM::PRT_LUpperarm:
-                return ESM::BodyPart::MP_Upperarm;
-            case ESM::PRT_RFoot:
-                return ESM::BodyPart::MP_Foot;
-            case ESM::PRT_LFoot:
-                return ESM::BodyPart::MP_Foot;
-            case ESM::PRT_RAnkle:
-                return ESM::BodyPart::MP_Ankle;
-            case ESM::PRT_LAnkle:
-                return ESM::BodyPart::MP_Ankle;
-            case ESM::PRT_RKnee:
-                return ESM::BodyPart::MP_Knee;
-            case ESM::PRT_LKnee:
-                return ESM::BodyPart::MP_Knee;
-            case ESM::PRT_RLeg:
-                return ESM::BodyPart::MP_Upperleg;
-            case ESM::PRT_LLeg:
-                return ESM::BodyPart::MP_Upperleg;
-            case ESM::PRT_Tail:
-                return ESM::BodyPart::MP_Tail;
+            case PRT_Head:
+                return BodyPart::MP_Head;
+            case PRT_Hair:
+                return BodyPart::MP_Hair;
+            case PRT_Neck:
+                return BodyPart::MP_Neck;
+            case PRT_Cuirass:
+                return BodyPart::MP_Chest;
+            case PRT_Groin:
+                return BodyPart::MP_Groin;
+            case PRT_RHand:
+                return BodyPart::MP_Hand;
+            case PRT_LHand:
+                return BodyPart::MP_Hand;
+            case PRT_RWrist:
+                return BodyPart::MP_Wrist;
+            case PRT_LWrist:
+                return BodyPart::MP_Wrist;
+            case PRT_RForearm:
+                return BodyPart::MP_Forearm;
+            case PRT_LForearm:
+                return BodyPart::MP_Forearm;
+            case PRT_RUpperarm:
+                return BodyPart::MP_Upperarm;
+            case PRT_LUpperarm:
+                return BodyPart::MP_Upperarm;
+            case PRT_RFoot:
+                return BodyPart::MP_Foot;
+            case PRT_LFoot:
+                return BodyPart::MP_Foot;
+            case PRT_RAnkle:
+                return BodyPart::MP_Ankle;
+            case PRT_LAnkle:
+                return BodyPart::MP_Ankle;
+            case PRT_RKnee:
+                return BodyPart::MP_Knee;
+            case PRT_LKnee:
+                return BodyPart::MP_Knee;
+            case PRT_RLeg:
+                return BodyPart::MP_Upperleg;
+            case PRT_LLeg:
+                return BodyPart::MP_Upperleg;
+            case PRT_Tail:
+                return BodyPart::MP_Tail;
             default:
                 throw std::runtime_error("PartReferenceType " +
                     std::to_string(type) + " not associated with a mesh part");
         }
     }
 
-    std::string getBoneName(ESM::PartReferenceType type)
+    std::string getBoneName(PartReferenceType type)
     {
         switch(type)
         {
-            case ESM::PRT_Head:
+            case PRT_Head:
                 return "head";
-            case ESM::PRT_Hair:
+            case PRT_Hair:
                 return "head"; // This is purposeful.
-            case ESM::PRT_Neck:
+            case PRT_Neck:
                 return "neck";
-            case ESM::PRT_Cuirass:
+            case PRT_Cuirass:
                 return "chest";
-            case ESM::PRT_Groin:
+            case PRT_Groin:
                 return "groin";
-            case ESM::PRT_Skirt:
+            case PRT_Skirt:
                 return "groin";
-            case ESM::PRT_RHand:
+            case PRT_RHand:
                 return "right hand";
-            case ESM::PRT_LHand:
+            case PRT_LHand:
                 return "left hand";
-            case ESM::PRT_RWrist:
+            case PRT_RWrist:
                 return "right wrist";
-            case ESM::PRT_LWrist:
+            case PRT_LWrist:
                 return "left wrist";
-            case ESM::PRT_Shield:
+            case PRT_Shield:
                 return "shield bone";
-            case ESM::PRT_RForearm:
+            case PRT_RForearm:
                 return "right forearm";
-            case ESM::PRT_LForearm:
+            case PRT_LForearm:
                 return "left forearm";
-            case ESM::PRT_RUpperarm:
+            case PRT_RUpperarm:
                 return "right upper arm";
-            case ESM::PRT_LUpperarm:
+            case PRT_LUpperarm:
                 return "left upper arm";
-            case ESM::PRT_RFoot:
+            case PRT_RFoot:
                 return "right foot";
-            case ESM::PRT_LFoot:
+            case PRT_LFoot:
                 return "left foot";
-            case ESM::PRT_RAnkle:
+            case PRT_RAnkle:
                 return "right ankle";
-            case ESM::PRT_LAnkle:
+            case PRT_LAnkle:
                 return "left ankle";
-            case ESM::PRT_RKnee:
+            case PRT_RKnee:
                 return "right knee";
-            case ESM::PRT_LKnee:
+            case PRT_LKnee:
                 return "left knee";
-            case ESM::PRT_RLeg:
+            case PRT_RLeg:
                 return "right upper leg";
-            case ESM::PRT_LLeg:
+            case PRT_LLeg:
                 return "left upper leg";
-            case ESM::PRT_RPauldron:
+            case PRT_RPauldron:
                 return "right clavicle";
-            case ESM::PRT_LPauldron:
+            case PRT_LPauldron:
                 return "left clavicle";
-            case ESM::PRT_Weapon:
+            case PRT_Weapon:
                 return "weapon bone";
-            case ESM::PRT_Tail:
+            case PRT_Tail:
                 return "tail";
             default:
                 throw std::runtime_error("unknown PartReferenceType");
         }
     }
 
-    std::string getMeshFilter(ESM::PartReferenceType type)
+    std::string getMeshFilter(PartReferenceType type)
     {
         switch(type)
         {
-            case ESM::PRT_Hair:
+            case PRT_Hair:
                 return "hair";
             default:
                 return getBoneName(type);
diff --git a/components/esm3/mappings.hpp b/components/esm3/mappings.hpp
index e2fa1b62c3..a6f0ec3048 100644
--- a/components/esm3/mappings.hpp
+++ b/components/esm3/mappings.hpp
@@ -8,9 +8,9 @@
 
 namespace ESM
 {
-    ESM::BodyPart::MeshPart getMeshPart(ESM::PartReferenceType type);
-    std::string getBoneName(ESM::PartReferenceType type);
-    std::string getMeshFilter(ESM::PartReferenceType type);
+    BodyPart::MeshPart getMeshPart(PartReferenceType type);
+    std::string getBoneName(PartReferenceType type);
+    std::string getMeshFilter(PartReferenceType type);
 }
 
 #endif
diff --git a/components/esm3/npcstate.cpp b/components/esm3/npcstate.cpp
index 6c9988d50d..91c6ebbf09 100644
--- a/components/esm3/npcstate.cpp
+++ b/components/esm3/npcstate.cpp
@@ -1,6 +1,9 @@
 #include "npcstate.hpp"
 
-void ESM::NpcState::load (ESMReader &esm)
+namespace ESM
+{
+
+void NpcState::load (ESMReader &esm)
 {
     ObjectState::load (esm);
 
@@ -14,7 +17,7 @@ void ESM::NpcState::load (ESMReader &esm)
     }
 }
 
-void ESM::NpcState::save (ESMWriter &esm, bool inInventory) const
+void NpcState::save (ESMWriter &esm, bool inInventory) const
 {
     ObjectState::save (esm, inInventory);
 
@@ -28,10 +31,12 @@ void ESM::NpcState::save (ESMWriter &esm, bool inInventory) const
     }
 }
 
-void ESM::NpcState::blank()
+void NpcState::blank()
 {
     ObjectState::blank();
     mNpcStats.blank();
     mCreatureStats.blank();
     mHasCustomState = true;
 }
+
+}
diff --git a/components/esm3/npcstats.cpp b/components/esm3/npcstats.cpp
index 277335e8ca..2896f6a922 100644
--- a/components/esm3/npcstats.cpp
+++ b/components/esm3/npcstats.cpp
@@ -5,9 +5,12 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
-ESM::NpcStats::Faction::Faction() : mExpelled (false), mRank (-1), mReputation (0) {}
+namespace ESM
+{
+
+NpcStats::Faction::Faction() : mExpelled (false), mRank (-1), mReputation (0) {}
 
-void ESM::NpcStats::load (ESMReader &esm)
+void NpcStats::load (ESMReader &esm)
 {
     while (esm.isNextSub ("FACT"))
     {
@@ -41,17 +44,17 @@ void ESM::NpcStats::load (ESMReader &esm)
         // we have deprecated werewolf skills, stored interleaved
         // Load into one big vector, then remove every 2nd value
         mWerewolfDeprecatedData = true;
-        std::vector<ESM::StatState<float> > skills(mSkills, mSkills + sizeof(mSkills)/sizeof(mSkills[0]));
+        std::vector<StatState<float> > skills(mSkills, mSkills + sizeof(mSkills)/sizeof(mSkills[0]));
 
         for (int i=0; i<27; ++i)
         {
-            ESM::StatState<float> skill;
+            StatState<float> skill;
             skill.load(esm, intFallback);
             skills.push_back(skill);
         }
 
         int i=0;
-        for (std::vector<ESM::StatState<float> >::iterator it = skills.begin(); it != skills.end(); ++i)
+        for (std::vector<StatState<float> >::iterator it = skills.begin(); it != skills.end(); ++i)
         {
             if (i%2 == 1)
                 it = skills.erase(it);
@@ -67,7 +70,7 @@ void ESM::NpcStats::load (ESMReader &esm)
     esm.getHNOT (hasWerewolfAttributes, "HWAT");
     if (hasWerewolfAttributes)
     {
-        ESM::StatState<int> dummy;
+        StatState<int> dummy;
         for (int i=0; i<8; ++i)
             dummy.load(esm, intFallback);
         mWerewolfDeprecatedData = true;
@@ -122,7 +125,7 @@ void ESM::NpcStats::load (ESMReader &esm)
     esm.getHNOT (mCrimeId, "CRID");
 }
 
-void ESM::NpcStats::save (ESMWriter &esm) const
+void NpcStats::save (ESMWriter &esm) const
 {
     for (std::map<std::string, Faction>::const_iterator iter (mFactions.begin());
         iter!=mFactions.end(); ++iter)
@@ -191,7 +194,7 @@ void ESM::NpcStats::save (ESMWriter &esm) const
         esm.writeHNT ("CRID", mCrimeId);
 }
 
-void ESM::NpcStats::blank()
+void NpcStats::blank()
 {
     mWerewolfDeprecatedData = false;
     mIsWerewolf = false;
@@ -207,3 +210,5 @@ void ESM::NpcStats::blank()
     mTimeToStartDrowning = 20;
     mCrimeId = -1;
 }
+
+}
diff --git a/components/esm3/objectstate.cpp b/components/esm3/objectstate.cpp
index 5204af7daf..30f6c98f38 100644
--- a/components/esm3/objectstate.cpp
+++ b/components/esm3/objectstate.cpp
@@ -8,7 +8,10 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
-void ESM::ObjectState::load (ESMReader &esm)
+namespace ESM
+{
+
+void ObjectState::load (ESMReader &esm)
 {
     mVersion = esm.getFormat();
 
@@ -56,7 +59,7 @@ void ESM::ObjectState::load (ESMReader &esm)
     esm.getHNOT (mHasCustomState, "HCUS");
 }
 
-void ESM::ObjectState::save (ESMWriter &esm, bool inInventory) const
+void ObjectState::save (ESMWriter &esm, bool inInventory) const
 {
     mRef.save (esm, true, inInventory);
 
@@ -91,7 +94,7 @@ void ESM::ObjectState::save (ESMWriter &esm, bool inInventory) const
         esm.writeHNT ("HCUS", false);
 }
 
-void ESM::ObjectState::blank()
+void ObjectState::blank()
 {
     mRef.blank();
     mHasLocals = 0;
@@ -106,74 +109,76 @@ void ESM::ObjectState::blank()
     mHasCustomState = true;
 }
 
-const ESM::NpcState& ESM::ObjectState::asNpcState() const
+const NpcState& ObjectState::asNpcState() const
 {
     std::stringstream error;
     error << "bad cast " << typeid(this).name() << " to NpcState";
     throw std::logic_error(error.str());
 }
 
-ESM::NpcState& ESM::ObjectState::asNpcState()
+NpcState& ObjectState::asNpcState()
 {
     std::stringstream error;
     error << "bad cast " << typeid(this).name() << " to NpcState";
     throw std::logic_error(error.str());
 }
 
-const ESM::CreatureState& ESM::ObjectState::asCreatureState() const
+const CreatureState& ObjectState::asCreatureState() const
 {
     std::stringstream error;
     error << "bad cast " << typeid(this).name() << " to CreatureState";
     throw std::logic_error(error.str());
 }
 
-ESM::CreatureState& ESM::ObjectState::asCreatureState()
+CreatureState& ObjectState::asCreatureState()
 {
     std::stringstream error;
     error << "bad cast " << typeid(this).name() << " to CreatureState";
     throw std::logic_error(error.str());
 }
 
-const ESM::ContainerState& ESM::ObjectState::asContainerState() const
+const ContainerState& ObjectState::asContainerState() const
 {
     std::stringstream error;
     error << "bad cast " << typeid(this).name() << " to ContainerState";
     throw std::logic_error(error.str());
 }
 
-ESM::ContainerState& ESM::ObjectState::asContainerState()
+ContainerState& ObjectState::asContainerState()
 {
     std::stringstream error;
     error << "bad cast " << typeid(this).name() << " to ContainerState";
     throw std::logic_error(error.str());
 }
 
-const ESM::DoorState& ESM::ObjectState::asDoorState() const
+const DoorState& ObjectState::asDoorState() const
 {
     std::stringstream error;
     error << "bad cast " << typeid(this).name() << " to DoorState";
     throw std::logic_error(error.str());
 }
 
-ESM::DoorState& ESM::ObjectState::asDoorState()
+DoorState& ObjectState::asDoorState()
 {
     std::stringstream error;
     error << "bad cast " << typeid(this).name() << " to DoorState";
     throw std::logic_error(error.str());
 }
 
-const ESM::CreatureLevListState& ESM::ObjectState::asCreatureLevListState() const
+const CreatureLevListState& ObjectState::asCreatureLevListState() const
 {
     std::stringstream error;
     error << "bad cast " << typeid(this).name() << " to CreatureLevListState";
     throw std::logic_error(error.str());
 }
 
-ESM::CreatureLevListState& ESM::ObjectState::asCreatureLevListState()
+CreatureLevListState& ObjectState::asCreatureLevListState()
 {
     std::stringstream error;
     error << "bad cast " << typeid(this).name() << " to CreatureLevListState";
     throw std::logic_error(error.str());
 }
 
-ESM::ObjectState::~ObjectState() {}
+ObjectState::~ObjectState() {}
+
+}
diff --git a/components/esm3/objectstate.hpp b/components/esm3/objectstate.hpp
index eb09e2e854..5a9e85b71d 100644
--- a/components/esm3/objectstate.hpp
+++ b/components/esm3/objectstate.hpp
@@ -31,7 +31,7 @@ namespace ESM
         LuaScripts mLuaScripts;
         unsigned char mEnabled;
         int mCount;
-        ESM::Position mPosition;
+        Position mPosition;
         unsigned int mFlags;
 
         // Is there any class-specific state following the ObjectState
@@ -39,7 +39,7 @@ namespace ESM
 
         unsigned int mVersion;
 
-        ESM::AnimationState mAnimationState;
+        AnimationState mAnimationState;
 
         ObjectState()
         : mHasLocals(0), mEnabled(0), mCount(0)
diff --git a/components/esm3/player.cpp b/components/esm3/player.cpp
index 1839a45749..fbf6afec93 100644
--- a/components/esm3/player.cpp
+++ b/components/esm3/player.cpp
@@ -3,7 +3,10 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
-void ESM::Player::load (ESMReader &esm)
+namespace ESM
+{
+
+void Player::load (ESMReader &esm)
 {
     mObject.mRef.loadId(esm, true);
     mObject.load (esm);
@@ -50,7 +53,7 @@ void ESM::Player::load (ESMReader &esm)
         bool clearModified = esm.getFormat() < 17 && !mObject.mNpcStats.mIsWerewolf;
         if (esm.hasMoreSubs())
         {
-            for (int i=0; i<ESM::Attribute::Length; ++i)
+            for (int i=0; i<Attribute::Length; ++i)
             {
                 StatState<float> attribute;
                 attribute.load(esm, intFallback);
@@ -60,7 +63,7 @@ void ESM::Player::load (ESMReader &esm)
                 if (mObject.mNpcStats.mIsWerewolf)
                     mObject.mCreatureStats.mAttributes[i] = attribute;
             }
-            for (int i=0; i<ESM::Skill::Length; ++i)
+            for (int i=0; i<Skill::Length; ++i)
             {
                 StatState<float> skill;
                 skill.load(esm, intFallback);
@@ -69,7 +72,7 @@ void ESM::Player::load (ESMReader &esm)
                 mSaveSkills[i] = skill.mBase + skill.mMod - skill.mDamage;
                 if (mObject.mNpcStats.mIsWerewolf)
                 {
-                    if(i == ESM::Skill::Acrobatics)
+                    if(i == Skill::Acrobatics)
                         mSetWerewolfAcrobatics = mObject.mNpcStats.mSkills[i].mBase != skill.mBase;
                     mObject.mNpcStats.mSkills[i] = skill;
                 }
@@ -84,7 +87,7 @@ void ESM::Player::load (ESMReader &esm)
     }
 }
 
-void ESM::Player::save (ESMWriter &esm) const
+void Player::save (ESMWriter &esm) const
 {
     mObject.save (esm);
 
@@ -112,3 +115,5 @@ void ESM::Player::save (ESMWriter &esm) const
     esm.writeHNT("WWAT", mSaveAttributes);
     esm.writeHNT("WWSK", mSaveSkills);
 }
+
+}
diff --git a/components/esm3/player.hpp b/components/esm3/player.hpp
index d69571705d..6e914b0e9a 100644
--- a/components/esm3/player.hpp
+++ b/components/esm3/player.hpp
@@ -24,15 +24,15 @@ namespace ESM
         float mLastKnownExteriorPosition[3];
         unsigned char mHasMark;
         bool mSetWerewolfAcrobatics;
-        ESM::Position mMarkedPosition;
+        Position mMarkedPosition;
         CellId mMarkedCell;
         std::string mBirthsign;
 
         int mCurrentCrimeId;
         int mPaidCrimeId;
 
-        float mSaveAttributes[ESM::Attribute::Length];
-        float mSaveSkills[ESM::Skill::Length];
+        float mSaveAttributes[Attribute::Length];
+        float mSaveSkills[Skill::Length];
 
         typedef std::map<std::string, std::string> PreviousItems; // previous equipped items, needed for bound spells
         PreviousItems mPreviousItems;
diff --git a/components/esm3/projectilestate.cpp b/components/esm3/projectilestate.cpp
index 3421c19526..6a2fcc6675 100644
--- a/components/esm3/projectilestate.cpp
+++ b/components/esm3/projectilestate.cpp
@@ -38,7 +38,7 @@ namespace ESM
         mSpellId = esm.getHNString("SPEL");
         if (esm.isNextSub("SRCN")) // for backwards compatibility
             esm.skipHSub();
-        ESM::EffectList().load(esm); // for backwards compatibility
+        EffectList().load(esm); // for backwards compatibility
         esm.getHNT (mSpeed, "SPED");
         if(esm.getFormat() < 17)
             mSlot = 0;
diff --git a/components/esm3/queststate.cpp b/components/esm3/queststate.cpp
index 5408cd2ffd..af7ed81f9e 100644
--- a/components/esm3/queststate.cpp
+++ b/components/esm3/queststate.cpp
@@ -3,16 +3,21 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
-void ESM::QuestState::load (ESMReader &esm)
+namespace ESM
+{
+
+void QuestState::load (ESMReader &esm)
 {
     mTopic = esm.getHNString ("YETO");
     esm.getHNOT (mState, "QSTA");
     esm.getHNOT (mFinished, "QFIN");
 }
 
-void ESM::QuestState::save (ESMWriter &esm) const
+void QuestState::save (ESMWriter &esm) const
 {
     esm.writeHNString ("YETO", mTopic);
     esm.writeHNT ("QSTA", mState);
     esm.writeHNT ("QFIN", mFinished);
 }
+
+}
diff --git a/components/esm3/savedgame.cpp b/components/esm3/savedgame.cpp
index 94ea075759..9a4997842c 100644
--- a/components/esm3/savedgame.cpp
+++ b/components/esm3/savedgame.cpp
@@ -3,10 +3,13 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
-unsigned int ESM::SavedGame::sRecordId = ESM::REC_SAVE;
-int ESM::SavedGame::sCurrentFormat = 21;
+namespace ESM
+{
+
+unsigned int SavedGame::sRecordId = REC_SAVE;
+int SavedGame::sCurrentFormat = 21;
 
-void ESM::SavedGame::load (ESMReader &esm)
+void SavedGame::load (ESMReader &esm)
 {
     mPlayerName = esm.getHNString("PLNA");
     esm.getHNOT (mPlayerLevel, "PLLE");
@@ -28,7 +31,7 @@ void ESM::SavedGame::load (ESMReader &esm)
     esm.getExact(mScreenshot.data(), mScreenshot.size());
 }
 
-void ESM::SavedGame::save (ESMWriter &esm) const
+void SavedGame::save (ESMWriter &esm) const
 {
     esm.writeHNString ("PLNA", mPlayerName);
     esm.writeHNT ("PLLE", mPlayerLevel);
@@ -51,3 +54,5 @@ void ESM::SavedGame::save (ESMWriter &esm) const
     esm.write(&mScreenshot[0], mScreenshot.size());
     esm.endRecord("SCRN");
 }
+
+}
diff --git a/components/esm3/spelllist.cpp b/components/esm3/spelllist.cpp
index 71c7b340d2..168a8c7448 100644
--- a/components/esm3/spelllist.cpp
+++ b/components/esm3/spelllist.cpp
@@ -3,7 +3,8 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
-namespace ESM {
+namespace ESM
+{
 
 void SpellList::add(ESMReader &esm)
 {
diff --git a/components/esm3/statstate.cpp b/components/esm3/statstate.cpp
index 30d39e3c67..4e37df7d79 100644
--- a/components/esm3/statstate.cpp
+++ b/components/esm3/statstate.cpp
@@ -70,7 +70,7 @@ namespace ESM
         if (mProgress)
             esm.writeHNT("STPR", mProgress);
     }
-}
 
-template struct ESM::StatState<int>;
-template struct ESM::StatState<float>;
+    template struct StatState<int>;
+    template struct StatState<float>;
+}
diff --git a/components/esm3/stolenitems.hpp b/components/esm3/stolenitems.hpp
index 928fbbf757..cd7fe5a6c8 100644
--- a/components/esm3/stolenitems.hpp
+++ b/components/esm3/stolenitems.hpp
@@ -15,8 +15,8 @@ namespace ESM
         typedef std::map<std::string, std::map<std::pair<std::string, bool>, int> > StolenItemsMap;
         StolenItemsMap mStolenItems;
 
-        void load(ESM::ESMReader& esm);
-        void write(ESM::ESMWriter& esm) const;
+        void load(ESMReader& esm);
+        void write(ESMWriter& esm) const;
     };
 
 }
diff --git a/components/esm3/transport.cpp b/components/esm3/transport.cpp
index 40f831e748..b79818a228 100644
--- a/components/esm3/transport.cpp
+++ b/components/esm3/transport.cpp
@@ -10,13 +10,13 @@ namespace ESM
 
     void Transport::add(ESMReader &esm)
     {
-        if (esm.retSubName().toInt() == ESM::fourCC("DODT"))
+        if (esm.retSubName().toInt() == fourCC("DODT"))
         {
             Dest dodt;
             esm.getHExact(&dodt.mPos, 24);
             mList.push_back(dodt);
         }
-        else if (esm.retSubName().toInt() == ESM::fourCC("DNAM"))
+        else if (esm.retSubName().toInt() == fourCC("DNAM"))
         {
             const std::string name = esm.getHString();
             if (mList.empty())
diff --git a/components/esm3/variant.cpp b/components/esm3/variant.cpp
index c50581327d..b7dc293f53 100644
--- a/components/esm3/variant.cpp
+++ b/components/esm3/variant.cpp
@@ -8,12 +8,14 @@
 
 #include "components/esm/defs.hpp"
 
+namespace ESM
+{
 namespace
 {
-    constexpr uint32_t STRV = ESM::fourCC("STRV");
-    constexpr uint32_t INTV = ESM::fourCC("INTV");
-    constexpr uint32_t FLTV = ESM::fourCC("FLTV");
-    constexpr uint32_t STTV = ESM::fourCC("STTV");
+    constexpr uint32_t STRV = fourCC("STRV");
+    constexpr uint32_t INTV = fourCC("INTV");
+    constexpr uint32_t FLTV = fourCC("FLTV");
+    constexpr uint32_t STTV = fourCC("STTV");
 
     template <typename T, bool orDefault = false>
     struct GetValue
@@ -48,22 +50,22 @@ namespace
     };
 }
 
-const std::string& ESM::Variant::getString() const
+const std::string& Variant::getString() const
 {
     return std::get<std::string>(mData);
 }
 
-int ESM::Variant::getInteger() const
+int Variant::getInteger() const
 {
     return std::visit(GetValue<int>{}, mData);
 }
 
-float ESM::Variant::getFloat() const
+float Variant::getFloat() const
 {
     return std::visit(GetValue<float>{}, mData);
 }
 
-void ESM::Variant::read (ESMReader& esm, Format format)
+void Variant::read (ESMReader& esm, Format format)
 {
     // type
     VarType type = VT_Unknown;
@@ -152,7 +154,7 @@ void ESM::Variant::read (ESMReader& esm, Format format)
     std::visit(ReadESMVariantValue {esm, format, mType}, mData);
 }
 
-void ESM::Variant::write (ESMWriter& esm, Format format) const
+void Variant::write (ESMWriter& esm, Format format) const
 {
     if (mType==VT_Unknown)
     {
@@ -175,7 +177,7 @@ void ESM::Variant::write (ESMWriter& esm, Format format) const
         std::visit(WriteESMVariantValue {esm, format, mType}, mData);
 }
 
-void ESM::Variant::write (std::ostream& stream) const
+void Variant::write (std::ostream& stream) const
 {
     switch (mType)
     {
@@ -216,7 +218,7 @@ void ESM::Variant::write (std::ostream& stream) const
     }
 }
 
-void ESM::Variant::setType (VarType type)
+void Variant::setType (VarType type)
 {
     if (type!=mType)
     {
@@ -246,28 +248,30 @@ void ESM::Variant::setType (VarType type)
     }
 }
 
-void ESM::Variant::setString (const std::string& value)
+void Variant::setString (const std::string& value)
 {
     std::get<std::string>(mData) = value;
 }
 
-void ESM::Variant::setString (std::string&& value)
+void Variant::setString (std::string&& value)
 {
     std::get<std::string>(mData) = std::move(value);
 }
 
-void ESM::Variant::setInteger (int value)
+void Variant::setInteger (int value)
 {
     std::visit(SetValue(value), mData);
 }
 
-void ESM::Variant::setFloat (float value)
+void Variant::setFloat (float value)
 {
     std::visit(SetValue(value), mData);
 }
 
-std::ostream& ESM::operator<< (std::ostream& stream, const Variant& value)
+std::ostream& operator<< (std::ostream& stream, const Variant& value)
 {
     value.write (stream);
     return stream;
 }
+
+}
diff --git a/components/esm3/variantimp.cpp b/components/esm3/variantimp.cpp
index df491e7cec..7116ce7a74 100644
--- a/components/esm3/variantimp.cpp
+++ b/components/esm3/variantimp.cpp
@@ -7,7 +7,10 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
-void ESM::readESMVariantValue(ESMReader& esm, Variant::Format format, VarType type, std::string& out)
+namespace ESM
+{
+
+void readESMVariantValue(ESMReader& esm, Variant::Format format, VarType type, std::string& out)
 {
     if (type!=VT_String)
         throw std::logic_error ("not a string type");
@@ -25,7 +28,7 @@ void ESM::readESMVariantValue(ESMReader& esm, Variant::Format format, VarType ty
     out = esm.getHString();
 }
 
-void ESM::writeESMVariantValue(ESMWriter& esm, Variant::Format format, VarType type, const std::string& in)
+void writeESMVariantValue(ESMWriter& esm, Variant::Format format, VarType type, const std::string& in)
 {
     if (type!=VT_String)
         throw std::logic_error ("not a string type");
@@ -43,7 +46,7 @@ void ESM::writeESMVariantValue(ESMWriter& esm, Variant::Format format, VarType t
     esm.writeHNString("STRV", in);
 }
 
-void ESM::readESMVariantValue(ESMReader& esm, Variant::Format format, VarType type, int& out)
+void readESMVariantValue(ESMReader& esm, Variant::Format format, VarType type, int& out)
 {
     if (type!=VT_Short && type!=VT_Long && type!=VT_Int)
         throw std::logic_error ("not an integer type");
@@ -93,7 +96,7 @@ void ESM::readESMVariantValue(ESMReader& esm, Variant::Format format, VarType ty
     }
 }
 
-void ESM::writeESMVariantValue(ESMWriter& esm, Variant::Format format, VarType type, int in)
+void writeESMVariantValue(ESMWriter& esm, Variant::Format format, VarType type, int in)
 {
     if (type!=VT_Short && type!=VT_Long && type!=VT_Int)
         throw std::logic_error ("not an integer type");
@@ -133,7 +136,7 @@ void ESM::writeESMVariantValue(ESMWriter& esm, Variant::Format format, VarType t
     }
 }
 
-void ESM::readESMVariantValue(ESMReader& esm, Variant::Format format, VarType type, float& out)
+void readESMVariantValue(ESMReader& esm, Variant::Format format, VarType type, float& out)
 {
     if (type!=VT_Float)
         throw std::logic_error ("not a float type");
@@ -148,7 +151,7 @@ void ESM::readESMVariantValue(ESMReader& esm, Variant::Format format, VarType ty
     }
 }
 
-void ESM::writeESMVariantValue(ESMWriter& esm, Variant::Format format, VarType type, float in)
+void writeESMVariantValue(ESMWriter& esm, Variant::Format format, VarType type, float in)
 {
     if (type!=VT_Float)
         throw std::logic_error ("not a float type");
@@ -163,3 +166,5 @@ void ESM::writeESMVariantValue(ESMWriter& esm, Variant::Format format, VarType t
         esm.writeHNT("FLTV", in);
     }
 }
+
+}
diff --git a/components/esm3/weatherstate.cpp b/components/esm3/weatherstate.cpp
index c791aac145..b149c2bfe0 100644
--- a/components/esm3/weatherstate.cpp
+++ b/components/esm3/weatherstate.cpp
@@ -3,19 +3,22 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
+namespace ESM
+{
 namespace
 {
-    constexpr ESM::NAME currentRegionRecord     = "CREG";
-    constexpr ESM::NAME timePassedRecord        = "TMPS";
-    constexpr ESM::NAME fastForwardRecord       = "FAST";
-    constexpr ESM::NAME weatherUpdateTimeRecord = "WUPD";
-    constexpr ESM::NAME transitionFactorRecord  = "TRFC";
-    constexpr ESM::NAME currentWeatherRecord    = "CWTH";
-    constexpr ESM::NAME nextWeatherRecord       = "NWTH";
-    constexpr ESM::NAME queuedWeatherRecord     = "QWTH";
-    constexpr ESM::NAME regionNameRecord        = "RGNN";
-    constexpr ESM::NAME regionWeatherRecord     = "RGNW";
-    constexpr ESM::NAME regionChanceRecord      = "RGNC";
+    constexpr NAME currentRegionRecord     = "CREG";
+    constexpr NAME timePassedRecord        = "TMPS";
+    constexpr NAME fastForwardRecord       = "FAST";
+    constexpr NAME weatherUpdateTimeRecord = "WUPD";
+    constexpr NAME transitionFactorRecord  = "TRFC";
+    constexpr NAME currentWeatherRecord    = "CWTH";
+    constexpr NAME nextWeatherRecord       = "NWTH";
+    constexpr NAME queuedWeatherRecord     = "QWTH";
+    constexpr NAME regionNameRecord        = "RGNN";
+    constexpr NAME regionWeatherRecord     = "RGNW";
+    constexpr NAME regionChanceRecord      = "RGNC";
+}
 }
 
 namespace ESM

From 1a41cefab343bb0341d29e20e8d13aa558327eff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Tue, 12 Apr 2022 18:25:03 +0300
Subject: [PATCH 2301/2859] Use active package in predictAndAvoidCollisions

---
 apps/openmw/mwmechanics/actors.cpp | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 963fd7b806..01c404c563 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1234,8 +1234,8 @@ namespace MWMechanics
         const float maxTimeToCheck = 2.0f;
         static const bool giveWayWhenIdle = Settings::Manager::getBool("NPCs give way", "Game");
 
-        MWWorld::Ptr player = getPlayer();
-        MWBase::World* world = MWBase::Environment::get().getWorld();
+        const MWWorld::Ptr player = getPlayer();
+        const MWBase::World* world = MWBase::Environment::get().getWorld();
         for(PtrActorMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
         {
             const MWWorld::Ptr& ptr = iter->first;
@@ -1260,23 +1260,26 @@ namespace MWMechanics
             bool shouldTurnToApproachingActor = !isMoving;
             MWWorld::Ptr currentTarget; // Combat or pursue target (NPCs should not avoid collision with their targets).
             const auto& aiSequence = ptr.getClass().getCreatureStats(ptr).getAiSequence();
-            for (const auto& package : aiSequence)
+            if (!aiSequence.isEmpty())
             {
-                if (package->getTypeId() == AiPackageTypeId::Follow)
+                const auto& package = aiSequence.getActivePackage();
+                if (package.getTypeId() == AiPackageTypeId::Follow)
+                {
                     shouldAvoidCollision = true;
-                else if (package->getTypeId() == AiPackageTypeId::Wander && giveWayWhenIdle)
+                }
+                else if (package.getTypeId() == AiPackageTypeId::Wander && giveWayWhenIdle)
                 {
-                    if (!static_cast<const AiWander*>(package.get())->isStationary())
+                    if (!static_cast<const AiWander&>(package).isStationary())
                         shouldGiveWay = true;
                 }
-                else if (package->getTypeId() == AiPackageTypeId::Combat || package->getTypeId() == AiPackageTypeId::Pursue)
+                else if (package.getTypeId() == AiPackageTypeId::Combat || package.getTypeId() == AiPackageTypeId::Pursue)
                 {
-                    currentTarget = package->getTarget();
+                    currentTarget = package.getTarget();
                     shouldAvoidCollision = isMoving;
                     shouldTurnToApproachingActor = false;
-                    break;
                 }
             }
+
             if (!shouldAvoidCollision && !shouldGiveWay)
                 continue;
 

From b2739dc84a8b3e38eaf6cd2c26a6036687072401 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Tue, 12 Apr 2022 18:48:27 +0300
Subject: [PATCH 2302/2859] Avoid looking up settings from gmst each frame

---
 apps/openmw/mwmechanics/combat.cpp | 53 +++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 20 deletions(-)

diff --git a/apps/openmw/mwmechanics/combat.cpp b/apps/openmw/mwmechanics/combat.cpp
index 27582840df..e18fb892dc 100644
--- a/apps/openmw/mwmechanics/combat.cpp
+++ b/apps/openmw/mwmechanics/combat.cpp
@@ -1,3 +1,4 @@
+
 #include "combat.hpp"
 
 #include <components/misc/rng.hpp>
@@ -87,9 +88,11 @@ namespace MWMechanics
                     osg::Vec3f(0,0,1)));
 
         const MWWorld::Store<ESM::GameSetting>& gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
-        if (angleDegrees < gmst.find("fCombatBlockLeftAngle")->mValue.getFloat())
+        static const float fCombatBlockLeftAngle = gmst.find("fCombatBlockLeftAngle")->mValue.getFloat();
+        if (angleDegrees < fCombatBlockLeftAngle)
             return false;
-        if (angleDegrees > gmst.find("fCombatBlockRightAngle")->mValue.getFloat())
+        static const float fCombatBlockRightAngle = gmst.find("fCombatBlockRightAngle")->mValue.getFloat();
+        if (angleDegrees > fCombatBlockRightAngle)
             return false;
 
         MWMechanics::CreatureStats& attackerStats = attacker.getClass().getCreatureStats(attacker);
@@ -97,11 +100,16 @@ namespace MWMechanics
         float blockTerm = blocker.getClass().getSkill(blocker, ESM::Skill::Block) + 0.2f * blockerStats.getAttribute(ESM::Attribute::Agility).getModified()
             + 0.1f * blockerStats.getAttribute(ESM::Attribute::Luck).getModified();
         float enemySwing = attackStrength;
-        float swingTerm = enemySwing * gmst.find("fSwingBlockMult")->mValue.getFloat() + gmst.find("fSwingBlockBase")->mValue.getFloat();
+        static const float fSwingBlockMult = gmst.find("fSwingBlockMult")->mValue.getFloat();
+        static const float fSwingBlockBase = gmst.find("fSwingBlockBase")->mValue.getFloat();
+        float swingTerm = enemySwing * fSwingBlockMult + fSwingBlockBase;
 
         float blockerTerm = blockTerm * swingTerm;
         if (blocker.getClass().getMovementSettings(blocker).mPosition[1] <= 0)
-            blockerTerm *= gmst.find("fBlockStillBonus")->mValue.getFloat();
+        {
+            static const float fBlockStillBonus = gmst.find("fBlockStillBonus")->mValue.getFloat();
+            blockerTerm *= fBlockStillBonus;
+        }
         blockerTerm *= blockerStats.getFatigueTerm();
 
         float attackerSkill = 0;
@@ -113,8 +121,8 @@ namespace MWMechanics
                 + 0.1f * attackerStats.getAttribute(ESM::Attribute::Luck).getModified();
         attackerTerm *= attackerStats.getFatigueTerm();
 
-        const int iBlockMaxChance = gmst.find("iBlockMaxChance")->mValue.getInteger();
-        const int iBlockMinChance = gmst.find("iBlockMinChance")->mValue.getInteger();
+        static const int iBlockMaxChance = gmst.find("iBlockMaxChance")->mValue.getInteger();
+        static const int iBlockMinChance = gmst.find("iBlockMinChance")->mValue.getInteger();
         int x = std::clamp<int>(blockerTerm - attackerTerm, iBlockMinChance, iBlockMaxChance);
 
         auto& prng = MWBase::Environment::get().getWorld()->getPrng();
@@ -128,9 +136,9 @@ namespace MWMechanics
             if (shieldhealth == 0)
                 inv.unequipItem(*shield, blocker);
             // Reduce blocker fatigue
-            const float fFatigueBlockBase = gmst.find("fFatigueBlockBase")->mValue.getFloat();
-            const float fFatigueBlockMult = gmst.find("fFatigueBlockMult")->mValue.getFloat();
-            const float fWeaponFatigueBlockMult = gmst.find("fWeaponFatigueBlockMult")->mValue.getFloat();
+            static const float fFatigueBlockBase = gmst.find("fFatigueBlockBase")->mValue.getFloat();
+            static const float fFatigueBlockMult = gmst.find("fFatigueBlockMult")->mValue.getFloat();
+            static const float fWeaponFatigueBlockMult = gmst.find("fWeaponFatigueBlockMult")->mValue.getFloat();
             MWMechanics::DynamicStat<float> fatigue = blockerStats.getFatigue();
             float normalizedEncumbrance = blocker.getClass().getNormalizedEncumbrance(blocker);
             normalizedEncumbrance = std::min(1.f, normalizedEncumbrance);
@@ -248,7 +256,8 @@ namespace MWMechanics
             bool knockedDown = victim.getClass().getCreatureStats(victim).getKnockedDown();
             if (knockedDown || unaware)
             {
-                damage *= gmst.find("fCombatKODamageMult")->mValue.getFloat();
+                static const float fCombatKODamageMult = gmst.find("fCombatKODamageMult")->mValue.getFloat();
+                damage *= fCombatKODamageMult;
                 if (!knockedDown)
                     MWBase::Environment::get().getSoundManager()->playSound3D(victim, "critical damage", 1.0f, 1.0f);
             }
@@ -262,7 +271,7 @@ namespace MWMechanics
             // Non-enchanted arrows shot at enemies have a chance to turn up in their inventory
             if (victim != getPlayer() && !appliedEnchantment)
             {
-                float fProjectileThrownStoreChance = gmst.find("fProjectileThrownStoreChance")->mValue.getFloat();
+                static const float fProjectileThrownStoreChance = gmst.find("fProjectileThrownStoreChance")->mValue.getFloat();
                 if (Misc::Rng::rollProbability(world->getPrng()) < fProjectileThrownStoreChance / 100.f)
                     victim.getClass().getContainerStore(victim).add(projectile, 1, victim);
             }
@@ -293,11 +302,12 @@ namespace MWMechanics
             {
                 defenseTerm = victimStats.getEvasion();
             }
+            static const float fCombatInvisoMult = gmst.find("fCombatInvisoMult")->mValue.getFloat();
             defenseTerm += std::min(100.f,
-                                    gmst.find("fCombatInvisoMult")->mValue.getFloat() *
+                                    fCombatInvisoMult *
                                     victimStats.getMagicEffects().get(ESM::MagicEffect::Chameleon).getMagnitude());
             defenseTerm += std::min(100.f,
-                                    gmst.find("fCombatInvisoMult")->mValue.getFloat() *
+                                    fCombatInvisoMult *
                                     victimStats.getMagicEffects().get(ESM::MagicEffect::Invisibility).getMagnitude());
         }
         float attackTerm = skillValue +
@@ -415,8 +425,8 @@ namespace MWMechanics
     void getHandToHandDamage(const MWWorld::Ptr &attacker, const MWWorld::Ptr &victim, float &damage, bool &healthdmg, float attackStrength)
     {
         const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
-        float minstrike = store.get<ESM::GameSetting>().find("fMinHandToHandMult")->mValue.getFloat();
-        float maxstrike = store.get<ESM::GameSetting>().find("fMaxHandToHandMult")->mValue.getFloat();
+        static const float minstrike = store.get<ESM::GameSetting>().find("fMinHandToHandMult")->mValue.getFloat();
+        static const float maxstrike = store.get<ESM::GameSetting>().find("fMaxHandToHandMult")->mValue.getFloat();
         damage  = static_cast<float>(attacker.getClass().getSkill(attacker, ESM::Skill::HandToHand));
         damage *= minstrike + ((maxstrike-minstrike)*attackStrength);
 
@@ -440,8 +450,11 @@ namespace MWMechanics
             // GLOB instead of GMST because it gets updated during a quest
             damage *= MWBase::Environment::get().getWorld()->getGlobalFloat("werewolfclawmult");
         }
-        if(healthdmg)
-            damage *= store.get<ESM::GameSetting>().find("fHandtoHandHealthPer")->mValue.getFloat();
+        if (healthdmg)
+        {
+            static const float fHandtoHandHealthPer = store.get<ESM::GameSetting>().find("fHandtoHandHealthPer")->mValue.getFloat();
+            damage *= fHandtoHandHealthPer;
+        }
 
         MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
         if(isWerewolf)
@@ -459,9 +472,9 @@ namespace MWMechanics
     {
         // somewhat of a guess, but using the weapon weight makes sense
         const MWWorld::Store<ESM::GameSetting>& store = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
-        const float fFatigueAttackBase = store.find("fFatigueAttackBase")->mValue.getFloat();
-        const float fFatigueAttackMult = store.find("fFatigueAttackMult")->mValue.getFloat();
-        const float fWeaponFatigueMult = store.find("fWeaponFatigueMult")->mValue.getFloat();
+        static const float fFatigueAttackBase = store.find("fFatigueAttackBase")->mValue.getFloat();
+        static const float fFatigueAttackMult = store.find("fFatigueAttackMult")->mValue.getFloat();
+        static const float fWeaponFatigueMult = store.find("fWeaponFatigueMult")->mValue.getFloat();
         CreatureStats& stats = attacker.getClass().getCreatureStats(attacker);
         MWMechanics::DynamicStat<float> fatigue = stats.getFatigue();
         const float normalizedEncumbrance = attacker.getClass().getNormalizedEncumbrance(attacker);

From 165f146e694815d494e64c6059d4b4557c902e11 Mon Sep 17 00:00:00 2001
From: Benjamin Winger <bmw@disroot.org>
Date: Tue, 12 Apr 2022 13:07:15 -0400
Subject: [PATCH 2303/2859] Added ICU runtime DLLs to Windows builds

---
 CI/before_script.msvc.sh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 5cfff39b3d..7c9ea20bd1 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -1039,16 +1039,22 @@ echo
 # ICU
 printf "ICU ${ICU_VER/_/.}... "
 {
-	if [ -d ICU ]; then
+	if [ -d ICU-${ICU_VER} ]; then
 		printf "Exists. "
 	elif [ -z $SKIP_EXTRACT ]; then
-		rm -rf ICU
-		eval 7z x -y icu4c-${ICU_VER}-Win${BITS}-MSVC2019.zip -o$(real_pwd)/ICU $STRIP
+		rm -rf ICU-${ICU_VER}
+		eval 7z x -y icu4c-${ICU_VER}-Win${BITS}-MSVC2019.zip -o$(real_pwd)/ICU-${ICU_VER} $STRIP
 	fi
-	export ICU_ROOT="$(real_pwd)/ICU"
+	export ICU_ROOT="$(real_pwd)/ICU-${ICU_VER}"
 	add_cmake_opts -DICU_INCLUDE_DIR="${ICU_ROOT}/include" \
 		-DICU_LIBRARY="${ICU_ROOT}/lib${BITS}/icuuc.lib " \
         -DICU_DEBUG=ON
+
+	for config in ${CONFIGURATIONS[@]}; do
+		add_runtime_dlls $config "$(pwd)/ICU-${ICU_VER}/bin${BITS}/icudt${ICU_VER/_*/}.dll"
+		add_runtime_dlls $config "$(pwd)/ICU-${ICU_VER}/bin${BITS}/icuin${ICU_VER/_*/}.dll"
+		add_runtime_dlls $config "$(pwd)/ICU-${ICU_VER}/bin${BITS}/icuuc${ICU_VER/_*/}.dll"
+	done
 	echo Done.
 }
 

From 194c11f214dad1147fb993cf0a0f89abf309ff7c Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 12 Apr 2022 17:27:59 +0200
Subject: [PATCH 2304/2859] Fix loading order in EsmLoader

Need to load the last present record from a sequence of loaded records. That
means reverse should be called before unique or unique should be applied for
a reversed range. Since unique keeps only the first element from a sub
sequence of equal elements.

Use forEachUnique with reversed range to avoid redundant container
modifications.
---
 apps/openmw_test_suite/CMakeLists.txt       |   1 +
 apps/openmw_test_suite/esmloader/record.cpp | 105 ++++++++++++++++++++
 components/esmloader/record.hpp             |   7 +-
 3 files changed, 110 insertions(+), 3 deletions(-)
 create mode 100644 apps/openmw_test_suite/esmloader/record.cpp

diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index 3b12e7c227..74418a004b 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -67,6 +67,7 @@ if (GTEST_FOUND AND GMOCK_FOUND)
 
         esmloader/load.cpp
         esmloader/esmdata.cpp
+        esmloader/record.cpp
 
         files/hash.cpp
 
diff --git a/apps/openmw_test_suite/esmloader/record.cpp b/apps/openmw_test_suite/esmloader/record.cpp
new file mode 100644
index 0000000000..fbbbdf18d8
--- /dev/null
+++ b/apps/openmw_test_suite/esmloader/record.cpp
@@ -0,0 +1,105 @@
+#include <components/esmloader/record.hpp>
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+#include <array>
+#include <tuple>
+
+namespace
+{
+    using namespace testing;
+    using namespace EsmLoader;
+
+    struct Value
+    {
+        int mKey;
+        int mValue;
+    };
+
+    auto tie(const Value& v)
+    {
+        return std::tie(v.mKey, v.mValue);
+    }
+
+    bool operator==(const Value& l, const Value& r)
+    {
+        return tie(l) == tie(r);
+    }
+
+    std::ostream& operator<<(std::ostream& s, const Value& v)
+    {
+        return s << "Value {" << v.mKey << ", " << v.mValue << "}";
+    }
+
+    Record<Value> present(const Value& v)
+    {
+        return Record<Value>(false, v);
+    }
+
+    Record<Value> deleted(const Value& v)
+    {
+        return Record<Value>(true, v);
+    }
+
+    struct Params
+    {
+        Records<Value> mRecords;
+        std::vector<Value> mResult;
+    };
+
+    struct EsmLoaderPrepareRecordTest : TestWithParam<Params> {};
+
+    TEST_P(EsmLoaderPrepareRecordTest, prepareRecords)
+    {
+        auto records = GetParam().mRecords;
+        const auto getKey = [&] (const Record<Value>& v) { return v.mValue.mKey; };
+        EXPECT_THAT(prepareRecords(records, getKey), ElementsAreArray(GetParam().mResult));
+    }
+
+    const std::array params = {
+        Params {{}, {}},
+        Params {
+            {present(Value {1, 1})},
+            {Value {1, 1}}
+        },
+        Params {
+            {deleted(Value {1, 1})},
+            {}
+        },
+        Params {
+            {present(Value {1, 1}), present(Value {2, 2})},
+            {Value {1, 1}, Value {2, 2}}
+        },
+        Params {
+            {present(Value {2, 2}), present(Value {1, 1})},
+            {Value {1, 1}, Value {2, 2}}
+        },
+        Params {
+            {present(Value {1, 1}), present(Value {1, 2})},
+            {Value {1, 2}}
+        },
+        Params {
+            {present(Value {1, 2}), present(Value {1, 1})},
+            {Value {1, 1}}
+        },
+        Params {
+            {present(Value {1, 1}), deleted(Value {1, 2})},
+            {}
+        },
+        Params {
+            {deleted(Value {1, 1}), present(Value {1, 2})},
+            {Value {1, 2}}
+        },
+        Params {
+            {present(Value {1, 2}), deleted(Value {1, 1})},
+            {}
+        },
+        Params {
+            {deleted(Value {1, 2}), present(Value {1, 1})},
+            {Value {1, 1}}
+        },
+    };
+
+    INSTANTIATE_TEST_SUITE_P(Params, EsmLoaderPrepareRecordTest, ValuesIn(params));
+}
diff --git a/components/esmloader/record.hpp b/components/esmloader/record.hpp
index b88991cca1..ec9705e823 100644
--- a/components/esmloader/record.hpp
+++ b/components/esmloader/record.hpp
@@ -2,6 +2,7 @@
 #define OPENMW_COMPONENTS_ESMLOADER_RECORD_H
 
 #include <components/esm3/loadcell.hpp>
+#include <components/misc/algorithm.hpp>
 
 #include <algorithm>
 #include <utility>
@@ -31,12 +32,12 @@ namespace EsmLoader
         const auto greaterByKey = [&] (const auto& l, const auto& r) { return getKey(r) < getKey(l); };
         const auto equalByKey = [&] (const auto& l, const auto& r) { return getKey(l) == getKey(r); };
         std::stable_sort(records.begin(), records.end(), greaterByKey);
-        records.erase(std::unique(records.begin(), records.end(), equalByKey), records.end());
-        std::reverse(records.begin(), records.end());
         std::vector<T> result;
-        for (Record<T>& v : records)
+        Misc::forEachUnique(records.rbegin(), records.rend(), equalByKey, [&] (const auto& v)
+        {
             if (!v.mDeleted)
                 result.emplace_back(std::move(v.mValue));
+        });
         return result;
     }
 }

From 45c9635e94dcd20c5924060b3c43c5536060fac7 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sat, 9 Apr 2022 20:52:05 +0200
Subject: [PATCH 2305/2859] Fix getmetatable, fix pairsForReadonly, add
 util.loadCode, _G

---
 components/lua/luastate.cpp    | 42 ++++++++++++++++++++--------------
 components/lua/utilpackage.cpp | 13 +++++++++++
 files/lua_api/openmw/util.lua  |  7 ++++++
 3 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/components/lua/luastate.cpp b/components/lua/luastate.cpp
index 4ede81cc02..38f3ae889e 100644
--- a/components/lua/luastate.cpp
+++ b/components/lua/luastate.cpp
@@ -46,7 +46,7 @@ namespace LuaUtil
 
     static const std::string safeFunctions[] = {
         "assert", "error", "ipairs", "next", "pairs", "pcall", "select", "tonumber", "tostring",
-        "type", "unpack", "xpcall", "rawequal", "rawget", "rawset", "getmetatable", "setmetatable"};
+        "type", "unpack", "xpcall", "rawequal", "rawget", "rawset", "setmetatable"};
     static const std::string safePackages[] = {"coroutine", "math", "string", "table"};
 
     LuaState::LuaState(const VFS::Manager* vfs, const ScriptsConfiguration* conf) : mConf(conf), mVFS(vfs)
@@ -58,7 +58,6 @@ namespace LuaUtil
         mLua["math"]["randomseed"] = []{};
 
         mLua["writeToLog"] = [](std::string_view s) { Log(Debug::Level::Info) << s; };
-        mLua["cmetatable"] = [](const sol::table& v) -> sol::object { return v[sol::metatable_key]; };
 
         // Some fixes for compatibility between different Lua versions
         if (mLua["unpack"] == sol::nil)
@@ -70,29 +69,35 @@ namespace LuaUtil
             mLua.script(R"(
                 local _pairs = pairs
                 local _ipairs = ipairs
-                local _cmeta = cmetatable
-                pairs = function(v) return ((_cmeta(v) or v).__pairs or _pairs)(v) end
-                ipairs = function(v) return ((_cmeta(v) or v).__ipairs or _ipairs)(v) end
+                pairs = function(v) return (rawget(getmetatable(v) or {}, '__pairs') or _pairs)(v) end
+                ipairs = function(v) return (rawget(getmetatable(v) or {}, '__ipairs') or _ipairs)(v) end
             )");
         }
 
         mLua.script(R"(
-            local _pairs = pairs
-            local _ipairs = ipairs
-            local _tostring = tostring
-            local _write = writeToLog
-            local printToLog = function(name, ...)
-                local msg = name
-                for _, v in _ipairs({...}) do
-                    msg = msg .. '\t' .. _tostring(v)
+            local printToLog = function(...)
+                local strs = {}
+                for i = 1, select('#', ...) do
+                    strs[i] = tostring(select(i, ...))
                 end
-                return _write(msg)
+                return writeToLog(table.concat(strs, '\t'))
             end
             printGen = function(name) return function(...) return printToLog(name, ...) end end
 
-            local _cmeta = cmetatable
-            function pairsForReadOnly(v) return _pairs(_cmeta(v).__index) end
-            function ipairsForReadOnly(v) return _ipairs(_cmeta(v).__index) end
+            function pairsForReadOnly(v)
+                local nextFn, t, firstKey = pairs(getmetatable(v).__index)
+                return function(_, k) return nextFn(t, k) end, v, firstKey
+            end
+            function ipairsForReadOnly(v)
+                local nextFn, t, firstKey = ipairs(getmetatable(v).__index)
+                return function(_, k) return nextFn(t, k) end, v, firstKey
+            end
+
+            getmetatable('').__metatable = false
+            getSafeMetatable = function(v)
+                if type(v) ~= 'table' then error('getmetatable is allowed only for tables', 2) end
+                return getmetatable(v)
+            end
         )");
 
         mSandboxEnv = sol::table(mLua, sol::create);
@@ -107,6 +112,7 @@ namespace LuaUtil
             if (mLua[s] == sol::nil) throw std::logic_error("Lua package not found: " + s);
             mCommonPackages[s] = mSandboxEnv[s] = makeReadOnly(mLua[s]);
         }
+        mSandboxEnv["getmetatable"] = mLua["getSafeMetatable"];
         mCommonPackages["os"] = mSandboxEnv["os"] = makeReadOnly(tableFromPairs<std::string_view, sol::function>({
             {"date", mLua["os"]["date"]},
             {"difftime", mLua["os"]["difftime"]},
@@ -162,6 +168,8 @@ namespace LuaUtil
         sol::environment env(mLua, sol::create, mSandboxEnv);
         std::string envName = namePrefix + "[" + path + "]:";
         env["print"] = mLua["printGen"](envName);
+        env["_G"] = env;
+        env[sol::metatable_key]["__metatable"] = false;
 
         auto maybeRunLoader = [&hiddenData](const sol::object& package) -> sol::object
         {
diff --git a/components/lua/utilpackage.cpp b/components/lua/utilpackage.cpp
index 2eda03dc52..7f52a770a1 100644
--- a/components/lua/utilpackage.cpp
+++ b/components/lua/utilpackage.cpp
@@ -247,6 +247,19 @@ namespace LuaUtil
             util["bitNot"] = [](unsigned a) { return ~a; };
         }
 
+        util["loadCode"] = [](const std::string& code, const sol::table& env, sol::this_state s)
+        {
+            sol::state_view lua(s);
+            sol::load_result res = lua.load(code, "", sol::load_mode::text);
+            if (!res.valid())
+                throw std::runtime_error("Lua error: " + res.get<std::string>());
+            sol::function fn = res;
+            sol::environment newEnv(lua, sol::create, env);
+            newEnv[sol::metatable_key][sol::meta_function::new_index] = env;
+            sol::set_environment(newEnv, fn);
+            return fn;
+        };
+
         return util;
     }
     
diff --git a/files/lua_api/openmw/util.lua b/files/lua_api/openmw/util.lua
index dbb1cbd8ae..3dd959b4a5 100644
--- a/files/lua_api/openmw/util.lua
+++ b/files/lua_api/openmw/util.lua
@@ -25,6 +25,13 @@
 -- @param #table table Any table.
 -- @return #table The same table wrapped with read only userdata.
 
+---
+-- Parses Lua code from string and returns as a function.
+-- @function [parent=#util] loadCode
+-- @param #string code Lua code.
+-- @param #table table Environment to run the code in.
+-- @return #function The loaded code.
+
 ---
 -- Bitwise And (supports any number of arguments).
 -- @function [parent=#util] bitAnd

From b09570692e351ec39251d8861218dd624db2e462 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 14 Apr 2022 22:12:59 +0200
Subject: [PATCH 2306/2859] Use ifstream for ESMReader

ESMReader reads the whole file, there is no need in the ConstrainedFileStream.
---
 apps/openmw/mwworld/esmloader.cpp             |  2 +-
 apps/openmw_test_suite/esm/variant.cpp        |  2 +-
 apps/openmw_test_suite/mwworld/test_store.cpp | 21 +++++++------------
 components/CMakeLists.txt                     |  2 +-
 components/esm3/esmreader.cpp                 | 14 +++++++------
 components/esm3/esmreader.hpp                 | 10 ++++-----
 components/esmloader/load.cpp                 |  4 +---
 components/files/openfile.cpp                 | 16 ++++++++++++++
 components/files/openfile.hpp                 | 13 ++++++++++++
 9 files changed, 54 insertions(+), 30 deletions(-)
 create mode 100644 components/files/openfile.cpp
 create mode 100644 components/files/openfile.hpp

diff --git a/apps/openmw/mwworld/esmloader.cpp b/apps/openmw/mwworld/esmloader.cpp
index 8369523dca..41a8dc478c 100644
--- a/apps/openmw/mwworld/esmloader.cpp
+++ b/apps/openmw/mwworld/esmloader.cpp
@@ -21,7 +21,7 @@ void EsmLoader::load(const boost::filesystem::path& filepath, int& index, Loadin
     lEsm.setIndex(index);
     lEsm.open(filepath.string());
     lEsm.resolveParentFileIndices(mEsm);
-    mEsm[index] = lEsm;
+    mEsm[index] = std::move(lEsm);
     mStore.load(mEsm[index], listener);
 }
 
diff --git a/apps/openmw_test_suite/esm/variant.cpp b/apps/openmw_test_suite/esm/variant.cpp
index 287540c1e0..53f31cc1c9 100644
--- a/apps/openmw_test_suite/esm/variant.cpp
+++ b/apps/openmw_test_suite/esm/variant.cpp
@@ -436,7 +436,7 @@ namespace
     {
         Variant result;
         ESMReader reader;
-        reader.open(std::make_shared<std::istringstream>(data), "");
+        reader.open(std::make_unique<std::istringstream>(data), "");
         result.read(reader, format);
         return result;
     }
diff --git a/apps/openmw_test_suite/mwworld/test_store.cpp b/apps/openmw_test_suite/mwworld/test_store.cpp
index bf1a40f7d9..a789e05a5d 100644
--- a/apps/openmw_test_suite/mwworld/test_store.cpp
+++ b/apps/openmw_test_suite/mwworld/test_store.cpp
@@ -224,17 +224,17 @@ protected:
 /// Create an ESM file in-memory containing the specified record.
 /// @param deleted Write record with deleted flag?
 template <typename T>
-Files::IStreamPtr getEsmFile(T record, bool deleted)
+std::unique_ptr<std::istream> getEsmFile(T record, bool deleted)
 {
     ESM::ESMWriter writer;
-    auto* stream = new std::stringstream;
+    auto stream = std::make_unique<std::stringstream>();
     writer.setFormat(0);
     writer.save(*stream);
     writer.startRecord(T::sRecordId);
     record.save(writer, deleted);
     writer.endRecord(T::sRecordId);
 
-    return Files::IStreamPtr(stream);
+    return stream;
 }
 
 /// Tests deletion of records.
@@ -251,16 +251,14 @@ TEST_F(StoreTest, delete_test)
     ESM::ESMReader reader;
 
     // master file inserts a record
-    Files::IStreamPtr file = getEsmFile(record, false);
-    reader.open(file, "filename");
+    reader.open(getEsmFile(record, false), "filename");
     mEsmStore.load(reader, &dummyListener);
     mEsmStore.setUp();
 
     ASSERT_TRUE (mEsmStore.get<RecordType>().getSize() == 1);
 
     // now a plugin deletes it
-    file = getEsmFile(record, true);
-    reader.open(file, "filename");
+    reader.open(getEsmFile(record, true), "filename");
     mEsmStore.load(reader, &dummyListener);
     mEsmStore.setUp();
 
@@ -268,8 +266,7 @@ TEST_F(StoreTest, delete_test)
 
     // now another plugin inserts it again
     // expected behaviour is the record to reappear rather than staying deleted
-    file = getEsmFile(record, false);
-    reader.open(file, "filename");
+    reader.open(getEsmFile(record, false), "filename");
     mEsmStore.load(reader, &dummyListener);
     mEsmStore.setUp();
 
@@ -291,16 +288,14 @@ TEST_F(StoreTest, overwrite_test)
     ESM::ESMReader reader;
 
     // master file inserts a record
-    Files::IStreamPtr file = getEsmFile(record, false);
-    reader.open(file, "filename");
+    reader.open(getEsmFile(record, false), "filename");
     mEsmStore.load(reader, &dummyListener);
     mEsmStore.setUp();
 
     // now a plugin overwrites it with changed data
     record.mId = recordIdUpper; // change id to uppercase, to test case smashing while we're at it
     record.mModel = "the_new_model";
-    file = getEsmFile(record, false);
-    reader.open(file, "filename");
+    reader.open(getEsmFile(record, false), "filename");
     mEsmStore.load(reader, &dummyListener);
     mEsmStore.setUp();
 
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 5a3292228e..57a60322d5 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -206,7 +206,7 @@ IF(NOT WIN32 AND NOT APPLE)
 ENDIF()
 add_component_dir (files
     linuxpath androidpath windowspath macospath fixedpath multidircollection collections configurationmanager
-    lowlevelfile constrainedfilestream memorystream hash configfileparser
+    lowlevelfile constrainedfilestream memorystream hash configfileparser openfile
     )
 
 add_component_dir (compiler
diff --git a/components/esm3/esmreader.cpp b/components/esm3/esmreader.cpp
index 2a3ee69464..08cd100ab1 100644
--- a/components/esm3/esmreader.cpp
+++ b/components/esm3/esmreader.cpp
@@ -2,9 +2,11 @@
 
 #include <boost/filesystem/path.hpp>
 #include <components/misc/stringops.hpp>
+#include <components/files/openfile.hpp>
 
 #include <stdexcept>
 #include <sstream>
+#include <fstream>
 
 namespace ESM
 {
@@ -82,10 +84,10 @@ void ESMReader::resolveParentFileIndices(const std::vector<ESMReader>& allPlugin
     }
 }
 
-void ESMReader::openRaw(Files::IStreamPtr _esm, const std::string& name)
+void ESMReader::openRaw(std::unique_ptr<std::istream>&& stream, const std::string& name)
 {
     close();
-    mEsm = _esm;
+    mEsm = std::move(stream);
     mCtx.filename = name;
     mEsm->seekg(0, mEsm->end);
     mCtx.leftFile = mFileSize = mEsm->tellg();
@@ -94,12 +96,12 @@ void ESMReader::openRaw(Files::IStreamPtr _esm, const std::string& name)
 
 void ESMReader::openRaw(const std::string& filename)
 {
-    openRaw(Files::openConstrainedFileStream(filename), filename);
+    openRaw(Files::openBinaryInputFileStream(filename), filename);
 }
 
-void ESMReader::open(Files::IStreamPtr _esm, const std::string &name)
+void ESMReader::open(std::unique_ptr<std::istream>&& stream, const std::string &name)
 {
-    openRaw(_esm, name);
+    openRaw(std::move(stream), name);
 
     if (getRecName() != "TES3")
         fail("Not a valid Morrowind file");
@@ -111,7 +113,7 @@ void ESMReader::open(Files::IStreamPtr _esm, const std::string &name)
 
 void ESMReader::open(const std::string &file)
 {
-    open (Files::openConstrainedFileStream(file), file);
+    open(Files::openBinaryInputFileStream(file), file);
 }
 
 std::string ESMReader::getHNOString(NAME name)
diff --git a/components/esm3/esmreader.hpp b/components/esm3/esmreader.hpp
index 7994899db9..2c987ef025 100644
--- a/components/esm3/esmreader.hpp
+++ b/components/esm3/esmreader.hpp
@@ -3,8 +3,8 @@
 
 #include <cstdint>
 #include <vector>
-
-#include <components/files/constrainedfilestream.hpp>
+#include <istream>
+#include <memory>
 
 #include <components/misc/stringops.hpp>
 
@@ -61,11 +61,11 @@ public:
 
   /// Raw opening. Opens the file and sets everything up but doesn't
   /// parse the header.
-  void openRaw(Files::IStreamPtr _esm, const std::string &name);
+  void openRaw(std::unique_ptr<std::istream>&& stream, const std::string &name);
 
   /// Load ES file from a new stream, parses the header. Closes the
   /// currently open file first, if any.
-  void open(Files::IStreamPtr _esm, const std::string &name);
+  void open(std::unique_ptr<std::istream>&& stream, const std::string &name);
 
   void open(const std::string &file);
 
@@ -295,7 +295,7 @@ private:
 
   void clearCtx();
 
-  Files::IStreamPtr mEsm;
+  std::unique_ptr<std::istream> mEsm;
 
   ESM_Context mCtx;
 
diff --git a/components/esmloader/load.cpp b/components/esmloader/load.cpp
index 95011e221c..2e54449a2c 100644
--- a/components/esmloader/load.cpp
+++ b/components/esmloader/load.cpp
@@ -188,7 +188,7 @@ namespace EsmLoader
             reader.skipRecord();
         }
 
-        ESM::ESMReader loadEsm(const Query& query, ESM::ESMReader& reader, ShallowContent& content)
+        void loadEsm(const Query& query, ESM::ESMReader& reader, ShallowContent& content)
         {
             Log(Debug::Info) << "Loading ESM file " << reader.getName();
 
@@ -198,8 +198,6 @@ namespace EsmLoader
                 reader.getRecHeader();
                 loadRecord(query, recName, reader, content);
             }
-
-            return reader;
         }
 
         ShallowContent shallowLoad(const Query& query, const std::vector<std::string>& contentFiles,
diff --git a/components/files/openfile.cpp b/components/files/openfile.cpp
new file mode 100644
index 0000000000..61a177b038
--- /dev/null
+++ b/components/files/openfile.cpp
@@ -0,0 +1,16 @@
+#include "openfile.hpp"
+
+#include <cstring>
+#include <fstream>
+
+namespace Files
+{
+    std::unique_ptr<std::ifstream> openBinaryInputFileStream(const std::string& path)
+    {
+        auto stream = std::make_unique<std::ifstream>(path, std::ios::binary);
+        if (!stream->is_open())
+            throw std::runtime_error("Failed to open '" + path + "' for reading: " + std::strerror(errno));
+        stream->exceptions(std::ios::badbit);
+        return stream;
+    }
+}
diff --git a/components/files/openfile.hpp b/components/files/openfile.hpp
new file mode 100644
index 0000000000..3cecf7bac1
--- /dev/null
+++ b/components/files/openfile.hpp
@@ -0,0 +1,13 @@
+#ifndef OPENMW_COMPONENTS_FILES_OPENFILE_H
+#define OPENMW_COMPONENTS_FILES_OPENFILE_H
+
+#include <iosfwd>
+#include <memory>
+#include <string>
+
+namespace Files
+{
+    std::unique_ptr<std::ifstream> openBinaryInputFileStream(const std::string& path);
+}
+
+#endif

From 3e4c683ba98d961aaa92a574fe9097388eb04a70 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Fri, 15 Apr 2022 19:14:18 +0200
Subject: [PATCH 2307/2859] Update CMakeLists.txt after a file was removed.

---
 apps/openmw/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index f67c991958..6f35e53fd1 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -21,7 +21,7 @@ source_group(game FILES ${GAME} ${GAME_HEADER})
 add_openmw_dir (mwrender
     actors objects renderingmanager animation rotatecontroller sky skyutil npcanimation vismask
     creatureanimation effectmanager util renderinginterface pathgrid rendermode weaponanimation screenshotmanager
-    bulletdebugdraw globalmap characterpreview camera viewovershoulder localmap water terrainstorage ripplesimulation
+    bulletdebugdraw globalmap characterpreview camera localmap water terrainstorage ripplesimulation
     renderbin actoranimation landmanager navmesh actorspaths recastmesh fogmanager objectpaging groundcover postprocessor
     )
 

From fbc853804d0d28cb9b0f4306e29058e76fd93a6b Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 15 Apr 2022 03:06:53 +0200
Subject: [PATCH 2308/2859] Fix recover from errors in Files::getHash

---
 apps/openmw_test_suite/files/hash.cpp | 10 ++++++++++
 components/files/hash.cpp             |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/apps/openmw_test_suite/files/hash.cpp b/apps/openmw_test_suite/files/hash.cpp
index f87edd4e6e..645258f60e 100644
--- a/apps/openmw_test_suite/files/hash.cpp
+++ b/apps/openmw_test_suite/files/hash.cpp
@@ -22,6 +22,16 @@ namespace
 
     struct FilesGetHash : TestWithParam<Params> {};
 
+    TEST(FilesGetHash, shouldClearErrors)
+    {
+        const std::string fileName = "fileName";
+        std::string content;
+        std::fill_n(std::back_inserter(content), 1, 'a');
+        std::istringstream stream(content);
+        stream.exceptions(std::ios::failbit | std::ios::badbit);
+        EXPECT_THAT(getHash(fileName, stream), ElementsAre(9607679276477937801ull, 16624257681780017498ull));
+    }
+
     TEST_P(FilesGetHash, shouldReturnHashForStringStream)
     {
         const std::string fileName = "fileName";
diff --git a/components/files/hash.cpp b/components/files/hash.cpp
index 079a169ae5..b11ecbf838 100644
--- a/components/files/hash.cpp
+++ b/components/files/hash.cpp
@@ -28,8 +28,8 @@ namespace Files
                 MurmurHash3_x64_128(value.data(), static_cast<int>(read), hash.data(), blockHash.data());
                 hash = blockHash;
             }
-            stream.exceptions(exceptions);
             stream.clear();
+            stream.exceptions(exceptions);
             stream.seekg(start);
         }
         catch (const std::exception& e)

From 61ea678a96ebd376c358bb0fc349c08f5260abb0 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 16 Apr 2022 16:28:39 +0200
Subject: [PATCH 2309/2859] Implement ignored records

---
 CHANGELOG.md                      | 1 +
 apps/openmw/mwworld/esmloader.cpp | 3 ++-
 apps/openmw/mwworld/esmloader.hpp | 2 ++
 apps/openmw/mwworld/esmstore.cpp  | 9 ++++++---
 apps/openmw/mwworld/esmstore.hpp  | 2 +-
 components/esm/esmcommon.hpp      | 3 +++
 6 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 525cd5807b..30f02bed33 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -145,6 +145,7 @@
     Feature #6592: Missing support for NiTriShape particle emitters
     Feature #6600: Support NiSortAdjustNode
     Feature #6684: Support NiFltAnimationNode
+    Feature #6699: Ignored flag
     Task #6201: Remove the "Note: No relevant classes found. No output generated" warnings
     Task #6264: Remove the old classes in animation.cpp
     Task #6553: Simplify interpreter instruction registration
diff --git a/apps/openmw/mwworld/esmloader.cpp b/apps/openmw/mwworld/esmloader.cpp
index 41a8dc478c..d9c7d1389f 100644
--- a/apps/openmw/mwworld/esmloader.cpp
+++ b/apps/openmw/mwworld/esmloader.cpp
@@ -11,6 +11,7 @@ EsmLoader::EsmLoader(MWWorld::ESMStore& store, std::vector<ESM::ESMReader>& read
     : mEsm(readers)
     , mStore(store)
     , mEncoder(encoder)
+    , mDialogue(nullptr) // A content file containing INFO records without a DIAL record appends them to the previous file's dialogue
 {
 }
 
@@ -22,7 +23,7 @@ void EsmLoader::load(const boost::filesystem::path& filepath, int& index, Loadin
     lEsm.open(filepath.string());
     lEsm.resolveParentFileIndices(mEsm);
     mEsm[index] = std::move(lEsm);
-    mStore.load(mEsm[index], listener);
+    mStore.load(mEsm[index], listener, mDialogue);
 }
 
 } /* namespace MWWorld */
diff --git a/apps/openmw/mwworld/esmloader.hpp b/apps/openmw/mwworld/esmloader.hpp
index db50d44146..4dfb48c2d1 100644
--- a/apps/openmw/mwworld/esmloader.hpp
+++ b/apps/openmw/mwworld/esmloader.hpp
@@ -13,6 +13,7 @@ namespace ToUTF8
 namespace ESM
 {
     class ESMReader;
+    struct Dialogue;
 }
 
 namespace MWWorld
@@ -31,6 +32,7 @@ struct EsmLoader : public ContentLoader
         std::vector<ESM::ESMReader>& mEsm;
         MWWorld::ESMStore& mStore;
         ToUTF8::Utf8Encoder* mEncoder;
+        ESM::Dialogue* mDialogue;
 };
 
 } /* namespace MWWorld */
diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index c670bead9c..bad5685a7f 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -143,12 +143,10 @@ static bool isCacheableRecord(int id)
     return false;
 }
 
-void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener)
+void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener, ESM::Dialogue*& dialogue)
 {
     listener->setProgressRange(1000);
 
-    ESM::Dialogue *dialogue = nullptr;
-
     // Land texture loading needs to use a separate internal store for each plugin.
     // We set the number of plugins here so we can properly verify if valid plugin
     // indices are being passed to the LandTexture Store retrieval methods.
@@ -159,6 +157,11 @@ void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener)
     {
         ESM::NAME n = esm.getRecName();
         esm.getRecHeader();
+        if (esm.getRecordFlags() & ESM::FLAG_Ignored)
+        {
+            esm.skipRecord();
+            continue;
+        }
 
         // Look up the record type.
         std::map<int, StoreBase *>::iterator it = mStores.find(n.toInt());
diff --git a/apps/openmw/mwworld/esmstore.hpp b/apps/openmw/mwworld/esmstore.hpp
index 07f860e6de..8ad374350e 100644
--- a/apps/openmw/mwworld/esmstore.hpp
+++ b/apps/openmw/mwworld/esmstore.hpp
@@ -196,7 +196,7 @@ namespace MWWorld
         /// Validate entries in store after loading a save
         void validateDynamic();
 
-        void load(ESM::ESMReader &esm, Loading::Listener* listener);
+        void load(ESM::ESMReader &esm, Loading::Listener* listener, ESM::Dialogue*& dialogue);
 
         template <class T>
         const Store<T> &get() const {
diff --git a/components/esm/esmcommon.hpp b/components/esm/esmcommon.hpp
index 7ca059020f..2685371ec0 100644
--- a/components/esm/esmcommon.hpp
+++ b/components/esm/esmcommon.hpp
@@ -19,7 +19,10 @@ enum Version
 
 enum RecordFlag
   {
+    // This flag exists, but is not used to determine if a record has been deleted while loading
+    FLAG_Deleted    = 0x00000020,
     FLAG_Persistent = 0x00000400,
+    FLAG_Ignored    = 0x00001000,
     FLAG_Blocked    = 0x00002000
   };
 

From 86d7f5a9885732e019939c351a46107a953aa650 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 16 Apr 2022 22:58:08 +0200
Subject: [PATCH 2310/2859] Fix tests

---
 apps/openmw_test_suite/mwworld/test_store.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/apps/openmw_test_suite/mwworld/test_store.cpp b/apps/openmw_test_suite/mwworld/test_store.cpp
index a789e05a5d..c15e238c9b 100644
--- a/apps/openmw_test_suite/mwworld/test_store.cpp
+++ b/apps/openmw_test_suite/mwworld/test_store.cpp
@@ -29,13 +29,14 @@ struct ContentFileTest : public ::testing::Test
 
         // load the content files
         int index=0;
+        ESM::Dialogue* dialogue = nullptr;
         for (const auto & mContentFile : mContentFiles)
         {
             ESM::ESMReader lEsm;
             lEsm.setEncoder(nullptr);
             lEsm.setIndex(index);
             lEsm.open(mContentFile.string());
-            mEsmStore.load(lEsm, &dummyListener);
+            mEsmStore.load(lEsm, &dummyListener, dialogue);
 
             ++index;
         }
@@ -249,17 +250,18 @@ TEST_F(StoreTest, delete_test)
     record.mId = recordId;
 
     ESM::ESMReader reader;
+    ESM::Dialogue* dialogue = nullptr;
 
     // master file inserts a record
     reader.open(getEsmFile(record, false), "filename");
-    mEsmStore.load(reader, &dummyListener);
+    mEsmStore.load(reader, &dummyListener, dialogue);
     mEsmStore.setUp();
 
     ASSERT_TRUE (mEsmStore.get<RecordType>().getSize() == 1);
 
     // now a plugin deletes it
     reader.open(getEsmFile(record, true), "filename");
-    mEsmStore.load(reader, &dummyListener);
+    mEsmStore.load(reader, &dummyListener, dialogue);
     mEsmStore.setUp();
 
     ASSERT_TRUE (mEsmStore.get<RecordType>().getSize() == 0);
@@ -267,7 +269,7 @@ TEST_F(StoreTest, delete_test)
     // now another plugin inserts it again
     // expected behaviour is the record to reappear rather than staying deleted
     reader.open(getEsmFile(record, false), "filename");
-    mEsmStore.load(reader, &dummyListener);
+    mEsmStore.load(reader, &dummyListener, dialogue);
     mEsmStore.setUp();
 
     ASSERT_TRUE (mEsmStore.get<RecordType>().getSize() == 1);
@@ -286,17 +288,18 @@ TEST_F(StoreTest, overwrite_test)
     record.mId = recordId;
 
     ESM::ESMReader reader;
+    ESM::Dialogue* dialogue = nullptr;
 
     // master file inserts a record
     reader.open(getEsmFile(record, false), "filename");
-    mEsmStore.load(reader, &dummyListener);
+    mEsmStore.load(reader, &dummyListener, dialogue);
     mEsmStore.setUp();
 
     // now a plugin overwrites it with changed data
     record.mId = recordIdUpper; // change id to uppercase, to test case smashing while we're at it
     record.mModel = "the_new_model";
     reader.open(getEsmFile(record, false), "filename");
-    mEsmStore.load(reader, &dummyListener);
+    mEsmStore.load(reader, &dummyListener, dialogue);
     mEsmStore.setUp();
 
     // verify that changes were actually applied

From 6c87219ba35b8f5c25f21c5ad3f84dc28183e258 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 17 Apr 2022 09:00:58 +0200
Subject: [PATCH 2311/2859] Print record flags in esmtool

---
 apps/esmtool/esmtool.cpp |  4 +++-
 apps/esmtool/labels.cpp  | 14 ++++++++++++++
 apps/esmtool/labels.hpp  |  2 ++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp
index a968dcb464..a6178d692d 100644
--- a/apps/esmtool/esmtool.cpp
+++ b/apps/esmtool/esmtool.cpp
@@ -15,6 +15,7 @@
 #include <components/esm/records.hpp>
 
 #include "record.hpp"
+#include "labels.hpp"
 
 #define ESMTOOL_VERSION 1.2
 
@@ -398,7 +399,8 @@ int load(Arguments& info)
 
             if(!quiet && interested)
             {
-                std::cout << "\nRecord: " << n.toStringView() << " '" << record->getId() << "'\n";
+                std::cout << "\nRecord: " << n.toStringView() << " '" << record->getId() << "'\n"
+                    << "Record flags: " << recordFlags(record->getFlags()) << '\n';
                 record->print();
             }
 
diff --git a/apps/esmtool/labels.cpp b/apps/esmtool/labels.cpp
index d6cae207c9..405aeb9454 100644
--- a/apps/esmtool/labels.cpp
+++ b/apps/esmtool/labels.cpp
@@ -902,3 +902,17 @@ std::string weaponFlags(int flags)
     properties += Misc::StringUtils::format("(0x%08X)", flags);
     return properties;
 }
+
+std::string recordFlags(uint32_t flags)
+{
+    std::string properties;
+    if (flags == 0) properties += "[None] ";
+    if (flags & ESM::FLAG_Deleted) properties += "Deleted ";
+    if (flags & ESM::FLAG_Persistent) properties += "Persistent ";
+    if (flags & ESM::FLAG_Ignored) properties += "Ignored ";
+    if (flags & ESM::FLAG_Blocked) properties += "Blocked ";
+    int unused = ~(ESM::FLAG_Deleted | ESM::FLAG_Persistent | ESM::FLAG_Ignored | ESM::FLAG_Blocked);
+    if (flags & unused) properties += "Invalid ";
+    properties += Misc::StringUtils::format("(0x%08X)", flags);
+    return properties;
+}
\ No newline at end of file
diff --git a/apps/esmtool/labels.hpp b/apps/esmtool/labels.hpp
index b06480a97b..8450ccfa03 100644
--- a/apps/esmtool/labels.hpp
+++ b/apps/esmtool/labels.hpp
@@ -60,6 +60,8 @@ std::string raceFlags(int flags);
 std::string spellFlags(int flags);
 std::string weaponFlags(int flags);
 
+std::string recordFlags(uint32_t flags);
+
 // Missing flags functions:
 // aiServicesFlags, possibly more
 

From 22d02e86b09d7764666287e3bec1c894da4bc564 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 17 Apr 2022 09:23:09 +0200
Subject: [PATCH 2312/2859] Respect ignored flag in navmeshtool and groundcover

---
 components/esmloader/load.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/components/esmloader/load.cpp b/components/esmloader/load.cpp
index 2e54449a2c..2705c43c49 100644
--- a/components/esmloader/load.cpp
+++ b/components/esmloader/load.cpp
@@ -196,6 +196,11 @@ namespace EsmLoader
             {
                 const ESM::NAME recName = reader.getRecName();
                 reader.getRecHeader();
+                if (reader.getRecordFlags() & ESM::FLAG_Ignored)
+                {
+                    reader.skipRecord();
+                    continue;
+                }
                 loadRecord(query, recName, reader, content);
             }
         }

From db84d9e6490ccf01d6a32106255c91611490397f Mon Sep 17 00:00:00 2001
From: Eris Caffee <eris-caffee@eldalin.com>
Date: Sun, 17 Apr 2022 16:28:14 +0000
Subject: [PATCH 2313/2859] Issue 2766 Warn user of old MW version detected

---
 AUTHORS.md                               |  1 +
 CHANGELOG.md                             |  1 +
 apps/launcher/maindialog.cpp             |  2 +-
 apps/wizard/existinginstallationpage.cpp | 38 ++++++++++++++
 apps/wizard/existinginstallationpage.hpp |  5 +-
 apps/wizard/installationpage.cpp         | 39 +++++++++++++--
 apps/wizard/installationpage.hpp         |  6 ++-
 apps/wizard/mainwizard.cpp               |  2 +-
 apps/wizard/unshield/unshieldworker.cpp  | 64 +++++++++++++++++++++++-
 apps/wizard/unshield/unshieldworker.hpp  | 11 +++-
 10 files changed, 159 insertions(+), 10 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index 44c8fbc2e8..0939409926 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -76,6 +76,7 @@ Programmers
     Eduard Cot (trombonecot)
     Eli2
     Emanuel Guével (potatoesmaster)
+    Eris Caffee (eris)
     eroen
     escondida
     Evgeniy Mineev (sandstranger)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30f02bed33..2141d20007 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -114,6 +114,7 @@
     Feature #1465: "Reset" argument for AI functions
     Feature #2491: Ability to make OpenMW "portable"
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
+    Feature #2766: Warn user if their version of Morrowind is not the latest.
     Feature #2780: A way to see current OpenMW version in the console
     Feature #3245: Grid and angle snapping for the OpenMW-CS
     Feature #3616: Allow Zoom levels on the World Map
diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp
index 167f6b9c26..accb27a48b 100644
--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@@ -570,7 +570,7 @@ void Launcher::MainDialog::play()
         msgBox.setStandardButtons(QMessageBox::Ok);
         msgBox.setText(tr("<br><b>You do not have a game file selected.</b><br><br> \
                           OpenMW will not start without a game file selected.<br>"));
-                          msgBox.exec();
+        msgBox.exec();
         return;
     }
 
diff --git a/apps/wizard/existinginstallationpage.cpp b/apps/wizard/existinginstallationpage.cpp
index 886fcd95db..42b7766693 100644
--- a/apps/wizard/existinginstallationpage.cpp
+++ b/apps/wizard/existinginstallationpage.cpp
@@ -123,6 +123,11 @@ void Wizard::ExistingInstallationPage::on_browseButton_clicked()
         return;
     }
 
+    if (!versionIsOK(info.absolutePath()))
+    {
+        return;
+    }
+
     QString path(QDir::toNativeSeparators(info.absolutePath()));
     QList<QListWidgetItem*> items = installationsList->findItems(path, Qt::MatchExactly);
 
@@ -165,3 +170,36 @@ int Wizard::ExistingInstallationPage::nextId() const
 {
     return MainWizard::Page_LanguageSelection;
 }
+
+bool Wizard::ExistingInstallationPage::versionIsOK(QString directory_name)
+{
+    QDir directory = QDir(directory_name);
+    QFileInfoList infoList = directory.entryInfoList(QStringList(QString("Morrowind.bsa")));
+    if (infoList.size() == 1)
+    {
+        qint64 actualFileSize = infoList.at(0).size();
+        const qint64 expectedFileSize = 310459500; // Size of Morrowind.bsa in Steam and GOG editions.
+
+        if (actualFileSize == expectedFileSize)
+        {
+            return true;
+        }
+
+        QMessageBox msgBox;
+        msgBox.setWindowTitle(QObject::tr("Most recent Morrowind not detected"));
+        msgBox.setIcon(QMessageBox::Warning);
+        msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
+        msgBox.setDefaultButton(QMessageBox::No);
+        msgBox.setText(QObject::tr("<br><b>There may be a more recent version of Morrowind available.</b><br><br>\
+                              Do you wish to continue anyway?<br>"));
+        int ret = msgBox.exec();
+        if (ret == QMessageBox::Yes)
+        {
+            return true;
+        }
+
+        return false;
+    }
+
+    return false;
+}
diff --git a/apps/wizard/existinginstallationpage.hpp b/apps/wizard/existinginstallationpage.hpp
index fbbbe432ee..6bdc5df134 100644
--- a/apps/wizard/existinginstallationpage.hpp
+++ b/apps/wizard/existinginstallationpage.hpp
@@ -3,6 +3,8 @@
 
 #include "ui_existinginstallationpage.h"
 
+#include <components/config/gamesettings.hpp>
+
 namespace Wizard
 {
     class MainWizard;
@@ -25,9 +27,10 @@ namespace Wizard
     private:
         MainWizard *mWizard;
 
+        bool versionIsOK(QString directory_name);
+
     protected:
         void initializePage() override;
-
     };
 
 }
diff --git a/apps/wizard/installationpage.cpp b/apps/wizard/installationpage.cpp
index 9c90b0bbf7..8aad714be3 100644
--- a/apps/wizard/installationpage.cpp
+++ b/apps/wizard/installationpage.cpp
@@ -8,8 +8,9 @@
 
 #include "mainwizard.hpp"
 
-Wizard::InstallationPage::InstallationPage(QWidget *parent) :
-    QWizardPage(parent)
+Wizard::InstallationPage::InstallationPage(QWidget *parent, Config::GameSettings &gameSettings) :
+    QWizardPage(parent),
+    mGameSettings(gameSettings)
 {
     mWizard = qobject_cast<MainWizard*>(parent);
 
@@ -18,7 +19,7 @@ Wizard::InstallationPage::InstallationPage(QWidget *parent) :
     mFinished = false;
 
     mThread = new QThread();
-    mUnshield = new UnshieldWorker();
+    mUnshield = new UnshieldWorker(mGameSettings.value("morrowind-bsa-filesize").toLongLong());
     mUnshield->moveToThread(mThread);
 
     connect(mThread, SIGNAL(started()),
@@ -47,6 +48,10 @@ Wizard::InstallationPage::InstallationPage(QWidget *parent) :
 
     connect(mUnshield, SIGNAL(requestFileDialog(Wizard::Component)),
             this, SLOT(showFileDialog(Wizard::Component)), Qt::QueuedConnection);
+
+    connect(mUnshield, SIGNAL(requestOldVersionDialog()),
+            this, SLOT(showOldVersionDialog())
+            , Qt::QueuedConnection);
 }
 
 Wizard::InstallationPage::~InstallationPage()
@@ -181,6 +186,34 @@ void Wizard::InstallationPage::showFileDialog(Wizard::Component component)
     mUnshield->setDiskPath(path);
 }
 
+void Wizard::InstallationPage::showOldVersionDialog()
+{
+    logTextEdit->appendHtml(tr("<p>Detected old version of component Morrowind.</p>"));
+    mWizard->addLogText(tr("Detected old version of component Morrowind."));
+
+    QMessageBox msgBox;
+    msgBox.setWindowTitle(tr("Morrowind Installation"));
+    msgBox.setIcon(QMessageBox::Information);
+    msgBox.setText(QObject::tr("There may be a more recent version of Morrowind available.<br><br>Do you wish to continue anyway?"));
+    msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
+    msgBox.setDefaultButton(QMessageBox::No);
+
+    int ret = msgBox.exec();
+    if (ret == QMessageBox::No)
+    {
+        logTextEdit->appendHtml(tr("<p><br/><span style=\"color:red;\"> \
+                                    <b>Error: The installation was aborted by the user</b></span></p>"));
+
+        mWizard->addLogText(QLatin1String("Error: The installation was aborted by the user"));
+        mWizard->mError = true;
+
+        emit completeChanged();
+        return;
+    }
+
+    mUnshield->wakeAll();
+}
+
 void Wizard::InstallationPage::installationFinished()
 {
     QMessageBox msgBox;
diff --git a/apps/wizard/installationpage.hpp b/apps/wizard/installationpage.hpp
index 97b1fa8bf7..49c92a5f31 100644
--- a/apps/wizard/installationpage.hpp
+++ b/apps/wizard/installationpage.hpp
@@ -6,6 +6,7 @@
 #include "unshield/unshieldworker.hpp"
 #include "ui_installationpage.h"
 #include "inisettings.hpp"
+#include <components/config/gamesettings.hpp>
 
 class QThread;
 
@@ -19,7 +20,7 @@ namespace Wizard
     {
         Q_OBJECT
     public:
-        InstallationPage(QWidget *parent);
+        InstallationPage(QWidget *parent, Config::GameSettings &gameSettings);
         ~InstallationPage() override;
 
         int nextId() const override;
@@ -34,8 +35,11 @@ namespace Wizard
 
         void startInstallation();
 
+        Config::GameSettings &mGameSettings;
+
     private slots:
         void showFileDialog(Wizard::Component component);
+        void showOldVersionDialog();
 
         void installationFinished();
         void installationError(const QString &text, const QString &details);
diff --git a/apps/wizard/mainwizard.cpp b/apps/wizard/mainwizard.cpp
index 7987d9b08d..268aaf15af 100644
--- a/apps/wizard/mainwizard.cpp
+++ b/apps/wizard/mainwizard.cpp
@@ -325,7 +325,7 @@ void Wizard::MainWizard::setupPages()
     setPage(Page_InstallationTarget, new InstallationTargetPage(this, mCfgMgr));
     setPage(Page_ComponentSelection, new ComponentSelectionPage(this));
 #ifdef OPENMW_USE_UNSHIELD
-    setPage(Page_Installation, new InstallationPage(this));
+    setPage(Page_Installation, new InstallationPage(this, mGameSettings));
 #endif
     setPage(Page_Import, new ImportPage(this));
     setPage(Page_Conclusion, new ConclusionPage(this));
diff --git a/apps/wizard/unshield/unshieldworker.cpp b/apps/wizard/unshield/unshieldworker.cpp
index 14a34e8779..3b68f87cc1 100644
--- a/apps/wizard/unshield/unshieldworker.cpp
+++ b/apps/wizard/unshield/unshieldworker.cpp
@@ -12,8 +12,9 @@
 #include <QDir>
 #include <QDirIterator>
 
-Wizard::UnshieldWorker::UnshieldWorker(QObject *parent) :
+Wizard::UnshieldWorker::UnshieldWorker(qint64 expectedMorrowindBsaSize, QObject *parent) :
     QObject(parent),
+    mExpectedMorrowindBsaSize(expectedMorrowindBsaSize),
     mIniSettings()
 {
     unshield_set_log_level(0);
@@ -159,6 +160,11 @@ void Wizard::UnshieldWorker::setIniCodec(QTextCodec *codec)
     mIniCodec = codec;
 }
 
+void Wizard::UnshieldWorker::wakeAll()
+{
+    mWait.wakeAll();
+}
+
 bool Wizard::UnshieldWorker::setupSettings()
 {
     // Create Morrowind.ini settings map
@@ -478,6 +484,18 @@ bool Wizard::UnshieldWorker::setupComponent(Component component)
                     // Check if we have correct archive, other archives have Morrowind.bsa too
                     if (tribunalFound == bloodmoonFound)
                     {
+                        qint64 actualFileSize = getMorrowindBsaFileSize(file);
+                        if (actualFileSize != mExpectedMorrowindBsaSize)
+                        {
+                            QReadLocker readLock(&mLock);
+                            emit requestOldVersionDialog();
+                            mWait.wait(&mLock);
+                            if (mStopped)
+                            {
+                                qDebug() << "We are asked to stop !!";
+                                break;
+                            }
+                        }
                         cabFile = file;
                         found = true; // We have a GoTY disk or a Morrowind-only disk
                     }
@@ -492,6 +510,11 @@ bool Wizard::UnshieldWorker::setupComponent(Component component)
 
         }
 
+        if (cabFile.isEmpty())
+        {
+            break;
+        }
+
         if (!found)
         {
             emit textChanged(tr("Failed to find a valid archive containing %1.bsa! Retrying.").arg(name));
@@ -939,3 +962,42 @@ bool Wizard::UnshieldWorker::findInCab(const QString &fileName, const QString &c
     unshield_close(unshield);
     return false;
 }
+
+size_t Wizard::UnshieldWorker::getMorrowindBsaFileSize(const QString &cabFile)
+{
+    QString fileName = QString("Morrowind.bsa");
+    QByteArray array(cabFile.toUtf8());
+
+    Unshield *unshield;
+    unshield = unshield_open(array.constData());
+
+    if (!unshield)
+    {
+        emit error(tr("Failed to open InstallShield Cabinet File."), tr("Opening %1 failed.").arg(cabFile));
+        unshield_close(unshield);
+        return false;
+    }
+
+    for (int i = 0; i < unshield_file_group_count(unshield); ++i)
+    {
+        UnshieldFileGroup *group = unshield_file_group_get(unshield, i);
+
+        for (size_t j = group->first_file; j <= group->last_file; ++j)
+        {
+
+            if (unshield_file_is_valid(unshield, j))
+            {
+                QString current(QString::fromUtf8(unshield_file_name(unshield, j)));
+                if (current.toLower() == fileName.toLower())
+                {
+                    size_t fileSize = unshield_file_size(unshield, j);
+                    unshield_close(unshield);
+                    return fileSize; // File is found!
+                }
+            }
+        }
+    }
+
+    unshield_close(unshield);
+    return 0;
+}
diff --git a/apps/wizard/unshield/unshieldworker.hpp b/apps/wizard/unshield/unshieldworker.hpp
index 13f4a1168c..483264e990 100644
--- a/apps/wizard/unshield/unshieldworker.hpp
+++ b/apps/wizard/unshield/unshieldworker.hpp
@@ -12,6 +12,7 @@
 
 #include "../inisettings.hpp"
 
+#include <components/config/gamesettings.hpp>
 
 namespace Wizard
 {
@@ -26,7 +27,7 @@ namespace Wizard
         Q_OBJECT
 
     public:
-        UnshieldWorker(QObject *parent = nullptr);
+        UnshieldWorker(qint64 expectedMorrowindBsaSize, QObject *parent = nullptr);
         ~UnshieldWorker() override;
 
         void stopWorker();
@@ -38,6 +39,8 @@ namespace Wizard
         void setPath(const QString &path);
         void setIniPath(const QString &path);
 
+        void wakeAll();
+
         QString getPath();
         QString getIniPath();
 
@@ -45,8 +48,9 @@ namespace Wizard
 
         bool setupSettings();
 
-    private:
+        size_t getMorrowindBsaFileSize(const QString &cabFile);
 
+    private:
         bool writeSettings();
 
         bool getInstallComponent(Component component);
@@ -95,6 +99,8 @@ namespace Wizard
 
         bool mStopped;
 
+        qint64 mExpectedMorrowindBsaSize;
+
         QString mPath;
         QString mIniPath;
         QString mDiskPath;
@@ -113,6 +119,7 @@ namespace Wizard
     signals:
         void finished();
         void requestFileDialog(Wizard::Component component);
+        void requestOldVersionDialog();
 
         void textChanged(const QString &text);
 

From ba57d0651fa3641f353b96eabd0599a779cbbf15 Mon Sep 17 00:00:00 2001
From: Eris Caffee <eris-caffee@eldalin.com>
Date: Sun, 17 Apr 2022 17:13:31 +0000
Subject: [PATCH 2314/2859] issue 6685 - wizard failure if config dir does not
 exist

---
 apps/launcher/maindialog.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp
index 167f6b9c26..87d5a5f3d8 100644
--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@@ -4,6 +4,7 @@
 #include <components/misc/helpviewer.hpp>
 
 #include <QDate>
+#include <QDir>
 #include <QMessageBox>
 #include <QFontDatabase>
 #include <QFileDialog>
@@ -153,6 +154,20 @@ Launcher::FirstRunDialogResult Launcher::MainDialog::showFirstRunDialog()
     if (!setupLauncherSettings())
         return FirstRunDialogResultFailure;
 
+    // Dialog wizard and setup will fail if the config directory does not already exist
+    QDir userConfigDir = QDir(QString::fromStdString(mCfgMgr.getUserConfigPath().string()));
+    if ( ! userConfigDir.exists() ) {
+        if ( ! userConfigDir.mkpath(".") )
+        {
+            cfgError(tr("Error opening OpenMW configuration file"),
+                     tr("<br><b>Could not create directory %0</b><br><br> \
+                        Please make sure you have the right permissions \
+                        and try again.<br>").arg(userConfigDir.canonicalPath())
+            );
+            return FirstRunDialogResultFailure;
+        }
+    }
+
     if (mLauncherSettings.value(QString("General/firstrun"), QString("true")) == QLatin1String("true"))
     {
         QMessageBox msgBox;

From 56a1505885c09e1a7088c4c243797f84025babbd Mon Sep 17 00:00:00 2001
From: Matt <3397065-ZehMatt@users.noreply.gitlab.com>
Date: Sun, 17 Apr 2022 17:15:00 +0000
Subject: [PATCH 2315/2859] Cache the target for ai packages instead of looking
 for it every frame

---
 apps/openmw/mwmechanics/aicombat.cpp  |  6 +++++-
 apps/openmw/mwmechanics/aipackage.cpp | 22 +++++++++++++++++-----
 apps/openmw/mwmechanics/aipackage.hpp |  9 +++------
 apps/openmw/mwmechanics/aipursue.cpp  | 10 +++++++++-
 4 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index cbd62d37ff..bd6bd385e8 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -451,7 +451,11 @@ namespace MWMechanics
 
     MWWorld::Ptr AiCombat::getTarget() const
     {
-        return MWBase::Environment::get().getWorld()->searchPtrViaActorId(mTargetActorId);
+        if (mCachedTarget.isEmpty() || mCachedTarget.getRefData().isDeleted() || !mCachedTarget.getRefData().isEnabled())
+        {
+            mCachedTarget = MWBase::Environment::get().getWorld()->searchPtrViaActorId(mTargetActorId);
+        }
+        return mCachedTarget;
     }
 
     void AiCombat::writeState(ESM::AiSequence::AiSequence &sequence) const
diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index e532e71478..7057a99393 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -47,6 +47,7 @@ MWMechanics::AiPackage::AiPackage(AiPackageTypeId typeId, const Options& options
     mReaction(MWBase::Environment::get().getWorld()->getPrng()),
     mTargetActorRefId(""),
     mTargetActorId(-1),
+    mCachedTarget(),
     mRotateOnTheRunChecks(0),
     mIsShortcutting(false),
     mShortcutProhibited(false),
@@ -56,6 +57,14 @@ MWMechanics::AiPackage::AiPackage(AiPackageTypeId typeId, const Options& options
 
 MWWorld::Ptr MWMechanics::AiPackage::getTarget() const
 {
+    if (!mCachedTarget.isEmpty())
+    {
+        if (mCachedTarget.getRefData().isDeleted() || !mCachedTarget.getRefData().isEnabled())
+            mCachedTarget = MWWorld::Ptr();
+        else
+            return mCachedTarget;
+    }
+
     if (mTargetActorId == -2)
         return MWWorld::Ptr();
 
@@ -66,20 +75,22 @@ MWWorld::Ptr MWMechanics::AiPackage::getTarget() const
             mTargetActorId = -2;
             return MWWorld::Ptr();
         }
-        MWWorld::Ptr target = MWBase::Environment::get().getWorld()->searchPtr(mTargetActorRefId, false);
-        if (target.isEmpty())
+        mCachedTarget = MWBase::Environment::get().getWorld()->searchPtr(mTargetActorRefId, false);
+        if (mCachedTarget.isEmpty())
         {
             mTargetActorId = -2;
-            return target;
+            return mCachedTarget;
         }
         else
-            mTargetActorId = target.getClass().getCreatureStats(target).getActorId();
+            mTargetActorId = mCachedTarget.getClass().getCreatureStats(mCachedTarget).getActorId();
     }
 
     if (mTargetActorId != -1)
-        return MWBase::Environment::get().getWorld()->searchPtrViaActorId(mTargetActorId);
+        mCachedTarget = MWBase::Environment::get().getWorld()->searchPtrViaActorId(mTargetActorId);
     else
         return MWWorld::Ptr();
+
+    return mCachedTarget;
 }
 
 void MWMechanics::AiPackage::reset()
@@ -89,6 +100,7 @@ void MWMechanics::AiPackage::reset()
     mIsShortcutting = false;
     mShortcutProhibited = false;
     mShortcutFailPos = osg::Vec3f();
+    mCachedTarget = MWWorld::Ptr();
 
     mPathFinder.clearPath();
     mObstacleCheck.clear();
diff --git a/apps/openmw/mwmechanics/aipackage.hpp b/apps/openmw/mwmechanics/aipackage.hpp
index 498c6e3050..4e5dfcab6b 100644
--- a/apps/openmw/mwmechanics/aipackage.hpp
+++ b/apps/openmw/mwmechanics/aipackage.hpp
@@ -4,17 +4,13 @@
 #include <memory>
 
 #include <components/detournavigator/areatype.hpp>
-
+ 
 #include "pathfinding.hpp"
 #include "obstacle.hpp"
 #include "aistate.hpp"
 #include "aipackagetypeid.hpp"
 #include "aitimer.hpp"
-
-namespace MWWorld
-{
-    class Ptr;
-}
+#include "../mwworld/ptr.hpp"
 
 namespace ESM
 {
@@ -165,6 +161,7 @@ namespace MWMechanics
 
             std::string mTargetActorRefId;
             mutable int mTargetActorId;
+            mutable MWWorld::Ptr mCachedTarget;
 
             short mRotateOnTheRunChecks; // attempts to check rotation to the pathpoint on the run possibility
 
diff --git a/apps/openmw/mwmechanics/aipursue.cpp b/apps/openmw/mwmechanics/aipursue.cpp
index 252bff58f8..25dd08436b 100644
--- a/apps/openmw/mwmechanics/aipursue.cpp
+++ b/apps/openmw/mwmechanics/aipursue.cpp
@@ -71,7 +71,15 @@ bool AiPursue::execute (const MWWorld::Ptr& actor, CharacterController& characte
 
 MWWorld::Ptr AiPursue::getTarget() const
 {
-    return MWBase::Environment::get().getWorld()->searchPtrViaActorId(mTargetActorId);
+    if (!mCachedTarget.isEmpty())
+    {
+        if (mCachedTarget.getRefData().isDeleted() || !mCachedTarget.getRefData().isEnabled())
+            mCachedTarget = MWWorld::Ptr();
+        else
+            return mCachedTarget;
+    }
+    mCachedTarget = MWBase::Environment::get().getWorld()->searchPtrViaActorId(mTargetActorId);
+    return mCachedTarget;
 }
 
 void AiPursue::writeState(ESM::AiSequence::AiSequence &sequence) const

From d05a2facf3c32ef896b88095d191162dc36c49fa Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sun, 11 Apr 2021 10:28:56 +0200
Subject: [PATCH 2316/2859] Handle NCC flag in Nif files. Objects with this
 flag will collide only with camera. Expose objects with NC flag to be used by
 Lua mods.

---
 CHANGELOG.md                                  |  1 +
 apps/openmw/mwlua/nearbybindings.cpp          |  5 +-
 apps/openmw/mwphysics/collisiontype.hpp       |  5 +-
 apps/openmw/mwphysics/movementsolver.cpp      |  4 +-
 apps/openmw/mwphysics/mtphysics.cpp           |  2 +-
 apps/openmw/mwphysics/physicssystem.cpp       | 13 ++++-
 apps/openmw/mwrender/camera.cpp               |  2 +-
 .../nifloader/testbulletnifloader.cpp         | 58 ++++++++++++++++++-
 components/nif/extra.hpp                      |  5 +-
 components/nifbullet/bulletnifloader.cpp      | 30 +++++-----
 components/nifbullet/bulletnifloader.hpp      |  7 +--
 components/resource/bulletshape.cpp           |  1 +
 components/resource/bulletshape.hpp           |  7 +++
 files/builtin_scripts/scripts/omw/camera.lua  |  2 +-
 .../scripts/omw/third_person.lua              |  3 +-
 files/lua_api/openmw/nearby.lua               |  5 +-
 16 files changed, 113 insertions(+), 37 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 525cd5807b..846aaea290 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -140,6 +140,7 @@
     Feature #6380: Commas are treated as whitespace in vanilla
     Feature #6419: Topics shouldn't be greyed out if they can produce another topic reference
     Feature #6443: Support NiStencilProperty
+    Feature #6496: NCC flag isn't handled properly
     Feature #6534: Shader-based object texture blending
     Feature #6541: Gloss-mapping
     Feature #6592: Missing support for NiTriShape particle emitters
diff --git a/apps/openmw/mwlua/nearbybindings.cpp b/apps/openmw/mwlua/nearbybindings.cpp
index 6ce78e569f..cf1458c883 100644
--- a/apps/openmw/mwlua/nearbybindings.cpp
+++ b/apps/openmw/mwlua/nearbybindings.cpp
@@ -54,7 +54,10 @@ namespace MWLua
             {"HeightMap", MWPhysics::CollisionType_HeightMap},
             {"Projectile", MWPhysics::CollisionType_Projectile},
             {"Water", MWPhysics::CollisionType_Water},
-            {"Default", MWPhysics::CollisionType_Default}
+            {"Default", MWPhysics::CollisionType_Default},
+            {"AnyPhysical", MWPhysics::CollisionType_AnyPhysical},
+            {"Camera", MWPhysics::CollisionType_CameraOnly},
+            {"VisualOnly", MWPhysics::CollisionType_VisualOnly},
         }));
 
         api["castRay"] = [](const osg::Vec3f& from, const osg::Vec3f& to, sol::optional<sol::table> options)
diff --git a/apps/openmw/mwphysics/collisiontype.hpp b/apps/openmw/mwphysics/collisiontype.hpp
index e69534cf68..b51a22a2f5 100644
--- a/apps/openmw/mwphysics/collisiontype.hpp
+++ b/apps/openmw/mwphysics/collisiontype.hpp
@@ -11,7 +11,10 @@ enum CollisionType {
     CollisionType_HeightMap = 1<<3,
     CollisionType_Projectile = 1<<4,
     CollisionType_Water = 1<<5,
-    CollisionType_Default = CollisionType_World|CollisionType_HeightMap|CollisionType_Actor|CollisionType_Door
+    CollisionType_Default = CollisionType_World|CollisionType_HeightMap|CollisionType_Actor|CollisionType_Door,
+    CollisionType_AnyPhysical = CollisionType_World|CollisionType_HeightMap|CollisionType_Actor|CollisionType_Door|CollisionType_Projectile|CollisionType_Water,
+    CollisionType_CameraOnly = 1<<6,
+    CollisionType_VisualOnly = 1<<7
 };
 
 }
diff --git a/apps/openmw/mwphysics/movementsolver.cpp b/apps/openmw/mwphysics/movementsolver.cpp
index fd8a7f2b05..da07d5975b 100644
--- a/apps/openmw/mwphysics/movementsolver.cpp
+++ b/apps/openmw/mwphysics/movementsolver.cpp
@@ -101,7 +101,7 @@ namespace MWPhysics
         btVector3 to = from - btVector3(0,0,maxHeight);
 
         btCollisionWorld::ClosestRayResultCallback resultCallback1(from, to);
-        resultCallback1.m_collisionFilterGroup = 0xff;
+        resultCallback1.m_collisionFilterGroup = CollisionType_AnyPhysical;
         resultCallback1.m_collisionFilterMask = CollisionType_World|CollisionType_HeightMap;
 
         collisionWorld->rayTest(from, to, resultCallback1);
@@ -426,7 +426,7 @@ namespace MWPhysics
             return;
 
         ProjectileConvexCallback resultCallback(projectile.mCaster, projectile.mCollisionObject, btFrom, btTo, projectile.mProjectile);
-        resultCallback.m_collisionFilterMask = 0xff;
+        resultCallback.m_collisionFilterMask = CollisionType_AnyPhysical;
         resultCallback.m_collisionFilterGroup = CollisionType_Projectile;
 
         const btQuaternion btrot = btQuaternion::getIdentity();
diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 0f05ccdbb1..cb8e520384 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -661,7 +661,7 @@ namespace MWPhysics
         btVector3 pos2  = Misc::Convert::toBullet(actor2->getCollisionObjectPosition() + osg::Vec3f(0,0,actor2->getHalfExtents().z() * 0.9));
 
         btCollisionWorld::ClosestRayResultCallback resultCallback(pos1, pos2);
-        resultCallback.m_collisionFilterGroup = 0xFF;
+        resultCallback.m_collisionFilterGroup = CollisionType_AnyPhysical;
         resultCallback.m_collisionFilterMask = CollisionType_World|CollisionType_HeightMap|CollisionType_Door;
 
         MaybeLock lockColWorld(mCollisionWorldMutex, mNumThreads);
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 06c2420df1..0dd177e4b8 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -490,6 +490,17 @@ namespace MWPhysics
 
         assert(!getObject(ptr));
 
+        // Override collision type based on shape content.
+        switch (shapeInstance->mCollisionType)
+        {
+            case Resource::BulletShape::CollisionType::Camera:
+                collisionType = CollisionType_CameraOnly;
+                break;
+            case Resource::BulletShape::CollisionType::None:
+                collisionType = CollisionType_VisualOnly;
+                break;
+        }
+
         auto obj = std::make_shared<Object>(ptr, shapeInstance, rotation, collisionType, mTaskScheduler.get());
         mObjects.emplace(ptr.mRef, obj);
 
@@ -905,7 +916,7 @@ namespace MWPhysics
         const auto aabbMin = bulletPosition - btVector3(radius, radius, radius);
         const auto aabbMax = bulletPosition + btVector3(radius, radius, radius);
         const int mask = MWPhysics::CollisionType_Actor;
-        const int group = 0xff;
+        const int group = MWPhysics::CollisionType_AnyPhysical;
         if (occupyingActors == nullptr)
         {
             HasSphereCollisionCallback callback(bulletPosition, radius, mask, group, ignoreFilter,
diff --git a/apps/openmw/mwrender/camera.cpp b/apps/openmw/mwrender/camera.cpp
index 7e83a08493..ea499a64bc 100644
--- a/apps/openmw/mwrender/camera.cpp
+++ b/apps/openmw/mwrender/camera.cpp
@@ -53,7 +53,7 @@ namespace MWRender
 
     Camera::Camera (osg::Camera* camera)
     : mHeightScale(1.f),
-      mCollisionType(MWPhysics::CollisionType::CollisionType_Default & ~MWPhysics::CollisionType::CollisionType_Actor),
+      mCollisionType((MWPhysics::CollisionType::CollisionType_Default & ~MWPhysics::CollisionType::CollisionType_Actor) | MWPhysics::CollisionType_CameraOnly),
       mCamera(camera),
       mAnimation(nullptr),
       mFirstPersonView(true),
diff --git a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
index f84fbe2508..f2f6cb3985 100644
--- a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
+++ b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
@@ -1009,7 +1009,53 @@ namespace
         EXPECT_EQ(*result, expected);
     }
 
-    TEST_F(TestBulletNifLoader, for_tri_shape_child_node_with_extra_data_string_starting_with_nc_should_return_shape_with_null_collision_shape)
+    TEST_F(TestBulletNifLoader, for_tri_shape_child_node_with_extra_data_string_equal_ncc_should_return_shape_with_cameraonly_collision)
+    {
+        mNiStringExtraData.string = "NCC__";
+        mNiStringExtraData.recType = Nif::RC_NiStringExtraData;
+        mNiTriShape.extra = Nif::ExtraPtr(&mNiStringExtraData);
+        mNiTriShape.parents.push_back(&mNiNode);
+        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
+
+        EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
+        EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiNode));
+        EXPECT_CALL(mNifFile, getFilename()).WillOnce(Return("test.nif"));
+        const auto result = mLoader.load(mNifFile);
+
+        std::unique_ptr<btTriangleMesh> triangles(new btTriangleMesh(false));
+        triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
+        Resource::BulletShape expected;
+        expected.mCollisionShape.reset(new Resource::TriangleMeshShape(triangles.release(), true));
+        expected.mCollisionType = Resource::BulletShape::CollisionType::Camera;
+
+        EXPECT_EQ(*result, expected);
+    }
+
+    TEST_F(TestBulletNifLoader, for_tri_shape_child_node_with_not_first_extra_data_string_equal_ncc_should_return_shape_with_cameraonly_collision)
+    {
+        mNiStringExtraData.next = Nif::ExtraPtr(&mNiStringExtraData2);
+        mNiStringExtraData2.string = "NC___";
+        mNiStringExtraData2.recType = Nif::RC_NiStringExtraData;
+        mNiTriShape.extra = Nif::ExtraPtr(&mNiStringExtraData);
+        mNiTriShape.parents.push_back(&mNiNode);
+        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>({Nif::NodePtr(&mNiTriShape)}));
+
+        EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
+        EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiNode));
+        EXPECT_CALL(mNifFile, getFilename()).WillOnce(Return("test.nif"));
+        const auto result = mLoader.load(mNifFile);
+
+        std::unique_ptr<btTriangleMesh> triangles(new btTriangleMesh(false));
+        triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
+        Resource::BulletShape expected;
+        expected.mCollisionShape.reset(new Resource::TriangleMeshShape(triangles.release(), true));
+        expected.mCollisionType = Resource::BulletShape::CollisionType::Camera;
+
+        EXPECT_EQ(*result, expected);
+    }
+
+
+    TEST_F(TestBulletNifLoader, for_tri_shape_child_node_with_extra_data_string_starting_with_nc_should_return_shape_with_nocollision)
     {
         mNiStringExtraData.string = "NC___";
         mNiStringExtraData.recType = Nif::RC_NiStringExtraData;
@@ -1022,12 +1068,16 @@ namespace
         EXPECT_CALL(mNifFile, getFilename()).WillOnce(Return("test.nif"));
         const auto result = mLoader.load(mNifFile);
 
+        std::unique_ptr<btTriangleMesh> triangles(new btTriangleMesh(false));
+        triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
         Resource::BulletShape expected;
+        expected.mCollisionShape.reset(new Resource::TriangleMeshShape(triangles.release(), true));
+        expected.mCollisionType = Resource::BulletShape::CollisionType::None;
 
         EXPECT_EQ(*result, expected);
     }
 
-    TEST_F(TestBulletNifLoader, for_tri_shape_child_node_with_not_first_extra_data_string_starting_with_nc_should_return_shape_with_null_collision_shape)
+    TEST_F(TestBulletNifLoader, for_tri_shape_child_node_with_not_first_extra_data_string_starting_with_nc_should_return_shape_with_nocollision)
     {
         mNiStringExtraData.next = Nif::ExtraPtr(&mNiStringExtraData2);
         mNiStringExtraData2.string = "NC___";
@@ -1041,7 +1091,11 @@ namespace
         EXPECT_CALL(mNifFile, getFilename()).WillOnce(Return("test.nif"));
         const auto result = mLoader.load(mNifFile);
 
+        std::unique_ptr<btTriangleMesh> triangles(new btTriangleMesh(false));
+        triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
         Resource::BulletShape expected;
+        expected.mCollisionShape.reset(new Resource::TriangleMeshShape(triangles.release(), true));
+        expected.mCollisionType = Resource::BulletShape::CollisionType::None;
 
         EXPECT_EQ(*result, expected);
     }
diff --git a/components/nif/extra.hpp b/components/nif/extra.hpp
index 8eb14f9b01..cbcb3cabe6 100644
--- a/components/nif/extra.hpp
+++ b/components/nif/extra.hpp
@@ -55,9 +55,10 @@ struct NiTextKeyExtraData : public Extra
 
 struct NiStringExtraData : public Extra
 {
-    /* Two known meanings:
+    /* Known meanings:
        "MRK" - marker, only visible in the editor, not rendered in-game
-       "NCO" - no collision
+       "NCC" - no collision except with the camera
+       Anything else starting with "NC" - no collision
     */
     std::string string;
 
diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index 3b0eacfbd7..52be8d4a07 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -17,6 +17,8 @@
 #include <components/nif/extra.hpp>
 #include <components/nif/parent.hpp>
 
+#include <components/settings/settings.hpp>
+
 namespace
 {
 
@@ -215,7 +217,7 @@ osg::ref_ptr<Resource::BulletShape> BulletNifLoader::load(const Nif::File& nif)
     for (const Nif::Node* node : roots)
     {
         bool autogenerated = hasAutoGeneratedCollision(*node);
-        handleNode(filename, *node, nullptr, 0, autogenerated, isAnimated, autogenerated);
+        handleNode(filename, *node, nullptr, 0, autogenerated, isAnimated, autogenerated, false, mShape->mCollisionType);
     }
 
     if (mCompoundShape)
@@ -307,7 +309,7 @@ bool BulletNifLoader::hasAutoGeneratedCollision(const Nif::Node& rootNode)
 }
 
 void BulletNifLoader::handleNode(const std::string& fileName, const Nif::Node& node, const Nif::Parent* parent,
-    int flags, bool isCollisionNode, bool isAnimated, bool autogenerated, bool avoid)
+    int flags, bool isCollisionNode, bool isAnimated, bool autogenerated, bool avoid, unsigned int& collisionType)
 {
     // TODO: allow on-the fly collision switching via toggling this flag
     if (node.recType == Nif::RC_NiCollisionSwitch && !(node.flags & Nif::NiNode::Flag_ActiveCollision))
@@ -341,8 +343,13 @@ void BulletNifLoader::handleNode(const std::string& fileName, const Nif::Node& n
 
             if (Misc::StringUtils::ciCompareLen(sd->string, "NC", 2) == 0)
             {
-                // No collision. Use an internal flag setting to mark this.
-                flags |= 0x800;
+                // NCC flag in vanilla is partly case sensitive: prefix NC is case insensitive but second C needs be uppercase
+                if (sd->string.length() > 2 && sd->string[2] == 'C')
+                    // Collide only with camera.
+                    collisionType = Resource::BulletShape::CollisionType::Camera;
+                else
+                    // No collision.
+                    collisionType = Resource::BulletShape::CollisionType::None;
             }
             else if (sd->string == "MRK" && autogenerated)
             {
@@ -362,7 +369,7 @@ void BulletNifLoader::handleNode(const std::string& fileName, const Nif::Node& n
                                 || node.recType == Nif::RC_NiTriStrips
                                 || node.recType == Nif::RC_BSLODTriShape))
         {
-            handleNiTriShape(node, parent, flags, getWorldTransform(node, parent), isAnimated, avoid);
+            handleNiTriShape(static_cast<const Nif::NiGeometry&>(node), parent, getWorldTransform(node, parent), isAnimated, avoid);
         }
     }
 
@@ -377,22 +384,11 @@ void BulletNifLoader::handleNode(const std::string& fileName, const Nif::Node& n
                 continue;
 
             assert(std::find(list[i]->parents.begin(), list[i]->parents.end(), ninode) != list[i]->parents.end());
-            handleNode(fileName, list[i].get(), &currentParent, flags, isCollisionNode, isAnimated, autogenerated, avoid);
+            handleNode(fileName, list[i].get(), &currentParent, flags, isCollisionNode, isAnimated, autogenerated, avoid, collisionType);
         }
     }
 }
 
-void BulletNifLoader::handleNiTriShape(const Nif::Node& nifNode, const Nif::Parent* parent, int flags,
-    const osg::Matrixf &transform, bool isAnimated, bool avoid)
-{
-    // If the object was marked "NCO" earlier, it shouldn't collide with
-    // anything. So don't do anything.
-    if ((flags & 0x800))
-        return;
-
-    handleNiTriShape(static_cast<const Nif::NiGeometry&>(nifNode), parent, transform, isAnimated, avoid);
-}
-
 void BulletNifLoader::handleNiTriShape(const Nif::NiGeometry& niGeometry, const Nif::Parent* nodeParent,
     const osg::Matrixf &transform, bool isAnimated, bool avoid)
 {
diff --git a/components/nifbullet/bulletnifloader.hpp b/components/nifbullet/bulletnifloader.hpp
index 01a17a5aa1..e90c882bc3 100644
--- a/components/nifbullet/bulletnifloader.hpp
+++ b/components/nifbullet/bulletnifloader.hpp
@@ -56,14 +56,11 @@ public:
 private:
     bool findBoundingBox(const Nif::Node& node, const std::string& filename);
 
-    void handleNode(const std::string& fileName, const Nif::Node& node, const Nif::Parent* parent, int flags,
-        bool isCollisionNode, bool isAnimated=false, bool autogenerated=false, bool avoid=false);
+    void handleNode(const std::string& fileName, const Nif::Node& node,const Nif::Parent* parent, int flags,
+        bool isCollisionNode, bool isAnimated, bool autogenerated, bool avoid, unsigned int& cameraOnlyCollision);
 
     bool hasAutoGeneratedCollision(const Nif::Node& rootNode);
 
-    void handleNiTriShape(const Nif::Node& nifNode, const Nif::Parent* parent, int flags, const osg::Matrixf& transform,
-        bool isAnimated, bool avoid);
-
     void handleNiTriShape(const Nif::NiGeometry& nifNode, const Nif::Parent* parent, const osg::Matrixf& transform,
         bool isAnimated, bool avoid);
 
diff --git a/components/resource/bulletshape.cpp b/components/resource/bulletshape.cpp
index 74515691c6..2d7fd87aed 100644
--- a/components/resource/bulletshape.cpp
+++ b/components/resource/bulletshape.cpp
@@ -96,6 +96,7 @@ BulletShapeInstance::BulletShapeInstance(osg::ref_ptr<const BulletShape> source)
 {
     mCollisionBox = mSource->mCollisionBox;
     mAnimatedShapes = mSource->mAnimatedShapes;
+    mCollisionType = mSource->mCollisionType;
     mCollisionShape = duplicateCollisionShape(mSource->mCollisionShape.get());
     mAvoidCollisionShape = duplicateCollisionShape(mSource->mAvoidCollisionShape.get());
 }
diff --git a/components/resource/bulletshape.hpp b/components/resource/bulletshape.hpp
index cd8922ec8e..63db8ec482 100644
--- a/components/resource/bulletshape.hpp
+++ b/components/resource/bulletshape.hpp
@@ -59,6 +59,13 @@ namespace Resource
         void setLocalScaling(const btVector3& scale);
 
         bool isAnimated() const { return !mAnimatedShapes.empty(); }
+
+        unsigned int mCollisionType = 0;
+        enum CollisionType
+        {
+            None = 0x1,
+            Camera = 0x2
+        };
     };
 
 
diff --git a/files/builtin_scripts/scripts/omw/camera.lua b/files/builtin_scripts/scripts/omw/camera.lua
index 04252e1b47..56e7f52487 100644
--- a/files/builtin_scripts/scripts/omw/camera.lua
+++ b/files/builtin_scripts/scripts/omw/camera.lua
@@ -24,7 +24,7 @@ local noHeadBobbing = 0
 local noZoom = 0
 
 local function init()
-    camera.setCollisionType(util.bitAnd(nearby.COLLISION_TYPE.Default, util.bitNot(nearby.COLLISION_TYPE.Actor)))
+    camera.setCollisionType(util.bitOr(util.bitAnd(nearby.COLLISION_TYPE.Default, util.bitNot(nearby.COLLISION_TYPE.Actor)), nearby.COLLISION_TYPE.Camera))
     camera.setFieldOfView(camera.getBaseFieldOfView())
     camera.allowCharacterDeferredRotation(settings._getBoolFromSettingsCfg('Camera', 'deferred preview rotation'))
     if camera.getMode() == MODE.FirstPerson then
diff --git a/files/builtin_scripts/scripts/omw/third_person.lua b/files/builtin_scripts/scripts/omw/third_person.lua
index 1b833d2322..311dbde48b 100644
--- a/files/builtin_scripts/scripts/omw/third_person.lua
+++ b/files/builtin_scripts/scripts/omw/third_person.lua
@@ -28,10 +28,9 @@ local combatOffset = util.vector2(0, 15)
 
 local state = defaultShoulder
 
-local rayOptions = {collisionType = nearby.COLLISION_TYPE.Default - nearby.COLLISION_TYPE.Actor}
 local function ray(from, angle, limit)
     local to = from + util.transform.rotateZ(angle) * util.vector3(0, limit, 0)
-    local res = nearby.castRay(from, to, rayOptions)
+    local res = nearby.castRay(from, to, {collisionType = camera.getCollisionType()})
     if res.hit then
         return (res.hitPos - from):length()
     else
diff --git a/files/lua_api/openmw/nearby.lua b/files/lua_api/openmw/nearby.lua
index ba27269700..f290992f33 100644
--- a/files/lua_api/openmw/nearby.lua
+++ b/files/lua_api/openmw/nearby.lua
@@ -34,7 +34,10 @@
 -- @field [parent=#COLLISION_TYPE] #number HeightMap
 -- @field [parent=#COLLISION_TYPE] #number Projectile
 -- @field [parent=#COLLISION_TYPE] #number Water
--- @field [parent=#COLLISION_TYPE] #number Default Used by deafult: World+Door+Actor+HeightMap
+-- @field [parent=#COLLISION_TYPE] #number Default Used by default: World+Door+Actor+HeightMap
+-- @field [parent=#COLLISION_TYPE] #number AnyPhysical : World+Door+Actor+HeightMap+Projectile+Water
+-- @field [parent=#COLLISION_TYPE] #number Camera Objects that should collide only with camera
+-- @field [parent=#COLLISION_TYPE] #number VisualOnly Objects that were not intended to be part of the physics world
 
 ---
 -- Collision types that are used in `castRay`.

From b2c6c499998a722e2060c4f0aa6b80d168a9a6c3 Mon Sep 17 00:00:00 2001
From: Eris Caffee <eris-caffee@eldalin.com>
Date: Sun, 17 Apr 2022 20:25:09 +0000
Subject: [PATCH 2317/2859] issue-5279 console stops scrolling properly after
 selection

---
 CHANGELOG.md                  | 1 +
 apps/openmw/mwgui/console.cpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 525cd5807b..1a70c819d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@
     Bug #5120: Scripted object spawning updates physics system
     Bug #5192: Actor turn rate is too slow
     Bug #5207: Loose summons can be present in scene
+    Bug #5279: Ingame console stops auto-scrolling after clicking output
     Bug #5377: console does not appear after using menutest in inventory
     Bug #5379: Wandering NPCs falling through cantons
     Bug #5394: Windows snapping no longer works
diff --git a/apps/openmw/mwgui/console.cpp b/apps/openmw/mwgui/console.cpp
index 3bc2607045..a3663b6b9f 100644
--- a/apps/openmw/mwgui/console.cpp
+++ b/apps/openmw/mwgui/console.cpp
@@ -336,6 +336,7 @@ namespace MWGui
             mCommandHistory.push_back(cm);
         mCurrent = mCommandHistory.end();
         mEditString.clear();
+        mHistory->setTextCursor(mHistory->getTextLength());
 
         // Reset the command line before the command execution.
         // It prevents the re-triggering of the acceptCommand() event for the same command 

From 627656ace0da7dd53b6edb088efca55fce030e18 Mon Sep 17 00:00:00 2001
From: Eris Caffee <eris-caffee@eldalin.com>
Date: Sun, 17 Apr 2022 20:26:23 +0000
Subject: [PATCH 2318/2859] issue-6667 pressing escape during wait causes black
 screen

---
 CHANGELOG.md                     |  1 +
 apps/openmw/mwgui/waitdialog.cpp | 12 +++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30f02bed33..9aff710043 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -107,6 +107,7 @@
     Bug #6606: Quests with multiple IDs cannot always be restarted
     Bug #6653: With default settings the in-game console doesn't fit into screen
     Bug #6655: Constant effect absorb attribute causes the game to break
+    Bug #6667: Pressing the Esc key while resting or waiting causes black screen.
     Bug #6670: Dialogue order is incorrect
     Bug #6680: object.cpp handles nodetree unsafely, memory access with dangling pointer
     Bug #6682: HitOnMe doesn't fire as intended
diff --git a/apps/openmw/mwgui/waitdialog.cpp b/apps/openmw/mwgui/waitdialog.cpp
index 754777c507..9cda792a86 100644
--- a/apps/openmw/mwgui/waitdialog.cpp
+++ b/apps/openmw/mwgui/waitdialog.cpp
@@ -98,12 +98,22 @@ namespace MWGui
 
     bool WaitDialog::exit()
     {
-        return (!mTimeAdvancer.isRunning()); //Only exit if not currently waiting
+        bool canExit = !mTimeAdvancer.isRunning(); // Only exit if not currently waiting
+        if (canExit)
+        {
+            clear();
+            stopWaiting();
+        }
+        return canExit;
     }
 
     void WaitDialog::clear()
     {
         mSleeping = false;
+        mHours = 1;
+        mManualHours = 1;
+        mFadeTimeRemaining = 0;
+        mInterruptAt = -1;
         mTimeAdvancer.stop();
     }
 

From 4907bcaf4163078ef59e7f70b049d7502d500787 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matja=C5=BE=20Lamut?= <matjaz.lamut@gmail.com>
Date: Mon, 18 Apr 2022 18:42:47 +0000
Subject: [PATCH 2319/2859] Document OpenMW-CS tables.

---
 docs/source/manuals/openmw-cs/index.rst       |   5 +
 .../source/manuals/openmw-cs/record-types.rst | 101 +++++-
 .../manuals/openmw-cs/tables-assets.rst       | 108 +++++++
 .../manuals/openmw-cs/tables-characters.rst   | 300 ++++++++++++++++++
 docs/source/manuals/openmw-cs/tables-file.rst |  37 +++
 .../manuals/openmw-cs/tables-mechanics.rst    | 176 ++++++++++
 .../source/manuals/openmw-cs/tables-world.rst | 275 ++++++++++++++++
 docs/source/manuals/openmw-cs/tables.rst      |  99 ------
 8 files changed, 989 insertions(+), 112 deletions(-)
 create mode 100644 docs/source/manuals/openmw-cs/tables-assets.rst
 create mode 100644 docs/source/manuals/openmw-cs/tables-characters.rst
 create mode 100644 docs/source/manuals/openmw-cs/tables-file.rst
 create mode 100644 docs/source/manuals/openmw-cs/tables-mechanics.rst
 create mode 100644 docs/source/manuals/openmw-cs/tables-world.rst

diff --git a/docs/source/manuals/openmw-cs/index.rst b/docs/source/manuals/openmw-cs/index.rst
index ee82907119..5a0b9c99e0 100644
--- a/docs/source/manuals/openmw-cs/index.rst
+++ b/docs/source/manuals/openmw-cs/index.rst
@@ -22,5 +22,10 @@ few chapters to familiarise yourself with the new interface.
     files-and-directories
     starting-dialog
     tables
+    tables-file
+    tables-world
+    tables-mechanics
+    tables-characters
+    tables-assets
     record-types
     record-filters
diff --git a/docs/source/manuals/openmw-cs/record-types.rst b/docs/source/manuals/openmw-cs/record-types.rst
index 3742cc9e86..cd83555a4c 100644
--- a/docs/source/manuals/openmw-cs/record-types.rst
+++ b/docs/source/manuals/openmw-cs/record-types.rst
@@ -1,25 +1,20 @@
-Record Types
-############
+###################
+Object Record Types
+###################
 
-A game world contains many items, such as chests, weapons and monsters. All
-these items are merely instances of templates we call *Objects*. The OpenMW CS
-*Objects* table contains information about each of these template objects, such
+A game world contains many items, such as chests, weapons and monsters. All of
+these items are merely instances of templates we call Objects. The OpenMW-CS
+Objects table contains information about each of these template objects, such
 as its value and weight in the case of items, or an aggression level in the
 case of NPCs.
 
-The following is a list of all Record Types and what you can tell OpenMW CS
+The following is a list of all Record Types and what you can tell OpenMW-CS
 about each of them.
 
 Activator
    Activators can have a script attached to them. As long as the cell this
    object is in is active the script will be run once per frame.
 
-Potion
-   This is a potion which is not self-made. It has an Icon for your inventory,
-   weight, coin value, and an attribute called *Auto Calc* set to ``False``.
-   This means that the effects of this potion are pre-configured. This does not
-   happen when the player makes their own potion.
-
 Apparatus
    This is a tool to make potions. Again there’s an icon for your inventory as
    well as a weight and a coin value. It also has a *Quality* value attached to
@@ -54,9 +49,89 @@ Container
    container, however, will just refuse to take the item in question when it
    gets "over-encumbered". Organic Containers are containers such as plants.
    Containers that respawn are not safe to store stuff in. After a certain
-   amount of time they will reset to their default contents, meaning that
+   amount of time, they will reset to their default contents, meaning that
    everything in them is gone forever.
 
 Creature
    These can be monsters, animals and the like.
 
+Creature Levelled List
+   A list of creatures that can periodically spawn at a particular location.
+   The strength, type, and number of creatures depends on the player's level.
+   The list accepts entries of individual Creatures or also of other Creature
+   Levelled Lists. Each entry has a corresponding level value that determines
+   the lowest player level the creature can be spawned at.
+
+   When ``Calculate all levels <= player`` is enabled, all the creatures with
+   a level value lower or equal to the player can be spawned. Otherwise,
+   the creature levelled list will only resolve a creature that matches
+   the player's level
+
+   ``Chance None`` is the percentage of possibility that no creatures will spawn.
+
+Door
+   Objects in the environment that can be opened or closed when activated. Can
+   also be locked and trapped.
+
+Ingredient
+   Objects required to create potions in an apparatus. Each ingredient can hold
+   up to four alchemical effects.
+
+Item Levelled List   
+   A list of items that can spawn in a container when the player opens it.
+   The quality, type, and number of spawned items depends on the player's level.
+   The list accepts entries of individual items or also of other Item
+   Levelled Lists. Each entry has a corresponding level value that determines
+   the lowest player level the item can be spawned at.
+
+   When ``Calculate all levels <= player`` is enabled, all the items with
+   a level value lower or equal to the player can be spawned. Otherwise,
+   the item levelled list will only resolve an item that matches the
+   player's level.
+
+   ``Chance None`` is the percentage of possibility that no creatures will spawn. 
+
+Light
+   An object that illuminates the environment around itself, depending on the
+   light's strength, range, and colour. Can be a static object in the environment,
+   or when configured, can be picked up and carried by NPCs.
+
+Lockpick
+   Tool required to open locks without having the proper key or using a spell.
+   Locks are found on various in-game objects, usually doors, cabinets, drawers,
+   chests, and so on. 
+
+Miscellaneous
+   This is a category of objects with various in-game functions.
+   
+   * Soul Gems, used to hold trapped souls and enchant items.
+   * Gold piles that add their value directly to the player's gold amount when picked up.
+   * Keys to open locked doors.
+   * Certain quest items.
+   * Environment props such as plates, bowls, pots, tankards, and so on. Unlike environment objects of the Static type, these can be picked up.
+
+NPC
+   Player character and non-player characters. Their attributes and skills
+   follow the game's character system, and they are made from multiple body parts.
+
+Potion
+   This is a potion which is not self-made. It has an Icon for your inventory,
+   weight, coin value, and an attribute called *Auto Calc* set to ``False``.
+   This means that the effects of this potion are pre-configured. This does not
+   happen when the player makes their own potion.
+
+Probe
+   Tool required to disarm trapped doors, chests, or any other object that has
+   a trap assigned.
+
+Repair
+   Tool required by the player to repair damaged objects of Armor and Weapon types.
+
+Static
+   Objects from which the world is made. Walls, furniture, foliage, statues,
+   signs, rocks and rock formations, etc.
+
+Weapon
+   An object which the player or NPCs can carry and use it to deal damage
+   to their opponents in combat. Swords, spears, axes, maces, staves, bows,
+   crossbows, ammunition, and so on.
diff --git a/docs/source/manuals/openmw-cs/tables-assets.rst b/docs/source/manuals/openmw-cs/tables-assets.rst
new file mode 100644
index 0000000000..e06213ea60
--- /dev/null
+++ b/docs/source/manuals/openmw-cs/tables-assets.rst
@@ -0,0 +1,108 @@
+#############
+Assets Tables
+#############
+
+
+Sounds
+******
+
+Sounds are Sound Files wrapped by OpenMW, allowing you to adjust how they behave
+once they are played in-game. They are used for many audio events including
+spells, NPCs commenting, environment ambients, doors, UI events, when moving items
+in the inventory, and so on.
+
+Volume
+    More is louder, less is quieter. Maximum is 255.
+Min Range
+    When the player is within Min Range distance from the Sound, the Volume will
+    always be at its maximum defined value.
+Max Range
+    When the player is beyond Max Range distance from the Sound, the volume will
+    fade to 0.
+Sound File
+    Source sound file on the hard-drive that holds all the actual audio information.
+    All available records are visible in the Sound Files table. 
+
+
+Sound Generators
+****************
+
+Sound generators are a way to play Sounds driven by animation events. Animated
+creatures or NPCs always require to be paired with a corresponding textkeys file.
+This textkeys file defines the extents of each animation, and relevant in this
+case, events and triggers occuring at particular animation frames.
+
+For example, a typical textkey entry intended for a Sound Generator would be
+named `SoundGen: Left` and be hand placed by an animator whenever the left leg
+of the creature touches the ground. In OpenMW-CS, the appropriate Sound
+Generator of an appropriate type would then be connected to the animated creature.
+In this case the type would be `Left Foot`. Once in-game, OpenMW will play the
+sound whenever its textkeys occurs in the currently playing animation.
+
+Creature
+    Which creature uses this effect.
+Sound
+    Which record of the Sound type is used as the audio source
+Sound Generator Type
+    Type of the sound generator that is matched to corresponding textkeys.
+
+    * Land
+    * Left Foot
+    * Moan
+    * Right Foot
+    * Roar
+    * Scream
+    * Swim Left
+    * Swim Right
+
+    
+Meshes
+******
+
+Meshes are 3D assets that need to be assigned to objects to render them in the 
+game world. Entries in this table are based on contents of ``data/meshes`` 
+folder and cannot be edited from OpenMW-CS.  
+
+
+Icons
+*****
+
+Icons are images used in the user interface to represent inventory items, 
+spells, and attributes. They can be assigned to relevant records through other 
+dialogues in the editor. Entries in this table are based on contents of 
+``data/icons`` folder and cannot be edited from OpenMW-CS.  
+ 
+
+Music Files
+***********
+
+Music is played in the background during the game and at special events such as 
+intro, death, or level up. Entries in this table are based on contents of 
+``data/music`` folder and cannot be edited from OpenMW-CS.  
+
+
+Sound Files
+***********
+
+Sound files are the source audio files on the hard-drive and are used by other
+records related to sound. Entries in this table are based on contents of
+``data/sounds`` folder and cannot be edited from OpenMW-CS. 
+
+
+Textures
+********
+
+Textures are images used by 3D objects, particle effects, weather system, user 
+interface and more. Definitions which mesh uses which texture are included in 
+the mesh files and cannot be assigned through the editor. To use a texture to 
+paint the terrain, a separate entry is needed in the Land Textures table. 
+Entries in this table are based on contents of ``data/textures`` folder and 
+cannot be edited from OpenMW-CS.
+
+
+Videos
+******
+
+Videos can be shown at various points in the game, depending on where they are 
+called. Entries in this table are based on contents of ``data/videos`` folder 
+and cannot be edited from OpenMW-CS.
diff --git a/docs/source/manuals/openmw-cs/tables-characters.rst b/docs/source/manuals/openmw-cs/tables-characters.rst
new file mode 100644
index 0000000000..9d6f290937
--- /dev/null
+++ b/docs/source/manuals/openmw-cs/tables-characters.rst
@@ -0,0 +1,300 @@
+#################
+Characters Tables
+#################
+
+These tables deal with records that make up the player and NPCs. Together we'll
+refer to them as characters.
+
+
+Skills
+******
+
+Characters in OpenMW can perform various actions and skills define how successful
+a character is in performing these actions. The skills themselves are hardcoded
+and cannot be added through the editor but can have some of their parameters
+adjusted.
+
+Attribute
+    Each skill is governed by an attribute. The value of the attribute will
+    contribute or hinder your success in using a skill.
+    
+Specialization
+    A skill can belong to combat, magic, or stealth category. If the player
+    specializes in the same category, they get a +5 starting bonus to the skill.
+    
+Use Value 1, 2, 3, 4
+    Use Values are the amount of experience points the player will be awarded 
+    for successful use of this skill. Skills can have one or multiple in-game 
+    actions associated with them and each action is tied to one of the Use Values. 
+    For example, Block skill has Use Value 1 = 2,5. This means that on each 
+    successful blocked attack, the player's block skill will increase by 2,5 
+    experience points. Athletics have Use Value 1 = 0,02, and Use Value 2 = 0,03. 
+    For each second of running the player's athletics skill will be raised by 0,02 
+    experience points, while for each second of swimming by 0,03 points. Note that not 
+    all of the skills use all of the Use Values and OpenMW-CS currently doesn't tell 
+    what action a skill's Use Value is associated with.
+    
+Description
+    Flavour text that appears in the character information window.
+
+
+Classes
+*******
+
+All characters in OpenMW need to be of a certain class. This table list existing
+classes and allows you to create, delete or modify them.
+
+Name
+    How this class is called.
+    
+Attribute 1 and 2
+    Characters of this class receive a +10 starting bonus on the two chosen
+    atributes.
+    
+Specialization
+    Characters can specialize in combat, magic, or stealth. Each skill that
+    belongs to the chosen specialization receives a +5 starting bonus and is
+    easier to train.
+    
+Major Skill 1 to 5
+    Training these skills contributes to the player leveling up. Each of these
+    skills receives a +25 starting bonus and is easier to train.
+    
+Minor Skill 1 to 5
+    Training these skills contributes to the player leveling up. Each of these
+    skills receives a +10 starting bonus and is easier to train.
+         
+Playable
+    When enabled, the player can choose to play as this class at character creation.
+    If disabled, only NPCs can be of this class.
+    
+Description
+    Flavour text that appears in the character information window.
+
+
+Faction
+*******
+
+Characters in OpenMW can belong to different factions that represent interest
+groups within the game's society. The most obvious example of factions are
+guilds which the player can join, perform quests for and rise through its ranks.
+Membership in factions can be a good source of interesting situations and quests.
+If nothing else, membership affects NPC disposition towards the player.
+
+Name
+    How this faction is called.
+    
+Attribute 1 and 2
+    Two attributes valued by the faction and required to rise through its ranks.
+    
+Hidden
+    When enabled, the player's membership in this faction will not be displayed
+    in the character window.
+    
+Skill 1 to 7
+    Skills valued by the faction and required to rise through its ranks. Not all
+    of the skill slots need to be filled.
+    
+Reactions
+    Change of NPC disposition towards the player when joining this faction.
+    Disposition change depends on which factions the NPCs belong to.
+    
+Ranks
+    Positions in the hierarchy of this faction. Every rank has a requirement in
+    attributes and skills before the player is promoted. Every rank gives the
+    player an NPC disposition bonus within the faction.
+
+
+Races
+*****
+
+All characters in OpenMW need to be of a certain race. This table list existing
+races and allows you to create, delete or modify them. After a race is created,
+it can be assigned to an NPC in the objects table. Race affects character's
+starting attributes and skill bonuses, appearance, and voice lines. In addition,
+a race assigned to the player can affect NPC disposition, quests, dialogues and
+other things.
+
+Name
+    How this race is called.
+
+Description
+    Flavour text that appears in the character information window.
+
+Playable
+    When enabled, the player can choose to play as this race. If disabled, only
+    the NPCs can belong to it.
+
+Beast Race
+    Use models and animations for humanoids of different proportions and
+    movement styles. In addition, beast races can't wear closed helmets
+    or boots.
+
+Male Weight
+    Scaling factor of the default body type. Values above 1.0 will make members
+    of this race wider. Values below 1.0 will make them thinner. Applies to males. 
+
+Male Height
+    Scaling factor of the default body type. Values above 1.0 will make members
+    of this race taller. Values below 1.0 will make them shorter. Applies to males.
+
+Female Weight
+    Scaling factor of the default body type. Values above 1.0 will make members
+    of this race wider. Values below 1.0 will make them thinner. Applies to females. 
+
+Female Height
+    Scaling factor of the default body type. Values above 1.0 will make members
+    of this race taller. Values below 1.0 will make them shorter. Applies to females.
+
+
+Birthsigns
+**********
+
+Birthsigns permanently modify player's attributes, skills, or other abilities.
+The player can have a single birthsign which is usually picked during character creation.
+Modifications to the player are done through one or more spells added
+to a birthsign. Spells with constant effects modify skills and attributes.
+Spells that are cast are given to the player in the form of powers.
+
+Name
+    Name of the birthsign that will be displayed in the interface.
+    
+Texture
+    An image that will be displayed in the birthsigns selection window.
+    
+Description
+    Flavour text about the birthsign.
+    
+Powers
+    A list of spells that are given to the player. When spells are added by a
+    birthsign, they cannot be removed in-game by the player.
+
+    
+Body Parts
+**********
+
+Characters are made from separate parts. Together they form the whole body.
+Allows customization of the outer look. Includes heads, arms, legs, torso, hand,
+armor, pauldrons, chestpiece, helmets, wearables, etc.
+
+
+Topics
+******
+
+Topics are, in a broader meaning, dialogue triggers. They can take the form of
+clickable keywords in the dialogue, combat events, persuasion events, and other.
+What response they produce and under what conditions is then defined by topic infos.
+A single topic can be used by unlimited number of topic infos. There are four
+different types of topics.
+
+Greeting 0 to 9
+    Initial text that appears in the dialogue window when talking to an NPC. Hardcoded.
+    
+Persuasion
+    Persuasion entries produce a dialogue response when using persuasion actions on NPCs. Hardcoded.
+
+    * Admire, Bribe, Intimidate Taunt Fail - Conversation text that appears when the player fails a persuasion action.
+    * Admire, Bribe, Intimidate Taunt Succeed - Conversation text that appears when the player succeeds a persuasion action.
+    * Info Refusal - Conversation text that appears when the player wishes to talk about a certain topic and the conditions are not met. For example, NPC disposition is too low, the player is not a faction member, etc.
+    * Service Refusal - Conversation text that appears when the player wishes a service from the NPC but the conditions are not met.
+    
+Topic
+    A keyword in the dialogue window that leads to further dialogue text, 
+    similar to wiki links. These are the foundation to create dialogues from. 
+    Entires can be freely added, edited, or removed.
+    
+Voice
+    Voice entries are specific in-game events used to play a sound. Hardcoded.
+    
+    * Alarm - NPC enters combat state
+    * Attack - NPC performs an attack
+    * Flee - NPC loses their motivation to fight
+    * Hello - NPC addressing the player when near enough
+    * Hit - When NPCs are hit and injured.
+    * Idle - Random things NPCs say.
+    * Intruder
+    * Thief - When an NPC detects the player steal something.
+    
+
+Topic Infos
+***********
+
+Topic infos take topics as their triggers and define responses. Through their
+many parameters they can be assigned to one or more NPCs. Important to note is
+that each topic info can take a combination of parameters to accurately define
+which NPCs will produce a particular response. These parameters are as follow.
+
+Actor
+    A specific NPC.
+    
+Race
+    All members of a race.
+    
+Class
+    NPCs of a chosen class.
+    
+Faction
+    NPCs belonging to a faction.
+    
+Cell
+    NPCs located in a particular cell.
+    
+Disposition
+    NPC disposition towards the player. This is the 0-100 bar visible in the
+    conversation window and tells how much an NPC likes the player.
+    
+Rank
+    NPC rank within a faction.
+    
+Gender
+    NPC gender.
+    
+PC Faction
+    Player's faction.
+    
+PC Rank
+    Player's rank within a faction.
+
+Topic infos when triggered provide a response when the correct conditions are met.
+
+Sound File
+    Sound file to play when the topic info is triggered
+    
+Response
+    Dialogue text that appears in a dialogue window when clicking on a keyword.
+    Dialogue text that appears near the bottom of the screen when a voice topic
+    is triggered.
+
+Script
+    Script to define further effects or branching dialogue choices when this
+    topic info is triggered.
+    
+Info Conditions.
+    Conditions required for this topic info to be active.
+
+
+Journals
+********
+
+Journals are records that define questlines. Entries can be added or removed.
+When adding a new entry, you give it a unique ID which cannot be edited afterwards.
+Also to remember is that journal IDs are not the actual keywords appearing in
+the in-game journal.
+
+
+Journal Infos
+*************
+
+Journal infos are stages of a particular quest. Entries appear in the player's
+journal once they are called by a script. The script can be a standalone record
+or a part of a topic info. The current command is ``Journal, "Journal ID", "Quest Index"``
+
+Quest Status
+    Finished, Name, None, Restart. No need to use them.
+    
+Quest Index
+    A quest can write multiple entries into the player's journal and each of
+    these entries is identified by its index. 
+    
+Quest Description
+    Text that appears in the journal for this particular stage of the quest.
diff --git a/docs/source/manuals/openmw-cs/tables-file.rst b/docs/source/manuals/openmw-cs/tables-file.rst
new file mode 100644
index 0000000000..f6b5be0bfd
--- /dev/null
+++ b/docs/source/manuals/openmw-cs/tables-file.rst
@@ -0,0 +1,37 @@
+###########
+File Tables
+###########
+
+Tables found in the File menu.
+
+
+Verification Results
+********************
+
+This table shows reports created by the verify command found in the file menu.
+Verify will go over the whole project and output errors / warnings when records
+don't conform to the requirements of the engine. The offending records can be
+accessed directly from the verification results table. The table will not update
+on its own once an error / warning is fixed. Instead, use the *Refresh* option
+found in the right click menu in this table. 
+
+Type
+    The type of record that is causing the error / warning.
+
+ID
+    ID value of the offending record.
+    
+Severity
+    Whether the entry is an error or merely a warning.
+    The game can still run even if not all errors are fixed.
+    
+Description
+    Information on what exactly is causing the error / warning.
+
+
+Error Log
+*********
+
+The Error Log table shows any errors that occured while loading the game files
+into OpenMW-CS. These are the files that come in ``.omwgame``, ``.omwaddon``,
+``.esm``, and ``.esp`` formats.
diff --git a/docs/source/manuals/openmw-cs/tables-mechanics.rst b/docs/source/manuals/openmw-cs/tables-mechanics.rst
new file mode 100644
index 0000000000..8438be69b6
--- /dev/null
+++ b/docs/source/manuals/openmw-cs/tables-mechanics.rst
@@ -0,0 +1,176 @@
+################
+Mechanics Tables
+################
+
+Tables that belong into the mechanics category.
+
+
+Scripts
+*******
+
+Scripts are useful to expand the base functionality offered by the engine
+or to create complex quest lines. Entries can be freely added or removed
+through OpenMW-CS. When creating a new script, it can be defined as local
+or global.
+
+
+Start Scripts
+*************
+
+A list of scripts that are automatically started as global scripts on game startup.
+The script ``main`` is an exception, because it will be automatically started
+even without being in the start script list.
+
+
+Global Variables
+****************
+
+Global variables are needed to keep track of the the game's state. They can be 
+accessed from anywhere in the game (in contrast to local variables) and can be 
+altered at runtime (in contrast to GMST records). Some example of global 
+variables are current day, month and year, rats killed, player's crime penalty, 
+is player a werewolf, is player a vampire, and so on.
+
+
+Game Settings (GMST)
+********************
+
+GMST are variables needed throughout the game. They can be either a float,
+integer, boolean, or string. Float and integer variables affect all sorts of
+behaviours of the game. String entries are the text that appears in the
+user interface, dialogues, tooltips, buttons and so on. GMST records cannot
+be altered at runtime.
+
+
+Spells
+******
+
+Spells are combinations of magic effects with additional properties and are used 
+in different ways depending on their type. Some spells are the usual abracadabra 
+that characters cast. Other spells define immunities, diseases, modify 
+attributes, or give special abilities. Entries in this table can be freely 
+added, edited, or removed through the editor.
+
+Name
+    Name of the spell that will appear in the user interface.
+   
+Spell Type
+    * Ability - Constant effect which does not need to be cast. Commonly used for racial or birthsign bonuses to attributes and skills.
+    * Blight - Can be contracted in-game and treated with blight disease cures (common disease cures will not work). Applies a constant effect to the recepient. 
+    * Curse
+    * Disease - Can be contracted in-game and treated with common disease cures. Applies a constant effect to the recepient. 
+    * Power - May be cast once per day at no magicka cost. Usually a racial or birthsign bonus.
+    * Spell - Can be cast and costs magicka. The chance to successfully cast a spell depends on the caster's skill.
+  
+Cost
+    The amount of magicka spent when casting this spell.
+
+Auto Calc
+    Automatically calculate the spell's magicka cost.
+
+Starter Spell
+    Starting spells are added to the player on character creation when certain 
+    criteria are fulfilled. The player must be able to cast spells, there is a 
+    certain chance for that spell to be added, and there is a maximum number
+    of starter spells the player can have.
+
+
+Always Succeeds
+    When enabled, it will ensure this spell will always be cast regardless of
+    the caster's skill.
+
+Effects
+    A table containing magic effects of this spell and their properties.
+    New entries can be added and removed through the right click menu.
+
+
+Enchantments
+************
+
+Enchantments are a way for magic effects to be assigned to in-game items.
+Each enchantment can hold multiple magic effects along with other properties.
+Entries can be freely added or removed through the editor.
+
+Enchantment Type
+    The way to use this enchantment.
+    * Cast once - the enchantment is cast like a regular spell and afterwards the item is gone. Used to make scrolls. 
+    * Constant effect - the effects of the enchantment will always apply as long as the enchanted item is equiped.
+    * When Strikes - the effect will apply to whatever is hit by the weapon with the enchantment.
+    * When Used - the enchantment is cast like a regular spell. Instead of spending character's magicka, it uses the item's available charges.
+
+Cost
+    How many points from the available charges are spent each time the
+    enchantment is used. In-game the cost will also depend on character's
+    enchanting skill.
+
+Charges
+    Total supply of points needed to use the enchantment. When there are
+    less charges than the cost, the enchantment cannot be used and
+    the item needs to be refilled.
+
+Auto Calc
+    Automatically calculate the enchantment's cost to cast.
+
+Effects
+    A table containing magic effects of this enchantment and their properties. 
+    New entries can be added and removed through the right click menu.
+
+
+Magic Efects
+************
+
+Magic effects define how in-game entities are affected when using magic.
+They are required in spells, enchantments, and potions. The core gameplay
+functionality of these effects is hardcoded and it's not possible to add
+new entries through the editor. The existing entries can nonetheless have
+their various parameters adjusted.
+
+School
+    Category this magic effect belongs to.
+    
+Base Cost
+    Used when automatically calculating the spell's cost with "Auto Calc" feature.
+
+Icon
+    Which icon will be displayed in the user interface for this effect. Can only 
+    insert records available from the icons table.
+     
+Particle
+    Texture used by the particle system of this magic effect.
+    
+Casting Object
+    Which object is displayed when this magic effect is cast.
+        
+Hit Object
+    Which object is displayed when this magic effect hits a target.
+    
+Area Object
+    Which object is displayed when this magic effect affects an area.
+      
+Bolt Object
+    Which object is displayed as the projectile for this magic effect.
+    
+Casting Sound
+    Sound played when this magic effect is cast.
+      
+Hit Sound
+    Sound played when this magic effect hits a target.
+       
+Area Sound
+    Sound played when this magic effect affects an area.
+    
+Bolt Sound
+    Sound played by this magic effect's projectile.
+      
+Allow Spellmaking
+    When enabled, this magic effect can be used to create spells.
+        
+Allow Enchanting
+    When enabled, this magic effect can be used to create enchantments.
+        
+Negative Light
+    This is a flag present in Morrowind, but is not actually used.
+    It doesn’t do anything in OpenMW either.
+      
+Description
+    Flavour text that appears in the user interface.
diff --git a/docs/source/manuals/openmw-cs/tables-world.rst b/docs/source/manuals/openmw-cs/tables-world.rst
new file mode 100644
index 0000000000..91f1b744a5
--- /dev/null
+++ b/docs/source/manuals/openmw-cs/tables-world.rst
@@ -0,0 +1,275 @@
+############
+World Tables
+############
+
+These are the tables in the World menu category. The contents of the game world 
+can be changed by choosing one of the options in the appropriate menu at the top 
+of the screen.
+
+
+Objects
+*******
+
+This is a library of all the items, triggers, containers, NPCs, etc. in the game.
+There are several kinds of Record Types. Depending on which type a record 
+is, it will need specific information to function. For example, an NPC needs a 
+value attached to its aggression level. A chest, of course, does not. All Record 
+Types contain at least a 3D model or else the player would not see them. Usually 
+they also have a *Name*, which is what the players sees when they hover their 
+crosshair over the object during the game.
+
+Please refer to the :doc:`record-types` chapter for an overview of what each
+object type represents in the game's world.
+
+
+Instances
+*********
+
+An instance is created every time an object is placed into a cell. While the 
+object defines its own fundamental properties, an instance defines how and where 
+this object appears in the world. When the object is modified, all of its 
+instances will be modified as well.
+
+Cell
+    Which cell contains this instance. Is assigned automatically based on the 
+    edit you make in the 3D view.
+
+Original Cell
+    If an object has been moved in-game this field keeps a track of the original 
+    cell as defined through the editor. Is assigned automatically based on the edit 
+    you make in the 3D view. 
+
+Object ID
+    ID of the object from which this instance is created.
+    
+Pos X, Y, Z
+    Position coordinates in 3D space relative to the parent cell.
+
+Rot X, Y, Z
+    Rotation in 3D space.
+
+Scale
+    Size factor applied to this instance. It scales the instance uniformly on 
+    all axes.
+
+Owner
+    NPC the instance belongs to. Picking up the instance by the player is 
+    regarded as stealing.
+
+Soul
+    This field takes the object of a *Creature* type. Option applies only to 
+    soul gems which will contain the creature's soul and allow enchanting. 
+    
+Faction
+    Faction the instance belongs to. Picking up the instance without joining 
+    this faction is regarded as stealing.
+    
+Faction Index
+    The player's required rank in a faction to pick up this instance without it
+    seen as stealing. It allows a reward mechanic where the higher the player
+    is in a faction, the more of its items and resources are freely
+    available for use.
+    
+Charges
+    How many times can this item be used. Applies to lockpicks, probes, and 
+    repair items. Typically used to add a "used" version of the object to the
+    in-game world.
+    
+Enchantment
+    Doesn't appear to do anything for instances. An identical field for Objects 
+    takes an ID of an enchantment.
+    
+Coin Value
+    This works only for instances created from objects with IDs ``gold_001``, 
+    ``gold_005``, ``gold_010``, ``gold_025``, and ``gold_100``. Coin Value tells how 
+    much gold is added to player's inventory when this instance is picked up. The 
+    names and corresponding functionality are hardcoded into the engine.
+    
+    For all other instances this value does nothing and their price when buying 
+    or selling is determined by the Coin Value of their Object.    
+    
+Teleport
+    When enabled, this instance acts as a teleport to other locations in the world.
+    Teleportation occurs when the player activates the instance.
+
+Teleport Cell
+    Destination cell where the player will appear.
+
+Teleport Pos X, Y, Z
+    Location coordinates where the player will appear relative to the 
+    destination cell.
+
+Teleport Rot X, Y, Z
+    Initial orientation of the player after being teleported. 
+
+Lock Level
+    Is there a lock on this instance and how difficult it is to pick.
+    
+Key
+    Which key is needed to unlock the lock on this instance.
+
+Trap
+    What spell will be cast on the player if the trap is triggered. The spell
+    has an on touch magic effect.
+
+Owner Global
+    A global variable that lets you override ownership. This is used in original 
+    Morrowind to make beds rentable.
+
+
+Cells
+*****
+
+Cells are the basic world-building units that together make up the game's world. 
+Each of these basic building blocks is a container for other objects to exist in.
+Dividing an expansive world into smaller units is neccessary to be able to 
+efficiently render and process it. Cells can be one of two types:
+    
+Exterior cells
+    These represent the outside world. They all fit on a grid where cells have 
+    unique coordinates and border one another. Each exterior cell contains a part of 
+    the terrain and together they form a seamless, continuous landmass. Entering and 
+    leaving these cells is as simple as walking beyond their boundary after which we 
+    enter its neighbouring cell. It is also possible to move into another interior 
+    or exterior cell through door objects.
+
+Interior cells
+    These represent enclosed spaces such as houses, dungeons, mines, etc. They 
+    don't have a terrain, instead their whole environment is made from objects. 
+    Interior cells only load when the player is in them. Entering and leaving these 
+    cells is possible through door objects or teleportation abilities.
+
+The Cells table provides you with a list of cells in the game and exposes 
+their various parameters to edit.
+
+Sleep Forbidden
+   In most cities it is forbidden to sleep outside. Sleeping in the wilderness
+   carries its own risks of attack, though. This entry lets you decide if a
+   player should be allowed to sleep on the floor in this cell or not.
+
+Interior Water
+   Setting the cell’s Interior Water to ``true`` tells the game that there needs
+   to be water at height 0 in this cell. This is useful for dungeons or mines
+   that have water in them.
+
+   Setting the cell’s Interior Water to ``false`` tells the game that the water
+   at height 0 should not be used. This flag is useless for outside cells.
+
+Interior Sky
+   Should this interior cell have a sky? This is a rather unique case. The
+   Tribunal expansion took place in a city on the mainland. Normally this would
+   require the city to be composed of exterior cells so it has a sky, weather
+   and the like. But if the player is in an exterior cell and were to look at
+   their in-game map, they would see Vvardenfell with an overview of all
+   exterior cells. The player would have to see the city’s very own map, as if
+   they were walking around in an interior cell.
+   
+   So the developers decided to create a workaround and take a bit of both: The
+   whole city would technically work exactly like an interior cell, but it
+   would need a sky as if it was an exterior cell. That is what this is. This
+   is why the vast majority of the cells you will find in this screen will have
+   this option set to false: It is only meant for these "fake exteriors".
+
+Region
+   To which Region does this cell belong? This has an impact on the way the
+   game handles weather and encounters in this area. It is also possible for a
+   cell not to belong to any region.
+
+Interior
+    When enabled, it allows to manually set *Ambient*, *Sunlight*, *Fog*, 
+    and *Fog Density* values regardless of the main sky system.
+    
+Ambient
+    Colour of the secondary light, that contributes to an overall shading of the 
+    scene.
+    
+Sunlight
+    Colour of the primary light that lights the scene.
+    
+Fog
+    Colour of the distant fog effect.
+    
+Fog Density
+    How quickly do objects start fading into the fog.
+
+Water Level
+    Height of the water plane. Only applies to interior cells
+    when *Interior Water* is enabled.
+    
+Map Color
+    This is a property present in Morrowind, but is not actually used.
+    It doesn’t do anything in OpenMW either.
+
+
+Lands
+*****
+
+Lands are records needed by exterior cells to show the terrain. Each exterior 
+cell needs its own land record and they are paired by matching IDs. Land records
+can be created manually in this table, but a better approach is to simply shape
+the terrain in the 3D view and the land record of affected cells will be
+created automatically.
+
+
+Land Textures
+*************
+
+This is a list of textures that are specifically used to paint the terrain of 
+exterior cells. By default, the terrain shows the ``_land_default.dds`` texture 
+found in ``data/textures`` folder. Land texture entries can be added, edited or
+removed.
+
+Texture Nickname
+    Name of this land texture.
+
+Texture Index
+    Assigned automatically and cannot be edited.
+    
+Texture
+    Texture image file that is used for this land texture.
+
+
+Pathgrids
+*********
+
+Pathgrids allow NPCs to navigate and move along complicated paths in their surroundings.
+A pathgrid contains a list of *points* connected by *edges*. NPCs will
+find their way from one point to another as long as there is a path of 
+connecting edges between them. One pathgrid is used per cell. When recast 
+navigation is enabled, the pathgrids are not used.
+
+
+Regions
+*******
+
+Regions describe general areas of the exterior game world and define rules for 
+random enemy encounters, ambient sounds, and weather. Regions can be assigned 
+one per cell and the cells will inherit their rules.
+
+Name
+   This is how the game will show the player's location in-game.
+
+MapColour
+   This is a colour used to identify the region when viewed in *World* → *Region Map*.
+
+Sleep Encounter
+   This field takes an object of the *Creature Levelled List* type. This object 
+   defines what kinds of enemies the player might encounter when sleeping outside 
+   in the wilderness.
+
+Weather
+    A table listing all available weather types and their chance to occur while 
+    the player is in this region. Entries cannot be added or removed.
+
+Sounds
+    A table listing ambient sounds that will randomly play while the player is 
+    in this region. Entries can be freely added or removed.
+
+
+Region Map
+**********
+
+The region map shows a grid of exterior cells, their relative positions to one 
+another, and regions they belong to. In summary, it shows the world map. 
+Compared to the cells table which is a list, this view helps vizualize the world.
+Region map does not show interior cells.
diff --git a/docs/source/manuals/openmw-cs/tables.rst b/docs/source/manuals/openmw-cs/tables.rst
index 43da03f079..2d63439683 100644
--- a/docs/source/manuals/openmw-cs/tables.rst
+++ b/docs/source/manuals/openmw-cs/tables.rst
@@ -67,102 +67,3 @@ Modified
       delete that instance yourself or make sure that that object is replaced
       by something that still exists otherwise the player will get crashes in
       the worst case scenario.
-
-
-
-World Screens
-*************
-
-The contents of the game world can be changed by choosing one of the options in
-the appropriate menu at the top of the screen.
-
-
-Regions
-=======
-
-This describes the general areas of Vvardenfell. Each of these areas has
-different rules about things such as encounters and weather.
-
-Name
-   This is how the game will show the player's location in-game.
-
-MapColour
-   This is a six-digit hexadecimal representation of the colour used to
-   identify the region on the map available in *World* → *Region Map*.
-
-Sleep Encounter
-   These are the rules for what kinds of enemies the player might encounter
-   when sleeping outside in the wilderness.
-
-
-Cells
-=====
-
-Expansive worlds such as Vvardenfell, with all its items, NPCs, etc. have a lot
-going on simultaneously. But if the player is in Balmora, why would the
-computer need to keep track the exact locations of NPCs walking through the
-corridors in a Vivec canton? All that work would be quite useless and bring
-the player's system down to its knees! So the world has been divided up into
-squares we call *cells*.  Once your character enters a cell, the game will load
-everything that is going on in that cell so the player can interact with it.
-
-In the original Morrowind this could be seen when a small loading bar would
-appear near the bottom of the screen while travelling; the player had just
-entered a new cell and the game had to load all the items and NPCs. The *Cells*
-screen in OpenMW CS provides you with a list of cells in the game, both the
-interior cells (houses, dungeons, mines, etc.) and the exterior cells (the
-outside world).
-
-Sleep Forbidden
-   Can the player sleep on the floor? In most cities it is forbidden to sleep
-   outside. Sleeping in the wilderness carries its own risks of attack, though,
-   and this entry lets you decide if a player should be allowed to sleep on the
-   floor in this cell or not.
-
-Interior Water
-   Should water be rendered in this interior cell? The game world consists of
-   an endless ocean at height 0, then the landscape is added. If part of the
-   landscape goes below height 0, the player will see water.
-
-   Setting the cell’s Interior Water to true tells the game that this cell that
-   there needs to be water at height 0. This is useful for dungeons or mines
-   that have water in them.
-
-   Setting the cell’s Interior Water to ``false`` tells the game that the water
-   at height 0 should not be used. This flag is useless for outside cells.
-
-Interior Sky
-   Should this interior cell have a sky? This is a rather unique case. The
-   Tribunal expansion took place in a city on the mainland. Normally this would
-   require the city to be composed of exterior cells so it has a sky, weather
-   and the like. But if the player is in an exterior cell and were to look at
-   their in-game map, they would see Vvardenfell with an overview of all
-   exterior cells. The player would have to see the city’s very own map, as if
-   they were walking around in an interior cell.
-   
-   So the developers decided to create a workaround and take a bit of both: The
-   whole city would technically work exactly like an interior cell, but it
-   would need a sky as if it was an exterior cell. That is what this is. This
-   is why the vast majority of the cells you will find in this screen will have
-   this option set to false: It is only meant for these "fake exteriors".
-
-Region
-   To which Region does this cell belong? This has an impact on the way the
-   game handles weather and encounters in this area. It is also possible for a
-   cell not to belong to any region.
-
-
-Objects
-=======
-
-This is a library of all the items, triggers, containers, NPCs, etc. in the
-game. There are several kinds of Record Types. Depending on which type a record
-is, it will need specific information to function. For example, an NPC needs a
-value attached to its aggression level. A chest, of course, does not. All
-Record Types contain at least a 3D model or else the player would not see them.
-Usually they also have a *Name*, which is what the players sees when they hover
-their reticle over the object during the game.
-
-Please refer to the Record Types chapter for an overview of what each type of
-object does and what you can tell OpenMW CS about these objects.
-

From 78210290560ca8f97d365c0a2fd98fdb956d6e12 Mon Sep 17 00:00:00 2001
From: Benjamin Winger <bmw@disroot.org>
Date: Tue, 12 Apr 2022 13:08:58 -0400
Subject: [PATCH 2320/2859] Added missing line continuation to ICU_ROOT setting
 on macos CI

---
 CI/before_script.osx.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh
index c4bb1d1a64..c51eeb61d0 100755
--- a/CI/before_script.osx.sh
+++ b/CI/before_script.osx.sh
@@ -26,6 +26,6 @@ cmake \
 -D BUILD_BSATOOL=TRUE \
 -D BUILD_ESSIMPORTER=TRUE \
 -D BUILD_NIFTEST=TRUE \
--D ICU_ROOT="/usr/local/opt/icu4c"
+-D ICU_ROOT="/usr/local/opt/icu4c" \
 -G"Unix Makefiles" \
 ..

From 6cb36464c3c37341f8211d191680f0c4c9f01d82 Mon Sep 17 00:00:00 2001
From: Abdu Sharif <narukomanroom@gmail.com>
Date: Wed, 20 Apr 2022 08:14:02 +0000
Subject: [PATCH 2321/2859] disable ICU tools for android

---
 extern/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 1c051bff61..f7bf9c4556 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -271,7 +271,7 @@ if (NOT OPENMW_USE_SYSTEM_ICU)
         SOURCE_DIR fetched/icu
         CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env ${ICU_ENV}
             <SOURCE_DIR>/icu4c/source/configure --enable-static --disable-shared
-            --disable-tests --disable-samples --disable-icuio --disable-extras ${ICU_ADDITIONAL_OPTS}
+            --disable-tests --disable-samples --disable-icuio --disable-extras --disable-tools ${ICU_ADDITIONAL_OPTS}
         BUILD_COMMAND make
         INSTALL_COMMAND ""
     )

From 21d46dcf78f14fcdac7c292449eb46929812984d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matja=C5=BE=20Lamut?= <matjaz.lamut@gmail.com>
Date: Wed, 20 Apr 2022 12:02:22 +0000
Subject: [PATCH 2322/2859] Add fallbacks for the moons.

---
 files/openmw.cfg       | 25 +++++++++++++++++++++++++
 files/openmw.cfg.local | 25 +++++++++++++++++++++++++
 2 files changed, 50 insertions(+)

diff --git a/files/openmw.cfg b/files/openmw.cfg
index d1ecd6f8a3..b56f2bbca1 100644
--- a/files/openmw.cfg
+++ b/files/openmw.cfg
@@ -500,3 +500,28 @@ fallback=Weather_Blizzard_Cloud_Speed,7.5
 fallback=Weather_Blizzard_Glare_View,0
 fallback=Weather_Blizzard_Ambient_Loop_Sound_ID, Blizzard
 fallback=Weather_Blizzard_Storm_Threshold,.50
+
+# moons
+fallback=Moons_Secunda_Size,20
+fallback=Moons_Secunda_Axis_Offset,50
+fallback=Moons_Secunda_Speed,.6
+fallback=Moons_Secunda_Daily_Increment,1.2
+fallback=Moons_Secunda_Moon_Shadow_Early_Fade_Angle,0.5
+fallback=Moons_Secunda_Fade_Start_Angle,50
+fallback=Moons_Secunda_Fade_End_Angle,30
+fallback=Moons_Secunda_Fade_In_Start,14
+fallback=Moons_Secunda_Fade_In_Finish,15
+fallback=Moons_Secunda_Fade_Out_Start,7
+fallback=Moons_Secunda_Fade_Out_Finish,10
+fallback=Moons_Masser_Size,55
+fallback=Moons_Masser_Axis_Offset,35
+fallback=Moons_Masser_Speed,.5
+fallback=Moons_Masser_Daily_Increment,1
+fallback=Moons_Masser_Moon_Shadow_Early_Fade_Angle,0.5
+fallback=Moons_Masser_Fade_Start_Angle,50
+fallback=Moons_Masser_Fade_End_Angle,40
+fallback=Moons_Masser_Fade_In_Start,14
+fallback=Moons_Masser_Fade_In_Finish,15
+fallback=Moons_Masser_Fade_Out_Start,7
+fallback=Moons_Masser_Fade_Out_Finish,10
+fallback=Moons_Script_Color,255,20,20
diff --git a/files/openmw.cfg.local b/files/openmw.cfg.local
index f928113002..94f17d8aec 100644
--- a/files/openmw.cfg.local
+++ b/files/openmw.cfg.local
@@ -500,3 +500,28 @@ fallback=Weather_Blizzard_Cloud_Speed,7.5
 fallback=Weather_Blizzard_Glare_View,0
 fallback=Weather_Blizzard_Ambient_Loop_Sound_ID, Blizzard
 fallback=Weather_Blizzard_Storm_Threshold,.50
+
+# moons
+fallback=Moons_Secunda_Size,20
+fallback=Moons_Secunda_Axis_Offset,50
+fallback=Moons_Secunda_Speed,.6
+fallback=Moons_Secunda_Daily_Increment,1.2
+fallback=Moons_Secunda_Moon_Shadow_Early_Fade_Angle,0.5
+fallback=Moons_Secunda_Fade_Start_Angle,50
+fallback=Moons_Secunda_Fade_End_Angle,30
+fallback=Moons_Secunda_Fade_In_Start,14
+fallback=Moons_Secunda_Fade_In_Finish,15
+fallback=Moons_Secunda_Fade_Out_Start,7
+fallback=Moons_Secunda_Fade_Out_Finish,10
+fallback=Moons_Masser_Size,55
+fallback=Moons_Masser_Axis_Offset,35
+fallback=Moons_Masser_Speed,.5
+fallback=Moons_Masser_Daily_Increment,1
+fallback=Moons_Masser_Moon_Shadow_Early_Fade_Angle,0.5
+fallback=Moons_Masser_Fade_Start_Angle,50
+fallback=Moons_Masser_Fade_End_Angle,40
+fallback=Moons_Masser_Fade_In_Start,14
+fallback=Moons_Masser_Fade_In_Finish,15
+fallback=Moons_Masser_Fade_Out_Start,7
+fallback=Moons_Masser_Fade_Out_Finish,10
+fallback=Moons_Script_Color,255,20,20

From a2d596dbc70728b7df171ae173dba8a722dd565b Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 20 Feb 2022 19:34:04 +0100
Subject: [PATCH 2323/2859] Prepare navmesh scene asynchronously

It is expensive operation to generate new osg::Group for updated navmesh tile
which noticeably slows down main thread primarily because of
SceneManager::recreateShaders call. Move it to the preload work queue that is
used by RenderingManager. Leave to main thread only manipulations on the root
node.

Also move deallocation of no more needed data to the work queue. It's also
quite expensive operation because SceneManager::recreateShaders allocates a
new state set for each osg::Geometry. Deallocating them takes time.

Avoid creating another work item if there is existing one that is not started
yet.

Make sure results are accepted in the proper serialized order by selecting
completed work item with maximum {id, version}.
---
 apps/openmw/mwrender/navmesh.cpp          | 249 +++++++++++++++++++---
 apps/openmw/mwrender/navmesh.hpp          |  21 +-
 apps/openmw/mwrender/renderingmanager.cpp |   4 +-
 3 files changed, 235 insertions(+), 39 deletions(-)

diff --git a/apps/openmw/mwrender/navmesh.cpp b/apps/openmw/mwrender/navmesh.cpp
index a3c26aeb59..8345df9265 100644
--- a/apps/openmw/mwrender/navmesh.cpp
+++ b/apps/openmw/mwrender/navmesh.cpp
@@ -6,6 +6,8 @@
 #include <components/resource/scenemanager.hpp>
 #include <components/detournavigator/navmeshcacheitem.hpp>
 #include <components/sceneutil/detourdebugdraw.hpp>
+#include <components/sceneutil/workqueue.hpp>
+#include <components/detournavigator/settings.hpp>
 
 #include <osg/PositionAttitudeTransform>
 #include <osg/StateSet>
@@ -17,8 +19,137 @@
 
 namespace MWRender
 {
-    NavMesh::NavMesh(const osg::ref_ptr<osg::Group>& root, bool enabled)
+    struct NavMesh::LessByTilePosition
+    {
+        bool operator()(const DetourNavigator::TilePosition& lhs,
+                        const std::pair<DetourNavigator::TilePosition, DetourNavigator::Version>& rhs) const
+        {
+            return lhs < rhs.first;
+        }
+
+        bool operator()(const std::pair<DetourNavigator::TilePosition, DetourNavigator::Version>& lhs,
+                        const DetourNavigator::TilePosition& rhs) const
+        {
+            return lhs.first < rhs;
+        }
+    };
+
+    struct NavMesh::CreateNavMeshTileGroups final : SceneUtil::WorkItem
+    {
+        std::size_t mId;
+        DetourNavigator::Version mVersion;
+        const std::weak_ptr<DetourNavigator::GuardedNavMeshCacheItem> mNavMesh;
+        const osg::ref_ptr<osg::StateSet> mGroupStateSet;
+        const osg::ref_ptr<osg::StateSet> mDebugDrawStateSet;
+        const DetourNavigator::Settings mSettings;
+        std::map<DetourNavigator::TilePosition, Tile> mTiles;
+        std::atomic_bool mAborted {false};
+        std::mutex mMutex;
+        bool mStarted = false;
+        std::vector<std::pair<DetourNavigator::TilePosition, Tile>> mUpdatedTiles;
+        std::vector<DetourNavigator::TilePosition> mRemovedTiles;
+
+        explicit CreateNavMeshTileGroups(std::size_t id, DetourNavigator::Version version,
+            std::weak_ptr<DetourNavigator::GuardedNavMeshCacheItem> navMesh,
+            const osg::ref_ptr<osg::StateSet>& groupStateSet, const osg::ref_ptr<osg::StateSet>& debugDrawStateSet,
+            const DetourNavigator::Settings& settings, const std::map<DetourNavigator::TilePosition, Tile>& tiles)
+            : mId(id)
+            , mVersion(version)
+            , mNavMesh(navMesh)
+            , mGroupStateSet(groupStateSet)
+            , mDebugDrawStateSet(debugDrawStateSet)
+            , mSettings(settings)
+            , mTiles(tiles)
+        {
+        }
+
+        void doWork() final
+        {
+            using DetourNavigator::TilePosition;
+            using DetourNavigator::Version;
+
+            const std::lock_guard lock(mMutex);
+            mStarted = true;
+
+            if (mAborted.load(std::memory_order_acquire))
+                return;
+
+            const auto navMeshPtr = mNavMesh.lock();
+            if (navMeshPtr == nullptr)
+                return;
+
+            std::vector<std::pair<DetourNavigator::TilePosition, Version>> existingTiles;
+
+            navMeshPtr->lockConst()->forEachUsedTile([&] (const TilePosition& position, const Version& version, const dtMeshTile& /*meshTile*/)
+            {
+                existingTiles.emplace_back(position, version);
+            });
+
+            if (mAborted.load(std::memory_order_acquire))
+                return;
+
+            std::sort(existingTiles.begin(), existingTiles.end());
+
+            std::vector<DetourNavigator::TilePosition> removedTiles;
+
+            for (const auto& [position, tile] : mTiles)
+                if (!std::binary_search(existingTiles.begin(), existingTiles.end(), position, LessByTilePosition {}))
+                    removedTiles.push_back(position);
+
+            std::vector<std::pair<TilePosition, Tile>> updatedTiles;
+
+            for (const auto& [position, version] : existingTiles)
+            {
+                const auto it = mTiles.find(position);
+                if (it != mTiles.end() && it->second.mGroup != nullptr && it->second.mVersion == version)
+                    continue;
+
+                osg::ref_ptr<osg::Group> group;
+                {
+                    const auto navMesh = navMeshPtr->lockConst();
+                    const dtMeshTile* meshTile = DetourNavigator::getTile(navMesh->getImpl(), position);
+                    if (meshTile == nullptr)
+                        continue;
+
+                    if (mAborted.load(std::memory_order_acquire))
+                        return;
+
+                    group = SceneUtil::createNavMeshTileGroup(navMesh->getImpl(), *meshTile, mSettings, mGroupStateSet, mDebugDrawStateSet);
+                }
+                if (group == nullptr)
+                {
+                    removedTiles.push_back(position);
+                    continue;
+                }
+                MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(group, "debug");
+                group->setNodeMask(Mask_Debug);
+                updatedTiles.emplace_back(position, Tile {version, std::move(group)});
+            }
+
+            if (mAborted.load(std::memory_order_acquire))
+                return;
+
+            mUpdatedTiles = std::move(updatedTiles);
+            mRemovedTiles = std::move(removedTiles);
+        }
+
+        void abort() final
+        {
+            mAborted.store(true, std::memory_order_release);
+        }
+    };
+
+    struct NavMesh::DeallocateCreateNavMeshTileGroups final : SceneUtil::WorkItem
+    {
+        osg::ref_ptr<NavMesh::CreateNavMeshTileGroups> mWorkItem;
+
+        explicit DeallocateCreateNavMeshTileGroups(osg::ref_ptr<NavMesh::CreateNavMeshTileGroups>&& workItem)
+            : mWorkItem(std::move(workItem)) {}
+    };
+
+    NavMesh::NavMesh(const osg::ref_ptr<osg::Group>& root, const osg::ref_ptr<SceneUtil::WorkQueue>& workQueue, bool enabled)
         : mRootNode(root)
+        , mWorkQueue(workQueue)
         , mGroupStateSet(SceneUtil::makeNavMeshTileStateSet())
         , mDebugDrawStateSet(SceneUtil::DebugDraw::makeStateSet())
         , mEnabled(enabled)
@@ -30,6 +161,8 @@ namespace MWRender
     {
         if (mEnabled)
             disable();
+        for (const auto& workItem : mWorkItems)
+            workItem->abort();
     }
 
     bool NavMesh::toggle()
@@ -42,13 +175,69 @@ namespace MWRender
         return mEnabled;
     }
 
-    void NavMesh::update(const DetourNavigator::NavMeshCacheItem& navMesh, std::size_t id,
+    void NavMesh::update(const std::shared_ptr<DetourNavigator::GuardedNavMeshCacheItem>& navMesh, std::size_t id,
         const DetourNavigator::Settings& settings)
     {
         using DetourNavigator::TilePosition;
         using DetourNavigator::Version;
 
-        if (!mEnabled || (!mTiles.empty() && mId == id && mVersion == navMesh.getVersion()))
+        if (!mEnabled)
+            return;
+
+        {
+            std::pair<std::size_t, Version> lastest {0, Version {}};
+            osg::ref_ptr<CreateNavMeshTileGroups> latestCandidate;
+            for (auto it = mWorkItems.begin(); it != mWorkItems.end();)
+            {
+                if (!(*it)->isDone())
+                {
+                    ++it;
+                    continue;
+                }
+                const std::pair<std::size_t, Version> order {(*it)->mId, (*it)->mVersion};
+                if (lastest < order)
+                {
+                    lastest = order;
+                    std::swap(latestCandidate, *it);
+                }
+                if (*it != nullptr)
+                    mWorkQueue->addWorkItem(new DeallocateCreateNavMeshTileGroups(std::move(*it)));
+                it = mWorkItems.erase(it);
+            }
+
+            if (latestCandidate != nullptr)
+            {
+                for (const TilePosition& position : latestCandidate->mRemovedTiles)
+                {
+                    const auto it = mTiles.find(position);
+                    if (it == mTiles.end())
+                        continue;
+                    mRootNode->removeChild(it->second.mGroup);
+                    mTiles.erase(it);
+                }
+
+                for (auto& [position, tile] : latestCandidate->mUpdatedTiles)
+                {
+                    const auto it = mTiles.find(position);
+                    if (it == mTiles.end())
+                    {
+                        mRootNode->addChild(tile.mGroup);
+                        mTiles.emplace_hint(it, position, std::move(tile));
+                    }
+                    else
+                    {
+                        mRootNode->replaceChild(it->second.mGroup, tile.mGroup);
+                        std::swap(it->second, tile);
+                    }
+                }
+
+                mWorkQueue->addWorkItem(new DeallocateCreateNavMeshTileGroups(std::move(latestCandidate)));
+            }
+        }
+
+        const auto version = navMesh->lock()->getVersion();
+
+        if (!mTiles.empty() && mId == id && mVersion == version)
             return;
 
         if (mId != id)
@@ -57,40 +246,35 @@ namespace MWRender
             mId = id;
         }
 
-        mVersion = navMesh.getVersion();
+        mVersion = version;
 
-        std::vector<TilePosition> updated;
-        navMesh.forEachUsedTile([&] (const TilePosition& position, const Version& version, const dtMeshTile& meshTile)
+        for (auto& workItem : mWorkItems)
         {
-            updated.push_back(position);
-            Tile& tile = mTiles[position];
-            if (tile.mGroup != nullptr && tile.mVersion == version)
-                return;
-            if (tile.mGroup != nullptr)
-                mRootNode->removeChild(tile.mGroup);
-            tile.mGroup = SceneUtil::createNavMeshTileGroup(navMesh.getImpl(), meshTile, settings,
-                                                            mGroupStateSet, mDebugDrawStateSet);
-            if (tile.mGroup == nullptr)
-                return;
-            MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(tile.mGroup, "debug");
-            tile.mGroup->setNodeMask(Mask_Debug);
-            mRootNode->addChild(tile.mGroup);
-        });
-        std::sort(updated.begin(), updated.end());
-        for (auto it = mTiles.begin(); it != mTiles.end();)
-        {
-            if (!std::binary_search(updated.begin(), updated.end(), it->first))
-            {
-                mRootNode->removeChild(it->second.mGroup);
-                it = mTiles.erase(it);
-            }
-            else
-                ++it;
+            const std::unique_lock lock(workItem->mMutex, std::try_to_lock);
+
+            if (!lock.owns_lock())
+                continue;
+
+            if (workItem->mStarted)
+                continue;
+
+            workItem->mId = id;
+            workItem->mVersion = version;
+            workItem->mTiles = mTiles;
+
+            return;
         }
+
+        osg::ref_ptr<CreateNavMeshTileGroups> workItem = new CreateNavMeshTileGroups(id, version, navMesh, mGroupStateSet, mDebugDrawStateSet, settings, mTiles);
+        mWorkQueue->addWorkItem(workItem);
+        mWorkItems.push_back(std::move(workItem));
     }
 
     void NavMesh::reset()
     {
+        for (auto& workItem : mWorkItems)
+            workItem->abort();
+        mWorkItems.clear();
         for (auto& [position, tile] : mTiles)
             mRootNode->removeChild(tile.mGroup);
         mTiles.clear();
@@ -98,15 +282,12 @@ namespace MWRender
 
     void NavMesh::enable()
     {
-        for (const auto& [position, tile] : mTiles)
-            mRootNode->addChild(tile.mGroup);
         mEnabled = true;
     }
 
     void NavMesh::disable()
     {
-        for (const auto& [position, tile] : mTiles)
-            mRootNode->removeChild(tile.mGroup);
+        reset();
         mEnabled = false;
     }
 }
diff --git a/apps/openmw/mwrender/navmesh.hpp b/apps/openmw/mwrender/navmesh.hpp
index fd69a3e487..1c2cfbd323 100644
--- a/apps/openmw/mwrender/navmesh.hpp
+++ b/apps/openmw/mwrender/navmesh.hpp
@@ -3,11 +3,14 @@
 
 #include <components/detournavigator/version.hpp>
 #include <components/detournavigator/tileposition.hpp>
+#include <components/misc/guarded.hpp>
 
 #include <osg/ref_ptr>
 
 #include <cstddef>
 #include <map>
+#include <memory>
+#include <vector>
 
 class dtNavMesh;
 
@@ -24,18 +27,24 @@ namespace DetourNavigator
     struct Settings;
 }
 
+namespace SceneUtil
+{
+    class WorkQueue;
+}
+
 namespace MWRender
 {
     class NavMesh
     {
     public:
-        NavMesh(const osg::ref_ptr<osg::Group>& root, bool enabled);
+        explicit NavMesh(const osg::ref_ptr<osg::Group>& root, const osg::ref_ptr<SceneUtil::WorkQueue>& workQueue,
+                         bool enabled);
         ~NavMesh();
 
         bool toggle();
 
-        void update(const DetourNavigator::NavMeshCacheItem& navMesh, std::size_t id,
-            const DetourNavigator::Settings& settings);
+        void update(const std::shared_ptr<Misc::ScopeGuarded<DetourNavigator::NavMeshCacheItem>>& navMesh,
+            std::size_t id, const DetourNavigator::Settings& settings);
 
         void reset();
 
@@ -55,13 +64,19 @@ namespace MWRender
             osg::ref_ptr<osg::Group> mGroup;
         };
 
+        struct LessByTilePosition;
+        struct CreateNavMeshTileGroups;
+        struct DeallocateCreateNavMeshTileGroups;
+
         osg::ref_ptr<osg::Group> mRootNode;
+        osg::ref_ptr<SceneUtil::WorkQueue> mWorkQueue;
         osg::ref_ptr<osg::StateSet> mGroupStateSet;
         osg::ref_ptr<osg::StateSet> mDebugDrawStateSet;
         bool mEnabled;
         std::size_t mId;
         DetourNavigator::Version mVersion;
         std::map<DetourNavigator::TilePosition, Tile> mTiles;
+        std::vector<osg::ref_ptr<CreateNavMeshTileGroups>> mWorkItems;
     };
 }
 
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index a504a42faf..384580adb8 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -384,7 +384,7 @@ namespace MWRender
         // It is unnecessary to stop/start the viewer as no frames are being rendered yet.
         mResourceSystem->getSceneManager()->getShaderManager().setGlobalDefines(globalDefines);
 
-        mNavMesh.reset(new NavMesh(mRootNode, Settings::Manager::getBool("enable nav mesh render", "Navigator")));
+        mNavMesh.reset(new NavMesh(mRootNode, mWorkQueue, Settings::Manager::getBool("enable nav mesh render", "Navigator")));
         mActorsPaths.reset(new ActorsPaths(mRootNode, Settings::Manager::getBool("enable agents paths render", "Navigator")));
         mRecastMesh.reset(new RecastMesh(mRootNode, Settings::Manager::getBool("enable recast mesh render", "Navigator")));
         mPathgrid.reset(new Pathgrid(mRootNode));
@@ -1395,7 +1395,7 @@ namespace MWRender
         {
             try
             {
-                mNavMesh->update(*it->second->lockConst(), mNavMeshNumber, mNavigator.getSettings());
+                mNavMesh->update(it->second, mNavMeshNumber, mNavigator.getSettings());
             }
             catch (const std::exception& e)
             {

From dac4415699464264c43ac7e46ed23e45f73bf21e Mon Sep 17 00:00:00 2001
From: Benjamin Winger <bmw@disroot.org>
Date: Tue, 12 Apr 2022 13:09:53 -0400
Subject: [PATCH 2324/2859] Moved localisation docs to dedicated page

---
 docs/source/reference/modding/index.rst       |  1 +
 .../source/reference/modding/localisation.rst | 83 +++++++++++++++++++
 files/lua_api/openmw/core.lua                 | 45 ++--------
 3 files changed, 92 insertions(+), 37 deletions(-)
 create mode 100644 docs/source/reference/modding/localisation.rst

diff --git a/docs/source/reference/modding/index.rst b/docs/source/reference/modding/index.rst
index 440db96d8c..1e8560930a 100644
--- a/docs/source/reference/modding/index.rst
+++ b/docs/source/reference/modding/index.rst
@@ -28,3 +28,4 @@ about creating new content for OpenMW, please refer to
 	sky-system
 	extended
 	paths
+	localisation
diff --git a/docs/source/reference/modding/localisation.rst b/docs/source/reference/modding/localisation.rst
new file mode 100644
index 0000000000..c0bf766d66
--- /dev/null
+++ b/docs/source/reference/modding/localisation.rst
@@ -0,0 +1,83 @@
+Localisation
+============
+
+OpenMW supports localisation of mods using ICU MessageFormat wrapped in YAML.
+Currently this is only possible using the
+`openmw.core.l10n <../lua-scripting/openmw_core.html##(core).l10n>`_ lua function.
+
+Locales
+-------
+
+Locales usually have the form ``{lang}_{COUNTRY}``,
+where ``{lang}`` is a lowercase two-letter language code and ``{COUNTRY}`` is an uppercase
+two-letter country code. Localisation files *must* have this exact capitalisation and separator
+to be recognized.
+
+When users request a locale using the :ref:`preferred locales` setting they do not need to match capitalisation
+and can also use hyphens instead of underscores. The locale will be normalised to the above format.
+
+Locales may also contain variants and keywords, though these usually will not be necessary.
+See `The Locale chapter of the ICU Guide <https://unicode-org.github.io/icu/userguide/locale/#language-code>`_ for full details.
+
+Localisation Files
+--------------------------
+
+Localisation files (containing the message names and translations) should be stored in the
+VFS as files of the form ``l10n/<ContextName>/<Locale>.yaml``.
+
+Messages contents have the form of ICU MessageFormat strings.
+See `the Formatting Messages chapter of the ICU Guide <https://unicode-org.github.io/icu/userguide/format_parse/messages/>`_
+for a guide to MessageFormat, and see
+`The ICU APIdoc <https://unicode-org.github.io/icu-docs/apidoc/released/icu4c/classicu_1_1MessageFormat.html>`_
+for full details of the MessageFormat syntax.
+
+Examples
+~~~~~~~~
+
+.. code-block:: yaml
+    :caption: DataFiles/l10n/MyMod/en.yaml
+
+    good_morning: 'Good morning.'
+
+    you_have_arrows: |-
+      {count, plural,
+        one {You have one arrow.}
+        other {You have {count} arrows.}
+      }
+
+.. code-block:: yaml
+    :caption: DataFiles/l10n/MyMod/de.yaml
+
+    good_morning: "Guten Morgen."
+    you_have_arrows: |-
+      {count, plural,
+        one {Du hast ein Pfeil.}
+        other {Du hast {count} Pfeile.}
+      }
+    "Hello {name}!": "Hallo {name}!"
+
+Select rules can be used to match arbitrary string arguments.
+The default keyword ``other`` must always be provided.
+
+.. code-block:: yaml
+    :caption: DataFiles/l10n/AdvancedExample/en.yaml
+
+    pc_must_come: {PCGender, select,
+        male {He is}
+        female {She is}
+        other {They are}
+      } coming with us.
+
+Numbers have various formatting options and can also be formatted with custom patterns.
+See `The ICU Guide <https://unicode-org.github.io/icu/userguide/format_parse/numbers/skeletons.html#syntax>`_
+
+.. code-block:: yaml
+    :caption: DataFiles/l10n/AdvancedExample2/en.yaml
+
+    quest_completion: "The quest is {done, number, percent} complete."
+    # E.g. "You came in 4th place"
+    ordinal: "You came in {num, ordinal} place."
+    # E.g. "There is one thing", "There are one hundred things"
+    spellout: "There {num, plural, one{is {num, spellout} thing} other{are {num, spellout} things}}."
+    numbers: "{int} and {double, number, integer} are integers, but {double} is a double"
+    rounding: "{value, number, :: .00}"
diff --git a/files/lua_api/openmw/core.lua b/files/lua_api/openmw/core.lua
index b1a10b9cfb..dd4ccac831 100644
--- a/files/lua_api/openmw/core.lua
+++ b/files/lua_api/openmw/core.lua
@@ -54,25 +54,14 @@
 
 ---
 -- Return l10n formatting function for the given context.
--- Language files should be stored in VFS as `l10n/<ContextName>/<Locale>.yaml`.
+-- Localisation files (containing the message names and translations) should be stored in
+-- VFS as files of the form `l10n/<ContextName>/<Locale>.yaml`.
 --
--- Locales usually have the form {lang}_{COUNTRY},
--- where {lang} is a lowercase two-letter language code and {COUNTRY} is an uppercase
--- two-letter country code. Capitalization and the separator must have exactly
--- this format for language files to be recognized, but when users request a
--- locale they do not need to match capitalization and can use hyphens instead of
--- underscores.
+-- See [Localisation](../modding/localisation.html) for details of the localisation file structure.
 --
--- Locales may also contain variants and keywords. See https://unicode-org.github.io/icu/userguide/locale/#language-code
--- for full details.
---
--- Messages have the form of ICU MessageFormat strings.
--- See https://unicode-org.github.io/icu/userguide/format_parse/messages/
--- for a guide to MessageFormat, and see 
--- https://unicode-org.github.io/icu-docs/apidoc/released/icu4c/classicu_1_1MessageFormat.html
--- for full details of the MessageFormat syntax.
 -- @function [parent=#core] l10n
 -- @param #string context l10n context; recommended to use the name of the mod.
+--                This must match the <ContextName> directory in the VFS which stores the localisation files.
 -- @param #string fallbackLocale The source locale containing the default messages
 --                               If omitted defaults to "en"
 -- @return #function
@@ -80,39 +69,21 @@
 -- # DataFiles/l10n/MyMod/en.yaml
 -- good_morning: 'Good morning.'
 --
--- you_have_arrows: |- {count, plural,
+-- you_have_arrows: |-
+--   {count, plural,
 --     one {You have one arrow.}
 --     other {You have {count} arrows.}
 --   }
 -- @usage
 -- # DataFiles/l10n/MyMod/de.yaml
 -- good_morning: "Guten Morgen."
--- you_have_arrows: |- {count, plural,
+-- you_have_arrows: |-
+--   {count, plural,
 --     one {Du hast ein Pfeil.}
 --     other {Du hast {count} Pfeile.}
 --   }
 -- "Hello {name}!": "Hallo {name}!"
 -- @usage
--- # DataFiles/l10n/AdvancedExample/en.yaml
--- # More complicated patterns
--- # select rules can be used to match arbitrary string arguments
--- # The default keyword other must always be provided
--- pc_must_come: {PCGender, select,
---     male {He is}
---     female {She is}
---     other {They are}
---   } coming with us.
--- # Numbers have various formatting options
--- quest_completion: "The quest is {done, number, percent} complete.",
--- # E.g. "You came in 4th place"
--- ordinal: "You came in {num, ordinal} place."
--- # E.g. "There is one thing", "There are one hundred things"
--- spellout: "There {num, plural, one{is {num, spellout} thing} other{are {num, spellout} things}}."
--- numbers: "{int} and {double, number, integer} are integers, but {double} is a double"
--- # Numbers can be formatted with custom patterns
--- # See https://unicode-org.github.io/icu/userguide/format_parse/numbers/skeletons.html#syntax
--- rounding: "{value, number, :: .00}"
--- @usage
 -- -- Usage in Lua
 -- local myMsg = core.l10n('MyMod', 'en')
 -- print( myMsg('good_morning') )

From 2f455aa87bd2f0ebca375dc799bb9bb455759a4d Mon Sep 17 00:00:00 2001
From: Benjamin Winger <bmw@disroot.org>
Date: Tue, 12 Apr 2022 14:11:55 -0400
Subject: [PATCH 2325/2859] Added fallback details to l10n docs

---
 docs/source/reference/modding/localisation.rst | 11 +++++++++++
 files/lua_api/openmw/core.lua                  |  9 ++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/docs/source/reference/modding/localisation.rst b/docs/source/reference/modding/localisation.rst
index c0bf766d66..bc66053d58 100644
--- a/docs/source/reference/modding/localisation.rst
+++ b/docs/source/reference/modding/localisation.rst
@@ -19,6 +19,17 @@ and can also use hyphens instead of underscores. The locale will be normalised t
 Locales may also contain variants and keywords, though these usually will not be necessary.
 See `The Locale chapter of the ICU Guide <https://unicode-org.github.io/icu/userguide/locale/#language-code>`_ for full details.
 
+Fallbacks
+---------
+
+When OpenMW looks up messages at runtime, it starts with the first requested locale, and then looks at that locale's more generic ancestors before looking at the next requested locale. E.g. ``en_GB_OED`` will fall back to ``en_GB``, which will fall back to ``en``.
+
+When including localisations with specific country variants (or more specific variants/keywords), you should always include the more generic version as well.
+
+E.g. if you include ``en_US.yaml`` and ``en_GB.yaml`` localisation files, you should also include ``en.yaml``, since other English locales will fall back to that (e.g. ``en_CA``, ``en_AU``, ``en_NZ``). You can put an arbitrary ``en`` locale of your choice in ``en.yaml``, and then leave the file for that variant empty (since all lookups for the variant will fall back to ``en`` anyway).
+
+Note that because of the fallbacks only messages which differ between variants need to be included in the country-specific localisation files.
+
 Localisation Files
 --------------------------
 
diff --git a/files/lua_api/openmw/core.lua b/files/lua_api/openmw/core.lua
index dd4ccac831..d719853da0 100644
--- a/files/lua_api/openmw/core.lua
+++ b/files/lua_api/openmw/core.lua
@@ -59,11 +59,18 @@
 --
 -- See [Localisation](../modding/localisation.html) for details of the localisation file structure.
 --
+-- When calling the l10n formatting function, if no localisation can be found for any of the requested locales then
+-- the message key will be returned instead (and formatted, if possible).
+-- This makes it possible to use the source strings as message identifiers.
+--
+-- If you do not use the source string as a message identifier you should instead make certain to include
+-- a fallback locale with a complete set of messages.
+--
 -- @function [parent=#core] l10n
 -- @param #string context l10n context; recommended to use the name of the mod.
 --                This must match the <ContextName> directory in the VFS which stores the localisation files.
 -- @param #string fallbackLocale The source locale containing the default messages
---                               If omitted defaults to "en"
+--                               If omitted defaults to "en".
 -- @return #function
 -- @usage
 -- # DataFiles/l10n/MyMod/en.yaml

From 755c161ab75ccc299651fc46cc311755942b9aec Mon Sep 17 00:00:00 2001
From: Benjamin Winger <bmw@disroot.org>
Date: Wed, 20 Apr 2022 18:57:05 -0400
Subject: [PATCH 2326/2859] Display fatal error if OPENMW_ICU_HOST_BUILD_DIR is
 not set on Android

---
 extern/CMakeLists.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index f7bf9c4556..7d58ceb45e 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -248,6 +248,12 @@ if (NOT OPENMW_USE_SYSTEM_ICU)
         # Note: Must be a build directory, not an install root, since the configure script
         # looks for a configuration file which does not get installed.
         set(OPENMW_ICU_HOST_BUILD_DIR "" CACHE STRING "A pre-built ICU build directory for the host system if cross-compiling")
+        if (OPENMW_ICU_HOST_BUILD_DIR STREQUAL "")
+            message(FATAL_ERROR "If cross-compiling on android you must set the \
+            OPENMW_ICU_HOST_BUILD_DIR to the path of a pre-compiled build of \
+            ICU 70.1 for the system doing the build, as ICU needs to be able \
+            to run its own executables as part of the build process.")
+        endif()
         # We need a host version of ICU so that the tools can be run when building the data library.
         set(NDK_STANDARD_ROOT ${CMAKE_ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64)
         string(REPLACE "android-" "" ANDROIDVER ${ANDROID_PLATFORM})

From 206f0d4b1d6dc7765743cea76dbc6440f237b055 Mon Sep 17 00:00:00 2001
From: Benjamin Winger <bmw@disroot.org>
Date: Wed, 20 Apr 2022 18:58:45 -0400
Subject: [PATCH 2327/2859] Remove some hardcoded values in when building ICU
 on android

---
 extern/CMakeLists.txt | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 7d58ceb45e..0c464381e3 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -257,17 +257,17 @@ if (NOT OPENMW_USE_SYSTEM_ICU)
         # We need a host version of ICU so that the tools can be run when building the data library.
         set(NDK_STANDARD_ROOT ${CMAKE_ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64)
         string(REPLACE "android-" "" ANDROIDVER ${ANDROID_PLATFORM})
+        # Wants a triple such as aarch64-linux-android, excluding a trailing
+        # -clang etc.
+        string(REGEX MATCH "^[^-]\+-[^-]+-[^-]+" ICU_TOOLCHAIN_NAME ${ANDROID_TOOLCHAIN_NAME})
         set(ICU_ENV
-            "CC=ccache ${NDK_STANDARD_ROOT}/bin/aarch64-linux-android${ANDROIDVER}-clang"
-            "CXX=ccache ${NDK_STANDARD_ROOT}/bin/aarch64-linux-android${ANDROIDVER}-clang"
-            "RANLIB=${NDK_STANDARD_ROOT}/bin/aarch64-linux-android-ranlib"
-            "AR=${NDK_STANDARD_ROOT}/bin/aarch64-linux-android-ar"
+            "CC=${CMAKE_C_COMPILER_LAUNCHER} ${NDK_STANDARD_ROOT}/bin/${ICU_TOOLCHAIN_NAME}${ANDROIDVER}-clang"
+            "CXX=${CMAKE_CXX_COMPILER_LAUNCHER} ${NDK_STANDARD_ROOT}/bin/${ICU_TOOLCHAIN_NAME}${ANDROIDVER}-clang"
+            "RANLIB=${NDK_STANDARD_ROOT}/bin/${ICU_TOOLCHAIN_NAME}-ranlib"
+            "AR=${NDK_STANDARD_ROOT}/bin/${ICU_TOOLCHAIN_NAME}-ar"
             "CPPFLAGS=${ANDROID_COMPILER_FLAGS}"
             "LDFLAGS=${ANDROID_LINKER_FLAGS} -lc -lstdc++"
             )
-        # Wants a triple such as aarch64-linux-android, excluding a trailing
-        # -clang etc.
-        string(REGEX MATCH "^[^-]\+-[^-]+-[^-]+" ICU_TOOLCHAIN_NAME ${ANDROID_TOOLCHAIN_NAME})
         set(ICU_ADDITIONAL_OPTS --host=${ICU_TOOLCHAIN_NAME}${ANDROIDVER} --with-cross-build=${OPENMW_ICU_HOST_BUILD_DIR})
     endif()
     include(ExternalProject)

From 8a09cec0ab64e2b8e2c9d43148ba095800952790 Mon Sep 17 00:00:00 2001
From: Benjamin Winger <bmw@disroot.org>
Date: Wed, 20 Apr 2022 18:59:31 -0400
Subject: [PATCH 2328/2859] Only disable building ICU tools when doing an
 android cross-compile

Otherwise the icudata library won't be built
---
 extern/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 0c464381e3..c95a9273af 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -268,7 +268,7 @@ if (NOT OPENMW_USE_SYSTEM_ICU)
             "CPPFLAGS=${ANDROID_COMPILER_FLAGS}"
             "LDFLAGS=${ANDROID_LINKER_FLAGS} -lc -lstdc++"
             )
-        set(ICU_ADDITIONAL_OPTS --host=${ICU_TOOLCHAIN_NAME}${ANDROIDVER} --with-cross-build=${OPENMW_ICU_HOST_BUILD_DIR})
+        set(ICU_ADDITIONAL_OPTS --disable-tools --host=${ICU_TOOLCHAIN_NAME}${ANDROIDVER} --with-cross-build=${OPENMW_ICU_HOST_BUILD_DIR})
     endif()
     include(ExternalProject)
     ExternalProject_Add(icu
@@ -277,7 +277,7 @@ if (NOT OPENMW_USE_SYSTEM_ICU)
         SOURCE_DIR fetched/icu
         CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env ${ICU_ENV}
             <SOURCE_DIR>/icu4c/source/configure --enable-static --disable-shared
-            --disable-tests --disable-samples --disable-icuio --disable-extras --disable-tools ${ICU_ADDITIONAL_OPTS}
+            --disable-tests --disable-samples --disable-icuio --disable-extras ${ICU_ADDITIONAL_OPTS}
         BUILD_COMMAND make
         INSTALL_COMMAND ""
     )

From 8179a097f837a9593d738a8567d95f9f40aaa1b3 Mon Sep 17 00:00:00 2001
From: Benjamin Winger <bmw@disroot.org>
Date: Wed, 20 Apr 2022 19:00:23 -0400
Subject: [PATCH 2329/2859] Added ICU feature filters to limit the size of the
 data library when building ICU ourselves

---
 extern/CMakeLists.txt  |  2 ++
 extern/icufilters.json | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 extern/icufilters.json

diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index c95a9273af..898dfeffad 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -244,6 +244,7 @@ if (NOT OPENMW_USE_SYSTEM_YAML_CPP)
 endif()
 
 if (NOT OPENMW_USE_SYSTEM_ICU)
+    set(ICU_ENV "ICU_DATA_FILTER_FILE=${CMAKE_CURRENT_SOURCE_DIR}/icufilters.json")
     if (ANDROID)
         # Note: Must be a build directory, not an install root, since the configure script
         # looks for a configuration file which does not get installed.
@@ -261,6 +262,7 @@ if (NOT OPENMW_USE_SYSTEM_ICU)
         # -clang etc.
         string(REGEX MATCH "^[^-]\+-[^-]+-[^-]+" ICU_TOOLCHAIN_NAME ${ANDROID_TOOLCHAIN_NAME})
         set(ICU_ENV
+            ${ICU_ENV}
             "CC=${CMAKE_C_COMPILER_LAUNCHER} ${NDK_STANDARD_ROOT}/bin/${ICU_TOOLCHAIN_NAME}${ANDROIDVER}-clang"
             "CXX=${CMAKE_CXX_COMPILER_LAUNCHER} ${NDK_STANDARD_ROOT}/bin/${ICU_TOOLCHAIN_NAME}${ANDROIDVER}-clang"
             "RANLIB=${NDK_STANDARD_ROOT}/bin/${ICU_TOOLCHAIN_NAME}-ranlib"
diff --git a/extern/icufilters.json b/extern/icufilters.json
new file mode 100644
index 0000000000..837658e5c7
--- /dev/null
+++ b/extern/icufilters.json
@@ -0,0 +1,19 @@
+{
+    "featureFilters": {
+        "brkitr_rules": "exclude",
+        "brkitr_dictionaries": "exclude",
+        "brkitr_tree": "exclude",
+        "coll_ucadata": "exclude",
+        "coll_tree": "exclude",
+        "confusables": "exclude",
+        "conversion_mappings": "exclude",
+        "zone_tree": "exclude",
+        "zone_supplemental": "exclude",
+        "translit": "exclude",
+        "cnvalias": "exclude",
+        "lang_tree": "exclude",
+        "normalization": "exclude",
+        "region_tree": "exclude",
+        "stringprep": "exclude"
+    }
+}

From 51a84aaef8390dce12e4fba1e5cf0305792b6a78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Thu, 21 Apr 2022 11:51:10 +0300
Subject: [PATCH 2330/2859] Include random state record in count of saved
 records

---
 apps/openmw/mwworld/worldimp.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index c40d3b6d5b..f925ebec82 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -331,7 +331,8 @@ namespace MWWorld
             +1 // weather record
             +1 // actorId counter
             +1 // levitation/teleport enabled state
-            +1; // camera
+            +1 // camera
+            +1; // random state.
     }
 
     int World::countSavedGameCells() const

From 88d09c336c6506712705657a39838d1a4f4a9ebe Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sat, 9 Apr 2022 23:07:57 +0200
Subject: [PATCH 2331/2859] Lua console

---
 apps/openmw/mwbase/luamanager.hpp             |   2 +
 apps/openmw/mwbase/windowmanager.hpp          |   7 +
 apps/openmw/mwgui/console.cpp                 |  51 ++++--
 apps/openmw/mwgui/console.hpp                 |  11 +-
 apps/openmw/mwgui/windowmanagerimp.cpp        |  10 ++
 apps/openmw/mwgui/windowmanagerimp.hpp        |   2 +
 apps/openmw/mwlua/luamanagerimp.cpp           |  24 +++
 apps/openmw/mwlua/luamanagerimp.hpp           |   9 +
 apps/openmw/mwlua/playerscripts.hpp           |   9 +-
 apps/openmw/mwlua/uibindings.cpp              |  29 ++++
 .../lua-scripting/engine_handlers.rst         |  26 ++-
 files/builtin_scripts/CMakeLists.txt          |   3 +
 files/builtin_scripts/builtin.omwscripts      |   3 +
 files/builtin_scripts/openmw_aux/util.lua     |  23 ++-
 .../scripts/omw/console/global.lua            |  81 +++++++++
 .../scripts/omw/console/local.lua             |  71 ++++++++
 .../scripts/omw/console/player.lua            | 158 ++++++++++++++++++
 files/lua_api/openmw/ui.lua                   |  31 ++++
 18 files changed, 522 insertions(+), 28 deletions(-)
 create mode 100644 files/builtin_scripts/scripts/omw/console/global.lua
 create mode 100644 files/builtin_scripts/scripts/omw/console/local.lua
 create mode 100644 files/builtin_scripts/scripts/omw/console/player.lua

diff --git a/apps/openmw/mwbase/luamanager.hpp b/apps/openmw/mwbase/luamanager.hpp
index 5ed751ffed..6c1ce6a27b 100644
--- a/apps/openmw/mwbase/luamanager.hpp
+++ b/apps/openmw/mwbase/luamanager.hpp
@@ -92,6 +92,8 @@ namespace MWBase
 
         // Drops script cache and reloads all scripts. Calls `onSave` and `onLoad` for every script.
         virtual void reloadAllScripts() = 0;
+
+        virtual void handleConsoleCommand(const std::string& consoleMode, const std::string& command, const MWWorld::Ptr& selectedPtr) = 0;
     };
 
 }
diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index eeb2d6a56b..04f21906a0 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -154,6 +154,13 @@ namespace MWBase
             virtual void updateSpellWindow() = 0;
 
             virtual void setConsoleSelectedObject(const MWWorld::Ptr& object) = 0;
+            virtual void setConsoleMode(const std::string& mode) = 0;
+
+            static constexpr std::string_view sConsoleColor_Default = "#FFFFFF";
+            static constexpr std::string_view sConsoleColor_Error = "#FF2222";
+            static constexpr std::string_view sConsoleColor_Success = "#FF00FF";
+            static constexpr std::string_view sConsoleColor_Info = "#AAAAAA";
+            virtual void printToConsole(const std::string& msg, std::string_view color) = 0;
 
             /// Set time left for the player to start drowning (update the drowning bar)
             /// @param time time left to start drowning
diff --git a/apps/openmw/mwgui/console.cpp b/apps/openmw/mwgui/console.cpp
index a3663b6b9f..aaf36aab59 100644
--- a/apps/openmw/mwgui/console.cpp
+++ b/apps/openmw/mwgui/console.cpp
@@ -162,25 +162,34 @@ namespace MWGui
         MyGUI::LayerManager::getInstance().upLayerItem(mMainWidget);
     }
 
-    void Console::print(const std::string &msg, const std::string& color)
+    void Console::print(const std::string &msg, std::string_view color)
     {
-        mHistory->addText(color + MyGUI::TextIterator::toTagsString(msg));
+        mHistory->addText(std::string(color) + MyGUI::TextIterator::toTagsString(msg));
     }
 
     void Console::printOK(const std::string &msg)
     {
-        print(msg + "\n", "#FF00FF");
+        print(msg + "\n", MWBase::WindowManager::sConsoleColor_Success);
     }
 
     void Console::printError(const std::string &msg)
     {
-        print(msg + "\n", "#FF2222");
+        print(msg + "\n", MWBase::WindowManager::sConsoleColor_Error);
     }
 
     void Console::execute (const std::string& command)
     {
         // Log the command
-        print("> " + command + "\n");
+        if (mConsoleMode.empty())
+            print("> " + command + "\n");
+        else
+            print(mConsoleMode + " " + command + "\n");
+
+        if (!mConsoleMode.empty() || (command.size() >= 3 && std::string_view(command).substr(0, 3) == "lua"))
+        {
+            MWBase::Environment::get().getLuaManager()->handleConsoleCommand(mConsoleMode, command, mPtr);
+            return;
+        }
 
         Compiler::Locals locals;
         if (!mPtr.isEmpty())
@@ -271,7 +280,7 @@ namespace MWGui
                 }
             }
         }
-        else if(key == MyGUI::KeyCode::Tab)
+        else if(key == MyGUI::KeyCode::Tab && mConsoleMode.empty())
         {
             std::vector<std::string> matches;
             listNames();
@@ -475,7 +484,7 @@ namespace MWGui
 
     void Console::onResChange(int width, int height)
     {
-        setCoord(10,10, width-10, height/2);
+        setCoord(10, 10, width-10, height/2);
     }
 
     void Console::updateSelectedObjectPtr(const MWWorld::Ptr& currentPtr, const MWWorld::Ptr& newPtr)
@@ -489,23 +498,31 @@ namespace MWGui
         if (!object.isEmpty())
         {
             if (object == mPtr)
-            {
-                setTitle("#{sConsoleTitle}");
-                mPtr=MWWorld::Ptr();
-            }
+                mPtr = MWWorld::Ptr();
             else
-            {
-                setTitle("#{sConsoleTitle} (" + object.getCellRef().getRefId() + ")");
                 mPtr = object;
-            }
             // User clicked on an object. Restore focus to the console command line.
             MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mCommandLine);
         }
         else
-        {
-            setTitle("#{sConsoleTitle}");
             mPtr = MWWorld::Ptr();
-        }
+        updateConsoleTitle();
+    }
+
+    void Console::updateConsoleTitle()
+    {
+        std::string title = "#{sConsoleTitle}";
+        if (!mConsoleMode.empty())
+            title = mConsoleMode + " " + title;
+        if (!mPtr.isEmpty())
+            title.append(" (" + mPtr.getCellRef().getRefId() + ")");
+        setTitle(title);
+    }
+
+    void Console::setConsoleMode(std::string_view mode)
+    {
+        mConsoleMode = std::string(mode);
+        updateConsoleTitle();
     }
 
     void Console::onReferenceUnavailable()
diff --git a/apps/openmw/mwgui/console.hpp b/apps/openmw/mwgui/console.hpp
index 2b8cecbc01..891c4e0ac7 100644
--- a/apps/openmw/mwgui/console.hpp
+++ b/apps/openmw/mwgui/console.hpp
@@ -9,6 +9,8 @@
 #include <components/compiler/output.hpp>
 #include <components/compiler/extensions.hpp>
 
+#include "../mwbase/windowmanager.hpp"
+
 #include "../mwscript/compilercontext.hpp"
 #include "../mwscript/interpretercontext.hpp"
 
@@ -40,7 +42,7 @@ namespace MWGui
             void onResChange(int width, int height) override;
 
             // Print a message to the console, in specified color.
-            void print(const std::string &msg, const std::string& color = "#FFFFFF");
+            void print(const std::string &msg, std::string_view color = MWBase::WindowManager::sConsoleColor_Default);
 
             // These are pre-colored versions that you should use.
 
@@ -60,12 +62,19 @@ namespace MWGui
 
             void resetReference () override;
 
+            const std::string& getConsoleMode() const { return mConsoleMode; }
+            void setConsoleMode(std::string_view mode);
+
         protected:
 
             void onReferenceUnavailable() override;
 
         private:
 
+            std::string mConsoleMode;
+
+            void updateConsoleTitle();
+
             void keyPress(MyGUI::Widget* _sender,
                           MyGUI::KeyCode key,
                           MyGUI::Char _char);
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 0be8f2c751..23c16082b4 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -2069,6 +2069,16 @@ namespace MWGui
         mConsole->setSelectedObject(object);
     }
 
+    void WindowManager::printToConsole(const std::string& msg, std::string_view color)
+    {
+        mConsole->print(msg, color);
+    }
+
+    void WindowManager::setConsoleMode(const std::string& mode)
+    {
+        mConsole->setConsoleMode(mode);
+    }
+
     std::string WindowManager::correctIconPath(const std::string& path)
     {
         return Misc::ResourceHelpers::correctIconPath(path, mResourceSystem->getVFS());
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index 11d10ab45e..90e8d1b0d7 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -195,6 +195,8 @@ namespace MWGui
     void updateSpellWindow() override;
 
     void setConsoleSelectedObject(const MWWorld::Ptr& object) override;
+    void printToConsole(const std::string& msg, std::string_view color) override;
+    void setConsoleMode(const std::string& mode) override;
 
     /// Set time left for the player to start drowning (update the drowning bar)
     /// @param time time left to start drowning
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index aa2d5baa6f..80dfef16cd 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -242,6 +242,9 @@ namespace MWLua
         for (const std::string& message : mUIMessages)
             windowManager->messageBox(message);
         mUIMessages.clear();
+        for (auto& [msg, color] : mInGameConsoleMessages)
+            windowManager->printToConsole(msg, "#" + color.toHex());
+        mInGameConsoleMessages.clear();
 
         for (std::unique_ptr<Action>& action : mActionQueue)
             action->safeApply(mWorldView);
@@ -256,6 +259,7 @@ namespace MWLua
     {
         LuaUi::clearUserInterface();
         mUiResourceManager.clear();
+        MWBase::Environment::get().getWindowManager()->setConsoleMode("");
         mActiveLocalScripts.clear();
         mLocalEvents.clear();
         mGlobalEvents.clear();
@@ -480,6 +484,7 @@ namespace MWLua
         Log(Debug::Info) << "Reload Lua";
 
         LuaUi::clearUserInterface();
+        MWBase::Environment::get().getWindowManager()->setConsoleMode("");
         mUiResourceManager.clear();
         mLua.dropScriptCache();
         initConfiguration();
@@ -503,6 +508,25 @@ namespace MWLua
             scripts->receiveEngineEvent(LocalScripts::OnActive());
     }
 
+    void LuaManager::handleConsoleCommand(const std::string& consoleMode, const std::string& command, const MWWorld::Ptr& selectedPtr)
+    {
+        PlayerScripts* playerScripts = nullptr;
+        if (!mPlayer.isEmpty())
+            playerScripts = dynamic_cast<PlayerScripts*>(mPlayer.getRefData().getLuaScripts());
+        if (!playerScripts)
+        {
+            MWBase::Environment::get().getWindowManager()->printToConsole("You must enter a game session to run Lua commands\n",
+                                                                          MWBase::WindowManager::sConsoleColor_Error);
+            return;
+        }
+        sol::object selected = sol::nil;
+        if (!selectedPtr.isEmpty())
+            selected = sol::make_object(mLua.sol(), LObject(getId(selectedPtr), mWorldView.getObjectRegistry()));
+        if (!playerScripts->consoleCommand(consoleMode, command, selected))
+            MWBase::Environment::get().getWindowManager()->printToConsole("No Lua handlers for console\n",
+                                                                          MWBase::WindowManager::sConsoleColor_Error);
+    }
+
     LuaManager::Action::Action(LuaUtil::LuaState* state)
     {
         static const bool luaDebug = Settings::Manager::getBool("lua debug", "Lua");
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index fd9ec8b172..a75cac2da9 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -10,6 +10,8 @@
 
 #include <components/lua_ui/resources.hpp>
 
+#include <components/misc/color.hpp>
+
 #include "../mwbase/luamanager.hpp"
 
 #include "object.hpp"
@@ -60,6 +62,10 @@ namespace MWLua
         // Used only in Lua bindings
         void addCustomLocalScript(const MWWorld::Ptr&, int scriptId);
         void addUIMessage(std::string_view message) { mUIMessages.emplace_back(message); }
+        void addInGameConsoleMessage(const std::string& msg, const Misc::Color& color)
+        {
+            mInGameConsoleMessages.push_back({msg, color});
+        }
         
         // Some changes to the game world can not be done from the scripting thread (because it runs in parallel with OSG Cull),
         // so we need to queue it and apply from the main thread. All such changes should be implemented as classes inherited
@@ -94,6 +100,8 @@ namespace MWLua
         // Drops script cache and reloads all scripts. Calls `onSave` and `onLoad` for every script.
         void reloadAllScripts() override;
 
+        void handleConsoleCommand(const std::string& consoleMode, const std::string& command, const MWWorld::Ptr& selectedPtr) override;
+
         // Used to call Lua callbacks from C++
         void queueCallback(LuaUtil::Callback callback, sol::object arg)
         {
@@ -172,6 +180,7 @@ namespace MWLua
         std::vector<std::unique_ptr<Action>> mActionQueue;
         std::unique_ptr<Action> mTeleportPlayerAction;
         std::vector<std::string> mUIMessages;
+        std::vector<std::pair<std::string, Misc::Color>> mInGameConsoleMessages;
 
         LuaUtil::LuaStorage mGlobalStorage{mLua.sol()};
         LuaUtil::LuaStorage mPlayerStorage{mLua.sol()};
diff --git a/apps/openmw/mwlua/playerscripts.hpp b/apps/openmw/mwlua/playerscripts.hpp
index 15ab451792..1e909dc72c 100644
--- a/apps/openmw/mwlua/playerscripts.hpp
+++ b/apps/openmw/mwlua/playerscripts.hpp
@@ -18,7 +18,7 @@ namespace MWLua
         PlayerScripts(LuaUtil::LuaState* lua, const LObject& obj) : LocalScripts(lua, obj, ESM::LuaScriptCfg::sPlayer)
         {
             registerEngineHandlers({
-                &mKeyPressHandlers, &mKeyReleaseHandlers,
+                &mConsoleCommandHandlers, &mKeyPressHandlers, &mKeyReleaseHandlers,
                 &mControllerButtonPressHandlers, &mControllerButtonReleaseHandlers,
                 &mActionHandlers, &mInputUpdateHandlers,
                 &mTouchpadPressed, &mTouchpadReleased, &mTouchpadMoved
@@ -59,7 +59,14 @@ namespace MWLua
 
         void inputUpdate(float dt) { callEngineHandlers(mInputUpdateHandlers, dt); }
 
+        bool consoleCommand(const std::string& consoleMode, const std::string& command, const sol::object& selectedObject)
+        {
+            callEngineHandlers(mConsoleCommandHandlers, consoleMode, command, selectedObject);
+            return !mConsoleCommandHandlers.mList.empty();
+        }
+
     private:
+        EngineHandlerList mConsoleCommandHandlers{"onConsoleCommand"};
         EngineHandlerList mKeyPressHandlers{"onKeyPress"};
         EngineHandlerList mKeyReleaseHandlers{"onKeyRelease"};
         EngineHandlerList mControllerButtonPressHandlers{"onControllerButtonPress"};
diff --git a/apps/openmw/mwlua/uibindings.cpp b/apps/openmw/mwlua/uibindings.cpp
index f82dd3db00..84ec98adfb 100644
--- a/apps/openmw/mwlua/uibindings.cpp
+++ b/apps/openmw/mwlua/uibindings.cpp
@@ -12,6 +12,8 @@
 #include "context.hpp"
 #include "luamanagerimp.hpp"
 
+#include "../mwbase/windowmanager.hpp"
+
 namespace MWLua
 {
     namespace
@@ -213,6 +215,33 @@ namespace MWLua
         {
             luaManager->addUIMessage(message);
         };
+        api["CONSOLE_COLOR"] = LuaUtil::makeReadOnly(context.mLua->tableFromPairs<std::string, Misc::Color>({
+            {"Default", Misc::Color::fromHex(MWBase::WindowManager::sConsoleColor_Default.substr(1))},
+            {"Error", Misc::Color::fromHex(MWBase::WindowManager::sConsoleColor_Error.substr(1))},
+            {"Success", Misc::Color::fromHex(MWBase::WindowManager::sConsoleColor_Success.substr(1))},
+            {"Info", Misc::Color::fromHex(MWBase::WindowManager::sConsoleColor_Info.substr(1))},
+        }));
+        api["printToConsole"] = [luaManager=context.mLuaManager](const std::string& message, const Misc::Color& color)
+        {
+            luaManager->addInGameConsoleMessage(message + "\n", color);
+        };
+        api["setConsoleMode"] = [luaManager=context.mLuaManager](std::string_view mode)
+        {
+            luaManager->addAction(
+                [mode = std::string(mode)]{ MWBase::Environment::get().getWindowManager()->setConsoleMode(mode); });
+        };
+        api["setConsoleSelectedObject"] = [luaManager=context.mLuaManager](const sol::object& obj)
+        {
+            auto* wm = MWBase::Environment::get().getWindowManager();
+            if (obj == sol::nil)
+                luaManager->addAction([wm]{ wm->setConsoleSelectedObject(MWWorld::Ptr()); });
+            else
+            {
+                if (!obj.is<LObject>())
+                    throw std::runtime_error("Game object expected");
+                luaManager->addAction([wm, obj=obj.as<LObject>()]{ wm->setConsoleSelectedObject(obj.ptr()); });
+            }
+        };
         api["content"] = [](const sol::table& table)
         {
             return LuaUi::Content(table);
diff --git a/docs/source/reference/lua-scripting/engine_handlers.rst b/docs/source/reference/lua-scripting/engine_handlers.rst
index adc07d25fe..6f24750736 100644
--- a/docs/source/reference/lua-scripting/engine_handlers.rst
+++ b/docs/source/reference/lua-scripting/engine_handlers.rst
@@ -70,23 +70,28 @@ Engine handler is a function defined by a script, that can be called by the engi
   :widths: 20 80
 
   * - onInputUpdate(dt)
-    - | Called every frame (if the game is not paused) right after processing
-      | user input. Use it only for latency-critical stuff.
+    - | Called every frame (if the game is not paused) right after
+      | processing user input. Use it only for latency-critical stuff.
   * - onKeyPress(key)
     - | `Key <openmw_input.html##(KeyboardEvent)>`_ is pressed.
-      | Usage example: ``if key.symbol == 'z' and key.withShift then ...``
+      | Usage example:
+      | ``if key.symbol == 'z' and key.withShift then ...``
   * - onKeyRelease(key)
     - | `Key <openmw_input.html##(KeyboardEvent)>`_ is released.
-      | Usage example: ``if key.symbol == 'z' and key.withShift then ...``
+      | Usage example:
+      | ``if key.symbol == 'z' and key.withShift then ...``
   * - onControllerButtonPress(id)
     - | A `button <openmw_input.html##(CONTROLLER_BUTTON)>`_ on a game controller is pressed.
-      | Usage example: ``if id == input.CONTROLLER_BUTTON.LeftStick then ...``
+      | Usage example:
+      | ``if id == input.CONTROLLER_BUTTON.LeftStick then ...``
   * - onControllerButtonRelease(id)
     - | A `button <openmw_input.html##(CONTROLLER_BUTTON)>`_ on a game controller is released.
-      | Usage example: ``if id == input.CONTROLLER_BUTTON.LeftStick then ...``
+      | Usage example:
+      | ``if id == input.CONTROLLER_BUTTON.LeftStick then ...``
   * - onInputAction(id)
     - | `Game control <openmw_input.html##(ACTION)>`_ is pressed.
-      | Usage example: ``if id == input.ACTION.ToggleWeapon then ...``
+      | Usage example:
+      | ``if id == input.ACTION.ToggleWeapon then ...``
   * - onTouchPress(touchEvent)
     - | A finger pressed on a touch device.
       | `Touch event <openmw_input.html##(TouchEvent)>`_.
@@ -95,4 +100,9 @@ Engine handler is a function defined by a script, that can be called by the engi
       | `Touch event <openmw_input.html##(TouchEvent)>`_.
   * - onTouchMove(touchEvent)
     - | A finger moved on a touch device.
-      | `Touch event <openmw_input.html##(TouchEvent)>`_.
\ No newline at end of file
+      | `Touch event <openmw_input.html##(TouchEvent)>`_.
+  * - | onConsoleCommand(
+      |     mode, command, selectedObject)
+    - | User entered `command` in in-game console. Called if either
+      | `mode` is not default or `command` starts with prefix `lua`.
+
diff --git a/files/builtin_scripts/CMakeLists.txt b/files/builtin_scripts/CMakeLists.txt
index 7afcd7f529..1732270527 100644
--- a/files/builtin_scripts/CMakeLists.txt
+++ b/files/builtin_scripts/CMakeLists.txt
@@ -13,6 +13,9 @@ set(LUA_BUILTIN_FILES
     scripts/omw/camera.lua
     scripts/omw/head_bobbing.lua
     scripts/omw/third_person.lua
+    scripts/omw/console/player.lua
+    scripts/omw/console/global.lua
+    scripts/omw/console/local.lua
 
     l10n/Calendar/en.yaml
 )
diff --git a/files/builtin_scripts/builtin.omwscripts b/files/builtin_scripts/builtin.omwscripts
index 2ffe7007f2..e1fbbcdb7c 100644
--- a/files/builtin_scripts/builtin.omwscripts
+++ b/files/builtin_scripts/builtin.omwscripts
@@ -1,2 +1,5 @@
 PLAYER: scripts/omw/camera.lua
 NPC,CREATURE: scripts/omw/ai.lua
+PLAYER: scripts/omw/console/player.lua
+GLOBAL: scripts/omw/console/global.lua
+CUSTOM: scripts/omw/console/local.lua
diff --git a/files/builtin_scripts/openmw_aux/util.lua b/files/builtin_scripts/openmw_aux/util.lua
index c442178b5e..4832517418 100644
--- a/files/builtin_scripts/openmw_aux/util.lua
+++ b/files/builtin_scripts/openmw_aux/util.lua
@@ -1,4 +1,4 @@
--------------------------------------------------------------------------------
+---
 -- `openmw_aux.util` defines utility functions that are implemented in Lua rather than in C++.
 -- Implementation can be found in `resources/vfs/openmw_aux/util.lua`.
 -- @module util
@@ -6,6 +6,27 @@
 
 local aux_util = {}
 
+---
+-- Works like `tostring` but shows also content of tables.
+-- @function [parent=#util] deepToString
+-- @param #any value The value to conver to string
+-- @param #number maxDepth Max depth of tables unpacking (optional, 2 by default)
+function aux_util.deepToString(val, level, prefix)
+    level = (level or 1) - 1
+    local ok, iter, t = pcall(function() return pairs(val) end)
+    if level < 0 or not ok then
+        return tostring(val)
+    end
+    local prefix = prefix or ''
+    local newPrefix = prefix .. '  '
+    local strs = {tostring(val) .. ' {\n'}
+    for k, v in iter, t do
+        strs[#strs + 1] = newPrefix .. tostring(k) .. ' = ' .. aux_util.deepToString(v, level, newPrefix) .. ',\n'
+    end
+    strs[#strs + 1] = prefix .. '}'
+    return table.concat(strs)
+end
+
 -------------------------------------------------------------------------------
 -- Finds the nearest object to the given point in the given list.
 -- Ignores cells, uses only coordinates. Returns the nearest object,
diff --git a/files/builtin_scripts/scripts/omw/console/global.lua b/files/builtin_scripts/scripts/omw/console/global.lua
new file mode 100644
index 0000000000..e3b4375b1e
--- /dev/null
+++ b/files/builtin_scripts/scripts/omw/console/global.lua
@@ -0,0 +1,81 @@
+local util = require('openmw.util')
+
+local player = nil
+
+local function printToConsole(...)
+    local strs = {}
+    for i = 1, select('#', ...) do
+        strs[i] = tostring(select(i, ...))
+    end
+    player:sendEvent('OMWConsolePrint', table.concat(strs, '\t'))
+end
+
+local function printRes(...)
+    if select('#', ...) >= 0 then
+        printToConsole(...)
+    end
+end
+
+local env = {
+    I = require('openmw.interfaces'),
+    util = require('openmw.util'),
+    storage = require('openmw.storage'),
+    core = require('openmw.core'),
+    types = require('openmw.types'),
+    async = require('openmw.async'),
+    world = require('openmw.world'),
+    aux_util = require('openmw_aux.util'),
+    view = require('openmw_aux.util').deepToString,
+    print = printToConsole,
+    exit = function() player:sendEvent('OMWConsoleExit') end,
+    help = function() player:sendEvent('OMWConsoleHelp') end,
+}
+env._G = env
+setmetatable(env, {__index = _G, __metatable = false})
+_G = nil
+
+local function executeLuaCode(code)
+    local fn
+    local ok, err = pcall(function() fn = util.loadCode('return ' .. code, env) end)
+    if ok then
+        ok, err = pcall(function() printRes(fn()) end)
+    else
+        ok, err = pcall(function() util.loadCode(code, env)() end)
+    end
+    if not ok then
+        player:sendEvent('OMWConsoleError', err)
+    end
+end
+
+return {
+    eventHandlers = {
+        OMWConsoleEval = function(data)
+            player = data.player
+            env.selected = data.selected
+            executeLuaCode(data.code)
+            if env.selected ~= data.selected then
+                local ok, err = pcall(function() player:sendEvent('OMWConsoleSetSelected', env.selected) end)
+                if not ok then player:sendEvent('OMWConsoleError', err) end
+            end
+        end,
+        OMWConsoleStartLocal = function(data)
+            player = data.player
+            ok, err = pcall(function()
+                if not data.selected:hasScript('scripts/omw/console/local.lua') then
+                    data.selected:addScript('scripts/omw/console/local.lua')
+                end
+            end)
+            if ok then
+                player:sendEvent('OMWConsoleSetContext', data.selected)
+            else
+                player:sendEvent('OMWConsoleError', err)
+            end
+        end,
+        OMWConsoleStopLocal = function(obj)
+            if obj:hasScript('scripts/omw/console/local.lua') then
+                obj:removeScript('scripts/omw/console/local.lua')
+            end
+        end,
+    },
+}
+
diff --git a/files/builtin_scripts/scripts/omw/console/local.lua b/files/builtin_scripts/scripts/omw/console/local.lua
new file mode 100644
index 0000000000..adcad3d6cb
--- /dev/null
+++ b/files/builtin_scripts/scripts/omw/console/local.lua
@@ -0,0 +1,71 @@
+local util = require('openmw.util')
+local core = require('openmw.core')
+local self = require('openmw.self')
+
+local player = nil
+
+local function printToConsole(...)
+    local strs = {}
+    for i = 1, select('#', ...) do
+        strs[i] = tostring(select(i, ...))
+    end
+    player:sendEvent('OMWConsolePrint', table.concat(strs, '\t'))
+end
+
+local function printRes(...)
+    if select('#', ...) >= 0 then
+        printToConsole(...)
+    end
+end
+
+local env = {
+    I = require('openmw.interfaces'),
+    util = require('openmw.util'),
+    storage = require('openmw.storage'),
+    core = require('openmw.core'),
+    types = require('openmw.types'),
+    async = require('openmw.async'),
+    nearby = require('openmw.nearby'),
+    self = require('openmw.self'),
+    aux_util = require('openmw_aux.util'),
+    view = require('openmw_aux.util').deepToString,
+    print = printToConsole,
+    exit = function() player:sendEvent('OMWConsoleExit') end,
+    help = function() player:sendEvent('OMWConsoleHelp') end,
+}
+env._G = env
+setmetatable(env, {__index = _G, __metatable = false})
+_G = nil
+
+local function executeLuaCode(code)
+    local fn
+    local ok, err = pcall(function() fn = util.loadCode('return ' .. code, env) end)
+    if ok then
+        ok, err = pcall(function() printRes(fn()) end)
+    else
+        ok, err = pcall(function() util.loadCode(code, env)() end)
+    end
+    if not ok then
+        player:sendEvent('OMWConsoleError', err)
+    end
+end
+
+return {
+    eventHandlers = {
+        OMWConsoleEval = function(data)
+            player = data.player
+            env.selected = data.selected
+            executeLuaCode(data.code)
+            if env.selected ~= data.selected then
+                local ok, err = pcall(function() player:sendEvent('OMWConsoleSetSelected', env.selected) end)
+                if not ok then player:sendEvent('OMWConsoleError', err) end
+            end
+        end,
+    },
+    engineHandlers = {
+        onLoad = function()
+            core.sendGlobalEvent('OMWConsoleStopLocal', self.object)
+        end,
+    }
+}
+
diff --git a/files/builtin_scripts/scripts/omw/console/player.lua b/files/builtin_scripts/scripts/omw/console/player.lua
new file mode 100644
index 0000000000..fd4309b610
--- /dev/null
+++ b/files/builtin_scripts/scripts/omw/console/player.lua
@@ -0,0 +1,158 @@
+local ui = require('openmw.ui')
+local util = require('openmw.util')
+local self = require('openmw.self')
+local core = require('openmw.core')
+
+local function printHelp()
+    local msg = [[
+This is the built-in Lua interpreter.
+help() - print this message
+exit() - exit Lua mode
+selected - currently selected object (click on any object to change)
+view(_G) - print content of the table `_G` (current environment)
+    standard libraries (math, string, etc.) are loaded by default but not visible in `_G`
+view(types, 2) - print table `types` (i.e. `openmw.types`) and its subtables (2 - traversal depth)]]
+    ui.printToConsole(msg, ui.CONSOLE_COLOR.Info)
+end
+
+local function printToConsole(...)
+    local strs = {}
+    for i = 1, select('#', ...) do
+        strs[i] = tostring(select(i, ...))
+    end
+    return ui.printToConsole(table.concat(strs, '\t'), ui.CONSOLE_COLOR.Info)
+end
+
+local function printRes(...)
+    if select('#', ...) >= 0 then
+        printToConsole(...)
+    end
+end
+
+local currentSelf = nil
+local currentMode = ''
+
+local function exitLuaMode()
+    currentSelf = nil
+    currentMode = ''
+    ui.setConsoleMode('')
+    ui.printToConsole('Lua mode OFF', ui.CONSOLE_COLOR.Success)
+end
+
+local function setContext(obj)
+    ui.printToConsole('Lua mode ON, use exit() to return, help() for more info', ui.CONSOLE_COLOR.Success)
+    if obj == self then
+        currentMode = 'Lua[Player]'
+        ui.printToConsole('Context: Player', ui.CONSOLE_COLOR.Success)
+    elseif obj then
+        if not obj:isValid() then error('Object not available') end
+        currentMode = 'Lua['..obj.recordId..']'
+        ui.printToConsole('Context: Local['..tostring(obj)..']', ui.CONSOLE_COLOR.Success)
+    else
+        currentMode = 'Lua[Global]'
+        ui.printToConsole('Context: Global', ui.CONSOLE_COLOR.Success)
+    end
+    currentSelf = obj
+    ui.setConsoleMode(currentMode)
+end
+
+local function setSelected(obj)
+    local ok, err = pcall(function() ui.setConsoleSelectedObject(obj) end)
+    if ok then
+        ui.printToConsole('Selected object changed', ui.CONSOLE_COLOR.Success)
+    else
+        ui.printToConsole(err, ui.CONSOLE_COLOR.Error)
+    end
+end
+
+local env = {
+    I = require('openmw.interfaces'),
+    util = require('openmw.util'),
+    storage = require('openmw.storage'),
+    core = require('openmw.core'),
+    types = require('openmw.types'),
+    async = require('openmw.async'),
+    nearby = require('openmw.nearby'),
+    self = require('openmw.self'),
+    input = require('openmw.input'),
+    ui = require('openmw.ui'),
+    camera = require('openmw.camera'),
+    aux_util = require('openmw_aux.util'),
+    view = require('openmw_aux.util').deepToString,
+    print = printToConsole,
+    exit = exitLuaMode,
+    help = printHelp,
+}
+env._G = env
+setmetatable(env, {__index = _G, __metatable = false})
+_G = nil
+
+local function executeLuaCode(code)
+    local fn
+    local ok, err = pcall(function() fn = util.loadCode('return ' .. code, env) end)
+    if ok then
+        ok, err = pcall(function() printRes(fn()) end)
+    else
+        ok, err = pcall(function() util.loadCode(code, env)() end)
+    end
+    if not ok then
+        ui.printToConsole(err, ui.CONSOLE_COLOR.Error)
+    end
+end
+
+local function onConsoleCommand(mode, cmd, selectedObject)
+    env.selected = selectedObject
+    if mode == '' then
+        cmd, arg = cmd:lower():match('(%w+) *(%w*)')
+        if cmd == 'lua' then
+            if arg == 'player' then
+                cmd = 'luap'
+            elseif arg == 'global' then
+                cmd = 'luag'
+            elseif arg == 'selected' then
+                cmd = 'luas'
+            else
+                local msg = [[
+Usage: 'lua player' or 'luap' - enter player context
+       'lua global' or 'luag' - enter global context
+       'lua selected' or 'luas' - enter local context on the selected object]]
+                ui.printToConsole(msg, ui.CONSOLE_COLOR.Info)
+            end
+        end
+        if cmd == 'luap' or (cmd == 'luas' and selectedObject == self.object) then
+            setContext(self)
+        elseif cmd == 'luag' then
+            setContext()
+        elseif cmd == 'luas' then
+            if selectedObject then
+                core.sendGlobalEvent('OMWConsoleStartLocal', {player=self.object, selected=selectedObject})
+            else
+                ui.printToConsole('No selected object', ui.CONSOLE_COLOR.Error)
+            end
+        end
+    elseif mode == currentMode then
+        if cmd == 'exit()' then
+            exitLuaMode()
+        elseif currentSelf == self then
+            executeLuaCode(cmd)
+            if env.selected ~= selectedObject then setSelected(env.selected) end
+        elseif currentSelf then
+            currentSelf:sendEvent('OMWConsoleEval', {player=self.object, code=cmd, selected=selectedObject})
+        else
+            core.sendGlobalEvent('OMWConsoleEval', {player=self.object, code=cmd, selected=selectedObject})
+        end
+    end
+end
+
+return {
+    engineHandlers = {onConsoleCommand = onConsoleCommand},
+    eventHandlers = {
+        OMWConsolePrint = function(msg) ui.printToConsole(tostring(msg), ui.CONSOLE_COLOR.Info) end,
+        OMWConsoleError = function(msg) ui.printToConsole(tostring(msg), ui.CONSOLE_COLOR.Error) end,
+        OMWConsoleSetContext = setContext,
+        OMWConsoleSetSelected = setSelected,
+        OMWConsoleExit = exitLuaMode,
+        OMWConsoleHelp = printHelp,
+    }
+}
+
diff --git a/files/lua_api/openmw/ui.lua b/files/lua_api/openmw/ui.lua
index 0ef35a61a5..45adbd8508 100644
--- a/files/lua_api/openmw/ui.lua
+++ b/files/lua_api/openmw/ui.lua
@@ -38,6 +38,37 @@
 -- @function [parent=#ui] showMessage
 -- @param #string msg
 
+---
+-- Predefined colors for console output
+-- @field [parent=#ui] #CONSOLE_COLOR CONSOLE_COLOR
+
+---
+-- Predefined colors for console output
+-- @type CONSOLE_COLOR
+-- @field openmw.util#Color Default
+-- @field openmw.util#Color Error
+-- @field openmw.util#Color Success
+-- @field openmw.util#Color Info
+
+---
+-- Print to the in-game console.
+-- @function [parent=#ui] printToConsole
+-- @param #string msg
+-- @param openmw.util#Color color
+
+---
+-- Set mode of the in-game console.
+-- The mode can be any string, by default is empty.
+-- If not empty, then the console doesn't handle mwscript commands and
+-- instead passes user input to Lua scripts via `onConsoleCommand` engine handler.
+-- @function [parent=#ui] setConsoleMode
+-- @param #string mode
+
+---
+-- Set selected object for console.
+-- @function [parent=#ui] setConsoleSelectedObject
+-- @param openmw.core#GameObject obj
+
 ---
 -- Returns the size of the OpenMW window in pixels as a 2D vector.
 -- @function [parent=#ui] screenSize

From e777e354146b42e3791172a281d442d4754d2079 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 21 Apr 2022 22:45:26 +0200
Subject: [PATCH 2332/2859] Use system_clock for time in logs

high_resolution_clock may not give real time. MSVC implements it as
steady_clock that is basically CPU time which is usually desynchronized with
real time.
---
 CHANGELOG.md                   | 1 +
 components/debug/debugging.cpp | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfcce6018d..bcbd47beba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -112,6 +112,7 @@
     Bug #6670: Dialogue order is incorrect
     Bug #6680: object.cpp handles nodetree unsafely, memory access with dangling pointer
     Bug #6682: HitOnMe doesn't fire as intended
+    Bug #6711: Log time differs from real time
     Feature #890: OpenMW-CS: Column filtering
     Feature #1465: "Reset" argument for AI functions
     Feature #2491: Ability to make OpenMW "portable"
diff --git a/components/debug/debugging.cpp b/components/debug/debugging.cpp
index 65589bd6b4..7d94459136 100644
--- a/components/debug/debugging.cpp
+++ b/components/debug/debugging.cpp
@@ -78,11 +78,11 @@ namespace Debug
         int prefixSize;
         {
             prefix[0] = '[';
-            uint64_t ms = std::chrono::duration_cast<std::chrono::milliseconds>(
-                std::chrono::high_resolution_clock::now().time_since_epoch()).count();
-            std::time_t t = ms / 1000;
-            prefixSize = std::strftime(prefix + 1, sizeof(prefix) - 1, "%T", std::localtime(&t)) + 1;
+            const auto now = std::chrono::system_clock::now();
+            const auto time = std::chrono::system_clock::to_time_t(now);
+            prefixSize = std::strftime(prefix + 1, sizeof(prefix) - 1, "%T", std::localtime(&time)) + 1;
             char levelLetter = " EWIVD*"[int(level)];
+            const auto ms = std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()).count();
             prefixSize += snprintf(prefix + prefixSize, sizeof(prefix) - prefixSize,
                                    ".%03u %c] ", static_cast<unsigned>(ms % 1000), levelLetter);
         }

From 9d6d0c6ffb1e98467cea07c48789b35227c8d086 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 14 Apr 2022 17:01:36 +0200
Subject: [PATCH 2333/2859] Move ConstrainedStreamBuf into separate file

---
 components/CMakeLists.txt                     |   2 +-
 components/files/constrainedfilestream.cpp    | 103 +-----------------
 components/files/constrainedfilestream.hpp    |   9 +-
 components/files/constrainedfilestreambuf.cpp |  83 ++++++++++++++
 components/files/constrainedfilestreambuf.hpp |  30 +++++
 5 files changed, 120 insertions(+), 107 deletions(-)
 create mode 100644 components/files/constrainedfilestreambuf.cpp
 create mode 100644 components/files/constrainedfilestreambuf.hpp

diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 57a60322d5..7121bde103 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -206,7 +206,7 @@ IF(NOT WIN32 AND NOT APPLE)
 ENDIF()
 add_component_dir (files
     linuxpath androidpath windowspath macospath fixedpath multidircollection collections configurationmanager
-    lowlevelfile constrainedfilestream memorystream hash configfileparser openfile
+    lowlevelfile constrainedfilestream memorystream hash configfileparser openfile constrainedfilestreambuf
     )
 
 add_component_dir (compiler
diff --git a/components/files/constrainedfilestream.cpp b/components/files/constrainedfilestream.cpp
index 0beaf5facc..aafcacba74 100644
--- a/components/files/constrainedfilestream.cpp
+++ b/components/files/constrainedfilestream.cpp
@@ -1,109 +1,8 @@
 #include "constrainedfilestream.hpp"
 
-#include <streambuf>
-#include <algorithm>
-
-#include "lowlevelfile.hpp"
-
-namespace
-{
-// somewhat arbitrary though 64KB buffers didn't seem to improve performance any
-const size_t sBufferSize = 8192;
-}
-
 namespace Files
 {
-    class ConstrainedFileStreamBuf : public std::streambuf
-    {
-
-        size_t mOrigin;
-        size_t mSize;
-
-        LowLevelFile mFile;
-
-        char mBuffer[sBufferSize]{0};
-
-    public:
-        ConstrainedFileStreamBuf(const std::string &fname, size_t start, size_t length)
-        {
-            mFile.open (fname.c_str ());
-            mSize  = length != std::numeric_limits<std::size_t>::max() ? length : mFile.size () - start;
-
-            if (start != 0)
-                mFile.seek(start);
-
-            setg(nullptr,nullptr,nullptr);
-
-            mOrigin = start;
-        }
-
-        int_type underflow() override
-        {
-            if(gptr() == egptr())
-            {
-                size_t toRead = std::min((mOrigin+mSize)-(mFile.tell()), sBufferSize);
-                // Read in the next chunk of data, and set the read pointers on success
-                // Failure will throw exception in LowLevelFile
-                size_t got = mFile.read(mBuffer, toRead);
-                setg(&mBuffer[0], &mBuffer[0], &mBuffer[0]+got);
-            }
-            if(gptr() == egptr())
-                return traits_type::eof();
-
-            return traits_type::to_int_type(*gptr());
-        }
-
-        pos_type seekoff(off_type offset, std::ios_base::seekdir whence, std::ios_base::openmode mode) override
-        {
-            if((mode&std::ios_base::out) || !(mode&std::ios_base::in))
-                return traits_type::eof();
-
-            // new file position, relative to mOrigin
-            size_t newPos;
-            switch (whence)
-            {
-                case std::ios_base::beg:
-                    newPos = offset;
-                    break;
-                case std::ios_base::cur:
-                    newPos = (mFile.tell() - mOrigin - (egptr() - gptr())) + offset;
-                    break;
-                case std::ios_base::end:
-                    newPos = mSize + offset;
-                    break;
-                default:
-                    return traits_type::eof();
-            }
-
-            if (newPos > mSize)
-                return traits_type::eof();
-
-            mFile.seek(mOrigin+newPos);
-
-            // Clear read pointers so underflow() gets called on the next read attempt.
-            setg(nullptr, nullptr, nullptr);
-
-            return newPos;
-        }
-
-        pos_type seekpos(pos_type pos, std::ios_base::openmode mode) override
-        {
-            if((mode&std::ios_base::out) || !(mode&std::ios_base::in))
-                return traits_type::eof();
-
-            if ((size_t)pos > mSize)
-                return traits_type::eof();
-
-            mFile.seek(mOrigin + pos);
-
-            // Clear read pointers so underflow() gets called on the next read attempt.
-            setg(nullptr, nullptr, nullptr);
-            return pos;
-        }
-
-    };
-
-    ConstrainedFileStream::ConstrainedFileStream(std::unique_ptr<std::streambuf> buf)
+    ConstrainedFileStream::ConstrainedFileStream(std::unique_ptr<ConstrainedFileStreamBuf> buf)
         : std::istream(buf.get())
         , mBuf(std::move(buf))
     {
diff --git a/components/files/constrainedfilestream.hpp b/components/files/constrainedfilestream.hpp
index b828f0f6f1..4284705d17 100644
--- a/components/files/constrainedfilestream.hpp
+++ b/components/files/constrainedfilestream.hpp
@@ -1,6 +1,8 @@
 #ifndef OPENMW_CONSTRAINEDFILESTREAM_H
 #define OPENMW_CONSTRAINEDFILESTREAM_H
 
+#include "constrainedfilestreambuf.hpp"
+
 #include <istream>
 #include <memory>
 #include <limits>
@@ -10,14 +12,13 @@ namespace Files
 {
 
 /// A file stream constrained to a specific region in the file, specified by the 'start' and 'length' parameters.
-class ConstrainedFileStream : public std::istream
+class ConstrainedFileStream final : public std::istream
 {
 public:
-    ConstrainedFileStream(std::unique_ptr<std::streambuf> buf);
-    virtual ~ConstrainedFileStream() {};
+    explicit ConstrainedFileStream(std::unique_ptr<ConstrainedFileStreamBuf> buf);
 
 private:
-    std::unique_ptr<std::streambuf> mBuf;
+    std::unique_ptr<ConstrainedFileStreamBuf> mBuf;
 };
 
 typedef std::shared_ptr<std::istream> IStreamPtr;
diff --git a/components/files/constrainedfilestreambuf.cpp b/components/files/constrainedfilestreambuf.cpp
new file mode 100644
index 0000000000..1263523ebe
--- /dev/null
+++ b/components/files/constrainedfilestreambuf.cpp
@@ -0,0 +1,83 @@
+#include "constrainedfilestreambuf.hpp"
+
+#include <algorithm>
+#include <limits>
+
+namespace Files
+{
+    ConstrainedFileStreamBuf::ConstrainedFileStreamBuf(const std::string& fname, std::size_t start, std::size_t length)
+        : mOrigin(start)
+    {
+        mFile.open(fname.c_str());
+        mSize  = length != std::numeric_limits<std::size_t>::max() ? length : mFile.size () - start;
+
+        if (start != 0)
+            mFile.seek(start);
+
+        setg(nullptr, nullptr, nullptr);
+    }
+
+    std::streambuf::int_type ConstrainedFileStreamBuf::underflow()
+    {
+        if (gptr() == egptr())
+        {
+            const std::size_t toRead = std::min((mOrigin + mSize) - (mFile.tell()), sizeof(mBuffer));
+            // Read in the next chunk of data, and set the read pointers on success
+            // Failure will throw exception in LowLevelFile
+            const std::size_t got = mFile.read(mBuffer, toRead);
+            setg(&mBuffer[0], &mBuffer[0], &mBuffer[0] + got);
+        }
+        if (gptr() == egptr())
+            return traits_type::eof();
+
+        return traits_type::to_int_type(*gptr());
+    }
+
+    std::streambuf::pos_type ConstrainedFileStreamBuf::seekoff(off_type offset, std::ios_base::seekdir whence, std::ios_base::openmode mode)
+    {
+        if ((mode & std::ios_base::out) || !(mode & std::ios_base::in))
+            return traits_type::eof();
+
+        // new file position, relative to mOrigin
+        size_t newPos;
+        switch (whence)
+        {
+            case std::ios_base::beg:
+                newPos = offset;
+                break;
+            case std::ios_base::cur:
+                newPos = (mFile.tell() - mOrigin - (egptr() - gptr())) + offset;
+                break;
+            case std::ios_base::end:
+                newPos = mSize + offset;
+                break;
+            default:
+                return traits_type::eof();
+        }
+
+        if (newPos > mSize)
+            return traits_type::eof();
+
+        mFile.seek(mOrigin + newPos);
+
+        // Clear read pointers so underflow() gets called on the next read attempt.
+        setg(nullptr, nullptr, nullptr);
+
+        return newPos;
+    }
+
+    std::streambuf::pos_type ConstrainedFileStreamBuf::seekpos(pos_type pos, std::ios_base::openmode mode)
+    {
+        if ((mode & std::ios_base::out) || !(mode & std::ios_base::in))
+            return traits_type::eof();
+
+        if (static_cast<std::size_t>(pos) > mSize)
+            return traits_type::eof();
+
+        mFile.seek(mOrigin + pos);
+
+        // Clear read pointers so underflow() gets called on the next read attempt.
+        setg(nullptr, nullptr, nullptr);
+        return pos;
+    }
+}
diff --git a/components/files/constrainedfilestreambuf.hpp b/components/files/constrainedfilestreambuf.hpp
new file mode 100644
index 0000000000..46be98c905
--- /dev/null
+++ b/components/files/constrainedfilestreambuf.hpp
@@ -0,0 +1,30 @@
+#ifndef OPENMW_CONSTRAINEDFILESTREAMBUF_H
+#define OPENMW_CONSTRAINEDFILESTREAMBUF_H
+
+#include "lowlevelfile.hpp"
+
+#include <streambuf>
+
+namespace Files
+{
+    /// A file streambuf constrained to a specific region in the file, specified by the 'start' and 'length' parameters.
+    class ConstrainedFileStreamBuf final : public std::streambuf
+    {
+    public:
+        ConstrainedFileStreamBuf(const std::string& fname, std::size_t start, std::size_t length);
+
+        int_type underflow() final;
+
+        pos_type seekoff(off_type offset, std::ios_base::seekdir whence, std::ios_base::openmode mode) final;
+
+        pos_type seekpos(pos_type pos, std::ios_base::openmode mode) final;
+
+    private:
+        std::size_t mOrigin;
+        std::size_t mSize;
+        LowLevelFile mFile;
+        char mBuffer[8192]{0};
+    };
+}
+
+#endif

From c94d8be7bfc0e71f8ee81f8bd4cbf78e00e1bd56 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 15 Apr 2022 01:55:14 +0200
Subject: [PATCH 2334/2859] Add generic StreamWithBuffer owning the underlying
 buffer

---
 components/files/constrainedfilestream.cpp |  6 ------
 components/files/constrainedfilestream.hpp | 10 ++--------
 components/files/streamwithbuffer.hpp      | 23 ++++++++++++++++++++++
 3 files changed, 25 insertions(+), 14 deletions(-)
 create mode 100644 components/files/streamwithbuffer.hpp

diff --git a/components/files/constrainedfilestream.cpp b/components/files/constrainedfilestream.cpp
index aafcacba74..22a85ce808 100644
--- a/components/files/constrainedfilestream.cpp
+++ b/components/files/constrainedfilestream.cpp
@@ -2,12 +2,6 @@
 
 namespace Files
 {
-    ConstrainedFileStream::ConstrainedFileStream(std::unique_ptr<ConstrainedFileStreamBuf> buf)
-        : std::istream(buf.get())
-        , mBuf(std::move(buf))
-    {
-    }
-
     IStreamPtr openConstrainedFileStream(const std::string& filename, std::size_t start, std::size_t length)
     {
         return std::make_shared<ConstrainedFileStream>(std::make_unique<ConstrainedFileStreamBuf>(filename, start, length));
diff --git a/components/files/constrainedfilestream.hpp b/components/files/constrainedfilestream.hpp
index 4284705d17..3acb04d896 100644
--- a/components/files/constrainedfilestream.hpp
+++ b/components/files/constrainedfilestream.hpp
@@ -2,6 +2,7 @@
 #define OPENMW_CONSTRAINEDFILESTREAM_H
 
 #include "constrainedfilestreambuf.hpp"
+#include "streamwithbuffer.hpp"
 
 #include <istream>
 #include <memory>
@@ -12,14 +13,7 @@ namespace Files
 {
 
 /// A file stream constrained to a specific region in the file, specified by the 'start' and 'length' parameters.
-class ConstrainedFileStream final : public std::istream
-{
-public:
-    explicit ConstrainedFileStream(std::unique_ptr<ConstrainedFileStreamBuf> buf);
-
-private:
-    std::unique_ptr<ConstrainedFileStreamBuf> mBuf;
-};
+using ConstrainedFileStream = StreamWithBuffer<ConstrainedFileStreamBuf>;
 
 typedef std::shared_ptr<std::istream> IStreamPtr;
 
diff --git a/components/files/streamwithbuffer.hpp b/components/files/streamwithbuffer.hpp
new file mode 100644
index 0000000000..dfd1a04376
--- /dev/null
+++ b/components/files/streamwithbuffer.hpp
@@ -0,0 +1,23 @@
+#ifndef OPENMW_COMPONENTS_FILES_STREAMWITHBUFFER_H
+#define OPENMW_COMPONENTS_FILES_STREAMWITHBUFFER_H
+
+#include <istream>
+#include <memory>
+
+namespace Files
+{
+    template <class Buffer>
+    class StreamWithBuffer final : public std::istream
+    {
+        public:
+            explicit StreamWithBuffer(std::unique_ptr<Buffer>&& buffer)
+                : std::istream(buffer.get())
+                , mBuffer(std::move(buffer))
+            {}
+
+        private:
+            std::unique_ptr<Buffer> mBuffer;
+    };
+}
+
+#endif

From 94c1d0cced8fc3a0ca3dd280fa78870fec474e8a Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 15 Apr 2022 02:15:39 +0200
Subject: [PATCH 2335/2859] Use unique_ptr to store istream

---
 apps/openmw/mwgui/videowidget.cpp             |  2 +-
 apps/openmw_test_suite/lua/testing_util.hpp   |  2 +-
 components/bsa/compressedbsafile.cpp          |  4 +-
 components/esm/reader.cpp                     | 14 ++---
 components/esm/reader.hpp                     |  2 +-
 components/esm4/reader.cpp                    | 54 +++++++++----------
 components/esm4/reader.hpp                    | 10 ++--
 components/files/constrainedfilestream.cpp    |  2 +-
 components/files/constrainedfilestream.hpp    |  2 +-
 components/fontloader/fontloader.cpp          | 24 ++++-----
 components/nif/niffile.cpp                    |  8 +--
 components/nif/niffile.hpp                    |  4 +-
 components/nif/nifstream.hpp                  |  2 +-
 extern/osg-ffmpeg-videoplayer/videoplayer.cpp |  4 +-
 extern/osg-ffmpeg-videoplayer/videoplayer.hpp |  2 +-
 extern/osg-ffmpeg-videoplayer/videostate.cpp  |  2 +-
 extern/osg-ffmpeg-videoplayer/videostate.hpp  |  4 +-
 17 files changed, 70 insertions(+), 72 deletions(-)

diff --git a/apps/openmw/mwgui/videowidget.cpp b/apps/openmw/mwgui/videowidget.cpp
index 2aea0018d5..36dd7fd3e2 100644
--- a/apps/openmw/mwgui/videowidget.cpp
+++ b/apps/openmw/mwgui/videowidget.cpp
@@ -44,7 +44,7 @@ void VideoWidget::playVideo(const std::string &video)
         return;
     }
 
-    mPlayer->playVideo(videoStream, video);
+    mPlayer->playVideo(std::move(videoStream), video);
 
     osg::ref_ptr<osg::Texture2D> texture = mPlayer->getVideoTexture();
     if (!texture)
diff --git a/apps/openmw_test_suite/lua/testing_util.hpp b/apps/openmw_test_suite/lua/testing_util.hpp
index ba4a418bfb..a40314bd0d 100644
--- a/apps/openmw_test_suite/lua/testing_util.hpp
+++ b/apps/openmw_test_suite/lua/testing_util.hpp
@@ -23,7 +23,7 @@ namespace
 
         Files::IStreamPtr open() override
         {
-            return std::make_shared<std::stringstream>(mContent, std::ios_base::in);
+            return std::make_unique<std::stringstream>(mContent, std::ios_base::in);
         }
 
     private:
diff --git a/components/bsa/compressedbsafile.cpp b/components/bsa/compressedbsafile.cpp
index a3f3c08864..e4117a0b89 100644
--- a/components/bsa/compressedbsafile.cpp
+++ b/components/bsa/compressedbsafile.cpp
@@ -370,7 +370,7 @@ Files::IStreamPtr CompressedBSAFile::getFile(const FileRecord& fileRecord)
         fileStream->read(reinterpret_cast<char*>(&uncompressedSize), sizeof(uint32_t));
         size -= sizeof(uint32_t);
     }
-    std::shared_ptr<Bsa::MemoryInputStream> memoryStreamPtr = std::make_shared<MemoryInputStream>(uncompressedSize);
+    auto memoryStreamPtr = std::make_unique<MemoryInputStream>(uncompressedSize);
 
     if (compressed)
     {
@@ -403,7 +403,7 @@ Files::IStreamPtr CompressedBSAFile::getFile(const FileRecord& fileRecord)
         fileStream->read(memoryStreamPtr->getRawData(), size);
     }
 
-    return std::shared_ptr<std::istream>(memoryStreamPtr, (std::istream*)memoryStreamPtr.get());
+    return std::make_unique<Files::StreamWithBuffer<MemoryInputStream>>(std::move(memoryStreamPtr));
 }
 
 BsaVersion CompressedBSAFile::detectVersion(const std::string& filePath)
diff --git a/components/esm/reader.cpp b/components/esm/reader.cpp
index d3732abb1e..519c547bb8 100644
--- a/components/esm/reader.cpp
+++ b/components/esm/reader.cpp
@@ -26,7 +26,7 @@ namespace ESM
 
             if (modVer == ESM4::REC_TES4)
             {
-                return new ESM4::Reader(esmStream, filename);
+                return new ESM4::Reader(std::move(esmStream), filename);
             }
             else
             {
@@ -38,15 +38,15 @@ namespace ESM
     }
 
     bool Reader::getStringImpl(std::string& str, std::size_t size,
-            Files::IStreamPtr filestream, ToUTF8::StatelessUtf8Encoder* encoder, bool hasNull)
+            std::istream& stream, ToUTF8::StatelessUtf8Encoder* encoder, bool hasNull)
     {
         std::size_t newSize = size;
 
         if (encoder)
         {
             std::string input(size, '\0');
-            filestream->read(input.data(), size);
-            if (filestream->gcount() == static_cast<std::streamsize>(size))
+            stream.read(input.data(), size);
+            if (stream.gcount() == static_cast<std::streamsize>(size))
             {
                 encoder->getUtf8(input, ToUTF8::BufferAllocationPolicy::FitToRequiredSize, str);
                 return true;
@@ -58,13 +58,13 @@ namespace ESM
                 newSize -= 1; // don't read the null terminator yet
 
             str.resize(newSize); // assumed C++11
-            filestream->read(&str[0], newSize);
-            if ((std::size_t)filestream->gcount() == newSize)
+            stream.read(&str[0], newSize);
+            if (static_cast<std::size_t>(stream.gcount()) == newSize)
             {
                 if (hasNull)
                 {
                     char ch;
-                    filestream->read(&ch, 1); // read the null terminator
+                    stream.read(&ch, 1); // read the null terminator
                     assert (ch == '\0'
                             && "ESM4::Reader::getString string is not terminated with a null");
                 }
diff --git a/components/esm/reader.hpp b/components/esm/reader.hpp
index 5356d9bd01..ffc416dc18 100644
--- a/components/esm/reader.hpp
+++ b/components/esm/reader.hpp
@@ -53,7 +53,7 @@ namespace ESM
 
     protected:
         bool getStringImpl(std::string& str, std::size_t size,
-                Files::IStreamPtr filestream, ToUTF8::StatelessUtf8Encoder* encoder, bool hasNull = false);
+                std::istream& stream, ToUTF8::StatelessUtf8Encoder* encoder, bool hasNull = false);
     };
 }
 
diff --git a/components/esm4/reader.cpp b/components/esm4/reader.cpp
index 1a8fff789a..ce7ede2bf4 100644
--- a/components/esm4/reader.cpp
+++ b/components/esm4/reader.cpp
@@ -64,8 +64,8 @@ ReaderContext::ReaderContext() : modIndex(0), recHeaderSize(sizeof(RecordHeader)
     currCellGrid.grid.y = 0;
 }
 
-Reader::Reader(Files::IStreamPtr esmStream, const std::string& filename)
-    : mEncoder(nullptr), mFileSize(0), mStream(esmStream)
+Reader::Reader(Files::IStreamPtr&& esmStream, const std::string& filename)
+    : mEncoder(nullptr), mFileSize(0), mStream(std::move(esmStream))
 {
     // used by ESMReader only?
     mCtx.filename = filename;
@@ -130,8 +130,7 @@ bool Reader::restoreContext(const ReaderContext& ctx)
 {
     if (mSavedStream) // TODO: doesn't seem to ever happen
     {
-        mStream = mSavedStream;
-        mSavedStream.reset();
+        mStream = std::move(mSavedStream);
     }
 
     mCtx.groupStack.clear(); // probably not necessary since it will be overwritten
@@ -148,11 +147,11 @@ void Reader::close()
     //mHeader.blank();
 }
 
-void Reader::openRaw(Files::IStreamPtr esmStream, const std::string& filename)
+void Reader::openRaw(Files::IStreamPtr&& stream, const std::string& filename)
 {
     close();
 
-    mStream = esmStream;
+    mStream = std::move(stream);
     mCtx.filename = filename;
     mCtx.fileRead = 0;
     mStream->seekg(0, mStream->end);
@@ -161,9 +160,9 @@ void Reader::openRaw(Files::IStreamPtr esmStream, const std::string& filename)
 
 }
 
-void Reader::open(Files::IStreamPtr esmStream, const std::string &filename)
+void Reader::open(Files::IStreamPtr&& stream, const std::string &filename)
 {
-    openRaw(esmStream, filename);
+    openRaw(std::move(stream), filename);
 
     // should at least have the size of ESM3 record header (20 or 24 bytes for ESM4)
     assert (mFileSize >= 16);
@@ -210,32 +209,33 @@ void Reader::buildLStringIndex(const std::string& stringFile, LocalizedStringTyp
     sp.type = stringType;
 
     // TODO: possibly check if the resource exists?
-    Files::IStreamPtr filestream = Files::IStreamPtr(Files::openConstrainedFileStream(stringFile));
+    Files::IStreamPtr filestream = Files::openConstrainedFileStream(stringFile);
 
     filestream->seekg(0, std::ios::end);
     std::size_t fileSize = filestream->tellg();
     filestream->seekg(0, std::ios::beg);
 
+    std::istream* stream = filestream.get();
     switch (stringType)
     {
-        case Type_Strings:   mStrings =   filestream; break;
-        case Type_ILStrings: mILStrings = filestream; break;
-        case Type_DLStrings: mDLStrings = filestream; break;
+        case Type_Strings:   mStrings =   std::move(filestream); break;
+        case Type_ILStrings: mILStrings = std::move(filestream); break;
+        case Type_DLStrings: mDLStrings = std::move(filestream); break;
         default:
             throw std::runtime_error("ESM4::Reader::unknown localised string type");
     }
 
-    filestream->read((char*)&numEntries, sizeof(numEntries));
-    filestream->read((char*)&dataSize, sizeof(dataSize));
+    stream->read((char*)&numEntries, sizeof(numEntries));
+    stream->read((char*)&dataSize, sizeof(dataSize));
     std::size_t dataStart = fileSize - dataSize;
     for (unsigned int i = 0; i < numEntries; ++i)
     {
-        filestream->read((char*)&stringId, sizeof(stringId));
-        filestream->read((char*)&sp.offset, sizeof(sp.offset));
+        stream->read((char*)&stringId, sizeof(stringId));
+        stream->read((char*)&sp.offset, sizeof(sp.offset));
         sp.offset += (std::uint32_t)dataStart;
         mLStringIndex[stringId] = sp;
     }
-    //assert (dataStart - filestream->tell() == 0 && "String file start of data section mismatch");
+    //assert (dataStart - stream->tell() == 0 && "String file start of data section mismatch");
 }
 
 void Reader::getLocalizedString(std::string& str)
@@ -256,13 +256,13 @@ void Reader::getLocalizedStringImpl(const FormId stringId, std::string& str)
 
     if (it != mLStringIndex.end())
     {
-        Files::IStreamPtr filestream;
+        std::istream* filestream = nullptr;
 
         switch (it->second.type)
         {
             case Type_Strings: // no string size provided
             {
-                filestream = mStrings;
+                filestream = mStrings.get();
                 filestream->seekg(it->second.offset);
 
                 char ch;
@@ -275,8 +275,8 @@ void Reader::getLocalizedStringImpl(const FormId stringId, std::string& str)
                 str = std::string(data.data());
                 return;
             }
-            case Type_ILStrings: filestream = mILStrings; break;
-            case Type_DLStrings: filestream = mDLStrings; break;
+            case Type_ILStrings: filestream = mILStrings.get(); break;
+            case Type_DLStrings: filestream = mDLStrings.get(); break;
             default:
                 throw std::runtime_error("ESM4::Reader::getLocalizedString unknown string type");
         }
@@ -285,7 +285,7 @@ void Reader::getLocalizedStringImpl(const FormId stringId, std::string& str)
         filestream->seekg(it->second.offset);
         std::uint32_t size = 0;
         filestream->read((char*)&size, sizeof(size));
-        getStringImpl(str, size, filestream, mEncoder, true); // expect null terminated string
+        getStringImpl(str, size, *filestream, mEncoder, true); // expect null terminated string
     }
     else
         throw std::runtime_error("ESM4::Reader::getLocalizedString localized string not found");
@@ -296,8 +296,7 @@ bool Reader::getRecordHeader()
     // FIXME: this seems very hacky but we may have skipped subrecords from within an inflated data block
     if (/*mStream->eof() && */mSavedStream)
     {
-        mStream = mSavedStream;
-        mSavedStream.reset();
+        mStream = std::move(mSavedStream);
     }
 
     mStream->read((char*)&mCtx.recordHeader, mCtx.recHeaderSize);
@@ -336,12 +335,11 @@ void Reader::getRecordData(bool dump)
         Bsa::MemoryInputStream compressedRecord(recordSize);
         mStream->read(compressedRecord.getRawData(), recordSize);
         std::istream *fileStream = (std::istream*)&compressedRecord;
-        mSavedStream = mStream;
+        mSavedStream = std::move(mStream);
 
         mCtx.recordHeader.record.dataSize = uncompressedSize - sizeof(uncompressedSize);
 
-        std::shared_ptr<Bsa::MemoryInputStream> memoryStreamPtr
-            = std::make_shared<Bsa::MemoryInputStream>(uncompressedSize);
+        auto memoryStreamPtr = std::make_unique<Bsa::MemoryInputStream>(uncompressedSize);
 
         boost::iostreams::filtering_streambuf<boost::iostreams::input> inputStreamBuf;
         inputStreamBuf.push(boost::iostreams::zlib_decompressor());
@@ -370,7 +368,7 @@ if (dump)
         std::cout << ss.str() << std::endl;
 }
 //#endif
-        mStream = std::shared_ptr<std::istream>(memoryStreamPtr, (std::istream*)memoryStreamPtr.get());
+        mStream = std::make_unique<Files::StreamWithBuffer<Bsa::MemoryInputStream>>(std::move(memoryStreamPtr));
     }
 }
 
diff --git a/components/esm4/reader.hpp b/components/esm4/reader.hpp
index 60676b116b..68d5b9eb04 100644
--- a/components/esm4/reader.hpp
+++ b/components/esm4/reader.hpp
@@ -114,17 +114,17 @@ namespace ESM4 {
         //void close();
 
         // Raw opening. Opens the file and sets everything up but doesn't parse the header.
-        void openRaw(Files::IStreamPtr esmStream, const std::string& filename);
+        void openRaw(Files::IStreamPtr&& stream, const std::string& filename);
 
         // Load ES file from a new stream, parses the header.
         // Closes the currently open file first, if any.
-        void open(Files::IStreamPtr esmStream, const std::string& filename);
+        void open(Files::IStreamPtr&& stream, const std::string& filename);
 
         Reader() = default;
 
     public:
 
-        Reader(Files::IStreamPtr esmStream, const std::string& filename);
+        Reader(Files::IStreamPtr&& esmStream, const std::string& filename);
         ~Reader();
 
         // FIXME: should be private but ESMTool uses it
@@ -280,10 +280,10 @@ namespace ESM4 {
 
         // Note: uses the string size from the subrecord header rather than checking null termination
         bool getZString(std::string& str) {
-            return getStringImpl(str, mCtx.subRecordHeader.dataSize, mStream, mEncoder, true);
+            return getStringImpl(str, mCtx.subRecordHeader.dataSize, *mStream, mEncoder, true);
         }
         bool getString(std::string& str) {
-            return getStringImpl(str, mCtx.subRecordHeader.dataSize, mStream, mEncoder);
+            return getStringImpl(str, mCtx.subRecordHeader.dataSize, *mStream, mEncoder);
         }
 
         void enterGroup();
diff --git a/components/files/constrainedfilestream.cpp b/components/files/constrainedfilestream.cpp
index 22a85ce808..a56ae01aa0 100644
--- a/components/files/constrainedfilestream.cpp
+++ b/components/files/constrainedfilestream.cpp
@@ -4,6 +4,6 @@ namespace Files
 {
     IStreamPtr openConstrainedFileStream(const std::string& filename, std::size_t start, std::size_t length)
     {
-        return std::make_shared<ConstrainedFileStream>(std::make_unique<ConstrainedFileStreamBuf>(filename, start, length));
+        return std::make_unique<ConstrainedFileStream>(std::make_unique<ConstrainedFileStreamBuf>(filename, start, length));
     }
 }
diff --git a/components/files/constrainedfilestream.hpp b/components/files/constrainedfilestream.hpp
index 3acb04d896..bed4242ec4 100644
--- a/components/files/constrainedfilestream.hpp
+++ b/components/files/constrainedfilestream.hpp
@@ -15,7 +15,7 @@ namespace Files
 /// A file stream constrained to a specific region in the file, specified by the 'start' and 'length' parameters.
 using ConstrainedFileStream = StreamWithBuffer<ConstrainedFileStreamBuf>;
 
-typedef std::shared_ptr<std::istream> IStreamPtr;
+typedef std::unique_ptr<std::istream> IStreamPtr;
 
 IStreamPtr openConstrainedFileStream(const std::string& filename, std::size_t start = 0,
     std::size_t length = std::numeric_limits<std::size_t>::max());
diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index d0125398f1..b67283d01f 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -137,12 +137,12 @@ namespace
         }
     }
 
-    [[noreturn]] void fail (Files::IStreamPtr file, const std::string& fileName, const std::string& message)
+    [[noreturn]] void fail(std::istream& stream, const std::string& fileName, const std::string& message)
     {
         std::stringstream error;
         error << "Font loading error: " << message;
         error << "\n  File: " << fileName;
-        error << "\n  Offset: 0x" << std::hex << file->tellg();
+        error << "\n  Offset: 0x" << std::hex << stream.tellg();
         throw std::runtime_error(error.str());
     }
 
@@ -252,33 +252,33 @@ namespace Gui
         float fontSize;
         file->read((char*)&fontSize, sizeof(fontSize));
         if (!file->good())
-            fail(file, fileName, "File too small to be a valid font");
+            fail(*file, fileName, "File too small to be a valid font");
 
         int one;
         file->read((char*)&one, sizeof(one));
         if (!file->good())
-            fail(file, fileName, "File too small to be a valid font");
+            fail(*file, fileName, "File too small to be a valid font");
 
         if (one != 1)
-            fail(file, fileName, "Unexpected value");
+            fail(*file, fileName, "Unexpected value");
 
         file->read((char*)&one, sizeof(one));
         if (!file->good())
-            fail(file, fileName, "File too small to be a valid font");
+            fail(*file, fileName, "File too small to be a valid font");
 
         if (one != 1)
-            fail(file, fileName, "Unexpected value");
+            fail(*file, fileName, "Unexpected value");
 
         char name_[284];
         file->read(name_, sizeof(name_));
         if (!file->good())
-            fail(file, fileName, "File too small to be a valid font");
+            fail(*file, fileName, "File too small to be a valid font");
         std::string name(name_);
 
         GlyphInfo data[256];
         file->read((char*)data, sizeof(data));
         if (!file->good())
-            fail(file, fileName, "File too small to be a valid font");
+            fail(*file, fileName, "File too small to be a valid font");
 
         file.reset();
 
@@ -292,16 +292,16 @@ namespace Gui
         bitmapFile->read((char*)&height, sizeof(int));
 
         if (!bitmapFile->good())
-            fail(bitmapFile, bitmapFilename, "File too small to be a valid bitmap");
+            fail(*bitmapFile, bitmapFilename, "File too small to be a valid bitmap");
 
         if (width <= 0 || height <= 0)
-            fail(bitmapFile, bitmapFilename, "Width and height must be positive");
+            fail(*bitmapFile, bitmapFilename, "Width and height must be positive");
 
         std::vector<char> textureData;
         textureData.resize(width*height*4);
         bitmapFile->read(&textureData[0], width*height*4);
         if (!bitmapFile->good())
-            fail(bitmapFile, bitmapFilename, "File too small to be a valid bitmap");
+            fail(*bitmapFile, bitmapFilename, "File too small to be a valid bitmap");
         bitmapFile.reset();
 
         std::string resourceName;
diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index 57d1ce6457..4e0fd5a614 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -12,10 +12,10 @@ namespace Nif
 {
 
 /// Open a NIF stream. The name is used for error messages.
-NIFFile::NIFFile(Files::IStreamPtr stream, const std::string &name)
+NIFFile::NIFFile(Files::IStreamPtr&& stream, const std::string &name)
     : filename(name)
 {
-    parse(stream);
+    parse(std::move(stream));
 }
 
 template <typename NodeType, RecordType recordType>
@@ -170,12 +170,12 @@ std::string NIFFile::printVersion(unsigned int version)
     return stream.str();
 }
 
-void NIFFile::parse(Files::IStreamPtr stream)
+void NIFFile::parse(Files::IStreamPtr&& stream)
 {
     const std::array<std::uint64_t, 2> fileHash = Files::getHash(filename, *stream);
     hash.append(reinterpret_cast<const char*>(fileHash.data()), fileHash.size() * sizeof(std::uint64_t));
 
-    NIFStream nif (this, stream);
+    NIFStream nif (this, std::move(stream));
 
     // Check the header string
     std::string head = nif.getVersionString();
diff --git a/components/nif/niffile.hpp b/components/nif/niffile.hpp
index def2b8870d..aa53f516fd 100644
--- a/components/nif/niffile.hpp
+++ b/components/nif/niffile.hpp
@@ -69,7 +69,7 @@ class NIFFile final : public File
     static std::atomic_bool sLoadUnsupportedFiles;
 
     /// Parse the file
-    void parse(Files::IStreamPtr stream);
+    void parse(Files::IStreamPtr&& stream);
 
     /// Get the file's version in a human readable form
     ///\returns A string containing a human readable NIF version number
@@ -107,7 +107,7 @@ public:
     }
 
     /// Open a NIF stream. The name is used for error messages.
-    NIFFile(Files::IStreamPtr stream, const std::string &name);
+    NIFFile(Files::IStreamPtr&& stream, const std::string &name);
 
     /// Get a given record
     Record *getRecord(size_t index) const override
diff --git a/components/nif/nifstream.hpp b/components/nif/nifstream.hpp
index 04243c2506..04583131b9 100644
--- a/components/nif/nifstream.hpp
+++ b/components/nif/nifstream.hpp
@@ -62,7 +62,7 @@ public:
 
     NIFFile * const file;
 
-    NIFStream (NIFFile * file, Files::IStreamPtr inp): inp (inp), file (file) {}
+    NIFStream (NIFFile * file, Files::IStreamPtr&& inp): inp (std::move(inp)), file (file) {}
 
     void skip(size_t size) { inp->ignore(size); }
 
diff --git a/extern/osg-ffmpeg-videoplayer/videoplayer.cpp b/extern/osg-ffmpeg-videoplayer/videoplayer.cpp
index 28ac3b36c2..e101bd4870 100644
--- a/extern/osg-ffmpeg-videoplayer/videoplayer.cpp
+++ b/extern/osg-ffmpeg-videoplayer/videoplayer.cpp
@@ -27,7 +27,7 @@ void VideoPlayer::setAudioFactory(MovieAudioFactory *factory)
     mAudioFactory.reset(factory);
 }
 
-void VideoPlayer::playVideo(std::shared_ptr<std::istream> inputstream, const std::string& name)
+void VideoPlayer::playVideo(std::unique_ptr<std::istream>&& inputstream, const std::string& name)
 {
     if(mState)
         close();
@@ -35,7 +35,7 @@ void VideoPlayer::playVideo(std::shared_ptr<std::istream> inputstream, const std
     try {
         mState = new VideoState;
         mState->setAudioFactory(mAudioFactory.get());
-        mState->init(inputstream, name);
+        mState->init(std::move(inputstream), name);
 
         // wait until we have the first picture
         while (mState->video_st && !mState->mTexture.get())
diff --git a/extern/osg-ffmpeg-videoplayer/videoplayer.hpp b/extern/osg-ffmpeg-videoplayer/videoplayer.hpp
index 97ef13032d..801f9ab560 100644
--- a/extern/osg-ffmpeg-videoplayer/videoplayer.hpp
+++ b/extern/osg-ffmpeg-videoplayer/videoplayer.hpp
@@ -42,7 +42,7 @@ namespace Video
         /// Play the given video. If a video is already playing, the old video is closed first.
         /// @note The video will be unpaused by default. Use the pause() and play() methods to control pausing.
         /// @param name A name for the video stream - only used for logging purposes.
-        void playVideo (std::shared_ptr<std::istream> inputstream, const std::string& name);
+        void playVideo(std::unique_ptr<std::istream>&& inputstream, const std::string& name);
 
         /// Get the current playback time position in the video, in seconds
         double getCurrentTime();
diff --git a/extern/osg-ffmpeg-videoplayer/videostate.cpp b/extern/osg-ffmpeg-videoplayer/videostate.cpp
index 9b07ece14d..096651dfd8 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.cpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.cpp
@@ -714,7 +714,7 @@ int VideoState::stream_open(int stream_index, AVFormatContext *pFormatCtx)
     return 0;
 }
 
-void VideoState::init(std::shared_ptr<std::istream> inputstream, const std::string &name)
+void VideoState::init(std::unique_ptr<std::istream>&& inputstream, const std::string &name)
 {
     int video_index = -1;
     int audio_index = -1;
diff --git a/extern/osg-ffmpeg-videoplayer/videostate.hpp b/extern/osg-ffmpeg-videoplayer/videostate.hpp
index 8fdbbe64bf..3681a64976 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.hpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.hpp
@@ -128,7 +128,7 @@ struct VideoState {
 
     void setAudioFactory(MovieAudioFactory* factory);
 
-    void init(std::shared_ptr<std::istream> inputstream, const std::string& name);
+    void init(std::unique_ptr<std::istream>&& inputstream, const std::string& name);
     void deinit();
 
     void setPaused(bool isPaused);
@@ -165,7 +165,7 @@ struct VideoState {
 
     ExternalClock mExternalClock;
 
-    std::shared_ptr<std::istream> stream;
+    std::unique_ptr<std::istream> stream;
     AVFormatContext* format_ctx;
     AVCodecContext* video_ctx;
     AVCodecContext* audio_ctx;

From 3abcf3dd0d22c47ae9fa31eb4077b134754c65df Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 12 Apr 2022 23:25:41 +0200
Subject: [PATCH 2336/2859] Fix style guide

---
 components/esm4/reader.hpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/esm4/reader.hpp b/components/esm4/reader.hpp
index 60676b116b..75e002bbea 100644
--- a/components/esm4/reader.hpp
+++ b/components/esm4/reader.hpp
@@ -38,7 +38,8 @@ namespace ESM4 {
     //                                                     v
     typedef std::vector<std::pair<ESM4::GroupTypeHeader, std::uint32_t> > GroupStack;
 
-    struct ReaderContext {
+    struct ReaderContext
+    {
         std::string filename;         // in case we need to reopen to restore the context
         std::uint32_t modIndex;         // the sequential position of this file in the load order:
         //  0x00 reserved, 0xFF in-game (see notes below)

From 761a04ce001ac60f9808d7be7d3485069651c276 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 13 Apr 2022 18:37:22 +0200
Subject: [PATCH 2337/2859] Remove duplicated enum definition

---
 components/esm/common.hpp | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/components/esm/common.hpp b/components/esm/common.hpp
index 3a8894e321..af19572c03 100644
--- a/components/esm/common.hpp
+++ b/components/esm/common.hpp
@@ -40,17 +40,6 @@ namespace ESM
         std::uint64_t size;
     };
 
-    enum VarType
-    {
-        VT_Unknown = 0,
-        VT_None,
-        VT_Short, // stored as a float, kinda
-        VT_Int,
-        VT_Long, // stored as a float
-        VT_Float,
-        VT_String
-    };
-
     std::string printName(const std::uint32_t typeId);
 }
 

From d5fb2f8091e955bacb2c9ba43510a24d40481d70 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 13 Apr 2022 18:41:15 +0200
Subject: [PATCH 2338/2859] Use ESM::fourCC to define ESM4 record types

---
 components/esm4/common.hpp | 1490 ++++++++++++++++++------------------
 1 file changed, 743 insertions(+), 747 deletions(-)

diff --git a/components/esm4/common.hpp b/components/esm4/common.hpp
index 2f769c28c9..b92a48e070 100644
--- a/components/esm4/common.hpp
+++ b/components/esm4/common.hpp
@@ -23,8 +23,6 @@
   from Tes4Mod:Mod_File_Format and Tes5Mod:File_Formats but also refined by
   trial & error.  See http://en.uesp.net/wiki for details.
 
-  MKTAG macro was adapated from ScummVM.
-
 */
 #ifndef ESM4_COMMON_H
 #define ESM4_COMMON_H
@@ -32,780 +30,778 @@
 #include <cstdint>
 #include <string>
 
-#include "formid.hpp"
+#include <components/esm/defs.hpp>
 
-// From ScummVM's endianness.h but for little endian
-#ifndef MKTAG
-#define MKTAG(a0,a1,a2,a3) ((std::uint32_t)((a0) | ((a1) << 8) | ((a2) << 16) | ((a3) << 24)))
-#endif
+#include "formid.hpp"
 
 namespace ESM4
 {
+    using ESM::fourCC;
 
     // Based on http://www.uesp.net/wiki/Tes5Mod:Mod_File_Format
     enum RecordTypes
     {
-        REC_AACT = MKTAG('A','A','C','T'), // Action
-        REC_ACHR = MKTAG('A','C','H','R'), // Actor Reference
-        REC_ACTI = MKTAG('A','C','T','I'), // Activator
-        REC_ADDN = MKTAG('A','D','D','N'), // Addon Node
-        REC_ALCH = MKTAG('A','L','C','H'), // Potion
-        REC_AMMO = MKTAG('A','M','M','O'), // Ammo
-        REC_ANIO = MKTAG('A','N','I','O'), // Animated Object
-        REC_APPA = MKTAG('A','P','P','A'), // Apparatus (probably unused)
-        REC_ARMA = MKTAG('A','R','M','A'), // Armature (Model)
-        REC_ARMO = MKTAG('A','R','M','O'), // Armor
-        REC_ARTO = MKTAG('A','R','T','O'), // Art Object
-        REC_ASPC = MKTAG('A','S','P','C'), // Acoustic Space
-        REC_ASTP = MKTAG('A','S','T','P'), // Association Type
-        REC_AVIF = MKTAG('A','V','I','F'), // Actor Values/Perk Tree Graphics
-        REC_BOOK = MKTAG('B','O','O','K'), // Book
-        REC_BPTD = MKTAG('B','P','T','D'), // Body Part Data
-        REC_CAMS = MKTAG('C','A','M','S'), // Camera Shot
-        REC_CELL = MKTAG('C','E','L','L'), // Cell
-        REC_CLAS = MKTAG('C','L','A','S'), // Class
-        REC_CLFM = MKTAG('C','L','F','M'), // Color
-        REC_CLMT = MKTAG('C','L','M','T'), // Climate
-        REC_CLOT = MKTAG('C','L','O','T'), // Clothing
-        REC_COBJ = MKTAG('C','O','B','J'), // Constructible Object (recipes)
-        REC_COLL = MKTAG('C','O','L','L'), // Collision Layer
-        REC_CONT = MKTAG('C','O','N','T'), // Container
-        REC_CPTH = MKTAG('C','P','T','H'), // Camera Path
-        REC_CREA = MKTAG('C','R','E','A'), // Creature
-        REC_CSTY = MKTAG('C','S','T','Y'), // Combat Style
-        REC_DEBR = MKTAG('D','E','B','R'), // Debris
-        REC_DIAL = MKTAG('D','I','A','L'), // Dialog Topic
-        REC_DLBR = MKTAG('D','L','B','R'), // Dialog Branch
-        REC_DLVW = MKTAG('D','L','V','W'), // Dialog View
-        REC_DOBJ = MKTAG('D','O','B','J'), // Default Object Manager
-        REC_DOOR = MKTAG('D','O','O','R'), // Door
-        REC_DUAL = MKTAG('D','U','A','L'), // Dual Cast Data (possibly unused)
-      //REC_ECZN = MKTAG('E','C','Z','N'), // Encounter Zone
-        REC_EFSH = MKTAG('E','F','S','H'), // Effect Shader
-        REC_ENCH = MKTAG('E','N','C','H'), // Enchantment
-        REC_EQUP = MKTAG('E','Q','U','P'), // Equip Slot (flag-type values)
-        REC_EXPL = MKTAG('E','X','P','L'), // Explosion
-        REC_EYES = MKTAG('E','Y','E','S'), // Eyes
-        REC_FACT = MKTAG('F','A','C','T'), // Faction
-        REC_FLOR = MKTAG('F','L','O','R'), // Flora
-        REC_FLST = MKTAG('F','L','S','T'), // Form List (non-levelled list)
-        REC_FSTP = MKTAG('F','S','T','P'), // Footstep
-        REC_FSTS = MKTAG('F','S','T','S'), // Footstep Set
-        REC_FURN = MKTAG('F','U','R','N'), // Furniture
-        REC_GLOB = MKTAG('G','L','O','B'), // Global Variable
-        REC_GMST = MKTAG('G','M','S','T'), // Game Setting
-        REC_GRAS = MKTAG('G','R','A','S'), // Grass
-        REC_GRUP = MKTAG('G','R','U','P'), // Form Group
-        REC_HAIR = MKTAG('H','A','I','R'), // Hair
-      //REC_HAZD = MKTAG('H','A','Z','D'), // Hazard
-        REC_HDPT = MKTAG('H','D','P','T'), // Head Part
-        REC_IDLE = MKTAG('I','D','L','E'), // Idle Animation
-        REC_IDLM = MKTAG('I','D','L','M'), // Idle Marker
-        REC_IMAD = MKTAG('I','M','A','D'), // Image Space Modifier
-        REC_IMGS = MKTAG('I','M','G','S'), // Image Space
-        REC_INFO = MKTAG('I','N','F','O'), // Dialog Topic Info
-        REC_INGR = MKTAG('I','N','G','R'), // Ingredient
-        REC_IPCT = MKTAG('I','P','C','T'), // Impact Data
-        REC_IPDS = MKTAG('I','P','D','S'), // Impact Data Set
-        REC_KEYM = MKTAG('K','E','Y','M'), // Key
-        REC_KYWD = MKTAG('K','Y','W','D'), // Keyword
-        REC_LAND = MKTAG('L','A','N','D'), // Land
-        REC_LCRT = MKTAG('L','C','R','T'), // Location Reference Type
-        REC_LCTN = MKTAG('L','C','T','N'), // Location
-        REC_LGTM = MKTAG('L','G','T','M'), // Lighting Template
-        REC_LIGH = MKTAG('L','I','G','H'), // Light
-        REC_LSCR = MKTAG('L','S','C','R'), // Load Screen
-        REC_LTEX = MKTAG('L','T','E','X'), // Land Texture
-        REC_LVLC = MKTAG('L','V','L','C'), // Leveled Creature
-        REC_LVLI = MKTAG('L','V','L','I'), // Leveled Item
-        REC_LVLN = MKTAG('L','V','L','N'), // Leveled Actor
-        REC_LVSP = MKTAG('L','V','S','P'), // Leveled Spell
-        REC_MATO = MKTAG('M','A','T','O'), // Material Object
-        REC_MATT = MKTAG('M','A','T','T'), // Material Type
-        REC_MESG = MKTAG('M','E','S','G'), // Message
-        REC_MGEF = MKTAG('M','G','E','F'), // Magic Effect
-        REC_MISC = MKTAG('M','I','S','C'), // Misc. Object
-        REC_MOVT = MKTAG('M','O','V','T'), // Movement Type
-        REC_MSTT = MKTAG('M','S','T','T'), // Movable Static
-        REC_MUSC = MKTAG('M','U','S','C'), // Music Type
-        REC_MUST = MKTAG('M','U','S','T'), // Music Track
-        REC_NAVI = MKTAG('N','A','V','I'), // Navigation (master data)
-        REC_NAVM = MKTAG('N','A','V','M'), // Nav Mesh
-        REC_NOTE = MKTAG('N','O','T','E'), // Note
-        REC_NPC_ = MKTAG('N','P','C','_'), // Actor (NPC, Creature)
-        REC_OTFT = MKTAG('O','T','F','T'), // Outfit
-        REC_PACK = MKTAG('P','A','C','K'), // AI Package
-        REC_PERK = MKTAG('P','E','R','K'), // Perk
-        REC_PGRE = MKTAG('P','G','R','E'), // Placed grenade
-        REC_PHZD = MKTAG('P','H','Z','D'), // Placed hazard
-        REC_PROJ = MKTAG('P','R','O','J'), // Projectile
-        REC_QUST = MKTAG('Q','U','S','T'), // Quest
-        REC_RACE = MKTAG('R','A','C','E'), // Race / Creature type
-        REC_REFR = MKTAG('R','E','F','R'), // Object Reference
-        REC_REGN = MKTAG('R','E','G','N'), // Region (Audio/Weather)
-        REC_RELA = MKTAG('R','E','L','A'), // Relationship
-        REC_REVB = MKTAG('R','E','V','B'), // Reverb Parameters
-        REC_RFCT = MKTAG('R','F','C','T'), // Visual Effect
-        REC_SBSP = MKTAG('S','B','S','P'), // Subspace (TES4 only?)
-        REC_SCEN = MKTAG('S','C','E','N'), // Scene
-        REC_SCPT = MKTAG('S','C','P','T'), // Script
-        REC_SCRL = MKTAG('S','C','R','L'), // Scroll
-        REC_SGST = MKTAG('S','G','S','T'), // Sigil Stone
-        REC_SHOU = MKTAG('S','H','O','U'), // Shout
-        REC_SLGM = MKTAG('S','L','G','M'), // Soul Gem
-        REC_SMBN = MKTAG('S','M','B','N'), // Story Manager Branch Node
-        REC_SMEN = MKTAG('S','M','E','N'), // Story Manager Event Node
-        REC_SMQN = MKTAG('S','M','Q','N'), // Story Manager Quest Node
-        REC_SNCT = MKTAG('S','N','C','T'), // Sound Category
-        REC_SNDR = MKTAG('S','N','D','R'), // Sound Reference
-        REC_SOPM = MKTAG('S','O','P','M'), // Sound Output Model
-        REC_SOUN = MKTAG('S','O','U','N'), // Sound
-        REC_SPEL = MKTAG('S','P','E','L'), // Spell
-        REC_SPGD = MKTAG('S','P','G','D'), // Shader Particle Geometry
-        REC_STAT = MKTAG('S','T','A','T'), // Static
-        REC_TACT = MKTAG('T','A','C','T'), // Talking Activator
-        REC_TERM = MKTAG('T','E','R','M'), // Terminal
-        REC_TES4 = MKTAG('T','E','S','4'), // Plugin info
-        REC_TREE = MKTAG('T','R','E','E'), // Tree
-        REC_TXST = MKTAG('T','X','S','T'), // Texture Set
-        REC_VTYP = MKTAG('V','T','Y','P'), // Voice Type
-        REC_WATR = MKTAG('W','A','T','R'), // Water Type
-        REC_WEAP = MKTAG('W','E','A','P'), // Weapon
-        REC_WOOP = MKTAG('W','O','O','P'), // Word Of Power
-        REC_WRLD = MKTAG('W','R','L','D'), // World Space
-        REC_WTHR = MKTAG('W','T','H','R'), // Weather
-        REC_ACRE = MKTAG('A','C','R','E'), // Placed Creature (TES4 only?)
-        REC_PGRD = MKTAG('P','G','R','D'), // Pathgrid (TES4 only?)
-        REC_ROAD = MKTAG('R','O','A','D'), // Road (TES4 only?)
-        REC_IMOD = MKTAG('I','M','O','D'), // Item Mod
-        REC_PWAT = MKTAG('P','W','A','T'), // Placeable Water
-        REC_SCOL = MKTAG('S','C','O','L'), // Static Collection
-        REC_CCRD = MKTAG('C','C','R','D'), // Caravan Card
-        REC_CMNY = MKTAG('C','M','N','Y'), // Caravan Money
-        REC_ALOC = MKTAG('A','L','O','C'), // Audio Location Controller
-        REC_MSET = MKTAG('M','S','E','T')  // Media Set
+        REC_AACT = fourCC("AACT"), // Action
+        REC_ACHR = fourCC("ACHR"), // Actor Reference
+        REC_ACTI = fourCC("ACTI"), // Activator
+        REC_ADDN = fourCC("ADDN"), // Addon Node
+        REC_ALCH = fourCC("ALCH"), // Potion
+        REC_AMMO = fourCC("AMMO"), // Ammo
+        REC_ANIO = fourCC("ANIO"), // Animated Object
+        REC_APPA = fourCC("APPA"), // Apparatus (probably unused)
+        REC_ARMA = fourCC("ARMA"), // Armature (Model)
+        REC_ARMO = fourCC("ARMO"), // Armor
+        REC_ARTO = fourCC("ARTO"), // Art Object
+        REC_ASPC = fourCC("ASPC"), // Acoustic Space
+        REC_ASTP = fourCC("ASTP"), // Association Type
+        REC_AVIF = fourCC("AVIF"), // Actor Values/Perk Tree Graphics
+        REC_BOOK = fourCC("BOOK"), // Book
+        REC_BPTD = fourCC("BPTD"), // Body Part Data
+        REC_CAMS = fourCC("CAMS"), // Camera Shot
+        REC_CELL = fourCC("CELL"), // Cell
+        REC_CLAS = fourCC("CLAS"), // Class
+        REC_CLFM = fourCC("CLFM"), // Color
+        REC_CLMT = fourCC("CLMT"), // Climate
+        REC_CLOT = fourCC("CLOT"), // Clothing
+        REC_COBJ = fourCC("COBJ"), // Constructible Object (recipes)
+        REC_COLL = fourCC("COLL"), // Collision Layer
+        REC_CONT = fourCC("CONT"), // Container
+        REC_CPTH = fourCC("CPTH"), // Camera Path
+        REC_CREA = fourCC("CREA"), // Creature
+        REC_CSTY = fourCC("CSTY"), // Combat Style
+        REC_DEBR = fourCC("DEBR"), // Debris
+        REC_DIAL = fourCC("DIAL"), // Dialog Topic
+        REC_DLBR = fourCC("DLBR"), // Dialog Branch
+        REC_DLVW = fourCC("DLVW"), // Dialog View
+        REC_DOBJ = fourCC("DOBJ"), // Default Object Manager
+        REC_DOOR = fourCC("DOOR"), // Door
+        REC_DUAL = fourCC("DUAL"), // Dual Cast Data (possibly unused)
+      //REC_ECZN = fourCC("ECZN"), // Encounter Zone
+        REC_EFSH = fourCC("EFSH"), // Effect Shader
+        REC_ENCH = fourCC("ENCH"), // Enchantment
+        REC_EQUP = fourCC("EQUP"), // Equip Slot (flag-type values)
+        REC_EXPL = fourCC("EXPL"), // Explosion
+        REC_EYES = fourCC("EYES"), // Eyes
+        REC_FACT = fourCC("FACT"), // Faction
+        REC_FLOR = fourCC("FLOR"), // Flora
+        REC_FLST = fourCC("FLST"), // Form List (non-levelled list)
+        REC_FSTP = fourCC("FSTP"), // Footstep
+        REC_FSTS = fourCC("FSTS"), // Footstep Set
+        REC_FURN = fourCC("FURN"), // Furniture
+        REC_GLOB = fourCC("GLOB"), // Global Variable
+        REC_GMST = fourCC("GMST"), // Game Setting
+        REC_GRAS = fourCC("GRAS"), // Grass
+        REC_GRUP = fourCC("GRUP"), // Form Group
+        REC_HAIR = fourCC("HAIR"), // Hair
+      //REC_HAZD = fourCC("HAZD"), // Hazard
+        REC_HDPT = fourCC("HDPT"), // Head Part
+        REC_IDLE = fourCC("IDLE"), // Idle Animation
+        REC_IDLM = fourCC("IDLM"), // Idle Marker
+        REC_IMAD = fourCC("IMAD"), // Image Space Modifier
+        REC_IMGS = fourCC("IMGS"), // Image Space
+        REC_INFO = fourCC("INFO"), // Dialog Topic Info
+        REC_INGR = fourCC("INGR"), // Ingredient
+        REC_IPCT = fourCC("IPCT"), // Impact Data
+        REC_IPDS = fourCC("IPDS"), // Impact Data Set
+        REC_KEYM = fourCC("KEYM"), // Key
+        REC_KYWD = fourCC("KYWD"), // Keyword
+        REC_LAND = fourCC("LAND"), // Land
+        REC_LCRT = fourCC("LCRT"), // Location Reference Type
+        REC_LCTN = fourCC("LCTN"), // Location
+        REC_LGTM = fourCC("LGTM"), // Lighting Template
+        REC_LIGH = fourCC("LIGH"), // Light
+        REC_LSCR = fourCC("LSCR"), // Load Screen
+        REC_LTEX = fourCC("LTEX"), // Land Texture
+        REC_LVLC = fourCC("LVLC"), // Leveled Creature
+        REC_LVLI = fourCC("LVLI"), // Leveled Item
+        REC_LVLN = fourCC("LVLN"), // Leveled Actor
+        REC_LVSP = fourCC("LVSP"), // Leveled Spell
+        REC_MATO = fourCC("MATO"), // Material Object
+        REC_MATT = fourCC("MATT"), // Material Type
+        REC_MESG = fourCC("MESG"), // Message
+        REC_MGEF = fourCC("MGEF"), // Magic Effect
+        REC_MISC = fourCC("MISC"), // Misc. Object
+        REC_MOVT = fourCC("MOVT"), // Movement Type
+        REC_MSTT = fourCC("MSTT"), // Movable Static
+        REC_MUSC = fourCC("MUSC"), // Music Type
+        REC_MUST = fourCC("MUST"), // Music Track
+        REC_NAVI = fourCC("NAVI"), // Navigation (master data)
+        REC_NAVM = fourCC("NAVM"), // Nav Mesh
+        REC_NOTE = fourCC("NOTE"), // Note
+        REC_NPC_ = fourCC("NPC_"), // Actor (NPC, Creature)
+        REC_OTFT = fourCC("OTFT"), // Outfit
+        REC_PACK = fourCC("PACK"), // AI Package
+        REC_PERK = fourCC("PERK"), // Perk
+        REC_PGRE = fourCC("PGRE"), // Placed grenade
+        REC_PHZD = fourCC("PHZD"), // Placed hazard
+        REC_PROJ = fourCC("PROJ"), // Projectile
+        REC_QUST = fourCC("QUST"), // Quest
+        REC_RACE = fourCC("RACE"), // Race / Creature type
+        REC_REFR = fourCC("REFR"), // Object Reference
+        REC_REGN = fourCC("REGN"), // Region (Audio/Weather)
+        REC_RELA = fourCC("RELA"), // Relationship
+        REC_REVB = fourCC("REVB"), // Reverb Parameters
+        REC_RFCT = fourCC("RFCT"), // Visual Effect
+        REC_SBSP = fourCC("SBSP"), // Subspace (TES4 only?)
+        REC_SCEN = fourCC("SCEN"), // Scene
+        REC_SCPT = fourCC("SCPT"), // Script
+        REC_SCRL = fourCC("SCRL"), // Scroll
+        REC_SGST = fourCC("SGST"), // Sigil Stone
+        REC_SHOU = fourCC("SHOU"), // Shout
+        REC_SLGM = fourCC("SLGM"), // Soul Gem
+        REC_SMBN = fourCC("SMBN"), // Story Manager Branch Node
+        REC_SMEN = fourCC("SMEN"), // Story Manager Event Node
+        REC_SMQN = fourCC("SMQN"), // Story Manager Quest Node
+        REC_SNCT = fourCC("SNCT"), // Sound Category
+        REC_SNDR = fourCC("SNDR"), // Sound Reference
+        REC_SOPM = fourCC("SOPM"), // Sound Output Model
+        REC_SOUN = fourCC("SOUN"), // Sound
+        REC_SPEL = fourCC("SPEL"), // Spell
+        REC_SPGD = fourCC("SPGD"), // Shader Particle Geometry
+        REC_STAT = fourCC("STAT"), // Static
+        REC_TACT = fourCC("TACT"), // Talking Activator
+        REC_TERM = fourCC("TERM"), // Terminal
+        REC_TES4 = fourCC("TES4"), // Plugin info
+        REC_TREE = fourCC("TREE"), // Tree
+        REC_TXST = fourCC("TXST"), // Texture Set
+        REC_VTYP = fourCC("VTYP"), // Voice Type
+        REC_WATR = fourCC("WATR"), // Water Type
+        REC_WEAP = fourCC("WEAP"), // Weapon
+        REC_WOOP = fourCC("WOOP"), // Word Of Power
+        REC_WRLD = fourCC("WRLD"), // World Space
+        REC_WTHR = fourCC("WTHR"), // Weather
+        REC_ACRE = fourCC("ACRE"), // Placed Creature (TES4 only?)
+        REC_PGRD = fourCC("PGRD"), // Pathgrid (TES4 only?)
+        REC_ROAD = fourCC("ROAD"), // Road (TES4 only?)
+        REC_IMOD = fourCC("IMOD"), // Item Mod
+        REC_PWAT = fourCC("PWAT"), // Placeable Water
+        REC_SCOL = fourCC("SCOL"), // Static Collection
+        REC_CCRD = fourCC("CCRD"), // Caravan Card
+        REC_CMNY = fourCC("CMNY"), // Caravan Money
+        REC_ALOC = fourCC("ALOC"), // Audio Location Controller
+        REC_MSET = fourCC("MSET")  // Media Set
     };
 
     enum SubRecordTypes
     {
-        SUB_HEDR = MKTAG('H','E','D','R'),
-        SUB_CNAM = MKTAG('C','N','A','M'),
-        SUB_SNAM = MKTAG('S','N','A','M'), // TES4 only?
-        SUB_MAST = MKTAG('M','A','S','T'),
-        SUB_DATA = MKTAG('D','A','T','A'),
-        SUB_ONAM = MKTAG('O','N','A','M'),
-        SUB_INTV = MKTAG('I','N','T','V'),
-        SUB_INCC = MKTAG('I','N','C','C'),
-        SUB_OFST = MKTAG('O','F','S','T'), // TES4 only?
-        SUB_DELE = MKTAG('D','E','L','E'), // TES4 only?
-
-        SUB_DNAM = MKTAG('D','N','A','M'),
-        SUB_EDID = MKTAG('E','D','I','D'),
-        SUB_FULL = MKTAG('F','U','L','L'),
-        SUB_LTMP = MKTAG('L','T','M','P'),
-        SUB_MHDT = MKTAG('M','H','D','T'),
-        SUB_MNAM = MKTAG('M','N','A','M'),
-        SUB_MODL = MKTAG('M','O','D','L'),
-        SUB_NAM0 = MKTAG('N','A','M','0'),
-        SUB_NAM2 = MKTAG('N','A','M','2'),
-        SUB_NAM3 = MKTAG('N','A','M','3'),
-        SUB_NAM4 = MKTAG('N','A','M','4'),
-        SUB_NAM9 = MKTAG('N','A','M','9'),
-        SUB_NAMA = MKTAG('N','A','M','A'),
-        SUB_PNAM = MKTAG('P','N','A','M'),
-        SUB_RNAM = MKTAG('R','N','A','M'),
-        SUB_TNAM = MKTAG('T','N','A','M'),
-        SUB_UNAM = MKTAG('U','N','A','M'),
-        SUB_WCTR = MKTAG('W','C','T','R'),
-        SUB_WNAM = MKTAG('W','N','A','M'),
-        SUB_XEZN = MKTAG('X','E','Z','N'),
-        SUB_XLCN = MKTAG('X','L','C','N'),
-        SUB_XXXX = MKTAG('X','X','X','X'),
-        SUB_ZNAM = MKTAG('Z','N','A','M'),
-        SUB_MODT = MKTAG('M','O','D','T'),
-        SUB_ICON = MKTAG('I','C','O','N'), // TES4 only?
-
-        SUB_NVER = MKTAG('N','V','E','R'),
-        SUB_NVMI = MKTAG('N','V','M','I'),
-        SUB_NVPP = MKTAG('N','V','P','P'),
-        SUB_NVSI = MKTAG('N','V','S','I'),
-
-        SUB_NVNM = MKTAG('N','V','N','M'),
-        SUB_NNAM = MKTAG('N','N','A','M'),
-
-        SUB_XCLC = MKTAG('X','C','L','C'),
-        SUB_XCLL = MKTAG('X','C','L','L'),
-        SUB_TVDT = MKTAG('T','V','D','T'),
-        SUB_XCGD = MKTAG('X','C','G','D'),
-        SUB_LNAM = MKTAG('L','N','A','M'),
-        SUB_XCLW = MKTAG('X','C','L','W'),
-        SUB_XNAM = MKTAG('X','N','A','M'),
-        SUB_XCLR = MKTAG('X','C','L','R'),
-        SUB_XWCS = MKTAG('X','W','C','S'),
-        SUB_XWCN = MKTAG('X','W','C','N'),
-        SUB_XWCU = MKTAG('X','W','C','U'),
-        SUB_XCWT = MKTAG('X','C','W','T'),
-        SUB_XOWN = MKTAG('X','O','W','N'),
-        SUB_XILL = MKTAG('X','I','L','L'),
-        SUB_XWEM = MKTAG('X','W','E','M'),
-        SUB_XCCM = MKTAG('X','C','C','M'),
-        SUB_XCAS = MKTAG('X','C','A','S'),
-        SUB_XCMO = MKTAG('X','C','M','O'),
-        SUB_XCIM = MKTAG('X','C','I','M'),
-        SUB_XCMT = MKTAG('X','C','M','T'), // TES4 only?
-        SUB_XRNK = MKTAG('X','R','N','K'), // TES4 only?
-        SUB_XGLB = MKTAG('X','G','L','B'), // TES4 only?
-
-        SUB_VNML = MKTAG('V','N','M','L'),
-        SUB_VHGT = MKTAG('V','H','G','T'),
-        SUB_VCLR = MKTAG('V','C','L','R'),
-        SUA_BTXT = MKTAG('B','T','X','T'),
-        SUB_ATXT = MKTAG('A','T','X','T'),
-        SUB_VTXT = MKTAG('V','T','X','T'),
-        SUB_VTEX = MKTAG('V','T','E','X'),
-
-        SUB_HNAM = MKTAG('H','N','A','M'),
-        SUB_GNAM = MKTAG('G','N','A','M'),
-
-        SUB_RCLR = MKTAG('R','C','L','R'),
-        SUB_RPLI = MKTAG('R','P','L','I'),
-        SUB_RPLD = MKTAG('R','P','L','D'),
-        SUB_RDAT = MKTAG('R','D','A','T'),
-        SUB_RDMD = MKTAG('R','D','M','D'), // TES4 only?
-        SUB_RDSD = MKTAG('R','D','S','D'), // TES4 only?
-        SUB_RDGS = MKTAG('R','D','G','S'), // TES4 only?
-        SUB_RDMO = MKTAG('R','D','M','O'),
-        SUB_RDSA = MKTAG('R','D','S','A'),
-        SUB_RDWT = MKTAG('R','D','W','T'),
-        SUB_RDOT = MKTAG('R','D','O','T'),
-        SUB_RDMP = MKTAG('R','D','M','P'),
-
-        SUB_MODB = MKTAG('M','O','D','B'),
-        SUB_OBND = MKTAG('O','B','N','D'),
-        SUB_MODS = MKTAG('M','O','D','S'),
-
-        SUB_NAME = MKTAG('N','A','M','E'),
-        SUB_XMRK = MKTAG('X','M','R','K'),
-        SUB_FNAM = MKTAG('F','N','A','M'),
-        SUB_XSCL = MKTAG('X','S','C','L'),
-        SUB_XTEL = MKTAG('X','T','E','L'),
-        SUB_XTRG = MKTAG('X','T','R','G'),
-        SUB_XSED = MKTAG('X','S','E','D'),
-        SUB_XLOD = MKTAG('X','L','O','D'),
-        SUB_XPCI = MKTAG('X','P','C','I'),
-        SUB_XLOC = MKTAG('X','L','O','C'),
-        SUB_XESP = MKTAG('X','E','S','P'),
-        SUB_XLCM = MKTAG('X','L','C','M'),
-        SUB_XRTM = MKTAG('X','R','T','M'),
-        SUB_XACT = MKTAG('X','A','C','T'),
-        SUB_XCNT = MKTAG('X','C','N','T'),
-        SUB_VMAD = MKTAG('V','M','A','D'),
-        SUB_XPRM = MKTAG('X','P','R','M'),
-        SUB_XMBO = MKTAG('X','M','B','O'),
-        SUB_XPOD = MKTAG('X','P','O','D'),
-        SUB_XRMR = MKTAG('X','R','M','R'),
-        SUB_INAM = MKTAG('I','N','A','M'),
-        SUB_SCHR = MKTAG('S','C','H','R'),
-        SUB_XLRM = MKTAG('X','L','R','M'),
-        SUB_XRGD = MKTAG('X','R','G','D'),
-        SUB_XRDS = MKTAG('X','R','D','S'),
-        SUB_XEMI = MKTAG('X','E','M','I'),
-        SUB_XLIG = MKTAG('X','L','I','G'),
-        SUB_XALP = MKTAG('X','A','L','P'),
-        SUB_XNDP = MKTAG('X','N','D','P'),
-        SUB_XAPD = MKTAG('X','A','P','D'),
-        SUB_XAPR = MKTAG('X','A','P','R'),
-        SUB_XLIB = MKTAG('X','L','I','B'),
-        SUB_XLKR = MKTAG('X','L','K','R'),
-        SUB_XLRT = MKTAG('X','L','R','T'),
-        SUB_XCVL = MKTAG('X','C','V','L'),
-        SUB_XCVR = MKTAG('X','C','V','R'),
-        SUB_XCZA = MKTAG('X','C','Z','A'),
-        SUB_XCZC = MKTAG('X','C','Z','C'),
-        SUB_XFVC = MKTAG('X','F','V','C'),
-        SUB_XHTW = MKTAG('X','H','T','W'),
-        SUB_XIS2 = MKTAG('X','I','S','2'),
-        SUB_XMBR = MKTAG('X','M','B','R'),
-        SUB_XCCP = MKTAG('X','C','C','P'),
-        SUB_XPWR = MKTAG('X','P','W','R'),
-        SUB_XTRI = MKTAG('X','T','R','I'),
-        SUB_XATR = MKTAG('X','A','T','R'),
-        SUB_XPRD = MKTAG('X','P','R','D'),
-        SUB_XPPA = MKTAG('X','P','P','A'),
-        SUB_PDTO = MKTAG('P','D','T','O'),
-        SUB_XLRL = MKTAG('X','L','R','L'),
-
-        SUB_QNAM = MKTAG('Q','N','A','M'),
-        SUB_COCT = MKTAG('C','O','C','T'),
-        SUB_COED = MKTAG('C','O','E','D'),
-        SUB_CNTO = MKTAG('C','N','T','O'),
-        SUB_SCRI = MKTAG('S','C','R','I'),
-
-        SUB_BNAM = MKTAG('B','N','A','M'),
-
-        SUB_BMDT = MKTAG('B','M','D','T'),
-        SUB_MOD2 = MKTAG('M','O','D','2'),
-        SUB_MOD3 = MKTAG('M','O','D','3'),
-        SUB_MOD4 = MKTAG('M','O','D','4'),
-        SUB_MO2B = MKTAG('M','O','2','B'),
-        SUB_MO3B = MKTAG('M','O','3','B'),
-        SUB_MO4B = MKTAG('M','O','4','B'),
-        SUB_MO2T = MKTAG('M','O','2','T'),
-        SUB_MO3T = MKTAG('M','O','3','T'),
-        SUB_MO4T = MKTAG('M','O','4','T'),
-        SUB_ANAM = MKTAG('A','N','A','M'),
-        SUB_ENAM = MKTAG('E','N','A','M'),
-        SUB_ICO2 = MKTAG('I','C','O','2'),
-
-        SUB_ACBS = MKTAG('A','C','B','S'),
-        SUB_SPLO = MKTAG('S','P','L','O'),
-        SUB_AIDT = MKTAG('A','I','D','T'),
-        SUB_PKID = MKTAG('P','K','I','D'),
-        SUB_HCLR = MKTAG('H','C','L','R'),
-        SUB_FGGS = MKTAG('F','G','G','S'),
-        SUB_FGGA = MKTAG('F','G','G','A'),
-        SUB_FGTS = MKTAG('F','G','T','S'),
-        SUB_KFFZ = MKTAG('K','F','F','Z'),
-
-        SUB_PFIG = MKTAG('P','F','I','G'),
-        SUB_PFPC = MKTAG('P','F','P','C'),
-
-        SUB_XHRS = MKTAG('X','H','R','S'),
-        SUB_XMRC = MKTAG('X','M','R','C'),
-
-        SUB_SNDD = MKTAG('S','N','D','D'),
-        SUB_SNDX = MKTAG('S','N','D','X'),
-
-        SUB_DESC = MKTAG('D','E','S','C'),
-
-        SUB_ENIT = MKTAG('E','N','I','T'),
-        SUB_EFID = MKTAG('E','F','I','D'),
-        SUB_EFIT = MKTAG('E','F','I','T'),
-        SUB_SCIT = MKTAG('S','C','I','T'),
-
-        SUB_SOUL = MKTAG('S','O','U','L'),
-        SUB_SLCP = MKTAG('S','L','C','P'),
-
-        SUB_CSCR = MKTAG('C','S','C','R'),
-        SUB_CSDI = MKTAG('C','S','D','I'),
-        SUB_CSDC = MKTAG('C','S','D','C'),
-        SUB_NIFZ = MKTAG('N','I','F','Z'),
-        SUB_CSDT = MKTAG('C','S','D','T'),
-        SUB_NAM1 = MKTAG('N','A','M','1'),
-        SUB_NIFT = MKTAG('N','I','F','T'),
-
-        SUB_LVLD = MKTAG('L','V','L','D'),
-        SUB_LVLF = MKTAG('L','V','L','F'),
-        SUB_LVLO = MKTAG('L','V','L','O'),
-
-        SUB_BODT = MKTAG('B','O','D','T'),
-        SUB_YNAM = MKTAG('Y','N','A','M'),
-        SUB_DEST = MKTAG('D','E','S','T'),
-        SUB_DMDL = MKTAG('D','M','D','L'),
-        SUB_DMDS = MKTAG('D','M','D','S'),
-        SUB_DMDT = MKTAG('D','M','D','T'),
-        SUB_DSTD = MKTAG('D','S','T','D'),
-        SUB_DSTF = MKTAG('D','S','T','F'),
-        SUB_KNAM = MKTAG('K','N','A','M'),
-        SUB_KSIZ = MKTAG('K','S','I','Z'),
-        SUB_KWDA = MKTAG('K','W','D','A'),
-        SUB_VNAM = MKTAG('V','N','A','M'),
-        SUB_SDSC = MKTAG('S','D','S','C'),
-        SUB_MO2S = MKTAG('M','O','2','S'),
-        SUB_MO4S = MKTAG('M','O','4','S'),
-        SUB_BOD2 = MKTAG('B','O','D','2'),
-        SUB_BAMT = MKTAG('B','A','M','T'),
-        SUB_BIDS = MKTAG('B','I','D','S'),
-        SUB_ETYP = MKTAG('E','T','Y','P'),
-        SUB_BMCT = MKTAG('B','M','C','T'),
-        SUB_MICO = MKTAG('M','I','C','O'),
-        SUB_MIC2 = MKTAG('M','I','C','2'),
-        SUB_EAMT = MKTAG('E','A','M','T'),
-        SUB_EITM = MKTAG('E','I','T','M'),
-
-        SUB_SCTX = MKTAG('S','C','T','X'),
-        SUB_XLTW = MKTAG('X','L','T','W'),
-        SUB_XMBP = MKTAG('X','M','B','P'),
-        SUB_XOCP = MKTAG('X','O','C','P'),
-        SUB_XRGB = MKTAG('X','R','G','B'),
-        SUB_XSPC = MKTAG('X','S','P','C'),
-        SUB_XTNM = MKTAG('X','T','N','M'),
-        SUB_ATKR = MKTAG('A','T','K','R'),
-        SUB_CRIF = MKTAG('C','R','I','F'),
-        SUB_DOFT = MKTAG('D','O','F','T'),
-        SUB_DPLT = MKTAG('D','P','L','T'),
-        SUB_ECOR = MKTAG('E','C','O','R'),
-        SUB_ATKD = MKTAG('A','T','K','D'),
-        SUB_ATKE = MKTAG('A','T','K','E'),
-        SUB_FTST = MKTAG('F','T','S','T'),
-        SUB_HCLF = MKTAG('H','C','L','F'),
-        SUB_NAM5 = MKTAG('N','A','M','5'),
-        SUB_NAM6 = MKTAG('N','A','M','6'),
-        SUB_NAM7 = MKTAG('N','A','M','7'),
-        SUB_NAM8 = MKTAG('N','A','M','8'),
-        SUB_PRKR = MKTAG('P','R','K','R'),
-        SUB_PRKZ = MKTAG('P','R','K','Z'),
-        SUB_SOFT = MKTAG('S','O','F','T'),
-        SUB_SPCT = MKTAG('S','P','C','T'),
-        SUB_TINC = MKTAG('T','I','N','C'),
-        SUB_TIAS = MKTAG('T','I','A','S'),
-        SUB_TINI = MKTAG('T','I','N','I'),
-        SUB_TINV = MKTAG('T','I','N','V'),
-        SUB_TPLT = MKTAG('T','P','L','T'),
-        SUB_VTCK = MKTAG('V','T','C','K'),
-        SUB_SHRT = MKTAG('S','H','R','T'),
-        SUB_SPOR = MKTAG('S','P','O','R'),
-        SUB_XHOR = MKTAG('X','H','O','R'),
-        SUB_CTDA = MKTAG('C','T','D','A'),
-        SUB_CRDT = MKTAG('C','R','D','T'),
-        SUB_FNMK = MKTAG('F','N','M','K'),
-        SUB_FNPR = MKTAG('F','N','P','R'),
-        SUB_WBDT = MKTAG('W','B','D','T'),
-        SUB_QUAL = MKTAG('Q','U','A','L'),
-        SUB_INDX = MKTAG('I','N','D','X'),
-        SUB_ATTR = MKTAG('A','T','T','R'),
-        SUB_MTNM = MKTAG('M','T','N','M'),
-        SUB_UNES = MKTAG('U','N','E','S'),
-        SUB_TIND = MKTAG('T','I','N','D'),
-        SUB_TINL = MKTAG('T','I','N','L'),
-        SUB_TINP = MKTAG('T','I','N','P'),
-        SUB_TINT = MKTAG('T','I','N','T'),
-        SUB_TIRS = MKTAG('T','I','R','S'),
-        SUB_PHWT = MKTAG('P','H','W','T'),
-        SUB_AHCF = MKTAG('A','H','C','F'),
-        SUB_AHCM = MKTAG('A','H','C','M'),
-        SUB_HEAD = MKTAG('H','E','A','D'),
-        SUB_MPAI = MKTAG('M','P','A','I'),
-        SUB_MPAV = MKTAG('M','P','A','V'),
-        SUB_DFTF = MKTAG('D','F','T','F'),
-        SUB_DFTM = MKTAG('D','F','T','M'),
-        SUB_FLMV = MKTAG('F','L','M','V'),
-        SUB_FTSF = MKTAG('F','T','S','F'),
-        SUB_FTSM = MKTAG('F','T','S','M'),
-        SUB_MTYP = MKTAG('M','T','Y','P'),
-        SUB_PHTN = MKTAG('P','H','T','N'),
-        SUB_RNMV = MKTAG('R','N','M','V'),
-        SUB_RPRF = MKTAG('R','P','R','F'),
-        SUB_RPRM = MKTAG('R','P','R','M'),
-        SUB_SNMV = MKTAG('S','N','M','V'),
-        SUB_SPED = MKTAG('S','P','E','D'),
-        SUB_SWMV = MKTAG('S','W','M','V'),
-        SUB_WKMV = MKTAG('W','K','M','V'),
-        SUB_LLCT = MKTAG('L','L','C','T'),
-        SUB_IDLF = MKTAG('I','D','L','F'),
-        SUB_IDLA = MKTAG('I','D','L','A'),
-        SUB_IDLC = MKTAG('I','D','L','C'),
-        SUB_IDLT = MKTAG('I','D','L','T'),
-        SUB_DODT = MKTAG('D','O','D','T'),
-        SUB_TX00 = MKTAG('T','X','0','0'),
-        SUB_TX01 = MKTAG('T','X','0','1'),
-        SUB_TX02 = MKTAG('T','X','0','2'),
-        SUB_TX03 = MKTAG('T','X','0','3'),
-        SUB_TX04 = MKTAG('T','X','0','4'),
-        SUB_TX05 = MKTAG('T','X','0','5'),
-        SUB_TX06 = MKTAG('T','X','0','6'),
-        SUB_TX07 = MKTAG('T','X','0','7'),
-        SUB_BPND = MKTAG('B','P','N','D'),
-        SUB_BPTN = MKTAG('B','P','T','N'),
-        SUB_BPNN = MKTAG('B','P','N','N'),
-        SUB_BPNT = MKTAG('B','P','N','T'),
-        SUB_BPNI = MKTAG('B','P','N','I'),
-        SUB_RAGA = MKTAG('R','A','G','A'),
-
-        SUB_QSTI = MKTAG('Q','S','T','I'),
-        SUB_QSTR = MKTAG('Q','S','T','R'),
-        SUB_QSDT = MKTAG('Q','S','D','T'),
-        SUB_SCDA = MKTAG('S','C','D','A'),
-        SUB_SCRO = MKTAG('S','C','R','O'),
-        SUB_QSTA = MKTAG('Q','S','T','A'),
-        SUB_CTDT = MKTAG('C','T','D','T'),
-        SUB_SCHD = MKTAG('S','C','H','D'),
-        SUB_TCLF = MKTAG('T','C','L','F'),
-        SUB_TCLT = MKTAG('T','C','L','T'),
-        SUB_TRDT = MKTAG('T','R','D','T'),
-        SUB_TPIC = MKTAG('T','P','I','C'),
-
-        SUB_PKDT = MKTAG('P','K','D','T'),
-        SUB_PSDT = MKTAG('P','S','D','T'),
-        SUB_PLDT = MKTAG('P','L','D','T'),
-        SUB_PTDT = MKTAG('P','T','D','T'),
-        SUB_PGRP = MKTAG('P','G','R','P'),
-        SUB_PGRR = MKTAG('P','G','R','R'),
-        SUB_PGRI = MKTAG('P','G','R','I'),
-        SUB_PGRL = MKTAG('P','G','R','L'),
-        SUB_PGAG = MKTAG('P','G','A','G'),
-        SUB_FLTV = MKTAG('F','L','T','V'),
-
-        SUB_XHLT = MKTAG('X','H','L','T'), // Unofficial Oblivion Patch
-        SUB_XCHG = MKTAG('X','C','H','G'), // thievery.exp
-
-        SUB_ITXT = MKTAG('I','T','X','T'),
-        SUB_MO5T = MKTAG('M','O','5','T'),
-        SUB_MOD5 = MKTAG('M','O','D','5'),
-        SUB_MDOB = MKTAG('M','D','O','B'),
-        SUB_SPIT = MKTAG('S','P','I','T'),
-        SUB_PTDA = MKTAG('P','T','D','A'), // TES5
-        SUB_PFOR = MKTAG('P','F','O','R'), // TES5
-        SUB_PFO2 = MKTAG('P','F','O','2'), // TES5
-        SUB_PRCB = MKTAG('P','R','C','B'), // TES5
-        SUB_PKCU = MKTAG('P','K','C','U'), // TES5
-        SUB_PKC2 = MKTAG('P','K','C','2'), // TES5
-        SUB_CITC = MKTAG('C','I','T','C'), // TES5
-        SUB_CIS1 = MKTAG('C','I','S','1'), // TES5
-        SUB_CIS2 = MKTAG('C','I','S','2'), // TES5
-        SUB_TIFC = MKTAG('T','I','F','C'), // TES5
-        SUB_ALCA = MKTAG('A','L','C','A'), // TES5
-        SUB_ALCL = MKTAG('A','L','C','L'), // TES5
-        SUB_ALCO = MKTAG('A','L','C','O'), // TES5
-        SUB_ALDN = MKTAG('A','L','D','N'), // TES5
-        SUB_ALEA = MKTAG('A','L','E','A'), // TES5
-        SUB_ALED = MKTAG('A','L','E','D'), // TES5
-        SUB_ALEQ = MKTAG('A','L','E','Q'), // TES5
-        SUB_ALFA = MKTAG('A','L','F','A'), // TES5
-        SUB_ALFC = MKTAG('A','L','F','C'), // TES5
-        SUB_ALFD = MKTAG('A','L','F','D'), // TES5
-        SUB_ALFE = MKTAG('A','L','F','E'), // TES5
-        SUB_ALFI = MKTAG('A','L','F','I'), // TES5
-        SUB_ALFL = MKTAG('A','L','F','L'), // TES5
-        SUB_ALFR = MKTAG('A','L','F','R'), // TES5
-        SUB_ALID = MKTAG('A','L','I','D'), // TES5
-        SUB_ALLS = MKTAG('A','L','L','S'), // TES5
-        SUB_ALNA = MKTAG('A','L','N','A'), // TES5
-        SUB_ALNT = MKTAG('A','L','N','T'), // TES5
-        SUB_ALPC = MKTAG('A','L','P','C'), // TES5
-        SUB_ALRT = MKTAG('A','L','R','T'), // TES5
-        SUB_ALSP = MKTAG('A','L','S','P'), // TES5
-        SUB_ALST = MKTAG('A','L','S','T'), // TES5
-        SUB_ALUA = MKTAG('A','L','U','A'), // TES5
-        SUB_FLTR = MKTAG('F','L','T','R'), // TES5
-        SUB_QTGL = MKTAG('Q','T','G','L'), // TES5
-        SUB_TWAT = MKTAG('T','W','A','T'), // TES5
-        SUB_XIBS = MKTAG('X','I','B','S'), // FO3
-        SUB_REPL = MKTAG('R','E','P','L'), // FO3
-        SUB_BIPL = MKTAG('B','I','P','L'), // FO3
-        SUB_MODD = MKTAG('M','O','D','D'), // FO3
-        SUB_MOSD = MKTAG('M','O','S','D'), // FO3
-        SUB_MO3S = MKTAG('M','O','3','S'), // FO3
-        SUB_XCET = MKTAG('X','C','E','T'), // FO3
-        SUB_LVLG = MKTAG('L','V','L','G'), // FO3
-        SUB_NVCI = MKTAG('N','V','C','I'), // FO3
-        SUB_NVVX = MKTAG('N','V','V','X'), // FO3
-        SUB_NVTR = MKTAG('N','V','T','R'), // FO3
-        SUB_NVCA = MKTAG('N','V','C','A'), // FO3
-        SUB_NVDP = MKTAG('N','V','D','P'), // FO3
-        SUB_NVGD = MKTAG('N','V','G','D'), // FO3
-        SUB_NVEX = MKTAG('N','V','E','X'), // FO3
-        SUB_XHLP = MKTAG('X','H','L','P'), // FO3
-        SUB_XRDO = MKTAG('X','R','D','O'), // FO3
-        SUB_XAMT = MKTAG('X','A','M','T'), // FO3
-        SUB_XAMC = MKTAG('X','A','M','C'), // FO3
-        SUB_XRAD = MKTAG('X','R','A','D'), // FO3
-        SUB_XORD = MKTAG('X','O','R','D'), // FO3
-        SUB_XCLP = MKTAG('X','C','L','P'), // FO3
-        SUB_NEXT = MKTAG('N','E','X','T'), // FO3
-        SUB_QOBJ = MKTAG('Q','O','B','J'), // FO3
-        SUB_POBA = MKTAG('P','O','B','A'), // FO3
-        SUB_POCA = MKTAG('P','O','C','A'), // FO3
-        SUB_POEA = MKTAG('P','O','E','A'), // FO3
-        SUB_PKDD = MKTAG('P','K','D','D'), // FO3
-        SUB_PKD2 = MKTAG('P','K','D','2'), // FO3
-        SUB_PKPT = MKTAG('P','K','P','T'), // FO3
-        SUB_PKED = MKTAG('P','K','E','D'), // FO3
-        SUB_PKE2 = MKTAG('P','K','E','2'), // FO3
-        SUB_PKAM = MKTAG('P','K','A','M'), // FO3
-        SUB_PUID = MKTAG('P','U','I','D'), // FO3
-        SUB_PKW3 = MKTAG('P','K','W','3'), // FO3
-        SUB_PTD2 = MKTAG('P','T','D','2'), // FO3
-        SUB_PLD2 = MKTAG('P','L','D','2'), // FO3
-        SUB_PKFD = MKTAG('P','K','F','D'), // FO3
-        SUB_IDLB = MKTAG('I','D','L','B'), // FO3
-        SUB_XDCR = MKTAG('X','D','C','R'), // FO3
-        SUB_DALC = MKTAG('D','A','L','C'), // FO3
-        SUB_IMPS = MKTAG('I','M','P','S'), // FO3 Anchorage
-        SUB_IMPF = MKTAG('I','M','P','F'), // FO3 Anchorage
-
-        SUB_XATO = MKTAG('X','A','T','O'), // FONV
-        SUB_INFC = MKTAG('I','N','F','C'), // FONV
-        SUB_INFX = MKTAG('I','N','F','X'), // FONV
-        SUB_TDUM = MKTAG('T','D','U','M'), // FONV
-        SUB_TCFU = MKTAG('T','C','F','U'), // FONV
-        SUB_DAT2 = MKTAG('D','A','T','2'), // FONV
-        SUB_RCIL = MKTAG('R','C','I','L'), // FONV
-        SUB_MMRK = MKTAG('M','M','R','K'), // FONV
-        SUB_SCRV = MKTAG('S','C','R','V'), // FONV
-        SUB_SCVR = MKTAG('S','C','V','R'), // FONV
-        SUB_SLSD = MKTAG('S','L','S','D'), // FONV
-        SUB_XSRF = MKTAG('X','S','R','F'), // FONV
-        SUB_XSRD = MKTAG('X','S','R','D'), // FONV
-        SUB_WMI1 = MKTAG('W','M','I','1'), // FONV
-        SUB_RDID = MKTAG('R','D','I','D'), // FONV
-        SUB_RDSB = MKTAG('R','D','S','B'), // FONV
-        SUB_RDSI = MKTAG('R','D','S','I'), // FONV
-        SUB_BRUS = MKTAG('B','R','U','S'), // FONV
-        SUB_VATS = MKTAG('V','A','T','S'), // FONV
-        SUB_VANM = MKTAG('V','A','N','M'), // FONV
-        SUB_MWD1 = MKTAG('M','W','D','1'), // FONV
-        SUB_MWD2 = MKTAG('M','W','D','2'), // FONV
-        SUB_MWD3 = MKTAG('M','W','D','3'), // FONV
-        SUB_MWD4 = MKTAG('M','W','D','4'), // FONV
-        SUB_MWD5 = MKTAG('M','W','D','5'), // FONV
-        SUB_MWD6 = MKTAG('M','W','D','6'), // FONV
-        SUB_MWD7 = MKTAG('M','W','D','7'), // FONV
-        SUB_WMI2 = MKTAG('W','M','I','2'), // FONV
-        SUB_WMI3 = MKTAG('W','M','I','3'), // FONV
-        SUB_WMS1 = MKTAG('W','M','S','1'), // FONV
-        SUB_WMS2 = MKTAG('W','M','S','2'), // FONV
-        SUB_WNM1 = MKTAG('W','N','M','1'), // FONV
-        SUB_WNM2 = MKTAG('W','N','M','2'), // FONV
-        SUB_WNM3 = MKTAG('W','N','M','3'), // FONV
-        SUB_WNM4 = MKTAG('W','N','M','4'), // FONV
-        SUB_WNM5 = MKTAG('W','N','M','5'), // FONV
-        SUB_WNM6 = MKTAG('W','N','M','6'), // FONV
-        SUB_WNM7 = MKTAG('W','N','M','7'), // FONV
-        SUB_JNAM = MKTAG('J','N','A','M'), // FONV
-        SUB_EFSD = MKTAG('E','F','S','D'), // FONV DeadMoney
+        SUB_HEDR = fourCC("HEDR"),
+        SUB_CNAM = fourCC("CNAM"),
+        SUB_SNAM = fourCC("SNAM"), // TES4 only?
+        SUB_MAST = fourCC("MAST"),
+        SUB_DATA = fourCC("DATA"),
+        SUB_ONAM = fourCC("ONAM"),
+        SUB_INTV = fourCC("INTV"),
+        SUB_INCC = fourCC("INCC"),
+        SUB_OFST = fourCC("OFST"), // TES4 only?
+        SUB_DELE = fourCC("DELE"), // TES4 only?
+
+        SUB_DNAM = fourCC("DNAM"),
+        SUB_EDID = fourCC("EDID"),
+        SUB_FULL = fourCC("FULL"),
+        SUB_LTMP = fourCC("LTMP"),
+        SUB_MHDT = fourCC("MHDT"),
+        SUB_MNAM = fourCC("MNAM"),
+        SUB_MODL = fourCC("MODL"),
+        SUB_NAM0 = fourCC("NAM0"),
+        SUB_NAM2 = fourCC("NAM2"),
+        SUB_NAM3 = fourCC("NAM3"),
+        SUB_NAM4 = fourCC("NAM4"),
+        SUB_NAM9 = fourCC("NAM9"),
+        SUB_NAMA = fourCC("NAMA"),
+        SUB_PNAM = fourCC("PNAM"),
+        SUB_RNAM = fourCC("RNAM"),
+        SUB_TNAM = fourCC("TNAM"),
+        SUB_UNAM = fourCC("UNAM"),
+        SUB_WCTR = fourCC("WCTR"),
+        SUB_WNAM = fourCC("WNAM"),
+        SUB_XEZN = fourCC("XEZN"),
+        SUB_XLCN = fourCC("XLCN"),
+        SUB_XXXX = fourCC("XXXX"),
+        SUB_ZNAM = fourCC("ZNAM"),
+        SUB_MODT = fourCC("MODT"),
+        SUB_ICON = fourCC("ICON"), // TES4 only?
+
+        SUB_NVER = fourCC("NVER"),
+        SUB_NVMI = fourCC("NVMI"),
+        SUB_NVPP = fourCC("NVPP"),
+        SUB_NVSI = fourCC("NVSI"),
+
+        SUB_NVNM = fourCC("NVNM"),
+        SUB_NNAM = fourCC("NNAM"),
+
+        SUB_XCLC = fourCC("XCLC"),
+        SUB_XCLL = fourCC("XCLL"),
+        SUB_TVDT = fourCC("TVDT"),
+        SUB_XCGD = fourCC("XCGD"),
+        SUB_LNAM = fourCC("LNAM"),
+        SUB_XCLW = fourCC("XCLW"),
+        SUB_XNAM = fourCC("XNAM"),
+        SUB_XCLR = fourCC("XCLR"),
+        SUB_XWCS = fourCC("XWCS"),
+        SUB_XWCN = fourCC("XWCN"),
+        SUB_XWCU = fourCC("XWCU"),
+        SUB_XCWT = fourCC("XCWT"),
+        SUB_XOWN = fourCC("XOWN"),
+        SUB_XILL = fourCC("XILL"),
+        SUB_XWEM = fourCC("XWEM"),
+        SUB_XCCM = fourCC("XCCM"),
+        SUB_XCAS = fourCC("XCAS"),
+        SUB_XCMO = fourCC("XCMO"),
+        SUB_XCIM = fourCC("XCIM"),
+        SUB_XCMT = fourCC("XCMT"), // TES4 only?
+        SUB_XRNK = fourCC("XRNK"), // TES4 only?
+        SUB_XGLB = fourCC("XGLB"), // TES4 only?
+
+        SUB_VNML = fourCC("VNML"),
+        SUB_VHGT = fourCC("VHGT"),
+        SUB_VCLR = fourCC("VCLR"),
+        SUA_BTXT = fourCC("BTXT"),
+        SUB_ATXT = fourCC("ATXT"),
+        SUB_VTXT = fourCC("VTXT"),
+        SUB_VTEX = fourCC("VTEX"),
+
+        SUB_HNAM = fourCC("HNAM"),
+        SUB_GNAM = fourCC("GNAM"),
+
+        SUB_RCLR = fourCC("RCLR"),
+        SUB_RPLI = fourCC("RPLI"),
+        SUB_RPLD = fourCC("RPLD"),
+        SUB_RDAT = fourCC("RDAT"),
+        SUB_RDMD = fourCC("RDMD"), // TES4 only?
+        SUB_RDSD = fourCC("RDSD"), // TES4 only?
+        SUB_RDGS = fourCC("RDGS"), // TES4 only?
+        SUB_RDMO = fourCC("RDMO"),
+        SUB_RDSA = fourCC("RDSA"),
+        SUB_RDWT = fourCC("RDWT"),
+        SUB_RDOT = fourCC("RDOT"),
+        SUB_RDMP = fourCC("RDMP"),
+
+        SUB_MODB = fourCC("MODB"),
+        SUB_OBND = fourCC("OBND"),
+        SUB_MODS = fourCC("MODS"),
+
+        SUB_NAME = fourCC("NAME"),
+        SUB_XMRK = fourCC("XMRK"),
+        SUB_FNAM = fourCC("FNAM"),
+        SUB_XSCL = fourCC("XSCL"),
+        SUB_XTEL = fourCC("XTEL"),
+        SUB_XTRG = fourCC("XTRG"),
+        SUB_XSED = fourCC("XSED"),
+        SUB_XLOD = fourCC("XLOD"),
+        SUB_XPCI = fourCC("XPCI"),
+        SUB_XLOC = fourCC("XLOC"),
+        SUB_XESP = fourCC("XESP"),
+        SUB_XLCM = fourCC("XLCM"),
+        SUB_XRTM = fourCC("XRTM"),
+        SUB_XACT = fourCC("XACT"),
+        SUB_XCNT = fourCC("XCNT"),
+        SUB_VMAD = fourCC("VMAD"),
+        SUB_XPRM = fourCC("XPRM"),
+        SUB_XMBO = fourCC("XMBO"),
+        SUB_XPOD = fourCC("XPOD"),
+        SUB_XRMR = fourCC("XRMR"),
+        SUB_INAM = fourCC("INAM"),
+        SUB_SCHR = fourCC("SCHR"),
+        SUB_XLRM = fourCC("XLRM"),
+        SUB_XRGD = fourCC("XRGD"),
+        SUB_XRDS = fourCC("XRDS"),
+        SUB_XEMI = fourCC("XEMI"),
+        SUB_XLIG = fourCC("XLIG"),
+        SUB_XALP = fourCC("XALP"),
+        SUB_XNDP = fourCC("XNDP"),
+        SUB_XAPD = fourCC("XAPD"),
+        SUB_XAPR = fourCC("XAPR"),
+        SUB_XLIB = fourCC("XLIB"),
+        SUB_XLKR = fourCC("XLKR"),
+        SUB_XLRT = fourCC("XLRT"),
+        SUB_XCVL = fourCC("XCVL"),
+        SUB_XCVR = fourCC("XCVR"),
+        SUB_XCZA = fourCC("XCZA"),
+        SUB_XCZC = fourCC("XCZC"),
+        SUB_XFVC = fourCC("XFVC"),
+        SUB_XHTW = fourCC("XHTW"),
+        SUB_XIS2 = fourCC("XIS2"),
+        SUB_XMBR = fourCC("XMBR"),
+        SUB_XCCP = fourCC("XCCP"),
+        SUB_XPWR = fourCC("XPWR"),
+        SUB_XTRI = fourCC("XTRI"),
+        SUB_XATR = fourCC("XATR"),
+        SUB_XPRD = fourCC("XPRD"),
+        SUB_XPPA = fourCC("XPPA"),
+        SUB_PDTO = fourCC("PDTO"),
+        SUB_XLRL = fourCC("XLRL"),
+
+        SUB_QNAM = fourCC("QNAM"),
+        SUB_COCT = fourCC("COCT"),
+        SUB_COED = fourCC("COED"),
+        SUB_CNTO = fourCC("CNTO"),
+        SUB_SCRI = fourCC("SCRI"),
+
+        SUB_BNAM = fourCC("BNAM"),
+
+        SUB_BMDT = fourCC("BMDT"),
+        SUB_MOD2 = fourCC("MOD2"),
+        SUB_MOD3 = fourCC("MOD3"),
+        SUB_MOD4 = fourCC("MOD4"),
+        SUB_MO2B = fourCC("MO2B"),
+        SUB_MO3B = fourCC("MO3B"),
+        SUB_MO4B = fourCC("MO4B"),
+        SUB_MO2T = fourCC("MO2T"),
+        SUB_MO3T = fourCC("MO3T"),
+        SUB_MO4T = fourCC("MO4T"),
+        SUB_ANAM = fourCC("ANAM"),
+        SUB_ENAM = fourCC("ENAM"),
+        SUB_ICO2 = fourCC("ICO2"),
+
+        SUB_ACBS = fourCC("ACBS"),
+        SUB_SPLO = fourCC("SPLO"),
+        SUB_AIDT = fourCC("AIDT"),
+        SUB_PKID = fourCC("PKID"),
+        SUB_HCLR = fourCC("HCLR"),
+        SUB_FGGS = fourCC("FGGS"),
+        SUB_FGGA = fourCC("FGGA"),
+        SUB_FGTS = fourCC("FGTS"),
+        SUB_KFFZ = fourCC("KFFZ"),
+
+        SUB_PFIG = fourCC("PFIG"),
+        SUB_PFPC = fourCC("PFPC"),
+
+        SUB_XHRS = fourCC("XHRS"),
+        SUB_XMRC = fourCC("XMRC"),
+
+        SUB_SNDD = fourCC("SNDD"),
+        SUB_SNDX = fourCC("SNDX"),
+
+        SUB_DESC = fourCC("DESC"),
+
+        SUB_ENIT = fourCC("ENIT"),
+        SUB_EFID = fourCC("EFID"),
+        SUB_EFIT = fourCC("EFIT"),
+        SUB_SCIT = fourCC("SCIT"),
+
+        SUB_SOUL = fourCC("SOUL"),
+        SUB_SLCP = fourCC("SLCP"),
+
+        SUB_CSCR = fourCC("CSCR"),
+        SUB_CSDI = fourCC("CSDI"),
+        SUB_CSDC = fourCC("CSDC"),
+        SUB_NIFZ = fourCC("NIFZ"),
+        SUB_CSDT = fourCC("CSDT"),
+        SUB_NAM1 = fourCC("NAM1"),
+        SUB_NIFT = fourCC("NIFT"),
+
+        SUB_LVLD = fourCC("LVLD"),
+        SUB_LVLF = fourCC("LVLF"),
+        SUB_LVLO = fourCC("LVLO"),
+
+        SUB_BODT = fourCC("BODT"),
+        SUB_YNAM = fourCC("YNAM"),
+        SUB_DEST = fourCC("DEST"),
+        SUB_DMDL = fourCC("DMDL"),
+        SUB_DMDS = fourCC("DMDS"),
+        SUB_DMDT = fourCC("DMDT"),
+        SUB_DSTD = fourCC("DSTD"),
+        SUB_DSTF = fourCC("DSTF"),
+        SUB_KNAM = fourCC("KNAM"),
+        SUB_KSIZ = fourCC("KSIZ"),
+        SUB_KWDA = fourCC("KWDA"),
+        SUB_VNAM = fourCC("VNAM"),
+        SUB_SDSC = fourCC("SDSC"),
+        SUB_MO2S = fourCC("MO2S"),
+        SUB_MO4S = fourCC("MO4S"),
+        SUB_BOD2 = fourCC("BOD2"),
+        SUB_BAMT = fourCC("BAMT"),
+        SUB_BIDS = fourCC("BIDS"),
+        SUB_ETYP = fourCC("ETYP"),
+        SUB_BMCT = fourCC("BMCT"),
+        SUB_MICO = fourCC("MICO"),
+        SUB_MIC2 = fourCC("MIC2"),
+        SUB_EAMT = fourCC("EAMT"),
+        SUB_EITM = fourCC("EITM"),
+
+        SUB_SCTX = fourCC("SCTX"),
+        SUB_XLTW = fourCC("XLTW"),
+        SUB_XMBP = fourCC("XMBP"),
+        SUB_XOCP = fourCC("XOCP"),
+        SUB_XRGB = fourCC("XRGB"),
+        SUB_XSPC = fourCC("XSPC"),
+        SUB_XTNM = fourCC("XTNM"),
+        SUB_ATKR = fourCC("ATKR"),
+        SUB_CRIF = fourCC("CRIF"),
+        SUB_DOFT = fourCC("DOFT"),
+        SUB_DPLT = fourCC("DPLT"),
+        SUB_ECOR = fourCC("ECOR"),
+        SUB_ATKD = fourCC("ATKD"),
+        SUB_ATKE = fourCC("ATKE"),
+        SUB_FTST = fourCC("FTST"),
+        SUB_HCLF = fourCC("HCLF"),
+        SUB_NAM5 = fourCC("NAM5"),
+        SUB_NAM6 = fourCC("NAM6"),
+        SUB_NAM7 = fourCC("NAM7"),
+        SUB_NAM8 = fourCC("NAM8"),
+        SUB_PRKR = fourCC("PRKR"),
+        SUB_PRKZ = fourCC("PRKZ"),
+        SUB_SOFT = fourCC("SOFT"),
+        SUB_SPCT = fourCC("SPCT"),
+        SUB_TINC = fourCC("TINC"),
+        SUB_TIAS = fourCC("TIAS"),
+        SUB_TINI = fourCC("TINI"),
+        SUB_TINV = fourCC("TINV"),
+        SUB_TPLT = fourCC("TPLT"),
+        SUB_VTCK = fourCC("VTCK"),
+        SUB_SHRT = fourCC("SHRT"),
+        SUB_SPOR = fourCC("SPOR"),
+        SUB_XHOR = fourCC("XHOR"),
+        SUB_CTDA = fourCC("CTDA"),
+        SUB_CRDT = fourCC("CRDT"),
+        SUB_FNMK = fourCC("FNMK"),
+        SUB_FNPR = fourCC("FNPR"),
+        SUB_WBDT = fourCC("WBDT"),
+        SUB_QUAL = fourCC("QUAL"),
+        SUB_INDX = fourCC("INDX"),
+        SUB_ATTR = fourCC("ATTR"),
+        SUB_MTNM = fourCC("MTNM"),
+        SUB_UNES = fourCC("UNES"),
+        SUB_TIND = fourCC("TIND"),
+        SUB_TINL = fourCC("TINL"),
+        SUB_TINP = fourCC("TINP"),
+        SUB_TINT = fourCC("TINT"),
+        SUB_TIRS = fourCC("TIRS"),
+        SUB_PHWT = fourCC("PHWT"),
+        SUB_AHCF = fourCC("AHCF"),
+        SUB_AHCM = fourCC("AHCM"),
+        SUB_HEAD = fourCC("HEAD"),
+        SUB_MPAI = fourCC("MPAI"),
+        SUB_MPAV = fourCC("MPAV"),
+        SUB_DFTF = fourCC("DFTF"),
+        SUB_DFTM = fourCC("DFTM"),
+        SUB_FLMV = fourCC("FLMV"),
+        SUB_FTSF = fourCC("FTSF"),
+        SUB_FTSM = fourCC("FTSM"),
+        SUB_MTYP = fourCC("MTYP"),
+        SUB_PHTN = fourCC("PHTN"),
+        SUB_RNMV = fourCC("RNMV"),
+        SUB_RPRF = fourCC("RPRF"),
+        SUB_RPRM = fourCC("RPRM"),
+        SUB_SNMV = fourCC("SNMV"),
+        SUB_SPED = fourCC("SPED"),
+        SUB_SWMV = fourCC("SWMV"),
+        SUB_WKMV = fourCC("WKMV"),
+        SUB_LLCT = fourCC("LLCT"),
+        SUB_IDLF = fourCC("IDLF"),
+        SUB_IDLA = fourCC("IDLA"),
+        SUB_IDLC = fourCC("IDLC"),
+        SUB_IDLT = fourCC("IDLT"),
+        SUB_DODT = fourCC("DODT"),
+        SUB_TX00 = fourCC("TX00"),
+        SUB_TX01 = fourCC("TX01"),
+        SUB_TX02 = fourCC("TX02"),
+        SUB_TX03 = fourCC("TX03"),
+        SUB_TX04 = fourCC("TX04"),
+        SUB_TX05 = fourCC("TX05"),
+        SUB_TX06 = fourCC("TX06"),
+        SUB_TX07 = fourCC("TX07"),
+        SUB_BPND = fourCC("BPND"),
+        SUB_BPTN = fourCC("BPTN"),
+        SUB_BPNN = fourCC("BPNN"),
+        SUB_BPNT = fourCC("BPNT"),
+        SUB_BPNI = fourCC("BPNI"),
+        SUB_RAGA = fourCC("RAGA"),
+
+        SUB_QSTI = fourCC("QSTI"),
+        SUB_QSTR = fourCC("QSTR"),
+        SUB_QSDT = fourCC("QSDT"),
+        SUB_SCDA = fourCC("SCDA"),
+        SUB_SCRO = fourCC("SCRO"),
+        SUB_QSTA = fourCC("QSTA"),
+        SUB_CTDT = fourCC("CTDT"),
+        SUB_SCHD = fourCC("SCHD"),
+        SUB_TCLF = fourCC("TCLF"),
+        SUB_TCLT = fourCC("TCLT"),
+        SUB_TRDT = fourCC("TRDT"),
+        SUB_TPIC = fourCC("TPIC"),
+
+        SUB_PKDT = fourCC("PKDT"),
+        SUB_PSDT = fourCC("PSDT"),
+        SUB_PLDT = fourCC("PLDT"),
+        SUB_PTDT = fourCC("PTDT"),
+        SUB_PGRP = fourCC("PGRP"),
+        SUB_PGRR = fourCC("PGRR"),
+        SUB_PGRI = fourCC("PGRI"),
+        SUB_PGRL = fourCC("PGRL"),
+        SUB_PGAG = fourCC("PGAG"),
+        SUB_FLTV = fourCC("FLTV"),
+
+        SUB_XHLT = fourCC("XHLT"), // Unofficial Oblivion Patch
+        SUB_XCHG = fourCC("XCHG"), // thievery.exp
+
+        SUB_ITXT = fourCC("ITXT"),
+        SUB_MO5T = fourCC("MO5T"),
+        SUB_MOD5 = fourCC("MOD5"),
+        SUB_MDOB = fourCC("MDOB"),
+        SUB_SPIT = fourCC("SPIT"),
+        SUB_PTDA = fourCC("PTDA"), // TES5
+        SUB_PFOR = fourCC("PFOR"), // TES5
+        SUB_PFO2 = fourCC("PFO2"), // TES5
+        SUB_PRCB = fourCC("PRCB"), // TES5
+        SUB_PKCU = fourCC("PKCU"), // TES5
+        SUB_PKC2 = fourCC("PKC2"), // TES5
+        SUB_CITC = fourCC("CITC"), // TES5
+        SUB_CIS1 = fourCC("CIS1"), // TES5
+        SUB_CIS2 = fourCC("CIS2"), // TES5
+        SUB_TIFC = fourCC("TIFC"), // TES5
+        SUB_ALCA = fourCC("ALCA"), // TES5
+        SUB_ALCL = fourCC("ALCL"), // TES5
+        SUB_ALCO = fourCC("ALCO"), // TES5
+        SUB_ALDN = fourCC("ALDN"), // TES5
+        SUB_ALEA = fourCC("ALEA"), // TES5
+        SUB_ALED = fourCC("ALED"), // TES5
+        SUB_ALEQ = fourCC("ALEQ"), // TES5
+        SUB_ALFA = fourCC("ALFA"), // TES5
+        SUB_ALFC = fourCC("ALFC"), // TES5
+        SUB_ALFD = fourCC("ALFD"), // TES5
+        SUB_ALFE = fourCC("ALFE"), // TES5
+        SUB_ALFI = fourCC("ALFI"), // TES5
+        SUB_ALFL = fourCC("ALFL"), // TES5
+        SUB_ALFR = fourCC("ALFR"), // TES5
+        SUB_ALID = fourCC("ALID"), // TES5
+        SUB_ALLS = fourCC("ALLS"), // TES5
+        SUB_ALNA = fourCC("ALNA"), // TES5
+        SUB_ALNT = fourCC("ALNT"), // TES5
+        SUB_ALPC = fourCC("ALPC"), // TES5
+        SUB_ALRT = fourCC("ALRT"), // TES5
+        SUB_ALSP = fourCC("ALSP"), // TES5
+        SUB_ALST = fourCC("ALST"), // TES5
+        SUB_ALUA = fourCC("ALUA"), // TES5
+        SUB_FLTR = fourCC("FLTR"), // TES5
+        SUB_QTGL = fourCC("QTGL"), // TES5
+        SUB_TWAT = fourCC("TWAT"), // TES5
+        SUB_XIBS = fourCC("XIBS"), // FO3
+        SUB_REPL = fourCC("REPL"), // FO3
+        SUB_BIPL = fourCC("BIPL"), // FO3
+        SUB_MODD = fourCC("MODD"), // FO3
+        SUB_MOSD = fourCC("MOSD"), // FO3
+        SUB_MO3S = fourCC("MO3S"), // FO3
+        SUB_XCET = fourCC("XCET"), // FO3
+        SUB_LVLG = fourCC("LVLG"), // FO3
+        SUB_NVCI = fourCC("NVCI"), // FO3
+        SUB_NVVX = fourCC("NVVX"), // FO3
+        SUB_NVTR = fourCC("NVTR"), // FO3
+        SUB_NVCA = fourCC("NVCA"), // FO3
+        SUB_NVDP = fourCC("NVDP"), // FO3
+        SUB_NVGD = fourCC("NVGD"), // FO3
+        SUB_NVEX = fourCC("NVEX"), // FO3
+        SUB_XHLP = fourCC("XHLP"), // FO3
+        SUB_XRDO = fourCC("XRDO"), // FO3
+        SUB_XAMT = fourCC("XAMT"), // FO3
+        SUB_XAMC = fourCC("XAMC"), // FO3
+        SUB_XRAD = fourCC("XRAD"), // FO3
+        SUB_XORD = fourCC("XORD"), // FO3
+        SUB_XCLP = fourCC("XCLP"), // FO3
+        SUB_NEXT = fourCC("NEXT"), // FO3
+        SUB_QOBJ = fourCC("QOBJ"), // FO3
+        SUB_POBA = fourCC("POBA"), // FO3
+        SUB_POCA = fourCC("POCA"), // FO3
+        SUB_POEA = fourCC("POEA"), // FO3
+        SUB_PKDD = fourCC("PKDD"), // FO3
+        SUB_PKD2 = fourCC("PKD2"), // FO3
+        SUB_PKPT = fourCC("PKPT"), // FO3
+        SUB_PKED = fourCC("PKED"), // FO3
+        SUB_PKE2 = fourCC("PKE2"), // FO3
+        SUB_PKAM = fourCC("PKAM"), // FO3
+        SUB_PUID = fourCC("PUID"), // FO3
+        SUB_PKW3 = fourCC("PKW3"), // FO3
+        SUB_PTD2 = fourCC("PTD2"), // FO3
+        SUB_PLD2 = fourCC("PLD2"), // FO3
+        SUB_PKFD = fourCC("PKFD"), // FO3
+        SUB_IDLB = fourCC("IDLB"), // FO3
+        SUB_XDCR = fourCC("XDCR"), // FO3
+        SUB_DALC = fourCC("DALC"), // FO3
+        SUB_IMPS = fourCC("IMPS"), // FO3 Anchorage
+        SUB_IMPF = fourCC("IMPF"), // FO3 Anchorage
+
+        SUB_XATO = fourCC("XATO"), // FONV
+        SUB_INFC = fourCC("INFC"), // FONV
+        SUB_INFX = fourCC("INFX"), // FONV
+        SUB_TDUM = fourCC("TDUM"), // FONV
+        SUB_TCFU = fourCC("TCFU"), // FONV
+        SUB_DAT2 = fourCC("DAT2"), // FONV
+        SUB_RCIL = fourCC("RCIL"), // FONV
+        SUB_MMRK = fourCC("MMRK"), // FONV
+        SUB_SCRV = fourCC("SCRV"), // FONV
+        SUB_SCVR = fourCC("SCVR"), // FONV
+        SUB_SLSD = fourCC("SLSD"), // FONV
+        SUB_XSRF = fourCC("XSRF"), // FONV
+        SUB_XSRD = fourCC("XSRD"), // FONV
+        SUB_WMI1 = fourCC("WMI1"), // FONV
+        SUB_RDID = fourCC("RDID"), // FONV
+        SUB_RDSB = fourCC("RDSB"), // FONV
+        SUB_RDSI = fourCC("RDSI"), // FONV
+        SUB_BRUS = fourCC("BRUS"), // FONV
+        SUB_VATS = fourCC("VATS"), // FONV
+        SUB_VANM = fourCC("VANM"), // FONV
+        SUB_MWD1 = fourCC("MWD1"), // FONV
+        SUB_MWD2 = fourCC("MWD2"), // FONV
+        SUB_MWD3 = fourCC("MWD3"), // FONV
+        SUB_MWD4 = fourCC("MWD4"), // FONV
+        SUB_MWD5 = fourCC("MWD5"), // FONV
+        SUB_MWD6 = fourCC("MWD6"), // FONV
+        SUB_MWD7 = fourCC("MWD7"), // FONV
+        SUB_WMI2 = fourCC("WMI2"), // FONV
+        SUB_WMI3 = fourCC("WMI3"), // FONV
+        SUB_WMS1 = fourCC("WMS1"), // FONV
+        SUB_WMS2 = fourCC("WMS2"), // FONV
+        SUB_WNM1 = fourCC("WNM1"), // FONV
+        SUB_WNM2 = fourCC("WNM2"), // FONV
+        SUB_WNM3 = fourCC("WNM3"), // FONV
+        SUB_WNM4 = fourCC("WNM4"), // FONV
+        SUB_WNM5 = fourCC("WNM5"), // FONV
+        SUB_WNM6 = fourCC("WNM6"), // FONV
+        SUB_WNM7 = fourCC("WNM7"), // FONV
+        SUB_JNAM = fourCC("JNAM"), // FONV
+        SUB_EFSD = fourCC("EFSD"), // FONV DeadMoney
     };
 
     enum MagicEffectID
     {
         // Alteration
-        EFI_BRDN = MKTAG('B','R','D','N'),
-        EFI_FTHR = MKTAG('F','T','H','R'),
-        EFI_FISH = MKTAG('F','I','S','H'),
-        EFI_FRSH = MKTAG('F','R','S','H'),
-        EFI_OPEN = MKTAG('O','P','N','N'),
-        EFI_SHLD = MKTAG('S','H','L','D'),
-        EFI_LISH = MKTAG('L','I','S','H'),
-        EFI_WABR = MKTAG('W','A','B','R'),
-        EFI_WAWA = MKTAG('W','A','W','A'),
+        EFI_BRDN = fourCC("BRDN"),
+        EFI_FTHR = fourCC("FTHR"),
+        EFI_FISH = fourCC("FISH"),
+        EFI_FRSH = fourCC("FRSH"),
+        EFI_OPEN = fourCC("OPNN"),
+        EFI_SHLD = fourCC("SHLD"),
+        EFI_LISH = fourCC("LISH"),
+        EFI_WABR = fourCC("WABR"),
+        EFI_WAWA = fourCC("WAWA"),
 
         // Conjuration
-        EFI_BABO = MKTAG('B','A','B','O'), // Bound Boots
-        EFI_BACU = MKTAG('B','A','C','U'), // Bound Cuirass
-        EFI_BAGA = MKTAG('B','A','G','A'), // Bound Gauntlets
-        EFI_BAGR = MKTAG('B','A','G','R'), // Bound Greaves
-        EFI_BAHE = MKTAG('B','A','H','E'), // Bound Helmet
-        EFI_BASH = MKTAG('B','A','S','H'), // Bound Shield
-        EFI_BWAX = MKTAG('B','W','A','X'), // Bound Axe
-        EFI_BWBO = MKTAG('B','W','B','O'), // Bound Bow
-        EFI_BWDA = MKTAG('B','W','D','A'), // Bound Dagger
-        EFI_BWMA = MKTAG('B','W','M','A'), // Bound Mace
-        EFI_BWSW = MKTAG('B','W','S','W'), // Bound Sword
-        EFI_Z001 = MKTAG('Z','0','0','1'), // Summon Rufio's Ghost
-        EFI_Z002 = MKTAG('Z','0','0','2'), // Summon Ancestor Guardian
-        EFI_Z003 = MKTAG('Z','0','0','3'), // Summon Spiderling
-        EFI_Z005 = MKTAG('Z','0','0','5'), // Summon Bear
-        EFI_ZCLA = MKTAG('Z','C','L','A'), // Summon Clannfear
-        EFI_ZDAE = MKTAG('Z','D','A','E'), // Summon Daedroth
-        EFI_ZDRE = MKTAG('Z','D','R','E'), // Summon Dremora
-        EFI_ZDRL = MKTAG('Z','D','R','L'), // Summon Dremora Lord
-        EFI_ZFIA = MKTAG('Z','F','I','A'), // Summon Flame Atronach
-        EFI_ZFRA = MKTAG('Z','F','R','A'), // Summon Frost Atronach
-        EFI_ZGHO = MKTAG('Z','G','H','O'), // Summon Ghost
-        EFI_ZHDZ = MKTAG('Z','H','D','Z'), // Summon Headless Zombie
-        EFI_ZLIC = MKTAG('Z','L','I','C'), // Summon Lich
-        EFI_ZSCA = MKTAG('Z','S','C','A'), // Summon Scamp
-        EFI_ZSKE = MKTAG('Z','S','K','E'), // Summon Skeleton
-        EFI_ZSKA = MKTAG('Z','S','K','A'), // Summon Skeleton Guardian
-        EFI_ZSKH = MKTAG('Z','S','K','H'), // Summon Skeleton Hero
-        EFI_ZSKC = MKTAG('Z','S','K','C'), // Summon Skeleton Champion
-        EFI_ZSPD = MKTAG('Z','S','P','D'), // Summon Spider Daedra
-        EFI_ZSTA = MKTAG('Z','S','T','A'), // Summon Storm Atronach
-        EFI_ZWRA = MKTAG('Z','W','R','A'), // Summon Faded Wraith
-        EFI_ZWRL = MKTAG('Z','W','R','L'), // Summon Gloom Wraith
-        EFI_ZXIV = MKTAG('Z','X','I','V'), // Summon Xivilai
-        EFI_ZZOM = MKTAG('Z','Z','O','M'), // Summon Zombie
-        EFI_TURN = MKTAG('T','U','R','N'), // Turn Undead
+        EFI_BABO = fourCC("BABO"), // Bound Boots
+        EFI_BACU = fourCC("BACU"), // Bound Cuirass
+        EFI_BAGA = fourCC("BAGA"), // Bound Gauntlets
+        EFI_BAGR = fourCC("BAGR"), // Bound Greaves
+        EFI_BAHE = fourCC("BAHE"), // Bound Helmet
+        EFI_BASH = fourCC("BASH"), // Bound Shield
+        EFI_BWAX = fourCC("BWAX"), // Bound Axe
+        EFI_BWBO = fourCC("BWBO"), // Bound Bow
+        EFI_BWDA = fourCC("BWDA"), // Bound Dagger
+        EFI_BWMA = fourCC("BWMA"), // Bound Mace
+        EFI_BWSW = fourCC("BWSW"), // Bound Sword
+        EFI_Z001 = fourCC("Z001"), // Summon Rufio's Ghost
+        EFI_Z002 = fourCC("Z002"), // Summon Ancestor Guardian
+        EFI_Z003 = fourCC("Z003"), // Summon Spiderling
+        EFI_Z005 = fourCC("Z005"), // Summon Bear
+        EFI_ZCLA = fourCC("ZCLA"), // Summon Clannfear
+        EFI_ZDAE = fourCC("ZDAE"), // Summon Daedroth
+        EFI_ZDRE = fourCC("ZDRE"), // Summon Dremora
+        EFI_ZDRL = fourCC("ZDRL"), // Summon Dremora Lord
+        EFI_ZFIA = fourCC("ZFIA"), // Summon Flame Atronach
+        EFI_ZFRA = fourCC("ZFRA"), // Summon Frost Atronach
+        EFI_ZGHO = fourCC("ZGHO"), // Summon Ghost
+        EFI_ZHDZ = fourCC("ZHDZ"), // Summon Headless Zombie
+        EFI_ZLIC = fourCC("ZLIC"), // Summon Lich
+        EFI_ZSCA = fourCC("ZSCA"), // Summon Scamp
+        EFI_ZSKE = fourCC("ZSKE"), // Summon Skeleton
+        EFI_ZSKA = fourCC("ZSKA"), // Summon Skeleton Guardian
+        EFI_ZSKH = fourCC("ZSKH"), // Summon Skeleton Hero
+        EFI_ZSKC = fourCC("ZSKC"), // Summon Skeleton Champion
+        EFI_ZSPD = fourCC("ZSPD"), // Summon Spider Daedra
+        EFI_ZSTA = fourCC("ZSTA"), // Summon Storm Atronach
+        EFI_ZWRA = fourCC("ZWRA"), // Summon Faded Wraith
+        EFI_ZWRL = fourCC("ZWRL"), // Summon Gloom Wraith
+        EFI_ZXIV = fourCC("ZXIV"), // Summon Xivilai
+        EFI_ZZOM = fourCC("ZZOM"), // Summon Zombie
+        EFI_TURN = fourCC("TURN"), // Turn Undead
 
         // Destruction
-        EFI_DGAT = MKTAG('D','G','A','T'), // Damage Attribute
-        EFI_DGFA = MKTAG('D','G','F','A'), // Damage Fatigue
-        EFI_DGHE = MKTAG('D','G','H','E'), // Damage Health
-        EFI_DGSP = MKTAG('D','G','S','P'), // Damage Magicka
-        EFI_DIAR = MKTAG('D','I','A','R'), // Disintegrate Armor
-        EFI_DIWE = MKTAG('D','I','W','E'), // Disintegrate Weapon
-        EFI_DRAT = MKTAG('D','R','A','T'), // Drain Attribute
-        EFI_DRFA = MKTAG('D','R','F','A'), // Drain Fatigue
-        EFI_DRHE = MKTAG('D','R','H','E'), // Drain Health
-        EFI_DRSP = MKTAG('D','R','S','P'), // Drain Magicka
-        EFI_DRSK = MKTAG('D','R','S','K'), // Drain Skill
-        EFI_FIDG = MKTAG('F','I','D','G'), // Fire Damage
-        EFI_FRDG = MKTAG('F','R','D','G'), // Frost Damage
-        EFI_SHDG = MKTAG('S','H','D','G'), // Shock Damage
-        EFI_WKDI = MKTAG('W','K','D','I'), // Weakness to Disease
-        EFI_WKFI = MKTAG('W','K','F','I'), // Weakness to Fire
-        EFI_WKFR = MKTAG('W','K','F','R'), // Weakness to Frost
-        EFI_WKMA = MKTAG('W','K','M','A'), // Weakness to Magic
-        EFI_WKNW = MKTAG('W','K','N','W'), // Weakness to Normal Weapons
-        EFI_WKPO = MKTAG('W','K','P','O'), // Weakness to Poison
-        EFI_WKSH = MKTAG('W','K','S','H'), // Weakness to Shock
+        EFI_DGAT = fourCC("DGAT"), // Damage Attribute
+        EFI_DGFA = fourCC("DGFA"), // Damage Fatigue
+        EFI_DGHE = fourCC("DGHE"), // Damage Health
+        EFI_DGSP = fourCC("DGSP"), // Damage Magicka
+        EFI_DIAR = fourCC("DIAR"), // Disintegrate Armor
+        EFI_DIWE = fourCC("DIWE"), // Disintegrate Weapon
+        EFI_DRAT = fourCC("DRAT"), // Drain Attribute
+        EFI_DRFA = fourCC("DRFA"), // Drain Fatigue
+        EFI_DRHE = fourCC("DRHE"), // Drain Health
+        EFI_DRSP = fourCC("DRSP"), // Drain Magicka
+        EFI_DRSK = fourCC("DRSK"), // Drain Skill
+        EFI_FIDG = fourCC("FIDG"), // Fire Damage
+        EFI_FRDG = fourCC("FRDG"), // Frost Damage
+        EFI_SHDG = fourCC("SHDG"), // Shock Damage
+        EFI_WKDI = fourCC("WKDI"), // Weakness to Disease
+        EFI_WKFI = fourCC("WKFI"), // Weakness to Fire
+        EFI_WKFR = fourCC("WKFR"), // Weakness to Frost
+        EFI_WKMA = fourCC("WKMA"), // Weakness to Magic
+        EFI_WKNW = fourCC("WKNW"), // Weakness to Normal Weapons
+        EFI_WKPO = fourCC("WKPO"), // Weakness to Poison
+        EFI_WKSH = fourCC("WKSH"), // Weakness to Shock
 
         // Illusion
-        EFI_CALM = MKTAG('C','A','L','M'), // Calm
-        EFI_CHML = MKTAG('C','H','M','L'), // Chameleon
-        EFI_CHRM = MKTAG('C','H','R','M'), // Charm
-        EFI_COCR = MKTAG('C','O','C','R'), // Command Creature
-        EFI_COHU = MKTAG('C','O','H','U'), // Command Humanoid
-        EFI_DEMO = MKTAG('D','E','M','O'), // Demoralize
-        EFI_FRNZ = MKTAG('F','R','N','Z'), // Frenzy
-        EFI_INVI = MKTAG('I','N','V','I'), // Invisibility
-        EFI_LGHT = MKTAG('L','G','H','T'), // Light
-        EFI_NEYE = MKTAG('N','E','Y','E'), // Night-Eye
-        EFI_PARA = MKTAG('P','A','R','A'), // Paralyze
-        EFI_RALY = MKTAG('R','A','L','Y'), // Rally
-        EFI_SLNC = MKTAG('S','L','N','C'), // Silence
+        EFI_CALM = fourCC("CALM"), // Calm
+        EFI_CHML = fourCC("CHML"), // Chameleon
+        EFI_CHRM = fourCC("CHRM"), // Charm
+        EFI_COCR = fourCC("COCR"), // Command Creature
+        EFI_COHU = fourCC("COHU"), // Command Humanoid
+        EFI_DEMO = fourCC("DEMO"), // Demoralize
+        EFI_FRNZ = fourCC("FRNZ"), // Frenzy
+        EFI_INVI = fourCC("INVI"), // Invisibility
+        EFI_LGHT = fourCC("LGHT"), // Light
+        EFI_NEYE = fourCC("NEYE"), // Night-Eye
+        EFI_PARA = fourCC("PARA"), // Paralyze
+        EFI_RALY = fourCC("RALY"), // Rally
+        EFI_SLNC = fourCC("SLNC"), // Silence
 
         // Mysticism
-        EFI_DTCT = MKTAG('D','T','C','T'), // Detect Life
-        EFI_DSPL = MKTAG('D','S','P','L'), // Dispel
-        EFI_REDG = MKTAG('R','E','D','G'), // Reflect Damage
-        EFI_RFLC = MKTAG('R','F','L','C'), // Reflect Spell
-        EFI_STRP = MKTAG('S','T','R','P'), // Soul Trap
-        EFI_SABS = MKTAG('S','A','B','S'), // Spell Absorption
-        EFI_TELE = MKTAG('T','E','L','E'), // Telekinesis
+        EFI_DTCT = fourCC("DTCT"), // Detect Life
+        EFI_DSPL = fourCC("DSPL"), // Dispel
+        EFI_REDG = fourCC("REDG"), // Reflect Damage
+        EFI_RFLC = fourCC("RFLC"), // Reflect Spell
+        EFI_STRP = fourCC("STRP"), // Soul Trap
+        EFI_SABS = fourCC("SABS"), // Spell Absorption
+        EFI_TELE = fourCC("TELE"), // Telekinesis
 
         // Restoration
-        EFI_ABAT = MKTAG('A','B','A','T'), // Absorb Attribute
-        EFI_ABFA = MKTAG('A','B','F','A'), // Absorb Fatigue
-        EFI_ABHe = MKTAG('A','B','H','e'), // Absorb Health
-        EFI_ABSP = MKTAG('A','B','S','P'), // Absorb Magicka
-        EFI_ABSK = MKTAG('A','B','S','K'), // Absorb Skill
-        EFI_1400 = MKTAG('1','4','0','0'), // Cure Disease
-        EFI_CUPA = MKTAG('C','U','P','A'), // Cure Paralysis
-        EFI_CUPO = MKTAG('C','U','P','O'), // Cure Poison
-        EFI_FOAT = MKTAG('F','O','A','T'), // Fortify Attribute
-        EFI_FOFA = MKTAG('F','O','F','A'), // Fortify Fatigue
-        EFI_FOHE = MKTAG('F','O','H','E'), // Fortify Health
-        EFI_FOSP = MKTAG('F','O','S','P'), // Fortify Magicka
-        EFI_FOSK = MKTAG('F','O','S','K'), // Fortify Skill
-        EFI_RSDI = MKTAG('R','S','D','I'), // Resist Disease
-        EFI_RSFI = MKTAG('R','S','F','I'), // Resist Fire
-        EFI_RSFR = MKTAG('R','S','F','R'), // Resist Frost
-        EFI_RSMA = MKTAG('R','S','M','A'), // Resist Magic
-        EFI_RSNW = MKTAG('R','S','N','W'), // Resist Normal Weapons
-        EFI_RSPA = MKTAG('R','S','P','A'), // Resist Paralysis
-        EFI_RSPO = MKTAG('R','S','P','O'), // Resist Poison
-        EFI_RSSH = MKTAG('R','S','S','H'), // Resist Shock
-        EFI_REAT = MKTAG('R','E','A','T'), // Restore Attribute
-        EFI_REFA = MKTAG('R','E','F','A'), // Restore Fatigue
-        EFI_REHE = MKTAG('R','E','H','E'), // Restore Health
-        EFI_RESP = MKTAG('R','E','S','P'), // Restore Magicka
+        EFI_ABAT = fourCC("ABAT"), // Absorb Attribute
+        EFI_ABFA = fourCC("ABFA"), // Absorb Fatigue
+        EFI_ABHe = fourCC("ABHe"), // Absorb Health
+        EFI_ABSP = fourCC("ABSP"), // Absorb Magicka
+        EFI_ABSK = fourCC("ABSK"), // Absorb Skill
+        EFI_1400 = fourCC("1400"), // Cure Disease
+        EFI_CUPA = fourCC("CUPA"), // Cure Paralysis
+        EFI_CUPO = fourCC("CUPO"), // Cure Poison
+        EFI_FOAT = fourCC("FOAT"), // Fortify Attribute
+        EFI_FOFA = fourCC("FOFA"), // Fortify Fatigue
+        EFI_FOHE = fourCC("FOHE"), // Fortify Health
+        EFI_FOSP = fourCC("FOSP"), // Fortify Magicka
+        EFI_FOSK = fourCC("FOSK"), // Fortify Skill
+        EFI_RSDI = fourCC("RSDI"), // Resist Disease
+        EFI_RSFI = fourCC("RSFI"), // Resist Fire
+        EFI_RSFR = fourCC("RSFR"), // Resist Frost
+        EFI_RSMA = fourCC("RSMA"), // Resist Magic
+        EFI_RSNW = fourCC("RSNW"), // Resist Normal Weapons
+        EFI_RSPA = fourCC("RSPA"), // Resist Paralysis
+        EFI_RSPO = fourCC("RSPO"), // Resist Poison
+        EFI_RSSH = fourCC("RSSH"), // Resist Shock
+        EFI_REAT = fourCC("REAT"), // Restore Attribute
+        EFI_REFA = fourCC("REFA"), // Restore Fatigue
+        EFI_REHE = fourCC("REHE"), // Restore Health
+        EFI_RESP = fourCC("RESP"), // Restore Magicka
 
         // Effects
-        EFI_LOCK = MKTAG('L','O','C','K'), // Lock Lock
-        EFI_SEFF = MKTAG('S','E','F','F'), // Script Effect
-        EFI_Z020 = MKTAG('Z','0','2','0'), // Summon 20 Extra
-        EFI_MYHL = MKTAG('M','Y','H','L'), // Summon Mythic Dawn Helmet
-        EFI_MYTH = MKTAG('M','Y','T','H'), // Summon Mythic Dawn Armor
-        EFI_REAN = MKTAG('R','E','A','N'), // Reanimate
-        EFI_DISE = MKTAG('D','I','S','E'), // Disease Info
-        EFI_POSN = MKTAG('P','O','S','N'), // Poison Info
-        EFI_DUMY = MKTAG('D','U','M','Y'), // Mehrunes Dagon Custom Effect
-        EFI_STMA = MKTAG('S','T','M','A'), // Stunted Magicka
-        EFI_SUDG = MKTAG('S','U','D','G'), // Sun Damage
-        EFI_VAMP = MKTAG('V','A','M','P'), // Vampirism
-        EFI_DARK = MKTAG('D','A','R','K'), // Darkness
-        EFI_RSWD = MKTAG('R','S','W','D')  // Resist Water Damage
+        EFI_LOCK = fourCC("LOCK"), // Lock Lock
+        EFI_SEFF = fourCC("SEFF"), // Script Effect
+        EFI_Z020 = fourCC("Z020"), // Summon 20 Extra
+        EFI_MYHL = fourCC("MYHL"), // Summon Mythic Dawn Helmet
+        EFI_MYTH = fourCC("MYTH"), // Summon Mythic Dawn Armor
+        EFI_REAN = fourCC("REAN"), // Reanimate
+        EFI_DISE = fourCC("DISE"), // Disease Info
+        EFI_POSN = fourCC("POSN"), // Poison Info
+        EFI_DUMY = fourCC("DUMY"), // Mehrunes Dagon Custom Effect
+        EFI_STMA = fourCC("STMA"), // Stunted Magicka
+        EFI_SUDG = fourCC("SUDG"), // Sun Damage
+        EFI_VAMP = fourCC("VAMP"), // Vampirism
+        EFI_DARK = fourCC("DARK"), // Darkness
+        EFI_RSWD = fourCC("RSWD")  // Resist Water Damage
     };
 
     // Based on http://www.uesp.net/wiki/Tes5Mod:Mod_File_Format#Groups

From d71a1efa9205a8a944b56c69227fda88855e5789 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 23 Apr 2022 00:33:53 +0200
Subject: [PATCH 2339/2859] Rename components/esm4/acti.hpp ->
 components/esm4/loadacti.hpp

---
 apps/openmw_test_suite/esm4/includes.cpp   | 2 +-
 components/esm4/loadacti.cpp               | 2 +-
 components/esm4/{acti.hpp => loadacti.hpp} | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename components/esm4/{acti.hpp => loadacti.hpp} (100%)

diff --git a/apps/openmw_test_suite/esm4/includes.cpp b/apps/openmw_test_suite/esm4/includes.cpp
index 8272571099..3c6be55230 100644
--- a/apps/openmw_test_suite/esm4/includes.cpp
+++ b/apps/openmw_test_suite/esm4/includes.cpp
@@ -1,4 +1,3 @@
-#include <components/esm4/acti.hpp>
 #include <components/esm4/actor.hpp>
 #include <components/esm4/common.hpp>
 #include <components/esm4/dialogue.hpp>
@@ -8,6 +7,7 @@
 #include <components/esm4/lighting.hpp>
 #include <components/esm4/loadachr.hpp>
 #include <components/esm4/loadacre.hpp>
+#include <components/esm4/loadacti.hpp>
 #include <components/esm4/loadalch.hpp>
 #include <components/esm4/loadaloc.hpp>
 #include <components/esm4/loadammo.hpp>
diff --git a/components/esm4/loadacti.cpp b/components/esm4/loadacti.cpp
index cdfd6972fc..801cb9cdd8 100644
--- a/components/esm4/loadacti.cpp
+++ b/components/esm4/loadacti.cpp
@@ -24,7 +24,7 @@
   trial & error.  See http://en.uesp.net/wiki for details.
 
 */
-#include "acti.hpp"
+#include "loadacti.hpp"
 
 #include <stdexcept>
 #include <iostream> // FIXME
diff --git a/components/esm4/acti.hpp b/components/esm4/loadacti.hpp
similarity index 100%
rename from components/esm4/acti.hpp
rename to components/esm4/loadacti.hpp

From 4a49bc494167b12972f0fe398a412860822fdb57 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 23 Apr 2022 00:32:08 +0200
Subject: [PATCH 2340/2859] Remove undefined constructor declaration

---
 components/esm4/loadalch.hpp | 1 -
 components/esm4/loadpack.hpp | 1 -
 2 files changed, 2 deletions(-)

diff --git a/components/esm4/loadalch.hpp b/components/esm4/loadalch.hpp
index e6680dc93b..a3ff9ffe34 100644
--- a/components/esm4/loadalch.hpp
+++ b/components/esm4/loadalch.hpp
@@ -75,7 +75,6 @@ namespace ESM4
         Data mData;
         EnchantedItem mItem;
 
-        Potion();
         virtual ~Potion();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadpack.hpp b/components/esm4/loadpack.hpp
index b7fe895941..849a51c017 100644
--- a/components/esm4/loadpack.hpp
+++ b/components/esm4/loadpack.hpp
@@ -97,7 +97,6 @@ namespace ESM4
         PTDT mTarget;
         std::vector<CTDA> mConditions;
 
-        AIPackage();
         virtual ~AIPackage();
 
         virtual void load(ESM4::Reader& reader);

From 5a1a987f6c99fe2aad73dc8e670c5ef7465d4d2d Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sat, 23 Apr 2022 09:13:22 +0200
Subject: [PATCH 2341/2859] Remove write-only variable.

---
 apps/openmw/mwgui/mapwindow.cpp | 2 --
 apps/openmw/mwgui/tooltips.cpp  | 2 --
 2 files changed, 4 deletions(-)

diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index b5f281d333..428b925920 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -530,12 +530,10 @@ namespace MWGui
             markerTexture = "textures\\detect_enchantment_icon.dds";
         }
 
-        int counter = 0;
         for (const MWWorld::Ptr& ptr : markers)
         {
             const ESM::Position& worldPos = ptr.getRefData().getPosition();
             MarkerUserData markerPos (mLocalMapRender);
-            ++counter;
             MyGUI::ImageBox* markerWidget = mLocalMap->createWidget<MyGUI::ImageBox>("ImageBox",
                 getMarkerCoordinates(worldPos.pos[0], worldPos.pos[1], markerPos, 8), MyGUI::Align::Default);
             markerWidget->setDepth(Local_MarkerAboveFogLayer);
diff --git a/apps/openmw/mwgui/tooltips.cpp b/apps/openmw/mwgui/tooltips.cpp
index 3a2bd65361..f806d3829a 100644
--- a/apps/openmw/mwgui/tooltips.cpp
+++ b/apps/openmw/mwgui/tooltips.cpp
@@ -160,13 +160,11 @@ namespace MWGui
 
                 // try to go 1 level up until there is a widget that has tooltip
                 // this is necessary because some skin elements are actually separate widgets
-                int i=0;
                 while (!focus->isUserString("ToolTipType"))
                 {
                     focus = focus->getParent();
                     if (!focus)
                         return;
-                    ++i;
                 }
 
                 std::string type = focus->getUserString("ToolTipType");

From b88d32ff5b6d0da496d4b5a6df4d8ed4f49701a7 Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sun, 26 Apr 2020 15:31:39 +0200
Subject: [PATCH 2342/2859] Add 3 tabs in the "Data Files" page 1 with the data
 directories 2 with the BSA archives 3 with the content selector

When user select a directory to be added, first we walk the directory
hierarchy to make a list of all potential data= entries. If we find
none, the selected directory is added.

If more than one data directory is found, user is presented with a
directory list to check which one(s) are to be added.

Directories containing one or more content file are marked with an icon.

data= and fallback-archive= lines are handled like content= lines:
- they are part of the profile in launcher.cfg, prefixed by the profile
name
- they are updated in openmw.cfg when profile is selected / created

Directories can be moved in the list by drag and drop or by buttons.
Insertion is possible anywhere in the list.
Global data path and data local are shown but are greyed out, as they
are always included.

No attempt is made to ensure that the user choice are valid
(dependencies, overwrite of content).

After a profile is loaded, any added content is highlighted in green.
---
 CHANGELOG.md                                  |   1 +
 apps/launcher/CMakeLists.txt                  |   1 +
 apps/launcher/datafilespage.cpp               | 326 ++++++++++++++++--
 apps/launcher/datafilespage.hpp               |  24 +-
 components/config/gamesettings.cpp            |  36 +-
 components/config/gamesettings.hpp            |   8 +-
 components/config/launchersettings.cpp        |  61 +++-
 components/config/launchersettings.hpp        |  14 +-
 .../contentselector/model/contentmodel.cpp    |  44 ++-
 .../contentselector/model/contentmodel.hpp    |   7 +-
 .../contentselector/view/contentselector.cpp  |   9 +-
 .../contentselector/view/contentselector.hpp  |   3 +-
 files/ui/datafilespage.ui                     | 135 +++++++-
 files/ui/directorypicker.ui                   |  47 +++
 14 files changed, 662 insertions(+), 54 deletions(-)
 create mode 100644 files/ui/directorypicker.ui

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfcce6018d..6f71991ef8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -118,6 +118,7 @@
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
     Feature #2766: Warn user if their version of Morrowind is not the latest.
     Feature #2780: A way to see current OpenMW version in the console
+    Feature #2858: Add a tab to the launcher for handling datafolders
     Feature #3245: Grid and angle snapping for the OpenMW-CS
     Feature #3616: Allow Zoom levels on the World Map
     Feature #4297: Implement APPLIED_ONCE flag for magic effects
diff --git a/apps/launcher/CMakeLists.txt b/apps/launcher/CMakeLists.txt
index 7e8bd67e94..e3256519c3 100644
--- a/apps/launcher/CMakeLists.txt
+++ b/apps/launcher/CMakeLists.txt
@@ -44,6 +44,7 @@ set(LAUNCHER_UI
     ${CMAKE_SOURCE_DIR}/files/ui/contentselector.ui
     ${CMAKE_SOURCE_DIR}/files/ui/settingspage.ui
     ${CMAKE_SOURCE_DIR}/files/ui/advancedpage.ui
+    ${CMAKE_SOURCE_DIR}/files/ui/directorypicker.ui
 )
 
 source_group(launcher FILES ${LAUNCHER} ${LAUNCHER_HEADER})
diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index 58a20c7853..9268c8e142 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -7,6 +7,9 @@
 #include <QMessageBox>
 #include <QMenu>
 #include <QSortFilterProxyModel>
+#include <QFileDialog>
+#include <QTreeView>
+#include <qnamespace.h>
 #include <thread>
 #include <mutex>
 #include <algorithm>
@@ -20,12 +23,34 @@
 #include <components/config/gamesettings.hpp>
 #include <components/config/launchersettings.hpp>
 
+#include <components/bsa/compressedbsafile.hpp>
 #include <components/navmeshtool/protocol.hpp>
+#include <components/vfs/bsaarchive.hpp>
 
 #include "utils/textinputdialog.hpp"
+#include "utils/profilescombobox.hpp"
+
+#include "ui_directorypicker.h"
 
 const char *Launcher::DataFilesPage::mDefaultContentListName = "Default";
 
+namespace
+{
+    void contentSubdirs(const QString& path, QStringList& dirs)
+    {
+        QStringList fileFilter {"*.esm", "*.esp", "*.omwaddon", "*.bsa"};
+        QStringList dirFilter {"bookart", "icons", "meshes", "music", "sound", "textures"};
+
+        QDir currentDir(path);
+        if (!currentDir.entryInfoList(fileFilter, QDir::Files).empty()
+                || !currentDir.entryInfoList(dirFilter, QDir::Dirs | QDir::NoDotAndDotDot).empty())
+            dirs.push_back(currentDir.absolutePath());
+
+        for (const auto& subdir : currentDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot))
+            contentSubdirs(subdir.absoluteFilePath(), dirs);
+    }
+}
+
 namespace Launcher
 {
     namespace
@@ -114,6 +139,14 @@ Launcher::DataFilesPage::DataFilesPage(Files::ConfigurationManager &cfg, Config:
             this, SLOT(updateNewProfileOkButton(QString)));
     connect(mCloneProfileDialog->lineEdit(), SIGNAL(textChanged(QString)),
             this, SLOT(updateCloneProfileOkButton(QString)));
+    connect(ui.directoryAddSubdirsButton, &QPushButton::released, this, [=]() { this->addSubdirectories(true); });
+    connect(ui.directoryInsertButton,     &QPushButton::released, this, [=]() { this->addSubdirectories(false); });
+    connect(ui.directoryUpButton,         &QPushButton::released, this, [=]() { this->moveDirectory(-1); });
+    connect(ui.directoryDownButton,       &QPushButton::released, this, [=]() { this->moveDirectory(1); });
+    connect(ui.directoryRemoveButton,     &QPushButton::released, this, [=]() { this->removeDirectory(); });
+    connect(ui.archiveUpButton,           &QPushButton::released, this, [=]() { this->moveArchive(-1); });
+    connect(ui.archiveDownButton,         &QPushButton::released, this, [=]() { this->moveArchive(1); });
+    connect(ui.directoryListWidget->model(), &QAbstractItemModel::rowsMoved, this, [=]() { this->sortDirectories(); });
 
     buildView();
     loadSettings();
@@ -128,13 +161,12 @@ Launcher::DataFilesPage::DataFilesPage(Files::ConfigurationManager &cfg, Config:
 
 void Launcher::DataFilesPage::buildView()
 {
-    QToolButton * refreshButton = mSelector->refreshButton();    
+    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);
@@ -188,20 +220,94 @@ bool Launcher::DataFilesPage::loadSettings()
 
 void Launcher::DataFilesPage::populateFileViews(const QString& contentModelName)
 {
-    QStringList paths = mGameSettings.getDataDirs();
+    mSelector->clearFiles();
+    ui.archiveListWidget->clear();
+    ui.directoryListWidget->clear();
 
-    mDataLocal = mGameSettings.getDataLocal();
+    QStringList directories = mLauncherSettings.getDataDirectoryList(contentModelName);
+    if (directories.isEmpty())
+        directories = mGameSettings.getDataDirs();
 
+    mDataLocal = mGameSettings.getDataLocal();
     if (!mDataLocal.isEmpty())
-        paths.insert(0, mDataLocal);
+        directories.insert(0, mDataLocal);
 
-    mSelector->clearFiles();
+    const auto globalDataDir = QString(mGameSettings.getGlobalDataDir().c_str());
+    if (!globalDataDir.isEmpty())
+        directories.insert(0, globalDataDir);
+
+    // add directories, archives and content files
+    directories.removeDuplicates();
+    for (const auto& currentDir : directories)
+    {
+        // add new achives files presents in current directory
+        addArchivesFromDir(currentDir);
+
+        // Display new content with green background
+        QColor background;
+        QString tooltip;
+        if (mNewDataDirs.contains(currentDir))
+        {
+            tooltip += "Will be added to the current profile\n";
+            background = Qt::green;
+        }
+        else
+            background = Qt::white;
+
+        // add content files presents in current directory
+        mSelector->addFiles(currentDir, mNewDataDirs.contains(currentDir));
+
+        // add current directory to list
+        ui.directoryListWidget->addItem(currentDir);
+        auto row = ui.directoryListWidget->count() - 1;
+        auto* item = ui.directoryListWidget->item(row);
+        item->setBackground(background);
+
+        // deactivate data-local and global data directory: they are always included
+        if (currentDir == mDataLocal || currentDir == globalDataDir)
+        {
+            auto flags = item->flags();
+            item->setFlags(flags & ~(Qt::ItemIsDragEnabled|Qt::ItemIsDropEnabled|Qt::ItemIsEnabled));
+        }
 
-    for (const QString &path : paths)
-        mSelector->addFiles(path);
+        // Add a "data file" icon if the directory contains a content file
+        if (mSelector->containsDataFiles(currentDir))
+        {
+            item->setIcon(QIcon(":/images/openmw-plugin.png"));
+            tooltip += "Contains content file(s)";
+        }
+        else
+        {
+            // Pad to correct vertical alignment
+            QPixmap pixmap(QSize(200, 200)); // Arbitrary big number, will be scaled down to widget size
+            pixmap.fill(background);
+            auto emptyIcon = QIcon(pixmap);
+            item->setIcon(emptyIcon);
+        }
+        item->setToolTip(tooltip);
+    }
     mSelector->sortFiles();
 
-    PathIterator pathIterator(paths);
+    QStringList selectedArchives = mLauncherSettings.getArchiveList(contentModelName);
+    if (selectedArchives.isEmpty())
+         selectedArchives = mGameSettings.getArchiveList();
+
+    // sort and tick BSA according to profile
+    int row = 0;
+    for (const auto& archive : selectedArchives)
+    {
+        const auto match = ui.archiveListWidget->findItems(archive, Qt::MatchExactly);
+        if (match.isEmpty())
+            continue;
+        const auto name = match[0]->text();
+        const auto oldrow = ui.archiveListWidget->row(match[0]);
+        ui.archiveListWidget->takeItem(oldrow);
+        ui.archiveListWidget->insertItem(row, name);
+        ui.archiveListWidget->item(row)->setCheckState(Qt::Checked);
+        row++;
+    }
+
+    PathIterator pathIterator(directories);
 
     mSelector->setProfileContent(filesInProfile(contentModelName, pathIterator));
 }
@@ -232,6 +338,9 @@ void Launcher::DataFilesPage::saveSettings(const QString &profile)
     if (profileName.isEmpty())
         profileName = ui.profilesComboBox->currentText();
 
+    //retrieve the data paths
+    auto dirList = selectedDirectoriesPaths();
+
     //retrieve the files selected for the profile
     ContentSelectorModel::ContentFileList items = mSelector->selectedFiles();
 
@@ -243,11 +352,36 @@ void Launcher::DataFilesPage::saveSettings(const QString &profile)
     {
         fileNames.append(item->fileName());
     }
-    mLauncherSettings.setContentList(profileName, fileNames);
-    mGameSettings.setContentList(fileNames);
+    mLauncherSettings.setContentList(profileName, dirList, selectedArchivePaths(), fileNames);
+    mGameSettings.setContentList(dirList, selectedArchivePaths(), fileNames);
 }
 
-QStringList Launcher::DataFilesPage::selectedFilePaths()
+QStringList Launcher::DataFilesPage::selectedDirectoriesPaths() const
+{
+   QStringList dirList;
+   for (int i = 0; i < ui.directoryListWidget->count(); ++i)
+   {
+       if (ui.directoryListWidget->item(i)->background() != Qt::gray)
+           dirList.append(ui.directoryListWidget->item(i)->text());
+   }
+   return dirList;
+}
+
+QStringList Launcher::DataFilesPage::selectedArchivePaths(bool all) const
+{
+   QStringList archiveList;
+   for (int i = 0; i < ui.archiveListWidget->count(); ++i)
+   {
+       const auto* item = ui.archiveListWidget->item(i);
+       const auto archive = ui.archiveListWidget->item(i)->text();
+
+       if (all ||item->checkState() == Qt::Checked)
+           archiveList.append(item->text());
+   }
+   return archiveList;
+}
+
+QStringList Launcher::DataFilesPage::selectedFilePaths() const
 {
     //retrieve the files selected for the profile
     ContentSelectorModel::ContentFileList items = mSelector->selectedFiles();
@@ -255,15 +389,8 @@ QStringList Launcher::DataFilesPage::selectedFilePaths()
     for (const ContentSelectorModel::EsmFile *item : items)
     {
         QFile file(item->filePath());
-        
         if(file.exists())
-        {
             filePaths.append(item->filePath());
-        }
-        else
-        {
-            slotRefreshButtonClicked();
-        }
     }
     return filePaths;
 }
@@ -307,8 +434,18 @@ void Launcher::DataFilesPage::setProfile (const QString &previous, const QString
 
     ui.profilesComboBox->setCurrentProfile (ui.profilesComboBox->findText (current));
 
+    mNewDataDirs.clear();
+    mKnownArchives.clear();
     populateFileViews(current);
 
+    // save list of "old" bsa to be able to display "new" bsa in a different colour
+    for (int i = 0; i < ui.archiveListWidget->count(); ++i)
+    {
+        auto* item = ui.archiveListWidget->item(i);
+        mKnownArchives.push_back(item->text());
+        item->setBackground(Qt::white);
+    }
+
     checkForDefaultProfile();
 }
 
@@ -397,7 +534,7 @@ void Launcher::DataFilesPage::on_cloneProfileAction_triggered()
     if (profile.isEmpty())
         return;
 
-    mLauncherSettings.setContentList(profile, selectedFilePaths());
+    mLauncherSettings.setContentList(profile, selectedDirectoriesPaths(), selectedArchivePaths(), selectedFilePaths());
     addProfile(profile, true);
 }
 
@@ -435,6 +572,155 @@ void Launcher::DataFilesPage::updateCloneProfileOkButton(const QString &text)
     mCloneProfileDialog->setOkButtonEnabled(!text.isEmpty() && ui.profilesComboBox->findText(text) == -1);
 }
 
+QString Launcher::DataFilesPage::selectDirectory()
+{
+    QFileDialog fileDialog(this);
+    fileDialog.setFileMode(QFileDialog::Directory);
+    fileDialog.setOptions(QFileDialog::Option::ShowDirsOnly | QFileDialog::Option::ReadOnly);
+
+    if (fileDialog.exec() == QDialog::Rejected)
+        return {};
+
+    return fileDialog.selectedFiles()[0];
+
+}
+
+void Launcher::DataFilesPage::addSubdirectories(bool append)
+{
+    int selectedRow = append ? ui.directoryListWidget->count() : ui.directoryListWidget->currentRow();
+
+    if (selectedRow == -1)
+        return;
+
+    const auto rootDir = selectDirectory();
+    if (rootDir.isEmpty())
+        return;
+
+    QStringList subdirs;
+    contentSubdirs(rootDir, subdirs);
+
+    if (subdirs.empty())
+    {
+        // we didn't find anything that looks like a content directory, add directory selected by user
+        if (ui.directoryListWidget->findItems(rootDir, Qt::MatchFixedString).isEmpty())
+        {
+            ui.directoryListWidget->addItem(rootDir);
+            mNewDataDirs.push_back(rootDir);
+            refreshDataFilesView();
+        }
+        return;
+    }
+
+    QDialog dialog;
+    Ui::SelectSubdirs select;
+
+    select.setupUi(&dialog);
+
+    for (const auto& dir : subdirs)
+    {
+        if (!ui.directoryListWidget->findItems(dir, Qt::MatchFixedString).isEmpty())
+            continue;
+        const auto lastRow = select.dirListWidget->count();
+        select.dirListWidget->addItem(dir);
+        select.dirListWidget->item(lastRow)->setCheckState(Qt::Unchecked);
+    }
+
+    dialog.show();
+
+    if (dialog.exec() == QDialog::Rejected)
+        return;
+
+    for (int i = 0; i < select.dirListWidget->count(); ++i)
+    {
+       const auto* dir = select.dirListWidget->item(i);
+       if (dir->checkState() == Qt::Checked)
+       {
+           ui.directoryListWidget->insertItem(selectedRow++, dir->text());
+           mNewDataDirs.push_back(dir->text());
+       }
+    }
+
+    refreshDataFilesView();
+}
+
+void Launcher::DataFilesPage::sortDirectories()
+{
+    // Ensure disabled entries (aka default directories) are always at the top.
+    for (auto i = 1; i < ui.directoryListWidget->count(); ++i)
+    {
+        if (!(ui.directoryListWidget->item(i)->flags() & Qt::ItemIsEnabled) &&
+            (ui.directoryListWidget->item(i - 1)->flags() & Qt::ItemIsEnabled))
+        {
+            const auto item = ui.directoryListWidget->takeItem(i);
+            ui.directoryListWidget->insertItem(i - 1, item);
+            ui.directoryListWidget->setCurrentRow(i);
+        }
+    }
+}
+
+void Launcher::DataFilesPage::moveDirectory(int step)
+{
+    int selectedRow = ui.directoryListWidget->currentRow();
+    int newRow = selectedRow + step;
+    if (selectedRow == -1 || newRow < 0 || newRow > ui.directoryListWidget->count() - 1)
+        return;
+
+    if (!(ui.directoryListWidget->item(newRow)->flags() & Qt::ItemIsEnabled))
+        return;
+
+    const auto item = ui.directoryListWidget->takeItem(selectedRow);
+    ui.directoryListWidget->insertItem(newRow, item);
+    ui.directoryListWidget->setCurrentRow(newRow);
+}
+
+void Launcher::DataFilesPage::removeDirectory()
+{
+    for (const auto& path : ui.directoryListWidget->selectedItems())
+        ui.directoryListWidget->takeItem(ui.directoryListWidget->row(path));
+    refreshDataFilesView();
+}
+
+void Launcher::DataFilesPage::moveArchive(int step)
+{
+    int selectedRow = ui.archiveListWidget->currentRow();
+    int newRow = selectedRow + step;
+    if (selectedRow == -1 || newRow < 0 || newRow > ui.archiveListWidget->count() - 1)
+        return;
+
+    const auto* item = ui.archiveListWidget->takeItem(selectedRow);
+
+    addArchive(item->text(), item->checkState(), newRow);
+    ui.archiveListWidget->setCurrentRow(newRow);
+}
+
+void Launcher::DataFilesPage::addArchive(const QString& name, Qt::CheckState selected, int row)
+{
+    if (row == -1)
+        row = ui.archiveListWidget->count();
+    ui.archiveListWidget->insertItem(row, name);
+    ui.archiveListWidget->item(row)->setCheckState(selected);
+    if (mKnownArchives.filter(name).isEmpty()) // XXX why contains doesn't work here ???
+        ui.archiveListWidget->item(row)->setBackground(Qt::green);
+}
+
+void Launcher::DataFilesPage::addArchivesFromDir(const QString& path)
+{
+    QDir dir(path, "*.bsa");
+
+    for (const auto& fileinfo : dir.entryInfoList())
+    {
+        const auto absPath = fileinfo.absoluteFilePath();
+        if (Bsa::CompressedBSAFile::detectVersion(absPath.toStdString()) == Bsa::BSAVER_UNKNOWN)
+            continue;
+
+        const auto fileName = fileinfo.fileName();
+        const auto currentList = selectedArchivePaths(true);
+
+        if (!currentList.contains(fileName, Qt::CaseInsensitive))
+            addArchive(fileName, Qt::Unchecked);
+    }
+}
+
 void Launcher::DataFilesPage::checkForDefaultProfile()
 {
     //don't allow deleting "Default" profile
diff --git a/apps/launcher/datafilespage.hpp b/apps/launcher/datafilespage.hpp
index e004ca7542..0a235209f3 100644
--- a/apps/launcher/datafilespage.hpp
+++ b/apps/launcher/datafilespage.hpp
@@ -43,12 +43,6 @@ namespace Launcher
         void saveSettings(const QString &profile = "");
         bool loadSettings();
 
-        /**
-         * Returns the file paths of all selected content files
-         * @return the file paths of all selected content files
-         */
-        QStringList selectedFilePaths();
-
     signals:
         void signalProfileChanged (int index);
         void signalLoadedCellsChanged(QStringList selectedFiles);
@@ -66,6 +60,11 @@ namespace Launcher
 
         void updateNewProfileOkButton(const QString &text);
         void updateCloneProfileOkButton(const QString &text);
+        void addSubdirectories(bool append);
+        void sortDirectories();
+        void removeDirectory();
+        void moveArchive(int step);
+        void moveDirectory(int step);
 
         void on_newProfileAction_triggered();
         void on_cloneProfileAction_triggered();
@@ -103,10 +102,14 @@ namespace Launcher
         QString mPreviousProfile;
         QStringList previousSelectedFiles;
         QString mDataLocal;
+        QStringList mKnownArchives;
+        QStringList mNewDataDirs;
 
         Process::ProcessInvoker* mNavMeshToolInvoker;
         NavMeshToolProgress mNavMeshToolProgress;
 
+        void addArchive(const QString& name, Qt::CheckState selected, int row = -1);
+        void addArchivesFromDir(const QString& dir);
         void buildView();
         void setProfile (int index, bool savePrevious);
         void setProfile (const QString &previous, const QString &current, bool savePrevious);
@@ -118,6 +121,15 @@ namespace Launcher
         void reloadCells(QStringList selectedFiles);
         void refreshDataFilesView ();
         void updateNavMeshProgress(int minDataSize);
+        QString selectDirectory();
+
+        /**
+         * Returns the file paths of all selected content files
+         * @return the file paths of all selected content files
+         */
+        QStringList selectedFilePaths() const;
+        QStringList selectedArchivePaths(bool all=false) const;
+        QStringList selectedDirectoriesPaths() const;
 
         class PathIterator
         {
diff --git a/components/config/gamesettings.cpp b/components/config/gamesettings.cpp
index 2b4bce5faf..6253d53f45 100644
--- a/components/config/gamesettings.cpp
+++ b/components/config/gamesettings.cpp
@@ -7,7 +7,9 @@
 
 #include <components/files/configurationmanager.hpp>
 
+const char Config::GameSettings::sArchiveKey[] = "fallback-archive";
 const char Config::GameSettings::sContentKey[] = "content";
+const char Config::GameSettings::sDirectoryKey[] = "data";
 
 Config::GameSettings::GameSettings(Files::ConfigurationManager &cfg)
     : mCfgMgr(cfg)
@@ -63,6 +65,14 @@ void Config::GameSettings::validatePaths()
     }
 }
 
+std::string Config::GameSettings::getGlobalDataDir() const
+{
+    // global data dir may not exists if OpenMW is not installed (ie if run from build directory)
+    if (boost::filesystem::exists(mCfgMgr.getGlobalDataPath()))
+        return boost::filesystem::canonical(mCfgMgr.getGlobalDataPath()).string();
+    return {};
+}
+
 QStringList Config::GameSettings::values(const QString &key, const QStringList &defaultValues) const
 {
     if (!mSettings.values(key).isEmpty())
@@ -475,13 +485,29 @@ bool Config::GameSettings::hasMaster()
     return result;
 }
 
-void Config::GameSettings::setContentList(const QStringList& fileNames)
+void Config::GameSettings::setContentList(const QStringList& dirNames, const QStringList& archiveNames, const QStringList& fileNames)
 {
-    remove(sContentKey);
-    for (const QString& fileName : fileNames)
+    auto const reset = [this](const char* key, const QStringList& list)
     {
-        setMultiValue(sContentKey, fileName);
-    }
+        remove(key);
+        for (auto const& item : list)
+            setMultiValue(key, item);
+    };
+
+    reset(sDirectoryKey, dirNames);
+    reset(sArchiveKey, archiveNames);
+    reset(sContentKey, fileNames);
+}
+
+QStringList Config::GameSettings::getDataDirs() const
+{
+    return Config::LauncherSettings::reverse(mDataDirs);
+}
+
+QStringList Config::GameSettings::getArchiveList() const
+{
+    // QMap returns multiple rows in LIFO order, so need to reverse
+    return Config::LauncherSettings::reverse(values(sArchiveKey));
 }
 
 QStringList Config::GameSettings::getContentList() const
diff --git a/components/config/gamesettings.hpp b/components/config/gamesettings.hpp
index 263a151c93..d4191523ad 100644
--- a/components/config/gamesettings.hpp
+++ b/components/config/gamesettings.hpp
@@ -53,7 +53,8 @@ namespace Config
             mUserSettings.remove(key);
         }
 
-        inline QStringList getDataDirs() const { return mDataDirs; }
+        QStringList getDataDirs() const;
+        std::string getGlobalDataDir() const;
 
         inline void removeDataDir(const QString &dir) { if(!dir.isEmpty()) mDataDirs.removeAll(dir); }
         inline void addDataDir(const QString &dir) { if(!dir.isEmpty()) mDataDirs.append(dir); }
@@ -70,7 +71,8 @@ namespace Config
         bool writeFile(QTextStream &stream);
         bool writeFileWithComments(QFile &file);
 
-        void setContentList(const QStringList& fileNames);
+        QStringList getArchiveList() const;
+        void setContentList(const QStringList& dirNames, const QStringList& archiveNames, const QStringList& fileNames);
         QStringList getContentList() const;
 
         void clear();
@@ -85,7 +87,9 @@ namespace Config
         QStringList mDataDirs;
         QString mDataLocal;
 
+        static const char sArchiveKey[];
         static const char sContentKey[];
+        static const char sDirectoryKey[];
 
         static bool isOrderedLine(const QString& line) ;
     };
diff --git a/components/config/launchersettings.cpp b/components/config/launchersettings.cpp
index 025bc43827..f0d9093993 100644
--- a/components/config/launchersettings.cpp
+++ b/components/config/launchersettings.cpp
@@ -7,9 +7,15 @@
 
 #include <QDebug>
 
+#include <boost/filesystem/operations.hpp>
+
+#include <components/files/configurationmanager.hpp>
+
 const char Config::LauncherSettings::sCurrentContentListKey[] = "Profiles/currentprofile";
 const char Config::LauncherSettings::sLauncherConfigFileName[] = "launcher.cfg";
 const char Config::LauncherSettings::sContentListsSectionPrefix[] = "Profiles/";
+const char Config::LauncherSettings::sDirectoryListSuffix[] = "/data";
+const char Config::LauncherSettings::sArchiveListSuffix[] = "/fallback-archive";
 const char Config::LauncherSettings::sContentListSuffix[] = "/content";
 
 QStringList Config::LauncherSettings::subKeys(const QString &key)
@@ -86,6 +92,16 @@ QStringList Config::LauncherSettings::getContentLists()
     return subKeys(QString(sContentListsSectionPrefix));
 }
 
+QString Config::LauncherSettings::makeDirectoryListKey(const QString& contentListName)
+{
+    return QString(sContentListsSectionPrefix) + contentListName + QString(sDirectoryListSuffix);
+}
+
+QString Config::LauncherSettings::makeArchiveListKey(const QString& contentListName)
+{
+    return QString(sContentListsSectionPrefix) + contentListName + QString(sArchiveListSuffix);
+}
+
 QString Config::LauncherSettings::makeContentListKey(const QString& contentListName)
 {
     return QString(sContentListsSectionPrefix) + contentListName + QString(sContentListSuffix);
@@ -94,18 +110,28 @@ QString Config::LauncherSettings::makeContentListKey(const QString& contentListN
 void Config::LauncherSettings::setContentList(const GameSettings& gameSettings)
 {
     // obtain content list from game settings (if present)
+    QStringList dirs(gameSettings.getDataDirs());
+    const QStringList archives(gameSettings.getArchiveList());
     const QStringList files(gameSettings.getContentList());
 
     // if openmw.cfg has no content, exit so we don't create an empty content list.
-    if (files.isEmpty())
+    if (dirs.isEmpty() || files.isEmpty())
     {
         return;
     }
 
+    // global and local data directories are not part of any profile
+    const auto globalDataDir = QString(gameSettings.getGlobalDataDir().c_str());
+    const auto dataLocal = gameSettings.getDataLocal();
+    dirs.removeAll(globalDataDir);
+    dirs.removeAll(dataLocal);
+
     // if any existing profile in launcher matches the content list, make that profile the default
     for (const QString &listName : getContentLists())
     {
-        if (isEqual(files, getContentListFiles(listName)))
+        if (isEqual(files, getContentListFiles(listName)) &&
+            isEqual(archives, getArchiveList(listName)) &&
+            isEqual(dirs, getDataDirectoryList(listName)))
         {
             setCurrentContentListName(listName);
             return;
@@ -115,11 +141,13 @@ void Config::LauncherSettings::setContentList(const GameSettings& gameSettings)
     // otherwise, add content list
     QString newContentListName(makeNewContentListName());
     setCurrentContentListName(newContentListName);
-    setContentList(newContentListName, files);
+    setContentList(newContentListName, dirs, archives, files);
 }
 
 void Config::LauncherSettings::removeContentList(const QString &contentListName)
 {
+    remove(makeDirectoryListKey(contentListName));
+    remove(makeArchiveListKey(contentListName));
     remove(makeContentListKey(contentListName));
 }
 
@@ -129,14 +157,18 @@ void Config::LauncherSettings::setCurrentContentListName(const QString &contentL
     setValue(QString(sCurrentContentListKey), contentListName);
 }
 
-void Config::LauncherSettings::setContentList(const QString& contentListName, const QStringList& fileNames)
+void Config::LauncherSettings::setContentList(const QString& contentListName, const QStringList& dirNames, const QStringList& archiveNames, const QStringList& fileNames)
 {
-    removeContentList(contentListName);
-    QString key = makeContentListKey(contentListName);
-    for (const QString& fileName : fileNames)
+    auto const assign = [this](const QString key, const QStringList& list)
     {
-        setMultiValue(key, fileName);
-    }
+        for (auto const& item : list)
+            setMultiValue(key, item);
+    };
+
+    removeContentList(contentListName);
+    assign(makeDirectoryListKey(contentListName), dirNames);
+    assign(makeArchiveListKey(contentListName), archiveNames);
+    assign(makeContentListKey(contentListName), fileNames);
 }
 
 QString Config::LauncherSettings::getCurrentContentListName() const
@@ -144,6 +176,17 @@ QString Config::LauncherSettings::getCurrentContentListName() const
     return value(QString(sCurrentContentListKey));
 }
 
+QStringList Config::LauncherSettings::getDataDirectoryList(const QString& contentListName) const
+{
+    // QMap returns multiple rows in LIFO order, so need to reverse
+    return reverse(getSettings().values(makeDirectoryListKey(contentListName)));
+}
+
+QStringList Config::LauncherSettings::getArchiveList(const QString& contentListName) const
+{
+    // QMap returns multiple rows in LIFO order, so need to reverse
+    return reverse(getSettings().values(makeArchiveListKey(contentListName)));
+}
 QStringList Config::LauncherSettings::getContentListFiles(const QString& contentListName) const
 {
     // QMap returns multiple rows in LIFO order, so need to reverse
diff --git a/components/config/launchersettings.hpp b/components/config/launchersettings.hpp
index da492c85ce..06632423a8 100644
--- a/components/config/launchersettings.hpp
+++ b/components/config/launchersettings.hpp
@@ -18,7 +18,7 @@ namespace Config
         void setContentList(const GameSettings& gameSettings);
 
         /// Create a Content List (or replace if it already exists)
-        void setContentList(const QString& contentListName, const QStringList& fileNames);
+        void setContentList(const QString& contentListName, const QStringList& dirNames, const QStringList& archiveNames, const QStringList& fileNames);
 
         void removeContentList(const QString &contentListName);
 
@@ -26,15 +26,23 @@ namespace Config
 
         QString getCurrentContentListName() const;
 
+        QStringList getDataDirectoryList(const QString& contentListName) const;
+        QStringList getArchiveList(const QString& contentListName) const;
         QStringList getContentListFiles(const QString& contentListName) const;
 
         /// \return new list that is reversed order of input
         static QStringList reverse(const QStringList& toReverse);
 
         static const char sLauncherConfigFileName[];
-    
+
     private:
 
+        /// \return key to use to get/set the files in the specified data Directory List
+        static QString makeDirectoryListKey(const QString& contentListName);
+
+        /// \return key to use to get/set the files in the specified Archive List
+        static QString makeArchiveListKey(const QString& contentListName);
+
         /// \return key to use to get/set the files in the specified Content List
         static QString makeContentListKey(const QString& contentListName);
 
@@ -51,6 +59,8 @@ namespace Config
         /// section of launcher.cfg holding the Content Lists
         static const char sContentListsSectionPrefix[];
 
+        static const char sDirectoryListSuffix[];
+        static const char sArchiveListSuffix[];
         static const char sContentListSuffix[];
     };
 }
diff --git a/components/contentselector/model/contentmodel.cpp b/components/contentselector/model/contentmodel.cpp
index f7cedc83a4..f4760aaea6 100644
--- a/components/contentselector/model/contentmodel.cpp
+++ b/components/contentselector/model/contentmodel.cpp
@@ -160,6 +160,15 @@ QVariant ContentSelectorModel::ContentModel::data(const QModelIndex &index, int
         return isLoadOrderError(file) ? mWarningIcon : QVariant();
     }
 
+    case Qt::BackgroundRole:
+    {
+        if (isNew(file->fileName()))
+        {
+            return QVariant(QColor(Qt::green));
+        }
+        return QVariant();
+    }
+
     case Qt::EditRole:
     case Qt::DisplayRole:
     {
@@ -413,7 +422,7 @@ void ContentSelectorModel::ContentModel::addFile(EsmFile *file)
     emit dataChanged (idx, idx);
 }
 
-void ContentSelectorModel::ContentModel::addFiles(const QString &path)
+void ContentSelectorModel::ContentModel::addFiles(const QString &path, bool newfiles)
 {
     QDir dir(path);
     QStringList filters;
@@ -471,6 +480,7 @@ void ContentSelectorModel::ContentModel::addFiles(const QString &path)
 
             // Put the file in the table
             addFile(file);
+            setNew(file->fileName(), newfiles);
 
         } catch(std::runtime_error &e) {
             // An error occurred while reading the .esp
@@ -481,6 +491,16 @@ void ContentSelectorModel::ContentModel::addFiles(const QString &path)
     }
 }
 
+bool ContentSelectorModel::ContentModel::containsDataFiles(const QString &path)
+{
+    QDir dir(path);
+    QStringList filters;
+    filters << "*.esp" << "*.esm" << "*.omwgame" << "*.omwaddon";
+    dir.setNameFilters(filters);
+
+    return dir.entryList().count() != 0;
+}
+
 void ContentSelectorModel::ContentModel::clearFiles()
 {
     const int filesCount = mFiles.count();
@@ -553,6 +573,28 @@ bool ContentSelectorModel::ContentModel::isEnabled (const QModelIndex& index) co
     return (flags(index) & Qt::ItemIsEnabled);
 }
 
+bool ContentSelectorModel::ContentModel::isNew(const QString& filepath) const
+{
+    if (mNewFiles.contains(filepath))
+        return mNewFiles[filepath];
+
+    return false;
+}
+
+void ContentSelectorModel::ContentModel::setNew(const QString &filepath, bool isNew)
+{
+    if (filepath.isEmpty())
+        return;
+
+    const EsmFile *file = item(filepath);
+
+    if (!file)
+        return;
+
+    mNewFiles[filepath] = isNew;
+}
+
+
 bool ContentSelectorModel::ContentModel::isLoadOrderError(const EsmFile *file) const
 {
     return mPluginsWithLoadOrderError.contains(file->filePath());
diff --git a/components/contentselector/model/contentmodel.hpp b/components/contentselector/model/contentmodel.hpp
index 4bbe73b427..9a3dddb1c7 100644
--- a/components/contentselector/model/contentmodel.hpp
+++ b/components/contentselector/model/contentmodel.hpp
@@ -43,8 +43,9 @@ namespace ContentSelectorModel
         QMimeData *mimeData(const QModelIndexList &indexes) const override;
         bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override;
 
-        void addFiles(const QString &path);
+        void addFiles(const QString &path, bool newfiles);
         void sortFiles();
+        bool containsDataFiles(const QString &path);
         void clearFiles();
 
         QModelIndex indexFromItem(const EsmFile *item) const;
@@ -56,6 +57,8 @@ namespace ContentSelectorModel
         bool isEnabled (const QModelIndex& index) const;
         bool isChecked(const QString &filepath) const;
         bool setCheckState(const QString &filepath, bool isChecked);
+        bool isNew(const QString &filepath) const;
+        void setNew(const QString &filepath, bool isChecked);
         void setContentList(const QStringList &fileList);
         ContentFileList checkedItems() const;
         void uncheckAll();
@@ -79,7 +82,9 @@ namespace ContentSelectorModel
         QString toolTip(const EsmFile *file) const;
 
         ContentFileList mFiles;
+        QStringList mArchives;
         QHash<QString, Qt::CheckState> mCheckStates;
+        QHash<QString, bool> mNewFiles;
         QSet<QString> mPluginsWithLoadOrderError;
         QString mEncoding;
         QIcon mWarningIcon;
diff --git a/components/contentselector/view/contentselector.cpp b/components/contentselector/view/contentselector.cpp
index ef925148ab..441caa3b23 100644
--- a/components/contentselector/view/contentselector.cpp
+++ b/components/contentselector/view/contentselector.cpp
@@ -153,9 +153,9 @@ ContentSelectorModel::ContentFileList
     return mContentModel->checkedItems();
 }
 
-void ContentSelectorView::ContentSelector::addFiles(const QString &path)
+void ContentSelectorView::ContentSelector::addFiles(const QString &path, bool newfiles)
 {
-    mContentModel->addFiles(path);
+    mContentModel->addFiles(path, newfiles);
 
     // add any game files to the combo box
     for (const QString& gameFileName : mContentModel->gameFiles())
@@ -178,6 +178,11 @@ void ContentSelectorView::ContentSelector::sortFiles()
     mContentModel->sortFiles();
 }
 
+bool ContentSelectorView::ContentSelector::containsDataFiles(const QString &path)
+{
+    return mContentModel->containsDataFiles(path);
+}
+
 void ContentSelectorView::ContentSelector::clearFiles()
 {
     mContentModel->clearFiles();
diff --git a/components/contentselector/view/contentselector.hpp b/components/contentselector/view/contentselector.hpp
index b40675bedc..75ca3e17b4 100644
--- a/components/contentselector/view/contentselector.hpp
+++ b/components/contentselector/view/contentselector.hpp
@@ -27,8 +27,9 @@ namespace ContentSelectorView
 
         QString currentFile() const;
 
-        void addFiles(const QString &path);
+        void addFiles(const QString &path, bool newfiles = false);
         void sortFiles();
+        bool containsDataFiles(const QString &path);
         void clearFiles();
         void setProfileContent (const QStringList &fileList);
 
diff --git a/files/ui/datafilespage.ui b/files/ui/datafilespage.ui
index e942cd652b..dfcf02fced 100644
--- a/files/ui/datafilespage.ui
+++ b/files/ui/datafilespage.ui
@@ -17,16 +17,141 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>2</number>
      </property>
-     <widget class="QWidget" name="tab">
+     <widget class="QWidget" name="dirTab">
       <attribute name="title">
-       <string>Data Files</string>
+       <string>Data Directories</string>
       </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_4">
-       <item>
+      <layout class="QGridLayout" name="dirTabLayout">
+       <item row="0" column="0" rowspan="26">
+        <widget class="QListWidget" name="directoryListWidget">
+         <property name="dragDropMode">
+          <enum>QAbstractItemView::InternalMove</enum>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QPushButton" name="directoryAddSubdirsButton">
+         <property name="toolTip">
+          <string>Scan directories for likely data directories and append them at the end of the list.</string>
+         </property>
+         <property name="text">
+          <string>Append</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QPushButton" name="directoryInsertButton">
+         <property name="toolTip">
+          <string>Scan directories for likely data directories and insert them above the selected position</string>
+         </property>
+         <property name="text">
+          <string>Insert Above</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1">
+        <widget class="QPushButton" name="directoryUpButton">
+         <property name="toolTip">
+          <string>Move selected directory one position up</string>
+         </property>
+         <property name="text">
+          <string>Move Up</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1">
+        <widget class="QPushButton" name="directoryDownButton">
+         <property name="toolTip">
+          <string>Move selected directory one position down</string>
+         </property>
+         <property name="text">
+          <string>Move Down</string>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="1">
+        <widget class="QPushButton" name="directoryRemoveButton">
+         <property name="toolTip">
+          <string>Remove selected directory</string>
+         </property>
+         <property name="text">
+          <string>Remove</string>
+         </property>
+        </widget>
+       </item>
+       <item row="27" column="0" colspan="2">
+        <widget class="QLabel" name="label">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;note: directories that are not part of current Content List are &lt;/span&gt;&lt;span style=&quot; font-style:italic; background-color:#00ff00;&quot;&gt;highlighted&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="archiveTab">
+      <attribute name="title">
+       <string>Archive Files</string>
+      </attribute>
+      <layout class="QGridLayout" name="archiveTabLayout">
+       <item row="0" column="0" rowspan="26">
+        <widget class="QListWidget" name="archiveListWidget">
+         <property name="dragDropMode">
+          <enum>QAbstractItemView::InternalMove</enum>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QPushButton" name="archiveUpButton">
+         <property name="toolTip">
+          <string>Move selected archive one position up</string>
+         </property>
+         <property name="text">
+          <string>Move Up</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QPushButton" name="archiveDownButton">
+         <property name="toolTip">
+          <string>Move selected archive one position down</string>
+         </property>
+         <property name="text">
+          <string>Move Down</string>
+         </property>
+        </widget>
+       </item>
+       <item row="27" column="0" colspan="2">
+        <widget class="QLabel" name="label_2">
+         <property name="text">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;note: archives that are not part of current Content List are &lt;/span&gt;&lt;span style=&quot; font-style:italic; background-color:#00ff00;&quot;&gt;highlighted&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="dataTab">
+      <attribute name="title">
+       <string>Content Files</string>
+      </attribute>
+      <layout class="QGridLayout" name="dataTabLayout">
+       <item row="0" column="0">
         <widget class="QWidget" name="contentSelectorWidget" native="true"/>
        </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="label_3">
+         <property name="text">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;note: content files that are not part of current Content List are &lt;/span&gt;&lt;span style=&quot; font-style:italic; background-color:#00ff00;&quot;&gt;highlighted&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_2">
diff --git a/files/ui/directorypicker.ui b/files/ui/directorypicker.ui
new file mode 100644
index 0000000000..6350bcd2d3
--- /dev/null
+++ b/files/ui/directorypicker.ui
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>SelectSubdirs</class>
+ <widget class="QDialog" name="SelectSubdirs">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>800</width>
+    <height>500</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Select directories you wish to add</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="1" column="0">
+    <widget class="QDialogButtonBox" name="confirmButton">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0">
+    <widget class="QListWidget" name="dirListWidget"/>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>confirmButton</sender>
+   <signal>accepted()</signal>
+   <receiver>SelectSubdirs</receiver>
+   <slot>accept()</slot>
+  </connection>
+  <connection>
+   <sender>confirmButton</sender>
+   <signal>rejected()</signal>
+   <receiver>SelectSubdirs</receiver>
+   <slot>reject()</slot>
+  </connection>
+ </connections>
+</ui>

From eae1e8708160cd26f279934162ef3214e21c6b34 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sat, 23 Apr 2022 15:37:08 +0200
Subject: [PATCH 2343/2859] [Lua] Update openmw.storage

---
 apps/openmw/mwlua/luamanagerimp.cpp         |   4 +-
 apps/openmw_test_suite/lua/test_storage.cpp |  26 ++--
 components/lua/scriptscontainer.hpp         |  14 ++-
 components/lua/storage.cpp                  | 125 +++++++++++---------
 components/lua/storage.hpp                  |  44 ++++---
 files/lua_api/openmw/storage.lua            |  26 ++--
 6 files changed, 143 insertions(+), 96 deletions(-)

diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 80dfef16cd..602f32710f 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -277,8 +277,8 @@ namespace MWLua
             mPlayer.getRefData().setLuaScripts(nullptr);
             mPlayer = MWWorld::Ptr();
         }
-        mGlobalStorage.clearTemporary();
-        mPlayerStorage.clearTemporary();
+        mGlobalStorage.clearTemporaryAndRemoveCallbacks();
+        mPlayerStorage.clearTemporaryAndRemoveCallbacks();
     }
 
     void LuaManager::setupPlayer(const MWWorld::Ptr& ptr)
diff --git a/apps/openmw_test_suite/lua/test_storage.cpp b/apps/openmw_test_suite/lua/test_storage.cpp
index a1c6af6e0a..c1d8cc4c4f 100644
--- a/apps/openmw_test_suite/lua/test_storage.cpp
+++ b/apps/openmw_test_suite/lua/test_storage.cpp
@@ -2,6 +2,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
+#include <components/lua/scriptscontainer.hpp>
 #include <components/lua/storage.hpp>
 
 namespace
@@ -19,15 +20,27 @@ namespace
         sol::state mLua;
         LuaUtil::LuaStorage::initLuaBindings(mLua);
         LuaUtil::LuaStorage storage(mLua);
+
+        std::vector<std::string> callbackCalls;
+        LuaUtil::Callback callback{
+            sol::make_object(mLua, [&](const std::string& section, const sol::optional<std::string>& key)
+            {
+                if (key)
+                    callbackCalls.push_back(section + "_" + *key);
+                else
+                    callbackCalls.push_back(section + "_*");
+            }),
+            sol::table(mLua, sol::create)
+        };
+        callback.mHiddenData[LuaUtil::ScriptsContainer::sScriptIdKey] = "fakeId";
+
         mLua["mutable"] = storage.getMutableSection("test");
         mLua["ro"] = storage.getReadOnlySection("test");
+        mLua["ro"]["subscribe"](mLua["ro"], callback);
 
         mLua.safe_script("mutable:set('x', 5)");
         EXPECT_EQ(get<int>(mLua, "mutable:get('x')"), 5);
         EXPECT_EQ(get<int>(mLua, "ro:get('x')"), 5);
-        EXPECT_FALSE(get<bool>(mLua, "mutable:wasChanged()"));
-        EXPECT_TRUE(get<bool>(mLua, "ro:wasChanged()"));
-        EXPECT_FALSE(get<bool>(mLua, "ro:wasChanged()"));
 
         EXPECT_THROW(mLua.safe_script("ro:set('y', 3)"), std::exception);
 
@@ -42,9 +55,8 @@ namespace
         mLua.safe_script("mutable:reset({x=4, y=7})");
         EXPECT_EQ(get<int>(mLua, "ro:get('x')"), 4);
         EXPECT_EQ(get<int>(mLua, "ro:get('y')"), 7);
-        EXPECT_FALSE(get<bool>(mLua, "mutable:wasChanged()"));
-        EXPECT_TRUE(get<bool>(mLua, "ro:wasChanged()"));
-        EXPECT_FALSE(get<bool>(mLua, "ro:wasChanged()"));
+
+        EXPECT_THAT(callbackCalls, ::testing::ElementsAre("test_x", "test_*", "test_*"));
     }
 
     TEST(LuaUtilStorageTest, Table)
@@ -81,7 +93,7 @@ namespace
         EXPECT_EQ(get<int>(mLua, "permanent:get('x')"), 1);
         EXPECT_EQ(get<int>(mLua, "temporary:get('y')"), 2);
 
-        storage.clearTemporary();
+        storage.clearTemporaryAndRemoveCallbacks();
         mLua["permanent"] = storage.getMutableSection("permanent");
         mLua["temporary"] = storage.getMutableSection("temporary");
         EXPECT_EQ(get<int>(mLua, "permanent:get('x')"), 1);
diff --git a/components/lua/scriptscontainer.hpp b/components/lua/scriptscontainer.hpp
index d968c13a45..e065c487c4 100644
--- a/components/lua/scriptscontainer.hpp
+++ b/components/lua/scriptscontainer.hpp
@@ -249,16 +249,28 @@ namespace LuaUtil
         sol::function mFunc;
         sol::table mHiddenData;  // same object as Script::mHiddenData in ScriptsContainer
 
+        bool isValid() const { return mHiddenData[ScriptsContainer::sScriptIdKey] != sol::nil; }
+
         template <typename... Args>
         sol::object operator()(Args&&... args) const
         {
-            if (mHiddenData[ScriptsContainer::sScriptIdKey] != sol::nil)
+            if (isValid())
                 return LuaUtil::call(mFunc, std::forward<Args>(args)...);
             else
                 Log(Debug::Debug) << "Ignored callback to the removed script "
                                   << mHiddenData.get<std::string>(ScriptsContainer::sScriptDebugNameKey);
             return sol::nil;
         }
+
+        template <typename... Args>
+        void tryCall(Args&&... args) const
+        {
+            try { (*this)(std::forward<Args>(args)...); }
+            catch (std::exception& e)
+            {
+                Log(Debug::Error) << "Error in callback: " << e.what();
+            }
+        }
     };
 
 }
diff --git a/components/lua/storage.cpp b/components/lua/storage.cpp
index 91a339cb03..eff4578d00 100644
--- a/components/lua/storage.cpp
+++ b/components/lua/storage.cpp
@@ -8,9 +8,7 @@
 namespace sol
 {
     template <>
-    struct is_automagical<LuaUtil::LuaStorage::SectionMutableView> : std::false_type {};
-    template <>
-    struct is_automagical<LuaUtil::LuaStorage::SectionReadOnlyView> : std::false_type {};
+    struct is_automagical<LuaUtil::LuaStorage::SectionView> : std::false_type {};
 }
 
 namespace LuaUtil
@@ -38,19 +36,49 @@ namespace LuaUtil
             return sEmpty;
     }
 
+    void LuaStorage::Section::runCallbacks(sol::optional<std::string_view> changedKey)
+    {
+        mStorage->mRunningCallbacks = true;
+        mCallbacks.erase(std::remove_if(mCallbacks.begin(), mCallbacks.end(), [&](const Callback& callback)
+        {
+            bool valid = callback.isValid();
+            if (valid)
+                callback.tryCall(mSectionName, changedKey);
+            return !valid;
+        }), mCallbacks.end());
+        mStorage->mRunningCallbacks = false;
+    }
+
     void LuaStorage::Section::set(std::string_view key, const sol::object& value)
     {
-        mValues[std::string(key)] = Value(value);
-        mChangeCounter++;
+        if (mStorage->mRunningCallbacks)
+            throw std::runtime_error("Not allowed to change storage in storage handlers because it can lead to an infinite recursion");
+        if (value != sol::nil)
+            mValues[std::string(key)] = Value(value);
+        else
+        {
+            auto it = mValues.find(key);
+            if (it != mValues.end())
+                mValues.erase(it);
+        }
         if (mStorage->mListener)
-            (*mStorage->mListener)(mSectionName, key, value);
+            mStorage->mListener->valueChanged(mSectionName, key, value);
+        runCallbacks(key);
     }
 
-    bool LuaStorage::Section::wasChanged(int64_t& lastCheck)
+    void LuaStorage::Section::setAll(const sol::optional<sol::table>& values)
     {
-        bool res = lastCheck < mChangeCounter;
-        lastCheck = mChangeCounter;
-        return res;
+        if (mStorage->mRunningCallbacks)
+            throw std::runtime_error("Not allowed to change storage in storage handlers because it can lead to an infinite recursion");
+        mValues.clear();
+        if (values)
+        {
+            for (const auto& [k, v] : *values)
+                mValues[k.as<std::string>()] = Value(v);
+        }
+        if (mStorage->mListener)
+            mStorage->mListener->sectionReplaced(mSectionName, values);
+        runCallbacks(sol::nullopt);
     }
 
     sol::table LuaStorage::Section::asTable()
@@ -64,62 +92,53 @@ namespace LuaUtil
     void LuaStorage::initLuaBindings(lua_State* L)
     {
         sol::state_view lua(L);
-        sol::usertype<SectionReadOnlyView> roView = lua.new_usertype<SectionReadOnlyView>("ReadOnlySection");
-        sol::usertype<SectionMutableView> mutableView = lua.new_usertype<SectionMutableView>("MutableSection");
-        roView["get"] = [](sol::this_state s, SectionReadOnlyView& section, std::string_view key)
+        sol::usertype<SectionView> sview = lua.new_usertype<SectionView>("Section");
+        sview["get"] = [](sol::this_state s, const SectionView& section, std::string_view key)
         {
             return section.mSection->get(key).getReadOnly(s);
         };
-        roView["getCopy"] = [](sol::this_state s, SectionReadOnlyView& section, std::string_view key)
+        sview["getCopy"] = [](sol::this_state s, const SectionView& section, std::string_view key)
         {
             return section.mSection->get(key).getCopy(s);
         };
-        roView["wasChanged"] = [](SectionReadOnlyView& section) { return section.mSection->wasChanged(section.mLastCheck); };
-        roView["asTable"] = [](SectionReadOnlyView& section) { return section.mSection->asTable(); };
-        mutableView["get"] = [](sol::this_state s, SectionMutableView& section, std::string_view key)
+        sview["asTable"] = [](const SectionView& section) { return section.mSection->asTable(); };
+        sview["subscribe"] = [](const SectionView& section, const Callback& callback)
         {
-            return section.mSection->get(key).getReadOnly(s);
+            std::vector<Callback>& callbacks = section.mSection->mCallbacks;
+            if (!callbacks.empty() && callbacks.size() == callbacks.capacity())
+            {
+                callbacks.erase(std::remove_if(callbacks.begin(), callbacks.end(),
+                                               [&](const Callback& c) { return !c.isValid(); }),
+                                callbacks.end());
+            }
+            callbacks.push_back(callback);
         };
-        mutableView["getCopy"] = [](sol::this_state s, SectionMutableView& section, std::string_view key)
+        sview["reset"] = [](const SectionView& section, const sol::optional<sol::table>& newValues)
         {
-            return section.mSection->get(key).getCopy(s);
+            if (section.mReadOnly)
+                throw std::runtime_error("Access to storage is read only");
+            section.mSection->setAll(newValues);
         };
-        mutableView["wasChanged"] = [](SectionMutableView& section) { return section.mSection->wasChanged(section.mLastCheck); };
-        mutableView["asTable"] = [](SectionMutableView& section) { return section.mSection->asTable(); };
-        mutableView["reset"] = [](SectionMutableView& section, sol::optional<sol::table> newValues)
+        sview["removeOnExit"] = [](const SectionView& section)
         {
-            section.mSection->mValues.clear();
-            if (newValues)
-            {
-                for (const auto& [k, v] : *newValues)
-                {
-                    try
-                    {
-                        section.mSection->set(k.as<std::string_view>(), v);
-                    }
-                    catch (std::exception& e)
-                    {
-                        Log(Debug::Error) << "LuaUtil::LuaStorage::Section::reset(table): " << e.what();
-                    }
-                }
-            }
-            section.mSection->mChangeCounter++;
-            section.mLastCheck = section.mSection->mChangeCounter;
+            if (section.mReadOnly)
+                throw std::runtime_error("Access to storage is read only");
+            section.mSection->mPermanent = false;
         };
-        mutableView["removeOnExit"] = [](SectionMutableView& section) { section.mSection->mPermanent = false; };
-        mutableView["set"] = [](SectionMutableView& section, std::string_view key, const sol::object& value)
+        sview["set"] = [](const SectionView& section, std::string_view key, const sol::object& value)
         {
-            if (section.mLastCheck == section.mSection->mChangeCounter)
-                section.mLastCheck++;
+            if (section.mReadOnly)
+                throw std::runtime_error("Access to storage is read only");
             section.mSection->set(key, value);
         };
     }
 
-    void LuaStorage::clearTemporary()
+    void LuaStorage::clearTemporaryAndRemoveCallbacks()
     {
         auto it = mData.begin();
         while (it != mData.end())
         {
+            it->second->mCallbacks.clear();
             if (!it->second->mPermanent)
             {
                 it->second->mValues.clear();
@@ -157,7 +176,7 @@ namespace LuaUtil
         sol::table data(mLua, sol::create);
         for (const auto& [sectionName, section] : mData)
         {
-            if (section->mPermanent)
+            if (section->mPermanent && !section->mValues.empty())
                 data[sectionName] = section->asTable();
         }
         std::string serializedData = serialize(data);
@@ -178,23 +197,17 @@ namespace LuaUtil
         return newIt->second;
     }
 
-    sol::object LuaStorage::getReadOnlySection(std::string_view sectionName)
-    {
-        const std::shared_ptr<Section>& section = getSection(sectionName);
-        return sol::make_object<SectionReadOnlyView>(mLua, SectionReadOnlyView{section, section->mChangeCounter});
-    }
-
-    sol::object LuaStorage::getMutableSection(std::string_view sectionName)
+    sol::object LuaStorage::getSection(std::string_view sectionName, bool readOnly)
     {
         const std::shared_ptr<Section>& section = getSection(sectionName);
-        return sol::make_object<SectionMutableView>(mLua, SectionMutableView{section, section->mChangeCounter});
+        return sol::make_object<SectionView>(mLua, SectionView{section, readOnly});
     }
 
-    sol::table LuaStorage::getAllSections()
+    sol::table LuaStorage::getAllSections(bool readOnly)
     {
         sol::table res(mLua, sol::create);
         for (const auto& [sectionName, _] : mData)
-            res[sectionName] = getMutableSection(sectionName);
+            res[sectionName] = getSection(sectionName, readOnly);
         return res;
     }
 
diff --git a/components/lua/storage.hpp b/components/lua/storage.hpp
index c23e417f0f..11ea91f039 100644
--- a/components/lua/storage.hpp
+++ b/components/lua/storage.hpp
@@ -4,6 +4,7 @@
 #include <map>
 #include <sol/sol.hpp>
 
+#include "scriptscontainer.hpp"
 #include "serialization.hpp"
 
 namespace LuaUtil
@@ -16,18 +17,28 @@ namespace LuaUtil
 
         explicit LuaStorage(lua_State* lua) : mLua(lua) {}
 
-        void clearTemporary();
+        void clearTemporaryAndRemoveCallbacks();
         void load(const std::string& path);
         void save(const std::string& path) const;
 
-        sol::object getReadOnlySection(std::string_view sectionName);
-        sol::object getMutableSection(std::string_view sectionName);
-        sol::table getAllSections();
+        sol::object getSection(std::string_view sectionName, bool readOnly);
+        sol::object getMutableSection(std::string_view sectionName) { return getSection(sectionName, false); }
+        sol::object getReadOnlySection(std::string_view sectionName) { return getSection(sectionName, true); }
+        sol::table getAllSections(bool readOnly = false);
 
-        void set(std::string_view section, std::string_view key, const sol::object& value) { getSection(section)->set(key, value); }
+        void setSingleValue(std::string_view section, std::string_view key, const sol::object& value)
+            { getSection(section)->set(key, value); }
 
-        using ListenerFn = std::function<void(std::string_view, std::string_view, const sol::object&)>;
-        void setListener(ListenerFn fn) { mListener = std::move(fn); }
+        void setSectionValues(std::string_view section, const sol::optional<sol::table>& values)
+            { getSection(section)->setAll(values); }
+
+        class Listener
+        {
+        public:
+            virtual void valueChanged(std::string_view section, std::string_view key, const sol::object& value) const = 0;
+            virtual void sectionReplaced(std::string_view section, const sol::optional<sol::table>& values) const = 0;
+        };
+        void setListener(const Listener* listener) { mListener = listener; }
 
     private:
         class Value
@@ -48,32 +59,29 @@ namespace LuaUtil
             explicit Section(LuaStorage* storage, std::string name) : mStorage(storage), mSectionName(std::move(name)) {}
             const Value& get(std::string_view key) const;
             void set(std::string_view key, const sol::object& value);
-            bool wasChanged(int64_t& lastCheck);
+            void setAll(const sol::optional<sol::table>& values);
             sol::table asTable();
+            void runCallbacks(sol::optional<std::string_view> changedKey);
 
             LuaStorage* mStorage;
             std::string mSectionName;
             std::map<std::string, Value, std::less<>> mValues;
+            std::vector<Callback> mCallbacks;
             bool mPermanent = true;
-            int64_t mChangeCounter = 0;
             static Value sEmpty;
         };
-        struct SectionMutableView
-        {
-            std::shared_ptr<Section> mSection = nullptr;
-            int64_t mLastCheck = 0;
-        };
-        struct SectionReadOnlyView
+        struct SectionView
         {
-            std::shared_ptr<Section> mSection = nullptr;
-            int64_t mLastCheck = 0;
+            std::shared_ptr<Section> mSection;
+            bool mReadOnly;
         };
 
         const std::shared_ptr<Section>& getSection(std::string_view sectionName);
 
         lua_State* mLua;
         std::map<std::string_view, std::shared_ptr<Section>> mData;
-        std::optional<ListenerFn> mListener;
+        const Listener* mListener = nullptr;
+        bool mRunningCallbacks = false;
     };
 
 }
diff --git a/files/lua_api/openmw/storage.lua b/files/lua_api/openmw/storage.lua
index 5499eefb9c..353c1ca49c 100644
--- a/files/lua_api/openmw/storage.lua
+++ b/files/lua_api/openmw/storage.lua
@@ -6,14 +6,14 @@
 -- local myModData = storage.globalSection('MyModExample')
 -- myModData:set("someVariable", 1.0)
 -- myModData:set("anotherVariable", { exampleStr='abc', exampleBool=true })
--- local function update()
---     if myModCfg:checkChanged() then
---         print('Data was changes by another script:')
---         print('MyModExample.someVariable =', myModData:get('someVariable'))
---         print('MyModExample.anotherVariable.exampleStr =',
---               myModData:get('anotherVariable').exampleStr)
+-- local async = require('openmw.async')
+-- myModData:subscribe(async:callback(function(section, key)
+--     if key then
+--         print('Value is changed:', key, '=', myModData:get(key))
+--     else
+--         print('All values are changed')
 --     end
--- end
+-- end))
 
 ---
 -- Get a section of the global storage; can be used by any script, but only global scripts can change values.
@@ -58,10 +58,12 @@
 -- @param #string key
 
 ---
--- Return `True` if any value in this section was changed by another script since the last `wasChanged`.
--- @function [parent=#StorageSection] wasChanged
+-- Subscribe to changes in this section.
+-- First argument of the callback is the name of the section (so one callback can be used for different sections).
+-- The second argument is the changed key (or `nil` if `reset` was used and all values were changed at the same time)
+-- @function [parent=#StorageSection] subscribe
 -- @param self
--- @return #boolean
+-- @param openmw.async#Callback callback
 
 ---
 -- Copy all values and return them as a table.
@@ -71,14 +73,14 @@
 
 ---
 -- Remove all existing values and assign values from given (the arg is optional) table.
--- Note: `section:reset()` removes all values, but not the section itself. Use `section:removeOnExit()` to remove the section completely.
+-- This function can not be used for a global storage section from a local script.
+-- Note: `section:reset()` removes the section.
 -- @function [parent=#StorageSection] reset
 -- @param self
 -- @param #table values (optional) New values
 
 ---
 -- Make the whole section temporary: will be removed on exit or when load a save.
--- No section can be removed immediately because other scripts may use it at the moment.
 -- Temporary sections have the same interface to get/set values, the only difference is they will not
 -- be saved to the permanent storage on exit.
 -- This function can not be used for a global storage section from a local script.

From 0dcb1f5aac9677399f82aebc413ead001f6b35ac Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 23 Apr 2022 19:00:47 +0200
Subject: [PATCH 2344/2859] Fix build on Windows

Use wrapper header over Windows.h to undefine far and near in a single place.
---
 apps/opencs/editor.cpp                           | 2 +-
 apps/openmw/main.cpp                             | 5 +----
 components/crashcatcher/windows_crashcatcher.hpp | 5 +----
 components/crashcatcher/windows_crashmonitor.cpp | 4 +---
 components/crashcatcher/windows_crashmonitor.hpp | 4 +---
 components/crashcatcher/windows_crashshm.hpp     | 4 +---
 components/debug/debugging.cpp                   | 6 ++----
 components/debug/debugging.hpp                   | 4 +---
 components/files/lowlevelfile.hpp                | 2 +-
 components/misc/thread.cpp                       | 5 +----
 components/windows.hpp                           | 9 +++++++++
 11 files changed, 20 insertions(+), 30 deletions(-)
 create mode 100644 components/windows.hpp

diff --git a/apps/opencs/editor.cpp b/apps/opencs/editor.cpp
index 07154f6d55..40defda4e2 100644
--- a/apps/opencs/editor.cpp
+++ b/apps/opencs/editor.cpp
@@ -15,7 +15,7 @@
 #include "model/world/data.hpp"
 
 #ifdef _WIN32
-#include <Windows.h>
+#include <components/windows.hpp>
 #endif
 
 using namespace Fallback;
diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index 456fe23b60..1dfa2a6494 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -9,10 +9,7 @@
 #include "options.hpp"
 
 #if defined(_WIN32)
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-#include <windows.h>
+#include <components/windows.hpp>
 // makes __argc and __argv available on windows
 #include <cstdlib>
 #endif
diff --git a/components/crashcatcher/windows_crashcatcher.hpp b/components/crashcatcher/windows_crashcatcher.hpp
index e1857271e9..1133afe69c 100644
--- a/components/crashcatcher/windows_crashcatcher.hpp
+++ b/components/crashcatcher/windows_crashcatcher.hpp
@@ -3,10 +3,7 @@
 
 #include <string>
 
-#undef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
-
+#include <components/windows.hpp>
 #include <components/crashcatcher/crashcatcher.hpp>
 
 namespace Crash
diff --git a/components/crashcatcher/windows_crashmonitor.cpp b/components/crashcatcher/windows_crashmonitor.cpp
index 50d3fc08a1..5688d0eeb8 100644
--- a/components/crashcatcher/windows_crashmonitor.cpp
+++ b/components/crashcatcher/windows_crashmonitor.cpp
@@ -1,8 +1,6 @@
 #include "windows_crashmonitor.hpp"
 
-#undef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
+#include <components/windows.hpp>
 #include <Psapi.h>
 
 #include <DbgHelp.h>
diff --git a/components/crashcatcher/windows_crashmonitor.hpp b/components/crashcatcher/windows_crashmonitor.hpp
index eaf908bf66..d6a8dd7ac5 100644
--- a/components/crashcatcher/windows_crashmonitor.hpp
+++ b/components/crashcatcher/windows_crashmonitor.hpp
@@ -1,9 +1,7 @@
 #ifndef WINDOWS_CRASHMONITOR_HPP
 #define WINDOWS_CRASHMONITOR_HPP
 
-#undef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
+#include <components/windows.hpp>
 
 #include <atomic>
 #include <unordered_map>
diff --git a/components/crashcatcher/windows_crashshm.hpp b/components/crashcatcher/windows_crashshm.hpp
index a474600f94..eba478e744 100644
--- a/components/crashcatcher/windows_crashshm.hpp
+++ b/components/crashcatcher/windows_crashshm.hpp
@@ -1,9 +1,7 @@
 #ifndef WINDOWS_CRASHSHM_HPP
 #define WINDOWS_CRASHSHM_HPP
 
-#undef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
+#include <components/windows.hpp>
 
 namespace Crash
 {
diff --git a/components/debug/debugging.cpp b/components/debug/debugging.cpp
index 7d94459136..e1bea70954 100644
--- a/components/debug/debugging.cpp
+++ b/components/debug/debugging.cpp
@@ -7,10 +7,8 @@
 #include <components/crashcatcher/crashcatcher.hpp>
 
 #ifdef _WIN32
-#   include <components/crashcatcher/windows_crashcatcher.hpp>
-#   undef WIN32_LEAN_AND_MEAN
-#   define WIN32_LEAN_AND_MEAN
-#   include <windows.h>
+#include <components/crashcatcher/windows_crashcatcher.hpp>
+#include <components/windows.hpp>
 #endif
 
 namespace Debug
diff --git a/components/debug/debugging.hpp b/components/debug/debugging.hpp
index d0af6d8f25..3e6739c1e1 100644
--- a/components/debug/debugging.hpp
+++ b/components/debug/debugging.hpp
@@ -12,9 +12,7 @@
 #include "debuglog.hpp"
 
 #if defined _WIN32 && defined _DEBUG
-#   undef WIN32_LEAN_AND_MEAN
-#   define WIN32_LEAN_AND_MEAN
-#   include <windows.h>
+#include <components/windows.hpp>
 #endif
 
 namespace Debug
diff --git a/components/files/lowlevelfile.hpp b/components/files/lowlevelfile.hpp
index b2634d8c76..47c2e44f15 100644
--- a/components/files/lowlevelfile.hpp
+++ b/components/files/lowlevelfile.hpp
@@ -19,7 +19,7 @@
 #include <cstdio>
 #elif FILE_API == FILE_API_POSIX
 #elif FILE_API == FILE_API_WIN32
-#include <windows.h>
+#include <components/windows.hpp>
 #else
 #error Unsupported File API
 #endif
diff --git a/components/misc/thread.cpp b/components/misc/thread.cpp
index c78bf17e5a..ca811fdd2f 100644
--- a/components/misc/thread.cpp
+++ b/components/misc/thread.cpp
@@ -25,10 +25,7 @@ namespace Misc
 
 #elif defined(WIN32)
 
-#undef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-
-#include <windows.h>
+#include <components/windows.hpp>
 
 namespace Misc
 {
diff --git a/components/windows.hpp b/components/windows.hpp
new file mode 100644
index 0000000000..003c7bcaae
--- /dev/null
+++ b/components/windows.hpp
@@ -0,0 +1,9 @@
+#ifndef OPENMW_COMPONENTS_WINDOWS_H
+#define OPENMW_COMPONENTS_WINDOWS_H
+
+#include <Windows.h>
+
+#undef far
+#undef near
+
+#endif

From 0c2c47810cd23dafdb77e8ab956b80fc871c7c54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Mon, 25 Apr 2022 12:35:00 +0300
Subject: [PATCH 2345/2859] Increase CI timeout for windows builds to 2h

---
 .gitlab-ci.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5579fcc76b..1e81ffb481 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -414,7 +414,9 @@ variables: &tests-targets
     - MSVC2019_64_Ninja/*/*/*/*/*/*.log
     - MSVC2019_64_Ninja/*/*/*/*/*/*/*.log
     - MSVC2019_64_Ninja/*/*/*/*/*/*/*/*.log
-
+  # 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
+  
 Windows_Ninja_Engine_Release:
   extends:
     - .Windows_Ninja_Base
@@ -539,6 +541,8 @@ Windows_Ninja_Tests_RelWithDebInfo:
     - MSVC2019_64/*/*/*/*/*/*.log
     - MSVC2019_64/*/*/*/*/*/*/*.log
     - MSVC2019_64/*/*/*/*/*/*/*/*.log
+  # 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
 
 Windows_MSBuild_Engine_Release:
   extends:

From 43b2892cc3dda2b3bebfbbdc26c78349116b672d Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 14 Apr 2022 15:48:32 +0200
Subject: [PATCH 2346/2859] Move ESMData, reader and writer out of esmtool
 Arguments

---
 apps/esmtool/esmtool.cpp | 95 ++++++++++++++++++++--------------------
 1 file changed, 47 insertions(+), 48 deletions(-)

diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp
index a6178d692d..d6708fbfb4 100644
--- a/apps/esmtool/esmtool.cpp
+++ b/apps/esmtool/esmtool.cpp
@@ -51,10 +51,6 @@ struct Arguments
 
     std::vector<std::string> types;
     std::string name;
-
-    ESMData data;
-    ESM::ESMReader reader;
-    ESM::ESMWriter writer;
 };
 
 bool parseOptions (int argc, char** argv, Arguments &info)
@@ -186,11 +182,11 @@ bool parseOptions (int argc, char** argv, Arguments &info)
 }
 
 void printRaw(ESM::ESMReader &esm);
-void loadCell(ESM::Cell &cell, ESM::ESMReader &esm, Arguments& info);
+void loadCell(const Arguments& info, ESM::Cell &cell, ESM::ESMReader &esm, ESMData* data);
 
-int load(Arguments& info);
-int clone(Arguments& info);
-int comp(Arguments& info);
+int load(const Arguments& info, ESMData* data);
+int clone(const Arguments& info);
+int comp(const Arguments& info);
 
 int main(int argc, char**argv)
 {
@@ -201,7 +197,7 @@ int main(int argc, char**argv)
             return 1;
 
         if (info.mode == "dump")
-            return load(info);
+            return load(info, nullptr);
         else if (info.mode == "clone")
             return clone(info);
         else if (info.mode == "comp")
@@ -221,7 +217,7 @@ int main(int argc, char**argv)
     return 0;
 }
 
-void loadCell(ESM::Cell &cell, ESM::ESMReader &esm, Arguments& info)
+void loadCell(const Arguments& info, ESM::Cell &cell, ESM::ESMReader &esm, ESMData* data)
 {
     bool quiet = (info.quiet_given || info.mode == "clone");
     bool save = (info.mode == "clone");
@@ -241,9 +237,8 @@ void loadCell(ESM::Cell &cell, ESM::ESMReader &esm, Arguments& info)
     bool moved = false;
     while(cell.getNextRef(esm, ref, deleted, movedCellRef, moved))
     {
-        if (save) {
-            info.data.mCellRefs[&cell].push_back(std::make_pair(ref, deleted));
-        }
+        if (data != nullptr && save)
+            data->mCellRefs[&cell].push_back(std::make_pair(ref, deleted));
 
         if(quiet) continue;
 
@@ -310,9 +305,9 @@ void printRaw(ESM::ESMReader &esm)
     }
 }
 
-int load(Arguments& info)
+int load(const Arguments& info, ESMData* data)
 {
-    ESM::ESMReader& esm = info.reader;
+    ESM::ESMReader esm;
     ToUTF8::Utf8Encoder encoder (ToUTF8::calculateEncoding(info.encoding));
     esm.setEncoder(&encoder);
 
@@ -340,9 +335,12 @@ int load(Arguments& info)
 
         esm.open(filename);
 
-        info.data.author = esm.getAuthor();
-        info.data.description = esm.getDesc();
-        info.data.masters = esm.getGameFiles();
+        if (data != nullptr)
+        {
+            data->author = esm.getAuthor();
+            data->description = esm.getDesc();
+            data->masters = esm.getGameFiles();
+        }
 
         if (!quiet)
         {
@@ -387,12 +385,8 @@ int load(Arguments& info)
 
             // Is the user interested in this record type?
             bool interested = true;
-            if (!info.types.empty())
-            {
-                std::vector<std::string>::iterator match;
-                match = std::find(info.types.begin(), info.types.end(), n.toStringView());
-                if (match == info.types.end()) interested = false;
-            }
+            if (!info.types.empty() && std::find(info.types.begin(), info.types.end(), n.toStringView()) == info.types.end())
+                interested = false;
 
             if (!info.name.empty() && !Misc::StringUtils::ciEqual(info.name, record->getId()))
                 interested = false;
@@ -406,20 +400,22 @@ int load(Arguments& info)
 
             if (record->getType().toInt() == ESM::REC_CELL && loadCells && interested)
             {
-                loadCell(record->cast<ESM::Cell>()->get(), esm, info);
+                loadCell(info, record->cast<ESM::Cell>()->get(), esm, data);
             }
 
-            if (save)
+            if (data != nullptr)
             {
-                info.data.mRecords.push_back(std::move(record));
+                if (save)
+                    data->mRecords.push_back(std::move(record));
+                ++data->mRecordStats[n.toInt()];
             }
-            ++info.data.mRecordStats[n.toInt()];
         }
-
-    } catch(std::exception &e) {
+    }
+    catch (const std::exception &e)
+    {
         std::cout << "\nERROR:\n\n  " << e.what() << std::endl;
-
-        info.data.mRecords.clear();
+        if (data != nullptr)
+            data->mRecords.clear();
         return 1;
     }
 
@@ -428,7 +424,7 @@ int load(Arguments& info)
 
 #include <iomanip>
 
-int clone(Arguments& info)
+int clone(const Arguments& info)
 {
     if (info.outname.empty())
     {
@@ -436,13 +432,14 @@ int clone(Arguments& info)
         return 1;
     }
 
-    if (load(info) != 0)
+    ESMData data;
+    if (load(info, &data) != 0)
     {
         std::cout << "Failed to load, aborting." << std::endl;
         return 1;
     }
 
-    size_t recordCount = info.data.mRecords.size();
+    size_t recordCount = data.mRecords.size();
 
     int digitCount = 1; // For a nicer output
     if (recordCount > 0)
@@ -451,7 +448,7 @@ int clone(Arguments& info)
     std::cout << "Loaded " << recordCount << " records:\n\n";
 
     int i = 0;
-    for (std::pair<int, int> stat : info.data.mRecordStats)
+    for (std::pair<int, int> stat : data.mRecordStats)
     {
         ESM::NAME name;
         name = stat.first;
@@ -466,22 +463,22 @@ int clone(Arguments& info)
 
     std::cout << "\nSaving records to: " << info.outname << "...\n";
 
-    ESM::ESMWriter& esm = info.writer;
+    ESM::ESMWriter esm;
     ToUTF8::Utf8Encoder encoder (ToUTF8::calculateEncoding(info.encoding));
     esm.setEncoder(&encoder);
-    esm.setAuthor(info.data.author);
-    esm.setDescription(info.data.description);
-    esm.setVersion(info.data.version);
+    esm.setAuthor(data.author);
+    esm.setDescription(data.description);
+    esm.setVersion(data.version);
     esm.setRecordCount (recordCount);
 
-    for (const ESM::Header::MasterData &master : info.data.masters)
+    for (const ESM::Header::MasterData &master : 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;
-    for (auto& record : info.data.mRecords)
+    for (auto& record : data.mRecords)
     {
         if (i <= 0)
             break;
@@ -493,9 +490,9 @@ int clone(Arguments& info)
         record->save(esm);
         if (typeName.toInt() == ESM::REC_CELL) {
             ESM::Cell *ptr = &record->cast<ESM::Cell>()->get();
-            if (!info.data.mCellRefs[ptr].empty()) 
+            if (!data.mCellRefs[ptr].empty())
             {
-                for (std::pair<ESM::CellRef, bool> &ref : info.data.mCellRefs[ptr])
+                for (std::pair<ESM::CellRef, bool> &ref : data.mCellRefs[ptr])
                     ref.first.save(esm, ref.second);
             }
         }
@@ -518,7 +515,7 @@ int clone(Arguments& info)
     return 0;
 }
 
-int comp(Arguments& info)
+int comp(const Arguments& info)
 {
     if (info.filename.empty() || info.outname.empty())
     {
@@ -541,19 +538,21 @@ int comp(Arguments& info)
     fileOne.filename = info.filename;
     fileTwo.filename = info.outname;
 
-    if (load(fileOne) != 0)
+    ESMData dataOne;
+    if (load(fileOne, &dataOne) != 0)
     {
         std::cout << "Failed to load " << info.filename << ", aborting comparison." << std::endl;
         return 1;
     }
 
-    if (load(fileTwo) != 0)
+    ESMData dataTwo;
+    if (load(fileTwo, &dataTwo) != 0)
     {
         std::cout << "Failed to load " << info.outname << ", aborting comparison." << std::endl;
         return 1;
     }
 
-    if (fileOne.data.mRecords.size() != fileTwo.data.mRecords.size())
+    if (dataOne.mRecords.size() != dataTwo.mRecords.size())
     {
         std::cout << "Not equal, different amount of records." << std::endl;
         return 1;

From c7ba4100e1278e7a5f77a3910d7b48f236783a75 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 24 Apr 2022 18:50:37 +0200
Subject: [PATCH 2347/2859] Remove undefined and redundant ESM4 record type
 constructors

---
 components/esm4/loadaloc.hpp | 1 -
 components/esm4/loadgrup.hpp | 4 ----
 components/esm4/loadhdpt.hpp | 1 -
 components/esm4/loadmstt.hpp | 1 -
 components/esm4/loadpgrd.hpp | 1 -
 components/esm4/loadpgre.hpp | 1 -
 components/esm4/loadpwat.hpp | 1 -
 7 files changed, 10 deletions(-)

diff --git a/components/esm4/loadaloc.hpp b/components/esm4/loadaloc.hpp
index 1c2d17d11e..a58efd289e 100644
--- a/components/esm4/loadaloc.hpp
+++ b/components/esm4/loadaloc.hpp
@@ -75,7 +75,6 @@ namespace ESM4
         std::uint32_t mDayStart;
         std::uint32_t mNightStart;
 
-        MediaLocationController();
         virtual ~MediaLocationController();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadgrup.hpp b/components/esm4/loadgrup.hpp
index 8eb53a0e58..4b9aa9547b 100644
--- a/components/esm4/loadgrup.hpp
+++ b/components/esm4/loadgrup.hpp
@@ -86,8 +86,6 @@ namespace ESM4
         FormId mRoad;
 
         std::vector<FormId> mCells; // FIXME should this be CellGroup* instead?
-
-        WorldGroup() : mWorld(0), mRoad(0) {}
     };
 
     // http://www.uesp.net/wiki/Tes4Mod:Mod_File_Format/CELL
@@ -150,8 +148,6 @@ namespace ESM4
 
         // need to keep modindex and context for lazy loading (of all the files that contribute
         // to this group)
-
-        CellGroup() : mCell(0), mLand(0), mPgrd(0) {}
     };
 }
 
diff --git a/components/esm4/loadhdpt.hpp b/components/esm4/loadhdpt.hpp
index 9b67b0fce8..7ec46a32bc 100644
--- a/components/esm4/loadhdpt.hpp
+++ b/components/esm4/loadhdpt.hpp
@@ -53,7 +53,6 @@ namespace ESM4
         std::array<std::string, 3> mTriFile;
         FormId mBaseTexture;
 
-        HeadPart();
         virtual ~HeadPart();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadmstt.hpp b/components/esm4/loadmstt.hpp
index 77dc453d35..0b9873a91a 100644
--- a/components/esm4/loadmstt.hpp
+++ b/components/esm4/loadmstt.hpp
@@ -47,7 +47,6 @@ namespace ESM4
         std::int8_t mData;
         FormId mLoopingSound;
 
-        MovableStatic();
         virtual ~MovableStatic();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadpgrd.hpp b/components/esm4/loadpgrd.hpp
index 9f522af5ca..74672a1f92 100644
--- a/components/esm4/loadpgrd.hpp
+++ b/components/esm4/loadpgrd.hpp
@@ -83,7 +83,6 @@ namespace ESM4
         std::vector<PGRI> mForeign;
         std::vector<PGRL> mObjects;
 
-        Pathgrid();
         virtual ~Pathgrid();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadpgre.hpp b/components/esm4/loadpgre.hpp
index bb36acfc37..1929cd4c52 100644
--- a/components/esm4/loadpgre.hpp
+++ b/components/esm4/loadpgre.hpp
@@ -46,7 +46,6 @@ namespace ESM4
 
         std::string mEditorId;
 
-        PlacedGrenade();
         virtual ~PlacedGrenade();
 
         virtual void load(ESM4::Reader& reader);
diff --git a/components/esm4/loadpwat.hpp b/components/esm4/loadpwat.hpp
index e1de91ab96..b2dc2c4e00 100644
--- a/components/esm4/loadpwat.hpp
+++ b/components/esm4/loadpwat.hpp
@@ -46,7 +46,6 @@ namespace ESM4
 
         std::string mEditorId;
 
-        PlaceableWater();
         virtual ~PlaceableWater();
 
         virtual void load(ESM4::Reader& reader);

From 13c970b37a2cd640ccc1ca380155e1c63568a494 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 24 Apr 2022 18:51:30 +0200
Subject: [PATCH 2348/2859] Add const modifier to encoder type

---
 components/esm/reader.cpp  | 2 +-
 components/esm/reader.hpp  | 4 ++--
 components/esm4/reader.hpp | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/esm/reader.cpp b/components/esm/reader.cpp
index 519c547bb8..0e2e9a9b8a 100644
--- a/components/esm/reader.cpp
+++ b/components/esm/reader.cpp
@@ -38,7 +38,7 @@ namespace ESM
     }
 
     bool Reader::getStringImpl(std::string& str, std::size_t size,
-            std::istream& stream, ToUTF8::StatelessUtf8Encoder* encoder, bool hasNull)
+            std::istream& stream, const ToUTF8::StatelessUtf8Encoder* encoder, bool hasNull)
     {
         std::size_t newSize = size;
 
diff --git a/components/esm/reader.hpp b/components/esm/reader.hpp
index ffc416dc18..fc3845d87e 100644
--- a/components/esm/reader.hpp
+++ b/components/esm/reader.hpp
@@ -31,7 +31,7 @@ namespace ESM
 
         virtual inline bool hasMoreRecs() const = 0;
 
-        virtual inline void setEncoder(ToUTF8::StatelessUtf8Encoder* encoder) = 0;
+        virtual inline void setEncoder(const ToUTF8::StatelessUtf8Encoder* encoder) = 0;
 
         // used to check for dependencies e.g. CS::Editor::run()
         virtual inline const std::vector<ESM::MasterData>& getGameFiles() const = 0;
@@ -53,7 +53,7 @@ namespace ESM
 
     protected:
         bool getStringImpl(std::string& str, std::size_t size,
-                std::istream& stream, ToUTF8::StatelessUtf8Encoder* encoder, bool hasNull = false);
+                std::istream& stream, const ToUTF8::StatelessUtf8Encoder* encoder, bool hasNull = false);
     };
 }
 
diff --git a/components/esm4/reader.hpp b/components/esm4/reader.hpp
index 863121cf38..aaebeb335a 100644
--- a/components/esm4/reader.hpp
+++ b/components/esm4/reader.hpp
@@ -78,7 +78,7 @@ namespace ESM4 {
 
         ReaderContext        mCtx;
 
-        ToUTF8::StatelessUtf8Encoder* mEncoder;
+        const ToUTF8::StatelessUtf8Encoder* mEncoder;
 
         std::size_t          mFileSize;
 
@@ -143,7 +143,7 @@ namespace ESM4 {
 
         inline bool isEsm4() const final { return true; }
 
-        inline void setEncoder(ToUTF8::StatelessUtf8Encoder* encoder) final { mEncoder = encoder; };
+        inline void setEncoder(const ToUTF8::StatelessUtf8Encoder* encoder) final { mEncoder = encoder; };
 
         const std::vector<ESM::MasterData>& getGameFiles() const final { return mHeader.mMaster; }
 

From 2c9b6fffe51791ccece206f81c3a44973afab17c Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 24 Apr 2022 19:00:35 +0200
Subject: [PATCH 2349/2859] Remove preloading logic from ESM4::Cell

This logic does not belong here. If client of ESM4::Cell needs to cache load
results it can be done separately.
---
 components/esm4/loadcell.cpp | 32 ++++++++------------------------
 components/esm4/loadcell.hpp |  5 -----
 2 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/components/esm4/loadcell.cpp b/components/esm4/loadcell.cpp
index 0b90a7cdbf..97b3603204 100644
--- a/components/esm4/loadcell.cpp
+++ b/components/esm4/loadcell.cpp
@@ -43,7 +43,14 @@ ESM4::Cell::~Cell()
 {
 }
 
-void ESM4::Cell::init(ESM4::Reader& reader)
+// TODO: Try loading only EDID and XCLC (along with mFormId, mFlags and mParent)
+//
+// But, for external cells we may be scanning the whole record since we don't know if there is
+// going to be an EDID subrecord. And the vast majority of cells are these kinds.
+//
+// So perhaps some testing needs to be done to see if scanning and skipping takes
+// longer/shorter/same as loading the subrecords.
+void ESM4::Cell::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
@@ -64,33 +71,10 @@ void ESM4::Cell::init(ESM4::Reader& reader)
         currCellGrid.grid.y = 0;
         reader.setCurrCellGrid(currCellGrid);  // side effect: sets mCellGridValid  true
     }
-}
-
-// TODO: Try loading only EDID and XCLC (along with mFormId, mFlags and mParent)
-//
-// But, for external cells we may be scanning the whole record since we don't know if there is
-// going to be an EDID subrecord. And the vast majority of cells are these kinds.
-//
-// So perhaps some testing needs to be done to see if scanning and skipping takes
-// longer/shorter/same as loading the subrecords.
-bool ESM4::Cell::preload(ESM4::Reader& reader)
-{
-    if (!mPreloaded)
-        load(reader);
-
-    mPreloaded = true;
-    return true;
-}
-
-void ESM4::Cell::load(ESM4::Reader& reader)
-{
-    if (mPreloaded)
-        return;
 
     // WARN: we need to call setCurrCell (and maybe setCurrCellGrid?) again before loading
     // cell child groups if we are loading them after restoring the context
     // (may be easier to update the context before saving?)
-    init(reader);
     reader.setCurrCell(mFormId); // save for LAND (and other children) to access later
     std::uint32_t esmVer = reader.esmVersion();
     bool isFONV = esmVer == ESM::VER_132 || esmVer == ESM::VER_133 || esmVer == ESM::VER_134;
diff --git a/components/esm4/loadcell.hpp b/components/esm4/loadcell.hpp
index c2274fcbe9..3dff4fdf0a 100644
--- a/components/esm4/loadcell.hpp
+++ b/components/esm4/loadcell.hpp
@@ -93,11 +93,6 @@ namespace ESM4
 
         virtual ~Cell();
 
-        void init(ESM4::Reader& reader); // common setup for both preload() and load()
-
-        bool mPreloaded;
-        bool preload(ESM4::Reader& reader);
-
         virtual void load(ESM4::Reader& reader);
         //virtual void save(ESM4::Writer& writer) const;
 

From 4b28d51d5eca8e75bf907b6fbcd1e510f9525c3e Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 24 Apr 2022 19:20:17 +0200
Subject: [PATCH 2350/2859] Remove virtual modifiers from ESM4 record functions

There is no need to have virtual functions.
---
 components/esm4/loadachr.cpp | 4 ----
 components/esm4/loadachr.hpp | 6 ++----
 components/esm4/loadacre.cpp | 4 ----
 components/esm4/loadacre.hpp | 6 ++----
 components/esm4/loadacti.cpp | 4 ----
 components/esm4/loadacti.hpp | 6 ++----
 components/esm4/loadalch.cpp | 4 ----
 components/esm4/loadalch.hpp | 6 ++----
 components/esm4/loadaloc.cpp | 4 ----
 components/esm4/loadaloc.hpp | 6 ++----
 components/esm4/loadammo.cpp | 4 ----
 components/esm4/loadammo.hpp | 6 ++----
 components/esm4/loadanio.cpp | 4 ----
 components/esm4/loadanio.hpp | 6 ++----
 components/esm4/loadappa.cpp | 4 ----
 components/esm4/loadappa.hpp | 6 ++----
 components/esm4/loadarma.cpp | 4 ----
 components/esm4/loadarma.hpp | 6 ++----
 components/esm4/loadarmo.cpp | 4 ----
 components/esm4/loadarmo.hpp | 6 ++----
 components/esm4/loadaspc.cpp | 4 ----
 components/esm4/loadaspc.hpp | 6 ++----
 components/esm4/loadbook.cpp | 4 ----
 components/esm4/loadbook.hpp | 6 ++----
 components/esm4/loadbptd.cpp | 4 ----
 components/esm4/loadbptd.hpp | 6 ++----
 components/esm4/loadcell.cpp | 4 ----
 components/esm4/loadcell.hpp | 6 ++----
 components/esm4/loadclas.cpp | 4 ----
 components/esm4/loadclas.hpp | 2 --
 components/esm4/loadclfm.cpp | 4 ----
 components/esm4/loadclfm.hpp | 6 ++----
 components/esm4/loadclot.cpp | 4 ----
 components/esm4/loadclot.hpp | 6 ++----
 components/esm4/loadcont.cpp | 4 ----
 components/esm4/loadcont.hpp | 6 ++----
 components/esm4/loadcrea.cpp | 4 ----
 components/esm4/loadcrea.hpp | 6 ++----
 components/esm4/loaddial.cpp | 4 ----
 components/esm4/loaddial.hpp | 6 ++----
 components/esm4/loaddobj.cpp | 4 ----
 components/esm4/loaddobj.hpp | 6 ++----
 components/esm4/loaddoor.cpp | 4 ----
 components/esm4/loaddoor.hpp | 6 ++----
 components/esm4/loadeyes.cpp | 4 ----
 components/esm4/loadeyes.hpp | 6 ++----
 components/esm4/loadflor.cpp | 4 ----
 components/esm4/loadflor.hpp | 6 ++----
 components/esm4/loadflst.cpp | 4 ----
 components/esm4/loadflst.hpp | 6 ++----
 components/esm4/loadfurn.cpp | 4 ----
 components/esm4/loadfurn.hpp | 6 ++----
 components/esm4/loadglob.cpp | 4 ----
 components/esm4/loadglob.hpp | 6 ++----
 components/esm4/loadgras.cpp | 4 ----
 components/esm4/loadgras.hpp | 6 ++----
 components/esm4/loadhair.cpp | 4 ----
 components/esm4/loadhair.hpp | 6 ++----
 components/esm4/loadhdpt.cpp | 4 ----
 components/esm4/loadhdpt.hpp | 6 ++----
 components/esm4/loadidle.cpp | 4 ----
 components/esm4/loadidle.hpp | 6 ++----
 components/esm4/loadidlm.cpp | 4 ----
 components/esm4/loadidlm.hpp | 6 ++----
 components/esm4/loadimod.cpp | 4 ----
 components/esm4/loadimod.hpp | 6 ++----
 components/esm4/loadinfo.cpp | 4 ----
 components/esm4/loadinfo.hpp | 6 ++----
 components/esm4/loadingr.cpp | 4 ----
 components/esm4/loadingr.hpp | 6 ++----
 components/esm4/loadkeym.cpp | 4 ----
 components/esm4/loadkeym.hpp | 6 ++----
 components/esm4/loadland.cpp | 4 ----
 components/esm4/loadland.hpp | 2 --
 components/esm4/loadlgtm.cpp | 4 ----
 components/esm4/loadlgtm.hpp | 6 ++----
 components/esm4/loadligh.cpp | 4 ----
 components/esm4/loadligh.hpp | 6 ++----
 components/esm4/loadltex.cpp | 4 ----
 components/esm4/loadltex.hpp | 6 ++----
 components/esm4/loadlvlc.cpp | 4 ----
 components/esm4/loadlvlc.hpp | 6 ++----
 components/esm4/loadlvli.cpp | 4 ----
 components/esm4/loadlvli.hpp | 6 ++----
 components/esm4/loadlvln.cpp | 4 ----
 components/esm4/loadlvln.hpp | 6 ++----
 components/esm4/loadmato.cpp | 4 ----
 components/esm4/loadmato.hpp | 6 ++----
 components/esm4/loadmisc.cpp | 4 ----
 components/esm4/loadmisc.hpp | 6 ++----
 components/esm4/loadmset.cpp | 4 ----
 components/esm4/loadmset.hpp | 6 ++----
 components/esm4/loadmstt.cpp | 4 ----
 components/esm4/loadmstt.hpp | 6 ++----
 components/esm4/loadmusc.cpp | 4 ----
 components/esm4/loadmusc.hpp | 6 ++----
 components/esm4/loadnavi.cpp | 4 ----
 components/esm4/loadnavi.hpp | 6 ++----
 components/esm4/loadnavm.cpp | 4 ----
 components/esm4/loadnavm.hpp | 6 ++----
 components/esm4/loadnote.cpp | 4 ----
 components/esm4/loadnote.hpp | 6 ++----
 components/esm4/loadnpc.cpp  | 4 ----
 components/esm4/loadnpc.hpp  | 6 ++----
 components/esm4/loadotft.cpp | 4 ----
 components/esm4/loadotft.hpp | 6 ++----
 components/esm4/loadpack.cpp | 4 ----
 components/esm4/loadpack.hpp | 6 ++----
 components/esm4/loadpgrd.cpp | 4 ----
 components/esm4/loadpgrd.hpp | 6 ++----
 components/esm4/loadpgre.cpp | 4 ----
 components/esm4/loadpgre.hpp | 6 ++----
 components/esm4/loadpwat.cpp | 4 ----
 components/esm4/loadpwat.hpp | 6 ++----
 components/esm4/loadqust.cpp | 4 ----
 components/esm4/loadqust.hpp | 6 ++----
 components/esm4/loadrace.cpp | 4 ----
 components/esm4/loadrace.hpp | 6 ++----
 components/esm4/loadrefr.cpp | 4 ----
 components/esm4/loadrefr.hpp | 6 ++----
 components/esm4/loadregn.cpp | 4 ----
 components/esm4/loadregn.hpp | 6 ++----
 components/esm4/loadroad.cpp | 4 ----
 components/esm4/loadroad.hpp | 6 ++----
 components/esm4/loadsbsp.cpp | 4 ----
 components/esm4/loadsbsp.hpp | 2 --
 components/esm4/loadscol.cpp | 4 ----
 components/esm4/loadscol.hpp | 6 ++----
 components/esm4/loadscpt.cpp | 4 ----
 components/esm4/loadscpt.hpp | 6 ++----
 components/esm4/loadscrl.cpp | 4 ----
 components/esm4/loadscrl.hpp | 6 ++----
 components/esm4/loadsgst.cpp | 4 ----
 components/esm4/loadsgst.hpp | 6 ++----
 components/esm4/loadslgm.cpp | 4 ----
 components/esm4/loadslgm.hpp | 6 ++----
 components/esm4/loadsndr.cpp | 4 ----
 components/esm4/loadsndr.hpp | 6 ++----
 components/esm4/loadsoun.cpp | 4 ----
 components/esm4/loadsoun.hpp | 6 ++----
 components/esm4/loadstat.cpp | 4 ----
 components/esm4/loadstat.hpp | 6 ++----
 components/esm4/loadtact.cpp | 4 ----
 components/esm4/loadtact.hpp | 6 ++----
 components/esm4/loadterm.cpp | 4 ----
 components/esm4/loadterm.hpp | 6 ++----
 components/esm4/loadtree.cpp | 4 ----
 components/esm4/loadtree.hpp | 6 ++----
 components/esm4/loadtxst.cpp | 4 ----
 components/esm4/loadtxst.hpp | 6 ++----
 components/esm4/loadweap.cpp | 4 ----
 components/esm4/loadweap.hpp | 6 ++----
 components/esm4/loadwrld.cpp | 4 ----
 components/esm4/loadwrld.hpp | 6 ++----
 154 files changed, 148 insertions(+), 610 deletions(-)

diff --git a/components/esm4/loadachr.cpp b/components/esm4/loadachr.cpp
index e006588475..7a62b5cdbd 100644
--- a/components/esm4/loadachr.cpp
+++ b/components/esm4/loadachr.cpp
@@ -32,10 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::ActorCharacter::~ActorCharacter()
-{
-}
-
 void ESM4::ActorCharacter::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadachr.hpp b/components/esm4/loadachr.hpp
index 7f78aa32d1..89b1ad7c86 100644
--- a/components/esm4/loadachr.hpp
+++ b/components/esm4/loadachr.hpp
@@ -57,10 +57,8 @@ namespace ESM4
 
         EnableParent mEsp;
 
-        virtual ~ActorCharacter();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadacre.cpp b/components/esm4/loadacre.cpp
index 9eb0cc7e5f..33d402eb81 100644
--- a/components/esm4/loadacre.cpp
+++ b/components/esm4/loadacre.cpp
@@ -32,10 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::ActorCreature::~ActorCreature()
-{
-}
-
 void ESM4::ActorCreature::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadacre.hpp b/components/esm4/loadacre.hpp
index 0b436d762b..4be76a5a8a 100644
--- a/components/esm4/loadacre.hpp
+++ b/components/esm4/loadacre.hpp
@@ -54,10 +54,8 @@ namespace ESM4
 
         EnableParent mEsp;
 
-        virtual ~ActorCreature();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadacti.cpp b/components/esm4/loadacti.cpp
index 801cb9cdd8..8c64e0477c 100644
--- a/components/esm4/loadacti.cpp
+++ b/components/esm4/loadacti.cpp
@@ -32,10 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Activator::~Activator()
-{
-}
-
 void ESM4::Activator::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadacti.hpp b/components/esm4/loadacti.hpp
index f86a4aa370..7d5798c033 100644
--- a/components/esm4/loadacti.hpp
+++ b/components/esm4/loadacti.hpp
@@ -57,10 +57,8 @@ namespace ESM4
 
         std::string mActivationPrompt;
 
-        virtual ~Activator();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadalch.cpp b/components/esm4/loadalch.cpp
index 2c346d71b9..579bf309f0 100644
--- a/components/esm4/loadalch.cpp
+++ b/components/esm4/loadalch.cpp
@@ -33,10 +33,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Potion::~Potion()
-{
-}
-
 void ESM4::Potion::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadalch.hpp b/components/esm4/loadalch.hpp
index a3ff9ffe34..dbc8b80f82 100644
--- a/components/esm4/loadalch.hpp
+++ b/components/esm4/loadalch.hpp
@@ -75,10 +75,8 @@ namespace ESM4
         Data mData;
         EnchantedItem mItem;
 
-        virtual ~Potion();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadaloc.cpp b/components/esm4/loadaloc.cpp
index 9907e5908b..b14341f682 100644
--- a/components/esm4/loadaloc.cpp
+++ b/components/esm4/loadaloc.cpp
@@ -38,10 +38,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::MediaLocationController::~MediaLocationController()
-{
-}
-
 void ESM4::MediaLocationController::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadaloc.hpp b/components/esm4/loadaloc.hpp
index a58efd289e..3c5ae39f55 100644
--- a/components/esm4/loadaloc.hpp
+++ b/components/esm4/loadaloc.hpp
@@ -75,10 +75,8 @@ namespace ESM4
         std::uint32_t mDayStart;
         std::uint32_t mNightStart;
 
-        virtual ~MediaLocationController();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadammo.cpp b/components/esm4/loadammo.cpp
index 3c30a7a73b..16cd7cab1c 100644
--- a/components/esm4/loadammo.cpp
+++ b/components/esm4/loadammo.cpp
@@ -31,10 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Ammunition::~Ammunition()
-{
-}
-
 void ESM4::Ammunition::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadammo.hpp b/components/esm4/loadammo.hpp
index c31d38c10c..b399245a1b 100644
--- a/components/esm4/loadammo.hpp
+++ b/components/esm4/loadammo.hpp
@@ -71,10 +71,8 @@ namespace ESM4
 
         Data mData;
 
-        virtual ~Ammunition();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadanio.cpp b/components/esm4/loadanio.cpp
index 15847fbbda..86441e36ee 100644
--- a/components/esm4/loadanio.cpp
+++ b/components/esm4/loadanio.cpp
@@ -31,10 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::AnimObject::~AnimObject()
-{
-}
-
 void ESM4::AnimObject::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadanio.hpp b/components/esm4/loadanio.hpp
index f7e85f613b..5e40b5f9d8 100644
--- a/components/esm4/loadanio.hpp
+++ b/components/esm4/loadanio.hpp
@@ -50,10 +50,8 @@ namespace ESM4
         FormId mIdleAnim;         // only in TES4
         std::string mUnloadEvent; // only in TES5
 
-        virtual ~AnimObject();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadappa.cpp b/components/esm4/loadappa.cpp
index c0561322b0..a7814d99c4 100644
--- a/components/esm4/loadappa.cpp
+++ b/components/esm4/loadappa.cpp
@@ -31,10 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Apparatus::~Apparatus()
-{
-}
-
 void ESM4::Apparatus::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadappa.hpp b/components/esm4/loadappa.hpp
index f3b2966518..7e4e48ce5a 100644
--- a/components/esm4/loadappa.hpp
+++ b/components/esm4/loadappa.hpp
@@ -62,10 +62,8 @@ namespace ESM4
 
         Data mData;
 
-        virtual ~Apparatus();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadarma.cpp b/components/esm4/loadarma.cpp
index 6306845689..389a5b122c 100644
--- a/components/esm4/loadarma.cpp
+++ b/components/esm4/loadarma.cpp
@@ -32,10 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::ArmorAddon::~ArmorAddon()
-{
-}
-
 void ESM4::ArmorAddon::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadarma.hpp b/components/esm4/loadarma.hpp
index f7abb404a1..8bee9d0396 100644
--- a/components/esm4/loadarma.hpp
+++ b/components/esm4/loadarma.hpp
@@ -57,10 +57,8 @@ namespace ESM4
 
         BodyTemplate mBodyTemplate; // TES5
 
-        virtual ~ArmorAddon();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadarmo.cpp b/components/esm4/loadarmo.cpp
index c6237f326d..b2b43e1111 100644
--- a/components/esm4/loadarmo.cpp
+++ b/components/esm4/loadarmo.cpp
@@ -32,10 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Armor::~Armor()
-{
-}
-
 void ESM4::Armor::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadarmo.hpp b/components/esm4/loadarmo.hpp
index b44ba1a973..e7f6fa5a7c 100644
--- a/components/esm4/loadarmo.hpp
+++ b/components/esm4/loadarmo.hpp
@@ -183,10 +183,8 @@ namespace ESM4
         std::vector<FormId> mAddOns; // TES5 ARMA
         Data mData;
 
-        virtual ~Armor();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadaspc.cpp b/components/esm4/loadaspc.cpp
index 8fb9d70c71..b1e856056a 100644
--- a/components/esm4/loadaspc.cpp
+++ b/components/esm4/loadaspc.cpp
@@ -32,10 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::AcousticSpace::~AcousticSpace()
-{
-}
-
 void ESM4::AcousticSpace::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadaspc.hpp b/components/esm4/loadaspc.hpp
index 179297a604..9fd17ea27c 100644
--- a/components/esm4/loadaspc.hpp
+++ b/components/esm4/loadaspc.hpp
@@ -53,10 +53,8 @@ namespace ESM4
 
         std::uint32_t mIsInterior; // if true only use mAmbientLoopSounds[0]
 
-        virtual ~AcousticSpace();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadbook.cpp b/components/esm4/loadbook.cpp
index 939888fc43..c17ef102be 100644
--- a/components/esm4/loadbook.cpp
+++ b/components/esm4/loadbook.cpp
@@ -31,10 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Book::~Book()
-{
-}
-
 void ESM4::Book::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadbook.hpp b/components/esm4/loadbook.hpp
index 9cb5358bdb..a1176a3320 100644
--- a/components/esm4/loadbook.hpp
+++ b/components/esm4/loadbook.hpp
@@ -101,10 +101,8 @@ namespace ESM4
         FormId mPickUpSound;
         FormId mDropSound;
 
-        virtual ~Book();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadbptd.cpp b/components/esm4/loadbptd.cpp
index a65d2dd482..33229edd07 100644
--- a/components/esm4/loadbptd.cpp
+++ b/components/esm4/loadbptd.cpp
@@ -43,10 +43,6 @@ void ESM4::BodyPartData::BodyPart::clear()
     mGoreEffectsTarget.clear();
 }
 
-ESM4::BodyPartData::~BodyPartData()
-{
-}
-
 void ESM4::BodyPartData::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadbptd.hpp b/components/esm4/loadbptd.hpp
index 0b971ca083..f831a53653 100644
--- a/components/esm4/loadbptd.hpp
+++ b/components/esm4/loadbptd.hpp
@@ -115,10 +115,8 @@ namespace ESM4
 
         std::vector<BodyPart> mBodyParts;
 
-        virtual ~BodyPartData();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadcell.cpp b/components/esm4/loadcell.cpp
index 97b3603204..1bd7cb783a 100644
--- a/components/esm4/loadcell.cpp
+++ b/components/esm4/loadcell.cpp
@@ -39,10 +39,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Cell::~Cell()
-{
-}
-
 // TODO: Try loading only EDID and XCLC (along with mFormId, mFlags and mParent)
 //
 // But, for external cells we may be scanning the whole record since we don't know if there is
diff --git a/components/esm4/loadcell.hpp b/components/esm4/loadcell.hpp
index 3dff4fdf0a..ff51c64f00 100644
--- a/components/esm4/loadcell.hpp
+++ b/components/esm4/loadcell.hpp
@@ -91,10 +91,8 @@ namespace ESM4
 
         CellGroup *mCellGroup;
 
-        virtual ~Cell();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         void blank();
     };
diff --git a/components/esm4/loadclas.cpp b/components/esm4/loadclas.cpp
index 80c9fc2b0f..eca978276b 100644
--- a/components/esm4/loadclas.cpp
+++ b/components/esm4/loadclas.cpp
@@ -36,10 +36,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Class::~Class()
-{
-}
-
 void ESM4::Class::load(ESM4::Reader& reader)
 {
     //mFormId = reader.adjustFormId(reader.hdr().record.id); // FIXME: use master adjusted?
diff --git a/components/esm4/loadclas.hpp b/components/esm4/loadclas.hpp
index c68a1c1ae5..bf091fa7f4 100644
--- a/components/esm4/loadclas.hpp
+++ b/components/esm4/loadclas.hpp
@@ -53,8 +53,6 @@ namespace ESM4
         std::string mIcon;
         Data mData;
 
-        ~Class();
-
         void load(ESM4::Reader& reader);
         //void save(ESM4::Writer& reader) const;
 
diff --git a/components/esm4/loadclfm.cpp b/components/esm4/loadclfm.cpp
index 7ad9f56615..efaf1461e4 100644
--- a/components/esm4/loadclfm.cpp
+++ b/components/esm4/loadclfm.cpp
@@ -32,10 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Colour::~Colour()
-{
-}
-
 void ESM4::Colour::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadclfm.hpp b/components/esm4/loadclfm.hpp
index 35d4a28686..4fb81c6e00 100644
--- a/components/esm4/loadclfm.hpp
+++ b/components/esm4/loadclfm.hpp
@@ -57,10 +57,8 @@ namespace ESM4
         ColourRGB mColour;
         std::uint32_t mPlayable;
 
-        virtual ~Colour();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadclot.cpp b/components/esm4/loadclot.cpp
index 8f43cf2ac6..cdcc692caa 100644
--- a/components/esm4/loadclot.cpp
+++ b/components/esm4/loadclot.cpp
@@ -32,10 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Clothing::~Clothing()
-{
-}
-
 void ESM4::Clothing::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadclot.hpp b/components/esm4/loadclot.hpp
index 8870c58a45..16c8a145a0 100644
--- a/components/esm4/loadclot.hpp
+++ b/components/esm4/loadclot.hpp
@@ -70,10 +70,8 @@ namespace ESM4
 
         Data mData;
 
-        virtual ~Clothing();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadcont.cpp b/components/esm4/loadcont.cpp
index 6ddb6c17f9..f0c7309967 100644
--- a/components/esm4/loadcont.cpp
+++ b/components/esm4/loadcont.cpp
@@ -31,10 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Container::~Container()
-{
-}
-
 void ESM4::Container::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadcont.hpp b/components/esm4/loadcont.hpp
index 7218da9729..e7b47e8944 100644
--- a/components/esm4/loadcont.hpp
+++ b/components/esm4/loadcont.hpp
@@ -58,10 +58,8 @@ namespace ESM4
 
         std::vector<InventoryItem> mInventory;
 
-        virtual ~Container();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadcrea.cpp b/components/esm4/loadcrea.cpp
index a78aadd82d..3da8a0c114 100644
--- a/components/esm4/loadcrea.cpp
+++ b/components/esm4/loadcrea.cpp
@@ -40,10 +40,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Creature::~Creature()
-{
-}
-
 void ESM4::Creature::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadcrea.hpp b/components/esm4/loadcrea.hpp
index 8062a670d0..05e6840312 100644
--- a/components/esm4/loadcrea.hpp
+++ b/components/esm4/loadcrea.hpp
@@ -138,10 +138,8 @@ namespace ESM4
         FormId mBaseTemplate;           // FO3/FONV
         std::vector<FormId> mBodyParts; // FO3/FONV
 
-        virtual ~Creature();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loaddial.cpp b/components/esm4/loaddial.cpp
index 28176e7c52..342828a9d6 100644
--- a/components/esm4/loaddial.cpp
+++ b/components/esm4/loaddial.cpp
@@ -33,10 +33,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Dialogue::~Dialogue()
-{
-}
-
 void ESM4::Dialogue::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loaddial.hpp b/components/esm4/loaddial.hpp
index 6463da4f19..8097c94baf 100644
--- a/components/esm4/loaddial.hpp
+++ b/components/esm4/loaddial.hpp
@@ -57,10 +57,8 @@ namespace ESM4
 
         float mPriority;
 
-        virtual ~Dialogue();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loaddobj.cpp b/components/esm4/loaddobj.cpp
index b81e29c9fc..6d791ff044 100644
--- a/components/esm4/loaddobj.cpp
+++ b/components/esm4/loaddobj.cpp
@@ -37,10 +37,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::DefaultObj::~DefaultObj()
-{
-}
-
 void ESM4::DefaultObj::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loaddobj.hpp b/components/esm4/loaddobj.hpp
index b9557bbb05..c959a62e50 100644
--- a/components/esm4/loaddobj.hpp
+++ b/components/esm4/loaddobj.hpp
@@ -87,10 +87,8 @@ namespace ESM4
 
         Defaults mData;
 
-        virtual ~DefaultObj();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loaddoor.cpp b/components/esm4/loaddoor.cpp
index 7af92fa870..555c7a7d3f 100644
--- a/components/esm4/loaddoor.cpp
+++ b/components/esm4/loaddoor.cpp
@@ -31,10 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Door::~Door()
-{
-}
-
 void ESM4::Door::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loaddoor.hpp b/components/esm4/loaddoor.hpp
index 71e7ae70ac..9810a45989 100644
--- a/components/esm4/loaddoor.hpp
+++ b/components/esm4/loaddoor.hpp
@@ -63,10 +63,8 @@ namespace ESM4
         FormId mLoopSound;
         FormId mRandomTeleport;
 
-        virtual ~Door();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadeyes.cpp b/components/esm4/loadeyes.cpp
index d4f4fc4bbb..f91de07926 100644
--- a/components/esm4/loadeyes.cpp
+++ b/components/esm4/loadeyes.cpp
@@ -31,10 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Eyes::~Eyes()
-{
-}
-
 void ESM4::Eyes::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadeyes.hpp b/components/esm4/loadeyes.hpp
index dfc5d5e983..5f0bb0f31b 100644
--- a/components/esm4/loadeyes.hpp
+++ b/components/esm4/loadeyes.hpp
@@ -55,10 +55,8 @@ namespace ESM4
 
         Data mData;
 
-        virtual ~Eyes();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadflor.cpp b/components/esm4/loadflor.cpp
index fcc7fa05c1..ae9770ab74 100644
--- a/components/esm4/loadflor.cpp
+++ b/components/esm4/loadflor.cpp
@@ -31,10 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Flora::~Flora()
-{
-}
-
 void ESM4::Flora::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadflor.hpp b/components/esm4/loadflor.hpp
index f4961adf9c..d454108233 100644
--- a/components/esm4/loadflor.hpp
+++ b/components/esm4/loadflor.hpp
@@ -65,10 +65,8 @@ namespace ESM4
         FormId mSound;
         Production mPercentHarvest;
 
-        virtual ~Flora();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadflst.cpp b/components/esm4/loadflst.cpp
index f73f883148..32de2fe813 100644
--- a/components/esm4/loadflst.cpp
+++ b/components/esm4/loadflst.cpp
@@ -32,10 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::FormIdList::~FormIdList()
-{
-}
-
 void ESM4::FormIdList::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadflst.hpp b/components/esm4/loadflst.hpp
index c7e098b9ba..5a3d048fd4 100644
--- a/components/esm4/loadflst.hpp
+++ b/components/esm4/loadflst.hpp
@@ -47,10 +47,8 @@ namespace ESM4
 
         std::vector<FormId> mObjects;
 
-        virtual ~FormIdList();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadfurn.cpp b/components/esm4/loadfurn.cpp
index 046f105451..0b27f50194 100644
--- a/components/esm4/loadfurn.cpp
+++ b/components/esm4/loadfurn.cpp
@@ -31,10 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Furniture::~Furniture()
-{
-}
-
 void ESM4::Furniture::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadfurn.hpp b/components/esm4/loadfurn.hpp
index c04f78f462..051d2b03d6 100644
--- a/components/esm4/loadfurn.hpp
+++ b/components/esm4/loadfurn.hpp
@@ -51,10 +51,8 @@ namespace ESM4
         FormId mScriptId;
         std::uint32_t mActiveMarkerFlags;
 
-        virtual ~Furniture();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadglob.cpp b/components/esm4/loadglob.cpp
index 3435726d76..739aab5b82 100644
--- a/components/esm4/loadglob.cpp
+++ b/components/esm4/loadglob.cpp
@@ -32,10 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::GlobalVariable::~GlobalVariable()
-{
-}
-
 void ESM4::GlobalVariable::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadglob.hpp b/components/esm4/loadglob.hpp
index 59e2c1fbd0..abe3a8ac93 100644
--- a/components/esm4/loadglob.hpp
+++ b/components/esm4/loadglob.hpp
@@ -47,10 +47,8 @@ namespace ESM4
         std::uint8_t mType;
         float mValue;
 
-        virtual ~GlobalVariable();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadgras.cpp b/components/esm4/loadgras.cpp
index 81be002bc9..8c4699b25b 100644
--- a/components/esm4/loadgras.cpp
+++ b/components/esm4/loadgras.cpp
@@ -31,10 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Grass::~Grass()
-{
-}
-
 void ESM4::Grass::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadgras.hpp b/components/esm4/loadgras.hpp
index f142779637..e5b9cb18ff 100644
--- a/components/esm4/loadgras.hpp
+++ b/components/esm4/loadgras.hpp
@@ -85,10 +85,8 @@ namespace ESM4
 
         Data mData;
 
-        virtual ~Grass();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadhair.cpp b/components/esm4/loadhair.cpp
index f558a46521..64d0b2192e 100644
--- a/components/esm4/loadhair.cpp
+++ b/components/esm4/loadhair.cpp
@@ -32,10 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Hair::~Hair()
-{
-}
-
 void ESM4::Hair::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadhair.hpp b/components/esm4/loadhair.hpp
index 22ae6ef605..b0b07f9281 100644
--- a/components/esm4/loadhair.hpp
+++ b/components/esm4/loadhair.hpp
@@ -58,10 +58,8 @@ namespace ESM4
 
         Data mData;
 
-        virtual ~Hair();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadhdpt.cpp b/components/esm4/loadhdpt.cpp
index ce579f5371..9e5d4c9ffd 100644
--- a/components/esm4/loadhdpt.cpp
+++ b/components/esm4/loadhdpt.cpp
@@ -32,10 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::HeadPart::~HeadPart()
-{
-}
-
 void ESM4::HeadPart::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadhdpt.hpp b/components/esm4/loadhdpt.hpp
index 7ec46a32bc..89a486eba8 100644
--- a/components/esm4/loadhdpt.hpp
+++ b/components/esm4/loadhdpt.hpp
@@ -53,10 +53,8 @@ namespace ESM4
         std::array<std::string, 3> mTriFile;
         FormId mBaseTexture;
 
-        virtual ~HeadPart();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadidle.cpp b/components/esm4/loadidle.cpp
index 16bcfcf9dc..df84e3df4c 100644
--- a/components/esm4/loadidle.cpp
+++ b/components/esm4/loadidle.cpp
@@ -31,10 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::IdleAnimation::~IdleAnimation()
-{
-}
-
 void ESM4::IdleAnimation::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadidle.hpp b/components/esm4/loadidle.hpp
index d41d715906..ad4e796359 100644
--- a/components/esm4/loadidle.hpp
+++ b/components/esm4/loadidle.hpp
@@ -49,10 +49,8 @@ namespace ESM4
         FormId      mParent;  // IDLE or AACT
         FormId      mPrevious;
 
-        virtual ~IdleAnimation();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadidlm.cpp b/components/esm4/loadidlm.cpp
index 0aada6a3a3..c94cd37310 100644
--- a/components/esm4/loadidlm.cpp
+++ b/components/esm4/loadidlm.cpp
@@ -32,10 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::IdleMarker::~IdleMarker()
-{
-}
-
 void ESM4::IdleMarker::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadidlm.hpp b/components/esm4/loadidlm.hpp
index 717aade9c3..2874426217 100644
--- a/components/esm4/loadidlm.hpp
+++ b/components/esm4/loadidlm.hpp
@@ -50,10 +50,8 @@ namespace ESM4
         float mIdleTimer;
         std::vector<FormId> mIdleAnim;
 
-        virtual ~IdleMarker();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadimod.cpp b/components/esm4/loadimod.cpp
index 7be99fbae0..4ec6518a01 100644
--- a/components/esm4/loadimod.cpp
+++ b/components/esm4/loadimod.cpp
@@ -34,10 +34,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::ItemMod::~ItemMod()
-{
-}
-
 void ESM4::ItemMod::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadimod.hpp b/components/esm4/loadimod.hpp
index 2fee4f3156..5e6078384e 100644
--- a/components/esm4/loadimod.hpp
+++ b/components/esm4/loadimod.hpp
@@ -46,10 +46,8 @@ namespace ESM4
 
         std::string mEditorId;
 
-        virtual ~ItemMod();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadinfo.cpp b/components/esm4/loadinfo.cpp
index d72051e8a7..a0a99b13dc 100644
--- a/components/esm4/loadinfo.cpp
+++ b/components/esm4/loadinfo.cpp
@@ -33,10 +33,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::DialogInfo::~DialogInfo()
-{
-}
-
 void ESM4::DialogInfo::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadinfo.hpp b/components/esm4/loadinfo.hpp
index be7e77efc4..2decff05e0 100644
--- a/components/esm4/loadinfo.hpp
+++ b/components/esm4/loadinfo.hpp
@@ -77,10 +77,8 @@ namespace ESM4
 
         ScriptDefinition mScript; // FIXME: ignoring the second one after the NEXT sub-record
 
-        virtual ~DialogInfo();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadingr.cpp b/components/esm4/loadingr.cpp
index 38f38463d0..9001329662 100644
--- a/components/esm4/loadingr.cpp
+++ b/components/esm4/loadingr.cpp
@@ -32,10 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Ingredient::~Ingredient()
-{
-}
-
 void ESM4::Ingredient::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadingr.hpp b/components/esm4/loadingr.hpp
index c011ff54cf..08b3e73efc 100644
--- a/components/esm4/loadingr.hpp
+++ b/components/esm4/loadingr.hpp
@@ -70,10 +70,8 @@ namespace ESM4
 
         Data mData;
 
-        virtual ~Ingredient();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadkeym.cpp b/components/esm4/loadkeym.cpp
index 85d348465f..f0c5dbedb7 100644
--- a/components/esm4/loadkeym.cpp
+++ b/components/esm4/loadkeym.cpp
@@ -31,10 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Key::~Key()
-{
-}
-
 void ESM4::Key::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadkeym.hpp b/components/esm4/loadkeym.hpp
index 6a31395618..68835eeeb6 100644
--- a/components/esm4/loadkeym.hpp
+++ b/components/esm4/loadkeym.hpp
@@ -64,10 +64,8 @@ namespace ESM4
 
         Data mData;
 
-        virtual ~Key();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadland.cpp b/components/esm4/loadland.cpp
index aadc2f3aaf..651a285a72 100644
--- a/components/esm4/loadland.cpp
+++ b/components/esm4/loadland.cpp
@@ -38,10 +38,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Land::~Land()
-{
-}
-
 //             overlap north
 //
 //         32
diff --git a/components/esm4/loadland.hpp b/components/esm4/loadland.hpp
index 80a2490855..305b48c157 100644
--- a/components/esm4/loadland.hpp
+++ b/components/esm4/loadland.hpp
@@ -123,8 +123,6 @@ namespace ESM4
         Texture       mTextures[4]; // 0 = bottom left, 1 = bottom right, 2 = top left, 3 = top right
         std::vector<FormId> mIds;   // land texture (LTEX) formids
 
-        virtual ~Land();
-
         virtual void load(Reader& reader);
         //virtual void save(Writer& writer) const;
 
diff --git a/components/esm4/loadlgtm.cpp b/components/esm4/loadlgtm.cpp
index 74486c3615..d0aa3a5b49 100644
--- a/components/esm4/loadlgtm.cpp
+++ b/components/esm4/loadlgtm.cpp
@@ -35,10 +35,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::LightingTemplate::~LightingTemplate()
-{
-}
-
 void ESM4::LightingTemplate::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadlgtm.hpp b/components/esm4/loadlgtm.hpp
index 9e54bf53d9..1b625e458f 100644
--- a/components/esm4/loadlgtm.hpp
+++ b/components/esm4/loadlgtm.hpp
@@ -50,10 +50,8 @@ namespace ESM4
 
         Lighting mLighting;
 
-        virtual ~LightingTemplate();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadligh.cpp b/components/esm4/loadligh.cpp
index c4f0a94d51..394d10114d 100644
--- a/components/esm4/loadligh.cpp
+++ b/components/esm4/loadligh.cpp
@@ -31,10 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Light::~Light()
-{
-}
-
 void ESM4::Light::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadligh.hpp b/components/esm4/loadligh.hpp
index b1c642eb27..974385dbf8 100644
--- a/components/esm4/loadligh.hpp
+++ b/components/esm4/loadligh.hpp
@@ -84,10 +84,8 @@ namespace ESM4
 
         Data mData;
 
-        virtual ~Light();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadltex.cpp b/components/esm4/loadltex.cpp
index 7b442ef8df..6edcd4ae05 100644
--- a/components/esm4/loadltex.cpp
+++ b/components/esm4/loadltex.cpp
@@ -37,10 +37,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::LandTexture::~LandTexture()
-{
-}
-
 void ESM4::LandTexture::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadltex.hpp b/components/esm4/loadltex.hpp
index 6347df2827..e445f54525 100644
--- a/components/esm4/loadltex.hpp
+++ b/components/esm4/loadltex.hpp
@@ -62,10 +62,8 @@ namespace ESM4
 
         // ----------------------
 
-        virtual ~LandTexture();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadlvlc.cpp b/components/esm4/loadlvlc.cpp
index cef4c0aff9..a3067a0561 100644
--- a/components/esm4/loadlvlc.cpp
+++ b/components/esm4/loadlvlc.cpp
@@ -32,10 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::LevelledCreature::~LevelledCreature()
-{
-}
-
 void ESM4::LevelledCreature::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadlvlc.hpp b/components/esm4/loadlvlc.hpp
index 61f2d90e24..44aadbe36e 100644
--- a/components/esm4/loadlvlc.hpp
+++ b/components/esm4/loadlvlc.hpp
@@ -58,10 +58,8 @@ namespace ESM4
         bool calcEachItemInCount() const;
         std::int8_t chanceNone() const;
 
-        virtual ~LevelledCreature();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadlvli.cpp b/components/esm4/loadlvli.cpp
index 44395e92ea..68e458e73c 100644
--- a/components/esm4/loadlvli.cpp
+++ b/components/esm4/loadlvli.cpp
@@ -32,10 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::LevelledItem::~LevelledItem()
-{
-}
-
 void ESM4::LevelledItem::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadlvli.hpp b/components/esm4/loadlvli.hpp
index 479d556d5c..290658e86d 100644
--- a/components/esm4/loadlvli.hpp
+++ b/components/esm4/loadlvli.hpp
@@ -54,15 +54,13 @@ namespace ESM4
 
         std::vector<LVLO> mLvlObject;
 
-        virtual ~LevelledItem();
-
         bool calcAllLvlLessThanPlayer() const;
         bool calcEachItemInCount() const;
         bool useAll() const;
         std::int8_t chanceNone() const;
 
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadlvln.cpp b/components/esm4/loadlvln.cpp
index f4782a9c40..bd1423d0ac 100644
--- a/components/esm4/loadlvln.cpp
+++ b/components/esm4/loadlvln.cpp
@@ -32,10 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::LevelledNpc::~LevelledNpc()
-{
-}
-
 void ESM4::LevelledNpc::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadlvln.hpp b/components/esm4/loadlvln.hpp
index 7c82a44ded..49a7bb943b 100644
--- a/components/esm4/loadlvln.hpp
+++ b/components/esm4/loadlvln.hpp
@@ -52,14 +52,12 @@ namespace ESM4
         std::uint8_t mListCount;
         std::vector<LVLO> mLvlObject;
 
-        virtual ~LevelledNpc();
-
         inline bool calcAllLvlLessThanPlayer() const { return (mLvlActorFlags & 0x01) != 0; }
         inline bool calcEachItemInCount() const { return (mLvlActorFlags & 0x02) != 0; }
         inline std::int8_t chanceNone() const { return mChanceNone; }
 
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadmato.cpp b/components/esm4/loadmato.cpp
index 839a6211df..7e3ab43026 100644
--- a/components/esm4/loadmato.cpp
+++ b/components/esm4/loadmato.cpp
@@ -31,10 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Material::~Material()
-{
-}
-
 void ESM4::Material::load(ESM4::Reader& reader)
 {
     //mFormId = reader.adjustFormId(reader.hdr().record.id); // FIXME: use master adjusted?
diff --git a/components/esm4/loadmato.hpp b/components/esm4/loadmato.hpp
index 8f60824bd8..041b158c29 100644
--- a/components/esm4/loadmato.hpp
+++ b/components/esm4/loadmato.hpp
@@ -45,10 +45,8 @@ namespace ESM4
         std::string mEditorId;
         std::string mModel;
 
-        virtual ~Material();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadmisc.cpp b/components/esm4/loadmisc.cpp
index 8231df28f5..966910f775 100644
--- a/components/esm4/loadmisc.cpp
+++ b/components/esm4/loadmisc.cpp
@@ -31,10 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::MiscItem::~MiscItem()
-{
-}
-
 void ESM4::MiscItem::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadmisc.hpp b/components/esm4/loadmisc.hpp
index 308a6ec326..49297330ea 100644
--- a/components/esm4/loadmisc.hpp
+++ b/components/esm4/loadmisc.hpp
@@ -64,10 +64,8 @@ namespace ESM4
 
         Data mData;
 
-        virtual ~MiscItem();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadmset.cpp b/components/esm4/loadmset.cpp
index 67ee5666d1..55a2619239 100644
--- a/components/esm4/loadmset.cpp
+++ b/components/esm4/loadmset.cpp
@@ -32,10 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::MediaSet::~MediaSet()
-{
-}
-
 void ESM4::MediaSet::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadmset.hpp b/components/esm4/loadmset.hpp
index c66273bc6c..7fa9450236 100644
--- a/components/esm4/loadmset.hpp
+++ b/components/esm4/loadmset.hpp
@@ -86,10 +86,8 @@ namespace ESM4
         FormId mSoundIntro; // HNAM
         FormId mSoundOutro; // INAM
 
-        virtual ~MediaSet();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadmstt.cpp b/components/esm4/loadmstt.cpp
index 35c69c8a31..1deb5603f8 100644
--- a/components/esm4/loadmstt.cpp
+++ b/components/esm4/loadmstt.cpp
@@ -32,10 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::MovableStatic::~MovableStatic()
-{
-}
-
 void ESM4::MovableStatic::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadmstt.hpp b/components/esm4/loadmstt.hpp
index 0b9873a91a..eceabda161 100644
--- a/components/esm4/loadmstt.hpp
+++ b/components/esm4/loadmstt.hpp
@@ -47,10 +47,8 @@ namespace ESM4
         std::int8_t mData;
         FormId mLoopingSound;
 
-        virtual ~MovableStatic();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadmusc.cpp b/components/esm4/loadmusc.cpp
index a328fbce1e..566fcb2401 100644
--- a/components/esm4/loadmusc.cpp
+++ b/components/esm4/loadmusc.cpp
@@ -36,10 +36,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Music::~Music()
-{
-}
-
 void ESM4::Music::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadmusc.hpp b/components/esm4/loadmusc.hpp
index 2ec10abc8c..c54c9fa67c 100644
--- a/components/esm4/loadmusc.hpp
+++ b/components/esm4/loadmusc.hpp
@@ -47,10 +47,8 @@ namespace ESM4
         std::string mEditorId;
         std::string mMusicFile;
 
-        virtual ~Music();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadnavi.cpp b/components/esm4/loadnavi.cpp
index 818a8e98aa..4ed72c20f1 100644
--- a/components/esm4/loadnavi.cpp
+++ b/components/esm4/loadnavi.cpp
@@ -38,10 +38,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Navigation::~Navigation()
-{
-}
-
 void ESM4::Navigation::IslandInfo::load(ESM4::Reader& reader)
 {
     reader.get(minX);
diff --git a/components/esm4/loadnavi.hpp b/components/esm4/loadnavi.hpp
index ff0d033f3b..117aa102d0 100644
--- a/components/esm4/loadnavi.hpp
+++ b/components/esm4/loadnavi.hpp
@@ -104,10 +104,8 @@ namespace ESM4
 
         std::map<FormId, std::uint32_t> mPathIndexMap;
 
-        virtual ~Navigation();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadnavm.cpp b/components/esm4/loadnavm.cpp
index 1e84a9ffee..5fce00893c 100644
--- a/components/esm4/loadnavm.cpp
+++ b/components/esm4/loadnavm.cpp
@@ -35,10 +35,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::NavMesh::~NavMesh()
-{
-}
-
 void ESM4::NavMesh::NVNMstruct::load(ESM4::Reader& reader)
 {
     //std::cout << "start: divisor " << std::dec << divisor << ", segments " << triSegments.size() << //std::endl;
diff --git a/components/esm4/loadnavm.hpp b/components/esm4/loadnavm.hpp
index 7910b1373d..a7a86cf71d 100644
--- a/components/esm4/loadnavm.hpp
+++ b/components/esm4/loadnavm.hpp
@@ -98,10 +98,8 @@ namespace ESM4
         FormId mFormId;       // from the header
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
-        virtual ~NavMesh();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         void blank();
     };
diff --git a/components/esm4/loadnote.cpp b/components/esm4/loadnote.cpp
index 90e39811af..5f4b836fcf 100644
--- a/components/esm4/loadnote.cpp
+++ b/components/esm4/loadnote.cpp
@@ -32,10 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Note::~Note()
-{
-}
-
 void ESM4::Note::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadnote.hpp b/components/esm4/loadnote.hpp
index 506674081f..33f08257e9 100644
--- a/components/esm4/loadnote.hpp
+++ b/components/esm4/loadnote.hpp
@@ -47,10 +47,8 @@ namespace ESM4
         std::string mModel;
         std::string mIcon;
 
-        virtual ~Note();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadnpc.cpp b/components/esm4/loadnpc.cpp
index 51d1d0b181..a05bedd90e 100644
--- a/components/esm4/loadnpc.cpp
+++ b/components/esm4/loadnpc.cpp
@@ -41,10 +41,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Npc::~Npc()
-{
-}
-
 void ESM4::Npc::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadnpc.hpp b/components/esm4/loadnpc.hpp
index 1bd38e189c..316caeecc2 100644
--- a/components/esm4/loadnpc.hpp
+++ b/components/esm4/loadnpc.hpp
@@ -217,10 +217,8 @@ namespace ESM4
         std::vector<float> mSymTextureModeCoefficients;  // size 0 or 50
         std::int16_t mFgRace;
 
-        virtual ~Npc();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadotft.cpp b/components/esm4/loadotft.cpp
index d1b1bb23a7..e24e3fbc9c 100644
--- a/components/esm4/loadotft.cpp
+++ b/components/esm4/loadotft.cpp
@@ -32,10 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Outfit::~Outfit()
-{
-}
-
 void ESM4::Outfit::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadotft.hpp b/components/esm4/loadotft.hpp
index b982a3c468..cf15775a91 100644
--- a/components/esm4/loadotft.hpp
+++ b/components/esm4/loadotft.hpp
@@ -47,10 +47,8 @@ namespace ESM4
 
         std::vector<FormId> mInventory;
 
-        virtual ~Outfit();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadpack.cpp b/components/esm4/loadpack.cpp
index 5ab9555cd6..7d0e1027c7 100644
--- a/components/esm4/loadpack.cpp
+++ b/components/esm4/loadpack.cpp
@@ -33,10 +33,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::AIPackage::~AIPackage()
-{
-}
-
 void ESM4::AIPackage::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadpack.hpp b/components/esm4/loadpack.hpp
index 849a51c017..e04c67a7d8 100644
--- a/components/esm4/loadpack.hpp
+++ b/components/esm4/loadpack.hpp
@@ -97,10 +97,8 @@ namespace ESM4
         PTDT mTarget;
         std::vector<CTDA> mConditions;
 
-        virtual ~AIPackage();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadpgrd.cpp b/components/esm4/loadpgrd.cpp
index 4a95c8af0a..d1b9f6d57f 100644
--- a/components/esm4/loadpgrd.cpp
+++ b/components/esm4/loadpgrd.cpp
@@ -36,10 +36,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Pathgrid::~Pathgrid()
-{
-}
-
 void ESM4::Pathgrid::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadpgrd.hpp b/components/esm4/loadpgrd.hpp
index 74672a1f92..5ee864b93b 100644
--- a/components/esm4/loadpgrd.hpp
+++ b/components/esm4/loadpgrd.hpp
@@ -83,10 +83,8 @@ namespace ESM4
         std::vector<PGRI> mForeign;
         std::vector<PGRL> mObjects;
 
-        virtual ~Pathgrid();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadpgre.cpp b/components/esm4/loadpgre.cpp
index 665b07e523..b38305b3b5 100644
--- a/components/esm4/loadpgre.cpp
+++ b/components/esm4/loadpgre.cpp
@@ -34,10 +34,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::PlacedGrenade::~PlacedGrenade()
-{
-}
-
 void ESM4::PlacedGrenade::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadpgre.hpp b/components/esm4/loadpgre.hpp
index 1929cd4c52..90e3749508 100644
--- a/components/esm4/loadpgre.hpp
+++ b/components/esm4/loadpgre.hpp
@@ -46,10 +46,8 @@ namespace ESM4
 
         std::string mEditorId;
 
-        virtual ~PlacedGrenade();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadpwat.cpp b/components/esm4/loadpwat.cpp
index 52852b0e8a..8f403470a2 100644
--- a/components/esm4/loadpwat.cpp
+++ b/components/esm4/loadpwat.cpp
@@ -34,10 +34,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::PlaceableWater::~PlaceableWater()
-{
-}
-
 void ESM4::PlaceableWater::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadpwat.hpp b/components/esm4/loadpwat.hpp
index b2dc2c4e00..4a74faeb02 100644
--- a/components/esm4/loadpwat.hpp
+++ b/components/esm4/loadpwat.hpp
@@ -46,10 +46,8 @@ namespace ESM4
 
         std::string mEditorId;
 
-        virtual ~PlaceableWater();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadqust.cpp b/components/esm4/loadqust.cpp
index 5588f90580..39eb592514 100644
--- a/components/esm4/loadqust.cpp
+++ b/components/esm4/loadqust.cpp
@@ -33,10 +33,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Quest::~Quest()
-{
-}
-
 void ESM4::Quest::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadqust.hpp b/components/esm4/loadqust.hpp
index 853805900c..2fa9ff7097 100644
--- a/components/esm4/loadqust.hpp
+++ b/components/esm4/loadqust.hpp
@@ -71,10 +71,8 @@ namespace ESM4
 
         ScriptDefinition mScript;
 
-        virtual ~Quest();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadrace.cpp b/components/esm4/loadrace.cpp
index 3fa9661122..142cfd2adf 100644
--- a/components/esm4/loadrace.cpp
+++ b/components/esm4/loadrace.cpp
@@ -35,10 +35,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Race::~Race()
-{
-}
-
 void ESM4::Race::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadrace.hpp b/components/esm4/loadrace.hpp
index c5912b719b..9166282e17 100644
--- a/components/esm4/loadrace.hpp
+++ b/components/esm4/loadrace.hpp
@@ -162,10 +162,8 @@ namespace ESM4
         std::vector<FormId> mHeadPartIdsMale;   // TES5
         std::vector<FormId> mHeadPartIdsFemale; // TES5
 
-        virtual ~Race();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadrefr.cpp b/components/esm4/loadrefr.cpp
index 24cd3d5cde..91c10c564e 100644
--- a/components/esm4/loadrefr.cpp
+++ b/components/esm4/loadrefr.cpp
@@ -32,10 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Reference::~Reference()
-{
-}
-
 void ESM4::Reference::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadrefr.hpp b/components/esm4/loadrefr.hpp
index b631b334ee..0494dcb074 100644
--- a/components/esm4/loadrefr.hpp
+++ b/components/esm4/loadrefr.hpp
@@ -106,10 +106,8 @@ namespace ESM4
 
         FormId mTargetRef;
 
-        virtual ~Reference();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         void blank();
     };
diff --git a/components/esm4/loadregn.cpp b/components/esm4/loadregn.cpp
index 7acda43350..2455966036 100644
--- a/components/esm4/loadregn.cpp
+++ b/components/esm4/loadregn.cpp
@@ -39,10 +39,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Region::~Region()
-{
-}
-
 void ESM4::Region::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadregn.hpp b/components/esm4/loadregn.hpp
index 86b5ca5799..9b7962ba3c 100644
--- a/components/esm4/loadregn.hpp
+++ b/components/esm4/loadregn.hpp
@@ -85,10 +85,8 @@ namespace ESM4
         RegionData mData;
         std::vector<RegionSound> mSounds;
 
-        virtual ~Region();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         void blank();
     };
diff --git a/components/esm4/loadroad.cpp b/components/esm4/loadroad.cpp
index fca11db779..b131811c64 100644
--- a/components/esm4/loadroad.cpp
+++ b/components/esm4/loadroad.cpp
@@ -33,10 +33,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Road::~Road()
-{
-}
-
 void ESM4::Road::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadroad.hpp b/components/esm4/loadroad.hpp
index 85745d000a..33fc332643 100644
--- a/components/esm4/loadroad.hpp
+++ b/components/esm4/loadroad.hpp
@@ -76,10 +76,8 @@ namespace ESM4
         std::vector<PGRP> mNodes;
         std::vector<PGRR> mLinks;
 
-        virtual ~Road();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadsbsp.cpp b/components/esm4/loadsbsp.cpp
index 9daef0f89c..79ad846414 100644
--- a/components/esm4/loadsbsp.cpp
+++ b/components/esm4/loadsbsp.cpp
@@ -31,10 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::SubSpace::~SubSpace()
-{
-}
-
 void ESM4::SubSpace::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadsbsp.hpp b/components/esm4/loadsbsp.hpp
index 601b2b0cb7..8e949cc6ad 100644
--- a/components/esm4/loadsbsp.hpp
+++ b/components/esm4/loadsbsp.hpp
@@ -51,8 +51,6 @@ namespace ESM4
         std::string mEditorId;
         Dimension mDimension;
 
-        virtual ~SubSpace();
-
         virtual void load(Reader& reader);
         //virtual void save(Writer& writer) const;
 
diff --git a/components/esm4/loadscol.cpp b/components/esm4/loadscol.cpp
index 23a3cad1a3..0dd206a08f 100644
--- a/components/esm4/loadscol.cpp
+++ b/components/esm4/loadscol.cpp
@@ -34,10 +34,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::StaticCollection::~StaticCollection()
-{
-}
-
 void ESM4::StaticCollection::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadscol.hpp b/components/esm4/loadscol.hpp
index dc1bf296e1..6a0005699d 100644
--- a/components/esm4/loadscol.hpp
+++ b/components/esm4/loadscol.hpp
@@ -46,10 +46,8 @@ namespace ESM4
 
         std::string mEditorId;
 
-        virtual ~StaticCollection();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadscpt.cpp b/components/esm4/loadscpt.cpp
index c95a212e75..4c606e3351 100644
--- a/components/esm4/loadscpt.cpp
+++ b/components/esm4/loadscpt.cpp
@@ -33,10 +33,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Script::~Script()
-{
-}
-
 void ESM4::Script::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadscpt.hpp b/components/esm4/loadscpt.hpp
index 459c552876..dbf36aa367 100644
--- a/components/esm4/loadscpt.hpp
+++ b/components/esm4/loadscpt.hpp
@@ -46,10 +46,8 @@ namespace ESM4
 
         ScriptDefinition mScript;
 
-        virtual ~Script();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadscrl.cpp b/components/esm4/loadscrl.cpp
index c09c38ae90..ae084afae3 100644
--- a/components/esm4/loadscrl.cpp
+++ b/components/esm4/loadscrl.cpp
@@ -32,10 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Scroll::~Scroll()
-{
-}
-
 void ESM4::Scroll::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadscrl.hpp b/components/esm4/loadscrl.hpp
index d4feded5d8..d7872f551e 100644
--- a/components/esm4/loadscrl.hpp
+++ b/components/esm4/loadscrl.hpp
@@ -55,10 +55,8 @@ namespace ESM4
 
         Data mData;
 
-        virtual ~Scroll();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadsgst.cpp b/components/esm4/loadsgst.cpp
index 9453cdc27d..843644fe8b 100644
--- a/components/esm4/loadsgst.cpp
+++ b/components/esm4/loadsgst.cpp
@@ -32,10 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::SigilStone::~SigilStone()
-{
-}
-
 void ESM4::SigilStone::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadsgst.hpp b/components/esm4/loadsgst.hpp
index 3a2d32850d..aa9b95166b 100644
--- a/components/esm4/loadsgst.hpp
+++ b/components/esm4/loadsgst.hpp
@@ -62,10 +62,8 @@ namespace ESM4
 
         Data mData;
 
-        virtual ~SigilStone();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadslgm.cpp b/components/esm4/loadslgm.cpp
index 97bbab9569..53e30fd1da 100644
--- a/components/esm4/loadslgm.cpp
+++ b/components/esm4/loadslgm.cpp
@@ -31,10 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::SoulGem::~SoulGem()
-{
-}
-
 void ESM4::SoulGem::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadslgm.hpp b/components/esm4/loadslgm.hpp
index e101fbf8a5..893603a1fe 100644
--- a/components/esm4/loadslgm.hpp
+++ b/components/esm4/loadslgm.hpp
@@ -63,10 +63,8 @@ namespace ESM4
 
         Data mData;
 
-        virtual ~SoulGem();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadsndr.cpp b/components/esm4/loadsndr.cpp
index 4c0bf30b24..d01fb0ed74 100644
--- a/components/esm4/loadsndr.cpp
+++ b/components/esm4/loadsndr.cpp
@@ -32,10 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::SoundReference::~SoundReference()
-{
-}
-
 void ESM4::SoundReference::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadsndr.hpp b/components/esm4/loadsndr.hpp
index fba1912264..de0ca3eb1a 100644
--- a/components/esm4/loadsndr.hpp
+++ b/components/esm4/loadsndr.hpp
@@ -73,10 +73,8 @@ namespace ESM4
 
         TargetCondition mTargetCondition;
 
-        virtual ~SoundReference();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadsoun.cpp b/components/esm4/loadsoun.cpp
index bcb776e100..a3358236b0 100644
--- a/components/esm4/loadsoun.cpp
+++ b/components/esm4/loadsoun.cpp
@@ -32,10 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Sound::~Sound()
-{
-}
-
 void ESM4::Sound::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadsoun.hpp b/components/esm4/loadsoun.hpp
index b766aa5534..da1d7fbd71 100644
--- a/components/esm4/loadsoun.hpp
+++ b/components/esm4/loadsoun.hpp
@@ -88,10 +88,8 @@ namespace ESM4
         SNDX mData;
         SoundData mExtra;
 
-        virtual ~Sound();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadstat.cpp b/components/esm4/loadstat.cpp
index d08812b4ee..10ce91980c 100644
--- a/components/esm4/loadstat.cpp
+++ b/components/esm4/loadstat.cpp
@@ -32,10 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Static::~Static()
-{
-}
-
 void ESM4::Static::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadstat.hpp b/components/esm4/loadstat.hpp
index 9c689462ef..07369b3357 100644
--- a/components/esm4/loadstat.hpp
+++ b/components/esm4/loadstat.hpp
@@ -49,10 +49,8 @@ namespace ESM4
         float mBoundRadius;
         std::vector<std::uint8_t> mMODT; // FIXME texture hash
 
-        virtual ~Static();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadtact.cpp b/components/esm4/loadtact.cpp
index f82e70c483..0d684719be 100644
--- a/components/esm4/loadtact.cpp
+++ b/components/esm4/loadtact.cpp
@@ -32,10 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::TalkingActivator::~TalkingActivator()
-{
-}
-
 void ESM4::TalkingActivator::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadtact.hpp b/components/esm4/loadtact.hpp
index f3fd91a433..3a79006d78 100644
--- a/components/esm4/loadtact.hpp
+++ b/components/esm4/loadtact.hpp
@@ -63,10 +63,8 @@ namespace ESM4
         FormId mLoopSound;     // SOUN
         FormId mRadioTemplate; // SOUN
 
-        virtual ~TalkingActivator();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadterm.cpp b/components/esm4/loadterm.cpp
index e9eedc3651..fc1d10cf70 100644
--- a/components/esm4/loadterm.cpp
+++ b/components/esm4/loadterm.cpp
@@ -32,10 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Terminal::~Terminal()
-{
-}
-
 void ESM4::Terminal::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadterm.hpp b/components/esm4/loadterm.hpp
index 1b1486d7a2..32ec613ff5 100644
--- a/components/esm4/loadterm.hpp
+++ b/components/esm4/loadterm.hpp
@@ -53,10 +53,8 @@ namespace ESM4
         FormId mPasswordNote;
         FormId mSound;
 
-        virtual ~Terminal();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadtree.cpp b/components/esm4/loadtree.cpp
index c70863a51b..1ac3301c3f 100644
--- a/components/esm4/loadtree.cpp
+++ b/components/esm4/loadtree.cpp
@@ -31,10 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Tree::~Tree()
-{
-}
-
 void ESM4::Tree::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadtree.hpp b/components/esm4/loadtree.hpp
index 2c88812b46..48c59468b2 100644
--- a/components/esm4/loadtree.hpp
+++ b/components/esm4/loadtree.hpp
@@ -49,10 +49,8 @@ namespace ESM4
 
         std::string mLeafTexture;
 
-        virtual ~Tree();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadtxst.cpp b/components/esm4/loadtxst.cpp
index 51f58c9816..b0f8c1113c 100644
--- a/components/esm4/loadtxst.cpp
+++ b/components/esm4/loadtxst.cpp
@@ -32,10 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::TextureSet::~TextureSet()
-{
-}
-
 void ESM4::TextureSet::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadtxst.hpp b/components/esm4/loadtxst.hpp
index 71251c2dcb..be968f2e6e 100644
--- a/components/esm4/loadtxst.hpp
+++ b/components/esm4/loadtxst.hpp
@@ -53,10 +53,8 @@ namespace ESM4
         std::string mUnknown;
         std::string mSpecular;
 
-        virtual ~TextureSet();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadweap.cpp b/components/esm4/loadweap.cpp
index 463496187e..56ae2174d2 100644
--- a/components/esm4/loadweap.cpp
+++ b/components/esm4/loadweap.cpp
@@ -31,10 +31,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::Weapon::~Weapon()
-{
-}
-
 void ESM4::Weapon::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadweap.hpp b/components/esm4/loadweap.hpp
index 7128e26ec9..1abfc5b577 100644
--- a/components/esm4/loadweap.hpp
+++ b/components/esm4/loadweap.hpp
@@ -83,10 +83,8 @@ namespace ESM4
 
         Data mData;
 
-        virtual ~Weapon();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
 
         //void blank();
     };
diff --git a/components/esm4/loadwrld.cpp b/components/esm4/loadwrld.cpp
index ca8e5fd2c5..d8ec79b625 100644
--- a/components/esm4/loadwrld.cpp
+++ b/components/esm4/loadwrld.cpp
@@ -32,10 +32,6 @@
 #include "reader.hpp"
 //#include "writer.hpp"
 
-ESM4::World::~World()
-{
-}
-
 void ESM4::World::load(ESM4::Reader& reader)
 {
     mFormId = reader.hdr().record.id;
diff --git a/components/esm4/loadwrld.hpp b/components/esm4/loadwrld.hpp
index 5937670daf..b6b643446c 100644
--- a/components/esm4/loadwrld.hpp
+++ b/components/esm4/loadwrld.hpp
@@ -126,10 +126,8 @@ namespace ESM4
         std::vector<FormId> mCells;
         std::vector<FormId> mRoads;
 
-        virtual ~World();
-
-        virtual void load(ESM4::Reader& reader);
-        //virtual void save(ESM4::Writer& writer) const;
+        void load(ESM4::Reader& reader);
+        //void save(ESM4::Writer& writer) const;
     };
 }
 

From d2510284ec25349dbf934d7bf92d2be36ffa7148 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 14 Apr 2022 16:46:57 +0200
Subject: [PATCH 2351/2859] Support TES4 in esmtool dump

---
 apps/esmtool/CMakeLists.txt |   3 +
 apps/esmtool/arguments.hpp  |  28 +++
 apps/esmtool/esmtool.cpp    | 126 +++++++++-----
 apps/esmtool/tes4.cpp       | 329 ++++++++++++++++++++++++++++++++++++
 apps/esmtool/tes4.hpp       |  15 ++
 components/CMakeLists.txt   |   2 +-
 components/esm/format.cpp   |  40 +++++
 components/esm/format.hpp   |  23 +++
 components/esm4/common.hpp  |   4 +-
 components/esm4/records.hpp |  84 +++++++++
 10 files changed, 606 insertions(+), 48 deletions(-)
 create mode 100644 apps/esmtool/arguments.hpp
 create mode 100644 apps/esmtool/tes4.cpp
 create mode 100644 apps/esmtool/tes4.hpp
 create mode 100644 components/esm/format.cpp
 create mode 100644 components/esm/format.hpp
 create mode 100644 components/esm4/records.hpp

diff --git a/apps/esmtool/CMakeLists.txt b/apps/esmtool/CMakeLists.txt
index 122ca2f3af..914a40699e 100644
--- a/apps/esmtool/CMakeLists.txt
+++ b/apps/esmtool/CMakeLists.txt
@@ -4,6 +4,9 @@ set(ESMTOOL
   labels.cpp
   record.hpp
   record.cpp
+  arguments.hpp
+  tes4.hpp
+  tes4.cpp
 )
 source_group(apps\\esmtool FILES ${ESMTOOL})
 
diff --git a/apps/esmtool/arguments.hpp b/apps/esmtool/arguments.hpp
new file mode 100644
index 0000000000..96b4bb8f04
--- /dev/null
+++ b/apps/esmtool/arguments.hpp
@@ -0,0 +1,28 @@
+#ifndef OPENMW_ESMTOOL_ARGUMENTS_H
+#define OPENMW_ESMTOOL_ARGUMENTS_H
+
+#include <vector>
+#include <optional>
+
+#include <components/esm/format.hpp>
+
+namespace EsmTool
+{
+    struct Arguments
+    {
+        std::optional<ESM::Format> mRawFormat;
+        bool quiet_given;
+        bool loadcells_given;
+        bool plain_given;
+
+        std::string mode;
+        std::string encoding;
+        std::string filename;
+        std::string outname;
+
+        std::vector<std::string> types;
+        std::string name;
+    };
+}
+
+#endif
diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp
index d6708fbfb4..3eb78f3e41 100644
--- a/apps/esmtool/esmtool.cpp
+++ b/apps/esmtool/esmtool.cpp
@@ -7,17 +7,29 @@
 #include <fstream>
 #include <cmath>
 #include <memory>
+#include <optional>
+#include <iomanip>
 
 #include <boost/program_options.hpp>
 
 #include <components/esm3/esmreader.hpp>
 #include <components/esm3/esmwriter.hpp>
 #include <components/esm/records.hpp>
+#include <components/esm/format.hpp>
+#include <components/files/openfile.hpp>
 
 #include "record.hpp"
 #include "labels.hpp"
+#include "arguments.hpp"
+#include "tes4.hpp"
+
+namespace
+{
 
-#define ESMTOOL_VERSION 1.2
+using namespace EsmTool;
+
+constexpr unsigned majorVersion = 1;
+constexpr unsigned minorVersion = 3;
 
 // Create a local alias for brevity
 namespace bpo = boost::program_options;
@@ -36,23 +48,6 @@ struct ESMData
 
 };
 
-// Based on the legacy struct
-struct Arguments
-{
-    bool raw_given;
-    bool quiet_given;
-    bool loadcells_given;
-    bool plain_given;
-
-    std::string mode;
-    std::string encoding;
-    std::string filename;
-    std::string outname;
-
-    std::vector<std::string> types;
-    std::string name;
-};
-
 bool parseOptions (int argc, char** argv, Arguments &info)
 {
     bpo::options_description desc("Inspect and extract from Morrowind ES files (ESM, ESP, ESS)\nSyntax: esmtool [options] mode infile [outfile]\nAllowed modes:\n  dump\t Dumps all readable data from the input file.\n  clone\t Clones the input file to the output file.\n  comp\t Compares the given files.\n\nAllowed options");
@@ -60,7 +55,10 @@ bool parseOptions (int argc, char** argv, Arguments &info)
     desc.add_options()
         ("help,h", "print help message.")
         ("version,v", "print version information and quit.")
-        ("raw,r", "Show an unformatted list of all records and subrecords.")
+        ("raw,r", bpo::value<std::string>(),
+         "Show an unformatted list of all records and subrecords of given format:\n"
+         "\n\tTES3"
+         "\n\tTES4")
         // The intention is that this option would interact better
         // with other modes including clone, dump, and raw.
         ("type,t", bpo::value< std::vector<std::string> >(),
@@ -122,7 +120,7 @@ bool parseOptions (int argc, char** argv, Arguments &info)
     }
     if (variables.count ("version"))
     {
-        std::cout << "ESMTool version " << ESMTOOL_VERSION << std::endl;
+        std::cout << "ESMTool version " << majorVersion << '.' << minorVersion << std::endl;
         return false;
     }
     if (!variables.count("mode"))
@@ -164,7 +162,9 @@ bool parseOptions (int argc, char** argv, Arguments &info)
     if (variables["input-file"].as< std::vector<std::string> >().size() > 1)
         info.outname = variables["input-file"].as< std::vector<std::string> >()[1];
 
-    info.raw_given = variables.count ("raw") != 0;
+    if (const auto it = variables.find("raw"); it != variables.end())
+        info.mRawFormat = ESM::parseFormat(it->second.as<std::string>());
+
     info.quiet_given = variables.count ("quiet") != 0;
     info.loadcells_given = variables.count ("loadcells") != 0;
     info.plain_given = variables.count("plain") != 0;
@@ -181,13 +181,14 @@ bool parseOptions (int argc, char** argv, Arguments &info)
     return true;
 }
 
-void printRaw(ESM::ESMReader &esm);
 void loadCell(const Arguments& info, ESM::Cell &cell, ESM::ESMReader &esm, ESMData* data);
 
 int load(const Arguments& info, ESMData* data);
 int clone(const Arguments& info);
 int comp(const Arguments& info);
 
+}
+
 int main(int argc, char**argv)
 {
     try
@@ -217,6 +218,9 @@ int main(int argc, char**argv)
     return 0;
 }
 
+namespace
+{
+
 void loadCell(const Arguments& info, ESM::Cell &cell, ESM::ESMReader &esm, ESMData* data)
 {
     bool quiet = (info.quiet_given || info.mode == "clone");
@@ -284,8 +288,11 @@ void loadCell(const Arguments& info, ESM::Cell &cell, ESM::ESMReader &esm, ESMDa
     }
 }
 
-void printRaw(ESM::ESMReader &esm)
+void printRawTes3(const std::string& path)
 {
+    std::cout << "TES3 RAW file listing: " << path << '\n';
+    ESM::ESMReader esm;
+    esm.openRaw(path);
     while(esm.hasMoreRecs())
     {
         ESM::NAME n = esm.getRecName();
@@ -305,35 +312,23 @@ void printRaw(ESM::ESMReader &esm)
     }
 }
 
-int load(const Arguments& info, ESMData* data)
+int loadTes3(const Arguments& info, std::unique_ptr<std::ifstream>&& stream, ESMData* data)
 {
+    std::cout << "Loading TES3 file: " << info.filename << '\n';
+
     ESM::ESMReader esm;
     ToUTF8::Utf8Encoder encoder (ToUTF8::calculateEncoding(info.encoding));
     esm.setEncoder(&encoder);
 
-    std::string filename = info.filename;
-    std::cout << "Loading file: " << filename << '\n';
-
     std::unordered_set<uint32_t> skipped;
 
-    try {
-
-        if(info.raw_given && info.mode == "dump")
-        {
-            std::cout << "RAW file listing:\n";
-
-            esm.openRaw(filename);
-
-            printRaw(esm);
-
-            return 0;
-        }
-
+    try
+    {
         bool quiet = (info.quiet_given || info.mode == "clone");
         bool loadCells = (info.loadcells_given || info.mode == "clone");
         bool save = (info.mode == "clone");
 
-        esm.open(filename);
+        esm.open(std::move(stream), info.filename);
 
         if (data != nullptr)
         {
@@ -422,7 +417,49 @@ int load(const Arguments& info, ESMData* data)
     return 0;
 }
 
-#include <iomanip>
+int load(const Arguments& info, ESMData* data)
+{
+    if (info.mRawFormat.has_value() && info.mode == "dump")
+    {
+        switch (*info.mRawFormat)
+        {
+            case ESM::Format::Tes3:
+                printRawTes3(info.filename);
+                break;
+            case ESM::Format::Tes4:
+                std::cout << "Printing raw TES4 file is not supported: " << info.filename << "\n";
+                break;
+        }
+        return 0;
+    }
+
+    auto stream = Files::openBinaryInputFileStream(info.filename);
+    if (!stream->is_open())
+    {
+        std::cout << "Failed to open file: " << std::strerror(errno) << '\n';
+        return -1;
+    }
+
+    const ESM::Format format = ESM::readFormat(*stream);
+    stream->seekg(0);
+
+    switch (format)
+    {
+        case ESM::Format::Tes3:
+            return loadTes3(info, std::move(stream), data);
+        case ESM::Format::Tes4:
+            if (data != nullptr)
+            {
+                std::cout << "Collecting data from esm file is not supported for TES4\n";
+                return -1;
+            }
+            return loadTes4(info, std::move(stream));
+    }
+
+    std::cout << "Unsupported ESM format: " << ESM::NAME(format).toStringView() << '\n';
+
+    return -1;
+}
 
 int clone(const Arguments& info)
 {
@@ -526,9 +563,6 @@ int comp(const Arguments& info)
     Arguments fileOne;
     Arguments fileTwo;
 
-    fileOne.raw_given = false;
-    fileTwo.raw_given = false;
-
     fileOne.mode = "clone";
     fileTwo.mode = "clone";
 
@@ -560,3 +594,5 @@ int comp(const Arguments& info)
 
     return 0;
 }
+
+}
diff --git a/apps/esmtool/tes4.cpp b/apps/esmtool/tes4.cpp
new file mode 100644
index 0000000000..3f213ff0b7
--- /dev/null
+++ b/apps/esmtool/tes4.cpp
@@ -0,0 +1,329 @@
+#include "tes4.hpp"
+#include "arguments.hpp"
+#include "labels.hpp"
+
+#include <fstream>
+#include <iostream>
+#include <type_traits>
+
+#include <components/esm/esmcommon.hpp>
+#include <components/esm4/reader.hpp>
+#include <components/esm4/records.hpp>
+
+namespace EsmTool
+{
+    namespace
+    {
+        struct Params
+        {
+            const bool mQuite;
+
+            explicit Params(const Arguments& info)
+                : mQuite(info.quiet_given || info.mode == "clone")
+            {}
+        };
+
+        std::string toString(ESM4::GroupType type)
+        {
+            switch (type)
+            {
+                case ESM4::Grp_RecordType: return "RecordType";
+                case ESM4::Grp_WorldChild: return "WorldChild";
+                case ESM4::Grp_InteriorCell: return "InteriorCell";
+                case ESM4::Grp_InteriorSubCell: return "InteriorSubCell";
+                case ESM4::Grp_ExteriorCell: return "ExteriorCell";
+                case ESM4::Grp_ExteriorSubCell: return "ExteriorSubCell";
+                case ESM4::Grp_CellChild: return "CellChild";
+                case ESM4::Grp_TopicChild: return "TopicChild";
+                case ESM4::Grp_CellPersistentChild: return "CellPersistentChild";
+                case ESM4::Grp_CellTemporaryChild: return "CellTemporaryChild";
+                case ESM4::Grp_CellVisibleDistChild: return "CellVisibleDistChild";
+            }
+
+            return "Unknown (" + std::to_string(type) + ")";
+        }
+
+        template <class T, class = std::void_t<>>
+        struct HasFormId : std::false_type {};
+
+        template <class T>
+        struct HasFormId<T, std::void_t<decltype(T::mFormId)>> : std::true_type {};
+
+        template <class T>
+        constexpr bool hasFormId = HasFormId<T>::value;
+
+        template <class T, class = std::void_t<>>
+        struct HasFlags : std::false_type {};
+
+        template <class T>
+        struct HasFlags<T, std::void_t<decltype(T::mFlags)>> : std::true_type {};
+
+        template <class T>
+        constexpr bool hasFlags = HasFlags<T>::value;
+
+        template <class T>
+        void readTypedRecord(const Params& params, ESM4::Reader& reader)
+        {
+            reader.getRecordData();
+
+            T value;
+            value.load(reader);
+
+            if (params.mQuite)
+                return;
+
+            std::cout << "\n  Record: " << ESM::NAME(reader.hdr().record.typeId).toStringView();
+            if constexpr (hasFormId<T>)
+                std::cout << ' ' << value.mFormId;
+            if constexpr (hasFlags<T>)
+                std::cout << "\n  Record flags: " << recordFlags(value.mFlags);
+            std::cout << '\n';
+        }
+
+        void readRecord(const Params& params, ESM4::Reader& reader)
+        {
+            switch (static_cast<ESM4::RecordTypes>(reader.hdr().record.typeId))
+            {
+                case ESM4::REC_AACT: break;
+                case ESM4::REC_ACHR: return readTypedRecord<ESM4::ActorCharacter>(params, reader);
+                case ESM4::REC_ACRE: return readTypedRecord<ESM4::ActorCreature>(params, reader);
+                case ESM4::REC_ACTI: return readTypedRecord<ESM4::Activator>(params, reader);
+                case ESM4::REC_ADDN: break;
+                case ESM4::REC_ALCH: return readTypedRecord<ESM4::Potion>(params, reader);
+                case ESM4::REC_ALOC: return readTypedRecord<ESM4::MediaLocationController>(params, reader);
+                case ESM4::REC_AMMO: return readTypedRecord<ESM4::Ammunition>(params, reader);
+                case ESM4::REC_ANIO: return readTypedRecord<ESM4::AnimObject>(params, reader);
+                case ESM4::REC_APPA: return readTypedRecord<ESM4::Apparatus>(params, reader);
+                case ESM4::REC_ARMA: return readTypedRecord<ESM4::ArmorAddon>(params, reader);
+                case ESM4::REC_ARMO: return readTypedRecord<ESM4::Armor>(params, reader);
+                case ESM4::REC_ARTO: break;
+                case ESM4::REC_ASPC: return readTypedRecord<ESM4::AcousticSpace>(params, reader);
+                case ESM4::REC_ASTP: break;
+                case ESM4::REC_AVIF: break;
+                case ESM4::REC_BOOK: return readTypedRecord<ESM4::Book>(params, reader);
+                case ESM4::REC_BPTD: return readTypedRecord<ESM4::BodyPartData>(params, reader);
+                case ESM4::REC_CAMS: break;
+                case ESM4::REC_CCRD: break;
+                case ESM4::REC_CELL: return readTypedRecord<ESM4::Cell>(params, reader);
+                case ESM4::REC_CLAS: return readTypedRecord<ESM4::Class>(params, reader);
+                case ESM4::REC_CLFM: return readTypedRecord<ESM4::Colour>(params, reader);
+                case ESM4::REC_CLMT: break;
+                case ESM4::REC_CLOT: return readTypedRecord<ESM4::Clothing>(params, reader);
+                case ESM4::REC_CMNY: break;
+                case ESM4::REC_COBJ: break;
+                case ESM4::REC_COLL: break;
+                case ESM4::REC_CONT: return readTypedRecord<ESM4::Container>(params, reader);
+                case ESM4::REC_CPTH: break;
+                case ESM4::REC_CREA: return readTypedRecord<ESM4::Creature>(params, reader);
+                case ESM4::REC_CSTY: break;
+                case ESM4::REC_DEBR: break;
+                case ESM4::REC_DIAL: return readTypedRecord<ESM4::Dialogue>(params, reader);
+                case ESM4::REC_DLBR: break;
+                case ESM4::REC_DLVW: break;
+                case ESM4::REC_DOBJ: return readTypedRecord<ESM4::DefaultObj>(params, reader);
+                case ESM4::REC_DOOR: return readTypedRecord<ESM4::Door>(params, reader);
+                case ESM4::REC_DUAL: break;
+                case ESM4::REC_ECZN: break;
+                case ESM4::REC_EFSH: break;
+                case ESM4::REC_ENCH: break;
+                case ESM4::REC_EQUP: break;
+                case ESM4::REC_EXPL: break;
+                case ESM4::REC_EYES: return readTypedRecord<ESM4::Eyes>(params, reader);
+                case ESM4::REC_FACT: break;
+                case ESM4::REC_FLOR: return readTypedRecord<ESM4::Flora>(params, reader);
+                case ESM4::REC_FLST: return readTypedRecord<ESM4::FormIdList>(params, reader);
+                case ESM4::REC_FSTP: break;
+                case ESM4::REC_FSTS: break;
+                case ESM4::REC_FURN: return readTypedRecord<ESM4::Furniture>(params, reader);
+                case ESM4::REC_GLOB: return readTypedRecord<ESM4::GlobalVariable>(params, reader);
+                case ESM4::REC_GMST: break;
+                case ESM4::REC_GRAS: return readTypedRecord<ESM4::Grass>(params, reader);
+                case ESM4::REC_GRUP: break;
+                case ESM4::REC_HAIR: return readTypedRecord<ESM4::Hair>(params, reader);
+                case ESM4::REC_HAZD: break;
+                case ESM4::REC_HDPT: return readTypedRecord<ESM4::HeadPart>(params, reader);
+                case ESM4::REC_IDLE:
+                    // FIXME: ESM4::IdleAnimation::load does not work with Oblivion.esm
+                    // return readTypedRecord<ESM4::IdleAnimation>(params, reader);
+                    break;
+                case ESM4::REC_IDLM: return readTypedRecord<ESM4::IdleMarker>(params, reader);
+                case ESM4::REC_IMAD: break;
+                case ESM4::REC_IMGS: break;
+                case ESM4::REC_IMOD: return readTypedRecord<ESM4::ItemMod>(params, reader);
+                case ESM4::REC_INFO: return readTypedRecord<ESM4::DialogInfo>(params, reader);
+                case ESM4::REC_INGR: return readTypedRecord<ESM4::Ingredient>(params, reader);
+                case ESM4::REC_IPCT: break;
+                case ESM4::REC_IPDS: break;
+                case ESM4::REC_KEYM: return readTypedRecord<ESM4::Key>(params, reader);
+                case ESM4::REC_KYWD: break;
+                case ESM4::REC_LAND: return readTypedRecord<ESM4::Land>(params, reader);
+                case ESM4::REC_LCRT: break;
+                case ESM4::REC_LCTN: break;
+                case ESM4::REC_LGTM: return readTypedRecord<ESM4::LightingTemplate>(params, reader);
+                case ESM4::REC_LIGH: return readTypedRecord<ESM4::Light>(params, reader);
+                case ESM4::REC_LSCR: break;
+                case ESM4::REC_LTEX: return readTypedRecord<ESM4::LandTexture>(params, reader);
+                case ESM4::REC_LVLC: return readTypedRecord<ESM4::LevelledCreature>(params, reader);
+                case ESM4::REC_LVLI: return readTypedRecord<ESM4::LevelledItem>(params, reader);
+                case ESM4::REC_LVLN: return readTypedRecord<ESM4::LevelledNpc>(params, reader);
+                case ESM4::REC_LVSP: break;
+                case ESM4::REC_MATO: return readTypedRecord<ESM4::Material>(params, reader);
+                case ESM4::REC_MATT: break;
+                case ESM4::REC_MESG: break;
+                case ESM4::REC_MGEF: break;
+                case ESM4::REC_MISC: return readTypedRecord<ESM4::MiscItem>(params, reader);
+                case ESM4::REC_MOVT: break;
+                case ESM4::REC_MSET: return readTypedRecord<ESM4::MediaSet>(params, reader);
+                case ESM4::REC_MSTT: return readTypedRecord<ESM4::MovableStatic>(params, reader);
+                case ESM4::REC_MUSC: return readTypedRecord<ESM4::Music>(params, reader);
+                case ESM4::REC_MUST: break;
+                case ESM4::REC_NAVI: return readTypedRecord<ESM4::Navigation>(params, reader);
+                case ESM4::REC_NAVM: return readTypedRecord<ESM4::NavMesh>(params, reader);
+                case ESM4::REC_NOTE: return readTypedRecord<ESM4::Note>(params, reader);
+                case ESM4::REC_NPC_: return readTypedRecord<ESM4::Npc>(params, reader);
+                case ESM4::REC_OTFT: return readTypedRecord<ESM4::Outfit>(params, reader);
+                case ESM4::REC_PACK: return readTypedRecord<ESM4::AIPackage>(params, reader);
+                case ESM4::REC_PERK: break;
+                case ESM4::REC_PGRD: return readTypedRecord<ESM4::Pathgrid>(params, reader);
+                case ESM4::REC_PGRE: return readTypedRecord<ESM4::PlacedGrenade>(params, reader);
+                case ESM4::REC_PHZD: break;
+                case ESM4::REC_PROJ: break;
+                case ESM4::REC_PWAT: return readTypedRecord<ESM4::PlaceableWater>(params, reader);
+                case ESM4::REC_QUST: return readTypedRecord<ESM4::Quest>(params, reader);
+                case ESM4::REC_RACE: return readTypedRecord<ESM4::Race>(params, reader);
+                case ESM4::REC_REFR: return readTypedRecord<ESM4::Reference>(params, reader);
+                case ESM4::REC_REGN: return readTypedRecord<ESM4::Region>(params, reader);
+                case ESM4::REC_RELA: break;
+                case ESM4::REC_REVB: break;
+                case ESM4::REC_RFCT: break;
+                case ESM4::REC_ROAD: return readTypedRecord<ESM4::Road>(params, reader);
+                case ESM4::REC_SBSP: return readTypedRecord<ESM4::SubSpace>(params, reader);
+                case ESM4::REC_SCEN: break;
+                case ESM4::REC_SCOL: return readTypedRecord<ESM4::StaticCollection>(params, reader);
+                case ESM4::REC_SCPT: return readTypedRecord<ESM4::Script>(params, reader);
+                case ESM4::REC_SCRL: return readTypedRecord<ESM4::Scroll>(params, reader);
+                case ESM4::REC_SGST: return readTypedRecord<ESM4::SigilStone>(params, reader);
+                case ESM4::REC_SHOU: break;
+                case ESM4::REC_SLGM: return readTypedRecord<ESM4::SoulGem>(params, reader);
+                case ESM4::REC_SMBN: break;
+                case ESM4::REC_SMEN: break;
+                case ESM4::REC_SMQN: break;
+                case ESM4::REC_SNCT: break;
+                case ESM4::REC_SNDR: return readTypedRecord<ESM4::SoundReference>(params, reader);
+                case ESM4::REC_SOPM: break;
+                case ESM4::REC_SOUN: return readTypedRecord<ESM4::Sound>(params, reader);
+                case ESM4::REC_SPEL: break;
+                case ESM4::REC_SPGD: break;
+                case ESM4::REC_STAT: return readTypedRecord<ESM4::Static>(params, reader);
+                case ESM4::REC_TACT: return readTypedRecord<ESM4::TalkingActivator>(params, reader);
+                case ESM4::REC_TERM: return readTypedRecord<ESM4::Terminal>(params, reader);
+                case ESM4::REC_TES4: return readTypedRecord<ESM4::Header>(params, reader);
+                case ESM4::REC_TREE: return readTypedRecord<ESM4::Tree>(params, reader);
+                case ESM4::REC_TXST: return readTypedRecord<ESM4::TextureSet>(params, reader);
+                case ESM4::REC_VTYP: break;
+                case ESM4::REC_WATR: break;
+                case ESM4::REC_WEAP: return readTypedRecord<ESM4::Weapon>(params, reader);
+                case ESM4::REC_WOOP: break;
+                case ESM4::REC_WRLD: return readTypedRecord<ESM4::World>(params, reader);
+                case ESM4::REC_WTHR: break;
+            }
+
+            if (!params.mQuite)
+                std::cout << "\n  Unsupported record: " << ESM::NAME(reader.hdr().record.typeId).toStringView() << '\n';
+
+            reader.skipRecordData();
+        }
+
+        bool readItem(const Params& params, ESM4::Reader& reader);
+
+        bool readGroup(const Params& params, ESM4::Reader& reader)
+        {
+            const ESM4::RecordHeader& header = reader.hdr();
+
+            if (!params.mQuite)
+                std::cout << "\nGroup: " << toString(static_cast<ESM4::GroupType>(header.group.type))
+                    << " " << ESM::NAME(header.group.typeId).toStringView() << '\n';
+
+            switch (static_cast<ESM4::GroupType>(header.group.type))
+            {
+                case ESM4::Grp_RecordType:
+                case ESM4::Grp_InteriorCell:
+                case ESM4::Grp_InteriorSubCell:
+                case ESM4::Grp_ExteriorCell:
+                case ESM4::Grp_ExteriorSubCell:
+                    reader.enterGroup();
+                    return readItem(params, reader);
+                case ESM4::Grp_WorldChild:
+                case ESM4::Grp_CellChild:
+                case ESM4::Grp_TopicChild:
+                case ESM4::Grp_CellPersistentChild:
+                case ESM4::Grp_CellTemporaryChild:
+                case ESM4::Grp_CellVisibleDistChild:
+                    reader.adjustGRUPFormId();
+                    reader.enterGroup();
+                    if (!reader.hasMoreRecs())
+                        return false;
+                    return readItem(params, reader);
+            }
+
+            reader.skipGroup();
+
+            return true;
+        }
+
+        bool readItem(const Params& params, ESM4::Reader& reader)
+        {
+            if (!reader.getRecordHeader() || !reader.hasMoreRecs())
+                return false;
+
+            const ESM4::RecordHeader& header = reader.hdr();
+
+            if (header.record.typeId == ESM4::REC_GRUP)
+                return readGroup(params, reader);
+
+            readRecord(params, reader);
+            return true;
+        }
+    }
+
+    int loadTes4(const Arguments& info, std::unique_ptr<std::ifstream>&& stream)
+    {
+        std::cout << "Loading TES4 file: " << info.filename << '\n';
+
+        try
+        {
+            const ToUTF8::StatelessUtf8Encoder encoder(ToUTF8::calculateEncoding(info.encoding));
+            ESM4::Reader reader(std::move(stream), info.filename);
+            reader.setEncoder(&encoder);
+            const Params params(info);
+
+            if (!params.mQuite)
+            {
+                std::cout << "Author: " << reader.getAuthor() << '\n'
+                    << "Description: " << reader.getDesc() << '\n'
+                    << "File format version: " << reader.esmVersion() << '\n';
+
+                if (const std::vector<ESM::MasterData>& masterData = reader.getGameFiles(); !masterData.empty())
+                {
+                    std::cout << "Masters:" << '\n';
+                    for (const auto& master : masterData)
+                        std::cout << "  " << master.name << ", " << master.size << " bytes\n";
+                }
+            }
+
+            while (reader.hasMoreRecs())
+            {
+                reader.exitGroupCheck();
+                if (!readItem(params, reader))
+                    break;
+            }
+        }
+        catch (const std::exception& e)
+        {
+            std::cout << "\nERROR:\n\n  " << e.what() << std::endl;
+            return -1;
+        }
+
+        return 0;
+    }
+}
diff --git a/apps/esmtool/tes4.hpp b/apps/esmtool/tes4.hpp
new file mode 100644
index 0000000000..8149b26049
--- /dev/null
+++ b/apps/esmtool/tes4.hpp
@@ -0,0 +1,15 @@
+#ifndef OPENMW_ESMTOOL_TES4_H
+#define OPENMW_ESMTOOL_TES4_H
+
+#include <fstream>
+#include <iosfwd>
+#include <memory>
+
+namespace EsmTool
+{
+    struct Arguments;
+
+    int loadTes4(const Arguments& info, std::unique_ptr<std::ifstream>&& stream);
+}
+
+#endif
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 7121bde103..32c7c9535f 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -80,7 +80,7 @@ add_component_dir (to_utf8
     to_utf8
     )
 
-add_component_dir(esm attr common defs esmcommon reader records util luascripts)
+add_component_dir(esm attr common defs esmcommon reader records util luascripts format)
 
 add_component_dir (esm3
     esmreader esmwriter loadacti loadalch loadappa loadarmo loadbody loadbook loadbsgn loadcell
diff --git a/components/esm/format.cpp b/components/esm/format.cpp
new file mode 100644
index 0000000000..b41d81d57d
--- /dev/null
+++ b/components/esm/format.cpp
@@ -0,0 +1,40 @@
+#include "format.hpp"
+
+#include <components/esm/esmcommon.hpp>
+
+namespace ESM
+{
+    namespace
+    {
+        bool isValidFormat(std::uint32_t value)
+        {
+            return value == static_cast<std::uint32_t>(Format::Tes3)
+                || value == static_cast<std::uint32_t>(Format::Tes4);
+        }
+
+        Format toFormat(std::uint32_t value)
+        {
+            if (!isValidFormat(value))
+                throw std::runtime_error("Invalid format: " + std::to_string(value));
+            return static_cast<Format>(value);
+        }
+    }
+
+    Format readFormat(std::istream& stream)
+    {
+        std::uint32_t format = 0;
+        stream.read(reinterpret_cast<char*>(&format), sizeof(format));
+        if (stream.gcount() != sizeof(format))
+            throw std::runtime_error("Not enough bytes to read file header");
+        return toFormat(format);
+    }
+
+    Format parseFormat(std::string_view value)
+    {
+        if (value.size() != sizeof(std::uint32_t))
+            throw std::logic_error("Invalid format value: " + std::string(value));
+        std::uint32_t format;
+        std::memcpy(&format, value.data(), sizeof(std::uint32_t));
+        return toFormat(format);
+    }
+}
diff --git a/components/esm/format.hpp b/components/esm/format.hpp
new file mode 100644
index 0000000000..acd93b4075
--- /dev/null
+++ b/components/esm/format.hpp
@@ -0,0 +1,23 @@
+#ifndef COMPONENT_ESM_FORMAT_H
+#define COMPONENT_ESM_FORMAT_H
+
+#include "defs.hpp"
+
+#include <cstdint>
+#include <istream>
+#include <string_view>
+
+namespace ESM
+{
+    enum class Format : std::uint32_t
+    {
+        Tes3 = fourCC("TES3"),
+        Tes4 = fourCC("TES4"),
+    };
+
+    Format readFormat(std::istream& stream);
+
+    Format parseFormat(std::string_view value);
+}
+
+#endif
diff --git a/components/esm4/common.hpp b/components/esm4/common.hpp
index b92a48e070..11286e4b03 100644
--- a/components/esm4/common.hpp
+++ b/components/esm4/common.hpp
@@ -76,7 +76,7 @@ namespace ESM4
         REC_DOBJ = fourCC("DOBJ"), // Default Object Manager
         REC_DOOR = fourCC("DOOR"), // Door
         REC_DUAL = fourCC("DUAL"), // Dual Cast Data (possibly unused)
-      //REC_ECZN = fourCC("ECZN"), // Encounter Zone
+        REC_ECZN = fourCC("ECZN"), // Encounter Zone
         REC_EFSH = fourCC("EFSH"), // Effect Shader
         REC_ENCH = fourCC("ENCH"), // Enchantment
         REC_EQUP = fourCC("EQUP"), // Equip Slot (flag-type values)
@@ -93,7 +93,7 @@ namespace ESM4
         REC_GRAS = fourCC("GRAS"), // Grass
         REC_GRUP = fourCC("GRUP"), // Form Group
         REC_HAIR = fourCC("HAIR"), // Hair
-      //REC_HAZD = fourCC("HAZD"), // Hazard
+        REC_HAZD = fourCC("HAZD"), // Hazard
         REC_HDPT = fourCC("HDPT"), // Head Part
         REC_IDLE = fourCC("IDLE"), // Idle Animation
         REC_IDLM = fourCC("IDLM"), // Idle Marker
diff --git a/components/esm4/records.hpp b/components/esm4/records.hpp
new file mode 100644
index 0000000000..ae2a7a78f7
--- /dev/null
+++ b/components/esm4/records.hpp
@@ -0,0 +1,84 @@
+#ifndef COMPONENTS_ESM4_RECORDS_H
+#define COMPONENTS_ESM4_RECORDS_H
+
+#include <components/esm4/loadachr.hpp>
+#include <components/esm4/loadacre.hpp>
+#include <components/esm4/loadacti.hpp>
+#include <components/esm4/loadalch.hpp>
+#include <components/esm4/loadaloc.hpp>
+#include <components/esm4/loadammo.hpp>
+#include <components/esm4/loadanio.hpp>
+#include <components/esm4/loadappa.hpp>
+#include <components/esm4/loadarma.hpp>
+#include <components/esm4/loadarmo.hpp>
+#include <components/esm4/loadaspc.hpp>
+#include <components/esm4/loadbook.hpp>
+#include <components/esm4/loadbptd.hpp>
+#include <components/esm4/loadcell.hpp>
+#include <components/esm4/loadclas.hpp>
+#include <components/esm4/loadclfm.hpp>
+#include <components/esm4/loadclot.hpp>
+#include <components/esm4/loadcont.hpp>
+#include <components/esm4/loadcrea.hpp>
+#include <components/esm4/loaddial.hpp>
+#include <components/esm4/loaddobj.hpp>
+#include <components/esm4/loaddoor.hpp>
+#include <components/esm4/loadeyes.hpp>
+#include <components/esm4/loadflor.hpp>
+#include <components/esm4/loadflst.hpp>
+#include <components/esm4/loadfurn.hpp>
+#include <components/esm4/loadglob.hpp>
+#include <components/esm4/loadgras.hpp>
+#include <components/esm4/loadgrup.hpp>
+#include <components/esm4/loadhair.hpp>
+#include <components/esm4/loadhdpt.hpp>
+#include <components/esm4/loadidle.hpp>
+#include <components/esm4/loadidlm.hpp>
+#include <components/esm4/loadimod.hpp>
+#include <components/esm4/loadinfo.hpp>
+#include <components/esm4/loadingr.hpp>
+#include <components/esm4/loadkeym.hpp>
+#include <components/esm4/loadland.hpp>
+#include <components/esm4/loadlgtm.hpp>
+#include <components/esm4/loadligh.hpp>
+#include <components/esm4/loadltex.hpp>
+#include <components/esm4/loadlvlc.hpp>
+#include <components/esm4/loadlvli.hpp>
+#include <components/esm4/loadlvln.hpp>
+#include <components/esm4/loadmato.hpp>
+#include <components/esm4/loadmisc.hpp>
+#include <components/esm4/loadmset.hpp>
+#include <components/esm4/loadmstt.hpp>
+#include <components/esm4/loadmusc.hpp>
+#include <components/esm4/loadnavi.hpp>
+#include <components/esm4/loadnavm.hpp>
+#include <components/esm4/loadnote.hpp>
+#include <components/esm4/loadnpc.hpp>
+#include <components/esm4/loadotft.hpp>
+#include <components/esm4/loadpack.hpp>
+#include <components/esm4/loadpgrd.hpp>
+#include <components/esm4/loadpgre.hpp>
+#include <components/esm4/loadpwat.hpp>
+#include <components/esm4/loadqust.hpp>
+#include <components/esm4/loadrace.hpp>
+#include <components/esm4/loadrefr.hpp>
+#include <components/esm4/loadregn.hpp>
+#include <components/esm4/loadroad.hpp>
+#include <components/esm4/loadsbsp.hpp>
+#include <components/esm4/loadscol.hpp>
+#include <components/esm4/loadscpt.hpp>
+#include <components/esm4/loadscrl.hpp>
+#include <components/esm4/loadsgst.hpp>
+#include <components/esm4/loadslgm.hpp>
+#include <components/esm4/loadsndr.hpp>
+#include <components/esm4/loadsoun.hpp>
+#include <components/esm4/loadstat.hpp>
+#include <components/esm4/loadtact.hpp>
+#include <components/esm4/loadterm.hpp>
+#include <components/esm4/loadtes4.hpp>
+#include <components/esm4/loadtree.hpp>
+#include <components/esm4/loadtxst.hpp>
+#include <components/esm4/loadweap.hpp>
+#include <components/esm4/loadwrld.hpp>
+
+#endif

From dc3045c97014d6413813663191b927e3826caaea Mon Sep 17 00:00:00 2001
From: madsbuvi <madssandvei@zoho.com>
Date: Tue, 26 Apr 2022 19:54:24 +0200
Subject: [PATCH 2352/2859] mono-only version of the shader linking system
 introduced in the stereo MR

---
 apps/openmw_test_suite/CMakeLists.txt        |   1 +
 apps/openmw_test_suite/shader/parsefors.cpp  |   7 +
 apps/openmw_test_suite/shader/parselinks.cpp | 100 ++++++++
 components/shader/shadermanager.cpp          | 240 ++++++++++++++-----
 components/shader/shadermanager.hpp          |  16 +-
 files/shaders/CMakeLists.txt                 |   4 +
 files/shaders/debug_vertex.glsl              |   4 +-
 files/shaders/groundcover_vertex.glsl        |   5 +-
 files/shaders/nv_default_vertex.glsl         |   8 +-
 files/shaders/nv_nolighting_vertex.glsl      |   6 +-
 files/shaders/objects_vertex.glsl            |   8 +-
 files/shaders/openmw_fragment.glsl           |  26 ++
 files/shaders/openmw_fragment.h.glsl         |   8 +
 files/shaders/openmw_vertex.glsl             |  35 +++
 files/shaders/openmw_vertex.h.glsl           |   8 +
 files/shaders/sky_vertex.glsl                |   5 +-
 files/shaders/terrain_vertex.glsl            |   8 +-
 files/shaders/water_fragment.glsl            |  16 +-
 files/shaders/water_vertex.glsl              |   6 +-
 19 files changed, 412 insertions(+), 99 deletions(-)
 create mode 100644 apps/openmw_test_suite/shader/parselinks.cpp
 create mode 100644 files/shaders/openmw_fragment.glsl
 create mode 100644 files/shaders/openmw_fragment.h.glsl
 create mode 100644 files/shaders/openmw_vertex.glsl
 create mode 100644 files/shaders/openmw_vertex.h.glsl

diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index 74418a004b..7e42a49f66 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -55,6 +55,7 @@ if (GTEST_FOUND AND GMOCK_FOUND)
 
         shader/parsedefines.cpp
         shader/parsefors.cpp
+        shader/parselinks.cpp
         shader/shadermanager.cpp
 
         ../openmw/options.cpp
diff --git a/apps/openmw_test_suite/shader/parsefors.cpp b/apps/openmw_test_suite/shader/parsefors.cpp
index 330feb172d..4e64042365 100644
--- a/apps/openmw_test_suite/shader/parsefors.cpp
+++ b/apps/openmw_test_suite/shader/parsefors.cpp
@@ -2,6 +2,7 @@
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
+#include <vector>
 
 namespace
 {
@@ -16,6 +17,12 @@ namespace
         const std::string mName = "shader";
     };
 
+    static bool parseFors(std::string& source, const std::string& templateName)
+    {
+        std::vector<std::string> dummy;
+        return parseDirectives(source, dummy, {}, {}, templateName);
+    }
+
     TEST_F(ShaderParseForsTest, empty_should_succeed)
     {
         ASSERT_TRUE(parseFors(mSource, mName));
diff --git a/apps/openmw_test_suite/shader/parselinks.cpp b/apps/openmw_test_suite/shader/parselinks.cpp
new file mode 100644
index 0000000000..2e3697ba50
--- /dev/null
+++ b/apps/openmw_test_suite/shader/parselinks.cpp
@@ -0,0 +1,100 @@
+#include <components/shader/shadermanager.hpp>
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+#include <vector>
+
+namespace
+{
+    using namespace testing;
+    using namespace Shader;
+
+    using DefineMap = ShaderManager::DefineMap;
+
+    struct ShaderParseLinksTest : Test
+    {
+        std::string mSource;
+        std::vector<std::string> mLinkTargets;
+        ShaderManager::DefineMap mDefines;
+        const std::string mName = "my_shader.glsl";
+
+        bool parseLinks()
+        {
+            return parseDirectives(mSource, mLinkTargets, mDefines, {}, mName);
+        }
+    };
+
+    TEST_F(ShaderParseLinksTest, empty_should_succeed)
+    {
+        ASSERT_TRUE(parseLinks());
+        EXPECT_EQ(mSource, "");
+        EXPECT_TRUE(mLinkTargets.empty());
+    }
+
+    TEST_F(ShaderParseLinksTest, should_fail_for_single_escape_symbol)
+    {
+        mSource = "$";
+        ASSERT_FALSE(parseLinks());
+        EXPECT_EQ(mSource, "$");
+        EXPECT_TRUE(mLinkTargets.empty());
+    }
+
+    TEST_F(ShaderParseLinksTest, should_fail_on_first_found_escaped_not_valid_directive)
+    {
+        mSource = "$foo ";
+        ASSERT_FALSE(parseLinks());
+        EXPECT_EQ(mSource, "$foo ");
+        EXPECT_TRUE(mLinkTargets.empty());
+    }
+
+    TEST_F(ShaderParseLinksTest, should_fail_on_absent_link_target)
+    {
+        mSource = "$link ";
+        ASSERT_FALSE(parseLinks());
+        EXPECT_EQ(mSource, "$link ");
+        EXPECT_TRUE(mLinkTargets.empty());
+    }
+
+    TEST_F(ShaderParseLinksTest, should_not_require_newline)
+    {
+        mSource = "$link \"foo.glsl\"";
+        ASSERT_TRUE(parseLinks());
+        EXPECT_EQ(mSource, "");
+        ASSERT_EQ(mLinkTargets.size(), 1);
+        EXPECT_EQ(mLinkTargets[0], "foo.glsl");
+    }
+
+    TEST_F(ShaderParseLinksTest, should_require_quotes)
+    {
+        mSource = "$link foo.glsl";
+        ASSERT_FALSE(parseLinks());
+        EXPECT_EQ(mSource, "$link foo.glsl");
+        EXPECT_EQ(mLinkTargets.size(), 0);
+    }
+
+    TEST_F(ShaderParseLinksTest, should_be_replaced_with_empty_line)
+    {
+        mSource = "$link \"foo.glsl\"\nbar";
+        ASSERT_TRUE(parseLinks());
+        EXPECT_EQ(mSource, "\nbar");
+        ASSERT_EQ(mLinkTargets.size(), 1);
+        EXPECT_EQ(mLinkTargets[0], "foo.glsl");
+    }
+
+    TEST_F(ShaderParseLinksTest, should_only_accept_on_true_condition)
+    {
+        mSource = 
+R"glsl(
+$link "foo.glsl" if 1
+$link "bar.glsl" if 0
+)glsl";
+        ASSERT_TRUE(parseLinks());
+        EXPECT_EQ(mSource, 
+R"glsl(
+
+
+)glsl");
+        ASSERT_EQ(mLinkTargets.size(), 1);
+        EXPECT_EQ(mLinkTargets[0], "foo.glsl");
+    }
+}
diff --git a/components/shader/shadermanager.cpp b/components/shader/shadermanager.cpp
index 30c7ed1b1d..1341baad60 100644
--- a/components/shader/shadermanager.cpp
+++ b/components/shader/shadermanager.cpp
@@ -3,6 +3,7 @@
 #include <fstream>
 #include <algorithm>
 #include <sstream>
+#include <regex>
 
 #include <osg/Program>
 
@@ -142,11 +143,123 @@ namespace Shader
         return true;
     }
 
-    bool parseFors(std::string& source, const std::string& templateName)
+    bool parseForeachDirective(std::string& source, const std::string& templateName, size_t foundPos)
+    {
+        size_t iterNameStart = foundPos + strlen("$foreach") + 1;
+        size_t iterNameEnd = source.find_first_of(" \n\r()[].;,", iterNameStart);
+        if (iterNameEnd == std::string::npos)
+        {
+            Log(Debug::Error) << "Shader " << templateName << " error: Unexpected EOF";
+            return false;
+        }
+        std::string iteratorName = "$" + source.substr(iterNameStart, iterNameEnd - iterNameStart);
+
+        size_t listStart = iterNameEnd + 1;
+        size_t listEnd = source.find_first_of("\n\r", listStart);
+        if (listEnd == std::string::npos)
+        {
+            Log(Debug::Error) << "Shader " << templateName << " error: Unexpected EOF";
+            return false;
+        }
+        std::string list = source.substr(listStart, listEnd - listStart);
+        std::vector<std::string> listElements;
+        if (list != "")
+            Misc::StringUtils::split(list, listElements, ",");
+
+        size_t contentStart = source.find_first_not_of("\n\r", listEnd);
+        size_t contentEnd = source.find("$endforeach", contentStart);
+        if (contentEnd == std::string::npos)
+        {
+            Log(Debug::Error) << "Shader " << templateName << " error: Unexpected EOF";
+            return false;
+        }
+        std::string content = source.substr(contentStart, contentEnd - contentStart);
+
+        size_t overallEnd = contentEnd + std::string("$endforeach").length();
+
+        size_t lineDirectivePosition = source.rfind("#line", overallEnd);
+        int lineNumber;
+        if (lineDirectivePosition != std::string::npos)
+        {
+            size_t lineNumberStart = lineDirectivePosition + std::string("#line ").length();
+            size_t lineNumberEnd = source.find_first_not_of("0123456789", lineNumberStart);
+            std::string lineNumberString = source.substr(lineNumberStart, lineNumberEnd - lineNumberStart);
+            lineNumber = std::stoi(lineNumberString);
+        }
+        else
+        {
+            lineDirectivePosition = 0;
+            lineNumber = 2;
+        }
+        lineNumber += std::count(source.begin() + lineDirectivePosition, source.begin() + overallEnd, '\n');
+
+        std::string replacement = "";
+        for (std::vector<std::string>::const_iterator element = listElements.cbegin(); element != listElements.cend(); element++)
+        {
+            std::string contentInstance = content;
+            size_t foundIterator;
+            while ((foundIterator = contentInstance.find(iteratorName)) != std::string::npos)
+                contentInstance.replace(foundIterator, iteratorName.length(), *element);
+            replacement += contentInstance;
+        }
+        replacement += "\n#line " + std::to_string(lineNumber);
+        source.replace(foundPos, overallEnd - foundPos, replacement);
+        return true;
+    }
+
+    bool parseLinkDirective(std::string& source, std::string& linkTarget, const std::string& templateName, size_t foundPos)
+    {
+        size_t endPos = foundPos + 5;
+        size_t lineEnd = source.find_first_of('\n', endPos);
+        // If lineEnd = npos, this is the last line, so no need to check
+        std::string linkStatement = source.substr(endPos, lineEnd - endPos);
+        std::regex linkRegex(
+            R"r(\s*"([^"]+)"\s*)r" // Find any quoted string as the link name -> match[1]
+            R"r((if\s+)r" // Begin optional condition -> match[2]
+                R"r((!)?\s*)r" // Optional ! -> match[3]
+                R"r(([_a-zA-Z0-9]+)?)r" // The condition -> match[4]
+            R"r()?\s*)r" // End optional condition -> match[2]
+        );
+        std::smatch linkMatch;
+        bool hasCondition = false;
+        std::string linkConditionExpression;
+        if (std::regex_match(linkStatement, linkMatch, linkRegex))
+        {
+            linkTarget = linkMatch[1].str();
+            hasCondition = !linkMatch[2].str().empty();
+            linkConditionExpression = linkMatch[4].str();
+        }
+        else
+        {
+            Log(Debug::Error) << "Shader " << templateName << " error: Expected a shader filename to link";
+            return false;
+        }
+        if (linkTarget.empty())
+        {
+            Log(Debug::Error) << "Shader " << templateName << " error: Empty link name";
+            return false;
+        }
+
+        if (hasCondition)
+        {
+            bool condition = !(linkConditionExpression.empty() || linkConditionExpression == "0");
+            if (linkMatch[3].str() == "!")
+                condition = !condition;
+            
+            if (!condition)
+                linkTarget = "";
+        }
+
+        source.replace(foundPos, lineEnd - foundPos, "");
+        return true;
+    }
+
+    bool parseDirectives(std::string& source, std::vector<std::string>& linkedShaderTemplateNames, const ShaderManager::DefineMap& defines, const ShaderManager::DefineMap& globalDefines, const std::string& templateName)
     {
         const char escapeCharacter = '$';
         size_t foundPos = 0;
-        while ((foundPos = source.find(escapeCharacter)) != std::string::npos)
+
+        while ((foundPos = source.find(escapeCharacter, foundPos)) != std::string::npos)
         {
             size_t endPos = source.find_first_of(" \n\r()[].;,", foundPos);
             if (endPos == std::string::npos)
@@ -154,72 +267,25 @@ namespace Shader
                 Log(Debug::Error) << "Shader " << templateName << " error: Unexpected EOF";
                 return false;
             }
-            std::string command = source.substr(foundPos + 1, endPos - (foundPos + 1));
-            if (command != "foreach")
-            {
-                Log(Debug::Error) << "Shader " << templateName << " error: Unknown shader directive: $" << command;
-                return false;
-            }
-
-            size_t iterNameStart = endPos + 1;
-            size_t iterNameEnd = source.find_first_of(" \n\r()[].;,", iterNameStart);
-            if (iterNameEnd == std::string::npos)
-            {
-                Log(Debug::Error) << "Shader " << templateName << " error: Unexpected EOF";
-                return false;
-            }
-            std::string iteratorName = "$" + source.substr(iterNameStart, iterNameEnd - iterNameStart);
-
-            size_t listStart = iterNameEnd + 1;
-            size_t listEnd = source.find_first_of("\n\r", listStart);
-            if (listEnd == std::string::npos)
+            std::string directive = source.substr(foundPos + 1, endPos - (foundPos + 1));
+            if (directive == "foreach")
             {
-                Log(Debug::Error) << "Shader " << templateName << " error: Unexpected EOF";
-                return false;
+                if (!parseForeachDirective(source, templateName, foundPos))
+                    return false;
             }
-            std::string list = source.substr(listStart, listEnd - listStart);
-            std::vector<std::string> listElements;
-            if (list != "")
-                Misc::StringUtils::split (list, listElements, ",");
-
-            size_t contentStart = source.find_first_not_of("\n\r", listEnd);
-            size_t contentEnd = source.find("$endforeach", contentStart);
-            if (contentEnd == std::string::npos)
+            else if (directive == "link")
             {
-                Log(Debug::Error) << "Shader " << templateName << " error: Unexpected EOF";
-                return false;
-            }
-            std::string content = source.substr(contentStart, contentEnd - contentStart);
-
-            size_t overallEnd = contentEnd + std::string("$endforeach").length();
-
-            size_t lineDirectivePosition = source.rfind("#line", overallEnd);
-            int lineNumber;
-            if (lineDirectivePosition != std::string::npos)
-            {
-                size_t lineNumberStart = lineDirectivePosition + std::string("#line ").length();
-                size_t lineNumberEnd = source.find_first_not_of("0123456789", lineNumberStart);
-                std::string lineNumberString = source.substr(lineNumberStart, lineNumberEnd - lineNumberStart);
-                lineNumber = std::stoi(lineNumberString);
+                std::string linkTarget;
+                if (!parseLinkDirective(source, linkTarget, templateName, foundPos))
+                    return false;
+                if (!linkTarget.empty() && linkTarget != templateName)
+                    linkedShaderTemplateNames.push_back(linkTarget);
             }
             else
             {
-                lineDirectivePosition = 0;
-                lineNumber = 2;
-            }
-            lineNumber += std::count(source.begin() + lineDirectivePosition, source.begin() + overallEnd, '\n');
-
-            std::string replacement = "";
-            for (std::vector<std::string>::const_iterator element = listElements.cbegin(); element != listElements.cend(); element++)
-            {
-                std::string contentInstance = content;
-                size_t foundIterator;
-                while ((foundIterator = contentInstance.find(iteratorName)) != std::string::npos)
-                    contentInstance.replace(foundIterator, iteratorName.length(), *element);
-                replacement += contentInstance;
+                Log(Debug::Error) << "Shader " << templateName << " error: Unknown shader directive: $" << directive;
+                return false;
             }
-            replacement += "\n#line " + std::to_string(lineNumber);
-            source.replace(foundPos, overallEnd - foundPos, replacement);
         }
 
         return true;
@@ -265,6 +331,10 @@ namespace Shader
                 else
                     forIterators.pop_back();
             }
+            else if (define == "link")
+            {
+                source.replace(foundPos, 1, "$");
+            }
             else if (std::find(forIterators.begin(), forIterators.end(), define) != forIterators.end())
             {
                 source.replace(foundPos, 1, "$");
@@ -288,7 +358,7 @@ namespace Shader
 
     osg::ref_ptr<osg::Shader> ShaderManager::getShader(const std::string &templateName, const ShaderManager::DefineMap &defines, osg::Shader::Type shaderType)
     {
-        std::lock_guard<std::mutex> lock(mMutex);
+        std::unique_lock<std::mutex> lock(mMutex);
 
         // read the template if we haven't already
         TemplateMap::iterator templateIt = mShaderTemplates.find(templateName);
@@ -319,7 +389,8 @@ namespace Shader
         if (shaderIt == mShaders.end())
         {
             std::string shaderSource = templateIt->second;
-            if (!parseDefines(shaderSource, defines, mGlobalDefines, templateName) || !parseFors(shaderSource, templateName))
+            std::vector<std::string> linkedShaderNames;
+            if (!createSourceFromTemplate(shaderSource, linkedShaderNames, templateName, defines))
             {
                 // Add to the cache anyway to avoid logging the same error over and over.
                 mShaders.insert(std::make_pair(std::make_pair(templateName, defines), nullptr));
@@ -333,6 +404,10 @@ namespace Shader
             static unsigned int counter = 0;
             shader->setName(Misc::StringUtils::format("%u %s", counter++, templateName));
 
+            lock.unlock();
+            getLinkedShaders(shader, linkedShaderNames, defines);
+            lock.lock();
+
             shaderIt = mShaders.insert(std::make_pair(std::make_pair(templateName, defines), shader)).first;
         }
         return shaderIt->second;
@@ -348,6 +423,9 @@ namespace Shader
             osg::ref_ptr<osg::Program> program = programTemplate ? cloneProgram(programTemplate) : osg::ref_ptr<osg::Program>(new osg::Program);
             program->addShader(vertexShader);
             program->addShader(fragmentShader);
+            addLinkedShaders(vertexShader, program);
+            addLinkedShaders(fragmentShader, program);
+
             found = mPrograms.insert(std::make_pair(std::make_pair(vertexShader, fragmentShader), program)).first;
         }
         return found->second;
@@ -377,11 +455,14 @@ namespace Shader
                 // I'm not sure how to handle a shader that was already broken as there's no way to get a potential replacement to the nodes that need it.
                 continue;
             std::string shaderSource = mShaderTemplates[templateId];
-            if (!parseDefines(shaderSource, defines, mGlobalDefines, templateId) || !parseFors(shaderSource, templateId))
+            std::vector<std::string> linkedShaderNames;
+            if (!createSourceFromTemplate(shaderSource, linkedShaderNames, templateId, defines))
                 // We just broke the shader and there's no way to force existing objects back to fixed-function mode as we would when creating the shader.
                 // If we put a nullptr in the shader map, we just lose the ability to put a working one in later.
                 continue;
             shader->setShaderSource(shaderSource);
+
+            getLinkedShaders(shader, linkedShaderNames, defines);
         }
     }
 
@@ -397,4 +478,35 @@ namespace Shader
             program->releaseGLObjects(state);
     }
 
+    bool ShaderManager::createSourceFromTemplate(std::string& source, std::vector<std::string>& linkedShaderTemplateNames, const std::string& templateName, const ShaderManager::DefineMap& defines)
+    {
+        if (!parseDefines(source, defines, mGlobalDefines, templateName))
+            return false;
+        if (!parseDirectives(source, linkedShaderTemplateNames, defines, mGlobalDefines, templateName))
+            return false;
+        return true;
+    }
+
+    void ShaderManager::getLinkedShaders(osg::ref_ptr<osg::Shader> shader, const std::vector<std::string>& linkedShaderNames, const DefineMap& defines)
+    {
+        mLinkedShaders.erase(shader);
+        if (linkedShaderNames.empty())
+            return;
+
+        for (auto& linkedShaderName : linkedShaderNames)
+        {
+            auto linkedShader = getShader(linkedShaderName, defines, shader->getType());
+            if (linkedShader)
+                mLinkedShaders[shader].emplace_back(linkedShader);
+        }
+    }
+
+    void ShaderManager::addLinkedShaders(osg::ref_ptr<osg::Shader> shader, osg::ref_ptr<osg::Program> program)
+    {
+        auto linkedIt = mLinkedShaders.find(shader);
+        if (linkedIt != mLinkedShaders.end())
+            for (const auto& linkedShader : linkedIt->second)
+                program->addShader(linkedShader);
+    }
+
 }
diff --git a/components/shader/shadermanager.hpp b/components/shader/shadermanager.hpp
index 613f33b168..598dde85bb 100644
--- a/components/shader/shadermanager.hpp
+++ b/components/shader/shadermanager.hpp
@@ -4,6 +4,7 @@
 #include <string>
 #include <map>
 #include <mutex>
+#include <vector>
 
 #include <osg/ref_ptr>
 
@@ -51,7 +52,12 @@ namespace Shader
 
         void releaseGLObjects(osg::State* state);
 
+        bool createSourceFromTemplate(std::string& source, std::vector<std::string>& linkedShaderTemplateNames, const std::string& templateName, const ShaderManager::DefineMap& defines);
+
     private:
+        void getLinkedShaders(osg::ref_ptr<osg::Shader> shader, const std::vector<std::string>& linkedShaderNames, const DefineMap& defines);
+        void addLinkedShaders(osg::ref_ptr<osg::Shader> shader, osg::ref_ptr<osg::Program> program);
+
         std::string mPath;
 
         DefineMap mGlobalDefines;
@@ -67,15 +73,23 @@ namespace Shader
         typedef std::map<std::pair<osg::ref_ptr<osg::Shader>, osg::ref_ptr<osg::Shader> >, osg::ref_ptr<osg::Program> > ProgramMap;
         ProgramMap mPrograms;
 
+        typedef std::vector<osg::ref_ptr<osg::Shader> > ShaderList;
+        typedef std::map<osg::ref_ptr<osg::Shader>, ShaderList> LinkedShadersMap;
+        LinkedShadersMap mLinkedShaders;
+
         std::mutex mMutex;
 
         osg::ref_ptr<const osg::Program> mProgramTemplate;
     };
 
-    bool parseFors(std::string& source, const std::string& templateName);
+    bool parseForeachDirective(std::string& source, const std::string& templateName, size_t foundPos);
+    bool parseLinkDirective(std::string& source, std::string& linkTarget, const std::string& templateName, size_t foundPos);
 
     bool parseDefines(std::string& source, const ShaderManager::DefineMap& defines,
         const ShaderManager::DefineMap& globalDefines, const std::string& templateName);
+
+    bool parseDirectives(std::string& source, std::vector<std::string>& linkedShaderTemplateNames, const ShaderManager::DefineMap& defines,
+        const ShaderManager::DefineMap& globalDefines, const std::string& templateName);
 }
 
 #endif
diff --git a/files/shaders/CMakeLists.txt b/files/shaders/CMakeLists.txt
index 73929486cd..c873ada12f 100644
--- a/files/shaders/CMakeLists.txt
+++ b/files/shaders/CMakeLists.txt
@@ -16,6 +16,10 @@ set(SHADER_FILES
     depth.glsl
     objects_vertex.glsl
     objects_fragment.glsl
+    openmw_fragment.glsl
+    openmw_fragment.h.glsl
+    openmw_vertex.glsl
+    openmw_vertex.h.glsl
     terrain_vertex.glsl
     terrain_fragment.glsl
     lighting.glsl
diff --git a/files/shaders/debug_vertex.glsl b/files/shaders/debug_vertex.glsl
index a26d2573cf..094e866f9e 100644
--- a/files/shaders/debug_vertex.glsl
+++ b/files/shaders/debug_vertex.glsl
@@ -1,12 +1,12 @@
 #version 120
 
-uniform mat4 projectionMatrix;
+#include "openmw_vertex.glsl"
 
 centroid varying vec4 passColor;
 
 void main()
 {
-    gl_Position = projectionMatrix * (gl_ModelViewMatrix * gl_Vertex);
+    gl_Position = mw_modelToClip(gl_Vertex);
 
     passColor = gl_Color;
 }
diff --git a/files/shaders/groundcover_vertex.glsl b/files/shaders/groundcover_vertex.glsl
index c8db4be000..2914552139 100644
--- a/files/shaders/groundcover_vertex.glsl
+++ b/files/shaders/groundcover_vertex.glsl
@@ -1,5 +1,7 @@
 #version 120
 
+#include "openmw_vertex.h.glsl"
+
 #if @useUBO
     #extension GL_ARB_uniform_buffer_object : require
 #endif
@@ -46,7 +48,6 @@ uniform mat4 osg_ViewMatrixInverse;
 uniform mat4 osg_ViewMatrix;
 uniform float windSpeed;
 uniform vec3 playerPos;
-uniform mat4 projectionMatrix;
 
 #if @groundcoverStompMode == 0
 #else
@@ -143,7 +144,7 @@ void main(void)
     if (length(gl_ModelViewMatrix * vec4(position, 1.0)) > @groundcoverFadeEnd)
         gl_Position = vec4(0.0, 0.0, 0.0, 1.0);
     else
-        gl_Position = projectionMatrix * viewPos;
+        gl_Position = mw_viewToClip(mw_viewStereoAdjust(viewPos));
 
     linearDepth = getLinearDepth(gl_Position.z, viewPos.z);
 
diff --git a/files/shaders/nv_default_vertex.glsl b/files/shaders/nv_default_vertex.glsl
index 34d5415250..d27b9b2cbd 100644
--- a/files/shaders/nv_default_vertex.glsl
+++ b/files/shaders/nv_default_vertex.glsl
@@ -1,5 +1,7 @@
 #version 120
 
+#include "openmw_vertex.h.glsl"
+
 #if @useUBO
     #extension GL_ARB_uniform_buffer_object : require
 #endif
@@ -8,8 +10,6 @@
     #extension GL_EXT_gpu_shader4: require
 #endif
 
-uniform mat4 projectionMatrix;
-
 #if @diffuseMap
 varying vec2 diffuseMapUV;
 #endif
@@ -38,9 +38,9 @@ varying vec3 passNormal;
 
 void main(void)
 {
-    gl_Position = projectionMatrix * (gl_ModelViewMatrix * gl_Vertex);
+    gl_Position = mw_modelToClip(gl_Vertex);
 
-    vec4 viewPos = (gl_ModelViewMatrix * gl_Vertex);
+    vec4 viewPos = mw_modelToView(gl_Vertex);
     gl_ClipVertex = viewPos;
     euclideanDepth = length(viewPos.xyz);
     linearDepth = getLinearDepth(gl_Position.z, viewPos.z);
diff --git a/files/shaders/nv_nolighting_vertex.glsl b/files/shaders/nv_nolighting_vertex.glsl
index 617f0489a4..7b1f6961b4 100644
--- a/files/shaders/nv_nolighting_vertex.glsl
+++ b/files/shaders/nv_nolighting_vertex.glsl
@@ -1,6 +1,6 @@
 #version 120
 
-uniform mat4 projectionMatrix;
+#include "openmw_vertex.h.glsl"
 
 #if @diffuseMap
 varying vec2 diffuseMapUV;
@@ -23,9 +23,9 @@ varying float passFalloff;
 
 void main(void)
 {
-    gl_Position = projectionMatrix * (gl_ModelViewMatrix * gl_Vertex);
+    gl_Position = mw_modelToClip(gl_Vertex);
 
-    vec4 viewPos = (gl_ModelViewMatrix * gl_Vertex);
+    vec4 viewPos = mw_modelToView(gl_Vertex);
     gl_ClipVertex = viewPos;
 #if @radialFog
     euclideanDepth = length(viewPos.xyz);
diff --git a/files/shaders/objects_vertex.glsl b/files/shaders/objects_vertex.glsl
index 77c7fef391..df60d8ea49 100644
--- a/files/shaders/objects_vertex.glsl
+++ b/files/shaders/objects_vertex.glsl
@@ -1,5 +1,7 @@
 #version 120
 
+#include "openmw_vertex.h.glsl"
+
 #if @useUBO
     #extension GL_ARB_uniform_buffer_object : require
 #endif
@@ -8,8 +10,6 @@
     #extension GL_EXT_gpu_shader4: require
 #endif
 
-uniform mat4 projectionMatrix;
-
 #if @diffuseMap
 varying vec2 diffuseMapUV;
 #endif
@@ -72,9 +72,9 @@ varying vec3 passNormal;
 
 void main(void)
 {
-    gl_Position = projectionMatrix * (gl_ModelViewMatrix * gl_Vertex);
+    gl_Position = mw_modelToClip(gl_Vertex);
 
-    vec4 viewPos = (gl_ModelViewMatrix * gl_Vertex);
+    vec4 viewPos = mw_modelToView(gl_Vertex);
 
     gl_ClipVertex = viewPos;
     euclideanDepth = length(viewPos.xyz);
diff --git a/files/shaders/openmw_fragment.glsl b/files/shaders/openmw_fragment.glsl
new file mode 100644
index 0000000000..9de9e7afff
--- /dev/null
+++ b/files/shaders/openmw_fragment.glsl
@@ -0,0 +1,26 @@
+#version 120
+
+#include "openmw_fragment.h.glsl"
+
+uniform sampler2D reflectionMap;
+
+vec4 mw_sampleReflectionMap(vec2 uv)
+{
+    return texture2D(reflectionMap, uv);
+}
+
+#if @refraction_enabled
+uniform sampler2D refractionMap;
+uniform sampler2D refractionDepthMap;
+
+vec4 mw_sampleRefractionMap(vec2 uv)
+{
+    return texture2D(refractionMap, uv);
+}
+
+float mw_sampleRefractionDepthMap(vec2 uv)
+{
+    return texture2D(refractionDepthMap, uv).x;
+}
+
+#endif
\ No newline at end of file
diff --git a/files/shaders/openmw_fragment.h.glsl b/files/shaders/openmw_fragment.h.glsl
new file mode 100644
index 0000000000..c5bcf21c9d
--- /dev/null
+++ b/files/shaders/openmw_fragment.h.glsl
@@ -0,0 +1,8 @@
+@link "openmw_fragment.glsl"
+
+vec4 mw_sampleReflectionMap(vec2 uv);
+
+#if @refraction_enabled
+vec4 mw_sampleRefractionMap(vec2 uv);
+float mw_sampleRefractionDepthMap(vec2 uv);
+#endif
\ No newline at end of file
diff --git a/files/shaders/openmw_vertex.glsl b/files/shaders/openmw_vertex.glsl
new file mode 100644
index 0000000000..cc14f3a0e3
--- /dev/null
+++ b/files/shaders/openmw_vertex.glsl
@@ -0,0 +1,35 @@
+#version 120
+
+#include "openmw_vertex.h.glsl"
+
+uniform mat4 projectionMatrix;
+
+vec4 mw_modelToClip(vec4 pos)
+{
+    return projectionMatrix * mw_modelToView(pos);
+}
+
+vec4 mw_modelToView(vec4 pos)
+{
+    return gl_ModelViewMatrix * pos;
+}
+
+vec4 mw_viewToClip(vec4 pos)
+{
+    return projectionMatrix * pos;
+}
+
+vec4 mw_viewStereoAdjust(vec4 pos)
+{
+    return pos;
+}
+
+mat4 mw_viewMatrix()
+{
+    return gl_ModelViewMatrix;
+}
+
+mat4 mw_projectionMatrix()
+{
+    return projectionMatrix;
+}
diff --git a/files/shaders/openmw_vertex.h.glsl b/files/shaders/openmw_vertex.h.glsl
new file mode 100644
index 0000000000..00feb9310e
--- /dev/null
+++ b/files/shaders/openmw_vertex.h.glsl
@@ -0,0 +1,8 @@
+@link "openmw_vertex.glsl"
+
+vec4 mw_modelToClip(vec4 pos);
+vec4 mw_modelToView(vec4 pos);
+vec4 mw_viewToClip(vec4 pos);
+vec4 mw_viewStereoAdjust(vec4 pos);
+mat4 mw_viewMatrix();
+mat4 mw_projectionMatrix();
\ No newline at end of file
diff --git a/files/shaders/sky_vertex.glsl b/files/shaders/sky_vertex.glsl
index 9c676140ac..8ff9c0f156 100644
--- a/files/shaders/sky_vertex.glsl
+++ b/files/shaders/sky_vertex.glsl
@@ -1,8 +1,9 @@
 #version 120
 
+#include "openmw_vertex.h.glsl"
+
 #include "skypasses.glsl"
 
-uniform mat4 projectionMatrix;
 uniform int pass;
 
 varying vec4 passColor;
@@ -10,7 +11,7 @@ varying vec2 diffuseMapUV;
 
 void main()
 {
-    gl_Position = projectionMatrix * (gl_ModelViewMatrix * gl_Vertex);
+    gl_Position = mw_modelToClip(gl_Vertex);
     passColor = gl_Color;
 
     if (pass == PASS_CLOUDS)
diff --git a/files/shaders/terrain_vertex.glsl b/files/shaders/terrain_vertex.glsl
index b46b299e2b..7f248d5a6b 100644
--- a/files/shaders/terrain_vertex.glsl
+++ b/files/shaders/terrain_vertex.glsl
@@ -1,5 +1,7 @@
 #version 120
 
+#include "openmw_vertex.h.glsl"
+
 #if @useUBO
     #extension GL_ARB_uniform_buffer_object : require
 #endif
@@ -8,8 +10,6 @@
     #extension GL_EXT_gpu_shader4: require
 #endif
 
-uniform mat4 projectionMatrix;
-
 varying vec2 uv;
 varying float euclideanDepth;
 varying float linearDepth;
@@ -31,9 +31,9 @@ varying vec3 passNormal;
 
 void main(void)
 {
-    gl_Position = projectionMatrix * (gl_ModelViewMatrix * gl_Vertex);
+    gl_Position = mw_modelToClip(gl_Vertex);
 
-    vec4 viewPos = (gl_ModelViewMatrix * gl_Vertex);
+    vec4 viewPos = mw_modelToView(gl_Vertex);
     gl_ClipVertex = viewPos;
     euclideanDepth = length(viewPos.xyz);
     linearDepth = getLinearDepth(gl_Position.z, viewPos.z);
diff --git a/files/shaders/water_fragment.glsl b/files/shaders/water_fragment.glsl
index eaf52c1189..1090531f23 100644
--- a/files/shaders/water_fragment.glsl
+++ b/files/shaders/water_fragment.glsl
@@ -1,5 +1,7 @@
 #version 120
 
+#include "openmw_fragment.h.glsl"
+
 #if @useUBO
     #extension GL_ARB_uniform_buffer_object : require
 #endif
@@ -207,12 +209,6 @@ varying float linearDepth;
 
 uniform sampler2D normalMap;
 
-uniform sampler2D reflectionMap;
-#if REFRACTION
-uniform sampler2D refractionMap;
-uniform sampler2D refractionDepthMap;
-#endif
-
 uniform float osg_SimulationTime;
 
 uniform float near;
@@ -299,14 +295,14 @@ void main(void)
 
     vec2 screenCoordsOffset = normal.xy * REFL_BUMP;
 #if REFRACTION
-    float depthSample = linearizeDepth(texture2D(refractionDepthMap,screenCoords).x) * radialise;
-    float depthSampleDistorted = linearizeDepth(texture2D(refractionDepthMap,screenCoords-screenCoordsOffset).x) * radialise;
+    float depthSample = linearizeDepth(mw_sampleRefractionDepthMap(screenCoords)) * radialise;
+    float depthSampleDistorted = linearizeDepth(mw_sampleRefractionDepthMap(screenCoords-screenCoordsOffset)) * radialise;
     float surfaceDepth = linearizeDepth(gl_FragCoord.z) * radialise;
     float realWaterDepth = depthSample - surfaceDepth;  // undistorted water depth in view direction, independent of frustum
     screenCoordsOffset *= clamp(realWaterDepth / BUMP_SUPPRESS_DEPTH,0,1);
 #endif
     // reflection
-    vec3 reflection = texture2D(reflectionMap, screenCoords + screenCoordsOffset).rgb;
+    vec3 reflection = mw_sampleReflectionMap(screenCoords + screenCoordsOffset).rgb;
 
     // specular
     float specular = pow(max(dot(reflect(vVec, normal), lVec), 0.0),SPEC_HARDNESS) * shadow;
@@ -324,7 +320,7 @@ void main(void)
     rainSpecular *= clamp(fresnel*6.0 + specular * sunSpec.w, 0.0, 1.0);
 
     // refraction
-    vec3 refraction = texture2D(refractionMap, screenCoords - screenCoordsOffset).rgb;
+    vec3 refraction = mw_sampleRefractionMap(screenCoords - screenCoordsOffset).rgb;
     vec3 rawRefraction = refraction;
 
     // brighten up the refraction underwater
diff --git a/files/shaders/water_vertex.glsl b/files/shaders/water_vertex.glsl
index 3a6c352ac8..b09d3b54ae 100644
--- a/files/shaders/water_vertex.glsl
+++ b/files/shaders/water_vertex.glsl
@@ -1,6 +1,6 @@
 #version 120
 
-uniform mat4 projectionMatrix;
+#include "openmw_vertex.h.glsl"
 
 varying vec4  position;
 varying float linearDepth;
@@ -10,11 +10,11 @@ varying float linearDepth;
 
 void main(void)
 {
-    gl_Position = projectionMatrix * (gl_ModelViewMatrix * gl_Vertex);
+    gl_Position = mw_modelToClip(gl_Vertex);
 
     position = gl_Vertex;
 
-    vec4 viewPos = gl_ModelViewMatrix * gl_Vertex;
+    vec4 viewPos = mw_modelToView(gl_Vertex);
     linearDepth = getLinearDepth(gl_Position.z, viewPos.z);
 
     setupShadowCoords(viewPos, normalize((gl_NormalMatrix * gl_Normal).xyz));

From 1fd4ac91689b8a480b582d57e806ce546993652c Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sat, 23 Apr 2022 23:14:02 +0200
Subject: [PATCH 2353/2859] [Lua] Update openmw_aux.util

---
 files/builtin_scripts/openmw_aux/util.lua | 117 ++++++++++++++++------
 1 file changed, 86 insertions(+), 31 deletions(-)

diff --git a/files/builtin_scripts/openmw_aux/util.lua b/files/builtin_scripts/openmw_aux/util.lua
index 4832517418..b360383066 100644
--- a/files/builtin_scripts/openmw_aux/util.lua
+++ b/files/builtin_scripts/openmw_aux/util.lua
@@ -6,52 +6,107 @@
 
 local aux_util = {}
 
----
--- Works like `tostring` but shows also content of tables.
--- @function [parent=#util] deepToString
--- @param #any value The value to conver to string
--- @param #number maxDepth Max depth of tables unpacking (optional, 2 by default)
-function aux_util.deepToString(val, level, prefix)
-    level = (level or 1) - 1
+local function deepToString(val, level, prefix)
+    local level = (level or 1) - 1
     local ok, iter, t = pcall(function() return pairs(val) end)
     if level < 0 or not ok then
         return tostring(val)
     end
-    local prefix = prefix or ''
     local newPrefix = prefix .. '  '
     local strs = {tostring(val) .. ' {\n'}
     for k, v in iter, t do
-        strs[#strs + 1] = newPrefix .. tostring(k) .. ' = ' .. aux_util.deepToString(v, level, newPrefix) .. ',\n'
+        strs[#strs + 1] = newPrefix .. tostring(k) .. ' = ' .. deepToString(v, level, newPrefix) .. ',\n'
     end
     strs[#strs + 1] = prefix .. '}'
     return table.concat(strs)
 end
 
--------------------------------------------------------------------------------
--- Finds the nearest object to the given point in the given list.
--- Ignores cells, uses only coordinates. Returns the nearest object,
--- and the distance to it. If objectList is empty, returns nil.
--- @function [parent=#util] findNearestTo
--- @param openmw.util#Vector3 point
--- @param openmw.core#ObjectList objectList
--- @param #number minDist (optional) ignore objects that are closer than minDist
--- @param #number maxDist (optional) ignore objects that are farther than maxDist
--- @return openmw.core#GameObject, #number the nearest object and the distance
-function aux_util.findNearestTo(point, objectList, minDist, maxDist)
-    local res = nil
-    local resDist = nil
-    local minDist = minDist or 0
-    for i = 1, #objectList do
-        local obj = objectList[i]
-        local dist = (obj.position - point):length()
-        if dist >= minDist and (not res or dist < resDist) then
-            res = obj
-            resDist = dist
+---
+-- Works like `tostring` but shows also content of tables.
+-- @function [parent=#util] deepToString
+-- @param #any value The value to convert to string
+-- @param #number maxDepth Max depth of tables unpacking (optional, 1 by default)
+function aux_util.deepToString(value, maxDepth)
+    return deepToString(value, maxDepth, '')
+end
+
+---
+-- Finds the element the minimizes `scoreFn`.
+-- @function [parent=#util] findMinScore
+-- @param #table array Any array
+-- @param #function scoreFn Function that returns either nil/false or a number for each element of the array
+-- @return element The element the minimizes `scoreFn`
+-- @return #number score The output of `scoreFn(element)`
+-- @return #number index The index of the chosen element in the array
+-- @usage -- Find the nearest NPC
+-- local nearestNPC, distToNPC = aux_util.findMinScore(
+--     nearby.actors,
+--     function(actor)
+--         return actor.type == types.NPC and (self.position - actor.position):length()
+--     end)
+function aux_util.findMinScore(array, scoreFn)
+    local bestValue, bestScore, bestIndex
+    for i = 1, #array do
+        local v = array[i]
+        local score = scoreFn(v)
+        if score and (not bestScore or bestScore > score) then
+            bestValue, bestScore, bestIndex = v, score, i
         end
     end
-    if res and (not maxDist or resDist <= maxDist) then
-        return res, resDist
+    return bestValue, bestScore, bestIndex
+end
+
+---
+-- Computes `scoreFn` for each element of `array` and filters out elements with false and nil results.
+-- @function [parent=#util] mapFilter
+-- @param #table array Any array
+-- @param #function scoreFn Filter function
+-- @return #table Output array
+-- @return #table Array of the same size with corresponding scores
+-- @usage -- Find all NPCs in `nearby.actors`
+-- local NPCs = aux_util.mapFilter(
+--     nearby.actors,
+--     function(actor) return actor.type == types.NPC end)
+function aux_util.mapFilter(array, scoreFn)
+    local res = {}
+    local scores = {}
+    for i = 1, #array do
+        local v = array[i]
+        local f = scoreFn(v)
+        if f then
+            scores[#res + 1] = f
+            res[#res + 1] = v
+        end
+    end
+    return res, scores
+end
+
+---
+-- Filters and sorts `array` by the scores calculated by `scoreFn`. The same as `aux_util.mapFilter`, but the result is sorted.
+-- @function [parent=#util] mapFilterSort
+-- @param #table array Any array
+-- @param #function scoreFn Filter function
+-- @return #table Output array
+-- @return #table Array of the same size with corresponding scores
+-- @usage -- Find all NPCs in `nearby.actors` and sort them by distances
+-- local NPCs, distances = aux_util.mapFilterSort(
+--     nearby.actors,
+--     function(actor)
+--         return actor.type == types.NPC and (self.position - actor.position):length()
+--     end)
+function aux_util.mapFilterSort(array, scoreFn)
+    local values, scores = aux_util.mapFilter(array, scoreFn)
+    local size = #values
+    local ids = {}
+    for i = 1, size do ids[i] = i end
+    table.sort(ids, function(i, j) return scores[i] < scores[j] end)
+    local sortedValues = {}
+    local sortedScores = {}
+    for i = 1, size do
+        sortedValues[i] = values[ids[i]]
+        sortedScores[i] = scores[ids[i]]
     end
+    return sortedValues, sortedScores
 end
 
 return aux_util

From 164458dc568c1bedab0dea8b4039ad7b3bc1970e Mon Sep 17 00:00:00 2001
From: madsbuvi <madssandvei@zoho.com>
Date: Wed, 27 Apr 2022 17:37:07 +0200
Subject: [PATCH 2354/2859] shader fixes

---
 files/shaders/debug_vertex.glsl       | 2 +-
 files/shaders/groundcover_vertex.glsl | 4 ++--
 files/shaders/nv_default_vertex.glsl  | 4 ++--
 files/shaders/objects_vertex.glsl     | 4 ++--
 files/shaders/terrain_vertex.glsl     | 4 ++--
 files/shaders/water_fragment.glsl     | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/files/shaders/debug_vertex.glsl b/files/shaders/debug_vertex.glsl
index 094e866f9e..fd41a6ff48 100644
--- a/files/shaders/debug_vertex.glsl
+++ b/files/shaders/debug_vertex.glsl
@@ -1,6 +1,6 @@
 #version 120
 
-#include "openmw_vertex.glsl"
+#include "openmw_vertex.h.glsl"
 
 centroid varying vec4 passColor;
 
diff --git a/files/shaders/groundcover_vertex.glsl b/files/shaders/groundcover_vertex.glsl
index 2914552139..e707954e81 100644
--- a/files/shaders/groundcover_vertex.glsl
+++ b/files/shaders/groundcover_vertex.glsl
@@ -1,7 +1,5 @@
 #version 120
 
-#include "openmw_vertex.h.glsl"
-
 #if @useUBO
     #extension GL_ARB_uniform_buffer_object : require
 #endif
@@ -10,6 +8,8 @@
     #extension GL_EXT_gpu_shader4: require
 #endif
 
+#include "openmw_vertex.h.glsl"
+
 #define GROUNDCOVER
 
 attribute vec4 aOffset;
diff --git a/files/shaders/nv_default_vertex.glsl b/files/shaders/nv_default_vertex.glsl
index d27b9b2cbd..c0d28f3e34 100644
--- a/files/shaders/nv_default_vertex.glsl
+++ b/files/shaders/nv_default_vertex.glsl
@@ -1,7 +1,5 @@
 #version 120
 
-#include "openmw_vertex.h.glsl"
-
 #if @useUBO
     #extension GL_ARB_uniform_buffer_object : require
 #endif
@@ -10,6 +8,8 @@
     #extension GL_EXT_gpu_shader4: require
 #endif
 
+#include "openmw_vertex.h.glsl"
+
 #if @diffuseMap
 varying vec2 diffuseMapUV;
 #endif
diff --git a/files/shaders/objects_vertex.glsl b/files/shaders/objects_vertex.glsl
index df60d8ea49..e8976692a2 100644
--- a/files/shaders/objects_vertex.glsl
+++ b/files/shaders/objects_vertex.glsl
@@ -1,7 +1,5 @@
 #version 120
 
-#include "openmw_vertex.h.glsl"
-
 #if @useUBO
     #extension GL_ARB_uniform_buffer_object : require
 #endif
@@ -10,6 +8,8 @@
     #extension GL_EXT_gpu_shader4: require
 #endif
 
+#include "openmw_vertex.h.glsl"
+
 #if @diffuseMap
 varying vec2 diffuseMapUV;
 #endif
diff --git a/files/shaders/terrain_vertex.glsl b/files/shaders/terrain_vertex.glsl
index 7f248d5a6b..5519001219 100644
--- a/files/shaders/terrain_vertex.glsl
+++ b/files/shaders/terrain_vertex.glsl
@@ -1,7 +1,5 @@
 #version 120
 
-#include "openmw_vertex.h.glsl"
-
 #if @useUBO
     #extension GL_ARB_uniform_buffer_object : require
 #endif
@@ -10,6 +8,8 @@
     #extension GL_EXT_gpu_shader4: require
 #endif
 
+#include "openmw_vertex.h.glsl"
+
 varying vec2 uv;
 varying float euclideanDepth;
 varying float linearDepth;
diff --git a/files/shaders/water_fragment.glsl b/files/shaders/water_fragment.glsl
index 1090531f23..bf35ca78ca 100644
--- a/files/shaders/water_fragment.glsl
+++ b/files/shaders/water_fragment.glsl
@@ -1,7 +1,5 @@
 #version 120
 
-#include "openmw_fragment.h.glsl"
-
 #if @useUBO
     #extension GL_ARB_uniform_buffer_object : require
 #endif
@@ -10,6 +8,8 @@
     #extension GL_EXT_gpu_shader4: require
 #endif
 
+#include "openmw_fragment.h.glsl"
+
 #define REFRACTION @refraction_enabled
 #define RAIN_RIPPLE_DETAIL @rain_ripple_detail
 

From ad1ab1c8803f64834b9e9521d624f65358b7f8ba Mon Sep 17 00:00:00 2001
From: Frederic Chardon <chardon.frederic@gmail.com>
Date: Wed, 27 Apr 2022 19:51:54 +0000
Subject: [PATCH 2355/2859] Follow up to !192

---
 apps/launcher/datafilespage.cpp | 12 ++++++----
 files/ui/datafilespage.ui       | 40 ++++++++++++++++-----------------
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index 9268c8e142..fe6d96b51a 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -44,10 +44,10 @@ namespace
         QDir currentDir(path);
         if (!currentDir.entryInfoList(fileFilter, QDir::Files).empty()
                 || !currentDir.entryInfoList(dirFilter, QDir::Dirs | QDir::NoDotAndDotDot).empty())
-            dirs.push_back(currentDir.absolutePath());
+            dirs.push_back(currentDir.canonicalPath());
 
         for (const auto& subdir : currentDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot))
-            contentSubdirs(subdir.absoluteFilePath(), dirs);
+            contentSubdirs(subdir.canonicalFilePath(), dirs);
     }
 }
 
@@ -236,6 +236,10 @@ void Launcher::DataFilesPage::populateFileViews(const QString& contentModelName)
     if (!globalDataDir.isEmpty())
         directories.insert(0, globalDataDir);
 
+    // normalize user supplied directories: resolve symlink, convert to native separator, make absolute
+    for (auto& currentDir : directories)
+        currentDir = QDir(QDir::cleanPath(currentDir)).canonicalPath();
+
     // add directories, archives and content files
     directories.removeDuplicates();
     for (const auto& currentDir : directories)
@@ -361,7 +365,7 @@ QStringList Launcher::DataFilesPage::selectedDirectoriesPaths() const
    QStringList dirList;
    for (int i = 0; i < ui.directoryListWidget->count(); ++i)
    {
-       if (ui.directoryListWidget->item(i)->background() != Qt::gray)
+       if (ui.directoryListWidget->item(i)->flags() & Qt::ItemIsEnabled)
            dirList.append(ui.directoryListWidget->item(i)->text());
    }
    return dirList;
@@ -581,7 +585,7 @@ QString Launcher::DataFilesPage::selectDirectory()
     if (fileDialog.exec() == QDialog::Rejected)
         return {};
 
-    return fileDialog.selectedFiles()[0];
+    return QDir(fileDialog.selectedFiles()[0]).canonicalPath();
 
 }
 
diff --git a/files/ui/datafilespage.ui b/files/ui/datafilespage.ui
index dfcf02fced..813d0109ee 100644
--- a/files/ui/datafilespage.ui
+++ b/files/ui/datafilespage.ui
@@ -17,8 +17,25 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>2</number>
+      <number>0</number>
      </property>
+     <widget class="QWidget" name="dataTab">
+      <attribute name="title">
+       <string>Content Files</string>
+      </attribute>
+      <layout class="QGridLayout" name="dataTabLayout">
+       <item row="0" column="0">
+        <widget class="QWidget" name="contentSelectorWidget" native="true"/>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="label_3">
+         <property name="text">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;note: content files that are not part of current Content List are &lt;/span&gt;&lt;span style=&quot; font-style:italic; background-color:#00ff00;&quot;&gt;highlighted&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
      <widget class="QWidget" name="dirTab">
       <attribute name="title">
        <string>Data Directories</string>
@@ -137,23 +154,6 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="dataTab">
-      <attribute name="title">
-       <string>Content Files</string>
-      </attribute>
-      <layout class="QGridLayout" name="dataTabLayout">
-       <item row="0" column="0">
-        <widget class="QWidget" name="contentSelectorWidget" native="true"/>
-       </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="label_3">
-         <property name="text">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;note: content files that are not part of current Content List are &lt;/span&gt;&lt;span style=&quot; font-style:italic; background-color:#00ff00;&quot;&gt;highlighted&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
      <widget class="QWidget" name="tab_2">
       <attribute name="title">
        <string>Navigation mesh cache</string>
@@ -212,7 +212,7 @@
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_2">
          <item>
-          <widget class="QLabel" name="label">
+          <widget class="QLabel" name="label_4">
            <property name="text">
             <string>Max size</string>
            </property>
@@ -261,7 +261,7 @@
      <property name="flat">
       <bool>false</bool>
      </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <layout class="QHBoxLayout" name="horizontalLayout_3">
       <property name="spacing">
        <number>6</number>
       </property>

From c7ab67c2c1ff9193b72e3694e81fdb7b827a9462 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Tue, 26 Apr 2022 22:36:03 +0200
Subject: [PATCH 2356/2859] Allow relative paths in openmw.cfg; support
 --replace=config.

---
 apps/bulletobjecttool/main.cpp                |   2 +-
 apps/navmeshtool/main.cpp                     |   2 +-
 apps/opencs/editor.cpp                        |   8 +-
 apps/openmw/main.cpp                          |   4 +-
 apps/openmw/options.cpp                       |   4 +-
 apps/openmw_test_suite/mwworld/test_store.cpp |   8 +-
 components/config/gamesettings.cpp            |   4 +-
 components/files/configurationmanager.cpp     | 185 ++++++++++--------
 components/files/configurationmanager.hpp     |  30 +--
 9 files changed, 130 insertions(+), 117 deletions(-)

diff --git a/apps/bulletobjecttool/main.cpp b/apps/bulletobjecttool/main.cpp
index c80883fe78..36ec8df9ed 100644
--- a/apps/bulletobjecttool/main.cpp
+++ b/apps/bulletobjecttool/main.cpp
@@ -141,7 +141,7 @@ namespace
         if (!local.empty())
             dataDirs.push_back(std::move(local));
 
-        config.processPaths(dataDirs);
+        config.filterOutNonExistingPaths(dataDirs);
 
         const auto fsStrict = variables["fs-strict"].as<bool>();
         const auto resDir = variables["resources"].as<Files::MaybeQuotedPath>();
diff --git a/apps/navmeshtool/main.cpp b/apps/navmeshtool/main.cpp
index 643c14af0a..e024a35530 100644
--- a/apps/navmeshtool/main.cpp
+++ b/apps/navmeshtool/main.cpp
@@ -133,7 +133,7 @@ namespace NavMeshTool
             if (!local.empty())
                 dataDirs.push_back(std::move(local));
 
-            config.processPaths(dataDirs);
+            config.filterOutNonExistingPaths(dataDirs);
 
             const auto fsStrict = variables["fs-strict"].as<bool>();
             const auto resDir = variables["resources"].as<Files::MaybeQuotedPath>();
diff --git a/apps/opencs/editor.cpp b/apps/opencs/editor.cpp
index 40defda4e2..d8672cd84b 100644
--- a/apps/opencs/editor.cpp
+++ b/apps/opencs/editor.cpp
@@ -137,10 +137,12 @@ std::pair<Files::PathContainer, std::vector<std::string> > CS::Editor::readConfi
 
     Files::PathContainer::value_type local(variables["data-local"].as<Files::MaybeQuotedPathContainer::value_type>());
     if (!local.empty())
+    {
+        boost::filesystem::create_directories(local);
         dataLocal.push_back(local);
-
-    mCfgMgr.processPaths (dataDirs);
-    mCfgMgr.processPaths (dataLocal, true);
+    }
+    mCfgMgr.filterOutNonExistingPaths(dataDirs);
+    mCfgMgr.filterOutNonExistingPaths(dataLocal);
 
     if (!dataLocal.empty())
         mLocal = dataLocal[0];
diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index 1dfa2a6494..a0967ec14b 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -37,8 +37,6 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     typedef std::vector<std::string> StringsVector;
 
     bpo::options_description desc = OpenMW::makeOptionsDescription();
-    Files::ConfigurationManager::addCommonOptions(desc);
-
     bpo::variables_map variables;
 
     Files::parseArgs(argc, argv, variables, desc);
@@ -82,7 +80,7 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     if (!local.empty())
         dataDirs.push_back(local);
 
-    cfgMgr.processPaths(dataDirs);
+    cfgMgr.filterOutNonExistingPaths(dataDirs);
 
     engine.setResourceDir(variables["resources"].as<Files::MaybeQuotedPath>());
     engine.setDataDirs(dataDirs);
diff --git a/apps/openmw/options.cpp b/apps/openmw/options.cpp
index dbf910b70f..f557e42282 100644
--- a/apps/openmw/options.cpp
+++ b/apps/openmw/options.cpp
@@ -16,14 +16,12 @@ namespace OpenMW
     bpo::options_description makeOptionsDescription()
     {
         bpo::options_description desc("Syntax: openmw <options>\nAllowed options");
+        Files::ConfigurationManager::addCommonOptions(desc);
 
         desc.add_options()
             ("help", "print help message")
             ("version", "print version information and quit")
 
-            ("replace", bpo::value<StringsVector>()->default_value(StringsVector(), "")
-                ->multitoken()->composing(), "settings where the values from the current source should replace those from lower-priority sources instead of being appended")
-
             ("data", bpo::value<Files::MaybeQuotedPathContainer>()->default_value(Files::MaybeQuotedPathContainer(), "data")
                 ->multitoken()->composing(), "set data directories (later directories have higher priority)")
 
diff --git a/apps/openmw_test_suite/mwworld/test_store.cpp b/apps/openmw_test_suite/mwworld/test_store.cpp
index c15e238c9b..ab1fdd4995 100644
--- a/apps/openmw_test_suite/mwworld/test_store.cpp
+++ b/apps/openmw_test_suite/mwworld/test_store.cpp
@@ -71,12 +71,14 @@ struct ContentFileTest : public ::testing::Test
         }
 
         Files::PathContainer::value_type local(variables["data-local"].as<Files::MaybeQuotedPathContainer::value_type>());
-        if (!local.empty()) {
+        if (!local.empty())
+        {
+            boost::filesystem::create_directories(local);
             dataLocal.push_back(local);
         }
 
-        mConfigurationManager.processPaths (dataDirs);
-        mConfigurationManager.processPaths (dataLocal, true);
+        mConfigurationManager.filterOutNonExistingPaths(dataDirs);
+        mConfigurationManager.filterOutNonExistingPaths(dataLocal);
 
         if (!dataLocal.empty())
             dataDirs.insert (dataDirs.end(), dataLocal.begin(), dataLocal.end());
diff --git a/components/config/gamesettings.cpp b/components/config/gamesettings.cpp
index 6253d53f45..0ec13abe36 100644
--- a/components/config/gamesettings.cpp
+++ b/components/config/gamesettings.cpp
@@ -28,7 +28,7 @@ void Config::GameSettings::validatePaths()
     }
 
     // Parse the data dirs to convert the tokenized paths
-    mCfgMgr.processPaths(dataDirs);
+    mCfgMgr.processPaths(dataDirs, /*basePath=*/"");
     mDataDirs.clear();
 
     for (auto & dataDir : dataDirs) {
@@ -54,7 +54,7 @@ void Config::GameSettings::validatePaths()
     QByteArray bytes = local.toUtf8();
     dataDirs.push_back(Files::PathContainer::value_type(std::string(bytes.constData(), bytes.length())));
 
-    mCfgMgr.processPaths(dataDirs);
+    mCfgMgr.processPaths(dataDirs, /*basePath=*/"");
 
     if (!dataDirs.empty()) {
         QString path = QString::fromUtf8(dataDirs.front().string().c_str());
diff --git a/components/files/configurationmanager.cpp b/components/files/configurationmanager.cpp
index 80426586fe..74fe03b3e2 100644
--- a/components/files/configurationmanager.cpp
+++ b/components/files/configurationmanager.cpp
@@ -11,6 +11,8 @@
 namespace Files
 {
 
+namespace bpo = boost::program_options;
+
 static const char* const openmwCfgFile = "openmw.cfg";
 
 #if defined(_WIN32) || defined(__WINDOWS__)
@@ -31,7 +33,6 @@ ConfigurationManager::ConfigurationManager(bool silent)
     setupTokensMapping();
 
     // Initialize with fixed paths, will be overridden in `readConfiguration`.
-    mLogPath = mFixedPath.getUserConfigPath();
     mUserDataPath = mFixedPath.getUserDataPath();
     mScreenshotPath = mFixedPath.getUserDataPath() / "screenshots";
 }
@@ -48,14 +49,25 @@ void ConfigurationManager::setupTokensMapping()
     mTokensMapping.insert(std::make_pair(globalToken, &FixedPath<>::getGlobalDataPath));
 }
 
-void ConfigurationManager::readConfiguration(boost::program_options::variables_map& variables,
-    boost::program_options::options_description& description, bool quiet)
+static bool hasReplaceConfig(const bpo::variables_map& variables)
+{
+    if (variables["replace"].empty())
+        return false;
+    for (const std::string& var : variables["replace"].as<std::vector<std::string>>())
+    {
+        if (var == "config")
+            return true;
+    }
+    return false;
+}
+
+void ConfigurationManager::readConfiguration(bpo::variables_map& variables,
+                                             const bpo::options_description& description, bool quiet)
 {
-    using ParsedConfigFile = bpo::basic_parsed_options<char>;
     bool silent = mSilent;
     mSilent = quiet;
 
-    std::optional<ParsedConfigFile> config = loadConfig(mFixedPath.getLocalPath(), description);
+    std::optional<bpo::variables_map> config = loadConfig(mFixedPath.getLocalPath(), description);
     if (config)
         mActiveConfigPaths.push_back(mFixedPath.getLocalPath());
     else
@@ -73,9 +85,10 @@ void ConfigurationManager::readConfiguration(boost::program_options::variables_m
 
     std::stack<boost::filesystem::path> extraConfigDirs;
     addExtraConfigDirs(extraConfigDirs, variables);
-    addExtraConfigDirs(extraConfigDirs, *config);
+    if (!hasReplaceConfig(variables))
+        addExtraConfigDirs(extraConfigDirs, *config);
 
-    std::vector<ParsedConfigFile> parsedOptions{*std::move(config)};
+    std::vector<bpo::variables_map> parsedConfigs{*std::move(config)};
     std::set<boost::filesystem::path> alreadyParsedPaths;  // needed to prevent infinite loop in case of a circular link
     alreadyParsedPaths.insert(boost::filesystem::path(mActiveConfigPaths.front()));
 
@@ -92,20 +105,35 @@ void ConfigurationManager::readConfiguration(boost::program_options::variables_m
         alreadyParsedPaths.insert(path);
         mActiveConfigPaths.push_back(path);
         config = loadConfig(path, description);
-        if (!config)
-            continue;
-        addExtraConfigDirs(extraConfigDirs, *config);
-        parsedOptions.push_back(*std::move(config));
+        if (config && hasReplaceConfig(*config) && parsedConfigs.size() > 1)
+        {
+            mActiveConfigPaths.resize(1);
+            parsedConfigs.resize(1);
+            Log(Debug::Info) << "Skipping previous configs except " << (mActiveConfigPaths.front() / "openmw.cfg") <<
+                " due to replace=config in " << (path / "openmw.cfg");
+        }
+        mActiveConfigPaths.push_back(path);
+        if (config)
+        {
+            addExtraConfigDirs(extraConfigDirs, *config);
+            parsedConfigs.push_back(*std::move(config));
+        }
     }
 
-    for (auto it = parsedOptions.rbegin(); it != parsedOptions.rend(); ++it)
+    for (auto it = parsedConfigs.rbegin(); it != parsedConfigs.rend(); ++it)
     {
         auto composingVariables = separateComposingVariables(variables, description);
-        boost::program_options::store(std::move(*it), variables);
+        for (auto& [k, v] : *it)
+        {
+            auto it = variables.find(k);
+            if (it == variables.end())
+                variables.insert({k, v});
+            else if (it->second.defaulted())
+                it->second = v;
+        }
         mergeComposingVariables(variables, composingVariables, description);
     }
 
-    mLogPath = mActiveConfigPaths.back();
     mUserDataPath = variables["user-data"].as<Files::MaybeQuotedPath>();
     if (mUserDataPath.empty())
     {
@@ -113,7 +141,6 @@ void ConfigurationManager::readConfiguration(boost::program_options::variables_m
             Log(Debug::Warning) << "Error: `user-data` is not specified";
         mUserDataPath = mFixedPath.getUserDataPath();
     }
-    processPath(mUserDataPath, true);
     mScreenshotPath = mUserDataPath / "screenshots";
 
     boost::filesystem::create_directories(getUserConfigPath());
@@ -123,18 +150,6 @@ void ConfigurationManager::readConfiguration(boost::program_options::variables_m
     if (!boost::filesystem::is_directory(mScreenshotPath))
         mScreenshotPath = mUserDataPath;
 
-    if (!quiet && !variables["replace"].empty())
-    {
-        for (const std::string& var : variables["replace"].as<std::vector<std::string>>())
-        {
-            if (var == "config")
-            {
-                Log(Debug::Warning) << "replace=config is not allowed and was ignored";
-                break;
-            }
-        }
-    }
-
     if (!quiet)
     {
         Log(Debug::Info) << "Logs dir: " << getUserConfigPath().string();
@@ -146,42 +161,30 @@ void ConfigurationManager::readConfiguration(boost::program_options::variables_m
 }
 
 void ConfigurationManager::addExtraConfigDirs(std::stack<boost::filesystem::path>& dirs,
-                                              const bpo::basic_parsed_options<char>& options) const
-{
-    boost::program_options::variables_map variables;
-    boost::program_options::store(options, variables);
-    boost::program_options::notify(variables);
-    addExtraConfigDirs(dirs, variables);
-}
-
-void ConfigurationManager::addExtraConfigDirs(std::stack<boost::filesystem::path>& dirs,
-                                              const boost::program_options::variables_map& variables) const
+                                              const bpo::variables_map& variables) const
 {
     auto configIt = variables.find("config");
     if (configIt == variables.end())
         return;
     Files::PathContainer newDirs = asPathContainer(configIt->second.as<Files::MaybeQuotedPathContainer>());
-    processPaths(newDirs);
     for (auto it = newDirs.rbegin(); it != newDirs.rend(); ++it)
         dirs.push(*it);
 }
 
-void ConfigurationManager::addCommonOptions(boost::program_options::options_description& description)
+void ConfigurationManager::addCommonOptions(bpo::options_description& description)
 {
-    Files::MaybeQuotedPath defaultUserData;
-    static_cast<boost::filesystem::path&>(defaultUserData) = boost::filesystem::path("?userdata?");
-
     description.add_options()
         ("config", bpo::value<Files::MaybeQuotedPathContainer>()->default_value(Files::MaybeQuotedPathContainer(), "")
             ->multitoken()->composing(), "additional config directories")
-        ("user-data", bpo::value<Files::MaybeQuotedPath>()->default_value(defaultUserData, ""),
+        ("replace", bpo::value<std::vector<std::string>>()->default_value(std::vector<std::string>(), "")->multitoken()->composing(),
+            "settings where the values from the current source should replace those from lower-priority sources instead of being appended")
+        ("user-data", bpo::value<Files::MaybeQuotedPath>()->default_value(Files::MaybeQuotedPath(), ""),
             "set user data directory (used for saves, screenshots, etc)");
 }
 
-boost::program_options::variables_map separateComposingVariables(boost::program_options::variables_map & variables,
-    boost::program_options::options_description& description)
+bpo::variables_map separateComposingVariables(bpo::variables_map & variables, const bpo::options_description& description)
 {
-    boost::program_options::variables_map composingVariables;
+    bpo::variables_map composingVariables;
     for (auto itr = variables.begin(); itr != variables.end();)
     {
         if (description.find(itr->first, false).semantic()->is_composing())
@@ -195,8 +198,8 @@ boost::program_options::variables_map separateComposingVariables(boost::program_
     return composingVariables;
 }
 
-void mergeComposingVariables(boost::program_options::variables_map& first, boost::program_options::variables_map& second,
-    boost::program_options::options_description& description)
+void mergeComposingVariables(bpo::variables_map& first, bpo::variables_map& second,
+    const bpo::options_description& description)
 {
     // There are a few places this assumes all variables are present in second, but it's never crashed in the wild, so it looks like that's guaranteed.
     std::set<std::string> replacedVariables;
@@ -260,16 +263,18 @@ void mergeComposingVariables(boost::program_options::variables_map& first, boost
                 Log(Debug::Error) << "Unexpected composing variable type. Curse boost and their blasted arcane templates.";
         }
     }
-    boost::program_options::notify(first);
 }
 
-void ConfigurationManager::processPath(boost::filesystem::path& path, bool create) const
+void ConfigurationManager::processPath(boost::filesystem::path& path, const boost::filesystem::path& basePath) const
 {
     std::string str = path.string();
 
-    // Do nothing if the path doesn't start with a token
     if (str.empty() || str[0] != '?')
+    {
+        if (!path.is_absolute())
+            path = basePath / path;
         return;
+    }
 
     std::string::size_type pos = str.find('?', 1);
     if (pos != std::string::npos && pos != 0)
@@ -294,37 +299,49 @@ void ConfigurationManager::processPath(boost::filesystem::path& path, bool creat
             path.clear();
         }
     }
+}
 
-    if (!boost::filesystem::is_directory(path) && create)
-    {
-        try
-        {
-            boost::filesystem::create_directories(path);
-        }
-        catch (...) {}
-    }
+void ConfigurationManager::processPaths(Files::PathContainer& dataDirs, const boost::filesystem::path& basePath) const
+{
+    for (auto& path : dataDirs)
+        processPath(path, basePath);
 }
 
-void ConfigurationManager::processPaths(Files::PathContainer& dataDirs, bool create) const
+void ConfigurationManager::processPaths(boost::program_options::variables_map& variables, const boost::filesystem::path& basePath) const
 {
-    for (Files::PathContainer::iterator it = dataDirs.begin(); it != dataDirs.end(); ++it)
+    for (auto& [name, var] : variables)
     {
-        processPath(*it, create);
-        if (!boost::filesystem::is_directory(*it))
+        if (var.defaulted())
+            continue;
+        if (var.value().type() == typeid(MaybeQuotedPathContainer))
         {
-            if (!mSilent)
-                Log(Debug::Warning) << "No such dir: " << *it;
-            (*it).clear();
+            auto& pathContainer = boost::any_cast<MaybeQuotedPathContainer&>(var.value());
+            for (MaybeQuotedPath& path : pathContainer)
+                processPath(path, basePath);
+        }
+        else if (var.value().type() == typeid(MaybeQuotedPath))
+        {
+            boost::filesystem::path& path = boost::any_cast<Files::MaybeQuotedPath&>(var.value());
+            processPath(path, basePath);
         }
     }
+}
 
+void ConfigurationManager::filterOutNonExistingPaths(Files::PathContainer& dataDirs) const
+{
     dataDirs.erase(std::remove_if(dataDirs.begin(), dataDirs.end(),
-        std::bind(&boost::filesystem::path::empty, std::placeholders::_1)), dataDirs.end());
+        [this](const boost::filesystem::path& p)
+        {
+            bool exists = boost::filesystem::is_directory(p);
+            if (!exists && !mSilent)
+                Log(Debug::Warning) << "No such dir: " << p;
+            return !exists;
+        }),
+        dataDirs.end());
 }
 
-std::optional<bpo::basic_parsed_options<char>> ConfigurationManager::loadConfig(
-    const boost::filesystem::path& path,
-    boost::program_options::options_description& description)
+std::optional<bpo::variables_map> ConfigurationManager::loadConfig(
+    const boost::filesystem::path& path, const bpo::options_description& description) const
 {
     boost::filesystem::path cfgFile(path);
     cfgFile /= std::string(openmwCfgFile);
@@ -336,7 +353,12 @@ std::optional<bpo::basic_parsed_options<char>> ConfigurationManager::loadConfig(
         boost::filesystem::ifstream configFileStream(cfgFile);
 
         if (configFileStream.is_open())
-            return Files::parse_config_file(configFileStream, description, true);
+        {
+            bpo::variables_map variables;
+            bpo::store(Files::parse_config_file(configFileStream, description, true), variables);
+            processPaths(variables, path);
+            return variables;
+        }
         else if (!mSilent)
             Log(Debug::Error) << "Loading failed.";
     }
@@ -381,32 +403,23 @@ const boost::filesystem::path& ConfigurationManager::getInstallPath() const
     return mFixedPath.getInstallPath();
 }
 
-const boost::filesystem::path& ConfigurationManager::getLogPath() const
-{
-    return mLogPath;
-}
-
 const boost::filesystem::path& ConfigurationManager::getScreenshotPath() const
 {
     return mScreenshotPath;
 }
 
-void parseArgs(int argc, const char* const argv[], boost::program_options::variables_map& variables,
-    boost::program_options::options_description& description)
+void parseArgs(int argc, const char* const argv[], bpo::variables_map& variables,
+    const bpo::options_description& description)
 {
-    boost::program_options::store(
-        boost::program_options::command_line_parser(argc, argv).options(description).allow_unregistered().run(),
+    bpo::store(
+        bpo::command_line_parser(argc, argv).options(description).allow_unregistered().run(),
         variables
     );
 }
 
-void parseConfig(std::istream& stream, boost::program_options::variables_map& variables,
-    boost::program_options::options_description& description)
+void parseConfig(std::istream& stream, bpo::variables_map& variables, const bpo::options_description& description)
 {
-    boost::program_options::store(
-        Files::parse_config_file(stream, description, true),
-        variables
-    );
+    bpo::store(Files::parse_config_file(stream, description, true), variables);
 }
 
 std::istream& operator>> (std::istream& istream, MaybeQuotedPath& MaybeQuotedPath)
diff --git a/components/files/configurationmanager.hpp b/components/files/configurationmanager.hpp
index 49844cca41..f45df612ef 100644
--- a/components/files/configurationmanager.hpp
+++ b/components/files/configurationmanager.hpp
@@ -25,11 +25,14 @@ struct ConfigurationManager
     virtual ~ConfigurationManager();
 
     void readConfiguration(boost::program_options::variables_map& variables,
-        boost::program_options::options_description& description, bool quiet=false);
+        const boost::program_options::options_description& description, bool quiet=false);
 
-    void processPath(boost::filesystem::path& path, bool create = false) const;
-    void processPaths(Files::PathContainer& dataDirs, bool create = false) const;
-    ///< \param create Try creating the directory, if it does not exist.
+    void filterOutNonExistingPaths(Files::PathContainer& dataDirs) const;
+
+    // Replaces tokens (`?local?`, `?global?`, etc.) in paths. Adds `basePath` prefix for relative paths.
+    void processPath(boost::filesystem::path& path, const boost::filesystem::path& basePath) const;
+    void processPaths(Files::PathContainer& dataDirs, const boost::filesystem::path& basePath) const;
+    void processPaths(boost::program_options::variables_map& variables, const boost::filesystem::path& basePath) const;
 
     /**< Fixed paths */
     const boost::filesystem::path& getGlobalPath() const;
@@ -44,7 +47,7 @@ struct ConfigurationManager
 
     const boost::filesystem::path& getCachePath() const;
 
-    const boost::filesystem::path& getLogPath() const;
+    const boost::filesystem::path& getLogPath() const { return getUserConfigPath(); }
     const boost::filesystem::path& getScreenshotPath() const;
 
     static void addCommonOptions(boost::program_options::options_description& description);
@@ -55,14 +58,12 @@ struct ConfigurationManager
         typedef const boost::filesystem::path& (FixedPathType::*path_type_f)() const;
         typedef std::map<std::string, path_type_f> TokensMappingContainer;
 
-        std::optional<boost::program_options::basic_parsed_options<char>> loadConfig(
+        std::optional<boost::program_options::variables_map> loadConfig(
             const boost::filesystem::path& path,
-            boost::program_options::options_description& description);
+            const boost::program_options::options_description& description) const;
 
         void addExtraConfigDirs(std::stack<boost::filesystem::path>& dirs,
             const boost::program_options::variables_map& variables) const;
-        void addExtraConfigDirs(std::stack<boost::filesystem::path>& dirs,
-            const boost::program_options::basic_parsed_options<char>& options) const;
 
         void setupTokensMapping();
 
@@ -70,7 +71,6 @@ struct ConfigurationManager
 
         FixedPathType mFixedPath;
 
-        boost::filesystem::path mLogPath;
         boost::filesystem::path mUserDataPath;
         boost::filesystem::path mScreenshotPath;
 
@@ -80,16 +80,16 @@ struct ConfigurationManager
 };
 
 boost::program_options::variables_map separateComposingVariables(boost::program_options::variables_map& variables,
-    boost::program_options::options_description& description);
+    const boost::program_options::options_description& description);
 
 void mergeComposingVariables(boost::program_options::variables_map& first, boost::program_options::variables_map& second,
-    boost::program_options::options_description& description);
+    const boost::program_options::options_description& description);
 
 void parseArgs(int argc, const char* const argv[], boost::program_options::variables_map& variables,
-    boost::program_options::options_description& description);
+    const boost::program_options::options_description& description);
 
 void parseConfig(std::istream& stream, boost::program_options::variables_map& variables,
-    boost::program_options::options_description& description);
+    const boost::program_options::options_description& description);
 
 class MaybeQuotedPath : public boost::filesystem::path
 {
@@ -101,6 +101,6 @@ typedef std::vector<MaybeQuotedPath> MaybeQuotedPathContainer;
 
 PathContainer asPathContainer(const MaybeQuotedPathContainer& MaybeQuotedPathContainer);
 
-} /* namespace Cfg */
+} /* namespace Files */
 
 #endif /* COMPONENTS_FILES_CONFIGURATIONMANAGER_HPP */

From bab5e56768a7ae47c0557f62f8dc4dd5a107013e Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Thu, 28 Apr 2022 15:19:54 +0200
Subject: [PATCH 2357/2859] Make the launcher dara directory and bsa list play
 nicer with dark themes.

Known issue: the padding icon for disabled data directories is of wrong
color.
---
 apps/launcher/datafilespage.cpp               | 24 +++++++++----------
 .../contentselector/model/contentmodel.cpp    |  9 +++++++
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index fe6d96b51a..29042a72a6 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -247,16 +247,7 @@ void Launcher::DataFilesPage::populateFileViews(const QString& contentModelName)
         // add new achives files presents in current directory
         addArchivesFromDir(currentDir);
 
-        // Display new content with green background
-        QColor background;
         QString tooltip;
-        if (mNewDataDirs.contains(currentDir))
-        {
-            tooltip += "Will be added to the current profile\n";
-            background = Qt::green;
-        }
-        else
-            background = Qt::white;
 
         // add content files presents in current directory
         mSelector->addFiles(currentDir, mNewDataDirs.contains(currentDir));
@@ -265,7 +256,14 @@ void Launcher::DataFilesPage::populateFileViews(const QString& contentModelName)
         ui.directoryListWidget->addItem(currentDir);
         auto row = ui.directoryListWidget->count() - 1;
         auto* item = ui.directoryListWidget->item(row);
-        item->setBackground(background);
+
+        // Display new content with green background
+        if (mNewDataDirs.contains(currentDir))
+        {
+            tooltip += "Will be added to the current profile\n";
+            item->setBackground(Qt::green);
+            item->setForeground(Qt::black);
+        }
 
         // deactivate data-local and global data directory: they are always included
         if (currentDir == mDataLocal || currentDir == globalDataDir)
@@ -284,7 +282,7 @@ void Launcher::DataFilesPage::populateFileViews(const QString& contentModelName)
         {
             // Pad to correct vertical alignment
             QPixmap pixmap(QSize(200, 200)); // Arbitrary big number, will be scaled down to widget size
-            pixmap.fill(background);
+            pixmap.fill(ui.directoryListWidget->palette().base().color());
             auto emptyIcon = QIcon(pixmap);
             item->setIcon(emptyIcon);
         }
@@ -447,7 +445,6 @@ void Launcher::DataFilesPage::setProfile (const QString &previous, const QString
     {
         auto* item = ui.archiveListWidget->item(i);
         mKnownArchives.push_back(item->text());
-        item->setBackground(Qt::white);
     }
 
     checkForDefaultProfile();
@@ -704,7 +701,10 @@ void Launcher::DataFilesPage::addArchive(const QString& name, Qt::CheckState sel
     ui.archiveListWidget->insertItem(row, name);
     ui.archiveListWidget->item(row)->setCheckState(selected);
     if (mKnownArchives.filter(name).isEmpty()) // XXX why contains doesn't work here ???
+    {
         ui.archiveListWidget->item(row)->setBackground(Qt::green);
+        ui.archiveListWidget->item(row)->setForeground(Qt::black);
+    }
 }
 
 void Launcher::DataFilesPage::addArchivesFromDir(const QString& path)
diff --git a/components/contentselector/model/contentmodel.cpp b/components/contentselector/model/contentmodel.cpp
index f4760aaea6..c1d35ad1e2 100644
--- a/components/contentselector/model/contentmodel.cpp
+++ b/components/contentselector/model/contentmodel.cpp
@@ -169,6 +169,15 @@ QVariant ContentSelectorModel::ContentModel::data(const QModelIndex &index, int
         return QVariant();
     }
 
+    case Qt::ForegroundRole:
+    {
+        if (isNew(file->fileName()))
+        {
+            return QVariant(QColor(Qt::black));
+        }
+        return QVariant();
+    }
+
     case Qt::EditRole:
     case Qt::DisplayRole:
     {

From dd5901d3517cc519819a2c45b37b1fd93e571ce8 Mon Sep 17 00:00:00 2001
From: madsbuvi <madssandvei@zoho.com>
Date: Mon, 4 Apr 2022 22:51:23 +0200
Subject: [PATCH 2358/2859] Initial commit

Multiview shaders.

Refactor Frustum management

Rewrite shared shadow map

cull mask should respect stereo

Stereo savegame screencap

LocalMap refactoring

use the vertex buffer hint instead of the display list patch to enable/disable display lists

Character preview fixes
---
 .gitlab-ci.yml                             |  10 +-
 CI/before_script.msvc.sh                   |  49 ++-
 CMakeLists.txt                             |   5 +
 apps/openmw/engine.cpp                     |  55 ++-
 apps/openmw/engine.hpp                     |  20 +
 apps/openmw/mwbase/windowmanager.hpp       |   6 +
 apps/openmw/mwgui/mapwindow.cpp            |   4 +
 apps/openmw/mwgui/windowmanagerimp.cpp     |  25 +-
 apps/openmw/mwgui/windowmanagerimp.hpp     |   3 +
 apps/openmw/mwrender/characterpreview.cpp  | 172 +++++---
 apps/openmw/mwrender/characterpreview.hpp  |   4 +-
 apps/openmw/mwrender/localmap.cpp          | 302 +++++++------
 apps/openmw/mwrender/localmap.hpp          |  19 +-
 apps/openmw/mwrender/postprocessor.cpp     | 191 +++++---
 apps/openmw/mwrender/postprocessor.hpp     |  14 +-
 apps/openmw/mwrender/renderingmanager.cpp  | 108 ++++-
 apps/openmw/mwrender/renderingmanager.hpp  |   5 +-
 apps/openmw/mwrender/screenshotmanager.cpp |  24 +-
 apps/openmw/mwrender/sky.cpp               |   7 +-
 apps/openmw/mwrender/water.cpp             |  14 +-
 cmake/CheckOsgMultiview.cmake              |  26 ++
 components/CMakeLists.txt                  |   6 +-
 components/sceneutil/color.cpp             | 157 +++++++
 components/sceneutil/color.hpp             | 204 +++++++++
 components/sceneutil/depth.cpp             | 145 +++++-
 components/sceneutil/depth.hpp             |  69 +++
 components/sceneutil/mwshadowtechnique.cpp | 152 ++++++-
 components/sceneutil/mwshadowtechnique.hpp |  30 ++
 components/sceneutil/rtt.cpp               | 212 +++++++--
 components/sceneutil/rtt.hpp               |  51 ++-
 components/sceneutil/shadow.cpp            |   3 +
 components/sceneutil/statesetupdater.cpp   |   8 +
 components/sceneutil/statesetupdater.hpp   |   5 +
 components/shader/shadervisitor.cpp        |   3 +
 components/stereo/frustum.cpp              | 162 +++++++
 components/stereo/frustum.hpp              |  76 ++++
 components/stereo/multiview.cpp            | 484 +++++++++++++++++++++
 components/stereo/multiview.hpp            |  85 ++++
 components/stereo/stereomanager.cpp        | 459 +++++++++++++++++++
 components/stereo/stereomanager.hpp        | 134 ++++++
 components/stereo/types.cpp                | 168 +++++++
 components/stereo/types.hpp                |  61 +++
 components/terrain/material.cpp            |   3 +
 files/settings-default.cfg                 |  57 +++
 files/shaders/CMakeLists.txt               |   2 +
 files/shaders/debug_fragment.glsl          |   2 +-
 files/shaders/debug_vertex.glsl            |   2 +-
 files/shaders/groundcover_fragment.glsl    |   2 +-
 files/shaders/groundcover_vertex.glsl      |   4 +-
 files/shaders/gui_fragment.glsl            |   2 +-
 files/shaders/gui_vertex.glsl              |   2 +-
 files/shaders/multiview_fragment.glsl      |  48 ++
 files/shaders/multiview_vertex.glsl        |  80 ++++
 files/shaders/nv_default_fragment.glsl     |   2 +-
 files/shaders/nv_default_vertex.glsl       |   5 +-
 files/shaders/nv_nolighting_fragment.glsl  |   2 +-
 files/shaders/nv_nolighting_vertex.glsl    |   2 +-
 files/shaders/objects_fragment.glsl        |   2 +-
 files/shaders/objects_vertex.glsl          |   5 +-
 files/shaders/s360_fragment.glsl           |   2 +-
 files/shaders/s360_vertex.glsl             |   2 +-
 files/shaders/shadowcasting_fragment.glsl  |   2 +-
 files/shaders/shadowcasting_vertex.glsl    |   2 +-
 files/shaders/sky_fragment.glsl            |   2 +-
 files/shaders/sky_vertex.glsl              |  18 +-
 files/shaders/terrain_fragment.glsl        |   2 +-
 files/shaders/terrain_vertex.glsl          |   5 +-
 files/shaders/water_fragment.glsl          |   4 +-
 files/shaders/water_vertex.glsl            |   2 +-
 69 files changed, 3566 insertions(+), 434 deletions(-)
 create mode 100644 cmake/CheckOsgMultiview.cmake
 create mode 100644 components/sceneutil/color.cpp
 create mode 100644 components/sceneutil/color.hpp
 create mode 100644 components/stereo/frustum.cpp
 create mode 100644 components/stereo/frustum.hpp
 create mode 100644 components/stereo/multiview.cpp
 create mode 100644 components/stereo/multiview.hpp
 create mode 100644 components/stereo/stereomanager.cpp
 create mode 100644 components/stereo/stereomanager.hpp
 create mode 100644 components/stereo/types.cpp
 create mode 100644 components/stereo/types.hpp
 create mode 100644 files/shaders/multiview_fragment.glsl
 create mode 100644 files/shaders/multiview_vertex.glsl

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e81ffb481..fdfbdac13b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -424,6 +424,14 @@ Windows_Ninja_Engine_Release:
     <<: *engine-targets
     config: "Release"
 
+Windows_Ninja_Engine_Release_MultiView:
+  extends:
+    - .Windows_Ninja_Base
+  variables:
+    <<: *engine-targets
+    multiview: "-M"
+    config: "Release"
+
 Windows_Ninja_Engine_Debug:
   extends:
     - .Windows_Ninja_Base
@@ -506,7 +514,7 @@ Windows_Ninja_Tests_RelWithDebInfo:
     - $env:CCACHE_BASEDIR = Get-Location
     - $env:CCACHE_DIR = "$(Get-Location)\ccache"
     - New-Item -Type Directory -Force -Path $env:CCACHE_DIR
-    - sh CI/before_script.msvc.sh -c $config -p Win64 -v 2019 -k -V -b -t -C
+    - sh CI/before_script.msvc.sh -c $config -p Win64 -v 2019 -k -V -b -t -C $multiview
     - cd MSVC2019_64
     - cmake --build . --config $config --target ($targets.Split(','))
     - ccache --show-stats
diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 7c9ea20bd1..bdf7d24eb8 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -75,6 +75,7 @@ TEST_FRAMEWORK=""
 GOOGLE_INSTALL_ROOT=""
 INSTALL_PREFIX="."
 BUILD_BENCHMARKS=""
+OSG_MULTIVIEW_BUILD=""
 
 ACTIVATE_MSVC=""
 SINGLE_CONFIG=""
@@ -139,7 +140,10 @@ while [ $# -gt 0 ]; do
 
 			b )
 				BUILD_BENCHMARKS=true ;;
-
+            
+            M )
+                OSG_MULTIVIEW_BUILD=true ;;
+                
 			h )
 				cat <<EOF
 Usage: $0 [-cdehkpuvVi]
@@ -178,6 +182,8 @@ Options:
 		CMake install prefix
 	-b
 		Build benchmarks
+    -M
+        Use a multiview build of OSG
 EOF
 				wrappedExit 0
 				;;
@@ -514,6 +520,16 @@ fi
 
 ICU_VER="70_1"
 
+OSG_ARCHIVE_NAME="OSGoS 3.6.5"
+OSG_ARCHIVE="OSGoS-3.6.5-b02abe2-msvc${MSVC_REAL_YEAR}-win${BITS}"
+OSG_ARCHIVE_REPO_URL="https://gitlab.com/OpenMW/openmw-deps/-/raw/main"
+if ! [ -z $OSG_MULTIVIEW_BUILD ]; then
+    OSG_ARCHIVE_NAME="OSG-3.6-multiview"
+    OSG_ARCHIVE="OSG-3.6-multiview-ee297dce0-msvc${MSVC_REAL_YEAR}-win${BITS}"
+    OSG_ARCHIVE_REPO_URL="https://gitlab.com/madsbuvi/openmw-deps/-/raw/openmw-vr-ovr_multiview"
+fi
+
+
 echo
 echo "==================================="
 echo "Starting prebuild on MSVC${MSVC_DISPLAY_YEAR} WIN${BITS}"
@@ -565,15 +581,15 @@ if [ -z $SKIP_DOWNLOAD ]; then
 	  "https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/OpenAL-Soft-1.20.1.zip" \
 		"OpenAL-Soft-1.20.1.zip"
 
-	# OSGoS
-	download "OSGoS 3.6.5" \
-		"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/OSGoS-3.6.5-b02abe2-msvc${MSVC_REAL_YEAR}-win${BITS}.7z" \
-		"OSGoS-3.6.5-b02abe2-msvc${MSVC_REAL_YEAR}-win${BITS}.7z"
+	# OSGoS https://gitlab.com/madsbuvi/openmw-deps/-/raw/openmw-vr-ovr_multiview/windows/OSG-3.6-multiview-ee297dce0-msvc${MSVC_REAL_YEAR}-win${BITS}.7z
+	download "${OSG_ARCHIVE_NAME}" \
+		"${OSG_ARCHIVE_REPO_URL}/windows/${OSG_ARCHIVE}.7z" \
+		"${OSG_ARCHIVE}.7z"
 
 	if [ -n "$PDBS" ]; then
-		download "OSGoS symbols" \
-			"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/OSGoS-3.6.5-b02abe2-msvc${MSVC_REAL_YEAR}-win${BITS}-sym.7z" \
-			"OSGoS-3.6.5-b02abe2-msvc${MSVC_REAL_YEAR}-win${BITS}-sym.7z"
+		download "${OSG_ARCHIVE_NAME} symbols" \
+			"${OSG_ARCHIVE_REPO_URL}/windows/${OSG_ARCHIVE}-sym.7z" \
+			"${OSG_ARCHIVE}-sym.7z"
 	fi
 
 	# SDL2
@@ -781,7 +797,7 @@ printf "OpenAL-Soft 1.20.1... "
 cd $DEPS
 echo
 # OSGoS
-printf "OSGoS 3.6.5... "
+printf "${OSG_ARCHIVE_NAME}... "
 {
 	cd $DEPS_INSTALL
 	if [ -d OSG ] && \
@@ -792,9 +808,9 @@ printf "OSGoS 3.6.5... "
 		printf "Exists. "
 	elif [ -z $SKIP_EXTRACT ]; then
 		rm -rf OSG
-		eval 7z x -y "${DEPS}/OSGoS-3.6.5-b02abe2-msvc${MSVC_REAL_YEAR}-win${BITS}.7z" $STRIP
-		[ -n "$PDBS" ] && eval 7z x -y "${DEPS}/OSGoS-3.6.5-b02abe2-msvc${MSVC_REAL_YEAR}-win${BITS}-sym.7z" $STRIP
-		mv "OSGoS-3.6.5-b02abe2-msvc${MSVC_REAL_YEAR}-win${BITS}" OSG
+		eval 7z x -y "${DEPS}/${OSG_ARCHIVE}.7z" $STRIP
+		[ -n "$PDBS" ] && eval 7z x -y "${DEPS}/${OSG_ARCHIVE}-sym.7z" $STRIP
+		mv "${OSG_ARCHIVE}" OSG
 	fi
 	OSG_SDK="$(real_pwd)/OSG"
 	add_cmake_opts -DOSG_DIR="$OSG_SDK"
@@ -804,8 +820,13 @@ printf "OSGoS 3.6.5... "
 		else
 			SUFFIX=""
 		fi
-		add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/"{OpenThreads,zlib,libpng}${SUFFIX}.dll \
-			"$(pwd)/OSG/bin/osg"{,Animation,DB,FX,GA,Particle,Text,Util,Viewer,Shadow}${SUFFIX}.dll
+        if ! [ -z $OSG_MULTIVIEW_BUILD ]; then
+            add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/"{ot21-OpenThreads,zlib,libpng16}${SUFFIX}.dll \
+                "$(pwd)/OSG/bin/osg162-osg"{,Animation,DB,FX,GA,Particle,Text,Util,Viewer,Shadow}${SUFFIX}.dll
+        else
+            add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/"{OpenThreads,zlib,libpng}${SUFFIX}.dll \
+                "$(pwd)/OSG/bin/osg"{,Animation,DB,FX,GA,Particle,Text,Util,Viewer,Shadow}${SUFFIX}.dll
+        fi
 		add_osg_dlls $CONFIGURATION "$(pwd)/OSG/bin/osgPlugins-3.6.5/osgdb_"{bmp,dds,freetype,jpeg,osg,png,tga}${SUFFIX}.dll
 		add_osg_dlls $CONFIGURATION "$(pwd)/OSG/bin/osgPlugins-3.6.5/osgdb_serializers_osg"{,animation,fx,ga,particle,text,util,viewer,shadow}${SUFFIX}.dll
 	done
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0cbd7a1a99..500f8a510d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -410,6 +410,11 @@ if(OSG_STATIC)
     add_definitions(-DOSG_LIBRARY_STATIC)
 endif()
 
+include(cmake/CheckOsgMultiview.cmake)
+if(HAVE_MULTIVIEW)
+    add_definitions(-DOSG_HAS_MULTIVIEW)
+endif(HAVE_MULTIVIEW)
+
 set(BOOST_COMPONENTS system filesystem program_options iostreams)
 if(WIN32)
     set(BOOST_COMPONENTS ${BOOST_COMPONENTS} locale)
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index e0848eecf6..91250ca0fb 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -30,6 +30,9 @@
 
 #include <components/compiler/extensions0.hpp>
 
+#include <components/stereo/stereomanager.hpp>
+#include <components/stereo/multiview.hpp>
+
 #include <components/sceneutil/workqueue.hpp>
 
 #include <components/files/configurationmanager.hpp>
@@ -40,6 +43,7 @@
 
 #include <components/sceneutil/screencapture.hpp>
 #include <components/sceneutil/depth.hpp>
+#include <components/sceneutil/color.hpp>
 #include <components/sceneutil/util.hpp>
 
 #include "mwinput/inputmanagerimp.hpp"
@@ -251,6 +255,18 @@ namespace
             Log(Debug::Info) << "OpenGL Version: " << glGetString(GL_VERSION);
         }
     };
+
+    class InitializeStereoOperation final : public osg::GraphicsOperation
+    {
+    public:
+        InitializeStereoOperation() : GraphicsOperation("InitializeStereoOperation", false)
+        {}
+
+        void operator()(osg::GraphicsContext* graphicsContext) override
+        {
+            Stereo::Manager::instance().initializeStereo(graphicsContext);
+        }
+    };
 }
 
 void OMW::Engine::executeLocalScripts()
@@ -413,6 +429,9 @@ OMW::Engine::Engine(Files::ConfigurationManager& configurationManager)
   , mEncoding(ToUTF8::WINDOWS_1252)
   , mEncoder(nullptr)
   , mScreenCaptureOperation(nullptr)
+  , mSelectDepthFormatOperation(new SceneUtil::SelectDepthFormatOperation())
+  , mSelectColorFormatOperation(new SceneUtil::Color::SelectColorFormatOperation())
+  , mStereoManager(nullptr)
   , mSkipMenu (false)
   , mUseSound (true)
   , mCompileAll (false)
@@ -448,6 +467,8 @@ OMW::Engine::~Engine()
     if (mScreenCaptureOperation != nullptr)
         mScreenCaptureOperation->stop();
 
+    mStereoManager = nullptr;
+
     mEnvironment.cleanup();
 
     delete mScriptContext;
@@ -640,6 +661,15 @@ void OMW::Engine::createWindow(Settings::Manager& settings)
     if (Debug::shouldDebugOpenGL())
         realizeOperations->add(new Debug::EnableGLDebugOperation());
 
+    realizeOperations->add(mSelectDepthFormatOperation);
+    realizeOperations->add(mSelectColorFormatOperation);
+
+    if (Stereo::getStereo())
+    {
+        realizeOperations->add(new InitializeStereoOperation());
+        Stereo::setVertexBufferHint();
+    }
+
     mViewer->realize();
 
     mViewer->getEventQueue()->getCurrentEventState()->setWindowRectangle(0, 0, graphicsWindow->getTraits()->width, graphicsWindow->getTraits()->height);
@@ -674,11 +704,13 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     mEnvironment.setStateManager (
         std::make_unique<MWState::StateManager> (mCfgMgr.getUserDataPath() / "saves", mContentFiles));
 
-    createWindow(settings);
+    mStereoManager = std::make_unique<Stereo::Manager>(mViewer);
 
-    osg::ref_ptr<osg::Group> rootNode (new osg::Group);
+    osg::ref_ptr<osg::Group> rootNode(new osg::Group);
     mViewer->setSceneData(rootNode);
 
+    createWindow(settings);
+
     mVFS = std::make_unique<VFS::Manager>(mFSStrict);
 
     VFS::registerArchives(mVFS.get(), mFileCollections, mArchives, true);
@@ -757,22 +789,6 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
 
     osg::ref_ptr<osg::GLExtensions> exts = osg::GLExtensions::Get(0, false);
     bool shadersSupported = exts && (exts->glslLanguageVersion >= 1.2f);
-    bool enableReverseZ = false;
-
-    if (Settings::Manager::getBool("reverse z", "Camera"))
-    {
-        if (exts && exts->isClipControlSupported)
-        {
-            enableReverseZ = true;
-            Log(Debug::Info) << "Using reverse-z depth buffer";
-        }
-        else
-            Log(Debug::Warning) << "GL_ARB_clip_control not supported: disabling reverse-z depth buffer";
-    }
-    else
-        Log(Debug::Info) << "Using standard depth buffer";
-
-    SceneUtil::AutoDepth::setReversed(enableReverseZ);
 
 #if OSG_VERSION_LESS_THAN(3, 6, 6)
     // hack fix for https://github.com/openscenegraph/OpenSceneGraph/issues/1028
@@ -784,6 +800,7 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     osg::ref_ptr<osg::Group> guiRoot = new osg::Group;
     guiRoot->setName("GUI Root");
     guiRoot->setNodeMask(MWRender::Mask_GUI);
+    mStereoManager->disableStereoForNode(guiRoot);
     rootNode->addChild(guiRoot);
 
     auto windowMgr = std::make_unique<MWGui::WindowManager>(mWindow, mViewer, guiRoot, mResourceSystem.get(), mWorkQueue.get(),
@@ -794,7 +811,7 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     mEnvironment.setWindowManager (std::move(windowMgr));
 
     auto inputMgr = std::make_unique<MWInput::InputManager>(mWindow, mViewer, mScreenCaptureHandler, mScreenCaptureOperation, keybinderUser, keybinderUserExists, userGameControllerdb, gameControllerdb, mGrab);
-    mEnvironment.setInputManager (std::move(inputMgr));
+    mEnvironment.setInputManager(std::move(inputMgr));
 
     // Create sound system
     mEnvironment.setSoundManager (std::make_unique<MWSound::SoundManager>(mVFS.get(), mUseSound));
diff --git a/apps/openmw/engine.hpp b/apps/openmw/engine.hpp
index 5fe032d27e..d30bd33e80 100644
--- a/apps/openmw/engine.hpp
+++ b/apps/openmw/engine.hpp
@@ -39,6 +39,11 @@ namespace MWLua
     class LuaManager;
 }
 
+namespace Stereo
+{
+    class Manager;
+}
+
 namespace Files
 {
     struct ConfigurationManager;
@@ -49,6 +54,16 @@ namespace osgViewer
     class ScreenCaptureHandler;
 }
 
+namespace SceneUtil
+{
+    class SelectDepthFormatOperation;
+
+    namespace Color
+    {
+        class SelectColorFormatOperation;
+    }
+}
+
 struct SDL_Window;
 
 namespace OMW
@@ -69,9 +84,14 @@ namespace OMW
             osg::ref_ptr<osgViewer::Viewer> mViewer;
             osg::ref_ptr<osgViewer::ScreenCaptureHandler> mScreenCaptureHandler;
             osg::ref_ptr<SceneUtil::AsyncScreenCaptureOperation> mScreenCaptureOperation;
+            osg::ref_ptr<SceneUtil::SelectDepthFormatOperation> mSelectDepthFormatOperation;
+            osg::ref_ptr<SceneUtil::Color::SelectColorFormatOperation> mSelectColorFormatOperation;
             std::string mCellName;
             std::vector<std::string> mContentFiles;
             std::vector<std::string> mGroundcoverFiles;
+
+            std::unique_ptr<Stereo::Manager> mStereoManager;
+
             bool mSkipMenu;
             bool mUseSound;
             bool mCompileAll;
diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index 04f21906a0..f47ae24e87 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -367,6 +367,12 @@ namespace MWBase
             virtual void forceLootMode(const MWWorld::Ptr& ptr) = 0;
 
             virtual void asyncPrepareSaveMap() = 0;
+
+            /// Sets the cull masks for all applicable views
+            virtual void setCullMask(uint32_t mask) = 0;
+
+            /// Same as viewer->getCamera()->getCullMask(), provided for consistency.
+            virtual uint32_t getCullMask() = 0;
     };
 }
 
diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index 428b925920..b15ff1d178 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -748,7 +748,11 @@ namespace MWGui
 
     // ------------------------------------------------------------------------------------------
     MapWindow::MapWindow(CustomMarkerCollection &customMarkers, DragAndDrop* drag, MWRender::LocalMap* localMapRender, SceneUtil::WorkQueue* workQueue)
+#ifdef USE_OPENXR
+        : WindowPinnableBase("openmw_map_window_vr.layout")
+#else
         : WindowPinnableBase("openmw_map_window.layout")
+#endif
         , LocalMapBase(customMarkers, localMapRender)
         , NoDrop(drag, mMainWidget)
         , mGlobalMap(nullptr)
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 23c16082b4..94b80d3faf 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -572,17 +572,17 @@ namespace MWGui
     void WindowManager::enableScene(bool enable)
     {
         unsigned int disablemask = MWRender::Mask_GUI|MWRender::Mask_PreCompile;
-        if (!enable && mViewer->getCamera()->getCullMask() != disablemask)
+        if (!enable && getCullMask() != disablemask)
         {
             mOldUpdateMask = mViewer->getUpdateVisitor()->getTraversalMask();
-            mOldCullMask = mViewer->getCamera()->getCullMask();
+            mOldCullMask = getCullMask();
             mViewer->getUpdateVisitor()->setTraversalMask(disablemask);
-            mViewer->getCamera()->setCullMask(disablemask);
+            setCullMask(disablemask);
         }
-        else if (enable && mViewer->getCamera()->getCullMask() == disablemask)
+        else if (enable && getCullMask() == disablemask)
         {
             mViewer->getUpdateVisitor()->setTraversalMask(mOldUpdateMask);
-            mViewer->getCamera()->setCullMask(mOldCullMask);
+            setCullMask(mOldCullMask);
         }
     }
 
@@ -1226,6 +1226,21 @@ namespace MWGui
         updateVisible();
     }
 
+    void WindowManager::setCullMask(uint32_t mask)
+    {
+        mViewer->getCamera()->setCullMask(mask);
+
+        // We could check whether stereo is enabled here, but these methods are 
+        // trivial and have no effect in mono or multiview so just call them regardless.
+        mViewer->getCamera()->setCullMaskLeft(mask);
+        mViewer->getCamera()->setCullMaskRight(mask);
+    }
+
+    uint32_t WindowManager::getCullMask()
+    {
+        return mViewer->getCamera()->getCullMask();
+    }
+
     void WindowManager::popGuiMode(bool noSound)
     {
         if (mDragAndDrop && mDragAndDrop->mIsOnDragAndDrop)
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index 90e8d1b0d7..8ab50e32ed 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -582,6 +582,9 @@ namespace MWGui
     void handleScheduledMessageBoxes();
 
     void pushGuiMode(GuiMode mode, const MWWorld::Ptr& arg, bool force);
+
+    void setCullMask(uint32_t mask) override;
+    uint32_t getCullMask() override;
   };
 }
 
diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index 7cca787580..f2bbe10460 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -21,6 +21,7 @@
 #include <components/resource/resourcesystem.hpp>
 #include <components/sceneutil/lightmanager.hpp>
 #include <components/sceneutil/shadow.hpp>
+#include <components/sceneutil/rtt.hpp>
 #include <components/settings/settings.hpp>
 #include <components/sceneutil/nodecallback.hpp>
 #include <components/sceneutil/depth.hpp>
@@ -41,9 +42,10 @@ namespace MWRender
     class DrawOnceCallback : public SceneUtil::NodeCallback<DrawOnceCallback>
     {
     public:
-        DrawOnceCallback ()
+        DrawOnceCallback(osg::Node* subgraph)
             : mRendered(false)
             , mLastRenderedFrame(0)
+            , mSubgraph(subgraph)
         {
         }
 
@@ -61,6 +63,9 @@ namespace MWRender
 
                 nv->setFrameStamp(fs);
 
+                // Update keyframe controllers in the scene graph first...
+                // RTTNode does not continue update traversal, so manually continue the update traversal since we need it.
+                mSubgraph->accept(*nv);
                 traverse(node, nv);
 
                 nv->setFrameStamp(previousFramestamp);
@@ -84,6 +89,7 @@ namespace MWRender
     private:
         bool mRendered;
         unsigned int mLastRenderedFrame;
+        osg::ref_ptr<osg::Node> mSubgraph;
     };
 
 
@@ -138,6 +144,96 @@ namespace MWRender
         }
     };
 
+    class CharacterPreviewRTTNode : public SceneUtil::RTTNode
+    {
+        static constexpr float fovYDegrees = 12.3f;
+        static constexpr float znear = 0.1f;
+        static constexpr float zfar = 10000.f;
+
+    public:
+        CharacterPreviewRTTNode(uint32_t sizeX, uint32_t sizeY)
+            : RTTNode(sizeX, sizeY, Settings::Manager::getInt("antialiasing", "Video"), false, 0, StereoAwareness::Unaware_MultiViewShaders)
+            , mAspectRatio(static_cast<float>(sizeX) / static_cast<float>(sizeY))
+        {
+            if (SceneUtil::AutoDepth::isReversed())
+                mPerspectiveMatrix = static_cast<osg::Matrixf>(SceneUtil::getReversedZProjectionMatrixAsPerspective(fovYDegrees, mAspectRatio, znear, zfar));
+            else
+                mPerspectiveMatrix = osg::Matrixf::perspective(fovYDegrees, mAspectRatio, znear, zfar);
+            mGroup->getOrCreateStateSet()->addUniform(new osg::Uniform("projectionMatrix", mPerspectiveMatrix));
+            mViewMatrix = osg::Matrixf::identity();
+            setColorBufferInternalFormat(GL_RGBA);
+        } 
+
+        void setDefaults(osg::Camera* camera) override 
+        {
+
+            // hints that the camera is not relative to the master camera
+            camera->setReferenceFrame(osg::Camera::ABSOLUTE_RF);
+            camera->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT, osg::Camera::PIXEL_BUFFER_RTT);
+            camera->setClearColor(osg::Vec4(0.f, 0.f, 0.f, 0.f));
+            camera->setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+            camera->setViewport(0, 0, width(), height());
+            camera->setRenderOrder(osg::Camera::PRE_RENDER);
+            camera->setName("CharacterPreview");
+            camera->setComputeNearFarMode(osg::Camera::COMPUTE_NEAR_FAR_USING_BOUNDING_VOLUMES);
+            camera->setCullMask(~(Mask_UpdateVisitor));
+            SceneUtil::setCameraClearDepth(camera);
+
+            // hints that the camera is not relative to the master camera
+            camera->setReferenceFrame(osg::Camera::ABSOLUTE_RF);
+            camera->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT, osg::Camera::PIXEL_BUFFER_RTT);
+            camera->setClearColor(osg::Vec4(0.f, 0.f, 0.f, 0.f));
+            camera->setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+            camera->setProjectionMatrixAsPerspective(fovYDegrees, mAspectRatio, znear, zfar);
+            camera->setViewport(0, 0, width(), height());
+            camera->setRenderOrder(osg::Camera::PRE_RENDER);
+#ifdef OSG_HAS_MULTIVIEW
+            if (shouldDoTextureArray())
+            {
+                auto* viewUniform = new osg::Uniform(osg::Uniform::FLOAT_MAT4, "viewMatrixMultiView", 2);
+                auto* projUniform = new osg::Uniform(osg::Uniform::FLOAT_MAT4, "projectionMatrixMultiView", 2);
+                viewUniform->setElement(0, osg::Matrix::identity());
+                viewUniform->setElement(1, osg::Matrix::identity());
+                projUniform->setElement(0, mPerspectiveMatrix);
+                projUniform->setElement(1, mPerspectiveMatrix);
+                mGroup->getOrCreateStateSet()->addUniform(viewUniform, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+                mGroup->getOrCreateStateSet()->addUniform(projUniform, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+            }
+#endif
+
+            camera->setNodeMask(Mask_RenderToTexture);
+            camera->addChild(mGroup);
+        };
+
+        void apply(osg::Camera* camera) override 
+        {
+            if(mCameraStateset)
+                camera->setStateSet(mCameraStateset);
+            camera->setViewMatrix(mViewMatrix);
+        };
+
+        void addChild(osg::Node* node)
+        {
+            mGroup->addChild(node);
+        }
+
+        void setCameraStateset(osg::StateSet* stateset)
+        {
+            mCameraStateset = stateset;
+        }
+
+        void setViewMatrix(const osg::Matrixf& viewMatrix)
+        {
+            mViewMatrix = viewMatrix;
+        }
+
+        osg::ref_ptr<osg::Group> mGroup = new osg::Group;
+        osg::Matrixf mPerspectiveMatrix;
+        osg::Matrixf mViewMatrix;
+        osg::ref_ptr<osg::StateSet> mCameraStateset;
+        float mAspectRatio;
+    };
+
     CharacterPreview::CharacterPreview(osg::Group* parent, Resource::ResourceSystem* resourceSystem,
                                        const MWWorld::Ptr& character, int sizeX, int sizeY, const osg::Vec3f& position, const osg::Vec3f& lookAt)
         : mParent(parent)
@@ -149,31 +245,11 @@ namespace MWRender
         , mSizeX(sizeX)
         , mSizeY(sizeY)
     {
-        mTexture = new osg::Texture2D;
-        mTexture->setTextureSize(sizeX, sizeY);
-        mTexture->setInternalFormat(GL_RGBA);
-        mTexture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
-        mTexture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
-
         mTextureStateSet = new osg::StateSet;
         mTextureStateSet->setAttribute(new osg::BlendFunc(osg::BlendFunc::ONE, osg::BlendFunc::ONE_MINUS_SRC_ALPHA));
 
-        mCamera = new osg::Camera;
-        // hints that the camera is not relative to the master camera
-        mCamera->setReferenceFrame(osg::Camera::ABSOLUTE_RF);
-        mCamera->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT, osg::Camera::PIXEL_BUFFER_RTT);
-        mCamera->setClearColor(osg::Vec4(0.f, 0.f, 0.f, 0.f));
-        mCamera->setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-        mCamera->setViewport(0, 0, sizeX, sizeY);
-        mCamera->setRenderOrder(osg::Camera::PRE_RENDER);
-        mCamera->attach(osg::Camera::COLOR_BUFFER, mTexture, 0, 0, false, Settings::Manager::getInt("antialiasing", "Video"));
-        mCamera->setName("CharacterPreview");
-        mCamera->setComputeNearFarMode(osg::Camera::COMPUTE_NEAR_FAR_USING_BOUNDING_VOLUMES);
-        mCamera->setCullMask(~(Mask_UpdateVisitor));
-
-        mCamera->setNodeMask(Mask_RenderToTexture);
-
-        SceneUtil::setCameraClearDepth(mCamera);
+        mRTTNode = new CharacterPreviewRTTNode(sizeX, sizeY);
+        mRTTNode->setNodeMask(Mask_RenderToTexture);
 
         bool ffp = mResourceSystem->getSceneManager()->getLightingMethod() == SceneUtil::LightingMethod::FFP;
 
@@ -191,14 +267,6 @@ namespace MWRender
         defaultMat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 0.f));
         stateset->setAttribute(defaultMat);
 
-        const float fovYDegrees = 12.3f;
-        const float aspectRatio = static_cast<float>(sizeX) / static_cast<float>(sizeY);
-        const float znear = 0.1f;
-        const float zfar = 10000.f;
-        mCamera->setProjectionMatrixAsPerspective(fovYDegrees, aspectRatio, znear, zfar);
-        osg::Matrixf projectionMatrix = SceneUtil::AutoDepth::isReversed() ? static_cast<osg::Matrixf>(SceneUtil::getReversedZProjectionMatrixAsPerspective(fovYDegrees, aspectRatio, znear, zfar)) : static_cast<osg::Matrixf>(mCamera->getProjectionMatrix());
-        stateset->addUniform(new osg::Uniform("projectionMatrix", projectionMatrix));
-
         SceneUtil::ShadowManager::disableShadowsForStateSet(stateset);
 
         // assign large value to effectively turn off fog
@@ -266,23 +334,22 @@ namespace MWRender
 
         lightManager->addChild(lightSource);
 
-        mCamera->addChild(lightManager);
+        mRTTNode->addChild(lightManager);
 
         mNode = new osg::PositionAttitudeTransform;
         lightManager->addChild(mNode);
 
-        mDrawOnceCallback = new DrawOnceCallback;
-        mCamera->addUpdateCallback(mDrawOnceCallback);
+        mDrawOnceCallback = new DrawOnceCallback(mRTTNode->mGroup);
+        mRTTNode->addUpdateCallback(mDrawOnceCallback);
 
-        mParent->addChild(mCamera);
+        mParent->addChild(mRTTNode);
 
         mCharacter.mCell = nullptr;
     }
 
     CharacterPreview::~CharacterPreview ()
     {
-        mCamera->removeChildren(0, mCamera->getNumChildren());
-        mParent->removeChild(mCamera);
+        mParent->removeChild(mRTTNode);
     }
 
     int CharacterPreview::getTextureWidth() const
@@ -308,7 +375,7 @@ namespace MWRender
 
     osg::ref_ptr<osg::Texture2D> CharacterPreview::getTexture()
     {
-        return mTexture;
+        return static_cast<osg::Texture2D*>(mRTTNode->getColorTexture(nullptr));
     }
 
     void CharacterPreview::rebuild()
@@ -325,7 +392,7 @@ namespace MWRender
 
     void CharacterPreview::redraw()
     {
-        mCamera->setNodeMask(Mask_RenderToTexture);
+        mRTTNode->setNodeMask(Mask_RenderToTexture);
         mDrawOnceCallback->redrawNextFrame();
     }
 
@@ -346,7 +413,7 @@ namespace MWRender
         osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
         mViewport = new osg::Viewport(0, mSizeY-sizeY, std::min(mSizeX, sizeX), std::min(mSizeY, sizeY));
         stateset->setAttributeAndModes(mViewport);
-        mCamera->setStateSet(stateset);
+        mRTTNode->setCameraStateset(stateset);
 
         redraw();
     }
@@ -433,10 +500,11 @@ namespace MWRender
         // Set the traversal number from the last draw, so that the frame switch used for RigGeometry double buffering works correctly
         visitor.setTraversalNumber(mDrawOnceCallback->getLastRenderedFrame());
 
-        osg::Node::NodeMask nodeMask = mCamera->getNodeMask();
-        mCamera->setNodeMask(~0u);
-        mCamera->accept(visitor);
-        mCamera->setNodeMask(nodeMask);
+        auto* camera = mRTTNode->getCamera(nullptr);
+        osg::Node::NodeMask nodeMask = camera->getNodeMask();
+        camera->setNodeMask(~0u);
+        camera->accept(visitor);
+        camera->setNodeMask(nodeMask);
 
         if (intersector->containsIntersections())
         {
@@ -459,7 +527,8 @@ namespace MWRender
 
         mNode->setScale(scale);
 
-        mCamera->setViewMatrixAsLookAt(mPosition * scale.z(), mLookAt * scale.z(), osg::Vec3f(0,0,1));
+        auto viewMatrix = osg::Matrixf::lookAt(mPosition * scale.z(), mLookAt * scale.z(), osg::Vec3f(0, 0, 1));
+        mRTTNode->setViewMatrix(viewMatrix);
     }
 
     // --------------------------------------------------------------------------------------------------
@@ -492,7 +561,7 @@ namespace MWRender
         rebuild();
     }
 
-    class UpdateCameraCallback : public SceneUtil::NodeCallback<UpdateCameraCallback, osg::Camera*>
+    class UpdateCameraCallback : public SceneUtil::NodeCallback<UpdateCameraCallback, CharacterPreviewRTTNode*>
     {
     public:
         UpdateCameraCallback(osg::ref_ptr<const osg::Node> nodeToFollow, const osg::Vec3& posOffset, const osg::Vec3& lookAtOffset)
@@ -502,10 +571,10 @@ namespace MWRender
         {
         }
 
-        void operator()(osg::Camera* cam, osg::NodeVisitor* nv)
+        void operator()(CharacterPreviewRTTNode* node, osg::NodeVisitor* nv)
         {
             // Update keyframe controllers in the scene graph first...
-            traverse(cam, nv);
+            traverse(node, nv);
 
             // Now update camera utilizing the updated head position
             osg::NodePathList nodepaths = mNodeToFollow->getParentalNodePaths();
@@ -514,7 +583,8 @@ namespace MWRender
             osg::Matrix worldMat = osg::computeLocalToWorld(nodepaths[0]);
             osg::Vec3 headOffset = worldMat.getTrans();
 
-            cam->setViewMatrixAsLookAt(headOffset + mPosOffset, headOffset + mLookAtOffset, osg::Vec3(0,0,1));
+            auto viewMatrix = osg::Matrixf::lookAt(headOffset + mPosOffset, headOffset + mLookAtOffset, osg::Vec3(0, 0, 1));
+            node->setViewMatrix(viewMatrix);
         }
 
     private:
@@ -531,13 +601,13 @@ namespace MWRender
 
         // attach camera to follow the head node
         if (mUpdateCameraCallback)
-            mCamera->removeUpdateCallback(mUpdateCameraCallback);
+            mRTTNode->removeUpdateCallback(mUpdateCameraCallback);
 
         const osg::Node* head = mAnimation->getNode("Bip01 Head");
         if (head)
         {
             mUpdateCameraCallback = new UpdateCameraCallback(head, mPosition, mLookAt);
-            mCamera->addUpdateCallback(mUpdateCameraCallback);
+            mRTTNode->addUpdateCallback(mUpdateCameraCallback);
         }
         else
             Log(Debug::Error) << "Error: Bip01 Head node not found";
diff --git a/apps/openmw/mwrender/characterpreview.hpp b/apps/openmw/mwrender/characterpreview.hpp
index 0d7c1959c3..a8777d8548 100644
--- a/apps/openmw/mwrender/characterpreview.hpp
+++ b/apps/openmw/mwrender/characterpreview.hpp
@@ -26,6 +26,7 @@ namespace MWRender
 
     class NpcAnimation;
     class DrawOnceCallback;
+    class CharacterPreviewRTTNode;
 
     class CharacterPreview
     {
@@ -56,10 +57,9 @@ namespace MWRender
 
         osg::ref_ptr<osg::Group> mParent;
         Resource::ResourceSystem* mResourceSystem;
-        osg::ref_ptr<osg::Texture2D> mTexture;
         osg::ref_ptr<osg::StateSet> mTextureStateSet;
-        osg::ref_ptr<osg::Camera> mCamera;
         osg::ref_ptr<DrawOnceCallback> mDrawOnceCallback;
+        osg::ref_ptr<CharacterPreviewRTTNode> mRTTNode;
 
         osg::Vec3f mPosition;
         osg::Vec3f mLookAt;
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index 98eebf0b75..2fd3c8b7f7 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -15,12 +15,14 @@
 #include <components/esm3/fogstate.hpp>
 #include <components/esm3/loadcell.hpp>
 #include <components/misc/constants.hpp>
+#include <components/stereo/multiview.hpp>
 #include <components/settings/settings.hpp>
 #include <components/sceneutil/visitor.hpp>
 #include <components/sceneutil/shadow.hpp>
 #include <components/sceneutil/depth.hpp>
 #include <components/sceneutil/lightmanager.hpp>
 #include <components/sceneutil/nodecallback.hpp>
+#include <components/sceneutil/rtt.hpp>
 #include <components/files/memorystream.hpp>
 #include <components/resource/scenemanager.hpp>
 
@@ -34,36 +36,6 @@
 
 namespace
 {
-
-    class CameraLocalUpdateCallback : public SceneUtil::NodeCallback<CameraLocalUpdateCallback, osg::Camera*>
-    {
-    public:
-        CameraLocalUpdateCallback(MWRender::LocalMap* parent)
-            : mRendered(false)
-            , mParent(parent)
-        {
-        }
-
-        void operator()(osg::Camera* node, osg::NodeVisitor*)
-        {
-            if (mRendered)
-                node->setNodeMask(0);
-
-            if (!mRendered)
-            {
-                mRendered = true;
-                mParent->markForRemoval(node);
-            }
-
-            // Note, we intentionally do not traverse children here. The map camera's scene data is the same as the master camera's,
-            // so it has been updated already.
-        }
-
-    private:
-        bool mRendered;
-        MWRender::LocalMap* mParent;
-    };
-
     float square(float val)
     {
         return val*val;
@@ -82,6 +54,28 @@ namespace
 
 namespace MWRender
 {
+    class LocalMapRenderToTexture: public SceneUtil::RTTNode
+    {
+    public:
+        LocalMapRenderToTexture(osg::Node* sceneRoot, int res, int mapWorldSize,
+            float x, float y, const osg::Vec3d& upVector, float zmin, float zmax);
+
+        void setDefaults(osg::Camera* camera) override;
+
+        bool isActive() { return mActive; }
+        void setIsActive(bool active) { mActive = active; }
+
+        osg::Node* mSceneRoot;
+        osg::Matrix mProjectionMatrix;
+        osg::Matrix mViewMatrix;
+        bool mActive;
+    };
+
+    class CameraLocalUpdateCallback : public SceneUtil::NodeCallback<CameraLocalUpdateCallback, LocalMapRenderToTexture*>
+    {
+    public:
+        void operator()(LocalMapRenderToTexture* node, osg::NodeVisitor* nv);
+    };
 
 LocalMap::LocalMap(osg::Group* root)
     : mRoot(root)
@@ -104,10 +98,8 @@ LocalMap::LocalMap(osg::Group* root)
 
 LocalMap::~LocalMap()
 {
-    for (auto& camera : mActiveCameras)
-        removeCamera(camera);
-    for (auto& camera : mCamerasPendingRemoval)
-        removeCamera(camera);
+    for (auto& rtt : mLocalMapRTTs)
+        mRoot->removeChild(rtt);
 }
 
 const osg::Vec2f LocalMap::rotatePoint(const osg::Vec2f& point, const osg::Vec2f& center, const float angle)
@@ -173,93 +165,14 @@ void LocalMap::saveFogOfWar(MWWorld::CellStore* cell)
     }
 }
 
-osg::ref_ptr<osg::Camera> LocalMap::createOrthographicCamera(float x, float y, float width, float height, const osg::Vec3d& upVector, float zmin, float zmax)
-{
-    osg::ref_ptr<osg::Camera> camera (new osg::Camera);
-
-    if (SceneUtil::AutoDepth::isReversed())
-        camera->setProjectionMatrix(SceneUtil::getReversedZProjectionMatrixAsOrtho(-width/2, width/2, -height/2, height/2, 5, (zmax-zmin) + 10));
-    else
-        camera->setProjectionMatrixAsOrtho(-width/2, width/2, -height/2, height/2, 5, (zmax-zmin) + 10);
-
-    camera->setComputeNearFarMode(osg::Camera::DO_NOT_COMPUTE_NEAR_FAR);
-    camera->setViewMatrixAsLookAt(osg::Vec3d(x, y, zmax + 5), osg::Vec3d(x, y, zmin), upVector);
-    camera->setReferenceFrame(osg::Camera::ABSOLUTE_RF_INHERIT_VIEWPOINT);
-    camera->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT, osg::Camera::PIXEL_BUFFER_RTT);
-    camera->setClearColor(osg::Vec4(0.f, 0.f, 0.f, 1.f));
-    camera->setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
-    camera->setRenderOrder(osg::Camera::PRE_RENDER);
-
-    camera->setCullMask(Mask_Scene | Mask_SimpleWater | Mask_Terrain | Mask_Object | Mask_Static);
-    camera->setNodeMask(Mask_RenderToTexture);
-
-    // Disable small feature culling, it's not going to be reliable for this camera
-    osg::Camera::CullingMode cullingMode = (osg::Camera::DEFAULT_CULLING|osg::Camera::FAR_PLANE_CULLING) & ~(osg::Camera::SMALL_FEATURE_CULLING);
-    camera->setCullingMode(cullingMode);
-
-    SceneUtil::setCameraClearDepth(camera);
-
-    osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
-    stateset->setAttribute(new osg::PolygonMode(osg::PolygonMode::FRONT_AND_BACK, osg::PolygonMode::FILL), osg::StateAttribute::OVERRIDE);
-    stateset->addUniform(new osg::Uniform("projectionMatrix", static_cast<osg::Matrixf>(camera->getProjectionMatrix())), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
-
-    // assign large value to effectively turn off fog
-    // shaders don't respect glDisable(GL_FOG)
-    osg::ref_ptr<osg::Fog> fog (new osg::Fog);
-    fog->setStart(10000000);
-    fog->setEnd(10000000);
-    stateset->setAttributeAndModes(fog, osg::StateAttribute::OFF|osg::StateAttribute::OVERRIDE);
-
-    osg::ref_ptr<osg::LightModel> lightmodel = new osg::LightModel;
-    lightmodel->setAmbientIntensity(osg::Vec4(0.3f, 0.3f, 0.3f, 1.f));
-    stateset->setAttributeAndModes(lightmodel, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
-
-    osg::ref_ptr<osg::Light> light = new osg::Light;
-    light->setPosition(osg::Vec4(-0.3f, -0.3f, 0.7f, 0.f));
-    light->setDiffuse(osg::Vec4(0.7f, 0.7f, 0.7f, 1.f));
-    light->setAmbient(osg::Vec4(0,0,0,1));
-    light->setSpecular(osg::Vec4(0,0,0,0));
-    light->setLightNum(0);
-    light->setConstantAttenuation(1.f);
-    light->setLinearAttenuation(0.f);
-    light->setQuadraticAttenuation(0.f);
-
-    osg::ref_ptr<osg::LightSource> lightSource = new osg::LightSource;
-    lightSource->setLight(light);
-
-    lightSource->setStateSetModes(*stateset, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
-
-    SceneUtil::ShadowManager::disableShadowsForStateSet(stateset);
-
-    // override sun for local map 
-    SceneUtil::configureStateSetSunOverride(static_cast<SceneUtil::LightManager*>(mSceneRoot.get()), light, stateset);
-
-    camera->addChild(lightSource);
-    camera->setStateSet(stateset);
-    camera->setViewport(0, 0, mMapResolution, mMapResolution);
-    camera->setUpdateCallback(new CameraLocalUpdateCallback(this));
-
-    return camera;
-}
-
-void LocalMap::setupRenderToTexture(osg::ref_ptr<osg::Camera> camera, int x, int y)
+void LocalMap::setupRenderToTexture(int segment_x, int segment_y, float left, float top, const osg::Vec3d& upVector, float zmin, float zmax)
 {
-    osg::ref_ptr<osg::Texture2D> texture (new osg::Texture2D);
-    texture->setTextureSize(mMapResolution, mMapResolution);
-    texture->setInternalFormat(GL_RGB);
-    texture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
-    texture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
-    texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
-    texture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+    mLocalMapRTTs.emplace_back(new LocalMapRenderToTexture(mSceneRoot, mMapResolution, mMapWorldSize, left, top, upVector, zmin, zmax));
 
-    SceneUtil::attachAlphaToCoverageFriendlyFramebufferToCamera(camera, osg::Camera::COLOR_BUFFER, texture);
+    mRoot->addChild(mLocalMapRTTs.back());
 
-    camera->addChild(mSceneRoot);
-    mRoot->addChild(camera);
-    mActiveCameras.push_back(camera);
-
-    MapSegment& segment = mInterior? mInteriorSegments[std::make_pair(x, y)] : mExteriorSegments[std::make_pair(x, y)];
-    segment.mMapTexture = texture;
+    MapSegment& segment = mInterior? mInteriorSegments[std::make_pair(segment_x, segment_y)] : mExteriorSegments[std::make_pair(segment_x, segment_y)];
+    segment.mMapTexture = static_cast<osg::Texture2D*>(mLocalMapRTTs.back()->getColorTexture(nullptr));
 }
 
 void LocalMap::requestMap(const MWWorld::CellStore* cell)
@@ -321,33 +234,19 @@ osg::ref_ptr<osg::Texture2D> LocalMap::getFogOfWarTexture(int x, int y)
         return found->second.mFogOfWarTexture;
 }
 
-void LocalMap::removeCamera(osg::Camera *cam)
-{
-    cam->removeChildren(0, cam->getNumChildren());
-    mRoot->removeChild(cam);
-}
-
-void LocalMap::markForRemoval(osg::Camera *cam)
+void LocalMap::cleanupCameras()
 {
-    CameraVector::iterator found = std::find(mActiveCameras.begin(), mActiveCameras.end(), cam);
-    if (found == mActiveCameras.end())
+    auto it = mLocalMapRTTs.begin();
+    while (it != mLocalMapRTTs.end())
     {
-        Log(Debug::Error) << "Error: trying to remove an inactive camera";
-        return;
+        if (!(*it)->isActive())
+        {
+            mRoot->removeChild(*it);
+            it = mLocalMapRTTs.erase(it);
+        }
+        else
+            it++;
     }
-    mActiveCameras.erase(found);
-    mCamerasPendingRemoval.push_back(cam);
-}
-
-void LocalMap::cleanupCameras()
-{
-    if (mCamerasPendingRemoval.empty())
-        return;
-
-    for (auto& camera : mCamerasPendingRemoval)
-        removeCamera(camera);
-
-    mCamerasPendingRemoval.clear();
 }
 
 void LocalMap::requestExteriorMap(const MWWorld::CellStore* cell)
@@ -361,9 +260,9 @@ void LocalMap::requestExteriorMap(const MWWorld::CellStore* cell)
     float zmin = bound.center().z() - bound.radius();
     float zmax = bound.center().z() + bound.radius();
 
-    osg::ref_ptr<osg::Camera> camera = createOrthographicCamera(x*mMapWorldSize + mMapWorldSize/2.f, y*mMapWorldSize + mMapWorldSize/2.f, mMapWorldSize, mMapWorldSize,
-                                                                osg::Vec3d(0,1,0), zmin, zmax);
-    setupRenderToTexture(camera, cell->getCell()->getGridX(), cell->getCell()->getGridY());
+    setupRenderToTexture(cell->getCell()->getGridX(), cell->getCell()->getGridY(), 
+        x * mMapWorldSize + mMapWorldSize / 2.f, y * mMapWorldSize + mMapWorldSize / 2.f,
+        osg::Vec3d(0, 1, 0), zmin, zmax);
 
     MapSegment& segment = mExteriorSegments[std::make_pair(cell->getCell()->getGridX(), cell->getCell()->getGridY())];
     if (!segment.mFogOfWarImage)
@@ -501,11 +400,8 @@ void LocalMap::requestInteriorMap(const MWWorld::CellStore* cell)
 
             osg::Vec2f pos = osg::Vec2f(rotatedCenter.x(), rotatedCenter.y()) + center;
 
-            osg::ref_ptr<osg::Camera> camera = createOrthographicCamera(pos.x(), pos.y(),
-                                                                        mMapWorldSize, mMapWorldSize,
-                                                                        osg::Vec3f(north.x(), north.y(), 0.f), zMin, zMax);
-
-            setupRenderToTexture(camera, x, y);
+            setupRenderToTexture(x, y, pos.x(), pos.y(),
+                osg::Vec3f(north.x(), north.y(), 0.f), zMin, zMax);
 
             auto coords = std::make_pair(x,y);
             MapSegment& segment = mInteriorSegments[coords];
@@ -682,6 +578,7 @@ void LocalMap::MapSegment::createFogOfWarTexture()
     mFogOfWarTexture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
     mFogOfWarTexture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
     mFogOfWarTexture->setUnRefImageDataAfterApply(false);
+    mFogOfWarTexture->setImage(mFogOfWarImage);
 }
 
 void LocalMap::MapSegment::initFogOfWar()
@@ -697,7 +594,6 @@ void LocalMap::MapSegment::initFogOfWar()
     memcpy(mFogOfWarImage->data(), &data[0], data.size()*4);
 
     createFogOfWarTexture();
-    mFogOfWarTexture->setImage(mFogOfWarImage);
 }
 
 void LocalMap::MapSegment::loadFogOfWar(const ESM::FogTexture &esm)
@@ -730,7 +626,6 @@ void LocalMap::MapSegment::loadFogOfWar(const ESM::FogTexture &esm)
     mFogOfWarImage->dirty();
 
     createFogOfWarTexture();
-    mFogOfWarTexture->setImage(mFogOfWarImage);
     mHasFogState = true;
 }
 
@@ -762,4 +657,107 @@ void LocalMap::MapSegment::saveFogOfWar(ESM::FogTexture &fog) const
     fog.mImageData = std::vector<char>(data.begin(), data.end());
 }
 
+LocalMapRenderToTexture::LocalMapRenderToTexture(osg::Node* sceneRoot, int res, int mapWorldSize, float x, float y, const osg::Vec3d& upVector, float zmin, float zmax)
+    : RTTNode(res, res, 0, false, 0, StereoAwareness::Unaware_MultiViewShaders)
+    , mSceneRoot(sceneRoot)
+    , mActive(true)
+{
+    if (SceneUtil::AutoDepth::isReversed())
+        mProjectionMatrix = SceneUtil::getReversedZProjectionMatrixAsOrtho(-mapWorldSize / 2, mapWorldSize / 2, -mapWorldSize / 2, mapWorldSize / 2, 5, (zmax - zmin) + 10);
+    else
+        mProjectionMatrix.makeOrtho(-mapWorldSize / 2, mapWorldSize / 2, -mapWorldSize / 2, mapWorldSize / 2, 5, (zmax - zmin) + 10);
+
+    mViewMatrix.makeLookAt(osg::Vec3d(x, y, zmax + 5), osg::Vec3d(x, y, zmin), upVector);
+
+    setUpdateCallback(new CameraLocalUpdateCallback);
+}
+
+void LocalMapRenderToTexture::setDefaults(osg::Camera* camera)
+{
+    // Disable small feature culling, it's not going to be reliable for this camera
+    osg::Camera::CullingMode cullingMode = (osg::Camera::DEFAULT_CULLING | osg::Camera::FAR_PLANE_CULLING) & ~(osg::Camera::SMALL_FEATURE_CULLING);
+    camera->setCullingMode(cullingMode);
+
+    SceneUtil::setCameraClearDepth(camera);
+    camera->setComputeNearFarMode(osg::Camera::DO_NOT_COMPUTE_NEAR_FAR);
+    camera->setReferenceFrame(osg::Camera::ABSOLUTE_RF_INHERIT_VIEWPOINT);
+    camera->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT, osg::Camera::PIXEL_BUFFER_RTT);
+    camera->setClearColor(osg::Vec4(0.f, 0.f, 0.f, 1.f));
+    camera->setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+    camera->setRenderOrder(osg::Camera::PRE_RENDER);
+
+    camera->setCullMask(Mask_Scene | Mask_SimpleWater | Mask_Terrain | Mask_Object | Mask_Static);
+    camera->setCullMaskLeft(Mask_Scene | Mask_SimpleWater | Mask_Terrain | Mask_Object | Mask_Static);
+    camera->setCullMaskRight(Mask_Scene | Mask_SimpleWater | Mask_Terrain | Mask_Object | Mask_Static);
+    camera->setNodeMask(Mask_RenderToTexture);
+    camera->setProjectionMatrix(mProjectionMatrix);
+    camera->setViewMatrix(mViewMatrix);
+
+    auto* stateset = camera->getOrCreateStateSet();
+
+    stateset->setAttribute(new osg::PolygonMode(osg::PolygonMode::FRONT_AND_BACK, osg::PolygonMode::FILL), osg::StateAttribute::OVERRIDE);
+    stateset->addUniform(new osg::Uniform("projectionMatrix", static_cast<osg::Matrixf>(mProjectionMatrix)), osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+
+    if (Stereo::getMultiview())
+    {
+        auto* viewUniform = new osg::Uniform(osg::Uniform::FLOAT_MAT4, "viewMatrixMultiView", 2);
+        auto* projUniform = new osg::Uniform(osg::Uniform::FLOAT_MAT4, "projectionMatrixMultiView", 2);
+        viewUniform->setElement(0, osg::Matrix::identity());
+        viewUniform->setElement(1, osg::Matrix::identity());
+        projUniform->setElement(0, mProjectionMatrix);
+        projUniform->setElement(1, mProjectionMatrix);
+        stateset->addUniform(viewUniform, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+        stateset->addUniform(projUniform, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+    }
+
+    // assign large value to effectively turn off fog
+    // shaders don't respect glDisable(GL_FOG)
+    osg::ref_ptr<osg::Fog> fog(new osg::Fog);
+    fog->setStart(10000000);
+    fog->setEnd(10000000);
+    stateset->setAttributeAndModes(fog, osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE);
+
+    osg::ref_ptr<osg::LightModel> lightmodel = new osg::LightModel;
+    lightmodel->setAmbientIntensity(osg::Vec4(0.3f, 0.3f, 0.3f, 1.f));
+    stateset->setAttributeAndModes(lightmodel, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+
+    osg::ref_ptr<osg::Light> light = new osg::Light;
+    light->setPosition(osg::Vec4(-0.3f, -0.3f, 0.7f, 0.f));
+    light->setDiffuse(osg::Vec4(0.7f, 0.7f, 0.7f, 1.f));
+    light->setAmbient(osg::Vec4(0, 0, 0, 1));
+    light->setSpecular(osg::Vec4(0, 0, 0, 0));
+    light->setLightNum(0);
+    light->setConstantAttenuation(1.f);
+    light->setLinearAttenuation(0.f);
+    light->setQuadraticAttenuation(0.f);
+
+    osg::ref_ptr<osg::LightSource> lightSource = new osg::LightSource;
+    lightSource->setLight(light);
+
+    lightSource->setStateSetModes(*stateset, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+
+    SceneUtil::ShadowManager::disableShadowsForStateSet(stateset);
+
+    // override sun for local map 
+    SceneUtil::configureStateSetSunOverride(static_cast<SceneUtil::LightManager*>(mSceneRoot), light, stateset);
+
+    camera->addChild(lightSource);
+    camera->addChild(mSceneRoot);
+}
+
+void CameraLocalUpdateCallback::operator()(LocalMapRenderToTexture* node, osg::NodeVisitor* nv)
+{
+    if (!node->isActive())
+        node->setNodeMask(0);
+
+    if (node->isActive())
+    {
+        node->setIsActive(false);
+    }
+
+    // Rtt-nodes do not forward update traversal to their cameras so we can traverse safely.
+    // Traverse in case there are nested callbacks.
+    traverse(node, nv);
+}
+
 }
diff --git a/apps/openmw/mwrender/localmap.hpp b/apps/openmw/mwrender/localmap.hpp
index f9ccd5a011..911671aee2 100644
--- a/apps/openmw/mwrender/localmap.hpp
+++ b/apps/openmw/mwrender/localmap.hpp
@@ -30,6 +30,8 @@ namespace osg
 
 namespace MWRender
 {
+    class LocalMapRenderToTexture;
+
     ///
     /// \brief Local map rendering
     ///
@@ -58,13 +60,6 @@ namespace MWRender
 
         osg::ref_ptr<osg::Texture2D> getFogOfWarTexture (int x, int y);
 
-        void removeCamera(osg::Camera* cam);
-
-        /**
-         * Indicates a camera has been queued for rendering and can be cleaned up in the next frame. For internal use only.
-         */
-        void markForRemoval(osg::Camera* cam);
-
         /**
          * Removes cameras that have already been rendered. Should be called every frame to ensure that
          * we do not render the same map more than once. Note, this cleanup is difficult to implement in an
@@ -104,11 +99,8 @@ namespace MWRender
         osg::ref_ptr<osg::Group> mRoot;
         osg::ref_ptr<osg::Node> mSceneRoot;
 
-        typedef std::vector< osg::ref_ptr<osg::Camera> > CameraVector;
-
-        CameraVector mActiveCameras;
-
-        CameraVector mCamerasPendingRemoval;
+        typedef std::vector< osg::ref_ptr<LocalMapRenderToTexture> > RTTVector;
+        RTTVector mLocalMapRTTs;
 
         typedef std::set<std::pair<int, int> > Grid;
         Grid mCurrentGrid;
@@ -152,8 +144,7 @@ namespace MWRender
         void requestExteriorMap(const MWWorld::CellStore* cell);
         void requestInteriorMap(const MWWorld::CellStore* cell);
 
-        osg::ref_ptr<osg::Camera> createOrthographicCamera(float left, float top, float width, float height, const osg::Vec3d& upVector, float zmin, float zmax);
-        void setupRenderToTexture(osg::ref_ptr<osg::Camera> camera, int x, int y);
+        void setupRenderToTexture(int segment_x, int segment_y, float left, float top, const osg::Vec3d& upVector, float zmin, float zmax);
 
         bool mInterior;
         osg::BoundingBox mBounds;
diff --git a/apps/openmw/mwrender/postprocessor.cpp b/apps/openmw/mwrender/postprocessor.cpp
index afdec4f1b5..9fbc5de528 100644
--- a/apps/openmw/mwrender/postprocessor.cpp
+++ b/apps/openmw/mwrender/postprocessor.cpp
@@ -6,15 +6,20 @@
 #include <osg/Camera>
 #include <osg/Callback>
 #include <osg/Texture2D>
+#include <osg/Texture2DArray>
 #include <osg/FrameBufferObject>
 
 #include <osgViewer/Viewer>
 
 #include <components/settings/settings.hpp>
 #include <components/sceneutil/depth.hpp>
+#include <components/sceneutil/color.hpp>
 #include <components/sceneutil/nodecallback.hpp>
 #include <components/debug/debuglog.hpp>
 
+#include <components/stereo/multiview.hpp>
+#include <components/stereo/stereomanager.hpp>
+
 #include "vismask.hpp"
 
 namespace
@@ -38,8 +43,8 @@ namespace
     class CullCallback : public SceneUtil::NodeCallback<CullCallback, osg::Node*, osgUtil::CullVisitor*>
     {
     public:
-        CullCallback()
-            : mLastFrameNumber(0)
+        CullCallback(MWRender::PostProcessor* pp)
+            : mPostProcessor(pp)
         {
         }
 
@@ -47,36 +52,21 @@ namespace
         {
             osgUtil::RenderStage* renderStage = cv->getCurrentRenderStage();
 
-            unsigned int frame = cv->getTraversalNumber();
-            if (frame != mLastFrameNumber)
+            if (!mPostProcessor->getMsaaFbo())
             {
-                mLastFrameNumber = frame;
-
-                MWRender::PostProcessor* postProcessor = dynamic_cast<MWRender::PostProcessor*>(cv->getCurrentCamera()->getUserData());
-
-                if (!postProcessor)
-                {
-                    Log(Debug::Error) << "Failed retrieving user data for master camera: FBO setup failed";
-                    traverse(node, cv);
-                    return;
-                }
-
-                if (!postProcessor->getMsaaFbo())
-                {
-                    renderStage->setFrameBufferObject(postProcessor->getFbo());
-                }
-                else
-                {
-                    renderStage->setMultisampleResolveFramebufferObject(postProcessor->getFbo());
-                    renderStage->setFrameBufferObject(postProcessor->getMsaaFbo());
-                }
+                renderStage->setFrameBufferObject(mPostProcessor->getFbo());
+            }
+            else
+            {
+                renderStage->setMultisampleResolveFramebufferObject(mPostProcessor->getFbo());
+                renderStage->setFrameBufferObject(mPostProcessor->getMsaaFbo());
             }
 
             traverse(node, cv);
         }
 
     private:
-        unsigned int mLastFrameNumber;
+        MWRender::PostProcessor* mPostProcessor;
     };
 
     struct ResizedCallback : osg::GraphicsContext::ResizedCallback
@@ -157,15 +147,13 @@ namespace MWRender
     PostProcessor::PostProcessor(osgViewer::Viewer* viewer, osg::Group* rootNode)
         : mViewer(viewer)
         , mRootNode(new osg::Group)
-        , mDepthFormat(GL_DEPTH24_STENCIL8_EXT)
     {
         bool softParticles = Settings::Manager::getBool("soft particles", "Shaders");
 
-        if (!SceneUtil::AutoDepth::isReversed() && !softParticles)
+        if (!SceneUtil::AutoDepth::isReversed() && !softParticles && !Stereo::getStereo())
             return;
 
         osg::GraphicsContext* gc = viewer->getCamera()->getGraphicsContext();
-        unsigned int contextID = gc->getState()->getContextID();
         osg::GLExtensions* ext = gc->getState()->get<osg::GLExtensions>();
 
         constexpr char errPreamble[] = "Postprocessing and floating point depth buffers disabled: ";
@@ -184,24 +172,19 @@ namespace MWRender
 
         if (SceneUtil::AutoDepth::isReversed())
         {
-            if (osg::isGLExtensionSupported(contextID, "GL_ARB_depth_buffer_float"))
-                mDepthFormat = GL_DEPTH32F_STENCIL8;
-            else if (osg::isGLExtensionSupported(contextID, "GL_NV_depth_buffer_float"))
-                mDepthFormat = GL_DEPTH32F_STENCIL8_NV;
-            else
+            if(SceneUtil::AutoDepth::depthSourceType() != GL_FLOAT_32_UNSIGNED_INT_24_8_REV)
             {
                 // TODO: Once we have post-processing implemented we want to skip this return and continue with setup.
                 // Rendering to a FBO to fullscreen geometry has overhead (especially when MSAA is enabled) and there are no
                 // benefits if no floating point depth formats are supported.
-                Log(Debug::Warning) << errPreamble << "'GL_ARB_depth_buffer_float' and 'GL_NV_depth_buffer_float' unsupported.";
-
-                if (!softParticles)
+                if (!softParticles && !Stereo::getStereo())
                     return;
             }
         }
 
-        int width = viewer->getCamera()->getViewport()->width();
-        int height = viewer->getCamera()->getViewport()->height();
+        auto* traits = gc->getTraits();
+        int width = traits->width;
+        int height = traits->height;
 
         createTexturesAndCamera(width, height);
         resize(width, height);
@@ -210,15 +193,17 @@ namespace MWRender
         mRootNode->addChild(rootNode);
         mViewer->setSceneData(mRootNode);
 
-        // We need to manually set the FBO and resolve FBO during the cull callback. If we were using a separate
-        // RTT camera this would not be needed.
-        mViewer->getCamera()->addCullCallback(new CullCallback);
-        mViewer->getCamera()->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT);
-        mViewer->getCamera()->attach(osg::Camera::COLOR_BUFFER0, mSceneTex);
+        if (!Stereo::getStereo())
+        {
+            // We need to manually set the FBO and resolve FBO during the cull callback. If we were using a separate
+            // RTT camera this would not be needed.
+            mViewer->getCamera()->addCullCallback(new CullCallback(this));
+            mViewer->getCamera()->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT);
+            mViewer->getCamera()->attach(osg::Camera::COLOR_BUFFER0, mSceneTex);
         mViewer->getCamera()->attach(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, mDepthTex);
+        }
 
         mViewer->getCamera()->getGraphicsContext()->setResizedCallback(new ResizedCallback(this));
-        mViewer->getCamera()->setUserData(this);
     }
 
     void PostProcessor::resize(int width, int height)
@@ -260,15 +245,89 @@ namespace MWRender
 
         mViewer->getCamera()->resize(width, height);
         mHUDCamera->resize(width, height);
+
+        if (Stereo::getStereo())
+            Stereo::Manager::instance().screenResolutionChanged();
     }
 
+    class HUDCameraStatesetUpdater final : public SceneUtil::StateSetUpdater
+    {
+    public:
+    public:
+        HUDCameraStatesetUpdater(osg::ref_ptr<osg::Camera> HUDCamera, osg::ref_ptr<osg::Program> program, osg::ref_ptr<osg::Texture2D> sceneTex)
+            : mHUDCamera(HUDCamera)
+            , mProgram(program)
+            , mSceneTex(sceneTex)
+        {
+        }
+
+        void setDefaults(osg::StateSet* stateset) override
+        {
+            stateset->setTextureAttributeAndModes(0, mSceneTex, osg::StateAttribute::ON);
+            stateset->setAttributeAndModes(mProgram, osg::StateAttribute::ON);
+            stateset->addUniform(new osg::Uniform("sceneTex", 0));
+            stateset->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+            stateset->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
+
+            if (osg::DisplaySettings::instance()->getStereo())
+            {
+                stateset->setAttribute(new osg::Viewport);
+                stateset->addUniform(new osg::Uniform("viewportIndex", 0));
+            }
+        }
+
+        void apply(osg::StateSet* stateset, osg::NodeVisitor* nv) override
+        {
+            if (Stereo::getMultiview())
+            {
+                auto& multiviewFbo = Stereo::Manager::instance().multiviewFramebuffer();
+                stateset->setTextureAttributeAndModes(0, multiviewFbo->multiviewColorBuffer(), osg::StateAttribute::ON);
+            }
+        }
+
+        void applyLeft(osg::StateSet* stateset, osgUtil::CullVisitor* cv) override
+        {
+            auto& multiviewFbo = Stereo::Manager::instance().multiviewFramebuffer();
+            stateset->setTextureAttributeAndModes(0, multiviewFbo->layerColorBuffer(0), osg::StateAttribute::ON);
+
+            auto viewport = static_cast<osg::Viewport*>(stateset->getAttribute(osg::StateAttribute::VIEWPORT));
+            auto fullViewport = mHUDCamera->getViewport();
+            viewport->setViewport(
+                0,
+                0,
+                fullViewport->width() / 2,
+                fullViewport->height()
+            );
+        }
+
+        void applyRight(osg::StateSet* stateset, osgUtil::CullVisitor* cv) override
+        {
+            auto& multiviewFbo = Stereo::Manager::instance().multiviewFramebuffer();
+            stateset->setTextureAttributeAndModes(0, multiviewFbo->layerColorBuffer(1), osg::StateAttribute::ON);
+
+            auto viewport = static_cast<osg::Viewport*>(stateset->getAttribute(osg::StateAttribute::VIEWPORT));
+            auto fullViewport = mHUDCamera->getViewport();
+            viewport->setViewport(
+                fullViewport->width() / 2,
+                0,
+                fullViewport->width() / 2,
+                fullViewport->height()
+            );
+        }
+
+    private:
+        osg::ref_ptr<osg::Camera> mHUDCamera;
+        osg::ref_ptr<osg::Program> mProgram;
+        osg::ref_ptr<osg::Texture2D> mSceneTex;
+    };
+
     void PostProcessor::createTexturesAndCamera(int width, int height)
     {
         mDepthTex = new osg::Texture2D;
         mDepthTex->setTextureSize(width, height);
-        mDepthTex->setSourceFormat(GL_DEPTH_STENCIL_EXT);
-        mDepthTex->setSourceType(SceneUtil::isFloatingPointDepthFormat(getDepthFormat()) ? GL_FLOAT_32_UNSIGNED_INT_24_8_REV : GL_UNSIGNED_INT_24_8_EXT);
-        mDepthTex->setInternalFormat(mDepthFormat);
+        mDepthTex->setSourceFormat(SceneUtil::AutoDepth::depthSourceFormat());
+        mDepthTex->setSourceType(SceneUtil::AutoDepth::depthSourceType());
+        mDepthTex->setInternalFormat(SceneUtil::AutoDepth::depthInternalFormat());
         mDepthTex->setFilter(osg::Texture2D::MIN_FILTER, osg::Texture2D::NEAREST);
         mDepthTex->setFilter(osg::Texture2D::MAG_FILTER, osg::Texture2D::NEAREST);
         mDepthTex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
@@ -283,9 +342,9 @@ namespace MWRender
 
         mSceneTex = new osg::Texture2D;
         mSceneTex->setTextureSize(width, height);
-        mSceneTex->setSourceFormat(GL_RGB);
-        mSceneTex->setSourceType(GL_UNSIGNED_BYTE);
-        mSceneTex->setInternalFormat(GL_RGB);
+        mSceneTex->setSourceFormat(SceneUtil::Color::colorSourceFormat());
+        mSceneTex->setSourceType(SceneUtil::Color::colorSourceType());
+        mSceneTex->setInternalFormat(SceneUtil::Color::colorInternalFormat());
         mSceneTex->setFilter(osg::Texture2D::MIN_FILTER, osg::Texture2D::NEAREST);
         mSceneTex->setFilter(osg::Texture2D::MAG_FILTER, osg::Texture2D::NEAREST);
         mSceneTex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
@@ -296,6 +355,7 @@ namespace MWRender
         mHUDCamera->setReferenceFrame(osg::Camera::ABSOLUTE_RF);
         mHUDCamera->setRenderOrder(osg::Camera::POST_RENDER);
         mHUDCamera->setClearColor(osg::Vec4(0.45, 0.45, 0.14, 1.0));
+        mHUDCamera->setClearMask(0);
         mHUDCamera->setProjectionMatrix(osg::Matrix::ortho2D(0, 1, 0, 1));
         mHUDCamera->setAllowEventFocus(false);
         mHUDCamera->setViewport(0, 0, width, height);
@@ -325,8 +385,28 @@ namespace MWRender
             }
         )GLSL";
 
+        constexpr char fragSrcMultiview[] = R"GLSL(
+            #version 330 compatibility
+
+            #extension GL_EXT_texture_array : require
+
+            varying vec2 uv;
+            uniform sampler2DArray sceneTex;
+
+            void main()
+            {
+                vec3 array_uv = vec3(uv.x * 2, uv.y, 0);
+                if(array_uv.x >= 1.0)
+                {
+                    array_uv.x -= 1.0;
+                    array_uv.z = 1;
+                }
+                gl_FragData[0] = texture2DArray(sceneTex, array_uv);
+            }
+        )GLSL";
+
         osg::ref_ptr<osg::Shader> vertShader = new osg::Shader(osg::Shader::VERTEX, vertSrc);
-        osg::ref_ptr<osg::Shader> fragShader = new osg::Shader(osg::Shader::FRAGMENT, fragSrc);
+        osg::ref_ptr<osg::Shader> fragShader = new osg::Shader(osg::Shader::FRAGMENT, Stereo::getMultiview() ? fragSrcMultiview : fragSrc);
 
         osg::ref_ptr<osg::Program> program = new osg::Program;
         program->addShader(vertShader);
@@ -334,13 +414,8 @@ namespace MWRender
 
         mHUDCamera->addChild(createFullScreenTri());
         mHUDCamera->setNodeMask(Mask_RenderToTexture);
-
-        auto* stateset = mHUDCamera->getOrCreateStateSet();
-        stateset->setTextureAttributeAndModes(0, mSceneTex, osg::StateAttribute::ON);
-        stateset->setAttributeAndModes(program, osg::StateAttribute::ON);
-        stateset->addUniform(new osg::Uniform("sceneTex", 0));
-        stateset->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
-        stateset->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
+        mHUDCamera->setCullCallback(new HUDCameraStatesetUpdater(mHUDCamera, program, mSceneTex));
     }
 
 }
+
diff --git a/apps/openmw/mwrender/postprocessor.hpp b/apps/openmw/mwrender/postprocessor.hpp
index f2ef238737..b1217b011b 100644
--- a/apps/openmw/mwrender/postprocessor.hpp
+++ b/apps/openmw/mwrender/postprocessor.hpp
@@ -7,11 +7,18 @@
 #include <osg/Camera>
 #include <osg/ref_ptr>
 
+#include <memory>
+
 namespace osgViewer
 {
     class Viewer;
 }
 
+namespace Stereo
+{
+    class MultiviewFramebuffer;
+}
+
 namespace MWRender
 {
     class PostProcessor : public osg::Referenced
@@ -23,7 +30,6 @@ namespace MWRender
         auto getFbo() { return mFbo; }
         auto getFirstPersonRBProxy() { return mFirstPersonDepthRBProxy; }
 
-        int getDepthFormat() { return mDepthFormat; }
         osg::ref_ptr<osg::Texture2D> getOpaqueDepthTex() { return mOpaqueDepthTex; }
 
         void resize(int width, int height);
@@ -35,6 +41,7 @@ namespace MWRender
         osg::ref_ptr<osg::Group> mRootNode;
         osg::ref_ptr<osg::Camera> mHUDCamera;
 
+        std::shared_ptr<Stereo::MultiviewFramebuffer> mMultiviewFbo;
         osg::ref_ptr<osg::FrameBufferObject> mMsaaFbo;
         osg::ref_ptr<osg::FrameBufferObject> mFbo;
         osg::ref_ptr<osg::RenderBuffer> mFirstPersonDepthRBProxy;
@@ -42,9 +49,8 @@ namespace MWRender
         osg::ref_ptr<osg::Texture2D> mSceneTex;
         osg::ref_ptr<osg::Texture2D> mDepthTex;
         osg::ref_ptr<osg::Texture2D> mOpaqueDepthTex;
-
-        int mDepthFormat;
     };
 }
 
-#endif
\ No newline at end of file
+#endif
+
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 384580adb8..15d690534a 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -21,6 +21,9 @@
 
 #include <components/debug/debuglog.hpp>
 
+#include <components/stereo/stereomanager.hpp>
+#include <components/stereo/multiview.hpp>
+
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/imagemanager.hpp>
 #include <components/resource/keyframemanager.hpp>
@@ -31,6 +34,7 @@
 #include <components/settings/settings.hpp>
 
 #include <components/sceneutil/depth.hpp>
+#include <components/sceneutil/visitor.hpp>
 #include <components/sceneutil/lightmanager.hpp>
 #include <components/sceneutil/statesetupdater.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
@@ -45,6 +49,7 @@
 
 #include <components/detournavigator/navigator.hpp>
 
+#include "../mwbase/windowmanager.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/groundcoverstore.hpp"
@@ -70,6 +75,54 @@
 
 namespace MWRender
 {
+    class PerViewUniformStateUpdater final : public SceneUtil::StateSetUpdater
+    {
+    public:
+    public:
+        PerViewUniformStateUpdater()
+        {
+        }
+
+        void setDefaults(osg::StateSet* stateset) override
+        {
+            stateset->addUniform(new osg::Uniform("projectionMatrix", osg::Matrixf{}));
+        }
+
+        void apply(osg::StateSet* stateset, osg::NodeVisitor* nv) override
+        {
+            auto* uProjectionMatrix = stateset->getUniform("projectionMatrix");
+            if (uProjectionMatrix)
+                uProjectionMatrix->set(mProjectionMatrix);
+        }
+
+        void applyLeft(osg::StateSet* stateset, osgUtil::CullVisitor* nv) override
+        {
+            auto* uProjectionMatrix = stateset->getUniform("projectionMatrix");
+            if (uProjectionMatrix)
+                uProjectionMatrix->set(Stereo::Manager::instance().computeEyeProjection(0, SceneUtil::AutoDepth::isReversed()));
+        }
+
+        void applyRight(osg::StateSet* stateset, osgUtil::CullVisitor* nv) override
+        {
+            auto* uProjectionMatrix = stateset->getUniform("projectionMatrix");
+            if (uProjectionMatrix)
+                uProjectionMatrix->set(Stereo::Manager::instance().computeEyeProjection(1, SceneUtil::AutoDepth::isReversed()));
+        }
+
+        void setProjectionMatrix(const osg::Matrixf& projectionMatrix)
+        {
+            mProjectionMatrix = projectionMatrix;
+        }
+
+        const osg::Matrixf& projectionMatrix() const
+        {
+            return mProjectionMatrix;
+        }
+
+    private:
+        osg::Matrixf mProjectionMatrix;
+    };
+
     class SharedUniformStateUpdater : public SceneUtil::StateSetUpdater
     {
     public:
@@ -82,9 +135,8 @@ namespace MWRender
         {
         }
 
-        void setDefaults(osg::StateSet *stateset) override
+        void setDefaults(osg::StateSet* stateset) override
         {
-            stateset->addUniform(new osg::Uniform("projectionMatrix", osg::Matrixf{}));
             stateset->addUniform(new osg::Uniform("linearFac", 0.f));
             stateset->addUniform(new osg::Uniform("near", 0.f));
             stateset->addUniform(new osg::Uniform("far", 0.f));
@@ -98,10 +150,6 @@ namespace MWRender
 
         void apply(osg::StateSet* stateset, osg::NodeVisitor* nv) override
         {
-            auto* uProjectionMatrix = stateset->getUniform("projectionMatrix");
-            if (uProjectionMatrix)
-                uProjectionMatrix->set(mProjectionMatrix);
-
             auto* uLinearFac = stateset->getUniform("linearFac");
             if (uLinearFac)
                 uLinearFac->set(mLinearFac);
@@ -130,11 +178,6 @@ namespace MWRender
             }
         }
 
-        void setProjectionMatrix(const osg::Matrixf& projectionMatrix)
-        {
-            mProjectionMatrix = projectionMatrix;
-        }
-
         void setLinearFac(float linearFac)
         {
             mLinearFac = linearFac;
@@ -167,7 +210,6 @@ namespace MWRender
 
 
     private:
-        osg::Matrixf mProjectionMatrix;
         float mLinearFac;
         float mNear;
         float mFar;
@@ -312,14 +354,16 @@ namespace MWRender
         auto lightingMethod = SceneUtil::LightManager::getLightingMethodFromString(Settings::Manager::getString("lighting method", "Shaders"));
 
         resourceSystem->getSceneManager()->setParticleSystemMask(MWRender::Mask_ParticleSystem);
-        // Shadows and radial fog have problems with fixed-function mode
+        // Shadows and radial fog have problems with fixed-function mode.
         bool forceShaders = Settings::Manager::getBool("radial fog", "Shaders")
                             || Settings::Manager::getBool("soft particles", "Shaders")
                             || Settings::Manager::getBool("force shaders", "Shaders")
                             || Settings::Manager::getBool("enable shadows", "Shadows")
                             || lightingMethod != SceneUtil::LightingMethod::FFP
-                            || reverseZ;
+                            || reverseZ
+                            || Stereo::getMultiview();
         resourceSystem->getSceneManager()->setForceShaders(forceShaders);
+         
         // FIXME: calling dummy method because terrain needs to know whether lighting is clamped
         resourceSystem->getSceneManager()->setClampLighting(Settings::Manager::getBool("clamp lighting", "Shaders"));
         resourceSystem->getSceneManager()->setAutoUseNormalMaps(Settings::Manager::getBool("auto use object normal maps", "Shaders"));
@@ -368,6 +412,9 @@ namespace MWRender
         globalDefines["preLightEnv"] = Settings::Manager::getBool("apply lighting to environment maps", "Shaders") ? "1" : "0";
         globalDefines["radialFog"] = Settings::Manager::getBool("radial fog", "Shaders") ? "1" : "0";
         globalDefines["useGPUShader4"] = "0";
+        globalDefines["GLSLVersion"] = "120";
+        globalDefines["useOVR_multiview"] = "0";
+        globalDefines["numViews"] = "1";
 
         for (auto itr = lightDefines.begin(); itr != lightDefines.end(); itr++)
             globalDefines[itr->first] = itr->second;
@@ -453,16 +500,19 @@ namespace MWRender
         mSharedUniformStateUpdater = new SharedUniformStateUpdater(groundcover);
         rootNode->addUpdateCallback(mSharedUniformStateUpdater);
 
+        mPerViewUniformStateUpdater = new PerViewUniformStateUpdater();
+        rootNode->addCullCallback(mPerViewUniformStateUpdater);
+
         mPostProcessor = new PostProcessor(viewer, mRootNode);
-        resourceSystem->getSceneManager()->setDepthFormat(mPostProcessor->getDepthFormat());
+        resourceSystem->getSceneManager()->setDepthFormat(SceneUtil::AutoDepth::depthInternalFormat());
         resourceSystem->getSceneManager()->setOpaqueDepthTex(mPostProcessor->getOpaqueDepthTex());
 
-        if (reverseZ && !SceneUtil::isFloatingPointDepthFormat(mPostProcessor->getDepthFormat()))
+        if (reverseZ && !SceneUtil::isFloatingPointDepthFormat(SceneUtil::AutoDepth::depthInternalFormat()))
             Log(Debug::Warning) << "Floating point depth format not in use but reverse-z buffer is enabled, consider disabling it.";
 
         // water goes after terrain for correct waterculling order
         mWater.reset(new Water(sceneRoot->getParent(0), sceneRoot, mResourceSystem, mViewer->getIncrementalCompileOperation(), resourcePath));
-
+        
         mCamera.reset(new Camera(mViewer->getCamera()));
 
         mScreenshotManager.reset(new ScreenshotManager(viewer, mRootNode, sceneRoot, mResourceSystem, mWater.get()));
@@ -514,7 +564,8 @@ namespace MWRender
         mViewer->getCamera()->setComputeNearFarMode(osg::Camera::DO_NOT_COMPUTE_NEAR_FAR);
         mViewer->getCamera()->setCullingMode(cullingMode);
 
-        mViewer->getCamera()->setCullMask(~(Mask_UpdateVisitor|Mask_SimpleWater));
+        auto mask = ~(Mask_UpdateVisitor | Mask_SimpleWater);
+        MWBase::Environment::get().getWindowManager()->setCullMask(mask);
         NifOsg::Loader::setHiddenNodeMask(Mask_UpdateVisitor);
         NifOsg::Loader::setIntersectionDisabledNodeMask(Mask_Effect);
         Nif::NIFFile::setLoadUnsupportedFiles(Settings::Manager::getBool("load unsupported nif files", "Models"));
@@ -537,6 +588,7 @@ namespace MWRender
 
         SceneUtil::setCameraClearDepth(mViewer->getCamera());
 
+
         updateProjectionMatrix();
 
         mViewer->getCamera()->setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
@@ -753,14 +805,15 @@ namespace MWRender
         }
         else if (mode == Render_Scene)
         {
-            unsigned int mask = mViewer->getCamera()->getCullMask();
+            auto* wm = MWBase::Environment::get().getWindowManager();
+            unsigned int mask = wm->getCullMask();
             bool enabled = !(mask&sToggleWorldMask);
             if (enabled)
                 mask |= sToggleWorldMask;
             else
                 mask &= ~sToggleWorldMask;
             mWater->showWorld(enabled);
-            mViewer->getCamera()->setCullMask(mask);
+            wm->setCullMask(mask);
             return enabled;
         }
         else if (mode == Render_NavMesh)
@@ -1155,14 +1208,23 @@ namespace MWRender
         if (SceneUtil::AutoDepth::isReversed())
         {
             mSharedUniformStateUpdater->setLinearFac(-mNearClip / (mViewDistance - mNearClip) - 1.f);
-            mSharedUniformStateUpdater->setProjectionMatrix(SceneUtil::getReversedZProjectionMatrixAsPerspective(fov, aspect, mNearClip, mViewDistance));
+            mPerViewUniformStateUpdater->setProjectionMatrix(SceneUtil::getReversedZProjectionMatrixAsPerspective(fov, aspect, mNearClip, mViewDistance));
         }
         else
-            mSharedUniformStateUpdater->setProjectionMatrix(mViewer->getCamera()->getProjectionMatrix());
+            mPerViewUniformStateUpdater->setProjectionMatrix(mViewer->getCamera()->getProjectionMatrix());
 
         mSharedUniformStateUpdater->setNear(mNearClip);
         mSharedUniformStateUpdater->setFar(mViewDistance);
-        mSharedUniformStateUpdater->setScreenRes(width, height);
+        if (Stereo::getStereo())
+        {
+            auto res = Stereo::Manager::instance().eyeResolution();
+            mSharedUniformStateUpdater->setScreenRes(res.x(), res.y());
+            Stereo::Manager::instance().setMasterProjectionMatrix(mPerViewUniformStateUpdater->projectionMatrix());
+        }
+        else
+        {
+            mSharedUniformStateUpdater->setScreenRes(width, height);
+        }
 
         // Since our fog is not radial yet, we should take FOV in account, otherwise terrain near viewing distance may disappear.
         // Limit FOV here just for sure, otherwise viewing distance can be too high.
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index b25e675748..fe3b33b20e 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -76,6 +76,7 @@ namespace MWRender
 {
     class StateUpdater;
     class SharedUniformStateUpdater;
+    class PerViewUniformStateUpdater;
 
     class EffectManager;
     class ScreenshotManager;
@@ -97,7 +98,7 @@ namespace MWRender
     class RenderingManager : public MWRender::RenderingInterface
     {
     public:
-        RenderingManager(osgViewer::Viewer* viewer, osg::ref_ptr<osg::Group> rootNode,
+        RenderingManager(osgViewer::Viewer* viewer, osg::ref_ptr<osg::Group> rootNode, 
                          Resource::ResourceSystem* resourceSystem, SceneUtil::WorkQueue* workQueue,
                          const std::string& resourcePath, DetourNavigator::Navigator& navigator, const MWWorld::GroundcoverStore& groundcoverStore);
         ~RenderingManager();
@@ -255,6 +256,7 @@ namespace MWRender
 
         void updateRecastMesh();
 
+
         osg::ref_ptr<osgUtil::IntersectionVisitor> getIntersectionVisitor(osgUtil::Intersector* intersector, bool ignorePlayer, bool ignoreActors);
 
         osg::ref_ptr<osgUtil::IntersectionVisitor> mIntersectionVisitor;
@@ -292,6 +294,7 @@ namespace MWRender
 
         osg::ref_ptr<StateUpdater> mStateUpdater;
         osg::ref_ptr<SharedUniformStateUpdater> mSharedUniformStateUpdater;
+        osg::ref_ptr<PerViewUniformStateUpdater> mPerViewUniformStateUpdater;
 
         osg::Vec4f mAmbientColor;
         float mMinimumAmbientLuminance;
diff --git a/apps/openmw/mwrender/screenshotmanager.cpp b/apps/openmw/mwrender/screenshotmanager.cpp
index 90e6eec124..65b6a1bdbc 100644
--- a/apps/openmw/mwrender/screenshotmanager.cpp
+++ b/apps/openmw/mwrender/screenshotmanager.cpp
@@ -13,6 +13,8 @@
 #include <components/resource/scenemanager.hpp>
 #include <components/shader/shadermanager.hpp>
 #include <components/sceneutil/depth.hpp>
+#include <components/stereo/stereomanager.hpp>
+#include <components/stereo/multiview.hpp>
 
 #include <components/settings/settings.hpp>
 
@@ -85,6 +87,12 @@ namespace MWRender
         {
             int screenW = renderInfo.getCurrentCamera()->getViewport()->width();
             int screenH = renderInfo.getCurrentCamera()->getViewport()->height();
+            if (Stereo::getStereo())
+            {
+                auto eyeRes = Stereo::Manager::instance().eyeResolution();
+                screenW = eyeRes.x();
+                screenH = eyeRes.y();
+            }
             double imageaspect = (double)mWidth/(double)mHeight;
             int leftPadding = std::max(0, static_cast<int>(screenW - screenH * imageaspect) / 2);
             int topPadding = std::max(0, static_cast<int>(screenH - screenW / imageaspect) / 2);
@@ -94,13 +102,19 @@ namespace MWRender
             // Ensure we are reading from the resolved framebuffer and not the multisampled render buffer. Also ensure that the readbuffer is set correctly with rendeirng to FBO.
             // glReadPixel() cannot read from multisampled targets
             PostProcessor* postProcessor = dynamic_cast<PostProcessor*>(renderInfo.getCurrentCamera()->getUserData());
+            osg::GLExtensions* ext = osg::GLExtensions::Get(renderInfo.getContextID(), false);
 
-            if (postProcessor && postProcessor->getFbo())
+            if (ext)
             {
-                osg::GLExtensions* ext = osg::GLExtensions::Get(renderInfo.getContextID(), false);
-                if (ext)
+                osg::FrameBufferObject* fbo = nullptr;
+                if (Stereo::getStereo())
+                    fbo = Stereo::Manager::instance().multiviewFramebuffer()->layerFbo(0);
+                else if (postProcessor)
+                    fbo = postProcessor->getFbo();
+
+                if (fbo)
                 {
-                    ext->glBindFramebuffer(GL_FRAMEBUFFER_EXT, postProcessor->getFbo()->getHandle(renderInfo.getContextID()));
+                    ext->glBindFramebuffer(GL_FRAMEBUFFER_EXT, fbo->getHandle(renderInfo.getContextID()));
                     renderInfo.getState()->glReadBuffer(GL_COLOR_ATTACHMENT0_EXT);
                 }
             }
@@ -346,7 +360,7 @@ namespace MWRender
         rttCamera->addChild(mWater->getReflectionNode());
         rttCamera->addChild(mWater->getRefractionNode());
 
-        rttCamera->setCullMask(mViewer->getCamera()->getCullMask() & ~(Mask_GUI|Mask_FirstPerson));
+        rttCamera->setCullMask(MWBase::Environment::get().getWindowManager()->getCullMask() & ~(Mask_GUI|Mask_FirstPerson));
 
         rttCamera->setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
 
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index a9c56bdf19..f0a591477a 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -23,6 +23,7 @@
 
 #include <components/misc/rng.hpp>
 #include <components/misc/resourcehelpers.hpp>
+#include <components/stereo/stereomanager.hpp>
 
 #include <components/nifosg/particle.hpp>
 
@@ -332,8 +333,10 @@ namespace MWRender
 
         if (mSceneManager->getForceShaders())
         {
-            auto vertex = mSceneManager->getShaderManager().getShader("sky_vertex.glsl", {}, osg::Shader::VERTEX);
-            auto fragment = mSceneManager->getShaderManager().getShader("sky_fragment.glsl", {}, osg::Shader::FRAGMENT);
+            Shader::ShaderManager::DefineMap defines = {};
+            Stereo::Manager::instance().shaderStereoDefines(defines);
+            auto vertex = mSceneManager->getShaderManager().getShader("sky_vertex.glsl", defines, osg::Shader::VERTEX);
+            auto fragment = mSceneManager->getShaderManager().getShader("sky_fragment.glsl", defines, osg::Shader::FRAGMENT);
             auto program = mSceneManager->getShaderManager().getProgram(vertex, fragment);
             mEarlyRenderBinRoot->getOrCreateStateSet()->addUniform(new osg::Uniform("pass", -1));
             mEarlyRenderBinRoot->getOrCreateStateSet()->setAttributeAndModes(program, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index 7d9aca9b76..87f5eada20 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -10,6 +10,7 @@
 #include <osg/PositionAttitudeTransform>
 #include <osg/ClipNode>
 #include <osg/FrontFace>
+#include <osg/ViewportIndexed>
 
 #include <osgDB/ReadFile>
 
@@ -33,6 +34,7 @@
 
 #include <components/misc/constants.hpp>
 #include <components/misc/stringops.hpp>
+#include <components/stereo/stereomanager.hpp>
 
 #include <components/nifosg/controller.hpp>
 
@@ -44,6 +46,8 @@
 
 #include "../mwworld/cellstore.hpp"
 
+#include "../mwbase/environment.hpp"
+
 #include "vismask.hpp"
 #include "ripplesimulation.hpp"
 #include "renderbin.hpp"
@@ -166,7 +170,7 @@ private:
 class InheritViewPointCallback : public SceneUtil::NodeCallback<InheritViewPointCallback, osg::Node*, osgUtil::CullVisitor*>
 {
 public:
-    InheritViewPointCallback() {}
+        InheritViewPointCallback() {}
 
     void operator()(osg::Node* node, osgUtil::CullVisitor* cv)
     {
@@ -260,7 +264,7 @@ class Refraction : public SceneUtil::RTTNode
 {
 public:
     Refraction(uint32_t rttSize)
-        : RTTNode(rttSize, rttSize, 1, false)
+        : RTTNode(rttSize, rttSize, 0, false, 1, StereoAwareness::Aware)
         , mNodeMask(Refraction::sDefaultCullMask)
     {
         mClipCullNode = new ClipCullNode;
@@ -335,7 +339,7 @@ class Reflection : public SceneUtil::RTTNode
 {
 public:
     Reflection(uint32_t rttSize, bool isInterior)
-        : RTTNode(rttSize, rttSize, 0, false)
+        : RTTNode(rttSize, rttSize, 0, false, 0, StereoAwareness::Aware)
     {
         setInterior(isInterior);
         mClipCullNode = new ClipCullNode;
@@ -458,6 +462,7 @@ Water::Water(osg::Group *parent, osg::Group* sceneRoot, Resource::ResourceSystem
     mWaterGeom->setDrawCallback(new DepthClampCallback);
     mWaterGeom->setNodeMask(Mask_Water);
     mWaterGeom->setDataVariance(osg::Object::STATIC);
+    mWaterGeom->setName("Water Geometry");
 
     mWaterNode = new osg::PositionAttitudeTransform;
     mWaterNode->setName("Water Root");
@@ -468,6 +473,7 @@ Water::Water(osg::Group *parent, osg::Group* sceneRoot, Resource::ResourceSystem
     osg::ref_ptr<osg::Geometry> geom2 (osg::clone(mWaterGeom.get(), osg::CopyOp::DEEP_COPY_NODES));
     createSimpleWaterStateSet(geom2, Fallback::Map::getFloat("Water_Map_Alpha"));
     geom2->setNodeMask(Mask_SimpleWater);
+    geom2->setName("Simple Water Geometry");
     mWaterNode->addChild(geom2);
  
     mSceneRoot->addChild(mWaterNode);
@@ -679,6 +685,7 @@ void Water::createShaderWaterStateSet(osg::Node* node, Reflection* reflection, R
     const auto rippleDetail = std::clamp(Settings::Manager::getInt("rain ripple detail", "Water"), 0, 2);
     defineMap["rain_ripple_detail"] = std::to_string(rippleDetail);
 
+    Stereo::Manager::instance().shaderStereoDefines(defineMap);
 
     Shader::ShaderManager& shaderMgr = mResourceSystem->getSceneManager()->getShaderManager();
     osg::ref_ptr<osg::Shader> vertexShader(shaderMgr.getShader("water_vertex.glsl", defineMap, osg::Shader::VERTEX));
@@ -694,6 +701,7 @@ void Water::createShaderWaterStateSet(osg::Node* node, Reflection* reflection, R
     normalMap->setMaxAnisotropy(16);
     normalMap->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR_MIPMAP_LINEAR);
     normalMap->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
+    
 
     mRainIntensityUpdater = new RainIntensityUpdater();
     node->setUpdateCallback(mRainIntensityUpdater);
diff --git a/cmake/CheckOsgMultiview.cmake b/cmake/CheckOsgMultiview.cmake
new file mode 100644
index 0000000000..1dcea31a32
--- /dev/null
+++ b/cmake/CheckOsgMultiview.cmake
@@ -0,0 +1,26 @@
+set(TMP_ROOT ${CMAKE_BINARY_DIR}/try-compile)
+file(MAKE_DIRECTORY ${TMP_ROOT})
+
+file(WRITE ${TMP_ROOT}/checkmultiview.cpp
+"
+#include <osg/Camera>
+int main(void)
+{
+    (void)osg::Camera::FACE_CONTROLLED_BY_MULTIVIEW_SHADER;
+    return 0;
+}
+")
+
+message(STATUS "Checking if OSG supports multiview")
+
+try_compile(RESULT_VAR
+    ${TMP_ROOT}/temp
+    ${TMP_ROOT}/checkmultiview.cpp
+    CMAKE_FLAGS  "-DINCLUDE_DIRECTORIES=${OPENSCENEGRAPH_INCLUDE_DIRS}"
+    )
+set(HAVE_MULTIVIEW ${RESULT_VAR})
+if(HAVE_MULTIVIEW)
+    message(STATUS "Osg supports multiview")
+else(HAVE_MULTIVIEW)
+    message(NOTICE "Osg does not support multiview, disabling use of GL_OVR_multiview")
+endif(HAVE_MULTIVIEW)
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 32c7c9535f..5ad88523b8 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -61,7 +61,7 @@ add_component_dir (sceneutil
     clone attach visitor util statesetupdater controller skeleton riggeometry morphgeometry lightcontroller
     lightmanager lightutil positionattitudetransform workqueue pathgridutil waterutil writescene serialize optimizer
     actorutil detourdebugdraw navmesh agentpath shadow mwshadowtechnique recastmesh shadowsbin osgacontroller rtt
-    screencapture depth
+    screencapture depth color
     )
 
 add_component_dir (nif
@@ -196,6 +196,10 @@ add_component_dir (misc
     compression osguservalues errorMarker color
     )
 
+add_component_dir (stereo
+    frustum multiview stereomanager types
+    )
+
 add_component_dir (debug
     debugging debuglog gldebug
     )
diff --git a/components/sceneutil/color.cpp b/components/sceneutil/color.cpp
new file mode 100644
index 0000000000..825d7f65fd
--- /dev/null
+++ b/components/sceneutil/color.cpp
@@ -0,0 +1,157 @@
+#include "color.hpp"
+
+#include <algorithm>
+#include <array>
+
+#include <SDL_opengl_glext.h>
+
+#include <components/debug/debuglog.hpp>
+#include <components/settings/settings.hpp>
+
+namespace SceneUtil
+{
+
+    bool isColorFormat(GLenum format)
+    {
+        static constexpr std::array<GLenum, 42> formats = {
+            GL_RGB,
+            GL_RGB4,
+            GL_RGB5,
+            GL_RGB8,
+            GL_RGB8_SNORM,
+            GL_RGB10,
+            GL_RGB12,
+            GL_RGB16,
+            GL_RGB16_SNORM,
+            GL_SRGB,
+            GL_SRGB8,
+            GL_RGB16F,
+            GL_RGB32F,
+            GL_R11F_G11F_B10F,
+            GL_RGB9_E5,
+            GL_RGB8I,
+            GL_RGB8UI,
+            GL_RGB16I,
+            GL_RGB16UI,
+            GL_RGB32I,
+            GL_RGB32UI,
+            GL_RGBA,
+            GL_RGBA2,
+            GL_RGBA4,
+            GL_RGB5_A1,
+            GL_RGBA8,
+            GL_RGBA8_SNORM,
+            GL_RGB10_A2,
+            GL_RGB10_A2UI,
+            GL_RGBA12,
+            GL_RGBA16,
+            GL_RGBA16_SNORM,
+            GL_SRGB_ALPHA8,
+            GL_SRGB8_ALPHA8,
+            GL_RGBA16F,
+            GL_RGBA32F,
+            GL_RGBA8I,
+            GL_RGBA8UI,
+            GL_RGBA16I,
+            GL_RGBA16UI,
+            GL_RGBA32I,
+            GL_RGBA32UI,
+        };
+
+        return std::find(formats.cbegin(), formats.cend(), format) != formats.cend();
+    }
+
+    bool isFloatingPointColorFormat(GLenum format)
+    {
+        static constexpr std::array<GLenum, 5> formats = {
+            GL_RGB16F,
+            GL_RGB32F,
+            GL_R11F_G11F_B10F,
+            GL_RGBA16F,
+            GL_RGBA32F,
+        };
+
+        return std::find(formats.cbegin(), formats.cend(), format) != formats.cend();
+    }
+
+    int getColorFormatChannelCount(GLenum format)
+    {
+        static constexpr std::array<GLenum, 21> formats = {
+            GL_RGBA,
+            GL_RGBA2,
+            GL_RGBA4,
+            GL_RGB5_A1,
+            GL_RGBA8,
+            GL_RGBA8_SNORM,
+            GL_RGB10_A2,
+            GL_RGB10_A2UI,
+            GL_RGBA12,
+            GL_RGBA16,
+            GL_RGBA16_SNORM,
+            GL_SRGB_ALPHA8,
+            GL_SRGB8_ALPHA8,
+            GL_RGBA16F,
+            GL_RGBA32F,
+            GL_RGBA8I,
+            GL_RGBA8UI,
+            GL_RGBA16I,
+            GL_RGBA16UI,
+            GL_RGBA32I,
+            GL_RGBA32UI,
+        };
+        if (std::find(formats.cbegin(), formats.cend(), format) != formats.cend())
+            return 4;
+        return 3;
+    }
+
+    void getColorFormatSourceFormatAndType(GLenum internalFormat, GLenum& sourceFormat, GLenum& sourceType)
+    {
+        if (getColorFormatChannelCount(internalFormat == 4))
+            sourceFormat = GL_RGBA;
+        else
+            sourceFormat = GL_RGB;
+
+        if (isFloatingPointColorFormat(internalFormat))
+            sourceType = GL_FLOAT;
+        else
+            sourceType = GL_UNSIGNED_BYTE;
+    }
+
+    namespace Color
+    {
+        GLenum sColorInternalFormat;
+        GLenum sColorSourceFormat;
+        GLenum sColorSourceType;
+
+        GLenum colorInternalFormat()
+        {
+            return sColorInternalFormat;
+        }
+
+        GLenum colorSourceFormat()
+        {
+            return sColorSourceFormat;
+        }
+
+        GLenum colorSourceType()
+        {
+            return sColorSourceType;
+        }
+
+        void SelectColorFormatOperation::operator()([[maybe_unused]] osg::GraphicsContext* graphicsContext)
+        {
+            sColorInternalFormat = GL_RGB;
+
+            for (auto supportedFormat : mSupportedFormats)
+            {
+                if (isColorFormat(supportedFormat))
+                {
+                    sColorInternalFormat = supportedFormat;
+                    break;
+                }
+            }
+
+            getColorFormatSourceFormatAndType(sColorInternalFormat, sColorSourceFormat, sColorSourceType);
+        }
+    }
+}
diff --git a/components/sceneutil/color.hpp b/components/sceneutil/color.hpp
new file mode 100644
index 0000000000..cd950c2749
--- /dev/null
+++ b/components/sceneutil/color.hpp
@@ -0,0 +1,204 @@
+#ifndef OPENMW_COMPONENTS_SCENEUTIL_COLOR_H
+#define OPENMW_COMPONENTS_SCENEUTIL_COLOR_H
+
+#include <osg/GraphicsThread>
+
+namespace SceneUtil
+{
+    bool isColorFormat(GLenum format);
+    bool isFloatingPointColorFormat(GLenum format);
+    int getColorFormatChannelCount(GLenum format);
+    void getColorFormatSourceFormatAndType(GLenum internalFormat, GLenum& sourceFormat, GLenum& sourceType);
+
+    namespace Color
+    {
+        GLenum colorSourceFormat();
+        GLenum colorSourceType();
+        GLenum colorInternalFormat();
+
+        class SelectColorFormatOperation final : public osg::GraphicsOperation
+        {
+        public:
+            SelectColorFormatOperation() : GraphicsOperation("SelectColorFormatOperation", false)
+            {}
+
+            void operator()(osg::GraphicsContext* graphicsContext) override;
+
+            void setSupportedFormats(const std::vector<GLenum>& supportedFormats)
+            {
+                mSupportedFormats = supportedFormats;
+            }
+
+        private:
+            std::vector<GLenum> mSupportedFormats;
+        };
+    }
+}
+
+#ifndef GL_RGB
+#define GL_RGB 0x1907
+#endif
+
+#ifndef GL_RGBA
+#define GL_RGBA 0x1908
+#endif
+
+#ifndef GL_RGB4
+#define GL_RGB4 0x804F
+#endif
+
+#ifndef GL_RGB5
+#define GL_RGB5 0x8050
+#endif
+
+#ifndef GL_RGB8
+#define GL_RGB8 0x8051
+#endif
+
+#ifndef GL_RGB8_SNORM
+#define GL_RGB8_SNORM 0x8F96
+#endif
+
+#ifndef GL_RGB10
+#define GL_RGB10 0x8052
+#endif
+
+#ifndef GL_RGB12
+#define GL_RGB12 0x8053
+#endif
+
+#ifndef GL_RGB16
+#define GL_RGB16 0x8054
+#endif
+
+#ifndef GL_RGB16_SNORM
+#define GL_RGB16_SNORM 0x8F9A
+#endif
+
+#ifndef GL_RGBA2
+#define GL_RGBA2 0x8055
+#endif
+
+#ifndef GL_RGBA4
+#define GL_RGBA4 0x8056
+#endif
+
+#ifndef GL_RGB5_A1
+#define GL_RGB5_A1 0x8057
+#endif
+
+#ifndef GL_RGBA8
+#define GL_RGBA8 0x8058
+#endif
+
+#ifndef GL_RGBA8_SNORM
+#define GL_RGBA8_SNORM 0x8F97
+#endif
+
+#ifndef GL_RGB10_A2
+#define GL_RGB10_A2 0x906F
+#endif
+
+#ifndef GL_RGB10_A2UI 
+#define GL_RGB10_A2UI  0x906F
+#endif
+
+#ifndef GL_RGBA12
+#define GL_RGBA12 0x805A
+#endif
+
+#ifndef GL_RGBA16
+#define GL_RGBA16 0x805B
+#endif
+
+#ifndef GL_RGBA16_SNORM
+#define GL_RGBA16_SNORM 0x8F9B
+#endif
+
+#ifndef GL_SRGB
+#define GL_SRGB 0x8C40
+#endif
+
+#ifndef GL_SRGB8
+#define GL_SRGB8 0x8C41
+#endif
+
+#ifndef GL_SRGB_ALPHA8
+#define GL_SRGB_ALPHA8 0x8C42
+#endif
+
+#ifndef GL_SRGB8_ALPHA8
+#define GL_SRGB8_ALPHA8 0x8C43
+#endif
+
+#ifndef GL_RGB16F
+#define GL_RGB16F 0x881B
+#endif
+
+#ifndef GL_RGBA16F
+#define GL_RGBA16F 0x881A
+#endif
+
+#ifndef GL_RGB32F
+#define GL_RGB32F 0x8815
+#endif
+
+#ifndef GL_RGBA32F
+#define GL_RGBA32F 0x8814
+#endif
+
+#ifndef GL_R11F_G11F_B10F
+#define GL_R11F_G11F_B10F 0x8C3A
+#endif
+
+
+#ifndef GL_RGB8I
+#define GL_RGB8I 0x8D8F
+#endif
+
+#ifndef GL_RGB8UI
+#define GL_RGB8UI 0x8D7D
+#endif
+
+#ifndef GL_RGB16I
+#define GL_RGB16I 0x8D89
+#endif
+
+#ifndef GL_RGB16UI
+#define GL_RGB16UI 0x8D77
+#endif
+
+#ifndef GL_RGB32I
+#define GL_RGB32I 0x8D83
+#endif
+
+#ifndef GL_RGB32UI
+#define GL_RGB32UI 0x8D71
+#endif
+
+#ifndef GL_RGBA8I
+#define GL_RGBA8I 0x8D8E
+#endif
+
+#ifndef GL_RGBA8UI
+#define GL_RGBA8UI 0x8D7C
+#endif
+
+#ifndef GL_RGBA16I
+#define GL_RGBA16I 0x8D88
+#endif
+
+#ifndef GL_RGBA16UI
+#define GL_RGBA16UI 0x8D76
+#endif
+
+#ifndef GL_RGBA32I
+#define GL_RGBA32I 0x8D82
+#endif
+
+#ifndef GL_RGBA32UI
+#define GL_RGBA32UI 0x8D70
+#endif
+
+
+#endif
diff --git a/components/sceneutil/depth.cpp b/components/sceneutil/depth.cpp
index ee95f8c7ec..c52bdf2ed2 100644
--- a/components/sceneutil/depth.cpp
+++ b/components/sceneutil/depth.cpp
@@ -2,8 +2,7 @@
 
 #include <algorithm>
 
-#include <SDL_opengl_glext.h>
-
+#include <components/debug/debuglog.hpp>
 #include <components/settings/settings.hpp>
 
 namespace SceneUtil
@@ -56,4 +55,144 @@ namespace SceneUtil
 
         return std::find(formats.cbegin(), formats.cend(), format) != formats.cend();
     }
-}
\ No newline at end of file
+
+    bool isDepthFormat(GLenum format)
+    {
+        constexpr std::array<GLenum, 8> formats = {
+            GL_DEPTH_COMPONENT32F,
+            GL_DEPTH_COMPONENT32F_NV,
+            GL_DEPTH_COMPONENT16,
+            GL_DEPTH_COMPONENT24,
+            GL_DEPTH_COMPONENT32,
+            GL_DEPTH32F_STENCIL8,
+            GL_DEPTH32F_STENCIL8_NV,
+            GL_DEPTH24_STENCIL8,
+        };
+
+        return std::find(formats.cbegin(), formats.cend(), format) != formats.cend();
+    }
+
+    bool isDepthStencilFormat(GLenum format)
+    {
+        constexpr std::array<GLenum, 8> formats = {
+            GL_DEPTH32F_STENCIL8,
+            GL_DEPTH32F_STENCIL8_NV,
+            GL_DEPTH24_STENCIL8,
+        };
+
+        return std::find(formats.cbegin(), formats.cend(), format) != formats.cend();
+    }
+
+    void getDepthFormatSourceFormatAndType(GLenum internalFormat, GLenum& sourceFormat, GLenum& sourceType)
+    {
+        switch (internalFormat)
+        {
+        case GL_DEPTH_COMPONENT16:
+        case GL_DEPTH_COMPONENT24:
+        case GL_DEPTH_COMPONENT32:
+            sourceType = GL_UNSIGNED_INT;
+            sourceFormat = GL_DEPTH_COMPONENT;
+            break;
+        case GL_DEPTH_COMPONENT32F:
+        case GL_DEPTH_COMPONENT32F_NV:
+            sourceType = GL_FLOAT;
+            sourceFormat = GL_DEPTH_COMPONENT;
+            break;
+        case GL_DEPTH24_STENCIL8:
+            sourceType = GL_UNSIGNED_INT_24_8_EXT;
+            sourceFormat = GL_DEPTH_STENCIL_EXT;
+            break;
+        case GL_DEPTH32F_STENCIL8:
+        case GL_DEPTH32F_STENCIL8_NV:
+            sourceType = GL_FLOAT_32_UNSIGNED_INT_24_8_REV;
+            sourceFormat = GL_DEPTH_STENCIL_EXT;
+            break;
+        default:
+            sourceType = GL_UNSIGNED_INT;
+            sourceFormat = GL_DEPTH_COMPONENT;
+            break;
+        }
+    }
+
+    GLenum getDepthFormatOfDepthStencilFormat(GLenum internalFormat)
+    {
+        switch (internalFormat)
+        {
+        case GL_DEPTH24_STENCIL8:
+            return GL_DEPTH_COMPONENT24;
+            break;
+        case GL_DEPTH32F_STENCIL8:
+            return GL_DEPTH_COMPONENT32F;
+            break;
+        case GL_DEPTH32F_STENCIL8_NV:
+            return GL_DEPTH_COMPONENT32F_NV;
+            break;
+        default:
+            return internalFormat;
+            break;
+        }
+    }
+
+    void SelectDepthFormatOperation::operator()(osg::GraphicsContext* graphicsContext)
+    {
+        bool enableReverseZ = false;
+
+        if (Settings::Manager::getBool("reverse z", "Camera"))
+        {
+            osg::ref_ptr<osg::GLExtensions> exts = osg::GLExtensions::Get(0, false);
+            if (exts && exts->isClipControlSupported)
+            {
+                enableReverseZ = true;
+                Log(Debug::Info) << "Using reverse-z depth buffer";
+            }
+            else
+                Log(Debug::Warning) << "GL_ARB_clip_control not supported: disabling reverse-z depth buffer";
+        }
+        else
+            Log(Debug::Info) << "Using standard depth buffer";
+
+        SceneUtil::AutoDepth::setReversed(enableReverseZ);
+
+        constexpr char errPreamble[] = "Postprocessing and floating point depth buffers disabled: ";
+        std::vector<GLenum> requestedFormats;
+        unsigned int contextID = graphicsContext->getState()->getContextID();
+        if (SceneUtil::AutoDepth::isReversed())
+        {
+            if (osg::isGLExtensionSupported(contextID, "GL_ARB_depth_buffer_float"))
+            {
+                requestedFormats.push_back(GL_DEPTH32F_STENCIL8);
+            }
+            else if (osg::isGLExtensionSupported(contextID, "GL_NV_depth_buffer_float"))
+            {
+                requestedFormats.push_back(GL_DEPTH32F_STENCIL8_NV);
+            }
+            else
+            {
+                Log(Debug::Warning) << errPreamble << "'GL_ARB_depth_buffer_float' and 'GL_NV_depth_buffer_float' unsupported.";
+            }
+        }
+
+        requestedFormats.push_back(GL_DEPTH24_STENCIL8);
+        if (mSupportedFormats.empty())
+        {
+            SceneUtil::AutoDepth::setDepthFormat(requestedFormats.front());
+        }
+        else
+        {
+            for (auto requestedFormat : requestedFormats)
+            {
+                if (std::find(mSupportedFormats.cbegin(), mSupportedFormats.cend(), requestedFormat) != mSupportedFormats.cend())
+                {
+                    SceneUtil::AutoDepth::setDepthFormat(requestedFormat);
+                    break;
+                }
+            }
+        }
+    }
+
+    void AutoDepth::setDepthFormat(GLenum format)
+    {
+        sDepthInternalFormat = format;
+        getDepthFormatSourceFormatAndType(sDepthInternalFormat, sDepthSourceFormat, sDepthSourceType);
+    }
+}
diff --git a/components/sceneutil/depth.hpp b/components/sceneutil/depth.hpp
index 1f4ba55297..67cf5bdb45 100644
--- a/components/sceneutil/depth.hpp
+++ b/components/sceneutil/depth.hpp
@@ -9,6 +9,26 @@
 #define GL_DEPTH32F_STENCIL8_NV 0x8DAC
 #endif
 
+#ifndef GL_DEPTH32F_STENCIL8
+#define GL_DEPTH32F_STENCIL8 0x8CAD
+#endif
+
+#ifndef GL_FLOAT_32_UNSIGNED_INT_24_8_REV
+#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV 0x8DAD
+#endif
+
+#ifndef GL_DEPTH24_STENCIL8
+#define GL_DEPTH24_STENCIL8 0x88F0
+#endif
+
+#ifndef GL_DEPTH_STENCIL_EXT
+#define GL_DEPTH_STENCIL_EXT 0x84F9
+#endif
+
+#ifndef GL_UNSIGNED_INT_24_8_EXT
+#define GL_UNSIGNED_INT_24_8_EXT 0x84FA
+#endif
+
 namespace SceneUtil
 {
     // Sets camera clear depth to 0 if reversed depth buffer is in use, 1 otherwise.
@@ -28,6 +48,18 @@ namespace SceneUtil
     // Returns true if the GL format is a floating point depth format.
     bool isFloatingPointDepthFormat(GLenum format);
 
+    // Returns true if the GL format is a depth format
+    bool isDepthFormat(GLenum format);
+
+    // Returns true if the GL format is a depth+stencil format
+    bool isDepthStencilFormat(GLenum format);
+
+    // Returns the corresponding source format and type for the given internal format
+    void getDepthFormatSourceFormatAndType(GLenum internalFormat, GLenum& sourceFormat, GLenum& sourceType);
+
+    // Converts depth-stencil formats to their corresponding depth formats.
+    GLenum getDepthFormatOfDepthStencilFormat(GLenum internalFormat);
+
     // Brief wrapper around an osg::Depth that applies the reversed depth function when a reversed depth buffer is in use
     class AutoDepth : public osg::Depth
     {
@@ -72,9 +104,29 @@ namespace SceneUtil
             return AutoDepth::sReversed;
         }
 
+        static void setDepthFormat(GLenum format);
+
+        static GLenum depthInternalFormat()
+        {
+            return AutoDepth::sDepthInternalFormat;
+        }
+
+        static GLenum depthSourceFormat()
+        {
+            return AutoDepth::sDepthSourceFormat;
+        }
+
+        static GLenum depthSourceType()
+        {
+            return AutoDepth::sDepthSourceType;
+        }
+
     private:
 
         static inline bool sReversed = false;
+        static inline GLenum sDepthSourceFormat = GL_DEPTH_COMPONENT;
+        static inline GLenum sDepthInternalFormat = GL_DEPTH_COMPONENT24;
+        static inline GLenum sDepthSourceType = GL_UNSIGNED_INT;
 
         osg::Depth::Function getReversedDepthFunction() const
         {
@@ -116,6 +168,23 @@ namespace SceneUtil
             traverse(node);
         }
     };
+
+    class SelectDepthFormatOperation : public osg::GraphicsOperation
+    {
+    public:
+        SelectDepthFormatOperation() : GraphicsOperation("SelectDepthFormatOperation", false)
+        {}
+
+        void operator()(osg::GraphicsContext* graphicsContext) override;
+
+        void setSupportedFormats(const std::vector<GLenum>& supportedFormats)
+        {
+            mSupportedFormats = supportedFormats;
+        }
+
+    private:
+        std::vector<GLenum> mSupportedFormats;
+    };
 }
 
 #endif
diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
index 931b316347..60dd613df5 100644
--- a/components/sceneutil/mwshadowtechnique.cpp
+++ b/components/sceneutil/mwshadowtechnique.cpp
@@ -633,6 +633,7 @@ void MWShadowTechnique::ShadowData::releaseGLObjects(osg::State* state) const
 // Frustum
 //
 MWShadowTechnique::Frustum::Frustum(osgUtil::CullVisitor* cv, double minZNear, double maxZFar):
+    useCustomClipSpace(false),
     corners(8),
     faces(6),
     edges(12)
@@ -652,19 +653,40 @@ MWShadowTechnique::Frustum::Frustum(osgUtil::CullVisitor* cv, double minZNear, d
         OSG_INFO<<"zNear = "<<zNear<<", zFar = "<<zFar<<std::endl;
         OSG_INFO<<"Projection matrix after clamping "<<projectionMatrix<<std::endl;
     }
+}
 
-    corners[0].set(-1.0,-1.0,-1.0);
-    corners[1].set(1.0,-1.0,-1.0);
-    corners[2].set(1.0,-1.0,1.0);
-    corners[3].set(-1.0,-1.0,1.0);
-    corners[4].set(-1.0,1.0,-1.0);
-    corners[5].set(1.0,1.0,-1.0);
-    corners[6].set(1.0,1.0,1.0);
-    corners[7].set(-1.0,1.0,1.0);
+void SceneUtil::MWShadowTechnique::Frustum::setCustomClipSpace(const osg::BoundingBoxd& clipCornersOverride)
+{
+    useCustomClipSpace = true;
+    customClipSpace = clipCornersOverride;
+}
 
+void SceneUtil::MWShadowTechnique::Frustum::init()
+{
     osg::Matrixd clipToWorld;
     clipToWorld.invert(modelViewMatrix * projectionMatrix);
 
+    if (useCustomClipSpace)
+    {
+        corners.clear();
+        // Add corners in the same order OSG expects them
+        for (int i : {0, 1, 5, 4, 2, 3, 7, 6})
+        {
+            corners.push_back(customClipSpace.corner(i));
+        }
+    }
+    else
+    {
+        corners[0].set(-1.0, -1.0, -1.0);
+        corners[1].set(1.0, -1.0, -1.0);
+        corners[2].set(1.0, -1.0, 1.0);
+        corners[3].set(-1.0, -1.0, 1.0);
+        corners[4].set(-1.0, 1.0, -1.0);
+        corners[5].set(1.0, 1.0, -1.0);
+        corners[6].set(1.0, 1.0, 1.0);
+        corners[7].set(-1.0, 1.0, 1.0);
+    }
+
     // transform frustum corners from clipspace to world coords, and compute center
     for(Vertices::iterator itr = corners.begin();
         itr != corners.end();
@@ -899,7 +921,7 @@ void SceneUtil::MWShadowTechnique::setupCastingShader(Shader::ShaderManager & sh
 {
     // This can't be part of the constructor as OSG mandates that there be a trivial constructor available
 
-    osg::ref_ptr<osg::Shader> castingVertexShader = shaderManager.getShader("shadowcasting_vertex.glsl", {}, osg::Shader::VERTEX);
+    osg::ref_ptr<osg::Shader> castingVertexShader = shaderManager.getShader("shadowcasting_vertex.glsl", { {"GLSLVersion", "120"} }, osg::Shader::VERTEX);
     osg::ref_ptr<osg::GLExtensions> exts = osg::GLExtensions::Get(0, false);
     std::string useGPUShader4 = exts && exts->isGpuShader4Supported ? "1" : "0";
     for (int alphaFunc = GL_NEVER; alphaFunc <= GL_ALWAYS; ++alphaFunc)
@@ -910,7 +932,8 @@ void SceneUtil::MWShadowTechnique::setupCastingShader(Shader::ShaderManager & sh
         program->addShader(shaderManager.getShader("shadowcasting_fragment.glsl", { {"alphaFunc", std::to_string(alphaFunc)},
                                                                                     {"alphaToCoverage", "0"},
                                                                                     {"adjustCoverage", "1"},
-                                                                                    {"useGPUShader4", useGPUShader4}
+                                                                                    {"useGPUShader4", useGPUShader4},
+                                                                                    {"GLSLVersion", "120"}
                                                                                   }, osg::Shader::FRAGMENT));
     }
 }
@@ -931,6 +954,67 @@ MWShadowTechnique::ViewDependentData* MWShadowTechnique::getViewDependentData(os
     return vdd.release();
 }
 
+void SceneUtil::MWShadowTechnique::copyShadowMap(osgUtil::CullVisitor& cv, ViewDependentData* lhs, ViewDependentData* rhs)
+{
+    // Prepare for rendering shadows using the shadow map owned by rhs.
+
+    // To achieve this i first copy all data that is not specific to this cv's camera and thus read-only,
+    // trusting openmw and osg won't overwrite that data before this frame is done rendering.
+    // This works due to the double buffering of CullVisitors by osg, but also requires that cull passes are serialized (relative to one another).
+    // Then initialize new copies of the data that will be written with view-specific data 
+    // (the stateset and the texgens).
+
+    lhs->_viewDependentShadowMap = rhs->_viewDependentShadowMap;
+    auto* stateset = lhs->getStateSet(cv.getTraversalNumber());
+    stateset->clear();
+    lhs->_lightDataList = rhs->_lightDataList;
+    lhs->_numValidShadows = rhs->_numValidShadows;
+
+    ShadowDataList& sdl = lhs->getShadowDataList();
+    ShadowDataList previous_sdl;
+    previous_sdl.swap(sdl);
+    for (const auto& rhs_sd : rhs->getShadowDataList())
+    {
+        osg::ref_ptr<ShadowData> lhs_sd;
+
+        if (previous_sdl.empty())
+        {
+            OSG_INFO << "Create new ShadowData" << std::endl;
+            lhs_sd = new ShadowData(lhs);
+        }
+        else
+        {
+            OSG_INFO << "Taking ShadowData from from of previous_sdl" << std::endl;
+            lhs_sd = previous_sdl.front();
+            previous_sdl.erase(previous_sdl.begin());
+        }
+        lhs_sd->_camera = rhs_sd->_camera;
+        lhs_sd->_textureUnit = rhs_sd->_textureUnit;
+        lhs_sd->_texture = rhs_sd->_texture;
+        sdl.push_back(lhs_sd);
+    }
+
+    assignTexGenSettings(cv, lhs);
+
+    if (lhs->_numValidShadows > 0)
+    {
+        prepareStateSetForRenderingShadow(*lhs, cv.getTraversalNumber());
+    }
+}
+
+void SceneUtil::MWShadowTechnique::setCustomFrustumCallback(CustomFrustumCallback* cfc)
+{
+    _customFrustumCallback = cfc;
+}
+
+void SceneUtil::MWShadowTechnique::assignTexGenSettings(osgUtil::CullVisitor& cv, ViewDependentData* vdd)
+{
+    for (const auto& sd : vdd->getShadowDataList())
+    {
+        assignTexGenSettings(&cv, sd->_camera, sd->_textureUnit, sd->_texgen);
+    }
+}
+
 void MWShadowTechnique::update(osg::NodeVisitor& nv)
 {
     OSG_INFO<<"MWShadowTechnique::update(osg::NodeVisitor& "<<&nv<<")"<<std::endl;
@@ -939,6 +1023,7 @@ void MWShadowTechnique::update(osg::NodeVisitor& nv)
 
 void MWShadowTechnique::cull(osgUtil::CullVisitor& cv)
 {
+
     if (!_enableShadows)
     {
         if (mSetDummyStateWhenDisabled)
@@ -1036,7 +1121,7 @@ void MWShadowTechnique::cull(osgUtil::CullVisitor& cv)
         // are all done correctly.
         cv.computeNearPlane();
     }
-
+ 
     // clamp the minZNear and maxZFar to those provided by ShadowSettings
     maxZFar = osg::minimum(settings->getMaximumShadowMapDistance(),maxZFar);
     if (minZNear>maxZFar) minZNear = maxZFar*settings->getMinimumShadowMapNearFarRatio();
@@ -1047,6 +1132,36 @@ void MWShadowTechnique::cull(osgUtil::CullVisitor& cv)
     cv.setNearFarRatio(minZNear / maxZFar);
 
     Frustum frustum(&cv, minZNear, maxZFar);
+    if (_customFrustumCallback)
+    {
+        OSG_INFO << "Calling custom frustum callback" << std::endl;
+        osgUtil::CullVisitor* sharedFrustumHint = nullptr;
+        _customClipSpace.init();
+        _customFrustumCallback->operator()(cv, _customClipSpace, sharedFrustumHint);
+        frustum.setCustomClipSpace(_customClipSpace);
+        if (sharedFrustumHint)
+        {
+            // user hinted another view shares its frustum
+            std::lock_guard<std::mutex> lock(_viewDependentDataMapMutex);
+            auto itr = _viewDependentDataMap.find(sharedFrustumHint);
+            if (itr != _viewDependentDataMap.end())
+            {
+                OSG_INFO << "User provided a valid shared frustum hint, re-using previously generated shadow map" << std::endl;
+
+                copyShadowMap(cv, vdd, itr->second);
+
+                // return compute near far mode back to it's original settings
+                cv.setComputeNearFarMode(cachedNearFarMode);
+                return;
+            }
+            else
+            {
+                OSG_INFO << "User provided a shared frustum hint, but it was not valid." << std::endl;
+            }
+        }
+    }
+
+    frustum.init();
     if (_debugHud)
     {
         osg::ref_ptr<osg::Vec3Array> vertexArray = new osg::Vec3Array();
@@ -1066,7 +1181,7 @@ void MWShadowTechnique::cull(osgUtil::CullVisitor& cv)
         reducedNear = minZNear;
         reducedFar = maxZFar;
     }
-
+ 
     // return compute near far mode back to it's original settings
     cv.setComputeNearFarMode(cachedNearFarMode);
 
@@ -1430,7 +1545,7 @@ void MWShadowTechnique::cull(osgUtil::CullVisitor& cv)
                     vdsmCallback->getProjectionMatrix()->set(camera->getProjectionMatrix());
                 }
             }
-
+ 
             // 4.4 compute main scene graph TexGen + uniform settings + setup state
             //
             assignTexGenSettings(&cv, camera.get(), textureUnit, sd->_texgen.get());
@@ -1459,6 +1574,8 @@ void MWShadowTechnique::cull(osgUtil::CullVisitor& cv)
         }
     }
 
+    vdd->setNumValidShadows(numValidShadows);
+
     if (numValidShadows>0)
     {
         prepareStateSetForRenderingShadow(*vdd, cv.getTraversalNumber());
@@ -1665,7 +1782,14 @@ osg::Polytope MWShadowTechnique::computeLightViewFrustumPolytope(Frustum& frustu
     OSG_INFO<<"computeLightViewFrustumPolytope()"<<std::endl;
 
     osg::Polytope polytope;
-    polytope.setToUnitFrustum();
+    if (frustum.useCustomClipSpace)
+    {
+        polytope.setToBoundingBox(frustum.customClipSpace);
+    }
+    else
+    {
+        polytope.setToUnitFrustum();
+    }
 
     polytope.transformProvidingInverse( frustum.projectionMatrix );
     polytope.transformProvidingInverse( frustum.modelViewMatrix );
diff --git a/components/sceneutil/mwshadowtechnique.hpp b/components/sceneutil/mwshadowtechnique.hpp
index 574d054204..04355b5729 100644
--- a/components/sceneutil/mwshadowtechnique.hpp
+++ b/components/sceneutil/mwshadowtechnique.hpp
@@ -119,10 +119,15 @@ namespace SceneUtil {
         struct Frustum
         {
             Frustum(osgUtil::CullVisitor* cv, double minZNear, double maxZFar);
+            void setCustomClipSpace(const osg::BoundingBoxd& clipCornersOverride);
+            void init();
 
             osg::Matrixd projectionMatrix;
             osg::Matrixd modelViewMatrix;
 
+            bool useCustomClipSpace;
+            osg::BoundingBoxd customClipSpace;
+
             typedef std::vector<osg::Vec3d> Vertices;
             Vertices corners;
 
@@ -140,6 +145,18 @@ namespace SceneUtil {
             osg::Vec3d frustumCenterLine;
         };
 
+        /** Custom frustum callback allowing the application to request shadow maps covering a
+        * different furstum than the camera normally would cover, by customizing the corners of the clip space. */
+        struct CustomFrustumCallback : osg::Referenced
+        {
+            /** The callback operator.
+            * Output the custum frustum to the boundingBox variable.
+            * If sharedFrustumHint is set to a valid cull visitor, the shadow maps of that cull visitor will be re-used instead of recomputing new shadow maps 
+            * Note that the customClipSpace bounding box will be uninitialized when this operator is called. If it is not initalized, or a valid shared frustum hint set,
+            * the resulting shadow map may be invalid. */
+            virtual void operator()(osgUtil::CullVisitor& cv, osg::BoundingBoxd& customClipSpace, osgUtil::CullVisitor*& sharedFrustumHint) = 0;
+        };
+
         // forward declare
         class ViewDependentData;
 
@@ -197,7 +214,12 @@ namespace SceneUtil {
 
             virtual void releaseGLObjects(osg::State* = 0) const;
 
+            unsigned int numValidShadows(void) const { return _numValidShadows; }
+
+            void setNumValidShadows(unsigned int numValidShadows) { _numValidShadows = numValidShadows; }
+
         protected:
+            friend class MWShadowTechnique;
             virtual ~ViewDependentData() {}
 
             MWShadowTechnique*          _viewDependentShadowMap;
@@ -206,13 +228,19 @@ namespace SceneUtil {
 
             LightDataList               _lightDataList;
             ShadowDataList              _shadowDataList;
+
+            unsigned int _numValidShadows;
         };
 
         virtual ViewDependentData* createViewDependentData(osgUtil::CullVisitor* cv);
 
         ViewDependentData* getViewDependentData(osgUtil::CullVisitor* cv);
 
+        void copyShadowMap(osgUtil::CullVisitor& cv, ViewDependentData* lhs, ViewDependentData* rhs);
+
+        void setCustomFrustumCallback(CustomFrustumCallback* cfc);
 
+        void assignTexGenSettings(osgUtil::CullVisitor& cv, ViewDependentData* vdd);
 
         virtual void createShaders();
 
@@ -246,6 +274,8 @@ namespace SceneUtil {
         typedef std::map< osgUtil::CullVisitor*, osg::ref_ptr<ViewDependentData> >  ViewDependentDataMap;
         mutable std::mutex                      _viewDependentDataMapMutex;
         ViewDependentDataMap                    _viewDependentDataMap;
+        osg::ref_ptr<CustomFrustumCallback>     _customFrustumCallback;
+        osg::BoundingBoxd                       _customClipSpace;
 
         osg::ref_ptr<osg::StateSet>             _shadowRecievingPlaceholderStateSet;
 
diff --git a/components/sceneutil/rtt.cpp b/components/sceneutil/rtt.cpp
index 9fe9a44516..099425330a 100644
--- a/components/sceneutil/rtt.cpp
+++ b/components/sceneutil/rtt.cpp
@@ -4,11 +4,16 @@
 #include <osg/Node>
 #include <osg/NodeVisitor>
 #include <osg/Texture2D>
+#include <osg/Texture2DArray>
 #include <osgUtil/CullVisitor>
 
 #include <components/sceneutil/nodecallback.hpp>
 #include <components/settings/settings.hpp>
 #include <components/sceneutil/depth.hpp>
+#include <components/sceneutil/color.hpp>
+#include <components/stereo/multiview.hpp>
+#include <components/debug/debuglog.hpp>
+#include <components/stereo/stereomanager.hpp>
 
 namespace SceneUtil
 {
@@ -22,11 +27,15 @@ namespace SceneUtil
         }
     };
 
-    RTTNode::RTTNode(uint32_t textureWidth, uint32_t textureHeight, int renderOrderNum, bool doPerViewMapping)
+    RTTNode::RTTNode(uint32_t textureWidth, uint32_t textureHeight, uint32_t samples, bool generateMipmaps, int renderOrderNum, StereoAwareness stereoAwareness)
         : mTextureWidth(textureWidth)
         , mTextureHeight(textureHeight)
+        , mSamples(samples)
+        , mGenerateMipmaps(generateMipmaps)
+        , mColorBufferInternalFormat(Color::colorInternalFormat())
+        , mDepthBufferInternalFormat(AutoDepth::depthInternalFormat())
         , mRenderOrderNum(renderOrderNum)
-        , mDoPerViewMapping(doPerViewMapping)
+        , mStereoAwareness(stereoAwareness)
     {
         addCullCallback(new CullCallback);
         setCullingActive(false);
@@ -34,28 +43,139 @@ namespace SceneUtil
 
     RTTNode::~RTTNode()
     {
+        for (auto& vdd : mViewDependentDataMap)
+        {
+            auto* camera = vdd.second->mCamera.get();
+            if (camera)
+            {
+                camera->removeChildren(0, camera->getNumChildren());
+            }
+        }
+        mViewDependentDataMap.clear();
     }
 
     void RTTNode::cull(osgUtil::CullVisitor* cv)
     {
+        auto frameNumber = cv->getFrameStamp()->getFrameNumber();
         auto* vdd = getViewDependentData(cv);
-        apply(vdd->mCamera);
-        vdd->mCamera->accept(*cv);
+        if (frameNumber > vdd->mFrameNumber)
+        {
+            apply(vdd->mCamera);
+            auto& sm = Stereo::Manager::instance();
+            if (sm.getEye(cv) == Stereo::Eye::Left)
+                applyLeft(vdd->mCamera);
+            if (sm.getEye(cv) == Stereo::Eye::Right)
+                applyRight(vdd->mCamera);
+            vdd->mCamera->accept(*cv);
+        }
+        vdd->mFrameNumber = frameNumber;
+    }
+
+    void RTTNode::setColorBufferInternalFormat(GLint internalFormat)
+    {
+        mColorBufferInternalFormat = internalFormat;
+    }
+
+    void RTTNode::setDepthBufferInternalFormat(GLint internalFormat)
+    {
+        mDepthBufferInternalFormat = internalFormat;
+    }
+
+    bool RTTNode::shouldDoPerViewMapping()
+    {
+        if(mStereoAwareness != StereoAwareness::Aware)
+            return false;
+        if (!Stereo::getMultiview())
+            return true;
+        return false;
+    }
+
+    bool RTTNode::shouldDoTextureArray()
+    {
+        if (mStereoAwareness == StereoAwareness::Unaware)
+            return false;
+        if (Stereo::getMultiview())
+            return true;
+        return false;
+    }
+
+    bool RTTNode::shouldDoTextureView()
+    {
+        if (mStereoAwareness != StereoAwareness::Unaware_MultiViewShaders)
+            return false;
+        if (Stereo::getMultiview())
+            return true;
+        return false;
+    }
+
+    osg::Texture2DArray* RTTNode::createTextureArray(GLint internalFormat)
+    {
+        osg::Texture2DArray* textureArray = new osg::Texture2DArray;
+        textureArray->setTextureSize(mTextureWidth, mTextureHeight, 2);
+        textureArray->setInternalFormat(internalFormat);
+        GLenum sourceFormat = 0;
+        GLenum sourceType = 0;
+        if (SceneUtil::isDepthFormat(internalFormat))
+        {
+            SceneUtil::getDepthFormatSourceFormatAndType(internalFormat, sourceFormat, sourceType);
+        }
+        else
+        {
+            SceneUtil::getColorFormatSourceFormatAndType(internalFormat, sourceFormat, sourceType);
+        }
+        textureArray->setSourceFormat(sourceFormat);
+        textureArray->setSourceType(sourceType);
+        textureArray->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
+        textureArray->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
+        textureArray->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+        textureArray->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+        textureArray->setWrap(osg::Texture::WRAP_R, osg::Texture::CLAMP_TO_EDGE);
+        return textureArray;
+    }
+
+    osg::Texture2D* RTTNode::createTexture(GLint internalFormat)
+    {
+        osg::Texture2D* texture = new osg::Texture2D;
+        texture->setTextureSize(mTextureWidth, mTextureHeight);
+        texture->setInternalFormat(internalFormat);
+        GLenum sourceFormat = 0;
+        GLenum sourceType = 0;
+        if (SceneUtil::isDepthFormat(internalFormat))
+        {
+            SceneUtil::getDepthFormatSourceFormatAndType(internalFormat, sourceFormat, sourceType);
+        }
+        else
+        {
+            SceneUtil::getColorFormatSourceFormatAndType(internalFormat, sourceFormat, sourceType);
+        }
+        texture->setSourceFormat(sourceFormat);
+        texture->setSourceType(sourceType);
+        texture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
+        texture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
+        texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+        texture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+        texture->setWrap(osg::Texture::WRAP_R, osg::Texture::CLAMP_TO_EDGE);
+        return texture;
     }
 
     osg::Texture* RTTNode::getColorTexture(osgUtil::CullVisitor* cv)
     {
-        return getViewDependentData(cv)->mCamera->getBufferAttachmentMap()[osg::Camera::COLOR_BUFFER]._texture;
+        return getViewDependentData(cv)->mColorTexture;
     }
 
     osg::Texture* RTTNode::getDepthTexture(osgUtil::CullVisitor* cv)
     {
-        return getViewDependentData(cv)->mCamera->getBufferAttachmentMap()[osg::Camera::PACKED_DEPTH_STENCIL_BUFFER]._texture;
+        return getViewDependentData(cv)->mDepthTexture;
+    }
+
+    osg::Camera* RTTNode::getCamera(osgUtil::CullVisitor* cv)
+    {
+        return getViewDependentData(cv)->mCamera;
     }
 
     RTTNode::ViewDependentData* RTTNode::getViewDependentData(osgUtil::CullVisitor* cv)
     {
-        if (!mDoPerViewMapping)
+        if (!shouldDoPerViewMapping())
             // Always setting it to null is an easy way to disable per-view mapping when mDoPerViewMapping is false.
             // This is safe since the visitor is never dereferenced.
             cv = nullptr;
@@ -63,7 +183,8 @@ namespace SceneUtil
         if (mViewDependentDataMap.count(cv) == 0)
         {
             auto camera = new osg::Camera();
-            mViewDependentDataMap[cv].reset(new ViewDependentData);
+            auto vdd = std::make_shared<ViewDependentData>();
+            mViewDependentDataMap[cv] = vdd;
             mViewDependentDataMap[cv]->mCamera = camera;
 
             camera->setRenderOrder(osg::Camera::PRE_RENDER, mRenderOrderNum);
@@ -72,34 +193,63 @@ namespace SceneUtil
             camera->setViewport(0, 0, mTextureWidth, mTextureHeight);
             SceneUtil::setCameraClearDepth(camera);
 
-            setDefaults(mViewDependentDataMap[cv]->mCamera.get());
+            setDefaults(camera);
+
+            if (camera->getBufferAttachmentMap().count(osg::Camera::COLOR_BUFFER))
+                vdd->mColorTexture = camera->getBufferAttachmentMap()[osg::Camera::COLOR_BUFFER]._texture;
+            if (camera->getBufferAttachmentMap().count(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER))
+                vdd->mDepthTexture = camera->getBufferAttachmentMap()[osg::Camera::PACKED_DEPTH_STENCIL_BUFFER]._texture;
 
-            // Create any buffer attachments not added in setDefaults
-            if (camera->getBufferAttachmentMap().count(osg::Camera::COLOR_BUFFER) == 0)
+#ifdef OSG_HAS_MULTIVIEW
+            if (shouldDoTextureArray())
             {
-                auto colorBuffer = new osg::Texture2D;
-                colorBuffer->setTextureSize(mTextureWidth, mTextureHeight);
-                colorBuffer->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
-                colorBuffer->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
-                colorBuffer->setInternalFormat(GL_RGB);
-                colorBuffer->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
-                colorBuffer->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
-                camera->attach(osg::Camera::COLOR_BUFFER, colorBuffer);
-                SceneUtil::attachAlphaToCoverageFriendlyFramebufferToCamera(camera, osg::Camera::COLOR_BUFFER, colorBuffer);
+                // Create any buffer attachments not added in setDefaults
+                if (camera->getBufferAttachmentMap().count(osg::Camera::COLOR_BUFFER) == 0)
+                {
+                    vdd->mColorTexture = createTextureArray(mColorBufferInternalFormat);
+                    camera->attach(osg::Camera::COLOR_BUFFER, vdd->mColorTexture, 0, osg::Camera::FACE_CONTROLLED_BY_MULTIVIEW_SHADER, mGenerateMipmaps, mSamples);
+                    SceneUtil::attachAlphaToCoverageFriendlyFramebufferToCamera(camera, osg::Camera::COLOR_BUFFER, vdd->mColorTexture, 0, osg::Camera::FACE_CONTROLLED_BY_MULTIVIEW_SHADER, mGenerateMipmaps);
+                }
+
+                if (camera->getBufferAttachmentMap().count(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER) == 0)
+                {
+                    vdd->mDepthTexture = createTextureArray(mDepthBufferInternalFormat);
+                    camera->attach(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, vdd->mDepthTexture, 0, osg::Camera::FACE_CONTROLLED_BY_MULTIVIEW_SHADER, false, mSamples);
+                }
+
+                if (shouldDoTextureView())
+                {
+                    // In this case, shaders being set to multiview forces us to render to a multiview framebuffer even though we don't need that.
+                    // This forces us to make Texture2DArray. To make this possible to sample as a Texture2D, make a Texture2D view into the texture array.
+                    vdd->mColorTexture = Stereo::createTextureView_Texture2DFromTexture2DArray(static_cast<osg::Texture2DArray*>(vdd->mColorTexture.get()), 0);
+                    vdd->mDepthTexture = Stereo::createTextureView_Texture2DFromTexture2DArray(static_cast<osg::Texture2DArray*>(vdd->mDepthTexture.get()), 0);
+                }
+            }
+            else
+#endif
+            {
+                // Create any buffer attachments not added in setDefaults
+                if (camera->getBufferAttachmentMap().count(osg::Camera::COLOR_BUFFER) == 0)
+                {
+                    vdd->mColorTexture = createTexture(mColorBufferInternalFormat);
+                    camera->attach(osg::Camera::COLOR_BUFFER, vdd->mColorTexture, 0, 0, mGenerateMipmaps, mSamples);
+                    SceneUtil::attachAlphaToCoverageFriendlyFramebufferToCamera(camera, osg::Camera::COLOR_BUFFER, vdd->mColorTexture, 0, 0, mGenerateMipmaps);
+                }
+
+                if (camera->getBufferAttachmentMap().count(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER) == 0)
+                {
+                    vdd->mDepthTexture = createTexture(mDepthBufferInternalFormat);
+                    camera->attach(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, vdd->mDepthTexture, 0, 0, false, mSamples);
+                }
             }
 
-            if (camera->getBufferAttachmentMap().count(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER) == 0)
+            // OSG appears not to properly initialize this metadata. So when multisampling is enabled, OSG will use incorrect formats for the resolve buffers.
+            if (mSamples > 1)
             {
-                auto depthBuffer = new osg::Texture2D;
-                depthBuffer->setTextureSize(mTextureWidth, mTextureHeight);
-                depthBuffer->setSourceFormat(GL_DEPTH_STENCIL_EXT);
-                depthBuffer->setInternalFormat(GL_DEPTH24_STENCIL8_EXT);
-                depthBuffer->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
-                depthBuffer->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
-                depthBuffer->setSourceType(GL_UNSIGNED_INT_24_8_EXT);
-                depthBuffer->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
-                depthBuffer->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
-                camera->attach(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, depthBuffer);
+                camera->getBufferAttachmentMap()[osg::Camera::COLOR_BUFFER]._internalFormat = mColorBufferInternalFormat;
+                camera->getBufferAttachmentMap()[osg::Camera::COLOR_BUFFER]._mipMapGeneration = mGenerateMipmaps;
+                camera->getBufferAttachmentMap()[osg::Camera::PACKED_DEPTH_STENCIL_BUFFER]._internalFormat = mDepthBufferInternalFormat;
+                camera->getBufferAttachmentMap()[osg::Camera::PACKED_DEPTH_STENCIL_BUFFER]._mipMapGeneration = mGenerateMipmaps;
             }
         }
 
diff --git a/components/sceneutil/rtt.hpp b/components/sceneutil/rtt.hpp
index c587006c96..ec8243792f 100644
--- a/components/sceneutil/rtt.hpp
+++ b/components/sceneutil/rtt.hpp
@@ -9,6 +9,7 @@
 namespace osg
 {
     class Texture2D;
+    class Texture2DArray;
     class Camera;
 }
 
@@ -19,6 +20,8 @@ namespace osgUtil
 
 namespace SceneUtil
 {
+    class CreateTextureViewsCallback;
+
     /// @brief Implements per-view RTT operations.
     /// @par With a naive RTT implementation, subsequent views of multiple views will overwrite the results of the previous views, leading to
     ///     the results of the last view being broadcast to all views. An error in all cases where the RTT result depends on the view.
@@ -32,37 +35,73 @@ namespace SceneUtil
     class RTTNode : public osg::Node
     {
     public:
-        RTTNode(uint32_t textureWidth, uint32_t textureHeight, int renderOrderNum, bool doPerViewMapping);
+        enum class StereoAwareness
+        {
+            Unaware, //! RTT does not vary by view. A single RTT context is created
+            Aware, //! RTT varies by view. One RTT context per view is created. Textures are automatically created as arrays if multiview is enabled.
+            Unaware_MultiViewShaders, //! RTT does not vary by view, but renders with multiview shaders and needs to create texture arrays if multiview is enabled.
+        };
+
+        RTTNode(uint32_t textureWidth, uint32_t textureHeight, uint32_t samples, bool generateMipmaps, int renderOrderNum, StereoAwareness stereoAwareness);
         ~RTTNode();
 
         osg::Texture* getColorTexture(osgUtil::CullVisitor* cv);
 
         osg::Texture* getDepthTexture(osgUtil::CullVisitor* cv);
 
+        osg::Camera* getCamera(osgUtil::CullVisitor* cv);
 
-        /// Apply state - to override in derived classes
-        /// @note Due to the view mapping approach you *have* to apply all camera settings, even if they have not changed since the last frame.
+        /// Set default settings - optionally override in derived classes
         virtual void setDefaults(osg::Camera* camera) {};
 
-        /// Set default settings - optionally override in derived classes
+        /// Apply state - to override in derived classes
+        /// @note Due to the view mapping approach you *have* to apply all camera settings, even if they have not changed since the last frame.
         virtual void apply(osg::Camera* camera) {};
 
+        /// Apply any state specific to the Left view. Default implementation does nothing. Called after apply()
+        virtual void applyLeft(osg::Camera* camera) {}
+        /// Apply any state specific to the Right view. Default implementation does nothing. Called after apply()
+        virtual void applyRight(osg::Camera* camera) {}
+
         void cull(osgUtil::CullVisitor* cv);
 
+        uint32_t width() const { return mTextureWidth; }
+        uint32_t height() const { return mTextureHeight; }
+        uint32_t samples() const { return mSamples; }
+        bool generatesMipmaps() const { return mGenerateMipmaps; }
+
+        void setColorBufferInternalFormat(GLint internalFormat);
+        void setDepthBufferInternalFormat(GLint internalFormat);
+
+    protected:
+        bool shouldDoPerViewMapping();
+        bool shouldDoTextureArray();
+        bool shouldDoTextureView();
+        osg::Texture2DArray* createTextureArray(GLint internalFormat);
+        osg::Texture2D* createTexture(GLint internalFormat);
+
     private:
+        friend class CreateTextureViewsCallback;
         struct ViewDependentData
         {
             osg::ref_ptr<osg::Camera> mCamera;
+            osg::ref_ptr<osg::Texture> mColorTexture;
+            osg::ref_ptr<osg::Texture> mDepthTexture;
+            unsigned int mFrameNumber = 0;
         };
 
         ViewDependentData* getViewDependentData(osgUtil::CullVisitor* cv);
 
-        typedef std::map< osgUtil::CullVisitor*, std::unique_ptr<ViewDependentData> >  ViewDependentDataMap;
+        typedef std::map< osgUtil::CullVisitor*, std::shared_ptr<ViewDependentData> >  ViewDependentDataMap;
         ViewDependentDataMap mViewDependentDataMap;
         uint32_t mTextureWidth;
         uint32_t mTextureHeight;
+        uint32_t mSamples;
+        bool mGenerateMipmaps;
+        GLint mColorBufferInternalFormat;
+        GLint mDepthBufferInternalFormat;
         int mRenderOrderNum;
-        bool mDoPerViewMapping;
+        StereoAwareness mStereoAwareness;
     };
 }
 #endif
diff --git a/components/sceneutil/shadow.cpp b/components/sceneutil/shadow.cpp
index dfe4cf1507..5220fce78a 100644
--- a/components/sceneutil/shadow.cpp
+++ b/components/sceneutil/shadow.cpp
@@ -5,6 +5,7 @@
 
 #include <components/misc/stringops.hpp>
 #include <components/settings/settings.hpp>
+#include <components/stereo/stereomanager.hpp>
 
 #include "mwshadowtechnique.hpp"
 
@@ -101,6 +102,7 @@ namespace SceneUtil
         mIndoorShadowCastingMask(indoorShadowCastingMask)
     {
         mShadowedScene->setShadowTechnique(mShadowTechnique);
+        Stereo::Manager::instance().setShadowTechnique(mShadowTechnique);
 
         mShadowedScene->addChild(sceneRoot);
         rootNode->addChild(mShadowedScene);
@@ -117,6 +119,7 @@ namespace SceneUtil
 
     ShadowManager::~ShadowManager()
     {
+        Stereo::Manager::instance().setShadowTechnique(nullptr);
     }
 
     Shader::ShaderManager::DefineMap ShadowManager::getShadowDefines()
diff --git a/components/sceneutil/statesetupdater.cpp b/components/sceneutil/statesetupdater.cpp
index 9ef82b9271..9778cf4852 100644
--- a/components/sceneutil/statesetupdater.cpp
+++ b/components/sceneutil/statesetupdater.cpp
@@ -1,5 +1,7 @@
 #include "statesetupdater.hpp"
 
+#include <components/stereo/stereomanager.hpp>
+
 #include <osg/Node>
 #include <osg/NodeVisitor>
 #include <osgUtil/CullVisitor>
@@ -38,6 +40,12 @@ namespace SceneUtil
     {
         auto stateset = getCvDependentStateset(cv);
         apply(stateset, cv);
+        auto& sm = Stereo::Manager::instance();
+        if (sm.getEye(cv) == Stereo::Eye::Left)
+            applyLeft(stateset, cv);
+        if (sm.getEye(cv) == Stereo::Eye::Right)
+            applyRight(stateset, cv);
+
         cv->pushStateSet(stateset);
         traverse(node, cv);
         cv->popStateSet();
diff --git a/components/sceneutil/statesetupdater.hpp b/components/sceneutil/statesetupdater.hpp
index cc2e248457..fb8a9c2fc9 100644
--- a/components/sceneutil/statesetupdater.hpp
+++ b/components/sceneutil/statesetupdater.hpp
@@ -41,6 +41,11 @@ namespace SceneUtil
         /// even if it has not changed since the last frame.
         virtual void apply(osg::StateSet* stateset, osg::NodeVisitor* nv) {}
 
+        /// Apply any state specific to the Left view. Default implementation does nothing. Called after apply() \note requires the updater be a cull callback
+        virtual void applyLeft(osg::StateSet* stateset, osgUtil::CullVisitor* nv) {}
+        /// Apply any state specific to the Right view. Default implementation does nothing. Called after apply() \note requires the updater be a cull callback
+        virtual void applyRight(osg::StateSet* stateset, osgUtil::CullVisitor* nv) {}
+
         /// Set default state - optionally override in derived classes
         /// @par May be used e.g. to allocate StateAttributes.
         virtual void setDefaults(osg::StateSet* stateset) {}
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index d8bbeeadc2..8923fec666 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -18,6 +18,7 @@
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/stringops.hpp>
+#include <components/stereo/stereomanager.hpp>
 #include <components/resource/imagemanager.hpp>
 #include <components/vfs/manager.hpp>
 #include <components/sceneutil/riggeometry.hpp>
@@ -647,6 +648,8 @@ namespace Shader
 
         defineMap["softParticles"] = reqs.mSoftParticles ? "1" : "0";
 
+        Stereo::Manager::instance().shaderStereoDefines(defineMap);
+
         std::string shaderPrefix;
         if (!node.getUserValue("shaderPrefix", shaderPrefix))
             shaderPrefix = mDefaultShaderPrefix;
diff --git a/components/stereo/frustum.cpp b/components/stereo/frustum.cpp
new file mode 100644
index 0000000000..81fd022f58
--- /dev/null
+++ b/components/stereo/frustum.cpp
@@ -0,0 +1,162 @@
+#include "stereomanager.hpp"
+#include "multiview.hpp"
+
+#include <osg/io_utils>
+#include <osg/Texture2D>
+#include <osg/Texture2DMultisample>
+#include <osg/Texture2DArray>
+#include <osg/DisplaySettings>
+
+#include <osgUtil/CullVisitor>
+#include <osgUtil/RenderStage>
+
+#include <osgViewer/Renderer>
+#include <osgViewer/Viewer>
+
+#include <iostream>
+#include <map>
+#include <string>
+
+#include <components/debug/debuglog.hpp>
+
+#include <components/sceneutil/statesetupdater.hpp>
+#include <components/sceneutil/visitor.hpp>
+#include <components/sceneutil/util.hpp>
+#include <components/sceneutil/depth.hpp>
+#include <components/sceneutil/color.hpp>
+#include <components/sceneutil/mwshadowtechnique.hpp>
+
+#include <components/settings/settings.hpp>
+
+#include <components/misc/stringops.hpp>
+#include "frustum.hpp"
+
+namespace Stereo
+{
+#ifdef OSG_HAS_MULTIVIEW
+    struct MultiviewFrustumCallback final : public osg::CullSettings::InitialFrustumCallback
+    {
+        MultiviewFrustumCallback(StereoFrustumManager* sfm)
+            : mSfm(sfm)
+        {
+
+        }
+
+        void setInitialFrustum(osg::CullStack& cullStack, osg::Polytope& frustum) const override
+        {
+            auto cm = cullStack.getCullingMode();
+            bool nearCulling = !!(cm & osg::CullSettings::NEAR_PLANE_CULLING);
+            bool farCulling = !!(cm & osg::CullSettings::FAR_PLANE_CULLING);
+            frustum.setToBoundingBox(mSfm->boundingBox(), nearCulling, farCulling);
+        }
+
+        StereoFrustumManager* mSfm;
+    };
+#endif
+
+    struct ShadowFrustumCallback final : public SceneUtil::MWShadowTechnique::CustomFrustumCallback
+    {
+        ShadowFrustumCallback(StereoFrustumManager* parent) : mParent(parent)
+        {
+        }
+
+        void operator()(osgUtil::CullVisitor& cv, osg::BoundingBoxd& customClipSpace, osgUtil::CullVisitor*& sharedFrustumHint) override
+        {
+            mParent->customFrustumCallback(cv, customClipSpace, sharedFrustumHint);
+        }
+
+        StereoFrustumManager* mParent;
+    };
+
+    void joinBoundingBoxes(const osg::Matrix& masterProjection, const osg::Matrix& slaveProjection, osg::BoundingBoxd& bb)
+    {
+        static const std::array<osg::Vec3d, 8> clipCorners = {{
+            {-1.0, -1.0, -1.0},
+            { 1.0, -1.0, -1.0},
+            { 1.0, -1.0,  1.0},
+            {-1.0, -1.0,  1.0},
+            {-1.0,  1.0, -1.0},
+            { 1.0,  1.0, -1.0},
+            { 1.0,  1.0,  1.0},
+            {-1.0,  1.0,  1.0}
+        }};
+
+        osg::Matrix slaveClipToView;
+        slaveClipToView.invert(slaveProjection);
+
+        for (const auto& clipCorner : clipCorners)
+        {
+            auto masterViewVertice = clipCorner * slaveClipToView;
+            auto masterClipVertice = masterViewVertice * masterProjection;
+            bb.expandBy(masterClipVertice);
+        }
+    }
+
+    StereoFrustumManager::StereoFrustumManager(osg::Camera* camera)
+        : mCamera(camera)
+        , mShadowTechnique(nullptr)
+        , mShadowFrustumCallback(nullptr)
+    {
+        if (Stereo::getMultiview())
+        {
+#ifdef OSG_HAS_MULTIVIEW
+            mMultiviewFrustumCallback = new MultiviewFrustumCallback(this);
+            mCamera->setInitialFrustumCallback(mMultiviewFrustumCallback);
+#endif
+        }
+
+        if (Settings::Manager::getBool("shared shadow maps", "Stereo"))
+        {
+            mShadowFrustumCallback = new ShadowFrustumCallback(this);
+            auto* renderer = static_cast<osgViewer::Renderer*>(mCamera->getRenderer());
+            for (auto* sceneView : { renderer->getSceneView(0), renderer->getSceneView(1) })
+            {
+                mSharedFrustums[sceneView->getCullVisitorRight()] = sceneView->getCullVisitorLeft();
+            }
+        }
+    }
+
+    StereoFrustumManager::~StereoFrustumManager()
+    {
+        if (Stereo::getMultiview())
+        {
+#ifdef OSG_HAS_MULTIVIEW
+            mCamera->setInitialFrustumCallback(nullptr);
+#endif
+        }
+
+        if (mShadowTechnique)
+            mShadowTechnique->setCustomFrustumCallback(nullptr);
+    }
+
+    void StereoFrustumManager::setShadowTechnique(
+        SceneUtil::MWShadowTechnique* shadowTechnique)
+    {
+        if (mShadowTechnique)
+            mShadowTechnique->setCustomFrustumCallback(nullptr);
+        mShadowTechnique = shadowTechnique;
+        if (mShadowTechnique)
+            mShadowTechnique->setCustomFrustumCallback(mShadowFrustumCallback);
+    }
+
+    void StereoFrustumManager::customFrustumCallback(
+        osgUtil::CullVisitor& cv, 
+        osg::BoundingBoxd& customClipSpace,
+        osgUtil::CullVisitor*& sharedFrustumHint)
+    {
+        auto it = mSharedFrustums.find(&cv);
+        if (it != mSharedFrustums.end())
+        {
+            sharedFrustumHint = it->second;
+        }
+
+        customClipSpace = mBoundingBox;
+    }
+
+    void StereoFrustumManager::update(std::array<osg::Matrix, 2> projections)
+    {
+        mBoundingBox.init();
+        for (auto& projection : projections)
+            joinBoundingBoxes(mCamera->getProjectionMatrix(), projection, mBoundingBox);
+    }
+}
diff --git a/components/stereo/frustum.hpp b/components/stereo/frustum.hpp
new file mode 100644
index 0000000000..579d3b6876
--- /dev/null
+++ b/components/stereo/frustum.hpp
@@ -0,0 +1,76 @@
+#ifndef STEREO_FRUSTUM_H
+#define STEREO_FRUSTUM_H
+
+#include <osg/Matrix>
+#include <osg/Vec3>
+#include <osg/Camera>
+#include <osg/StateSet>
+#include <osg/BoundingBox>
+
+#include <memory>
+#include <array>
+#include <map>
+
+#include <components/stereo/types.hpp>
+
+namespace osg
+{
+    class FrameBufferObject;
+    class Texture2D;
+    class Texture2DMultisample;
+    class Texture2DArray;
+}
+
+namespace osgViewer
+{
+    class Viewer;
+}
+
+namespace usgUtil
+{
+    class CullVisitor;
+}
+
+namespace SceneUtil
+{
+    class MWShadowTechnique;
+}
+
+namespace Stereo
+{
+#ifdef OSG_HAS_MULTIVIEW
+    struct MultiviewFrustumCallback;
+#endif
+
+    struct ShadowFrustumCallback;
+
+    void joinBoundingBoxes(const osg::Matrix& masterProjection, const osg::Matrix& slaveProjection, osg::BoundingBoxd& bb);
+    
+    class StereoFrustumManager
+    {
+    public:
+        StereoFrustumManager(osg::Camera* camera);
+        ~StereoFrustumManager();
+
+        void update(std::array<osg::Matrix, 2> projections);
+
+        const osg::BoundingBoxd& boundingBox() const { return mBoundingBox; }
+
+        void setShadowTechnique(SceneUtil::MWShadowTechnique* shadowTechnique);
+
+        void customFrustumCallback(osgUtil::CullVisitor& cv, osg::BoundingBoxd& customClipSpace, osgUtil::CullVisitor*& sharedFrustumHint);
+
+    private:
+        osg::ref_ptr<osg::Camera> mCamera;
+        osg::ref_ptr<SceneUtil::MWShadowTechnique> mShadowTechnique;
+        osg::ref_ptr<ShadowFrustumCallback> mShadowFrustumCallback;
+        std::map< osgUtil::CullVisitor*, osgUtil::CullVisitor*> mSharedFrustums;
+        osg::BoundingBoxd mBoundingBox;
+
+#ifdef OSG_HAS_MULTIVIEW
+        osg::ref_ptr<MultiviewFrustumCallback> mMultiviewFrustumCallback;
+#endif
+    };
+}
+
+#endif
diff --git a/components/stereo/multiview.cpp b/components/stereo/multiview.cpp
new file mode 100644
index 0000000000..56c1ada349
--- /dev/null
+++ b/components/stereo/multiview.cpp
@@ -0,0 +1,484 @@
+#include "multiview.hpp"
+
+#include <osg/FrameBufferObject>
+#include <osg/GLExtensions>
+#include <osg/Texture2D>
+#include <osg/Texture2DMultisample>
+#include <osg/Texture2DArray>
+#include <osgUtil/RenderStage>
+#include <osgUtil/CullVisitor>
+
+#include <components/sceneutil/nodecallback.hpp>
+#include <components/settings/settings.hpp>
+#include <components/debug/debuglog.hpp>
+#include <components/stereo/stereomanager.hpp>
+
+#include <algorithm>
+
+namespace Stereo
+{
+    namespace
+    {
+        bool getMultiviewSupportedImpl(unsigned int contextID)
+        {
+#ifdef OSG_HAS_MULTIVIEW
+            if (!osg::isGLExtensionSupported(contextID, "GL_OVR_multiview"))
+            {
+                Log(Debug::Verbose) << "Disabling Multiview (opengl extension \"GL_OVR_multiview\" not supported)";
+                return false;
+            }
+
+            if (!osg::isGLExtensionSupported(contextID, "GL_OVR_multiview2"))
+            {
+                Log(Debug::Verbose) << "Disabling Multiview (opengl extension \"GL_OVR_multiview2\" not supported)";
+                return false;
+            }
+            return true;
+#else
+            Log(Debug::Verbose) << "Disabling Multiview (OSG does not support multiview)";
+            return false;
+#endif
+        }
+
+        bool getMultiviewSupported(unsigned int contextID)
+        {
+            static bool supported = getMultiviewSupportedImpl(contextID);
+            return supported;
+        }
+
+        bool getTextureViewSupportedImpl(unsigned int contextID)
+        {
+            if (!osg::isGLExtensionOrVersionSupported(contextID, "ARB_texture_view", 4.3))
+            {
+                Log(Debug::Verbose) << "Disabling texture views (opengl extension \"ARB_texture_view\" not supported)";
+                return false;
+            }
+            return true;
+        }
+
+        bool getTextureViewSupported(unsigned int contextID)
+        {
+            static bool supported = getTextureViewSupportedImpl(contextID);
+            return supported;
+        }
+
+        bool getMultiviewImpl(unsigned int contextID)
+        {
+            if (!Stereo::getStereo())
+            {
+                Log(Debug::Verbose) << "Disabling Multiview (disabled by config)";
+                return false;
+            }
+
+            if (!Settings::Manager::getBool("multiview", "Stereo"))
+            {
+                Log(Debug::Verbose) << "Disabling Multiview (disabled by config)";
+                return false;
+            }
+
+            if (!getMultiviewSupported(contextID))
+            {
+                return false;
+            }
+
+            if (!getTextureViewSupported(contextID))
+            {
+                Log(Debug::Verbose) << "Disabling Multiview (texture views not supported)";
+                return false;
+            }
+
+            Log(Debug::Verbose) << "Enabling Multiview";
+            return true;
+        }
+
+        bool getMultiview(unsigned int contextID)
+        {
+            static bool multiView = getMultiviewImpl(contextID);
+            return multiView;
+        }
+    }
+
+    bool getTextureViewSupported()
+    {
+        return getTextureViewSupported(0);
+    }
+
+    bool getMultiview()
+    {
+        return getMultiview(0);
+    }
+
+    void configureExtensions(unsigned int contextID)
+    {
+        getTextureViewSupported(contextID);
+        getMultiviewSupported(contextID);
+        getMultiview(contextID);
+    }
+
+    void setVertexBufferHint()
+    {
+        if (getStereo() && Settings::Manager::getBool("multiview", "Stereo"))
+        {
+            auto* ds = osg::DisplaySettings::instance().get();
+            if (!Settings::Manager::getBool("allow display lists for multiview", "Stereo")
+                && ds->getVertexBufferHint() == osg::DisplaySettings::VertexBufferHint::NO_PREFERENCE)
+            {
+                // Note that this only works if this code is executed before realize() is called on the viewer.
+                // The hint is read by the state object only once, before the user realize operations are run. 
+                // Therefore we have to set this hint without access to a graphics context to let us determine 
+                // if multiview will actually be supported or not. So if the user has requested multiview, we
+                // will just have to set it regardless.
+                ds->setVertexBufferHint(osg::DisplaySettings::VertexBufferHint::VERTEX_BUFFER_OBJECT);
+                Log(Debug::Verbose) << "Disabling display lists";
+            }
+        }
+    }
+
+    class Texture2DViewSubloadCallback : public osg::Texture2D::SubloadCallback
+    {
+    public:
+        Texture2DViewSubloadCallback(osg::Texture2DArray* textureArray, int layer);
+
+        void load(const osg::Texture2D& texture, osg::State& state) const override;
+        void subload(const osg::Texture2D& texture, osg::State& state) const override;
+
+    private:
+        osg::ref_ptr<osg::Texture2DArray> mTextureArray;
+        int mLayer;
+    };
+
+    Texture2DViewSubloadCallback::Texture2DViewSubloadCallback(osg::Texture2DArray* textureArray, int layer)
+        : mTextureArray(textureArray)
+        , mLayer(layer)
+    {
+    }
+
+    void Texture2DViewSubloadCallback::load(const osg::Texture2D& texture, osg::State& state) const
+    {
+        state.checkGLErrors("before Texture2DViewSubloadCallback::load()");
+
+        auto contextId = state.getContextID();
+        auto* gl = osg::GLExtensions::Get(contextId, false);
+        mTextureArray->apply(state);
+
+        auto sourceTextureObject = mTextureArray->getTextureObject(contextId);
+        if (!sourceTextureObject)
+        {
+            Log(Debug::Error) << "Texture2DViewSubloadCallback: Texture2DArray did not have a texture object";
+            return;
+        }
+
+        auto targetTextureObject = texture.getTextureObject(contextId);
+        if (!sourceTextureObject)
+        {
+            Log(Debug::Error) << "Texture2DViewSubloadCallback: Texture2D did not have a texture object";
+            return;
+        }
+
+
+        // OSG already bound this texture ID, giving it a target.
+        // Delete it and make a new texture ID.
+        glBindTexture(GL_TEXTURE_2D, 0);
+        glDeleteTextures(1, &targetTextureObject->_id);
+        glGenTextures(1, &targetTextureObject->_id);
+
+        auto sourceId = sourceTextureObject->_id;
+        auto targetId = targetTextureObject->_id;
+        auto internalFormat = sourceTextureObject->_profile._internalFormat;
+        auto levels = std::max(1, sourceTextureObject->_profile._numMipmapLevels);
+
+        {
+            ////// OSG BUG
+            // Texture views require immutable storage. 
+            // OSG should always give immutable storage to sized internal formats, but does not do so for depth formats.
+            // Fortunately, we can just call glTexStorage3D here to make it immutable. This probably discards depth info for that frame, but whatever.
+#ifndef GL_TEXTURE_IMMUTABLE_FORMAT
+#define GL_TEXTURE_IMMUTABLE_FORMAT 0x912F 
+#endif
+            // Store any current binding and re-apply it after so i don't mess with state.
+            GLint oldBinding = 0;
+            glGetIntegerv(GL_TEXTURE_BINDING_2D_ARRAY, &oldBinding);
+
+            // Bind the source texture and check if it's immutable.
+            glBindTexture(GL_TEXTURE_2D_ARRAY, sourceId);
+            GLint immutable = 0;
+            glGetTexParameteriv(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_IMMUTABLE_FORMAT, &immutable);
+            if(!immutable)
+            {
+                // It wasn't immutable, so make it immutable.
+                gl->glTexStorage3D(GL_TEXTURE_2D_ARRAY, 1, internalFormat, sourceTextureObject->_profile._width, sourceTextureObject->_profile._height, 2);
+                state.checkGLErrors("after Texture2DViewSubloadCallback::load()::glTexStorage3D");
+            }
+            glBindTexture(GL_TEXTURE_2D_ARRAY, oldBinding);
+        }
+
+        gl->glTextureView(targetId, GL_TEXTURE_2D, sourceId, internalFormat, 0, levels, mLayer, 1);
+        state.checkGLErrors("after Texture2DViewSubloadCallback::load()::glTextureView");
+        glBindTexture(GL_TEXTURE_2D, targetId);
+    }
+
+    void Texture2DViewSubloadCallback::subload(const osg::Texture2D& texture, osg::State& state) const
+    {
+        // Nothing to do
+    }
+
+    osg::ref_ptr<osg::Texture2D> createTextureView_Texture2DFromTexture2DArray(osg::Texture2DArray* textureArray, int layer)
+    {
+        if (!getTextureViewSupported())
+        {
+            Log(Debug::Error) << "createTextureView_Texture2DFromTexture2DArray: Tried to use a texture view but glTextureView is not supported";
+            return nullptr;
+        }
+
+        osg::ref_ptr<osg::Texture2D> texture2d = new osg::Texture2D;
+        texture2d->setSubloadCallback(new Texture2DViewSubloadCallback(textureArray, layer));
+        texture2d->setTextureSize(textureArray->getTextureWidth(), textureArray->getTextureHeight());
+        texture2d->setBorderColor(textureArray->getBorderColor());
+        texture2d->setBorderWidth(textureArray->getBorderWidth());
+        texture2d->setLODBias(textureArray->getLODBias());
+        texture2d->setFilter(osg::Texture::FilterParameter::MAG_FILTER, textureArray->getFilter(osg::Texture::FilterParameter::MAG_FILTER));
+        texture2d->setFilter(osg::Texture::FilterParameter::MIN_FILTER, textureArray->getFilter(osg::Texture::FilterParameter::MIN_FILTER));
+        texture2d->setInternalFormat(textureArray->getInternalFormat());
+        texture2d->setNumMipmapLevels(textureArray->getNumMipmapLevels());
+        return texture2d;
+    }
+
+    class UpdateRenderStagesCallback : public SceneUtil::NodeCallback<UpdateRenderStagesCallback, osg::Node*, osgUtil::CullVisitor*>
+    {
+    public:
+        UpdateRenderStagesCallback(Stereo::MultiviewFramebuffer* multiviewFramebuffer)
+            : mMultiviewFramebuffer(multiviewFramebuffer)
+        {
+            mViewport = new osg::Viewport(0, 0, multiviewFramebuffer->width(), multiviewFramebuffer->height());
+            mViewportStateset = new osg::StateSet();
+            mViewportStateset->setAttribute(mViewport.get());
+        }
+
+        void operator()(osg::Node* node, osgUtil::CullVisitor* cv)
+        {
+            osgUtil::RenderStage* renderStage = cv->getCurrentRenderStage();
+
+            bool msaa = mMultiviewFramebuffer->samples() > 1;
+
+            if (!Stereo::getMultiview())
+            {
+                auto eye = static_cast<int>(Stereo::Manager::instance().getEye(cv));
+
+                if (msaa)
+                {
+                    renderStage->setFrameBufferObject(mMultiviewFramebuffer->layerMsaaFbo(eye));
+                    renderStage->setMultisampleResolveFramebufferObject(mMultiviewFramebuffer->layerFbo(eye));
+                }
+                else
+                {
+                    renderStage->setFrameBufferObject(mMultiviewFramebuffer->layerFbo(eye));
+                }
+            }
+
+            // OSG tries to do a horizontal split, but we want to render to separate framebuffers instead.
+            renderStage->setViewport(mViewport);
+            cv->pushStateSet(mViewportStateset.get());
+            traverse(node, cv);
+            cv->popStateSet();
+        }
+
+    private:
+        Stereo::MultiviewFramebuffer* mMultiviewFramebuffer;
+        osg::ref_ptr<osg::Viewport> mViewport;
+        osg::ref_ptr<osg::StateSet> mViewportStateset;
+    };
+
+    MultiviewFramebuffer::MultiviewFramebuffer(int width, int height, int samples)
+        : mWidth(width)
+        , mHeight(height)
+        , mSamples(samples)
+        , mMultiview(getMultiview())
+        , mMultiviewFbo{ new osg::FrameBufferObject }
+        , mLayerFbo{ new osg::FrameBufferObject, new osg::FrameBufferObject }
+        , mLayerMsaaFbo{ new osg::FrameBufferObject, new osg::FrameBufferObject }
+    {
+    }
+
+    MultiviewFramebuffer::~MultiviewFramebuffer()
+    {
+    }
+
+    void MultiviewFramebuffer::attachColorComponent(GLint sourceFormat, GLint sourceType, GLint internalFormat)
+    {
+        if (mMultiview)
+        {
+#ifdef OSG_HAS_MULTIVIEW
+            mMultiviewColorTexture = createTextureArray(sourceFormat, sourceType, internalFormat);
+            mMultiviewFbo->setAttachment(osg::Camera::COLOR_BUFFER, osg::FrameBufferAttachment(mMultiviewColorTexture, osg::Camera::FACE_CONTROLLED_BY_MULTIVIEW_SHADER, 0));
+            for (unsigned i = 0; i < 2; i++)
+            {
+                mColorTexture[i] = createTextureView_Texture2DFromTexture2DArray(mMultiviewColorTexture.get(), i);
+                mLayerFbo[i]->setAttachment(osg::Camera::COLOR_BUFFER, osg::FrameBufferAttachment(mColorTexture[i]));
+            }
+#endif
+        }
+        else
+        {
+            for (unsigned i = 0; i < 2; i++)
+            {
+                if (mSamples > 1)
+                {
+                    mMsaaColorTexture[i] = createTextureMsaa(sourceFormat, sourceType, internalFormat);
+                    mLayerMsaaFbo[i]->setAttachment(osg::Camera::COLOR_BUFFER, osg::FrameBufferAttachment(mMsaaColorTexture[i]));
+                }
+                mColorTexture[i] = createTexture(sourceFormat, sourceType, internalFormat);
+                mLayerFbo[i]->setAttachment(osg::Camera::COLOR_BUFFER, osg::FrameBufferAttachment(mColorTexture[i]));
+            }
+        }
+    }
+
+    void MultiviewFramebuffer::attachDepthComponent(GLint sourceFormat, GLint sourceType, GLint internalFormat)
+    {
+        if (mMultiview)
+        {
+#ifdef OSG_HAS_MULTIVIEW
+            mMultiviewDepthTexture = createTextureArray(sourceFormat, sourceType, internalFormat);
+            mMultiviewFbo->setAttachment(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, osg::FrameBufferAttachment(mMultiviewDepthTexture, osg::Camera::FACE_CONTROLLED_BY_MULTIVIEW_SHADER, 0));
+            for (unsigned i = 0; i < 2; i++)
+            {
+                mDepthTexture[i] = createTextureView_Texture2DFromTexture2DArray(mMultiviewDepthTexture.get(), i);
+                mLayerFbo[i]->setAttachment(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, osg::FrameBufferAttachment(mDepthTexture[i]));
+            }
+#endif
+        }
+        else
+        {
+            for (unsigned i = 0; i < 2; i++)
+            {
+                if (mSamples > 1)
+                {
+                    mMsaaDepthTexture[i] = createTextureMsaa(sourceFormat, sourceType, internalFormat);
+                    mLayerMsaaFbo[i]->setAttachment(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, osg::FrameBufferAttachment(mMsaaDepthTexture[i]));
+                }
+                mDepthTexture[i] = createTexture(sourceFormat, sourceType, internalFormat);
+                mLayerFbo[i]->setAttachment(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, osg::FrameBufferAttachment(mDepthTexture[i]));
+            }
+        }
+    }
+
+    osg::FrameBufferObject* MultiviewFramebuffer::multiviewFbo()
+    {
+        return mMultiviewFbo;
+    }
+
+    osg::FrameBufferObject* MultiviewFramebuffer::layerFbo(int i)
+    {
+        return mLayerFbo[i];
+    }
+
+    osg::FrameBufferObject* MultiviewFramebuffer::layerMsaaFbo(int i)
+    {
+        return mLayerMsaaFbo[i];
+    }
+
+    osg::Texture2DArray* MultiviewFramebuffer::multiviewColorBuffer()
+    {
+        return mMultiviewColorTexture;
+    }
+
+    osg::Texture2D* MultiviewFramebuffer::layerColorBuffer(int i)
+    {
+        return mColorTexture[i];
+    }
+
+    osg::Texture2D* MultiviewFramebuffer::layerDepthBuffer(int i)
+    {
+        return mDepthTexture[i];
+    }
+    void MultiviewFramebuffer::attachTo(osg::Camera* camera)
+    {
+#ifdef OSG_HAS_MULTIVIEW
+        if (mMultiview)
+        {
+            if (mMultiviewColorTexture)
+            {
+                camera->attach(osg::Camera::COLOR_BUFFER, mMultiviewColorTexture, 0, osg::Camera::FACE_CONTROLLED_BY_MULTIVIEW_SHADER, false, mSamples);
+                camera->getBufferAttachmentMap()[osg::Camera::COLOR_BUFFER]._internalFormat = mMultiviewColorTexture->getInternalFormat();
+                camera->getBufferAttachmentMap()[osg::Camera::COLOR_BUFFER]._mipMapGeneration = false;
+            }
+            if (mMultiviewDepthTexture)
+            {
+                camera->attach(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, mMultiviewDepthTexture, 0, osg::Camera::FACE_CONTROLLED_BY_MULTIVIEW_SHADER, false, mSamples);
+                camera->getBufferAttachmentMap()[osg::Camera::PACKED_DEPTH_STENCIL_BUFFER]._internalFormat = mMultiviewDepthTexture->getInternalFormat();
+                camera->getBufferAttachmentMap()[osg::Camera::PACKED_DEPTH_STENCIL_BUFFER]._mipMapGeneration = false;
+            }
+        }
+#endif
+        camera->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT);
+        
+        if (!mCullCallback)
+            mCullCallback = new UpdateRenderStagesCallback(this);
+        camera->addCullCallback(mCullCallback);
+    }
+
+    void MultiviewFramebuffer::detachFrom(osg::Camera* camera)
+    {
+#ifdef OSG_HAS_MULTIVIEW
+        if (mMultiview)
+        {
+            if (mMultiviewColorTexture)
+            {
+                camera->detach(osg::Camera::COLOR_BUFFER);
+            }
+            if (mMultiviewDepthTexture)
+            {
+                camera->detach(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER);
+            }
+        }
+#endif
+        camera->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER);
+        if (mCullCallback)
+            camera->removeCullCallback(mCullCallback);
+    }
+
+    osg::Texture2D* MultiviewFramebuffer::createTexture(GLint sourceFormat, GLint sourceType, GLint internalFormat)
+    {
+        osg::Texture2D* texture = new osg::Texture2D;
+        texture->setTextureSize(mWidth, mHeight);
+        texture->setSourceFormat(sourceFormat);
+        texture->setSourceType(sourceType);
+        texture->setInternalFormat(internalFormat);
+        texture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
+        texture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
+        texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+        texture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+        texture->setWrap(osg::Texture::WRAP_R, osg::Texture::CLAMP_TO_EDGE);
+        return texture;
+    }
+
+    osg::Texture2DMultisample* MultiviewFramebuffer::createTextureMsaa(GLint sourceFormat, GLint sourceType, GLint internalFormat)
+    {
+        osg::Texture2DMultisample* texture = new osg::Texture2DMultisample;
+        texture->setTextureSize(mWidth, mHeight);
+        texture->setNumSamples(mSamples);
+        texture->setSourceFormat(sourceFormat);
+        texture->setSourceType(sourceType);
+        texture->setInternalFormat(internalFormat);
+        texture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
+        texture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
+        texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+        texture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+        texture->setWrap(osg::Texture::WRAP_R, osg::Texture::CLAMP_TO_EDGE);
+        return texture;
+    }
+
+    osg::Texture2DArray* MultiviewFramebuffer::createTextureArray(GLint sourceFormat, GLint sourceType, GLint internalFormat)
+    {
+        osg::Texture2DArray* textureArray = new osg::Texture2DArray;
+        textureArray->setTextureSize(mWidth, mHeight, 2);
+        textureArray->setSourceFormat(sourceFormat);
+        textureArray->setSourceType(sourceType);
+        textureArray->setInternalFormat(internalFormat);
+        textureArray->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
+        textureArray->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
+        textureArray->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+        textureArray->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+        textureArray->setWrap(osg::Texture::WRAP_R, osg::Texture::CLAMP_TO_EDGE);
+        return textureArray;
+    }
+}
diff --git a/components/stereo/multiview.hpp b/components/stereo/multiview.hpp
new file mode 100644
index 0000000000..298d042ffc
--- /dev/null
+++ b/components/stereo/multiview.hpp
@@ -0,0 +1,85 @@
+#ifndef STEREO_MULTIVIEW_H
+#define STEREO_MULTIVIEW_H
+
+#include <osg/ref_ptr>
+#include <osg/GL>
+#include <osg/Camera>
+
+#include <array>
+#include <memory>
+
+namespace osg
+{
+    class FrameBufferObject;
+    class Texture;
+    class Texture2D;
+    class Texture2DMultisample;
+    class Texture2DArray;
+}
+
+namespace Stereo
+{
+    class UpdateRenderStagesCallback;
+
+    //! Check if TextureView is supported. Results are undefined if called before configureExtensions().
+    bool getTextureViewSupported();
+
+    //! Check if Multiview should be used. Results are undefined if called before configureExtensions().
+    bool getMultiview();
+
+    //! Use the provided context to check what extensions are supported and configure use of multiview based on extensions and settings.
+    void configureExtensions(unsigned int contextID);
+
+    //! Sets the appropriate vertex buffer hint on OSG's display settings if needed
+    void setVertexBufferHint();
+
+    //! Creates a Texture2D as a texture view into a Texture2DArray
+    osg::ref_ptr<osg::Texture2D> createTextureView_Texture2DFromTexture2DArray(osg::Texture2DArray* textureArray, int layer);
+
+    //! Class that manages the specifics of GL_OVR_Multiview aware framebuffers, separating the layers into separate framebuffers, and disabling
+    class MultiviewFramebuffer
+    {
+    public:
+        MultiviewFramebuffer(int width, int height, int samples);
+        ~MultiviewFramebuffer();
+
+        void attachColorComponent(GLint sourceFormat, GLint sourceType, GLint internalFormat);
+        void attachDepthComponent(GLint sourceFormat, GLint sourceType, GLint internalFormat);
+
+        osg::FrameBufferObject* multiviewFbo();
+        osg::FrameBufferObject* layerFbo(int i);
+        osg::FrameBufferObject* layerMsaaFbo(int i);
+        osg::Texture2DArray* multiviewColorBuffer();
+        osg::Texture2D* layerColorBuffer(int i);
+        osg::Texture2D* layerDepthBuffer(int i);
+
+        void attachTo(osg::Camera* camera);
+        void detachFrom(osg::Camera* camera);
+
+        int width() const { return mWidth; }
+        int height() const { return mHeight; }
+        int samples() const { return mSamples; };
+
+    private:
+        osg::Texture2D* createTexture(GLint sourceFormat, GLint sourceType, GLint internalFormat);
+        osg::Texture2DMultisample* createTextureMsaa(GLint sourceFormat, GLint sourceType, GLint internalFormat);
+        osg::Texture2DArray* createTextureArray(GLint sourceFormat, GLint sourceType, GLint internalFormat);
+
+        int mWidth;
+        int mHeight;
+        int mSamples;
+        bool mMultiview;
+        osg::ref_ptr<UpdateRenderStagesCallback> mCullCallback;
+        osg::ref_ptr<osg::FrameBufferObject> mMultiviewFbo;
+        std::array<osg::ref_ptr<osg::FrameBufferObject>, 2> mLayerFbo;
+        std::array<osg::ref_ptr<osg::FrameBufferObject>, 2> mLayerMsaaFbo;
+        osg::ref_ptr<osg::Texture2DArray> mMultiviewColorTexture;
+        osg::ref_ptr<osg::Texture2DArray> mMultiviewDepthTexture;
+        std::array<osg::ref_ptr<osg::Texture2D>, 2> mColorTexture;
+        std::array<osg::ref_ptr<osg::Texture2DMultisample>, 2> mMsaaColorTexture;
+        std::array<osg::ref_ptr<osg::Texture2D>, 2> mDepthTexture;
+        std::array<osg::ref_ptr<osg::Texture2DMultisample>, 2> mMsaaDepthTexture;
+    };
+}
+
+#endif
diff --git a/components/stereo/stereomanager.cpp b/components/stereo/stereomanager.cpp
new file mode 100644
index 0000000000..7214fe0031
--- /dev/null
+++ b/components/stereo/stereomanager.cpp
@@ -0,0 +1,459 @@
+#include "stereomanager.hpp"
+#include "multiview.hpp"
+#include "frustum.hpp"
+
+#include <osg/io_utils>
+#include <osg/Texture2D>
+#include <osg/Texture2DMultisample>
+#include <osg/Texture2DArray>
+#include <osg/DisplaySettings>
+
+#include <osgUtil/CullVisitor>
+#include <osgUtil/RenderStage>
+
+#include <osgViewer/Renderer>
+#include <osgViewer/Viewer>
+
+#include <iostream>
+#include <map>
+#include <string>
+
+#include <components/debug/debuglog.hpp>
+
+#include <components/sceneutil/statesetupdater.hpp>
+#include <components/sceneutil/visitor.hpp>
+#include <components/sceneutil/util.hpp>
+#include <components/sceneutil/depth.hpp>
+#include <components/sceneutil/color.hpp>
+
+#include <components/settings/settings.hpp>
+
+#include <components/misc/stringops.hpp>
+
+namespace Stereo
+{
+    // Update stereo view/projection during update
+    class StereoUpdateCallback final : public osg::Callback
+    {
+    public:
+        StereoUpdateCallback(Manager* stereoView) : stereoView(stereoView) {}
+
+        bool run(osg::Object* object, osg::Object* data) override
+        {
+            auto b = traverse(object, data);
+            stereoView->update();
+            return b;
+        }
+
+        Manager* stereoView;
+    };
+
+    // Update states during cull
+    class BruteForceStereoStatesetUpdateCallback final : public SceneUtil::StateSetUpdater
+    {
+    public:
+        BruteForceStereoStatesetUpdateCallback(Manager* manager)
+            : mManager(manager)
+        {
+        }
+
+    protected:
+        virtual void setDefaults(osg::StateSet* stateset) override
+        {
+            stateset->addUniform(new osg::Uniform("projectionMatrix", osg::Matrixf{}));
+        }
+
+        virtual void apply(osg::StateSet* stateset, osg::NodeVisitor* /*nv*/) override
+        {
+        }
+
+        void applyLeft(osg::StateSet* stateset, osgUtil::CullVisitor* nv) override
+        {
+            osg::Matrix dummy;
+            auto* uProjectionMatrix = stateset->getUniform("projectionMatrix");
+            if (uProjectionMatrix)
+                uProjectionMatrix->set(mManager->computeEyeProjection(0, SceneUtil::AutoDepth::isReversed()));
+        }
+
+        void applyRight(osg::StateSet* stateset, osgUtil::CullVisitor* nv) override
+        {
+            osg::Matrix dummy;
+            auto* uProjectionMatrix = stateset->getUniform("projectionMatrix");
+            if (uProjectionMatrix)
+                uProjectionMatrix->set(mManager->computeEyeProjection(1, SceneUtil::AutoDepth::isReversed()));
+        }
+
+    private:
+        Manager* mManager;
+    };
+
+    // Update states during cull
+    class MultiviewStereoStatesetUpdateCallback : public SceneUtil::StateSetUpdater
+    {
+    public:
+        MultiviewStereoStatesetUpdateCallback(Manager* manager)
+            : mManager(manager)
+        {
+        }
+
+    protected:
+        virtual void setDefaults(osg::StateSet* stateset)
+        {
+            stateset->addUniform(new osg::Uniform(osg::Uniform::FLOAT_MAT4, "viewMatrixMultiView", 2));
+            stateset->addUniform(new osg::Uniform(osg::Uniform::FLOAT_MAT4, "projectionMatrixMultiView", 2));
+        }
+
+        virtual void apply(osg::StateSet* stateset, osg::NodeVisitor* /*nv*/)
+        {
+            mManager->updateMultiviewStateset(stateset);
+        }
+
+    private:
+        Manager* mManager;
+    };
+
+    static Manager* sInstance = nullptr;
+
+    Manager& Manager::instance()
+    {
+        return *sInstance;
+    }
+
+    struct CustomViewCallback : public Manager::UpdateViewCallback
+    {
+    public:
+        CustomViewCallback();
+
+        void updateView(View& left, View& right) override;
+
+    private:
+        View mLeft;
+        View mRight;
+    };
+
+    Manager::Manager(osgViewer::Viewer* viewer)
+        : mViewer(viewer)
+        , mMainCamera(mViewer->getCamera())
+        , mUpdateCallback(new StereoUpdateCallback(this))
+        , mMasterProjectionMatrix(osg::Matrix::identity())
+        , mEyeResolutionOverriden(false)
+        , mEyeResolutionOverride(0,0)
+        , mFrustumManager(nullptr)
+        , mUpdateViewCallback(nullptr)
+    {
+        if (sInstance)
+            throw std::logic_error("Double instance of Stereo::Manager");
+        sInstance = this;
+
+        if (Settings::Manager::getBool("use custom view", "Stereo"))
+            mUpdateViewCallback = std::make_shared<CustomViewCallback>();
+
+        if (Settings::Manager::getBool("use custom eye resolution", "Stereo"))
+        {
+            osg::Vec2i eyeResolution = osg::Vec2i();
+            eyeResolution.x() = Settings::Manager::getInt("eye resolution x", "Stereo View");
+            eyeResolution.y() = Settings::Manager::getInt("eye resolution y", "Stereo View");
+            overrideEyeResolution(eyeResolution);
+        }
+    }
+
+    Manager::~Manager()
+    {
+    }
+
+    void Manager::initializeStereo(osg::GraphicsContext* gc)
+    {
+        mMainCamera->addUpdateCallback(mUpdateCallback);
+        mFrustumManager = std::make_unique<StereoFrustumManager>(mViewer->getCamera());
+
+        auto ci = gc->getState()->getContextID();
+        configureExtensions(ci);
+
+        if(getMultiview())
+            setupOVRMultiView2Technique();
+        else
+            setupBruteForceTechnique();
+
+        updateStereoFramebuffer();
+
+    }
+
+    void Manager::shaderStereoDefines(Shader::ShaderManager::DefineMap& defines) const
+    {
+        if (getMultiview())
+        {
+            defines["GLSLVersion"] = "330 compatibility";
+            defines["useOVR_multiview"] = "1";
+            defines["numViews"] = "2";
+        }
+        else
+        {
+            defines["useOVR_multiview"] = "0";
+            defines["numViews"] = "1";
+        }
+    }
+
+    void Manager::overrideEyeResolution(const osg::Vec2i& eyeResolution)
+    {
+        mEyeResolutionOverride = eyeResolution;
+        mEyeResolutionOverriden = true;
+
+        if (mMultiviewFramebuffer)
+            updateStereoFramebuffer();
+    }
+
+    void Manager::screenResolutionChanged()
+    {
+        updateStereoFramebuffer();
+    }
+
+    osg::Vec2i Manager::eyeResolution()
+    {
+        if (mEyeResolutionOverriden)
+            return mEyeResolutionOverride;
+        auto width = mMainCamera->getViewport()->width() / 2;
+        auto height = mMainCamera->getViewport()->height();
+
+        return osg::Vec2i(width, height);
+    }
+
+    void Manager::disableStereoForNode(osg::Node* node)
+    {
+        // Re-apply the main camera's full viewport to return to full screen rendering.
+        node->getOrCreateStateSet()->setAttribute(mMainCamera->getViewport());
+    }
+
+    void Manager::setShadowTechnique(SceneUtil::MWShadowTechnique* shadowTechnique)
+    {
+        if (mFrustumManager)
+            mFrustumManager->setShadowTechnique(shadowTechnique);
+    }
+
+    void Manager::setupBruteForceTechnique()
+    {
+        auto* ds = osg::DisplaySettings::instance().get();
+        ds->setStereo(true);
+        ds->setStereoMode(osg::DisplaySettings::StereoMode::HORIZONTAL_SPLIT);
+        ds->setUseSceneViewForStereoHint(true);
+        
+        mMainCamera->addCullCallback(new BruteForceStereoStatesetUpdateCallback(this));
+
+        struct ComputeStereoMatricesCallback : public osgUtil::SceneView::ComputeStereoMatricesCallback
+        {
+            ComputeStereoMatricesCallback(Manager* sv)
+                : mManager(sv)
+            {
+
+            }
+
+            osg::Matrixd computeLeftEyeProjection(const osg::Matrixd& projection) const override
+            {
+                (void)projection;
+                return mManager->computeEyeProjection(0, false);
+            }
+
+            osg::Matrixd computeLeftEyeView(const osg::Matrixd& view) const override
+            {
+                (void)view;
+                return mManager->computeEyeView(0);
+            }
+
+            osg::Matrixd computeRightEyeProjection(const osg::Matrixd& projection) const override
+            {
+                (void)projection;
+                return mManager->computeEyeProjection(1, false);
+            }
+
+            osg::Matrixd computeRightEyeView(const osg::Matrixd& view) const override
+            {
+                (void)view;
+                return mManager->computeEyeView(1);
+            }
+
+            Manager* mManager;
+        };
+
+        auto* renderer = static_cast<osgViewer::Renderer*>(mMainCamera->getRenderer());
+        for (auto* sceneView : { renderer->getSceneView(0), renderer->getSceneView(1) })
+        {
+            sceneView->setComputeStereoMatricesCallback(new ComputeStereoMatricesCallback(this));
+
+            auto* cvMain = sceneView->getCullVisitor();
+            auto* cvLeft = sceneView->getCullVisitorLeft();
+            auto* cvRight = sceneView->getCullVisitorRight();
+            if (!cvMain)
+                sceneView->setCullVisitor(cvMain = new osgUtil::CullVisitor());
+            if (!cvLeft)
+                sceneView->setCullVisitor(cvLeft = cvMain->clone());
+            if (!cvRight)
+                sceneView->setCullVisitor(cvRight = cvMain->clone());
+
+            // Osg by default gives cullVisitorLeft and cullVisitor the same identifier.
+            // So we make our own to avoid confusion
+            cvMain->setIdentifier(mIdentifierMain);
+            cvLeft->setIdentifier(mIdentifierLeft);
+            cvRight->setIdentifier(mIdentifierRight);
+        }
+    }
+
+    void Manager::setupOVRMultiView2Technique()
+    {
+        auto* ds = osg::DisplaySettings::instance().get();
+        ds->setStereo(false);
+
+        mMainCamera->addCullCallback(new MultiviewStereoStatesetUpdateCallback(this));
+    }
+
+    void Manager::updateStereoFramebuffer()
+    {
+        auto samples = Settings::Manager::getInt("antialiasing", "Video");
+        auto eyeRes = eyeResolution();
+
+        if (mMultiviewFramebuffer)
+            mMultiviewFramebuffer->detachFrom(mMainCamera);
+        mMultiviewFramebuffer = std::make_shared<MultiviewFramebuffer>(static_cast<int>(eyeRes.x()), static_cast<int>(eyeRes.y()), samples);
+        mMultiviewFramebuffer->attachColorComponent(SceneUtil::Color::colorSourceFormat(), SceneUtil::Color::colorSourceType(), SceneUtil::Color::colorInternalFormat());
+        mMultiviewFramebuffer->attachDepthComponent(SceneUtil::AutoDepth::depthSourceFormat(), SceneUtil::AutoDepth::depthSourceType(), SceneUtil::AutoDepth::depthInternalFormat());
+        mMultiviewFramebuffer->attachTo(mMainCamera);
+    }
+
+    void Manager::update()
+    {
+        double near_ = 1.f;
+        double far_ = 10000.f;
+
+        near_ = Settings::Manager::getFloat("near clip", "Camera");
+        far_ = Settings::Manager::getFloat("viewing distance", "Camera");
+        auto projectionMatrix = mMainCamera->getProjectionMatrix();
+
+        if (mUpdateViewCallback)
+        {
+            mUpdateViewCallback->updateView(mView[0], mView[1]);
+            auto viewMatrix = mMainCamera->getViewMatrix();
+            mViewOffsetMatrix[0] = mView[0].viewMatrix(true);
+            mViewOffsetMatrix[1] = mView[1].viewMatrix(true);
+            mViewMatrix[0] = viewMatrix * mViewOffsetMatrix[0];
+            mViewMatrix[1] = viewMatrix * mViewOffsetMatrix[1];
+            mProjectionMatrix[0] = mView[0].perspectiveMatrix(near_, far_, false);
+            mProjectionMatrix[1] = mView[1].perspectiveMatrix(near_, far_, false);
+            if (SceneUtil::AutoDepth::isReversed())
+            {
+                mProjectionMatrixReverseZ[0] = mView[0].perspectiveMatrix(near_, far_, true);
+                mProjectionMatrixReverseZ[1] = mView[1].perspectiveMatrix(near_, far_, true);
+            }
+
+            View masterView;
+            masterView.fov.angleDown = std::min(mView[0].fov.angleDown, mView[1].fov.angleDown);
+            masterView.fov.angleUp = std::max(mView[0].fov.angleUp, mView[1].fov.angleUp);
+            masterView.fov.angleLeft = std::min(mView[0].fov.angleLeft, mView[1].fov.angleLeft);
+            masterView.fov.angleRight = std::max(mView[0].fov.angleRight, mView[1].fov.angleRight);
+            projectionMatrix = masterView.perspectiveMatrix(near_, far_, false);
+            mMainCamera->setProjectionMatrix(projectionMatrix);
+        }
+        else
+        {
+            auto* ds = osg::DisplaySettings::instance().get();
+            auto viewMatrix = mMainCamera->getViewMatrix();
+            mViewMatrix[0] = ds->computeLeftEyeViewImplementation(viewMatrix);
+            mViewMatrix[1] = ds->computeRightEyeViewImplementation(viewMatrix);
+            mViewOffsetMatrix[0] = osg::Matrix::inverse(viewMatrix) * mViewMatrix[0];
+            mViewOffsetMatrix[1] = osg::Matrix::inverse(viewMatrix) * mViewMatrix[1];
+            mProjectionMatrix[0] = ds->computeLeftEyeProjectionImplementation(projectionMatrix);
+            mProjectionMatrix[1] = ds->computeRightEyeProjectionImplementation(projectionMatrix);
+            if (SceneUtil::AutoDepth::isReversed())
+            {
+                mProjectionMatrixReverseZ[0] = ds->computeLeftEyeProjectionImplementation(mMasterProjectionMatrix);
+                mProjectionMatrixReverseZ[1] = ds->computeRightEyeProjectionImplementation(mMasterProjectionMatrix);
+            }
+        }
+
+        mFrustumManager->update(
+            { 
+                mViewOffsetMatrix[0] * mProjectionMatrix[0], 
+                mViewOffsetMatrix[1] * mProjectionMatrix[1] 
+            });
+    }
+
+    void Manager::updateMultiviewStateset(osg::StateSet* stateset)
+    {
+        // Update stereo uniforms
+        auto * viewMatrixMultiViewUniform = stateset->getUniform("viewMatrixMultiView");
+        auto * projectionMatrixMultiViewUniform = stateset->getUniform("projectionMatrixMultiView");
+
+        for (int view : {0, 1})
+        {
+            viewMatrixMultiViewUniform->setElement(view, mViewOffsetMatrix[view]);
+            projectionMatrixMultiViewUniform->setElement(view, computeEyeProjection(view, SceneUtil::AutoDepth::isReversed()));
+        }
+    }
+
+    void Manager::setUpdateViewCallback(std::shared_ptr<UpdateViewCallback> cb)
+    {
+        mUpdateViewCallback = cb;
+    }
+
+    void Manager::setCullCallback(osg::ref_ptr<osg::NodeCallback> cb)
+    {
+        mMainCamera->setCullCallback(cb);
+    }
+
+    osg::Matrixd Manager::computeEyeProjection(int view, bool reverseZ) const
+    {
+        return reverseZ ? mProjectionMatrixReverseZ[view] : mProjectionMatrix[view];
+    }
+
+    osg::Matrixd Manager::computeEyeView(int view) const
+    {
+        return mViewMatrix[view];
+    }
+
+    Eye Manager::getEye(const osgUtil::CullVisitor* cv) const
+    {
+        if (cv->getIdentifier() == mIdentifierMain)
+            return Eye::Center;
+        if (cv->getIdentifier() == mIdentifierLeft)
+            return Eye::Left;
+        if (cv->getIdentifier() == mIdentifierRight)
+            return Eye::Right;
+        return Eye::Center;
+    }
+
+    bool getStereo()
+    {
+        static bool stereo = Settings::Manager::getBool("stereo enabled", "Stereo") || osg::DisplaySettings::instance().get()->getStereo();
+        return stereo;
+    }
+
+    CustomViewCallback::CustomViewCallback()
+    {
+        mLeft.pose.position.x() = Settings::Manager::getDouble("left eye offset x", "Stereo View");
+        mLeft.pose.position.y() = Settings::Manager::getDouble("left eye offset y", "Stereo View");
+        mLeft.pose.position.z() = Settings::Manager::getDouble("left eye offset z", "Stereo View");
+        mLeft.pose.orientation.x() = Settings::Manager::getDouble("left eye orientation x", "Stereo View");
+        mLeft.pose.orientation.y() = Settings::Manager::getDouble("left eye orientation y", "Stereo View");
+        mLeft.pose.orientation.z() = Settings::Manager::getDouble("left eye orientation z", "Stereo View");
+        mLeft.pose.orientation.w() = Settings::Manager::getDouble("left eye orientation w", "Stereo View");
+        mLeft.fov.angleLeft = Settings::Manager::getDouble("left eye fov left", "Stereo View");
+        mLeft.fov.angleRight = Settings::Manager::getDouble("left eye fov right", "Stereo View");
+        mLeft.fov.angleUp = Settings::Manager::getDouble("left eye fov up", "Stereo View");
+        mLeft.fov.angleDown = Settings::Manager::getDouble("left eye fov down", "Stereo View");
+
+        mRight.pose.position.x() = Settings::Manager::getDouble("right eye offset x", "Stereo View");
+        mRight.pose.position.y() = Settings::Manager::getDouble("right eye offset y", "Stereo View");
+        mRight.pose.position.z() = Settings::Manager::getDouble("right eye offset z", "Stereo View");
+        mRight.pose.orientation.x() = Settings::Manager::getDouble("right eye orientation x", "Stereo View");
+        mRight.pose.orientation.y() = Settings::Manager::getDouble("right eye orientation y", "Stereo View");
+        mRight.pose.orientation.z() = Settings::Manager::getDouble("right eye orientation z", "Stereo View");
+        mRight.pose.orientation.w() = Settings::Manager::getDouble("right eye orientation w", "Stereo View");
+        mRight.fov.angleLeft = Settings::Manager::getDouble("right eye fov left", "Stereo View");
+        mRight.fov.angleRight = Settings::Manager::getDouble("right eye fov right", "Stereo View");
+        mRight.fov.angleUp = Settings::Manager::getDouble("right eye fov up", "Stereo View");
+        mRight.fov.angleDown = Settings::Manager::getDouble("right eye fov down", "Stereo View");
+    }
+
+    void CustomViewCallback::updateView(View& left, View& right)
+    {
+        left = mLeft;
+        right = mRight;
+    }
+}
diff --git a/components/stereo/stereomanager.hpp b/components/stereo/stereomanager.hpp
new file mode 100644
index 0000000000..fea5a8543f
--- /dev/null
+++ b/components/stereo/stereomanager.hpp
@@ -0,0 +1,134 @@
+#ifndef STEREO_MANAGER_H
+#define STEREO_MANAGER_H
+
+#include <osg/Matrix>
+#include <osg/Vec3>
+#include <osg/Camera>
+#include <osg/StateSet>
+#include <osgUtil/CullVisitor>
+
+#include <memory>
+#include <array>
+
+#include <components/stereo/types.hpp>
+#include <components/shader/shadermanager.hpp>
+
+namespace osg
+{
+    class FrameBufferObject;
+    class Texture2D;
+    class Texture2DMultisample;
+    class Texture2DArray;
+}
+
+namespace osgViewer
+{
+    class Viewer;
+}
+
+namespace SceneUtil
+{
+    class MWShadowTechnique;
+}
+
+namespace Stereo
+{
+    class MultiviewFramebuffer;
+    class StereoFrustumManager;
+    class MultiviewStereoStatesetUpdateCallback;
+
+    bool getStereo();
+
+    //! Class that provides tools for managing stereo mode
+    class Manager
+    {
+    public:
+        struct UpdateViewCallback
+        {
+            virtual ~UpdateViewCallback() = default;
+
+            //! Called during the update traversal of every frame to update stereo views.
+            virtual void updateView(View& left, View& right) = 0;
+        };
+
+        //! Gets the singleton instance
+        static Manager& instance();
+
+        Manager(osgViewer::Viewer* viewer);
+        ~Manager();
+
+        //! Called during update traversal
+        void update();
+
+        void initializeStereo(osg::GraphicsContext* gc);
+
+        //! Callback that updates stereo configuration during the update pass
+        void setUpdateViewCallback(std::shared_ptr<UpdateViewCallback> cb);
+
+        //! Set the cull callback on the appropriate camera object
+        void setCullCallback(osg::ref_ptr<osg::NodeCallback> cb);
+
+        osg::Matrixd computeEyeProjection(int view, bool reverseZ) const;
+        osg::Matrixd computeEyeView(int view) const;
+
+        //! Sets up any definitions necessary for stereo rendering
+        void shaderStereoDefines(Shader::ShaderManager::DefineMap& defines) const;
+
+        const std::shared_ptr<MultiviewFramebuffer>& multiviewFramebuffer() { return mMultiviewFramebuffer; };
+
+        //! Sets rendering resolution of each eye to eyeResolution. 
+        //! Once set, there will no longer be any connection between rendering resolution and screen/window resolution.
+        void overrideEyeResolution(const osg::Vec2i& eyeResolution);
+
+        //! Notify stereo manager that the screen/window resolution has changed.
+        void screenResolutionChanged();
+
+        //! Get current eye resolution
+        osg::Vec2i eyeResolution();
+
+        //! The projection intended for rendering. When reverse Z is enabled, this is not the same as the camera's projection matrix, 
+        //! and therefore must be provided to the manager explicitly.
+        void setMasterProjectionMatrix(const osg::Matrix& projectionMatrix) { mMasterProjectionMatrix = projectionMatrix; }
+
+        //! Causes the subgraph represented by the node to draw to the full viewport.
+        //! This has no effect if stereo is not enabled
+        void disableStereoForNode(osg::Node* node);
+
+        void setShadowTechnique(SceneUtil::MWShadowTechnique* shadowTechnique);
+
+        /// Determine which view the cull visitor belongs to
+        Eye getEye(const osgUtil::CullVisitor* cv) const;
+
+    private:
+        friend class MultiviewStereoStatesetUpdateCallback;
+        void updateMultiviewStateset(osg::StateSet* stateset);
+        void updateStereoFramebuffer();
+        void setupBruteForceTechnique();
+        void setupOVRMultiView2Technique();
+
+        osg::ref_ptr<osgViewer::Viewer> mViewer;
+        osg::ref_ptr<osg::Camera>       mMainCamera;
+        osg::ref_ptr<osg::Callback>     mUpdateCallback;
+        std::string                     mError;
+        osg::Matrix                     mMasterProjectionMatrix;
+        std::shared_ptr<MultiviewFramebuffer> mMultiviewFramebuffer;
+        bool                            mEyeResolutionOverriden;
+        osg::Vec2i                      mEyeResolutionOverride;
+
+        std::array<View, 2>         mView;
+        std::array<osg::Matrix, 2>  mViewMatrix;
+        std::array<osg::Matrix, 2>  mViewOffsetMatrix;
+        std::array<osg::Matrix, 2>  mProjectionMatrix;
+        std::array<osg::Matrix, 2>  mProjectionMatrixReverseZ;
+
+        std::unique_ptr<StereoFrustumManager> mFrustumManager;
+        std::shared_ptr<UpdateViewCallback> mUpdateViewCallback;
+
+        using Identifier = osgUtil::CullVisitor::Identifier;
+        osg::ref_ptr<Identifier> mIdentifierMain = new Identifier();
+        osg::ref_ptr<Identifier> mIdentifierLeft = new Identifier();
+        osg::ref_ptr<Identifier> mIdentifierRight = new Identifier();
+    };
+}
+
+#endif
diff --git a/components/stereo/types.cpp b/components/stereo/types.cpp
new file mode 100644
index 0000000000..4829e32b55
--- /dev/null
+++ b/components/stereo/types.cpp
@@ -0,0 +1,168 @@
+#include "types.hpp"
+
+#include <osg/io_utils>
+
+namespace Stereo
+{
+
+    Pose Pose::operator+(const Pose& rhs)
+    {
+        Pose pose = *this;
+        pose.position += this->orientation * rhs.position;
+        pose.orientation = rhs.orientation * this->orientation;
+        return pose;
+    }
+
+    const Pose& Pose::operator+=(const Pose& rhs)
+    {
+        *this = *this + rhs;
+        return *this;
+    }
+
+    Pose Pose::operator*(float scalar)
+    {
+        Pose pose = *this;
+        pose.position *= scalar;
+        return pose;
+    }
+
+    const Pose& Pose::operator*=(float scalar)
+    {
+        *this = *this * scalar;
+        return *this;
+    }
+
+    Pose Pose::operator/(float scalar)
+    {
+        Pose pose = *this;
+        pose.position /= scalar;
+        return pose;
+    }
+    const Pose& Pose::operator/=(float scalar)
+    {
+        *this = *this / scalar;
+        return *this;
+    }
+
+    bool Pose::operator==(const Pose& rhs) const
+    {
+        return position == rhs.position && orientation == rhs.orientation;
+    }
+
+    osg::Matrix View::viewMatrix(bool useGLConventions)
+    {
+        auto position = pose.position;
+        auto orientation = pose.orientation;
+
+        if (useGLConventions)
+        {
+            // When applied as an offset to an existing view matrix,
+            // that view matrix will already convert points to a camera space
+            // with opengl conventions. So we need to convert offsets to opengl 
+            // conventions.
+            float y = position.y();
+            float z = position.z();
+            position.y() = z;
+            position.z() = -y;
+
+            y = orientation.y();
+            z = orientation.z();
+            orientation.y() = z;
+            orientation.z() = -y;
+
+            osg::Matrix viewMatrix;
+            viewMatrix.setTrans(-position);
+            viewMatrix.postMultRotate(orientation.conj());
+            return viewMatrix;
+        }
+        else
+        {
+            osg::Vec3d forward = orientation * osg::Vec3d(0, 1, 0);
+            osg::Vec3d up = orientation * osg::Vec3d(0, 0, 1);
+            osg::Matrix viewMatrix;
+            viewMatrix.makeLookAt(position, position + forward, up);
+
+            return viewMatrix;
+        }
+    }
+
+    osg::Matrix View::perspectiveMatrix(float near, float far, bool reverseZ)
+    {
+        const float tanLeft = tanf(fov.angleLeft);
+        const float tanRight = tanf(fov.angleRight);
+        const float tanDown = tanf(fov.angleDown);
+        const float tanUp = tanf(fov.angleUp);
+
+        const float tanWidth = tanRight - tanLeft;
+        const float tanHeight = tanUp - tanDown;
+
+        float matrix[16] = {};
+
+        matrix[0] = 2 / tanWidth;
+        matrix[4] = 0;
+        matrix[8] = (tanRight + tanLeft) / tanWidth;
+        matrix[12] = 0;
+
+        matrix[1] = 0;
+        matrix[5] = 2 / tanHeight;
+        matrix[9] = (tanUp + tanDown) / tanHeight;
+        matrix[13] = 0;
+
+        if (reverseZ) {
+            matrix[2] = 0;
+            matrix[6] = 0;
+            matrix[10] = (2.f * near) / (far - near);
+            matrix[14] = ((2.f * near) * far) / (far - near);
+        }
+        else {
+            matrix[2] = 0;
+            matrix[6] = 0;
+            matrix[10] = -(far + near) / (far - near);
+            matrix[14] = -(far * (2.f * near)) / (far - near);
+        }
+
+        matrix[3] = 0;
+        matrix[7] = 0;
+        matrix[11] = -1;
+        matrix[15] = 0;
+
+        return osg::Matrix(matrix);
+    }
+
+    bool FieldOfView::operator==(const FieldOfView& rhs) const
+    {
+        return angleDown == rhs.angleDown
+            && angleUp == rhs.angleUp
+            && angleLeft == rhs.angleLeft
+            && angleRight == rhs.angleRight;
+    }
+
+    bool View::operator==(const View& rhs) const
+    {
+        return pose == rhs.pose && fov == rhs.fov;
+    }
+
+    std::ostream& operator <<(
+        std::ostream& os,
+        const Pose& pose)
+    {
+        os << "position=" << pose.position << ", orientation=" << pose.orientation;
+        return os;
+    }
+
+    std::ostream& operator <<(
+        std::ostream& os,
+        const FieldOfView& fov)
+    {
+        os << "left=" << fov.angleLeft << ", right=" << fov.angleRight << ", down=" << fov.angleDown << ", up=" << fov.angleUp;
+        return os;
+    }
+
+    std::ostream& operator <<(
+        std::ostream& os,
+        const View& view)
+    {
+        os << "pose=< " << view.pose << " >, fov=< " << view.fov << " >";
+        return os;
+    }
+}
diff --git a/components/stereo/types.hpp b/components/stereo/types.hpp
new file mode 100644
index 0000000000..9f2aa074d5
--- /dev/null
+++ b/components/stereo/types.hpp
@@ -0,0 +1,61 @@
+#ifndef STEREO_TYPES_H
+#define STEREO_TYPES_H
+
+#include <osg/Matrix>
+#include <osg/Vec3>
+
+
+namespace Stereo
+{
+    enum class Eye
+    {
+        Left = 0, 
+        Right = 1, 
+        Center = 2
+    };
+
+    struct Pose
+    {
+        //! Position in space
+        osg::Vec3 position{ 0,0,0 };
+        //! Orientation in space.
+        osg::Quat orientation{ 0,0,0,1 };
+
+        //! Add one pose to another
+        Pose operator+(const Pose& rhs);
+        const Pose& operator+=(const Pose& rhs);
+
+        //! Scale a pose (does not affect orientation)
+        Pose operator*(float scalar);
+        const Pose& operator*=(float scalar);
+        Pose operator/(float scalar);
+        const Pose& operator/=(float scalar);
+
+        bool operator==(const Pose& rhs) const;
+    };
+
+    struct FieldOfView {
+        float    angleLeft{ 0.f };
+        float    angleRight{ 0.f };
+        float    angleUp{ 0.f };
+        float    angleDown{ 0.f };
+
+        bool operator==(const FieldOfView& rhs) const;
+    };
+
+    struct View
+    {
+        Pose pose;
+        FieldOfView fov;
+        bool operator==(const View& rhs) const;
+
+        osg::Matrix viewMatrix(bool useGLConventions);
+        osg::Matrix perspectiveMatrix(float near, float far, bool reverseZ);
+    };
+
+    std::ostream& operator <<(std::ostream& os, const Pose& pose);
+    std::ostream& operator <<(std::ostream& os, const FieldOfView& fov);
+    std::ostream& operator <<(std::ostream& os, const View& view);
+}
+
+#endif
diff --git a/components/terrain/material.cpp b/components/terrain/material.cpp
index 6ae1a970d3..8e892a08c8 100644
--- a/components/terrain/material.cpp
+++ b/components/terrain/material.cpp
@@ -7,6 +7,7 @@
 #include <osg/TexMat>
 #include <osg/BlendFunc>
 
+#include <components/stereo/stereomanager.hpp>
 #include <components/shader/shadermanager.hpp>
 #include <components/sceneutil/depth.hpp>
 
@@ -251,6 +252,8 @@ namespace Terrain
                 defineMap["specularMap"] = it->mSpecular ? "1" : "0";
                 defineMap["parallax"] = (it->mNormalMap && it->mParallax) ? "1" : "0";
 
+                Stereo::Manager::instance().shaderStereoDefines(defineMap);
+
                 osg::ref_ptr<osg::Shader> vertexShader = shaderManager->getShader("terrain_vertex.glsl", defineMap, osg::Shader::VERTEX);
                 osg::ref_ptr<osg::Shader> fragmentShader = shaderManager->getShader("terrain_fragment.glsl", defineMap, osg::Shader::FRAGMENT);
                 if (!vertexShader || !fragmentShader)
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 50214668d1..ec03720dfe 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -1129,3 +1129,60 @@ lua debug = false
 # Set the maximum number of threads used for Lua scripts.
 # If zero, Lua scripts are processed in the main thread.
 lua num threads = 1
+
+[Stereo]
+# Enable/disable stereo view. This setting is ignored in VR.
+stereo enabled = false
+
+# If enabled, OpenMW will use the GL_OVR_MultiView and GL_OVR_MultiView2 extensions where possible.
+multiview = false
+
+# May accelerate the BruteForce method when shadows are enabled
+shared shadow maps = true
+
+# If false, OpenMW-VR will disable display lists when using multiview. Necessary on some buggy drivers, but may incur a slight performance penalty.
+allow display lists for multiview = false
+
+# If false, the default OSG horizontal split will be used for stereo
+# If true, the config defined in the [Stereo View] settings category will be used
+# Note: This option is ignored in VR, and exists primarily for debugging purposes
+use custom view = false
+
+# If true, overrides rendering resolution for each eye.
+# Note: This option is ignored in VR, and exists primarily for debugging purposes
+use custom eye resolution = false
+
+[Stereo View]
+# The default values are based on an HP Reverb G2 HMD
+eye resolution x = 3128
+eye resolution y = 3060
+
+# Left eye offset from center, expressed in MW units (1 meter = ~70)
+left eye offset x = -2.35
+left eye offset y = 0.0
+left eye offset z = 0.0
+# Left eye orientation, expressed as a quaternion
+left eye orientation x = 0.0
+left eye orientation y = 0.0
+left eye orientation z = 0.0
+left eye orientation w = 1.0
+# Left eye field of view, expressed in radians
+left eye fov left = -0.86
+left eye fov right = 0.78
+left eye fov up = 0.8
+left eye fov down = -0.8
+
+# Left eye offset from center, expressed in MW units (1 meter = ~70)
+right eye offset x = 2.35
+right eye offset y = 0.0
+right eye offset z = 0.0
+# Left eye orientation, expressed as a quaternion
+right eye orientation x = 0.0
+right eye orientation y = 0.0
+right eye orientation z = 0.0
+right eye orientation w = 1.0
+# Left eye field of view
+right eye fov left = -0.78
+right eye fov right = 0.86
+right eye fov up = 0.8
+right eye fov down = -0.8
\ No newline at end of file
diff --git a/files/shaders/CMakeLists.txt b/files/shaders/CMakeLists.txt
index c873ada12f..30909d4311 100644
--- a/files/shaders/CMakeLists.txt
+++ b/files/shaders/CMakeLists.txt
@@ -40,6 +40,8 @@ set(SHADER_FILES
     gui_fragment.glsl
     debug_vertex.glsl
     debug_fragment.glsl
+    multiview_fragment.glsl
+    multiview_vertex.glsl
     sky_vertex.glsl
     sky_fragment.glsl
     skypasses.glsl
diff --git a/files/shaders/debug_fragment.glsl b/files/shaders/debug_fragment.glsl
index 1b25510d66..ab6ad813ee 100644
--- a/files/shaders/debug_fragment.glsl
+++ b/files/shaders/debug_fragment.glsl
@@ -1,4 +1,4 @@
-#version 120
+#version @GLSLVersion
 
 #include "vertexcolors.glsl"
 
diff --git a/files/shaders/debug_vertex.glsl b/files/shaders/debug_vertex.glsl
index fd41a6ff48..5331859122 100644
--- a/files/shaders/debug_vertex.glsl
+++ b/files/shaders/debug_vertex.glsl
@@ -1,4 +1,4 @@
-#version 120
+#version @GLSLVersion
 
 #include "openmw_vertex.h.glsl"
 
diff --git a/files/shaders/groundcover_fragment.glsl b/files/shaders/groundcover_fragment.glsl
index d669634190..c7e6ec36aa 100644
--- a/files/shaders/groundcover_fragment.glsl
+++ b/files/shaders/groundcover_fragment.glsl
@@ -1,4 +1,4 @@
-#version 120
+#version @GLSLVersion
 
 #if @useUBO
     #extension GL_ARB_uniform_buffer_object : require
diff --git a/files/shaders/groundcover_vertex.glsl b/files/shaders/groundcover_vertex.glsl
index e707954e81..660a4624f0 100644
--- a/files/shaders/groundcover_vertex.glsl
+++ b/files/shaders/groundcover_vertex.glsl
@@ -1,4 +1,6 @@
-#version 120
+#version @GLSLVersion
+
+#include "multiview_vertex.glsl"
 
 #if @useUBO
     #extension GL_ARB_uniform_buffer_object : require
diff --git a/files/shaders/gui_fragment.glsl b/files/shaders/gui_fragment.glsl
index a8c9434711..7c0a3b4811 100644
--- a/files/shaders/gui_fragment.glsl
+++ b/files/shaders/gui_fragment.glsl
@@ -1,4 +1,4 @@
-#version 120
+#version @GLSLVersion
 
 uniform sampler2D diffuseMap;
 
diff --git a/files/shaders/gui_vertex.glsl b/files/shaders/gui_vertex.glsl
index b378b097bd..670de5b6e3 100644
--- a/files/shaders/gui_vertex.glsl
+++ b/files/shaders/gui_vertex.glsl
@@ -1,4 +1,4 @@
-#version 120
+#version @GLSLVersion
 
 varying vec2 diffuseMapUV;
 varying vec4 passColor;
diff --git a/files/shaders/multiview_fragment.glsl b/files/shaders/multiview_fragment.glsl
new file mode 100644
index 0000000000..662dbe5f55
--- /dev/null
+++ b/files/shaders/multiview_fragment.glsl
@@ -0,0 +1,48 @@
+#ifndef MULTIVIEW_FRAGMENT
+#define MULTIVIEW_FRAGMENT
+
+// This file either enables or disables GL_OVR_multiview2 related code.
+// For use in fragment shaders
+
+// REQUIREMENT:
+// GLSL version: 330 or greater
+// GLSL profile: compatibility
+// NOTE: If stereo is enabled using Misc::StereoView::shaderStereoDefines, version 330 compatibility (or greater) will be set.
+//
+// This file provides symbols for sampling stereo-aware textures. Without multiview, these texture uniforms are sampler2D,
+// while in stereo the same uniforms are sampler2DArray instead. The symbols defined in this file mask this difference, allowing
+// the same code to work in both cases. Use mw_stereoAwareSampler2D and mw_stereoAwareTexture2D, where you otherwise would use 
+// sampler2D and texture2D()
+//
+// USAGE:
+// For stereo-aware textures, such as reflections, use the mw_stereoAwareSampler2D sampler and mw_stereoAwareTexture2D method 
+// instead of the usual sampler2D and texture2D.
+//
+// Using water reflection as an example, the old code for these textures changes from
+//    uniform sampler2D reflectionMap;
+//    ...
+//    vec3 reflection = texture2D(reflectionMap, screenCoords + screenCoordsOffset).rgb;
+//    
+// to
+//    uniform mw_stereoAwareSampler2D reflectionMap;
+//    ...
+//    vec3 reflection = mw_stereoAwareTexture2D(reflectionMap, screenCoords + screenCoordsOffset).rgb;
+//
+
+#if @useOVR_multiview
+
+#extension GL_OVR_multiview : require
+#extension GL_OVR_multiview2 : require
+#extension GL_EXT_texture_array : require
+
+#define mw_stereoAwareSampler2D sampler2DArray
+#define mw_stereoAwareTexture2D(texture, uv) texture2DArray(texture, vec3((uv), gl_ViewID_OVR))
+
+#else // useOVR_multiview
+
+#define mw_stereoAwareSampler2D sampler2D
+#define mw_stereoAwareTexture2D(texture, uv) texture2D(texture, uv)
+
+#endif // useOVR_multiview
+
+#endif // MULTIVIEW_FRAGMENT
\ No newline at end of file
diff --git a/files/shaders/multiview_vertex.glsl b/files/shaders/multiview_vertex.glsl
new file mode 100644
index 0000000000..0cabeb84a2
--- /dev/null
+++ b/files/shaders/multiview_vertex.glsl
@@ -0,0 +1,80 @@
+#ifndef MULTIVIEW_VERTEX
+#define MULTIVIEW_VERTEX
+
+// This file either enables or disables GL_OVR_multiview related code.
+// For use in vertex shaders
+
+// REQUIREMENT:
+// GLSL version: 330 or greater
+// GLSL profile: compatibility
+// NOTE: If stereo is enabled using Misc::StereoView::shaderStereoDefines, version 330 compatibility (or greater) will be set.
+
+// USAGE:
+// To create a stereo-aware vertex shader, use the matrix accessor functions defined in this .glsl file to compute gl_Position.
+// For the vertex stage, usually only gl_Position needs to be computed with stereo awareness, while other variables such as viewPos 
+// should be computed in the center camera's view space and take no stereo awareness.
+//
+// A typical gl_Position line will look like the following:
+//    gl_Position = mw_stereoAwareProjectionMatrix() * (mw_stereoAwareModelViewMatrix() * gl_Vertex);
+//
+// If you need to perform intermediate computations before determining the final values of gl_Position and viewPos,
+// your code might look more like the following:
+//    vec4 intermediateViewPos = gl_ModelViewMatrix * gl_Vertex;
+//    vec4 viewPos = myWhateverCode(intermediateViewPos);
+//    gl_Position = mw_stereoAwareProjectionMatrix() * mw_stereoAwareViewPosition(viewPos);
+//
+
+#if @useOVR_multiview
+
+#extension GL_OVR_multiview : require
+
+#ifndef MULTIVIEW_FRAGMENT
+// Layout cannot be used in the fragment shader
+layout(num_views = @numViews) in;
+#endif
+
+uniform mat4 projectionMatrixMultiView[@numViews];
+uniform mat4 viewMatrixMultiView[@numViews];
+
+// NOTE:
+// stereo-aware inverse view matrices and normal matrices have not been implemented.
+// Some effects like specular highlights would need stereo aware normal matrices to be 100% correct.
+// But the difference is not likely to be noticeable unless you're actively looking for it.
+
+mat4 mw_stereoAwareProjectionMatrix()
+{
+    return projectionMatrixMultiView[gl_ViewID_OVR];
+}
+
+mat4 mw_stereoAwareModelViewMatrix()
+{
+    return viewMatrixMultiView[gl_ViewID_OVR] * gl_ModelViewMatrix;
+}
+
+vec4 mw_stereoAwareViewPosition(vec4 viewPos)
+{
+	return viewMatrixMultiView[gl_ViewID_OVR] * viewPos;
+}
+
+#else // useOVR_multiview
+
+uniform mat4 projectionMatrix;
+
+mat4 mw_stereoAwareProjectionMatrix()
+{
+    return projectionMatrix;
+}
+
+mat4 mw_stereoAwareModelViewMatrix()
+{
+    return gl_ModelViewMatrix;
+}
+
+vec4 mw_stereoAwareViewPosition(vec4 viewPos)
+{
+	return viewPos;
+}
+
+#endif // useOVR_multiview
+
+#endif // MULTIVIEW_VERTEX
\ No newline at end of file
diff --git a/files/shaders/nv_default_fragment.glsl b/files/shaders/nv_default_fragment.glsl
index ff81a2b94d..e4d8046662 100644
--- a/files/shaders/nv_default_fragment.glsl
+++ b/files/shaders/nv_default_fragment.glsl
@@ -1,4 +1,4 @@
-#version 120
+#version @GLSLVersion
 #pragma import_defines(FORCE_OPAQUE)
 
 #if @useUBO
diff --git a/files/shaders/nv_default_vertex.glsl b/files/shaders/nv_default_vertex.glsl
index c0d28f3e34..2554677018 100644
--- a/files/shaders/nv_default_vertex.glsl
+++ b/files/shaders/nv_default_vertex.glsl
@@ -1,4 +1,6 @@
-#version 120
+#version @GLSLVersion
+
+#include "multiview_vertex.glsl"
 
 #if @useUBO
     #extension GL_ARB_uniform_buffer_object : require
@@ -9,7 +11,6 @@
 #endif
 
 #include "openmw_vertex.h.glsl"
-
 #if @diffuseMap
 varying vec2 diffuseMapUV;
 #endif
diff --git a/files/shaders/nv_nolighting_fragment.glsl b/files/shaders/nv_nolighting_fragment.glsl
index 7c4f4737e0..116677318a 100644
--- a/files/shaders/nv_nolighting_fragment.glsl
+++ b/files/shaders/nv_nolighting_fragment.glsl
@@ -1,4 +1,4 @@
-#version 120
+#version @GLSLVersion
 #pragma import_defines(FORCE_OPAQUE)
 
 #if @useGPUShader4
diff --git a/files/shaders/nv_nolighting_vertex.glsl b/files/shaders/nv_nolighting_vertex.glsl
index 7b1f6961b4..a3d884d026 100644
--- a/files/shaders/nv_nolighting_vertex.glsl
+++ b/files/shaders/nv_nolighting_vertex.glsl
@@ -1,4 +1,4 @@
-#version 120
+#version @GLSLVersion
 
 #include "openmw_vertex.h.glsl"
 
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index 85950c7468..7e7ef647cc 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -1,4 +1,4 @@
-#version 120
+#version @GLSLVersion
 #pragma import_defines(FORCE_OPAQUE)
 
 #if @useUBO
diff --git a/files/shaders/objects_vertex.glsl b/files/shaders/objects_vertex.glsl
index e8976692a2..4764e63ce4 100644
--- a/files/shaders/objects_vertex.glsl
+++ b/files/shaders/objects_vertex.glsl
@@ -1,4 +1,6 @@
-#version 120
+#version @GLSLVersion
+
+#include "multiview_vertex.glsl"
 
 #if @useUBO
     #extension GL_ARB_uniform_buffer_object : require
@@ -9,7 +11,6 @@
 #endif
 
 #include "openmw_vertex.h.glsl"
-
 #if @diffuseMap
 varying vec2 diffuseMapUV;
 #endif
diff --git a/files/shaders/s360_fragment.glsl b/files/shaders/s360_fragment.glsl
index f52e1478ee..f5f623c828 100644
--- a/files/shaders/s360_fragment.glsl
+++ b/files/shaders/s360_fragment.glsl
@@ -1,4 +1,4 @@
-#version 120
+#version @GLSLVersion
 
 varying vec2 uv;
 uniform samplerCube cubeMap;
diff --git a/files/shaders/s360_vertex.glsl b/files/shaders/s360_vertex.glsl
index ad96620c3f..375dcda0ba 100644
--- a/files/shaders/s360_vertex.glsl
+++ b/files/shaders/s360_vertex.glsl
@@ -1,4 +1,4 @@
-#version 120
+#version @GLSLVersion
 
 varying vec2 uv;
 
diff --git a/files/shaders/shadowcasting_fragment.glsl b/files/shaders/shadowcasting_fragment.glsl
index 07fad047e1..186934fec2 100644
--- a/files/shaders/shadowcasting_fragment.glsl
+++ b/files/shaders/shadowcasting_fragment.glsl
@@ -1,4 +1,4 @@
-#version 120
+#version @GLSLVersion
 
 #if @useGPUShader4
     #extension GL_EXT_gpu_shader4: require
diff --git a/files/shaders/shadowcasting_vertex.glsl b/files/shaders/shadowcasting_vertex.glsl
index e36f21a4de..25d5c402d7 100644
--- a/files/shaders/shadowcasting_vertex.glsl
+++ b/files/shaders/shadowcasting_vertex.glsl
@@ -1,4 +1,4 @@
-#version 120
+#version @GLSLVersion
 
 varying vec2 diffuseMapUV;
 
diff --git a/files/shaders/sky_fragment.glsl b/files/shaders/sky_fragment.glsl
index cfa3650c02..0f2ff938c2 100644
--- a/files/shaders/sky_fragment.glsl
+++ b/files/shaders/sky_fragment.glsl
@@ -1,4 +1,4 @@
-#version 120
+#version @GLSLVersion
 
 #include "skypasses.glsl"
 
diff --git a/files/shaders/sky_vertex.glsl b/files/shaders/sky_vertex.glsl
index 8ff9c0f156..5b6a99be01 100644
--- a/files/shaders/sky_vertex.glsl
+++ b/files/shaders/sky_vertex.glsl
@@ -1,4 +1,6 @@
-#version 120
+#version @GLSLVersion
+
+#include "multiview_vertex.glsl"
 
 #include "openmw_vertex.h.glsl"
 
@@ -9,6 +11,20 @@ uniform int pass;
 varying vec4 passColor;
 varying vec2 diffuseMapUV;
 
+mat4 selectModelViewMatrix()
+{
+#if @useOVR_multiview
+    mat4 viewOffsetMatrix = viewMatrixMultiView[gl_ViewID_OVR];
+    // Sky geometries aren't actually all that distant. So delete view translation to keep them looking distant.
+    viewOffsetMatrix[3][0] = 0;
+    viewOffsetMatrix[3][1] = 0;
+    viewOffsetMatrix[3][2] = 0;
+    return viewOffsetMatrix * gl_ModelViewMatrix;
+#else
+    return gl_ModelViewMatrix;
+#endif
+}
+
 void main()
 {
     gl_Position = mw_modelToClip(gl_Vertex);
diff --git a/files/shaders/terrain_fragment.glsl b/files/shaders/terrain_fragment.glsl
index d9d4a6dc30..e5532f9bce 100644
--- a/files/shaders/terrain_fragment.glsl
+++ b/files/shaders/terrain_fragment.glsl
@@ -1,4 +1,4 @@
-#version 120
+#version @GLSLVersion
 
 #if @useUBO
     #extension GL_ARB_uniform_buffer_object : require
diff --git a/files/shaders/terrain_vertex.glsl b/files/shaders/terrain_vertex.glsl
index 5519001219..abceb019b7 100644
--- a/files/shaders/terrain_vertex.glsl
+++ b/files/shaders/terrain_vertex.glsl
@@ -1,4 +1,6 @@
-#version 120
+#version @GLSLVersion
+
+#include "multiview_vertex.glsl"
 
 #if @useUBO
     #extension GL_ARB_uniform_buffer_object : require
@@ -9,7 +11,6 @@
 #endif
 
 #include "openmw_vertex.h.glsl"
-
 varying vec2 uv;
 varying float euclideanDepth;
 varying float linearDepth;
diff --git a/files/shaders/water_fragment.glsl b/files/shaders/water_fragment.glsl
index bf35ca78ca..87645f2135 100644
--- a/files/shaders/water_fragment.glsl
+++ b/files/shaders/water_fragment.glsl
@@ -1,4 +1,6 @@
-#version 120
+#version @GLSLVersion
+
+#include "multiview_fragment.glsl"
 
 #if @useUBO
     #extension GL_ARB_uniform_buffer_object : require
diff --git a/files/shaders/water_vertex.glsl b/files/shaders/water_vertex.glsl
index b09d3b54ae..e3dd29d2a0 100644
--- a/files/shaders/water_vertex.glsl
+++ b/files/shaders/water_vertex.glsl
@@ -1,4 +1,4 @@
-#version 120
+#version @GLSLVersion
 
 #include "openmw_vertex.h.glsl"
 

From 606a795a54303712f46c41df3b5799f548b794f2 Mon Sep 17 00:00:00 2001
From: Mads Buvik Sandvei <madssandvei@protonmail.com>
Date: Sun, 24 Apr 2022 15:29:16 +0000
Subject: [PATCH 2359/2859] multiview linker-method

---
 .gitlab-ci.yml                               |  2 +-
 apps/openmw/mwrender/renderingmanager.cpp    |  1 -
 components/sceneutil/mwshadowtechnique.cpp   |  5 +-
 components/stereo/stereomanager.cpp          |  1 -
 files/shaders/CMakeLists.txt                 |  4 +-
 files/shaders/debug_fragment.glsl            |  2 +-
 files/shaders/debug_vertex.glsl              |  2 +-
 files/shaders/groundcover_fragment.glsl      |  2 +-
 files/shaders/groundcover_vertex.glsl        |  4 +-
 files/shaders/gui_fragment.glsl              |  2 +-
 files/shaders/gui_vertex.glsl                |  2 +-
 files/shaders/multiview_fragment.glsl        | 48 ------------
 files/shaders/multiview_vertex.glsl          | 80 --------------------
 files/shaders/nv_default_fragment.glsl       |  2 +-
 files/shaders/nv_default_vertex.glsl         |  4 +-
 files/shaders/nv_nolighting_fragment.glsl    |  2 +-
 files/shaders/nv_nolighting_vertex.glsl      |  2 +-
 files/shaders/objects_fragment.glsl          |  2 +-
 files/shaders/objects_vertex.glsl            |  4 +-
 files/shaders/openmw_fragment.h.glsl         |  3 +-
 files/shaders/openmw_fragment_multiview.glsl | 31 ++++++++
 files/shaders/openmw_vertex.h.glsl           |  3 +-
 files/shaders/openmw_vertex_multiview.glsl   | 41 ++++++++++
 files/shaders/s360_fragment.glsl             |  2 +-
 files/shaders/s360_vertex.glsl               |  2 +-
 files/shaders/shadowcasting_fragment.glsl    |  2 +-
 files/shaders/shadowcasting_vertex.glsl      |  2 +-
 files/shaders/sky_fragment.glsl              |  2 +-
 files/shaders/sky_vertex.glsl                | 10 +--
 files/shaders/terrain_fragment.glsl          |  2 +-
 files/shaders/terrain_vertex.glsl            |  4 +-
 files/shaders/water_fragment.glsl            |  4 +-
 files/shaders/water_vertex.glsl              |  2 +-
 33 files changed, 112 insertions(+), 169 deletions(-)
 delete mode 100644 files/shaders/multiview_fragment.glsl
 delete mode 100644 files/shaders/multiview_vertex.glsl
 create mode 100644 files/shaders/openmw_fragment_multiview.glsl
 create mode 100644 files/shaders/openmw_vertex_multiview.glsl

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fdfbdac13b..696e8113c5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -378,7 +378,7 @@ variables: &tests-targets
     - $env:CCACHE_BASEDIR = Get-Location
     - $env:CCACHE_DIR = "$(Get-Location)\ccache"
     - New-Item -Type Directory -Force -Path $env:CCACHE_DIR
-    - sh CI/before_script.msvc.sh -c $config -p Win64 -v 2019 -k -V -N -b -t -C
+    - sh CI/before_script.msvc.sh -c $config -p Win64 -v 2019 -k -V -N -b -t -C $multiview
     - cd MSVC2019_64_Ninja
     - .\ActivateMSVC.ps1
     - cmake --build . --config $config --target ($targets.Split(','))
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 15d690534a..20e69450d1 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -412,7 +412,6 @@ namespace MWRender
         globalDefines["preLightEnv"] = Settings::Manager::getBool("apply lighting to environment maps", "Shaders") ? "1" : "0";
         globalDefines["radialFog"] = Settings::Manager::getBool("radial fog", "Shaders") ? "1" : "0";
         globalDefines["useGPUShader4"] = "0";
-        globalDefines["GLSLVersion"] = "120";
         globalDefines["useOVR_multiview"] = "0";
         globalDefines["numViews"] = "1";
 
diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
index 60dd613df5..3210bf4a4e 100644
--- a/components/sceneutil/mwshadowtechnique.cpp
+++ b/components/sceneutil/mwshadowtechnique.cpp
@@ -921,7 +921,7 @@ void SceneUtil::MWShadowTechnique::setupCastingShader(Shader::ShaderManager & sh
 {
     // This can't be part of the constructor as OSG mandates that there be a trivial constructor available
 
-    osg::ref_ptr<osg::Shader> castingVertexShader = shaderManager.getShader("shadowcasting_vertex.glsl", { {"GLSLVersion", "120"} }, osg::Shader::VERTEX);
+    osg::ref_ptr<osg::Shader> castingVertexShader = shaderManager.getShader("shadowcasting_vertex.glsl", { }, osg::Shader::VERTEX);
     osg::ref_ptr<osg::GLExtensions> exts = osg::GLExtensions::Get(0, false);
     std::string useGPUShader4 = exts && exts->isGpuShader4Supported ? "1" : "0";
     for (int alphaFunc = GL_NEVER; alphaFunc <= GL_ALWAYS; ++alphaFunc)
@@ -932,8 +932,7 @@ void SceneUtil::MWShadowTechnique::setupCastingShader(Shader::ShaderManager & sh
         program->addShader(shaderManager.getShader("shadowcasting_fragment.glsl", { {"alphaFunc", std::to_string(alphaFunc)},
                                                                                     {"alphaToCoverage", "0"},
                                                                                     {"adjustCoverage", "1"},
-                                                                                    {"useGPUShader4", useGPUShader4},
-                                                                                    {"GLSLVersion", "120"}
+                                                                                    {"useGPUShader4", useGPUShader4}
                                                                                   }, osg::Shader::FRAGMENT));
     }
 }
diff --git a/components/stereo/stereomanager.cpp b/components/stereo/stereomanager.cpp
index 7214fe0031..bbbdc6e934 100644
--- a/components/stereo/stereomanager.cpp
+++ b/components/stereo/stereomanager.cpp
@@ -182,7 +182,6 @@ namespace Stereo
     {
         if (getMultiview())
         {
-            defines["GLSLVersion"] = "330 compatibility";
             defines["useOVR_multiview"] = "1";
             defines["numViews"] = "2";
         }
diff --git a/files/shaders/CMakeLists.txt b/files/shaders/CMakeLists.txt
index 30909d4311..97f32ad979 100644
--- a/files/shaders/CMakeLists.txt
+++ b/files/shaders/CMakeLists.txt
@@ -18,8 +18,10 @@ set(SHADER_FILES
     objects_fragment.glsl
     openmw_fragment.glsl
     openmw_fragment.h.glsl
+    openmw_fragment_multiview.glsl
     openmw_vertex.glsl
     openmw_vertex.h.glsl
+    openmw_vertex_multiview.glsl
     terrain_vertex.glsl
     terrain_fragment.glsl
     lighting.glsl
@@ -40,8 +42,6 @@ set(SHADER_FILES
     gui_fragment.glsl
     debug_vertex.glsl
     debug_fragment.glsl
-    multiview_fragment.glsl
-    multiview_vertex.glsl
     sky_vertex.glsl
     sky_fragment.glsl
     skypasses.glsl
diff --git a/files/shaders/debug_fragment.glsl b/files/shaders/debug_fragment.glsl
index ab6ad813ee..1b25510d66 100644
--- a/files/shaders/debug_fragment.glsl
+++ b/files/shaders/debug_fragment.glsl
@@ -1,4 +1,4 @@
-#version @GLSLVersion
+#version 120
 
 #include "vertexcolors.glsl"
 
diff --git a/files/shaders/debug_vertex.glsl b/files/shaders/debug_vertex.glsl
index 5331859122..fd41a6ff48 100644
--- a/files/shaders/debug_vertex.glsl
+++ b/files/shaders/debug_vertex.glsl
@@ -1,4 +1,4 @@
-#version @GLSLVersion
+#version 120
 
 #include "openmw_vertex.h.glsl"
 
diff --git a/files/shaders/groundcover_fragment.glsl b/files/shaders/groundcover_fragment.glsl
index c7e6ec36aa..d669634190 100644
--- a/files/shaders/groundcover_fragment.glsl
+++ b/files/shaders/groundcover_fragment.glsl
@@ -1,4 +1,4 @@
-#version @GLSLVersion
+#version 120
 
 #if @useUBO
     #extension GL_ARB_uniform_buffer_object : require
diff --git a/files/shaders/groundcover_vertex.glsl b/files/shaders/groundcover_vertex.glsl
index 660a4624f0..ff3dacdd99 100644
--- a/files/shaders/groundcover_vertex.glsl
+++ b/files/shaders/groundcover_vertex.glsl
@@ -1,6 +1,6 @@
-#version @GLSLVersion
+#version 120
 
-#include "multiview_vertex.glsl"
+#include "openmw_vertex.h.glsl"
 
 #if @useUBO
     #extension GL_ARB_uniform_buffer_object : require
diff --git a/files/shaders/gui_fragment.glsl b/files/shaders/gui_fragment.glsl
index 7c0a3b4811..a8c9434711 100644
--- a/files/shaders/gui_fragment.glsl
+++ b/files/shaders/gui_fragment.glsl
@@ -1,4 +1,4 @@
-#version @GLSLVersion
+#version 120
 
 uniform sampler2D diffuseMap;
 
diff --git a/files/shaders/gui_vertex.glsl b/files/shaders/gui_vertex.glsl
index 670de5b6e3..b378b097bd 100644
--- a/files/shaders/gui_vertex.glsl
+++ b/files/shaders/gui_vertex.glsl
@@ -1,4 +1,4 @@
-#version @GLSLVersion
+#version 120
 
 varying vec2 diffuseMapUV;
 varying vec4 passColor;
diff --git a/files/shaders/multiview_fragment.glsl b/files/shaders/multiview_fragment.glsl
deleted file mode 100644
index 662dbe5f55..0000000000
--- a/files/shaders/multiview_fragment.glsl
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef MULTIVIEW_FRAGMENT
-#define MULTIVIEW_FRAGMENT
-
-// This file either enables or disables GL_OVR_multiview2 related code.
-// For use in fragment shaders
-
-// REQUIREMENT:
-// GLSL version: 330 or greater
-// GLSL profile: compatibility
-// NOTE: If stereo is enabled using Misc::StereoView::shaderStereoDefines, version 330 compatibility (or greater) will be set.
-//
-// This file provides symbols for sampling stereo-aware textures. Without multiview, these texture uniforms are sampler2D,
-// while in stereo the same uniforms are sampler2DArray instead. The symbols defined in this file mask this difference, allowing
-// the same code to work in both cases. Use mw_stereoAwareSampler2D and mw_stereoAwareTexture2D, where you otherwise would use 
-// sampler2D and texture2D()
-//
-// USAGE:
-// For stereo-aware textures, such as reflections, use the mw_stereoAwareSampler2D sampler and mw_stereoAwareTexture2D method 
-// instead of the usual sampler2D and texture2D.
-//
-// Using water reflection as an example, the old code for these textures changes from
-//    uniform sampler2D reflectionMap;
-//    ...
-//    vec3 reflection = texture2D(reflectionMap, screenCoords + screenCoordsOffset).rgb;
-//    
-// to
-//    uniform mw_stereoAwareSampler2D reflectionMap;
-//    ...
-//    vec3 reflection = mw_stereoAwareTexture2D(reflectionMap, screenCoords + screenCoordsOffset).rgb;
-//
-
-#if @useOVR_multiview
-
-#extension GL_OVR_multiview : require
-#extension GL_OVR_multiview2 : require
-#extension GL_EXT_texture_array : require
-
-#define mw_stereoAwareSampler2D sampler2DArray
-#define mw_stereoAwareTexture2D(texture, uv) texture2DArray(texture, vec3((uv), gl_ViewID_OVR))
-
-#else // useOVR_multiview
-
-#define mw_stereoAwareSampler2D sampler2D
-#define mw_stereoAwareTexture2D(texture, uv) texture2D(texture, uv)
-
-#endif // useOVR_multiview
-
-#endif // MULTIVIEW_FRAGMENT
\ No newline at end of file
diff --git a/files/shaders/multiview_vertex.glsl b/files/shaders/multiview_vertex.glsl
deleted file mode 100644
index 0cabeb84a2..0000000000
--- a/files/shaders/multiview_vertex.glsl
+++ /dev/null
@@ -1,80 +0,0 @@
-#ifndef MULTIVIEW_VERTEX
-#define MULTIVIEW_VERTEX
-
-// This file either enables or disables GL_OVR_multiview related code.
-// For use in vertex shaders
-
-// REQUIREMENT:
-// GLSL version: 330 or greater
-// GLSL profile: compatibility
-// NOTE: If stereo is enabled using Misc::StereoView::shaderStereoDefines, version 330 compatibility (or greater) will be set.
-
-// USAGE:
-// To create a stereo-aware vertex shader, use the matrix accessor functions defined in this .glsl file to compute gl_Position.
-// For the vertex stage, usually only gl_Position needs to be computed with stereo awareness, while other variables such as viewPos 
-// should be computed in the center camera's view space and take no stereo awareness.
-//
-// A typical gl_Position line will look like the following:
-//    gl_Position = mw_stereoAwareProjectionMatrix() * (mw_stereoAwareModelViewMatrix() * gl_Vertex);
-//
-// If you need to perform intermediate computations before determining the final values of gl_Position and viewPos,
-// your code might look more like the following:
-//    vec4 intermediateViewPos = gl_ModelViewMatrix * gl_Vertex;
-//    vec4 viewPos = myWhateverCode(intermediateViewPos);
-//    gl_Position = mw_stereoAwareProjectionMatrix() * mw_stereoAwareViewPosition(viewPos);
-//
-
-#if @useOVR_multiview
-
-#extension GL_OVR_multiview : require
-
-#ifndef MULTIVIEW_FRAGMENT
-// Layout cannot be used in the fragment shader
-layout(num_views = @numViews) in;
-#endif
-
-uniform mat4 projectionMatrixMultiView[@numViews];
-uniform mat4 viewMatrixMultiView[@numViews];
-
-// NOTE:
-// stereo-aware inverse view matrices and normal matrices have not been implemented.
-// Some effects like specular highlights would need stereo aware normal matrices to be 100% correct.
-// But the difference is not likely to be noticeable unless you're actively looking for it.
-
-mat4 mw_stereoAwareProjectionMatrix()
-{
-    return projectionMatrixMultiView[gl_ViewID_OVR];
-}
-
-mat4 mw_stereoAwareModelViewMatrix()
-{
-    return viewMatrixMultiView[gl_ViewID_OVR] * gl_ModelViewMatrix;
-}
-
-vec4 mw_stereoAwareViewPosition(vec4 viewPos)
-{
-	return viewMatrixMultiView[gl_ViewID_OVR] * viewPos;
-}
-
-#else // useOVR_multiview
-
-uniform mat4 projectionMatrix;
-
-mat4 mw_stereoAwareProjectionMatrix()
-{
-    return projectionMatrix;
-}
-
-mat4 mw_stereoAwareModelViewMatrix()
-{
-    return gl_ModelViewMatrix;
-}
-
-vec4 mw_stereoAwareViewPosition(vec4 viewPos)
-{
-	return viewPos;
-}
-
-#endif // useOVR_multiview
-
-#endif // MULTIVIEW_VERTEX
\ No newline at end of file
diff --git a/files/shaders/nv_default_fragment.glsl b/files/shaders/nv_default_fragment.glsl
index e4d8046662..ff81a2b94d 100644
--- a/files/shaders/nv_default_fragment.glsl
+++ b/files/shaders/nv_default_fragment.glsl
@@ -1,4 +1,4 @@
-#version @GLSLVersion
+#version 120
 #pragma import_defines(FORCE_OPAQUE)
 
 #if @useUBO
diff --git a/files/shaders/nv_default_vertex.glsl b/files/shaders/nv_default_vertex.glsl
index 2554677018..f182bbe8be 100644
--- a/files/shaders/nv_default_vertex.glsl
+++ b/files/shaders/nv_default_vertex.glsl
@@ -1,6 +1,6 @@
-#version @GLSLVersion
+#version 120
 
-#include "multiview_vertex.glsl"
+#include "openmw_vertex.h.glsl"
 
 #if @useUBO
     #extension GL_ARB_uniform_buffer_object : require
diff --git a/files/shaders/nv_nolighting_fragment.glsl b/files/shaders/nv_nolighting_fragment.glsl
index 116677318a..7c4f4737e0 100644
--- a/files/shaders/nv_nolighting_fragment.glsl
+++ b/files/shaders/nv_nolighting_fragment.glsl
@@ -1,4 +1,4 @@
-#version @GLSLVersion
+#version 120
 #pragma import_defines(FORCE_OPAQUE)
 
 #if @useGPUShader4
diff --git a/files/shaders/nv_nolighting_vertex.glsl b/files/shaders/nv_nolighting_vertex.glsl
index a3d884d026..7b1f6961b4 100644
--- a/files/shaders/nv_nolighting_vertex.glsl
+++ b/files/shaders/nv_nolighting_vertex.glsl
@@ -1,4 +1,4 @@
-#version @GLSLVersion
+#version 120
 
 #include "openmw_vertex.h.glsl"
 
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index 7e7ef647cc..85950c7468 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -1,4 +1,4 @@
-#version @GLSLVersion
+#version 120
 #pragma import_defines(FORCE_OPAQUE)
 
 #if @useUBO
diff --git a/files/shaders/objects_vertex.glsl b/files/shaders/objects_vertex.glsl
index 4764e63ce4..10543f767a 100644
--- a/files/shaders/objects_vertex.glsl
+++ b/files/shaders/objects_vertex.glsl
@@ -1,6 +1,6 @@
-#version @GLSLVersion
+#version 120
 
-#include "multiview_vertex.glsl"
+#include "openmw_vertex.h.glsl"
 
 #if @useUBO
     #extension GL_ARB_uniform_buffer_object : require
diff --git a/files/shaders/openmw_fragment.h.glsl b/files/shaders/openmw_fragment.h.glsl
index c5bcf21c9d..ae1a131b42 100644
--- a/files/shaders/openmw_fragment.h.glsl
+++ b/files/shaders/openmw_fragment.h.glsl
@@ -1,4 +1,5 @@
-@link "openmw_fragment.glsl"
+@link "openmw_fragment.glsl" if !@useOVR_multiview
+@link "openmw_fragment_multiview.glsl" if @useOVR_multiview
 
 vec4 mw_sampleReflectionMap(vec2 uv);
 
diff --git a/files/shaders/openmw_fragment_multiview.glsl b/files/shaders/openmw_fragment_multiview.glsl
new file mode 100644
index 0000000000..1a2c0d991b
--- /dev/null
+++ b/files/shaders/openmw_fragment_multiview.glsl
@@ -0,0 +1,31 @@
+#version 330 compatibility
+
+#extension GL_OVR_multiview : require
+#extension GL_OVR_multiview2 : require
+#extension GL_EXT_texture_array : require
+
+#include "openmw_fragment.h.glsl"
+
+uniform sampler2DArray reflectionMap;
+
+vec4 mw_sampleReflectionMap(vec2 uv)
+{
+    return texture2DArray(reflectionMap, vec3((uv), gl_ViewID_OVR));
+}
+
+#if @refraction_enabled
+
+uniform sampler2DArray refractionMap;
+uniform sampler2DArray refractionDepthMap;
+
+vec4 mw_sampleRefractionMap(vec2 uv)
+{
+    return texture2DArray(refractionMap, vec3((uv), gl_ViewID_OVR));
+}
+
+float mw_sampleRefractionDepthMap(vec2 uv)
+{
+    return texture2DArray(refractionDepthMap, vec3((uv), gl_ViewID_OVR)).x;
+}
+
+#endif
\ No newline at end of file
diff --git a/files/shaders/openmw_vertex.h.glsl b/files/shaders/openmw_vertex.h.glsl
index 00feb9310e..5f591e4311 100644
--- a/files/shaders/openmw_vertex.h.glsl
+++ b/files/shaders/openmw_vertex.h.glsl
@@ -1,4 +1,5 @@
-@link "openmw_vertex.glsl"
+@link "openmw_vertex.glsl" if !@useOVR_multiview
+@link "openmw_vertex_multiview.glsl" if @useOVR_multiview
 
 vec4 mw_modelToClip(vec4 pos);
 vec4 mw_modelToView(vec4 pos);
diff --git a/files/shaders/openmw_vertex_multiview.glsl b/files/shaders/openmw_vertex_multiview.glsl
new file mode 100644
index 0000000000..f65d9f0da0
--- /dev/null
+++ b/files/shaders/openmw_vertex_multiview.glsl
@@ -0,0 +1,41 @@
+#version 330 compatibility
+
+#extension GL_OVR_multiview : require
+#extension GL_OVR_multiview2 : require
+
+layout(num_views = @numViews) in;
+
+#include "openmw_vertex.h.glsl"
+
+uniform mat4 projectionMatrixMultiView[@numViews];
+uniform mat4 viewMatrixMultiView[@numViews];
+
+vec4 mw_modelToClip(vec4 pos)
+{
+    return projectionMatrixMultiView[gl_ViewID_OVR] * mw_modelToView(pos);
+}
+
+vec4 mw_modelToView(vec4 pos)
+{
+    return viewMatrixMultiView[gl_ViewID_OVR] * gl_ModelViewMatrix * pos;
+}
+
+vec4 mw_viewToClip(vec4 pos)
+{
+    return projectionMatrixMultiView[gl_ViewID_OVR] * pos;
+}
+
+vec4 mw_viewStereoAdjust(vec4 pos)
+{
+    return viewMatrixMultiView[gl_ViewID_OVR] * pos;
+}
+
+mat4 mw_viewMatrix()
+{
+    return viewMatrixMultiView[gl_ViewID_OVR] * gl_ModelViewMatrix;
+}
+
+mat4 mw_projectionMatrix()
+{
+    return projectionMatrixMultiView[gl_ViewID_OVR];
+}
diff --git a/files/shaders/s360_fragment.glsl b/files/shaders/s360_fragment.glsl
index f5f623c828..f52e1478ee 100644
--- a/files/shaders/s360_fragment.glsl
+++ b/files/shaders/s360_fragment.glsl
@@ -1,4 +1,4 @@
-#version @GLSLVersion
+#version 120
 
 varying vec2 uv;
 uniform samplerCube cubeMap;
diff --git a/files/shaders/s360_vertex.glsl b/files/shaders/s360_vertex.glsl
index 375dcda0ba..ad96620c3f 100644
--- a/files/shaders/s360_vertex.glsl
+++ b/files/shaders/s360_vertex.glsl
@@ -1,4 +1,4 @@
-#version @GLSLVersion
+#version 120
 
 varying vec2 uv;
 
diff --git a/files/shaders/shadowcasting_fragment.glsl b/files/shaders/shadowcasting_fragment.glsl
index 186934fec2..07fad047e1 100644
--- a/files/shaders/shadowcasting_fragment.glsl
+++ b/files/shaders/shadowcasting_fragment.glsl
@@ -1,4 +1,4 @@
-#version @GLSLVersion
+#version 120
 
 #if @useGPUShader4
     #extension GL_EXT_gpu_shader4: require
diff --git a/files/shaders/shadowcasting_vertex.glsl b/files/shaders/shadowcasting_vertex.glsl
index 25d5c402d7..e36f21a4de 100644
--- a/files/shaders/shadowcasting_vertex.glsl
+++ b/files/shaders/shadowcasting_vertex.glsl
@@ -1,4 +1,4 @@
-#version @GLSLVersion
+#version 120
 
 varying vec2 diffuseMapUV;
 
diff --git a/files/shaders/sky_fragment.glsl b/files/shaders/sky_fragment.glsl
index 0f2ff938c2..cfa3650c02 100644
--- a/files/shaders/sky_fragment.glsl
+++ b/files/shaders/sky_fragment.glsl
@@ -1,4 +1,4 @@
-#version @GLSLVersion
+#version 120
 
 #include "skypasses.glsl"
 
diff --git a/files/shaders/sky_vertex.glsl b/files/shaders/sky_vertex.glsl
index 5b6a99be01..6d9ef7a073 100644
--- a/files/shaders/sky_vertex.glsl
+++ b/files/shaders/sky_vertex.glsl
@@ -1,6 +1,6 @@
-#version @GLSLVersion
+#version 120
 
-#include "multiview_vertex.glsl"
+#include "openmw_vertex.h.glsl"
 
 #include "openmw_vertex.h.glsl"
 
@@ -14,12 +14,12 @@ varying vec2 diffuseMapUV;
 mat4 selectModelViewMatrix()
 {
 #if @useOVR_multiview
-    mat4 viewOffsetMatrix = viewMatrixMultiView[gl_ViewID_OVR];
+    mat4 viewOffsetMatrix = mw_viewMatrix();
     // Sky geometries aren't actually all that distant. So delete view translation to keep them looking distant.
     viewOffsetMatrix[3][0] = 0;
     viewOffsetMatrix[3][1] = 0;
     viewOffsetMatrix[3][2] = 0;
-    return viewOffsetMatrix * gl_ModelViewMatrix;
+    return viewOffsetMatrix;
 #else
     return gl_ModelViewMatrix;
 #endif
@@ -27,7 +27,7 @@ mat4 selectModelViewMatrix()
 
 void main()
 {
-    gl_Position = mw_modelToClip(gl_Vertex);
+    gl_Position = mw_viewToClip(selectModelViewMatrix() * gl_Vertex);
     passColor = gl_Color;
 
     if (pass == PASS_CLOUDS)
diff --git a/files/shaders/terrain_fragment.glsl b/files/shaders/terrain_fragment.glsl
index e5532f9bce..d9d4a6dc30 100644
--- a/files/shaders/terrain_fragment.glsl
+++ b/files/shaders/terrain_fragment.glsl
@@ -1,4 +1,4 @@
-#version @GLSLVersion
+#version 120
 
 #if @useUBO
     #extension GL_ARB_uniform_buffer_object : require
diff --git a/files/shaders/terrain_vertex.glsl b/files/shaders/terrain_vertex.glsl
index abceb019b7..07ffeee202 100644
--- a/files/shaders/terrain_vertex.glsl
+++ b/files/shaders/terrain_vertex.glsl
@@ -1,6 +1,6 @@
-#version @GLSLVersion
+#version 120
 
-#include "multiview_vertex.glsl"
+#include "openmw_vertex.h.glsl"
 
 #if @useUBO
     #extension GL_ARB_uniform_buffer_object : require
diff --git a/files/shaders/water_fragment.glsl b/files/shaders/water_fragment.glsl
index 87645f2135..8db92a2984 100644
--- a/files/shaders/water_fragment.glsl
+++ b/files/shaders/water_fragment.glsl
@@ -1,6 +1,6 @@
-#version @GLSLVersion
+#version 120
 
-#include "multiview_fragment.glsl"
+#include "openmw_fragment.h.glsl"
 
 #if @useUBO
     #extension GL_ARB_uniform_buffer_object : require
diff --git a/files/shaders/water_vertex.glsl b/files/shaders/water_vertex.glsl
index e3dd29d2a0..b09d3b54ae 100644
--- a/files/shaders/water_vertex.glsl
+++ b/files/shaders/water_vertex.glsl
@@ -1,4 +1,4 @@
-#version @GLSLVersion
+#version 120
 
 #include "openmw_vertex.h.glsl"
 

From 276cb6f1704c049b067b67077594a5bd47aa4612 Mon Sep 17 00:00:00 2001
From: cody glassman <glassmancody.info@gmail.com>
Date: Thu, 28 Apr 2022 20:02:13 -0700
Subject: [PATCH 2360/2859] clamp vertex lighting in fragment shader properly

---
 CHANGELOG.md                            | 1 +
 files/shaders/groundcover_fragment.glsl | 3 ++-
 files/shaders/objects_fragment.glsl     | 3 ++-
 files/shaders/terrain_fragment.glsl     | 3 ++-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4561574175..d819dbe303 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -112,6 +112,7 @@
     Bug #6670: Dialogue order is incorrect
     Bug #6680: object.cpp handles nodetree unsafely, memory access with dangling pointer
     Bug #6682: HitOnMe doesn't fire as intended
+    Bug #6697: Shaders vertex lighting incorrectly clamped
     Bug #6711: Log time differs from real time
     Feature #890: OpenMW-CS: Column filtering
     Feature #1465: "Reset" argument for AI functions
diff --git a/files/shaders/groundcover_fragment.glsl b/files/shaders/groundcover_fragment.glsl
index d669634190..cb53e7a63e 100644
--- a/files/shaders/groundcover_fragment.glsl
+++ b/files/shaders/groundcover_fragment.glsl
@@ -73,9 +73,10 @@ void main()
     vec3 diffuseLight, ambientLight;
     doLighting(passViewPos, normalize(viewNormal), shadowing, diffuseLight, ambientLight);
     lighting = diffuseLight + ambientLight;
-    clampLightingResult(lighting);
 #endif
 
+    clampLightingResult(lighting);
+
     gl_FragData[0].xyz *= lighting;
 
 #if @radialFog
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index 85950c7468..bf9f207297 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -194,9 +194,10 @@ void main()
     doLighting(passViewPos, normalize(viewNormal), shadowing, diffuseLight, ambientLight);
     vec3 emission = getEmissionColor().xyz * emissiveMult;
     lighting = diffuseColor.xyz * diffuseLight + getAmbientColor().xyz * ambientLight + emission;
-    clampLightingResult(lighting);
 #endif
 
+    clampLightingResult(lighting);
+
     gl_FragData[0].xyz *= lighting;
 
 #if @envMap && !@preLightEnv
diff --git a/files/shaders/terrain_fragment.glsl b/files/shaders/terrain_fragment.glsl
index d9d4a6dc30..a8106f4ad5 100644
--- a/files/shaders/terrain_fragment.glsl
+++ b/files/shaders/terrain_fragment.glsl
@@ -87,9 +87,10 @@ void main()
     vec3 diffuseLight, ambientLight;
     doLighting(passViewPos, normalize(viewNormal), shadowing, diffuseLight, ambientLight);
     lighting = diffuseColor.xyz * diffuseLight + getAmbientColor().xyz * ambientLight + getEmissionColor().xyz;
-    clampLightingResult(lighting);
 #endif
 
+    clampLightingResult(lighting);
+
     gl_FragData[0].xyz *= lighting;
 
 #if @specularMap

From de291b0ec4cfa01266ee9bd2b964324f05eb54a3 Mon Sep 17 00:00:00 2001
From: Eris Caffee <eris-caffee@eldalin.com>
Date: Fri, 29 Apr 2022 09:56:08 +0000
Subject: [PATCH 2361/2859] Issue-6706 Save the size of the Options window

---
 CHANGELOG.md                                     |  1 +
 apps/openmw/mwgui/windowmanagerimp.cpp           |  1 +
 .../reference/modding/settings/windows.rst       | 16 ++++++++++++++++
 files/settings-default.cfg                       | 11 +++++++++++
 4 files changed, 29 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4561574175..adfd4e6991 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -152,6 +152,7 @@
     Feature #6600: Support NiSortAdjustNode
     Feature #6684: Support NiFltAnimationNode
     Feature #6699: Ignored flag
+    Feature #6706: Save the size of the Options window
     Task #6201: Remove the "Note: No relevant classes found. No output generated" warnings
     Task #6264: Remove the old classes in animation.cpp
     Task #6553: Simplify interpreter instruction registration
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 23c16082b4..707029972f 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -388,6 +388,7 @@ namespace MWGui
 
         mSettingsWindow = new SettingsWindow();
         mWindows.push_back(mSettingsWindow);
+        trackWindow(mSettingsWindow, "settings");
         mGuiModeStates[GM_Settings] = GuiModeState(mSettingsWindow);
 
         mConfirmationDialog = new ConfirmationDialog();
diff --git a/docs/source/reference/modding/settings/windows.rst b/docs/source/reference/modding/settings/windows.rst
index 00ee78a86d..d745c765d9 100644
--- a/docs/source/reference/modding/settings/windows.rst
+++ b/docs/source/reference/modding/settings/windows.rst
@@ -244,3 +244,19 @@ console
 
 The console command window.
 Activated by pressing the tilde (~) key.
+
+settings
+--------
+
+:Default:
+	x = 0.33
+
+	y = 0.18
+
+	w = 0.33
+
+	h = 0.66
+The settings window.
+Activated by clicking Options in the main menu.
+
+
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 50214668d1..49fbbd6516 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -822,6 +822,17 @@ companion maximized w = 0.97
 companion maximized h = 0.875
 companion maximized = false
 
+# Settings menu
+settings x = 0.33
+settings y = 0.18
+settings w = 0.33
+settings h = 0.67
+settings maximized x = 0.015
+settings maximized y = 0.02
+settings maximized w = 0.97
+settings maximized h = 0.875
+settings maximized = false
+
 [Navigator]
 
 # Enable navigator (true, false). When enabled background threads are started to build navmesh for world geometry.

From 79577f37de99f70ca229ec6f981da02003ad985c Mon Sep 17 00:00:00 2001
From: madsbuvi <madssandvei@zoho.com>
Date: Fri, 29 Apr 2022 17:35:24 +0200
Subject: [PATCH 2362/2859] Rebase artifacts + cleaned up the remaining
 unnecessary exposures of stereo awareness.

---
 apps/openmw/mwrender/skyutil.cpp           | 34 ++++++++++++++++++++++
 components/stereo/stereomanager.cpp        |  5 ++++
 components/stereo/stereomanager.hpp        |  1 +
 files/shaders/groundcover_vertex.glsl      |  4 +--
 files/shaders/nv_default_vertex.glsl       |  2 --
 files/shaders/objects_vertex.glsl          |  2 --
 files/shaders/openmw_vertex.glsl           | 10 -------
 files/shaders/openmw_vertex.h.glsl         |  4 +--
 files/shaders/openmw_vertex_multiview.glsl | 12 +-------
 files/shaders/sky_vertex.glsl              | 18 +-----------
 files/shaders/terrain_vertex.glsl          |  2 --
 files/shaders/water_fragment.glsl          |  2 --
 12 files changed, 44 insertions(+), 52 deletions(-)

diff --git a/apps/openmw/mwrender/skyutil.cpp b/apps/openmw/mwrender/skyutil.cpp
index ead9d9af70..ec9e6e7635 100644
--- a/apps/openmw/mwrender/skyutil.cpp
+++ b/apps/openmw/mwrender/skyutil.cpp
@@ -21,6 +21,7 @@
 #include <osgParticle/Particle>
 
 #include <components/misc/rng.hpp>
+#include <components/stereo/stereomanager.hpp>
 
 #include <components/resource/scenemanager.hpp>
 #include <components/resource/imagemanager.hpp>
@@ -602,6 +603,38 @@ namespace MWRender
         }
     }
 
+
+    class SkyMultiviewStatesetUpdater: public SceneUtil::StateSetUpdater
+    {
+    public:
+        SkyMultiviewStatesetUpdater()
+        {
+        }
+
+    protected:
+        virtual void setDefaults(osg::StateSet* stateset)
+        {
+            stateset->addUniform(new osg::Uniform(osg::Uniform::FLOAT_MAT4, "viewMatrixMultiView", 2), osg::StateAttribute::OVERRIDE);
+        }
+
+        virtual void apply(osg::StateSet* stateset, osg::NodeVisitor* /*nv*/)
+        {
+            auto* viewMatrixMultiViewUniform = stateset->getUniform("viewMatrixMultiView");
+            auto& sm = Stereo::Manager::instance();
+
+            for (int view : {0, 1})
+            {
+                auto viewOffsetMatrix = sm.computeEyeViewOffset(view);
+                for (int col : {0, 1, 2})
+                    viewOffsetMatrix(3, col) = 0;
+
+                viewMatrixMultiViewUniform->setElement(view, viewOffsetMatrix);
+            }
+        }
+
+    private:
+    };
+
     CameraRelativeTransform::CameraRelativeTransform()
     {
         // Culling works in node-local space, not in camera space, so we can't cull this node correctly
@@ -610,6 +643,7 @@ namespace MWRender
         setCullingActive(false);
 
         addCullCallback(new CameraRelativeTransformCullCallback);
+        addCullCallback(new SkyMultiviewStatesetUpdater);
     }
 
     CameraRelativeTransform::CameraRelativeTransform(const CameraRelativeTransform& copy, const osg::CopyOp& copyop)
diff --git a/components/stereo/stereomanager.cpp b/components/stereo/stereomanager.cpp
index bbbdc6e934..3cca855e7e 100644
--- a/components/stereo/stereomanager.cpp
+++ b/components/stereo/stereomanager.cpp
@@ -406,6 +406,11 @@ namespace Stereo
         return mViewMatrix[view];
     }
 
+    osg::Matrixd Manager::computeEyeViewOffset(int view) const
+    {
+        return mViewOffsetMatrix[view];
+    }
+
     Eye Manager::getEye(const osgUtil::CullVisitor* cv) const
     {
         if (cv->getIdentifier() == mIdentifierMain)
diff --git a/components/stereo/stereomanager.hpp b/components/stereo/stereomanager.hpp
index fea5a8543f..49ae685e6b 100644
--- a/components/stereo/stereomanager.hpp
+++ b/components/stereo/stereomanager.hpp
@@ -70,6 +70,7 @@ namespace Stereo
 
         osg::Matrixd computeEyeProjection(int view, bool reverseZ) const;
         osg::Matrixd computeEyeView(int view) const;
+        osg::Matrixd computeEyeViewOffset(int view) const;
 
         //! Sets up any definitions necessary for stereo rendering
         void shaderStereoDefines(Shader::ShaderManager::DefineMap& defines) const;
diff --git a/files/shaders/groundcover_vertex.glsl b/files/shaders/groundcover_vertex.glsl
index ff3dacdd99..fff8293b61 100644
--- a/files/shaders/groundcover_vertex.glsl
+++ b/files/shaders/groundcover_vertex.glsl
@@ -1,7 +1,5 @@
 #version 120
 
-#include "openmw_vertex.h.glsl"
-
 #if @useUBO
     #extension GL_ARB_uniform_buffer_object : require
 #endif
@@ -146,7 +144,7 @@ void main(void)
     if (length(gl_ModelViewMatrix * vec4(position, 1.0)) > @groundcoverFadeEnd)
         gl_Position = vec4(0.0, 0.0, 0.0, 1.0);
     else
-        gl_Position = mw_viewToClip(mw_viewStereoAdjust(viewPos));
+        gl_Position = mw_viewToClip(viewPos);
 
     linearDepth = getLinearDepth(gl_Position.z, viewPos.z);
 
diff --git a/files/shaders/nv_default_vertex.glsl b/files/shaders/nv_default_vertex.glsl
index f182bbe8be..0d014b02fa 100644
--- a/files/shaders/nv_default_vertex.glsl
+++ b/files/shaders/nv_default_vertex.glsl
@@ -1,7 +1,5 @@
 #version 120
 
-#include "openmw_vertex.h.glsl"
-
 #if @useUBO
     #extension GL_ARB_uniform_buffer_object : require
 #endif
diff --git a/files/shaders/objects_vertex.glsl b/files/shaders/objects_vertex.glsl
index 10543f767a..5c94417491 100644
--- a/files/shaders/objects_vertex.glsl
+++ b/files/shaders/objects_vertex.glsl
@@ -1,7 +1,5 @@
 #version 120
 
-#include "openmw_vertex.h.glsl"
-
 #if @useUBO
     #extension GL_ARB_uniform_buffer_object : require
 #endif
diff --git a/files/shaders/openmw_vertex.glsl b/files/shaders/openmw_vertex.glsl
index cc14f3a0e3..68a98c7880 100644
--- a/files/shaders/openmw_vertex.glsl
+++ b/files/shaders/openmw_vertex.glsl
@@ -23,13 +23,3 @@ vec4 mw_viewStereoAdjust(vec4 pos)
 {
     return pos;
 }
-
-mat4 mw_viewMatrix()
-{
-    return gl_ModelViewMatrix;
-}
-
-mat4 mw_projectionMatrix()
-{
-    return projectionMatrix;
-}
diff --git a/files/shaders/openmw_vertex.h.glsl b/files/shaders/openmw_vertex.h.glsl
index 5f591e4311..3794121656 100644
--- a/files/shaders/openmw_vertex.h.glsl
+++ b/files/shaders/openmw_vertex.h.glsl
@@ -4,6 +4,4 @@
 vec4 mw_modelToClip(vec4 pos);
 vec4 mw_modelToView(vec4 pos);
 vec4 mw_viewToClip(vec4 pos);
-vec4 mw_viewStereoAdjust(vec4 pos);
-mat4 mw_viewMatrix();
-mat4 mw_projectionMatrix();
\ No newline at end of file
+vec4 mw_viewStereoAdjust(vec4 pos);
\ No newline at end of file
diff --git a/files/shaders/openmw_vertex_multiview.glsl b/files/shaders/openmw_vertex_multiview.glsl
index f65d9f0da0..c860112d5c 100644
--- a/files/shaders/openmw_vertex_multiview.glsl
+++ b/files/shaders/openmw_vertex_multiview.glsl
@@ -22,20 +22,10 @@ vec4 mw_modelToView(vec4 pos)
 
 vec4 mw_viewToClip(vec4 pos)
 {
-    return projectionMatrixMultiView[gl_ViewID_OVR] * pos;
+    return projectionMatrixMultiView[gl_ViewID_OVR] * viewMatrixMultiView[gl_ViewID_OVR] * pos;
 }
 
 vec4 mw_viewStereoAdjust(vec4 pos)
 {
     return viewMatrixMultiView[gl_ViewID_OVR] * pos;
 }
-
-mat4 mw_viewMatrix()
-{
-    return viewMatrixMultiView[gl_ViewID_OVR] * gl_ModelViewMatrix;
-}
-
-mat4 mw_projectionMatrix()
-{
-    return projectionMatrixMultiView[gl_ViewID_OVR];
-}
diff --git a/files/shaders/sky_vertex.glsl b/files/shaders/sky_vertex.glsl
index 6d9ef7a073..8ff9c0f156 100644
--- a/files/shaders/sky_vertex.glsl
+++ b/files/shaders/sky_vertex.glsl
@@ -2,8 +2,6 @@
 
 #include "openmw_vertex.h.glsl"
 
-#include "openmw_vertex.h.glsl"
-
 #include "skypasses.glsl"
 
 uniform int pass;
@@ -11,23 +9,9 @@ uniform int pass;
 varying vec4 passColor;
 varying vec2 diffuseMapUV;
 
-mat4 selectModelViewMatrix()
-{
-#if @useOVR_multiview
-    mat4 viewOffsetMatrix = mw_viewMatrix();
-    // Sky geometries aren't actually all that distant. So delete view translation to keep them looking distant.
-    viewOffsetMatrix[3][0] = 0;
-    viewOffsetMatrix[3][1] = 0;
-    viewOffsetMatrix[3][2] = 0;
-    return viewOffsetMatrix;
-#else
-    return gl_ModelViewMatrix;
-#endif
-}
-
 void main()
 {
-    gl_Position = mw_viewToClip(selectModelViewMatrix() * gl_Vertex);
+    gl_Position = mw_modelToClip(gl_Vertex);
     passColor = gl_Color;
 
     if (pass == PASS_CLOUDS)
diff --git a/files/shaders/terrain_vertex.glsl b/files/shaders/terrain_vertex.glsl
index 07ffeee202..a426061941 100644
--- a/files/shaders/terrain_vertex.glsl
+++ b/files/shaders/terrain_vertex.glsl
@@ -1,7 +1,5 @@
 #version 120
 
-#include "openmw_vertex.h.glsl"
-
 #if @useUBO
     #extension GL_ARB_uniform_buffer_object : require
 #endif
diff --git a/files/shaders/water_fragment.glsl b/files/shaders/water_fragment.glsl
index 8db92a2984..bf35ca78ca 100644
--- a/files/shaders/water_fragment.glsl
+++ b/files/shaders/water_fragment.glsl
@@ -1,7 +1,5 @@
 #version 120
 
-#include "openmw_fragment.h.glsl"
-
 #if @useUBO
     #extension GL_ARB_uniform_buffer_object : require
 #endif

From 31a97141b7f827859eba3e14fb665de726157c73 Mon Sep 17 00:00:00 2001
From: madsbuvi <madssandvei@zoho.com>
Date: Fri, 29 Apr 2022 21:59:26 +0200
Subject: [PATCH 2363/2859] Mac

---
 components/sceneutil/color.hpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/components/sceneutil/color.hpp b/components/sceneutil/color.hpp
index cd950c2749..e4812d1149 100644
--- a/components/sceneutil/color.hpp
+++ b/components/sceneutil/color.hpp
@@ -200,5 +200,8 @@ namespace SceneUtil
 #define GL_RGBA32UI 0x8D70
 #endif
 
+#ifndef GL_RGB9_E5
+#define GL_RGB9_E5 0x8C3D
+#endif
 
 #endif

From 13a05dbd633a4ae31e722e9a92cc3bdcabd3320f Mon Sep 17 00:00:00 2001
From: cody glassman <glassmancody.info@gmail.com>
Date: Fri, 29 Apr 2022 17:01:28 -0700
Subject: [PATCH 2364/2859] simple water should respect filter settings

---
 CHANGELOG.md                   | 1 +
 apps/openmw/mwrender/water.cpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26e52a1ea0..d0591139eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@
     Bug #5913: Failed assertion during Ritual of Trees quest
     Bug #5928: Glow in the Dahrk functionality used without mod installed
     Bug #5937: Lights always need to be rotated by 90 degrees
+    Bug #5989: Simple water isn't affected by texture filter settings
     Bug #6037: Morrowind Content Language Cannot be Set to English in OpenMW Launcher
     Bug #6051: NaN water height in ESM file is not handled gracefully
     Bug #6066: addtopic "return" does not work from within script. No errors thrown
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index 7d9aca9b76..20cd789d7f 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -590,6 +590,7 @@ void Water::createSimpleWaterStateSet(osg::Node* node, float alpha)
         osg::ref_ptr<osg::Texture2D> tex (new osg::Texture2D(mResourceSystem->getImageManager()->getImage(texname.str())));
         tex->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
         tex->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
+        mResourceSystem->getSceneManager()->applyFilterSettings(tex);
         textures.push_back(tex);
     }
 

From ed6cd487ee1773846943bbd0a76ffeb5f2471efd Mon Sep 17 00:00:00 2001
From: cody glassman <glassmancody.info@gmail.com>
Date: Fri, 29 Apr 2022 17:26:09 -0700
Subject: [PATCH 2365/2859] allow updating filtering at runtime

---
 apps/openmw/mwrender/renderingmanager.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 384580adb8..b5ad5dac7b 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -1182,6 +1182,7 @@ namespace MWRender
         );
 
         mTerrain->updateTextureFiltering();
+        mWater->processChangedSettings({});
 
         mViewer->startThreading();
     }

From 9a96d64611bc5b60542977010dd372c0ef6bdf6b Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 30 Apr 2022 10:11:49 +0200
Subject: [PATCH 2366/2859] Use subrecord size instead of version to load WEAT

---
 components/esm3/loadregn.cpp | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/components/esm3/loadregn.cpp b/components/esm3/loadregn.cpp
index 99f09b7fad..98dd585e33 100644
--- a/components/esm3/loadregn.cpp
+++ b/components/esm3/loadregn.cpp
@@ -29,26 +29,17 @@ namespace ESM
                 case fourCC("WEAT"):
                 {
                     esm.getSubHeader();
-                    if (esm.getVer() == VER_12)
+                    // May include the additional two bytes (but not necessarily)
+                    if (esm.getSubSize() == sizeof(mData))
+                    {
+                        esm.getT(mData);
+                    }
+                    else if (esm.getSubSize() == sizeof(mData) - 2)
                     {
                         mData.mA = 0;
                         mData.mB = 0;
                         esm.getExact(&mData, sizeof(mData) - 2);
                     }
-                    else if (esm.getVer() == VER_13)
-                    {
-                        // May include the additional two bytes (but not necessarily)
-                        if (esm.getSubSize() == sizeof(mData))
-                        {
-                            esm.getT(mData);
-                        }
-                        else
-                        {
-                            mData.mA = 0;
-                            mData.mB = 0;
-                            esm.getExact(&mData, sizeof(mData)-2);
-                        }
-                    }
                     else
                     {
                         esm.fail("Don't know what to do in this version");

From db1970059948afe958689f496325d9228c7d8139 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 30 Apr 2022 16:45:45 +0200
Subject: [PATCH 2367/2859] Make stack manipulation unconditional

---
 CHANGELOG.md                                  |   1 +
 apps/openmw/mwscript/cellextensions.cpp       |   2 +
 apps/openmw/mwscript/statsextensions.cpp      |   1 +
 .../mwscript/transformationextensions.cpp     | 140 ++++++++++--------
 4 files changed, 84 insertions(+), 60 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26e52a1ea0..120df16b2e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -114,6 +114,7 @@
     Bug #6682: HitOnMe doesn't fire as intended
     Bug #6697: Shaders vertex lighting incorrectly clamped
     Bug #6711: Log time differs from real time
+    Bug #6717: Broken script causes interpreter stack corruption
     Feature #890: OpenMW-CS: Column filtering
     Feature #1465: "Reset" argument for AI functions
     Feature #2491: Ability to make OpenMW "portable"
diff --git a/apps/openmw/mwscript/cellextensions.cpp b/apps/openmw/mwscript/cellextensions.cpp
index d5ac222244..f00fcfd447 100644
--- a/apps/openmw/mwscript/cellextensions.cpp
+++ b/apps/openmw/mwscript/cellextensions.cpp
@@ -208,6 +208,7 @@ namespace MWScript
                 void execute (Interpreter::Runtime& runtime) override
                 {
                     Interpreter::Type_Float level = runtime[0].mFloat;
+                    runtime.pop();
 
                     if (!MWMechanics::getPlayer().isInCell())
                     {
@@ -231,6 +232,7 @@ namespace MWScript
                 void execute (Interpreter::Runtime& runtime) override
                 {
                     Interpreter::Type_Float level = runtime[0].mFloat;
+                    runtime.pop();
 
                     if (!MWMechanics::getPlayer().isInCell())
                     {
diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp
index a62d40065d..08f4cd6f27 100644
--- a/apps/openmw/mwscript/statsextensions.cpp
+++ b/apps/openmw/mwscript/statsextensions.cpp
@@ -1208,6 +1208,7 @@ namespace MWScript
             void execute (Interpreter::Runtime& runtime) override
             {
                 // dummy
+                runtime.pop();
                 runtime.push(0);
             }
         };
diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index 9f2ecf9e34..c4e78dbc96 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -193,18 +193,23 @@ namespace MWScript
                     std::string axis = runtime.getStringLiteral (runtime[0].mInteger);
                     runtime.pop();
 
-                    if (axis == "x")
-                    {
-                        runtime.push(osg::RadiansToDegrees(ptr.getCellRef().getPosition().rot[0]));
-                    }
-                    else if (axis == "y")
-                    {
-                        runtime.push(osg::RadiansToDegrees(ptr.getCellRef().getPosition().rot[1]));
-                    }
-                    else if (axis == "z")
+                    float ret = 0.f;
+                    if (!axis.empty())
                     {
-                        runtime.push(osg::RadiansToDegrees(ptr.getCellRef().getPosition().rot[2]));
+                        if (axis[0] == 'x')
+                        {
+                            ret = osg::RadiansToDegrees(ptr.getCellRef().getPosition().rot[0]);
+                        }
+                        else if (axis[0] == 'y')
+                        {
+                            ret = osg::RadiansToDegrees(ptr.getCellRef().getPosition().rot[1]);
+                        }
+                        else if (axis[0] == 'z')
+                        {
+                            ret = osg::RadiansToDegrees(ptr.getCellRef().getPosition().rot[2]);
+                        }
                     }
+                    runtime.push(ret);
                 }
         };
 
@@ -220,18 +225,23 @@ namespace MWScript
                     std::string axis = runtime.getStringLiteral (runtime[0].mInteger);
                     runtime.pop();
 
-                    if (axis=="x")
-                    {
-                        runtime.push(osg::RadiansToDegrees(ptr.getRefData().getPosition().rot[0]));
-                    }
-                    else if (axis=="y")
+                    float ret = 0.f;
+                    if (!axis.empty())
                     {
-                        runtime.push(osg::RadiansToDegrees(ptr.getRefData().getPosition().rot[1]));
-                    }
-                    else if (axis=="z")
-                    {
-                        runtime.push(osg::RadiansToDegrees(ptr.getRefData().getPosition().rot[2]));
+                        if (axis[0] == 'x')
+                        {
+                            ret = osg::RadiansToDegrees(ptr.getRefData().getPosition().rot[0]);
+                        }
+                        else if (axis[0] == 'y')
+                        {
+                            ret = osg::RadiansToDegrees(ptr.getRefData().getPosition().rot[1]);
+                        }
+                        else if (axis[0] == 'z')
+                        {
+                            ret = osg::RadiansToDegrees(ptr.getRefData().getPosition().rot[2]);
+                        }
                     }
+                    runtime.push(ret);
                 }
         };
 
@@ -247,18 +257,23 @@ namespace MWScript
                     std::string axis = runtime.getStringLiteral (runtime[0].mInteger);
                     runtime.pop();
 
-                    if(axis == "x")
-                    {
-                        runtime.push(ptr.getRefData().getPosition().pos[0]);
-                    }
-                    else if(axis == "y")
+                    float ret = 0.f;
+                    if (!axis.empty())
                     {
-                        runtime.push(ptr.getRefData().getPosition().pos[1]);
-                    }
-                    else if(axis == "z")
-                    {
-                        runtime.push(ptr.getRefData().getPosition().pos[2]);
+                        if (axis[0] == 'x')
+                        {
+                            ret = osg::RadiansToDegrees(ptr.getRefData().getPosition().pos[0]);
+                        }
+                        else if (axis[0] == 'y')
+                        {
+                            ret = osg::RadiansToDegrees(ptr.getRefData().getPosition().pos[1]);
+                        }
+                        else if (axis[0] == 'z')
+                        {
+                            ret = osg::RadiansToDegrees(ptr.getRefData().getPosition().pos[2]);
+                        }
                     }
+                    runtime.push(ret);
                 }
         };
 
@@ -271,14 +286,14 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    if (!ptr.isInCell())
-                        return;
-
                     std::string axis = runtime.getStringLiteral (runtime[0].mInteger);
                     runtime.pop();
                     Interpreter::Type_Float pos = runtime[0].mFloat;
                     runtime.pop();
 
+                    if (!ptr.isInCell())
+                        return;
+
                     // Note: SetPos does not skip weather transitions in vanilla engine, so we do not call setTeleported(true) here.
 
                     const auto curPos = ptr.getRefData().getPosition().asVec3();
@@ -328,18 +343,23 @@ namespace MWScript
                     std::string axis = runtime.getStringLiteral (runtime[0].mInteger);
                     runtime.pop();
 
-                    if(axis == "x")
+                    float ret = 0.f;
+                    if (!axis.empty())
                     {
-                        runtime.push(ptr.getCellRef().getPosition().pos[0]);
-                    }
-                    else if(axis == "y")
-                    {
-                        runtime.push(ptr.getCellRef().getPosition().pos[1]);
-                    }
-                    else if(axis == "z")
-                    {
-                        runtime.push(ptr.getCellRef().getPosition().pos[2]);
+                        if (axis[0] == 'x')
+                        {
+                            ret = osg::RadiansToDegrees(ptr.getCellRef().getPosition().pos[0]);
+                        }
+                        else if (axis[0] == 'y')
+                        {
+                            ret = osg::RadiansToDegrees(ptr.getCellRef().getPosition().pos[1]);
+                        }
+                        else if (axis[0] == 'z')
+                        {
+                            ret = osg::RadiansToDegrees(ptr.getCellRef().getPosition().pos[2]);
+                        }
                     }
+                    runtime.push(ret);
                 }
         };
 
@@ -352,15 +372,6 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    if (ptr.getContainerStore())
-                        return;
-
-                    bool isPlayer = ptr == MWMechanics::getPlayer();
-                    if (isPlayer)
-                    {
-                        MWBase::Environment::get().getWorld()->getPlayer().setTeleported(true);
-                    }
-
                     Interpreter::Type_Float x = runtime[0].mFloat;
                     runtime.pop();
                     Interpreter::Type_Float y = runtime[0].mFloat;
@@ -372,6 +383,15 @@ namespace MWScript
                     std::string cellID = runtime.getStringLiteral (runtime[0].mInteger);
                     runtime.pop();
 
+                    if (ptr.getContainerStore())
+                        return;
+
+                    bool isPlayer = ptr == MWMechanics::getPlayer();
+                    if (isPlayer)
+                    {
+                        MWBase::Environment::get().getWorld()->getPlayer().setTeleported(true);
+                    }
+
                     MWWorld::CellStore* store = nullptr;
                     try
                     {
@@ -424,14 +444,6 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    if (!ptr.isInCell())
-                        return;
-
-                    if (ptr == MWMechanics::getPlayer())
-                    {
-                        MWBase::Environment::get().getWorld()->getPlayer().setTeleported(true);
-                    }
-
                     Interpreter::Type_Float x = runtime[0].mFloat;
                     runtime.pop();
                     Interpreter::Type_Float y = runtime[0].mFloat;
@@ -440,6 +452,14 @@ namespace MWScript
                     runtime.pop();
                     Interpreter::Type_Float zRot = runtime[0].mFloat;
                     runtime.pop();
+
+                    if (!ptr.isInCell())
+                        return;
+
+                    if (ptr == MWMechanics::getPlayer())
+                    {
+                        MWBase::Environment::get().getWorld()->getPlayer().setTeleported(true);
+                    }
                     int cx,cy;
                     MWBase::Environment::get().getWorld()->positionToIndex(x,y,cx,cy);
 

From 1bc24d51203bfc11145354c1cf4ec1e2a0a59d26 Mon Sep 17 00:00:00 2001
From: unknown <malusluminis@hotmail.com>
Date: Sat, 30 Apr 2022 18:32:10 +0200
Subject: [PATCH 2368/2859] Bring HitAttemptOnMe in line with HitOnMe

---
 apps/openmw/mwmechanics/creaturestats.cpp | 5 +++++
 apps/openmw/mwmechanics/creaturestats.hpp | 1 +
 apps/openmw/mwscript/miscextensions.cpp   | 7 ++++---
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index b30d052d64..2faa6332ec 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -362,6 +362,11 @@ namespace MWMechanics
         mLastHitAttemptObject = objectid;
     }
 
+    void CreatureStats::clearLastHitAttemptObject()
+    {
+        mLastHitAttemptObject.clear();
+    }
+
     const std::string &CreatureStats::getLastHitAttemptObject() const
     {
         return mLastHitAttemptObject;
diff --git a/apps/openmw/mwmechanics/creaturestats.hpp b/apps/openmw/mwmechanics/creaturestats.hpp
index d233d87cd0..8908ed838c 100644
--- a/apps/openmw/mwmechanics/creaturestats.hpp
+++ b/apps/openmw/mwmechanics/creaturestats.hpp
@@ -258,6 +258,7 @@ namespace MWMechanics
         void clearLastHitObject();
         const std::string &getLastHitObject() const;
         void setLastHitAttemptObject(const std::string &objectid);
+        void clearLastHitAttemptObject();
         const std::string &getLastHitAttemptObject() const;
         void setHitAttemptActorId(const int actorId);
         int getHitAttemptActorId() const;
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index 2b557fc9b6..678e195808 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -997,9 +997,10 @@ namespace MWScript
                     runtime.pop();
 
                     MWMechanics::CreatureStats &stats = ptr.getClass().getCreatureStats(ptr);
-                    runtime.push(::Misc::StringUtils::ciEqual(objectID, stats.getLastHitAttemptObject()));
-
-                    stats.setLastHitAttemptObject(std::string());
+                    bool hit = ::Misc::StringUtils::ciEqual(objectID, stats.getLastHitAttemptObject());
+                    runtime.push(hit);
+                    if(hit)
+                        stats.clearLastHitAttemptObject();
                 }
         };
 

From 92538dde8941801ebe6034d3759443db954bd8b3 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 1 May 2022 15:45:22 +0200
Subject: [PATCH 2369/2859] End SNAM record as SNAM record

---
 components/esm3/loadregn.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/esm3/loadregn.cpp b/components/esm3/loadregn.cpp
index 98dd585e33..4f097a5e2b 100644
--- a/components/esm3/loadregn.cpp
+++ b/components/esm3/loadregn.cpp
@@ -100,7 +100,7 @@ namespace ESM
             esm.startSubRecord("SNAM");
             esm.writeFixedSizeString(it->mSound, 32);
             esm.writeT(it->mChance);
-            esm.endRecord("NPCO");
+            esm.endRecord("SNAM");
         }
     }
 

From b67a0a8f2bbef990794c941a82eab9014424a5a5 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 1 May 2022 14:46:47 +0200
Subject: [PATCH 2370/2859] Fix uninitialized coverity warnings

---
 apps/esmtool/arguments.hpp    |  6 +++---
 apps/esmtool/esmtool.cpp      | 20 ++++----------------
 components/esm3/esmwriter.hpp |  1 +
 components/esm3/loadnpc.cpp   |  3 +++
 components/esm4/loadhdpt.cpp  | 16 ++++++++++++----
 components/esm4/loadland.cpp  |  1 +
 components/esm4/loadqust.cpp  |  8 ++++----
 components/esm4/loadtes4.cpp  |  2 +-
 8 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/apps/esmtool/arguments.hpp b/apps/esmtool/arguments.hpp
index 96b4bb8f04..edd8c9b06c 100644
--- a/apps/esmtool/arguments.hpp
+++ b/apps/esmtool/arguments.hpp
@@ -11,9 +11,9 @@ namespace EsmTool
     struct Arguments
     {
         std::optional<ESM::Format> mRawFormat;
-        bool quiet_given;
-        bool loadcells_given;
-        bool plain_given;
+        bool quiet_given = false;
+        bool loadcells_given = false;
+        bool plain_given = false;
 
         std::string mode;
         std::string encoding;
diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp
index 3eb78f3e41..2e64168046 100644
--- a/apps/esmtool/esmtool.cpp
+++ b/apps/esmtool/esmtool.cpp
@@ -36,11 +36,7 @@ namespace bpo = boost::program_options;
 
 struct ESMData
 {
-    std::string author;
-    std::string description;
-    unsigned int version;
-    std::vector<ESM::Header::MasterData> masters;
-
+    ESM::Header mHeader;
     std::deque<std::unique_ptr<EsmTool::RecordBase>> mRecords;
     // Value: (Reference, Deleted flag)
     std::map<ESM::Cell *, std::deque<std::pair<ESM::CellRef, bool> > > mCellRefs;
@@ -331,11 +327,7 @@ int loadTes3(const Arguments& info, std::unique_ptr<std::ifstream>&& stream, ESM
         esm.open(std::move(stream), info.filename);
 
         if (data != nullptr)
-        {
-            data->author = esm.getAuthor();
-            data->description = esm.getDesc();
-            data->masters = esm.getGameFiles();
-        }
+            data->mHeader = esm.getHeader();
 
         if (!quiet)
         {
@@ -503,14 +495,10 @@ int clone(const Arguments& info)
     ESM::ESMWriter esm;
     ToUTF8::Utf8Encoder encoder (ToUTF8::calculateEncoding(info.encoding));
     esm.setEncoder(&encoder);
-    esm.setAuthor(data.author);
-    esm.setDescription(data.description);
-    esm.setVersion(data.version);
+    esm.setHeader(data.mHeader);
+    esm.setVersion(ESM::VER_13);
     esm.setRecordCount (recordCount);
 
-    for (const ESM::Header::MasterData &master : data.masters)
-        esm.addMaster(master.name, master.size);
-
     std::fstream save(info.outname.c_str(), std::fstream::out | std::fstream::binary);
     esm.save(save);
 
diff --git a/components/esm3/esmwriter.hpp b/components/esm3/esmwriter.hpp
index 264dc1c877..473e948f98 100644
--- a/components/esm3/esmwriter.hpp
+++ b/components/esm3/esmwriter.hpp
@@ -38,6 +38,7 @@ class ESMWriter
         void setEncoder(ToUTF8::Utf8Encoder *encoding);
         void setAuthor(const std::string& author);
         void setDescription(const std::string& desc);
+        void setHeader(const Header& value) { mHeader = value; }
 
         // Set the record count for writing it in the file header
         void setRecordCount (int count);
diff --git a/components/esm3/loadnpc.cpp b/components/esm3/loadnpc.cpp
index 6c0b8d0a68..dc91c5ea0c 100644
--- a/components/esm3/loadnpc.cpp
+++ b/components/esm3/loadnpc.cpp
@@ -158,6 +158,9 @@ namespace ESM
             npdt12.mDisposition = mNpdt.mDisposition;
             npdt12.mReputation = mNpdt.mReputation;
             npdt12.mRank = mNpdt.mRank;
+            npdt12.mUnknown1 = 0;
+            npdt12.mUnknown2 = 0;
+            npdt12.mUnknown3 = 0;
             npdt12.mGold = mNpdt.mGold;
             esm.writeHNT("NPDT", npdt12, 12);
         }
diff --git a/components/esm4/loadhdpt.cpp b/components/esm4/loadhdpt.cpp
index 9e5d4c9ffd..ee1d3dd526 100644
--- a/components/esm4/loadhdpt.cpp
+++ b/components/esm4/loadhdpt.cpp
@@ -27,6 +27,7 @@
 #include "loadhdpt.hpp"
 
 #include <stdexcept>
+#include <optional>
 //#include <iostream> // FIXME: testing only
 
 #include "reader.hpp"
@@ -38,7 +39,7 @@ void ESM4::HeadPart::load(ESM4::Reader& reader)
     reader.adjustFormId(mFormId);
     mFlags  = reader.hdr().record.flags;
 
-    std::uint32_t type;
+    std::optional<std::uint32_t> type;
 
     while (reader.getSubRecordHeader())
     {
@@ -52,7 +53,9 @@ void ESM4::HeadPart::load(ESM4::Reader& reader)
             case ESM4::SUB_HNAM: reader.getFormId(mAdditionalPart); break;
             case ESM4::SUB_NAM0: // TES5
             {
-                reader.get(type);
+                std::uint32_t value;
+                reader.get(value);
+                type = value;
 
                 break;
             }
@@ -61,8 +64,13 @@ void ESM4::HeadPart::load(ESM4::Reader& reader)
                 std::string file;
                 reader.getZString(file);
 
-                // FIXME: check type >= 0 && type < 3
-                mTriFile[type] = std::move(file);
+                if (!type.has_value())
+                    throw std::runtime_error("Failed to read ESM4 HDPT record: subrecord NAM0 does not precede subrecord NAM1: file type is unknown");
+
+                if (*type >= mTriFile.size())
+                    throw std::runtime_error("Failed to read ESM4 HDPT record: invalid file type: " + std::to_string(*type));
+
+                mTriFile[*type] = std::move(file);
 
                 break;
             }
diff --git a/components/esm4/loadland.cpp b/components/esm4/loadland.cpp
index 651a285a72..4cbbfd69eb 100644
--- a/components/esm4/loadland.cpp
+++ b/components/esm4/loadland.cpp
@@ -58,6 +58,7 @@ void ESM4::Land::load(ESM4::Reader& reader)
     mFormId = reader.hdr().record.id;
     reader.adjustFormId(mFormId);
     mFlags  = reader.hdr().record.flags;
+    mDataTypes = 0;
 
     TxtLayer layer;
     std::int8_t currentAddQuad = -1; // for VTXT following ATXT
diff --git a/components/esm4/loadqust.cpp b/components/esm4/loadqust.cpp
index 39eb592514..14aa51e17a 100644
--- a/components/esm4/loadqust.cpp
+++ b/components/esm4/loadqust.cpp
@@ -65,18 +65,20 @@ void ESM4::Quest::load(ESM4::Reader& reader)
             case ESM4::SUB_SCRI: reader.get(mQuestScript); break;
             case ESM4::SUB_CTDA: // FIXME: how to detect if 1st/2nd param is a formid?
             {
-                TargetCondition cond;
-
                 if (subHdr.dataSize == 24) // TES4
                 {
+                    TargetCondition cond;
                     reader.get(&cond, 24);
                     cond.reference = 0; // unused in TES4 but keep it clean
+                    mTargetConditions.push_back(cond);
                 }
                 else if (subHdr.dataSize == 28)
                 {
+                    TargetCondition cond;
                     reader.get(cond); // FO3/FONV
                     if (cond.reference)
                         reader.adjustFormId(cond.reference);
+                    mTargetConditions.push_back(cond);
                 }
                 else
                 {
@@ -85,8 +87,6 @@ void ESM4::Quest::load(ESM4::Reader& reader)
                 }
                 // FIXME: support TES5
 
-                mTargetConditions.push_back(cond);
-
                 break;
             }
             case ESM4::SUB_SCHR: reader.get(mScript.scriptHeader); break;
diff --git a/components/esm4/loadtes4.cpp b/components/esm4/loadtes4.cpp
index 42c4acde4e..3e81492825 100644
--- a/components/esm4/loadtes4.cpp
+++ b/components/esm4/loadtes4.cpp
@@ -67,7 +67,7 @@ void ESM4::Header::load(ESM4::Reader& reader)
                     throw std::runtime_error("TES4 MAST data read error");
 
                 // NOTE: some mods do not have DATA following MAST so can't read DATA here
-
+                m.size = 0;
                 mMaster.push_back (m);
                 break;
             }

From af5b1b30838ea4a931ff9b515a3a34c4d8065617 Mon Sep 17 00:00:00 2001
From: Max Henzerling <maxhenzerling@gmail.com>
Date: Tue, 26 Apr 2022 18:31:27 -0700
Subject: [PATCH 2371/2859] Add option to open record editting subviews in new
 windows instead of exclusive docking.

---
 apps/opencs/model/prefs/state.cpp |  3 +++
 apps/opencs/view/doc/view.cpp     | 19 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/apps/opencs/model/prefs/state.cpp b/apps/opencs/model/prefs/state.cpp
index 97039df2eb..0acd8680c8 100644
--- a/apps/opencs/model/prefs/state.cpp
+++ b/apps/opencs/model/prefs/state.cpp
@@ -93,6 +93,9 @@ void CSMPrefs::State::declare()
         "If this option is enabled, types of affected records are selected "
         "manually before a command execution.\nOtherwise, all associated "
         "records are deleted/reverted immediately.");
+    declareBool ("subview-new-window", "Open Record in new window", false)
+        .setTooltip("When editing a record, open the view in a new window,"
+        " rather than docked in the main view.");
 
     declareCategory ("ID Dialogues");
     declareBool ("toolbar", "Show toolbar", true);
diff --git a/apps/opencs/view/doc/view.cpp b/apps/opencs/view/doc/view.cpp
index c89437d70d..20e71d057d 100644
--- a/apps/opencs/view/doc/view.cpp
+++ b/apps/opencs/view/doc/view.cpp
@@ -25,6 +25,8 @@
 #include "../world/subviews.hpp"
 #include "../world/scenesubview.hpp"
 #include "../world/tablesubview.hpp"
+#include "../world/dialoguesubview.hpp"
+#include "../world/scriptsubview.hpp"
 
 #include "../tools/subviews.hpp"
 
@@ -609,7 +611,7 @@ void CSVDoc::View::addSubView (const CSMWorld::UniversalId& id, const std::strin
         view = mSubViewFactory.makeSubView (id, *mDocument);
     }
     assert(view);
-    view->setParent(this);
+    view->setParent(this); // unfloats view
     view->setEditLock (mDocument->getState() & CSMDoc::State_Locked);
     mSubViews.append(view); // only after assert
 
@@ -661,6 +663,21 @@ void CSVDoc::View::addSubView (const CSMWorld::UniversalId& id, const std::strin
                 this, SLOT(onRequestFocus(const std::string&)));
     }
 
+    if (CSMPrefs::State::get()["ID Tables"]["subview-new-window"].isTrue())
+    {
+        CSVWorld::DialogueSubView* dialogueView = dynamic_cast<CSVWorld::DialogueSubView*>(view);
+        if (dialogueView)
+        {
+            dialogueView->setFloating(true);
+        }
+
+        CSVWorld::ScriptSubView* scriptView = dynamic_cast<CSVWorld::ScriptSubView*>(view);
+        if (scriptView)
+        {
+            scriptView->setFloating(true);
+        }
+    }
+
     view->show();
 
     if (!hint.empty())

From 41be5a17f4d262f5e626a65238e0595e2abcefef Mon Sep 17 00:00:00 2001
From: Max Henzerling <maxhenzerling@gmail.com>
Date: Thu, 28 Apr 2022 10:52:02 -0700
Subject: [PATCH 2372/2859] comments from PR

---
 apps/opencs/view/doc/view.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/apps/opencs/view/doc/view.cpp b/apps/opencs/view/doc/view.cpp
index 20e71d057d..1fea81ce97 100644
--- a/apps/opencs/view/doc/view.cpp
+++ b/apps/opencs/view/doc/view.cpp
@@ -611,7 +611,7 @@ void CSVDoc::View::addSubView (const CSMWorld::UniversalId& id, const std::strin
         view = mSubViewFactory.makeSubView (id, *mDocument);
     }
     assert(view);
-    view->setParent(this); // unfloats view
+    view->setParent(this);
     view->setEditLock (mDocument->getState() & CSMDoc::State_Locked);
     mSubViews.append(view); // only after assert
 
@@ -667,15 +667,11 @@ void CSVDoc::View::addSubView (const CSMWorld::UniversalId& id, const std::strin
     {
         CSVWorld::DialogueSubView* dialogueView = dynamic_cast<CSVWorld::DialogueSubView*>(view);
         if (dialogueView)
-        {
             dialogueView->setFloating(true);
-        }
 
         CSVWorld::ScriptSubView* scriptView = dynamic_cast<CSVWorld::ScriptSubView*>(view);
         if (scriptView)
-        {
             scriptView->setFloating(true);
-        }
     }
 
     view->show();

From 2771fa1bb49fb7749a0f8594a40e87025c11d851 Mon Sep 17 00:00:00 2001
From: Max Henzerling <maxhenzerling@gmail.com>
Date: Thu, 28 Apr 2022 13:11:35 -0700
Subject: [PATCH 2373/2859] create and add issue to changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b388f0c18c..29a199808d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -156,6 +156,7 @@
     Feature #6684: Support NiFltAnimationNode
     Feature #6699: Ignored flag
     Feature #6706: Save the size of the Options window
+    Feature #6721: [OpenMW-CS] Add option to open records in new window
     Task #6201: Remove the "Note: No relevant classes found. No output generated" warnings
     Task #6264: Remove the old classes in animation.cpp
     Task #6553: Simplify interpreter instruction registration

From eedae407ab6cb031c8cdb761a994c0522962e541 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Mon, 2 May 2022 19:49:30 +0100
Subject: [PATCH 2374/2859] Tell CMake where to find ICU properly

I had a problem where CMake picked up half of ICU from its C API, which
is included with the Windows SDK, and half from the C++ API we provide.
This should prevent that.

* ICU_ROOT takes precedence as a CMake variable so do that instead of as
  an environment variable.
* ICU_LIBRARY is an output of FindICU.cmake, not an input, so don't set
  it.
* FindICU.cmake needs telling about components via their own variables.
---
 CI/before_script.msvc.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index bdf7d24eb8..17ff27f9f1 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -1066,10 +1066,12 @@ printf "ICU ${ICU_VER/_/.}... "
 		rm -rf ICU-${ICU_VER}
 		eval 7z x -y icu4c-${ICU_VER}-Win${BITS}-MSVC2019.zip -o$(real_pwd)/ICU-${ICU_VER} $STRIP
 	fi
-	export ICU_ROOT="$(real_pwd)/ICU-${ICU_VER}"
-	add_cmake_opts -DICU_INCLUDE_DIR="${ICU_ROOT}/include" \
-		-DICU_LIBRARY="${ICU_ROOT}/lib${BITS}/icuuc.lib " \
-        -DICU_DEBUG=ON
+	ICU_ROOT="$(real_pwd)/ICU-${ICU_VER}"
+	add_cmake_opts -DICU_ROOT="${ICU_ROOT}" \
+		-DICU_INCLUDE_DIR="${ICU_ROOT}/include" \
+		-DICU_I18N_LIBRARY="${ICU_ROOT}/lib${BITS}/icuin.lib " \
+		-DICU_UC_LIBRARY="${ICU_ROOT}/lib${BITS}/icuuc.lib " \
+		-DICU_DEBUG=ON
 
 	for config in ${CONFIGURATIONS[@]}; do
 		add_runtime_dlls $config "$(pwd)/ICU-${ICU_VER}/bin${BITS}/icudt${ICU_VER/_*/}.dll"

From a6c9c9d1f8b6b664229f4d68f72c2d2134a93b02 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Mon, 2 May 2022 20:11:01 +0100
Subject: [PATCH 2375/2859] Don't return a random anonymous node from
 getArrowBone when the current weapon doesn't fire arrows.

---
 apps/openmw/mwrender/creatureanimation.cpp | 2 ++
 apps/openmw/mwrender/npcanimation.cpp      | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/apps/openmw/mwrender/creatureanimation.cpp b/apps/openmw/mwrender/creatureanimation.cpp
index 78a524b74f..f3a92bff46 100644
--- a/apps/openmw/mwrender/creatureanimation.cpp
+++ b/apps/openmw/mwrender/creatureanimation.cpp
@@ -232,6 +232,8 @@ osg::Group *CreatureWeaponAnimation::getArrowBone()
 
     int type = weapon->get<ESM::Weapon>()->mBase->mData.mType;
     int ammoType = MWMechanics::getWeaponType(type)->mAmmoType;
+    if (ammoType == ESM::Weapon::None)
+        return nullptr;
 
     // Try to find and attachment bone in actor's skeleton, otherwise fall back to the ArrowBone in weapon's mesh
     osg::Group* bone = getBoneByName(MWMechanics::getWeaponType(ammoType)->mAttachBone);
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 5b96fdb6ba..0d74b8d302 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -1034,6 +1034,8 @@ osg::Group* NpcAnimation::getArrowBone()
 
     int type = weapon->get<ESM::Weapon>()->mBase->mData.mType;
     int ammoType = MWMechanics::getWeaponType(type)->mAmmoType;
+    if (ammoType == ESM::Weapon::None)
+        return nullptr;
 
     // Try to find and attachment bone in actor's skeleton, otherwise fall back to the ArrowBone in weapon's mesh
     osg::Group* bone = getBoneByName(MWMechanics::getWeaponType(ammoType)->mAttachBone);

From 143dcad0e8de610a7d503010da86993f923cf33c Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Mon, 2 May 2022 21:17:24 +0000
Subject: [PATCH 2376/2859] Use an `if` instead of an assert

---
 components/esm4/loadtes4.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/components/esm4/loadtes4.cpp b/components/esm4/loadtes4.cpp
index 42c4acde4e..7123f60e38 100644
--- a/components/esm4/loadtes4.cpp
+++ b/components/esm4/loadtes4.cpp
@@ -53,9 +53,8 @@ void ESM4::Header::load(ESM4::Reader& reader)
             {
                 if (!reader.getExact(mData.version) || !reader.getExact(mData.records) || !reader.getExact(mData.nextObjectId))
                     throw std::runtime_error("TES4 HEDR data read error");
-
-                assert((size_t)subHdr.dataSize == sizeof(mData.version)+sizeof(mData.records)+sizeof(mData.nextObjectId)
-                        && "TES4 HEDR data size mismatch");
+                if ((size_t)subHdr.dataSize != sizeof(mData.version)+sizeof(mData.records)+sizeof(mData.nextObjectId))
+                    throw std::runtime_error("TES4 HEDR data size mismatch");
                 break;
             }
             case ESM4::SUB_CNAM: reader.getZString(mAuthor); break;

From 03659bef86ba60a1a30aebac9790742072875010 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Tue, 3 May 2022 17:36:49 +0000
Subject: [PATCH 2377/2859] MWUI interface (resolve
 https://gitlab.com/OpenMW/openmw/-/issues/6594)

---
 apps/openmw/mwlua/uibindings.cpp              |  48 ++-----
 components/lua_ui/element.cpp                 |  24 ++--
 components/lua_ui/element.hpp                 |   7 +
 components/lua_ui/flex.cpp                    |  17 ++-
 components/lua_ui/flex.hpp                    |   1 +
 components/lua_ui/widget.cpp                  |  14 +-
 components/lua_ui/widget.hpp                  |   2 +-
 docs/source/generate_luadoc.sh                |   1 +
 docs/source/reference/lua-scripting/api.rst   |   4 +
 .../lua-scripting/interface_mwui.rst          |   6 +
 .../reference/lua-scripting/openmw_aux_ui.rst |   5 +
 files/builtin_scripts/CMakeLists.txt          |   9 +-
 files/builtin_scripts/builtin.omwscripts      |   1 +
 files/builtin_scripts/openmw_aux/ui.lua       |  36 ++++++
 .../scripts/omw/mwui/borders.lua              | 120 ++++++++++++++++++
 .../builtin_scripts/scripts/omw/mwui/box.lua  |  45 +++++++
 .../scripts/omw/mwui/constants.lua            |   8 ++
 .../builtin_scripts/scripts/omw/mwui/init.lua | 101 +++++++++++++++
 .../builtin_scripts/scripts/omw/mwui/text.lua |  15 +++
 .../scripts/omw/mwui/textEdit.lua             |  47 +++++++
 files/lua_api/openmw/ui.lua                   |  18 +--
 21 files changed, 465 insertions(+), 64 deletions(-)
 create mode 100644 docs/source/reference/lua-scripting/interface_mwui.rst
 create mode 100644 docs/source/reference/lua-scripting/openmw_aux_ui.rst
 create mode 100644 files/builtin_scripts/openmw_aux/ui.lua
 create mode 100644 files/builtin_scripts/scripts/omw/mwui/borders.lua
 create mode 100644 files/builtin_scripts/scripts/omw/mwui/box.lua
 create mode 100644 files/builtin_scripts/scripts/omw/mwui/constants.lua
 create mode 100644 files/builtin_scripts/scripts/omw/mwui/init.lua
 create mode 100644 files/builtin_scripts/scripts/omw/mwui/text.lua
 create mode 100644 files/builtin_scripts/scripts/omw/mwui/textEdit.lua

diff --git a/apps/openmw/mwlua/uibindings.cpp b/apps/openmw/mwlua/uibindings.cpp
index 84ec98adfb..5b66c8b945 100644
--- a/apps/openmw/mwlua/uibindings.cpp
+++ b/apps/openmw/mwlua/uibindings.cpp
@@ -82,38 +82,6 @@ namespace MWLua
                 std::shared_ptr<LuaUi::Element> mElement;
         };
 
-        class InsertLayerAction final : public LuaManager::Action
-        {
-            public:
-                InsertLayerAction(std::string_view name, size_t index,
-                    LuaUi::Layer::Options options, LuaUtil::LuaState* state)
-                    : Action(state)
-                    , mName(name)
-                    , mIndex(index)
-                    , mOptions(options)
-                {}
-
-                void apply(WorldView&) const override
-                {
-                    LuaUi::Layer::insert(mIndex, mName, mOptions);
-                }
-
-                std::string toString() const override
-                {
-                    std::string result("Insert UI layer \"");
-                    result += mName;
-                    result += "\" at \"";
-                    result += mIndex;
-                    result += "\"";
-                    return result;
-                }
-
-            private:
-                std::string mName;
-                size_t mIndex;
-                LuaUi::Layer::Options mOptions;
-        };
-
         // Lua arrays index from 1
         inline size_t fromLuaIndex(size_t i) { return i - 1; }
         inline size_t toLuaIndex(size_t i) { return i + 1; }
@@ -252,6 +220,18 @@ namespace MWLua
             context.mLuaManager->addAction(std::make_unique<UiAction>(UiAction::CREATE, element, context.mLua));
             return element;
         };
+        api["updateAll"] = [context]()
+        {
+            LuaUi::Element::forEach([](LuaUi::Element* e) { e->mUpdate = true; });
+            context.mLuaManager->addAction([]()
+            {
+                LuaUi::Element::forEach([](LuaUi::Element* e) { e->update(); });
+            }, "Update all UI elements");
+        };
+        api["_getMenuTransparency"] = []()
+        {
+            return Settings::Manager::getFloat("menu transparency", "GUI");
+        };
 
         auto uiLayer = context.mLua->sol().new_usertype<LuaUi::Layer>("UiLayer");
         uiLayer["name"] = sol::property([](LuaUi::Layer& self) { return self.name(); });
@@ -287,7 +267,7 @@ namespace MWLua
             if (index == LuaUi::Layer::count())
                 throw std::logic_error(std::string("Layer not found"));
             index++;
-            context.mLuaManager->addAction(std::make_unique<InsertLayerAction>(name, index, options, context.mLua));
+            context.mLuaManager->addAction([=]() { LuaUi::Layer::insert(index, name, options); }, "Insert UI layer");
         };
         layers["insertBefore"] = [context](std::string_view beforename, std::string_view name, const sol::object& opt)
         {
@@ -296,7 +276,7 @@ namespace MWLua
             size_t index = LuaUi::Layer::indexOf(beforename);
             if (index == LuaUi::Layer::count())
                 throw std::logic_error(std::string("Layer not found"));
-            context.mLuaManager->addAction(std::make_unique<InsertLayerAction>(name, index, options, context.mLua));
+            context.mLuaManager->addAction([=]() { LuaUi::Layer::insert(index, name, options); }, "Insert UI layer");
         };
         {
             auto pairs = [layers](const sol::object&)
diff --git a/components/lua_ui/element.cpp b/components/lua_ui/element.cpp
index a939ccdc51..46eb543cca 100644
--- a/components/lua_ui/element.cpp
+++ b/components/lua_ui/element.cpp
@@ -20,9 +20,11 @@ namespace LuaUi
         constexpr std::string_view external = "external";
     }
 
+    const std::string defaultWidgetType = "LuaWidget";
+
     std::string widgetType(const sol::table& layout)
     {
-        return layout.get_or(LayoutKeys::type, std::string("LuaWidget"));
+        return layout.get_or(LayoutKeys::type, defaultWidgetType);
     }
 
     void destroyWidget(LuaUi::WidgetExtension* ext)
@@ -74,11 +76,6 @@ namespace LuaUi
 
     void setTemplate(WidgetExtension* ext, const sol::object& templateLayout)
     {
-        // \todo remove when none of the widgets require this workaround
-        sol::object skin = LuaUtil::getFieldOrNil(templateLayout, "skin");
-        if (skin.is<std::string>())
-            ext->widget()->changeWidgetSkin(skin.as<std::string>());
-
         sol::object props = LuaUtil::getFieldOrNil(templateLayout, LayoutKeys::props);
         ext->setTemplateProperties(props);
         sol::object content = LuaUtil::getFieldOrNil(templateLayout, LayoutKeys::content);
@@ -107,13 +104,22 @@ namespace LuaUi
 
     WidgetExtension* createWidget(const sol::table& layout)
     {
-        std::string type = widgetType(layout);
-        std::string name = layout.get_or(LayoutKeys::name, std::string());
-
+        sol::object typeField = LuaUtil::getFieldOrNil(layout, LayoutKeys::type);
+        std::string type = LuaUtil::getValueOrDefault(typeField, defaultWidgetType);
+        sol::object templateTypeField = LuaUtil::getFieldOrNil(layout, LayoutKeys::templateLayout, LayoutKeys::type);
+        if (templateTypeField != sol::nil)
+        {
+            std::string templateType = LuaUtil::getValueOrDefault(templateTypeField, defaultWidgetType);
+            if (typeField != sol::nil && templateType != type)
+                throw std::logic_error(std::string("Template layout type ") + type
+                    + std::string(" doesn't match template type ") + templateType);
+            type = templateType;
+        }
         static auto widgetTypeMap = widgetTypeToName();
         if (widgetTypeMap.find(type) == widgetTypeMap.end())
             throw std::logic_error(std::string("Invalid widget type ") += type);
 
+        std::string name = layout.get_or(LayoutKeys::name, std::string());
         MyGUI::Widget* widget = MyGUI::Gui::getInstancePtr()->createWidgetT(
             type, "",
             MyGUI::IntCoord(), MyGUI::Align::Default,
diff --git a/components/lua_ui/element.hpp b/components/lua_ui/element.hpp
index 13f4ea052d..1387a1b51e 100644
--- a/components/lua_ui/element.hpp
+++ b/components/lua_ui/element.hpp
@@ -9,6 +9,13 @@ namespace LuaUi
     {
         static std::shared_ptr<Element> make(sol::table layout);
 
+        template<class Callback>
+        static void forEach(Callback callback)
+        {
+            for(auto& [e, _] : sAllElements)
+                callback(e);
+        }
+
         WidgetExtension* mRoot;
         WidgetExtension* mAttachedTo;
         sol::table mLayout;
diff --git a/components/lua_ui/flex.cpp b/components/lua_ui/flex.cpp
index 13acfb3990..e90fba2a1a 100644
--- a/components/lua_ui/flex.cpp
+++ b/components/lua_ui/flex.cpp
@@ -56,24 +56,25 @@ namespace LuaUi
         MyGUI::IntSize flexSize = calculateSize();
         int growSize = 0;
         float growFactor = 0;
-        if (totalGrow > 0)
+        if (totalGrow > 0 && !mAutoSized)
         {
             growSize = primary(flexSize) - primary(childrenSize);
             growFactor = growSize / totalGrow;
-        }   
+        }
 
         MyGUI::IntPoint childPosition;
         primary(childPosition) = alignSize(primary(flexSize) - growSize, primary(childrenSize), mAlign);
-        secondary(childPosition) = alignSize(secondary(flexSize), secondary(childrenSize), mArrange);
         for (auto* w : children())
         {
+            MyGUI::IntSize size = w->calculateSize();
+            secondary(childPosition) = alignSize(secondary(flexSize), secondary(size), mArrange);
             w->forcePosition(childPosition);
-            MyGUI::IntSize size = w->widget()->getSize();
             primary(size) += static_cast<int>(growFactor * getGrow(w));
             w->forceSize(size);
             primary(childPosition) += primary(size);
+            w->updateCoord();
         }
-        WidgetExtension::updateProperties();
+        WidgetExtension::updateChildren();
     }
 
     MyGUI::IntSize LuaFlex::calculateSize()
@@ -85,4 +86,10 @@ namespace LuaUi
         }
         return size;
     }
+
+    void LuaFlex::updateCoord()
+    {
+        updateChildren();
+        WidgetExtension::updateCoord();
+    }
 }
diff --git a/components/lua_ui/flex.hpp b/components/lua_ui/flex.hpp
index 9ac85213f6..7c583dc3c3 100644
--- a/components/lua_ui/flex.hpp
+++ b/components/lua_ui/flex.hpp
@@ -18,6 +18,7 @@ namespace LuaUi
             {
                 return MyGUI::IntSize();
             }
+            void updateCoord() override;
 
         private:
             bool mHorizontal;
diff --git a/components/lua_ui/widget.cpp b/components/lua_ui/widget.cpp
index 87b1636d74..4c1bb9752f 100644
--- a/components/lua_ui/widget.cpp
+++ b/components/lua_ui/widget.cpp
@@ -197,10 +197,13 @@ namespace LuaUi
             MyGUI::IntSize slotSize = mSlot->widget()->getSize();
             MyGUI::IntPoint slotPosition = mSlot->widget()->getAbsolutePosition() - widget()->getAbsolutePosition();
             MyGUI::IntCoord slotCoord(slotPosition, slotSize);
-            if (mWidget->getSubWidgetMain())
-                mWidget->getSubWidgetMain()->setCoord(slotCoord);
-            if (mWidget->getSubWidgetText())
-                mWidget->getSubWidgetText()->setCoord(slotCoord);
+            MyGUI::Widget* clientWidget = mWidget->getClientWidget();
+            if (!clientWidget)
+                clientWidget = mWidget;
+            if (clientWidget->getSubWidgetMain())
+                clientWidget->getSubWidgetMain()->setCoord(slotCoord);
+            if (clientWidget->getSubWidgetText())
+                clientWidget->getSubWidgetText()->setCoord(slotCoord);
         }
     }
 
@@ -250,8 +253,7 @@ namespace LuaUi
 
         if (oldCoord != newCoord)
             mWidget->setCoord(newCoord);
-        if (oldCoord.size() != newCoord.size())
-            updateChildrenCoord();
+        updateChildrenCoord();
         if (oldCoord != newCoord && mOnCoordChange.has_value())
             mOnCoordChange.value()(this, newCoord);
     }
diff --git a/components/lua_ui/widget.hpp b/components/lua_ui/widget.hpp
index 33bf52cd78..239d2e6bb3 100644
--- a/components/lua_ui/widget.hpp
+++ b/components/lua_ui/widget.hpp
@@ -52,7 +52,7 @@ namespace LuaUi
         void forcePosition(const MyGUI::IntPoint& pos);
         void clearForced();
 
-        void updateCoord();
+        virtual void updateCoord();
 
         const sol::table& getLayout() { return mLayout; }
         void setLayout(const sol::table& layout) { mLayout = layout; }
diff --git a/docs/source/generate_luadoc.sh b/docs/source/generate_luadoc.sh
index b3ec10ba97..5376aa0ab9 100755
--- a/docs/source/generate_luadoc.sh
+++ b/docs/source/generate_luadoc.sh
@@ -67,3 +67,4 @@ cd $FILES_DIR/builtin_scripts
 $DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR openmw_aux/*lua
 $DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR scripts/omw/ai.lua
 $DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR scripts/omw/camera.lua
+$DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR scripts/omw/mwui/init.lua
diff --git a/docs/source/reference/lua-scripting/api.rst b/docs/source/reference/lua-scripting/api.rst
index cf071534d9..110771fbcf 100644
--- a/docs/source/reference/lua-scripting/api.rst
+++ b/docs/source/reference/lua-scripting/api.rst
@@ -23,8 +23,10 @@ Lua API reference
     openmw_aux_calendar
     openmw_aux_util
     openmw_aux_time
+    openmw_aux_ui
     interface_ai
     interface_camera
+    interface_mwui
     iterables
 
 
@@ -87,6 +89,8 @@ Sources can be found in ``resources/vfs/openmw_aux``. In theory mods can overrid
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 |:ref:`openmw_aux.time <Package openmw_aux.time>`         | everywhere         | | Timers and game time utils                                  |
 +---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw_aux.ui <Package openmw_aux.ui>`             | by player scripts  | | User interface utils                                        |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
 
 **Interfaces of built-in scripts**
 
diff --git a/docs/source/reference/lua-scripting/interface_mwui.rst b/docs/source/reference/lua-scripting/interface_mwui.rst
new file mode 100644
index 0000000000..cd9b00cb87
--- /dev/null
+++ b/docs/source/reference/lua-scripting/interface_mwui.rst
@@ -0,0 +1,6 @@
+Interface MWUI
+==============
+
+.. raw:: html
+   :file: generated_html/scripts_omw_mwui_init.html
+
diff --git a/docs/source/reference/lua-scripting/openmw_aux_ui.rst b/docs/source/reference/lua-scripting/openmw_aux_ui.rst
new file mode 100644
index 0000000000..18c0926c03
--- /dev/null
+++ b/docs/source/reference/lua-scripting/openmw_aux_ui.rst
@@ -0,0 +1,5 @@
+Package openmw_aux.ui
+=======================
+
+.. raw:: html
+   :file: generated_html/openmw_aux_ui.html
diff --git a/files/builtin_scripts/CMakeLists.txt b/files/builtin_scripts/CMakeLists.txt
index 1732270527..a3ba1f5149 100644
--- a/files/builtin_scripts/CMakeLists.txt
+++ b/files/builtin_scripts/CMakeLists.txt
@@ -8,6 +8,7 @@ set(LUA_BUILTIN_FILES
     openmw_aux/util.lua
     openmw_aux/time.lua
     openmw_aux/calendar.lua
+    openmw_aux/ui.lua
 
     scripts/omw/ai.lua
     scripts/omw/camera.lua
@@ -18,9 +19,15 @@ set(LUA_BUILTIN_FILES
     scripts/omw/console/local.lua
 
     l10n/Calendar/en.yaml
+
+    scripts/omw/mwui/constants.lua
+    scripts/omw/mwui/borders.lua
+    scripts/omw/mwui/box.lua
+    scripts/omw/mwui/text.lua
+    scripts/omw/mwui/textEdit.lua
+    scripts/omw/mwui/init.lua
 )
 
 foreach (f ${LUA_BUILTIN_FILES})
     copy_resource_file("${CMAKE_CURRENT_SOURCE_DIR}/${f}" "${OPENMW_RESOURCES_ROOT}" "resources/vfs/${f}")
 endforeach (f)
-
diff --git a/files/builtin_scripts/builtin.omwscripts b/files/builtin_scripts/builtin.omwscripts
index e1fbbcdb7c..af6320e0b2 100644
--- a/files/builtin_scripts/builtin.omwscripts
+++ b/files/builtin_scripts/builtin.omwscripts
@@ -3,3 +3,4 @@ NPC,CREATURE: scripts/omw/ai.lua
 PLAYER: scripts/omw/console/player.lua
 GLOBAL: scripts/omw/console/global.lua
 CUSTOM: scripts/omw/console/local.lua
+PLAYER: scripts/omw/mwui/init.lua
diff --git a/files/builtin_scripts/openmw_aux/ui.lua b/files/builtin_scripts/openmw_aux/ui.lua
new file mode 100644
index 0000000000..ec9b81fdb1
--- /dev/null
+++ b/files/builtin_scripts/openmw_aux/ui.lua
@@ -0,0 +1,36 @@
+local ui = require('openmw.ui')
+
+---
+-- `openmw_aux.ui` defines utility functions for UI.
+-- Implementation can be found in `resources/vfs/openmw_aux/ui.lua`.
+-- @module ui
+-- @usage local auxUi = require('openmw_aux.ui')
+local aux_ui = {}
+
+local function deepContentCopy(content)
+    local result = ui.content{}
+    for _, v in ipairs(content) do
+        result:add(aux_ui.deepLayoutCopy(v))
+    end
+    return result
+end
+
+---
+-- @function [parent=#ui] templates
+-- @param #table layout
+-- @return #table copied layout
+function aux_ui.deepLayoutCopy(layout)
+    local result = {}
+    for k, v in pairs(layout) do
+        if k == 'content' then
+            result[k] = deepContentCopy(v)
+        elseif type(v) == 'table' then
+            result[k] = aux_ui.deepLayoutCopy(v)
+        else
+            result[k] = v
+        end
+    end
+    return result
+end
+
+return aux_ui
\ No newline at end of file
diff --git a/files/builtin_scripts/scripts/omw/mwui/borders.lua b/files/builtin_scripts/scripts/omw/mwui/borders.lua
new file mode 100644
index 0000000000..d0d3e50cdf
--- /dev/null
+++ b/files/builtin_scripts/scripts/omw/mwui/borders.lua
@@ -0,0 +1,120 @@
+local ui = require('openmw.ui')
+local util = require('openmw.util')
+
+local constants = require('scripts.omw.mwui.constants')
+
+local v2 = util.vector2
+
+local sideParts = {
+    left = util.vector2(0, 0.5),
+    right = util.vector2(1, 0.5),
+    top = util.vector2(0.5, 0),
+    bottom = util.vector2(0.5, 1),
+}
+local cornerParts = {
+    top_left_corner = util.vector2(0, 0),
+    top_right_corner = util.vector2(1, 0),
+    bottom_left_corner = util.vector2(0, 1),
+    bottom_right_corner = util.vector2(1, 1),
+}
+
+local resources = {}
+do
+    local boxBorderPattern = 'textures/menu_thin_border_%s.dds'
+    for k, _ in pairs(sideParts) do
+        resources[k] = ui.texture{ path = boxBorderPattern:format(k) }
+    end
+    for k, _ in pairs(cornerParts) do
+        resources[k] = ui.texture{ path = boxBorderPattern:format(k) }
+    end
+end
+
+local borderPieces = {}
+for k, align in pairs(sideParts) do
+    local resource = resources[k]
+    local horizontal = align.x ~= 0.5
+    borderPieces[#borderPieces + 1] = {
+        type = ui.TYPE.Image,
+        props = {
+            resource = resource,
+            relativePosition = align,
+            anchor = align,
+            relativeSize = horizontal and v2(0, 1) or v2(1, 0),
+            size = (horizontal and v2(1, -2) or v2(-2, 1)) * constants.borderSize,
+            tileH = not horizontal,
+            tileV = horizontal,
+        },
+    }
+end
+
+for k, align in pairs(cornerParts) do
+    local resource = resources[k]
+    borderPieces[#borderPieces + 1] = {
+        type = ui.TYPE.Image,
+        props = {
+            resource = resource,
+            relativePosition = align,
+            anchor = align,
+            size = v2(1, 1) * constants.borderSize,
+        },
+    }
+end
+
+borderPieces[#borderPieces + 1] = {
+    external = {
+        slot = true,
+    },
+    props = {
+        position = v2(1, 1) * (constants.borderSize + constants.padding),
+        size = v2(-2, -2) * (constants.borderSize + constants.padding),
+        relativeSize = v2(1, 1),
+    },
+}
+
+local borders = {
+    content = ui.content(borderPieces)
+}
+borders.content:add({
+    external = {
+        slot = true,
+    },
+    props = {
+        size = v2(-2, -2) * constants.borderSize,
+    },
+})
+
+local horizontalLine = {
+    content = ui.content {
+        {
+            type = ui.TYPE.Image,
+            props = {
+                resource = resources.top,
+                tileH = true,
+                tileV = false,
+                size = v2(0, constants.borderSize),
+                relativeSize = v2(1, 0),
+            },
+        },
+    },
+}
+
+local verticalLine = {
+    content = ui.content {
+        {
+            type = ui.TYPE.Image,
+            props = {
+                resource = resources.left,
+                tileH = false,
+                tileV = true,
+                size = v2(constants.borderSize, 0),
+                relativeSize = v2(0, 1),
+            },
+        },
+    },
+}
+
+return function(templates)
+    templates.borders = borders
+    templates.horizontalLine = horizontalLine
+    templates.verticalLine = verticalLine
+end
\ No newline at end of file
diff --git a/files/builtin_scripts/scripts/omw/mwui/box.lua b/files/builtin_scripts/scripts/omw/mwui/box.lua
new file mode 100644
index 0000000000..e7737165ae
--- /dev/null
+++ b/files/builtin_scripts/scripts/omw/mwui/box.lua
@@ -0,0 +1,45 @@
+local ui = require('openmw.ui')
+local util = require('openmw.util')
+
+local whiteTexture = ui.texture{ path = 'white' }
+
+local menuTransparency = ui._getMenuTransparency()
+
+return function(templates)
+    templates.backgroundTransparent = {
+        props = {
+            resource = whiteTexture,
+            color = util.color.rgb(0, 0, 0),
+            alpha = menuTransparency,
+        },
+    }
+    templates.backgroundSolid = {
+        props = {
+            resource = whiteTexture,
+            color = util.color.rgb(0, 0, 0),
+        },
+    }
+    templates.box = {
+        props = {
+            inheritAlpha = false,
+        },
+        content = ui.content {
+            {
+                type = ui.TYPE.Image,
+                template = templates.backgroundTransparent,
+                props = {
+                    relativeSize = util.vector2(1, 1),
+                },
+            },
+            {
+                template = templates.borders,
+                props = {
+                    relativeSize = util.vector2(1, 1),
+                },
+                external = {
+                    slot = true,
+                },
+            },
+        },
+    }
+end
\ No newline at end of file
diff --git a/files/builtin_scripts/scripts/omw/mwui/constants.lua b/files/builtin_scripts/scripts/omw/mwui/constants.lua
new file mode 100644
index 0000000000..ddfe5c9214
--- /dev/null
+++ b/files/builtin_scripts/scripts/omw/mwui/constants.lua
@@ -0,0 +1,8 @@
+local util = require('openmw.util')
+
+return {
+    textNormalSize = 16,
+    sandColor = util.color.rgb(202 / 255, 165 / 255, 96 / 255),
+    borderSize = 4,
+    padding = 2,
+}
\ No newline at end of file
diff --git a/files/builtin_scripts/scripts/omw/mwui/init.lua b/files/builtin_scripts/scripts/omw/mwui/init.lua
new file mode 100644
index 0000000000..af41bece98
--- /dev/null
+++ b/files/builtin_scripts/scripts/omw/mwui/init.lua
@@ -0,0 +1,101 @@
+local util = require('openmw.util')
+
+local function shallowLayoutCopy(source, target)
+    for k in pairs(target) do
+        target[k] = nil
+    end
+    for k, v in pairs(source) do
+        target[k] = v
+    end
+    return target
+end
+
+---
+-- @type Templates
+-- @usage
+-- local I = require('openmw.interfaces')
+-- local ui = require('openmw.ui')
+-- local auxUi = require('openmw_aux.ui')
+-- ui.create {
+--     template = I.MWUI.templates.textNormal,
+--     layer = 'Windows',
+--     type = ui.TYPE.Text,
+--     props = {
+--         text = 'Hello, world!',
+--     },
+-- }
+-- -- important to copy here
+-- local myText = auxUi.deepLayoutCopy(I.MWUI.templates.textNormal)
+-- myText.props.textSize = 20
+-- I.MWUI.templates.textNormal = myText
+-- ui.updateAll()
+
+local templatesMeta = {
+    __index = function(self, key)
+        return self.__templates[key]
+    end,
+    __newindex = function(self, key, template)
+        local target = self.__templates[key]
+        if target == template then
+            error("Overriding a template with itself")
+        else
+            shallowLayoutCopy(template, target)
+        end
+    end,
+}
+
+---
+-- @module MWUI
+-- @usage require('openmw.interfaces').MWUI
+local function TemplateOverrides(templates)
+    return setmetatable({
+        __templates = util.makeReadOnly(templates),
+    }, templatesMeta)
+end
+
+---
+-- @field [parent=#MWUI] #Templates templates
+local templates = {}
+
+---
+-- Standard rectangular border
+-- @field [parent=#Templates] openmw.ui#Layout border
+require('scripts.omw.mwui.borders')(templates)
+
+---
+-- Border combined with a transparent background
+-- @field [parent=#Templates] openmw.ui#Layout box
+---
+-- A transparent background
+-- @field [parent=#Templates] openmw.ui#Layout backgroundTransparent
+---
+-- A solid, non-transparent background
+-- @field [parent=#Templates] openmw.ui#Layout backgroundSolid
+require('scripts.omw.mwui.box')(templates)
+
+---
+-- Standard "sand" colored text
+-- @field [parent=#Templates] openmw.ui#Layout textNormal
+require('scripts.omw.mwui.text')(templates)
+
+---
+-- Single line text input
+-- @field [parent=#Templates] openmw.ui#Layout textEditLine
+
+---
+-- Multiline text input
+-- @field [parent=#Templates] openmw.ui#Layout textEditBox
+require('scripts.omw.mwui.textEdit')(templates)
+
+---
+-- Interface version
+-- @field [parent=#MWUI] #number version
+local interface = {
+    version = 0,
+    templates = TemplateOverrides(templates),
+}
+
+return {
+    interfaceName = "MWUI",
+    interface = interface,
+}
\ No newline at end of file
diff --git a/files/builtin_scripts/scripts/omw/mwui/text.lua b/files/builtin_scripts/scripts/omw/mwui/text.lua
new file mode 100644
index 0000000000..f62e4384c1
--- /dev/null
+++ b/files/builtin_scripts/scripts/omw/mwui/text.lua
@@ -0,0 +1,15 @@
+local ui = require('openmw.ui')
+
+local constants = require('scripts.omw.mwui.constants')
+
+local textNormal = {
+    type = ui.TYPE.Text,
+    props = {
+        textSize = constants.textNormalSize,
+        textColor = constants.sandColor,
+    },
+}
+
+return function(templates)
+    templates.textNormal = textNormal
+end
\ No newline at end of file
diff --git a/files/builtin_scripts/scripts/omw/mwui/textEdit.lua b/files/builtin_scripts/scripts/omw/mwui/textEdit.lua
new file mode 100644
index 0000000000..1fbc619611
--- /dev/null
+++ b/files/builtin_scripts/scripts/omw/mwui/textEdit.lua
@@ -0,0 +1,47 @@
+local util = require('openmw.util')
+local ui = require('openmw.ui')
+
+local constants = require('scripts.omw.mwui.constants')
+
+return function(templates)
+    local borderContent = ui.content {
+        {
+            template = templates.borders,
+            props = {
+                relativeSize = util.vector2(1, 1),
+            },
+            content = ui.content {
+                {
+                    external = {
+                        slot = true,
+                    },
+                },
+            }
+        },
+    }
+
+    templates.textEditLine = {
+        type = ui.TYPE.TextEdit,
+        props = {
+            textSize = constants.textNormalSize,
+            textColor = constants.sandColor,
+            textAlignH = ui.ALIGNMENT.Start,
+            textAlignV = ui.ALIGNMENT.Center,
+            multiline = false,
+        },
+        content = borderContent,
+    }
+
+    templates.textEditBox = {
+        type = ui.TYPE.TextEdit,
+        props = {
+            textSize = constants.textNormalSize,
+            textColor = constants.sandColor,
+            textAlignH = ui.ALIGNMENT.Start,
+            textAlignV = ui.ALIGNMENT.Start,
+            multiline = true,
+            wordWrap = true,
+        },
+        content = borderContent,
+    }
+end
\ No newline at end of file
diff --git a/files/lua_api/openmw/ui.lua b/files/lua_api/openmw/ui.lua
index 45adbd8508..b52d9c81e4 100644
--- a/files/lua_api/openmw/ui.lua
+++ b/files/lua_api/openmw/ui.lua
@@ -9,6 +9,13 @@
 -- Widget types
 -- @field [parent=#ui] #TYPE TYPE
 
+---
+-- Alignment values (details depend on the specific property). For horizontal alignment the order is left to right, for vertical alignment the order is top to bottom.
+-- @type ALIGNMENT
+-- @field Start
+-- @field Center
+-- @field End
+
 ---
 -- Alignment values (left to right, top to bottom)
 -- @field [parent=#ui] #ALIGNMENT ALIGNMENT
@@ -25,14 +32,6 @@
 -- @field TextEdit Accepts user text input
 -- @field Window Can be moved and resized by the user
 
----
--- Alignment values (details depend on the specific property).
--- For horizontal alignment the order is left to right, for vertical alignment the order is top to bottom.
--- @type ALIGNMENT
--- @field Start
--- @field Center
--- @field End
-
 ---
 -- Shows given message at the bottom of the screen.
 -- @function [parent=#ui] showMessage
@@ -98,6 +97,9 @@
 -- @field #string searchHints Additional keywords used in search, not displayed anywhere
 -- @field #Element element The page's UI, which will be attached to the settings tab. The root widget has to have a fixed size. Set the `size` field in `props`, `relativeSize` is ignored.
 
+---
+-- Update all existing UI elements. Potentially extremely slow, so only call this when necessary, e. g. after overriding a template.
+-- @function [parent=#ui] updateAll
 
 ---
 -- Layout

From 2b9c7e77bda70515a4b63516a64d0c1dfeb8aa24 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Tue, 3 May 2022 21:30:21 +0100
Subject: [PATCH 2378/2859] Appease the CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29a199808d..8caa2fe0c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -116,6 +116,7 @@
     Bug #6697: Shaders vertex lighting incorrectly clamped
     Bug #6711: Log time differs from real time
     Bug #6717: Broken script causes interpreter stack corruption
+    Bug #6718: Throwable weapons cause arrow enchantment effect to be applied to the whole body
     Feature #890: OpenMW-CS: Column filtering
     Feature #1465: "Reset" argument for AI functions
     Feature #2491: Ability to make OpenMW "portable"

From 2f10ccd18f2907d8164f1c3f4b0b9890e06cbf1e Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Tue, 3 May 2022 22:51:34 +0000
Subject: [PATCH 2379/2859] Disable Chocolatey community repo

This should work around https://github.com/chocolatey/choco/issues/1541, which causes priority to be ignored and our proxy cache to be skipped
---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 696e8113c5..89b6b81179 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -350,6 +350,7 @@ variables: &tests-targets
   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 source disable -n=chocolatey
   - choco install git --force --params "/GitAndUnixToolsOnPath" -y
   - choco install 7zip -y
   - choco install ccache -y
@@ -487,6 +488,7 @@ Windows_Ninja_Tests_RelWithDebInfo:
   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 source disable -n=chocolatey
   - choco install git --force --params "/GitAndUnixToolsOnPath" -y
   - choco install 7zip -y
   - choco install ccache -y

From 55d32432b935b3410bed782f70c96cd65ffb9405 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 4 May 2022 21:15:08 +0200
Subject: [PATCH 2380/2859] Don't mark idle animations as bad when blocking
 them

---
 CHANGELOG.md                          | 1 +
 apps/openmw/mwmechanics/character.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8caa2fe0c4..fd762a82ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -117,6 +117,7 @@
     Bug #6711: Log time differs from real time
     Bug #6717: Broken script causes interpreter stack corruption
     Bug #6718: Throwable weapons cause arrow enchantment effect to be applied to the whole body
+    Bug #6730: LoopGroup stalls animation after playing :Stop frame until another animation is played
     Feature #890: OpenMW-CS: Column filtering
     Feature #1465: "Reset" argument for AI functions
     Feature #2491: Ability to make OpenMW "portable"
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index b2eb316e24..48c7e5125f 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -2457,7 +2457,7 @@ bool CharacterController::playGroup(const std::string &groupname, int mode, int
 
     // We should not interrupt persistent animations by non-persistent ones
     if (isPersistentAnimPlaying() && !persist)
-        return false;
+        return true;
 
     // If this animation is a looped animation (has a "loop start" key) that is already playing
     // and has not yet reached the end of the loop, allow it to continue animating with its existing loop count

From a64979e25d494332523133a33b42b89917419c5b Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 4 May 2022 22:33:39 +0200
Subject: [PATCH 2381/2859] Replace empty std::string assignments

---
 apps/opencs/model/doc/savingstages.cpp            |  4 ++--
 apps/opencs/model/world/nestedcoladapterimp.hpp   |  2 +-
 apps/opencs/model/world/refidadapterimp.hpp       | 10 +++++-----
 apps/opencs/view/render/scenewidget.cpp           |  2 +-
 apps/opencs/view/widget/scenetooltexturebrush.cpp |  2 +-
 apps/openmw/engine.cpp                            |  8 ++------
 apps/openmw/mwclass/armor.cpp                     |  6 ++++--
 apps/openmw/mwclass/book.cpp                      |  2 +-
 apps/openmw/mwclass/clothing.cpp                  |  2 +-
 apps/openmw/mwclass/weapon.cpp                    |  2 +-
 apps/openmw/mwdialogue/dialoguemanagerimp.cpp     |  2 +-
 apps/openmw/mwgui/charactercreation.cpp           |  2 +-
 apps/openmw/mwgui/itemwidget.cpp                  |  2 +-
 apps/openmw/mwgui/quickkeysmenu.cpp               |  4 ++--
 apps/openmw/mwgui/tooltips.cpp                    |  4 ++--
 apps/openmw/mwgui/windowmanagerimp.cpp            |  4 ++--
 apps/openmw/mwmechanics/character.cpp             | 10 +++++-----
 apps/openmw/mwscript/statsextensions.cpp          | 14 +++++++-------
 apps/openmw/mwworld/weather.cpp                   |  2 +-
 components/esm3/inventorystate.cpp                |  2 +-
 components/esm4/loadcell.cpp                      |  8 ++++----
 components/esm4/loadnavi.cpp                      |  6 +++---
 components/esm4/loadnavm.cpp                      |  6 +++---
 components/esm4/loadregn.cpp                      |  2 +-
 components/esm4/loadstat.cpp                      |  2 +-
 components/esm4/loadtes4.cpp                      |  2 +-
 components/esm4/reader.cpp                        |  6 +++---
 components/resource/stats.cpp                     |  2 +-
 components/settings/settings.cpp                  |  4 ++--
 components/shader/shadermanager.cpp               |  4 ++--
 30 files changed, 63 insertions(+), 65 deletions(-)

diff --git a/apps/opencs/model/doc/savingstages.cpp b/apps/opencs/model/doc/savingstages.cpp
index df3d0cb980..bba5aea92f 100644
--- a/apps/opencs/model/doc/savingstages.cpp
+++ b/apps/opencs/model/doc/savingstages.cpp
@@ -145,7 +145,7 @@ void CSMDoc::WriteDialogueCollectionStage::perform (int stage, Messages& message
                 ESM::DialInfo info = (*iter)->get();
                 info.mId = info.mId.substr (info.mId.find_last_of ('#')+1);
 
-                info.mPrev = "";
+                info.mPrev.clear();
                 if (iter!=range.first)
                 {
                     CSMWorld::InfoCollection::RecordConstIterator prev = iter;
@@ -157,7 +157,7 @@ void CSMDoc::WriteDialogueCollectionStage::perform (int stage, Messages& message
                 CSMWorld::InfoCollection::RecordConstIterator next = iter;
                 ++next;
 
-                info.mNext = "";
+                info.mNext.clear();
                 if (next!=range.second)
                 {
                     info.mNext = (*next)->get().mId.substr ((*next)->get().mId.find_last_of ('#')+1);
diff --git a/apps/opencs/model/world/nestedcoladapterimp.hpp b/apps/opencs/model/world/nestedcoladapterimp.hpp
index a5daefc3cd..b1785cc919 100644
--- a/apps/opencs/model/world/nestedcoladapterimp.hpp
+++ b/apps/opencs/model/world/nestedcoladapterimp.hpp
@@ -163,7 +163,7 @@ namespace CSMWorld
             std::vector<std::string>& spells = raceOrBthSgn.mPowers.mList;
 
             // blank row
-            std::string spell = "";
+            std::string spell;
 
             spells.insert(spells.begin()+position, spell);
 
diff --git a/apps/opencs/model/world/refidadapterimp.hpp b/apps/opencs/model/world/refidadapterimp.hpp
index 41de82a0ef..0cfde25569 100644
--- a/apps/opencs/model/world/refidadapterimp.hpp
+++ b/apps/opencs/model/world/refidadapterimp.hpp
@@ -1527,7 +1527,7 @@ namespace CSMWorld
 
             ESM::Transport::Dest newRow;
             newRow.mPos = newPos;
-            newRow.mCellName = "";
+            newRow.mCellName.clear();
 
             if (position >= (int)list.size())
                 list.push_back(newRow);
@@ -1679,7 +1679,7 @@ namespace CSMWorld
             for (int i = 0; i < 8; ++i)
                 newRow.mWander.mIdle[i] = 0;
             newRow.mWander.mShouldRepeat = 1;
-            newRow.mCellName = "";
+            newRow.mCellName.clear();
 
             if (position >= (int)list.size())
                 list.push_back(newRow);
@@ -2013,8 +2013,8 @@ namespace CSMWorld
 
             ESM::PartReference newPart;
             newPart.mPart = 0; // 0 == head
-            newPart.mMale = "";
-            newPart.mFemale = "";
+            newPart.mMale.clear();
+            newPart.mFemale.clear();
 
             if (position >= (int)list.size())
                 list.push_back(newPart);
@@ -2362,7 +2362,7 @@ namespace CSMWorld
             std::vector<ESM::LevelledListBase::LevelItem>& list = leveled.mList;
 
             ESM::LevelledListBase::LevelItem newItem;
-            newItem.mId = "";
+            newItem.mId.clear();
             newItem.mLevel = 0;
 
             if (position >= (int)list.size())
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index b0c2140da9..2cc3b3a582 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -44,7 +44,7 @@ RenderWidget::RenderWidget(QWidget *parent, Qt::WindowFlags f)
     //ds->setNumMultiSamples(8);
 
     osg::ref_ptr<osg::GraphicsContext::Traits> traits = new osg::GraphicsContext::Traits;
-    traits->windowName = "";
+    traits->windowName.clear();
     traits->windowDecoration = true;
     traits->x = 0;
     traits->y = 0;
diff --git a/apps/opencs/view/widget/scenetooltexturebrush.cpp b/apps/opencs/view/widget/scenetooltexturebrush.cpp
index 80eca21785..f55bda0464 100644
--- a/apps/opencs/view/widget/scenetooltexturebrush.cpp
+++ b/apps/opencs/view/widget/scenetooltexturebrush.cpp
@@ -185,7 +185,7 @@ void CSVWidget::TextureBrushWindow::setBrushTexture(std::string brushTexture)
         mSelectedBrush->setText(QString::fromStdString(mBrushTextureLabel) + landtexturesCollection.getData(rowInNew, landTextureFilename).value<QString>());
     } else
     {
-        newBrushTextureId = "";
+        newBrushTextureId.clear();
         mBrushTextureLabel = "No selected texture or invalid texture";
         mSelectedBrush->setText(QString::fromStdString(mBrushTextureLabel));
     }
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 91250ca0fb..650f6511f9 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -770,19 +770,15 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     const std::string globaldefault = mCfgMgr.getGlobalPath().string() + "/gamecontrollerdb.txt";
 
     std::string userGameControllerdb;
-    if (boost::filesystem::exists(userdefault)){
+    if (boost::filesystem::exists(userdefault))
         userGameControllerdb = userdefault;
-    }
-    else
-        userGameControllerdb = "";
 
     std::string gameControllerdb;
     if (boost::filesystem::exists(localdefault))
         gameControllerdb = localdefault;
     else if (boost::filesystem::exists(globaldefault))
         gameControllerdb = globaldefault;
-    else
-        gameControllerdb = ""; //if it doesn't exist, pass in an empty string
+    //else if it doesn't exist, pass in an empty string
 
     // gui needs our shaders path before everything else
     mResourceSystem->getSceneManager()->setShaderPath((mResDir / "shaders").string());
diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index 22c46bf579..da2420d94a 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -205,7 +205,9 @@ namespace MWClass
         // get armor type string (light/medium/heavy)
         std::string typeText;
         if (ref->mBase->mData.mWeight == 0)
-            typeText = "";
+        {
+            // no type
+        }
         else
         {
             int armorType = getEquipmentSkill(ptr);       
@@ -255,7 +257,7 @@ namespace MWClass
         const MWWorld::LiveCellRef<ESM::Armor> *ref = ptr.get<ESM::Armor>();
 
         ESM::Armor newItem = *ref->mBase;
-        newItem.mId="";
+        newItem.mId.clear();
         newItem.mName=newName;
         newItem.mData.mEnchant=enchCharge;
         newItem.mEnchant=enchId;
diff --git a/apps/openmw/mwclass/book.cpp b/apps/openmw/mwclass/book.cpp
index c8a05a132e..86a0c56b9b 100644
--- a/apps/openmw/mwclass/book.cpp
+++ b/apps/openmw/mwclass/book.cpp
@@ -140,7 +140,7 @@ namespace MWClass
         const MWWorld::LiveCellRef<ESM::Book> *ref = ptr.get<ESM::Book>();
 
         ESM::Book newItem = *ref->mBase;
-        newItem.mId="";
+        newItem.mId.clear();
         newItem.mName=newName;
         newItem.mData.mIsScroll = 1;
         newItem.mData.mEnchant=enchCharge;
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index 32396cae35..79c502d673 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -189,7 +189,7 @@ namespace MWClass
         const MWWorld::LiveCellRef<ESM::Clothing> *ref = ptr.get<ESM::Clothing>();
 
         ESM::Clothing newItem = *ref->mBase;
-        newItem.mId="";
+        newItem.mId.clear();
         newItem.mName=newName;
         newItem.mData.mEnchant=enchCharge;
         newItem.mEnchant=enchId;
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index 9290c19d80..9fbc7a8da9 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -266,7 +266,7 @@ namespace MWClass
         const MWWorld::LiveCellRef<ESM::Weapon> *ref = ptr.get<ESM::Weapon>();
 
         ESM::Weapon newItem = *ref->mBase;
-        newItem.mId="";
+        newItem.mId.clear();
         newItem.mName=newName;
         newItem.mData.mEnchant=enchCharge;
         newItem.mEnchant=enchId;
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index feb3c22035..9d8516ae79 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -135,7 +135,7 @@ namespace MWDialogue
         if (actor.getClass().getCreatureStats(actor).isDead())
             return false;
 
-        mLastTopic = "";
+        mLastTopic.clear();
         // Note that we intentionally don't reset mPermanentDispositionChange
 
         mChoice = -1;
diff --git a/apps/openmw/mwgui/charactercreation.cpp b/apps/openmw/mwgui/charactercreation.cpp
index 43da1ef83f..19ba432d58 100644
--- a/apps/openmw/mwgui/charactercreation.cpp
+++ b/apps/openmw/mwgui/charactercreation.cpp
@@ -249,7 +249,7 @@ namespace MWGui
                     break;
                 case GM_ClassGenerate:
                     mGenerateClassStep = 0;
-                    mGenerateClass = "";
+                    mGenerateClass.clear();
                     mGenerateClassSpecializations[0] = 0;
                     mGenerateClassSpecializations[1] = 0;
                     mGenerateClassSpecializations[2] = 0;
diff --git a/apps/openmw/mwgui/itemwidget.cpp b/apps/openmw/mwgui/itemwidget.cpp
index d2dfa827b4..f914ee8556 100644
--- a/apps/openmw/mwgui/itemwidget.cpp
+++ b/apps/openmw/mwgui/itemwidget.cpp
@@ -146,7 +146,7 @@ namespace MWGui
         if (state == None)
         {
             if (!isMagic)
-                backgroundTex = "";
+                backgroundTex.clear();
         }
         else if (state == Equip)
         {
diff --git a/apps/openmw/mwgui/quickkeysmenu.cpp b/apps/openmw/mwgui/quickkeysmenu.cpp
index 99876e0c85..7f53916d65 100644
--- a/apps/openmw/mwgui/quickkeysmenu.cpp
+++ b/apps/openmw/mwgui/quickkeysmenu.cpp
@@ -142,8 +142,8 @@ namespace MWGui
         else
         {
             key->type = Type_Unassigned;
-            key->id = "";
-            key->name = "";
+            key->id.clear();
+            key->name.clear();
 
             MyGUI::TextBox* textBox = key->button->createWidgetReal<MyGUI::TextBox>("SandText",
                 MyGUI::FloatCoord(0,0,1,1), MyGUI::Align::Default);
diff --git a/apps/openmw/mwgui/tooltips.cpp b/apps/openmw/mwgui/tooltips.cpp
index f806d3829a..10ed206e3f 100644
--- a/apps/openmw/mwgui/tooltips.cpp
+++ b/apps/openmw/mwgui/tooltips.cpp
@@ -122,7 +122,7 @@ namespace MWGui
                     info.caption = mFocusObject.getClass().getName(mFocusObject);
                     if (info.caption.empty())
                         info.caption=mFocusObject.getCellRef().getRefId();
-                    info.icon="";
+                    info.icon.clear();
                     tooltipSize = createToolTip(info, checkOwned());
                 }
                 else
@@ -371,7 +371,7 @@ namespace MWGui
 
             ToolTipInfo info = object.getToolTipInfo(mFocusObject, count);
             if (!image)
-                info.icon = "";
+                info.icon.clear();
             tooltipSize = createToolTip(info, isOwned);
         }
 
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 6f053643d6..e3d61e7c08 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -1313,7 +1313,7 @@ namespace MWGui
     void WindowManager::setSelectedEnchantItem(const MWWorld::Ptr& item)
     {
         mSelectedEnchantItem = item;
-        mSelectedSpell = "";
+        mSelectedSpell.clear();
         const ESM::Enchantment* ench = mStore->get<ESM::Enchantment>()
                 .find(item.getClass().getEnchantment(item));
 
@@ -1346,7 +1346,7 @@ namespace MWGui
 
     void WindowManager::unsetSelectedSpell()
     {
-        mSelectedSpell = "";
+        mSelectedSpell.clear();
         mSelectedEnchantItem = MWWorld::Ptr();
         mHud->unsetSelectedSpell();
 
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index b2eb316e24..f626419707 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -759,19 +759,19 @@ void CharacterController::playDeath(float startpoint, CharacterState death)
     // However, they could still trigger text keys, such as Hit events, or sounds.
     mMovementState = CharState_None;
     mAnimation->disable(mCurrentMovement);
-    mCurrentMovement = "";
+    mCurrentMovement.clear();
     mUpperBodyState = UpperCharState_Nothing;
     mAnimation->disable(mCurrentWeapon);
-    mCurrentWeapon = "";
+    mCurrentWeapon.clear();
     mHitState = CharState_None;
     mAnimation->disable(mCurrentHit);
-    mCurrentHit = "";
+    mCurrentHit.clear();
     mIdleState = CharState_None;
     mAnimation->disable(mCurrentIdle);
-    mCurrentIdle = "";
+    mCurrentIdle.clear();
     mJumpState = JumpState_None;
     mAnimation->disable(mCurrentJump);
-    mCurrentJump = "";
+    mCurrentJump.clear();
     mMovementAnimationControlled = true;
 
     mAnimation->play(mCurrentDeath, Priority_Death, MWRender::Animation::BlendMask_All,
diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp
index 08f4cd6f27..9a9a315bdb 100644
--- a/apps/openmw/mwscript/statsextensions.cpp
+++ b/apps/openmw/mwscript/statsextensions.cpp
@@ -553,7 +553,7 @@ namespace MWScript
                 {
                     MWWorld::ConstPtr actor = R()(runtime, false);
 
-                    std::string factionID = "";
+                    std::string factionID;
 
                     if(arg0==0)
                     {
@@ -585,7 +585,7 @@ namespace MWScript
                 {
                     MWWorld::ConstPtr actor = R()(runtime, false);
 
-                    std::string factionID = "";
+                    std::string factionID;
 
                     if(arg0==0)
                     {
@@ -624,7 +624,7 @@ namespace MWScript
                 {
                     MWWorld::ConstPtr actor = R()(runtime, false);
 
-                    std::string factionID = "";
+                    std::string factionID;
 
                     if(arg0==0)
                     {
@@ -656,7 +656,7 @@ namespace MWScript
                 {
                     MWWorld::ConstPtr ptr = R()(runtime, false);
 
-                    std::string factionID = "";
+                    std::string factionID;
                     if(arg0 >0)
                     {
                         factionID = runtime.getStringLiteral (runtime[0].mInteger);
@@ -922,7 +922,7 @@ namespace MWScript
                 {
                     MWWorld::ConstPtr ptr = R()(runtime, false);
 
-                    std::string factionID = "";
+                    std::string factionID;
                     if(arg0 >0 )
                     {
                         factionID = runtime.getStringLiteral (runtime[0].mInteger);
@@ -954,7 +954,7 @@ namespace MWScript
                 {
                     MWWorld::ConstPtr ptr = R()(runtime, false);
 
-                    std::string factionID = "";
+                    std::string factionID;
                     if(arg0 >0 )
                     {
                         factionID = runtime.getStringLiteral (runtime[0].mInteger);
@@ -981,7 +981,7 @@ namespace MWScript
                 {
                     MWWorld::ConstPtr ptr = R()(runtime, false);
 
-                    std::string factionID = "";
+                    std::string factionID;
                     if(arg0 >0 )
                     {
                         factionID = runtime.getStringLiteral (runtime[0].mInteger);
diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index e2b75edc40..16a0bef131 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -945,7 +945,7 @@ namespace MWWorld
     {
         stopSounds();
 
-        mCurrentRegion = "";
+        mCurrentRegion.clear();
         mTimePassed = 0.0f;
         mWeatherUpdateTime = 0.0f;
         forceWeather(0);
diff --git a/components/esm3/inventorystate.cpp b/components/esm3/inventorystate.cpp
index b43a7b7233..7dc971d205 100644
--- a/components/esm3/inventorystate.cpp
+++ b/components/esm3/inventorystate.cpp
@@ -59,7 +59,7 @@ void InventoryState::load (ESMReader &esm)
         //Get its name
         std::string id = esm.getHString();
         int count;
-        std::string parentGroup = "";
+        std::string parentGroup;
         //Then get its count
         esm.getHNT (count, "COUN");
         //Old save formats don't have information about parent group; check for that
diff --git a/components/esm4/loadcell.cpp b/components/esm4/loadcell.cpp
index 1bd7cb783a..6da827499d 100644
--- a/components/esm4/loadcell.cpp
+++ b/components/esm4/loadcell.cpp
@@ -85,7 +85,7 @@ void ESM4::Cell::load(ESM4::Reader& reader)
                 if (!reader.getZString(mEditorId))
                     throw std::runtime_error ("CELL EDID data read error");
 #if 0
-                std::string padding = "";
+                std::string padding;
                 padding.insert(0, reader.stackSize()*2, ' ');
                 std::cout << padding << "CELL Editor ID: " << mEditorId << std::endl;
 #endif
@@ -108,7 +108,7 @@ void ESM4::Cell::load(ESM4::Reader& reader)
                 reader.get(mX);
                 reader.get(mY);
 #if 0
-                std::string padding = "";
+                std::string padding;
                 padding.insert(0, reader.stackSize()*2, ' ');
                 std::cout << padding << "CELL group " << ESM4::printLabel(reader.grp().label, reader.grp().type) << std::endl;
                 std::cout << padding << "CELL formId " << std::hex << reader.hdr().record.id << std::endl;
@@ -143,7 +143,7 @@ void ESM4::Cell::load(ESM4::Reader& reader)
                     reader.get((std::uint8_t&)mCellFlags); // 8 bits in Obvlivion
                 }
 #if 0
-                std::string padding = "";
+                std::string padding;
                 padding.insert(0, reader.stackSize()*2, ' ');
                 std::cout << padding  << "flags: " << std::hex << mCellFlags << std::endl;
 #endif
@@ -156,7 +156,7 @@ void ESM4::Cell::load(ESM4::Reader& reader)
                 {
                     reader.getFormId(*it);
 #if 0
-                    std::string padding = "";
+                    std::string padding;
                     padding.insert(0, reader.stackSize()*2, ' ');
                     std::cout << padding  << "region: " << std::hex << *it << std::endl;
 #endif
diff --git a/components/esm4/loadnavi.cpp b/components/esm4/loadnavi.cpp
index 4ed72c20f1..ae8d433f28 100644
--- a/components/esm4/loadnavi.cpp
+++ b/components/esm4/loadnavi.cpp
@@ -68,7 +68,7 @@ void ESM4::Navigation::IslandInfo::load(ESM4::Reader& reader)
             reader.get(*it);
 // FIXME: debugging only
 #if 0
-            std::string padding = "";
+            std::string padding;
             padding.insert(0, reader.stackSize()*2, ' ');
             std::cout << padding << "NVMI vert " << std::dec << (*it).x << ", " << (*it).y << ", " << (*it).z << std::endl;
 #endif
@@ -88,7 +88,7 @@ void ESM4::Navigation::NavMeshInfo::load(ESM4::Reader& reader)
 
 // FIXME: for debugging only
 #if 0
-    std::string padding = "";
+    std::string padding;
     if (flags == ESM4::FLG_Modified)
         padding.insert(0, 2, '-');
     else if (flags == ESM4::FLG_Unmodified)
@@ -157,7 +157,7 @@ void ESM4::Navigation::NavMeshInfo::load(ESM4::Reader& reader)
         reader.get(cellGrid.grid.x);
 // FIXME: debugging only
 #if 0
-    std::string padding = "";
+    std::string padding;
     padding.insert(0, reader.stackSize()*2, ' ');
     if (worldSpaceId == ESM4::FLG_Morrowind)
         std::cout << padding << "NVMI MW: X " << std::dec << cellGrid.grid.x << ", Y " << cellGrid.grid.y << std::endl;
diff --git a/components/esm4/loadnavm.cpp b/components/esm4/loadnavm.cpp
index 5fce00893c..5a90f67b01 100644
--- a/components/esm4/loadnavm.cpp
+++ b/components/esm4/loadnavm.cpp
@@ -69,7 +69,7 @@ void ESM4::NavMesh::NVNMstruct::load(ESM4::Reader& reader)
         reader.get(cellGrid.grid.x);
 // FIXME: debugging only
 #if 0
-        std::string padding = "";
+        std::string padding;
         padding.insert(0, reader.stackSize()*2, ' ');
         if (worldSpaceId == ESM4::FLG_Morrowind)
             std::cout << padding << "NVNM MW: X " << std::dec << cellGrid.grid.x << ", Y " << cellGrid.grid.y << std::endl;
@@ -82,7 +82,7 @@ void ESM4::NavMesh::NVNMstruct::load(ESM4::Reader& reader)
         reader.get(cellGrid.cellId);
 
 #if 0
-        std::string padding = ""; // FIXME
+        std::string padding; // FIXME
         padding.insert(0, reader.stackSize()*2, ' ');
         if (worldSpaceId == 0) // interior
             std::cout << padding << "NVNM Interior: cellId " << std::hex << cellGrid.cellId << std::endl;
@@ -194,7 +194,7 @@ void ESM4::NavMesh::load(ESM4::Reader& reader)
 
 // FIXME: debugging only
 #if 0
-    std::string padding = "";
+    std::string padding;
     padding.insert(0, reader.stackSize()*2, ' ');
     std::cout << padding << "NAVM flags 0x" << std::hex << reader.hdr().record.flags << std::endl;
     std::cout << padding << "NAVM id 0x" << std::hex << reader.hdr().record.id << std::endl;
diff --git a/components/esm4/loadregn.cpp b/components/esm4/loadregn.cpp
index 2455966036..b57ce81aa0 100644
--- a/components/esm4/loadregn.cpp
+++ b/components/esm4/loadregn.cpp
@@ -62,7 +62,7 @@ void ESM4::Region::load(ESM4::Reader& reader)
                 {
                     reader.get(*it);
 #if 0
-                    std::string padding = "";
+                    std::string padding;
                     padding.insert(0, reader.stackSize()*2, ' ');
                     std::cout << padding  << "RPLD: 0x" << std::hex << *it << std::endl;
 #endif
diff --git a/components/esm4/loadstat.cpp b/components/esm4/loadstat.cpp
index 10ce91980c..d57294cc40 100644
--- a/components/esm4/loadstat.cpp
+++ b/components/esm4/loadstat.cpp
@@ -58,7 +58,7 @@ void ESM4::Static::load(ESM4::Reader& reader)
                 {
                     reader.get(*it);
 #if 0
-                    std::string padding = "";
+                    std::string padding;
                     padding.insert(0, reader.stackSize()*2, ' ');
                     std::cout << padding  << "MODT: " << std::hex << *it << std::endl;
 #endif
diff --git a/components/esm4/loadtes4.cpp b/components/esm4/loadtes4.cpp
index 7123f60e38..7814b0f4ad 100644
--- a/components/esm4/loadtes4.cpp
+++ b/components/esm4/loadtes4.cpp
@@ -85,7 +85,7 @@ void ESM4::Header::load(ESM4::Reader& reader)
                     if (!reader.getExact(mOverride))
                         throw std::runtime_error("TES4 ONAM data read error");
 #if 0
-                    std::string padding = "";
+                    std::string padding;
                     padding.insert(0, reader.stackSize()*2, ' ');
                     std::cout << padding  << "ESM4::Header::ONAM overrides: " << formIdToString(mOverride) << std::endl;
 #endif
diff --git a/components/esm4/reader.cpp b/components/esm4/reader.cpp
index ce7ede2bf4..9ac8da8802 100644
--- a/components/esm4/reader.cpp
+++ b/components/esm4/reader.cpp
@@ -423,7 +423,7 @@ void Reader::skipSubRecordData(std::uint32_t size)
 void Reader::enterGroup()
 {
 #ifdef DEBUG_GROUPSTACK
-    std::string padding = ""; // FIXME: debugging only
+    std::string padding; // FIXME: debugging only
     padding.insert(0, mCtx.groupStack.size()*2, ' ');
     std::cout << padding << "Starting record group "
               << printLabel(mCtx.recordHeader.group.label, mCtx.recordHeader.group.type) << std::endl;
@@ -473,7 +473,7 @@ void Reader::exitGroupCheck()
 
         mCtx.groupStack.pop_back();
 #ifdef DEBUG_GROUPSTACK
-        std::string padding = ""; // FIXME: debugging only
+        std::string padding; // FIXME: debugging only
         padding.insert(0, mCtx.groupStack.size()*2, ' ');
         std::cout << padding << "Finished record group " << printLabel(grp.label, grp.type) << std::endl;
 #endif
@@ -521,7 +521,7 @@ void Reader::skipGroupData()
 void Reader::skipGroup()
 {
 #ifdef DEBUG_GROUPSTACK
-    std::string padding = ""; // FIXME: debugging only
+    std::string padding; // FIXME: debugging only
     padding.insert(0, mCtx.groupStack.size()*2, ' ');
     std::cout << padding << "Skipping record group "
               << printLabel(mCtx.recordHeader.group.label, mCtx.recordHeader.group.type) << std::endl;
diff --git a/components/resource/stats.cpp b/components/resource/stats.cpp
index d97ddd1d6f..d8578a67cc 100644
--- a/components/resource/stats.cpp
+++ b/components/resource/stats.cpp
@@ -106,7 +106,7 @@ Profiler::Profiler(bool offlineCollect):
     if (osgDB::Registry::instance()->getReaderWriterForExtension("ttf"))
         _font = osgMyGUI::DataManager::getInstance().getDataPath("DejaVuLGCSansMono.ttf");
     else
-        _font = "";
+        _font.clear();
 
     _characterSize = 18;
 
diff --git a/components/settings/settings.cpp b/components/settings/settings.cpp
index ecd25dbd4e..e9ad6a1bf5 100644
--- a/components/settings/settings.cpp
+++ b/components/settings/settings.cpp
@@ -28,8 +28,8 @@ std::string Manager::load(const Files::ConfigurationManager& cfgMgr, bool loadEd
         throw std::runtime_error("No config dirs! ConfigurationManager::readConfiguration must be called first.");
 
     // Create file name strings for either the engine or the editor.
-    std::string defaultSettingsFile = "";
-    std::string userSettingsFile = "";
+    std::string defaultSettingsFile;
+    std::string userSettingsFile;
 
     if (!loadEditorSettings)
     {
diff --git a/components/shader/shadermanager.cpp b/components/shader/shadermanager.cpp
index 1341baad60..b15825126a 100644
--- a/components/shader/shadermanager.cpp
+++ b/components/shader/shadermanager.cpp
@@ -193,7 +193,7 @@ namespace Shader
         }
         lineNumber += std::count(source.begin() + lineDirectivePosition, source.begin() + overallEnd, '\n');
 
-        std::string replacement = "";
+        std::string replacement;
         for (std::vector<std::string>::const_iterator element = listElements.cbegin(); element != listElements.cend(); element++)
         {
             std::string contentInstance = content;
@@ -247,7 +247,7 @@ namespace Shader
                 condition = !condition;
             
             if (!condition)
-                linkTarget = "";
+                linkTarget.clear();
         }
 
         source.replace(foundPos, lineEnd - foundPos, "");

From 2bbd0ba97602be1421265a392a51f3c226e47e06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Thu, 5 May 2022 00:57:15 +0300
Subject: [PATCH 2382/2859] #5336: Refactor World::updatePlayer in to
 Player::update

---
 apps/openmw/mwworld/player.cpp   | 56 ++++++++++++++++++++++++++++++++
 apps/openmw/mwworld/player.hpp   |  2 ++
 apps/openmw/mwworld/worldimp.cpp | 50 +---------------------------
 apps/openmw/mwworld/worldimp.hpp |  1 -
 4 files changed, 59 insertions(+), 50 deletions(-)

diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp
index 45e87a7942..64acf1c10f 100644
--- a/apps/openmw/mwworld/player.cpp
+++ b/apps/openmw/mwworld/player.cpp
@@ -9,6 +9,7 @@
 #include <components/esm3/player.hpp>
 #include <components/esm/defs.hpp>
 #include <components/esm3/loadbsgn.hpp>
+#include <components/fallback/fallback.hpp>
 
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/inventorystore.hpp"
@@ -23,6 +24,9 @@
 #include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/spellutil.hpp"
 
+#include "../mwrender/renderingmanager.hpp"
+#include "../mwrender/camera.hpp"
+
 #include "cellstore.hpp"
 #include "class.hpp"
 #include "ptr.hpp"
@@ -514,4 +518,56 @@ namespace MWWorld
         MWBase::Environment::get().getWindowManager()->setSelectedSpell(spellId, castChance);
         MWBase::Environment::get().getWindowManager()->updateSpellWindow();
     }
+
+    void Player::update()
+    {
+        auto player = getPlayer();
+        auto* world = MWBase::Environment::get().getWorld();
+        auto* rendering = world->getRenderingManager();
+        auto& store = world->getStore();
+        auto& playerClass = player.getClass();
+        auto* windowMgr = MWBase::Environment::get().getWindowManager();
+
+        if (player.getCell()->isExterior())
+        {
+            ESM::Position pos = player.getRefData().getPosition();
+            setLastKnownExteriorPosition(pos.asVec3());
+        }
+
+        bool isWerewolf = playerClass.getNpcStats(player).isWerewolf();
+        bool isFirstPerson = world->isFirstPerson();
+        if (isWerewolf && isFirstPerson)
+        {
+            float werewolfFov = Fallback::Map::getFloat("General_Werewolf_FOV");
+            if (werewolfFov != 0)
+                rendering->overrideFieldOfView(werewolfFov);
+            windowMgr->setWerewolfOverlay(true);
+        }
+        else
+        {
+            rendering->resetFieldOfView();
+            windowMgr->setWerewolfOverlay(false);
+        }
+
+        // Sink the camera while sneaking
+        bool sneaking = playerClass.getCreatureStats(player).getStance(MWMechanics::CreatureStats::Stance_Sneak);
+        bool swimming = world->isSwimming(player);
+        bool flying = world->isFlying(player);
+
+        static const float i1stPersonSneakDelta = store.get<ESM::GameSetting>().find("i1stPersonSneakDelta")->mValue.getFloat();
+        if (sneaking && !swimming && !flying)
+            rendering->getCamera()->setSneakOffset(i1stPersonSneakDelta);
+        else
+            rendering->getCamera()->setSneakOffset(0.f);
+
+        int blind = 0;
+        const auto& magicEffects = playerClass.getCreatureStats(player).getMagicEffects();
+        if (!world->getGodModeState())
+            blind = static_cast<int>(magicEffects.get(ESM::MagicEffect::Blind).getMagnitude());
+        windowMgr->setBlindness(std::clamp(blind, 0, 100));
+
+        int nightEye = static_cast<int>(magicEffects.get(ESM::MagicEffect::NightEye).getMagnitude());
+        rendering->setNightEyeFactor(std::min(1.f, (nightEye / 100.f)));
+    }
+
 }
diff --git a/apps/openmw/mwworld/player.hpp b/apps/openmw/mwworld/player.hpp
index 4add58541e..3a3c58cb5d 100644
--- a/apps/openmw/mwworld/player.hpp
+++ b/apps/openmw/mwworld/player.hpp
@@ -135,6 +135,8 @@ namespace MWWorld
         void erasePreviousItem(const std::string& boundItemId);
 
         void setSelectedSpell(const std::string& spellId);
+
+        void update();
     };
 }
 #endif
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index f925ebec82..ff343e0828 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1845,7 +1845,7 @@ namespace MWWorld
             updateNavigator();
         }
 
-        updatePlayer();
+        mPlayer->update();
 
         mPhysics->debugDraw();
 
@@ -1876,54 +1876,6 @@ namespace MWWorld
         }
     }
 
-    void World::updatePlayer()
-    {
-        MWWorld::Ptr player = getPlayerPtr();
-
-        // TODO: move to MWWorld::Player
-
-        if (player.getCell()->isExterior())
-        {
-            ESM::Position pos = player.getRefData().getPosition();
-            mPlayer->setLastKnownExteriorPosition(pos.asVec3());
-        }
-
-        bool isWerewolf = player.getClass().getNpcStats(player).isWerewolf();
-        bool isFirstPerson = this->isFirstPerson();
-        if (isWerewolf && isFirstPerson)
-        {
-            float werewolfFov = Fallback::Map::getFloat("General_Werewolf_FOV");
-            if (werewolfFov != 0)
-                mRendering->overrideFieldOfView(werewolfFov);
-            MWBase::Environment::get().getWindowManager()->setWerewolfOverlay(true);
-        }
-        else
-        {
-            mRendering->resetFieldOfView();
-            MWBase::Environment::get().getWindowManager()->setWerewolfOverlay(false);
-        }
-
-        // Sink the camera while sneaking
-        bool sneaking = player.getClass().getCreatureStats(getPlayerPtr()).getStance(MWMechanics::CreatureStats::Stance_Sneak);
-        bool swimming = isSwimming(player);
-        bool flying = isFlying(player);
-
-        static const float i1stPersonSneakDelta = mStore.get<ESM::GameSetting>().find("i1stPersonSneakDelta")->mValue.getFloat();
-        if (sneaking && !swimming && !flying)
-            mRendering->getCamera()->setSneakOffset(i1stPersonSneakDelta);
-        else
-            mRendering->getCamera()->setSneakOffset(0.f);
-
-        int blind = 0;
-        const auto& magicEffects = player.getClass().getCreatureStats(player).getMagicEffects();
-        if (!mGodMode)
-            blind = static_cast<int>(magicEffects.get(ESM::MagicEffect::Blind).getMagnitude());
-        MWBase::Environment::get().getWindowManager()->setBlindness(std::clamp(blind, 0, 100));
-
-        int nightEye = static_cast<int>(magicEffects.get(ESM::MagicEffect::NightEye).getMagnitude());
-        mRendering->setNightEyeFactor(std::min(1.f, (nightEye/100.f)));
-    }
-
     void World::preloadSpells()
     {
         std::string selectedSpell = MWBase::Environment::get().getWindowManager()->getSelectedSpell();
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 2dc1f3c81a..fb1b80daf3 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -141,7 +141,6 @@ namespace MWWorld
             Ptr copyObjectToCell(const ConstPtr &ptr, CellStore* cell, ESM::Position pos, int count, bool adjustPos);
 
             void updateSoundListener();
-            void updatePlayer();
 
             void preloadSpells();
 

From bc5e43ab600036afe820f9fad30acd5807120f89 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 5 May 2022 21:53:20 +0200
Subject: [PATCH 2383/2859] Fix copy paste error

---
 apps/openmw/mwscript/transformationextensions.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index c4e78dbc96..d87888c282 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -262,15 +262,15 @@ namespace MWScript
                     {
                         if (axis[0] == 'x')
                         {
-                            ret = osg::RadiansToDegrees(ptr.getRefData().getPosition().pos[0]);
+                            ret = ptr.getRefData().getPosition().pos[0];
                         }
                         else if (axis[0] == 'y')
                         {
-                            ret = osg::RadiansToDegrees(ptr.getRefData().getPosition().pos[1]);
+                            ret = ptr.getRefData().getPosition().pos[1];
                         }
                         else if (axis[0] == 'z')
                         {
-                            ret = osg::RadiansToDegrees(ptr.getRefData().getPosition().pos[2]);
+                            ret = ptr.getRefData().getPosition().pos[2];
                         }
                     }
                     runtime.push(ret);
@@ -348,15 +348,15 @@ namespace MWScript
                     {
                         if (axis[0] == 'x')
                         {
-                            ret = osg::RadiansToDegrees(ptr.getCellRef().getPosition().pos[0]);
+                            ret = ptr.getCellRef().getPosition().pos[0];
                         }
                         else if (axis[0] == 'y')
                         {
-                            ret = osg::RadiansToDegrees(ptr.getCellRef().getPosition().pos[1]);
+                            ret = ptr.getCellRef().getPosition().pos[1];
                         }
                         else if (axis[0] == 'z')
                         {
-                            ret = osg::RadiansToDegrees(ptr.getCellRef().getPosition().pos[2]);
+                            ret = ptr.getCellRef().getPosition().pos[2];
                         }
                     }
                     runtime.push(ret);

From 06225c69684446d20b3f42603517f9fee6cd3f0b Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 6 May 2022 19:41:29 +0000
Subject: [PATCH 2384/2859] Fix collecting cobertura reports

---
 .gitlab-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 89b6b81179..df4a9cc719 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -201,7 +201,9 @@ Ubuntu_GCC_tests_coverage:
     name: ${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHA}
     when: always
     reports:
-      cobertura: coverage.xml
+      coverage_report:
+        coverage_format: cobertura
+        path: coverage.xml
       junit: build/tests.xml
 
 Ubuntu_Static_Deps:

From 86d6ab593e2f2f85802cd5e08d5f07189672abb6 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Fri, 6 May 2022 19:57:41 +0000
Subject: [PATCH 2385/2859] Fix #6731

---
 components/l10n/messagebundles.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/l10n/messagebundles.cpp b/components/l10n/messagebundles.cpp
index d02735313e..fab59a7cb8 100644
--- a/components/l10n/messagebundles.cpp
+++ b/components/l10n/messagebundles.cpp
@@ -151,7 +151,8 @@ namespace l10n
              defaultLocale = mPreferredLocales[0];
         }
         UParseError parseError;
-        icu::MessageFormat defaultMessage(icu::UnicodeString::fromUTF8(key), defaultLocale, parseError, success);
+        icu::MessageFormat defaultMessage(icu::UnicodeString::fromUTF8(icu::StringPiece(key.data(), key.size())),
+                                          defaultLocale, parseError, success);
         if (!checkSuccess(success, std::string("Failed to create message ") + key.data(), parseError))
             // If we can't parse the key as a pattern, just return the key
             return std::string(key);

From 70c7f1880d3dd59223aaf6daa41ee00b067eb5b5 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Fri, 6 May 2022 23:11:47 +0200
Subject: [PATCH 2386/2859] [Lua] pairs and ipairs for ObjectList (resolves
 #6732)

---
 apps/openmw/mwlua/objectbindings.cpp | 26 ++------------------------
 components/lua/luastate.cpp          |  9 +++++++++
 2 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/apps/openmw/mwlua/objectbindings.cpp b/apps/openmw/mwlua/objectbindings.cpp
index 0bf3fc99c5..3cab81c38d 100644
--- a/apps/openmw/mwlua/objectbindings.cpp
+++ b/apps/openmw/mwlua/objectbindings.cpp
@@ -131,30 +131,8 @@ namespace MWLua
                 else
                     throw std::runtime_error("Index out of range");
             };
-            if constexpr (std::is_same_v<ObjectT, GObject>)
-            {
-                // GObject and LObject iterators are in separate branches because if they share source code
-                // there is a collision in sol and only one iterator can be mapped to Lua.
-                auto iter = sol::make_object(lua, [registry](const GObjectList& l, int64_t i) -> sol::optional<std::tuple<int64_t, GObject>>
-                {
-                    if (i >= 0 && i < static_cast<int64_t>(l.mIds->size()))
-                        return std::make_tuple(i + 1, GObject((*l.mIds)[i], registry));
-                    else
-                        return sol::nullopt;
-                });
-                listT[sol::meta_function::ipairs] = [iter](const GObjectList& list) { return std::make_tuple(iter, list, 0); };
-            }
-            else
-            {
-                auto iter = sol::make_object(lua, [registry](const LObjectList& l, int64_t i) -> sol::optional<std::tuple<int64_t, LObject>>
-                {
-                    if (i >= 0 && i < static_cast<int64_t>(l.mIds->size()))
-                        return std::make_tuple(i + 1, LObject((*l.mIds)[i], registry));
-                    else
-                        return sol::nullopt;
-                });
-                listT[sol::meta_function::ipairs] = [iter](const LObjectList& list) { return std::make_tuple(iter, list, 0); };
-            }
+            listT[sol::meta_function::pairs] = lua["ipairsForArray"].template get<sol::function>();
+            listT[sol::meta_function::ipairs] = lua["ipairsForArray"].template get<sol::function>();
         }
 
         template <class ObjectT>
diff --git a/components/lua/luastate.cpp b/components/lua/luastate.cpp
index 38f3ae889e..ac32f12992 100644
--- a/components/lua/luastate.cpp
+++ b/components/lua/luastate.cpp
@@ -92,6 +92,15 @@ namespace LuaUtil
                 local nextFn, t, firstKey = ipairs(getmetatable(v).__index)
                 return function(_, k) return nextFn(t, k) end, v, firstKey
             end
+            local function nextForArray(array, index)
+                index = (index or 0) + 1
+                if index < #array then
+                    return index, array[index]
+                end
+            end
+            function ipairsForArray(array)
+                return nextForArray, array, 0
+            end
 
             getmetatable('').__metatable = false
             getSafeMetatable = function(v)

From 79676aee15bdab383d42ae8d86598312c398bb44 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 6 May 2022 17:46:50 +0200
Subject: [PATCH 2387/2859] Make Environment a storage of referencing pointers
 instead of owned

Engine controls lifetime of managers therefore it should own them. Environment
is only access provider.

This allows to avoid redundant virtual calls and also some functions from
managers base classes can be removed if they are used only by Engine.
---
 apps/openmw/engine.cpp                    | 140 ++++++++++--------
 apps/openmw/engine.hpp                    |  57 +++++++-
 apps/openmw/mwbase/environment.cpp        | 168 ++--------------------
 apps/openmw/mwbase/environment.hpp        | 101 ++++++-------
 apps/openmw/mwinput/actionmanager.cpp     |   4 +-
 apps/openmw/mwlua/uibindings.cpp          |   2 +-
 apps/openmw/mwmechanics/actors.cpp        |  10 +-
 apps/openmw/mwmechanics/character.cpp     |   6 +-
 apps/openmw/mwphysics/physicssystem.cpp   |   2 +-
 apps/openmw/mwrender/landmanager.cpp      |   2 +-
 apps/openmw/mwrender/renderingmanager.cpp |   2 +-
 apps/openmw/mwworld/player.cpp            |   6 +-
 components/misc/notnullptr.hpp            |  33 +++++
 13 files changed, 246 insertions(+), 287 deletions(-)
 create mode 100644 components/misc/notnullptr.hpp

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 650f6511f9..a99bd72831 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -271,7 +271,7 @@ namespace
 
 void OMW::Engine::executeLocalScripts()
 {
-    MWWorld::LocalScripts& localScripts = mEnvironment.getWorld()->getLocalScripts();
+    MWWorld::LocalScripts& localScripts = mWorld->getLocalScripts();
 
     localScripts.startIteration();
     std::pair<std::string, MWWorld::Ptr> script;
@@ -279,7 +279,7 @@ void OMW::Engine::executeLocalScripts()
     {
         MWScript::InterpreterContext interpreterContext (
             &script.second.getRefData().getLocals(), script.second);
-        mEnvironment.getScriptManager()->run (script.first, interpreterContext);
+        mScriptManager->run (script.first, interpreterContext);
     }
 }
 
@@ -297,7 +297,7 @@ bool OMW::Engine::frame(float frametime)
         // update input
         {
             ScopedProfile<UserStatsType::Input> profile(frameStart, frameNumber, *timer, *stats);
-            mEnvironment.getInputManager()->update(frametime, false);
+            mInputManager->update(frametime, false);
         }
 
         // When the window is minimized, pause the game. Currently this *has* to be here to work around a MyGUI bug.
@@ -306,21 +306,21 @@ bool OMW::Engine::frame(float frametime)
         {
             ScopedProfile<UserStatsType::Sound> profile(frameStart, frameNumber, *timer, *stats);
 
-            if (!mEnvironment.getWindowManager()->isWindowVisible())
+            if (!mWindowManager->isWindowVisible())
             {
-                mEnvironment.getSoundManager()->pausePlayback();
+                mSoundManager->pausePlayback();
                 return false;
             }
             else
-                mEnvironment.getSoundManager()->resumePlayback();
+                mSoundManager->resumePlayback();
 
             // sound
             if (mUseSound)
-                mEnvironment.getSoundManager()->update(frametime);
+                mSoundManager->update(frametime);
         }
 
         // Main menu opened? Then scripts are also paused.
-        bool paused = mEnvironment.getWindowManager()->containsMode(MWGui::GM_MainMenu);
+        bool paused = mWindowManager->containsMode(MWGui::GM_MainMenu);
 
         // Should be called after input manager update and before any change to the game world.
         // It applies to the game world queued changes from the previous frame.
@@ -329,35 +329,35 @@ bool OMW::Engine::frame(float frametime)
         // update game state
         {
             ScopedProfile<UserStatsType::State> profile(frameStart, frameNumber, *timer, *stats);
-            mEnvironment.getStateManager()->update (frametime);
+            mStateManager->update (frametime);
         }
 
-        bool guiActive = mEnvironment.getWindowManager()->isGuiMode();
+        bool guiActive = mWindowManager->isGuiMode();
 
         {
             ScopedProfile<UserStatsType::Script> profile(frameStart, frameNumber, *timer, *stats);
 
-            if (mEnvironment.getStateManager()->getState() != MWBase::StateManager::State_NoGame)
+            if (mStateManager->getState() != MWBase::StateManager::State_NoGame)
             {
                 if (!paused)
                 {
-                    if (mEnvironment.getWorld()->getScriptsEnabled())
+                    if (mWorld->getScriptsEnabled())
                     {
                         // local scripts
                         executeLocalScripts();
 
                         // global scripts
-                        mEnvironment.getScriptManager()->getGlobalScripts().run();
+                        mScriptManager->getGlobalScripts().run();
                     }
 
-                    mEnvironment.getWorld()->markCellAsUnchanged();
+                    mWorld->markCellAsUnchanged();
                 }
 
                 if (!guiActive)
                 {
-                    double hours = (frametime * mEnvironment.getWorld()->getTimeScaleFactor()) / 3600.0;
-                    mEnvironment.getWorld()->advanceTime(hours, true);
-                    mEnvironment.getWorld()->rechargeItems(frametime, true);
+                    double hours = (frametime * mWorld->getTimeScaleFactor()) / 3600.0;
+                    mWorld->advanceTime(hours, true);
+                    mWorld->rechargeItems(frametime, true);
                 }
             }
         }
@@ -366,16 +366,16 @@ bool OMW::Engine::frame(float frametime)
         {
             ScopedProfile<UserStatsType::Mechanics> profile(frameStart, frameNumber, *timer, *stats);
 
-            if (mEnvironment.getStateManager()->getState() != MWBase::StateManager::State_NoGame)
+            if (mStateManager->getState() != MWBase::StateManager::State_NoGame)
             {
-                mEnvironment.getMechanicsManager()->update(frametime, guiActive);
+                mMechanicsManager->update(frametime, guiActive);
             }
 
-            if (mEnvironment.getStateManager()->getState() == MWBase::StateManager::State_Running)
+            if (mStateManager->getState() == MWBase::StateManager::State_Running)
             {
-                MWWorld::Ptr player = mEnvironment.getWorld()->getPlayerPtr();
+                MWWorld::Ptr player = mWorld->getPlayerPtr();
                 if(!guiActive && player.getClass().getCreatureStats(player).isDead())
-                    mEnvironment.getStateManager()->endGame();
+                    mStateManager->endGame();
             }
         }
 
@@ -383,9 +383,9 @@ bool OMW::Engine::frame(float frametime)
         {
             ScopedProfile<UserStatsType::Physics> profile(frameStart, frameNumber, *timer, *stats);
 
-            if (mEnvironment.getStateManager()->getState() != MWBase::StateManager::State_NoGame)
+            if (mStateManager->getState() != MWBase::StateManager::State_NoGame)
             {
-                mEnvironment.getWorld()->updatePhysics(frametime, guiActive, frameStart, frameNumber, *stats);
+                mWorld->updatePhysics(frametime, guiActive, frameStart, frameNumber, *stats);
             }
         }
 
@@ -393,16 +393,16 @@ bool OMW::Engine::frame(float frametime)
         {
             ScopedProfile<UserStatsType::World> profile(frameStart, frameNumber, *timer, *stats);
 
-            if (mEnvironment.getStateManager()->getState() != MWBase::StateManager::State_NoGame)
+            if (mStateManager->getState() != MWBase::StateManager::State_NoGame)
             {
-                mEnvironment.getWorld()->update(frametime, guiActive);
+                mWorld->update(frametime, guiActive);
             }
         }
 
         // update GUI
         {
             ScopedProfile<UserStatsType::Gui> profile(frameStart, frameNumber, *timer, *stats);
-            mEnvironment.getWindowManager()->update(frametime);
+            mWindowManager->update(frametime);
         }
 
         if (stats->collectStats("resource"))
@@ -443,7 +443,6 @@ OMW::Engine::Engine(Files::ConfigurationManager& configurationManager)
   , mExportFonts(false)
   , mRandomSeed(0)
   , mScriptContext (nullptr)
-  , mLuaManager (nullptr)
   , mFSStrict (false)
   , mScriptBlacklistUse (true)
   , mNewGame (false)
@@ -471,6 +470,17 @@ OMW::Engine::~Engine()
 
     mEnvironment.cleanup();
 
+    mMechanicsManager = nullptr;
+    mDialogueManager = nullptr;
+    mJournal = nullptr;
+    mScriptManager = nullptr;
+    mWindowManager = nullptr;
+    mWorld = nullptr;
+    mSoundManager = nullptr;
+    mInputManager = nullptr;
+    mStateManager = nullptr;
+    mLuaManager = nullptr;
+
     delete mScriptContext;
     mScriptContext = nullptr;
 
@@ -701,8 +711,8 @@ void OMW::Engine::setWindowIcon()
 
 void OMW::Engine::prepareEngine (Settings::Manager & settings)
 {
-    mEnvironment.setStateManager (
-        std::make_unique<MWState::StateManager> (mCfgMgr.getUserDataPath() / "saves", mContentFiles));
+    mStateManager = std::make_unique<MWState::StateManager>(mCfgMgr.getUserDataPath() / "saves", mContentFiles);
+    mEnvironment.setStateManager(*mStateManager);
 
     mStereoManager = std::make_unique<Stereo::Manager>(mViewer);
 
@@ -723,6 +733,7 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
         Settings::Manager::getString("texture mipmap", "General"),
         Settings::Manager::getInt("anisotropy", "General")
     );
+    mEnvironment.setResourceSystem(*mResourceSystem);
 
     int numThreads = Settings::Manager::getInt("preload num threads", "Cells");
     if (numThreads <= 0)
@@ -744,9 +755,8 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
 
     mViewer->addEventHandler(mScreenCaptureHandler);
 
-    auto luaMgr = std::make_unique<MWLua::LuaManager>(mVFS.get(), (mResDir / "lua_libs").string());
-    mLuaManager = luaMgr.get();
-    mEnvironment.setLuaManager(std::move(luaMgr));
+    mLuaManager = std::make_unique<MWLua::LuaManager>(mVFS.get(), (mResDir / "lua_libs").string());
+    mEnvironment.setLuaManager(*mLuaManager);
 
     // Create input and UI first to set up a bootstrapping environment for
     // showing a loading screen and keeping the window responsive while doing so
@@ -799,34 +809,36 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     mStereoManager->disableStereoForNode(guiRoot);
     rootNode->addChild(guiRoot);
 
-    auto windowMgr = std::make_unique<MWGui::WindowManager>(mWindow, mViewer, guiRoot, mResourceSystem.get(), mWorkQueue.get(),
+    mWindowManager = std::make_unique<MWGui::WindowManager>(mWindow, mViewer, guiRoot, mResourceSystem.get(), mWorkQueue.get(),
                 mCfgMgr.getLogPath().string() + std::string("/"), myguiResources,
                 mScriptConsoleMode, mTranslationDataStorage, mEncoding, mExportFonts,
                 Version::getOpenmwVersionDescription(mResDir.string()), mCfgMgr.getUserConfigPath().string(), shadersSupported);
-    auto* windowMgrInternal = windowMgr.get();
-    mEnvironment.setWindowManager (std::move(windowMgr));
+    mEnvironment.setWindowManager(*mWindowManager);
 
-    auto inputMgr = std::make_unique<MWInput::InputManager>(mWindow, mViewer, mScreenCaptureHandler, mScreenCaptureOperation, keybinderUser, keybinderUserExists, userGameControllerdb, gameControllerdb, mGrab);
-    mEnvironment.setInputManager(std::move(inputMgr));
+    mInputManager = std::make_unique<MWInput::InputManager>(mWindow, mViewer, mScreenCaptureHandler,
+        mScreenCaptureOperation, keybinderUser, keybinderUserExists, userGameControllerdb, gameControllerdb, mGrab);
+    mEnvironment.setInputManager(*mInputManager);
 
     // Create sound system
-    mEnvironment.setSoundManager (std::make_unique<MWSound::SoundManager>(mVFS.get(), mUseSound));
+    mSoundManager = std::make_unique<MWSound::SoundManager>(mVFS.get(), mUseSound);
+    mEnvironment.setSoundManager(*mSoundManager);
 
     if (!mSkipMenu)
     {
         const std::string& logo = Fallback::Map::getString("Movies_Company_Logo");
         if (!logo.empty())
-            mEnvironment.getWindowManager()->playVideo(logo, true);
+            mWindowManager->playVideo(logo, true);
     }
 
     // Create the world
-    mEnvironment.setWorld(std::make_unique<MWWorld::World>(mViewer, rootNode, mResourceSystem.get(), mWorkQueue.get(),
+    mWorld = std::make_unique<MWWorld::World>(mViewer, rootNode, mResourceSystem.get(), mWorkQueue.get(),
         mFileCollections, mContentFiles, mGroundcoverFiles, mEncoder, mActivationDistanceOverride, mCellName,
-        mStartupScript, mResDir.string(), mCfgMgr.getUserDataPath().string()));
-    mEnvironment.getWorld()->setupPlayer();
+        mStartupScript, mResDir.string(), mCfgMgr.getUserDataPath().string());
+    mWorld->setupPlayer();
+    mEnvironment.setWorld(*mWorld);
 
-    windowMgrInternal->setStore(mEnvironment.getWorld()->getStore());
-    windowMgrInternal->initUI();
+    mWindowManager->setStore(mWorld->getStore());
+    mWindowManager->initUI();
 
     //Load translation data
     mTranslationDataStorage.setEncoder(mEncoder);
@@ -839,21 +851,25 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     mScriptContext = new MWScript::CompilerContext (MWScript::CompilerContext::Type_Full);
     mScriptContext->setExtensions (&mExtensions);
 
-    mEnvironment.setScriptManager (std::make_unique<MWScript::ScriptManager>(mEnvironment.getWorld()->getStore(), *mScriptContext, mWarningsMode,
-        mScriptBlacklistUse ? mScriptBlacklist : std::vector<std::string>()));
+    mScriptManager = std::make_unique<MWScript::ScriptManager>(mWorld->getStore(), *mScriptContext, mWarningsMode,
+        mScriptBlacklistUse ? mScriptBlacklist : std::vector<std::string>());
+    mEnvironment.setScriptManager(*mScriptManager);
 
     // Create game mechanics system
-    mEnvironment.setMechanicsManager (std::make_unique<MWMechanics::MechanicsManager>());
+    mMechanicsManager = std::make_unique<MWMechanics::MechanicsManager>();
+    mEnvironment.setMechanicsManager(*mMechanicsManager);
 
     // Create dialog system
-    mEnvironment.setJournal (std::make_unique<MWDialogue::Journal>());
-    mEnvironment.setDialogueManager (std::make_unique<MWDialogue::DialogueManager>(mExtensions, mTranslationDataStorage));
-    mEnvironment.setResourceSystem(mResourceSystem.get());
+    mJournal = std::make_unique<MWDialogue::Journal>();
+    mEnvironment.setJournal(*mJournal);
+
+    mDialogueManager = std::make_unique<MWDialogue::DialogueManager>(mExtensions, mTranslationDataStorage);
+    mEnvironment.setDialogueManager(*mDialogueManager);
 
     // scripts
     if (mCompileAll)
     {
-        std::pair<int, int> result = mEnvironment.getScriptManager()->compileAll();
+        std::pair<int, int> result = mScriptManager->compileAll();
         if (result.first)
             Log(Debug::Info)
                 << "compiled " << result.second << " of " << result.first << " scripts ("
@@ -1014,25 +1030,25 @@ void OMW::Engine::go()
     // Start the game
     if (!mSaveGameFile.empty())
     {
-        mEnvironment.getStateManager()->loadGame(mSaveGameFile);
+        mStateManager->loadGame(mSaveGameFile);
     }
     else if (!mSkipMenu)
     {
         // start in main menu
-        mEnvironment.getWindowManager()->pushGuiMode (MWGui::GM_MainMenu);
-        mEnvironment.getSoundManager()->playTitleMusic();
+        mWindowManager->pushGuiMode (MWGui::GM_MainMenu);
+        mSoundManager->playTitleMusic();
         const std::string& logo = Fallback::Map::getString("Movies_Morrowind_Logo");
         if (!logo.empty())
-            mEnvironment.getWindowManager()->playVideo(logo, true);
+            mWindowManager->playVideo(logo, true);
     }
     else
     {
-        mEnvironment.getStateManager()->newGame (!mNewGame);
+        mStateManager->newGame (!mNewGame);
     }
 
-    if (!mStartupScript.empty() && mEnvironment.getStateManager()->getState() == MWState::StateManager::State_Running)
+    if (!mStartupScript.empty() && mStateManager->getState() == MWState::StateManager::State_Running)
     {
-        mEnvironment.getWindowManager()->executeInConsole(mStartupScript);
+        mWindowManager->executeInConsole(mStartupScript);
     }
 
     LuaWorker luaWorker(this);  // starts a separate lua thread if "lua num threads" > 0
@@ -1041,7 +1057,7 @@ void OMW::Engine::go()
     double simulationTime = 0.0;
     Misc::FrameRateLimiter frameRateLimiter = Misc::makeFrameRateLimiter(mEnvironment.getFrameRateLimit());
     const std::chrono::steady_clock::duration maxSimulationInterval(std::chrono::milliseconds(200));
-    while (!mViewer->done() && !mEnvironment.getStateManager()->hasQuitRequest())
+    while (!mViewer->done() && !mStateManager->hasQuitRequest())
     {
         const double dt = std::chrono::duration_cast<std::chrono::duration<double>>(std::min(
             frameRateLimiter.getLastFrameDuration(),
@@ -1060,7 +1076,7 @@ void OMW::Engine::go()
             mViewer->eventTraversal();
             mViewer->updateTraversal();
 
-            mEnvironment.getWorld()->updateWindowManager();
+            mWorld->updateWindowManager();
 
             luaWorker.allowUpdate();  // if there is a separate Lua thread, it starts the update now
 
@@ -1068,7 +1084,7 @@ void OMW::Engine::go()
 
             luaWorker.finishUpdate();
 
-            bool guiActive = mEnvironment.getWindowManager()->isGuiMode();
+            bool guiActive = mWindowManager->isGuiMode();
             if (!guiActive)
                 simulationTime += dt;
         }
diff --git a/apps/openmw/engine.hpp b/apps/openmw/engine.hpp
index d30bd33e80..c281f032ea 100644
--- a/apps/openmw/engine.hpp
+++ b/apps/openmw/engine.hpp
@@ -64,6 +64,51 @@ namespace SceneUtil
     }
 }
 
+namespace MWState
+{
+    class StateManager;
+}
+
+namespace MWGui
+{
+    class WindowManager;
+}
+
+namespace MWInput
+{
+    class InputManager;
+}
+
+namespace MWSound
+{
+    class SoundManager;
+}
+
+namespace MWWorld
+{
+    class World;
+}
+
+namespace MWScript
+{
+    class ScriptManager;
+}
+
+namespace MWMechanics
+{
+    class MechanicsManager;
+}
+
+namespace MWDialogue
+{
+    class DialogueManager;
+}
+
+namespace MWDialogue
+{
+    class Journal;
+}
+
 struct SDL_Window;
 
 namespace OMW
@@ -75,6 +120,16 @@ namespace OMW
             std::unique_ptr<VFS::Manager> mVFS;
             std::unique_ptr<Resource::ResourceSystem> mResourceSystem;
             osg::ref_ptr<SceneUtil::WorkQueue> mWorkQueue;
+            std::unique_ptr<MWWorld::World> mWorld;
+            std::unique_ptr<MWSound::SoundManager> mSoundManager;
+            std::unique_ptr<MWScript::ScriptManager> mScriptManager;
+            std::unique_ptr<MWGui::WindowManager> mWindowManager;
+            std::unique_ptr<MWMechanics::MechanicsManager> mMechanicsManager;
+            std::unique_ptr<MWDialogue::DialogueManager> mDialogueManager;
+            std::unique_ptr<MWDialogue::Journal> mJournal;
+            std::unique_ptr<MWInput::InputManager> mInputManager;
+            std::unique_ptr<MWState::StateManager> mStateManager;
+            std::unique_ptr<MWLua::LuaManager> mLuaManager;
             MWBase::Environment mEnvironment;
             ToUTF8::FromType mEncoding;
             ToUTF8::Utf8Encoder* mEncoder;
@@ -111,8 +166,6 @@ namespace OMW
             Compiler::Extensions mExtensions;
             Compiler::Context *mScriptContext;
 
-            MWLua::LuaManager* mLuaManager;
-
             Files::Collections mFileCollections;
             bool mFSStrict;
             Translation::Storage mTranslationDataStorage;
diff --git a/apps/openmw/mwbase/environment.cpp b/apps/openmw/mwbase/environment.cpp
index 1b212c73ab..70027989a6 100644
--- a/apps/openmw/mwbase/environment.cpp
+++ b/apps/openmw/mwbase/environment.cpp
@@ -19,7 +19,7 @@ MWBase::Environment *MWBase::Environment::sThis = nullptr;
 
 MWBase::Environment::Environment()
 {
-    assert(!sThis);
+    assert(sThis == nullptr);
     sThis = this;
 }
 
@@ -28,167 +28,21 @@ MWBase::Environment::~Environment()
     sThis = nullptr;
 }
 
-void MWBase::Environment::setWorld (std::unique_ptr<World>&& world)
-{
-    mWorld = std::move(world);
-}
-
-void MWBase::Environment::setSoundManager (std::unique_ptr<SoundManager>&& soundManager)
-{
-    mSoundManager = std::move(soundManager);
-}
-
-void MWBase::Environment::setScriptManager (std::unique_ptr<ScriptManager>&& scriptManager)
-{
-    mScriptManager = std::move(scriptManager);
-}
-
-void MWBase::Environment::setWindowManager (std::unique_ptr<WindowManager>&& windowManager)
-{
-    mWindowManager = std::move(windowManager);
-}
-
-void MWBase::Environment::setMechanicsManager (std::unique_ptr<MechanicsManager>&& mechanicsManager)
-{
-    mMechanicsManager = std::move(mechanicsManager);
-}
-
-void MWBase::Environment::setDialogueManager (std::unique_ptr<DialogueManager>&& dialogueManager)
-{
-    mDialogueManager = std::move(dialogueManager);
-}
-
-void MWBase::Environment::setJournal (std::unique_ptr<Journal>&& journal)
-{
-    mJournal = std::move(journal);
-}
-
-void MWBase::Environment::setInputManager (std::unique_ptr<InputManager>&& inputManager)
-{
-    mInputManager = std::move(inputManager);
-}
-
-void MWBase::Environment::setStateManager (std::unique_ptr<StateManager>&& stateManager)
-{
-    mStateManager = std::move(stateManager);
-}
-
-void MWBase::Environment::setLuaManager (std::unique_ptr<LuaManager>&& luaManager)
-{
-    mLuaManager = std::move(luaManager);
-}
-
-void MWBase::Environment::setResourceSystem (Resource::ResourceSystem *resourceSystem)
-{
-    mResourceSystem = resourceSystem;
-}
-
-void MWBase::Environment::setFrameDuration (float duration)
-{
-    mFrameDuration = duration;
-}
-
-void MWBase::Environment::setFrameRateLimit(float limit)
-{
-    mFrameRateLimit = limit;
-}
-
-float MWBase::Environment::getFrameRateLimit() const
-{
-    return mFrameRateLimit;
-}
-
-MWBase::World *MWBase::Environment::getWorld() const
-{
-    assert (mWorld);
-    return mWorld.get();
-}
-
-MWBase::SoundManager *MWBase::Environment::getSoundManager() const
-{
-    assert (mSoundManager);
-    return mSoundManager.get();
-}
-
-MWBase::ScriptManager *MWBase::Environment::getScriptManager() const
-{
-    assert (mScriptManager);
-    return mScriptManager.get();
-}
-
-MWBase::WindowManager *MWBase::Environment::getWindowManager() const
-{
-    assert (mWindowManager);
-    return mWindowManager.get();
-}
-
-MWBase::MechanicsManager *MWBase::Environment::getMechanicsManager() const
-{
-    assert (mMechanicsManager);
-    return mMechanicsManager.get();
-}
-
-MWBase::DialogueManager *MWBase::Environment::getDialogueManager() const
-{
-    assert (mDialogueManager);
-    return mDialogueManager.get();
-}
-
-MWBase::Journal *MWBase::Environment::getJournal() const
-{
-    assert (mJournal);
-    return mJournal.get();
-}
-
-MWBase::InputManager *MWBase::Environment::getInputManager() const
-{
-    assert (mInputManager);
-    return mInputManager.get();
-}
-
-MWBase::StateManager *MWBase::Environment::getStateManager() const
-{
-    assert (mStateManager);
-    return mStateManager.get();
-}
-
-MWBase::LuaManager *MWBase::Environment::getLuaManager() const
-{
-    assert (mLuaManager);
-    return mLuaManager.get();
-}
-
-Resource::ResourceSystem *MWBase::Environment::getResourceSystem() const
-{
-    return mResourceSystem;
-}
-
-float MWBase::Environment::getFrameDuration() const
-{
-    return mFrameDuration;
-}
-
 void MWBase::Environment::cleanup()
 {
-    mMechanicsManager.reset();
-    mDialogueManager.reset();
-    mJournal.reset();
-    mScriptManager.reset();
-    mWindowManager.reset();
-    mWorld.reset();
-    mSoundManager.reset();
-    mInputManager.reset();
-    mStateManager.reset();
-    mLuaManager.reset();
+    mMechanicsManager = nullptr;
+    mDialogueManager = nullptr;
+    mJournal = nullptr;
+    mScriptManager = nullptr;
+    mWindowManager = nullptr;
+    mWorld = nullptr;
+    mSoundManager = nullptr;
+    mInputManager = nullptr;
+    mStateManager = nullptr;
+    mLuaManager = nullptr;
     mResourceSystem = nullptr;
 }
 
-const MWBase::Environment& MWBase::Environment::get()
-{
-    assert (sThis);
-    return *sThis;
-}
-
 void MWBase::Environment::reportStats(unsigned int frameNumber, osg::Stats& stats) const
 {
     mMechanicsManager->reportStats(frameNumber, stats);
diff --git a/apps/openmw/mwbase/environment.hpp b/apps/openmw/mwbase/environment.hpp
index 00af5d2869..e8ea605a9a 100644
--- a/apps/openmw/mwbase/environment.hpp
+++ b/apps/openmw/mwbase/environment.hpp
@@ -1,6 +1,8 @@
 #ifndef GAME_BASE_ENVIRONMENT_H
 #define GAME_BASE_ENVIRONMENT_H
 
+#include <components/misc/notnullptr.hpp>
+
 #include <memory>
 
 namespace osg
@@ -34,25 +36,19 @@ namespace MWBase
     {
             static Environment *sThis;
 
-            std::unique_ptr<World> mWorld;
-            std::unique_ptr<SoundManager> mSoundManager;
-            std::unique_ptr<ScriptManager> mScriptManager;
-            std::unique_ptr<WindowManager> mWindowManager;
-            std::unique_ptr<MechanicsManager> mMechanicsManager;
-            std::unique_ptr<DialogueManager> mDialogueManager;
-            std::unique_ptr<Journal> mJournal;
-            std::unique_ptr<InputManager> mInputManager;
-            std::unique_ptr<StateManager> mStateManager;
-            std::unique_ptr<LuaManager> mLuaManager;
-            Resource::ResourceSystem* mResourceSystem{};
-            float mFrameDuration{};
-            float mFrameRateLimit{};
-
-            Environment (const Environment&);
-            ///< not implemented
-
-            Environment& operator= (const Environment&);
-            ///< not implemented
+            World* mWorld = nullptr;
+            SoundManager* mSoundManager = nullptr;
+            ScriptManager* mScriptManager = nullptr;
+            WindowManager* mWindowManager = nullptr;
+            MechanicsManager* mMechanicsManager = nullptr;
+            DialogueManager* mDialogueManager = nullptr;
+            Journal* mJournal = nullptr;
+            InputManager* mInputManager = nullptr;
+            StateManager* mStateManager = nullptr;
+            LuaManager* mLuaManager = nullptr;
+            Resource::ResourceSystem* mResourceSystem = nullptr;
+            float mFrameRateLimit = 0;
+            float mFrameDuration = 0;
 
         public:
 
@@ -60,63 +56,70 @@ namespace MWBase
 
             ~Environment();
 
-            void setWorld (std::unique_ptr<World>&& world);
+            Environment(const Environment&) = delete;
+
+            Environment& operator=(const Environment&) = delete;
+
+            void setWorld(World& value) { mWorld = &value; }
+
+            void setSoundManager(SoundManager& value) { mSoundManager = &value; }
 
-            void setSoundManager (std::unique_ptr<SoundManager>&& soundManager);
+            void setScriptManager(ScriptManager& value) { mScriptManager = &value; }
 
-            void setScriptManager (std::unique_ptr<ScriptManager>&& scriptManager);
+            void setWindowManager(WindowManager& value) { mWindowManager = &value; }
 
-            void setWindowManager (std::unique_ptr<WindowManager>&& windowManager);
+            void setMechanicsManager(MechanicsManager& value) { mMechanicsManager = &value; }
 
-            void setMechanicsManager (std::unique_ptr<MechanicsManager>&& mechanicsManager);
+            void setDialogueManager(DialogueManager& value) { mDialogueManager = &value; }
 
-            void setDialogueManager (std::unique_ptr<DialogueManager>&& dialogueManager);
+            void setJournal(Journal& value) { mJournal = &value; }
 
-            void setJournal (std::unique_ptr<Journal>&& journal);
+            void setInputManager(InputManager& value) { mInputManager = &value; }
 
-            void setInputManager (std::unique_ptr<InputManager>&& inputManager);
+            void setStateManager(StateManager& value) { mStateManager = &value; }
 
-            void setStateManager (std::unique_ptr<StateManager>&& stateManager);
+            void setLuaManager(LuaManager& value) { mLuaManager = &value; }
 
-            void setLuaManager (std::unique_ptr<LuaManager>&& luaManager);
+            void setResourceSystem(Resource::ResourceSystem& value) { mResourceSystem = &value; }
 
-            void setResourceSystem (Resource::ResourceSystem *resourceSystem);
+            Misc::NotNullPtr<World> getWorld() const { return mWorld; }
 
-            void setFrameDuration (float duration);
-            ///< Set length of current frame in seconds.
+            Misc::NotNullPtr<SoundManager> getSoundManager() const { return mSoundManager; }
 
-            void setFrameRateLimit(float frameRateLimit);
-            float getFrameRateLimit() const;
+            Misc::NotNullPtr<ScriptManager> getScriptManager() const { return mScriptManager; }
 
-            World *getWorld() const;
+            Misc::NotNullPtr<WindowManager> getWindowManager() const { return mWindowManager; }
 
-            SoundManager *getSoundManager() const;
+            Misc::NotNullPtr<MechanicsManager> getMechanicsManager() const { return mMechanicsManager; }
 
-            ScriptManager *getScriptManager() const;
+            Misc::NotNullPtr<DialogueManager> getDialogueManager() const { return mDialogueManager; }
 
-            WindowManager *getWindowManager() const;
+            Misc::NotNullPtr<Journal> getJournal() const { return mJournal; }
 
-            MechanicsManager *getMechanicsManager() const;
+            Misc::NotNullPtr<InputManager> getInputManager() const { return mInputManager; }
 
-            DialogueManager *getDialogueManager() const;
+            Misc::NotNullPtr<StateManager> getStateManager() const { return mStateManager; }
 
-            Journal *getJournal() const;
+            Misc::NotNullPtr<LuaManager> getLuaManager() const { return mLuaManager; }
 
-            InputManager *getInputManager() const;
+            Misc::NotNullPtr<Resource::ResourceSystem> getResourceSystem() const { return mResourceSystem; }
 
-            StateManager *getStateManager() const;
+            float getFrameRateLimit() const { return mFrameRateLimit; }
 
-            LuaManager *getLuaManager() const;
+            void setFrameRateLimit(float value) { mFrameRateLimit = value; }
 
-            Resource::ResourceSystem *getResourceSystem() const;
+            float getFrameDuration() const { return mFrameDuration; }
 
-            float getFrameDuration() const;
+            void setFrameDuration(float value) { mFrameDuration = value; }
 
             void cleanup();
-            ///< Delete all mw*-subsystems.
 
-            static const Environment& get();
-            ///< Return instance of this class.
+            /// Return instance of this class.
+            static const Environment& get()
+            {
+                assert(sThis != nullptr);
+                return *sThis;
+            }
 
             void reportStats(unsigned int frameNumber, osg::Stats& stats) const;
     };
diff --git a/apps/openmw/mwinput/actionmanager.cpp b/apps/openmw/mwinput/actionmanager.cpp
index 63b0a197a7..eae6996acd 100644
--- a/apps/openmw/mwinput/actionmanager.cpp
+++ b/apps/openmw/mwinput/actionmanager.cpp
@@ -157,8 +157,8 @@ namespace MWInput
     void ActionManager::executeAction(int action)
     {
         MWBase::Environment::get().getLuaManager()->inputEvent({MWBase::LuaManager::InputEvent::Action, action});
-        auto* inputManager = MWBase::Environment::get().getInputManager();
-        auto* windowManager = MWBase::Environment::get().getWindowManager();
+        const auto inputManager = MWBase::Environment::get().getInputManager();
+        const auto windowManager = MWBase::Environment::get().getWindowManager();
         // trigger action activated
         switch (action)
         {
diff --git a/apps/openmw/mwlua/uibindings.cpp b/apps/openmw/mwlua/uibindings.cpp
index 5b66c8b945..b66aa35368 100644
--- a/apps/openmw/mwlua/uibindings.cpp
+++ b/apps/openmw/mwlua/uibindings.cpp
@@ -200,7 +200,7 @@ namespace MWLua
         };
         api["setConsoleSelectedObject"] = [luaManager=context.mLuaManager](const sol::object& obj)
         {
-            auto* wm = MWBase::Environment::get().getWindowManager();
+            const auto wm = MWBase::Environment::get().getWindowManager();
             if (obj == sol::nil)
                 luaManager->addAction([wm]{ wm->setConsoleSelectedObject(MWWorld::Ptr()); });
             else
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 01c404c563..a659c30341 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -495,7 +495,7 @@ namespace MWMechanics
 
         getActorsSidingWith(actor1, allies1, cachedAllies);
 
-        auto* mechanicsManager = MWBase::Environment::get().getMechanicsManager();
+        const auto mechanicsManager = MWBase::Environment::get().getMechanicsManager();
         // If an ally of actor1 has been attacked by actor2 or has attacked actor2, start combat between actor1 and actor2
         for (const MWWorld::Ptr& ally : allies1)
         {
@@ -583,7 +583,7 @@ namespace MWMechanics
         }
 
         // Make guards go aggressive with creatures that are in combat, unless the creature is a follower or escorter
-        auto* world = MWBase::Environment::get().getWorld();
+        const auto world = MWBase::Environment::get().getWorld();
         if (!aggressive && actor1.getClass().isClass(actor1, "Guard") && !actor2.getClass().isNpc() && creatureStats2.getAiSequence().isInCombat())
         {
             // Check if the creature is too far
@@ -917,7 +917,7 @@ namespace MWMechanics
         //If holding a light...
         if(heldIter.getType() == MWWorld::ContainerStore::Type_Light)
         {
-            auto* world = MWBase::Environment::get().getWorld();
+            const auto world = MWBase::Environment::get().getWorld();
             // Use time from the player's light
             if(isPlayer)
             {
@@ -974,8 +974,8 @@ namespace MWMechanics
         if (playerStats.isWerewolf())
             return;
 
-        auto* mechanicsManager = MWBase::Environment::get().getMechanicsManager();
-        auto* world = MWBase::Environment::get().getWorld();
+        const auto mechanicsManager = MWBase::Environment::get().getMechanicsManager();
+        const auto world = MWBase::Environment::get().getWorld();
 
         if (actorClass.isClass(ptr, "Guard") && creatureStats.getAiSequence().isInPursuit() && !creatureStats.getAiSequence().isInCombat()
             && creatureStats.getMagicEffects().get(ESM::MagicEffect::CalmHumanoid).getMagnitude() == 0)
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 26baba30d4..209229efc5 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -207,7 +207,7 @@ std::string CharacterController::chooseRandomGroup (const std::string& prefix, i
 
 void CharacterController::refreshHitRecoilAnims(CharacterState& idle)
 {
-    auto* world = MWBase::Environment::get().getWorld();
+    const auto world = MWBase::Environment::get().getWorld();
     auto& charClass = mPtr.getClass();
     auto& stats = charClass.getCreatureStats(mPtr);
     bool recovery = stats.getHitRecovery();
@@ -1101,7 +1101,7 @@ void CharacterController::updateIdleStormState(bool inwater)
         return;
     }
 
-    auto* world = MWBase::Environment::get().getWorld();
+    const auto world = MWBase::Environment::get().getWorld();
     if (world->isInStorm())
     {
         osg::Vec3f stormDirection = world->getStormDirection();
@@ -1139,7 +1139,7 @@ bool CharacterController::updateCarriedLeftVisible(const int weaptype) const
 
 bool CharacterController::updateState(CharacterState idle)
 {
-    auto* world = MWBase::Environment::get().getWorld();
+    const auto world = MWBase::Environment::get().getWorld();
     auto& prng = world->getPrng();
     MWBase::SoundManager* sndMgr = MWBase::Environment::get().getSoundManager();
 
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 0dd177e4b8..1c1a2d6fbd 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -789,7 +789,7 @@ namespace MWPhysics
     void PhysicsSystem::moveActors()
     {
         auto* player = getActor(MWMechanics::getPlayer());
-        auto* world = MWBase::Environment::get().getWorld();
+        const auto world = MWBase::Environment::get().getWorld();
 
         // copy new ptr position in temporary vector. player is handled separately as its movement might change active cell.
         std::vector<std::pair<MWWorld::Ptr, osg::Vec3f>> newPositions;
diff --git a/apps/openmw/mwrender/landmanager.cpp b/apps/openmw/mwrender/landmanager.cpp
index 6af1d9782c..2395eeab69 100644
--- a/apps/openmw/mwrender/landmanager.cpp
+++ b/apps/openmw/mwrender/landmanager.cpp
@@ -25,7 +25,7 @@ osg::ref_ptr<ESMTerrain::LandObject> LandManager::getLand(int x, int y)
         return static_cast<ESMTerrain::LandObject*>(obj.get());
     else
     {
-        const auto* world = MWBase::Environment::get().getWorld();
+        const auto world = MWBase::Environment::get().getWorld();
         if (!world)
             return nullptr;
         const ESM::Land* land = world->getStore().get<ESM::Land>().search(x,y);
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 944e947cd1..52b647add3 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -804,7 +804,7 @@ namespace MWRender
         }
         else if (mode == Render_Scene)
         {
-            auto* wm = MWBase::Environment::get().getWindowManager();
+            const auto wm = MWBase::Environment::get().getWindowManager();
             unsigned int mask = wm->getCullMask();
             bool enabled = !(mask&sToggleWorldMask);
             if (enabled)
diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp
index 64acf1c10f..dd5ad0c0f9 100644
--- a/apps/openmw/mwworld/player.cpp
+++ b/apps/openmw/mwworld/player.cpp
@@ -522,11 +522,11 @@ namespace MWWorld
     void Player::update()
     {
         auto player = getPlayer();
-        auto* world = MWBase::Environment::get().getWorld();
-        auto* rendering = world->getRenderingManager();
+        const auto world = MWBase::Environment::get().getWorld();
+        const auto rendering = world->getRenderingManager();
         auto& store = world->getStore();
         auto& playerClass = player.getClass();
-        auto* windowMgr = MWBase::Environment::get().getWindowManager();
+        const auto windowMgr = MWBase::Environment::get().getWindowManager();
 
         if (player.getCell()->isExterior())
         {
diff --git a/components/misc/notnullptr.hpp b/components/misc/notnullptr.hpp
new file mode 100644
index 0000000000..a7e02c3614
--- /dev/null
+++ b/components/misc/notnullptr.hpp
@@ -0,0 +1,33 @@
+#ifndef OPENMW_COMPONENTS_MISC_NOTNULLPTR_H
+#define OPENMW_COMPONENTS_MISC_NOTNULLPTR_H
+
+#include <cassert>
+#include <cstddef>
+#include <type_traits>
+
+namespace Misc
+{
+    template <class T>
+    class NotNullPtr
+    {
+    public:
+        NotNullPtr(T* value)
+            : mValue(value)
+        {
+            assert(mValue != nullptr);
+        }
+
+        NotNullPtr(std::nullptr_t) = delete;
+
+        operator T*() const { return mValue; }
+
+        T* operator->() const { return mValue; }
+
+        T& operator*() const { return *mValue; }
+
+    private:
+        T* mValue;
+    };
+}
+
+#endif

From 2dc6e755b2d304b26d6c3a2a40ffe0c016f4b9d3 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 6 May 2022 18:23:57 +0200
Subject: [PATCH 2388/2859] Remove redundant update virtual functions

---
 apps/openmw/mwbase/mechanicsmanager.hpp         | 6 ------
 apps/openmw/mwbase/soundmanager.hpp             | 2 --
 apps/openmw/mwbase/statemanager.hpp             | 2 --
 apps/openmw/mwbase/windowmanager.hpp            | 2 --
 apps/openmw/mwbase/world.hpp                    | 5 -----
 apps/openmw/mwgui/windowmanagerimp.hpp          | 2 +-
 apps/openmw/mwinput/inputmanagerimp.hpp         | 2 +-
 apps/openmw/mwmechanics/mechanicsmanagerimp.hpp | 2 +-
 apps/openmw/mwsound/soundmanagerimp.hpp         | 2 +-
 apps/openmw/mwstate/statemanagerimp.hpp         | 2 +-
 apps/openmw/mwworld/worldimp.hpp                | 6 +++---
 11 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/apps/openmw/mwbase/mechanicsmanager.hpp b/apps/openmw/mwbase/mechanicsmanager.hpp
index 5b41ff7fda..b6e167ab9e 100644
--- a/apps/openmw/mwbase/mechanicsmanager.hpp
+++ b/apps/openmw/mwbase/mechanicsmanager.hpp
@@ -66,12 +66,6 @@ namespace MWBase
             virtual void drop (const MWWorld::CellStore *cellStore) = 0;
             ///< Deregister all objects in the given cell.
 
-            virtual void update (float duration, bool paused) = 0;
-            ///< Update objects
-            ///
-            /// \param paused In game type does not currently advance (this usually means some GUI
-            /// component is up).
-
             virtual void setPlayerName (const std::string& name) = 0;
             ///< Set player name.
 
diff --git a/apps/openmw/mwbase/soundmanager.hpp b/apps/openmw/mwbase/soundmanager.hpp
index 2bac561fdd..9d3e99d06b 100644
--- a/apps/openmw/mwbase/soundmanager.hpp
+++ b/apps/openmw/mwbase/soundmanager.hpp
@@ -176,8 +176,6 @@ namespace MWBase
             virtual void pausePlayback() = 0;
             virtual void resumePlayback() = 0;
 
-            virtual void update(float duration) = 0;
-
             virtual void setListenerPosDir(const osg::Vec3f &pos, const osg::Vec3f &dir, const osg::Vec3f &up, bool underwater) = 0;
 
             virtual void updatePtr(const MWWorld::ConstPtr& old, const MWWorld::ConstPtr& updated) = 0;
diff --git a/apps/openmw/mwbase/statemanager.hpp b/apps/openmw/mwbase/statemanager.hpp
index 157833a0ee..0537ff02d2 100644
--- a/apps/openmw/mwbase/statemanager.hpp
+++ b/apps/openmw/mwbase/statemanager.hpp
@@ -88,8 +88,6 @@ namespace MWBase
             /// iterator.
 
             virtual CharacterIterator characterEnd() = 0;
-
-            virtual void update (float duration) = 0;
     };
 }
 
diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index f47ae24e87..45ea43daa8 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -247,8 +247,6 @@ namespace MWBase
             /// returns the index of the pressed button or -1 if no button was pressed (->MessageBoxmanager->InteractiveMessageBox)
             virtual int readPressedButton() = 0;
 
-            virtual void update (float duration) = 0;
-
             virtual void updateConsoleObjectPtr(const MWWorld::Ptr& currentPtr, const MWWorld::Ptr& newPtr) = 0;
 
             /**
diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 98783f3c62..899be7dfb9 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -408,11 +408,6 @@ namespace MWBase
             ///< Write this record to the ESM store, allowing it to override a pre-existing record with the same ID.
             /// \return pointer to created record
 
-            virtual void update (float duration, bool paused) = 0;
-            virtual void updatePhysics (float duration, bool paused, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats) = 0;
-
-            virtual void updateWindowManager () = 0;
-
             virtual MWWorld::Ptr placeObject (const MWWorld::ConstPtr& object, float cursorX, float cursorY, int amount) = 0;
             ///< copy and place an object into the gameworld at the specified cursor position
             /// @param object
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index 8ab50e32ed..9a7ea2f1a7 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -277,7 +277,7 @@ namespace MWGui
 
     int readPressedButton () override; ///< returns the index of the pressed button or -1 if no button was pressed (->MessageBoxmanager->InteractiveMessageBox)
 
-    void update (float duration) override;
+    void update (float duration);
 
     /**
      * Fetches a GMST string from the store, if there is no setting with the given
diff --git a/apps/openmw/mwinput/inputmanagerimp.hpp b/apps/openmw/mwinput/inputmanagerimp.hpp
index 3f9f1b3be1..cf222d3e46 100644
--- a/apps/openmw/mwinput/inputmanagerimp.hpp
+++ b/apps/openmw/mwinput/inputmanagerimp.hpp
@@ -61,7 +61,7 @@ namespace MWInput
         /// Clear all savegame-specific data
         void clear() override;
 
-        void update(float dt, bool disableControls=false, bool disableEvents=false) override;
+        void update(float dt, bool disableControls, bool disableEvents=false) override;
 
         void changeInputMode(bool guiMode) override;
 
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
index 6128b8bf52..4dd8790d2a 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
@@ -54,7 +54,7 @@ namespace MWMechanics
             void drop(const MWWorld::CellStore *cellStore) override;
             ///< Deregister all objects in the given cell.
 
-            void update (float duration, bool paused) override;
+            void update(float duration, bool paused);
             ///< Update objects
             ///
             /// \param paused In game type does not currently advance (this usually means some GUI
diff --git a/apps/openmw/mwsound/soundmanagerimp.hpp b/apps/openmw/mwsound/soundmanagerimp.hpp
index e659e7a12a..d03059ba3e 100644
--- a/apps/openmw/mwsound/soundmanagerimp.hpp
+++ b/apps/openmw/mwsound/soundmanagerimp.hpp
@@ -244,7 +244,7 @@ namespace MWSound
         void pausePlayback() override;
         void resumePlayback() override;
 
-        void update(float duration) override;
+        void update(float duration);
 
         void setListenerPosDir(const osg::Vec3f &pos, const osg::Vec3f &dir, const osg::Vec3f &up, bool underwater) override;
 
diff --git a/apps/openmw/mwstate/statemanagerimp.hpp b/apps/openmw/mwstate/statemanagerimp.hpp
index a29e72b3ad..273a3eb3bc 100644
--- a/apps/openmw/mwstate/statemanagerimp.hpp
+++ b/apps/openmw/mwstate/statemanagerimp.hpp
@@ -84,7 +84,7 @@ namespace MWState
 
             CharacterIterator characterEnd() override;
 
-            void update (float duration) override;
+            void update(float duration);
     };
 }
 
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index fb1b80daf3..09bae6653d 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -495,10 +495,10 @@ namespace MWWorld
             ///< Write this record to the ESM store, allowing it to override a pre-existing record with the same ID.
             /// \return pointer to created record
 
-            void update (float duration, bool paused) override;
-            void updatePhysics (float duration, bool paused, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats) override;
+            void update(float duration, bool paused);
+            void updatePhysics(float duration, bool paused, osg::Timer_t frameStart, unsigned int frameNumber, osg::Stats& stats);
 
-            void updateWindowManager () override;
+            void updateWindowManager();
 
             MWWorld::Ptr placeObject (const MWWorld::ConstPtr& object, float cursorX, float cursorY, int amount) override;
             ///< copy and place an object into the gameworld at the specified cursor position

From 2d1d7e644c7750f5d705e2bb833b8441a14d1b69 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Fri, 6 May 2022 23:46:36 +0200
Subject: [PATCH 2389/2859] [Lua] Fix the bug the object:activate() doesn't
 trigger mwscripts

---
 apps/openmw/mwlua/objectbindings.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwlua/objectbindings.cpp b/apps/openmw/mwlua/objectbindings.cpp
index 0bf3fc99c5..8487856d81 100644
--- a/apps/openmw/mwlua/objectbindings.cpp
+++ b/apps/openmw/mwlua/objectbindings.cpp
@@ -95,9 +95,12 @@ namespace MWLua
                 if (actor.isEmpty())
                     throw std::runtime_error(std::string("Actor not found: " + idToString(mActor)));
 
-                MWBase::Environment::get().getLuaManager()->objectActivated(object, actor);
-                std::unique_ptr<MWWorld::Action> action = object.getClass().activate(object, actor);
-                action->execute(actor);
+                if (object.getRefData().activate())
+                {
+                    MWBase::Environment::get().getLuaManager()->objectActivated(object, actor);
+                    std::unique_ptr<MWWorld::Action> action = object.getClass().activate(object, actor);
+                    action->execute(actor);
+                }
             }
 
             std::string toString() const override

From 76160076db9a5a6cc17212e88df2721c69b89794 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sat, 10 Jul 2021 13:43:53 +0200
Subject: [PATCH 2390/2859] Introduce OpenMW integration tests

---
 .../integration_tests/test_lua_api/player.lua | 63 +++++++++++++
 .../integration_tests/test_lua_api/test.lua   | 67 +++++++++++++
 .../test_lua_api/test.omwscripts              |  3 +
 .../test_lua_api/testing_util.lua             | 93 +++++++++++++++++++
 scripts/integration_tests.py                  | 87 +++++++++++++++++
 5 files changed, 313 insertions(+)
 create mode 100644 scripts/data/integration_tests/test_lua_api/player.lua
 create mode 100644 scripts/data/integration_tests/test_lua_api/test.lua
 create mode 100644 scripts/data/integration_tests/test_lua_api/test.omwscripts
 create mode 100644 scripts/data/integration_tests/test_lua_api/testing_util.lua
 create mode 100755 scripts/integration_tests.py

diff --git a/scripts/data/integration_tests/test_lua_api/player.lua b/scripts/data/integration_tests/test_lua_api/player.lua
new file mode 100644
index 0000000000..c46ab5c46e
--- /dev/null
+++ b/scripts/data/integration_tests/test_lua_api/player.lua
@@ -0,0 +1,63 @@
+local testing = require('testing_util')
+local self = require('openmw.self')
+local util = require('openmw.util')
+local core = require('openmw.core')
+local input = require('openmw.input')
+local types = require('openmw.types')
+
+input.setControlSwitch(input.CONTROL_SWITCH.Fighting, false)
+input.setControlSwitch(input.CONTROL_SWITCH.Jumping, false)
+input.setControlSwitch(input.CONTROL_SWITCH.Looking, false)
+input.setControlSwitch(input.CONTROL_SWITCH.Magic, false)
+input.setControlSwitch(input.CONTROL_SWITCH.VanityMode, false)
+input.setControlSwitch(input.CONTROL_SWITCH.ViewMode, false)
+
+testing.registerLocalTest('playerMovement',
+    function()
+        local startTime = core.getSimulationTime()
+        local pos = self.position
+
+        while core.getSimulationTime() < startTime + 0.5 do
+            self.controls.jump = false
+            self.controls.run = true
+            self.controls.movement = 0
+            self.controls.sideMovement = 0
+            local progress = (core.getSimulationTime() - startTime) / 0.5
+            self.controls.yawChange = util.normalizeAngle(math.rad(90) * progress - self.rotation.z)
+            coroutine.yield()
+        end
+        testing.expectEqualWithDelta(self.rotation.z, math.rad(90), 0.05, 'Incorrect rotation')
+
+        while core.getSimulationTime() < startTime + 1.5 do
+            self.controls.jump = false
+            self.controls.run = true
+            self.controls.movement = 1
+            self.controls.sideMovement = 0
+            self.controls.yawChange = 0
+            coroutine.yield()
+        end
+        direction = (self.position - pos) / types.Actor.runSpeed(self)
+        testing.expectEqualWithDelta(direction.x, 1, 0.1, 'Run forward, X coord')
+        testing.expectEqualWithDelta(direction.y, 0, 0.1, 'Run forward, Y coord')
+
+        pos = self.position
+        while core.getSimulationTime() < startTime + 2.5 do
+            self.controls.jump = false
+            self.controls.run = false
+            self.controls.movement = -1
+            self.controls.sideMovement = -1
+            self.controls.yawChange = 0
+            coroutine.yield()
+        end
+        direction = (self.position - pos) / types.Actor.walkSpeed(self)
+        testing.expectEqualWithDelta(direction.x, -0.707, 0.1, 'Walk diagonally, X coord')
+        testing.expectEqualWithDelta(direction.y, 0.707, 0.1, 'Walk diagonally, Y coord')
+    end)
+
+return {
+    engineHandlers = {
+        onUpdate = testing.updateLocal,
+    },
+    eventHandlers = testing.eventHandlers
+}
+
diff --git a/scripts/data/integration_tests/test_lua_api/test.lua b/scripts/data/integration_tests/test_lua_api/test.lua
new file mode 100644
index 0000000000..573844199b
--- /dev/null
+++ b/scripts/data/integration_tests/test_lua_api/test.lua
@@ -0,0 +1,67 @@
+local testing = require('testing_util')
+local core = require('openmw.core')
+local async = require('openmw.async')
+local util = require('openmw.util')
+
+local function testTimers()
+    testing.expectAlmostEqual(core.getGameTimeScale(), 30, 'incorrect getGameTimeScale() result')
+    testing.expectAlmostEqual(core.getSimulationTimeScale(), 1, 'incorrect getSimulationTimeScale result')
+
+    local startGameTime = core.getGameTime()
+    local startSimulationTime = core.getSimulationTime()
+
+    local ts1, ts2, th1, th2
+    local cb = async:registerTimerCallback("tfunc", function(arg)
+        if arg == 'g' then
+            th1 = core.getGameTime() - startGameTime
+        else
+            ts1 = core.getSimulationTime() - startSimulationTime
+        end
+    end)
+    async:newGameTimer(36, cb, 'g')
+    async:newSimulationTimer(0.5, cb, 's')
+    async:newUnsavableGameTimer(72, function()
+        th2 = core.getGameTime() - startGameTime
+    end)
+    async:newUnsavableSimulationTimer(1, function()
+        ts2 = core.getSimulationTime() - startSimulationTime
+    end)
+
+    while not (ts1 and ts2 and th1 and th2) do coroutine.yield() end
+
+    testing.expectAlmostEqual(th1, 36, 'async:newGameTimer failed')
+    testing.expectAlmostEqual(ts1, 0.5, 'async:newSimulationTimer failed')
+    testing.expectAlmostEqual(th2, 72, 'async:newUnsavableGameTimer failed')
+    testing.expectAlmostEqual(ts2, 1, 'async:newUnsavableSimulationTimer failed')
+end
+
+local function testTeleport()
+    player:teleport('', util.vector3(100, 50, 0), util.vector3(0, 0, math.rad(-90)))
+    coroutine.yield()
+    testing.expect(player.cell.isExterior, 'teleport to exterior failed')
+    testing.expectEqualWithDelta(player.position.x, 100, 1, 'incorrect position after teleporting')
+    testing.expectEqualWithDelta(player.position.y, 50, 1, 'incorrect position after teleporting')
+    testing.expectEqualWithDelta(player.rotation.z, math.rad(-90), 0.05, 'incorrect rotation after teleporting')
+
+    player:teleport('', util.vector3(50, -100, 0))
+    coroutine.yield()
+    testing.expect(player.cell.isExterior, 'teleport to exterior failed')
+    testing.expectEqualWithDelta(player.position.x, 50, 1, 'incorrect position after teleporting')
+    testing.expectEqualWithDelta(player.position.y, -100, 1, 'incorrect position after teleporting')
+    testing.expectEqualWithDelta(player.rotation.z, math.rad(-90), 0.05, 'teleporting changes rotation')
+end
+
+tests = {
+    {'timers', testTimers},
+    {'playerMovement', function() testing.runLocalTest(player, 'playerMovement') end},
+    {'teleport', testTeleport},
+}
+
+return {
+    engineHandlers = {
+        onUpdate = testing.testRunner(tests),
+        onPlayerAdded = function(p) player = p end,
+    },
+    eventHandlers = testing.eventHandlers,
+}
+
diff --git a/scripts/data/integration_tests/test_lua_api/test.omwscripts b/scripts/data/integration_tests/test_lua_api/test.omwscripts
new file mode 100644
index 0000000000..97f523afbd
--- /dev/null
+++ b/scripts/data/integration_tests/test_lua_api/test.omwscripts
@@ -0,0 +1,3 @@
+GLOBAL: test.lua
+PLAYER: player.lua
+
diff --git a/scripts/data/integration_tests/test_lua_api/testing_util.lua b/scripts/data/integration_tests/test_lua_api/testing_util.lua
new file mode 100644
index 0000000000..719502e741
--- /dev/null
+++ b/scripts/data/integration_tests/test_lua_api/testing_util.lua
@@ -0,0 +1,93 @@
+local core = require('openmw.core')
+
+local M = {}
+local currentLocalTest = nil
+local currentLocalTestError = nil
+
+function M.testRunner(tests)
+    local fn = function()
+        for i, test in ipairs(tests) do
+            local name, fn = unpack(test)
+            print('TEST_START', i, name)
+            local status, err = pcall(fn)
+            if status then
+                print('TEST_OK', i, name)
+            else
+                print('TEST_FAILED', i, name, err)
+            end
+        end
+        core.quit()
+    end
+    local co = coroutine.create(fn)
+    return function()
+        if coroutine.status(co) ~= 'dead' then
+            coroutine.resume(co)
+        end
+    end
+end
+
+function M.runLocalTest(obj, name)
+    currentLocalTest = name
+    currentLocalTestError = nil
+    obj:sendEvent('runLocalTest', name)
+    while currentLocalTest do coroutine.yield() end
+    if currentLocalTestError then error(currentLocalTestError, 2) end
+end
+
+function M.expect(cond, delta, msg)
+    if not cond then
+        error(msg or '"true" expected', 2)
+    end
+end
+
+function M.expectEqualWithDelta(v1, v2, delta, msg)
+    if math.abs(v1 - v2) > delta then
+        error(string.format('%s: %f ~= %f', msg or '', v1, v2), 2)
+    end
+end
+
+function M.expectAlmostEqual(v1, v2, msg)
+    if math.abs(v1 - v2) / (math.abs(v1) + math.abs(v2)) > 0.05 then
+        error(string.format('%s: %f ~= %f', msg or '', v1, v2), 2)
+    end
+end
+
+local localTests = {}
+local localTestRunner = nil
+
+function M.registerLocalTest(name, fn)
+    localTests[name] = fn
+end
+
+function M.updateLocal()
+    if localTestRunner and coroutine.status(localTestRunner) ~= 'dead' then
+        coroutine.resume(localTestRunner)
+    else
+        localTestRunner = nil
+    end
+end
+
+M.eventHandlers = {
+    runLocalTest = function(name)  -- used only in local scripts
+        fn = localTests[name]
+        if not fn then
+            core.sendGlobalEvent('localTestFinished', {name=name, errMsg='Test not found'})
+            return
+        end
+        localTestRunner = coroutine.create(function()
+            local status, err = pcall(fn)
+            if status then err = nil end
+            core.sendGlobalEvent('localTestFinished', {name=name, errMsg=err})
+        end)
+    end,
+    localTestFinished = function(data)  -- used only in global scripts
+        if data.name ~= currentLocalTest then
+            error(string.format('localTestFinished with incorrect name %s, expected %s', data.name, currentLocalTest))
+        end
+        currentLocalTest = nil
+        currentLocalTestError = data.errMsg
+    end,
+}
+
+return M
+
diff --git a/scripts/integration_tests.py b/scripts/integration_tests.py
new file mode 100755
index 0000000000..b125e688fb
--- /dev/null
+++ b/scripts/integration_tests.py
@@ -0,0 +1,87 @@
+#!/usr/bin/env python3
+
+import argparse, datetime, os, subprocess, sys, shutil
+from pathlib import Path
+
+parser = argparse.ArgumentParser(description="OpenMW integration tests.")
+parser.add_argument(
+    "example_suite",
+    type=str,
+    help="path to openmw example suite (use 'git clone https://gitlab.com/OpenMW/example-suite/' to get it)",
+)
+parser.add_argument("--omw", type=str, default="openmw", help="path to openmw binary")
+parser.add_argument(
+    "--workdir", type=str, default="integration_tests_output", help="directory for temporary files and logs"
+)
+args = parser.parse_args()
+
+example_suite_dir = Path(args.example_suite).resolve()
+example_suite_content = example_suite_dir / "game_template" / "data" / "template.omwgame"
+if not example_suite_content.is_file():
+    sys.exit(
+        f"{example_suite_content} not found, use 'git clone https://gitlab.com/OpenMW/example-suite/' to get it"
+    )
+
+openmw_binary = Path(args.omw).resolve()
+if not openmw_binary.is_file():
+    sys.exit(f"{openmw_binary} not found")
+
+work_dir = Path(args.workdir).resolve()
+work_dir.mkdir(parents=True, exist_ok=True)
+config_dir = work_dir / "config"
+userdata_dir = work_dir / "userdata"
+tests_dir = Path(__file__).resolve().parent / "data" / "integration_tests"
+time_str = datetime.datetime.now().strftime("%Y-%m-%d-%H.%M.%S")
+
+
+def runTest(name):
+    print(f"Start {name}")
+    shutil.rmtree(config_dir, ignore_errors=True)
+    config_dir.mkdir()
+    shutil.copyfile(example_suite_dir / "settings.cfg", config_dir / "settings.cfg")
+    test_dir = tests_dir / name
+    with open(config_dir / "openmw.cfg", "w", encoding="utf-8") as omw_cfg:
+        omw_cfg.writelines(
+            (
+                f'data="{example_suite_dir}{os.sep}game_template{os.sep}data"\n',
+                f'data-local="{test_dir}"\n',
+                f'user-data="{userdata_dir}"\n',
+                "content=template.omwgame\n",
+            )
+        )
+        if (test_dir / "test.omwscripts").exists():
+            omw_cfg.write("content=test.omwscripts\n")
+    with subprocess.Popen(
+        [f"{openmw_binary}", "--replace=config", f"--config={config_dir}", "--skip-menu", "--no-grab"],
+        stdout=subprocess.PIPE,
+        stderr=subprocess.STDOUT,
+        encoding="utf-8",
+    ) as process:
+        quit_requested = False
+        for line in process.stdout:
+            words = line.split(" ")
+            if len(words) > 1 and words[1] == "E]":
+                print(line, end="")
+            elif "Quit requested by a Lua script" in line:
+                quit_requested = True
+            elif "TEST_START" in line:
+                w = line.split("TEST_START")[1].split("\t")
+                print(f"TEST {w[2].strip()}\t\t", end="")
+            elif "TEST_OK" in line:
+                print(f"OK")
+            elif "TEST_FAILED" in line:
+                w = line.split("TEST_FAILED")[1].split("\t")
+                print(f"FAILED {w[3]}\t\t")
+        process.wait(5)
+        if not quit_requested:
+            print("ERROR: Unexpected termination")
+    shutil.copyfile(config_dir / "openmw.log", work_dir / f"{name}.{time_str}.log")
+    print(f"{name} finished")
+
+
+for entry in tests_dir.glob("test_*"):
+    if entry.is_dir():
+        runTest(entry.name)
+shutil.rmtree(config_dir, ignore_errors=True)
+shutil.rmtree(userdata_dir, ignore_errors=True)
+

From 096255534a00cf93c50eda583dea9207d6655268 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Mon, 7 Mar 2022 21:28:05 +0100
Subject: [PATCH 2391/2859] Initial Lua Settings API prototype

---
 files/builtin_scripts/builtin.omwscripts      |   2 +
 .../scripts/omw/settings/common.lua           | 150 ++++++++++++++++++
 .../scripts/omw/settings/global.lua           |  30 ++++
 .../scripts/omw/settings/interface.lua        |  51 ++++++
 .../scripts/omw/settings/player.lua           |  26 +++
 .../scripts/omw/settings/register.lua         |  76 +++++++++
 .../scripts/omw/settings/render.lua           |  61 +++++++
 7 files changed, 396 insertions(+)
 create mode 100644 files/builtin_scripts/scripts/omw/settings/common.lua
 create mode 100644 files/builtin_scripts/scripts/omw/settings/global.lua
 create mode 100644 files/builtin_scripts/scripts/omw/settings/interface.lua
 create mode 100644 files/builtin_scripts/scripts/omw/settings/player.lua
 create mode 100644 files/builtin_scripts/scripts/omw/settings/register.lua
 create mode 100644 files/builtin_scripts/scripts/omw/settings/render.lua

diff --git a/files/builtin_scripts/builtin.omwscripts b/files/builtin_scripts/builtin.omwscripts
index af6320e0b2..989575ee1a 100644
--- a/files/builtin_scripts/builtin.omwscripts
+++ b/files/builtin_scripts/builtin.omwscripts
@@ -4,3 +4,5 @@ PLAYER: scripts/omw/console/player.lua
 GLOBAL: scripts/omw/console/global.lua
 CUSTOM: scripts/omw/console/local.lua
 PLAYER: scripts/omw/mwui/init.lua
+GLOBAL: scripts/omw/settings/global.lua
+PLAYER: scripts/omw/settings/player.lua
diff --git a/files/builtin_scripts/scripts/omw/settings/common.lua b/files/builtin_scripts/scripts/omw/settings/common.lua
new file mode 100644
index 0000000000..f6645b3a11
--- /dev/null
+++ b/files/builtin_scripts/scripts/omw/settings/common.lua
@@ -0,0 +1,150 @@
+local prequire = function(path)
+    local status, result = pcall(function()
+        return require(path)
+    end)
+    return status and result or nil
+end
+
+local core = require('openmw.core')
+local types = require('openmw.types')
+local storage = require('openmw.storage')
+local self = prequire('openmw.self')
+local world = prequire('openmw.world')
+
+local isPlayerScript = self and true or false
+local isGlobalScript = world and true or false
+
+local EVENTS = {
+    SettingChanged = 'omwSettingsChanged',
+    SettingSet = 'omwSettingsGlobalSet',
+    GroupRegistered = 'omwSettingsGroupRegistered',
+}
+
+local SCOPE = {
+    Global = 'Global',
+    Player = 'Player',
+    SaveGlobal = 'SaveGlobal',
+    SavePlayer = 'SavePlayer',
+}
+
+local groups = storage.globalSection('OMW_Settings_Groups')
+local saveGlobalSection = storage.globalSection('OMW_Settings_SaveGlobal')
+
+if isGlobalScript then
+    groups:removeOnExit()
+    saveGlobalSection:removeOnExit()
+end
+
+local savePlayerSection = nil
+if isPlayerScript then
+    savePlayerSection = storage.playerSection('OMW_Setting_SavePlayer')
+    savePlayerSection:removeOnExit()
+end
+
+local scopes = {
+    [SCOPE.Global] = storage.globalSection('OMW_Setting_Global'),
+    [SCOPE.Player] = isPlayerScript and storage.playerSection('OMW_Setting_Player'),
+    [SCOPE.SaveGlobal] = saveGlobalSection,
+    [SCOPE.SavePlayer] = savePlayerSection,
+}
+
+local function isGlobalScope(scope)
+    return scope == SCOPE.Global or scope == SCOPE.SaveGlobal
+end
+
+local function getSetting(groupName, settingName)
+    local group = groups:get(groupName)
+    if not group then
+        error('Unknown group')
+    end
+    local setting = group[settingName]
+    if not setting then
+        error('Unknown setting')
+    end
+    return setting
+end
+
+local function getSettingValue(groupName, settingName)
+    local setting = getSetting(groupName, settingName)
+    local scopeSection = scopes[setting.scope]
+    if not scopeSection then
+        error(('Setting %s is not available in this context'):format(setting.name))
+    end
+    if not scopeSection:get(groupName) then
+        scopeSection:set(groupName, {})
+    end
+    return scopeSection:get(groupName)[setting.name] or setting.default
+end
+
+local function notifySettingChange(scope, event)
+    if isGlobalScope(scope) then
+        core.sendGlobalEvent(EVENTS.SettingChanged, event)
+        for _, a in ipairs(world.activeActors) do
+            if a.type == types.Player then
+                a:sendEvent(EVENTS.SettingChanged, event)
+            end
+        end
+    else
+        self:sendEvent(EVENTS.SettingChanged, event)
+    end
+end
+
+local function setSettingValue(groupName, settingName, value)
+    local setting = getSetting(groupName, settingName)
+    local event = {
+        groupName = groupName,
+        settingName = setting.name,
+        value = value,
+    }
+    if isPlayerScript and isGlobalScope(setting.scope) then
+        core.sendGlobalEvent(EVENTS.SettingSet, event)
+        return
+    end
+
+    local scopeSection = scopes[setting.scope]
+    if not scopeSection:get(groupName) then
+        scopeSection:set(groupName, {})
+    end
+    local copy = scopeSection:getCopy(groupName)
+    copy[setting.name] = value
+    scopeSection:set(groupName, copy)
+
+    notifySettingChange(setting.scope, event)
+end
+
+local groupMeta = {
+    __index = {
+        get = function(self, settingName)
+            return getSettingValue(self.name, settingName)
+        end,
+        set = function(self, settingName, value)
+            setSettingValue(self.name, settingName, value)
+        end,
+        onChange = function(self, callback)
+            table.insert(self.__callbacks, callback)
+        end,
+        __changed = function(self, settingName, value)
+            for _, callback in ipairs(self.__callbacks) do
+                callback(settingName, value)
+            end
+        end,
+    },
+}
+local cachedGroups = {}
+local function getGroup(groupName)
+    if not cachedGroups[groupName] then
+        cachedGroups[groupName] = setmetatable({
+            name = groupName,
+            __callbacks = {},
+        }, groupMeta)
+    end
+    return cachedGroups[groupName]
+end
+
+return {
+    EVENTS = EVENTS,
+    SCOPE = SCOPE,
+    scopes = scopes,
+    groups = groups,
+    getGroup = getGroup,
+}
\ No newline at end of file
diff --git a/files/builtin_scripts/scripts/omw/settings/global.lua b/files/builtin_scripts/scripts/omw/settings/global.lua
new file mode 100644
index 0000000000..148d21847a
--- /dev/null
+++ b/files/builtin_scripts/scripts/omw/settings/global.lua
@@ -0,0 +1,30 @@
+local common = require('scripts.omw.settings.common')
+local register = require('scripts.omw.settings.register')
+
+local saveScope = common.scopes[common.SCOPE.SaveGlobal]
+return {
+    interfaceName = 'Settings',
+    interface = {
+        SCOPE = common.SCOPE,
+        getGroup = common.getGroup,
+        registerGroup = register.registerGroup,
+    },
+    engineHandlers = {
+        onLoad = function(saved)
+            common.groups:reset()
+            saveScope:reset(saved)
+        end,
+        onSave = function()
+            return saveScope:asTable()
+        end,
+        onPlayerAdded = register.onPlayerAdded,
+    },
+    eventHandlers = {
+        [common.EVENTS.SettingChanged] = function(e)
+            common.getGroup(e.groupName):__changed(e.settingName, e.value)
+        end,
+        [common.EVENTS.SettingSet] = function(e)
+            common.getGroup(e.groupName):set(e.settingName, e.value)
+        end,
+    }
+}
\ No newline at end of file
diff --git a/files/builtin_scripts/scripts/omw/settings/interface.lua b/files/builtin_scripts/scripts/omw/settings/interface.lua
new file mode 100644
index 0000000000..4fb60d2c4d
--- /dev/null
+++ b/files/builtin_scripts/scripts/omw/settings/interface.lua
@@ -0,0 +1,51 @@
+return function(player)
+    local core = require('openmw.core')
+    local types = require('openmw.types')
+    local world = not player and require('openmw.world')
+    
+
+    local sections = require('scripts.omw.settings.sections')
+    local render = player and require('scripts.omw.settings.render') or nil
+
+    local settingChangeEvent = 'omwSettingChanged'
+    local globalSetEvent = 'omwSettingGlobalSet'
+    local registerEvent = 'omwSettingGroupRegistered'
+
+    local groups, scopes, SCOPE, isGlobal = sections.groups, sections.scopes, sections.SCOPE, sections.isGlobal
+
+
+
+    local saveScope = scopes[player and SCOPE.SavePlayer or SCOPE.SaveGlobal]
+    return {
+        interfaceName = 'Settings',
+        interface = {
+            getGroup = getGroup,
+            SCOPE = SCOPE,
+            registerGroup = not player and require('scripts.omw.settings.register') or nil,
+            registerType = player and render.registerType or nil,
+        },
+        engineHandlers = {
+            onLoad = function(saved)
+                if not player then groups:reset() end
+                saveScope:reset(saved)
+            end,
+            onSave = function()
+                return saveScope:asTable()
+            end,
+        },
+        eventHandlers = {
+            [settingChangeEvent] = function(e)
+                getGroup(e.groupName):__changed(e.settingName, e.value)
+            end,
+            [globalSetEvent] = not player and function(e)
+                local setting = getSetting(e.groupName, e.settingName)
+                if isGlobal(setting.scope) then
+                    setSettingValue(e.groupName, e.settingName, e.value)
+                else
+                    error(('Unexpected Setting event for a non-global setting %s'):format(e.settingName))
+                end
+            end or nil,
+            [registerEvent] = player and render.onGroupRegistered or nil,
+        }
+    }
+end
\ No newline at end of file
diff --git a/files/builtin_scripts/scripts/omw/settings/player.lua b/files/builtin_scripts/scripts/omw/settings/player.lua
new file mode 100644
index 0000000000..42e333a4be
--- /dev/null
+++ b/files/builtin_scripts/scripts/omw/settings/player.lua
@@ -0,0 +1,26 @@
+local common = require('scripts.omw.settings.common')
+local render = require('scripts.omw.settings.render')
+
+local saveScope = common.scopes[common.SCOPE.SavePlayer]
+return {
+    interfaceName = 'Settings',
+    interface = {
+        SCOPE = common.SCOPE,
+        getGroup = common.getGroup,
+        registerRenderer = render.registerRenderer,
+    },
+    engineHandlers = {
+        onLoad = function(saved)
+            saveScope:reset(saved)
+        end,
+        onSave = function()
+            return saveScope:asTable()
+        end,
+    },
+    eventHandlers = {
+        [common.EVENTS.SettingChanged] = function(e)
+            common.getGroup(e.groupName):__changed(e.settingName, e.value)
+        end,
+        [common.EVENTS.GroupRegistered] = render.onGroupRegistered,
+    }
+}
\ No newline at end of file
diff --git a/files/builtin_scripts/scripts/omw/settings/register.lua b/files/builtin_scripts/scripts/omw/settings/register.lua
new file mode 100644
index 0000000000..93dcfc18bb
--- /dev/null
+++ b/files/builtin_scripts/scripts/omw/settings/register.lua
@@ -0,0 +1,76 @@
+local world = require('openmw.world')
+local types = require('openmw.types')
+
+local common = require('scripts.omw.settings.common')
+
+local groups, SCOPE = common.groups, common.SCOPE
+
+local function validScope(scope)
+    local valid = false
+    for _, v in pairs(SCOPE) do
+        if v == scope then
+            valid = true
+            break
+        end
+    end
+    return valid
+end
+
+local function validateSettingOptions(options)
+    if type(options.name) ~= 'string' then
+        error('Setting must have a name')
+    end
+    if options.default == nil then
+        error('Setting must have a default value')
+    end
+    if type(options.description) ~= 'string' then
+        error('Setting must have a description')
+    end
+    if not validScope(options.scope) then
+        error(('Invalid setting scope %s'):format(options.scope))
+    end
+    if type(options.renderer) ~= 'string' then
+        error('Setting must have a renderer')
+    end
+end
+
+local function addSetting(group, options)
+    validateSettingOptions(options)
+    if group[options.name] then
+        error(('Duplicate setting name %s'):format(options.name))
+    end
+    group[options.name] = {
+        name = options.name,
+        scope = options.scope or SCOPE.Global,
+        default = options.default,
+        description = options.description,
+        renderer = options.renderer,
+    }
+end
+
+local function registerGroup(groupName, list)
+    if groups:get(groupName) then
+        print(('Overwriting group %s'):format(groupName))
+    end
+    local settings = {}
+    for _, opt in ipairs(list) do
+        addSetting(settings, opt)
+    end
+    groups:set(groupName, settings)
+    for _, a in ipairs(world.activeActors) do
+        if a.type == types.Player and a:isValid() then
+            a:sendEvent(common.EVENTS.GroupRegistered, groupName)
+        end
+    end
+end
+
+local function onPlayerAdded(player)
+    for groupName in pairs(groups:asTable()) do
+        player:sendEvent(common.EVENTS.GroupRegistered, groupName)
+    end
+end
+
+return {
+    registerGroup = registerGroup,
+    onPlayerAdded = onPlayerAdded,
+}
\ No newline at end of file
diff --git a/files/builtin_scripts/scripts/omw/settings/render.lua b/files/builtin_scripts/scripts/omw/settings/render.lua
new file mode 100644
index 0000000000..e77badcff7
--- /dev/null
+++ b/files/builtin_scripts/scripts/omw/settings/render.lua
@@ -0,0 +1,61 @@
+local ui = require('openmw.ui')
+local util = require('openmw.util')
+
+local common = require('scripts.omw.settings.common')
+
+local renderers = {}
+local function registerRenderer(name, renderFunction)
+    renderers[name] = renderFunction
+end
+
+local groupOptions = {}
+
+local function renderSetting(groupName, setting, value, index)
+    local renderFunction = renderers[setting.renderer]
+    if not renderFunction then
+        error(('Setting %s of %s has unknown renderer %s'):format(setting.name, groupName, setting.renderer))
+    end
+    local layout = renderFunction(setting, value or setting.default, function(value)
+        local group = common.getGroup(groupName)
+        group:set(setting.name, value)
+        local element = groupOptions[groupName].element
+        element.layout.content[setting.name] = renderSetting(groupName, setting, value, index)
+        element:update()
+    end)
+    layout.name = setting.name
+    -- temporary hacky position and size
+    layout.props = layout.props or {}
+    layout.props.position = util.vector2(0, 100 * (index - 1))
+    layout.props.size = util.vector2(400, 100)
+    return layout
+end
+
+local function onGroupRegistered(groupName)
+    local group = common.groups:get(groupName)
+    local layout = {
+        content = ui.content{},
+    }
+    local searchHints = { groupName }
+    local count = 0
+    for _, setting in pairs(group) do
+        count = count + 1
+        layout.content:add(renderSetting(groupName, setting, setting.default, count))
+        table.insert(searchHints, setting.name)
+    end
+    layout.props = {
+        size = util.vector2(400, 100 * count)
+    }
+    local options = {
+        name = groupName,
+        element = ui.create(layout),
+        searchHints = table.concat(searchHints, ' '),
+    }
+    groupOptions[groupName] = options
+    print(('registering group %s'):format(groupName))
+    ui.registerSettingsPage(options)
+end
+
+return {
+    onGroupRegistered = onGroupRegistered,
+    registerRenderer = registerRenderer,
+}
\ No newline at end of file

From aea2c019de175c1ff64e5799d85c4faec3dc5af7 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Tue, 29 Mar 2022 20:17:48 +0200
Subject: [PATCH 2392/2859] Fix content names for layouts inserted with :add()

---
 components/lua_ui/content.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/components/lua_ui/content.cpp b/components/lua_ui/content.cpp
index 6f9cf61f2f..e7cf474bc9 100644
--- a/components/lua_ui/content.cpp
+++ b/components/lua_ui/content.cpp
@@ -44,11 +44,10 @@ namespace LuaUi
 
     void Content::insert(size_t index, const sol::table& table)
     {
-        size_t size = mOrdered.size();
-        if (size < index)
+        if (mOrdered.size() < index)
             throw std::logic_error("Can't have gaps in UI Content.");
         mOrdered.insert(mOrdered.begin() + index, table);
-        for (size_t i = index; i < size; ++i)
+        for (size_t i = index; i < mOrdered.size(); ++i)
         {
             sol::optional<std::string> name = mOrdered[i]["name"];
             if (name.has_value())

From 1f5e3b78d4c0dcbeb4a9a6e0c5c8f36629120ba6 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Thu, 7 Apr 2022 17:43:03 +0200
Subject: [PATCH 2393/2859] Use Flex, don't force re-renders on layout table
 changes

---
 components/lua_ui/element.cpp                    |  3 +--
 components/lua_ui/flex.cpp                       |  1 +
 .../scripts/omw/settings/render.lua              | 16 +++++++---------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/components/lua_ui/element.cpp b/components/lua_ui/element.cpp
index 46eb543cca..9f70cfc1da 100644
--- a/components/lua_ui/element.cpp
+++ b/components/lua_ui/element.cpp
@@ -55,8 +55,7 @@ namespace LuaUi
         {
             WidgetExtension* ext = children[i];
             sol::table newLayout = content.at(i);
-            if (ext->widget()->getTypeName() == widgetType(newLayout)
-                && ext->getLayout() == newLayout)
+            if (ext->widget()->getTypeName() == widgetType(newLayout))
             {
                 updateWidget(ext, newLayout);
             }
diff --git a/components/lua_ui/flex.cpp b/components/lua_ui/flex.cpp
index e90fba2a1a..dfe943a02f 100644
--- a/components/lua_ui/flex.cpp
+++ b/components/lua_ui/flex.cpp
@@ -71,6 +71,7 @@ namespace LuaUi
             w->forcePosition(childPosition);
             primary(size) += static_cast<int>(growFactor * getGrow(w));
             w->forceSize(size);
+            w->updateCoord();
             primary(childPosition) += primary(size);
             w->updateCoord();
         }
diff --git a/files/builtin_scripts/scripts/omw/settings/render.lua b/files/builtin_scripts/scripts/omw/settings/render.lua
index e77badcff7..0f9249a390 100644
--- a/files/builtin_scripts/scripts/omw/settings/render.lua
+++ b/files/builtin_scripts/scripts/omw/settings/render.lua
@@ -19,32 +19,30 @@ local function renderSetting(groupName, setting, value, index)
         local group = common.getGroup(groupName)
         group:set(setting.name, value)
         local element = groupOptions[groupName].element
-        element.layout.content[setting.name] = renderSetting(groupName, setting, value, index)
+        local settingLayout = renderSetting(groupName, setting, value, index)
+        settingLayout.name = setting.name
+        element.layout.content[setting.name] = settingLayout
         element:update()
     end)
     layout.name = setting.name
-    -- temporary hacky position and size
-    layout.props = layout.props or {}
-    layout.props.position = util.vector2(0, 100 * (index - 1))
-    layout.props.size = util.vector2(400, 100)
     return layout
 end
 
 local function onGroupRegistered(groupName)
     local group = common.groups:get(groupName)
     local layout = {
+        type = ui.TYPE.Flex,
         content = ui.content{},
     }
     local searchHints = { groupName }
     local count = 0
     for _, setting in pairs(group) do
         count = count + 1
-        layout.content:add(renderSetting(groupName, setting, setting.default, count))
+        local settingLayout = renderSetting(groupName, setting, setting.default, count)
+        settingLayout.name = setting.name
+        layout.content:add(settingLayout)
         table.insert(searchHints, setting.name)
     end
-    layout.props = {
-        size = util.vector2(400, 100 * count)
-    }
     local options = {
         name = groupName,
         element = ui.create(layout),

From a0c0c39a8cde66a402726f35129eedb79976de50 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sat, 9 Apr 2022 19:58:32 +0200
Subject: [PATCH 2394/2859] Separate setting keys and names, support
 localization

---
 .../scripts/omw/settings/common.lua           | 58 ++++++-------
 .../scripts/omw/settings/player.lua           |  1 +
 .../scripts/omw/settings/register.lua         | 19 ++---
 .../scripts/omw/settings/render.lua           | 81 ++++++++++++++-----
 4 files changed, 95 insertions(+), 64 deletions(-)

diff --git a/files/builtin_scripts/scripts/omw/settings/common.lua b/files/builtin_scripts/scripts/omw/settings/common.lua
index f6645b3a11..ec7afcae22 100644
--- a/files/builtin_scripts/scripts/omw/settings/common.lua
+++ b/files/builtin_scripts/scripts/omw/settings/common.lua
@@ -52,28 +52,28 @@ local function isGlobalScope(scope)
     return scope == SCOPE.Global or scope == SCOPE.SaveGlobal
 end
 
-local function getSetting(groupName, settingName)
-    local group = groups:get(groupName)
+local function getSetting(groupKey, settingKey)
+    local group = groups:get(groupKey)
     if not group then
         error('Unknown group')
     end
-    local setting = group[settingName]
+    local setting = group[settingKey]
     if not setting then
         error('Unknown setting')
     end
     return setting
 end
 
-local function getSettingValue(groupName, settingName)
-    local setting = getSetting(groupName, settingName)
+local function getSettingValue(groupKey, settingKey)
+    local setting = getSetting(groupKey, settingKey)
     local scopeSection = scopes[setting.scope]
     if not scopeSection then
-        error(('Setting %s is not available in this context'):format(setting.name))
+        error(('Setting %s is not available in this context'):format(setting.key))
     end
-    if not scopeSection:get(groupName) then
-        scopeSection:set(groupName, {})
+    if not scopeSection:get(groupKey) then
+        scopeSection:set(groupKey, {})
     end
-    return scopeSection:get(groupName)[setting.name] or setting.default
+    return scopeSection:get(groupKey)[setting.key] or setting.default
 end
 
 local function notifySettingChange(scope, event)
@@ -89,11 +89,11 @@ local function notifySettingChange(scope, event)
     end
 end
 
-local function setSettingValue(groupName, settingName, value)
-    local setting = getSetting(groupName, settingName)
+local function setSettingValue(groupKey, settingKey, value)
+    local setting = getSetting(groupKey, settingKey)
     local event = {
-        groupName = groupName,
-        settingName = setting.name,
+        groupName = groupKey,
+        settingName = setting.key,
         value = value,
     }
     if isPlayerScript and isGlobalScope(setting.scope) then
@@ -102,43 +102,43 @@ local function setSettingValue(groupName, settingName, value)
     end
 
     local scopeSection = scopes[setting.scope]
-    if not scopeSection:get(groupName) then
-        scopeSection:set(groupName, {})
+    if not scopeSection:get(groupKey) then
+        scopeSection:set(groupKey, {})
     end
-    local copy = scopeSection:getCopy(groupName)
-    copy[setting.name] = value
-    scopeSection:set(groupName, copy)
+    local copy = scopeSection:getCopy(groupKey)
+    copy[setting.key] = value
+    scopeSection:set(groupKey, copy)
 
     notifySettingChange(setting.scope, event)
 end
 
 local groupMeta = {
     __index = {
-        get = function(self, settingName)
-            return getSettingValue(self.name, settingName)
+        get = function(self, settingKey)
+            return getSettingValue(self.key, settingKey)
         end,
-        set = function(self, settingName, value)
-            setSettingValue(self.name, settingName, value)
+        set = function(self, settingKey, value)
+            setSettingValue(self.key, settingKey, value)
         end,
         onChange = function(self, callback)
             table.insert(self.__callbacks, callback)
         end,
-        __changed = function(self, settingName, value)
+        __changed = function(self, settingKey, value)
             for _, callback in ipairs(self.__callbacks) do
-                callback(settingName, value)
+                callback(settingKey, value)
             end
         end,
     },
 }
 local cachedGroups = {}
-local function getGroup(groupName)
-    if not cachedGroups[groupName] then
-        cachedGroups[groupName] = setmetatable({
-            name = groupName,
+local function getGroup(groupKey)
+    if not cachedGroups[groupKey] then
+        cachedGroups[groupKey] = setmetatable({
+            key = groupKey,
             __callbacks = {},
         }, groupMeta)
     end
-    return cachedGroups[groupName]
+    return cachedGroups[groupKey]
 end
 
 return {
diff --git a/files/builtin_scripts/scripts/omw/settings/player.lua b/files/builtin_scripts/scripts/omw/settings/player.lua
index 42e333a4be..fb9a434e05 100644
--- a/files/builtin_scripts/scripts/omw/settings/player.lua
+++ b/files/builtin_scripts/scripts/omw/settings/player.lua
@@ -8,6 +8,7 @@ return {
         SCOPE = common.SCOPE,
         getGroup = common.getGroup,
         registerRenderer = render.registerRenderer,
+        localizeGroup = render.localizeGroup,
     },
     engineHandlers = {
         onLoad = function(saved)
diff --git a/files/builtin_scripts/scripts/omw/settings/register.lua b/files/builtin_scripts/scripts/omw/settings/register.lua
index 93dcfc18bb..bc8812acf6 100644
--- a/files/builtin_scripts/scripts/omw/settings/register.lua
+++ b/files/builtin_scripts/scripts/omw/settings/register.lua
@@ -17,14 +17,8 @@ local function validScope(scope)
 end
 
 local function validateSettingOptions(options)
-    if type(options.name) ~= 'string' then
-        error('Setting must have a name')
-    end
-    if options.default == nil then
-        error('Setting must have a default value')
-    end
-    if type(options.description) ~= 'string' then
-        error('Setting must have a description')
+    if type(options.key) ~= 'string' then
+        error('Setting must have a key')
     end
     if not validScope(options.scope) then
         error(('Invalid setting scope %s'):format(options.scope))
@@ -36,14 +30,13 @@ end
 
 local function addSetting(group, options)
     validateSettingOptions(options)
-    if group[options.name] then
-        error(('Duplicate setting name %s'):format(options.name))
+    if group[options.key] then
+        error(('Duplicate setting key %s'):format(options.key))
     end
-    group[options.name] = {
-        name = options.name,
+    group[options.key] = {
+        key = options.key,
         scope = options.scope or SCOPE.Global,
         default = options.default,
-        description = options.description,
         renderer = options.renderer,
     }
 end
diff --git a/files/builtin_scripts/scripts/omw/settings/render.lua b/files/builtin_scripts/scripts/omw/settings/render.lua
index 0f9249a390..17217aab6f 100644
--- a/files/builtin_scripts/scripts/omw/settings/render.lua
+++ b/files/builtin_scripts/scripts/omw/settings/render.lua
@@ -9,51 +9,88 @@ local function registerRenderer(name, renderFunction)
 end
 
 local groupOptions = {}
+local localization = {}
 
-local function renderSetting(groupName, setting, value, index)
+local function renderSetting(groupKey, setting, value, index)
     local renderFunction = renderers[setting.renderer]
     if not renderFunction then
-        error(('Setting %s of %s has unknown renderer %s'):format(setting.name, groupName, setting.renderer))
+        error(('Setting %s of %s has unknown renderer %s'):format(setting.key, groupKey, setting.renderer))
     end
-    local layout = renderFunction(setting, value or setting.default, function(value)
-        local group = common.getGroup(groupName)
-        group:set(setting.name, value)
-        local element = groupOptions[groupName].element
-        local settingLayout = renderSetting(groupName, setting, value, index)
-        settingLayout.name = setting.name
-        element.layout.content[setting.name] = settingLayout
+    local loc = localization[groupKey] and localization[groupKey].settings[setting.key] or {
+        name = setting.key,
+        description = '',
+    }
+    local layout = renderFunction(loc, value or setting.default, function(value)
+        local group = common.getGroup(groupKey)
+        group:set(setting.key, value)
+        local element = groupOptions[groupKey].element
+        local settingLayout = renderSetting(groupKey, setting, value, index)
+        settingLayout.name = setting.key
+        element.layout.content.settings.content[setting.key] = settingLayout
         element:update()
     end)
-    layout.name = setting.name
+    layout.name = setting.key
     return layout
 end
 
-local function onGroupRegistered(groupName)
-    local group = common.groups:get(groupName)
-    local layout = {
+local function updateLocalization(groupKey)
+    local loc = localization[groupKey]
+    local options = groupOptions[groupKey]
+    if not options or not loc then return end
+    local searchHints = { loc.name, loc.description }
+    options.name = loc.name
+    options.searchHints = table.concat(searchHints, ' ')
+    local layout = options.element.layout
+    layout.content.header.props.text = loc.description
+end
+
+local function onGroupRegistered(groupKey)
+    local group = common.groups:get(groupKey)
+    local settingsLayout = {
+        name = 'settings',
         type = ui.TYPE.Flex,
         content = ui.content{},
     }
-    local searchHints = { groupName }
     local count = 0
     for _, setting in pairs(group) do
         count = count + 1
-        local settingLayout = renderSetting(groupName, setting, setting.default, count)
-        settingLayout.name = setting.name
-        layout.content:add(settingLayout)
-        table.insert(searchHints, setting.name)
+        local settingLayout = renderSetting(groupKey, setting, setting.default, count)
+        settingLayout.key = setting.key
+        settingsLayout.content:add(settingLayout)
     end
+    local layout = {
+        type = ui.TYPE.Flex,
+        content = ui.content {
+            {
+                name = 'header',
+                type = ui.TYPE.Text,
+                props = {
+                    text = '',
+                    textSize = 30,
+                    textColor = util.color.rgb(1, 1, 1),
+                },
+            },
+            settingsLayout,
+        },
+    }
     local options = {
-        name = groupName,
+        name = groupKey,
         element = ui.create(layout),
-        searchHints = table.concat(searchHints, ' '),
+        searchHints = '',
     }
-    groupOptions[groupName] = options
-    print(('registering group %s'):format(groupName))
+    groupOptions[groupKey] = options
+    updateLocalization(groupKey)
+    print(('registering group %s'):format(groupKey))
     ui.registerSettingsPage(options)
 end
 
+local function localizeGroup(groupKey, loc)
+    localization[groupKey] = loc
+    updateLocalization(groupKey)
+end
+
 return {
     onGroupRegistered = onGroupRegistered,
     registerRenderer = registerRenderer,
+    localizeGroup = localizeGroup,
 }
\ No newline at end of file

From 711f982e1941915f1b99454a03b32f088670f486 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Wed, 13 Apr 2022 20:08:33 +0200
Subject: [PATCH 2395/2859] Simplify renderers, standard setting reset

---
 .../scripts/omw/settings/player.lua           | 18 +++++
 .../scripts/omw/settings/register.lua         |  1 +
 .../scripts/omw/settings/render.lua           | 80 ++++++++++++-------
 3 files changed, 72 insertions(+), 27 deletions(-)

diff --git a/files/builtin_scripts/scripts/omw/settings/player.lua b/files/builtin_scripts/scripts/omw/settings/player.lua
index fb9a434e05..1f55380ccc 100644
--- a/files/builtin_scripts/scripts/omw/settings/player.lua
+++ b/files/builtin_scripts/scripts/omw/settings/player.lua
@@ -1,5 +1,23 @@
 local common = require('scripts.omw.settings.common')
 local render = require('scripts.omw.settings.render')
+local ui = require('openmw.ui')
+local async = require('openmw.async')
+local util = require('openmw.util')
+
+render.registerRenderer('text', function(value, set, arg)
+    return {
+        type = ui.TYPE.TextEdit,
+        props = {
+            size = util.vector2(arg and arg.size or 300, 100),
+            text = value,
+            textColor = util.color.rgb(1, 1, 1),
+            textSize = 30,
+        },
+        events = {
+            textChanged = async:callback(function(s) set(s) end),
+        },
+    }
+end)
 
 local saveScope = common.scopes[common.SCOPE.SavePlayer]
 return {
diff --git a/files/builtin_scripts/scripts/omw/settings/register.lua b/files/builtin_scripts/scripts/omw/settings/register.lua
index bc8812acf6..29f4263fa8 100644
--- a/files/builtin_scripts/scripts/omw/settings/register.lua
+++ b/files/builtin_scripts/scripts/omw/settings/register.lua
@@ -38,6 +38,7 @@ local function addSetting(group, options)
         scope = options.scope or SCOPE.Global,
         default = options.default,
         renderer = options.renderer,
+        argument = options.argument,
     }
 end
 
diff --git a/files/builtin_scripts/scripts/omw/settings/render.lua b/files/builtin_scripts/scripts/omw/settings/render.lua
index 17217aab6f..9fc42bb72e 100644
--- a/files/builtin_scripts/scripts/omw/settings/render.lua
+++ b/files/builtin_scripts/scripts/omw/settings/render.lua
@@ -1,5 +1,6 @@
 local ui = require('openmw.ui')
 local util = require('openmw.util')
+local async = require('openmw.async')
 
 local common = require('scripts.omw.settings.common')
 
@@ -11,26 +12,55 @@ end
 local groupOptions = {}
 local localization = {}
 
-local function renderSetting(groupKey, setting, value, index)
+local function renderSetting(groupKey, setting, value)
     local renderFunction = renderers[setting.renderer]
     if not renderFunction then
         error(('Setting %s of %s has unknown renderer %s'):format(setting.key, groupKey, setting.renderer))
     end
-    local loc = localization[groupKey] and localization[groupKey].settings[setting.key] or {
-        name = setting.key,
-        description = '',
-    }
-    local layout = renderFunction(loc, value or setting.default, function(value)
+    local settingName = localization[groupKey]
+        and localization[groupKey].settings[setting.key].name
+        or setting.key
+    local set = function(value)
         local group = common.getGroup(groupKey)
         group:set(setting.key, value)
-        local element = groupOptions[groupKey].element
-        local settingLayout = renderSetting(groupKey, setting, value, index)
-        settingLayout.name = setting.key
-        element.layout.content.settings.content[setting.key] = settingLayout
-        element:update()
-    end)
-    layout.name = setting.key
-    return layout
+        renderSetting(groupKey, setting, value)
+    end
+    local element = groupOptions[groupKey].element
+    local settingsLayout = element.layout.content.settings
+    settingsLayout.content[setting.key] = {
+        name = setting.key,
+        type = ui.TYPE.Flex,
+        props = {
+            horizontal = true,
+            align = ui.ALIGNMENT.Start,
+            arrange = ui.ALIGNMENT.Center,
+        },
+        content = ui.content {
+            {
+                type = ui.TYPE.Text,
+                props = {
+                    text = settingName .. ':',
+                    textColor = util.color.rgb(1, 1, 1),
+                    textSize = 30,
+                },
+            },
+            renderFunction(value or setting.default, set, setting.argument),
+            {
+                type = ui.TYPE.Text,
+                props = {
+                    text = 'Reset',
+                    textColor = util.color.rgb(1, 1, 1),
+                    textSize = 30,
+                },
+                events = {
+                    mouseClick = async:callback(function()
+                        set(setting.default)
+                    end),
+                },
+            },
+        },
+    }
+    element:update()
 end
 
 local function updateLocalization(groupKey)
@@ -46,18 +76,6 @@ end
 
 local function onGroupRegistered(groupKey)
     local group = common.groups:get(groupKey)
-    local settingsLayout = {
-        name = 'settings',
-        type = ui.TYPE.Flex,
-        content = ui.content{},
-    }
-    local count = 0
-    for _, setting in pairs(group) do
-        count = count + 1
-        local settingLayout = renderSetting(groupKey, setting, setting.default, count)
-        settingLayout.key = setting.key
-        settingsLayout.content:add(settingLayout)
-    end
     local layout = {
         type = ui.TYPE.Flex,
         content = ui.content {
@@ -70,7 +88,11 @@ local function onGroupRegistered(groupKey)
                     textColor = util.color.rgb(1, 1, 1),
                 },
             },
-            settingsLayout,
+            {
+                name = 'settings',
+                type = ui.TYPE.Flex,
+                content = ui.content{},
+            },
         },
     }
     local options = {
@@ -79,6 +101,10 @@ local function onGroupRegistered(groupKey)
         searchHints = '',
     }
     groupOptions[groupKey] = options
+    for _, setting in pairs(group) do
+        layout.content.settings.content:add({ name = setting.key })
+        renderSetting(groupKey, setting, setting.default)
+    end
     updateLocalization(groupKey)
     print(('registering group %s'):format(groupKey))
     ui.registerSettingsPage(options)

From 76b16f57dab8d8a0a8331c9dc667c7e9f26e47fc Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sat, 16 Apr 2022 10:41:20 +0200
Subject: [PATCH 2396/2859] Change settings localization, add group name and
 description

---
 .../scripts/omw/settings/common.lua           |   2 +-
 .../scripts/omw/settings/player.lua           |   6 +-
 .../scripts/omw/settings/register.lua         |  58 +++++--
 .../scripts/omw/settings/render.lua           | 155 +++++++++++-------
 4 files changed, 148 insertions(+), 73 deletions(-)

diff --git a/files/builtin_scripts/scripts/omw/settings/common.lua b/files/builtin_scripts/scripts/omw/settings/common.lua
index ec7afcae22..6f6cebb2cf 100644
--- a/files/builtin_scripts/scripts/omw/settings/common.lua
+++ b/files/builtin_scripts/scripts/omw/settings/common.lua
@@ -57,7 +57,7 @@ local function getSetting(groupKey, settingKey)
     if not group then
         error('Unknown group')
     end
-    local setting = group[settingKey]
+    local setting = group.settings[settingKey]
     if not setting then
         error('Unknown setting')
     end
diff --git a/files/builtin_scripts/scripts/omw/settings/player.lua b/files/builtin_scripts/scripts/omw/settings/player.lua
index 1f55380ccc..b4cf75b127 100644
--- a/files/builtin_scripts/scripts/omw/settings/player.lua
+++ b/files/builtin_scripts/scripts/omw/settings/player.lua
@@ -8,10 +8,11 @@ render.registerRenderer('text', function(value, set, arg)
     return {
         type = ui.TYPE.TextEdit,
         props = {
-            size = util.vector2(arg and arg.size or 300, 100),
+            size = util.vector2(arg and arg.size or 300, 30),
             text = value,
             textColor = util.color.rgb(1, 1, 1),
-            textSize = 30,
+            textSize = 15,
+            textAlignV = ui.ALIGNMENT.Center,
         },
         events = {
             textChanged = async:callback(function(s) set(s) end),
@@ -26,7 +27,6 @@ return {
         SCOPE = common.SCOPE,
         getGroup = common.getGroup,
         registerRenderer = render.registerRenderer,
-        localizeGroup = render.localizeGroup,
     },
     engineHandlers = {
         onLoad = function(saved)
diff --git a/files/builtin_scripts/scripts/omw/settings/register.lua b/files/builtin_scripts/scripts/omw/settings/register.lua
index 29f4263fa8..ca41843e00 100644
--- a/files/builtin_scripts/scripts/omw/settings/register.lua
+++ b/files/builtin_scripts/scripts/omw/settings/register.lua
@@ -26,34 +26,70 @@ local function validateSettingOptions(options)
     if type(options.renderer) ~= 'string' then
         error('Setting must have a renderer')
     end
+    if type(options.name) ~= 'string' then
+        error('Setting must have a name localization key')
+    end
+    if type(options.description) ~= 'string' then
+        error('Setting must have a descripiton localization key')
+    end
 end
 
-local function addSetting(group, options)
+local function addSetting(settings, options)
     validateSettingOptions(options)
-    if group[options.key] then
+    if settings[options.key] then
         error(('Duplicate setting key %s'):format(options.key))
     end
-    group[options.key] = {
+    settings[options.key] = {
         key = options.key,
         scope = options.scope or SCOPE.Global,
         default = options.default,
         renderer = options.renderer,
         argument = options.argument,
+
+        name = options.name,
+        description = options.description,
     }
 end
 
-local function registerGroup(groupName, list)
-    if groups:get(groupName) then
-        print(('Overwriting group %s'):format(groupName))
+local function validateGroupOptions(options)
+    if type(options.key) ~= 'string' then
+        error('Group must have a key')
+    end
+    if type(options.localization) ~= 'string' then
+        error('Group must have a localization context')
+    end
+    if type(options.name) ~= 'string' then
+        error('Group must have a name localization key')
+    end
+    if type(options.description) ~= 'string' then
+        error('Group must have a description localization key')
+    end
+    if type(options.settings) ~= 'table' then
+        error('Group must have a table of settings')
     end
-    local settings = {}
-    for _, opt in ipairs(list) do
-        addSetting(settings, opt)
+end
+
+local function registerGroup(options)
+    validateGroupOptions(options)
+    if groups:get(options.key) then
+        print(('Overwriting group %s'):format(options.key))
+    end
+    local group = {
+        key = options.key,
+        localization = options.localization,
+
+        name = options.name,
+        description = options.description,
+
+        settings = {},
+    }
+    for _, opt in ipairs(options.settings) do
+        addSetting(group.settings, opt)
     end
-    groups:set(groupName, settings)
+    groups:set(options.key, group)
     for _, a in ipairs(world.activeActors) do
         if a.type == types.Player and a:isValid() then
-            a:sendEvent(common.EVENTS.GroupRegistered, groupName)
+            a:sendEvent(common.EVENTS.GroupRegistered, options.key)
         end
     end
 end
diff --git a/files/builtin_scripts/scripts/omw/settings/render.lua b/files/builtin_scripts/scripts/omw/settings/render.lua
index 9fc42bb72e..57368a6a15 100644
--- a/files/builtin_scripts/scripts/omw/settings/render.lua
+++ b/files/builtin_scripts/scripts/omw/settings/render.lua
@@ -1,6 +1,7 @@
 local ui = require('openmw.ui')
 local util = require('openmw.util')
 local async = require('openmw.async')
+local core = require('openmw.core')
 
 local common = require('scripts.omw.settings.common')
 
@@ -10,84 +11,122 @@ local function registerRenderer(name, renderFunction)
 end
 
 local groupOptions = {}
-local localization = {}
+
+
+local padding = function(size)
+    return {
+        props = {
+            size = util.vector2(size, size),
+        }
+    }
+end
+
+local header = {
+    props = {
+        textColor = util.color.rgb(1, 1, 1),
+        textSize = 30,
+    },
+}
+
+local normal = {
+    props = {
+        textColor = util.color.rgb(1, 1, 1),
+        textSize = 25,
+    },
+}
 
 local function renderSetting(groupKey, setting, value)
     local renderFunction = renderers[setting.renderer]
     if not renderFunction then
         error(('Setting %s of %s has unknown renderer %s'):format(setting.key, groupKey, setting.renderer))
     end
-    local settingName = localization[groupKey]
-        and localization[groupKey].settings[setting.key].name
-        or setting.key
+    local group = common.getGroup(groupKey)
+    value = value or group:get(setting.key)
     local set = function(value)
-        local group = common.getGroup(groupKey)
         group:set(setting.key, value)
         renderSetting(groupKey, setting, value)
     end
     local element = groupOptions[groupKey].element
+    local localization = groupOptions[groupKey].localization
     local settingsLayout = element.layout.content.settings
     settingsLayout.content[setting.key] = {
         name = setting.key,
         type = ui.TYPE.Flex,
-        props = {
-            horizontal = true,
-            align = ui.ALIGNMENT.Start,
-            arrange = ui.ALIGNMENT.Center,
-        },
         content = ui.content {
             {
-                type = ui.TYPE.Text,
-                props = {
-                    text = settingName .. ':',
-                    textColor = util.color.rgb(1, 1, 1),
-                    textSize = 30,
-                },
-            },
-            renderFunction(value or setting.default, set, setting.argument),
-            {
-                type = ui.TYPE.Text,
+                type = ui.TYPE.Flex,
                 props = {
-                    text = 'Reset',
-                    textColor = util.color.rgb(1, 1, 1),
-                    textSize = 30,
+                    horizontal = true,
+                    align = ui.ALIGNMENT.Start,
+                    arrange = ui.ALIGNMENT.End,
                 },
-                events = {
-                    mouseClick = async:callback(function()
-                        set(setting.default)
-                    end),
+                content = ui.content {
+                    {
+                        type = ui.TYPE.Text,
+                        template = normal,
+                        props = {
+                            text = localization(setting.name),
+                        },
+                    },
+                    padding(10),
+                    renderFunction(value, set, setting.argument),
+                    padding(10),
+                    {
+                        type = ui.TYPE.Text,
+                        template = normal,
+                        props = {
+                            text = 'Reset',
+                        },
+                        events = {
+                            mouseClick = async:callback(function()
+                                set(setting.default)
+                            end),
+                        },
+                    },
                 },
             },
+            padding(20),
         },
     }
     element:update()
 end
 
-local function updateLocalization(groupKey)
-    local loc = localization[groupKey]
-    local options = groupOptions[groupKey]
-    if not options or not loc then return end
-    local searchHints = { loc.name, loc.description }
-    options.name = loc.name
-    options.searchHints = table.concat(searchHints, ' ')
-    local layout = options.element.layout
-    layout.content.header.props.text = loc.description
-end
-
-local function onGroupRegistered(groupKey)
+local function renderGroup(groupKey)
     local group = common.groups:get(groupKey)
-    local layout = {
+    local element = groupOptions[groupKey].element
+    local localization = groupOptions[groupKey].localization
+    element.layout = {
         type = ui.TYPE.Flex,
         content = ui.content {
+            padding(10),
             {
-                name = 'header',
-                type = ui.TYPE.Text,
+                type = ui.TYPE.Flex,
                 props = {
-                    text = '',
-                    textSize = 30,
-                    textColor = util.color.rgb(1, 1, 1),
+                    horizontal = true,
+                    align = ui.ALIGNMENT.Start,
+                    arrange = ui.ALIGNMENT.Center,
+                },
+                content = ui.content {
+                    {
+                        name = 'name',
+                        type = ui.TYPE.Text,
+                        template = header,
+                        props = {
+                            text = localization(group.name),
+                        },
+                    },
+                    padding(10),
+                    {
+                        name = 'description',
+                        type = ui.TYPE.Text,
+                        template = normal,
+                        props = {
+                            text = localization(group.description),
+                        },
+                    },
                 },
             },
+            padding(50),
             {
                 name = 'settings',
                 type = ui.TYPE.Flex,
@@ -95,28 +134,28 @@ local function onGroupRegistered(groupKey)
             },
         },
     }
+    local settingsContent = element.layout.content.settings.content
+    for _, setting in pairs(group.settings) do
+        settingsContent:add({ name = setting.key })
+        renderSetting(groupKey, setting)
+    end
+    element:update()
+end
+
+local function onGroupRegistered(groupKey)
+    local group = common.groups:get(groupKey)
     local options = {
         name = groupKey,
-        element = ui.create(layout),
+        element = ui.create{},
         searchHints = '',
+        localization = core.l10n(group.localization),
     }
     groupOptions[groupKey] = options
-    for _, setting in pairs(group) do
-        layout.content.settings.content:add({ name = setting.key })
-        renderSetting(groupKey, setting, setting.default)
-    end
-    updateLocalization(groupKey)
-    print(('registering group %s'):format(groupKey))
+    renderGroup(groupKey)
     ui.registerSettingsPage(options)
 end
 
-local function localizeGroup(groupKey, loc)
-    localization[groupKey] = loc
-    updateLocalization(groupKey)
-end
-
 return {
     onGroupRegistered = onGroupRegistered,
     registerRenderer = registerRenderer,
-    localizeGroup = localizeGroup,
 }
\ No newline at end of file

From 38e0f5c0af4587faa918a19a85d8a60cba235366 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sat, 16 Apr 2022 11:29:37 +0200
Subject: [PATCH 2397/2859] Fix a docs typo

---
 docs/source/reference/lua-scripting/widgets/flex.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/reference/lua-scripting/widgets/flex.rst b/docs/source/reference/lua-scripting/widgets/flex.rst
index 359d0d4394..2648e88996 100644
--- a/docs/source/reference/lua-scripting/widgets/flex.rst
+++ b/docs/source/reference/lua-scripting/widgets/flex.rst
@@ -24,7 +24,7 @@ Properties
     - ui.ALIGNMENT (Start)
     - Where to align the children in the main axis.
   * - arrange
-    - ui.ALIGNMETN (Start)
+    - ui.ALIGNMENT (Start)
     - How to arrange the children in the cross axis.
 
 External

From a35bc1dee0663a05ab5763beaa16ae282f59f0bc Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Mon, 18 Apr 2022 08:42:02 +0200
Subject: [PATCH 2398/2859] openmw_aux.settings, rework to support local
 scripts

---
 files/builtin_scripts/openmw_aux/settings.lua |   4 +
 .../scripts/omw/settings/common.lua           | 243 ++++++++++--------
 .../scripts/omw/settings/global.lua           |  34 ++-
 .../scripts/omw/settings/interface.lua        |  51 ----
 .../scripts/omw/settings/player.lua           |  17 +-
 .../scripts/omw/settings/register.lua         |  14 +-
 .../scripts/omw/settings/render.lua           |  22 +-
 7 files changed, 197 insertions(+), 188 deletions(-)
 create mode 100644 files/builtin_scripts/openmw_aux/settings.lua
 delete mode 100644 files/builtin_scripts/scripts/omw/settings/interface.lua

diff --git a/files/builtin_scripts/openmw_aux/settings.lua b/files/builtin_scripts/openmw_aux/settings.lua
new file mode 100644
index 0000000000..8ce9929eaa
--- /dev/null
+++ b/files/builtin_scripts/openmw_aux/settings.lua
@@ -0,0 +1,4 @@
+local common = require('scripts.omw.settings.common')
+return {
+    group = common.group,
+}
\ No newline at end of file
diff --git a/files/builtin_scripts/scripts/omw/settings/common.lua b/files/builtin_scripts/scripts/omw/settings/common.lua
index 6f6cebb2cf..bc01bc20b5 100644
--- a/files/builtin_scripts/scripts/omw/settings/common.lua
+++ b/files/builtin_scripts/scripts/omw/settings/common.lua
@@ -1,23 +1,20 @@
-local prequire = function(path)
-    local status, result = pcall(function()
-        return require(path)
-    end)
-    return status and result or nil
-end
-
+local storage = require('openmw.storage')
 local core = require('openmw.core')
 local types = require('openmw.types')
-local storage = require('openmw.storage')
-local self = prequire('openmw.self')
-local world = prequire('openmw.world')
-
-local isPlayerScript = self and true or false
-local isGlobalScript = world and true or false
+local selfObject
+do
+    local success, result = pcall(function() return require('openmw.self') end)
+    selfObject = success and result or nil
+end
+local playerObject = selfObject and selfObject.type == types.Player and selfObject or nil
 
+local eventPrefix = 'omwSettings'
 local EVENTS = {
-    SettingChanged = 'omwSettingsChanged',
-    SettingSet = 'omwSettingsGlobalSet',
-    GroupRegistered = 'omwSettingsGroupRegistered',
+    SettingChanged = eventPrefix .. 'Changed',
+    SetValue = eventPrefix .. 'GlobalSetValue',
+    GroupRegistered = eventPrefix .. 'GroupRegistered',
+    RegisterGroup = eventPrefix .. 'RegisterGroup',
+    Subscribe = eventPrefix .. 'Subscribe',
 }
 
 local SCOPE = {
@@ -27,124 +24,160 @@ local SCOPE = {
     SavePlayer = 'SavePlayer',
 }
 
-local groups = storage.globalSection('OMW_Settings_Groups')
-local saveGlobalSection = storage.globalSection('OMW_Settings_SaveGlobal')
-
-if isGlobalScript then
-    groups:removeOnExit()
-    saveGlobalSection:removeOnExit()
+local function isPlayerScope(scope)
+    return scope == SCOPE.Player or scope == SCOPE.SavePlayer
 end
 
-local savePlayerSection = nil
-if isPlayerScript then
-    savePlayerSection = storage.playerSection('OMW_Setting_SavePlayer')
-    savePlayerSection:removeOnExit()
+local function isSaveScope(scope)
+    return scope == SCOPE.SaveGlobal or scope == SCOPE.SavePlayer
 end
 
-local scopes = {
-    [SCOPE.Global] = storage.globalSection('OMW_Setting_Global'),
-    [SCOPE.Player] = isPlayerScript and storage.playerSection('OMW_Setting_Player'),
-    [SCOPE.SaveGlobal] = saveGlobalSection,
-    [SCOPE.SavePlayer] = savePlayerSection,
-}
+local prefix = 'omw_settings_'
+local settingsPattern = prefix .. 'settings_%s%s'
 
-local function isGlobalScope(scope)
-    return scope == SCOPE.Global or scope == SCOPE.SaveGlobal
+local groupsSection = storage.globalSection(prefix .. 'groups')
+if groupsSection.removeOnExit then
+    groupsSection:removeOnExit()
 end
 
-local function getSetting(groupKey, settingKey)
-    local group = groups:get(groupKey)
-    if not group then
-        error('Unknown group')
+local function values(groupKey, scope)
+    local player = isPlayerScope(scope)
+    local save = isSaveScope(scope)
+    local sectionKey = settingsPattern:format(groupKey, save and '_save' or '')
+    local section
+    if player then
+        section = storage.playerSection and storage.playerSection(sectionKey) or nil
+    else
+        section = storage.globalSection(sectionKey)
     end
-    local setting = group.settings[settingKey]
-    if not setting then
-        error('Unknown setting')
+    if save and section and section.removeOnExit then
+        section:removeOnExit()
     end
-    return setting
+    return section
 end
 
-local function getSettingValue(groupKey, settingKey)
-    local setting = getSetting(groupKey, settingKey)
-    local scopeSection = scopes[setting.scope]
-    if not scopeSection then
-        error(('Setting %s is not available in this context'):format(setting.key))
+local function saveScope(scope)
+    local saved = {}
+    for _, group in pairs(groupsSection:asTable()) do
+        saved[group.key] = values(group.key, scope):asTable()
     end
-    if not scopeSection:get(groupKey) then
-        scopeSection:set(groupKey, {})
+    return saved
+end
+
+local function loadScope(scope, saved)
+    if not saved then return end
+    for _, group in pairs(saved) do
+        values(group.key, scope):reset(saved[group.key])
     end
-    return scopeSection:get(groupKey)[setting.key] or setting.default
 end
 
-local function notifySettingChange(scope, event)
-    if isGlobalScope(scope) then
-        core.sendGlobalEvent(EVENTS.SettingChanged, event)
-        for _, a in ipairs(world.activeActors) do
-            if a.type == types.Player then
-                a:sendEvent(EVENTS.SettingChanged, event)
-            end
-        end
-    else
-        self:sendEvent(EVENTS.SettingChanged, event)
+local function groupSubscribeEvent(groupKey)
+    return ('%sSubscribe%s'):format(eventPrefix, groupKey)
+end
+
+local subscriptions = {}
+local function handleSubscription(event)
+    if not subscriptions[event.groupKey] then
+        subscriptions[event.groupKey] = {}
     end
+    table.insert(subscriptions[event.groupKey], event.object or false)
 end
 
-local function setSettingValue(groupKey, settingKey, value)
-    local setting = getSetting(groupKey, settingKey)
+local function subscribe(self)
+    local groupKey = rawget(self, 'groupKey')
     local event = {
-        groupName = groupKey,
-        settingName = setting.key,
-        value = value,
+        groupKey = groupKey,
+        object = selfObject,
     }
-    if isPlayerScript and isGlobalScope(setting.scope) then
-        core.sendGlobalEvent(EVENTS.SettingSet, event)
-        return
-    end
-
-    local scopeSection = scopes[setting.scope]
-    if not scopeSection:get(groupKey) then
-        scopeSection:set(groupKey, {})
+    core.sendGlobalEvent(EVENTS.Subscribe, event)
+    if playerObject then
+        playerObject:sendEvent(EVENTS.Subscribe, event)
     end
-    local copy = scopeSection:getCopy(groupKey)
-    copy[setting.key] = value
-    scopeSection:set(groupKey, copy)
-
-    notifySettingChange(setting.scope, event)
+    return groupSubscribeEvent(groupKey)
 end
 
 local groupMeta = {
-    __index = {
-        get = function(self, settingKey)
-            return getSettingValue(self.key, settingKey)
-        end,
-        set = function(self, settingKey, value)
-            setSettingValue(self.key, settingKey, value)
-        end,
-        onChange = function(self, callback)
-            table.insert(self.__callbacks, callback)
-        end,
-        __changed = function(self, settingKey, value)
-            for _, callback in ipairs(self.__callbacks) do
-                callback(settingKey, value)
+    __newindex = function(self, settingKey, value)
+        local group = groupsSection:get(rawget(self, 'groupKey'))
+        local setting = group.settings[settingKey]
+        if not setting then
+            error(('Setting %s does not exist'):format(settingKey))
+        end
+        local section = values(group.key, setting.scope)
+        local event = {
+            groupKey = group.key,
+            settingKey = settingKey,
+            value = value,
+        }
+        if section.set then
+            section:set(settingKey, value)
+            if playerObject then
+                playerObject:sendEvent(EVENTS.SettingChanged, event)
+            else
+                core.sendGlobalEvent(EVENTS.SettingChanged, event)
+            end
+            if subscriptions[group.key] then
+                local eventKey = groupSubscribeEvent(group.key)
+                for _, object in ipairs(subscriptions[group.key]) do
+                    if object then
+                        object:sendEvent(eventKey, event)
+                    else
+                        core.sendGlobalEvent(eventKey, event)
+                    end
+                end
             end
-        end,
-    },
+        else
+            if isPlayerScope(setting.scope) then
+                error(("Can't change player scope setting %s from global scope"):format(settingKey))
+            else
+                core.sendGlobalEvent(EVENTS.SetValue, event)
+            end
+        end
+    end,
+    __index = function(self, key)
+        if key == "subscribe" then return subscribe end
+        local settingKey = key
+        local group = groupsSection:get(rawget(self, 'groupKey'))
+        local setting = group.settings[settingKey]
+        if not setting then
+            error(('Unknown setting %s'):format(settingKey))
+        end
+        local section = rawget(self, 'sections')[setting.scope]
+        if not section then
+            error(("Can't access setting %s from scope %s"):format(settingKey, setting.scope))
+        end
+        return section:get(setting.key) or setting.default
+    end,
 }
-local cachedGroups = {}
-local function getGroup(groupKey)
-    if not cachedGroups[groupKey] then
-        cachedGroups[groupKey] = setmetatable({
-            key = groupKey,
-            __callbacks = {},
-        }, groupMeta)
+
+local function group(groupKey)
+    if not groupsSection:get(groupKey) then
+        print(("Settings group %s wasn't registered yet"):format(groupKey))
     end
-    return cachedGroups[groupKey]
+    local s = {}
+    for _, scope in pairs(SCOPE) do
+        local section = values(groupKey, scope)
+        if section then
+            s[scope] = section
+        end
+    end
+    return setmetatable({
+        groupKey = groupKey,
+        sections = s,
+    }, groupMeta)
 end
 
 return {
-    EVENTS = EVENTS,
     SCOPE = SCOPE,
-    scopes = scopes,
-    groups = groups,
-    getGroup = getGroup,
+    EVENTS = EVENTS,
+    isPlayerScope = isPlayerScope,
+    isSaveScope = isSaveScope,
+    values = values,
+    groups = function()
+        return groupsSection
+    end,
+    saveScope = saveScope,
+    loadScope = loadScope,
+    group = group,
+    handleSubscription = handleSubscription,
 }
\ No newline at end of file
diff --git a/files/builtin_scripts/scripts/omw/settings/global.lua b/files/builtin_scripts/scripts/omw/settings/global.lua
index 148d21847a..ec14a07f73 100644
--- a/files/builtin_scripts/scripts/omw/settings/global.lua
+++ b/files/builtin_scripts/scripts/omw/settings/global.lua
@@ -1,30 +1,44 @@
 local common = require('scripts.omw.settings.common')
 local register = require('scripts.omw.settings.register')
+local world = require('openmw.world')
+local types = require('openmw.types')
 
-local saveScope = common.scopes[common.SCOPE.SaveGlobal]
 return {
     interfaceName = 'Settings',
     interface = {
         SCOPE = common.SCOPE,
-        getGroup = common.getGroup,
+        group = common.group,
         registerGroup = register.registerGroup,
     },
     engineHandlers = {
         onLoad = function(saved)
-            common.groups:reset()
-            saveScope:reset(saved)
+            common.groups():reset()
+            common.loadScope(common.SCOPE.SaveGlobal, saved)
         end,
         onSave = function()
-            return saveScope:asTable()
+            common.saveScope(common.SCOPE.SaveGlobal)
         end,
         onPlayerAdded = register.onPlayerAdded,
     },
     eventHandlers = {
-        [common.EVENTS.SettingChanged] = function(e)
-            common.getGroup(e.groupName):__changed(e.settingName, e.value)
+        [common.EVENTS.SetValue] = function(event)
+            local group = common.group(event.groupKey)
+            group[event.settingKey] = event.value
         end,
-        [common.EVENTS.SettingSet] = function(e)
-            common.getGroup(e.groupName):set(e.settingName, e.value)
+        [common.EVENTS.RegisterGroup] = function(options)
+            if common.groups():get(options.key) then return end
+            register.registerGroup(options)
         end,
-    }
+        [common.EVENTS.SettingChanged] = function(event)
+            local setting = common.groups():get(event.groupKey).settings[event.settingKey]
+            if common.isPlayerScope(setting.scope) then
+                for _, a in ipairs(world.activeActors) do
+                    if a.type == types.Player and a:isValid() then
+                        a:sendEvent(common.EVENTS.SettingChanged, event)
+                    end
+                end
+            end
+        end,
+        [common.EVENTS.Subscribe] = common.handleSubscription,
+    },
 }
\ No newline at end of file
diff --git a/files/builtin_scripts/scripts/omw/settings/interface.lua b/files/builtin_scripts/scripts/omw/settings/interface.lua
deleted file mode 100644
index 4fb60d2c4d..0000000000
--- a/files/builtin_scripts/scripts/omw/settings/interface.lua
+++ /dev/null
@@ -1,51 +0,0 @@
-return function(player)
-    local core = require('openmw.core')
-    local types = require('openmw.types')
-    local world = not player and require('openmw.world')
-    
-
-    local sections = require('scripts.omw.settings.sections')
-    local render = player and require('scripts.omw.settings.render') or nil
-
-    local settingChangeEvent = 'omwSettingChanged'
-    local globalSetEvent = 'omwSettingGlobalSet'
-    local registerEvent = 'omwSettingGroupRegistered'
-
-    local groups, scopes, SCOPE, isGlobal = sections.groups, sections.scopes, sections.SCOPE, sections.isGlobal
-
-
-
-    local saveScope = scopes[player and SCOPE.SavePlayer or SCOPE.SaveGlobal]
-    return {
-        interfaceName = 'Settings',
-        interface = {
-            getGroup = getGroup,
-            SCOPE = SCOPE,
-            registerGroup = not player and require('scripts.omw.settings.register') or nil,
-            registerType = player and render.registerType or nil,
-        },
-        engineHandlers = {
-            onLoad = function(saved)
-                if not player then groups:reset() end
-                saveScope:reset(saved)
-            end,
-            onSave = function()
-                return saveScope:asTable()
-            end,
-        },
-        eventHandlers = {
-            [settingChangeEvent] = function(e)
-                getGroup(e.groupName):__changed(e.settingName, e.value)
-            end,
-            [globalSetEvent] = not player and function(e)
-                local setting = getSetting(e.groupName, e.settingName)
-                if isGlobal(setting.scope) then
-                    setSettingValue(e.groupName, e.settingName, e.value)
-                else
-                    error(('Unexpected Setting event for a non-global setting %s'):format(e.settingName))
-                end
-            end or nil,
-            [registerEvent] = player and render.onGroupRegistered or nil,
-        }
-    }
-end
\ No newline at end of file
diff --git a/files/builtin_scripts/scripts/omw/settings/player.lua b/files/builtin_scripts/scripts/omw/settings/player.lua
index b4cf75b127..39d989d5cc 100644
--- a/files/builtin_scripts/scripts/omw/settings/player.lua
+++ b/files/builtin_scripts/scripts/omw/settings/player.lua
@@ -1,8 +1,10 @@
 local common = require('scripts.omw.settings.common')
 local render = require('scripts.omw.settings.render')
+
 local ui = require('openmw.ui')
 local async = require('openmw.async')
 local util = require('openmw.util')
+local core = require('openmw.core')
 
 render.registerRenderer('text', function(value, set, arg)
     return {
@@ -20,26 +22,27 @@ render.registerRenderer('text', function(value, set, arg)
     }
 end)
 
-local saveScope = common.scopes[common.SCOPE.SavePlayer]
 return {
     interfaceName = 'Settings',
     interface = {
         SCOPE = common.SCOPE,
-        getGroup = common.getGroup,
+        group = common.group,
         registerRenderer = render.registerRenderer,
+        registerGroup = function(options)
+            core.sendGlobalEvent(common.EVENTS.RegisterGroup, options)
+        end,
     },
     engineHandlers = {
         onLoad = function(saved)
-            saveScope:reset(saved)
+            common.loadScope(common.SCOPE.SavePlayer, saved)
         end,
         onSave = function()
-            return saveScope:asTable()
+            common.saveScope(common.SCOPE.SavePlayer)
         end,
     },
     eventHandlers = {
-        [common.EVENTS.SettingChanged] = function(e)
-            common.getGroup(e.groupName):__changed(e.settingName, e.value)
-        end,
         [common.EVENTS.GroupRegistered] = render.onGroupRegistered,
+        [common.EVENTS.SettingChanged] = render.onSettingChanged,
+        [common.EVENTS.Subscribe] = common.handleSubscription,
     }
 }
\ No newline at end of file
diff --git a/files/builtin_scripts/scripts/omw/settings/register.lua b/files/builtin_scripts/scripts/omw/settings/register.lua
index ca41843e00..02a85cdeca 100644
--- a/files/builtin_scripts/scripts/omw/settings/register.lua
+++ b/files/builtin_scripts/scripts/omw/settings/register.lua
@@ -3,11 +3,9 @@ local types = require('openmw.types')
 
 local common = require('scripts.omw.settings.common')
 
-local groups, SCOPE = common.groups, common.SCOPE
-
 local function validScope(scope)
     local valid = false
-    for _, v in pairs(SCOPE) do
+    for _, v in pairs(common.SCOPE) do
         if v == scope then
             valid = true
             break
@@ -41,7 +39,7 @@ local function addSetting(settings, options)
     end
     settings[options.key] = {
         key = options.key,
-        scope = options.scope or SCOPE.Global,
+        scope = options.scope,
         default = options.default,
         renderer = options.renderer,
         argument = options.argument,
@@ -70,14 +68,14 @@ local function validateGroupOptions(options)
 end
 
 local function registerGroup(options)
+    local groups = common.groups()
     validateGroupOptions(options)
     if groups:get(options.key) then
-        print(('Overwriting group %s'):format(options.key))
-    end
+        error(('Duplicate group %s'):format(options.key))
+    end             
     local group = {
         key = options.key,
         localization = options.localization,
-
         name = options.name,
         description = options.description,
 
@@ -95,7 +93,7 @@ local function registerGroup(options)
 end
 
 local function onPlayerAdded(player)
-    for groupName in pairs(groups:asTable()) do
+    for groupName in pairs(common.groups():asTable()) do
         player:sendEvent(common.EVENTS.GroupRegistered, groupName)
     end
 end
diff --git a/files/builtin_scripts/scripts/omw/settings/render.lua b/files/builtin_scripts/scripts/omw/settings/render.lua
index 57368a6a15..bbbb8bfc6d 100644
--- a/files/builtin_scripts/scripts/omw/settings/render.lua
+++ b/files/builtin_scripts/scripts/omw/settings/render.lua
@@ -40,10 +40,10 @@ local function renderSetting(groupKey, setting, value)
     if not renderFunction then
         error(('Setting %s of %s has unknown renderer %s'):format(setting.key, groupKey, setting.renderer))
     end
-    local group = common.getGroup(groupKey)
-    value = value or group:get(setting.key)
+    local group = common.group(groupKey)
+    value = value or group[setting.key]
     local set = function(value)
-        group:set(setting.key, value)
+        group[setting.key] = value
         renderSetting(groupKey, setting, value)
     end
     local element = groupOptions[groupKey].element
@@ -92,7 +92,7 @@ local function renderSetting(groupKey, setting, value)
 end
 
 local function renderGroup(groupKey)
-    local group = common.groups:get(groupKey)
+    local group = common.groups():get(groupKey)
     local element = groupOptions[groupKey].element
     local localization = groupOptions[groupKey].localization
     element.layout = {
@@ -143,19 +143,27 @@ local function renderGroup(groupKey)
 end
 
 local function onGroupRegistered(groupKey)
-    local group = common.groups:get(groupKey)
+    local group = common.groups():get(groupKey)
+    local loc = core.l10n(group.localization)
     local options = {
-        name = groupKey,
+        name = loc(group.name),
         element = ui.create{},
         searchHints = '',
-        localization = core.l10n(group.localization),
+        localization = loc,
     }
     groupOptions[groupKey] = options
     renderGroup(groupKey)
     ui.registerSettingsPage(options)
 end
 
+local function onSettingChanged(event)
+    local group = common.groups():get(event.groupKey)
+    local setting = group.settings[event.settingKey]
+    renderSetting(event.groupKey, setting, event.value)
+end
+
 return {
     onGroupRegistered = onGroupRegistered,
+    onSettingChanged = onSettingChanged,
     registerRenderer = registerRenderer,
 }
\ No newline at end of file

From b899320e9fa9b330877ac6b865a497ca8f75df2d Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Wed, 27 Apr 2022 21:28:16 +0200
Subject: [PATCH 2399/2859] Use storage subscribe, unify groups into pages

---
 .../scripts/omw/settings/common.lua           | 259 +++++++-----------
 .../scripts/omw/settings/global.lua           |  39 +--
 .../scripts/omw/settings/player.lua           |  29 +-
 .../scripts/omw/settings/register.lua         | 104 -------
 .../scripts/omw/settings/render.lua           | 211 ++++++++++----
 5 files changed, 276 insertions(+), 366 deletions(-)
 delete mode 100644 files/builtin_scripts/scripts/omw/settings/register.lua

diff --git a/files/builtin_scripts/scripts/omw/settings/common.lua b/files/builtin_scripts/scripts/omw/settings/common.lua
index bc01bc20b5..3ea462daf9 100644
--- a/files/builtin_scripts/scripts/omw/settings/common.lua
+++ b/files/builtin_scripts/scripts/omw/settings/common.lua
@@ -1,183 +1,126 @@
 local storage = require('openmw.storage')
-local core = require('openmw.core')
-local types = require('openmw.types')
-local selfObject
-do
-    local success, result = pcall(function() return require('openmw.self') end)
-    selfObject = success and result or nil
-end
-local playerObject = selfObject and selfObject.type == types.Player and selfObject or nil
-
-local eventPrefix = 'omwSettings'
-local EVENTS = {
-    SettingChanged = eventPrefix .. 'Changed',
-    SetValue = eventPrefix .. 'GlobalSetValue',
-    GroupRegistered = eventPrefix .. 'GroupRegistered',
-    RegisterGroup = eventPrefix .. 'RegisterGroup',
-    Subscribe = eventPrefix .. 'Subscribe',
-}
-
-local SCOPE = {
-    Global = 'Global',
-    Player = 'Player',
-    SaveGlobal = 'SaveGlobal',
-    SavePlayer = 'SavePlayer',
-}
 
-local function isPlayerScope(scope)
-    return scope == SCOPE.Player or scope == SCOPE.SavePlayer
-end
-
-local function isSaveScope(scope)
-    return scope == SCOPE.SaveGlobal or scope == SCOPE.SavePlayer
-end
+local contextSection = storage.playerSection or storage.globalSection
+local groupSectionKey = 'OmwSettingGroups'
+local groupSection = contextSection(groupSectionKey)
+groupSection:removeOnExit()
 
-local prefix = 'omw_settings_'
-local settingsPattern = prefix .. 'settings_%s%s'
-
-local groupsSection = storage.globalSection(prefix .. 'groups')
-if groupsSection.removeOnExit then
-    groupsSection:removeOnExit()
-end
-
-local function values(groupKey, scope)
-    local player = isPlayerScope(scope)
-    local save = isSaveScope(scope)
-    local sectionKey = settingsPattern:format(groupKey, save and '_save' or '')
-    local section
-    if player then
-        section = storage.playerSection and storage.playerSection(sectionKey) or nil
-    else
-        section = storage.globalSection(sectionKey)
+local function validateSettingOptions(options)
+    if type(options.key) ~= 'string' then
+        error('Setting must have a key')
     end
-    if save and section and section.removeOnExit then
-        section:removeOnExit()
+    if type(options.saveOnly) ~= 'boolean' then
+        error('Setting must be save only or not')
     end
-    return section
-end
-
-local function saveScope(scope)
-    local saved = {}
-    for _, group in pairs(groupsSection:asTable()) do
-        saved[group.key] = values(group.key, scope):asTable()
+    if type(options.renderer) ~= 'string' then
+        error('Setting must have a renderer')
+    end
+    if type(options.name) ~= 'string' then
+        error('Setting must have a name localization key')
+    end
+    if type(options.description) ~= 'string' then
+        error('Setting must have a descripiton localization key')
     end
-    return saved
 end
 
-local function loadScope(scope, saved)
-    if not saved then return end
-    for _, group in pairs(saved) do
-        values(group.key, scope):reset(saved[group.key])
+local function validateGroupOptions(options)
+    if type(options.key) ~= 'string' then
+        error('Group must have a key')
+    end
+    local conventionPrefix = "Settings"
+    if options.key:sub(1, conventionPrefix:len()) ~= conventionPrefix then
+        print(("Group key %s doesn't start with %s"):format(options.key, conventionPrefix))
+    end
+    if type(options.page) ~= 'string' then
+        error('Group must belong to a page')
+    end
+    if type(options.l10n) ~= 'string' then
+        error('Group must have a localization context')
+    end
+    if type(options.name) ~= 'string' then
+        error('Group must have a name localization key')
+    end
+    if type(options.description) ~= 'string' then
+        error('Group must have a description localization key')
+    end
+    if type(options.settings) ~= 'table' then
+        error('Group must have a table of settings')
+    end
+    for _, opt in ipairs(options.settings) do
+        validateSettingOptions(opt)
     end
 end
 
-local function groupSubscribeEvent(groupKey)
-    return ('%sSubscribe%s'):format(eventPrefix, groupKey)
+local function registerSetting(options)
+    return {
+        key = options.key,
+        saveOnly = options.saveOnly,
+        default = options.default,
+        renderer = options.renderer,
+        argument = options.argument,
+
+        name = options.name,
+        description = options.description,
+    }
 end
 
-local subscriptions = {}
-local function handleSubscription(event)
-    if not subscriptions[event.groupKey] then
-        subscriptions[event.groupKey] = {}
+local function registerGroup(options)
+    validateGroupOptions(options)
+    if groupSection:get(options.key) then
+        error(('Group with key %s was already registered'):format(options.key))
     end
-    table.insert(subscriptions[event.groupKey], event.object or false)
-end
+    local group = {
+        key = options.key,
+        page = options.page,
+        l10n = options.l10n,
+        name = options.name,
+        description = options.description,
 
-local function subscribe(self)
-    local groupKey = rawget(self, 'groupKey')
-    local event = {
-        groupKey = groupKey,
-        object = selfObject,
+        settings = {},
     }
-    core.sendGlobalEvent(EVENTS.Subscribe, event)
-    if playerObject then
-        playerObject:sendEvent(EVENTS.Subscribe, event)
+    local valueSection = contextSection(options.key)
+    for _, opt in ipairs(options.settings) do
+        local setting = registerSetting(opt)
+        if group.settings[setting.key] then
+            error(('Duplicate setting key %s'):format(options.key))
+        end
+        group.settings[setting.key] = setting
+        if not valueSection:get(setting.key) then
+            valueSection:set(setting.key, setting.default)
+        end
     end
-    return groupSubscribeEvent(groupKey)
+    groupSection:set(group.key, group)
 end
 
-local groupMeta = {
-    __newindex = function(self, settingKey, value)
-        local group = groupsSection:get(rawget(self, 'groupKey'))
-        local setting = group.settings[settingKey]
-        if not setting then
-            error(('Setting %s does not exist'):format(settingKey))
-        end
-        local section = values(group.key, setting.scope)
-        local event = {
-            groupKey = group.key,
-            settingKey = settingKey,
-            value = value,
-        }
-        if section.set then
-            section:set(settingKey, value)
-            if playerObject then
-                playerObject:sendEvent(EVENTS.SettingChanged, event)
-            else
-                core.sendGlobalEvent(EVENTS.SettingChanged, event)
-            end
-            if subscriptions[group.key] then
-                local eventKey = groupSubscribeEvent(group.key)
-                for _, object in ipairs(subscriptions[group.key]) do
-                    if object then
-                        object:sendEvent(eventKey, event)
-                    else
-                        core.sendGlobalEvent(eventKey, event)
-                    end
-                end
-            end
-        else
-            if isPlayerScope(setting.scope) then
-                error(("Can't change player scope setting %s from global scope"):format(settingKey))
-            else
-                core.sendGlobalEvent(EVENTS.SetValue, event)
-            end
-        end
+return {
+    getSection = function(global, key)
+        return (global and storage.globalSection or storage.playerSection)(key)
     end,
-    __index = function(self, key)
-        if key == "subscribe" then return subscribe end
-        local settingKey = key
-        local group = groupsSection:get(rawget(self, 'groupKey'))
-        local setting = group.settings[settingKey]
-        if not setting then
-            error(('Unknown setting %s'):format(settingKey))
-        end
-        local section = rawget(self, 'sections')[setting.scope]
-        if not section then
-            error(("Can't access setting %s from scope %s"):format(settingKey, setting.scope))
+    setGlobalEvent = 'OMWSettingsGlobalSet',
+    groupSectionKey = groupSectionKey,
+    onLoad = function(saved)
+        if not saved then return end
+        for groupKey, settings in pairs(saved) do
+            local section = contextSection(groupKey)
+            for key, value in pairs(settings) do
+                section:set(key, value)
+            end
         end
-        return section:get(setting.key) or setting.default
     end,
-}
-
-local function group(groupKey)
-    if not groupsSection:get(groupKey) then
-        print(("Settings group %s wasn't registered yet"):format(groupKey))
-    end
-    local s = {}
-    for _, scope in pairs(SCOPE) do
-        local section = values(groupKey, scope)
-        if section then
-            s[scope] = section
+    onSave = function()
+        local saved = {}
+        for groupKey, group in pairs(groupSection:asTable()) do
+            local section = contextSection(groupKey)
+            saved[groupKey] = {}
+            for key, value in pairs(section:asTable()) do
+                if group.settings[key].saveOnly then
+                    saved[groupKey][key] = value
+                end
+            end
         end
-    end
-    return setmetatable({
-        groupKey = groupKey,
-        sections = s,
-    }, groupMeta)
-end
-
-return {
-    SCOPE = SCOPE,
-    EVENTS = EVENTS,
-    isPlayerScope = isPlayerScope,
-    isSaveScope = isSaveScope,
-    values = values,
-    groups = function()
-        return groupsSection
+        groupSection:reset()
+        return saved
     end,
-    saveScope = saveScope,
-    loadScope = loadScope,
-    group = group,
-    handleSubscription = handleSubscription,
+    registerGroup = registerGroup,
+    validateGroupOptions = validateGroupOptions,
 }
\ No newline at end of file
diff --git a/files/builtin_scripts/scripts/omw/settings/global.lua b/files/builtin_scripts/scripts/omw/settings/global.lua
index ec14a07f73..5818668b0e 100644
--- a/files/builtin_scripts/scripts/omw/settings/global.lua
+++ b/files/builtin_scripts/scripts/omw/settings/global.lua
@@ -1,44 +1,19 @@
+local storage = require('openmw.storage')
+
 local common = require('scripts.omw.settings.common')
-local register = require('scripts.omw.settings.register')
-local world = require('openmw.world')
-local types = require('openmw.types')
 
 return {
     interfaceName = 'Settings',
     interface = {
-        SCOPE = common.SCOPE,
-        group = common.group,
-        registerGroup = register.registerGroup,
+        registerGroup = common.registerGroup,
     },
     engineHandlers = {
-        onLoad = function(saved)
-            common.groups():reset()
-            common.loadScope(common.SCOPE.SaveGlobal, saved)
-        end,
-        onSave = function()
-            common.saveScope(common.SCOPE.SaveGlobal)
-        end,
-        onPlayerAdded = register.onPlayerAdded,
+        onLoad = common.onLoad,
+        onSave = common.onSave,
     },
     eventHandlers = {
-        [common.EVENTS.SetValue] = function(event)
-            local group = common.group(event.groupKey)
-            group[event.settingKey] = event.value
-        end,
-        [common.EVENTS.RegisterGroup] = function(options)
-            if common.groups():get(options.key) then return end
-            register.registerGroup(options)
-        end,
-        [common.EVENTS.SettingChanged] = function(event)
-            local setting = common.groups():get(event.groupKey).settings[event.settingKey]
-            if common.isPlayerScope(setting.scope) then
-                for _, a in ipairs(world.activeActors) do
-                    if a.type == types.Player and a:isValid() then
-                        a:sendEvent(common.EVENTS.SettingChanged, event)
-                    end
-                end
-            end
+        [common.setGlobalEvent] = function(e)
+            storage.globalSection(e.groupKey):set(e.settingKey, e.value)
         end,
-        [common.EVENTS.Subscribe] = common.handleSubscription,
     },
 }
\ No newline at end of file
diff --git a/files/builtin_scripts/scripts/omw/settings/player.lua b/files/builtin_scripts/scripts/omw/settings/player.lua
index 39d989d5cc..14d5b12033 100644
--- a/files/builtin_scripts/scripts/omw/settings/player.lua
+++ b/files/builtin_scripts/scripts/omw/settings/player.lua
@@ -1,16 +1,15 @@
-local common = require('scripts.omw.settings.common')
-local render = require('scripts.omw.settings.render')
-
 local ui = require('openmw.ui')
 local async = require('openmw.async')
 local util = require('openmw.util')
-local core = require('openmw.core')
+
+local common = require('scripts.omw.settings.common')
+local render = require('scripts.omw.settings.render')
 
 render.registerRenderer('text', function(value, set, arg)
     return {
         type = ui.TYPE.TextEdit,
         props = {
-            size = util.vector2(arg and arg.size or 300, 30),
+            size = util.vector2(arg and arg.size or 150, 30),
             text = value,
             textColor = util.color.rgb(1, 1, 1),
             textSize = 15,
@@ -25,24 +24,12 @@ end)
 return {
     interfaceName = 'Settings',
     interface = {
-        SCOPE = common.SCOPE,
-        group = common.group,
+        registerPage = render.registerPage,
         registerRenderer = render.registerRenderer,
-        registerGroup = function(options)
-            core.sendGlobalEvent(common.EVENTS.RegisterGroup, options)
-        end,
+        registerGroup = common.registerGroup,
     },
     engineHandlers = {
-        onLoad = function(saved)
-            common.loadScope(common.SCOPE.SavePlayer, saved)
-        end,
-        onSave = function()
-            common.saveScope(common.SCOPE.SavePlayer)
-        end,
+        onLoad = common.onLoad,
+        onSave = common.onSave,
     },
-    eventHandlers = {
-        [common.EVENTS.GroupRegistered] = render.onGroupRegistered,
-        [common.EVENTS.SettingChanged] = render.onSettingChanged,
-        [common.EVENTS.Subscribe] = common.handleSubscription,
-    }
 }
\ No newline at end of file
diff --git a/files/builtin_scripts/scripts/omw/settings/register.lua b/files/builtin_scripts/scripts/omw/settings/register.lua
deleted file mode 100644
index 02a85cdeca..0000000000
--- a/files/builtin_scripts/scripts/omw/settings/register.lua
+++ /dev/null
@@ -1,104 +0,0 @@
-local world = require('openmw.world')
-local types = require('openmw.types')
-
-local common = require('scripts.omw.settings.common')
-
-local function validScope(scope)
-    local valid = false
-    for _, v in pairs(common.SCOPE) do
-        if v == scope then
-            valid = true
-            break
-        end
-    end
-    return valid
-end
-
-local function validateSettingOptions(options)
-    if type(options.key) ~= 'string' then
-        error('Setting must have a key')
-    end
-    if not validScope(options.scope) then
-        error(('Invalid setting scope %s'):format(options.scope))
-    end
-    if type(options.renderer) ~= 'string' then
-        error('Setting must have a renderer')
-    end
-    if type(options.name) ~= 'string' then
-        error('Setting must have a name localization key')
-    end
-    if type(options.description) ~= 'string' then
-        error('Setting must have a descripiton localization key')
-    end
-end
-
-local function addSetting(settings, options)
-    validateSettingOptions(options)
-    if settings[options.key] then
-        error(('Duplicate setting key %s'):format(options.key))
-    end
-    settings[options.key] = {
-        key = options.key,
-        scope = options.scope,
-        default = options.default,
-        renderer = options.renderer,
-        argument = options.argument,
-
-        name = options.name,
-        description = options.description,
-    }
-end
-
-local function validateGroupOptions(options)
-    if type(options.key) ~= 'string' then
-        error('Group must have a key')
-    end
-    if type(options.localization) ~= 'string' then
-        error('Group must have a localization context')
-    end
-    if type(options.name) ~= 'string' then
-        error('Group must have a name localization key')
-    end
-    if type(options.description) ~= 'string' then
-        error('Group must have a description localization key')
-    end
-    if type(options.settings) ~= 'table' then
-        error('Group must have a table of settings')
-    end
-end
-
-local function registerGroup(options)
-    local groups = common.groups()
-    validateGroupOptions(options)
-    if groups:get(options.key) then
-        error(('Duplicate group %s'):format(options.key))
-    end             
-    local group = {
-        key = options.key,
-        localization = options.localization,
-        name = options.name,
-        description = options.description,
-
-        settings = {},
-    }
-    for _, opt in ipairs(options.settings) do
-        addSetting(group.settings, opt)
-    end
-    groups:set(options.key, group)
-    for _, a in ipairs(world.activeActors) do
-        if a.type == types.Player and a:isValid() then
-            a:sendEvent(common.EVENTS.GroupRegistered, options.key)
-        end
-    end
-end
-
-local function onPlayerAdded(player)
-    for groupName in pairs(common.groups():asTable()) do
-        player:sendEvent(common.EVENTS.GroupRegistered, groupName)
-    end
-end
-
-return {
-    registerGroup = registerGroup,
-    onPlayerAdded = onPlayerAdded,
-}
\ No newline at end of file
diff --git a/files/builtin_scripts/scripts/omw/settings/render.lua b/files/builtin_scripts/scripts/omw/settings/render.lua
index bbbb8bfc6d..0d06214600 100644
--- a/files/builtin_scripts/scripts/omw/settings/render.lua
+++ b/files/builtin_scripts/scripts/omw/settings/render.lua
@@ -2,6 +2,7 @@ local ui = require('openmw.ui')
 local util = require('openmw.util')
 local async = require('openmw.async')
 local core = require('openmw.core')
+local storage = require('openmw.storage')
 
 local common = require('scripts.omw.settings.common')
 
@@ -10,8 +11,8 @@ local function registerRenderer(name, renderFunction)
     renderers[name] = renderFunction
 end
 
-local groupOptions = {}
-
+local groups = {}
+local pageOptions = {}
 
 local padding = function(size)
     return {
@@ -20,36 +21,46 @@ local padding = function(size)
         }
     }
 end
+local smallPadding = padding(10)
+local bigPadding = padding(25)
 
-local header = {
+local pageHeader = {
     props = {
         textColor = util.color.rgb(1, 1, 1),
         textSize = 30,
     },
 }
-
-local normal = {
+local groupHeader = {
     props = {
         textColor = util.color.rgb(1, 1, 1),
         textSize = 25,
     },
 }
+local normal = {
+    props = {
+        textColor = util.color.rgb(1, 1, 1),
+        textSize = 20,
+    },
+}
 
-local function renderSetting(groupKey, setting, value)
+local function renderSetting(group, setting, value, global)
     local renderFunction = renderers[setting.renderer]
     if not renderFunction then
-        error(('Setting %s of %s has unknown renderer %s'):format(setting.key, groupKey, setting.renderer))
+        error(('Setting %s of %s has unknown renderer %s'):format(setting.key, group.key, setting.renderer))
     end
-    local group = common.group(groupKey)
-    value = value or group[setting.key]
     local set = function(value)
-        group[setting.key] = value
-        renderSetting(groupKey, setting, value)
+        if global then
+            core.sendGlobalEvent(common.setGlobalEvent, {
+                groupKey = group.key,
+                settingKey = setting.key,
+                value = value,
+            })
+        else
+            storage.playerSection(group.key):set(setting.key, value)
+        end
     end
-    local element = groupOptions[groupKey].element
-    local localization = groupOptions[groupKey].localization
-    local settingsLayout = element.layout.content.settings
-    settingsLayout.content[setting.key] = {
+    local l10n = core.l10n(group.l10n)
+    return {
         name = setting.key,
         type = ui.TYPE.Flex,
         content = ui.content {
@@ -65,12 +76,12 @@ local function renderSetting(groupKey, setting, value)
                         type = ui.TYPE.Text,
                         template = normal,
                         props = {
-                            text = localization(setting.name),
+                            text = l10n(setting.name),
                         },
                     },
-                    padding(10),
+                    smallPadding,
                     renderFunction(value, set, setting.argument),
-                    padding(10),
+                    smallPadding,
                     {
                         type = ui.TYPE.Text,
                         template = normal,
@@ -85,20 +96,20 @@ local function renderSetting(groupKey, setting, value)
                     },
                 },
             },
-            padding(20),
         },
     }
-    element:update()
 end
 
-local function renderGroup(groupKey)
-    local group = common.groups():get(groupKey)
-    local element = groupOptions[groupKey].element
-    local localization = groupOptions[groupKey].localization
-    element.layout = {
+local groupLayoutName = function(key, global)
+    return ('%s%s'):format(global and 'global_' or 'player_', key)
+end
+
+local function renderGroup(group, global)
+    local l10n = core.l10n(group.l10n)
+    local layout = {
+        name = groupLayoutName(group.key, global),
         type = ui.TYPE.Flex,
         content = ui.content {
-            padding(10),
             {
                 type = ui.TYPE.Flex,
                 props = {
@@ -110,60 +121,158 @@ local function renderGroup(groupKey)
                     {
                         name = 'name',
                         type = ui.TYPE.Text,
-                        template = header,
+                        template = groupHeader,
                         props = {
-                            text = localization(group.name),
+                            text = l10n(group.name),
                         },
                     },
-                    padding(10),
+                    smallPadding,
                     {
                         name = 'description',
                         type = ui.TYPE.Text,
                         template = normal,
                         props = {
-                            text = localization(group.description),
+                            text = l10n(group.description),
                         },
                     },
                 },
             },
-            padding(50),
+            smallPadding,
             {
                 name = 'settings',
                 type = ui.TYPE.Flex,
                 content = ui.content{},
             },
+            bigPadding,
         },
     }
-    local settingsContent = element.layout.content.settings.content
+    local settingsContent = layout.content.settings.content
+    local valueSection = common.getSection(global, group.key)
     for _, setting in pairs(group.settings) do
-        settingsContent:add({ name = setting.key })
-        renderSetting(groupKey, setting)
+        settingsContent:add(renderSetting(group, setting, valueSection:get(setting.key), global))
     end
-    element:update()
+    return layout
 end
 
-local function onGroupRegistered(groupKey)
-    local group = common.groups():get(groupKey)
-    local loc = core.l10n(group.localization)
-    local options = {
-        name = loc(group.name),
-        element = ui.create{},
+local function renderPage(page)
+    local l10n = core.l10n(page.l10n)
+    local layout = {
+        name = page.key,
+        type = ui.TYPE.Flex,
+        content = ui.content {
+            smallPadding,
+            {
+                type = ui.TYPE.Flex,
+                props = {
+                    horizontal = true,
+                    align = ui.ALIGNMENT.Start,
+                    arrange = ui.ALIGNMENT.Center,
+                },
+                content = ui.content {
+                    {
+                        name = 'name',
+                        type = ui.TYPE.Text,
+                        template = pageHeader,
+                        props = {
+                            text = l10n(page.name),
+                        },
+                    },
+                    smallPadding,
+                    {
+                        name = 'description',
+                        type = ui.TYPE.Text,
+                        template = normal,
+                        props = {
+                            text = l10n(page.description),
+                        },
+                    },
+                },
+            },
+            bigPadding,
+            {
+                name = 'groups',
+                type = ui.TYPE.Flex,
+                content = ui.content {},
+            },
+        },
+    }
+    local groupsContent = layout.content.groups.content
+    for _, pageGroup in ipairs(groups[page.key]) do
+        local group = common.getSection(pageGroup.global, common.groupSectionKey):get(pageGroup.key)
+        groupsContent:add(renderGroup(group, pageGroup.global))
+    end
+    return {
+        name = l10n(page.name),
+        element = ui.create(layout),
         searchHints = '',
-        localization = loc,
     }
-    groupOptions[groupKey] = options
-    renderGroup(groupKey)
-    ui.registerSettingsPage(options)
 end
 
-local function onSettingChanged(event)
-    local group = common.groups():get(event.groupKey)
-    local setting = group.settings[event.settingKey]
-    renderSetting(event.groupKey, setting, event.value)
+local function onSettingChanged(global)
+    return async:callback(function(groupKey, settingKey)
+        local group = common.getSection(global, common.groupSectionKey):get(groupKey)
+        if not pageOptions[group.page] then return end
+
+        local element = pageOptions[group.page].element
+        local groupLayout = element.layout.content.groups.content[groupLayoutName(group.key, global)]
+        local settingsLayout = groupLayout.content.settings
+        local value = common.getSection(global, group.key):get(settingKey)
+        settingsLayout.content[settingKey] = renderSetting(group, group.settings[settingKey], value, global)
+        element:update()
+    end)
+end
+local function onGroupRegistered(global, key)
+    local group = common.getSection(global, common.groupSectionKey):get(key)
+    groups[group.page] = groups[group.page] or {}
+    table.insert(groups[group.page], {
+        key = group.key,
+        global = global,
+    })
+    common.getSection(global, group.key):subscribe(onSettingChanged(global))
+
+    if not pageOptions[group.page] then return end
+    local element = pageOptions[group.page].element
+    local groupsLayout = element.layout.content.groups
+    -- TODO: make group order deterministic
+    groupsLayout.content:add(renderGroup(group, global))
+    element:update()
+end
+local globalGroups = storage.globalSection(common.groupSectionKey)
+for groupKey in pairs(globalGroups:asTable()) do
+    onGroupRegistered(true, groupKey)
+end
+globalGroups:subscribe(async:callback(function(_, key)
+    if key then onGroupRegistered(true, key) end
+end))
+storage.playerSection(common.groupSectionKey):subscribe(async:callback(function(_, key)
+    if key then onGroupRegistered(false, key) end
+end))
+
+local function registerPage(options)
+    if type(options.key) ~= 'string' then
+        error('Page must have a key')
+    end
+    if type(options.l10n) ~= 'string' then
+        error('Page must have a localization context')
+    end
+    if type(options.name) ~= 'string' then
+        error('Page must have a name')
+    end
+    if type(options.description) ~= 'string' then
+        error('Page must have a description')
+    end
+    local page = {
+        key = options.key,
+        l10n = options.l10n,
+        name = options.name,
+        description = options.description,
+    }
+    groups[page.key] = groups[page.key] or {}
+    pageOptions[page.key] = renderPage(page)
+    ui.registerSettingsPage(pageOptions[page.key])
 end
 
 return {
-    onGroupRegistered = onGroupRegistered,
-    onSettingChanged = onSettingChanged,
+    registerPage = registerPage,
     registerRenderer = registerRenderer,
 }
\ No newline at end of file

From d9b4871f0c7425026a0826ac7cde645ca8148056 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Wed, 27 Apr 2022 22:05:39 +0200
Subject: [PATCH 2400/2859] Apply Flex arrange to each child separately

---
 files/builtin_scripts/scripts/omw/settings/player.lua | 2 +-
 files/builtin_scripts/scripts/omw/settings/render.lua | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/files/builtin_scripts/scripts/omw/settings/player.lua b/files/builtin_scripts/scripts/omw/settings/player.lua
index 14d5b12033..434f7b69c5 100644
--- a/files/builtin_scripts/scripts/omw/settings/player.lua
+++ b/files/builtin_scripts/scripts/omw/settings/player.lua
@@ -13,7 +13,7 @@ render.registerRenderer('text', function(value, set, arg)
             text = value,
             textColor = util.color.rgb(1, 1, 1),
             textSize = 15,
-            textAlignV = ui.ALIGNMENT.Center,
+            textAlignV = ui.ALIGNMENT.End,
         },
         events = {
             textChanged = async:callback(function(s) set(s) end),
diff --git a/files/builtin_scripts/scripts/omw/settings/render.lua b/files/builtin_scripts/scripts/omw/settings/render.lua
index 0d06214600..403eae44a6 100644
--- a/files/builtin_scripts/scripts/omw/settings/render.lua
+++ b/files/builtin_scripts/scripts/omw/settings/render.lua
@@ -115,7 +115,7 @@ local function renderGroup(group, global)
                 props = {
                     horizontal = true,
                     align = ui.ALIGNMENT.Start,
-                    arrange = ui.ALIGNMENT.Center,
+                    arrange = ui.ALIGNMENT.End,
                 },
                 content = ui.content {
                     {
@@ -166,7 +166,7 @@ local function renderPage(page)
                 props = {
                     horizontal = true,
                     align = ui.ALIGNMENT.Start,
-                    arrange = ui.ALIGNMENT.Center,
+                    arrange = ui.ALIGNMENT.End,
                 },
                 content = ui.content {
                     {

From 9b27973479ce9914c2cf54412fd591e0d5f00495 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Thu, 28 Apr 2022 08:08:42 +0000
Subject: [PATCH 2401/2859] Deleted
 files/builtin_scripts/openmw_aux/settings.lua

---
 files/builtin_scripts/openmw_aux/settings.lua | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 files/builtin_scripts/openmw_aux/settings.lua

diff --git a/files/builtin_scripts/openmw_aux/settings.lua b/files/builtin_scripts/openmw_aux/settings.lua
deleted file mode 100644
index 8ce9929eaa..0000000000
--- a/files/builtin_scripts/openmw_aux/settings.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-local common = require('scripts.omw.settings.common')
-return {
-    group = common.group,
-}
\ No newline at end of file

From 26154c85a163db5cf76057f4ae6517c5071913c8 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Fri, 29 Apr 2022 18:56:37 +0200
Subject: [PATCH 2402/2859] Check if options arguments are a table

---
 files/builtin_scripts/scripts/omw/settings/common.lua | 6 ++++++
 files/builtin_scripts/scripts/omw/settings/render.lua | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/files/builtin_scripts/scripts/omw/settings/common.lua b/files/builtin_scripts/scripts/omw/settings/common.lua
index 3ea462daf9..96bfd747a2 100644
--- a/files/builtin_scripts/scripts/omw/settings/common.lua
+++ b/files/builtin_scripts/scripts/omw/settings/common.lua
@@ -6,6 +6,9 @@ local groupSection = contextSection(groupSectionKey)
 groupSection:removeOnExit()
 
 local function validateSettingOptions(options)
+    if type(options) ~= 'table' then
+        error('Setting options must be a table')
+    end
     if type(options.key) ~= 'string' then
         error('Setting must have a key')
     end
@@ -24,6 +27,9 @@ local function validateSettingOptions(options)
 end
 
 local function validateGroupOptions(options)
+    if type(options) ~= 'table' then
+        error('Group options must be a table')
+    end
     if type(options.key) ~= 'string' then
         error('Group must have a key')
     end
diff --git a/files/builtin_scripts/scripts/omw/settings/render.lua b/files/builtin_scripts/scripts/omw/settings/render.lua
index 403eae44a6..ba537b2099 100644
--- a/files/builtin_scripts/scripts/omw/settings/render.lua
+++ b/files/builtin_scripts/scripts/omw/settings/render.lua
@@ -249,6 +249,9 @@ storage.playerSection(common.groupSectionKey):subscribe(async:callback(function(
 end))
 
 local function registerPage(options)
+    if type(options) ~= 'table' then
+        error('Page options must be a table')
+    end
     if type(options.key) ~= 'string' then
         error('Page must have a key')
     end

From 5e90b1db0d4131ee6b52eb99c6a92d4267f1e525 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Fri, 29 Apr 2022 19:23:20 +0200
Subject: [PATCH 2403/2859] Define order of groups in a page

---
 .../scripts/omw/settings/common.lua           |  4 +++
 .../scripts/omw/settings/render.lua           | 28 +++++++++++++++----
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/files/builtin_scripts/scripts/omw/settings/common.lua b/files/builtin_scripts/scripts/omw/settings/common.lua
index 96bfd747a2..51e22b4465 100644
--- a/files/builtin_scripts/scripts/omw/settings/common.lua
+++ b/files/builtin_scripts/scripts/omw/settings/common.lua
@@ -40,6 +40,9 @@ local function validateGroupOptions(options)
     if type(options.page) ~= 'string' then
         error('Group must belong to a page')
     end
+    if type(options.order) ~= 'number' and type(options.order) ~= 'nil' then
+        error('Group order must be a number')
+    end
     if type(options.l10n) ~= 'string' then
         error('Group must have a localization context')
     end
@@ -78,6 +81,7 @@ local function registerGroup(options)
     local group = {
         key = options.key,
         page = options.page,
+        order = options.order or 0,
         l10n = options.l10n,
         name = options.name,
         description = options.description,
diff --git a/files/builtin_scripts/scripts/omw/settings/render.lua b/files/builtin_scripts/scripts/omw/settings/render.lua
index ba537b2099..95b4bf2ff1 100644
--- a/files/builtin_scripts/scripts/omw/settings/render.lua
+++ b/files/builtin_scripts/scripts/omw/settings/render.lua
@@ -154,6 +154,12 @@ local function renderGroup(group, global)
     return layout
 end
 
+local function pageGroupComparator(a, b)
+    return a.order < b.order or (
+        a.order == b.order and a.key < b.key
+    )
+end
+
 local function renderPage(page)
     local l10n = core.l10n(page.l10n)
     local layout = {
@@ -197,7 +203,11 @@ local function renderPage(page)
         },
     }
     local groupsContent = layout.content.groups.content
-    for _, pageGroup in ipairs(groups[page.key]) do
+    local pageGroups = groups[page.key]
+    local sortedGroups = {}
+    for i, v in ipairs(pageGroups) do sortedGroups[i] = v end
+    table.sort(sortedGroups, pageGroupComparator)
+    for _, pageGroup in ipairs(sortedGroups) do
         local group = common.getSection(pageGroup.global, common.groupSectionKey):get(pageGroup.key)
         groupsContent:add(renderGroup(group, pageGroup.global))
     end
@@ -224,17 +234,25 @@ end
 local function onGroupRegistered(global, key)
     local group = common.getSection(global, common.groupSectionKey):get(key)
     groups[group.page] = groups[group.page] or {}
-    table.insert(groups[group.page], {
+    local pageGroup =  {
         key = group.key,
         global = global,
-    })
+        order = group.order,
+    }
+    table.insert(groups[group.page], pageGroup)
     common.getSection(global, group.key):subscribe(onSettingChanged(global))
 
+    local index = 1
+    for _, g in ipairs(groups[group.page]) do
+        if pageGroupComparator(pageGroup, g) then
+            index = index + 1
+        end
+    end
+
     if not pageOptions[group.page] then return end
     local element = pageOptions[group.page].element
     local groupsLayout = element.layout.content.groups
-    -- TODO: make group order deterministic
-    groupsLayout.content:add(renderGroup(group, global))
+    groupsLayout.content:insert(index, renderGroup(group, global))
     element:update()
 end
 local globalGroups = storage.globalSection(common.groupSectionKey)

From 1b62dda9f6648c15a166b50d17c74f01c5abc73c Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Fri, 29 Apr 2022 19:35:01 +0200
Subject: [PATCH 2404/2859] Generate search hints

---
 .../scripts/omw/settings/render.lua           | 39 +++++++++++++------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/files/builtin_scripts/scripts/omw/settings/render.lua b/files/builtin_scripts/scripts/omw/settings/render.lua
index 95b4bf2ff1..c072d20e94 100644
--- a/files/builtin_scripts/scripts/omw/settings/render.lua
+++ b/files/builtin_scripts/scripts/omw/settings/render.lua
@@ -11,6 +11,7 @@ local function registerRenderer(name, renderFunction)
     renderers[name] = renderFunction
 end
 
+local pages = {}
 local groups = {}
 local pageOptions = {}
 
@@ -160,6 +161,25 @@ local function pageGroupComparator(a, b)
     )
 end
 
+local function generateSearchHints(page)
+    local hints = {}
+    local l10n = core.l10n(page.l10n)
+    table.insert(hints, l10n(page.name))
+    table.insert(hints, l10n(page.description))
+    local pageGroups = groups[page.key]
+    for _, pageGroup in pairs(pageGroups) do
+        local group = common.getSection(pageGroup.global, common.groupSectionKey):get(pageGroup.key)
+        local l10n = core.l10n(group.l10n)
+        table.insert(hints, l10n(group.name))
+        table.insert(hints, l10n(group.description))
+        for _, setting in pairs(group.settings) do
+            table.insert(hints, l10n(setting.name))
+            table.insert(hints, l10n(setting.description))
+        end
+    end
+    return table.concat(hints, ' ')
+end
+
 local function renderPage(page)
     local l10n = core.l10n(page.l10n)
     local layout = {
@@ -214,7 +234,7 @@ local function renderPage(page)
     return {
         name = l10n(page.name),
         element = ui.create(layout),
-        searchHints = '',
+        searchHints = generateSearchHints(page),
     }
 end
 
@@ -242,18 +262,12 @@ local function onGroupRegistered(global, key)
     table.insert(groups[group.page], pageGroup)
     common.getSection(global, group.key):subscribe(onSettingChanged(global))
 
-    local index = 1
-    for _, g in ipairs(groups[group.page]) do
-        if pageGroupComparator(pageGroup, g) then
-            index = index + 1
-        end
+    if not pages[group.page] then return end
+    local options = renderPage(pages[group.page])
+    pageOptions[group.page].element:destroy()
+    for k, v in pairs(options) do
+        pageOptions[group.page][k] = v
     end
-
-    if not pageOptions[group.page] then return end
-    local element = pageOptions[group.page].element
-    local groupsLayout = element.layout.content.groups
-    groupsLayout.content:insert(index, renderGroup(group, global))
-    element:update()
 end
 local globalGroups = storage.globalSection(common.groupSectionKey)
 for groupKey in pairs(globalGroups:asTable()) do
@@ -288,6 +302,7 @@ local function registerPage(options)
         name = options.name,
         description = options.description,
     }
+    pages[page.key] = page
     groups[page.key] = groups[page.key] or {}
     pageOptions[page.key] = renderPage(page)
     ui.registerSettingsPage(pageOptions[page.key])

From cd3535cd63f074941e4c1772eb531f8bc3f1b99b Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sun, 1 May 2022 16:57:33 +0200
Subject: [PATCH 2405/2859] Document Settings interface, add scripts to
 CMakeLists

---
 docs/source/generate_luadoc.sh                |   1 +
 docs/source/reference/lua-scripting/api.rst   |  24 ++--
 .../lua-scripting/interface_settings.rst      |   6 +
 .../reference/lua-scripting/overview.rst      |  25 ++--
 files/builtin_scripts/CMakeLists.txt          |   4 +
 .../scripts/omw/settings/common.lua           |   9 +-
 .../scripts/omw/settings/player.lua           | 125 ++++++++++++++++++
 7 files changed, 172 insertions(+), 22 deletions(-)
 create mode 100644 docs/source/reference/lua-scripting/interface_settings.rst

diff --git a/docs/source/generate_luadoc.sh b/docs/source/generate_luadoc.sh
index 5376aa0ab9..d6bbbe3634 100755
--- a/docs/source/generate_luadoc.sh
+++ b/docs/source/generate_luadoc.sh
@@ -68,3 +68,4 @@ $DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR openmw_aux/*lua
 $DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR scripts/omw/ai.lua
 $DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR scripts/omw/camera.lua
 $DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR scripts/omw/mwui/init.lua
+$DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR scripts/omw/settings/player.lua
diff --git a/docs/source/reference/lua-scripting/api.rst b/docs/source/reference/lua-scripting/api.rst
index 110771fbcf..a6009edf1a 100644
--- a/docs/source/reference/lua-scripting/api.rst
+++ b/docs/source/reference/lua-scripting/api.rst
@@ -27,6 +27,7 @@ Lua API reference
     interface_ai
     interface_camera
     interface_mwui
+    interface_settings
     iterables
 
 
@@ -94,12 +95,19 @@ Sources can be found in ``resources/vfs/openmw_aux``. In theory mods can overrid
 
 **Interfaces of built-in scripts**
 
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-| Interface                                               | Can be used        | Description                                                   |
-+=========================================================+====================+===============================================================+
-|:ref:`AI <Interface AI>`                                 | by local scripts   | | Control basic AI of NPCs and creatures.                     |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`Camera <Interface Camera>`                         | by player scripts  | | Allows to alter behavior of the built-in camera script      |
-|                                                         |                    | | without overriding the script completely.                   |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+.. list-table::
+  :widths: 20 20 60
 
+  * - Interface
+    - Can be used
+    - Description
+  * - :ref:`AI <Interface AI>`
+    - by local scripts
+    - Control basic AI of NPCs and creatures.
+  * - :ref:`Camera <Interface Camera>`
+    - by player scripts
+    - | Allows to alter behavior of the built-in camera script
+      | without overriding the script completely.
+  * - :ref:`Settings <Interface Settings>`
+    - by player and global scripts
+    - Save, display and track changes of setting values.
diff --git a/docs/source/reference/lua-scripting/interface_settings.rst b/docs/source/reference/lua-scripting/interface_settings.rst
new file mode 100644
index 0000000000..cd1994ccfa
--- /dev/null
+++ b/docs/source/reference/lua-scripting/interface_settings.rst
@@ -0,0 +1,6 @@
+Interface Settings
+==================
+
+.. raw:: html
+   :file: generated_html/scripts_omw_settings_player.html
+
diff --git a/docs/source/reference/lua-scripting/overview.rst b/docs/source/reference/lua-scripting/overview.rst
index 91c0a071e0..e21469a53f 100644
--- a/docs/source/reference/lua-scripting/overview.rst
+++ b/docs/source/reference/lua-scripting/overview.rst
@@ -460,15 +460,22 @@ The order in which the scripts are started is important. So if one mod should ov
 
 **Interfaces of built-in scripts**
 
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-| Interface                                               | Can be used        | Description                                                   |
-+=========================================================+====================+===============================================================+
-|:ref:`AI <Interface AI>`                                 | by local scripts   | | Control basic AI of NPCs and creatures.                     |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`Camera <Interface Camera>`                         | by player scripts  | | Allows to alter behavior of the built-in camera script      |
-|                                                         |                    | | without overriding the script completely.                   |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-
+.. list-table::
+  :widths: 20 20 60
+
+  * - Interface
+    - Can be used
+    - Description
+  * - :ref:`AI <Interface AI>`
+    - by local scripts
+    - Control basic AI of NPCs and creatures.
+  * - :ref:`Camera <Interface Camera>`
+    - by player scripts
+    - | Allows to alter behavior of the built-in camera script
+      | without overriding the script completely.
+  * - :ref:`Settings <Interface Settings>`
+    - by player and global scripts
+    - Save, display and track changes of setting values.
 
 Event system
 ============
diff --git a/files/builtin_scripts/CMakeLists.txt b/files/builtin_scripts/CMakeLists.txt
index a3ba1f5149..318e389585 100644
--- a/files/builtin_scripts/CMakeLists.txt
+++ b/files/builtin_scripts/CMakeLists.txt
@@ -17,6 +17,10 @@ set(LUA_BUILTIN_FILES
     scripts/omw/console/player.lua
     scripts/omw/console/global.lua
     scripts/omw/console/local.lua
+    scripts/omw/settings/player.lua
+    scripts/omw/settings/global.lua
+    scripts/omw/settings/common.lua
+    scripts/omw/settings/render.lua
 
     l10n/Calendar/en.yaml
 
diff --git a/files/builtin_scripts/scripts/omw/settings/common.lua b/files/builtin_scripts/scripts/omw/settings/common.lua
index 51e22b4465..1e87dfd62b 100644
--- a/files/builtin_scripts/scripts/omw/settings/common.lua
+++ b/files/builtin_scripts/scripts/omw/settings/common.lua
@@ -12,8 +12,8 @@ local function validateSettingOptions(options)
     if type(options.key) ~= 'string' then
         error('Setting must have a key')
     end
-    if type(options.saveOnly) ~= 'boolean' then
-        error('Setting must be save only or not')
+    if type(options.permanentStorage) ~= 'boolean' then
+        error('Setting must have a permanentStorage flag')
     end
     if type(options.renderer) ~= 'string' then
         error('Setting must have a renderer')
@@ -63,7 +63,7 @@ end
 local function registerSetting(options)
     return {
         key = options.key,
-        saveOnly = options.saveOnly,
+        permanentStorage = options.permanentStorage,
         default = options.default,
         renderer = options.renderer,
         argument = options.argument,
@@ -123,7 +123,7 @@ return {
             local section = contextSection(groupKey)
             saved[groupKey] = {}
             for key, value in pairs(section:asTable()) do
-                if group.settings[key].saveOnly then
+                if not group.settings[key].permanentStorage then
                     saved[groupKey][key] = value
                 end
             end
@@ -132,5 +132,4 @@ return {
         return saved
     end,
     registerGroup = registerGroup,
-    validateGroupOptions = validateGroupOptions,
 }
\ No newline at end of file
diff --git a/files/builtin_scripts/scripts/omw/settings/player.lua b/files/builtin_scripts/scripts/omw/settings/player.lua
index 434f7b69c5..612ba3ec7b 100644
--- a/files/builtin_scripts/scripts/omw/settings/player.lua
+++ b/files/builtin_scripts/scripts/omw/settings/player.lua
@@ -21,11 +21,136 @@ render.registerRenderer('text', function(value, set, arg)
     }
 end)
 
+---
+-- @type PageOptions
+-- @field #string key A unique key
+-- @field #string l10n A localization context (an argument of core.l10n)
+-- @field #string name A key from the localization context
+-- @field #string description A key from the localization context
+
+---
+-- @type GroupOptions
+-- @field #string key A unique key, starts with "Settings" by convention
+-- @field #string l10n A localization context (an argument of core.l10n)
+-- @field #string name A key from the localization context
+-- @field #string description A key from the localization context
+-- @field #string page Key of a page which will contain this group
+-- @field #number order Groups within the same page are sorted by this number, or their key for equal values.
+--   Defaults to 0.
+-- @field #list<#SettingOptions> settings A [iterables#List](iterables.html#List) of #SettingOptions
+
+---
+-- @type SettingOptions
+-- @field #string key A unique key
+-- @field #string name A key from the localization context
+-- @field #string description A key from the localization context
+-- @field default A default value
+-- @field #string renderer A renderer key
+-- @field argument An argument for the renderer
+-- @field #boolean permanentStorage Whether the setting should is stored in permanent storage, or in the save file
+
 return {
     interfaceName = 'Settings',
+    ---
+    -- @module Settings
+    -- @usage
+    -- -- In a player script
+    -- local storage = require('openmw.storage')
+    -- local I = require('openmw.interfaces')
+    -- I.Settings.registerGroup({
+    --     key = 'SettingsPlayerMyMod',
+    --     page = 'MyPage',
+    --     l10n = 'mymod',
+    --     name = 'modName',
+    --     description = 'modDescription',
+    --     settings = {
+    --         {
+    --             key = 'Greeting',
+    --             renderer = 'text',
+    --             name = 'greetingName',
+    --             description = 'greetingDescription',
+    --             default = 'Hello, world!',
+    --             argument = {
+    --                 size = 200,
+    --             },
+    --         },
+    --     },
+    -- })
+    -- local playerSettings = storage.playerSection('SettingsPlayerMyMod')
+    -- -- access a setting page registered by a global script
+    -- local globalSettings = storage.globalSection('SettingsGlobalMyMod')
     interface = {
+        ---
+        -- @field [parent=#Settings] #string version
+        version = 0,
+        ---
+        -- @function [parent=#Settings] registerPage Register a page to be displayed in the settings menu,
+        --   only available in player scripts
+        -- @param #PageOptions options
+        -- @usage
+        -- I.Settings.registerPage({
+        --   key = 'MyModName',
+        --   l10n = 'MyModName',
+        --   name = 'MyModName',
+        --   description = 'MyModDescription',
+        -- })---
         registerPage = render.registerPage,
+        ---
+        -- @function [parent=#Settings] registerRenderer Register a renderer,
+        --   only avaialable in player scripts
+        -- @param #string key
+        -- @param #function renderer A renderer function, receives setting's value,
+        --   a function to change it and an argument from the setting options
+        -- @usage
+        -- I.Settings.registerRenderer('text', function(value, set, arg)
+        --   return {
+        --     type = ui.TYPE.TextEdit,
+        --     props = {
+        --       size = util.vector2(arg and arg.size or 150, 30),
+        --       text = value,
+        --       textColor = util.color.rgb(1, 1, 1),
+        --       textSize = 15,
+        --       textAlignV = ui.ALIGNMENT.End,
+        --     },
+        --     events = {
+        --       textChanged = async:callback(function(s) set(s) end),
+        --     },
+        --   }
+        -- end)
         registerRenderer = render.registerRenderer,
+        ---
+        -- @function [parent=#Settings] registerGroup Register a group to be attached to a page,
+        --   available both in player and global scripts
+        -- @param #GroupOptions options
+        -- @usage
+        -- I.Settings.registerGroup {
+        --     key = 'SettingsTest',
+        --     page = 'test',
+        --     l10n = 'test',
+        --     name = 'Player',
+        --     description = 'Player settings group',
+        --     settings = {
+        --         {
+        --             key = 'Greeting',
+        --             saveOnly = true,
+        --             default = 'Hi',
+        --             renderer = 'text',
+        --             argument = {
+        --                 size = 200,
+        --             },
+        --             name = 'Text Input',
+        --             description = 'Short text input',
+        --         },
+        --         {
+        --             key = 'Key',
+        --             saveOnly = false,
+        --             default = input.KEY.LeftAlt,
+        --             renderer = 'keybind',
+        --             name = 'Key',
+        --             description = 'Bind Key',
+        --         },
+        --     }
+        -- }
         registerGroup = common.registerGroup,
     },
     engineHandlers = {

From 6a97a21fbd020a02bff074abc4ca1bcc26c06b58 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 8 May 2022 13:09:02 +0200
Subject: [PATCH 2406/2859] [Lua] Fix stupid bug in tostring for ESM::Weapon
 and ESM::Door

---
 apps/openmw/mwlua/types/door.cpp   | 3 +--
 apps/openmw/mwlua/types/weapon.cpp | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwlua/types/door.cpp b/apps/openmw/mwlua/types/door.cpp
index 5c13e27f9e..3b5e9a29cc 100644
--- a/apps/openmw/mwlua/types/door.cpp
+++ b/apps/openmw/mwlua/types/door.cpp
@@ -45,8 +45,7 @@ namespace MWLua
             [](const Object& obj) -> const ESM::Door* { return obj.ptr().get<ESM::Door>()->mBase; },
             [store](const std::string& recordId) -> const ESM::Door* { return store->find(recordId); });
         sol::usertype<ESM::Door> record = context.mLua->sol().new_usertype<ESM::Door>("ESM3_Door");
-        record[sol::meta_function::to_string] = sol::readonly_property(
-            [](const ESM::Door& rec) -> std::string { return "ESM3_Door[" + rec.mId + "]"; });
+        record[sol::meta_function::to_string] = [](const ESM::Door& rec) -> std::string { return "ESM3_Door[" + rec.mId + "]"; };
         record["id"] = sol::readonly_property([](const ESM::Door& rec) -> std::string { return rec.mId; });
         record["name"] = sol::readonly_property([](const ESM::Door& rec) -> std::string { return rec.mName; });
         record["model"] = sol::readonly_property([](const ESM::Door& rec) -> std::string { return rec.mModel; });
diff --git a/apps/openmw/mwlua/types/weapon.cpp b/apps/openmw/mwlua/types/weapon.cpp
index 746536cc69..3b6265697e 100644
--- a/apps/openmw/mwlua/types/weapon.cpp
+++ b/apps/openmw/mwlua/types/weapon.cpp
@@ -38,8 +38,7 @@ namespace MWLua
             [](const Object& obj) -> const ESM::Weapon* { return obj.ptr().get<ESM::Weapon>()->mBase; },
             [store](const std::string& recordId) -> const ESM::Weapon* { return store->find(recordId); });
         sol::usertype<ESM::Weapon> record = context.mLua->sol().new_usertype<ESM::Weapon>("ESM3_Weapon");
-        record[sol::meta_function::to_string] = sol::readonly_property(
-            [](const ESM::Weapon& rec) -> std::string { return "ESM3_Weapon[" + rec.mId + "]"; });
+        record[sol::meta_function::to_string] = [](const ESM::Weapon& rec) -> std::string { return "ESM3_Weapon[" + rec.mId + "]"; };
         record["id"] = sol::readonly_property([](const ESM::Weapon& rec) -> std::string { return rec.mId; });
         record["name"] = sol::readonly_property([](const ESM::Weapon& rec) -> std::string { return rec.mName; });
         record["model"] = sol::readonly_property([](const ESM::Weapon& rec) -> std::string { return rec.mModel; });

From 8473336b06e9128db266c30c26999e2d97fe1d16 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 6 May 2022 19:56:10 +0200
Subject: [PATCH 2407/2859] Remove redundant virtual functions

---
 apps/openmw/mwbase/statemanager.hpp     | 2 --
 apps/openmw/mwbase/windowmanager.hpp    | 2 --
 apps/openmw/mwbase/world.hpp            | 1 -
 apps/openmw/mwgui/windowmanagerimp.hpp  | 2 +-
 apps/openmw/mwstate/statemanagerimp.hpp | 2 +-
 apps/openmw/mwworld/worldimp.hpp        | 2 +-
 6 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwbase/statemanager.hpp b/apps/openmw/mwbase/statemanager.hpp
index 0537ff02d2..c18db4190d 100644
--- a/apps/openmw/mwbase/statemanager.hpp
+++ b/apps/openmw/mwbase/statemanager.hpp
@@ -53,8 +53,6 @@ namespace MWBase
             ///
             /// \param bypass Skip new game mechanics.
 
-            virtual void endGame() = 0;
-
             virtual void resumeGame() = 0;
 
             virtual void deleteGame (const MWState::Character *character, const MWState::Slot *slot) = 0;
diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index 45ea43daa8..b0076b02f2 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -282,8 +282,6 @@ namespace MWBase
             /// Warning: do not use MyGUI::InputManager::setKeyFocusWidget directly. Instead use this.
             virtual void setKeyFocusWidget (MyGUI::Widget* widget) = 0;
 
-            virtual void loadUserFonts() = 0;
-
             virtual Loading::Listener* getLoadingScreen() = 0;
 
             /// Should the cursor be visible?
diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 899be7dfb9..4aaf84c126 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -623,7 +623,6 @@ namespace MWBase
             virtual bool isPlayerInJail() const = 0;
 
             virtual void rest(double hours) = 0;
-            virtual void rechargeItems(double duration, bool activeOnly) = 0;
 
             virtual void setPlayerTraveling(bool traveling) = 0;
             virtual bool isPlayerTraveling() const = 0;
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index 9a7ea2f1a7..9a4de2b33f 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -142,7 +142,7 @@ namespace MWGui
     void setStore (const MWWorld::ESMStore& store);
 
     void initUI();
-    void loadUserFonts() override;
+    void loadUserFonts();
 
     Loading::Listener* getLoadingScreen() override;
 
diff --git a/apps/openmw/mwstate/statemanagerimp.hpp b/apps/openmw/mwstate/statemanagerimp.hpp
index 273a3eb3bc..3da71e8401 100644
--- a/apps/openmw/mwstate/statemanagerimp.hpp
+++ b/apps/openmw/mwstate/statemanagerimp.hpp
@@ -46,7 +46,7 @@ namespace MWState
             ///
             /// \param bypass Skip new game mechanics.
 
-            void endGame() override;
+            void endGame();
 
             void resumeGame() override;
 
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 09bae6653d..d5ff82f52d 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -587,7 +587,7 @@ namespace MWWorld
             ///< check if the player is allowed to rest
 
             void rest(double hours) override;
-            void rechargeItems(double duration, bool activeOnly) override;
+            void rechargeItems(double duration, bool activeOnly);
 
             /// \todo Probably shouldn't be here
             MWRender::Animation* getAnimation(const MWWorld::Ptr &ptr) override;

From f03360b66641cbb572b72641b5d57c108b902717 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 6 May 2022 20:12:17 +0200
Subject: [PATCH 2408/2859] Move RenderingManager::update call to World::update

There is no need to do that in Scene::update and pass paused argument there.
---
 apps/openmw/mwworld/scene.cpp    | 4 +---
 apps/openmw/mwworld/scene.hpp    | 2 +-
 apps/openmw/mwworld/worldimp.cpp | 4 +++-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index f24316045b..98bfc514ed 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -295,7 +295,7 @@ namespace MWWorld
         mPhysics->updateScale(ptr);
     }
 
-    void Scene::update (float duration, bool paused)
+    void Scene::update(float duration)
     {
         if (mChangeCellGridRequest.has_value())
         {
@@ -306,8 +306,6 @@ namespace MWWorld
 
         mPreloader->updateCache(mRendering.getReferenceTime());
         preloadCells(duration);
-
-        mRendering.update (duration, paused);
     }
 
     void Scene::unloadCell(CellStore* cell)
diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp
index 464088f223..371c3cbbc5 100644
--- a/apps/openmw/mwworld/scene.hpp
+++ b/apps/openmw/mwworld/scene.hpp
@@ -164,7 +164,7 @@ namespace MWWorld
 
             void markCellAsUnchanged();
 
-            void update (float duration, bool paused);
+            void update(float duration);
 
             void addObjectToScene (const Ptr& ptr);
             ///< Add an object that already exists in the world model to the scene.
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index ff343e0828..1ba27ac8b6 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1849,7 +1849,9 @@ namespace MWWorld
 
         mPhysics->debugDraw();
 
-        mWorldScene->update (duration, paused);
+        mWorldScene->update(duration);
+
+        mRendering->update(duration, paused);
 
         updateSoundListener();
 

From 9320fb50abede4e09ca4ed4f77c35cb4f74693b8 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 6 May 2022 20:36:25 +0200
Subject: [PATCH 2409/2859] Remove redundant
 MWBase::Environment::get().getWorld() calls

---
 apps/openmw/mwworld/cellutils.hpp | 20 +++++++++++
 apps/openmw/mwworld/worldimp.cpp  | 60 +++++++++++++------------------
 2 files changed, 44 insertions(+), 36 deletions(-)
 create mode 100644 apps/openmw/mwworld/cellutils.hpp

diff --git a/apps/openmw/mwworld/cellutils.hpp b/apps/openmw/mwworld/cellutils.hpp
new file mode 100644
index 0000000000..c699982af5
--- /dev/null
+++ b/apps/openmw/mwworld/cellutils.hpp
@@ -0,0 +1,20 @@
+#ifndef OPENMW_MWWORLD_CELLUTILS_H
+#define OPENMW_MWWORLD_CELLUTILS_H
+
+#include <components/misc/constants.hpp>
+#include <components/esm3/cellid.hpp>
+
+#include <cmath>
+
+namespace MWWorld
+{
+    inline ESM::CellId::CellIndex positionToIndex(float x, float y)
+    {
+        return {
+            static_cast<int>(std::floor(x / Constants::CellSizeInUnits)),
+            static_cast<int>(std::floor(y / Constants::CellSizeInUnits))
+        };
+    }
+}
+
+#endif
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 1ba27ac8b6..c7d253b4c5 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -78,6 +78,7 @@
 
 #include "contentloader.hpp"
 #include "esmloader.hpp"
+#include "cellutils.hpp"
 
 namespace MWWorld
 {
@@ -1276,11 +1277,10 @@ namespace MWWorld
 
     MWWorld::Ptr World::moveObject(const Ptr& ptr, const osg::Vec3f& position, bool movePhysics, bool moveToActive)
     {
-        int cellX, cellY;
-        positionToIndex(position.x(), position.y(), cellX, cellY);
+        const auto index = MWWorld::positionToIndex(position.x(), position.y());
 
         CellStore* cell = ptr.getCell();
-        CellStore* newCell = getExterior(cellX, cellY);
+        CellStore* newCell = getExterior(index.mX, index.mY);
         bool isCellActive = getPlayerPtr().isInCell() && getPlayerPtr().getCell()->isExterior() && mWorldScene->isCellActive(*newCell);
 
         if (cell->isExterior() || (moveToActive && isCellActive && ptr.getClass().isActor()))
@@ -1518,8 +1518,9 @@ namespace MWWorld
 
     void World::positionToIndex (float x, float y, int &cellX, int &cellY) const
     {
-        cellX = static_cast<int>(std::floor(x / Constants::CellSizeInUnits));
-        cellY = static_cast<int>(std::floor(y / Constants::CellSizeInUnits));
+        const auto index = MWWorld::positionToIndex(x, y);
+        cellX = index.mX;
+        cellY = index.mY;
     }
 
     void World::queueMovement(const Ptr &ptr, const osg::Vec3f &velocity)
@@ -2074,11 +2075,6 @@ namespace MWWorld
 
     struct GetDoorMarkerVisitor
     {
-        GetDoorMarkerVisitor(std::vector<World::DoorMarker>& out)
-            : mOut(out)
-        {
-        }
-
         std::vector<World::DoorMarker>& mOut;
 
         bool operator()(const MWWorld::Ptr& ptr)
@@ -2104,11 +2100,7 @@ namespace MWWorld
                 else
                 {
                     cellid.mPaged = true;
-                    MWBase::Environment::get().getWorld()->positionToIndex(
-                                ref.mRef.getDoorDest().pos[0],
-                                ref.mRef.getDoorDest().pos[1],
-                                cellid.mIndex.mX,
-                                cellid.mIndex.mY);
+                    cellid.mIndex = MWWorld::positionToIndex(ref.mRef.getDoorDest().pos[0], ref.mRef.getDoorDest().pos[1]);
                 }
                 newMarker.dest = cellid;
 
@@ -2124,7 +2116,7 @@ namespace MWWorld
 
     void World::getDoorMarkers (CellStore* cell, std::vector<World::DoorMarker>& out)
     {
-        GetDoorMarkerVisitor visitor(out);
+        GetDoorMarkerVisitor visitor {out};
         cell->forEachType<ESM::Door>(visitor);
     }
 
@@ -2210,9 +2202,8 @@ namespace MWWorld
             throw std::runtime_error("copyObjectToCell(): cannot copy object to null cell");
         if (cell->isExterior())
         {
-            int cellX, cellY;
-            positionToIndex(pos.pos[0], pos.pos[1], cellX, cellY);
-            cell = mCells.getExterior(cellX, cellY);
+            const auto index = MWWorld::positionToIndex(pos.pos[0], pos.pos[1]);
+            cell = mCells.getExterior(index.mX, index.mY);
         }
 
         MWWorld::Ptr dropped =
@@ -2819,10 +2810,9 @@ namespace MWWorld
             // door to exterior
             if (door->getDestCell().empty())
             {
-                int x, y;
                 ESM::Position doorDest = door->getDoorDest();
-                positionToIndex(doorDest.pos[0], doorDest.pos[1], x, y);
-                source = getExterior(x, y);
+                const auto index = MWWorld::positionToIndex(doorDest.pos[0], doorDest.pos[1]);
+                source = getExterior(index.mX, index.mY);
             }
             // door to interior
             else
@@ -3154,7 +3144,7 @@ namespace MWWorld
         const osg::Vec3f sourcePos = worldPos + orient * osg::Vec3f(0,-1,0) * 64.f;
 
         // Early out if the launch position is underwater
-        bool underwater = MWBase::Environment::get().getWorld()->isUnderwater(MWMechanics::getPlayer().getCell(), worldPos);
+        bool underwater = isUnderwater(MWMechanics::getPlayer().getCell(), worldPos);
         if (underwater)
         {
             MWMechanics::projectileHit(actor, Ptr(), bow, projectile, worldPos, attackStrength);
@@ -3415,15 +3405,12 @@ namespace MWWorld
 
     struct AddDetectedReferenceVisitor
     {
-        AddDetectedReferenceVisitor(std::vector<Ptr>& out, const Ptr& detector, World::DetectionType type, float squaredDist)
-            : mOut(out), mDetector(detector), mSquaredDist(squaredDist), mType(type)
-        {
-        }
-
         std::vector<Ptr>& mOut;
         Ptr mDetector;
         float mSquaredDist;
         World::DetectionType mType;
+        const MWWorld::ESMStore& mStore;
+
         bool operator() (const MWWorld::Ptr& ptr)
         {
             if ((ptr.getRefData().getPosition().asVec3() - mDetector.getRefData().getPosition().asVec3()).length2() >= mSquaredDist)
@@ -3439,14 +3426,13 @@ namespace MWWorld
                 // but ignore containers without resolved content
                 if (isContainer && ptr.getRefData().getCustomData() == nullptr)
                 {
-                    const auto& store = MWBase::Environment::get().getWorld()->getStore();
                     for(const auto& containerItem :  ptr.get<ESM::Container>()->mBase->mInventory.mList)
                     {
                         if(containerItem.mCount)
                         {
                             try
                             {
-                                ManualRef ref(store, containerItem.mItem, containerItem.mCount);
+                                ManualRef ref(mStore, containerItem.mItem, containerItem.mCount);
                                 if(needToAdd(ref.getPtr(), mDetector))
                                 {
                                     mOut.push_back(ptr);
@@ -3521,7 +3507,7 @@ namespace MWWorld
 
         dist = feetToGameUnits(dist);
 
-        AddDetectedReferenceVisitor visitor (out, ptr, type, dist*dist);
+        AddDetectedReferenceVisitor visitor {out, ptr, dist * dist, type, mStore};
 
         for (CellStore* cellStore : mWorldScene->getActiveCells())
         {
@@ -3701,10 +3687,9 @@ namespace MWWorld
         static int iNumberCreatures = mStore.get<ESM::GameSetting>().find("iNumberCreatures")->mValue.getInteger();
         int numCreatures = 1 + Misc::Rng::rollDice(iNumberCreatures); // [1, iNumberCreatures]
 
-        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
         for (int i=0; i<numCreatures; ++i)
         {
-            std::string selectedCreature = MWMechanics::getLevelledItem(list, true, prng);
+            std::string selectedCreature = MWMechanics::getLevelledItem(list, true, mPrng);
             if (selectedCreature.empty())
                 continue;
 
@@ -3833,6 +3818,8 @@ namespace MWWorld
 
     struct ResetActorsVisitor
     {
+        World& mWorld;
+
         bool operator() (const Ptr& ptr)
         {
             if (ptr.getClass().isActor() && ptr.getCellRef().hasContentFile())
@@ -3841,18 +3828,19 @@ namespace MWWorld
                     return true;
 
                 const ESM::Position& origPos = ptr.getCellRef().getPosition();
-                MWBase::Environment::get().getWorld()->moveObject(ptr, origPos.asVec3());
-                MWBase::Environment::get().getWorld()->rotateObject(ptr, origPos.asRotationVec3());
+                mWorld.moveObject(ptr, origPos.asVec3());
+                mWorld.rotateObject(ptr, origPos.asRotationVec3());
                 ptr.getClass().adjustPosition(ptr, true);
             }
             return true;
         }
     };
+
     void World::resetActors()
     {
         for (CellStore* cellstore : mWorldScene->getActiveCells())
         {
-            ResetActorsVisitor visitor;
+            ResetActorsVisitor visitor {*this};
             cellstore->forEach(visitor);
         }
     }

From b32a787cd86f054ba5a601797af51c786d9c7975 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 6 May 2022 21:03:02 +0200
Subject: [PATCH 2410/2859] Add explicit dependency to World from Scene

To avoid redundant MWBase::Environment::get().getWorld() calls and virtual
calls.
---
 apps/openmw/mwbase/world.hpp     |   4 +-
 apps/openmw/mwworld/scene.cpp    | 129 +++++++++++++++----------------
 apps/openmw/mwworld/scene.hpp    |   4 +-
 apps/openmw/mwworld/worldimp.cpp |   6 +-
 apps/openmw/mwworld/worldimp.hpp |   4 +-
 5 files changed, 74 insertions(+), 73 deletions(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 4aaf84c126..f78befe470 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -273,7 +273,7 @@ namespace MWBase
 
             virtual float getDistanceToFacedObject() = 0;
 
-            virtual float getMaxActivationDistance() = 0;
+            virtual float getMaxActivationDistance() const = 0;
 
             /// Returns a pointer to the object the provided object would hit (if within the
             /// specified distance), and the point where the hit occurs. This will attempt to
@@ -548,7 +548,7 @@ namespace MWBase
                                            const osg::Vec3f& worldPos, const osg::Quat& orient, MWWorld::Ptr& bow, float speed, float attackStrength) = 0;
             virtual void updateProjectilesCasters() = 0;
 
-            virtual void applyLoopingParticles(const MWWorld::Ptr& ptr) = 0;
+            virtual void applyLoopingParticles(const MWWorld::Ptr& ptr) const = 0;
 
             virtual const std::vector<std::string>& getContentFiles() const = 0;
 
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 98bfc514ed..0da47a9a74 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -40,6 +40,7 @@
 #include "cellvisitors.hpp"
 #include "cellstore.hpp"
 #include "cellpreloader.hpp"
+#include "worldimp.hpp"
 
 namespace
 {
@@ -97,7 +98,7 @@ namespace
         return model;
     }
 
-    void addObject(const MWWorld::Ptr& ptr, MWPhysics::PhysicsSystem& physics,
+    void addObject(const MWWorld::Ptr& ptr, const MWWorld::World& world, MWPhysics::PhysicsSystem& physics,
                    MWRender::RenderingManager& rendering, std::set<ESM::RefNum>& pagedRefs)
     {
         if (ptr.getRefData().getBaseNode() || physics.getActor(ptr))
@@ -123,7 +124,7 @@ namespace
             rendering.addWaterRippleEmitter(ptr);
 
         // Restore effect particles
-        MWBase::Environment::get().getWorld()->applyLoopingParticles(ptr);
+        world.applyLoopingParticles(ptr);
 
         if (!model.empty())
             ptr.getClass().insertObject(ptr, model, rotation, physics);
@@ -131,7 +132,8 @@ namespace
         MWBase::Environment::get().getLuaManager()->objectAddedToScene(ptr);
     }
 
-    void addObject(const MWWorld::Ptr& ptr, const MWPhysics::PhysicsSystem& physics, DetourNavigator::Navigator& navigator)
+    void addObject(const MWWorld::Ptr& ptr, const MWWorld::World& world, const MWPhysics::PhysicsSystem& physics,
+                   DetourNavigator::Navigator& navigator)
     {
         if (const auto object = physics.getObject(ptr))
         {
@@ -145,7 +147,7 @@ namespace
 
                 const auto center = (aabbMax + aabbMin) * 0.5f;
 
-                const auto distanceFromDoor = MWBase::Environment::get().getWorld()->getMaxActivationDistance() * 0.5f;
+                const auto distanceFromDoor = world.getMaxActivationDistance() * 0.5f;
                 const auto toPoint = aabbMax.x() - aabbMin.x() < aabbMax.y() - aabbMin.y()
                         ? btVector3(distanceFromDoor, 0, 0)
                         : btVector3(0, distanceFromDoor, 0);
@@ -183,7 +185,7 @@ namespace
         }
         else if (physics.getActor(ptr))
         {
-            navigator.addAgent(MWBase::Environment::get().getWorld()->getPathfindingHalfExtents(ptr));
+            navigator.addAgent(world.getPathfindingHalfExtents(ptr));
         }
     }
 
@@ -318,7 +320,6 @@ namespace MWWorld
         ListAndResetObjectsVisitor visitor;
 
         cell->forEach(visitor);
-        const auto world = MWBase::Environment::get().getWorld();
         for (const auto& ptr : visitor.mObjects)
         {
             if (const auto object = mPhysics->getObject(ptr))
@@ -329,7 +330,7 @@ namespace MWWorld
             }
             else if (mPhysics->getActor(ptr))
             {
-                mNavigator.removeAgent(world->getPathfindingHalfExtents(ptr));
+                mNavigator.removeAgent(mWorld.getPathfindingHalfExtents(ptr));
                 mRendering.removeActorPath(ptr);
                 mPhysics->remove(ptr);
             }
@@ -350,17 +351,17 @@ namespace MWWorld
         if (cell->getCell()->hasWater())
             mNavigator.removeWater(osg::Vec2i(cellX, cellY));
 
-        if (const auto pathgrid = world->getStore().get<ESM::Pathgrid>().search(*cell->getCell()))
+        if (const auto pathgrid = mWorld.getStore().get<ESM::Pathgrid>().search(*cell->getCell()))
             mNavigator.removePathgrid(*pathgrid);
 
-        mNavigator.update(world->getPlayerPtr().getRefData().getPosition().asVec3());
+        mNavigator.update(mWorld.getPlayerPtr().getRefData().getPosition().asVec3());
 
         MWBase::Environment::get().getMechanicsManager()->drop (cell);
 
         mRendering.removeCell(cell);
         MWBase::Environment::get().getWindowManager()->removeCell(cell);
 
-        MWBase::Environment::get().getWorld()->getLocalScripts().clearCell (cell);
+        mWorld.getLocalScripts().clearCell (cell);
 
         MWBase::Environment::get().getSoundManager()->stopSound (cell);
         mActiveCells.erase(cell);
@@ -375,8 +376,6 @@ namespace MWWorld
 
         Log(Debug::Info) << "Loading cell " << cell->getCell()->getDescription();
 
-        const auto world = MWBase::Environment::get().getWorld();
-
         const int cellX = cell->getCell()->getGridX();
         const int cellY = cell->getCell()->getGridY();
 
@@ -423,12 +422,12 @@ namespace MWWorld
             }
         }
 
-        if (const auto pathgrid = world->getStore().get<ESM::Pathgrid>().search(*cell->getCell()))
+        if (const auto pathgrid = mWorld.getStore().get<ESM::Pathgrid>().search(*cell->getCell()))
             mNavigator.addPathgrid(*cell->getCell(), *pathgrid);
 
         // register local scripts
         // do this before insertCell, to make sure we don't add scripts from levelled creature spawning twice
-        MWBase::Environment::get().getWorld()->getLocalScripts().addCell (cell);
+        mWorld.getLocalScripts().addCell (cell);
 
         if (respawn)
             cell->respawn();
@@ -459,7 +458,7 @@ namespace MWWorld
         else
             mPhysics->disableWater();
 
-        const auto player = MWBase::Environment::get().getWorld()->getPlayerPtr();
+        const auto player = mWorld.getPlayerPtr();
 
         // The player is loaded before the scene and by default it is grounded, with the scene fully loaded, we validate and correct this.
         if (player.mCell == cell) // Only run once, during initial cell load.
@@ -498,14 +497,14 @@ namespace MWWorld
         if (currentGridCenter)
         {
             float centerX, centerY;
-            MWBase::Environment::get().getWorld()->indexToPosition(currentGridCenter->x(), currentGridCenter->y(), centerX, centerY, true);
+            mWorld.indexToPosition(currentGridCenter->x(), currentGridCenter->y(), centerX, centerY, true);
             float distance = std::max(std::abs(centerX-pos.x()), std::abs(centerY-pos.y()));
             const float maxDistance = Constants::CellSizeInUnits / 2 + mCellLoadingThreshold; // 1/2 cell size + threshold
             if (distance <= maxDistance)
                 return *currentGridCenter;
         }
         osg::Vec2i newCenter;
-        MWBase::Environment::get().getWorld()->positionToIndex(pos.x(), pos.y(), newCenter.x(), newCenter.y());
+        mWorld.positionToIndex(pos.x(), pos.y(), newCenter.x(), newCenter.y());
         return newCenter;
     }
 
@@ -559,7 +558,7 @@ namespace MWWorld
         mRendering.getPagedRefnums(newGrid, mPagedRefs);
 
         std::size_t refsToLoad = 0;
-        const auto cellsToLoad = [&playerCellX,&playerCellY,&refsToLoad](CellStoreCollection& collection, int range) -> std::vector<std::pair<int,int>>
+        const auto cellsToLoad = [&] (CellStoreCollection& collection, int range) -> std::vector<std::pair<int,int>>
         {
             std::vector<std::pair<int, int>> cellsPositionsToLoad;
             for (int x = playerCellX - range; x <= playerCellX + range; ++x)
@@ -568,7 +567,7 @@ namespace MWWorld
                 {
                     if (!isCellInCollection(x, y, collection))
                     {
-                        refsToLoad += MWBase::Environment::get().getWorld()->getExterior(x, y)->count();
+                        refsToLoad += mWorld.getExterior(x, y)->count();
                         cellsPositionsToLoad.emplace_back(x, y);
                     }
                 }
@@ -624,12 +623,12 @@ namespace MWWorld
         {
             if (!isCellInCollection(x, y, mActiveCells))
             {
-                CellStore *cell = MWBase::Environment::get().getWorld()->getExterior(x, y);
+                CellStore *cell = mWorld.getExterior(x, y);
                 loadCell(cell, loadingListener, changeEvent, pos);
             }
         }
 
-        CellStore* current = MWBase::Environment::get().getWorld()->getExterior(playerCellX, playerCellY);
+        CellStore* current = mWorld.getExterior(playerCellX, playerCellY);
         MWBase::Environment::get().getWindowManager()->changeCell(current);
 
         if (changeEvent)
@@ -645,7 +644,7 @@ namespace MWWorld
 
         mRendering.getResourceSystem()->setExpiryDelay(1.f);
 
-        const MWWorld::Store<ESM::Cell> &cells = MWBase::Environment::get().getWorld()->getStore().get<ESM::Cell>();
+        const MWWorld::Store<ESM::Cell> &cells = mWorld.getStore().get<ESM::Cell>();
 
         Loading::Listener* loadingListener = MWBase::Environment::get().getWindowManager()->getLoadingScreen();
         Loading::ScopedLoad load(loadingListener);
@@ -657,7 +656,7 @@ namespace MWWorld
         {
             loadingListener->setLabel("Testing exterior cells ("+std::to_string(i)+"/"+std::to_string(cells.getExtSize())+")...");
 
-            CellStore *cell = MWBase::Environment::get().getWorld()->getExterior(it->mData.mX, it->mData.mY);
+            CellStore *cell = mWorld.getExterior(it->mData.mX, it->mData.mY);
             loadCell(cell, nullptr, false, osg::Vec3f(it->mData.mX + 0.5f, it->mData.mY + 0.5f, 0) * Constants::CellSizeInUnits);
 
             auto iter = mActiveCells.begin();
@@ -690,7 +689,7 @@ namespace MWWorld
 
         mRendering.getResourceSystem()->setExpiryDelay(1.f);
 
-        const MWWorld::Store<ESM::Cell> &cells = MWBase::Environment::get().getWorld()->getStore().get<ESM::Cell>();
+        const MWWorld::Store<ESM::Cell> &cells = mWorld.getStore().get<ESM::Cell>();
 
         Loading::Listener* loadingListener = MWBase::Environment::get().getWindowManager()->getLoadingScreen();
         Loading::ScopedLoad load(loadingListener);
@@ -702,9 +701,9 @@ namespace MWWorld
         {
             loadingListener->setLabel("Testing interior cells ("+std::to_string(i)+"/"+std::to_string(cells.getIntSize())+")...");
 
-            CellStore *cell = MWBase::Environment::get().getWorld()->getInterior(it->mName);
+            CellStore *cell = mWorld.getInterior(it->mName);
             ESM::Position position;
-            MWBase::Environment::get().getWorld()->findInteriorPosition(it->mName, position);
+            mWorld.findInteriorPosition(it->mName, position);
             loadCell(cell, nullptr, false, position.asVec3());
 
             auto iter = mActiveCells.begin();
@@ -737,16 +736,16 @@ namespace MWWorld
 
         mRendering.enableTerrain(cell->isExterior());
 
-        MWBase::World *world = MWBase::Environment::get().getWorld();
-        MWWorld::Ptr old = world->getPlayerPtr();
-        world->getPlayer().setCell(cell);
+        MWWorld::Ptr old = mWorld.getPlayerPtr();
+        mWorld.getPlayer().setCell(cell);
 
-        MWWorld::Ptr player = world->getPlayerPtr();
+        MWWorld::Ptr player = mWorld.getPlayerPtr();
         mRendering.updatePlayerPtr(player);
 
-        if (adjustPlayerPos) {
-            world->moveObject(player, pos.asVec3());
-            world->rotateObject(player, pos.asRotationVec3());
+        if (adjustPlayerPos)
+        {
+            mWorld.moveObject(player, pos.asVec3());
+            mWorld.rotateObject(player, pos.asRotationVec3());
 
             player.getClass().adjustPosition(player, true);
         }
@@ -756,14 +755,15 @@ namespace MWWorld
 
         mPhysics->updatePtr(old, player);
 
-        world->adjustSky();
+        mWorld.adjustSky();
 
         mLastPlayerPos = player.getRefData().getPosition().asVec3();
     }
 
-    Scene::Scene (MWRender::RenderingManager& rendering, MWPhysics::PhysicsSystem *physics,
+    Scene::Scene(MWWorld::World& world, MWRender::RenderingManager& rendering, MWPhysics::PhysicsSystem *physics,
                   DetourNavigator::Navigator& navigator)
-    : mCurrentCell (nullptr), mCellChanged (false), mPhysics(physics), mRendering(rendering), mNavigator(navigator)
+    : mCurrentCell (nullptr), mCellChanged (false)
+    , mWorld(world), mPhysics(physics), mRendering(rendering), mNavigator(navigator)
     , mCellLoadingThreshold(1024.f)
     , mPreloadDistance(Settings::Manager::getInt("preload distance", "Cells"))
     , mPreloadEnabled(Settings::Manager::getBool("preload enabled", "Cells"))
@@ -804,7 +804,7 @@ namespace MWWorld
 
     void Scene::changeToInteriorCell (const std::string& cellName, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent)
     {
-        CellStore *cell = MWBase::Environment::get().getWorld()->getInterior(cellName);
+        CellStore *cell = mWorld.getInterior(cellName);
         bool useFading = (mCurrentCell != nullptr);
         if (useFading)
             MWBase::Environment::get().getWindowManager()->fadeScreenOut(0.5);
@@ -816,12 +816,11 @@ namespace MWWorld
 
         if(mCurrentCell != nullptr && *mCurrentCell == *cell)
         {
-            MWBase::World *world = MWBase::Environment::get().getWorld();
-            world->moveObject(world->getPlayerPtr(), position.asVec3());
-            world->rotateObject(world->getPlayerPtr(), position.asRotationVec3());
+            mWorld.moveObject(mWorld.getPlayerPtr(), position.asVec3());
+            mWorld.rotateObject(mWorld.getPlayerPtr(), position.asRotationVec3());
 
             if (adjustPlayerPos)
-                world->getPlayerPtr().getClass().adjustPosition(world->getPlayerPtr(), true);
+                mWorld.getPlayerPtr().getClass().adjustPosition(mWorld.getPlayerPtr(), true);
             MWBase::Environment::get().getWindowManager()->fadeScreenIn(0.5);
             return;
         }
@@ -850,7 +849,7 @@ namespace MWWorld
         mRendering.configureFog(mCurrentCell->getCell());
 
         // Sky system
-        MWBase::Environment::get().getWorld()->adjustSky();
+        mWorld.adjustSky();
 
         if (changeEvent)
             mCellChanged = true;
@@ -868,14 +867,14 @@ namespace MWWorld
         int x = 0;
         int y = 0;
 
-        MWBase::Environment::get().getWorld()->positionToIndex (position.pos[0], position.pos[1], x, y);
+        mWorld.positionToIndex (position.pos[0], position.pos[1], x, y);
 
         if (changeEvent)
             MWBase::Environment::get().getWindowManager()->fadeScreenOut(0.5);
 
         changeCellGrid(position.asVec3(), x, y, changeEvent);
 
-        CellStore* current = MWBase::Environment::get().getWorld()->getExterior(x, y);
+        CellStore* current = mWorld.getExterior(x, y);
         changePlayerCell(current, position, adjustPlayerPos);
 
         if (changeEvent)
@@ -896,20 +895,20 @@ namespace MWWorld
     {
         InsertVisitor insertVisitor(cell, loadingListener);
         cell.forEach (insertVisitor);
-        insertVisitor.insert([&] (const MWWorld::Ptr& ptr) { addObject(ptr, *mPhysics, mRendering, mPagedRefs); });
-        insertVisitor.insert([&] (const MWWorld::Ptr& ptr) { addObject(ptr, *mPhysics, mNavigator); });
+        insertVisitor.insert([&] (const MWWorld::Ptr& ptr) { addObject(ptr, mWorld, *mPhysics, mRendering, mPagedRefs); });
+        insertVisitor.insert([&] (const MWWorld::Ptr& ptr) { addObject(ptr, mWorld, *mPhysics, mNavigator); });
     }
 
     void Scene::addObjectToScene (const Ptr& ptr)
     {
         try
         {
-            addObject(ptr, *mPhysics, mRendering, mPagedRefs);
-            addObject(ptr, *mPhysics, mNavigator);
-            MWBase::Environment::get().getWorld()->scaleObject(ptr, ptr.getCellRef().getScale());
+            addObject(ptr, mWorld, *mPhysics, mRendering, mPagedRefs);
+            addObject(ptr, mWorld, *mPhysics, mNavigator);
+            mWorld.scaleObject(ptr, ptr.getCellRef().getScale());
             if (mCurrentCell != nullptr)
             {
-                const auto player = MWBase::Environment::get().getWorld()->getPlayerPtr();
+                const auto player = mWorld.getPlayerPtr();
                 mNavigator.update(player.getRefData().getPosition().asVec3());
             }
         }
@@ -929,13 +928,13 @@ namespace MWWorld
             mNavigator.removeObject(DetourNavigator::ObjectId(object));
             if (mCurrentCell != nullptr)
             {
-                const auto player = MWBase::Environment::get().getWorld()->getPlayerPtr();
+                const auto player = mWorld.getPlayerPtr();
                 mNavigator.update(player.getRefData().getPosition().asVec3());
             }
         }
         else if (mPhysics->getActor(ptr))
         {
-            mNavigator.removeAgent(MWBase::Environment::get().getWorld()->getPathfindingHalfExtents(ptr));
+            mNavigator.removeAgent(mWorld.getPathfindingHalfExtents(ptr));
         }
         mPhysics->remove(ptr);
         mRendering.removeObject (ptr);
@@ -1020,7 +1019,7 @@ namespace MWWorld
         if (dt<=1e-06) return;
         std::vector<PositionCellGrid> exteriorPositions;
 
-        const MWWorld::ConstPtr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
+        const MWWorld::ConstPtr player = mWorld.getPlayerPtr();
         osg::Vec3f playerPos = player.getRefData().getPosition().asVec3();
         osg::Vec3f moved = playerPos - mLastPlayerPos;
         osg::Vec3f predictedPos = playerPos + moved / dt * mPredictionTime;
@@ -1070,13 +1069,13 @@ namespace MWWorld
                 try
                 {
                     if (!door.getCellRef().getDestCell().empty())
-                        preloadCell(MWBase::Environment::get().getWorld()->getInterior(door.getCellRef().getDestCell()));
+                        preloadCell(mWorld.getInterior(door.getCellRef().getDestCell()));
                     else
                     {
                         osg::Vec3f pos = door.getCellRef().getDoorDest().asVec3();
                         int x,y;
-                        MWBase::Environment::get().getWorld()->positionToIndex (pos.x(), pos.y(), x, y);
-                        preloadCell(MWBase::Environment::get().getWorld()->getExterior(x,y), true);
+                        mWorld.positionToIndex (pos.x(), pos.y(), x, y);
+                        preloadCell(mWorld.getExterior(x,y), true);
                         exteriorPositions.emplace_back(pos, gridCenterToBounds(getNewGridCenter(pos)));
                     }
                 }
@@ -1090,7 +1089,7 @@ namespace MWWorld
 
     void Scene::preloadExteriorGrid(const osg::Vec3f& playerPos, const osg::Vec3f& predictedPos)
     {
-        if (!MWBase::Environment::get().getWorld()->isCellExterior())
+        if (!mWorld.isCellExterior())
             return;
 
         int halfGridSizePlusOne = mHalfGridSize + 1;
@@ -1100,7 +1099,7 @@ namespace MWWorld
         cellX = mCurrentGridCenter.x(); cellY = mCurrentGridCenter.y();
 
         float centerX, centerY;
-        MWBase::Environment::get().getWorld()->indexToPosition(cellX, cellY, centerX, centerY, true);
+        mWorld.indexToPosition(cellX, cellY, centerX, centerY, true);
 
         for (int dx = -halfGridSizePlusOne; dx <= halfGridSizePlusOne; ++dx)
         {
@@ -1110,14 +1109,14 @@ namespace MWWorld
                     continue; // only care about the outer (not yet loaded) part of the grid
 
                 float thisCellCenterX, thisCellCenterY;
-                MWBase::Environment::get().getWorld()->indexToPosition(cellX+dx, cellY+dy, thisCellCenterX, thisCellCenterY, true);
+                mWorld.indexToPosition(cellX+dx, cellY+dy, thisCellCenterX, thisCellCenterY, true);
 
                 float dist = std::max(std::abs(thisCellCenterX - playerPos.x()), std::abs(thisCellCenterY - playerPos.y()));
                 dist = std::min(dist,std::max(std::abs(thisCellCenterX - predictedPos.x()), std::abs(thisCellCenterY - predictedPos.y())));
                 float loadDist = Constants::CellSizeInUnits / 2 + Constants::CellSizeInUnits - mCellLoadingThreshold + mPreloadDistance;
 
                 if (dist < loadDist)
-                    preloadCell(MWBase::Environment::get().getWorld()->getExterior(cellX+dx, cellY+dy));
+                    preloadCell(mWorld.getExterior(cellX+dx, cellY+dy));
             }
         }
     }
@@ -1133,7 +1132,7 @@ namespace MWWorld
             {
                 for (int dy = -mHalfGridSize; dy <= mHalfGridSize; ++dy)
                 {
-                    mPreloader->preload(MWBase::Environment::get().getWorld()->getExterior(x+dx, y+dy), mRendering.getReferenceTime());
+                    mPreloader->preload(mWorld.getExterior(x+dx, y+dy), mRendering.getReferenceTime());
                     if (++numpreloaded >= mPreloader->getMaxCacheSize())
                         break;
                 }
@@ -1196,7 +1195,7 @@ namespace MWWorld
 
     void Scene::preloadFastTravelDestinations(const osg::Vec3f& playerPos, const osg::Vec3f& /*predictedPos*/, std::vector<PositionCellGrid>& exteriorPositions) // ignore predictedPos here since opening dialogue with travel service takes extra time
     {
-        const MWWorld::ConstPtr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
+        const MWWorld::ConstPtr player = mWorld.getPlayerPtr();
         ListFastTravelDestinationsVisitor listVisitor(mPreloadDistance, player.getRefData().getPosition().asVec3());
 
         for (MWWorld::CellStore* cellStore : mActiveCells)
@@ -1208,13 +1207,13 @@ namespace MWWorld
         for (ESM::Transport::Dest& dest : listVisitor.mList)
         {
             if (!dest.mCellName.empty())
-                preloadCell(MWBase::Environment::get().getWorld()->getInterior(dest.mCellName));
+                preloadCell(mWorld.getInterior(dest.mCellName));
             else
             {
                 osg::Vec3f pos = dest.mPos.asVec3();
                 int x,y;
-                MWBase::Environment::get().getWorld()->positionToIndex( pos.x(), pos.y(), x, y);
-                preloadCell(MWBase::Environment::get().getWorld()->getExterior(x,y), true);
+                mWorld.positionToIndex( pos.x(), pos.y(), x, y);
+                preloadCell(mWorld.getExterior(x,y), true);
                 exteriorPositions.emplace_back(pos, gridCenterToBounds(getNewGridCenter(pos)));
             }
         }
diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp
index 371c3cbbc5..fd66d71cf2 100644
--- a/apps/openmw/mwworld/scene.hpp
+++ b/apps/openmw/mwworld/scene.hpp
@@ -62,6 +62,7 @@ namespace MWWorld
     class Player;
     class CellStore;
     class CellPreloader;
+    class World;
 
     enum class RotationOrder
     {
@@ -85,6 +86,7 @@ namespace MWWorld
             CellStore* mCurrentCell; // the cell the player is in
             CellStoreCollection mActiveCells;
             bool mCellChanged;
+            MWWorld::World& mWorld;
             MWPhysics::PhysicsSystem *mPhysics;
             MWRender::RenderingManager& mRendering;
             DetourNavigator::Navigator& mNavigator;
@@ -131,7 +133,7 @@ namespace MWWorld
 
         public:
 
-            Scene (MWRender::RenderingManager& rendering, MWPhysics::PhysicsSystem *physics,
+            Scene(MWWorld::World& world, MWRender::RenderingManager& rendering, MWPhysics::PhysicsSystem *physics,
                    DetourNavigator::Navigator& navigator);
 
             ~Scene();
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index c7d253b4c5..851ba2daf4 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -201,7 +201,7 @@ namespace MWWorld
 
         mWeatherManager.reset(new MWWorld::WeatherManager(*mRendering, mStore));
 
-        mWorldScene.reset(new Scene(*mRendering.get(), mPhysics.get(), *mNavigator));
+        mWorldScene.reset(new Scene(*this, *mRendering.get(), mPhysics.get(), *mNavigator));
     }
 
     void World::fillGlobalVariables()
@@ -1035,7 +1035,7 @@ namespace MWWorld
         return mWorldScene->markCellAsUnchanged();
     }
 
-    float World::getMaxActivationDistance ()
+    float World::getMaxActivationDistance() const
     {
         if (mActivationDistanceOverride >= 0)
             return static_cast<float>(mActivationDistanceOverride);
@@ -3175,7 +3175,7 @@ namespace MWWorld
         mProjectileManager->updateCasters();
     }
 
-    void World::applyLoopingParticles(const MWWorld::Ptr& ptr)
+    void World::applyLoopingParticles(const MWWorld::Ptr& ptr) const
     {
         const MWWorld::Class &cls = ptr.getClass();
         if (cls.isActor())
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index d5ff82f52d..02d6d4afb7 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -396,7 +396,7 @@ namespace MWWorld
             ///< Place an object in a safe place next to \a referenceObject. \a direction and \a distance specify the wanted placement
             /// relative to \a referenceObject (but the object may be placed somewhere else if the wanted location is obstructed).
 
-            float getMaxActivationDistance() override;
+            float getMaxActivationDistance() const override;
 
             void indexToPosition (int cellX, int cellY, float &x, float &y, bool centre = false)
                 const override;
@@ -643,7 +643,7 @@ namespace MWWorld
                                            const osg::Vec3f& worldPos, const osg::Quat& orient, MWWorld::Ptr& bow, float speed, float attackStrength) override;
             void updateProjectilesCasters() override;
 
-            void applyLoopingParticles(const MWWorld::Ptr& ptr) override;
+            void applyLoopingParticles(const MWWorld::Ptr& ptr) const override;
 
             const std::vector<std::string>& getContentFiles() const override;
             void breakInvisibility (const MWWorld::Ptr& actor) override;

From 31bd87936fc9d417a98622ac639e3c286d55e691 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 6 May 2022 21:06:14 +0200
Subject: [PATCH 2411/2859] Remove redundant virtual World::adjustSky function

---
 apps/openmw/mwbase/world.hpp     | 2 --
 apps/openmw/mwworld/worldimp.hpp | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index f78befe470..336af37a89 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -150,8 +150,6 @@ namespace MWBase
             virtual bool toggleWorld() = 0;
             virtual bool toggleBorders() = 0;
 
-            virtual void adjustSky() = 0;
-
             virtual MWWorld::Player& getPlayer() = 0;
             virtual MWWorld::Ptr getPlayerPtr() = 0;
             virtual MWWorld::ConstPtr getPlayerConstPtr() const = 0;
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 02d6d4afb7..8098c6ec20 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -232,7 +232,7 @@ namespace MWWorld
             bool toggleWorld() override;
             bool toggleBorders() override;
 
-            void adjustSky() override;
+            void adjustSky();
 
             Player& getPlayer() override;
             MWWorld::Ptr getPlayerPtr() override;

From 9c5887aab6b5b4a04c9832a2511e842a9d60de55 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Mon, 2 May 2022 22:04:19 +0200
Subject: [PATCH 2412/2859] Add NPC and Creature record bindings

---
 apps/openmw/CMakeLists.txt           |  2 +-
 apps/openmw/mwlua/types/creature.cpp | 31 ++++++++++++++++++++++++++++
 apps/openmw/mwlua/types/npc.cpp      | 24 +++++++++++++++++++++
 apps/openmw/mwlua/types/types.cpp    |  2 +-
 apps/openmw/mwlua/types/types.hpp    |  1 +
 files/lua_api/openmw/types.lua       | 26 +++++++++++++++++++++++
 6 files changed, 84 insertions(+), 2 deletions(-)
 create mode 100644 apps/openmw/mwlua/types/creature.cpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 6f35e53fd1..7bbf179d95 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -60,7 +60,7 @@ add_openmw_dir (mwlua
     luamanagerimp object worldview userdataserializer eventqueue
     luabindings localscripts playerscripts objectbindings cellbindings asyncbindings settingsbindings
     camerabindings uibindings inputbindings nearbybindings stats
-    types/types types/door types/actor types/container types/weapon types/npc
+    types/types types/door types/actor types/container types/weapon types/npc types/creature
     )
 
 add_openmw_dir (mwsound
diff --git a/apps/openmw/mwlua/types/creature.cpp b/apps/openmw/mwlua/types/creature.cpp
new file mode 100644
index 0000000000..87be291493
--- /dev/null
+++ b/apps/openmw/mwlua/types/creature.cpp
@@ -0,0 +1,31 @@
+#include "types.hpp"
+
+#include <components/esm3/loadcrea.hpp>
+
+#include <apps/openmw/mwworld/esmstore.hpp>
+
+#include "../stats.hpp"
+#include "../luabindings.hpp"
+
+namespace sol
+{
+    template <>
+    struct is_automagical<ESM::Creature> : std::false_type {};
+}
+
+namespace MWLua
+{
+    void addCreatureBindings(sol::table creature, const Context& context)
+    {
+        const MWWorld::Store<ESM::Creature>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Creature>();
+        creature["record"] = sol::overload(
+            [](const Object& obj) -> const ESM::Creature* { return obj.ptr().get<ESM::Creature>()->mBase; },
+            [store](const std::string& recordId) -> const ESM::Creature* { return store->find(recordId); });
+        sol::usertype<ESM::Creature> record = context.mLua->sol().new_usertype<ESM::Creature>("ESM3_Creature");
+        record[sol::meta_function::to_string] = [](const ESM::Creature& rec) { return "ESM3_Creature[" + rec.mId + "]"; };
+        record["name"] = sol::readonly_property([](const ESM::Creature& rec) -> std::string { return rec.mName; });
+        record["model"] = sol::readonly_property([](const ESM::Creature& rec) -> std::string { return rec.mModel; });
+        record["mwscript"] = sol::readonly_property([](const ESM::Creature& rec) -> std::string { return rec.mScript; });
+        record["baseCreature"] = sol::readonly_property([](const ESM::Creature& rec) -> std::string { return rec.mOriginal; });
+    }
+}
diff --git a/apps/openmw/mwlua/types/npc.cpp b/apps/openmw/mwlua/types/npc.cpp
index 8dafbe1e8a..0c9dd3fb9c 100644
--- a/apps/openmw/mwlua/types/npc.cpp
+++ b/apps/openmw/mwlua/types/npc.cpp
@@ -1,11 +1,35 @@
 #include "types.hpp"
 
+#include <components/esm3/loadnpc.hpp>
+
+#include <apps/openmw/mwworld/esmstore.hpp>
+
 #include "../stats.hpp"
+#include "../luabindings.hpp"
+
+namespace sol
+{
+    template <>
+    struct is_automagical<ESM::NPC> : std::false_type {};
+}
 
 namespace MWLua
 {
     void addNpcBindings(sol::table npc, const Context& context)
     {
         addNpcStatsBindings(npc, context);
+
+        const MWWorld::Store<ESM::NPC>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::NPC>();
+        npc["record"] = sol::overload(
+            [](const Object& obj) -> const ESM::NPC* { return obj.ptr().get<ESM::NPC>()->mBase; },
+            [store](const std::string& recordId) -> const ESM::NPC* { return store->find(recordId); });
+        sol::usertype<ESM::NPC> record = context.mLua->sol().new_usertype<ESM::NPC>("ESM3_NPC");
+        record[sol::meta_function::to_string] = [](const ESM::NPC& rec) { return "ESM3_NPC[" + rec.mId + "]"; };
+        record["name"] = sol::readonly_property([](const ESM::NPC& rec) -> std::string { return rec.mName; });
+        record["race"] = sol::readonly_property([](const ESM::NPC& rec) -> std::string { return rec.mRace; });
+        record["class"] = sol::readonly_property([](const ESM::NPC& rec) -> std::string { return rec.mClass; });
+        record["mwscript"] = sol::readonly_property([](const ESM::NPC& rec) -> std::string { return rec.mScript; });
+        record["hair"] = sol::readonly_property([](const ESM::NPC& rec) -> std::string { return rec.mHair; });
+        record["head"] = sol::readonly_property([](const ESM::NPC& rec) -> std::string { return rec.mHead; });
     }
 }
diff --git a/apps/openmw/mwlua/types/types.cpp b/apps/openmw/mwlua/types/types.cpp
index d696fb9715..f8b20ea59c 100644
--- a/apps/openmw/mwlua/types/types.cpp
+++ b/apps/openmw/mwlua/types/types.cpp
@@ -155,7 +155,7 @@ namespace MWLua
                                        ESM::REC_LIGH, ESM::REC_MISC, ESM::REC_ALCH, ESM::REC_WEAP,
                                        ESM::REC_APPA, ESM::REC_LOCK, ESM::REC_PROB, ESM::REC_REPA});
 
-        addType(ObjectTypeName::Creature, {ESM::REC_CREA}, ObjectTypeName::Actor);
+        addCreatureBindings(addType(ObjectTypeName::Creature, {ESM::REC_CREA}, ObjectTypeName::Actor), context);
         addNpcBindings(addType(ObjectTypeName::NPC, {ESM::REC_INTERNAL_PLAYER, ESM::REC_NPC_}, ObjectTypeName::Actor), context);
         addType(ObjectTypeName::Player, {ESM::REC_INTERNAL_PLAYER}, ObjectTypeName::NPC);
 
diff --git a/apps/openmw/mwlua/types/types.hpp b/apps/openmw/mwlua/types/types.hpp
index cb345b7d01..bd4cb5e384 100644
--- a/apps/openmw/mwlua/types/types.hpp
+++ b/apps/openmw/mwlua/types/types.hpp
@@ -29,6 +29,7 @@ namespace MWLua
     void addActorBindings(sol::table actor, const Context& context);
     void addWeaponBindings(sol::table weapon, const Context& context);
     void addNpcBindings(sol::table npc, const Context& context);
+    void addCreatureBindings(sol::table creature, const Context& context);
 }
 
 #endif // MWLUA_TYPES_H
diff --git a/files/lua_api/openmw/types.lua b/files/lua_api/openmw/types.lua
index d62d92169d..ae40cee595 100644
--- a/files/lua_api/openmw/types.lua
+++ b/files/lua_api/openmw/types.lua
@@ -441,6 +441,19 @@
 -- @param openmw.core#GameObject object
 -- @return #boolean
 
+---
+-- Returns the read-only @{#CreatureRecord} of a creature
+-- @function [parent=#Creature] record
+-- @param #any objectOrRecordId
+-- @return #CreatureRecord
+
+---
+-- @type CreatureRecord
+-- @field #string name
+-- @field #string baseCreature Record id of a base creature, which was modified to create this one
+-- @field #string model VFS path to the creature's model
+-- @field #string mwscript
+
 
 
 --- @{#NPC} functions
@@ -458,7 +471,20 @@
 -- @param openmw.core#GameObject object
 -- @return #boolean
 
+---
+-- Returns the read-only @{#NpcRecord} of an NPC
+-- @function [parent=#NPC] record
+-- @param #any objectOrRecordId
+-- @return #NpcRecord
 
+---
+-- @type NpcRecord
+-- @field #string name
+-- @field #string race
+-- @field #string class Name of the NPC's class (e. g. Acrobat)
+-- @field #string mwscript MWScript that is attached to this NPC
+-- @field #string hair Path to the hair body part model
+-- @field #string head Path to the head body part model
 
 --- @{#Player} functions
 -- @field [parent=#types] #Player Player

From 87ca575d60e40e57bc341043094179308e0d5ae9 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 6 May 2022 23:59:27 +0200
Subject: [PATCH 2413/2859] List private members of MWMechanics::Actors in a
 single place

---
 apps/openmw/mwmechanics/actors.hpp | 46 ++++++++++++++----------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index f1985377e8..ff992399b0 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -39,24 +39,6 @@ namespace MWMechanics
 
     class Actors
     {
-            std::map<std::string, int> mDeathCount;
-
-            void adjustMagicEffects (const MWWorld::Ptr& creature, float duration);
-
-            void calculateRestoration (const MWWorld::Ptr& ptr, float duration);
-
-            void updateDrowning (const MWWorld::Ptr& ptr, float duration, bool isKnockedOut, bool isPlayer);
-
-            void updateEquippedLight (const MWWorld::Ptr& ptr, float duration, bool mayEquip);
-
-            void updateCrimePursuit (const MWWorld::Ptr& ptr, float duration);
-
-            void killDeadActors ();
-
-            void purgeSpellEffects (int casterActorId);
-
-            void predictAndAvoidCollisions(float duration);
-
         public:
 
             Actors();
@@ -200,14 +182,30 @@ namespace MWMechanics
             GreetingState getGreetingState(const MWWorld::Ptr& ptr) const;
             bool isTurningToPlayer(const MWWorld::Ptr& ptr) const;
 
-    private:
-        void updateVisibility (const MWWorld::Ptr& ptr, CharacterController* ctrl);
+        private:
+            std::map<std::string, int> mDeathCount;
+            PtrActorMap mActors;
+            float mTimerDisposeSummonsCorpses;
+            float mActorsProcessingRange;
+            bool mSmoothMovement;
 
-        PtrActorMap mActors;
-        float mTimerDisposeSummonsCorpses;
-        float mActorsProcessingRange;
+            void updateVisibility (const MWWorld::Ptr& ptr, CharacterController* ctrl);
 
-        bool mSmoothMovement;
+            void adjustMagicEffects (const MWWorld::Ptr& creature, float duration);
+
+            void calculateRestoration (const MWWorld::Ptr& ptr, float duration);
+
+            void updateDrowning (const MWWorld::Ptr& ptr, float duration, bool isKnockedOut, bool isPlayer);
+
+            void updateEquippedLight (const MWWorld::Ptr& ptr, float duration, bool mayEquip);
+
+            void updateCrimePursuit (const MWWorld::Ptr& ptr, float duration);
+
+            void killDeadActors ();
+
+            void purgeSpellEffects (int casterActorId);
+
+            void predictAndAvoidCollisions(float duration);
     };
 }
 

From 66c9b6c19984a993e700ed22110a6aa021d52253 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 7 May 2022 00:11:12 +0200
Subject: [PATCH 2414/2859] Make MWMechanics::Actors local static variables to
 be members

---
 apps/openmw/mwmechanics/actors.cpp | 63 +++++++++++++++---------------
 apps/openmw/mwmechanics/actors.hpp | 12 ++++++
 2 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index a659c30341..a209535cd2 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1207,18 +1207,17 @@ namespace MWMechanics
         }
 
         // check if we still have any player enemies to switch music
-        static int currentMusic = 0;
-
-        if (currentMusic != 1 && !hasHostiles && !(player.getClass().getCreatureStats(player).isDead() &&
-        MWBase::Environment::get().getSoundManager()->isMusicPlaying()))
+        if (mCurrentMusic != MusicType::Explore && !hasHostiles
+                && !(player.getClass().getCreatureStats(player).isDead()
+                     && MWBase::Environment::get().getSoundManager()->isMusicPlaying()))
         {
             MWBase::Environment::get().getSoundManager()->playPlaylist(std::string("Explore"));
-            currentMusic = 1;
+            mCurrentMusic = MusicType::Explore;
         }
-        else if (currentMusic != 2 && hasHostiles)
+        else if (mCurrentMusic != MusicType::Battle && hasHostiles)
         {
             MWBase::Environment::get().getSoundManager()->playPlaylist(std::string("Battle"));
-            currentMusic = 2;
+            mCurrentMusic = MusicType::Battle;
         }
 
     }
@@ -1374,15 +1373,19 @@ namespace MWMechanics
     {
         if(!paused)
         {
-            static float timerUpdateHeadTrack = 0;
-            static float timerUpdateEquippedLight = 0;
-            static float timerUpdateHello = 0;
             const float updateEquippedLightInterval = 1.0f;
 
-            if (timerUpdateHeadTrack >= 0.3f) timerUpdateHeadTrack = 0;
-            if (timerUpdateHello >= 0.25f) timerUpdateHello = 0;
-            if (mTimerDisposeSummonsCorpses >= 0.2f) mTimerDisposeSummonsCorpses = 0;
-            if (timerUpdateEquippedLight >= updateEquippedLightInterval) timerUpdateEquippedLight = 0;
+            if (mTimerUpdateHeadTrack >= 0.3f)
+                mTimerUpdateHeadTrack = 0;
+
+            if (mTimerUpdateHello >= 0.25f)
+                mTimerUpdateHello = 0;
+
+            if (mTimerDisposeSummonsCorpses >= 0.2f)
+                mTimerDisposeSummonsCorpses = 0;
+
+            if (mTimerUpdateEquippedLight >= updateEquippedLightInterval)
+                mTimerUpdateEquippedLight = 0;
 
             // show torches only when there are darkness and no precipitations
             MWBase::World* world = MWBase::Environment::get().getWorld();
@@ -1470,7 +1473,7 @@ namespace MWMechanics
                                 engageCombat(iter->first, it->first, cachedAllies, it->first == player);
                             }
                         }
-                        if (timerUpdateHeadTrack == 0)
+                        if (mTimerUpdateHeadTrack == 0)
                         {
                             float sqrHeadTrackDistance = std::numeric_limits<float>::max();
                             MWWorld::Ptr headTrackTarget;
@@ -1518,7 +1521,7 @@ namespace MWMechanics
                             if (isConscious(iter->first) && !(luaControls && luaControls->mDisableAI))
                             {
                                 stats.getAiSequence().execute(iter->first, *ctrl, duration);
-                                updateGreetingState(iter->first, *iter->second, timerUpdateHello > 0);
+                                updateGreetingState(iter->first, *iter->second, mTimerUpdateHello > 0);
                                 playIdleDialogue(iter->first);
                                 updateMovementSpeed(iter->first);
                             }
@@ -1535,7 +1538,7 @@ namespace MWMechanics
                         // We can not update drowning state for actors outside of AI distance - they can not resurface to breathe
                         updateDrowning(iter->first, duration, ctrl->isKnockedOut(), isPlayer);
                     }
-                    if(timerUpdateEquippedLight == 0 && iter->first.getClass().hasInventoryStore(iter->first))
+                    if(mTimerUpdateEquippedLight == 0 && iter->first.getClass().hasInventoryStore(iter->first))
                         updateEquippedLight(iter->first, updateEquippedLightInterval, showTorches);
 
                     if (luaControls && isConscious(iter->first))
@@ -1577,9 +1580,9 @@ namespace MWMechanics
             if (avoidCollisions)
                 predictAndAvoidCollisions(duration);
 
-            timerUpdateHeadTrack += duration;
-            timerUpdateEquippedLight += duration;
-            timerUpdateHello += duration;
+            mTimerUpdateHeadTrack += duration;
+            mTimerUpdateEquippedLight += duration;
+            mTimerUpdateHello += duration;
             mTimerDisposeSummonsCorpses += duration;
 
             // Animation/movement update
@@ -1829,8 +1832,6 @@ namespace MWMechanics
 
     void Actors::updateSneaking(CharacterController* ctrl, float duration)
     {
-        static float sneakTimer = 0.f; // Times update of sneak icon
-
         if (!ctrl)
         {
             MWBase::Environment::get().getWindowManager()->setSneakVisibility(false);
@@ -1845,17 +1846,15 @@ namespace MWMechanics
             return;
         }
 
-        static float sneakSkillTimer = 0.f; // Times sneak skill progress from "avoid notice"
-
         MWBase::World* world = MWBase::Environment::get().getWorld();
         const MWWorld::Store<ESM::GameSetting>& gmst = world->getStore().get<ESM::GameSetting>();
         static const float fSneakUseDist = gmst.find("fSneakUseDist")->mValue.getFloat();
         static const float fSneakUseDelay = gmst.find("fSneakUseDelay")->mValue.getFloat();
 
-        if (sneakTimer >= fSneakUseDelay)
-            sneakTimer = 0.f;
+        if (mSneakTimer >= fSneakUseDelay)
+            mSneakTimer = 0.f;
 
-        if (sneakTimer == 0.f)
+        if (mSneakTimer == 0.f)
         {
             // Set when an NPC is within line of sight and distance, but is still unaware. Used for skill progress.
             bool avoidedNotice = false;
@@ -1893,18 +1892,18 @@ namespace MWMechanics
                 }
             }
 
-            if (sneakSkillTimer >= fSneakUseDelay)
-                sneakSkillTimer = 0.f;
+            if (mSneakSkillTimer >= fSneakUseDelay)
+                mSneakSkillTimer = 0.f;
 
-            if (avoidedNotice && sneakSkillTimer == 0.f)
+            if (avoidedNotice && mSneakSkillTimer == 0.f)
                 player.getClass().skillUsageSucceeded(player, ESM::Skill::Sneak, 0);
 
             if (!detected)
                 MWBase::Environment::get().getWindowManager()->setSneakVisibility(true);
         }
 
-        sneakTimer += duration;
-        sneakSkillTimer += duration;
+        mSneakTimer += duration;
+        mSneakSkillTimer += duration;
     }
 
     int Actors::getHoursToRest(const MWWorld::Ptr &ptr) const
diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index ff992399b0..1bc45774d0 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -183,11 +183,23 @@ namespace MWMechanics
             bool isTurningToPlayer(const MWWorld::Ptr& ptr) const;
 
         private:
+            enum class MusicType
+            {
+                Explore,
+                Battle
+            };
+
             std::map<std::string, int> mDeathCount;
             PtrActorMap mActors;
             float mTimerDisposeSummonsCorpses;
+            float mTimerUpdateHeadTrack = 0;
+            float mTimerUpdateEquippedLight = 0;
+            float mTimerUpdateHello = 0;
+            float mSneakTimer = 0; // Times update of sneak icon
+            float mSneakSkillTimer = 0; // Times sneak skill progress from "avoid notice"
             float mActorsProcessingRange;
             bool mSmoothMovement;
+            MusicType mCurrentMusic = MusicType::Explore;
 
             void updateVisibility (const MWWorld::Ptr& ptr, CharacterController* ctrl);
 

From ef64587cbfff83de5d1bf4f3b296f23081cc3940 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 7 May 2022 00:12:00 +0200
Subject: [PATCH 2415/2859] Mark unchanging static as const

---
 apps/openmw/mwmechanics/actors.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index a209535cd2..5e2e083648 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -380,7 +380,7 @@ namespace MWMechanics
             return;
 
         // Play a random voice greeting if the player gets too close
-        static int iGreetDistanceMultiplier = MWBase::Environment::get().getWorld()->getStore()
+        static const int iGreetDistanceMultiplier = MWBase::Environment::get().getWorld()->getStore()
             .get<ESM::GameSetting>().find("iGreetDistanceMultiplier")->mValue.getInteger();
 
         float helloDistance = static_cast<float>(actorStats.getAiSetting(CreatureStats::AI_Hello).getModified() * iGreetDistanceMultiplier);

From 05901a2480c89e1aa3710fa469a8d6b193415a62 Mon Sep 17 00:00:00 2001
From: cody glassman <glassmancody.info@gmail.com>
Date: Tue, 3 May 2022 22:50:31 -0700
Subject: [PATCH 2416/2859] add borderless windows, deprecate fullscreen mode

---
 CHANGELOG.md                                  |   1 +
 apps/launcher/graphicspage.cpp                |  18 +--
 apps/openmw/engine.cpp                        |   8 +-
 apps/openmw/mwgui/settingswindow.cpp          | 113 +++++++++++-------
 apps/openmw/mwgui/settingswindow.hpp          |   8 +-
 apps/openmw/mwgui/windowmanagerimp.cpp        |   4 +-
 components/sdlutil/sdlvideowrapper.cpp        |   7 +-
 components/sdlutil/sdlvideowrapper.hpp        |   7 +-
 components/settings/settings.hpp              |   7 ++
 .../reference/modding/settings/video.rst      |  22 ++--
 files/mygui/openmw_settings_window.layout     |  22 ++--
 files/settings-default.cfg                    |   5 +-
 files/ui/graphicspage.ui                      |  30 ++++-
 13 files changed, 163 insertions(+), 89 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd762a82ac..c7396ba328 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -157,6 +157,7 @@
     Feature #6600: Support NiSortAdjustNode
     Feature #6684: Support NiFltAnimationNode
     Feature #6699: Ignored flag
+    Feature #6700: Support borderless fullscreen
     Feature #6706: Save the size of the Options window
     Feature #6721: [OpenMW-CS] Add option to open records in new window
     Task #6201: Remove the "Note: No relevant classes found. No output generated" warnings
diff --git a/apps/launcher/graphicspage.cpp b/apps/launcher/graphicspage.cpp
index e6d857a943..d3e5d1c86d 100644
--- a/apps/launcher/graphicspage.cpp
+++ b/apps/launcher/graphicspage.cpp
@@ -42,7 +42,7 @@ Launcher::GraphicsPage::GraphicsPage(QWidget *parent)
     customWidthSpinBox->setMaximum(res.width());
     customHeightSpinBox->setMaximum(res.height());
 
-    connect(fullScreenCheckBox, SIGNAL(stateChanged(int)), this, SLOT(slotFullScreenChanged(int)));
+    connect(windowModeComboBox, SIGNAL(currentIndexChanged(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)));
@@ -94,8 +94,10 @@ bool Launcher::GraphicsPage::loadSettings()
     if (Settings::Manager::getBool("vsync", "Video"))
         vSyncCheckBox->setCheckState(Qt::Checked);
 
-    if (Settings::Manager::getBool("fullscreen", "Video"))
-        fullScreenCheckBox->setCheckState(Qt::Checked);
+    size_t windowMode = static_cast<size_t>(Settings::Manager::getInt("window mode", "Video"));
+    if (windowMode > static_cast<size_t>(Settings::WindowMode::Windowed))
+        windowMode = 0;
+    windowModeComboBox->setCurrentIndex(windowMode);
 
     if (Settings::Manager::getBool("window border", "Video"))
         windowBorderCheckBox->setCheckState(Qt::Checked);
@@ -183,9 +185,9 @@ void Launcher::GraphicsPage::saveSettings()
     if (cVSync != Settings::Manager::getBool("vsync", "Video"))
         Settings::Manager::setBool("vsync", "Video", cVSync);
 
-    bool cFullScreen = fullScreenCheckBox->checkState();
-    if (cFullScreen != Settings::Manager::getBool("fullscreen", "Video"))
-        Settings::Manager::setBool("fullscreen", "Video", cFullScreen);
+    int cWindowMode = windowModeComboBox->currentIndex();
+    if (cWindowMode != Settings::Manager::getInt("window mode", "Video"))
+        Settings::Manager::setInt("window mode", "Video", cWindowMode);
 
     bool cWindowBorder = windowBorderCheckBox->checkState();
     if (cWindowBorder != Settings::Manager::getBool("window border", "Video"))
@@ -355,9 +357,9 @@ void Launcher::GraphicsPage::screenChanged(int screen)
     }
 }
 
-void Launcher::GraphicsPage::slotFullScreenChanged(int state)
+void Launcher::GraphicsPage::slotFullScreenChanged(int mode)
 {
-    if (state == Qt::Checked) {
+    if (mode == static_cast<int>(Settings::WindowMode::Fullscreen) || mode == static_cast<int>(Settings::WindowMode::BorderlessFullscreen)) {
         standardRadioButton->toggle();
         customRadioButton->setEnabled(false);
         customWidthSpinBox->setEnabled(false);
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index a99bd72831..2e12fecd39 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -554,7 +554,7 @@ void OMW::Engine::createWindow(Settings::Manager& settings)
     int screen = settings.getInt("screen", "Video");
     int width = settings.getInt("resolution x", "Video");
     int height = settings.getInt("resolution y", "Video");
-    bool fullscreen = settings.getBool("fullscreen", "Video");
+    Settings::WindowMode windowMode = static_cast<Settings::WindowMode>(Settings::Manager::getInt("window mode", "Video"));
     bool windowBorder = settings.getBool("window border", "Video");
     bool vsync = settings.getBool("vsync", "Video");
     unsigned int antialiasing = std::max(0, settings.getInt("antialiasing", "Video"));
@@ -562,15 +562,17 @@ void OMW::Engine::createWindow(Settings::Manager& settings)
     int pos_x = SDL_WINDOWPOS_CENTERED_DISPLAY(screen),
         pos_y = SDL_WINDOWPOS_CENTERED_DISPLAY(screen);
 
-    if(fullscreen)
+    if(windowMode == Settings::WindowMode::Fullscreen || windowMode == Settings::WindowMode::BorderlessFullscreen)
     {
         pos_x = SDL_WINDOWPOS_UNDEFINED_DISPLAY(screen);
         pos_y = SDL_WINDOWPOS_UNDEFINED_DISPLAY(screen);
     }
 
     Uint32 flags = SDL_WINDOW_OPENGL|SDL_WINDOW_SHOWN|SDL_WINDOW_RESIZABLE;
-    if(fullscreen)
+    if(windowMode == Settings::WindowMode::Fullscreen)
         flags |= SDL_WINDOW_FULLSCREEN;
+    else if (windowMode == Settings::WindowMode::BorderlessFullscreen)
+        flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
 
     // Allows for Windows snapping features to properly work in borderless window
     SDL_SetHint("SDL_BORDERLESS_WINDOWED_STYLE", "1");
diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index e79132f0ab..95a555da99 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -224,7 +224,7 @@ namespace MWGui
         getWidget(mSettingsTab, "SettingsTab");
         getWidget(mOkButton, "OkButton");
         getWidget(mResolutionList, "ResolutionList");
-        getWidget(mFullscreenButton, "FullscreenButton");
+        getWidget(mWindowModeList, "WindowModeList");
         getWidget(mWindowBorderButton, "WindowBorderButton");
         getWidget(mTextureFilteringButton, "TextureFilteringButton");
         getWidget(mAnisotropyBox, "AnisotropyBox");
@@ -274,6 +274,8 @@ namespace MWGui
         mLightsResetButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onLightsResetButtonClicked);
         mMaxLights->eventComboChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onMaxLightsChanged);
 
+        mWindowModeList->eventComboChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onWindowModeChanged);
+
         mKeyboardSwitch->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onKeyboardSwitchClicked);
         mControllerSwitch->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onControllerSwitchClicked);
 
@@ -325,7 +327,8 @@ namespace MWGui
 
         updateMaxLightsComboBox(mMaxLights);
 
-        mWindowBorderButton->setEnabled(!Settings::Manager::getBool("fullscreen", "Video"));
+        Settings::WindowMode windowMode = static_cast<Settings::WindowMode>(Settings::Manager::getInt("window mode", "Video"));
+        mWindowBorderButton->setEnabled(windowMode != Settings::WindowMode::Fullscreen && windowMode != Settings::WindowMode::BorderlessFullscreen);
 
         mKeyboardSwitch->setStateSelected(true);
         mControllerSwitch->setStateSelected(false);
@@ -433,6 +436,15 @@ namespace MWGui
         apply();
     }
 
+    void SettingsWindow::onWindowModeChanged(MyGUI::ComboBox* _sender, size_t pos)
+    {
+        if (pos == MyGUI::ITEM_NONE)
+            return;
+
+        Settings::Manager::setInt("window mode", "Video", static_cast<int>(_sender->getIndexSelected()));
+        apply();
+    }
+
     void SettingsWindow::onMaxLightsChanged(MyGUI::ComboBox* _sender, size_t pos)
     {
         int count = 8 * (pos + 1);
@@ -485,49 +497,6 @@ namespace MWGui
             newState = true;
         }
 
-        if (_sender == mFullscreenButton)
-        {
-            // check if this resolution is supported in fullscreen
-            if (mResolutionList->getIndexSelected() != MyGUI::ITEM_NONE)
-            {
-                std::string resStr = mResolutionList->getItemNameAt(mResolutionList->getIndexSelected());
-                int resX, resY;
-                parseResolution (resX, resY, resStr);
-                Settings::Manager::setInt("resolution x", "Video", resX);
-                Settings::Manager::setInt("resolution y", "Video", resY);
-            }
-
-            bool supported = false;
-            int fallbackX = 0, fallbackY = 0;
-            for (unsigned int i=0; i<mResolutionList->getItemCount(); ++i)
-            {
-                std::string resStr = mResolutionList->getItemNameAt(i);
-                int resX, resY;
-                parseResolution (resX, resY, resStr);
-
-                if (i == 0)
-                {
-                    fallbackX = resX;
-                    fallbackY = resY;
-                }
-
-                if (resX == Settings::Manager::getInt("resolution x", "Video")
-                    && resY  == Settings::Manager::getInt("resolution y", "Video"))
-                    supported = true;
-            }
-
-            if (!supported && mResolutionList->getItemCount())
-            {
-                if (fallbackX != 0 && fallbackY != 0)
-                {
-                    Settings::Manager::setInt("resolution x", "Video", fallbackX);
-                    Settings::Manager::setInt("resolution y", "Video", fallbackY);
-                }
-            }
-
-            mWindowBorderButton->setEnabled(!newState);
-        }
-
         if (getSettingType(_sender) == checkButtonType)
         {
             Settings::Manager::setBool(getSettingName(_sender), getSettingCategory(_sender), newState);
@@ -691,6 +660,59 @@ namespace MWGui
         mLightingMethodButton->setIndexSelected(mLightingMethodButton->findItemIndexWith(lightingMethodStr));
     }
 
+    void SettingsWindow::updateWindowModeSettings()
+    {
+        size_t index = static_cast<size_t>(Settings::Manager::getInt("window mode", "Video"));
+
+        if (index > static_cast<size_t>(Settings::WindowMode::Windowed))
+            index = MyGUI::ITEM_NONE;
+
+        mWindowModeList->setIndexSelected(index);
+
+        if (index != static_cast<size_t>(Settings::WindowMode::Windowed) && index != MyGUI::ITEM_NONE)
+        {
+            // check if this resolution is supported in fullscreen
+            if (mResolutionList->getIndexSelected() != MyGUI::ITEM_NONE)
+            {
+                std::string resStr = mResolutionList->getItemNameAt(mResolutionList->getIndexSelected());
+                int resX, resY;
+                parseResolution (resX, resY, resStr);
+                Settings::Manager::setInt("resolution x", "Video", resX);
+                Settings::Manager::setInt("resolution y", "Video", resY);
+            }
+
+            bool supported = false;
+            int fallbackX = 0, fallbackY = 0;
+            for (unsigned int i=0; i<mResolutionList->getItemCount(); ++i)
+            {
+                std::string resStr = mResolutionList->getItemNameAt(i);
+                int resX, resY;
+                parseResolution (resX, resY, resStr);
+
+                if (i == 0)
+                {
+                    fallbackX = resX;
+                    fallbackY = resY;
+                }
+
+                if (resX == Settings::Manager::getInt("resolution x", "Video")
+                    && resY  == Settings::Manager::getInt("resolution y", "Video"))
+                    supported = true;
+            }
+
+            if (!supported && mResolutionList->getItemCount())
+            {
+                if (fallbackX != 0 && fallbackY != 0)
+                {
+                    Settings::Manager::setInt("resolution x", "Video", fallbackX);
+                    Settings::Manager::setInt("resolution y", "Video", fallbackY);
+                }
+            }
+
+            mWindowBorderButton->setEnabled(false);
+        }
+    }
+
     void SettingsWindow::layoutControlsBox()
     {
         const int h = 18;
@@ -866,6 +888,7 @@ namespace MWGui
         highlightCurrentResolution();
         updateControlsBox();
         updateLightSettings();
+        updateWindowModeSettings();
         resetScrollbars();
         renderScriptSettings();
         resizeScriptSettings();
diff --git a/apps/openmw/mwgui/settingswindow.hpp b/apps/openmw/mwgui/settingswindow.hpp
index 1a888257a8..bfce6c30dd 100644
--- a/apps/openmw/mwgui/settingswindow.hpp
+++ b/apps/openmw/mwgui/settingswindow.hpp
@@ -18,6 +18,8 @@ namespace MWGui
 
             void updateLightSettings();
 
+            void updateWindowModeSettings();
+
             void onResChange(int, int) override { center(); }
 
     protected:
@@ -26,7 +28,7 @@ namespace MWGui
 
             // graphics
             MyGUI::ListBox* mResolutionList;
-            MyGUI::Button* mFullscreenButton;
+            MyGUI::ComboBox* mWindowModeList;
             MyGUI::Button* mWindowBorderButton;
             MyGUI::ComboBox* mTextureFilteringButton;
             MyGUI::Widget* mAnisotropyBox;
@@ -72,6 +74,8 @@ namespace MWGui
             void onLightsResetButtonClicked(MyGUI::Widget* _sender);
             void onMaxLightsChanged(MyGUI::ComboBox* _sender, size_t pos);
 
+            void onWindowModeChanged(MyGUI::ComboBox* _sender, size_t pos);
+
             void onRebindAction(MyGUI::Widget* _sender);
             void onInputTabMouseWheel(MyGUI::Widget* _sender, int _rel);
             void onResetDefaultBindings(MyGUI::Widget* _sender);
@@ -94,7 +98,7 @@ namespace MWGui
             void renderScriptSettings();
 
             void computeMinimumWindowSize();
-        
+
         private:
             void resetScrollbars();
     };
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index e3d61e7c08..80fb1e546b 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -1086,7 +1086,7 @@ namespace MWGui
             else if (setting.first == "Video" && (
                     setting.second == "resolution x"
                     || setting.second == "resolution y"
-                    || setting.second == "fullscreen"
+                    || setting.second == "window mode"
                     || setting.second == "window border"))
                 changeRes = true;
 
@@ -1101,7 +1101,7 @@ namespace MWGui
         {
             mVideoWrapper->setVideoMode(Settings::Manager::getInt("resolution x", "Video"),
                                         Settings::Manager::getInt("resolution y", "Video"),
-                                        Settings::Manager::getBool("fullscreen", "Video"),
+                                        static_cast<Settings::WindowMode>(Settings::Manager::getInt("window mode", "Video")),
                                         Settings::Manager::getBool("window border", "Video"));
         }
     }
diff --git a/components/sdlutil/sdlvideowrapper.cpp b/components/sdlutil/sdlvideowrapper.cpp
index b3ba98ee3c..dec0942259 100644
--- a/components/sdlutil/sdlvideowrapper.cpp
+++ b/components/sdlutil/sdlvideowrapper.cpp
@@ -1,6 +1,7 @@
 #include "sdlvideowrapper.hpp"
 
 #include <components/debug/debuglog.hpp>
+#include <components/settings/settings.hpp>
 
 #include <osgViewer/Viewer>
 
@@ -68,21 +69,21 @@ namespace SDLUtil
             Log(Debug::Warning) << "Couldn't set gamma: " << SDL_GetError();
     }
 
-    void VideoWrapper::setVideoMode(int width, int height, bool fullscreen, bool windowBorder)
+    void VideoWrapper::setVideoMode(int width, int height, Settings::WindowMode windowMode, bool windowBorder)
     {
         SDL_SetWindowFullscreen(mWindow, 0);
 
         if (SDL_GetWindowFlags(mWindow) & SDL_WINDOW_MAXIMIZED)
             SDL_RestoreWindow(mWindow);
 
-        if (fullscreen)
+        if (windowMode == Settings::WindowMode::Fullscreen || windowMode == Settings::WindowMode::BorderlessFullscreen)
         {
             SDL_DisplayMode mode;
             SDL_GetWindowDisplayMode(mWindow, &mode);
             mode.w = width;
             mode.h = height;
             SDL_SetWindowDisplayMode(mWindow, &mode);
-            SDL_SetWindowFullscreen(mWindow, fullscreen);
+            SDL_SetWindowFullscreen(mWindow, windowMode == Settings::WindowMode::Fullscreen ? SDL_WINDOW_FULLSCREEN : SDL_WINDOW_FULLSCREEN_DESKTOP);
         }
         else
         {
diff --git a/components/sdlutil/sdlvideowrapper.hpp b/components/sdlutil/sdlvideowrapper.hpp
index 3866c3ec31..b9bcd66b5c 100644
--- a/components/sdlutil/sdlvideowrapper.hpp
+++ b/components/sdlutil/sdlvideowrapper.hpp
@@ -12,6 +12,11 @@ namespace osgViewer
     class Viewer;
 }
 
+namespace Settings
+{
+    enum class WindowMode;
+}
+
 namespace SDLUtil
 {
 
@@ -25,7 +30,7 @@ namespace SDLUtil
 
         void setGammaContrast(float gamma, float contrast);
 
-        void setVideoMode(int width, int height, bool fullscreen, bool windowBorder);
+        void setVideoMode(int width, int height, Settings::WindowMode windowMode, bool windowBorder);
 
         void centerWindow();
 
diff --git a/components/settings/settings.hpp b/components/settings/settings.hpp
index d5d9c2d9f6..89adfea7e0 100644
--- a/components/settings/settings.hpp
+++ b/components/settings/settings.hpp
@@ -16,6 +16,13 @@ namespace Files
 
 namespace Settings
 {
+    enum class WindowMode
+    {
+        Fullscreen = 0,
+        BorderlessFullscreen,
+        Windowed
+    };
+
     ///
     /// \brief Settings management (can change during runtime)
     ///
diff --git a/docs/source/reference/modding/settings/video.rst b/docs/source/reference/modding/settings/video.rst
index 040b9948f7..f57b4e92d5 100644
--- a/docs/source/reference/modding/settings/video.rst
+++ b/docs/source/reference/modding/settings/video.rst
@@ -31,17 +31,23 @@ The window resolution can be selected from a menu of common screen sizes
 in the Video tab of the Video Panel of the Options menu, or in the Graphics tab of the OpenMW Launcher.
 The vertical resolution can also be set to a custom value in the Graphics tab of the OpenMW Launcher.
 
-fullscreen
-----------
+window mode
+-----------
 
-:Type:		boolean
-:Range:		True/False
-:Default:	False
+:Type:		integer
+:Range:		0, 1, 2
+:Default:	2 (Windowed)
+
+This setting determines the window mode.
+
+0: Fullscreen
+
+1: Borderless Fullscreen
 
-This setting determines whether the entire screen is used for the specified resolution.
+2: Windowed
 
-This setting can be toggled in game using the Fullscreen button in the Video tab of the Video panel in the Options menu.
-It can also be toggled with the Full Screen check box in the Graphics tab of the OpenMW Launcher.
+This setting can be toggled in game using the dropdown list in the Video tab of the Video panel in the Options menu.
+It can also be toggled with the window mode dropdown in the Graphics tab of the OpenMW Launcher.
 
 screen
 ------
diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index d0e2edfbf6..b5c3185693 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -270,17 +270,17 @@
                     <Widget type="TabItem" skin="" position="0 28 352 268" align="Stretch">
                         <Property key="Caption" value="  Video  "/>
                         <Widget type="ListBox" skin="MW_List" position="0 4 170 170" align="Left Top" name="ResolutionList"/>
-                        <Widget type="HBox" skin="" position="182 4 300 24">
-                            <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top" name="FullscreenButton">
-                                <UserString key="SettingCategory" value="Video"/>
-                                <UserString key="SettingName" value="fullscreen"/>
-                                <UserString key="SettingType" value="CheckButton"/>
-                            </Widget>
-                            <Widget type="AutoSizedTextBox" skin="SandText" position="28 4 70 16" align="Left Top">
-                                <Property key="Caption" value="Fullscreen"/>
+                        <Widget type="TextBox" skin="NormalText" position="182 4 170 18" align="Left Top">
+                            <Property key="Caption" value="Window Mode:"/>
+                        </Widget>
+                        <Widget type="HBox" skin="" position="182 28 300 24">
+                            <Widget type="ComboBox" skin="MW_ComboBox" position="0 0 200 24" align="Left Top" name="WindowModeList">
+                                <Property key="AddItem" value="Fullscreen"/>
+                                <Property key="AddItem" value="Borderless Fullscreen"/>
+                                <Property key="AddItem" value="Windowed"/>
                             </Widget>
                         </Widget>
-                        <Widget type="HBox" skin="" position="182 34 300 24">
+                        <Widget type="HBox" skin="" position="182 64 300 24">
                             <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top" name="VSyncButton">
                                 <UserString key="SettingCategory" value="Video"/>
                                 <UserString key="SettingName" value="vsync"/>
@@ -290,7 +290,7 @@
                                 <Property key="Caption" value="VSync"/>
                             </Widget>
                         </Widget>
-                        <Widget type="HBox" skin="" position="182 64 300 24">
+                        <Widget type="HBox" skin="" position="182 94 300 24">
                             <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top" name="WindowBorderButton">
                                 <UserString key="SettingCategory" value="Video"/>
                                 <UserString key="SettingName" value="window border"/>
@@ -301,7 +301,7 @@
                             </Widget>
                         </Widget>
 
-                        <Widget type="TextBox" skin="SandText" position="182 94 300 32" align="Left Top">
+                        <Widget type="TextBox" skin="SandText" position="182 124 300 32" align="Left Top">
                             <Property key="Caption" value="Hint: press F3 to show \nthe current frame rate."/>
                         </Widget>
 
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index e320652f36..bc3c104765 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -611,8 +611,9 @@ hrtf =
 resolution x = 800
 resolution y = 600
 
-# OpenMW takes complete control of the screen.
-fullscreen = false
+# Specify the window mode.
+# 0 = Fullscreen, 1 = Borderless Fullscreen, 2 = Windowed
+window mode = 0
 
 # Determines which screen OpenMW is on.  (>=0).
 screen = 0
diff --git a/files/ui/graphicspage.ui b/files/ui/graphicspage.ui
index 508a955d7b..6a186906a5 100644
--- a/files/ui/graphicspage.ui
+++ b/files/ui/graphicspage.ui
@@ -112,17 +112,39 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="0">
+          <item row="1" column="0">
            <widget class="QCheckBox" name="windowBorderCheckBox">
             <property name="text">
              <string>Window Border</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="0">
-           <widget class="QCheckBox" name="fullScreenCheckBox">
+          <item row="2" column="1">
+            <widget class="QComboBox" name="windowModeComboBox">
+            <property name="currentIndex">
+                <number>0</number>
+            </property>
+            <item>
+                <property name="text">
+                <string>Fullscreen</string>
+                </property>
+            </item>
+            <item>
+                <property name="text">
+                <string>Borderless Fullscreen</string>
+                </property>
+            </item>
+            <item>
+                <property name="text">
+                <string>Windowed</string>
+                </property>
+            </item>
+            </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="windowModeLabel">
             <property name="text">
-             <string>Full Screen</string>
+             <string>Window Mode:</string>
             </property>
            </widget>
           </item>

From ad139f2f9ad94c967eb3cc2db443e12ce88ab620 Mon Sep 17 00:00:00 2001
From: cody glassman <glassmancody.info@gmail.com>
Date: Sun, 8 May 2022 22:56:35 -0700
Subject: [PATCH 2417/2859] rename to windowed fullscreen

---
 CHANGELOG.md                                     | 2 +-
 apps/launcher/graphicspage.cpp                   | 2 +-
 apps/openmw/engine.cpp                           | 4 ++--
 apps/openmw/mwgui/settingswindow.cpp             | 2 +-
 components/sdlutil/sdlvideowrapper.cpp           | 2 +-
 components/settings/settings.hpp                 | 2 +-
 docs/source/reference/modding/settings/video.rst | 5 +++--
 files/mygui/openmw_settings_window.layout        | 2 +-
 files/settings-default.cfg                       | 2 +-
 files/ui/graphicspage.ui                         | 2 +-
 10 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7396ba328..66f5868589 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -157,7 +157,7 @@
     Feature #6600: Support NiSortAdjustNode
     Feature #6684: Support NiFltAnimationNode
     Feature #6699: Ignored flag
-    Feature #6700: Support borderless fullscreen
+    Feature #6700: Support windowed fullscreen
     Feature #6706: Save the size of the Options window
     Feature #6721: [OpenMW-CS] Add option to open records in new window
     Task #6201: Remove the "Note: No relevant classes found. No output generated" warnings
diff --git a/apps/launcher/graphicspage.cpp b/apps/launcher/graphicspage.cpp
index d3e5d1c86d..5a57be0e53 100644
--- a/apps/launcher/graphicspage.cpp
+++ b/apps/launcher/graphicspage.cpp
@@ -359,7 +359,7 @@ void Launcher::GraphicsPage::screenChanged(int screen)
 
 void Launcher::GraphicsPage::slotFullScreenChanged(int mode)
 {
-    if (mode == static_cast<int>(Settings::WindowMode::Fullscreen) || mode == static_cast<int>(Settings::WindowMode::BorderlessFullscreen)) {
+    if (mode == static_cast<int>(Settings::WindowMode::Fullscreen) || mode == static_cast<int>(Settings::WindowMode::WindowedFullscreen)) {
         standardRadioButton->toggle();
         customRadioButton->setEnabled(false);
         customWidthSpinBox->setEnabled(false);
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 2e12fecd39..fa84bcf14c 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -562,7 +562,7 @@ void OMW::Engine::createWindow(Settings::Manager& settings)
     int pos_x = SDL_WINDOWPOS_CENTERED_DISPLAY(screen),
         pos_y = SDL_WINDOWPOS_CENTERED_DISPLAY(screen);
 
-    if(windowMode == Settings::WindowMode::Fullscreen || windowMode == Settings::WindowMode::BorderlessFullscreen)
+    if(windowMode == Settings::WindowMode::Fullscreen || windowMode == Settings::WindowMode::WindowedFullscreen)
     {
         pos_x = SDL_WINDOWPOS_UNDEFINED_DISPLAY(screen);
         pos_y = SDL_WINDOWPOS_UNDEFINED_DISPLAY(screen);
@@ -571,7 +571,7 @@ void OMW::Engine::createWindow(Settings::Manager& settings)
     Uint32 flags = SDL_WINDOW_OPENGL|SDL_WINDOW_SHOWN|SDL_WINDOW_RESIZABLE;
     if(windowMode == Settings::WindowMode::Fullscreen)
         flags |= SDL_WINDOW_FULLSCREEN;
-    else if (windowMode == Settings::WindowMode::BorderlessFullscreen)
+    else if (windowMode == Settings::WindowMode::WindowedFullscreen)
         flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
 
     // Allows for Windows snapping features to properly work in borderless window
diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index 95a555da99..785cec9ef6 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -328,7 +328,7 @@ namespace MWGui
         updateMaxLightsComboBox(mMaxLights);
 
         Settings::WindowMode windowMode = static_cast<Settings::WindowMode>(Settings::Manager::getInt("window mode", "Video"));
-        mWindowBorderButton->setEnabled(windowMode != Settings::WindowMode::Fullscreen && windowMode != Settings::WindowMode::BorderlessFullscreen);
+        mWindowBorderButton->setEnabled(windowMode != Settings::WindowMode::Fullscreen && windowMode != Settings::WindowMode::WindowedFullscreen);
 
         mKeyboardSwitch->setStateSelected(true);
         mControllerSwitch->setStateSelected(false);
diff --git a/components/sdlutil/sdlvideowrapper.cpp b/components/sdlutil/sdlvideowrapper.cpp
index dec0942259..7d62979e7f 100644
--- a/components/sdlutil/sdlvideowrapper.cpp
+++ b/components/sdlutil/sdlvideowrapper.cpp
@@ -76,7 +76,7 @@ namespace SDLUtil
         if (SDL_GetWindowFlags(mWindow) & SDL_WINDOW_MAXIMIZED)
             SDL_RestoreWindow(mWindow);
 
-        if (windowMode == Settings::WindowMode::Fullscreen || windowMode == Settings::WindowMode::BorderlessFullscreen)
+        if (windowMode == Settings::WindowMode::Fullscreen || windowMode == Settings::WindowMode::WindowedFullscreen)
         {
             SDL_DisplayMode mode;
             SDL_GetWindowDisplayMode(mWindow, &mode);
diff --git a/components/settings/settings.hpp b/components/settings/settings.hpp
index 89adfea7e0..693941df10 100644
--- a/components/settings/settings.hpp
+++ b/components/settings/settings.hpp
@@ -19,7 +19,7 @@ namespace Settings
     enum class WindowMode
     {
         Fullscreen = 0,
-        BorderlessFullscreen,
+        WindowedFullscreen,
         Windowed
     };
 
diff --git a/docs/source/reference/modding/settings/video.rst b/docs/source/reference/modding/settings/video.rst
index f57b4e92d5..b05fbf0380 100644
--- a/docs/source/reference/modding/settings/video.rst
+++ b/docs/source/reference/modding/settings/video.rst
@@ -40,12 +40,13 @@ window mode
 
 This setting determines the window mode.
 
-0: Fullscreen
+0: Exclusive fullscreen
 
-1: Borderless Fullscreen
+1: Windowed fullscreen, borderless window that matches screen resolution
 
 2: Windowed
 
+
 This setting can be toggled in game using the dropdown list in the Video tab of the Video panel in the Options menu.
 It can also be toggled with the window mode dropdown in the Graphics tab of the OpenMW Launcher.
 
diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index b5c3185693..a134d8ecb8 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -276,7 +276,7 @@
                         <Widget type="HBox" skin="" position="182 28 300 24">
                             <Widget type="ComboBox" skin="MW_ComboBox" position="0 0 200 24" align="Left Top" name="WindowModeList">
                                 <Property key="AddItem" value="Fullscreen"/>
-                                <Property key="AddItem" value="Borderless Fullscreen"/>
+                                <Property key="AddItem" value="Windowed Fullscreen"/>
                                 <Property key="AddItem" value="Windowed"/>
                             </Widget>
                         </Widget>
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index bc3c104765..3a41f72d9b 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -612,7 +612,7 @@ resolution x = 800
 resolution y = 600
 
 # Specify the window mode.
-# 0 = Fullscreen, 1 = Borderless Fullscreen, 2 = Windowed
+# 0 = Fullscreen, 1 = Windowed Fullscreen, 2 = Windowed
 window mode = 0
 
 # Determines which screen OpenMW is on.  (>=0).
diff --git a/files/ui/graphicspage.ui b/files/ui/graphicspage.ui
index 6a186906a5..8cf26aa1e2 100644
--- a/files/ui/graphicspage.ui
+++ b/files/ui/graphicspage.ui
@@ -131,7 +131,7 @@
             </item>
             <item>
                 <property name="text">
-                <string>Borderless Fullscreen</string>
+                <string>Windowed Fullscreen</string>
                 </property>
             </item>
             <item>

From 882245b9354189df0005837330f3e78427831468 Mon Sep 17 00:00:00 2001
From: Cody Glassman <glassmancody.info@gmail.com>
Date: Mon, 9 May 2022 19:40:48 +0000
Subject: [PATCH 2418/2859] Lua Bindings: Add view distance bindings to camera

---
 apps/openmw/mwlua/camerabindings.cpp      |  7 +++++++
 apps/openmw/mwrender/renderingmanager.cpp | 21 +++++++++++++--------
 apps/openmw/mwrender/renderingmanager.hpp |  5 ++++-
 files/lua_api/openmw/camera.lua           | 13 +++++++++++++
 4 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwlua/camerabindings.cpp b/apps/openmw/mwlua/camerabindings.cpp
index 4e865374cf..345564ef0c 100644
--- a/apps/openmw/mwlua/camerabindings.cpp
+++ b/apps/openmw/mwlua/camerabindings.cpp
@@ -92,6 +92,13 @@ namespace MWLua
         api["getFieldOfView"] = [renderingManager]() { return osg::DegreesToRadians(renderingManager->getFieldOfView()); };
         api["setFieldOfView"] = [renderingManager](float v) { renderingManager->setFieldOfView(osg::RadiansToDegrees(v)); };
 
+        api["getBaseViewDistance"] = []()
+        {
+            return std::max(0.f, Settings::Manager::getFloat("viewing distance", "Camera"));
+        };
+        api["getViewDistance"] = [renderingManager]() { return renderingManager->getViewDistance(); };
+        api["setViewDistance"] = [renderingManager](float d) { renderingManager->setViewDistance(d, true); };
+
         api["getViewTransform"] = [camera]() { return LuaUtil::TransformM{camera->getViewMatrix()}; };
 
         api["viewportToWorldVector"] = [camera, renderingManager](osg::Vec2f pos) -> osg::Vec3f
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 52b647add3..24e37a93ea 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -363,7 +363,7 @@ namespace MWRender
                             || reverseZ
                             || Stereo::getMultiview();
         resourceSystem->getSceneManager()->setForceShaders(forceShaders);
-         
+
         // FIXME: calling dummy method because terrain needs to know whether lighting is clamped
         resourceSystem->getSceneManager()->setClampLighting(Settings::Manager::getBool("clamp lighting", "Shaders"));
         resourceSystem->getSceneManager()->setAutoUseNormalMaps(Settings::Manager::getBool("auto use object normal maps", "Shaders"));
@@ -511,7 +511,7 @@ namespace MWRender
 
         // water goes after terrain for correct waterculling order
         mWater.reset(new Water(sceneRoot->getParent(0), sceneRoot, mResourceSystem, mViewer->getIncrementalCompileOperation(), resourcePath));
-        
+
         mCamera.reset(new Camera(mViewer->getCamera()));
 
         mScreenshotManager.reset(new ScreenshotManager(viewer, mRootNode, sceneRoot, mResourceSystem, mWater.get()));
@@ -1293,10 +1293,7 @@ namespace MWRender
             }
             else if (it->first == "Camera" && it->second == "viewing distance")
             {
-                mViewDistance = Settings::Manager::getFloat("viewing distance", "Camera");
-                if(!Settings::Manager::getBool("use distant fog", "Fog"))
-                    mStateUpdater->setFogEnd(mViewDistance);
-                updateProjection = true;
+                setViewDistance(Settings::Manager::getFloat("viewing distance", "Camera"));
             }
             else if (it->first == "General" && (it->second == "texture filter" ||
                                                 it->second == "texture mipmap" ||
@@ -1346,9 +1343,17 @@ namespace MWRender
         }
     }
 
-    float RenderingManager::getNearClipDistance() const
+    void RenderingManager::setViewDistance(float distance, bool delay)
     {
-        return mNearClip;
+        mViewDistance = distance;
+
+        if (delay)
+        {
+            mUpdateProjectionMatrix = true;
+            return;
+        }
+
+        updateProjectionMatrix();
     }
 
     float RenderingManager::getTerrainHeightAt(const osg::Vec3f &pos)
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index fe3b33b20e..5b5c28b198 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -206,7 +206,10 @@ namespace MWRender
 
         void processChangedSettings(const Settings::CategorySettingVector& settings);
 
-        float getNearClipDistance() const;
+        float getNearClipDistance() const { return mNearClip; }
+        float getViewDistance() const { return mViewDistance; }
+
+        void setViewDistance(float distance, bool delay = false);
 
         float getTerrainHeightAt(const osg::Vec3f& pos);
 
diff --git a/files/lua_api/openmw/camera.lua b/files/lua_api/openmw/camera.lua
index f744dcbc5c..f699663c49 100644
--- a/files/lua_api/openmw/camera.lua
+++ b/files/lua_api/openmw/camera.lua
@@ -186,6 +186,19 @@
 -- @function [parent=#camera] setFieldOfView
 -- @param #number fov Field of view vertical angle in radians
 
+--- Return base view distance.
+-- @function [parent=#camera] getBaseViewDistance
+-- @return #number
+
+--- Return current view distance.
+-- @function [parent=#camera] getViewDistance
+-- @return #number
+
+--- Set view distance.
+--- Takes effect on the next frame.
+-- @function [parent=#camera] setViewDistance
+-- @param #number distance View distance in game units
+
 --- Get world to local transform for the camera.
 -- @function [parent=#camera] getViewTransform
 -- @return openmw.util#Transform

From a75c7c49f011982aec86243f83a6d4066532391a Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 8 May 2022 21:28:43 +0200
Subject: [PATCH 2419/2859] Disable writes to navmeshdb on database is locked
 error

Simultaneously writing to sqlite3 database is not possible. Process exclusively
locks the database for this. Another process will fail to perform any request
when database is locked. Alternatively it can wait. Handling this situation
properly requires complexity that is not really needed. Users are not expected
to run multiple openmw processes simultaneously using the same navmeshdb.

Before this change running multiple openmw processes using the same navmeshdb
can lead to a crash when first transaction fails to start because there is
exception thrown and not catched.

Remove use of explicit transactions from DbWorker. Handling all possible
transaction states due to different errors brings unnecessary complexity.
Initially they were introduced to increase time between flushes to disk. This
makes sense for navmeshtool because of massive number of writes but for the
engine this is not an issue.
---
 .../detournavigator/asyncnavmeshupdater.cpp   | 19 ++++++-
 .../detournavigator/asyncnavmeshupdater.cpp   | 53 ++++++-------------
 .../detournavigator/asyncnavmeshupdater.hpp   |  3 +-
 3 files changed, 33 insertions(+), 42 deletions(-)

diff --git a/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp b/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp
index 1f7125d1f2..06de335d50 100644
--- a/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp
+++ b/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp
@@ -262,6 +262,20 @@ namespace
         updater.post(mAgentHalfExtents, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
         updater.wait(mListener, WaitConditionType::allJobsDone);
         updater.stop();
+        const std::set<TilePosition> present {
+            TilePosition(-2, 0),
+            TilePosition(-1, -1),
+            TilePosition(-1, 0),
+            TilePosition(-1, 1),
+            TilePosition(0, -2),
+            TilePosition(0, -1),
+            TilePosition(0, 0),
+            TilePosition(0, 1),
+            TilePosition(0, 2),
+            TilePosition(1, -1),
+            TilePosition(1, 0),
+            TilePosition(1, 1),
+        };
         for (int x = -5; x <= 5; ++x)
             for (int y = -5; y <= 5; ++y)
             {
@@ -272,8 +286,9 @@ namespace
                     [&] (const MeshSource& v) { return resolveMeshSource(*dbPtr, v); });
                 if (!objects.has_value())
                     continue;
-                EXPECT_FALSE(dbPtr->findTile(mWorldspace, tilePosition, serialize(mSettings.mRecast, *recastMesh, *objects)).has_value())
-                    << tilePosition.x() << " " << tilePosition.y();
+                EXPECT_EQ(dbPtr->findTile(mWorldspace, tilePosition, serialize(mSettings.mRecast, *recastMesh, *objects)).has_value(),
+                          present.find(tilePosition) != present.end())
+                    << tilePosition.x() << " " << tilePosition.y() << " present=" << (present.find(tilePosition) != present.end());
             }
     }
 }
diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index 18bffae131..36c54a99b0 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -678,10 +678,10 @@ namespace DetourNavigator
         mHasJob.notify_all();
     }
 
-    std::optional<JobIt> DbJobQueue::pop(std::chrono::steady_clock::duration timeout)
+    std::optional<JobIt> DbJobQueue::pop()
     {
         std::unique_lock lock(mMutex);
-        mHasJob.wait_for(lock, timeout, [&] { return mShouldStop || !mJobs.empty(); });
+        mHasJob.wait(lock, [&] { return mShouldStop || !mJobs.empty(); });
         if (mJobs.empty())
             return std::nullopt;
         const JobIt job = mJobs.front();
@@ -752,45 +752,18 @@ namespace DetourNavigator
 
     void DbWorker::run() noexcept
     {
-        constexpr std::chrono::seconds transactionInterval(1);
-        auto transaction = mDb->startTransaction(Sqlite3::TransactionMode::Immediate);
-        auto start = std::chrono::steady_clock::now();
         while (!mShouldStop)
         {
             try
             {
-                if (const auto job = mQueue.pop(transactionInterval))
+                if (const auto job = mQueue.pop())
                     processJob(*job);
-                const auto now = std::chrono::steady_clock::now();
-                if (mHasChanges && now - start > transactionInterval)
-                {
-                    mHasChanges = false;
-                    try
-                    {
-                        transaction.commit();
-                    }
-                    catch (const std::exception& e)
-                    {
-                        Log(Debug::Error) << "DbWorker exception on commit: " << e.what();
-                    }
-                    transaction = mDb->startTransaction(Sqlite3::TransactionMode::Immediate);
-                    start = now;
-                }
             }
             catch (const std::exception& e)
             {
                 Log(Debug::Error) << "DbWorker exception: " << e.what();
             }
         }
-        if (mHasChanges)
-            try
-            {
-                transaction.commit();
-            }
-            catch (const std::exception& e)
-            {
-                Log(Debug::Error) << "DbWorker exception on final commit: " << e.what();
-            }
     }
 
     void DbWorker::processJob(JobIt job)
@@ -804,10 +777,19 @@ namespace DetourNavigator
             catch (const std::exception& e)
             {
                 Log(Debug::Error) << "DbWorker exception while processing job " << job->mId << ": " << e.what();
-                if (std::string_view(e.what()).find("database or disk is full") != std::string_view::npos)
+                if (mWriteToDb)
                 {
-                    mWriteToDb = false;
-                    Log(Debug::Warning) << "Writes to navmeshdb are disabled because file size limit is reached or disk is full";
+                    const std::string_view message(e.what());
+                    if (message.find("database or disk is full") != std::string_view::npos)
+                    {
+                        mWriteToDb = false;
+                        Log(Debug::Warning) << "Writes to navmeshdb are disabled because file size limit is reached or disk is full";
+                    }
+                    else if (message.find("database is locked") != std::string_view::npos)
+                    {
+                        mWriteToDb = false;
+                        Log(Debug::Warning) << "Writes to navmeshdb are disabled to avoid concurrent writes from multiple processes";
+                    }
                 }
             }
         };
@@ -833,11 +815,8 @@ namespace DetourNavigator
             Log(Debug::Debug) << "Serializing input for job " << job->mId;
             if (mWriteToDb)
             {
-                const ShapeId shapeId = mNextShapeId;
                 const auto objects = makeDbRefGeometryObjects(job->mRecastMesh->getMeshSources(),
                     [&] (const MeshSource& v) { return resolveMeshSource(*mDb, v, mNextShapeId); });
-                if (shapeId != mNextShapeId)
-                    mHasChanges = true;
                 job->mInput = serialize(mRecastSettings, *job->mRecastMesh, objects);
             }
             else
@@ -877,7 +856,6 @@ namespace DetourNavigator
             Log(Debug::Debug) << "Update db tile by job " << job->mId;
             job->mGeneratedNavMeshData->mUserId = cachedTileData->mTileId;
             mDb->updateTile(cachedTileData->mTileId, mVersion, serialize(*job->mGeneratedNavMeshData));
-            mHasChanges = true;
             return;
         }
 
@@ -893,6 +871,5 @@ namespace DetourNavigator
         mDb->insertTile(mNextTileId, job->mWorldspace, job->mChangedTile,
                         mVersion, job->mInput, serialize(*job->mGeneratedNavMeshData));
         ++mNextTileId;
-        mHasChanges = true;
     }
 }
diff --git a/components/detournavigator/asyncnavmeshupdater.hpp b/components/detournavigator/asyncnavmeshupdater.hpp
index dc6e9b5a81..ec8c849ca8 100644
--- a/components/detournavigator/asyncnavmeshupdater.hpp
+++ b/components/detournavigator/asyncnavmeshupdater.hpp
@@ -87,7 +87,7 @@ namespace DetourNavigator
     public:
         void push(JobIt job);
 
-        std::optional<JobIt> pop(std::chrono::steady_clock::duration timeout);
+        std::optional<JobIt> pop();
 
         void update(TilePosition playerTile, int maxTiles);
 
@@ -137,7 +137,6 @@ namespace DetourNavigator
         DbJobQueue mQueue;
         std::atomic_bool mShouldStop {false};
         std::atomic_size_t mGetTileCount {0};
-        bool mHasChanges = false;
         std::thread mThread;
 
         inline void run() noexcept;

From e92c88a133286eb3b23d172aae07c1145c299b6f Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Tue, 10 May 2022 20:00:42 +0200
Subject: [PATCH 2420/2859] Make the documentation clearer, match the
 documentation when no buttons are pressed for an event

---
 components/lua_ui/widget.cpp | 4 +++-
 files/lua_api/openmw/ui.lua  | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/components/lua_ui/widget.cpp b/components/lua_ui/widget.cpp
index 4c1bb9752f..641f34c9ca 100644
--- a/components/lua_ui/widget.cpp
+++ b/components/lua_ui/widget.cpp
@@ -156,9 +156,11 @@ namespace LuaUi
         MyGUI::IntPoint absolutePosition = mWidget->getAbsolutePosition();
         osg::Vec2f offset = position - osg::Vec2f(absolutePosition.left, absolutePosition.top);
         sol::table table = makeTable();
+        int sdlButton = SDLUtil::myGuiMouseButtonToSdl(button);
         table["position"] = position;
         table["offset"] = offset;
-        table["button"] = SDLUtil::myGuiMouseButtonToSdl(button);
+        if (sdlButton == 0) // nil if no button was pressed
+            table["button"] = sdlButton;
         return table;
     }
 
diff --git a/files/lua_api/openmw/ui.lua b/files/lua_api/openmw/ui.lua
index b52d9c81e4..52660a5c3e 100644
--- a/files/lua_api/openmw/ui.lua
+++ b/files/lua_api/openmw/ui.lua
@@ -217,7 +217,8 @@
 -- @type MouseEvent
 -- @field openmw.util#Vector2 position Absolute position of the mouse cursor
 -- @field openmw.util#Vector2 offset Position of the mouse cursor relative to the widget
--- @field #number button Mouse button which triggered the event (could be nil)
+-- @field #number button Mouse button which triggered the event.
+--   Matches the arguments of @{openmw_input#input.isMouseButtonPressed} (`nil` for none, 1 for left, 3 for right).
 
 ---
 -- Register a new texture resource. Can be used to manually atlas UI textures.

From 926cdfbe19b0dc0ebb3faf7181e0539b03690c1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Wed, 11 May 2022 16:37:16 +0300
Subject: [PATCH 2421/2859] Use random seed specified by settings for new games

---
 apps/openmw/engine.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index fa84bcf14c..f39daa44d8 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -837,6 +837,7 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
         mFileCollections, mContentFiles, mGroundcoverFiles, mEncoder, mActivationDistanceOverride, mCellName,
         mStartupScript, mResDir.string(), mCfgMgr.getUserDataPath().string());
     mWorld->setupPlayer();
+    mWorld->setRandomSeed(mRandomSeed);
     mEnvironment.setWorld(*mWorld);
 
     mWindowManager->setStore(mWorld->getStore());

From a710cf6d10af2782455fb1f50a6b8988d6c4d5f9 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 11 May 2022 23:12:16 +0200
Subject: [PATCH 2422/2859] Remove Environment cleanup

Some managers may use the environment in the destructors. Setting them to
nullptr may lead to nullptr dereference when the object is still alive and can
be accessible. But after object is destructed it's UB anyway to dereference
nullptr or a dangling pointer.
---
 apps/openmw/engine.cpp             |  2 --
 apps/openmw/mwbase/environment.cpp | 15 ---------------
 apps/openmw/mwbase/environment.hpp |  2 --
 3 files changed, 19 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index f39daa44d8..982ae92f11 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -468,8 +468,6 @@ OMW::Engine::~Engine()
 
     mStereoManager = nullptr;
 
-    mEnvironment.cleanup();
-
     mMechanicsManager = nullptr;
     mDialogueManager = nullptr;
     mJournal = nullptr;
diff --git a/apps/openmw/mwbase/environment.cpp b/apps/openmw/mwbase/environment.cpp
index 70027989a6..927db90288 100644
--- a/apps/openmw/mwbase/environment.cpp
+++ b/apps/openmw/mwbase/environment.cpp
@@ -28,21 +28,6 @@ MWBase::Environment::~Environment()
     sThis = nullptr;
 }
 
-void MWBase::Environment::cleanup()
-{
-    mMechanicsManager = nullptr;
-    mDialogueManager = nullptr;
-    mJournal = nullptr;
-    mScriptManager = nullptr;
-    mWindowManager = nullptr;
-    mWorld = nullptr;
-    mSoundManager = nullptr;
-    mInputManager = nullptr;
-    mStateManager = nullptr;
-    mLuaManager = nullptr;
-    mResourceSystem = nullptr;
-}
-
 void MWBase::Environment::reportStats(unsigned int frameNumber, osg::Stats& stats) const
 {
     mMechanicsManager->reportStats(frameNumber, stats);
diff --git a/apps/openmw/mwbase/environment.hpp b/apps/openmw/mwbase/environment.hpp
index e8ea605a9a..0c5d39425b 100644
--- a/apps/openmw/mwbase/environment.hpp
+++ b/apps/openmw/mwbase/environment.hpp
@@ -112,8 +112,6 @@ namespace MWBase
 
             void setFrameDuration(float value) { mFrameDuration = value; }
 
-            void cleanup();
-
             /// Return instance of this class.
             static const Environment& get()
             {

From de4a75821ea2fa418cb9eb52fb93a44f9c22a986 Mon Sep 17 00:00:00 2001
From: Cody Glassman <glassmancody.info@gmail.com>
Date: Wed, 11 May 2022 23:43:35 +0000
Subject: [PATCH 2423/2859] Correct default window mode

---
 files/settings-default.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 3a41f72d9b..d97f529db2 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -613,7 +613,7 @@ resolution y = 600
 
 # Specify the window mode.
 # 0 = Fullscreen, 1 = Windowed Fullscreen, 2 = Windowed
-window mode = 0
+window mode = 2
 
 # Determines which screen OpenMW is on.  (>=0).
 screen = 0

From 95ad67eb8bed39e2beda04c82806a8fdec477342 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Thu, 12 May 2022 22:57:00 +0200
Subject: [PATCH 2424/2859] Add extraRoll to the Lua camera package

---
 apps/openmw/mwlua/camerabindings.cpp               |  2 ++
 apps/openmw/mwrender/camera.cpp                    |  2 +-
 apps/openmw/mwrender/camera.hpp                    |  4 +++-
 files/builtin_scripts/scripts/omw/camera.lua       |  2 +-
 files/builtin_scripts/scripts/omw/head_bobbing.lua |  2 +-
 files/lua_api/openmw/camera.lua                    | 12 ++++++++++++
 6 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwlua/camerabindings.cpp b/apps/openmw/mwlua/camerabindings.cpp
index 345564ef0c..32abb8babe 100644
--- a/apps/openmw/mwlua/camerabindings.cpp
+++ b/apps/openmw/mwlua/camerabindings.cpp
@@ -67,8 +67,10 @@ namespace MWLua
         api["setRoll"] = [camera](float v) { camera->setRoll(-v); };
         api["setExtraPitch"] = [camera](float v) { camera->setExtraPitch(-v); };
         api["setExtraYaw"] = [camera](float v) { camera->setExtraYaw(-v); };
+        api["setExtraRoll"] = [camera](float v) { camera->setExtraRoll(-v); };
         api["getExtraPitch"] = [camera]() { return -camera->getExtraPitch(); };
         api["getExtraYaw"] = [camera]() { return -camera->getExtraYaw(); };
+        api["getExtraRoll"] = [camera]() { return -camera->getExtraRoll(); };
 
         api["getThirdPersonDistance"] = [camera]() { return camera->getCameraDistance(); };
         api["setPreferredThirdPersonDistance"] = [camera](float v) { camera->setPreferredCameraDistance(v); };
diff --git a/apps/openmw/mwrender/camera.cpp b/apps/openmw/mwrender/camera.cpp
index ea499a64bc..625b6c3e97 100644
--- a/apps/openmw/mwrender/camera.cpp
+++ b/apps/openmw/mwrender/camera.cpp
@@ -110,7 +110,7 @@ namespace MWRender
 
     void Camera::updateCamera(osg::Camera *cam)
     {
-        osg::Quat orient = osg::Quat(mRoll, osg::Vec3d(0, 1, 0)) *
+        osg::Quat orient = osg::Quat(mRoll + mExtraRoll, osg::Vec3d(0, 1, 0)) *
                            osg::Quat(mPitch + mExtraPitch, osg::Vec3d(1, 0, 0)) *
                            osg::Quat(mYaw + mExtraYaw, osg::Vec3d(0, 0, 1));
         osg::Vec3d forward = orient * osg::Vec3d(0,1,0);
diff --git a/apps/openmw/mwrender/camera.hpp b/apps/openmw/mwrender/camera.hpp
index ba815a7e60..e17e63ddaf 100644
--- a/apps/openmw/mwrender/camera.hpp
+++ b/apps/openmw/mwrender/camera.hpp
@@ -60,8 +60,10 @@ namespace MWRender
 
         float getExtraPitch() const { return mExtraPitch; }
         float getExtraYaw() const { return mExtraYaw; }
+        float getExtraRoll() const { return mExtraRoll; }
         void setExtraPitch(float angle) { mExtraPitch = angle; }
         void setExtraYaw(float angle) { mExtraYaw = angle; }
+        void setExtraRoll(float angle) { mExtraRoll = angle; }
 
         /// @param Force view mode switch, even if currently not allowed by the animation.
         void toggleViewMode(bool force=false);
@@ -125,7 +127,7 @@ namespace MWRender
 
         float mHeight;
         float mPitch, mYaw, mRoll;
-        float mExtraPitch = 0, mExtraYaw = 0;
+        float mExtraPitch = 0, mExtraYaw = 0, mExtraRoll = 0;
         bool mLockPitch = false, mLockYaw = false;
         osg::Vec3d mPosition;
         osg::Matrixf mViewMatrix;
diff --git a/files/builtin_scripts/scripts/omw/camera.lua b/files/builtin_scripts/scripts/omw/camera.lua
index 56e7f52487..9845135f50 100644
--- a/files/builtin_scripts/scripts/omw/camera.lua
+++ b/files/builtin_scripts/scripts/omw/camera.lua
@@ -150,7 +150,7 @@ end
 local function onUpdate(dt)
     camera.setExtraPitch(0)
     camera.setExtraYaw(0)
-    camera.setRoll(0)
+    camera.setExtraRoll(0)
     camera.setFirstPersonOffset(util.vector3(0, 0, 0))
     updateSmoothedSpeed(dt)
 end
diff --git a/files/builtin_scripts/scripts/omw/head_bobbing.lua b/files/builtin_scripts/scripts/omw/head_bobbing.lua
index 8e6ea0660f..b3d96a7eba 100644
--- a/files/builtin_scripts/scripts/omw/head_bobbing.lua
+++ b/files/builtin_scripts/scripts/omw/head_bobbing.lua
@@ -46,7 +46,7 @@ function M.update(dt, smoothedSpeed)
     local zOffset = (0.5 - effect) * coef * stepHeight  -- range from -stepHeight/2 to stepHeight/2
     local roll = ((stepState > 0 and 1) or -1) * effect * coef * maxRoll  -- range from -maxRoll to maxRoll
     camera.setFirstPersonOffset(camera.getFirstPersonOffset() + util.vector3(0, 0, zOffset))
-    camera.setRoll(camera.getRoll() + roll)
+    camera.setExtraRoll(camera.getExtraRoll() + roll)
 end
 
 return M
diff --git a/files/lua_api/openmw/camera.lua b/files/lua_api/openmw/camera.lua
index f699663c49..84858cadd4 100644
--- a/files/lua_api/openmw/camera.lua
+++ b/files/lua_api/openmw/camera.lua
@@ -111,6 +111,18 @@
 -- @function [parent=#camera] setExtraYaw
 -- @param #number value
 
+---
+-- Additional summand for the roll angle that is not affected by player input.
+-- Full yaw is `getRoll()+getExtraRoll()`.
+-- @function [parent=#camera] getExtraRoll
+-- @return #number
+
+---
+-- Additional summand for the roll angle; useful for camera shaking effects.
+-- Full yaw is `getRoll()+getExtraRoll()`.
+-- @function [parent=#camera] setExtraRoll
+-- @param #number value
+
 ---
 -- Set camera position; can be used only if camera is in Static mode.
 -- @function [parent=#camera] setStaticPosition

From 0643685ea547f3bddf84455655adb97feadfde32 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Fri, 13 May 2022 18:22:59 +0200
Subject: [PATCH 2425/2859] [Lua] Rename onInputUpdate -> onFrame and call it
 even when the game is on pause (#6745)

---
 apps/openmw/mwlua/luabindings.cpp                    |  2 +-
 apps/openmw/mwlua/luamanagerimp.cpp                  |  4 ++--
 apps/openmw/mwlua/playerscripts.hpp                  |  6 +++---
 .../reference/lua-scripting/engine_handlers.rst      | 12 +++++++-----
 files/builtin_scripts/scripts/omw/camera.lua         |  5 +++--
 files/lua_api/openmw/nearby.lua                      |  2 +-
 6 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index 3c2023ff5f..dc50d093ca 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -41,7 +41,7 @@ namespace MWLua
     {
         auto* lua = context.mLua;
         sol::table api(lua->sol(), sol::create);
-        api["API_REVISION"] = 21;
+        api["API_REVISION"] = 22;
         api["quit"] = [lua]()
         {
             Log(Debug::Warning) << "Quit requested by a Lua script.\n" << lua->debugTraceback();
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 602f32710f..3c458bd7b8 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -234,8 +234,8 @@ namespace MWLua
                 playerScripts->processInputEvent(event);
         }
         mInputEvents.clear();
-        if (playerScripts && !mWorldView.isPaused())
-            playerScripts->inputUpdate(MWBase::Environment::get().getFrameDuration());
+        if (playerScripts)
+            playerScripts->onFrame(mWorldView.isPaused() ? 0.0 : MWBase::Environment::get().getFrameDuration());
         mProcessingInputEvents = false;
 
         MWBase::WindowManager* windowManager = MWBase::Environment::get().getWindowManager();
diff --git a/apps/openmw/mwlua/playerscripts.hpp b/apps/openmw/mwlua/playerscripts.hpp
index 1e909dc72c..eb248ccc40 100644
--- a/apps/openmw/mwlua/playerscripts.hpp
+++ b/apps/openmw/mwlua/playerscripts.hpp
@@ -20,7 +20,7 @@ namespace MWLua
             registerEngineHandlers({
                 &mConsoleCommandHandlers, &mKeyPressHandlers, &mKeyReleaseHandlers,
                 &mControllerButtonPressHandlers, &mControllerButtonReleaseHandlers,
-                &mActionHandlers, &mInputUpdateHandlers,
+                &mActionHandlers, &mOnFrameHandlers,
                 &mTouchpadPressed, &mTouchpadReleased, &mTouchpadMoved
             });
         }
@@ -57,7 +57,7 @@ namespace MWLua
             }
         }
 
-        void inputUpdate(float dt) { callEngineHandlers(mInputUpdateHandlers, dt); }
+        void onFrame(float dt) { callEngineHandlers(mOnFrameHandlers, dt); }
 
         bool consoleCommand(const std::string& consoleMode, const std::string& command, const sol::object& selectedObject)
         {
@@ -72,7 +72,7 @@ namespace MWLua
         EngineHandlerList mControllerButtonPressHandlers{"onControllerButtonPress"};
         EngineHandlerList mControllerButtonReleaseHandlers{"onControllerButtonRelease"};
         EngineHandlerList mActionHandlers{"onInputAction"};
-        EngineHandlerList mInputUpdateHandlers{"onInputUpdate"};
+        EngineHandlerList mOnFrameHandlers{"onFrame"};
         EngineHandlerList mTouchpadPressed{ "onTouchPress" };
         EngineHandlerList mTouchpadReleased{ "onTouchRelease" };
         EngineHandlerList mTouchpadMoved{ "onTouchMove" };
diff --git a/docs/source/reference/lua-scripting/engine_handlers.rst b/docs/source/reference/lua-scripting/engine_handlers.rst
index 6f24750736..524314341c 100644
--- a/docs/source/reference/lua-scripting/engine_handlers.rst
+++ b/docs/source/reference/lua-scripting/engine_handlers.rst
@@ -15,8 +15,8 @@ Engine handler is a function defined by a script, that can be called by the engi
       | `assigned to a script in openmw-cs (not yet implemented).`
       | ``onInterfaceOverride`` can be called before ``onInit``.
   * - onUpdate(dt)
-    - | Called every frame if the game is not paused. `dt` is the time
-      | from the last update in seconds.
+    - | Called every frame if the game is not paused. `dt` is
+      | the simulation time from the last update in seconds.
   * - onSave() -> savedData
     - | Called when the game is saving. May be called in inactive state,
       | so it shouldn't use `openmw.nearby`.
@@ -69,9 +69,11 @@ Engine handler is a function defined by a script, that can be called by the engi
 .. list-table::
   :widths: 20 80
 
-  * - onInputUpdate(dt)
-    - | Called every frame (if the game is not paused) right after
-      | processing user input. Use it only for latency-critical stuff.
+  * - onFrame(dt)
+    - | Called every frame (even if the game is paused) right after
+      | processing user input. Use it only for latency-critical stuff
+      | and for UI that should work on pause.
+      | `dt` is simulation time delta (0 when on pause).
   * - onKeyPress(key)
     - | `Key <openmw_input.html##(KeyboardEvent)>`_ is pressed.
       | Usage example:
diff --git a/files/builtin_scripts/scripts/omw/camera.lua b/files/builtin_scripts/scripts/omw/camera.lua
index 9845135f50..8a614c9ac3 100644
--- a/files/builtin_scripts/scripts/omw/camera.lua
+++ b/files/builtin_scripts/scripts/omw/camera.lua
@@ -155,7 +155,8 @@ local function onUpdate(dt)
     updateSmoothedSpeed(dt)
 end
 
-local function onInputUpdate(dt)
+local function onFrame(dt)
+    if core.isWorldPaused() then return end
     local mode = camera.getMode()
     if mode == MODE.FirstPerson or mode == MODE.ThirdPerson then
         primaryMode = mode
@@ -232,7 +233,7 @@ return {
     },
     engineHandlers = {
         onUpdate = onUpdate,
-        onInputUpdate = onInputUpdate,
+        onFrame = onFrame,
         onInputAction = function(action)
             if core.isWorldPaused() then return end
             if action == input.ACTION.ZoomIn then
diff --git a/files/lua_api/openmw/nearby.lua b/files/lua_api/openmw/nearby.lua
index f290992f33..076d5cebbd 100644
--- a/files/lua_api/openmw/nearby.lua
+++ b/files/lua_api/openmw/nearby.lua
@@ -74,7 +74,7 @@
 ---
 -- Cast ray from one point to another and find the first visual intersection with anything in the scene.
 -- As opposite to `castRay` can find an intersection with an object without collisions.
--- In order to avoid threading issues can be used only in player scripts only in `onInputUpdate` or
+-- In order to avoid threading issues can be used only in player scripts only in `onFrame` or
 -- in engine handlers for user input. In other cases use `asyncCastRenderingRay` instead.
 -- @function [parent=#nearby] castRenderingRay
 -- @param openmw.util#Vector3 from Start point of the ray.

From 3e343a53d0a213fec47f4aa994f9f3ca970c7428 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Fri, 13 May 2022 17:47:11 +0000
Subject: [PATCH 2426/2859] Fix wrong function name in Lua docs

---
 files/builtin_scripts/openmw_aux/ui.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/builtin_scripts/openmw_aux/ui.lua b/files/builtin_scripts/openmw_aux/ui.lua
index ec9b81fdb1..44e1029b4b 100644
--- a/files/builtin_scripts/openmw_aux/ui.lua
+++ b/files/builtin_scripts/openmw_aux/ui.lua
@@ -16,7 +16,7 @@ local function deepContentCopy(content)
 end
 
 ---
--- @function [parent=#ui] templates
+-- @function [parent=#ui] deepLayoutCopy
 -- @param #table layout
 -- @return #table copied layout
 function aux_ui.deepLayoutCopy(layout)
@@ -33,4 +33,4 @@ function aux_ui.deepLayoutCopy(layout)
     return result
 end
 
-return aux_ui
\ No newline at end of file
+return aux_ui

From 9649bfc4cb55abc36159275dc4e8afab4523b7a4 Mon Sep 17 00:00:00 2001
From: ShadIK02 <shadik02@icloud.com>
Date: Fri, 13 May 2022 21:59:47 +0000
Subject: [PATCH 2427/2859] When building Win32 (VS 2019), there are problems
 in line 45. This change solves the problem.

Special thanks to AnyOldName3 for the hint :)
---
 components/debug/gldebug.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/debug/gldebug.cpp b/components/debug/gldebug.cpp
index ccf49edd40..a0c7aa6206 100644
--- a/components/debug/gldebug.cpp
+++ b/components/debug/gldebug.cpp
@@ -42,7 +42,7 @@ either expressed or implied, of the FreeBSD Project.
 namespace Debug
 {
 
-    void debugCallback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const void *userParam)
+    void GL_APIENTRY debugCallback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const void *userParam)
     {
 #ifdef GL_DEBUG_OUTPUT
         std::string srcStr;

From 52d05be04ba193ba32385efd51f64972088449a4 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sat, 14 May 2022 10:27:30 +0000
Subject: [PATCH 2428/2859] Styling for Settings

---
 components/lua_ui/container.cpp               |  40 +-
 components/lua_ui/container.hpp               |   6 +
 components/lua_ui/element.cpp                 |  27 +-
 components/lua_ui/flex.cpp                    |  18 +-
 components/lua_ui/flex.hpp                    |   6 +-
 components/lua_ui/image.cpp                   |   1 +
 components/lua_ui/textedit.cpp                |  45 ++-
 components/lua_ui/textedit.hpp                |   6 +-
 components/lua_ui/util.cpp                    |   1 +
 components/lua_ui/widget.cpp                  |  88 ++---
 components/lua_ui/widget.hpp                  |   6 +-
 docs/source/reference/lua-scripting/api.rst   |   3 +
 .../reference/lua-scripting/overview.rst      |   3 +
 .../lua-scripting/user_interface.rst          |   1 +
 .../lua-scripting/widgets/container.rst       |   8 +
 .../reference/lua-scripting/widgets/flex.rst  |   6 +-
 files/builtin_scripts/CMakeLists.txt          |   2 +
 .../scripts/omw/mwui/borders.lua              | 245 ++++++++----
 .../scripts/omw/mwui/constants.lua            |   7 +-
 .../builtin_scripts/scripts/omw/mwui/init.lua |  22 +-
 .../scripts/omw/mwui/space.lua                |  39 ++
 .../builtin_scripts/scripts/omw/mwui/text.lua |  11 +-
 .../scripts/omw/mwui/textEdit.lua             |  18 +-
 .../scripts/omw/settings/common.lua           |  13 +-
 .../scripts/omw/settings/player.lua           |  76 ++--
 .../scripts/omw/settings/render.lua           | 355 +++++++++++-------
 .../scripts/omw/settings/renderers.lua        |  39 ++
 files/mygui/openmw_lua.xml                    |   2 +-
 28 files changed, 719 insertions(+), 375 deletions(-)
 create mode 100644 docs/source/reference/lua-scripting/widgets/container.rst
 create mode 100644 files/builtin_scripts/scripts/omw/mwui/space.lua
 create mode 100644 files/builtin_scripts/scripts/omw/settings/renderers.lua

diff --git a/components/lua_ui/container.cpp b/components/lua_ui/container.cpp
index 11b9c1b360..52fea684d7 100644
--- a/components/lua_ui/container.cpp
+++ b/components/lua_ui/container.cpp
@@ -7,11 +7,6 @@ namespace LuaUi
     void LuaContainer::updateChildren()
     {
         WidgetExtension::updateChildren();
-        for (auto w : children())
-        {
-            w->onCoordChange([this](WidgetExtension* child, MyGUI::IntCoord coord)
-                { updateSizeToFit(); });
-        }
         updateSizeToFit();
     }
 
@@ -20,16 +15,39 @@ namespace LuaUi
         return MyGUI::IntSize();
     }
 
+    MyGUI::IntSize LuaContainer::templateScalingSize()
+    {
+        return mInnerSize;
+    }
+
     void LuaContainer::updateSizeToFit()
     {
-        MyGUI::IntSize size;
+        MyGUI::IntSize innerSize = MyGUI::IntSize();
         for (auto w : children())
         {
-            MyGUI::IntCoord coord = w->widget()->getCoord();
-            size.width = std::max(size.width, coord.left + coord.width);
-            size.height = std::max(size.height, coord.top + coord.height);
+            MyGUI::IntCoord coord = w->calculateCoord();
+            innerSize.width = std::max(innerSize.width, coord.left + coord.width);
+            innerSize.height = std::max(innerSize.height, coord.top + coord.height);
+        }
+        MyGUI::IntSize outerSize = innerSize;
+        for (auto w : templateChildren())
+        {
+            MyGUI::IntCoord coord = w->calculateCoord();
+            outerSize.width = std::max(outerSize.width, coord.left + coord.width);
+            outerSize.height = std::max(outerSize.height, coord.top + coord.height);
         }
-        forceSize(size);
-        updateCoord();
+        mInnerSize = innerSize;
+        mOuterSize = outerSize;
+    }
+
+    MyGUI::IntSize LuaContainer::calculateSize()
+    {
+        return mOuterSize;
+    }
+
+    void LuaContainer::updateCoord()
+    {
+        updateSizeToFit();
+        WidgetExtension::updateCoord();
     }
 }
diff --git a/components/lua_ui/container.hpp b/components/lua_ui/container.hpp
index 664fb08ea2..1a8adee89f 100644
--- a/components/lua_ui/container.hpp
+++ b/components/lua_ui/container.hpp
@@ -9,12 +9,18 @@ namespace LuaUi
     {
         MYGUI_RTTI_DERIVED(LuaContainer)
 
+        MyGUI::IntSize calculateSize() override;
+        void updateCoord() override;
+
         protected:
             void updateChildren() override;
             MyGUI::IntSize childScalingSize() override;
+            MyGUI::IntSize templateScalingSize() override;
 
         private:
             void updateSizeToFit();
+            MyGUI::IntSize mInnerSize;
+            MyGUI::IntSize mOuterSize;
     };
 }
 
diff --git a/components/lua_ui/element.cpp b/components/lua_ui/element.cpp
index 9f70cfc1da..b55d89e613 100644
--- a/components/lua_ui/element.cpp
+++ b/components/lua_ui/element.cpp
@@ -24,7 +24,18 @@ namespace LuaUi
 
     std::string widgetType(const sol::table& layout)
     {
-        return layout.get_or(LayoutKeys::type, defaultWidgetType);
+        sol::object typeField = LuaUtil::getFieldOrNil(layout, LayoutKeys::type);
+        std::string type = LuaUtil::getValueOrDefault(typeField, defaultWidgetType);
+        sol::object templateTypeField = LuaUtil::getFieldOrNil(layout, LayoutKeys::templateLayout, LayoutKeys::type);
+        if (templateTypeField != sol::nil)
+        {
+            std::string templateType = LuaUtil::getValueOrDefault(templateTypeField, defaultWidgetType);
+            if (typeField != sol::nil && templateType != type)
+                throw std::logic_error(std::string("Template layout type ") + type
+                    + std::string(" doesn't match template type ") + templateType);
+            type = templateType;
+        }
+        return type;
     }
 
     void destroyWidget(LuaUi::WidgetExtension* ext)
@@ -103,18 +114,8 @@ namespace LuaUi
 
     WidgetExtension* createWidget(const sol::table& layout)
     {
-        sol::object typeField = LuaUtil::getFieldOrNil(layout, LayoutKeys::type);
-        std::string type = LuaUtil::getValueOrDefault(typeField, defaultWidgetType);
-        sol::object templateTypeField = LuaUtil::getFieldOrNil(layout, LayoutKeys::templateLayout, LayoutKeys::type);
-        if (templateTypeField != sol::nil)
-        {
-            std::string templateType = LuaUtil::getValueOrDefault(templateTypeField, defaultWidgetType);
-            if (typeField != sol::nil && templateType != type)
-                throw std::logic_error(std::string("Template layout type ") + type
-                    + std::string(" doesn't match template type ") + templateType);
-            type = templateType;
-        }
         static auto widgetTypeMap = widgetTypeToName();
+        std::string type = widgetType(layout);
         if (widgetTypeMap.find(type) == widgetTypeMap.end())
             throw std::logic_error(std::string("Invalid widget type ") += type);
 
@@ -242,7 +243,7 @@ namespace LuaUi
             if (!mLayer.empty())
                 Log(Debug::Warning) << "Ignoring element's layer " << mLayer << " because it's attached to a widget";
             mAttachedTo->setChildren({ mRoot });
-            mRoot->updateCoord();
+            mAttachedTo->updateCoord();
         }
     }
 }
diff --git a/components/lua_ui/flex.cpp b/components/lua_ui/flex.cpp
index dfe943a02f..b54120e78b 100644
--- a/components/lua_ui/flex.cpp
+++ b/components/lua_ui/flex.cpp
@@ -56,7 +56,7 @@ namespace LuaUi
         MyGUI::IntSize flexSize = calculateSize();
         int growSize = 0;
         float growFactor = 0;
-        if (totalGrow > 0 && !mAutoSized)
+        if (totalGrow > 0)
         {
             growSize = primary(flexSize) - primary(childrenSize);
             growFactor = growSize / totalGrow;
@@ -67,22 +67,32 @@ namespace LuaUi
         for (auto* w : children())
         {
             MyGUI::IntSize size = w->calculateSize();
+            primary(size) += static_cast<int>(growFactor * getGrow(w));
+            float stretch = std::clamp(w->externalValue("stretch", 0.0f), 0.0f, 1.0f);
+            secondary(size) = std::max(secondary(size), static_cast<int>(stretch * secondary(flexSize)));
             secondary(childPosition) = alignSize(secondary(flexSize), secondary(size), mArrange);
             w->forcePosition(childPosition);
-            primary(size) += static_cast<int>(growFactor * getGrow(w));
             w->forceSize(size);
             w->updateCoord();
             primary(childPosition) += primary(size);
-            w->updateCoord();
         }
         WidgetExtension::updateChildren();
     }
 
+    MyGUI::IntSize LuaFlex::childScalingSize()
+    {
+        // Call the base method to prevent relativeSize feedback loop
+        MyGUI::IntSize size = WidgetExtension::calculateSize();
+        if (mAutoSized)
+            primary(size) = 0;
+        return size;
+    }
+
     MyGUI::IntSize LuaFlex::calculateSize()
     {
         MyGUI::IntSize size = WidgetExtension::calculateSize();
         if (mAutoSized) {
-            primary(size) = primary(mChildrenSize);
+            primary(size) = std::max(primary(size), primary(mChildrenSize));
             secondary(size) = std::max(secondary(size), secondary(mChildrenSize));
         }
         return size;
diff --git a/components/lua_ui/flex.hpp b/components/lua_ui/flex.hpp
index 7c583dc3c3..50a3404425 100644
--- a/components/lua_ui/flex.hpp
+++ b/components/lua_ui/flex.hpp
@@ -14,10 +14,8 @@ namespace LuaUi
             MyGUI::IntSize calculateSize() override;
             void updateProperties() override;
             void updateChildren() override;
-            MyGUI::IntSize childScalingSize() override
-            {
-                return MyGUI::IntSize();
-            }
+            MyGUI::IntSize childScalingSize() override;
+
             void updateCoord() override;
 
         private:
diff --git a/components/lua_ui/image.cpp b/components/lua_ui/image.cpp
index 6bcc4a5846..8319780b23 100644
--- a/components/lua_ui/image.cpp
+++ b/components/lua_ui/image.cpp
@@ -31,6 +31,7 @@ namespace LuaUi
     {
         changeWidgetSkin("LuaImage");
         mTileRect = dynamic_cast<LuaTileRect*>(getSubWidgetMain());
+        WidgetExtension::initialize();
     }
 
     void LuaImage::updateProperties()
diff --git a/components/lua_ui/textedit.cpp b/components/lua_ui/textedit.cpp
index ac44872f21..0441eb4e5d 100644
--- a/components/lua_ui/textedit.cpp
+++ b/components/lua_ui/textedit.cpp
@@ -6,38 +6,57 @@ namespace LuaUi
 {
     void LuaTextEdit::initialize()
     {
-        changeWidgetSkin("LuaTextEdit");
-
-        eventEditTextChange += MyGUI::newDelegate(this, &LuaTextEdit::textChange);
-
+        mEditBox = createWidget<MyGUI::EditBox>("LuaTextEdit", MyGUI::IntCoord(0, 0, 0, 0), MyGUI::Align::Default);
+        mEditBox->eventEditTextChange += MyGUI::newDelegate(this, &LuaTextEdit::textChange);
+        registerEvents(mEditBox);
         WidgetExtension::initialize();
     }
 
     void LuaTextEdit::deinitialize()
     {
-        eventEditTextChange -= MyGUI::newDelegate(this, &LuaTextEdit::textChange);
+        mEditBox->eventEditTextChange -= MyGUI::newDelegate(this, &LuaTextEdit::textChange);
+        clearEvents(mEditBox);
         WidgetExtension::deinitialize();
     }
 
     void LuaTextEdit::updateProperties()
     {
-        setCaption(propertyValue("text", std::string()));
-        setFontHeight(propertyValue("textSize", 10));
-        setTextColour(propertyValue("textColor", MyGUI::Colour(0, 0, 0, 1)));
-        setEditMultiLine(propertyValue("multiline", false));
-        setEditWordWrap(propertyValue("wordWrap", false));
+        mEditBox->setCaption(propertyValue("text", std::string()));
+        mEditBox->setFontHeight(propertyValue("textSize", 10));
+        mEditBox->setTextColour(propertyValue("textColor", MyGUI::Colour(0, 0, 0, 1)));
+        mEditBox->setEditMultiLine(propertyValue("multiline", false));
+        mEditBox->setEditWordWrap(propertyValue("wordWrap", false));
 
         Alignment horizontal(propertyValue("textAlignH", Alignment::Start));
         Alignment vertical(propertyValue("textAlignV", Alignment::Start));
-        setTextAlign(alignmentToMyGui(horizontal, vertical));
+        mEditBox->setTextAlign(alignmentToMyGui(horizontal, vertical));
 
-        setEditStatic(propertyValue("readOnly", false));
+        mEditBox->setEditStatic(propertyValue("readOnly", false));
 
         WidgetExtension::updateProperties();
     }
 
     void LuaTextEdit::textChange(MyGUI::EditBox*)
     {
-        triggerEvent("textChanged", sol::make_object(lua(), getCaption().asUTF8()));
+        triggerEvent("textChanged", sol::make_object(lua(), mEditBox->getCaption().asUTF8()));
+    }
+
+    void LuaTextEdit::updateCoord()
+    {
+        WidgetExtension::updateCoord();
+        {
+            MyGUI::IntSize slotSize = slot()->calculateSize();
+            MyGUI::IntPoint slotPosition = slot()->widget()->getAbsolutePosition() - widget()->getAbsolutePosition();
+            MyGUI::IntCoord slotCoord(slotPosition, slotSize);
+            mEditBox->setCoord(slotCoord);
+        }
+    }
+
+    void LuaTextEdit::updateChildren()
+    {
+        WidgetExtension::updateChildren();
+        // otherwise it won't be focusable
+        mEditBox->detachFromWidget();
+        mEditBox->attachToWidget(this);
     }
 }
diff --git a/components/lua_ui/textedit.hpp b/components/lua_ui/textedit.hpp
index 208240283c..1158e91e2c 100644
--- a/components/lua_ui/textedit.hpp
+++ b/components/lua_ui/textedit.hpp
@@ -7,7 +7,7 @@
 
 namespace LuaUi
 {
-    class LuaTextEdit : public MyGUI::EditBox, public WidgetExtension
+    class LuaTextEdit : public MyGUI::Widget, public WidgetExtension
     {
         MYGUI_RTTI_DERIVED(LuaTextEdit)
 
@@ -15,9 +15,13 @@ namespace LuaUi
             void initialize() override;
             void deinitialize() override;
             void updateProperties() override;
+            void updateCoord() override;
+            void updateChildren() override;
 
         private:
             void textChange(MyGUI::EditBox*);
+
+        MyGUI::EditBox* mEditBox;
     };
 }
 
diff --git a/components/lua_ui/util.cpp b/components/lua_ui/util.cpp
index d7e7390647..f3cb0d288c 100644
--- a/components/lua_ui/util.cpp
+++ b/components/lua_ui/util.cpp
@@ -39,6 +39,7 @@ namespace LuaUi
             { "LuaWindow", "Window" },
             { "LuaImage", "Image" },
             { "LuaFlex", "Flex" },
+            { "LuaContainer", "Container" },
         };
         return types;
     }
diff --git a/components/lua_ui/widget.cpp b/components/lua_ui/widget.cpp
index 641f34c9ca..bd9e47ab34 100644
--- a/components/lua_ui/widget.cpp
+++ b/components/lua_ui/widget.cpp
@@ -35,37 +35,13 @@ namespace LuaUi
     void WidgetExtension::initialize()
     {
         // \todo might be more efficient to only register these if there are Lua callbacks
-        mWidget->eventKeyButtonPressed += MyGUI::newDelegate(this, &WidgetExtension::keyPress);
-        mWidget->eventKeyButtonReleased += MyGUI::newDelegate(this, &WidgetExtension::keyRelease);
-        mWidget->eventMouseButtonClick += MyGUI::newDelegate(this, &WidgetExtension::mouseClick);
-        mWidget->eventMouseButtonDoubleClick += MyGUI::newDelegate(this, &WidgetExtension::mouseDoubleClick);
-        mWidget->eventMouseButtonPressed += MyGUI::newDelegate(this, &WidgetExtension::mousePress);
-        mWidget->eventMouseButtonReleased += MyGUI::newDelegate(this, &WidgetExtension::mouseRelease);
-        mWidget->eventMouseMove += MyGUI::newDelegate(this, &WidgetExtension::mouseMove);
-        mWidget->eventMouseDrag += MyGUI::newDelegate(this, &WidgetExtension::mouseDrag);
-
-        mWidget->eventMouseSetFocus += MyGUI::newDelegate(this, &WidgetExtension::focusGain);
-        mWidget->eventMouseLostFocus += MyGUI::newDelegate(this, &WidgetExtension::focusLoss);
-        mWidget->eventKeySetFocus += MyGUI::newDelegate(this, &WidgetExtension::focusGain);
-        mWidget->eventKeyLostFocus += MyGUI::newDelegate(this, &WidgetExtension::focusLoss);
+        registerEvents(mWidget);
     }
 
     void WidgetExtension::deinitialize()
     {
         clearCallbacks();
-        mWidget->eventKeyButtonPressed.clear();
-        mWidget->eventKeyButtonReleased.clear();
-        mWidget->eventMouseButtonClick.clear();
-        mWidget->eventMouseButtonDoubleClick.clear();
-        mWidget->eventMouseButtonPressed.clear();
-        mWidget->eventMouseButtonReleased.clear();
-        mWidget->eventMouseMove.clear();
-        mWidget->eventMouseDrag.m_event.clear();
-
-        mWidget->eventMouseSetFocus.clear();
-        mWidget->eventMouseLostFocus.clear();
-        mWidget->eventKeySetFocus.clear();
-        mWidget->eventKeyLostFocus.clear();
+        clearEvents(mWidget);
 
         mOnCoordChange.reset();
 
@@ -75,6 +51,39 @@ namespace LuaUi
             w->deinitialize();
     }
 
+    void WidgetExtension::registerEvents(MyGUI::Widget* w)
+    {
+        w->eventKeyButtonPressed += MyGUI::newDelegate(this, &WidgetExtension::keyPress);
+        w->eventKeyButtonReleased += MyGUI::newDelegate(this, &WidgetExtension::keyRelease);
+        w->eventMouseButtonClick += MyGUI::newDelegate(this, &WidgetExtension::mouseClick);
+        w->eventMouseButtonDoubleClick += MyGUI::newDelegate(this, &WidgetExtension::mouseDoubleClick);
+        w->eventMouseButtonPressed += MyGUI::newDelegate(this, &WidgetExtension::mousePress);
+        w->eventMouseButtonReleased += MyGUI::newDelegate(this, &WidgetExtension::mouseRelease);
+        w->eventMouseMove += MyGUI::newDelegate(this, &WidgetExtension::mouseMove);
+        w->eventMouseDrag += MyGUI::newDelegate(this, &WidgetExtension::mouseDrag);
+
+        w->eventMouseSetFocus += MyGUI::newDelegate(this, &WidgetExtension::focusGain);
+        w->eventMouseLostFocus += MyGUI::newDelegate(this, &WidgetExtension::focusLoss);
+        w->eventKeySetFocus += MyGUI::newDelegate(this, &WidgetExtension::focusGain);
+        w->eventKeyLostFocus += MyGUI::newDelegate(this, &WidgetExtension::focusLoss);
+    }
+    void WidgetExtension::clearEvents(MyGUI::Widget* w)
+    {
+        w->eventKeyButtonPressed.clear();
+        w->eventKeyButtonReleased.clear();
+        w->eventMouseButtonClick.clear();
+        w->eventMouseButtonDoubleClick.clear();
+        w->eventMouseButtonPressed.clear();
+        w->eventMouseButtonReleased.clear();
+        w->eventMouseMove.clear();
+        w->eventMouseDrag.m_event.clear();
+
+        w->eventMouseSetFocus.clear();
+        w->eventMouseLostFocus.clear();
+        w->eventKeySetFocus.clear();
+        w->eventKeyLostFocus.clear();
+    }
+
     void WidgetExtension::reset()
     {
         // detach all children from the slot widget, in case it gets destroyed
@@ -188,25 +197,11 @@ namespace LuaUi
 
     void WidgetExtension::updateTemplate()
     {
-        WidgetExtension* oldSlot = mSlot;
         WidgetExtension* slot = findDeepInTemplates("slot");
         if (slot == nullptr)
             mSlot = this;
         else
             mSlot = slot->mSlot;
-        if (mSlot != oldSlot)
-        {
-            MyGUI::IntSize slotSize = mSlot->widget()->getSize();
-            MyGUI::IntPoint slotPosition = mSlot->widget()->getAbsolutePosition() - widget()->getAbsolutePosition();
-            MyGUI::IntCoord slotCoord(slotPosition, slotSize);
-            MyGUI::Widget* clientWidget = mWidget->getClientWidget();
-            if (!clientWidget)
-                clientWidget = mWidget;
-            if (clientWidget->getSubWidgetMain())
-                clientWidget->getSubWidgetMain()->setCoord(slotCoord);
-            if (clientWidget->getSubWidgetText())
-                clientWidget->getSubWidgetText()->setCoord(slotCoord);
-        }
     }
 
     void WidgetExtension::setCallback(const std::string& name, const LuaUtil::Callback& callback)
@@ -290,10 +285,12 @@ namespace LuaUi
 
     MyGUI::IntSize WidgetExtension::parentSize()
     {
-        if (mParent && !mTemplateChild)
-            return mParent->childScalingSize();
+        if (!mParent)
+            return widget()->getParentSize(); // size of the layer
+        if (mTemplateChild)
+            return mParent->templateScalingSize();
         else
-            return widget()->getParentSize();
+            return mParent->childScalingSize();
     }
 
     MyGUI::IntSize WidgetExtension::calculateSize()
@@ -334,6 +331,11 @@ namespace LuaUi
         return mSlot->widget()->getSize();
     }
 
+    MyGUI::IntSize WidgetExtension::templateScalingSize()
+    {
+        return widget()->getSize();
+    }
+
     void WidgetExtension::triggerEvent(std::string_view name, sol::object argument) const
     {
         auto it = mCallbacks.find(name);
diff --git a/components/lua_ui/widget.hpp b/components/lua_ui/widget.hpp
index 239d2e6bb3..b6bef55235 100644
--- a/components/lua_ui/widget.hpp
+++ b/components/lua_ui/widget.hpp
@@ -70,16 +70,20 @@ namespace LuaUi
 
         virtual MyGUI::IntSize calculateSize();
         virtual MyGUI::IntPoint calculatePosition(const MyGUI::IntSize& size);
+        MyGUI::IntCoord calculateCoord();
 
     protected:
         virtual void initialize();
+        void registerEvents(MyGUI::Widget* w);
+        void clearEvents(MyGUI::Widget* w);
+
         sol::table makeTable() const;
         sol::object keyEvent(MyGUI::KeyCode) const;
         sol::object mouseEvent(int left, int top, MyGUI::MouseButton button) const;
 
         MyGUI::IntSize parentSize();
-        MyGUI::IntCoord calculateCoord();
         virtual MyGUI::IntSize childScalingSize();
+        virtual MyGUI::IntSize templateScalingSize();
 
         template<typename T>
         T propertyValue(std::string_view name, const T& defaultValue)
diff --git a/docs/source/reference/lua-scripting/api.rst b/docs/source/reference/lua-scripting/api.rst
index a6009edf1a..0c850d3676 100644
--- a/docs/source/reference/lua-scripting/api.rst
+++ b/docs/source/reference/lua-scripting/api.rst
@@ -111,3 +111,6 @@ Sources can be found in ``resources/vfs/openmw_aux``. In theory mods can overrid
   * - :ref:`Settings <Interface Settings>`
     - by player and global scripts
     - Save, display and track changes of setting values.
+  * - :ref:`MWUI <Interface MWUI>`
+    - by player scripts
+    - Morrowind-style UI templates.
diff --git a/docs/source/reference/lua-scripting/overview.rst b/docs/source/reference/lua-scripting/overview.rst
index e21469a53f..a075d9228e 100644
--- a/docs/source/reference/lua-scripting/overview.rst
+++ b/docs/source/reference/lua-scripting/overview.rst
@@ -476,6 +476,9 @@ The order in which the scripts are started is important. So if one mod should ov
   * - :ref:`Settings <Interface Settings>`
     - by player and global scripts
     - Save, display and track changes of setting values.
+  * - :ref:`MWUI <Interface MWUI>`
+    - by player scripts
+    - Morrowind-style UI templates.
 
 Event system
 ============
diff --git a/docs/source/reference/lua-scripting/user_interface.rst b/docs/source/reference/lua-scripting/user_interface.rst
index 394c53e688..d1d3162a4b 100644
--- a/docs/source/reference/lua-scripting/user_interface.rst
+++ b/docs/source/reference/lua-scripting/user_interface.rst
@@ -82,6 +82,7 @@ Widget types
    TextEdit: Accepts text input from the user. <widgets/textedit>
    Image: Renders a texture. <widgets/image>
    Flex: Aligns children in a column/row <widgets/flex>
+   Container: Wraps around its children <widgets/container>
 
 Example
 -------
diff --git a/docs/source/reference/lua-scripting/widgets/container.rst b/docs/source/reference/lua-scripting/widgets/container.rst
new file mode 100644
index 0000000000..6b15f25110
--- /dev/null
+++ b/docs/source/reference/lua-scripting/widgets/container.rst
@@ -0,0 +1,8 @@
+Container Widget
+================
+
+Wraps around its children. Convenient for creating border-type templates.
+
+Relative size and position don't work for children.
+
+For template children, relative size and position depend on the children's combined size.
\ No newline at end of file
diff --git a/docs/source/reference/lua-scripting/widgets/flex.rst b/docs/source/reference/lua-scripting/widgets/flex.rst
index 2648e88996..468cb93958 100644
--- a/docs/source/reference/lua-scripting/widgets/flex.rst
+++ b/docs/source/reference/lua-scripting/widgets/flex.rst
@@ -15,7 +15,8 @@ Properties
     - description
   * - horizontal
     - bool (false)
-    - Flex aligns its children in a row if true, otherwise in a column.
+    - | Flex aligns its children in a row (main axis is horizontal) if true,
+      | otherwise in a column (main axis is vertical).
   * - autoSize
     - bool (true)
     - | If true, Flex will automatically resize to fit its contents.
@@ -41,3 +42,6 @@ External
     - | Grow factor for the child. If there is unused space in the Flex,
       | it will be split between widgets according to this value.
       | Has no effect if `autoSize` is `true`.
+  * - stretch
+    - float (0)
+    - | Stretches the child to a percentage of the Flex's cross axis size.
diff --git a/files/builtin_scripts/CMakeLists.txt b/files/builtin_scripts/CMakeLists.txt
index 318e389585..103351d044 100644
--- a/files/builtin_scripts/CMakeLists.txt
+++ b/files/builtin_scripts/CMakeLists.txt
@@ -21,6 +21,7 @@ set(LUA_BUILTIN_FILES
     scripts/omw/settings/global.lua
     scripts/omw/settings/common.lua
     scripts/omw/settings/render.lua
+    scripts/omw/settings/renderers.lua
 
     l10n/Calendar/en.yaml
 
@@ -29,6 +30,7 @@ set(LUA_BUILTIN_FILES
     scripts/omw/mwui/box.lua
     scripts/omw/mwui/text.lua
     scripts/omw/mwui/textEdit.lua
+    scripts/omw/mwui/space.lua
     scripts/omw/mwui/init.lua
 )
 
diff --git a/files/builtin_scripts/scripts/omw/mwui/borders.lua b/files/builtin_scripts/scripts/omw/mwui/borders.lua
index d0d3e50cdf..bd8d99a7b7 100644
--- a/files/builtin_scripts/scripts/omw/mwui/borders.lua
+++ b/files/builtin_scripts/scripts/omw/mwui/borders.lua
@@ -1,120 +1,203 @@
 local ui = require('openmw.ui')
 local util = require('openmw.util')
 
+local auxUi = require('openmw_aux.ui')
+
 local constants = require('scripts.omw.mwui.constants')
 
 local v2 = util.vector2
+local whiteTexture = ui.texture{ path = 'white' }
+local menuTransparency = ui._getMenuTransparency()
 
 local sideParts = {
-    left = util.vector2(0, 0.5),
-    right = util.vector2(1, 0.5),
-    top = util.vector2(0.5, 0),
-    bottom = util.vector2(0.5, 1),
+    left = v2(0, 0),
+    right = v2(1, 0),
+    top = v2(0, 0),
+    bottom = v2(0, 1),
 }
 local cornerParts = {
-    top_left_corner = util.vector2(0, 0),
-    top_right_corner = util.vector2(1, 0),
-    bottom_left_corner = util.vector2(0, 1),
-    bottom_right_corner = util.vector2(1, 1),
+    top_left = v2(0, 0),
+    top_right = v2(1, 0),
+    bottom_left = v2(0, 1),
+    bottom_right = v2(1, 1),
 }
 
-local resources = {}
+local borderSidePattern = 'textures/menu_thin_border_%s.dds'
+local borderCornerPattern = 'textures/menu_thin_border_%s_corner.dds'
+
+local borderResources = {}
 do
-    local boxBorderPattern = 'textures/menu_thin_border_%s.dds'
-    for k, _ in pairs(sideParts) do
-        resources[k] = ui.texture{ path = boxBorderPattern:format(k) }
+    for k in pairs(sideParts) do
+        borderResources[k] = ui.texture{ path = borderSidePattern:format(k) }
     end
-    for k, _ in pairs(cornerParts) do
-        resources[k] = ui.texture{ path = boxBorderPattern:format(k) }
+    for k in pairs(cornerParts) do
+        borderResources[k] = ui.texture{ path = borderCornerPattern:format(k) }
     end
 end
 
 local borderPieces = {}
-for k, align in pairs(sideParts) do
-    local resource = resources[k]
-    local horizontal = align.x ~= 0.5
-    borderPieces[#borderPieces + 1] = {
+for k in pairs(sideParts) do
+    local horizontal = k == 'top' or k == 'bottom'
+    borderPieces[k] = {
         type = ui.TYPE.Image,
         props = {
-            resource = resource,
-            relativePosition = align,
-            anchor = align,
-            relativeSize = horizontal and v2(0, 1) or v2(1, 0),
-            size = (horizontal and v2(1, -2) or v2(-2, 1)) * constants.borderSize,
-            tileH = not horizontal,
-            tileV = horizontal,
+            resource = borderResources[k],
+            tileH = horizontal,
+            tileV = not horizontal,
         },
     }
 end
-
-for k, align in pairs(cornerParts) do
-    local resource = resources[k]
-    borderPieces[#borderPieces + 1] = {
+for k in pairs(cornerParts) do
+    borderPieces[k] = {
         type = ui.TYPE.Image,
         props = {
-            resource = resource,
-            relativePosition = align,
-            anchor = align,
-            size = v2(1, 1) * constants.borderSize,
+            resource = borderResources[k],
         },
     }
 end
 
-borderPieces[#borderPieces + 1] = {
-    external = {
-        slot = true,
-    },
-    props = {
-        position = v2(1, 1) * (constants.borderSize + constants.padding),
-        size = v2(-2, -2) * (constants.borderSize + constants.padding),
-        relativeSize = v2(1, 1),
-    },
-}
 
-local borders = {
-    content = ui.content(borderPieces)
-}
-borders.content:add({
-    external = {
-        slot = true,
-    },
-    props = {
-        size = v2(-2, -2) * constants.borderSize,
-    },
-})
-
-local horizontalLine = {
-    content = ui.content {
-        {
-            type = ui.TYPE.Image,
+
+local function borderTemplates(borderSize)
+    local borderV = v2(1, 1) * borderSize
+    local result = {}
+    result.horizontalLine = {
+        type = ui.TYPE.Image,
+        props = {
+            resource = borderResources.top,
+            tileH = true,
+            tileV = false,
+            size = v2(0, borderSize),
+            relativeSize = v2(1, 0),
+        },
+    }
+
+    result.verticalLine = {
+        type = ui.TYPE.Image,
+        props = {
+            resource = borderResources.left,
+            tileH = false,
+            tileV = true,
+            size = v2(borderSize, 0),
+            relativeSize = v2(0, 1),
+        },
+    }
+
+    result.borders = {
+        content = ui.content {},
+    }
+    for k, v in pairs(sideParts) do
+        local horizontal = k == 'top' or k == 'bottom'
+        local direction = horizontal and v2(1, 0) or v2(0, 1)
+        result.borders.content:add {
+            template = borderPieces[k],
+            props = {
+                position = (direction - v) * borderSize,
+                relativePosition = v,
+                size = (v2(1, 1) - direction * 3) * borderSize,
+                relativeSize = direction,
+            }
+        }
+    end
+    for k, v in pairs(cornerParts) do
+        result.borders.content:add {
+            template = borderPieces[k],
             props = {
-                resource = resources.top,
-                tileH = true,
-                tileV = false,
-                size = v2(0, constants.borderSize),
-                relativeSize = v2(1, 0),
+                position = -v * borderSize,
+                relativePosition = v,
+                size = borderV,
             },
-        },
-    },
-}
+        }
+    end
+    result.borders.content:add {
+        external = { slot = true },
+        props = {
+            position = borderV,
+            size = borderV * -2,
+            relativeSize = v2(1, 1),
+        }
+    }
 
-local verticalLine = {
-    content = ui.content {
-        {
-            type = ui.TYPE.Image,
+    result.box = {
+        type = ui.TYPE.Container,
+        content = ui.content{},
+    }
+    for k, v in pairs(sideParts) do
+        local horizontal = k == 'top' or k == 'bottom'
+        local direction = horizontal and v2(1, 0) or v2(0, 1)
+        result.box.content:add {
+            template = borderPieces[k],
             props = {
-                resource = resources.left,
-                tileH = false,
-                tileV = true,
-                size = v2(constants.borderSize, 0),
-                relativeSize = v2(0, 1),
+                position = (direction + v) * borderSize,
+                relativePosition = v,
+                size = (v2(1, 1) - direction) * borderSize,
+                relativeSize = direction,
+            }
+        }
+    end
+    for k, v in pairs(cornerParts) do
+        result.box.content:add {
+            template = borderPieces[k],
+            props = {
+                position = v * borderSize,
+                relativePosition = v,
+                size = borderV,
             },
+        }
+    end
+    result.box.content:add {
+        external = { slot = true },
+        props = {
+            position = borderV,
+            relativeSize = v2(1, 1),
+        }
+    }
+
+    local backgroundTransparent = {
+        type = ui.TYPE.Image,
+        props = {
+            resource = whiteTexture,
+            color = util.color.rgb(0, 0, 0),
+            alpha = menuTransparency,
         },
-    },
-}
+    }
+    local backgroundSolid = {
+        type = ui.TYPE.Image,
+        props = {
+            resource = whiteTexture,
+            color = util.color.rgb(0, 0, 0),
+        },
+    }
+
+    result.boxTransparent = auxUi.deepLayoutCopy(result.box)
+    result.boxTransparent.content:insert(1, {
+        template = backgroundTransparent,
+        props = {
+            relativeSize = v2(1, 1),
+            size = borderV * 2,
+        },
+    })
+
+    result.boxSolid = auxUi.deepLayoutCopy(result.box)
+    result.boxSolid.content:insert(1, {
+        template = backgroundSolid,
+        props = {
+            relativeSize = v2(1, 1),
+            size = borderV * 2,
+        },
+    })
+
+    return result
+end
+
+local thinBorders = borderTemplates(constants.border)
+local thickBorders = borderTemplates(constants.thickBorder)
 
 return function(templates)
-    templates.borders = borders
-    templates.horizontalLine = horizontalLine
-    templates.verticalLine = verticalLine
+    for k, t in pairs(thinBorders) do
+        templates[k] = t
+    end
+    for k, t in pairs(thickBorders) do
+        templates[k .. 'Thick'] = t
+    end
 end
\ No newline at end of file
diff --git a/files/builtin_scripts/scripts/omw/mwui/constants.lua b/files/builtin_scripts/scripts/omw/mwui/constants.lua
index ddfe5c9214..3791025717 100644
--- a/files/builtin_scripts/scripts/omw/mwui/constants.lua
+++ b/files/builtin_scripts/scripts/omw/mwui/constants.lua
@@ -2,7 +2,10 @@ local util = require('openmw.util')
 
 return {
     textNormalSize = 16,
-    sandColor = util.color.rgb(202 / 255, 165 / 255, 96 / 255),
-    borderSize = 4,
+    textHeaderSize = 16,
+    headerColor = util.color.rgb(223 / 255, 201 / 255, 159 / 255),
+    normalColor = util.color.rgb(202 / 255, 165 / 255, 96 / 255),
+    border = 2,
+    thickBorder = 4,
     padding = 2,
 }
\ No newline at end of file
diff --git a/files/builtin_scripts/scripts/omw/mwui/init.lua b/files/builtin_scripts/scripts/omw/mwui/init.lua
index af41bece98..d95a07040b 100644
--- a/files/builtin_scripts/scripts/omw/mwui/init.lua
+++ b/files/builtin_scripts/scripts/omw/mwui/init.lua
@@ -57,21 +57,27 @@ end
 -- @field [parent=#MWUI] #Templates templates
 local templates = {}
 
+---
+-- Container that adds padding around its content.
+-- @field [parent=#MWUI] #table padding
+---
+-- Standard spacing interval
+-- @field [parent=#MWUI] #number interval
+require('scripts.omw.mwui.space')(templates)
+
 ---
 -- Standard rectangular border
 -- @field [parent=#Templates] openmw.ui#Layout border
-require('scripts.omw.mwui.borders')(templates)
-
 ---
--- Border combined with a transparent background
+-- Container wrapping the content with borders
 -- @field [parent=#Templates] openmw.ui#Layout box
 ---
--- A transparent background
--- @field [parent=#Templates] openmw.ui#Layout backgroundTransparent
+-- Same as box, but with a semi-transparent background
+-- @field [parent=#Templates] openmw.ui#Layout boxTransparent
 ---
--- A solid, non-transparent background
--- @field [parent=#Templates] openmw.ui#Layout backgroundSolid
-require('scripts.omw.mwui.box')(templates)
+-- Same as box, but with a solid background
+-- @field [parent=#Templates] openmw.ui#Layout boxSolid
+require('scripts.omw.mwui.borders')(templates)
 
 ---
 -- Standard "sand" colored text
diff --git a/files/builtin_scripts/scripts/omw/mwui/space.lua b/files/builtin_scripts/scripts/omw/mwui/space.lua
new file mode 100644
index 0000000000..1f65a98e7f
--- /dev/null
+++ b/files/builtin_scripts/scripts/omw/mwui/space.lua
@@ -0,0 +1,39 @@
+local ui = require('openmw.ui')
+local util = require('openmw.util')
+
+local constants = require('scripts.omw.mwui.constants')
+
+local borderV = util.vector2(1, 1) * constants.border
+
+return function(templates)
+    templates.padding = {
+        type = ui.TYPE.Container,
+        content = ui.content {
+            {
+                props = {
+                    size = borderV,
+                },
+            },
+            {
+                external = { slot = true },
+                props = {
+                    position = borderV,
+                    relativeSize = util.vector2(1, 1),
+                },
+            },
+            {
+                props = {
+                    position = borderV,
+                    relativePosition = util.vector2(1, 1),
+                    size = borderV,
+                },
+            },
+        }
+    }
+    templates.interval = {
+        type = ui.TYPE.Widget,
+        props = {
+            size = borderV,
+        },
+    }
+end
\ No newline at end of file
diff --git a/files/builtin_scripts/scripts/omw/mwui/text.lua b/files/builtin_scripts/scripts/omw/mwui/text.lua
index f62e4384c1..8fc1133000 100644
--- a/files/builtin_scripts/scripts/omw/mwui/text.lua
+++ b/files/builtin_scripts/scripts/omw/mwui/text.lua
@@ -6,10 +6,19 @@ local textNormal = {
     type = ui.TYPE.Text,
     props = {
         textSize = constants.textNormalSize,
-        textColor = constants.sandColor,
+        textColor = constants.normalColor,
+    },
+}
+
+local textHeader = {
+    type = ui.TYPE.Text,
+    props = {
+        textSize = constants.textHeaderSize,
+        textColor = constants.headerColor,
     },
 }
 
 return function(templates)
     templates.textNormal = textNormal
+    templates.textHeader = textHeader
 end
\ No newline at end of file
diff --git a/files/builtin_scripts/scripts/omw/mwui/textEdit.lua b/files/builtin_scripts/scripts/omw/mwui/textEdit.lua
index 1fbc619611..4f86aa356f 100644
--- a/files/builtin_scripts/scripts/omw/mwui/textEdit.lua
+++ b/files/builtin_scripts/scripts/omw/mwui/textEdit.lua
@@ -3,6 +3,8 @@ local ui = require('openmw.ui')
 
 local constants = require('scripts.omw.mwui.constants')
 
+local borderOffset = util.vector2(1, 1) * constants.border
+
 return function(templates)
     local borderContent = ui.content {
         {
@@ -12,10 +14,14 @@ return function(templates)
             },
             content = ui.content {
                 {
+                    props = {
+                        position = borderOffset,
+                        relativeSize = util.vector2(1, 1),
+                    },
                     external = {
                         slot = true,
                     },
-                },
+                }
             }
         },
     }
@@ -23,10 +29,9 @@ return function(templates)
     templates.textEditLine = {
         type = ui.TYPE.TextEdit,
         props = {
+            size = util.vector2(150, constants.textNormalSize) + borderOffset * 4,
             textSize = constants.textNormalSize,
-            textColor = constants.sandColor,
-            textAlignH = ui.ALIGNMENT.Start,
-            textAlignV = ui.ALIGNMENT.Center,
+            textColor = constants.normalColor,
             multiline = false,
         },
         content = borderContent,
@@ -35,10 +40,9 @@ return function(templates)
     templates.textEditBox = {
         type = ui.TYPE.TextEdit,
         props = {
+            size = util.vector2(150, 5 * constants.textNormalSize) + borderOffset * 4,
             textSize = constants.textNormalSize,
-            textColor = constants.sandColor,
-            textAlignH = ui.ALIGNMENT.Start,
-            textAlignV = ui.ALIGNMENT.Start,
+            textColor = constants.normalColor,
             multiline = true,
             wordWrap = true,
         },
diff --git a/files/builtin_scripts/scripts/omw/settings/common.lua b/files/builtin_scripts/scripts/omw/settings/common.lua
index 1e87dfd62b..8150f2cc61 100644
--- a/files/builtin_scripts/scripts/omw/settings/common.lua
+++ b/files/builtin_scripts/scripts/omw/settings/common.lua
@@ -21,8 +21,8 @@ local function validateSettingOptions(options)
     if type(options.name) ~= 'string' then
         error('Setting must have a name localization key')
     end
-    if type(options.description) ~= 'string' then
-        error('Setting must have a descripiton localization key')
+    if options.description ~= nil and type(options.description) ~= 'string' then
+        error('Setting description key must be a string')
     end
 end
 
@@ -49,8 +49,8 @@ local function validateGroupOptions(options)
     if type(options.name) ~= 'string' then
         error('Group must have a name localization key')
     end
-    if type(options.description) ~= 'string' then
-        error('Group must have a description localization key')
+    if options.description ~= nil and type(options.description) ~= 'string' then
+        error('Group description key must be a string')
     end
     if type(options.settings) ~= 'table' then
         error('Group must have a table of settings')
@@ -89,8 +89,9 @@ local function registerGroup(options)
         settings = {},
     }
     local valueSection = contextSection(options.key)
-    for _, opt in ipairs(options.settings) do
+    for i, opt in ipairs(options.settings) do
         local setting = registerSetting(opt)
+        setting.order = i
         if group.settings[setting.key] then
             error(('Duplicate setting key %s'):format(options.key))
         end
@@ -123,7 +124,7 @@ return {
             local section = contextSection(groupKey)
             saved[groupKey] = {}
             for key, value in pairs(section:asTable()) do
-                if not group.settings[key].permanentStorage then
+                if group.settings[key] and not group.settings[key].permanentStorage then
                     saved[groupKey][key] = value
                 end
             end
diff --git a/files/builtin_scripts/scripts/omw/settings/player.lua b/files/builtin_scripts/scripts/omw/settings/player.lua
index 612ba3ec7b..a4201bc8a8 100644
--- a/files/builtin_scripts/scripts/omw/settings/player.lua
+++ b/files/builtin_scripts/scripts/omw/settings/player.lua
@@ -1,39 +1,21 @@
-local ui = require('openmw.ui')
-local async = require('openmw.async')
-local util = require('openmw.util')
-
 local common = require('scripts.omw.settings.common')
 local render = require('scripts.omw.settings.render')
 
-render.registerRenderer('text', function(value, set, arg)
-    return {
-        type = ui.TYPE.TextEdit,
-        props = {
-            size = util.vector2(arg and arg.size or 150, 30),
-            text = value,
-            textColor = util.color.rgb(1, 1, 1),
-            textSize = 15,
-            textAlignV = ui.ALIGNMENT.End,
-        },
-        events = {
-            textChanged = async:callback(function(s) set(s) end),
-        },
-    }
-end)
+require('scripts.omw.settings.renderers')(render.registerRenderer)
 
 ---
 -- @type PageOptions
 -- @field #string key A unique key
 -- @field #string l10n A localization context (an argument of core.l10n)
 -- @field #string name A key from the localization context
--- @field #string description A key from the localization context
+-- @field #string description A key from the localization context (optional, can be `nil`)
 
 ---
 -- @type GroupOptions
 -- @field #string key A unique key, starts with "Settings" by convention
 -- @field #string l10n A localization context (an argument of core.l10n)
 -- @field #string name A key from the localization context
--- @field #string description A key from the localization context
+-- @field #string description A key from the localization context (optional, can be `nil`)
 -- @field #string page Key of a page which will contain this group
 -- @field #number order Groups within the same page are sorted by this number, or their key for equal values.
 --   Defaults to 0.
@@ -43,7 +25,7 @@ end)
 -- @type SettingOptions
 -- @field #string key A unique key
 -- @field #string name A key from the localization context
--- @field #string description A key from the localization context
+-- @field #string description A key from the localization context (optional, can be `nil`)
 -- @field default A default value
 -- @field #string renderer A renderer key
 -- @field argument An argument for the renderer
@@ -57,26 +39,33 @@ return {
     -- -- In a player script
     -- local storage = require('openmw.storage')
     -- local I = require('openmw.interfaces')
-    -- I.Settings.registerGroup({
+    -- I.Settings.registerPage {
+    --     key = 'MyModPage',
+    --     l10n = 'MyMod',
+    --     name = 'My Mod Name',
+    --     description = 'My Mod Description',
+    -- }
+    -- I.Settings.registerGroup {
     --     key = 'SettingsPlayerMyMod',
-    --     page = 'MyPage',
-    --     l10n = 'mymod',
-    --     name = 'modName',
-    --     description = 'modDescription',
+    --     page = 'MyModPage',
+    --     l10n = 'MyMod',
+    --     name = 'My Group Name',
+    --     description = 'My Group Description',
     --     settings = {
     --         {
     --             key = 'Greeting',
-    --             renderer = 'text',
-    --             name = 'greetingName',
-    --             description = 'greetingDescription',
+    --             renderer = 'textLine',
+    --             name = 'Greeting',
+    --             description = 'Text to display when the game starts',
     --             default = 'Hello, world!',
-    --             argument = {
-    --                 size = 200,
-    --             },
+    --             permanentStorage = false,
     --         },
     --     },
-    -- })
+    -- }
     -- local playerSettings = storage.playerSection('SettingsPlayerMyMod')
+    -- ...
+    -- ui.showMessage(playerSettings:get('Greeting'))
+    -- -- ...
     -- -- access a setting page registered by a global script
     -- local globalSettings = storage.globalSection('SettingsGlobalMyMod')
     interface = {
@@ -132,22 +121,19 @@ return {
         --     settings = {
         --         {
         --             key = 'Greeting',
-        --             saveOnly = true,
+        --             permanentStorage = true,
         --             default = 'Hi',
-        --             renderer = 'text',
-        --             argument = {
-        --                 size = 200,
-        --             },
+        --             renderer = 'textLine',
         --             name = 'Text Input',
         --             description = 'Short text input',
         --         },
         --         {
-        --             key = 'Key',
-        --             saveOnly = false,
-        --             default = input.KEY.LeftAlt,
-        --             renderer = 'keybind',
-        --             name = 'Key',
-        --             description = 'Bind Key',
+        --             key = 'Flag',
+        --             permanentStorage = false,
+        --             default = false,
+        --             renderer = 'yeNo',
+        --             name = 'Flag',
+        --             description = 'Flag toggle',
         --         },
         --     }
         -- }
diff --git a/files/builtin_scripts/scripts/omw/settings/render.lua b/files/builtin_scripts/scripts/omw/settings/render.lua
index c072d20e94..8274f04670 100644
--- a/files/builtin_scripts/scripts/omw/settings/render.lua
+++ b/files/builtin_scripts/scripts/omw/settings/render.lua
@@ -3,6 +3,7 @@ local util = require('openmw.util')
 local async = require('openmw.async')
 local core = require('openmw.core')
 local storage = require('openmw.storage')
+local I = require('openmw.interfaces')
 
 local common = require('scripts.omw.settings.common')
 
@@ -15,34 +16,68 @@ local pages = {}
 local groups = {}
 local pageOptions = {}
 
-local padding = function(size)
-    return {
-        props = {
-            size = util.vector2(size, size),
-        }
-    }
-end
-local smallPadding = padding(10)
-local bigPadding = padding(25)
-
-local pageHeader = {
-    props = {
-        textColor = util.color.rgb(1, 1, 1),
-        textSize = 30,
+local interval = { template = I.MWUI.templates.interval }
+local growingIntreval = {
+    template = I.MWUI.templates.interval,
+    external = {
+        grow = 1,
     },
 }
-local groupHeader = {
+local spacer =  {
     props = {
-        textColor = util.color.rgb(1, 1, 1),
-        textSize = 25,
+        size = util.vector2(0, 10),
     },
 }
-local normal = {
+local bigSpacer =  {
     props = {
-        textColor = util.color.rgb(1, 1, 1),
-        textSize = 20,
+        size = util.vector2(0, 50),
+    },
+}
+local stretchingLine = {
+    template = I.MWUI.templates.horizontalLine,
+    external = {
+        stretch = 1,
     },
 }
+local spacedLines = function(count)
+    local content = {}
+    table.insert(content, spacer)
+    table.insert(content, stretchingLine)
+    for i = 2, count do
+        table.insert(content, interval)
+        table.insert(content, stretchingLine)
+    end
+    table.insert(content, spacer)
+    return {
+        type = ui.TYPE.Flex,
+        external = {
+            stretch = 1,
+        },
+        content = ui.content(content),
+    }
+end
+
+local function interlaceSeparator(layouts, separator)
+    local result = {}
+    result[1] = layouts[1]
+    for i = 2, #layouts do
+        table.insert(result, separator)
+        table.insert(result, layouts[i])
+    end
+    return result
+end
+
+local function setSettingValue(global, groupKey, settingKey, value)
+    if global then
+        core.sendGlobalEvent(common.setGlobalEvent, {
+            groupKey = groupKey,
+            settingKey = settingKey,
+            value = value,
+        })
+    else
+        storage.playerSection(groupKey):set(settingKey, value)
+    end
+end
 
 local function renderSetting(group, setting, value, global)
     local renderFunction = renderers[setting.renderer]
@@ -50,48 +85,83 @@ local function renderSetting(group, setting, value, global)
         error(('Setting %s of %s has unknown renderer %s'):format(setting.key, group.key, setting.renderer))
     end
     local set = function(value)
-        if global then
-            core.sendGlobalEvent(common.setGlobalEvent, {
-                groupKey = group.key,
-                settingKey = setting.key,
-                value = value,
-            })
-        else
-            storage.playerSection(group.key):set(setting.key, value)
-        end
+        setSettingValue(global, group.key, setting.key, value)
     end
     local l10n = core.l10n(group.l10n)
-    return {
-        name = setting.key,
+    local titleLayout = {
         type = ui.TYPE.Flex,
         content = ui.content {
             {
-                type = ui.TYPE.Flex,
+                template = I.MWUI.templates.textNormal,
                 props = {
-                    horizontal = true,
-                    align = ui.ALIGNMENT.Start,
-                    arrange = ui.ALIGNMENT.End,
+                    text = l10n(setting.name),
+                    textSize = 18,
                 },
+            },
+        },
+    }
+    if setting.description then
+        titleLayout.content:add(interval)
+        titleLayout.content:add {
+            template = I.MWUI.templates.textNormal,
+            props = {
+                text = l10n(setting.description),
+                textSize = 16,
+            },
+        }
+    end
+    return {
+        name = setting.key,
+        type = ui.TYPE.Flex,
+        props = {
+            horizontal = true,
+            arrange = ui.ALIGNMENT.Center,
+        },
+        external = {
+            stretch = 1,
+        },
+        content = ui.content {
+            titleLayout,
+            growingIntreval,
+            renderFunction(value, set, setting.argument),
+        },
+    }
+end
+
+local groupLayoutName = function(key, global)
+    return ('%s%s'):format(global and 'global_' or 'player_', key)
+end
+
+local function renderGroup(group, global)
+    local l10n = core.l10n(group.l10n)
+
+    local valueSection = common.getSection(global, group.key)
+    local settingLayouts = {}
+    local sortedSettings = {}
+    for _, setting in pairs(group.settings) do
+        sortedSettings[setting.order] = setting
+    end
+    for _, setting in ipairs(sortedSettings) do
+        table.insert(settingLayouts, renderSetting(group, setting, valueSection:get(setting.key), global))
+    end
+    local settingsContent = ui.content(interlaceSeparator(settingLayouts, spacedLines(1)))
+
+    local resetButtonLayout = {
+        template = I.MWUI.templates.box,
+        content = ui.content {
+            {
+                template = I.MWUI.templates.padding,
                 content = ui.content {
                     {
-                        type = ui.TYPE.Text,
-                        template = normal,
-                        props = {
-                            text = l10n(setting.name),
-                        },
-                    },
-                    smallPadding,
-                    renderFunction(value, set, setting.argument),
-                    smallPadding,
-                    {
-                        type = ui.TYPE.Text,
-                        template = normal,
+                        template = I.MWUI.templates.textNormal,
                         props = {
                             text = 'Reset',
                         },
                         events = {
                             mouseClick = async:callback(function()
-                                set(setting.default)
+                                for _, setting in pairs(group.settings) do
+                                    setSettingValue(global, group.key, setting.key, setting.default)
+                                end
                             end),
                         },
                     },
@@ -99,60 +169,66 @@ local function renderSetting(group, setting, value, global)
             },
         },
     }
-end
 
-local groupLayoutName = function(key, global)
-    return ('%s%s'):format(global and 'global_' or 'player_', key)
-end
+    local titleLayout = {
+        type = ui.TYPE.Flex,
+        external = {
+            stretch = 1,
+        },
+        content = ui.content {
+            {
+                template = I.MWUI.templates.textHeader,
+                props = {
+                    text = l10n(group.name),
+                    textSize = 20,
+                },
+            }
+        },
+    }
+    if group.description then
+        titleLayout.content:add(interval)
+        titleLayout.content:add {
+            template = I.MWUI.templates.textHeader,
+            props = {
+                text = l10n(group.description),
+                textSize = 18,
+            },
+        }
+    end
 
-local function renderGroup(group, global)
-    local l10n = core.l10n(group.l10n)
-    local layout = {
+    return {
         name = groupLayoutName(group.key, global),
         type = ui.TYPE.Flex,
+        external = {
+            stretch = 1,
+        },
         content = ui.content {
             {
                 type = ui.TYPE.Flex,
                 props = {
                     horizontal = true,
-                    align = ui.ALIGNMENT.Start,
-                    arrange = ui.ALIGNMENT.End,
+                    arrange = ui.ALIGNMENT.Center,
+                },
+                external = {
+                    stretch = 1,
                 },
                 content = ui.content {
-                    {
-                        name = 'name',
-                        type = ui.TYPE.Text,
-                        template = groupHeader,
-                        props = {
-                            text = l10n(group.name),
-                        },
-                    },
-                    smallPadding,
-                    {
-                        name = 'description',
-                        type = ui.TYPE.Text,
-                        template = normal,
-                        props = {
-                            text = l10n(group.description),
-                        },
-                    },
+                    titleLayout,
+                    growingIntreval,
+                    resetButtonLayout,
                 },
             },
-            smallPadding,
+            spacedLines(2),
             {
                 name = 'settings',
                 type = ui.TYPE.Flex,
-                content = ui.content{},
+                content = settingsContent,
+                external = {
+                    stretch = 1,
+                },
             },
-            bigPadding,
         },
     }
-    local settingsContent = layout.content.settings.content
-    local valueSection = common.getSection(global, group.key)
-    for _, setting in pairs(group.settings) do
-        settingsContent:add(renderSetting(group, setting, valueSection:get(setting.key), global))
-    end
-    return layout
 end
 
 local function pageGroupComparator(a, b)
@@ -165,16 +241,22 @@ local function generateSearchHints(page)
     local hints = {}
     local l10n = core.l10n(page.l10n)
     table.insert(hints, l10n(page.name))
-    table.insert(hints, l10n(page.description))
+    if page.description then
+        table.insert(hints, l10n(page.description))
+    end
     local pageGroups = groups[page.key]
     for _, pageGroup in pairs(pageGroups) do
         local group = common.getSection(pageGroup.global, common.groupSectionKey):get(pageGroup.key)
         local l10n = core.l10n(group.l10n)
         table.insert(hints, l10n(group.name))
-        table.insert(hints, l10n(group.description))
+        if group.description then
+            table.insert(hints, l10n(group.description))
+        end
         for _, setting in pairs(group.settings) do
             table.insert(hints, l10n(setting.name))
-            table.insert(hints, l10n(setting.description))
+            if setting.description then
+                table.insert(hints, l10n(setting.description))
+            end
         end
     end
     return table.concat(hints, ' ')
@@ -182,55 +264,60 @@ end
 
 local function renderPage(page)
     local l10n = core.l10n(page.l10n)
-    local layout = {
-        name = page.key,
+    local sortedGroups = {}
+    for i, v in ipairs(groups[page.key]) do sortedGroups[i] = v end
+    table.sort(sortedGroups, pageGroupComparator)
+    local groupLayouts = {}
+    for _, pageGroup in ipairs(sortedGroups) do
+        local group = common.getSection(pageGroup.global, common.groupSectionKey):get(pageGroup.key)
+        table.insert(groupLayouts, renderGroup(group, pageGroup.global))
+    end
+    local groupsLayout = {
+        name = 'groups',
+        type = ui.TYPE.Flex,
+        external = {
+            stretch = 1,
+        },
+        content = ui.content(interlaceSeparator(groupLayouts, bigSpacer)),
+    }
+    local titleLayout = {
         type = ui.TYPE.Flex,
+        external = {
+            stretch = 1,
+        },
         content = ui.content {
-            smallPadding,
             {
-                type = ui.TYPE.Flex,
+                template = I.MWUI.templates.textHeader,
                 props = {
-                    horizontal = true,
-                    align = ui.ALIGNMENT.Start,
-                    arrange = ui.ALIGNMENT.End,
-                },
-                content = ui.content {
-                    {
-                        name = 'name',
-                        type = ui.TYPE.Text,
-                        template = pageHeader,
-                        props = {
-                            text = l10n(page.name),
-                        },
-                    },
-                    smallPadding,
-                    {
-                        name = 'description',
-                        type = ui.TYPE.Text,
-                        template = normal,
-                        props = {
-                            text = l10n(page.description),
-                        },
-                    },
+                    text = l10n(page.name),
+                    textSize = 22,
                 },
             },
-            bigPadding,
-            {
-                name = 'groups',
-                type = ui.TYPE.Flex,
-                content = ui.content {},
-            },
+            spacedLines(3),
         },
     }
-    local groupsContent = layout.content.groups.content
-    local pageGroups = groups[page.key]
-    local sortedGroups = {}
-    for i, v in ipairs(pageGroups) do sortedGroups[i] = v end
-    table.sort(sortedGroups, pageGroupComparator)
-    for _, pageGroup in ipairs(sortedGroups) do
-        local group = common.getSection(pageGroup.global, common.groupSectionKey):get(pageGroup.key)
-        groupsContent:add(renderGroup(group, pageGroup.global))
+    if page.description then
+        titleLayout.content:add {
+            template = I.MWUI.templates.textNormal,
+            props = {
+                text = l10n(page.description),
+                textSize = 20,
+            },
+        }
     end
+    local layout = {
+        name = page.key,
+        type = ui.TYPE.Flex,
+        props = {
+            position = util.vector2(10, 10),
+        },
+        content = ui.content {
+            titleLayout,
+            bigSpacer,
+            groupsLayout,
+            bigSpacer,
+        },
+    }
     return {
         name = l10n(page.name),
         element = ui.create(layout),
@@ -241,13 +328,15 @@ end
 local function onSettingChanged(global)
     return async:callback(function(groupKey, settingKey)
         local group = common.getSection(global, common.groupSectionKey):get(groupKey)
-        if not pageOptions[group.page] then return end
+        if not group or not pageOptions[group.page] then return end
 
-        local element = pageOptions[group.page].element
-        local groupLayout = element.layout.content.groups.content[groupLayoutName(group.key, global)]
-        local settingsLayout = groupLayout.content.settings
         local value = common.getSection(global, group.key):get(settingKey)
-        settingsLayout.content[settingKey] = renderSetting(group, group.settings[settingKey], value, global)
+
+        local element = pageOptions[group.page].element
+        local groupsLayout = element.layout.content.groups
+        local groupLayout = groupsLayout.content[groupLayoutName(group.key, global)]
+        local settingsContent = groupLayout.content.settings.content
+        settingsContent[settingKey] = renderSetting(group, group.settings[settingKey], value, global)
         element:update()
     end)
 end
@@ -293,8 +382,8 @@ local function registerPage(options)
     if type(options.name) ~= 'string' then
         error('Page must have a name')
     end
-    if type(options.description) ~= 'string' then
-        error('Page must have a description')
+    if options.description ~= nil and type(options.description) ~= 'string' then
+        error('Page description key must be a string')
     end
     local page = {
         key = options.key,
diff --git a/files/builtin_scripts/scripts/omw/settings/renderers.lua b/files/builtin_scripts/scripts/omw/settings/renderers.lua
new file mode 100644
index 0000000000..9b862c3b4b
--- /dev/null
+++ b/files/builtin_scripts/scripts/omw/settings/renderers.lua
@@ -0,0 +1,39 @@
+local ui = require('openmw.ui')
+local async = require('openmw.async')
+local I = require('openmw.interfaces')
+
+return function(registerRenderer)
+    registerRenderer('textLine', function(value, set)
+        return {
+            template = I.MWUI.templates.textEditLine,
+            props = {
+                text = tostring(value),
+            },
+            events = {
+                textChanged = async:callback(function(s) set(s) end),
+            },
+        }
+    end)
+
+    registerRenderer('yesNo', function(value, set)
+        return {
+            template = I.MWUI.templates.box,
+            content = ui.content {
+                {
+                    template = I.MWUI.templates.padding,
+                    content = ui.content {
+                        {
+                            template = I.MWUI.templates.textNormal,
+                            props = {
+                                text = value and 'Yes' or 'No',
+                            },
+                            events = {
+                                mouseClick = async:callback(function() set(not value) end),
+                            },
+                        },
+                    },
+                },
+            },
+        }
+    end)
+end
\ No newline at end of file
diff --git a/files/mygui/openmw_lua.xml b/files/mygui/openmw_lua.xml
index 6e5e232a2a..b792b1c21f 100644
--- a/files/mygui/openmw_lua.xml
+++ b/files/mygui/openmw_lua.xml
@@ -12,7 +12,7 @@
     </Resource>
 
     <Resource type="ResourceSkin" name="LuaTextEditClient" size="16 16">
-        <BasisSkin type="EditText" offset="0 0 16 16" align="Stretch" name="Client" />
+        <BasisSkin type="EditText" offset="0 0 16 16" align="Stretch" />
     </Resource>
 
     <Resource type="ResourceSkin" name="LuaTextEdit" size="16 16">

From 1766f89c4d45423fe13f2a8e8411b518b2910e4f Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sat, 14 May 2022 16:55:11 +0200
Subject: [PATCH 2429/2859] Fix a typo

---
 components/lua_ui/widget.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/lua_ui/widget.cpp b/components/lua_ui/widget.cpp
index bd9e47ab34..49d69f8fd1 100644
--- a/components/lua_ui/widget.cpp
+++ b/components/lua_ui/widget.cpp
@@ -168,7 +168,7 @@ namespace LuaUi
         int sdlButton = SDLUtil::myGuiMouseButtonToSdl(button);
         table["position"] = position;
         table["offset"] = offset;
-        if (sdlButton == 0) // nil if no button was pressed
+        if (sdlButton != 0) // nil if no button was pressed
             table["button"] = sdlButton;
         return table;
     }

From c0cc5feecd70f6f4f8f07735c8011e52cc111f14 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 15 May 2022 14:52:44 +0200
Subject: [PATCH 2430/2859] Initialize DialInfo::DATAstruct with the proper
 blank values

---
 CHANGELOG.md                 | 1 +
 components/esm3/loadinfo.cpp | 7 +------
 components/esm3/loadinfo.hpp | 2 ++
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 66f5868589..2d264b5f02 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -118,6 +118,7 @@
     Bug #6717: Broken script causes interpreter stack corruption
     Bug #6718: Throwable weapons cause arrow enchantment effect to be applied to the whole body
     Bug #6730: LoopGroup stalls animation after playing :Stop frame until another animation is played
+    Bug #6753: Info records without a DATA subrecords are loaded incorrectly
     Feature #890: OpenMW-CS: Column filtering
     Feature #1465: "Reset" argument for AI functions
     Feature #2491: Ability to make OpenMW "portable"
diff --git a/components/esm3/loadinfo.cpp b/components/esm3/loadinfo.cpp
index 0c7c4db61a..20604c8be4 100644
--- a/components/esm3/loadinfo.cpp
+++ b/components/esm3/loadinfo.cpp
@@ -133,12 +133,7 @@ namespace ESM
 
     void DialInfo::blank()
     {
-        mData.mUnknown1 = 0;
-        mData.mDisposition = 0;
-        mData.mRank = 0;
-        mData.mGender = 0;
-        mData.mPCrank = 0;
-        mData.mUnknown2 = 0;
+        mData = {};
 
         mSelects.clear();
         mPrev.clear();
diff --git a/components/esm3/loadinfo.hpp b/components/esm3/loadinfo.hpp
index 7f135087ee..067dc62471 100644
--- a/components/esm3/loadinfo.hpp
+++ b/components/esm3/loadinfo.hpp
@@ -43,6 +43,8 @@ struct DialInfo
         signed char mGender; // See Gender enum
         signed char mPCrank; // Player rank
         signed char mUnknown2;
+
+        DATAstruct() : mDisposition(0), mRank(-1), mGender(Gender::NA), mPCrank(-1) {}
     }; // 12 bytes
     DATAstruct mData;
 

From 04843fed6d5fd7f784912480536b44f6d3c40cec Mon Sep 17 00:00:00 2001
From: cody glassman <glassmancody.info@gmail.com>
Date: Fri, 13 May 2022 18:58:00 -0700
Subject: [PATCH 2431/2859] moddable post-processing pipeline

---
 CHANGELOG.md                                  |    1 +
 apps/launcher/advancedpage.cpp                |   19 +
 apps/launcher/advancedpage.hpp                |    1 +
 apps/opencs/model/world/data.cpp              |    1 +
 apps/openmw/CMakeLists.txt                    |    6 +-
 apps/openmw/engine.cpp                        |    5 +
 apps/openmw/mwbase/windowmanager.hpp          |    3 +
 apps/openmw/mwbase/world.hpp                  |    7 +
 apps/openmw/mwgui/postprocessorhud.cpp        |  454 +++++++
 apps/openmw/mwgui/postprocessorhud.hpp        |  107 ++
 apps/openmw/mwgui/windowmanagerimp.cpp        |   32 +-
 apps/openmw/mwgui/windowmanagerimp.hpp        |    4 +
 apps/openmw/mwinput/actionmanager.cpp         |    3 +
 apps/openmw/mwinput/actions.hpp               |    2 +
 apps/openmw/mwinput/bindingsmanager.cpp       |    6 +-
 apps/openmw/mwlua/inputbindings.cpp           |    1 +
 apps/openmw/mwlua/luabindings.hpp             |    1 +
 apps/openmw/mwlua/luamanagerimp.cpp           |    2 +
 apps/openmw/mwlua/luamanagerimp.hpp           |    1 +
 apps/openmw/mwlua/postprocessingbindings.cpp  |  140 +++
 apps/openmw/mwrender/animation.cpp            |    4 +-
 apps/openmw/mwrender/characterpreview.cpp     |   20 +-
 apps/openmw/mwrender/hdr.cpp                  |  123 ++
 apps/openmw/mwrender/hdr.hpp                  |   71 ++
 apps/openmw/mwrender/localmap.cpp             |    1 +
 apps/openmw/mwrender/npcanimation.cpp         |   25 +-
 apps/openmw/mwrender/pingpongcanvas.cpp       |  260 ++++
 apps/openmw/mwrender/pingpongcanvas.hpp       |   88 ++
 apps/openmw/mwrender/pingpongcull.cpp         |   47 +
 apps/openmw/mwrender/pingpongcull.hpp         |   22 +
 apps/openmw/mwrender/postprocessor.cpp        |  936 ++++++++++-----
 apps/openmw/mwrender/postprocessor.hpp        |  210 +++-
 apps/openmw/mwrender/renderingmanager.cpp     |   85 +-
 apps/openmw/mwrender/renderingmanager.hpp     |    8 +-
 apps/openmw/mwrender/screenshotmanager.cpp    |   11 +-
 apps/openmw/mwrender/sky.cpp                  |   10 +
 apps/openmw/mwrender/sky.hpp                  |    3 +
 apps/openmw/mwrender/skyutil.cpp              |    6 +
 apps/openmw/mwrender/skyutil.hpp              |    1 +
 apps/openmw/mwrender/transparentpass.cpp      |   89 ++
 apps/openmw/mwrender/transparentpass.hpp      |   38 +
 apps/openmw/mwrender/water.cpp                |    2 +
 apps/openmw/mwworld/scene.cpp                 |    5 +
 apps/openmw/mwworld/weather.cpp               |    8 +-
 apps/openmw/mwworld/weather.hpp               |    6 +-
 apps/openmw/mwworld/worldimp.cpp              |   15 +
 apps/openmw/mwworld/worldimp.hpp              |    7 +
 apps/openmw_test_suite/CMakeLists.txt         |    4 +
 apps/openmw_test_suite/fx/lexer.cpp           |  216 ++++
 apps/openmw_test_suite/fx/technique.cpp       |  204 ++++
 apps/openmw_test_suite/lua/testing_util.hpp   |    5 +
 .../settings/shadermanager.cpp                |   66 ++
 components/CMakeLists.txt                     |    4 +
 components/fx/lexer.cpp                       |  301 +++++
 components/fx/lexer.hpp                       |   75 ++
 components/fx/lexer_types.hpp                 |   56 +
 components/fx/parse_constants.hpp             |  133 +++
 components/fx/pass.cpp                        |  253 ++++
 components/fx/pass.hpp                        |   79 ++
 components/fx/stateupdater.cpp                |   60 +
 components/fx/stateupdater.hpp                |  192 +++
 components/fx/technique.cpp                   | 1049 +++++++++++++++++
 components/fx/technique.hpp                   |  300 +++++
 components/fx/types.hpp                       |  259 ++++
 components/fx/widgets.cpp                     |  164 +++
 components/fx/widgets.hpp                     |  266 +++++
 components/resource/scenemanager.cpp          |   21 +-
 components/resource/scenemanager.hpp          |   15 +-
 components/sceneutil/clearcolor.hpp           |   42 +
 components/sceneutil/depth.cpp                |   12 -
 components/sceneutil/depth.hpp                |    3 -
 components/sceneutil/rtt.cpp                  |    2 +-
 components/sceneutil/util.cpp                 |   36 -
 components/serialization/osgyaml.hpp          |   64 +
 components/settings/shadermanager.hpp         |  174 +++
 components/shader/shadervisitor.cpp           |   74 +-
 components/shader/shadervisitor.hpp           |   12 +-
 components/std140/ubo.hpp                     |  162 +++
 components/stereo/multiview.cpp               |   32 +-
 components/stereo/multiview.hpp               |    5 +-
 components/stereo/stereomanager.hpp           |    1 -
 components/terrain/chunkmanager.cpp           |    4 +-
 components/terrain/material.cpp               |   17 +-
 components/terrain/material.hpp               |    6 +-
 components/vfs/archive.hpp                    |    2 +
 components/vfs/bsaarchive.hpp                 |    4 +
 components/vfs/filesystemarchive.hpp          |    2 +
 components/vfs/manager.cpp                    |   11 +
 components/vfs/manager.hpp                    |    5 +
 docs/source/reference/index.rst               |    1 +
 docs/source/reference/lua-scripting/api.rst   |   61 +-
 .../lua-scripting/openmw_postprocessing.rst   |    5 +
 .../reference/lua-scripting/overview.rst      |   60 +-
 .../reference/modding/settings/index.rst      |    1 +
 .../modding/settings/postprocessing.rst       |   65 +
 .../reference/modding/settings/windows.rst    |   14 +
 .../source/reference/postprocessing/index.rst |   11 +
 .../source/reference/postprocessing/omwfx.rst |  862 ++++++++++++++
 .../reference/postprocessing/overview.rst     |   45 +
 files/lua_api/CMakeLists.txt                  |    1 +
 files/lua_api/openmw/input.lua                |    1 +
 files/lua_api/openmw/postprocessing.lua       |   92 ++
 files/mygui/CMakeLists.txt                    |    2 +
 files/mygui/openmw_list.skin.xml              |    8 +
 files/mygui/openmw_postprocessor_hud.layout   |  138 +++
 files/mygui/openmw_postprocessor_hud.skin.xml |   79 ++
 files/mygui/openmw_resources.xml              |   11 +
 files/mygui/openmw_settings_window.layout     |   33 +-
 files/mygui/skins.xml                         |    1 +
 files/settings-default.cfg                    |   30 +-
 files/shaders/CMakeLists.txt                  |    6 +
 .../blended_depth_postpass_fragment.glsl      |   19 +
 .../blended_depth_postpass_vertex.glsl        |   20 +
 files/shaders/fullscreen_tri_fragment.glsl    |   10 +
 files/shaders/fullscreen_tri_vertex.glsl      |    9 +
 files/shaders/groundcover_fragment.glsl       |   14 +-
 files/shaders/groundcover_vertex.glsl         |    5 +-
 files/shaders/hdr_fragment.glsl               |   14 +
 files/shaders/hdr_luminance_fragment.glsl     |   17 +
 files/shaders/nv_default_fragment.glsl        |   13 +-
 files/shaders/objects_fragment.glsl           |   19 +-
 files/shaders/openmw_fragment.glsl            |    9 +-
 files/shaders/openmw_fragment.h.glsl          |    4 +-
 files/shaders/openmw_fragment_multiview.glsl  |    9 +-
 files/shaders/terrain_fragment.glsl           |   21 +-
 files/shaders/water_fragment.glsl             |    4 +
 files/ui/advancedpage.ui                      |   88 ++
 files/vfs/CMakeLists.txt                      |    7 +
 files/vfs/shaders/displaydepth.omwfx          |   26 +
 files/vfs/shaders/main.omwfx                  |   45 +
 130 files changed, 8603 insertions(+), 566 deletions(-)
 create mode 100644 apps/openmw/mwgui/postprocessorhud.cpp
 create mode 100644 apps/openmw/mwgui/postprocessorhud.hpp
 create mode 100644 apps/openmw/mwlua/postprocessingbindings.cpp
 create mode 100644 apps/openmw/mwrender/hdr.cpp
 create mode 100644 apps/openmw/mwrender/hdr.hpp
 create mode 100644 apps/openmw/mwrender/pingpongcanvas.cpp
 create mode 100644 apps/openmw/mwrender/pingpongcanvas.hpp
 create mode 100644 apps/openmw/mwrender/pingpongcull.cpp
 create mode 100644 apps/openmw/mwrender/pingpongcull.hpp
 create mode 100644 apps/openmw/mwrender/transparentpass.cpp
 create mode 100644 apps/openmw/mwrender/transparentpass.hpp
 create mode 100644 apps/openmw_test_suite/fx/lexer.cpp
 create mode 100644 apps/openmw_test_suite/fx/technique.cpp
 create mode 100644 apps/openmw_test_suite/settings/shadermanager.cpp
 create mode 100644 components/fx/lexer.cpp
 create mode 100644 components/fx/lexer.hpp
 create mode 100644 components/fx/lexer_types.hpp
 create mode 100644 components/fx/parse_constants.hpp
 create mode 100644 components/fx/pass.cpp
 create mode 100644 components/fx/pass.hpp
 create mode 100644 components/fx/stateupdater.cpp
 create mode 100644 components/fx/stateupdater.hpp
 create mode 100644 components/fx/technique.cpp
 create mode 100644 components/fx/technique.hpp
 create mode 100644 components/fx/types.hpp
 create mode 100644 components/fx/widgets.cpp
 create mode 100644 components/fx/widgets.hpp
 create mode 100755 components/sceneutil/clearcolor.hpp
 create mode 100644 components/serialization/osgyaml.hpp
 create mode 100644 components/settings/shadermanager.hpp
 create mode 100644 components/std140/ubo.hpp
 create mode 100644 docs/source/reference/lua-scripting/openmw_postprocessing.rst
 create mode 100644 docs/source/reference/modding/settings/postprocessing.rst
 create mode 100644 docs/source/reference/postprocessing/index.rst
 create mode 100644 docs/source/reference/postprocessing/omwfx.rst
 create mode 100644 docs/source/reference/postprocessing/overview.rst
 create mode 100644 files/lua_api/openmw/postprocessing.lua
 create mode 100644 files/mygui/openmw_postprocessor_hud.layout
 create mode 100644 files/mygui/openmw_postprocessor_hud.skin.xml
 create mode 100644 files/shaders/blended_depth_postpass_fragment.glsl
 create mode 100644 files/shaders/blended_depth_postpass_vertex.glsl
 create mode 100644 files/shaders/fullscreen_tri_fragment.glsl
 create mode 100644 files/shaders/fullscreen_tri_vertex.glsl
 create mode 100644 files/shaders/hdr_fragment.glsl
 create mode 100644 files/shaders/hdr_luminance_fragment.glsl
 create mode 100644 files/vfs/shaders/displaydepth.omwfx
 create mode 100644 files/vfs/shaders/main.omwfx

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d264b5f02..5c64b831bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -128,6 +128,7 @@
     Feature #2858: Add a tab to the launcher for handling datafolders
     Feature #3245: Grid and angle snapping for the OpenMW-CS
     Feature #3616: Allow Zoom levels on the World Map
+    Feature #4067: Post Processing
     Feature #4297: Implement APPLIED_ONCE flag for magic effects
     Feature #4414: Handle duration of EXTRA SPELL magic effect
     Feature #4595: Unique object identifier
diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index fc1d84a61f..6f4ca60edf 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -145,6 +145,12 @@ bool Launcher::AdvancedPage::loadSettings()
         objectPagingMinSizeComboBox->setValue(Settings::Manager::getDouble("object paging min size", "Terrain"));
 
         loadSettingBool(nightDaySwitchesCheckBox, "day night switches", "Game");
+
+        connect(postprocessEnabledCheckBox, SIGNAL(toggled(bool)), this, SLOT(slotPostProcessToggled(bool)));
+        loadSettingBool(postprocessEnabledCheckBox, "enabled", "Post Processing");
+        loadSettingBool(postprocessLiveReloadCheckBox, "live reload", "Post Processing");
+        loadSettingBool(postprocessTransparentPostpassCheckBox, "transparent postpass", "Post Processing");
+        postprocessHDRTimeComboBox->setValue(Settings::Manager::getDouble("hdr exposure time", "Post Processing"));
     }
 
     // Audio
@@ -302,6 +308,11 @@ void Launcher::AdvancedPage::saveSettings()
             Settings::Manager::setDouble("object paging min size", "Terrain", objectPagingMinSize);
 
         saveSettingBool(nightDaySwitchesCheckBox, "day night switches", "Game");
+
+        saveSettingBool(postprocessEnabledCheckBox, "enabled", "Post Processing");
+        saveSettingBool(postprocessLiveReloadCheckBox, "live reload", "Post Processing");
+        saveSettingBool(postprocessTransparentPostpassCheckBox, "transparent postpass", "Post Processing");
+        Settings::Manager::setDouble("hdr exposure time", "Post Processing", postprocessHDRTimeComboBox->value());
     }
     
     // Audio
@@ -464,3 +475,11 @@ void Launcher::AdvancedPage::slotViewOverShoulderToggled(bool checked)
 {
     viewOverShoulderVerticalLayout->setEnabled(viewOverShoulderCheckBox->checkState());
 }
+
+void Launcher::AdvancedPage::slotPostProcessToggled(bool checked)
+{
+    postprocessLiveReloadCheckBox->setEnabled(checked);
+    postprocessTransparentPostpassCheckBox->setEnabled(checked);
+    postprocessHDRTimeComboBox->setEnabled(checked);
+    postprocessHDRTimeLabel->setEnabled(checked);
+}
diff --git a/apps/launcher/advancedpage.hpp b/apps/launcher/advancedpage.hpp
index 1d16fae706..6a3f8319d2 100644
--- a/apps/launcher/advancedpage.hpp
+++ b/apps/launcher/advancedpage.hpp
@@ -30,6 +30,7 @@ namespace Launcher
         void on_runScriptAfterStartupBrowseButton_clicked();
         void slotAnimSourcesToggled(bool checked);
         void slotViewOverShoulderToggled(bool checked);
+        void slotPostProcessToggled(bool checked);
 
     private:
         Config::GameSettings &mGameSettings;
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 12274b912f..b10efaa3a4 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -84,6 +84,7 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding, bool fsStrict, const Files::Pat
     defines["radialFog"] = "0";
     defines["lightingModel"] = "0";
     defines["reverseZ"] = "0";
+    defines["refraction_enabled"] = "0";
     for (const auto& define : shadowDefines)
         defines[define.first] = define.second;
     mResourceSystem->getSceneManager()->getShaderManager().setGlobalDefines(defines);
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 7bbf179d95..1756824164 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -22,7 +22,8 @@ add_openmw_dir (mwrender
     actors objects renderingmanager animation rotatecontroller sky skyutil npcanimation vismask
     creatureanimation effectmanager util renderinginterface pathgrid rendermode weaponanimation screenshotmanager
     bulletdebugdraw globalmap characterpreview camera localmap water terrainstorage ripplesimulation
-    renderbin actoranimation landmanager navmesh actorspaths recastmesh fogmanager objectpaging groundcover postprocessor
+    renderbin actoranimation landmanager navmesh actorspaths recastmesh fogmanager objectpaging groundcover
+    postprocessor pingpongcull hdr pingpongcanvas transparentpass
     )
 
 add_openmw_dir (mwinput
@@ -43,6 +44,7 @@ add_openmw_dir (mwgui
     tradeitemmodel companionitemmodel pickpocketitemmodel controllers savegamedialog
     recharge mode videowidget backgroundimage itemwidget screenfader debugwindow spellmodel spellview
     draganddrop timeadvancer jailscreen itemchargeview keyboardnavigation textcolours statswatcher
+    postprocessorhud
     )
 
 add_openmw_dir (mwdialogue
@@ -59,7 +61,7 @@ add_openmw_dir (mwscript
 add_openmw_dir (mwlua
     luamanagerimp object worldview userdataserializer eventqueue
     luabindings localscripts playerscripts objectbindings cellbindings asyncbindings settingsbindings
-    camerabindings uibindings inputbindings nearbybindings stats
+    camerabindings uibindings inputbindings nearbybindings postprocessingbindings stats
     types/types types/door types/actor types/container types/weapon types/npc types/creature
     )
 
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 982ae92f11..af3db12b5f 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -46,6 +46,8 @@
 #include <components/sceneutil/color.hpp>
 #include <components/sceneutil/util.hpp>
 
+#include <components/settings/shadermanager.hpp>
+
 #include "mwinput/inputmanagerimp.hpp"
 
 #include "mwgui/windowmanagerimp.hpp"
@@ -987,6 +989,8 @@ void OMW::Engine::go()
     Settings::Manager settings;
     std::string settingspath = settings.load(mCfgMgr);
 
+    Settings::ShaderManager::get().load((mCfgMgr.getUserConfigPath() / "shaders.yaml").string());
+
     MWClass::registerClasses();
 
     // Create encoder
@@ -1110,6 +1114,7 @@ void OMW::Engine::go()
 
     // Save user settings
     settings.saveUser(settingspath);
+    Settings::ShaderManager::get().save();
     mLuaManager->savePermanentStorage(mCfgMgr.getUserConfigPath().string());
 
     Log(Debug::Info) << "Quitting peacefully.";
diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index b0076b02f2..c1c99436cb 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -70,6 +70,7 @@ namespace MWGui
     class WindowModal;
     class JailScreen;
     class MessageBox;
+    class PostProcessorHud;
 
     enum ShowInDialogueMode {
         ShowInDialogueMode_IfPossible,
@@ -147,6 +148,7 @@ namespace MWBase
             virtual MWGui::ConfirmationDialog* getConfirmationDialog() = 0;
             virtual MWGui::TradeWindow* getTradeWindow() = 0;
             virtual const std::vector<MWGui::MessageBox*> getActiveMessageBoxes() = 0;
+            virtual MWGui::PostProcessorHud* getPostProcessorHud() = 0;
 
             /// Make the player use an item, while updating GUI state accordingly
             virtual void useItem(const MWWorld::Ptr& item, bool force=false) = 0;
@@ -326,6 +328,7 @@ namespace MWBase
 
             virtual void toggleConsole() = 0;
             virtual void toggleDebugWindow() = 0;
+            virtual void togglePostProcessorHud() = 0;
 
             /// Cycle to next or previous spell
             virtual void cycleSpell(bool next) = 0;
diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 336af37a89..15177b4301 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -67,6 +67,7 @@ namespace MWRender
     class Animation;
     class Camera;
     class RenderingManager;
+    class PostProcessor;
 }
 
 namespace MWMechanics
@@ -238,6 +239,10 @@ namespace MWBase
 
             virtual int getCurrentWeather() const = 0;
 
+            virtual int getNextWeather() const = 0;
+
+            virtual float getWeatherTransition() const = 0;
+
             virtual unsigned int getNightDayMode() const = 0;
 
             virtual int getMasserPhase() const = 0;
@@ -664,6 +669,8 @@ namespace MWBase
             virtual Misc::Rng::Generator& getPrng() = 0;
 
             virtual MWRender::RenderingManager* getRenderingManager() = 0;
+
+            virtual MWRender::PostProcessor* getPostProcessor() = 0;
     };
 }
 
diff --git a/apps/openmw/mwgui/postprocessorhud.cpp b/apps/openmw/mwgui/postprocessorhud.cpp
new file mode 100644
index 0000000000..cfdbfda7e8
--- /dev/null
+++ b/apps/openmw/mwgui/postprocessorhud.cpp
@@ -0,0 +1,454 @@
+#include "postprocessorhud.hpp"
+
+#include <MyGUI_Window.h>
+#include <MyGUI_Button.h>
+#include <MyGUI_TabItem.h>
+#include <MyGUI_TabControl.h>
+#include <MyGUI_RenderManager.h>
+#include <MyGUI_FactoryManager.h>
+
+#include <components/fx/widgets.hpp>
+#include <components/fx/technique.hpp>
+
+#include <components/widgets/box.hpp>
+
+#include "../mwrender/postprocessor.hpp"
+
+#include "../mwbase/world.hpp"
+#include "../mwbase/environment.hpp"
+#include "../mwbase/windowmanager.hpp"
+
+namespace
+{
+    void saveChain()
+    {
+        auto* processor = MWBase::Environment::get().getWorld()->getPostProcessor();
+
+        std::ostringstream chain;
+
+        for (size_t i = 1; i < processor->getTechniques().size(); ++i)
+        {
+            auto technique = processor->getTechniques()[i];
+
+            if (!technique)
+                continue;
+
+            chain << technique->getName();
+
+            if (i < processor-> getTechniques().size() - 1)
+                chain << ",";
+        }
+
+        Settings::Manager::setString("chain", "Post Processing", chain.str());
+    }
+}
+
+namespace MWGui
+{
+    void PostProcessorHud::ListWrapper::onKeyButtonPressed(MyGUI::KeyCode key, MyGUI::Char ch)
+    {
+        if (MyGUI::InputManager::getInstance().isShiftPressed() && (key == MyGUI::KeyCode::ArrowUp || key == MyGUI::KeyCode::ArrowDown))
+            return;
+
+        MyGUI::ListBox::onKeyButtonPressed(key, ch);
+    }
+
+    PostProcessorHud::PostProcessorHud()
+        : WindowBase("openmw_postprocessor_hud.layout")
+    {
+        getWidget(mTabConfiguration, "TabConfiguration");
+        getWidget(mActiveList, "ActiveList");
+        getWidget(mInactiveList, "InactiveList");
+        getWidget(mModeToggle, "ModeToggle");
+        getWidget(mConfigLayout, "ConfigLayout");
+        getWidget(mFilter, "Filter");
+        getWidget(mButtonActivate, "ButtonActivate");
+        getWidget(mButtonDeactivate, "ButtonDeactivate");
+        getWidget(mButtonUp, "ButtonUp");
+        getWidget(mButtonDown, "ButtonDown");
+
+        mButtonActivate->eventMouseButtonClick += MyGUI::newDelegate(this, &PostProcessorHud::notifyActivatePressed);
+        mButtonDeactivate->eventMouseButtonClick += MyGUI::newDelegate(this, &PostProcessorHud::notifyDeactivatePressed);
+        mButtonUp->eventMouseButtonClick += MyGUI::newDelegate(this, &PostProcessorHud::notifyShaderUpPressed);
+        mButtonDown->eventMouseButtonClick += MyGUI::newDelegate(this, &PostProcessorHud::notifyShaderDownPressed);
+
+        mActiveList->eventKeyButtonPressed += MyGUI::newDelegate(this, &PostProcessorHud::notifyKeyButtonPressed);
+        mInactiveList->eventKeyButtonPressed += MyGUI::newDelegate(this, &PostProcessorHud::notifyKeyButtonPressed);
+
+        mActiveList->eventListChangePosition += MyGUI::newDelegate(this, &PostProcessorHud::notifyListChangePosition);
+        mInactiveList->eventListChangePosition += MyGUI::newDelegate(this, &PostProcessorHud::notifyListChangePosition);
+
+        mModeToggle->eventMouseButtonClick += MyGUI::newDelegate(this, &PostProcessorHud::notifyModeToggle);
+
+        mFilter->eventEditTextChange += MyGUI::newDelegate(this, &PostProcessorHud::notifyFilterChanged);
+
+        mMainWidget->castType<MyGUI::Window>()->eventWindowChangeCoord += MyGUI::newDelegate(this, &PostProcessorHud::notifyWindowResize);
+
+        mShaderInfo = mConfigLayout->createWidget<Gui::AutoSizedEditBox>("HeaderText", {}, MyGUI::Align::Default);
+        mShaderInfo->setUserString("VStretch", "true");
+        mShaderInfo->setUserString("HStretch", "true");
+        mShaderInfo->setTextAlign(MyGUI::Align::Left | MyGUI::Align::Top);
+        mShaderInfo->setEditReadOnly(true);
+        mShaderInfo->setEditWordWrap(true);
+        mShaderInfo->setEditMultiLine(true);
+
+        mConfigLayout->setVisibleVScroll(true);
+
+        mConfigArea = mConfigLayout->createWidget<MyGUI::Widget>("", {}, MyGUI::Align::Default);
+    }
+
+    void PostProcessorHud::notifyFilterChanged(MyGUI::EditBox* sender)
+    {
+        updateTechniques();
+    }
+
+    void PostProcessorHud::notifyWindowResize(MyGUI::Window* sender)
+    {
+        layout();
+    }
+
+    void PostProcessorHud::notifyResetButtonClicked(MyGUI::Widget* sender)
+    {
+        for (size_t i = 1; i < mConfigArea->getChildCount(); ++i)
+        {
+            if (auto* child = dynamic_cast<fx::Widgets::UniformBase*>(mConfigArea->getChildAt(i)))
+                child->toDefault();
+        }
+    }
+
+    void PostProcessorHud::notifyListChangePosition(MyGUI::ListBox* sender, size_t index)
+    {
+        if (sender == mActiveList)
+            mInactiveList->clearIndexSelected();
+        else if (sender == mInactiveList)
+            mActiveList->clearIndexSelected();
+
+        if (index >= sender->getItemCount())
+            return;
+
+        updateConfigView(sender->getItemNameAt(index));
+    }
+
+    void PostProcessorHud::toggleTechnique(bool enabled)
+    {
+        auto* list = enabled ? mInactiveList : mActiveList;
+
+        size_t selected = list->getIndexSelected();
+
+        if (selected != MyGUI::ITEM_NONE)
+        {
+            auto* processor = MWBase::Environment::get().getWorld()->getPostProcessor();
+            mOverrideHint = list->getItemNameAt(selected);
+            if (enabled)
+                processor->enableTechnique(*list->getItemDataAt<std::shared_ptr<fx::Technique>>(selected));
+            else
+                processor->disableTechnique(*list->getItemDataAt<std::shared_ptr<fx::Technique>>(selected));
+            saveChain();
+        }
+    }
+
+    void PostProcessorHud::notifyActivatePressed(MyGUI::Widget* sender)
+    {
+        toggleTechnique(true);
+    }
+
+    void PostProcessorHud::notifyDeactivatePressed(MyGUI::Widget* sender)
+    {
+        toggleTechnique(false);
+    }
+
+    void PostProcessorHud::moveShader(Direction direction)
+    {
+        auto* processor = MWBase::Environment::get().getWorld()->getPostProcessor();
+
+        size_t selected = mActiveList->getIndexSelected();
+
+        if (selected == MyGUI::ITEM_NONE)
+            return;
+
+        int index = direction == Direction::Up ? static_cast<int>(selected) - 1 : selected + 1;
+        index = std::clamp<int>(index, 0, mActiveList->getItemCount() - 1);
+
+        if (static_cast<size_t>(index) != selected)
+        {
+            if (processor->enableTechnique(*mActiveList->getItemDataAt<std::shared_ptr<fx::Technique>>(selected), index))
+                saveChain();
+        }
+    }
+
+    void PostProcessorHud::notifyShaderUpPressed(MyGUI::Widget* sender)
+    {
+        moveShader(Direction::Up);
+    }
+
+    void PostProcessorHud::notifyShaderDownPressed(MyGUI::Widget* sender)
+    {
+        moveShader(Direction::Down);
+    }
+
+    void PostProcessorHud::notifyKeyButtonPressed(MyGUI::Widget* sender, MyGUI::KeyCode key, MyGUI::Char ch)
+    {
+        MyGUI::ListBox* list = static_cast<MyGUI::ListBox*>(sender);
+
+        if (list->getIndexSelected() == MyGUI::ITEM_NONE)
+            return;
+
+        if (key == MyGUI::KeyCode::ArrowLeft && list == mActiveList)
+        {
+            if (MyGUI::InputManager::getInstance().isShiftPressed())
+            {
+                toggleTechnique(false);
+            }
+            else
+            {
+                MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mInactiveList);
+                mActiveList->clearIndexSelected();
+                select(mInactiveList, 0);
+            }
+        }
+        else if (key == MyGUI::KeyCode::ArrowRight && list == mInactiveList)
+        {
+            if (MyGUI::InputManager::getInstance().isShiftPressed())
+            {
+                toggleTechnique(true);
+            }
+            else
+            {
+                MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mActiveList);
+                mInactiveList->clearIndexSelected();
+                select(mActiveList, 0);
+            }
+        }
+        else if (list == mActiveList && MyGUI::InputManager::getInstance().isShiftPressed() && (key == MyGUI::KeyCode::ArrowUp || key == MyGUI::KeyCode::ArrowDown))
+        {
+            moveShader(key == MyGUI::KeyCode::ArrowUp ? Direction::Up : Direction::Down);
+        }
+    }
+
+    void PostProcessorHud::notifyModeToggle(MyGUI::Widget* sender)
+    {
+        Settings::ShaderManager::Mode prev = Settings::ShaderManager::get().getMode();
+        toggleMode(prev == Settings::ShaderManager::Mode::Debug ? Settings::ShaderManager::Mode::Normal : Settings::ShaderManager::Mode::Debug);
+    }
+
+    void PostProcessorHud::onOpen()
+    {
+        toggleMode(Settings::ShaderManager::Mode::Debug);
+        updateTechniques();
+    }
+
+    void PostProcessorHud::onClose()
+    {
+        toggleMode(Settings::ShaderManager::Mode::Normal);
+    }
+
+    void PostProcessorHud::layout()
+    {
+        constexpr int padding = 12;
+        constexpr int padding2 = padding * 2;
+        mShaderInfo->setCoord(padding, padding, mConfigLayout->getSize().width - padding2 - padding, mShaderInfo->getTextSize().height);
+
+        int totalHeight = mShaderInfo->getTop() + mShaderInfo->getTextSize().height + padding;
+
+        mConfigArea->setCoord({padding, totalHeight, mShaderInfo->getSize().width, mConfigLayout->getHeight()});
+
+        int childHeights = 0;
+		MyGUI::EnumeratorWidgetPtr enumerator = mConfigArea->getEnumerator();
+		while (enumerator.next())
+		{
+			enumerator.current()->setCoord(padding, childHeights + padding, mShaderInfo->getSize().width - padding2, enumerator.current()->getHeight());
+            childHeights += enumerator.current()->getHeight() + padding;
+		}
+        totalHeight += childHeights;
+
+        mConfigArea->setSize(mConfigArea->getWidth(), childHeights);
+
+        mConfigLayout->setCanvasSize(mConfigLayout->getWidth() - padding2, totalHeight);
+        mConfigLayout->setSize(mConfigLayout->getWidth(), mConfigLayout->getParentSize().height - padding2);
+    }
+
+    void PostProcessorHud::select(ListWrapper* list, size_t index)
+    {
+        list->setIndexSelected(index);
+        notifyListChangePosition(list, index);
+    }
+
+    void PostProcessorHud::toggleMode(Settings::ShaderManager::Mode mode)
+    {
+        Settings::ShaderManager::get().setMode(mode);
+
+        mModeToggle->setCaptionWithReplacing(mode == Settings::ShaderManager::Mode::Debug ? "#{sOn}" :"#{sOff}");
+
+        MWBase::Environment::get().getWorld()->getPostProcessor()->toggleMode();
+
+        if (!isVisible())
+            return;
+
+        if (mInactiveList->getIndexSelected() != MyGUI::ITEM_NONE)
+            updateConfigView(mInactiveList->getItemNameAt(mInactiveList->getIndexSelected()));
+        else if (mActiveList->getIndexSelected() != MyGUI::ITEM_NONE)
+            updateConfigView(mActiveList->getItemNameAt(mActiveList->getIndexSelected()));
+    }
+
+    void PostProcessorHud::updateConfigView(const std::string& name)
+    {
+        auto* processor = MWBase::Environment::get().getWorld()->getPostProcessor();
+
+        auto technique = processor->loadTechnique(name);
+
+        if (!technique)
+            return;
+
+        while (mConfigArea->getChildCount() > 0)
+            MyGUI::Gui::getInstance().destroyWidget(mConfigArea->getChildAt(0));
+
+        mShaderInfo->setCaption("");
+
+        if (!technique)
+            return;
+
+        std::ostringstream ss;
+
+        const std::string NA = "NA";
+        const std::string endl = "\n";
+
+        std::string author = technique->getAuthor().empty() ? NA : std::string(technique->getAuthor());
+        std::string version = technique->getVersion().empty() ? NA : std::string(technique->getVersion());
+        std::string description = technique->getDescription().empty() ? NA : std::string(technique->getDescription());
+
+        auto serializeBool = [](bool value) {
+            return value ? "#{sYes}" : "#{sNo}";
+        };
+
+        const auto flags = technique->getFlags();
+
+        const auto flag_interior = serializeBool (!(flags & fx::Technique::Flag_Disable_Interiors));
+        const auto flag_exterior = serializeBool (!(flags & fx::Technique::Flag_Disable_Exteriors));
+        const auto flag_underwater = serializeBool(!(flags & fx::Technique::Flag_Disable_Underwater));
+        const auto flag_abovewater = serializeBool(!(flags & fx::Technique::Flag_Disable_Abovewater));
+
+        switch (technique->getStatus())
+        {
+            case fx::Technique::Status::Success:
+            case fx::Technique::Status::Uncompiled:
+                ss  << "#{fontcolourhtml=header}Author:      #{fontcolourhtml=normal} " << author << endl << endl
+                    << "#{fontcolourhtml=header}Version:     #{fontcolourhtml=normal} " << version << endl << endl
+                    << "#{fontcolourhtml=header}Description: #{fontcolourhtml=normal} " << description << endl << endl
+                    << "#{fontcolourhtml=header}Interiors: #{fontcolourhtml=normal} " << flag_interior
+                    << "#{fontcolourhtml=header}   Exteriors: #{fontcolourhtml=normal} " << flag_exterior
+                    << "#{fontcolourhtml=header}   Underwater: #{fontcolourhtml=normal} " << flag_underwater
+                    << "#{fontcolourhtml=header}   Abovewater: #{fontcolourhtml=normal} " << flag_abovewater;
+                break;
+            case fx::Technique::Status::File_Not_exists:
+                ss  << "#{fontcolourhtml=negative}Shader Error: #{fontcolourhtml=header} <" << std::string(technique->getFileName()) << ">#{fontcolourhtml=normal} not found." << endl << endl
+                    << "Ensure the shader file is in a 'Shaders/' sub directory in a data files directory";
+                break;
+            case fx::Technique::Status::Parse_Error:
+                ss  << "#{fontcolourhtml=negative}Shader Compile Error: #{fontcolourhtml=normal} <" << std::string(technique->getName()) << "> failed to compile." << endl << endl
+                    << technique->getLastError();
+                break;
+        }
+
+        mShaderInfo->setCaptionWithReplacing(ss.str());
+
+        if (Settings::ShaderManager::get().getMode() == Settings::ShaderManager::Mode::Debug)
+        {
+            if (technique->getUniformMap().size() > 0)
+            {
+                MyGUI::Button* resetButton = mConfigArea->createWidget<MyGUI::Button>("MW_Button", {0,0,0,24}, MyGUI::Align::Default);
+                resetButton->setCaption("Reset all to default");
+                resetButton->setTextAlign(MyGUI::Align::Center);
+                resetButton->eventMouseButtonClick += MyGUI::newDelegate(this, &PostProcessorHud::notifyResetButtonClicked);
+            }
+
+            for (const auto& uniform : technique->getUniformMap())
+            {
+                if (!uniform->mStatic || uniform->mSamplerType)
+                    continue;
+
+                if (!uniform->mHeader.empty())
+                    mConfigArea->createWidget<Gui::AutoSizedTextBox>("MW_UniformGroup", {0,0,0,34}, MyGUI::Align::Default)->setCaption(uniform->mHeader);
+
+                fx::Widgets::UniformBase* uwidget = mConfigArea->createWidget<fx::Widgets::UniformBase>("MW_UniformEdit", {0,0,0,22}, MyGUI::Align::Default);
+                uwidget->init(uniform);
+            }
+        }
+
+        layout();
+    }
+
+    void PostProcessorHud::updateTechniques()
+    {
+        if (!isVisible())
+            return;
+
+        std::string hint;
+        ListWrapper* hintWidget = nullptr;
+        if (mInactiveList->getIndexSelected() != MyGUI::ITEM_NONE)
+        {
+            hint = mInactiveList->getItemNameAt(mInactiveList->getIndexSelected());
+            hintWidget = mInactiveList;
+        }
+        else if (mActiveList->getIndexSelected() != MyGUI::ITEM_NONE)
+        {
+            hint = mActiveList->getItemNameAt(mActiveList->getIndexSelected());
+            hintWidget = mActiveList;
+        }
+
+        mInactiveList->removeAllItems();
+        mActiveList->removeAllItems();
+
+        auto* processor = MWBase::Environment::get().getWorld()->getPostProcessor();
+
+        for (const auto& [name, _] : processor->getTechniqueMap())
+        {
+            auto technique = processor->loadTechnique(name);
+
+            if (!technique)
+                continue;
+
+            if (!technique->getHidden() && !processor->isTechniqueEnabled(technique) && name.find(mFilter->getCaption()) != std::string::npos)
+                mInactiveList->addItem(name, technique);
+        }
+
+        for (auto technique : processor->getTechniques())
+        {
+            if (!technique->getHidden())
+                mActiveList->addItem(technique->getName(), technique);
+        }
+
+        auto tryFocus = [this](ListWrapper* widget, const std::string& hint)
+        {
+            size_t index = widget->findItemIndexWith(hint);
+
+            if (index != MyGUI::ITEM_NONE)
+            {
+                MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(widget);
+                select(widget, index);
+            }
+        };
+
+        if (!mOverrideHint.empty())
+        {
+            tryFocus(mActiveList, mOverrideHint);
+            tryFocus(mInactiveList, mOverrideHint);
+
+            mOverrideHint.clear();
+        }
+        else if (hintWidget && !hint.empty())
+            tryFocus(hintWidget, hint);
+    }
+
+    void PostProcessorHud::registerMyGUIComponents()
+    {
+        MyGUI::FactoryManager& factory = MyGUI::FactoryManager::getInstance();
+        factory.registerFactory<fx::Widgets::UniformBase>("Widget");
+        factory.registerFactory<fx::Widgets::EditNumberFloat4>("Widget");
+        factory.registerFactory<fx::Widgets::EditNumberFloat3>("Widget");
+        factory.registerFactory<fx::Widgets::EditNumberFloat2>("Widget");
+        factory.registerFactory<fx::Widgets::EditNumberFloat>("Widget");
+        factory.registerFactory<fx::Widgets::EditNumberInt>("Widget");
+        factory.registerFactory<fx::Widgets::EditBool>("Widget");
+        factory.registerFactory<ListWrapper>("Widget");
+    }
+}
diff --git a/apps/openmw/mwgui/postprocessorhud.hpp b/apps/openmw/mwgui/postprocessorhud.hpp
new file mode 100644
index 0000000000..44baf79b63
--- /dev/null
+++ b/apps/openmw/mwgui/postprocessorhud.hpp
@@ -0,0 +1,107 @@
+#ifndef MYGUI_POSTPROCESSOR_HUD_H
+#define MYGUI_POSTPROCESSOR_HUD_H
+
+#include "windowbase.hpp"
+
+#include <MyGUI_Gui.h>
+#include <MyGUI_ListBox.h>
+
+#include <components/settings/shadermanager.hpp>
+
+namespace MyGUI
+{
+    class ScrollView;
+    class EditBox;
+    class TabItem;
+}
+namespace Gui
+{
+    class AutoSizedButton;
+    class AutoSizedEditBox;
+}
+
+namespace MWGui
+{
+    class PostProcessorHud : public WindowBase
+    {
+        class ListWrapper final : public MyGUI::ListBox
+        {
+            MYGUI_RTTI_DERIVED(ListWrapper)
+        protected:
+            void onKeyButtonPressed(MyGUI::KeyCode key, MyGUI::Char ch) override;
+        };
+
+    public:
+        PostProcessorHud();
+
+        void onOpen() override;
+
+        void onClose() override;
+
+        void updateTechniques();
+
+        void toggleMode(Settings::ShaderManager::Mode mode);
+
+        static void registerMyGUIComponents();
+
+    private:
+
+        void notifyWindowResize(MyGUI::Window* sender);
+
+        void notifyFilterChanged(MyGUI::EditBox* sender);
+
+        void updateConfigView(const std::string& name);
+
+        void notifyModeToggle(MyGUI::Widget* sender);
+
+        void notifyResetButtonClicked(MyGUI::Widget* sender);
+
+        void notifyListChangePosition(MyGUI::ListBox* sender, size_t index);
+
+        void notifyKeyButtonPressed(MyGUI::Widget* sender, MyGUI::KeyCode key, MyGUI::Char ch);
+
+        void notifyActivatePressed(MyGUI::Widget* sender);
+
+        void notifyDeactivatePressed(MyGUI::Widget* sender);
+
+        void notifyShaderUpPressed(MyGUI::Widget* sender);
+
+        void notifyShaderDownPressed(MyGUI::Widget* sender);
+
+        enum class Direction
+        {
+            Up,
+            Down
+        };
+
+        void moveShader(Direction direction);
+
+        void toggleTechnique(bool enabled);
+
+        void select(ListWrapper* list, size_t index);
+
+        void layout();
+
+        MyGUI::TabItem* mTabConfiguration;
+
+        ListWrapper* mActiveList;
+        ListWrapper* mInactiveList;
+
+        Gui::AutoSizedButton* mButtonActivate;
+        Gui::AutoSizedButton* mButtonDeactivate;
+        Gui::AutoSizedButton* mButtonDown;
+        Gui::AutoSizedButton* mButtonUp;
+
+        MyGUI::ScrollView* mConfigLayout;
+
+        MyGUI::Widget* mConfigArea;
+
+        MyGUI::EditBox* mFilter;
+        Gui::AutoSizedButton* mModeToggle;
+        Gui::AutoSizedEditBox* mShaderInfo;
+
+        std::string mOverrideHint;
+    };
+}
+
+#endif
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 80fb1e546b..3b79b21a7c 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -71,6 +71,7 @@
 #include "../mwmechanics/actorutil.hpp"
 
 #include "../mwrender/localmap.hpp"
+#include "../mwrender/postprocessor.hpp"
 
 #include "console.hpp"
 #include "journalwindow.hpp"
@@ -113,6 +114,7 @@
 #include "itemwidget.hpp"
 #include "screenfader.hpp"
 #include "debugwindow.hpp"
+#include "postprocessorhud.hpp"
 #include "spellview.hpp"
 #include "draganddrop.hpp"
 #include "container.hpp"
@@ -164,6 +166,7 @@ namespace MWGui
       , mHitFader(nullptr)
       , mScreenFader(nullptr)
       , mDebugWindow(nullptr)
+      , mPostProcessorHud(nullptr)
       , mJailScreen(nullptr)
       , mContainerWindow(nullptr)
       , mTranslationDataStorage (translationDataStorage)
@@ -217,7 +220,8 @@ namespace MWGui
         MyGUI::FactoryManager::getInstance().registerFactory<BackgroundImage>("Widget");
         MyGUI::FactoryManager::getInstance().registerFactory<osgMyGUI::AdditiveLayer>("Layer");
         MyGUI::FactoryManager::getInstance().registerFactory<osgMyGUI::ScalingLayer>("Layer");
-        BookPage::registerMyGUIComponents ();
+        BookPage::registerMyGUIComponents();
+        PostProcessorHud::registerMyGUIComponents();
         ItemView::registerComponents();
         ItemChargeView::registerComponents();
         ItemWidget::registerComponents();
@@ -469,6 +473,10 @@ namespace MWGui
         mDebugWindow = new DebugWindow();
         mWindows.push_back(mDebugWindow);
 
+        mPostProcessorHud = new PostProcessorHud();
+        mWindows.push_back(mPostProcessorHud);
+        trackWindow(mPostProcessorHud, "postprocessor");
+
         mInputBlocker = MyGUI::Gui::getInstance().createWidget<MyGUI::Widget>("",0,0,w,h,MyGUI::Align::Stretch,"InputBlocker");
 
         mHud->setVisible(true);
@@ -897,6 +905,8 @@ namespace MWGui
 
         mDebugWindow->onFrame(frameDuration);
 
+        mPostProcessorHud->onFrame(frameDuration);
+
         if (mCharGen)
             mCharGen->onFrame(frameDuration);
 
@@ -1400,6 +1410,7 @@ namespace MWGui
     MWGui::CountDialog* WindowManager::getCountDialog() { return mCountDialog; }
     MWGui::ConfirmationDialog* WindowManager::getConfirmationDialog() { return mConfirmationDialog; }
     MWGui::TradeWindow* WindowManager::getTradeWindow() { return mTradeWindow; }
+    MWGui::PostProcessorHud* WindowManager::getPostProcessorHud() { return mPostProcessorHud; }
 
     void WindowManager::useItem(const MWWorld::Ptr &item, bool bypassBeastRestrictions)
     {
@@ -1488,6 +1499,7 @@ namespace MWGui
         return
             !mGuiModes.empty() ||
             isConsoleMode() ||
+            (mPostProcessorHud && mPostProcessorHud->isVisible()) ||
             (mMessageBoxManager && mMessageBoxManager->isInteractiveMessageBox());
     }
 
@@ -2054,6 +2066,24 @@ namespace MWGui
 #endif
     }
 
+    void WindowManager::togglePostProcessorHud()
+    {
+        if (!MWBase::Environment::get().getWorld()->getPostProcessor()->isEnabled())
+            return;
+
+        bool visible = mPostProcessorHud->isVisible();
+
+        if (!visible && !mGuiModes.empty())
+            mKeyboardNavigation->saveFocus(mGuiModes.back());
+
+        mPostProcessorHud->setVisible(!visible);
+
+        if (visible && !mGuiModes.empty())
+            mKeyboardNavigation->restoreFocus(mGuiModes.back());
+
+        updateVisible();
+    }
+
     void WindowManager::cycleSpell(bool next)
     {
         if (!isGuiMode())
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index 9a4de2b33f..58400ec76b 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -123,6 +123,7 @@ namespace MWGui
   class WindowModal;
   class ScreenFader;
   class DebugWindow;
+  class PostProcessorHud;
   class JailScreen;
   class KeyboardNavigation;
 
@@ -188,6 +189,7 @@ namespace MWGui
     MWGui::ConfirmationDialog* getConfirmationDialog() override;
     MWGui::TradeWindow* getTradeWindow() override;
     const std::vector<MWGui::MessageBox*> getActiveMessageBoxes() override;
+    MWGui::PostProcessorHud* getPostProcessorHud() override;
 
     /// Make the player use an item, while updating GUI state accordingly
     void useItem(const MWWorld::Ptr& item, bool bypassBeastRestrictions=false) override;
@@ -366,6 +368,7 @@ namespace MWGui
 
     void toggleConsole() override;
     void toggleDebugWindow() override;
+    void togglePostProcessorHud() override;
 
     /// Cycle to next or previous spell
     void cycleSpell(bool next) override;
@@ -452,6 +455,7 @@ namespace MWGui
     ScreenFader* mHitFader;
     ScreenFader* mScreenFader;
     DebugWindow* mDebugWindow;
+    PostProcessorHud* mPostProcessorHud;
     JailScreen* mJailScreen;
     ContainerWindow* mContainerWindow;
 
diff --git a/apps/openmw/mwinput/actionmanager.cpp b/apps/openmw/mwinput/actionmanager.cpp
index eae6996acd..6b5a100722 100644
--- a/apps/openmw/mwinput/actionmanager.cpp
+++ b/apps/openmw/mwinput/actionmanager.cpp
@@ -241,6 +241,9 @@ namespace MWInput
         case A_ToggleDebug:
             windowManager->toggleDebugWindow();
             break;
+        case A_TogglePostProcessorHUD:
+            windowManager->togglePostProcessorHud();
+            break;
         case A_QuickSave:
             quickSave();
             break;
diff --git a/apps/openmw/mwinput/actions.hpp b/apps/openmw/mwinput/actions.hpp
index a1c1607126..c7bdbf28d3 100644
--- a/apps/openmw/mwinput/actions.hpp
+++ b/apps/openmw/mwinput/actions.hpp
@@ -73,6 +73,8 @@ namespace MWInput
         A_ZoomIn,
         A_ZoomOut,
 
+        A_TogglePostProcessorHUD,
+
         A_Last                      // Marker for the last item
     };
 }
diff --git a/apps/openmw/mwinput/bindingsmanager.cpp b/apps/openmw/mwinput/bindingsmanager.cpp
index 68be849dbd..82a469890c 100644
--- a/apps/openmw/mwinput/bindingsmanager.cpp
+++ b/apps/openmw/mwinput/bindingsmanager.cpp
@@ -286,6 +286,7 @@ namespace MWInput
         defaultKeyBindings[A_AlwaysRun] = SDL_SCANCODE_CAPSLOCK;
         defaultKeyBindings[A_QuickSave] = SDL_SCANCODE_F5;
         defaultKeyBindings[A_QuickLoad] = SDL_SCANCODE_F9;
+        defaultKeyBindings[A_TogglePostProcessorHUD] = SDL_SCANCODE_F2;
 
         std::map<int, int> defaultMouseButtonBindings;
         defaultMouseButtonBindings[A_Inventory] = SDL_BUTTON_RIGHT;
@@ -502,6 +503,8 @@ namespace MWInput
                 return "#{sQuickSaveCmd}";
             case A_QuickLoad:
                 return "#{sQuickLoadCmd}";
+            case A_TogglePostProcessorHUD:
+                return "Toggle Post Processor HUD";
             default:
                 return std::string(); // not configurable
         }
@@ -563,7 +566,8 @@ namespace MWInput
             A_CycleSpellLeft, A_CycleSpellRight, A_CycleWeaponLeft, A_CycleWeaponRight, A_AutoMove,
             A_Jump, A_Inventory, A_Journal, A_Rest, A_Console, A_QuickSave, A_QuickLoad,
             A_ToggleHUD, A_Screenshot, A_QuickKeysMenu, A_QuickKey1, A_QuickKey2, A_QuickKey3,
-            A_QuickKey4, A_QuickKey5, A_QuickKey6, A_QuickKey7, A_QuickKey8, A_QuickKey9, A_QuickKey10
+            A_QuickKey4, A_QuickKey5, A_QuickKey6, A_QuickKey7, A_QuickKey8, A_QuickKey9, A_QuickKey10,
+            A_TogglePostProcessorHUD
         };
 
         return actions;
diff --git a/apps/openmw/mwlua/inputbindings.cpp b/apps/openmw/mwlua/inputbindings.cpp
index 1be6e086fa..fc16f514fd 100644
--- a/apps/openmw/mwlua/inputbindings.cpp
+++ b/apps/openmw/mwlua/inputbindings.cpp
@@ -136,6 +136,7 @@ namespace MWLua
 
             {"ToggleHUD", MWInput::A_ToggleHUD},
             {"ToggleDebug", MWInput::A_ToggleDebug},
+            {"TogglePostProcessorHUD", MWInput::A_TogglePostProcessorHUD},
 
             {"ZoomIn", MWInput::A_ZoomIn},
             {"ZoomOut", MWInput::A_ZoomOut}
diff --git a/apps/openmw/mwlua/luabindings.hpp b/apps/openmw/mwlua/luabindings.hpp
index 41bc8b29ae..af41199ad9 100644
--- a/apps/openmw/mwlua/luabindings.hpp
+++ b/apps/openmw/mwlua/luabindings.hpp
@@ -21,6 +21,7 @@ namespace MWLua
 
     sol::table initCorePackage(const Context&);
     sol::table initWorldPackage(const Context&);
+    sol::table initPostprocessingPackage(const Context&);
 
     sol::table initGlobalStoragePackage(const Context&, LuaUtil::LuaStorage* globalStorage);
     sol::table initLocalStoragePackage(const Context&, LuaUtil::LuaStorage* globalStorage);
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 602f32710f..b0e22db110 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -95,6 +95,7 @@ namespace MWLua
         mPlayerSettingsPackage = initPlayerSettingsPackage(localContext);
         mLocalStoragePackage = initLocalStoragePackage(localContext, &mGlobalStorage);
         mPlayerStoragePackage = initPlayerStoragePackage(localContext, &mGlobalStorage, &mPlayerStorage);
+        mPostprocessingPackage = initPostprocessingPackage(localContext);
 
         initConfiguration();
         mInitialized = true;
@@ -407,6 +408,7 @@ namespace MWLua
             scripts->addPackage("openmw.input", mInputPackage);
             scripts->addPackage("openmw.settings", mPlayerSettingsPackage);
             scripts->addPackage("openmw.storage", mPlayerStoragePackage);
+            scripts->addPackage("openmw.postprocessing", mPostprocessingPackage);
         }
         else
         {
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index a75cac2da9..0700895497 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -140,6 +140,7 @@ namespace MWLua
         sol::table mPlayerSettingsPackage;
         sol::table mLocalStoragePackage;
         sol::table mPlayerStoragePackage;
+        sol::table mPostprocessingPackage;
 
         GlobalScripts mGlobalScripts{&mLua};
         std::set<LocalScripts*> mActiveLocalScripts;
diff --git a/apps/openmw/mwlua/postprocessingbindings.cpp b/apps/openmw/mwlua/postprocessingbindings.cpp
new file mode 100644
index 0000000000..b016c7716a
--- /dev/null
+++ b/apps/openmw/mwlua/postprocessingbindings.cpp
@@ -0,0 +1,140 @@
+#include "luabindings.hpp"
+
+#include "../mwbase/environment.hpp"
+#include "../mwrender/postprocessor.hpp"
+
+#include "luamanagerimp.hpp"
+
+namespace
+{
+    template <class T>
+    class SetUniformShaderAction final : public MWLua::LuaManager::Action
+    {
+    public:
+        SetUniformShaderAction(LuaUtil::LuaState* state, std::shared_ptr<fx::Technique> shader, const std::string& name, const T& value)
+            : MWLua::LuaManager::Action(state), mShader(std::move(shader)), mName(name), mValue(value) {}
+
+        void apply(MWLua::WorldView&) const override
+        {
+            MWBase::Environment::get().getWorld()->getPostProcessor()->setUniform(mShader, mName, mValue);
+        }
+
+        std::string toString() const override
+        {
+            return  std::string("SetUniformShaderAction shader=") + (mShader ? mShader->getName() : "nil") +
+                    std::string("uniform=") + (mShader ? mName : "nil");
+        }
+
+    private:
+        std::shared_ptr<fx::Technique> mShader;
+        std::string mName;
+        T mValue;
+    };
+}
+
+namespace MWLua
+{
+    struct Shader;
+}
+
+namespace sol
+{
+    template <>
+    struct is_automagical<MWLua::Shader> : std::false_type {};
+}
+
+namespace MWLua
+{
+    struct Shader
+    {
+        std::shared_ptr<fx::Technique> mShader;
+
+        Shader(std::shared_ptr<fx::Technique> shader) : mShader(std::move(shader)) {}
+
+        std::string toString() const
+        {
+            if (!mShader)
+                return "Shader(nil)";
+
+            return Misc::StringUtils::format("Shader(%s, %s)", mShader->getName(), mShader->getFileName());
+        }
+
+        bool mQueuedAction = false;
+    };
+
+    sol::table initPostprocessingPackage(const Context& context)
+    {
+        sol::table api(context.mLua->sol(), sol::create);
+
+        sol::usertype<Shader> shader = context.mLua->sol().new_usertype<Shader>("Shader");
+        shader[sol::meta_function::to_string] = [](const Shader& shader) { return shader.toString(); };
+
+        shader["enable"] = [context](Shader& shader, sol::optional<int> optPos)
+        {
+            std::optional<int> pos = std::nullopt;
+            if (optPos)
+                pos = optPos.value();
+
+            if (shader.mShader && shader.mShader->isValid())
+                shader.mQueuedAction = true;
+
+            context.mLuaManager->addAction(
+                [&] { MWBase::Environment::get().getWorld()->getPostProcessor()->enableTechnique(shader.mShader, pos); },
+                "Enable shader " + (shader.mShader ? shader.mShader->getName() : "nil")
+            );
+        };
+
+        shader["disable"] = [context](Shader& shader)
+        {
+            shader.mQueuedAction = false;
+
+            context.mLuaManager->addAction(
+                [&] { MWBase::Environment::get().getWorld()->getPostProcessor()->disableTechnique(shader.mShader); },
+                "Disable shader " + (shader.mShader ? shader.mShader->getName() : "nil")
+            );
+        };
+
+        shader["isEnabled"] = [](const Shader& shader)
+        {
+            return shader.mQueuedAction;
+        };
+
+        shader["setBool"] = [context](const Shader& shader, const std::string& name, bool value)
+        {
+            context.mLuaManager->addAction(std::make_unique<SetUniformShaderAction<bool>>(context.mLua, shader.mShader, name, value));
+        };
+
+        shader["setFloat"] = [context](const Shader& shader, const std::string& name, float value)
+        {
+            context.mLuaManager->addAction(std::make_unique<SetUniformShaderAction<float>>(context.mLua, shader.mShader, name, value));
+        };
+
+        shader["setInt"] = [context](const Shader& shader, const std::string& name, int value)
+        {
+            context.mLuaManager->addAction(std::make_unique<SetUniformShaderAction<int>>(context.mLua, shader.mShader, name, value));
+        };
+
+        shader["setVector2"] = [context](const Shader& shader, const std::string& name, const osg::Vec2f& value)
+        {
+            context.mLuaManager->addAction(std::make_unique<SetUniformShaderAction<osg::Vec2f>>(context.mLua, shader.mShader, name, value));
+        };
+
+        shader["setVector3"] = [context](const Shader& shader, const std::string& name, const osg::Vec3f& value)
+        {
+            context.mLuaManager->addAction(std::make_unique<SetUniformShaderAction<osg::Vec3f>>(context.mLua, shader.mShader, name, value));
+        };
+
+        shader["setVector4"] = [context](const Shader& shader, const std::string& name, const osg::Vec4f& value)
+        {
+            context.mLuaManager->addAction(std::make_unique<SetUniformShaderAction<osg::Vec4f>>(context.mLua, shader.mShader, name, value));
+        };
+
+        api["load"] = [](const std::string& name)
+        {
+            return Shader(MWBase::Environment::get().getWorld()->getPostProcessor()->loadTechnique(name, false));
+        };
+
+        return LuaUtil::makeReadOnly(api);
+    }
+
+}
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index cb4c074586..0ec8d8885d 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -8,6 +8,7 @@
 #include <osg/Material>
 #include <osg/Switch>
 #include <osg/LightModel>
+#include <osg/ColorMaski>
 
 #include <osgParticle/ParticleSystem>
 #include <osgParticle/ParticleProcessor>
@@ -1563,7 +1564,8 @@ namespace MWRender
 
         // Morrowind has a white ambient light attached to the root VFX node of the scenegraph
         node->getOrCreateStateSet()->setAttributeAndModes(getVFXLightModelInstance(), osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
-
+        if (mResourceSystem->getSceneManager()->getSupportsNormalsRT())
+            node->getOrCreateStateSet()->setAttribute(new osg::ColorMaski(1, false, false, false, false));
         SceneUtil::FindMaxControllerLengthVisitor findMaxLengthVisitor;
         node->accept(findMaxLengthVisitor);
 
diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index f2bbe10460..3a6d2df7ff 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -147,7 +147,7 @@ namespace MWRender
     class CharacterPreviewRTTNode : public SceneUtil::RTTNode
     {
         static constexpr float fovYDegrees = 12.3f;
-        static constexpr float znear = 0.1f;
+        static constexpr float znear = 4.0f;
         static constexpr float zfar = 10000.f;
 
     public:
@@ -162,31 +162,23 @@ namespace MWRender
             mGroup->getOrCreateStateSet()->addUniform(new osg::Uniform("projectionMatrix", mPerspectiveMatrix));
             mViewMatrix = osg::Matrixf::identity();
             setColorBufferInternalFormat(GL_RGBA);
+            setDepthBufferInternalFormat(GL_DEPTH24_STENCIL8);
         } 
 
         void setDefaults(osg::Camera* camera) override 
         {
-
-            // hints that the camera is not relative to the master camera
+            camera->setName("CharacterPreview");
             camera->setReferenceFrame(osg::Camera::ABSOLUTE_RF);
             camera->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT, osg::Camera::PIXEL_BUFFER_RTT);
             camera->setClearColor(osg::Vec4(0.f, 0.f, 0.f, 0.f));
-            camera->setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+            camera->setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+            camera->setProjectionMatrixAsPerspective(fovYDegrees, mAspectRatio, znear, zfar);
             camera->setViewport(0, 0, width(), height());
             camera->setRenderOrder(osg::Camera::PRE_RENDER);
-            camera->setName("CharacterPreview");
-            camera->setComputeNearFarMode(osg::Camera::COMPUTE_NEAR_FAR_USING_BOUNDING_VOLUMES);
             camera->setCullMask(~(Mask_UpdateVisitor));
+            camera->setComputeNearFarMode(osg::Camera::DO_NOT_COMPUTE_NEAR_FAR);
             SceneUtil::setCameraClearDepth(camera);
 
-            // hints that the camera is not relative to the master camera
-            camera->setReferenceFrame(osg::Camera::ABSOLUTE_RF);
-            camera->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT, osg::Camera::PIXEL_BUFFER_RTT);
-            camera->setClearColor(osg::Vec4(0.f, 0.f, 0.f, 0.f));
-            camera->setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-            camera->setProjectionMatrixAsPerspective(fovYDegrees, mAspectRatio, znear, zfar);
-            camera->setViewport(0, 0, width(), height());
-            camera->setRenderOrder(osg::Camera::PRE_RENDER);
 #ifdef OSG_HAS_MULTIVIEW
             if (shouldDoTextureArray())
             {
diff --git a/apps/openmw/mwrender/hdr.cpp b/apps/openmw/mwrender/hdr.cpp
new file mode 100644
index 0000000000..95015da83a
--- /dev/null
+++ b/apps/openmw/mwrender/hdr.cpp
@@ -0,0 +1,123 @@
+#include "hdr.hpp"
+
+#include <components/settings/settings.hpp>
+#include <components/shader/shadermanager.hpp>
+
+#include "pingpongcanvas.hpp"
+
+namespace MWRender
+{
+    HDRDriver::HDRDriver(Shader::ShaderManager& shaderManager)
+        : mCompiled(false)
+        , mEnabled(false)
+        , mWidth(1)
+        , mHeight(1)
+    {
+        const float hdrExposureTime = std::clamp(Settings::Manager::getFloat("hdr exposure time", "Post Processing"), 0.f, 1.f);
+
+        constexpr float minLog = -9.0;
+        constexpr float maxLog = 4.0;
+        constexpr float logLumRange = (maxLog - minLog);
+        constexpr float invLogLumRange = 1.0 / logLumRange;
+        constexpr float epsilon = 0.004;
+
+        Shader::ShaderManager::DefineMap defines = {
+            {"minLog", std::to_string(minLog)},
+            {"maxLog", std::to_string(maxLog)},
+            {"logLumRange", std::to_string(logLumRange)},
+            {"invLogLumRange", std::to_string(invLogLumRange)},
+            {"hdrExposureTime", std::to_string(hdrExposureTime)},
+            {"epsilon", std::to_string(epsilon)},
+        };
+
+        auto vertex = shaderManager.getShader("fullscreen_tri_vertex.glsl", {}, osg::Shader::VERTEX);
+        auto hdrLuminance = shaderManager.getShader("hdr_luminance_fragment.glsl", defines, osg::Shader::FRAGMENT);
+        auto hdr = shaderManager.getShader("hdr_fragment.glsl", defines, osg::Shader::FRAGMENT);
+
+        mProgram = shaderManager.getProgram(vertex, hdr);
+        mLuminanceProgram = shaderManager.getProgram(vertex, hdrLuminance);
+    }
+
+    void HDRDriver::compile()
+    {
+        int mipmapLevels = osg::Image::computeNumberOfMipmapLevels(mWidth, mHeight);
+
+        for (auto& buffer : mBuffers)
+        {
+            buffer.texture = new osg::Texture2D;
+            buffer.texture->setInternalFormat(GL_R16F);
+            buffer.texture->setSourceFormat(GL_RED);
+            buffer.texture->setSourceType(GL_FLOAT);
+            buffer.texture->setFilter(osg::Texture2D::MIN_FILTER, osg::Texture2D::LINEAR_MIPMAP_NEAREST);
+            buffer.texture->setFilter(osg::Texture2D::MAG_FILTER, osg::Texture2D::LINEAR);
+            buffer.texture->setTextureSize(mWidth, mHeight);
+            buffer.texture->setNumMipmapLevels(mipmapLevels);
+
+            buffer.finalTexture = new osg::Texture2D;
+            buffer.finalTexture->setInternalFormat(GL_R16F);
+            buffer.finalTexture->setSourceFormat(GL_RED);
+            buffer.finalTexture->setSourceType(GL_FLOAT);
+            buffer.finalTexture->setFilter(osg::Texture2D::MIN_FILTER, osg::Texture2D::NEAREST);
+            buffer.finalTexture->setFilter(osg::Texture2D::MAG_FILTER, osg::Texture2D::NEAREST);
+            buffer.finalTexture->setTextureSize(1, 1);
+
+            buffer.finalFbo = new osg::FrameBufferObject;
+            buffer.finalFbo->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, osg::FrameBufferAttachment(buffer.finalTexture));
+
+            buffer.fullscreenFbo = new osg::FrameBufferObject;
+            buffer.fullscreenFbo->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, osg::FrameBufferAttachment(buffer.texture));
+
+            buffer.mipmapFbo = new osg::FrameBufferObject;
+            buffer.mipmapFbo->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, osg::FrameBufferAttachment(buffer.texture, mipmapLevels - 1));
+
+            buffer.fullscreenStateset = new osg::StateSet;
+            buffer.fullscreenStateset->setAttributeAndModes(mLuminanceProgram);
+            buffer.fullscreenStateset->addUniform(new osg::Uniform("sceneTex", 0));
+
+            buffer.mipmapStateset = new osg::StateSet;
+            buffer.mipmapStateset->setAttributeAndModes(mProgram);
+            buffer.mipmapStateset->setTextureAttributeAndModes(0, buffer.texture);
+            buffer.mipmapStateset->addUniform(new osg::Uniform("luminanceSceneTex", 0));
+            buffer.mipmapStateset->addUniform(new osg::Uniform("prevLuminanceSceneTex", 1));
+        }
+
+        mBuffers[0].mipmapStateset->setTextureAttributeAndModes(1, mBuffers[1].finalTexture);
+        mBuffers[1].mipmapStateset->setTextureAttributeAndModes(1, mBuffers[0].finalTexture);
+
+        mCompiled = true;
+    }
+
+    void HDRDriver::draw(const PingPongCanvas& canvas, osg::RenderInfo& renderInfo, osg::State& state, osg::GLExtensions* ext, size_t frameId)
+    {
+        if (!mEnabled)
+            return;
+
+        if (!mCompiled)
+            compile();
+
+        auto& hdrBuffer = mBuffers[frameId];
+        hdrBuffer.fullscreenFbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
+        hdrBuffer.fullscreenStateset->setTextureAttributeAndModes(0, canvas.getSceneTexture(frameId));
+
+        state.apply(hdrBuffer.fullscreenStateset);
+        canvas.drawGeometry(renderInfo);
+
+        state.applyTextureAttribute(0, hdrBuffer.texture);
+        ext->glGenerateMipmap(GL_TEXTURE_2D);
+
+        hdrBuffer.mipmapFbo->apply(state, osg::FrameBufferObject::READ_FRAMEBUFFER);
+        hdrBuffer.finalFbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
+
+        ext->glBlitFramebuffer(0, 0, 1, 1, 0, 0, 1, 1, GL_COLOR_BUFFER_BIT, GL_LINEAR);
+
+        state.apply(hdrBuffer.mipmapStateset);
+        canvas.drawGeometry(renderInfo);
+
+        ext->glBindFramebuffer(GL_FRAMEBUFFER_EXT, state.getGraphicsContext() ? state.getGraphicsContext()->getDefaultFboId() : 0);
+    }
+
+    osg::ref_ptr<osg::Texture2D> HDRDriver::getLuminanceTexture(size_t frameId) const
+    {
+        return mBuffers[frameId].finalTexture;
+    }
+}
\ No newline at end of file
diff --git a/apps/openmw/mwrender/hdr.hpp b/apps/openmw/mwrender/hdr.hpp
new file mode 100644
index 0000000000..95bdc6aa0a
--- /dev/null
+++ b/apps/openmw/mwrender/hdr.hpp
@@ -0,0 +1,71 @@
+#ifndef OPENMW_MWRENDER_HDR_H
+#define OPENMW_MWRENDER_HDR_H
+
+#include <array>
+
+#include <osg/FrameBufferObject>
+#include <osg/Texture2D>
+#include <osg/Program>
+
+namespace Shader
+{
+    class ShaderManager;
+}
+
+namespace MWRender
+{
+    class PingPongCanvas;
+
+    class HDRDriver
+    {
+
+    public:
+
+        HDRDriver() = default;
+
+        HDRDriver(Shader::ShaderManager& shaderManager);
+
+        void draw(const PingPongCanvas& canvas, osg::RenderInfo& renderInfo, osg::State& state, osg::GLExtensions* ext, size_t frameId);
+
+        bool isEnabled() const { return mEnabled; }
+
+        void enable() { mEnabled = true; }
+        void disable() { mEnabled = false; }
+
+        void dirty(int w, int h)
+        {
+            mWidth = w;
+            mHeight = h;
+            mCompiled = false;
+        }
+
+        osg::ref_ptr<osg::Texture2D> getLuminanceTexture(size_t frameId) const;
+
+    private:
+
+        void compile();
+
+        struct HDRContainer
+        {
+            osg::ref_ptr<osg::FrameBufferObject> fullscreenFbo;
+            osg::ref_ptr<osg::FrameBufferObject> mipmapFbo;
+            osg::ref_ptr<osg::FrameBufferObject> finalFbo;
+            osg::ref_ptr<osg::Texture2D> texture;
+            osg::ref_ptr<osg::Texture2D> finalTexture;
+            osg::ref_ptr<osg::StateSet> fullscreenStateset;
+            osg::ref_ptr<osg::StateSet> mipmapStateset;
+        };
+
+        std::array<HDRContainer, 2> mBuffers;
+        osg::ref_ptr<osg::Program> mLuminanceProgram;
+        osg::ref_ptr<osg::Program> mProgram;
+
+        bool mCompiled;
+        bool mEnabled;
+
+        int mWidth;
+        int mHeight;
+    };
+}
+
+#endif
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index 2fd3c8b7f7..fda98a1589 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -670,6 +670,7 @@ LocalMapRenderToTexture::LocalMapRenderToTexture(osg::Node* sceneRoot, int res,
     mViewMatrix.makeLookAt(osg::Vec3d(x, y, zmax + 5), osg::Vec3d(x, y, zmin), upVector);
 
     setUpdateCallback(new CameraLocalUpdateCallback);
+    setDepthBufferInternalFormat(GL_DEPTH24_STENCIL8);
 }
 
 void LocalMapRenderToTexture::setDefaults(osg::Camera* camera)
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 0d74b8d302..7ce5594f96 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -327,24 +327,31 @@ public:
 
         state->applyAttribute(mDepth);
 
-        if (postProcessor && postProcessor->getFirstPersonRBProxy())
-        {
-            osg::GLExtensions* ext = state->get<osg::GLExtensions>();
+        unsigned int frameId = state->getFrameStamp()->getFrameNumber() % 2;
 
-            osg::FrameBufferAttachment(postProcessor->getFirstPersonRBProxy()).attach(*state, GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, ext);
+        if (postProcessor && postProcessor->getFbo(PostProcessor::FBO_FirstPerson, frameId))
+        {
+            postProcessor->getFbo(PostProcessor::FBO_FirstPerson, frameId)->apply(*state);
 
             glClear(GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
             // color accumulation pass
             bin->drawImplementation(renderInfo, previous);
 
-            auto primaryFBO = postProcessor->getMsaaFbo() ? postProcessor->getMsaaFbo() : postProcessor->getFbo();
-            primaryFBO->getAttachment(osg::FrameBufferObject::BufferComponent::PACKED_DEPTH_STENCIL_BUFFER).attach(*state, GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, ext);
+            auto primaryFBO = postProcessor->getPrimaryFbo(frameId);
+
+            if (postProcessor->getFbo(PostProcessor::FBO_OpaqueDepth, frameId))
+                postProcessor->getFbo(PostProcessor::FBO_OpaqueDepth, frameId)->apply(*state);
+            else
+                primaryFBO->apply(*state);
 
-            state->pushStateSet(mStateSet);
-            state->apply();
             // depth accumulation pass
+            osg::ref_ptr<osg::StateSet> restore = bin->getStateSet();
+            bin->setStateSet(mStateSet);
             bin->drawImplementation(renderInfo, previous);
-            state->popStateSet();
+            bin->setStateSet(restore);
+
+            if (postProcessor->getFbo(PostProcessor::FBO_OpaqueDepth, frameId))
+                primaryFBO->apply(*state);
         }
         else
         {
diff --git a/apps/openmw/mwrender/pingpongcanvas.cpp b/apps/openmw/mwrender/pingpongcanvas.cpp
new file mode 100644
index 0000000000..9592a8bbba
--- /dev/null
+++ b/apps/openmw/mwrender/pingpongcanvas.cpp
@@ -0,0 +1,260 @@
+#include "pingpongcanvas.hpp"
+
+#include <components/shader/shadermanager.hpp>
+#include <components/debug/debuglog.hpp>
+
+#include "postprocessor.hpp"
+
+namespace MWRender
+{
+    PingPongCanvas::PingPongCanvas(Shader::ShaderManager& shaderManager)
+        : mFallbackStateSet(new osg::StateSet)
+        , mQueuedDispatchArray(std::nullopt)
+        , mQueuedDispatchFrameId(0)
+    {
+        setUseDisplayList(false);
+        setUseVertexBufferObjects(true);
+
+        osg::ref_ptr<osg::Vec3Array> verts = new osg::Vec3Array;
+        verts->push_back(osg::Vec3f(-1, -1, 0));
+        verts->push_back(osg::Vec3f(-1, 3, 0));
+        verts->push_back(osg::Vec3f(3, -1, 0));
+
+        setVertexArray(verts);
+
+        addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::TRIANGLES, 0, 3));
+
+        mHDRDriver = HDRDriver(shaderManager);
+        mHDRDriver.disable();
+
+        auto fallbackVertex = shaderManager.getShader("fullscreen_tri_vertex.glsl", {}, osg::Shader::VERTEX);
+        auto fallbackFragment = shaderManager.getShader("fullscreen_tri_fragment.glsl", {}, osg::Shader::FRAGMENT);
+        mFallbackProgram = shaderManager.getProgram(fallbackVertex, fallbackFragment);
+
+        mFallbackStateSet->setAttributeAndModes(mFallbackProgram);
+        mFallbackStateSet->addUniform(new osg::Uniform("omw_SamplerLastShader", 0));
+    }
+
+    void PingPongCanvas::setCurrentFrameData(size_t frameId, fx::DispatchArray&& data)
+    {
+        mQueuedDispatchArray = fx::DispatchArray(data);
+        mQueuedDispatchFrameId = !frameId;
+
+        mBufferData[frameId].data = std::move(data);
+    }
+
+    void PingPongCanvas::setMask(size_t frameId, bool underwater, bool exterior)
+    {
+        mBufferData[frameId].mask = 0;
+
+        mBufferData[frameId].mask |= underwater ? fx::Technique::Flag_Disable_Underwater : fx::Technique::Flag_Disable_Abovewater;
+        mBufferData[frameId].mask |= exterior ? fx::Technique::Flag_Disable_Exteriors : fx::Technique::Flag_Disable_Interiors;
+    }
+
+    void PingPongCanvas::drawGeometry(osg::RenderInfo& renderInfo) const
+    {
+        osg::Geometry::drawImplementation(renderInfo);
+    }
+
+    void PingPongCanvas::drawImplementation(osg::RenderInfo& renderInfo) const
+    {
+        osg::State& state = *renderInfo.getState();
+        osg::GLExtensions* ext = state.get<osg::GLExtensions>();
+
+        size_t frameId = state.getFrameStamp()->getFrameNumber() % 2;
+
+        auto& bufferData = mBufferData[frameId];
+
+        if (mQueuedDispatchArray && mQueuedDispatchFrameId == frameId)
+        {
+            mBufferData[frameId].data = std::move(mQueuedDispatchArray.value());
+            mQueuedDispatchArray = std::nullopt;
+        }
+
+        const auto& data = bufferData.data;
+
+        std::vector<size_t> filtered;
+
+        filtered.reserve(data.size());
+
+        const fx::DispatchNode::SubPass* resolvePass = nullptr;
+
+        for (size_t i = 0; i < data.size(); ++i)
+        {
+            const auto& node = data[i];
+
+            if (bufferData.mask & node.mFlags)
+                continue;
+
+            for (auto it = node.mPasses.crbegin(); it != node.mPasses.crend(); ++it)
+            {
+                if (!(*it).mRenderTarget)
+                {
+                    resolvePass = &(*it);
+                    break;
+                }
+            }
+
+            filtered.push_back(i);
+        }
+
+        auto* viewport = state.getCurrentViewport();
+
+        if (filtered.empty() || !bufferData.postprocessing)
+        {
+            if (bufferData.postprocessing)
+                Log(Debug::Error) << "Critical error, postprocess shaders failed to compile. Using default shader.";
+
+            mFallbackStateSet->setTextureAttributeAndModes(0, bufferData.sceneTex);
+
+            state.pushStateSet(mFallbackStateSet);
+            state.apply();
+            viewport->apply(state);
+
+            drawGeometry(renderInfo);
+            state.popStateSet();
+            return;
+        }
+
+        const unsigned int handle = mFbos[0] ? mFbos[0]->getHandle(state.getContextID()) : 0;
+
+        if (handle == 0 || bufferData.dirty)
+        {
+            for (auto& fbo : mFbos)
+            {
+                fbo = new osg::FrameBufferObject;
+                fbo->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, osg::FrameBufferAttachment(new osg::Texture2D(*bufferData.sceneTexLDR)));
+                fbo->apply(state);
+                glClearColor(0.5, 0.5, 0.5, 1);
+                glClear(GL_COLOR_BUFFER_BIT);
+            }
+
+            mHDRDriver.dirty(bufferData.sceneTex->getTextureWidth(), bufferData.sceneTex->getTextureHeight());
+
+            bufferData.dirty = false;
+        }
+
+        constexpr std::array<std::array<int, 2>, 3> buffers = {{
+            {GL_COLOR_ATTACHMENT1_EXT, GL_COLOR_ATTACHMENT2_EXT},
+            {GL_COLOR_ATTACHMENT0_EXT, GL_COLOR_ATTACHMENT2_EXT},
+            {GL_COLOR_ATTACHMENT0_EXT, GL_COLOR_ATTACHMENT1_EXT}
+        }};
+
+        (bufferData.hdr) ? mHDRDriver.enable() : mHDRDriver.disable();
+
+        // A histogram based approach is superior way to calculate scene luminance. Using mipmaps is more broadly supported, so that's what we use for now.
+        mHDRDriver.draw(*this, renderInfo, state, ext, frameId);
+
+        auto buffer = buffers[0];
+
+        int lastDraw = 0;
+        int lastShader = 0;
+
+        unsigned int lastApplied = handle;
+
+        const unsigned int cid = state.getContextID();
+
+        const osg::ref_ptr<osg::FrameBufferObject>& destinationFbo = bufferData.destination ? bufferData.destination : nullptr;
+        unsigned int destinationHandle = destinationFbo ? destinationFbo->getHandle(cid) : 0;
+
+        auto bindDestinationFbo = [&]() {
+            if (destinationFbo)
+            {
+                destinationFbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
+                lastApplied = destinationHandle;
+            }
+            else
+            {
+                ext->glBindFramebuffer(GL_DRAW_FRAMEBUFFER_EXT, 0);
+
+                lastApplied = 0;
+            }
+        };
+
+        for (const size_t& index : filtered)
+        {
+            const auto& node = data[index];
+
+            node.mRootStateSet->setTextureAttribute(PostProcessor::Unit_Depth, bufferData.depthTex);
+
+            if (bufferData.hdr)
+                node.mRootStateSet->setTextureAttribute(PostProcessor::TextureUnits::Unit_EyeAdaptation, mHDRDriver.getLuminanceTexture(frameId));
+
+            if (bufferData.normalsTex)
+                node.mRootStateSet->setTextureAttribute(PostProcessor::TextureUnits::Unit_Normals, bufferData.normalsTex);
+
+            state.pushStateSet(node.mRootStateSet);
+            state.apply();
+
+            for (size_t passIndex = 0; passIndex < node.mPasses.size(); ++passIndex)
+            {
+                const auto& pass = node.mPasses[passIndex];
+
+                bool lastPass = passIndex == node.mPasses.size() - 1;
+
+                if (lastShader == 0)
+                    pass.mStateSet->setTextureAttribute(PostProcessor::Unit_LastShader, bufferData.sceneTex);
+                else
+                    pass.mStateSet->setTextureAttribute(PostProcessor::Unit_LastShader, (osg::Texture2D*)mFbos[lastShader - GL_COLOR_ATTACHMENT0_EXT]->getAttachment(osg::Camera::COLOR_BUFFER0).getTexture());
+
+                if (lastDraw == 0)
+                    pass.mStateSet->setTextureAttribute(PostProcessor::Unit_LastPass, bufferData.sceneTex);
+                else
+                    pass.mStateSet->setTextureAttribute(PostProcessor::Unit_LastPass, (osg::Texture2D*)mFbos[lastDraw - GL_COLOR_ATTACHMENT0_EXT]->getAttachment(osg::Camera::COLOR_BUFFER0).getTexture());
+
+                if (pass.mRenderTarget)
+                {
+                    pass.mRenderTarget->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
+
+                    if (pass.mRenderTexture->getNumMipmapLevels() > 0)
+                    {
+                        state.setActiveTextureUnit(0);
+                        state.applyTextureAttribute(0, pass.mRenderTarget->getAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0).getTexture());
+                        ext->glGenerateMipmap(GL_TEXTURE_2D);
+                    }
+
+                    lastApplied = pass.mRenderTarget->getHandle(state.getContextID());;
+                }
+                else if (&pass == resolvePass)
+                {
+                    bindDestinationFbo();
+                }
+                else if (lastPass)
+                {
+                    lastDraw = buffer[0];
+                    lastShader = buffer[0];
+                    mFbos[buffer[0] - GL_COLOR_ATTACHMENT0_EXT]->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
+                    buffer = buffers[lastShader - GL_COLOR_ATTACHMENT0_EXT];
+
+                    lastApplied = mFbos[buffer[0] - GL_COLOR_ATTACHMENT0_EXT]->getHandle(cid);
+                }
+                else
+                {
+                    mFbos[buffer[0] - GL_COLOR_ATTACHMENT0_EXT]->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
+                    lastDraw = buffer[0];
+                    std::swap(buffer[0], buffer[1]);
+
+                    lastApplied = mFbos[buffer[0] - GL_COLOR_ATTACHMENT0_EXT]->getHandle(cid);
+                }
+
+                state.pushStateSet(pass.mStateSet);
+                state.apply();
+
+                if (!state.getLastAppliedProgramObject())
+                    mFallbackProgram->apply(state);
+
+                drawGeometry(renderInfo);
+
+                state.popStateSet();
+                state.apply();
+            }
+
+            state.popStateSet();
+        }
+
+        if (lastApplied != destinationHandle)
+        {
+            bindDestinationFbo();
+        }
+    }
+}
diff --git a/apps/openmw/mwrender/pingpongcanvas.hpp b/apps/openmw/mwrender/pingpongcanvas.hpp
new file mode 100644
index 0000000000..bb39f9bcf3
--- /dev/null
+++ b/apps/openmw/mwrender/pingpongcanvas.hpp
@@ -0,0 +1,88 @@
+#ifndef OPENMW_MWRENDER_PINGPONGCANVAS_H
+#define OPENMW_MWRENDER_PINGPONGCANVAS_H
+
+#include <array>
+#include <optional>
+
+#include <osg/Geometry>
+#include <osg/Texture2D>
+#include <osg/FrameBufferObject>
+
+#include <components/fx/technique.hpp>
+
+#include "postprocessor.hpp"
+#include "hdr.hpp"
+
+namespace Shader
+{
+    class ShaderManager;
+}
+
+namespace MWRender
+{
+    class PingPongCanvas : public osg::Geometry
+    {
+    public:
+        PingPongCanvas(Shader::ShaderManager& shaderManager);
+
+        void drawImplementation(osg::RenderInfo& renderInfo) const override;
+
+        void dirty(size_t frameId) { mBufferData[frameId].dirty = true; }
+
+        const fx::DispatchArray& getCurrentFrameData(size_t frame) { return mBufferData[frame % 2].data; }
+
+        // Sets current frame pass data and stores copy of dispatch array to apply to next frame data
+        void setCurrentFrameData(size_t frameId, fx::DispatchArray&& data);
+
+        void setMask(size_t frameId, bool underwater, bool exterior);
+
+        void setSceneTexture(size_t frameId, osg::ref_ptr<osg::Texture> tex) { mBufferData[frameId].sceneTex = tex; }
+
+        void setLDRSceneTexture(size_t frameId, osg::ref_ptr<osg::Texture2D> tex) { mBufferData[frameId].sceneTexLDR = tex; }
+
+        void setDepthTexture(size_t frameId, osg::ref_ptr<osg::Texture> tex) { mBufferData[frameId].depthTex = tex; }
+
+        void setNormalsTexture(size_t frameId, osg::ref_ptr<osg::Texture2D> tex) { mBufferData[frameId].normalsTex = tex; }
+
+        void setHDR(size_t frameId, bool hdr) { mBufferData[frameId].hdr = hdr; }
+
+        void setPostProcessing(size_t frameId, bool postprocessing) { mBufferData[frameId].postprocessing = postprocessing; }
+
+        const osg::ref_ptr<osg::Texture>& getSceneTexture(size_t frameId) const { return mBufferData[frameId].sceneTex; }
+
+        void drawGeometry(osg::RenderInfo& renderInfo) const;
+
+    private:
+        void copyNewFrameData(size_t frameId) const;
+
+        mutable HDRDriver mHDRDriver;
+
+        osg::ref_ptr<osg::Program> mFallbackProgram;
+        osg::ref_ptr<osg::StateSet> mFallbackStateSet;
+
+        struct BufferData
+        {
+            bool dirty = false;
+            bool hdr = false;
+            bool postprocessing = true;
+
+            fx::DispatchArray data;
+            fx::FlagsType mask;
+
+            osg::ref_ptr<osg::FrameBufferObject> destination;
+
+            osg::ref_ptr<osg::Texture> sceneTex;
+            osg::ref_ptr<osg::Texture> depthTex;
+            osg::ref_ptr<osg::Texture2D> sceneTexLDR;
+            osg::ref_ptr<osg::Texture2D> normalsTex;
+        };
+
+        mutable std::array<BufferData, 2> mBufferData;
+        mutable std::array<osg::ref_ptr<osg::FrameBufferObject>, 3> mFbos;
+
+        mutable std::optional<fx::DispatchArray> mQueuedDispatchArray;
+        mutable size_t mQueuedDispatchFrameId;
+    };
+}
+
+#endif
diff --git a/apps/openmw/mwrender/pingpongcull.cpp b/apps/openmw/mwrender/pingpongcull.cpp
new file mode 100644
index 0000000000..2bec155bbb
--- /dev/null
+++ b/apps/openmw/mwrender/pingpongcull.cpp
@@ -0,0 +1,47 @@
+#include "pingpongcull.hpp"
+
+#include <osg/Camera>
+#include <osg/FrameBufferObject>
+#include <osgUtil/CullVisitor>
+
+#include "postprocessor.hpp"
+#include "pingpongcanvas.hpp"
+
+namespace MWRender
+{
+    void PingPongCull::operator()(osg::Node* node, osgUtil::CullVisitor* cv)
+    {
+        osgUtil::RenderStage* renderStage = cv->getCurrentRenderStage();
+        size_t frame = cv->getTraversalNumber();
+        size_t frameId = frame % 2;
+
+        MWRender::PostProcessor* postProcessor = dynamic_cast<MWRender::PostProcessor*>(cv->getCurrentCamera()->getUserData());
+
+        postProcessor->getStateUpdater()->setViewMatrix(cv->getCurrentCamera()->getViewMatrix());
+        postProcessor->getStateUpdater()->setInvViewMatrix(cv->getCurrentCamera()->getInverseViewMatrix());
+        postProcessor->getStateUpdater()->setPrevViewMatrix(mLastViewMatrix);
+        mLastViewMatrix = cv->getCurrentCamera()->getViewMatrix();
+        postProcessor->getStateUpdater()->setEyePos(cv->getEyePoint());
+        postProcessor->getStateUpdater()->setEyeVec(cv->getLookVectorLocal());
+
+        if (!postProcessor || !postProcessor->getFbo(PostProcessor::FBO_Primary, frameId))
+        {
+            renderStage->setMultisampleResolveFramebufferObject(nullptr);
+            renderStage->setFrameBufferObject(nullptr);
+            traverse(node, cv);
+            return;
+        }
+
+        if (!postProcessor->getFbo(PostProcessor::FBO_Multisample, frameId))
+        {
+            renderStage->setFrameBufferObject(postProcessor->getFbo(PostProcessor::FBO_Primary, frameId));
+        }
+        else
+        {
+            renderStage->setMultisampleResolveFramebufferObject(postProcessor->getFbo(PostProcessor::FBO_Primary, frameId));
+            renderStage->setFrameBufferObject(postProcessor->getFbo(PostProcessor::FBO_Multisample, frameId));
+        }
+
+        traverse(node, cv);
+    }
+}
diff --git a/apps/openmw/mwrender/pingpongcull.hpp b/apps/openmw/mwrender/pingpongcull.hpp
new file mode 100644
index 0000000000..d4514e20d3
--- /dev/null
+++ b/apps/openmw/mwrender/pingpongcull.hpp
@@ -0,0 +1,22 @@
+#ifndef OPENMW_MWRENDER_PINGPONGCULL_H
+#define OPENMW_MWRENDER_PINGPONGCULL_H
+
+#include <array>
+
+#include <components/sceneutil/nodecallback.hpp>
+
+#include "postprocessor.hpp"
+
+namespace MWRender
+{
+    class PostProcessor;
+    class PingPongCull : public SceneUtil::NodeCallback<PingPongCull, osg::Node*, osgUtil::CullVisitor*>
+    {
+    public:
+        void operator()(osg::Node* node, osgUtil::CullVisitor* nv);
+    private:
+        osg::Matrixf mLastViewMatrix;
+    };
+}
+
+#endif
diff --git a/apps/openmw/mwrender/postprocessor.cpp b/apps/openmw/mwrender/postprocessor.cpp
index 9fbc5de528..6fcbb4d51f 100644
--- a/apps/openmw/mwrender/postprocessor.cpp
+++ b/apps/openmw/mwrender/postprocessor.cpp
@@ -2,354 +2,696 @@
 
 #include <SDL_opengl_glext.h>
 
-#include <osg/Group>
-#include <osg/Camera>
-#include <osg/Callback>
+#include <osg/Texture1D>
 #include <osg/Texture2D>
+#include <osg/Texture3D>
 #include <osg/Texture2DArray>
-#include <osg/FrameBufferObject>
-
-#include <osgViewer/Viewer>
 
 #include <components/settings/settings.hpp>
 #include <components/sceneutil/depth.hpp>
 #include <components/sceneutil/color.hpp>
 #include <components/sceneutil/nodecallback.hpp>
-#include <components/debug/debuglog.hpp>
-
+#include <components/sceneutil/util.hpp>
+#include <components/resource/scenemanager.hpp>
+#include <components/shader/shadermanager.hpp>
+#include <components/misc/stringops.hpp>
+#include <components/vfs/manager.hpp>
 #include <components/stereo/multiview.hpp>
 #include <components/stereo/stereomanager.hpp>
 
+#include "../mwbase/world.hpp"
+#include "../mwbase/environment.hpp"
+#include "../mwbase/windowmanager.hpp"
+
+#include "../mwgui/postprocessorhud.hpp"
+
+#include "transparentpass.hpp"
+#include "pingpongcull.hpp"
+#include "renderingmanager.hpp"
 #include "vismask.hpp"
+#include "sky.hpp"
 
 namespace
 {
-    osg::ref_ptr<osg::Geometry> createFullScreenTri()
+    struct ResizedCallback : osg::GraphicsContext::ResizedCallback
     {
-        osg::ref_ptr<osg::Geometry> geom = new osg::Geometry;
-
-        osg::ref_ptr<osg::Vec3Array> verts = new osg::Vec3Array;
-        verts->push_back(osg::Vec3f(-1, -1, 0));
-        verts->push_back(osg::Vec3f(-1, 3, 0));
-        verts->push_back(osg::Vec3f(3, -1, 0));
+        ResizedCallback(MWRender::PostProcessor* postProcessor)
+            : mPostProcessor(postProcessor)
+        { }
 
-        geom->setVertexArray(verts);
+        void resizedImplementation(osg::GraphicsContext* gc, int x, int y, int width, int height) override
+        {
+            gc->resizedImplementation(x, y, width, height);
 
-        geom->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::TRIANGLES, 0, 3));
+            mPostProcessor->setRenderTargetSize(width, height);
+            mPostProcessor->resize();
+        }
 
-        return geom;
-    }
+        MWRender::PostProcessor* mPostProcessor;
+    };
 
-    class CullCallback : public SceneUtil::NodeCallback<CullCallback, osg::Node*, osgUtil::CullVisitor*>
+    class HUDCullCallback : public SceneUtil::NodeCallback<HUDCullCallback, osg::Camera*, osgUtil::CullVisitor*>
     {
     public:
-        CullCallback(MWRender::PostProcessor* pp)
-            : mPostProcessor(pp)
+        void operator()(osg::Camera* camera, osgUtil::CullVisitor* cv)
         {
+            osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
+            auto& sm = Stereo::Manager::instance();
+            auto* fullViewport = camera->getViewport();
+            if (sm.getEye(cv) == Stereo::Eye::Left)
+                stateset->setAttributeAndModes(new osg::Viewport(0, 0, fullViewport->width() / 2, fullViewport->height()));
+            if (sm.getEye(cv) == Stereo::Eye::Right)
+                stateset->setAttributeAndModes(new osg::Viewport(fullViewport->width() / 2, 0, fullViewport->width() / 2, fullViewport->height()));
+
+            cv->pushStateSet(stateset);
+            traverse(camera, cv);
+            cv->popViewport();
         }
+    };
+}
 
-        void operator()(osg::Node* node, osgUtil::CullVisitor* cv)
-        {
-            osgUtil::RenderStage* renderStage = cv->getCurrentRenderStage();
+namespace MWRender
+{
+    PostProcessor::PostProcessor(RenderingManager& rendering, osgViewer::Viewer* viewer, osg::Group* rootNode, const VFS::Manager* vfs)
+        : osg::Group()
+        , mRootNode(rootNode)
+        , mSamples(Settings::Manager::getInt("antialiasing", "Video"))
+        , mDirty(false)
+        , mDirtyFrameId(0)
+        , mRendering(rendering)
+        , mViewer(viewer)
+        , mVFS(vfs)
+        , mReload(false)
+        , mEnabled(false)
+        , mUsePostProcessing(false)
+        , mSoftParticles(false)
+        , mDisableDepthPasses(false)
+        , mLastFrameNumber(0)
+        , mLastSimulationTime(0.f)
+        , mExteriorFlag(false)
+        , mUnderwater(false)
+        , mHDR(false)
+        , mNormals(false)
+        , mPrevNormals(false)
+        , mNormalsSupported(false)
+        , mMainTemplate(new osg::Texture2D)
+    {
+        mSoftParticles = Settings::Manager::getBool("soft particles", "Shaders") && !Stereo::getStereo() && !Stereo::getMultiview();
+        mUsePostProcessing = Settings::Manager::getBool("enabled", "Post Processing");
 
-            if (!mPostProcessor->getMsaaFbo())
-            {
-                renderStage->setFrameBufferObject(mPostProcessor->getFbo());
-            }
-            else
+        osg::GraphicsContext* gc = viewer->getCamera()->getGraphicsContext();
+        osg::GLExtensions* ext = gc->getState()->get<osg::GLExtensions>();
+
+        mWidth = gc->getTraits()->width;
+        mHeight = gc->getTraits()->height;
+
+        if (!ext->glDisablei && ext->glDisableIndexedEXT)
+            ext->glDisablei = ext->glDisableIndexedEXT;
+
+        if (ext->glDisablei)
+            mNormalsSupported = true;
+        else
+            Log(Debug::Error) << "'glDisablei' unsupported, pass normals will not be available to shaders.";
+
+        if (mSoftParticles)
+            for (int i = 0; i < 2; ++i)
+                mTextures[i][Tex_OpaqueDepth] = new osg::Texture2D;
+
+        mGLSLVersion = ext->glslLanguageVersion * 100;
+        mUBO = ext && ext->isUniformBufferObjectSupported && mGLSLVersion >= 330;
+        mStateUpdater = new fx::StateUpdater(mUBO);
+
+        if (!SceneUtil::AutoDepth::isReversed() && !mSoftParticles && !mUsePostProcessing && !Stereo::getStereo() && !Stereo::getMultiview())
+            return;
+
+        enable(mUsePostProcessing);
+    }
+
+    PostProcessor::~PostProcessor()
+    {
+        if (auto* bin = osgUtil::RenderBin::getRenderBinPrototype("DepthSortedBin"))
+            bin->setDrawCallback(nullptr);
+    }
+
+    void PostProcessor::resize()
+    {
+        for (auto& technique : mTechniques)
+        {
+            for (auto& [name, rt] : technique->getRenderTargetsMap())
             {
-                renderStage->setMultisampleResolveFramebufferObject(mPostProcessor->getFbo());
-                renderStage->setFrameBufferObject(mPostProcessor->getMsaaFbo());
+                const auto [w, h] = rt.mSize.get(mWidth, mHeight);
+                rt.mTarget->setTextureSize(w, h);
+                rt.mTarget->dirtyTextureObject();
             }
-
-            traverse(node, cv);
         }
 
-    private:
-        MWRender::PostProcessor* mPostProcessor;
-    };
+        size_t frameId = frame() % 2;
 
-    struct ResizedCallback : osg::GraphicsContext::ResizedCallback
+        createTexturesAndCamera(frameId);
+        createObjectsForFrame(frameId);
+
+        mHUDCamera->resize(mWidth, mHeight);
+        mViewer->getCamera()->resize(mWidth, mHeight);
+        mRendering.updateProjectionMatrix();
+        mRendering.setScreenRes(mWidth, mHeight);
+
+        dirtyTechniques();
+
+        mPingPongCanvas->dirty(frameId);
+
+        mDirty = true;
+        mDirtyFrameId = !frameId;
+
+        if (Stereo::getStereo())
+            Stereo::Manager::instance().screenResolutionChanged();
+    }
+
+    void PostProcessor::enable(bool usePostProcessing)
     {
-        ResizedCallback(MWRender::PostProcessor* postProcessor)
-            : mPostProcessor(postProcessor)
+        mReload = true;
+        mEnabled = true;
+        mUsePostProcessing = usePostProcessing && !Stereo::getStereo() && !Stereo::getMultiview();
+
+        if (!mDisableDepthPasses && !Stereo::getStereo() && !Stereo::getMultiview())
         {
+            mTransparentDepthPostPass = new TransparentDepthBinCallback(mRendering.getResourceSystem()->getSceneManager()->getShaderManager(), Settings::Manager::getBool("transparent postpass", "Post Processing"));
+            osgUtil::RenderBin::getRenderBinPrototype("DepthSortedBin")->setDrawCallback(mTransparentDepthPostPass);
         }
 
-        void resizedImplementation(osg::GraphicsContext* gc, int x, int y, int width, int height) override
+        if (mUsePostProcessing && mTechniqueFileMap.empty())
         {
-            gc->resizedImplementation(x, y, width, height);
-            mPostProcessor->resize(width, height);
+            for (const auto& name : mVFS->getRecursiveDirectoryIterator(fx::Technique::sSubdir))
+            {
+                std::filesystem::path path = name;
+                std::string fileExt = Misc::StringUtils::lowerCase(path.extension().string());
+                if (!path.parent_path().has_parent_path() && fileExt == fx::Technique::sExt)
+                {
+                    auto absolutePath = std::filesystem::path(mVFS->getAbsoluteFileName(name));
+
+                    mTechniqueFileMap[absolutePath.stem().string()] = absolutePath;
+                }
+            }
         }
 
-        MWRender::PostProcessor* mPostProcessor;
-    };
+        mMainTemplate->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
+        mMainTemplate->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
+        mMainTemplate->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+        mMainTemplate->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+        mMainTemplate->setInternalFormat(GL_RGBA);
+        mMainTemplate->setSourceType(GL_UNSIGNED_BYTE);
+        mMainTemplate->setSourceFormat(GL_RGBA);
 
-    // Copies the currently bound depth attachment to a new texture so drawables in transparent renderbin can safely sample from depth.
-    class OpaqueDepthCopyCallback : public osgUtil::RenderBin::DrawCallback
-    {
-    public:
-        OpaqueDepthCopyCallback(osg::ref_ptr<osg::Texture2D> opaqueDepthTex, osg::ref_ptr<osg::FrameBufferObject> sourceFbo)
-            : mOpaqueDepthFbo(new osg::FrameBufferObject)
-            , mSourceFbo(sourceFbo)
-            , mOpaqueDepthTex(opaqueDepthTex)
-            , mColorAttached(false)
-        {
-            mOpaqueDepthFbo->setAttachment(osg::FrameBufferObject::BufferComponent::DEPTH_BUFFER, osg::FrameBufferAttachment(opaqueDepthTex));
+        createTexturesAndCamera(frame() % 2);
 
-#ifdef __APPLE__
-            // Mac OS drivers complain that a FBO is incomplete if it has no color attachment
-            mOpaqueDepthFbo->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER, osg::FrameBufferAttachment(new osg::RenderBuffer(mOpaqueDepthTex->getTextureWidth(), mOpaqueDepthTex->getTextureHeight(), GL_RGB)));
-            mColorAttached = true;
-#endif
-        }
+        removeChild(mHUDCamera);
+        removeChild(mRootNode);
+
+        addChild(mHUDCamera);
+        addChild(mRootNode);
+
+        mViewer->setSceneData(this);
+        mViewer->getCamera()->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT);
+        mViewer->getCamera()->setImplicitBufferAttachmentMask(0, 0);
+        mViewer->getCamera()->getGraphicsContext()->setResizedCallback(new ResizedCallback(this));
+        mViewer->getCamera()->setUserData(this);
+
+        setCullCallback(mStateUpdater);
+        mHUDCamera->setCullCallback(new HUDCullCallback);
 
-        void drawImplementation(osgUtil::RenderBin* bin, osg::RenderInfo& renderInfo, osgUtil::RenderLeaf*& previous) override
+        static bool init = false;
+
+        if (init)
         {
-            if (bin->getStage()->getFrameBufferObject() == mSourceFbo)
-            {
-                osg::State& state = *renderInfo.getState();
-                osg::GLExtensions* ext = state.get<osg::GLExtensions>();
+            resize();
+            init = true;
+        }
 
-                mSourceFbo->apply(state, osg::FrameBufferObject::READ_FRAMEBUFFER);
-                postBindOperation(state);
+        init = true;
+    }
 
-                mOpaqueDepthFbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
-                postBindOperation(state);
+    void PostProcessor::disable()
+    {
+        if (!mSoftParticles)
+            osgUtil::RenderBin::getRenderBinPrototype("DepthSortedBin")->setDrawCallback(nullptr);
 
-                ext->glBlitFramebuffer(0, 0, mOpaqueDepthTex->getTextureWidth(), mOpaqueDepthTex->getTextureHeight(), 0, 0, mOpaqueDepthTex->getTextureWidth(), mOpaqueDepthTex->getTextureHeight(), GL_DEPTH_BUFFER_BIT, GL_NEAREST);
+        if (!SceneUtil::AutoDepth::isReversed() && !mSoftParticles && !Stereo::getStereo() && !Stereo::getMultiview())
+        {
+            removeChild(mHUDCamera);
+            setCullCallback(nullptr);
 
-                mSourceFbo->apply(state);
-            }
+            mViewer->getCamera()->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER);
+            mViewer->getCamera()->getGraphicsContext()->setResizedCallback(nullptr);
+            mViewer->getCamera()->setUserData(nullptr);
 
-            bin->drawImplementation(renderInfo, previous);
+            mEnabled = false;
         }
-    private:
-        void postBindOperation(osg::State& state)
+
+        mUsePostProcessing = false;
+        mRendering.getSkyManager()->setSunglare(true);
+    }
+
+    void PostProcessor::traverse(osg::NodeVisitor& nv)
+    {
+        if (!mEnabled)
         {
-            if (mColorAttached)
-                return;
-            #if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE) && !defined(OSG_GLES3_AVAILABLE)
-            state.glDrawBuffer(GL_NONE);
-            state.glReadBuffer(GL_NONE);
-            #endif
+            osg::Group::traverse(nv);
+            return;
         }
 
-        osg::ref_ptr<osg::FrameBufferObject> mOpaqueDepthFbo;
-        osg::ref_ptr<osg::FrameBufferObject> mSourceFbo;
-        osg::ref_ptr<osg::Texture2D> mOpaqueDepthTex;
-        bool mColorAttached;
-    };
-}
+        size_t frameId = nv.getTraversalNumber() % 2;
 
-namespace MWRender
-{
-    PostProcessor::PostProcessor(osgViewer::Viewer* viewer, osg::Group* rootNode)
-        : mViewer(viewer)
-        , mRootNode(new osg::Group)
+        if (nv.getVisitorType() == osg::NodeVisitor::CULL_VISITOR)
+            cull(frameId, static_cast<osgUtil::CullVisitor*>(&nv));
+        else if (nv.getVisitorType() == osg::NodeVisitor::UPDATE_VISITOR)
+            update(frameId);
+
+        osg::Group::traverse(nv);
+    }
+
+    void PostProcessor::cull(size_t frameId, osgUtil::CullVisitor* cv)
     {
-        bool softParticles = Settings::Manager::getBool("soft particles", "Shaders");
+        const auto& fbo = getFbo(FBO_Intercept, frameId);
+        if (fbo)
+        {
+            osgUtil::RenderStage* rs = cv->getRenderStage();
+            if (rs && rs->getMultisampleResolveFramebufferObject())
+                rs->setMultisampleResolveFramebufferObject(fbo);
+        }
 
-        if (!SceneUtil::AutoDepth::isReversed() && !softParticles && !Stereo::getStereo())
-            return;
+        mPingPongCanvas->setPostProcessing(frameId, mUsePostProcessing);
+        mPingPongCanvas->setNormalsTexture(frameId, mNormals ? getTexture(Tex_Normal, frameId) : nullptr);
+        mPingPongCanvas->setMask(frameId, mUnderwater, mExteriorFlag);
+        mPingPongCanvas->setHDR(frameId, getHDR());
 
-        osg::GraphicsContext* gc = viewer->getCamera()->getGraphicsContext();
-        osg::GLExtensions* ext = gc->getState()->get<osg::GLExtensions>();
+        if (Stereo::getStereo())
+        {
+            auto& sm = Stereo::Manager::instance();
 
-        constexpr char errPreamble[] = "Postprocessing and floating point depth buffers disabled: ";
+            int index = sm.getEye(cv) == Stereo::Eye::Left ? 0 : 1;
 
-        if (!ext->isFrameBufferObjectSupported)
+            mPingPongCanvas->setSceneTexture(frameId, sm.multiviewFramebuffer()->layerColorBuffer(index));
+            mPingPongCanvas->setDepthTexture(frameId, sm.multiviewFramebuffer()->layerDepthBuffer(index));
+        }
+        else if (Stereo::getMultiview())
         {
-            Log(Debug::Warning) << errPreamble << "FrameBufferObject unsupported.";
-            return;
+            auto& sm = Stereo::Manager::instance();
+
+            mPingPongCanvas->setSceneTexture(frameId, sm.multiviewFramebuffer()->multiviewColorBuffer());
+            mPingPongCanvas->setDepthTexture(frameId, sm.multiviewFramebuffer()->multiviewDepthBuffer());
         }
+        else
+        {
+            mPingPongCanvas->setSceneTexture(frameId, getTexture(Tex_Scene, frameId));
+            if (mDisableDepthPasses)
+                mPingPongCanvas->setDepthTexture(frameId, getTexture(Tex_Depth, frameId));
+            else
+                mPingPongCanvas->setDepthTexture(frameId, getTexture(Tex_OpaqueDepth, frameId));
+
+            mPingPongCanvas->setLDRSceneTexture(frameId, getTexture(Tex_Scene_LDR, frameId));
 
-        if (Settings::Manager::getInt("antialiasing", "Video") > 1 && !ext->isRenderbufferMultisampleSupported())
+            if (mTransparentDepthPostPass)
+            {
+                mTransparentDepthPostPass->mFbo[frameId] = mFbos[frameId][FBO_Primary];
+                mTransparentDepthPostPass->mMsaaFbo[frameId] = mFbos[frameId][FBO_Multisample];
+                mTransparentDepthPostPass->mOpaqueFbo[frameId] = mFbos[frameId][FBO_OpaqueDepth];
+            }
+        }
+
+        size_t frame = cv->getTraversalNumber();
+
+        mStateUpdater->setResolution(osg::Vec2f(cv->getViewport()->width(), cv->getViewport()->height()));
+
+        // per-frame data
+        if (frame != mLastFrameNumber)
         {
-            Log(Debug::Warning) << errPreamble << "RenderBufferMultiSample unsupported. Disabling antialiasing will resolve this issue.";
-            return;
+            mLastFrameNumber = frame;
+
+            auto stamp = cv->getFrameStamp();
+
+            mStateUpdater->setSimulationTime(static_cast<float>(stamp->getSimulationTime()));
+            mStateUpdater->setDeltaSimulationTime(static_cast<float>(stamp->getSimulationTime() - mLastSimulationTime));
+            mLastSimulationTime = stamp->getSimulationTime();
+
+            for (const auto& dispatchNode : mPingPongCanvas->getCurrentFrameData(frame))
+            {
+                for (auto& uniform : dispatchNode.mHandle->getUniformMap())
+                {
+                    if (uniform->getType().has_value() && !uniform->mSamplerType)
+                        if (auto* u = dispatchNode.mRootStateSet->getUniform(uniform->mName))
+                            uniform->setUniform(u);
+                }
+            }
         }
+    }
+
+    void PostProcessor::update(size_t frameId)
+    {
+        static const bool liveReload = Settings::Manager::getBool("live reload", "Post Processing");
 
-        if (SceneUtil::AutoDepth::isReversed())
+        if (liveReload)
         {
-            if(SceneUtil::AutoDepth::depthSourceType() != GL_FLOAT_32_UNSIGNED_INT_24_8_REV)
+            for (auto& technique : mTechniques)
             {
-                // TODO: Once we have post-processing implemented we want to skip this return and continue with setup.
-                // Rendering to a FBO to fullscreen geometry has overhead (especially when MSAA is enabled) and there are no
-                // benefits if no floating point depth formats are supported.
-                if (!softParticles && !Stereo::getStereo())
-                    return;
+                if (technique->getStatus() == fx::Technique::Status::File_Not_exists)
+                    continue;
+
+                technique->setLastModificationTime(std::filesystem::last_write_time(mTechniqueFileMap[technique->getName()]));
+
+                if(technique->isValid() && !technique->isDirty())
+                    continue;
+
+                if (technique->isDirty())
+                {
+                    technique->compile();
+
+                    if (technique->isValid())
+                        Log(Debug::Info) << "Reloaded technique : " << mTechniqueFileMap[technique->getName()].string();
+
+                    if (!mReload)
+                        mReload = technique->isValid();
+                }
             }
         }
 
-        auto* traits = gc->getTraits();
-        int width = traits->width;
-        int height = traits->height;
+        if (mReload)
+        {
+            mReload = false;
+
+            if (!mTechniques.empty())
+                reloadMainPass(*mTechniques[0]);
 
-        createTexturesAndCamera(width, height);
-        resize(width, height);
+            reloadTechniques();
 
-        mRootNode->addChild(mHUDCamera);
-        mRootNode->addChild(rootNode);
-        mViewer->setSceneData(mRootNode);
+            if (!mUsePostProcessing)
+                resize();
+        }
 
-        if (!Stereo::getStereo())
+        if (mDirty && mDirtyFrameId == frameId)
         {
-            // We need to manually set the FBO and resolve FBO during the cull callback. If we were using a separate
-            // RTT camera this would not be needed.
-            mViewer->getCamera()->addCullCallback(new CullCallback(this));
-            mViewer->getCamera()->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT);
-            mViewer->getCamera()->attach(osg::Camera::COLOR_BUFFER0, mSceneTex);
-        mViewer->getCamera()->attach(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, mDepthTex);
+            createTexturesAndCamera(frameId);
+            createObjectsForFrame(frameId);
+            mDirty = false;
         }
 
-        mViewer->getCamera()->getGraphicsContext()->setResizedCallback(new ResizedCallback(this));
+        if (mNormalsSupported && mNormals != mPrevNormals)
+        {
+            mPrevNormals = mNormals;
+
+            mViewer->stopThreading();
+
+            auto& shaderManager = MWBase::Environment::get().getResourceSystem()->getSceneManager()->getShaderManager();
+            auto defines = shaderManager.getGlobalDefines();
+            defines["disableNormals"] = mNormals ? "0" : "1";
+            shaderManager.setGlobalDefines(defines);
+
+            mViewer->startThreading();
+
+            createTexturesAndCamera(frameId);
+            createObjectsForFrame(frameId);
+            mDirty = true;
+            mDirtyFrameId = !frameId;
+        }
     }
 
-    void PostProcessor::resize(int width, int height)
+    void PostProcessor::createObjectsForFrame(size_t frameId)
     {
-        mDepthTex->setTextureSize(width, height);
-        mSceneTex->setTextureSize(width, height);
-        mDepthTex->dirtyTextureObject();
-        mSceneTex->dirtyTextureObject();
+        if (Stereo::getStereo() || Stereo::getMultiview())
+            return;
 
-        if (mOpaqueDepthTex)
+        auto& fbos = mFbos[frameId];
+        auto& textures = mTextures[frameId];
+
+        for (auto& tex : textures)
         {
-            mOpaqueDepthTex->setTextureSize(width, height);
-            mOpaqueDepthTex->dirtyTextureObject();
+            if (!tex)
+                continue;
+
+            tex->setTextureSize(mWidth, mHeight);
+            tex->dirtyTextureObject();
         }
 
-        int samples = Settings::Manager::getInt("antialiasing", "Video");
+        fbos[FBO_Primary] = new osg::FrameBufferObject;
+        fbos[FBO_Primary]->setAttachment(osg::Camera::COLOR_BUFFER0, osg::FrameBufferAttachment(textures[Tex_Scene]));
+        if (mNormals && mNormalsSupported)
+            fbos[FBO_Primary]->setAttachment(osg::Camera::COLOR_BUFFER1, osg::FrameBufferAttachment(textures[Tex_Normal]));
+        fbos[FBO_Primary]->setAttachment(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, osg::FrameBufferAttachment(textures[Tex_Depth]));
 
-        mFbo = new osg::FrameBufferObject;
-        mFbo->setAttachment(osg::Camera::COLOR_BUFFER0, osg::FrameBufferAttachment(mSceneTex));
-        mFbo->setAttachment(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, osg::FrameBufferAttachment(mDepthTex));
+        fbos[FBO_FirstPerson] = new osg::FrameBufferObject;
+        osg::ref_ptr<osg::RenderBuffer> fpDepthRb = new osg::RenderBuffer(mWidth, mHeight, textures[Tex_Depth]->getInternalFormat(), mSamples > 1 ? mSamples : 0);
+        fbos[FBO_FirstPerson]->setAttachment(osg::FrameBufferObject::BufferComponent::PACKED_DEPTH_STENCIL_BUFFER, osg::FrameBufferAttachment(fpDepthRb));
 
         // When MSAA is enabled we must first render to a render buffer, then
         // blit the result to the FBO which is either passed to the main frame
         // buffer for display or used as the entry point for a post process chain.
-        if (samples > 1)
+        if (mSamples > 1)
         {
-            mMsaaFbo = new osg::FrameBufferObject;
-            osg::ref_ptr<osg::RenderBuffer> colorRB = new osg::RenderBuffer(width, height, mSceneTex->getInternalFormat(), samples);
-            osg::ref_ptr<osg::RenderBuffer> depthRB = new osg::RenderBuffer(width, height, mDepthTex->getInternalFormat(), samples);
-            mMsaaFbo->setAttachment(osg::Camera::COLOR_BUFFER0, osg::FrameBufferAttachment(colorRB));
-            mMsaaFbo->setAttachment(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, osg::FrameBufferAttachment(depthRB));
+            fbos[FBO_Multisample] = new osg::FrameBufferObject;
+            osg::ref_ptr<osg::RenderBuffer> colorRB = new osg::RenderBuffer(mWidth, mHeight, textures[Tex_Scene]->getInternalFormat(), mSamples);
+            if (mNormals && mNormalsSupported)
+            {
+                osg::ref_ptr<osg::RenderBuffer> normalRB = new osg::RenderBuffer(mWidth, mHeight, textures[Tex_Normal]->getInternalFormat(), mSamples);
+                fbos[FBO_Multisample]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER1, osg::FrameBufferAttachment(normalRB));
+                fbos[FBO_FirstPerson]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER1, osg::FrameBufferAttachment(normalRB));
+            }
+            osg::ref_ptr<osg::RenderBuffer> depthRB = new osg::RenderBuffer(mWidth, mHeight, textures[Tex_Depth]->getInternalFormat(), mSamples);
+            fbos[FBO_Multisample]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, osg::FrameBufferAttachment(colorRB));
+            fbos[FBO_Multisample]->setAttachment(osg::FrameBufferObject::BufferComponent::PACKED_DEPTH_STENCIL_BUFFER, osg::FrameBufferAttachment(depthRB));
+            fbos[FBO_FirstPerson]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, osg::FrameBufferAttachment(colorRB));
+
+            fbos[FBO_Intercept] = new osg::FrameBufferObject;
+            fbos[FBO_Intercept]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, osg::FrameBufferAttachment(textures[Tex_Scene]));
+            fbos[FBO_Intercept]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER1, osg::FrameBufferAttachment(textures[Tex_Normal]));
+        }
+        else
+        {
+            fbos[FBO_FirstPerson]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, osg::FrameBufferAttachment(textures[Tex_Scene]));
+            if (mNormals && mNormalsSupported)
+                fbos[FBO_FirstPerson]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER1, osg::FrameBufferAttachment(textures[Tex_Normal]));
         }
 
-        if (const auto depthProxy = std::getenv("OPENMW_ENABLE_DEPTH_CLEAR_PROXY"))
-            mFirstPersonDepthRBProxy = new osg::RenderBuffer(width, height, mDepthTex->getInternalFormat(), samples);
-
-        if (Settings::Manager::getBool("soft particles", "Shaders"))
-            osgUtil::RenderBin::getRenderBinPrototype("DepthSortedBin")->setDrawCallback(new OpaqueDepthCopyCallback(mOpaqueDepthTex, mMsaaFbo ? mMsaaFbo : mFbo));
-
-        mViewer->getCamera()->resize(width, height);
-        mHUDCamera->resize(width, height);
+        if (textures[Tex_OpaqueDepth])
+        {
+            fbos[FBO_OpaqueDepth] = new osg::FrameBufferObject;
+            fbos[FBO_OpaqueDepth]->setAttachment(osg::FrameBufferObject::BufferComponent::PACKED_DEPTH_STENCIL_BUFFER, osg::FrameBufferAttachment(textures[Tex_OpaqueDepth]));
+        }
 
-        if (Stereo::getStereo())
-            Stereo::Manager::instance().screenResolutionChanged();
+#ifdef __APPLE__
+        if (textures[Tex_OpaqueDepth])
+            fbos[FBO_OpaqueDepth]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER, osg::FrameBufferAttachment(new osg::RenderBuffer(textures[Tex_OpaqueDepth]->getTextureWidth(), textures[Tex_OpaqueDepth]->getTextureHeight(), textures[Tex_Scene]->getInternalFormat())));
+#endif
     }
 
-    class HUDCameraStatesetUpdater final : public SceneUtil::StateSetUpdater
+    void PostProcessor::dirtyTechniques()
     {
-    public:
-    public:
-        HUDCameraStatesetUpdater(osg::ref_ptr<osg::Camera> HUDCamera, osg::ref_ptr<osg::Program> program, osg::ref_ptr<osg::Texture2D> sceneTex)
-            : mHUDCamera(HUDCamera)
-            , mProgram(program)
-            , mSceneTex(sceneTex)
-        {
-        }
+        if (!isEnabled())
+            return;
 
-        void setDefaults(osg::StateSet* stateset) override
+        fx::DispatchArray data;
+
+        bool sunglare = true;
+        mHDR = false;
+        mNormals = false;
+
+        for (const auto& technique : mTechniques)
         {
-            stateset->setTextureAttributeAndModes(0, mSceneTex, osg::StateAttribute::ON);
-            stateset->setAttributeAndModes(mProgram, osg::StateAttribute::ON);
-            stateset->addUniform(new osg::Uniform("sceneTex", 0));
-            stateset->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
-            stateset->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
+            if (!technique->isValid())
+                continue;
 
-            if (osg::DisplaySettings::instance()->getStereo())
+            if (technique->getGLSLVersion() > mGLSLVersion)
             {
-                stateset->setAttribute(new osg::Viewport);
-                stateset->addUniform(new osg::Uniform("viewportIndex", 0));
+                Log(Debug::Warning) << "Technique " << technique->getName() << " requires GLSL version " << technique->getGLSLVersion() << " which is unsupported by your hardware.";
+                continue;
             }
+
+            fx::DispatchNode node;
+
+            node.mFlags = technique->getFlags();
+
+            if (technique->getHDR())
+                mHDR = true;
+
+            if (technique->getNormals())
+                mNormals = true;
+
+            if (node.mFlags & fx::Technique::Flag_Disable_SunGlare)
+                sunglare = false;
+
+            // required default samplers available to every shader pass
+            node.mRootStateSet->addUniform(new osg::Uniform("omw_SamplerLastShader", Unit_LastShader));
+            node.mRootStateSet->addUniform(new osg::Uniform("omw_SamplerLastPass", Unit_LastPass));
+            node.mRootStateSet->addUniform(new osg::Uniform("omw_SamplerDepth", Unit_Depth));
+
+            if (mNormals)
+                node.mRootStateSet->addUniform(new osg::Uniform("omw_SamplerNormals", Unit_Normals));
+
+            if (technique->getHDR())
+                node.mRootStateSet->addUniform(new osg::Uniform("omw_EyeAdaptation", Unit_EyeAdaptation));
+
+            int texUnit = Unit_NextFree;
+
+            // user-defined samplers
+            for (const osg::Texture* texture : technique->getTextures())
+            {
+                if (const auto* tex1D = dynamic_cast<const osg::Texture1D*>(texture))
+                    node.mRootStateSet->setTextureAttribute(texUnit, new osg::Texture1D(*tex1D));
+                else if (const auto* tex2D = dynamic_cast<const osg::Texture2D*>(texture))
+                    node.mRootStateSet->setTextureAttribute(texUnit, new osg::Texture2D(*tex2D));
+                else if (const auto* tex3D = dynamic_cast<const osg::Texture3D*>(texture))
+                    node.mRootStateSet->setTextureAttribute(texUnit, new osg::Texture3D(*tex3D));
+
+                node.mRootStateSet->addUniform(new osg::Uniform(texture->getName().c_str(), texUnit++));
+            }
+
+            // user-defined uniforms
+            for (auto& uniform : technique->getUniformMap())
+            {
+                if (uniform->mSamplerType) continue;
+
+                if (auto type = uniform->getType())
+                    uniform->setUniform(node.mRootStateSet->getOrCreateUniform(uniform->mName, type.value()));
+            }
+
+            int subTexUnit = texUnit;
+
+            for (const auto& pass : technique->getPasses())
+            {
+                fx::DispatchNode::SubPass subPass;
+
+                pass->prepareStateSet(subPass.mStateSet, technique->getName());
+
+                node.mHandle = technique;
+
+                if (!pass->getTarget().empty())
+                {
+                    const auto& rt = technique->getRenderTargetsMap()[pass->getTarget()];
+
+                    const auto [w, h] = rt.mSize.get(mWidth, mHeight);
+
+                    subPass.mRenderTexture = new osg::Texture2D(*rt.mTarget);
+                    subPass.mRenderTexture->setTextureSize(w, h);
+                    subPass.mRenderTexture->setName(std::string(pass->getTarget()));
+
+                    if (rt.mMipMap)
+                        subPass.mRenderTexture->setNumMipmapLevels(osg::Image::computeNumberOfMipmapLevels(w, h));
+
+                    subPass.mRenderTarget = new osg::FrameBufferObject;
+                    subPass.mRenderTarget->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, osg::FrameBufferAttachment(subPass.mRenderTexture));
+                    subPass.mStateSet->setAttributeAndModes(new osg::Viewport(0, 0, w, h));
+
+                    node.mRootStateSet->setTextureAttributeAndModes(subTexUnit, subPass.mRenderTexture);
+                    node.mRootStateSet->addUniform(new osg::Uniform(subPass.mRenderTexture->getName().c_str(), subTexUnit++));
+                }
+                node.mPasses.emplace_back(std::move(subPass));
+            }
+
+            data.emplace_back(std::move(node));
         }
 
-        void apply(osg::StateSet* stateset, osg::NodeVisitor* nv) override
+        size_t frameId = frame() % 2;
+
+        mPingPongCanvas->setCurrentFrameData(frameId, std::move(data));
+
+        if (auto hud = MWBase::Environment::get().getWindowManager()->getPostProcessorHud())
+            hud->updateTechniques();
+
+        mRendering.getSkyManager()->setSunglare(sunglare);
+    }
+
+    bool PostProcessor::enableTechnique(std::shared_ptr<fx::Technique> technique, std::optional<int> location)
+    {
+        if (!technique || technique->getName() == "main" || (location.has_value() && location.value() <= 0))
+            return false;
+
+        disableTechnique(technique, false);
+
+        int pos = std::min<int>(location.value_or(mTechniques.size()), mTechniques.size());
+
+        mTechniques.insert(mTechniques.begin() + pos, technique);
+        dirtyTechniques();
+
+        return true;
+    }
+
+    bool PostProcessor::disableTechnique(std::shared_ptr<fx::Technique> technique, bool dirty)
+    {
+        for (size_t i = 1; i < mTechniques.size(); ++i)
         {
-            if (Stereo::getMultiview())
+            if (technique.get() == mTechniques[i].get())
             {
-                auto& multiviewFbo = Stereo::Manager::instance().multiviewFramebuffer();
-                stateset->setTextureAttributeAndModes(0, multiviewFbo->multiviewColorBuffer(), osg::StateAttribute::ON);
+                mTechniques.erase(mTechniques.begin() + i);
+                if (dirty)
+                    dirtyTechniques();
+                return true;
             }
         }
 
-        void applyLeft(osg::StateSet* stateset, osgUtil::CullVisitor* cv) override
+        return false;
+    }
+
+    bool PostProcessor::isTechniqueEnabled(const std::shared_ptr<fx::Technique>& technique) const
+    {
+        for (const auto& t : mTechniques)
         {
-            auto& multiviewFbo = Stereo::Manager::instance().multiviewFramebuffer();
-            stateset->setTextureAttributeAndModes(0, multiviewFbo->layerColorBuffer(0), osg::StateAttribute::ON);
-
-            auto viewport = static_cast<osg::Viewport*>(stateset->getAttribute(osg::StateAttribute::VIEWPORT));
-            auto fullViewport = mHUDCamera->getViewport();
-            viewport->setViewport(
-                0,
-                0,
-                fullViewport->width() / 2,
-                fullViewport->height()
-            );
+            if (technique.get() == t.get())
+                return technique->isValid();
         }
 
-        void applyRight(osg::StateSet* stateset, osgUtil::CullVisitor* cv) override
+        return false;
+    }
+
+    void PostProcessor::createTexturesAndCamera(size_t frameId)
+    {
+        auto& textures = mTextures[frameId];
+
+        for (auto& texture : textures)
         {
-            auto& multiviewFbo = Stereo::Manager::instance().multiviewFramebuffer();
-            stateset->setTextureAttributeAndModes(0, multiviewFbo->layerColorBuffer(1), osg::StateAttribute::ON);
-
-            auto viewport = static_cast<osg::Viewport*>(stateset->getAttribute(osg::StateAttribute::VIEWPORT));
-            auto fullViewport = mHUDCamera->getViewport();
-            viewport->setViewport(
-                fullViewport->width() / 2,
-                0,
-                fullViewport->width() / 2,
-                fullViewport->height()
-            );
+            if (!texture)
+                texture = new osg::Texture2D;
+            texture->setTextureSize(mWidth, mHeight);
+            texture->setSourceFormat(GL_RGBA);
+            texture->setSourceType(GL_UNSIGNED_BYTE);
+            texture->setInternalFormat(GL_RGBA);
+            texture->setFilter(osg::Texture2D::MIN_FILTER, osg::Texture::LINEAR);
+            texture->setFilter(osg::Texture2D::MAG_FILTER, osg::Texture::LINEAR);
+            texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+            texture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+            texture->setResizeNonPowerOfTwoHint(false);
         }
 
-    private:
-        osg::ref_ptr<osg::Camera> mHUDCamera;
-        osg::ref_ptr<osg::Program> mProgram;
-        osg::ref_ptr<osg::Texture2D> mSceneTex;
-    };
+        textures[Tex_Normal]->setSourceFormat(GL_RGB);
+        textures[Tex_Normal]->setInternalFormat(GL_RGB);
 
-    void PostProcessor::createTexturesAndCamera(int width, int height)
-    {
-        mDepthTex = new osg::Texture2D;
-        mDepthTex->setTextureSize(width, height);
-        mDepthTex->setSourceFormat(SceneUtil::AutoDepth::depthSourceFormat());
-        mDepthTex->setSourceType(SceneUtil::AutoDepth::depthSourceType());
-        mDepthTex->setInternalFormat(SceneUtil::AutoDepth::depthInternalFormat());
-        mDepthTex->setFilter(osg::Texture2D::MIN_FILTER, osg::Texture2D::NEAREST);
-        mDepthTex->setFilter(osg::Texture2D::MAG_FILTER, osg::Texture2D::NEAREST);
-        mDepthTex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
-        mDepthTex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
-        mDepthTex->setResizeNonPowerOfTwoHint(false);
-
-        if (Settings::Manager::getBool("soft particles", "Shaders"))
+        if (mMainTemplate)
+        {
+            textures[Tex_Scene]->setSourceFormat(mMainTemplate->getSourceFormat());
+            textures[Tex_Scene]->setSourceType(mMainTemplate->getSourceType());
+            textures[Tex_Scene]->setInternalFormat(mMainTemplate->getInternalFormat());
+            textures[Tex_Scene]->setFilter(osg::Texture2D::MIN_FILTER, mMainTemplate->getFilter(osg::Texture2D::MIN_FILTER));
+            textures[Tex_Scene]->setFilter(osg::Texture2D::MAG_FILTER, mMainTemplate->getFilter(osg::Texture2D::MAG_FILTER));
+            textures[Tex_Scene]->setWrap(osg::Texture::WRAP_S, mMainTemplate->getWrap(osg::Texture2D::WRAP_S));
+            textures[Tex_Scene]->setWrap(osg::Texture::WRAP_T, mMainTemplate->getWrap(osg::Texture2D::WRAP_T));
+        }
+
+        auto setupDepth = [] (osg::Texture2D* tex) {
+            tex->setSourceFormat(GL_DEPTH_STENCIL_EXT);
+            tex->setSourceType(SceneUtil::AutoDepth::depthSourceType());
+            tex->setInternalFormat(SceneUtil::AutoDepth::depthInternalFormat());
+        };
+
+        setupDepth(textures[Tex_Depth]);
+
+        if (mDisableDepthPasses)
+        {
+            textures[Tex_OpaqueDepth] = nullptr;
+        }
+        else
         {
-            mOpaqueDepthTex = new osg::Texture2D(*mDepthTex);
-            mOpaqueDepthTex->setName("opaqueTexMap");
+            setupDepth(textures[Tex_OpaqueDepth]);
+            textures[Tex_OpaqueDepth]->setName("opaqueTexMap");
         }
 
-        mSceneTex = new osg::Texture2D;
-        mSceneTex->setTextureSize(width, height);
-        mSceneTex->setSourceFormat(SceneUtil::Color::colorSourceFormat());
-        mSceneTex->setSourceType(SceneUtil::Color::colorSourceType());
-        mSceneTex->setInternalFormat(SceneUtil::Color::colorInternalFormat());
-        mSceneTex->setFilter(osg::Texture2D::MIN_FILTER, osg::Texture2D::NEAREST);
-        mSceneTex->setFilter(osg::Texture2D::MAG_FILTER, osg::Texture2D::NEAREST);
-        mSceneTex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
-        mSceneTex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
-        mSceneTex->setResizeNonPowerOfTwoHint(false);
+        if (mHUDCamera)
+            return;
 
         mHUDCamera = new osg::Camera;
         mHUDCamera->setReferenceFrame(osg::Camera::ABSOLUTE_RF);
@@ -358,64 +700,106 @@ namespace MWRender
         mHUDCamera->setClearMask(0);
         mHUDCamera->setProjectionMatrix(osg::Matrix::ortho2D(0, 1, 0, 1));
         mHUDCamera->setAllowEventFocus(false);
-        mHUDCamera->setViewport(0, 0, width, height);
+        mHUDCamera->setViewport(0, 0, mWidth, mHeight);
 
-        // Shaders calculate correct UV coordinates for our fullscreen triangle
-        constexpr char vertSrc[] = R"GLSL(
-            #version 120
+        mViewer->getCamera()->removeCullCallback(mPingPongCull);
+        mPingPongCull = new PingPongCull;
+        mViewer->getCamera()->addCullCallback(mPingPongCull);
 
-            varying vec2 uv;
+        mPingPongCanvas = new PingPongCanvas(mRendering.getResourceSystem()->getSceneManager()->getShaderManager());
 
-            void main()
-            {
-                gl_Position = vec4(gl_Vertex.xy, 0.0, 1.0);
-                uv = gl_Position.xy * 0.5 + 0.5;
-            }
-        )GLSL";
+        mHUDCamera->addChild(mPingPongCanvas);
+        mHUDCamera->setNodeMask(Mask_RenderToTexture);
 
-        constexpr char fragSrc[] = R"GLSL(
-            #version 120
+        mHUDCamera->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+        mHUDCamera->getOrCreateStateSet()->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
+    }
 
-            varying vec2 uv;
-            uniform sampler2D sceneTex;
+    std::shared_ptr<fx::Technique> PostProcessor::loadTechnique(const std::string& name, bool insert)
+    {
+        if (!isEnabled())
+            return nullptr;
 
-            void main()
-            {
-                gl_FragData[0] = texture2D(sceneTex, uv);
-            }
-        )GLSL";
+        for (size_t i = 0; i < mTemplates.size(); ++i)
+            if (name == mTemplates[i]->getName())
+                return mTemplates[i];
 
-        constexpr char fragSrcMultiview[] = R"GLSL(
-            #version 330 compatibility
+        auto technique = std::make_shared<fx::Technique>(*mVFS, *mRendering.getResourceSystem()->getImageManager(), name, mWidth, mHeight, mUBO, mNormalsSupported);
 
-            #extension GL_EXT_texture_array : require
+        technique->compile();
 
-            varying vec2 uv;
-            uniform sampler2DArray sceneTex;
+        if (technique->getStatus() != fx::Technique::Status::File_Not_exists)
+            technique->setLastModificationTime(std::filesystem::last_write_time(mTechniqueFileMap[technique->getName()]), false);
 
-            void main()
+        if (!insert)
+            return technique;
+
+        reloadMainPass(*technique);
+
+        mTemplates.push_back(std::move(technique));
+
+        return mTemplates.back();
+    }
+
+    void PostProcessor::addTemplate(std::shared_ptr<fx::Technique> technique)
+    {
+        if (!isEnabled())
+            return;
+
+        for (size_t i = 0; i < mTemplates.size(); ++i)
+            if (technique.get() == mTemplates[i].get())
+                return;
+
+        mTemplates.push_back(technique);
+    }
+
+    void PostProcessor::reloadTechniques()
+    {
+        if (!isEnabled())
+            return;
+
+        mTechniques.clear();
+
+        std::vector<std::string> techniqueStrings;
+        Misc::StringUtils::split(Settings::Manager::getString("chain", "Post Processing"), techniqueStrings, ",");
+
+        techniqueStrings.insert(techniqueStrings.begin(), "main");
+
+        for (auto& techniqueName : techniqueStrings)
+        {
+            Misc::StringUtils::trim(techniqueName);
+
+            if (techniqueName.empty())
+                continue;
+
+            if ((&techniqueName != &techniqueStrings.front()) && Misc::StringUtils::ciEqual(techniqueName, "main"))
             {
-                vec3 array_uv = vec3(uv.x * 2, uv.y, 0);
-                if(array_uv.x >= 1.0)
-                {
-                    array_uv.x -= 1.0;
-                    array_uv.z = 1;
-                }
-                gl_FragData[0] = texture2DArray(sceneTex, array_uv);
+                Log(Debug::Warning) << "main.omwfx techniqued specified in chain, this is not allowed. technique file will be ignored if it exists.";
+                continue;
             }
-        )GLSL";
 
-        osg::ref_ptr<osg::Shader> vertShader = new osg::Shader(osg::Shader::VERTEX, vertSrc);
-        osg::ref_ptr<osg::Shader> fragShader = new osg::Shader(osg::Shader::FRAGMENT, Stereo::getMultiview() ? fragSrcMultiview : fragSrc);
+            mTechniques.push_back(loadTechnique(techniqueName));
+        }
+
+        dirtyTechniques();
+    }
 
-        osg::ref_ptr<osg::Program> program = new osg::Program;
-        program->addShader(vertShader);
-        program->addShader(fragShader);
+    void PostProcessor::reloadMainPass(fx::Technique& technique)
+    {
+        if (!technique.getMainTemplate())
+            return;
 
-        mHUDCamera->addChild(createFullScreenTri());
-        mHUDCamera->setNodeMask(Mask_RenderToTexture);
-        mHUDCamera->setCullCallback(new HUDCameraStatesetUpdater(mHUDCamera, program, mSceneTex));
+        mMainTemplate = technique.getMainTemplate();
+
+        resize();
     }
 
+    void PostProcessor::toggleMode()
+    {
+        for (auto& technique : mTemplates)
+            technique->compile();
+
+        dirtyTechniques();
+    }
 }
 
diff --git a/apps/openmw/mwrender/postprocessor.hpp b/apps/openmw/mwrender/postprocessor.hpp
index b1217b011b..8560b76eaa 100644
--- a/apps/openmw/mwrender/postprocessor.hpp
+++ b/apps/openmw/mwrender/postprocessor.hpp
@@ -1,11 +1,26 @@
 #ifndef OPENMW_MWRENDER_POSTPROCESSOR_H
 #define OPENMW_MWRENDER_POSTPROCESSOR_H
 
+#include <array>
+#include <vector>
+#include <string>
+#include <unordered_map>
+
+#include <filesystem>
+
 #include <osg/Texture2D>
 #include <osg/Group>
 #include <osg/FrameBufferObject>
 #include <osg/Camera>
-#include <osg/ref_ptr>
+
+#include <osgViewer/Viewer>
+
+#include <components/fx/stateupdater.hpp>
+#include <components/fx/technique.hpp>
+#include <components/debug/debuglog.hpp>
+
+#include "pingpongcanvas.hpp"
+#include "transparentpass.hpp"
 
 #include <memory>
 
@@ -19,38 +34,197 @@ namespace Stereo
     class MultiviewFramebuffer;
 }
 
+namespace VFS
+{
+    class Manager;
+}
+
+namespace Shader
+{
+    class ShaderManager;
+}
+
 namespace MWRender
 {
-    class PostProcessor : public osg::Referenced
+    class RenderingManager;
+    class PingPongCull;
+    class PingPongCanvas;
+    class TransparentDepthBinCallback;
+
+    class PostProcessor : public osg::Group
     {
     public:
-        PostProcessor(osgViewer::Viewer* viewer, osg::Group* rootNode);
+        using FBOArray = std::array<osg::ref_ptr<osg::FrameBufferObject>, 5>;
+        using TextureArray = std::array<osg::ref_ptr<osg::Texture2D>, 5>;
+        using TechniqueList = std::vector<std::shared_ptr<fx::Technique>>;
+
+        enum TextureIndex
+        {
+            Tex_Scene,
+            Tex_Scene_LDR,
+            Tex_Depth,
+            Tex_OpaqueDepth,
+            Tex_Normal
+        };
+
+        enum FBOIndex
+        {
+            FBO_Primary,
+            FBO_Multisample,
+            FBO_FirstPerson,
+            FBO_OpaqueDepth,
+            FBO_Intercept
+        };
+
+        enum TextureUnits
+        {
+            Unit_LastShader = 0,
+            Unit_LastPass,
+            Unit_Depth,
+            Unit_EyeAdaptation,
+            Unit_Normals,
+            Unit_NextFree
+        };
+
+        PostProcessor(RenderingManager& rendering, osgViewer::Viewer* viewer, osg::Group* rootNode, const VFS::Manager* vfs);
+
+        ~PostProcessor();
+
+        void traverse(osg::NodeVisitor& nv) override;
+
+        osg::ref_ptr<osg::FrameBufferObject> getFbo(FBOIndex index, unsigned int frameId) { return mFbos[frameId][index]; }
+
+        osg::ref_ptr<osg::Texture2D> getTexture(TextureIndex index, unsigned int frameId) { return mTextures[frameId][index]; }
+
+        osg::ref_ptr<osg::FrameBufferObject> getPrimaryFbo(unsigned int frameId) { return mFbos[frameId][FBO_Multisample] ? mFbos[frameId][FBO_Multisample] : mFbos[frameId][FBO_Primary]; }
+
+        osg::ref_ptr<fx::StateUpdater> getStateUpdater() { return mStateUpdater; }
+
+        const TechniqueList& getTechniques() { return mTechniques; }
+
+        const TechniqueList& getTemplates() const { return mTemplates; }
+
+        osg::ref_ptr<PingPongCanvas> getCanvas() { return mPingPongCanvas; }
+
+        const auto& getTechniqueMap() const { return mTechniqueFileMap; }
+
+        void resize();
+
+        bool enableTechnique(std::shared_ptr<fx::Technique> technique, std::optional<int> location = std::nullopt);
+
+        bool disableTechnique(std::shared_ptr<fx::Technique> technique, bool dirty = true);
+
+        bool getSupportsNormalsRT() const { return mNormalsSupported; }
+
+        template <class T>
+        void setUniform(std::shared_ptr<fx::Technique> technique, const std::string& name, const T& value)
+        {
+            if (!isEnabled())
+                return;
+
+            auto it = technique->findUniform(name);
 
-        auto getMsaaFbo() { return mMsaaFbo; }
-        auto getFbo() { return mFbo; }
-        auto getFirstPersonRBProxy() { return mFirstPersonDepthRBProxy; }
+            if (it == technique->getUniformMap().end())
+                return;
 
-        osg::ref_ptr<osg::Texture2D> getOpaqueDepthTex() { return mOpaqueDepthTex; }
+            if ((*it)->mStatic)
+            {
+                Log(Debug::Warning) << "Attempting to set a configration variable [" << name << "] as a uniform";
+                return;
+            }
 
-        void resize(int width, int height);
+            (*it)->setValue(value);
+        }
+
+        bool isTechniqueEnabled(const std::shared_ptr<fx::Technique>& technique) const;
+
+        void setExteriorFlag(bool exterior) { mExteriorFlag = exterior; }
+
+        void setUnderwaterFlag(bool underwater) { mUnderwater = underwater; }
+
+        void toggleMode();
+
+        std::shared_ptr<fx::Technique> loadTechnique(const std::string& name, bool insert=true);
+
+        void addTemplate(std::shared_ptr<fx::Technique> technique);
+
+        bool isEnabled() const { return mUsePostProcessing && mEnabled; }
+
+        bool softParticlesEnabled() const {return mSoftParticles; }
+
+        bool getHDR() const { return mHDR; }
+
+        void disable();
+
+        void enable(bool usePostProcessing = true);
+
+        void setRenderTargetSize(int width, int height) { mWidth = width; mHeight = height; }
 
     private:
-        void createTexturesAndCamera(int width, int height);
+        size_t frame() const { return mViewer->getFrameStamp()->getFrameNumber(); }
+
+        void createObjectsForFrame(size_t frameId);
+
+        void createTexturesAndCamera(size_t frameId);
+
+        void reloadTechniques();
+
+        void reloadMainPass(fx::Technique& technique);
+
+        void dirtyTechniques();
+
+        void update(size_t frameId);
+
+        void cull(size_t frameId, osgUtil::CullVisitor* cv);
 
-        osgViewer::Viewer* mViewer;
         osg::ref_ptr<osg::Group> mRootNode;
         osg::ref_ptr<osg::Camera> mHUDCamera;
 
-        std::shared_ptr<Stereo::MultiviewFramebuffer> mMultiviewFbo;
-        osg::ref_ptr<osg::FrameBufferObject> mMsaaFbo;
-        osg::ref_ptr<osg::FrameBufferObject> mFbo;
-        osg::ref_ptr<osg::RenderBuffer> mFirstPersonDepthRBProxy;
+        std::array<TextureArray, 2> mTextures;
+        std::array<FBOArray, 2> mFbos;
+
+        TechniqueList mTechniques;
+        TechniqueList mTemplates;
+
+        std::unordered_map<std::string, std::filesystem::path> mTechniqueFileMap;
+
+        int mSamples;
+
+        bool mDirty;
+        size_t mDirtyFrameId;
 
-        osg::ref_ptr<osg::Texture2D> mSceneTex;
-        osg::ref_ptr<osg::Texture2D> mDepthTex;
-        osg::ref_ptr<osg::Texture2D> mOpaqueDepthTex;
+        RenderingManager& mRendering;
+        osgViewer::Viewer* mViewer;
+        const VFS::Manager* mVFS;
+
+        bool mReload;
+        bool mEnabled;
+        bool mUsePostProcessing;
+        bool mSoftParticles;
+        bool mDisableDepthPasses;
+
+        size_t mLastFrameNumber;
+        float mLastSimulationTime;
+
+        bool mExteriorFlag;
+        bool mUnderwater;
+        bool mHDR;
+        bool mNormals;
+        bool mPrevNormals;
+        bool mNormalsSupported;
+        bool mUBO;
+        int mGLSLVersion;
+
+        osg::ref_ptr<osg::Texture2D> mMainTemplate;
+
+        osg::ref_ptr<fx::StateUpdater> mStateUpdater;
+        osg::ref_ptr<PingPongCull> mPingPongCull;
+        osg::ref_ptr<PingPongCanvas> mPingPongCanvas;
+        osg::ref_ptr<TransparentDepthBinCallback> mTransparentDepthPostPass;
+    
+        int mWidth;
+        int mHeight;
     };
 }
 
 #endif
-
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 24e37a93ea..359b2e0f9d 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -54,7 +54,9 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/groundcoverstore.hpp"
 #include "../mwgui/loadingscreen.hpp"
+#include "../mwgui/postprocessorhud.hpp"
 #include "../mwmechanics/actorutil.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 #include "sky.hpp"
 #include "effectmanager.hpp"
@@ -114,7 +116,7 @@ namespace MWRender
             mProjectionMatrix = projectionMatrix;
         }
 
-        const osg::Matrixf& projectionMatrix() const
+        const osg::Matrixf& getProjectionMatrix() const
         {
             return mProjectionMatrix;
         }
@@ -208,7 +210,6 @@ namespace MWRender
             mPlayerPos = playerPos;
         }
 
-
     private:
         float mLinearFac;
         float mNear;
@@ -411,9 +412,11 @@ namespace MWRender
         globalDefines["clamp"] = Settings::Manager::getBool("clamp lighting", "Shaders") ? "1" : "0";
         globalDefines["preLightEnv"] = Settings::Manager::getBool("apply lighting to environment maps", "Shaders") ? "1" : "0";
         globalDefines["radialFog"] = Settings::Manager::getBool("radial fog", "Shaders") ? "1" : "0";
+        globalDefines["refraction_enabled"] = "0";
         globalDefines["useGPUShader4"] = "0";
         globalDefines["useOVR_multiview"] = "0";
         globalDefines["numViews"] = "1";
+        globalDefines["disableNormals"] = "1";
 
         for (auto itr = lightDefines.begin(); itr != lightDefines.end(); itr++)
             globalDefines[itr->first] = itr->second;
@@ -502,12 +505,9 @@ namespace MWRender
         mPerViewUniformStateUpdater = new PerViewUniformStateUpdater();
         rootNode->addCullCallback(mPerViewUniformStateUpdater);
 
-        mPostProcessor = new PostProcessor(viewer, mRootNode);
-        resourceSystem->getSceneManager()->setDepthFormat(SceneUtil::AutoDepth::depthInternalFormat());
-        resourceSystem->getSceneManager()->setOpaqueDepthTex(mPostProcessor->getOpaqueDepthTex());
-
-        if (reverseZ && !SceneUtil::isFloatingPointDepthFormat(SceneUtil::AutoDepth::depthInternalFormat()))
-            Log(Debug::Warning) << "Floating point depth format not in use but reverse-z buffer is enabled, consider disabling it.";
+        mPostProcessor = new PostProcessor(*this, viewer, mRootNode, resourceSystem->getVFS());
+        resourceSystem->getSceneManager()->setOpaqueDepthTex(mPostProcessor->getTexture(PostProcessor::Tex_OpaqueDepth, 0), mPostProcessor->getTexture(PostProcessor::Tex_OpaqueDepth, 1));
+        resourceSystem->getSceneManager()->setSupportsNormalsRT(mPostProcessor->getSupportsNormalsRT());
 
         // water goes after terrain for correct waterculling order
         mWater.reset(new Water(sceneRoot->getParent(0), sceneRoot, mResourceSystem, mViewer->getIncrementalCompileOperation(), resourcePath));
@@ -692,9 +692,10 @@ namespace MWRender
 
     void RenderingManager::configureAmbient(const ESM::Cell *cell)
     {
+        bool isInterior = !cell->isExterior() && !(cell->mData.mFlags & ESM::Cell::QuasiEx);
         bool needsAdjusting = false;
         if (mResourceSystem->getSceneManager()->getLightingMethod() != SceneUtil::LightingMethod::FFP)
-            needsAdjusting = !cell->isExterior() && !(cell->mData.mFlags & ESM::Cell::QuasiEx);
+            needsAdjusting = isInterior;
 
         auto ambient = SceneUtil::colourFromRGB(cell->mAmbi.mAmbient);
 
@@ -724,11 +725,14 @@ namespace MWRender
         mSunLight->setPosition(osg::Vec4f(-0.15f, 0.15f, 1.f, 0.f));
     }
 
-    void RenderingManager::setSunColour(const osg::Vec4f& diffuse, const osg::Vec4f& specular)
+    void RenderingManager::setSunColour(const osg::Vec4f& diffuse, const osg::Vec4f& specular, float sunVis)
     {
         // need to wrap this in a StateUpdater?
         mSunLight->setDiffuse(diffuse);
         mSunLight->setSpecular(specular);
+
+        mPostProcessor->getStateUpdater()->setSunColor(diffuse);
+        mPostProcessor->getStateUpdater()->setSunVis(sunVis);
     }
 
     void RenderingManager::setSunDirection(const osg::Vec3f &direction)
@@ -738,6 +742,8 @@ namespace MWRender
         mSunLight->setPosition(osg::Vec4(position.x(), position.y(), position.z(), 0));
 
         mSky->setSunDirection(position);
+
+        mPostProcessor->getStateUpdater()->setSunPos(mSunLight->getPosition(), mNight);
     }
 
     void RenderingManager::addCell(const MWWorld::CellStore *store)
@@ -779,6 +785,7 @@ namespace MWRender
             mShadowManager->enableOutdoorMode();
         else
             mShadowManager->enableIndoorMode();
+        mPostProcessor->getStateUpdater()->setIsInterior(!enabled);
     }
 
     bool RenderingManager::toggleBorders()
@@ -877,9 +884,28 @@ namespace MWRender
         mCamera->update(dt, paused);
 
         bool isUnderwater = mWater->isUnderwater(mCamera->getPosition());
-        mStateUpdater->setFogStart(mFog->getFogStart(isUnderwater));
-        mStateUpdater->setFogEnd(mFog->getFogEnd(isUnderwater));
-        setFogColor(mFog->getFogColor(isUnderwater));
+
+        float fogStart = mFog->getFogStart(isUnderwater);
+        float fogEnd = mFog->getFogEnd(isUnderwater);
+        osg::Vec4f fogColor = mFog->getFogColor(isUnderwater);
+
+        mStateUpdater->setFogStart(fogStart);
+        mStateUpdater->setFogEnd(fogEnd);
+        setFogColor(fogColor);
+
+        auto world = MWBase::Environment::get().getWorld();
+        const auto& stateUpdater = mPostProcessor->getStateUpdater();
+
+        stateUpdater->setFogRange(fogStart, fogEnd);
+        stateUpdater->setNearFar(mNearClip, mViewDistance);
+        stateUpdater->setIsUnderwater(isUnderwater);
+        stateUpdater->setFogColor(fogColor);
+        stateUpdater->setGameHour(world->getTimeStamp().getHour());
+        stateUpdater->setWeatherId(world->getCurrentWeather());
+        stateUpdater->setNextWeatherId(world->getNextWeather());
+        stateUpdater->setWeatherTransition(world->getWeatherTransition());
+        stateUpdater->setWindSpeed(world->getWindSpeed());
+        mPostProcessor->setUnderwaterFlag(isUnderwater);
     }
 
     void RenderingManager::updatePlayerPtr(const MWWorld::Ptr &ptr)
@@ -939,6 +965,8 @@ namespace MWRender
         mWater->setCullCallback(mTerrain->getHeightCullCallback(height, Mask_Water));
         mWater->setHeight(height);
         mSky->setWaterHeight(height);
+
+        mPostProcessor->getStateUpdater()->setWaterHeight(height);
     }
 
     void RenderingManager::screenshot(osg::Image* image, int w, int h)
@@ -1131,6 +1159,11 @@ namespace MWRender
         return mObjects->getAnimation(ptr);
     }
 
+    PostProcessor* RenderingManager::getPostProcessor()
+    {
+        return mPostProcessor;
+    }
+
     void RenderingManager::setupPlayer(const MWWorld::Ptr &player)
     {
         if (!mPlayerNode)
@@ -1218,9 +1251,9 @@ namespace MWRender
         {
             auto res = Stereo::Manager::instance().eyeResolution();
             mSharedUniformStateUpdater->setScreenRes(res.x(), res.y());
-            Stereo::Manager::instance().setMasterProjectionMatrix(mPerViewUniformStateUpdater->projectionMatrix());
+            Stereo::Manager::instance().setMasterProjectionMatrix(mPerViewUniformStateUpdater->getProjectionMatrix());
         }
-        else
+        else if (!mPostProcessor->isEnabled())
         {
             mSharedUniformStateUpdater->setScreenRes(width, height);
         }
@@ -1229,6 +1262,17 @@ namespace MWRender
         // Limit FOV here just for sure, otherwise viewing distance can be too high.
         float distanceMult = std::cos(osg::DegreesToRadians(std::min(fov, 140.f))/2.f);
         mTerrain->setViewDistance(mViewDistance * (distanceMult ? 1.f/distanceMult : 1.f));
+
+        if (mPostProcessor)
+        {
+            mPostProcessor->getStateUpdater()->setProjectionMatrix(mPerViewUniformStateUpdater->getProjectionMatrix());
+            mPostProcessor->getStateUpdater()->setFov(fov);
+        }
+    }
+
+    void RenderingManager::setScreenRes(int width, int height)
+    {
+        mSharedUniformStateUpdater->setScreenRes(width, height);
     }
 
     void RenderingManager::updateTextureFiltering()
@@ -1335,6 +1379,17 @@ namespace MWRender
                     mViewer->startThreading();
                 }
             }
+            else if (it->first == "Post Processing" && it->second == "enabled")
+            {
+                if (Settings::Manager::getBool("enabled", "Post Processing"))
+                    mPostProcessor->enable();
+                else
+                {
+                    mPostProcessor->disable();
+                    if (auto* hud = MWBase::Environment::get().getWindowManager()->getPostProcessorHud())
+                        hud->setVisible(false);
+                }
+            }
         }
 
         if (updateProjection)
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index 5b5c28b198..850b1c5a39 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -128,7 +128,8 @@ namespace MWRender
         void skySetMoonColour(bool red);
 
         void setSunDirection(const osg::Vec3f& direction);
-        void setSunColour(const osg::Vec4f& diffuse, const osg::Vec4f& specular);
+        void setSunColour(const osg::Vec4f& diffuse, const osg::Vec4f& specular, float sunVis);
+        void setNight(bool isNight) { mNight = isNight; }
 
         void configureAmbient(const ESM::Cell* cell);
         void configureFog(const ESM::Cell* cell);
@@ -192,6 +193,8 @@ namespace MWRender
         Animation* getAnimation(const MWWorld::Ptr& ptr);
         const Animation* getAnimation(const MWWorld::ConstPtr& ptr) const;
 
+        PostProcessor* getPostProcessor();
+
         void addWaterRippleEmitter(const MWWorld::Ptr& ptr);
         void removeWaterRippleEmitter(const MWWorld::Ptr& ptr);
         void emitWaterRipple(const osg::Vec3f& pos);
@@ -247,6 +250,8 @@ namespace MWRender
 
         void updateProjectionMatrix();
 
+        void setScreenRes(int width, int height);
+
     private:
         void updateTextureFiltering();
         void updateAmbient();
@@ -310,6 +315,7 @@ namespace MWRender
         float mFieldOfView;
         float mFirstPersonFieldOfView;
         bool mUpdateProjectionMatrix = false;
+        bool mNight = false;
 
         void operator = (const RenderingManager&);
         RenderingManager(const RenderingManager&);
diff --git a/apps/openmw/mwrender/screenshotmanager.cpp b/apps/openmw/mwrender/screenshotmanager.cpp
index 65b6a1bdbc..64961bf037 100644
--- a/apps/openmw/mwrender/screenshotmanager.cpp
+++ b/apps/openmw/mwrender/screenshotmanager.cpp
@@ -106,17 +106,16 @@ namespace MWRender
 
             if (ext)
             {
+                size_t frameId = renderInfo.getState()->getFrameStamp()->getFrameNumber() % 2;
                 osg::FrameBufferObject* fbo = nullptr;
+
                 if (Stereo::getStereo())
                     fbo = Stereo::Manager::instance().multiviewFramebuffer()->layerFbo(0);
-                else if (postProcessor)
-                    fbo = postProcessor->getFbo();
+                else if (postProcessor && postProcessor->getFbo(PostProcessor::FBO_Primary, frameId))
+                    fbo = postProcessor->getFbo(PostProcessor::FBO_Primary, frameId);
 
                 if (fbo)
-                {
-                    ext->glBindFramebuffer(GL_FRAMEBUFFER_EXT, fbo->getHandle(renderInfo.getContextID()));
-                    renderInfo.getState()->glReadBuffer(GL_COLOR_ATTACHMENT0_EXT);
-                }
+                    fbo->apply(*renderInfo.getState(), osg::FrameBufferObject::READ_FRAMEBUFFER);
             }
 
             mImage->readPixels(leftPadding, topPadding, width, height, GL_RGB, GL_UNSIGNED_BYTE);
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index f0a591477a..d8add9a685 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -248,6 +248,7 @@ namespace MWRender
         , mBaseWindSpeed(0.f)
         , mEnabled(true)
         , mSunEnabled(true)
+        , mSunglareEnabled(true)
         , mPrecipitationAlpha(0.f)
         , mDirtyParticlesEffect(false)
     {
@@ -303,6 +304,7 @@ namespace MWRender
         atmosphereNight->addUpdateCallback(mAtmosphereNightUpdater);
 
         mSun.reset(new Sun(mEarlyRenderBinRoot, *mSceneManager));
+        mSun->setSunglare(mSunglareEnabled);
         mMasser.reset(new Moon(mEarlyRenderBinRoot, *mSceneManager, Fallback::Map::getFloat("Moons_Masser_Size")/125, Moon::Type_Masser));
         mSecunda.reset(new Moon(mEarlyRenderBinRoot, *mSceneManager, Fallback::Map::getFloat("Moons_Secunda_Size")/125, Moon::Type_Secunda));
 
@@ -776,6 +778,14 @@ namespace MWRender
         return mBaseWindSpeed;
     }
 
+    void SkyManager::setSunglare(bool enabled)
+    {
+        mSunglareEnabled = enabled;
+
+        if (mSun)
+            mSun->setSunglare(mSunglareEnabled);
+    }
+
     void SkyManager::sunEnable()
     {
         if (!mCreated) return;
diff --git a/apps/openmw/mwrender/sky.hpp b/apps/openmw/mwrender/sky.hpp
index e2ceae45f4..1fdf476bd5 100644
--- a/apps/openmw/mwrender/sky.hpp
+++ b/apps/openmw/mwrender/sky.hpp
@@ -96,6 +96,8 @@ namespace MWRender
 
         float getBaseWindSpeed() const;
 
+        void setSunglare(bool enabled);
+
     private:
         void create();
         ///< no need to call this, automatically done on first enable()
@@ -184,6 +186,7 @@ namespace MWRender
 
         bool mEnabled;
         bool mSunEnabled;
+        bool mSunglareEnabled;
 
         float mPrecipitationAlpha;
         bool mDirtyParticlesEffect;
diff --git a/apps/openmw/mwrender/skyutil.cpp b/apps/openmw/mwrender/skyutil.cpp
index ec9e6e7635..843582064b 100644
--- a/apps/openmw/mwrender/skyutil.cpp
+++ b/apps/openmw/mwrender/skyutil.cpp
@@ -812,6 +812,12 @@ namespace MWRender
             mSunGlareCallback->setTimeOfDayFade(val);
     }
 
+    void Sun::setSunglare(bool enabled)
+    {
+        mSunGlareNode->setNodeMask(enabled ? ~0u : 0);
+        mSunFlashNode->setNodeMask(enabled ? ~0u : 0);
+    }
+
     osg::ref_ptr<osg::OcclusionQueryNode> Sun::createOcclusionQueryNode(osg::Group* parent, bool queryVisible)
     {
         osg::ref_ptr<osg::OcclusionQueryNode> oqn = new osg::OcclusionQueryNode;
diff --git a/apps/openmw/mwrender/skyutil.hpp b/apps/openmw/mwrender/skyutil.hpp
index a0d9ed72b4..604e5909e8 100644
--- a/apps/openmw/mwrender/skyutil.hpp
+++ b/apps/openmw/mwrender/skyutil.hpp
@@ -248,6 +248,7 @@ namespace MWRender
 
         void setDirection(const osg::Vec3f& direction);
         void setGlareTimeOfDayFade(float val);
+        void setSunglare(bool enabled);
 
     private:
         /// @param queryVisible If true, queries the amount of visible pixels. If false, queries the total amount of pixels.
diff --git a/apps/openmw/mwrender/transparentpass.cpp b/apps/openmw/mwrender/transparentpass.cpp
new file mode 100644
index 0000000000..8bb5713230
--- /dev/null
+++ b/apps/openmw/mwrender/transparentpass.cpp
@@ -0,0 +1,89 @@
+#include "transparentpass.hpp"
+
+#include <osg/BlendFunc>
+#include <osg/Texture2D>
+
+#include <osgUtil/RenderStage>
+
+#include <components/shader/shadermanager.hpp>
+
+namespace MWRender
+{
+        TransparentDepthBinCallback::TransparentDepthBinCallback(Shader::ShaderManager& shaderManager, bool postPass)
+            : mStateSet(new osg::StateSet)
+            , mPostPass(postPass)
+        {
+            osg::ref_ptr<osg::Image> image = new osg::Image;
+            image->allocateImage(1, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE);
+            image->setColor(osg::Vec4(1,1,1,1), 0, 0);
+
+            osg::ref_ptr<osg::Texture2D> dummyTexture = new osg::Texture2D(image);
+
+            constexpr osg::StateAttribute::OverrideValue modeOff = osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE;
+            constexpr osg::StateAttribute::OverrideValue modeOn = osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE;
+
+            mStateSet->setTextureAttributeAndModes(0, dummyTexture);
+
+            osg::ref_ptr<osg::Shader> vertex = shaderManager.getShader("blended_depth_postpass_vertex.glsl", {}, osg::Shader::VERTEX);
+            osg::ref_ptr<osg::Shader> fragment = shaderManager.getShader("blended_depth_postpass_fragment.glsl", {}, osg::Shader::FRAGMENT);
+
+            mStateSet->setAttributeAndModes(new osg::BlendFunc, modeOff);
+            mStateSet->setAttributeAndModes(shaderManager.getProgram(vertex, fragment), modeOn);
+
+            for (unsigned int unit = 1; unit < 8; ++unit)
+                mStateSet->setTextureMode(unit, GL_TEXTURE_2D, modeOff);
+        }
+
+        void TransparentDepthBinCallback::drawImplementation(osgUtil::RenderBin* bin, osg::RenderInfo& renderInfo, osgUtil::RenderLeaf*& previous)
+        {
+            osg::State& state = *renderInfo.getState();
+            osg::GLExtensions* ext = state.get<osg::GLExtensions>();
+
+            bool validFbo = false;
+            unsigned int frameId = state.getFrameStamp()->getFrameNumber() % 2;
+
+            const auto& fbo = mFbo[frameId];
+            const auto& msaaFbo = mMsaaFbo[frameId];
+            const auto& opaqueFbo = mOpaqueFbo[frameId];
+
+            if (bin->getStage()->getMultisampleResolveFramebufferObject() && bin->getStage()->getMultisampleResolveFramebufferObject() == fbo)
+                validFbo = true;
+            else if (bin->getStage()->getFrameBufferObject() && (bin->getStage()->getFrameBufferObject() == fbo || bin->getStage()->getFrameBufferObject() == msaaFbo))
+                validFbo = true;
+
+            if (!validFbo)
+            {
+                bin->drawImplementation(renderInfo, previous);
+                return;
+            }
+
+            const osg::Texture* tex = opaqueFbo->getAttachment(osg::FrameBufferObject::BufferComponent::PACKED_DEPTH_STENCIL_BUFFER).getTexture();
+
+            opaqueFbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
+
+            ext->glBlitFramebuffer(0, 0, tex->getTextureWidth(), tex->getTextureHeight(), 0, 0, tex->getTextureWidth(), tex->getTextureHeight(), GL_DEPTH_BUFFER_BIT, GL_NEAREST);
+
+            if (msaaFbo)
+                msaaFbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
+            else
+                fbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
+
+            // draws scene into primary attachments
+            bin->drawImplementation(renderInfo, previous);
+
+            if (!mPostPass)
+                return;
+
+            opaqueFbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
+
+            osg::ref_ptr<osg::StateSet> restore = bin->getStateSet();
+            bin->setStateSet(mStateSet);
+            // draws transparent post-pass to populate a postprocess friendly depth texture with alpha-clipped geometry
+            bin->drawImplementation(renderInfo, previous);
+            bin->setStateSet(restore);
+
+            if (!msaaFbo)
+                fbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
+        }
+
+}
\ No newline at end of file
diff --git a/apps/openmw/mwrender/transparentpass.hpp b/apps/openmw/mwrender/transparentpass.hpp
new file mode 100644
index 0000000000..a933dde989
--- /dev/null
+++ b/apps/openmw/mwrender/transparentpass.hpp
@@ -0,0 +1,38 @@
+#ifndef OPENMW_MWRENDER_TRANSPARENTPASS_H
+#define OPENMW_MWRENDER_TRANSPARENTPASS_H
+
+#include <array>
+
+#include <osg/FrameBufferObject>
+#include <osg/StateSet>
+
+#include <osgUtil/RenderBin>
+
+#include "postprocessor.hpp"
+
+namespace Shader
+{
+    class ShaderManager;
+}
+
+namespace MWRender
+{
+    class TransparentDepthBinCallback : public osgUtil::RenderBin::DrawCallback
+    {
+    public:
+        TransparentDepthBinCallback(Shader::ShaderManager& shaderManager, bool postPass);
+
+        void drawImplementation(osgUtil::RenderBin* bin, osg::RenderInfo& renderInfo, osgUtil::RenderLeaf*& previous) override;
+
+        std::array<osg::ref_ptr<osg::FrameBufferObject>, 2> mFbo;
+        std::array<osg::ref_ptr<osg::FrameBufferObject>, 2> mMsaaFbo;
+        std::array<osg::ref_ptr<osg::FrameBufferObject>, 2> mOpaqueFbo;
+
+    private:
+        osg::ref_ptr<osg::StateSet> mStateSet;
+        bool mPostPass;
+    };
+
+}
+
+#endif
\ No newline at end of file
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index c67a206416..9896893da2 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -267,6 +267,7 @@ public:
         : RTTNode(rttSize, rttSize, 0, false, 1, StereoAwareness::Aware)
         , mNodeMask(Refraction::sDefaultCullMask)
     {
+        setDepthBufferInternalFormat(GL_DEPTH24_STENCIL8);
         mClipCullNode = new ClipCullNode;
     }
 
@@ -342,6 +343,7 @@ public:
         : RTTNode(rttSize, rttSize, 0, false, 0, StereoAwareness::Aware)
     {
         setInterior(isInterior);
+        setDepthBufferInternalFormat(GL_DEPTH24_STENCIL8);
         mClipCullNode = new ClipCullNode;
     }
 
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 0da47a9a74..db1b9e592f 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -27,6 +27,7 @@
 
 #include "../mwrender/renderingmanager.hpp"
 #include "../mwrender/landmanager.hpp"
+#include "../mwrender/postprocessor.hpp"
 
 #include "../mwphysics/physicssystem.hpp"
 #include "../mwphysics/actor.hpp"
@@ -860,6 +861,8 @@ namespace MWWorld
         MWBase::Environment::get().getWindowManager()->changeCell(mCurrentCell);
 
         mNavigator.wait(*loadingListener, DetourNavigator::WaitConditionType::requiredTilesPresent);
+
+        MWBase::Environment::get().getWorld()->getPostProcessor()->setExteriorFlag(cell->getCell()->mData.mFlags & ESM::Cell::QuasiEx);
     }
 
     void Scene::changeToExteriorCell (const ESM::Position& position, bool adjustPlayerPos, bool changeEvent)
@@ -879,6 +882,8 @@ namespace MWWorld
 
         if (changeEvent)
             MWBase::Environment::get().getWindowManager()->fadeScreenIn(0.5);
+
+        MWBase::Environment::get().getWorld()->getPostProcessor()->setExteriorFlag(true);
     }
 
     CellStore* Scene::getCurrentCell ()
diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index 16a0bef131..eb0226d506 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -786,6 +786,7 @@ namespace MWWorld
                 -0.268f, // approx tan( -15 degrees )
                 static_cast<float>(sin(theta)));
             mRendering.setSunDirection( final * -1 );
+            mRendering.setNight(is_night);
         }
 
         float underwaterFog = mUnderwaterFog.getValue(time.getHour(), mTimeSettings, "Fog");
@@ -807,7 +808,7 @@ namespace MWWorld
         mRendering.configureFog(mResult.mFogDepth, underwaterFog, mResult.mDLFogFactor,
                                 mResult.mDLFogOffset/100.0f, mResult.mFogColor);
         mRendering.setAmbientColour(mResult.mAmbientColor);
-        mRendering.setSunColour(mResult.mSunColor, mResult.mSunColor * mResult.mGlareView * glareFade);
+        mRendering.setSunColour(mResult.mSunColor, mResult.mSunColor * mResult.mGlareView * glareFade, mResult.mGlareView * glareFade);
 
         mRendering.getSkyManager()->setWeather(mResult);
 
@@ -857,11 +858,6 @@ namespace MWWorld
         mFastForward = !incremental ? true : mFastForward;
     }
 
-    unsigned int WeatherManager::getWeatherID() const
-    {
-        return mCurrentWeather;
-    }
-
     NightDayMode WeatherManager::getNightDayMode() const
     {
         return mNightDayMode;
diff --git a/apps/openmw/mwworld/weather.hpp b/apps/openmw/mwworld/weather.hpp
index b29ad9e994..21b690f7b6 100644
--- a/apps/openmw/mwworld/weather.hpp
+++ b/apps/openmw/mwworld/weather.hpp
@@ -307,7 +307,11 @@ namespace MWWorld
 
         void advanceTime(double hours, bool incremental);
 
-        unsigned int getWeatherID() const;
+        int getWeatherID() const { return mCurrentWeather; }
+
+        int getNextWeatherID() const { return mNextWeather; }
+
+        float getTransitionFactor() const { return mTransitionFactor; }
 
         bool useTorches(float hour) const;
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 851ba2daf4..78eeab79ff 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -55,6 +55,7 @@
 #include "../mwrender/renderingmanager.hpp"
 #include "../mwrender/camera.hpp"
 #include "../mwrender/vismask.hpp"
+#include "../mwrender/postprocessor.hpp"
 
 #include "../mwscript/globalscripts.hpp"
 
@@ -2045,6 +2046,16 @@ namespace MWWorld
         return mWeatherManager->getWeatherID();
     }
 
+    int World::getNextWeather() const
+    {
+        return mWeatherManager->getNextWeatherID();
+    }
+
+    float World::getWeatherTransition() const
+    {
+        return mWeatherManager->getTransitionFactor();
+    }
+
     unsigned int World::getNightDayMode() const
     {
         return mWeatherManager->getNightDayMode();
@@ -3986,4 +3997,8 @@ namespace MWWorld
         return mPrng;
     }
 
+    MWRender::PostProcessor* World::getPostProcessor()
+    {
+        return mRendering->getPostProcessor();
+    }
 }
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 8098c6ec20..088c4097aa 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -54,6 +54,7 @@ namespace MWRender
     class SkyManager;
     class Animation;
     class Camera;
+    class PostProcessor;
 }
 
 namespace ToUTF8
@@ -329,6 +330,10 @@ namespace MWWorld
 
             int getCurrentWeather() const override;
 
+            int getNextWeather() const override;
+
+            float getWeatherTransition() const override;
+
             unsigned int getNightDayMode() const override;
 
             int getMasserPhase() const override;
@@ -747,6 +752,8 @@ namespace MWWorld
             Misc::Rng::Generator& getPrng() override;
 
             MWRender::RenderingManager* getRenderingManager() override { return mRendering.get(); }
+
+            MWRender::PostProcessor* getPostProcessor() override;
     };
 }
 
diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index 7e42a49f66..b17e49207d 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -52,6 +52,7 @@ if (GTEST_FOUND AND GMOCK_FOUND)
         serialization/integration.cpp
 
         settings/parser.cpp
+        settings/shadermanager.cpp
 
         shader/parsedefines.cpp
         shader/parsefors.cpp
@@ -75,6 +76,9 @@ if (GTEST_FOUND AND GMOCK_FOUND)
         toutf8/toutf8.cpp
 
         esm4/includes.cpp
+
+        fx/lexer.cpp
+        fx/technique.cpp
     )
 
     source_group(apps\\openmw_test_suite FILES openmw_test_suite.cpp ${UNITTEST_SRC_FILES})
diff --git a/apps/openmw_test_suite/fx/lexer.cpp b/apps/openmw_test_suite/fx/lexer.cpp
new file mode 100644
index 0000000000..5024622a71
--- /dev/null
+++ b/apps/openmw_test_suite/fx/lexer.cpp
@@ -0,0 +1,216 @@
+#include <components/fx/lexer.hpp>
+
+#include <gtest/gtest.h>
+
+namespace
+{
+    using namespace testing;
+    using namespace fx::Lexer;
+
+    struct LexerTest : Test {};
+    
+    struct LexerSingleTokenTest : Test
+    {
+        template <class Token>
+        void test()
+        {
+            const std::string content = std::string(Token::repr);
+            Lexer lexer(content);
+
+            EXPECT_TRUE(std::holds_alternative<Token>(lexer.next()));
+        }
+    };
+
+    TEST_F(LexerSingleTokenTest, single_token_shared) { test<Shared>(); }
+    TEST_F(LexerSingleTokenTest, single_token_technique) { test<Technique>(); }
+    TEST_F(LexerSingleTokenTest, single_token_main_pass) { test<Main_Pass>(); }
+    TEST_F(LexerSingleTokenTest, single_token_render_target) { test<Render_Target>(); }
+    TEST_F(LexerSingleTokenTest, single_token_vertex) { test<Vertex>(); }
+    TEST_F(LexerSingleTokenTest, single_token_fragment) { test<Fragment>(); }
+    TEST_F(LexerSingleTokenTest, single_token_compute) { test<Compute>(); }
+    TEST_F(LexerSingleTokenTest, single_token_sampler_1d) { test<Sampler_1D>(); }
+    TEST_F(LexerSingleTokenTest, single_token_sampler_2d) { test<Sampler_2D>(); }
+    TEST_F(LexerSingleTokenTest, single_token_sampler_3d) { test<Sampler_3D>(); }
+    TEST_F(LexerSingleTokenTest, single_token_true) { test<True>(); }
+    TEST_F(LexerSingleTokenTest, single_token_false) { test<False>(); }
+    TEST_F(LexerSingleTokenTest, single_token_vec2) { test<Vec2>(); }
+    TEST_F(LexerSingleTokenTest, single_token_vec3) { test<Vec3>(); }
+    TEST_F(LexerSingleTokenTest, single_token_vec4) { test<Vec4>(); }
+
+    TEST(LexerTest, peek_whitespace_only_content_should_be_eof)
+    {
+        Lexer lexer(R"(
+
+        )");
+
+        EXPECT_TRUE(std::holds_alternative<Eof>(lexer.peek()));
+    }
+
+    TEST(LexerTest, float_with_no_prefixed_digits)
+    {
+        Lexer lexer(R"(
+            0.123;
+        )");
+
+        auto token = lexer.next();
+        EXPECT_TRUE(std::holds_alternative<Float>(token));
+        EXPECT_FLOAT_EQ(std::get<Float>(token).value, 0.123f);
+    }
+
+    TEST(LexerTest, float_with_alpha_prefix)
+    {
+        Lexer lexer(R"(
+            abc.123;
+        )");
+
+        EXPECT_TRUE(std::holds_alternative<Literal>(lexer.next()));
+
+        auto token = lexer.next();
+        EXPECT_TRUE(std::holds_alternative<Float>(token));
+        EXPECT_FLOAT_EQ(std::get<Float>(token).value, 0.123f);
+    }
+
+    TEST(LexerTest, float_with_numeric_prefix)
+    {
+        Lexer lexer(R"(
+            123.123;
+        )");
+
+        auto token = lexer.next();
+        EXPECT_TRUE(std::holds_alternative<Float>(token));
+        EXPECT_FLOAT_EQ(std::get<Float>(token).value, 123.123f);
+    }
+
+    TEST(LexerTest, int_should_not_be_float)
+    {
+        Lexer lexer(R"(
+            123
+        )");
+
+        auto token = lexer.next();
+        EXPECT_TRUE(std::holds_alternative<Integer>(token));
+        EXPECT_EQ(std::get<Integer>(token).value, 123);
+    }
+
+    TEST(LexerTest, simple_string)
+    {
+        Lexer lexer(R"(
+            "test string"
+        )");
+
+        auto token = lexer.next();
+        EXPECT_TRUE(std::holds_alternative<String>(token));
+
+        std::string parsed = std::string(std::get<String>(token).value);
+        EXPECT_EQ("test string", parsed);
+    }
+
+    TEST(LexerTest, fail_on_unterminated_double_quotes)
+    {
+        Lexer lexer(R"(
+            "unterminated string'
+        )");
+
+        EXPECT_THROW(lexer.next(), LexerException);
+    }
+
+    TEST(LexerTest, multiline_strings_with_single_quotes)
+    {
+        Lexer lexer(R"(
+            "string that is
+                on multiple with 'single quotes'
+            and correctly terminated!"
+        )");
+
+        auto token = lexer.next();
+        EXPECT_TRUE(std::holds_alternative<String>(token));
+    }
+
+    TEST(LexerTest, fail_on_unterminated_double_quotes_with_multiline_strings)
+    {
+        Lexer lexer(R"(
+            "string that is
+                on multiple with 'single quotes'
+            and but is unterminated :(
+        )");
+
+        EXPECT_THROW(lexer.next(), LexerException);
+    }
+
+    TEST(LexerTest, jump_with_single_nested_bracket)
+    {
+        const std::string content = R"(
+                #version 120
+
+                void main()
+                {
+                    return 0;
+                }})";
+
+        const std::string expected = content.substr(0, content.size() - 1);
+
+        Lexer lexer(content);
+
+        auto block = lexer.jump();
+    
+        EXPECT_NE(block, std::nullopt);
+        EXPECT_EQ(expected, std::string(block.value()));
+    }
+
+    TEST(LexerTest, jump_with_single_line_comments_and_mismatching_brackets)
+    {
+        const std::string content = R"(
+                #version 120
+
+                void main()
+                {
+                    // }
+                    return 0;
+                }})";
+
+        const std::string expected = content.substr(0, content.size() - 1);
+
+        Lexer lexer(content);
+
+        auto block = lexer.jump();
+    
+        EXPECT_NE(block, std::nullopt);
+        EXPECT_EQ(expected, std::string(block.value()));
+    }
+
+    TEST(LexerTest, jump_with_multi_line_comments_and_mismatching_brackets)
+    {
+        const std::string content = R"(
+                #version 120
+
+                void main()
+                {
+                    /*
+                        }
+                    */
+                    return 0;
+                }})";
+
+        const std::string expected = content.substr(0, content.size() - 1);
+
+        Lexer lexer(content);
+
+        auto block = lexer.jump();
+    
+        EXPECT_NE(block, std::nullopt);
+        EXPECT_EQ(expected, std::string(block.value()));
+    }
+
+    TEST(LexerTest, immediate_closed_blocks)
+    {
+        Lexer lexer(R"(block{})");
+
+        EXPECT_TRUE(std::holds_alternative<Literal>(lexer.next()));
+        EXPECT_TRUE(std::holds_alternative<Open_bracket>(lexer.next()));
+        auto block = lexer.jump();
+        EXPECT_TRUE(block.has_value());
+        EXPECT_TRUE(block.value().empty());
+        EXPECT_TRUE(std::holds_alternative<Close_bracket>(lexer.next()));
+    }
+
+}
diff --git a/apps/openmw_test_suite/fx/technique.cpp b/apps/openmw_test_suite/fx/technique.cpp
new file mode 100644
index 0000000000..d10e1f1b37
--- /dev/null
+++ b/apps/openmw_test_suite/fx/technique.cpp
@@ -0,0 +1,204 @@
+#include "gmock/gmock.h"
+#include <gtest/gtest.h>
+
+#include <components/settings/settings.hpp>
+#include <components/fx/technique.hpp>
+#include <components/resource/imagemanager.hpp>
+#include <components/files/configurationmanager.hpp>
+
+#include "../lua/testing_util.hpp"
+
+namespace
+{
+
+TestFile technique_properties(R"(
+    fragment main {}
+    vertex main {}
+    technique {
+        passes = main;
+        version = "0.1a";
+        description = "description";
+        author = "author";
+        glsl_version = 330;
+        glsl_profile = "compatability";
+        glsl_extensions = GL_EXT_gpu_shader4, GL_ARB_uniform_buffer_object;
+        flags = disable_sunglare;
+        hdr = true;
+    }
+)");
+
+TestFile rendertarget_properties{R"(
+    render_target rendertarget {
+        width_ratio = 0.5;
+        height_ratio = 0.5;
+        internal_format = r16f;
+        source_type = float;
+        source_format = red;
+        mipmaps = true;
+        wrap_s = clamp_to_edge;
+        wrap_t = repeat;
+        min_filter = linear;
+        mag_filter = nearest;
+    }
+    fragment downsample2x(target=rendertarget) {
+
+        omw_In vec2 omw_TexCoord;
+
+        void main()
+        {
+            omw_FragColor.r = omw_GetLastShader(omw_TexCoord).r;
+        }
+    }
+    fragment main { }
+    technique { passes = downsample2x, main; }
+)"};
+
+
+TestFile uniform_properties{R"(
+    uniform_vec4 uVec4 {
+        default = vec4(0,0,0,0);
+        min = vec4(0,1,0,0);
+        max = vec4(0,0,1,0);
+        step = 0.5;
+        header = "header";
+        static = true;
+        description = "description";
+    }
+    fragment main { }
+    technique { passes = main; }
+)"};
+
+
+TestFile missing_sampler_source{R"(
+    sampler_1d mysampler1d { }
+    fragment main { }
+    technique { passes = main; }
+)"};
+
+TestFile repeated_shared_block{R"(
+    shared {
+        float myfloat = 1.0;
+    }
+    shared {}
+    fragment main { }
+    technique { passes = main; }
+)"};
+
+
+    using namespace testing;
+    using namespace fx;
+
+    struct TechniqueTest : Test
+    {
+        std::unique_ptr<VFS::Manager> mVFS;
+        Resource::ImageManager mImageManager;
+        std::unique_ptr<Technique> mTechnique;
+
+        TechniqueTest()
+            : mVFS(createTestVFS({
+                {"shaders/technique_properties.omwfx", &technique_properties},
+                {"shaders/rendertarget_properties.omwfx", &rendertarget_properties},
+                {"shaders/uniform_properties.omwfx", &uniform_properties},
+                {"shaders/missing_sampler_source.omwfx", &missing_sampler_source},
+                {"shaders/repeated_shared_block.omwfx", &repeated_shared_block},
+            }))
+            , mImageManager(mVFS.get())
+        {
+            Settings::Manager::setBool("radial fog", "Shaders", true);
+            Settings::Manager::setBool("stereo enabled", "Stereo", false);
+        }
+
+        void compile(const std::string& name)
+        {
+            mTechnique = std::make_unique<Technique>(*mVFS.get(), mImageManager, name, 1, 1, true, true);
+            mTechnique->compile();
+        }
+    };
+
+    TEST_F(TechniqueTest, technique_properties)
+    {
+        std::unordered_set<std::string> targetExtensions = {
+            "GL_EXT_gpu_shader4",
+            "GL_ARB_uniform_buffer_object"
+        };
+
+        compile("technique_properties");
+
+        EXPECT_EQ(mTechnique->getVersion(), "0.1a");
+        EXPECT_EQ(mTechnique->getDescription(), "description");
+        EXPECT_EQ(mTechnique->getAuthor(), "author");
+        EXPECT_EQ(mTechnique->getGLSLVersion(), 330);
+        EXPECT_EQ(mTechnique->getGLSLProfile(), "compatability");
+        EXPECT_EQ(mTechnique->getGLSLExtensions(), targetExtensions);
+        EXPECT_EQ(mTechnique->getFlags(), Technique::Flag_Disable_SunGlare);
+        EXPECT_EQ(mTechnique->getHDR(), true);
+        EXPECT_EQ(mTechnique->getPasses().size(), 1);
+        EXPECT_EQ(mTechnique->getPasses().front()->getName(), "main");
+    }
+
+    TEST_F(TechniqueTest, rendertarget_properties)
+    {
+        compile("rendertarget_properties");
+
+        EXPECT_EQ(mTechnique->getRenderTargetsMap().size(), 1);
+
+        const std::string_view name = mTechnique->getRenderTargetsMap().begin()->first;
+        auto& rt = mTechnique->getRenderTargetsMap().begin()->second;
+        auto& texture = rt.mTarget;
+
+        EXPECT_EQ(name, "rendertarget");
+        EXPECT_EQ(rt.mMipMap, true);
+        EXPECT_EQ(rt.mSize.mWidthRatio, 0.5f);
+        EXPECT_EQ(rt.mSize.mHeightRatio, 0.5f);
+        EXPECT_EQ(texture->getWrap(osg::Texture::WRAP_S), osg::Texture::CLAMP_TO_EDGE);
+        EXPECT_EQ(texture->getWrap(osg::Texture::WRAP_T), osg::Texture::REPEAT);
+        EXPECT_EQ(texture->getFilter(osg::Texture::MIN_FILTER), osg::Texture::LINEAR);
+        EXPECT_EQ(texture->getFilter(osg::Texture::MAG_FILTER), osg::Texture::NEAREST);
+        EXPECT_EQ(texture->getSourceType(), static_cast<GLenum>(GL_FLOAT));
+        EXPECT_EQ(texture->getSourceFormat(), static_cast<GLenum>(GL_RED));
+        EXPECT_EQ(texture->getInternalFormat(), static_cast<GLint>(GL_R16F));
+
+        EXPECT_EQ(mTechnique->getPasses().size(), 2);
+        EXPECT_EQ(mTechnique->getPasses()[0]->getTarget(), "rendertarget");
+    }
+
+    TEST_F(TechniqueTest, uniform_properties)
+    {
+        compile("uniform_properties");
+
+        EXPECT_EQ(mTechnique->getUniformMap().size(), 1);
+
+        const auto& uniform = mTechnique->getUniformMap().front();
+
+        EXPECT_TRUE(uniform->mStatic);
+        EXPECT_FLOAT_EQ(uniform->mStep, 0.5f);
+        EXPECT_EQ(uniform->getDefault<osg::Vec4f>(), osg::Vec4f(0,0,0,0));
+        EXPECT_EQ(uniform->getMin<osg::Vec4f>(), osg::Vec4f(0,1,0,0));
+        EXPECT_EQ(uniform->getMax<osg::Vec4f>(), osg::Vec4f(0,0,1,0));
+        EXPECT_EQ(uniform->mHeader, "header");
+        EXPECT_EQ(uniform->mDescription, "description");
+        EXPECT_EQ(uniform->mName, "uVec4");
+    }
+
+    TEST_F(TechniqueTest, fail_with_missing_source_for_sampler)
+    {
+        internal::CaptureStdout();
+
+        compile("missing_sampler_source");
+
+        std::string output = internal::GetCapturedStdout();
+        Log(Debug::Error) << output;
+        EXPECT_THAT(output, HasSubstr("sampler_1d 'mysampler1d' requires a filename"));
+    }
+
+    TEST_F(TechniqueTest, fail_with_repeated_shared_block)
+    {
+        internal::CaptureStdout();
+
+        compile("repeated_shared_block");
+
+        std::string output = internal::GetCapturedStdout();
+        Log(Debug::Error) << output;
+        EXPECT_THAT(output, HasSubstr("repeated 'shared' block"));
+    }
+}
\ No newline at end of file
diff --git a/apps/openmw_test_suite/lua/testing_util.hpp b/apps/openmw_test_suite/lua/testing_util.hpp
index a40314bd0d..217c8ae5d5 100644
--- a/apps/openmw_test_suite/lua/testing_util.hpp
+++ b/apps/openmw_test_suite/lua/testing_util.hpp
@@ -26,6 +26,11 @@ namespace
             return std::make_unique<std::stringstream>(mContent, std::ios_base::in);
         }
 
+        std::string getPath() override
+        {
+            return "TestFile";
+        }
+
     private:
         const std::string mContent;
     };
diff --git a/apps/openmw_test_suite/settings/shadermanager.cpp b/apps/openmw_test_suite/settings/shadermanager.cpp
new file mode 100644
index 0000000000..8f8e09e134
--- /dev/null
+++ b/apps/openmw_test_suite/settings/shadermanager.cpp
@@ -0,0 +1,66 @@
+#include <components/settings/shadermanager.hpp>
+
+#include <fstream>
+
+#include <gtest/gtest.h>
+
+namespace
+{
+    using namespace testing;
+    using namespace Settings;
+
+    struct ShaderSettingsTest : Test
+    {
+        template <typename F>
+        void withSettingsFile( const std::string& content, F&& f)
+        {
+            const auto path = std::string(UnitTest::GetInstance()->current_test_info()->name()) + ".yaml";
+
+            {
+                std::ofstream stream;
+                stream.open(path);
+                stream << content;
+                stream.close();
+            }
+
+            f(path);
+        }
+    };
+
+    TEST_F(ShaderSettingsTest, fail_to_fetch_then_set_and_succeed)
+    {
+        const std::string content =
+R"YAML(
+config:
+    shader:
+        vec3_uniform: [1.0, 2.0]
+)YAML";
+
+        withSettingsFile(content, [this] (const auto& path) {
+            EXPECT_TRUE(ShaderManager::get().load(path));
+            EXPECT_FALSE(ShaderManager::get().getValue<osg::Vec3f>("shader", "vec3_uniform").has_value());
+            EXPECT_TRUE(ShaderManager::get().setValue<osg::Vec3f>("shader", "vec3_uniform", osg::Vec3f(1, 2, 3)));
+            EXPECT_TRUE(ShaderManager::get().getValue<osg::Vec3f>("shader", "vec3_uniform").has_value());
+            EXPECT_EQ(ShaderManager::get().getValue<osg::Vec3f>("shader", "vec3_uniform").value(), osg::Vec3f(1, 2, 3));
+            EXPECT_TRUE(ShaderManager::get().save());
+        });
+    }
+
+    TEST_F(ShaderSettingsTest, fail_to_load_file_then_fail_to_set_and_get)
+    {
+        const std::string content =
+R"YAML(
+config:
+    shader:
+        uniform: 12.0
+ >Defeated by a sideways carrot
+)YAML";
+
+        withSettingsFile(content, [this] (const auto& path) {
+            EXPECT_FALSE(ShaderManager::get().load(path));
+            EXPECT_FALSE(ShaderManager::get().setValue("shader", "uniform", 12.0));
+            EXPECT_FALSE(ShaderManager::get().getValue<float>("shader", "uniform").has_value());
+            EXPECT_FALSE(ShaderManager::get().save());
+        });
+    }
+}
\ No newline at end of file
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 5ad88523b8..8e7f1bbfa5 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -82,6 +82,10 @@ add_component_dir (to_utf8
 
 add_component_dir(esm attr common defs esmcommon reader records util luascripts format)
 
+add_component_dir(fx pass technique lexer widgets stateupdater)
+
+add_component_dir(std140 ubo)
+
 add_component_dir (esm3
     esmreader esmwriter loadacti loadalch loadappa loadarmo loadbody loadbook loadbsgn loadcell
     loadclas loadclot loadcont loadcrea loaddial loaddoor loadench loadfact loadglob loadgmst
diff --git a/components/fx/lexer.cpp b/components/fx/lexer.cpp
new file mode 100644
index 0000000000..d416dd692d
--- /dev/null
+++ b/components/fx/lexer.cpp
@@ -0,0 +1,301 @@
+#include "lexer.hpp"
+
+#include <string_view>
+#include <string>
+#include <variant>
+#include <optional>
+#include <cstdint>
+#include <array>
+#include <cmath>
+#include <exception>
+
+#include <components/misc/stringops.hpp>
+
+#include <components/debug/debuglog.hpp>
+
+#include "types.hpp"
+
+namespace fx
+{
+    namespace Lexer
+    {
+        Lexer::Lexer(std::string_view buffer)
+            : mHead(buffer.data())
+            , mTail(mHead + buffer.length())
+            , mAbsolutePos(0)
+            , mColumn(0)
+            , mLine(0)
+            , mBuffer(buffer)
+            , mLastToken(Eof{})
+        { }
+
+        Token Lexer::next()
+        {
+            if (mLookahead)
+            {
+                auto token = *mLookahead;
+                drop();
+                return token;
+            }
+
+            mLastToken = scanToken();
+
+            return mLastToken;
+        }
+
+        Token Lexer::peek()
+        {
+            if (!mLookahead)
+                mLookahead = scanToken();
+
+            return *mLookahead;
+        }
+
+        void Lexer::drop()
+        {
+            mLookahead = std::nullopt;
+        }
+
+        std::optional<std::string_view> Lexer::jump()
+        {
+            bool multi = false;
+            bool single = false;
+            auto start = mHead;
+            std::size_t level = 1;
+
+            mLastJumpBlock.line = mLine;
+
+            if (head() == '}')
+            {
+                mLastJumpBlock.content = {};
+                return mLastJumpBlock.content;
+            }
+
+            for (; mHead != mTail; advance())
+            {
+                if (head() == '\n')
+                {
+                    mLine++;
+                    mColumn = 0;
+                    if (single)
+                    {
+                        single = false;
+                        continue;
+                    }
+                }
+                else if (multi && head() == '*' && peekChar('/'))
+                {
+                    multi = false;
+                    advance();
+                    continue;
+                }
+                else if (multi || single)
+                {
+                    continue;
+                }
+                else if (head() == '/' && peekChar('/'))
+                {
+                    single = true;
+                    advance();
+                    continue;
+                }
+                else if (head() == '/' && peekChar('*'))
+                {
+                    multi = true;
+                    advance();
+                    continue;
+                }
+
+                if (head() == '{')
+                    level++;
+                else if (head() == '}')
+                    level--;
+
+                if (level == 0)
+                {
+                    mHead--;
+                    auto sv = std::string_view{start, static_cast<std::string_view::size_type>(mHead + 1 - start)};
+                    mLastJumpBlock.content = sv;
+                    return sv;
+                }
+            }
+
+            mLastJumpBlock = {};
+            return std::nullopt;
+        }
+
+        Lexer::Block Lexer::getLastJumpBlock() const
+        {
+            return mLastJumpBlock;
+        }
+
+        [[noreturn]] void Lexer::error(const std::string& msg)
+        {
+            throw LexerException(Misc::StringUtils::format("Line %zu Col %zu. %s", mLine + 1, mColumn, msg));
+        }
+
+        void Lexer::advance()
+        {
+            mAbsolutePos++;
+            mHead++;
+            mColumn++;
+        }
+
+        char Lexer::head()
+        {
+            return *mHead;
+        }
+
+        bool Lexer::peekChar(char c)
+        {
+            if (mHead == mTail)
+                return false;
+            return *(mHead + 1) == c;
+        }
+
+        Token Lexer::scanToken()
+        {
+            while (true)
+            {
+                if (mHead == mTail)
+                    return {Eof{}};
+
+                if (head() == '\n')
+                {
+                    mLine++;
+                    mColumn = 0;
+                }
+
+                if (!std::isspace(head()))
+                    break;
+
+                advance();
+            }
+
+            if (head() == '\"')
+                return scanStringLiteral();
+
+            if (std::isalpha(head()))
+                return scanLiteral();
+
+            if (std::isdigit(head()) || head() == '.' || head() == '-')
+                return scanNumber();
+
+            switch(head())
+            {
+                case '=':
+                    advance();
+                    return {Equal{}};
+                case '{':
+                    advance();
+                    return {Open_bracket{}};
+                case '}':
+                    advance();
+                    return {Close_bracket{}};
+                case '(':
+                    advance();
+                    return {Open_Parenthesis{}};
+                case ')':
+                    advance();
+                    return {Close_Parenthesis{}};
+                case '\"':
+                    advance();
+                    return {Quote{}};
+                case ':':
+                    advance();
+                    return {Colon{}};
+                case ';':
+                    advance();
+                    return {SemiColon{}};
+                case '|':
+                    advance();
+                    return {VBar{}};
+                case ',':
+                    advance();
+                    return {Comma{}};
+                default:
+                    error(Misc::StringUtils::format("unexpected token <%c>", head()));
+            }
+        }
+
+        Token Lexer::scanLiteral()
+        {
+            auto start = mHead;
+            advance();
+
+            while (mHead != mTail && (std::isalnum(head()) || head() == '_'))
+                advance();
+
+            std::string_view value{start, static_cast<std::string_view::size_type>(mHead - start)};
+
+            if (value == "shared") return Shared{};
+            if (value == "technique") return Technique{};
+            if (value == "main_pass") return Main_Pass{};
+            if (value == "render_target") return Render_Target{};
+            if (value == "vertex") return Vertex{};
+            if (value == "fragment") return Fragment{};
+            if (value == "compute") return Compute{};
+            if (value == "sampler_1d") return Sampler_1D{};
+            if (value == "sampler_2d") return Sampler_2D{};
+            if (value == "sampler_3d") return Sampler_3D{};
+            if (value == "uniform_bool") return Uniform_Bool{};
+            if (value == "uniform_float") return Uniform_Float{};
+            if (value == "uniform_int") return Uniform_Int{};
+            if (value == "uniform_vec2") return Uniform_Vec2{};
+            if (value == "uniform_vec3") return Uniform_Vec3{};
+            if (value == "uniform_vec4") return Uniform_Vec4{};
+            if (value == "true") return True{};
+            if (value == "false") return False{};
+            if (value == "vec2") return Vec2{};
+            if (value == "vec3") return Vec3{};
+            if (value == "vec4") return Vec4{};
+
+            return Literal{value};
+        }
+
+        Token Lexer::scanStringLiteral()
+        {
+            advance(); // consume quote
+            auto start = mHead;
+
+            bool terminated = false;
+
+            for (; mHead != mTail; advance())
+            {
+                if (head() == '\"')
+                {
+                    terminated = true;
+                    advance();
+                    break;
+                }
+            }
+
+            if (!terminated)
+                error("unterminated string");
+
+            return String{{start, static_cast<std::string_view::size_type>(mHead - start - 1)}};
+        }
+
+        Token Lexer::scanNumber()
+        {
+            double buffer;
+
+            char* endPtr;
+            buffer = std::strtod(mHead, &endPtr);
+
+            if (endPtr == nullptr)
+                error("critical error while parsing number");
+
+            const char* tmp = mHead;
+            mHead = endPtr;
+
+            for (; tmp != endPtr; ++tmp)
+            {
+                if ((*tmp == '.'))
+                    return Float{static_cast<float>(buffer)};
+            }
+
+            return Integer{static_cast<int>(buffer)};
+        }
+    }
+}
diff --git a/components/fx/lexer.hpp b/components/fx/lexer.hpp
new file mode 100644
index 0000000000..e24239399c
--- /dev/null
+++ b/components/fx/lexer.hpp
@@ -0,0 +1,75 @@
+#ifndef OPENMW_COMPONENTS_FX_LEXER_H
+#define OPENMW_COMPONENTS_FX_LEXER_H
+
+#include <string_view>
+#include <string>
+#include <variant>
+#include <optional>
+#include <cstdint>
+#include <stdexcept>
+
+#include <osg/Vec2f>
+#include <osg/Vec3f>
+#include <osg/Vec4f>
+
+#include "lexer_types.hpp"
+
+namespace fx
+{
+    namespace Lexer
+    {
+        struct LexerException : std::runtime_error
+        {
+            LexerException(const std::string& message) : std::runtime_error(message) {}
+            LexerException(const char* message) : std::runtime_error(message) {}
+        };
+
+        class Lexer
+        {
+        public:
+            struct Block
+            {
+                int line;
+                std::string_view content;
+            };
+
+            Lexer(std::string_view buffer);
+            Lexer() = delete;
+
+            Token next();
+            Token peek();
+
+            // Jump ahead to next uncommented closing bracket at level zero. Assumes the head is at an opening bracket.
+            // Returns the contents of the block excluding the brackets and places cursor at closing bracket.
+            std::optional<std::string_view> jump();
+
+            Block getLastJumpBlock() const;
+
+            [[noreturn]] void error(const std::string& msg);
+
+        private:
+            void drop();
+            void advance();
+            char head();
+            bool peekChar(char c);
+
+            Token scanToken();
+            Token scanLiteral();
+            Token scanStringLiteral();
+            Token scanNumber();
+
+            const char* mHead;
+            const char* mTail;
+            std::size_t mAbsolutePos;
+            std::size_t mColumn;
+            std::size_t mLine;
+            std::string_view mBuffer;
+            Token mLastToken;
+            std::optional<Token> mLookahead;
+
+            Block mLastJumpBlock;
+        };
+    }
+}
+
+#endif
diff --git a/components/fx/lexer_types.hpp b/components/fx/lexer_types.hpp
new file mode 100644
index 0000000000..0d81c483b7
--- /dev/null
+++ b/components/fx/lexer_types.hpp
@@ -0,0 +1,56 @@
+#ifndef OPENMW_COMPONENTS_FX_LEXER_TYPES_H
+#define OPENMW_COMPONENTS_FX_LEXER_TYPES_H
+
+#include <variant>
+#include <string_view>
+
+namespace fx
+{
+    namespace Lexer
+    {
+        struct Float            { inline static constexpr std::string_view repr = "float"; float value = 0.0;};
+        struct Integer          { inline static constexpr std::string_view repr = "integer"; int value = 0;};
+        struct Boolean          { inline static constexpr std::string_view repr = "boolean"; bool value = false;};
+        struct Literal          { inline static constexpr std::string_view repr = "literal"; std::string_view value;};
+        struct String           { inline static constexpr std::string_view repr = "string"; std::string_view value;};
+        struct Shared           { inline static constexpr std::string_view repr = "shared"; };
+        struct Vertex           { inline static constexpr std::string_view repr = "vertex"; };
+        struct Fragment         { inline static constexpr std::string_view repr = "fragment"; };
+        struct Compute          { inline static constexpr std::string_view repr = "compute"; };
+        struct Technique        { inline static constexpr std::string_view repr = "technique"; };
+        struct Main_Pass        { inline static constexpr std::string_view repr = "main_pass"; };
+        struct Render_Target    { inline static constexpr std::string_view repr = "render_target"; };
+        struct Sampler_1D       { inline static constexpr std::string_view repr = "sampler_1d"; };
+        struct Sampler_2D       { inline static constexpr std::string_view repr = "sampler_2d"; };
+        struct Sampler_3D       { inline static constexpr std::string_view repr = "sampler_3d"; };
+        struct Uniform_Bool     { inline static constexpr std::string_view repr = "uniform_bool"; };
+        struct Uniform_Float    { inline static constexpr std::string_view repr = "uniform_float"; };
+        struct Uniform_Int      { inline static constexpr std::string_view repr = "uniform_int"; };
+        struct Uniform_Vec2     { inline static constexpr std::string_view repr = "uniform_vec2"; };
+        struct Uniform_Vec3     { inline static constexpr std::string_view repr = "uniform_vec3"; };
+        struct Uniform_Vec4     { inline static constexpr std::string_view repr = "uniform_vec4"; };
+        struct Eof              { inline static constexpr std::string_view repr = "eof"; };
+        struct Equal            { inline static constexpr std::string_view repr = "equal"; };
+        struct Open_bracket     { inline static constexpr std::string_view repr = "open_bracket"; };
+        struct Close_bracket    { inline static constexpr std::string_view repr = "close_bracket"; };
+        struct Open_Parenthesis { inline static constexpr std::string_view repr = "open_parenthesis"; };
+        struct Close_Parenthesis{ inline static constexpr std::string_view repr = "close_parenthesis"; };
+        struct Quote            { inline static constexpr std::string_view repr = "quote"; };
+        struct SemiColon        { inline static constexpr std::string_view repr = "semicolon"; };
+        struct Comma            { inline static constexpr std::string_view repr = "comma"; };
+        struct VBar             { inline static constexpr std::string_view repr = "vbar"; };
+        struct Colon            { inline static constexpr std::string_view repr = "colon"; };
+        struct True             { inline static constexpr std::string_view repr = "true"; };
+        struct False            { inline static constexpr std::string_view repr = "false"; };
+        struct Vec2             { inline static constexpr std::string_view repr = "vec2"; };
+        struct Vec3             { inline static constexpr std::string_view repr = "vec3"; };
+        struct Vec4             { inline static constexpr std::string_view repr = "vec4"; };
+
+        using Token = std::variant<Float, Integer, Boolean, String, Literal, Equal, Open_bracket, Close_bracket, Open_Parenthesis,
+            Close_Parenthesis, Quote, SemiColon, Comma, VBar, Colon, Shared, Technique, Render_Target, Vertex, Fragment,
+            Compute, Sampler_1D, Sampler_2D, Sampler_3D, Uniform_Bool, Uniform_Float, Uniform_Int, Uniform_Vec2, Uniform_Vec3, Uniform_Vec4,
+            True, False, Vec2, Vec3, Vec4, Main_Pass, Eof>;
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/components/fx/parse_constants.hpp b/components/fx/parse_constants.hpp
new file mode 100644
index 0000000000..18d32ee53a
--- /dev/null
+++ b/components/fx/parse_constants.hpp
@@ -0,0 +1,133 @@
+#ifndef OPENMW_COMPONENTS_FX_PARSE_CONSTANTS_H
+#define OPENMW_COMPONENTS_FX_PARSE_CONSTANTS_H
+
+#include <array>
+#include <string_view>
+
+#include <osg/Texture>
+#include <osg/Image>
+#include <osg/BlendFunc>
+#include <osg/BlendEquation>
+
+#include <components/sceneutil/color.hpp>
+
+#include "technique.hpp"
+
+namespace fx
+{
+    namespace constants
+    {
+        constexpr std::array<std::pair<std::string_view, fx::FlagsType>, 6> TechniqueFlag = {{
+            {"disable_interiors"  ,  Technique::Flag_Disable_Interiors},
+            {"disable_exteriors"  ,  Technique::Flag_Disable_Exteriors},
+            {"disable_underwater" ,  Technique::Flag_Disable_Underwater},
+            {"disable_abovewater" ,  Technique::Flag_Disable_Abovewater},
+            {"disable_sunglare"   ,  Technique::Flag_Disable_SunGlare},
+            {"hidden"             ,  Technique::Flag_Hidden}
+        }};
+
+        constexpr std::array<std::pair<std::string_view, int>, 6> SourceFormat = {{
+            {"red" ,  GL_RED},
+            {"rg"  ,  GL_RG},
+            {"rgb" ,  GL_RGB},
+            {"bgr" ,  GL_BGR},
+            {"rgba",  GL_RGBA},
+            {"bgra",  GL_BGRA},
+        }};
+
+        constexpr std::array<std::pair<std::string_view, int>, 9> SourceType = {{
+            {"byte"             ,  GL_BYTE},
+            {"unsigned_byte"    ,  GL_UNSIGNED_BYTE},
+            {"short"            ,  GL_SHORT},
+            {"unsigned_short"   ,  GL_UNSIGNED_SHORT},
+            {"int"              ,  GL_INT},
+            {"unsigned_int"     ,  GL_UNSIGNED_INT},
+            {"unsigned_int_24_8",  GL_UNSIGNED_INT_24_8},
+            {"float"            ,  GL_FLOAT},
+            {"double"           ,  GL_DOUBLE},
+        }};
+
+        constexpr std::array<std::pair<std::string_view, int>, 16> InternalFormat = {{
+            {"red"               ,  GL_RED},
+            {"r16f"              ,  GL_R16F},
+            {"r32f"              ,  GL_R32F},
+            {"rg"                ,  GL_RG},
+            {"rg16f"             ,  GL_RG16F},
+            {"rg32f"             ,  GL_RG32F},
+            {"rgb"               ,  GL_RGB},
+            {"rgb16f"            ,  GL_RGB16F},
+            {"rgb32f"            ,  GL_RGB32F},
+            {"rgba"              ,  GL_RGBA},
+            {"rgba16f"           ,  GL_RGBA16F},
+            {"rgba32f"           ,  GL_RGBA32F},
+            {"depth_component16" ,  GL_DEPTH_COMPONENT16},
+            {"depth_component24" ,  GL_DEPTH_COMPONENT24},
+            {"depth_component32" ,  GL_DEPTH_COMPONENT32},
+            {"depth_component32f",  GL_DEPTH_COMPONENT32F}
+        }};
+
+        constexpr std::array<std::pair<std::string_view, osg::Texture::InternalFormatMode>, 13> Compression = {{
+            {"auto"        , osg::Texture::USE_USER_DEFINED_FORMAT},
+            {"arb"         , osg::Texture::USE_ARB_COMPRESSION},
+            {"s3tc_dxt1"   , osg::Texture::USE_S3TC_DXT1_COMPRESSION},
+            {"s3tc_dxt3"   , osg::Texture::USE_S3TC_DXT3_COMPRESSION},
+            {"s3tc_dxt5"   , osg::Texture::USE_S3TC_DXT5_COMPRESSION},
+            {"pvrtc_2bpp"  , osg::Texture::USE_PVRTC_2BPP_COMPRESSION},
+            {"pvrtc_4bpp"  , osg::Texture::USE_PVRTC_4BPP_COMPRESSION},
+            {"etc"         , osg::Texture::USE_ETC_COMPRESSION},
+            {"etc2"        , osg::Texture::USE_ETC2_COMPRESSION},
+            {"rgtc1"       , osg::Texture::USE_RGTC1_COMPRESSION},
+            {"rgtc2"       , osg::Texture::USE_RGTC2_COMPRESSION},
+            {"s3tc_dxt1c"  , osg::Texture::USE_S3TC_DXT1c_COMPRESSION},
+            {"s3tc_dxt1a"  , osg::Texture::USE_S3TC_DXT1a_COMPRESSION}
+        }};
+
+        constexpr std::array<std::pair<std::string_view, osg::Texture::WrapMode>, 6> WrapMode = {{
+            {"clamp"          , osg::Texture::CLAMP},
+            {"clamp_to_edge"  , osg::Texture::CLAMP_TO_EDGE},
+            {"clamp_to_border", osg::Texture::CLAMP_TO_BORDER},
+            {"repeat"         , osg::Texture::REPEAT},
+            {"mirror"         , osg::Texture::MIRROR}
+        }};
+
+        constexpr std::array<std::pair<std::string_view, osg::Texture::FilterMode>, 6> FilterMode = {{
+            {"linear"                , osg::Texture::LINEAR},
+            {"linear_mipmap_linear"  , osg::Texture::LINEAR_MIPMAP_LINEAR},
+            {"linear_mipmap_nearest" , osg::Texture::LINEAR_MIPMAP_NEAREST},
+            {"nearest"               , osg::Texture::NEAREST},
+            {"nearest_mipmap_linear" , osg::Texture::NEAREST_MIPMAP_LINEAR},
+            {"nearest_mipmap_nearest", osg::Texture::NEAREST_MIPMAP_NEAREST}
+        }};
+
+        constexpr std::array<std::pair<std::string_view, osg::BlendFunc::BlendFuncMode>, 15> BlendFunc = {{
+            {"dst_alpha"                , osg::BlendFunc::DST_ALPHA},
+            {"dst_color"                , osg::BlendFunc::DST_COLOR},
+            {"one"                      , osg::BlendFunc::ONE},
+            {"one_minus_dst_alpha"      , osg::BlendFunc::ONE_MINUS_DST_ALPHA},
+            {"one_minus_dst_color"      , osg::BlendFunc::ONE_MINUS_DST_COLOR},
+            {"one_minus_src_alpha"      , osg::BlendFunc::ONE_MINUS_SRC_ALPHA},
+            {"one_minus_src_color"      , osg::BlendFunc::ONE_MINUS_SRC_COLOR},
+            {"src_alpha"                , osg::BlendFunc::SRC_ALPHA},
+            {"src_alpha_saturate"       , osg::BlendFunc::SRC_ALPHA_SATURATE},
+            {"src_color"                , osg::BlendFunc::SRC_COLOR},
+            {"constant_color"           , osg::BlendFunc::CONSTANT_COLOR},
+            {"one_minus_constant_color" , osg::BlendFunc::ONE_MINUS_CONSTANT_COLOR},
+            {"constant_alpha"           , osg::BlendFunc::CONSTANT_ALPHA},
+            {"one_minus_constant_alpha" , osg::BlendFunc::ONE_MINUS_CONSTANT_ALPHA},
+            {"zero"                     , osg::BlendFunc::ZERO}
+        }};
+
+        constexpr std::array<std::pair<std::string_view, osg::BlendEquation::Equation>, 8> BlendEquation = {{
+            {"rgba_min"             , osg::BlendEquation::RGBA_MIN},
+            {"rgba_max"             , osg::BlendEquation::RGBA_MAX},
+            {"alpha_min"            , osg::BlendEquation::ALPHA_MIN},
+            {"alpha_max"            , osg::BlendEquation::ALPHA_MAX},
+            {"logic_op"             , osg::BlendEquation::LOGIC_OP},
+            {"add"                  , osg::BlendEquation::FUNC_ADD},
+            {"subtract"             , osg::BlendEquation::FUNC_SUBTRACT},
+            {"reverse_subtract"     , osg::BlendEquation::FUNC_REVERSE_SUBTRACT}
+        }};
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/components/fx/pass.cpp b/components/fx/pass.cpp
new file mode 100644
index 0000000000..0d86bdcf50
--- /dev/null
+++ b/components/fx/pass.cpp
@@ -0,0 +1,253 @@
+#include "pass.hpp"
+
+#include <unordered_set>
+#include <string>
+#include <sstream>
+
+#include <osg/Program>
+#include <osg/Shader>
+#include <osg/State>
+#include <osg/StateSet>
+#include <osg/BindImageTexture>
+#include <osg/FrameBufferObject>
+
+#include <components/misc/stringops.hpp>
+#include <components/sceneutil/util.hpp>
+#include <components/sceneutil/clearcolor.hpp>
+#include <components/resource/scenemanager.hpp>
+#include <components/stereo/multiview.hpp>
+
+#include "technique.hpp"
+#include "stateupdater.hpp"
+
+namespace
+{
+    constexpr char s_DefaultVertex[] = R"GLSL(
+#if OMW_USE_BINDINGS
+    omw_In vec2 omw_Vertex;
+#endif
+omw_Out vec2 omw_TexCoord;
+
+void main()
+{
+    omw_Position = vec4(omw_Vertex.xy, 0.0, 1.0);
+    omw_TexCoord = omw_Position.xy * 0.5 + 0.5;
+})GLSL";
+
+}
+
+namespace fx
+{
+    Pass::Pass(Pass::Type type, Pass::Order order, bool ubo)
+        : mCompiled(false)
+        , mType(type)
+        , mOrder(order)
+        , mLegacyGLSL(true)
+        , mUBO(ubo)
+    {
+    }
+
+    std::string Pass::getPassHeader(Technique& technique, std::string_view preamble, bool fragOut)
+    {
+        std::string header = R"GLSL(
+#version @version @profile
+@extensions
+
+@uboStruct
+
+#define OMW_REVERSE_Z @reverseZ
+#define OMW_RADIAL_FOG @radialFog
+#define OMW_HDR @hdr
+#define OMW_NORMALS @normals
+#define OMW_USE_BINDINGS @useBindings
+#define OMW_MULTIVIEW @multiview
+#define omw_In @in
+#define omw_Out @out
+#define omw_Position @position
+#define omw_Texture1D @texture1D
+#define omw_Texture2D @texture2D
+#define omw_Texture3D @texture3D
+#define omw_Vertex @vertex
+#define omw_FragColor @fragColor
+
+@fragBinding
+
+uniform @builtinSampler omw_SamplerLastShader;
+uniform @builtinSampler omw_SamplerLastPass;
+uniform @builtinSampler omw_SamplerDepth;
+uniform @builtinSampler omw_SamplerNormals;
+
+#if @ubo
+    layout(std140) uniform _data { _omw_data omw; };
+#else
+    uniform _omw_data omw;
+#endif
+
+    float omw_GetDepth(vec2 uv)
+    {
+#if OMW_MULTIVIEW
+        float depth = omw_Texture2D(omw_SamplerDepth, vec3(uv, gl_ViewID_OVR)).r;
+#else
+        float depth = omw_Texture2D(omw_SamplerDepth, uv).r;
+#endif
+#if OMW_REVERSE_Z
+        return 1.0 - depth;
+#else
+        return depth;
+#endif
+    }
+
+    vec4 omw_GetLastShader(vec2 uv)
+    {
+#if OMW_MULTIVIEW
+        return omw_Texture2D(omw_SamplerLastShader, vec3(uv, gl_ViewID_OVR));
+#else
+        return omw_Texture2D(omw_SamplerLastShader, uv);
+#endif
+    }
+
+    vec4 omw_GetLastPass(vec2 uv)
+    {
+#if OMW_MULTIVIEW
+        return omw_Texture2D(omw_SamplerLastPass, vec3(uv, gl_ViewID_OVR));
+#else
+        return omw_Texture2D(omw_SamplerLastPass, uv);
+#endif
+    }
+
+    vec3 omw_GetNormals(vec2 uv)
+    {
+#if OMW_MULTIVIEW
+        return omw_Texture2D(omw_SamplerNormals, vec3(uv, gl_ViewID_OVR)).rgb * 2.0 - 1.0;
+#else
+        return omw_Texture2D(omw_SamplerNormals, uv).rgb * 2.0 - 1.0;
+#endif
+    }
+
+#if OMW_HDR
+    uniform sampler2D omw_EyeAdaptation;
+#endif
+
+    float omw_GetEyeAdaptation()
+    {
+#if OMW_HDR
+        return omw_Texture2D(omw_EyeAdaptation, vec2(0.5, 0.5)).r;
+#else
+        return 1.0;
+#endif
+    }
+)GLSL";
+
+        std::stringstream extBlock;
+        for (const auto& extension : technique.getGLSLExtensions())
+            extBlock << "#ifdef " << extension << '\n' << "\t#extension " << extension << ": enable" << '\n' << "#endif" << '\n';
+
+        const std::vector<std::pair<std::string,std::string>> defines = {
+            {"@version", std::to_string(technique.getGLSLVersion())},
+            {"@multiview", Stereo::getMultiview() ? "1" : "0"},
+            {"@builtinSampler", Stereo::getMultiview() ? "sampler2DArray" : "sampler2D"},
+            {"@profile", technique.getGLSLProfile()},
+            {"@extensions", extBlock.str()},
+            {"@uboStruct", StateUpdater::getStructDefinition()},
+            {"@ubo", mUBO ? "1" : "0"},
+            {"@normals", technique.getNormals() ? "1" : "0"},
+            {"@reverseZ", SceneUtil::AutoDepth::isReversed() ? "1" : "0"},
+            {"@radialFog", Settings::Manager::getBool("radial fog", "Shaders") ? "1" : "0"},
+            {"@hdr", technique.getHDR() ? "1" : "0"},
+            {"@in", mLegacyGLSL ? "varying" : "in"},
+            {"@out", mLegacyGLSL ? "varying" : "out"},
+            {"@position", "gl_Position"},
+            {"@texture1D", mLegacyGLSL ? "texture1D" : "texture"},
+            {"@texture2D", mLegacyGLSL ? "texture2D" : "texture"},
+            {"@texture3D", mLegacyGLSL ? "texture3D" : "texture"},
+            {"@vertex", mLegacyGLSL ? "gl_Vertex" : "_omw_Vertex"},
+            {"@fragColor", mLegacyGLSL ? "gl_FragColor" : "_omw_FragColor"},
+            {"@useBindings", mLegacyGLSL ? "0" : "1"},
+            {"@fragBinding", mLegacyGLSL ? "" : "out vec4 omw_FragColor;"}
+        };
+
+        for (const auto& [define, value]: defines)
+            for (size_t pos = header.find(define); pos != std::string::npos; pos = header.find(define))
+                header.replace(pos, define.size(), value);
+
+        for (auto& uniform : technique.getUniformMap())
+            if (auto glsl = uniform->getGLSL())
+                header.append(glsl.value());
+
+        header.append(preamble);
+
+        return header;
+    }
+
+    void Pass::prepareStateSet(osg::StateSet* stateSet, const std::string& name) const
+    {
+        osg::ref_ptr<osg::Program> program = new osg::Program;
+        if (mType == Type::Pixel)
+        {
+            program->addShader(new osg::Shader(*mVertex));
+            program->addShader(new osg::Shader(*mFragment));
+        }
+        else if (mType == Type::Compute)
+        {
+            program->addShader(new osg::Shader(*mCompute));
+        }
+
+        if (mUBO)
+            program->addBindUniformBlock("_data", static_cast<int>(Resource::SceneManager::UBOBinding::PostProcessor));
+
+        program->setName(name);
+
+        if (!mLegacyGLSL)
+        {
+            program->addBindFragDataLocation("_omw_FragColor", 0);
+            program->addBindAttribLocation("_omw_Vertex", 0);
+        }
+
+        stateSet->setAttribute(program);
+
+        if (mBlendSource && mBlendDest)
+            stateSet->setAttribute(new osg::BlendFunc(mBlendSource.value(), mBlendDest.value()));
+
+        if (mBlendEq)
+            stateSet->setAttribute(new osg::BlendEquation(mBlendEq.value()));
+
+        if (mClearColor)
+            stateSet->setAttribute(new SceneUtil::ClearColor(mClearColor.value(), GL_COLOR_BUFFER_BIT));
+    }
+
+    void Pass::dirty()
+    {
+        mVertex = nullptr;
+        mFragment = nullptr;
+        mCompute = nullptr;
+        mCompiled = false;
+    }
+
+    void Pass::compile(Technique& technique, std::string_view preamble)
+    {
+        if (mCompiled)
+            return;
+
+        mLegacyGLSL = technique.getGLSLVersion() != 330;
+
+        if (mType == Type::Pixel)
+        {
+            if (!mVertex)
+                mVertex = new osg::Shader(osg::Shader::VERTEX, s_DefaultVertex);
+
+            mVertex->setShaderSource(getPassHeader(technique, preamble).append(mVertex->getShaderSource()));
+            mFragment->setShaderSource(getPassHeader(technique, preamble, true).append(mFragment->getShaderSource()));
+
+            mVertex->setName(mName);
+            mFragment->setName(mName);
+        }
+        else if (mType == Type::Compute)
+        {
+            mCompute->setShaderSource(getPassHeader(technique, preamble).append(mCompute->getShaderSource()));
+            mCompute->setName(mName);
+        }
+
+        mCompiled = true;
+    }
+
+}
diff --git a/components/fx/pass.hpp b/components/fx/pass.hpp
new file mode 100644
index 0000000000..bd13c3f99b
--- /dev/null
+++ b/components/fx/pass.hpp
@@ -0,0 +1,79 @@
+#ifndef OPENMW_COMPONENTS_FX_PASS_H
+#define OPENMW_COMPONENTS_FX_PASS_H
+
+#include <array>
+#include <string>
+#include <sstream>
+#include <cstdint>
+#include <unordered_set>
+#include <optional>
+
+#include <osg/Timer>
+#include <osg/Program>
+#include <osg/Shader>
+#include <osg/State>
+#include <osg/Texture2D>
+#include <osg/BlendEquation>
+#include <osg/BlendFunc>
+
+namespace fx
+{
+    class Technique;
+
+    class Pass
+    {
+    public:
+
+        enum class Order
+        {
+            Forward,
+            Post
+        };
+
+        enum class Type
+        {
+            None,
+            Pixel,
+            Compute
+        };
+
+        friend class Technique;
+
+        Pass(Type type=Type::Pixel, Order order=Order::Post, bool ubo = false);
+
+        void compile(Technique& technique, std::string_view preamble);
+
+        std::string_view getTarget() const { return mTarget; }
+
+        void prepareStateSet(osg::StateSet* stateSet, const std::string& name) const;
+
+        std::string getName() const { return mName; }
+
+        void dirty();
+
+    private:
+        std::string getPassHeader(Technique& technique, std::string_view preamble, bool fragOut = false);
+
+        bool mCompiled;
+
+        osg::ref_ptr<osg::Shader> mVertex;
+        osg::ref_ptr<osg::Shader> mFragment;
+        osg::ref_ptr<osg::Shader> mCompute;
+
+        Type mType;
+        Order mOrder;
+        std::string mName;
+        bool mLegacyGLSL;
+        bool mUBO;
+        bool mSupportsNormals;
+
+        std::string_view mTarget;
+        std::optional<osg::Vec4f> mClearColor;
+
+        std::optional<osg::BlendFunc::BlendFuncMode> mBlendSource;
+        std::optional<osg::BlendFunc::BlendFuncMode> mBlendDest;
+        std::optional<osg::BlendEquation::Equation> mBlendEq;
+    };
+}
+
+#endif
diff --git a/components/fx/stateupdater.cpp b/components/fx/stateupdater.cpp
new file mode 100644
index 0000000000..c362c16f54
--- /dev/null
+++ b/components/fx/stateupdater.cpp
@@ -0,0 +1,60 @@
+#include "stateupdater.hpp"
+
+#include <osg/BufferObject>
+#include <osg/BufferIndexBinding>
+
+#include <components/resource/scenemanager.hpp>
+#include <components/debug/debuglog.hpp>
+
+namespace fx
+{
+    StateUpdater::StateUpdater(bool useUBO) : mUseUBO(useUBO) {}
+
+    void StateUpdater::setDefaults(osg::StateSet* stateset)
+    {
+        if (mUseUBO)
+        {
+            osg::ref_ptr<osg::UniformBufferObject> ubo = new osg::UniformBufferObject;
+
+            osg::ref_ptr<osg::BufferTemplate<UniformData::BufferType>> data = new osg::BufferTemplate<UniformData::BufferType>();
+            data->setBufferObject(ubo);
+
+            osg::ref_ptr<osg::UniformBufferBinding> ubb = new osg::UniformBufferBinding(static_cast<int>(Resource::SceneManager::UBOBinding::PostProcessor), data, 0, mData.getGPUSize());
+
+            stateset->setAttributeAndModes(ubb, osg::StateAttribute::ON);
+        }
+        else
+        {
+            const auto createUniform = [&] (const auto& v) {
+                using T = std::decay_t<decltype(v)>;
+                std::string name = "omw." + std::string(T::sName);
+                stateset->addUniform(new osg::Uniform(name.c_str(), mData.get<T>()));
+            };
+
+            std::apply([&] (const auto& ... v) { (createUniform(v) , ...); }, mData.getData());
+        }
+    }
+
+    void StateUpdater::apply(osg::StateSet* stateset, osg::NodeVisitor* nv)
+    {
+        if (mUseUBO)
+        {
+            osg::UniformBufferBinding* ubb = dynamic_cast<osg::UniformBufferBinding*>(stateset->getAttribute(osg::StateAttribute::UNIFORMBUFFERBINDING, static_cast<int>(Resource::SceneManager::UBOBinding::PostProcessor)));
+
+            auto& dest = static_cast<osg::BufferTemplate<UniformData::BufferType>*>(ubb->getBufferData())->getData();
+            mData.copyTo(dest);
+
+            ubb->getBufferData()->dirty();
+        }
+        else
+        {
+            const auto setUniform = [&] (const auto& v) {
+                using T = std::decay_t<decltype(v)>;
+                std::string name = "omw." + std::string(T::sName);
+                stateset->getUniform(name)->set(mData.get<T>());
+            };
+
+            std::apply([&] (const auto& ... v) { (setUniform(v) , ...); }, mData.getData());
+        }
+    }
+}
\ No newline at end of file
diff --git a/components/fx/stateupdater.hpp b/components/fx/stateupdater.hpp
new file mode 100644
index 0000000000..25bb17fffa
--- /dev/null
+++ b/components/fx/stateupdater.hpp
@@ -0,0 +1,192 @@
+#ifndef OPENMW_COMPONENTS_FX_STATEUPDATER_H
+#define OPENMW_COMPONENTS_FX_STATEUPDATER_H
+
+#include <osg/BufferTemplate>
+
+#include <components/sceneutil/statesetupdater.hpp>
+#include <components/std140/ubo.hpp>
+
+namespace fx
+{
+    class StateUpdater : public SceneUtil::StateSetUpdater
+    {
+    public:
+        StateUpdater(bool useUBO);
+
+        void setProjectionMatrix(const osg::Matrixf& matrix)
+        {
+            mData.get<ProjectionMatrix>() = matrix;
+            mData.get<InvProjectionMatrix>() = osg::Matrixf::inverse(matrix);
+        }
+
+        void setViewMatrix(const osg::Matrixf& matrix) { mData.get<ViewMatrix>() = matrix; }
+
+        void setInvViewMatrix(const osg::Matrixf& matrix) { mData.get<InvViewMatrix>() = matrix; }
+
+        void setPrevViewMatrix(const osg::Matrixf& matrix) { mData.get<PrevViewMatrix>() = matrix;}
+
+        void setEyePos(const osg::Vec3f& pos) { mData.get<EyePos>() = osg::Vec4f(pos, 0.f); }
+
+        void setEyeVec(const osg::Vec3f& vec) { mData.get<EyeVec>() = osg::Vec4f(vec, 0.f); }
+
+        void setFogColor(const osg::Vec4f& color) { mData.get<FogColor>() = color; }
+
+        void setSunColor(const osg::Vec4f& color) { mData.get<SunColor>() = color; }
+
+        void setSunPos(const osg::Vec4f& pos, bool night)
+        {
+            mData.get<SunPos>() = pos;
+
+            if (night)
+                mData.get<SunPos>().z() *= -1.f;
+        }
+
+        void setResolution(const osg::Vec2f& size)
+        {
+            mData.get<Resolution>() = size;
+            mData.get<RcpResolution>() = {1.f / size.x(), 1.f / size.y()};
+        }
+
+        void setSunVis(float vis)
+        {
+            mData.get<SunVis>() = vis;
+        }
+
+        void setFogRange(float near, float far)
+        {
+            mData.get<FogNear>() = near;
+            mData.get<FogFar>() = far;
+        }
+
+        void setNearFar(float near, float far)
+        {
+            mData.get<Near>() = near;
+            mData.get<Far>() = far;
+        }
+
+        void setIsUnderwater(bool underwater) { mData.get<IsUnderwater>() = underwater; }
+
+        void setIsInterior(bool interior) { mData.get<IsInterior>() = interior; }
+
+        void setFov(float fov) { mData.get<Fov>() = fov; }
+
+        void setGameHour(float hour) { mData.get<GameHour>() = hour; }
+
+        void setWeatherId(int id) { mData.get<WeatherID>() = id; }
+
+        void setNextWeatherId(int id) { mData.get<NextWeatherID>() = id; }
+
+        void setWaterHeight(float height) { mData.get<WaterHeight>() = height; }
+
+        void setSimulationTime(float time) { mData.get<SimulationTime>() = time; }
+
+        void setDeltaSimulationTime(float time) { mData.get<DeltaSimulationTime>() = time; }
+
+        void setWindSpeed(float speed) { mData.get<WindSpeed>() = speed; }
+
+        void setWeatherTransition(float transition) { mData.get<WeatherTransition>() = transition; }
+
+        static std::string getStructDefinition()
+        {
+            static std::string definition = UniformData::getDefinition("_omw_data");
+            return definition;
+        }
+
+    private:
+        struct ProjectionMatrix : std140::Mat4 { static constexpr std::string_view sName = "projectionMatrix"; };
+
+        struct InvProjectionMatrix : std140::Mat4 { static constexpr std::string_view sName = "invProjectionMatrix"; };
+
+        struct ViewMatrix : std140::Mat4 { static constexpr std::string_view sName = "viewMatrix"; };
+
+        struct PrevViewMatrix : std140::Mat4 { static constexpr std::string_view sName = "prevViewMatrix"; };
+
+        struct InvViewMatrix : std140::Mat4 { static constexpr std::string_view sName = "invViewMatrix"; };
+
+        struct EyePos : std140::Vec4 { static constexpr std::string_view sName = "eyePos"; };
+
+        struct EyeVec : std140::Vec4 { static constexpr std::string_view sName = "eyeVec"; };
+
+        struct FogColor : std140::Vec4 { static constexpr std::string_view sName = "fogColor"; };
+
+        struct SunColor : std140::Vec4 { static constexpr std::string_view sName = "sunColor"; };
+
+        struct SunPos : std140::Vec4 { static constexpr std::string_view sName = "sunPos"; };
+
+        struct Resolution : std140::Vec2 { static constexpr std::string_view sName = "resolution"; };
+
+        struct RcpResolution : std140::Vec2 { static constexpr std::string_view sName = "rcpResolution"; };
+
+        struct FogNear : std140::Float { static constexpr std::string_view sName = "fogNear"; };
+
+        struct FogFar : std140::Float { static constexpr std::string_view sName = "fogFar"; };
+
+        struct Near : std140::Float { static constexpr std::string_view sName = "near"; };
+
+        struct Far : std140::Float { static constexpr std::string_view sName = "far"; };
+
+        struct Fov : std140::Float { static constexpr std::string_view sName = "fov"; };
+
+        struct GameHour : std140::Float { static constexpr std::string_view sName = "gameHour"; };
+
+        struct SunVis : std140::Float { static constexpr std::string_view sName = "sunVis"; };
+
+        struct WaterHeight : std140::Float { static constexpr std::string_view sName = "waterHeight"; };
+
+        struct SimulationTime : std140::Float { static constexpr std::string_view sName = "simulationTime"; };
+
+        struct DeltaSimulationTime : std140::Float { static constexpr std::string_view sName = "deltaSimulationTime"; };
+
+        struct WindSpeed : std140::Float { static constexpr std::string_view sName = "windSpeed"; };
+
+        struct WeatherTransition : std140::Float { static constexpr std::string_view sName = "weatherTransition"; };
+
+        struct WeatherID : std140::Int { static constexpr std::string_view sName = "weatherID"; };
+
+        struct NextWeatherID : std140::Int { static constexpr std::string_view sName = "nextWeatherID"; };
+
+        struct IsUnderwater : std140::Bool { static constexpr std::string_view sName = "isUnderwater"; };
+
+        struct IsInterior : std140::Bool { static constexpr std::string_view sName = "isInterior"; };
+
+        using UniformData = std140::UBO<
+            ProjectionMatrix,
+            InvProjectionMatrix,
+            ViewMatrix,
+            PrevViewMatrix,
+            InvViewMatrix,
+            EyePos,
+            EyeVec,
+            FogColor,
+            SunColor,
+            SunPos,
+            Resolution,
+            RcpResolution,
+            FogNear,
+            FogFar,
+            Near,
+            Far,
+            Fov,
+            GameHour,
+            SunVis,
+            WaterHeight,
+            SimulationTime,
+            DeltaSimulationTime,
+            WindSpeed,
+            WeatherTransition,
+            WeatherID,
+            NextWeatherID,
+            IsUnderwater,
+            IsInterior
+        >;
+
+    private:
+        void setDefaults(osg::StateSet* stateset) override;
+        void apply(osg::StateSet* stateset, osg::NodeVisitor* nv) override;
+
+        UniformData mData;
+        bool mUseUBO;
+    };
+}
+
+#endif
\ No newline at end of file
diff --git a/components/fx/technique.cpp b/components/fx/technique.cpp
new file mode 100644
index 0000000000..86a6189fd7
--- /dev/null
+++ b/components/fx/technique.cpp
@@ -0,0 +1,1049 @@
+#include "technique.hpp"
+
+#include <array>
+#include <string>
+
+#include <osg/Texture1D>
+#include <osg/Texture2D>
+#include <osg/Texture3D>
+#include <osg/CullStack>
+
+#include <SDL_opengl_glext.h>
+
+#include <components/vfs/manager.hpp>
+#include <components/stereo/multiview.hpp>
+#include <components/misc/stringops.hpp>
+#include <components/sceneutil/util.hpp>
+#include <components/resource/imagemanager.hpp>
+#include <components/debug/debuglog.hpp>
+
+#include "parse_constants.hpp"
+
+namespace
+{
+    struct ProxyTextureData
+    {
+        osg::Texture::WrapMode wrap_s = osg::Texture::CLAMP_TO_EDGE;
+        osg::Texture::WrapMode wrap_t = osg::Texture::CLAMP_TO_EDGE;
+        osg::Texture::WrapMode wrap_r = osg::Texture::CLAMP_TO_EDGE;
+        osg::Texture::FilterMode min_filter = osg::Texture::LINEAR_MIPMAP_LINEAR;
+        osg::Texture::FilterMode mag_filter =osg::Texture::LINEAR;
+        osg::Texture::InternalFormatMode compression = osg::Texture::USE_IMAGE_DATA_FORMAT;
+        std::optional<int> source_format;
+        std::optional<int> source_type;
+        std::optional<int> internal_format;
+    };
+}
+
+namespace fx
+{
+    Technique::Technique(const VFS::Manager& vfs, Resource::ImageManager& imageManager, const std::string& name, int width, int height, bool ubo, bool supportsNormals)
+        : mName(name)
+        , mFileName((std::filesystem::path(Technique::sSubdir) / (mName + Technique::sExt)).string())
+        , mLastModificationTime(std::filesystem::file_time_type())
+        , mWidth(width)
+        , mHeight(height)
+        , mVFS(vfs)
+        , mImageManager(imageManager)
+        , mUBO(ubo)
+        , mSupportsNormals(supportsNormals)
+    {
+        clear();
+    }
+
+    void Technique::clear()
+    {
+        mTextures.clear();
+        mStatus = Status::Uncompiled;
+        mDirty = false;
+        mValid = false;
+        mHDR = false;
+        mNormals = false;
+        mEnabled = true;
+        mPassMap.clear();
+        mPasses.clear();
+        mPassKeys.clear();
+        mDefinedUniforms.clear();
+        mRenderTargets.clear();
+        mMainTemplate = nullptr;
+        mLastAppliedType = Pass::Type::None;
+        mFlags = 0;
+        mShared.clear();
+        mAuthor = {};
+        mDescription = {};
+        mVersion = {};
+        mGLSLExtensions.clear();
+        mGLSLVersion = mUBO ? 330 : 120;
+        mGLSLProfile.clear();
+    }
+
+    std::string Technique::getBlockWithLineDirective()
+    {
+        auto block = mLexer->getLastJumpBlock();
+        std::string content = std::string(block.content);
+
+        content = "\n#line " + std::to_string(block.line + 1) + "\n"  + std::string(block.content) + "\n";
+        return content;
+    }
+
+    Technique::UniformMap::iterator Technique::findUniform(const std::string& name)
+    {
+        return std::find_if(mDefinedUniforms.begin(), mDefinedUniforms.end(), [&name](const auto& uniform)
+        {
+            return uniform->mName == name;
+        });
+    }
+
+    bool Technique::compile()
+    {
+        clear();
+
+        if (!mVFS.exists(mFileName))
+        {
+            Log(Debug::Error) << "Could not load technique, file does not exist '" << mFileName << "'";
+
+            mStatus = Status::File_Not_exists;
+            return false;
+        }
+
+        try
+        {
+            std::string source(std::istreambuf_iterator<char>(*mVFS.get(getFileName())), {});
+
+            parse(std::move(source));
+
+            if (mPassKeys.empty())
+                error("no pass list found, ensure you define one in a 'technique' block");
+
+            int swaps = 0;
+
+            for (auto name : mPassKeys)
+            {
+                auto it = mPassMap.find(name);
+
+                if (it == mPassMap.end())
+                    error(Misc::StringUtils::format("pass '%s' was found in the pass list, but there was no matching 'fragment', 'vertex' or 'compute' block", std::string(name)));
+
+                if (mLastAppliedType != Pass::Type::None && mLastAppliedType != it->second->mType)
+                {
+                    swaps++;
+                    if (swaps == 2)
+                        Log(Debug::Warning) << "compute and pixel shaders are being swapped multiple times in shader chain, this can lead to serious performance drain.";
+                }
+                else
+                    mLastAppliedType = it->second->mType;
+
+                if (Stereo::getMultiview())
+                {
+                    mGLSLExtensions.insert("GL_OVR_multiview");
+                    mGLSLExtensions.insert("GL_OVR_multiview2");
+                    mGLSLExtensions.insert("GL_EXT_texture_array");
+                }
+
+                it->second->compile(*this, mShared);
+
+                if (!it->second->mTarget.empty())
+                {
+                    auto rtIt = mRenderTargets.find(it->second->mTarget);
+                    if (rtIt == mRenderTargets.end())
+                        error(Misc::StringUtils::format("target '%s' not defined", std::string(it->second->mTarget)));
+                }
+
+                mPasses.emplace_back(it->second);
+            }
+
+            if (mPasses.empty())
+                error("invalid pass list, no passes defined for technique");
+
+            mValid = true;
+        }
+        catch(const std::runtime_error& e)
+        {
+            clear();
+            mStatus = Status::Parse_Error;
+
+            mLastError = "Failed parsing technique '" + getName() + "' "  + e.what();;
+            Log(Debug::Error) << mLastError;
+        }
+
+        return mValid;
+    }
+
+    std::string Technique::getName() const
+    {
+        return mName;
+    }
+
+    std::string Technique::getFileName() const
+    {
+        return mFileName;
+    }
+
+    void Technique::setLastModificationTime(std::filesystem::file_time_type timeStamp, bool dirty)
+    {
+        if (dirty && mLastModificationTime != timeStamp)
+            mDirty = true;
+
+        mLastModificationTime = timeStamp;
+    }
+
+    [[noreturn]] void Technique::error(const std::string& msg)
+    {
+        mLexer->error(msg);
+    }
+
+    template<>
+    void Technique::parseBlockImp<Lexer::Shared>()
+    {
+        if (!mLexer->jump())
+            error(Misc::StringUtils::format("unterminated 'shared' block, expected closing brackets"));
+
+        if (!mShared.empty())
+            error("repeated 'shared' block, only one allowed per technique file");
+
+        mShared = getBlockWithLineDirective();
+    }
+
+    template<>
+    void Technique::parseBlockImp<Lexer::Technique>()
+    {
+        if (!mPassKeys.empty())
+            error("exactly one 'technique' block can appear per file");
+
+        while (!isNext<Lexer::Close_bracket>() && !isNext<Lexer::Eof>())
+        {
+            expect<Lexer::Literal>();
+
+            auto key = std::get<Lexer::Literal>(mToken).value;
+
+            expect<Lexer::Equal>();
+
+            if (key == "passes")
+                mPassKeys = parseLiteralList<Lexer::Comma>();
+            else if (key == "version")
+                mVersion = parseString();
+            else if (key == "description")
+                mDescription = parseString();
+            else if (key == "author")
+                mAuthor = parseString();
+            else if (key == "glsl_version")
+            {
+                int version = parseInteger();
+                if (mUBO && version > 330)
+                    mGLSLVersion = version;
+            }
+            else if (key == "flags")
+                mFlags = parseFlags();
+            else if (key == "hdr")
+                mHDR = parseBool();
+            else if (key == "pass_normals")
+                mNormals = parseBool() && mSupportsNormals;
+            else if (key == "glsl_profile")
+            {
+                expect<Lexer::String>();
+                mGLSLProfile = std::string(std::get<Lexer::String>(mToken).value);
+            }
+            else if (key == "glsl_extensions")
+            {
+                for (const auto& ext : parseLiteralList<Lexer::Comma>())
+                    mGLSLExtensions.emplace(ext);
+            }
+            else
+                error(Misc::StringUtils::format("unexpected key '%s'", std::string{key}));
+
+            expect<Lexer::SemiColon>();
+        }
+
+        if (mPassKeys.empty())
+            error("pass list in 'technique' block cannot be empty.");
+    }
+
+    template<>
+    void Technique::parseBlockImp<Lexer::Main_Pass>()
+    {
+        if (mMainTemplate)
+            error("duplicate 'main_pass' block");
+
+        if (mName != "main")
+            error("'main_pass' block can only be defined in the 'main.omwfx' technique file");
+
+        mMainTemplate = new osg::Texture2D;
+
+        mMainTemplate->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
+        mMainTemplate->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
+
+        while (!isNext<Lexer::Close_bracket>() && !isNext<Lexer::Eof>())
+        {
+            expect<Lexer::Literal>();
+
+            auto key = std::get<Lexer::Literal>(mToken).value;
+
+            expect<Lexer::Equal>();
+
+            if (key == "wrap_s")
+                mMainTemplate->setWrap(osg::Texture::WRAP_S, parseWrapMode());
+            else if (key == "wrap_t")
+                mMainTemplate->setWrap(osg::Texture::WRAP_T, parseWrapMode());
+            // Skip depth attachments for main scene, as some engine settings rely on specific depth formats.
+            // Allowing this to be overriden will cause confusion.
+            else if (key == "internal_format")
+                mMainTemplate->setInternalFormat(parseInternalFormat());
+            else if (key == "source_type")
+                mMainTemplate->setSourceType(parseSourceType());
+            else if (key == "source_format")
+                mMainTemplate->setSourceFormat(parseSourceFormat());
+            else
+                error(Misc::StringUtils::format("unexpected key '%s'", std::string(key)));
+
+            expect<Lexer::SemiColon>();
+        }
+    }
+
+    template<>
+    void Technique::parseBlockImp<Lexer::Render_Target>()
+    {
+        if (mRenderTargets.count(mBlockName))
+            error(Misc::StringUtils::format("redeclaration of render target '%s'", std::string(mBlockName)));
+
+        fx::Types::RenderTarget rt;
+        rt.mTarget->setTextureSize(mWidth, mHeight);
+        rt.mTarget->setSourceFormat(GL_RGB);
+        rt.mTarget->setInternalFormat(GL_RGB);
+        rt.mTarget->setSourceType(GL_UNSIGNED_BYTE);
+
+        while (!isNext<Lexer::Close_bracket>() && !isNext<Lexer::Eof>())
+        {
+            expect<Lexer::Literal>();
+
+            auto key = std::get<Lexer::Literal>(mToken).value;
+
+            expect<Lexer::Equal>();
+
+            if (key == "min_filter")
+                rt.mTarget->setFilter(osg::Texture2D::MIN_FILTER, parseFilterMode());
+            else if (key == "mag_filter")
+                rt.mTarget->setFilter(osg::Texture2D::MAG_FILTER, parseFilterMode());
+            else if (key == "wrap_s")
+                rt.mTarget->setWrap(osg::Texture2D::WRAP_S, parseWrapMode());
+            else if (key == "wrap_t")
+                rt.mTarget->setWrap(osg::Texture2D::WRAP_T, parseWrapMode());
+            else if (key == "width_ratio")
+                rt.mSize.mWidthRatio = parseFloat();
+            else if (key == "height_ratio")
+                rt.mSize.mHeightRatio = parseFloat();
+            else if (key == "width")
+                rt.mSize.mWidth = parseInteger();
+            else if (key == "height")
+                rt.mSize.mHeight = parseInteger();
+            else if (key == "internal_format")
+                rt.mTarget->setInternalFormat(parseInternalFormat());
+            else if (key == "source_type")
+                rt.mTarget->setSourceType(parseSourceType());
+            else if (key == "source_format")
+                rt.mTarget->setSourceFormat(parseSourceFormat());
+            else if (key == "mipmaps")
+                rt.mMipMap = parseBool();
+            else
+                error(Misc::StringUtils::format("unexpected key '%s'", std::string(key)));
+
+            expect<Lexer::SemiColon>();
+        }
+
+        mRenderTargets.emplace(mBlockName, std::move(rt));
+    }
+
+    template<>
+    void Technique::parseBlockImp<Lexer::Vertex>()
+    {
+        if (!mLexer->jump())
+            error(Misc::StringUtils::format("unterminated 'vertex' block, expected closing brackets"));
+
+        auto& pass = mPassMap[mBlockName];
+
+        if (!pass)
+            pass = std::make_shared<fx::Pass>();
+
+        pass->mName = mBlockName;
+
+        if (pass->mCompute)
+            error(Misc::StringUtils::format("'compute' block already defined. Usage is ambiguous."));
+        else if (!pass->mVertex)
+            pass->mVertex = new osg::Shader(osg::Shader::VERTEX, getBlockWithLineDirective());
+        else
+            error(Misc::StringUtils::format("duplicate vertex shader for block '%s'", std::string(mBlockName)));
+
+        pass->mType = Pass::Type::Pixel;
+    }
+
+    template<>
+    void Technique::parseBlockImp<Lexer::Fragment>()
+    {
+        if (!mLexer->jump())
+            error(Misc::StringUtils::format("unterminated 'fragment' block, expected closing brackets"));
+
+        auto& pass = mPassMap[mBlockName];
+
+        if (!pass)
+            pass = std::make_shared<fx::Pass>();
+
+        pass->mUBO = mUBO;
+        pass->mName = mBlockName;
+
+        if (pass->mCompute)
+            error(Misc::StringUtils::format("'compute' block already defined. Usage is ambiguous."));
+        else if (!pass->mFragment)
+            pass->mFragment = new osg::Shader(osg::Shader::FRAGMENT, getBlockWithLineDirective());
+        else
+            error(Misc::StringUtils::format("duplicate vertex shader for block '%s'", std::string(mBlockName)));
+
+        pass->mType = Pass::Type::Pixel;
+    }
+
+    template<>
+    void Technique::parseBlockImp<Lexer::Compute>()
+    {
+        if (!mLexer->jump())
+            error(Misc::StringUtils::format("unterminated 'compute' block, expected closing brackets"));
+
+        auto& pass = mPassMap[mBlockName];
+
+        if (!pass)
+            pass = std::make_shared<fx::Pass>();
+
+        pass->mName = mBlockName;
+
+        if (pass->mFragment)
+            error(Misc::StringUtils::format("'fragment' block already defined. Usage is ambiguous."));
+        else if (pass->mVertex)
+            error(Misc::StringUtils::format("'vertex' block already defined. Usage is ambiguous."));
+        else if (!pass->mFragment)
+            pass->mCompute = new osg::Shader(osg::Shader::COMPUTE, getBlockWithLineDirective());
+        else
+            error(Misc::StringUtils::format("duplicate vertex shader for block '%s'", std::string(mBlockName)));
+
+        pass->mType = Pass::Type::Compute;
+    }
+
+    template <class T>
+    void Technique::parseSampler()
+    {
+        if (findUniform(std::string(mBlockName)) != mDefinedUniforms.end())
+            error(Misc::StringUtils::format("redeclaration of uniform '%s'", std::string(mBlockName)));
+
+        ProxyTextureData proxy;
+        osg::ref_ptr<osg::Texture> sampler;
+
+        constexpr bool is1D = std::is_same_v<Lexer::Sampler_1D, T>;
+        constexpr bool is3D = std::is_same_v<Lexer::Sampler_3D, T>;
+
+        Types::SamplerType type;
+
+        while (!isNext<Lexer::Close_bracket>() && !isNext<Lexer::Eof>())
+        {
+            expect<Lexer::Literal>();
+
+            auto key = asLiteral();
+
+            expect<Lexer::Equal>();
+
+            if (!is1D && key == "min_filter")
+                proxy.min_filter = parseFilterMode();
+            else if (!is1D && key == "mag_filter")
+                proxy.mag_filter = parseFilterMode();
+            else if (key == "wrap_s")
+                proxy.wrap_s = parseWrapMode();
+            else if (key == "wrap_t")
+                proxy.wrap_t = parseWrapMode();
+            else if (is3D && key == "wrap_r")
+                proxy.wrap_r = parseWrapMode();
+            else if (key == "compression")
+                proxy.compression = parseCompression();
+            else if (key == "source_type")
+                proxy.source_type = parseSourceType();
+            else if (key == "source_format")
+                proxy.source_format = parseSourceFormat();
+            else if (key == "internal_format")
+                proxy.internal_format = parseInternalFormat();
+            else if (key == "source")
+            {
+                expect<Lexer::String>();
+                auto image = mImageManager.getImage(std::string{std::get<Lexer::String>(mToken).value});
+                if constexpr (is1D)
+                {
+                    type = Types::SamplerType::Texture_1D;
+                    sampler = new osg::Texture1D(image);
+                }
+                else if constexpr (is3D)
+                {
+                    type = Types::SamplerType::Texture_3D;
+                    sampler = new osg::Texture3D(image);
+                }
+                else
+                {
+                    type = Types::SamplerType::Texture_2D;
+                    sampler = new osg::Texture2D(image);
+                }
+            }
+            else
+                error(Misc::StringUtils::format("unexpected key '%s'", std::string{key}));
+
+            expect<Lexer::SemiColon>();
+        }
+        if (!sampler)
+            error(Misc::StringUtils::format("%s '%s' requires a filename", std::string(T::repr), std::string{mBlockName}));
+
+        if (!is1D)
+        {
+            sampler->setFilter(osg::Texture::MIN_FILTER, proxy.min_filter);
+            sampler->setFilter(osg::Texture::MAG_FILTER, proxy.mag_filter);
+        }
+        if (is3D)
+            sampler->setWrap(osg::Texture::WRAP_R, proxy.wrap_r);
+        sampler->setWrap(osg::Texture::WRAP_S, proxy.wrap_s);
+        sampler->setWrap(osg::Texture::WRAP_T, proxy.wrap_t);
+        sampler->setInternalFormatMode(proxy.compression);
+        if (proxy.internal_format.has_value())
+            sampler->setInternalFormat(proxy.internal_format.value());
+        if (proxy.source_type.has_value())
+            sampler->setSourceType(proxy.source_type.value());
+        if (proxy.internal_format.has_value())
+            sampler->setSourceFormat(proxy.internal_format.value());
+        sampler->setName(std::string{mBlockName});
+
+        mTextures.emplace_back(sampler);
+
+        std::shared_ptr<Types::UniformBase> uniform = std::make_shared<Types::UniformBase>();
+        uniform->mSamplerType = type;
+        uniform->mName = std::string(mBlockName);
+        mDefinedUniforms.emplace_back(std::move(uniform));
+    }
+
+    template <class SrcT, class T>
+    void Technique::parseUniform()
+    {
+        if (findUniform(std::string(mBlockName)) != mDefinedUniforms.end())
+            error(Misc::StringUtils::format("redeclaration of uniform '%s'", std::string(mBlockName)));
+
+        std::shared_ptr<Types::UniformBase> uniform = std::make_shared<Types::UniformBase>();
+        Types::Uniform<SrcT> data;
+
+        while (!isNext<Lexer::Close_bracket>() && !isNext<Lexer::Eof>())
+        {
+            expect<Lexer::Literal>();
+
+            auto key = asLiteral();
+
+            expect<Lexer::Equal>("error parsing config for uniform block");
+
+            constexpr bool isVec = std::is_same_v<osg::Vec2f, SrcT> || std::is_same_v<osg::Vec3f, SrcT> || std::is_same_v<osg::Vec4f, SrcT>;
+            constexpr bool isFloat = std::is_same_v<float, SrcT>;
+            constexpr bool isInt = std::is_same_v<int, SrcT>;
+
+            std::optional<double> step;
+
+            if constexpr (isInt)
+                step = 1.0;
+
+            if (key == "default")
+            {
+                if constexpr (isVec)
+                    data.mDefault = parseVec<SrcT, T>();
+                else if constexpr (isFloat)
+                    data.mDefault = parseFloat();
+                else if constexpr (isInt)
+                    data.mDefault = parseInteger();
+                else
+                    data.mDefault = parseBool();
+            }
+            else if (key == "min")
+            {
+                if constexpr (isVec)
+                    data.mMin = parseVec<SrcT, T>();
+                else if constexpr (isFloat)
+                    data.mMin = parseFloat();
+                else if constexpr (isInt)
+                    data.mMin = parseInteger();
+                else
+                    data.mMin = parseBool();
+            }
+            else if (key == "max")
+            {
+                if constexpr (isVec)
+                    data.mMax = parseVec<SrcT, T>();
+                else if constexpr (isFloat)
+                    data.mMax = parseFloat();
+                else if constexpr (isInt)
+                    data.mMax = parseInteger();
+                else
+                    data.mMax = parseBool();
+            }
+            else if (key == "step")
+                step = parseFloat();
+            else if (key == "static")
+                uniform->mStatic = parseBool();
+            else if (key == "description")
+            {
+                expect<Lexer::String>();
+                uniform->mDescription = std::get<Lexer::String>(mToken).value;
+            }
+            else if (key == "header")
+            {
+                expect<Lexer::String>();
+                uniform->mHeader = std::get<Lexer::String>(mToken).value;
+            }
+            else
+                error(Misc::StringUtils::format("unexpected key '%s'", std::string{key}));
+
+            if (step)
+                uniform->mStep = step.value();
+
+            expect<Lexer::SemiColon>();
+        }
+
+        uniform->mName = std::string(mBlockName);
+        uniform->mData = data;
+        uniform->mTechniqueName = mName;
+
+        if (auto cached = Settings::ShaderManager::get().getValue<SrcT>(mName, uniform->mName))
+            uniform->setValue<SrcT>(cached.value());
+
+        mDefinedUniforms.emplace_back(std::move(uniform));
+    }
+
+    template<>
+    void Technique::parseBlockImp<Lexer::Sampler_1D>()
+    {
+        parseSampler<Lexer::Sampler_1D>();
+    }
+
+    template<>
+    void Technique::parseBlockImp<Lexer::Sampler_2D>()
+    {
+        parseSampler<Lexer::Sampler_2D>();
+    }
+
+    template<>
+    void Technique::parseBlockImp<Lexer::Sampler_3D>()
+    {
+        parseSampler<Lexer::Sampler_3D>();
+    }
+
+    template<>
+    void Technique::parseBlockImp<Lexer::Uniform_Bool>()
+    {
+        parseUniform<bool, bool>();
+    }
+
+    template<>
+    void Technique::parseBlockImp<Lexer::Uniform_Float>()
+    {
+        parseUniform<float, float>();
+    }
+
+    template<>
+    void Technique::parseBlockImp<Lexer::Uniform_Int>()
+    {
+        parseUniform<int, int>();
+    }
+
+    template<>
+    void Technique::parseBlockImp<Lexer::Uniform_Vec2>()
+    {
+        parseUniform<osg::Vec2f, Lexer::Vec2>();
+    }
+
+    template<>
+    void Technique::parseBlockImp<Lexer::Uniform_Vec3>()
+    {
+        parseUniform<osg::Vec3f, Lexer::Vec3>();
+    }
+
+    template<>
+    void Technique::parseBlockImp<Lexer::Uniform_Vec4>()
+    {
+        parseUniform<osg::Vec4f, Lexer::Vec4>();
+    }
+
+    template<class T>
+    void Technique::expect(const std::string& err)
+    {
+        mToken = mLexer->next();
+        if (!std::holds_alternative<T>(mToken))
+        {
+            if (err.empty())
+                error(Misc::StringUtils::format("Expected %s", std::string(T::repr)));
+            else
+                error(Misc::StringUtils::format("%s. Expected %s", err, std::string(T::repr)));
+        }
+    }
+
+    template<class T, class T2>
+    void Technique::expect(const std::string& err)
+    {
+        mToken = mLexer->next();
+        if (!std::holds_alternative<T>(mToken) && !std::holds_alternative<T2>(mToken))
+        {
+            if (err.empty())
+                error(Misc::StringUtils::format("%s. Expected %s or %s", err, std::string(T::repr), std::string(T2::repr)));
+            else
+                error(Misc::StringUtils::format("Expected %s or %s", std::string(T::repr), std::string(T2::repr)));
+        }
+    }
+
+    template <class T>
+    bool Technique::isNext()
+    {
+        return std::holds_alternative<T>(mLexer->peek());
+    }
+
+    void Technique::parse(std::string&& buffer)
+    {
+        mBuffer = std::move(buffer);
+        Misc::StringUtils::replaceAll(mBuffer, "\r\n", "\n");
+        mLexer = std::make_unique<Lexer::Lexer>(mBuffer);
+
+        for (auto t = mLexer->next(); !std::holds_alternative<Lexer::Eof>(t); t = mLexer->next())
+        {
+            std::visit([=](auto&& arg) {
+                using T = std::decay_t<decltype(arg)>;
+
+                if constexpr (std::is_same_v<Lexer::Shared, T>)
+                    parseBlock<Lexer::Shared>(false);
+                else if constexpr (std::is_same_v<Lexer::Technique, T>)
+                    parseBlock<Lexer::Technique>(false);
+                else if constexpr (std::is_same_v<Lexer::Main_Pass, T>)
+                    parseBlock<Lexer::Main_Pass>(false);
+                else if constexpr (std::is_same_v<Lexer::Render_Target, T>)
+                    parseBlock<Lexer::Render_Target>();
+                else if constexpr (std::is_same_v<Lexer::Vertex, T>)
+                    parseBlock<Lexer::Vertex>();
+                else if constexpr (std::is_same_v<Lexer::Fragment, T>)
+                    parseBlock<Lexer::Fragment>();
+                else if constexpr (std::is_same_v<Lexer::Compute, T>)
+                    parseBlock<Lexer::Compute>();
+                else if constexpr (std::is_same_v<Lexer::Sampler_1D, T>)
+                    parseBlock<Lexer::Sampler_1D>();
+                else if constexpr (std::is_same_v<Lexer::Sampler_2D, T>)
+                    parseBlock<Lexer::Sampler_2D>();
+                else if constexpr (std::is_same_v<Lexer::Sampler_3D, T>)
+                    parseBlock<Lexer::Sampler_3D>();
+                else if constexpr (std::is_same_v<Lexer::Uniform_Bool, T>)
+                    parseBlock<Lexer::Uniform_Bool>();
+                else if constexpr (std::is_same_v<Lexer::Uniform_Float, T>)
+                    parseBlock<Lexer::Uniform_Float>();
+                else if constexpr (std::is_same_v<Lexer::Uniform_Int, T>)
+                    parseBlock<Lexer::Uniform_Int>();
+                else if constexpr (std::is_same_v<Lexer::Uniform_Vec2, T>)
+                    parseBlock<Lexer::Uniform_Vec2>();
+                else if constexpr (std::is_same_v<Lexer::Uniform_Vec3, T>)
+                    parseBlock<Lexer::Uniform_Vec3>();
+                else if constexpr (std::is_same_v<Lexer::Uniform_Vec4, T>)
+                    parseBlock<Lexer::Uniform_Vec4>();
+                else
+                    error("invalid top level block");
+            }
+            , t);
+        }
+    }
+
+    template <class T>
+    void Technique::parseBlock(bool named)
+    {
+        mBlockName = T::repr;
+
+        if (named)
+        {
+            expect<Lexer::Literal>("name is required for preceeding block decleration");
+
+            mBlockName = std::get<Lexer::Literal>(mToken).value;
+
+            if (isNext<Lexer::Open_Parenthesis>())
+                parseBlockHeader();
+        }
+
+        expect<Lexer::Open_bracket>();
+
+        parseBlockImp<T>();
+
+        expect<Lexer::Close_bracket>();
+    }
+
+    template <class TDelimeter>
+    std::vector<std::string_view> Technique::parseLiteralList()
+    {
+        std::vector<std::string_view> data;
+
+        while (!isNext<Lexer::Eof>())
+        {
+            expect<Lexer::Literal>();
+
+            data.emplace_back(std::get<Lexer::Literal>(mToken).value);
+
+            if (!isNext<TDelimeter>())
+                break;
+
+            mLexer->next();
+        }
+
+        return data;
+    }
+
+    void Technique::parseBlockHeader()
+    {
+        expect<Lexer::Open_Parenthesis>();
+
+        if (isNext<Lexer::Close_Parenthesis>())
+        {
+            mLexer->next();
+            return;
+        }
+
+        auto& pass = mPassMap[mBlockName];
+
+        if (!pass)
+            pass = std::make_shared<fx::Pass>();
+
+        bool clear = true;
+        osg::Vec4f clearColor = {1,1,1,1};
+
+        while (!isNext<Lexer::Eof>())
+        {
+            expect<Lexer::Literal>("invalid key in block header");
+
+            std::string_view key = std::get<Lexer::Literal>(mToken).value;
+
+            expect<Lexer::Equal>();
+
+            if (key == "target")
+            {
+                expect<Lexer::Literal>();
+                pass->mTarget = std::get<Lexer::Literal>(mToken).value;
+            }
+            else if (key == "blend")
+            {
+                expect<Lexer::Open_Parenthesis>();
+                osg::BlendEquation::Equation blendEq = parseBlendEquation();
+                expect<Lexer::Comma>();
+                osg::BlendFunc::BlendFuncMode blendSrc = parseBlendFuncMode();
+                expect<Lexer::Comma>();
+                osg::BlendFunc::BlendFuncMode blendDest = parseBlendFuncMode();
+                expect<Lexer::Close_Parenthesis>();
+
+                pass->mBlendSource = blendSrc;
+                pass->mBlendDest = blendDest;
+                if (blendEq != osg::BlendEquation::FUNC_ADD)
+                    pass->mBlendEq = blendEq;
+            }
+            else if (key == "clear")
+                clear = parseBool();
+            else if (key == "clear_color")
+                clearColor = parseVec<osg::Vec4f, Lexer::Vec4>();
+            else
+                error(Misc::StringUtils::format("unrecognized key '%s' in block header", std::string(key)));
+
+            mToken = mLexer->next();
+
+            if (std::holds_alternative<Lexer::Comma>(mToken))
+            {
+                if (std::holds_alternative<Lexer::Close_Parenthesis>(mLexer->peek()))
+                    error(Misc::StringUtils::format("leading comma in '%s' is not allowed", std::string(mBlockName)));
+                else
+                    continue;
+            }
+
+            if (std::holds_alternative<Lexer::Close_Parenthesis>(mToken))
+                return;
+        }
+
+        if (clear)
+            pass->mClearColor = clearColor;
+
+        error("malformed block header");
+    }
+
+    std::string_view Technique::asLiteral() const
+    {
+        return std::get<Lexer::Literal>(mToken).value;
+    }
+
+    FlagsType Technique::parseFlags()
+    {
+        auto parseBit = [this] (std::string_view term) {
+            for (const auto& [identifer, bit]: constants::TechniqueFlag)
+            {
+                if (Misc::StringUtils::ciEqual(term, identifer))
+                    return bit;
+            }
+            error(Misc::StringUtils::format("unrecognized flag '%s'", std::string(term)));
+        };
+
+        FlagsType flag = 0;
+        for (const auto& bit : parseLiteralList<Lexer::Comma>())
+            flag |= parseBit(bit);
+
+        return flag;
+    }
+
+    osg::Texture::FilterMode Technique::parseFilterMode()
+    {
+        expect<Lexer::Literal>();
+
+        for (const auto& [identifer, mode]: constants::FilterMode)
+        {
+            if (asLiteral() == identifer)
+                return mode;
+        }
+
+        error(Misc::StringUtils::format("unrecognized filter mode '%s'", std::string{asLiteral()}));
+    }
+
+    osg::Texture::WrapMode Technique::parseWrapMode()
+    {
+        expect<Lexer::Literal>();
+
+        for (const auto& [identifer, mode]: constants::WrapMode)
+        {
+            if (asLiteral() == identifer)
+                return mode;
+        }
+
+        error(Misc::StringUtils::format("unrecognized wrap mode '%s'", std::string{asLiteral()}));
+    }
+
+    osg::Texture::InternalFormatMode Technique::parseCompression()
+    {
+        expect<Lexer::Literal>();
+
+        for (const auto& [identifer, mode]: constants::Compression)
+        {
+            if (asLiteral() == identifer)
+                return mode;
+        }
+
+        error(Misc::StringUtils::format("unrecognized compression '%s'", std::string{asLiteral()}));
+    }
+
+    int Technique::parseInternalFormat()
+    {
+        expect<Lexer::Literal>();
+
+        for (const auto& [identifer, mode]: constants::InternalFormat)
+        {
+            if (asLiteral() == identifer)
+                return mode;
+        }
+
+        error(Misc::StringUtils::format("unrecognized internal format '%s'", std::string{asLiteral()}));
+    }
+
+    int Technique::parseSourceType()
+    {
+        expect<Lexer::Literal>();
+
+        for (const auto& [identifer, mode]: constants::SourceType)
+        {
+            if (asLiteral() == identifer)
+                return mode;
+        }
+
+        error(Misc::StringUtils::format("unrecognized source type '%s'", std::string{asLiteral()}));
+    }
+
+    int Technique::parseSourceFormat()
+    {
+        expect<Lexer::Literal>();
+
+        for (const auto& [identifer, mode]: constants::SourceFormat)
+        {
+            if (asLiteral() == identifer)
+                return mode;
+        }
+
+        error(Misc::StringUtils::format("unrecognized source format '%s'", std::string{asLiteral()}));
+    }
+
+    osg::BlendEquation::Equation Technique::parseBlendEquation()
+    {
+        expect<Lexer::Literal>();
+
+        for (const auto& [identifer, mode]: constants::BlendEquation)
+        {
+            if (asLiteral() == identifer)
+                return mode;
+        }
+
+        error(Misc::StringUtils::format("unrecognized blend equation '%s'", std::string{asLiteral()}));
+    }
+
+    osg::BlendFunc::BlendFuncMode Technique::parseBlendFuncMode()
+    {
+        expect<Lexer::Literal>();
+
+        for (const auto& [identifer, mode]: constants::BlendFunc)
+        {
+            if (asLiteral() == identifer)
+                return mode;
+        }
+
+        error(Misc::StringUtils::format("unrecognized blend function '%s'", std::string{asLiteral()}));
+    }
+
+    bool Technique::parseBool()
+    {
+        mToken = mLexer->next();
+
+        if (std::holds_alternative<Lexer::True>(mToken))
+            return true;
+        if (std::holds_alternative<Lexer::False>(mToken))
+            return false;
+
+        error("expected 'true' or 'false' as boolean value");
+    }
+
+    std::string_view Technique::parseString()
+    {
+        expect<Lexer::String>();
+
+        return std::get<Lexer::String>(mToken).value;
+    }
+
+    float Technique::parseFloat()
+    {
+        mToken = mLexer->next();
+
+        if (std::holds_alternative<Lexer::Float>(mToken))
+            return std::get<Lexer::Float>(mToken).value;
+        if (std::holds_alternative<Lexer::Integer>(mToken))
+            return static_cast<float>(std::get<Lexer::Integer>(mToken).value);
+
+        error("expected float value");
+    }
+
+    int Technique::parseInteger()
+    {
+        expect<Lexer::Integer>();
+
+        return std::get<Lexer::Integer>(mToken).value;
+    }
+
+    template <class OSGVec, class T>
+    OSGVec Technique::parseVec()
+    {
+        expect<T>();
+        expect<Lexer::Open_Parenthesis>();
+
+        OSGVec value;
+
+        for (int i = 0; i < OSGVec::num_components; ++i)
+        {
+            value[i] = parseFloat();
+
+            if (i < OSGVec::num_components - 1)
+                expect<Lexer::Comma>();
+        }
+
+        expect<Lexer::Close_Parenthesis>("check definition of the vector");
+
+        return value;
+    }
+}
diff --git a/components/fx/technique.hpp b/components/fx/technique.hpp
new file mode 100644
index 0000000000..ca8ef96a52
--- /dev/null
+++ b/components/fx/technique.hpp
@@ -0,0 +1,300 @@
+#ifndef OPENMW_COMPONENTS_FX_TECHNIQUE_H
+#define OPENMW_COMPONENTS_FX_TECHNIQUE_H
+
+#include <vector>
+#include <string>
+#include <variant>
+#include <memory>
+#include <unordered_map>
+#include <filesystem>
+
+#include <osg/Node>
+#include <osg/Program>
+#include <osg/Shader>
+#include <osg/Texture2D>
+#include <osg/StateSet>
+#include <osg/FrameBufferObject>
+#include <osg/Vec2f>
+#include <osg/Vec3f>
+#include <osg/Vec4f>
+#include <osg/BlendFunc>
+#include <osg/BlendEquation>
+
+#include "pass.hpp"
+#include "lexer.hpp"
+#include "types.hpp"
+
+namespace Resource
+{
+    class ImageManager;
+}
+
+namespace VFS
+{
+    class Manager;
+}
+
+namespace fx
+{
+    using FlagsType = size_t;
+
+    struct DispatchNode
+    {
+        DispatchNode() = default;
+
+        DispatchNode(const DispatchNode& other, const osg::CopyOp& copyOp = osg::CopyOp::SHALLOW_COPY)
+            : mHandle(other.mHandle)
+            , mFlags(other.mFlags)
+            , mRootStateSet(other.mRootStateSet)
+        {
+            mPasses.reserve(other.mPasses.size());
+
+            for (const auto& subpass : other.mPasses)
+                mPasses.emplace_back(subpass, copyOp);
+        }
+
+        struct SubPass {
+            SubPass() = default;
+
+            osg::ref_ptr<osg::StateSet> mStateSet = new osg::StateSet;
+            osg::ref_ptr<osg::FrameBufferObject> mRenderTarget;
+            osg::ref_ptr<osg::Texture2D> mRenderTexture;
+
+            SubPass(const SubPass& other, const osg::CopyOp& copyOp = osg::CopyOp::SHALLOW_COPY)
+                : mStateSet(new osg::StateSet(*other.mStateSet, copyOp))
+            {
+                if (other.mRenderTarget)
+                    mRenderTarget = new osg::FrameBufferObject(*other.mRenderTarget, copyOp);
+                if (other.mRenderTexture)
+                    mRenderTexture = new osg::Texture2D(*other.mRenderTexture, copyOp);
+            }
+        };
+
+        // not safe to read/write in draw thread
+        std::shared_ptr<fx::Technique> mHandle = nullptr;
+
+        FlagsType mFlags = 0;
+
+        std::vector<SubPass> mPasses;
+
+        osg::ref_ptr<osg::StateSet> mRootStateSet = new osg::StateSet;
+    };
+
+    using DispatchArray = std::vector<DispatchNode>;
+
+    class Technique
+    {
+    public:
+        using PassList = std::vector<std::shared_ptr<Pass>>;
+        using TexList = std::vector<osg::ref_ptr<osg::Texture>>;
+
+        using UniformMap = std::vector<std::shared_ptr<Types::UniformBase>>;
+        using RenderTargetMap = std::unordered_map<std::string_view, Types::RenderTarget>;
+
+        inline static std::string sExt = ".omwfx";
+        inline static std::string sSubdir = "shaders";
+
+        enum class Status
+        {
+            Success,
+            Uncompiled,
+            File_Not_exists,
+            Parse_Error
+        };
+
+        static constexpr FlagsType Flag_Disable_Interiors = (1 << 0);
+        static constexpr FlagsType Flag_Disable_Exteriors = (1 << 1);
+        static constexpr FlagsType Flag_Disable_Underwater = (1 << 2);
+        static constexpr FlagsType Flag_Disable_Abovewater = (1 << 3);
+        static constexpr FlagsType Flag_Disable_SunGlare = (1 << 4);
+        static constexpr FlagsType Flag_Hidden = (1 << 5);
+
+        Technique(const VFS::Manager& vfs, Resource::ImageManager& imageManager, const std::string& name, int width, int height, bool ubo, bool supportsNormals);
+
+        bool compile();
+
+        std::string getName() const;
+
+        std::string getFileName() const;
+
+        void setLastModificationTime(std::filesystem::file_time_type timeStamp, bool dirty = true);
+
+        bool isDirty() const { return mDirty; }
+
+        void setDirty(bool dirty) { mDirty = dirty; }
+
+        bool isValid() const { return mValid; }
+
+        bool getHDR() const { return mHDR; }
+
+        bool getNormals() const { return mNormals && mSupportsNormals; }
+
+        const PassList& getPasses() { return mPasses; }
+
+        const TexList& getTextures() const { return mTextures; }
+
+        Status getStatus() const { return mStatus; }
+
+        std::string_view getAuthor() const { return mAuthor; }
+
+        std::string_view getDescription() const { return mDescription; }
+
+        std::string_view getVersion() const { return mVersion; }
+
+        int getGLSLVersion() const { return mGLSLVersion; }
+
+        std::string getGLSLProfile() const { return mGLSLProfile; }
+
+        const std::unordered_set<std::string>& getGLSLExtensions() const { return mGLSLExtensions; }
+
+        osg::ref_ptr<osg::Texture2D> getMainTemplate() const { return mMainTemplate; }
+
+        FlagsType getFlags() const { return mFlags; }
+
+        bool getHidden() const { return mFlags & Flag_Hidden; }
+
+        UniformMap& getUniformMap() { return mDefinedUniforms; }
+
+        RenderTargetMap& getRenderTargetsMap() { return mRenderTargets; }
+
+        std::string getLastError() const { return mLastError; }
+
+        UniformMap::iterator findUniform(const std::string& name);
+
+    private:
+        [[noreturn]] void error(const std::string& msg);
+
+        void clear();
+
+        std::string_view asLiteral() const;
+
+        template<class T>
+        void expect(const std::string& err="");
+
+        template<class T, class T2>
+        void expect(const std::string& err="");
+
+        template <class T>
+        bool isNext();
+
+        void parse(std::string&& buffer);
+
+        template <class SrcT, class T>
+        void parseUniform();
+
+        template <class T>
+        void parseSampler();
+
+        template <class T>
+        void parseBlock(bool named=true);
+
+        template <class T>
+        void parseBlockImp() {}
+
+        void parseBlockHeader();
+
+        bool parseBool();
+
+        std::string_view parseString();
+
+        float parseFloat();
+
+        int parseInteger();
+
+        int parseInternalFormat();
+
+        int parseSourceType();
+
+        int parseSourceFormat();
+
+        osg::BlendEquation::Equation parseBlendEquation();
+
+        osg::BlendFunc::BlendFuncMode parseBlendFuncMode();
+
+        osg::Texture::WrapMode parseWrapMode();
+
+        osg::Texture::InternalFormatMode parseCompression();
+
+        FlagsType parseFlags();
+
+        osg::Texture::FilterMode parseFilterMode();
+
+        template <class TDelimeter>
+        std::vector<std::string_view> parseLiteralList();
+
+        template <class OSGVec, class T>
+        OSGVec parseVec();
+
+        std::string getBlockWithLineDirective();
+
+        std::unique_ptr<Lexer::Lexer> mLexer;
+        Lexer::Token mToken;
+
+        std::string mShared;
+        std::string mName;
+        std::string mFileName;
+        std::string_view mBlockName;
+        std::string_view mAuthor;
+        std::string_view mDescription;
+        std::string_view mVersion;
+
+        std::unordered_set<std::string> mGLSLExtensions;
+        int mGLSLVersion;
+        std::string mGLSLProfile;
+
+        FlagsType mFlags;
+
+        Status mStatus;
+
+        bool mEnabled;
+
+        std::filesystem::file_time_type mLastModificationTime;
+        bool mDirty;
+        bool mValid;
+        bool mHDR;
+        bool mNormals;
+        int mWidth;
+        int mHeight;
+
+        osg::ref_ptr<osg::Texture2D> mMainTemplate;
+        RenderTargetMap mRenderTargets;
+
+        TexList mTextures;
+        PassList mPasses;
+
+        std::unordered_map<std::string_view, std::shared_ptr<Pass>> mPassMap;
+        std::vector<std::string_view> mPassKeys;
+
+        Pass::Type mLastAppliedType;
+
+        UniformMap mDefinedUniforms;
+
+        const VFS::Manager& mVFS;
+        Resource::ImageManager& mImageManager;
+        bool mUBO;
+        bool mSupportsNormals;
+
+        std::string mBuffer;
+
+        std::string mLastError;
+    };
+
+    template<> void Technique::parseBlockImp<Lexer::Shared>();
+    template<> void Technique::parseBlockImp<Lexer::Technique>();
+    template<> void Technique::parseBlockImp<Lexer::Main_Pass>();
+    template<> void Technique::parseBlockImp<Lexer::Render_Target>();
+    template<> void Technique::parseBlockImp<Lexer::Vertex>();
+    template<> void Technique::parseBlockImp<Lexer::Fragment>();
+    template<> void Technique::parseBlockImp<Lexer::Compute>();
+    template<> void Technique::parseBlockImp<Lexer::Sampler_1D>();
+    template<> void Technique::parseBlockImp<Lexer::Sampler_2D>();
+    template<> void Technique::parseBlockImp<Lexer::Sampler_3D>();
+    template<> void Technique::parseBlockImp<Lexer::Uniform_Bool>();
+    template<> void Technique::parseBlockImp<Lexer::Uniform_Float>();
+    template<> void Technique::parseBlockImp<Lexer::Uniform_Int>();
+    template<> void Technique::parseBlockImp<Lexer::Uniform_Vec2>();
+    template<> void Technique::parseBlockImp<Lexer::Uniform_Vec3>();
+    template<> void Technique::parseBlockImp<Lexer::Uniform_Vec4>();
+}
+
+#endif
diff --git a/components/fx/types.hpp b/components/fx/types.hpp
new file mode 100644
index 0000000000..f12810197f
--- /dev/null
+++ b/components/fx/types.hpp
@@ -0,0 +1,259 @@
+#ifndef OPENMW_COMPONENTS_FX_TYPES_H
+#define OPENMW_COMPONENTS_FX_TYPES_H
+
+#include <optional>
+
+#include <osg/Camera>
+#include <osg/Uniform>
+#include <osg/Texture2D>
+#include <osg/FrameBufferObject>
+#include <osg/BlendFunc>
+#include <osg/BlendEquation>
+
+#include <MyGUI_Widget.h>
+
+#include <components/sceneutil/depth.hpp>
+#include <components/settings/shadermanager.hpp>
+#include <components/misc/stringops.hpp>
+#include <components/debug/debuglog.hpp>
+
+#include "pass.hpp"
+
+namespace fx
+{
+    namespace Types
+    {
+        struct SizeProxy
+        {
+            std::optional<float> mWidthRatio;
+            std::optional<float> mHeightRatio;
+            std::optional<int> mWidth;
+            std::optional<int> mHeight;
+
+            std::tuple<int,int> get(int width, int height) const
+            {
+                int scaledWidth = width;
+                int scaledHeight = height;
+
+                if (mWidthRatio)
+                    scaledWidth = width * mWidthRatio.value();
+                else if (mWidth)
+                    scaledWidth = mWidth.value();
+
+                if (mHeightRatio > 0.f)
+                    scaledHeight = height * mHeightRatio.value();
+                else if (mHeight)
+                    scaledHeight = mHeight.value();
+
+                return std::make_tuple(scaledWidth, scaledHeight);
+            }
+        };
+
+        struct RenderTarget
+        {
+            osg::ref_ptr<osg::Texture2D> mTarget = new osg::Texture2D;
+            SizeProxy mSize;
+            bool mMipMap = false;
+        };
+
+        template <class T>
+        struct Uniform
+        {
+            std::optional<T> mValue;
+            T mDefault;
+            T mMin = std::numeric_limits<T>::lowest();
+            T mMax = std::numeric_limits<T>::max();
+
+            using value_type = T;
+
+            T getValue() const
+            {
+                return mValue.value_or(mDefault);
+            }
+        };
+
+        using Uniform_t = std::variant<
+            Uniform<osg::Vec2f>,
+            Uniform<osg::Vec3f>,
+            Uniform<osg::Vec4f>,
+            Uniform<bool>,
+            Uniform<float>,
+            Uniform<int>
+        >;
+
+        enum SamplerType
+        {
+            Texture_1D,
+            Texture_2D,
+            Texture_3D
+        };
+
+        struct UniformBase
+        {
+            std::string mName;
+            std::string mHeader;
+            std::string mTechniqueName;
+            std::string mDescription;
+
+            bool mStatic = true;
+            std::optional<SamplerType> mSamplerType = std::nullopt;
+            double mStep;
+
+            Uniform_t mData;
+
+            template <class T>
+            T getValue() const
+            {
+                auto value = Settings::ShaderManager::get().getValue<T>(mTechniqueName, mName);
+
+                return value.value_or(std::get<Uniform<T>>(mData).getValue());
+            }
+
+            template <class T>
+            T getMin() const
+            {
+                return std::get<Uniform<T>>(mData).mMin;
+            }
+
+            template <class T>
+            T getMax() const
+            {
+                return std::get<Uniform<T>>(mData).mMax;
+            }
+
+            template <class T>
+            T getDefault() const
+            {
+                return std::get<Uniform<T>>(mData).mDefault;
+            }
+
+            template <class T>
+            void setValue(const T& value)
+            {
+                std::visit([&, value](auto&& arg){
+                    using U = typename std::decay_t<decltype(arg)>::value_type;
+
+                    if constexpr (std::is_same_v<T, U>)
+                    {
+                        arg.mValue = value;
+
+                        if (mStatic)
+                            Settings::ShaderManager::get().setValue<T>(mTechniqueName, mName, value);
+                    }
+                    else
+                    {
+                        Log(Debug::Warning) << "Attempting to set uniform '" << mName << "' with wrong type";
+                    }
+                }, mData);
+            }
+
+            void setUniform(osg::Uniform* uniform)
+            {
+                auto type = getType();
+                if (!type || type.value() != uniform->getType())
+                    return;
+
+                std::visit([&](auto&& arg)
+                {
+                    const auto value = arg.getValue();
+                    uniform->set(value);
+                }, mData);
+            }
+
+            std::optional<osg::Uniform::Type> getType() const
+            {
+                return std::visit([](auto&& arg) -> std::optional<osg::Uniform::Type> {
+                    using T = typename std::decay_t<decltype(arg)>::value_type;
+
+                    if constexpr (std::is_same_v<T, osg::Vec2f>)
+                        return osg::Uniform::FLOAT_VEC2;
+                    else if constexpr (std::is_same_v<T, osg::Vec3f>)
+                        return osg::Uniform::FLOAT_VEC3;
+                    else if constexpr (std::is_same_v<T, osg::Vec4f>)
+                        return osg::Uniform::FLOAT_VEC4;
+                    else if constexpr (std::is_same_v<T, float>)
+                        return osg::Uniform::FLOAT;
+                    else if constexpr (std::is_same_v<T, int>)
+                        return osg::Uniform::INT;
+                    else if constexpr (std::is_same_v<T, bool>)
+                        return osg::Uniform::BOOL;
+
+                    return std::nullopt;
+                }, mData);
+            }
+
+            std::optional<std::string> getGLSL()
+            {
+                if (mSamplerType)
+                {
+                    switch (mSamplerType.value())
+                    {
+                        case Texture_1D:
+                            return Misc::StringUtils::format("uniform sampler1D %s;", mName);
+                        case Texture_2D:
+                            return Misc::StringUtils::format("uniform sampler2D %s;", mName);
+                        case Texture_3D:
+                            return Misc::StringUtils::format("uniform sampler3D %s;", mName);
+                    }
+                }
+
+                bool useUniform = (Settings::ShaderManager::get().getMode() == Settings::ShaderManager::Mode::Debug || mStatic == false);
+
+                return std::visit([&](auto&& arg) -> std::optional<std::string> {
+                    using T = typename std::decay_t<decltype(arg)>::value_type;
+
+                    auto value = arg.getValue();
+
+                    if constexpr (std::is_same_v<T, osg::Vec2f>)
+                    {
+                        if (useUniform)
+                            return Misc::StringUtils::format("uniform vec2 %s;", mName);
+
+                        return Misc::StringUtils::format("const vec2 %s=vec2(%f,%f);", mName, value[0], value[1]);
+                    }
+                    else if constexpr (std::is_same_v<T, osg::Vec3f>)
+                    {
+                        if (useUniform)
+                            return Misc::StringUtils::format("uniform vec3 %s;", mName);
+
+                        return Misc::StringUtils::format("const vec3 %s=vec3(%f,%f,%f);", mName, value[0], value[1], value[2]);
+                    }
+                    else if constexpr (std::is_same_v<T, osg::Vec4f>)
+                    {
+                        if (useUniform)
+                            return Misc::StringUtils::format("uniform vec4 %s;", mName);
+
+                        return Misc::StringUtils::format("const vec4 %s=vec4(%f,%f,%f,%f);", mName, value[0], value[1], value[2], value[3]);
+                    }
+                    else if constexpr (std::is_same_v<T, float>)
+                    {
+                        if (useUniform)
+                            return Misc::StringUtils::format("uniform float %s;",  mName);
+
+                        return Misc::StringUtils::format("const float %s=%f;", mName, value);
+                    }
+                    else if constexpr (std::is_same_v<T, int>)
+                    {
+                        if (useUniform)
+                            return Misc::StringUtils::format("uniform int %s;",  mName);
+
+                        return Misc::StringUtils::format("const int %s=%i;", mName, value);
+                    }
+                    else if constexpr (std::is_same_v<T, bool>)
+                    {
+                        if (useUniform)
+                            return Misc::StringUtils::format("uniform bool %s;", mName);
+
+                        return Misc::StringUtils::format("const bool %s=%s;", mName, value ? "true" : "false");
+                    }
+
+                    return std::nullopt;
+
+                }, mData);
+            }
+
+        };
+    }
+}
+
+#endif
diff --git a/components/fx/widgets.cpp b/components/fx/widgets.cpp
new file mode 100644
index 0000000000..2206fd8c7f
--- /dev/null
+++ b/components/fx/widgets.cpp
@@ -0,0 +1,164 @@
+#include "widgets.hpp"
+
+#include <components/widgets/box.hpp>
+
+namespace
+{
+    template <class T, class WidgetT>
+    void createVectorWidget(const std::shared_ptr<fx::Types::UniformBase>& uniform, MyGUI::Widget* client, fx::Widgets::UniformBase* base)
+    {
+        int height = client->getHeight();
+        base->setSize(base->getSize().width, (base->getSize().height - height) + (height * T::num_components));
+        client->setSize(client->getSize().width, height * T::num_components);
+
+        for (int i = 0; i < T::num_components; ++i)
+        {
+            auto* widget = client->createWidget<WidgetT>("MW_ValueEditNumber", {0, height * i, client->getWidth(), height}, MyGUI::Align::Default);
+            widget->setData(uniform, static_cast<fx::Widgets::Index>(i));
+            base->addItem(widget);
+        }
+    }
+}
+
+namespace fx
+{
+    namespace Widgets
+    {
+        void EditBool::setValue(bool value)
+        {
+            auto uniform = mUniform.lock();
+
+            if (!uniform)
+                return;
+
+            mCheckbutton->setCaptionWithReplacing(value ? "#{sOn}" : "#{sOff}");
+
+            uniform->setValue<bool>(value);
+        }
+
+        void EditBool::setValueFromUniform()
+        {
+            auto uniform = mUniform.lock();
+
+            if (!uniform)
+                return;
+
+            setValue(uniform->template getValue<bool>());
+        }
+
+        void EditBool::toDefault()
+        {
+            auto uniform = mUniform.lock();
+
+            if (!uniform)
+                return;
+
+            setValue(uniform->getDefault<bool>());
+        }
+
+        void EditBool::initialiseOverride()
+        {
+            Base::initialiseOverride();
+
+            assignWidget(mCheckbutton, "Checkbutton");
+
+            mCheckbutton->eventMouseButtonClick += MyGUI::newDelegate(this, &EditBool::notifyMouseButtonClick);
+        }
+
+
+        void EditBool::notifyMouseButtonClick(MyGUI::Widget* sender)
+        {
+            auto uniform = mUniform.lock();
+
+            if (!uniform)
+                return;
+
+            setValue(!uniform->getValue<bool>());
+        }
+
+        void UniformBase::init(const std::shared_ptr<fx::Types::UniformBase>& uniform)
+        {
+            mLabel->setCaption(uniform->mName);
+
+            if (uniform->mDescription.empty())
+            {
+                mLabel->setUserString("ToolTipType", "");
+            }
+            else
+            {
+                mLabel->setUserString("ToolTipType", "Layout");
+                mLabel->setUserString("ToolTipLayout", "TextToolTip");
+                mLabel->setUserString("Caption_Text", uniform->mDescription);
+            }
+
+            std::visit([this, &uniform](auto&& arg) {
+                using T = typename std::decay_t<decltype(arg)>::value_type;
+
+                if constexpr (std::is_same_v<osg::Vec4f, T>)
+                {
+                    createVectorWidget<T, EditNumberFloat4>(uniform, mClient, this);
+                }
+                else if constexpr (std::is_same_v<osg::Vec3f, T>)
+                {
+                    createVectorWidget<T, EditNumberFloat3>(uniform, mClient, this);
+                }
+                else if constexpr (std::is_same_v<osg::Vec2f, T>)
+                {
+                    createVectorWidget<T, EditNumberFloat2>(uniform, mClient, this);
+                }
+                else if constexpr (std::is_same_v<T, float>)
+                {
+                    auto* widget = mClient->createWidget<EditNumberFloat>("MW_ValueEditNumber", {0, 0, mClient->getWidth(), mClient->getHeight()}, MyGUI::Align::Stretch);
+                    widget->setData(uniform);
+                    mBases.emplace_back(widget);
+                }
+                else if constexpr (std::is_same_v<T, int>)
+                {
+                    auto* widget = mClient->createWidget<EditNumberInt>("MW_ValueEditNumber", {0, 0, mClient->getWidth(), mClient->getHeight()}, MyGUI::Align::Stretch);
+                    widget->setData(uniform);
+                    mBases.emplace_back(widget);
+                }
+                else if constexpr (std::is_same_v<T, bool>)
+                {
+                    auto* widget = mClient->createWidget<EditBool>("MW_ValueEditBool", {0, 0, mClient->getWidth(), mClient->getHeight()}, MyGUI::Align::Stretch);
+                    widget->setData(uniform);
+                    mBases.emplace_back(widget);
+                }
+
+                mReset->eventMouseButtonClick += MyGUI::newDelegate(this, &UniformBase::notifyResetClicked);
+
+                for (EditBase* base : mBases)
+                    base->setValueFromUniform();
+
+            }, uniform->mData);
+        }
+
+        void UniformBase::addItem(EditBase* item)
+        {
+            mBases.emplace_back(item);
+        }
+
+        void UniformBase::toDefault()
+        {
+            for (EditBase* base : mBases)
+            {
+                if (base)
+                    base->toDefault();
+            }
+        }
+
+        void UniformBase::notifyResetClicked(MyGUI::Widget* sender)
+        {
+            toDefault();
+        }
+
+        void UniformBase::initialiseOverride()
+        {
+            Base::initialiseOverride();
+
+            assignWidget(mReset, "Reset");
+            assignWidget(mLabel, "Label");
+            assignWidget(mClient, "Client");
+        }
+    }
+}
\ No newline at end of file
diff --git a/components/fx/widgets.hpp b/components/fx/widgets.hpp
new file mode 100644
index 0000000000..f15e676fb6
--- /dev/null
+++ b/components/fx/widgets.hpp
@@ -0,0 +1,266 @@
+#ifndef OPENMW_COMPONENTS_FX_WIDGETS_H
+#define OPENMW_COMPONENTS_FX_WIDGETS_H
+
+#include <MyGUI_Gui.h>
+#include <MyGUI_Button.h>
+#include <MyGUI_ScrollView.h>
+#include <MyGUI_InputManager.h>
+
+#include <osg/Vec2f>
+#include <osg/Vec3f>
+#include <osg/Vec4f>
+
+#include <components/misc/stringops.hpp>
+
+#include "technique.hpp"
+#include "types.hpp"
+
+namespace Gui
+{
+    class AutoSizedTextBox;
+    class AutoSizedButton;
+}
+
+namespace fx
+{
+    namespace Widgets
+    {
+        enum Index
+        {
+            None = -1,
+            Zero = 0,
+            One = 1,
+            Two = 2,
+            Three = 3
+        };
+
+        class EditBase
+        {
+        public:
+            virtual ~EditBase() = default;
+
+            void setData(const std::shared_ptr<fx::Types::UniformBase>& uniform, Index index = None)
+            {
+                mUniform = uniform;
+                mIndex = index;
+            }
+
+            virtual void setValueFromUniform() = 0;
+
+            virtual void toDefault() = 0;
+
+        protected:
+            std::weak_ptr<fx::Types::UniformBase> mUniform;
+            Index mIndex;
+        };
+
+        class EditBool : public EditBase, public MyGUI::Widget
+        {
+            MYGUI_RTTI_DERIVED(EditBool)
+
+        public:
+            void setValue(bool value);
+            void setValueFromUniform() override;
+            void toDefault() override;
+
+        private:
+            void initialiseOverride() override;
+            void notifyMouseButtonClick(MyGUI::Widget* sender);
+
+            MyGUI::Button* mCheckbutton;
+        };
+
+        template <class T, class UType>
+        class EditNumber : public EditBase, public MyGUI::Widget
+        {
+            MYGUI_RTTI_DERIVED(EditNumber)
+
+        public:
+            EditNumber() : mLastPointerX(0) {}
+
+            void setValue(T value)
+            {
+                mValue = value;
+                if constexpr (std::is_floating_point_v<T>)
+                    mValueLabel->setCaption(Misc::StringUtils::format("%.3f", mValue));
+                else
+                    mValueLabel->setCaption(std::to_string(mValue));
+
+                if (auto uniform = mUniform.lock())
+                {
+                    if constexpr (std::is_fundamental_v<UType>)
+                        uniform->template setValue<UType>(mValue);
+                    else
+                    {
+                        UType uvalue = uniform->template getValue<UType>();
+                        uvalue[mIndex] = mValue;
+                        uniform->template setValue<UType>(uvalue);
+                    }
+                }
+            }
+
+            void setValueFromUniform() override
+            {
+                if (auto uniform = mUniform.lock())
+                {
+                    T value;
+
+                    if constexpr (std::is_fundamental_v<UType>)
+                        value = uniform->template getValue<UType>();
+                    else
+                        value = uniform->template getValue<UType>()[mIndex];
+
+                    setValue(value);
+                }
+            }
+
+            void toDefault() override
+            {
+                if (auto uniform = mUniform.lock())
+                {
+                    if constexpr (std::is_fundamental_v<UType>)
+                        setValue(uniform->template getDefault<UType>());
+                    else
+                        setValue(uniform->template getDefault<UType>()[mIndex]);
+                }
+            }
+
+        private:
+
+            void initialiseOverride() override
+            {
+                Base::initialiseOverride();
+
+                assignWidget(mDragger, "Dragger");
+                assignWidget(mValueLabel, "Value");
+                assignWidget(mButtonIncrease, "ButtonIncrease");
+                assignWidget(mButtonDecrease, "ButtonDecrease");
+
+                mButtonIncrease->eventMouseButtonClick += MyGUI::newDelegate(this, &EditNumber::notifyButtonClicked);
+                mButtonDecrease->eventMouseButtonClick += MyGUI::newDelegate(this, &EditNumber::notifyButtonClicked);
+
+                mDragger->eventMouseButtonPressed += MyGUI::newDelegate(this, &EditNumber::notifyMouseButtonPressed);
+                mDragger->eventMouseDrag += MyGUI::newDelegate(this, &EditNumber::notifyMouseButtonDragged);
+                mDragger->eventMouseWheel += MyGUI::newDelegate(this, &EditNumber::notifyMouseWheel);
+            }
+
+            void notifyMouseWheel(MyGUI::Widget* sender, int rel)
+            {
+                auto uniform = mUniform.lock();
+
+                if (!uniform)
+                    return;
+
+                if (rel > 0)
+                    increment(uniform->mStep);
+                else
+                    increment(-uniform->mStep);
+            }
+
+            void notifyMouseButtonDragged(MyGUI::Widget* sender, int left, int top, MyGUI::MouseButton id)
+            {
+                if (id != MyGUI::MouseButton::Left)
+                    return;
+
+                auto uniform = mUniform.lock();
+
+                if (!uniform)
+                    return;
+
+                int delta = left - mLastPointerX;
+
+                // allow finer tuning when shift is pressed
+                constexpr double scaling = 20.0;
+                T step = MyGUI::InputManager::getInstance().isShiftPressed() ? uniform->mStep / scaling : uniform->mStep;
+
+                if (step == 0)
+                {
+                    if constexpr (std::is_integral_v<T>)
+                        step = 1;
+                    else
+                        step = uniform->mStep;
+                }
+
+                if (delta > 0)
+                    increment(step);
+                else if (delta < 0)
+                    increment(-step);
+
+                mLastPointerX = left;
+            }
+
+            void notifyMouseButtonPressed(MyGUI::Widget* sender, int left, int top, MyGUI::MouseButton id)
+            {
+                if (id != MyGUI::MouseButton::Left)
+                    return;
+
+                mLastPointerX = left;
+            }
+
+            void increment(T step)
+            {
+                auto uniform = mUniform.lock();
+
+                if (!uniform)
+                    return;
+
+                if constexpr (std::is_fundamental_v<UType>)
+                    setValue(std::clamp<T>(uniform->template getValue<UType>() + step, uniform->template getMin<UType>(), uniform->template getMax<T>()));
+                else
+                    setValue(std::clamp<T>(uniform->template getValue<UType>()[mIndex] + step, uniform->template getMin<UType>()[mIndex], uniform->template getMax<UType>()[mIndex]));
+            }
+
+            void notifyButtonClicked(MyGUI::Widget* sender)
+            {
+                auto uniform = mUniform.lock();
+
+                if (!uniform)
+                    return;
+
+                if (sender == mButtonDecrease)
+                    increment(-uniform->mStep);
+                else if (sender == mButtonIncrease)
+                    increment(uniform->mStep);
+            }
+
+            MyGUI::Button* mButtonDecrease;
+            MyGUI::Button* mButtonIncrease;
+            MyGUI::Widget* mDragger;
+            MyGUI::TextBox* mValueLabel;
+            T mValue;
+
+            int mLastPointerX;
+        };
+
+        class EditNumberFloat4 : public EditNumber<float, osg::Vec4f> { MYGUI_RTTI_DERIVED(EditNumberFloat4) };
+        class EditNumberFloat3 : public EditNumber<float, osg::Vec3f> { MYGUI_RTTI_DERIVED(EditNumberFloat3) };
+        class EditNumberFloat2 : public EditNumber<float, osg::Vec2f> { MYGUI_RTTI_DERIVED(EditNumberFloat2) };
+        class EditNumberFloat : public EditNumber<float, float> { MYGUI_RTTI_DERIVED(EditNumberFloat) };
+        class EditNumberInt : public EditNumber<int, int> { MYGUI_RTTI_DERIVED(EditNumberInt) };
+
+        class UniformBase final : public MyGUI::Widget
+        {
+            MYGUI_RTTI_DERIVED(UniformBase)
+
+        public:
+            void init(const std::shared_ptr<fx::Types::UniformBase>& uniform);
+
+            void toDefault();
+
+            void addItem(EditBase* item);
+
+        private:
+
+            void notifyResetClicked(MyGUI::Widget* sender);
+
+            void initialiseOverride() override;
+
+            Gui::AutoSizedButton* mReset;
+            Gui::AutoSizedTextBox* mLabel;
+            MyGUI::Widget* mClient;
+            std::vector<EditBase*> mBases;
+        };
+    }
+}
+
+#endif
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 8ddc3fd102..a2779109ac 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -318,7 +318,7 @@ namespace Resource
         , mApplyLightingToEnvMaps(false)
         , mLightingMethod(SceneUtil::LightingMethod::FFP)
         , mConvertAlphaTestToAlphaToCoverage(false)
-        , mDepthFormat(0)
+        , mSupportsNormalsRT(false)
         , mSharedStateManager(new SharedStateManager)
         , mImageManager(imageManager)
         , mNifFileManager(nifFileManager)
@@ -348,7 +348,7 @@ namespace Resource
         if (forceShadersForNode)
             shaderVisitor->setForceShaders(true);
         if (disableSoftParticles)
-            shaderVisitor->setOpaqueDepthTex(nullptr);
+            shaderVisitor->setOpaqueDepthTex(nullptr, nullptr);
         node->accept(*shaderVisitor);
     }
 
@@ -368,16 +368,6 @@ namespace Resource
         return mClampLighting;
     }
 
-    void SceneManager::setDepthFormat(GLenum format)
-    {
-        mDepthFormat = format;
-    }
-
-    GLenum SceneManager::getDepthFormat() const
-    {
-        return mDepthFormat;
-    }
-
     void SceneManager::setAutoUseNormalMaps(bool use)
     {
         mAutoUseNormalMaps = use;
@@ -440,9 +430,9 @@ namespace Resource
         mConvertAlphaTestToAlphaToCoverage = convert;
     }
 
-    void SceneManager::setOpaqueDepthTex(osg::ref_ptr<osg::Texture2D> texture)
+    void SceneManager::setOpaqueDepthTex(osg::ref_ptr<osg::Texture2D> texturePing, osg::ref_ptr<osg::Texture2D> texturePong)
     {
-        mOpaqueDepthTex = texture;
+        mOpaqueDepthTex = { texturePing, texturePong };
     }
 
     SceneManager::~SceneManager()
@@ -930,7 +920,8 @@ namespace Resource
         shaderVisitor->setSpecularMapPattern(mSpecularMapPattern);
         shaderVisitor->setApplyLightingToEnvMaps(mApplyLightingToEnvMaps);
         shaderVisitor->setConvertAlphaTestToAlphaToCoverage(mConvertAlphaTestToAlphaToCoverage);
-        shaderVisitor->setOpaqueDepthTex(mOpaqueDepthTex);
+        shaderVisitor->setOpaqueDepthTex(mOpaqueDepthTex[0], mOpaqueDepthTex[1]);
+        shaderVisitor->setSupportsNormalsRT(mSupportsNormalsRT);
         return shaderVisitor;
     }
 }
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index b3a42bac45..ba5c75f7ea 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -91,9 +91,6 @@ namespace Resource
         void setClampLighting(bool clamp);
         bool getClampLighting() const;
 
-        void setDepthFormat(GLenum format);
-        GLenum getDepthFormat() const;
-
         /// @see ShaderVisitor::setAutoUseNormalMaps
         void setAutoUseNormalMaps(bool use);
 
@@ -112,12 +109,13 @@ namespace Resource
         void setSupportedLightingMethods(const SceneUtil::LightManager::SupportedMethods& supported);
         bool isSupportedLightingMethod(SceneUtil::LightingMethod method) const;
 
-        void setOpaqueDepthTex(osg::ref_ptr<osg::Texture2D> texture);
+        void setOpaqueDepthTex(osg::ref_ptr<osg::Texture2D> texturePing, osg::ref_ptr<osg::Texture2D> texturePong);
 
         enum class UBOBinding
         {
             // If we add more UBO's, we should probably assign their bindings dynamically according to the current count of UBO's in the programTemplate
-            LightBuffer
+            LightBuffer,
+            PostProcessor
         };
         void setLightingMethod(SceneUtil::LightingMethod method);
         SceneUtil::LightingMethod getLightingMethod() const;
@@ -195,6 +193,9 @@ namespace Resource
 
         void reportStats(unsigned int frameNumber, osg::Stats* stats) const override;
 
+        void setSupportsNormalsRT(bool supports) { mSupportsNormalsRT = supports; }
+        bool getSupportsNormalsRT() const { return mSupportsNormalsRT; }
+
     private:
 
         Shader::ShaderVisitor* createShaderVisitor(const std::string& shaderPrefix = "objects");
@@ -211,8 +212,8 @@ namespace Resource
         SceneUtil::LightingMethod mLightingMethod;
         SceneUtil::LightManager::SupportedMethods mSupportedLightingMethods;
         bool mConvertAlphaTestToAlphaToCoverage;
-        GLenum mDepthFormat;
-        osg::ref_ptr<osg::Texture2D> mOpaqueDepthTex;
+        bool mSupportsNormalsRT;
+        std::array<osg::ref_ptr<osg::Texture2D>, 2> mOpaqueDepthTex;
 
         osg::ref_ptr<Resource::SharedStateManager> mSharedStateManager;
         mutable std::mutex mSharedStateMutex;
diff --git a/components/sceneutil/clearcolor.hpp b/components/sceneutil/clearcolor.hpp
new file mode 100755
index 0000000000..e6e6468ecc
--- /dev/null
+++ b/components/sceneutil/clearcolor.hpp
@@ -0,0 +1,42 @@
+#ifndef OPENMW_COMPONENTS_SCENEUTIL_CLEARCOLOR_H
+#define OPENMW_COMPONENTS_SCENEUTIL_CLEARCOLOR_H
+
+#include <osg/StateAttribute>
+#include <osg/Vec4f>
+
+namespace SceneUtil
+{
+    class ClearColor : public osg::StateAttribute
+    {
+    public:
+        ClearColor() : mMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT) {}
+        ClearColor(const osg::Vec4f& color, GLbitfield mask) : mColor(color), mMask(mask) {}
+
+        ClearColor(const ClearColor& copy,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY)
+            : osg::StateAttribute(copy,copyop), mColor(copy.mColor), mMask(copy.mMask) {}
+
+        META_StateAttribute(fx, ClearColor, static_cast<osg::StateAttribute::Type>(100))
+
+        int compare(const StateAttribute& sa) const override
+        {
+            COMPARE_StateAttribute_Types(ClearColor, sa);
+
+            COMPARE_StateAttribute_Parameter(mColor);
+            COMPARE_StateAttribute_Parameter(mMask);
+
+            return 0;
+        }
+
+        void apply(osg::State& state) const override
+        {
+            glClearColor(mColor[0], mColor[1], mColor[2], mColor[3]);
+            glClear(mMask);
+        }
+
+    private:
+        osg::Vec4f mColor;
+        GLbitfield mMask;
+    };
+}
+
+#endif
diff --git a/components/sceneutil/depth.cpp b/components/sceneutil/depth.cpp
index c52bdf2ed2..f51c973389 100644
--- a/components/sceneutil/depth.cpp
+++ b/components/sceneutil/depth.cpp
@@ -44,18 +44,6 @@ namespace SceneUtil
         );
     }
 
-    bool isFloatingPointDepthFormat(GLenum format)
-    {
-        constexpr std::array<GLenum, 4> formats = {
-            GL_DEPTH_COMPONENT32F,
-            GL_DEPTH_COMPONENT32F_NV,
-            GL_DEPTH32F_STENCIL8,
-            GL_DEPTH32F_STENCIL8_NV,
-        };
-
-        return std::find(formats.cbegin(), formats.cend(), format) != formats.cend();
-    }
-
     bool isDepthFormat(GLenum format)
     {
         constexpr std::array<GLenum, 8> formats = {
diff --git a/components/sceneutil/depth.hpp b/components/sceneutil/depth.hpp
index 67cf5bdb45..f7b1875206 100644
--- a/components/sceneutil/depth.hpp
+++ b/components/sceneutil/depth.hpp
@@ -45,9 +45,6 @@ namespace SceneUtil
     // Returns an orthographic projection matrix for use with a reversed z-buffer.
     osg::Matrix getReversedZProjectionMatrixAsOrtho(double left, double right, double bottom, double top, double near, double far);
 
-    // Returns true if the GL format is a floating point depth format.
-    bool isFloatingPointDepthFormat(GLenum format);
-
     // Returns true if the GL format is a depth format
     bool isDepthFormat(GLenum format);
 
diff --git a/components/sceneutil/rtt.cpp b/components/sceneutil/rtt.cpp
index 099425330a..4ab1b4c92a 100644
--- a/components/sceneutil/rtt.cpp
+++ b/components/sceneutil/rtt.cpp
@@ -33,7 +33,7 @@ namespace SceneUtil
         , mSamples(samples)
         , mGenerateMipmaps(generateMipmaps)
         , mColorBufferInternalFormat(Color::colorInternalFormat())
-        , mDepthBufferInternalFormat(AutoDepth::depthInternalFormat())
+        , mDepthBufferInternalFormat(SceneUtil::AutoDepth::depthInternalFormat())
         , mRenderOrderNum(renderOrderNum)
         , mStereoAwareness(stereoAwareness)
     {
diff --git a/components/sceneutil/util.cpp b/components/sceneutil/util.cpp
index b70a0e2481..52b7be1798 100644
--- a/components/sceneutil/util.cpp
+++ b/components/sceneutil/util.cpp
@@ -152,42 +152,6 @@ void GlowUpdater::setDuration(float duration)
     mDuration = duration;
 }
 
-// Allows camera to render to a color and floating point depth texture with a multisampled framebuffer.
-class AttachMultisampledDepthColorCallback : public SceneUtil::NodeCallback<AttachMultisampledDepthColorCallback, osg::Node*, osgUtil::CullVisitor*>
-{
-public:
-    AttachMultisampledDepthColorCallback(osg::Texture2D* colorTex, osg::Texture2D* depthTex, int samples, int colorSamples)
-    {
-        int width = colorTex->getTextureWidth();
-        int height = colorTex->getTextureHeight();
-
-        osg::ref_ptr<osg::RenderBuffer> rbColor = new osg::RenderBuffer(width, height, colorTex->getInternalFormat(), samples, colorSamples);
-        osg::ref_ptr<osg::RenderBuffer> rbDepth = new osg::RenderBuffer(width, height, depthTex->getInternalFormat(), samples, colorSamples);
-
-        mMsaaFbo = new osg::FrameBufferObject;
-        mMsaaFbo->setAttachment(osg::Camera::COLOR_BUFFER0, osg::FrameBufferAttachment(rbColor));
-        mMsaaFbo->setAttachment(osg::Camera::DEPTH_BUFFER, osg::FrameBufferAttachment(rbDepth));
-
-        mFbo = new osg::FrameBufferObject;
-        mFbo->setAttachment(osg::Camera::COLOR_BUFFER0, osg::FrameBufferAttachment(colorTex));
-        mFbo->setAttachment(osg::Camera::DEPTH_BUFFER, osg::FrameBufferAttachment(depthTex));
-    }
-
-    void operator()(osg::Node* node, osgUtil::CullVisitor* cv)
-    {
-        osgUtil::RenderStage* renderStage = cv->getCurrentRenderStage();
-
-        renderStage->setMultisampleResolveFramebufferObject(mFbo);
-        renderStage->setFrameBufferObject(mMsaaFbo);
-
-        traverse(node, cv);
-    }
-
-private:
-    osg::ref_ptr<osg::FrameBufferObject> mFbo;
-    osg::ref_ptr<osg::FrameBufferObject> mMsaaFbo;
-};
-
 osg::Vec4f colourFromRGB(unsigned int clr)
 {
     osg::Vec4f colour(((clr >> 0) & 0xFF) / 255.0f,
diff --git a/components/serialization/osgyaml.hpp b/components/serialization/osgyaml.hpp
new file mode 100644
index 0000000000..866d1db2fe
--- /dev/null
+++ b/components/serialization/osgyaml.hpp
@@ -0,0 +1,64 @@
+#ifndef OPENMW_COMPONENTS_SERIALIZATION_OSGYAML_H
+#define OPENMW_COMPONENTS_SERIALIZATION_OSGYAML_H
+
+#include <yaml-cpp/yaml.h>
+
+#include <osg/Vec2f>
+#include <osg/Vec3f>
+#include <osg/Vec4f>
+
+namespace Serialization
+{
+    template <class OSGVec>
+    YAML::Node encodeOSGVec(const OSGVec& rhs)
+    {
+        YAML::Node node;
+        for (int i = 0; i < OSGVec::num_components; ++i)
+            node.push_back(rhs[i]);
+
+        return node;
+    }
+
+    template <class OSGVec>
+    bool decodeOSGVec(const YAML::Node& node, OSGVec& rhs)
+    {
+        if (!node.IsSequence() || node.size() != OSGVec::num_components)
+            return false;
+
+        for (int i = 0; i < OSGVec::num_components; ++i)
+            rhs[i] = node[i].as<typename OSGVec::value_type>();
+
+        return true;
+    }
+}
+
+namespace YAML
+{
+
+    template<>
+    struct convert<osg::Vec2f>
+    {
+        static Node encode(const osg::Vec2f& rhs) { return Serialization::encodeOSGVec(rhs); }
+
+        static bool decode(const Node& node, osg::Vec2f& rhs) { return Serialization::decodeOSGVec(node, rhs); }
+    };
+
+    template<>
+    struct convert<osg::Vec3f>
+    {
+        static Node encode(const osg::Vec3f& rhs) { return Serialization::encodeOSGVec(rhs); }
+
+        static bool decode(const Node& node, osg::Vec3f& rhs) { return Serialization::decodeOSGVec(node, rhs); }
+    };
+
+    template<>
+    struct convert<osg::Vec4f>
+    {
+        static Node encode(const osg::Vec4f& rhs) { return Serialization::encodeOSGVec(rhs); }
+
+        static bool decode(const Node& node, osg::Vec4f& rhs) { return Serialization::decodeOSGVec(node, rhs); }
+    };
+
+}
+
+#endif
\ No newline at end of file
diff --git a/components/settings/shadermanager.hpp b/components/settings/shadermanager.hpp
new file mode 100644
index 0000000000..322d6169b3
--- /dev/null
+++ b/components/settings/shadermanager.hpp
@@ -0,0 +1,174 @@
+#ifndef OPENMW_COMPONENTS_SETTINGS_SHADERMANAGER_H
+#define OPENMW_COMPONENTS_SETTINGS_SHADERMANAGER_H
+
+#include <unordered_map>
+#include <filesystem>
+#include <optional>
+#include <fstream>
+
+#include <yaml-cpp/yaml.h>
+
+#include <osg/Vec2f>
+#include <osg/Vec3f>
+#include <osg/Vec4f>
+
+#include <components/serialization/osgyaml.hpp>
+#include <components/debug/debuglog.hpp>
+
+namespace Settings
+{
+    /*
+     * Manages the shader.yaml file which is auto-generated and lives next to settings.cfg.
+     * This YAML file is simply a mapping of technique name to a list of uniforms and their values.
+     * Currently only vec2f, vec3f, vec4f, int, and float uniforms are supported.
+     *
+     * config:
+     *   TECHNIQUE:
+     *    MY_FLOAT: 10.34
+     *    MY_VEC2: [0.23, 0.34]
+     *   TECHNIQUE2:
+     *    MY_VEC3: [0.22, 0.33, 0.20]
+    */
+    class ShaderManager
+    {
+    public:
+
+        enum class Mode
+        {
+            Normal,
+            Debug
+        };
+
+        ShaderManager() = default;
+        ShaderManager(ShaderManager const&) = delete;
+        void operator=(ShaderManager const&) = delete;
+
+        static ShaderManager& get()
+        {
+            static ShaderManager instance;
+            return instance;
+        }
+
+        Mode getMode()
+        {
+            return mMode;
+        }
+
+        void setMode(Mode mode)
+        {
+            mMode = mode;
+        }
+
+        const YAML::Node& getRoot()
+        {
+            return mData;
+        }
+
+        template <class T>
+        bool setValue(const std::string& tname, const std::string& uname, const T& value)
+        {
+            if (mData.IsNull())
+            {
+                Log(Debug::Warning) << "Failed setting " << tname << ", " << uname << " : shader settings failed to load";
+                return false;
+            }
+
+            mData["config"][tname][uname] = value;
+            return true;
+        }
+
+        template <class T>
+        std::optional<T> getValue(const std::string& tname, const std::string& uname)
+        {
+            if (mData.IsNull())
+            {
+                Log(Debug::Warning) << "Failed getting " << tname << ", " << uname << " : shader settings failed to load";
+                return std::nullopt;
+            }
+
+            try
+            {
+                auto value = mData["config"][tname][uname];
+
+                if (!value)
+                    return std::nullopt;
+
+                return value.as<T>();
+            }
+            catch(const YAML::BadConversion& e)
+            {
+                Log(Debug::Warning) << "Failed retrieving " << tname << ", " << uname << " : mismatched types in config file.";
+            }
+
+            return std::nullopt;
+        }
+
+        bool load(const std::string& path)
+        {
+            mData = YAML::Null;
+            mPath = std::filesystem::path(path);
+
+            Log(Debug::Info) << "Loading shader settings file: " << mPath;
+
+            if (!std::filesystem::exists(mPath))
+            {
+                std::ofstream fout(mPath);
+                if (!fout)
+                {
+                    Log(Debug::Error) << "Failed creating shader settings file: " << mPath;
+                    return false;
+                }
+            }
+
+            try
+            {
+                mData = YAML::LoadFile(mPath.string());
+                mData.SetStyle(YAML::EmitterStyle::Block);
+
+                if (!mData["config"])
+                    mData["config"] = YAML::Node();
+
+                return true;
+            }
+            catch(const YAML::Exception& e)
+            {
+                Log(Debug::Error) << "Shader settings failed to load, " <<  e.msg;
+            }
+
+            return false;
+        }
+
+        bool save()
+        {
+            if (mData.IsNull())
+            {
+                Log(Debug::Error) << "Shader settings failed to load, settings will not be saved: " << mPath;
+                return false;
+            }
+
+            Log(Debug::Info) << "Saving shader settings file: " << mPath;
+
+            YAML::Emitter out;
+            out.SetMapFormat(YAML::Block);
+            out << mData;
+
+            std::ofstream fout(mPath.string());
+            fout << out.c_str();
+
+            if (!fout)
+            {
+                Log(Debug::Error) << "Failed saving shader settings file: " << mPath;
+                return false;
+            }
+
+            return true;
+        }
+
+    private:
+        std::filesystem::path mPath;
+        YAML::Node mData;
+        Mode mMode = Mode::Normal;
+    };
+}
+
+#endif
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 8923fec666..4ef0d7a0ea 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -11,6 +11,7 @@
 #include <osg/Multisample>
 #include <osg/Texture>
 #include <osg/ValueObject>
+#include <osg/Capability>
 
 #include <osgParticle/ParticleSystem>
 
@@ -28,6 +29,50 @@
 #include "removedalphafunc.hpp"
 #include "shadermanager.hpp"
 
+namespace
+{
+    class OpaqueDepthAttribute : public osg::StateAttribute
+    {
+    public:
+        OpaqueDepthAttribute() = default;
+
+        OpaqueDepthAttribute(const OpaqueDepthAttribute& copy, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY)
+            : osg::StateAttribute(copy, copyop), mTextures(copy.mTextures), mUnit(copy.mUnit) {}
+
+        void setTexturesAndUnit(const std::array<osg::ref_ptr<osg::Texture2D>, 2>& textures, int unit)
+        {
+            mTextures = textures;
+            mUnit = unit;
+        }
+
+        META_StateAttribute(Shader, OpaqueDepthAttribute, osg::StateAttribute::TEXTURE)
+
+        int compare(const StateAttribute& sa) const override
+        {
+            COMPARE_StateAttribute_Types(OpaqueDepthAttribute, sa);
+
+            COMPARE_StateAttribute_Parameter(mTextures);
+
+            return 0;
+        }
+
+        void apply(osg::State& state) const override
+        {
+            auto index = state.getFrameStamp()->getFrameNumber() % 2;
+
+            if (!mTextures[index])
+                return;
+
+            state.setActiveTextureUnit(mUnit);
+            state.applyTextureAttribute(mUnit, mTextures[index]);
+        }
+
+    private:
+        mutable std::array<osg::ref_ptr<osg::Texture2D>, 2> mTextures;
+        int mUnit;
+    };
+}
+
 namespace Shader
 {
     /**
@@ -165,6 +210,7 @@ namespace Shader
         , mAutoUseSpecularMaps(false)
         , mApplyLightingToEnvMaps(false)
         , mConvertAlphaTestToAlphaToCoverage(false)
+        , mSupportsNormalsRT(false)
         , mShaderManager(shaderManager)
         , mImageManager(imageManager)
         , mDefaultShaderPrefix(defaultShaderPrefix)
@@ -611,6 +657,14 @@ namespace Shader
             defineMap["endLight"] = "0";
         }
 
+        if (reqs.mAlphaBlend && mSupportsNormalsRT)
+        {
+            if (reqs.mSoftParticles)
+                defineMap["disableNormals"] = "1";
+            else
+                writableStateSet->setAttribute(new osg::Disablei(GL_BLEND, 1));
+        }
+
         if (writableStateSet->getMode(GL_ALPHA_TEST) != osg::StateAttribute::INHERIT && !previousAddedState->hasMode(GL_ALPHA_TEST))
             removedState->setMode(GL_ALPHA_TEST, writableStateSet->getMode(GL_ALPHA_TEST));
         // This disables the deprecated fixed-function alpha test
@@ -629,7 +683,7 @@ namespace Shader
             updateRemovedState(*writableUserData, removedState);
         }
 
-        if (reqs.mSoftParticles)
+        if (reqs.mSoftParticles && mOpaqueDepthTex.front())
         {
             osg::ref_ptr<osg::Depth> depth = new SceneUtil::AutoDepth;
             depth->setWriteMask(false);
@@ -639,14 +693,18 @@ namespace Shader
             writableStateSet->addUniform(new osg::Uniform("particleSize", reqs.mSoftParticleSize));
             addedState->addUniform("particleSize");
 
-            writableStateSet->addUniform(new osg::Uniform("opaqueDepthTex", 2));
+            constexpr int unit = 2;
+
+            writableStateSet->addUniform(new osg::Uniform("opaqueDepthTex", unit));
             addedState->addUniform("opaqueDepthTex");
 
-            writableStateSet->setTextureAttributeAndModes(2, mOpaqueDepthTex, osg::StateAttribute::ON);
-            addedState->setTextureAttributeAndModes(2, mOpaqueDepthTex);
+            osg::ref_ptr<OpaqueDepthAttribute> opaqueDepthAttr = new OpaqueDepthAttribute;
+            opaqueDepthAttr->setTexturesAndUnit(mOpaqueDepthTex, unit);
+            writableStateSet->setAttributeAndModes(opaqueDepthAttr, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
+            addedState->setAttributeAndModes(opaqueDepthAttr);
         }
 
-        defineMap["softParticles"] = reqs.mSoftParticles ? "1" : "0";
+        defineMap["softParticles"] = reqs.mSoftParticles && mOpaqueDepthTex.front() ? "1" : "0";
 
         Stereo::Manager::instance().shaderStereoDefines(defineMap);
 
@@ -840,7 +898,7 @@ namespace Shader
         {
             pushRequirements(drawable);
 
-            if (partsys && mOpaqueDepthTex)
+            if (partsys)
             {
                 mRequirements.back().mSoftParticles = true;
                 mRequirements.back().mSoftParticleSize = partsys->getDefaultParticleTemplate().getSizeRange().maximum;
@@ -915,9 +973,9 @@ namespace Shader
         mConvertAlphaTestToAlphaToCoverage = convert;
     }
 
-    void ShaderVisitor::setOpaqueDepthTex(osg::ref_ptr<osg::Texture2D> texture)
+    void ShaderVisitor::setOpaqueDepthTex(osg::ref_ptr<osg::Texture2D> texturePing, osg::ref_ptr<osg::Texture2D> texturePong)
     {
-        mOpaqueDepthTex = texture;
+        mOpaqueDepthTex = { texturePing, texturePong };
     }
 
     ReinstateRemovedStateVisitor::ReinstateRemovedStateVisitor(bool allowedToModifyStateSets)
diff --git a/components/shader/shadervisitor.hpp b/components/shader/shadervisitor.hpp
index 72dec05b5e..cd1ca421d9 100644
--- a/components/shader/shadervisitor.hpp
+++ b/components/shader/shadervisitor.hpp
@@ -1,6 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SHADERVISITOR_H
 #define OPENMW_COMPONENTS_SHADERVISITOR_H
 
+#include <array>
+
 #include <osg/NodeVisitor>
 #include <osg/Program>
 #include <osg/Texture2D>
@@ -46,7 +48,9 @@ namespace Shader
 
         void setConvertAlphaTestToAlphaToCoverage(bool convert);
 
-        void setOpaqueDepthTex(osg::ref_ptr<osg::Texture2D> texture);
+        void setOpaqueDepthTex(osg::ref_ptr<osg::Texture2D> texturePing, osg::ref_ptr<osg::Texture2D> texturePong);
+
+        void setSupportsNormalsRT(bool supports) { mSupportsNormalsRT = supports; }
 
         void apply(osg::Node& node) override;
 
@@ -73,6 +77,8 @@ namespace Shader
 
         bool mConvertAlphaTestToAlphaToCoverage;
 
+        bool mSupportsNormalsRT;
+
         ShaderManager& mShaderManager;
         Resource::ImageManager& mImageManager;
 
@@ -87,7 +93,7 @@ namespace Shader
             bool mShaderRequired;
 
             int mColorMode;
-            
+
             bool mMaterialOverridden;
             bool mAlphaTestOverridden;
             bool mAlphaBlendOverridden;
@@ -116,7 +122,7 @@ namespace Shader
         bool adjustGeometry(osg::Geometry& sourceGeometry, const ShaderRequirements& reqs);
 
         osg::ref_ptr<const osg::Program> mProgramTemplate;
-        osg::ref_ptr<osg::Texture2D> mOpaqueDepthTex;
+        std::array<osg::ref_ptr<osg::Texture2D>, 2> mOpaqueDepthTex;
     };
 
     class ReinstateRemovedStateVisitor : public osg::NodeVisitor
diff --git a/components/std140/ubo.hpp b/components/std140/ubo.hpp
new file mode 100644
index 0000000000..6154cd32ac
--- /dev/null
+++ b/components/std140/ubo.hpp
@@ -0,0 +1,162 @@
+#ifndef COMPONENTS_STD140_UBO_H
+#define COMPONENTS_STD140_UBO_H
+
+#include <osg/Vec2f>
+#include <osg/Vec4f>
+#include <osg/Matrixf>
+
+#include <cstdint>
+#include <tuple>
+#include <cstring>
+#include <string>
+#include <string_view>
+
+namespace std140
+{
+    struct Mat4
+    {
+        using Value = osg::Matrixf;
+        Value mValue;
+        static constexpr size_t sAlign = sizeof(Value);
+        static constexpr std::string_view sTypeName = "mat4";
+    };
+
+    struct Vec4
+    {
+        using Value = osg::Vec4f;
+        Value mValue;
+        static constexpr size_t sAlign = sizeof(Value);
+        static constexpr std::string_view sTypeName = "vec4";
+    };
+
+    struct Vec3
+    {
+        using Value = osg::Vec3f;
+        Value mValue;
+        static constexpr std::size_t sAlign = 4 * sizeof(osg::Vec3f::value_type);
+        static constexpr std::string_view sTypeName = "vec3";
+    };
+
+    struct Vec2
+    {
+        using Value = osg::Vec2f;
+        Value mValue;
+        static constexpr std::size_t sAlign = sizeof(Value);
+        static constexpr std::string_view sTypeName = "vec2";
+    };
+
+    struct Float
+    {
+        using Value = float;
+        Value mValue;
+        static constexpr std::size_t sAlign = sizeof(Value);
+        static constexpr std::string_view sTypeName = "float";
+    };
+
+    struct Int
+    {
+        using Value = std::int32_t;
+        Value mValue;
+        static constexpr std::size_t sAlign = sizeof(Value);
+        static constexpr std::string_view sTypeName = "int";
+    };
+
+    struct UInt
+    {
+        using Value = std::uint32_t;
+        Value mValue;
+        static constexpr std::size_t sAlign = sizeof(Value);
+        static constexpr std::string_view sTypeName = "uint";
+    };
+
+    struct Bool
+    {
+        using Value = std::int32_t;
+        Value mValue;
+        static constexpr std::size_t sAlign = sizeof(Value);
+        static constexpr std::string_view sTypeName = "bool";
+    };
+
+    template <class... CArgs>
+    class UBO
+    {
+    private:
+
+        template<typename T, typename... Args>
+        struct contains : std::bool_constant<(std::is_base_of_v<Args, T> || ...)> { };
+
+        static_assert((contains<CArgs, Mat4, Vec4, Vec3, Vec2, Float, Int, UInt, Bool>() && ...));
+
+        static constexpr size_t roundUpRemainder(size_t x, size_t multiple)
+        {
+            size_t remainder = x % multiple;
+            if (remainder == 0)
+                return 0;
+            return multiple - remainder;
+        }
+
+        template <class T>
+        static constexpr std::size_t getOffset()
+        {
+            bool found = false;
+            std::size_t size = 0;
+            ((
+                found = found || std::is_same_v<T, CArgs>,
+                size += (found ? 0 : sizeof(typename CArgs::Value) + roundUpRemainder(size, CArgs::sAlign))
+            ) , ...);
+            return size + roundUpRemainder(size, T::sAlign);
+        }
+
+    public:
+
+        static constexpr size_t getGPUSize()
+        {
+            std::size_t size = 0;
+            ((size += (sizeof(typename CArgs::Value) + roundUpRemainder(size, CArgs::sAlign))), ...);
+            return size;
+        }
+
+        static std::string getDefinition(const std::string& name)
+        {
+            std::string structDefinition = "struct " + name + " {\n";
+            ((structDefinition += ("    " + std::string(CArgs::sTypeName) + " " + std::string(CArgs::sName) + ";\n")), ...);
+            return structDefinition + "};";
+        }
+
+        using BufferType = std::array<char, getGPUSize()>;
+        using TupleType = std::tuple<CArgs...>;
+
+        template <class T>
+        typename T::Value& get()
+        {
+            return std::get<T>(mData).mValue;
+        }
+
+        template <class T>
+        const typename T::Value& get() const
+        {
+            return std::get<T>(mData).mValue;
+        }
+
+        void copyTo(BufferType& buffer) const
+        {
+            const auto copy = [&] (const auto& v) {
+                static_assert(std::is_standard_layout_v<std::decay_t<decltype(v.mValue)>>);
+                constexpr std::size_t offset = getOffset<std::decay_t<decltype(v)>>();
+                std::memcpy(buffer.data() + offset, &v.mValue, sizeof(v.mValue));
+            };
+
+            std::apply([&] (const auto& ... v) { (copy(v) , ...); }, mData);
+        }
+
+        const auto& getData() const
+        {
+            return mData;
+        }
+
+    private:
+        std::tuple<CArgs...> mData;
+    };
+}
+
+#endif
diff --git a/components/stereo/multiview.cpp b/components/stereo/multiview.cpp
index 56c1ada349..de48bf6d17 100644
--- a/components/stereo/multiview.cpp
+++ b/components/stereo/multiview.cpp
@@ -3,7 +3,6 @@
 #include <osg/FrameBufferObject>
 #include <osg/GLExtensions>
 #include <osg/Texture2D>
-#include <osg/Texture2DMultisample>
 #include <osg/Texture2DArray>
 #include <osgUtil/RenderStage>
 #include <osgUtil/CullVisitor>
@@ -322,10 +321,7 @@ namespace Stereo
             for (unsigned i = 0; i < 2; i++)
             {
                 if (mSamples > 1)
-                {
-                    mMsaaColorTexture[i] = createTextureMsaa(sourceFormat, sourceType, internalFormat);
-                    mLayerMsaaFbo[i]->setAttachment(osg::Camera::COLOR_BUFFER, osg::FrameBufferAttachment(mMsaaColorTexture[i]));
-                }
+                    mLayerMsaaFbo[i]->setAttachment(osg::Camera::COLOR_BUFFER, osg::FrameBufferAttachment(new osg::RenderBuffer(mWidth, mHeight, internalFormat, mSamples)));
                 mColorTexture[i] = createTexture(sourceFormat, sourceType, internalFormat);
                 mLayerFbo[i]->setAttachment(osg::Camera::COLOR_BUFFER, osg::FrameBufferAttachment(mColorTexture[i]));
             }
@@ -351,10 +347,7 @@ namespace Stereo
             for (unsigned i = 0; i < 2; i++)
             {
                 if (mSamples > 1)
-                {
-                    mMsaaDepthTexture[i] = createTextureMsaa(sourceFormat, sourceType, internalFormat);
-                    mLayerMsaaFbo[i]->setAttachment(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, osg::FrameBufferAttachment(mMsaaDepthTexture[i]));
-                }
+                    mLayerMsaaFbo[i]->setAttachment(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, osg::FrameBufferAttachment(new osg::RenderBuffer(mWidth, mHeight, internalFormat, mSamples)));
                 mDepthTexture[i] = createTexture(sourceFormat, sourceType, internalFormat);
                 mLayerFbo[i]->setAttachment(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, osg::FrameBufferAttachment(mDepthTexture[i]));
             }
@@ -381,6 +374,11 @@ namespace Stereo
         return mMultiviewColorTexture;
     }
 
+    osg::Texture2DArray* MultiviewFramebuffer::multiviewDepthBuffer()
+    {
+        return mMultiviewDepthTexture;
+    }
+
     osg::Texture2D* MultiviewFramebuffer::layerColorBuffer(int i)
     {
         return mColorTexture[i];
@@ -451,22 +449,6 @@ namespace Stereo
         return texture;
     }
 
-    osg::Texture2DMultisample* MultiviewFramebuffer::createTextureMsaa(GLint sourceFormat, GLint sourceType, GLint internalFormat)
-    {
-        osg::Texture2DMultisample* texture = new osg::Texture2DMultisample;
-        texture->setTextureSize(mWidth, mHeight);
-        texture->setNumSamples(mSamples);
-        texture->setSourceFormat(sourceFormat);
-        texture->setSourceType(sourceType);
-        texture->setInternalFormat(internalFormat);
-        texture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
-        texture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
-        texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
-        texture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
-        texture->setWrap(osg::Texture::WRAP_R, osg::Texture::CLAMP_TO_EDGE);
-        return texture;
-    }
-
     osg::Texture2DArray* MultiviewFramebuffer::createTextureArray(GLint sourceFormat, GLint sourceType, GLint internalFormat)
     {
         osg::Texture2DArray* textureArray = new osg::Texture2DArray;
diff --git a/components/stereo/multiview.hpp b/components/stereo/multiview.hpp
index 298d042ffc..cfdc721d1a 100644
--- a/components/stereo/multiview.hpp
+++ b/components/stereo/multiview.hpp
@@ -13,7 +13,6 @@ namespace osg
     class FrameBufferObject;
     class Texture;
     class Texture2D;
-    class Texture2DMultisample;
     class Texture2DArray;
 }
 
@@ -50,6 +49,7 @@ namespace Stereo
         osg::FrameBufferObject* layerFbo(int i);
         osg::FrameBufferObject* layerMsaaFbo(int i);
         osg::Texture2DArray* multiviewColorBuffer();
+        osg::Texture2DArray* multiviewDepthBuffer();
         osg::Texture2D* layerColorBuffer(int i);
         osg::Texture2D* layerDepthBuffer(int i);
 
@@ -62,7 +62,6 @@ namespace Stereo
 
     private:
         osg::Texture2D* createTexture(GLint sourceFormat, GLint sourceType, GLint internalFormat);
-        osg::Texture2DMultisample* createTextureMsaa(GLint sourceFormat, GLint sourceType, GLint internalFormat);
         osg::Texture2DArray* createTextureArray(GLint sourceFormat, GLint sourceType, GLint internalFormat);
 
         int mWidth;
@@ -76,9 +75,7 @@ namespace Stereo
         osg::ref_ptr<osg::Texture2DArray> mMultiviewColorTexture;
         osg::ref_ptr<osg::Texture2DArray> mMultiviewDepthTexture;
         std::array<osg::ref_ptr<osg::Texture2D>, 2> mColorTexture;
-        std::array<osg::ref_ptr<osg::Texture2DMultisample>, 2> mMsaaColorTexture;
         std::array<osg::ref_ptr<osg::Texture2D>, 2> mDepthTexture;
-        std::array<osg::ref_ptr<osg::Texture2DMultisample>, 2> mMsaaDepthTexture;
     };
 }
 
diff --git a/components/stereo/stereomanager.hpp b/components/stereo/stereomanager.hpp
index 49ae685e6b..41c05b8785 100644
--- a/components/stereo/stereomanager.hpp
+++ b/components/stereo/stereomanager.hpp
@@ -17,7 +17,6 @@ namespace osg
 {
     class FrameBufferObject;
     class Texture2D;
-    class Texture2DMultisample;
     class Texture2DArray;
 }
 
diff --git a/components/terrain/chunkmanager.cpp b/components/terrain/chunkmanager.cpp
index d57b73768f..badca42977 100644
--- a/components/terrain/chunkmanager.cpp
+++ b/components/terrain/chunkmanager.cpp
@@ -180,7 +180,7 @@ std::vector<osg::ref_ptr<osg::StateSet> > ChunkManager::createPasses(float chunk
 
     float blendmapScale = mStorage->getBlendmapScale(chunkSize);
 
-    return ::Terrain::createPasses(useShaders, &mSceneManager->getShaderManager(), layers, blendmapTextures, blendmapScale, blendmapScale);
+    return ::Terrain::createPasses(useShaders, mSceneManager, layers, blendmapTextures, blendmapScale, blendmapScale);
 }
 
 osg::ref_ptr<osg::Node> ChunkManager::createChunk(float chunkSize, const osg::Vec2f &chunkCenter, unsigned char lod, unsigned int lodFlags, bool compile, TerrainDrawable* templateGeometry)
@@ -268,7 +268,7 @@ osg::ref_ptr<osg::Node> ChunkManager::createChunk(float chunkSize, const osg::Ve
             layer.mDiffuseMap = compositeMap->mTexture;
             layer.mParallax = false;
             layer.mSpecular = false;
-            geometry->setPasses(::Terrain::createPasses(mSceneManager->getForceShaders() || !mSceneManager->getClampLighting(), &mSceneManager->getShaderManager(), std::vector<TextureLayer>(1, layer), std::vector<osg::ref_ptr<osg::Texture2D> >(), 1.f, 1.f));
+            geometry->setPasses(::Terrain::createPasses(mSceneManager->getForceShaders() || !mSceneManager->getClampLighting(), mSceneManager, std::vector<TextureLayer>(1, layer), std::vector<osg::ref_ptr<osg::Texture2D> >(), 1.f, 1.f));
         }
         else
         {
diff --git a/components/terrain/material.cpp b/components/terrain/material.cpp
index 8e892a08c8..1c6770e6bc 100644
--- a/components/terrain/material.cpp
+++ b/components/terrain/material.cpp
@@ -6,8 +6,10 @@
 #include <osg/Texture2D>
 #include <osg/TexMat>
 #include <osg/BlendFunc>
+#include <osg/Capability>
 
 #include <components/stereo/stereomanager.hpp>
+#include <components/resource/scenemanager.hpp>
 #include <components/shader/shadermanager.hpp>
 #include <components/sceneutil/depth.hpp>
 
@@ -194,9 +196,10 @@ namespace
 
 namespace Terrain
 {
-    std::vector<osg::ref_ptr<osg::StateSet> > createPasses(bool useShaders, Shader::ShaderManager* shaderManager, const std::vector<TextureLayer> &layers,
+    std::vector<osg::ref_ptr<osg::StateSet> > createPasses(bool useShaders, Resource::SceneManager* sceneManager, const std::vector<TextureLayer> &layers,
                                                            const std::vector<osg::ref_ptr<osg::Texture2D> > &blendmaps, int blendmapScale, float layerTileSize)
     {
+        auto& shaderManager = sceneManager->getShaderManager();
         std::vector<osg::ref_ptr<osg::StateSet> > passes;
 
         unsigned int blendmapIndex = 0;
@@ -209,6 +212,8 @@ namespace Terrain
             if (!blendmaps.empty())
             {
                 stateset->setMode(GL_BLEND, osg::StateAttribute::ON);
+                if (sceneManager->getSupportsNormalsRT())
+                    stateset->setAttribute(new osg::Disablei(GL_BLEND, 1));
                 stateset->setRenderBinDetails(firstLayer ? 0 : 1, "RenderBin");
                 if (!firstLayer)
                 {
@@ -251,18 +256,18 @@ namespace Terrain
                 defineMap["blendMap"] = (!blendmaps.empty()) ? "1" : "0";
                 defineMap["specularMap"] = it->mSpecular ? "1" : "0";
                 defineMap["parallax"] = (it->mNormalMap && it->mParallax) ? "1" : "0";
-
+                defineMap["writeNormals"] = (it == layers.end() - 1) ? "1" : "0";
                 Stereo::Manager::instance().shaderStereoDefines(defineMap);
 
-                osg::ref_ptr<osg::Shader> vertexShader = shaderManager->getShader("terrain_vertex.glsl", defineMap, osg::Shader::VERTEX);
-                osg::ref_ptr<osg::Shader> fragmentShader = shaderManager->getShader("terrain_fragment.glsl", defineMap, osg::Shader::FRAGMENT);
+                osg::ref_ptr<osg::Shader> vertexShader = shaderManager.getShader("terrain_vertex.glsl", defineMap, osg::Shader::VERTEX);
+                osg::ref_ptr<osg::Shader> fragmentShader = shaderManager.getShader("terrain_fragment.glsl", defineMap, osg::Shader::FRAGMENT);
                 if (!vertexShader || !fragmentShader)
                 {
                     // Try again without shader. Error already logged by above
-                    return createPasses(false, shaderManager, layers, blendmaps, blendmapScale, layerTileSize);
+                    return createPasses(false, sceneManager, layers, blendmaps, blendmapScale, layerTileSize);
                 }
 
-                stateset->setAttributeAndModes(shaderManager->getProgram(vertexShader, fragmentShader));
+                stateset->setAttributeAndModes(shaderManager.getProgram(vertexShader, fragmentShader));
                 stateset->addUniform(UniformCollection::value().mColorMode);
             }
             else
diff --git a/components/terrain/material.hpp b/components/terrain/material.hpp
index 5f78af6a06..d5ef40a29e 100644
--- a/components/terrain/material.hpp
+++ b/components/terrain/material.hpp
@@ -10,9 +10,9 @@ namespace osg
     class Texture2D;
 }
 
-namespace Shader
+namespace Resource
 {
-    class ShaderManager;
+    class SceneManager;
 }
 
 namespace Terrain
@@ -26,7 +26,7 @@ namespace Terrain
         bool mSpecular;
     };
 
-    std::vector<osg::ref_ptr<osg::StateSet> > createPasses(bool useShaders, Shader::ShaderManager* shaderManager,
+    std::vector<osg::ref_ptr<osg::StateSet> > createPasses(bool useShaders, Resource::SceneManager* sceneManager,
                                                            const std::vector<TextureLayer>& layers,
                                                            const std::vector<osg::ref_ptr<osg::Texture2D> >& blendmaps, int blendmapScale, float layerTileSize);
 
diff --git a/components/vfs/archive.hpp b/components/vfs/archive.hpp
index 971ac15b39..faefe30dfe 100644
--- a/components/vfs/archive.hpp
+++ b/components/vfs/archive.hpp
@@ -14,6 +14,8 @@ namespace VFS
         virtual ~File() {}
 
         virtual Files::IStreamPtr open() = 0;
+
+        virtual std::string getPath() = 0;
     };
 
     class Archive
diff --git a/components/vfs/bsaarchive.hpp b/components/vfs/bsaarchive.hpp
index 1bf9cf4381..a52104efd7 100644
--- a/components/vfs/bsaarchive.hpp
+++ b/components/vfs/bsaarchive.hpp
@@ -15,6 +15,8 @@ namespace VFS
 
         Files::IStreamPtr open() override;
 
+        std::string getPath() override { return mInfo->name(); }
+
         const Bsa::BSAFile::FileStruct* mInfo;
         Bsa::BSAFile* mFile;
     };
@@ -26,6 +28,8 @@ namespace VFS
 
         Files::IStreamPtr open() override;
 
+        std::string getPath() override { return mInfo->name(); }
+
         const Bsa::BSAFile::FileStruct* mInfo;
         Bsa::CompressedBSAFile* mCompressedFile;
     };
diff --git a/components/vfs/filesystemarchive.hpp b/components/vfs/filesystemarchive.hpp
index 70463d32f2..fa9b50edc5 100644
--- a/components/vfs/filesystemarchive.hpp
+++ b/components/vfs/filesystemarchive.hpp
@@ -13,6 +13,8 @@ namespace VFS
 
         Files::IStreamPtr open() override;
 
+        std::string getPath() override { return mPath; }
+
     private:
         std::string mPath;
 
diff --git a/components/vfs/manager.cpp b/components/vfs/manager.cpp
index faebc782aa..8a43eda5ee 100644
--- a/components/vfs/manager.cpp
+++ b/components/vfs/manager.cpp
@@ -105,6 +105,17 @@ namespace VFS
         return {};
     }
 
+    std::string Manager::getAbsoluteFileName(const std::string& name) const
+    {
+        std::string normalized = name;
+        normalize_path(normalized, mStrict);
+
+        std::map<std::string, File*>::const_iterator found = mIndex.find(normalized);
+        if (found == mIndex.end())
+            throw std::runtime_error("Resource '" + normalized + "' not found");
+        return found->second->getPath();
+    }
+
     namespace
     {
         bool startsWith(std::string_view text, std::string_view start)
diff --git a/components/vfs/manager.hpp b/components/vfs/manager.hpp
index 8568e8e784..98acfb7955 100644
--- a/components/vfs/manager.hpp
+++ b/components/vfs/manager.hpp
@@ -90,6 +90,11 @@ namespace VFS
         /// @note May be called from any thread once the index has been built.
         RecursiveDirectoryRange getRecursiveDirectoryIterator(const std::string& path) const;
 
+        /// Retrieve the absolute path to the file
+        /// @note Throws an exception if the file can not be found.
+        /// @note May be called from any thread once the index has been built.
+        std::string getAbsoluteFileName(const std::string& name) const;
+
     private:
         bool mStrict;
 
diff --git a/docs/source/reference/index.rst b/docs/source/reference/index.rst
index aa6ff1d96f..9aa409f784 100644
--- a/docs/source/reference/index.rst
+++ b/docs/source/reference/index.rst
@@ -7,4 +7,5 @@ Reference Material
 
 	modding/index
 	lua-scripting/index
+	postprocessing/index
 	documentationHowTo
diff --git a/docs/source/reference/lua-scripting/api.rst b/docs/source/reference/lua-scripting/api.rst
index 0c850d3676..c3b77a15ee 100644
--- a/docs/source/reference/lua-scripting/api.rst
+++ b/docs/source/reference/lua-scripting/api.rst
@@ -20,6 +20,7 @@ Lua API reference
     openmw_input
     openmw_ui
     openmw_camera
+    openmw_postprocessing
     openmw_aux_calendar
     openmw_aux_util
     openmw_aux_time
@@ -46,35 +47,37 @@ It can not be overloaded even if there is a lua file with the same name.
 The list of available packages is different for global and for local scripts.
 Player scripts are local scripts that are attached to a player.
 
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-| Package                                                 | Can be used        | Description                                                   |
-+=========================================================+====================+===============================================================+
-|:ref:`openmw.interfaces <Script interfaces>`             | everywhere         | | Public interfaces of other scripts.                         |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.util <Package openmw.util>`                 | everywhere         | | Defines utility functions and classes like 3D vectors,      |
-|                                                         |                    | | that don't depend on the game world.                        |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.storage <Package openmw.storage>`           | everywhere         | | Storage API. In particular can be used to store data        |
-|                                                         |                    | | between game sessions.                                      |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.core <Package openmw.core>`                 | everywhere         | | Functions that are common for both global and local scripts |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.types <Package openmw.types>`               | everywhere         | | Functions for specific types of game objects.               |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.async <Package openmw.async>`               | everywhere         | | Timers (implemented) and coroutine utils (not implemented)  |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.world <Package openmw.world>`               | by global scripts  | | Read-write access to the game world.                        |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.self <Package openmw.self>`                 | by local scripts   | | Full access to the object the script is attached to.        |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.nearby <Package openmw.nearby>`             | by local scripts   | | Read-only access to the nearest area of the game world.     |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.input <Package openmw.input>`               | by player scripts  | | User input.                                                 |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.ui <Package openmw.ui>`                     | by player scripts  | | Controls :ref:`user interface <User interface reference>`.  |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.camera <Package openmw.camera>`             | by player scripts  | | Controls camera.                                            |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+| Package                                                    | Can be used        | Description                                                   |
++============================================================+====================+===============================================================+
+|:ref:`openmw.interfaces <Script interfaces>`                | everywhere         | | Public interfaces of other scripts.                         |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.util <Package openmw.util>`                    | everywhere         | | Defines utility functions and classes like 3D vectors,      |
+|                                                            |                    | | that don't depend on the game world.                        |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.storage <Package openmw.storage>`              | everywhere         | | Storage API. In particular can be used to store data        |
+|                                                            |                    | | between game sessions.                                      |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.core <Package openmw.core>`                    | everywhere         | | Functions that are common for both global and local scripts |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.types <Package openmw.types>`                  | everywhere         | | Functions for specific types of game objects.               |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.async <Package openmw.async>`                  | everywhere         | | Timers (implemented) and coroutine utils (not implemented)  |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.world <Package openmw.world>`                  | by global scripts  | | Read-write access to the game world.                        |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.self <Package openmw.self>`                    | by local scripts   | | Full access to the object the script is attached to.        |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.nearby <Package openmw.nearby>`                | by local scripts   | | Read-only access to the nearest area of the game world.     |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.input <Package openmw.input>`                  | by player scripts  | | User input.                                                 |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.ui <Package openmw.ui>`                        | by player scripts  | | Controls :ref:`user interface <User interface reference>`.  |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.camera <Package openmw.camera>`                | by player scripts  | | Controls camera.                                            |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.postprocessing <Package openmw.postprocessing>`| by player scripts  | | Controls post-process shaders.                              |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
 
 **openmw_aux**
 
diff --git a/docs/source/reference/lua-scripting/openmw_postprocessing.rst b/docs/source/reference/lua-scripting/openmw_postprocessing.rst
new file mode 100644
index 0000000000..ec2f025049
--- /dev/null
+++ b/docs/source/reference/lua-scripting/openmw_postprocessing.rst
@@ -0,0 +1,5 @@
+Package openmw.postprocessing
+=============================
+
+.. raw:: html
+   :file: generated_html/openmw_postprocessing.html
diff --git a/docs/source/reference/lua-scripting/overview.rst b/docs/source/reference/lua-scripting/overview.rst
index a075d9228e..74fed7195c 100644
--- a/docs/source/reference/lua-scripting/overview.rst
+++ b/docs/source/reference/lua-scripting/overview.rst
@@ -340,35 +340,37 @@ It can not be overloaded even if there is a lua file with the same name.
 The list of available packages is different for global and for local scripts.
 Player scripts are local scripts that are attached to a player.
 
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-| Package                                                 | Can be used        | Description                                                   |
-+=========================================================+====================+===============================================================+
-|:ref:`openmw.interfaces <Script interfaces>`             | everywhere         | | Public interfaces of other scripts.                         |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.util <Package openmw.util>`                 | everywhere         | | Defines utility functions and classes like 3D vectors,      |
-|                                                         |                    | | that don't depend on the game world.                        |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.storage <Package openmw.storage>`           | everywhere         | | Storage API. In particular can be used to store data        |
-|                                                         |                    | | between game sessions.                                      |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.core <Package openmw.core>`                 | everywhere         | | Functions that are common for both global and local scripts |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.types <Package openmw.types>`               | everywhere         | | Functions for specific types of game objects.               |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.async <Package openmw.async>`               | everywhere         | | Timers (implemented) and coroutine utils (not implemented)  |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.world <Package openmw.world>`               | by global scripts  | | Read-write access to the game world.                        |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.self <Package openmw.self>`                 | by local scripts   | | Full access to the object the script is attached to.        |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.nearby <Package openmw.nearby>`             | by local scripts   | | Read-only access to the nearest area of the game world.     |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.input <Package openmw.input>`               | by player scripts  | | User input                                                  |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.ui <Package openmw.ui>`                     | by player scripts  | | Controls :ref:`user interface <User interface reference>`   |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.camera <Package openmw.camera>`             | by player scripts  | | Controls camera                                             |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+| Package                                                    | Can be used        | Description                                                   |
++============================================================+====================+===============================================================+
+|:ref:`openmw.interfaces <Script interfaces>`                | everywhere         | | Public interfaces of other scripts.                         |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.util <Package openmw.util>`                    | everywhere         | | Defines utility functions and classes like 3D vectors,      |
+|                                                            |                    | | that don't depend on the game world.                        |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.storage <Package openmw.storage>`              | everywhere         | | Storage API. In particular can be used to store data        |
+|                                                            |                    | | between game sessions.                                      |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.core <Package openmw.core>`                    | everywhere         | | Functions that are common for both global and local scripts |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.types <Package openmw.types>`                  | everywhere         | | Functions for specific types of game objects.               |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.async <Package openmw.async>`                  | everywhere         | | Timers (implemented) and coroutine utils (not implemented)  |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.world <Package openmw.world>`                  | by global scripts  | | Read-write access to the game world.                        |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.self <Package openmw.self>`                    | by local scripts   | | Full access to the object the script is attached to.        |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.nearby <Package openmw.nearby>`                | by local scripts   | | Read-only access to the nearest area of the game world.     |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.input <Package openmw.input>`                  | by player scripts  | | User input                                                  |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.ui <Package openmw.ui>`                        | by player scripts  | | Controls :ref:`user interface <User interface reference>`   |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.camera <Package openmw.camera>`                | by player scripts  | | Controls camera                                             |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.postprocessing <Package openmw.postprocessing>`| by player scripts  | | Controls postprocess shaders                                |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
 
 openmw_aux
 ----------
diff --git a/docs/source/reference/modding/settings/index.rst b/docs/source/reference/modding/settings/index.rst
index b1cfad44ff..326182cd3c 100644
--- a/docs/source/reference/modding/settings/index.rst
+++ b/docs/source/reference/modding/settings/index.rst
@@ -71,3 +71,4 @@ The ranges included with each setting are the physically possible ranges, not re
 	navigator
 	physics
 	models
+	postprocessing
diff --git a/docs/source/reference/modding/settings/postprocessing.rst b/docs/source/reference/modding/settings/postprocessing.rst
new file mode 100644
index 0000000000..49b7ab7813
--- /dev/null
+++ b/docs/source/reference/modding/settings/postprocessing.rst
@@ -0,0 +1,65 @@
+Post Processing Settings
+########################
+
+enabled
+-------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	False
+
+Enable or disable post processing.
+This enables use of post processing shaders, which must be installed.
+
+chain
+-----
+
+:Type:		string list
+
+Controls which post process effects are active and their order.
+It is recommended to configure the settings and order of shaders through the in game HUD. By default this is available with the F2 key.
+Note, an empty chain will not disable post processing.
+
+This setting has no effect if :ref:`enabled` is set to false.
+
+live reload
+-----------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	False
+
+Automatically reloads a shader if the file has been changed. This is useful for debugging and writing shaders yourself.
+
+.. warning::
+    This should be disabled for normal gameplay
+
+hdr exposure time
+-----------------
+
+:Type:      float
+:Range:     0.0 to 1.0
+:Default:   0.05
+
+Use for eye adaptation to control speed at which average scene luminance can change from one frame to the next.
+Average scene luminance is used in some shader effects for features such as dynamic eye adaptation.
+Smaller values will cause slower changes in scene luminance. This is most impactful when the brightness
+drastically changes quickly, like when entering a dark cave or exiting an interior and looking into a bright sun.
+
+This settings has no effect when HDR is disabled or :ref:`enabled` is set to false.
+
+transparent postpass
+--------------------
+
+:Type:      boolean
+:Range:     True/False
+:Default:   True
+
+Re-renders transparent objects with alpha-clipping forced with a fixed threshold. This is particularly important with vanilla content, where blended
+objects usually have depth writes disabled and massive margins between the geometry and texture alpha.
+
+
+.. warning::
+    This can be quite costly with vanilla assets. For best performance it is recommended to use a mod replacer which
+    uses alpha tested foliage and disable this setting. Morrowind Optimizaton Patch is a great option. 
+    If you are not using any shaders which utilize the depth buffer this setting should be disabled.
diff --git a/docs/source/reference/modding/settings/windows.rst b/docs/source/reference/modding/settings/windows.rst
index d745c765d9..6426802ab9 100644
--- a/docs/source/reference/modding/settings/windows.rst
+++ b/docs/source/reference/modding/settings/windows.rst
@@ -256,7 +256,21 @@ settings
 	w = 0.33
 
 	h = 0.66
+
 The settings window.
 Activated by clicking Options in the main menu.
 
+postprocessor
+-------------
+
+:Default:
+	x = 0.01
+
+	y = 0.02
+
+	w = 0.44
+
+	h = 0.95
 
+The postprocessor window used to configure shaders.
+Activated by pressing the F2 key.
diff --git a/docs/source/reference/postprocessing/index.rst b/docs/source/reference/postprocessing/index.rst
new file mode 100644
index 0000000000..9e69572742
--- /dev/null
+++ b/docs/source/reference/postprocessing/index.rst
@@ -0,0 +1,11 @@
+######################
+OpenMW Post Processing
+######################
+
+.. toctree::
+    :caption: Table of Contents
+    :includehidden:
+    :maxdepth: 2
+
+    overview
+    omwfx
\ No newline at end of file
diff --git a/docs/source/reference/postprocessing/omwfx.rst b/docs/source/reference/postprocessing/omwfx.rst
new file mode 100644
index 0000000000..ca25e7be7e
--- /dev/null
+++ b/docs/source/reference/postprocessing/omwfx.rst
@@ -0,0 +1,862 @@
+#########################
+OMWFX Language Reference
+#########################
+
+Overview
+########
+
+Shaders are written in a OpenMW specific ``*.omwfx`` format. This is a light
+wrapper around GLSL, so a basic understanding of GLSL should be acquired before
+attempting to write any shaders. Every shader must be contained within a single
+``*.omwfx`` file, ``#include`` directives are currently unsupported.
+
+By default, all shaders only guarantee support of GLSL 120 features. To target a
+newer GLSL version, you must specify it in the `technique`_ block properties. If
+the specified version is not supported on the target machine, the shader will
+not load.
+
+Reserved Keywords
+#################
+
+GLSL doesn't support namespaces, instead reserved prefixes are used. Do not
+attempt to name anything starting with ``_`` or ``omw``, this will cause
+name clashes.
+
+
+Builtin Samplers
+################
+
++------------------+---------------------------+---------------------------------------------+
+| GLSL Type        | Name                      | Description                                 |
++==================+===========================+=============================================+
+| sampler2D[Array] |``omw_SamplerLastShader``  | Color output of the last shader             |
++------------------+---------------------------+---------------------------------------------+
+| sampler2D[Array] |``omw_SamplerLastPass``    | Color output of the last pass               |
++------------------+---------------------------+---------------------------------------------+
+| sampler2D[Array] |``omw_SamplerDepth``       | Non-linear normalized depth                 |
++------------------+---------------------------+---------------------------------------------+
+| sampler2D[Array] |``omw_SamplerNormals``     | Normalized world-space normals [0, 1]       |
++------------------+---------------------------+---------------------------------------------+
+
+These are included in a common header in every pass, they do not need to be re-defined.
+It is recommended to use the accessor functions to retrieve the sampler value.
+OpenMW supports multiview rendering, so these samplers will either be a
+``sampler2D`` or ``sampler2DArray``. If you want more control over how you
+sample textures, use the ``OMW_MULTIVIEW`` macro to determine the appropriate functions to use.
+
+
+Builtin Uniforms
+################
+
++-------------+------------------------------+--------------------------------------------------+
+| GLSL Type   | Name                         | Description                                      |
++=============+==============================+==================================================+
+| mat4        | ``omw.projectionMatrix``     | The camera's projection matrix                   |
++-------------+------------------------------+--------------------------------------------------+
+| mat4        | ``omw.invProjectionMatrix``  | The inverse of the camera's projection matrix    |
++-------------+------------------------------+--------------------------------------------------+
+| mat4        | ``omw.viewMatrix``           | The camera's view matrix                         |
++-------------+------------------------------+--------------------------------------------------+
+| mat4        | ``omw.prevViewMatrix``       | The camera's previous frame view matrix          |
++-------------+------------------------------+--------------------------------------------------+
+| mat4        | ``omw.invViewMatrix``        | The inverse of the camera's view matrix          |
++-------------+------------------------------+--------------------------------------------------+
+| vec4        | ``omw.eyePos``               | The camera's eye position                        |
++-------------+------------------------------+--------------------------------------------------+
+| vec4        | ``omw.eyeVec``               | The normalized camera's eye vector               |
++-------------+------------------------------+--------------------------------------------------+
+| vec4        | ``omw.fogColor``             | The RGBA color of fog                            |
++-------------+------------------------------+--------------------------------------------------+
+| vec4        | ``omw.sunColor``             | The RGBA color of sun                            |
++-------------+------------------------------+--------------------------------------------------+
+| vec4        | ``omw.sunPos``               | The normalized sun direction                     |
+|             |                              |                                                  |
+|             |                              | When the sun is set `omw.sunpos.z` is negated    |
++-------------+------------------------------+--------------------------------------------------+
+| vec2        | ``omw.resolution``           | The render target's resolution                   |
++-------------+------------------------------+--------------------------------------------------+
+| vec2        | ``omw.rcpResolution``        | Reciprocal of the render target resolution       |
++-------------+------------------------------+--------------------------------------------------+
+| vec2        | ``omw.fogNear``              | The units at which the fog begins to render      |
++-------------+------------------------------+--------------------------------------------------+
+| float       | ``omw.fogFar``               | The units at which the fog ends                  |
++-------------+------------------------------+--------------------------------------------------+
+| float       | ``omw.near``                 | The camera's near clip                           |
++-------------+------------------------------+--------------------------------------------------+
+| float       | ``omw.far``                  | The camera's far clip                            |
++-------------+------------------------------+--------------------------------------------------+
+| float       | ``omw.gameHour``             | The game hour in range [0,24)                    |
++-------------+------------------------------+--------------------------------------------------+
+| float       | ``omw.sunVis``               | The sun's visibility between [0, 1]              |
+|             |                              |                                                  |
+|             |                              | Influenced by types of weather                   |
+|             |                              |                                                  |
+|             |                              | Closer to zero during overcast weathers          |
++-------------+------------------------------+--------------------------------------------------+
+| float       | ``omw.waterHeight``          | The water height of current cell                 |
+|             |                              |                                                  |
+|             |                              | Exterior water level is always zero              |
++-------------+------------------------------+--------------------------------------------------+
+| float       | ``omw.simulationTime``       | The time in milliseconds since simulation began  |
++-------------+------------------------------+--------------------------------------------------+
+| float       | ``omw.deltaSimulationTime``  | The change in `omw.simulationTime`               |
++-------------+------------------------------+--------------------------------------------------+
+| float       | ``omw.windSpeed``            | The current wind speed                           |
++-------------+------------------------------+--------------------------------------------------+
+| float       | ``omw.weatherTransition``    | The transition factor between weathers [0, 1]    |
++-------------+------------------------------+--------------------------------------------------+
+| int         | ``omw.weatherID``            | The current weather ID                           |
++-------------+------------------------------+--------------------------------------------------+
+| int         | ``omw.nextWeatherID``        | The next weather ID                              |
++-------------+------------------------------+--------------------------------------------------+
+| bool        | ``omw.isUnderwater``         | True if player is submerged underwater           |
++-------------+------------------------------+--------------------------------------------------+
+| bool        | ``omw.isInterior``           | True if player is in an interior                 |
+|             |                              |                                                  |
+|             |                              | False for interiors that behave like exteriors   |
++-------------+------------------------------+--------------------------------------------------+
+
+
+Builtin Macros
+##############
+
++------------------+----------------+---------------------------------------------------------------------------+
+| Macro            | Definition     | Description                                                               |
++==================+================+===========================================================================+
+|``OMW_REVERSE_Z`` | ``0`` or ``1`` | Whether a reversed depth buffer is in use.                                |
+|                  |                |                                                                           |
+|                  |                | ``0``  Depth sampler will be in range [1, 0]                              |
+|                  |                |                                                                           |
+|                  |                | ``1``  Depth sampler will be in range [0, 1]                              |
++------------------+----------------+---------------------------------------------------------------------------+
+|``OMW_RADIAL_FOG``| ``0`` or ``1`` | Whether radial fog is in use.                                             |
+|                  |                |                                                                           |
+|                  |                | ``0``  Fog is linear                                                      |
+|                  |                |                                                                           |
+|                  |                | ``1``  Fog is radial                                                      |
++------------------+----------------+---------------------------------------------------------------------------+
+| ``OMW_HDR``      | ``0`` or ``1`` | Whether average scene luminance is computed every frame.                  |
+|                  |                |                                                                           |
+|                  |                | ``0``  Average scene luminance is not computed                            |
+|                  |                |                                                                           |
+|                  |                | ``1``  Average scene luminance is computed                                |
++------------------+----------------+---------------------------------------------------------------------------+
+|  ``OMW_NORMALS`` | ``0`` or ``1`` | Whether normals are available as a sampler in the technique.              |
+|                  |                |                                                                           |
+|                  |                | ``0``  Normals are not available                                          |
+|                  |                |                                                                           |
+|                  |                | ``1``  Normals are available.                                             |
++------------------+----------------+---------------------------------------------------------------------------+
+| ``OMW_MULTIVIEW``| ``0`` or ``1`` | Whether multiview rendering is in use.                                    |
+|                  |                |                                                                           |
+|                  |                | ``0``  Multiview not in use                                               |
+|                  |                |                                                                           |
+|                  |                | ``1``  Multiview in use.                                                  |
++------------------+----------------+---------------------------------------------------------------------------+
+
+
+Builtin Functions
+#################
+
+The following functions can be accessed in any fragment or vertex shader.
+
++----------------------------------------+-------------------------------------------------------------------------------+
+| Function                               | Description                                                                   |
++========================================+===============================================================================+
+| ``float omw_GetDepth(vec2)``           |  Returns the depth value from a sampler given a uv coordinate.                |
+|                                        |                                                                               |
+|                                        |  Reverses sampled value when ``OMW_REVERSE_Z`` is set.                        |
++----------------------------------------+-------------------------------------------------------------------------------+
+| ``float omw_GetEyeAdaptation()``       |  Returns the average scene luminance in range [0, 1].                         |
+|                                        |                                                                               |
+|                                        |  If HDR is not in use, this returns `1.0`                                     |
+|                                        |                                                                               |
+|                                        |  Scene luminance is always calculated on original scene texture.              |
++----------------------------------------+-------------------------------------------------------------------------------+
+| ``vec4 omw_GetDepth(vec2 uv)``         | Returns non-linear normalized depth                                           |
++----------------------------------------+-------------------------------------------------------------------------------+
+| ``vec4 omw_GetLastShader(vec2 uv)``    | Returns RGBA color output of the last shader                                  |
++----------------------------------------+-------------------------------------------------------------------------------+
+| ``vec4 omw_GetLastPass(vec2 uv)``      | Returns RGBA color output of the last pass                                    |
++----------------------------------------+-------------------------------------------------------------------------------+
+| ``vec3 omw_GetNormals(vec2 uv)``       | Returns normalized worldspace normals [-1, 1]                                 |
+|                                        |                                                                               |
+|                                        | The values in sampler are in [0, 1] but are transformed to [-1, 1]            |
++----------------------------------------+-----------------------+-------------------------------------------------------+
+
+
+Special Attributes
+##################
+
+To maintain maximum compatability with future releases, OpenMW defines specific keywords, attributes, and functions for you to use. These should be used instead of their
+GLSL equivalent. Refer to the table below to view these mappings.
+
++-------------------+---------------------------------------------------------+
+| .omwfx            | Description                                             |
++===================+=========================================================+
+| omw_In            |  use in place of ``in`` and ``varying``                 |
++-------------------+---------------------------------------------------------+
+| omw_Out           |  use in place of ``out`` and ```varying``               |
++-------------------+---------------------------------------------------------+
+| omw_Position      |  use in place of ``gl_Position``                        |
++-------------------+---------------------------------------------------------+
+| omw_Vertex        |  use in place of ``gl_Vertex``                          |
++-------------------+---------------------------------------------------------+
+| omw_Fragment      |  use in place of ``gl_FragData[*]`` and ``gl_FragColor``|
++-------------------+---------------------------------------------------------+
+| omw_Texture1D()   |  use in place of ``texture1D()`` or ``texture()``       |
++-------------------+---------------------------------------------------------+
+| omw_Texture2D()   |  use in place of ``texture2D()`` or ``texture()``       |
++-------------------+---------------------------------------------------------+
+| omw_Texture3D()   |  use in place of ``texture3D()`` or ``texture()``       |
++-------------------+---------------------------------------------------------+
+
+Blocks
+######
+
+``fragment``
+*************
+
+Declare your passes with ``fragment`` followed by a unique name. We will define the order of these passes later on.
+Each ``fragment`` block must contain valid GLSL. Below is a simple example of defining two passes.
+
+.. code-block:: none
+
+    fragment pass {
+        void main()
+        {
+            omw_FragColor = vec4(1.0);
+        }
+    }
+
+    fragment otherPass {
+
+        omw_In vec2 omw_TexCoord;
+
+        void main()
+        {
+            omw_FragColor = omw_GetLastPass(omw_TexCoord);
+        }
+    }
+
+``vertex``
+***********
+
+For every ``fragment`` block you declare, OpenMW generates a default vertex shader if you do not define one. This is used to draw the fullscreen triangle used in postprocessing.
+This means you rarely need to use a custom vertex shader. Using a vertex shader can sometimes be useful when you need to do lots of complicated calculations that don't rely on pixel location.
+The vertex shader only invocates on the `3` vertices of the fullscreen triangle.
+Below is an example of passing a value through a custom vertex shader to the fragment shader.
+
+.. code-block:: none
+
+    vertex pass {
+        #if OMW_USE_BINDINGS
+            omw_In vec2 omw_Vertex;
+        #endif
+
+        uniform sampler2D noiseSampler;
+
+        omw_Out vec2 omw_TexCoord;
+
+        // custom output from vertex shader
+        omw_Out float noise;
+
+        void main()
+        {
+            omw_Position = vec4(omw_Vertex.xy, 0.0, 1.0);
+            omw_TexCoord = omw_Position.xy * 0.5 + 0.5;
+
+            noise = sqrt(omw_Texture2D(noiseSampler, vec2(0.5, 0.5)).r);
+        }
+    }
+
+    fragment pass {
+        omw_Out vec2 omw_TexCoord;
+
+        // our custom output from the vertex shader is available
+        omw_Out float noise;
+
+        void main()
+        {
+            omw_FragColor = vec4(1.0);
+        }
+    }
+
+
+``technique``
+*************
+
+Exactly one ``technique`` block is required for every shader file. In this we define important traits like author, description, requirements, and flags.
+
+
++------------------+--------------------+---------------------------------------------------+
+| Property         | Type               | Description                                       |
++==================+====================+===================================================+
+| passes           | literal list       | ``,`` separated list of pass names                |
++------------------+--------------------+---------------------------------------------------+
+| version          | string             | Shader version that shows in HUD                  |
++------------------+--------------------+---------------------------------------------------+
+| description      | string             | Shader description that shows in HUD              |
++------------------+--------------------+---------------------------------------------------+
+| author           | string             | Shader authors that shows in HUD                  |
++------------------+--------------------+---------------------------------------------------+
+| glsl_Version     | integer            | GLSL version                                      |
++------------------+--------------------+---------------------------------------------------+
+| glsl_profile     | string             | GLSL profile, like ``compatability``              |
++------------------+--------------------+---------------------------------------------------+
+| glsl_extensions  | literal list       | ``,`` separated list of required GLSL extensions  |
++------------------+--------------------+---------------------------------------------------+
+| hdr              | boolean            | Whether HDR eye adaptation is required.           |
++------------------+--------------------+---------------------------------------------------+
+| pass_normals     | boolean            | Pass normals from the forward passes.             |
+|                  |                    |                                                   |
+|                  |                    | If unsupported, `OMW_NORMALS` will be set to `0`  |
++------------------+--------------------+---------------------------------------------------+
+| flags            | `SHADER_FLAG`_     | ``,`` separated list of shader flags              |
++------------------+--------------------+---------------------------------------------------+
+
+In the code snippet below, a shader is defined that requires GLSL `330`, HDR capatiblities, and is only enabled underwater in exteriors.
+
+.. code-block:: none
+
+    fragment dummy {
+        void main()
+        {
+            omw_FragColor = vec4(0.0);
+        }
+    }
+
+    technique {
+        passes = dummy;
+        glsl_version = 330;
+        hdr = true;
+        flags = disable_interiors | disable_abovewater;
+    }
+
+
+``sampler_*``
+*************
+
+Any texture in the VFS can be loaded by a shader. All passes within the technique will have access to this texture as a sampler.
+OpenMW currently supports ``1D``, ``2D``, and ``3D`` texture samplers, cubemaps can not yet be loaded.
+
++-------------+
+| Block       |
++=============+
+| sampler_1d  |
++-------------+
+| sampler_2d  |
++-------------+
+| sampler_3d  |
++-------------+
+
+The properites for a ``sampler_*`` block are as following.
+The only required property for a texture is its ``source``.
+
++-----------------------+-----------------------+
+| Property              | Type                  |
++=======================+=======================+
+|``source``             |  string               |
++-----------------------+-----------------------+
+|``min_filter``         | `FILTER_MODE`_        |
++-----------------------+-----------------------+
+|``mag_filter``         | `FILTER_MODE`_        |
++-----------------------+-----------------------+
+|``wrap_s``             | `WRAP_MODE`_          |
++-----------------------+-----------------------+
+|``wrap_t``             | `WRAP_MODE`_          |
++-----------------------+-----------------------+
+|``wrap_r``             | `WRAP_MODE`_          |
++-----------------------+-----------------------+
+|``compression``        | `COMPRESSION_MODE`_   |
++-----------------------+-----------------------+
+|``source_format``      | `SOURCE_FORMAT`_      |
++-----------------------+-----------------------+
+|``source_type``        | `SOURCE_TYPE`_        |
++-----------------------+-----------------------+
+|``internal_format``    | `INTERNAL_FORMAT`_    |
++-----------------------+-----------------------+
+
+In the code snippet below, a simple noise texture is loaded with nearest filtering.
+
+.. code-block:: none
+
+    sampler_2d noise {
+        source = "textures/noise.png";
+        mag_filter = nearest;
+        min_filter = nearest;
+    }
+
+To use the sampler, define the appropriately named `sampler2D` in any of your passes.
+
+.. code-block:: none
+
+    fragment pass {
+        omw_In vec2 omw_TexCoord;
+
+        uniform sampler2D noise;
+
+        void main()
+        {
+            // ...
+            vec4 noise = omw_Texture2D(noise, omw_TexCoord);
+        }
+    }
+
+``uniform_*``
+**************
+
+It is possible to define settings for your shaders that can be adjusted by either users or a Lua script.
+
+
++-----------------+----------+----------+----------+---------+----------+--------------+---------+
+| Block           | default  | min      | max      | static  | step     | description  | header  |
++=================+==========+==========+==========+=========+==========+==============+=========+
+|``uniform_bool`` | boolean  | x        | x        | boolean | x        | string       | string  |
++-----------------+----------+----------+----------+---------+----------+--------------+---------+
+|``uniform_float``| float    | float    | float    | boolean | float    | string       | string  |
++-----------------+----------+----------+----------+---------+----------+--------------+---------+
+|``uniform_int``  | integer  | integer  | integer  | boolean | integer  | string       | string  |
++-----------------+----------+----------+----------+---------+----------+--------------+---------+
+|``uniform_vec2`` | vec2     | vec2     | vec2     | boolean | vec2     | string       | string  |
++-----------------+----------+----------+----------+---------+----------+--------------+---------+
+|``uniform_vec3`` | vec3     | vec3     | vec3     | boolean | vec3     | string       | string  |
++-----------------+----------+----------+----------+---------+----------+--------------+---------+
+|``uniform_vec4`` | vec4     | vec4     | vec4     | boolean | vec4     | string       | string  |
++-----------------+----------+----------+----------+---------+----------+--------------+---------+
+
+The ``description`` field is used to display a toolip when viewed in the in-game HUD. The ``header`` field
+field can be used to organize uniforms into groups in the HUD.
+
+If you would like a uniform to be adjustable with Lua API you `must` set ``static = false;``. Doing this
+will also remove the uniform from the players HUD.
+
+Below is an example of declaring a ``vec3`` uniform.
+
+.. code-block:: none
+
+    uniform_vec3 uColor {
+        default = vec3(0,1,1);
+        min = vec3(0,0,0);
+        max = vec3(1,1,1);
+        step = vec3(0.1, 0.1, 0.1);
+        description = "Color uniform";
+        static = true;
+        header = "Colors";
+    }
+
+To use the uniform you can reference it in any pass, it should **not** be declared with the ``uniform`` keyword.
+
+.. code-block:: none
+
+    fragment pass {
+        void main()
+        {
+            // ...
+            vec3 color = uColor;
+        }
+    }
+
+
+``render_target``
+*****************
+
+Normally when defining passes, OpenMW will take care of setting up all of the render targets. Sometimes, this behavior
+is not wanted and you want a custom render target.
+
+
++------------------+---------------------+-----------------------------------------------------------------------------+
+| Property         | Type                | Description                                                                 |
++==================+=====================+=============================================================================+
+| min_filter       | `FILTER_MODE`_      | x                                                                           |
++------------------+---------------------+-----------------------------------------------------------------------------+
+| mag_filter       | `FILTER_MODE`_      | x                                                                           |
++------------------+---------------------+-----------------------------------------------------------------------------+
+| wrap_s           | `WRAP_MODE`_        | x                                                                           |
++------------------+---------------------+-----------------------------------------------------------------------------+
+| wrap_t           | `WRAP_MODE`_        | x                                                                           |
++------------------+---------------------+-----------------------------------------------------------------------------+
+| internal_format  | `INTERNAL_FORMAT`_  | x                                                                           |
++------------------+---------------------+-----------------------------------------------------------------------------+
+| source_type      | `SOURCE_TYPE`_      | x                                                                           |
++------------------+---------------------+-----------------------------------------------------------------------------+
+| source_format    | `SOURCE_FORMAT`_    | x                                                                           |
++------------------+---------------------+-----------------------------------------------------------------------------+
+| width_ratio      | float               | Automatic width as a percentage of screen width                             |
++------------------+---------------------+-----------------------------------------------------------------------------+
+| height_ratio     | float               | Automatic width as a percentage of screen height                            |
++------------------+---------------------+-----------------------------------------------------------------------------+
+| width            | float               | Width in pixels                                                             |
++------------------+---------------------+-----------------------------------------------------------------------------+
+| height           | float               | Height in pixels                                                            |
++------------------+---------------------+-----------------------------------------------------------------------------+
+| mipmaps          | boolean             | Whether mipmaps should be generated every frame                             |
++------------------+---------------------+-----------------------------------------------------------------------------+
+
+
+To use the render target you must assign passes to it, along with any optional clear modes or custom blend modes.
+
+In the code snippet below a rendertarget is used to draw the red cannel of a scene at half resolution.
+
+.. code-block:: none
+
+    render_target RT_Downsample {
+        width_ratio = 0.5;
+        height_ratio = 0.5;
+        internal_format = r16f;
+        source_type = float;
+        source_format = red;
+    }
+
+    fragment downsample2x(target=RT_Downsample) {
+
+        omw_In vec2 omw_TexCoord;
+
+        void main()
+        {
+            omw_FragColor.r = omw_GetLastShader(omw_TexCoord).r;
+        }
+    }
+
+Now, if we ever run the `downsample2x` pass it will write to the target buffer instead of the default
+one assigned by the engine.
+
+To use the uniform you can reference it in any pass, it should **not** be declared with the ``uniform`` keyword.
+
+.. code-block:: none
+
+    fragment pass {
+        void main()
+        {
+            // ...
+            vec3 color = uColor;
+        }
+    }
+
+Simple Example
+##############
+
+Let us go through a simple example in which we apply a simple desaturation
+filter with a user-configurable factor.
+
+Our first step is defining our user-configurable variable. In this case all we
+want is a normalized value between 0 and 1 to influence the amount of
+desaturation to apply to the scene. Here we setup a new variable of type
+``float``, define a few basic properties, and give it a tooltip description.
+
+.. code-block:: none
+
+    uniform_float uDesaturationFactor {
+        default = 0.5;
+        min = 0.0;
+        max = 1.0;
+        step = 0.05;
+        static = true;
+        description = "Desaturation factor. A value of 1.0 is full grayscale.";
+    }
+
+Now, we can setup our first pass. Remember a pass is just a pixel shader invocation.
+
+.. code-block:: none
+
+    fragment desaturate {
+        omw_In vec2 omw_TexCoord;
+
+        void main()
+        {
+            // fetch scene texture from last shader
+            vec4 scene = omw_GetLastShader(omw_TexCoord);
+
+            // desaturate RGB component
+            const vec3 luminance = vec3(0.299, 0.587, 0.144);
+            float gray = dot(luminance, scene.rgb);
+
+            omw_FragColor = vec4(mix(scene.rgb, vec3(gray), uDesaturationFactor), scene.a);
+        }
+    }
+
+Next we can define our ``technique`` block, which is in charge of glueing
+together passes, setting up metadata, and setting up various flags.
+
+.. code-block:: none
+
+    technique {
+        description = "Desaturates scene";
+        passes = desaturate;
+        version = "1.0";
+        author = "Fargoth";
+        passes = desaturate;
+    }
+
+
+Putting it all together we have this simple shader.
+
+.. code-block:: none
+
+    uniform_float uDesaturationFactor {
+        default = 0.5;
+        min = 0.0;
+        max = 1.0;
+        step = 0.05;
+        description = "Desaturation factor. A value of 1.0 is full grayscale.";
+    }
+
+    fragment desaturate {
+        omw_In vec2 omw_TexCoord;
+
+        void main()
+        {
+            // fetch scene texture from last shader
+            vec4 scene = omw_GetLastShader(omw_TexCoord);
+
+            // desaturate RGB component
+            const vec3 luminance = vec3(0.299, 0.587, 0.144);
+            float gray = dot(luminance, scene.rgb);
+
+            omw_FragColor = vec4(mix(scene.rgb, vec3(gray), uDesaturationFactor), scene.a);
+        }
+    }
+
+    technique {
+        description = "Desaturates scene";
+        passes = desaturate;
+        version = "1.0";
+        author = "Fargoth";
+        passes = desaturate;
+    }
+
+
+Types
+#####
+
+`SHADER_FLAG`
+*************
+
++--------------------+--------------------------------------------------------------------------+
+| Flag               | Description                                                              |
++====================+==========================================================================+
+| disable_interiors  | Disable in interiors.                                                    |
++--------------------+--------------------------------------------------------------------------+
+| disable_exteriors  | Disable when in exteriors or interiors which behave like exteriors.      |
++--------------------+--------------------------------------------------------------------------+
+| disable_underwater | Disable when underwater.                                                 |
++--------------------+--------------------------------------------------------------------------+
+| disable_abovewater | Disable when above water.                                                |
++--------------------+--------------------------------------------------------------------------+
+| disable_sunglare   | Disables builtin sunglare.                                               |
++--------------------+--------------------------------------------------------------------------+
+| hidden             | Shader does not show in the HUD. Useful for shaders driven by Lua API.   |
++--------------------+--------------------------------------------------------------------------+
+
+`BLEND_EQ`
+**********
+
++-------------------+---------------------------+
+| .omwfx            | OpenGL                    |
++===================+===========================+
+| rgba_min          | GL_MIN                    |
++-------------------+---------------------------+
+| rgba_max          | GL_MAX                    |
++-------------------+---------------------------+
+| alpha_min         | GL_ALPHA_MIN_SGIX         |
++-------------------+---------------------------+
+| alpha_max         | GL_ALPHA_MAX_SGIX         |
++-------------------+---------------------------+
+| logic_op          | GL_LOGIC_OP               |
++-------------------+---------------------------+
+| add               | GL_FUNC_ADD               |
++-------------------+---------------------------+
+| subtract          | GL_FUNC_SUBTRACT          |
++-------------------+---------------------------+
+| reverse_subtract  | GL_FUNC_REVERSE_SUBTRACT  |
++-------------------+---------------------------+
+
+`BLEND_FUNC`
+************
+
++---------------------------+------------------------------+
+| .omwfx                    | OpenGL                       |
++===========================+==============================+
+| dst_alpha                 | GL_DST_ALPHA                 |
++---------------------------+------------------------------+
+| dst_color                 | GL_DST_COLOR                 |
++---------------------------+------------------------------+
+| one                       | GL_ONE                       |
++---------------------------+------------------------------+
+| one_minus_dst_alpha       | GL_ONE_MINUS_DST_ALPHA       |
++---------------------------+------------------------------+
+| one_minus_dst_color       | GL_ONE_MINUS_DST_COLOR       |
++---------------------------+------------------------------+
+| one_minus_src_alpha       | GL_ONE_MINUS_SRC_ALPHA       |
++---------------------------+------------------------------+
+| one_minus_src_color       | GL_ONE_MINUS_SRC_COLOR       |
++---------------------------+------------------------------+
+| src_alpha                 | GL_SRC_ALPHA                 |
++---------------------------+------------------------------+
+| src_alpha_saturate        | GL_SRC_ALPHA_SATURATE        |
++---------------------------+------------------------------+
+| src_color                 | GL_SRC_COLOR                 |
++---------------------------+------------------------------+
+| constant_color            | GL_CONSTANT_COLOR            |
++---------------------------+------------------------------+
+| one_minus_constant_color  | GL_ONE_MINUS_CONSTANT_COLOR  |
++---------------------------+------------------------------+
+| constant_alpha            | GL_CONSTANT_ALPHA            |
++---------------------------+------------------------------+
+| one_minus_constant_alpha  | GL_ONE_MINUS_CONSTANT_ALPHA  |
++---------------------------+------------------------------+
+| zero                      | GL_ZERO                      |
++---------------------------+------------------------------+
+
+`INTERNAL_FORMAT`
+*****************
+
++--------------------+-----------------------+
+| .omwfx             | OpenGL                |
++====================+=======================+
+| red                | GL_RED                |
++--------------------+-----------------------+
+| r16f               | GL_R16F               |
++--------------------+-----------------------+
+| r32f               | GL_R32F               |
++--------------------+-----------------------+
+| rg                 | GL_RG                 |
++--------------------+-----------------------+
+| rg16f              | GL_RG16F              |
++--------------------+-----------------------+
+| rg32f              | GL_RG32F              |
++--------------------+-----------------------+
+| rgb                | GL_RGB                |
++--------------------+-----------------------+
+| rgb16f             | GL_RGB16F             |
++--------------------+-----------------------+
+| rgb32f             | GL_RGB32F             |
++--------------------+-----------------------+
+| rgba               | GL_RGBA               |
++--------------------+-----------------------+
+| rgba16f            | GL_RGBA16F            |
++--------------------+-----------------------+
+| rgba32f            | GL_RGBA32F            |
++--------------------+-----------------------+
+| depth_component16  | GL_DEPTH_COMPONENT16  |
++--------------------+-----------------------+
+| depth_component24  | GL_DEPTH_COMPONENT24  |
++--------------------+-----------------------+
+| depth_component32  | GL_DEPTH_COMPONENT32  |
++--------------------+-----------------------+
+| depth_component32f | GL_DEPTH_COMPONENT32F |
++--------------------+-----------------------+
+
+`SOURCE_TYPE`
+*************
+
++--------------------+-----------------------+
+| .omwfx             | OpenGL                |
++====================+=======================+
+| byte               | GL_BYTE               |
++--------------------+-----------------------+
+| unsigned_byte      | GL_UNSIGNED_BYTE      |
++--------------------+-----------------------+
+| short              | GL_SHORT              |
++--------------------+-----------------------+
+| unsigned_short     | GL_UNSIGNED_SHORT     |
++--------------------+-----------------------+
+| int                | GL_INT                |
++--------------------+-----------------------+
+| unsigned_int       | GL_UNSIGNED_INT       |
++--------------------+-----------------------+
+| unsigned_int_24_8  | GL_UNSIGNED_INT_24_8  |
++--------------------+-----------------------+
+| float              | GL_FLOAT              |
++--------------------+-----------------------+
+| double             | GL_DOUBLE             |
++--------------------+-----------------------+
+
+
+`SOURCE_FORMAT`
+***************
+
++---------+---------+
+| .omwfx  | OpenGL  |
++=========+=========+
+| red     | GL_RED  |
++---------+---------+
+| rg      | GL_RG   |
++---------+---------+
+| rgb     | GL_RGB  |
++---------+---------+
+| bgr     | GL_BGR  |
++---------+---------+
+| rgba    | GL_RGBA |
++---------+---------+
+| bgra    | GL_BGRA |
++---------+---------+
+
+`FILTER_MODE`
+*************
+
++-------------------------+----------------------------+
+| .omwfx                  | OpenGL                     |
++=========================+============================+
+| linear                  | GL_LINEAR                  |
++-------------------------+----------------------------+
+| linear_mipmap_linear    | GL_LINEAR_MIPMAP_LINEAR    |
++-------------------------+----------------------------+
+| linear_mipmap_nearest   | GL_LINEAR_MIPMAP_NEAREST   |
++-------------------------+----------------------------+
+| nearest                 | GL_NEAREST                 |
++-------------------------+----------------------------+
+| nearest_mipmap_linear   | GL_NEAREST_MIPMAP_LINEAR   |
++-------------------------+----------------------------+
+| nearest_mipmap_nearest  | GL_NEAREST_MIPMAP_NEAREST  |
++-------------------------+----------------------------+
+
+`WRAP_MODE`
+***********
+
++------------------+---------------------+
+| .omwfx           | OpenGL              |
++==================+=====================+
+| clamp            | GL_CLAMP            |
++------------------+---------------------+
+| clamp_to_edge    | GL_CLAMP_TO_EDGE    |
++------------------+---------------------+
+| clamp_to_border  | GL_CLAMP_TO_BORDER  |
++------------------+---------------------+
+| repeat           | GL_REPEAT           |
++------------------+---------------------+
+| mirror           | GL_MIRRORED_REPEAT  |
++------------------+---------------------+
+
+`COMPRESSION_MODE`
+******************
+
++-------------+
+| .omwfx      |
++=============+
+| auto        |
++-------------+
+| arb         |
++-------------+
+| s3tc_dxt1   |
++-------------+
+| s3tc_dxt3   |
++-------------+
+| s3tc_dxt5   |
++-------------+
+| pvrtc_2bpp  |
++-------------+
+| pvrtc_4bpp  |
++-------------+
+| etc         |
++-------------+
+| etc2        |
++-------------+
+| rgtc1       |
++-------------+
+| rgtc2       |
++-------------+
+| s3tc_dxt1c  |
++-------------+
+| s3tc_dxt1a  |
++-------------+
diff --git a/docs/source/reference/postprocessing/overview.rst b/docs/source/reference/postprocessing/overview.rst
new file mode 100644
index 0000000000..05d5e428c0
--- /dev/null
+++ b/docs/source/reference/postprocessing/overview.rst
@@ -0,0 +1,45 @@
+#####################################
+Overview of Post Processing Framework
+#####################################
+
+Overview
+========
+
+OpenMW supports a moddable post process framework for creating and
+controlling screenspace effects. This is integrated into OpenMW's Lua API, see
+`reference <../lua-scripting/openmw_shader.html>`_ for details.
+
+Basic concepts
+==============
+
+Pass
+    Describes a single shader invocation pass. Currently only pixel (also known
+    as fragment) shaders are supported.
+
+Technique/Shader
+    An ordered list of passes, techniques will encompass a single effect like
+    bloom or SSAO. Technique is interchangable with shader.
+
+Installing and Activating
+=========================
+
+Shaders are managed through the virtual file system, simply install the associated
+archive or folder as described in :ref:`mod-install<install>`. Shaders must be
+in the `Shaders` directory to be discoverable. A shader can be activated in one
+of two ways:
+
+1. Adding the shaders filename (without its extension) to the end of the
+   :ref:`chain` list in ``settings.cfg``.
+2. Using the in game post processor HUD, which can be activated with the ``F2``
+   key by default. This is the recommended method as manual editing can be error
+   prone.
+
+Hot Reloading
+==============
+
+It is possible to modify a shader without restarting OpenMW, :ref:`live reload`
+must be enabled in ``settings.cfg``. Whenever a file is modified and saved, the
+shader will automatically reload in game. This allows shaders to be written in a
+text editor you are comfortable with. The only restriction is that new shaders
+cannot be added, as the VFS will not be rebuilt and OpenMW will not be aware of
+the new file.
diff --git a/files/lua_api/CMakeLists.txt b/files/lua_api/CMakeLists.txt
index 88efc8195c..d2447fa80c 100644
--- a/files/lua_api/CMakeLists.txt
+++ b/files/lua_api/CMakeLists.txt
@@ -13,6 +13,7 @@ set(LUA_API_FILES
     openmw/util.lua
     openmw/world.lua
     openmw/types.lua
+    openmw/postprocessing.lua
 )
 
 foreach (f ${LUA_API_FILES})
diff --git a/files/lua_api/openmw/input.lua b/files/lua_api/openmw/input.lua
index 12ea5c94b3..205ab584d9 100644
--- a/files/lua_api/openmw/input.lua
+++ b/files/lua_api/openmw/input.lua
@@ -149,6 +149,7 @@
 -- @field [parent=#ACTION] #number ToggleDebug
 -- @field [parent=#ACTION] #number ZoomIn
 -- @field [parent=#ACTION] #number ZoomOut
+-- @field [parent=#ACTION] #number TogglePostProcessorHUD
 
 ---
 -- Values that can be used with isActionPressed.
diff --git a/files/lua_api/openmw/postprocessing.lua b/files/lua_api/openmw/postprocessing.lua
new file mode 100644
index 0000000000..36c96c2efc
--- /dev/null
+++ b/files/lua_api/openmw/postprocessing.lua
@@ -0,0 +1,92 @@
+---
+-- `openmw.postprocessing` is an interface to postprocessing shaders.
+-- Can be used only by local scripts, that are attached to a player.
+-- @module shader
+-- @usage local postprocessing = require('openmw.postprocessing')
+
+
+
+---
+-- Load a shader and return its handle.
+-- @function [parent=#postprocessing] load
+-- @param #string name Name of the shader without its extension
+-- @return #Shader
+-- @usage
+-- If the shader exists and compiles, the shader will still be off by default.
+-- It must be enabled to see its effect.
+-- local vignetteShader = postprocessing.load('vignette')
+
+---
+-- Enable the shader. Has no effect if the shader is already enabled or does
+-- not exist. Will not apply until the next frame.
+-- @function [parent=#Shader] enable Enable the shader
+-- @param self
+-- @param #number position optional position to place the shader. If left out the shader will be inserted at the end of the chain.
+-- @usage
+-- -- Load shader
+-- local vignetteShader = postprocessing.load('vignette')
+-- -- Toggle shader on
+-- vignetteShader:enable()
+
+---
+-- Deactivate the shader. Has no effect if the shader is already deactivated or does not exist.
+-- Will not apply until the next frame.
+-- @function [parent=#Shader] disable Disable the shader
+-- @param self
+-- @usage
+-- local vignetteShader = shader.postprocessing('vignette')
+-- vignetteShader:disable() -- shader will be toggled off
+
+---
+-- Check if the shader is enabled.
+-- @function [parent=#Shader] isEnabled
+-- @param self
+-- @return #boolean True if shader is enabled and was compiled successfully.
+-- @usage
+-- local vignetteShader = shader.postprocessing('vignette')
+-- vignetteShader:enable() -- shader will be toggled on
+
+---
+-- Set a non static bool shader variable.
+-- @function [parent=#Shader] setBool
+-- @param self
+-- @param #string name Name of uniform
+-- @param #boolean value Value of uniform.
+
+---
+-- Set a non static integer shader variable.
+-- @function [parent=#Shader] setInt
+-- @param self
+-- @param #string name Name of uniform
+-- @param #number value Value of uniform.
+
+---
+-- Set a non static float shader variable.
+-- @function [parent=#Shader] setFloat
+-- @param self
+-- @param #string name Name of uniform
+-- @param #number value Value of uniform.
+
+---
+-- Set a non static Vector2 shader variable.
+-- @function [parent=#Shader] setVector2
+-- @param self
+-- @param #string name Name of uniform
+-- @param #Vector2 value Value of uniform.
+
+---
+-- Set a non static Vector3 shader variable.
+-- @function [parent=#Shader] setVector3
+-- @param self
+-- @param #string name Name of uniform
+-- @param #Vector3 value Value of uniform.
+
+---
+-- Set a non static Vector4 shader variable.
+-- @function [parent=#Shader] setVector4
+-- @param self
+-- @param #string name Name of uniform
+-- @param #Vector4 value Value of uniform.
+
+
+return nil
diff --git a/files/mygui/CMakeLists.txt b/files/mygui/CMakeLists.txt
index 1edfbca806..924aaecada 100644
--- a/files/mygui/CMakeLists.txt
+++ b/files/mygui/CMakeLists.txt
@@ -90,6 +90,8 @@ set(MYGUI_FILES
     openmw_edit_note.layout
     openmw_debug_window.layout
     openmw_debug_window.skin.xml
+    openmw_postprocessor_hud.layout
+    openmw_postprocessor_hud.skin.xml
     openmw_jail_screen.layout
     DejaVuLGCSansMono.ttf
     ../launcher/images/openmw.png
diff --git a/files/mygui/openmw_list.skin.xml b/files/mygui/openmw_list.skin.xml
index db2c722d7e..9a54a10683 100644
--- a/files/mygui/openmw_list.skin.xml
+++ b/files/mygui/openmw_list.skin.xml
@@ -202,6 +202,14 @@
         </BasisSkin>
     </Resource>
 
+    <!-- Vertical line -->
+
+    <Resource type="ResourceSkin" name="MW_VLine" size="10 512" texture="textures\menu_thin_border_left.dds">
+        <BasisSkin type="SubSkin" offset="0 0 2 512" align="Bottom VStretch">
+            <State name="normal" offset="0 0 2 512"/>
+        </BasisSkin>
+    </Resource>
+
     <!-- Arrows -->
 
     <Resource type="AutoSizedResourceSkin" name="MW_ArrowLeft" texture="textures\omw_menu_scroll_left.dds">
diff --git a/files/mygui/openmw_postprocessor_hud.layout b/files/mygui/openmw_postprocessor_hud.layout
new file mode 100644
index 0000000000..1030c83d2c
--- /dev/null
+++ b/files/mygui/openmw_postprocessor_hud.layout
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MyGUI type="Layout">
+  <Widget type="Window" skin="MW_Window" position="0 0 500 500" layer="Debug" name="_Main" align="Stretch">
+    <Property key="Visible" value="false"/>
+    <Property key="Caption" value="Postprocess HUD"/>
+	<Property key="MinSize" value="600 600"/>
+
+    <Widget type="TabControl" skin="TabControl_NoBorder" position="8 8 468 450" align="Stretch" name="TabControl">
+        <Property key="ButtonAutoWidth" value="true"/>
+
+		<Widget type="AutoSizedTextBox" skin="NormalText" position="440 8 50 50" align="Top Right">
+			<Property key="Caption" value="[?]"/>
+			<UserString key="ToolTipType" value="Layout"/>
+			<UserString key="ToolTipLayout" value="TextToolTip"/>
+			<UserString key="Caption_Text" value="Keyboard controls:\n\n
+				Shift+Right-Arrow > Activate shader\n
+				Shift+Left-Arrow > Deactive shader\n
+				Shift+Up-Arrow > Move shader up\n
+				Shift+Down-Arrow > Move shader down\n
+				Hold Shift > Fine tune sliders\n
+				"/>
+		</Widget>
+
+        <Widget type="TabItem" skin="" position_real="0 0 1 1" name="TabConfiguration">
+			<Property key="Caption" value="Configuration"/>
+
+			<Widget type="VBox" position_real="0 0.02 1 0.98" align="Stretch" name="Layout">
+				<Property key="Padding" value="0"/>
+				<Property key="Spacing" value="8"/>
+
+				<Widget type="Widget" position ="0 0 0 400">
+					<UserString key="HStretch" value="true"/>
+					<UserString key="VStretch" value="false"/>
+
+					<Widget type="HBox" position_real="0 0 1 1" align="Stretch">
+						<UserString key="VStretch" value="true"/>
+						<UserString key="HStretch" value="true"/>
+
+						<Widget type="Widget">
+							<UserString key="VStretch" value="true"/>
+							<UserString key="HStretch" value="true"/>
+
+							<Widget type="VBox" position_real="0 0 1 1" align="Stretch">
+								<Widget type="EditBox" skin="MW_TextBoxEditWithBorder" position="0 0 0 28" name="Filter">
+									<UserString key="HStretch" value="true"/>
+									<UserString key="AcceptTab" value="true"/>
+									<Property key="TextAlign" value="Left VCenter"/>
+								</Widget>
+								<Widget type="ListWrapper" skin="MW_List" name="InactiveList">
+									<UserString key="VStretch" value="true"/>
+									<UserString key="HStretch" value="true"/>
+								</Widget>
+							</Widget>
+						</Widget>
+
+						<Widget type="VBox" position_real="0 0 1 1">
+							<Widget type="AutoSizedButton" skin="MW_Button" name="ButtonActivate">
+								<Widget type="Widget" skin="MW_ArrowRight" position="0 0 12 12" align="Center">
+									<Property key="NeedMouse" value="false"/>
+								</Widget>
+							</Widget>
+							<Widget type="AutoSizedButton" skin="MW_Button" name="ButtonDeactivate">
+								<Widget type="Widget" skin="MW_ArrowLeft" position="0 0 12 12" align="Center">
+									<Property key="NeedMouse" value="false"/>
+								</Widget>
+							</Widget>
+
+							<Widget type="Widget" skin="" position="0 0 15 25"/>
+
+							<Widget type="AutoSizedButton" skin="MW_Button" name="ButtonUp">
+								<Widget type="Widget" skin="MW_ArrowUp" position="0 0 12 12" align="Center">
+									<Property key="NeedMouse" value="false"/>
+								</Widget>
+							</Widget>
+							<Widget type="AutoSizedButton" skin="MW_Button" name="ButtonDown">
+								<Widget type="Widget" skin="MW_ArrowDown" position="0 0 12 12" align="Center">
+									<Property key="NeedMouse" value="false"/>
+								</Widget>
+							</Widget>
+
+						</Widget>
+
+						<Widget type="ListWrapper" skin="MW_List" name="ActiveList">
+							<UserString key="VStretch" value="true"/>
+							<UserString key="HStretch" value="true"/>
+						</Widget>
+
+					</Widget>
+
+				</Widget>
+
+				<Widget type="Widget" skin="MW_Box">
+					<UserString key="VStretch" value="true"/>
+					<UserString key="HStretch" value="true"/>
+
+					<Widget type="VBox" position_real="0 0 1 1" align="Stretch">
+						<Property key="Padding" value="14"/>
+						<Widget type="ScrollView" skin="MW_ScrollView" position_real="0 0 1 1" align="Stretch" name="ConfigLayout">
+							<Property key="CanvasAlign" value="Left Top"/>
+							<Property key="NeedMouse" value="true"/>
+							<Property key="VisibleVScroll" value="true"/>
+						</Widget>
+					</Widget>
+				</Widget>
+
+				<Widget type="Widget" position="0 0 230 28" align="Bottom Left">
+					<UserString key="HStretch" value="false"/>
+					<UserString key="VStretch" value="false"/>
+
+					<Widget type="HBox" position_real="0 0 1 1" align="Stretch">
+						<UserString key="HStretch" value="true"/>
+						<Property key="Spacing" value="4"/>
+
+						<Widget type="AutoSizedTextBox" skin="SandText">
+							<UserString key="HStretch" value="true"/>
+							<UserString key="VStretch" value="true"/>
+							<Property key="Caption" value="Enable Config Mode"/>
+							<Property key="TextAlign" value="Left VCenter"/>
+						</Widget>
+
+						<Widget type="AutoSizedButton" skin="MW_Button" name="ModeToggle">
+							<UserString key="VStretch" value="true"/>
+							<Property key="Caption" value="#{sOff}"/>
+						</Widget>
+					</Widget>
+
+				</Widget>
+
+				<Widget type="Widget" />
+
+			</Widget>
+
+        </Widget>
+
+    </Widget>
+
+  </Widget>
+</MyGUI>
diff --git a/files/mygui/openmw_postprocessor_hud.skin.xml b/files/mygui/openmw_postprocessor_hud.skin.xml
new file mode 100644
index 0000000000..bf3a470b94
--- /dev/null
+++ b/files/mygui/openmw_postprocessor_hud.skin.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MyGUI type="Resource" version="1.1">
+
+	<Resource type="ResourceLayout" name="MW_ValueEditNumber" version="3.2.0">
+		<Widget type="Widget" skin="" position="0 0 100 50" align="Stretch" name="Root">
+            <Widget type="HBox" skin="MW_Box" position_real="0 0 1 1" align="Stretch" name="Layout">
+                <UserString key="HStretch" value="true"/>
+                <UserString key="VStretch" value="true"/>
+                <Property key="Padding" value="4"/>
+
+                <Widget type="Button" skin="MW_ArrowLeft" position="0 0 12 12" align="VCenter Left" name="ButtonDecrease"/>
+                <Widget type="Widget" name="Dragger">
+                    <Widget type="TextBox" skin="HeaderText" align="Stretch" name="Value">
+                        <Property key="Caption" value="NA"/>
+                        <Property key="NeedMouse" value="false"/>
+                        <Property key="TextAlign" value="Center"/>
+                    </Widget>
+                    <UserString key="HStretch" value="true"/>
+                    <UserString key="VStretch" value="true"/>
+                    <Property key="Pointer" value="hresize"/>
+                </Widget>
+                <Widget type="Button" skin="MW_ArrowRight" position="0 0 12 12" align="VCenter Right" name="ButtonIncrease"/>
+            </Widget>
+		</Widget>
+	</Resource>
+
+	<Resource type="ResourceLayout" name="MW_ValueEditBool" version="3.2.0">
+		<Widget type="Widget" skin="" position="0 0 100 50" align="Stretch" name="Root">
+            <Widget type="HBox" skin="MW_Box" position_real="0 0 1 1" align="Stretch" name="Layout">
+                <UserString key="HStretch" value="true"/>
+                <UserString key="VStretch" value="true"/>
+
+                <Widget type="Button" skin="SandTextButton" align="Stretch" name="Checkbutton">
+                    <UserString key="HStretch" value="true"/>
+                    <UserString key="VStretch" value="true"/>
+                    <Property key="TextAlign" value="Center"/>
+                    <Property key="Caption" value="On"/>
+                    <Property key="Colour" value="1 0 0 1"/>
+                </Widget>
+            </Widget>
+		</Widget>
+	</Resource>
+
+    <Resource type="ResourceLayout" name="MW_UniformEdit" version="3.2.0">
+        <Widget type="Widget" position="0 0 300 22" name="Root">
+            <Widget type="HBox" position_real="0 0 1 1" align="Stretch">
+                <Property key="Padding" value="0"/>
+                <Property key="Spacing" value="8"/>
+                <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 22 22" name="Reset">
+                    <UserString key="HStretch" value="false"/>
+                    <UserString key="VStretch" value="false"/>
+                    <Property key="Caption" value="r"/>
+                </Widget>
+                <Widget type="Widget" skin="BlackBG" position="0 0 225 22" name="Client">
+                    <UserString key="HStretch" value="false"/>
+                    <UserString key="VStretch" value="false"/>
+                    <Property key="Colour" value="0.2 0.2 0.2 0.05"/>
+                </Widget>
+                <Widget type="AutoSizedTextBox" skin="SandText" name="Label" align="Top Right">
+                    <UserString key="HStretch" value="true"/>
+                    <UserString key="VStretch" value="true"/>
+                <Property key="Padding" value="8"/>
+                    <Property key="TextAlign" value="Left Top"/>
+                    <Property key="NeedMouse" value="true"/>
+                </Widget>
+            </Widget>
+        </Widget>
+    </Resource>
+
+    <Resource type="ResourceSkin" name="MW_UniformGroup" size="16 16">
+        <Property key="FontName" value="Default"/>
+        <Property key="TextAlign" value="Left VCenter"/>
+        <Property key="TextColour" value="#{fontcolour=header}"/>
+        
+        <Child type="Widget" skin="IB_B" offset="0 14 16 2" align="Bottom HStretch"/>
+        <BasisSkin type="SimpleText" offset="0 0 16 14" align="Stretch"/>
+    </Resource>
+
+</MyGUI>
diff --git a/files/mygui/openmw_resources.xml b/files/mygui/openmw_resources.xml
index ff4893a9b2..03ca91f5eb 100644
--- a/files/mygui/openmw_resources.xml
+++ b/files/mygui/openmw_resources.xml
@@ -59,6 +59,17 @@
         </Widget>
     </Resource>
 
+    <Resource type="ResourceLayout" name="TabControl_NoBorder" version="3.2.0">
+        <Widget type="Widget" skin="" position="5 5 89 60" name="Root">
+            <UserString key="ButtonSkin" value="MW_Button_RightPadding"/>
+            <Widget type="Widget" skin="" position="0 28 89 32" align="Left Top Stretch" name="TabItem"/>
+            <Widget type="Widget" skin="" position="0 0 89 23" align="HStretch Top" name="HeaderPlace">
+                <Widget type="Widget" skin="" position="52 0 37 23" name="Controls">
+                </Widget>
+            </Widget>
+        </Widget>
+    </Resource>
+
     <Resource type="ResourceLayout" name="TabControlInner" version="3.2.0">
         <Widget type="Widget" skin="" position="0 5 89 60" name="Root">
             <UserString key="ButtonSkin" value="MW_Button_RightPadding"/>
diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index a134d8ecb8..cfc80b1368 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -269,7 +269,7 @@
                     <Property key="ButtonAutoWidth" value="true"/>
                     <Widget type="TabItem" skin="" position="0 28 352 268" align="Stretch">
                         <Property key="Caption" value="  Video  "/>
-                        <Widget type="ListBox" skin="MW_List" position="0 4 170 170" align="Left Top" name="ResolutionList"/>
+                        <Widget type="ListBox" skin="MW_List" position="0 4 170 215" align="Left Top" name="ResolutionList"/>
                         <Widget type="TextBox" skin="NormalText" position="182 4 170 18" align="Left Top">
                             <Property key="Caption" value="Window Mode:"/>
                         </Widget>
@@ -305,9 +305,24 @@
                             <Property key="Caption" value="Hint: press F3 to show \nthe current frame rate."/>
                         </Widget>
 
-                        <Widget type="TextBox" skin="NormalText" position="0 198 352 18" align="Left Top" name="FovText">
+                        <Widget type="HBox" skin="" position="182 160 300 24">
+                            <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top" name="WindowBorderButton">
+                                <UserString key="SettingCategory" value="Post Processing"/>
+                                <UserString key="SettingName" value="enabled"/>
+                                <UserString key="SettingType" value="CheckButton"/>
+                            </Widget>
+                            <Widget type="AutoSizedTextBox" skin="SandText" position="28 4 48 16" align="Left Top">
+                                <Property key="Caption" value="Post Processing"/>
+                            </Widget>
+                        </Widget>
+
+                        <Widget type="TextBox" skin="SandText" position="182 190 300 32" align="Left Top">
+                            <Property key="Caption" value="Hint: press F2 to show \nthe config HUD."/>
+                        </Widget>
+
+                        <Widget type="TextBox" skin="NormalText" position="0 228 352 18" align="Left Top" name="FovText">
                         </Widget>
-                        <Widget type="ScrollBar" skin="MW_HScroll" position="0 222 352 18" align="HStretch Top">
+                        <Widget type="ScrollBar" skin="MW_HScroll" position="0 252 352 18" align="HStretch Top">
                             <Property key="Range" value="81"/>
                             <Property key="Page" value="1"/>
                             <UserString key="SettingType" value="Slider"/>
@@ -319,18 +334,18 @@
                             <UserString key="SettingLabelWidget" value="FovText"/>
                             <UserString key="SettingLabelCaption" value="Field of View (%s)"/>
                         </Widget>
-                        <Widget type="TextBox" skin="SandText" position="0 246 352 18" align="Left Top">
+                        <Widget type="TextBox" skin="SandText" position="0 276 352 18" align="Left Top">
                             <Property key="Caption" value="#{sLow}"/>
                             <Property key="TextAlign" value="Left"/>
                         </Widget>
-                        <Widget type="TextBox" skin="SandText" position="0 246 352 18" align="Right Top">
+                        <Widget type="TextBox" skin="SandText" position="0 276 352 18" align="Right Top">
                             <Property key="Caption" value="#{sHigh}"/>
                             <Property key="TextAlign" value="Right"/>
                         </Widget>
-                        <Widget type="TextBox" skin="NormalText" position="0 268 352 18" align="Left Top" name="GammaText">
+                        <Widget type="TextBox" skin="NormalText" position="0 298 352 18" align="Left Top" name="GammaText">
                             <Property key="Caption" value="#{sGamma_Correction}"/>
                         </Widget>
-                        <Widget type="ScrollBar" skin="MW_HScroll" position="0 292 352 18" align="HStretch Top" name="GammaSlider">
+                        <Widget type="ScrollBar" skin="MW_HScroll" position="0 322 352 18" align="HStretch Top" name="GammaSlider">
                             <Property key="Range" value="10000"/>
                             <Property key="Page" value="300"/>
                             <UserString key="SettingType" value="Slider"/>
@@ -340,11 +355,11 @@
                             <UserString key="SettingMin" value="0.1"/>
                             <UserString key="SettingMax" value="3.0"/>
                         </Widget>
-                        <Widget type="TextBox" skin="SandText" position="0 316 352 18" align="Left Top" name="GammaTextDark">
+                        <Widget type="TextBox" skin="SandText" position="0 346 352 18" align="Left Top" name="GammaTextDark">
                             <Property key="Caption" value="#{sDark_Gamma}"/>
                             <Property key="TextAlign" value="Left"/>
                         </Widget>
-                        <Widget type="TextBox" skin="SandText" position="0 316 352 18" align="Right Top" name="GammaTextLight">
+                        <Widget type="TextBox" skin="SandText" position="0 346 352 18" align="Right Top" name="GammaTextLight">
                             <Property key="Caption" value="#{sLight_Gamma}"/>
                             <Property key="TextAlign" value="Right"/>
                         </Widget>
diff --git a/files/mygui/skins.xml b/files/mygui/skins.xml
index 1811afb83f..4d3d4c8774 100644
--- a/files/mygui/skins.xml
+++ b/files/mygui/skins.xml
@@ -20,6 +20,7 @@
         <List file="openmw_dialogue_window.skin.xml"/>
         <List file="openmw_scroll.skin.xml"/>
         <List file="openmw_debug_window.skin.xml" />
+        <List file="openmw_postprocessor_hud.skin.xml" />
     </MyGUI>
 </MyGUI>
 
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index d97f529db2..1a30e492c5 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -834,6 +834,17 @@ settings maximized w = 0.97
 settings maximized h = 0.875
 settings maximized = false
 
+# Postprocessor configuration window for controlling shaders.
+postprocessor h = 0.95
+postprocessor w = 0.44
+postprocessor x = 0.01
+postprocessor y = 0.02
+postprocessor maximized x = 0.015
+postprocessor maximized y = 0.02
+postprocessor maximized w = 0.97
+postprocessor maximized h = 0.875
+postprocessor maximized = false
+
 [Navigator]
 
 # Enable navigator (true, false). When enabled background threads are started to build navmesh for world geometry.
@@ -1197,4 +1208,21 @@ right eye orientation w = 1.0
 right eye fov left = -0.78
 right eye fov right = 0.86
 right eye fov up = 0.8
-right eye fov down = -0.8
\ No newline at end of file
+right eye fov down = -0.8
+
+[Post Processing]
+
+# Enables post-processing 
+enabled = false
+
+# List of active shaders. This is more easily with the in-game shader HUD, by default accessible with the F2 key.
+chain =
+
+# Reload active shaders when modified on local filesystem. This is a DEBUG mode, and should be disabled in normal gameplay.
+live reload = false
+
+# Used for eye adaptation to control speed at which scene luminance can change from one frame to the next. No effect when HDR is not being utilized.
+hdr exposure time = 0.1
+
+# Transparent depth postpass. Re-renders transparent objects with alpha-clipping forced with a fixed threshold.
+transparent postpass = true
diff --git a/files/shaders/CMakeLists.txt b/files/shaders/CMakeLists.txt
index 97f32ad979..88fd6d45ca 100644
--- a/files/shaders/CMakeLists.txt
+++ b/files/shaders/CMakeLists.txt
@@ -38,6 +38,8 @@ set(SHADER_FILES
     nv_default_fragment.glsl
     nv_nolighting_vertex.glsl
     nv_nolighting_fragment.glsl
+    blended_depth_postpass_vertex.glsl
+    blended_depth_postpass_fragment.glsl
     gui_vertex.glsl
     gui_fragment.glsl
     debug_vertex.glsl
@@ -46,6 +48,10 @@ set(SHADER_FILES
     sky_fragment.glsl
     skypasses.glsl
     softparticles.glsl
+    hdr_fragment.glsl
+    hdr_luminance_fragment.glsl
+    fullscreen_tri_vertex.glsl
+    fullscreen_tri_fragment.glsl
 )
 
 copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_ROOT} ${DDIRRELATIVE} "${SHADER_FILES}")
diff --git a/files/shaders/blended_depth_postpass_fragment.glsl b/files/shaders/blended_depth_postpass_fragment.glsl
new file mode 100644
index 0000000000..61e8b4ea7e
--- /dev/null
+++ b/files/shaders/blended_depth_postpass_fragment.glsl
@@ -0,0 +1,19 @@
+#version 120
+
+uniform sampler2D diffuseMap;
+
+varying vec2 diffuseMapUV;
+varying float alphaPassthrough;
+
+void main()
+{
+    float alpha = texture2D(diffuseMap, diffuseMapUV).a * alphaPassthrough;
+
+    const float alphaRef = 0.5;
+
+    if (alpha < alphaRef)
+        discard;
+
+    // DO NOT write to color!
+    // This is a post-pass of transparent objects in charge of only updating depth buffer.
+}
diff --git a/files/shaders/blended_depth_postpass_vertex.glsl b/files/shaders/blended_depth_postpass_vertex.glsl
new file mode 100644
index 0000000000..471a2df16a
--- /dev/null
+++ b/files/shaders/blended_depth_postpass_vertex.glsl
@@ -0,0 +1,20 @@
+#version 120
+
+uniform mat4 projectionMatrix;
+
+varying vec2 diffuseMapUV;
+varying float alphaPassthrough;
+
+#include "vertexcolors.glsl"
+
+void main()
+{
+    gl_Position = projectionMatrix * (gl_ModelViewMatrix * gl_Vertex);
+
+    if (colorMode == 2)
+        alphaPassthrough = gl_Color.a;
+    else
+        alphaPassthrough = gl_FrontMaterial.diffuse.a;
+
+    diffuseMapUV = (gl_TextureMatrix[0] * gl_MultiTexCoord0).xy;
+}
diff --git a/files/shaders/fullscreen_tri_fragment.glsl b/files/shaders/fullscreen_tri_fragment.glsl
new file mode 100644
index 0000000000..b71f98365d
--- /dev/null
+++ b/files/shaders/fullscreen_tri_fragment.glsl
@@ -0,0 +1,10 @@
+#version 120
+
+varying vec2 uv;
+
+#include "openmw_fragment.h.glsl"
+
+void main()
+{
+    gl_FragColor = mw_samplerLastShader(uv);
+}
\ No newline at end of file
diff --git a/files/shaders/fullscreen_tri_vertex.glsl b/files/shaders/fullscreen_tri_vertex.glsl
new file mode 100644
index 0000000000..794e0827c4
--- /dev/null
+++ b/files/shaders/fullscreen_tri_vertex.glsl
@@ -0,0 +1,9 @@
+#version 120
+
+varying vec2 uv;
+
+void main()
+{
+    gl_Position = vec4(gl_Vertex.xy, 0.0, 1.0);
+    uv = gl_Position.xy * 0.5 + 0.5;
+}
diff --git a/files/shaders/groundcover_fragment.glsl b/files/shaders/groundcover_fragment.glsl
index cb53e7a63e..b7ff102079 100644
--- a/files/shaders/groundcover_fragment.glsl
+++ b/files/shaders/groundcover_fragment.glsl
@@ -30,27 +30,31 @@ varying float linearDepth;
 
 #if PER_PIXEL_LIGHTING
 varying vec3 passViewPos;
-varying vec3 passNormal;
 #else
 centroid varying vec3 passLighting;
 centroid varying vec3 shadowDiffuseLighting;
 #endif
 
+varying vec3 passNormal;
+
 #include "shadows_fragment.glsl"
 #include "lighting.glsl"
 #include "alpha.glsl"
 
 void main()
 {
+    vec3 worldNormal = normalize(passNormal);
+
 #if @normalMap
     vec4 normalTex = texture2D(normalMap, normalMapUV);
 
-    vec3 normalizedNormal = normalize(passNormal);
+    vec3 normalizedNormal = worldNormal;
     vec3 normalizedTangent = normalize(passTangent.xyz);
     vec3 binormal = cross(normalizedTangent, normalizedNormal) * passTangent.w;
     mat3 tbnTranspose = mat3(normalizedTangent, binormal, normalizedNormal);
 
-    vec3 viewNormal = gl_NormalMatrix * normalize(tbnTranspose * (normalTex.xyz * 2.0 - 1.0));
+    worldNormal = normalize(tbnTranspose * (normalTex.xyz * 2.0 - 1.0));
+    vec3 viewNormal = gl_NormalMatrix * worldNormal;
 #endif
 
 #if @diffuseMap
@@ -86,5 +90,9 @@ void main()
 #endif
     gl_FragData[0].xyz = mix(gl_FragData[0].xyz, gl_Fog.color.xyz, fogValue);
 
+#if !@disableNormals
+    gl_FragData[1].xyz = worldNormal * 0.5 + 0.5;
+#endif
+
     applyShadowDebugOverlay();
 }
diff --git a/files/shaders/groundcover_vertex.glsl b/files/shaders/groundcover_vertex.glsl
index fff8293b61..aa9dea3355 100644
--- a/files/shaders/groundcover_vertex.glsl
+++ b/files/shaders/groundcover_vertex.glsl
@@ -33,12 +33,13 @@ varying float linearDepth;
 
 #if PER_PIXEL_LIGHTING
 varying vec3 passViewPos;
-varying vec3 passNormal;
 #else
 centroid varying vec3 passLighting;
 centroid varying vec3 shadowDiffuseLighting;
 #endif
 
+varying vec3 passNormal;
+
 #include "shadows_vertex.glsl"
 #include "lighting.glsl"
 #include "depth.glsl"
@@ -161,9 +162,9 @@ void main(void)
     passTangent = gl_MultiTexCoord7.xyzw * rotation;
 #endif
 
+    passNormal = rotation3(rotation) * gl_Normal.xyz;
 #if PER_PIXEL_LIGHTING
     passViewPos = viewPos.xyz;
-    passNormal = rotation3(rotation) * gl_Normal.xyz;
 #else
     vec3 diffuseLight, ambientLight;
     doLighting(viewPos.xyz, viewNormal, diffuseLight, ambientLight, shadowDiffuseLighting);
diff --git a/files/shaders/hdr_fragment.glsl b/files/shaders/hdr_fragment.glsl
new file mode 100644
index 0000000000..5490a6873d
--- /dev/null
+++ b/files/shaders/hdr_fragment.glsl
@@ -0,0 +1,14 @@
+#version 120
+
+varying vec2 uv;
+uniform sampler2D luminanceSceneTex;
+uniform sampler2D prevLuminanceSceneTex;
+
+void main()
+{
+    float prevLum = texture2D(prevLuminanceSceneTex, vec2(0.5, 0.5)).r;
+
+    float l = texture2D(luminanceSceneTex, vec2(0.5, 0.5)).r;
+    float weightedAvgLum = exp2((l * @logLumRange) + @minLog);
+    gl_FragColor.r = prevLum + (weightedAvgLum - prevLum) * @hdrExposureTime;
+}
diff --git a/files/shaders/hdr_luminance_fragment.glsl b/files/shaders/hdr_luminance_fragment.glsl
new file mode 100644
index 0000000000..f78dc41dfa
--- /dev/null
+++ b/files/shaders/hdr_luminance_fragment.glsl
@@ -0,0 +1,17 @@
+#version 120
+
+varying vec2 uv;
+uniform sampler2D sceneTex;
+
+void main()
+{
+    float lum = dot(texture2D(sceneTex, uv).rgb, vec3(0.2126, 0.7152, 0.0722));
+
+    if (lum < @epsilon)
+    {
+        gl_FragColor.r = 0.0;
+        return;
+    }
+
+    gl_FragColor.r = clamp((log2(lum) - @minLog) * @invLogLumRange, 0.0, 1.0);
+}
diff --git a/files/shaders/nv_default_fragment.glsl b/files/shaders/nv_default_fragment.glsl
index ff81a2b94d..9cb784ab98 100644
--- a/files/shaders/nv_default_fragment.glsl
+++ b/files/shaders/nv_default_fragment.glsl
@@ -43,6 +43,8 @@ uniform float specStrength;
 
 void main()
 {
+    vec3 worldNormal = normalize(passNormal);
+
 #if @diffuseMap
     gl_FragData[0] = texture2D(diffuseMap, diffuseMapUV);
     gl_FragData[0].a *= coveragePreservingAlphaScale(diffuseMap, diffuseMapUV);
@@ -57,14 +59,15 @@ void main()
 #if @normalMap
     vec4 normalTex = texture2D(normalMap, normalMapUV);
 
-    vec3 normalizedNormal = normalize(passNormal);
+    vec3 normalizedNormal = worldNormal;
     vec3 normalizedTangent = normalize(passTangent.xyz);
     vec3 binormal = cross(normalizedTangent, normalizedNormal) * passTangent.w;
     mat3 tbnTranspose = mat3(normalizedTangent, binormal, normalizedNormal);
 
-    vec3 viewNormal = gl_NormalMatrix * normalize(tbnTranspose * (normalTex.xyz * 2.0 - 1.0));
+    worldNormal = normalize(tbnTranspose * (normalTex.xyz * 2.0 - 1.0));
+    vec3 viewNormal = gl_NormalMatrix * worldNormal;
 #else
-    vec3 viewNormal = gl_NormalMatrix * normalize(passNormal);
+    vec3 viewNormal = gl_NormalMatrix * worldNormal;
 #endif
 
     float shadowing = unshadowedLightRatio(linearDepth);
@@ -100,5 +103,9 @@ void main()
     gl_FragData[0].a = 1.0;
 #endif
 
+#if !defined(FORCE_OPAQUE) && !@disableNormals
+    gl_FragData[1].xyz = worldNormal * 0.5 + 0.5;
+#endif
+
     applyShadowDebugOverlay();
 }
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index bf9f207297..16cbf9bbbd 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -96,19 +96,22 @@ void main()
     vec2 adjustedDiffuseUV = diffuseMapUV;
 #endif
 
+    vec3 worldNormal = normalize(passNormal);
+
 #if @normalMap
     vec4 normalTex = texture2D(normalMap, normalMapUV);
 
-    vec3 normalizedNormal = normalize(passNormal);
+    vec3 normalizedNormal = worldNormal;
     vec3 normalizedTangent = normalize(passTangent.xyz);
     vec3 binormal = cross(normalizedTangent, normalizedNormal) * passTangent.w;
     mat3 tbnTranspose = mat3(normalizedTangent, binormal, normalizedNormal);
 
-    vec3 viewNormal = gl_NormalMatrix * normalize(tbnTranspose * (normalTex.xyz * 2.0 - 1.0));
+    worldNormal = normalize(tbnTranspose * (normalTex.xyz * 2.0 - 1.0));
+    vec3 viewNormal = gl_NormalMatrix * worldNormal;
 #endif
 
 #if (!@normalMap && (@parallax || @forcePPL))
-    vec3 viewNormal = gl_NormalMatrix * normalize(passNormal);
+    vec3 viewNormal = gl_NormalMatrix * worldNormal;
 #endif
 
 #if @parallax
@@ -123,7 +126,9 @@ void main()
 #if 1
     // fetch a new normal using updated coordinates
     normalTex = texture2D(normalMap, adjustedDiffuseUV);
-    viewNormal = gl_NormalMatrix * normalize(tbnTranspose * (normalTex.xyz * 2.0 - 1.0));
+
+    worldNormal = normalize(tbnTranspose * (normalTex.xyz * 2.0 - 1.0));
+    viewNormal = gl_NormalMatrix * worldNormal;
 #endif
 
 #endif
@@ -221,7 +226,7 @@ void main()
     if (matSpec != vec3(0.0))
     {
 #if (!@normalMap && !@parallax && !@forcePPL)
-        vec3 viewNormal = gl_NormalMatrix * normalize(passNormal);
+        vec3 viewNormal = gl_NormalMatrix * worldNormal;
 #endif
         gl_FragData[0].xyz += getSpecular(normalize(viewNormal), normalize(passViewPos.xyz), shininess, matSpec) * shadowing;
     }
@@ -247,5 +252,9 @@ void main()
     gl_FragData[0].a = 1.0;
 #endif
 
+#if !defined(FORCE_OPAQUE) && !@disableNormals
+    gl_FragData[1].xyz = worldNormal * 0.5 + 0.5;
+#endif
+
     applyShadowDebugOverlay();
 }
diff --git a/files/shaders/openmw_fragment.glsl b/files/shaders/openmw_fragment.glsl
index 9de9e7afff..151f8fdb13 100644
--- a/files/shaders/openmw_fragment.glsl
+++ b/files/shaders/openmw_fragment.glsl
@@ -23,4 +23,11 @@ float mw_sampleRefractionDepthMap(vec2 uv)
     return texture2D(refractionDepthMap, uv).x;
 }
 
-#endif
\ No newline at end of file
+#endif
+
+uniform sampler2D omw_SamplerLastShader;
+
+vec4 mw_samplerLastShader(vec2 uv)
+{
+    return texture2D(omw_SamplerLastShader, uv);
+}
diff --git a/files/shaders/openmw_fragment.h.glsl b/files/shaders/openmw_fragment.h.glsl
index ae1a131b42..c96912ead6 100644
--- a/files/shaders/openmw_fragment.h.glsl
+++ b/files/shaders/openmw_fragment.h.glsl
@@ -6,4 +6,6 @@ vec4 mw_sampleReflectionMap(vec2 uv);
 #if @refraction_enabled
 vec4 mw_sampleRefractionMap(vec2 uv);
 float mw_sampleRefractionDepthMap(vec2 uv);
-#endif
\ No newline at end of file
+#endif
+
+vec4 mw_samplerLastShader(vec2 uv);
\ No newline at end of file
diff --git a/files/shaders/openmw_fragment_multiview.glsl b/files/shaders/openmw_fragment_multiview.glsl
index 1a2c0d991b..0ec9a3e12b 100644
--- a/files/shaders/openmw_fragment_multiview.glsl
+++ b/files/shaders/openmw_fragment_multiview.glsl
@@ -28,4 +28,11 @@ float mw_sampleRefractionDepthMap(vec2 uv)
     return texture2DArray(refractionDepthMap, vec3((uv), gl_ViewID_OVR)).x;
 }
 
-#endif
\ No newline at end of file
+#endif
+
+uniform sampler2DArray omw_SamplerLastShader;
+
+vec4 mw_samplerLastShader(vec2 uv)
+{
+    return texture2DArray(omw_SamplerLastShader, vec3((uv), gl_ViewID_OVR));
+}
\ No newline at end of file
diff --git a/files/shaders/terrain_fragment.glsl b/files/shaders/terrain_fragment.glsl
index a8106f4ad5..7ff696e083 100644
--- a/files/shaders/terrain_fragment.glsl
+++ b/files/shaders/terrain_fragment.glsl
@@ -41,20 +41,24 @@ void main()
 {
     vec2 adjustedUV = (gl_TextureMatrix[0] * vec4(uv, 0.0, 1.0)).xy;
 
+    vec3 worldNormal = normalize(passNormal);
+
 #if @normalMap
     vec4 normalTex = texture2D(normalMap, adjustedUV);
 
-    vec3 normalizedNormal = normalize(passNormal);
+    vec3 normalizedNormal = worldNormal;
     vec3 tangent = vec3(1.0, 0.0, 0.0);
     vec3 binormal = normalize(cross(tangent, normalizedNormal));
     tangent = normalize(cross(normalizedNormal, binormal)); // note, now we need to re-cross to derive tangent again because it wasn't orthonormal
     mat3 tbnTranspose = mat3(tangent, binormal, normalizedNormal);
 
-    vec3 viewNormal = normalize(gl_NormalMatrix * (tbnTranspose * (normalTex.xyz * 2.0 - 1.0)));
+    worldNormal = tbnTranspose * (normalTex.xyz * 2.0 - 1.0);
+    vec3 viewNormal = normalize(gl_NormalMatrix * worldNormal);
+    normalize(worldNormal);
 #endif
 
 #if (!@normalMap && (@parallax || @forcePPL))
-    vec3 viewNormal = gl_NormalMatrix * normalize(passNormal);
+    vec3 viewNormal = gl_NormalMatrix * worldNormal;
 #endif
 
 #if @parallax
@@ -65,7 +69,10 @@ void main()
 
     // update normal using new coordinates
     normalTex = texture2D(normalMap, adjustedUV);
-    viewNormal = normalize(gl_NormalMatrix * (tbnTranspose * (normalTex.xyz * 2.0 - 1.0)));
+
+    worldNormal = tbnTranspose * (normalTex.xyz * 2.0 - 1.0);
+    viewNormal = normalize(gl_NormalMatrix * worldNormal);
+    normalize(worldNormal);
 #endif
 
     vec4 diffuseTex = texture2D(diffuseMap, adjustedUV);
@@ -104,7 +111,7 @@ void main()
     if (matSpec != vec3(0.0))
     {
 #if (!@normalMap && !@parallax && !@forcePPL)
-        vec3 viewNormal = gl_NormalMatrix * normalize(passNormal);
+        vec3 viewNormal = gl_NormalMatrix * worldNormal;
 #endif
         gl_FragData[0].xyz += getSpecular(normalize(viewNormal), normalize(passViewPos), shininess, matSpec) * shadowing;
     }
@@ -116,5 +123,9 @@ void main()
 #endif
     gl_FragData[0].xyz = mix(gl_FragData[0].xyz, gl_Fog.color.xyz, fogValue);
 
+#if !@disableNormals && @writeNormals
+    gl_FragData[1].xyz = worldNormal.xyz * 0.5 + 0.5;
+#endif
+
     applyShadowDebugOverlay();
 }
diff --git a/files/shaders/water_fragment.glsl b/files/shaders/water_fragment.glsl
index bf35ca78ca..51d30be2d4 100644
--- a/files/shaders/water_fragment.glsl
+++ b/files/shaders/water_fragment.glsl
@@ -363,5 +363,9 @@ void main(void)
 #endif
     gl_FragData[0].xyz = mix(gl_FragData[0].xyz, gl_Fog.color.xyz, fogValue);
 
+#if !@disableNormals
+    gl_FragData[1].rgb = normal * 0.5 + 0.5;
+#endif
+
     applyShadowDebugOverlay();
 }
diff --git a/files/ui/advancedpage.ui b/files/ui/advancedpage.ui
index 18f406d5b3..520b089965 100644
--- a/files/ui/advancedpage.ui
+++ b/files/ui/advancedpage.ui
@@ -576,6 +576,94 @@
              </layout>
             </widget>
            </item>
+           <item>
+            <widget class="QGroupBox" name="postprocessGroup">
+             <property name="title">
+              <string>Post Processing</string>
+             </property>
+             <layout class="QGridLayout" name="postprocessLayout">
+              <item row="0" column="0">
+               <widget class="QCheckBox" name="postprocessEnabledCheckBox">
+                <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, post processing will be enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                </property>
+                <property name="text">
+                 <string>Enable post processing</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="0">
+                <layout class="QVBoxLayout">
+                  <property name="leftMargin">
+                    <number>20</number>
+                  </property>
+                  <item>
+                    <widget class="QCheckBox" name="postprocessLiveReloadCheckBox">
+                      <property name="enabled">
+                        <bool>false</bool>
+                      </property>
+                      <property name="toolTip">
+                        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Debug Mode. Automatically reload active shaders when they are modified on filesystem.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                      </property>
+                      <property name="text">
+                        <string>Live reload</string>
+                      </property>
+                    </widget>
+                  </item>
+                  <item>
+                    <widget class="QCheckBox" name="postprocessTransparentPostpassCheckBox">
+                      <property name="enabled">
+                        <bool>false</bool>
+                      </property>
+                      <property name="toolTip">
+                      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Re-render transparent objects with forced alpha clipping.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                      </property>
+                      <property name="text">
+                        <string>Transparent postpass</string>
+                      </property>
+                    </widget>
+                  </item>
+                  <item row="1" column="0">
+                    <layout class="QHBoxLayout">
+                      <item>
+                      <widget class="QLabel" name="postprocessHDRTimeLabel">
+                        <property name="enabled">
+                          <bool>false</bool>
+                        </property>
+                        <property name="toolTip">
+                        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Controls how much eye adaptation can change from frame to frame. Smaller values makes for slower transitions.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                        </property>
+                        <property name="text">
+                        <string>HDR exposure time</string>
+                        </property>
+                      </widget>
+                      </item>
+                      <item>
+                      <widget class="QDoubleSpinBox" name="postprocessHDRTimeComboBox">
+                        <property name="enabled">
+                          <bool>false</bool>
+                        </property>
+                        <property name="decimals">
+                        <number>3</number>
+                        </property>
+                        <property name="minimum">
+                        <double>0.000000000000000</double>
+                        </property>
+                        <property name="maximum">
+                        <double>1.000000000000000</double>
+                        </property>
+                        <property name="singleStep">
+                        <double>0.001000000000000</double>
+                        </property>
+                      </widget>
+                      </item>
+                    </layout>
+                  </item>
+                </layout>
+              </item>
+             </layout>
+            </widget>
+           </item>
            <item>
             <spacer name="verticalSpacer">
              <property name="orientation">
diff --git a/files/vfs/CMakeLists.txt b/files/vfs/CMakeLists.txt
index 15dcb80ec1..16911df573 100644
--- a/files/vfs/CMakeLists.txt
+++ b/files/vfs/CMakeLists.txt
@@ -5,6 +5,7 @@ endif()
 # Copy resource files into the build directory
 set(SDIR ${CMAKE_CURRENT_SOURCE_DIR})
 set(DDIRRELATIVE resources/vfs/textures)
+set(DDIRRELATIVE_SHADERS resources/vfs/shaders)
 
 set(TEXTURE_FILES
     textures/omw_menu_scroll_down.dds
@@ -15,4 +16,10 @@ set(TEXTURE_FILES
     textures/omw_menu_scroll_center_v.dds
 )
 
+set(SHADER_FILES
+    shaders/main.omwfx
+    shaders/displaydepth.omwfx
+)
+
 copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_ROOT} ${DDIRRELATIVE} "${TEXTURE_FILES}")
+copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_ROOT} ${DDIRRELATIVE_SHADERS} "${SHADER_FILES}")
diff --git a/files/vfs/shaders/displaydepth.omwfx b/files/vfs/shaders/displaydepth.omwfx
new file mode 100644
index 0000000000..8b73a5abab
--- /dev/null
+++ b/files/vfs/shaders/displaydepth.omwfx
@@ -0,0 +1,26 @@
+uniform_float uFactor {
+    step = 0.1;
+    min = 0.01;
+    max = 20.0;
+    default = 1.0;
+}
+
+fragment main {
+
+    omw_In vec2 omw_TexCoord;
+
+    void main()
+    {
+        float depth = omw_GetDepth(omw_TexCoord);
+        float zNear = omw.near;
+        float zFar = omw.far;
+        omw_FragColor = vec4(vec3((2.0 * zNear) / (zFar + zNear - depth * (zFar - zNear))) * uFactor, 1.0);
+    }
+}
+
+technique {
+    passes = main;
+    description = "Visualizes the depth buffer.";
+    author = "OpenMW";
+    version = "1.0";
+}
diff --git a/files/vfs/shaders/main.omwfx b/files/vfs/shaders/main.omwfx
new file mode 100644
index 0000000000..8d12cebf81
--- /dev/null
+++ b/files/vfs/shaders/main.omwfx
@@ -0,0 +1,45 @@
+main_pass {
+    wrap_s = clamp_to_edge;
+    wrap_t = clamp_to_edge;
+    internal_format = rgba;
+    source_type = unsigned_int;
+    source_format = rgba;
+}
+
+uniform_float uGamma {
+    default = 1.0;
+    step = 0.01;
+    min = 0.0;
+    max = 5.0;
+    description = "gamma level";
+}
+
+uniform_float uContrast {
+    default = 1.0;
+    step = 0.01;
+    min = 0.0;
+    max = 5.0;
+    description = "constrast level";
+}
+
+fragment main {
+
+    omw_In vec2 omw_TexCoord;
+
+    void main()
+    {
+        vec4 color = omw_GetLastShader(omw_TexCoord);
+        color.rgb = (color.rgb - vec3(0.5)) * uContrast + 0.5;
+        color.rgb = pow(color.rgb, vec3(1.0 / uGamma));
+
+        omw_FragColor = color;
+    }
+}
+
+technique {
+    description = "Main pass.";
+    version = "1.0";
+    author = "OpenMW";
+    passes = main;
+    hdr = false;
+}

From fee639a74fe237067950a9e30459c968c6fbade3 Mon Sep 17 00:00:00 2001
From: cody glassman <glassmancody.info@gmail.com>
Date: Sat, 14 May 2022 18:11:40 -0700
Subject: [PATCH 2432/2859] Correct default value

---
 files/settings-default.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 1a30e492c5..ed392d44e4 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -1222,7 +1222,7 @@ chain =
 live reload = false
 
 # Used for eye adaptation to control speed at which scene luminance can change from one frame to the next. No effect when HDR is not being utilized.
-hdr exposure time = 0.1
+hdr exposure time = 0.05
 
 # Transparent depth postpass. Re-renders transparent objects with alpha-clipping forced with a fixed threshold.
 transparent postpass = true

From 0cb63ca4e68f4107ab13dd7ed9035a8424c23925 Mon Sep 17 00:00:00 2001
From: cody glassman <glassmancody.info@gmail.com>
Date: Sat, 14 May 2022 22:53:53 -0700
Subject: [PATCH 2433/2859] experimental point light bindings

---
 apps/openmw/mwrender/postprocessor.cpp    | 14 ++++-
 apps/openmw/mwrender/postprocessor.hpp    |  2 +
 apps/openmw/mwrender/renderingmanager.cpp |  9 ++--
 apps/openmw/mwrender/renderingmanager.hpp |  5 +-
 apps/openmw/mwworld/worldimp.cpp          |  3 +-
 components/fx/pass.cpp                    | 30 +++++++++++
 components/fx/stateupdater.cpp            |  3 ++
 components/fx/stateupdater.hpp            | 16 ++++--
 components/fx/technique.cpp               |  3 ++
 components/fx/technique.hpp               |  3 ++
 components/misc/constants.hpp             |  3 ++
 components/sceneutil/lightmanager.cpp     | 24 +++++++++
 components/sceneutil/lightmanager.hpp     | 65 +++++++++++++++++++++++
 13 files changed, 168 insertions(+), 12 deletions(-)

diff --git a/apps/openmw/mwrender/postprocessor.cpp b/apps/openmw/mwrender/postprocessor.cpp
index 6fcbb4d51f..3762e8e280 100644
--- a/apps/openmw/mwrender/postprocessor.cpp
+++ b/apps/openmw/mwrender/postprocessor.cpp
@@ -94,6 +94,8 @@ namespace MWRender
         , mNormals(false)
         , mPrevNormals(false)
         , mNormalsSupported(false)
+        , mPassLights(false)
+        , mPrevPassLights(false)
         , mMainTemplate(new osg::Texture2D)
     {
         mSoftParticles = Settings::Manager::getBool("soft particles", "Shaders") && !Stereo::getStereo() && !Stereo::getMultiview();
@@ -393,9 +395,10 @@ namespace MWRender
             mDirty = false;
         }
 
-        if (mNormalsSupported && mNormals != mPrevNormals)
+        if ((mNormalsSupported && mNormals != mPrevNormals) || (mPassLights != mPrevPassLights))
         {
             mPrevNormals = mNormals;
+            mPrevPassLights = mPassLights;
 
             mViewer->stopThreading();
 
@@ -404,10 +407,15 @@ namespace MWRender
             defines["disableNormals"] = mNormals ? "0" : "1";
             shaderManager.setGlobalDefines(defines);
 
+            mRendering.getLightRoot()->setCollectPPLights(mPassLights);
+            mStateUpdater->bindPointLights(mPassLights ? mRendering.getLightRoot()->getPPLightsBuffer() : nullptr);
+            mStateUpdater->reset();
+
             mViewer->startThreading();
 
             createTexturesAndCamera(frameId);
             createObjectsForFrame(frameId);
+
             mDirty = true;
             mDirtyFrameId = !frameId;
         }
@@ -491,6 +499,7 @@ namespace MWRender
         bool sunglare = true;
         mHDR = false;
         mNormals = false;
+        mPassLights = false;
 
         for (const auto& technique : mTechniques)
         {
@@ -513,6 +522,9 @@ namespace MWRender
             if (technique->getNormals())
                 mNormals = true;
 
+            if (technique->getLights())
+                mPassLights = true;
+
             if (node.mFlags & fx::Technique::Flag_Disable_SunGlare)
                 sunglare = false;
 
diff --git a/apps/openmw/mwrender/postprocessor.hpp b/apps/openmw/mwrender/postprocessor.hpp
index 8560b76eaa..f81615c90b 100644
--- a/apps/openmw/mwrender/postprocessor.hpp
+++ b/apps/openmw/mwrender/postprocessor.hpp
@@ -212,6 +212,8 @@ namespace MWRender
         bool mNormals;
         bool mPrevNormals;
         bool mNormalsSupported;
+        bool mPassLights;
+        bool mPrevPassLights;
         bool mUBO;
         int mGLSLVersion;
 
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 359b2e0f9d..3c032e2fd6 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -42,6 +42,8 @@
 #include <components/sceneutil/writescene.hpp>
 #include <components/sceneutil/shadow.hpp>
 
+#include <components/misc/constants.hpp>
+
 #include <components/terrain/terraingrid.hpp>
 #include <components/terrain/quadtreeworld.hpp>
 
@@ -558,10 +560,9 @@ namespace MWRender
             cullingMode |= osg::CullStack::SMALL_FEATURE_CULLING;
         }
 
-        mViewer->getCamera()->setCullingMode( cullingMode );
-
         mViewer->getCamera()->setComputeNearFarMode(osg::Camera::DO_NOT_COMPUTE_NEAR_FAR);
         mViewer->getCamera()->setCullingMode(cullingMode);
+        mViewer->getCamera()->setName(Constants::SceneCamera);
 
         auto mask = ~(Mask_UpdateVisitor | Mask_SimpleWater);
         MWBase::Environment::get().getWindowManager()->setCullMask(mask);
@@ -650,7 +651,7 @@ namespace MWRender
         return mViewer->getFrameStamp()->getReferenceTime();
     }
 
-    osg::Group* RenderingManager::getLightRoot()
+    SceneUtil::LightManager* RenderingManager::getLightRoot()
     {
         return mSceneRoot.get();
     }
@@ -1360,7 +1361,7 @@ namespace MWRender
                                                 it->second == "light fade start" ||
                                                 it->second == "max lights"))
             {
-                auto* lightManager = static_cast<SceneUtil::LightManager*>(getLightRoot());
+                auto* lightManager = getLightRoot();
                 lightManager->processChangedSettings(changed);
 
                 if (it->second == "max lights" && !lightManager->usingFFP())
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index 850b1c5a39..cd4b6edca4 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -59,6 +59,7 @@ namespace SceneUtil
 {
     class ShadowManager;
     class WorkQueue;
+    class LightManager;
 }
 
 namespace DetourNavigator
@@ -116,7 +117,7 @@ namespace MWRender
 
         double getReferenceTime() const;
 
-        osg::Group* getLightRoot();
+        SceneUtil::LightManager* getLightRoot();
 
         void setNightEyeFactor(float factor);
 
@@ -271,7 +272,7 @@ namespace MWRender
 
         osg::ref_ptr<osgViewer::Viewer> mViewer;
         osg::ref_ptr<osg::Group> mRootNode;
-        osg::ref_ptr<osg::Group> mSceneRoot;
+        osg::ref_ptr<SceneUtil::LightManager> mSceneRoot;
         Resource::ResourceSystem* mResourceSystem;
 
         osg::ref_ptr<SceneUtil::WorkQueue> mWorkQueue;
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 78eeab79ff..cda1940ac4 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -28,6 +28,7 @@
 #include <components/resource/resourcesystem.hpp>
 
 #include <components/sceneutil/positionattitudetransform.hpp>
+#include <components/sceneutil/lightmanager.hpp>
 
 #include <components/detournavigator/navigator.hpp>
 #include <components/detournavigator/settings.hpp>
@@ -197,7 +198,7 @@ namespace MWWorld
         }
 
         mRendering.reset(new MWRender::RenderingManager(viewer, rootNode, resourceSystem, workQueue, resourcePath, *mNavigator, mGroundcoverStore));
-        mProjectileManager.reset(new ProjectileManager(mRendering->getLightRoot(), resourceSystem, mRendering.get(), mPhysics.get()));
+        mProjectileManager.reset(new ProjectileManager(mRendering->getLightRoot()->asGroup(), resourceSystem, mRendering.get(), mPhysics.get()));
         mRendering->preloadCommonAssets();
 
         mWeatherManager.reset(new MWWorld::WeatherManager(*mRendering, mStore));
diff --git a/components/fx/pass.cpp b/components/fx/pass.cpp
index 0d86bdcf50..e0489fe0c8 100644
--- a/components/fx/pass.cpp
+++ b/components/fx/pass.cpp
@@ -13,6 +13,7 @@
 
 #include <components/misc/stringops.hpp>
 #include <components/sceneutil/util.hpp>
+#include <components/sceneutil/lightmanager.hpp>
 #include <components/sceneutil/clearcolor.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/stereo/multiview.hpp>
@@ -77,6 +78,34 @@ uniform @builtinSampler omw_SamplerLastPass;
 uniform @builtinSampler omw_SamplerDepth;
 uniform @builtinSampler omw_SamplerNormals;
 
+uniform vec4 omw_PointLights[@pointLightCount];
+uniform int omw_PointLightsCount;
+
+int omw_GetPointLightCount()
+{
+    return omw_PointLightsCount;
+}
+
+vec3 omw_GetPointLightViewPos(int index)
+{
+    return omw_PointLights[(index * 3)].xyz;
+}
+
+vec3 omw_GetPointLightDiffuse(int index)
+{
+    return omw_PointLights[(index * 3) + 1].xyz;
+}
+
+vec3 omw_GetPointLightAttenuation(int index)
+{
+    return omw_PointLights[(index * 3) + 2].xyz;
+}
+
+float omw_GetPointLightRadius(int index)
+{
+    return omw_PointLights[(index * 3) + 2].w;
+}
+
 #if @ubo
     layout(std140) uniform _data { _omw_data omw; };
 #else
@@ -143,6 +172,7 @@ uniform @builtinSampler omw_SamplerNormals;
             extBlock << "#ifdef " << extension << '\n' << "\t#extension " << extension << ": enable" << '\n' << "#endif" << '\n';
 
         const std::vector<std::pair<std::string,std::string>> defines = {
+            {"@pointLightCount", std::to_string(SceneUtil::PPLightBuffer::sMaxPPLightsArraySize)},
             {"@version", std::to_string(technique.getGLSLVersion())},
             {"@multiview", Stereo::getMultiview() ? "1" : "0"},
             {"@builtinSampler", Stereo::getMultiview() ? "sampler2DArray" : "sampler2D"},
diff --git a/components/fx/stateupdater.cpp b/components/fx/stateupdater.cpp
index c362c16f54..36362e07a4 100644
--- a/components/fx/stateupdater.cpp
+++ b/components/fx/stateupdater.cpp
@@ -56,5 +56,8 @@ namespace fx
 
             std::apply([&] (const auto& ... v) { (setUniform(v) , ...); }, mData.getData());
         }
+
+        if (mPointLightBuffer)
+            mPointLightBuffer->applyUniforms(nv->getTraversalNumber(), stateset);
     }
 }
\ No newline at end of file
diff --git a/components/fx/stateupdater.hpp b/components/fx/stateupdater.hpp
index 25bb17fffa..8b181729d1 100644
--- a/components/fx/stateupdater.hpp
+++ b/components/fx/stateupdater.hpp
@@ -3,6 +3,7 @@
 
 #include <osg/BufferTemplate>
 
+#include <components/sceneutil/lightmanager.hpp>
 #include <components/sceneutil/statesetupdater.hpp>
 #include <components/std140/ubo.hpp>
 
@@ -86,12 +87,21 @@ namespace fx
 
         void setWeatherTransition(float transition) { mData.get<WeatherTransition>() = transition; }
 
+        void bindPointLights(std::shared_ptr<SceneUtil::PPLightBuffer> buffer)
+        {
+            mPointLightBuffer = buffer;
+        }
+
         static std::string getStructDefinition()
         {
             static std::string definition = UniformData::getDefinition("_omw_data");
             return definition;
         }
 
+        void setDefaults(osg::StateSet* stateset) override;
+
+        void apply(osg::StateSet* stateset, osg::NodeVisitor* nv) override;
+
     private:
         struct ProjectionMatrix : std140::Mat4 { static constexpr std::string_view sName = "projectionMatrix"; };
 
@@ -180,12 +190,10 @@ namespace fx
             IsInterior
         >;
 
-    private:
-        void setDefaults(osg::StateSet* stateset) override;
-        void apply(osg::StateSet* stateset, osg::NodeVisitor* nv) override;
-
         UniformData mData;
         bool mUseUBO;
+
+        std::shared_ptr<SceneUtil::PPLightBuffer> mPointLightBuffer;
     };
 }
 
diff --git a/components/fx/technique.cpp b/components/fx/technique.cpp
index 86a6189fd7..7ef3fb61a4 100644
--- a/components/fx/technique.cpp
+++ b/components/fx/technique.cpp
@@ -59,6 +59,7 @@ namespace fx
         mValid = false;
         mHDR = false;
         mNormals = false;
+        mLights = false;
         mEnabled = true;
         mPassMap.clear();
         mPasses.clear();
@@ -238,6 +239,8 @@ namespace fx
                 mHDR = parseBool();
             else if (key == "pass_normals")
                 mNormals = parseBool() && mSupportsNormals;
+            else if (key == "pass_lights")
+                mLights = parseBool();
             else if (key == "glsl_profile")
             {
                 expect<Lexer::String>();
diff --git a/components/fx/technique.hpp b/components/fx/technique.hpp
index ca8ef96a52..85a28d9944 100644
--- a/components/fx/technique.hpp
+++ b/components/fx/technique.hpp
@@ -129,6 +129,8 @@ namespace fx
 
         bool getNormals() const { return mNormals && mSupportsNormals; }
 
+        bool getLights() const { return mLights; }
+
         const PassList& getPasses() { return mPasses; }
 
         const TexList& getTextures() const { return mTextures; }
@@ -253,6 +255,7 @@ namespace fx
         bool mValid;
         bool mHDR;
         bool mNormals;
+        bool mLights;
         int mWidth;
         int mHeight;
 
diff --git a/components/misc/constants.hpp b/components/misc/constants.hpp
index 01d783a4fc..2f4d4f8a18 100644
--- a/components/misc/constants.hpp
+++ b/components/misc/constants.hpp
@@ -39,6 +39,9 @@ const float TorsoHeight = 0.75f;
 static constexpr float sStepSizeUp = 34.0f;
 static constexpr float sMaxSlope = 46.0f;
 
+// Identifier for main scene camera
+const std::string SceneCamera = "SceneCam";
+
 }
 
 #endif
diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 45738bcad8..3092fc6f40 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -18,6 +18,7 @@
 
 #include <components/misc/hash.hpp>
 #include <components/misc/stringops.hpp>
+#include <components/misc/constants.hpp>
 
 #include <components/debug/debuglog.hpp>
 
@@ -839,6 +840,7 @@ namespace SceneUtil
         , mPointLightFadeEnd(copy.mPointLightFadeEnd)
         , mPointLightFadeStart(copy.mPointLightFadeStart)
         , mMaxLights(copy.mMaxLights)
+        , mPPLightBuffer(copy.mPPLightBuffer)
     {
     }
 
@@ -1001,6 +1003,9 @@ namespace SceneUtil
 
     void LightManager::update(size_t frameNum)
     {
+        if (mPPLightBuffer)
+            mPPLightBuffer->clear(frameNum);
+
         getLightIndexMap(frameNum).clear();
         mLights.clear();
         mLightsInViewSpace.clear();
@@ -1132,6 +1137,17 @@ namespace SceneUtil
                 l.mLightSource = transform.mLightSource;
                 l.mViewBound = viewBound;
                 it->second.push_back(l);
+
+                if (mPPLightBuffer && it->first->getName() == Constants::SceneCamera)
+                {
+                    const auto* light = l.mLightSource->getLight(frameNum);
+                    mPPLightBuffer->setLight(frameNum, light->getPosition() * (*viewMatrix),
+                                            light->getDiffuse(),
+                                            light->getConstantAttenuation(),
+                                            light->getLinearAttenuation(),
+                                            light->getQuadraticAttenuation(),
+                                            l.mLightSource->getRadius());
+                }
             }
         }
 
@@ -1168,6 +1184,14 @@ namespace SceneUtil
         return uniform;
     }
 
+    void LightManager::setCollectPPLights(bool enabled)
+    {
+        if (enabled)
+            mPPLightBuffer = std::make_shared<PPLightBuffer>();
+        else
+            mPPLightBuffer = nullptr;
+    }
+
     LightSource::LightSource()
         : mRadius(0.f)
         , mActorFade(1.f)
diff --git a/components/sceneutil/lightmanager.hpp b/components/sceneutil/lightmanager.hpp
index 64b7e325ad..ab48e9a23a 100644
--- a/components/sceneutil/lightmanager.hpp
+++ b/components/sceneutil/lightmanager.hpp
@@ -26,6 +26,64 @@ namespace SceneUtil
     class LightBuffer;
     struct StateSetGenerator;
 
+    class PPLightBuffer
+    {
+    public:
+        inline static constexpr auto sMaxPPLights = 30;
+        inline static constexpr auto sMaxPPLightsArraySize = sMaxPPLights * 3;
+
+        PPLightBuffer()
+        {
+            for (size_t i = 0; i < 2; ++i)
+            {
+                mIndex[i] = 0;
+                mUniformBuffers[i] = new osg::Uniform(osg::Uniform::FLOAT_VEC4, "omw_PointLights", sMaxPPLightsArraySize);
+                mUniformCount[i] = new osg::Uniform("omw_PointLightsCount", static_cast<int>(0));
+            }
+        }
+
+        void applyUniforms(size_t frame, osg::StateSet* stateset)
+        {
+            size_t frameId = frame % 2;
+
+            if (!stateset->getUniform("omw_PointLights"))
+                stateset->addUniform(mUniformBuffers[frameId]);
+            if (!stateset->getUniform("omw_PointLightsCount"))
+                stateset->addUniform(mUniformCount[frameId]);
+
+            mUniformBuffers[frameId]->dirty();
+            mUniformCount[frameId]->dirty();
+        }
+
+        void clear(size_t frame)
+        {
+            mIndex[frame % 2] = 0;
+        }
+
+        void setLight(size_t frame, const osg::Vec4f& position, osg::Vec4f diffuse, float ac, float al, float aq, float radius)
+        {
+            size_t frameId = frame % 2;
+            size_t i = mIndex[frameId];
+
+            if (i >= (sMaxPPLights - 1))
+                return;
+
+            i *= 3;
+
+            mUniformBuffers[frameId]->setElement(i + 0, position);
+            mUniformBuffers[frameId]->setElement(i + 1, diffuse);
+            mUniformBuffers[frameId]->setElement(i + 2, osg::Vec4f(ac, al, aq, radius));
+
+            mIndex[frameId]++;
+            mUniformCount[frameId]->set(static_cast<int>(mIndex[frameId]));
+        }
+
+    private:
+        std::array<size_t, 2> mIndex;
+        std::array<osg::ref_ptr<osg::Uniform>, 2> mUniformBuffers;
+        std::array<osg::ref_ptr<osg::Uniform>, 2> mUniformCount;
+    };
+
     enum class LightingMethod
     {
         FFP,
@@ -227,6 +285,11 @@ namespace SceneUtil
 
         osg::ref_ptr<osg::Uniform> generateLightBufferUniform(const osg::Matrixf& sun);
 
+        // Whether to collect main scene camera points lights into a buffer to be later sent to postprocessing shaders
+        void setCollectPPLights(bool enabled);
+
+        std::shared_ptr<PPLightBuffer> getPPLightsBuffer() { return mPPLightBuffer; }
+
     private:
         void initFFP(int targetLights);
         void initPerObjectUniform(int targetLights);
@@ -285,6 +348,8 @@ namespace SceneUtil
         static constexpr auto mFFPMaxLights = 8;
 
         static const std::unordered_map<std::string, LightingMethod> mLightingMethodSettingMap;
+
+        std::shared_ptr<PPLightBuffer> mPPLightBuffer;
     };
 
     /// To receive lighting, objects must be decorated by a LightListCallback. Light list callbacks must be added via

From ac6089a430b6a242eeab3f7dea0a45073b4a52ae Mon Sep 17 00:00:00 2001
From: cody glassman <glassmancody.info@gmail.com>
Date: Sat, 14 May 2022 23:06:32 -0700
Subject: [PATCH 2434/2859] skip flipping of 3D textures which is unsupported
 in OSG

---
 components/fx/technique.cpp          | 2 +-
 components/resource/imagemanager.cpp | 5 +++--
 components/resource/imagemanager.hpp | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/components/fx/technique.cpp b/components/fx/technique.cpp
index 7ef3fb61a4..c186f12c0c 100644
--- a/components/fx/technique.cpp
+++ b/components/fx/technique.cpp
@@ -470,7 +470,7 @@ namespace fx
             else if (key == "source")
             {
                 expect<Lexer::String>();
-                auto image = mImageManager.getImage(std::string{std::get<Lexer::String>(mToken).value});
+                auto image = mImageManager.getImage(std::string{std::get<Lexer::String>(mToken).value}, is3D);
                 if constexpr (is1D)
                 {
                     type = Types::SamplerType::Texture_1D;
diff --git a/components/resource/imagemanager.cpp b/components/resource/imagemanager.cpp
index a544b7b621..ef90353a73 100644
--- a/components/resource/imagemanager.cpp
+++ b/components/resource/imagemanager.cpp
@@ -49,6 +49,7 @@ namespace Resource
         : ResourceManager(vfs)
         , mWarningImage(createWarningImage())
         , mOptions(new osgDB::Options("dds_flip dds_dxt1_detect_rgba ignoreTga2Fields"))
+        , mOptionsNoFlip(new osgDB::Options("dds_dxt1_detect_rgba ignoreTga2Fields"))
     {
     }
 
@@ -82,7 +83,7 @@ namespace Resource
         return true;
     }
 
-    osg::ref_ptr<osg::Image> ImageManager::getImage(const std::string &filename)
+    osg::ref_ptr<osg::Image> ImageManager::getImage(const std::string &filename, bool disableFlip)
     {
         const std::string normalized = mVFS->normalizeFilename(filename);
 
@@ -135,7 +136,7 @@ namespace Resource
                 stream->seekg(0);
             }
 
-            osgDB::ReaderWriter::ReadResult result = reader->readImage(*stream, mOptions);
+            osgDB::ReaderWriter::ReadResult result = reader->readImage(*stream, disableFlip ? mOptionsNoFlip : mOptions);
             if (!result.success())
             {
                 Log(Debug::Error) << "Error loading " << filename << ": " << result.message() << " code " << result.status();
diff --git a/components/resource/imagemanager.hpp b/components/resource/imagemanager.hpp
index 64954af54b..85ea69795a 100644
--- a/components/resource/imagemanager.hpp
+++ b/components/resource/imagemanager.hpp
@@ -28,7 +28,7 @@ namespace Resource
 
         /// Create or retrieve an Image
         /// Returns the dummy image if the given image is not found.
-        osg::ref_ptr<osg::Image> getImage(const std::string& filename);
+        osg::ref_ptr<osg::Image> getImage(const std::string& filename, bool disableFlip = false);
 
         osg::Image* getWarningImage();
 
@@ -37,6 +37,7 @@ namespace Resource
     private:
         osg::ref_ptr<osg::Image> mWarningImage;
         osg::ref_ptr<osgDB::Options> mOptions;
+        osg::ref_ptr<osgDB::Options> mOptionsNoFlip;
 
         ImageManager(const ImageManager&);
         void operator = (const ImageManager&);

From 205452b482512cf3156c97796f1d2502bd95c5b7 Mon Sep 17 00:00:00 2001
From: cody glassman <glassmancody.info@gmail.com>
Date: Sun, 15 May 2022 00:06:33 -0700
Subject: [PATCH 2435/2859] updates to omwfx documentation

---
 .../source/reference/postprocessing/index.rst |   3 +-
 docs/source/reference/postprocessing/lua.rst  | 137 ++++++++++++++++++
 .../source/reference/postprocessing/omwfx.rst |   4 +
 3 files changed, 143 insertions(+), 1 deletion(-)
 create mode 100644 docs/source/reference/postprocessing/lua.rst

diff --git a/docs/source/reference/postprocessing/index.rst b/docs/source/reference/postprocessing/index.rst
index 9e69572742..061d76f37d 100644
--- a/docs/source/reference/postprocessing/index.rst
+++ b/docs/source/reference/postprocessing/index.rst
@@ -8,4 +8,5 @@ OpenMW Post Processing
     :maxdepth: 2
 
     overview
-    omwfx
\ No newline at end of file
+    omwfx
+    lua
\ No newline at end of file
diff --git a/docs/source/reference/postprocessing/lua.rst b/docs/source/reference/postprocessing/lua.rst
new file mode 100644
index 0000000000..cdc6dd93d0
--- /dev/null
+++ b/docs/source/reference/postprocessing/lua.rst
@@ -0,0 +1,137 @@
+####################
+Connecting With Lua
+####################
+
+Overview
+########
+
+Every shader can be controlled through the Lua scripting system. While shaders can be disabled and enabled,
+shader uniforms can also be controlled. For details reference the API documentation, found :doc:`here<../lua-scripting/openmw_postprocessing>`.
+
+Toggling Shaders With a Keybind
+###############################
+
+In this example, we use the desaturation shader created in the previous section and bind the ``x`` key to toggle it on and off.
+It is assumed the shader has the filename ``desaturate.omwfx`` in this example.
+
+.. code-block:: none
+
+    uniform_float uDesaturationFactor {
+        default = 0.5;
+        min = 0.0;
+        max = 1.0;
+        step = 0.05;
+        description = "Desaturation factor. A value of 1.0 is full grayscale.";
+    }
+
+    fragment desaturate {
+        omw_In vec2 omw_TexCoord;
+
+        void main()
+        {
+            // fetch scene texture from last shader
+            vec4 scene = omw_GetLastShader(omw_TexCoord);
+
+            // desaturate RGB component
+            const vec3 luminance = vec3(0.299, 0.587, 0.144);
+            float gray = dot(luminance, scene.rgb);
+
+            omw_FragColor = vec4(mix(scene.rgb, vec3(gray), uDesaturationFactor), scene.a);
+        }
+    }
+
+    technique {
+        description = "Desaturates scene";
+        passes = desaturate;
+        version = "1.0";
+        author = "Fargoth";
+        passes = desaturate;
+    }
+
+
+Next, a script that is attached to the player is needed. The shader is loaded first, then toggled on and off in response to key presses.
+Below is a working example to illustrate this.
+
+.. code-block:: Lua
+
+    local input = require('openmw.input')
+    local postprocessing = require('openmw.postprocessing')
+
+    local shader = postprocessing.load('desaturate')
+
+    return {
+        engineHandlers = {
+            onKeyPress = function(key)
+                if key.code == input.KEY.X then
+                    if shader:isEnabled() then
+                        shader:disable()
+                    else
+                        shader:enable()
+                    end
+                end
+            end
+        }
+    }
+
+Hiding Shader From the HUD
+##########################
+
+If the HUD is opened (default with ``F2``) you will notice it lists all available shaders. If you want your shader to be completely
+hidden in this HUD, this can done by adding the ``hidden`` flag to the main technique block.
+
+.. code-block:: none
+
+    technique {
+        description = "Desaturates scene";
+        passes = desaturate;
+        version = "1.0";
+        author = "Fargoth";
+        passes = desaturate;
+        flags = hidden;
+    }
+
+This flag is usually used when the shader is associated with something special, like special weather, spell, or alcohol effects.
+
+Controlling Uniforms
+####################
+
+By default, any uniform you defined will not be exposed to Lua, you must set the ``static`` flag to ``false`` in every uniform block for which you want exposed.
+For example, to set the ``uDesaturationFactor`` uniform from a Lua script, we must define it as follows.
+
+.. code-block:: none
+
+    uniform_float uDesaturationFactor {
+        default = 0.5;
+        min = 0.0;
+        max = 1.0;
+        step = 0.05;
+        description = "Desaturation factor. A value of 1.0 is full grayscale.";
+        static = false;
+    }
+
+In some player Lua script, this uniform can then be freely set. When a uniform is set to ``static`` it will no longer show up in the HUD.
+Here, instead of disabling and enabling the shader we set the factor to ``0`` or ``1``, respectively.
+
+.. code-block:: Lua
+
+    local input = require('openmw.input')
+    local postprocessing = require('openmw.postprocessing')
+
+    local shader = postprocessing.load('desaturate')
+    local factor = 0
+
+    return {
+        engineHandlers = {
+            onKeyPress = function(key)
+                if key.code == input.KEY.X then
+                    if factor == 0 then
+                        factor = 1
+                    else
+                        factor = 0
+                    end
+
+                    shader:setFloat('uDesaturationFactor', factor)
+                end
+            end
+        }
+    }
\ No newline at end of file
diff --git a/docs/source/reference/postprocessing/omwfx.rst b/docs/source/reference/postprocessing/omwfx.rst
index ca25e7be7e..eab70ba9d5 100644
--- a/docs/source/reference/postprocessing/omwfx.rst
+++ b/docs/source/reference/postprocessing/omwfx.rst
@@ -350,6 +350,10 @@ OpenMW currently supports ``1D``, ``2D``, and ``3D`` texture samplers, cubemaps
 | sampler_3d  |
 +-------------+
 
+.. warning::
+    OpenMW vertically flips all DDS textures when loading them, with the exception of ``3D`` textures.
+
+
 The properites for a ``sampler_*`` block are as following.
 The only required property for a texture is its ``source``.
 

From dae0914820ae6cb97f0a2ae836ae832b0f6fdf60 Mon Sep 17 00:00:00 2001
From: cody glassman <glassmancody.info@gmail.com>
Date: Sun, 15 May 2022 09:36:21 -0700
Subject: [PATCH 2436/2859] workarounds for gl4es

---
 apps/openmw/mwrender/postprocessor.cpp | 13 ++++++++++++-
 components/fx/pass.cpp                 |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwrender/postprocessor.cpp b/apps/openmw/mwrender/postprocessor.cpp
index 3762e8e280..df42daa34c 100644
--- a/apps/openmw/mwrender/postprocessor.cpp
+++ b/apps/openmw/mwrender/postprocessor.cpp
@@ -110,6 +110,10 @@ namespace MWRender
         if (!ext->glDisablei && ext->glDisableIndexedEXT)
             ext->glDisablei = ext->glDisableIndexedEXT;
 
+#ifdef ANDROID
+        ext->glDisablei = nullptr;
+#endif
+
         if (ext->glDisablei)
             mNormalsSupported = true;
         else
@@ -172,11 +176,18 @@ namespace MWRender
     {
         mReload = true;
         mEnabled = true;
+        bool postPass = Settings::Manager::getBool("transparent postpass", "Post Processing");
         mUsePostProcessing = usePostProcessing && !Stereo::getStereo() && !Stereo::getMultiview();
 
+        mDisableDepthPasses = !mSoftParticles && !postPass;
+
+#ifdef ANDROID
+        mDisableDepthPasses = true;
+#endif
+
         if (!mDisableDepthPasses && !Stereo::getStereo() && !Stereo::getMultiview())
         {
-            mTransparentDepthPostPass = new TransparentDepthBinCallback(mRendering.getResourceSystem()->getSceneManager()->getShaderManager(), Settings::Manager::getBool("transparent postpass", "Post Processing"));
+            mTransparentDepthPostPass = new TransparentDepthBinCallback(mRendering.getResourceSystem()->getSceneManager()->getShaderManager(), postPass);
             osgUtil::RenderBin::getRenderBinPrototype("DepthSortedBin")->setDrawCallback(mTransparentDepthPostPass);
         }
 
diff --git a/components/fx/pass.cpp b/components/fx/pass.cpp
index e0489fe0c8..246221eb84 100644
--- a/components/fx/pass.cpp
+++ b/components/fx/pass.cpp
@@ -75,7 +75,7 @@ namespace fx
 
 uniform @builtinSampler omw_SamplerLastShader;
 uniform @builtinSampler omw_SamplerLastPass;
-uniform @builtinSampler omw_SamplerDepth;
+uniform highp @builtinSampler omw_SamplerDepth;
 uniform @builtinSampler omw_SamplerNormals;
 
 uniform vec4 omw_PointLights[@pointLightCount];

From d16fa553c8eab3f044255886ba952bca4ea6ac7a Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 15 May 2022 21:30:08 +0200
Subject: [PATCH 2437/2859] Fix LuaUtil::Callback

---
 apps/openmw/mwlua/asyncbindings.cpp                  | 9 ++++++++-
 apps/openmw/mwlua/luamanagerimp.cpp                  | 2 +-
 apps/openmw_test_suite/lua/test_scriptscontainer.cpp | 6 +++---
 components/lua/scriptscontainer.hpp                  | 4 ++--
 components/lua_ui/widget.cpp                         | 2 +-
 components/lua_ui/widget.hpp                         | 2 +-
 6 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwlua/asyncbindings.cpp b/apps/openmw/mwlua/asyncbindings.cpp
index 0ffb2aad8f..d70e9bfea5 100644
--- a/apps/openmw/mwlua/asyncbindings.cpp
+++ b/apps/openmw/mwlua/asyncbindings.cpp
@@ -6,6 +6,9 @@ namespace sol
 {
     template <>
     struct is_automagical<MWLua::AsyncPackageId> : std::false_type {};
+
+    template <>
+    struct is_automagical<LuaUtil::Callback> : std::false_type {};
 }
 
 namespace MWLua
@@ -50,11 +53,15 @@ namespace MWLua
             asyncId.mContainer->setupUnsavableTimer(
                 TimerType::GAME_TIME, world->getGameTime() + delay, asyncId.mScriptId, std::move(callback));
         };
-        api["callback"] = [](const AsyncPackageId& asyncId, sol::function fn)
+        api["callback"] = [](const AsyncPackageId& asyncId, sol::function fn) -> LuaUtil::Callback
         {
             return LuaUtil::Callback{std::move(fn), asyncId.mHiddenData};
         };
 
+        sol::usertype<LuaUtil::Callback> callbackType = context.mLua->sol().new_usertype<LuaUtil::Callback>("Callback");
+        callbackType[sol::meta_function::call] =
+            [](const LuaUtil::Callback& callback, sol::variadic_args va) { return callback.call(sol::as_args(va)); };
+
         auto initializer = [](sol::table hiddenData)
         {
             LuaUtil::ScriptsContainer::ScriptId id = hiddenData[LuaUtil::ScriptsContainer::sScriptIdKey];
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 3c458bd7b8..c747d69ab4 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -169,7 +169,7 @@ namespace MWLua
 
         // Run queued callbacks
         for (CallbackWithData& c : mQueuedCallbacks)
-            c.mCallback(c.mArg);
+            c.mCallback.call(c.mArg);
         mQueuedCallbacks.clear();
 
         // Engine handlers in local scripts
diff --git a/apps/openmw_test_suite/lua/test_scriptscontainer.cpp b/apps/openmw_test_suite/lua/test_scriptscontainer.cpp
index 779debb4e6..900888929d 100644
--- a/apps/openmw_test_suite/lua/test_scriptscontainer.cpp
+++ b/apps/openmw_test_suite/lua/test_scriptscontainer.cpp
@@ -447,16 +447,16 @@ return {
         callback.mHiddenData[LuaUtil::ScriptsContainer::sScriptIdKey] = LuaUtil::ScriptsContainer::ScriptId{nullptr, 0};
 
         testing::internal::CaptureStdout();
-        callback(1.5);
+        callback.call(1.5);
         EXPECT_EQ(internal::GetCapturedStdout(), "1.5\n");
 
         testing::internal::CaptureStdout();
-        callback(1.5, 2.5);
+        callback.call(1.5, 2.5);
         EXPECT_EQ(internal::GetCapturedStdout(), "1.5\t2.5\n");
 
         testing::internal::CaptureStdout();
         callback.mHiddenData[LuaUtil::ScriptsContainer::sScriptIdKey] = sol::nil;
-        callback(1.5, 2.5);
+        callback.call(1.5, 2.5);
         EXPECT_EQ(internal::GetCapturedStdout(), "Ignored callback to the removed script some_script.lua\n");
     }
 
diff --git a/components/lua/scriptscontainer.hpp b/components/lua/scriptscontainer.hpp
index e065c487c4..f64ec97722 100644
--- a/components/lua/scriptscontainer.hpp
+++ b/components/lua/scriptscontainer.hpp
@@ -252,7 +252,7 @@ namespace LuaUtil
         bool isValid() const { return mHiddenData[ScriptsContainer::sScriptIdKey] != sol::nil; }
 
         template <typename... Args>
-        sol::object operator()(Args&&... args) const
+        sol::object call(Args&&... args) const
         {
             if (isValid())
                 return LuaUtil::call(mFunc, std::forward<Args>(args)...);
@@ -265,7 +265,7 @@ namespace LuaUtil
         template <typename... Args>
         void tryCall(Args&&... args) const
         {
-            try { (*this)(std::forward<Args>(args)...); }
+            try { this->call(std::forward<Args>(args)...); }
             catch (std::exception& e)
             {
                 Log(Debug::Error) << "Error in callback: " << e.what();
diff --git a/components/lua_ui/widget.cpp b/components/lua_ui/widget.cpp
index 49d69f8fd1..c98b7ad38f 100644
--- a/components/lua_ui/widget.cpp
+++ b/components/lua_ui/widget.cpp
@@ -340,7 +340,7 @@ namespace LuaUi
     {
         auto it = mCallbacks.find(name);
         if (it != mCallbacks.end())
-            it->second(argument, mLayout);
+            it->second.call(argument, mLayout);
     }
 
     void WidgetExtension::keyPress(MyGUI::Widget*, MyGUI::KeyCode code, MyGUI::Char ch)
diff --git a/components/lua_ui/widget.hpp b/components/lua_ui/widget.hpp
index b6bef55235..3285f629ac 100644
--- a/components/lua_ui/widget.hpp
+++ b/components/lua_ui/widget.hpp
@@ -111,7 +111,7 @@ namespace LuaUi
                 auto it = w->mCallbacks.find(name);
                 if (it != w->mCallbacks.end())
                 {
-                    sol::object res = it->second(argumentFactory(w), w->mLayout);
+                    sol::object res = it->second.call(argumentFactory(w), w->mLayout);
                     shouldPropagate = res.is<bool>() && res.as<bool>();
                 }
                 if (w->mParent && w->mPropagateEvents && shouldPropagate)

From 7cd422264768f00e238647f2facdfe9c6ea1feb1 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Fri, 13 May 2022 16:35:49 +0200
Subject: [PATCH 2438/2859] Update sol. Replace combined sol.hpp with loose
 files.

---
 CMakeLists.txt                                |     2 +-
 extern/sol3.2.2/README.md                     |     3 -
 extern/sol3.2.2/sol/sol.hpp                   | 26674 ----------------
 extern/sol3/README.md                         |     3 +
 extern/sol3/sol/as_args.hpp                   |    54 +
 extern/sol3/sol/as_returns.hpp                |    62 +
 extern/sol3/sol/assert.hpp                    |    99 +
 extern/sol3/sol/base_traits.hpp               |   123 +
 extern/sol3/sol/bind_traits.hpp               |   553 +
 extern/sol3/sol/bytecode.hpp                  |   121 +
 extern/sol3/sol/call.hpp                      |   961 +
 extern/sol3/sol/compatibility.hpp             |    51 +
 extern/sol3/sol/compatibility/compat-5.3.c.h  |   900 +
 extern/sol3/sol/compatibility/compat-5.3.h    |   424 +
 extern/sol3/sol/compatibility/compat-5.4.h    |    25 +
 extern/sol3/sol/compatibility/lua_version.hpp |   218 +
 extern/sol3/sol/coroutine.hpp                 |   251 +
 extern/sol3/sol/debug.hpp                     |    52 +
 extern/sol3/sol/demangle.hpp                  |   192 +
 extern/sol3/sol/deprecate.hpp                 |    44 +
 extern/sol3/sol/detail/build_version.hpp      |   232 +
 extern/sol3/sol/dump_handler.hpp              |    77 +
 extern/sol3/sol/ebco.hpp                      |   160 +
 extern/sol3/sol/environment.hpp               |   261 +
 extern/sol3/sol/epilogue.hpp                  |    39 +
 extern/sol3/sol/error.hpp                     |    89 +
 extern/sol3/sol/error_handler.hpp             |   175 +
 extern/sol3/sol/forward.hpp                   |   266 +
 extern/sol3/sol/forward_detail.hpp            |    56 +
 extern/sol3/sol/function.hpp                  |   142 +
 extern/sol3/sol/function_result.hpp           |    78 +
 extern/sol3/sol/function_types.hpp            |   769 +
 extern/sol3/sol/function_types_core.hpp       |    46 +
 extern/sol3/sol/function_types_overloaded.hpp |    65 +
 extern/sol3/sol/function_types_stateful.hpp   |   158 +
 extern/sol3/sol/function_types_stateless.hpp  |   385 +
 extern/sol3/sol/function_types_templated.hpp  |   154 +
 extern/sol3/sol/in_place.hpp                  |    48 +
 extern/sol3/sol/inheritance.hpp               |   195 +
 extern/sol3/sol/load_result.hpp               |   150 +
 extern/sol3/sol/lua_table.hpp                 |    95 +
 extern/sol3/sol/lua_value.hpp                 |   162 +
 extern/sol3/sol/make_reference.hpp            |    74 +
 extern/sol3/sol/metatable.hpp                 |   203 +
 extern/sol3/sol/object.hpp                    |   150 +
 extern/sol3/sol/object_base.hpp               |    86 +
 extern/sol3/sol/optional.hpp                  |    83 +
 extern/sol3/sol/optional_implementation.hpp   |  2303 ++
 extern/sol3/sol/overload.hpp                  |    49 +
 extern/sol3/sol/packaged_coroutine.hpp        |   262 +
 extern/sol3/sol/pairs_iterator.hpp            |   275 +
 extern/sol3/sol/pointer_like.hpp              |   102 +
 extern/sol3/sol/policies.hpp                  |    98 +
 extern/sol3/sol/prologue.hpp                  |    47 +
 extern/sol3/sol/property.hpp                  |   151 +
 extern/sol3/sol/protect.hpp                   |    53 +
 extern/sol3/sol/protected_function.hpp        |   385 +
 extern/sol3/sol/protected_function_result.hpp |   233 +
 extern/sol3/sol/protected_handler.hpp         |   108 +
 extern/sol3/sol/proxy_base.hpp                |    68 +
 extern/sol3/sol/raii.hpp                      |   162 +
 extern/sol3/sol/reference.hpp                 |   900 +
 extern/sol3/sol/resolve.hpp                   |   173 +
 extern/sol3/sol/sol.hpp                       |    79 +
 extern/sol3/sol/stack.hpp                     |   351 +
 extern/sol3/sol/stack/detail/pairs.hpp        |    98 +
 extern/sol3/sol/stack_check.hpp               |    30 +
 extern/sol3/sol/stack_check_get.hpp           |    30 +
 extern/sol3/sol/stack_check_get_qualified.hpp |   139 +
 .../sol3/sol/stack_check_get_unqualified.hpp  |   186 +
 extern/sol3/sol/stack_check_qualified.hpp     |    89 +
 extern/sol3/sol/stack_check_unqualified.hpp   |   639 +
 extern/sol3/sol/stack_core.hpp                |  1456 +
 extern/sol3/sol/stack_field.hpp               |   279 +
 extern/sol3/sol/stack_get.hpp                 |    30 +
 extern/sol3/sol/stack_get_qualified.hpp       |    37 +
 extern/sol3/sol/stack_get_unqualified.hpp     |  1064 +
 extern/sol3/sol/stack_guard.hpp               |    67 +
 extern/sol3/sol/stack_iterator.hpp            |   153 +
 extern/sol3/sol/stack_pop.hpp                 |    51 +
 extern/sol3/sol/stack_probe.hpp               |    94 +
 extern/sol3/sol/stack_proxy.hpp               |    64 +
 extern/sol3/sol/stack_proxy_base.hpp          |    96 +
 extern/sol3/sol/stack_push.hpp                |  1382 +
 extern/sol3/sol/stack_reference.hpp           |   314 +
 extern/sol3/sol/state.hpp                     |    62 +
 extern/sol3/sol/state_handling.hpp            |   194 +
 extern/sol3/sol/state_view.hpp                |   874 +
 extern/sol3/sol/string_view.hpp               |    45 +
 extern/sol3/sol/table.hpp                     |   116 +
 extern/sol3/sol/table_core.hpp                |   733 +
 extern/sol3/sol/table_iterator.hpp            |   114 +
 extern/sol3/sol/table_proxy.hpp               |   337 +
 extern/sol3/sol/thread.hpp                    |   189 +
 extern/sol3/sol/tie.hpp                       |    98 +
 extern/sol3/sol/traits.hpp                    |   739 +
 extern/sol3/sol/trampoline.hpp                |   214 +
 extern/sol3/sol/tuple.hpp                     |    93 +
 extern/sol3/sol/types.hpp                     |  1496 +
 extern/sol3/sol/unicode.hpp                   |   308 +
 extern/sol3/sol/unique_usertype_traits.hpp    |   240 +
 extern/sol3/sol/unsafe_function.hpp           |   170 +
 extern/sol3/sol/unsafe_function_result.hpp    |   180 +
 extern/sol3/sol/userdata.hpp                  |   134 +
 extern/sol3/sol/usertype.hpp                  |   131 +
 extern/sol3/sol/usertype_container.hpp        |  1562 +
 extern/sol3/sol/usertype_container_launch.hpp |   432 +
 extern/sol3/sol/usertype_core.hpp             |   214 +
 extern/sol3/sol/usertype_proxy.hpp            |   187 +
 extern/sol3/sol/usertype_storage.hpp          |  1161 +
 extern/sol3/sol/usertype_traits.hpp           |    61 +
 extern/sol3/sol/variadic_args.hpp             |   181 +
 extern/sol3/sol/variadic_results.hpp          |   103 +
 extern/sol3/sol/version.hpp                   |   831 +
 extern/sol3/sol/wrapper.hpp                   |   280 +
 115 files changed, 32108 insertions(+), 26678 deletions(-)
 delete mode 100644 extern/sol3.2.2/README.md
 delete mode 100644 extern/sol3.2.2/sol/sol.hpp
 create mode 100644 extern/sol3/README.md
 create mode 100644 extern/sol3/sol/as_args.hpp
 create mode 100644 extern/sol3/sol/as_returns.hpp
 create mode 100644 extern/sol3/sol/assert.hpp
 create mode 100644 extern/sol3/sol/base_traits.hpp
 create mode 100644 extern/sol3/sol/bind_traits.hpp
 create mode 100644 extern/sol3/sol/bytecode.hpp
 create mode 100644 extern/sol3/sol/call.hpp
 create mode 100644 extern/sol3/sol/compatibility.hpp
 create mode 100644 extern/sol3/sol/compatibility/compat-5.3.c.h
 create mode 100644 extern/sol3/sol/compatibility/compat-5.3.h
 create mode 100644 extern/sol3/sol/compatibility/compat-5.4.h
 create mode 100644 extern/sol3/sol/compatibility/lua_version.hpp
 create mode 100644 extern/sol3/sol/coroutine.hpp
 create mode 100644 extern/sol3/sol/debug.hpp
 create mode 100644 extern/sol3/sol/demangle.hpp
 create mode 100644 extern/sol3/sol/deprecate.hpp
 create mode 100644 extern/sol3/sol/detail/build_version.hpp
 create mode 100644 extern/sol3/sol/dump_handler.hpp
 create mode 100644 extern/sol3/sol/ebco.hpp
 create mode 100644 extern/sol3/sol/environment.hpp
 create mode 100644 extern/sol3/sol/epilogue.hpp
 create mode 100644 extern/sol3/sol/error.hpp
 create mode 100644 extern/sol3/sol/error_handler.hpp
 create mode 100644 extern/sol3/sol/forward.hpp
 create mode 100644 extern/sol3/sol/forward_detail.hpp
 create mode 100644 extern/sol3/sol/function.hpp
 create mode 100644 extern/sol3/sol/function_result.hpp
 create mode 100644 extern/sol3/sol/function_types.hpp
 create mode 100644 extern/sol3/sol/function_types_core.hpp
 create mode 100644 extern/sol3/sol/function_types_overloaded.hpp
 create mode 100644 extern/sol3/sol/function_types_stateful.hpp
 create mode 100644 extern/sol3/sol/function_types_stateless.hpp
 create mode 100644 extern/sol3/sol/function_types_templated.hpp
 create mode 100644 extern/sol3/sol/in_place.hpp
 create mode 100644 extern/sol3/sol/inheritance.hpp
 create mode 100644 extern/sol3/sol/load_result.hpp
 create mode 100644 extern/sol3/sol/lua_table.hpp
 create mode 100644 extern/sol3/sol/lua_value.hpp
 create mode 100644 extern/sol3/sol/make_reference.hpp
 create mode 100644 extern/sol3/sol/metatable.hpp
 create mode 100644 extern/sol3/sol/object.hpp
 create mode 100644 extern/sol3/sol/object_base.hpp
 create mode 100644 extern/sol3/sol/optional.hpp
 create mode 100644 extern/sol3/sol/optional_implementation.hpp
 create mode 100644 extern/sol3/sol/overload.hpp
 create mode 100644 extern/sol3/sol/packaged_coroutine.hpp
 create mode 100644 extern/sol3/sol/pairs_iterator.hpp
 create mode 100644 extern/sol3/sol/pointer_like.hpp
 create mode 100644 extern/sol3/sol/policies.hpp
 create mode 100644 extern/sol3/sol/prologue.hpp
 create mode 100644 extern/sol3/sol/property.hpp
 create mode 100644 extern/sol3/sol/protect.hpp
 create mode 100644 extern/sol3/sol/protected_function.hpp
 create mode 100644 extern/sol3/sol/protected_function_result.hpp
 create mode 100644 extern/sol3/sol/protected_handler.hpp
 create mode 100644 extern/sol3/sol/proxy_base.hpp
 create mode 100644 extern/sol3/sol/raii.hpp
 create mode 100644 extern/sol3/sol/reference.hpp
 create mode 100644 extern/sol3/sol/resolve.hpp
 create mode 100644 extern/sol3/sol/sol.hpp
 create mode 100644 extern/sol3/sol/stack.hpp
 create mode 100644 extern/sol3/sol/stack/detail/pairs.hpp
 create mode 100644 extern/sol3/sol/stack_check.hpp
 create mode 100644 extern/sol3/sol/stack_check_get.hpp
 create mode 100644 extern/sol3/sol/stack_check_get_qualified.hpp
 create mode 100644 extern/sol3/sol/stack_check_get_unqualified.hpp
 create mode 100644 extern/sol3/sol/stack_check_qualified.hpp
 create mode 100644 extern/sol3/sol/stack_check_unqualified.hpp
 create mode 100644 extern/sol3/sol/stack_core.hpp
 create mode 100644 extern/sol3/sol/stack_field.hpp
 create mode 100644 extern/sol3/sol/stack_get.hpp
 create mode 100644 extern/sol3/sol/stack_get_qualified.hpp
 create mode 100644 extern/sol3/sol/stack_get_unqualified.hpp
 create mode 100644 extern/sol3/sol/stack_guard.hpp
 create mode 100644 extern/sol3/sol/stack_iterator.hpp
 create mode 100644 extern/sol3/sol/stack_pop.hpp
 create mode 100644 extern/sol3/sol/stack_probe.hpp
 create mode 100644 extern/sol3/sol/stack_proxy.hpp
 create mode 100644 extern/sol3/sol/stack_proxy_base.hpp
 create mode 100644 extern/sol3/sol/stack_push.hpp
 create mode 100644 extern/sol3/sol/stack_reference.hpp
 create mode 100644 extern/sol3/sol/state.hpp
 create mode 100644 extern/sol3/sol/state_handling.hpp
 create mode 100644 extern/sol3/sol/state_view.hpp
 create mode 100644 extern/sol3/sol/string_view.hpp
 create mode 100644 extern/sol3/sol/table.hpp
 create mode 100644 extern/sol3/sol/table_core.hpp
 create mode 100644 extern/sol3/sol/table_iterator.hpp
 create mode 100644 extern/sol3/sol/table_proxy.hpp
 create mode 100644 extern/sol3/sol/thread.hpp
 create mode 100644 extern/sol3/sol/tie.hpp
 create mode 100644 extern/sol3/sol/traits.hpp
 create mode 100644 extern/sol3/sol/trampoline.hpp
 create mode 100644 extern/sol3/sol/tuple.hpp
 create mode 100644 extern/sol3/sol/types.hpp
 create mode 100644 extern/sol3/sol/unicode.hpp
 create mode 100644 extern/sol3/sol/unique_usertype_traits.hpp
 create mode 100644 extern/sol3/sol/unsafe_function.hpp
 create mode 100644 extern/sol3/sol/unsafe_function_result.hpp
 create mode 100644 extern/sol3/sol/userdata.hpp
 create mode 100644 extern/sol3/sol/usertype.hpp
 create mode 100644 extern/sol3/sol/usertype_container.hpp
 create mode 100644 extern/sol3/sol/usertype_container_launch.hpp
 create mode 100644 extern/sol3/sol/usertype_core.hpp
 create mode 100644 extern/sol3/sol/usertype_proxy.hpp
 create mode 100644 extern/sol3/sol/usertype_storage.hpp
 create mode 100644 extern/sol3/sol/usertype_traits.hpp
 create mode 100644 extern/sol3/sol/variadic_args.hpp
 create mode 100644 extern/sol3/sol/variadic_results.hpp
 create mode 100644 extern/sol3/sol/version.hpp
 create mode 100644 extern/sol3/sol/wrapper.hpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 500f8a510d..de0469c7c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -449,7 +449,7 @@ else(USE_LUAJIT)
 endif(USE_LUAJIT)
 
 # C++ library binding to Lua
-set(SOL_INCLUDE_DIR ${OpenMW_SOURCE_DIR}/extern/sol3.2.2)
+set(SOL_INCLUDE_DIR ${OpenMW_SOURCE_DIR}/extern/sol3)
 set(SOL_CONFIG_DIR ${OpenMW_SOURCE_DIR}/extern/sol_config)
 
 include_directories(
diff --git a/extern/sol3.2.2/README.md b/extern/sol3.2.2/README.md
deleted file mode 100644
index c831941822..0000000000
--- a/extern/sol3.2.2/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-sol/sol.hpp is downloaded from https://github.com/ThePhD/sol2/releases/download/v3.2.2/sol.hpp
-
-License: MIT
diff --git a/extern/sol3.2.2/sol/sol.hpp b/extern/sol3.2.2/sol/sol.hpp
deleted file mode 100644
index c25fd549e7..0000000000
--- a/extern/sol3.2.2/sol/sol.hpp
+++ /dev/null
@@ -1,26674 +0,0 @@
-// The MIT License (MIT)
-
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
-
-// Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the "Software"), to deal in
-// the Software without restriction, including without limitation the rights to
-// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-// the Software, and to permit persons to whom the Software is furnished to do so,
-// subject to the following conditions:
-
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-// This file was generated with a script.
-// Generated 2020-10-03 21:34:24.496436 UTC
-// This header was generated with sol v3.2.1 (revision 48eea7b5)
-// https://github.com/ThePhD/sol2
-
-#ifndef SOL_SINGLE_INCLUDE_HPP
-#define SOL_SINGLE_INCLUDE_HPP
-
-// beginning of sol/sol.hpp
-
-#ifndef SOL_HPP
-#define SOL_HPP
-
-// beginning of sol/version.hpp
-
-#include <sol/config.hpp>
-
-#include <cstdint>
-
-#define SOL_VERSION_MAJOR 3
-#define SOL_VERSION_MINOR 5
-#define SOL_VERSION_PATCH 0
-#define SOL_VERSION_STRING "3.5.0"
-#define SOL_VERSION ((SOL_VERSION_MAJOR * 100000) + (SOL_VERSION_MINOR * 100) + (SOL_VERSION_PATCH))
-
-#define SOL_IS_ON(OP_SYMBOL) ((3 OP_SYMBOL 3) != 0)
-#define SOL_IS_OFF(OP_SYMBOL) ((3 OP_SYMBOL 3) == 0)
-#define SOL_IS_DEFAULT_ON(OP_SYMBOL) ((3 OP_SYMBOL 3) > 3)
-#define SOL_IS_DEFAULT_OFF(OP_SYMBOL) ((3 OP_SYMBOL 3 OP_SYMBOL 3) < 0)
-
-#define SOL_ON          |
-#define SOL_OFF         ^
-#define SOL_DEFAULT_ON  +
-#define SOL_DEFAULT_OFF -
-
-#if defined(_MSC_VER)
-	#define SOL_COMPILER_CLANG_I_ SOL_OFF
-	#define SOL_COMPILER_GCC_I_   SOL_OFF
-	#define SOL_COMPILER_EDG_I_   SOL_OFF
-	#define SOL_COMPILER_VCXX_I_  SOL_ON
-#elif defined(__clang__)
-	#define SOL_COMPILER_CLANG_I_ SOL_ON
-	#define SOL_COMPILER_GCC_I_   SOL_OFF
-	#define SOL_COMPILER_EDG_I_   SOL_OFF
-	#define SOL_COMPILER_VCXX_I_  SOL_OFF
-#elif defined(__GNUC__)
-	#define SOL_COMPILER_CLANG_I_ SOL_OFF
-	#define SOL_COMPILER_GCC_I_   SOL_ON
-	#define SOL_COMPILER_EDG_I_   SOL_OFF
-	#define SOL_COMPILER_VCXX_I_  SOL_OFF
-#else
-	#define SOL_COMPILER_CLANG_I_ SOL_OFF
-	#define SOL_COMPILER_GCC_I_   SOL_OFF
-	#define SOL_COMPILER_EDG_I_   SOL_OFF
-	#define SOL_COMPILER_VCXX_I_  SOL_OFF
-#endif
-
-#if defined(__MINGW32__)
-	#define SOL_COMPILER_FRONTEND_MINGW_I_ SOL_ON
-#else
-	#define SOL_COMPILER_FRONTEND_MINGW_I_ SOL_OFF
-#endif
-
-#if SIZE_MAX <= 0xFFFFULL
-	#define SOL_PLATFORM_X16_I_ SOL_ON
-	#define SOL_PLATFORM_X86_I_ SOL_OFF
-	#define SOL_PLATFORM_X64_I_ SOL_OFF
-#elif SIZE_MAX <= 0xFFFFFFFFULL
-	#define SOL_PLATFORM_X16_I_ SOL_OFF
-	#define SOL_PLATFORM_X86_I_ SOL_ON
-	#define SOL_PLATFORM_X64_I_ SOL_OFF
-#else
-	#define SOL_PLATFORM_X16_I_ SOL_OFF
-	#define SOL_PLATFORM_X86_I_ SOL_OFF
-	#define SOL_PLATFORM_X64_I_ SOL_ON
-#endif
-
-#define SOL_PLATFORM_ARM32_I_ SOL_OFF
-#define SOL_PLATFORM_ARM64_I_ SOL_OFF
-
-#if defined(_WIN32)
-	#define SOL_PLATFORM_WINDOWS_I_ SOL_ON
-#else
-	#define SOL_PLATFORM_WINDOWS_I_ SOL_OFF
-#endif
-#if defined(__APPLE__)
-	#define SOL_PLATFORM_APPLE_I_ SOL_ON
-#else
-	#define SOL_PLATFORM_APPLE_I_ SOL_OFF
-#endif
-#if defined(__unix__)
-	#define SOL_PLATFORM_UNIXLIKE_I_ SOL_ON
-#else
-	#define SOL_PLATFORM_UNIXLIKE_I_ SOL_OFF
-#endif
-#if defined(__linux__)
-	#define SOL_PLATFORM_LINUXLIKE_I_ SOL_ON
-#else
-	#define SOL_PLATFORM_LINUXLIKE_I_ SOL_OFF
-#endif
-
-#define SOL_PLATFORM_APPLE_IPHONE_I_ SOL_OFF
-#define SOL_PLATFORM_BSDLIKE_I_      SOL_OFF
-
-#if defined(SOL_IN_DEBUG_DETECTED)
-	#if SOL_IN_DEBUG_DETECTED != 0
-		#define SOL_DEBUG_BUILD_I_ SOL_ON
-	#else
-		#define SOL_DEBUG_BUILD_I_ SOL_OFF
-	#endif
-#elif !defined(NDEBUG)
-	#if SOL_IS_ON(SOL_COMPILER_VCXX_I_) && defined(_DEBUG)
-		#define SOL_DEBUG_BUILD_I_ SOL_ON
-	#elif (SOL_IS_ON(SOL_COMPILER_CLANG_I_) || SOL_IS_ON(SOL_COMPILER_GCC_I_)) && !defined(__OPTIMIZE__)
-		#define SOL_DEBUG_BUILD_I_ SOL_ON
-	#else
-		#define SOL_DEBUG_BUILD_I_ SOL_OFF
-	#endif
-#else
-	#define SOL_DEBUG_BUILD_I_ SOL_DEFAULT_OFF
-#endif // We are in a debug mode of some sort
-
-#if defined(SOL_NO_EXCEPTIONS)
-	#if (SOL_NO_EXCEPTIONS != 0)
-		#define SOL_EXCEPTIONS_I_ SOL_OFF
-	#else
-		#define SOL_EXCEPTIONS_I_ SOL_ON
-	#endif
-#elif SOL_IS_ON(SOL_COMPILER_VCXX_I_)
-	#if !defined(_CPPUNWIND)
-		#define SOL_EXCEPTIONS_I_ SOL_OFF
-	#else
-		#define SOL_EXCEPTIONS_I_ SOL_ON
-	#endif
-#elif SOL_IS_ON(SOL_COMPILER_CLANG_I_) || SOL_IS_ON(SOL_COMPILER_GCC_I_)
-	#if !defined(__EXCEPTIONS)
-		#define SOL_EXCEPTIONS_I_ SOL_OFF
-	#else
-		#define SOL_EXCEPTIONS_I_ SOL_ON
-	#endif
-#else
-	#define SOL_EXCEPTIONS_I_ SOL_DEFAULT_ON
-#endif
-
-#if defined(SOL_NO_RTTI)
-	#if (SOL_NO_RTTI != 0)
-		#define SOL_RTTI_I_ SOL_OFF
-	#else
-		#define SOL_RTTI_I_ SOL_ON
-	#endif
-#elif SOL_IS_ON(SOL_COMPILER_VCXX_I_)
-	#if !defined(_CPPRTTI)
-		#define SOL_RTTI_I_ SOL_OFF
-	#else
-		#define SOL_RTTI_I_ SOL_ON
-	#endif
-#elif SOL_IS_ON(SOL_COMPILER_CLANG_I_) || SOL_IS_ON(SOL_COMPILER_GCC_I_)
-	#if !defined(__GXX_RTTI)
-		#define SOL_RTTI_I_ SOL_OFF
-	#else
-		#define SOL_RTTI_I_ SOL_ON
-	#endif
-#else
-	#define SOL_RTTI_I_ SOL_DEFAULT_ON
-#endif
-
-#if defined(SOL_NO_THREAD_LOCAL) && (SOL_NO_THREAD_LOCAL != 0)
-	#define SOL_USE_THREAD_LOCAL_I_ SOL_OFF
-#else
-	#define SOL_USE_THREAD_LOCAL_I_ SOL_DEFAULT_ON
-#endif // thread_local keyword is bjorked on some platforms
-
-#if defined(SOL_ALL_SAFETIES_ON) && (SOL_ALL_SAFETIES_ON != 0)
-	#define SOL_ALL_SAFETIES_ON_I_ SOL_ON
-#else
-	#define SOL_ALL_SAFETIES_ON_I_ SOL_DEFAULT_OFF
-#endif
-
-#if defined(SOL_SAFE_GETTER) && (SOL_SAFE_GETTER != 0)
-	#define SOL_SAFE_GETTER_I_ SOL_ON
-#else
-	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON_I_)
-		#define SOL_SAFE_GETTER_I_ SOL_ON
-	#elif SOL_IS_ON(SOL_DEBUG_BUILD_I_)
-		#define SOL_SAFE_GETTER_I_ SOL_DEFAULT_ON
-	#else
-		#define SOL_SAFE_GETTER_I_ SOL_DEFAULT_OFF
-	#endif
-#endif
-
-#if defined(SOL_SAFE_USERTYPE) && (SOL_SAFE_USERTYPE != 0)
-	#define SOL_SAFE_USERTYPE_I_ SOL_ON
-#else
-	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON_I_)
-		#define SOL_SAFE_USERTYPE_I_ SOL_ON
-	#elif SOL_IS_ON(SOL_DEBUG_BUILD_I_)
-		#define SOL_SAFE_USERTYPE_I_ SOL_DEFAULT_ON
-	#else
-		#define SOL_SAFE_USERTYPE_I_ SOL_DEFAULT_OFF
-	#endif
-#endif
-
-#if defined(SOL_SAFE_REFERENCES) && (SOL_SAFE_REFERENCES != 0)
-	#define SOL_SAFE_REFERENCES_I_ SOL_ON
-#else
-	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON_I_)
-		#define SOL_SAFE_REFERENCES_I_ SOL_ON
-	#elif SOL_IS_ON(SOL_DEBUG_BUILD_I_)
-		#define SOL_SAFE_REFERENCES_I_ SOL_DEFAULT_ON
-	#else
-		#define SOL_SAFE_REFERENCES_I_ SOL_DEFAULT_OFF
-	#endif
-#endif
-
-#if (defined(SOL_SAFE_FUNCTIONS) && (SOL_SAFE_FUNCTIONS != 0)) \
-    || (defined(SOL_SAFE_FUNCTION_OBJECTS) && (SOL_SAFE_FUNCTION_OBJECTS != 0))
-	#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_ON
-#else
-	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON_I_)
-		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_ON
-	#elif SOL_IS_ON(SOL_DEBUG_BUILD_I_)
-		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_DEFAULT_ON
-	#else
-		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_DEFAULT_OFF
-	#endif
-#endif
-
-#if defined(SOL_SAFE_FUNCTION_CALLS) && (SOL_SAFE_FUNCTION_CALLS != 0)
-	#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_ON
-#else
-	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON_I_)
-		#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_ON
-	#elif SOL_IS_ON(SOL_DEBUG_BUILD_I_)
-		#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_DEFAULT_ON
-	#else
-		#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_DEFAULT_OFF
-	#endif
-#endif
-
-#if defined(SOL_SAFE_PROXIES) && (SOL_SAFE_PROXIES != 0)
-	#define SOL_SAFE_PROXIES_I_ SOL_ON
-#else
-	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON_I_)
-		#define SOL_SAFE_PROXIES_I_ SOL_ON
-	#elif SOL_IS_ON(SOL_DEBUG_BUILD_I_)
-		#define SOL_SAFE_PROXIES_I_ SOL_DEFAULT_ON
-	#else
-		#define SOL_SAFE_PROXIES_I_ SOL_DEFAULT_OFF
-	#endif
-#endif
-
-#if defined(SOL_SAFE_NUMERICS) && (SOL_SAFE_NUMERICS != 0)
-	#define SOL_SAFE_NUMERICS_I_ SOL_ON
-#else
-	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON_I_)
-		#define SOL_SAFE_NUMERICS_I_ SOL_ON
-	#elif SOL_IS_ON(SOL_DEBUG_BUILD_I_)
-		#define SOL_SAFE_NUMERICS_I_ SOL_DEFAULT_ON
-	#else
-		#define SOL_SAFE_NUMERICS_I_ SOL_DEFAULT_OFF
-	#endif
-#endif
-
-#if defined(SOL_SAFE_STACK_CHECK) && (SOL_SAFE_STACK_CHECK != 0)
-	#define SOL_SAFE_STACK_CHECK_I_ SOL_ON
-#else
-	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON_I_)
-		#define SOL_SAFE_STACK_CHECK_I_ SOL_ON
-	#elif SOL_IS_ON(SOL_DEBUG_BUILD_I_)
-		#define SOL_SAFE_STACK_CHECK_I_ SOL_DEFAULT_ON
-	#else
-		#define SOL_SAFE_STACK_CHECK_I_ SOL_DEFAULT_OFF
-	#endif
-#endif
-
-#if (defined(SOL_NO_CHECK_NUMBER_PRECISION) && (SOL_NO_CHECK_NUMBER_PRECISION != 0)) \
-    || (defined(SOL_NO_CHECKING_NUMBER_PRECISION) && (SOL_NO_CHECKING_NUMBER_PRECISION != 0))
-	#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_OFF
-#else
-	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON_I_)
-		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_ON
-	#elif SOL_IS_ON(SOL_SAFE_NUMERICS_I_)
-		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_ON
-	#elif SOL_IS_ON(SOL_DEBUG_BUILD_I_)
-		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_DEFAULT_ON
-	#else
-		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_DEFAULT_OFF
-	#endif
-#endif
-
-#if defined(SOL_STRINGS_ARE_NUMBERS)
-	#if (SOL_STRINGS_ARE_NUMBERS != 0)
-		#define SOL_STRINGS_ARE_NUMBERS_I_ SOL_ON
-	#else
-		#define SOL_STRINGS_ARE_NUMBERS_I_ SOL_OFF
-	#endif
-#else
-	#define SOL_STRINGS_ARE_NUMBERS_I_ SOL_DEFAULT_OFF
-#endif
-
-#if defined(SOL_ENABLE_INTEROP) && (SOL_ENABLE_INTEROP != 0) \
-    || defined(SOL_USE_INTEROP) && (SOL_USE_INTEROP != 0)
-	#define SOL_USE_INTEROP_I_ SOL_ON
-#else
-	#define SOL_USE_INTEROP_I_ SOL_DEFAULT_OFF
-#endif
-
-#if defined(SOL_NO_NIL)
-	#if (SOL_NO_NIL != 0)
-		#define SOL_NIL_I_ SOL_OFF
-	#else
-		#define SOL_NIL_I_ SOL_ON
-	#endif
-#elif defined(__MAC_OS_X_VERSION_MAX_ALLOWED) || defined(__OBJC__) || defined(nil)
-	#define SOL_NIL_I_ SOL_DEFAULT_OFF
-#else
-	#define SOL_NIL_I_ SOL_DEFAULT_ON
-#endif
-
-#if defined(SOL_USERTYPE_TYPE_BINDING_INFO)
-	#if (SOL_USERTYPE_TYPE_BINDING_INFO != 0)
-		#define SOL_USERTYPE_TYPE_BINDING_INFO_I_ SOL_ON
-	#else
-		#define SOL_USERTYPE_TYPE_BINDING_INFO_I_ SOL_OFF
-	#endif
-#else
-	#define SOL_USERTYPE_TYPE_BINDING_INFO_I_ SOL_DEFAULT_ON
-#endif // We should generate a my_type.__type table with lots of class information for usertypes
-
-#if defined(SOL_AUTOMAGICAL_TYPES_BY_DEFAULT)
-	#if (SOL_AUTOMAGICAL_TYPES_BY_DEFAULT != 0)
-		#define SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_ SOL_ON
-	#else
-		#define SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_ SOL_OFF
-	#endif
-#elif defined(SOL_DEFAULT_AUTOMAGICAL_USERTYPES)
-	#if (SOL_DEFAULT_AUTOMAGICAL_USERTYPES != 0)
-		#define SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_ SOL_ON
-	#else
-		#define SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_ SOL_OFF
-	#endif
-#else
-	#define SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_ SOL_DEFAULT_ON
-#endif // make is_automagical on/off by default
-
-#if defined(SOL_STD_VARIANT)
-	#if (SOL_STD_VARIANT != 0)
-		#define SOL_STD_VARIANT_I_ SOL_ON
-	#else
-		#define SOL_STD_VARIANT_I_ SOL_OFF
-	#endif
-#else
-	#if SOL_IS_ON(SOL_COMPILER_CLANG_I_) && SOL_IS_ON(SOL_PLATFORM_APPLE_I_)
-		#if defined(__has_include)
-			#if __has_include(<variant>)
-				#define SOL_STD_VARIANT_I_ SOL_ON
-			#else
-				#define SOL_STD_VARIANT_I_ SOL_OFF
-			#endif
-		#else
-			#define SOL_STD_VARIANT_I_ SOL_OFF
-		#endif
-	#else
-		#define SOL_STD_VARIANT_I_ SOL_DEFAULT_ON
-	#endif
-#endif // make is_automagical on/off by default
-
-#if defined(SOL_NOEXCEPT_FUNCTION_TYPE)
-	#if (SOL_NOEXCEPT_FUNCTION_TYPE != 0)
-		#define SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_ SOL_ON
-	#else
-		#define SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_ SOL_OFF
-	#endif
-#else
-	#if defined(__cpp_noexcept_function_type)
-		#define SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_ SOL_ON
-	#elif SOL_IS_ON(SOL_COMPILER_VCXX_I_) && (defined(_MSVC_LANG) && (_MSVC_LANG < 201403L))
-		// There is a bug in the VC++ compiler??
-		// on /std:c++latest under x86 conditions (VS 15.5.2),
-		// compiler errors are tossed for noexcept markings being on function types
-		// that are identical in every other way to their non-noexcept marked types function types...
-		// VS 2019: There is absolutely a bug.
-		#define SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_ SOL_OFF
-	#else
-		#define SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_ SOL_DEFAULT_ON
-	#endif
-#endif // noexcept is part of a function's type
-
-#if defined(SOL_STACK_STRING_OPTIMIZATION_SIZE) && SOL_STACK_STRING_OPTIMIZATION_SIZE > 0
-	#define SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_ SOL_STACK_STRING_OPTIMIZATION_SIZE
-#else
-	#define SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_ 1024
-#endif
-
-#if defined(SOL_ID_SIZE) && SOL_ID_SIZE > 0
-	#define SOL_ID_SIZE_I_ SOL_ID_SIZE
-#else
-	#define SOL_ID_SIZE_I_ 512
-#endif
-
-#if defined(LUA_IDSIZE) && LUA_IDSIZE > 0
-	#define SOL_FILE_ID_SIZE_I_ LUA_IDSIZE
-#elif defined(SOL_ID_SIZE) && SOL_ID_SIZE > 0
-	#define SOL_FILE_ID_SIZE_I_ SOL_FILE_ID_SIZE
-#else
-	#define SOL_FILE_ID_SIZE_I_ 2048
-#endif
-
-#if defined(SOL_PRINT_ERRORS)
-	#if (SOL_PRINT_ERRORS != 0)
-		#define SOL_PRINT_ERRORS_I_ SOL_ON
-	#else
-		#define SOL_PRINT_ERRORS_I_ SOL_OFF
-	#endif
-#else
-	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON_I_)
-		#define SOL_PRINT_ERRORS_I_ SOL_ON
-	#elif SOL_IS_ON(SOL_DEBUG_BUILD_I_)
-		#define SOL_PRINT_ERRORS_I_ SOL_DEFAULT_ON
-	#else
-		#define SOL_PRINT_ERRORS_I_ SOL_OFF
-	#endif
-#endif
-
-#if defined(SOL_DEFAULT_PASS_ON_ERROR) && (SOL_DEFAULT_PASS_ON_ERROR != 0)
-	#define SOL_DEFAULT_PASS_ON_ERROR_I_ SOL_ON
-#else
-	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON_I_)
-		#define SOL_DEFAULT_PASS_ON_ERROR_I_ SOL_ON
-	#elif SOL_IS_ON(SOL_DEBUG_BUILD_I_)
-		#define SOL_DEFAULT_PASS_ON_ERROR_I_ SOL_DEFAULT_ON
-	#else
-		#define SOL_DEFAULT_PASS_ON_ERROR_I_ SOL_OFF
-	#endif
-#endif
-
-#if defined(SOL_USING_CXX_LUA)
-	#if (SOL_USING_CXX_LUA != 0)
-		#define SOL_USE_CXX_LUA_I_ SOL_ON
-	#else
-		#define SOL_USE_CXX_LUA_I_ SOL_OFF
-	#endif
-#elif defined(SOL_USE_CXX_LUA)
-	#if (SOL_USE_CXX_LUA != 0)
-		#define SOL_USE_CXX_LUA_I_ SOL_ON
-	#else
-		#define SOL_USE_CXX_LUA_I_ SOL_OFF
-	#endif
-#else
-	#define SOL_USE_CXX_LUA_I_ SOL_OFF
-#endif
-
-#if defined(SOL_USING_CXX_LUAJIT)
-	#if (SOL_USING_CXX_LUA != 0)
-		#define SOL_USE_CXX_LUAJIT_I_ SOL_ON
-	#else
-		#define SOL_USE_CXX_LUAJIT_I_ SOL_OFF
-	#endif
-#elif defined(SOL_USE_CXX_LUAJIT)
-	#if (SOL_USE_CXX_LUA != 0)
-		#define SOL_USE_CXX_LUAJIT_I_ SOL_ON
-	#else
-		#define SOL_USE_CXX_LUAJIT_I_ SOL_OFF
-	#endif
-#else
-	#define SOL_USE_CXX_LUAJIT_I_ SOL_OFF
-#endif
-
-#if defined(SOL_NO_LUA_HPP)
-	#if (SOL_NO_LUA_HPP != 0)
-		#define SOL_USE_LUA_HPP_I_ SOL_OFF
-	#else
-		#define SOL_USE_LUA_HPP_I_ SOL_ON
-	#endif
-#elif defined(SOL_USING_CXX_LUA)
-	#define SOL_USE_LUA_HPP_I_ SOL_OFF
-#elif defined(__has_include)
-	#if __has_include(<lua.hpp>)
-		#define SOL_USE_LUA_HPP_I_ SOL_ON
-	#else
-		#define SOL_USE_LUA_HPP_I_ SOL_OFF
-	#endif
-#else
-	#define SOL_USE_LUA_HPP_I_ SOL_DEFAULT_ON
-#endif
-
-#if defined(SOL_CONTAINERS_START)
-	#define SOL_CONTAINER_START_INDEX_I_ SOL_CONTAINERS_START
-#elif defined(SOL_CONTAINERS_START_INDEX)
-	#define SOL_CONTAINER_START_INDEX_I_ SOL_CONTAINERS_START_INDEX
-#elif defined(SOL_CONTAINER_START_INDEX)
-	#define SOL_CONTAINER_START_INDEX_I_ SOL_CONTAINER_START_INDEX
-#else
-	#define SOL_CONTAINER_START_INDEX_I_ 1
-#endif
-
-#if defined (SOL_NO_MEMORY_ALIGNMENT)
-	#if (SOL_NO_MEMORY_ALIGNMENT != 0)
-		#define SOL_ALIGN_MEMORY_I_ SOL_OFF
-	#else
-		#define SOL_ALIGN_MEMORY_I_ SOL_ON
-	#endif
-#else
-	#define SOL_ALIGN_MEMORY_I_ SOL_DEFAULT_ON
-#endif
-
-#if defined(SOL_USE_BOOST)
-	#if (SOL_USE_BOOST != 0)
-		#define SOL_USE_BOOST_I_ SOL_ON
-	#else
-		#define SOL_USE_BOOST_I_ SOL_OFF
-	#endif
-#else
-		#define SOL_USE_BOOST_I_ SOL_OFF
-#endif
-
-#if defined(SOL_USE_UNSAFE_BASE_LOOKUP)
-	#if (SOL_USE_UNSAFE_BASE_LOOKUP != 0)
-		#define SOL_USE_UNSAFE_BASE_LOOKUP_I_ SOL_ON
-	#else
-		#define SOL_USE_UNSAFE_BASE_LOOKUP_I_ SOL_OFF
-	#endif
-#else
-	#define SOL_USE_UNSAFE_BASE_LOOKUP_I_ SOL_OFF
-#endif
-
-#if defined(SOL_INSIDE_UNREAL)
-	#if (SOL_INSIDE_UNREAL != 0)
-		#define SOL_INSIDE_UNREAL_ENGINE_I_ SOL_ON
-	#else
-		#define SOL_INSIDE_UNREAL_ENGINE_I_ SOL_OFF
-	#endif
-#else
-	#if defined(UE_BUILD_DEBUG) || defined(UE_BUILD_DEVELOPMENT) || defined(UE_BUILD_TEST) || defined(UE_BUILD_SHIPPING) || defined(UE_SERVER)
-		#define SOL_INSIDE_UNREAL_ENGINE_I_ SOL_ON
-	#else
-		#define SOL_INSIDE_UNREAL_ENGINE_I_ SOL_DEFAULT_OFF
-	#endif
-#endif
-
-#if defined(SOL_NO_COMPAT)
-	#if (SOL_NO_COMPAT != 0)
-		#define SOL_USE_COMPATIBILITY_LAYER_I_ SOL_OFF
-	#else
-		#define SOL_USE_COMPATIBILITY_LAYER_I_ SOL_ON
-	#endif
-#else
-	#define SOL_USE_COMPATIBILITY_LAYER_I_ SOL_DEFAULT_ON
-#endif
-
-#if defined(SOL_GET_FUNCTION_POINTER_UNSAFE)
-	#if (SOL_GET_FUNCTION_POINTER_UNSAFE != 0)
-		#define SOL_GET_FUNCTION_POINTER_UNSAFE_I_ SOL_ON
-	#else
-		#define SOL_GET_FUNCTION_POINTER_UNSAFE_I_ SOL_OFF
-	#endif
-#else
-	#define SOL_GET_FUNCTION_POINTER_UNSAFE_I_ SOL_DEFAULT_OFF
-#endif
-
-#if SOL_IS_ON(SOL_COMPILER_FRONTEND_MINGW_I_) && defined(__GNUC__) && (__GNUC__ < 6)
-	// MinGW is off its rocker in some places...
-	#define SOL_MINGW_CCTYPE_IS_POISONED_I_ SOL_ON
-#else
-	#define SOL_MINGW_CCTYPE_IS_POISONED_I_ SOL_DEFAULT_OFF
-#endif
-
-// end of sol/version.hpp
-
-#if SOL_IS_ON(SOL_INSIDE_UNREAL_ENGINE_I_)
-#ifdef check
-#pragma push_macro("check")
-#undef check
-#endif
-#endif // Unreal Engine 4 Bullshit
-
-#if SOL_IS_ON(SOL_COMPILER_GCC_I_)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow"
-#pragma GCC diagnostic ignored "-Wconversion"
-#if __GNUC__ > 6
-#pragma GCC diagnostic ignored "-Wnoexcept-type"
-#endif
-#elif SOL_IS_ON(SOL_COMPILER_CLANG_I_)
-#elif SOL_IS_ON(SOL_COMPILER_VCXX_I_)
-#pragma warning(push)
-#pragma warning(disable : 4505) // unreferenced local function has been removed GEE THANKS
-#endif                          // clang++ vs. g++ vs. VC++
-
-// beginning of sol/forward.hpp
-
-#ifndef SOL_FORWARD_HPP
-#define SOL_FORWARD_HPP
-
-#include <utility>
-#include <type_traits>
-#include <string_view>
-
-#if SOL_IS_ON(SOL_USE_CXX_LUA_I_) || SOL_IS_ON(SOL_USE_CXX_LUAJIT_I_)
-struct lua_State;
-#else
-extern "C" {
-struct lua_State;
-}
-#endif // C++ Mangling for Lua vs. Not
-
-namespace sol {
-
-	enum class type;
-
-	class stateless_reference;
-	template <bool b>
-	class basic_reference;
-	using reference = basic_reference<false>;
-	using main_reference = basic_reference<true>;
-	class stateless_stack_reference;
-	class stack_reference;
-
-	template <typename A>
-	class basic_bytecode;
-
-	struct lua_value;
-
-	struct proxy_base_tag;
-	template <typename>
-	struct proxy_base;
-	template <typename, typename>
-	struct table_proxy;
-
-	template <bool, typename>
-	class basic_table_core;
-	template <bool b>
-	using table_core = basic_table_core<b, reference>;
-	template <bool b>
-	using main_table_core = basic_table_core<b, main_reference>;
-	template <bool b>
-	using stack_table_core = basic_table_core<b, stack_reference>;
-	template <typename base_type>
-	using basic_table = basic_table_core<false, base_type>;
-	using table = table_core<false>;
-	using global_table = table_core<true>;
-	using main_table = main_table_core<false>;
-	using main_global_table = main_table_core<true>;
-	using stack_table = stack_table_core<false>;
-	using stack_global_table = stack_table_core<true>;
-
-	template <typename>
-	struct basic_lua_table;
-	using lua_table = basic_lua_table<reference>;
-	using stack_lua_table = basic_lua_table<stack_reference>;
-
-	template <typename T, typename base_type>
-	class basic_usertype;
-	template <typename T>
-	using usertype = basic_usertype<T, reference>;
-	template <typename T>
-	using stack_usertype = basic_usertype<T, stack_reference>;
-
-	template <typename base_type>
-	class basic_metatable;
-	using metatable = basic_metatable<reference>;
-	using stack_metatable = basic_metatable<stack_reference>;
-
-	template <typename base_t>
-	struct basic_environment;
-	using environment = basic_environment<reference>;
-	using main_environment = basic_environment<main_reference>;
-	using stack_environment = basic_environment<stack_reference>;
-
-	template <typename T, bool>
-	class basic_function;
-	template <typename T, bool, typename H>
-	class basic_protected_function;
-	using unsafe_function = basic_function<reference, false>;
-	using safe_function = basic_protected_function<reference, false, reference>;
-	using main_unsafe_function = basic_function<main_reference, false>;
-	using main_safe_function = basic_protected_function<main_reference, false, reference>;
-	using stack_unsafe_function = basic_function<stack_reference, false>;
-	using stack_safe_function = basic_protected_function<stack_reference, false, reference>;
-	using stack_aligned_unsafe_function = basic_function<stack_reference, true>;
-	using stack_aligned_safe_function = basic_protected_function<stack_reference, true, reference>;
-	using protected_function = safe_function;
-	using main_protected_function = main_safe_function;
-	using stack_protected_function = stack_safe_function;
-	using stack_aligned_protected_function = stack_aligned_safe_function;
-#if SOL_IS_ON(SOL_SAFE_FUNCTION_OBJECTS_I_)
-	using function = protected_function;
-	using main_function = main_protected_function;
-	using stack_function = stack_protected_function;
-	using stack_aligned_function = stack_aligned_safe_function;
-#else
-	using function = unsafe_function;
-	using main_function = main_unsafe_function;
-	using stack_function = stack_unsafe_function;
-	using stack_aligned_function = stack_aligned_unsafe_function;
-#endif
-	using stack_aligned_stack_handler_function = basic_protected_function<stack_reference, true, stack_reference>;
-
-	struct unsafe_function_result;
-	struct protected_function_result;
-	using safe_function_result = protected_function_result;
-#if SOL_IS_ON(SOL_SAFE_FUNCTION_OBJECTS_I_)
-	using function_result = safe_function_result;
-#else
-	using function_result = unsafe_function_result;
-#endif
-
-	template <typename base_t>
-	class basic_object_base;
-	template <typename base_t>
-	class basic_object;
-	template <typename base_t>
-	class basic_userdata;
-	template <typename base_t>
-	class basic_lightuserdata;
-	template <typename base_t>
-	class basic_coroutine;
-	template <typename base_t>
-	class basic_thread;
-
-	using object = basic_object<reference>;
-	using userdata = basic_userdata<reference>;
-	using lightuserdata = basic_lightuserdata<reference>;
-	using thread = basic_thread<reference>;
-	using coroutine = basic_coroutine<reference>;
-	using main_object = basic_object<main_reference>;
-	using main_userdata = basic_userdata<main_reference>;
-	using main_lightuserdata = basic_lightuserdata<main_reference>;
-	using main_coroutine = basic_coroutine<main_reference>;
-	using stack_object = basic_object<stack_reference>;
-	using stack_userdata = basic_userdata<stack_reference>;
-	using stack_lightuserdata = basic_lightuserdata<stack_reference>;
-	using stack_thread = basic_thread<stack_reference>;
-	using stack_coroutine = basic_coroutine<stack_reference>;
-
-	struct stack_proxy_base;
-	struct stack_proxy;
-	struct variadic_args;
-	struct variadic_results;
-	struct stack_count;
-	struct this_state;
-	struct this_main_state;
-	struct this_environment;
-
-	class state_view;
-	class state;
-
-	template <typename T>
-	struct as_table_t;
-	template <typename T>
-	struct as_container_t;
-	template <typename T>
-	struct nested;
-	template <typename T>
-	struct light;
-	template <typename T>
-	struct user;
-	template <typename T>
-	struct as_args_t;
-	template <typename T>
-	struct protect_t;
-	template <typename F, typename... Policies>
-	struct policy_wrapper;
-
-	template <typename T>
-	struct usertype_traits;
-	template <typename T>
-	struct unique_usertype_traits;
-
-	template <typename... Args>
-	struct types {
-		typedef std::make_index_sequence<sizeof...(Args)> indices;
-		static constexpr std::size_t size() {
-			return sizeof...(Args);
-		}
-	};
-
-	template <typename T>
-	struct derive : std::false_type {
-		typedef types<> type;
-	};
-
-	template <typename T>
-	struct base : std::false_type {
-		typedef types<> type;
-	};
-
-	template <typename T>
-	struct weak_derive {
-		static bool value;
-	};
-
-	template <typename T>
-	bool weak_derive<T>::value = false;
-
-	namespace stack {
-		struct record;
-	}
-
-#if SOL_IS_OFF(SOL_USE_BOOST_I_)
-	template <class T>
-	class optional;
-
-	template <class T>
-	class optional<T&>;
-#endif
-
-	using check_handler_type = int(lua_State*, int, type, type, const char*);
-
-} // namespace sol
-
-#define SOL_BASE_CLASSES(T, ...)                       \
-	namespace sol {                                   \
-		template <>                                  \
-		struct base<T> : std::true_type {            \
-			typedef ::sol::types<__VA_ARGS__> type; \
-		};                                           \
-	}                                                 \
-	void a_sol3_detail_function_decl_please_no_collide()
-#define SOL_DERIVED_CLASSES(T, ...)                    \
-	namespace sol {                                   \
-		template <>                                  \
-		struct derive<T> : std::true_type {          \
-			typedef ::sol::types<__VA_ARGS__> type; \
-		};                                           \
-	}                                                 \
-	void a_sol3_detail_function_decl_please_no_collide()
-
-#endif // SOL_FORWARD_HPP
-// end of sol/forward.hpp
-
-// beginning of sol/forward_detail.hpp
-
-#ifndef SOL_FORWARD_DETAIL_HPP
-#define SOL_FORWARD_DETAIL_HPP
-
-// beginning of sol/traits.hpp
-
-// beginning of sol/tuple.hpp
-
-// beginning of sol/base_traits.hpp
-
-#include <type_traits>
-
-namespace sol {
-	namespace detail {
-		struct unchecked_t {};
-		const unchecked_t unchecked = unchecked_t{};
-	} // namespace detail
-
-	namespace meta {
-		using sfinae_yes_t = std::true_type;
-		using sfinae_no_t = std::false_type;
-
-		template <typename T>
-		using void_t = void;
-
-		template <typename T>
-		using unqualified = std::remove_cv<std::remove_reference_t<T>>;
-
-		template <typename T>
-		using unqualified_t = typename unqualified<T>::type;
-
-		namespace meta_detail {
-			template <typename T>
-			struct unqualified_non_alias : unqualified<T> {};
-
-			template <template <class...> class Test, class, class... Args>
-			struct is_detected : std::false_type {};
-
-			template <template <class...> class Test, class... Args>
-			struct is_detected<Test, void_t<Test<Args...>>, Args...> : std::true_type {};
-		} // namespace meta_detail
-
-		template <template <class...> class Trait, class... Args>
-		using is_detected = typename meta_detail::is_detected<Trait, void, Args...>::type;
-
-		template <template <class...> class Trait, class... Args>
-		constexpr inline bool is_detected_v = is_detected<Trait, Args...>::value;
-
-		template <std::size_t I>
-		using index_value = std::integral_constant<std::size_t, I>;
-
-		template <bool>
-		struct conditional {
-			template <typename T, typename U>
-			using type = T;
-		};
-
-		template <>
-		struct conditional<false> {
-			template <typename T, typename U>
-			using type = U;
-		};
-
-		template <bool B, typename T, typename U>
-		using conditional_t = typename conditional<B>::template type<T, U>;
-
-		namespace meta_detail {
-			template <typename T, template <typename...> class Templ>
-			struct is_specialization_of : std::false_type {};
-			template <typename... T, template <typename...> class Templ>
-			struct is_specialization_of<Templ<T...>, Templ> : std::true_type {};
-		} // namespace meta_detail
-
-		template <typename T, template <typename...> class Templ>
-		using is_specialization_of = meta_detail::is_specialization_of<std::remove_cv_t<T>, Templ>;
-
-		template <typename T, template <typename...> class Templ>
-		inline constexpr bool is_specialization_of_v = is_specialization_of<std::remove_cv_t<T>, Templ>::value;
-
-		template <typename T>
-		struct identity {
-			typedef T type;
-		};
-
-		template <typename T>
-		using identity_t = typename identity<T>::type;
-
-		template <typename T>
-		using is_builtin_type = std::integral_constant<bool, std::is_arithmetic<T>::value || std::is_pointer<T>::value || std::is_array<T>::value>;
-
-	} // namespace meta
-} // namespace sol
-
-// end of sol/base_traits.hpp
-
-#include <tuple>
-#include <cstddef>
-
-namespace sol {
-	namespace detail {
-		using swallow = std::initializer_list<int>;
-	} // namespace detail
-
-	namespace meta {
-		template <typename T>
-		using is_tuple = is_specialization_of<T, std::tuple>;
-
-		template <typename T>
-		constexpr inline bool is_tuple_v = is_tuple<T>::value;
-
-		namespace detail {
-			template <typename... Args>
-			struct tuple_types_ { typedef types<Args...> type; };
-
-			template <typename... Args>
-			struct tuple_types_<std::tuple<Args...>> { typedef types<Args...> type; };
-		} // namespace detail
-
-		template <typename... Args>
-		using tuple_types = typename detail::tuple_types_<Args...>::type;
-
-		template <typename Arg>
-		struct pop_front_type;
-
-		template <typename Arg>
-		using pop_front_type_t = typename pop_front_type<Arg>::type;
-
-		template <typename... Args>
-		struct pop_front_type<types<Args...>> {
-			typedef void front_type;
-			typedef types<Args...> type;
-		};
-
-		template <typename Arg, typename... Args>
-		struct pop_front_type<types<Arg, Args...>> {
-			typedef Arg front_type;
-			typedef types<Args...> type;
-		};
-
-		template <std::size_t N, typename Tuple>
-		using tuple_element = std::tuple_element<N, std::remove_reference_t<Tuple>>;
-
-		template <std::size_t N, typename Tuple>
-		using tuple_element_t = std::tuple_element_t<N, std::remove_reference_t<Tuple>>;
-
-		template <std::size_t N, typename Tuple>
-		using unqualified_tuple_element = unqualified<tuple_element_t<N, Tuple>>;
-
-		template <std::size_t N, typename Tuple>
-		using unqualified_tuple_element_t = unqualified_t<tuple_element_t<N, Tuple>>;
-
-	} // namespace meta
-} // namespace sol
-
-// end of sol/tuple.hpp
-
-// beginning of sol/bind_traits.hpp
-
-namespace sol { namespace meta {
-	namespace meta_detail {
-
-		template <class F>
-		struct check_deducible_signature {
-			struct nat {};
-			template <class G>
-			static auto test(int) -> decltype(&G::operator(), void());
-			template <class>
-			static auto test(...) -> nat;
-
-			using type = std::is_void<decltype(test<F>(0))>;
-		};
-	} // namespace meta_detail
-
-	template <class F>
-	struct has_deducible_signature : meta_detail::check_deducible_signature<F>::type {};
-
-	namespace meta_detail {
-
-		template <std::size_t I, typename T>
-		struct void_tuple_element : meta::tuple_element<I, T> {};
-
-		template <std::size_t I>
-		struct void_tuple_element<I, std::tuple<>> {
-			typedef void type;
-		};
-
-		template <std::size_t I, typename T>
-		using void_tuple_element_t = typename void_tuple_element<I, T>::type;
-
-		template <bool it_is_noexcept, bool has_c_variadic, typename T, typename R, typename... Args>
-		struct basic_traits {
-		private:
-			using first_type = meta::conditional_t<std::is_void<T>::value, int, T>&;
-
-		public:
-			inline static constexpr const bool is_noexcept = it_is_noexcept;
-			inline static constexpr bool is_member_function = std::is_void<T>::value;
-			inline static constexpr bool has_c_var_arg = has_c_variadic;
-			inline static constexpr std::size_t arity = sizeof...(Args);
-			inline static constexpr std::size_t free_arity = sizeof...(Args) + static_cast<std::size_t>(!std::is_void<T>::value);
-			typedef types<Args...> args_list;
-			typedef std::tuple<Args...> args_tuple;
-			typedef T object_type;
-			typedef R return_type;
-			typedef tuple_types<R> returns_list;
-			typedef R(function_type)(Args...);
-			typedef meta::conditional_t<std::is_void<T>::value, args_list, types<first_type, Args...>> free_args_list;
-			typedef meta::conditional_t<std::is_void<T>::value, R(Args...), R(first_type, Args...)> free_function_type;
-			typedef meta::conditional_t<std::is_void<T>::value, R (*)(Args...), R (*)(first_type, Args...)> free_function_pointer_type;
-			typedef std::remove_pointer_t<free_function_pointer_type> signature_type;
-			template <std::size_t i>
-			using arg_at = void_tuple_element_t<i, args_tuple>;
-		};
-
-		template <typename Signature, bool b = has_deducible_signature<Signature>::value>
-		struct fx_traits : basic_traits<false, false, void, void> {};
-
-		// Free Functions
-		template <typename R, typename... Args>
-		struct fx_traits<R(Args...), false> : basic_traits<false, false, void, R, Args...> {
-			typedef R (*function_pointer_type)(Args...);
-		};
-
-		template <typename R, typename... Args>
-		struct fx_traits<R (*)(Args...), false> : basic_traits<false, false, void, R, Args...> {
-			typedef R (*function_pointer_type)(Args...);
-		};
-
-		template <typename R, typename... Args>
-		struct fx_traits<R(Args..., ...), false> : basic_traits<false, true, void, R, Args...> {
-			typedef R (*function_pointer_type)(Args..., ...);
-		};
-
-		template <typename R, typename... Args>
-		struct fx_traits<R (*)(Args..., ...), false> : basic_traits<false, true, void, R, Args...> {
-			typedef R (*function_pointer_type)(Args..., ...);
-		};
-
-		// Member Functions
-		/* C-Style Variadics */
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args...), false> : basic_traits<false, false, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args...);
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args..., ...), false> : basic_traits<false, true, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args..., ...);
-		};
-
-		/* Const Volatile */
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args...) const, false> : basic_traits<false, false, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args...) const;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args..., ...) const, false> : basic_traits<false, true, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args..., ...) const;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args...) const volatile, false> : basic_traits<false, false, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args...) const volatile;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args..., ...) const volatile, false> : basic_traits<false, true, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args..., ...) const volatile;
-		};
-
-		/* Member Function Qualifiers */
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args...)&, false> : basic_traits<false, false, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args...) &;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args..., ...)&, false> : basic_traits<false, true, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args..., ...) &;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args...) const&, false> : basic_traits<false, false, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args...) const&;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args..., ...) const&, false> : basic_traits<false, true, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args..., ...) const&;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args...) const volatile&, false> : basic_traits<false, false, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args...) const volatile&;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args..., ...) const volatile&, false> : basic_traits<false, true, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args..., ...) const volatile&;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args...)&&, false> : basic_traits<false, false, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args...) &&;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args..., ...)&&, false> : basic_traits<false, true, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args..., ...) &&;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args...) const&&, false> : basic_traits<false, false, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args...) const&&;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args..., ...) const&&, false> : basic_traits<false, true, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args..., ...) const&&;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args...) const volatile&&, false> : basic_traits<false, false, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args...) const volatile&&;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args..., ...) const volatile&&, false> : basic_traits<false, true, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args..., ...) const volatile&&;
-		};
-
-#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_)
-
-		template <typename R, typename... Args>
-		struct fx_traits<R(Args...) noexcept, false> : basic_traits<true, false, void, R, Args...> {
-			typedef R (*function_pointer_type)(Args...) noexcept;
-		};
-
-		template <typename R, typename... Args>
-		struct fx_traits<R (*)(Args...) noexcept, false> : basic_traits<true, false, void, R, Args...> {
-			typedef R (*function_pointer_type)(Args...) noexcept;
-		};
-
-		template <typename R, typename... Args>
-		struct fx_traits<R(Args..., ...) noexcept, false> : basic_traits<true, true, void, R, Args...> {
-			typedef R (*function_pointer_type)(Args..., ...) noexcept;
-		};
-
-		template <typename R, typename... Args>
-		struct fx_traits<R (*)(Args..., ...) noexcept, false> : basic_traits<true, true, void, R, Args...> {
-			typedef R (*function_pointer_type)(Args..., ...) noexcept;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args...) noexcept, false> : basic_traits<true, false, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args...) noexcept;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args..., ...) noexcept, false> : basic_traits<true, true, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args..., ...) noexcept;
-		};
-
-		/* Const Volatile */
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args...) const noexcept, false> : basic_traits<true, false, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args...) const noexcept;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args..., ...) const noexcept, false> : basic_traits<true, true, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args..., ...) const noexcept;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args...) const volatile noexcept, false> : basic_traits<true, false, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args...) const volatile noexcept;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args..., ...) const volatile noexcept, false> : basic_traits<true, true, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args..., ...) const volatile noexcept;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args...) & noexcept, false> : basic_traits<true, false, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args...) & noexcept;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args..., ...) & noexcept, false> : basic_traits<true, true, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args..., ...) & noexcept;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args...) const& noexcept, false> : basic_traits<true, false, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args...) const& noexcept;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args..., ...) const& noexcept, false> : basic_traits<true, true, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args..., ...) const& noexcept;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args...) const volatile& noexcept, false> : basic_traits<true, false, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args...) const volatile& noexcept;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args..., ...) const volatile& noexcept, false> : basic_traits<true, true, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args..., ...) const volatile& noexcept;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args...) && noexcept, false> : basic_traits<true, false, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args...) && noexcept;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args..., ...) && noexcept, false> : basic_traits<true, true, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args..., ...) && noexcept;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args...) const&& noexcept, false> : basic_traits<true, false, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args...) const&& noexcept;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args..., ...) const&& noexcept, false> : basic_traits<true, true, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args..., ...) const&& noexcept;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args...) const volatile&& noexcept, false> : basic_traits<true, false, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args...) const volatile&& noexcept;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (T::*)(Args..., ...) const volatile&& noexcept, false> : basic_traits<true, true, T, R, Args...> {
-			typedef R (T::*function_pointer_type)(Args..., ...) const volatile&& noexcept;
-		};
-
-#endif // noexcept is part of a function's type
-
-#if SOL_IS_ON(SOL_COMPILER_VCXX_I_) && SOL_IS_ON(SOL_PLATFORM_X86_I_)
-		template <typename R, typename... Args>
-		struct fx_traits<R __stdcall(Args...), false> : basic_traits<false, false, void, R, Args...> {
-			typedef R(__stdcall* function_pointer_type)(Args...);
-		};
-
-		template <typename R, typename... Args>
-		struct fx_traits<R(__stdcall*)(Args...), false> : basic_traits<false, false, void, R, Args...> {
-			typedef R(__stdcall* function_pointer_type)(Args...);
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (__stdcall T::*)(Args...), false> : basic_traits<false, false, T, R, Args...> {
-			typedef R (__stdcall T::*function_pointer_type)(Args...);
-		};
-
-		/* Const Volatile */
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (__stdcall T::*)(Args...) const, false> : basic_traits<false, false, T, R, Args...> {
-			typedef R (__stdcall T::*function_pointer_type)(Args...) const;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (__stdcall T::*)(Args...) const volatile, false> : basic_traits<false, false, T, R, Args...> {
-			typedef R (__stdcall T::*function_pointer_type)(Args...) const volatile;
-		};
-
-		/* Member Function Qualifiers */
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (__stdcall T::*)(Args...)&, false> : basic_traits<false, false, T, R, Args...> {
-			typedef R (__stdcall T::*function_pointer_type)(Args...) &;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (__stdcall T::*)(Args...) const&, false> : basic_traits<false, false, T, R, Args...> {
-			typedef R (__stdcall T::*function_pointer_type)(Args...) const&;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (__stdcall T::*)(Args...) const volatile&, false> : basic_traits<false, false, T, R, Args...> {
-			typedef R (__stdcall T::*function_pointer_type)(Args...) const volatile&;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (__stdcall T::*)(Args...)&&, false> : basic_traits<false, false, T, R, Args...> {
-			typedef R (__stdcall T::*function_pointer_type)(Args...) &&;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (__stdcall T::*)(Args...) const&&, false> : basic_traits<false, false, T, R, Args...> {
-			typedef R (__stdcall T::*function_pointer_type)(Args...) const&&;
-		};
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (__stdcall T::*)(Args...) const volatile&&, false> : basic_traits<false, false, T, R, Args...> {
-			typedef R (__stdcall T::*function_pointer_type)(Args...) const volatile&&;
-		};
-
-#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_)
-
-		template <typename R, typename... Args>
-		struct fx_traits<R __stdcall(Args...) noexcept, false> : basic_traits<true, false, void, R, Args...> {
-			typedef R(__stdcall* function_pointer_type)(Args...) noexcept;
-		};
-
-		template <typename R, typename... Args>
-		struct fx_traits<R(__stdcall*)(Args...) noexcept, false> : basic_traits<true, false, void, R, Args...> {
-			typedef R(__stdcall* function_pointer_type)(Args...) noexcept;
-		};
-
-		/* __stdcall cannot be applied to functions with varargs*/
-		/*template <typename R, typename... Args>
-		struct fx_traits<__stdcall R(Args..., ...) noexcept, false> : basic_traits<true, true, void, R, Args...> {
-			typedef R(__stdcall* function_pointer_type)(Args..., ...) noexcept;
-		};
-
-		template <typename R, typename... Args>
-		struct fx_traits<R (__stdcall *)(Args..., ...) noexcept, false> : basic_traits<true, true, void, R, Args...> {
-			typedef R(__stdcall* function_pointer_type)(Args..., ...) noexcept;
-		};*/
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (__stdcall T::*)(Args...) noexcept, false> : basic_traits<true, false, T, R, Args...> {
-			typedef R (__stdcall T::*function_pointer_type)(Args...) noexcept;
-		};
-
-		/* __stdcall does not work with varargs */
-		/*template <typename T, typename R, typename... Args>
-		struct fx_traits<R (__stdcall T::*)(Args..., ...) noexcept, false> : basic_traits<true, true, T, R, Args...> {
-			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) noexcept;
-		};*/
-
-		/* Const Volatile */
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (__stdcall T::*)(Args...) const noexcept, false> : basic_traits<true, false, T, R, Args...> {
-			typedef R (__stdcall T::*function_pointer_type)(Args...) const noexcept;
-		};
-
-		/* __stdcall does not work with varargs */
-		/*template <typename T, typename R, typename... Args>
-		struct fx_traits<R (__stdcall T::*)(Args..., ...) const noexcept, false> : basic_traits<true, true, T, R, Args...> {
-			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) const noexcept;
-		};*/
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (__stdcall T::*)(Args...) const volatile noexcept, false> : basic_traits<true, false, T, R, Args...> {
-			typedef R (__stdcall T::*function_pointer_type)(Args...) const volatile noexcept;
-		};
-
-		/* __stdcall does not work with varargs */
-		/*template <typename T, typename R, typename... Args>
-		struct fx_traits<R (__stdcall T::*)(Args..., ...) const volatile noexcept, false> : basic_traits<true, true, T, R, Args...> {
-			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) const volatile noexcept;
-		};*/
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (__stdcall T::*)(Args...) & noexcept, false> : basic_traits<true, false, T, R, Args...> {
-			typedef R (__stdcall T::*function_pointer_type)(Args...) & noexcept;
-		};
-
-		/* __stdcall does not work with varargs */
-		/*template <typename T, typename R, typename... Args>
-		struct fx_traits<R (__stdcall T::*)(Args..., ...) & noexcept, false> : basic_traits<true, true, T, R, Args...> {
-			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) & noexcept;
-		};*/
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (__stdcall T::*)(Args...) const& noexcept, false> : basic_traits<true, false, T, R, Args...> {
-			typedef R (__stdcall T::*function_pointer_type)(Args...) const& noexcept;
-		};
-
-		/* __stdcall does not work with varargs */
-		/*template <typename T, typename R, typename... Args>
-		struct fx_traits<R (__stdcall T::*)(Args..., ...) const& noexcept, false> : basic_traits<true, true, T, R, Args...> {
-			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) const& noexcept;
-		};*/
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (__stdcall T::*)(Args...) const volatile& noexcept, false> : basic_traits<true, false, T, R, Args...> {
-			typedef R (__stdcall T::*function_pointer_type)(Args...) const volatile& noexcept;
-		};
-
-		/* __stdcall does not work with varargs */
-		/*template <typename T, typename R, typename... Args>
-		struct fx_traits<R (__stdcall T::*)(Args..., ...) const volatile& noexcept, false> : basic_traits<true, true, T, R, Args...> {
-			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) const volatile& noexcept;
-		};*/
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (__stdcall T::*)(Args...) && noexcept, false> : basic_traits<true, false, T, R, Args...> {
-			typedef R (__stdcall T::*function_pointer_type)(Args...) && noexcept;
-		};
-
-		/* __stdcall does not work with varargs */
-		/*template <typename T, typename R, typename... Args>
-		struct fx_traits<R (__stdcall T::*)(Args..., ...) && noexcept, false> : basic_traits<true, true, T, R, Args...> {
-			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) && noexcept;
-		};*/
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (__stdcall T::*)(Args...) const&& noexcept, false> : basic_traits<true, false, T, R, Args...> {
-			typedef R (__stdcall T::*function_pointer_type)(Args...) const&& noexcept;
-		};
-
-		/* __stdcall does not work with varargs */
-		/*template <typename T, typename R, typename... Args>
-		struct fx_traits<R (__stdcall T::*)(Args..., ...) const&& noexcept, false> : basic_traits<true, true, T, R, Args...> {
-			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) const&& noexcept;
-		};*/
-
-		template <typename T, typename R, typename... Args>
-		struct fx_traits<R (__stdcall T::*)(Args...) const volatile&& noexcept, false> : basic_traits<true, false, T, R, Args...> {
-			typedef R (__stdcall T::*function_pointer_type)(Args...) const volatile&& noexcept;
-		};
-
-		/* __stdcall does not work with varargs */
-		/*template <typename T, typename R, typename... Args>
-		struct fx_traits<R (__stdcall T::*)(Args..., ...) const volatile&& noexcept, false> : basic_traits<true, true, T, R, Args...> {
-			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) const volatile&& noexcept;
-		};*/
-#endif // noexcept is part of a function's type
-#endif // __stdcall x86 VC++ bug
-
-		template <typename Signature>
-		struct fx_traits<Signature, true>
-		: public fx_traits<typename fx_traits<decltype(&Signature::operator())>::function_type, false> {};
-
-		template <typename Signature, bool b = std::is_member_object_pointer<Signature>::value>
-		struct callable_traits
-		: public fx_traits<std::decay_t<Signature>> {};
-
-		template <typename R, typename T>
-		struct callable_traits<R(T::*), true> {
-			typedef meta::conditional_t<std::is_array_v<R>, std::add_lvalue_reference_t<R>, R> return_type;
-			typedef return_type Arg;
-			typedef T object_type;
-			using signature_type = R(T::*);
-			inline static constexpr bool is_noexcept = false;
-			inline static constexpr bool is_member_function = false;
-			inline static constexpr std::size_t arity = 1;
-			inline static constexpr std::size_t free_arity = 2;
-			typedef std::tuple<Arg> args_tuple;
-			typedef types<Arg> args_list;
-			typedef types<T, Arg> free_args_list;
-			typedef meta::tuple_types<return_type> returns_list;
-			typedef return_type(function_type)(T&, return_type);
-			typedef return_type (*function_pointer_type)(T&, Arg);
-			typedef return_type (*free_function_pointer_type)(T&, Arg);
-			template <std::size_t i>
-			using arg_at = void_tuple_element_t<i, args_tuple>;
-		};
-
-	} // namespace meta_detail
-
-	template <typename Signature>
-	struct bind_traits : meta_detail::callable_traits<Signature> {};
-
-	template <typename Signature>
-	using function_args_t = typename bind_traits<Signature>::args_list;
-
-	template <typename Signature>
-	using function_signature_t = typename bind_traits<Signature>::signature_type;
-
-	template <typename Signature>
-	using function_return_t = typename bind_traits<Signature>::return_type;
-}} // namespace sol::meta
-
-// end of sol/bind_traits.hpp
-
-// beginning of sol/pointer_like.hpp
-
-#include <utility>
-#include <type_traits>
-
-namespace sol {
-
-	namespace meta {
-		namespace meta_detail {
-			template <typename T>
-			using is_dereferenceable_test = decltype(*std::declval<T>());
-
-			template <typename T>
-			using is_explicitly_dereferenceable_test = decltype(std::declval<T>().operator*());
-		}
-
-		template <typename T>
-		using is_pointer_like = std::integral_constant<bool, !std::is_array_v<T> && (std::is_pointer_v<T> || is_detected_v<meta_detail::is_explicitly_dereferenceable_test, T>)>;
-
-		template <typename T>
-		constexpr inline bool is_pointer_like_v = is_pointer_like<T>::value;
-	} // namespace meta
-
-	namespace detail {
-
-		template <typename T>
-		auto unwrap(T&& item) -> decltype(std::forward<T>(item)) {
-			return std::forward<T>(item);
-		}
-
-		template <typename T>
-		T& unwrap(std::reference_wrapper<T> arg) {
-			return arg.get();
-		}
-
-		template <typename T>
-		inline decltype(auto) deref(T&& item) {
-			using Tu = meta::unqualified_t<T>;
-			if constexpr (meta::is_pointer_like_v<Tu>) {
-				return *std::forward<T>(item);
-			}
-			else {
-				return std::forward<T>(item);
-			}
-		}
-
-		template <typename T>
-		inline decltype(auto) deref_move_only(T&& item) {
-			using Tu = meta::unqualified_t<T>;
-			if constexpr (meta::is_pointer_like_v<Tu> && !std::is_pointer_v<Tu> && !std::is_copy_constructible_v<Tu>) {
-				return *std::forward<T>(item);
-			}
-			else {
-				return std::forward<T>(item);
-			}
-		}
-
-		template <typename T>
-		inline T* ptr(T& val) {
-			return std::addressof(val);
-		}
-
-		template <typename T>
-		inline T* ptr(std::reference_wrapper<T> val) {
-			return std::addressof(val.get());
-		}
-
-		template <typename T>
-		inline T* ptr(T* val) {
-			return val;
-		}
-	} // namespace detail
-} // namespace sol
-
-// end of sol/pointer_like.hpp
-
-// beginning of sol/string_view.hpp
-
-#include <cstddef>
-#include <string>
-#include <string_view>
-#include <functional>
-
-namespace sol {
-	template <typename C, typename T = std::char_traits<C>>
-	using basic_string_view = std::basic_string_view<C, T>;
-
-	typedef std::string_view string_view;
-	typedef std::wstring_view wstring_view;
-	typedef std::u16string_view u16string_view;
-	typedef std::u32string_view u32string_view;
-	typedef std::hash<std::string_view> string_view_hash;
-} // namespace sol
-
-// end of sol/string_view.hpp
-
-#include <type_traits>
-#include <cstdint>
-#include <memory>
-#include <functional>
-#include <array>
-#include <iterator>
-#include <iosfwd>
-#if SOL_IS_ON(SOL_STD_VARIANT_I_)
-#include <variant>
-#endif // variant is weird on XCode, thanks XCode
-
-namespace sol { namespace meta {
-	template <typename T>
-	struct unwrapped {
-		typedef T type;
-	};
-
-	template <typename T>
-	struct unwrapped<std::reference_wrapper<T>> {
-		typedef T type;
-	};
-
-	template <typename T>
-	using unwrapped_t = typename unwrapped<T>::type;
-
-	template <typename T>
-	struct unwrap_unqualified : unwrapped<unqualified_t<T>> {};
-
-	template <typename T>
-	using unwrap_unqualified_t = typename unwrap_unqualified<T>::type;
-
-	template <typename T>
-	struct remove_member_pointer;
-
-	template <typename R, typename T>
-	struct remove_member_pointer<R T::*> {
-		typedef R type;
-	};
-
-	template <typename R, typename T>
-	struct remove_member_pointer<R T::*const> {
-		typedef R type;
-	};
-
-	template <typename T>
-	using remove_member_pointer_t = remove_member_pointer<T>;
-
-	template <typename T, typename...>
-	struct all_same : std::true_type {};
-
-	template <typename T, typename U, typename... Args>
-	struct all_same<T, U, Args...> : std::integral_constant<bool, std::is_same<T, U>::value && all_same<T, Args...>::value> {};
-
-	template <typename T, typename...>
-	struct any_same : std::false_type {};
-
-	template <typename T, typename U, typename... Args>
-	struct any_same<T, U, Args...> : std::integral_constant<bool, std::is_same<T, U>::value || any_same<T, Args...>::value> {};
-
-	template <typename T, typename... Args>
-	constexpr inline bool any_same_v = any_same<T, Args...>::value;
-
-	template <bool B>
-	using boolean = std::integral_constant<bool, B>;
-
-	template <bool B>
-	constexpr inline bool boolean_v = boolean<B>::value;
-
-	template <typename T>
-	using neg = boolean<!T::value>;
-
-	template <typename T>
-	constexpr inline bool neg_v = neg<T>::value;
-
-	template <typename... Args>
-	struct all : boolean<true> {};
-
-	template <typename T, typename... Args>
-	struct all<T, Args...> : std::conditional_t<T::value, all<Args...>, boolean<false>> {};
-
-	template <typename... Args>
-	struct any : boolean<false> {};
-
-	template <typename T, typename... Args>
-	struct any<T, Args...> : std::conditional_t<T::value, boolean<true>, any<Args...>> {};
-
-	template <typename T, typename... Args>
-	constexpr inline bool all_v = all<T, Args...>::value;
-
-	template <typename T, typename... Args>
-	constexpr inline bool any_v = any<T, Args...>::value;
-
-	enum class enable_t { _ };
-
-	constexpr const auto enabler = enable_t::_;
-
-	template <bool value, typename T = void>
-	using disable_if_t = std::enable_if_t<!value, T>;
-
-	template <typename... Args>
-	using enable = std::enable_if_t<all<Args...>::value, enable_t>;
-
-	template <typename... Args>
-	using disable = std::enable_if_t<neg<all<Args...>>::value, enable_t>;
-
-	template <typename... Args>
-	using enable_any = std::enable_if_t<any<Args...>::value, enable_t>;
-
-	template <typename... Args>
-	using disable_any = std::enable_if_t<neg<any<Args...>>::value, enable_t>;
-
-	template <typename V, typename... Vs>
-	struct find_in_pack_v : boolean<false> {};
-
-	template <typename V, typename Vs1, typename... Vs>
-	struct find_in_pack_v<V, Vs1, Vs...> : any<boolean<(V::value == Vs1::value)>, find_in_pack_v<V, Vs...>> {};
-
-	namespace meta_detail {
-		template <std::size_t I, typename T, typename... Args>
-		struct index_in_pack : std::integral_constant<std::size_t, SIZE_MAX> {};
-
-		template <std::size_t I, typename T, typename T1, typename... Args>
-		struct index_in_pack<I, T, T1, Args...>
-		: conditional_t<std::is_same<T, T1>::value, std::integral_constant<std::ptrdiff_t, I>, index_in_pack<I + 1, T, Args...>> {};
-	} // namespace meta_detail
-
-	template <typename T, typename... Args>
-	struct index_in_pack : meta_detail::index_in_pack<0, T, Args...> {};
-
-	template <typename T, typename List>
-	struct index_in : meta_detail::index_in_pack<0, T, List> {};
-
-	template <typename T, typename... Args>
-	struct index_in<T, types<Args...>> : meta_detail::index_in_pack<0, T, Args...> {};
-
-	template <std::size_t I, typename... Args>
-	struct at_in_pack {};
-
-	template <std::size_t I, typename... Args>
-	using at_in_pack_t = typename at_in_pack<I, Args...>::type;
-
-	template <std::size_t I, typename Arg, typename... Args>
-	struct at_in_pack<I, Arg, Args...> : std::conditional<I == 0, Arg, at_in_pack_t<I - 1, Args...>> {};
-
-	template <typename Arg, typename... Args>
-	struct at_in_pack<0, Arg, Args...> {
-		typedef Arg type;
-	};
-
-	namespace meta_detail {
-		template <typename, typename TI>
-		using on_even = meta::boolean<(TI::value % 2) == 0>;
-
-		template <typename, typename TI>
-		using on_odd = meta::boolean<(TI::value % 2) == 1>;
-
-		template <typename, typename>
-		using on_always = std::true_type;
-
-		template <template <typename...> class When, std::size_t Limit, std::size_t I, template <typename...> class Pred, typename... Ts>
-		struct count_when_for_pack : std::integral_constant<std::size_t, 0> {};
-		template <template <typename...> class When, std::size_t Limit, std::size_t I, template <typename...> class Pred, typename T, typename... Ts>
-			          struct count_when_for_pack<When, Limit, I, Pred, T, Ts...> : conditional_t < sizeof...(Ts)
-			     == 0
-			|| Limit<2, std::integral_constant<std::size_t, I + static_cast<std::size_t>(Limit != 0 && Pred<T>::value)>,
-			     count_when_for_pack<When, Limit - static_cast<std::size_t>(When<T, std::integral_constant<std::size_t, I>>::value),
-			          I + static_cast<std::size_t>(When<T, std::integral_constant<std::size_t, I>>::value&& Pred<T>::value), Pred, Ts...>> {};
-	} // namespace meta_detail
-
-	template <template <typename...> class Pred, typename... Ts>
-	struct count_for_pack : meta_detail::count_when_for_pack<meta_detail::on_always, sizeof...(Ts), 0, Pred, Ts...> {};
-
-	template <template <typename...> class Pred, typename... Ts>
-	inline constexpr std::size_t count_for_pack_v = count_for_pack<Pred, Ts...>::value;
-
-	template <template <typename...> class Pred, typename List>
-	struct count_for;
-
-	template <template <typename...> class Pred, typename... Args>
-	struct count_for<Pred, types<Args...>> : count_for_pack<Pred, Args...> {};
-
-	template <std::size_t Limit, template <typename...> class Pred, typename... Ts>
-	struct count_for_to_pack : meta_detail::count_when_for_pack<meta_detail::on_always, Limit, 0, Pred, Ts...> {};
-
-	template <std::size_t Limit, template <typename...> class Pred, typename... Ts>
-	inline constexpr std::size_t count_for_to_pack_v = count_for_to_pack<Limit, Pred, Ts...>::value;
-
-	template <template <typename...> class When, std::size_t Limit, template <typename...> class Pred, typename... Ts>
-	struct count_when_for_to_pack : meta_detail::count_when_for_pack<When, Limit, 0, Pred, Ts...> {};
-
-	template <template <typename...> class When, std::size_t Limit, template <typename...> class Pred, typename... Ts>
-	inline constexpr std::size_t count_when_for_to_pack_v = count_when_for_to_pack<When, Limit, Pred, Ts...>::value;
-
-	template <template <typename...> class Pred, typename... Ts>
-	using count_even_for_pack = count_when_for_to_pack<meta_detail::on_even, sizeof...(Ts), Pred, Ts...>;
-
-	template <template <typename...> class Pred, typename... Ts>
-	inline constexpr std::size_t count_even_for_pack_v = count_even_for_pack<Pred, Ts...>::value;
-
-	template <template <typename...> class Pred, typename... Ts>
-	using count_odd_for_pack = count_when_for_to_pack<meta_detail::on_odd, sizeof...(Ts), Pred, Ts...>;
-
-	template <template <typename...> class Pred, typename... Ts>
-	inline constexpr std::size_t count_odd_for_pack_v = count_odd_for_pack<Pred, Ts...>::value;
-
-	template <typename... Args>
-	struct return_type {
-		typedef std::tuple<Args...> type;
-	};
-
-	template <typename T>
-	struct return_type<T> {
-		typedef T type;
-	};
-
-	template <>
-	struct return_type<> {
-		typedef void type;
-	};
-
-	template <typename... Args>
-	using return_type_t = typename return_type<Args...>::type;
-
-	namespace meta_detail {
-		template <typename>
-		struct always_true : std::true_type {};
-		struct is_invokable_tester {
-			template <typename Fun, typename... Args>
-			static always_true<decltype(std::declval<Fun>()(std::declval<Args>()...))> test(int);
-			template <typename...>
-			static std::false_type test(...);
-		};
-	} // namespace meta_detail
-
-	template <typename T>
-	struct is_invokable;
-	template <typename Fun, typename... Args>
-	struct is_invokable<Fun(Args...)> : decltype(meta_detail::is_invokable_tester::test<Fun, Args...>(0)) {};
-
-	namespace meta_detail {
-
-		template <typename T, typename = void>
-		struct is_callable : std::is_function<std::remove_pointer_t<T>> {};
-
-		template <typename T>
-		struct is_callable<T,
-			std::enable_if_t<std::is_final<unqualified_t<T>>::value && std::is_class<unqualified_t<T>>::value
-			     && std::is_same<decltype(void(&T::operator())), void>::value>> {};
-
-		template <typename T>
-		struct is_callable<T,
-			std::enable_if_t<!std::is_final<unqualified_t<T>>::value && std::is_class<unqualified_t<T>>::value
-			     && std::is_destructible<unqualified_t<T>>::value>> {
-			struct F {
-				void operator()() {};
-			};
-			struct Derived : T, F {};
-			template <typename U, U>
-			struct Check;
-
-			template <typename V>
-			static sfinae_no_t test(Check<void (F::*)(), &V::operator()>*);
-
-			template <typename>
-			static sfinae_yes_t test(...);
-
-			static constexpr bool value = std::is_same_v<decltype(test<Derived>(0)), sfinae_yes_t>;
-		};
-
-		template <typename T>
-		struct is_callable<T,
-			std::enable_if_t<!std::is_final<unqualified_t<T>>::value && std::is_class<unqualified_t<T>>::value
-			     && !std::is_destructible<unqualified_t<T>>::value>> {
-			struct F {
-				void operator()() {};
-			};
-			struct Derived : T, F {
-				~Derived() = delete;
-			};
-			template <typename U, U>
-			struct Check;
-
-			template <typename V>
-			static sfinae_no_t test(Check<void (F::*)(), &V::operator()>*);
-
-			template <typename>
-			static sfinae_yes_t test(...);
-
-			static constexpr bool value = std::is_same_v<decltype(test<Derived>(0)), sfinae_yes_t>;
-		};
-
-		struct has_begin_end_impl {
-			template <typename T, typename U = unqualified_t<T>, typename B = decltype(std::declval<U&>().begin()),
-				typename E = decltype(std::declval<U&>().end())>
-			static std::true_type test(int);
-
-			template <typename...>
-			static std::false_type test(...);
-		};
-
-		struct has_key_type_impl {
-			template <typename T, typename U = unqualified_t<T>, typename V = typename U::key_type>
-			static std::true_type test(int);
-
-			template <typename...>
-			static std::false_type test(...);
-		};
-
-		struct has_key_comp_impl {
-			template <typename T, typename V = decltype(std::declval<unqualified_t<T>>().key_comp())>
-			static std::true_type test(int);
-
-			template <typename...>
-			static std::false_type test(...);
-		};
-
-		struct has_load_factor_impl {
-			template <typename T, typename V = decltype(std::declval<unqualified_t<T>>().load_factor())>
-			static std::true_type test(int);
-
-			template <typename...>
-			static std::false_type test(...);
-		};
-
-		struct has_mapped_type_impl {
-			template <typename T, typename V = typename unqualified_t<T>::mapped_type>
-			static std::true_type test(int);
-
-			template <typename...>
-			static std::false_type test(...);
-		};
-
-		struct has_value_type_impl {
-			template <typename T, typename V = typename unqualified_t<T>::value_type>
-			static std::true_type test(int);
-
-			template <typename...>
-			static std::false_type test(...);
-		};
-
-		struct has_iterator_impl {
-			template <typename T, typename V = typename unqualified_t<T>::iterator>
-			static std::true_type test(int);
-
-			template <typename...>
-			static std::false_type test(...);
-		};
-
-		struct has_key_value_pair_impl {
-			template <typename T, typename U = unqualified_t<T>, typename V = typename U::value_type, typename F = decltype(std::declval<V&>().first),
-				typename S = decltype(std::declval<V&>().second)>
-			static std::true_type test(int);
-
-			template <typename...>
-			static std::false_type test(...);
-		};
-
-		template <typename T>
-		struct has_push_back_test {
-		private:
-			template <typename C>
-			static sfinae_yes_t test(decltype(std::declval<C>().push_back(std::declval<std::add_rvalue_reference_t<typename C::value_type>>()))*);
-			template <typename C>
-			static sfinae_no_t test(...);
-
-		public:
-			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), sfinae_yes_t>;
-		};
-
-		template <typename T>
-		struct has_insert_test {
-		private:
-			template <typename C>
-			static sfinae_yes_t test(decltype(std::declval<C>().insert(std::declval<std::add_rvalue_reference_t<typename C::const_iterator>>(),
-				std::declval<std::add_rvalue_reference_t<typename C::value_type>>()))*);
-			template <typename C>
-			static sfinae_no_t test(...);
-
-		public:
-			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), sfinae_yes_t>;
-		};
-
-		template <typename T>
-		struct has_insert_after_test {
-		private:
-			template <typename C>
-			static sfinae_yes_t test(decltype(std::declval<C>().insert_after(std::declval<std::add_rvalue_reference_t<typename C::const_iterator>>(),
-				std::declval<std::add_rvalue_reference_t<typename C::value_type>>()))*);
-			template <typename C>
-			static sfinae_no_t test(...);
-
-		public:
-			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), sfinae_yes_t>;
-		};
-
-		template <typename T>
-		struct has_size_test {
-		private:
-			template <typename C>
-			static sfinae_yes_t test(decltype(std::declval<C>().size())*);
-			template <typename C>
-			static sfinae_no_t test(...);
-
-		public:
-			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), sfinae_yes_t>;
-		};
-
-		template <typename T>
-		struct has_max_size_test {
-		private:
-			template <typename C>
-			static sfinae_yes_t test(decltype(std::declval<C>().max_size())*);
-			template <typename C>
-			static sfinae_no_t test(...);
-
-		public:
-			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), sfinae_yes_t>;
-		};
-
-		template <typename T>
-		struct has_to_string_test {
-		private:
-			template <typename C>
-			static sfinae_yes_t test(decltype(std::declval<C>().to_string())*);
-			template <typename C>
-			static sfinae_no_t test(...);
-
-		public:
-			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), sfinae_yes_t>;
-		};
-
-		template <typename T, typename U, typename = void>
-		class supports_op_less_test : public std::false_type {};
-		template <typename T, typename U>
-		class supports_op_less_test<T, U, void_t<decltype(std::declval<T&>() < std::declval<U&>())>>
-		: public std::integral_constant<bool,
-			  !is_specialization_of_v<unqualified_t<T>, std::variant> && !is_specialization_of_v<unqualified_t<U>, std::variant>> {};
-
-		template <typename T, typename U, typename = void>
-		class supports_op_equal_test : public std::false_type {};
-		template <typename T, typename U>
-		class supports_op_equal_test<T, U, void_t<decltype(std::declval<T&>() == std::declval<U&>())>>
-		: public std::integral_constant<bool,
-			  !is_specialization_of_v<unqualified_t<T>, std::variant> && !is_specialization_of_v<unqualified_t<U>, std::variant>> {};
-
-		template <typename T, typename U, typename = void>
-		class supports_op_less_equal_test : public std::false_type {};
-		template <typename T, typename U>
-		class supports_op_less_equal_test<T, U, void_t<decltype(std::declval<T&>() <= std::declval<U&>())>>
-		: public std::integral_constant<bool,
-			  !is_specialization_of_v<unqualified_t<T>, std::variant> && !is_specialization_of_v<unqualified_t<U>, std::variant>> {};
-
-		template <typename T, typename U, typename = void>
-		class supports_op_left_shift_test : public std::false_type {};
-		template <typename T, typename U>
-		class supports_op_left_shift_test<T, U, void_t<decltype(std::declval<T&>() << std::declval<U&>())>> : public std::true_type {};
-
-		template <typename T, typename = void>
-		class supports_adl_to_string_test : public std::false_type {};
-		template <typename T>
-		class supports_adl_to_string_test<T, void_t<decltype(to_string(std::declval<const T&>()))>> : public std::true_type {};
-
-		template <typename T, bool b>
-		struct is_matched_lookup_impl : std::false_type {};
-		template <typename T>
-		struct is_matched_lookup_impl<T, true> : std::is_same<typename T::key_type, typename T::value_type> {};
-
-		template <typename T>
-		using non_void_t = meta::conditional_t<std::is_void_v<T>, ::sol::detail::unchecked_t, T>;
-	} // namespace meta_detail
-
-	template <typename T, typename U = T>
-	class supports_op_less : public meta_detail::supports_op_less_test<T, U> {};
-
-	template <typename T, typename U = T>
-	class supports_op_equal : public meta_detail::supports_op_equal_test<T, U> {};
-
-	template <typename T, typename U = T>
-	class supports_op_less_equal : public meta_detail::supports_op_less_equal_test<T, U> {};
-
-	template <typename T, typename U = T>
-	class supports_op_left_shift : public meta_detail::supports_op_left_shift_test<T, U> {};
-
-	template <typename T>
-	class supports_adl_to_string : public meta_detail::supports_adl_to_string_test<T> {};
-
-	template <typename T>
-	class supports_to_string_member : public meta::boolean<meta_detail::has_to_string_test<meta_detail::non_void_t<T>>::value> {};
-
-	template <typename T>
-	using is_callable = boolean<meta_detail::is_callable<T>::value>;
-
-	template <typename T>
-	constexpr inline bool is_callable_v = is_callable<T>::value;
-
-	template <typename T>
-	struct has_begin_end : decltype(meta_detail::has_begin_end_impl::test<T>(0)) {};
-
-	template <typename T>
-	constexpr inline bool has_begin_end_v = has_begin_end<T>::value;
-
-	template <typename T>
-	struct has_key_value_pair : decltype(meta_detail::has_key_value_pair_impl::test<T>(0)) {};
-
-	template <typename T>
-	struct has_key_type : decltype(meta_detail::has_key_type_impl::test<T>(0)) {};
-
-	template <typename T>
-	struct has_key_comp : decltype(meta_detail::has_key_comp_impl::test<T>(0)) {};
-
-	template <typename T>
-	struct has_load_factor : decltype(meta_detail::has_load_factor_impl::test<T>(0)) {};
-
-	template <typename T>
-	struct has_mapped_type : decltype(meta_detail::has_mapped_type_impl::test<T>(0)) {};
-
-	template <typename T>
-	struct has_iterator : decltype(meta_detail::has_iterator_impl::test<T>(0)) {};
-
-	template <typename T>
-	struct has_value_type : decltype(meta_detail::has_value_type_impl::test<T>(0)) {};
-
-	template <typename T>
-	using has_push_back = meta::boolean<meta_detail::has_push_back_test<T>::value>;
-
-	template <typename T>
-	using has_max_size = meta::boolean<meta_detail::has_max_size_test<T>::value>;
-
-	template <typename T>
-	using has_insert = meta::boolean<meta_detail::has_insert_test<T>::value>;
-
-	template <typename T>
-	using has_insert_after = meta::boolean<meta_detail::has_insert_after_test<T>::value>;
-
-	template <typename T>
-	using has_size = meta::boolean<meta_detail::has_size_test<T>::value>;
-
-	template <typename T>
-	using is_associative = meta::all<has_key_type<T>, has_key_value_pair<T>, has_mapped_type<T>>;
-
-	template <typename T>
-	using is_lookup = meta::all<has_key_type<T>, has_value_type<T>>;
-
-	template <typename T>
-	using is_ordered = meta::all<has_key_comp<T>, meta::neg<has_load_factor<T>>>;
-
-	template <typename T>
-	using is_matched_lookup = meta_detail::is_matched_lookup_impl<T, is_lookup<T>::value>;
-
-	template <typename T>
-	using is_initializer_list = meta::is_specialization_of<T, std::initializer_list>;
-
-	template <typename T>
-	constexpr inline bool is_initializer_list_v = is_initializer_list<T>::value;
-
-	template <typename T, typename CharT = char>
-	using is_string_literal_array_of = boolean<std::is_array_v<T> && std::is_same_v<std::remove_all_extents_t<T>, CharT>>;
-
-	template <typename T, typename CharT = char>
-	constexpr inline bool is_string_literal_array_of_v = is_string_literal_array_of<T, CharT>::value;
-
-	template <typename T>
-	using is_string_literal_array = boolean<std::is_array_v<T> && any_same_v<std::remove_all_extents_t<T>, char, char16_t, char32_t, wchar_t>>;
-
-	template <typename T>
-	constexpr inline bool is_string_literal_array_v = is_string_literal_array<T>::value;
-
-	template <typename T, typename CharT>
-	struct is_string_of : std::false_type {};
-
-	template <typename CharT, typename CharTargetT, typename TraitsT, typename AllocT>
-	struct is_string_of<std::basic_string<CharT, TraitsT, AllocT>, CharTargetT> : std::is_same<CharT, CharTargetT> {};
-
-	template <typename T, typename CharT>
-	constexpr inline bool is_string_of_v = is_string_of<T, CharT>::value;
-
-	template <typename T, typename CharT>
-	struct is_string_view_of : std::false_type {};
-
-	template <typename CharT, typename CharTargetT, typename TraitsT>
-	struct is_string_view_of<std::basic_string_view<CharT, TraitsT>, CharTargetT> : std::is_same<CharT, CharTargetT> {};
-
-	template <typename T, typename CharT>
-	constexpr inline bool is_string_view_of_v = is_string_view_of<T, CharT>::value;
-
-	template <typename T>
-	using is_string_like
-		= meta::boolean<is_specialization_of_v<T, std::basic_string> || is_specialization_of_v<T, std::basic_string_view> || is_string_literal_array_v<T>>;
-
-	template <typename T>
-	constexpr inline bool is_string_like_v = is_string_like<T>::value;
-
-	template <typename T, typename CharT = char>
-	using is_string_constructible = meta::boolean<
-		is_string_literal_array_of_v<T,
-		     CharT> || std::is_same_v<T, const CharT*> || std::is_same_v<T, CharT> || is_string_of_v<T, CharT> || std::is_same_v<T, std::initializer_list<CharT>> || is_string_view_of_v<T, CharT>>;
-
-	template <typename T, typename CharT = char>
-	constexpr inline bool is_string_constructible_v = is_string_constructible<T, CharT>::value;
-
-	template <typename T>
-	using is_string_like_or_constructible = meta::boolean<is_string_like_v<T> || is_string_constructible_v<T>>;
-
-	template <typename T>
-	struct is_pair : std::false_type {};
-
-	template <typename T1, typename T2>
-	struct is_pair<std::pair<T1, T2>> : std::true_type {};
-
-	template <typename T, typename Char>
-	using is_c_str_of = any<std::is_same<T, const Char*>, std::is_same<T, Char const* const>, std::is_same<T, Char*>, is_string_of<T, Char>,
-		is_string_literal_array_of<T, Char>>;
-
-	template <typename T, typename Char>
-	constexpr inline bool is_c_str_of_v = is_c_str_of<T, Char>::value;
-
-	template <typename T>
-	using is_c_str = is_c_str_of<T, char>;
-
-	template <typename T>
-	constexpr inline bool is_c_str_v = is_c_str<T>::value;
-
-	template <typename T>
-	struct is_move_only : all<neg<std::is_reference<T>>, neg<std::is_copy_constructible<unqualified_t<T>>>, std::is_move_constructible<unqualified_t<T>>> {};
-
-	template <typename T>
-	using is_not_move_only = neg<is_move_only<T>>;
-
-	namespace meta_detail {
-		template <typename T>
-		decltype(auto) force_tuple(T&& x) {
-			if constexpr (meta::is_specialization_of_v<meta::unqualified_t<T>, std::tuple>) {
-				return std::forward<T>(x);
-			}
-			else {
-				return std::tuple<T>(std::forward<T>(x));
-			}
-		}
-	} // namespace meta_detail
-
-	template <typename... X>
-	decltype(auto) tuplefy(X&&... x) {
-		return std::tuple_cat(meta_detail::force_tuple(std::forward<X>(x))...);
-	}
-
-	template <typename T, typename = void>
-	struct iterator_tag {
-		using type = std::input_iterator_tag;
-	};
-
-	template <typename T>
-	struct iterator_tag<T, conditional_t<false, typename std::iterator_traits<T>::iterator_category, void>> {
-		using type = typename std::iterator_traits<T>::iterator_category;
-	};
-
-}} // namespace sol::meta
-
-// end of sol/traits.hpp
-
-namespace sol {
-	namespace detail {
-		const bool default_safe_function_calls =
-#if SOL_IS_ON(SOL_SAFE_FUNCTION_CALLS_I_)
-		     true;
-#else
-		     false;
-#endif
-	} // namespace detail
-
-	namespace meta { namespace meta_detail {
-	}} // namespace meta::meta_detail
-
-	namespace stack { namespace stack_detail {
-		using undefined_method_func = void (*)(stack_reference);
-
-		template <typename T>
-		void set_undefined_methods_on(stack_reference);
-
-		struct undefined_metatable;
-	}} // namespace stack::stack_detail
-} // namespace sol
-
-#endif // SOL_FORWARD_DETAIL_HPP
-// end of sol/forward_detail.hpp
-
-// beginning of sol/bytecode.hpp
-
-// beginning of sol/compatibility.hpp
-
-// beginning of sol/compatibility/lua_version.hpp
-
-#if SOL_IS_ON(SOL_USE_CXX_LUA_I_)
-	#include <lua.h>
-	#include <lualib.h>
-	#include <lauxlib.h>
-#elif SOL_IS_ON(SOL_USE_LUA_HPP_I_)
-	#include <lua.hpp>
-#else
-	extern "C" {
-		#include <lua.h>
-		#include <lauxlib.h>
-		#include <lualib.h>
-	}
-#endif // C++ Mangling for Lua vs. Not
-
-#if defined(SOL_LUAJIT)
-	#if (SOL_LUAJIT != 0)
-		#define SOL_USE_LUAJIT_I_ SOL_ON
-	#else
-		#define SOL_USE_LUAJIT_I_ SOL_OFF
-	#endif
-#elif defined(LUAJIT_VERSION)
-	#define SOL_USE_LUAJIT_I_ SOL_OFF
-#else
-	#define SOL_USE_LUAJIT_I_ SOL_DEFAULT_OFF
-#endif // luajit
-
-#if SOL_IS_ON(SOL_USE_CXX_LUAJIT_I_)
-	#include <luajit.h>
-#elif SOL_IS_ON(SOL_USE_LUAJIT_I_)
-	extern "C" {
-		#include <luajit.h>
-	}
-#endif // C++ LuaJIT ... whatever that means
-
-#if defined(SOL_LUAJIT_VERSION)
-	#define SOL_LUAJIT_VERSION_I_ SOL_LUAJIT_VERSION
-#elif SOL_IS_ON(SOL_USE_LUAJIT_I_)
-	#define SOL_LUAJIT_VERSION_I_ LUAJIT_VERSION_NUM
-#else
-	#define SOL_LUAJIT_VERSION_I_ 0
-#endif
-
-#if defined(MOONJIT_VERSION)
-	#define SOL_USE_MOONJIT_I_ SOL_ON
-#else
-	#define SOL_USE_MOONJIT_I_ SOL_OFF
-#endif
-
-#if !defined(SOL_LUA_VERSION)
-	#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 502
-		#define SOL_LUA_VERSION LUA_VERSION_NUM
-	#elif defined(LUA_VERSION_NUM) && LUA_VERSION_NUM == 501
-		#define SOL_LUA_VERSION LUA_VERSION_NUM
-	#elif !defined(LUA_VERSION_NUM) || !(LUA_VERSION_NUM)
-		// Definitely 5.0
-		#define SOL_LUA_VERSION 500
-	#else
-		// ??? Not sure, assume latest?
-		#define SOL_LUA_VERSION 504
-	#endif // Lua Version 503, 502, 501 || luajit, 500
-#endif // SOL_LUA_VERSION
-
-#if defined(SOL_LUA_VERSION)
-	#define SOL_LUA_VESION_I_ SOL_LUA_VERSION
-#else
-	#define SOL_LUA_VESION_I_ 504
-#endif
-
-#if defined(SOL_EXCEPTIONS_ALWAYS_UNSAFE)
-	#if (SOL_EXCEPTIONS_ALWAYS_UNSAFE != 0)
-		#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_OFF
-	#else
-		#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_ON
-	#endif
-#elif defined(SOL_EXCEPTIONS_SAFE_PROPAGATION)
-	#if (SOL_EXCEPTIONS_SAFE_PROPAGATION != 0)
-		#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_ON
-	#else
-		#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_OFF
-	#endif
-#elif SOL_LUAJIT_VERSION_I_ >= 20100
-	// LuaJIT 2.1.0-beta3 and better have exception support locked in for all platforms (mostly)
-	#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_DEFAULT_ON
-#elif SOL_LUAJIT_VERSION_I_ >= 20000
-	// LuaJIT 2.0.x have exception support only on x64 builds
-	#if SOL_IS_ON(SOL_PLATFORM_X64_I_)
-		#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_DEFAULT_ON
-	#else
-		#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_OFF
-	#endif
-#else
-	// otherwise, there is no exception safety for
-	// shoving exceptions through Lua and errors should
-	// always be serialized
-	#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_DEFAULT_OFF
-#endif // LuaJIT beta 02.01.00 have better exception handling on all platforms since beta3
-
-#if defined(SOL_LUAJIT_USE_EXCEPTION_TRAMPOLINE)
-	#if (SOL_LUAJIT_USE_EXCEPTION_TRAMPOLINE != 0)
-		#define SOL_USE_LUAJIT_EXCEPTION_TRAMPOLINE_I_ SOL_ON
-	#else
-		#define SOL_USE_LUAJIT_EXCEPTION_TRAMPOLINE_I_ SOL_OFF
-	#endif
-#else
-	#if SOL_IS_OFF(SOL_PROPAGATE_EXCEPTIONS_I_) && SOL_IS_ON(SOL_USE_LUAJIT_I_)
-		#define SOL_USE_LUAJIT_EXCEPTION_TRAMPOLINE_I_ SOL_ON
-	#else
-		#define SOL_USE_LUAJIT_EXCEPTION_TRAMPOLINE_I_ SOL_DEFAULT_OFF
-	#endif
-#endif
-
-#if defined(SOL_LUAL_STREAM_HAS_CLOSE_FUNCTION)
-	#if (SOL_LUAL_STREAM_HAS_CLOSE_FUNCTION != 0)
-		#define SOL_LUAL_STREAM_USE_CLOSE_FUNCTION_I_ SOL_ON
-	#else
-		#define SOL_LUAL_STREAM_USE_CLOSE_FUNCTION_I_ SOL_OFF
-	#endif
-#else
-	#if SOL_IS_OFF(SOL_USE_LUAJIT_I_) && (SOL_LUA_VERSION > 501)
-		#define SOL_LUAL_STREAM_USE_CLOSE_FUNCTION_I_ SOL_ON
-	#else
-		#define SOL_LUAL_STREAM_USE_CLOSE_FUNCTION_I_ SOL_DEFAULT_OFF
-	#endif
-#endif
-
-// end of sol/compatibility/lua_version.hpp
-
-#if SOL_IS_ON(SOL_USE_COMPATIBILITY_LAYER_I_)
-
-#if SOL_IS_ON(SOL_USE_CXX_LUA_I_) || SOL_IS_ON(SOL_USE_CXX_LUAJIT_I_)
-#ifndef COMPAT53_LUA_CPP
-#define COMPAT53_LUA_CPP 1
-#endif // Build Lua Compat layer as C++
-#endif
-#ifndef COMPAT53_INCLUDE_SOURCE
-#define COMPAT53_INCLUDE_SOURCE 1
-#endif // Build Compat Layer Inline
-
-// beginning of sol/compatibility/compat-5.3.h
-
-#ifndef KEPLER_PROJECT_COMPAT53_H_
-#define KEPLER_PROJECT_COMPAT53_H_
-
-#include <stddef.h>
-#include <limits.h>
-#include <string.h>
-#if defined(__cplusplus) && !defined(COMPAT53_LUA_CPP)
-extern "C" {
-#endif
-#include <lua.h>
-#include <lauxlib.h>
-#include <lualib.h>
-#if defined(__cplusplus) && !defined(COMPAT53_LUA_CPP)
-}
-#endif
-
-#ifndef COMPAT53_PREFIX
-/* we chose this name because many other lua bindings / libs have
-* their own compatibility layer, and that use the compat53 declaration
-* frequently, causing all kinds of linker / compiler issues
-*/
-#  define COMPAT53_PREFIX kp_compat53
-#endif // COMPAT53_PREFIX
-
-#ifndef COMPAT53_API
-#  if defined(COMPAT53_INCLUDE_SOURCE) && COMPAT53_INCLUDE_SOURCE
-#    if defined(__GNUC__) || defined(__clang__)
-#      define COMPAT53_API __attribute__((__unused__)) static inline 
-#    else
-#      define COMPAT53_API static inline 
-#    endif /* Clang/GCC */
-#  else /* COMPAT53_INCLUDE_SOURCE */
-/* we are not including source, so everything is extern */
-#      define COMPAT53_API extern
-#  endif /* COMPAT53_INCLUDE_SOURCE */
-#endif /* COMPAT53_PREFIX */
-
-#define COMPAT53_CONCAT_HELPER(a, b) a##b
-#define COMPAT53_CONCAT(a, b) COMPAT53_CONCAT_HELPER(a, b)
-
-/* declarations for Lua 5.1 */
-#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM == 501
-
-/* XXX not implemented:
-* lua_arith (new operators)
-* lua_upvalueid
-* lua_upvaluejoin
-* lua_version
-* lua_yieldk
-*/
-
-#ifndef LUA_OK
-#  define LUA_OK 0
-#endif
-#ifndef LUA_OPADD
-#  define LUA_OPADD 0
-#endif
-#ifndef LUA_OPSUB
-#  define LUA_OPSUB 1
-#endif
-#ifndef LUA_OPMUL
-#  define LUA_OPMUL 2
-#endif
-#ifndef LUA_OPDIV
-#  define LUA_OPDIV 3
-#endif
-#ifndef LUA_OPMOD
-#  define LUA_OPMOD 4
-#endif
-#ifndef LUA_OPPOW
-#  define LUA_OPPOW 5
-#endif
-#ifndef LUA_OPUNM
-#  define LUA_OPUNM 6
-#endif
-#ifndef LUA_OPEQ
-#  define LUA_OPEQ 0
-#endif
-#ifndef LUA_OPLT
-#  define LUA_OPLT 1
-#endif
-#ifndef LUA_OPLE
-#  define LUA_OPLE 2
-#endif
-
-/* LuaJIT/Lua 5.1 does not have the updated
-* error codes for thread status/function returns (but some patched versions do)
-* define it only if it's not found
-*/
-#if !defined(LUA_ERRGCMM)
-/* Use + 2 because in some versions of Lua (Lua 5.1)
-* LUA_ERRFILE is defined as (LUA_ERRERR+1)
-* so we need to avoid it (LuaJIT might have something at this
-* integer value too)
-*/
-#  define LUA_ERRGCMM (LUA_ERRERR + 2)
-#endif /* LUA_ERRGCMM define */
-
-#if !defined(MOONJIT_VERSION)
-typedef size_t lua_Unsigned;
-#endif
-
-typedef struct luaL_Buffer_53 {
-	luaL_Buffer b; /* make incorrect code crash! */
-	char *ptr;
-	size_t nelems;
-	size_t capacity;
-	lua_State *L2;
-} luaL_Buffer_53;
-#define luaL_Buffer luaL_Buffer_53
-
-/* In PUC-Rio 5.1, userdata is a simple FILE*
-* In LuaJIT, it's a struct where the first member is a FILE*
-* We can't support the `closef` member
-*/
-typedef struct luaL_Stream {
-	FILE *f;
-} luaL_Stream;
-
-#define lua_absindex COMPAT53_CONCAT(COMPAT53_PREFIX, _absindex)
-COMPAT53_API int lua_absindex(lua_State *L, int i);
-
-#define lua_arith COMPAT53_CONCAT(COMPAT53_PREFIX, _arith)
-COMPAT53_API void lua_arith(lua_State *L, int op);
-
-#define lua_compare COMPAT53_CONCAT(COMPAT53_PREFIX, _compare)
-COMPAT53_API int lua_compare(lua_State *L, int idx1, int idx2, int op);
-
-#define lua_copy COMPAT53_CONCAT(COMPAT53_PREFIX, _copy)
-COMPAT53_API void lua_copy(lua_State *L, int from, int to);
-
-#define lua_getuservalue(L, i) \
-  (lua_getfenv((L), (i)), lua_type((L), -1))
-#define lua_setuservalue(L, i) \
-  (luaL_checktype((L), -1, LUA_TTABLE), lua_setfenv((L), (i)))
-
-#define lua_len COMPAT53_CONCAT(COMPAT53_PREFIX, _len)
-COMPAT53_API void lua_len(lua_State *L, int i);
-
-#define lua_pushstring(L, s) \
-  (lua_pushstring((L), (s)), lua_tostring((L), -1))
-
-#define lua_pushlstring(L, s, len) \
-  ((((len) == 0) ? lua_pushlstring((L), "", 0) : lua_pushlstring((L), (s), (len))), lua_tostring((L), -1))
-
-#ifndef luaL_newlibtable
-#  define luaL_newlibtable(L, l) \
-  (lua_createtable((L), 0, sizeof((l))/sizeof(*(l))-1))
-#endif
-#ifndef luaL_newlib
-#  define luaL_newlib(L, l) \
-  (luaL_newlibtable((L), (l)), luaL_register((L), NULL, (l)))
-#endif
-
-#ifndef lua_pushglobaltable
-#  define lua_pushglobaltable(L) \
-  lua_pushvalue((L), LUA_GLOBALSINDEX)
-#endif
-#define lua_rawgetp COMPAT53_CONCAT(COMPAT53_PREFIX, _rawgetp)
-COMPAT53_API int lua_rawgetp(lua_State *L, int i, const void *p);
-
-#define lua_rawsetp COMPAT53_CONCAT(COMPAT53_PREFIX, _rawsetp)
-COMPAT53_API void lua_rawsetp(lua_State *L, int i, const void *p);
-
-#define lua_rawlen(L, i) lua_objlen((L), (i))
-
-#define lua_tointeger(L, i) lua_tointegerx((L), (i), NULL)
-
-#define lua_tonumberx COMPAT53_CONCAT(COMPAT53_PREFIX, _tonumberx)
-COMPAT53_API lua_Number lua_tonumberx(lua_State *L, int i, int *isnum);
-
-#define luaL_checkversion COMPAT53_CONCAT(COMPAT53_PREFIX, L_checkversion)
-COMPAT53_API void luaL_checkversion(lua_State *L);
-
-#define lua_load COMPAT53_CONCAT(COMPAT53_PREFIX, _load_53)
-COMPAT53_API int lua_load(lua_State *L, lua_Reader reader, void *data, const char* source, const char* mode);
-
-#define luaL_loadfilex COMPAT53_CONCAT(COMPAT53_PREFIX, L_loadfilex)
-COMPAT53_API int luaL_loadfilex(lua_State *L, const char *filename, const char *mode);
-
-#define luaL_loadbufferx COMPAT53_CONCAT(COMPAT53_PREFIX, L_loadbufferx)
-COMPAT53_API int luaL_loadbufferx(lua_State *L, const char *buff, size_t sz, const char *name, const char *mode);
-
-#define luaL_checkstack COMPAT53_CONCAT(COMPAT53_PREFIX, L_checkstack_53)
-COMPAT53_API void luaL_checkstack(lua_State *L, int sp, const char *msg);
-
-#define luaL_getsubtable COMPAT53_CONCAT(COMPAT53_PREFIX, L_getsubtable)
-COMPAT53_API int luaL_getsubtable(lua_State* L, int i, const char *name);
-
-#define luaL_len COMPAT53_CONCAT(COMPAT53_PREFIX, L_len)
-COMPAT53_API lua_Integer luaL_len(lua_State *L, int i);
-
-#define luaL_setfuncs COMPAT53_CONCAT(COMPAT53_PREFIX, L_setfuncs)
-COMPAT53_API void luaL_setfuncs(lua_State *L, const luaL_Reg *l, int nup);
-
-#define luaL_setmetatable COMPAT53_CONCAT(COMPAT53_PREFIX, L_setmetatable)
-COMPAT53_API void luaL_setmetatable(lua_State *L, const char *tname);
-
-#define luaL_testudata COMPAT53_CONCAT(COMPAT53_PREFIX, L_testudata)
-COMPAT53_API void *luaL_testudata(lua_State *L, int i, const char *tname);
-
-#define luaL_traceback COMPAT53_CONCAT(COMPAT53_PREFIX, L_traceback)
-COMPAT53_API void luaL_traceback(lua_State *L, lua_State *L1, const char *msg, int level);
-
-#define luaL_fileresult COMPAT53_CONCAT(COMPAT53_PREFIX, L_fileresult)
-COMPAT53_API int luaL_fileresult(lua_State *L, int stat, const char *fname);
-
-#define luaL_execresult COMPAT53_CONCAT(COMPAT53_PREFIX, L_execresult)
-COMPAT53_API int luaL_execresult(lua_State *L, int stat);
-
-#define lua_callk(L, na, nr, ctx, cont) \
-  ((void)(ctx), (void)(cont), lua_call((L), (na), (nr)))
-#define lua_pcallk(L, na, nr, err, ctx, cont) \
-  ((void)(ctx), (void)(cont), lua_pcall((L), (na), (nr), (err)))
-
-#define lua_resume(L, from, nargs) \
-  ((void)(from), lua_resume((L), (nargs)))
-
-#define luaL_buffinit COMPAT53_CONCAT(COMPAT53_PREFIX, _buffinit_53)
-COMPAT53_API void luaL_buffinit(lua_State *L, luaL_Buffer_53 *B);
-
-#define luaL_prepbuffsize COMPAT53_CONCAT(COMPAT53_PREFIX, _prepbufsize_53)
-COMPAT53_API char *luaL_prepbuffsize(luaL_Buffer_53 *B, size_t s);
-
-#define luaL_addlstring COMPAT53_CONCAT(COMPAT53_PREFIX, _addlstring_53)
-COMPAT53_API void luaL_addlstring(luaL_Buffer_53 *B, const char *s, size_t l);
-
-#define luaL_addvalue COMPAT53_CONCAT(COMPAT53_PREFIX, _addvalue_53)
-COMPAT53_API void luaL_addvalue(luaL_Buffer_53 *B);
-
-#define luaL_pushresult COMPAT53_CONCAT(COMPAT53_PREFIX, _pushresult_53)
-COMPAT53_API void luaL_pushresult(luaL_Buffer_53 *B);
-
-#undef luaL_buffinitsize
-#define luaL_buffinitsize(L, B, s) \
-  (luaL_buffinit((L), (B)), luaL_prepbuffsize((B), (s)))
-
-#undef luaL_prepbuffer
-#define luaL_prepbuffer(B) \
-  luaL_prepbuffsize((B), LUAL_BUFFERSIZE)
-
-#undef luaL_addchar
-#define luaL_addchar(B, c) \
-  ((void)((B)->nelems < (B)->capacity || luaL_prepbuffsize((B), 1)), \
-   ((B)->ptr[(B)->nelems++] = (c)))
-
-#undef luaL_addsize
-#define luaL_addsize(B, s) \
-  ((B)->nelems += (s))
-
-#undef luaL_addstring
-#define luaL_addstring(B, s) \
-  luaL_addlstring((B), (s), strlen((s)))
-
-#undef luaL_pushresultsize
-#define luaL_pushresultsize(B, s) \
-  (luaL_addsize((B), (s)), luaL_pushresult((B)))
-
-#if defined(LUA_COMPAT_APIINTCASTS)
-#define lua_pushunsigned(L, n) \
-  lua_pushinteger((L), (lua_Integer)(n))
-#define lua_tounsignedx(L, i, is) \
-  ((lua_Unsigned)lua_tointegerx((L), (i), (is)))
-#define lua_tounsigned(L, i) \
-  lua_tounsignedx((L), (i), NULL)
-#define luaL_checkunsigned(L, a) \
-  ((lua_Unsigned)luaL_checkinteger((L), (a)))
-#define luaL_optunsigned(L, a, d) \
-  ((lua_Unsigned)luaL_optinteger((L), (a), (lua_Integer)(d)))
-#endif
-
-#endif /* Lua 5.1 only */
-
-/* declarations for Lua 5.1 and 5.2 */
-#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM <= 502
-
-typedef int lua_KContext;
-
-typedef int(*lua_KFunction)(lua_State *L, int status, lua_KContext ctx);
-
-#define lua_dump(L, w, d, s) \
-  ((void)(s), lua_dump((L), (w), (d)))
-
-#define lua_getfield(L, i, k) \
-  (lua_getfield((L), (i), (k)), lua_type((L), -1))
-
-#define lua_gettable(L, i) \
-  (lua_gettable((L), (i)), lua_type((L), -1))
-
-#define lua_geti COMPAT53_CONCAT(COMPAT53_PREFIX, _geti)
-COMPAT53_API int lua_geti(lua_State *L, int index, lua_Integer i);
-
-#define lua_isinteger COMPAT53_CONCAT(COMPAT53_PREFIX, _isinteger)
-COMPAT53_API int lua_isinteger(lua_State *L, int index);
-
-#define lua_tointegerx COMPAT53_CONCAT(COMPAT53_PREFIX, _tointegerx_53)
-COMPAT53_API lua_Integer lua_tointegerx(lua_State *L, int i, int *isnum);
-
-#define lua_numbertointeger(n, p) \
-  ((*(p) = (lua_Integer)(n)), 1)
-
-#define lua_rawget(L, i) \
-  (lua_rawget((L), (i)), lua_type((L), -1))
-
-#define lua_rawgeti(L, i, n) \
-  (lua_rawgeti((L), (i), (n)), lua_type((L), -1))
-
-#define lua_rotate COMPAT53_CONCAT(COMPAT53_PREFIX, _rotate)
-COMPAT53_API void lua_rotate(lua_State *L, int idx, int n);
-
-#define lua_seti COMPAT53_CONCAT(COMPAT53_PREFIX, _seti)
-COMPAT53_API void lua_seti(lua_State *L, int index, lua_Integer i);
-
-#define lua_stringtonumber COMPAT53_CONCAT(COMPAT53_PREFIX, _stringtonumber)
-COMPAT53_API size_t lua_stringtonumber(lua_State *L, const char *s);
-
-#define luaL_tolstring COMPAT53_CONCAT(COMPAT53_PREFIX, L_tolstring)
-COMPAT53_API const char *luaL_tolstring(lua_State *L, int idx, size_t *len);
-
-#define luaL_getmetafield(L, o, e) \
-  (luaL_getmetafield((L), (o), (e)) ? lua_type((L), -1) : LUA_TNIL)
-
-#define luaL_newmetatable(L, tn) \
-  (luaL_newmetatable((L), (tn)) ? (lua_pushstring((L), (tn)), lua_setfield((L), -2, "__name"), 1) : 0)
-
-#define luaL_requiref COMPAT53_CONCAT(COMPAT53_PREFIX, L_requiref_53)
-COMPAT53_API void luaL_requiref(lua_State *L, const char *modname,
-	lua_CFunction openf, int glb);
-
-#endif /* Lua 5.1 and Lua 5.2 */
-
-/* declarations for Lua 5.2 */
-#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM == 502
-
-/* XXX not implemented:
-* lua_isyieldable
-* lua_getextraspace
-* lua_arith (new operators)
-* lua_pushfstring (new formats)
-*/
-
-#define lua_getglobal(L, n) \
-  (lua_getglobal((L), (n)), lua_type((L), -1))
-
-#define lua_getuservalue(L, i) \
-  (lua_getuservalue((L), (i)), lua_type((L), -1))
-
-#define lua_pushlstring(L, s, len) \
-  (((len) == 0) ? lua_pushlstring((L), "", 0) : lua_pushlstring((L), (s), (len)))
-
-#define lua_rawgetp(L, i, p) \
-  (lua_rawgetp((L), (i), (p)), lua_type((L), -1))
-
-#define LUA_KFUNCTION(_name) \
-  static int (_name)(lua_State *L, int status, lua_KContext ctx); \
-  static int (_name ## _52)(lua_State *L) { \
-    lua_KContext ctx; \
-    int status = lua_getctx(L, &ctx); \
-    return (_name)(L, status, ctx); \
-  } \
-  static int (_name)(lua_State *L, int status, lua_KContext ctx)
-
-#define lua_pcallk(L, na, nr, err, ctx, cont) \
-  lua_pcallk((L), (na), (nr), (err), (ctx), cont ## _52)
-
-#define lua_callk(L, na, nr, ctx, cont) \
-  lua_callk((L), (na), (nr), (ctx), cont ## _52)
-
-#define lua_yieldk(L, nr, ctx, cont) \
-  lua_yieldk((L), (nr), (ctx), cont ## _52)
-
-#ifdef lua_call
-#  undef lua_call
-#  define lua_call(L, na, nr) \
-  (lua_callk)((L), (na), (nr), 0, NULL)
-#endif
-
-#ifdef lua_pcall
-#  undef lua_pcall
-#  define lua_pcall(L, na, nr, err) \
-  (lua_pcallk)((L), (na), (nr), (err), 0, NULL)
-#endif
-
-#ifdef lua_yield
-#  undef lua_yield
-#  define lua_yield(L, nr) \
-  (lua_yieldk)((L), (nr), 0, NULL)
-#endif
-
-#endif /* Lua 5.2 only */
-
-/* other Lua versions */
-#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 501 || LUA_VERSION_NUM > 504
-
-#  error "unsupported Lua version (i.e. not Lua 5.1, 5.2, 5.3, or 5.4)"
-
-#endif /* other Lua versions except 5.1, 5.2, 5.3, and 5.4 */
-
-/* helper macro for defining continuation functions (for every version
-* *except* Lua 5.2) */
-#ifndef LUA_KFUNCTION
-#define LUA_KFUNCTION(_name) \
-  static int (_name)(lua_State *L, int status, lua_KContext ctx)
-#endif
-
-#if defined(COMPAT53_INCLUDE_SOURCE) && COMPAT53_INCLUDE_SOURCE == 1
-// beginning of sol/compatibility/compat-5.3.c.h
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-
-/* don't compile it again if it already is included via compat53.h */
-#ifndef KEPLER_PROJECT_COMPAT53_C_
-#define KEPLER_PROJECT_COMPAT53_C_
-
-/* definitions for Lua 5.1 only */
-#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM == 501
-
-#ifndef COMPAT53_FOPEN_NO_LOCK
-#if defined(_MSC_VER)
-#define COMPAT53_FOPEN_NO_LOCK 1
-#else /* otherwise */
-#define COMPAT53_FOPEN_NO_LOCK 0
-#endif /* VC++ only so far */
-#endif /* No-lock fopen_s usage if possible */
-
-#if defined(_MSC_VER) && COMPAT53_FOPEN_NO_LOCK
-#include <share.h>
-#endif /* VC++ _fsopen for share-allowed file read */
-
-#ifndef COMPAT53_HAVE_STRERROR_R
-#if defined(__GLIBC__) || defined(_POSIX_VERSION) || defined(__APPLE__) || (!defined(__MINGW32__) && defined(__GNUC__) && (__GNUC__ < 6))
-#define COMPAT53_HAVE_STRERROR_R 1
-#else /* none of the defines matched: define to 0 */
-#define COMPAT53_HAVE_STRERROR_R 0
-#endif /* have strerror_r of some form */
-#endif /* strerror_r */
-
-#ifndef COMPAT53_HAVE_STRERROR_S
-#if defined(_MSC_VER) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) || (defined(__STDC_LIB_EXT1__) && __STDC_LIB_EXT1__)
-#define COMPAT53_HAVE_STRERROR_S 1
-#else /* not VC++ or C11 */
-#define COMPAT53_HAVE_STRERROR_S 0
-#endif /* strerror_s from VC++ or C11 */
-#endif /* strerror_s */
-
-#ifndef COMPAT53_LUA_FILE_BUFFER_SIZE
-#define COMPAT53_LUA_FILE_BUFFER_SIZE 4096
-#endif /* Lua File Buffer Size */
-
-static char* compat53_strerror(int en, char* buff, size_t sz) {
-#if COMPAT53_HAVE_STRERROR_R
-	/* use strerror_r here, because it's available on these specific platforms */
-	if (sz > 0) {
-		buff[0] = '\0';
-		/* we don't care whether the GNU version or the XSI version is used: */
-		if (strerror_r(en, buff, sz)) {
-			/* Yes, we really DO want to ignore the return value!
-			 * GCC makes that extra hard, not even a (void) cast will do. */
-		}
-		if (buff[0] == '\0') {
-			/* Buffer is unchanged, so we probably have called GNU strerror_r which
-			 * returned a static constant string. Chances are that strerror will
-			 * return the same static constant string and therefore be thread-safe. */
-			return strerror(en);
-		}
-	}
-	return buff; /* sz is 0 *or* strerror_r wrote into the buffer */
-#elif COMPAT53_HAVE_STRERROR_S
-	/* for MSVC and other C11 implementations, use strerror_s since it's
-	 * provided by default by the libraries */
-	strerror_s(buff, sz, en);
-	return buff;
-#else
-	/* fallback, but strerror is not guaranteed to be threadsafe due to modifying
-	 * errno itself and some impls not locking a static buffer for it ... but most
-	 * known systems have threadsafe errno: this might only change if the locale
-	 * is changed out from under someone while this function is being called */
-	(void)buff;
-	(void)sz;
-	return strerror(en);
-#endif
-}
-
-COMPAT53_API int lua_absindex(lua_State* L, int i) {
-	if (i < 0 && i > LUA_REGISTRYINDEX)
-		i += lua_gettop(L) + 1;
-	return i;
-}
-
-static void compat53_call_lua(lua_State* L, char const code[], size_t len, int nargs, int nret) {
-	lua_rawgetp(L, LUA_REGISTRYINDEX, (void*)code);
-	if (lua_type(L, -1) != LUA_TFUNCTION) {
-		lua_pop(L, 1);
-		if (luaL_loadbuffer(L, code, len, "=none"))
-			lua_error(L);
-		lua_pushvalue(L, -1);
-		lua_rawsetp(L, LUA_REGISTRYINDEX, (void*)code);
-	}
-	lua_insert(L, -nargs - 1);
-	lua_call(L, nargs, nret);
-}
-
-static const char compat53_arith_code[]
-     = "local op,a,b=...\n"
-       "if op==0 then return a+b\n"
-       "elseif op==1 then return a-b\n"
-       "elseif op==2 then return a*b\n"
-       "elseif op==3 then return a/b\n"
-       "elseif op==4 then return a%b\n"
-       "elseif op==5 then return a^b\n"
-       "elseif op==6 then return -a\n"
-       "end\n";
-
-COMPAT53_API void lua_arith(lua_State* L, int op) {
-	if (op < LUA_OPADD || op > LUA_OPUNM)
-		luaL_error(L, "invalid 'op' argument for lua_arith");
-	luaL_checkstack(L, 5, "not enough stack slots");
-	if (op == LUA_OPUNM)
-		lua_pushvalue(L, -1);
-	lua_pushnumber(L, op);
-	lua_insert(L, -3);
-	compat53_call_lua(L, compat53_arith_code, sizeof(compat53_arith_code) - 1, 3, 1);
-}
-
-static const char compat53_compare_code[]
-     = "local a,b=...\n"
-       "return a<=b\n";
-
-COMPAT53_API int lua_compare(lua_State* L, int idx1, int idx2, int op) {
-	int result = 0;
-	switch (op) {
-	case LUA_OPEQ:
-		return lua_equal(L, idx1, idx2);
-	case LUA_OPLT:
-		return lua_lessthan(L, idx1, idx2);
-	case LUA_OPLE:
-		luaL_checkstack(L, 5, "not enough stack slots");
-		idx1 = lua_absindex(L, idx1);
-		idx2 = lua_absindex(L, idx2);
-		lua_pushvalue(L, idx1);
-		lua_pushvalue(L, idx2);
-		compat53_call_lua(L, compat53_compare_code, sizeof(compat53_compare_code) - 1, 2, 1);
-		result = lua_toboolean(L, -1);
-		lua_pop(L, 1);
-		return result;
-	default:
-		luaL_error(L, "invalid 'op' argument for lua_compare");
-	}
-	return 0;
-}
-
-COMPAT53_API void lua_copy(lua_State* L, int from, int to) {
-	int abs_to = lua_absindex(L, to);
-	luaL_checkstack(L, 1, "not enough stack slots");
-	lua_pushvalue(L, from);
-	lua_replace(L, abs_to);
-}
-
-COMPAT53_API void lua_len(lua_State* L, int i) {
-	switch (lua_type(L, i)) {
-	case LUA_TSTRING:
-		lua_pushnumber(L, (lua_Number)lua_objlen(L, i));
-		break;
-	case LUA_TTABLE:
-		if (!luaL_callmeta(L, i, "__len"))
-			lua_pushnumber(L, (lua_Number)lua_objlen(L, i));
-		break;
-	case LUA_TUSERDATA:
-		if (luaL_callmeta(L, i, "__len"))
-			break;
-		/* FALLTHROUGH */
-	default:
-		luaL_error(L, "attempt to get length of a %s value", lua_typename(L, lua_type(L, i)));
-	}
-}
-
-COMPAT53_API int lua_rawgetp(lua_State* L, int i, const void* p) {
-	int abs_i = lua_absindex(L, i);
-	lua_pushlightuserdata(L, (void*)p);
-	lua_rawget(L, abs_i);
-	return lua_type(L, -1);
-}
-
-COMPAT53_API void lua_rawsetp(lua_State* L, int i, const void* p) {
-	int abs_i = lua_absindex(L, i);
-	luaL_checkstack(L, 1, "not enough stack slots");
-	lua_pushlightuserdata(L, (void*)p);
-	lua_insert(L, -2);
-	lua_rawset(L, abs_i);
-}
-
-COMPAT53_API lua_Number lua_tonumberx(lua_State* L, int i, int* isnum) {
-	lua_Number n = lua_tonumber(L, i);
-	if (isnum != NULL) {
-		*isnum = (n != 0 || lua_isnumber(L, i));
-	}
-	return n;
-}
-
-COMPAT53_API void luaL_checkversion(lua_State* L) {
-	(void)L;
-}
-
-COMPAT53_API void luaL_checkstack(lua_State* L, int sp, const char* msg) {
-	if (!lua_checkstack(L, sp + LUA_MINSTACK)) {
-		if (msg != NULL)
-			luaL_error(L, "stack overflow (%s)", msg);
-		else {
-			lua_pushliteral(L, "stack overflow");
-			lua_error(L);
-		}
-	}
-}
-
-COMPAT53_API int luaL_getsubtable(lua_State* L, int i, const char* name) {
-	int abs_i = lua_absindex(L, i);
-	luaL_checkstack(L, 3, "not enough stack slots");
-	lua_pushstring(L, name);
-	lua_gettable(L, abs_i);
-	if (lua_istable(L, -1))
-		return 1;
-	lua_pop(L, 1);
-	lua_newtable(L);
-	lua_pushstring(L, name);
-	lua_pushvalue(L, -2);
-	lua_settable(L, abs_i);
-	return 0;
-}
-
-COMPAT53_API lua_Integer luaL_len(lua_State* L, int i) {
-	lua_Integer res = 0;
-	int isnum = 0;
-	luaL_checkstack(L, 1, "not enough stack slots");
-	lua_len(L, i);
-	res = lua_tointegerx(L, -1, &isnum);
-	lua_pop(L, 1);
-	if (!isnum)
-		luaL_error(L, "object length is not an integer");
-	return res;
-}
-
-COMPAT53_API void luaL_setfuncs(lua_State* L, const luaL_Reg* l, int nup) {
-	luaL_checkstack(L, nup + 1, "too many upvalues");
-	for (; l->name != NULL; l++) { /* fill the table with given functions */
-		int i;
-		lua_pushstring(L, l->name);
-		for (i = 0; i < nup; i++) /* copy upvalues to the top */
-			lua_pushvalue(L, -(nup + 1));
-		lua_pushcclosure(L, l->func, nup); /* closure with those upvalues */
-		lua_settable(L, -(nup + 3));       /* table must be below the upvalues, the name and the closure */
-	}
-	lua_pop(L, nup); /* remove upvalues */
-}
-
-COMPAT53_API void luaL_setmetatable(lua_State* L, const char* tname) {
-	luaL_checkstack(L, 1, "not enough stack slots");
-	luaL_getmetatable(L, tname);
-	lua_setmetatable(L, -2);
-}
-
-COMPAT53_API void* luaL_testudata(lua_State* L, int i, const char* tname) {
-	void* p = lua_touserdata(L, i);
-	luaL_checkstack(L, 2, "not enough stack slots");
-	if (p == NULL || !lua_getmetatable(L, i))
-		return NULL;
-	else {
-		int res = 0;
-		luaL_getmetatable(L, tname);
-		res = lua_rawequal(L, -1, -2);
-		lua_pop(L, 2);
-		if (!res)
-			p = NULL;
-	}
-	return p;
-}
-
-static int compat53_countlevels(lua_State* L) {
-	lua_Debug ar;
-	int li = 1, le = 1;
-	/* find an upper bound */
-	while (lua_getstack(L, le, &ar)) {
-		li = le;
-		le *= 2;
-	}
-	/* do a binary search */
-	while (li < le) {
-		int m = (li + le) / 2;
-		if (lua_getstack(L, m, &ar))
-			li = m + 1;
-		else
-			le = m;
-	}
-	return le - 1;
-}
-
-static int compat53_findfield(lua_State* L, int objidx, int level) {
-	if (level == 0 || !lua_istable(L, -1))
-		return 0;                               /* not found */
-	lua_pushnil(L);                              /* start 'next' loop */
-	while (lua_next(L, -2)) {                    /* for each pair in table */
-		if (lua_type(L, -2) == LUA_TSTRING) {   /* ignore non-string keys */
-			if (lua_rawequal(L, objidx, -1)) { /* found object? */
-				lua_pop(L, 1);                /* remove value (but keep name) */
-				return 1;
-			}
-			else if (compat53_findfield(L, objidx, level - 1)) { /* try recursively */
-				lua_remove(L, -2);                              /* remove table (but keep name) */
-				lua_pushliteral(L, ".");
-				lua_insert(L, -2); /* place '.' between the two names */
-				lua_concat(L, 3);
-				return 1;
-			}
-		}
-		lua_pop(L, 1); /* remove value */
-	}
-	return 0; /* not found */
-}
-
-static int compat53_pushglobalfuncname(lua_State* L, lua_Debug* ar) {
-	int top = lua_gettop(L);
-	lua_getinfo(L, "f", ar); /* push function */
-	lua_pushvalue(L, LUA_GLOBALSINDEX);
-	if (compat53_findfield(L, top + 1, 2)) {
-		lua_copy(L, -1, top + 1); /* move name to proper place */
-		lua_pop(L, 2);            /* remove pushed values */
-		return 1;
-	}
-	else {
-		lua_settop(L, top); /* remove function and global table */
-		return 0;
-	}
-}
-
-static void compat53_pushfuncname(lua_State* L, lua_Debug* ar) {
-	if (*ar->namewhat != '\0') /* is there a name? */
-		lua_pushfstring(L, "function " LUA_QS, ar->name);
-	else if (*ar->what == 'm') /* main? */
-		lua_pushliteral(L, "main chunk");
-	else if (*ar->what == 'C') {
-		if (compat53_pushglobalfuncname(L, ar)) {
-			lua_pushfstring(L, "function " LUA_QS, lua_tostring(L, -1));
-			lua_remove(L, -2); /* remove name */
-		}
-		else
-			lua_pushliteral(L, "?");
-	}
-	else
-		lua_pushfstring(L, "function <%s:%d>", ar->short_src, ar->linedefined);
-}
-
-#define COMPAT53_LEVELS1 12 /* size of the first part of the stack */
-#define COMPAT53_LEVELS2 10 /* size of the second part of the stack */
-
-COMPAT53_API void luaL_traceback(lua_State* L, lua_State* L1, const char* msg, int level) {
-	lua_Debug ar;
-	int top = lua_gettop(L);
-	int numlevels = compat53_countlevels(L1);
-	int mark = (numlevels > COMPAT53_LEVELS1 + COMPAT53_LEVELS2) ? COMPAT53_LEVELS1 : 0;
-	if (msg)
-		lua_pushfstring(L, "%s\n", msg);
-	lua_pushliteral(L, "stack traceback:");
-	while (lua_getstack(L1, level++, &ar)) {
-		if (level == mark) {                       /* too many levels? */
-			lua_pushliteral(L, "\n\t...");        /* add a '...' */
-			level = numlevels - COMPAT53_LEVELS2; /* and skip to last ones */
-		}
-		else {
-			lua_getinfo(L1, "Slnt", &ar);
-			lua_pushfstring(L, "\n\t%s:", ar.short_src);
-			if (ar.currentline > 0)
-				lua_pushfstring(L, "%d:", ar.currentline);
-			lua_pushliteral(L, " in ");
-			compat53_pushfuncname(L, &ar);
-			lua_concat(L, lua_gettop(L) - top);
-		}
-	}
-	lua_concat(L, lua_gettop(L) - top);
-}
-
-COMPAT53_API int luaL_fileresult(lua_State* L, int stat, const char* fname) {
-	const char* serr = NULL;
-	int en = errno; /* calls to Lua API may change this value */
-	char buf[512] = { 0 };
-	if (stat) {
-		lua_pushboolean(L, 1);
-		return 1;
-	}
-	else {
-		lua_pushnil(L);
-		serr = compat53_strerror(en, buf, sizeof(buf));
-		if (fname)
-			lua_pushfstring(L, "%s: %s", fname, serr);
-		else
-			lua_pushstring(L, serr);
-		lua_pushnumber(L, (lua_Number)en);
-		return 3;
-	}
-}
-
-static int compat53_checkmode(lua_State* L, const char* mode, const char* modename, int err) {
-	if (mode && strchr(mode, modename[0]) == NULL) {
-		lua_pushfstring(L, "attempt to load a %s chunk (mode is '%s')", modename, mode);
-		return err;
-	}
-	return LUA_OK;
-}
-
-typedef struct {
-	lua_Reader reader;
-	void* ud;
-	int has_peeked_data;
-	const char* peeked_data;
-	size_t peeked_data_size;
-} compat53_reader_data;
-
-static const char* compat53_reader(lua_State* L, void* ud, size_t* size) {
-	compat53_reader_data* data = (compat53_reader_data*)ud;
-	if (data->has_peeked_data) {
-		data->has_peeked_data = 0;
-		*size = data->peeked_data_size;
-		return data->peeked_data;
-	}
-	else
-		return data->reader(L, data->ud, size);
-}
-
-COMPAT53_API int lua_load(lua_State* L, lua_Reader reader, void* data, const char* source, const char* mode) {
-	int status = LUA_OK;
-	compat53_reader_data compat53_data = { reader, data, 1, 0, 0 };
-	compat53_data.peeked_data = reader(L, data, &(compat53_data.peeked_data_size));
-	if (compat53_data.peeked_data && compat53_data.peeked_data_size && compat53_data.peeked_data[0] == LUA_SIGNATURE[0]) /* binary file? */
-		status = compat53_checkmode(L, mode, "binary", LUA_ERRSYNTAX);
-	else
-		status = compat53_checkmode(L, mode, "text", LUA_ERRSYNTAX);
-	if (status != LUA_OK)
-		return status;
-		/* we need to call the original 5.1 version of lua_load! */
-#undef lua_load
-	return lua_load(L, compat53_reader, &compat53_data, source);
-#define lua_load COMPAT53_CONCAT(COMPAT53_PREFIX, _load_53)
-}
-
-typedef struct {
-	int n;                                    /* number of pre-read characters */
-	FILE* f;                                  /* file being read */
-	char buff[COMPAT53_LUA_FILE_BUFFER_SIZE]; /* area for reading file */
-} compat53_LoadF;
-
-static const char* compat53_getF(lua_State* L, void* ud, size_t* size) {
-	compat53_LoadF* lf = (compat53_LoadF*)ud;
-	(void)L;            /* not used */
-	if (lf->n > 0) {    /* are there pre-read characters to be read? */
-		*size = lf->n; /* return them (chars already in buffer) */
-		lf->n = 0;     /* no more pre-read characters */
-	}
-	else { /* read a block from file */
-		  /* 'fread' can return > 0 *and* set the EOF flag. If next call to
-		  'compat53_getF' called 'fread', it might still wait for user input.
-		  The next check avoids this problem. */
-		if (feof(lf->f))
-			return NULL;
-		*size = fread(lf->buff, 1, sizeof(lf->buff), lf->f); /* read block */
-	}
-	return lf->buff;
-}
-
-static int compat53_errfile(lua_State* L, const char* what, int fnameindex) {
-	char buf[512] = { 0 };
-	const char* serr = compat53_strerror(errno, buf, sizeof(buf));
-	const char* filename = lua_tostring(L, fnameindex) + 1;
-	lua_pushfstring(L, "cannot %s %s: %s", what, filename, serr);
-	lua_remove(L, fnameindex);
-	return LUA_ERRFILE;
-}
-
-static int compat53_skipBOM(compat53_LoadF* lf) {
-	const char* p = "\xEF\xBB\xBF"; /* UTF-8 BOM mark */
-	int c;
-	lf->n = 0;
-	do {
-		c = getc(lf->f);
-		if (c == EOF || c != *(const unsigned char*)p++)
-			return c;
-		lf->buff[lf->n++] = (char)c; /* to be read by the parser */
-	} while (*p != '\0');
-	lf->n = 0;          /* prefix matched; discard it */
-	return getc(lf->f); /* return next character */
-}
-
-/*
-** reads the first character of file 'f' and skips an optional BOM mark
-** in its beginning plus its first line if it starts with '#'. Returns
-** true if it skipped the first line.  In any case, '*cp' has the
-** first "valid" character of the file (after the optional BOM and
-** a first-line comment).
-*/
-static int compat53_skipcomment(compat53_LoadF* lf, int* cp) {
-	int c = *cp = compat53_skipBOM(lf);
-	if (c == '#') { /* first line is a comment (Unix exec. file)? */
-		do {       /* skip first line */
-			c = getc(lf->f);
-		} while (c != EOF && c != '\n');
-		*cp = getc(lf->f); /* skip end-of-line, if present */
-		return 1;          /* there was a comment */
-	}
-	else
-		return 0; /* no comment */
-}
-
-COMPAT53_API int luaL_loadfilex(lua_State* L, const char* filename, const char* mode) {
-	compat53_LoadF lf;
-	int status, readstatus;
-	int c;
-	int fnameindex = lua_gettop(L) + 1; /* index of filename on the stack */
-	if (filename == NULL) {
-		lua_pushliteral(L, "=stdin");
-		lf.f = stdin;
-	}
-	else {
-		lua_pushfstring(L, "@%s", filename);
-#if defined(_MSC_VER)
-		/* This code is here to stop a deprecation error that stops builds
-		 * if a certain macro is defined. While normally not caring would
-		 * be best, some header-only libraries and builds can't afford to
-		 * dictate this to the user. A quick check shows that fopen_s this
-		 * goes back to VS 2005, and _fsopen goes back to VS 2003 .NET,
-		 * possibly even before that so we don't need to do any version
-		 * number checks, since this has been there since forever.  */
-
-		/* TO USER: if you want the behavior of typical fopen_s/fopen,
-		 * which does lock the file on VC++, define the macro used below to 0 */
-#if COMPAT53_FOPEN_NO_LOCK
-		lf.f = _fsopen(filename, "r", _SH_DENYNO); /* do not lock the file in any way */
-		if (lf.f == NULL)
-			return compat53_errfile(L, "open", fnameindex);
-#else  /* use default locking version */
-		if (fopen_s(&lf.f, filename, "r") != 0)
-			return compat53_errfile(L, "open", fnameindex);
-#endif /* Locking vs. No-locking fopen variants */
-#else
-		lf.f = fopen(filename, "r"); /* default stdlib doesn't forcefully lock files here */
-		if (lf.f == NULL)
-			return compat53_errfile(L, "open", fnameindex);
-#endif
-	}
-	if (compat53_skipcomment(&lf, &c))       /* read initial portion */
-		lf.buff[lf.n++] = '\n';             /* add line to correct line numbers */
-	if (c == LUA_SIGNATURE[0] && filename) { /* binary file? */
-#if defined(_MSC_VER)
-		if (freopen_s(&lf.f, filename, "rb", lf.f) != 0)
-			return compat53_errfile(L, "reopen", fnameindex);
-#else
-		lf.f = freopen(filename, "rb", lf.f); /* reopen in binary mode */
-		if (lf.f == NULL)
-			return compat53_errfile(L, "reopen", fnameindex);
-#endif
-		compat53_skipcomment(&lf, &c); /* re-read initial portion */
-	}
-	if (c != EOF)
-		lf.buff[lf.n++] = (char)c; /* 'c' is the first character of the stream */
-	status = lua_load(L, &compat53_getF, &lf, lua_tostring(L, -1), mode);
-	readstatus = ferror(lf.f);
-	if (filename)
-		fclose(lf.f); /* close file (even in case of errors) */
-	if (readstatus) {
-		lua_settop(L, fnameindex); /* ignore results from 'lua_load' */
-		return compat53_errfile(L, "read", fnameindex);
-	}
-	lua_remove(L, fnameindex);
-	return status;
-}
-
-COMPAT53_API int luaL_loadbufferx(lua_State* L, const char* buff, size_t sz, const char* name, const char* mode) {
-	int status = LUA_OK;
-	if (sz > 0 && buff[0] == LUA_SIGNATURE[0]) {
-		status = compat53_checkmode(L, mode, "binary", LUA_ERRSYNTAX);
-	}
-	else {
-		status = compat53_checkmode(L, mode, "text", LUA_ERRSYNTAX);
-	}
-	if (status != LUA_OK)
-		return status;
-	return luaL_loadbuffer(L, buff, sz, name);
-}
-
-#if !defined(l_inspectstat) \
-     && (defined(unix) || defined(__unix) || defined(__unix__) || defined(__TOS_AIX__) || defined(_SYSTYPE_BSD) || (defined(__APPLE__) && defined(__MACH__)))
-/* some form of unix; check feature macros in unistd.h for details */
-#include <unistd.h>
-/* check posix version; the relevant include files and macros probably
- * were available before 2001, but I'm not sure */
-#if defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L
-#include <sys/wait.h>
-#define l_inspectstat(stat, what)   \
-	if (WIFEXITED(stat)) {         \
-		stat = WEXITSTATUS(stat); \
-	}                              \
-	else if (WIFSIGNALED(stat)) {  \
-		stat = WTERMSIG(stat);    \
-		what = "signal";          \
-	}
-#endif
-#endif
-
-/* provide default (no-op) version */
-#if !defined(l_inspectstat)
-#define l_inspectstat(stat, what) ((void)0)
-#endif
-
-COMPAT53_API int luaL_execresult(lua_State* L, int stat) {
-	const char* what = "exit";
-	if (stat == -1)
-		return luaL_fileresult(L, 0, NULL);
-	else {
-		l_inspectstat(stat, what);
-		if (*what == 'e' && stat == 0)
-			lua_pushboolean(L, 1);
-		else
-			lua_pushnil(L);
-		lua_pushstring(L, what);
-		lua_pushinteger(L, stat);
-		return 3;
-	}
-}
-
-COMPAT53_API void luaL_buffinit(lua_State* L, luaL_Buffer_53* B) {
-	/* make it crash if used via pointer to a 5.1-style luaL_Buffer */
-	B->b.p = NULL;
-	B->b.L = NULL;
-	B->b.lvl = 0;
-	/* reuse the buffer from the 5.1-style luaL_Buffer though! */
-	B->ptr = B->b.buffer;
-	B->capacity = LUAL_BUFFERSIZE;
-	B->nelems = 0;
-	B->L2 = L;
-}
-
-COMPAT53_API char* luaL_prepbuffsize(luaL_Buffer_53* B, size_t s) {
-	if (B->capacity - B->nelems < s) { /* needs to grow */
-		char* newptr = NULL;
-		size_t newcap = B->capacity * 2;
-		if (newcap - B->nelems < s)
-			newcap = B->nelems + s;
-		if (newcap < B->capacity) /* overflow */
-			luaL_error(B->L2, "buffer too large");
-		newptr = (char*)lua_newuserdata(B->L2, newcap);
-		memcpy(newptr, B->ptr, B->nelems);
-		if (B->ptr != B->b.buffer)
-			lua_replace(B->L2, -2); /* remove old buffer */
-		B->ptr = newptr;
-		B->capacity = newcap;
-	}
-	return B->ptr + B->nelems;
-}
-
-COMPAT53_API void luaL_addlstring(luaL_Buffer_53* B, const char* s, size_t l) {
-	memcpy(luaL_prepbuffsize(B, l), s, l);
-	luaL_addsize(B, l);
-}
-
-COMPAT53_API void luaL_addvalue(luaL_Buffer_53* B) {
-	size_t len = 0;
-	const char* s = lua_tolstring(B->L2, -1, &len);
-	if (!s)
-		luaL_error(B->L2, "cannot convert value to string");
-	if (B->ptr != B->b.buffer)
-		lua_insert(B->L2, -2); /* userdata buffer must be at stack top */
-	luaL_addlstring(B, s, len);
-	lua_remove(B->L2, B->ptr != B->b.buffer ? -2 : -1);
-}
-
-void luaL_pushresult(luaL_Buffer_53* B) {
-	lua_pushlstring(B->L2, B->ptr, B->nelems);
-	if (B->ptr != B->b.buffer)
-		lua_replace(B->L2, -2); /* remove userdata buffer */
-}
-
-#endif /* Lua 5.1 */
-
-/* definitions for Lua 5.1 and Lua 5.2 */
-#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM <= 502
-
-COMPAT53_API int lua_geti(lua_State* L, int index, lua_Integer i) {
-	index = lua_absindex(L, index);
-	lua_pushinteger(L, i);
-	lua_gettable(L, index);
-	return lua_type(L, -1);
-}
-
-COMPAT53_API int lua_isinteger(lua_State* L, int index) {
-	if (lua_type(L, index) == LUA_TNUMBER) {
-		lua_Number n = lua_tonumber(L, index);
-		lua_Integer i = lua_tointeger(L, index);
-		if (i == n)
-			return 1;
-	}
-	return 0;
-}
-
-COMPAT53_API lua_Integer lua_tointegerx(lua_State* L, int i, int* isnum) {
-	int ok = 0;
-	lua_Number n = lua_tonumberx(L, i, &ok);
-	if (ok) {
-		if (n == (lua_Integer)n) {
-			if (isnum)
-				*isnum = 1;
-			return (lua_Integer)n;
-		}
-	}
-	if (isnum)
-		*isnum = 0;
-	return 0;
-}
-
-static void compat53_reverse(lua_State* L, int a, int b) {
-	for (; a < b; ++a, --b) {
-		lua_pushvalue(L, a);
-		lua_pushvalue(L, b);
-		lua_replace(L, a);
-		lua_replace(L, b);
-	}
-}
-
-COMPAT53_API void lua_rotate(lua_State* L, int idx, int n) {
-	int n_elems = 0;
-	idx = lua_absindex(L, idx);
-	n_elems = lua_gettop(L) - idx + 1;
-	if (n < 0)
-		n += n_elems;
-	if (n > 0 && n < n_elems) {
-		luaL_checkstack(L, 2, "not enough stack slots available");
-		n = n_elems - n;
-		compat53_reverse(L, idx, idx + n - 1);
-		compat53_reverse(L, idx + n, idx + n_elems - 1);
-		compat53_reverse(L, idx, idx + n_elems - 1);
-	}
-}
-
-COMPAT53_API void lua_seti(lua_State* L, int index, lua_Integer i) {
-	luaL_checkstack(L, 1, "not enough stack slots available");
-	index = lua_absindex(L, index);
-	lua_pushinteger(L, i);
-	lua_insert(L, -2);
-	lua_settable(L, index);
-}
-
-#if !defined(lua_str2number)
-#define lua_str2number(s, p) strtod((s), (p))
-#endif
-
-COMPAT53_API size_t lua_stringtonumber(lua_State* L, const char* s) {
-	char* endptr;
-	lua_Number n = lua_str2number(s, &endptr);
-	if (endptr != s) {
-		while (*endptr != '\0' && isspace((unsigned char)*endptr))
-			++endptr;
-		if (*endptr == '\0') {
-			lua_pushnumber(L, n);
-			return endptr - s + 1;
-		}
-	}
-	return 0;
-}
-
-COMPAT53_API const char* luaL_tolstring(lua_State* L, int idx, size_t* len) {
-	if (!luaL_callmeta(L, idx, "__tostring")) {
-		int t = lua_type(L, idx), tt = 0;
-		char const* name = NULL;
-		switch (t) {
-		case LUA_TNIL:
-			lua_pushliteral(L, "nil");
-			break;
-		case LUA_TSTRING:
-		case LUA_TNUMBER:
-			lua_pushvalue(L, idx);
-			break;
-		case LUA_TBOOLEAN:
-			if (lua_toboolean(L, idx))
-				lua_pushliteral(L, "true");
-			else
-				lua_pushliteral(L, "false");
-			break;
-		default:
-			tt = luaL_getmetafield(L, idx, "__name");
-			name = (tt == LUA_TSTRING) ? lua_tostring(L, -1) : lua_typename(L, t);
-			lua_pushfstring(L, "%s: %p", name, lua_topointer(L, idx));
-			if (tt != LUA_TNIL)
-				lua_replace(L, -2);
-			break;
-		}
-	}
-	else {
-		if (!lua_isstring(L, -1))
-			luaL_error(L, "'__tostring' must return a string");
-	}
-	return lua_tolstring(L, -1, len);
-}
-
-COMPAT53_API void luaL_requiref(lua_State* L, const char* modname, lua_CFunction openf, int glb) {
-	luaL_checkstack(L, 3, "not enough stack slots available");
-	luaL_getsubtable(L, LUA_REGISTRYINDEX, "_LOADED");
-	if (lua_getfield(L, -1, modname) == LUA_TNIL) {
-		lua_pop(L, 1);
-		lua_pushcfunction(L, openf);
-		lua_pushstring(L, modname);
-		lua_call(L, 1, 1);
-		lua_pushvalue(L, -1);
-		lua_setfield(L, -3, modname);
-	}
-	if (glb) {
-		lua_pushvalue(L, -1);
-		lua_setglobal(L, modname);
-	}
-	lua_replace(L, -2);
-}
-
-#endif /* Lua 5.1 and 5.2 */
-
-#endif /* KEPLER_PROJECT_COMPAT53_C_ */
-
-/*********************************************************************
- * This file contains parts of Lua 5.2's and Lua 5.3's source code:
- *
- * Copyright (C) 1994-2014 Lua.org, PUC-Rio.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *********************************************************************/
-// end of sol/compatibility/compat-5.3.c.h
-
-#endif
-
-#endif /* KEPLER_PROJECT_COMPAT53_H_ */
-
-// end of sol/compatibility/compat-5.3.h
-
-// beginning of sol/compatibility/compat-5.4.h
-
-#ifndef NOT_KEPLER_PROJECT_COMPAT54_H_
-#define NOT_KEPLER_PROJECT_COMPAT54_H_
-
-#if defined(__cplusplus) && !defined(COMPAT53_LUA_CPP)
-extern "C" {
-#endif
-#include <lua.h>
-#include <lauxlib.h>
-#include <lualib.h>
-#if defined(__cplusplus) && !defined(COMPAT53_LUA_CPP)
-}
-#endif
-
-#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM == 504
-
-#if !defined(LUA_ERRGCMM)
-/* So Lua 5.4 actually removes this, which breaks sol2...
- man, this API is quite unstable...!
-*/
-#  define LUA_ERRGCMM (LUA_ERRERR + 2)
-#endif /* LUA_ERRGCMM define */
-
-#endif // Lua 5.4 only
-
-#endif // NOT_KEPLER_PROJECT_COMPAT54_H_// end of sol/compatibility/compat-5.4.h
-
-#endif
-
-// end of sol/compatibility.hpp
-
-#include <vector>
-#include <cstdint>
-#include <cstddef>
-
-namespace sol {
-
-	template <typename Allocator = std::allocator<std::byte>>
-	class basic_bytecode : private std::vector<std::byte, Allocator> {
-	private:
-		using base_t = std::vector<std::byte, Allocator>;
-
-	public:
-		using typename base_t::allocator_type;
-		using typename base_t::const_iterator;
-		using typename base_t::const_pointer;
-		using typename base_t::const_reference;
-		using typename base_t::const_reverse_iterator;
-		using typename base_t::difference_type;
-		using typename base_t::iterator;
-		using typename base_t::pointer;
-		using typename base_t::reference;
-		using typename base_t::reverse_iterator;
-		using typename base_t::size_type;
-		using typename base_t::value_type;
-
-		using base_t::base_t;
-		using base_t::operator=;
-
-		using base_t::data;
-		using base_t::empty;
-		using base_t::max_size;
-		using base_t::size;
-
-		using base_t::at;
-		using base_t::operator[];
-		using base_t::back;
-		using base_t::front;
-
-		using base_t::begin;
-		using base_t::cbegin;
-		using base_t::cend;
-		using base_t::end;
-
-		using base_t::crbegin;
-		using base_t::crend;
-		using base_t::rbegin;
-		using base_t::rend;
-
-		using base_t::get_allocator;
-		using base_t::swap;
-
-		using base_t::clear;
-		using base_t::emplace;
-		using base_t::emplace_back;
-		using base_t::erase;
-		using base_t::insert;
-		using base_t::pop_back;
-		using base_t::push_back;
-		using base_t::reserve;
-		using base_t::resize;
-		using base_t::shrink_to_fit;
-
-		string_view as_string_view() const {
-			return string_view(reinterpret_cast<const char*>(this->data()), this->size());
-		}
-	};
-
-	template <typename Container>
-	inline int basic_insert_dump_writer(lua_State*, const void* memory, size_t memory_size, void* userdata) {
-		using storage_t = Container;
-		const std::byte* p_code = static_cast<const std::byte*>(memory);
-		storage_t& bc = *static_cast<storage_t*>(userdata);
-#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
-		bc.insert(bc.cend(), p_code, p_code + memory_size);
-#else
-		try {
-			bc.insert(bc.cend(), p_code, p_code + memory_size);
-		}
-		catch (...) {
-			return -1;
-		}
-#endif
-		return 0;
-	}
-
-	using bytecode = basic_bytecode<>;
-
-	constexpr inline auto bytecode_dump_writer = &basic_insert_dump_writer<bytecode>;
-
-} // namespace sol
-
-// end of sol/bytecode.hpp
-
-// beginning of sol/stack.hpp
-
-// beginning of sol/trampoline.hpp
-
-// beginning of sol/types.hpp
-
-// beginning of sol/error.hpp
-
-#include <stdexcept>
-#include <string>
-#include <array>
-
-namespace sol {
-	namespace detail {
-		struct direct_error_tag {};
-		const auto direct_error = direct_error_tag{};
-
-		struct error_result {
-			int results;
-			const char* format_string;
-			std::array<const char*, 4> args_strings;
-
-			error_result() : results(0), format_string(nullptr) {
-			}
-
-			error_result(int results) : results(results), format_string(nullptr) {
-			}
-
-			error_result(const char* fmt, const char* msg) : results(0), format_string(fmt) {
-				args_strings[0] = msg;
-			}
-		};
-
-		inline int handle_errors(lua_State* L, const error_result& er) {
-			if (er.format_string == nullptr) {
-				return er.results;
-			}
-			return luaL_error(L, er.format_string, er.args_strings[0], er.args_strings[1], er.args_strings[2], er.args_strings[3]);
-		}
-	} // namespace detail
-
-	class error : public std::runtime_error {
-	private:
-		// Because VC++ is upsetting, most of the time!
-		std::string what_reason;
-
-	public:
-		error(const std::string& str) : error(detail::direct_error, "lua: error: " + str) {
-		}
-		error(std::string&& str) : error(detail::direct_error, "lua: error: " + std::move(str)) {
-		}
-		error(detail::direct_error_tag, const std::string& str) : std::runtime_error(""), what_reason(str) {
-		}
-		error(detail::direct_error_tag, std::string&& str) : std::runtime_error(""), what_reason(std::move(str)) {
-		}
-
-		error(const error& e) = default;
-		error(error&& e) = default;
-		error& operator=(const error& e) = default;
-		error& operator=(error&& e) = default;
-
-		virtual const char* what() const noexcept override {
-			return what_reason.c_str();
-		}
-	};
-
-} // namespace sol
-
-// end of sol/error.hpp
-
-// beginning of sol/optional.hpp
-
-// beginning of sol/in_place.hpp
-
-#include <cstddef>
-#include <utility>
-
-namespace sol {
-
-	using in_place_t = std::in_place_t;
-	constexpr std::in_place_t in_place {};
-	constexpr std::in_place_t in_place_of {};
-
-	template <typename T>
-	using in_place_type_t = std::in_place_type_t<T>;
-	template <typename T>
-	constexpr std::in_place_type_t<T> in_place_type {};
-
-	template <size_t I>
-	using in_place_index_t = std::in_place_index_t<I>;
-	template <size_t I>
-	constexpr in_place_index_t<I> in_place_index {};
-
-} // namespace sol
-
-// end of sol/in_place.hpp
-
-#if SOL_IS_ON(SOL_USE_BOOST_I_)
-#include <boost/optional.hpp>
-#else
-// beginning of sol/optional_implementation.hpp
-
-#define SOL_TL_OPTIONAL_VERSION_MAJOR 0
-#define SOL_TL_OPTIONAL_VERSION_MINOR 5
-
-#include <exception>
-#include <functional>
-#include <new>
-#include <type_traits>
-#include <utility>
-#include <cstdlib>
-#include <optional>
-
-#if (defined(_MSC_VER) && _MSC_VER == 1900)
-#define SOL_TL_OPTIONAL_MSVC2015
-#endif
-
-#if (defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ <= 9 && !defined(__clang__))
-#define SOL_TL_OPTIONAL_GCC49
-#endif
-
-#if (defined(__GNUC__) && __GNUC__ == 5 && __GNUC_MINOR__ <= 4 && !defined(__clang__))
-#define SOL_TL_OPTIONAL_GCC54
-#endif
-
-#if (defined(__GNUC__) && __GNUC__ == 5 && __GNUC_MINOR__ <= 5 && !defined(__clang__))
-#define SOL_TL_OPTIONAL_GCC55
-#endif
-
-#if (defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ <= 9 && !defined(__clang__))
-#define SOL_TL_OPTIONAL_NO_CONSTRR
-
-#define SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_CONSTRUCTIBLE(T) std::has_trivial_copy_constructor<T>::value
-#define SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_ASSIGNABLE(T) std::has_trivial_copy_assign<T>::value
-
-#define SOL_TL_OPTIONAL_IS_TRIVIALLY_DESTRUCTIBLE(T) std::is_trivially_destructible<T>::value
-
-#elif (defined(__GNUC__) && __GNUC__ < 8 && !defined(__clang__))
-#ifndef SOL_TL_GCC_LESS_8_TRIVIALLY_COPY_CONSTRUCTIBLE_MUTEX
-#define SOL_TL_GCC_LESS_8_TRIVIALLY_COPY_CONSTRUCTIBLE_MUTEX
-namespace sol { namespace detail {
-	template <class T>
-	struct is_trivially_copy_constructible : std::is_trivially_copy_constructible<T> {};
-#ifdef _GLIBCXX_VECTOR
-	template <class T, class A>
-	struct is_trivially_copy_constructible<std::vector<T, A>> : std::is_trivially_copy_constructible<T> {};
-#endif
-}} // namespace sol::detail
-#endif
-
-#define SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_CONSTRUCTIBLE(T) sol::detail::is_trivially_copy_constructible<T>::value
-#define SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_ASSIGNABLE(T) std::is_trivially_copy_assignable<T>::value
-#define SOL_TL_OPTIONAL_IS_TRIVIALLY_DESTRUCTIBLE(T) std::is_trivially_destructible<T>::value
-#else
-#define SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_CONSTRUCTIBLE(T) std::is_trivially_copy_constructible<T>::value
-#define SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_ASSIGNABLE(T) std::is_trivially_copy_assignable<T>::value
-#define SOL_TL_OPTIONAL_IS_TRIVIALLY_DESTRUCTIBLE(T) std::is_trivially_destructible<T>::value
-#endif
-
-#if __cplusplus > 201103L
-#define SOL_TL_OPTIONAL_CXX14
-#endif
-
-#if (__cplusplus == 201103L || defined(SOL_TL_OPTIONAL_MSVC2015) || defined(SOL_TL_OPTIONAL_GCC49))
-#define SOL_TL_OPTIONAL_11_CONSTEXPR
-#else
-   /// \exclude
-#define SOL_TL_OPTIONAL_11_CONSTEXPR constexpr
-#endif
-
-namespace sol {
-#ifndef SOL_TL_MONOSTATE_INPLACE_MUTEX
-#define SOL_TL_MONOSTATE_INPLACE_MUTEX
-	/// \brief Used to represent an optional with no data; essentially a bool
-	class monostate {};
-#endif
-
-	template <class T>
-	class optional;
-
-	/// \exclude
-	namespace detail {
-#ifndef SOL_TL_TRAITS_MUTEX
-#define SOL_TL_TRAITS_MUTEX
-		// C++14-style aliases for brevity
-		template <class T>
-		using remove_const_t = typename std::remove_const<T>::type;
-		template <class T>
-		using remove_reference_t = typename std::remove_reference<T>::type;
-		template <class T>
-		using decay_t = typename std::decay<T>::type;
-		template <bool E, class T = void>
-		using enable_if_t = typename std::enable_if<E, T>::type;
-		template <bool B, class T, class F>
-		using conditional_t = typename std::conditional<B, T, F>::type;
-
-		// std::conjunction from C++17
-		template <class...>
-		struct conjunction : std::true_type {};
-		template <class B>
-		struct conjunction<B> : B {};
-		template <class B, class... Bs>
-		struct conjunction<B, Bs...> : std::conditional<bool(B::value), conjunction<Bs...>, B>::type {};
-
-#if defined(_LIBCPP_VERSION) && __cplusplus == 201103L
-#define SOL_TL_OPTIONAL_LIBCXX_MEM_FN_WORKAROUND
-#endif
-
-#ifdef SOL_TL_OPTIONAL_LIBCXX_MEM_FN_WORKAROUND
-		template <class T>
-		struct is_pointer_to_non_const_member_func : std::false_type {};
-		template <class T, class Ret, class... Args>
-		struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...)> : std::true_type {};
-		template <class T, class Ret, class... Args>
-		struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...)&> : std::true_type {};
-		template <class T, class Ret, class... Args>
-		struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...) &&> : std::true_type {};
-		template <class T, class Ret, class... Args>
-		struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...) volatile> : std::true_type {};
-		template <class T, class Ret, class... Args>
-		struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...) volatile&> : std::true_type {};
-		template <class T, class Ret, class... Args>
-		struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...) volatile&&> : std::true_type {};
-
-		template <class T>
-		struct is_const_or_const_ref : std::false_type {};
-		template <class T>
-		struct is_const_or_const_ref<T const&> : std::true_type {};
-		template <class T>
-		struct is_const_or_const_ref<T const> : std::true_type {};
-#endif
-
-		// std::invoke from C++17
-		// https://stackoverflow.com/questions/38288042/c11-14-invoke-workaround
-		template <typename Fn, typename... Args,
-#ifdef SOL_TL_OPTIONAL_LIBCXX_MEM_FN_WORKAROUND
-		     typename = enable_if_t<!(is_pointer_to_non_const_member_func<Fn>::value && is_const_or_const_ref<Args...>::value)>,
-#endif
-		     typename = enable_if_t<std::is_member_pointer<decay_t<Fn>>::value>, int = 0>
-		constexpr auto invoke(Fn&& f, Args&&... args) noexcept(noexcept(std::mem_fn(f)(std::forward<Args>(args)...)))
-		     -> decltype(std::mem_fn(f)(std::forward<Args>(args)...)) {
-			return std::mem_fn(f)(std::forward<Args>(args)...);
-		}
-
-		template <typename Fn, typename... Args, typename = enable_if_t<!std::is_member_pointer<decay_t<Fn>>::value>>
-		constexpr auto invoke(Fn&& f, Args&&... args) noexcept(noexcept(std::forward<Fn>(f)(std::forward<Args>(args)...)))
-		     -> decltype(std::forward<Fn>(f)(std::forward<Args>(args)...)) {
-			return std::forward<Fn>(f)(std::forward<Args>(args)...);
-		}
-
-		// std::invoke_result from C++17
-		template <class F, class, class... Us>
-		struct invoke_result_impl;
-
-		template <class F, class... Us>
-		struct invoke_result_impl<F, decltype(detail::invoke(std::declval<F>(), std::declval<Us>()...), void()), Us...> {
-			using type = decltype(detail::invoke(std::declval<F>(), std::declval<Us>()...));
-		};
-
-		template <class F, class... Us>
-		using invoke_result = invoke_result_impl<F, void, Us...>;
-
-		template <class F, class... Us>
-		using invoke_result_t = typename invoke_result<F, Us...>::type;
-#endif
-
-		// std::void_t from C++17
-		template <class...>
-		struct voider {
-			using type = void;
-		};
-		template <class... Ts>
-		using void_t = typename voider<Ts...>::type;
-
-		// Trait for checking if a type is a sol::optional
-		template <class T>
-		struct is_optional_impl : std::false_type {};
-		template <class T>
-		struct is_optional_impl<optional<T>> : std::true_type {};
-		template <class T>
-		using is_optional = is_optional_impl<decay_t<T>>;
-
-		// Change void to sol::monostate
-		template <class U>
-		using fixup_void = conditional_t<std::is_void<U>::value, monostate, U>;
-
-		template <class F, class U, class = invoke_result_t<F, U>>
-		using get_map_return = optional<fixup_void<invoke_result_t<F, U>>>;
-
-		// Check if invoking F for some Us returns void
-		template <class F, class = void, class... U>
-		struct returns_void_impl;
-		template <class F, class... U>
-		struct returns_void_impl<F, void_t<invoke_result_t<F, U...>>, U...> : std::is_void<invoke_result_t<F, U...>> {};
-		template <class F, class... U>
-		using returns_void = returns_void_impl<F, void, U...>;
-
-		template <class T, class... U>
-		using enable_if_ret_void = enable_if_t<returns_void<T&&, U...>::value>;
-
-		template <class T, class... U>
-		using disable_if_ret_void = enable_if_t<!returns_void<T&&, U...>::value>;
-
-		template <class T, class U>
-		using enable_forward_value = detail::enable_if_t<std::is_constructible<T, U&&>::value && !std::is_same<detail::decay_t<U>, in_place_t>::value
-		     && !std::is_same<optional<T>, detail::decay_t<U>>::value>;
-
-		template <class T, class U, class Other>
-		using enable_from_other = detail::enable_if_t<std::is_constructible<T, Other>::value && !std::is_constructible<T, optional<U>&>::value
-		     && !std::is_constructible<T, optional<U>&&>::value && !std::is_constructible<T, const optional<U>&>::value
-		     && !std::is_constructible<T, const optional<U>&&>::value && !std::is_convertible<optional<U>&, T>::value
-		     && !std::is_convertible<optional<U>&&, T>::value && !std::is_convertible<const optional<U>&, T>::value
-		     && !std::is_convertible<const optional<U>&&, T>::value>;
-
-		template <class T, class U>
-		using enable_assign_forward = detail::enable_if_t<!std::is_same<optional<T>, detail::decay_t<U>>::value
-		     && !detail::conjunction<std::is_scalar<T>, std::is_same<T, detail::decay_t<U>>>::value && std::is_constructible<T, U>::value
-		     && std::is_assignable<T&, U>::value>;
-
-		template <class T, class U, class Other>
-		using enable_assign_from_other = detail::enable_if_t<std::is_constructible<T, Other>::value && std::is_assignable<T&, Other>::value
-		     && !std::is_constructible<T, optional<U>&>::value && !std::is_constructible<T, optional<U>&&>::value
-		     && !std::is_constructible<T, const optional<U>&>::value && !std::is_constructible<T, const optional<U>&&>::value
-		     && !std::is_convertible<optional<U>&, T>::value && !std::is_convertible<optional<U>&&, T>::value
-		     && !std::is_convertible<const optional<U>&, T>::value && !std::is_convertible<const optional<U>&&, T>::value
-		     && !std::is_assignable<T&, optional<U>&>::value && !std::is_assignable<T&, optional<U>&&>::value
-		     && !std::is_assignable<T&, const optional<U>&>::value && !std::is_assignable<T&, const optional<U>&&>::value>;
-
-#ifdef _MSC_VER
-		// TODO make a version which works with MSVC
-		template <class T, class U = T>
-		struct is_swappable : std::true_type {};
-
-		template <class T, class U = T>
-		struct is_nothrow_swappable : std::true_type {};
-#else
-		// https://stackoverflow.com/questions/26744589/what-is-a-proper-way-to-implement-is-swappable-to-test-for-the-swappable-concept
-		namespace swap_adl_tests {
-			// if swap ADL finds this then it would call std::swap otherwise (same
-			// signature)
-			struct tag {};
-
-			template <class T>
-			tag swap(T&, T&);
-			template <class T, std::size_t N>
-			tag swap(T (&a)[N], T (&b)[N]);
-
-			// helper functions to test if an unqualified swap is possible, and if it
-			// becomes std::swap
-			template <class, class>
-			std::false_type can_swap(...) noexcept(false);
-			template <class T, class U, class = decltype(swap(std::declval<T&>(), std::declval<U&>()))>
-			std::true_type can_swap(int) noexcept(noexcept(swap(std::declval<T&>(), std::declval<U&>())));
-
-			template <class, class>
-			std::false_type uses_std(...);
-			template <class T, class U>
-			std::is_same<decltype(swap(std::declval<T&>(), std::declval<U&>())), tag> uses_std(int);
-
-			template <class T>
-			struct is_std_swap_noexcept
-			: std::integral_constant<bool, std::is_nothrow_move_constructible<T>::value && std::is_nothrow_move_assignable<T>::value> {};
-
-			template <class T, std::size_t N>
-			struct is_std_swap_noexcept<T[N]> : is_std_swap_noexcept<T> {};
-
-			template <class T, class U>
-			struct is_adl_swap_noexcept : std::integral_constant<bool, noexcept(can_swap<T, U>(0))> {};
-		} // namespace swap_adl_tests
-
-		template <class T, class U = T>
-		struct is_swappable : std::integral_constant<bool,
-		                           decltype(detail::swap_adl_tests::can_swap<T, U>(0))::value
-		                                && (!decltype(detail::swap_adl_tests::uses_std<T, U>(0))::value
-		                                     || (std::is_move_assignable<T>::value && std::is_move_constructible<T>::value))> {};
-
-		template <class T, std::size_t N>
-		struct is_swappable<T[N], T[N]> : std::integral_constant<bool,
-		                                       decltype(detail::swap_adl_tests::can_swap<T[N], T[N]>(0))::value
-		                                            && (!decltype(detail::swap_adl_tests::uses_std<T[N], T[N]>(0))::value || is_swappable<T, T>::value)> {};
-
-		template <class T, class U = T>
-		struct is_nothrow_swappable
-		: std::integral_constant<bool,
-		       is_swappable<T, U>::value
-		            && ((decltype(detail::swap_adl_tests::uses_std<T, U>(0))::value&& detail::swap_adl_tests::is_std_swap_noexcept<T>::value)
-		                 || (!decltype(detail::swap_adl_tests::uses_std<T, U>(0))::value&& detail::swap_adl_tests::is_adl_swap_noexcept<T, U>::value))> {};
-#endif
-
-		// The storage base manages the actual storage, and correctly propagates
-		// trivial destruction from T. This case is for when T is not trivially
-		// destructible.
-		template <class T, bool = ::std::is_trivially_destructible<T>::value>
-		struct optional_storage_base {
-			SOL_TL_OPTIONAL_11_CONSTEXPR optional_storage_base() noexcept : m_dummy(), m_has_value(false) {
-			}
-
-			template <class... U>
-			SOL_TL_OPTIONAL_11_CONSTEXPR optional_storage_base(in_place_t, U&&... u) : m_value(std::forward<U>(u)...), m_has_value(true) {
-			}
-
-			~optional_storage_base() {
-				if (m_has_value) {
-					m_value.~T();
-					m_has_value = false;
-				}
-			}
-
-			struct dummy {};
-			union {
-				dummy m_dummy;
-				T m_value;
-			};
-
-			bool m_has_value;
-		};
-
-		// This case is for when T is trivially destructible.
-		template <class T>
-		struct optional_storage_base<T, true> {
-			SOL_TL_OPTIONAL_11_CONSTEXPR optional_storage_base() noexcept : m_dummy(), m_has_value(false) {
-			}
-
-			template <class... U>
-			SOL_TL_OPTIONAL_11_CONSTEXPR optional_storage_base(in_place_t, U&&... u) : m_value(std::forward<U>(u)...), m_has_value(true) {
-			}
-
-			// No destructor, so this class is trivially destructible
-
-			struct dummy {};
-			union {
-				dummy m_dummy;
-				T m_value;
-			};
-
-			bool m_has_value = false;
-		};
-
-		// This base class provides some handy member functions which can be used in
-		// further derived classes
-		template <class T>
-		struct optional_operations_base : optional_storage_base<T> {
-			using optional_storage_base<T>::optional_storage_base;
-
-			void hard_reset() noexcept {
-				get().~T();
-				this->m_has_value = false;
-			}
-
-			template <class... Args>
-			void construct(Args&&... args) noexcept {
-				new (std::addressof(this->m_value)) T(std::forward<Args>(args)...);
-				this->m_has_value = true;
-			}
-
-			template <class Opt>
-			void assign(Opt&& rhs) {
-				if (this->has_value()) {
-					if (rhs.has_value()) {
-						this->m_value = std::forward<Opt>(rhs).get();
-					}
-					else {
-						this->m_value.~T();
-						this->m_has_value = false;
-					}
-				}
-
-				else if (rhs.has_value()) {
-					construct(std::forward<Opt>(rhs).get());
-				}
-			}
-
-			bool has_value() const {
-				return this->m_has_value;
-			}
-
-			SOL_TL_OPTIONAL_11_CONSTEXPR T& get() & {
-				return this->m_value;
-			}
-			SOL_TL_OPTIONAL_11_CONSTEXPR const T& get() const& {
-				return this->m_value;
-			}
-			SOL_TL_OPTIONAL_11_CONSTEXPR T&& get() && {
-				return std::move(this->m_value);
-			}
-#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
-			constexpr const T&& get() const&& {
-				return std::move(this->m_value);
-			}
-#endif
-		};
-
-		// This class manages conditionally having a trivial copy constructor
-		// This specialization is for when T is trivially copy constructible
-		template <class T, bool = SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_CONSTRUCTIBLE(T)>
-		struct optional_copy_base : optional_operations_base<T> {
-			using optional_operations_base<T>::optional_operations_base;
-		};
-
-		// This specialization is for when T is not trivially copy constructible
-		template <class T>
-		struct optional_copy_base<T, false> : optional_operations_base<T> {
-			using base_t = optional_operations_base<T>;
-
-			using base_t::base_t;
-
-			optional_copy_base() = default;
-			optional_copy_base(const optional_copy_base& rhs) : base_t() {
-				if (rhs.has_value()) {
-					this->construct(rhs.get());
-				}
-				else {
-					this->m_has_value = false;
-				}
-			}
-
-			optional_copy_base(optional_copy_base&& rhs) = default;
-			optional_copy_base& operator=(const optional_copy_base& rhs) = default;
-			optional_copy_base& operator=(optional_copy_base&& rhs) = default;
-		};
-
-#ifndef SOL_TL_OPTIONAL_GCC49
-		template <class T, bool = std::is_trivially_move_constructible<T>::value>
-		struct optional_move_base : optional_copy_base<T> {
-			using optional_copy_base<T>::optional_copy_base;
-		};
-#else
-		template <class T, bool = false>
-		struct optional_move_base;
-#endif
-		template <class T>
-		struct optional_move_base<T, false> : optional_copy_base<T> {
-			using optional_copy_base<T>::optional_copy_base;
-
-			optional_move_base() = default;
-			optional_move_base(const optional_move_base& rhs) = default;
-
-			optional_move_base(optional_move_base&& rhs) noexcept(std::is_nothrow_move_constructible<T>::value) {
-				if (rhs.has_value()) {
-					this->construct(std::move(rhs.get()));
-				}
-				else {
-					this->m_has_value = false;
-				}
-			}
-			optional_move_base& operator=(const optional_move_base& rhs) = default;
-			optional_move_base& operator=(optional_move_base&& rhs) = default;
-		};
-
-		// This class manages conditionally having a trivial copy assignment operator
-		template <class T,
-		     bool = SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_ASSIGNABLE(T) && SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_CONSTRUCTIBLE(T)
-		          && SOL_TL_OPTIONAL_IS_TRIVIALLY_DESTRUCTIBLE(T)>
-		struct optional_copy_assign_base : optional_move_base<T> {
-			using optional_move_base<T>::optional_move_base;
-		};
-
-		template <class T>
-		struct optional_copy_assign_base<T, false> : optional_move_base<T> {
-			using optional_move_base<T>::optional_move_base;
-
-			optional_copy_assign_base() = default;
-			optional_copy_assign_base(const optional_copy_assign_base& rhs) = default;
-
-			optional_copy_assign_base(optional_copy_assign_base&& rhs) = default;
-			optional_copy_assign_base& operator=(const optional_copy_assign_base& rhs) {
-				this->assign(rhs);
-				return *this;
-			}
-			optional_copy_assign_base& operator=(optional_copy_assign_base&& rhs) = default;
-		};
-
-#ifndef SOL_TL_OPTIONAL_GCC49
-		template <class T,
-		     bool = std::is_trivially_destructible<T>::value&& std::is_trivially_move_constructible<T>::value&& std::is_trivially_move_assignable<T>::value>
-		struct optional_move_assign_base : optional_copy_assign_base<T> {
-			using optional_copy_assign_base<T>::optional_copy_assign_base;
-		};
-#else
-		template <class T, bool = false>
-		struct optional_move_assign_base;
-#endif
-
-		template <class T>
-		struct optional_move_assign_base<T, false> : optional_copy_assign_base<T> {
-			using optional_copy_assign_base<T>::optional_copy_assign_base;
-
-			optional_move_assign_base() = default;
-			optional_move_assign_base(const optional_move_assign_base& rhs) = default;
-
-			optional_move_assign_base(optional_move_assign_base&& rhs) = default;
-
-			optional_move_assign_base& operator=(const optional_move_assign_base& rhs) = default;
-
-			optional_move_assign_base& operator=(optional_move_assign_base&& rhs) noexcept(
-			     std::is_nothrow_move_constructible<T>::value&& std::is_nothrow_move_assignable<T>::value) {
-				this->assign(std::move(rhs));
-				return *this;
-			}
-		};
-
-		// optional_delete_ctor_base will conditionally delete copy and move
-		// constructors depending on whether T is copy/move constructible
-		template <class T, bool EnableCopy = std::is_copy_constructible<T>::value, bool EnableMove = std::is_move_constructible<T>::value>
-		struct optional_delete_ctor_base {
-			optional_delete_ctor_base() = default;
-			optional_delete_ctor_base(const optional_delete_ctor_base&) = default;
-			optional_delete_ctor_base(optional_delete_ctor_base&&) noexcept = default;
-			optional_delete_ctor_base& operator=(const optional_delete_ctor_base&) = default;
-			optional_delete_ctor_base& operator=(optional_delete_ctor_base&&) noexcept = default;
-		};
-
-		template <class T>
-		struct optional_delete_ctor_base<T, true, false> {
-			optional_delete_ctor_base() = default;
-			optional_delete_ctor_base(const optional_delete_ctor_base&) = default;
-			optional_delete_ctor_base(optional_delete_ctor_base&&) noexcept = delete;
-			optional_delete_ctor_base& operator=(const optional_delete_ctor_base&) = default;
-			optional_delete_ctor_base& operator=(optional_delete_ctor_base&&) noexcept = default;
-		};
-
-		template <class T>
-		struct optional_delete_ctor_base<T, false, true> {
-			optional_delete_ctor_base() = default;
-			optional_delete_ctor_base(const optional_delete_ctor_base&) = delete;
-			optional_delete_ctor_base(optional_delete_ctor_base&&) noexcept = default;
-			optional_delete_ctor_base& operator=(const optional_delete_ctor_base&) = default;
-			optional_delete_ctor_base& operator=(optional_delete_ctor_base&&) noexcept = default;
-		};
-
-		template <class T>
-		struct optional_delete_ctor_base<T, false, false> {
-			optional_delete_ctor_base() = default;
-			optional_delete_ctor_base(const optional_delete_ctor_base&) = delete;
-			optional_delete_ctor_base(optional_delete_ctor_base&&) noexcept = delete;
-			optional_delete_ctor_base& operator=(const optional_delete_ctor_base&) = default;
-			optional_delete_ctor_base& operator=(optional_delete_ctor_base&&) noexcept = default;
-		};
-
-		// optional_delete_assign_base will conditionally delete copy and move
-		// constructors depending on whether T is copy/move constructible + assignable
-		template <class T, bool EnableCopy = (std::is_copy_constructible<T>::value && std::is_copy_assignable<T>::value),
-		     bool EnableMove = (std::is_move_constructible<T>::value && std::is_move_assignable<T>::value)>
-		struct optional_delete_assign_base {
-			optional_delete_assign_base() = default;
-			optional_delete_assign_base(const optional_delete_assign_base&) = default;
-			optional_delete_assign_base(optional_delete_assign_base&&) noexcept = default;
-			optional_delete_assign_base& operator=(const optional_delete_assign_base&) = default;
-			optional_delete_assign_base& operator=(optional_delete_assign_base&&) noexcept = default;
-		};
-
-		template <class T>
-		struct optional_delete_assign_base<T, true, false> {
-			optional_delete_assign_base() = default;
-			optional_delete_assign_base(const optional_delete_assign_base&) = default;
-			optional_delete_assign_base(optional_delete_assign_base&&) noexcept = default;
-			optional_delete_assign_base& operator=(const optional_delete_assign_base&) = default;
-			optional_delete_assign_base& operator=(optional_delete_assign_base&&) noexcept = delete;
-		};
-
-		template <class T>
-		struct optional_delete_assign_base<T, false, true> {
-			optional_delete_assign_base() = default;
-			optional_delete_assign_base(const optional_delete_assign_base&) = default;
-			optional_delete_assign_base(optional_delete_assign_base&&) noexcept = default;
-			optional_delete_assign_base& operator=(const optional_delete_assign_base&) = delete;
-			optional_delete_assign_base& operator=(optional_delete_assign_base&&) noexcept = default;
-		};
-
-		template <class T>
-		struct optional_delete_assign_base<T, false, false> {
-			optional_delete_assign_base() = default;
-			optional_delete_assign_base(const optional_delete_assign_base&) = default;
-			optional_delete_assign_base(optional_delete_assign_base&&) noexcept = default;
-			optional_delete_assign_base& operator=(const optional_delete_assign_base&) = delete;
-			optional_delete_assign_base& operator=(optional_delete_assign_base&&) noexcept = delete;
-		};
-
-	} // namespace detail
-
-	/// \brief A tag type to represent an empty optional
-	using nullopt_t = std::nullopt_t;
-
-	/// \brief Represents an empty optional
-	/// \synopsis static constexpr nullopt_t nullopt;
-	///
-	/// *Examples*:
-	/// ```
-	/// sol::optional<int> a = sol::nullopt;
-	/// void foo (sol::optional<int>);
-	/// foo(sol::nullopt); //pass an empty optional
-	/// ```
-	using std::nullopt;
-
-	class bad_optional_access : public std::exception {
-	public:
-		bad_optional_access() = default;
-		const char* what() const noexcept {
-			return "Optional has no value";
-		}
-	};
-
-	/// An optional object is an object that contains the storage for another
-	/// object and manages the lifetime of this contained object, if any. The
-	/// contained object may be initialized after the optional object has been
-	/// initialized, and may be destroyed before the optional object has been
-	/// destroyed. The initialization state of the contained object is tracked by
-	/// the optional object.
-	template <class T>
-	class optional : private detail::optional_move_assign_base<T>,
-	                 private detail::optional_delete_ctor_base<T>,
-	                 private detail::optional_delete_assign_base<T> {
-		using base = detail::optional_move_assign_base<T>;
-
-		static_assert(!std::is_same<T, in_place_t>::value, "instantiation of optional with in_place_t is ill-formed");
-		static_assert(!std::is_same<detail::decay_t<T>, nullopt_t>::value, "instantiation of optional with nullopt_t is ill-formed");
-
-	public:
-#if defined(SOL_TL_OPTIONAL_CXX14) && !defined(SOL_TL_OPTIONAL_GCC49) && !defined(SOL_TL_OPTIONAL_GCC54) && !defined(SOL_TL_OPTIONAL_GCC55)
-		/// \group and_then
-		/// Carries out some operation which returns an optional on the stored
-		/// object if there is one. \requires `std::invoke(std::forward<F>(f),
-		/// value())` returns a `std::optional<U>` for some `U`. \returns Let `U` be
-		/// the result of `std::invoke(std::forward<F>(f), value())`. Returns a
-		/// `std::optional<U>`. The return value is empty if `*this` is empty,
-		/// otherwise the return value of `std::invoke(std::forward<F>(f), value())`
-		/// is returned.
-		/// \group and_then
-		/// \synopsis template <class F>\nconstexpr auto and_then(F &&f) &;
-		template <class F>
-		SOL_TL_OPTIONAL_11_CONSTEXPR auto and_then(F&& f) & {
-			using result = detail::invoke_result_t<F, T&>;
-			static_assert(detail::is_optional<result>::value, "F must return an optional");
-
-			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
-		}
-
-		/// \group and_then
-		/// \synopsis template <class F>\nconstexpr auto and_then(F &&f) &&;
-		template <class F>
-		SOL_TL_OPTIONAL_11_CONSTEXPR auto and_then(F&& f) && {
-			using result = detail::invoke_result_t<F, T&&>;
-			static_assert(detail::is_optional<result>::value, "F must return an optional");
-
-			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : result(nullopt);
-		}
-
-		/// \group and_then
-		/// \synopsis template <class F>\nconstexpr auto and_then(F &&f) const &;
-		template <class F>
-		constexpr auto and_then(F&& f) const& {
-			using result = detail::invoke_result_t<F, const T&>;
-			static_assert(detail::is_optional<result>::value, "F must return an optional");
-
-			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
-		}
-
-#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
-		/// \group and_then
-		/// \synopsis template <class F>\nconstexpr auto and_then(F &&f) const &&;
-		template <class F>
-		constexpr auto and_then(F&& f) const&& {
-			using result = detail::invoke_result_t<F, const T&&>;
-			static_assert(detail::is_optional<result>::value, "F must return an optional");
-
-			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : result(nullopt);
-		}
-#endif
-#else
-		/// \group and_then
-		/// Carries out some operation which returns an optional on the stored
-		/// object if there is one. \requires `std::invoke(std::forward<F>(f),
-		/// value())` returns a `std::optional<U>` for some `U`.
-		/// \returns Let `U` be the result of `std::invoke(std::forward<F>(f),
-		/// value())`. Returns a `std::optional<U>`. The return value is empty if
-		/// `*this` is empty, otherwise the return value of
-		/// `std::invoke(std::forward<F>(f), value())` is returned.
-		/// \group and_then
-		/// \synopsis template <class F>\nconstexpr auto and_then(F &&f) &;
-		template <class F>
-		SOL_TL_OPTIONAL_11_CONSTEXPR detail::invoke_result_t<F, T&> and_then(F&& f) & {
-			using result = detail::invoke_result_t<F, T&>;
-			static_assert(detail::is_optional<result>::value, "F must return an optional");
-
-			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
-		}
-
-		/// \group and_then
-		/// \synopsis template <class F>\nconstexpr auto and_then(F &&f) &&;
-		template <class F>
-		SOL_TL_OPTIONAL_11_CONSTEXPR detail::invoke_result_t<F, T&&> and_then(F&& f) && {
-			using result = detail::invoke_result_t<F, T&&>;
-			static_assert(detail::is_optional<result>::value, "F must return an optional");
-
-			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : result(nullopt);
-		}
-
-		/// \group and_then
-		/// \synopsis template <class F>\nconstexpr auto and_then(F &&f) const &;
-		template <class F>
-		constexpr detail::invoke_result_t<F, const T&> and_then(F&& f) const& {
-			using result = detail::invoke_result_t<F, const T&>;
-			static_assert(detail::is_optional<result>::value, "F must return an optional");
-
-			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
-		}
-
-#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
-		/// \group and_then
-		/// \synopsis template <class F>\nconstexpr auto and_then(F &&f) const &&;
-		template <class F>
-		constexpr detail::invoke_result_t<F, const T&&> and_then(F&& f) const&& {
-			using result = detail::invoke_result_t<F, const T&&>;
-			static_assert(detail::is_optional<result>::value, "F must return an optional");
-
-			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : result(nullopt);
-		}
-#endif
-#endif
-
-#if defined(SOL_TL_OPTIONAL_CXX14) && !defined(SOL_TL_OPTIONAL_GCC49) && !defined(SOL_TL_OPTIONAL_GCC54) && !defined(SOL_TL_OPTIONAL_GCC55)
-		/// \brief Carries out some operation on the stored object if there is one.
-		/// \returns Let `U` be the result of `std::invoke(std::forward<F>(f),
-		/// value())`. Returns a `std::optional<U>`. The return value is empty if
-		/// `*this` is empty, otherwise an `optional<U>` is constructed from the
-		/// return value of `std::invoke(std::forward<F>(f), value())` and is
-		/// returned.
-		///
-		/// \group map
-		/// \synopsis template <class F> constexpr auto map(F &&f) &;
-		template <class F>
-		SOL_TL_OPTIONAL_11_CONSTEXPR auto map(F&& f) & {
-			return optional_map_impl(*this, std::forward<F>(f));
-		}
-
-		/// \group map
-		/// \synopsis template <class F> constexpr auto map(F &&f) &&;
-		template <class F>
-		SOL_TL_OPTIONAL_11_CONSTEXPR auto map(F&& f) && {
-			return optional_map_impl(std::move(*this), std::forward<F>(f));
-		}
-
-		/// \group map
-		/// \synopsis template <class F> constexpr auto map(F &&f) const&;
-		template <class F>
-		constexpr auto map(F&& f) const& {
-			return optional_map_impl(*this, std::forward<F>(f));
-		}
-
-		/// \group map
-		/// \synopsis template <class F> constexpr auto map(F &&f) const&&;
-		template <class F>
-		constexpr auto map(F&& f) const&& {
-			return optional_map_impl(std::move(*this), std::forward<F>(f));
-		}
-#else
-		/// \brief Carries out some operation on the stored object if there is one.
-		/// \returns Let `U` be the result of `std::invoke(std::forward<F>(f),
-		/// value())`. Returns a `std::optional<U>`. The return value is empty if
-		/// `*this` is empty, otherwise an `optional<U>` is constructed from the
-		/// return value of `std::invoke(std::forward<F>(f), value())` and is
-		/// returned.
-		///
-		/// \group map
-		/// \synopsis template <class F> auto map(F &&f) &;
-		template <class F>
-		SOL_TL_OPTIONAL_11_CONSTEXPR decltype(optional_map_impl(std::declval<optional&>(), std::declval<F&&>())) map(F&& f) & {
-			return optional_map_impl(*this, std::forward<F>(f));
-		}
-
-		/// \group map
-		/// \synopsis template <class F> auto map(F &&f) &&;
-		template <class F>
-		SOL_TL_OPTIONAL_11_CONSTEXPR decltype(optional_map_impl(std::declval<optional&&>(), std::declval<F&&>())) map(F&& f) && {
-			return optional_map_impl(std::move(*this), std::forward<F>(f));
-		}
-
-		/// \group map
-		/// \synopsis template <class F> auto map(F &&f) const&;
-		template <class F>
-		constexpr decltype(optional_map_impl(std::declval<const optional&>(), std::declval<F&&>())) map(F&& f) const& {
-			return optional_map_impl(*this, std::forward<F>(f));
-		}
-
-#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
-		/// \group map
-		/// \synopsis template <class F> auto map(F &&f) const&&;
-		template <class F>
-		constexpr decltype(optional_map_impl(std::declval<const optional&&>(), std::declval<F&&>())) map(F&& f) const&& {
-			return optional_map_impl(std::move(*this), std::forward<F>(f));
-		}
-#endif
-#endif
-
-		/// \brief Calls `f` if the optional is empty
-		/// \requires `std::invoke_result_t<F>` must be void or convertible to
-		/// `optional<T>`.
-		/// \effects If `*this` has a value, returns `*this`.
-		/// Otherwise, if `f` returns `void`, calls `std::forward<F>(f)` and returns
-		/// `std::nullopt`. Otherwise, returns `std::forward<F>(f)()`.
-		///
-		/// \group or_else
-		/// \synopsis template <class F> optional<T> or_else (F &&f) &;
-		template <class F, detail::enable_if_ret_void<F>* = nullptr>
-		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) & {
-			if (has_value())
-				return *this;
-
-			std::forward<F>(f)();
-			return nullopt;
-		}
-
-		/// \exclude
-		template <class F, detail::disable_if_ret_void<F>* = nullptr>
-		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) & {
-			return has_value() ? *this : std::forward<F>(f)();
-		}
-
-		/// \group or_else
-		/// \synopsis template <class F> optional<T> or_else (F &&f) &&;
-		template <class F, detail::enable_if_ret_void<F>* = nullptr>
-		optional<T> or_else(F&& f) && {
-			if (has_value())
-				return std::move(*this);
-
-			std::forward<F>(f)();
-			return nullopt;
-		}
-
-		/// \exclude
-		template <class F, detail::disable_if_ret_void<F>* = nullptr>
-		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) && {
-			return has_value() ? std::move(*this) : std::forward<F>(f)();
-		}
-
-		/// \group or_else
-		/// \synopsis template <class F> optional<T> or_else (F &&f) const &;
-		template <class F, detail::enable_if_ret_void<F>* = nullptr>
-		optional<T> or_else(F&& f) const& {
-			if (has_value())
-				return *this;
-
-			std::forward<F>(f)();
-			return nullopt;
-		}
-
-		/// \exclude
-		template <class F, detail::disable_if_ret_void<F>* = nullptr>
-		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) const& {
-			return has_value() ? *this : std::forward<F>(f)();
-		}
-
-#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
-		/// \exclude
-		template <class F, detail::enable_if_ret_void<F>* = nullptr>
-		optional<T> or_else(F&& f) const&& {
-			if (has_value())
-				return std::move(*this);
-
-			std::forward<F>(f)();
-			return nullopt;
-		}
-
-		/// \exclude
-		template <class F, detail::disable_if_ret_void<F>* = nullptr>
-		optional<T> or_else(F&& f) const&& {
-			return has_value() ? std::move(*this) : std::forward<F>(f)();
-		}
-#endif
-
-		/// \brief Maps the stored value with `f` if there is one, otherwise returns
-		/// `u`.
-		///
-		/// \details If there is a value stored, then `f` is called with `**this`
-		/// and the value is returned. Otherwise `u` is returned.
-		///
-		/// \group map_or
-		template <class F, class U>
-		U map_or(F&& f, U&& u) & {
-			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u);
-		}
-
-		/// \group map_or
-		template <class F, class U>
-		U map_or(F&& f, U&& u) && {
-			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u);
-		}
-
-		/// \group map_or
-		template <class F, class U>
-		U map_or(F&& f, U&& u) const& {
-			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u);
-		}
-
-#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
-		/// \group map_or
-		template <class F, class U>
-		U map_or(F&& f, U&& u) const&& {
-			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u);
-		}
-#endif
-
-		/// \brief Maps the stored value with `f` if there is one, otherwise calls
-		/// `u` and returns the result.
-		///
-		/// \details If there is a value stored, then `f` is
-		/// called with `**this` and the value is returned. Otherwise
-		/// `std::forward<U>(u)()` is returned.
-		///
-		/// \group map_or_else
-		/// \synopsis template <class F, class U>\nauto map_or_else(F &&f, U &&u) &;
-		template <class F, class U>
-		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) & {
-			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u)();
-		}
-
-		/// \group map_or_else
-		/// \synopsis template <class F, class U>\nauto map_or_else(F &&f, U &&u)
-		/// &&;
-		template <class F, class U>
-		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) && {
-			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u)();
-		}
-
-		/// \group map_or_else
-		/// \synopsis template <class F, class U>\nauto map_or_else(F &&f, U &&u)
-		/// const &;
-		template <class F, class U>
-		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) const& {
-			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u)();
-		}
-
-#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
-		/// \group map_or_else
-		/// \synopsis template <class F, class U>\nauto map_or_else(F &&f, U &&u)
-		/// const &&;
-		template <class F, class U>
-		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) const&& {
-			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u)();
-		}
-#endif
-
-		/// \returns `u` if `*this` has a value, otherwise an empty optional.
-		template <class U>
-		constexpr optional<typename std::decay<U>::type> conjunction(U&& u) const {
-			using result = optional<detail::decay_t<U>>;
-			return has_value() ? result { u } : result { nullopt };
-		}
-
-		/// \returns `rhs` if `*this` is empty, otherwise the current value.
-		/// \group disjunction
-		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(const optional& rhs) & {
-			return has_value() ? *this : rhs;
-		}
-
-		/// \group disjunction
-		constexpr optional disjunction(const optional& rhs) const& {
-			return has_value() ? *this : rhs;
-		}
-
-		/// \group disjunction
-		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(const optional& rhs) && {
-			return has_value() ? std::move(*this) : rhs;
-		}
-
-#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
-		/// \group disjunction
-		constexpr optional disjunction(const optional& rhs) const&& {
-			return has_value() ? std::move(*this) : rhs;
-		}
-#endif
-
-		/// \group disjunction
-		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(optional&& rhs) & {
-			return has_value() ? *this : std::move(rhs);
-		}
-
-		/// \group disjunction
-		constexpr optional disjunction(optional&& rhs) const& {
-			return has_value() ? *this : std::move(rhs);
-		}
-
-		/// \group disjunction
-		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(optional&& rhs) && {
-			return has_value() ? std::move(*this) : std::move(rhs);
-		}
-
-#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
-		/// \group disjunction
-		constexpr optional disjunction(optional&& rhs) const&& {
-			return has_value() ? std::move(*this) : std::move(rhs);
-		}
-#endif
-
-		/// Takes the value out of the optional, leaving it empty
-		/// \group take
-		optional take() & {
-			optional ret = *this;
-			reset();
-			return ret;
-		}
-
-		/// \group take
-		optional take() const& {
-			optional ret = *this;
-			reset();
-			return ret;
-		}
-
-		/// \group take
-		optional take() && {
-			optional ret = std::move(*this);
-			reset();
-			return ret;
-		}
-
-#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
-		/// \group take
-		optional take() const&& {
-			optional ret = std::move(*this);
-			reset();
-			return ret;
-		}
-#endif
-
-		using value_type = T;
-
-		/// Constructs an optional that does not contain a value.
-		/// \group ctor_empty
-		constexpr optional() noexcept = default;
-
-		/// \group ctor_empty
-		constexpr optional(nullopt_t) noexcept {
-		}
-
-		/// Copy constructor
-		///
-		/// If `rhs` contains a value, the stored value is direct-initialized with
-		/// it. Otherwise, the constructed optional is empty.
-		SOL_TL_OPTIONAL_11_CONSTEXPR optional(const optional& rhs) = default;
-
-		/// Move constructor
-		///
-		/// If `rhs` contains a value, the stored value is direct-initialized with
-		/// it. Otherwise, the constructed optional is empty.
-		SOL_TL_OPTIONAL_11_CONSTEXPR optional(optional&& rhs) = default;
-
-		/// Constructs the stored value in-place using the given arguments.
-		/// \group in_place
-		/// \synopsis template <class... Args> constexpr explicit optional(in_place_t, Args&&... args);
-		template <class... Args>
-		constexpr explicit optional(detail::enable_if_t<std::is_constructible<T, Args...>::value, in_place_t>, Args&&... args)
-		: base(in_place, std::forward<Args>(args)...) {
-		}
-
-		/// \group in_place
-		/// \synopsis template <class U, class... Args>\nconstexpr explicit optional(in_place_t, std::initializer_list<U>&, Args&&... args);
-		template <class U, class... Args>
-		SOL_TL_OPTIONAL_11_CONSTEXPR explicit optional(detail::enable_if_t<std::is_constructible<T, std::initializer_list<U>&, Args&&...>::value, in_place_t>,
-		     std::initializer_list<U> il, Args&&... args) {
-			this->construct(il, std::forward<Args>(args)...);
-		}
-
-#if 0 // SOL_MODIFICATION
-      /// Constructs the stored value with `u`.
-      /// \synopsis template <class U=T> constexpr optional(U &&u);
-		template <class U = T, detail::enable_if_t<std::is_convertible<U&&, T>::value>* = nullptr, detail::enable_forward_value<T, U>* = nullptr>
-		constexpr optional(U&& u) : base(in_place, std::forward<U>(u)) {
-		}
-
-		/// \exclude
-		template <class U = T, detail::enable_if_t<!std::is_convertible<U&&, T>::value>* = nullptr, detail::enable_forward_value<T, U>* = nullptr>
-		constexpr explicit optional(U&& u) : base(in_place, std::forward<U>(u)) {
-		}
-#else
-		/// Constructs the stored value with `u`.
-		/// \synopsis template <class U=T> constexpr optional(U &&u);
-		constexpr optional(T&& u) : base(in_place, std::move(u)) {
-		}
-
-		/// \exclude
-		constexpr optional(const T& u) : base(in_place, u) {
-		}
-#endif // sol3 modification
-
-		/// Converting copy constructor.
-		/// \synopsis template <class U> optional(const optional<U> &rhs);
-		template <class U, detail::enable_from_other<T, U, const U&>* = nullptr, detail::enable_if_t<std::is_convertible<const U&, T>::value>* = nullptr>
-		optional(const optional<U>& rhs) {
-			if (rhs.has_value()) {
-				this->construct(*rhs);
-			}
-		}
-
-		/// \exclude
-		template <class U, detail::enable_from_other<T, U, const U&>* = nullptr, detail::enable_if_t<!std::is_convertible<const U&, T>::value>* = nullptr>
-		explicit optional(const optional<U>& rhs) {
-			if (rhs.has_value()) {
-				this->construct(*rhs);
-			}
-		}
-
-		/// Converting move constructor.
-		/// \synopsis template <class U> optional(optional<U> &&rhs);
-		template <class U, detail::enable_from_other<T, U, U&&>* = nullptr, detail::enable_if_t<std::is_convertible<U&&, T>::value>* = nullptr>
-		optional(optional<U>&& rhs) {
-			if (rhs.has_value()) {
-				this->construct(std::move(*rhs));
-			}
-		}
-
-		/// \exclude
-		template <class U, detail::enable_from_other<T, U, U&&>* = nullptr, detail::enable_if_t<!std::is_convertible<U&&, T>::value>* = nullptr>
-		explicit optional(optional<U>&& rhs) {
-			this->construct(std::move(*rhs));
-		}
-
-		/// Destroys the stored value if there is one.
-		~optional() = default;
-
-		/// Assignment to empty.
-		///
-		/// Destroys the current value if there is one.
-		optional& operator=(nullopt_t) noexcept {
-			if (has_value()) {
-				this->m_value.~T();
-				this->m_has_value = false;
-			}
-
-			return *this;
-		}
-
-		/// Copy assignment.
-		///
-		/// Copies the value from `rhs` if there is one. Otherwise resets the stored
-		/// value in `*this`.
-		optional& operator=(const optional& rhs) = default;
-
-		/// Move assignment.
-		///
-		/// Moves the value from `rhs` if there is one. Otherwise resets the stored
-		/// value in `*this`.
-		optional& operator=(optional&& rhs) = default;
-
-		/// Assigns the stored value from `u`, destroying the old value if there was
-		/// one.
-		/// \synopsis optional &operator=(U &&u);
-		template <class U = T, detail::enable_assign_forward<T, U>* = nullptr>
-		optional& operator=(U&& u) {
-			if (has_value()) {
-				this->m_value = std::forward<U>(u);
-			}
-			else {
-				this->construct(std::forward<U>(u));
-			}
-
-			return *this;
-		}
-
-		/// Converting copy assignment operator.
-		///
-		/// Copies the value from `rhs` if there is one. Otherwise resets the stored
-		/// value in `*this`.
-		/// \synopsis optional &operator=(const optional<U> & rhs);
-		template <class U, detail::enable_assign_from_other<T, U, const U&>* = nullptr>
-		optional& operator=(const optional<U>& rhs) {
-			if (has_value()) {
-				if (rhs.has_value()) {
-					this->m_value = *rhs;
-				}
-				else {
-					this->hard_reset();
-				}
-			}
-
-			if (rhs.has_value()) {
-				this->construct(*rhs);
-			}
-
-			return *this;
-		}
-
-		// TODO check exception guarantee
-		/// Converting move assignment operator.
-		///
-		/// Moves the value from `rhs` if there is one. Otherwise resets the stored
-		/// value in `*this`.
-		/// \synopsis optional &operator=(optional<U> && rhs);
-		template <class U, detail::enable_assign_from_other<T, U, U>* = nullptr>
-		optional& operator=(optional<U>&& rhs) {
-			if (has_value()) {
-				if (rhs.has_value()) {
-					this->m_value = std::move(*rhs);
-				}
-				else {
-					this->hard_reset();
-				}
-			}
-
-			if (rhs.has_value()) {
-				this->construct(std::move(*rhs));
-			}
-
-			return *this;
-		}
-
-		/// Constructs the value in-place, destroying the current one if there is
-		/// one.
-		/// \group emplace
-		template <class... Args>
-		T& emplace(Args&&... args) {
-			static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args");
-
-			*this = nullopt;
-			this->construct(std::forward<Args>(args)...);
-			return value();
-		}
-
-		/// \group emplace
-		/// \synopsis template <class U, class... Args>\nT& emplace(std::initializer_list<U> il, Args &&... args);
-		template <class U, class... Args>
-		detail::enable_if_t<std::is_constructible<T, std::initializer_list<U>&, Args&&...>::value, T&> emplace(std::initializer_list<U> il, Args&&... args) {
-			*this = nullopt;
-			this->construct(il, std::forward<Args>(args)...);
-			return value();
-		}
-
-		/// Swaps this optional with the other.
-		///
-		/// If neither optionals have a value, nothing happens.
-		/// If both have a value, the values are swapped.
-		/// If one has a value, it is moved to the other and the movee is left
-		/// valueless.
-		void swap(optional& rhs) noexcept(std::is_nothrow_move_constructible<T>::value&& detail::is_nothrow_swappable<T>::value) {
-			if (has_value()) {
-				if (rhs.has_value()) {
-					using std::swap;
-					swap(**this, *rhs);
-				}
-				else {
-					new (std::addressof(rhs.m_value)) T(std::move(this->m_value));
-					this->m_value.T::~T();
-				}
-			}
-			else if (rhs.has_value()) {
-				new (std::addressof(this->m_value)) T(std::move(rhs.m_value));
-				rhs.m_value.T::~T();
-			}
-		}
-
-		/// \returns a pointer to the stored value
-		/// \requires a value is stored
-		/// \group pointer
-		/// \synopsis constexpr const T *operator->() const;
-		constexpr const T* operator->() const {
-			return std::addressof(this->m_value);
-		}
-
-		/// \group pointer
-		/// \synopsis constexpr T *operator->();
-		SOL_TL_OPTIONAL_11_CONSTEXPR T* operator->() {
-			return std::addressof(this->m_value);
-		}
-
-		/// \returns the stored value
-		/// \requires a value is stored
-		/// \group deref
-		/// \synopsis constexpr T &operator*();
-		SOL_TL_OPTIONAL_11_CONSTEXPR T& operator*() & {
-			return this->m_value;
-		}
-
-		/// \group deref
-		/// \synopsis constexpr const T &operator*() const;
-		constexpr const T& operator*() const& {
-			return this->m_value;
-		}
-
-		/// \exclude
-		SOL_TL_OPTIONAL_11_CONSTEXPR T&& operator*() && {
-			return std::move(this->m_value);
-		}
-
-#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
-		/// \exclude
-		constexpr const T&& operator*() const&& {
-			return std::move(this->m_value);
-		}
-#endif
-
-		/// \returns whether or not the optional has a value
-		/// \group has_value
-		constexpr bool has_value() const noexcept {
-			return this->m_has_value;
-		}
-
-		/// \group has_value
-		constexpr explicit operator bool() const noexcept {
-			return this->m_has_value;
-		}
-
-		/// \returns the contained value if there is one, otherwise throws
-		/// [bad_optional_access]
-		/// \group value
-		/// \synopsis constexpr T &value();
-		SOL_TL_OPTIONAL_11_CONSTEXPR T& value() & {
-			if (has_value())
-				return this->m_value;
-#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
-			std::abort();
-#else
-			throw bad_optional_access();
-#endif // No exceptions allowed
-		}
-		/// \group value
-		/// \synopsis constexpr const T &value() const;
-		SOL_TL_OPTIONAL_11_CONSTEXPR const T& value() const& {
-			if (has_value())
-				return this->m_value;
-#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
-			std::abort();
-#else
-			throw bad_optional_access();
-#endif // No exceptions allowed
-		}
-		/// \exclude
-		SOL_TL_OPTIONAL_11_CONSTEXPR T&& value() && {
-			if (has_value())
-				return std::move(this->m_value);
-#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
-			std::abort();
-#else
-			throw bad_optional_access();
-#endif // No exceptions allowed
-		}
-
-#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
-		/// \exclude
-		SOL_TL_OPTIONAL_11_CONSTEXPR const T&& value() const&& {
-			if (has_value())
-				return std::move(this->m_value);
-#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
-			std::abort();
-#else
-			throw bad_optional_access();
-#endif // No exceptions allowed
-		}
-#endif
-
-		/// \returns the stored value if there is one, otherwise returns `u`
-		/// \group value_or
-		template <class U>
-		constexpr T value_or(U&& u) const& {
-			static_assert(std::is_copy_constructible<T>::value && std::is_convertible<U&&, T>::value, "T must be copy constructible and convertible from U");
-			return has_value() ? **this : static_cast<T>(std::forward<U>(u));
-		}
-
-		/// \group value_or
-		template <class U>
-		SOL_TL_OPTIONAL_11_CONSTEXPR T value_or(U&& u) && {
-			static_assert(std::is_move_constructible<T>::value && std::is_convertible<U&&, T>::value, "T must be move constructible and convertible from U");
-			return has_value() ? **this : static_cast<T>(std::forward<U>(u));
-		}
-
-		/// Destroys the stored value if one exists, making the optional empty
-		void reset() noexcept {
-			if (has_value()) {
-				this->m_value.~T();
-				this->m_has_value = false;
-			}
-		}
-	}; // namespace sol
-
-	/// \group relop
-	/// \brief Compares two optional objects
-	/// \details If both optionals contain a value, they are compared with `T`s
-	/// relational operators. Otherwise `lhs` and `rhs` are equal only if they are
-	/// both empty, and `lhs` is less than `rhs` only if `rhs` is empty and `lhs`
-	/// is not.
-	template <class T, class U>
-	inline constexpr bool operator==(const optional<T>& lhs, const optional<U>& rhs) {
-		return lhs.has_value() == rhs.has_value() && (!lhs.has_value() || *lhs == *rhs);
-	}
-	/// \group relop
-	template <class T, class U>
-	inline constexpr bool operator!=(const optional<T>& lhs, const optional<U>& rhs) {
-		return lhs.has_value() != rhs.has_value() || (lhs.has_value() && *lhs != *rhs);
-	}
-	/// \group relop
-	template <class T, class U>
-	inline constexpr bool operator<(const optional<T>& lhs, const optional<U>& rhs) {
-		return rhs.has_value() && (!lhs.has_value() || *lhs < *rhs);
-	}
-	/// \group relop
-	template <class T, class U>
-	inline constexpr bool operator>(const optional<T>& lhs, const optional<U>& rhs) {
-		return lhs.has_value() && (!rhs.has_value() || *lhs > *rhs);
-	}
-	/// \group relop
-	template <class T, class U>
-	inline constexpr bool operator<=(const optional<T>& lhs, const optional<U>& rhs) {
-		return !lhs.has_value() || (rhs.has_value() && *lhs <= *rhs);
-	}
-	/// \group relop
-	template <class T, class U>
-	inline constexpr bool operator>=(const optional<T>& lhs, const optional<U>& rhs) {
-		return !rhs.has_value() || (lhs.has_value() && *lhs >= *rhs);
-	}
-
-	/// \group relop_nullopt
-	/// \brief Compares an optional to a `nullopt`
-	/// \details Equivalent to comparing the optional to an empty optional
-	template <class T>
-	inline constexpr bool operator==(const optional<T>& lhs, nullopt_t) noexcept {
-		return !lhs.has_value();
-	}
-	/// \group relop_nullopt
-	template <class T>
-	inline constexpr bool operator==(nullopt_t, const optional<T>& rhs) noexcept {
-		return !rhs.has_value();
-	}
-	/// \group relop_nullopt
-	template <class T>
-	inline constexpr bool operator!=(const optional<T>& lhs, nullopt_t) noexcept {
-		return lhs.has_value();
-	}
-	/// \group relop_nullopt
-	template <class T>
-	inline constexpr bool operator!=(nullopt_t, const optional<T>& rhs) noexcept {
-		return rhs.has_value();
-	}
-	/// \group relop_nullopt
-	template <class T>
-	inline constexpr bool operator<(const optional<T>&, nullopt_t) noexcept {
-		return false;
-	}
-	/// \group relop_nullopt
-	template <class T>
-	inline constexpr bool operator<(nullopt_t, const optional<T>& rhs) noexcept {
-		return rhs.has_value();
-	}
-	/// \group relop_nullopt
-	template <class T>
-	inline constexpr bool operator<=(const optional<T>& lhs, nullopt_t) noexcept {
-		return !lhs.has_value();
-	}
-	/// \group relop_nullopt
-	template <class T>
-	inline constexpr bool operator<=(nullopt_t, const optional<T>&) noexcept {
-		return true;
-	}
-	/// \group relop_nullopt
-	template <class T>
-	inline constexpr bool operator>(const optional<T>& lhs, nullopt_t) noexcept {
-		return lhs.has_value();
-	}
-	/// \group relop_nullopt
-	template <class T>
-	inline constexpr bool operator>(nullopt_t, const optional<T>&) noexcept {
-		return false;
-	}
-	/// \group relop_nullopt
-	template <class T>
-	inline constexpr bool operator>=(const optional<T>&, nullopt_t) noexcept {
-		return true;
-	}
-	/// \group relop_nullopt
-	template <class T>
-	inline constexpr bool operator>=(nullopt_t, const optional<T>& rhs) noexcept {
-		return !rhs.has_value();
-	}
-
-	/// \group relop_t
-	/// \brief Compares the optional with a value.
-	/// \details If the optional has a value, it is compared with the other value
-	/// using `T`s relational operators. Otherwise, the optional is considered
-	/// less than the value.
-	template <class T, class U>
-	inline constexpr bool operator==(const optional<T>& lhs, const U& rhs) {
-		return lhs.has_value() ? *lhs == rhs : false;
-	}
-	/// \group relop_t
-	template <class T, class U>
-	inline constexpr bool operator==(const U& lhs, const optional<T>& rhs) {
-		return rhs.has_value() ? lhs == *rhs : false;
-	}
-	/// \group relop_t
-	template <class T, class U>
-	inline constexpr bool operator!=(const optional<T>& lhs, const U& rhs) {
-		return lhs.has_value() ? *lhs != rhs : true;
-	}
-	/// \group relop_t
-	template <class T, class U>
-	inline constexpr bool operator!=(const U& lhs, const optional<T>& rhs) {
-		return rhs.has_value() ? lhs != *rhs : true;
-	}
-	/// \group relop_t
-	template <class T, class U>
-	inline constexpr bool operator<(const optional<T>& lhs, const U& rhs) {
-		return lhs.has_value() ? *lhs < rhs : true;
-	}
-	/// \group relop_t
-	template <class T, class U>
-	inline constexpr bool operator<(const U& lhs, const optional<T>& rhs) {
-		return rhs.has_value() ? lhs < *rhs : false;
-	}
-	/// \group relop_t
-	template <class T, class U>
-	inline constexpr bool operator<=(const optional<T>& lhs, const U& rhs) {
-		return lhs.has_value() ? *lhs <= rhs : true;
-	}
-	/// \group relop_t
-	template <class T, class U>
-	inline constexpr bool operator<=(const U& lhs, const optional<T>& rhs) {
-		return rhs.has_value() ? lhs <= *rhs : false;
-	}
-	/// \group relop_t
-	template <class T, class U>
-	inline constexpr bool operator>(const optional<T>& lhs, const U& rhs) {
-		return lhs.has_value() ? *lhs > rhs : false;
-	}
-	/// \group relop_t
-	template <class T, class U>
-	inline constexpr bool operator>(const U& lhs, const optional<T>& rhs) {
-		return rhs.has_value() ? lhs > *rhs : true;
-	}
-	/// \group relop_t
-	template <class T, class U>
-	inline constexpr bool operator>=(const optional<T>& lhs, const U& rhs) {
-		return lhs.has_value() ? *lhs >= rhs : false;
-	}
-	/// \group relop_t
-	template <class T, class U>
-	inline constexpr bool operator>=(const U& lhs, const optional<T>& rhs) {
-		return rhs.has_value() ? lhs >= *rhs : true;
-	}
-
-	/// \synopsis template <class T>\nvoid swap(optional<T> &lhs, optional<T> &rhs);
-	template <class T, detail::enable_if_t<std::is_move_constructible<T>::value>* = nullptr, detail::enable_if_t<detail::is_swappable<T>::value>* = nullptr>
-	void swap(optional<T>& lhs, optional<T>& rhs) noexcept(noexcept(lhs.swap(rhs))) {
-		return lhs.swap(rhs);
-	}
-
-	namespace detail {
-		struct i_am_secret {};
-	} // namespace detail
-
-	template <class T = detail::i_am_secret, class U, class Ret = detail::conditional_t<std::is_same<T, detail::i_am_secret>::value, detail::decay_t<U>, T>>
-	inline constexpr optional<Ret> make_optional(U&& v) {
-		return optional<Ret>(std::forward<U>(v));
-	}
-
-	template <class T, class... Args>
-	inline constexpr optional<T> make_optional(Args&&... args) {
-		return optional<T>(in_place, std::forward<Args>(args)...);
-	}
-	template <class T, class U, class... Args>
-	inline constexpr optional<T> make_optional(std::initializer_list<U> il, Args&&... args) {
-		return optional<T>(in_place, il, std::forward<Args>(args)...);
-	}
-
-#if __cplusplus >= 201703L
-	template <class T>
-	optional(T)->optional<T>;
-#endif
-
-	/// \exclude
-	namespace detail {
-#ifdef SOL_TL_OPTIONAL_CXX14
-		template <class Opt, class F, class Ret = decltype(detail::invoke(std::declval<F>(), *std::declval<Opt>())),
-		     detail::enable_if_t<!std::is_void<Ret>::value>* = nullptr>
-		constexpr auto optional_map_impl(Opt&& opt, F&& f) {
-			return opt.has_value() ? detail::invoke(std::forward<F>(f), *std::forward<Opt>(opt)) : optional<Ret>(nullopt);
-		}
-
-		template <class Opt, class F, class Ret = decltype(detail::invoke(std::declval<F>(), *std::declval<Opt>())),
-		     detail::enable_if_t<std::is_void<Ret>::value>* = nullptr>
-		auto optional_map_impl(Opt&& opt, F&& f) {
-			if (opt.has_value()) {
-				detail::invoke(std::forward<F>(f), *std::forward<Opt>(opt));
-				return make_optional(monostate {});
-			}
-
-			return optional<monostate>(nullopt);
-		}
-#else
-		template <class Opt, class F, class Ret = decltype(detail::invoke(std::declval<F>(), *std::declval<Opt>())),
-		     detail::enable_if_t<!std::is_void<Ret>::value>* = nullptr>
-
-		constexpr auto optional_map_impl(Opt&& opt, F&& f) -> optional<Ret> {
-			return opt.has_value() ? detail::invoke(std::forward<F>(f), *std::forward<Opt>(opt)) : optional<Ret>(nullopt);
-		}
-
-		template <class Opt, class F, class Ret = decltype(detail::invoke(std::declval<F>(), *std::declval<Opt>())),
-		     detail::enable_if_t<std::is_void<Ret>::value>* = nullptr>
-
-		auto optional_map_impl(Opt&& opt, F&& f) -> optional<monostate> {
-			if (opt.has_value()) {
-				detail::invoke(std::forward<F>(f), *std::forward<Opt>(opt));
-				return monostate {};
-			}
-
-			return nullopt;
-		}
-#endif
-	} // namespace detail
-
-	/// Specialization for when `T` is a reference. `optional<T&>` acts similarly
-	/// to a `T*`, but provides more operations and shows intent more clearly.
-	///
-	/// *Examples*:
-	///
-	/// ```
-	/// int i = 42;
-	/// sol::optional<int&> o = i;
-	/// *o == 42; //true
-	/// i = 12;
-	/// *o = 12; //true
-	/// &*o == &i; //true
-	/// ```
-	///
-	/// Assignment has rebind semantics rather than assign-through semantics:
-	///
-	/// ```
-	/// int j = 8;
-	/// o = j;
-	///
-	/// &*o == &j; //true
-	/// ```
-	template <class T>
-	class optional<T&> {
-	public:
-#if defined(SOL_TL_OPTIONAL_CXX14) && !defined(SOL_TL_OPTIONAL_GCC49) && !defined(SOL_TL_OPTIONAL_GCC54) && !defined(SOL_TL_OPTIONAL_GCC55)
-		/// \group and_then
-		/// Carries out some operation which returns an optional on the stored
-		/// object if there is one. \requires `std::invoke(std::forward<F>(f),
-		/// value())` returns a `std::optional<U>` for some `U`. \returns Let `U` be
-		/// the result of `std::invoke(std::forward<F>(f), value())`. Returns a
-		/// `std::optional<U>`. The return value is empty if `*this` is empty,
-		/// otherwise the return value of `std::invoke(std::forward<F>(f), value())`
-		/// is returned.
-		/// \group and_then
-		/// \synopsis template <class F>\nconstexpr auto and_then(F &&f) &;
-		template <class F>
-		SOL_TL_OPTIONAL_11_CONSTEXPR auto and_then(F&& f) & {
-			using result = detail::invoke_result_t<F, T&>;
-			static_assert(detail::is_optional<result>::value, "F must return an optional");
-
-			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
-		}
-
-		/// \group and_then
-		/// \synopsis template <class F>\nconstexpr auto and_then(F &&f) &&;
-		template <class F>
-		SOL_TL_OPTIONAL_11_CONSTEXPR auto and_then(F&& f) && {
-			using result = detail::invoke_result_t<F, T&>;
-			static_assert(detail::is_optional<result>::value, "F must return an optional");
-
-			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
-		}
-
-		/// \group and_then
-		/// \synopsis template <class F>\nconstexpr auto and_then(F &&f) const &;
-		template <class F>
-		constexpr auto and_then(F&& f) const& {
-			using result = detail::invoke_result_t<F, const T&>;
-			static_assert(detail::is_optional<result>::value, "F must return an optional");
-
-			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
-		}
-
-#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
-		/// \group and_then
-		/// \synopsis template <class F>\nconstexpr auto and_then(F &&f) const &&;
-		template <class F>
-		constexpr auto and_then(F&& f) const&& {
-			using result = detail::invoke_result_t<F, const T&>;
-			static_assert(detail::is_optional<result>::value, "F must return an optional");
-
-			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
-		}
-#endif
-#else
-		/// \group and_then
-		/// Carries out some operation which returns an optional on the stored
-		/// object if there is one. \requires `std::invoke(std::forward<F>(f),
-		/// value())` returns a `std::optional<U>` for some `U`. \returns Let `U` be
-		/// the result of `std::invoke(std::forward<F>(f), value())`. Returns a
-		/// `std::optional<U>`. The return value is empty if `*this` is empty,
-		/// otherwise the return value of `std::invoke(std::forward<F>(f), value())`
-		/// is returned.
-		/// \group and_then
-		/// \synopsis template <class F>\nconstexpr auto and_then(F &&f) &;
-		template <class F>
-		SOL_TL_OPTIONAL_11_CONSTEXPR detail::invoke_result_t<F, T&> and_then(F&& f) & {
-			using result = detail::invoke_result_t<F, T&>;
-			static_assert(detail::is_optional<result>::value, "F must return an optional");
-
-			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
-		}
-
-		/// \group and_then
-		/// \synopsis template <class F>\nconstexpr auto and_then(F &&f) &&;
-		template <class F>
-		SOL_TL_OPTIONAL_11_CONSTEXPR detail::invoke_result_t<F, T&> and_then(F&& f) && {
-			using result = detail::invoke_result_t<F, T&>;
-			static_assert(detail::is_optional<result>::value, "F must return an optional");
-
-			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
-		}
-
-		/// \group and_then
-		/// \synopsis template <class F>\nconstexpr auto and_then(F &&f) const &;
-		template <class F>
-		constexpr detail::invoke_result_t<F, const T&> and_then(F&& f) const& {
-			using result = detail::invoke_result_t<F, const T&>;
-			static_assert(detail::is_optional<result>::value, "F must return an optional");
-
-			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
-		}
-
-#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
-		/// \group and_then
-		/// \synopsis template <class F>\nconstexpr auto and_then(F &&f) const &&;
-		template <class F>
-		constexpr detail::invoke_result_t<F, const T&> and_then(F&& f) const&& {
-			using result = detail::invoke_result_t<F, const T&>;
-			static_assert(detail::is_optional<result>::value, "F must return an optional");
-
-			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
-		}
-#endif
-#endif
-
-#if defined(SOL_TL_OPTIONAL_CXX14) && !defined(SOL_TL_OPTIONAL_GCC49) && !defined(SOL_TL_OPTIONAL_GCC54) && !defined(SOL_TL_OPTIONAL_GCC55)
-		/// \brief Carries out some operation on the stored object if there is one.
-		/// \returns Let `U` be the result of `std::invoke(std::forward<F>(f),
-		/// value())`. Returns a `std::optional<U>`. The return value is empty if
-		/// `*this` is empty, otherwise an `optional<U>` is constructed from the
-		/// return value of `std::invoke(std::forward<F>(f), value())` and is
-		/// returned.
-		///
-		/// \group map
-		/// \synopsis template <class F> constexpr auto map(F &&f) &;
-		template <class F>
-		SOL_TL_OPTIONAL_11_CONSTEXPR auto map(F&& f) & {
-			return detail::optional_map_impl(*this, std::forward<F>(f));
-		}
-
-		/// \group map
-		/// \synopsis template <class F> constexpr auto map(F &&f) &&;
-		template <class F>
-		SOL_TL_OPTIONAL_11_CONSTEXPR auto map(F&& f) && {
-			return detail::optional_map_impl(std::move(*this), std::forward<F>(f));
-		}
-
-		/// \group map
-		/// \synopsis template <class F> constexpr auto map(F &&f) const&;
-		template <class F>
-		constexpr auto map(F&& f) const& {
-			return detail::optional_map_impl(*this, std::forward<F>(f));
-		}
-
-		/// \group map
-		/// \synopsis template <class F> constexpr auto map(F &&f) const&&;
-		template <class F>
-		constexpr auto map(F&& f) const&& {
-			return detail::optional_map_impl(std::move(*this), std::forward<F>(f));
-		}
-#else
-		/// \brief Carries out some operation on the stored object if there is one.
-		/// \returns Let `U` be the result of `std::invoke(std::forward<F>(f),
-		/// value())`. Returns a `std::optional<U>`. The return value is empty if
-		/// `*this` is empty, otherwise an `optional<U>` is constructed from the
-		/// return value of `std::invoke(std::forward<F>(f), value())` and is
-		/// returned.
-		///
-		/// \group map
-		/// \synopsis template <class F> auto map(F &&f) &;
-		template <class F>
-		SOL_TL_OPTIONAL_11_CONSTEXPR decltype(detail::optional_map_impl(std::declval<optional&>(), std::declval<F&&>())) map(F&& f) & {
-			return detail::optional_map_impl(*this, std::forward<F>(f));
-		}
-
-		/// \group map
-		/// \synopsis template <class F> auto map(F &&f) &&;
-		template <class F>
-		SOL_TL_OPTIONAL_11_CONSTEXPR decltype(detail::optional_map_impl(std::declval<optional&&>(), std::declval<F&&>())) map(F&& f) && {
-			return detail::optional_map_impl(std::move(*this), std::forward<F>(f));
-		}
-
-		/// \group map
-		/// \synopsis template <class F> auto map(F &&f) const&;
-		template <class F>
-		constexpr decltype(detail::optional_map_impl(std::declval<const optional&>(), std::declval<F&&>())) map(F&& f) const& {
-			return detail::optional_map_impl(*this, std::forward<F>(f));
-		}
-
-#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
-		/// \group map
-		/// \synopsis template <class F> auto map(F &&f) const&&;
-		template <class F>
-		constexpr decltype(detail::optional_map_impl(std::declval<const optional&&>(), std::declval<F&&>())) map(F&& f) const&& {
-			return detail::optional_map_impl(std::move(*this), std::forward<F>(f));
-		}
-#endif
-#endif
-
-		/// \brief Calls `f` if the optional is empty
-		/// \requires `std::invoke_result_t<F>` must be void or convertible to
-		/// `optional<T>`. \effects If `*this` has a value, returns `*this`.
-		/// Otherwise, if `f` returns `void`, calls `std::forward<F>(f)` and returns
-		/// `std::nullopt`. Otherwise, returns `std::forward<F>(f)()`.
-		///
-		/// \group or_else
-		/// \synopsis template <class F> optional<T> or_else (F &&f) &;
-		template <class F, detail::enable_if_ret_void<F>* = nullptr>
-		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) & {
-			if (has_value())
-				return *this;
-
-			std::forward<F>(f)();
-			return nullopt;
-		}
-
-		/// \exclude
-		template <class F, detail::disable_if_ret_void<F>* = nullptr>
-		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) & {
-			return has_value() ? *this : std::forward<F>(f)();
-		}
-
-		/// \group or_else
-		/// \synopsis template <class F> optional<T> or_else (F &&f) &&;
-		template <class F, detail::enable_if_ret_void<F>* = nullptr>
-		optional<T> or_else(F&& f) && {
-			if (has_value())
-				return std::move(*this);
-
-			std::forward<F>(f)();
-			return nullopt;
-		}
-
-		/// \exclude
-		template <class F, detail::disable_if_ret_void<F>* = nullptr>
-		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) && {
-			return has_value() ? std::move(*this) : std::forward<F>(f)();
-		}
-
-		/// \group or_else
-		/// \synopsis template <class F> optional<T> or_else (F &&f) const &;
-		template <class F, detail::enable_if_ret_void<F>* = nullptr>
-		optional<T> or_else(F&& f) const& {
-			if (has_value())
-				return *this;
-
-			std::forward<F>(f)();
-			return nullopt;
-		}
-
-		/// \exclude
-		template <class F, detail::disable_if_ret_void<F>* = nullptr>
-		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) const& {
-			return has_value() ? *this : std::forward<F>(f)();
-		}
-
-#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
-		/// \exclude
-		template <class F, detail::enable_if_ret_void<F>* = nullptr>
-		optional<T> or_else(F&& f) const&& {
-			if (has_value())
-				return std::move(*this);
-
-			std::forward<F>(f)();
-			return nullopt;
-		}
-
-		/// \exclude
-		template <class F, detail::disable_if_ret_void<F>* = nullptr>
-		optional<T> or_else(F&& f) const&& {
-			return has_value() ? std::move(*this) : std::forward<F>(f)();
-		}
-#endif
-
-		/// \brief Maps the stored value with `f` if there is one, otherwise returns
-		/// `u`.
-		///
-		/// \details If there is a value stored, then `f` is called with `**this`
-		/// and the value is returned. Otherwise `u` is returned.
-		///
-		/// \group map_or
-		template <class F, class U>
-		U map_or(F&& f, U&& u) & {
-			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u);
-		}
-
-		/// \group map_or
-		template <class F, class U>
-		U map_or(F&& f, U&& u) && {
-			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u);
-		}
-
-		/// \group map_or
-		template <class F, class U>
-		U map_or(F&& f, U&& u) const& {
-			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u);
-		}
-
-#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
-		/// \group map_or
-		template <class F, class U>
-		U map_or(F&& f, U&& u) const&& {
-			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u);
-		}
-#endif
-
-		/// \brief Maps the stored value with `f` if there is one, otherwise calls
-		/// `u` and returns the result.
-		///
-		/// \details If there is a value stored, then `f` is
-		/// called with `**this` and the value is returned. Otherwise
-		/// `std::forward<U>(u)()` is returned.
-		///
-		/// \group map_or_else
-		/// \synopsis template <class F, class U>\nauto map_or_else(F &&f, U &&u) &;
-		template <class F, class U>
-		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) & {
-			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u)();
-		}
-
-		/// \group map_or_else
-		/// \synopsis template <class F, class U>\nauto map_or_else(F &&f, U &&u)
-		/// &&;
-		template <class F, class U>
-		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) && {
-			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u)();
-		}
-
-		/// \group map_or_else
-		/// \synopsis template <class F, class U>\nauto map_or_else(F &&f, U &&u)
-		/// const &;
-		template <class F, class U>
-		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) const& {
-			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u)();
-		}
-
-#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
-		/// \group map_or_else
-		/// \synopsis template <class F, class U>\nauto map_or_else(F &&f, U &&u)
-		/// const &&;
-		template <class F, class U>
-		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) const&& {
-			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u)();
-		}
-#endif
-
-		/// \returns `u` if `*this` has a value, otherwise an empty optional.
-		template <class U>
-		constexpr optional<typename std::decay<U>::type> conjunction(U&& u) const {
-			using result = optional<detail::decay_t<U>>;
-			return has_value() ? result { u } : result { nullopt };
-		}
-
-		/// \returns `rhs` if `*this` is empty, otherwise the current value.
-		/// \group disjunction
-		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(const optional& rhs) & {
-			return has_value() ? *this : rhs;
-		}
-
-		/// \group disjunction
-		constexpr optional disjunction(const optional& rhs) const& {
-			return has_value() ? *this : rhs;
-		}
-
-		/// \group disjunction
-		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(const optional& rhs) && {
-			return has_value() ? std::move(*this) : rhs;
-		}
-
-#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
-		/// \group disjunction
-		constexpr optional disjunction(const optional& rhs) const&& {
-			return has_value() ? std::move(*this) : rhs;
-		}
-#endif
-
-		/// \group disjunction
-		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(optional&& rhs) & {
-			return has_value() ? *this : std::move(rhs);
-		}
-
-		/// \group disjunction
-		constexpr optional disjunction(optional&& rhs) const& {
-			return has_value() ? *this : std::move(rhs);
-		}
-
-		/// \group disjunction
-		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(optional&& rhs) && {
-			return has_value() ? std::move(*this) : std::move(rhs);
-		}
-
-#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
-		/// \group disjunction
-		constexpr optional disjunction(optional&& rhs) const&& {
-			return has_value() ? std::move(*this) : std::move(rhs);
-		}
-#endif
-
-		/// Takes the value out of the optional, leaving it empty
-		/// \group take
-		optional take() & {
-			optional ret = *this;
-			reset();
-			return ret;
-		}
-
-		/// \group take
-		optional take() const& {
-			optional ret = *this;
-			reset();
-			return ret;
-		}
-
-		/// \group take
-		optional take() && {
-			optional ret = std::move(*this);
-			reset();
-			return ret;
-		}
-
-#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
-		/// \group take
-		optional take() const&& {
-			optional ret = std::move(*this);
-			reset();
-			return ret;
-		}
-#endif
-
-		using value_type = T&;
-
-		/// Constructs an optional that does not contain a value.
-		/// \group ctor_empty
-		constexpr optional() noexcept : m_value(nullptr) {
-		}
-
-		/// \group ctor_empty
-		constexpr optional(nullopt_t) noexcept : m_value(nullptr) {
-		}
-
-		/// Copy constructor
-		///
-		/// If `rhs` contains a value, the stored value is direct-initialized with
-		/// it. Otherwise, the constructed optional is empty.
-		SOL_TL_OPTIONAL_11_CONSTEXPR optional(const optional& rhs) noexcept = default;
-
-		/// Move constructor
-		///
-		/// If `rhs` contains a value, the stored value is direct-initialized with
-		/// it. Otherwise, the constructed optional is empty.
-		SOL_TL_OPTIONAL_11_CONSTEXPR optional(optional&& rhs) = default;
-
-		/// Constructs the stored value with `u`.
-		/// \synopsis template <class U=T> constexpr optional(U &&u);
-		template <class U = T, detail::enable_if_t<!detail::is_optional<detail::decay_t<U>>::value>* = nullptr>
-		constexpr optional(U&& u) : m_value(std::addressof(u)) {
-			static_assert(std::is_lvalue_reference<U>::value, "U must be an lvalue");
-		}
-
-		/// \exclude
-		template <class U>
-		constexpr explicit optional(const optional<U>& rhs) : optional(*rhs) {
-		}
-
-		/// No-op
-		~optional() = default;
-
-		/// Assignment to empty.
-		///
-		/// Destroys the current value if there is one.
-		optional& operator=(nullopt_t) noexcept {
-			m_value = nullptr;
-			return *this;
-		}
-
-		/// Copy assignment.
-		///
-		/// Rebinds this optional to the referee of `rhs` if there is one. Otherwise
-		/// resets the stored value in `*this`.
-		optional& operator=(const optional& rhs) = default;
-
-		/// Rebinds this optional to `u`.
-		///
-		/// \requires `U` must be an lvalue reference.
-		/// \synopsis optional &operator=(U &&u);
-		template <class U = T, detail::enable_if_t<!detail::is_optional<detail::decay_t<U>>::value>* = nullptr>
-		optional& operator=(U&& u) {
-			static_assert(std::is_lvalue_reference<U>::value, "U must be an lvalue");
-			m_value = std::addressof(u);
-			return *this;
-		}
-
-		/// Converting copy assignment operator.
-		///
-		/// Rebinds this optional to the referee of `rhs` if there is one. Otherwise
-		/// resets the stored value in `*this`.
-		template <class U>
-		optional& operator=(const optional<U>& rhs) {
-			m_value = std::addressof(rhs.value());
-			return *this;
-		}
-
-		/// Constructs the value in-place, destroying the current one if there is
-		/// one.
-		///
-		/// \group emplace
-		template <class... Args>
-		T& emplace(Args&&... args) noexcept {
-			static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args");
-
-			*this = nullopt;
-			this->construct(std::forward<Args>(args)...);
-		}
-
-		/// Swaps this optional with the other.
-		///
-		/// If neither optionals have a value, nothing happens.
-		/// If both have a value, the values are swapped.
-		/// If one has a value, it is moved to the other and the movee is left
-		/// valueless.
-		void swap(optional& rhs) noexcept {
-			std::swap(m_value, rhs.m_value);
-		}
-
-		/// \returns a pointer to the stored value
-		/// \requires a value is stored
-		/// \group pointer
-		/// \synopsis constexpr const T *operator->() const;
-		constexpr const T* operator->() const {
-			return m_value;
-		}
-
-		/// \group pointer
-		/// \synopsis constexpr T *operator->();
-		SOL_TL_OPTIONAL_11_CONSTEXPR T* operator->() {
-			return m_value;
-		}
-
-		/// \returns the stored value
-		/// \requires a value is stored
-		/// \group deref
-		/// \synopsis constexpr T &operator*();
-		SOL_TL_OPTIONAL_11_CONSTEXPR T& operator*() {
-			return *m_value;
-		}
-
-		/// \group deref
-		/// \synopsis constexpr const T &operator*() const;
-		constexpr const T& operator*() const {
-			return *m_value;
-		}
-
-		/// \returns whether or not the optional has a value
-		/// \group has_value
-		constexpr bool has_value() const noexcept {
-			return m_value != nullptr;
-		}
-
-		/// \group has_value
-		constexpr explicit operator bool() const noexcept {
-			return m_value != nullptr;
-		}
-
-		/// \returns the contained value if there is one, otherwise throws
-		/// [bad_optional_access]
-		/// \group value
-		/// synopsis constexpr T &value();
-		SOL_TL_OPTIONAL_11_CONSTEXPR T& value() {
-			if (has_value())
-				return *m_value;
-#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
-			std::abort();
-#else
-			throw bad_optional_access();
-#endif // No exceptions allowed
-		}
-		/// \group value
-		/// \synopsis constexpr const T &value() const;
-		SOL_TL_OPTIONAL_11_CONSTEXPR const T& value() const {
-			if (has_value())
-				return *m_value;
-#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
-			std::abort();
-#else
-			throw bad_optional_access();
-#endif // No exceptions allowed
-		}
-
-		/// \returns the stored value if there is one, otherwise returns `u`
-		/// \group value_or
-		template <class U>
-		constexpr T& value_or(U&& u) const {
-			static_assert(std::is_convertible<U&&, T&>::value, "T must be convertible from U");
-			return has_value() ? const_cast<T&>(**this) : static_cast<T&>(std::forward<U>(u));
-		}
-
-		/// Destroys the stored value if one exists, making the optional empty
-		void reset() noexcept {
-			m_value = nullptr;
-		}
-
-	private:
-		T* m_value;
-	};
-
-} // namespace sol
-
-namespace std {
-	// TODO SFINAE
-	template <class T>
-	struct hash<::sol::optional<T>> {
-		::std::size_t operator()(const ::sol::optional<T>& o) const {
-			if (!o.has_value())
-				return 0;
-
-			return ::std::hash<::sol::detail::remove_const_t<T>>()(*o);
-		}
-	};
-} // namespace std
-
-// end of sol/optional_implementation.hpp
-
-#endif // Boost vs. Better optional
-
-#include <optional>
-
-namespace sol {
-
-#if SOL_IS_ON(SOL_USE_BOOST_I_)
-	template <typename T>
-	using optional = boost::optional<T>;
-	using nullopt_t = boost::none_t;
-	const nullopt_t nullopt = boost::none;
-#endif // Boost vs. Better optional
-
-	namespace meta {
-		template <typename T>
-		using is_optional = any<is_specialization_of<T, optional>, is_specialization_of<T, std::optional>>;
-
-		template <typename T>
-		constexpr inline bool is_optional_v = is_optional<T>::value;
-	} // namespace meta
-
-	namespace detail {
-		template <typename T>
-		struct associated_nullopt {
-			inline static constexpr std::nullopt_t value = std::nullopt;
-		};
-
-#if SOL_IS_ON(SOL_USE_BOOST_I_)
-		template <typename T>
-		struct associated_nullopt<boost::optional<T>> {
-			inline static constexpr std::nullopt_t value = boost::nullopt;
-		};
-#endif // Boost nullopt
-
-		template <typename T>
-		inline constexpr auto associated_nullopt_v = associated_nullopt<T>::value;
-	} // namespace detail
-} // namespace sol
-
-// end of sol/optional.hpp
-
-// beginning of sol/raii.hpp
-
-#include <memory>
-
-namespace sol {
-	namespace detail {
-		struct default_construct {
-			template <typename T, typename... Args>
-			static void construct(T&& obj, Args&&... args) {
-				typedef meta::unqualified_t<T> Tu;
-				std::allocator<Tu> alloc{};
-				std::allocator_traits<std::allocator<Tu>>::construct(alloc, std::forward<T>(obj), std::forward<Args>(args)...);
-			}
-
-			template <typename T, typename... Args>
-			void operator()(T&& obj, Args&&... args) const {
-				construct(std::forward<T>(obj), std::forward<Args>(args)...);
-			}
-		};
-
-		struct default_destruct {
-			template <typename T>
-			static void destroy(T&& obj) {
-				std::allocator<meta::unqualified_t<T>> alloc{};
-				alloc.destroy(obj);
-			}
-
-			template <typename T>
-			void operator()(T&& obj) const {
-				destroy(std::forward<T>(obj));
-			}
-		};
-
-		struct deleter {
-			template <typename T>
-			void operator()(T* p) const {
-				delete p;
-			}
-		};
-
-		struct state_deleter {
-			void operator()(lua_State* L) const {
-				lua_close(L);
-			}
-		};
-
-		template <typename T, typename Dx, typename... Args>
-		inline std::unique_ptr<T, Dx> make_unique_deleter(Args&&... args) {
-			return std::unique_ptr<T, Dx>(new T(std::forward<Args>(args)...));
-		}
-
-		template <typename Tag, typename T>
-		struct tagged {
-		private:
-			T value_;
-		
-		public:
-			template <typename Arg, typename... Args, meta::disable<std::is_same<meta::unqualified_t<Arg>, tagged>> = meta::enabler>
-			tagged(Arg&& arg, Args&&... args)
-			: value_(std::forward<Arg>(arg), std::forward<Args>(args)...) {
-			}
-
-			T& value() & {
-				return value_;
-			}
-
-			T const& value() const& {
-				return value_;
-			}
-
-			T&& value() && {
-				return std::move(value_);
-			}
-		};
-	} // namespace detail
-
-	template <typename... Args>
-	struct constructor_list {};
-
-	template <typename... Args>
-	using constructors = constructor_list<Args...>;
-
-	const auto default_constructor = constructors<types<>>{};
-
-	struct no_construction {};
-	const auto no_constructor = no_construction{};
-
-	struct call_construction {};
-	const auto call_constructor = call_construction{};
-
-	template <typename... Functions>
-	struct constructor_wrapper {
-		std::tuple<Functions...> functions;
-		template <typename Arg, typename... Args, meta::disable<std::is_same<meta::unqualified_t<Arg>, constructor_wrapper>> = meta::enabler>
-		constructor_wrapper(Arg&& arg, Args&&... args)
-		: functions(std::forward<Arg>(arg), std::forward<Args>(args)...) {
-		}
-	};
-
-	template <typename... Functions>
-	inline auto initializers(Functions&&... functions) {
-		return constructor_wrapper<std::decay_t<Functions>...>(std::forward<Functions>(functions)...);
-	}
-
-	template <typename... Functions>
-	struct factory_wrapper {
-		std::tuple<Functions...> functions;
-		template <typename Arg, typename... Args, meta::disable<std::is_same<meta::unqualified_t<Arg>, factory_wrapper>> = meta::enabler>
-		factory_wrapper(Arg&& arg, Args&&... args)
-		: functions(std::forward<Arg>(arg), std::forward<Args>(args)...) {
-		}
-	};
-
-	template <typename... Functions>
-	inline auto factories(Functions&&... functions) {
-		return factory_wrapper<std::decay_t<Functions>...>(std::forward<Functions>(functions)...);
-	}
-
-	template <typename Function>
-	struct destructor_wrapper {
-		Function fx;
-		destructor_wrapper(Function f)
-		: fx(std::move(f)) {
-		}
-	};
-
-	template <>
-	struct destructor_wrapper<void> {};
-
-	const destructor_wrapper<void> default_destructor{};
-
-	template <typename Fx>
-	inline auto destructor(Fx&& fx) {
-		return destructor_wrapper<std::decay_t<Fx>>(std::forward<Fx>(fx));
-	}
-
-} // namespace sol
-
-// end of sol/raii.hpp
-
-// beginning of sol/policies.hpp
-
-#include <array>
-
-namespace sol {
-	namespace detail {
-		struct policy_base_tag {};
-	} // namespace detail
-
-	template <int Target, int... In>
-	struct static_stack_dependencies : detail::policy_base_tag {};
-	typedef static_stack_dependencies<-1, 1> self_dependency;
-	template <int... In>
-	struct returns_self_with : detail::policy_base_tag {};
-	typedef returns_self_with<> returns_self;
-
-	struct stack_dependencies : detail::policy_base_tag {
-		int target;
-		std::array<int, 64> stack_indices;
-		std::size_t len;
-
-		template <typename... Args>
-		stack_dependencies(int stack_target, Args&&... args) : target(stack_target), stack_indices(), len(sizeof...(Args)) {
-			std::size_t i = 0;
-			(void)detail::swallow{ int(), (stack_indices[i++] = static_cast<int>(std::forward<Args>(args)), int())... };
-		}
-
-		int& operator[](std::size_t i) {
-			return stack_indices[i];
-		}
-
-		const int& operator[](std::size_t i) const {
-			return stack_indices[i];
-		}
-
-		std::size_t size() const {
-			return len;
-		}
-	};
-
-	template <typename F, typename... Policies>
-	struct policy_wrapper {
-		typedef std::index_sequence_for<Policies...> indices;
-
-		F value;
-		std::tuple<Policies...> policies;
-
-		template <typename Fx, typename... Args, meta::enable<meta::neg<std::is_same<meta::unqualified_t<Fx>, policy_wrapper>>> = meta::enabler>
-		policy_wrapper(Fx&& fx, Args&&... args) : value(std::forward<Fx>(fx)), policies(std::forward<Args>(args)...) {
-		}
-
-		policy_wrapper(const policy_wrapper&) = default;
-		policy_wrapper& operator=(const policy_wrapper&) = default;
-		policy_wrapper(policy_wrapper&&) = default;
-		policy_wrapper& operator=(policy_wrapper&&) = default;
-	};
-
-	template <typename F, typename... Args>
-	auto policies(F&& f, Args&&... args) {
-		return policy_wrapper<std::decay_t<F>, std::decay_t<Args>...>(std::forward<F>(f), std::forward<Args>(args)...);
-	}
-
-	namespace detail {
-		template <typename T>
-		using is_policy = meta::is_specialization_of<T, policy_wrapper>;
-
-		template <typename T>
-		inline constexpr bool is_policy_v = is_policy<T>::value;
-	} // namespace detail
-} // namespace sol
-
-// end of sol/policies.hpp
-
-// beginning of sol/ebco.hpp
-
-#include <type_traits>
-#include <utility>
-
-namespace sol { namespace detail {
-
-	template <typename T, std::size_t tag = 0, typename = void>
-	struct ebco {
-		T value_;
-
-		ebco() = default;
-		ebco(const ebco&) = default;
-		ebco(ebco&&) = default;
-		ebco& operator=(const ebco&) = default;
-		ebco& operator=(ebco&&) = default;
-		ebco(const T& v) : value_(v){};
-		ebco(T&& v) : value_(std::move(v)){};
-		ebco& operator=(const T& v) {
-			value_ = v;
-			return *this;
-		}
-		ebco& operator=(T&& v) {
-			value_ = std::move(v);
-			return *this;
-		};
-		template <typename Arg, typename... Args,
-		     typename = std::enable_if_t<!std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>,
-		                                      ebco> && !std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>, T>>>
-		ebco(Arg&& arg, Args&&... args) : T(std::forward<Arg>(arg), std::forward<Args>(args)...){}
-
-		T& value() & {
-			return value_;
-		}
-
-		T const& value() const & {
-			return value_;
-		}
-
-		T&& value() && {
-			return std::move(value_);
-		}
-	};
-
-	template <typename T, std::size_t tag>
-	struct ebco<T, tag, std::enable_if_t<!std::is_reference_v<T> && std::is_class_v<T> && !std::is_final_v<T>>> : T {
-		ebco() = default;
-		ebco(const ebco&) = default;
-		ebco(ebco&&) = default;
-		ebco(const T& v) : T(v){};
-		ebco(T&& v) : T(std::move(v)){};
-		template <typename Arg, typename... Args,
-			typename = std::enable_if_t<!std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>,
-			                                 ebco> && !std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>, T>>>
-		ebco(Arg&& arg, Args&&... args) : T(std::forward<Arg>(arg), std::forward<Args>(args)...) {
-		}
-
-		ebco& operator=(const ebco&) = default;
-		ebco& operator=(ebco&&) = default;
-		ebco& operator=(const T& v) {
-			static_cast<T&>(*this) = v;
-			return *this;
-		}
-		ebco& operator=(T&& v) {
-			static_cast<T&>(*this) = std::move(v);
-			return *this;
-		};
-
-		T& value() & {
-			return static_cast<T&>(*this);
-		}
-
-		T const& value() const & {
-			return static_cast<T const&>(*this);
-		}
-
-		T&& value() && {
-			return std::move(static_cast<T&>(*this));
-		}
-	};
-
-	template <typename T, std::size_t tag>
-	struct ebco<T&, tag> {
-		T& ref;
-
-		ebco() = default;
-		ebco(const ebco&) = default;
-		ebco(ebco&&) = default;
-		ebco(T& v) : ref(v){};
-
-		ebco& operator=(const ebco&) = default;
-		ebco& operator=(ebco&&) = default;
-		ebco& operator=(T& v) {
-			ref = v;
-			return *this;
-		}
-
-		T& value() const {
-			return const_cast<ebco<T&, tag>&>(*this).ref;
-		}
-	};
-
-	template <typename T, std::size_t tag>
-	struct ebco<T&&, tag> {
-		T&& ref;
-
-		ebco() = default;
-		ebco(const ebco&) = default;
-		ebco(ebco&&) = default;
-		ebco(T&& v) : ref(v){};
-
-		ebco& operator=(const ebco&) = default;
-		ebco& operator=(ebco&&) = default;
-		ebco& operator=(T&& v) {
-			ref = std::move(v);
-			return *this;
-		}
-
-		T& value() & {
-			return ref;
-		}
-
-		const T& value() const & {
-			return ref;
-		}
-
-		T&& value() && {
-			return std::move(ref);
-		}
-	};
-
-}} // namespace sol::detail
-
-// end of sol/ebco.hpp
-
-#include <array>
-#include <initializer_list>
-#include <string>
-#include <string_view>
-#include <optional>
-#if SOL_IS_ON(SOL_STD_VARIANT_I_)
-#include <variant>
-#endif // variant shenanigans (thanks, Mac OSX)
-
-namespace sol {
-	namespace detail {
-#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_)
-		typedef int (*lua_CFunction_noexcept)(lua_State* L) noexcept;
-#else
-		typedef int (*lua_CFunction_noexcept)(lua_State* L);
-#endif // noexcept function type for lua_CFunction
-
-		template <typename T>
-		struct unique_usertype { };
-
-		template <typename T>
-		struct implicit_wrapper {
-			T& item;
-			implicit_wrapper(T* item) : item(*item) {
-			}
-			implicit_wrapper(T& item) : item(item) {
-			}
-			operator T&() {
-				return item;
-			}
-			operator T*() {
-				return std::addressof(item);
-			}
-		};
-
-		struct yield_tag_t { };
-		const yield_tag_t yield_tag = yield_tag_t {};
-	} // namespace detail
-
-	struct lua_nil_t { };
-	inline constexpr lua_nil_t lua_nil {};
-	inline bool operator==(lua_nil_t, lua_nil_t) {
-		return true;
-	}
-	inline bool operator!=(lua_nil_t, lua_nil_t) {
-		return false;
-	}
-#if SOL_IS_ON(SOL_NIL_I_)
-	using nil_t = lua_nil_t;
-	inline constexpr const nil_t& nil = lua_nil;
-#endif
-
-	namespace detail {
-		struct non_lua_nil_t { };
-	} // namespace detail
-
-	struct metatable_key_t { };
-	const metatable_key_t metatable_key = {};
-
-	struct env_key_t { };
-	const env_key_t env_key = {};
-
-	struct no_metatable_t { };
-	const no_metatable_t no_metatable = {};
-
-	template <typename T>
-	struct yielding_t {
-		T func;
-
-		yielding_t() = default;
-		yielding_t(const yielding_t&) = default;
-		yielding_t(yielding_t&&) = default;
-		yielding_t& operator=(const yielding_t&) = default;
-		yielding_t& operator=(yielding_t&&) = default;
-		template <typename Arg,
-		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<Arg>, yielding_t>>,
-		          meta::neg<std::is_base_of<proxy_base_tag, meta::unqualified_t<Arg>>>> = meta::enabler>
-		yielding_t(Arg&& arg) : func(std::forward<Arg>(arg)) {
-		}
-		template <typename Arg0, typename Arg1, typename... Args>
-		yielding_t(Arg0&& arg0, Arg1&& arg1, Args&&... args) : func(std::forward<Arg0>(arg0), std::forward<Arg1>(arg1), std::forward<Args>(args)...) {
-		}
-	};
-
-	template <typename F>
-	inline yielding_t<std::decay_t<F>> yielding(F&& f) {
-		return yielding_t<std::decay_t<F>>(std::forward<F>(f));
-	}
-
-	typedef std::remove_pointer_t<lua_CFunction> lua_CFunction_ref;
-
-	template <typename T>
-	struct non_null { };
-
-	template <typename... Args>
-	struct function_sig { };
-
-	struct upvalue_index {
-		int index;
-		upvalue_index(int idx) : index(lua_upvalueindex(idx)) {
-		}
-
-		operator int() const {
-			return index;
-		}
-	};
-
-	struct raw_index {
-		int index;
-		raw_index(int i) : index(i) {
-		}
-
-		operator int() const {
-			return index;
-		}
-	};
-
-	struct absolute_index {
-		int index;
-		absolute_index(lua_State* L, int idx) : index(lua_absindex(L, idx)) {
-		}
-
-		operator int() const {
-			return index;
-		}
-	};
-
-	struct ref_index {
-		int index;
-		ref_index(int idx) : index(idx) {
-		}
-
-		operator int() const {
-			return index;
-		}
-	};
-
-	struct stack_count {
-		int count;
-
-		stack_count(int cnt) : count(cnt) {
-		}
-	};
-
-	struct lightuserdata_value {
-		void* value;
-		lightuserdata_value(void* data) : value(data) {
-		}
-		operator void*() const {
-			return value;
-		}
-	};
-
-	struct userdata_value {
-		void* value;
-		userdata_value(void* data) : value(data) {
-		}
-		operator void*() const {
-			return value;
-		}
-	};
-
-	template <typename L>
-	struct light {
-		L* value;
-
-		light(L& x) : value(std::addressof(x)) {
-		}
-		light(L* x) : value(x) {
-		}
-		light(void* x) : value(static_cast<L*>(x)) {
-		}
-		operator L*() const {
-			return value;
-		}
-		operator L&() const {
-			return *value;
-		}
-	};
-
-	template <typename T>
-	auto make_light(T& l) {
-		typedef meta::unwrapped_t<std::remove_pointer_t<std::remove_pointer_t<T>>> L;
-		return light<L>(l);
-	}
-
-	template <typename U>
-	struct user {
-		U value;
-
-		user(U&& x) : value(std::forward<U>(x)) {
-		}
-		operator std::add_pointer_t<std::remove_reference_t<U>>() {
-			return std::addressof(value);
-		}
-		operator std::add_lvalue_reference_t<U>() {
-			return value;
-		}
-		operator std::add_const_t<std::add_lvalue_reference_t<U>> &() const {
-			return value;
-		}
-	};
-
-	template <typename T>
-	auto make_user(T&& u) {
-		typedef meta::unwrapped_t<meta::unqualified_t<T>> U;
-		return user<U>(std::forward<T>(u));
-	}
-
-	template <typename T>
-	struct metatable_registry_key {
-		T key;
-
-		metatable_registry_key(T key) : key(std::forward<T>(key)) {
-		}
-	};
-
-	template <typename T>
-	auto meta_registry_key(T&& key) {
-		typedef meta::unqualified_t<T> K;
-		return metatable_registry_key<K>(std::forward<T>(key));
-	}
-
-	template <typename... Upvalues>
-	struct closure {
-		lua_CFunction c_function;
-		std::tuple<Upvalues...> upvalues;
-		closure(lua_CFunction f, Upvalues... targetupvalues) : c_function(f), upvalues(std::forward<Upvalues>(targetupvalues)...) {
-		}
-	};
-
-	template <>
-	struct closure<> {
-		lua_CFunction c_function;
-		int upvalues;
-		closure(lua_CFunction f, int upvalue_count = 0) : c_function(f), upvalues(upvalue_count) {
-		}
-	};
-
-	typedef closure<> c_closure;
-
-	template <typename... Args>
-	closure<Args...> make_closure(lua_CFunction f, Args&&... args) {
-		return closure<Args...>(f, std::forward<Args>(args)...);
-	}
-
-	template <typename Sig, typename... Ps>
-	struct function_arguments {
-		std::tuple<Ps...> arguments;
-		template <typename Arg, typename... Args, meta::disable<std::is_same<meta::unqualified_t<Arg>, function_arguments>> = meta::enabler>
-		function_arguments(Arg&& arg, Args&&... args) : arguments(std::forward<Arg>(arg), std::forward<Args>(args)...) {
-		}
-	};
-
-	template <typename Sig = function_sig<>, typename... Args>
-	auto as_function(Args&&... args) {
-		return function_arguments<Sig, std::decay_t<Args>...>(std::forward<Args>(args)...);
-	}
-
-	template <typename Sig = function_sig<>, typename... Args>
-	auto as_function_reference(Args&&... args) {
-		return function_arguments<Sig, Args...>(std::forward<Args>(args)...);
-	}
-
-	template <typename T>
-	struct as_table_t {
-	private:
-		T value_;
-
-	public:
-		as_table_t() = default;
-		as_table_t(const as_table_t&) = default;
-		as_table_t(as_table_t&&) = default;
-		as_table_t& operator=(const as_table_t&) = default;
-		as_table_t& operator=(as_table_t&&) = default;
-		template <typename Arg,
-		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<Arg>, as_table_t>>,
-		          meta::neg<std::is_base_of<proxy_base_tag, meta::unqualified_t<Arg>>>> = meta::enabler>
-		as_table_t(Arg&& arg) : value_(std::forward<Arg>(arg)) {
-		}
-		template <typename Arg0, typename Arg1, typename... Args>
-		as_table_t(Arg0&& arg0, Arg1&& arg1, Args&&... args) : value_(std::forward<Arg0>(arg0), std::forward<Arg1>(arg1), std::forward<Args>(args)...) {
-		}
-
-		T& value() & {
-			return value_;
-		}
-
-		T&& value() && {
-			return std::move(value_);
-		}
-
-		const T& value() const& {
-			return value_;
-		}
-
-		operator std::add_lvalue_reference_t<T>() {
-			return value_;
-		}
-	};
-
-	template <typename T>
-	struct nested {
-	private:
-		T value_;
-
-	public:
-		using nested_type = T;
-
-		nested() = default;
-		nested(const nested&) = default;
-		nested(nested&&) = default;
-		nested& operator=(const nested&) = default;
-		nested& operator=(nested&&) = default;
-		template <typename Arg,
-		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<Arg>, nested>>,
-		          meta::neg<std::is_base_of<proxy_base_tag, meta::unqualified_t<Arg>>>> = meta::enabler>
-		nested(Arg&& arg) : value_(std::forward<Arg>(arg)) {
-		}
-		template <typename Arg0, typename Arg1, typename... Args>
-		nested(Arg0&& arg0, Arg1&& arg1, Args&&... args) : value_(std::forward<Arg0>(arg0), std::forward<Arg1>(arg1), std::forward<Args>(args)...) {
-		}
-
-		T& value() & {
-			return value_;
-		}
-
-		T&& value() && {
-			return std::move(value_);
-		}
-
-		const T& value() const& {
-			return value_;
-		}
-
-		operator std::add_lvalue_reference_t<T>() {
-			return value_;
-		}
-	};
-
-	struct nested_tag_t { };
-	constexpr inline nested_tag_t nested_tag {};
-
-	template <typename T>
-	as_table_t<T> as_table_ref(T&& container) {
-		return as_table_t<T>(std::forward<T>(container));
-	}
-
-	template <typename T>
-	as_table_t<meta::unqualified_t<T>> as_table(T&& container) {
-		return as_table_t<meta::unqualified_t<T>>(std::forward<T>(container));
-	}
-
-	template <typename T>
-	nested<T> as_nested_ref(T&& container) {
-		return nested<T>(std::forward<T>(container));
-	}
-
-	template <typename T>
-	nested<meta::unqualified_t<T>> as_nested(T&& container) {
-		return nested<meta::unqualified_t<T>>(std::forward<T>(container));
-	}
-
-	template <typename T>
-	struct as_container_t {
-	private:
-		T value_;
-
-	public:
-		using type = T;
-
-		as_container_t() = default;
-		as_container_t(const as_container_t&) = default;
-		as_container_t(as_container_t&&) = default;
-		as_container_t& operator=(const as_container_t&) = default;
-		as_container_t& operator=(as_container_t&&) = default;
-		template <typename Arg,
-		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<Arg>, as_container_t>>,
-		          meta::neg<std::is_base_of<proxy_base_tag, meta::unqualified_t<Arg>>>> = meta::enabler>
-		as_container_t(Arg&& arg) : value_(std::forward<Arg>(arg)) {
-		}
-		template <typename Arg0, typename Arg1, typename... Args>
-		as_container_t(Arg0&& arg0, Arg1&& arg1, Args&&... args) : value_(std::forward<Arg0>(arg0), std::forward<Arg1>(arg1), std::forward<Args>(args)...) {
-		}
-
-		T& value() & {
-			return value_;
-		}
-
-		T&& value() && {
-			return std::move(value_);
-		}
-
-		const T& value() const& {
-			return value_;
-		}
-	};
-
-	template <typename T>
-	struct as_container_t<T&> {
-	private:
-		std::reference_wrapper<T> value_;
-
-	public:
-		as_container_t(T& value) : value_(value) {
-		}
-
-		T& value() {
-			return value_;
-		}
-
-		operator T&() {
-			return value();
-		}
-	};
-
-	template <typename T>
-	auto as_container(T&& value) {
-		return as_container_t<T>(std::forward<T>(value));
-	}
-
-	template <typename T>
-	struct push_invoke_t {
-	private:
-		T value_;
-
-	public:
-		push_invoke_t() = default;
-		push_invoke_t(const push_invoke_t&) = default;
-		push_invoke_t(push_invoke_t&&) = default;
-		push_invoke_t& operator=(const push_invoke_t&) = default;
-		push_invoke_t& operator=(push_invoke_t&&) = default;
-		template <typename Arg,
-		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<Arg>, push_invoke_t>>,
-		          meta::neg<std::is_base_of<proxy_base_tag, meta::unqualified_t<Arg>>>> = meta::enabler>
-		push_invoke_t(Arg&& arg) : value_(std::forward<Arg>(arg)) {
-		}
-		template <typename Arg0, typename Arg1, typename... Args>
-		push_invoke_t(Arg0&& arg0, Arg1&& arg1, Args&&... args) : value_(std::forward<Arg0>(arg0), std::forward<Arg1>(arg1), std::forward<Args>(args)...) {
-		}
-
-		T& value() & {
-			return value_;
-		}
-
-		T&& value() && {
-			return std::move(value_);
-		}
-
-		const T& value() const& {
-			return value_;
-		}
-	};
-
-	template <typename T>
-	struct push_invoke_t<T&> {
-		std::reference_wrapper<T> value_;
-
-		push_invoke_t(T& value) : value_(value) {
-		}
-
-		T& value() {
-			return value_;
-		}
-	};
-
-	template <typename Fx>
-	auto push_invoke(Fx&& fx) {
-		return push_invoke_t<Fx>(std::forward<Fx>(fx));
-	}
-
-	struct override_value_t { };
-	constexpr inline override_value_t override_value = override_value_t();
-	struct update_if_empty_t { };
-	constexpr inline update_if_empty_t update_if_empty = update_if_empty_t();
-	struct create_if_nil_t { };
-	constexpr inline create_if_nil_t create_if_nil = create_if_nil_t();
-
-	namespace detail {
-		enum insert_mode { none = 0x0, update_if_empty = 0x01, override_value = 0x02, create_if_nil = 0x04 };
-
-		template <typename T, typename...>
-		using is_insert_mode = std::integral_constant<bool,
-		     std::is_same_v<T, override_value_t> || std::is_same_v<T, update_if_empty_t> || std::is_same_v<T, create_if_nil_t>>;
-
-		template <typename T, typename...>
-		using is_not_insert_mode = meta::neg<is_insert_mode<T>>;
-	} // namespace detail
-
-	struct this_state {
-		lua_State* L;
-
-		this_state(lua_State* Ls) : L(Ls) {
-		}
-
-		operator lua_State*() const noexcept {
-			return lua_state();
-		}
-
-		lua_State* operator->() const noexcept {
-			return lua_state();
-		}
-
-		lua_State* lua_state() const noexcept {
-			return L;
-		}
-	};
-
-	struct this_main_state {
-		lua_State* L;
-
-		this_main_state(lua_State* Ls) : L(Ls) {
-		}
-
-		operator lua_State*() const noexcept {
-			return lua_state();
-		}
-
-		lua_State* operator->() const noexcept {
-			return lua_state();
-		}
-
-		lua_State* lua_state() const noexcept {
-			return L;
-		}
-	};
-
-	struct new_table {
-		int sequence_hint = 0;
-		int map_hint = 0;
-
-		new_table() = default;
-		new_table(const new_table&) = default;
-		new_table(new_table&&) = default;
-		new_table& operator=(const new_table&) = default;
-		new_table& operator=(new_table&&) = default;
-
-		new_table(int sequence_hint, int map_hint = 0) : sequence_hint(sequence_hint), map_hint(map_hint) {
-		}
-	};
-
-	const new_table create = {};
-
-	enum class lib : char {
-		// print, assert, and other base functions
-		base,
-		// require and other package functions
-		package,
-		// coroutine functions and utilities
-		coroutine,
-		// string library
-		string,
-		// functionality from the OS
-		os,
-		// all things math
-		math,
-		// the table manipulator and observer functions
-		table,
-		// the debug library
-		debug,
-		// the bit library: different based on which you're using
-		bit32,
-		// input/output library
-		io,
-		// LuaJIT only
-		ffi,
-		// LuaJIT only
-		jit,
-		// library for handling utf8: new to Lua
-		utf8,
-		// do not use
-		count
-	};
-
-	enum class call_syntax { dot = 0, colon = 1 };
-
-	enum class load_mode {
-		any = 0,
-		text = 1,
-		binary = 2,
-	};
-
-	enum class call_status : int {
-		ok = LUA_OK,
-		yielded = LUA_YIELD,
-		runtime = LUA_ERRRUN,
-		memory = LUA_ERRMEM,
-		handler = LUA_ERRERR,
-		gc = LUA_ERRGCMM,
-		syntax = LUA_ERRSYNTAX,
-		file = LUA_ERRFILE,
-	};
-
-	enum class thread_status : int {
-		ok = LUA_OK,
-		yielded = LUA_YIELD,
-		runtime = LUA_ERRRUN,
-		memory = LUA_ERRMEM,
-		gc = LUA_ERRGCMM,
-		handler = LUA_ERRERR,
-		dead = -1,
-	};
-
-	enum class load_status : int {
-		ok = LUA_OK,
-		syntax = LUA_ERRSYNTAX,
-		memory = LUA_ERRMEM,
-		gc = LUA_ERRGCMM,
-		file = LUA_ERRFILE,
-	};
-
-	enum class gc_mode : int {
-		incremental = 0,
-		generational = 1,
-		default_value = incremental,
-	};
-
-	enum class type : int {
-		none = LUA_TNONE,
-		lua_nil = LUA_TNIL,
-#if SOL_IS_ON(SOL_NIL_I_)
-		nil = lua_nil,
-#endif // Objective C/C++ Keyword that's found in OSX SDK and OBJC -- check for all forms to protect
-		string = LUA_TSTRING,
-		number = LUA_TNUMBER,
-		thread = LUA_TTHREAD,
-		boolean = LUA_TBOOLEAN,
-		function = LUA_TFUNCTION,
-		userdata = LUA_TUSERDATA,
-		lightuserdata = LUA_TLIGHTUSERDATA,
-		table = LUA_TTABLE,
-		poly = -0xFFFF
-	};
-
-	inline const std::string& to_string(call_status c) {
-		static const std::array<std::string, 10> names { { "ok",
-			"yielded",
-			"runtime",
-			"memory",
-			"handler",
-			"gc",
-			"syntax",
-			"file",
-			"CRITICAL_EXCEPTION_FAILURE",
-			"CRITICAL_INDETERMINATE_STATE_FAILURE" } };
-		switch (c) {
-		case call_status::ok:
-			return names[0];
-		case call_status::yielded:
-			return names[1];
-		case call_status::runtime:
-			return names[2];
-		case call_status::memory:
-			return names[3];
-		case call_status::handler:
-			return names[4];
-		case call_status::gc:
-			return names[5];
-		case call_status::syntax:
-			return names[6];
-		case call_status::file:
-			return names[7];
-		}
-		if (static_cast<std::ptrdiff_t>(c) == -1) {
-			// One of the many cases where a critical exception error has occurred
-			return names[8];
-		}
-		return names[9];
-	}
-
-	inline bool is_indeterminate_call_failure(call_status c) {
-		switch (c) {
-		case call_status::ok:
-		case call_status::yielded:
-		case call_status::runtime:
-		case call_status::memory:
-		case call_status::handler:
-		case call_status::gc:
-		case call_status::syntax:
-		case call_status::file:
-			return false;
-		}
-		return true;
-	}
-
-	inline const std::string& to_string(load_status c) {
-		static const std::array<std::string, 7> names {
-			{ "ok", "memory", "gc", "syntax", "file", "CRITICAL_EXCEPTION_FAILURE", "CRITICAL_INDETERMINATE_STATE_FAILURE" }
-		};
-		switch (c) {
-		case load_status::ok:
-			return names[0];
-		case load_status::memory:
-			return names[1];
-		case load_status::gc:
-			return names[2];
-		case load_status::syntax:
-			return names[3];
-		case load_status::file:
-			return names[4];
-		}
-		if (static_cast<int>(c) == -1) {
-			// One of the many cases where a critical exception error has occurred
-			return names[5];
-		}
-		return names[6];
-	}
-
-	inline const std::string& to_string(load_mode c) {
-		static const std::array<std::string, 3> names { {
-			"bt",
-			"t",
-			"b",
-		} };
-		return names[static_cast<std::size_t>(c)];
-	}
-
-	enum class meta_function {
-		construct,
-		index,
-		new_index,
-		mode,
-		call,
-		call_function = call,
-		metatable,
-		to_string,
-		length,
-		unary_minus,
-		addition,
-		subtraction,
-		multiplication,
-		division,
-		modulus,
-		power_of,
-		involution = power_of,
-		concatenation,
-		equal_to,
-		less_than,
-		less_than_or_equal_to,
-		garbage_collect,
-		floor_division,
-		bitwise_left_shift,
-		bitwise_right_shift,
-		bitwise_not,
-		bitwise_and,
-		bitwise_or,
-		bitwise_xor,
-		pairs,
-		ipairs,
-		next,
-		type,
-		type_info,
-		call_construct,
-		storage,
-		gc_names,
-		static_index,
-		static_new_index,
-	};
-
-	typedef meta_function meta_method;
-
-	inline const std::array<std::string, 37>& meta_function_names() {
-		static const std::array<std::string, 37> names = { { "new",
-			"__index",
-			"__newindex",
-			"__mode",
-			"__call",
-			"__metatable",
-			"__tostring",
-			"__len",
-			"__unm",
-			"__add",
-			"__sub",
-			"__mul",
-			"__div",
-			"__mod",
-			"__pow",
-			"__concat",
-			"__eq",
-			"__lt",
-			"__le",
-			"__gc",
-
-			"__idiv",
-			"__shl",
-			"__shr",
-			"__bnot",
-			"__band",
-			"__bor",
-			"__bxor",
-
-			"__pairs",
-			"__ipairs",
-			"next",
-
-			"__type",
-			"__typeinfo",
-			"__sol.call_new",
-			"__sol.storage",
-			"__sol.gc_names",
-			"__sol.static_index",
-			"__sol.static_new_index" } };
-		return names;
-	}
-
-	inline const std::string& to_string(meta_function mf) {
-		return meta_function_names()[static_cast<int>(mf)];
-	}
-
-	inline type type_of(lua_State* L, int index) {
-		return static_cast<type>(lua_type(L, index));
-	}
-
-	inline std::string type_name(lua_State* L, type t) {
-		return lua_typename(L, static_cast<int>(t));
-	}
-
-	template <typename T>
-	struct is_lua_reference
-	: std::integral_constant<bool, std::is_base_of_v<reference, T> || std::is_base_of_v<main_reference, T> || std::is_base_of_v<stack_reference, T>> { };
-
-	template <typename T>
-	inline constexpr bool is_lua_reference_v = is_lua_reference<T>::value;
-
-	template <typename T>
-	struct is_lua_reference_or_proxy : std::integral_constant<bool, is_lua_reference_v<T> || meta::is_specialization_of_v<T, table_proxy>> { };
-
-	template <typename T>
-	inline constexpr bool is_lua_reference_or_proxy_v = is_lua_reference_or_proxy<T>::value;
-
-	template <typename T>
-	struct is_transparent_argument : std::false_type { };
-
-	template <typename T>
-	constexpr inline bool is_transparent_argument_v = is_transparent_argument<T>::value;
-
-	template <>
-	struct is_transparent_argument<this_state> : std::true_type { };
-	template <>
-	struct is_transparent_argument<this_main_state> : std::true_type { };
-	template <>
-	struct is_transparent_argument<this_environment> : std::true_type { };
-	template <>
-	struct is_transparent_argument<variadic_args> : std::true_type { };
-	template <typename T>
-	struct is_variadic_arguments : std::is_same<T, variadic_args> { };
-
-	template <typename T>
-	struct is_container
-	: std::integral_constant<bool,
-	       !std::is_same_v<state_view,
-	            T> && !std::is_same_v<state, T> && !meta::is_initializer_list_v<T> && !meta::is_string_like_v<T> && !meta::is_string_literal_array_v<T> && !is_transparent_argument_v<T> && !is_lua_reference_v<T> && (meta::has_begin_end_v<T> || std::is_array_v<T>)> {
-	};
-
-	template <typename T>
-	constexpr inline bool is_container_v = is_container<T>::value;
-
-	template <typename T>
-	struct is_to_stringable : meta::any<meta::supports_to_string_member<meta::unqualified_t<T>>, meta::supports_adl_to_string<meta::unqualified_t<T>>,
-	                               meta::supports_op_left_shift<std::ostream, meta::unqualified_t<T>>> { };
-
-	namespace detail {
-		template <typename T, typename = void>
-		struct lua_type_of : std::integral_constant<type, type::userdata> { };
-
-		template <typename C, typename T, typename A>
-		struct lua_type_of<std::basic_string<C, T, A>> : std::integral_constant<type, type::string> { };
-
-		template <typename C, typename T>
-		struct lua_type_of<basic_string_view<C, T>> : std::integral_constant<type, type::string> { };
-
-		template <std::size_t N>
-		struct lua_type_of<char[N]> : std::integral_constant<type, type::string> { };
-
-		template <std::size_t N>
-		struct lua_type_of<wchar_t[N]> : std::integral_constant<type, type::string> { };
-
-		template <std::size_t N>
-		struct lua_type_of<char16_t[N]> : std::integral_constant<type, type::string> { };
-
-		template <std::size_t N>
-		struct lua_type_of<char32_t[N]> : std::integral_constant<type, type::string> { };
-
-		template <>
-		struct lua_type_of<char> : std::integral_constant<type, type::string> { };
-
-		template <>
-		struct lua_type_of<wchar_t> : std::integral_constant<type, type::string> { };
-
-		template <>
-		struct lua_type_of<char16_t> : std::integral_constant<type, type::string> { };
-
-		template <>
-		struct lua_type_of<char32_t> : std::integral_constant<type, type::string> { };
-
-		template <>
-		struct lua_type_of<const char*> : std::integral_constant<type, type::string> { };
-
-		template <>
-		struct lua_type_of<const char16_t*> : std::integral_constant<type, type::string> { };
-
-		template <>
-		struct lua_type_of<const char32_t*> : std::integral_constant<type, type::string> { };
-
-		template <>
-		struct lua_type_of<bool> : std::integral_constant<type, type::boolean> { };
-
-		template <>
-		struct lua_type_of<lua_nil_t> : std::integral_constant<type, type::lua_nil> { };
-
-		template <>
-		struct lua_type_of<nullopt_t> : std::integral_constant<type, type::lua_nil> { };
-
-		template <>
-		struct lua_type_of<lua_value> : std::integral_constant<type, type::poly> { };
-
-		template <>
-		struct lua_type_of<detail::non_lua_nil_t> : std::integral_constant<type, type::poly> { };
-
-		template <>
-		struct lua_type_of<std::nullptr_t> : std::integral_constant<type, type::lua_nil> { };
-
-		template <>
-		struct lua_type_of<error> : std::integral_constant<type, type::string> { };
-
-		template <bool b, typename Base>
-		struct lua_type_of<basic_table_core<b, Base>> : std::integral_constant<type, type::table> { };
-
-		template <typename Base>
-		struct lua_type_of<basic_lua_table<Base>> : std::integral_constant<type, type::table> { };
-
-		template <typename Base>
-		struct lua_type_of<basic_metatable<Base>> : std::integral_constant<type, type::table> { };
-
-		template <typename T, typename Base>
-		struct lua_type_of<basic_usertype<T, Base>> : std::integral_constant<type, type::table> { };
-
-		template <>
-		struct lua_type_of<metatable_key_t> : std::integral_constant<type, type::table> { };
-
-		template <typename B>
-		struct lua_type_of<basic_environment<B>> : std::integral_constant<type, type::poly> { };
-
-		template <>
-		struct lua_type_of<env_key_t> : std::integral_constant<type, type::poly> { };
-
-		template <>
-		struct lua_type_of<new_table> : std::integral_constant<type, type::table> { };
-
-		template <typename T>
-		struct lua_type_of<as_table_t<T>> : std::integral_constant<type, type::table> { };
-
-		template <typename T>
-		struct lua_type_of<std::initializer_list<T>> : std::integral_constant<type, type::table> { };
-
-		template <bool b>
-		struct lua_type_of<basic_reference<b>> : std::integral_constant<type, type::poly> { };
-
-		template <>
-		struct lua_type_of<stack_reference> : std::integral_constant<type, type::poly> { };
-
-		template <typename Base>
-		struct lua_type_of<basic_object<Base>> : std::integral_constant<type, type::poly> { };
-
-		template <typename... Args>
-		struct lua_type_of<std::tuple<Args...>> : std::integral_constant<type, type::poly> { };
-
-		template <typename A, typename B>
-		struct lua_type_of<std::pair<A, B>> : std::integral_constant<type, type::poly> { };
-
-		template <>
-		struct lua_type_of<void*> : std::integral_constant<type, type::lightuserdata> { };
-
-		template <>
-		struct lua_type_of<const void*> : std::integral_constant<type, type::lightuserdata> { };
-
-		template <>
-		struct lua_type_of<lightuserdata_value> : std::integral_constant<type, type::lightuserdata> { };
-
-		template <>
-		struct lua_type_of<userdata_value> : std::integral_constant<type, type::userdata> { };
-
-		template <typename T>
-		struct lua_type_of<light<T>> : std::integral_constant<type, type::lightuserdata> { };
-
-		template <typename T>
-		struct lua_type_of<user<T>> : std::integral_constant<type, type::userdata> { };
-
-		template <typename Base>
-		struct lua_type_of<basic_lightuserdata<Base>> : std::integral_constant<type, type::lightuserdata> { };
-
-		template <typename Base>
-		struct lua_type_of<basic_userdata<Base>> : std::integral_constant<type, type::userdata> { };
-
-		template <>
-		struct lua_type_of<lua_CFunction> : std::integral_constant<type, type::function> { };
-
-		template <>
-		struct lua_type_of<std::remove_pointer_t<lua_CFunction>> : std::integral_constant<type, type::function> { };
-
-		template <typename Base, bool aligned>
-		struct lua_type_of<basic_function<Base, aligned>> : std::integral_constant<type, type::function> { };
-
-		template <typename Base, bool aligned, typename Handler>
-		struct lua_type_of<basic_protected_function<Base, aligned, Handler>> : std::integral_constant<type, type::function> { };
-
-		template <typename Base>
-		struct lua_type_of<basic_coroutine<Base>> : std::integral_constant<type, type::function> { };
-
-		template <typename Base>
-		struct lua_type_of<basic_thread<Base>> : std::integral_constant<type, type::thread> { };
-
-		template <typename Signature>
-		struct lua_type_of<std::function<Signature>> : std::integral_constant<type, type::function> { };
-
-		template <typename T>
-		struct lua_type_of<optional<T>> : std::integral_constant<type, type::poly> { };
-
-		template <typename T>
-		struct lua_type_of<std::optional<T>> : std::integral_constant<type, type::poly> { };
-
-		template <>
-		struct lua_type_of<variadic_args> : std::integral_constant<type, type::poly> { };
-
-		template <>
-		struct lua_type_of<variadic_results> : std::integral_constant<type, type::poly> { };
-
-		template <>
-		struct lua_type_of<stack_count> : std::integral_constant<type, type::poly> { };
-
-		template <>
-		struct lua_type_of<this_state> : std::integral_constant<type, type::poly> { };
-
-		template <>
-		struct lua_type_of<this_main_state> : std::integral_constant<type, type::poly> { };
-
-		template <>
-		struct lua_type_of<this_environment> : std::integral_constant<type, type::poly> { };
-
-		template <>
-		struct lua_type_of<type> : std::integral_constant<type, type::poly> { };
-
-#if SOL_IS_ON(SOL_GET_FUNCTION_POINTER_UNSAFE_I_)
-		template <typename T>
-		struct lua_type_of<T*> : std::integral_constant<type, std::is_function_v<T> ? type::function : type::userdata> { };
-#else
-		template <typename T>
-		struct lua_type_of<T*> : std::integral_constant<type, type::userdata> { };
-#endif
-
-		template <typename T>
-		struct lua_type_of<T, std::enable_if_t<std::is_arithmetic_v<T> || std::is_same_v<T, lua_Number> || std::is_same_v<T, lua_Integer>>>
-		: std::integral_constant<type, type::number> { };
-
-		template <typename T>
-		struct lua_type_of<T, std::enable_if_t<std::is_function_v<T>>> : std::integral_constant<type, type::function> { };
-
-		template <typename T>
-		struct lua_type_of<T, std::enable_if_t<std::is_enum_v<T>>> : std::integral_constant<type, type::number> { };
-
-		template <>
-		struct lua_type_of<meta_function> : std::integral_constant<type, type::string> { };
-
-#if SOL_IS_ON(SOL_STD_VARIANT_I_)
-		template <typename... Tn>
-		struct lua_type_of<std::variant<Tn...>> : std::integral_constant<type, type::poly> { };
-#endif // std::variant deployment sucks on Clang
-
-		template <typename T>
-		struct lua_type_of<nested<T>> : meta::conditional_t<::sol::is_container_v<T>, std::integral_constant<type, type::table>, lua_type_of<T>> { };
-
-		template <typename C, C v, template <typename...> class V, typename... Args>
-		struct accumulate : std::integral_constant<C, v> { };
-
-		template <typename C, C v, template <typename...> class V, typename T, typename... Args>
-		struct accumulate<C, v, V, T, Args...> : accumulate<C, v + V<T>::value, V, Args...> { };
-
-		template <typename C, C v, template <typename...> class V, typename List>
-		struct accumulate_list;
-
-		template <typename C, C v, template <typename...> class V, typename... Args>
-		struct accumulate_list<C, v, V, types<Args...>> : accumulate<C, v, V, Args...> { };
-	} // namespace detail
-
-	template <typename T>
-	struct lua_type_of : detail::lua_type_of<T> {
-		typedef int SOL_INTERNAL_UNSPECIALIZED_MARKER_;
-	};
-
-	template <typename T>
-	inline constexpr type lua_type_of_v = lua_type_of<T>::value;
-
-	template <typename T>
-	struct lua_size : std::integral_constant<int, 1> {
-		typedef int SOL_INTERNAL_UNSPECIALIZED_MARKER_;
-	};
-
-	template <typename A, typename B>
-	struct lua_size<std::pair<A, B>> : std::integral_constant<int, lua_size<A>::value + lua_size<B>::value> { };
-
-	template <typename... Args>
-	struct lua_size<std::tuple<Args...>> : std::integral_constant<int, detail::accumulate<int, 0, lua_size, Args...>::value> { };
-
-	template <typename T>
-	inline constexpr int lua_size_v = lua_size<T>::value;
-
-	namespace detail {
-		template <typename...>
-		struct void_ {
-			typedef void type;
-		};
-		template <typename T, typename = void>
-		struct has_internal_marker_impl : std::false_type { };
-		template <typename T>
-		struct has_internal_marker_impl<T, typename void_<typename T::SOL_INTERNAL_UNSPECIALIZED_MARKER_>::type> : std::true_type { };
-
-		template <typename T>
-		using has_internal_marker = has_internal_marker_impl<T>;
-
-		template <typename T>
-		constexpr inline bool has_internal_marker_v = has_internal_marker<T>::value;
-	} // namespace detail
-
-	template <typename T>
-	struct is_lua_primitive
-	: std::integral_constant<bool,
-	       type::userdata
-	                 != lua_type_of_v<
-	                      T> || ((type::userdata == lua_type_of_v<T>)&&detail::has_internal_marker_v<lua_type_of<T>> && !detail::has_internal_marker_v<lua_size<T>>)
-	            || is_lua_reference_or_proxy_v<T> || meta::is_specialization_of_v<T, std::tuple> || meta::is_specialization_of_v<T, std::pair>> { };
-
-	template <typename T>
-	constexpr inline bool is_lua_primitive_v = is_lua_primitive<T>::value;
-
-	template <typename T>
-	struct is_main_threaded : std::is_base_of<main_reference, T> { };
-
-	template <typename T>
-	struct is_stack_based : std::is_base_of<stack_reference, T> { };
-	template <>
-	struct is_stack_based<variadic_args> : std::true_type { };
-	template <>
-	struct is_stack_based<unsafe_function_result> : std::true_type { };
-	template <>
-	struct is_stack_based<protected_function_result> : std::true_type { };
-	template <>
-	struct is_stack_based<stack_proxy> : std::true_type { };
-	template <>
-	struct is_stack_based<stack_proxy_base> : std::true_type { };
-	template <>
-	struct is_stack_based<stack_count> : std::true_type { };
-
-	template <typename T>
-	constexpr inline bool is_stack_based_v = is_stack_based<T>::value;
-
-	template <typename T>
-	struct is_lua_primitive<T*> : std::true_type { };
-	template <>
-	struct is_lua_primitive<unsafe_function_result> : std::true_type { };
-	template <>
-	struct is_lua_primitive<protected_function_result> : std::true_type { };
-	template <typename T>
-	struct is_lua_primitive<std::reference_wrapper<T>> : std::true_type { };
-	template <typename T>
-	struct is_lua_primitive<user<T>> : std::true_type { };
-	template <typename T>
-	struct is_lua_primitive<light<T>> : is_lua_primitive<T*> { };
-	template <typename T>
-	struct is_lua_primitive<optional<T>> : std::true_type { };
-	template <typename T>
-	struct is_lua_primitive<std::optional<T>> : std::true_type { };
-	template <typename T>
-	struct is_lua_primitive<as_table_t<T>> : std::true_type { };
-	template <typename T>
-	struct is_lua_primitive<nested<T>> : std::true_type { };
-	template <>
-	struct is_lua_primitive<userdata_value> : std::true_type { };
-	template <>
-	struct is_lua_primitive<lightuserdata_value> : std::true_type { };
-	template <>
-	struct is_lua_primitive<stack_proxy> : std::true_type { };
-	template <>
-	struct is_lua_primitive<stack_proxy_base> : std::true_type { };
-	template <typename T>
-	struct is_lua_primitive<non_null<T>> : is_lua_primitive<T*> { };
-
-	template <typename T>
-	struct is_lua_index : std::is_integral<T> { };
-	template <>
-	struct is_lua_index<raw_index> : std::true_type { };
-	template <>
-	struct is_lua_index<absolute_index> : std::true_type { };
-	template <>
-	struct is_lua_index<ref_index> : std::true_type { };
-	template <>
-	struct is_lua_index<upvalue_index> : std::true_type { };
-
-	template <typename Signature>
-	struct lua_bind_traits : meta::bind_traits<Signature> {
-	private:
-		typedef meta::bind_traits<Signature> base_t;
-
-	public:
-		typedef std::integral_constant<bool, meta::count_for<is_variadic_arguments, typename base_t::args_list>::value != 0> runtime_variadics_t;
-		static const std::size_t true_arity = base_t::arity;
-		static const std::size_t arity = detail::accumulate_list<std::size_t, 0, lua_size, typename base_t::args_list>::value
-		     - meta::count_for<is_transparent_argument, typename base_t::args_list>::value;
-		static const std::size_t true_free_arity = base_t::free_arity;
-		static const std::size_t free_arity = detail::accumulate_list<std::size_t, 0, lua_size, typename base_t::free_args_list>::value
-		     - meta::count_for<is_transparent_argument, typename base_t::args_list>::value;
-	};
-
-	template <typename T>
-	struct is_table : std::false_type { };
-	template <bool x, typename T>
-	struct is_table<basic_table_core<x, T>> : std::true_type { };
-	template <typename T>
-	struct is_table<basic_lua_table<T>> : std::true_type { };
-
-	template <typename T>
-	inline constexpr bool is_table_v = is_table<T>::value;
-
-	template <typename T>
-	struct is_stack_table : std::false_type { };
-	template <bool x, typename T>
-	struct is_stack_table<basic_table_core<x, T>> : std::integral_constant<bool, std::is_base_of_v<stack_reference, T>> { };
-	template <typename T>
-	struct is_stack_table<basic_lua_table<T>> : std::integral_constant<bool, std::is_base_of_v<stack_reference, T>> { };
-
-	template <typename T>
-	inline constexpr bool is_stack_table_v = is_stack_table<T>::value;
-
-	template <typename T>
-	struct is_function : std::false_type { };
-	template <typename T, bool aligned>
-	struct is_function<basic_function<T, aligned>> : std::true_type { };
-	template <typename T, bool aligned, typename Handler>
-	struct is_function<basic_protected_function<T, aligned, Handler>> : std::true_type { };
-
-	template <typename T>
-	using is_lightuserdata = meta::is_specialization_of<T, basic_lightuserdata>;
-
-	template <typename T>
-	inline constexpr bool is_lightuserdata_v = is_lightuserdata<T>::value;
-
-	template <typename T>
-	using is_userdata = meta::is_specialization_of<T, basic_userdata>;
-
-	template <typename T>
-	inline constexpr bool is_userdata_v = is_userdata<T>::value;
-
-	template <typename T>
-	using is_environment = std::integral_constant<bool, is_userdata_v<T> || is_table_v<T> || meta::is_specialization_of_v<T, basic_environment>>;
-
-	template <typename T>
-	inline constexpr bool is_environment_v = is_environment<T>::value;
-
-	template <typename T>
-	using is_table_like = std::integral_constant<bool, is_table_v<T> || is_environment_v<T> || is_userdata_v<T>>;
-
-	template <typename T>
-	inline constexpr bool is_table_like_v = is_table_like<T>::value;
-
-	template <typename T>
-	struct is_automagical
-	: std::integral_constant<bool,
-	       (SOL_IS_ON(SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_))
-	            || (std::is_array_v<
-	                     meta::unqualified_t<T>> || (!std::is_same_v<meta::unqualified_t<T>, state> && !std::is_same_v<meta::unqualified_t<T>, state_view>))> {
-	};
-
-	template <typename T>
-	inline type type_of() {
-		return lua_type_of<meta::unqualified_t<T>>::value;
-	}
-
-	namespace detail {
-		template <typename T>
-		struct is_non_factory_constructor : std::false_type { };
-
-		template <typename... Args>
-		struct is_non_factory_constructor<constructors<Args...>> : std::true_type { };
-
-		template <typename... Args>
-		struct is_non_factory_constructor<constructor_wrapper<Args...>> : std::true_type { };
-
-		template <>
-		struct is_non_factory_constructor<no_construction> : std::true_type { };
-
-		template <typename T>
-		inline constexpr bool is_non_factory_constructor_v = is_non_factory_constructor<T>::value;
-
-		template <typename T>
-		struct is_constructor : is_non_factory_constructor<T> { };
-
-		template <typename... Args>
-		struct is_constructor<factory_wrapper<Args...>> : std::true_type { };
-
-		template <typename T>
-		struct is_constructor<protect_t<T>> : is_constructor<meta::unqualified_t<T>> { };
-
-		template <typename F, typename... Policies>
-		struct is_constructor<policy_wrapper<F, Policies...>> : is_constructor<meta::unqualified_t<F>> { };
-
-		template <typename T>
-		inline constexpr bool is_constructor_v = is_constructor<T>::value;
-
-		template <typename... Args>
-		using any_is_constructor = meta::any<is_constructor<meta::unqualified_t<Args>>...>;
-
-		template <typename... Args>
-		inline constexpr bool any_is_constructor_v = any_is_constructor<Args...>::value;
-
-		template <typename T>
-		struct is_destructor : std::false_type { };
-
-		template <typename Fx>
-		struct is_destructor<destructor_wrapper<Fx>> : std::true_type { };
-
-		template <typename... Args>
-		using any_is_destructor = meta::any<is_destructor<meta::unqualified_t<Args>>...>;
-
-		template <typename... Args>
-		inline constexpr bool any_is_destructor_v = any_is_destructor<Args...>::value;
-	} // namespace detail
-
-	template <typename T>
-	using is_lua_c_function = meta::any<std::is_same<lua_CFunction, T>, std::is_same<detail::lua_CFunction_noexcept, T>, std::is_same<lua_CFunction_ref, T>>;
-
-	template <typename T>
-	inline constexpr bool is_lua_c_function_v = is_lua_c_function<T>::value;
-
-	struct automagic_enrollments {
-		bool default_constructor = true;
-		bool destructor = true;
-		bool pairs_operator = true;
-		bool to_string_operator = true;
-		bool call_operator = true;
-		bool less_than_operator = true;
-		bool less_than_or_equal_to_operator = true;
-		bool length_operator = true;
-		bool equal_to_operator = true;
-	};
-
-} // namespace sol
-
-// end of sol/types.hpp
-
-#include <exception>
-#include <cstring>
-
-#if SOL_IS_ON(SOL_PRINT_ERRORS_I_)
-#include <iostream>
-#endif
-
-namespace sol {
-	// must push a single object to be the error object
-	// NOTE: the VAST MAJORITY of all Lua libraries -- C or otherwise -- expect a string for the type of error
-	// break this convention at your own risk
-	using exception_handler_function = int (*)(lua_State*, optional<const std::exception&>, string_view);
-
-	namespace detail {
-		inline const char (&default_exception_handler_name())[11] {
-			static const char name[11] = "sol.\xE2\x98\xA2\xE2\x98\xA2";
-			return name;
-		}
-
-		// must push at least 1 object on the stack
-		inline int default_exception_handler(lua_State* L, optional<const std::exception&>, string_view what) {
-#if SOL_IS_ON(SOL_PRINT_ERRORS_I_)
-			std::cerr << "[sol3] An exception occurred: ";
-			std::cerr.write(what.data(), what.size());
-			std::cerr << std::endl;
-#endif
-			lua_pushlstring(L, what.data(), what.size());
-			return 1;
-		}
-
-		inline int call_exception_handler(lua_State* L, optional<const std::exception&> maybe_ex, string_view what) {
-			lua_getglobal(L, default_exception_handler_name());
-			type t = static_cast<type>(lua_type(L, -1));
-			if (t != type::lightuserdata) {
-				lua_pop(L, 1);
-				return default_exception_handler(L, std::move(maybe_ex), std::move(what));
-			}
-			void* vfunc = lua_touserdata(L, -1);
-			lua_pop(L, 1);
-			if (vfunc == nullptr) {
-				return default_exception_handler(L, std::move(maybe_ex), std::move(what));
-			}
-			exception_handler_function exfunc = reinterpret_cast<exception_handler_function>(vfunc);
-			return exfunc(L, std::move(maybe_ex), std::move(what));
-		}
-
-#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
-		template <lua_CFunction f>
-		int static_trampoline(lua_State* L) noexcept {
-			return f(L);
-		}
-
-#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_)
-		template <lua_CFunction_noexcept f>
-		int static_trampoline_noexcept(lua_State* L) noexcept {
-			return f(L);
-		}
-#else
-		template <lua_CFunction f>
-		int static_trampoline_noexcept(lua_State* L) noexcept {
-			return f(L);
-		}
-#endif
-
-		template <typename Fx, typename... Args>
-		int trampoline(lua_State* L, Fx&& f, Args&&... args) noexcept {
-			return f(L, std::forward<Args>(args)...);
-		}
-
-		inline int c_trampoline(lua_State* L, lua_CFunction f) noexcept {
-			return trampoline(L, f);
-		}
-#else
-
-		inline int lua_cfunction_trampoline(lua_State* L, lua_CFunction f) {
-#if SOL_IS_ON(SOL_PROPAGATE_EXCEPTIONS_I_)
-			return f(L);
-
-#else
-			try {
-				return f(L);
-			}
-			catch (const char* cs) {
-				call_exception_handler(L, optional<const std::exception&>(nullopt), string_view(cs));
-			}
-			catch (const std::string& s) {
-				call_exception_handler(L, optional<const std::exception&>(nullopt), string_view(s.c_str(), s.size()));
-			}
-			catch (const std::exception& e) {
-				call_exception_handler(L, optional<const std::exception&>(e), e.what());
-			}
-#if SOL_IS_OFF(SOL_USE_LUAJIT_I_)
-			// LuaJIT cannot have the catchall when the safe propagation is on
-			// but LuaJIT will swallow all C++ errors
-			// if we don't at least catch std::exception ones
-			catch (...) {
-				call_exception_handler(L, optional<const std::exception&>(nullopt), "caught (...) exception");
-			}
-#endif // LuaJIT cannot have the catchall, but we must catch std::exceps for it
-			return lua_error(L);
-#endif // Safe exceptions
-		}
-
-		template <lua_CFunction f>
-		int static_trampoline(lua_State* L) {
-			return lua_cfunction_trampoline(L, f);
-		}
-
-#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_)
-		template <lua_CFunction_noexcept f>
-		int static_trampoline_noexcept(lua_State* L) noexcept {
-			return f(L);
-		}
-#else
-		template <lua_CFunction f>
-		int static_trampoline_noexcept(lua_State* L) noexcept {
-			return f(L);
-		}
-#endif
-
-		template <typename Fx, typename... Args>
-		int trampoline(lua_State* L, Fx&& f, Args&&... args) {
-			if constexpr (meta::bind_traits<meta::unqualified_t<Fx>>::is_noexcept) {
-				return f(L, std::forward<Args>(args)...);
-			}
-			else {
-#if SOL_IS_ON(SOL_PROPAGATE_EXCEPTIONS_I_)
-				return f(L, std::forward<Args>(args)...);
-#else
-				try {
-					return f(L, std::forward<Args>(args)...);
-				}
-				catch (const char* cs) {
-					call_exception_handler(L, optional<const std::exception&>(nullopt), string_view(cs));
-				}
-				catch (const std::string& s) {
-					call_exception_handler(L, optional<const std::exception&>(nullopt), string_view(s.c_str(), s.size()));
-				}
-				catch (const std::exception& e) {
-					call_exception_handler(L, optional<const std::exception&>(e), e.what());
-				}
-#if SOL_IS_OFF(SOL_USE_LUAJIT_I_)
-				// LuaJIT cannot have the catchall when the safe propagation is on
-				// but LuaJIT will swallow all C++ errors
-				// if we don't at least catch std::exception ones
-				catch (...) {
-					call_exception_handler(L, optional<const std::exception&>(nullopt), "caught (...) exception");
-				}
-#endif
-				return lua_error(L);
-#endif
-			}
-		}
-
-		inline int c_trampoline(lua_State* L, lua_CFunction f) {
-			return trampoline(L, f);
-		}
-#endif // Exceptions vs. No Exceptions
-
-		template <typename F, F fx>
-		inline int typed_static_trampoline(lua_State* L) {
-			if constexpr (meta::bind_traits<F>::is_noexcept) {
-				return static_trampoline_noexcept<fx>(L);
-			}
-			else {
-				return static_trampoline<fx>(L);
-			}
-		}
-	} // namespace detail
-
-	inline void set_default_exception_handler(lua_State* L, exception_handler_function exf = &detail::default_exception_handler) {
-		static_assert(sizeof(void*) >= sizeof(exception_handler_function),
-		     "void* storage is too small to transport the exception handler: please file a bug on the sol2 issue tracker to get this looked at!");
-		void* storage;
-		std::memcpy(&storage, &exf, sizeof(exception_handler_function));
-		lua_pushlightuserdata(L, storage);
-		lua_setglobal(L, detail::default_exception_handler_name());
-	}
-} // namespace sol
-
-// end of sol/trampoline.hpp
-
-// beginning of sol/stack_core.hpp
-
-// beginning of sol/inheritance.hpp
-
-// beginning of sol/usertype_traits.hpp
-
-// beginning of sol/demangle.hpp
-
-#include <string>
-#include <array>
-#include <cctype>
-#if SOL_IS_ON(SOL_MINGW_CCTYPE_IS_POISONED_I_)
-extern "C" {
-#include <ctype.h>
-}
-#endif // MinGW is on some stuff
-#include <locale>
-
-namespace sol { namespace detail {
-	inline constexpr std::array<string_view, 9> removals { { "{anonymous}",
-		"(anonymous namespace)",
-		"public:",
-		"private:",
-		"protected:",
-		"struct ",
-		"class ",
-		"`anonymous-namespace'",
-		"`anonymous namespace'" } };
-
-#if SOL_IS_ON(SOL_COMPILER_GCC_I_) || SOL_IS_ON(SOL_COMPILER_CLANG_I_)
-	inline std::string ctti_get_type_name_from_sig(std::string name) {
-		// cardinal sins from MINGW
-		using namespace std;
-		std::size_t start = name.find_first_of('[');
-		start = name.find_first_of('=', start);
-		std::size_t end = name.find_last_of(']');
-		if (end == std::string::npos)
-			end = name.size();
-		if (start == std::string::npos)
-			start = 0;
-		if (start < name.size() - 1)
-			start += 1;
-		name = name.substr(start, end - start);
-		start = name.rfind("seperator_mark");
-		if (start != std::string::npos) {
-			name.erase(start - 2, name.length());
-		}
-		while (!name.empty() && isblank(name.front()))
-			name.erase(name.begin());
-		while (!name.empty() && isblank(name.back()))
-			name.pop_back();
-
-		for (std::size_t r = 0; r < removals.size(); ++r) {
-			auto found = name.find(removals[r]);
-			while (found != std::string::npos) {
-				name.erase(found, removals[r].size());
-				found = name.find(removals[r]);
-			}
-		}
-
-		return name;
-	}
-
-	template <typename T, class seperator_mark = int>
-	inline std::string ctti_get_type_name() {
-		return ctti_get_type_name_from_sig(__PRETTY_FUNCTION__);
-	}
-#elif SOL_IS_ON(SOL_COMPILER_VCXX_I_)
-	inline std::string ctti_get_type_name_from_sig(std::string name) {
-		std::size_t start = name.find("get_type_name");
-		if (start == std::string::npos)
-			start = 0;
-		else
-			start += 13;
-		if (start < name.size() - 1)
-			start += 1;
-		std::size_t end = name.find_last_of('>');
-		if (end == std::string::npos)
-			end = name.size();
-		name = name.substr(start, end - start);
-		if (name.find("struct", 0) == 0)
-			name.replace(0, 6, "", 0);
-		if (name.find("class", 0) == 0)
-			name.replace(0, 5, "", 0);
-		while (!name.empty() && isblank(name.front()))
-			name.erase(name.begin());
-		while (!name.empty() && isblank(name.back()))
-			name.pop_back();
-
-		for (std::size_t r = 0; r < removals.size(); ++r) {
-			auto found = name.find(removals[r]);
-			while (found != std::string::npos) {
-				name.erase(found, removals[r].size());
-				found = name.find(removals[r]);
-			}
-		}
-
-		return name;
-	}
-
-	template <typename T>
-	std::string ctti_get_type_name() {
-		return ctti_get_type_name_from_sig(__FUNCSIG__);
-	}
-#else
-#error Compiler not supported for demangling
-#endif // compilers
-
-	template <typename T>
-	std::string demangle_once() {
-		std::string realname = ctti_get_type_name<T>();
-		return realname;
-	}
-
-	inline std::string short_demangle_from_type_name(std::string realname) {
-		// This isn't the most complete but it'll do for now...?
-		static const std::array<std::string, 10> ops = {
-			{ "operator<", "operator<<", "operator<<=", "operator<=", "operator>", "operator>>", "operator>>=", "operator>=", "operator->", "operator->*" }
-		};
-		int level = 0;
-		std::ptrdiff_t idx = 0;
-		for (idx = static_cast<std::ptrdiff_t>(realname.empty() ? 0 : realname.size() - 1); idx > 0; --idx) {
-			if (level == 0 && realname[idx] == ':') {
-				break;
-			}
-			bool isleft = realname[idx] == '<';
-			bool isright = realname[idx] == '>';
-			if (!isleft && !isright)
-				continue;
-			bool earlybreak = false;
-			for (const auto& op : ops) {
-				std::size_t nisop = realname.rfind(op, idx);
-				if (nisop == std::string::npos)
-					continue;
-				std::size_t nisopidx = idx - op.size() + 1;
-				if (nisop == nisopidx) {
-					idx = static_cast<std::ptrdiff_t>(nisopidx);
-					earlybreak = true;
-				}
-				break;
-			}
-			if (earlybreak) {
-				continue;
-			}
-			level += isleft ? -1 : 1;
-		}
-		if (idx > 0) {
-			realname.erase(0, realname.length() < static_cast<std::size_t>(idx) ? realname.length() : idx + 1);
-		}
-		return realname;
-	}
-
-	template <typename T>
-	std::string short_demangle_once() {
-		std::string realname = ctti_get_type_name<T>();
-		return short_demangle_from_type_name(realname);
-	}
-
-	template <typename T>
-	const std::string& demangle() {
-		static const std::string d = demangle_once<T>();
-		return d;
-	}
-
-	template <typename T>
-	const std::string& short_demangle() {
-		static const std::string d = short_demangle_once<T>();
-		return d;
-	}
-}} // namespace sol::detail
-
-// end of sol/demangle.hpp
-
-namespace sol {
-
-	template <typename T>
-	struct usertype_traits {
-		static const std::string& name() {
-			static const std::string& n = detail::short_demangle<T>();
-			return n;
-		}
-		static const std::string& qualified_name() {
-			static const std::string& q_n = detail::demangle<T>();
-			return q_n;
-		}
-		static const std::string& metatable() {
-			static const std::string m = std::string("sol.").append(detail::demangle<T>());
-			return m;
-		}
-		static const std::string& user_metatable() {
-			static const std::string u_m = std::string("sol.").append(detail::demangle<T>()).append(".user");
-			return u_m;
-		}
-		static const std::string& user_gc_metatable() {
-			static const std::string u_g_m = std::string("sol.").append(detail::demangle<T>()).append(".user\xE2\x99\xBB");
-			return u_g_m;
-		}
-		static const std::string& gc_table() {
-			static const std::string g_t = std::string("sol.").append(detail::demangle<T>()).append(".\xE2\x99\xBB");
-			return g_t;
-		}
-	};
-
-} // namespace sol
-
-// end of sol/usertype_traits.hpp
-
-// beginning of sol/unique_usertype_traits.hpp
-
-#include <memory>
-
-namespace sol {
-
-	template <typename T>
-	struct unique_usertype_traits {
-		typedef T type;
-		typedef T actual_type;
-		template <typename X>
-		using rebind_base = void;
-
-		static const bool value = false;
-
-		template <typename U>
-		static bool is_null(U&&) {
-			return false;
-		}
-
-		template <typename U>
-		static auto get(U&& value) {
-			return std::addressof(detail::deref(value));
-		}
-	};
-
-	template <typename T>
-	struct unique_usertype_traits<std::shared_ptr<T>> {
-		typedef T type;
-		typedef std::shared_ptr<T> actual_type;
-		// rebind is non-void
-		// if and only if unique usertype
-		// is cast-capable
-		template <typename X>
-		using rebind_base = std::shared_ptr<X>;
-
-		static const bool value = true;
-
-		static bool is_null(const actual_type& p) {
-			return p == nullptr;
-		}
-
-		static type* get(const actual_type& p) {
-			return p.get();
-		}
-	};
-
-	template <typename T, typename D>
-	struct unique_usertype_traits<std::unique_ptr<T, D>> {
-		using type = T;
-		using actual_type = std::unique_ptr<T, D>;
-
-		static const bool value = true;
-
-		static bool is_null(const actual_type& p) {
-			return p == nullptr;
-		}
-
-		static type* get(const actual_type& p) {
-			return p.get();
-		}
-	};
-
-	template <typename T>
-	struct is_unique_usertype : std::integral_constant<bool, unique_usertype_traits<T>::value> {};
-
-	template <typename T>
-	inline constexpr bool is_unique_usertype_v = is_unique_usertype<T>::value;
-
-	namespace detail {
-		template <typename T, typename Rebind = void>
-		using is_base_rebindable_test = typename T::template rebind_base<Rebind>;
-	}
-
-	template <typename T>
-	using is_base_rebindable = meta::is_detected<detail::is_base_rebindable_test, T>;
-
-	template <typename T>
-	inline constexpr bool is_base_rebindable_v = is_base_rebindable<T>::value;
-
-	namespace detail {
-		template <typename T, typename = void>
-		struct is_base_rebindable_non_void_sfinae : std::false_type {};
-
-		template <typename T>
-		struct is_base_rebindable_non_void_sfinae<T, std::enable_if_t<is_base_rebindable_v<T>>>
-		: std::integral_constant<bool, !std::is_void_v<typename T::template rebind_base<void>>> {};
-	} // namespace detail
-
-	template <typename T>
-	using is_base_rebindable_non_void = meta::is_detected<detail::is_base_rebindable_test, T>;
-
-	template <typename T>
-	inline constexpr bool is_base_rebindable_non_void_v = is_base_rebindable_non_void<T>::value;
-
-} // namespace sol
-
-// end of sol/unique_usertype_traits.hpp
-
-namespace sol {
-	template <typename... Args>
-	struct base_list {};
-	template <typename... Args>
-	using bases = base_list<Args...>;
-
-	typedef bases<> base_classes_tag;
-	const auto base_classes = base_classes_tag();
-
-	template <typename... Args>
-	struct is_to_stringable<base_list<Args...>> : std::false_type {};
-
-	namespace detail {
-
-		inline decltype(auto) base_class_check_key() {
-			static const auto& key = "class_check";
-			return key;
-		}
-
-		inline decltype(auto) base_class_cast_key() {
-			static const auto& key = "class_cast";
-			return key;
-		}
-
-		inline decltype(auto) base_class_index_propogation_key() {
-			static const auto& key = u8"\xF0\x9F\x8C\xB2.index";
-			return key;
-		}
-
-		inline decltype(auto) base_class_new_index_propogation_key() {
-			static const auto& key = u8"\xF0\x9F\x8C\xB2.new_index";
-			return key;
-		}
-
-		template <typename T>
-		struct inheritance {
-			typedef typename base<T>::type bases_t;
-
-			static bool type_check_bases(types<>, const string_view&) {
-				return false;
-			}
-
-			template <typename Base, typename... Args>
-			static bool type_check_bases(types<Base, Args...>, const string_view& ti) {
-				return ti == usertype_traits<Base>::qualified_name() || type_check_bases(types<Args...>(), ti);
-			}
-
-			static bool type_check(const string_view& ti) {
-				return ti == usertype_traits<T>::qualified_name() || type_check_bases(bases_t(), ti);
-			}
-
-			template <typename ...Bases>
-			static bool type_check_with(const string_view& ti) {
-				return ti == usertype_traits<T>::qualified_name() || type_check_bases(types<Bases...>(), ti);
-			}
-
-			static void* type_cast_bases(types<>, T*, const string_view&) {
-				return nullptr;
-			}
-
-			template <typename Base, typename... Args>
-			static void* type_cast_bases(types<Base, Args...>, T* data, const string_view& ti) {
-				// Make sure to convert to T first, and then dynamic cast to the proper type
-				return ti != usertype_traits<Base>::qualified_name() ? type_cast_bases(types<Args...>(), data, ti) : static_cast<void*>(static_cast<Base*>(data));
-			}
-
-			static void* type_cast(void* voiddata, const string_view& ti) {
-				T* data = static_cast<T*>(voiddata);
-				return static_cast<void*>(ti != usertype_traits<T>::qualified_name() ? type_cast_bases(bases_t(), data, ti) : data);
-			}
-
-			template <typename... Bases>
-			static void* type_cast_with(void* voiddata, const string_view& ti) {
-				T* data = static_cast<T*>(voiddata);
-				return static_cast<void*>(ti != usertype_traits<T>::qualified_name() ? type_cast_bases(types<Bases...>(), data, ti) : data);
-			}
-
-			template <typename U>
-			static bool type_unique_cast_bases(types<>, void*, void*, const string_view&) {
-				return 0;
-			}
-
-			template <typename U, typename Base, typename... Args>
-			static int type_unique_cast_bases(types<Base, Args...>, void* source_data, void* target_data, const string_view& ti) {
-				using uu_traits = unique_usertype_traits<U>;
-				using base_ptr = typename uu_traits::template rebind_base<Base>;
-				string_view base_ti = usertype_traits<Base>::qualified_name();
-				if (base_ti == ti) {
-					if (target_data != nullptr) {
-						U* source = static_cast<U*>(source_data);
-						base_ptr* target = static_cast<base_ptr*>(target_data);
-						// perform proper derived -> base conversion
-						*target = *source;
-					}
-					return 2;
-				}
-				return type_unique_cast_bases<U>(types<Args...>(), source_data, target_data, ti);
-			}
-
-			template <typename U>
-			static int type_unique_cast(void* source_data, void* target_data, const string_view& ti, const string_view& rebind_ti) {
-				typedef unique_usertype_traits<U> uu_traits;
-				if constexpr (is_base_rebindable_v<uu_traits>) {
-					typedef typename uu_traits::template rebind_base<void> rebind_t;
-					typedef meta::conditional_t<std::is_void<rebind_t>::value, types<>, bases_t> cond_bases_t;
-					string_view this_rebind_ti = usertype_traits<rebind_t>::qualified_name();
-					if (rebind_ti != this_rebind_ti) {
-						// this is not even of the same unique type
-						return 0;
-					}
-					string_view this_ti = usertype_traits<T>::qualified_name();
-					if (ti == this_ti) {
-						// direct match, return 1
-						return 1;
-					}
-					return type_unique_cast_bases<U>(cond_bases_t(), source_data, target_data, ti);
-				}
-				else {
-					(void)rebind_ti;
-					string_view this_ti = usertype_traits<T>::qualified_name();
-					if (ti == this_ti) {
-						// direct match, return 1
-						return 1;
-					}
-					return type_unique_cast_bases<U>(types<>(), source_data, target_data, ti);
-				}
-			}
-
-			template <typename U, typename... Bases>
-			static int type_unique_cast_with(void* source_data, void* target_data, const string_view& ti, const string_view& rebind_ti) {
-				using uc_bases_t = types<Bases...>;
-				typedef unique_usertype_traits<U> uu_traits;
-				if constexpr (is_base_rebindable_v<uu_traits>) {
-					using rebind_t = typename uu_traits::template rebind_base<void>;
-					using cond_bases_t = meta::conditional_t<std::is_void<rebind_t>::value, types<>, uc_bases_t>;
-					string_view this_rebind_ti = usertype_traits<rebind_t>::qualified_name();
-					if (rebind_ti != this_rebind_ti) {
-						// this is not even of the same unique type
-						return 0;
-					}
-					string_view this_ti = usertype_traits<T>::qualified_name();
-					if (ti == this_ti) {
-						// direct match, return 1
-						return 1;
-					}
-					return type_unique_cast_bases<U>(cond_bases_t(), source_data, target_data, ti);
-				}
-				else {
-					(void)rebind_ti;
-					string_view this_ti = usertype_traits<T>::qualified_name();
-					if (ti == this_ti) {
-						// direct match, return 1
-						return 1;
-					}
-					return type_unique_cast_bases<U>(types<>(), source_data, target_data, ti);
-				}
-			}
-		};
-
-		using inheritance_check_function = decltype(&inheritance<void>::type_check);
-		using inheritance_cast_function = decltype(&inheritance<void>::type_cast);
-		using inheritance_unique_cast_function = decltype(&inheritance<void>::type_unique_cast<void>);
-	} // namespace detail
-} // namespace sol
-
-// end of sol/inheritance.hpp
-
-// beginning of sol/error_handler.hpp
-
-#include <cstdio>
-
-namespace sol {
-
-	namespace detail {
-		constexpr const char* not_a_number = "not a numeric type";
-		constexpr const char* not_a_number_or_number_string = "not a numeric type or numeric string";
-		constexpr const char* not_a_number_integral = "not a numeric type that fits exactly an integer (number maybe has significant decimals)";
-		constexpr const char* not_a_number_or_number_string_integral
-		     = "not a numeric type or a numeric string that fits exactly an integer (e.g. number maybe has significant decimals)";
-
-		constexpr const char* not_enough_stack_space = "not enough space left on Lua stack";
-		constexpr const char* not_enough_stack_space_floating = "not enough space left on Lua stack for a floating point number";
-		constexpr const char* not_enough_stack_space_integral = "not enough space left on Lua stack for an integral number";
-		constexpr const char* not_enough_stack_space_string = "not enough space left on Lua stack for a string";
-		constexpr const char* not_enough_stack_space_meta_function_name = "not enough space left on Lua stack for the name of a meta_function";
-		constexpr const char* not_enough_stack_space_userdata = "not enough space left on Lua stack to create a sol3 userdata";
-		constexpr const char* not_enough_stack_space_generic = "not enough space left on Lua stack to push valuees";
-		constexpr const char* not_enough_stack_space_environment = "not enough space left on Lua stack to retrieve environment";
-		constexpr const char* protected_function_error = "caught (...) unknown error during protected_function call";
-
-		inline void accumulate_and_mark(const std::string& n, std::string& aux_message, int& marker) {
-			if (marker > 0) {
-				aux_message += ", ";
-			}
-			aux_message += n;
-			++marker;
-		}
-	} // namespace detail
-
-	inline std::string associated_type_name(lua_State* L, int index, type t) {
-		switch (t) {
-		case type::poly:
-			return "anything";
-		case type::userdata: {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-			luaL_checkstack(L, 2, "not enough space to push get the type name");
-#endif // make sure stack doesn't overflow
-			if (lua_getmetatable(L, index) == 0) {
-				break;
-			}
-			lua_pushlstring(L, "__name", 6);
-			lua_rawget(L, -2);
-			size_t sz;
-			const char* name = lua_tolstring(L, -1, &sz);
-			std::string tn(name, static_cast<std::string::size_type>(sz));
-			lua_pop(L, 2);
-			return tn;
-		}
-		default:
-			break;
-		}
-		return lua_typename(L, static_cast<int>(t));
-	}
-
-	inline int push_type_panic_string(lua_State* L, int index, type expected, type actual, string_view message, string_view aux_message) noexcept {
-		const char* err = message.size() == 0
-		     ? (aux_message.size() == 0 ? "stack index %d, expected %s, received %s" : "stack index %d, expected %s, received %s: %s")
-		     : "stack index %d, expected %s, received %s: %s %s";
-		const char* type_name = expected == type::poly ? "anything" : lua_typename(L, static_cast<int>(expected));
-		{
-			std::string actual_name = associated_type_name(L, index, actual);
-			lua_pushfstring(L, err, index, type_name, actual_name.c_str(), message.data(), aux_message.data());
-		}
-		return 1;
-	}
-
-	inline int type_panic_string(lua_State* L, int index, type expected, type actual, string_view message = "") noexcept(false) {
-		push_type_panic_string(L, index, expected, actual, message, "");
-		return lua_error(L);
-	}
-
-	inline int type_panic_c_str(lua_State* L, int index, type expected, type actual, const char* message = nullptr) noexcept(false) {
-		push_type_panic_string(L, index, expected, actual, message == nullptr ? "" : message, "");
-		return lua_error(L);
-	}
-
-	struct type_panic_t {
-		int operator()(lua_State* L, int index, type expected, type actual) const noexcept(false) {
-			return type_panic_c_str(L, index, expected, actual, nullptr);
-		}
-		int operator()(lua_State* L, int index, type expected, type actual, string_view message) const noexcept(false) {
-			return type_panic_c_str(L, index, expected, actual, message.data());
-		}
-	};
-
-	const type_panic_t type_panic = {};
-
-	struct constructor_handler {
-		int operator()(lua_State* L, int index, type expected, type actual, string_view message) const noexcept(false) {
-			push_type_panic_string(L, index, expected, actual, message, "(type check failed in constructor)");
-			return lua_error(L);
-		}
-	};
-
-	template <typename F = void>
-	struct argument_handler {
-		int operator()(lua_State* L, int index, type expected, type actual, string_view message) const noexcept(false) {
-			push_type_panic_string(L, index, expected, actual, message, "(bad argument to variable or function call)");
-			return lua_error(L);
-		}
-	};
-
-	template <typename R, typename... Args>
-	struct argument_handler<types<R, Args...>> {
-		int operator()(lua_State* L, int index, type expected, type actual, string_view message) const noexcept(false) {
-			{
-				std::string aux_message = "(bad argument into '";
-				aux_message += detail::demangle<R>();
-				aux_message += "(";
-				int marker = 0;
-				(void)detail::swallow { int(), (detail::accumulate_and_mark(detail::demangle<Args>(), aux_message, marker), int())... };
-				aux_message += ")')";
-				push_type_panic_string(L, index, expected, actual, message, aux_message);
-			}
-			return lua_error(L);
-		}
-	};
-
-	// Specify this function as the handler for lua::check if you know there's nothing wrong
-	inline int no_panic(lua_State*, int, type, type, const char* = nullptr) noexcept {
-		return 0;
-	}
-
-	inline void type_error(lua_State* L, int expected, int actual) noexcept(false) {
-		luaL_error(L, "expected %s, received %s", lua_typename(L, expected), lua_typename(L, actual));
-	}
-
-	inline void type_error(lua_State* L, type expected, type actual) noexcept(false) {
-		type_error(L, static_cast<int>(expected), static_cast<int>(actual));
-	}
-
-	inline void type_assert(lua_State* L, int index, type expected, type actual) noexcept(false) {
-		if (expected != type::poly && expected != actual) {
-			type_panic_c_str(L, index, expected, actual, nullptr);
-		}
-	}
-
-	inline void type_assert(lua_State* L, int index, type expected) {
-		type actual = type_of(L, index);
-		type_assert(L, index, expected, actual);
-	}
-
-} // namespace sol
-
-// end of sol/error_handler.hpp
-
-// beginning of sol/reference.hpp
-
-// beginning of sol/stack_reference.hpp
-
-namespace sol {
-	namespace detail {
-		inline bool xmovable(lua_State* leftL, lua_State* rightL) {
-			if (rightL == nullptr || leftL == nullptr || leftL == rightL) {
-				return false;
-			}
-			const void* leftregistry = lua_topointer(leftL, LUA_REGISTRYINDEX);
-			const void* rightregistry = lua_topointer(rightL, LUA_REGISTRYINDEX);
-			return leftregistry == rightregistry;
-		}
-	} // namespace detail
-
-	class stateless_stack_reference {
-	private:
-		friend class stack_reference;
-		
-		int index = 0;
-
-		int registry_index() const noexcept {
-			return LUA_NOREF;
-		}
-
-	public:
-		stateless_stack_reference() noexcept = default;
-		stateless_stack_reference(lua_nil_t) noexcept : stateless_stack_reference(){};
-		stateless_stack_reference(lua_State* L, int i) noexcept : stateless_stack_reference(absolute_index(L, i)) {
-		}
-		stateless_stack_reference(lua_State*, absolute_index i) noexcept : stateless_stack_reference(i) {
-		}
-		stateless_stack_reference(lua_State*, raw_index i) noexcept : stateless_stack_reference(i) {
-		}
-		stateless_stack_reference(absolute_index i) noexcept : index(i) {
-		}
-		stateless_stack_reference(raw_index i) noexcept : index(i) {
-		}
-		stateless_stack_reference(lua_State*, ref_index) noexcept = delete;
-		stateless_stack_reference(ref_index) noexcept = delete;
-		stateless_stack_reference(const reference&) noexcept = delete;
-		stateless_stack_reference(const stateless_stack_reference&) noexcept = default;
-		stateless_stack_reference(stateless_stack_reference&& o) noexcept = default;
-		stateless_stack_reference& operator=(stateless_stack_reference&&) noexcept = default;
-		stateless_stack_reference& operator=(const stateless_stack_reference&) noexcept = default;
-
-		int push(lua_State* L) const noexcept {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-			luaL_checkstack(L, 1, "not enough Lua stack space to push a single reference value");
-#endif // make sure stack doesn't overflow
-			lua_pushvalue(L, index);
-			return 1;
-		}
-
-		void pop(lua_State* L, int n = 1) const noexcept {
-			lua_pop(L, n);
-		}
-
-		int stack_index() const noexcept {
-			return index;
-		}
-
-		const void* pointer(lua_State* L) const noexcept {
-			const void* vp = lua_topointer(L, stack_index());
-			return vp;
-		}
-
-		type get_type(lua_State* L) const noexcept {
-			int result = lua_type(L, index);
-			return static_cast<type>(result);
-		}
-
-		bool valid(lua_State* L) const noexcept {
-			type t = get_type(L);
-			return t != type::lua_nil && t != type::none;
-		}
-
-		void abandon(lua_State* = nullptr) {
-			index = 0;
-		}
-	};
-
-	class stack_reference : public stateless_stack_reference {
-	private:
-		lua_State* luastate = nullptr;
-
-	public:
-		stack_reference() noexcept = default;
-		stack_reference(lua_nil_t) noexcept
-		: stack_reference() {};
-		stack_reference(lua_State* L, lua_nil_t) noexcept : stateless_stack_reference(L, 0), luastate(L) {
-		}
-		stack_reference(lua_State* L, int i) noexcept : stateless_stack_reference(L, i), luastate(L) {
-		}
-		stack_reference(lua_State* L, absolute_index i) noexcept : stateless_stack_reference(L, i), luastate(L) {
-		}
-		stack_reference(lua_State* L, raw_index i) noexcept : stateless_stack_reference(L, i), luastate(L) {
-		}
-		stack_reference(lua_State* L, ref_index i) noexcept = delete;
-		stack_reference(lua_State* L, const reference& r) noexcept = delete;
-		stack_reference(lua_State* L, const stack_reference& r) noexcept
-		: luastate(L) {
-			if (!r.valid()) {
-				index = 0;
-				return;
-			}
-			int i = r.stack_index();
-			if (detail::xmovable(lua_state(), r.lua_state())) {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-				luaL_checkstack(L, 1, "not enough Lua stack space to push a single reference value");
-#endif // make sure stack doesn't overflow
-				lua_pushvalue(r.lua_state(), r.index);
-				lua_xmove(r.lua_state(), luastate, 1);
-				i = absolute_index(luastate, -1);
-			}
-			index = i;
-		}
-		stack_reference(stack_reference&& o) noexcept = default;
-		stack_reference& operator=(stack_reference&&) noexcept = default;
-		stack_reference(const stack_reference&) noexcept = default;
-		stack_reference& operator=(const stack_reference&) noexcept = default;
-
-		int push() const noexcept {
-			return push(lua_state());
-		}
-
-		int push(lua_State* Ls) const noexcept {
-			return stateless_stack_reference::push(Ls);
-		}
-
-		void pop() const noexcept {
-			pop(lua_state());
-		}
-
-		void pop(lua_State* Ls, int n = 1) const noexcept {
-			stateless_stack_reference::pop(Ls, n);
-		}
-
-		const void* pointer() const noexcept {
-			return stateless_stack_reference::pointer(lua_state());
-		}
-
-		type get_type() const noexcept {
-			return stateless_stack_reference::get_type(lua_state());
-		}
-
-		lua_State* lua_state() const noexcept {
-			return luastate;
-		}
-
-		bool valid() const noexcept {
-			return stateless_stack_reference::valid(lua_state());
-		}
-
-		void abandon () {
-			stateless_stack_reference::abandon(lua_state());
-		}
-	};
-
-	inline bool operator==(const stack_reference& l, const stack_reference& r) {
-		return lua_compare(l.lua_state(), l.stack_index(), r.stack_index(), LUA_OPEQ) == 0;
-	}
-
-	inline bool operator!=(const stack_reference& l, const stack_reference& r) {
-		return !operator==(l, r);
-	}
-
-	inline bool operator==(const stack_reference& lhs, const lua_nil_t&) {
-		return !lhs.valid();
-	}
-
-	inline bool operator==(const lua_nil_t&, const stack_reference& rhs) {
-		return !rhs.valid();
-	}
-
-	inline bool operator!=(const stack_reference& lhs, const lua_nil_t&) {
-		return lhs.valid();
-	}
-
-	inline bool operator!=(const lua_nil_t&, const stack_reference& rhs) {
-		return rhs.valid();
-	}
-
-	struct stack_reference_equals {
-		bool operator()(const lua_nil_t& lhs, const stack_reference& rhs) const {
-			return lhs == rhs;
-		}
-
-		bool operator()(const stack_reference& lhs, const lua_nil_t& rhs) const {
-			return lhs == rhs;
-		}
-
-		bool operator()(const stack_reference& lhs, const stack_reference& rhs) const {
-			return lhs == rhs;
-		}
-	};
-
-	struct stack_reference_hash {
-		typedef stack_reference argument_type;
-		typedef std::size_t result_type;
-
-		result_type operator()(const argument_type& lhs) const {
-			std::hash<const void*> h;
-			return h(lhs.pointer());
-		}
-	};
-} // namespace sol
-
-// end of sol/stack_reference.hpp
-
-#include <functional>
-
-namespace sol {
-	namespace detail {
-		inline const char (&default_main_thread_name())[9] {
-			static const char name[9] = "sol.\xF0\x9F\x93\x8C";
-			return name;
-		}
-	} // namespace detail
-
-	namespace stack {
-		inline void remove(lua_State* L, int rawindex, int count) {
-			if (count < 1)
-				return;
-			int top = lua_gettop(L);
-			if (top < 1) {
-				return;
-			}
-			if (rawindex == -count || top == rawindex) {
-				// Slice them right off the top
-				lua_pop(L, static_cast<int>(count));
-				return;
-			}
-
-			// Remove each item one at a time using stack operations
-			// Probably slower, maybe, haven't benchmarked,
-			// but necessary
-			int index = lua_absindex(L, rawindex);
-			if (index < 0) {
-				index = lua_gettop(L) + (index + 1);
-			}
-			int last = index + count;
-			for (int i = index; i < last; ++i) {
-				lua_remove(L, index);
-			}
-		}
-
-		struct push_popper_at {
-			lua_State* L;
-			int index;
-			int count;
-			push_popper_at(lua_State* luastate, int index = -1, int count = 1) : L(luastate), index(index), count(count) {
-			}
-			~push_popper_at() {
-				remove(L, index, count);
-			}
-		};
-
-		template <bool top_level>
-		struct push_popper_n {
-			lua_State* L;
-			int t;
-			push_popper_n(lua_State* luastate, int x) : L(luastate), t(x) {
-			}
-			push_popper_n(const push_popper_n&) = delete;
-			push_popper_n(push_popper_n&&) = default;
-			push_popper_n& operator=(const push_popper_n&) = delete;
-			push_popper_n& operator=(push_popper_n&&) = default;
-			~push_popper_n() {
-				lua_pop(L, t);
-			}
-		};
-
-		template <>
-		struct push_popper_n<true> {
-			push_popper_n(lua_State*, int) {
-			}
-		};
-
-		template <bool, typename T, typename = void>
-		struct push_popper {
-			using Tu = meta::unqualified_t<T>;
-			T t;
-			int idx;
-
-			push_popper(T x) : t(x), idx(lua_absindex(t.lua_state(), -t.push())) {
-			}
-
-			int index_of(const Tu&) {
-				return idx;
-			}
-
-			~push_popper() {
-				t.pop();
-			}
-		};
-
-		template <typename T, typename C>
-		struct push_popper<true, T, C> {
-			using Tu = meta::unqualified_t<T>;
-
-			push_popper(T) {
-			}
-
-			int index_of(const Tu&) {
-				return -1;
-			}
-
-			~push_popper() {
-			}
-		};
-
-		template <typename T>
-		struct push_popper<false, T, std::enable_if_t<is_stack_based_v<meta::unqualified_t<T>>>> {
-			using Tu = meta::unqualified_t<T>;
-
-			push_popper(T) {
-			}
-
-			int index_of(const Tu& r) {
-				return r.stack_index();
-			}
-
-			~push_popper() {
-			}
-		};
-
-		template <bool top_level = false, typename T>
-		push_popper<top_level, T> push_pop(T&& x) {
-			return push_popper<top_level, T>(std::forward<T>(x));
-		}
-
-		template <typename T>
-		push_popper_at push_pop_at(T&& x) {
-			int c = x.push();
-			lua_State* L = x.lua_state();
-			return push_popper_at(L, lua_absindex(L, -c), c);
-		}
-
-		template <bool top_level = false>
-		push_popper_n<top_level> pop_n(lua_State* L, int x) {
-			return push_popper_n<top_level>(L, x);
-		}
-	} // namespace stack
-
-	inline lua_State* main_thread(lua_State* L, lua_State* backup_if_unsupported = nullptr) {
-#if SOL_LUA_VESION_I_ < 502
-		if (L == nullptr)
-			return backup_if_unsupported;
-		lua_getglobal(L, detail::default_main_thread_name());
-		auto pp = stack::pop_n(L, 1);
-		if (type_of(L, -1) == type::thread) {
-			return lua_tothread(L, -1);
-		}
-		return backup_if_unsupported;
-#else
-		if (L == nullptr)
-			return backup_if_unsupported;
-		lua_rawgeti(L, LUA_REGISTRYINDEX, LUA_RIDX_MAINTHREAD);
-		lua_State* Lmain = lua_tothread(L, -1);
-		lua_pop(L, 1);
-		return Lmain;
-#endif // Lua 5.2+ has the main thread unqualified_getter
-	}
-
-	namespace detail {
-		struct global_tag {
-		} const global_ {};
-		struct no_safety_tag {
-		} const no_safety {};
-
-		template <bool b>
-		inline lua_State* pick_main_thread(lua_State* L, lua_State* backup_if_unsupported = nullptr) {
-			(void)L;
-			(void)backup_if_unsupported;
-			if (b) {
-				return main_thread(L, backup_if_unsupported);
-			}
-			return L;
-		}
-	} // namespace detail
-
-	class stateless_reference {
-	private:
-		template <bool o_main_only>
-		friend class basic_reference;
-
-		int ref = LUA_NOREF;
-
-		int copy(lua_State* L) const noexcept {
-			if (ref == LUA_NOREF)
-				return LUA_NOREF;
-			push(L);
-			return luaL_ref(L, LUA_REGISTRYINDEX);
-		}
-
-		lua_State* copy_assign(lua_State* L, lua_State* rL, const stateless_reference& r) {
-			if (valid(L)) {
-				deref(L);
-			}
-			ref = r.copy(L);
-			return rL;
-		}
-
-		lua_State* move_assign(lua_State* L, lua_State* rL, stateless_reference&& r) {
-			if (valid(L)) {
-				deref(L);
-			}
-			ref = r.ref;
-			r.ref = LUA_NOREF;
-			return rL;
-		}
-
-	protected:
-		int stack_index() const noexcept {
-			return -1;
-		}
-
-		stateless_reference(lua_State* L, detail::global_tag) noexcept {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-			luaL_checkstack(L, 1, "not enough Lua stack space to push this reference value");
-#endif // make sure stack doesn't overflow
-			lua_pushglobaltable(L);
-			ref = luaL_ref(L, LUA_REGISTRYINDEX);
-		}
-
-		stateless_reference(int raw_ref_index) noexcept : ref(raw_ref_index) {
-		}
-
-	public:
-		stateless_reference() noexcept = default;
-		stateless_reference(lua_nil_t) noexcept : stateless_reference() {
-		}
-		stateless_reference(const stack_reference& r) noexcept : stateless_reference(r.lua_state(), r.stack_index()) {
-		}
-		stateless_reference(stack_reference&& r) noexcept : stateless_reference(r.lua_state(), r.stack_index()) {
-		}
-		stateless_reference(lua_State* L, const stateless_reference& r) noexcept {
-			if (r.ref == LUA_REFNIL) {
-				ref = LUA_REFNIL;
-				return;
-			}
-			if (r.ref == LUA_NOREF || L == nullptr) {
-				ref = LUA_NOREF;
-				return;
-			}
-			ref = r.copy(L);
-		}
-
-		stateless_reference(lua_State* L, stateless_reference&& r) noexcept {
-			if (r.ref == LUA_REFNIL) {
-				ref = LUA_REFNIL;
-				return;
-			}
-			if (r.ref == LUA_NOREF || L == nullptr) {
-				ref = LUA_NOREF;
-				return;
-			}
-			ref = r.ref;
-			r.ref = LUA_NOREF;
-		}
-
-		stateless_reference(lua_State* L, const stack_reference& r) noexcept {
-			if (L == nullptr || r.lua_state() == nullptr || r.get_type() == type::none) {
-				ref = LUA_NOREF;
-				return;
-			}
-			if (r.get_type() == type::lua_nil) {
-				ref = LUA_REFNIL;
-				return;
-			}
-			if (L != r.lua_state() && !detail::xmovable(L, r.lua_state())) {
-				return;
-			}
-			r.push(L);
-			ref = luaL_ref(L, LUA_REGISTRYINDEX);
-		}
-
-		stateless_reference(lua_State* L, int index = -1) noexcept {
-			// use L to stick with that state's execution stack
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-			luaL_checkstack(L, 1, "not enough Lua stack space to push this reference value");
-#endif // make sure stack doesn't overflow
-			lua_pushvalue(L, index);
-			ref = luaL_ref(L, LUA_REGISTRYINDEX);
-		}
-		stateless_reference(lua_State* L, ref_index index) noexcept {
-			lua_rawgeti(L, LUA_REGISTRYINDEX, index.index);
-			ref = luaL_ref(L, LUA_REGISTRYINDEX);
-		}
-		stateless_reference(lua_State*, lua_nil_t) noexcept {
-		}
-
-		~stateless_reference() noexcept = default;
-
-		stateless_reference(const stateless_reference& o) noexcept = delete;
-		stateless_reference& operator=(const stateless_reference& r) noexcept = delete;
-
-		stateless_reference(stateless_reference&& o) noexcept : ref(o.ref) {
-			o.ref = LUA_NOREF;
-		}
-
-		stateless_reference& operator=(stateless_reference&& o) noexcept {
-			ref = o.ref;
-			o.ref = LUA_NOREF;
-			return *this;
-		}
-
-		int push(lua_State* L) const noexcept {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-			luaL_checkstack(L, 1, "not enough Lua stack space to push this reference value");
-#endif // make sure stack doesn't overflow
-			lua_rawgeti(L, LUA_REGISTRYINDEX, ref);
-			return 1;
-		}
-
-		void pop(lua_State* L, int n = 1) const noexcept {
-			lua_pop(L, n);
-		}
-
-		int registry_index() const noexcept {
-			return ref;
-		}
-
-		bool valid(lua_State*) const noexcept {
-			return !(ref == LUA_NOREF || ref == LUA_REFNIL);
-		}
-
-		const void* pointer(lua_State* L) const noexcept {
-			int si = push(L);
-			const void* vp = lua_topointer(L, -si);
-			lua_pop(L, si);
-			return vp;
-		}
-
-		type get_type(lua_State* L) const noexcept {
-			int p = push(L);
-			int result = lua_type(L, -1);
-			pop(L, p);
-			return static_cast<type>(result);
-		}
-
-		void abandon(lua_State* = nullptr) {
-			ref = LUA_NOREF;
-		}
-
-		void deref(lua_State* L) const noexcept {
-			luaL_unref(L, LUA_REGISTRYINDEX, ref);
-		}
-	};
-
-	template <bool main_only = false>
-	class basic_reference : public stateless_reference {
-	private:
-		template <bool o_main_only>
-		friend class basic_reference;
-		lua_State* luastate = nullptr; // non-owning
-
-		template <bool r_main_only>
-		void copy_assign(const basic_reference<r_main_only>& r) {
-			if (valid()) {
-				deref();
-			}
-			if (r.ref == LUA_REFNIL) {
-				luastate = detail::pick_main_thread < main_only && !r_main_only > (r.lua_state(), r.lua_state());
-				ref = LUA_REFNIL;
-				return;
-			}
-			if (r.ref == LUA_NOREF) {
-				luastate = r.luastate;
-				ref = LUA_NOREF;
-				return;
-			}
-			if (detail::xmovable(lua_state(), r.lua_state())) {
-				r.push(lua_state());
-				ref = luaL_ref(lua_state(), LUA_REGISTRYINDEX);
-				return;
-			}
-			luastate = detail::pick_main_thread < main_only && !r_main_only > (r.lua_state(), r.lua_state());
-			ref = r.copy();
-		}
-
-		template <bool r_main_only>
-		void move_assign(basic_reference<r_main_only>&& r) {
-			if (valid()) {
-				deref();
-			}
-			if (r.ref == LUA_REFNIL) {
-				luastate = detail::pick_main_thread < main_only && !r_main_only > (r.lua_state(), r.lua_state());
-				ref = LUA_REFNIL;
-				return;
-			}
-			if (r.ref == LUA_NOREF) {
-				luastate = r.luastate;
-				ref = LUA_NOREF;
-				return;
-			}
-			if (detail::xmovable(lua_state(), r.lua_state())) {
-				r.push(lua_state());
-				ref = luaL_ref(lua_state(), LUA_REGISTRYINDEX);
-				return;
-			}
-
-			luastate = detail::pick_main_thread < main_only && !r_main_only > (r.lua_state(), r.lua_state());
-			ref = r.ref;
-			r.ref = LUA_NOREF;
-			r.luastate = nullptr;
-		}
-
-	protected:
-		basic_reference(lua_State* L, detail::global_tag) noexcept
-		: basic_reference(detail::pick_main_thread<main_only>(L, L), detail::global_, detail::global_) {
-		}
-
-		basic_reference(lua_State* L, detail::global_tag, detail::global_tag) noexcept : stateless_reference(L, detail::global_), luastate(L) {
-		}
-
-		basic_reference(lua_State* oL, const basic_reference<!main_only>& o) noexcept : stateless_reference(oL, o), luastate(oL) {
-		}
-
-		void deref() const noexcept {
-			return stateless_reference::deref(lua_state());
-		}
-
-		int copy() const noexcept {
-			return copy(lua_state());
-		}
-
-		int copy(lua_State* L) const noexcept {
-			return stateless_reference::copy(L);
-		}
-
-	public:
-		basic_reference() noexcept = default;
-		basic_reference(lua_nil_t) noexcept : basic_reference() {
-		}
-		basic_reference(const stack_reference& r) noexcept : basic_reference(r.lua_state(), r.stack_index()) {
-		}
-		basic_reference(stack_reference&& r) noexcept : basic_reference(r.lua_state(), r.stack_index()) {
-		}
-		template <bool r_main_only>
-		basic_reference(lua_State* L, const basic_reference<r_main_only>& r) noexcept : luastate(detail::pick_main_thread<main_only>(L, L)) {
-			if (r.ref == LUA_REFNIL) {
-				ref = LUA_REFNIL;
-				return;
-			}
-			if (r.ref == LUA_NOREF || lua_state() == nullptr) {
-				ref = LUA_NOREF;
-				return;
-			}
-			if (detail::xmovable(lua_state(), r.lua_state())) {
-				r.push(lua_state());
-				ref = luaL_ref(lua_state(), LUA_REGISTRYINDEX);
-				return;
-			}
-			ref = r.copy();
-		}
-
-		template <bool r_main_only>
-		basic_reference(lua_State* L, basic_reference<r_main_only>&& r) noexcept : luastate(detail::pick_main_thread<main_only>(L, L)) {
-			if (r.ref == LUA_REFNIL) {
-				ref = LUA_REFNIL;
-				return;
-			}
-			if (r.ref == LUA_NOREF || lua_state() == nullptr) {
-				ref = LUA_NOREF;
-				return;
-			}
-			if (detail::xmovable(lua_state(), r.lua_state())) {
-				r.push(lua_state());
-				ref = luaL_ref(lua_state(), LUA_REGISTRYINDEX);
-				return;
-			}
-			ref = r.ref;
-			r.ref = LUA_NOREF;
-			r.luastate = nullptr;
-		}
-
-		basic_reference(lua_State* L, const stack_reference& r) noexcept : luastate(detail::pick_main_thread<main_only>(L, L)) {
-			if (lua_state() == nullptr || r.lua_state() == nullptr || r.get_type() == type::none) {
-				ref = LUA_NOREF;
-				return;
-			}
-			if (r.get_type() == type::lua_nil) {
-				ref = LUA_REFNIL;
-				return;
-			}
-			if (lua_state() != r.lua_state() && !detail::xmovable(lua_state(), r.lua_state())) {
-				return;
-			}
-			r.push(lua_state());
-			ref = luaL_ref(lua_state(), LUA_REGISTRYINDEX);
-		}
-		basic_reference(lua_State* L, int index = -1) noexcept : luastate(detail::pick_main_thread<main_only>(L, L)) {
-			// use L to stick with that state's execution stack
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-			luaL_checkstack(L, 1, "not enough Lua stack space to push this reference value");
-#endif // make sure stack doesn't overflow
-			lua_pushvalue(L, index);
-			ref = luaL_ref(L, LUA_REGISTRYINDEX);
-		}
-		basic_reference(lua_State* L, ref_index index) noexcept : luastate(detail::pick_main_thread<main_only>(L, L)) {
-			lua_rawgeti(lua_state(), LUA_REGISTRYINDEX, index.index);
-			ref = luaL_ref(lua_state(), LUA_REGISTRYINDEX);
-		}
-		basic_reference(lua_State* L, lua_nil_t) noexcept : luastate(detail::pick_main_thread<main_only>(L, L)) {
-		}
-
-		~basic_reference() noexcept {
-			if (lua_state() == nullptr || ref == LUA_NOREF)
-				return;
-			deref();
-		}
-
-		basic_reference(const basic_reference& o) noexcept : stateless_reference(o.copy()), luastate(o.lua_state()) {
-		}
-
-		basic_reference(basic_reference&& o) noexcept : stateless_reference(std::move(o)), luastate(o.lua_state()) {
-			o.luastate = nullptr;
-		}
-
-		basic_reference(const basic_reference<!main_only>& o) noexcept
-		: basic_reference(detail::pick_main_thread<main_only>(o.lua_state(), o.lua_state()), o) {
-		}
-
-		basic_reference(basic_reference<!main_only>&& o) noexcept
-		: stateless_reference(std::move(o)), luastate(detail::pick_main_thread<main_only>(o.lua_state(), o.lua_state())) {
-			o.luastate = nullptr;
-			o.ref = LUA_NOREF;
-		}
-
-		basic_reference& operator=(basic_reference&& r) noexcept {
-			move_assign(std::move(r));
-			return *this;
-		}
-
-		basic_reference& operator=(const basic_reference& r) noexcept {
-			copy_assign(r);
-			return *this;
-		}
-
-		basic_reference& operator=(basic_reference<!main_only>&& r) noexcept {
-			move_assign(std::move(r));
-			return *this;
-		}
-
-		basic_reference& operator=(const basic_reference<!main_only>& r) noexcept {
-			copy_assign(r);
-			return *this;
-		}
-
-		basic_reference& operator=(const lua_nil_t&) noexcept {
-			if (valid()) {
-				deref();
-			}
-			luastate = nullptr;
-			ref = LUA_NOREF;
-			return *this;
-		}
-
-		template <typename Super>
-		basic_reference& operator=(proxy_base<Super>&& r);
-
-		template <typename Super>
-		basic_reference& operator=(const proxy_base<Super>& r);
-
-		int push() const noexcept {
-			return push(lua_state());
-		}
-
-		int push(lua_State* L) const noexcept {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-			luaL_checkstack(L, 1, "not enough Lua stack space to push this reference value");
-#endif // make sure stack doesn't overflow
-			if (lua_state() == nullptr) {
-				lua_pushnil(L);
-				return 1;
-			}
-			lua_rawgeti(lua_state(), LUA_REGISTRYINDEX, ref);
-			if (L != lua_state()) {
-				lua_xmove(lua_state(), L, 1);
-			}
-			return 1;
-		}
-
-		void pop() const noexcept {
-			pop(lua_state());
-		}
-
-		void pop(lua_State* L, int n = 1) const noexcept {
-			stateless_reference::pop(L, n);
-		}
-
-		int registry_index() const noexcept {
-			return stateless_reference::registry_index();
-		}
-
-		bool valid() const noexcept {
-			return stateless_reference::valid(lua_state());
-		}
-
-		const void* pointer() const noexcept {
-			return stateless_reference::pointer(lua_state());
-		}
-
-		explicit operator bool() const noexcept {
-			return valid();
-		}
-
-		type get_type() const noexcept {
-			return stateless_reference::get_type(lua_state());
-		}
-
-		lua_State* lua_state() const noexcept {
-			return luastate;
-		}
-	};
-
-	template <bool lb, bool rb>
-	inline bool operator==(const basic_reference<lb>& l, const basic_reference<rb>& r) {
-		auto ppl = stack::push_pop(l);
-		auto ppr = stack::push_pop(r);
-		return lua_compare(l.lua_state(), -1, -2, LUA_OPEQ) == 1;
-	}
-
-	template <bool lb, bool rb>
-	inline bool operator!=(const basic_reference<lb>& l, const basic_reference<rb>& r) {
-		return !operator==(l, r);
-	}
-
-	template <bool lb>
-	inline bool operator==(const basic_reference<lb>& l, const stack_reference& r) {
-		auto ppl = stack::push_pop(l);
-		return lua_compare(l.lua_state(), -1, r.stack_index(), LUA_OPEQ) == 1;
-	}
-
-	template <bool lb>
-	inline bool operator!=(const basic_reference<lb>& l, const stack_reference& r) {
-		return !operator==(l, r);
-	}
-
-	template <bool rb>
-	inline bool operator==(const stack_reference& l, const basic_reference<rb>& r) {
-		auto ppr = stack::push_pop(r);
-		return lua_compare(l.lua_state(), -1, r.stack_index(), LUA_OPEQ) == 1;
-	}
-
-	template <bool rb>
-	inline bool operator!=(const stack_reference& l, const basic_reference<rb>& r) {
-		return !operator==(l, r);
-	}
-
-	template <bool lb>
-	inline bool operator==(const basic_reference<lb>& lhs, const lua_nil_t&) {
-		return !lhs.valid();
-	}
-
-	template <bool rb>
-	inline bool operator==(const lua_nil_t&, const basic_reference<rb>& rhs) {
-		return !rhs.valid();
-	}
-
-	template <bool lb>
-	inline bool operator!=(const basic_reference<lb>& lhs, const lua_nil_t&) {
-		return lhs.valid();
-	}
-
-	template <bool rb>
-	inline bool operator!=(const lua_nil_t&, const basic_reference<rb>& rhs) {
-		return rhs.valid();
-	}
-
-	struct reference_equals : public stack_reference_equals {
-		template <bool rb>
-		bool operator()(const lua_nil_t& lhs, const basic_reference<rb>& rhs) const {
-			return lhs == rhs;
-		}
-
-		template <bool lb>
-		bool operator()(const basic_reference<lb>& lhs, const lua_nil_t& rhs) const {
-			return lhs == rhs;
-		}
-
-		template <bool lb, bool rb>
-		bool operator()(const basic_reference<lb>& lhs, const basic_reference<rb>& rhs) const {
-			return lhs == rhs;
-		}
-
-		template <bool lb>
-		bool operator()(const basic_reference<lb>& lhs, const stack_reference& rhs) const {
-			return lhs == rhs;
-		}
-
-		template <bool rb>
-		bool operator()(const stack_reference& lhs, const basic_reference<rb>& rhs) const {
-			return lhs == rhs;
-		}
-	};
-
-	struct reference_hash : public stack_reference_hash {
-		typedef reference argument_type;
-		typedef std::size_t result_type;
-
-		template <bool lb>
-		result_type operator()(const basic_reference<lb>& lhs) const {
-			std::hash<const void*> h;
-			return h(lhs.pointer());
-		}
-	};
-} // namespace sol
-
-// end of sol/reference.hpp
-
-// beginning of sol/tie.hpp
-
-namespace sol {
-
-	namespace detail {
-		template <typename T>
-		struct is_speshul : std::false_type {};
-	} // namespace detail
-
-	template <typename T>
-	struct tie_size : std::tuple_size<T> {};
-
-	template <typename T>
-	struct is_tieable : std::integral_constant<bool, (::sol::tie_size<T>::value > 0)> {};
-
-	template <typename... Tn>
-	struct tie_t : public std::tuple<std::add_lvalue_reference_t<Tn>...> {
-	private:
-		typedef std::tuple<std::add_lvalue_reference_t<Tn>...> base_t;
-
-		template <typename T>
-		void set(std::false_type, T&& target) {
-			std::get<0>(*this) = std::forward<T>(target);
-		}
-
-		template <typename T>
-		void set(std::true_type, T&& target) {
-			typedef tie_size<meta::unqualified_t<T>> value_size;
-			typedef tie_size<std::tuple<Tn...>> tie_size;
-			typedef meta::conditional_t<(value_size::value < tie_size::value), value_size, tie_size> indices_size;
-			typedef std::make_index_sequence<indices_size::value> indices;
-			set_extra(detail::is_speshul<meta::unqualified_t<T>>(), indices(), std::forward<T>(target));
-		}
-
-		template <std::size_t... I, typename T>
-		void set_extra(std::true_type, std::index_sequence<I...>, T&& target) {
-			using std::get;
-			(void)detail::swallow{0,
-				(get<I>(static_cast<base_t&>(*this)) = get<I>(types<Tn...>(), target), 0)..., 0};
-		}
-
-		template <std::size_t... I, typename T>
-		void set_extra(std::false_type, std::index_sequence<I...>, T&& target) {
-			using std::get;
-			(void)detail::swallow{0,
-				(get<I>(static_cast<base_t&>(*this)) = get<I>(target), 0)..., 0};
-		}
-
-	public:
-		using base_t::base_t;
-
-		template <typename T>
-		tie_t& operator=(T&& value) {
-			typedef is_tieable<meta::unqualified_t<T>> tieable;
-			set(tieable(), std::forward<T>(value));
-			return *this;
-		}
-	};
-
-	template <typename... Tn>
-	struct tie_size<tie_t<Tn...>> : std::tuple_size<std::tuple<Tn...>> {};
-
-	namespace adl_barrier_detail {
-		template <typename... Tn>
-		inline tie_t<std::remove_reference_t<Tn>...> tie(Tn&&... argn) {
-			return tie_t<std::remove_reference_t<Tn>...>(std::forward<Tn>(argn)...);
-		}
-	} // namespace adl_barrier_detail
-
-	using namespace adl_barrier_detail;
-
-} // namespace sol
-
-// end of sol/tie.hpp
-
-// beginning of sol/stack_guard.hpp
-
-#include <functional>
-
-namespace sol {
-	namespace detail {
-		inline void stack_fail(int, int) {
-#if !(defined(SOL_NO_EXCEPTIONS) && SOL_NO_EXCEPTIONS)
-			throw error(detail::direct_error, "imbalanced stack after operation finish");
-#else
-			// Lol, what do you want, an error printout? :3c
-			// There's no sane default here. The right way would be C-style abort(), and that's not acceptable, so
-			// hopefully someone will register their own stack_fail thing for the `fx` parameter of stack_guard.
-#endif // No Exceptions
-		}
-	} // namespace detail
-
-	struct stack_guard {
-		lua_State* L;
-		int top;
-		std::function<void(int, int)> on_mismatch;
-
-		stack_guard(lua_State* L) : stack_guard(L, lua_gettop(L)) {
-		}
-		stack_guard(lua_State* L, int top, std::function<void(int, int)> fx = detail::stack_fail) : L(L), top(top), on_mismatch(std::move(fx)) {
-		}
-		bool check_stack(int modification = 0) const {
-			int bottom = lua_gettop(L) + modification;
-			if (top == bottom) {
-				return true;
-			}
-			on_mismatch(top, bottom);
-			return false;
-		}
-		~stack_guard() {
-			check_stack();
-		}
-	};
-} // namespace sol
-
-// end of sol/stack_guard.hpp
-
-#include <vector>
-#include <bitset>
-#include <forward_list>
-#include <string>
-#include <algorithm>
-#include <sstream>
-#include <optional>
-
-namespace sol {
-	namespace detail {
-		struct with_function_tag { };
-		struct as_reference_tag { };
-		template <typename T>
-		struct as_pointer_tag { };
-		template <typename T>
-		struct as_value_tag { };
-		template <typename T>
-		struct as_unique_tag { };
-		template <typename T>
-		struct as_table_tag { };
-
-		using lua_reg_table = luaL_Reg[64];
-
-		using unique_destructor = void (*)(void*);
-		using unique_tag = detail::inheritance_unique_cast_function;
-
-		inline void* align(std::size_t alignment, std::size_t size, void*& ptr, std::size_t& space, std::size_t& required_space) {
-			// this handels arbitrary alignments...
-			// make this into a power-of-2-only?
-			// actually can't: this is a C++14-compatible framework,
-			// power of 2 alignment is C++17
-			std::uintptr_t initial = reinterpret_cast<std::uintptr_t>(ptr);
-			std::uintptr_t offby = static_cast<std::uintptr_t>(initial % alignment);
-			std::uintptr_t padding = (alignment - offby) % alignment;
-			required_space += size + padding;
-			if (space < required_space) {
-				return nullptr;
-			}
-			ptr = static_cast<void*>(static_cast<char*>(ptr) + padding);
-			space -= padding;
-			return ptr;
-		}
-
-		inline void* align(std::size_t alignment, std::size_t size, void*& ptr, std::size_t& space) {
-			std::size_t required_space = 0;
-			return align(alignment, size, ptr, space, required_space);
-		}
-
-		inline void align_one(std::size_t a, std::size_t s, void*& target_alignment) {
-			std::size_t space = (std::numeric_limits<std::size_t>::max)();
-			target_alignment = align(a, s, target_alignment, space);
-			target_alignment = static_cast<void*>(static_cast<char*>(target_alignment) + s);
-		}
-
-		template <typename... Args>
-		std::size_t aligned_space_for(void* alignment = nullptr) {
-			// use temporary storage to prevent strict UB shenanigans
-			char alignment_shim[(std::max)({ sizeof(Args)... }) + (std::max)({ alignof(Args)... })] {};
-			char* start = alignment == nullptr ? static_cast<char*>(alignment) : alignment_shim;
-			(void)detail::swallow { int {}, (align_one(std::alignment_of_v<Args>, sizeof(Args), alignment), int {})... };
-			return static_cast<char*>(alignment) - start;
-		}
-
-		inline void* align_usertype_pointer(void* ptr) {
-			using use_align = std::integral_constant<bool,
-#if SOL_IS_OFF(SOL_ALIGN_MEMORY_I_)
-			     false
-#else
-			     (std::alignment_of<void*>::value > 1)
-#endif
-			     >;
-			if (!use_align::value) {
-				return ptr;
-			}
-			std::size_t space = (std::numeric_limits<std::size_t>::max)();
-			return align(std::alignment_of<void*>::value, sizeof(void*), ptr, space);
-		}
-
-		template <bool pre_aligned = false, bool pre_shifted = false>
-		void* align_usertype_unique_destructor(void* ptr) {
-			using use_align = std::integral_constant<bool,
-#if SOL_IS_OFF(SOL_ALIGN_MEMORY_I_)
-			     false
-#else
-			     (std::alignment_of<unique_destructor>::value > 1)
-#endif
-			     >;
-			if (!pre_aligned) {
-				ptr = align_usertype_pointer(ptr);
-			}
-			if (!pre_shifted) {
-				ptr = static_cast<void*>(static_cast<char*>(ptr) + sizeof(void*));
-			}
-			if (!use_align::value) {
-				return static_cast<void*>(static_cast<void**>(ptr) + 1);
-			}
-			std::size_t space = (std::numeric_limits<std::size_t>::max)();
-			return align(std::alignment_of<unique_destructor>::value, sizeof(unique_destructor), ptr, space);
-		}
-
-		template <bool pre_aligned = false, bool pre_shifted = false>
-		void* align_usertype_unique_tag(void* ptr) {
-			using use_align = std::integral_constant<bool,
-#if SOL_IS_OFF(SOL_ALIGN_MEMORY_I_)
-			     false
-#else
-			     (std::alignment_of<unique_tag>::value > 1)
-#endif
-			     >;
-			if (!pre_aligned) {
-				ptr = align_usertype_unique_destructor(ptr);
-			}
-			if (!pre_shifted) {
-				ptr = static_cast<void*>(static_cast<char*>(ptr) + sizeof(unique_destructor));
-			}
-			if (!use_align::value) {
-				return ptr;
-			}
-			std::size_t space = (std::numeric_limits<std::size_t>::max)();
-			return align(std::alignment_of<unique_tag>::value, sizeof(unique_tag), ptr, space);
-		}
-
-		template <typename T, bool pre_aligned = false, bool pre_shifted = false>
-		void* align_usertype_unique(void* ptr) {
-			typedef std::integral_constant<bool,
-#if SOL_IS_OFF(SOL_ALIGN_MEMORY_I_)
-			     false
-#else
-			     (std::alignment_of_v<T> > 1)
-#endif
-			     >
-			     use_align;
-			if (!pre_aligned) {
-				ptr = align_usertype_unique_tag(ptr);
-			}
-			if (!pre_shifted) {
-				ptr = static_cast<void*>(static_cast<char*>(ptr) + sizeof(unique_tag));
-			}
-			if (!use_align::value) {
-				return ptr;
-			}
-			std::size_t space = (std::numeric_limits<std::size_t>::max)();
-			return align(std::alignment_of_v<T>, sizeof(T), ptr, space);
-		}
-
-		template <typename T>
-		void* align_user(void* ptr) {
-			typedef std::integral_constant<bool,
-#if SOL_IS_OFF(SOL_ALIGN_MEMORY_I_)
-			     false
-#else
-			     (std::alignment_of_v<T> > 1)
-#endif
-			     >
-			     use_align;
-			if (!use_align::value) {
-				return ptr;
-			}
-			std::size_t space = (std::numeric_limits<std::size_t>::max)();
-			return align(std::alignment_of_v<T>, sizeof(T), ptr, space);
-		}
-
-		template <typename T>
-		T** usertype_allocate_pointer(lua_State* L) {
-			typedef std::integral_constant<bool,
-#if SOL_IS_OFF(SOL_ALIGN_MEMORY_I_)
-			     false
-#else
-			     (std::alignment_of<T*>::value > 1)
-#endif
-			     >
-			     use_align;
-			if (!use_align::value) {
-				T** pointerpointer = static_cast<T**>(lua_newuserdata(L, sizeof(T*)));
-				return pointerpointer;
-			}
-			static const std::size_t initial_size = aligned_space_for<T*>(nullptr);
-			static const std::size_t misaligned_size = aligned_space_for<T*>(reinterpret_cast<void*>(0x1));
-
-			std::size_t allocated_size = initial_size;
-			void* unadjusted = lua_newuserdata(L, initial_size);
-			void* adjusted = align(std::alignment_of<T*>::value, sizeof(T*), unadjusted, allocated_size);
-			if (adjusted == nullptr) {
-				lua_pop(L, 1);
-				// what kind of absolute garbage trash allocator are we dealing with?
-				// whatever, add some padding in the case of MAXIMAL alignment waste...
-				allocated_size = misaligned_size;
-				unadjusted = lua_newuserdata(L, allocated_size);
-				adjusted = align(std::alignment_of<T*>::value, sizeof(T*), unadjusted, allocated_size);
-				if (adjusted == nullptr) {
-					// trash allocator can burn in hell
-					lua_pop(L, 1);
-					// luaL_error(L, "if you are the one that wrote this allocator you should feel bad for doing a
-					// worse job than malloc/realloc and should go read some books, yeah?");
-					luaL_error(L, "cannot properly align memory for '%s'", detail::demangle<T*>().data());
-				}
-			}
-			return static_cast<T**>(adjusted);
-		}
-
-		inline bool attempt_alloc(lua_State* L, std::size_t ptr_align, std::size_t ptr_size, std::size_t value_align, std::size_t value_size,
-		     std::size_t allocated_size, void*& pointer_adjusted, void*& data_adjusted) {
-			void* adjusted = lua_newuserdata(L, allocated_size);
-			pointer_adjusted = align(ptr_align, ptr_size, adjusted, allocated_size);
-			if (pointer_adjusted == nullptr) {
-				lua_pop(L, 1);
-				return false;
-			}
-			// subtract size of what we're going to allocate there
-			allocated_size -= ptr_size;
-			adjusted = static_cast<void*>(static_cast<char*>(pointer_adjusted) + ptr_size);
-			data_adjusted = align(value_align, value_size, adjusted, allocated_size);
-			if (data_adjusted == nullptr) {
-				lua_pop(L, 1);
-				return false;
-			}
-			return true;
-		}
-
-		inline bool attempt_alloc_unique(lua_State* L, std::size_t ptr_align, std::size_t ptr_size, std::size_t real_align, std::size_t real_size,
-		     std::size_t allocated_size, void*& pointer_adjusted, void*& dx_adjusted, void*& id_adjusted, void*& data_adjusted) {
-			void* adjusted = lua_newuserdata(L, allocated_size);
-			pointer_adjusted = align(ptr_align, ptr_size, adjusted, allocated_size);
-			if (pointer_adjusted == nullptr) {
-				lua_pop(L, 1);
-				return false;
-			}
-			allocated_size -= ptr_size;
-
-			adjusted = static_cast<void*>(static_cast<char*>(pointer_adjusted) + ptr_size);
-			dx_adjusted = align(std::alignment_of_v<unique_destructor>, sizeof(unique_destructor), adjusted, allocated_size);
-			if (dx_adjusted == nullptr) {
-				lua_pop(L, 1);
-				return false;
-			}
-			allocated_size -= sizeof(unique_destructor);
-
-			adjusted = static_cast<void*>(static_cast<char*>(dx_adjusted) + sizeof(unique_destructor));
-
-			id_adjusted = align(std::alignment_of_v<unique_tag>, sizeof(unique_tag), adjusted, allocated_size);
-			if (id_adjusted == nullptr) {
-				lua_pop(L, 1);
-				return false;
-			}
-			allocated_size -= sizeof(unique_tag);
-
-			adjusted = static_cast<void*>(static_cast<char*>(id_adjusted) + sizeof(unique_tag));
-			data_adjusted = align(real_align, real_size, adjusted, allocated_size);
-			if (data_adjusted == nullptr) {
-				lua_pop(L, 1);
-				return false;
-			}
-			return true;
-		}
-
-		template <typename T>
-		T* usertype_allocate(lua_State* L) {
-			typedef std::integral_constant<bool,
-#if SOL_IS_OFF(SOL_ALIGN_MEMORY_I_)
-			     false
-#else
-			     (std::alignment_of<T*>::value > 1 || std::alignment_of_v<T> > 1)
-#endif
-			     >
-			     use_align;
-			if (!use_align::value) {
-				T** pointerpointer = static_cast<T**>(lua_newuserdata(L, sizeof(T*) + sizeof(T)));
-				T*& pointerreference = *pointerpointer;
-				T* allocationtarget = reinterpret_cast<T*>(pointerpointer + 1);
-				pointerreference = allocationtarget;
-				return allocationtarget;
-			}
-
-			/* the assumption is that `lua_newuserdata` -- unless someone
-			passes a specific lua_Alloc that gives us bogus, un-aligned pointers
-			-- uses malloc, which tends to hand out more or less aligned pointers to memory
-			(most of the time, anyhow)
-
-			but it's not guaranteed, so we have to do a post-adjustment check and increase padding
-
-			we do this preliminarily with compile-time stuff, to see
-			if we strike lucky with the allocator and alignment values
-
-			otherwise, we have to re-allocate the userdata and
-			over-allocate some space for additional padding because
-			compilers are optimized for aligned reads/writes
-			(and clang will barf UBsan errors on us for not being aligned)
-			*/
-			static const std::size_t initial_size = aligned_space_for<T*, T>(nullptr);
-			static const std::size_t misaligned_size = aligned_space_for<T*, T>(reinterpret_cast<void*>(0x1));
-
-			void* pointer_adjusted;
-			void* data_adjusted;
-			bool result
-			     = attempt_alloc(L, std::alignment_of_v<T*>, sizeof(T*), std::alignment_of_v<T>, sizeof(T), initial_size, pointer_adjusted, data_adjusted);
-			if (!result) {
-				// we're likely to get something that fails to perform the proper allocation a second time,
-				// so we use the suggested_new_size bump to help us out here
-				pointer_adjusted = nullptr;
-				data_adjusted = nullptr;
-				result = attempt_alloc(
-				     L, std::alignment_of_v<T*>, sizeof(T*), std::alignment_of_v<T>, sizeof(T), misaligned_size, pointer_adjusted, data_adjusted);
-				if (!result) {
-					if (pointer_adjusted == nullptr) {
-						luaL_error(L, "aligned allocation of userdata block (pointer section) for '%s' failed", detail::demangle<T>().c_str());
-					}
-					else {
-						luaL_error(L, "aligned allocation of userdata block (data section) for '%s' failed", detail::demangle<T>().c_str());
-					}
-					return nullptr;
-				}
-			}
-
-			T** pointerpointer = reinterpret_cast<T**>(pointer_adjusted);
-			T*& pointerreference = *pointerpointer;
-			T* allocationtarget = reinterpret_cast<T*>(data_adjusted);
-			pointerreference = allocationtarget;
-			return allocationtarget;
-		}
-
-		template <typename T, typename Real>
-		Real* usertype_unique_allocate(lua_State* L, T**& pref, unique_destructor*& dx, unique_tag*& id) {
-			typedef std::integral_constant<bool,
-#if SOL_IS_OFF(SOL_ALIGN_MEMORY_I_)
-			     false
-#else
-			     (std::alignment_of<T*>::value > 1 || std::alignment_of<unique_tag>::value > 1 || std::alignment_of<unique_destructor>::value > 1
-			          || std::alignment_of<Real>::value > 1)
-#endif
-			     >
-			     use_align;
-			if (!use_align::value) {
-				pref = static_cast<T**>(lua_newuserdata(L, sizeof(T*) + sizeof(detail::unique_destructor) + sizeof(unique_tag) + sizeof(Real)));
-				dx = static_cast<detail::unique_destructor*>(static_cast<void*>(pref + 1));
-				id = static_cast<unique_tag*>(static_cast<void*>(dx + 1));
-				Real* mem = static_cast<Real*>(static_cast<void*>(id + 1));
-				return mem;
-			}
-
-			static const std::size_t initial_size = aligned_space_for<T*, unique_destructor, unique_tag, Real>(nullptr);
-			static const std::size_t misaligned_size = aligned_space_for<T*, unique_destructor, unique_tag, Real>(reinterpret_cast<void*>(0x1));
-
-			void* pointer_adjusted;
-			void* dx_adjusted;
-			void* id_adjusted;
-			void* data_adjusted;
-			bool result = attempt_alloc_unique(L,
-			     std::alignment_of_v<T*>,
-			     sizeof(T*),
-			     std::alignment_of_v<Real>,
-			     sizeof(Real),
-			     initial_size,
-			     pointer_adjusted,
-			     dx_adjusted,
-			     id_adjusted,
-			     data_adjusted);
-			if (!result) {
-				// we're likely to get something that fails to perform the proper allocation a second time,
-				// so we use the suggested_new_size bump to help us out here
-				pointer_adjusted = nullptr;
-				dx_adjusted = nullptr;
-				id_adjusted = nullptr;
-				data_adjusted = nullptr;
-				result = attempt_alloc_unique(L,
-				     std::alignment_of_v<T*>,
-				     sizeof(T*),
-				     std::alignment_of_v<Real>,
-				     sizeof(Real),
-				     misaligned_size,
-				     pointer_adjusted,
-				     dx_adjusted,
-				     id_adjusted,
-				     data_adjusted);
-				if (!result) {
-					if (pointer_adjusted == nullptr) {
-						luaL_error(L, "aligned allocation of userdata block (pointer section) for '%s' failed", detail::demangle<T>().c_str());
-					}
-					else if (dx_adjusted == nullptr) {
-						luaL_error(L, "aligned allocation of userdata block (deleter section) for '%s' failed", detail::demangle<T>().c_str());
-					}
-					else {
-						luaL_error(L, "aligned allocation of userdata block (data section) for '%s' failed", detail::demangle<T>().c_str());
-					}
-					return nullptr;
-				}
-			}
-
-			pref = static_cast<T**>(pointer_adjusted);
-			dx = static_cast<detail::unique_destructor*>(dx_adjusted);
-			id = static_cast<unique_tag*>(id_adjusted);
-			Real* mem = static_cast<Real*>(data_adjusted);
-			return mem;
-		}
-
-		template <typename T>
-		T* user_allocate(lua_State* L) {
-			typedef std::integral_constant<bool,
-#if SOL_IS_OFF(SOL_ALIGN_MEMORY_I_)
-			     false
-#else
-			     (std::alignment_of_v<T> > 1)
-#endif
-			     >
-			     use_align;
-			if (!use_align::value) {
-				T* pointer = static_cast<T*>(lua_newuserdata(L, sizeof(T)));
-				return pointer;
-			}
-
-			static const std::size_t initial_size = aligned_space_for<T>(nullptr);
-			static const std::size_t misaligned_size = aligned_space_for<T>(reinterpret_cast<void*>(0x1));
-
-			std::size_t allocated_size = initial_size;
-			void* unadjusted = lua_newuserdata(L, allocated_size);
-			void* adjusted = align(std::alignment_of_v<T>, sizeof(T), unadjusted, allocated_size);
-			if (adjusted == nullptr) {
-				lua_pop(L, 1);
-				// try again, add extra space for alignment padding
-				allocated_size = misaligned_size;
-				unadjusted = lua_newuserdata(L, allocated_size);
-				adjusted = align(std::alignment_of_v<T>, sizeof(T), unadjusted, allocated_size);
-				if (adjusted == nullptr) {
-					lua_pop(L, 1);
-					luaL_error(L, "cannot properly align memory for '%s'", detail::demangle<T>().data());
-				}
-			}
-			return static_cast<T*>(adjusted);
-		}
-
-		template <typename T>
-		int usertype_alloc_destruct(lua_State* L) {
-			void* memory = lua_touserdata(L, 1);
-			memory = align_usertype_pointer(memory);
-			T** pdata = static_cast<T**>(memory);
-			T* data = *pdata;
-			std::allocator<T> alloc {};
-			std::allocator_traits<std::allocator<T>>::destroy(alloc, data);
-			return 0;
-		}
-
-		template <typename T>
-		int unique_destruct(lua_State* L) {
-			void* memory = lua_touserdata(L, 1);
-			memory = align_usertype_unique_destructor(memory);
-			unique_destructor& dx = *static_cast<unique_destructor*>(memory);
-			memory = align_usertype_unique_tag<true>(memory);
-			(dx)(memory);
-			return 0;
-		}
-
-		template <typename T>
-		int user_alloc_destruct(lua_State* L) {
-			void* memory = lua_touserdata(L, 1);
-			memory = align_user<T>(memory);
-			T* data = static_cast<T*>(memory);
-			std::allocator<T> alloc;
-			std::allocator_traits<std::allocator<T>>::destroy(alloc, data);
-			return 0;
-		}
-
-		template <typename T, typename Real>
-		void usertype_unique_alloc_destroy(void* memory) {
-			memory = align_usertype_unique<Real, true>(memory);
-			Real* target = static_cast<Real*>(memory);
-			std::allocator<Real> alloc;
-			std::allocator_traits<std::allocator<Real>>::destroy(alloc, target);
-		}
-
-		template <typename T>
-		int cannot_destruct(lua_State* L) {
-			return luaL_error(L,
-			     "cannot call the destructor for '%s': it is either hidden (protected/private) or removed with '= "
-			     "delete' and thusly this type is being destroyed without properly destructing, invoking undefined "
-			     "behavior: please bind a usertype and specify a custom destructor to define the behavior properly",
-			     detail::demangle<T>().data());
-		}
-
-		template <typename T>
-		void reserve(T&, std::size_t) {
-		}
-
-		template <typename T, typename Al>
-		void reserve(std::vector<T, Al>& vec, std::size_t hint) {
-			vec.reserve(hint);
-		}
-
-		template <typename T, typename Tr, typename Al>
-		void reserve(std::basic_string<T, Tr, Al>& str, std::size_t hint) {
-			str.reserve(hint);
-		}
-
-		inline bool property_always_true(meta_function) {
-			return true;
-		}
-
-		struct properties_enrollment_allowed {
-			int& times_through;
-			std::bitset<64>& properties;
-			automagic_enrollments& enrollments;
-
-			properties_enrollment_allowed(int& times, std::bitset<64>& props, automagic_enrollments& enroll)
-			: times_through(times), properties(props), enrollments(enroll) {
-			}
-
-			bool operator()(meta_function mf) const {
-				bool p = properties[static_cast<int>(mf)];
-				if (times_through > 0) {
-					return p;
-				}
-				switch (mf) {
-				case meta_function::length:
-					return enrollments.length_operator && !p;
-				case meta_function::pairs:
-					return enrollments.pairs_operator && !p;
-				case meta_function::call:
-					return enrollments.call_operator && !p;
-				case meta_function::less_than:
-					return enrollments.less_than_operator && !p;
-				case meta_function::less_than_or_equal_to:
-					return enrollments.less_than_or_equal_to_operator && !p;
-				case meta_function::equal_to:
-					return enrollments.equal_to_operator && !p;
-				default:
-					break;
-				}
-				return !p;
-			}
-		};
-
-		struct indexed_insert {
-			lua_reg_table& l;
-			int& index;
-
-			indexed_insert(lua_reg_table& cont, int& idx) : l(cont), index(idx) {
-			}
-			void operator()(meta_function mf, lua_CFunction f) {
-				l[index] = luaL_Reg { to_string(mf).c_str(), f };
-				++index;
-			}
-		};
-	} // namespace detail
-
-	namespace stack {
-
-		template <typename T, bool global = false, bool raw = false, typename = void>
-		struct field_getter;
-		template <typename T, typename P, bool global = false, bool raw = false, typename = void>
-		struct probe_field_getter;
-
-		template <typename T, bool global = false, bool raw = false, typename = void>
-		struct field_setter;
-
-		template <typename T, typename = void>
-		struct unqualified_getter;
-		template <typename T, typename = void>
-		struct qualified_getter;
-
-		template <typename T, typename = void>
-		struct qualified_interop_getter;
-		template <typename T, typename = void>
-		struct unqualified_interop_getter;
-
-		template <typename T, typename = void>
-		struct popper;
-
-		template <typename T, typename = void>
-		struct unqualified_pusher;
-
-		template <typename T, type t, typename = void>
-		struct unqualified_checker;
-		template <typename T, type t, typename = void>
-		struct qualified_checker;
-
-		template <typename T, typename = void>
-		struct unqualified_check_getter;
-		template <typename T, typename = void>
-		struct qualified_check_getter;
-
-		struct probe {
-			bool success;
-			int levels;
-
-			probe(bool s, int l) : success(s), levels(l) {
-			}
-
-			operator bool() const {
-				return success;
-			};
-		};
-
-		struct record {
-			int last;
-			int used;
-
-			record() noexcept : last(), used() {
-			}
-			void use(int count) noexcept {
-				last = count;
-				used += count;
-			}
-		};
-
-		namespace stack_detail {
-			template <typename Function>
-			Function* get_function_pointer(lua_State*, int, record&) noexcept;
-			template <typename Function, typename Handler>
-			bool check_function_pointer(lua_State* L, int index, Handler&& handler, record& tracking) noexcept;
-		} // namespace stack_detail
-
-	} // namespace stack
-
-	namespace meta { namespace meta_detail {
-
-		template <typename T>
-		using adl_sol_lua_get_test_t = decltype(sol_lua_get(types<T>(), static_cast<lua_State*>(nullptr), -1, std::declval<stack::record&>()));
-
-		template <typename T>
-		using adl_sol_lua_interop_get_test_t
-			= decltype(sol_lua_interop_get(types<T>(), static_cast<lua_State*>(nullptr), -1, static_cast<void*>(nullptr), std::declval<stack::record&>()));
-
-		template <typename T>
-		using adl_sol_lua_check_test_t = decltype(sol_lua_check(types<T>(), static_cast<lua_State*>(nullptr), -1, no_panic, std::declval<stack::record&>()));
-
-		template <typename T>
-		using adl_sol_lua_interop_check_test_t
-			= decltype(sol_lua_interop_check(types<T>(), static_cast<lua_State*>(nullptr), -1, type::none, no_panic, std::declval<stack::record&>()));
-
-		template <typename T>
-		using adl_sol_lua_check_get_test_t
-			= decltype(sol_lua_check_get(types<T>(), static_cast<lua_State*>(nullptr), -1, no_panic, std::declval<stack::record&>()));
-
-		template <typename... Args>
-		using adl_sol_lua_push_test_t = decltype(sol_lua_push(static_cast<lua_State*>(nullptr), std::declval<Args>()...));
-
-		template <typename T, typename... Args>
-		using adl_sol_lua_push_exact_test_t = decltype(sol_lua_push(types<T>(), static_cast<lua_State*>(nullptr), std::declval<Args>()...));
-
-		template <typename T>
-		inline constexpr bool is_adl_sol_lua_get_v = meta::is_detected_v<adl_sol_lua_get_test_t, T>;
-
-		template <typename T>
-		inline constexpr bool is_adl_sol_lua_interop_get_v = meta::is_detected_v<adl_sol_lua_interop_get_test_t, T>;
-
-		template <typename T>
-		inline constexpr bool is_adl_sol_lua_check_v = meta::is_detected_v<adl_sol_lua_check_test_t, T>;
-
-		template <typename T>
-		inline constexpr bool is_adl_sol_lua_interop_check_v = meta::is_detected_v<adl_sol_lua_interop_check_test_t, T>;
-
-		template <typename T>
-		inline constexpr bool is_adl_sol_lua_check_get_v = meta::is_detected_v<adl_sol_lua_check_get_test_t, T>;
-
-		template <typename... Args>
-		inline constexpr bool is_adl_sol_lua_push_v = meta::is_detected_v<adl_sol_lua_push_test_t, Args...>;
-
-		template <typename T, typename... Args>
-		inline constexpr bool is_adl_sol_lua_push_exact_v = meta::is_detected_v<adl_sol_lua_push_exact_test_t, T, Args...>;
-	}} // namespace meta::meta_detail
-
-	namespace stack {
-		namespace stack_detail {
-			constexpr const char* not_enough_stack_space = "not enough space left on Lua stack";
-			constexpr const char* not_enough_stack_space_floating = "not enough space left on Lua stack for a floating point number";
-			constexpr const char* not_enough_stack_space_integral = "not enough space left on Lua stack for an integral number";
-			constexpr const char* not_enough_stack_space_string = "not enough space left on Lua stack for a string";
-			constexpr const char* not_enough_stack_space_meta_function_name = "not enough space left on Lua stack for the name of a meta_function";
-			constexpr const char* not_enough_stack_space_userdata = "not enough space left on Lua stack to create a sol3 userdata";
-			constexpr const char* not_enough_stack_space_generic = "not enough space left on Lua stack to push valuees";
-			constexpr const char* not_enough_stack_space_environment = "not enough space left on Lua stack to retrieve environment";
-
-			template <typename T>
-			struct strip {
-				typedef T type;
-			};
-			template <typename T>
-			struct strip<std::reference_wrapper<T>> {
-				typedef T& type;
-			};
-			template <typename T>
-			struct strip<user<T>> {
-				typedef T& type;
-			};
-			template <typename T>
-			struct strip<non_null<T>> {
-				typedef T type;
-			};
-			template <typename T>
-			using strip_t = typename strip<T>::type;
-
-			template <typename C>
-			static int get_size_hint(C& c) {
-				return static_cast<int>(c.size());
-			}
-
-			template <typename V, typename Al>
-			static int get_size_hint(const std::forward_list<V, Al>&) {
-				// forward_list makes me sad
-				return static_cast<int>(32);
-			}
-
-			template <typename T>
-			decltype(auto) unchecked_unqualified_get(lua_State* L, int index, record& tracking) {
-				using Tu = meta::unqualified_t<T>;
-				if constexpr (meta::meta_detail::is_adl_sol_lua_get_v<Tu>) {
-					return sol_lua_get(types<Tu>(), L, index, tracking);
-				}
-				else {
-					unqualified_getter<Tu> g {};
-					(void)g;
-					return g.get(L, index, tracking);
-				}
-			}
-
-			template <typename T>
-			decltype(auto) unchecked_get(lua_State* L, int index, record& tracking) {
-				if constexpr (meta::meta_detail::is_adl_sol_lua_get_v<T>) {
-					return sol_lua_get(types<T>(), L, index, tracking);
-				}
-				else {
-					qualified_getter<T> g {};
-					(void)g;
-					return g.get(L, index, tracking);
-				}
-			}
-
-			template <typename T>
-			decltype(auto) unqualified_interop_get(lua_State* L, int index, void* unadjusted_pointer, record& tracking) {
-				using Tu = meta::unqualified_t<T>;
-				if constexpr (meta::meta_detail::is_adl_sol_lua_interop_get_v<Tu>) {
-					return sol_lua_interop_get(types<Tu>(), L, index, unadjusted_pointer, tracking);
-				}
-				else {
-					(void)L;
-					(void)index;
-					(void)unadjusted_pointer;
-					(void)tracking;
-					using Ti = stack_detail::strip_t<Tu>;
-					return std::pair<bool, Ti*> { false, nullptr };
-				}
-			}
-
-			template <typename T>
-			decltype(auto) interop_get(lua_State* L, int index, void* unadjusted_pointer, record& tracking) {
-				if constexpr (meta::meta_detail::is_adl_sol_lua_interop_get_v<T>) {
-					return sol_lua_interop_get(types<T>(), L, index, unadjusted_pointer, tracking);
-				}
-				else {
-					return unqualified_interop_get<T>(L, index, unadjusted_pointer, tracking);
-				}
-			}
-
-			template <typename T, typename Handler>
-			bool unqualified_interop_check(lua_State* L, int index, type index_type, Handler&& handler, record& tracking) {
-				using Tu = meta::unqualified_t<T>;
-				if constexpr (meta::meta_detail::is_adl_sol_lua_interop_check_v<Tu>) {
-					return sol_lua_interop_check(types<Tu>(), L, index, index_type, std::forward<Handler>(handler), tracking);
-				}
-				else {
-					(void)L;
-					(void)index;
-					(void)index_type;
-					(void)handler;
-					(void)tracking;
-					return false;
-				}
-			}
-
-			template <typename T, typename Handler>
-			bool interop_check(lua_State* L, int index, type index_type, Handler&& handler, record& tracking) {
-				if constexpr (meta::meta_detail::is_adl_sol_lua_interop_check_v<T>) {
-					return sol_lua_interop_check(types<T>(), L, index, index_type, std::forward<Handler>(handler), tracking);
-				}
-				else {
-					return unqualified_interop_check<T>(L, index, index_type, std::forward<Handler>(handler), tracking);
-				}
-			}
-
-			using undefined_method_func = void (*)(stack_reference);
-
-			struct undefined_metatable {
-				lua_State* L;
-				const char* key;
-				undefined_method_func on_new_table;
-
-				undefined_metatable(lua_State* l, const char* k, undefined_method_func umf) : L(l), key(k), on_new_table(umf) {
-				}
-
-				void operator()() const {
-					if (luaL_newmetatable(L, key) == 1) {
-						on_new_table(stack_reference(L, -1));
-					}
-					lua_setmetatable(L, -2);
-				}
-			};
-		} // namespace stack_detail
-
-		inline bool maybe_indexable(lua_State* L, int index = -1) {
-			type t = type_of(L, index);
-			return t == type::userdata || t == type::table;
-		}
-
-		inline int top(lua_State* L) {
-			return lua_gettop(L);
-		}
-
-		inline bool is_main_thread(lua_State* L) {
-			int ismainthread = lua_pushthread(L);
-			lua_pop(L, 1);
-			return ismainthread == 1;
-		}
-
-		inline void coroutine_create_guard(lua_State* L) {
-			if (is_main_thread(L)) {
-				return;
-			}
-			int stacksize = lua_gettop(L);
-			if (stacksize < 1) {
-				return;
-			}
-			if (type_of(L, 1) != type::function) {
-				return;
-			}
-			// well now we're screwed...
-			// we can clean the stack and pray it doesn't destroy anything?
-			lua_pop(L, stacksize);
-		}
-
-		inline void clear(lua_State* L, int table_index) {
-			lua_pushnil(L);
-			while (lua_next(L, table_index) != 0) {
-				// remove value
-				lua_pop(L, 1);
-				// duplicate key to protect form rawset
-				lua_pushvalue(L, -1);
-				// push new value
-				lua_pushnil(L);
-				// table_index%[key] = nil
-				lua_rawset(L, table_index);
-			}
-		}
-
-		inline void clear(reference& r) {
-			auto pp = push_pop<false>(r);
-			int stack_index = pp.index_of(r);
-			clear(r.lua_state(), stack_index);
-		}
-
-		inline void clear(stack_reference& r) {
-			clear(r.lua_state(), r.stack_index());
-		}
-
-		template <typename T, typename... Args>
-		int push(lua_State* L, T&& t, Args&&... args) {
-			using Tu = meta::unqualified_t<T>;
-			if constexpr (meta::meta_detail::is_adl_sol_lua_push_exact_v<T, T, Args...>) {
-				return sol_lua_push(types<T>(), L, std::forward<T>(t), std::forward<Args>(args)...);
-			}
-			else if constexpr (meta::meta_detail::is_adl_sol_lua_push_exact_v<Tu, T, Args...>) {
-				return sol_lua_push(types<Tu>(), L, std::forward<T>(t), std::forward<Args>(args)...);
-			}
-			else if constexpr (meta::meta_detail::is_adl_sol_lua_push_v<T, Args...>) {
-				return sol_lua_push(L, std::forward<T>(t), std::forward<Args>(args)...);
-			}
-			else {
-				unqualified_pusher<Tu> p {};
-				(void)p;
-				return p.push(L, std::forward<T>(t), std::forward<Args>(args)...);
-			}
-		}
-
-		// overload allows to use a pusher of a specific type, but pass in any kind of args
-		template <typename T, typename Arg, typename... Args, typename = std::enable_if_t<!std::is_same<T, Arg>::value>>
-		int push(lua_State* L, Arg&& arg, Args&&... args) {
-			using Tu = meta::unqualified_t<T>;
-			if constexpr (meta::meta_detail::is_adl_sol_lua_push_exact_v<T, Arg, Args...>) {
-				return sol_lua_push(types<T>(), L, std::forward<Arg>(arg), std::forward<Args>(args)...);
-			}
-			else if constexpr (meta::meta_detail::is_adl_sol_lua_push_exact_v<Tu, Arg, Args...>) {
-				return sol_lua_push(types<Tu>(), L, std::forward<Arg>(arg), std::forward<Args>(args)...);
-			}
-			else if constexpr (meta::meta_detail::is_adl_sol_lua_push_v<Arg, Args...>) {
-				return sol_lua_push(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
-			}
-			else {
-				unqualified_pusher<Tu> p {};
-				(void)p;
-				return p.push(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
-			}
-		}
-
-		template <typename T, typename... Args>
-		int push_userdata(lua_State* L, T&& t, Args&&... args) {
-			using U = meta::unqualified_t<T>;
-			using Tr = meta::conditional_t<std::is_pointer_v<U>,
-			     detail::as_pointer_tag<std::remove_pointer_t<U>>,
-			     meta::conditional_t<is_unique_usertype_v<U>, detail::as_unique_tag<U>, detail::as_value_tag<U>>>;
-			return stack::push<Tr>(L, std::forward<T>(t), std::forward<Args>(args)...);
-		}
-
-		template <typename T, typename Arg, typename... Args>
-		int push_userdata(lua_State* L, Arg&& arg, Args&&... args) {
-			using U = meta::unqualified_t<T>;
-			using Tr = meta::conditional_t<std::is_pointer_v<U>,
-			     detail::as_pointer_tag<std::remove_pointer_t<U>>,
-			     meta::conditional_t<is_unique_usertype_v<U>, detail::as_unique_tag<U>, detail::as_value_tag<U>>>;
-			return stack::push<Tr>(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
-		}
-
-		namespace stack_detail {
-
-			template <typename T, typename Arg, typename... Args>
-			int push_reference(lua_State* L, Arg&& arg, Args&&... args) {
-				using use_reference_tag = meta::all<std::is_lvalue_reference<T>,
-				     meta::neg<std::is_const<std::remove_reference_t<T>>>,
-				     meta::neg<is_lua_primitive<meta::unqualified_t<T>>>,
-				     meta::neg<is_unique_usertype<meta::unqualified_t<T>>>>;
-				using Tr = meta::conditional_t<use_reference_tag::value, detail::as_reference_tag, meta::unqualified_t<T>>;
-				return stack::push<Tr>(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
-			}
-
-		} // namespace stack_detail
-
-		template <typename T, typename... Args>
-		int push_reference(lua_State* L, T&& t, Args&&... args) {
-			return stack_detail::push_reference<T>(L, std::forward<T>(t), std::forward<Args>(args)...);
-		}
-
-		template <typename T, typename Arg, typename... Args>
-		int push_reference(lua_State* L, Arg&& arg, Args&&... args) {
-			return stack_detail::push_reference<T>(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
-		}
-
-		inline int multi_push(lua_State*) {
-			// do nothing
-			return 0;
-		}
-
-		template <typename T, typename... Args>
-		int multi_push(lua_State* L, T&& t, Args&&... args) {
-			int pushcount = push(L, std::forward<T>(t));
-			void(detail::swallow { (pushcount += stack::push(L, std::forward<Args>(args)), 0)... });
-			return pushcount;
-		}
-
-		inline int multi_push_reference(lua_State*) {
-			// do nothing
-			return 0;
-		}
-
-		template <typename T, typename... Args>
-		int multi_push_reference(lua_State* L, T&& t, Args&&... args) {
-			int pushcount = push_reference(L, std::forward<T>(t));
-			void(detail::swallow { (pushcount += stack::push_reference(L, std::forward<Args>(args)), 0)... });
-			return pushcount;
-		}
-
-		template <typename T, typename Handler>
-		bool unqualified_check(lua_State* L, int index, Handler&& handler, record& tracking) {
-			using Tu = meta::unqualified_t<T>;
-			if constexpr (meta::meta_detail::is_adl_sol_lua_check_v<Tu>) {
-				return sol_lua_check(types<Tu>(), L, index, std::forward<Handler>(handler), tracking);
-			}
-			else {
-				unqualified_checker<Tu, lua_type_of_v<Tu>> c;
-				// VC++ has a bad warning here: shut it up
-				(void)c;
-				return c.check(L, index, std::forward<Handler>(handler), tracking);
-			}
-		}
-
-		template <typename T, typename Handler>
-		bool unqualified_check(lua_State* L, int index, Handler&& handler) {
-			record tracking {};
-			return unqualified_check<T>(L, index, std::forward<Handler>(handler), tracking);
-		}
-
-		template <typename T>
-		bool unqualified_check(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
-			auto handler = no_panic;
-			return unqualified_check<T>(L, index, handler);
-		}
-
-		template <typename T, typename Handler>
-		bool check(lua_State* L, int index, Handler&& handler, record& tracking) {
-			if constexpr (meta::meta_detail::is_adl_sol_lua_check_v<T>) {
-				return sol_lua_check(types<T>(), L, index, std::forward<Handler>(handler), tracking);
-			}
-			else {
-				using Tu = meta::unqualified_t<T>;
-				qualified_checker<T, lua_type_of_v<Tu>> c;
-				// VC++ has a bad warning here: shut it up
-				(void)c;
-				return c.check(L, index, std::forward<Handler>(handler), tracking);
-			}
-		}
-
-		template <typename T, typename Handler>
-		bool check(lua_State* L, int index, Handler&& handler) {
-			record tracking {};
-			return check<T>(L, index, std::forward<Handler>(handler), tracking);
-		}
-
-		template <typename T>
-		bool check(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
-			auto handler = no_panic;
-			return check<T>(L, index, handler);
-		}
-
-		template <typename T, typename Handler>
-		bool check_usertype(lua_State* L, int index, type, Handler&& handler, record& tracking) {
-			using Tu = meta::unqualified_t<T>;
-			using detail_t = meta::conditional_t<std::is_pointer_v<T>, detail::as_pointer_tag<Tu>, detail::as_value_tag<Tu>>;
-			return check<detail_t>(L, index, std::forward<Handler>(handler), tracking);
-		}
-
-		template <typename T, typename Handler>
-		bool check_usertype(lua_State* L, int index, Handler&& handler, record& tracking) {
-			using Tu = meta::unqualified_t<T>;
-			using detail_t = meta::conditional_t<std::is_pointer_v<T>, detail::as_pointer_tag<Tu>, detail::as_value_tag<Tu>>;
-			return check<detail_t>(L, index, std::forward<Handler>(handler), tracking);
-		}
-
-		template <typename T, typename Handler>
-		bool check_usertype(lua_State* L, int index, Handler&& handler) {
-			record tracking {};
-			return check_usertype<T>(L, index, std::forward<Handler>(handler), tracking);
-		}
-
-		template <typename T>
-		bool check_usertype(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
-			auto handler = no_panic;
-			return check_usertype<T>(L, index, handler);
-		}
-
-		template <typename T, typename Handler>
-		decltype(auto) unqualified_check_get(lua_State* L, int index, Handler&& handler, record& tracking) {
-			using Tu = meta::unqualified_t<T>;
-			if constexpr (meta::meta_detail::is_adl_sol_lua_check_get_v<T>) {
-				return sol_lua_check_get(types<T>(), L, index, std::forward<Handler>(handler), tracking);
-			}
-			else if constexpr (meta::meta_detail::is_adl_sol_lua_check_get_v<Tu>) {
-				return sol_lua_check_get(types<Tu>(), L, index, std::forward<Handler>(handler), tracking);
-			}
-			else {
-				unqualified_check_getter<Tu> cg {};
-				(void)cg;
-				return cg.get(L, index, std::forward<Handler>(handler), tracking);
-			}
-		}
-
-		template <typename T, typename Handler>
-		decltype(auto) unqualified_check_get(lua_State* L, int index, Handler&& handler) {
-			record tracking {};
-			return unqualified_check_get<T>(L, index, handler, tracking);
-		}
-
-		template <typename T>
-		decltype(auto) unqualified_check_get(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
-			auto handler = no_panic;
-			return unqualified_check_get<T>(L, index, handler);
-		}
-
-		template <typename T, typename Handler>
-		decltype(auto) check_get(lua_State* L, int index, Handler&& handler, record& tracking) {
-			if constexpr (meta::meta_detail::is_adl_sol_lua_check_get_v<T>) {
-				return sol_lua_check_get(types<T>(), L, index, std::forward<Handler>(handler), tracking);
-			}
-			else {
-				qualified_check_getter<T> cg {};
-				(void)cg;
-				return cg.get(L, index, std::forward<Handler>(handler), tracking);
-			}
-		}
-
-		template <typename T, typename Handler>
-		decltype(auto) check_get(lua_State* L, int index, Handler&& handler) {
-			record tracking {};
-			return check_get<T>(L, index, handler, tracking);
-		}
-
-		template <typename T>
-		decltype(auto) check_get(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
-			auto handler = no_panic;
-			return check_get<T>(L, index, handler);
-		}
-
-		namespace stack_detail {
-
-			template <typename Handler>
-			bool check_types(lua_State*, int, Handler&&, record&) {
-				return true;
-			}
-
-			template <typename T, typename... Args, typename Handler>
-			bool check_types(lua_State* L, int firstargument, Handler&& handler, record& tracking) {
-				if (!stack::check<T>(L, firstargument + tracking.used, handler, tracking))
-					return false;
-				return check_types<Args...>(L, firstargument, std::forward<Handler>(handler), tracking);
-			}
-
-			template <typename... Args, typename Handler>
-			bool check_types(types<Args...>, lua_State* L, int index, Handler&& handler, record& tracking) {
-				return check_types<Args...>(L, index, std::forward<Handler>(handler), tracking);
-			}
-
-		} // namespace stack_detail
-
-		template <typename... Args, typename Handler>
-		bool multi_check(lua_State* L, int index, Handler&& handler, record& tracking) {
-			return stack_detail::check_types<Args...>(L, index, std::forward<Handler>(handler), tracking);
-		}
-
-		template <typename... Args, typename Handler>
-		bool multi_check(lua_State* L, int index, Handler&& handler) {
-			record tracking {};
-			return multi_check<Args...>(L, index, std::forward<Handler>(handler), tracking);
-		}
-
-		template <typename... Args>
-		bool multi_check(lua_State* L, int index) {
-			return multi_check<Args...>(L, index);
-		}
-
-		template <typename T>
-		auto unqualified_get(lua_State* L, int index, record& tracking) -> decltype(stack_detail::unchecked_unqualified_get<T>(L, index, tracking)) {
-#if SOL_IS_ON(SOL_SAFE_GETTER_I_)
-			static constexpr bool is_op = meta::is_optional_v<T>;
-			if constexpr (is_op) {
-				return stack_detail::unchecked_unqualified_get<T>(L, index, tracking);
-			}
-			else {
-				if (is_lua_reference<T>::value) {
-					return stack_detail::unchecked_unqualified_get<T>(L, index, tracking);
-				}
-				auto op = unqualified_check_get<T>(L, index, type_panic_c_str, tracking);
-				return *std::move(op);
-			}
-#else
-			return stack_detail::unchecked_unqualified_get<T>(L, index, tracking);
-#endif
-		}
-
-		template <typename T>
-		decltype(auto) unqualified_get(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
-			record tracking {};
-			return unqualified_get<T>(L, index, tracking);
-		}
-
-		template <typename T>
-		auto get(lua_State* L, int index, record& tracking) -> decltype(stack_detail::unchecked_get<T>(L, index, tracking)) {
-#if SOL_IS_ON(SOL_SAFE_GETTER_I_)
-			static constexpr bool is_op = meta::is_optional_v<T>;
-			if constexpr (is_op) {
-				return stack_detail::unchecked_get<T>(L, index, tracking);
-			}
-			else {
-				if (is_lua_reference<T>::value) {
-					return stack_detail::unchecked_get<T>(L, index, tracking);
-				}
-				auto op = check_get<T>(L, index, type_panic_c_str, tracking);
-				return *std::move(op);
-			}
-#else
-			return stack_detail::unchecked_get<T>(L, index, tracking);
-#endif
-		}
-
-		template <typename T>
-		decltype(auto) get(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
-			record tracking {};
-			return get<T>(L, index, tracking);
-		}
-
-		template <typename T>
-		decltype(auto) get_usertype(lua_State* L, int index, record& tracking) {
-			using UT = meta::conditional_t<std::is_pointer<T>::value, detail::as_pointer_tag<std::remove_pointer_t<T>>, detail::as_value_tag<T>>;
-			return get<UT>(L, index, tracking);
-		}
-
-		template <typename T>
-		decltype(auto) get_usertype(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
-			record tracking {};
-			return get_usertype<T>(L, index, tracking);
-		}
-
-		template <typename T>
-		decltype(auto) pop(lua_State* L) {
-			return popper<meta::unqualified_t<T>> {}.pop(L);
-		}
-
-		template <bool global = false, bool raw = false, typename Key>
-		void get_field(lua_State* L, Key&& key) {
-			field_getter<meta::unqualified_t<Key>, global, raw> {}.get(L, std::forward<Key>(key));
-		}
-
-		template <bool global = false, bool raw = false, typename Key>
-		void get_field(lua_State* L, Key&& key, int tableindex) {
-			field_getter<meta::unqualified_t<Key>, global, raw> {}.get(L, std::forward<Key>(key), tableindex);
-		}
-
-		template <bool global = false, typename Key>
-		void raw_get_field(lua_State* L, Key&& key) {
-			get_field<global, true>(L, std::forward<Key>(key));
-		}
-
-		template <bool global = false, typename Key>
-		void raw_get_field(lua_State* L, Key&& key, int tableindex) {
-			get_field<global, true>(L, std::forward<Key>(key), tableindex);
-		}
-
-		template <bool global = false, bool raw = false, typename C = detail::non_lua_nil_t, typename Key>
-		probe probe_get_field(lua_State* L, Key&& key) {
-			return probe_field_getter<meta::unqualified_t<Key>, C, global, raw> {}.get(L, std::forward<Key>(key));
-		}
-
-		template <bool global = false, bool raw = false, typename C = detail::non_lua_nil_t, typename Key>
-		probe probe_get_field(lua_State* L, Key&& key, int tableindex) {
-			return probe_field_getter<meta::unqualified_t<Key>, C, global, raw> {}.get(L, std::forward<Key>(key), tableindex);
-		}
-
-		template <bool global = false, typename C = detail::non_lua_nil_t, typename Key>
-		probe probe_raw_get_field(lua_State* L, Key&& key) {
-			return probe_get_field<global, true, C>(L, std::forward<Key>(key));
-		}
-
-		template <bool global = false, typename C = detail::non_lua_nil_t, typename Key>
-		probe probe_raw_get_field(lua_State* L, Key&& key, int tableindex) {
-			return probe_get_field<global, true, C>(L, std::forward<Key>(key), tableindex);
-		}
-
-		template <bool global = false, bool raw = false, typename Key, typename Value>
-		void set_field(lua_State* L, Key&& key, Value&& value) {
-			field_setter<meta::unqualified_t<Key>, global, raw> {}.set(L, std::forward<Key>(key), std::forward<Value>(value));
-		}
-
-		template <bool global = false, bool raw = false, typename Key, typename Value>
-		void set_field(lua_State* L, Key&& key, Value&& value, int tableindex) {
-			field_setter<meta::unqualified_t<Key>, global, raw> {}.set(L, std::forward<Key>(key), std::forward<Value>(value), tableindex);
-		}
-
-		template <bool global = false, typename Key, typename Value>
-		void raw_set_field(lua_State* L, Key&& key, Value&& value) {
-			set_field<global, true>(L, std::forward<Key>(key), std::forward<Value>(value));
-		}
-
-		template <bool global = false, typename Key, typename Value>
-		void raw_set_field(lua_State* L, Key&& key, Value&& value, int tableindex) {
-			set_field<global, true>(L, std::forward<Key>(key), std::forward<Value>(value), tableindex);
-		}
-
-		template <typename T, typename F>
-		void modify_unique_usertype_as(const stack_reference& obj, F&& f) {
-			using u_traits = unique_usertype_traits<T>;
-			void* raw = lua_touserdata(obj.lua_state(), obj.stack_index());
-			void* ptr_memory = detail::align_usertype_pointer(raw);
-			void* uu_memory = detail::align_usertype_unique<T>(raw);
-			T& uu = *static_cast<T*>(uu_memory);
-			f(uu);
-			*static_cast<void**>(ptr_memory) = static_cast<void*>(u_traits::get(uu));
-		}
-
-		template <typename F>
-		void modify_unique_usertype(const stack_reference& obj, F&& f) {
-			using bt = meta::bind_traits<meta::unqualified_t<F>>;
-			using T = typename bt::template arg_at<0>;
-			using Tu = meta::unqualified_t<T>;
-			modify_unique_usertype_as<Tu>(obj, std::forward<F>(f));
-		}
-
-	} // namespace stack
-
-	namespace detail {
-
-		template <typename T>
-		lua_CFunction make_destructor(std::true_type) {
-			if constexpr (is_unique_usertype_v<T>) {
-				return &unique_destruct<T>;
-			}
-			else if constexpr (!std::is_pointer_v<T>) {
-				return &usertype_alloc_destruct<T>;
-			}
-			else {
-				return &cannot_destruct<T>;
-			}
-		}
-
-		template <typename T>
-		lua_CFunction make_destructor(std::false_type) {
-			return &cannot_destruct<T>;
-		}
-
-		template <typename T>
-		lua_CFunction make_destructor() {
-			return make_destructor<T>(std::is_destructible<T>());
-		}
-
-		struct no_comp {
-			template <typename A, typename B>
-			bool operator()(A&&, B&&) const {
-				return false;
-			}
-		};
-
-		template <typename T>
-		int is_check(lua_State* L) {
-			return stack::push(L, stack::check<T>(L, 1, &no_panic));
-		}
-
-		template <typename T>
-		int member_default_to_string(std::true_type, lua_State* L) {
-			decltype(auto) ts = stack::get<T>(L, 1).to_string();
-			return stack::push(L, std::forward<decltype(ts)>(ts));
-		}
-
-		template <typename T>
-		int member_default_to_string(std::false_type, lua_State* L) {
-			return luaL_error(L,
-			     "cannot perform to_string on '%s': no 'to_string' overload in namespace, 'to_string' member "
-			     "function, or operator<<(ostream&, ...) present",
-			     detail::demangle<T>().data());
-		}
-
-		template <typename T>
-		int adl_default_to_string(std::true_type, lua_State* L) {
-			using namespace std;
-			decltype(auto) ts = to_string(stack::get<T>(L, 1));
-			return stack::push(L, std::forward<decltype(ts)>(ts));
-		}
-
-		template <typename T>
-		int adl_default_to_string(std::false_type, lua_State* L) {
-			return member_default_to_string<T>(meta::supports_to_string_member<T>(), L);
-		}
-
-		template <typename T>
-		int oss_default_to_string(std::true_type, lua_State* L) {
-			std::ostringstream oss;
-			oss << stack::unqualified_get<T>(L, 1);
-			return stack::push(L, oss.str());
-		}
-
-		template <typename T>
-		int oss_default_to_string(std::false_type, lua_State* L) {
-			return adl_default_to_string<T>(meta::supports_adl_to_string<T>(), L);
-		}
-
-		template <typename T>
-		int default_to_string(lua_State* L) {
-			return oss_default_to_string<T>(meta::supports_op_left_shift<std::ostream, T>(), L);
-		}
-
-		template <typename T>
-		int default_size(lua_State* L) {
-			decltype(auto) self = stack::unqualified_get<T>(L, 1);
-			return stack::push(L, self.size());
-		}
-
-		template <typename T, typename Op>
-		int comparsion_operator_wrap(lua_State* L) {
-			if constexpr (std::is_void_v<T>) {
-				return stack::push(L, false);
-			}
-			else {
-				auto maybel = stack::unqualified_check_get<T>(L, 1);
-				if (!maybel) {
-					return stack::push(L, false);
-				}
-				auto mayber = stack::unqualified_check_get<T>(L, 2);
-				if (!mayber) {
-					return stack::push(L, false);
-				}
-				decltype(auto) l = *maybel;
-				decltype(auto) r = *mayber;
-				if constexpr (std::is_same_v<no_comp, Op>) {
-					std::equal_to<> op;
-					return stack::push(L, op(detail::ptr(l), detail::ptr(r)));
-				}
-				else {
-					if constexpr (std::is_same_v<std::equal_to<>, Op> // clang-format hack
-					     || std::is_same_v<std::less_equal<>, Op>     //
-					     || std::is_same_v<std::less_equal<>, Op>) {  //
-						if (detail::ptr(l) == detail::ptr(r)) {
-							return stack::push(L, true);
-						}
-					}
-					Op op;
-					return stack::push(L, op(detail::deref(l), detail::deref(r)));
-				}
-			}
-		}
-
-		template <typename T, typename IFx, typename Fx>
-		void insert_default_registrations(IFx&& ifx, Fx&& fx);
-
-		template <typename T, bool, bool>
-		struct get_is_primitive : is_lua_primitive<T> { };
-
-		template <typename T>
-		struct get_is_primitive<T, true, false>
-		: meta::neg<std::is_reference<decltype(sol_lua_get(types<T>(), nullptr, -1, std::declval<stack::record&>()))>> { };
-
-		template <typename T>
-		struct get_is_primitive<T, false, true>
-		: meta::neg<std::is_reference<decltype(sol_lua_get(types<meta::unqualified_t<T>>(), nullptr, -1, std::declval<stack::record&>()))>> { };
-
-		template <typename T>
-		struct get_is_primitive<T, true, true> : get_is_primitive<T, true, false> { };
-
-	} // namespace detail
-
-	template <typename T>
-	struct is_proxy_primitive
-	: detail::get_is_primitive<T, meta::meta_detail::is_adl_sol_lua_get_v<T>, meta::meta_detail::is_adl_sol_lua_get_v<meta::unqualified_t<T>>> { };
-
-} // namespace sol
-
-// end of sol/stack_core.hpp
-
-// beginning of sol/stack_check.hpp
-
-// beginning of sol/stack_check_unqualified.hpp
-
-#include <memory>
-#include <functional>
-#include <utility>
-#include <cmath>
-#include <optional>
-#if SOL_IS_ON(SOL_STD_VARIANT_I_)
-#include <variant>
-#endif // variant shenanigans
-
-namespace sol { namespace stack {
-	namespace stack_detail {
-		inline bool impl_check_metatable(lua_State* L, int index, const std::string& metakey, bool poptable) {
-			luaL_getmetatable(L, &metakey[0]);
-			const type expectedmetatabletype = static_cast<type>(lua_type(L, -1));
-			if (expectedmetatabletype != type::lua_nil) {
-				if (lua_rawequal(L, -1, index) == 1) {
-					lua_pop(L, 1 + static_cast<int>(poptable));
-					return true;
-				}
-			}
-			lua_pop(L, 1);
-			return false;
-		}
-
-		template <typename T, bool poptable = true>
-		inline bool check_metatable(lua_State* L, int index = -2) {
-			return impl_check_metatable(L, index, usertype_traits<T>::metatable(), poptable);
-		}
-
-		template <type expected, int (*check_func)(lua_State*, int)>
-		struct basic_check {
-			template <typename Handler>
-			static bool check(lua_State* L, int index, Handler&& handler, record& tracking) {
-				tracking.use(1);
-				bool success = check_func(L, index) == 1;
-				if (!success) {
-					// expected type, actual type
-					handler(L, index, expected, type_of(L, index), "");
-				}
-				return success;
-			}
-		};
-	} // namespace stack_detail
-
-	template <typename T, typename>
-	struct unqualified_interop_checker {
-		template <typename Handler>
-		static bool check(lua_State*, int, type, Handler&&, record&) {
-			return false;
-		}
-	};
-
-	template <typename T, typename>
-	struct qualified_interop_checker {
-		template <typename Handler>
-		static bool check(lua_State* L, int index, type index_type, Handler&& handler, record& tracking) {
-			return stack_detail::unqualified_interop_check<T>(L, index, index_type, std::forward<Handler>(handler), tracking);
-		}
-	};
-
-	template <typename T, type expected, typename>
-	struct unqualified_checker {
-		template <typename Handler>
-		static bool check(lua_State* L, int index, Handler&& handler, record& tracking) {
-			if constexpr (std::is_same_v<T, bool>) {
-				tracking.use(1);
-				bool success = lua_isboolean(L, index) == 1;
-				if (!success) {
-					// expected type, actual type
-					handler(L, index, expected, type_of(L, index), "");
-				}
-				return success;
-			}
-			else if constexpr (meta::any_same_v<T, char /* , char8_t*/, char16_t, char32_t>) {
-				return stack::check<std::basic_string<T>>(L, index, std::forward<Handler>(handler), tracking);
-			}
-			else if constexpr (std::is_integral_v<T> || std::is_same_v<T, lua_Integer>) {
-				tracking.use(1);
-#if SOL_LUA_VESION_I_ >= 503
-				// Lua 5.3 and greater checks for numeric precision
-#if SOL_IS_ON(SOL_STRINGS_ARE_NUMBERS_I_)
-				// imprecise, sloppy conversions
-				int isnum = 0;
-				lua_tointegerx(L, index, &isnum);
-				const bool success = isnum != 0;
-				if (!success) {
-					// expected type, actual type
-					handler(L, index, type::number, type_of(L, index), detail::not_a_number_or_number_string_integral);
-				}
-#elif SOL_IS_ON(SOL_NUMBER_PRECISION_CHECKS_I_)
-				// this check is precise, do not convert
-				if (lua_isinteger(L, index) == 1) {
-					return true;
-				}
-				const bool success = false;
-				if (!success) {
-					// expected type, actual type
-					handler(L, index, type::number, type_of(L, index), detail::not_a_number_integral);
-				}
-#else
-				// Numerics are neither safe nor string-convertible
-				type t = type_of(L, index);
-				const bool success = t == type::number;
-#endif
-				if (!success) {
-					// expected type, actual type
-					handler(L, index, type::number, type_of(L, index), detail::not_a_number);
-				}
-				return success;
-#else
-				// Lua 5.2 and below checks
-#if SOL_IS_OFF(SOL_STRINGS_ARE_NUMBERS_I_)
-				// must pre-check, because it will convert
-				type t = type_of(L, index);
-				if (t != type::number) {
-					// expected type, actual type
-					handler(L, index, type::number, t, detail::not_a_number);
-					return false;
-				}
-#endif // Do not allow strings to be numbers
-
-#if SOL_IS_ON(SOL_NUMBER_PRECISION_CHECKS_I_)
-				int isnum = 0;
-				const lua_Number v = lua_tonumberx(L, index, &isnum);
-				const bool success = isnum != 0 && static_cast<lua_Number>(llround(v)) == v;
-#else
-				const bool success = true;
-#endif // Safe numerics and number precision checking
-				if (!success) {
-					// Use defines to provide a better error message!
-#if SOL_IS_ON(SOL_STRINGS_ARE_NUMBERS_I_)
-					handler(L, index, type::number, type_of(L, index), detail::not_a_number_or_number_string);
-#elif SOL_IS_ON(SOL_NUMBER_PRECISION_CHECKS_I_)
-					handler(L, index, type::number, t, detail::not_a_number_or_number_string);
-#else
-					handler(L, index, type::number, t, detail::not_a_number);
-#endif
-				}
-				return success;
-#endif
-			}
-			else if constexpr (std::is_floating_point_v<T> || std::is_same_v<T, lua_Number>) {
-				tracking.use(1);
-#if SOL_IS_ON(SOL_STRINGS_ARE_NUMBERS_I_)
-				bool success = lua_isnumber(L, index) == 1;
-				if (!success) {
-					// expected type, actual type
-					handler(L, index, type::number, type_of(L, index), detail::not_a_number_or_number_string);
-				}
-				return success;
-#else
-				type t = type_of(L, index);
-				bool success = t == type::number;
-				if (!success) {
-					// expected type, actual type
-					handler(L, index, type::number, t, detail::not_a_number);
-				}
-				return success;
-#endif // Strings are Numbers
-			}
-			else if constexpr (meta::any_same_v<T, type, this_state, this_main_state, this_environment, variadic_args>) {
-				(void)L;
-				(void)index;
-				(void)handler;
-				tracking.use(0);
-				return true;
-			}
-			else if constexpr (is_unique_usertype_v<T>) {
-				using proper_T = typename unique_usertype_traits<T>::type;
-				const type indextype = type_of(L, index);
-				tracking.use(1);
-				if (indextype != type::userdata) {
-					handler(L, index, type::userdata, indextype, "value is not a userdata");
-					return false;
-				}
-				if (lua_getmetatable(L, index) == 0) {
-					return true;
-				}
-				int metatableindex = lua_gettop(L);
-				if (stack_detail::check_metatable<detail::unique_usertype<proper_T>>(L, metatableindex)) {
-					void* memory = lua_touserdata(L, index);
-					memory = detail::align_usertype_unique_destructor(memory);
-					detail::unique_destructor& pdx = *static_cast<detail::unique_destructor*>(memory);
-					bool success = &detail::usertype_unique_alloc_destroy<proper_T, T> == pdx;
-					if (!success) {
-						memory = detail::align_usertype_unique_tag<true>(memory);
-#if 0
-						// New version
-#else
-						const char*& name_tag = *static_cast<const char**>(memory);
-						success = usertype_traits<T>::qualified_name() == name_tag;
-#endif
-						if (!success) {
-							handler(L, index, type::userdata, indextype, "value is a userdata but is not the correct unique usertype");
-						}
-					}
-					return success;
-				}
-				lua_pop(L, 1);
-				handler(L, index, type::userdata, indextype, "unrecognized userdata (not pushed by sol?)");
-				return false;
-			}
-			else if constexpr (meta::any_same_v<T, lua_nil_t, std::nullopt_t, nullopt_t>) {
-				bool success = lua_isnil(L, index);
-				if (success) {
-					tracking.use(1);
-					return success;
-				}
-				tracking.use(0);
-				success = lua_isnone(L, index);
-				if (!success) {
-					// expected type, actual type
-					handler(L, index, expected, type_of(L, index), "");
-				}
-				return success;
-			}
-			else if constexpr (std::is_same_v<T, env_key_t>) {
-				tracking.use(1);
-				type t = type_of(L, index);
-				if (t == type::table || t == type::none || t == type::lua_nil || t == type::userdata) {
-					return true;
-				}
-				handler(L, index, type::table, t, "value cannot not have a valid environment");
-				return true;
-			}
-			else if constexpr (std::is_same_v<T, detail::non_lua_nil_t>) {
-				return !stack::unqualified_check<lua_nil_t>(L, index, std::forward<Handler>(handler), tracking);
-			}
-			else if constexpr (meta::is_specialization_of_v<T, basic_lua_table>) {
-				tracking.use(1);
-				type t = type_of(L, index);
-				if (t != type::table) {
-					handler(L, index, type::table, t, "value is not a table");
-					return false;
-				}
-				return true;
-			}
-			else if constexpr (meta::is_specialization_of_v<T, basic_bytecode>) {
-				tracking.use(1);
-				type t = type_of(L, index);
-				if (t != type::function) {
-					handler(L, index, type::function, t, "value is not a function that can be dumped");
-					return false;
-				}
-				return true;
-			}
-			else if constexpr (meta::is_specialization_of_v<T, basic_environment>) {
-				tracking.use(1);
-				if (lua_getmetatable(L, index) == 0) {
-					return true;
-				}
-				type t = type_of(L, -1);
-				if (t == type::table || t == type::none || t == type::lua_nil) {
-					lua_pop(L, 1);
-					return true;
-				}
-				if (t != type::userdata) {
-					lua_pop(L, 1);
-					handler(L, index, type::table, t, "value does not have a valid metatable");
-					return false;
-				}
-				return true;
-			}
-			else if constexpr (std::is_same_v<T, metatable_key_t>) {
-				tracking.use(1);
-				if (lua_getmetatable(L, index) == 0) {
-					return true;
-				}
-				type t = type_of(L, -1);
-				if (t == type::table || t == type::none || t == type::lua_nil) {
-					lua_pop(L, 1);
-					return true;
-				}
-				if (t != type::userdata) {
-					lua_pop(L, 1);
-					handler(L, index, expected, t, "value does not have a valid metatable");
-					return false;
-				}
-				return true;
-			}
-			else if constexpr (std::is_same_v<T, luaL_Stream*> || std::is_same_v<T, luaL_Stream>) {
-				if (lua_getmetatable(L, index) == 0) {
-					type t = type_of(L, index);
-					handler(L, index, expected, t, "value is not a valid luaL_Stream (has no metatable/is not a valid value)");
-					return false;
-				}
-				luaL_getmetatable(L, LUA_FILEHANDLE);
-				if (type_of(L, index) != type::table) {
-					type t = type_of(L, index);
-					lua_pop(L, 1);
-					handler(L,
-						index,
-						expected,
-						t,
-						"value is not a valid luaL_Stream (there is no metatable for luaL_Stream -- did you forget to "
-						"my_lua_state.open_libraries(sol::lib::state) or equivalent?)");
-					return false;
-				}
-				int is_stream_table = lua_compare(L, -1, -2, LUA_OPEQ);
-				lua_pop(L, 2);
-				if (is_stream_table == 0) {
-					type t = type_of(L, index);
-					handler(L, index, expected, t, "value is not a valid luaL_Stream (incorrect metatable)");
-					return false;
-				}
-				return true;
-			}
-			else if constexpr (meta::is_optional_v<T>) {
-				using ValueType = typename T::value_type;
-				(void)handler;
-				type t = type_of(L, index);
-				if (t == type::none) {
-					tracking.use(0);
-					return true;
-				}
-				if (t == type::lua_nil) {
-					tracking.use(1);
-					return true;
-				}
-				return stack::unqualified_check<ValueType>(L, index, no_panic, tracking);
-			}
-#if SOL_IS_ON(SOL_GET_FUNCTION_POINTER_UNSAFE_I_)
-			else if constexpr (std::is_function_v<T> || (std::is_pointer_v<T> && std::is_function_v<std::remove_pointer_t<T>>)) {
-				return stack_detail::check_function_pointer<std::remove_pointer_t<T>>(L, index, std::forward<Handler>(handler), tracking);
-			}
-#endif
-			else if constexpr (expected == type::userdata) {
-				if constexpr (meta::any_same_v<T, userdata_value> || meta::is_specialization_of_v<T, basic_userdata>) {
-					tracking.use(1);
-					type t = type_of(L, index);
-					bool success = t == type::userdata;
-					if (!success) {
-						// expected type, actual type
-						handler(L, index, type::userdata, t, "");
-					}
-					return success;
-				}
-				else if constexpr (meta::is_specialization_of_v<T, user>) {
-					unqualified_checker<lightuserdata_value, type::userdata> c;
-					(void)c;
-					return c.check(L, index, std::forward<Handler>(handler), tracking);
-				}
-				else {
-					if constexpr (std::is_pointer_v<T>) {
-						return check_usertype<T>(L, index, std::forward<Handler>(handler), tracking);
-					}
-					else if constexpr (meta::is_specialization_of_v<T, std::reference_wrapper>) {
-						using T_internal = typename T::type;
-						return stack::check<T_internal>(L, index, std::forward<Handler>(handler), tracking);
-					}
-					else {
-						return check_usertype<T>(L, index, std::forward<Handler>(handler), tracking);
-					}
-				}
-			}
-			else if constexpr (expected == type::poly) {
-				tracking.use(1);
-				bool success = is_lua_reference_v<T> || !lua_isnone(L, index);
-				if (!success) {
-					// expected type, actual type
-					handler(L, index, type::poly, type_of(L, index), "");
-				}
-				return success;
-			}
-			else if constexpr (expected == type::lightuserdata) {
-				tracking.use(1);
-				type t = type_of(L, index);
-				bool success = t == type::userdata || t == type::lightuserdata;
-				if (!success) {
-					// expected type, actual type
-					handler(L, index, type::lightuserdata, t, "");
-				}
-				return success;
-			}
-			else if constexpr (expected == type::function) {
-				if constexpr (meta::any_same_v<T, lua_CFunction, std::remove_pointer_t<lua_CFunction>, c_closure>) {
-					tracking.use(1);
-					bool success = lua_iscfunction(L, index) == 1;
-					if (!success) {
-						// expected type, actual type
-						handler(L, index, expected, type_of(L, index), "");
-					}
-					return success;
-				}
-				else {
-					tracking.use(1);
-					type t = type_of(L, index);
-					if (t == type::lua_nil || t == type::none || t == type::function) {
-						// allow for lua_nil to be returned
-						return true;
-					}
-					if (t != type::userdata && t != type::table) {
-						handler(L, index, type::function, t, "must be a function or table or a userdata");
-						return false;
-					}
-					// Do advanced check for call-style userdata?
-					static const auto& callkey = to_string(meta_function::call);
-					if (lua_getmetatable(L, index) == 0) {
-						// No metatable, no __call key possible
-						handler(L, index, type::function, t, "value is not a function and does not have overriden metatable");
-						return false;
-					}
-					if (lua_isnoneornil(L, -1)) {
-						lua_pop(L, 1);
-						handler(L, index, type::function, t, "value is not a function and does not have valid metatable");
-						return false;
-					}
-					lua_getfield(L, -1, &callkey[0]);
-					if (lua_isnoneornil(L, -1)) {
-						lua_pop(L, 2);
-						handler(L, index, type::function, t, "value's metatable does not have __call overridden in metatable, cannot call this type");
-						return false;
-					}
-					// has call, is definitely a function
-					lua_pop(L, 2);
-					return true;
-				}
-			}
-			else if constexpr (expected == type::table) {
-				tracking.use(1);
-				type t = type_of(L, index);
-				if (t == type::table) {
-					return true;
-				}
-				if (t != type::userdata) {
-					handler(L, index, type::table, t, "value is not a table or a userdata that can behave like one");
-					return false;
-				}
-				return true;
-			}
-			else {
-				tracking.use(1);
-				const type indextype = type_of(L, index);
-				bool success = expected == indextype;
-				if (!success) {
-					// expected type, actual type, message
-					handler(L, index, expected, indextype, "");
-				}
-				return success;
-			}
-		}
-	};
-
-	template <typename T>
-	struct unqualified_checker<non_null<T>, type::userdata> : unqualified_checker<T, lua_type_of_v<T>> { };
-
-	template <typename T>
-	struct unqualified_checker<detail::as_value_tag<T>, type::userdata> {
-		template <typename Handler>
-		static bool check(lua_State* L, int index, Handler&& handler, record& tracking) {
-			const type indextype = type_of(L, index);
-			return check(types<T>(), L, index, indextype, std::forward<Handler>(handler), tracking);
-		}
-
-		template <typename U, typename Handler>
-		static bool check(types<U>, lua_State* L, int index, type indextype, Handler&& handler, record& tracking) {
-			if constexpr (
-				std::is_same_v<T,
-				     lightuserdata_value> || std::is_same_v<T, userdata_value> || std::is_same_v<T, userdata> || std::is_same_v<T, lightuserdata>) {
-				tracking.use(1);
-				if (indextype != type::userdata) {
-					handler(L, index, type::userdata, indextype, "value is not a valid userdata");
-					return false;
-				}
-				return true;
-			}
-			else {
-#if SOL_IS_ON(SOL_USE_INTEROP_I_)
-				if (stack_detail::interop_check<U>(L, index, indextype, handler, tracking)) {
-					return true;
-				}
-#endif // interop extensibility
-				tracking.use(1);
-				if (indextype != type::userdata) {
-					handler(L, index, type::userdata, indextype, "value is not a valid userdata");
-					return false;
-				}
-				if (lua_getmetatable(L, index) == 0) {
-					return true;
-				}
-				int metatableindex = lua_gettop(L);
-				if (stack_detail::check_metatable<U>(L, metatableindex))
-					return true;
-				if (stack_detail::check_metatable<U*>(L, metatableindex))
-					return true;
-				if (stack_detail::check_metatable<detail::unique_usertype<U>>(L, metatableindex))
-					return true;
-				if (stack_detail::check_metatable<as_container_t<U>>(L, metatableindex))
-					return true;
-				bool success = false;
-				bool has_derived = derive<T>::value || weak_derive<T>::value;
-				if (has_derived) {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-					luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
-#endif // make sure stack doesn't overflow
-					auto pn = stack::pop_n(L, 1);
-					lua_pushstring(L, &detail::base_class_check_key()[0]);
-					lua_rawget(L, metatableindex);
-					if (type_of(L, -1) != type::lua_nil) {
-						void* basecastdata = lua_touserdata(L, -1);
-						detail::inheritance_check_function ic = reinterpret_cast<detail::inheritance_check_function>(basecastdata);
-						success = ic(usertype_traits<T>::qualified_name());
-					}
-				}
-				lua_pop(L, 1);
-				if (!success) {
-					handler(L, index, type::userdata, indextype, "value at this index does not properly reflect the desired type");
-					return false;
-				}
-				return true;
-			}
-		}
-	};
-
-	template <typename T>
-	struct unqualified_checker<detail::as_pointer_tag<T>, type::userdata> {
-		template <typename Handler>
-		static bool check(lua_State* L, int index, type indextype, Handler&& handler, record& tracking) {
-			if (indextype == type::lua_nil) {
-				tracking.use(1);
-				return true;
-			}
-			return check_usertype<std::remove_pointer_t<T>>(L, index, std::forward<Handler>(handler), tracking);
-		}
-
-		template <typename Handler>
-		static bool check(lua_State* L, int index, Handler&& handler, record& tracking) {
-			const type indextype = type_of(L, index);
-			return check(L, index, indextype, std::forward<Handler>(handler), tracking);
-		}
-	};
-
-	template <typename... Args>
-	struct unqualified_checker<std::tuple<Args...>, type::poly> {
-		template <typename Handler>
-		static bool check(lua_State* L, int index, Handler&& handler, record& tracking) {
-			return stack::multi_check<Args...>(L, index, std::forward<Handler>(handler), tracking);
-		}
-	};
-
-	template <typename A, typename B>
-	struct unqualified_checker<std::pair<A, B>, type::poly> {
-		template <typename Handler>
-		static bool check(lua_State* L, int index, Handler&& handler, record& tracking) {
-			return stack::multi_check<A, B>(L, index, std::forward<Handler>(handler), tracking);
-		}
-	};
-
-#if SOL_IS_ON(SOL_STD_VARIANT_I_)
-
-	template <typename... Tn>
-	struct unqualified_checker<std::variant<Tn...>, type::poly> {
-		typedef std::variant<Tn...> V;
-		typedef std::variant_size<V> V_size;
-		typedef std::integral_constant<bool, V_size::value == 0> V_is_empty;
-
-		template <typename Handler>
-		static bool is_one(std::integral_constant<std::size_t, 0>, lua_State* L, int index, Handler&& handler, record& tracking) {
-			if constexpr (V_is_empty::value) {
-				if (lua_isnone(L, index)) {
-					return true;
-				}
-			}
-			tracking.use(1);
-			handler(L, index, type::poly, type_of(L, index), "value does not fit any type present in the variant");
-			return false;
-		}
-
-		template <std::size_t I, typename Handler>
-		static bool is_one(std::integral_constant<std::size_t, I>, lua_State* L, int index, Handler&& handler, record& tracking) {
-			typedef std::variant_alternative_t<I - 1, V> T;
-			record temp_tracking = tracking;
-			if (stack::check<T>(L, index, no_panic, temp_tracking)) {
-				tracking = temp_tracking;
-				return true;
-			}
-			return is_one(std::integral_constant<std::size_t, I - 1>(), L, index, std::forward<Handler>(handler), tracking);
-		}
-
-		template <typename Handler>
-		static bool check(lua_State* L, int index, Handler&& handler, record& tracking) {
-			return is_one(std::integral_constant<std::size_t, V_size::value>(), L, index, std::forward<Handler>(handler), tracking);
-		}
-	};
-
-#endif // variant shenanigans
-
-}} // namespace sol::stack
-
-// end of sol/stack_check_unqualified.hpp
-
-// beginning of sol/stack_check_qualified.hpp
-
-namespace sol {
-namespace stack {
-
-	template <typename X, type expected, typename>
-	struct qualified_checker {
-		template <typename Handler>
-		static bool check(lua_State* L, int index, Handler&& handler, record& tracking) {
-			if constexpr (!std::is_reference_v<X> && is_unique_usertype_v<X>) {
-				using u_traits = unique_usertype_traits<meta::unqualified_t<X>>;
-				using T = typename u_traits::type;
-				if constexpr (is_base_rebindable_non_void_v<u_traits>) {
-					using rebind_t = typename u_traits::template rebind_base<void>;
-					// we have a unique pointer type that can be
-					// rebound to a base/derived type
-					const type indextype = type_of(L, index);
-					tracking.use(1);
-					if (indextype != type::userdata) {
-						handler(L, index, type::userdata, indextype, "value is not a userdata");
-						return false;
-					}
-					void* memory = lua_touserdata(L, index);
-					memory = detail::align_usertype_unique_destructor(memory);
-					detail::unique_destructor& pdx = *static_cast<detail::unique_destructor*>(memory);
-					if (&detail::usertype_unique_alloc_destroy<T, X> == pdx) {
-						return true;
-					}
-					if constexpr (derive<T>::value) {
-						memory = detail::align_usertype_unique_tag<true, false>(memory);
-						detail::unique_tag& ic = *reinterpret_cast<detail::unique_tag*>(memory);
-						string_view ti = usertype_traits<T>::qualified_name();
-						string_view rebind_ti = usertype_traits<rebind_t>::qualified_name();
-						if (ic(nullptr, nullptr, ti, rebind_ti) != 0) {
-							return true;
-						}
-					}
-					handler(L, index, type::userdata, indextype, "value is a userdata but is not the correct unique usertype");
-					return false;
-				}
-				else {
-					return stack::unqualified_check<X>(L, index, std::forward<Handler>(handler), tracking);
-				}
-			}
-			else if constexpr (!std::is_reference_v<X> && is_container_v<X>) {
-				if (type_of(L, index) == type::userdata) {
-					return stack::unqualified_check<X>(L, index, std::forward<Handler>(handler), tracking);
-				}
-				else {
-					return stack::unqualified_check<nested<X>>(L, index, std::forward<Handler>(handler), tracking);
-				}
-			}
-			else if constexpr (!std::is_reference_v<X> && meta::is_specialization_of_v<X, nested>) {
-				using NestedX = typename meta::unqualified_t<X>::nested_type;
-				return stack::check<NestedX>(L, index, ::std::forward<Handler>(handler), tracking);
-			}
-			else {
-				return stack::unqualified_check<X>(L, index, std::forward<Handler>(handler), tracking);
-			}
-		}
-	};
-}
-} // namespace sol::stack
-
-// end of sol/stack_check_qualified.hpp
-
-// end of sol/stack_check.hpp
-
-// beginning of sol/stack_get.hpp
-
-// beginning of sol/stack_get_unqualified.hpp
-
-// beginning of sol/overload.hpp
-
-#include <utility>
-
-namespace sol {
-	template <typename... Functions>
-	struct overload_set {
-		std::tuple<Functions...> functions;
-		template <typename Arg, typename... Args, meta::disable<std::is_same<overload_set, meta::unqualified_t<Arg>>> = meta::enabler>
-		overload_set(Arg&& arg, Args&&... args)
-		: functions(std::forward<Arg>(arg), std::forward<Args>(args)...) {
-		}
-		overload_set(const overload_set&) = default;
-		overload_set(overload_set&&) = default;
-		overload_set& operator=(const overload_set&) = default;
-		overload_set& operator=(overload_set&&) = default;
-	};
-
-	template <typename... Args>
-	decltype(auto) overload(Args&&... args) {
-		return overload_set<std::decay_t<Args>...>(std::forward<Args>(args)...);
-	}
-} // namespace sol
-
-// end of sol/overload.hpp
-
-// beginning of sol/unicode.hpp
-
-#include <array>
-#include <cstring>
-
-namespace sol {
-	// Everything here was lifted pretty much straight out of
-	// ogonek, because fuck figuring it out=
-	namespace unicode {
-		enum class error_code {
-			ok = 0,
-			invalid_code_point,
-			invalid_code_unit,
-			invalid_leading_surrogate,
-			invalid_trailing_surrogate,
-			sequence_too_short,
-			overlong_sequence,
-		};
-
-		inline const string_view& to_string(error_code ec) {
-			static const string_view storage[7] = {
-				"ok",
-				"invalid code points",
-				"invalid code unit",
-				"invalid leading surrogate",
-				"invalid trailing surrogate",
-				"sequence too short",
-				"overlong sequence"
-			};
-			return storage[static_cast<std::size_t>(ec)];
-		}
-
-		template <typename It>
-		struct decoded_result {
-			error_code error;
-			char32_t codepoint;
-			It next;
-		};
-
-		template <typename C>
-		struct encoded_result {
-			error_code error;
-			std::size_t code_units_size;
-			std::array<C, 4> code_units;
-		};
-
-		struct unicode_detail {
-			// codepoint related
-			static constexpr char32_t last_code_point = 0x10FFFF;
-
-			static constexpr char32_t first_lead_surrogate = 0xD800;
-			static constexpr char32_t last_lead_surrogate = 0xDBFF;
-
-			static constexpr char32_t first_trail_surrogate = 0xDC00;
-			static constexpr char32_t last_trail_surrogate = 0xDFFF;
-
-			static constexpr char32_t first_surrogate = first_lead_surrogate;
-			static constexpr char32_t last_surrogate = last_trail_surrogate;
-
-			static constexpr bool is_lead_surrogate(char32_t u) {
-				return u >= first_lead_surrogate && u <= last_lead_surrogate;
-			}
-			static constexpr bool is_trail_surrogate(char32_t u) {
-				return u >= first_trail_surrogate && u <= last_trail_surrogate;
-			}
-			static constexpr bool is_surrogate(char32_t u) {
-				return u >= first_surrogate && u <= last_surrogate;
-			}
-
-			// utf8 related
-			static constexpr auto last_1byte_value = 0x7Fu;
-			static constexpr auto last_2byte_value = 0x7FFu;
-			static constexpr auto last_3byte_value = 0xFFFFu;
-
-			static constexpr auto start_2byte_mask = 0x80u;
-			static constexpr auto start_3byte_mask = 0xE0u;
-			static constexpr auto start_4byte_mask = 0xF0u;
-
-			static constexpr auto continuation_mask = 0xC0u;
-			static constexpr auto continuation_signature = 0x80u;
-
-			static constexpr bool is_invalid(unsigned char b) {
-				return b == 0xC0 || b == 0xC1 || b > 0xF4;
-			}
-
-			static constexpr bool is_continuation(unsigned char b) {
-				return (b & unicode_detail::continuation_mask) == unicode_detail::continuation_signature;
-			}
-
-			static constexpr bool is_overlong(char32_t u, std::size_t bytes) {
-				return u <= unicode_detail::last_1byte_value || (u <= unicode_detail::last_2byte_value && bytes > 2)
-				     || (u <= unicode_detail::last_3byte_value && bytes > 3);
-			}
-
-			static constexpr int sequence_length(unsigned char b) {
-				return (b & start_2byte_mask) == 0 ? 1
-					: (b & start_3byte_mask) != start_3byte_mask ? 2
-					: (b & start_4byte_mask) != start_4byte_mask ? 3
-					: 4;
-			}
-
-			static constexpr char32_t decode(unsigned char b0, unsigned char b1) {
-				return ((b0 & 0x1F) << 6) | (b1 & 0x3F);
-			}
-			static constexpr char32_t decode(unsigned char b0, unsigned char b1, unsigned char b2) {
-				return ((b0 & 0x0F) << 12) | ((b1 & 0x3F) << 6) | (b2 & 0x3F);
-			}
-			static constexpr char32_t decode(unsigned char b0, unsigned char b1, unsigned char b2, unsigned char b3) {
-				return ((b0 & 0x07) << 18) | ((b1 & 0x3F) << 12) | ((b2 & 0x3F) << 6) | (b3 & 0x3F);
-			}
-
-			// utf16 related
-			static constexpr char32_t last_bmp_value = 0xFFFF;
-			static constexpr char32_t normalizing_value = 0x10000;
-			static constexpr int lead_surrogate_bitmask = 0xFFC00;
-			static constexpr int trail_surrogate_bitmask = 0x3FF;
-			static constexpr int lead_shifted_bits = 10;
-			static constexpr char32_t replacement = 0xFFFD;
-
-			static char32_t combine_surrogates(char16_t lead, char16_t trail) {
-				auto hi = lead - first_lead_surrogate;
-				auto lo = trail - first_trail_surrogate;
-				return normalizing_value + ((hi << lead_shifted_bits) | lo);
-			}
-		};
-
-		inline encoded_result<char> code_point_to_utf8(char32_t codepoint) {
-			encoded_result<char> er;
-			er.error = error_code::ok;
-			if (codepoint <= unicode_detail::last_1byte_value) {
-				er.code_units_size = 1;
-				er.code_units = std::array<char, 4>{ { static_cast<char>(codepoint) } };
-			}
-			else if (codepoint <= unicode_detail::last_2byte_value) {
-				er.code_units_size = 2;
-				er.code_units = std::array<char, 4>{{
-					static_cast<char>(0xC0 | ((codepoint & 0x7C0) >> 6)),
-					static_cast<char>(0x80 | (codepoint & 0x3F)),
-				}};
-			}
-			else if (codepoint <= unicode_detail::last_3byte_value) {
-				er.code_units_size = 3;
-				er.code_units = std::array<char, 4>{{
-					static_cast<char>(0xE0 | ((codepoint & 0xF000) >> 12)),
-					static_cast<char>(0x80 | ((codepoint & 0xFC0) >> 6)),
-					static_cast<char>(0x80 | (codepoint & 0x3F)),
-				}};
-			}
-			else {
-				er.code_units_size = 4;
-				er.code_units = std::array<char, 4>{ {
-					static_cast<char>(0xF0 | ((codepoint & 0x1C0000) >> 18)),
-						static_cast<char>(0x80 | ((codepoint & 0x3F000) >> 12)),
-						static_cast<char>(0x80 | ((codepoint & 0xFC0) >> 6)),
-						static_cast<char>(0x80 | (codepoint & 0x3F)),
-				} };
-			}
-			return er;
-		}
-
-		inline encoded_result<char16_t> code_point_to_utf16(char32_t codepoint) {
-			encoded_result<char16_t> er;
-
-			if (codepoint <= unicode_detail::last_bmp_value) {
-				er.code_units_size = 1;
-				er.code_units = std::array<char16_t, 4>{ { static_cast<char16_t>(codepoint) } };
-				er.error = error_code::ok;
-			}
-			else {
-				auto normal = codepoint - unicode_detail::normalizing_value;
-				auto lead = unicode_detail::first_lead_surrogate + ((normal & unicode_detail::lead_surrogate_bitmask) >> unicode_detail::lead_shifted_bits);
-				auto trail = unicode_detail::first_trail_surrogate + (normal & unicode_detail::trail_surrogate_bitmask);
-				er.code_units = std::array<char16_t, 4>{ {
-					static_cast<char16_t>(lead),
-					static_cast<char16_t>(trail)
-				} };
-				er.code_units_size = 2;
-				er.error = error_code::ok;
-			}
-			return er;
-		}
-
-		inline encoded_result<char32_t> code_point_to_utf32(char32_t codepoint) {
-			encoded_result<char32_t> er;
-			er.code_units_size = 1;
-			er.code_units[0] = codepoint;
-			er.error = error_code::ok;
-			return er;
-		}
-
-		template <typename It>
-		inline decoded_result<It> utf8_to_code_point(It it, It last) {
-			decoded_result<It> dr;
-			if (it == last) {
-				dr.next = it;
-				dr.error = error_code::sequence_too_short;
-				return dr;
-			}
-
-			unsigned char b0 = *it;
-			std::size_t length = unicode_detail::sequence_length(b0);
-
-			if (length == 1) {
-				dr.codepoint = static_cast<char32_t>(b0);
-				dr.error = error_code::ok;
-				++it;
-				dr.next = it;
-				return dr;
-			}
-
-			if (unicode_detail::is_invalid(b0) || unicode_detail::is_continuation(b0)) {
-				dr.error = error_code::invalid_code_unit;
-				dr.next = it;
-				return dr;
-			}
-
-			++it;
-			std::array<unsigned char, 4> b;
-			b[0] = b0;
-			for (std::size_t i = 1; i < length; ++i) {
-				b[i] = *it;
-				if (!unicode_detail::is_continuation(b[i])) {
-					dr.error = error_code::invalid_code_unit;
-					dr.next = it;
-					return dr;
-				}
-				++it;
-			}
-
-			char32_t decoded;
-			switch (length) {
-			case 2:
-				decoded = unicode_detail::decode(b[0], b[1]);
-				break;
-			case 3:
-				decoded = unicode_detail::decode(b[0], b[1], b[2]);
-				break;
-			default:
-				decoded = unicode_detail::decode(b[0], b[1], b[2], b[3]);
-				break;
-			}
-
-			if (unicode_detail::is_overlong(decoded, length)) {
-				dr.error = error_code::overlong_sequence;
-				return dr;
-			}
-			if (unicode_detail::is_surrogate(decoded) || decoded > unicode_detail::last_code_point) {
-				dr.error = error_code::invalid_code_point;
-				return dr;
-			}
-			
-			// then everything is fine
-			dr.codepoint = decoded;
-			dr.error = error_code::ok;
-			dr.next = it;
-			return dr;
-		}
-
-		template <typename It>
-		inline decoded_result<It> utf16_to_code_point(It it, It last) {
-			decoded_result<It> dr;
-			if (it == last) {
-				dr.next = it;
-				dr.error = error_code::sequence_too_short;
-				return dr;
-			}
-
-			char16_t lead = static_cast<char16_t>(*it);
-			
-			if (!unicode_detail::is_surrogate(lead)) {
-				++it;
-				dr.codepoint = static_cast<char32_t>(lead);
-				dr.next = it;
-				dr.error = error_code::ok;
-				return dr;
-			}
-			if (!unicode_detail::is_lead_surrogate(lead)) {
-				dr.error = error_code::invalid_leading_surrogate;
-				dr.next = it;
-				return dr;
-			}
-
-			++it;
-			auto trail = *it;
-			if (!unicode_detail::is_trail_surrogate(trail)) {
-				dr.error = error_code::invalid_trailing_surrogate;
-				dr.next = it;
-				return dr;
-			}
-			
-			dr.codepoint = unicode_detail::combine_surrogates(lead, trail);
-			dr.next = ++it;
-			dr.error = error_code::ok;
-			return dr;
-		}
-
-		template <typename It>
-		inline decoded_result<It> utf32_to_code_point(It it, It last) {
-			decoded_result<It> dr;
-			if (it == last) {
-				dr.next = it;
-				dr.error = error_code::sequence_too_short;
-				return dr;
-			}
-			dr.codepoint = static_cast<char32_t>(*it);
-			dr.next = ++it;
-			dr.error = error_code::ok;
-			return dr;
-		}
-	}
-}
-// end of sol/unicode.hpp
-
-#include <memory>
-#include <functional>
-#include <utility>
-#include <cstdlib>
-#include <cmath>
-#include <string_view>
-#if SOL_IS_ON(SOL_STD_VARIANT_I_)
-#include <variant>
-#endif // Apple clang screwed up
-
-namespace sol { namespace stack {
-
-	namespace stack_detail {
-		template <typename Ch>
-		struct count_code_units_utf {
-			std::size_t needed_size;
-
-			count_code_units_utf() : needed_size(0) {
-			}
-
-			void operator()(const unicode::encoded_result<Ch> er) {
-				needed_size += er.code_units_size;
-			}
-		};
-
-		template <typename Ch, typename ErCh>
-		struct copy_code_units_utf {
-			Ch* target_;
-
-			copy_code_units_utf(Ch* target) : target_(target) {
-			}
-
-			void operator()(const unicode::encoded_result<ErCh> er) {
-				std::memcpy(target_, er.code_units.data(), er.code_units_size * sizeof(ErCh));
-				target_ += er.code_units_size;
-			}
-		};
-
-		template <typename Ch, typename F>
-		inline void convert(const char* strb, const char* stre, F&& f) {
-			char32_t cp = 0;
-			for (const char* strtarget = strb; strtarget < stre;) {
-				auto dr = unicode::utf8_to_code_point(strtarget, stre);
-				if (dr.error != unicode::error_code::ok) {
-					cp = unicode::unicode_detail::replacement;
-					++strtarget;
-				}
-				else {
-					cp = dr.codepoint;
-					strtarget = dr.next;
-				}
-				if constexpr (std::is_same_v<Ch, char32_t>) {
-					auto er = unicode::code_point_to_utf32(cp);
-					f(er);
-				}
-				else {
-					auto er = unicode::code_point_to_utf16(cp);
-					f(er);
-				}
-			}
-		}
-
-		template <typename BaseCh, typename S>
-		inline S get_into(lua_State* L, int index, record& tracking) {
-			using Ch = typename S::value_type;
-			tracking.use(1);
-			size_t len;
-			auto utf8p = lua_tolstring(L, index, &len);
-			if (len < 1)
-				return S();
-			const char* strb = utf8p;
-			const char* stre = utf8p + len;
-			stack_detail::count_code_units_utf<BaseCh> count_units;
-			convert<BaseCh>(strb, stre, count_units);
-			S r(count_units.needed_size, static_cast<Ch>(0));
-			r.resize(count_units.needed_size);
-			Ch* target = &r[0];
-			stack_detail::copy_code_units_utf<Ch, BaseCh> copy_units(target);
-			convert<BaseCh>(strb, stre, copy_units);
-			return r;
-		}
-	} // namespace stack_detail
-
-	template <typename T, typename>
-	struct unqualified_getter {
-		static decltype(auto) get(lua_State* L, int index, record& tracking) {
-			if constexpr (std::is_same_v<T, bool>) {
-				tracking.use(1);
-				return lua_toboolean(L, index) != 0;
-			}
-			else if constexpr (std::is_enum_v<T>) {
-				tracking.use(1);
-				return static_cast<T>(lua_tointegerx(L, index, nullptr));
-			}
-			else if constexpr (std::is_integral_v<T> || std::is_same_v<T, lua_Integer>) {
-				tracking.use(1);
-#if SOL_LUA_VESION_I_ >= 503
-				if (lua_isinteger(L, index) != 0) {
-					return static_cast<T>(lua_tointeger(L, index));
-				}
-#endif
-				return static_cast<T>(llround(lua_tonumber(L, index)));
-			}
-			else if constexpr (std::is_floating_point_v<T> || std::is_same_v<T, lua_Number>) {
-				tracking.use(1);
-				return static_cast<T>(lua_tonumber(L, index));
-			}
-			else if constexpr (is_lua_reference_v<T>) {
-				tracking.use(1);
-				return T(L, index);
-			}
-			else if constexpr (is_unique_usertype_v<T>) {
-				using Real = typename unique_usertype_traits<T>::actual_type;
-
-				tracking.use(1);
-				void* memory = lua_touserdata(L, index);
-				memory = detail::align_usertype_unique<Real>(memory);
-				Real* mem = static_cast<Real*>(memory);
-				return *mem;
-			}
-			else if constexpr (meta::is_optional_v<T>) {
-				using ValueType = typename T::value_type;
-				return unqualified_check_getter<ValueType>::template get_using<T>(L, index, no_panic, tracking);
-			}
-			else if constexpr (std::is_same_v<T, luaL_Stream*>) {
-				luaL_Stream* pstream = static_cast<luaL_Stream*>(lua_touserdata(L, index));
-				return pstream;
-			}
-			else if constexpr (std::is_same_v<T, luaL_Stream>) {
-				luaL_Stream* pstream = static_cast<luaL_Stream*>(lua_touserdata(L, index));
-				return *pstream;
-			}
-#if SOL_IS_ON(SOL_GET_FUNCTION_POINTER_UNSAFE_I_)
-			else if constexpr (std::is_function_v<T> || (std::is_pointer_v<T> && std::is_function_v<std::remove_pointer_t<T>>)) {
-				return stack_detail::get_function_pointer<std::remove_pointer_t<T>>(L, index, tracking);
-			}
-#endif
-			else {
-				return stack_detail::unchecked_unqualified_get<detail::as_value_tag<T>>(L, index, tracking);
-			}
-		}
-	};
-
-	template <typename X, typename>
-	struct qualified_getter {
-		static decltype(auto) get(lua_State* L, int index, record& tracking) {
-			using Tu = meta::unqualified_t<X>;
-			static constexpr bool is_userdata_of_some_kind
-				= !std::is_reference_v<
-				       X> && is_container_v<Tu> && std::is_default_constructible_v<Tu> && !is_lua_primitive_v<Tu> && !is_transparent_argument_v<Tu>;
-			if constexpr (is_userdata_of_some_kind) {
-				if (type_of(L, index) == type::userdata) {
-					return static_cast<Tu>(stack_detail::unchecked_unqualified_get<Tu>(L, index, tracking));
-				}
-				else {
-					return stack_detail::unchecked_unqualified_get<sol::nested<Tu>>(L, index, tracking);
-				}
-			}
-			else if constexpr (!std::is_reference_v<X> && is_unique_usertype_v<Tu> && !is_base_rebindable_non_void_v<unique_usertype_traits<Tu>>) {
-				using u_traits = unique_usertype_traits<Tu>;
-				using T = typename u_traits::type;
-				using Real = typename u_traits::actual_type;
-				tracking.use(1);
-				void* memory = lua_touserdata(L, index);
-				memory = detail::align_usertype_unique_destructor(memory);
-				detail::unique_destructor& pdx = *static_cast<detail::unique_destructor*>(memory);
-				if (&detail::usertype_unique_alloc_destroy<T, X> == pdx) {
-					memory = detail::align_usertype_unique_tag<true, false>(memory);
-					memory = detail::align_usertype_unique<Real, true, false>(memory);
-					Real* mem = static_cast<Real*>(memory);
-					return static_cast<Real>(*mem);
-				}
-				Real r(nullptr);
-				if constexpr (!derive<T>::value) {
-					// TODO: abort / terminate, maybe only in debug modes?
-					return static_cast<Real>(std::move(r));
-				}
-				else {
-					memory = detail::align_usertype_unique_tag<true, false>(memory);
-					detail::unique_tag& ic = *reinterpret_cast<detail::unique_tag*>(memory);
-					memory = detail::align_usertype_unique<Real, true, false>(memory);
-					string_view ti = usertype_traits<T>::qualified_name();
-					int cast_operation;
-					if constexpr (is_base_rebindable_v<u_traits>) {
-						using rebind_t = typename u_traits::template rebind_base<void>;
-						string_view rebind_ti = usertype_traits<rebind_t>::qualified_name();
-						cast_operation = ic(memory, &r, ti, rebind_ti);
-					}
-					else {
-						string_view rebind_ti("");
-						cast_operation = ic(memory, &r, ti, rebind_ti);
-					}
-					switch (cast_operation) {
-					case 1: {
-						// it's a perfect match,
-						// alias memory directly
-						Real* mem = static_cast<Real*>(memory);
-						return static_cast<Real>(*mem);
-					}
-					case 2:
-						// it's a base match, return the
-						// aliased creation
-						return static_cast<Real>(std::move(r));
-					default:
-						// uh oh..
-						break;
-					}
-					// TODO: abort / terminate, maybe only in debug modes?
-					return static_cast<Real>(r);
-				}
-			}
-			else {
-				return stack_detail::unchecked_unqualified_get<Tu>(L, index, tracking);
-			}
-		}
-	};
-
-	template <typename T>
-	struct unqualified_getter<as_table_t<T>> {
-		using Tu = meta::unqualified_t<T>;
-
-		template <typename V>
-		static void push_back_at_end(std::true_type, types<V>, lua_State* L, T& cont, std::size_t) {
-			cont.push_back(stack::get<V>(L, -lua_size<V>::value));
-		}
-
-		template <typename V>
-		static void push_back_at_end(std::false_type, types<V> t, lua_State* L, T& cont, std::size_t idx) {
-			insert_at_end(meta::has_insert<Tu>(), t, L, cont, idx);
-		}
-
-		template <typename V>
-		static void insert_at_end(std::true_type, types<V>, lua_State* L, T& cont, std::size_t) {
-			using std::cend;
-			cont.insert(cend(cont), stack::get<V>(L, -lua_size<V>::value));
-		}
-
-		template <typename V>
-		static void insert_at_end(std::false_type, types<V>, lua_State* L, T& cont, std::size_t idx) {
-			cont[idx] = stack::get<V>(L, -lua_size<V>::value);
-		}
-
-		static bool max_size_check(std::false_type, T&, std::size_t) {
-			return false;
-		}
-
-		static bool max_size_check(std::true_type, T& cont, std::size_t idx) {
-			return idx >= cont.max_size();
-		}
-
-		static T get(lua_State* L, int relindex, record& tracking) {
-			return get(meta::is_associative<Tu>(), L, relindex, tracking);
-		}
-
-		static T get(std::false_type, lua_State* L, int relindex, record& tracking) {
-			typedef typename Tu::value_type V;
-			return get(types<V>(), L, relindex, tracking);
-		}
-
-		template <typename V>
-		static T get(types<V> t, lua_State* L, int relindex, record& tracking) {
-			tracking.use(1);
-
-			// the W4 flag is really great,
-			// so great that it can tell my for loops (twice nested)
-			// below never actually terminate
-			// without hitting where the gotos have infested
-
-			// so now I would get the error W4XXX unreachable
-			// me that the return cont at the end of this function
-			// which is fair until other compilers complain
-			// that there isn't a return and that based on
-			// SOME MAGICAL FORCE
-			// control flow falls off the end of a non-void function
-			// so it needs to be there for the compilers that are
-			// too flimsy to analyze the basic blocks...
-			// (I'm sure I should file a bug but those compilers are already
-			// in the wild; it doesn't matter if I fix them,
-			// someone else is still going to get some old-ass compiler
-			// and then bother me about the unclean build for the 30th
-			// time)
-
-			// "Why not an IIFE?"
-			// Because additional lambdas / functions which serve as
-			// capture-all-and-then-invoke bloat binary sizes
-			// by an actually detectable amount
-			// (one user uses sol2 pretty heavily and 22 MB of binary size
-			// was saved by reducing reliance on lambdas in templates)
-
-			// This would really be solved by having break N;
-			// be a real, proper thing...
-			// but instead, we have to use labels and gotos
-			// and earn the universal vitriol of the dogmatic
-			// programming community
-
-			// all in all: W4 is great!~
-
-			int index = lua_absindex(L, relindex);
-			T cont;
-			std::size_t idx = 0;
-#if SOL_LUA_VESION_I_ >= 503
-			// This method is HIGHLY performant over regular table iteration
-			// thanks to the Lua API changes in 5.3
-			// Questionable in 5.4
-			for (lua_Integer i = 0;; i += lua_size<V>::value) {
-				if (max_size_check(meta::has_max_size<Tu>(), cont, idx)) {
-					// see above comment
-					goto done;
-				}
-				bool isnil = false;
-				for (int vi = 0; vi < lua_size<V>::value; ++vi) {
-#if defined(LUA_NILINTABLE) && LUA_NILINTABLE && SOL_LUA_VESION_I_ >= 600
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-					luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
-#endif // make sure stack doesn't overflow
-					lua_pushinteger(L, static_cast<lua_Integer>(i + vi));
-					if (lua_keyin(L, index) == 0) {
-						// it's time to stop
-						isnil = true;
-					}
-					else {
-						// we have a key, have to get the value
-						lua_geti(L, index, i + vi);
-					}
-#else
-					type vt = static_cast<type>(lua_geti(L, index, i + vi));
-					isnil = vt == type::none || vt == type::lua_nil;
-#endif
-					if (isnil) {
-						if (i == 0) {
-							break;
-						}
-#if defined(LUA_NILINTABLE) && LUA_NILINTABLE && SOL_LUA_VESION_I_ >= 600
-						lua_pop(L, vi);
-#else
-						lua_pop(L, (vi + 1));
-#endif
-						// see above comment
-						goto done;
-					}
-				}
-				if (isnil) {
-#if defined(LUA_NILINTABLE) && LUA_NILINTABLE && SOL_LUA_VESION_I_ >= 600
-#else
-					lua_pop(L, lua_size<V>::value);
-#endif
-					continue;
-				}
-
-				push_back_at_end(meta::has_push_back<Tu>(), t, L, cont, idx);
-				++idx;
-				lua_pop(L, lua_size<V>::value);
-			}
-#else
-			// Zzzz slower but necessary thanks to the lower version API and missing functions qq
-			for (lua_Integer i = 0;; i += lua_size<V>::value, lua_pop(L, lua_size<V>::value)) {
-				if (idx >= cont.max_size()) {
-					// see above comment
-					goto done;
-				}
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-				luaL_checkstack(L, 2, detail::not_enough_stack_space_generic);
-#endif // make sure stack doesn't overflow
-				bool isnil = false;
-				for (int vi = 0; vi < lua_size<V>::value; ++vi) {
-					lua_pushinteger(L, i);
-					lua_gettable(L, index);
-					type vt = type_of(L, -1);
-					isnil = vt == type::lua_nil;
-					if (isnil) {
-						if (i == 0) {
-							break;
-						}
-						lua_pop(L, (vi + 1));
-						// see above comment
-						goto done;
-					}
-				}
-				if (isnil)
-					continue;
-				push_back_at_end(meta::has_push_back<Tu>(), t, L, cont, idx);
-				++idx;
-			}
-#endif
-		done:
-			return cont;
-		}
-
-		static T get(std::true_type, lua_State* L, int index, record& tracking) {
-			typedef typename Tu::value_type P;
-			typedef typename P::first_type K;
-			typedef typename P::second_type V;
-			return get(types<K, V>(), L, index, tracking);
-		}
-
-		template <typename K, typename V>
-		static T get(types<K, V>, lua_State* L, int relindex, record& tracking) {
-			tracking.use(1);
-
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-			luaL_checkstack(L, 3, detail::not_enough_stack_space_generic);
-#endif // make sure stack doesn't overflow
-
-			T associative;
-			int index = lua_absindex(L, relindex);
-			lua_pushnil(L);
-			while (lua_next(L, index) != 0) {
-				decltype(auto) key = stack::check_get<K>(L, -2);
-				if (!key) {
-					lua_pop(L, 1);
-					continue;
-				}
-				associative.emplace(std::forward<decltype(*key)>(*key), stack::get<V>(L, -1));
-				lua_pop(L, 1);
-			}
-			return associative;
-		}
-	};
-
-	template <typename T, typename Al>
-	struct unqualified_getter<as_table_t<std::forward_list<T, Al>>> {
-		typedef std::forward_list<T, Al> C;
-
-		static C get(lua_State* L, int relindex, record& tracking) {
-			return get(meta::has_key_value_pair<C>(), L, relindex, tracking);
-		}
-
-		static C get(std::true_type, lua_State* L, int index, record& tracking) {
-			typedef typename T::value_type P;
-			typedef typename P::first_type K;
-			typedef typename P::second_type V;
-			return get(types<K, V>(), L, index, tracking);
-		}
-
-		static C get(std::false_type, lua_State* L, int relindex, record& tracking) {
-			typedef typename C::value_type V;
-			return get(types<V>(), L, relindex, tracking);
-		}
-
-		template <typename V>
-		static C get(types<V>, lua_State* L, int relindex, record& tracking) {
-			tracking.use(1);
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-			luaL_checkstack(L, 3, detail::not_enough_stack_space_generic);
-#endif // make sure stack doesn't overflow
-
-			int index = lua_absindex(L, relindex);
-			C cont;
-			auto at = cont.cbefore_begin();
-			std::size_t idx = 0;
-#if SOL_LUA_VESION_I_ >= 503
-			// This method is HIGHLY performant over regular table iteration thanks to the Lua API changes in 5.3
-			for (lua_Integer i = 0;; i += lua_size<V>::value, lua_pop(L, lua_size<V>::value)) {
-				if (idx >= cont.max_size()) {
-					goto done;
-				}
-				bool isnil = false;
-				for (int vi = 0; vi < lua_size<V>::value; ++vi) {
-					type t = static_cast<type>(lua_geti(L, index, i + vi));
-					isnil = t == type::lua_nil;
-					if (isnil) {
-						if (i == 0) {
-							break;
-						}
-						lua_pop(L, (vi + 1));
-						goto done;
-					}
-				}
-				if (isnil)
-					continue;
-				at = cont.insert_after(at, stack::get<V>(L, -lua_size<V>::value));
-				++idx;
-			}
-#else
-			// Zzzz slower but necessary thanks to the lower version API and missing functions qq
-			for (lua_Integer i = 0;; i += lua_size<V>::value, lua_pop(L, lua_size<V>::value)) {
-				if (idx >= cont.max_size()) {
-					goto done;
-				}
-				bool isnil = false;
-				for (int vi = 0; vi < lua_size<V>::value; ++vi) {
-					lua_pushinteger(L, i);
-					lua_gettable(L, index);
-					type t = type_of(L, -1);
-					isnil = t == type::lua_nil;
-					if (isnil) {
-						if (i == 0) {
-							break;
-						}
-						lua_pop(L, (vi + 1));
-						goto done;
-					}
-				}
-				if (isnil)
-					continue;
-				at = cont.insert_after(at, stack::get<V>(L, -lua_size<V>::value));
-				++idx;
-			}
-#endif
-		done:
-			return cont;
-		}
-
-		template <typename K, typename V>
-		static C get(types<K, V>, lua_State* L, int relindex, record& tracking) {
-			tracking.use(1);
-
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-			luaL_checkstack(L, 3, detail::not_enough_stack_space_generic);
-#endif // make sure stack doesn't overflow
-
-			C associative;
-			auto at = associative.cbefore_begin();
-			int index = lua_absindex(L, relindex);
-			lua_pushnil(L);
-			while (lua_next(L, index) != 0) {
-				decltype(auto) key = stack::check_get<K>(L, -2);
-				if (!key) {
-					lua_pop(L, 1);
-					continue;
-				}
-				at = associative.emplace_after(at, std::forward<decltype(*key)>(*key), stack::get<V>(L, -1));
-				lua_pop(L, 1);
-			}
-			return associative;
-		}
-	};
-
-	template <typename T>
-	struct unqualified_getter<nested<T>> {
-		static T get(lua_State* L, int index, record& tracking) {
-			using Tu = meta::unqualified_t<T>;
-			if constexpr (is_container_v<Tu>) {
-				if constexpr (meta::is_associative<Tu>::value) {
-					typedef typename T::value_type P;
-					typedef typename P::first_type K;
-					typedef typename P::second_type V;
-					unqualified_getter<as_table_t<T>> g;
-					// VC++ has a bad warning here: shut it up
-					(void)g;
-					return g.get(types<K, nested<V>>(), L, index, tracking);
-				}
-				else {
-					typedef typename T::value_type V;
-					unqualified_getter<as_table_t<T>> g;
-					// VC++ has a bad warning here: shut it up
-					(void)g;
-					return g.get(types<nested<V>>(), L, index, tracking);
-				}
-			}
-			else {
-				unqualified_getter<Tu> g;
-				// VC++ has a bad warning here: shut it up
-				(void)g;
-				return g.get(L, index, tracking);
-			}
-		}
-	};
-
-	template <typename T>
-	struct unqualified_getter<as_container_t<T>> {
-		static decltype(auto) get(lua_State* L, int index, record& tracking) {
-			return stack::unqualified_get<T>(L, index, tracking);
-		}
-	};
-
-	template <typename T>
-	struct unqualified_getter<as_container_t<T>*> {
-		static decltype(auto) get(lua_State* L, int index, record& tracking) {
-			return stack::unqualified_get<T*>(L, index, tracking);
-		}
-	};
-
-	template <>
-	struct unqualified_getter<userdata_value> {
-		static userdata_value get(lua_State* L, int index, record& tracking) {
-			tracking.use(1);
-			return userdata_value(lua_touserdata(L, index));
-		}
-	};
-
-	template <>
-	struct unqualified_getter<lightuserdata_value> {
-		static lightuserdata_value get(lua_State* L, int index, record& tracking) {
-			tracking.use(1);
-			return lightuserdata_value(lua_touserdata(L, index));
-		}
-	};
-
-	template <typename T>
-	struct unqualified_getter<light<T>> {
-		static light<T> get(lua_State* L, int index, record& tracking) {
-			tracking.use(1);
-			void* memory = lua_touserdata(L, index);
-			return light<T>(static_cast<T*>(memory));
-		}
-	};
-
-	template <typename T>
-	struct unqualified_getter<user<T>> {
-		static std::add_lvalue_reference_t<T> get(lua_State* L, int index, record& tracking) {
-			tracking.use(1);
-			void* memory = lua_touserdata(L, index);
-			memory = detail::align_user<T>(memory);
-			return *static_cast<std::remove_reference_t<T>*>(memory);
-		}
-	};
-
-	template <typename T>
-	struct unqualified_getter<user<T*>> {
-		static T* get(lua_State* L, int index, record& tracking) {
-			tracking.use(1);
-			void* memory = lua_touserdata(L, index);
-			memory = detail::align_user<T*>(memory);
-			return static_cast<T*>(memory);
-		}
-	};
-
-	template <>
-	struct unqualified_getter<type> {
-		static type get(lua_State* L, int index, record& tracking) {
-			tracking.use(1);
-			return static_cast<type>(lua_type(L, index));
-		}
-	};
-
-	template <>
-	struct unqualified_getter<std::string> {
-		static std::string get(lua_State* L, int index, record& tracking) {
-			tracking.use(1);
-			std::size_t len;
-			auto str = lua_tolstring(L, index, &len);
-			return std::string(str, len);
-		}
-	};
-
-	template <>
-	struct unqualified_getter<const char*> {
-		static const char* get(lua_State* L, int index, record& tracking) {
-			tracking.use(1);
-			size_t sz;
-			return lua_tolstring(L, index, &sz);
-		}
-	};
-
-	template <>
-	struct unqualified_getter<char> {
-		static char get(lua_State* L, int index, record& tracking) {
-			tracking.use(1);
-			size_t len;
-			auto str = lua_tolstring(L, index, &len);
-			return len > 0 ? str[0] : '\0';
-		}
-	};
-
-	template <typename Traits>
-	struct unqualified_getter<basic_string_view<char, Traits>> {
-		static string_view get(lua_State* L, int index, record& tracking) {
-			tracking.use(1);
-			size_t sz;
-			const char* str = lua_tolstring(L, index, &sz);
-			return basic_string_view<char, Traits>(str, sz);
-		}
-	};
-
-	template <typename Traits, typename Al>
-	struct unqualified_getter<std::basic_string<wchar_t, Traits, Al>> {
-		using S = std::basic_string<wchar_t, Traits, Al>;
-		static S get(lua_State* L, int index, record& tracking) {
-			using Ch = meta::conditional_t<sizeof(wchar_t) == 2, char16_t, char32_t>;
-			return stack_detail::get_into<Ch, S>(L, index, tracking);
-		}
-	};
-
-	template <typename Traits, typename Al>
-	struct unqualified_getter<std::basic_string<char16_t, Traits, Al>> {
-		static std::basic_string<char16_t, Traits, Al> get(lua_State* L, int index, record& tracking) {
-			return stack_detail::get_into<char16_t, std::basic_string<char16_t, Traits, Al>>(L, index, tracking);
-		}
-	};
-
-	template <typename Traits, typename Al>
-	struct unqualified_getter<std::basic_string<char32_t, Traits, Al>> {
-		static std::basic_string<char32_t, Traits, Al> get(lua_State* L, int index, record& tracking) {
-			return stack_detail::get_into<char32_t, std::basic_string<char32_t, Traits, Al>>(L, index, tracking);
-		}
-	};
-
-	template <>
-	struct unqualified_getter<char16_t> {
-		static char16_t get(lua_State* L, int index, record& tracking) {
-			string_view utf8 = stack::get<string_view>(L, index, tracking);
-			const char* strb = utf8.data();
-			const char* stre = utf8.data() + utf8.size();
-			char32_t cp = 0;
-			auto dr = unicode::utf8_to_code_point(strb, stre);
-			if (dr.error != unicode::error_code::ok) {
-				cp = unicode::unicode_detail::replacement;
-			}
-			else {
-				cp = dr.codepoint;
-			}
-			auto er = unicode::code_point_to_utf16(cp);
-			return er.code_units[0];
-		}
-	};
-
-	template <>
-	struct unqualified_getter<char32_t> {
-		static char32_t get(lua_State* L, int index, record& tracking) {
-			string_view utf8 = stack::get<string_view>(L, index, tracking);
-			const char* strb = utf8.data();
-			const char* stre = utf8.data() + utf8.size();
-			char32_t cp = 0;
-			auto dr = unicode::utf8_to_code_point(strb, stre);
-			if (dr.error != unicode::error_code::ok) {
-				cp = unicode::unicode_detail::replacement;
-			}
-			else {
-				cp = dr.codepoint;
-			}
-			auto er = unicode::code_point_to_utf32(cp);
-			return er.code_units[0];
-		}
-	};
-
-	template <>
-	struct unqualified_getter<wchar_t> {
-		static wchar_t get(lua_State* L, int index, record& tracking) {
-			typedef meta::conditional_t<sizeof(wchar_t) == 2, char16_t, char32_t> Ch;
-			unqualified_getter<Ch> g;
-			(void)g;
-			auto c = g.get(L, index, tracking);
-			return static_cast<wchar_t>(c);
-		}
-	};
-
-	template <>
-	struct unqualified_getter<meta_function> {
-		static meta_function get(lua_State* L, int index, record& tracking) {
-			tracking.use(1);
-			const char* name = unqualified_getter<const char*> {}.get(L, index, tracking);
-			const auto& mfnames = meta_function_names();
-			for (std::size_t i = 0; i < mfnames.size(); ++i)
-				if (mfnames[i] == name)
-					return static_cast<meta_function>(i);
-			return meta_function::construct;
-		}
-	};
-
-	template <>
-	struct unqualified_getter<lua_nil_t> {
-		static lua_nil_t get(lua_State*, int, record& tracking) {
-			tracking.use(1);
-			return lua_nil;
-		}
-	};
-
-	template <>
-	struct unqualified_getter<std::nullptr_t> {
-		static std::nullptr_t get(lua_State*, int, record& tracking) {
-			tracking.use(1);
-			return nullptr;
-		}
-	};
-
-	template <>
-	struct unqualified_getter<nullopt_t> {
-		static nullopt_t get(lua_State*, int, record& tracking) {
-			tracking.use(1);
-			return nullopt;
-		}
-	};
-
-	template <>
-	struct unqualified_getter<this_state> {
-		static this_state get(lua_State* L, int, record& tracking) {
-			tracking.use(0);
-			return this_state(L);
-		}
-	};
-
-	template <>
-	struct unqualified_getter<this_main_state> {
-		static this_main_state get(lua_State* L, int, record& tracking) {
-			tracking.use(0);
-			return this_main_state(main_thread(L, L));
-		}
-	};
-
-	template <>
-	struct unqualified_getter<lua_CFunction> {
-		static lua_CFunction get(lua_State* L, int index, record& tracking) {
-			tracking.use(1);
-			return lua_tocfunction(L, index);
-		}
-	};
-
-	template <>
-	struct unqualified_getter<c_closure> {
-		static c_closure get(lua_State* L, int index, record& tracking) {
-			tracking.use(1);
-			return c_closure(lua_tocfunction(L, index), -1);
-		}
-	};
-
-	template <>
-	struct unqualified_getter<error> {
-		static error get(lua_State* L, int index, record& tracking) {
-			tracking.use(1);
-			size_t sz = 0;
-			const char* err = lua_tolstring(L, index, &sz);
-			if (err == nullptr) {
-				return error(detail::direct_error, "");
-			}
-			return error(detail::direct_error, std::string(err, sz));
-		}
-	};
-
-	template <>
-	struct unqualified_getter<void*> {
-		static void* get(lua_State* L, int index, record& tracking) {
-			tracking.use(1);
-			return lua_touserdata(L, index);
-		}
-	};
-
-	template <>
-	struct unqualified_getter<const void*> {
-		static const void* get(lua_State* L, int index, record& tracking) {
-			tracking.use(1);
-			return lua_touserdata(L, index);
-		}
-	};
-
-	template <typename T>
-	struct unqualified_getter<detail::as_value_tag<T>> {
-		static T* get_no_lua_nil(lua_State* L, int index, record& tracking) {
-			void* memory = lua_touserdata(L, index);
-#if SOL_IS_ON(SOL_USE_INTEROP_I_)
-			auto ugr = stack_detail::interop_get<T>(L, index, memory, tracking);
-			if (ugr.first) {
-				return ugr.second;
-			}
-#endif // interop extensibility
-			tracking.use(1);
-			void* rawdata = detail::align_usertype_pointer(memory);
-			void** pudata = static_cast<void**>(rawdata);
-			void* udata = *pudata;
-			return get_no_lua_nil_from(L, udata, index, tracking);
-		}
-
-		static T* get_no_lua_nil_from(lua_State* L, void* udata, int index, record&) {
-			bool has_derived = derive<T>::value || weak_derive<T>::value;
-			if (has_derived) {
-				if (lua_getmetatable(L, index) == 1) {
-					lua_getfield(L, -1, &detail::base_class_cast_key()[0]);
-					if (type_of(L, -1) != type::lua_nil) {
-						void* basecastdata = lua_touserdata(L, -1);
-						detail::inheritance_cast_function ic = reinterpret_cast<detail::inheritance_cast_function>(basecastdata);
-						// use the casting function to properly adjust the pointer for the desired T
-						udata = ic(udata, usertype_traits<T>::qualified_name());
-					}
-					lua_pop(L, 2);
-				}
-			}
-			T* obj = static_cast<T*>(udata);
-			return obj;
-		}
-
-		static T& get(lua_State* L, int index, record& tracking) {
-			return *get_no_lua_nil(L, index, tracking);
-		}
-	};
-
-	template <typename T>
-	struct unqualified_getter<detail::as_pointer_tag<T>> {
-		static T* get(lua_State* L, int index, record& tracking) {
-			type t = type_of(L, index);
-			if (t == type::lua_nil) {
-				tracking.use(1);
-				return nullptr;
-			}
-			unqualified_getter<detail::as_value_tag<T>> g;
-			// Avoid VC++ warning
-			(void)g;
-			return g.get_no_lua_nil(L, index, tracking);
-		}
-	};
-
-	template <typename T>
-	struct unqualified_getter<non_null<T*>> {
-		static T* get(lua_State* L, int index, record& tracking) {
-			unqualified_getter<detail::as_value_tag<T>> g;
-			// Avoid VC++ warning
-			(void)g;
-			return g.get_no_lua_nil(L, index, tracking);
-		}
-	};
-
-	template <typename T>
-	struct unqualified_getter<T&> {
-		static T& get(lua_State* L, int index, record& tracking) {
-			unqualified_getter<detail::as_value_tag<T>> g;
-			// Avoid VC++ warning
-			(void)g;
-			return g.get(L, index, tracking);
-		}
-	};
-
-	template <typename T>
-	struct unqualified_getter<std::reference_wrapper<T>> {
-		static T& get(lua_State* L, int index, record& tracking) {
-			unqualified_getter<T&> g;
-			// Avoid VC++ warning
-			(void)g;
-			return g.get(L, index, tracking);
-		}
-	};
-
-	template <typename T>
-	struct unqualified_getter<T*> {
-		static T* get(lua_State* L, int index, record& tracking) {
-#if SOL_IS_ON(SOL_GET_FUNCTION_POINTER_UNSAFE_I_)
-			if constexpr (std::is_function_v<T>) {
-				return stack_detail::get_function_pointer<T>(L, index, tracking);
-			}
-			else {
-				unqualified_getter<detail::as_pointer_tag<T>> g;
-				// Avoid VC++ warning
-				(void)g;
-				return g.get(L, index, tracking);
-			}
-#else
-			unqualified_getter<detail::as_pointer_tag<T>> g;
-			// Avoid VC++ warning
-			(void)g;
-			return g.get(L, index, tracking);
-#endif
-		}
-	};
-
-	template <typename... Tn>
-	struct unqualified_getter<std::tuple<Tn...>> {
-		typedef std::tuple<decltype(stack::get<Tn>(nullptr, 0))...> R;
-
-		template <typename... Args>
-		static R apply(std::index_sequence<>, lua_State*, int, record&, Args&&... args) {
-			// Fuck you too, VC++
-			return R { std::forward<Args>(args)... };
-		}
-
-		template <std::size_t I, std::size_t... Ix, typename... Args>
-		static R apply(std::index_sequence<I, Ix...>, lua_State* L, int index, record& tracking, Args&&... args) {
-			// Fuck you too, VC++
-			typedef std::tuple_element_t<I, std::tuple<Tn...>> T;
-			return apply(std::index_sequence<Ix...>(), L, index, tracking, std::forward<Args>(args)..., stack::get<T>(L, index + tracking.used, tracking));
-		}
-
-		static R get(lua_State* L, int index, record& tracking) {
-			return apply(std::make_index_sequence<sizeof...(Tn)>(), L, index, tracking);
-		}
-	};
-
-	template <typename A, typename B>
-	struct unqualified_getter<std::pair<A, B>> {
-		static decltype(auto) get(lua_State* L, int index, record& tracking) {
-			return std::pair<decltype(stack::get<A>(L, index)), decltype(stack::get<B>(L, index))> { stack::get<A>(L, index, tracking),
-				stack::get<B>(L, index + tracking.used, tracking) };
-		}
-	};
-
-#if SOL_IS_ON(SOL_STD_VARIANT_I_)
-
-	template <typename... Tn>
-	struct unqualified_getter<std::variant<Tn...>> {
-		using V = std::variant<Tn...>;
-
-		static V get_one(std::integral_constant<std::size_t, std::variant_size_v<V>>, lua_State* L, int index, record& tracking) {
-			(void)L;
-			(void)index;
-			(void)tracking;
-			if constexpr (std::variant_size_v<V> == 0) {
-				return V();
-			}
-			else {
-				// using T = std::variant_alternative_t<0, V>;
-				std::abort();
-				// return V(std::in_place_index<0>, stack::get<T>(L, index, tracking));
-			}
-		}
-
-		template <std::size_t I>
-		static V get_one(std::integral_constant<std::size_t, I>, lua_State* L, int index, record& tracking) {
-			typedef std::variant_alternative_t<I, V> T;
-			record temp_tracking = tracking;
-			if (stack::check<T>(L, index, no_panic, temp_tracking)) {
-				tracking = temp_tracking;
-				return V(std::in_place_index<I>, stack::get<T>(L, index));
-			}
-			return get_one(std::integral_constant<std::size_t, I + 1>(), L, index, tracking);
-		}
-
-		static V get(lua_State* L, int index, record& tracking) {
-			return get_one(std::integral_constant<std::size_t, 0>(), L, index, tracking);
-		}
-	};
-#endif // variant
-
-}} // namespace sol::stack
-
-// end of sol/stack_get_unqualified.hpp
-
-// beginning of sol/stack_get_qualified.hpp
-
-namespace sol {
-namespace stack {
-
-	// There are no more enable_ifs that can be used here,
-	// so this is just for posterity, I guess?
-	// maybe I'll fill this file in later.
-
-}
-} // namespace sol::stack
-
-// end of sol/stack_get_qualified.hpp
-
-// end of sol/stack_get.hpp
-
-// beginning of sol/stack_check_get.hpp
-
-// beginning of sol/stack_check_get_unqualified.hpp
-
-#include <cstdlib>
-#include <cmath>
-#include <optional>
-#if SOL_IS_ON(SOL_STD_VARIANT_I_)
-#include <variant>
-#endif // variant shenanigans (thanks, Mac OSX)
-
-namespace sol { namespace stack {
-	template <typename T, typename>
-	struct unqualified_check_getter {
-		typedef decltype(stack_detail::unchecked_unqualified_get<T>(nullptr, -1, std::declval<record&>())) R;
-
-		template <typename Optional, typename Handler>
-		static Optional get_using(lua_State* L, int index, Handler&& handler, record& tracking) {
-			if constexpr (!meta::meta_detail::is_adl_sol_lua_check_v<T> && !meta::meta_detail::is_adl_sol_lua_get_v<T>) {
-				if constexpr (is_lua_reference_v<T>) {
-					// actually check if it's none here, otherwise
-					// we'll have a none object inside an optional!
-					bool success = lua_isnoneornil(L, index) == 0 && stack::check<T>(L, index, no_panic);
-					if (!success) {
-						// expected type, actual type
-						tracking.use(static_cast<int>(success));
-						handler(L, index, type::poly, type_of(L, index), "");
-						return detail::associated_nullopt_v<Optional>;
-					}
-					return stack_detail::unchecked_get<T>(L, index, tracking);
-				}
-				else if constexpr ((std::is_integral_v<T> || std::is_same_v<T, lua_Integer>)&&!std::is_same_v<T, bool>) {
-#if SOL_LUA_VESION_I_ >= 503
-					if (lua_isinteger(L, index) != 0) {
-						tracking.use(1);
-						return static_cast<T>(lua_tointeger(L, index));
-					}
-#endif
-					int isnum = 0;
-					const lua_Number value = lua_tonumberx(L, index, &isnum);
-					if (isnum != 0) {
-#if SOL_IS_ON(SOL_NUMBER_PRECISION_CHECKS_I_)
-						const auto integer_value = llround(value);
-						if (static_cast<lua_Number>(integer_value) == value) {
-							tracking.use(1);
-							return static_cast<T>(integer_value);
-						}
-#else
-						tracking.use(1);
-						return static_cast<T>(value);
-#endif
-					}
-					const type t = type_of(L, index);
-					tracking.use(static_cast<int>(t != type::none));
-					handler(L, index, type::number, t, "not an integer");
-					return detail::associated_nullopt_v<Optional>;
-				}
-				else if constexpr (std::is_floating_point_v<T> || std::is_same_v<T, lua_Number>) {
-					int isnum = 0;
-					lua_Number value = lua_tonumberx(L, index, &isnum);
-					if (isnum == 0) {
-						type t = type_of(L, index);
-						tracking.use(static_cast<int>(t != type::none));
-						handler(L, index, type::number, t, "not a valid floating point number");
-						return detail::associated_nullopt_v<Optional>;
-					}
-					tracking.use(1);
-					return static_cast<T>(value);
-				}
-				else if constexpr (std::is_enum_v<T> && !meta::any_same_v<T, meta_function, type>) {
-					int isnum = 0;
-					lua_Integer value = lua_tointegerx(L, index, &isnum);
-					if (isnum == 0) {
-						type t = type_of(L, index);
-						tracking.use(static_cast<int>(t != type::none));
-						handler(L, index, type::number, t, "not a valid enumeration value");
-						return detail::associated_nullopt_v<Optional>;
-					}
-					tracking.use(1);
-					return static_cast<T>(value);
-				}
-				else {
-					if (!unqualified_check<T>(L, index, std::forward<Handler>(handler))) {
-						tracking.use(static_cast<int>(!lua_isnone(L, index)));
-						return detail::associated_nullopt_v<Optional>;
-					}
-					return stack_detail::unchecked_unqualified_get<T>(L, index, tracking);
-				}
-			}
-			else {
-				if (!unqualified_check<T>(L, index, std::forward<Handler>(handler))) {
-					tracking.use(static_cast<int>(!lua_isnone(L, index)));
-					return detail::associated_nullopt_v<Optional>;
-				}
-				return stack_detail::unchecked_unqualified_get<T>(L, index, tracking);
-			}
-		}
-
-		template <typename Handler>
-		static optional<R> get(lua_State* L, int index, Handler&& handler, record& tracking) {
-			return get_using<optional<R>>(L, index, std::forward<Handler>(handler), tracking);
-		}
-	};
-
-#if SOL_IS_ON(SOL_STD_VARIANT_I_)
-	template <typename... Tn, typename C>
-	struct unqualified_check_getter<std::variant<Tn...>, C> {
-		typedef std::variant<Tn...> V;
-		typedef std::variant_size<V> V_size;
-		typedef std::integral_constant<bool, V_size::value == 0> V_is_empty;
-
-		template <typename Handler>
-		static optional<V> get_empty(std::true_type, lua_State*, int, Handler&&, record&) {
-			return nullopt;
-		}
-
-		template <typename Handler>
-		static optional<V> get_empty(std::false_type, lua_State* L, int index, Handler&& handler, record&) {
-			// This should never be reached...
-			// please check your code and understand what you did to bring yourself here
-			// maybe file a bug report, or 5
-			handler(
-				L, index, type::poly, type_of(L, index), "this variant code should never be reached: if it has, you have done something so terribly wrong");
-			return nullopt;
-		}
-
-		template <typename Handler>
-		static optional<V> get_one(std::integral_constant<std::size_t, 0>, lua_State* L, int index, Handler&& handler, record& tracking) {
-			return get_empty(V_is_empty(), L, index, std::forward<Handler>(handler), tracking);
-		}
-
-		template <std::size_t I, typename Handler>
-		static optional<V> get_one(std::integral_constant<std::size_t, I>, lua_State* L, int index, Handler&& handler, record& tracking) {
-			typedef std::variant_alternative_t<I - 1, V> T;
-			if (stack::check<T>(L, index, no_panic, tracking)) {
-				return V(std::in_place_index<I - 1>, stack::get<T>(L, index));
-			}
-			return get_one(std::integral_constant<std::size_t, I - 1>(), L, index, std::forward<Handler>(handler), tracking);
-		}
-
-		template <typename Handler>
-		static optional<V> get(lua_State* L, int index, Handler&& handler, record& tracking) {
-			return get_one(std::integral_constant<std::size_t, V_size::value>(), L, index, std::forward<Handler>(handler), tracking);
-		}
-	};
-#endif // standard variant
-}}     // namespace sol::stack
-
-// end of sol/stack_check_get_unqualified.hpp
-
-// beginning of sol/stack_check_get_qualified.hpp
-
-namespace sol { namespace stack {
-	template <typename T, typename C>
-	struct qualified_check_getter {
-		typedef decltype(stack_detail::unchecked_get<T>(nullptr, -1, std::declval<record&>())) R;
-
-		template <typename Handler>
-		static optional<R> get(lua_State* L, int index, Handler&& handler, record& tracking) {
-			if constexpr (is_lua_reference_v<T>) {
-				// actually check if it's none here, otherwise
-				// we'll have a none object inside an optional!
-				bool success = lua_isnoneornil(L, index) == 0 && stack::check<T>(L, index, no_panic);
-				if (!success) {
-					// expected type, actual type
-					tracking.use(static_cast<int>(success));
-					handler(L, index, type::poly, type_of(L, index), "");
-					return nullopt;
-				}
-				return stack_detail::unchecked_get<T>(L, index, tracking);
-			}
-			else {
-				if (!check<T>(L, index, std::forward<Handler>(handler))) {
-					tracking.use(static_cast<int>(!lua_isnone(L, index)));
-					return nullopt;
-				}
-				return stack_detail::unchecked_get<T>(L, index, tracking);
-			}
-		}
-	};
-
-	template <typename T>
-	struct qualified_getter<T, std::enable_if_t<meta::is_optional_v<T>>> {
-		static T get(lua_State* L, int index, record& tracking) {
-			using ValueType = typename meta::unqualified_t<T>::value_type;
-			if constexpr (is_lua_reference_v<ValueType>) {
-				// actually check if it's none here, otherwise
-				// we'll have a none object inside an optional!
-				bool success = lua_isnoneornil(L, index) == 0 && stack::check<ValueType>(L, index, no_panic);
-				if (!success) {
-					// expected type, actual type
-					tracking.use(static_cast<int>(success));
-					return {};
-				}
-				return stack_detail::unchecked_get<ValueType>(L, index, tracking);
-			}
-			else {
-				if (!check<ValueType>(L, index, &no_panic)) {
-					tracking.use(static_cast<int>(!lua_isnone(L, index)));
-					return {};
-				}
-				return stack_detail::unchecked_get<ValueType>(L, index, tracking);
-			}
-		}
-	};
-
-}} // namespace sol::stack
-
-// end of sol/stack_check_get_qualified.hpp
-
-// end of sol/stack_check_get.hpp
-
-// beginning of sol/stack_push.hpp
-
-#include <memory>
-#include <type_traits>
-#include <cassert>
-#include <limits>
-#include <cmath>
-#include <string_view>
-#if SOL_IS_ON(SOL_STD_VARIANT_I_)
-#include <variant>
-#endif // Can use variant
-
-namespace sol { namespace stack {
-	namespace stack_detail {
-		template <typename T>
-		inline bool integer_value_fits(const T& value) {
-			if constexpr (sizeof(T) < sizeof(lua_Integer) || (std::is_signed_v<T> && sizeof(T) == sizeof(lua_Integer))) {
-				(void)value;
-				return true;
-			}
-			else {
-				auto u_min = static_cast<std::intmax_t>((std::numeric_limits<lua_Integer>::min)());
-				auto u_max = static_cast<std::uintmax_t>((std::numeric_limits<lua_Integer>::max)());
-				auto t_min = static_cast<std::intmax_t>((std::numeric_limits<T>::min)());
-				auto t_max = static_cast<std::uintmax_t>((std::numeric_limits<T>::max)());
-				return (u_min <= t_min || value >= static_cast<T>(u_min)) && (u_max >= t_max || value <= static_cast<T>(u_max));
-			}
-		}
-
-		template <typename T>
-		int msvc_is_ass_with_if_constexpr_push_enum(std::true_type, lua_State* L, const T& value) {
-			if constexpr (meta::any_same_v<std::underlying_type_t<T>, char /*, char8_t*/, char16_t, char32_t>) {
-				if constexpr (std::is_signed_v<T>) {
-					return stack::push(L, static_cast<std::int_least32_t>(value));
-				}
-				else {
-					return stack::push(L, static_cast<std::uint_least32_t>(value));
-				}
-			}
-			else {
-				return stack::push(L, static_cast<std::underlying_type_t<T>>(value));
-			}
-		}
-
-		template <typename T>
-		int msvc_is_ass_with_if_constexpr_push_enum(std::false_type, lua_State*, const T&) {
-			return 0;
-		}
-	} // namespace stack_detail
-
-	inline int push_environment_of(lua_State* L, int index = -1) {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-		luaL_checkstack(L, 1, detail::not_enough_stack_space_environment);
-#endif // make sure stack doesn't overflow
-#if SOL_LUA_VESION_I_ < 502
-		// Use lua_getfenv
-		lua_getfenv(L, index);
-#else
-		// Use upvalues as explained in Lua 5.2 and beyond's manual
-		if (lua_getupvalue(L, index, 1) == nullptr) {
-			push(L, lua_nil);
-			return 1;
-		}
-#endif
-		return 1;
-	}
-
-	template <typename T>
-	int push_environment_of(const T& target) {
-		target.push();
-		return push_environment_of(target.lua_state(), -1) + 1;
-	}
-
-	template <typename T>
-	struct unqualified_pusher<detail::as_value_tag<T>> {
-		template <typename F, typename... Args>
-		static int push_fx(lua_State* L, F&& f, Args&&... args) {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-			luaL_checkstack(L, 1, detail::not_enough_stack_space_userdata);
-#endif // make sure stack doesn't overflow
-       // Basically, we store all user-data like this:
-       // If it's a movable/copyable value (no std::ref(x)), then we store the pointer to the new
-       // data in the first sizeof(T*) bytes, and then however many bytes it takes to
-       // do the actual object. Things that are std::ref or plain T* are stored as
-       // just the sizeof(T*), and nothing else.
-			T* obj = detail::usertype_allocate<T>(L);
-			f();
-			std::allocator<T> alloc {};
-			std::allocator_traits<std::allocator<T>>::construct(alloc, obj, std::forward<Args>(args)...);
-			return 1;
-		}
-
-		template <typename K, typename... Args>
-		static int push_keyed(lua_State* L, K&& k, Args&&... args) {
-			stack_detail::undefined_metatable fx(L, &k[0], &stack::stack_detail::set_undefined_methods_on<T>);
-			return push_fx(L, fx, std::forward<Args>(args)...);
-		}
-
-		template <typename Arg, typename... Args>
-		static int push(lua_State* L, Arg&& arg, Args&&... args) {
-			if constexpr (std::is_same_v<meta::unqualified_t<Arg>, detail::with_function_tag>) {
-				(void)arg;
-				return push_fx(L, std::forward<Args>(args)...);
-			}
-			else {
-				return push_keyed(L, usertype_traits<T>::metatable(), std::forward<Arg>(arg), std::forward<Args>(args)...);
-			}
-		}
-
-		static int push(lua_State* L) {
-			return push_keyed(L, usertype_traits<T>::metatable());
-		}
-	};
-
-	template <typename T>
-	struct unqualified_pusher<detail::as_pointer_tag<T>> {
-		typedef meta::unqualified_t<T> U;
-
-		template <typename F>
-		static int push_fx(lua_State* L, F&& f, T* obj) {
-			if (obj == nullptr)
-				return stack::push(L, lua_nil);
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-			luaL_checkstack(L, 1, detail::not_enough_stack_space_userdata);
-#endif // make sure stack doesn't overflow
-			T** pref = detail::usertype_allocate_pointer<T>(L);
-			f();
-			*pref = obj;
-			return 1;
-		}
-
-		template <typename K>
-		static int push_keyed(lua_State* L, K&& k, T* obj) {
-			stack_detail::undefined_metatable fx(L, &k[0], &stack::stack_detail::set_undefined_methods_on<U*>);
-			return push_fx(L, fx, obj);
-		}
-
-		template <typename Arg, typename... Args>
-		static int push(lua_State* L, Arg&& arg, Args&&... args) {
-			if constexpr (std::is_same_v<meta::unqualified_t<Arg>, detail::with_function_tag>) {
-				(void)arg;
-				return push_fx(L, std::forward<Args>(args)...);
-			}
-			else {
-				return push_keyed(L, usertype_traits<U*>::metatable(), std::forward<Arg>(arg), std::forward<Args>(args)...);
-			}
-		}
-	};
-
-	template <>
-	struct unqualified_pusher<detail::as_reference_tag> {
-		template <typename T>
-		static int push(lua_State* L, T&& obj) {
-			return stack::push(L, detail::ptr(obj));
-		}
-	};
-
-	namespace stack_detail {
-		template <typename T>
-		struct uu_pusher {
-			using u_traits = unique_usertype_traits<T>;
-			using P = typename u_traits::type;
-			using Real = typename u_traits::actual_type;
-
-			template <typename Arg, typename... Args>
-			static int push(lua_State* L, Arg&& arg, Args&&... args) {
-				if constexpr (std::is_base_of_v<Real, meta::unqualified_t<Arg>>) {
-					if (u_traits::is_null(arg)) {
-						return stack::push(L, lua_nil);
-					}
-					return push_deep(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
-				}
-				else {
-					return push_deep(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
-				}
-			}
-
-			template <typename... Args>
-			static int push_deep(lua_State* L, Args&&... args) {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-				luaL_checkstack(L, 1, detail::not_enough_stack_space_userdata);
-#endif // make sure stack doesn't overflow
-				P** pref = nullptr;
-				detail::unique_destructor* fx = nullptr;
-				detail::unique_tag* id = nullptr;
-				Real* mem = detail::usertype_unique_allocate<P, Real>(L, pref, fx, id);
-				if (luaL_newmetatable(L, &usertype_traits<detail::unique_usertype<std::remove_cv_t<P>>>::metatable()[0]) == 1) {
-					detail::lua_reg_table l {};
-					int index = 0;
-					detail::indexed_insert insert_fx(l, index);
-					detail::insert_default_registrations<P>(insert_fx, detail::property_always_true);
-					l[index] = { to_string(meta_function::garbage_collect).c_str(), detail::make_destructor<T>() };
-					luaL_setfuncs(L, l, 0);
-				}
-				lua_setmetatable(L, -2);
-				*fx = detail::usertype_unique_alloc_destroy<P, Real>;
-				*id = &detail::inheritance<P>::template type_unique_cast<Real>;
-				detail::default_construct::construct(mem, std::forward<Args>(args)...);
-				*pref = unique_usertype_traits<T>::get(*mem);
-				return 1;
-			}
-		};
-	} // namespace stack_detail
-
-	template <typename T>
-	struct unqualified_pusher<detail::as_unique_tag<T>> {
-		template <typename... Args>
-		static int push(lua_State* L, Args&&... args) {
-			stack_detail::uu_pusher<T> p;
-			(void)p;
-			return p.push(L, std::forward<Args>(args)...);
-		}
-	};
-
-	template <typename T, typename>
-	struct unqualified_pusher {
-		template <typename... Args>
-		static int push(lua_State* L, Args&&... args) {
-			using Tu = meta::unqualified_t<T>;
-			if constexpr (is_lua_reference_v<Tu>) {
-				using int_arr = int[];
-				int_arr p { (std::forward<Args>(args).push(L))... };
-				return p[0];
-			}
-			else if constexpr (std::is_same_v<Tu, bool>) {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-				luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
-#endif // make sure stack doesn't overflow
-				lua_pushboolean(L, std::forward<Args>(args)...);
-				return 1;
-			}
-			else if constexpr (std::is_integral_v<Tu> || std::is_same_v<Tu, lua_Integer>) {
-				const Tu& value(std::forward<Args>(args)...);
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-				luaL_checkstack(L, 1, detail::not_enough_stack_space_integral);
-#endif // make sure stack doesn't overflow
-#if SOL_LUA_VESION_I_ >= 503
-				if (stack_detail::integer_value_fits<Tu>(value)) {
-					lua_pushinteger(L, static_cast<lua_Integer>(value));
-					return 1;
-				}
-#endif // Lua 5.3 and above
-#if SOL_IS_ON(SOL_NUMBER_PRECISION_CHECKS_I_)
-				if (static_cast<T>(llround(static_cast<lua_Number>(value))) != value) {
-#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
-					// Is this really worth it?
-					assert(false && "integer value will be misrepresented in lua");
-					lua_pushinteger(L, static_cast<lua_Integer>(value));
-					return 1;
-#else
-					throw error(detail::direct_error, "integer value will be misrepresented in lua");
-#endif // No Exceptions
-				}
-#endif // Safe Numerics and Number Precision Check
-				lua_pushnumber(L, static_cast<lua_Number>(value));
-				return 1;
-			}
-			else if constexpr (std::is_floating_point_v<Tu> || std::is_same_v<Tu, lua_Number>) {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-				luaL_checkstack(L, 1, detail::not_enough_stack_space_floating);
-#endif // make sure stack doesn't overflow
-				lua_pushnumber(L, std::forward<Args>(args)...);
-				return 1;
-			}
-			else if constexpr (std::is_same_v<Tu, luaL_Stream*>) {
-				luaL_Stream* source { std::forward<Args>(args)... };
-				luaL_Stream* stream = static_cast<luaL_Stream*>(lua_newuserdata(L, sizeof(luaL_Stream)));
-				stream->f = source->f;
-#if SOL_IS_ON(SOL_LUAL_STREAM_USE_CLOSE_FUNCTION_I_)
-				stream->closef = source->closef;
-#endif // LuaJIT and Lua 5.1 and below do not have
-				return 1;
-			}
-			else if constexpr (std::is_same_v<Tu, luaL_Stream>) {
-				luaL_Stream& source(std::forward<Args>(args)...);
-				luaL_Stream* stream = static_cast<luaL_Stream*>(lua_newuserdata(L, sizeof(luaL_Stream)));
-				stream->f = source.f;
-#if SOL_IS_ON(SOL_LUAL_STREAM_USE_CLOSE_FUNCTION_I_)
-				stream->closef = source.closef;
-#endif // LuaJIT and Lua 5.1 and below do not have
-				return 1;
-			}
-			else if constexpr (std::is_enum_v<Tu>) {
-				return stack_detail::msvc_is_ass_with_if_constexpr_push_enum(std::true_type(), L, std::forward<Args>(args)...);
-			}
-			else if constexpr (std::is_pointer_v<Tu>) {
-				return stack::push<detail::as_pointer_tag<std::remove_pointer_t<T>>>(L, std::forward<Args>(args)...);
-			}
-			else if constexpr (is_unique_usertype_v<Tu>) {
-				return stack::push<detail::as_unique_tag<T>>(L, std::forward<Args>(args)...);
-			}
-			else {
-				return stack::push<detail::as_value_tag<T>>(L, std::forward<Args>(args)...);
-			}
-		}
-	};
-
-	template <typename T>
-	struct unqualified_pusher<std::reference_wrapper<T>> {
-		static int push(lua_State* L, const std::reference_wrapper<T>& t) {
-			return stack::push(L, std::addressof(detail::deref(t.get())));
-		}
-	};
-
-	template <typename T>
-	struct unqualified_pusher<detail::as_table_tag<T>> {
-		using has_kvp = meta::has_key_value_pair<meta::unqualified_t<std::remove_pointer_t<T>>>;
-
-		static int push(lua_State* L, const T& tablecont) {
-			return push(has_kvp(), std::false_type(), L, tablecont);
-		}
-
-		static int push(lua_State* L, const T& tablecont, nested_tag_t) {
-			return push(has_kvp(), std::true_type(), L, tablecont);
-		}
-
-		static int push(std::true_type, lua_State* L, const T& tablecont) {
-			return push(has_kvp(), std::true_type(), L, tablecont);
-		}
-
-		static int push(std::false_type, lua_State* L, const T& tablecont) {
-			return push(has_kvp(), std::false_type(), L, tablecont);
-		}
-
-		template <bool is_nested>
-		static int push(std::true_type, std::integral_constant<bool, is_nested>, lua_State* L, const T& tablecont) {
-			auto& cont = detail::deref(detail::unwrap(tablecont));
-			lua_createtable(L, static_cast<int>(cont.size()), 0);
-			int tableindex = lua_gettop(L);
-			for (const auto& pair : cont) {
-				if (is_nested) {
-					set_field(L, pair.first, as_nested_ref(pair.second), tableindex);
-				}
-				else {
-					set_field(L, pair.first, pair.second, tableindex);
-				}
-			}
-			return 1;
-		}
-
-		template <bool is_nested>
-		static int push(std::false_type, std::integral_constant<bool, is_nested>, lua_State* L, const T& tablecont) {
-			auto& cont = detail::deref(detail::unwrap(tablecont));
-			lua_createtable(L, stack_detail::get_size_hint(cont), 0);
-			int tableindex = lua_gettop(L);
-			std::size_t index = 1;
-			for (const auto& i : cont) {
-#if SOL_LUA_VESION_I_ >= 503
-				int p = is_nested ? stack::push(L, as_nested_ref(i)) : stack::push(L, i);
-				for (int pi = 0; pi < p; ++pi) {
-					lua_seti(L, tableindex, static_cast<lua_Integer>(index++));
-				}
-#else
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-				luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
-#endif // make sure stack doesn't overflow
-				lua_pushinteger(L, static_cast<lua_Integer>(index));
-				int p = is_nested ? stack::push(L, as_nested_ref(i)) : stack::push(L, i);
-				if (p == 1) {
-					++index;
-					lua_settable(L, tableindex);
-				}
-				else {
-					int firstindex = tableindex + 1 + 1;
-					for (int pi = 0; pi < p; ++pi) {
-						stack::push(L, index);
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-						luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
-#endif // make sure stack doesn't overflow
-						lua_pushvalue(L, firstindex);
-						lua_settable(L, tableindex);
-						++index;
-						++firstindex;
-					}
-					lua_pop(L, 1 + p);
-				}
-#endif // Lua Version 5.3 and others
-			}
-			// TODO: figure out a better way to do this...?
-			// set_field(L, -1, cont.size());
-			return 1;
-		}
-	};
-
-	template <typename T>
-	struct unqualified_pusher<as_table_t<T>> {
-		static int push(lua_State* L, const T& v) {
-			using inner_t = std::remove_pointer_t<meta::unwrap_unqualified_t<T>>;
-			if constexpr (is_container_v<inner_t>) {
-				return stack::push<detail::as_table_tag<T>>(L, v);
-			}
-			else {
-				return stack::push(L, v);
-			}
-		}
-	};
-
-	template <typename T>
-	struct unqualified_pusher<nested<T>> {
-		static int push(lua_State* L, const T& tablecont) {
-			using Tu = meta::unwrap_unqualified_t<T>;
-			using inner_t = std::remove_pointer_t<Tu>;
-			if constexpr (is_container_v<inner_t>) {
-				return stack::push<detail::as_table_tag<T>>(L, tablecont, nested_tag);
-			}
-			else {
-				return stack::push<Tu>(L, tablecont);
-			}
-		}
-	};
-
-	template <typename T>
-	struct unqualified_pusher<std::initializer_list<T>> {
-		static int push(lua_State* L, const std::initializer_list<T>& il) {
-			unqualified_pusher<detail::as_table_tag<std::initializer_list<T>>> p {};
-			// silence annoying VC++ warning
-			(void)p;
-			return p.push(L, il);
-		}
-	};
-
-	template <>
-	struct unqualified_pusher<lua_nil_t> {
-		static int push(lua_State* L, lua_nil_t) {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
-#endif // make sure stack doesn't overflow
-			lua_pushnil(L);
-			return 1;
-		}
-	};
-
-	template <>
-	struct unqualified_pusher<stack_count> {
-		static int push(lua_State*, stack_count st) {
-			return st.count;
-		}
-	};
-
-	template <>
-	struct unqualified_pusher<metatable_key_t> {
-		static int push(lua_State* L, metatable_key_t) {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
-#endif // make sure stack doesn't overflow
-			lua_pushlstring(L, to_string(meta_function::metatable).c_str(), 4);
-			return 1;
-		}
-	};
-
-	template <>
-	struct unqualified_pusher<std::remove_pointer_t<lua_CFunction>> {
-		static int push(lua_State* L, lua_CFunction func, int n = 0) {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
-#endif // make sure stack doesn't overflow
-			lua_pushcclosure(L, func, n);
-			return 1;
-		}
-	};
-
-	template <>
-	struct unqualified_pusher<lua_CFunction> {
-		static int push(lua_State* L, lua_CFunction func, int n = 0) {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
-#endif // make sure stack doesn't overflow
-			lua_pushcclosure(L, func, n);
-			return 1;
-		}
-	};
-
-#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_)
-	template <>
-	struct unqualified_pusher<std::remove_pointer_t<detail::lua_CFunction_noexcept>> {
-		static int push(lua_State* L, detail::lua_CFunction_noexcept func, int n = 0) {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
-#endif // make sure stack doesn't overflow
-			lua_pushcclosure(L, func, n);
-			return 1;
-		}
-	};
-
-	template <>
-	struct unqualified_pusher<detail::lua_CFunction_noexcept> {
-		static int push(lua_State* L, detail::lua_CFunction_noexcept func, int n = 0) {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
-#endif // make sure stack doesn't overflow
-			lua_pushcclosure(L, func, n);
-			return 1;
-		}
-	};
-#endif // noexcept function type
-
-	template <>
-	struct unqualified_pusher<c_closure> {
-		static int push(lua_State* L, c_closure cc) {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
-#endif // make sure stack doesn't overflow
-			lua_pushcclosure(L, cc.c_function, cc.upvalues);
-			return 1;
-		}
-	};
-
-	template <typename Arg, typename... Args>
-	struct unqualified_pusher<closure<Arg, Args...>> {
-		template <std::size_t... I, typename T>
-		static int push(std::index_sequence<I...>, lua_State* L, T&& c) {
-			using f_tuple = decltype(std::forward<T>(c).upvalues);
-			int pushcount = multi_push(L, std::get<I>(std::forward<f_tuple>(std::forward<T>(c).upvalues))...);
-			return stack::push(L, c_closure(c.c_function, pushcount));
-		}
-
-		template <typename T>
-		static int push(lua_State* L, T&& c) {
-			return push(std::make_index_sequence<1 + sizeof...(Args)>(), L, std::forward<T>(c));
-		}
-	};
-
-	template <>
-	struct unqualified_pusher<void*> {
-		static int push(lua_State* L, void* userdata) {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
-#endif // make sure stack doesn't overflow
-			lua_pushlightuserdata(L, userdata);
-			return 1;
-		}
-	};
-
-	template <>
-	struct unqualified_pusher<const void*> {
-		static int push(lua_State* L, const void* userdata) {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
-#endif // make sure stack doesn't overflow
-			lua_pushlightuserdata(L, const_cast<void*>(userdata));
-			return 1;
-		}
-	};
-
-	template <>
-	struct unqualified_pusher<lightuserdata_value> {
-		static int push(lua_State* L, lightuserdata_value userdata) {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
-#endif // make sure stack doesn't overflow
-			lua_pushlightuserdata(L, userdata);
-			return 1;
-		}
-	};
-
-	template <typename T>
-	struct unqualified_pusher<light<T>> {
-		static int push(lua_State* L, light<T> l) {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
-#endif // make sure stack doesn't overflow
-			lua_pushlightuserdata(L, static_cast<void*>(l.value));
-			return 1;
-		}
-	};
-
-	template <typename T>
-	struct unqualified_pusher<user<T>> {
-		template <bool with_meta = true, typename Key, typename... Args>
-		static int push_with(lua_State* L, Key&& name, Args&&... args) {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-			luaL_checkstack(L, 1, detail::not_enough_stack_space_userdata);
-#endif // make sure stack doesn't overflow
-       // A dumb pusher
-			T* data = detail::user_allocate<T>(L);
-			if (with_meta) {
-				// Make sure we have a plain GC set for this data
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-				luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
-#endif // make sure stack doesn't overflow
-				if (luaL_newmetatable(L, name) != 0) {
-					lua_CFunction cdel = detail::user_alloc_destruct<T>;
-					lua_pushcclosure(L, cdel, 0);
-					lua_setfield(L, -2, "__gc");
-				}
-				lua_setmetatable(L, -2);
-			}
-			std::allocator<T> alloc {};
-			std::allocator_traits<std::allocator<T>>::construct(alloc, data, std::forward<Args>(args)...);
-			return 1;
-		}
-
-		template <typename Arg, typename... Args>
-		static int push(lua_State* L, Arg&& arg, Args&&... args) {
-			if constexpr (std::is_same_v<meta::unqualified_t<Arg>, metatable_key_t>) {
-				const auto name = &arg[0];
-				return push_with<true>(L, name, std::forward<Args>(args)...);
-			}
-			else if constexpr (std::is_same_v<meta::unqualified_t<Arg>, no_metatable_t>) {
-				(void)arg;
-				const auto name = &usertype_traits<meta::unqualified_t<T>>::user_gc_metatable()[0];
-				return push_with<false>(L, name, std::forward<Args>(args)...);
-			}
-			else {
-				const auto name = &usertype_traits<meta::unqualified_t<T>>::user_gc_metatable()[0];
-				return push_with(L, name, std::forward<Arg>(arg), std::forward<Args>(args)...);
-			}
-		}
-
-		static int push(lua_State* L, const user<T>& u) {
-			const auto name = &usertype_traits<meta::unqualified_t<T>>::user_gc_metatable()[0];
-			return push_with(L, name, u.value);
-		}
-
-		static int push(lua_State* L, user<T>&& u) {
-			const auto name = &usertype_traits<meta::unqualified_t<T>>::user_gc_metatable()[0];
-			return push_with(L, name, std::move(u.value));
-		}
-
-		static int push(lua_State* L, no_metatable_t, const user<T>& u) {
-			const auto name = &usertype_traits<meta::unqualified_t<T>>::user_gc_metatable()[0];
-			return push_with<false>(L, name, u.value);
-		}
-
-		static int push(lua_State* L, no_metatable_t, user<T>&& u) {
-			const auto name = &usertype_traits<meta::unqualified_t<T>>::user_gc_metatable()[0];
-			return push_with<false>(L, name, std::move(u.value));
-		}
-	};
-
-	template <>
-	struct unqualified_pusher<userdata_value> {
-		static int push(lua_State* L, userdata_value data) {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-			luaL_checkstack(L, 1, detail::not_enough_stack_space_userdata);
-#endif // make sure stack doesn't overflow
-			void** ud = detail::usertype_allocate_pointer<void>(L);
-			*ud = data.value;
-			return 1;
-		}
-	};
-
-	template <>
-	struct unqualified_pusher<const char*> {
-		static int push_sized(lua_State* L, const char* str, std::size_t len) {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-			luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
-#endif // make sure stack doesn't overflow
-			lua_pushlstring(L, str, len);
-			return 1;
-		}
-
-		static int push(lua_State* L, const char* str) {
-			if (str == nullptr)
-				return stack::push(L, lua_nil);
-			return push_sized(L, str, std::char_traits<char>::length(str));
-		}
-
-		static int push(lua_State* L, const char* strb, const char* stre) {
-			return push_sized(L, strb, stre - strb);
-		}
-
-		static int push(lua_State* L, const char* str, std::size_t len) {
-			return push_sized(L, str, len);
-		}
-	};
-
-	template <>
-	struct unqualified_pusher<char*> {
-		static int push_sized(lua_State* L, const char* str, std::size_t len) {
-			unqualified_pusher<const char*> p {};
-			(void)p;
-			return p.push_sized(L, str, len);
-		}
-
-		static int push(lua_State* L, const char* str) {
-			unqualified_pusher<const char*> p {};
-			(void)p;
-			return p.push(L, str);
-		}
-
-		static int push(lua_State* L, const char* strb, const char* stre) {
-			unqualified_pusher<const char*> p {};
-			(void)p;
-			return p.push(L, strb, stre);
-		}
-
-		static int push(lua_State* L, const char* str, std::size_t len) {
-			unqualified_pusher<const char*> p {};
-			(void)p;
-			return p.push(L, str, len);
-		}
-	};
-
-	template <size_t N>
-	struct unqualified_pusher<char[N]> {
-		static int push(lua_State* L, const char (&str)[N]) {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-			luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
-#endif // make sure stack doesn't overflow
-			lua_pushlstring(L, str, std::char_traits<char>::length(str));
-			return 1;
-		}
-
-		static int push(lua_State* L, const char (&str)[N], std::size_t sz) {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-			luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
-#endif // make sure stack doesn't overflow
-			lua_pushlstring(L, str, sz);
-			return 1;
-		}
-	};
-
-	template <>
-	struct unqualified_pusher<char> {
-		static int push(lua_State* L, char c) {
-			const char str[2] = { c, '\0' };
-			return stack::push(L, static_cast<const char*>(str), 1);
-		}
-	};
-
-	template <typename Ch, typename Traits, typename Al>
-	struct unqualified_pusher<std::basic_string<Ch, Traits, Al>> {
-		static int push(lua_State* L, const std::basic_string<Ch, Traits, Al>& str) {
-			if constexpr (!std::is_same_v<Ch, char>) {
-				return stack::push(L, str.data(), str.size());
-			}
-			else {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-				luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
-#endif // make sure stack doesn't overflow
-				lua_pushlstring(L, str.c_str(), str.size());
-				return 1;
-			}
-		}
-
-		static int push(lua_State* L, const std::basic_string<Ch, Traits, Al>& str, std::size_t sz) {
-			if constexpr (!std::is_same_v<Ch, char>) {
-				return stack::push(L, str.data(), sz);
-			}
-			else {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-				luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
-#endif // make sure stack doesn't overflow
-				lua_pushlstring(L, str.c_str(), sz);
-				return 1;
-			}
-		}
-	};
-
-	template <typename Ch, typename Traits>
-	struct unqualified_pusher<basic_string_view<Ch, Traits>> {
-		static int push(lua_State* L, const basic_string_view<Ch, Traits>& sv) {
-			return stack::push(L, sv.data(), sv.length());
-		}
-
-		static int push(lua_State* L, const basic_string_view<Ch, Traits>& sv, std::size_t n) {
-			return stack::push(L, sv.data(), n);
-		}
-	};
-
-	template <>
-	struct unqualified_pusher<meta_function> {
-		static int push(lua_State* L, meta_function m) {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-			luaL_checkstack(L, 1, detail::not_enough_stack_space_meta_function_name);
-#endif // make sure stack doesn't overflow
-			const std::string& str = to_string(m);
-			lua_pushlstring(L, str.c_str(), str.size());
-			return 1;
-		}
-	};
-
-	template <>
-	struct unqualified_pusher<absolute_index> {
-		static int push(lua_State* L, absolute_index ai) {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
-#endif // make sure stack doesn't overflow
-			lua_pushvalue(L, ai);
-			return 1;
-		}
-	};
-
-	template <>
-	struct unqualified_pusher<raw_index> {
-		static int push(lua_State* L, raw_index ri) {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
-#endif // make sure stack doesn't overflow
-			lua_pushvalue(L, ri);
-			return 1;
-		}
-	};
-
-	template <>
-	struct unqualified_pusher<ref_index> {
-		static int push(lua_State* L, ref_index ri) {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
-#endif // make sure stack doesn't overflow
-			lua_rawgeti(L, LUA_REGISTRYINDEX, ri);
-			return 1;
-		}
-	};
-
-	template <>
-	struct unqualified_pusher<const wchar_t*> {
-		static int push(lua_State* L, const wchar_t* wstr) {
-			return push(L, wstr, std::char_traits<wchar_t>::length(wstr));
-		}
-
-		static int push(lua_State* L, const wchar_t* wstr, std::size_t sz) {
-			return push(L, wstr, wstr + sz);
-		}
-
-		static int push(lua_State* L, const wchar_t* strb, const wchar_t* stre) {
-			if constexpr (sizeof(wchar_t) == 2) {
-				const char16_t* sb = reinterpret_cast<const char16_t*>(strb);
-				const char16_t* se = reinterpret_cast<const char16_t*>(stre);
-				return stack::push(L, sb, se);
-			}
-			else {
-				const char32_t* sb = reinterpret_cast<const char32_t*>(strb);
-				const char32_t* se = reinterpret_cast<const char32_t*>(stre);
-				return stack::push(L, sb, se);
-			}
-		}
-	};
-
-	template <>
-	struct unqualified_pusher<wchar_t*> {
-		static int push(lua_State* L, const wchar_t* str) {
-			unqualified_pusher<const wchar_t*> p {};
-			(void)p;
-			return p.push(L, str);
-		}
-
-		static int push(lua_State* L, const wchar_t* strb, const wchar_t* stre) {
-			unqualified_pusher<const wchar_t*> p {};
-			(void)p;
-			return p.push(L, strb, stre);
-		}
-
-		static int push(lua_State* L, const wchar_t* str, std::size_t len) {
-			unqualified_pusher<const wchar_t*> p {};
-			(void)p;
-			return p.push(L, str, len);
-		}
-	};
-
-	template <>
-	struct unqualified_pusher<const char16_t*> {
-		static int convert_into(lua_State* L, char* start, std::size_t, const char16_t* strb, const char16_t* stre) {
-			char* target = start;
-			char32_t cp = 0;
-			for (const char16_t* strtarget = strb; strtarget < stre;) {
-				auto dr = unicode::utf16_to_code_point(strtarget, stre);
-				if (dr.error != unicode::error_code::ok) {
-					cp = unicode::unicode_detail::replacement;
-				}
-				else {
-					cp = dr.codepoint;
-				}
-				auto er = unicode::code_point_to_utf8(cp);
-				const char* utf8data = er.code_units.data();
-				std::memcpy(target, utf8data, er.code_units_size);
-				target += er.code_units_size;
-				strtarget = dr.next;
-			}
-
-			return stack::push(L, start, target);
-		}
-
-		static int push(lua_State* L, const char16_t* u16str) {
-			return push(L, u16str, std::char_traits<char16_t>::length(u16str));
-		}
-
-		static int push(lua_State* L, const char16_t* u16str, std::size_t sz) {
-			return push(L, u16str, u16str + sz);
-		}
-
-		static int push(lua_State* L, const char16_t* strb, const char16_t* stre) {
-			char sbo[SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_];
-			// if our max string space is small enough, use SBO
-			// right off the bat
-			std::size_t max_possible_code_units = (stre - strb) * 4;
-			if (max_possible_code_units <= SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_) {
-				return convert_into(L, sbo, max_possible_code_units, strb, stre);
-			}
-			// otherwise, we must manually count/check size
-			std::size_t needed_size = 0;
-			for (const char16_t* strtarget = strb; strtarget < stre;) {
-				auto dr = unicode::utf16_to_code_point(strtarget, stre);
-				auto er = unicode::code_point_to_utf8(dr.codepoint);
-				needed_size += er.code_units_size;
-				strtarget = dr.next;
-			}
-			if (needed_size < SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_) {
-				return convert_into(L, sbo, needed_size, strb, stre);
-			}
-			std::string u8str("", 0);
-			u8str.resize(needed_size);
-			char* target = const_cast<char*>(u8str.data());
-			return convert_into(L, target, needed_size, strb, stre);
-		}
-	};
-
-	template <>
-	struct unqualified_pusher<char16_t*> {
-		static int push(lua_State* L, const char16_t* str) {
-			unqualified_pusher<const char16_t*> p {};
-			(void)p;
-			return p.push(L, str);
-		}
-
-		static int push(lua_State* L, const char16_t* strb, const char16_t* stre) {
-			unqualified_pusher<const char16_t*> p {};
-			(void)p;
-			return p.push(L, strb, stre);
-		}
-
-		static int push(lua_State* L, const char16_t* str, std::size_t len) {
-			unqualified_pusher<const char16_t*> p {};
-			(void)p;
-			return p.push(L, str, len);
-		}
-	};
-
-	template <>
-	struct unqualified_pusher<const char32_t*> {
-		static int convert_into(lua_State* L, char* start, std::size_t, const char32_t* strb, const char32_t* stre) {
-			char* target = start;
-			char32_t cp = 0;
-			for (const char32_t* strtarget = strb; strtarget < stre;) {
-				auto dr = unicode::utf32_to_code_point(strtarget, stre);
-				if (dr.error != unicode::error_code::ok) {
-					cp = unicode::unicode_detail::replacement;
-				}
-				else {
-					cp = dr.codepoint;
-				}
-				auto er = unicode::code_point_to_utf8(cp);
-				const char* data = er.code_units.data();
-				std::memcpy(target, data, er.code_units_size);
-				target += er.code_units_size;
-				strtarget = dr.next;
-			}
-			return stack::push(L, start, target);
-		}
-
-		static int push(lua_State* L, const char32_t* u32str) {
-			return push(L, u32str, u32str + std::char_traits<char32_t>::length(u32str));
-		}
-
-		static int push(lua_State* L, const char32_t* u32str, std::size_t sz) {
-			return push(L, u32str, u32str + sz);
-		}
-
-		static int push(lua_State* L, const char32_t* strb, const char32_t* stre) {
-			char sbo[SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_];
-			// if our max string space is small enough, use SBO
-			// right off the bat
-			std::size_t max_possible_code_units = (stre - strb) * 4;
-			if (max_possible_code_units <= SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_) {
-				return convert_into(L, sbo, max_possible_code_units, strb, stre);
-			}
-			// otherwise, we must manually count/check size
-			std::size_t needed_size = 0;
-			for (const char32_t* strtarget = strb; strtarget < stre;) {
-				auto dr = unicode::utf32_to_code_point(strtarget, stre);
-				auto er = unicode::code_point_to_utf8(dr.codepoint);
-				needed_size += er.code_units_size;
-				strtarget = dr.next;
-			}
-			if (needed_size < SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_) {
-				return convert_into(L, sbo, needed_size, strb, stre);
-			}
-			std::string u8str("", 0);
-			u8str.resize(needed_size);
-			char* target = const_cast<char*>(u8str.data());
-			return convert_into(L, target, needed_size, strb, stre);
-		}
-	};
-
-	template <>
-	struct unqualified_pusher<char32_t*> {
-		static int push(lua_State* L, const char32_t* str) {
-			unqualified_pusher<const char32_t*> p {};
-			(void)p;
-			return p.push(L, str);
-		}
-
-		static int push(lua_State* L, const char32_t* strb, const char32_t* stre) {
-			unqualified_pusher<const char32_t*> p {};
-			(void)p;
-			return p.push(L, strb, stre);
-		}
-
-		static int push(lua_State* L, const char32_t* str, std::size_t len) {
-			unqualified_pusher<const char32_t*> p {};
-			(void)p;
-			return p.push(L, str, len);
-		}
-	};
-
-	template <size_t N>
-	struct unqualified_pusher<wchar_t[N]> {
-		static int push(lua_State* L, const wchar_t (&str)[N]) {
-			return push(L, str, std::char_traits<wchar_t>::length(str));
-		}
-
-		static int push(lua_State* L, const wchar_t (&str)[N], std::size_t sz) {
-			const wchar_t* str_ptr = static_cast<const wchar_t*>(str);
-			return stack::push<const wchar_t*>(L, str_ptr, str_ptr + sz);
-		}
-	};
-
-	template <size_t N>
-	struct unqualified_pusher<char16_t[N]> {
-		static int push(lua_State* L, const char16_t (&str)[N]) {
-			return push(L, str, std::char_traits<char16_t>::length(str));
-		}
-
-		static int push(lua_State* L, const char16_t (&str)[N], std::size_t sz) {
-			const char16_t* str_ptr = static_cast<const char16_t*>(str);
-			return stack::push<const char16_t*>(L, str_ptr, str_ptr + sz);
-		}
-	};
-
-	template <size_t N>
-	struct unqualified_pusher<char32_t[N]> {
-		static int push(lua_State* L, const char32_t (&str)[N]) {
-			return push(L, str, std::char_traits<char32_t>::length(str));
-		}
-
-		static int push(lua_State* L, const char32_t (&str)[N], std::size_t sz) {
-			const char32_t* str_ptr = static_cast<const char32_t*>(str);
-			return stack::push<const char32_t*>(L, str_ptr, str_ptr + sz);
-		}
-	};
-
-	template <>
-	struct unqualified_pusher<wchar_t> {
-		static int push(lua_State* L, wchar_t c) {
-			const wchar_t str[2] = { c, '\0' };
-			return stack::push(L, static_cast<const wchar_t*>(str), 1);
-		}
-	};
-
-	template <>
-	struct unqualified_pusher<char16_t> {
-		static int push(lua_State* L, char16_t c) {
-			const char16_t str[2] = { c, '\0' };
-			return stack::push(L, static_cast<const char16_t*>(str), 1);
-		}
-	};
-
-	template <>
-	struct unqualified_pusher<char32_t> {
-		static int push(lua_State* L, char32_t c) {
-			const char32_t str[2] = { c, '\0' };
-			return stack::push(L, static_cast<const char32_t*>(str), 1);
-		}
-	};
-
-	template <typename... Args>
-	struct unqualified_pusher<std::tuple<Args...>> {
-		template <std::size_t... I, typename T>
-		static int push(std::index_sequence<I...>, lua_State* L, T&& t) {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-			luaL_checkstack(L, static_cast<int>(sizeof...(I)), detail::not_enough_stack_space_generic);
-#endif // make sure stack doesn't overflow
-			int pushcount = 0;
-			(void)detail::swallow { 0, (pushcount += stack::push(L, std::get<I>(std::forward<T>(t))), 0)... };
-			return pushcount;
-		}
-
-		template <typename T>
-		static int push(lua_State* L, T&& t) {
-			return push(std::index_sequence_for<Args...>(), L, std::forward<T>(t));
-		}
-	};
-
-	template <typename A, typename B>
-	struct unqualified_pusher<std::pair<A, B>> {
-		template <typename T>
-		static int push(lua_State* L, T&& t) {
-			int pushcount = stack::push(L, std::get<0>(std::forward<T>(t)));
-			pushcount += stack::push(L, std::get<1>(std::forward<T>(t)));
-			return pushcount;
-		}
-	};
-
-	template <typename T>
-	struct unqualified_pusher<T, std::enable_if_t<meta::is_optional_v<T>>> {
-		using ValueType = typename meta::unqualified_t<T>::value_type;
-
-		template <typename Optional>
-		static int push(lua_State* L, Optional&& op) {
-			using QualifiedValueType = meta::conditional_t<std::is_lvalue_reference_v<Optional>, ValueType&, ValueType&&>;
-			if (!op) {
-				return stack::push(L, nullopt);
-			}
-			return stack::push(L, static_cast<QualifiedValueType>(op.value()));
-		}
-	};
-
-	template <>
-	struct unqualified_pusher<nullopt_t> {
-		static int push(lua_State* L, nullopt_t) {
-			return stack::push(L, lua_nil);
-		}
-	};
-
-	template <>
-	struct unqualified_pusher<std::nullptr_t> {
-		static int push(lua_State* L, std::nullptr_t) {
-			return stack::push(L, lua_nil);
-		}
-	};
-
-	template <>
-	struct unqualified_pusher<this_state> {
-		static int push(lua_State*, const this_state&) {
-			return 0;
-		}
-	};
-
-	template <>
-	struct unqualified_pusher<this_main_state> {
-		static int push(lua_State*, const this_main_state&) {
-			return 0;
-		}
-	};
-
-	template <>
-	struct unqualified_pusher<new_table> {
-		static int push(lua_State* L, const new_table& nt) {
-			lua_createtable(L, nt.sequence_hint, nt.map_hint);
-			return 1;
-		}
-	};
-
-	template <typename Allocator>
-	struct unqualified_pusher<basic_bytecode<Allocator>> {
-		template <typename T>
-		static int push(lua_State* L, T&& bc, const char* bytecode_name) {
-			const auto first = bc.data();
-			const auto bcsize = bc.size();
-			// pushes either the function, or an error
-			// if it errors, shit goes south, and people can test that upstream
-			(void)luaL_loadbuffer(
-				L, reinterpret_cast<const char*>(first), static_cast<std::size_t>(bcsize * (sizeof(*first) / sizeof(const char))), bytecode_name);
-			return 1;
-		}
-
-		template <typename T>
-		static int push(lua_State* L, T&& bc) {
-			return push(L, std::forward<bc>(bc), "bytecode");
-		}
-	};
-
-#if SOL_IS_ON(SOL_STD_VARIANT_I_)
-	namespace stack_detail {
-
-		struct push_function {
-			lua_State* L;
-
-			push_function(lua_State* L) : L(L) {
-			}
-
-			template <typename T>
-			int operator()(T&& value) const {
-				return stack::push<T>(L, std::forward<T>(value));
-			}
-		};
-
-	} // namespace stack_detail
-
-	template <typename... Tn>
-	struct unqualified_pusher<std::variant<Tn...>> {
-		static int push(lua_State* L, const std::variant<Tn...>& v) {
-			return std::visit(stack_detail::push_function(L), v);
-		}
-
-		static int push(lua_State* L, std::variant<Tn...>&& v) {
-			return std::visit(stack_detail::push_function(L), std::move(v));
-		}
-	};
-#endif // Variant because Clang is terrible
-
-}} // namespace sol::stack
-
-// end of sol/stack_push.hpp
-
-// beginning of sol/stack_pop.hpp
-
-#include <utility>
-#include <tuple>
-
-namespace sol {
-namespace stack {
-	template <typename T, typename>
-	struct popper {
-		inline static decltype(auto) pop(lua_State* L) {
-			if constexpr (is_stack_based_v<meta::unqualified_t<T>>) {
-				static_assert(!is_stack_based_v<meta::unqualified_t<T>>,
-					"You cannot pop something that lives solely on the stack: it will not remain on the stack when popped and thusly will go out of "
-					"scope!");
-			}
-			else {
-				record tracking{};
-				decltype(auto) r = get<T>(L, -lua_size<T>::value, tracking);
-				lua_pop(L, tracking.used);
-				return r;
-			}
-		}
-	};
-}
-} // namespace sol::stack
-
-// end of sol/stack_pop.hpp
-
-// beginning of sol/stack_field.hpp
-
-namespace sol { namespace stack {
-	template <typename T, bool global, bool raw, typename>
-	struct field_getter {
-		static constexpr int default_table_index = meta::conditional_t < meta::is_c_str_v<T>
-#if SOL_LUA_VESION_I_ >= 503
-			|| (std::is_integral_v<T> && !std::is_same_v<T, bool>)
-#endif // integer  global keys 5.3 or better
-			|| (raw && std::is_void_v<std::remove_pointer_t<T>>),
-			                std::integral_constant<int, -1>, std::integral_constant<int, -2> > ::value;
-
-		template <typename Key>
-		void get(lua_State* L, Key&& key, int tableindex = default_table_index) {
-			if constexpr (std::is_same_v<T, update_if_empty_t> || std::is_same_v<T, override_value_t> || std::is_same_v<T, create_if_nil_t>) {
-				(void)L;
-				(void)key;
-				(void)tableindex;
-			}
-			else if constexpr (std::is_same_v<T, env_key_t>) {
-				(void)key;
-#if SOL_LUA_VESION_I_ < 502
-				// Use lua_setfenv
-				lua_getfenv(L, tableindex);
-#else
-				// Use upvalues as explained in Lua 5.2 and beyond's manual
-				if (lua_getupvalue(L, tableindex, 1) == nullptr) {
-					push(L, lua_nil);
-				}
-#endif
-			}
-			else if constexpr (std::is_same_v<T, metatable_key_t>) {
-				(void)key;
-				if (lua_getmetatable(L, tableindex) == 0)
-					push(L, lua_nil);
-			}
-			else if constexpr (raw) {
-				if constexpr (std::is_integral_v<T> && !std::is_same_v<bool, T>) {
-					lua_rawgeti(L, tableindex, static_cast<lua_Integer>(key));
-				}
-#if SOL_LUA_VESION_I_ >= 502
-				else if constexpr (std::is_void_v<std::remove_pointer_t<T>>) {
-					lua_rawgetp(L, tableindex, key);
-				}
-#endif // Lua 5.2.x+
-				else {
-					push(L, std::forward<Key>(key));
-					lua_rawget(L, tableindex);
-				}
-			}
-			else {
-				if constexpr (meta::is_c_str_v<T>) {
-					if constexpr (global) {
-						(void)tableindex;
-						lua_getglobal(L, &key[0]);
-					}
-					else {
-						lua_getfield(L, tableindex, &key[0]);
-					}
-				}
-#if SOL_LUA_VESION_I_ >= 503
-				else if constexpr (std::is_integral_v<T> && !std::is_same_v<bool, T>) {
-					lua_geti(L, tableindex, static_cast<lua_Integer>(key));
-				}
-#endif // Lua 5.3.x+
-				else {
-					push(L, std::forward<Key>(key));
-					lua_gettable(L, tableindex);
-				}
-			}
-		}
-	};
-
-	template <typename... Args, bool b, bool raw, typename C>
-	struct field_getter<std::tuple<Args...>, b, raw, C> {
-		template <std::size_t... I, typename Keys>
-		void apply(std::index_sequence<0, I...>, lua_State* L, Keys&& keys, int tableindex) {
-			get_field<b, raw>(L, std::get<0>(std::forward<Keys>(keys)), tableindex);
-			void(detail::swallow { (get_field<false, raw>(L, std::get<I>(std::forward<Keys>(keys))), 0)... });
-			reference saved(L, -1);
-			lua_pop(L, static_cast<int>(sizeof...(I)));
-			saved.push();
-		}
-
-		template <typename Keys>
-		void get(lua_State* L, Keys&& keys) {
-			apply(std::make_index_sequence<sizeof...(Args)>(), L, std::forward<Keys>(keys), lua_absindex(L, -1));
-		}
-
-		template <typename Keys>
-		void get(lua_State* L, Keys&& keys, int tableindex) {
-			apply(std::make_index_sequence<sizeof...(Args)>(), L, std::forward<Keys>(keys), tableindex);
-		}
-	};
-
-	template <typename A, typename B, bool b, bool raw, typename C>
-	struct field_getter<std::pair<A, B>, b, raw, C> {
-		template <typename Keys>
-		void get(lua_State* L, Keys&& keys, int tableindex) {
-			get_field<b, raw>(L, std::get<0>(std::forward<Keys>(keys)), tableindex);
-			get_field<false, raw>(L, std::get<1>(std::forward<Keys>(keys)));
-			reference saved(L, -1);
-			lua_pop(L, static_cast<int>(2));
-			saved.push();
-		}
-
-		template <typename Keys>
-		void get(lua_State* L, Keys&& keys) {
-			get_field<b, raw>(L, std::get<0>(std::forward<Keys>(keys)));
-			get_field<false, raw>(L, std::get<1>(std::forward<Keys>(keys)));
-			reference saved(L, -1);
-			lua_pop(L, static_cast<int>(2));
-			saved.push();
-		}
-	};
-
-	template <typename T, bool global, bool raw, typename>
-	struct field_setter {
-		static constexpr int default_table_index
-			= meta::conditional_t < (meta::is_c_str_v<T> || meta::is_string_of_v<T, char>) || (std::is_integral_v<T> && !std::is_same_v<T, bool>)
-			|| (std::is_integral_v<T> && !std::is_same_v<T, bool>) || (raw && std::is_void_v<std::remove_pointer_t<T>>),
-			std::integral_constant<int, -2>, std::integral_constant<int, -3> > ::value;
-
-		template <typename Key, typename Value>
-		void set(lua_State* L, Key&& key, Value&& value, int tableindex = default_table_index) {
-			if constexpr (std::is_same_v<T, update_if_empty_t> || std::is_same_v<T, override_value_t>) {
-				(void)L;
-				(void)key;
-				(void)value;
-				(void)tableindex;
-			}
-			else if constexpr (std::is_same_v<T, metatable_key_t>) {
-				(void)key;
-				push(L, std::forward<Value>(value));
-				lua_setmetatable(L, tableindex);
-			}
-			else if constexpr (raw) {
-				if constexpr (std::is_integral_v<T> && !std::is_same_v<bool, T>) {
-					push(L, std::forward<Value>(value));
-					lua_rawseti(L, tableindex, static_cast<lua_Integer>(key));
-				}
-#if SOL_LUA_VESION_I_ >= 502
-				else if constexpr (std::is_void_v<std::remove_pointer_t<T>>) {
-					push(L, std::forward<Value>(value));
-					lua_rawsetp(L, tableindex, std::forward<Key>(key));
-				}
-#endif // Lua 5.2.x
-				else {
-					push(L, std::forward<Key>(key));
-					push(L, std::forward<Value>(value));
-					lua_rawset(L, tableindex);
-				}
-			}
-			else {
-				if constexpr (meta::is_c_str_v<T> || meta::is_string_of_v<T, char>) {
-					if constexpr (global) {
-						push(L, std::forward<Value>(value));
-						lua_setglobal(L, &key[0]);
-						(void)tableindex;
-					}
-					else {
-						push(L, std::forward<Value>(value));
-						lua_setfield(L, tableindex, &key[0]);
-					}
-				}
-#if SOL_LUA_VESION_I_ >= 503
-				else if constexpr (std::is_integral_v<T> && !std::is_same_v<bool, T>) {
-					push(L, std::forward<Value>(value));
-					lua_seti(L, tableindex, static_cast<lua_Integer>(key));
-				}
-#endif // Lua 5.3.x
-				else {
-					push(L, std::forward<Key>(key));
-					push(L, std::forward<Value>(value));
-					lua_settable(L, tableindex);
-				}
-			}
-		}
-	};
-
-	template <typename... Args, bool b, bool raw, typename C>
-	struct field_setter<std::tuple<Args...>, b, raw, C> {
-		template <bool g, std::size_t I, typename Keys, typename Value>
-		void apply(std::index_sequence<I>, lua_State* L, Keys&& keys, Value&& value, int tableindex) {
-			I < 1 ? set_field<g, raw>(L, std::get<I>(std::forward<Keys>(keys)), std::forward<Value>(value), tableindex)
-				 : set_field<g, raw>(L, std::get<I>(std::forward<Keys>(keys)), std::forward<Value>(value));
-		}
-
-		template <bool g, std::size_t I0, std::size_t I1, std::size_t... I, typename Keys, typename Value>
-		void apply(std::index_sequence<I0, I1, I...>, lua_State* L, Keys&& keys, Value&& value, int tableindex) {
-			I0 < 1 ? get_field<g, raw>(L, std::get<I0>(std::forward<Keys>(keys)), tableindex)
-				  : get_field<g, raw>(L, std::get<I0>(std::forward<Keys>(keys)), -1);
-			apply<false>(std::index_sequence<I1, I...>(), L, std::forward<Keys>(keys), std::forward<Value>(value), -1);
-		}
-
-		template <bool g, std::size_t I0, std::size_t... I, typename Keys, typename Value>
-		void top_apply(std::index_sequence<I0, I...>, lua_State* L, Keys&& keys, Value&& value, int tableindex) {
-			apply<g>(std::index_sequence<I0, I...>(), L, std::forward<Keys>(keys), std::forward<Value>(value), tableindex);
-			lua_pop(L, static_cast<int>(sizeof...(I)));
-		}
-
-		template <typename Keys, typename Value>
-		void set(lua_State* L, Keys&& keys, Value&& value, int tableindex = -3) {
-			top_apply<b>(std::make_index_sequence<sizeof...(Args)>(), L, std::forward<Keys>(keys), std::forward<Value>(value), tableindex);
-		}
-	};
-
-	template <typename A, typename B, bool b, bool raw, typename C>
-	struct field_setter<std::pair<A, B>, b, raw, C> {
-		template <typename Keys, typename Value>
-		void set(lua_State* L, Keys&& keys, Value&& value, int tableindex = -1) {
-			get_field<b, raw>(L, std::get<0>(std::forward<Keys>(keys)), tableindex);
-			set_field<false, raw>(L, std::get<1>(std::forward<Keys>(keys)), std::forward<Value>(value), lua_gettop(L));
-			lua_pop(L, 1);
-		}
-	};
-}} // namespace sol::stack
-
-// end of sol/stack_field.hpp
-
-// beginning of sol/stack_probe.hpp
-
-namespace sol {
-namespace stack {
-	template <typename T, typename P, bool b, bool raw, typename>
-	struct probe_field_getter {
-		template <typename Key>
-		probe get(lua_State* L, Key&& key, int tableindex = -2) {
-			if constexpr(!b) {
-				if (!maybe_indexable(L, tableindex)) {
-					return probe(false, 0);
-				}
-			}
-			get_field<b, raw>(L, std::forward<Key>(key), tableindex);
-			return probe(check<P>(L), 1);
-		}
-	};
-
-	template <typename A, typename B, typename P, bool b, bool raw, typename C>
-	struct probe_field_getter<std::pair<A, B>, P, b, raw, C> {
-		template <typename Keys>
-		probe get(lua_State* L, Keys&& keys, int tableindex = -2) {
-			if (!b && !maybe_indexable(L, tableindex)) {
-				return probe(false, 0);
-			}
-			get_field<b, raw>(L, std::get<0>(keys), tableindex);
-			if (!maybe_indexable(L)) {
-				return probe(false, 1);
-			}
-			get_field<false, raw>(L, std::get<1>(keys), tableindex);
-			return probe(check<P>(L), 2);
-		}
-	};
-
-	template <typename... Args, typename P, bool b, bool raw, typename C>
-	struct probe_field_getter<std::tuple<Args...>, P, b, raw, C> {
-		template <std::size_t I, typename Keys>
-		probe apply(std::index_sequence<I>, int sofar, lua_State* L, Keys&& keys, int tableindex) {
-			get_field<(I<1) && b, raw>(L, std::get<I>(keys), tableindex);
-			return probe(check<P>(L), sofar);
-		}
-
-		template <std::size_t I, std::size_t I1, std::size_t... In, typename Keys>
-		probe apply(std::index_sequence<I, I1, In...>, int sofar, lua_State* L, Keys&& keys, int tableindex) {
-			get_field < I<1 && b, raw>(L, std::get<I>(keys), tableindex);
-			if (!maybe_indexable(L)) {
-				return probe(false, sofar);
-			}
-			return apply(std::index_sequence<I1, In...>(), sofar + 1, L, std::forward<Keys>(keys), -1);
-		}
-
-		template <typename Keys>
-		probe get(lua_State* L, Keys&& keys, int tableindex = -2) {
-			if constexpr (!b) {
-				if (!maybe_indexable(L, tableindex)) {
-					return probe(false, 0);
-				}
-				return apply(std::index_sequence_for<Args...>(), 1, L, std::forward<Keys>(keys), tableindex);
-			}
-			else {
-				return apply(std::index_sequence_for<Args...>(), 1, L, std::forward<Keys>(keys), tableindex);
-			}
-		}
-	};
-}
-} // namespace sol::stack
-
-// end of sol/stack_probe.hpp
-
-#include <cstring>
-#include <array>
-
-namespace sol {
-	namespace detail {
-		using typical_chunk_name_t = char[SOL_ID_SIZE_I_];
-		using typical_file_chunk_name_t = char[SOL_FILE_ID_SIZE_I_];
-
-		inline const std::string& default_chunk_name() {
-			static const std::string name = "";
-			return name;
-		}
-
-		template <std::size_t N>
-		const char* make_chunk_name(const string_view& code, const std::string& chunkname, char (&basechunkname)[N]) {
-			if (chunkname.empty()) {
-				auto it = code.cbegin();
-				auto e = code.cend();
-				std::size_t i = 0;
-				static const std::size_t n = N - 4;
-				for (i = 0; i < n && it != e; ++i, ++it) {
-					basechunkname[i] = *it;
-				}
-				if (it != e) {
-					for (std::size_t c = 0; c < 3; ++i, ++c) {
-						basechunkname[i] = '.';
-					}
-				}
-				basechunkname[i] = '\0';
-				return &basechunkname[0];
-			}
-			else {
-				return chunkname.c_str();
-			}
-		}
-
-		inline void clear_entries(stack_reference r) {
-			stack::push(r.lua_state(), lua_nil);
-			while (lua_next(r.lua_state(), -2)) {
-				absolute_index key(r.lua_state(), -2);
-				auto pn = stack::pop_n(r.lua_state(), 1);
-				stack::set_field<false, true>(r.lua_state(), key, lua_nil, r.stack_index());
-			}
-		}
-
-		inline void clear_entries(const reference& registry_reference) {
-			auto pp = stack::push_pop(registry_reference);
-			stack_reference ref(registry_reference.lua_state(), -1);
-			clear_entries(ref);
-		}
-	} // namespace detail
-
-	namespace stack {
-		namespace stack_detail {
-			template <typename T>
-			inline int push_as_upvalues(lua_State* L, T& item) {
-				typedef std::decay_t<T> TValue;
-				static const std::size_t itemsize = sizeof(TValue);
-				static const std::size_t voidsize = sizeof(void*);
-				static const std::size_t voidsizem1 = voidsize - 1;
-				static const std::size_t data_t_count = (sizeof(TValue) + voidsizem1) / voidsize;
-				typedef std::array<void*, data_t_count> data_t;
-
-				data_t data { {} };
-				std::memcpy(&data[0], std::addressof(item), itemsize);
-				int pushcount = 0;
-				for (const auto& v : data) {
-					lua_pushlightuserdata(L, v);
-					pushcount += 1;
-				}
-				return pushcount;
-			}
-
-			template <typename T>
-			inline std::pair<T, int> get_as_upvalues(lua_State* L, int index = 2) {
-				static const std::size_t data_t_count = (sizeof(T) + (sizeof(void*) - 1)) / sizeof(void*);
-				typedef std::array<void*, data_t_count> data_t;
-				data_t voiddata { {} };
-				for (std::size_t i = 0, d = 0; d < sizeof(T); ++i, d += sizeof(void*)) {
-					voiddata[i] = lua_touserdata(L, upvalue_index(index++));
-				}
-				return std::pair<T, int>(*reinterpret_cast<T*>(static_cast<void*>(voiddata.data())), index);
-			}
-
-			template <typename T>
-			inline std::pair<T, int> get_as_upvalues_using_function(lua_State* L, int function_index = -1) {
-				static const std::size_t data_t_count = (sizeof(T) + (sizeof(void*) - 1)) / sizeof(void*);
-				typedef std::array<void*, data_t_count> data_t;
-				function_index = lua_absindex(L, function_index);
-				int index = 0;
-				data_t voiddata { {} };
-				for (std::size_t d = 0; d < sizeof(T); d += sizeof(void*)) {
-					// first upvalue is nullptr to respect environment shenanigans
-					// So +2 instead of +1
-					const char* upvalue_name = lua_getupvalue(L, function_index, index + 2);
-					if (upvalue_name == nullptr) {
-						// We should freak out here...
-						break;
-					}
-					voiddata[index] = lua_touserdata(L, -1);
-					++index;
-				}
-				lua_pop(L, index);
-				return std::pair<T, int>(*reinterpret_cast<T*>(static_cast<void*>(voiddata.data())), index);
-			}
-
-			template <typename Fx, typename... Args>
-			static decltype(auto) eval(types<>, std::index_sequence<>, lua_State*, int, record&, Fx&& fx, Args&&... args) {
-				return std::forward<Fx>(fx)(std::forward<Args>(args)...);
-			}
-
-			template <typename Fx, typename Arg, typename... Args, std::size_t I, std::size_t... Is, typename... FxArgs>
-			static decltype(auto) eval(
-			     types<Arg, Args...>, std::index_sequence<I, Is...>, lua_State* L, int start, record& tracking, Fx&& fx, FxArgs&&... fxargs) {
-				return eval(types<Args...>(),
-				     std::index_sequence<Is...>(),
-				     L,
-				     start,
-				     tracking,
-				     std::forward<Fx>(fx),
-				     std::forward<FxArgs>(fxargs)...,
-				     stack_detail::unchecked_get<Arg>(L, start + tracking.used, tracking));
-			}
-
-			template <bool checkargs = detail::default_safe_function_calls, std::size_t... I, typename R, typename... Args, typename Fx, typename... FxArgs>
-			inline decltype(auto) call(types<R>, types<Args...> ta, std::index_sequence<I...> tai, lua_State* L, int start, Fx&& fx, FxArgs&&... args) {
-				static_assert(meta::all<meta::is_not_move_only<Args>...>::value,
-				     "One of the arguments being bound is a move-only type, and it is not being taken by reference: this will break your code. Please take "
-				     "a reference and std::move it manually if this was your intention.");
-				if constexpr (checkargs) {
-					argument_handler<types<R, Args...>> handler {};
-					multi_check<Args...>(L, start, handler);
-				}
-				record tracking {};
-				if constexpr (std::is_void_v<R>) {
-					eval(ta, tai, L, start, tracking, std::forward<Fx>(fx), std::forward<FxArgs>(args)...);
-				}
-				else {
-					return eval(ta, tai, L, start, tracking, std::forward<Fx>(fx), std::forward<FxArgs>(args)...);
-				}
-			}
-		} // namespace stack_detail
-
-		template <typename T>
-		int set_ref(lua_State* L, T&& arg, int tableindex = -2) {
-			push(L, std::forward<T>(arg));
-			return luaL_ref(L, tableindex);
-		}
-
-		template <bool check_args = detail::default_safe_function_calls, typename R, typename... Args, typename Fx, typename... FxArgs>
-		inline decltype(auto) call(types<R> tr, types<Args...> ta, lua_State* L, int start, Fx&& fx, FxArgs&&... args) {
-			using args_indices = std::make_index_sequence<sizeof...(Args)>;
-			if constexpr (std::is_void_v<R>) {
-				stack_detail::call<check_args>(tr, ta, args_indices(), L, start, std::forward<Fx>(fx), std::forward<FxArgs>(args)...);
-			}
-			else {
-				return stack_detail::call<check_args>(tr, ta, args_indices(), L, start, std::forward<Fx>(fx), std::forward<FxArgs>(args)...);
-			}
-		}
-
-		template <bool check_args = detail::default_safe_function_calls, typename R, typename... Args, typename Fx, typename... FxArgs>
-		inline decltype(auto) call(types<R> tr, types<Args...> ta, lua_State* L, Fx&& fx, FxArgs&&... args) {
-			if constexpr (std::is_void_v<R>) {
-				call<check_args>(tr, ta, L, 1, std::forward<Fx>(fx), std::forward<FxArgs>(args)...);
-			}
-			else {
-				return call<check_args>(tr, ta, L, 1, std::forward<Fx>(fx), std::forward<FxArgs>(args)...);
-			}
-		}
-
-		template <bool check_args = detail::default_safe_function_calls, typename R, typename... Args, typename Fx, typename... FxArgs>
-		inline decltype(auto) call_from_top(types<R> tr, types<Args...> ta, lua_State* L, Fx&& fx, FxArgs&&... args) {
-			using expected_count_t = meta::count_for_pack<lua_size, Args...>;
-			if constexpr (std::is_void_v<R>) {
-				call<check_args>(tr,
-				     ta,
-				     L,
-				     (std::max)(static_cast<int>(lua_gettop(L) - expected_count_t::value), static_cast<int>(0)),
-				     std::forward<Fx>(fx),
-				     std::forward<FxArgs>(args)...);
-			}
-			else {
-				return call<check_args>(tr,
-				     ta,
-				     L,
-				     (std::max)(static_cast<int>(lua_gettop(L) - expected_count_t::value), static_cast<int>(0)),
-				     std::forward<Fx>(fx),
-				     std::forward<FxArgs>(args)...);
-			}
-		}
-
-		template <bool check_args = detail::default_safe_function_calls, bool clean_stack = true, typename Ret0, typename... Ret, typename... Args,
-		     typename Fx, typename... FxArgs>
-		inline int call_into_lua(types<Ret0, Ret...> tr, types<Args...> ta, lua_State* L, int start, Fx&& fx, FxArgs&&... fxargs) {
-			if constexpr (std::is_void_v<Ret0>) {
-				call<check_args>(tr, ta, L, start, std::forward<Fx>(fx), std::forward<FxArgs>(fxargs)...);
-				if constexpr (clean_stack) {
-					lua_settop(L, 0);
-				}
-				return 0;
-			}
-			else {
-				(void)tr;
-				decltype(auto) r
-				     = call<check_args>(types<meta::return_type_t<Ret0, Ret...>>(), ta, L, start, std::forward<Fx>(fx), std::forward<FxArgs>(fxargs)...);
-				using R = meta::unqualified_t<decltype(r)>;
-				using is_stack = meta::any<is_stack_based<R>, std::is_same<R, absolute_index>, std::is_same<R, ref_index>, std::is_same<R, raw_index>>;
-				if constexpr (clean_stack && !is_stack::value) {
-					lua_settop(L, 0);
-				}
-				return push_reference(L, std::forward<decltype(r)>(r));
-			}
-		}
-
-		template <bool check_args = detail::default_safe_function_calls, bool clean_stack = true, typename Fx, typename... FxArgs>
-		inline int call_lua(lua_State* L, int start, Fx&& fx, FxArgs&&... fxargs) {
-			using traits_type = lua_bind_traits<meta::unqualified_t<Fx>>;
-			using args_list = typename traits_type::args_list;
-			using returns_list = typename traits_type::returns_list;
-			return call_into_lua<check_args, clean_stack>(returns_list(), args_list(), L, start, std::forward<Fx>(fx), std::forward<FxArgs>(fxargs)...);
-		}
-
-		inline call_syntax get_call_syntax(lua_State* L, const string_view& key, int index) {
-			if (lua_gettop(L) < 1) {
-				return call_syntax::dot;
-			}
-			luaL_getmetatable(L, key.data());
-			auto pn = pop_n(L, 1);
-			if (lua_compare(L, -1, index, LUA_OPEQ) != 1) {
-				return call_syntax::dot;
-			}
-			return call_syntax::colon;
-		}
-
-		inline void script(
-		     lua_State* L, lua_Reader reader, void* data, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
-			detail::typical_chunk_name_t basechunkname = {};
-			const char* chunknametarget = detail::make_chunk_name("lua_Reader", chunkname, basechunkname);
-			if (lua_load(L, reader, data, chunknametarget, to_string(mode).c_str()) || lua_pcall(L, 0, LUA_MULTRET, 0)) {
-				lua_error(L);
-			}
-		}
-
-		inline void script(
-		     lua_State* L, const string_view& code, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
-
-			detail::typical_chunk_name_t basechunkname = {};
-			const char* chunknametarget = detail::make_chunk_name(code, chunkname, basechunkname);
-			if (luaL_loadbufferx(L, code.data(), code.size(), chunknametarget, to_string(mode).c_str()) || lua_pcall(L, 0, LUA_MULTRET, 0)) {
-				lua_error(L);
-			}
-		}
-
-		inline void script_file(lua_State* L, const std::string& filename, load_mode mode = load_mode::any) {
-			if (luaL_loadfilex(L, filename.c_str(), to_string(mode).c_str()) || lua_pcall(L, 0, LUA_MULTRET, 0)) {
-				lua_error(L);
-			}
-		}
-
-		inline void luajit_exception_handler(lua_State* L, int (*handler)(lua_State*, lua_CFunction) = detail::c_trampoline) {
-#if SOL_IS_ON(SOL_USE_LUAJIT_EXCEPTION_TRAMPOLINE_I_)
-			if (L == nullptr) {
-				return;
-			}
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
-#endif // make sure stack doesn't overflow
-			lua_pushlightuserdata(L, (void*)handler);
-			auto pn = pop_n(L, 1);
-			luaJIT_setmode(L, -1, LUAJIT_MODE_WRAPCFUNC | LUAJIT_MODE_ON);
-#else
-			(void)L;
-			(void)handler;
-#endif
-		}
-
-		inline void luajit_exception_off(lua_State* L) {
-#if SOL_IS_ON(SOL_USE_LUAJIT_EXCEPTION_TRAMPOLINE_I_)
-			if (L == nullptr) {
-				return;
-			}
-			luaJIT_setmode(L, -1, LUAJIT_MODE_WRAPCFUNC | LUAJIT_MODE_OFF);
-#else
-			(void)L;
-#endif
-		}
-	} // namespace stack
-} // namespace sol
-
-// end of sol/stack.hpp
-
-// beginning of sol/object.hpp
-
-// beginning of sol/make_reference.hpp
-
-namespace sol {
-
-	template <typename R = reference, bool should_pop = !is_stack_based_v<R>, typename T>
-	R make_reference(lua_State* L, T&& value) {
-		int backpedal = stack::push(L, std::forward<T>(value));
-		R r = stack::get<R>(L, -backpedal);
-		if (should_pop) {
-			lua_pop(L, backpedal);
-		}
-		return r;
-	}
-
-	template <typename T, typename R = reference, bool should_pop = !is_stack_based_v<R>, typename... Args>
-	R make_reference(lua_State* L, Args&&... args) {
-		int backpedal = stack::push<T>(L, std::forward<Args>(args)...);
-		R r = stack::get<R>(L, -backpedal);
-		if (should_pop) {
-			lua_pop(L, backpedal);
-		}
-		return r;
-	}
-
-	template <typename R = reference, bool should_pop = !is_stack_based_v<R>, typename T>
-	R make_reference_userdata(lua_State* L, T&& value) {
-		int backpedal = stack::push_userdata(L, std::forward<T>(value));
-		R r = stack::get<R>(L, -backpedal);
-		if (should_pop) {
-			lua_pop(L, backpedal);
-		}
-		return r;
-	}
-
-	template <typename T, typename R = reference, bool should_pop = !is_stack_based_v<R>, typename... Args>
-	R make_reference_userdata(lua_State* L, Args&&... args) {
-		int backpedal = stack::push_userdata<T>(L, std::forward<Args>(args)...);
-		R r = stack::get<R>(L, -backpedal);
-		if (should_pop) {
-			lua_pop(L, backpedal);
-		}
-		return r;
-	}
-
-} // namespace sol
-
-// end of sol/make_reference.hpp
-
-// beginning of sol/object_base.hpp
-
-namespace sol {
-
-	template <typename ref_t>
-	class basic_object_base : public ref_t {
-	private:
-		using base_t = ref_t;
-		
-		template <typename T>
-		decltype(auto) as_stack(std::true_type) const {
-			return stack::get<T>(base_t::lua_state(), base_t::stack_index());
-		}
-
-		template <typename T>
-		decltype(auto) as_stack(std::false_type) const {
-			base_t::push();
-			return stack::pop<T>(base_t::lua_state());
-		}
-
-		template <typename T>
-		bool is_stack(std::true_type) const {
-			return stack::check<T>(base_t::lua_state(), base_t::stack_index(), no_panic);
-		}
-
-		template <typename T>
-		bool is_stack(std::false_type) const {
-			int r = base_t::registry_index();
-			if (r == LUA_REFNIL)
-				return meta::any_same<meta::unqualified_t<T>, lua_nil_t, nullopt_t, std::nullptr_t>::value ? true : false;
-			if (r == LUA_NOREF)
-				return false;
-			auto pp = stack::push_pop(*this);
-			return stack::check<T>(base_t::lua_state(), -1, no_panic);
-		}
-
-	public:
-		basic_object_base() noexcept = default;
-		basic_object_base(const basic_object_base&) = default;
-		basic_object_base(basic_object_base&&) = default;
-		basic_object_base& operator=(const basic_object_base&) = default;
-		basic_object_base& operator=(basic_object_base&&) = default;
-		template <typename T, typename... Args, meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_object_base>>> = meta::enabler>
-		basic_object_base(T&& arg, Args&&... args)
-		: base_t(std::forward<T>(arg), std::forward<Args>(args)...) {
-		}
-
-		template <typename T>
-		decltype(auto) as() const {
-			return as_stack<T>(is_stack_based<base_t>());
-		}
-
-		template <typename T>
-		bool is() const {
-			return is_stack<T>(is_stack_based<base_t>());
-		}
-	};
-} // namespace sol
-
-// end of sol/object_base.hpp
-
-namespace sol {
-
-	template <typename base_type>
-	class basic_object : public basic_object_base<base_type> {
-	private:
-		typedef basic_object_base<base_type> base_t;
-
-		template <bool invert_and_pop = false>
-		basic_object(std::integral_constant<bool, invert_and_pop>, lua_State* L, int index = -1) noexcept
-		: base_t(L, index) {
-			if (invert_and_pop) {
-				lua_pop(L, -index);
-			}
-		}
-
-	protected:
-		basic_object(detail::no_safety_tag, lua_nil_t n) : base_t(n) {
-		}
-		basic_object(detail::no_safety_tag, lua_State* L, int index) : base_t(L, index) {
-		}
-		basic_object(lua_State* L, detail::global_tag t) : base_t(L, t) {
-		}
-		basic_object(detail::no_safety_tag, lua_State* L, ref_index index) : base_t(L, index) {
-		}
-		template <typename T,
-		     meta::enable<meta::neg<meta::any_same<meta::unqualified_t<T>, basic_object>>, meta::neg<std::is_same<base_type, stack_reference>>,
-		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
-		basic_object(detail::no_safety_tag, T&& r) noexcept : base_t(std::forward<T>(r)) {
-		}
-
-		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
-		basic_object(detail::no_safety_tag, lua_State* L, T&& r) noexcept : base_t(L, std::forward<T>(r)) {
-		}
-
-	public:
-		basic_object() noexcept = default;
-		template <typename T, meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_object>>, meta::neg<std::is_same<base_type, stack_reference>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
-		basic_object(T&& r)
-		: base_t(std::forward<T>(r)) {
-		}
-		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
-		basic_object(lua_State* L, T&& r)
-		: base_t(L, std::forward<T>(r)) {
-		}
-		basic_object(lua_nil_t r)
-		: base_t(r) {
-		}
-		basic_object(const basic_object&) = default;
-		basic_object(basic_object&&) = default;
-		basic_object(const stack_reference& r) noexcept
-		: basic_object(r.lua_state(), r.stack_index()) {
-		}
-		basic_object(stack_reference&& r) noexcept
-		: basic_object(r.lua_state(), r.stack_index()) {
-		}
-		template <typename Super>
-		basic_object(const proxy_base<Super>& r) noexcept
-		: basic_object(r.operator basic_object()) {
-		}
-		template <typename Super>
-		basic_object(proxy_base<Super>&& r) noexcept
-		: basic_object(r.operator basic_object()) {
-		}
-		basic_object(lua_State* L, lua_nil_t r) noexcept
-		: base_t(L, r) {
-		}
-		basic_object(lua_State* L, int index = -1) noexcept
-		: base_t(L, index) {
-		}
-		basic_object(lua_State* L, absolute_index index) noexcept
-		: base_t(L, index) {
-		}
-		basic_object(lua_State* L, raw_index index) noexcept
-		: base_t(L, index) {
-		}
-		basic_object(lua_State* L, ref_index index) noexcept
-		: base_t(L, index) {
-		}
-		template <typename T, typename... Args>
-		basic_object(lua_State* L, in_place_type_t<T>, Args&&... args) noexcept
-		: basic_object(std::integral_constant<bool, !is_stack_based<base_t>::value>(), L, -stack::push<T>(L, std::forward<Args>(args)...)) {
-		}
-		template <typename T, typename... Args>
-		basic_object(lua_State* L, in_place_t, T&& arg, Args&&... args) noexcept
-		: basic_object(L, in_place_type<T>, std::forward<T>(arg), std::forward<Args>(args)...) {
-		}
-		basic_object& operator=(const basic_object&) = default;
-		basic_object& operator=(basic_object&&) = default;
-		basic_object& operator=(const base_type& b) {
-			base_t::operator=(b);
-			return *this;
-		}
-		basic_object& operator=(base_type&& b) {
-			base_t::operator=(std::move(b));
-			return *this;
-		}
-		template <typename Super>
-		basic_object& operator=(const proxy_base<Super>& r) {
-			this->operator=(r.operator basic_object());
-			return *this;
-		}
-		template <typename Super>
-		basic_object& operator=(proxy_base<Super>&& r) {
-			this->operator=(r.operator basic_object());
-			return *this;
-		}
-	};
-
-	template <typename T>
-	object make_object(lua_State* L, T&& value) {
-		return make_reference<object, true>(L, std::forward<T>(value));
-	}
-
-	template <typename T, typename... Args>
-	object make_object(lua_State* L, Args&&... args) {
-		return make_reference<T, object, true>(L, std::forward<Args>(args)...);
-	}
-
-	template <typename T>
-	object make_object_userdata(lua_State* L, T&& value) {
-		return make_reference_userdata<object, true>(L, std::forward<T>(value));
-	}
-
-	template <typename T, typename... Args>
-	object make_object_userdata(lua_State* L, Args&&... args) {
-		return make_reference_userdata<T, object, true>(L, std::forward<Args>(args)...);
-	}
-} // namespace sol
-
-// end of sol/object.hpp
-
-// beginning of sol/function.hpp
-
-// beginning of sol/unsafe_function.hpp
-
-// beginning of sol/function_result.hpp
-
-// beginning of sol/protected_function_result.hpp
-
-// beginning of sol/proxy_base.hpp
-
-namespace sol {
-	struct proxy_base_tag {};
-
-	namespace detail {
-		template <typename T>
-		using proxy_key_t = meta::conditional_t<meta::is_specialization_of_v<meta::unqualified_t<T>, std::tuple>, T,
-		     std::tuple<meta::conditional_t<std::is_array_v<meta::unqualified_t<T>>, std::remove_reference_t<T>&, meta::unqualified_t<T>>>>;
-	}
-
-	template <typename Super>
-	struct proxy_base : proxy_base_tag {
-		operator std::string() const {
-			const Super& super = *static_cast<const Super*>(static_cast<const void*>(this));
-			return super.template get<std::string>();
-		}
-
-		template <typename T, meta::enable<meta::neg<meta::is_string_constructible<T>>, is_proxy_primitive<meta::unqualified_t<T>>> = meta::enabler>
-		operator T() const {
-			const Super& super = *static_cast<const Super*>(static_cast<const void*>(this));
-			return super.template get<T>();
-		}
-
-		template <typename T, meta::enable<meta::neg<meta::is_string_constructible<T>>, meta::neg<is_proxy_primitive<meta::unqualified_t<T>>>> = meta::enabler>
-		operator T&() const {
-			const Super& super = *static_cast<const Super*>(static_cast<const void*>(this));
-			return super.template get<T&>();
-		}
-
-		lua_State* lua_state() const {
-			const Super& super = *static_cast<const Super*>(static_cast<const void*>(this));
-			return super.lua_state();
-		}
-	};
-} // namespace sol
-
-// end of sol/proxy_base.hpp
-
-// beginning of sol/stack_iterator.hpp
-
-#include <limits>
-#include <iterator>
-
-namespace sol {
-	template <typename proxy_t, bool is_const>
-	struct stack_iterator {
-		typedef meta::conditional_t<is_const, const proxy_t, proxy_t> reference;
-		typedef meta::conditional_t<is_const, const proxy_t*, proxy_t*> pointer;
-		typedef proxy_t value_type;
-		typedef std::ptrdiff_t difference_type;
-		typedef std::random_access_iterator_tag iterator_category;
-		lua_State* L;
-		int index;
-		int stacktop;
-		proxy_t sp;
-
-		stack_iterator()
-			: L(nullptr), index((std::numeric_limits<int>::max)()), stacktop((std::numeric_limits<int>::max)()), sp() {
-		}
-		stack_iterator(const stack_iterator<proxy_t, true>& r)
-			: L(r.L), index(r.index), stacktop(r.stacktop), sp(r.sp) {
-		}
-		stack_iterator(lua_State* luastate, int idx, int topidx)
-			: L(luastate), index(idx), stacktop(topidx), sp(luastate, idx) {
-		}
-
-		reference operator*() {
-			return proxy_t(L, index);
-		}
-
-		reference operator*() const {
-			return proxy_t(L, index);
-		}
-
-		pointer operator->() {
-			sp = proxy_t(L, index);
-			return &sp;
-		}
-
-		pointer operator->() const {
-			const_cast<proxy_t&>(sp) = proxy_t(L, index);
-			return &sp;
-		}
-
-		stack_iterator& operator++() {
-			++index;
-			return *this;
-		}
-
-		stack_iterator operator++(int) {
-			auto r = *this;
-			this->operator++();
-			return r;
-		}
-
-		stack_iterator& operator--() {
-			--index;
-			return *this;
-		}
-
-		stack_iterator operator--(int) {
-			auto r = *this;
-			this->operator--();
-			return r;
-		}
-
-		stack_iterator& operator+=(difference_type idx) {
-			index += static_cast<int>(idx);
-			return *this;
-		}
-
-		stack_iterator& operator-=(difference_type idx) {
-			index -= static_cast<int>(idx);
-			return *this;
-		}
-
-		difference_type operator-(const stack_iterator& r) const {
-			return index - r.index;
-		}
-
-		stack_iterator operator+(difference_type idx) const {
-			stack_iterator r = *this;
-			r += idx;
-			return r;
-		}
-
-		reference operator[](difference_type idx) const {
-			return proxy_t(L, index + static_cast<int>(idx));
-		}
-
-		bool operator==(const stack_iterator& r) const {
-			if (stacktop == (std::numeric_limits<int>::max)()) {
-				return r.index == r.stacktop;
-			}
-			else if (r.stacktop == (std::numeric_limits<int>::max)()) {
-				return index == stacktop;
-			}
-			return index == r.index;
-		}
-
-		bool operator!=(const stack_iterator& r) const {
-			return !(this->operator==(r));
-		}
-
-		bool operator<(const stack_iterator& r) const {
-			return index < r.index;
-		}
-
-		bool operator>(const stack_iterator& r) const {
-			return index > r.index;
-		}
-
-		bool operator<=(const stack_iterator& r) const {
-			return index <= r.index;
-		}
-
-		bool operator>=(const stack_iterator& r) const {
-			return index >= r.index;
-		}
-	};
-
-	template <typename proxy_t, bool is_const>
-	inline stack_iterator<proxy_t, is_const> operator+(typename stack_iterator<proxy_t, is_const>::difference_type n, const stack_iterator<proxy_t, is_const>& r) {
-		return r + n;
-	}
-} // namespace sol
-
-// end of sol/stack_iterator.hpp
-
-// beginning of sol/stack_proxy.hpp
-
-// beginning of sol/stack_proxy_base.hpp
-
-namespace sol {
-	struct stack_proxy_base : public proxy_base<stack_proxy_base> {
-	private:
-		lua_State* L;
-		int index;
-
-	public:
-		stack_proxy_base()
-			: L(nullptr), index(0) {
-		}
-		stack_proxy_base(lua_State* L, int index)
-			: L(L), index(index) {
-		}
-
-		template <typename T>
-		decltype(auto) get() const {
-			return stack::get<T>(L, stack_index());
-		}
-
-		template <typename T>
-		bool is() const {
-			return stack::check<T>(L, stack_index());
-		}
-
-		template <typename T>
-		decltype(auto) as() const {
-			return get<T>();
-		}
-
-		type get_type() const noexcept {
-			return type_of(lua_state(), stack_index());
-		}
-
-		int push() const {
-			return push(L);
-		}
-
-		int push(lua_State* Ls) const {
-			lua_pushvalue(Ls, index);
-			return 1;
-		}
-
-		lua_State* lua_state() const {
-			return L;
-		}
-		int stack_index() const {
-			return index;
-		}
-	};
-
-	namespace stack {
-		template <>
-		struct unqualified_getter<stack_proxy_base> {
-			static stack_proxy_base get(lua_State* L, int index = -1) {
-				return stack_proxy_base(L, index);
-			}
-		};
-
-		template <>
-		struct unqualified_pusher<stack_proxy_base> {
-			static int push(lua_State*, const stack_proxy_base& ref) {
-				return ref.push();
-			}
-		};
-	} // namespace stack
-
-} // namespace sol
-
-// end of sol/stack_proxy_base.hpp
-
-namespace sol {
-	struct stack_proxy : public stack_proxy_base {
-	public:
-		stack_proxy() : stack_proxy_base() {
-		}
-		stack_proxy(lua_State* L, int index) : stack_proxy_base(L, index) {
-		}
-
-		template <typename... Ret, typename... Args>
-		decltype(auto) call(Args&&... args);
-
-		template <typename... Args>
-		decltype(auto) operator()(Args&&... args) {
-			return call<>(std::forward<Args>(args)...);
-		}
-	};
-
-	namespace stack {
-		template <>
-		struct unqualified_getter<stack_proxy> {
-			static stack_proxy get(lua_State* L, int index, record& tracking) {
-				tracking.use(0);
-				return stack_proxy(L, index);
-			}
-		};
-
-		template <>
-		struct unqualified_pusher<stack_proxy> {
-			static int push(lua_State*, const stack_proxy& ref) {
-				return ref.push();
-			}
-		};
-	} // namespace stack
-} // namespace sol
-
-// end of sol/stack_proxy.hpp
-
-#include <cstdint>
-
-namespace sol {
-	struct protected_function_result : public proxy_base<protected_function_result> {
-	private:
-		lua_State* L;
-		int index;
-		int returncount;
-		int popcount;
-		call_status err;
-
-	public:
-		typedef stack_proxy reference_type;
-		typedef stack_proxy value_type;
-		typedef stack_proxy* pointer;
-		typedef std::ptrdiff_t difference_type;
-		typedef std::size_t size_type;
-		typedef stack_iterator<stack_proxy, false> iterator;
-		typedef stack_iterator<stack_proxy, true> const_iterator;
-		typedef std::reverse_iterator<iterator> reverse_iterator;
-		typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-
-		protected_function_result() noexcept = default;
-		protected_function_result(lua_State* Ls, int idx = -1, int retnum = 0, int popped = 0, call_status pferr = call_status::ok) noexcept
-		: L(Ls), index(idx), returncount(retnum), popcount(popped), err(pferr) {
-		}
-
-		// We do not want anyone to copy these around willy-nilly
-		// Will likely break people, but also will probably get rid of quiet bugs that have
-		// been lurking. (E.g., Vanilla Lua will just quietly discard over-pops and under-pops:
-		// LuaJIT and other Lua engines will implode and segfault at random later times.)
-		protected_function_result(const protected_function_result&) = delete;
-		protected_function_result& operator=(const protected_function_result&) = delete;
-
-		protected_function_result(protected_function_result&& o) noexcept
-		: L(o.L), index(o.index), returncount(o.returncount), popcount(o.popcount), err(o.err) {
-			// Must be manual, otherwise destructor will screw us
-			// return count being 0 is enough to keep things clean
-			// but we will be thorough
-			o.abandon();
-		}
-		protected_function_result& operator=(protected_function_result&& o) noexcept {
-			L = o.L;
-			index = o.index;
-			returncount = o.returncount;
-			popcount = o.popcount;
-			err = o.err;
-			// Must be manual, otherwise destructor will screw us
-			// return count being 0 is enough to keep things clean
-			// but we will be thorough
-			o.abandon();
-			return *this;
-		}
-
-		protected_function_result(const unsafe_function_result& o) = delete;
-		protected_function_result& operator=(const unsafe_function_result& o) = delete;
-		protected_function_result(unsafe_function_result&& o) noexcept;
-		protected_function_result& operator=(unsafe_function_result&& o) noexcept;
-
-		call_status status() const noexcept {
-			return err;
-		}
-
-		bool valid() const noexcept {
-			return status() == call_status::ok || status() == call_status::yielded;
-		}
-
-		template <typename T>
-		decltype(auto) get(int index_offset = 0) const {
-			using UT = meta::unqualified_t<T>;
-			int target = index + index_offset;
-			if constexpr (meta::is_optional_v<UT>) {
-				using ValueType = typename UT::value_type;
-				if constexpr (std::is_same_v<ValueType, error>) {
-					if (valid()) {
-						return UT();
-					}
-					return UT(error(detail::direct_error, stack::get<std::string>(L, target)));
-				}
-				else {
-					if (!valid()) {
-						return UT();
-					}
-					return stack::get<UT>(L, target);
-				}
-			}
-			else {
-				if constexpr (std::is_same_v<T, error>) {
-#if SOL_IS_ON(SOL_SAFE_PROXIES_I_)
-					if (valid()) {
-						type t = type_of(L, target);
-						type_panic_c_str(L, target, t, type::none, "bad get from protected_function_result (is an error)");
-					}
-#endif // Check Argument Safety
-					return error(detail::direct_error, stack::get<std::string>(L, target));
-				}
-				else {
-#if SOL_IS_ON(SOL_SAFE_PROXIES_I_)
-					if (!valid()) {
-						type t = type_of(L, target);
-						type_panic_c_str(L, target, t, type::none, "bad get from protected_function_result (is not an error)");
-					}
-#endif // Check Argument Safety
-					return stack::get<T>(L, target);
-				}
-			}
-		}
-
-		type get_type(int index_offset = 0) const noexcept {
-			return type_of(L, index + static_cast<int>(index_offset));
-		}
-
-		stack_proxy operator[](difference_type index_offset) const {
-			return stack_proxy(L, index + static_cast<int>(index_offset));
-		}
-
-		iterator begin() {
-			return iterator(L, index, stack_index() + return_count());
-		}
-		iterator end() {
-			return iterator(L, stack_index() + return_count(), stack_index() + return_count());
-		}
-		const_iterator begin() const {
-			return const_iterator(L, index, stack_index() + return_count());
-		}
-		const_iterator end() const {
-			return const_iterator(L, stack_index() + return_count(), stack_index() + return_count());
-		}
-		const_iterator cbegin() const {
-			return begin();
-		}
-		const_iterator cend() const {
-			return end();
-		}
-
-		reverse_iterator rbegin() {
-			return std::reverse_iterator<iterator>(begin());
-		}
-		reverse_iterator rend() {
-			return std::reverse_iterator<iterator>(end());
-		}
-		const_reverse_iterator rbegin() const {
-			return std::reverse_iterator<const_iterator>(begin());
-		}
-		const_reverse_iterator rend() const {
-			return std::reverse_iterator<const_iterator>(end());
-		}
-		const_reverse_iterator crbegin() const {
-			return std::reverse_iterator<const_iterator>(cbegin());
-		}
-		const_reverse_iterator crend() const {
-			return std::reverse_iterator<const_iterator>(cend());
-		}
-
-		lua_State* lua_state() const noexcept {
-			return L;
-		};
-		int stack_index() const noexcept {
-			return index;
-		};
-		int return_count() const noexcept {
-			return returncount;
-		};
-		int pop_count() const noexcept {
-			return popcount;
-		};
-		void abandon() noexcept {
-			// L = nullptr;
-			index = 0;
-			returncount = 0;
-			popcount = 0;
-			err = call_status::runtime;
-		}
-		~protected_function_result() {
-			stack::remove(L, index, popcount);
-		}
-	};
-
-	namespace stack {
-		template <>
-		struct unqualified_pusher<protected_function_result> {
-			static int push(lua_State* L, const protected_function_result& pfr) {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-				luaL_checkstack(L, static_cast<int>(pfr.pop_count()), detail::not_enough_stack_space_generic);
-#endif // make sure stack doesn't overflow
-				int p = 0;
-				for (int i = 0; i < pfr.pop_count(); ++i) {
-					lua_pushvalue(L, i + pfr.stack_index());
-					++p;
-				}
-				return p;
-			}
-		};
-	} // namespace stack
-} // namespace sol
-
-// end of sol/protected_function_result.hpp
-
-// beginning of sol/unsafe_function_result.hpp
-
-#include <cstdint>
-
-namespace sol {
-	struct unsafe_function_result : public proxy_base<unsafe_function_result> {
-	private:
-		lua_State* L;
-		int index;
-		int returncount;
-
-	public:
-		typedef stack_proxy reference_type;
-		typedef stack_proxy value_type;
-		typedef stack_proxy* pointer;
-		typedef std::ptrdiff_t difference_type;
-		typedef std::size_t size_type;
-		typedef stack_iterator<stack_proxy, false> iterator;
-		typedef stack_iterator<stack_proxy, true> const_iterator;
-		typedef std::reverse_iterator<iterator> reverse_iterator;
-		typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-
-		unsafe_function_result() noexcept = default;
-		unsafe_function_result(lua_State* Ls, int idx = -1, int retnum = 0) noexcept : L(Ls), index(idx), returncount(retnum) {
-		}
-
-		// We do not want anyone to copy these around willy-nilly
-		// Will likely break people, but also will probably get rid of quiet bugs that have
-		// been lurking. (E.g., Vanilla Lua will just quietly discard over-pops and under-pops:
-		// LuaJIT and other Lua engines will implode and segfault at random later times.)
-		unsafe_function_result(const unsafe_function_result&) = delete;
-		unsafe_function_result& operator=(const unsafe_function_result&) = delete;
-
-		unsafe_function_result(unsafe_function_result&& o) noexcept : L(o.L), index(o.index), returncount(o.returncount) {
-			// Must be manual, otherwise destructor will screw us
-			// return count being 0 is enough to keep things clean
-			// but will be thorough
-			o.abandon();
-		}
-		unsafe_function_result& operator=(unsafe_function_result&& o) noexcept {
-			L = o.L;
-			index = o.index;
-			returncount = o.returncount;
-			// Must be manual, otherwise destructor will screw us
-			// return count being 0 is enough to keep things clean
-			// but will be thorough
-			o.abandon();
-			return *this;
-		}
-
-		unsafe_function_result(const protected_function_result& o) = delete;
-		unsafe_function_result& operator=(const protected_function_result& o) = delete;
-		unsafe_function_result(protected_function_result&& o) noexcept;
-		unsafe_function_result& operator=(protected_function_result&& o) noexcept;
-
-		template <typename T>
-		decltype(auto) get(difference_type index_offset = 0) const {
-			return stack::get<T>(L, index + static_cast<int>(index_offset));
-		}
-
-		type get_type(difference_type index_offset = 0) const noexcept {
-			return type_of(L, index + static_cast<int>(index_offset));
-		}
-
-		stack_proxy operator[](difference_type index_offset) const {
-			return stack_proxy(L, index + static_cast<int>(index_offset));
-		}
-
-		iterator begin() {
-			return iterator(L, index, stack_index() + return_count());
-		}
-		iterator end() {
-			return iterator(L, stack_index() + return_count(), stack_index() + return_count());
-		}
-		const_iterator begin() const {
-			return const_iterator(L, index, stack_index() + return_count());
-		}
-		const_iterator end() const {
-			return const_iterator(L, stack_index() + return_count(), stack_index() + return_count());
-		}
-		const_iterator cbegin() const {
-			return begin();
-		}
-		const_iterator cend() const {
-			return end();
-		}
-
-		reverse_iterator rbegin() {
-			return std::reverse_iterator<iterator>(begin());
-		}
-		reverse_iterator rend() {
-			return std::reverse_iterator<iterator>(end());
-		}
-		const_reverse_iterator rbegin() const {
-			return std::reverse_iterator<const_iterator>(begin());
-		}
-		const_reverse_iterator rend() const {
-			return std::reverse_iterator<const_iterator>(end());
-		}
-		const_reverse_iterator crbegin() const {
-			return std::reverse_iterator<const_iterator>(cbegin());
-		}
-		const_reverse_iterator crend() const {
-			return std::reverse_iterator<const_iterator>(cend());
-		}
-
-		call_status status() const noexcept {
-			return call_status::ok;
-		}
-
-		bool valid() const noexcept {
-			return status() == call_status::ok || status() == call_status::yielded;
-		}
-
-		lua_State* lua_state() const {
-			return L;
-		};
-		int stack_index() const {
-			return index;
-		};
-		int return_count() const {
-			return returncount;
-		};
-		void abandon() noexcept {
-			// L = nullptr;
-			index = 0;
-			returncount = 0;
-		}
-		~unsafe_function_result() {
-			lua_pop(L, returncount);
-		}
-	};
-
-	namespace stack {
-		template <>
-		struct unqualified_pusher<unsafe_function_result> {
-			static int push(lua_State* L, const unsafe_function_result& fr) {
-				int p = 0;
-				for (int i = 0; i < fr.return_count(); ++i) {
-					lua_pushvalue(L, i + fr.stack_index());
-					++p;
-				}
-				return p;
-			}
-		};
-	} // namespace stack
-} // namespace sol
-
-// end of sol/unsafe_function_result.hpp
-
-#include <cstdint>
-
-namespace sol {
-
-	namespace detail {
-		template <>
-		struct is_speshul<unsafe_function_result> : std::true_type {};
-		template <>
-		struct is_speshul<protected_function_result> : std::true_type {};
-
-		template <std::size_t I, typename... Args, typename T>
-		stack_proxy get(types<Args...>, meta::index_value<0>, meta::index_value<I>, const T& fr) {
-			return stack_proxy(fr.lua_state(), static_cast<int>(fr.stack_index() + I));
-		}
-
-		template <std::size_t I, std::size_t N, typename Arg, typename... Args, typename T, meta::enable<meta::boolean<(N > 0)>> = meta::enabler>
-		stack_proxy get(types<Arg, Args...>, meta::index_value<N>, meta::index_value<I>, const T& fr) {
-			return get(types<Args...>(), meta::index_value<N - 1>(), meta::index_value<I + lua_size<Arg>::value>(), fr);
-		}
-	} // namespace detail
-
-	template <>
-	struct tie_size<unsafe_function_result> : std::integral_constant<std::size_t, SIZE_MAX> {};
-
-	template <>
-	struct tie_size<protected_function_result> : std::integral_constant<std::size_t, SIZE_MAX> {};
-
-	template <std::size_t I>
-	stack_proxy get(const unsafe_function_result& fr) {
-		return stack_proxy(fr.lua_state(), static_cast<int>(fr.stack_index() + I));
-	}
-
-	template <std::size_t I, typename... Args>
-	stack_proxy get(types<Args...> t, const unsafe_function_result& fr) {
-		return detail::get(t, meta::index_value<I>(), meta::index_value<0>(), fr);
-	}
-
-	template <std::size_t I>
-	stack_proxy get(const protected_function_result& fr) {
-		return stack_proxy(fr.lua_state(), static_cast<int>(fr.stack_index() + I));
-	}
-
-	template <std::size_t I, typename... Args>
-	stack_proxy get(types<Args...> t, const protected_function_result& fr) {
-		return detail::get(t, meta::index_value<I>(), meta::index_value<0>(), fr);
-	}
-} // namespace sol
-
-// end of sol/function_result.hpp
-
-// beginning of sol/function_types.hpp
-
-// beginning of sol/function_types_core.hpp
-
-// beginning of sol/wrapper.hpp
-
-namespace sol {
-
-	namespace detail {
-		template <typename T>
-		using array_return_type = meta::conditional_t<std::is_array<T>::value, std::add_lvalue_reference_t<T>, T>;
-	}
-
-	template <typename F, typename = void>
-	struct wrapper {
-		typedef lua_bind_traits<meta::unqualified_t<F>> traits_type;
-		typedef typename traits_type::args_list args_list;
-		typedef typename traits_type::args_list free_args_list;
-		typedef typename traits_type::returns_list returns_list;
-
-		template <typename... Args>
-		static decltype(auto) call(F& f, Args&&... args) {
-			return f(std::forward<Args>(args)...);
-		}
-
-		struct caller {
-			template <typename... Args>
-			decltype(auto) operator()(F& fx, Args&&... args) const {
-				return call(fx, std::forward<Args>(args)...);
-			}
-		};
-	};
-
-	template <typename F>
-	struct wrapper<F, std::enable_if_t<std::is_function<std::remove_pointer_t<meta::unqualified_t<F>>>::value>> {
-		typedef lua_bind_traits<std::remove_pointer_t<meta::unqualified_t<F>>> traits_type;
-		typedef typename traits_type::args_list args_list;
-		typedef typename traits_type::args_list free_args_list;
-		typedef typename traits_type::returns_list returns_list;
-
-		template <F fx, typename... Args>
-		static decltype(auto) invoke(Args&&... args) {
-			return fx(std::forward<Args>(args)...);
-		}
-
-		template <typename... Args>
-		static decltype(auto) call(F& fx, Args&&... args) {
-			return fx(std::forward<Args>(args)...);
-		}
-
-		struct caller {
-			template <typename... Args>
-			decltype(auto) operator()(F& fx, Args&&... args) const {
-				return call(fx, std::forward<Args>(args)...);
-			}
-		};
-
-		template <F fx>
-		struct invoker {
-			template <typename... Args>
-			decltype(auto) operator()(Args&&... args) const {
-				return invoke<fx>(std::forward<Args>(args)...);
-			}
-		};
-	};
-
-	template <typename F>
-	struct wrapper<F, std::enable_if_t<std::is_member_object_pointer<meta::unqualified_t<F>>::value>> {
-		typedef lua_bind_traits<meta::unqualified_t<F>> traits_type;
-		typedef typename traits_type::object_type object_type;
-		typedef typename traits_type::return_type return_type;
-		typedef typename traits_type::args_list args_list;
-		typedef types<object_type&, return_type> free_args_list;
-		typedef typename traits_type::returns_list returns_list;
-
-		template <F fx>
-		static auto call(object_type& mem) -> detail::array_return_type<decltype(mem.*fx)> {
-			return mem.*fx;
-		}
-
-		template <F fx, typename Arg, typename... Args>
-		static decltype(auto) invoke(object_type& mem, Arg&& arg, Args&&...) {
-			return mem.*fx = std::forward<Arg>(arg);
-		}
-
-		template <typename Fx>
-		static auto call(Fx&& fx, object_type& mem) -> detail::array_return_type<decltype(mem.*fx)> {
-			return mem.*fx;
-		}
-
-		template <typename Fx, typename Arg, typename... Args>
-		static void call(Fx&& fx, object_type& mem, Arg&& arg, Args&&...) {
-			using actual_type = meta::unqualified_t<detail::array_return_type<decltype(mem.*fx)>>;
-			if constexpr (std::is_array_v<actual_type>) {
-				using std::cbegin;
-				using std::cend;
-				auto first = cbegin(arg);
-				auto last = cend(arg);
-				for (std::size_t i = 0; first != last; ++i, ++first) {
-					(mem.*fx)[i] = *first;
-				}
-			}
-			else {
-				(mem.*fx) = std::forward<Arg>(arg);
-			}
-		}
-
-		struct caller {
-			template <typename Fx, typename... Args>
-			decltype(auto) operator()(Fx&& fx, object_type& mem, Args&&... args) const {
-				return call(std::forward<Fx>(fx), mem, std::forward<Args>(args)...);
-			}
-		};
-
-		template <F fx>
-		struct invoker {
-			template <typename... Args>
-			decltype(auto) operator()(Args&&... args) const {
-				return invoke<fx>(std::forward<Args>(args)...);
-			}
-		};
-	};
-
-	template <typename F, typename R, typename O, typename... FArgs>
-	struct member_function_wrapper {
-		typedef O object_type;
-		typedef lua_bind_traits<F> traits_type;
-		typedef typename traits_type::args_list args_list;
-		typedef types<object_type&, FArgs...> free_args_list;
-		typedef meta::tuple_types<R> returns_list;
-
-		template <F fx, typename... Args>
-		static R invoke(O& mem, Args&&... args) {
-			return (mem.*fx)(std::forward<Args>(args)...);
-		}
-
-		template <typename Fx, typename... Args>
-		static R call(Fx&& fx, O& mem, Args&&... args) {
-			return (mem.*fx)(std::forward<Args>(args)...);
-		}
-
-		struct caller {
-			template <typename Fx, typename... Args>
-			decltype(auto) operator()(Fx&& fx, O& mem, Args&&... args) const {
-				return call(std::forward<Fx>(fx), mem, std::forward<Args>(args)...);
-			}
-		};
-
-		template <F fx>
-		struct invoker {
-			template <typename... Args>
-			decltype(auto) operator()(O& mem, Args&&... args) const {
-				return invoke<fx>(mem, std::forward<Args>(args)...);
-			}
-		};
-	};
-
-	template <typename R, typename O, typename... Args>
-	struct wrapper<R (O::*)(Args...)> : public member_function_wrapper<R (O::*)(Args...), R, O, Args...> {};
-
-	template <typename R, typename O, typename... Args>
-	struct wrapper<R (O::*)(Args...) const> : public member_function_wrapper<R (O::*)(Args...) const, R, O, Args...> {};
-
-	template <typename R, typename O, typename... Args>
-	struct wrapper<R (O::*)(Args...) const volatile> : public member_function_wrapper<R (O::*)(Args...) const volatile, R, O, Args...> {};
-
-	template <typename R, typename O, typename... Args>
-	struct wrapper<R (O::*)(Args...)&> : public member_function_wrapper<R (O::*)(Args...)&, R, O, Args...> {};
-
-	template <typename R, typename O, typename... Args>
-	struct wrapper<R (O::*)(Args...) const&> : public member_function_wrapper<R (O::*)(Args...) const&, R, O, Args...> {};
-
-	template <typename R, typename O, typename... Args>
-	struct wrapper<R (O::*)(Args...) const volatile&> : public member_function_wrapper<R (O::*)(Args...) const volatile&, R, O, Args...> {};
-
-	template <typename R, typename O, typename... Args>
-	struct wrapper<R (O::*)(Args..., ...)&> : public member_function_wrapper<R (O::*)(Args..., ...)&, R, O, Args...> {};
-
-	template <typename R, typename O, typename... Args>
-	struct wrapper<R (O::*)(Args..., ...) const&> : public member_function_wrapper<R (O::*)(Args..., ...) const&, R, O, Args...> {};
-
-	template <typename R, typename O, typename... Args>
-	struct wrapper<R (O::*)(Args..., ...) const volatile&> : public member_function_wrapper<R (O::*)(Args..., ...) const volatile&, R, O, Args...> {};
-
-	template <typename R, typename O, typename... Args>
-	struct wrapper<R (O::*)(Args...) &&> : public member_function_wrapper<R (O::*)(Args...)&, R, O, Args...> {};
-
-	template <typename R, typename O, typename... Args>
-	struct wrapper<R (O::*)(Args...) const&&> : public member_function_wrapper<R (O::*)(Args...) const&, R, O, Args...> {};
-
-	template <typename R, typename O, typename... Args>
-	struct wrapper<R (O::*)(Args...) const volatile&&> : public member_function_wrapper<R (O::*)(Args...) const volatile&, R, O, Args...> {};
-
-	template <typename R, typename O, typename... Args>
-	struct wrapper<R (O::*)(Args..., ...) &&> : public member_function_wrapper<R (O::*)(Args..., ...)&, R, O, Args...> {};
-
-	template <typename R, typename O, typename... Args>
-	struct wrapper<R (O::*)(Args..., ...) const&&> : public member_function_wrapper<R (O::*)(Args..., ...) const&, R, O, Args...> {};
-
-	template <typename R, typename O, typename... Args>
-	struct wrapper<R (O::*)(Args..., ...) const volatile&&> : public member_function_wrapper<R (O::*)(Args..., ...) const volatile&, R, O, Args...> {};
-
-#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_)
-	// noexcept has become a part of a function's type
-
-	template <typename R, typename O, typename... Args>
-	struct wrapper<R (O::*)(Args...) noexcept> : public member_function_wrapper<R (O::*)(Args...) noexcept, R, O, Args...> {};
-
-	template <typename R, typename O, typename... Args>
-	struct wrapper<R (O::*)(Args...) const noexcept> : public member_function_wrapper<R (O::*)(Args...) const noexcept, R, O, Args...> {};
-
-	template <typename R, typename O, typename... Args>
-	struct wrapper<R (O::*)(Args...) const volatile noexcept> : public member_function_wrapper<R (O::*)(Args...) const volatile noexcept, R, O, Args...> {};
-
-	template <typename R, typename O, typename... Args>
-	struct wrapper<R (O::*)(Args...) & noexcept> : public member_function_wrapper<R (O::*)(Args...) & noexcept, R, O, Args...> {};
-
-	template <typename R, typename O, typename... Args>
-	struct wrapper<R (O::*)(Args...) const& noexcept> : public member_function_wrapper<R (O::*)(Args...) const& noexcept, R, O, Args...> {};
-
-	template <typename R, typename O, typename... Args>
-	struct wrapper<R (O::*)(Args...) const volatile& noexcept> : public member_function_wrapper<R (O::*)(Args...) const volatile& noexcept, R, O, Args...> {};
-
-	template <typename R, typename O, typename... Args>
-	struct wrapper<R (O::*)(Args..., ...) & noexcept> : public member_function_wrapper<R (O::*)(Args..., ...) & noexcept, R, O, Args...> {};
-
-	template <typename R, typename O, typename... Args>
-	struct wrapper<R (O::*)(Args..., ...) const& noexcept> : public member_function_wrapper<R (O::*)(Args..., ...) const& noexcept, R, O, Args...> {};
-
-	template <typename R, typename O, typename... Args>
-	struct wrapper<R (O::*)(Args..., ...) const volatile& noexcept>
-	: public member_function_wrapper<R (O::*)(Args..., ...) const volatile& noexcept, R, O, Args...> {};
-
-	template <typename R, typename O, typename... Args>
-	struct wrapper<R (O::*)(Args...) && noexcept> : public member_function_wrapper<R (O::*)(Args...) & noexcept, R, O, Args...> {};
-
-	template <typename R, typename O, typename... Args>
-	struct wrapper<R (O::*)(Args...) const&& noexcept> : public member_function_wrapper<R (O::*)(Args...) const& noexcept, R, O, Args...> {};
-
-	template <typename R, typename O, typename... Args>
-	struct wrapper<R (O::*)(Args...) const volatile&& noexcept> : public member_function_wrapper<R (O::*)(Args...) const volatile& noexcept, R, O, Args...> {};
-
-	template <typename R, typename O, typename... Args>
-	struct wrapper<R (O::*)(Args..., ...) && noexcept> : public member_function_wrapper<R (O::*)(Args..., ...) & noexcept, R, O, Args...> {};
-
-	template <typename R, typename O, typename... Args>
-	struct wrapper<R (O::*)(Args..., ...) const&& noexcept> : public member_function_wrapper<R (O::*)(Args..., ...) const& noexcept, R, O, Args...> {};
-
-	template <typename R, typename O, typename... Args>
-	struct wrapper<R (O::*)(Args..., ...) const volatile&& noexcept>
-	: public member_function_wrapper<R (O::*)(Args..., ...) const volatile& noexcept, R, O, Args...> {};
-
-#endif // noexcept is part of a function's type
-
-} // namespace sol
-
-// end of sol/wrapper.hpp
-
-#include <memory>
-
-namespace sol {
-namespace function_detail {
-	template <typename Fx, int start = 1, bool is_yielding = false>
-	int call(lua_State* L) {
-		Fx& fx = stack::get<user<Fx>>(L, upvalue_index(start));
-		int nr = fx(L);
-		if (is_yielding) {
-			return lua_yield(L, nr);
-		}
-		else {
-			return nr;
-		}
-	}
-}
-} // namespace sol::function_detail
-
-// end of sol/function_types_core.hpp
-
-// beginning of sol/function_types_templated.hpp
-
-// beginning of sol/call.hpp
-
-// beginning of sol/property.hpp
-
-#include <type_traits>
-#include <utility>
-
-namespace sol {
-	namespace detail {
-		struct no_prop {};
-	}
-
-	template <typename R, typename W>
-	struct property_wrapper : detail::ebco<R, 0>, detail::ebco<W, 1> {
-	private:
-		using read_base_t = detail::ebco<R, 0>;
-		using write_base_t = detail::ebco<W, 1>;
-
-	public:
-		template <typename Rx, typename Wx>
-		property_wrapper(Rx&& r, Wx&& w)
-		: read_base_t(std::forward<Rx>(r)), write_base_t(std::forward<Wx>(w)) {
-		}
-
-		W& write() {
-			return write_base_t::value();
-		}
-
-		const W& write() const {
-			return write_base_t::value();
-		}
-
-		R& read() {
-			return read_base_t::value();
-		}
-
-		const R& read() const {
-			return read_base_t::value();
-		}
-	};
-
-	template <typename F, typename G>
-	inline decltype(auto) property(F&& f, G&& g) {
-		typedef lua_bind_traits<meta::unqualified_t<F>> left_traits;
-		typedef lua_bind_traits<meta::unqualified_t<G>> right_traits;
-		if constexpr (left_traits::free_arity < right_traits::free_arity) {
-			return property_wrapper<std::decay_t<F>, std::decay_t<G>>(std::forward<F>(f), std::forward<G>(g));
-		}
-		else {
-			return property_wrapper<std::decay_t<G>, std::decay_t<F>>(std::forward<G>(g), std::forward<F>(f));
-		}
-	}
-
-	template <typename F>
-	inline decltype(auto) property(F&& f) {
-		typedef lua_bind_traits<meta::unqualified_t<F>> left_traits;
-		if constexpr (left_traits::free_arity < 2) {
-			return property_wrapper<std::decay_t<F>, detail::no_prop>(std::forward<F>(f), detail::no_prop());
-		}
-		else {
-			return property_wrapper<detail::no_prop, std::decay_t<F>>(detail::no_prop(), std::forward<F>(f));
-		}
-	}
-
-	template <typename F>
-	inline decltype(auto) readonly_property(F&& f) {
-		return property_wrapper<std::decay_t<F>, detail::no_prop>(std::forward<F>(f), detail::no_prop());
-	}
-
-	template <typename F>
-	inline decltype(auto) writeonly_property(F&& f) {
-		return property_wrapper<detail::no_prop, std::decay_t<F>>(detail::no_prop(), std::forward<F>(f));
-	}
-
-	template <typename T>
-	struct readonly_wrapper : detail::ebco<T> {
-	private:
-		using base_t = detail::ebco<T>;
-
-	public:
-		using base_t::base_t;
-
-		operator T&() {
-			return base_t::value();
-		}
-		operator const T&() const {
-			return base_t::value();
-		}
-	};
-
-	// Allow someone to make a member variable readonly (const)
-	template <typename R, typename T>
-	inline auto readonly(R T::*v) {
-		return readonly_wrapper<meta::unqualified_t<decltype(v)>>(v);
-	}
-
-	template <typename T>
-	struct var_wrapper : detail::ebco<T> {
-	private:
-		using base_t = detail::ebco<T>;
-
-	public:
-		using base_t::base_t;
-	};
-
-	template <typename V>
-	inline auto var(V&& v) {
-		typedef std::decay_t<V> T;
-		return var_wrapper<T>(std::forward<V>(v));
-	}
-
-	namespace meta {
-		template <typename T>
-		struct is_member_object : std::is_member_object_pointer<T> {};
-
-		template <typename T>
-		struct is_member_object<readonly_wrapper<T>> : std::true_type {};
-
-		template <typename T>
-		inline constexpr bool is_member_object_v = is_member_object<T>::value;
-	} // namespace meta
-
-} // namespace sol
-
-// end of sol/property.hpp
-
-// beginning of sol/protect.hpp
-
-#include <utility>
-
-namespace sol {
-
-	template <typename T>
-	struct protect_t {
-		T value;
-
-		template <typename Arg, typename... Args, meta::disable<std::is_same<protect_t, meta::unqualified_t<Arg>>> = meta::enabler>
-		protect_t(Arg&& arg, Args&&... args)
-		: value(std::forward<Arg>(arg), std::forward<Args>(args)...) {
-		}
-
-		protect_t(const protect_t&) = default;
-		protect_t(protect_t&&) = default;
-		protect_t& operator=(const protect_t&) = default;
-		protect_t& operator=(protect_t&&) = default;
-	};
-
-	template <typename T>
-	auto protect(T&& value) {
-		return protect_t<std::decay_t<T>>(std::forward<T>(value));
-	}
-
-} // namespace sol
-
-// end of sol/protect.hpp
-
-namespace sol {
-	namespace u_detail {
-
-	} // namespace u_detail
-
-	namespace policy_detail {
-		template <int I, int... In>
-		inline void handle_policy(static_stack_dependencies<I, In...>, lua_State* L, int&) {
-			if constexpr (sizeof...(In) == 0) {
-				(void)L;
-				return;
-			}
-			else {
-				absolute_index ai(L, I);
-				if (type_of(L, ai) != type::userdata) {
-					return;
-				}
-				lua_createtable(L, static_cast<int>(sizeof...(In)), 0);
-				stack_reference deps(L, -1);
-				auto per_dep = [&L, &deps](int i) {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-					luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
-#endif // make sure stack doesn't overflow
-					lua_pushvalue(L, i);
-					luaL_ref(L, deps.stack_index());
-				};
-				(void)per_dep;
-				(void)detail::swallow{ int(), (per_dep(In), int())... };
-				lua_setuservalue(L, ai);
-			}
-		}
-
-		template <int... In>
-		inline void handle_policy(returns_self_with<In...>, lua_State* L, int& pushed) {
-			pushed = stack::push(L, raw_index(1));
-			handle_policy(static_stack_dependencies<-1, In...>(), L, pushed);
-		}
-
-		inline void handle_policy(const stack_dependencies& sdeps, lua_State* L, int&) {
-			absolute_index ai(L, sdeps.target);
-			if (type_of(L, ai) != type::userdata) {
-				return;
-			}
-			lua_createtable(L, static_cast<int>(sdeps.size()), 0);
-			stack_reference deps(L, -1);
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-			luaL_checkstack(L, static_cast<int>(sdeps.size()), detail::not_enough_stack_space_generic);
-#endif // make sure stack doesn't overflow
-			for (std::size_t i = 0; i < sdeps.size(); ++i) {
-				lua_pushvalue(L, sdeps.stack_indices[i]);
-				luaL_ref(L, deps.stack_index());
-			}
-			lua_setuservalue(L, ai);
-		}
-
-		template <typename P, meta::disable<std::is_base_of<detail::policy_base_tag, meta::unqualified_t<P>>> = meta::enabler>
-		inline void handle_policy(P&& p, lua_State* L, int& pushed) {
-			pushed = std::forward<P>(p)(L, pushed);
-		}
-	} // namespace policy_detail
-
-	namespace function_detail {
-		inline int no_construction_error(lua_State* L) {
-			return luaL_error(L, "sol: cannot call this constructor (tagged as non-constructible)");
-		}
-	} // namespace function_detail
-
-	namespace call_detail {
-
-		template <typename R, typename W>
-		inline auto& pick(std::true_type, property_wrapper<R, W>& f) {
-			return f.read();
-		}
-
-		template <typename R, typename W>
-		inline auto& pick(std::false_type, property_wrapper<R, W>& f) {
-			return f.write();
-		}
-
-		template <typename T, typename List>
-		struct void_call : void_call<T, meta::function_args_t<List>> {};
-
-		template <typename T, typename... Args>
-		struct void_call<T, types<Args...>> {
-			static void call(Args...) {
-			}
-		};
-
-		template <typename T, bool checked, bool clean_stack>
-		struct constructor_match {
-			T* obj_;
-
-			constructor_match(T* o) : obj_(o) {
-			}
-
-			template <typename Fx, std::size_t I, typename... R, typename... Args>
-			int operator()(types<Fx>, meta::index_value<I>, types<R...> r, types<Args...> a, lua_State* L, int, int start) const {
-				detail::default_construct func{};
-				return stack::call_into_lua<checked, clean_stack>(r, a, L, start, func, obj_);
-			}
-		};
-
-		namespace overload_detail {
-			template <std::size_t... M, typename Match, typename... Args>
-			inline int overload_match_arity(types<>, std::index_sequence<>, std::index_sequence<M...>, Match&&, lua_State* L, int, int, Args&&...) {
-				return luaL_error(L, "sol: no matching function call takes this number of arguments and the specified types");
-			}
-
-			template <typename Fx, typename... Fxs, std::size_t I, std::size_t... In, std::size_t... M, typename Match, typename... Args>
-			inline int overload_match_arity(types<Fx, Fxs...>, std::index_sequence<I, In...>, std::index_sequence<M...>, Match&& matchfx, lua_State* L,
-			     int fxarity, int start, Args&&... args) {
-				typedef lua_bind_traits<meta::unwrap_unqualified_t<Fx>> traits;
-				typedef meta::tuple_types<typename traits::return_type> return_types;
-				typedef typename traits::free_args_list args_list;
-				// compile-time eliminate any functions that we know ahead of time are of improper arity
-				if constexpr (!traits::runtime_variadics_t::value
-				     && meta::find_in_pack_v<meta::index_value<traits::free_arity>, meta::index_value<M>...>::value) {
-					return overload_match_arity(types<Fxs...>(),
-					     std::index_sequence<In...>(),
-					     std::index_sequence<M...>(),
-					     std::forward<Match>(matchfx),
-					     L,
-					     fxarity,
-					     start,
-					     std::forward<Args>(args)...);
-				}
-				else {
-					if constexpr (!traits::runtime_variadics_t::value) {
-						if (traits::free_arity != fxarity) {
-							return overload_match_arity(types<Fxs...>(),
-							     std::index_sequence<In...>(),
-							     std::index_sequence<traits::free_arity, M...>(),
-							     std::forward<Match>(matchfx),
-							     L,
-							     fxarity,
-							     start,
-							     std::forward<Args>(args)...);
-						}
-					}
-					stack::record tracking{};
-					if (!stack::stack_detail::check_types(args_list(), L, start, no_panic, tracking)) {
-						return overload_match_arity(types<Fxs...>(),
-						     std::index_sequence<In...>(),
-						     std::index_sequence<M...>(),
-						     std::forward<Match>(matchfx),
-						     L,
-						     fxarity,
-						     start,
-						     std::forward<Args>(args)...);
-					}
-					return matchfx(types<Fx>(), meta::index_value<I>(), return_types(), args_list(), L, fxarity, start, std::forward<Args>(args)...);
-				}
-			}
-
-			template <std::size_t... M, typename Match, typename... Args>
-			inline int overload_match_arity_single(
-			     types<>, std::index_sequence<>, std::index_sequence<M...>, Match&& matchfx, lua_State* L, int fxarity, int start, Args&&... args) {
-				return overload_match_arity(types<>(),
-				     std::index_sequence<>(),
-				     std::index_sequence<M...>(),
-				     std::forward<Match>(matchfx),
-				     L,
-				     fxarity,
-				     start,
-				     std::forward<Args>(args)...);
-			}
-
-			template <typename Fx, std::size_t I, std::size_t... M, typename Match, typename... Args>
-			inline int overload_match_arity_single(
-			     types<Fx>, std::index_sequence<I>, std::index_sequence<M...>, Match&& matchfx, lua_State* L, int fxarity, int start, Args&&... args) {
-				typedef lua_bind_traits<meta::unwrap_unqualified_t<Fx>> traits;
-				typedef meta::tuple_types<typename traits::return_type> return_types;
-				typedef typename traits::free_args_list args_list;
-				// compile-time eliminate any functions that we know ahead of time are of improper arity
-				if constexpr (!traits::runtime_variadics_t::value
-				     && meta::find_in_pack_v<meta::index_value<traits::free_arity>, meta::index_value<M>...>::value) {
-					return overload_match_arity(types<>(),
-					     std::index_sequence<>(),
-					     std::index_sequence<M...>(),
-					     std::forward<Match>(matchfx),
-					     L,
-					     fxarity,
-					     start,
-					     std::forward<Args>(args)...);
-				}
-				if constexpr (!traits::runtime_variadics_t::value) {
-					if (traits::free_arity != fxarity) {
-						return overload_match_arity(types<>(),
-						     std::index_sequence<>(),
-						     std::index_sequence<traits::free_arity, M...>(),
-						     std::forward<Match>(matchfx),
-						     L,
-						     fxarity,
-						     start,
-						     std::forward<Args>(args)...);
-					}
-				}
-				return matchfx(types<Fx>(), meta::index_value<I>(), return_types(), args_list(), L, fxarity, start, std::forward<Args>(args)...);
-			}
-
-			template <typename Fx, typename Fx1, typename... Fxs, std::size_t I, std::size_t I1, std::size_t... In, std::size_t... M, typename Match,
-			     typename... Args>
-			inline int overload_match_arity_single(types<Fx, Fx1, Fxs...>, std::index_sequence<I, I1, In...>, std::index_sequence<M...>, Match&& matchfx,
-			     lua_State* L, int fxarity, int start, Args&&... args) {
-				typedef lua_bind_traits<meta::unwrap_unqualified_t<Fx>> traits;
-				typedef meta::tuple_types<typename traits::return_type> return_types;
-				typedef typename traits::free_args_list args_list;
-				// compile-time eliminate any functions that we know ahead of time are of improper arity
-				if constexpr (!traits::runtime_variadics_t::value
-				     && meta::find_in_pack_v<meta::index_value<traits::free_arity>, meta::index_value<M>...>::value) {
-					return overload_match_arity(types<Fx1, Fxs...>(),
-					     std::index_sequence<I1, In...>(),
-					     std::index_sequence<M...>(),
-					     std::forward<Match>(matchfx),
-					     L,
-					     fxarity,
-					     start,
-					     std::forward<Args>(args)...);
-				}
-				else {
-					if constexpr (!traits::runtime_variadics_t::value) {
-						if (traits::free_arity != fxarity) {
-							return overload_match_arity(types<Fx1, Fxs...>(),
-							     std::index_sequence<I1, In...>(),
-							     std::index_sequence<traits::free_arity, M...>(),
-							     std::forward<Match>(matchfx),
-							     L,
-							     fxarity,
-							     start,
-							     std::forward<Args>(args)...);
-						}
-					}
-					stack::record tracking{};
-					if (!stack::stack_detail::check_types(args_list(), L, start, no_panic, tracking)) {
-						return overload_match_arity(types<Fx1, Fxs...>(),
-						     std::index_sequence<I1, In...>(),
-						     std::index_sequence<M...>(),
-						     std::forward<Match>(matchfx),
-						     L,
-						     fxarity,
-						     start,
-						     std::forward<Args>(args)...);
-					}
-					return matchfx(types<Fx>(), meta::index_value<I>(), return_types(), args_list(), L, fxarity, start, std::forward<Args>(args)...);
-				}
-			}
-		} // namespace overload_detail
-
-		template <typename... Functions, typename Match, typename... Args>
-		inline int overload_match_arity(Match&& matchfx, lua_State* L, int fxarity, int start, Args&&... args) {
-			return overload_detail::overload_match_arity_single(types<Functions...>(),
-			     std::make_index_sequence<sizeof...(Functions)>(),
-			     std::index_sequence<>(),
-			     std::forward<Match>(matchfx),
-			     L,
-			     fxarity,
-			     start,
-			     std::forward<Args>(args)...);
-		}
-
-		template <typename... Functions, typename Match, typename... Args>
-		inline int overload_match(Match&& matchfx, lua_State* L, int start, Args&&... args) {
-			int fxarity = lua_gettop(L) - (start - 1);
-			return overload_match_arity<Functions...>(std::forward<Match>(matchfx), L, fxarity, start, std::forward<Args>(args)...);
-		}
-
-		template <typename T, typename... TypeLists, typename Match, typename... Args>
-		inline int construct_match(Match&& matchfx, lua_State* L, int fxarity, int start, Args&&... args) {
-			// use same overload resolution matching as all other parts of the framework
-			return overload_match_arity<decltype(void_call<T, TypeLists>::call)...>(
-			     std::forward<Match>(matchfx), L, fxarity, start, std::forward<Args>(args)...);
-		}
-
-		template <typename T, bool checked, bool clean_stack, typename... TypeLists>
-		inline int construct_trampolined(lua_State* L) {
-			static const auto& meta = usertype_traits<T>::metatable();
-			int argcount = lua_gettop(L);
-			call_syntax syntax = argcount > 0 ? stack::get_call_syntax(L, usertype_traits<T>::user_metatable(), 1) : call_syntax::dot;
-			argcount -= static_cast<int>(syntax);
-
-			T* obj = detail::usertype_allocate<T>(L);
-			reference userdataref(L, -1);
-			stack::stack_detail::undefined_metatable umf(L, &meta[0], &stack::stack_detail::set_undefined_methods_on<T>);
-			umf();
-
-			// put userdata at the first index
-			lua_insert(L, 1);
-			construct_match<T, TypeLists...>(constructor_match<T, checked, clean_stack>(obj), L, argcount, 1 + static_cast<int>(syntax));
-
-			userdataref.push();
-			return 1;
-		}
-
-		template <typename T, bool checked, bool clean_stack, typename... TypeLists>
-		inline int construct(lua_State* L) {
-			return detail::static_trampoline<&construct_trampolined<T, checked, clean_stack, TypeLists...>>(L);
-		}
-
-		template <typename F, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename = void>
-		struct agnostic_lua_call_wrapper {
-			template <typename Fx, typename... Args>
-			static int call(lua_State* L, Fx&& f, Args&&... args) {
-				using uFx = meta::unqualified_t<Fx>;
-				static constexpr bool is_ref = is_lua_reference_v<uFx>;
-				if constexpr (is_ref) {
-					if constexpr (is_index) {
-						return stack::push(L, std::forward<Fx>(f), std::forward<Args>(args)...);
-					}
-					else {
-						std::forward<Fx>(f) = stack::unqualified_get<F>(L, boost + (is_variable ? 3 : 1));
-						return 0;
-					}
-				}
-				else {
-					using wrap = wrapper<uFx>;
-					using traits_type = typename wrap::traits_type;
-					using fp_t = typename traits_type::function_pointer_type;
-					constexpr bool is_function_pointer_convertible
-					     = std::is_class_v<uFx> && std::is_convertible_v<std::decay_t<Fx>, fp_t>;
-					if constexpr (is_function_pointer_convertible) {
-						fp_t fx = f;
-						return agnostic_lua_call_wrapper<fp_t, is_index, is_variable, checked, boost, clean_stack>{}.call(
-						     L, fx, std::forward<Args>(args)...);
-					}
-					else {
-						using returns_list = typename wrap::returns_list;
-						using args_list = typename wrap::free_args_list;
-						using caller = typename wrap::caller;
-						return stack::call_into_lua<checked, clean_stack>(
-						     returns_list(), args_list(), L, boost + 1, caller(), std::forward<Fx>(f), std::forward<Args>(args)...);
-					}
-				}
-			}
-		};
-
-		template <typename T, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
-		struct agnostic_lua_call_wrapper<var_wrapper<T>, is_index, is_variable, checked, boost, clean_stack, C> {
-			template <typename F>
-			static int call(lua_State* L, F&& f) {
-				if constexpr (is_index) {
-					constexpr bool is_stack = is_stack_based_v<meta::unqualified_t<decltype(detail::unwrap(f.value()))>>;
-					if constexpr (clean_stack && !is_stack) {
-						lua_settop(L, 0);
-					}
-					return stack::push_reference(L, detail::unwrap(f.value()));
-				}
-				else {
-					if constexpr (std::is_const_v<meta::unwrapped_t<T>>) {
-						(void)f;
-						return luaL_error(L, "sol: cannot write to a readonly (const) variable");
-					}
-					else {
-						using R = meta::unwrapped_t<T>;
-						if constexpr (std::is_assignable_v<std::add_lvalue_reference_t<meta::unqualified_t<R>>, R>) {
-							detail::unwrap(f.value()) = stack::unqualified_get<meta::unwrapped_t<T>>(L, boost + (is_variable ? 3 : 1));
-							if (clean_stack) {
-								lua_settop(L, 0);
-							}
-							return 0;
-						}
-						else {
-							return luaL_error(L, "sol: cannot write to this variable: copy assignment/constructor not available");
-						}
-					}
-				}
-			}
-		};
-
-		template <bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
-		struct agnostic_lua_call_wrapper<lua_CFunction_ref, is_index, is_variable, checked, boost, clean_stack, C> {
-			static int call(lua_State* L, lua_CFunction_ref f) {
-				return f(L);
-			}
-		};
-
-		template <bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
-		struct agnostic_lua_call_wrapper<lua_CFunction, is_index, is_variable, checked, boost, clean_stack, C> {
-			static int call(lua_State* L, lua_CFunction f) {
-				return f(L);
-			}
-		};
-
-#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_)
-		template <bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
-		struct agnostic_lua_call_wrapper<detail::lua_CFunction_noexcept, is_index, is_variable, checked, boost, clean_stack, C> {
-			static int call(lua_State* L, detail::lua_CFunction_noexcept f) {
-				return f(L);
-			}
-		};
-#endif // noexcept function types
-
-		template <bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
-		struct agnostic_lua_call_wrapper<detail::no_prop, is_index, is_variable, checked, boost, clean_stack, C> {
-			static int call(lua_State* L, const detail::no_prop&) {
-				return luaL_error(L, is_index ? "sol: cannot read from a writeonly property" : "sol: cannot write to a readonly property");
-			}
-		};
-
-		template <bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
-		struct agnostic_lua_call_wrapper<no_construction, is_index, is_variable, checked, boost, clean_stack, C> {
-			static int call(lua_State* L, const no_construction&) {
-				return function_detail::no_construction_error(L);
-			}
-		};
-
-		template <typename... Args, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
-		struct agnostic_lua_call_wrapper<bases<Args...>, is_index, is_variable, checked, boost, clean_stack, C> {
-			static int call(lua_State*, const bases<Args...>&) {
-				// Uh. How did you even call this, lul
-				return 0;
-			}
-		};
-
-		template <typename T, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
-		struct agnostic_lua_call_wrapper<std::reference_wrapper<T>, is_index, is_variable, checked, boost, clean_stack, C> {
-			static int call(lua_State* L, std::reference_wrapper<T> f) {
-				agnostic_lua_call_wrapper<T, is_index, is_variable, checked, boost, clean_stack> alcw{};
-				return alcw.call(L, f.get());
-			}
-		};
-
-		template <typename T, typename F, bool is_index, bool is_variable, bool checked = detail::default_safe_function_calls, int boost = 0,
-		     bool clean_stack = true, typename = void>
-		struct lua_call_wrapper {
-			template <typename Fx, typename... Args>
-			static int call(lua_State* L, Fx&& fx, Args&&... args) {
-				if constexpr (std::is_member_function_pointer_v<F>) {
-					using wrap = wrapper<F>;
-					using object_type = typename wrap::object_type;
-					if constexpr (sizeof...(Args) < 1) {
-						using Ta = meta::conditional_t<std::is_void_v<T>, object_type, T>;
-						static_assert(std::is_base_of_v<object_type, Ta>, "It seems like you might have accidentally bound a class type with a member function method that does not correspond to the class. For example, there could be a small type in your new_usertype<T>(...) binding, where you specify one class \"T\" but then bind member methods from a complete unrelated class. Check things over!");
-#if SOL_IS_ON(SOL_SAFE_USERTYPE_I_)
-						auto maybeo = stack::check_get<Ta*>(L, 1);
-						if (!maybeo || maybeo.value() == nullptr) {
-							return luaL_error(L,
-							     "sol: received nil for 'self' argument (use ':' for accessing member functions, make sure member variables are "
-							     "preceeded by the "
-							     "actual object with '.' syntax)");
-						}
-						object_type* o = static_cast<object_type*>(maybeo.value());
-						return call(L, std::forward<Fx>(fx), *o);
-#else
-						object_type& o = static_cast<object_type&>(*stack::unqualified_get<non_null<Ta*>>(L, 1));
-						return call(L, std::forward<Fx>(fx), o);
-#endif // Safety
-					}
-					else {
-						using returns_list = typename wrap::returns_list;
-						using args_list = typename wrap::args_list;
-						using caller = typename wrap::caller;
-						return stack::call_into_lua<checked, clean_stack>(
-						     returns_list(), args_list(), L, boost + (is_variable ? 3 : 2), caller(), std::forward<Fx>(fx), std::forward<Args>(args)...);
-					}
-				}
-				else if constexpr (std::is_member_object_pointer_v<F>) {
-					using wrap = wrapper<F>;
-					using object_type = typename wrap::object_type;
-					if constexpr (is_index) {
-						if constexpr (sizeof...(Args) < 1) {
-							using Ta = meta::conditional_t<std::is_void_v<T>, object_type, T>;
-							static_assert(std::is_base_of_v<object_type, Ta>, "It seems like you might have accidentally bound a class type with a member function method that does not correspond to the class. For example, there could be a small type in your new_usertype<T>(...) binding, where you specify one class \"T\" but then bind member methods from a complete unrelated class. Check things over!");
-#if SOL_IS_ON(SOL_SAFE_USERTYPE_I_)
-							auto maybeo = stack::check_get<Ta*>(L, 1);
-							if (!maybeo || maybeo.value() == nullptr) {
-								if (is_variable) {
-									return luaL_error(L, "sol: 'self' argument is lua_nil (bad '.' access?)");
-								}
-								return luaL_error(L, "sol: 'self' argument is lua_nil (pass 'self' as first argument)");
-							}
-							object_type* o = static_cast<object_type*>(maybeo.value());
-							return call(L, std::forward<Fx>(fx), *o);
-#else
-							object_type& o = static_cast<object_type&>(*stack::get<non_null<Ta*>>(L, 1));
-							return call(L, std::forward<Fx>(fx), o);
-#endif // Safety
-						}
-						else {
-							using returns_list = typename wrap::returns_list;
-							using caller = typename wrap::caller;
-							return stack::call_into_lua<checked, clean_stack>(returns_list(),
-							     types<>(),
-							     L,
-							     boost + (is_variable ? 3 : 2),
-							     caller(),
-							     std::forward<Fx>(fx),
-							     std::forward<Args>(args)...);
-						}
-					}
-					else {
-						using traits_type = lua_bind_traits<F>;
-						using return_type = typename traits_type::return_type;
-						constexpr bool ret_is_const = std::is_const_v<std::remove_reference_t<return_type>>;
-						if constexpr (ret_is_const) {
-							(void)fx;
-							(void)detail::swallow{ 0, (static_cast<void>(args), 0)... };
-							return luaL_error(L, "sol: cannot write to a readonly (const) variable");
-						}
-						else {
-							using u_return_type = meta::unqualified_t<return_type>;
-							constexpr bool is_assignable = std::is_copy_assignable_v<u_return_type> || std::is_array_v<u_return_type>;
-							if constexpr (!is_assignable) {
-								(void)fx;
-								(void)detail::swallow{ 0, ((void)args, 0)... };
-								return luaL_error(L, "sol: cannot write to this variable: copy assignment/constructor not available");
-							}
-							else {
-								using args_list = typename wrap::args_list;
-								using caller = typename wrap::caller;
-								if constexpr (sizeof...(Args) > 0) {
-									return stack::call_into_lua<checked, clean_stack>(types<void>(),
-									     args_list(),
-									     L,
-									     boost + (is_variable ? 3 : 2),
-									     caller(),
-									     std::forward<Fx>(fx),
-									     std::forward<Args>(args)...);
-								}
-								else {
-									using Ta = meta::conditional_t<std::is_void_v<T>, object_type, T>;
-#if SOL_IS_ON(SOL_SAFE_USERTYPE_I_)
-									auto maybeo = stack::check_get<Ta*>(L, 1);
-									if (!maybeo || maybeo.value() == nullptr) {
-										if (is_variable) {
-											return luaL_error(L, "sol: received nil for 'self' argument (bad '.' access?)");
-										}
-										return luaL_error(L, "sol: received nil for 'self' argument (pass 'self' as first argument)");
-									}
-									object_type* po = static_cast<object_type*>(maybeo.value());
-									object_type& o = *po;
-#else
-									object_type& o = static_cast<object_type&>(*stack::get<non_null<Ta*>>(L, 1));
-#endif // Safety
-
-									return stack::call_into_lua<checked, clean_stack>(
-									     types<void>(), args_list(), L, boost + (is_variable ? 3 : 2), caller(), std::forward<Fx>(fx), o);
-								}
-							}
-						}
-					}
-				}
-				else {
-					agnostic_lua_call_wrapper<F, is_index, is_variable, checked, boost, clean_stack> alcw{};
-					return alcw.call(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
-				}
-			}
-		};
-
-		template <typename T, typename F, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
-		struct lua_call_wrapper<T, readonly_wrapper<F>, is_index, is_variable, checked, boost, clean_stack, C> {
-			using traits_type = lua_bind_traits<F>;
-			using wrap = wrapper<F>;
-			using object_type = typename wrap::object_type;
-
-			static int call(lua_State* L, readonly_wrapper<F>&& rw) {
-				if constexpr (!is_index) {
-					(void)rw;
-					return luaL_error(L, "sol: cannot write to a sol::readonly variable");
-				}
-				else {
-					lua_call_wrapper<T, F, true, is_variable, checked, boost, clean_stack, C> lcw;
-					return lcw.call(L, std::move(rw.value()));
-				}
-			}
-
-			static int call(lua_State* L, readonly_wrapper<F>&& rw, object_type& o) {
-				if constexpr (!is_index) {
-					(void)o;
-					return call(L, std::move(rw));
-				}
-				else {
-					lua_call_wrapper<T, F, true, is_variable, checked, boost, clean_stack, C> lcw;
-					return lcw.call(L, rw.value(), o);
-				}
-			}
-
-			static int call(lua_State* L, const readonly_wrapper<F>& rw) {
-				if constexpr (!is_index) {
-					(void)rw;
-					return luaL_error(L, "sol: cannot write to a sol::readonly variable");
-				}
-				else {
-					lua_call_wrapper<T, F, true, is_variable, checked, boost, clean_stack, C> lcw;
-					return lcw.call(L, rw.value());
-				}
-			}
-
-			static int call(lua_State* L, const readonly_wrapper<F>& rw, object_type& o) {
-				if constexpr (!is_index) {
-					(void)o;
-					return call(L, rw);
-				}
-				else {
-					lua_call_wrapper<T, F, true, is_variable, checked, boost, clean_stack, C> lcw;
-					return lcw.call(L, rw.value(), o);
-				}
-			}
-		};
-
-		template <typename T, typename... Args, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
-		struct lua_call_wrapper<T, constructor_list<Args...>, is_index, is_variable, checked, boost, clean_stack, C> {
-			typedef constructor_list<Args...> F;
-
-			static int call(lua_State* L, F&) {
-				const auto& meta = usertype_traits<T>::metatable();
-				int argcount = lua_gettop(L);
-				call_syntax syntax = argcount > 0 ? stack::get_call_syntax(L, usertype_traits<T>::user_metatable(), 1) : call_syntax::dot;
-				argcount -= static_cast<int>(syntax);
-
-				T* obj = detail::usertype_allocate<T>(L);
-				reference userdataref(L, -1);
-				stack::stack_detail::undefined_metatable umf(L, &meta[0], &stack::stack_detail::set_undefined_methods_on<T>);
-				umf();
-
-				// put userdata at the first index
-				lua_insert(L, 1);
-				construct_match<T, Args...>(constructor_match<T, checked, clean_stack>(obj), L, argcount, boost + 1 + 1 + static_cast<int>(syntax));
-
-				userdataref.push();
-				return 1;
-			}
-		};
-
-		template <typename T, typename... Cxs, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
-		struct lua_call_wrapper<T, constructor_wrapper<Cxs...>, is_index, is_variable, checked, boost, clean_stack, C> {
-			typedef constructor_wrapper<Cxs...> F;
-
-			struct onmatch {
-				template <typename Fx, std::size_t I, typename... R, typename... Args>
-				int operator()(types<Fx>, meta::index_value<I>, types<R...> r, types<Args...> a, lua_State* L, int, int start, F& f) {
-					const auto& meta = usertype_traits<T>::metatable();
-					T* obj = detail::usertype_allocate<T>(L);
-					reference userdataref(L, -1);
-					stack::stack_detail::undefined_metatable umf(L, &meta[0], &stack::stack_detail::set_undefined_methods_on<T>);
-					umf();
-
-					auto& func = std::get<I>(f.functions);
-					// put userdata at the first index
-					lua_insert(L, 1);
-					stack::call_into_lua<checked, clean_stack>(r, a, L, boost + 1 + start, func, detail::implicit_wrapper<T>(obj));
-
-					userdataref.push();
-					return 1;
-				}
-			};
-
-			static int call(lua_State* L, F& f) {
-				call_syntax syntax = stack::get_call_syntax(L, usertype_traits<T>::user_metatable(), 1);
-				int syntaxval = static_cast<int>(syntax);
-				int argcount = lua_gettop(L) - syntaxval;
-				return construct_match<T, meta::pop_front_type_t<meta::function_args_t<Cxs>>...>(onmatch(), L, argcount, 1 + syntaxval, f);
-			}
-		};
-
-		template <typename T, typename Fx, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
-		struct lua_call_wrapper<T, destructor_wrapper<Fx>, is_index, is_variable, checked, boost, clean_stack, C> {
-
-			template <typename F>
-			static int call(lua_State* L, F&& f) {
-				if constexpr (std::is_void_v<Fx>) {
-					return detail::usertype_alloc_destruct<T>(L);
-				}
-				else {
-					using uFx = meta::unqualified_t<Fx>;
-					lua_call_wrapper<T, uFx, is_index, is_variable, checked, boost, clean_stack> lcw{};
-					return lcw.call(L, std::forward<F>(f).fx);
-				}
-			}
-		};
-
-		template <typename T, typename... Fs, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
-		struct lua_call_wrapper<T, overload_set<Fs...>, is_index, is_variable, checked, boost, clean_stack, C> {
-			typedef overload_set<Fs...> F;
-
-			struct on_match {
-				template <typename Fx, std::size_t I, typename... R, typename... Args>
-				int operator()(types<Fx>, meta::index_value<I>, types<R...>, types<Args...>, lua_State* L, int, int, F& fx) {
-					auto& f = std::get<I>(fx.functions);
-					return lua_call_wrapper<T, Fx, is_index, is_variable, checked, boost>{}.call(L, f);
-				}
-			};
-
-			static int call(lua_State* L, F& fx) {
-				return overload_match_arity<Fs...>(on_match(), L, lua_gettop(L), 1, fx);
-			}
-		};
-
-		template <typename T, typename... Fs, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
-		struct lua_call_wrapper<T, factory_wrapper<Fs...>, is_index, is_variable, checked, boost, clean_stack, C> {
-			typedef factory_wrapper<Fs...> F;
-
-			struct on_match {
-				template <typename Fx, std::size_t I, typename... R, typename... Args>
-				int operator()(types<Fx>, meta::index_value<I>, types<R...>, types<Args...>, lua_State* L, int, int, F& fx) {
-					auto& f = std::get<I>(fx.functions);
-					return lua_call_wrapper<T, Fx, is_index, is_variable, checked, boost, clean_stack>{}.call(L, f);
-				}
-			};
-
-			static int call(lua_State* L, F& fx) {
-				return overload_match_arity<Fs...>(on_match(), L, lua_gettop(L) - boost, 1 + boost, fx);
-			}
-		};
-
-		template <typename T, typename R, typename W, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
-		struct lua_call_wrapper<T, property_wrapper<R, W>, is_index, is_variable, checked, boost, clean_stack, C> {
-			typedef meta::conditional_t<is_index, R, W> P;
-			typedef meta::unqualified_t<P> U;
-			typedef wrapper<U> wrap;
-			typedef lua_bind_traits<U> traits_type;
-			typedef meta::unqualified_t<typename traits_type::template arg_at<0>> object_type;
-
-			template <typename F, typename... Args>
-			static int call(lua_State* L, F&& f, Args&&... args) {
-				constexpr bool is_specialized = meta::any<std::is_same<U, detail::no_prop>,
-				     meta::is_specialization_of<U, var_wrapper>,
-				     meta::is_specialization_of<U, constructor_wrapper>,
-				     meta::is_specialization_of<U, constructor_list>,
-				     std::is_member_pointer<U>>::value;
-				if constexpr (is_specialized) {
-					if constexpr (is_index) {
-						decltype(auto) p = f.read();
-						lua_call_wrapper<T, meta::unqualified_t<decltype(p)>, is_index, is_variable, checked, boost, clean_stack> lcw{};
-						return lcw.call(L, p, std::forward<Args>(args)...);
-					}
-					else {
-						decltype(auto) p = f.write();
-						lua_call_wrapper<T, meta::unqualified_t<decltype(p)>, is_index, is_variable, checked, boost, clean_stack> lcw{};
-						return lcw.call(L, p, std::forward<Args>(args)...);
-					}
-				}
-				else {
-					constexpr bool non_class_object_type = meta::any<std::is_void<object_type>,
-					     meta::boolean<lua_type_of<meta::unwrap_unqualified_t<object_type>>::value != type::userdata>>::value;
-					if constexpr (non_class_object_type) {
-						// The type being void means we don't have any arguments, so it might be a free functions?
-						using args_list = typename traits_type::free_args_list;
-						using returns_list = typename wrap::returns_list;
-						using caller = typename wrap::caller;
-						if constexpr (is_index) {
-							decltype(auto) pf = f.read();
-							return stack::call_into_lua<checked, clean_stack>(
-							     returns_list(), args_list(), L, boost + (is_variable ? 3 : 2), caller(), pf);
-						}
-						else {
-							decltype(auto) pf = f.write();
-							return stack::call_into_lua<checked, clean_stack>(
-							     returns_list(), args_list(), L, boost + (is_variable ? 3 : 2), caller(), pf);
-						}
-					}
-					else {
-						using args_list = meta::pop_front_type_t<typename traits_type::free_args_list>;
-						using Ta = T;
-						using Oa = std::remove_pointer_t<object_type>;
-#if SOL_IS_ON(SOL_SAFE_USERTYPE_I_)
-						auto maybeo = stack::check_get<Ta*>(L, 1);
-						if (!maybeo || maybeo.value() == nullptr) {
-							if (is_variable) {
-								return luaL_error(L, "sol: 'self' argument is lua_nil (bad '.' access?)");
-							}
-							return luaL_error(L, "sol: 'self' argument is lua_nil (pass 'self' as first argument)");
-						}
-						Oa* o = static_cast<Oa*>(maybeo.value());
-#else
-						Oa* o = static_cast<Oa*>(stack::get<non_null<Ta*>>(L, 1));
-#endif // Safety
-						using returns_list = typename wrap::returns_list;
-						using caller = typename wrap::caller;
-						if constexpr (is_index) {
-							decltype(auto) pf = f.read();
-							return stack::call_into_lua<checked, clean_stack>(
-							     returns_list(), args_list(), L, boost + (is_variable ? 3 : 2), caller(), pf, detail::implicit_wrapper<Oa>(*o));
-						}
-						else {
-							decltype(auto) pf = f.write();
-							return stack::call_into_lua<checked, clean_stack>(
-							     returns_list(), args_list(), L, boost + (is_variable ? 3 : 2), caller(), pf, detail::implicit_wrapper<Oa>(*o));
-						}
-					}
-				}
-			}
-		};
-
-		template <typename T, typename V, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
-		struct lua_call_wrapper<T, protect_t<V>, is_index, is_variable, checked, boost, clean_stack, C> {
-			typedef protect_t<V> F;
-
-			template <typename... Args>
-			static int call(lua_State* L, F& fx, Args&&... args) {
-				return lua_call_wrapper<T, V, is_index, is_variable, true, boost, clean_stack>{}.call(L, fx.value, std::forward<Args>(args)...);
-			}
-		};
-
-		template <typename T, typename F, typename... Policies, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
-		struct lua_call_wrapper<T, policy_wrapper<F, Policies...>, is_index, is_variable, checked, boost, clean_stack, C> {
-			typedef policy_wrapper<F, Policies...> P;
-
-			template <std::size_t... In>
-			static int call(std::index_sequence<In...>, lua_State* L, P& fx) {
-				int pushed = lua_call_wrapper<T, F, is_index, is_variable, checked, boost, false, C>{}.call(L, fx.value);
-				(void)detail::swallow{ int(), (policy_detail::handle_policy(std::get<In>(fx.policies), L, pushed), int())... };
-				return pushed;
-			}
-
-			static int call(lua_State* L, P& fx) {
-				typedef typename P::indices indices;
-				return call(indices(), L, fx);
-			}
-		};
-
-		template <typename T, typename Y, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
-		struct lua_call_wrapper<T, yielding_t<Y>, is_index, is_variable, checked, boost, clean_stack, C> {
-			template <typename F>
-			static int call(lua_State* L, F&& f) {
-				return lua_call_wrapper<T, meta::unqualified_t<Y>, is_index, is_variable, checked, boost, clean_stack>{}.call(L, f.func);
-			}
-		};
-
-		template <typename T, typename Sig, typename P, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
-		struct lua_call_wrapper<T, function_arguments<Sig, P>, is_index, is_variable, checked, boost, clean_stack, C> {
-			static int call(lua_State* L, const function_arguments<Sig, P>& f) {
-				lua_call_wrapper<T, meta::unqualified_t<P>, is_index, is_variable, checked, boost, clean_stack> lcw{};
-				return lcw.call(L, std::get<0>(f.arguments));
-			}
-
-			static int call(lua_State* L, function_arguments<Sig, P>&& f) {
-				lua_call_wrapper<T, meta::unqualified_t<P>, is_index, is_variable, checked, boost, clean_stack> lcw{};
-				return lcw.call(L, std::get<0>(std::move(f.arguments)));
-			}
-		};
-
-		template <typename T, bool is_index, bool is_variable, int boost = 0, bool checked = detail::default_safe_function_calls, bool clean_stack = true,
-		     typename Fx, typename... Args>
-		inline int call_wrapped(lua_State* L, Fx&& fx, Args&&... args) {
-			using uFx = meta::unqualified_t<Fx>;
-			if constexpr (meta::is_specialization_of_v<uFx, yielding_t>) {
-				using real_fx = meta::unqualified_t<decltype(std::forward<Fx>(fx).func)>;
-				lua_call_wrapper<T, real_fx, is_index, is_variable, checked, boost, clean_stack> lcw{};
-				return lcw.call(L, std::forward<Fx>(fx).func, std::forward<Args>(args)...);
-			}
-			else {
-				lua_call_wrapper<T, uFx, is_index, is_variable, checked, boost, clean_stack> lcw{};
-				return lcw.call(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
-			}
-		}
-
-		template <typename T, bool is_index, bool is_variable, typename F, int start = 1, bool checked = detail::default_safe_function_calls,
-		     bool clean_stack = true>
-		inline int call_user(lua_State* L) {
-			auto& fx = stack::unqualified_get<user<F>>(L, upvalue_index(start));
-			using uFx = meta::unqualified_t<F>;
-			int nr = call_wrapped<T, is_index, is_variable, 0, checked, clean_stack>(L, fx);
-			if constexpr (meta::is_specialization_of_v<uFx, yielding_t>) {
-				return lua_yield(L, nr);
-			}
-			else {
-				return nr;
-			}
-		}
-
-		template <typename T, typename = void>
-		struct is_var_bind : std::false_type {};
-
-		template <typename T>
-		struct is_var_bind<T, std::enable_if_t<std::is_member_object_pointer<T>::value>> : std::true_type {};
-
-		template <typename T>
-		struct is_var_bind<T, std::enable_if_t<is_lua_reference_or_proxy<T>::value>> : std::true_type {};
-
-		template <>
-		struct is_var_bind<detail::no_prop> : std::true_type {};
-
-		template <typename R, typename W>
-		struct is_var_bind<property_wrapper<R, W>> : std::true_type {};
-
-		template <typename T>
-		struct is_var_bind<var_wrapper<T>> : std::true_type {};
-
-		template <typename T>
-		struct is_var_bind<readonly_wrapper<T>> : is_var_bind<meta::unqualified_t<T>> {};
-
-		template <typename F, typename... Policies>
-		struct is_var_bind<policy_wrapper<F, Policies...>> : is_var_bind<meta::unqualified_t<F>> {};
-	} // namespace call_detail
-
-	template <typename T>
-	struct is_variable_binding : call_detail::is_var_bind<meta::unqualified_t<T>> {};
-
-	template <typename T>
-	using is_var_wrapper = meta::is_specialization_of<T, var_wrapper>;
-
-	template <typename T>
-	struct is_function_binding : meta::neg<is_variable_binding<T>> {};
-
-} // namespace sol
-
-// end of sol/call.hpp
-
-namespace sol {
-	namespace function_detail {
-		template <typename F, F fx>
-		inline int call_wrapper_variable(std::false_type, lua_State* L) {
-			typedef meta::bind_traits<meta::unqualified_t<F>> traits_type;
-			typedef typename traits_type::args_list args_list;
-			typedef meta::tuple_types<typename traits_type::return_type> return_type;
-			return stack::call_into_lua(return_type(), args_list(), L, 1, fx);
-		}
-
-		template <typename R, typename V, V, typename T>
-		inline int call_set_assignable(std::false_type, T&&, lua_State* L) {
-			return luaL_error(L, "cannot write to this type: copy assignment/constructor not available");
-		}
-
-		template <typename R, typename V, V variable, typename T>
-		inline int call_set_assignable(std::true_type, lua_State* L, T&& mem) {
-			(mem.*variable) = stack::get<R>(L, 2);
-			return 0;
-		}
-
-		template <typename R, typename V, V, typename T>
-		inline int call_set_variable(std::false_type, lua_State* L, T&&) {
-			return luaL_error(L, "cannot write to a const variable");
-		}
-
-		template <typename R, typename V, V variable, typename T>
-		inline int call_set_variable(std::true_type, lua_State* L, T&& mem) {
-			return call_set_assignable<R, V, variable>(std::is_assignable<std::add_lvalue_reference_t<R>, R>(), L, std::forward<T>(mem));
-		}
-
-		template <typename V, V variable>
-		inline int call_wrapper_variable(std::true_type, lua_State* L) {
-			typedef meta::bind_traits<meta::unqualified_t<V>> traits_type;
-			typedef typename traits_type::object_type T;
-			typedef typename traits_type::return_type R;
-			auto& mem = stack::get<T>(L, 1);
-			switch (lua_gettop(L)) {
-			case 1: {
-				decltype(auto) r = (mem.*variable);
-				stack::push_reference(L, std::forward<decltype(r)>(r));
-				return 1;
-			}
-			case 2:
-				return call_set_variable<R, V, variable>(meta::neg<std::is_const<R>>(), L, mem);
-			default:
-				return luaL_error(L, "incorrect number of arguments to member variable function call");
-			}
-		}
-
-		template <typename F, F fx>
-		inline int call_wrapper_function(std::false_type, lua_State* L) {
-			return call_wrapper_variable<F, fx>(std::is_member_object_pointer<F>(), L);
-		}
-
-		template <typename F, F fx>
-		inline int call_wrapper_function(std::true_type, lua_State* L) {
-			return call_detail::call_wrapped<void, false, false>(L, fx);
-		}
-
-		template <typename F, F fx>
-		int call_wrapper_entry(lua_State* L) noexcept(meta::bind_traits<F>::is_noexcept) {
-			return call_wrapper_function<F, fx>(std::is_member_function_pointer<meta::unqualified_t<F>>(), L);
-		}
-
-		template <typename... Fxs>
-		struct c_call_matcher {
-			template <typename Fx, std::size_t I, typename R, typename... Args>
-			int operator()(types<Fx>, meta::index_value<I>, types<R>, types<Args...>, lua_State* L, int, int) const {
-				typedef meta::at_in_pack_t<I, Fxs...> target;
-				return target::call(L);
-			}
-		};
-
-		template <typename F, F fx>
-		inline int c_call_raw(std::true_type, lua_State* L) {
-			return fx(L);
-		}
-
-		template <typename F, F fx>
-		inline int c_call_raw(std::false_type, lua_State* L) {
-#ifdef __clang__
-			return detail::trampoline(L, function_detail::call_wrapper_entry<F, fx>);
-#else
-			return detail::typed_static_trampoline<decltype(&function_detail::call_wrapper_entry<F, fx>), (&function_detail::call_wrapper_entry<F, fx>)>(L);
-#endif // fuck you clang :c
-		}
-
-	} // namespace function_detail
-
-	template <typename F, F fx>
-	inline int c_call(lua_State* L) {
-		typedef meta::unqualified_t<F> Fu;
-		typedef std::integral_constant<bool,
-		     std::is_same<Fu, lua_CFunction>::value
-#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_)
-		          || std::is_same<Fu, detail::lua_CFunction_noexcept>::value
-#endif
-		     >
-		     is_raw;
-		return function_detail::c_call_raw<F, fx>(is_raw(), L);
-	}
-
-	template <typename F, F f>
-	struct wrap {
-		typedef F type;
-
-		static int call(lua_State* L) {
-			return c_call<type, f>(L);
-		}
-	};
-
-	template <typename... Fxs>
-	inline int c_call(lua_State* L) {
-		if constexpr (sizeof...(Fxs) < 2) {
-			using target = meta::at_in_pack_t<0, Fxs...>;
-			return target::call(L);
-		}
-		else {
-			return call_detail::overload_match_arity<typename Fxs::type...>(function_detail::c_call_matcher<Fxs...>(), L, lua_gettop(L), 1);
-		}
-	}
-
-} // namespace sol
-
-// end of sol/function_types_templated.hpp
-
-// beginning of sol/function_types_stateless.hpp
-
-namespace sol { namespace function_detail {
-	template <typename Function, bool is_yielding>
-	struct upvalue_free_function {
-		using function_type = std::remove_pointer_t<std::decay_t<Function>>;
-		using traits_type = meta::bind_traits<function_type>;
-
-		static int real_call(lua_State* L)
-#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
-		// MSVC is broken, what a surprise...
-#else
-			noexcept(traits_type::is_noexcept)
-#endif
-		{
-			auto udata = stack::stack_detail::get_as_upvalues<function_type*>(L);
-			function_type* fx = udata.first;
-			return call_detail::call_wrapped<void, true, false>(L, fx);
-		}
-
-		static int call(lua_State* L) {
-			int nr = detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
-			if (is_yielding) {
-				return lua_yield(L, nr);
-			}
-			else {
-				return nr;
-			}
-		}
-
-		int operator()(lua_State* L) {
-			return call(L);
-		}
-	};
-
-	template <typename T, typename Function, bool is_yielding>
-	struct upvalue_member_function {
-		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
-		typedef lua_bind_traits<function_type> traits_type;
-
-		static int real_call(lua_State* L)
-#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
-		// MSVC is broken, what a surprise...
-#else
-			noexcept(traits_type::is_noexcept)
-#endif
-		{
-			// Layout:
-			// idx 1...n: verbatim data of member function pointer
-			// idx n + 1: is the object's void pointer
-			// We don't need to store the size, because the other side is templated
-			// with the same member function pointer type
-			function_type& memfx = stack::get<user<function_type>>(L, upvalue_index(2));
-			auto& item = *static_cast<T*>(stack::get<void*>(L, upvalue_index(3)));
-			return call_detail::call_wrapped<T, true, false, -1>(L, memfx, item);
-		}
-
-		static int call(lua_State* L)
-#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
-		// MSVC is broken, what a surprise...
-#else
-			noexcept(traits_type::is_noexcept)
-#endif
-		{
-			int nr = detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
-			if (is_yielding) {
-				return lua_yield(L, nr);
-			}
-			else {
-				return nr;
-			}
-		}
-
-		int operator()(lua_State* L) {
-			return call(L);
-		}
-	};
-
-	template <typename T, typename Function, bool is_yielding>
-	struct upvalue_member_variable {
-		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
-		typedef lua_bind_traits<function_type> traits_type;
-
-		static int real_call(lua_State* L)
-#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
-		// MSVC is broken, what a surprise...
-#else
-			noexcept(traits_type::is_noexcept)
-#endif
-		{
-			// Layout:
-			// idx 1...n: verbatim data of member variable pointer
-			// idx n + 1: is the object's void pointer
-			// We don't need to store the size, because the other side is templated
-			// with the same member function pointer type
-			auto memberdata = stack::stack_detail::get_as_upvalues<function_type>(L);
-			auto objdata = stack::stack_detail::get_as_upvalues<T*>(L, memberdata.second);
-			auto& mem = *objdata.first;
-			function_type& var = memberdata.first;
-			switch (lua_gettop(L)) {
-			case 0:
-				return call_detail::call_wrapped<T, true, false, -1>(L, var, mem);
-			case 1:
-				return call_detail::call_wrapped<T, false, false, -1>(L, var, mem);
-			default:
-				return luaL_error(L, "sol: incorrect number of arguments to member variable function");
-			}
-		}
-
-		static int call(lua_State* L)
-#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
-		// MSVC is broken, what a surprise...
-#else
-			noexcept(traits_type::is_noexcept)
-#endif
-		{
-			int nr = detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
-			if (is_yielding) {
-				return lua_yield(L, nr);
-			}
-			else {
-				return nr;
-			}
-		}
-
-		int operator()(lua_State* L) {
-			return call(L);
-		}
-	};
-
-	template <typename T, typename Function, bool is_yielding>
-	struct upvalue_member_variable<T, readonly_wrapper<Function>, is_yielding> {
-		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
-		typedef lua_bind_traits<function_type> traits_type;
-
-		static int real_call(lua_State* L)
-#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
-		// MSVC is broken, what a surprise...
-#else
-			noexcept(traits_type::is_noexcept)
-#endif
-		{
-			// Layout:
-			// idx 1...n: verbatim data of member variable pointer
-			// idx n + 1: is the object's void pointer
-			// We don't need to store the size, because the other side is templated
-			// with the same member function pointer type
-			auto memberdata = stack::stack_detail::get_as_upvalues<function_type>(L);
-			auto objdata = stack::stack_detail::get_as_upvalues<T*>(L, memberdata.second);
-			auto& mem = *objdata.first;
-			function_type& var = memberdata.first;
-			switch (lua_gettop(L)) {
-			case 0:
-				return call_detail::call_wrapped<T, true, false, -1>(L, var, mem);
-			default:
-				return luaL_error(L, "sol: incorrect number of arguments to member variable function");
-			}
-		}
-
-		static int call(lua_State* L)
-#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
-		// MSVC is broken, what a surprise...
-#else
-			noexcept(traits_type::is_noexcept)
-#endif
-		{
-			int nr = detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
-			if (is_yielding) {
-				return lua_yield(L, nr);
-			}
-			else {
-				return nr;
-			}
-		}
-
-		int operator()(lua_State* L) {
-			return call(L);
-		}
-	};
-
-	template <typename T, typename Function, bool is_yielding>
-	struct upvalue_this_member_function {
-		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
-		typedef lua_bind_traits<function_type> traits_type;
-
-		static int real_call(lua_State* L)
-#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
-		// MSVC is broken, what a surprise...
-#else
-			noexcept(traits_type::is_noexcept)
-#endif
-		{
-			// Layout:
-			// idx 1...n: verbatim data of member variable pointer
-			function_type& memfx = stack::get<user<function_type>>(L, upvalue_index(2));
-			return call_detail::call_wrapped<T, false, false>(L, memfx);
-		}
-
-		static int call(lua_State* L)
-#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
-		// MSVC is broken, what a surprise...
-#else
-			noexcept(traits_type::is_noexcept)
-#endif
-		{
-			int nr = detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
-			if (is_yielding) {
-				return lua_yield(L, nr);
-			}
-			else {
-				return nr;
-			}
-		}
-
-		int operator()(lua_State* L) {
-			return call(L);
-		}
-	};
-
-	template <typename T, typename Function, bool is_yielding>
-	struct upvalue_this_member_variable {
-		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
-
-		static int real_call(lua_State* L) noexcept(false) {
-			// Layout:
-			// idx 1...n: verbatim data of member variable pointer
-			auto memberdata = stack::stack_detail::get_as_upvalues<function_type>(L);
-			function_type& var = memberdata.first;
-			switch (lua_gettop(L)) {
-			case 1:
-				return call_detail::call_wrapped<T, true, false>(L, var);
-			case 2:
-				return call_detail::call_wrapped<T, false, false>(L, var);
-			default:
-				return luaL_error(L, "sol: incorrect number of arguments to member variable function");
-			}
-		}
-
-		static int call(lua_State* L) {
-			int nr = detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
-			if (is_yielding) {
-				return lua_yield(L, nr);
-			}
-			else {
-				return nr;
-			}
-		}
-
-		int operator()(lua_State* L) {
-			return call(L);
-		}
-	};
-
-	template <typename T, typename Function, bool is_yielding>
-	struct upvalue_this_member_variable<T, readonly_wrapper<Function>, is_yielding> {
-		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
-		typedef lua_bind_traits<function_type> traits_type;
-
-		static int real_call(lua_State* L) noexcept(false) {
-			// Layout:
-			// idx 1...n: verbatim data of member variable pointer
-			auto memberdata = stack::stack_detail::get_as_upvalues<function_type>(L);
-			function_type& var = memberdata.first;
-			switch (lua_gettop(L)) {
-			case 1:
-				return call_detail::call_wrapped<T, true, false>(L, var);
-			default:
-				return luaL_error(L, "sol: incorrect number of arguments to member variable function");
-			}
-		}
-
-		static int call(lua_State* L) {
-			int nr = detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
-			if (is_yielding) {
-				return lua_yield(L, nr);
-			}
-			else {
-				return nr;
-			}
-		}
-
-		int operator()(lua_State* L) {
-			return call(L);
-		}
-	};
-}} // namespace sol::function_detail
-
-// end of sol/function_types_stateless.hpp
-
-// beginning of sol/function_types_stateful.hpp
-
-namespace sol {
-namespace function_detail {
-	template <typename Func, bool is_yielding, bool no_trampoline>
-	struct functor_function {
-		typedef std::decay_t<meta::unwrap_unqualified_t<Func>> function_type;
-		function_type fx;
-
-		template <typename... Args>
-		functor_function(function_type f, Args&&... args)
-		: fx(std::move(f), std::forward<Args>(args)...) {
-		}
-
-		int call(lua_State* L) {
-			int nr = call_detail::call_wrapped<void, true, false>(L, fx);
-			if (is_yielding) {
-				return lua_yield(L, nr);
-			}
-			else {
-				return nr;
-			}
-		}
-
-		int operator()(lua_State* L) {
-			if (!no_trampoline) {
-				auto f = [&](lua_State*) -> int { return this->call(L); };
-				return detail::trampoline(L, f);
-			}
-			else {
-				return call(L);
-			}
-		}
-	};
-
-	template <typename T, typename Function, bool is_yielding>
-	struct member_function {
-		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
-		typedef meta::function_return_t<function_type> return_type;
-		typedef meta::function_args_t<function_type> args_lists;
-		function_type invocation;
-		T member;
-
-		template <typename... Args>
-		member_function(function_type f, Args&&... args)
-		: invocation(std::move(f)), member(std::forward<Args>(args)...) {
-		}
-
-		int call(lua_State* L) {
-			int nr = call_detail::call_wrapped<T, true, false, -1>(L, invocation, detail::unwrap(detail::deref(member)));
-			if (is_yielding) {
-				return lua_yield(L, nr);
-			}
-			else {
-				return nr;
-			}
-		}
-
-		int operator()(lua_State* L) {
-			auto f = [&](lua_State*) -> int { return this->call(L); };
-			return detail::trampoline(L, f);
-		}
-	};
-
-	template <typename T, typename Function, bool is_yielding>
-	struct member_variable {
-		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
-		typedef typename meta::bind_traits<function_type>::return_type return_type;
-		typedef typename meta::bind_traits<function_type>::args_list args_lists;
-		function_type var;
-		T member;
-		typedef std::add_lvalue_reference_t<meta::unwrapped_t<std::remove_reference_t<decltype(detail::deref(member))>>> M;
-
-		template <typename... Args>
-		member_variable(function_type v, Args&&... args)
-		: var(std::move(v)), member(std::forward<Args>(args)...) {
-		}
-
-		int call(lua_State* L) {
-			int nr;
-			{
-				M mem = detail::unwrap(detail::deref(member));
-				switch (lua_gettop(L)) {
-				case 0:
-					nr = call_detail::call_wrapped<T, true, false, -1>(L, var, mem);
-					break;
-				case 1:
-					nr = call_detail::call_wrapped<T, false, false, -1>(L, var, mem);
-					break;
-				default:
-					nr = luaL_error(L, "sol: incorrect number of arguments to member variable function");
-					break;
-				}
-			}
-			if (is_yielding) {
-				return lua_yield(L, nr);
-			}
-			else {
-				return nr;
-			}
-		}
-
-		int operator()(lua_State* L) {
-			auto f = [&](lua_State*) -> int { return this->call(L); };
-			return detail::trampoline(L, f);
-		}
-	};
-}
-} // namespace sol::function_detail
-
-// end of sol/function_types_stateful.hpp
-
-// beginning of sol/function_types_overloaded.hpp
-
-namespace sol {
-namespace function_detail {
-	template <int start_skew, typename... Functions>
-	struct overloaded_function {
-		typedef std::tuple<Functions...> overload_list;
-		typedef std::make_index_sequence<sizeof...(Functions)> indices;
-		overload_list overloads;
-
-		overloaded_function(overload_list set)
-		: overloads(std::move(set)) {
-		}
-
-		overloaded_function(Functions... fxs)
-		: overloads(fxs...) {
-		}
-
-		template <typename Fx, std::size_t I, typename... R, typename... Args>
-		static int call(types<Fx>, meta::index_value<I>, types<R...>, types<Args...>, lua_State* L, int, int, overload_list& ol) {
-			auto& func = std::get<I>(ol);
-			int nr = call_detail::call_wrapped<void, true, false, start_skew>(L, func);
-			return nr;
-		}
-
-		int operator()(lua_State* L) {
-			auto mfx = [](auto&&... args) { return call(std::forward<decltype(args)>(args)...); };
-			return call_detail::overload_match<Functions...>(mfx, L, 1 + start_skew, overloads);
-		}
-	};
-}
-} // namespace sol::function_detail
-
-// end of sol/function_types_overloaded.hpp
-
-// beginning of sol/resolve.hpp
-
-namespace sol {
-
-#ifndef __clang__
-	// constexpr is fine for not-clang
-
-	namespace detail {
-		template <typename R, typename... Args, typename F, typename = std::invoke_result_t<meta::unqualified_t<F>, Args...>>
-		inline constexpr auto resolve_i(types<R(Args...)>, F &&) -> R (meta::unqualified_t<F>::*)(Args...) {
-			using Sig = R(Args...);
-			typedef meta::unqualified_t<F> Fu;
-			return static_cast<Sig Fu::*>(&Fu::operator());
-		}
-
-		template <typename F, typename U = meta::unqualified_t<F>>
-		inline constexpr auto resolve_f(std::true_type, F&& f)
-		     -> decltype(resolve_i(types<meta::function_signature_t<decltype(&U::operator())>>(), std::forward<F>(f))) {
-			return resolve_i(types<meta::function_signature_t<decltype(&U::operator())>>(), std::forward<F>(f));
-		}
-
-		template <typename F>
-		inline constexpr void resolve_f(std::false_type, F&&) {
-			static_assert(
-			     meta::has_deducible_signature<F>::value, "Cannot use no-template-parameter call with an overloaded functor: specify the signature");
-		}
-
-		template <typename F, typename U = meta::unqualified_t<F>>
-		inline constexpr auto resolve_i(types<>, F&& f) -> decltype(resolve_f(meta::has_deducible_signature<U>(), std::forward<F>(f))) {
-			return resolve_f(meta::has_deducible_signature<U> {}, std::forward<F>(f));
-		}
-
-		template <typename... Args, typename F, typename R = std::invoke_result_t<F&, Args...>>
-		inline constexpr auto resolve_i(types<Args...>, F&& f) -> decltype(resolve_i(types<R(Args...)>(), std::forward<F>(f))) {
-			return resolve_i(types<R(Args...)>(), std::forward<F>(f));
-		}
-
-		template <typename Sig, typename C>
-		inline constexpr Sig C::*resolve_v(std::false_type, Sig C::*mem_func_ptr) {
-			return mem_func_ptr;
-		}
-
-		template <typename Sig, typename C>
-		inline constexpr Sig C::*resolve_v(std::true_type, Sig C::*mem_variable_ptr) {
-			return mem_variable_ptr;
-		}
-	} // namespace detail
-
-	template <typename... Args, typename R>
-	inline constexpr auto resolve(R fun_ptr(Args...)) -> R (*)(Args...) {
-		return fun_ptr;
-	}
-
-	template <typename Sig>
-	inline constexpr Sig* resolve(Sig* fun_ptr) {
-		return fun_ptr;
-	}
-
-	template <typename... Args, typename R, typename C>
-	inline constexpr auto resolve(R (C::*mem_ptr)(Args...)) -> R (C::*)(Args...) {
-		return mem_ptr;
-	}
-
-	template <typename Sig, typename C>
-	inline constexpr Sig C::*resolve(Sig C::*mem_ptr) {
-		return detail::resolve_v(std::is_member_object_pointer<Sig C::*>(), mem_ptr);
-	}
-
-	template <typename... Sig, typename F, meta::disable<std::is_function<meta::unqualified_t<F>>> = meta::enabler>
-	inline constexpr auto resolve(F&& f) -> decltype(detail::resolve_i(types<Sig...>(), std::forward<F>(f))) {
-		return detail::resolve_i(types<Sig...>(), std::forward<F>(f));
-	}
-#else
-
-	// Clang has distinct problems with constexpr arguments,
-	// so don't use the constexpr versions inside of clang.
-
-	namespace detail {
-		template <typename R, typename... Args, typename F, typename = std::invoke_result_t<meta::unqualified_t<F>, Args...>>
-		inline auto resolve_i(types<R(Args...)>, F &&) -> R (meta::unqualified_t<F>::*)(Args...) {
-			using Sig = R(Args...);
-			typedef meta::unqualified_t<F> Fu;
-			return static_cast<Sig Fu::*>(&Fu::operator());
-		}
-
-		template <typename F, typename U = meta::unqualified_t<F>>
-		inline auto resolve_f(std::true_type, F&& f)
-		     -> decltype(resolve_i(types<meta::function_signature_t<decltype(&U::operator())>>(), std::forward<F>(f))) {
-			return resolve_i(types<meta::function_signature_t<decltype(&U::operator())>>(), std::forward<F>(f));
-		}
-
-		template <typename F>
-		inline void resolve_f(std::false_type, F&&) {
-			static_assert(
-			     meta::has_deducible_signature<F>::value, "Cannot use no-template-parameter call with an overloaded functor: specify the signature");
-		}
-
-		template <typename F, typename U = meta::unqualified_t<F>>
-		inline auto resolve_i(types<>, F&& f) -> decltype(resolve_f(meta::has_deducible_signature<U>(), std::forward<F>(f))) {
-			return resolve_f(meta::has_deducible_signature<U> {}, std::forward<F>(f));
-		}
-
-		template <typename... Args, typename F, typename R = std::invoke_result_t<F&, Args...>>
-		inline auto resolve_i(types<Args...>, F&& f) -> decltype(resolve_i(types<R(Args...)>(), std::forward<F>(f))) {
-			return resolve_i(types<R(Args...)>(), std::forward<F>(f));
-		}
-
-		template <typename Sig, typename C>
-		inline Sig C::*resolve_v(std::false_type, Sig C::*mem_func_ptr) {
-			return mem_func_ptr;
-		}
-
-		template <typename Sig, typename C>
-		inline Sig C::*resolve_v(std::true_type, Sig C::*mem_variable_ptr) {
-			return mem_variable_ptr;
-		}
-	} // namespace detail
-
-	template <typename... Args, typename R>
-	inline auto resolve(R fun_ptr(Args...)) -> R (*)(Args...) {
-		return fun_ptr;
-	}
-
-	template <typename Sig>
-	inline Sig* resolve(Sig* fun_ptr) {
-		return fun_ptr;
-	}
-
-	template <typename... Args, typename R, typename C>
-	inline auto resolve(R (C::*mem_ptr)(Args...)) -> R (C::*)(Args...) {
-		return mem_ptr;
-	}
-
-	template <typename Sig, typename C>
-	inline Sig C::*resolve(Sig C::*mem_ptr) {
-		return detail::resolve_v(std::is_member_object_pointer<Sig C::*>(), mem_ptr);
-	}
-
-	template <typename... Sig, typename F>
-	inline auto resolve(F&& f) -> decltype(detail::resolve_i(types<Sig...>(), std::forward<F>(f))) {
-		return detail::resolve_i(types<Sig...>(), std::forward<F>(f));
-	}
-
-#endif
-
-} // namespace sol
-
-// end of sol/resolve.hpp
-
-namespace sol {
-	namespace function_detail {
-		template <typename T>
-		struct class_indicator {
-			using type = T;
-		};
-
-		struct call_indicator { };
-
-		template <bool yielding>
-		int lua_c_wrapper(lua_State* L) {
-			lua_CFunction cf = lua_tocfunction(L, lua_upvalueindex(2));
-			int nr = cf(L);
-			if constexpr (yielding) {
-				return lua_yield(L, nr);
-			}
-			else {
-				return nr;
-			}
-		}
-
-		template <bool yielding>
-		int lua_c_noexcept_wrapper(lua_State* L) noexcept {
-			detail::lua_CFunction_noexcept cf = reinterpret_cast<detail::lua_CFunction_noexcept>(lua_tocfunction(L, lua_upvalueindex(2)));
-			int nr = cf(L);
-			if constexpr (yielding) {
-				return lua_yield(L, nr);
-			}
-			else {
-				return nr;
-			}
-		}
-
-		struct c_function_invocation { };
-
-		template <bool is_yielding, typename Fx, typename... Args>
-		void select(lua_State* L, Fx&& fx, Args&&... args);
-
-		template <bool is_yielding, bool no_trampoline, typename Fx, typename... Args>
-		void select_set_fx(lua_State* L, Args&&... args) {
-			lua_CFunction freefunc = no_trampoline ? detail::static_trampoline<function_detail::call<meta::unqualified_t<Fx>, 2, is_yielding>>
-			                                       : function_detail::call<meta::unqualified_t<Fx>, 2, is_yielding>;
-
-			int upvalues = 0;
-			upvalues += stack::push(L, nullptr);
-			upvalues += stack::push<user<Fx>>(L, std::forward<Args>(args)...);
-			stack::push(L, c_closure(freefunc, upvalues));
-		}
-
-		template <bool is_yielding, typename R, typename... A, typename Fx, typename... Args>
-		void select_convertible(types<R(A...)>, lua_State* L, Fx&& fx, Args&&... args) {
-			using dFx = std::decay_t<meta::unwrap_unqualified_t<Fx>>;
-			using fx_ptr_t = R (*)(A...);
-			constexpr bool is_convertible = std::is_convertible_v<dFx, fx_ptr_t>;
-			if constexpr (is_convertible) {
-				fx_ptr_t fxptr = detail::unwrap(std::forward<Fx>(fx));
-				select<is_yielding>(L, std::move(fxptr), std::forward<Args>(args)...);
-			}
-			else {
-				using F = function_detail::functor_function<dFx, false, true>;
-				select_set_fx<is_yielding, false, F>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
-			}
-		}
-
-		template <bool is_yielding, typename Fx, typename... Args>
-		void select_convertible(types<>, lua_State* L, Fx&& fx, Args&&... args) {
-			typedef meta::function_signature_t<meta::unwrap_unqualified_t<Fx>> Sig;
-			select_convertible<is_yielding>(types<Sig>(), L, std::forward<Fx>(fx), std::forward<Args>(args)...);
-		}
-
-		template <bool is_yielding, typename Fx, typename... Args>
-		void select_member_variable(lua_State* L, Fx&& fx, Args&&... args) {
-			using uFx = meta::unqualified_t<Fx>;
-			if constexpr (sizeof...(Args) < 1) {
-				using C = typename meta::bind_traits<uFx>::object_type;
-				lua_CFunction freefunc = &function_detail::upvalue_this_member_variable<C, Fx, is_yielding>::call;
-
-				int upvalues = 0;
-				upvalues += stack::push(L, nullptr);
-				upvalues += stack::stack_detail::push_as_upvalues(L, fx);
-				stack::push(L, c_closure(freefunc, upvalues));
-			}
-			else if constexpr (sizeof...(Args) < 2) {
-				using Tu = typename meta::meta_detail::unqualified_non_alias<Args...>::type;
-				constexpr bool is_reference = meta::is_specialization_of_v<Tu, std::reference_wrapper> || std::is_pointer_v<Tu>;
-				if constexpr (meta::is_specialization_of_v<Tu, function_detail::class_indicator>) {
-					lua_CFunction freefunc = &function_detail::upvalue_this_member_variable<typename Tu::type, Fx, is_yielding>::call;
-
-					int upvalues = 0;
-					upvalues += stack::push(L, nullptr);
-					upvalues += stack::stack_detail::push_as_upvalues(L, fx);
-					stack::push(L, c_closure(freefunc, upvalues));
-				}
-				else if constexpr (is_reference) {
-					typedef std::decay_t<Fx> dFx;
-					dFx memfxptr(std::forward<Fx>(fx));
-					auto userptr = detail::ptr(std::forward<Args>(args)...);
-					lua_CFunction freefunc
-					     = &function_detail::upvalue_member_variable<std::decay_t<decltype(*userptr)>, meta::unqualified_t<Fx>, is_yielding>::call;
-
-					int upvalues = 0;
-					upvalues += stack::push(L, nullptr);
-					upvalues += stack::stack_detail::push_as_upvalues(L, memfxptr);
-					upvalues += stack::push(L, static_cast<void const*>(userptr));
-					stack::push(L, c_closure(freefunc, upvalues));
-				}
-				else {
-					using clean_fx = std::remove_pointer_t<std::decay_t<Fx>>;
-					using F = function_detail::member_variable<Tu, clean_fx, is_yielding>;
-					select_set_fx<false, false, F>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
-				}
-			}
-			else {
-				using C = typename meta::bind_traits<uFx>::object_type;
-				using clean_fx = std::remove_pointer_t<std::decay_t<Fx>>;
-				using F = function_detail::member_variable<C, clean_fx, is_yielding>;
-				select_set_fx<false, false, F>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
-			}
-		}
-
-		template <bool is_yielding, typename Fx, typename T, typename... Args>
-		void select_member_function_with(lua_State* L, Fx&& fx, T&& obj, Args&&... args) {
-			using dFx = std::decay_t<Fx>;
-			using Tu = meta::unqualified_t<T>;
-			if constexpr (meta::is_specialization_of_v<Tu, function_detail::class_indicator>) {
-				(void)obj;
-				using C = typename Tu::type;
-				lua_CFunction freefunc = &function_detail::upvalue_this_member_function<C, dFx, is_yielding>::call;
-
-				int upvalues = 0;
-				upvalues += stack::push(L, nullptr);
-				upvalues += stack::push<user<dFx>>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
-				stack::push(L, c_closure(freefunc, upvalues));
-			}
-			else {
-				constexpr bool is_reference = meta::is_specialization_of_v<Tu, std::reference_wrapper> || std::is_pointer_v<Tu>;
-				if constexpr (is_reference) {
-					auto userptr = detail::ptr(std::forward<T>(obj));
-					lua_CFunction freefunc = &function_detail::upvalue_member_function<std::decay_t<decltype(*userptr)>, dFx, is_yielding>::call;
-
-					int upvalues = 0;
-					upvalues += stack::push(L, nullptr);
-					upvalues += stack::push<user<dFx>>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
-					upvalues += stack::push(L, lightuserdata_value(static_cast<void*>(userptr)));
-					stack::push(L, c_closure(freefunc, upvalues));
-				}
-				else {
-					using F = function_detail::member_function<Tu, dFx, is_yielding>;
-					select_set_fx<false, false, F>(L, std::forward<Fx>(fx), std::forward<T>(obj), std::forward<Args>(args)...);
-				}
-			}
-		}
-
-		template <bool is_yielding, typename Fx, typename... Args>
-		void select_member_function(lua_State* L, Fx&& fx, Args&&... args) {
-			using dFx = std::decay_t<Fx>;
-			if constexpr (sizeof...(Args) < 1) {
-				using C = typename meta::bind_traits<meta::unqualified_t<Fx>>::object_type;
-				lua_CFunction freefunc = &function_detail::upvalue_this_member_function<C, dFx, is_yielding>::call;
-
-				int upvalues = 0;
-				upvalues += stack::push(L, nullptr);
-				upvalues += stack::push<user<dFx>>(L, std::forward<Fx>(fx));
-				stack::push(L, c_closure(freefunc, upvalues));
-			}
-			else {
-				select_member_function_with<is_yielding>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
-			}
-		}
-
-		template <bool is_yielding, typename Fx, typename... Args>
-		void select(lua_State* L, Fx&& fx, Args&&... args) {
-			using uFx = meta::unqualified_t<Fx>;
-			if constexpr (is_lua_reference_v<uFx>) {
-				// TODO: hoist into lambda in this case for yielding???
-				stack::push(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
-			}
-			else if constexpr (is_lua_c_function_v<uFx>) {
-				int upvalues = 0;
-				upvalues += stack::push(L, nullptr);
-				upvalues += stack::push(L, std::forward<Fx>(fx));
-#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_)
-				if constexpr (std::is_nothrow_invocable_r_v<int, uFx, lua_State*>) {
-					detail::lua_CFunction_noexcept cf = &lua_c_noexcept_wrapper<is_yielding>;
-					lua_pushcclosure(L, reinterpret_cast<lua_CFunction>(cf), 2);
-				}
-				else {
-					lua_CFunction cf = &lua_c_wrapper<is_yielding>;
-					lua_pushcclosure(L, cf, 2);
-				}
-#else
-				lua_CFunction cf = &function_detail::lua_c_wrapper<is_yielding>;
-				lua_pushcclosure(L, cf, 2);
-#endif
-			}
-			else if constexpr (std::is_function_v<std::remove_pointer_t<uFx>>) {
-				std::decay_t<Fx> target(std::forward<Fx>(fx), std::forward<Args>(args)...);
-				lua_CFunction freefunc = &function_detail::upvalue_free_function<Fx, is_yielding>::call;
-
-				int upvalues = 0;
-				upvalues += stack::push(L, nullptr);
-				upvalues += stack::stack_detail::push_as_upvalues(L, target);
-				stack::push(L, c_closure(freefunc, upvalues));
-			}
-			else if constexpr (std::is_member_function_pointer_v<uFx>) {
-				select_member_function<is_yielding>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
-			}
-			else if constexpr (meta::is_member_object_v<uFx>) {
-				select_member_variable<is_yielding>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
-			}
-			else {
-				select_convertible<is_yielding>(types<>(), L, std::forward<Fx>(fx), std::forward<Args>(args)...);
-			}
-		}
-	} // namespace function_detail
-
-	namespace stack {
-		template <typename... Sigs>
-		struct unqualified_pusher<function_sig<Sigs...>> {
-			template <bool is_yielding, typename Arg0, typename... Args>
-			static int push(lua_State* L, Arg0&& arg0, Args&&... args) {
-				if constexpr (meta::is_specialization_of_v<meta::unqualified_t<Arg0>, std::function>) {
-					if constexpr (is_yielding) {
-						return stack::push<meta::unqualified_t<Arg0>>(L, detail::yield_tag, std::forward<Arg0>(arg0), std::forward<Args>(args)...);
-					}
-					else {
-						return stack::push(L, std::forward<Arg0>(arg0), std::forward<Args>(args)...);
-					}
-				}
-				else {
-					function_detail::select<is_yielding>(L, std::forward<Arg0>(arg0), std::forward<Args>(args)...);
-					return 1;
-				}
-			}
-
-			template <typename Arg0, typename... Args>
-			static int push(lua_State* L, Arg0&& arg0, Args&&... args) {
-				if constexpr (std::is_same_v<meta::unqualified_t<Arg0>, detail::yield_tag_t>) {
-					push<true>(L, std::forward<Args>(args)...);
-				}
-				else if constexpr (meta::is_specialization_of_v<meta::unqualified_t<Arg0>, yielding_t>) {
-					push<true>(L, std::forward<Arg0>(arg0).func, std::forward<Args>(args)...);
-				}
-				else {
-					push<false>(L, std::forward<Arg0>(arg0), std::forward<Args>(args)...);
-				}
-				return 1;
-			}
-		};
-
-		template <typename T>
-		struct unqualified_pusher<yielding_t<T>> {
-			template <typename... Args>
-			static int push(lua_State* L, const yielding_t<T>& f, Args&&... args) {
-				if constexpr (meta::is_specialization_of_v<meta::unqualified_t<T>, std::function>) {
-					return stack::push<T>(L, detail::yield_tag, f.func, std::forward<Args>(args)...);
-				}
-				else {
-					function_detail::select<true>(L, f.func, std::forward<Args>(args)...);
-					return 1;
-				}
-			}
-
-			template <typename... Args>
-			static int push(lua_State* L, yielding_t<T>&& f, Args&&... args) {
-				if constexpr (meta::is_specialization_of_v<meta::unqualified_t<T>, std::function>) {
-					return stack::push<T>(L, detail::yield_tag, std::move(f.func), std::forward<Args>(args)...);
-				}
-				else {
-					function_detail::select<true>(L, std::move(f.func), std::forward<Args>(args)...);
-					return 1;
-				}
-			}
-		};
-
-		template <typename T, typename... Args>
-		struct unqualified_pusher<function_arguments<T, Args...>> {
-			template <std::size_t... I, typename FP>
-			static int push_func(std::index_sequence<I...>, lua_State* L, FP&& fp) {
-				return stack::push<T>(L, std::get<I>(std::forward<FP>(fp).arguments)...);
-			}
-
-			static int push(lua_State* L, const function_arguments<T, Args...>& fp) {
-				return push_func(std::make_index_sequence<sizeof...(Args)>(), L, fp);
-			}
-
-			static int push(lua_State* L, function_arguments<T, Args...>&& fp) {
-				return push_func(std::make_index_sequence<sizeof...(Args)>(), L, std::move(fp));
-			}
-		};
-
-		template <typename Signature>
-		struct unqualified_pusher<std::function<Signature>> {
-			static int push(lua_State* L, detail::yield_tag_t, const std::function<Signature>& fx) {
-				if (fx) {
-					function_detail::select<true>(L, fx);
-					return 1;
-				}
-				return stack::push(L, lua_nil);
-			}
-
-			static int push(lua_State* L, detail::yield_tag_t, std::function<Signature>&& fx) {
-				if (fx) {
-					function_detail::select<true>(L, std::move(fx));
-					return 1;
-				}
-				return stack::push(L, lua_nil);
-			}
-
-			static int push(lua_State* L, const std::function<Signature>& fx) {
-				if (fx) {
-					function_detail::select<false>(L, fx);
-					return 1;
-				}
-				return stack::push(L, lua_nil);
-			}
-
-			static int push(lua_State* L, std::function<Signature>&& fx) {
-				if (fx) {
-					function_detail::select<false>(L, std::move(fx));
-					return 1;
-				}
-				return stack::push(L, lua_nil);
-			}
-		};
-
-		template <typename Signature>
-		struct unqualified_pusher<Signature, std::enable_if_t<std::is_member_pointer<Signature>::value>> {
-			template <typename... Args>
-			static int push(lua_State* L, Args&&... args) {
-				function_detail::select<false>(L, std::forward<Args>(args)...);
-				return 1;
-			}
-		};
-
-		template <typename Signature>
-		struct unqualified_pusher<Signature,
-		     std::enable_if_t<meta::all<std::is_function<std::remove_pointer_t<Signature>>, meta::neg<std::is_same<Signature, lua_CFunction>>,
-		          meta::neg<std::is_same<Signature, std::remove_pointer_t<lua_CFunction>>>
-#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_)
-		          ,
-		          meta::neg<std::is_same<Signature, detail::lua_CFunction_noexcept>>,
-		          meta::neg<std::is_same<Signature, std::remove_pointer_t<detail::lua_CFunction_noexcept>>>
-#endif // noexcept function types
-		          >::value>> {
-			template <typename F>
-			static int push(lua_State* L, F&& f) {
-				function_detail::select<false>(L, std::forward<F>(f));
-				return 1;
-			}
-		};
-
-		template <typename... Functions>
-		struct unqualified_pusher<overload_set<Functions...>> {
-			static int push(lua_State* L, overload_set<Functions...>&& set) {
-				using F = function_detail::overloaded_function<0, Functions...>;
-				function_detail::select_set_fx<false, false, F>(L, std::move(set.functions));
-				return 1;
-			}
-
-			static int push(lua_State* L, const overload_set<Functions...>& set) {
-				using F = function_detail::overloaded_function<0, Functions...>;
-				function_detail::select_set_fx<false, false, F>(L, set.functions);
-				return 1;
-			}
-		};
-
-		template <typename T>
-		struct unqualified_pusher<protect_t<T>> {
-			static int push(lua_State* L, protect_t<T>&& pw) {
-				lua_CFunction cf = call_detail::call_user<void, false, false, protect_t<T>, 2>;
-				int upvalues = 0;
-				upvalues += stack::push(L, nullptr);
-				upvalues += stack::push<user<protect_t<T>>>(L, std::move(pw.value));
-				return stack::push(L, c_closure(cf, upvalues));
-			}
-
-			static int push(lua_State* L, const protect_t<T>& pw) {
-				lua_CFunction cf = call_detail::call_user<void, false, false, protect_t<T>, 2>;
-				int upvalues = 0;
-				upvalues += stack::push(L, nullptr);
-				upvalues += stack::push<user<protect_t<T>>>(L, pw.value);
-				return stack::push(L, c_closure(cf, upvalues));
-			}
-		};
-
-		template <typename F, typename G>
-		struct unqualified_pusher<property_wrapper<F, G>> {
-			static int push(lua_State* L, property_wrapper<F, G>&& pw) {
-				if constexpr (std::is_void_v<F>) {
-					return stack::push(L, std::move(pw.write()));
-				}
-				else if constexpr (std::is_void_v<G>) {
-					return stack::push(L, std::move(pw.read()));
-				}
-				else {
-					return stack::push(L, overload(std::move(pw.read()), std::move(pw.write())));
-				}
-			}
-
-			static int push(lua_State* L, const property_wrapper<F, G>& pw) {
-				if constexpr (std::is_void_v<F>) {
-					return stack::push(L, pw.write);
-				}
-				else if constexpr (std::is_void_v<G>) {
-					return stack::push(L, pw.read);
-				}
-				else {
-					return stack::push(L, overload(pw.read, pw.write));
-				}
-			}
-		};
-
-		template <typename T>
-		struct unqualified_pusher<var_wrapper<T>> {
-			static int push(lua_State* L, var_wrapper<T>&& vw) {
-				return stack::push(L, std::move(vw.value()));
-			}
-			static int push(lua_State* L, const var_wrapper<T>& vw) {
-				return stack::push(L, vw.value());
-			}
-		};
-
-		template <typename... Functions>
-		struct unqualified_pusher<factory_wrapper<Functions...>> {
-			static int push(lua_State* L, const factory_wrapper<Functions...>& fw) {
-				using F = function_detail::overloaded_function<0, Functions...>;
-				function_detail::select_set_fx<false, false, F>(L, fw.functions);
-				return 1;
-			}
-
-			static int push(lua_State* L, factory_wrapper<Functions...>&& fw) {
-				using F = function_detail::overloaded_function<0, Functions...>;
-				function_detail::select_set_fx<false, false, F>(L, std::move(fw.functions));
-				return 1;
-			}
-
-			static int push(lua_State* L, const factory_wrapper<Functions...>& fw, function_detail::call_indicator) {
-				using F = function_detail::overloaded_function<1, Functions...>;
-				function_detail::select_set_fx<false, false, F>(L, fw.functions);
-				return 1;
-			}
-
-			static int push(lua_State* L, factory_wrapper<Functions...>&& fw, function_detail::call_indicator) {
-				using F = function_detail::overloaded_function<1, Functions...>;
-				function_detail::select_set_fx<false, false, F>(L, std::move(fw.functions));
-				return 1;
-			}
-		};
-
-		template <>
-		struct unqualified_pusher<no_construction> {
-			static int push(lua_State* L, no_construction) {
-				lua_CFunction cf = &function_detail::no_construction_error;
-				return stack::push(L, cf);
-			}
-
-			static int push(lua_State* L, no_construction c, function_detail::call_indicator) {
-				return push(L, c);
-			}
-		};
-
-		template <typename T>
-		struct unqualified_pusher<detail::tagged<T, no_construction>> {
-			static int push(lua_State* L, detail::tagged<T, no_construction>) {
-				lua_CFunction cf = &function_detail::no_construction_error;
-				return stack::push(L, cf);
-			}
-
-			static int push(lua_State* L, no_construction c, function_detail::call_indicator) {
-				return push(L, c);
-			}
-		};
-
-		template <typename T, typename... Lists>
-		struct unqualified_pusher<detail::tagged<T, constructor_list<Lists...>>> {
-			static int push(lua_State* L, detail::tagged<T, constructor_list<Lists...>>) {
-				lua_CFunction cf = call_detail::construct<T, detail::default_safe_function_calls, true, Lists...>;
-				return stack::push(L, cf);
-			}
-
-			static int push(lua_State* L, constructor_list<Lists...>) {
-				lua_CFunction cf = call_detail::construct<T, detail::default_safe_function_calls, true, Lists...>;
-				return stack::push(L, cf);
-			}
-		};
-
-		template <typename L0, typename... Lists>
-		struct unqualified_pusher<constructor_list<L0, Lists...>> {
-			typedef constructor_list<L0, Lists...> cl_t;
-			static int push(lua_State* L, cl_t cl) {
-				typedef typename meta::bind_traits<L0>::return_type T;
-				return stack::push<detail::tagged<T, cl_t>>(L, cl);
-			}
-		};
-
-		template <typename T, typename... Fxs>
-		struct unqualified_pusher<detail::tagged<T, constructor_wrapper<Fxs...>>> {
-			static int push(lua_State* L, detail::tagged<T, constructor_wrapper<Fxs...>>&& c) {
-				return push(L, std::move(c.value()));
-			}
-
-			static int push(lua_State* L, const detail::tagged<T, const constructor_wrapper<Fxs...>>& c) {
-				return push(L, c.value());
-			}
-
-			static int push(lua_State* L, constructor_wrapper<Fxs...>&& c) {
-				lua_CFunction cf = call_detail::call_user<T, false, false, constructor_wrapper<Fxs...>, 2>;
-				int upvalues = 0;
-				upvalues += stack::push(L, nullptr);
-				upvalues += stack::push<user<constructor_wrapper<Fxs...>>>(L, std::move(c));
-				return stack::push(L, c_closure(cf, upvalues));
-			}
-
-			static int push(lua_State* L, const constructor_wrapper<Fxs...>& c) {
-				lua_CFunction cf = call_detail::call_user<T, false, false, constructor_wrapper<Fxs...>, 2>;
-				int upvalues = 0;
-				upvalues += stack::push(L, nullptr);
-				upvalues += stack::push<user<constructor_wrapper<Fxs...>>>(L, c);
-				return stack::push(L, c_closure(cf, upvalues));
-			}
-		};
-
-		template <typename F, typename... Fxs>
-		struct unqualified_pusher<constructor_wrapper<F, Fxs...>> {
-			static int push(lua_State* L, const constructor_wrapper<F, Fxs...>& c) {
-				typedef typename meta::bind_traits<F>::template arg_at<0> arg0;
-				typedef meta::unqualified_t<std::remove_pointer_t<arg0>> T;
-				return stack::push<detail::tagged<T, constructor_wrapper<F, Fxs...>>>(L, c);
-			}
-
-			static int push(lua_State* L, constructor_wrapper<F, Fxs...>&& c) {
-				typedef typename meta::bind_traits<F>::template arg_at<0> arg0;
-				typedef meta::unqualified_t<std::remove_pointer_t<arg0>> T;
-				return stack::push<detail::tagged<T, constructor_wrapper<F, Fxs...>>>(L, std::move(c));
-			}
-		};
-
-		template <typename T>
-		struct unqualified_pusher<detail::tagged<T, destructor_wrapper<void>>> {
-			static int push(lua_State* L, destructor_wrapper<void>) {
-				lua_CFunction cf = detail::usertype_alloc_destruct<T>;
-				return stack::push(L, cf);
-			}
-		};
-
-		template <typename T, typename Fx>
-		struct unqualified_pusher<detail::tagged<T, destructor_wrapper<Fx>>> {
-			static int push(lua_State* L, destructor_wrapper<Fx>&& c) {
-				lua_CFunction cf = call_detail::call_user<T, false, false, destructor_wrapper<Fx>, 2>;
-				int upvalues = 0;
-				upvalues += stack::push(L, nullptr);
-				upvalues += stack::push<user<destructor_wrapper<Fx>>>(L, std::move(c));
-				return stack::push(L, c_closure(cf, upvalues));
-			}
-
-			static int push(lua_State* L, const destructor_wrapper<Fx>& c) {
-				lua_CFunction cf = call_detail::call_user<T, false, false, destructor_wrapper<Fx>, 2>;
-				int upvalues = 0;
-				upvalues += stack::push(L, nullptr);
-				upvalues += stack::push<user<destructor_wrapper<Fx>>>(L, c);
-				return stack::push(L, c_closure(cf, upvalues));
-			}
-		};
-
-		template <typename Fx>
-		struct unqualified_pusher<destructor_wrapper<Fx>> {
-			static int push(lua_State* L, destructor_wrapper<Fx>&& c) {
-				lua_CFunction cf = call_detail::call_user<void, false, false, destructor_wrapper<Fx>, 2>;
-				int upvalues = 0;
-				upvalues += stack::push(L, nullptr);
-				upvalues += stack::push<user<destructor_wrapper<Fx>>>(L, std::move(c));
-				return stack::push(L, c_closure(cf, upvalues));
-			}
-
-			static int push(lua_State* L, const destructor_wrapper<Fx>& c) {
-				lua_CFunction cf = call_detail::call_user<void, false, false, destructor_wrapper<Fx>, 2>;
-				int upvalues = 0;
-				upvalues += stack::push(L, nullptr);
-				upvalues += stack::push<user<destructor_wrapper<Fx>>>(L, c);
-				return stack::push(L, c_closure(cf, upvalues));
-			}
-		};
-
-		template <typename F, typename... Policies>
-		struct unqualified_pusher<policy_wrapper<F, Policies...>> {
-			using P = policy_wrapper<F, Policies...>;
-
-			static int push(lua_State* L, const P& p) {
-				lua_CFunction cf = call_detail::call_user<void, false, false, P, 2>;
-				int upvalues = 0;
-				upvalues += stack::push(L, nullptr);
-				upvalues += stack::push<user<P>>(L, p);
-				return stack::push(L, c_closure(cf, upvalues));
-			}
-
-			static int push(lua_State* L, P&& p) {
-				lua_CFunction cf = call_detail::call_user<void, false, false, P, 2>;
-				int upvalues = 0;
-				upvalues += stack::push(L, nullptr);
-				upvalues += stack::push<user<P>>(L, std::move(p));
-				return stack::push(L, c_closure(cf, upvalues));
-			}
-		};
-
-		template <typename T, typename F, typename... Policies>
-		struct unqualified_pusher<detail::tagged<T, policy_wrapper<F, Policies...>>> {
-			using P = policy_wrapper<F, Policies...>;
-			using Tagged = detail::tagged<T, P>;
-
-			static int push(lua_State* L, const Tagged& p) {
-				lua_CFunction cf = call_detail::call_user<T, false, false, P, 2>;
-				int upvalues = 0;
-				upvalues += stack::push(L, nullptr);
-				upvalues += stack::push<user<P>>(L, p.value());
-				return stack::push(L, c_closure(cf, upvalues));
-			}
-
-			static int push(lua_State* L, Tagged&& p) {
-				lua_CFunction cf = call_detail::call_user<T, false, false, P, 2>;
-				int upvalues = 0;
-				upvalues += stack::push(L, nullptr);
-				upvalues += stack::push<user<P>>(L, std::move(p.value()));
-				return stack::push(L, c_closure(cf, upvalues));
-			}
-		};
-
-		template <typename T>
-		struct unqualified_pusher<push_invoke_t<T>> {
-			static int push(lua_State* L, push_invoke_t<T>&& pi) {
-				if constexpr (std::is_invocable_v<std::add_rvalue_reference_t<T>, lua_State*>) {
-					return stack::push(L, std::move(pi.value())(L));
-				}
-				else {
-					return stack::push(L, std::move(pi.value())());
-				}
-			}
-
-			static int push(lua_State* L, const push_invoke_t<T>& pi) {
-				if constexpr (std::is_invocable_v<const T, lua_State*>) {
-					return stack::push(L, pi.value()(L));
-				}
-				else {
-					return stack::push(L, pi.value()());
-				}
-			}
-		};
-
-		namespace stack_detail {
-			template <typename Function, typename Handler>
-			bool check_function_pointer(lua_State* L, int index, Handler&& handler, record& tracking) noexcept {
-#if SOL_IS_ON(SOL_GET_FUNCTION_POINTER_UNSAFE_I_)
-				tracking.use(1);
-				bool success = lua_iscfunction(L, index) == 1;
-				if (success) {
-					// there must be at LEAST 2 upvalues; otherwise, we didn't serialize it.
-					const char* upvalue_name = lua_getupvalue(L, index, 2);
-					lua_pop(L, 1);
-					success = upvalue_name != nullptr;
-				}
-				if (!success) {
-					// expected type, actual type
-					handler(
-					     L, index, type::function, type_of(L, index), "type must be a Lua C Function gotten from a function pointer serialized by sol2");
-				}
-				return success;
-#else
-				return false;
-#endif
-			}
-
-			template <typename Function>
-			Function* get_function_pointer(lua_State* L, int index, record& tracking) noexcept {
-#if SOL_IS_ON(SOL_GET_FUNCTION_POINTER_UNSAFE_I_)
-				tracking.use(1);
-				auto udata = stack::stack_detail::get_as_upvalues_using_function<Function*>(L, index);
-				Function* fx = udata.first;
-				return fx;
-#else
-				static_assert(meta::meta_detail::always_true<Function>::value,
-#if SOL_IS_DEFAULT_OFF(SOL_GET_FUNCTION_POINTER_UNSAFE_I_)
-				     "You are attempting to retrieve a function pointer type. "
-				     "This is inherently unsafe in sol2. In order to do this, you must turn on the "
-				     "SOL_GET_FUNCTION_POINTER_UNSAFE configuration macro, as detailed in the documentation. "
-				     "Please be careful!"
-#else
-				     "You are attempting to retrieve a function pointer type. "
-				     "You explicitly turned off the ability to do this by defining "
-				     "SOL_GET_FUNCTION_POINTER_UNSAFE or similar to be off. "
-				     "Please reconsider this!"
-#endif
-				);
-				return nullptr;
-#endif
-			}
-		} // namespace stack_detail
-	}      // namespace stack
-} // namespace sol
-
-// end of sol/function_types.hpp
-
-// beginning of sol/dump_handler.hpp
-
-#include <cstdint>
-#include <exception>
-
-namespace sol {
-
-	class dump_error : public error {
-	private:
-		int ec_;
-
-	public:
-		dump_error(int error_code_) : error("dump returned non-zero error of " + std::to_string(error_code_)), ec_(error_code_) {
-		}
-
-		int error_code() const {
-			return ec_;
-		}
-	};
-
-	inline int dump_pass_on_error(lua_State* L, int result_code, lua_Writer writer_function, void* userdata, bool strip) {
-		(void)L;
-		(void)writer_function;
-		(void)userdata;
-		(void)strip;
-		return result_code;
-	}
-
-	inline int dump_panic_on_error(lua_State* L, int result_code, lua_Writer writer_function, void* userdata, bool strip) {
-		(void)L;
-		(void)writer_function;
-		(void)userdata;
-		(void)strip;
-		return luaL_error(L, "a non-zero error code (%d) was returned by the lua_Writer for the dump function", result_code);
-	}
-
-	inline int dump_throw_on_error(lua_State* L, int result_code, lua_Writer writer_function, void* userdata, bool strip) {
-#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
-		return dump_panic_on_error(L, result_code, writer_function, userdata, strip);
-#else
-		(void)L;
-		(void)writer_function;
-		(void)userdata;
-		(void)strip;
-		throw dump_error(result_code);
-#endif // no exceptions stuff
-	}
-
-} // namespace sol
-
-// end of sol/dump_handler.hpp
-
-#include <cstdint>
-
-namespace sol {
-	template <typename ref_t, bool aligned = false>
-	class basic_function : public basic_object<ref_t> {
-	private:
-		using base_t = basic_object<ref_t>;
-
-		void luacall(std::ptrdiff_t argcount, std::ptrdiff_t resultcount) const {
-			lua_call(lua_state(), static_cast<int>(argcount), static_cast<int>(resultcount));
-		}
-
-		template <std::size_t... I, typename... Ret>
-		auto invoke(types<Ret...>, std::index_sequence<I...>, std::ptrdiff_t n) const {
-			luacall(n, lua_size<std::tuple<Ret...>>::value);
-			return stack::pop<std::tuple<Ret...>>(lua_state());
-		}
-
-		template <std::size_t I, typename Ret, meta::enable<meta::neg<std::is_void<Ret>>> = meta::enabler>
-		Ret invoke(types<Ret>, std::index_sequence<I>, std::ptrdiff_t n) const {
-			luacall(n, lua_size<Ret>::value);
-			return stack::pop<Ret>(lua_state());
-		}
-
-		template <std::size_t I>
-		void invoke(types<void>, std::index_sequence<I>, std::ptrdiff_t n) const {
-			luacall(n, 0);
-		}
-
-		unsafe_function_result invoke(types<>, std::index_sequence<>, std::ptrdiff_t n) const {
-			int stacksize = lua_gettop(lua_state());
-			int firstreturn = (std::max)(1, stacksize - static_cast<int>(n));
-			luacall(n, LUA_MULTRET);
-			int poststacksize = lua_gettop(lua_state());
-			int returncount = poststacksize - (firstreturn - 1);
-			return unsafe_function_result(lua_state(), firstreturn, returncount);
-		}
-
-	public:
-		using base_t::lua_state;
-
-		basic_function() = default;
-		template <typename T, meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_function>>, meta::neg<std::is_same<base_t, stack_reference>>, meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
-		basic_function(T&& r) noexcept
-		: base_t(std::forward<T>(r)) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			if (!is_function<meta::unqualified_t<T>>::value) {
-				auto pp = stack::push_pop(*this);
-				constructor_handler handler{};
-				stack::check<basic_function>(lua_state(), -1, handler);
-			}
-#endif // Safety
-		}
-		basic_function(const basic_function&) = default;
-		basic_function& operator=(const basic_function&) = default;
-		basic_function(basic_function&&) = default;
-		basic_function& operator=(basic_function&&) = default;
-		basic_function(const stack_reference& r)
-		: basic_function(r.lua_state(), r.stack_index()) {
-		}
-		basic_function(stack_reference&& r)
-		: basic_function(r.lua_state(), r.stack_index()) {
-		}
-		basic_function(lua_nil_t n)
-		: base_t(n) {
-		}
-		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
-		basic_function(lua_State* L, T&& r)
-		: base_t(L, std::forward<T>(r)) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			auto pp = stack::push_pop(*this);
-			constructor_handler handler{};
-			stack::check<basic_function>(lua_state(), -1, handler);
-#endif // Safety
-		}
-		basic_function(lua_State* L, int index = -1)
-		: base_t(L, index) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			constructor_handler handler{};
-			stack::check<basic_function>(L, index, handler);
-#endif // Safety
-		}
-		basic_function(lua_State* L, ref_index index)
-		: base_t(L, index) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			auto pp = stack::push_pop(*this);
-			constructor_handler handler{};
-			stack::check<basic_function>(lua_state(), -1, handler);
-#endif // Safety
-		}
-
-		template <typename Fx>
-		int dump(lua_Writer writer, void* userdata, bool strip, Fx&& on_error) const {
-			this->push();
-			auto ppn = stack::push_popper_n<false>(this->lua_state(), 1);
-			int r = lua_dump(this->lua_state(), writer, userdata, strip ? 1 : 0);
-			if (r != 0) {
-				return on_error(this->lua_state(), r, writer, userdata, strip);
-			}
-			return r;
-		}
-
-		int dump(lua_Writer writer, void* userdata, bool strip = false) const {
-			return dump(writer, userdata, strip, &dump_throw_on_error);
-		}
-
-		template <typename Container = bytecode>
-		Container dump() const {
-			Container bc;
-			(void)dump(static_cast<lua_Writer>(&basic_insert_dump_writer<Container>), static_cast<void*>(&bc), false, &dump_panic_on_error);
-			return bc;
-		}
-
-		template <typename Container = bytecode, typename Fx>
-		Container dump(Fx&& on_error) const {
-			Container bc;
-			(void)dump(static_cast<lua_Writer>(&basic_insert_dump_writer<Container>), static_cast<void*>(&bc), false, std::forward<Fx>(on_error));
-			return bc;
-		}
-
-		template <typename... Args>
-		unsafe_function_result operator()(Args&&... args) const {
-			return call<>(std::forward<Args>(args)...);
-		}
-
-		template <typename... Ret, typename... Args>
-		decltype(auto) operator()(types<Ret...>, Args&&... args) const {
-			return call<Ret...>(std::forward<Args>(args)...);
-		}
-
-		template <typename... Ret, typename... Args>
-		decltype(auto) call(Args&&... args) const {
-			if (!aligned) {
-				base_t::push();
-			}
-			int pushcount = stack::multi_push_reference(lua_state(), std::forward<Args>(args)...);
-			return invoke(types<Ret...>(), std::make_index_sequence<sizeof...(Ret)>(), static_cast<std::ptrdiff_t>(pushcount));
-		}
-	};
-} // namespace sol
-
-// end of sol/unsafe_function.hpp
-
-// beginning of sol/protected_function.hpp
-
-// beginning of sol/protected_handler.hpp
-
-#include <cstdint>
-
-namespace sol {
-	namespace detail {
-		inline const char(&default_handler_name())[9]{
-			static const char name[9] = "sol.\xF0\x9F\x94\xA9";
-			return name;
-		}
-
-		template <bool b, typename target_t = reference>
-		struct protected_handler {
-			typedef is_stack_based<target_t> is_stack;
-			const target_t& target;
-			int stackindex;
-
-			protected_handler(std::false_type, const target_t& target)
-				: target(target), stackindex(0) {
-				if (b) {
-					stackindex = lua_gettop(target.lua_state()) + 1;
-					target.push();
-				}
-			}
-
-			protected_handler(std::true_type, const target_t& target)
-				: target(target), stackindex(0) {
-				if (b) {
-					stackindex = target.stack_index();
-				}
-			}
-
-			protected_handler(const target_t& target)
-				: protected_handler(is_stack(), target) {
-			}
-
-			bool valid() const noexcept {
-				return b;
-			}
-
-			~protected_handler() {
-				if constexpr (!is_stack::value) {
-					if (stackindex != 0) {
-						lua_remove(target.lua_state(), stackindex);
-					}
-				}
-			}
-		};
-
-		template <typename base_t, typename T>
-		basic_function<base_t> force_cast(T& p) {
-			return p;
-		}
-
-		template <typename Reference, bool is_main_ref = false>
-		static Reference get_default_handler(lua_State* L) {
-			if (is_stack_based<Reference>::value || L == nullptr)
-				return Reference(L, lua_nil);
-			L = is_main_ref ? main_thread(L, L) : L;
-			lua_getglobal(L, default_handler_name());
-			auto pp = stack::pop_n(L, 1);
-			return Reference(L, -1);
-		}
-
-		template <typename T>
-		static void set_default_handler(lua_State* L, const T& ref) {
-			if (L == nullptr) {
-				return;
-			}
-			if (!ref.valid()) {
-#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
-				luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
-#endif // make sure stack doesn't overflow
-				lua_pushnil(L);
-				lua_setglobal(L, default_handler_name());
-			}
-			else {
-				ref.push(L);
-				lua_setglobal(L, default_handler_name());
-			}
-		}
-	} // namespace detail
-} // namespace sol
-
-// end of sol/protected_handler.hpp
-
-#include <cstdint>
-#include <algorithm>
-
-namespace sol {
-	
-	namespace detail {
-		template <bool b, typename handler_t>
-		inline void handle_protected_exception(lua_State* L, optional<const std::exception&> maybe_ex, const char* error, detail::protected_handler<b, handler_t>& h) {
-			h.stackindex = 0;
-			if (b) {
-				h.target.push();
-				detail::call_exception_handler(L, maybe_ex, error);
-				lua_call(L, 1, 1);
-			}
-			else {
-				detail::call_exception_handler(L, maybe_ex, error);
-			}
-		}
-	}
-
-	template <typename ref_t, bool aligned = false, typename handler_t = reference>
-	class basic_protected_function : public basic_object<ref_t> {
-	private:
-		using base_t = basic_object<ref_t>;
-
-	public:
-		using is_stack_handler = is_stack_based<handler_t>;
-
-		static handler_t get_default_handler(lua_State* L) {
-			return detail::get_default_handler<handler_t, is_main_threaded<base_t>::value>(L);
-		}
-
-		template <typename T>
-		static void set_default_handler(const T& ref) {
-			detail::set_default_handler(ref.lua_state(), ref);
-		}
-
-	private:
-		template <bool b>
-		call_status luacall(std::ptrdiff_t argcount, std::ptrdiff_t resultcount, detail::protected_handler<b, handler_t>& h) const {
-			return static_cast<call_status>(lua_pcall(lua_state(), static_cast<int>(argcount), static_cast<int>(resultcount), h.stackindex));
-		}
-
-		template <std::size_t... I, bool b, typename... Ret>
-		auto invoke(types<Ret...>, std::index_sequence<I...>, std::ptrdiff_t n, detail::protected_handler<b, handler_t>& h) const {
-			luacall(n, sizeof...(Ret), h);
-			return stack::pop<std::tuple<Ret...>>(lua_state());
-		}
-
-		template <std::size_t I, bool b, typename Ret>
-		Ret invoke(types<Ret>, std::index_sequence<I>, std::ptrdiff_t n, detail::protected_handler<b, handler_t>& h) const {
-			luacall(n, 1, h);
-			return stack::pop<Ret>(lua_state());
-		}
-
-		template <std::size_t I, bool b>
-		void invoke(types<void>, std::index_sequence<I>, std::ptrdiff_t n, detail::protected_handler<b, handler_t>& h) const {
-			luacall(n, 0, h);
-		}
-
-		template <bool b>
-		protected_function_result invoke(types<>, std::index_sequence<>, std::ptrdiff_t n, detail::protected_handler<b, handler_t>& h) const {
-			int stacksize = lua_gettop(lua_state());
-			int poststacksize = stacksize;
-			int firstreturn = 1;
-			int returncount = 0;
-			call_status code = call_status::ok;
-#if !defined(SOL_NO_EXCEPTIONS) || !SOL_NO_EXCEPTIONS
-#if (!defined(SOL_EXCEPTIONS_SAFE_PROPAGATION) || !SOL_NO_EXCEPTIONS_SAFE_PROPAGATION) || (defined(SOL_LUAJIT) && SOL_LUAJIT)
-			try {
-#endif // Safe Exception Propagation
-#endif // No Exceptions
-				firstreturn = (std::max)(1, static_cast<int>(stacksize - n - static_cast<int>(h.valid() && !is_stack_handler::value)));
-				code = luacall(n, LUA_MULTRET, h);
-				poststacksize = lua_gettop(lua_state()) - static_cast<int>(h.valid() && !is_stack_handler::value);
-				returncount = poststacksize - (firstreturn - 1);
-#ifndef SOL_NO_EXCEPTIONS
-#if (!defined(SOL_EXCEPTIONS_SAFE_PROPAGATION) || !SOL_NO_EXCEPTIONS_SAFE_PROPAGATION) || (defined(SOL_LUAJIT) && SOL_LUAJIT)
-			}
-			// Handle C++ errors thrown from C++ functions bound inside of lua
-			catch (const char* error) {
-				detail::handle_protected_exception(lua_state(), optional<const std::exception&>(nullopt), error, h);
-				firstreturn = lua_gettop(lua_state());
-				return protected_function_result(lua_state(), firstreturn, 0, 1, call_status::runtime);
-			}
-			catch (const std::string& error) {
-				detail::handle_protected_exception(lua_state(), optional<const std::exception&>(nullopt), error.c_str(), h);
-				firstreturn = lua_gettop(lua_state());
-				return protected_function_result(lua_state(), firstreturn, 0, 1, call_status::runtime);
-			}
-			catch (const std::exception& error) {
-				detail::handle_protected_exception(lua_state(), optional<const std::exception&>(error), error.what(), h);
-				firstreturn = lua_gettop(lua_state());
-				return protected_function_result(lua_state(), firstreturn, 0, 1, call_status::runtime);
-			}
-#if (!defined(SOL_EXCEPTIONS_SAFE_PROPAGATION) || !SOL_NO_EXCEPTIONS_SAFE_PROPAGATION)
-			// LuaJIT cannot have the catchall when the safe propagation is on
-			// but LuaJIT will swallow all C++ errors 
-			// if we don't at least catch std::exception ones
-			catch (...) {
-				detail::handle_protected_exception(lua_state(), optional<const std::exception&>(nullopt), detail::protected_function_error, h);
-				firstreturn = lua_gettop(lua_state());
-				return protected_function_result(lua_state(), firstreturn, 0, 1, call_status::runtime);
-			}
-#endif // LuaJIT
-#else
-			// do not handle exceptions: they can be propogated into C++ and keep all type information / rich information
-#endif // Safe Exception Propagation
-#endif // Exceptions vs. No Exceptions
-			return protected_function_result(lua_state(), firstreturn, returncount, returncount, code);
-		}
-
-	public:
-		using base_t::lua_state;
-
-		handler_t error_handler;
-
-		basic_protected_function() = default;
-		template <typename T, meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_protected_function>>, meta::neg<std::is_base_of<proxy_base_tag, meta::unqualified_t<T>>>, meta::neg<std::is_same<base_t, stack_reference>>, meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
-		basic_protected_function(T&& r) noexcept
-		: base_t(std::forward<T>(r)), error_handler(get_default_handler(r.lua_state())) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			if (!is_function<meta::unqualified_t<T>>::value) {
-				auto pp = stack::push_pop(*this);
-				constructor_handler handler{};
-				stack::check<basic_protected_function>(lua_state(), -1, handler);
-			}
-#endif // Safety
-		}
-		basic_protected_function(const basic_protected_function&) = default;
-		basic_protected_function& operator=(const basic_protected_function&) = default;
-		basic_protected_function(basic_protected_function&&) = default;
-		basic_protected_function& operator=(basic_protected_function&&) = default;
-		basic_protected_function(const basic_function<base_t>& b)
-		: basic_protected_function(b, get_default_handler(b.lua_state())) {
-		}
-		basic_protected_function(basic_function<base_t>&& b)
-		: basic_protected_function(std::move(b), get_default_handler(b.lua_state())) {
-		}
-		basic_protected_function(const basic_function<base_t>& b, handler_t eh)
-		: base_t(b), error_handler(std::move(eh)) {
-		}
-		basic_protected_function(basic_function<base_t>&& b, handler_t eh)
-		: base_t(std::move(b)), error_handler(std::move(eh)) {
-		}
-		basic_protected_function(const stack_reference& r)
-		: basic_protected_function(r.lua_state(), r.stack_index(), get_default_handler(r.lua_state())) {
-		}
-		basic_protected_function(stack_reference&& r)
-		: basic_protected_function(r.lua_state(), r.stack_index(), get_default_handler(r.lua_state())) {
-		}
-		basic_protected_function(const stack_reference& r, handler_t eh)
-		: basic_protected_function(r.lua_state(), r.stack_index(), std::move(eh)) {
-		}
-		basic_protected_function(stack_reference&& r, handler_t eh)
-		: basic_protected_function(r.lua_state(), r.stack_index(), std::move(eh)) {
-		}
-
-		template <typename Super>
-		basic_protected_function(const proxy_base<Super>& p)
-		: basic_protected_function(p, get_default_handler(p.lua_state())) {
-		}
-		template <typename Super>
-		basic_protected_function(proxy_base<Super>&& p)
-		: basic_protected_function(std::move(p), get_default_handler(p.lua_state())) {
-		}
-		template <typename Proxy, typename Handler, meta::enable<std::is_base_of<proxy_base_tag, meta::unqualified_t<Proxy>>, meta::neg<is_lua_index<meta::unqualified_t<Handler>>>> = meta::enabler>
-		basic_protected_function(Proxy&& p, Handler&& eh)
-		: basic_protected_function(detail::force_cast<base_t>(p), std::forward<Handler>(eh)) {
-		}
-
-		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
-		basic_protected_function(lua_State* L, T&& r)
-		: basic_protected_function(L, std::forward<T>(r), get_default_handler(L)) {
-		}
-		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
-		basic_protected_function(lua_State* L, T&& r, handler_t eh)
-		: base_t(L, std::forward<T>(r)), error_handler(std::move(eh)) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			auto pp = stack::push_pop(*this);
-			constructor_handler handler{};
-			stack::check<basic_protected_function>(lua_state(), -1, handler);
-#endif // Safety
-		}
-		
-		basic_protected_function(lua_nil_t n)
-			: base_t(n), error_handler(n) {
-		}
-
-		basic_protected_function(lua_State* L, int index = -1)
-		: basic_protected_function(L, index, get_default_handler(L)) {
-		}
-		basic_protected_function(lua_State* L, int index, handler_t eh)
-		: base_t(L, index), error_handler(std::move(eh)) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			constructor_handler handler{};
-			stack::check<basic_protected_function>(L, index, handler);
-#endif // Safety
-		}
-		basic_protected_function(lua_State* L, absolute_index index)
-		: basic_protected_function(L, index, get_default_handler(L)) {
-		}
-		basic_protected_function(lua_State* L, absolute_index index, handler_t eh)
-		: base_t(L, index), error_handler(std::move(eh)) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			constructor_handler handler{};
-			stack::check<basic_protected_function>(L, index, handler);
-#endif // Safety
-		}
-		basic_protected_function(lua_State* L, raw_index index)
-		: basic_protected_function(L, index, get_default_handler(L)) {
-		}
-		basic_protected_function(lua_State* L, raw_index index, handler_t eh)
-		: base_t(L, index), error_handler(std::move(eh)) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			constructor_handler handler{};
-			stack::check<basic_protected_function>(L, index, handler);
-#endif // Safety
-		}
-		basic_protected_function(lua_State* L, ref_index index)
-		: basic_protected_function(L, index, get_default_handler(L)) {
-		}
-		basic_protected_function(lua_State* L, ref_index index, handler_t eh)
-		: base_t(L, index), error_handler(std::move(eh)) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			auto pp = stack::push_pop(*this);
-			constructor_handler handler{};
-			stack::check<basic_protected_function>(lua_state(), -1, handler);
-#endif // Safety
-		}
-
-		template <typename Fx>
-		int dump(lua_Writer writer, void* userdata, bool strip, Fx&& on_error) const {
-			this->push();
-			auto ppn = stack::push_popper_n<false>(this->lua_state(), 1);
-			int r = lua_dump(this->lua_state(), writer, userdata, strip ? 1 : 0);
-			if (r != 0) {
-				return on_error(this->lua_state(), r, writer, userdata, strip);
-			}
-			return r;
-		}
-
-		int dump(lua_Writer writer, void* userdata, bool strip = false) const {
-			return dump(writer, userdata, strip, &dump_pass_on_error);
-		}
-
-		template <typename Container = bytecode>
-		Container dump() const {
-			Container bc;
-			(void)dump(static_cast<lua_Writer>(&basic_insert_dump_writer<Container>), static_cast<void*>(&bc), false, &dump_throw_on_error);
-			return bc;
-		}
-
-		template <typename Container = bytecode, typename Fx>
-		Container dump(Fx&& on_error) const {
-			Container bc;
-			(void)dump(static_cast<lua_Writer>(&basic_insert_dump_writer<Container>), static_cast<void*>(&bc), false, std::forward<Fx>(on_error));
-			return bc;
-		}
-
-		template <typename... Args>
-		protected_function_result operator()(Args&&... args) const {
-			return call<>(std::forward<Args>(args)...);
-		}
-
-		template <typename... Ret, typename... Args>
-		decltype(auto) operator()(types<Ret...>, Args&&... args) const {
-			return call<Ret...>(std::forward<Args>(args)...);
-		}
-
-		template <typename... Ret, typename... Args>
-		decltype(auto) call(Args&&... args) const {
-			if constexpr (!aligned) {
-				// we do not expect the function to already be on the stack: push it
-				if (error_handler.valid()) {
-					detail::protected_handler<true, handler_t> h(error_handler);
-					base_t::push();
-					int pushcount = stack::multi_push_reference(lua_state(), std::forward<Args>(args)...);
-					return invoke(types<Ret...>(), std::make_index_sequence<sizeof...(Ret)>(), pushcount, h);
-				}
-				else {
-					detail::protected_handler<false, handler_t> h(error_handler);
-					base_t::push();
-					int pushcount = stack::multi_push_reference(lua_state(), std::forward<Args>(args)...);
-					return invoke(types<Ret...>(), std::make_index_sequence<sizeof...(Ret)>(), pushcount, h);
-				}
-			}
-			else {
-				// the function is already on the stack at the right location
-				if (error_handler.valid()) {
-					// the handler will be pushed onto the stack manually,
-					// since it's not already on the stack this means we need to push our own
-					// function on the stack too and swap things to be in-place
-					if constexpr (!is_stack_handler::value) {
-						// so, we need to remove the function at the top and then dump the handler out ourselves
-						base_t::push();
-					}
-					detail::protected_handler<true, handler_t> h(error_handler);
-					if constexpr (!is_stack_handler::value) {
-						lua_replace(lua_state(), -3);
-						h.stackindex = lua_absindex(lua_state(), -2);
-					}
-					int pushcount = stack::multi_push_reference(lua_state(), std::forward<Args>(args)...);
-					return invoke(types<Ret...>(), std::make_index_sequence<sizeof...(Ret)>(), pushcount, h);
-				}
-				else {
-					detail::protected_handler<false, handler_t> h(error_handler);
-					int pushcount = stack::multi_push_reference(lua_state(), std::forward<Args>(args)...);
-					return invoke(types<Ret...>(), std::make_index_sequence<sizeof...(Ret)>(), pushcount, h);
-				}
-			}
-		}
-	};
-} // namespace sol
-
-// end of sol/protected_function.hpp
-
-#include <functional>
-
-namespace sol {
-	template <typename... Ret, typename... Args>
-	decltype(auto) stack_proxy::call(Args&&... args) {
-		stack_function sf(this->lua_state(), this->stack_index());
-		return sf.template call<Ret...>(std::forward<Args>(args)...);
-	}
-
-	inline protected_function_result::protected_function_result(unsafe_function_result&& o) noexcept
-	: L(o.lua_state()), index(o.stack_index()), returncount(o.return_count()), popcount(o.return_count()), err(o.status()) {
-		// Must be manual, otherwise destructor will screw us
-		// return count being 0 is enough to keep things clean
-		// but we will be thorough
-		o.abandon();
-	}
-
-	inline protected_function_result& protected_function_result::operator=(unsafe_function_result&& o) noexcept {
-		L = o.lua_state();
-		index = o.stack_index();
-		returncount = o.return_count();
-		popcount = o.return_count();
-		err = o.status();
-		// Must be manual, otherwise destructor will screw us
-		// return count being 0 is enough to keep things clean
-		// but we will be thorough
-		o.abandon();
-		return *this;
-	}
-
-	inline unsafe_function_result::unsafe_function_result(protected_function_result&& o) noexcept
-	: L(o.lua_state()), index(o.stack_index()), returncount(o.return_count()) {
-		// Must be manual, otherwise destructor will screw us
-		// return count being 0 is enough to keep things clean
-		// but we will be thorough
-		o.abandon();
-	}
-	inline unsafe_function_result& unsafe_function_result::operator=(protected_function_result&& o) noexcept {
-		L = o.lua_state();
-		index = o.stack_index();
-		returncount = o.return_count();
-		// Must be manual, otherwise destructor will screw us
-		// return count being 0 is enough to keep things clean
-		// but we will be thorough
-		o.abandon();
-		return *this;
-	}
-
-	namespace detail {
-		template <typename... R>
-		struct std_shim {
-			unsafe_function lua_func_;
-
-			std_shim(unsafe_function lua_func) : lua_func_(std::move(lua_func)) {
-			}
-
-			template <typename... Args>
-			meta::return_type_t<R...> operator()(Args&&... args) {
-				return lua_func_.call<R...>(std::forward<Args>(args)...);
-			}
-		};
-
-		template <>
-		struct std_shim<void> {
-			unsafe_function lua_func_;
-
-			std_shim(unsafe_function lua_func) : lua_func_(std::move(lua_func)) {
-			}
-
-			template <typename... Args>
-			void operator()(Args&&... args) {
-				lua_func_.call<void>(std::forward<Args>(args)...);
-			}
-		};
-	} // namespace detail
-
-	namespace stack {
-		template <typename Signature>
-		struct unqualified_getter<std::function<Signature>> {
-			typedef meta::bind_traits<Signature> fx_t;
-			typedef typename fx_t::args_list args_lists;
-			typedef meta::tuple_types<typename fx_t::return_type> return_types;
-
-			template <typename... R>
-			static std::function<Signature> get_std_func(types<R...>, lua_State* L, int index) {
-				detail::std_shim<R...> fx(unsafe_function(L, index));
-				return fx;
-			}
-
-			static std::function<Signature> get(lua_State* L, int index, record& tracking) {
-				tracking.use(1);
-				type t = type_of(L, index);
-				if (t == type::none || t == type::lua_nil) {
-					return nullptr;
-				}
-				return get_std_func(return_types(), L, index);
-			}
-		};
-
-		template <typename Allocator>
-		struct unqualified_getter<basic_bytecode<Allocator>> {
-			static basic_bytecode<Allocator> get(lua_State* L, int index, record& tracking) {
-				tracking.use(1);
-				stack_function sf(L, index);
-				return sf.dump(&dump_panic_on_error);
-			}
-		};
-	} // namespace stack
-
-} // namespace sol
-
-// end of sol/function.hpp
-
-// beginning of sol/usertype.hpp
-
-// beginning of sol/usertype_core.hpp
-
-// beginning of sol/deprecate.hpp
-
-#ifndef SOL_DEPRECATED
-#ifdef _MSC_VER
-#define SOL_DEPRECATED __declspec(deprecated)
-#elif __GNUC__
-#define SOL_DEPRECATED __attribute__((deprecated))
-#else
-#define SOL_DEPRECATED [[deprecated]]
-#endif // compilers
-#endif // SOL_DEPRECATED
-
-namespace sol {
-namespace detail {
-	template <typename T>
-	struct SOL_DEPRECATED deprecate_type {
-		using type = T;
-	};
-}
-} // namespace sol::detail
-
-// end of sol/deprecate.hpp
-
-// beginning of sol/usertype_container_launch.hpp
-
-// beginning of sol/usertype_container.hpp
-
-namespace sol {
-
-	template <typename T>
-	struct usertype_container;
-
-	namespace container_detail {
-
-		template <typename T>
-		struct has_clear_test {
-		private:
-			template <typename C>
-			static meta::sfinae_yes_t test(decltype(&C::clear));
-			template <typename C>
-			static meta::sfinae_no_t test(...);
-
-		public:
-			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
-		};
-
-		template <typename T>
-		struct has_empty_test {
-		private:
-			template <typename C>
-			static meta::sfinae_yes_t test(decltype(&C::empty));
-			template <typename C>
-			static meta::sfinae_no_t test(...);
-
-		public:
-			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
-		};
-
-		template <typename T>
-		struct has_erase_after_test {
-		private:
-			template <typename C>
-			static meta::sfinae_yes_t test(
-			     decltype(std::declval<C>().erase_after(std::declval<std::add_rvalue_reference_t<typename C::const_iterator>>()))*);
-			template <typename C>
-			static meta::sfinae_no_t test(...);
-
-		public:
-			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
-		};
-
-		template <typename T, typename = void>
-		struct has_find_test {
-		private:
-			template <typename C>
-			static meta::sfinae_yes_t test(decltype(std::declval<C>().find(std::declval<std::add_rvalue_reference_t<typename C::value_type>>()))*);
-			template <typename C>
-			static meta::sfinae_no_t test(...);
-
-		public:
-			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
-		};
-
-		template <typename T>
-		struct has_find_test<T, std::enable_if_t<meta::is_lookup<T>::value>> {
-		private:
-			template <typename C>
-			static meta::sfinae_yes_t test(decltype(std::declval<C>().find(std::declval<std::add_rvalue_reference_t<typename C::key_type>>()))*);
-			template <typename C>
-			static meta::sfinae_no_t test(...);
-
-		public:
-			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
-		};
-
-		template <typename T>
-		struct has_erase_test {
-		private:
-			template <typename C>
-			static meta::sfinae_yes_t test(decltype(std::declval<C>().erase(std::declval<typename C::iterator>()))*);
-			template <typename C>
-			static meta::sfinae_no_t test(...);
-
-		public:
-			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
-		};
-
-		template <typename T>
-		struct has_erase_key_test {
-		private:
-			template <typename C>
-			static meta::sfinae_yes_t test(decltype(std::declval<C>().erase(std::declval<typename C::key_type>()))*);
-			template <typename C>
-			static meta::sfinae_no_t test(...);
-
-		public:
-			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
-		};
-
-		template <typename T>
-		struct has_traits_find_test {
-		private:
-			template <typename C>
-			static meta::sfinae_yes_t test(decltype(&C::find));
-			template <typename C>
-			static meta::sfinae_no_t test(...);
-
-		public:
-			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
-		};
-
-		template <typename T>
-		struct has_traits_index_of_test {
-		private:
-			template <typename C>
-			static meta::sfinae_yes_t test(decltype(&C::index_of));
-			template <typename C>
-			static meta::sfinae_no_t test(...);
-
-		public:
-			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
-		};
-
-		template <typename T>
-		struct has_traits_insert_test {
-		private:
-			template <typename C>
-			static meta::sfinae_yes_t test(decltype(&C::insert));
-			template <typename C>
-			static meta::sfinae_no_t test(...);
-
-		public:
-			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
-		};
-
-		template <typename T>
-		struct has_traits_erase_test {
-		private:
-			template <typename C>
-			static meta::sfinae_yes_t test(decltype(&C::erase));
-			template <typename C>
-			static meta::sfinae_no_t test(...);
-
-		public:
-			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
-		};
-
-		template <typename T>
-		struct has_traits_index_set_test {
-		private:
-			template <typename C>
-			static meta::sfinae_yes_t test(decltype(&C::index_set));
-			template <typename C>
-			static meta::sfinae_no_t test(...);
-
-		public:
-			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
-		};
-
-		template <typename T>
-		struct has_traits_index_get_test {
-		private:
-			template <typename C>
-			static meta::sfinae_yes_t test(decltype(&C::index_get));
-			template <typename C>
-			static meta::sfinae_no_t test(...);
-
-		public:
-			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
-		};
-
-		template <typename T>
-		struct has_traits_set_test {
-		private:
-			template <typename C>
-			static meta::sfinae_yes_t test(decltype(&C::set));
-			template <typename C>
-			static meta::sfinae_no_t test(...);
-
-		public:
-			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
-		};
-
-		template <typename T>
-		struct has_traits_get_test {
-		private:
-			template <typename C>
-			static meta::sfinae_yes_t test(decltype(&C::get));
-			template <typename C>
-			static meta::sfinae_no_t test(...);
-
-		public:
-			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
-		};
-
-		template <typename T>
-		struct has_traits_at_test {
-		private:
-			template <typename C>
-			static meta::sfinae_yes_t test(decltype(&C::at));
-			template <typename C>
-			static meta::sfinae_no_t test(...);
-
-		public:
-			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
-		};
-
-		template <typename T>
-		struct has_traits_pairs_test {
-		private:
-			template <typename C>
-			static meta::sfinae_yes_t test(decltype(&C::pairs));
-			template <typename C>
-			static meta::sfinae_no_t test(...);
-
-		public:
-			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
-		};
-
-		template <typename T>
-		struct has_traits_ipairs_test {
-		private:
-			template <typename C>
-			static meta::sfinae_yes_t test(decltype(&C::ipairs));
-			template <typename C>
-			static meta::sfinae_no_t test(...);
-
-		public:
-			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
-		};
-
-		template <typename T>
-		struct has_traits_next_test {
-		private:
-			template <typename C>
-			static meta::sfinae_yes_t test(decltype(&C::next));
-			template <typename C>
-			static meta::sfinae_no_t test(...);
-
-		public:
-			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
-		};
-
-		template <typename T>
-		struct has_traits_add_test {
-		private:
-			template <typename C>
-			static meta::sfinae_yes_t test(decltype(&C::add));
-			template <typename C>
-			static meta::sfinae_no_t test(...);
-
-		public:
-			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
-		};
-
-		template <typename T>
-		struct has_traits_size_test {
-		private:
-			template <typename C>
-			static meta::sfinae_yes_t test(decltype(&C::size));
-			template <typename C>
-			static meta::sfinae_no_t test(...);
-
-		public:
-			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
-		};
-
-		template <typename T>
-		using has_clear = meta::boolean<has_clear_test<T>::value>;
-
-		template <typename T>
-		using has_empty = meta::boolean<has_empty_test<T>::value>;
-
-		template <typename T>
-		using has_find = meta::boolean<has_find_test<T>::value>;
-
-		template <typename T>
-		using has_erase = meta::boolean<has_erase_test<T>::value>;
-
-		template <typename T>
-		using has_erase_key = meta::boolean<has_erase_key_test<T>::value>;
-
-		template <typename T>
-		using has_erase_after = meta::boolean<has_erase_after_test<T>::value>;
-
-		template <typename T>
-		using has_traits_get = meta::boolean<has_traits_get_test<T>::value>;
-
-		template <typename T>
-		using has_traits_at = meta::boolean<has_traits_at_test<T>::value>;
-
-		template <typename T>
-		using has_traits_set = meta::boolean<has_traits_set_test<T>::value>;
-
-		template <typename T>
-		using has_traits_index_get = meta::boolean<has_traits_index_get_test<T>::value>;
-
-		template <typename T>
-		using has_traits_index_set = meta::boolean<has_traits_index_set_test<T>::value>;
-
-		template <typename T>
-		using has_traits_pairs = meta::boolean<has_traits_pairs_test<T>::value>;
-
-		template <typename T>
-		using has_traits_ipairs = meta::boolean<has_traits_ipairs_test<T>::value>;
-
-		template <typename T>
-		using has_traits_next = meta::boolean<has_traits_next_test<T>::value>;
-
-		template <typename T>
-		using has_traits_add = meta::boolean<has_traits_add_test<T>::value>;
-
-		template <typename T>
-		using has_traits_size = meta::boolean<has_traits_size_test<T>::value>;
-
-		template <typename T>
-		using has_traits_clear = has_clear<T>;
-
-		template <typename T>
-		using has_traits_empty = has_empty<T>;
-
-		template <typename T>
-		using has_traits_find = meta::boolean<has_traits_find_test<T>::value>;
-
-		template <typename T>
-		using has_traits_index_of = meta::boolean<has_traits_index_of_test<T>::value>;
-
-		template <typename T>
-		using has_traits_insert = meta::boolean<has_traits_insert_test<T>::value>;
-
-		template <typename T>
-		using has_traits_erase = meta::boolean<has_traits_erase_test<T>::value>;
-
-		template <typename T>
-		struct is_forced_container : is_container<T> {};
-
-		template <typename T>
-		struct is_forced_container<as_container_t<T>> : std::true_type {};
-
-		template <typename T>
-		struct container_decay {
-			typedef T type;
-		};
-
-		template <typename T>
-		struct container_decay<as_container_t<T>> {
-			typedef T type;
-		};
-
-		template <typename T>
-		using container_decay_t = typename container_decay<meta::unqualified_t<T>>::type;
-
-		template <typename T>
-		decltype(auto) get_key(std::false_type, T&& t) {
-			return std::forward<T>(t);
-		}
-
-		template <typename T>
-		decltype(auto) get_key(std::true_type, T&& t) {
-			return t.first;
-		}
-
-		template <typename T>
-		decltype(auto) get_value(std::false_type, T&& t) {
-			return std::forward<T>(t);
-		}
-
-		template <typename T>
-		decltype(auto) get_value(std::true_type, T&& t) {
-			return t.second;
-		}
-
-		template <typename X, typename = void>
-		struct usertype_container_default {
-		private:
-			typedef std::remove_pointer_t<meta::unwrap_unqualified_t<X>> T;
-
-		public:
-			typedef lua_nil_t iterator;
-			typedef lua_nil_t value_type;
-
-			static int at(lua_State* L) {
-				return luaL_error(L, "sol: cannot call 'at(index)' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
-			}
-
-			static int get(lua_State* L) {
-				return luaL_error(L, "sol: cannot call 'get(key)' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
-			}
-
-			static int index_get(lua_State* L) {
-				return luaL_error(L, "sol: cannot call 'container[key]' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
-			}
-
-			static int set(lua_State* L) {
-				return luaL_error(L, "sol: cannot call 'set(key, value)' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
-			}
-
-			static int index_set(lua_State* L) {
-				return luaL_error(
-				     L, "sol: cannot call 'container[key] = value' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
-			}
-
-			static int add(lua_State* L) {
-				return luaL_error(L, "sol: cannot call 'add' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
-			}
-
-			static int insert(lua_State* L) {
-				return luaL_error(L, "sol: cannot call 'insert' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
-			}
-
-			static int find(lua_State* L) {
-				return luaL_error(L, "sol: cannot call 'find' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
-			}
-
-			static int index_of(lua_State* L) {
-				return luaL_error(L, "sol: cannot call 'index_of' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
-			}
-
-			static int size(lua_State* L) {
-				return luaL_error(L, "sol: cannot call 'end' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
-			}
-
-			static int clear(lua_State* L) {
-				return luaL_error(L, "sol: cannot call 'clear' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
-			}
-
-			static int empty(lua_State* L) {
-				return luaL_error(L, "sol: cannot call 'empty' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
-			}
-
-			static int erase(lua_State* L) {
-				return luaL_error(L, "sol: cannot call 'erase' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
-			}
-
-			static int next(lua_State* L) {
-				return luaL_error(L, "sol: cannot call 'next' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
-			}
-
-			static int pairs(lua_State* L) {
-				return luaL_error(L, "sol: cannot call '__pairs/pairs' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
-			}
-
-			static int ipairs(lua_State* L) {
-				return luaL_error(L, "sol: cannot call '__ipairs' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
-			}
-
-			static iterator begin(lua_State* L, T&) {
-				luaL_error(L, "sol: cannot call 'being' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
-				return lua_nil;
-			}
-
-			static iterator end(lua_State* L, T&) {
-				luaL_error(L, "sol: cannot call 'end' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
-				return lua_nil;
-			}
-		};
-
-		template <typename X>
-		struct usertype_container_default<X,
-		     std::enable_if_t<meta::all<is_forced_container<meta::unqualified_t<X>>, meta::has_value_type<meta::unqualified_t<container_decay_t<X>>>,
-		          meta::has_iterator<meta::unqualified_t<container_decay_t<X>>>>::value>> {
-		private:
-			using T = std::remove_pointer_t<meta::unwrap_unqualified_t<container_decay_t<X>>>;
-
-		private:
-			using deferred_uc = usertype_container<X>;
-			using is_associative = meta::is_associative<T>;
-			using is_lookup = meta::is_lookup<T>;
-			using is_ordered = meta::is_ordered<T>;
-			using is_matched_lookup = meta::is_matched_lookup<T>;
-			using iterator = typename T::iterator;
-			using value_type = typename T::value_type;
-			typedef meta::conditional_t<is_matched_lookup::value, std::pair<value_type, value_type>,
-			     meta::conditional_t<is_associative::value || is_lookup::value, value_type, std::pair<std::ptrdiff_t, value_type>>>
-			     KV;
-			typedef typename KV::first_type K;
-			typedef typename KV::second_type V;
-			typedef meta::conditional_t<is_matched_lookup::value, std::ptrdiff_t, K> next_K;
-			typedef decltype(*std::declval<iterator&>()) iterator_return;
-			typedef meta::conditional_t<is_associative::value || is_matched_lookup::value, std::add_lvalue_reference_t<V>,
-			     meta::conditional_t<is_lookup::value, V, iterator_return>>
-			     captured_type;
-			typedef typename meta::iterator_tag<iterator>::type iterator_category;
-			typedef std::is_same<iterator_category, std::input_iterator_tag> is_input_iterator;
-			typedef meta::conditional_t<is_input_iterator::value, V, decltype(detail::deref_move_only(std::declval<captured_type>()))> push_type;
-			typedef std::is_copy_assignable<V> is_copyable;
-			typedef meta::neg<meta::any<std::is_const<V>, std::is_const<std::remove_reference_t<iterator_return>>, meta::neg<is_copyable>>> is_writable;
-			typedef meta::unqualified_t<decltype(get_key(is_associative(), std::declval<std::add_lvalue_reference_t<value_type>>()))> key_type;
-			typedef meta::all<std::is_integral<K>, meta::neg<meta::any<is_associative, is_lookup>>> is_linear_integral;
-
-			struct iter {
-				T& source;
-				iterator it;
-				std::size_t i;
-
-				iter(T& source, iterator it) : source(source), it(std::move(it)), i(0) {
-				}
-
-				~iter() {
-				}
-			};
-
-			static auto& get_src(lua_State* L) {
-#if SOL_IS_ON(SOL_SAFE_USERTYPE_I_)
-				auto p = stack::unqualified_check_get<T*>(L, 1);
-				if (!p) {
-					luaL_error(L,
-					     "sol: 'self' is not of type '%s' (pass 'self' as first argument with ':' or call on proper type)",
-					     detail::demangle<T>().c_str());
-				}
-				if (p.value() == nullptr) {
-					luaL_error(
-					     L, "sol: 'self' argument is nil (pass 'self' as first argument with ':' or call on a '%s' type)", detail::demangle<T>().c_str());
-				}
-				return *p.value();
-#else
-				return stack::unqualified_get<T>(L, 1);
-#endif // Safe getting with error
-			}
-
-			static detail::error_result at_category(std::input_iterator_tag, lua_State* L, T& self, std::ptrdiff_t pos) {
-				pos += deferred_uc::index_adjustment(L, self);
-				if (pos < 0) {
-					return stack::push(L, lua_nil);
-				}
-				auto it = deferred_uc::begin(L, self);
-				auto e = deferred_uc::end(L, self);
-				if (it == e) {
-					return stack::push(L, lua_nil);
-				}
-				while (pos > 0) {
-					--pos;
-					++it;
-					if (it == e) {
-						return stack::push(L, lua_nil);
-					}
-				}
-				return get_associative(is_associative(), L, it);
-			}
-
-			static detail::error_result at_category(std::random_access_iterator_tag, lua_State* L, T& self, std::ptrdiff_t pos) {
-				std::ptrdiff_t len = static_cast<std::ptrdiff_t>(size_start(L, self));
-				pos += deferred_uc::index_adjustment(L, self);
-				if (pos < 0 || pos >= len) {
-					return stack::push(L, lua_nil);
-				}
-				auto it = std::next(deferred_uc::begin(L, self), pos);
-				return get_associative(is_associative(), L, it);
-			}
-
-			static detail::error_result at_start(lua_State* L, T& self, std::ptrdiff_t pos) {
-				return at_category(iterator_category(), L, self, pos);
-			}
-
-			template <typename Iter>
-			static detail::error_result get_associative(std::true_type, lua_State* L, Iter& it) {
-				decltype(auto) v = *it;
-				return stack::stack_detail::push_reference<push_type>(L, detail::deref_move_only(v.second));
-			}
-
-			template <typename Iter>
-			static detail::error_result get_associative(std::false_type, lua_State* L, Iter& it) {
-				return stack::stack_detail::push_reference<push_type>(L, detail::deref_move_only(*it));
-			}
-
-			static detail::error_result get_category(std::input_iterator_tag, lua_State* L, T& self, K& key) {
-				key += deferred_uc::index_adjustment(L, self);
-				if (key < 0) {
-					return stack::push(L, lua_nil);
-				}
-				auto it = deferred_uc::begin(L, self);
-				auto e = deferred_uc::end(L, self);
-				if (it == e) {
-					return stack::push(L, lua_nil);
-				}
-				while (key > 0) {
-					--key;
-					++it;
-					if (it == e) {
-						return stack::push(L, lua_nil);
-					}
-				}
-				return get_associative(is_associative(), L, it);
-			}
-
-			static detail::error_result get_category(std::random_access_iterator_tag, lua_State* L, T& self, K& key) {
-				std::ptrdiff_t len = static_cast<std::ptrdiff_t>(size_start(L, self));
-				key += deferred_uc::index_adjustment(L, self);
-				if (key < 0 || key >= len) {
-					return stack::push(L, lua_nil);
-				}
-				auto it = std::next(deferred_uc::begin(L, self), key);
-				return get_associative(is_associative(), L, it);
-			}
-
-			static detail::error_result get_it(std::true_type, lua_State* L, T& self, K& key) {
-				return get_category(iterator_category(), L, self, key);
-			}
-
-			static detail::error_result get_comparative(std::true_type, lua_State* L, T& self, K& key) {
-				auto fx = [&](const value_type& r) -> bool { return key == get_key(is_associative(), r); };
-				auto e = deferred_uc::end(L, self);
-				auto it = std::find_if(deferred_uc::begin(L, self), e, std::ref(fx));
-				if (it == e) {
-					return stack::push(L, lua_nil);
-				}
-				return get_associative(is_associative(), L, it);
-			}
-
-			static detail::error_result get_comparative(std::false_type, lua_State*, T&, K&) {
-				return detail::error_result("cannot get this key on '%s': no suitable way to increment iterator and compare to key value '%s'",
-				     detail::demangle<T>().data(),
-				     detail::demangle<K>().data());
-			}
-
-			static detail::error_result get_it(std::false_type, lua_State* L, T& self, K& key) {
-				return get_comparative(meta::supports_op_equal<K, key_type>(), L, self, key);
-			}
-
-			static detail::error_result set_associative(std::true_type, iterator& it, stack_object value) {
-				decltype(auto) v = *it;
-				v.second = value.as<V>();
-				return {};
-			}
-
-			static detail::error_result set_associative(std::false_type, iterator& it, stack_object value) {
-				decltype(auto) v = *it;
-				v = value.as<V>();
-				return {};
-			}
-
-			static detail::error_result set_writable(std::true_type, lua_State*, T&, iterator& it, stack_object value) {
-				return set_associative(is_associative(), it, std::move(value));
-			}
-
-			static detail::error_result set_writable(std::false_type, lua_State*, T&, iterator&, stack_object) {
-				return detail::error_result(
-				     "cannot perform a 'set': '%s's iterator reference is not writable (non-copy-assignable or const)", detail::demangle<T>().data());
-			}
-
-			static detail::error_result set_category(std::input_iterator_tag, lua_State* L, T& self, stack_object okey, stack_object value) {
-				decltype(auto) key = okey.as<K>();
-				key += deferred_uc::index_adjustment(L, self);
-				auto e = deferred_uc::end(L, self);
-				auto it = deferred_uc::begin(L, self);
-				auto backit = it;
-				for (; key > 0 && it != e; --key, ++it) {
-					backit = it;
-				}
-				if (it == e) {
-					if (key == 0) {
-						return add_copyable(is_copyable(), L, self, std::move(value), meta::has_insert_after<T>::value ? backit : it);
-					}
-					return detail::error_result("out of bounds (too big) for set on '%s'", detail::demangle<T>().c_str());
-				}
-				return set_writable(is_writable(), L, self, it, std::move(value));
-			}
-
-			static detail::error_result set_category(std::random_access_iterator_tag, lua_State* L, T& self, stack_object okey, stack_object value) {
-				decltype(auto) key = okey.as<K>();
-				key += deferred_uc::index_adjustment(L, self);
-				if (key < 0) {
-					return detail::error_result("sol: out of bounds (too small) for set on '%s'", detail::demangle<T>().c_str());
-				}
-				std::ptrdiff_t len = static_cast<std::ptrdiff_t>(size_start(L, self));
-				if (key == len) {
-					return add_copyable(is_copyable(), L, self, std::move(value));
-				}
-				else if (key >= len) {
-					return detail::error_result("sol: out of bounds (too big) for set on '%s'", detail::demangle<T>().c_str());
-				}
-				auto it = std::next(deferred_uc::begin(L, self), key);
-				return set_writable(is_writable(), L, self, it, std::move(value));
-			}
-
-			static detail::error_result set_comparative(std::true_type, lua_State* L, T& self, stack_object okey, stack_object value) {
-				decltype(auto) key = okey.as<K>();
-				if (!is_writable::value) {
-					return detail::error_result(
-					     "cannot perform a 'set': '%s's iterator reference is not writable (non-copy-assignable or const)", detail::demangle<T>().data());
-				}
-				auto fx = [&](const value_type& r) -> bool { return key == get_key(is_associative(), r); };
-				auto e = deferred_uc::end(L, self);
-				auto it = std::find_if(deferred_uc::begin(L, self), e, std::ref(fx));
-				if (it == e) {
-					return {};
-				}
-				return set_writable(is_writable(), L, self, it, std::move(value));
-			}
-
-			static detail::error_result set_comparative(std::false_type, lua_State*, T&, stack_object, stack_object) {
-				return detail::error_result("cannot set this value on '%s': no suitable way to increment iterator or compare to '%s' key",
-				     detail::demangle<T>().data(),
-				     detail::demangle<K>().data());
-			}
-
-			template <typename Iter>
-			static detail::error_result set_associative_insert(std::true_type, lua_State*, T& self, Iter& it, K& key, stack_object value) {
-				if constexpr (meta::has_insert<T>::value) {
-					self.insert(it, value_type(key, value.as<V>()));
-					return {};
-				}
-				else {
-					(void)self;
-					(void)it;
-					(void)key;
-					return detail::error_result(
-					     "cannot call 'set' on '%s': there is no 'insert' function on this associative type", detail::demangle<T>().c_str());
-				}
-			}
-
-			template <typename Iter>
-			static detail::error_result set_associative_insert(std::false_type, lua_State*, T& self, Iter& it, K& key, stack_object) {
-				if constexpr (meta::has_insert<T>::value) {
-					self.insert(it, key);
-					return {};
-				}
-				else {
-					(void)self;
-					(void)it;
-					(void)key;
-					return detail::error_result(
-					     "cannot call 'set' on '%s': there is no 'insert' function on this non-associative type", detail::demangle<T>().c_str());
-				}
-			}
-
-			static detail::error_result set_associative_find(std::true_type, lua_State* L, T& self, stack_object okey, stack_object value) {
-				decltype(auto) key = okey.as<K>();
-				auto it = self.find(key);
-				if (it == deferred_uc::end(L, self)) {
-					return set_associative_insert(is_associative(), L, self, it, key, std::move(value));
-				}
-				return set_writable(is_writable(), L, self, it, std::move(value));
-			}
-
-			static detail::error_result set_associative_find(std::false_type, lua_State* L, T& self, stack_object key, stack_object value) {
-				return set_comparative(meta::supports_op_equal<K, key_type>(), L, self, std::move(key), std::move(value));
-			}
-
-			static detail::error_result set_it(std::true_type, lua_State* L, T& self, stack_object key, stack_object value) {
-				return set_category(iterator_category(), L, self, std::move(key), std::move(value));
-			}
-
-			static detail::error_result set_it(std::false_type, lua_State* L, T& self, stack_object key, stack_object value) {
-				return set_associative_find(meta::all<has_find<T>, meta::any<is_associative, is_lookup>>(), L, self, std::move(key), std::move(value));
-			}
-
-			template <bool idx_of = false>
-			static detail::error_result find_has_associative_lookup(std::true_type, lua_State* L, T& self) {
-				if constexpr (!is_ordered::value && idx_of) {
-					(void)L;
-					(void)self;
-					return detail::error_result("cannot perform an 'index_of': '%s's is not an ordered container", detail::demangle<T>().data());
-				}
-				else {
-					decltype(auto) key = stack::unqualified_get<K>(L, 2);
-					auto it = self.find(key);
-					if (it == deferred_uc::end(L, self)) {
-						return stack::push(L, lua_nil);
-					}
-					if constexpr (idx_of) {
-						auto dist = std::distance(deferred_uc::begin(L, self), it);
-						dist -= deferred_uc::index_adjustment(L, self);
-						return stack::push(L, dist);
-					}
-					else {
-						return get_associative(is_associative(), L, it);
-					}
-				}
-			}
-
-			template <bool idx_of = false>
-			static detail::error_result find_has_associative_lookup(std::false_type, lua_State* L, T& self) {
-				if constexpr (!is_ordered::value && idx_of) {
-					(void)L;
-					(void)self;
-					return detail::error_result("cannot perform an 'index_of': '%s's is not an ordered container", detail::demangle<T>().data());
-				}
-				else {
-					decltype(auto) value = stack::unqualified_get<V>(L, 2);
-					auto it = self.find(value);
-					if (it == deferred_uc::end(L, self)) {
-						return stack::push(L, lua_nil);
-					}
-					if constexpr (idx_of) {
-						auto dist = std::distance(deferred_uc::begin(L, self), it);
-						dist -= deferred_uc::index_adjustment(L, self);
-						return stack::push(L, dist);
-					}
-					else {
-						return get_associative(is_associative(), L, it);
-					}
-				}
-			}
-
-			template <bool idx_of = false>
-			static detail::error_result find_has(std::true_type, lua_State* L, T& self) {
-				return find_has_associative_lookup<idx_of>(meta::any<is_lookup, is_associative>(), L, self);
-			}
-
-			template <typename Iter>
-			static detail::error_result find_associative_lookup(std::true_type, lua_State* L, T&, Iter& it, std::size_t) {
-				return get_associative(is_associative(), L, it);
-			}
-
-			template <typename Iter>
-			static detail::error_result find_associative_lookup(std::false_type, lua_State* L, T& self, Iter&, std::size_t idx) {
-				idx -= deferred_uc::index_adjustment(L, self);
-				return stack::push(L, idx);
-			}
-
-			template <bool = false>
-			static detail::error_result find_comparative(std::false_type, lua_State*, T&) {
-				return detail::error_result("cannot call 'find' on '%s': there is no 'find' function and the value_type is not equality comparable",
-				     detail::demangle<T>().c_str());
-			}
-
-			template <bool idx_of = false>
-			static detail::error_result find_comparative(std::true_type, lua_State* L, T& self) {
-				decltype(auto) value = stack::unqualified_get<V>(L, 2);
-				auto it = deferred_uc::begin(L, self);
-				auto e = deferred_uc::end(L, self);
-				std::size_t idx = 0;
-				for (;; ++it, ++idx) {
-					if (it == e) {
-						return stack::push(L, lua_nil);
-					}
-					if (value == get_value(is_associative(), *it)) {
-						break;
-					}
-				}
-				return find_associative_lookup(meta::all<meta::boolean<!idx_of>, meta::any<is_lookup, is_associative>>(), L, self, it, idx);
-			}
-
-			template <bool idx_of = false>
-			static detail::error_result find_has(std::false_type, lua_State* L, T& self) {
-				return find_comparative<idx_of>(meta::supports_op_equal<V>(), L, self);
-			}
-
-			template <typename Iter>
-			static detail::error_result add_insert_after(std::false_type, lua_State* L, T& self, stack_object value, Iter&) {
-				return add_insert_after(std::false_type(), L, self, value);
-			}
-
-			static detail::error_result add_insert_after(std::false_type, lua_State*, T&, stack_object) {
-				return detail::error_result("cannot call 'add' on type '%s': no suitable insert/push_back C++ functions", detail::demangle<T>().data());
-			}
-
-			template <typename Iter>
-			static detail::error_result add_insert_after(std::true_type, lua_State*, T& self, stack_object value, Iter& pos) {
-				self.insert_after(pos, value.as<V>());
-				return {};
-			}
-
-			static detail::error_result add_insert_after(std::true_type, lua_State* L, T& self, stack_object value) {
-				auto backit = self.before_begin();
-				{
-					auto e = deferred_uc::end(L, self);
-					for (auto it = deferred_uc::begin(L, self); it != e; ++backit, ++it) {
-					}
-				}
-				return add_insert_after(std::true_type(), L, self, value, backit);
-			}
-
-			template <typename Iter>
-			static detail::error_result add_insert(std::true_type, lua_State*, T& self, stack_object value, Iter& pos) {
-				self.insert(pos, value.as<V>());
-				return {};
-			}
-
-			static detail::error_result add_insert(std::true_type, lua_State* L, T& self, stack_object value) {
-				auto pos = deferred_uc::end(L, self);
-				return add_insert(std::true_type(), L, self, value, pos);
-			}
-
-			template <typename Iter>
-			static detail::error_result add_insert(std::false_type, lua_State* L, T& self, stack_object value, Iter& pos) {
-				return add_insert_after(meta::has_insert_after<T>(), L, self, std::move(value), pos);
-			}
-
-			static detail::error_result add_insert(std::false_type, lua_State* L, T& self, stack_object value) {
-				return add_insert_after(meta::has_insert_after<T>(), L, self, std::move(value));
-			}
-
-			template <typename Iter>
-			static detail::error_result add_push_back(std::true_type, lua_State*, T& self, stack_object value, Iter&) {
-				self.push_back(value.as<V>());
-				return {};
-			}
-
-			static detail::error_result add_push_back(std::true_type, lua_State*, T& self, stack_object value) {
-				self.push_back(value.as<V>());
-				return {};
-			}
-
-			template <typename Iter>
-			static detail::error_result add_push_back(std::false_type, lua_State* L, T& self, stack_object value, Iter& pos) {
-				return add_insert(meta::has_insert<T>(), L, self, value, pos);
-			}
-
-			static detail::error_result add_push_back(std::false_type, lua_State* L, T& self, stack_object value) {
-				return add_insert(meta::has_insert<T>(), L, self, value);
-			}
-
-			template <typename Iter>
-			static detail::error_result add_associative(std::true_type, lua_State* L, T& self, stack_object key, Iter& pos) {
-				if constexpr (meta::has_insert<T>::value) {
-					self.insert(pos, value_type(key.as<K>(), stack::unqualified_get<V>(L, 3)));
-					return {};
-				}
-				else {
-					(void)L;
-					(void)self;
-					(void)key;
-					(void)pos;
-					return detail::error_result(
-					     "cannot call 'insert' on '%s': there is no 'insert' function on this associative type", detail::demangle<T>().c_str());
-				}
-			}
-
-			static detail::error_result add_associative(std::true_type, lua_State* L, T& self, stack_object key) {
-				auto pos = deferred_uc::end(L, self);
-				return add_associative(std::true_type(), L, self, std::move(key), pos);
-			}
-
-			template <typename Iter>
-			static detail::error_result add_associative(std::false_type, lua_State* L, T& self, stack_object value, Iter& pos) {
-				return add_push_back(meta::has_push_back<T>(), L, self, value, pos);
-			}
-
-			static detail::error_result add_associative(std::false_type, lua_State* L, T& self, stack_object value) {
-				return add_push_back(meta::has_push_back<T>(), L, self, value);
-			}
-
-			template <typename Iter>
-			static detail::error_result add_copyable(std::true_type, lua_State* L, T& self, stack_object value, Iter& pos) {
-				return add_associative(is_associative(), L, self, std::move(value), pos);
-			}
-
-			static detail::error_result add_copyable(std::true_type, lua_State* L, T& self, stack_object value) {
-				return add_associative(is_associative(), L, self, value);
-			}
-
-			template <typename Iter>
-			static detail::error_result add_copyable(std::false_type, lua_State* L, T& self, stack_object value, Iter&) {
-				return add_copyable(std::false_type(), L, self, std::move(value));
-			}
-
-			static detail::error_result add_copyable(std::false_type, lua_State*, T&, stack_object) {
-				return detail::error_result("cannot call 'add' on '%s': value_type is non-copyable", detail::demangle<T>().data());
-			}
-
-			static detail::error_result insert_lookup(std::true_type, lua_State* L, T& self, stack_object, stack_object value) {
-				// TODO: should we warn or error about someone calling insert on an ordered / lookup container with no associativity?
-				return add_copyable(std::true_type(), L, self, std::move(value));
-			}
-
-			static detail::error_result insert_lookup(std::false_type, lua_State* L, T& self, stack_object where, stack_object value) {
-				auto it = deferred_uc::begin(L, self);
-				auto key = where.as<K>();
-				key += deferred_uc::index_adjustment(L, self);
-				std::advance(it, key);
-				self.insert(it, value.as<V>());
-				return {};
-			}
-
-			static detail::error_result insert_after_has(std::true_type, lua_State* L, T& self, stack_object where, stack_object value) {
-				auto key = where.as<K>();
-				auto backit = self.before_begin();
-				{
-					key += deferred_uc::index_adjustment(L, self);
-					auto e = deferred_uc::end(L, self);
-					for (auto it = deferred_uc::begin(L, self); key > 0; ++backit, ++it, --key) {
-						if (backit == e) {
-							return detail::error_result("sol: out of bounds (too big) for set on '%s'", detail::demangle<T>().c_str());
-						}
-					}
-				}
-				self.insert_after(backit, value.as<V>());
-				return {};
-			}
-
-			static detail::error_result insert_after_has(std::false_type, lua_State*, T&, stack_object, stack_object) {
-				return detail::error_result(
-				     "cannot call 'insert' on '%s': no suitable or similar functionality detected on this container", detail::demangle<T>().data());
-			}
-
-			static detail::error_result insert_has(std::true_type, lua_State* L, T& self, stack_object key, stack_object value) {
-				return insert_lookup(meta::any<is_associative, is_lookup>(), L, self, std::move(key), std::move(value));
-			}
-
-			static detail::error_result insert_has(std::false_type, lua_State* L, T& self, stack_object where, stack_object value) {
-				return insert_after_has(meta::has_insert_after<T>(), L, self, where, value);
-			}
-
-			static detail::error_result insert_copyable(std::true_type, lua_State* L, T& self, stack_object key, stack_object value) {
-				return insert_has(meta::has_insert<T>(), L, self, std::move(key), std::move(value));
-			}
-
-			static detail::error_result insert_copyable(std::false_type, lua_State*, T&, stack_object, stack_object) {
-				return detail::error_result("cannot call 'insert' on '%s': value_type is non-copyable", detail::demangle<T>().data());
-			}
-
-			static detail::error_result erase_integral(std::true_type, lua_State* L, T& self, K& key) {
-				auto it = deferred_uc::begin(L, self);
-				key += deferred_uc::index_adjustment(L, self);
-				std::advance(it, key);
-				self.erase(it);
-
-				return {};
-			}
-
-			static detail::error_result erase_integral(std::false_type, lua_State* L, T& self, const K& key) {
-				auto fx = [&](const value_type& r) -> bool { return key == r; };
-				auto e = deferred_uc::end(L, self);
-				auto it = std::find_if(deferred_uc::begin(L, self), e, std::ref(fx));
-				if (it == e) {
-					return {};
-				}
-				self.erase(it);
-
-				return {};
-			}
-
-			static detail::error_result erase_associative_lookup(std::true_type, lua_State*, T& self, const K& key) {
-				self.erase(key);
-				return {};
-			}
-
-			static detail::error_result erase_associative_lookup(std::false_type, lua_State* L, T& self, K& key) {
-				return erase_integral(std::is_integral<K>(), L, self, key);
-			}
-
-			static detail::error_result erase_after_has(std::true_type, lua_State* L, T& self, K& key) {
-				auto backit = self.before_begin();
-				{
-					key += deferred_uc::index_adjustment(L, self);
-					auto e = deferred_uc::end(L, self);
-					for (auto it = deferred_uc::begin(L, self); key > 0; ++backit, ++it, --key) {
-						if (backit == e) {
-							return detail::error_result("sol: out of bounds for erase on '%s'", detail::demangle<T>().c_str());
-						}
-					}
-				}
-				self.erase_after(backit);
-				return {};
-			}
-
-			static detail::error_result erase_after_has(std::false_type, lua_State*, T&, const K&) {
-				return detail::error_result("sol: cannot call erase on '%s'", detail::demangle<T>().c_str());
-			}
-
-			static detail::error_result erase_key_has(std::true_type, lua_State* L, T& self, K& key) {
-				return erase_associative_lookup(meta::any<is_associative, is_lookup>(), L, self, key);
-			}
-
-			static detail::error_result erase_key_has(std::false_type, lua_State* L, T& self, K& key) {
-				return erase_after_has(has_erase_after<T>(), L, self, key);
-			}
-
-			static detail::error_result erase_has(std::true_type, lua_State* L, T& self, K& key) {
-				return erase_associative_lookup(meta::any<is_associative, is_lookup>(), L, self, key);
-			}
-
-			static detail::error_result erase_has(std::false_type, lua_State* L, T& self, K& key) {
-				return erase_key_has(has_erase_key<T>(), L, self, key);
-			}
-
-			static auto size_has(std::false_type, lua_State* L, T& self) {
-				return std::distance(deferred_uc::begin(L, self), deferred_uc::end(L, self));
-			}
-
-			static auto size_has(std::true_type, lua_State*, T& self) {
-				return self.size();
-			}
-
-			static void clear_has(std::true_type, lua_State*, T& self) {
-				self.clear();
-			}
-
-			static void clear_has(std::false_type, lua_State* L, T&) {
-				luaL_error(L, "sol: cannot call clear on '%s'", detail::demangle<T>().c_str());
-			}
-
-			static bool empty_has(std::true_type, lua_State*, T& self) {
-				return self.empty();
-			}
-
-			static bool empty_has(std::false_type, lua_State* L, T& self) {
-				return deferred_uc::begin(L, self) == deferred_uc::end(L, self);
-			}
-
-			static detail::error_result get_associative_find(std::true_type, lua_State* L, T& self, K& key) {
-				auto it = self.find(key);
-				if (it == deferred_uc::end(L, self)) {
-					stack::push(L, lua_nil);
-					return {};
-				}
-				return get_associative(std::true_type(), L, it);
-			}
-
-			static detail::error_result get_associative_find(std::false_type, lua_State* L, T& self, K& key) {
-				return get_it(is_linear_integral(), L, self, key);
-			}
-
-			static detail::error_result get_start(lua_State* L, T& self, K& key) {
-				return get_associative_find(std::integral_constant < bool, is_associative::value&& has_find<T>::value > (), L, self, key);
-			}
-
-			static detail::error_result set_start(lua_State* L, T& self, stack_object key, stack_object value) {
-				return set_it(is_linear_integral(), L, self, std::move(key), std::move(value));
-			}
-
-			static std::size_t size_start(lua_State* L, T& self) {
-				return size_has(meta::has_size<T>(), L, self);
-			}
-
-			static void clear_start(lua_State* L, T& self) {
-				clear_has(has_clear<T>(), L, self);
-			}
-
-			static bool empty_start(lua_State* L, T& self) {
-				return empty_has(has_empty<T>(), L, self);
-			}
-
-			static detail::error_result erase_start(lua_State* L, T& self, K& key) {
-				return erase_has(has_erase<T>(), L, self, key);
-			}
-
-			template <bool ip>
-			static int next_associative(std::true_type, lua_State* L) {
-				iter& i = stack::unqualified_get<user<iter>>(L, 1);
-				auto& source = i.source;
-				auto& it = i.it;
-				if (it == deferred_uc::end(L, source)) {
-					return stack::push(L, lua_nil);
-				}
-				int p;
-				if constexpr (ip) {
-					++i.i;
-					p = stack::push_reference(L, i.i);
-				}
-				else {
-					p = stack::push_reference(L, it->first);
-				}
-				p += stack::stack_detail::push_reference<push_type>(L, detail::deref_move_only(it->second));
-				std::advance(it, 1);
-				return p;
-			}
-
-			template <bool>
-			static int next_associative(std::false_type, lua_State* L) {
-				iter& i = stack::unqualified_get<user<iter>>(L, 1);
-				auto& source = i.source;
-				auto& it = i.it;
-				next_K k = stack::unqualified_get<next_K>(L, 2);
-				if (it == deferred_uc::end(L, source)) {
-					return stack::push(L, lua_nil);
-				}
-				int p;
-				if constexpr (std::is_integral_v<next_K>) {
-					p = stack::push_reference(L, k + 1);
-				}
-				else {
-					p = stack::stack_detail::push_reference(L, k + 1);
-				}
-				p += stack::stack_detail::push_reference<push_type>(L, detail::deref_move_only(*it));
-				std::advance(it, 1);
-				return p;
-			}
-
-			template <bool ip>
-			static int next_iter(lua_State* L) {
-				typedef meta::any<is_associative, meta::all<is_lookup, meta::neg<is_matched_lookup>>> is_assoc;
-				return next_associative<ip>(is_assoc(), L);
-			}
-
-			template <bool ip>
-			static int pairs_associative(std::true_type, lua_State* L) {
-				auto& src = get_src(L);
-				stack::push(L, next_iter<ip>);
-				stack::push<user<iter>>(L, src, deferred_uc::begin(L, src));
-				stack::push(L, lua_nil);
-				return 3;
-			}
-
-			template <bool ip>
-			static int pairs_associative(std::false_type, lua_State* L) {
-				auto& src = get_src(L);
-				stack::push(L, next_iter<ip>);
-				stack::push<user<iter>>(L, src, deferred_uc::begin(L, src));
-				stack::push(L, 0);
-				return 3;
-			}
-
-		public:
-			static int at(lua_State* L) {
-				auto& self = get_src(L);
-				detail::error_result er;
-				{
-					std::ptrdiff_t pos = stack::unqualified_get<std::ptrdiff_t>(L, 2);
-					er = at_start(L, self, pos);
-				}
-				return handle_errors(L, er);
-			}
-
-			static int get(lua_State* L) {
-				auto& self = get_src(L);
-				detail::error_result er;
-				{
-					decltype(auto) key = stack::unqualified_get<K>(L);
-					er = get_start(L, self, key);
-				}
-				return handle_errors(L, er);
-			}
-
-			static int index_get(lua_State* L) {
-				return get(L);
-			}
-
-			static int set(lua_State* L) {
-				stack_object value = stack_object(L, raw_index(3));
-				if constexpr (is_linear_integral::value) {
-					// for non-associative containers,
-					// erasure only happens if it is the
-					// last index in the container
-					auto key = stack::get<K>(L, 2);
-					auto self_size = deferred_uc::size(L);
-					if (key == static_cast<K>(self_size)) {
-						if (type_of(L, 3) == type::lua_nil) {
-							return erase(L);
-						}
-					}
-				}
-				else {
-					if (type_of(L, 3) == type::lua_nil) {
-						return erase(L);
-					}
-				}
-				auto& self = get_src(L);
-				detail::error_result er = set_start(L, self, stack_object(L, raw_index(2)), std::move(value));
-				return handle_errors(L, er);
-			}
-
-			static int index_set(lua_State* L) {
-				return set(L);
-			}
-
-			static int add(lua_State* L) {
-				auto& self = get_src(L);
-				detail::error_result er = add_copyable(is_copyable(), L, self, stack_object(L, raw_index(2)));
-				return handle_errors(L, er);
-			}
-
-			static int insert(lua_State* L) {
-				auto& self = get_src(L);
-				detail::error_result er = insert_copyable(is_copyable(), L, self, stack_object(L, raw_index(2)), stack_object(L, raw_index(3)));
-				return handle_errors(L, er);
-			}
-
-			static int find(lua_State* L) {
-				auto& self = get_src(L);
-				detail::error_result er = find_has(has_find<T>(), L, self);
-				return handle_errors(L, er);
-			}
-
-			static int index_of(lua_State* L) {
-				auto& self = get_src(L);
-				detail::error_result er = find_has<true>(has_find<T>(), L, self);
-				return handle_errors(L, er);
-			}
-
-			static iterator begin(lua_State*, T& self) {
-				if constexpr (meta::has_begin_end_v<T>) {
-					return self.begin();
-				}
-				else {
-					using std::begin;
-					return begin(self);
-				}
-			}
-
-			static iterator end(lua_State*, T& self) {
-				if constexpr (meta::has_begin_end_v<T>) {
-					return self.end();
-				}
-				else {
-					using std::end;
-					return end(self);
-				}
-			}
-
-			static int size(lua_State* L) {
-				auto& self = get_src(L);
-				std::size_t r = size_start(L, self);
-				return stack::push(L, r);
-			}
-
-			static int clear(lua_State* L) {
-				auto& self = get_src(L);
-				clear_start(L, self);
-				return 0;
-			}
-
-			static int erase(lua_State* L) {
-				auto& self = get_src(L);
-				detail::error_result er;
-				{
-					decltype(auto) key = stack::unqualified_get<K>(L, 2);
-					er = erase_start(L, self, key);
-				}
-				return handle_errors(L, er);
-			}
-
-			static int empty(lua_State* L) {
-				auto& self = get_src(L);
-				return stack::push(L, empty_start(L, self));
-			}
-
-			static std::ptrdiff_t index_adjustment(lua_State*, T&) {
-				return static_cast<std::ptrdiff_t>((SOL_CONTAINER_START_INDEX_I_) == 0 ? 0 : -(SOL_CONTAINER_START_INDEX_I_));
-			}
-
-			static int pairs(lua_State* L) {
-				typedef meta::any<is_associative, meta::all<is_lookup, meta::neg<is_matched_lookup>>> is_assoc;
-				return pairs_associative<false>(is_assoc(), L);
-			}
-
-			static int ipairs(lua_State* L) {
-				typedef meta::any<is_associative, meta::all<is_lookup, meta::neg<is_matched_lookup>>> is_assoc;
-				return pairs_associative<true>(is_assoc(), L);
-			}
-
-			static int next(lua_State* L) {
-				return stack::push(L, next_iter<false>);
-			}
-		};
-
-		template <typename X>
-		struct usertype_container_default<X, std::enable_if_t<std::is_array<std::remove_pointer_t<meta::unwrap_unqualified_t<X>>>::value>> {
-		private:
-			typedef std::remove_pointer_t<meta::unwrap_unqualified_t<X>> T;
-			typedef usertype_container<X> deferred_uc;
-
-		public:
-			typedef std::remove_extent_t<T> value_type;
-			typedef value_type* iterator;
-
-		private:
-			struct iter {
-				T& source;
-				iterator it;
-
-				iter(T& source, iterator it) : source(source), it(std::move(it)) {
-				}
-			};
-
-			static auto& get_src(lua_State* L) {
-				auto p = stack::unqualified_check_get<T*>(L, 1);
-#if SOL_IS_ON(SOL_SAFE_USERTYPE_I_)
-				if (!p) {
-					luaL_error(L,
-					     "sol: 'self' is not of type '%s' (pass 'self' as first argument with ':' or call on proper type)",
-					     detail::demangle<T>().c_str());
-				}
-				if (p.value() == nullptr) {
-					luaL_error(
-					     L, "sol: 'self' argument is nil (pass 'self' as first argument with ':' or call on a '%s' type)", detail::demangle<T>().c_str());
-				}
-#endif // Safe getting with error
-				return *p.value();
-			}
-
-			static int find(std::true_type, lua_State* L) {
-				T& self = get_src(L);
-				decltype(auto) value = stack::unqualified_get<value_type>(L, 2);
-				std::size_t N = std::extent<T>::value;
-				for (std::size_t idx = 0; idx < N; ++idx) {
-					using v_t = std::add_const_t<decltype(self[idx])>;
-					v_t v = self[idx];
-					if (v == value) {
-						idx -= deferred_uc::index_adjustment(L, self);
-						return stack::push(L, idx);
-					}
-				}
-				return stack::push(L, lua_nil);
-			}
-
-			static int find(std::false_type, lua_State* L) {
-				return luaL_error(L, "sol: cannot call 'find' on '%s': no supported comparison operator for the value type", detail::demangle<T>().c_str());
-			}
-
-			static int next_iter(lua_State* L) {
-				iter& i = stack::unqualified_get<user<iter>>(L, 1);
-				auto& source = i.source;
-				auto& it = i.it;
-				std::size_t k = stack::unqualified_get<std::size_t>(L, 2);
-				if (it == deferred_uc::end(L, source)) {
-					return 0;
-				}
-				int p;
-				p = stack::push(L, k + 1);
-				p += stack::push_reference(L, detail::deref_move_only(*it));
-				std::advance(it, 1);
-				return p;
-			}
-
-		public:
-			static int clear(lua_State* L) {
-				return luaL_error(L, "sol: cannot call 'clear' on type '%s': cannot remove all items from a fixed array", detail::demangle<T>().c_str());
-			}
-
-			static int erase(lua_State* L) {
-				return luaL_error(L, "sol: cannot call 'erase' on type '%s': cannot remove an item from fixed arrays", detail::demangle<T>().c_str());
-			}
-
-			static int add(lua_State* L) {
-				return luaL_error(L, "sol: cannot call 'add' on type '%s': cannot add to fixed arrays", detail::demangle<T>().c_str());
-			}
-
-			static int insert(lua_State* L) {
-				return luaL_error(L, "sol: cannot call 'insert' on type '%s': cannot insert new entries into fixed arrays", detail::demangle<T>().c_str());
-			}
-
-			static int at(lua_State* L) {
-				return get(L);
-			}
-
-			static int get(lua_State* L) {
-				T& self = get_src(L);
-				std::ptrdiff_t idx = stack::unqualified_get<std::ptrdiff_t>(L, 2);
-				idx += deferred_uc::index_adjustment(L, self);
-				if (idx >= static_cast<std::ptrdiff_t>(std::extent<T>::value) || idx < 0) {
-					return stack::push(L, lua_nil);
-				}
-				return stack::push_reference(L, detail::deref_move_only(self[idx]));
-			}
-
-			static int index_get(lua_State* L) {
-				return get(L);
-			}
-
-			static int set(lua_State* L) {
-				T& self = get_src(L);
-				std::ptrdiff_t idx = stack::unqualified_get<std::ptrdiff_t>(L, 2);
-				idx += deferred_uc::index_adjustment(L, self);
-				if (idx >= static_cast<std::ptrdiff_t>(std::extent<T>::value)) {
-					return luaL_error(L, "sol: index out of bounds (too big) for set on '%s'", detail::demangle<T>().c_str());
-				}
-				if (idx < 0) {
-					return luaL_error(L, "sol: index out of bounds (too small) for set on '%s'", detail::demangle<T>().c_str());
-				}
-				self[idx] = stack::unqualified_get<value_type>(L, 3);
-				return 0;
-			}
-
-			static int index_set(lua_State* L) {
-				return set(L);
-			}
-
-			static int index_of(lua_State* L) {
-				return find(L);
-			}
-
-			static int find(lua_State* L) {
-				return find(meta::supports_op_equal<value_type, value_type>(), L);
-			}
-
-			static int size(lua_State* L) {
-				return stack::push(L, std::extent<T>::value);
-			}
-
-			static int empty(lua_State* L) {
-				return stack::push(L, std::extent<T>::value > 0);
-			}
-
-			static int pairs(lua_State* L) {
-				auto& src = get_src(L);
-				stack::push(L, next_iter);
-				stack::push<user<iter>>(L, src, deferred_uc::begin(L, src));
-				stack::push(L, 0);
-				return 3;
-			}
-
-			static int ipairs(lua_State* L) {
-				return pairs(L);
-			}
-
-			static int next(lua_State* L) {
-				return stack::push(L, next_iter);
-			}
-
-			static std::ptrdiff_t index_adjustment(lua_State*, T&) {
-				return (SOL_CONTAINER_START_INDEX_I_) == 0 ? 0 : -(SOL_CONTAINER_START_INDEX_I_);
-			}
-
-			static iterator begin(lua_State*, T& self) {
-				return std::addressof(self[0]);
-			}
-
-			static iterator end(lua_State*, T& self) {
-				return std::addressof(self[0]) + std::extent<T>::value;
-			}
-		};
-
-		template <typename X>
-		struct usertype_container_default<usertype_container<X>> : usertype_container_default<X> {};
-	} // namespace container_detail
-
-	template <typename T>
-	struct usertype_container : container_detail::usertype_container_default<T> {};
-
-} // namespace sol
-
-// end of sol/usertype_container.hpp
-
-#include <unordered_map>
-
-namespace sol {
-
-	namespace container_detail {
-		template <typename X>
-		struct u_c_launch {
-			using T = std::remove_pointer_t<meta::unqualified_t<X>>;
-			using uc = usertype_container<T>;
-			using default_uc = usertype_container_default<T>;
-
-			static inline int real_index_get_traits(std::true_type, lua_State* L) {
-				return uc::index_get(L);
-			}
-
-			static inline int real_index_get_traits(std::false_type, lua_State* L) {
-				return default_uc::index_get(L);
-			}
-
-			static inline int real_index_call(lua_State* L) {
-				static const std::unordered_map<string_view, lua_CFunction> calls {
-					{ "at", &real_at_call },
-					{ "get", &real_get_call },
-					{ "set", &real_set_call },
-					{ "size", &real_length_call },
-					{ "add", &real_add_call },
-					{ "empty", &real_empty_call },
-					{ "insert", &real_insert_call },
-					{ "clear", &real_clear_call },
-					{ "find", &real_find_call },
-					{ "index_of", &real_index_of_call },
-					{ "erase", &real_erase_call },
-					{ "pairs", &pairs_call },
-					{ "next", &next_call },
-				};
-				auto maybenameview = stack::unqualified_check_get<string_view>(L, 2);
-				if (maybenameview) {
-					const string_view& name = *maybenameview;
-					auto it = calls.find(name);
-					if (it != calls.cend()) {
-						return stack::push(L, it->second);
-					}
-				}
-				return real_index_get_traits(container_detail::has_traits_index_get<uc>(), L);
-			}
-
-			static inline int real_at_traits(std::true_type, lua_State* L) {
-				return uc::at(L);
-			}
-
-			static inline int real_at_traits(std::false_type, lua_State* L) {
-				return default_uc::at(L);
-			}
-
-			static inline int real_at_call(lua_State* L) {
-				return real_at_traits(container_detail::has_traits_at<uc>(), L);
-			}
-
-			static inline int real_get_traits(std::true_type, lua_State* L) {
-				return uc::get(L);
-			}
-
-			static inline int real_get_traits(std::false_type, lua_State* L) {
-				return default_uc::get(L);
-			}
-
-			static inline int real_get_call(lua_State* L) {
-				return real_get_traits(container_detail::has_traits_get<uc>(), L);
-			}
-
-			static inline int real_set_traits(std::true_type, lua_State* L) {
-				return uc::set(L);
-			}
-
-			static inline int real_set_traits(std::false_type, lua_State* L) {
-				return default_uc::set(L);
-			}
-
-			static inline int real_set_call(lua_State* L) {
-				return real_set_traits(container_detail::has_traits_set<uc>(), L);
-			}
-
-			static inline int real_index_set_traits(std::true_type, lua_State* L) {
-				return uc::index_set(L);
-			}
-
-			static inline int real_index_set_traits(std::false_type, lua_State* L) {
-				return default_uc::index_set(L);
-			}
-
-			static inline int real_new_index_call(lua_State* L) {
-				return real_index_set_traits(container_detail::has_traits_index_set<uc>(), L);
-			}
-
-			static inline int real_pairs_traits(std::true_type, lua_State* L) {
-				return uc::pairs(L);
-			}
-
-			static inline int real_pairs_traits(std::false_type, lua_State* L) {
-				return default_uc::pairs(L);
-			}
-
-			static inline int real_pairs_call(lua_State* L) {
-				return real_pairs_traits(container_detail::has_traits_pairs<uc>(), L);
-			}
-
-			static inline int real_ipairs_traits(std::true_type, lua_State* L) {
-				return uc::ipairs(L);
-			}
-
-			static inline int real_ipairs_traits(std::false_type, lua_State* L) {
-				return default_uc::ipairs(L);
-			}
-
-			static inline int real_ipairs_call(lua_State* L) {
-				return real_ipairs_traits(container_detail::has_traits_ipairs<uc>(), L);
-			}
-
-			static inline int real_next_traits(std::true_type, lua_State* L) {
-				return uc::next(L);
-			}
-
-			static inline int real_next_traits(std::false_type, lua_State* L) {
-				return default_uc::next(L);
-			}
-
-			static inline int real_next_call(lua_State* L) {
-				return real_next_traits(container_detail::has_traits_next<uc>(), L);
-			}
-
-			static inline int real_size_traits(std::true_type, lua_State* L) {
-				return uc::size(L);
-			}
-
-			static inline int real_size_traits(std::false_type, lua_State* L) {
-				return default_uc::size(L);
-			}
-
-			static inline int real_length_call(lua_State* L) {
-				return real_size_traits(container_detail::has_traits_size<uc>(), L);
-			}
-
-			static inline int real_add_traits(std::true_type, lua_State* L) {
-				return uc::add(L);
-			}
-
-			static inline int real_add_traits(std::false_type, lua_State* L) {
-				return default_uc::add(L);
-			}
-
-			static inline int real_add_call(lua_State* L) {
-				return real_add_traits(container_detail::has_traits_add<uc>(), L);
-			}
-
-			static inline int real_insert_traits(std::true_type, lua_State* L) {
-				return uc::insert(L);
-			}
-
-			static inline int real_insert_traits(std::false_type, lua_State* L) {
-				return default_uc::insert(L);
-			}
-
-			static inline int real_insert_call(lua_State* L) {
-				return real_insert_traits(container_detail::has_traits_insert<uc>(), L);
-			}
-
-			static inline int real_clear_traits(std::true_type, lua_State* L) {
-				return uc::clear(L);
-			}
-
-			static inline int real_clear_traits(std::false_type, lua_State* L) {
-				return default_uc::clear(L);
-			}
-
-			static inline int real_clear_call(lua_State* L) {
-				return real_clear_traits(container_detail::has_traits_clear<uc>(), L);
-			}
-
-			static inline int real_empty_traits(std::true_type, lua_State* L) {
-				return uc::empty(L);
-			}
-
-			static inline int real_empty_traits(std::false_type, lua_State* L) {
-				return default_uc::empty(L);
-			}
-
-			static inline int real_empty_call(lua_State* L) {
-				return real_empty_traits(container_detail::has_traits_empty<uc>(), L);
-			}
-
-			static inline int real_erase_traits(std::true_type, lua_State* L) {
-				return uc::erase(L);
-			}
-
-			static inline int real_erase_traits(std::false_type, lua_State* L) {
-				return default_uc::erase(L);
-			}
-
-			static inline int real_erase_call(lua_State* L) {
-				return real_erase_traits(container_detail::has_traits_erase<uc>(), L);
-			}
-
-			static inline int real_find_traits(std::true_type, lua_State* L) {
-				return uc::find(L);
-			}
-
-			static inline int real_find_traits(std::false_type, lua_State* L) {
-				return default_uc::find(L);
-			}
-
-			static inline int real_find_call(lua_State* L) {
-				return real_find_traits(container_detail::has_traits_find<uc>(), L);
-			}
-
-			static inline int real_index_of_call(lua_State* L) {
-				if constexpr (container_detail::has_traits_index_of<uc>()) {
-					return uc::index_of(L);
-				}
-				else {
-					return default_uc::index_of(L);
-				}
-			}
-
-			static inline int add_call(lua_State* L) {
-				return detail::typed_static_trampoline<decltype(&real_add_call), (&real_add_call)>(L);
-			}
-
-			static inline int erase_call(lua_State* L) {
-				return detail::typed_static_trampoline<decltype(&real_erase_call), (&real_erase_call)>(L);
-			}
-
-			static inline int insert_call(lua_State* L) {
-				return detail::typed_static_trampoline<decltype(&real_insert_call), (&real_insert_call)>(L);
-			}
-
-			static inline int clear_call(lua_State* L) {
-				return detail::typed_static_trampoline<decltype(&real_clear_call), (&real_clear_call)>(L);
-			}
-
-			static inline int empty_call(lua_State* L) {
-				return detail::typed_static_trampoline<decltype(&real_empty_call), (&real_empty_call)>(L);
-			}
-
-			static inline int find_call(lua_State* L) {
-				return detail::typed_static_trampoline<decltype(&real_find_call), (&real_find_call)>(L);
-			}
-
-			static inline int index_of_call(lua_State* L) {
-				return detail::typed_static_trampoline<decltype(&real_index_of_call), (&real_index_of_call)>(L);
-			}
-
-			static inline int length_call(lua_State* L) {
-				return detail::typed_static_trampoline<decltype(&real_length_call), (&real_length_call)>(L);
-			}
-
-			static inline int pairs_call(lua_State* L) {
-				return detail::typed_static_trampoline<decltype(&real_pairs_call), (&real_pairs_call)>(L);
-			}
-
-			static inline int ipairs_call(lua_State* L) {
-				return detail::typed_static_trampoline<decltype(&real_ipairs_call), (&real_ipairs_call)>(L);
-			}
-
-			static inline int next_call(lua_State* L) {
-				return detail::typed_static_trampoline<decltype(&real_next_call), (&real_next_call)>(L);
-			}
-
-			static inline int at_call(lua_State* L) {
-				return detail::typed_static_trampoline<decltype(&real_at_call), (&real_at_call)>(L);
-			}
-
-			static inline int get_call(lua_State* L) {
-				return detail::typed_static_trampoline<decltype(&real_get_call), (&real_get_call)>(L);
-			}
-
-			static inline int set_call(lua_State* L) {
-				return detail::typed_static_trampoline<decltype(&real_set_call), (&real_set_call)>(L);
-			}
-
-			static inline int index_call(lua_State* L) {
-				return detail::typed_static_trampoline<decltype(&real_index_call), (&real_index_call)>(L);
-			}
-
-			static inline int new_index_call(lua_State* L) {
-				return detail::typed_static_trampoline<decltype(&real_new_index_call), (&real_new_index_call)>(L);
-			}
-		};
-	} // namespace container_detail
-
-	namespace stack {
-		namespace stack_detail {
-			template <typename T, bool is_shim = false>
-			struct metatable_setup {
-				lua_State* L;
-
-				metatable_setup(lua_State* L) : L(L) {
-				}
-
-				void operator()() {
-					using meta_usertype_container
-					     = container_detail::u_c_launch<meta::conditional_t<is_shim, as_container_t<std::remove_pointer_t<T>>, std::remove_pointer_t<T>>>;
-					static const char* metakey
-					     = is_shim ? &usertype_traits<as_container_t<std::remove_pointer_t<T>>>::metatable()[0] : &usertype_traits<T>::metatable()[0];
-					static const std::array<luaL_Reg, 20> reg = { {
-						// clang-format off
-						{ "__pairs", &meta_usertype_container::pairs_call },
-						{ "__ipairs", &meta_usertype_container::ipairs_call },
-						{ "__len", &meta_usertype_container::length_call },
-						{ "__index", &meta_usertype_container::index_call },
-						{ "__newindex", &meta_usertype_container::new_index_call },
-						{ "pairs", &meta_usertype_container::pairs_call },
-						{ "next", &meta_usertype_container::next_call },
-						{ "at", &meta_usertype_container::at_call },
-						{ "get", &meta_usertype_container::get_call },
-						{ "set", &meta_usertype_container::set_call },
-						{ "size", &meta_usertype_container::length_call },
-						{ "empty", &meta_usertype_container::empty_call },
-						{ "clear", &meta_usertype_container::clear_call },
-						{ "insert", &meta_usertype_container::insert_call },
-						{ "add", &meta_usertype_container::add_call },
-						{ "find", &meta_usertype_container::find_call },
-						{ "index_of", &meta_usertype_container::index_of_call },
-						{ "erase", &meta_usertype_container::erase_call },
-						std::is_pointer<T>::value ? luaL_Reg{ nullptr, nullptr } : luaL_Reg{ "__gc", &detail::usertype_alloc_destruct<T> },
-						{ nullptr, nullptr }
-						// clang-format on 
-					} };
-
-					if (luaL_newmetatable(L, metakey) == 1) {
-						luaL_setfuncs(L, reg.data(), 0);
-					}
-					lua_setmetatable(L, -2);
-				}
-			};
-		} // namespace stack_detail
-
-		template <typename T>
-		struct unqualified_pusher<as_container_t<T>> {
-			using C = meta::unqualified_t<T>;
-
-			static int push_lvalue(std::true_type, lua_State* L, const C& cont) {
-				stack_detail::metatable_setup<C*, true> fx(L);
-				return stack::push<detail::as_pointer_tag<const C>>(L, detail::with_function_tag(), fx, detail::ptr(cont));
-			}
-
-			static int push_lvalue(std::false_type, lua_State* L, const C& cont) {
-				stack_detail::metatable_setup<C, true> fx(L);
-				return stack::push<detail::as_value_tag<C>>(L, detail::with_function_tag(), fx, cont);
-			}
-
-			static int push_rvalue(std::true_type, lua_State* L, C&& cont) {
-				stack_detail::metatable_setup<C, true> fx(L);
-				return stack::push<detail::as_value_tag<C>>(L, detail::with_function_tag(), fx, std::move(cont));
-			}
-
-			static int push_rvalue(std::false_type, lua_State* L, const C& cont) {
-				return push_lvalue(std::is_lvalue_reference<T>(), L, cont);
-			}
-
-			static int push(lua_State* L, const as_container_t<T>& as_cont) {
-				return push_lvalue(std::is_lvalue_reference<T>(), L, as_cont.value());
-			}
-
-			static int push(lua_State* L, as_container_t<T>&& as_cont) {
-				return push_rvalue(meta::all<std::is_rvalue_reference<T>, meta::neg<std::is_lvalue_reference<T>>>(), L, std::forward<T>(as_cont.value()));
-			}
-		};
-
-		template <typename T>
-		struct unqualified_pusher<as_container_t<T*>> {
-			using C = std::add_pointer_t<meta::unqualified_t<std::remove_pointer_t<T>>>;
-
-			static int push(lua_State* L, T* cont) {
-				stack_detail::metatable_setup<C> fx(L);
-				return stack::push<detail::as_pointer_tag<T>>(L, detail::with_function_tag(), fx, cont);
-			}
-		};
-
-		template <typename T>
-		struct unqualified_pusher<T, std::enable_if_t<is_container_v<T>>> {
-			using C = T;
-
-			template <typename... Args>
-			static int push(lua_State* L, Args&&... args) {
-				stack_detail::metatable_setup<C> fx(L);
-				return stack::push<detail::as_value_tag<T>>(L, detail::with_function_tag(), fx, std::forward<Args>(args)...);
-			}
-		};
-
-		template <typename T>
-		struct unqualified_pusher<T*, std::enable_if_t<is_container_v<T>>> {
-			using C = std::add_pointer_t<meta::unqualified_t<std::remove_pointer_t<T>>>;
-
-			static int push(lua_State* L, T* cont) {
-				stack_detail::metatable_setup<C> fx(L);
-				return stack::push<detail::as_pointer_tag<T>>(L, detail::with_function_tag(), fx, cont);
-			}
-		};
-	} // namespace stack
-
-} // namespace sol
-
-// end of sol/usertype_container_launch.hpp
-
-#include <sstream>
-#include <type_traits>
-
-namespace sol {
-	namespace u_detail {
-		constexpr const lua_Integer toplevel_magic = static_cast<lua_Integer>(0xCCC2CCC1);
-
-		constexpr const int environment_index = 1;
-		constexpr const int usertype_storage_index = 2;
-		constexpr const int usertype_storage_base_index = 3;
-		constexpr const int exact_function_index = 4;
-		constexpr const int magic_index = 5;
-
-		constexpr const int simple_usertype_storage_index = 2;
-		constexpr const int index_function_index = 3;
-		constexpr const int new_index_function_index = 4;
-
-		constexpr const int base_walking_failed_index = -32467;
-		constexpr const int lookup_failed_index = -42469;
-
-		enum class submetatable_type {
-			// must be sequential
-			value,
-			reference,
-			unique,
-			const_reference,
-			const_value,
-			// must be LAST!
-			named
-		};
-
-		inline auto make_string_view(string_view s) {
-			return s;
-		}
-
-		inline auto make_string_view(call_construction) {
-			return string_view(to_string(meta_function::call_function));
-		}
-
-		inline auto make_string_view(meta_function mf) {
-			return string_view(to_string(mf));
-		}
-
-		inline auto make_string_view(base_classes_tag) {
-			return string_view(detail::base_class_cast_key());
-		}
-
-		template <typename Arg>
-		inline std::string make_string(Arg&& arg) {
-			string_view s = make_string_view(arg);
-			return std::string(s.data(), s.size());
-		}
-
-		inline int is_indexer(string_view s) {
-			if (s == to_string(meta_function::index)) {
-				return 1;
-			}
-			else if (s == to_string(meta_function::new_index)) {
-				return 2;
-			}
-			return 0;
-		}
-
-		inline int is_indexer(meta_function mf) {
-			if (mf == meta_function::index) {
-				return 1;
-			}
-			else if (mf == meta_function::new_index) {
-				return 2;
-			}
-			return 0;
-		}
-
-		inline int is_indexer(call_construction) {
-			return 0;
-		}
-	} // namespace u_detail
-
-	namespace detail {
-
-		template <typename T, typename IFx, typename Fx>
-		inline void insert_default_registrations(IFx&& ifx, Fx&& fx) {
-			(void)ifx;
-			(void)fx;
-			if constexpr (is_automagical<T>::value) {
-				if (fx(meta_function::less_than)) {
-					if constexpr (meta::supports_op_less<T>::value) {
-						lua_CFunction f = &comparsion_operator_wrap<T, std::less<>>;
-						ifx(meta_function::less_than, f);
-					}
-				}
-				if (fx(meta_function::less_than_or_equal_to)) {
-					if constexpr (meta::supports_op_less_equal<T>::value) {
-						lua_CFunction f = &comparsion_operator_wrap<T, std::less_equal<>>;
-						ifx(meta_function::less_than_or_equal_to, f);
-					}
-				}
-				if (fx(meta_function::equal_to)) {
-					if constexpr (meta::supports_op_equal<T>::value) {
-						lua_CFunction f = &comparsion_operator_wrap<T, std::equal_to<>>;
-						ifx(meta_function::equal_to, f);
-					}
-					else {
-						lua_CFunction f = &comparsion_operator_wrap<T, no_comp>;
-						ifx(meta_function::equal_to, f);
-					}
-				}
-				if (fx(meta_function::pairs)) {
-					ifx(meta_function::pairs, &container_detail::u_c_launch<as_container_t<T>>::pairs_call);
-				}
-				if (fx(meta_function::length)) {
-					if constexpr (meta::has_size<const T>::value || meta::has_size<T>::value) {
-						auto f = &default_size<T>;
-						ifx(meta_function::length, f);
-					}
-				}
-				if (fx(meta_function::to_string)) {
-					if constexpr (is_to_stringable<T>::value) {
-						auto f = &detail::static_trampoline<&default_to_string<T>>;
-						ifx(meta_function::to_string, f);
-					}
-				}
-				if (fx(meta_function::call_function)) {
-					if constexpr (meta::has_deducible_signature<T>::value) {
-						auto f = &c_call<decltype(&T::operator()), &T::operator()>;
-						ifx(meta_function::call_function, f);
-					}
-				}
-			}
-		}
-	} // namespace detail
-
-	namespace stack { namespace stack_detail {
-		template <typename X>
-		void set_undefined_methods_on(stack_reference t) {
-			using T = std::remove_pointer_t<X>;
-
-			lua_State* L = t.lua_state();
-
-			t.push();
-
-			detail::lua_reg_table l{};
-			int index = 0;
-			detail::indexed_insert insert_fx(l, index);
-			detail::insert_default_registrations<T>(insert_fx, detail::property_always_true);
-			if constexpr (!std::is_pointer_v<X>) {
-				l[index] = luaL_Reg{ to_string(meta_function::garbage_collect).c_str(), detail::make_destructor<T>() };
-			}
-			luaL_setfuncs(L, l, 0);
-
-			// __type table
-			lua_createtable(L, 0, 2);
-			const std::string& name = detail::demangle<T>();
-			lua_pushlstring(L, name.c_str(), name.size());
-			lua_setfield(L, -2, "name");
-			lua_CFunction is_func = &detail::is_check<T>;
-			lua_pushcclosure(L, is_func, 0);
-			lua_setfield(L, -2, "is");
-			lua_setfield(L, t.stack_index(), to_string(meta_function::type).c_str());
-
-			t.pop();
-		}
-	}} // namespace stack::stack_detail
-} // namespace sol
-
-// end of sol/usertype_core.hpp
-
-// beginning of sol/usertype_storage.hpp
-
-#include <bitset>
-#include <unordered_map>
-
-namespace sol { namespace u_detail {
-
-	struct usertype_storage_base;
-	template <typename T>
-	struct usertype_storage;
-
-	optional<usertype_storage_base&> maybe_get_usertype_storage_base(lua_State* L, int index);
-	usertype_storage_base& get_usertype_storage_base(lua_State* L, const char* gcmetakey);
-	template <typename T>
-	optional<usertype_storage<T>&> maybe_get_usertype_storage(lua_State* L);
-	template <typename T>
-	usertype_storage<T>& get_usertype_storage(lua_State* L);
-
-	using index_call_function = int(lua_State*, void*);
-	using change_indexing_mem_func
-		= void (usertype_storage_base::*)(lua_State*, submetatable_type, void*, stack_reference&, lua_CFunction, lua_CFunction, lua_CFunction, lua_CFunction);
-
-	struct index_call_storage {
-		index_call_function* index;
-		index_call_function* new_index;
-		void* binding_data;
-	};
-
-	struct new_index_call_storage : index_call_storage {
-		void* new_binding_data;
-	};
-
-	struct binding_base {
-		virtual void* data() = 0;
-		virtual ~binding_base() {
-		}
-	};
-
-	template <typename K, typename Fq, typename T = void>
-	struct binding : binding_base {
-		using uF = meta::unqualified_t<Fq>;
-		using F = meta::conditional_t<meta::is_c_str_of_v<uF, char>
-#ifdef __cpp_char8_t
-			     || meta::is_c_str_of_v<uF, char8_t>
-#endif
-			     || meta::is_c_str_of_v<uF, char16_t> || meta::is_c_str_of_v<uF, char32_t> || meta::is_c_str_of_v<uF, wchar_t>,
-			std::add_pointer_t<std::add_const_t<std::remove_all_extents_t<Fq>>>, std::decay_t<Fq>>;
-		F data_;
-
-		template <typename... Args>
-		binding(Args&&... args) : data_(std::forward<Args>(args)...) {
-		}
-
-		virtual void* data() override {
-			return static_cast<void*>(std::addressof(data_));
-		}
-
-		template <bool is_index = true, bool is_variable = false>
-		static inline int call_with_(lua_State* L, void* target) {
-			constexpr int boost = !detail::is_non_factory_constructor<F>::value && std::is_same<K, call_construction>::value ? 1 : 0;
-			auto& f = *static_cast<F*>(target);
-			return call_detail::call_wrapped<T, is_index, is_variable, boost>(L, f);
-		}
-
-		template <bool is_index = true, bool is_variable = false>
-		static inline int call_(lua_State* L) {
-			void* f = stack::get<void*>(L, upvalue_index(usertype_storage_index));
-			return call_with_<is_index, is_variable>(L, f);
-		}
-
-		template <bool is_index = true, bool is_variable = false>
-		static inline int call(lua_State* L) {
-			int r = detail::typed_static_trampoline<decltype(&call_<is_index, is_variable>), (&call_<is_index, is_variable>)>(L);
-			if constexpr (meta::is_specialization_of_v<uF, yielding_t>) {
-				return lua_yield(L, r);
-			}
-			else {
-				return r;
-			}
-		}
-
-		template <bool is_index = true, bool is_variable = false>
-		static inline int index_call_with_(lua_State* L, void* target) {
-			if constexpr (!is_variable) {
-				if constexpr (is_lua_c_function_v<std::decay_t<F>>) {
-					auto& f = *static_cast<std::decay_t<F>*>(target);
-					return stack::push(L, f);
-				}
-				else {
-					// set up upvalues
-					// for a chained call
-					int upvalues = 0;
-					upvalues += stack::push(L, nullptr);
-					upvalues += stack::push(L, target);
-					auto cfunc = &call<is_index, is_variable>;
-					return stack::push(L, c_closure(cfunc, upvalues));
-				}
-			}
-			else {
-				constexpr int boost = !detail::is_non_factory_constructor<F>::value && std::is_same<K, call_construction>::value ? 1 : 0;
-				auto& f = *static_cast<F*>(target);
-				return call_detail::call_wrapped<T, is_index, is_variable, boost>(L, f);
-			}
-		}
-
-		template <bool is_index = true, bool is_variable = false>
-		static inline int index_call_(lua_State* L) {
-			void* f = stack::get<void*>(L, upvalue_index(usertype_storage_index));
-			return index_call_with_<is_index, is_variable>(L, f);
-		}
-
-		template <bool is_index = true, bool is_variable = false>
-		static inline int index_call(lua_State* L) {
-			int r = detail::typed_static_trampoline<decltype(&index_call_<is_index, is_variable>), (&index_call_<is_index, is_variable>)>(L);
-			if constexpr (meta::is_specialization_of_v<uF, yielding_t>) {
-				return lua_yield(L, r);
-			}
-			else {
-				return r;
-			}
-		}
-	};
-
-	inline int index_fail(lua_State* L) {
-		if (lua_getmetatable(L, 1) == 1) {
-			int metatarget = lua_gettop(L);
-			stack::get_field<false, true>(L, stack_reference(L, raw_index(2)), metatarget);
-			return 1;
-		}
-		// With runtime extensibility, we can't
-		// hard-error things. They have to
-		// return nil, like regular table types
-		return stack::push(L, lua_nil);
-	}
-
-	inline int index_target_fail(lua_State* L, void*) {
-		return index_fail(L);
-	}
-
-	inline int new_index_fail(lua_State* L) {
-		return luaL_error(L, "sol: cannot set (new_index) into this object: no defined new_index operation on usertype");
-	}
-
-	inline int new_index_target_fail(lua_State* L, void*) {
-		return new_index_fail(L);
-	}
-
-	struct string_for_each_metatable_func {
-		bool is_destruction = false;
-		bool is_index = false;
-		bool is_new_index = false;
-		bool is_static_index = false;
-		bool is_static_new_index = false;
-		bool poison_indexing = false;
-		bool is_unqualified_lua_CFunction = false;
-		bool is_unqualified_lua_reference = false;
-		std::string* p_key = nullptr;
-		reference* p_binding_ref = nullptr;
-		lua_CFunction call_func = nullptr;
-		index_call_storage* p_ics = nullptr;
-		usertype_storage_base* p_usb = nullptr;
-		void* p_derived_usb = nullptr;
-		lua_CFunction idx_call = nullptr, new_idx_call = nullptr, meta_idx_call = nullptr, meta_new_idx_call = nullptr;
-		change_indexing_mem_func change_indexing;
-
-		void operator()(lua_State* L, submetatable_type smt, reference& fast_index_table) {
-			std::string& key = *p_key;
-			usertype_storage_base& usb = *p_usb;
-			index_call_storage& ics = *p_ics;
-
-			if (smt == submetatable_type::named) {
-				// do not override __call or
-				// other specific meta functions on named metatable:
-				// we need that for call construction
-				// and other amenities
-				return;
-			}
-			int fast_index_table_push = fast_index_table.push();
-			stack_reference t(L, -fast_index_table_push);
-			if (poison_indexing) {
-				(usb.*change_indexing)(L, smt, p_derived_usb, t, idx_call, new_idx_call, meta_idx_call, meta_new_idx_call);
-			}
-			if (is_destruction
-				&& (smt == submetatable_type::reference || smt == submetatable_type::const_reference || smt == submetatable_type::named
-				     || smt == submetatable_type::unique)) {
-				// gc does not apply to us here
-				// for reference types (raw T*, std::ref)
-				// for the named metatable itself,
-				// or for unique_usertypes, which do their own custom destruction
-				t.pop();
-				return;
-			}
-			if (is_index || is_new_index || is_static_index || is_static_new_index) {
-				// do not serialize the new_index and index functions here directly
-				// we control those...
-				t.pop();
-				return;
-			}
-			if (is_unqualified_lua_CFunction) {
-				stack::set_field<false, true>(L, key, call_func, t.stack_index());
-			}
-			else if (is_unqualified_lua_reference) {
-				reference& binding_ref = *p_binding_ref;
-				stack::set_field<false, true>(L, key, binding_ref, t.stack_index());
-			}
-			else {
-				stack::set_field<false, true>(L, key, make_closure(call_func, nullptr, ics.binding_data), t.stack_index());
-			}
-			t.pop();
-		}
-	};
-
-	struct lua_reference_func {
-		reference key;
-		reference value;
-
-		void operator()(lua_State* L, submetatable_type smt, reference& fast_index_table) {
-			if (smt == submetatable_type::named) {
-				return;
-			}
-			int fast_index_table_push = fast_index_table.push();
-			stack_reference t(L, -fast_index_table_push);
-			stack::set_field<false, true>(L, key, value, t.stack_index());
-			t.pop();
-		}
-	};
-
-	struct update_bases_func {
-		detail::inheritance_check_function base_class_check_func;
-		detail::inheritance_cast_function base_class_cast_func;
-		lua_CFunction idx_call, new_idx_call, meta_idx_call, meta_new_idx_call;
-		usertype_storage_base* p_usb;
-		void* p_derived_usb;
-		change_indexing_mem_func change_indexing;
-
-		void operator()(lua_State* L, submetatable_type smt, reference& fast_index_table) {
-			int fast_index_table_push = fast_index_table.push();
-			stack_reference t(L, -fast_index_table_push);
-			stack::set_field(L, detail::base_class_check_key(), reinterpret_cast<void*>(base_class_check_func), t.stack_index());
-			stack::set_field(L, detail::base_class_cast_key(), reinterpret_cast<void*>(base_class_cast_func), t.stack_index());
-			// change indexing, forcefully
-			(p_usb->*change_indexing)(L, smt, p_derived_usb, t, idx_call, new_idx_call, meta_idx_call, meta_new_idx_call);
-			t.pop();
-		}
-	};
-
-	struct binding_data_equals {
-		void* binding_data;
-
-		binding_data_equals(void* b) : binding_data(b) {
-		}
-
-		bool operator()(const std::unique_ptr<binding_base>& ptr) const {
-			return binding_data == ptr->data();
-		}
-	};
-
-	struct usertype_storage_base {
-	public:
-		std::vector<std::unique_ptr<binding_base>> storage;
-		std::vector<std::unique_ptr<char[]>> string_keys_storage;
-		std::unordered_map<string_view, index_call_storage> string_keys;
-		std::unordered_map<reference, reference, reference_hash, reference_equals> auxiliary_keys;
-		reference value_index_table;
-		reference reference_index_table;
-		reference unique_index_table;
-		reference const_reference_index_table;
-		reference const_value_index_table;
-		reference named_index_table;
-		reference type_table;
-		reference gc_names_table;
-		reference named_metatable;
-		new_index_call_storage base_index;
-		new_index_call_storage static_base_index;
-		bool is_using_index;
-		bool is_using_new_index;
-		std::bitset<64> properties;
-
-		usertype_storage_base(lua_State* L)
-		: storage()
-		, string_keys()
-		, auxiliary_keys()
-		, value_index_table()
-		, reference_index_table()
-		, unique_index_table()
-		, const_reference_index_table()
-		, type_table(make_reference(L, create))
-		, gc_names_table(make_reference(L, create))
-		, named_metatable(make_reference(L, create))
-		, base_index()
-		, static_base_index()
-		, is_using_index(false)
-		, is_using_new_index(false)
-		, properties() {
-			base_index.binding_data = nullptr;
-			base_index.index = index_target_fail;
-			base_index.new_index = new_index_target_fail;
-			base_index.new_binding_data = nullptr;
-			static_base_index.binding_data = nullptr;
-			static_base_index.index = index_target_fail;
-			static_base_index.new_binding_data = this;
-			static_base_index.new_index = new_index_target_set;
-		}
-
-		template <typename Fx>
-		void for_each_table(lua_State* L, Fx&& fx) {
-			for (int i = 0; i < 6; ++i) {
-				submetatable_type smt = static_cast<submetatable_type>(i);
-				reference* p_fast_index_table = nullptr;
-				switch (smt) {
-				case submetatable_type::const_value:
-					p_fast_index_table = &this->const_value_index_table;
-					break;
-				case submetatable_type::reference:
-					p_fast_index_table = &this->reference_index_table;
-					break;
-				case submetatable_type::unique:
-					p_fast_index_table = &this->unique_index_table;
-					break;
-				case submetatable_type::const_reference:
-					p_fast_index_table = &this->const_reference_index_table;
-					break;
-				case submetatable_type::named:
-					p_fast_index_table = &this->named_index_table;
-					break;
-				case submetatable_type::value:
-				default:
-					p_fast_index_table = &this->value_index_table;
-					break;
-				}
-				fx(L, smt, *p_fast_index_table);
-			}
-		}
-
-		void add_entry(string_view sv, index_call_storage ics) {
-			string_keys_storage.emplace_back(new char[sv.size()]);
-			std::unique_ptr<char[]>& sv_storage = string_keys_storage.back();
-			std::memcpy(sv_storage.get(), sv.data(), sv.size());
-			string_view stored_sv(sv_storage.get(), sv.size());
-			string_keys.insert_or_assign(std::move(stored_sv), std::move(ics));
-		}
-
-		template <typename T, typename... Bases>
-		void update_bases(lua_State* L, bases<Bases...>) {
-			static_assert(sizeof(void*) <= sizeof(detail::inheritance_check_function),
-				"The size of this data pointer is too small to fit the inheritance checking function: Please file "
-				"a bug report.");
-			static_assert(sizeof(void*) <= sizeof(detail::inheritance_cast_function),
-				"The size of this data pointer is too small to fit the inheritance checking function: Please file "
-				"a bug report.");
-			static_assert(!meta::any_same<T, Bases...>::value, "base classes cannot list the original class as part of the bases");
-			if constexpr (sizeof...(Bases) < 1) {
-				return;
-			}
-
-			(void)detail::swallow { 0, ((weak_derive<Bases>::value = true), 0)... };
-
-			void* derived_this = static_cast<void*>(static_cast<usertype_storage<T>*>(this));
-
-			update_bases_func for_each_fx;
-			for_each_fx.base_class_check_func = &detail::inheritance<T>::template type_check_with<Bases...>;
-			for_each_fx.base_class_cast_func = &detail::inheritance<T>::template type_cast_with<Bases...>;
-			for_each_fx.idx_call = &usertype_storage<T>::template index_call_with_bases<false, Bases...>;
-			for_each_fx.new_idx_call = &usertype_storage<T>::template index_call_with_bases<true, Bases...>;
-			for_each_fx.meta_idx_call = &usertype_storage<T>::template meta_index_call_with_bases<false, Bases...>;
-			for_each_fx.meta_new_idx_call = &usertype_storage<T>::template meta_index_call_with_bases<true, Bases...>;
-			for_each_fx.p_usb = this;
-			for_each_fx.p_derived_usb = derived_this;
-			for_each_fx.change_indexing = &usertype_storage_base::change_indexing;
-			for_each_fx.p_derived_usb = derived_this;
-			this->for_each_table(L, for_each_fx);
-		}
-
-		void clear() {
-			if (value_index_table.valid()) {
-				stack::clear(value_index_table);
-			}
-			if (reference_index_table.valid()) {
-				stack::clear(reference_index_table);
-			}
-			if (unique_index_table.valid()) {
-				stack::clear(unique_index_table);
-			}
-			if (const_reference_index_table.valid()) {
-				stack::clear(const_reference_index_table);
-			}
-			if (const_value_index_table.valid()) {
-				stack::clear(const_value_index_table);
-			}
-			if (named_index_table.valid()) {
-				stack::clear(named_index_table);
-			}
-			if (type_table.valid()) {
-				stack::clear(type_table);
-			}
-			if (gc_names_table.valid()) {
-				stack::clear(gc_names_table);
-			}
-			if (named_metatable.valid()) {
-				lua_State* L = named_metatable.lua_state();
-				auto pp = stack::push_pop(named_metatable);
-				int named_metatable_index = pp.index_of(named_metatable);
-				if (lua_getmetatable(L, named_metatable_index) == 1) {
-					stack::clear(L, absolute_index(L, -1));
-				}
-				stack::clear(named_metatable);
-			}
-
-			value_index_table = lua_nil;
-			reference_index_table = lua_nil;
-			unique_index_table = lua_nil;
-			const_reference_index_table = lua_nil;
-			const_value_index_table = lua_nil;
-			named_index_table = lua_nil;
-			type_table = lua_nil;
-			gc_names_table = lua_nil;
-			named_metatable = lua_nil;
-
-			storage.clear();
-			string_keys.clear();
-			auxiliary_keys.clear();
-		}
-
-		template <bool is_new_index, typename Base>
-		static void base_walk_index(lua_State* L, usertype_storage_base& self, bool& keep_going, int& base_result) {
-			using bases = typename base<Base>::type;
-			if (!keep_going) {
-				return;
-			}
-			(void)L;
-			(void)self;
-#if SOL_IS_ON(SOL_USE_UNSAFE_BASE_LOOKUP_I_)
-			usertype_storage_base& base_storage = get_usertype_storage<Base>(L);
-			base_result = self_index_call<is_new_index, true>(bases(), L, base_storage);
-#else
-			optional<usertype_storage<Base>&> maybe_base_storage = maybe_get_usertype_storage<Base>(L);
-			if (static_cast<bool>(maybe_base_storage)) {
-				base_result = self_index_call<is_new_index, true>(bases(), L, *maybe_base_storage);
-				keep_going = base_result == base_walking_failed_index;
-			}
-#endif // Fast versus slow, safe base lookup
-		}
-
-		template <bool is_new_index = false, bool base_walking = false, bool from_named_metatable = false, typename... Bases>
-		static inline int self_index_call(types<Bases...>, lua_State* L, usertype_storage_base& self) {
-			type k_type = stack::get<type>(L, 2);
-			if (k_type == type::string) {
-				index_call_storage* target = nullptr;
-				{
-					string_view k = stack::get<string_view>(L, 2);
-					auto it = self.string_keys.find(k);
-					if (it != self.string_keys.cend()) {
-						target = &it->second;
-					}
-				}
-				if (target != nullptr) {
-					// let the target decide what to do
-					if constexpr (is_new_index) {
-						return (target->new_index)(L, target->binding_data);
-					}
-					else {
-						return (target->index)(L, target->binding_data);
-					}
-				}
-			}
-			else if (k_type != type::lua_nil && k_type != type::none) {
-				reference* target = nullptr;
-				{
-					stack_reference k = stack::get<stack_reference>(L, 2);
-					auto it = self.auxiliary_keys.find(k);
-					if (it != self.auxiliary_keys.cend()) {
-						target = &it->second;
-					}
-				}
-				if (target != nullptr) {
-					if constexpr (is_new_index) {
-						// set value and return
-						*target = reference(L, 3);
-						return 0;
-					}
-					else {
-						// push target to return
-						// what we found
-						return stack::push(L, *target);
-					}
-				}
-			}
-
-			// retrieve bases and walk through them.
-			bool keep_going = true;
-			int base_result;
-			(void)keep_going;
-			(void)base_result;
-			(void)detail::swallow { 1, (base_walk_index<is_new_index, Bases>(L, self, keep_going, base_result), 1)... };
-			if constexpr (sizeof...(Bases) > 0) {
-				if (!keep_going) {
-					return base_result;
-				}
-			}
-			if constexpr (base_walking) {
-				// if we're JUST base-walking then don't index-fail, just
-				// return the false bits
-				return base_walking_failed_index;
-			}
-			else if constexpr (from_named_metatable) {
-				if constexpr (is_new_index) {
-					return self.static_base_index.new_index(L, self.static_base_index.new_binding_data);
-				}
-				else {
-					return self.static_base_index.index(L, self.static_base_index.binding_data);
-				}
-			}
-			else {
-				if constexpr (is_new_index) {
-					return self.base_index.new_index(L, self.base_index.new_binding_data);
-				}
-				else {
-					return self.base_index.index(L, self.base_index.binding_data);
-				}
-			}
-		}
-
-		void change_indexing(lua_State* L, submetatable_type submetatable, void* derived_this, stack_reference& t, lua_CFunction index,
-			lua_CFunction new_index, lua_CFunction meta_index, lua_CFunction meta_new_index) {
-			usertype_storage_base& this_base = *this;
-			void* base_this = static_cast<void*>(&this_base);
-
-			this->is_using_index |= true;
-			this->is_using_new_index |= true;
-			if (submetatable == submetatable_type::named) {
-				stack::set_field(L, metatable_key, named_index_table, t.stack_index());
-				stack_reference stack_metametatable(L, -named_metatable.push());
-				stack::set_field<false, true>(L,
-					meta_function::index,
-					make_closure(meta_index, nullptr, derived_this, base_this, nullptr, toplevel_magic),
-					stack_metametatable.stack_index());
-				stack::set_field<false, true>(L,
-					meta_function::new_index,
-					make_closure(meta_new_index, nullptr, derived_this, base_this, nullptr, toplevel_magic),
-					stack_metametatable.stack_index());
-				stack_metametatable.pop();
-			}
-			else {
-				stack::set_field<false, true>(
-					L, meta_function::index, make_closure(index, nullptr, derived_this, base_this, nullptr, toplevel_magic), t.stack_index());
-				stack::set_field<false, true>(
-					L, meta_function::new_index, make_closure(new_index, nullptr, derived_this, base_this, nullptr, toplevel_magic), t.stack_index());
-			}
-		}
-
-		template <typename T = void, typename Key, typename Value>
-		void set(lua_State* L, Key&& key, Value&& value);
-
-		static int new_index_target_set(lua_State* L, void* target) {
-			usertype_storage_base& self = *static_cast<usertype_storage_base*>(target);
-			self.set(L, reference(L, raw_index(2)), reference(L, raw_index(3)));
-			return 0;
-		}
-	};
-
-	template <typename T>
-	struct usertype_storage : usertype_storage_base {
-
-		using usertype_storage_base::usertype_storage_base;
-
-		template <bool is_new_index, bool from_named_metatable>
-		static inline int index_call_(lua_State* L) {
-			using bases = typename base<T>::type;
-			usertype_storage_base& self = stack::get<light<usertype_storage_base>>(L, upvalue_index(usertype_storage_index));
-			return self_index_call<is_new_index, false, from_named_metatable>(bases(), L, self);
-		}
-
-		template <bool is_new_index, bool from_named_metatable, typename... Bases>
-		static inline int index_call_with_bases_(lua_State* L) {
-			using bases = types<Bases...>;
-			usertype_storage_base& self = stack::get<light<usertype_storage_base>>(L, upvalue_index(usertype_storage_index));
-			return self_index_call<is_new_index, false, from_named_metatable>(bases(), L, self);
-		}
-
-		template <bool is_new_index>
-		static inline int index_call(lua_State* L) {
-			return detail::static_trampoline<&index_call_<is_new_index, false>>(L);
-		}
-
-		template <bool is_new_index, typename... Bases>
-		static inline int index_call_with_bases(lua_State* L) {
-			return detail::static_trampoline<&index_call_with_bases_<is_new_index, false, Bases...>>(L);
-		}
-
-		template <bool is_new_index>
-		static inline int meta_index_call(lua_State* L) {
-			return detail::static_trampoline<&index_call_<is_new_index, true>>(L);
-		}
-
-		template <bool is_new_index, typename... Bases>
-		static inline int meta_index_call_with_bases(lua_State* L) {
-			return detail::static_trampoline<&index_call_with_bases_<is_new_index, true, Bases...>>(L);
-		}
-
-		template <typename Key, typename Value>
-		inline void set(lua_State* L, Key&& key, Value&& value);
-	};
-
-	template <typename T>
-	inline int destruct_usertype_storage(lua_State* L) {
-		return detail::user_alloc_destruct<usertype_storage<T>>(L);
-	}
-
-	template <typename T, typename Key, typename Value>
-	void usertype_storage_base::set(lua_State* L, Key&& key, Value&& value) {
-		using ValueU = meta::unwrap_unqualified_t<Value>;
-		using KeyU = meta::unwrap_unqualified_t<Key>;
-		using Binding = binding<KeyU, ValueU, T>;
-		using is_var_bind = is_variable_binding<ValueU>;
-		if constexpr (std::is_same_v<KeyU, call_construction>) {
-			(void)key;
-			std::unique_ptr<Binding> p_binding = std::make_unique<Binding>(std::forward<Value>(value));
-			Binding& b = *p_binding;
-			this->storage.push_back(std::move(p_binding));
-
-			this->named_index_table.push();
-			absolute_index metametatable_index(L, -1);
-			stack::push(L, nullptr);
-			stack::push(L, b.data());
-			lua_CFunction target_func = &b.template call<false, false>;
-			lua_pushcclosure(L, target_func, 2);
-			lua_setfield(L, metametatable_index, to_string(meta_function::call).c_str());
-			this->named_index_table.pop();
-		}
-		else if constexpr (std::is_same_v<KeyU, base_classes_tag>) {
-			(void)key;
-			this->update_bases<T>(L, std::forward<Value>(value));
-		}
-		else if constexpr ((meta::is_string_like_or_constructible<KeyU>::value || std::is_same_v<KeyU, meta_function>)) {
-			std::string s = u_detail::make_string(std::forward<Key>(key));
-			auto storage_it = this->storage.end();
-			auto string_it = this->string_keys.find(s);
-			if (string_it != this->string_keys.cend()) {
-				const auto& binding_data = string_it->second.binding_data;
-				storage_it = std::find_if(this->storage.begin(), this->storage.end(), binding_data_equals(binding_data));
-				this->string_keys.erase(string_it);
-			}
-
-			std::unique_ptr<Binding> p_binding = std::make_unique<Binding>(std::forward<Value>(value));
-			Binding& b = *p_binding;
-			if (storage_it != this->storage.cend()) {
-				*storage_it = std::move(p_binding);
-			}
-			else {
-				this->storage.push_back(std::move(p_binding));
-			}
-
-			bool is_index = (s == to_string(meta_function::index));
-			bool is_new_index = (s == to_string(meta_function::new_index));
-			bool is_static_index = (s == to_string(meta_function::static_index));
-			bool is_static_new_index = (s == to_string(meta_function::static_new_index));
-			bool is_destruction = s == to_string(meta_function::garbage_collect);
-			bool poison_indexing = (!is_using_index || !is_using_new_index) && (is_var_bind::value || is_index || is_new_index);
-			void* derived_this = static_cast<void*>(static_cast<usertype_storage<T>*>(this));
-			index_call_storage ics;
-			ics.binding_data = b.data();
-			ics.index = is_index || is_static_index ? &Binding::template call_with_<true, is_var_bind::value>
-				                                   : &Binding::template index_call_with_<true, is_var_bind::value>;
-			ics.new_index = is_new_index || is_static_new_index ? &Binding::template call_with_<false, is_var_bind::value>
-				                                               : &Binding::template index_call_with_<false, is_var_bind::value>;
-
-			string_for_each_metatable_func for_each_fx;
-			for_each_fx.is_destruction = is_destruction;
-			for_each_fx.is_index = is_index;
-			for_each_fx.is_new_index = is_new_index;
-			for_each_fx.is_static_index = is_static_index;
-			for_each_fx.is_static_new_index = is_static_new_index;
-			for_each_fx.poison_indexing = poison_indexing;
-			for_each_fx.p_key = &s;
-			for_each_fx.p_ics = &ics;
-			if constexpr (is_lua_c_function_v<ValueU>) {
-				for_each_fx.is_unqualified_lua_CFunction = true;
-				for_each_fx.call_func = *static_cast<lua_CFunction*>(ics.binding_data);
-			}
-			else if constexpr (is_lua_reference_or_proxy_v<ValueU>) {
-				for_each_fx.is_unqualified_lua_reference = true;
-				for_each_fx.p_binding_ref = static_cast<reference*>(ics.binding_data);
-			}
-			else {
-				for_each_fx.call_func = &b.template call<false, is_var_bind::value>;
-			}
-			for_each_fx.p_usb = this;
-			for_each_fx.p_derived_usb = derived_this;
-			for_each_fx.idx_call = &usertype_storage<T>::template index_call<false>;
-			for_each_fx.new_idx_call = &usertype_storage<T>::template index_call<true>;
-			for_each_fx.meta_idx_call = &usertype_storage<T>::template meta_index_call<false>;
-			for_each_fx.meta_new_idx_call = &usertype_storage<T>::template meta_index_call<true>;
-			for_each_fx.change_indexing = &usertype_storage_base::change_indexing;
-			// set base index and base new_index
-			// functions here
-			if (is_index) {
-				this->base_index.index = ics.index;
-				this->base_index.binding_data = ics.binding_data;
-			}
-			if (is_new_index) {
-				this->base_index.new_index = ics.new_index;
-				this->base_index.new_binding_data = ics.binding_data;
-			}
-			if (is_static_index) {
-				this->static_base_index.index = ics.index;
-				this->static_base_index.binding_data = ics.binding_data;
-			}
-			if (is_static_new_index) {
-				this->static_base_index.new_index = ics.new_index;
-				this->static_base_index.new_binding_data = ics.binding_data;
-			}
-			this->for_each_table(L, for_each_fx);
-			this->add_entry(s, std::move(ics));
-		}
-		else {
-			// the reference-based implementation might compare poorly and hash
-			// poorly in some cases...
-			if constexpr (is_lua_reference_v<KeyU> && is_lua_reference_v<ValueU>) {
-				if (key.get_type() == type::string) {
-					stack::push(L, key);
-					std::string string_key = stack::pop<std::string>(L);
-					this->set<T>(L, string_key, std::forward<Value>(value));
-				}
-				else {
-					lua_reference_func ref_additions_fx { key, value };
-
-					this->for_each_table(L, ref_additions_fx);
-					this->auxiliary_keys.insert_or_assign(std::forward<Key>(key), std::forward<Value>(value));
-				}
-			}
-			else {
-				reference ref_key = make_reference(L, std::forward<Key>(key));
-				reference ref_value = make_reference(L, std::forward<Value>(value));
-				lua_reference_func ref_additions_fx { key, value };
-
-				this->for_each_table(L, ref_additions_fx);
-				this->auxiliary_keys.insert_or_assign(std::move(ref_key), std::move(ref_value));
-			}
-		}
-	}
-
-	template <typename T>
-	template <typename Key, typename Value>
-	void usertype_storage<T>::set(lua_State* L, Key&& key, Value&& value) {
-		static_cast<usertype_storage_base&>(*this).set<T>(L, std::forward<Key>(key), std::forward<Value>(value));
-	}
-
-	template <typename T>
-	inline usertype_storage<T>& create_usertype_storage(lua_State* L) {
-		const char* gcmetakey = &usertype_traits<T>::gc_table()[0];
-
-		// Make sure userdata's memory is properly in lua first,
-		// otherwise all the light userdata we make later will become invalid
-		int usertype_storage_push_count = stack::push<user<usertype_storage<T>>>(L, no_metatable, L);
-		stack_reference usertype_storage_ref(L, -usertype_storage_push_count);
-
-		// create and push onto the stack a table to use as metatable for this GC
-		// we create a metatable to attach to the regular gc_table
-		// so that the destructor is called for the usertype storage
-		int usertype_storage_metatabe_count = stack::push(L, new_table(0, 1));
-		stack_reference usertype_storage_metatable(L, -usertype_storage_metatabe_count);
-		// set the destruction routine on the metatable
-		stack::set_field(L, meta_function::garbage_collect, &destruct_usertype_storage<T>, usertype_storage_metatable.stack_index());
-		// set the metatable on the usertype storage userdata
-		stack::set_field(L, metatable_key, usertype_storage_metatable, usertype_storage_ref.stack_index());
-		usertype_storage_metatable.pop();
-
-		// set the usertype storage and its metatable
-		// into the global table...
-		stack::set_field<true>(L, gcmetakey, usertype_storage_ref);
-		usertype_storage_ref.pop();
-
-		// then retrieve the lua-stored version so we have a well-pinned
-		// reference that does not die
-		stack::get_field<true>(L, gcmetakey);
-		usertype_storage<T>& target_umt = stack::pop<user<usertype_storage<T>>>(L);
-		return target_umt;
-	}
-
-	inline optional<usertype_storage_base&> maybe_get_usertype_storage_base(lua_State* L, int index) {
-		stack::record tracking;
-		if (!stack::check<user<usertype_storage_base>>(L, index)) {
-			return nullopt;
-		}
-		usertype_storage_base& target_umt = stack::stack_detail::unchecked_unqualified_get<user<usertype_storage_base>>(L, -1, tracking);
-		return target_umt;
-	}
-
-	inline optional<usertype_storage_base&> maybe_get_usertype_storage_base(lua_State* L, const char* gcmetakey) {
-		stack::get_field<true>(L, gcmetakey);
-		auto maybe_storage = maybe_get_usertype_storage_base(L, lua_gettop(L));
-		lua_pop(L, 1);
-		return maybe_storage;
-	}
-
-	inline usertype_storage_base& get_usertype_storage_base(lua_State* L, const char* gcmetakey) {
-		stack::get_field<true>(L, gcmetakey);
-		stack::record tracking;
-		usertype_storage_base& target_umt = stack::stack_detail::unchecked_unqualified_get<user<usertype_storage_base>>(L, -1, tracking);
-		lua_pop(L, 1);
-		return target_umt;
-	}
-
-	template <typename T>
-	inline optional<usertype_storage<T>&> maybe_get_usertype_storage(lua_State* L) {
-		const char* gcmetakey = &usertype_traits<T>::gc_table()[0];
-		stack::get_field<true>(L, gcmetakey);
-		int target = lua_gettop(L);
-		if (!stack::check<user<usertype_storage<T>>>(L, target)) {
-			return nullopt;
-		}
-		usertype_storage<T>& target_umt = stack::pop<user<usertype_storage<T>>>(L);
-		return target_umt;
-	}
-
-	template <typename T>
-	inline usertype_storage<T>& get_usertype_storage(lua_State* L) {
-		const char* gcmetakey = &usertype_traits<T>::gc_table()[0];
-		stack::get_field<true>(L, gcmetakey);
-		usertype_storage<T>& target_umt = stack::pop<user<usertype_storage<T>>>(L);
-		return target_umt;
-	}
-
-	template <typename T>
-	inline void delete_usertype_storage(lua_State* L) {
-		using u_traits = usertype_traits<T>;
-#if 0
-		using u_const_traits = usertype_traits<const T>;
-		using u_unique_traits = usertype_traits<detail::unique_usertype<T>>;
-		using u_ref_traits = usertype_traits<T*>;
-		using u_const_ref_traits = usertype_traits<T const*>;
-#endif
-		using uts = usertype_storage<T>;
-
-		const char* gcmetakey = &u_traits::gc_table()[0];
-		stack::get_field<true>(L, gcmetakey);
-		if (!stack::check<user<uts>>(L)) {
-			lua_pop(L, 1);
-			return;
-		}
-		usertype_storage<T>& target_umt = stack::pop<user<usertype_storage<T>>>(L);
-		target_umt.clear();
-
-		// get the registry
-#if 0
-		stack_reference registry(L, raw_index(LUA_REGISTRYINDEX));
-		registry.push();
-		// eliminate all named entries for this usertype
-		// in the registry (luaL_newmetatable does
-		// [name] = new table
-		// in registry upon creation
-		stack::set_field(L, &u_traits::metatable()[0], lua_nil, registry.stack_index());
-		stack::set_field(L, &u_const_traits::metatable()[0], lua_nil, registry.stack_index());
-		stack::set_field(L, &u_const_ref_traits::metatable()[0], lua_nil, registry.stack_index());
-		stack::set_field(L, &u_ref_traits::metatable()[0], lua_nil, registry.stack_index());
-		stack::set_field(L, &u_unique_traits::metatable()[0], lua_nil, registry.stack_index());
-		registry.pop();
-#endif // Registry Cleanout
-
-		stack::set_field<true>(L, gcmetakey, lua_nil);
-	}
-
-	template <typename T>
-	inline int register_usertype(lua_State* L, automagic_enrollments enrollments = {}) {
-		using u_traits = usertype_traits<T>;
-		using u_const_traits = usertype_traits<const T>;
-		using u_unique_traits = usertype_traits<detail::unique_usertype<T>>;
-		using u_ref_traits = usertype_traits<T*>;
-		using u_const_ref_traits = usertype_traits<T const*>;
-		using uts = usertype_storage<T>;
-
-		// always have __new_index point to usertype_storage method
-		// have __index always point to regular fast-lookup
-		// meta_method table
-		// if __new_index is invoked, runtime-swap
-		// to slow __index if necessary
-		// (no speed penalty because function calls
-		// are all read-only -- only depend on __index
-		// to retrieve function and then call happens VIA Lua)
-
-		// __type entry:
-		// table contains key -> value lookup,
-		// where key is entry in metatable
-		// and value is type information as a string as
-		// best as we can give it
-
-		// name entry:
-		// string that contains raw class name,
-		// as defined from C++
-
-		// is entry:
-		// checks if argument supplied is of type T
-
-		// __storage entry:
-		// a light userdata pointing to the storage
-		// mostly to enable this new abstraction
-		// to not require the type name `T`
-		// to get at the C++ usertype storage within
-
-		// we then let typical definitions potentially override these intrinsics
-		// it's the user's fault if they override things or screw them up:
-		// these names have been reserved and documented since sol3
-
-		// STEP 0: tell the old usertype (if it exists)
-		// to fuck off
-		delete_usertype_storage<T>(L);
-
-		// STEP 1: Create backing store for usertype storage
-		// Pretty much the most important step.
-		// STEP 2: Create Lua tables used for fast method indexing.
-		// This is done inside of the storage table's constructor
-		usertype_storage<T>& storage = create_usertype_storage<T>(L);
-		usertype_storage_base& base_storage = storage;
-		void* light_storage = static_cast<void*>(&storage);
-		void* light_base_storage = static_cast<void*>(&base_storage);
-
-		// STEP 3: set up GC escape hatch table entirely
-		storage.gc_names_table.push();
-		stack_reference gnt(L, -1);
-		stack::set_field(L, submetatable_type::named, &u_traits::gc_table()[0], gnt.stack_index());
-		stack::set_field(L, submetatable_type::const_value, &u_const_traits::metatable()[0], gnt.stack_index());
-		stack::set_field(L, submetatable_type::const_reference, &u_const_ref_traits::metatable()[0], gnt.stack_index());
-		stack::set_field(L, submetatable_type::reference, &u_ref_traits::metatable()[0], gnt.stack_index());
-		stack::set_field(L, submetatable_type::unique, &u_unique_traits::metatable()[0], gnt.stack_index());
-		stack::set_field(L, submetatable_type::value, &u_traits::metatable()[0], gnt.stack_index());
-		gnt.pop();
-
-		// STEP 4: add some useful information to the type table
-		stack_reference stacked_type_table(L, -storage.type_table.push());
-		stack::set_field(L, "name", detail::demangle<T>(), stacked_type_table.stack_index());
-		stack::set_field(L, "is", &detail::is_check<T>, stacked_type_table.stack_index());
-		stacked_type_table.pop();
-
-		// STEP 5: create and hook up metatable,
-		// add intrinsics
-		// this one is the actual meta-handling table,
-		// the next one will be the one for
-		int for_each_backing_metatable_calls = 0;
-		auto for_each_backing_metatable = [&](lua_State* L, submetatable_type smt, reference& fast_index_table) {
-			// Pointer types, AKA "references" from C++
-			const char* metakey = nullptr;
-			switch (smt) {
-			case submetatable_type::const_value:
-				metakey = &u_const_traits::metatable()[0];
-				break;
-			case submetatable_type::reference:
-				metakey = &u_ref_traits::metatable()[0];
-				break;
-			case submetatable_type::unique:
-				metakey = &u_unique_traits::metatable()[0];
-				break;
-			case submetatable_type::const_reference:
-				metakey = &u_const_ref_traits::metatable()[0];
-				break;
-			case submetatable_type::named:
-				metakey = &u_traits::user_metatable()[0];
-				break;
-			case submetatable_type::value:
-			default:
-				metakey = &u_traits::metatable()[0];
-				break;
-			}
-
-			luaL_newmetatable(L, metakey);
-			if (smt == submetatable_type::named) {
-				// the named table itself
-				// gets the associated name value
-				storage.named_metatable = reference(L, -1);
-				lua_pop(L, 1);
-				// but the thing we perform the methods on
-				// is still the metatable of the named
-				// table
-				lua_createtable(L, 0, 6);
-			}
-			stack_reference t(L, -1);
-			fast_index_table = reference(t);
-			stack::set_field<false, true>(L, meta_function::type, storage.type_table, t.stack_index());
-			if constexpr (std::is_destructible_v<T>) {
-				// destructible: serialize default
-				// destructor here
-				switch (smt) {
-				case submetatable_type::const_reference:
-				case submetatable_type::reference:
-				case submetatable_type::named:
-					break;
-				case submetatable_type::unique:
-					stack::set_field<false, true>(L, meta_function::garbage_collect, &detail::unique_destruct<T>, t.stack_index());
-					break;
-				case submetatable_type::value:
-				case submetatable_type::const_value:
-				default:
-					stack::set_field<false, true>(L, meta_function::garbage_collect, detail::make_destructor<T>(), t.stack_index());
-					break;
-				}
-			}
-			else {
-				// not destructible: serialize a
-				// "hey you messed up"
-				// destructor
-				switch (smt) {
-				case submetatable_type::const_reference:
-				case submetatable_type::reference:
-				case submetatable_type::named:
-					break;
-				case submetatable_type::unique:
-					stack::set_field<false, true>(L, meta_function::garbage_collect, &detail::cannot_destruct<T>, t.stack_index());
-					break;
-				case submetatable_type::value:
-				case submetatable_type::const_value:
-				default:
-					stack::set_field<false, true>(L, meta_function::garbage_collect, &detail::cannot_destruct<T>, t.stack_index());
-					break;
-				}
-			}
-
-			static_assert(sizeof(void*) <= sizeof(detail::inheritance_check_function),
-				"The size of this data pointer is too small to fit the inheritance checking function: file a bug "
-				"report.");
-			static_assert(sizeof(void*) <= sizeof(detail::inheritance_cast_function),
-				"The size of this data pointer is too small to fit the inheritance checking function: file a bug "
-				"report.");
-			stack::set_field<false, true>(L, detail::base_class_check_key(), reinterpret_cast<void*>(&detail::inheritance<T>::type_check), t.stack_index());
-			stack::set_field<false, true>(L, detail::base_class_cast_key(), reinterpret_cast<void*>(&detail::inheritance<T>::type_cast), t.stack_index());
-
-			auto prop_fx = detail::properties_enrollment_allowed(for_each_backing_metatable_calls, storage.properties, enrollments);
-			auto insert_fx = [&L, &t, &storage](meta_function mf, lua_CFunction reg) {
-				stack::set_field<false, true>(L, mf, reg, t.stack_index());
-				storage.properties[static_cast<int>(mf)] = true;
-			};
-			detail::insert_default_registrations<T>(insert_fx, prop_fx);
-
-			// There are no variables, so serialize the fast function stuff
-			// be sure to reset the index stuff to the non-fast version
-			// if the user ever adds something later!
-			if (smt == submetatable_type::named) {
-				// add escape hatch storage pointer and gc names
-				stack::set_field<false, true>(L, meta_function::storage, light_base_storage, t.stack_index());
-				stack::set_field<false, true>(L, meta_function::gc_names, storage.gc_names_table, t.stack_index());
-
-				// fancy new_indexing when using the named table
-				{
-					absolute_index named_metatable_index(L, -storage.named_metatable.push());
-					stack::set_field<false, true>(L, metatable_key, t, named_metatable_index);
-					storage.named_metatable.pop();
-				}
-				stack_reference stack_metametatable(L, -storage.named_index_table.push());
-				stack::set_field<false, true>(L,
-					meta_function::index,
-					make_closure(uts::template meta_index_call<false>, nullptr, light_storage, light_base_storage, nullptr, toplevel_magic),
-					stack_metametatable.stack_index());
-				stack::set_field<false, true>(L,
-					meta_function::new_index,
-					make_closure(uts::template meta_index_call<true>, nullptr, light_storage, light_base_storage, nullptr, toplevel_magic),
-					stack_metametatable.stack_index());
-				stack_metametatable.pop();
-			}
-			else {
-				// otherwise just plain for index,
-				// and elaborated for new_index
-				stack::set_field<false, true>(L, meta_function::index, t, t.stack_index());
-				stack::set_field<false, true>(L,
-					meta_function::new_index,
-					make_closure(uts::template index_call<true>, nullptr, light_storage, light_base_storage, nullptr, toplevel_magic),
-					t.stack_index());
-				storage.is_using_new_index = true;
-			}
-
-			++for_each_backing_metatable_calls;
-			fast_index_table = reference(L, t);
-			t.pop();
-		};
-
-		storage.for_each_table(L, for_each_backing_metatable);
-
-		// can only use set AFTER we initialize all the metatables
-		if constexpr (std::is_default_constructible_v<T>) {
-			if (enrollments.default_constructor) {
-				storage.set(L, meta_function::construct, constructors<T()>());
-			}
-		}
-
-		// return the named metatable we want names linked into
-		storage.named_metatable.push();
-		return 1;
-	}
-}} // namespace sol::u_detail
-
-// end of sol/usertype_storage.hpp
-
-// beginning of sol/usertype_proxy.hpp
-
-namespace sol {
-	template <typename Table, typename Key>
-	struct usertype_proxy : public proxy_base<usertype_proxy<Table, Key>> {
-	private:
-		using key_type = detail::proxy_key_t<Key>;
-
-		template <typename T, std::size_t... I>
-		decltype(auto) tuple_get(std::index_sequence<I...>) const & {
-			return tbl.template traverse_get<T>(std::get<I>(key)...);
-		}
-
-		template <typename T, std::size_t... I>
-		decltype(auto) tuple_get(std::index_sequence<I...>) && {
-			return tbl.template traverse_get<T>(std::get<I>(std::move(key))...);
-		}
-
-		template <std::size_t... I, typename T>
-		void tuple_set(std::index_sequence<I...>, T&& value) & {
-			if constexpr (sizeof...(I) > 1) {
-				tbl.traverse_set(std::get<I>(key)..., std::forward<T>(value));
-			}
-			else {
-				tbl.set(std::get<I>(key)..., std::forward<T>(value));
-			}
-		}
-
-		template <std::size_t... I, typename T>
-		void tuple_set(std::index_sequence<I...>, T&& value) && {
-			if constexpr (sizeof...(I) > 1) {
-				tbl.traverse_set(std::get<I>(std::move(key))..., std::forward<T>(value));
-			}
-			else {
-				tbl.set(std::get<I>(std::move(key))..., std::forward<T>(value));
-			}
-		}
-
-	public:
-		Table tbl;
-		key_type key;
-
-		template <typename T>
-		usertype_proxy(Table table, T&& k)
-		: tbl(table), key(std::forward<T>(k)) {
-		}
-
-		template <typename T>
-		usertype_proxy& set(T&& item) & {
-			using idx_seq = std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>;
-			tuple_set(idx_seq(), std::forward<T>(item));
-			return *this;
-		}
-
-		template <typename T>
-		usertype_proxy&& set(T&& item) && {
-			using idx_seq = std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>;
-			std::move(*this).tuple_set(idx_seq(), std::forward<T>(item));
-			return std::move(*this);
-		}
-
-		template <typename T>
-		usertype_proxy& operator=(T&& other) & {
-			return set(std::forward<T>(other));
-		}
-
-		template <typename T>
-		usertype_proxy&& operator=(T&& other) && {
-			return std::move(*this).set(std::forward<T>(other));
-		}
-
-		template <typename T>
-		usertype_proxy& operator=(std::initializer_list<T> other) & {
-			return set(std::move(other));
-		}
-
-		template <typename T>
-		usertype_proxy&& operator=(std::initializer_list<T> other) && {
-			return std::move(*this).set(std::move(other));
-		}
-
-		template <typename T>
-		decltype(auto) get() const& {
-			using idx_seq = std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>;
-			return tuple_get<T>(idx_seq());
-		}
-
-		template <typename T>
-		decltype(auto) get() && {
-			using idx_seq = std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>;
-			return std::move(*this).template tuple_get<T>(idx_seq());
-		}
-
-		template <typename K>
-		decltype(auto) operator[](K&& k) const& {
-			auto keys = meta::tuplefy(key, std::forward<K>(k));
-			return usertype_proxy<Table, decltype(keys)>(tbl, std::move(keys));
-		}
-
-		template <typename K>
-		decltype(auto) operator[](K&& k) & {
-			auto keys = meta::tuplefy(key, std::forward<K>(k));
-			return usertype_proxy<Table, decltype(keys)>(tbl, std::move(keys));
-		}
-
-		template <typename K>
-		decltype(auto) operator[](K&& k) && {
-			auto keys = meta::tuplefy(std::move(key), std::forward<K>(k));
-			return usertype_proxy<Table, decltype(keys)>(tbl, std::move(keys));
-		}
-
-		template <typename... Ret, typename... Args>
-		decltype(auto) call(Args&&... args) {
-#if !defined(__clang__) && defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 191200000
-			// MSVC is ass sometimes
-			return get<function>().call<Ret...>(std::forward<Args>(args)...);
-#else
-			return get<function>().template call<Ret...>(std::forward<Args>(args)...);
-#endif
-		}
-
-		template <typename... Args>
-		decltype(auto) operator()(Args&&... args) {
-			return call<>(std::forward<Args>(args)...);
-		}
-
-		bool valid() const {
-			auto pp = stack::push_pop(tbl);
-			auto p = stack::probe_get_field<std::is_same<meta::unqualified_t<Table>, global_table>::value>(lua_state(), key, lua_gettop(lua_state()));
-			lua_pop(lua_state(), p.levels);
-			return p;
-		}
-
-		int push() const noexcept {
-			return push(this->lua_state());
-		}
-
-		int push(lua_State* L) const noexcept {
-			return get<reference>().push(L);
-		}
-
-		type get_type() const {
-			type t = type::none;
-			auto pp = stack::push_pop(tbl);
-			auto p = stack::probe_get_field<std::is_same<meta::unqualified_t<Table>, global_table>::value>(lua_state(), key, lua_gettop(lua_state()));
-			if (p) {
-				t = type_of(lua_state(), -1);
-			}
-			lua_pop(lua_state(), p.levels);
-			return t;
-		}
-
-		lua_State* lua_state() const {
-			return tbl.lua_state();
-		}
-	};
-} // namespace sol
-
-// end of sol/usertype_proxy.hpp
-
-// beginning of sol/metatable.hpp
-
-// beginning of sol/table_core.hpp
-
-// beginning of sol/table_proxy.hpp
-
-namespace sol {
-
-	template <typename Table, typename Key>
-	struct table_proxy : public proxy_base<table_proxy<Table, Key>> {
-	private:
-		using key_type = detail::proxy_key_t<Key>;
-
-		template <typename T, std::size_t... I>
-		decltype(auto) tuple_get(std::index_sequence<I...>) const& {
-			return tbl.template traverse_get<T>(std::get<I>(key)...);
-		}
-
-		template <typename T, std::size_t... I>
-		decltype(auto) tuple_get(std::index_sequence<I...>) && {
-			return tbl.template traverse_get<T>(std::get<I>(std::move(key))...);
-		}
-
-		template <std::size_t... I, typename T>
-		void tuple_set(std::index_sequence<I...>, T&& value) & {
-			tbl.traverse_set(std::get<I>(key)..., std::forward<T>(value));
-		}
-
-		template <std::size_t... I, typename T>
-		void tuple_set(std::index_sequence<I...>, T&& value) && {
-			tbl.traverse_set(std::get<I>(std::move(key))..., std::forward<T>(value));
-		}
-
-		auto setup_table(std::true_type) {
-			auto p = stack::probe_get_field<std::is_same_v<meta::unqualified_t<Table>, global_table>>(lua_state(), key, tbl.stack_index());
-			lua_pop(lua_state(), p.levels);
-			return p;
-		}
-
-		bool is_valid(std::false_type) {
-			auto pp = stack::push_pop(tbl);
-			auto p = stack::probe_get_field<std::is_same_v<meta::unqualified_t<Table>, global_table>>(lua_state(), key, lua_gettop(lua_state()));
-			lua_pop(lua_state(), p.levels);
-			return p;
-		}
-
-	public:
-		Table tbl;
-		key_type key;
-
-		template <typename T>
-		table_proxy(Table table, T&& k) : tbl(table), key(std::forward<T>(k)) {
-		}
-
-		template <typename T>
-		table_proxy& set(T&& item) & {
-			tuple_set(std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>(), std::forward<T>(item));
-			return *this;
-		}
-
-		template <typename T>
-		table_proxy&& set(T&& item) && {
-			tuple_set(std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>(), std::forward<T>(item));
-			return std::move(*this);
-		}
-
-		template <typename... Args>
-		table_proxy& set_function(Args&&... args) & {
-			tbl.set_function(key, std::forward<Args>(args)...);
-			return *this;
-		}
-
-		template <typename... Args>
-		table_proxy&& set_function(Args&&... args) && {
-			tbl.set_function(std::move(key), std::forward<Args>(args)...);
-			return std::move(*this);
-		}
-
-		template <typename T>
-		table_proxy& operator=(T&& other) & {
-			using Tu = meta::unwrap_unqualified_t<T>;
-			if constexpr (!is_lua_reference_or_proxy_v<Tu> && meta::is_callable_v<Tu>) {
-				return set_function(std::forward<T>(other));
-			}
-			else {
-				return set(std::forward<T>(other));
-			}
-		}
-
-		template <typename T>
-		table_proxy&& operator=(T&& other) && {
-			using Tu = meta::unwrap_unqualified_t<T>;
-			if constexpr (!is_lua_reference_or_proxy_v<Tu> && meta::is_callable_v<Tu>) {
-				return std::move(*this).set_function(std::forward<T>(other));
-			}
-			else {
-				return std::move(*this).set(std::forward<T>(other));
-			}
-		}
-
-		template <typename T>
-		table_proxy& operator=(std::initializer_list<T> other) & {
-			return set(std::move(other));
-		}
-
-		template <typename T>
-		table_proxy&& operator=(std::initializer_list<T> other) && {
-			return std::move(*this).set(std::move(other));
-		}
-
-		template <typename T>
-		decltype(auto) get() const& {
-			using idx_seq = std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>;
-			return tuple_get<T>(idx_seq());
-		}
-
-		template <typename T>
-		decltype(auto) get() && {
-			using idx_seq = std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>;
-			return std::move(*this).template tuple_get<T>(idx_seq());
-		}
-
-		template <typename T>
-		decltype(auto) get_or(T&& otherwise) const {
-			typedef decltype(get<T>()) U;
-			optional<U> option = get<optional<U>>();
-			if (option) {
-				return static_cast<U>(option.value());
-			}
-			return static_cast<U>(std::forward<T>(otherwise));
-		}
-
-		template <typename T, typename D>
-		decltype(auto) get_or(D&& otherwise) const {
-			optional<T> option = get<optional<T>>();
-			if (option) {
-				return static_cast<T>(option.value());
-			}
-			return static_cast<T>(std::forward<D>(otherwise));
-		}
-
-		template <typename T>
-		decltype(auto) get_or_create() {
-			return get_or_create<T>(new_table());
-		}
-
-		template <typename T, typename Otherwise>
-		decltype(auto) get_or_create(Otherwise&& other) {
-			if (!this->valid()) {
-				this->set(std::forward<Otherwise>(other));
-			}
-			return get<T>();
-		}
-
-		template <typename K>
-		decltype(auto) operator[](K&& k) const& {
-			auto keys = meta::tuplefy(key, std::forward<K>(k));
-			return table_proxy<Table, decltype(keys)>(tbl, std::move(keys));
-		}
-
-		template <typename K>
-		decltype(auto) operator[](K&& k) & {
-			auto keys = meta::tuplefy(key, std::forward<K>(k));
-			return table_proxy<Table, decltype(keys)>(tbl, std::move(keys));
-		}
-
-		template <typename K>
-		decltype(auto) operator[](K&& k) && {
-			auto keys = meta::tuplefy(std::move(key), std::forward<K>(k));
-			return table_proxy<Table, decltype(keys)>(tbl, std::move(keys));
-		}
-
-		template <typename... Ret, typename... Args>
-		decltype(auto) call(Args&&... args) {
-			lua_State* L = this->lua_state();
-			push(L);
-			int idx = lua_gettop(L);
-			stack_aligned_function func(L, idx);
-			return func.call<Ret...>(std::forward<Args>(args)...);
-		}
-
-		template <typename... Args>
-		decltype(auto) operator()(Args&&... args) {
-			return call<>(std::forward<Args>(args)...);
-		}
-
-		bool valid() const {
-			auto pp = stack::push_pop(tbl);
-			auto p = stack::probe_get_field<std::is_same<meta::unqualified_t<Table>, global_table>::value>(lua_state(), key, lua_gettop(lua_state()));
-			lua_pop(lua_state(), p.levels);
-			return p;
-		}
-
-		int push() const noexcept {
-			return push(this->lua_state());
-		}
-
-		int push(lua_State* L) const noexcept {
-			if constexpr (std::is_same_v<meta::unqualified_t<Table>, global_table> || is_stack_table_v<meta::unqualified_t<Table>>) {
-				auto pp = stack::push_pop<true>(tbl);
-				int tableindex = pp.index_of(tbl);
-				int top_index = lua_gettop(L);
-				stack::get_field<true>(lua_state(), key, tableindex);
-				lua_replace(L, top_index + 1);
-				lua_settop(L, top_index + 1);
-			}
-			else {
-				auto pp = stack::push_pop<false>(tbl);
-				int tableindex = pp.index_of(tbl);
-				int aftertableindex = lua_gettop(L);
-				stack::get_field<false>(lua_state(), key, tableindex);
-				lua_replace(L, tableindex);
-				lua_settop(L, aftertableindex + 1);
-			}
-			return 1;
-		}
-
-		type get_type() const {
-			type t = type::none;
-			auto pp = stack::push_pop(tbl);
-			auto p = stack::probe_get_field<std::is_same<meta::unqualified_t<Table>, global_table>::value>(lua_state(), key, lua_gettop(lua_state()));
-			if (p) {
-				t = type_of(lua_state(), -1);
-			}
-			lua_pop(lua_state(), p.levels);
-			return t;
-		}
-
-		lua_State* lua_state() const {
-			return tbl.lua_state();
-		}
-
-		table_proxy& force() {
-			if (!this->valid()) {
-				this->set(new_table());
-			}
-			return *this;
-		}
-	};
-
-	template <typename Table, typename Key, typename T>
-	inline bool operator==(T&& left, const table_proxy<Table, Key>& right) {
-		using G = decltype(stack::get<T>(nullptr, 0));
-		return right.template get<optional<G>>() == left;
-	}
-
-	template <typename Table, typename Key, typename T>
-	inline bool operator==(const table_proxy<Table, Key>& right, T&& left) {
-		using G = decltype(stack::get<T>(nullptr, 0));
-		return right.template get<optional<G>>() == left;
-	}
-
-	template <typename Table, typename Key, typename T>
-	inline bool operator!=(T&& left, const table_proxy<Table, Key>& right) {
-		using G = decltype(stack::get<T>(nullptr, 0));
-		return right.template get<optional<G>>() != left;
-	}
-
-	template <typename Table, typename Key, typename T>
-	inline bool operator!=(const table_proxy<Table, Key>& right, T&& left) {
-		using G = decltype(stack::get<T>(nullptr, 0));
-		return right.template get<optional<G>>() != left;
-	}
-
-	template <typename Table, typename Key>
-	inline bool operator==(lua_nil_t, const table_proxy<Table, Key>& right) {
-		return !right.valid();
-	}
-
-	template <typename Table, typename Key>
-	inline bool operator==(const table_proxy<Table, Key>& right, lua_nil_t) {
-		return !right.valid();
-	}
-
-	template <typename Table, typename Key>
-	inline bool operator!=(lua_nil_t, const table_proxy<Table, Key>& right) {
-		return right.valid();
-	}
-
-	template <typename Table, typename Key>
-	inline bool operator!=(const table_proxy<Table, Key>& right, lua_nil_t) {
-		return right.valid();
-	}
-
-	template <bool b>
-	template <typename Super>
-	basic_reference<b>& basic_reference<b>::operator=(proxy_base<Super>&& r) {
-		basic_reference<b> v = r;
-		this->operator=(std::move(v));
-		return *this;
-	}
-
-	template <bool b>
-	template <typename Super>
-	basic_reference<b>& basic_reference<b>::operator=(const proxy_base<Super>& r) {
-		basic_reference<b> v = r;
-		this->operator=(std::move(v));
-		return *this;
-	}
-
-	namespace stack {
-		template <typename Table, typename Key>
-		struct unqualified_pusher<table_proxy<Table, Key>> {
-			static int push(lua_State* L, const table_proxy<Table, Key>& p) {
-				return p.push(L);
-			}
-		};
-	} // namespace stack
-} // namespace sol
-
-// end of sol/table_proxy.hpp
-
-// beginning of sol/table_iterator.hpp
-
-#include <iterator>
-
-namespace sol {
-
-	template <typename reference_type>
-	class basic_table_iterator {
-	public:
-		typedef object key_type;
-		typedef object mapped_type;
-		typedef std::pair<object, object> value_type;
-		typedef std::input_iterator_tag iterator_category;
-		typedef std::ptrdiff_t difference_type;
-		typedef value_type* pointer;
-		typedef value_type& reference;
-		typedef const value_type& const_reference;
-
-	private:
-		std::pair<object, object> kvp;
-		reference_type ref;
-		int tableidx = 0;
-		int keyidx = 0;
-		std::ptrdiff_t idx = 0;
-
-	public:
-		basic_table_iterator() : keyidx(-1), idx(-1) {
-		}
-
-		basic_table_iterator(reference_type x) : ref(std::move(x)) {
-			ref.push();
-			tableidx = lua_gettop(ref.lua_state());
-			stack::push(ref.lua_state(), lua_nil);
-			this->operator++();
-			if (idx == -1) {
-				return;
-			}
-			--idx;
-		}
-
-		basic_table_iterator& operator++() {
-			if (idx == -1)
-				return *this;
-
-			if (lua_next(ref.lua_state(), tableidx) == 0) {
-				idx = -1;
-				keyidx = -1;
-				return *this;
-			}
-			++idx;
-			kvp.first = object(ref.lua_state(), -2);
-			kvp.second = object(ref.lua_state(), -1);
-			lua_pop(ref.lua_state(), 1);
-			// leave key on the stack
-			keyidx = lua_gettop(ref.lua_state());
-			return *this;
-		}
-
-		basic_table_iterator operator++(int) {
-			auto saved = *this;
-			this->operator++();
-			return saved;
-		}
-
-		reference operator*() {
-			return kvp;
-		}
-
-		const_reference operator*() const {
-			return kvp;
-		}
-
-		bool operator==(const basic_table_iterator& right) const {
-			return idx == right.idx;
-		}
-
-		bool operator!=(const basic_table_iterator& right) const {
-			return idx != right.idx;
-		}
-
-		~basic_table_iterator() {
-			if (keyidx != -1) {
-				stack::remove(ref.lua_state(), keyidx, 1);
-			}
-			if (ref.lua_state() != nullptr && ref.valid()) {
-				stack::remove(ref.lua_state(), tableidx, 1);
-			}
-		}
-	};
-
-} // namespace sol
-
-// end of sol/table_iterator.hpp
-
-namespace sol {
-	namespace detail {
-		template <std::size_t n>
-		struct clean {
-			lua_State* L;
-			clean(lua_State* luastate) : L(luastate) {
-			}
-			~clean() {
-				lua_pop(L, static_cast<int>(n));
-			}
-		};
-
-		struct ref_clean {
-			lua_State* L;
-			int& n;
-			ref_clean(lua_State* luastate, int& n) : L(luastate), n(n) {
-			}
-			~ref_clean() {
-				lua_pop(L, static_cast<int>(n));
-			}
-		};
-
-		inline int fail_on_newindex(lua_State* L) {
-			return luaL_error(L, "sol: cannot modify the elements of an enumeration table");
-		}
-
-	} // namespace detail
-
-	template <bool top_level, typename ref_t>
-	class basic_table_core : public basic_object<ref_t> {
-	private:
-		using base_t = basic_object<ref_t>;
-
-		friend class state;
-		friend class state_view;
-		template <typename, typename>
-		friend class basic_usertype;
-		template <typename>
-		friend class basic_metatable;
-
-		template <bool raw, typename... Ret, typename... Keys>
-		decltype(auto) tuple_get(int table_index, Keys&&... keys) const {
-			if constexpr (sizeof...(Ret) < 2) {
-				return traverse_get_single_maybe_tuple<raw, Ret...>(table_index, std::forward<Keys>(keys)...);
-			}
-			else {
-				using multi_ret = decltype(stack::pop<std::tuple<Ret...>>(nullptr));
-				return multi_ret(traverse_get_single_maybe_tuple<raw, Ret>(table_index, std::forward<Keys>(keys))...);
-			}
-		}
-
-		template <bool raw, typename Ret, size_t... I, typename Key>
-		decltype(auto) traverse_get_single_tuple(int table_index, std::index_sequence<I...>, Key&& key) const {
-			return traverse_get_single<raw, Ret>(table_index, std::get<I>(std::forward<Key>(key))...);
-		}
-
-		template <bool raw, typename Ret, typename Key>
-		decltype(auto) traverse_get_single_maybe_tuple(int table_index, Key&& key) const {
-			if constexpr (meta::is_tuple_v<meta::unqualified_t<Key>>) {
-				return traverse_get_single_tuple<raw, Ret>(
-				     table_index, std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<Key>>>(), std::forward<Key>(key));
-			}
-			else {
-				return traverse_get_single<raw, Ret>(table_index, std::forward<Key>(key));
-			}
-		}
-
-		template <bool raw, typename Ret, typename... Keys>
-		decltype(auto) traverse_get_single(int table_index, Keys&&... keys) const {
-			constexpr static bool global = top_level && (meta::count_for_to_pack_v<1, meta::is_c_str, meta::unqualified_t<Keys>...> > 0);
-			if constexpr (meta::is_optional_v<meta::unqualified_t<Ret>>) {
-				int popcount = 0;
-				detail::ref_clean c(base_t::lua_state(), popcount);
-				return traverse_get_deep_optional<global, raw, detail::insert_mode::none, Ret>(popcount, table_index, std::forward<Keys>(keys)...);
-			}
-			else {
-				detail::clean<sizeof...(Keys) - meta::count_for_pack_v<detail::is_insert_mode, meta::unqualified_t<Keys>...>> c(base_t::lua_state());
-				return traverse_get_deep<global, raw, detail::insert_mode::none, Ret>(table_index, std::forward<Keys>(keys)...);
-			}
-		}
-
-		template <bool raw, typename Pairs, std::size_t... I>
-		void tuple_set(std::index_sequence<I...>, Pairs&& pairs) {
-			constexpr static bool global = top_level
-			     && (meta::count_even_for_pack_v<meta::is_c_str, meta::unqualified_t<decltype(std::get<I * 2>(std::forward<Pairs>(pairs)))>...> > 0);
-			auto pp = stack::push_pop<global>(*this);
-			int table_index = pp.index_of(*this);
-			lua_State* L = base_t::lua_state();
-			(void)table_index;
-			(void)L;
-			void(detail::swallow { (stack::set_field<(top_level), raw>(
-			                             L, std::get<I * 2>(std::forward<Pairs>(pairs)), std::get<I * 2 + 1>(std::forward<Pairs>(pairs)), table_index),
-			     0)... });
-		}
-
-		template <bool global, bool raw, detail::insert_mode mode, typename T, typename Key, typename... Keys>
-		decltype(auto) traverse_get_deep(int table_index, Key&& key, Keys&&... keys) const {
-			if constexpr (std::is_same_v<meta::unqualified_t<Key>, create_if_nil_t>) {
-				(void)key;
-				return traverse_get_deep<false, raw, static_cast<detail::insert_mode>(mode | detail::insert_mode::create_if_nil), T>(
-				     table_index, std::forward<Keys>(keys)...);
-			}
-			else {
-				lua_State* L = base_t::lua_state();
-				stack::get_field<global, raw>(L, std::forward<Key>(key), table_index);
-				if constexpr (sizeof...(Keys) > 0) {
-					if constexpr ((mode & detail::insert_mode::create_if_nil) == detail::insert_mode::create_if_nil) {
-						type t = type_of(L, -1);
-						if (t == type::lua_nil || t == type::none) {
-							lua_pop(L, 1);
-							stack::push(L, new_table(0, 0));
-						}
-					}
-					return traverse_get_deep<false, raw, mode, T>(lua_gettop(L), std::forward<Keys>(keys)...);
-				}
-				else {
-					if constexpr ((mode & detail::insert_mode::create_if_nil) == detail::insert_mode::create_if_nil) {
-						type t = type_of(L, -1);
-						if ((t == type::lua_nil || t == type::none) && (is_table_like_v<T>)) {
-							lua_pop(L, 1);
-							stack::push(L, new_table(0, 0));
-						}
-					}
-					return stack::get<T>(L);
-				}
-			}
-		}
-
-		template <bool global, bool raw, detail::insert_mode mode, typename T, typename Key, typename... Keys>
-		decltype(auto) traverse_get_deep_optional(int& popcount, int table_index, Key&& key, Keys&&... keys) const {
-			if constexpr (std::is_same_v<meta::unqualified_t<Key>, create_if_nil_t>) {
-				constexpr detail::insert_mode new_mode = static_cast<detail::insert_mode>(mode | detail::insert_mode::create_if_nil);
-				(void)key;
-				return traverse_get_deep_optional<global, raw, new_mode, T>(popcount, table_index, std::forward<Keys>(keys)...);
-			}
-			else if constexpr (std::is_same_v<meta::unqualified_t<Key>, update_if_empty_t>) {
-				constexpr detail::insert_mode new_mode = static_cast<detail::insert_mode>(mode | detail::insert_mode::update_if_empty);
-				(void)key;
-				return traverse_get_deep_optional<global, raw, new_mode, T>(popcount, table_index, std::forward<Keys>(keys)...);
-			}
-			else if constexpr (std::is_same_v<meta::unqualified_t<Key>, override_value_t>) {
-				constexpr detail::insert_mode new_mode = static_cast<detail::insert_mode>(mode | detail::insert_mode::override_value);
-				(void)key;
-				return traverse_get_deep_optional<global, raw, new_mode, T>(popcount, table_index, std::forward<Keys>(keys)...);
-			}
-			else {
-				if constexpr (sizeof...(Keys) > 0) {
-					lua_State* L = base_t::lua_state();
-					auto p = stack::probe_get_field<global, raw>(L, std::forward<Key>(key), table_index);
-					popcount += p.levels;
-					if (!p.success) {
-						if constexpr ((mode & detail::insert_mode::create_if_nil) == detail::insert_mode::create_if_nil) {
-							lua_pop(L, 1);
-							constexpr bool is_seq = meta::count_for_to_pack_v<1, std::is_integral, Keys...> > 0;
-							stack::push(L, new_table(static_cast<int>(is_seq), static_cast<int>(!is_seq)));
-							stack::set_field<global, raw>(L, std::forward<Key>(key), stack_reference(L, -1), table_index);
-						}
-						else {
-							return T(nullopt);
-						}
-					}
-					return traverse_get_deep_optional<false, raw, mode, T>(popcount, lua_gettop(L), std::forward<Keys>(keys)...);
-				}
-				else {
-					using R = decltype(stack::get<T>(nullptr));
-					using value_type = typename meta::unqualified_t<R>::value_type;
-					lua_State* L = base_t::lua_state();
-					auto p = stack::probe_get_field<global, raw, value_type>(L, key, table_index);
-					popcount += p.levels;
-					if (!p.success) {
-						if constexpr ((mode & detail::insert_mode::create_if_nil) == detail::insert_mode::create_if_nil) {
-							lua_pop(L, 1);
-							stack::push(L, new_table(0, 0));
-							stack::set_field<global, raw>(L, std::forward<Key>(key), stack_reference(L, -1), table_index);
-							if (stack::check<value_type>(L, lua_gettop(L), no_panic)) {
-								return stack::get<T>(L);
-							}
-						}
-						return R(nullopt);
-					}
-					return stack::get<T>(L);
-				}
-			}
-		}
-
-		template <bool global, bool raw, detail::insert_mode mode, typename Key, typename... Keys>
-		void traverse_set_deep(int table_index, Key&& key, Keys&&... keys) const {
-			using KeyU = meta::unqualified_t<Key>;
-			if constexpr (std::is_same_v<KeyU, update_if_empty_t>) {
-				(void)key;
-				traverse_set_deep<global, raw, static_cast<detail::insert_mode>(mode | detail::insert_mode::update_if_empty)>(
-				     table_index, std::forward<Keys>(keys)...);
-			}
-			else if constexpr (std::is_same_v<KeyU, create_if_nil_t>) {
-				(void)key;
-				traverse_set_deep<global, raw, static_cast<detail::insert_mode>(mode | detail::insert_mode::create_if_nil)>(
-				     table_index, std::forward<Keys>(keys)...);
-			}
-			else if constexpr (std::is_same_v<KeyU, override_value_t>) {
-				(void)key;
-				traverse_set_deep<global, raw, static_cast<detail::insert_mode>(mode | detail::insert_mode::override_value)>(
-				     table_index, std::forward<Keys>(keys)...);
-			}
-			else {
-				lua_State* L = base_t::lua_state();
-				if constexpr (sizeof...(Keys) == 1) {
-					if constexpr ((mode & detail::insert_mode::update_if_empty) == detail::insert_mode::update_if_empty) {
-						auto p = stack::probe_get_field<global, raw>(L, key, table_index);
-						lua_pop(L, p.levels);
-						if (!p.success) {
-							stack::set_field<global, raw>(L, std::forward<Key>(key), std::forward<Keys>(keys)..., table_index);
-						}
-					}
-					else {
-						stack::set_field<global, raw>(L, std::forward<Key>(key), std::forward<Keys>(keys)..., table_index);
-					}
-				}
-				else {
-					if constexpr (mode != detail::insert_mode::none) {
-						stack::get_field<global, raw>(L, key, table_index);
-						type vt = type_of(L, -1);
-						if constexpr ((mode & detail::insert_mode::update_if_empty) == detail::insert_mode::update_if_empty
-						     || (mode & detail::insert_mode::create_if_nil) == detail::insert_mode::create_if_nil) {
-							if (vt == type::lua_nil || vt == type::none) {
-								constexpr bool is_seq = meta::count_for_to_pack_v<1, std::is_integral, Keys...> > 0;
-								lua_pop(L, 1);
-								stack::push(L, new_table(static_cast<int>(is_seq), static_cast<int>(!is_seq)));
-								stack::set_field<global, raw>(L, std::forward<Key>(key), stack_reference(L, -1), table_index);
-							}
-						}
-						else {
-							if (vt != type::table) {
-								constexpr bool is_seq = meta::count_for_to_pack_v<1, std::is_integral, Keys...> > 0;
-								lua_pop(L, 1);
-								stack::push(L, new_table(static_cast<int>(is_seq), static_cast<int>(!is_seq)));
-								stack::set_field<global, raw>(L, std::forward<Key>(key), stack_reference(L, -1), table_index);
-							}
-						}
-					}
-					else {
-						stack::get_field<global, raw>(L, std::forward<Key>(key), table_index);
-					}
-					traverse_set_deep<false, raw, mode>(lua_gettop(L), std::forward<Keys>(keys)...);
-				}
-			}
-		}
-
-		basic_table_core(lua_State* L, detail::global_tag t) noexcept : base_t(L, t) {
-		}
-
-	protected:
-		basic_table_core(detail::no_safety_tag, lua_nil_t n) : base_t(n) {
-		}
-		basic_table_core(detail::no_safety_tag, lua_State* L, int index) : base_t(L, index) {
-		}
-		basic_table_core(detail::no_safety_tag, lua_State* L, ref_index index) : base_t(L, index) {
-		}
-		template <typename T,
-		     meta::enable<meta::neg<meta::any_same<meta::unqualified_t<T>, basic_table_core>>, meta::neg<std::is_same<ref_t, stack_reference>>,
-		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
-		basic_table_core(detail::no_safety_tag, T&& r) noexcept : base_t(std::forward<T>(r)) {
-		}
-		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
-		basic_table_core(detail::no_safety_tag, lua_State* L, T&& r) noexcept : base_t(L, std::forward<T>(r)) {
-		}
-
-	public:
-		using iterator = basic_table_iterator<ref_t>;
-		using const_iterator = iterator;
-
-		using base_t::lua_state;
-
-		basic_table_core() noexcept = default;
-		basic_table_core(const basic_table_core&) = default;
-		basic_table_core(basic_table_core&&) = default;
-		basic_table_core& operator=(const basic_table_core&) = default;
-		basic_table_core& operator=(basic_table_core&&) = default;
-		basic_table_core(const stack_reference& r) : basic_table_core(r.lua_state(), r.stack_index()) {
-		}
-		basic_table_core(stack_reference&& r) : basic_table_core(r.lua_state(), r.stack_index()) {
-		}
-		template <typename T, meta::enable_any<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
-		basic_table_core(lua_State* L, T&& r) : base_t(L, std::forward<T>(r)) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			auto pp = stack::push_pop(*this);
-			int table_index = pp.index_of(*this);
-			constructor_handler handler {};
-			stack::check<basic_table_core>(lua_state(), table_index, handler);
-#endif // Safety
-		}
-		basic_table_core(lua_State* L, const new_table& nt) : base_t(L, -stack::push(L, nt)) {
-			if (!is_stack_based<meta::unqualified_t<ref_t>>::value) {
-				lua_pop(L, 1);
-			}
-		}
-		basic_table_core(lua_State* L, int index = -1) : basic_table_core(detail::no_safety, L, index) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			constructor_handler handler {};
-			stack::check<basic_table_core>(L, index, handler);
-#endif // Safety
-		}
-		basic_table_core(lua_State* L, ref_index index) : basic_table_core(detail::no_safety, L, index) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			auto pp = stack::push_pop(*this);
-			int table_index = pp.index_of(*this);
-			constructor_handler handler {};
-			stack::check<basic_table_core>(lua_state(), table_index, handler);
-#endif // Safety
-		}
-		template <typename T,
-		     meta::enable<meta::neg<meta::any_same<meta::unqualified_t<T>, basic_table_core>>, meta::neg<std::is_same<ref_t, stack_reference>>,
-		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
-		basic_table_core(T&& r) noexcept : basic_table_core(detail::no_safety, std::forward<T>(r)) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			if (!is_table<meta::unqualified_t<T>>::value) {
-				auto pp = stack::push_pop(*this);
-				int table_index = pp.index_of(*this);
-				constructor_handler handler {};
-				stack::check<basic_table_core>(lua_state(), table_index, handler);
-			}
-#endif // Safety
-		}
-		basic_table_core(lua_nil_t r) noexcept : basic_table_core(detail::no_safety, r) {
-		}
-
-		iterator begin() const {
-			if (this->get_type() == type::table) {
-				return iterator(*this);
-			}
-			return iterator();
-		}
-
-		iterator end() const {
-			return iterator();
-		}
-
-		const_iterator cbegin() const {
-			return begin();
-		}
-
-		const_iterator cend() const {
-			return end();
-		}
-
-		void clear() {
-			auto pp = stack::push_pop<false>(*this);
-			int table_index = pp.index_of(*this);
-			stack::clear(lua_state(), table_index);
-		}
-
-		template <typename... Ret, typename... Keys>
-		decltype(auto) get(Keys&&... keys) const {
-			static_assert(sizeof...(Keys) == sizeof...(Ret), "number of keys and number of return types do not match");
-			constexpr static bool global = meta::all<meta::boolean<top_level>, meta::is_c_str<meta::unqualified_t<Keys>>...>::value;
-			auto pp = stack::push_pop<global>(*this);
-			int table_index = pp.index_of(*this);
-			return tuple_get<false, Ret...>(table_index, std::forward<Keys>(keys)...);
-		}
-
-		template <typename T, typename Key>
-		decltype(auto) get_or(Key&& key, T&& otherwise) const {
-			typedef decltype(get<T>("")) U;
-			optional<U> option = get<optional<U>>(std::forward<Key>(key));
-			if (option) {
-				return static_cast<U>(option.value());
-			}
-			return static_cast<U>(std::forward<T>(otherwise));
-		}
-
-		template <typename T, typename Key, typename D>
-		decltype(auto) get_or(Key&& key, D&& otherwise) const {
-			optional<T> option = get<optional<T>>(std::forward<Key>(key));
-			if (option) {
-				return static_cast<T>(option.value());
-			}
-			return static_cast<T>(std::forward<D>(otherwise));
-		}
-
-		template <typename T, typename... Keys>
-		decltype(auto) traverse_get(Keys&&... keys) const {
-			static_assert(sizeof...(Keys) > 0, "must pass at least 1 key to get");
-			constexpr static bool global = top_level && (meta::count_for_to_pack_v<1, meta::is_c_str, meta::unqualified_t<Keys>...> > 0);
-			auto pp = stack::push_pop<global>(*this);
-			int table_index = pp.index_of(*this);
-			return traverse_get_single<false, T>(table_index, std::forward<Keys>(keys)...);
-		}
-
-		template <typename... Keys>
-		basic_table_core& traverse_set(Keys&&... keys) {
-			static_assert(sizeof...(Keys) > 1, "must pass at least 1 key and 1 value to set");
-			constexpr static bool global
-			     = top_level && (meta::count_when_for_to_pack_v<detail::is_not_insert_mode, 1, meta::is_c_str, meta::unqualified_t<Keys>...> > 0);
-			auto pp = stack::push_pop<global>(*this);
-			int table_index = pp.index_of(*this);
-			lua_State* L = base_t::lua_state();
-			auto pn = stack::pop_n(L, static_cast<int>(sizeof...(Keys) - 2 - meta::count_for_pack_v<detail::is_insert_mode, meta::unqualified_t<Keys>...>));
-			traverse_set_deep<top_level, false, detail::insert_mode::none>(table_index, std::forward<Keys>(keys)...);
-			return *this;
-		}
-
-		template <typename... Args>
-		basic_table_core& set(Args&&... args) {
-			if constexpr (sizeof...(Args) == 2) {
-				traverse_set(std::forward<Args>(args)...);
-			}
-			else {
-				tuple_set<false>(std::make_index_sequence<sizeof...(Args) / 2>(), std::forward_as_tuple(std::forward<Args>(args)...));
-			}
-			return *this;
-		}
-
-		template <typename... Ret, typename... Keys>
-		decltype(auto) raw_get(Keys&&... keys) const {
-			static_assert(sizeof...(Keys) == sizeof...(Ret), "number of keys and number of return types do not match");
-			constexpr static bool global = top_level && (meta::count_for_to_pack_v<1, meta::is_c_str, meta::unqualified_t<Keys>...> > 0);
-			auto pp = stack::push_pop<global>(*this);
-			int table_index = pp.index_of(*this);
-			return tuple_get<true, Ret...>(table_index, std::forward<Keys>(keys)...);
-		}
-
-		template <typename T, typename Key>
-		decltype(auto) raw_get_or(Key&& key, T&& otherwise) const {
-			typedef decltype(raw_get<T>("")) U;
-			optional<U> option = raw_get<optional<U>>(std::forward<Key>(key));
-			if (option) {
-				return static_cast<U>(option.value());
-			}
-			return static_cast<U>(std::forward<T>(otherwise));
-		}
-
-		template <typename T, typename Key, typename D>
-		decltype(auto) raw_get_or(Key&& key, D&& otherwise) const {
-			optional<T> option = raw_get<optional<T>>(std::forward<Key>(key));
-			if (option) {
-				return static_cast<T>(option.value());
-			}
-			return static_cast<T>(std::forward<D>(otherwise));
-		}
-
-		template <typename T, typename... Keys>
-		decltype(auto) traverse_raw_get(Keys&&... keys) const {
-			constexpr static bool global = top_level && (meta::count_for_to_pack_v<1, meta::is_c_str, meta::unqualified_t<Keys>...> > 0);
-			auto pp = stack::push_pop<global>(*this);
-			int table_index = pp.index_of(*this);
-			return traverse_get_single<true, T>(table_index, std::forward<Keys>(keys)...);
-		}
-
-		template <typename... Keys>
-		basic_table_core& traverse_raw_set(Keys&&... keys) {
-			constexpr static bool global = top_level && (meta::count_for_to_pack_v<1, meta::is_c_str, meta::unqualified_t<Keys>...> > 0);
-			auto pp = stack::push_pop<global>(*this);
-			lua_State* L = base_t::lua_state();
-			auto pn = stack::pop_n(L, static_cast<int>(sizeof...(Keys) - 2 - meta::count_for_pack_v<detail::is_insert_mode, meta::unqualified_t<Keys>...>));
-			traverse_set_deep<top_level, true, false>(std::forward<Keys>(keys)...);
-			return *this;
-		}
-
-		template <typename... Args>
-		basic_table_core& raw_set(Args&&... args) {
-			tuple_set<true>(std::make_index_sequence<sizeof...(Args) / 2>(), std::forward_as_tuple(std::forward<Args>(args)...));
-			return *this;
-		}
-
-		template <typename Class, typename Key>
-		usertype<Class> new_usertype(Key&& key);
-
-		template <typename Class, typename Key>
-		usertype<Class> new_usertype(Key&& key, automagic_enrollments enrollment);
-
-		template <typename Class, typename Key, typename Arg, typename... Args,
-		     typename = std::enable_if_t<!std::is_same_v<meta::unqualified_t<Arg>, automagic_enrollments>>>
-		usertype<Class> new_usertype(Key&& key, Arg&& arg, Args&&... args);
-
-		template <bool read_only = true, typename... Args>
-		table new_enum(const string_view& name, Args&&... args) {
-			table target = create_with(std::forward<Args>(args)...);
-			if (read_only) {
-				table x = create_with(meta_function::new_index, detail::fail_on_newindex, meta_function::index, target);
-				table shim = create_named(name, metatable_key, x);
-				return shim;
-			}
-			else {
-				set(name, target);
-				return target;
-			}
-		}
-
-		template <typename T, bool read_only = true>
-		table new_enum(const string_view& name, std::initializer_list<std::pair<string_view, T>> items) {
-			table target = create(static_cast<int>(items.size()), static_cast<int>(0));
-			for (const auto& kvp : items) {
-				target.set(kvp.first, kvp.second);
-			}
-			if constexpr (read_only) {
-				table x = create_with(meta_function::new_index, detail::fail_on_newindex, meta_function::index, target);
-				table shim = create_named(name, metatable_key, x);
-				return shim;
-			}
-			else {
-				set(name, target);
-				return target;
-			}
-		}
-
-		template <typename Key = object, typename Value = object, typename Fx>
-		void for_each(Fx&& fx) const {
-			lua_State* L = base_t::lua_state();
-			if constexpr (std::is_invocable_v<Fx, Key, Value>) {
-				auto pp = stack::push_pop(*this);
-				int table_index = pp.index_of(*this);
-				stack::push(L, lua_nil);
-				while (lua_next(L, table_index)) {
-					Key key(L, -2);
-					Value value(L, -1);
-					auto pn = stack::pop_n(L, 1);
-					fx(key, value);
-				}
-			}
-			else {
-				auto pp = stack::push_pop(*this);
-				int table_index = pp.index_of(*this);
-				stack::push(L, lua_nil);
-				while (lua_next(L, table_index)) {
-					Key key(L, -2);
-					Value value(L, -1);
-					auto pn = stack::pop_n(L, 1);
-					std::pair<Key&, Value&> keyvalue(key, value);
-					fx(keyvalue);
-				}
-			}
-		}
-
-		size_t size() const {
-			auto pp = stack::push_pop(*this);
-			int table_index = pp.index_of(*this);
-			lua_State* L = base_t::lua_state();
-			lua_len(L, table_index);
-			return stack::pop<size_t>(L);
-		}
-
-		bool empty() const {
-			return cbegin() == cend();
-		}
-
-		template <typename T>
-		auto operator[](T&& key) & {
-			return table_proxy<basic_table_core&, detail::proxy_key_t<T>>(*this, std::forward<T>(key));
-		}
-
-		template <typename T>
-		auto operator[](T&& key) const& {
-			return table_proxy<const basic_table_core&, detail::proxy_key_t<T>>(*this, std::forward<T>(key));
-		}
-
-		template <typename T>
-		auto operator[](T&& key) && {
-			return table_proxy<basic_table_core, detail::proxy_key_t<T>>(std::move(*this), std::forward<T>(key));
-		}
-
-		template <typename Sig, typename Key, typename... Args>
-		basic_table_core& set_function(Key&& key, Args&&... args) {
-			set_fx(types<Sig>(), std::forward<Key>(key), std::forward<Args>(args)...);
-			return *this;
-		}
-
-		template <typename Key, typename... Args>
-		basic_table_core& set_function(Key&& key, Args&&... args) {
-			set_fx(types<>(), std::forward<Key>(key), std::forward<Args>(args)...);
-			return *this;
-		}
-
-		template <typename... Args>
-		basic_table_core& add(Args&&... args) {
-			auto pp = stack::push_pop(*this);
-			int table_index = pp.index_of(*this);
-			lua_State* L = base_t::lua_state();
-			(void)detail::swallow { 0, (stack::set_ref(L, std::forward<Args>(args), table_index), 0)... };
-			return *this;
-		}
-
-	private:
-		template <typename R, typename... Args, typename Fx, typename Key, typename = std::invoke_result_t<Fx, Args...>>
-		void set_fx(types<R(Args...)>, Key&& key, Fx&& fx) {
-			set_resolved_function<R(Args...)>(std::forward<Key>(key), std::forward<Fx>(fx));
-		}
-
-		template <typename Fx, typename Key, meta::enable<meta::is_specialization_of<meta::unqualified_t<Fx>, overload_set>> = meta::enabler>
-		void set_fx(types<>, Key&& key, Fx&& fx) {
-			set(std::forward<Key>(key), std::forward<Fx>(fx));
-		}
-
-		template <typename Fx, typename Key, typename... Args,
-		     meta::disable<meta::is_specialization_of<meta::unqualified_t<Fx>, overload_set>> = meta::enabler>
-		void set_fx(types<>, Key&& key, Fx&& fx, Args&&... args) {
-			set(std::forward<Key>(key), as_function_reference(std::forward<Fx>(fx), std::forward<Args>(args)...));
-		}
-
-		template <typename... Sig, typename... Args, typename Key>
-		void set_resolved_function(Key&& key, Args&&... args) {
-			set(std::forward<Key>(key), as_function_reference<function_sig<Sig...>>(std::forward<Args>(args)...));
-		}
-
-	public:
-		static inline table create(lua_State* L, int narr = 0, int nrec = 0) {
-			lua_createtable(L, narr, nrec);
-			table result(L);
-			lua_pop(L, 1);
-			return result;
-		}
-
-		template <typename Key, typename Value, typename... Args>
-		static inline table create(lua_State* L, int narr, int nrec, Key&& key, Value&& value, Args&&... args) {
-			lua_createtable(L, narr, nrec);
-			table result(L);
-			result.set(std::forward<Key>(key), std::forward<Value>(value), std::forward<Args>(args)...);
-			lua_pop(L, 1);
-			return result;
-		}
-
-		template <typename... Args>
-		static inline table create_with(lua_State* L, Args&&... args) {
-			static_assert(sizeof...(Args) % 2 == 0, "You must have an even number of arguments for a key, value ... list.");
-			constexpr int narr = static_cast<int>(meta::count_odd_for_pack_v<std::is_integral, Args...>);
-			return create(L, narr, static_cast<int>((sizeof...(Args) / 2) - narr), std::forward<Args>(args)...);
-		}
-
-		table create(int narr = 0, int nrec = 0) {
-			return create(base_t::lua_state(), narr, nrec);
-		}
-
-		template <typename Key, typename Value, typename... Args>
-		table create(int narr, int nrec, Key&& key, Value&& value, Args&&... args) {
-			return create(base_t::lua_state(), narr, nrec, std::forward<Key>(key), std::forward<Value>(value), std::forward<Args>(args)...);
-		}
-
-		template <typename Name>
-		table create(Name&& name, int narr = 0, int nrec = 0) {
-			table x = create(base_t::lua_state(), narr, nrec);
-			this->set(std::forward<Name>(name), x);
-			return x;
-		}
-
-		template <typename Name, typename Key, typename Value, typename... Args>
-		table create(Name&& name, int narr, int nrec, Key&& key, Value&& value, Args&&... args) {
-			table x = create(base_t::lua_state(), narr, nrec, std::forward<Key>(key), std::forward<Value>(value), std::forward<Args>(args)...);
-			this->set(std::forward<Name>(name), x);
-			return x;
-		}
-
-		template <typename... Args>
-		table create_with(Args&&... args) {
-			return create_with(base_t::lua_state(), std::forward<Args>(args)...);
-		}
-
-		template <typename Name, typename... Args>
-		table create_named(Name&& name, Args&&... args) {
-			static const int narr = static_cast<int>(meta::count_even_for_pack_v<std::is_integral, Args...>);
-			return create(std::forward<Name>(name), narr, (sizeof...(Args) / 2) - narr, std::forward<Args>(args)...);
-		}
-	};
-} // namespace sol
-
-// end of sol/table_core.hpp
-
-namespace sol {
-
-	template <typename base_type>
-	class basic_metatable : public basic_table<base_type> {
-		typedef basic_table<base_type> base_t;
-		friend class state;
-		friend class state_view;
-
-	protected:
-		basic_metatable(detail::no_safety_tag, lua_nil_t n) : base_t(n) {
-		}
-		basic_metatable(detail::no_safety_tag, lua_State* L, int index) : base_t(L, index) {
-		}
-		basic_metatable(detail::no_safety_tag, lua_State* L, ref_index index) : base_t(L, index) {
-		}
-		template <typename T,
-		     meta::enable<meta::neg<meta::any_same<meta::unqualified_t<T>, basic_metatable>>, meta::neg<std::is_same<base_type, stack_reference>>,
-		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
-		basic_metatable(detail::no_safety_tag, T&& r) noexcept : base_t(std::forward<T>(r)) {
-		}
-		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
-		basic_metatable(detail::no_safety_tag, lua_State* L, T&& r) noexcept : base_t(L, std::forward<T>(r)) {
-		}
-
-	public:
-		using base_t::lua_state;
-
-		basic_metatable() noexcept = default;
-		basic_metatable(const basic_metatable&) = default;
-		basic_metatable(basic_metatable&&) = default;
-		basic_metatable& operator=(const basic_metatable&) = default;
-		basic_metatable& operator=(basic_metatable&&) = default;
-		basic_metatable(const stack_reference& r) : basic_metatable(r.lua_state(), r.stack_index()) {
-		}
-		basic_metatable(stack_reference&& r) : basic_metatable(r.lua_state(), r.stack_index()) {
-		}
-		template <typename T, meta::enable_any<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
-		basic_metatable(lua_State* L, T&& r) : base_t(L, std::forward<T>(r)) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			auto pp = stack::push_pop(*this);
-			constructor_handler handler{};
-			stack::check<basic_metatable>(lua_state(), -1, handler);
-#endif // Safety
-		}
-		basic_metatable(lua_State* L, int index = -1) : basic_metatable(detail::no_safety, L, index) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			constructor_handler handler{};
-			stack::check<basic_metatable>(L, index, handler);
-#endif // Safety
-		}
-		basic_metatable(lua_State* L, ref_index index) : basic_metatable(detail::no_safety, L, index) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			auto pp = stack::push_pop(*this);
-			constructor_handler handler{};
-			stack::check<basic_metatable>(lua_state(), -1, handler);
-#endif // Safety
-		}
-		template <typename T,
-		     meta::enable<meta::neg<meta::any_same<meta::unqualified_t<T>, basic_metatable>>, meta::neg<std::is_same<base_type, stack_reference>>,
-		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
-		basic_metatable(T&& r) noexcept : basic_metatable(detail::no_safety, std::forward<T>(r)) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			if (!is_table<meta::unqualified_t<T>>::value) {
-				auto pp = stack::push_pop(*this);
-				constructor_handler handler{};
-				stack::check<basic_metatable>(base_t::lua_state(), -1, handler);
-			}
-#endif // Safety
-		}
-		basic_metatable(lua_nil_t r) noexcept : basic_metatable(detail::no_safety, r) {
-		}
-
-		template <typename Key, typename Value>
-		void set(Key&& key, Value&& value);
-
-		void unregister() {
-			using ustorage_base = u_detail::usertype_storage_base;
-
-			lua_State* L = this->lua_state();
-
-			auto pp = stack::push_pop(*this);
-			int top = lua_gettop(L);
-
-			stack_reference mt(L, -1);
-			stack::get_field(L, meta_function::gc_names, mt.stack_index());
-			if (type_of(L, -1) != type::table) {
-				return;
-			}
-			stack_reference gc_names_table(L, -1);
-			stack::get_field(L, meta_function::storage, mt.stack_index());
-			if (type_of(L, -1) != type::lightuserdata) {
-				return;
-			}
-			ustorage_base& base_storage = *static_cast<ustorage_base*>(stack::get<void*>(L, -1));
-			std::array<string_view, 6> registry_traits;
-			for (std::size_t i = 0; i < registry_traits.size(); ++i) {
-				u_detail::submetatable_type smt = static_cast<u_detail::submetatable_type>(i);
-				stack::get_field<false, true>(L, smt, gc_names_table.stack_index());
-				registry_traits[i] = stack::get<string_view>(L, -1);
-			}
-
-			// get the registry
-			stack_reference registry(L, raw_index(LUA_REGISTRYINDEX));
-			registry.push();
-			// eliminate all named entries for this usertype
-			// in the registry (luaL_newmetatable does
-			// [name] = new table
-			// in registry upon creation)
-			for (std::size_t i = 0; i < registry_traits.size(); ++i) {
-				u_detail::submetatable_type smt = static_cast<u_detail::submetatable_type>(i);
-				const string_view& gcmetakey = registry_traits[i];
-				if (smt == u_detail::submetatable_type::named) {
-					// use .data() to make it treat it like a c string,
-					// which it is...
-					stack::set_field<true>(L, gcmetakey.data(), lua_nil);
-				}
-				else {
-					// do not change the values in the registry: they need to be present
-					// no matter what, for safety's sake
-					//stack::set_field(L, gcmetakey, lua_nil, registry.stack_index());
-				}
-			}
-
-			// destroy all storage and tables
-			base_storage.clear();
-
-			// 6 strings from gc_names table,
-			// + 1 registry,
-			// + 1 gc_names table
-			// + 1 light userdata of storage
-			// + 1 registry
-			// 10 total, 4 left since popping off 6 gc_names tables
-			lua_settop(L, top);
-		}
-	};
-
-} // namespace sol
-
-// end of sol/metatable.hpp
-
-namespace sol {
-
-	template <typename T, typename base_type>
-	class basic_usertype : private basic_metatable<base_type> {
-	private:
-		using base_t = basic_metatable<base_type>;
-		using table_base_t = basic_table<base_type>;
-
-		template <typename>
-		friend class basic_metatable;
-
-		template <bool, typename>
-		friend class basic_table_core;
-
-		template <std::size_t... I, typename... Args>
-		void tuple_set(std::index_sequence<I...>, std::tuple<Args...>&& args) {
-			(void)args;
-			(void)detail::swallow{ 0,
-				(this->set(std::get<I * 2>(std::move(args)), std::get<I * 2 + 1>(std::move(args))), 0)... };
-		}
-
-	public:
-		using base_t::base_t;
-
-		using base_t::pop;
-		using base_t::push;
-		using base_t::lua_state;
-		using base_t::get;
-		using base_t::set_function;
-		using base_t::traverse_set;
-		using base_t::traverse_get;
-		using base_t::unregister;
-
-		template <typename Key, typename Value>
-		void set(Key&& key, Value&& value) {
-			optional<u_detail::usertype_storage<T>&> maybe_uts = u_detail::maybe_get_usertype_storage<T>(this->lua_state());
-			if (maybe_uts) {
-				u_detail::usertype_storage<T>& uts = *maybe_uts;
-				uts.set(this->lua_state(), std::forward<Key>(key), std::forward<Value>(value));
-			}
-			else {
-				using ValueU = meta::unqualified_t<Value>;
-				// cannot get metatable: try regular table set?
-				if constexpr (detail::is_non_factory_constructor_v<ValueU> || detail::is_policy_v<ValueU>) {
-					// tag constructors so we don't get destroyed by lack of info
-					table_base_t::set(std::forward<Key>(key), detail::tagged<T, Value>(std::forward<Value>(value)));
-				}
-				else {
-					table_base_t::set(std::forward<Key>(key), std::forward<Value>(value));
-				}
-			}
-		}
-
-		template <typename Key>
-		usertype_proxy<basic_usertype&, std::decay_t<Key>> operator[](Key&& key) {
-			return usertype_proxy<basic_usertype&, std::decay_t<Key>>(*this, std::forward<Key>(key));
-		}
-
-		template <typename Key>
-		usertype_proxy<const basic_usertype&, std::decay_t<Key>> operator[](Key&& key) const {
-			return usertype_proxy<const basic_usertype&, std::decay_t<Key>>(*this, std::forward<Key>(key));
-		}
-	};
-
-} // namespace sol
-
-// end of sol/usertype.hpp
-
-// beginning of sol/table.hpp
-
-// beginning of sol/lua_table.hpp
-
-namespace sol {
-
-	template <typename ref_t>
-	struct basic_lua_table : basic_table_core<false, ref_t> {
-	private:
-		using base_t = basic_table_core<false, ref_t>;
-
-		friend class state;
-		friend class state_view;
-
-	public:
-		using base_t::lua_state;
-
-		basic_lua_table() noexcept = default;
-		basic_lua_table(const basic_lua_table&) = default;
-		basic_lua_table(basic_lua_table&&) = default;
-		basic_lua_table& operator=(const basic_lua_table&) = default;
-		basic_lua_table& operator=(basic_lua_table&&) = default;
-		basic_lua_table(const stack_reference& r) : basic_lua_table(r.lua_state(), r.stack_index()) {
-		}
-		basic_lua_table(stack_reference&& r) : basic_lua_table(r.lua_state(), r.stack_index()) {
-		}
-		template <typename T, meta::enable_any<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
-		basic_lua_table(lua_State* L, T&& r) : base_t(L, std::forward<T>(r)) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			auto pp = stack::push_pop(*this);
-			constructor_handler handler{};
-			stack::check<basic_lua_table>(lua_state(), -1, handler);
-#endif // Safety
-		}
-		basic_lua_table(lua_State* L, const new_table& nt) : base_t(L, nt) {
-			if (!is_stack_based<meta::unqualified_t<ref_t>>::value) {
-				lua_pop(L, 1);
-			}
-		}
-		basic_lua_table(lua_State* L, int index = -1) : base_t(detail::no_safety, L, index) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			constructor_handler handler{};
-			stack::check<basic_lua_table>(L, index, handler);
-#endif // Safety
-		}
-		basic_lua_table(lua_State* L, ref_index index) : base_t(detail::no_safety, L, index) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			auto pp = stack::push_pop(*this);
-			constructor_handler handler{};
-			stack::check<basic_lua_table>(lua_state(), -1, handler);
-#endif // Safety
-		}
-		template <typename T,
-		     meta::enable<meta::neg<meta::any_same<meta::unqualified_t<T>, basic_lua_table>>, meta::neg<std::is_same<ref_t, stack_reference>>,
-		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
-		basic_lua_table(T&& r) noexcept : basic_lua_table(detail::no_safety, std::forward<T>(r)) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			if (!is_table<meta::unqualified_t<T>>::value) {
-				auto pp = stack::push_pop(*this);
-				constructor_handler handler{};
-				stack::check<basic_lua_table>(lua_state(), -1, handler);
-			}
-#endif // Safety
-		}
-		basic_lua_table(lua_nil_t r) noexcept : basic_lua_table(detail::no_safety, r) {
-		}
-	};
-
-}
-
-// end of sol/lua_table.hpp
-
-namespace sol {
-	typedef table_core<false> table;
-
-	template <bool is_global, typename base_type>
-	template <typename Class, typename Key>
-	usertype<Class> basic_table_core<is_global, base_type>::new_usertype(Key&& key) {
-		automagic_enrollments enrollments;
-		return this->new_usertype<Class>(std::forward<Key>(key), std::move(enrollments));
-	}
-
-	template <bool is_global, typename base_type>
-	template <typename Class, typename Key>
-	usertype<Class> basic_table_core<is_global, base_type>::new_usertype(Key&& key, automagic_enrollments enrollments) {
-		int mt_index = u_detail::register_usertype<Class>(this->lua_state(), std::move(enrollments));
-		usertype<Class> mt(this->lua_state(), -mt_index);
-		lua_pop(this->lua_state(), 1);
-		set(std::forward<Key>(key), mt);
-		return mt;
-	}
-
-	template <bool is_global, typename base_type>
-	template <typename Class, typename Key, typename Arg, typename... Args, typename>
-	usertype<Class> basic_table_core<is_global, base_type>::new_usertype(Key&& key, Arg&& arg, Args&&... args) {
-		automagic_enrollments enrollments;
-		enrollments.default_constructor = !detail::any_is_constructor_v<Arg, Args...>;
-		enrollments.destructor = !detail::any_is_destructor_v<Arg, Args...>;
-		usertype<Class> ut = this->new_usertype<Class>(std::forward<Key>(key), std::move(enrollments));
-		static_assert(sizeof...(Args) % 2 == static_cast<std::size_t>(!detail::any_is_constructor_v<Arg>), 
-			"you must pass an even number of arguments to new_usertype after first passing a constructor");
-		if constexpr (detail::any_is_constructor_v<Arg>) {
-			ut.set(meta_function::construct, std::forward<Arg>(arg));
-			ut.tuple_set(std::make_index_sequence<(sizeof...(Args)) / 2>(), std::forward_as_tuple(std::forward<Args>(args)...));
-		}
-		else {
-			ut.tuple_set(std::make_index_sequence<(sizeof...(Args) + 1) / 2>(), std::forward_as_tuple(std::forward<Arg>(arg), std::forward<Args>(args)...));
-		}
-		return ut;
-	}
-
-	template <typename base_type>
-	template <typename Key, typename Value>
-	void basic_metatable<base_type>::set(Key&& key, Value&& value) {
-		this->push();
-		lua_State* L = this->lua_state();
-		int target = lua_gettop(L);
-		optional<u_detail::usertype_storage_base&> maybe_uts = u_detail::maybe_get_usertype_storage_base(L, target);
-		lua_pop(L, 1);
-		if (maybe_uts) {
-			u_detail::usertype_storage_base& uts = *maybe_uts;
-			uts.set(L, std::forward<Key>(key), std::forward<Value>(value));
-		}
-		else {
-			base_t::set(std::forward<Key>(key), std::forward<Value>(value));
-		}
-	}
-
-	namespace stack {
-		template <>
-		struct unqualified_getter<metatable_key_t> {
-			static table get(lua_State* L, int index = -1) {
-				if (lua_getmetatable(L, index) == 0) {
-					return table(L, ref_index(LUA_REFNIL));
-				}
-				return table(L, -1);
-			}
-		};
-	} // namespace stack
-} // namespace sol
-
-// end of sol/table.hpp
-
-// beginning of sol/state.hpp
-
-// beginning of sol/state_view.hpp
-
-// beginning of sol/environment.hpp
-
-namespace sol {
-
-	template <typename base_type>
-	struct basic_environment : basic_table<base_type> {
-	private:
-		typedef basic_table<base_type> base_t;
-
-	public:
-		using base_t::lua_state;
-
-		basic_environment() noexcept = default;
-		basic_environment(const basic_environment&) = default;
-		basic_environment(basic_environment&&) = default;
-		basic_environment& operator=(const basic_environment&) = default;
-		basic_environment& operator=(basic_environment&&) = default;
-		basic_environment(const stack_reference& r) : basic_environment(r.lua_state(), r.stack_index()) {
-		}
-		basic_environment(stack_reference&& r) : basic_environment(r.lua_state(), r.stack_index()) {
-		}
-
-		basic_environment(lua_State* L, new_table nt) : base_t(L, std::move(nt)) {
-		}
-		template <bool b>
-		basic_environment(lua_State* L, new_table t, const basic_reference<b>& fallback) : basic_environment(L, std::move(t)) {
-			stack_table mt(L, new_table(0, 1));
-			mt.set(meta_function::index, fallback);
-			this->set(metatable_key, mt);
-			mt.pop();
-		}
-
-		basic_environment(env_key_t, const stack_reference& extraction_target)
-		: base_t(detail::no_safety, extraction_target.lua_state(), (stack::push_environment_of(extraction_target), -1)) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			constructor_handler handler {};
-			stack::check<env_key_t>(this->lua_state(), -1, handler);
-#endif // Safety
-			lua_pop(this->lua_state(), 2);
-		}
-		template <bool b>
-		basic_environment(env_key_t, const basic_reference<b>& extraction_target)
-		: base_t(detail::no_safety, extraction_target.lua_state(), (stack::push_environment_of(extraction_target), -1)) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			constructor_handler handler {};
-			stack::check<env_key_t>(this->lua_state(), -1, handler);
-#endif // Safety
-			lua_pop(this->lua_state(), 2);
-		}
-		basic_environment(lua_State* L, int index = -1) : base_t(detail::no_safety, L, index) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			constructor_handler handler {};
-			stack::check<basic_environment>(L, index, handler);
-#endif // Safety
-		}
-		basic_environment(lua_State* L, ref_index index) : base_t(detail::no_safety, L, index) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			auto pp = stack::push_pop(*this);
-			constructor_handler handler {};
-			stack::check<basic_environment>(L, -1, handler);
-#endif // Safety
-		}
-		template <typename T,
-		     meta::enable<meta::neg<meta::any_same<meta::unqualified_t<T>, basic_environment>>, meta::neg<std::is_same<base_type, stack_reference>>,
-		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
-		basic_environment(T&& r) noexcept : base_t(detail::no_safety, std::forward<T>(r)) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			if (!is_environment<meta::unqualified_t<T>>::value) {
-				auto pp = stack::push_pop(*this);
-				constructor_handler handler {};
-				stack::check<basic_environment>(lua_state(), -1, handler);
-			}
-#endif // Safety
-		}
-		basic_environment(lua_nil_t r) noexcept : base_t(detail::no_safety, r) {
-		}
-
-		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
-		basic_environment(lua_State* L, T&& r) noexcept : base_t(detail::no_safety, L, std::forward<T>(r)) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			if (!is_environment<meta::unqualified_t<T>>::value) {
-				auto pp = stack::push_pop(*this);
-				constructor_handler handler {};
-				stack::check<basic_environment>(lua_state(), -1, handler);
-			}
-#endif // Safety
-		}
-
-		template <typename T>
-		void set_on(const T& target) const {
-			lua_State* L = target.lua_state();
-			auto pp = stack::push_pop(target);
-#if SOL_LUA_VESION_I_ < 502
-			// Use lua_setfenv
-			this->push();
-			lua_setfenv(L, -2);
-#else
-			// Use upvalues as explained in Lua 5.2 and beyond's manual
-			this->push();
-			const char* name = lua_setupvalue(L, -2, 1);
-			if (name == nullptr) {
-				this->pop();
-			}
-#endif
-		}
-	};
-
-	template <typename T, typename E>
-	void set_environment(const basic_environment<E>& env, const T& target) {
-		env.set_on(target);
-	}
-
-	template <typename E = reference, typename T>
-	basic_environment<E> get_environment(const T& target) {
-		lua_State* L = target.lua_state();
-		auto pp = stack::pop_n(L, stack::push_environment_of(target));
-		return basic_environment<E>(L, -1);
-	}
-
-	struct this_environment {
-		optional<environment> env;
-
-		this_environment() : env(nullopt) {
-		}
-		this_environment(environment e) : env(std::move(e)) {
-		}
-		this_environment(const this_environment&) = default;
-		this_environment(this_environment&&) = default;
-		this_environment& operator=(const this_environment&) = default;
-		this_environment& operator=(this_environment&&) = default;
-
-		explicit operator bool() const {
-			return static_cast<bool>(env);
-		}
-
-		operator optional<environment> &() {
-			return env;
-		}
-
-		operator const optional<environment> &() const {
-			return env;
-		}
-
-		operator environment&() {
-			return env.value();
-		}
-
-		operator const environment&() const {
-			return env.value();
-		}
-	};
-
-	namespace stack {
-		template <>
-		struct unqualified_getter<env_key_t> {
-			static environment get(lua_State* L, int index, record& tracking) {
-				tracking.use(1);
-				return get_environment(stack_reference(L, raw_index(index)));
-			}
-		};
-
-		template <>
-		struct unqualified_getter<this_environment> {
-			static this_environment get(lua_State* L, int, record& tracking) {
-				tracking.use(0);
-				lua_Debug info;
-				// Level 0 means current function (this C function, which may or may not be useful for us?)
-				// Level 1 means next call frame up the stack. (Can be nothing if function called directly from C++ with lua_p/call)
-				int pre_stack_size = lua_gettop(L);
-				if (lua_getstack(L, 1, &info) != 1) {
-					if (lua_getstack(L, 0, &info) != 1) {
-						lua_settop(L, pre_stack_size);
-						return this_environment();
-					}
-				}
-				if (lua_getinfo(L, "f", &info) == 0) {
-					lua_settop(L, pre_stack_size);
-					return this_environment();
-				}
-
-				stack_reference f(L, -1);
-				environment env(env_key, f);
-				if (!env.valid()) {
-					lua_settop(L, pre_stack_size);
-					return this_environment();
-				}
-				return this_environment(std::move(env));
-			}
-		};
-	} // namespace stack
-} // namespace sol
-
-// end of sol/environment.hpp
-
-// beginning of sol/load_result.hpp
-
-#include <cstdint>
-
-namespace sol {
-	struct load_result : public proxy_base<load_result> {
-	private:
-		lua_State* L;
-		int index;
-		int returncount;
-		int popcount;
-		load_status err;
-
-	public:
-		load_result() noexcept = default;
-		load_result(lua_State* Ls, int stackindex = -1, int retnum = 0, int popnum = 0, load_status lerr = load_status::ok) noexcept
-		: L(Ls), index(stackindex), returncount(retnum), popcount(popnum), err(lerr) {
-		}
-
-		// We do not want anyone to copy these around willy-nilly
-		// Will likely break people, but also will probably get rid of quiet bugs that have
-		// been lurking. (E.g., Vanilla Lua will just quietly discard over-pops and under-pops:
-		// LuaJIT and other Lua engines will implode and segfault at random later times.)
-		load_result(const load_result&) = delete;
-		load_result& operator=(const load_result&) = delete;
-
-		load_result(load_result&& o) noexcept : L(o.L), index(o.index), returncount(o.returncount), popcount(o.popcount), err(o.err) {
-			// Must be manual, otherwise destructor will screw us
-			// return count being 0 is enough to keep things clean
-			// but we will be thorough
-			o.L = nullptr;
-			o.index = 0;
-			o.returncount = 0;
-			o.popcount = 0;
-			o.err = load_status::syntax;
-		}
-		load_result& operator=(load_result&& o) noexcept {
-			L = o.L;
-			index = o.index;
-			returncount = o.returncount;
-			popcount = o.popcount;
-			err = o.err;
-			// Must be manual, otherwise destructor will screw us
-			// return count being 0 is enough to keep things clean
-			// but we will be thorough
-			o.L = nullptr;
-			o.index = 0;
-			o.returncount = 0;
-			o.popcount = 0;
-			o.err = load_status::syntax;
-			return *this;
-		}
-
-		load_status status() const noexcept {
-			return err;
-		}
-
-		bool valid() const noexcept {
-			return status() == load_status::ok;
-		}
-
-		template <typename T>
-		T get() const {
-			using UT = meta::unqualified_t<T>;
-			if constexpr (meta::is_optional_v<UT>) {
-				using ValueType = typename UT::value_type;
-				if constexpr (std::is_same_v<ValueType, error>) {
-					if (valid()) {
-						return UT(nullopt);
-					}
-					return error(detail::direct_error, stack::get<std::string>(L, index));
-				}
-				else {
-					if (!valid()) {
-						return UT(nullopt);
-					}
-					return stack::get<UT>(L, index);
-				}
-			}
-			else {
-				if constexpr (std::is_same_v<T, error>) {
-#if SOL_IS_ON(SOL_SAFE_PROXIES_I_)
-					if (valid()) {
-						type_panic_c_str(L, index, type_of(L, index), type::none, "expecting an error type (a string, from Lua)");
-					}
-#endif // Check proxy type's safety
-					return error(detail::direct_error, stack::get<std::string>(L, index));
-				}
-				else {
-#if SOL_IS_ON(SOL_SAFE_PROXIES_I_)
-					if (!valid()) {
-						type_panic_c_str(L, index, type_of(L, index), type::none);
-					}
-#endif // Check proxy type's safety
-					return stack::get<T>(L, index);
-				}
-			}
-		}
-
-		template <typename... Ret, typename... Args>
-		decltype(auto) call(Args&&... args) {
-#if !defined(__clang__) && defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 191200000
-			// MSVC is ass sometimes
-			return get<protected_function>().call<Ret...>(std::forward<Args>(args)...);
-#else
-			return get<protected_function>().template call<Ret...>(std::forward<Args>(args)...);
-#endif
-		}
-
-		template <typename... Args>
-		decltype(auto) operator()(Args&&... args) {
-			return call<>(std::forward<Args>(args)...);
-		}
-
-		lua_State* lua_state() const noexcept {
-			return L;
-		};
-		int stack_index() const noexcept {
-			return index;
-		};
-
-		~load_result() {
-			stack::remove(L, index, popcount);
-		}
-	};
-} // namespace sol
-
-// end of sol/load_result.hpp
-
-// beginning of sol/state_handling.hpp
-
-// beginning of sol/lua_value.hpp
-
-namespace sol {
-	struct lua_value {
-	public:
-		struct arr : detail::ebco<std::initializer_list<lua_value>> {
-		private:
-			using base_t = detail::ebco<std::initializer_list<lua_value>>;
-
-		public:
-			using base_t::base_t;
-		};
-
-	private:
-		template <typename T>
-		using is_reference_or_lua_value_init_list
-		     = meta::any<meta::is_specialization_of<T, std::initializer_list>, std::is_same<T, reference>, std::is_same<T, arr>>;
-
-		template <typename T>
-		using is_lua_value_single_constructible = meta::any<std::is_same<T, lua_value>, is_reference_or_lua_value_init_list<T>>;
-
-		static lua_State*& thread_local_lua_state() {
-#if SOL_IS_ON(SOL_USE_THREAD_LOCAL_I_)
-			static thread_local lua_State* L = nullptr;
-#else
-			static lua_State* L = nullptr;
-#endif
-			return L;
-		}
-
-		reference ref_value;
-
-	public:
-		static void set_lua_state(lua_State* L) {
-			thread_local_lua_state() = L;
-		}
-
-		template <typename T, meta::disable<is_reference_or_lua_value_init_list<meta::unqualified_t<T>>> = meta::enabler>
-		lua_value(lua_State* L_, T&& value) : lua_value(((set_lua_state(L_)), std::forward<T>(value))) {
-		}
-
-		template <typename T, meta::disable<is_lua_value_single_constructible<meta::unqualified_t<T>>> = meta::enabler>
-		lua_value(T&& value) : ref_value(make_reference(thread_local_lua_state(), std::forward<T>(value))) {
-		}
-
-		lua_value(lua_State* L_, std::initializer_list<std::pair<lua_value, lua_value>> il)
-		: lua_value([&L_, &il]() {
-			set_lua_state(L_);
-			return std::move(il);
-		}()) {
-		}
-
-		lua_value(std::initializer_list<std::pair<lua_value, lua_value>> il) : ref_value(make_reference(thread_local_lua_state(), std::move(il))) {
-		}
-
-		lua_value(lua_State* L_, arr il)
-		: lua_value([&L_, &il]() {
-			set_lua_state(L_);
-			return std::move(il);
-		}()) {
-		}
-
-		lua_value(arr il) : ref_value(make_reference(thread_local_lua_state(), std::move(il.value()))) {
-		}
-
-		lua_value(lua_State* L_, reference r)
-		: lua_value([&L_, &r]() {
-			set_lua_state(L_);
-			return std::move(r);
-		}()) {
-		}
-
-		lua_value(reference r) : ref_value(std::move(r)) {
-		}
-
-		lua_value(const lua_value&) noexcept = default;
-		lua_value(lua_value&&) = default;
-		lua_value& operator=(const lua_value&) = default;
-		lua_value& operator=(lua_value&&) = default;
-
-		const reference& value() const& {
-			return ref_value;
-		}
-
-		reference& value() & {
-			return ref_value;
-		}
-
-		reference&& value() && {
-			return std::move(ref_value);
-		}
-
-		template <typename T>
-		decltype(auto) as() const {
-			ref_value.push();
-			return stack::pop<T>(ref_value.lua_state());
-		}
-
-		template <typename T>
-		bool is() const {
-			int r = ref_value.registry_index();
-			if (r == LUA_REFNIL)
-				return meta::any_same<meta::unqualified_t<T>, lua_nil_t, nullopt_t, std::nullptr_t>::value ? true : false;
-			if (r == LUA_NOREF)
-				return false;
-			auto pp = stack::push_pop(ref_value);
-			return stack::check<T>(ref_value.lua_state(), -1, no_panic);
-		}
-	};
-
-	using array_value = typename lua_value::arr;
-
-	namespace stack {
-		template <>
-		struct unqualified_pusher<lua_value> {
-			static int push(lua_State* L, const lua_value& lv) {
-				return stack::push(L, lv.value());
-			}
-
-			static int push(lua_State* L, lua_value&& lv) {
-				return stack::push(L, std::move(lv).value());
-			}
-		};
-
-		template <>
-		struct unqualified_getter<lua_value> {
-			static lua_value get(lua_State* L, int index, record& tracking) {
-				return lua_value(L, stack::get<reference>(L, index, tracking));
-			}
-		};
-	} // namespace stack
-} // namespace sol
-
-// end of sol/lua_value.hpp
-
-#if SOL_IS_ON(SOL_PRINT_ERRORS_I_)
-#include <iostream>
-#endif
-
-namespace sol {
-	inline void register_main_thread(lua_State* L) {
-#if SOL_LUA_VESION_I_ < 502
-		if (L == nullptr) {
-			lua_pushnil(L);
-			lua_setglobal(L, detail::default_main_thread_name());
-			return;
-		}
-		lua_pushthread(L);
-		lua_setglobal(L, detail::default_main_thread_name());
-#else
-		(void)L;
-#endif
-	}
-
-	inline int default_at_panic(lua_State* L) {
-#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
-		(void)L;
-		return -1;
-#else
-		size_t messagesize;
-		const char* message = lua_tolstring(L, -1, &messagesize);
-		if (message) {
-			std::string err(message, messagesize);
-			lua_settop(L, 0);
-#if SOL_IS_ON(SOL_PRINT_ERRORS_I_)
-			std::cerr << "[sol3] An error occurred and panic has been invoked: ";
-			std::cerr << err;
-			std::cerr << std::endl;
-#endif
-			throw error(err);
-		}
-		lua_settop(L, 0);
-		throw error(std::string("An unexpected error occurred and panic has been invoked"));
-#endif // Printing Errors
-	}
-
-	inline int default_traceback_error_handler(lua_State* L) {
-		std::string msg = "An unknown error has triggered the default error handler";
-		optional<string_view> maybetopmsg = stack::unqualified_check_get<string_view>(L, 1, no_panic);
-		if (maybetopmsg) {
-			const string_view& topmsg = maybetopmsg.value();
-			msg.assign(topmsg.data(), topmsg.size());
-		}
-		luaL_traceback(L, L, msg.c_str(), 1);
-		optional<string_view> maybetraceback = stack::unqualified_check_get<string_view>(L, -1, no_panic);
-		if (maybetraceback) {
-			const string_view& traceback = maybetraceback.value();
-			msg.assign(traceback.data(), traceback.size());
-		}
-#if SOL_IS_ON(SOL_PRINT_ERRORS_I_)
-		// std::cerr << "[sol3] An error occurred and was caught in traceback: ";
-		// std::cerr << msg;
-		// std::cerr << std::endl;
-#endif // Printing
-		return stack::push(L, msg);
-	}
-
-	inline void set_default_state(lua_State* L, lua_CFunction panic_function = &default_at_panic,
-	     lua_CFunction traceback_function = c_call<decltype(&default_traceback_error_handler), &default_traceback_error_handler>,
-	     exception_handler_function exf = detail::default_exception_handler) {
-		lua_atpanic(L, panic_function);
-		protected_function::set_default_handler(object(L, in_place, traceback_function));
-		set_default_exception_handler(L, exf);
-		register_main_thread(L);
-		stack::luajit_exception_handler(L);
-		lua_value::set_lua_state(L);
-	}
-
-	inline std::size_t total_memory_used(lua_State* L) {
-		std::size_t kb = lua_gc(L, LUA_GCCOUNT, 0);
-		kb *= 1024;
-		kb += lua_gc(L, LUA_GCCOUNTB, 0);
-		return kb;
-	}
-
-	inline protected_function_result script_pass_on_error(lua_State*, protected_function_result result) {
-		return result;
-	}
-
-	inline protected_function_result script_throw_on_error(lua_State* L, protected_function_result result) {
-		type t = type_of(L, result.stack_index());
-		std::string err = "sol: ";
-		err += to_string(result.status());
-		err += " error";
-#if SOL_IS_ON(SOL_EXCEPTIONS_I_)
-		std::exception_ptr eptr = std::current_exception();
-		if (eptr) {
-			err += " with a ";
-			try {
-				std::rethrow_exception(eptr);
-			}
-			catch (const std::exception& ex) {
-				err += "std::exception -- ";
-				err.append(ex.what());
-			}
-			catch (const std::string& message) {
-				err += "thrown message -- ";
-				err.append(message);
-			}
-			catch (const char* message) {
-				err += "thrown message -- ";
-				err.append(message);
-			}
-			catch (...) {
-				err.append("thrown but unknown type, cannot serialize into error message");
-			}
-		}
-#endif // serialize exception information if possible
-		if (t == type::string) {
-			err += ": ";
-			string_view serr = stack::unqualified_get<string_view>(L, result.stack_index());
-			err.append(serr.data(), serr.size());
-		}
-#if SOL_IS_ON(SOL_PRINT_ERRORS_I_)
-		std::cerr << "[sol3] An error occurred and has been passed to an error handler: ";
-		std::cerr << err;
-		std::cerr << std::endl;
-#endif
-		// replacing information of stack error into pfr
-		int target = result.stack_index();
-		if (result.pop_count() > 0) {
-			stack::remove(L, target, result.pop_count());
-		}
-		stack::push(L, err);
-		int top = lua_gettop(L);
-		int towards = top - target;
-		if (towards != 0) {
-			lua_rotate(L, top, towards);
-		}
-#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
-		return result;
-#else
-		// just throw our error
-		throw error(detail::direct_error, err);
-#endif // If exceptions are allowed
-	}
-
-	inline protected_function_result script_default_on_error(lua_State* L, protected_function_result pfr) {
-#if SOL_IS_ON(SOL_DEFAULT_PASS_ON_ERROR_I_)
-		return script_pass_on_error(L, std::move(pfr));
-#else
-		return script_throw_on_error(L, std::move(pfr));
-#endif
-	}
-
-	namespace stack {
-		inline error get_traceback_or_errors(lua_State* L) {
-			int p = default_traceback_error_handler(L);
-			sol::error err = stack::get<sol::error>(L, -p);
-			lua_pop(L, p);
-			return err;
-		}
-	} // namespace stack
-} // namespace sol
-
-// end of sol/state_handling.hpp
-
-#include <memory>
-#include <cstddef>
-
-namespace sol {
-
-	class state_view {
-	private:
-		lua_State* L;
-		table reg;
-		global_table global;
-
-		optional<object> is_loaded_package(const std::string& key) {
-			auto loaded = reg.traverse_get<optional<object>>("_LOADED", key);
-			bool is53mod = loaded && !(loaded->is<bool>() && !loaded->as<bool>());
-			if (is53mod)
-				return loaded;
-#if SOL_LUA_VESION_I_ <= 501
-			auto loaded51 = global.traverse_get<optional<object>>("package", "loaded", key);
-			bool is51mod = loaded51 && !(loaded51->is<bool>() && !loaded51->as<bool>());
-			if (is51mod)
-				return loaded51;
-#endif
-			return nullopt;
-		}
-
-		template <typename T>
-		void ensure_package(const std::string& key, T&& sr) {
-#if SOL_LUA_VESION_I_ <= 501
-			auto pkg = global["package"];
-			if (!pkg.valid()) {
-				pkg = create_table_with("loaded", create_table_with(key, sr));
-			}
-			else {
-				auto ld = pkg["loaded"];
-				if (!ld.valid()) {
-					ld = create_table_with(key, sr);
-				}
-				else {
-					ld[key] = sr;
-				}
-			}
-#endif
-			auto loaded = reg["_LOADED"];
-			if (!loaded.valid()) {
-				loaded = create_table_with(key, sr);
-			}
-			else {
-				loaded[key] = sr;
-			}
-		}
-
-		template <typename Fx>
-		object require_core(const std::string& key, Fx&& action, bool create_global = true) {
-			optional<object> loaded = is_loaded_package(key);
-			if (loaded && loaded->valid())
-				return std::move(*loaded);
-			action();
-			stack_reference sr(L, -1);
-			if (create_global)
-				set(key, sr);
-			ensure_package(key, sr);
-			return stack::pop<object>(L);
-		}
-
-	public:
-		using iterator = typename global_table::iterator;
-		using const_iterator = typename global_table::const_iterator;
-
-		state_view(lua_State* Ls) : L(Ls), reg(Ls, LUA_REGISTRYINDEX), global(Ls, detail::global_) {
-		}
-
-		state_view(this_state Ls) : state_view(Ls.L) {
-		}
-
-		lua_State* lua_state() const {
-			return L;
-		}
-
-		template <typename... Args>
-		void open_libraries(Args&&... args) {
-			static_assert(meta::all_same<lib, meta::unqualified_t<Args>...>::value, "all types must be libraries");
-			if constexpr (sizeof...(args) == 0) {
-				luaL_openlibs(L);
-				return;
-			}
-			else {
-				lib libraries[1 + sizeof...(args)] = { lib::count, std::forward<Args>(args)... };
-
-				for (auto&& library : libraries) {
-					switch (library) {
-#if SOL_LUA_VESION_I_ <= 501 && defined(SOL_LUAJIT)
-					case lib::coroutine:
-#endif // luajit opens coroutine base stuff
-					case lib::base:
-						luaL_requiref(L, "base", luaopen_base, 1);
-						lua_pop(L, 1);
-						break;
-					case lib::package:
-						luaL_requiref(L, "package", luaopen_package, 1);
-						lua_pop(L, 1);
-						break;
-#if !defined(SOL_LUAJIT)
-					case lib::coroutine:
-#if SOL_LUA_VESION_I_ > 501
-						luaL_requiref(L, "coroutine", luaopen_coroutine, 1);
-						lua_pop(L, 1);
-#endif // Lua 5.2+ only
-						break;
-#endif // Not LuaJIT - comes builtin
-					case lib::string:
-						luaL_requiref(L, "string", luaopen_string, 1);
-						lua_pop(L, 1);
-						break;
-					case lib::table:
-						luaL_requiref(L, "table", luaopen_table, 1);
-						lua_pop(L, 1);
-						break;
-					case lib::math:
-						luaL_requiref(L, "math", luaopen_math, 1);
-						lua_pop(L, 1);
-						break;
-					case lib::bit32:
-#ifdef SOL_LUAJIT
-						luaL_requiref(L, "bit32", luaopen_bit, 1);
-						lua_pop(L, 1);
-#elif (SOL_LUA_VESION_I_ == 502) || defined(LUA_COMPAT_BITLIB) || defined(LUA_COMPAT_5_2)
-						luaL_requiref(L, "bit32", luaopen_bit32, 1);
-						lua_pop(L, 1);
-#else
-#endif // Lua 5.2 only (deprecated in 5.3 (503)) (Can be turned on with Compat flags)
-						break;
-					case lib::io:
-						luaL_requiref(L, "io", luaopen_io, 1);
-						lua_pop(L, 1);
-						break;
-					case lib::os:
-						luaL_requiref(L, "os", luaopen_os, 1);
-						lua_pop(L, 1);
-						break;
-					case lib::debug:
-						luaL_requiref(L, "debug", luaopen_debug, 1);
-						lua_pop(L, 1);
-						break;
-					case lib::utf8:
-#if SOL_LUA_VESION_I_ > 502 && !defined(SOL_LUAJIT)
-						luaL_requiref(L, "utf8", luaopen_utf8, 1);
-						lua_pop(L, 1);
-#endif // Lua 5.3+ only
-						break;
-					case lib::ffi:
-#ifdef SOL_LUAJIT
-						luaL_requiref(L, "ffi", luaopen_ffi, 1);
-						lua_pop(L, 1);
-#endif // LuaJIT only
-						break;
-					case lib::jit:
-#ifdef SOL_LUAJIT
-						luaL_requiref(L, "jit", luaopen_jit, 0);
-						lua_pop(L, 1);
-#endif // LuaJIT Only
-						break;
-					case lib::count:
-					default:
-						break;
-					}
-				}
-			}
-		}
-
-		object require(const std::string& key, lua_CFunction open_function, bool create_global = true) {
-			luaL_requiref(L, key.c_str(), open_function, create_global ? 1 : 0);
-			return stack::pop<object>(L);
-		}
-
-		object require_script(const std::string& key, const string_view& code, bool create_global = true,
-		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
-			auto action = [this, &code, &chunkname, &mode]() { stack::script(L, code, chunkname, mode); };
-			return require_core(key, action, create_global);
-		}
-
-		object require_file(const std::string& key, const std::string& filename, bool create_global = true, load_mode mode = load_mode::any) {
-			auto action = [this, &filename, &mode]() { stack::script_file(L, filename, mode); };
-			return require_core(key, action, create_global);
-		}
-
-		void clear_package_loaders() {
-			optional<table> maybe_package = this->global["package"];
-			if (!maybe_package) {
-				// package lib wasn't opened
-				// open package lib
-				return;
-			}
-			table& package = *maybe_package;
-			// yay for version differences...
-			// one day Lua 5.1 will die a peaceful death
-			// and its old bones will find blissful rest
-			auto loaders_proxy = package
-#if SOL_LUA_VESION_I_ < 502
-			     ["loaders"]
-#else
-			     ["searchers"]
-#endif
-			     ;
-			if (!loaders_proxy.valid()) {
-				// nothing to clear
-				return;
-			}
-			// we need to create the table for loaders
-			// table does not exist, so create and move forward
-			loaders_proxy = new_table(1, 0);
-		}
-
-		template <typename Fx>
-		void add_package_loader(Fx&& fx, bool clear_all_package_loaders = false) {
-			optional<table> maybe_package = this->global["package"];
-			if (!maybe_package) {
-				// package lib wasn't opened
-				// open package lib
-				return;
-			}
-			table& package = *maybe_package;
-			// yay for version differences...
-			// one day Lua 5.1 will die a peaceful death
-			// and its old bones will find blissful rest
-			auto loaders_proxy = package
-#if SOL_LUA_VESION_I_ < 502
-			     ["loaders"]
-#else
-			     ["searchers"]
-#endif
-			     ;
-			bool make_new_table = clear_all_package_loaders || !loaders_proxy.valid();
-			if (make_new_table) {
-				// we need to create the table for loaders
-				// table does not exist, so create and move forward
-				loaders_proxy = new_table(1, 0);
-			}
-			optional<table> maybe_loaders = loaders_proxy;
-			if (!maybe_loaders) {
-				// loaders/searches
-				// thing exists in package, but it
-				// ain't a table or a table-alike...!
-				return;
-			}
-			table loaders = loaders_proxy;
-			loaders.add(std::forward<Fx>(fx));
-		}
-
-		template <typename E>
-		protected_function_result do_reader(lua_Reader reader, void* data, const basic_environment<E>& env,
-		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
-			detail::typical_chunk_name_t basechunkname = {};
-			const char* chunknametarget = detail::make_chunk_name("lua_Reader", chunkname, basechunkname);
-			load_status x = static_cast<load_status>(lua_load(L, reader, data, chunknametarget, to_string(mode).c_str()));
-			if (x != load_status::ok) {
-				return protected_function_result(L, absolute_index(L, -1), 0, 1, static_cast<call_status>(x));
-			}
-			stack_aligned_protected_function pf(L, -1);
-			set_environment(env, pf);
-			return pf();
-		}
-
-		protected_function_result do_reader(
-		     lua_Reader reader, void* data, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
-			detail::typical_chunk_name_t basechunkname = {};
-			const char* chunknametarget = detail::make_chunk_name("lua_Reader", chunkname, basechunkname);
-			load_status x = static_cast<load_status>(lua_load(L, reader, data, chunknametarget, to_string(mode).c_str()));
-			if (x != load_status::ok) {
-				return protected_function_result(L, absolute_index(L, -1), 0, 1, static_cast<call_status>(x));
-			}
-			stack_aligned_protected_function pf(L, -1);
-			return pf();
-		}
-
-		template <typename E>
-		protected_function_result do_string(const string_view& code, const basic_environment<E>& env,
-		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
-			detail::typical_chunk_name_t basechunkname = {};
-			const char* chunknametarget = detail::make_chunk_name(code, chunkname, basechunkname);
-			load_status x = static_cast<load_status>(luaL_loadbufferx(L, code.data(), code.size(), chunknametarget, to_string(mode).c_str()));
-			if (x != load_status::ok) {
-				return protected_function_result(L, absolute_index(L, -1), 0, 1, static_cast<call_status>(x));
-			}
-			stack_aligned_protected_function pf(L, -1);
-			set_environment(env, pf);
-			return pf();
-		}
-
-		protected_function_result do_string(
-		     const string_view& code, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
-			detail::typical_chunk_name_t basechunkname = {};
-			const char* chunknametarget = detail::make_chunk_name(code, chunkname, basechunkname);
-			load_status x = static_cast<load_status>(luaL_loadbufferx(L, code.data(), code.size(), chunknametarget, to_string(mode).c_str()));
-			if (x != load_status::ok) {
-				return protected_function_result(L, absolute_index(L, -1), 0, 1, static_cast<call_status>(x));
-			}
-			stack_aligned_protected_function pf(L, -1);
-			return pf();
-		}
-
-		template <typename E>
-		protected_function_result do_file(const std::string& filename, const basic_environment<E>& env, load_mode mode = load_mode::any) {
-			load_status x = static_cast<load_status>(luaL_loadfilex(L, filename.c_str(), to_string(mode).c_str()));
-			if (x != load_status::ok) {
-				return protected_function_result(L, absolute_index(L, -1), 0, 1, static_cast<call_status>(x));
-			}
-			stack_aligned_protected_function pf(L, -1);
-			set_environment(env, pf);
-			return pf();
-		}
-
-		protected_function_result do_file(const std::string& filename, load_mode mode = load_mode::any) {
-			load_status x = static_cast<load_status>(luaL_loadfilex(L, filename.c_str(), to_string(mode).c_str()));
-			if (x != load_status::ok) {
-				return protected_function_result(L, absolute_index(L, -1), 0, 1, static_cast<call_status>(x));
-			}
-			stack_aligned_protected_function pf(L, -1);
-			return pf();
-		}
-
-		template <typename Fx,
-		     meta::disable_any<meta::is_string_constructible<meta::unqualified_t<Fx>>,
-		          meta::is_specialization_of<meta::unqualified_t<Fx>, basic_environment>> = meta::enabler>
-		protected_function_result safe_script(
-		     lua_Reader reader, void* data, Fx&& on_error, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
-			protected_function_result pfr = do_reader(reader, data, chunkname, mode);
-			if (!pfr.valid()) {
-				return on_error(L, std::move(pfr));
-			}
-			return pfr;
-		}
-
-		protected_function_result safe_script(
-		     lua_Reader reader, void* data, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
-			return safe_script(reader, data, script_default_on_error, chunkname, mode);
-		}
-
-		template <typename Fx,
-		     meta::disable_any<meta::is_string_constructible<meta::unqualified_t<Fx>>,
-		          meta::is_specialization_of<meta::unqualified_t<Fx>, basic_environment>> = meta::enabler>
-		protected_function_result safe_script(
-		     const string_view& code, Fx&& on_error, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
-			protected_function_result pfr = do_string(code, chunkname, mode);
-			if (!pfr.valid()) {
-				return on_error(L, std::move(pfr));
-			}
-			return pfr;
-		}
-
-		template <typename Fx, typename E>
-		protected_function_result safe_script(const string_view& code, const basic_environment<E>& env, Fx&& on_error,
-		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
-			protected_function_result pfr = do_string(code, env, chunkname, mode);
-			if (!pfr.valid()) {
-				return on_error(L, std::move(pfr));
-			}
-			return pfr;
-		}
-
-		template <typename E>
-		protected_function_result safe_script(const string_view& code, const basic_environment<E>& env,
-		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
-			return safe_script(code, env, script_default_on_error, chunkname, mode);
-		}
-
-		protected_function_result safe_script(
-		     const string_view& code, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
-			return safe_script(code, script_default_on_error, chunkname, mode);
-		}
-
-		template <typename Fx,
-		     meta::disable_any<meta::is_string_constructible<meta::unqualified_t<Fx>>,
-		          meta::is_specialization_of<meta::unqualified_t<Fx>, basic_environment>> = meta::enabler>
-		protected_function_result safe_script_file(const std::string& filename, Fx&& on_error, load_mode mode = load_mode::any) {
-			protected_function_result pfr = do_file(filename, mode);
-			if (!pfr.valid()) {
-				return on_error(L, std::move(pfr));
-			}
-			return pfr;
-		}
-
-		template <typename Fx, typename E>
-		protected_function_result safe_script_file(
-		     const std::string& filename, const basic_environment<E>& env, Fx&& on_error, load_mode mode = load_mode::any) {
-			protected_function_result pfr = do_file(filename, env, mode);
-			if (!pfr.valid()) {
-				return on_error(L, std::move(pfr));
-			}
-			return pfr;
-		}
-
-		template <typename E>
-		protected_function_result safe_script_file(const std::string& filename, const basic_environment<E>& env, load_mode mode = load_mode::any) {
-			return safe_script_file(filename, env, script_default_on_error, mode);
-		}
-
-		protected_function_result safe_script_file(const std::string& filename, load_mode mode = load_mode::any) {
-			return safe_script_file(filename, script_default_on_error, mode);
-		}
-
-		template <typename E>
-		unsafe_function_result unsafe_script(lua_Reader reader, void* data, const basic_environment<E>& env,
-		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
-			detail::typical_chunk_name_t basechunkname = {};
-			const char* chunknametarget = detail::make_chunk_name("lua_Reader", chunkname, basechunkname);
-			int index = lua_gettop(L);
-			if (lua_load(L, reader, data, chunknametarget, to_string(mode).c_str())) {
-				lua_error(L);
-			}
-			set_environment(env, stack_reference(L, raw_index(index + 1)));
-			if (lua_pcall(L, 0, LUA_MULTRET, 0)) {
-				lua_error(L);
-			}
-			int postindex = lua_gettop(L);
-			int returns = postindex - index;
-			return unsafe_function_result(L, (std::max)(postindex - (returns - 1), 1), returns);
-		}
-
-		unsafe_function_result unsafe_script(
-		     lua_Reader reader, void* data, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
-			int index = lua_gettop(L);
-			stack::script(L, reader, data, chunkname, mode);
-			int postindex = lua_gettop(L);
-			int returns = postindex - index;
-			return unsafe_function_result(L, (std::max)(postindex - (returns - 1), 1), returns);
-		}
-
-		template <typename E>
-		unsafe_function_result unsafe_script(const string_view& code, const basic_environment<E>& env,
-		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
-			detail::typical_chunk_name_t basechunkname = {};
-			const char* chunknametarget = detail::make_chunk_name(code, chunkname, basechunkname);
-			int index = lua_gettop(L);
-			if (luaL_loadbufferx(L, code.data(), code.size(), chunknametarget, to_string(mode).c_str())) {
-				lua_error(L);
-			}
-			set_environment(env, stack_reference(L, raw_index(index + 1)));
-			if (lua_pcall(L, 0, LUA_MULTRET, 0)) {
-				lua_error(L);
-			}
-			int postindex = lua_gettop(L);
-			int returns = postindex - index;
-			return unsafe_function_result(L, (std::max)(postindex - (returns - 1), 1), returns);
-		}
-
-		unsafe_function_result unsafe_script(
-		     const string_view& code, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
-			int index = lua_gettop(L);
-			stack::script(L, code, chunkname, mode);
-			int postindex = lua_gettop(L);
-			int returns = postindex - index;
-			return unsafe_function_result(L, (std::max)(postindex - (returns - 1), 1), returns);
-		}
-
-		template <typename E>
-		unsafe_function_result unsafe_script_file(const std::string& filename, const basic_environment<E>& env, load_mode mode = load_mode::any) {
-			int index = lua_gettop(L);
-			if (luaL_loadfilex(L, filename.c_str(), to_string(mode).c_str())) {
-				lua_error(L);
-			}
-			set_environment(env, stack_reference(L, raw_index(index + 1)));
-			if (lua_pcall(L, 0, LUA_MULTRET, 0)) {
-				lua_error(L);
-			}
-			int postindex = lua_gettop(L);
-			int returns = postindex - index;
-			return unsafe_function_result(L, (std::max)(postindex - (returns - 1), 1), returns);
-		}
-
-		unsafe_function_result unsafe_script_file(const std::string& filename, load_mode mode = load_mode::any) {
-			int index = lua_gettop(L);
-			stack::script_file(L, filename, mode);
-			int postindex = lua_gettop(L);
-			int returns = postindex - index;
-			return unsafe_function_result(L, (std::max)(postindex - (returns - 1), 1), returns);
-		}
-
-		template <typename Fx,
-		     meta::disable_any<meta::is_string_constructible<meta::unqualified_t<Fx>>,
-		          meta::is_specialization_of<meta::unqualified_t<Fx>, basic_environment>> = meta::enabler>
-		protected_function_result script(
-		     const string_view& code, Fx&& on_error, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
-			return safe_script(code, std::forward<Fx>(on_error), chunkname, mode);
-		}
-
-		template <typename Fx,
-		     meta::disable_any<meta::is_string_constructible<meta::unqualified_t<Fx>>,
-		          meta::is_specialization_of<meta::unqualified_t<Fx>, basic_environment>> = meta::enabler>
-		protected_function_result script_file(const std::string& filename, Fx&& on_error, load_mode mode = load_mode::any) {
-			return safe_script_file(filename, std::forward<Fx>(on_error), mode);
-		}
-
-		template <typename Fx, typename E>
-		protected_function_result script(const string_view& code, const basic_environment<E>& env, Fx&& on_error,
-		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
-			return safe_script(code, env, std::forward<Fx>(on_error), chunkname, mode);
-		}
-
-		template <typename Fx, typename E>
-		protected_function_result script_file(const std::string& filename, const basic_environment<E>& env, Fx&& on_error, load_mode mode = load_mode::any) {
-			return safe_script_file(filename, env, std::forward<Fx>(on_error), mode);
-		}
-
-		protected_function_result script(
-		     const string_view& code, const environment& env, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
-			return safe_script(code, env, script_default_on_error, chunkname, mode);
-		}
-
-		protected_function_result script_file(const std::string& filename, const environment& env, load_mode mode = load_mode::any) {
-			return safe_script_file(filename, env, script_default_on_error, mode);
-		}
-
-#if SOL_IS_ON(SOL_SAFE_FUNCTION_OBJECTS_I_)
-		protected_function_result script(
-		     lua_Reader reader, void* data, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
-			return safe_script(reader, data, chunkname, mode);
-		}
-
-		protected_function_result script(
-		     const string_view& code, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
-			return safe_script(code, chunkname, mode);
-		}
-
-		protected_function_result script_file(const std::string& filename, load_mode mode = load_mode::any) {
-			return safe_script_file(filename, mode);
-		}
-#else
-		unsafe_function_result script(const string_view& code, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
-			return unsafe_script(code, chunkname, mode);
-		}
-
-		unsafe_function_result script_file(const std::string& filename, load_mode mode = load_mode::any) {
-			return unsafe_script_file(filename, mode);
-		}
-#endif
-		load_result load(const string_view& code, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
-			detail::typical_chunk_name_t basechunkname = {};
-			const char* chunknametarget = detail::make_chunk_name(code, chunkname, basechunkname);
-			load_status x = static_cast<load_status>(luaL_loadbufferx(L, code.data(), code.size(), chunknametarget, to_string(mode).c_str()));
-			return load_result(L, absolute_index(L, -1), 1, 1, x);
-		}
-
-		load_result load_buffer(const char* buff, size_t size, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
-			return load(string_view(buff, size), chunkname, mode);
-		}
-
-		load_result load_buffer(
-		     const std::byte* buff, size_t size, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
-			return load(string_view(reinterpret_cast<const char*>(buff), size), chunkname, mode);
-		}
-
-		load_result load_file(const std::string& filename, load_mode mode = load_mode::any) {
-			load_status x = static_cast<load_status>(luaL_loadfilex(L, filename.c_str(), to_string(mode).c_str()));
-			return load_result(L, absolute_index(L, -1), 1, 1, x);
-		}
-
-		load_result load(lua_Reader reader, void* data, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
-			detail::typical_chunk_name_t basechunkname = {};
-			const char* chunknametarget = detail::make_chunk_name("lua_Reader", chunkname, basechunkname);
-			load_status x = static_cast<load_status>(lua_load(L, reader, data, chunknametarget, to_string(mode).c_str()));
-			return load_result(L, absolute_index(L, -1), 1, 1, x);
-		}
-
-		iterator begin() const {
-			return global.begin();
-		}
-
-		iterator end() const {
-			return global.end();
-		}
-
-		const_iterator cbegin() const {
-			return global.cbegin();
-		}
-
-		const_iterator cend() const {
-			return global.cend();
-		}
-
-		global_table globals() const {
-			// if we return a reference
-			// we'll be screwed a bit
-			return global;
-		}
-
-		global_table& globals() {
-			return global;
-		}
-
-		table registry() const {
-			return reg;
-		}
-
-		std::size_t memory_used() const {
-			return total_memory_used(lua_state());
-		}
-
-		int stack_top() const {
-			return stack::top(L);
-		}
-
-		int stack_clear() {
-			int s = stack_top();
-			lua_pop(L, s);
-			return s;
-		}
-
-		bool supports_gc_mode(gc_mode mode) const noexcept {
-#if SOL_LUA_VESION_I_ >= 504
-			// supports all modes
-			(void)mode;
-			return true;
-#endif
-			return mode == gc_mode::default_value;
-		}
-
-		bool is_gc_on() const {
-#if SOL_LUA_VESION_I_ >= 502
-			return lua_gc(lua_state(), LUA_GCISRUNNING, 0) == 1;
-#else
-			// You cannot turn it off in Lua 5.1
-			return true;
-#endif
-		}
-
-		void collect_garbage() {
-			lua_gc(lua_state(), LUA_GCCOLLECT, 0);
-		}
-
-		void collect_gc() {
-			collect_garbage();
-		}
-
-		bool step_gc(int step_size_kilobytes) {
-			// THOUGHT: std::chrono-alikes to map "kilobyte size" here...?
-			// Make it harder to give MB or KB to a B parameter...?
-			// Probably overkill for now.
-#if SOL_LUA_VESION_I_ >= 504
-			// The manual implies that this function is almost always successful...
-			// is it?? It could depend on the GC mode...
-			return lua_gc(lua_state(), LUA_GCSTEP, step_size_kilobytes) != 0;
-#else
-			return lua_gc(lua_state(), LUA_GCSTEP, step_size_kilobytes) == 1;
-#endif
-		}
-
-		void restart_gc() {
-			lua_gc(lua_state(), LUA_GCRESTART, 0);
-		}
-
-		void stop_gc() {
-			lua_gc(lua_state(), LUA_GCSTOP, 0);
-		}
-
-		// Returns the old GC mode. Check support using the supports_gc_mode function.
-		gc_mode change_gc_mode_incremental(int pause, int step_multiplier, int step_byte_size) {
-			// "What the fuck does any of this mean??"
-			// http://www.lua.org/manual/5.4/manual.html#2.5.1
-
-			// THOUGHT: std::chrono-alikes to map "byte size" here...?
-			// Make it harder to give MB or KB to a B parameter...?
-			// Probably overkill for now.
-#if SOL_LUA_VESION_I_ >= 504
-			int old_mode = lua_gc(lua_state(), LUA_GCINC, pause, step_multiplier, step_byte_size);
-			if (old_mode == LUA_GCGEN) {
-				return gc_mode::generational;
-			}
-			else if (old_mode == LUA_GCINC) {
-				return gc_mode::incremental;
-			}
-#else
-			lua_gc(lua_state(), LUA_GCSETPAUSE, pause);
-			lua_gc(lua_state(), LUA_GCSETSTEPMUL, step_multiplier);
-			(void)step_byte_size; // means nothing in older versions
-#endif
-			return gc_mode::default_value;
-		}
-
-		// Returns the old GC mode. Check support using the supports_gc_mode function.
-		gc_mode change_gc_mode_generational(int minor_multiplier, int major_multiplier) {
-#if SOL_LUA_VESION_I_ >= 504
-			// "What does this shit mean?"
-			// http://www.lua.org/manual/5.4/manual.html#2.5.2
-			int old_mode = lua_gc(lua_state(), LUA_GCGEN, minor_multiplier, major_multiplier);
-			if (old_mode == LUA_GCGEN) {
-				return gc_mode::generational;
-			}
-			else if (old_mode == LUA_GCINC) {
-				return gc_mode::incremental;
-			}
-#endif
-			return gc_mode::default_value;
-		}
-
-		operator lua_State*() const {
-			return lua_state();
-		}
-
-		void set_panic(lua_CFunction panic) {
-			lua_atpanic(lua_state(), panic);
-		}
-
-		void set_exception_handler(exception_handler_function handler) {
-			set_default_exception_handler(lua_state(), handler);
-		}
-
-		template <typename... Args, typename... Keys>
-		decltype(auto) get(Keys&&... keys) const {
-			return global.get<Args...>(std::forward<Keys>(keys)...);
-		}
-
-		template <typename T, typename Key>
-		decltype(auto) get_or(Key&& key, T&& otherwise) const {
-			return global.get_or(std::forward<Key>(key), std::forward<T>(otherwise));
-		}
-
-		template <typename T, typename Key, typename D>
-		decltype(auto) get_or(Key&& key, D&& otherwise) const {
-			return global.get_or<T>(std::forward<Key>(key), std::forward<D>(otherwise));
-		}
-
-		template <typename... Args>
-		state_view& set(Args&&... args) {
-			global.set(std::forward<Args>(args)...);
-			return *this;
-		}
-
-		template <typename T, typename... Keys>
-		decltype(auto) traverse_get(Keys&&... keys) const {
-			return global.traverse_get<T>(std::forward<Keys>(keys)...);
-		}
-
-		template <typename... Args>
-		state_view& traverse_set(Args&&... args) {
-			global.traverse_set(std::forward<Args>(args)...);
-			return *this;
-		}
-
-		template <typename Class, typename... Args>
-		usertype<Class> new_usertype(const std::string& name, Args&&... args) {
-			return global.new_usertype<Class>(name, std::forward<Args>(args)...);
-		}
-
-		template <bool read_only = true, typename... Args>
-		state_view& new_enum(const string_view& name, Args&&... args) {
-			global.new_enum<read_only>(name, std::forward<Args>(args)...);
-			return *this;
-		}
-
-		template <typename T, bool read_only = true>
-		state_view& new_enum(const string_view& name, std::initializer_list<std::pair<string_view, T>> items) {
-			global.new_enum<T, read_only>(name, std::move(items));
-			return *this;
-		}
-
-		template <typename Fx>
-		void for_each(Fx&& fx) {
-			global.for_each(std::forward<Fx>(fx));
-		}
-
-		template <typename T>
-		table_proxy<global_table&, detail::proxy_key_t<T>> operator[](T&& key) {
-			return global[std::forward<T>(key)];
-		}
-
-		template <typename T>
-		table_proxy<const global_table&, detail::proxy_key_t<T>> operator[](T&& key) const {
-			return global[std::forward<T>(key)];
-		}
-
-		template <typename Sig, typename... Args, typename Key>
-		state_view& set_function(Key&& key, Args&&... args) {
-			global.set_function<Sig>(std::forward<Key>(key), std::forward<Args>(args)...);
-			return *this;
-		}
-
-		template <typename... Args, typename Key>
-		state_view& set_function(Key&& key, Args&&... args) {
-			global.set_function(std::forward<Key>(key), std::forward<Args>(args)...);
-			return *this;
-		}
-
-		template <typename Name>
-		table create_table(Name&& name, int narr = 0, int nrec = 0) {
-			return global.create(std::forward<Name>(name), narr, nrec);
-		}
-
-		template <typename Name, typename Key, typename Value, typename... Args>
-		table create_table(Name&& name, int narr, int nrec, Key&& key, Value&& value, Args&&... args) {
-			return global.create(std::forward<Name>(name), narr, nrec, std::forward<Key>(key), std::forward<Value>(value), std::forward<Args>(args)...);
-		}
-
-		template <typename Name, typename... Args>
-		table create_named_table(Name&& name, Args&&... args) {
-			table x = global.create_with(std::forward<Args>(args)...);
-			global.set(std::forward<Name>(name), x);
-			return x;
-		}
-
-		table create_table(int narr = 0, int nrec = 0) {
-			return create_table(lua_state(), narr, nrec);
-		}
-
-		template <typename Key, typename Value, typename... Args>
-		table create_table(int narr, int nrec, Key&& key, Value&& value, Args&&... args) {
-			return create_table(lua_state(), narr, nrec, std::forward<Key>(key), std::forward<Value>(value), std::forward<Args>(args)...);
-		}
-
-		template <typename... Args>
-		table create_table_with(Args&&... args) {
-			return create_table_with(lua_state(), std::forward<Args>(args)...);
-		}
-
-		static inline table create_table(lua_State* L, int narr = 0, int nrec = 0) {
-			return global_table::create(L, narr, nrec);
-		}
-
-		template <typename Key, typename Value, typename... Args>
-		static inline table create_table(lua_State* L, int narr, int nrec, Key&& key, Value&& value, Args&&... args) {
-			return global_table::create(L, narr, nrec, std::forward<Key>(key), std::forward<Value>(value), std::forward<Args>(args)...);
-		}
-
-		template <typename... Args>
-		static inline table create_table_with(lua_State* L, Args&&... args) {
-			return global_table::create_with(L, std::forward<Args>(args)...);
-		}
-	};
-} // namespace sol
-
-// end of sol/state_view.hpp
-
-// beginning of sol/thread.hpp
-
-namespace sol {
-	struct lua_thread_state {
-		lua_State* L;
-
-		lua_thread_state(lua_State* Ls)
-		: L(Ls) {
-		}
-
-		lua_State* lua_state() const noexcept {
-			return L;
-		}
-		operator lua_State*() const noexcept {
-			return lua_state();
-		}
-		lua_State* operator->() const noexcept {
-			return lua_state();
-		}
-	};
-
-	namespace stack {
-		template <>
-		struct unqualified_pusher<lua_thread_state> {
-			int push(lua_State*, lua_thread_state lts) {
-				lua_pushthread(lts.L);
-				return 1;
-			}
-		};
-
-		template <>
-		struct unqualified_getter<lua_thread_state> {
-			lua_thread_state get(lua_State* L, int index, record& tracking) {
-				tracking.use(1);
-				lua_thread_state lts( lua_tothread(L, index) );
-				return lts;
-			}
-		};
-
-		template <>
-		struct unqualified_check_getter<lua_thread_state> {
-			template <typename Handler>
-			optional<lua_thread_state> get(lua_State* L, int index, Handler&& handler, record& tracking) {
-				lua_thread_state lts( lua_tothread(L, index) );
-				if (lts.lua_state() == nullptr) {
-					handler(L, index, type::thread, type_of(L, index), "value is not a valid thread type");
-					return nullopt;
-				}
-				tracking.use(1);
-				return lts;
-			}
-		};
-	} // namespace stack
-
-	template <typename ref_t>
-	class basic_thread : public basic_object<ref_t> {
-	private:
-		using base_t = basic_object<ref_t>;
-
-	public:
-		using base_t::lua_state;
-
-		basic_thread() noexcept = default;
-		basic_thread(const basic_thread&) = default;
-		basic_thread(basic_thread&&) = default;
-		template <typename T, meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_thread>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
-		basic_thread(T&& r)
-		: base_t(std::forward<T>(r)) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			auto pp = stack::push_pop(*this);
-			constructor_handler handler{};
-			stack::check<basic_thread>(lua_state(), -1, handler);
-#endif // Safety
-		}
-		basic_thread(const stack_reference& r)
-		: basic_thread(r.lua_state(), r.stack_index()){};
-		basic_thread(stack_reference&& r)
-		: basic_thread(r.lua_state(), r.stack_index()){};
-		basic_thread& operator=(const basic_thread&) = default;
-		basic_thread& operator=(basic_thread&&) = default;
-		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
-		basic_thread(lua_State* L, T&& r)
-		: base_t(L, std::forward<T>(r)) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			auto pp = stack::push_pop(*this);
-			constructor_handler handler{};
-			stack::check<basic_thread>(lua_state(), -1, handler);
-#endif // Safety
-		}
-		basic_thread(lua_State* L, int index = -1)
-		: base_t(L, index) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			constructor_handler handler{};
-			stack::check<basic_thread>(L, index, handler);
-#endif // Safety
-		}
-		basic_thread(lua_State* L, ref_index index)
-		: base_t(L, index) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			auto pp = stack::push_pop(*this);
-			constructor_handler handler{};
-			stack::check<basic_thread>(lua_state(), -1, handler);
-#endif // Safety
-		}
-		basic_thread(lua_State* L, lua_State* actualthread)
-		: basic_thread(L, lua_thread_state{ actualthread }) {
-		}
-		basic_thread(lua_State* L, this_state actualthread)
-		: basic_thread(L, lua_thread_state{ actualthread.L }) {
-		}
-		basic_thread(lua_State* L, lua_thread_state actualthread)
-		: base_t(L, -stack::push(L, actualthread)) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			constructor_handler handler{};
-			stack::check<basic_thread>(lua_state(), -1, handler);
-#endif // Safety
-			if (!is_stack_based<base_t>::value) {
-				lua_pop(lua_state(), 1);
-			}
-		}
-
-		state_view state() const {
-			return state_view(this->thread_state());
-		}
-
-		bool is_main_thread() const {
-			return stack::is_main_thread(this->thread_state());
-		}
-
-		lua_State* thread_state() const {
-			auto pp = stack::push_pop(*this);
-			lua_State* lthread = lua_tothread(lua_state(), -1);
-			return lthread;
-		}
-
-		thread_status status() const {
-			lua_State* lthread = thread_state();
-			auto lstat = static_cast<thread_status>(lua_status(lthread));
-			if (lstat == thread_status::ok) {
-				lua_Debug ar;
-				if (lua_getstack(lthread, 0, &ar) > 0)
-					return thread_status::ok;
-				else if (lua_gettop(lthread) == 0)
-					return thread_status::dead;
-				else
-					return thread_status::yielded;
-			}
-			return lstat;
-		}
-
-		basic_thread create() {
-			return create(lua_state());
-		}
-
-		static basic_thread create(lua_State* L) {
-			lua_newthread(L);
-			basic_thread result(L);
-			if (!is_stack_based<base_t>::value) {
-				lua_pop(L, 1);
-			}
-			return result;
-		}
-	};
-
-	typedef basic_thread<reference> thread;
-	typedef basic_thread<stack_reference> stack_thread;
-} // namespace sol
-
-// end of sol/thread.hpp
-
-namespace sol {
-
-	class state : private std::unique_ptr<lua_State, detail::state_deleter>, public state_view {
-	private:
-		typedef std::unique_ptr<lua_State, detail::state_deleter> unique_base;
-
-	public:
-		state(lua_CFunction panic = default_at_panic)
-		: unique_base(luaL_newstate()), state_view(unique_base::get()) {
-			set_default_state(unique_base::get(), panic);
-		}
-
-		state(lua_CFunction panic, lua_Alloc alfunc, void* alpointer = nullptr)
-		: unique_base(lua_newstate(alfunc, alpointer)), state_view(unique_base::get()) {
-			set_default_state(unique_base::get(), panic);
-		}
-
-		state(const state&) = delete;
-		state(state&&) = default;
-		state& operator=(const state&) = delete;
-		state& operator=(state&& that) {
-			state_view::operator=(std::move(that));
-			unique_base::operator=(std::move(that));
-			return *this;
-		}
-
-		using state_view::get;
-
-		~state() {
-		}
-	};
-} // namespace sol
-
-// end of sol/state.hpp
-
-// beginning of sol/coroutine.hpp
-
-namespace sol {
-	template <typename ref_t>
-	class basic_coroutine : public basic_object<ref_t> {
-	private:
-		using base_t = basic_object<ref_t>;
-
-	public:
-		typedef reference handler_t;
-		handler_t error_handler;
-
-	private:
-		call_status stats = call_status::yielded;
-
-		void luacall(std::ptrdiff_t argcount, std::ptrdiff_t) {
-#if SOL_LUA_VESION_I_ >= 504
-			int nresults;
-			stats = static_cast<call_status>(lua_resume(lua_state(), nullptr, static_cast<int>(argcount), &nresults));
-#else
-			stats = static_cast<call_status>(lua_resume(lua_state(), nullptr, static_cast<int>(argcount)));
-#endif
-		}
-
-		template <std::size_t... I, typename... Ret>
-		auto invoke(types<Ret...>, std::index_sequence<I...>, std::ptrdiff_t n) {
-			luacall(n, sizeof...(Ret));
-			return stack::pop<std::tuple<Ret...>>(lua_state());
-		}
-
-		template <std::size_t I, typename Ret>
-		Ret invoke(types<Ret>, std::index_sequence<I>, std::ptrdiff_t n) {
-			luacall(n, 1);
-			return stack::pop<Ret>(lua_state());
-		}
-
-		template <std::size_t I>
-		void invoke(types<void>, std::index_sequence<I>, std::ptrdiff_t n) {
-			luacall(n, 0);
-		}
-
-		protected_function_result invoke(types<>, std::index_sequence<>, std::ptrdiff_t n) {
-			int firstreturn = 1;
-			luacall(n, LUA_MULTRET);
-			int poststacksize = lua_gettop(this->lua_state());
-			int returncount = poststacksize - (firstreturn - 1);
-			if (error()) {
-				if (error_handler.valid()) {
-					string_view err = stack::get<string_view>(this->lua_state(), poststacksize);
-					error_handler.push();
-					stack::push(this->lua_state(), err);
-					lua_call(lua_state(), 1, 1);
-				}
-				return protected_function_result(this->lua_state(), lua_absindex(this->lua_state(), -1), 1, returncount, status());
-			}
-			return protected_function_result(this->lua_state(), firstreturn, returncount, returncount, status());
-		}
-
-	public:
-		using base_t::lua_state;
-
-		basic_coroutine() = default;
-		template <typename T,
-		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_coroutine>>,
-		          meta::neg<std::is_base_of<proxy_base_tag, meta::unqualified_t<T>>>, meta::neg<std::is_same<base_t, stack_reference>>,
-		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
-		basic_coroutine(T&& r) noexcept
-		: base_t(std::forward<T>(r)), error_handler(detail::get_default_handler<reference, is_main_threaded<base_t>::value>(r.lua_state())) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			if (!is_function<meta::unqualified_t<T>>::value) {
-				auto pp = stack::push_pop(*this);
-				constructor_handler handler {};
-				stack::check<basic_coroutine>(lua_state(), -1, handler);
-			}
-#endif // Safety
-		}
-		basic_coroutine(const basic_coroutine&) = default;
-		basic_coroutine& operator=(const basic_coroutine&) = default;
-		basic_coroutine(basic_coroutine&&) = default;
-		basic_coroutine& operator=(basic_coroutine&&) = default;
-		basic_coroutine(const basic_function<base_t>& b)
-		: basic_coroutine(b, detail::get_default_handler<reference, is_main_threaded<base_t>::value>(b.lua_state())) {
-		}
-		basic_coroutine(basic_function<base_t>&& b)
-		: basic_coroutine(std::move(b), detail::get_default_handler<reference, is_main_threaded<base_t>::value>(b.lua_state())) {
-		}
-		basic_coroutine(const basic_function<base_t>& b, handler_t eh) : base_t(b), error_handler(std::move(eh)) {
-		}
-		basic_coroutine(basic_function<base_t>&& b, handler_t eh) : base_t(std::move(b)), error_handler(std::move(eh)) {
-		}
-		basic_coroutine(const stack_reference& r)
-		: basic_coroutine(r.lua_state(), r.stack_index(), detail::get_default_handler<reference, is_main_threaded<base_t>::value>(r.lua_state())) {
-		}
-		basic_coroutine(stack_reference&& r)
-		: basic_coroutine(r.lua_state(), r.stack_index(), detail::get_default_handler<reference, is_main_threaded<base_t>::value>(r.lua_state())) {
-		}
-		basic_coroutine(const stack_reference& r, handler_t eh) : basic_coroutine(r.lua_state(), r.stack_index(), std::move(eh)) {
-		}
-		basic_coroutine(stack_reference&& r, handler_t eh) : basic_coroutine(r.lua_state(), r.stack_index(), std::move(eh)) {
-		}
-
-		template <typename Super>
-		basic_coroutine(const proxy_base<Super>& p)
-		: basic_coroutine(p, detail::get_default_handler<reference, is_main_threaded<base_t>::value>(p.lua_state())) {
-		}
-		template <typename Super>
-		basic_coroutine(proxy_base<Super>&& p)
-		: basic_coroutine(std::move(p), detail::get_default_handler<reference, is_main_threaded<base_t>::value>(p.lua_state())) {
-		}
-		template <typename Proxy, typename Handler,
-		     meta::enable<std::is_base_of<proxy_base_tag, meta::unqualified_t<Proxy>>, meta::neg<is_lua_index<meta::unqualified_t<Handler>>>> = meta::enabler>
-		basic_coroutine(Proxy&& p, Handler&& eh) : basic_coroutine(detail::force_cast<base_t>(p), std::forward<Handler>(eh)) {
-		}
-
-		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
-		basic_coroutine(lua_State* L, T&& r)
-		: basic_coroutine(L, std::forward<T>(r), detail::get_default_handler<reference, is_main_threaded<base_t>::value>(L)) {
-		}
-		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
-		basic_coroutine(lua_State* L, T&& r, handler_t eh) : base_t(L, std::forward<T>(r)), error_handler(std::move(eh)) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			auto pp = stack::push_pop(*this);
-			constructor_handler handler {};
-			stack::check<basic_coroutine>(lua_state(), -1, handler);
-#endif // Safety
-		}
-
-		basic_coroutine(lua_nil_t n) : base_t(n), error_handler(n) {
-		}
-
-		basic_coroutine(lua_State* L, int index = -1)
-		: basic_coroutine(L, index, detail::get_default_handler<reference, is_main_threaded<base_t>::value>(L)) {
-		}
-		basic_coroutine(lua_State* L, int index, handler_t eh) : base_t(L, index), error_handler(std::move(eh)) {
-#ifdef SOL_SAFE_REFERENCES
-			constructor_handler handler {};
-			stack::check<basic_coroutine>(L, index, handler);
-#endif // Safety
-		}
-		basic_coroutine(lua_State* L, absolute_index index)
-		: basic_coroutine(L, index, detail::get_default_handler<reference, is_main_threaded<base_t>::value>(L)) {
-		}
-		basic_coroutine(lua_State* L, absolute_index index, handler_t eh) : base_t(L, index), error_handler(std::move(eh)) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			constructor_handler handler {};
-			stack::check<basic_coroutine>(L, index, handler);
-#endif // Safety
-		}
-		basic_coroutine(lua_State* L, raw_index index)
-		: basic_coroutine(L, index, detail::get_default_handler<reference, is_main_threaded<base_t>::value>(L)) {
-		}
-		basic_coroutine(lua_State* L, raw_index index, handler_t eh) : base_t(L, index), error_handler(std::move(eh)) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			constructor_handler handler {};
-			stack::check<basic_coroutine>(L, index, handler);
-#endif // Safety
-		}
-		basic_coroutine(lua_State* L, ref_index index)
-		: basic_coroutine(L, index, detail::get_default_handler<reference, is_main_threaded<base_t>::value>(L)) {
-		}
-		basic_coroutine(lua_State* L, ref_index index, handler_t eh) : base_t(L, index), error_handler(std::move(eh)) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			auto pp = stack::push_pop(*this);
-			constructor_handler handler {};
-			stack::check<basic_coroutine>(lua_state(), -1, handler);
-#endif // Safety
-		}
-
-		call_status status() const noexcept {
-			return stats;
-		}
-
-		bool error() const noexcept {
-			call_status cs = status();
-			return cs != call_status::ok && cs != call_status::yielded;
-		}
-
-		bool runnable() const noexcept {
-			return base_t::valid() && (status() == call_status::yielded);
-		}
-
-		explicit operator bool() const noexcept {
-			return runnable();
-		}
-
-		template <typename... Args>
-		protected_function_result operator()(Args&&... args) {
-			return call<>(std::forward<Args>(args)...);
-		}
-
-		template <typename... Ret, typename... Args>
-		decltype(auto) operator()(types<Ret...>, Args&&... args) {
-			return call<Ret...>(std::forward<Args>(args)...);
-		}
-
-		template <typename... Ret, typename... Args>
-		decltype(auto) call(Args&&... args) {
-			// some users screw up coroutine.create
-			// and try to use it with sol::coroutine without ever calling the first resume in Lua
-			// this makes the stack incompatible with other kinds of stacks: protect against this
-			// make sure coroutines don't screw us over
-			base_t::push();
-			int pushcount = stack::multi_push_reference(lua_state(), std::forward<Args>(args)...);
-			return invoke(types<Ret...>(), std::make_index_sequence<sizeof...(Ret)>(), pushcount);
-		}
-	};
-} // namespace sol
-
-// end of sol/coroutine.hpp
-
-// beginning of sol/userdata.hpp
-
-namespace sol {
-	template <typename base_type>
-	class basic_userdata : public basic_table<base_type> {
-	private:
-		using base_t = basic_table<base_type>;
-
-	public:
-		using base_t::lua_state;
-
-		basic_userdata() noexcept = default;
-		template <typename T, meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_userdata>>, meta::neg<std::is_same<base_t, stack_reference>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
-		basic_userdata(T&& r) noexcept
-		: base_t(std::forward<T>(r)) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			if (!is_userdata<meta::unqualified_t<T>>::value) {
-				auto pp = stack::push_pop(*this);
-				type_assert(lua_state(), -1, type::userdata);
-			}
-#endif // Safety
-		}
-		basic_userdata(const basic_userdata&) = default;
-		basic_userdata(basic_userdata&&) = default;
-		basic_userdata& operator=(const basic_userdata&) = default;
-		basic_userdata& operator=(basic_userdata&&) = default;
-		basic_userdata(const stack_reference& r)
-		: basic_userdata(r.lua_state(), r.stack_index()) {
-		}
-		basic_userdata(stack_reference&& r)
-		: basic_userdata(r.lua_state(), r.stack_index()) {
-		}
-		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
-		basic_userdata(lua_State* L, T&& r)
-		: base_t(L, std::forward<T>(r)) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			auto pp = stack::push_pop(*this);
-			constructor_handler handler{};
-			stack::check<basic_userdata>(L, -1, handler);
-#endif // Safety
-		}
-		basic_userdata(lua_State* L, int index = -1)
-		: base_t(detail::no_safety, L, index) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			constructor_handler handler{};
-			stack::check<basic_userdata>(L, index, handler);
-#endif // Safety
-		}
-		basic_userdata(lua_State* L, ref_index index)
-		: base_t(detail::no_safety, L, index) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			auto pp = stack::push_pop(*this);
-			constructor_handler handler{};
-			stack::check<basic_userdata>(L, -1, handler);
-#endif // Safety
-		}
-	};
-
-	template <typename base_type>
-	class basic_lightuserdata : public basic_object_base<base_type> {
-		typedef basic_object_base<base_type> base_t;
-
-	public:
-		using base_t::lua_state;
-
-		basic_lightuserdata() noexcept = default;
-		template <typename T, meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_lightuserdata>>, meta::neg<std::is_same<base_t, stack_reference>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
-		basic_lightuserdata(T&& r) noexcept
-		: base_t(std::forward<T>(r)) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			if (!is_lightuserdata<meta::unqualified_t<T>>::value) {
-				auto pp = stack::push_pop(*this);
-				type_assert(lua_state(), -1, type::lightuserdata);
-			}
-#endif // Safety
-		}
-		basic_lightuserdata(const basic_lightuserdata&) = default;
-		basic_lightuserdata(basic_lightuserdata&&) = default;
-		basic_lightuserdata& operator=(const basic_lightuserdata&) = default;
-		basic_lightuserdata& operator=(basic_lightuserdata&&) = default;
-		basic_lightuserdata(const stack_reference& r)
-		: basic_lightuserdata(r.lua_state(), r.stack_index()) {
-		}
-		basic_lightuserdata(stack_reference&& r)
-		: basic_lightuserdata(r.lua_state(), r.stack_index()) {
-		}
-		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
-		basic_lightuserdata(lua_State* L, T&& r)
-		: basic_lightuserdata(L, std::forward<T>(r)) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			auto pp = stack::push_pop(*this);
-			constructor_handler handler{};
-			stack::check<basic_lightuserdata>(lua_state(), -1, handler);
-#endif // Safety
-		}
-		basic_lightuserdata(lua_State* L, int index = -1)
-		: base_t(L, index) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			constructor_handler handler{};
-			stack::check<basic_lightuserdata>(L, index, handler);
-#endif // Safety
-		}
-		basic_lightuserdata(lua_State* L, ref_index index)
-		: base_t(L, index) {
-#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
-			auto pp = stack::push_pop(*this);
-			constructor_handler handler{};
-			stack::check<basic_lightuserdata>(lua_state(), index, handler);
-#endif // Safety
-		}
-	};
-
-} // namespace sol
-
-// end of sol/userdata.hpp
-
-// beginning of sol/as_args.hpp
-
-namespace sol {
-	template <typename T>
-	struct as_args_t {
-		T src;
-	};
-
-	template <typename Source>
-	auto as_args(Source&& source) {
-		return as_args_t<Source> { std::forward<Source>(source) };
-	}
-
-	namespace stack {
-		template <typename T>
-		struct unqualified_pusher<as_args_t<T>> {
-			int push(lua_State* L, const as_args_t<T>& e) {
-				int p = 0;
-				for (const auto& i : e.src) {
-					p += stack::push(L, i);
-				}
-				return p;
-			}
-		};
-	} // namespace stack
-} // namespace sol
-
-// end of sol/as_args.hpp
-
-// beginning of sol/variadic_args.hpp
-
-#include <limits>
-#include <iterator>
-
-namespace sol {
-	struct variadic_args {
-	private:
-		lua_State* L;
-		int index;
-		int stacktop;
-
-	public:
-		typedef stack_proxy reference_type;
-		typedef stack_proxy value_type;
-		typedef stack_proxy* pointer;
-		typedef std::ptrdiff_t difference_type;
-		typedef std::size_t size_type;
-		typedef stack_iterator<stack_proxy, false> iterator;
-		typedef stack_iterator<stack_proxy, true> const_iterator;
-		typedef std::reverse_iterator<iterator> reverse_iterator;
-		typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-
-		variadic_args() = default;
-		variadic_args(lua_State* luastate, int stackindex = -1)
-			: L(luastate), index(lua_absindex(luastate, stackindex)), stacktop(lua_gettop(luastate)) {
-		}
-		variadic_args(lua_State* luastate, int stackindex, int lastindex)
-			: L(luastate), index(lua_absindex(luastate, stackindex)), stacktop(lastindex) {
-		}
-		variadic_args(const variadic_args&) = default;
-		variadic_args& operator=(const variadic_args&) = default;
-		variadic_args(variadic_args&& o)
-			: L(o.L), index(o.index), stacktop(o.stacktop) {
-			// Must be manual, otherwise destructor will screw us
-			// return count being 0 is enough to keep things clean
-			// but will be thorough
-			o.L = nullptr;
-			o.index = 0;
-			o.stacktop = 0;
-		}
-		variadic_args& operator=(variadic_args&& o) {
-			L = o.L;
-			index = o.index;
-			stacktop = o.stacktop;
-			// Must be manual, otherwise destructor will screw us
-			// return count being 0 is enough to keep things clean
-			// but will be thorough
-			o.L = nullptr;
-			o.index = 0;
-			o.stacktop = 0;
-			return *this;
-		}
-
-		iterator begin() {
-			return iterator(L, index, stacktop + 1);
-		}
-		iterator end() {
-			return iterator(L, stacktop + 1, stacktop + 1);
-		}
-		const_iterator begin() const {
-			return const_iterator(L, index, stacktop + 1);
-		}
-		const_iterator end() const {
-			return const_iterator(L, stacktop + 1, stacktop + 1);
-		}
-		const_iterator cbegin() const {
-			return begin();
-		}
-		const_iterator cend() const {
-			return end();
-		}
-
-		reverse_iterator rbegin() {
-			return std::reverse_iterator<iterator>(begin());
-		}
-		reverse_iterator rend() {
-			return std::reverse_iterator<iterator>(end());
-		}
-		const_reverse_iterator rbegin() const {
-			return std::reverse_iterator<const_iterator>(begin());
-		}
-		const_reverse_iterator rend() const {
-			return std::reverse_iterator<const_iterator>(end());
-		}
-		const_reverse_iterator crbegin() const {
-			return std::reverse_iterator<const_iterator>(cbegin());
-		}
-		const_reverse_iterator crend() const {
-			return std::reverse_iterator<const_iterator>(cend());
-		}
-
-		int push() const {
-			return push(L);
-		}
-
-		int push(lua_State* target) const {
-			int pushcount = 0;
-			for (int i = index; i <= stacktop; ++i) {
-				lua_pushvalue(L, i);
-				pushcount += 1;
-			}
-			if (target != L) {
-				lua_xmove(L, target, pushcount);
-			}
-			return pushcount;
-		}
-
-		template <typename T>
-		decltype(auto) get(difference_type index_offset = 0) const {
-			return stack::get<T>(L, index + static_cast<int>(index_offset));
-		}
-
-		type get_type(difference_type index_offset = 0) const noexcept {
-			return type_of(L, index + static_cast<int>(index_offset));
-		}
-
-		stack_proxy operator[](difference_type index_offset) const {
-			return stack_proxy(L, index + static_cast<int>(index_offset));
-		}
-
-		lua_State* lua_state() const {
-			return L;
-		};
-		int stack_index() const {
-			return index;
-		};
-		int leftover_count() const {
-			return stacktop - (index - 1);
-		}
-		std::size_t size() const {
-			return static_cast<std::size_t>(leftover_count());
-		}
-		int top() const {
-			return stacktop;
-		}
-	};
-
-	namespace stack {
-		template <>
-		struct unqualified_getter<variadic_args> {
-			static variadic_args get(lua_State* L, int index, record& tracking) {
-				tracking.last = 0;
-				return variadic_args(L, index);
-			}
-		};
-
-		template <>
-		struct unqualified_pusher<variadic_args> {
-			static int push(lua_State* L, const variadic_args& ref) {
-				return ref.push(L);
-			}
-		};
-	} // namespace stack
-} // namespace sol
-
-// end of sol/variadic_args.hpp
-
-// beginning of sol/variadic_results.hpp
-
-// beginning of sol/as_returns.hpp
-
-namespace sol {
-	template <typename T>
-	struct as_returns_t {
-		T src;
-	};
-
-	template <typename Source>
-	auto as_returns(Source&& source) {
-		return as_returns_t<std::decay_t<Source>>{ std::forward<Source>(source) };
-	}
-
-	namespace stack {
-		template <typename T>
-		struct unqualified_pusher<as_returns_t<T>> {
-			int push(lua_State* L, const as_returns_t<T>& e) {
-				auto& src = detail::unwrap(e.src);
-				int p = 0;
-				for (const auto& i : src) {
-					p += stack::push(L, i);
-				}
-				return p;
-			}
-		};
-	} // namespace stack
-} // namespace sol
-
-// end of sol/as_returns.hpp
-
-#include <vector>
-
-namespace sol {
-
-	template <typename Al = typename std::allocator<object>>
-	struct basic_variadic_results : public std::vector<object, Al> {
-	private:
-		using base_t = std::vector<object, Al>;
-
-	public:
-		basic_variadic_results() : base_t() {
-		}
-
-		basic_variadic_results(unsafe_function_result fr) : base_t() {
-			this->reserve(fr.return_count());
-			this->insert(this->cend(), fr.begin(), fr.end());
-		}
-
-		basic_variadic_results(protected_function_result fr) : base_t() {
-			this->reserve(fr.return_count());
-			this->insert(this->cend(), fr.begin(), fr.end());
-		}
-
-		template <typename Arg0, typename... Args,
-		     meta::disable_any<std::is_same<meta::unqualified_t<Arg0>, basic_variadic_results>, std::is_same<meta::unqualified_t<Arg0>, function_result>,
-		          std::is_same<meta::unqualified_t<Arg0>, protected_function_result>> = meta::enabler>
-		basic_variadic_results(Arg0&& arg0, Args&&... args) : base_t(std::forward<Arg0>(arg0), std::forward<Args>(args)...) {
-		}
-
-		basic_variadic_results(const basic_variadic_results&) = default;
-		basic_variadic_results(basic_variadic_results&&) = default;
-	};
-
-	struct variadic_results : public basic_variadic_results<> {
-	private:
-		using base_t = basic_variadic_results<>;
-
-	public:
-		using base_t::base_t;
-	};
-
-	template <typename Al>
-	struct is_container<basic_variadic_results<Al>> : std::false_type { };
-
-	template <>
-	struct is_container<variadic_results> : std::false_type { };
-
-	namespace stack {
-		template <typename Al>
-		struct unqualified_pusher<basic_variadic_results<Al>> {
-			int push(lua_State* L, const basic_variadic_results<Al>& e) {
-				int p = 0;
-				for (const auto& i : e) {
-					p += stack::push(L, i);
-				}
-				return p;
-			}
-		};
-
-		template <>
-		struct unqualified_pusher<variadic_results> {
-			int push(lua_State* L, const variadic_results& r) {
-				using base_t = basic_variadic_results<>;
-				return stack::push(L, static_cast<const base_t&>(r));
-			}
-		};
-	} // namespace stack
-
-} // namespace sol
-
-// end of sol/variadic_results.hpp
-
-#if SOL_IS_ON(SOL_COMPILER_GCC_I_)
-#pragma GCC diagnostic pop
-#elif SOL_IS_ON(SOL_COMPILER_VCXX_I_)
-#pragma warning(pop)
-#endif // g++
-
-#if SOL_IS_ON(SOL_INSIDE_UNREAL_ENGINE_I_)
-#undef check
-#pragma pop_macro("check")
-#endif // Unreal Engine 4 Bullshit
-
-#endif // SOL_HPP
-// end of sol/sol.hpp
-
-#endif // SOL_SINGLE_INCLUDE_HPP
diff --git a/extern/sol3/README.md b/extern/sol3/README.md
new file mode 100644
index 0000000000..1674dcf599
--- /dev/null
+++ b/extern/sol3/README.md
@@ -0,0 +1,3 @@
+The code in this directory is copied from https://github.com/ThePhD/sol2.git (64096348465b980e2f1d0e5ba9cbeea8782e8f27)
+
+License: MIT
diff --git a/extern/sol3/sol/as_args.hpp b/extern/sol3/sol/as_args.hpp
new file mode 100644
index 0000000000..5afe78b0e4
--- /dev/null
+++ b/extern/sol3/sol/as_args.hpp
@@ -0,0 +1,54 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this Spermission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_AS_ARGS_HPP
+#define SOL_AS_ARGS_HPP
+
+#include <sol/stack.hpp>
+
+namespace sol {
+	template <typename T>
+	struct as_args_t {
+		T src;
+	};
+
+	template <typename Source>
+	auto as_args(Source&& source) {
+		return as_args_t<Source> { std::forward<Source>(source) };
+	}
+
+	namespace stack {
+		template <typename T>
+		struct unqualified_pusher<as_args_t<T>> {
+			int push(lua_State* L, const as_args_t<T>& e) {
+				int p = 0;
+				for (const auto& i : e.src) {
+					p += stack::push(L, i);
+				}
+				return p;
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+#endif // SOL_AS_ARGS_HPP
diff --git a/extern/sol3/sol/as_returns.hpp b/extern/sol3/sol/as_returns.hpp
new file mode 100644
index 0000000000..0ac499e67d
--- /dev/null
+++ b/extern/sol3/sol/as_returns.hpp
@@ -0,0 +1,62 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_AS_RETURNS_HPP
+#define SOL_AS_RETURNS_HPP
+
+#include <sol/traits.hpp>
+#include <sol/stack.hpp>
+#include <sol/ebco.hpp>
+
+namespace sol {
+	template <typename T>
+	struct as_returns_t : private detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		using base_t::base_t;
+		using base_t::value;
+	};
+
+	template <typename Source>
+	auto as_returns(Source&& source) {
+		return as_returns_t<std::decay_t<Source>> { std::forward<Source>(source) };
+	}
+
+	namespace stack {
+		template <typename T>
+		struct unqualified_pusher<as_returns_t<T>> {
+			int push(lua_State* L, const as_returns_t<T>& e) {
+				auto& src = detail::unwrap(e.value());
+				int p = 0;
+				for (const auto& i : src) {
+					p += stack::push(L, i);
+				}
+				return p;
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+#endif // SOL_AS_RETURNS_HPP
diff --git a/extern/sol3/sol/assert.hpp b/extern/sol3/sol/assert.hpp
new file mode 100644
index 0000000000..860ac3deee
--- /dev/null
+++ b/extern/sol3/sol/assert.hpp
@@ -0,0 +1,99 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#pragma once
+
+#ifndef SOL_ASSERT_HPP
+#define SOL_ASSERT_HPP
+
+#include <sol/forward.hpp>
+
+#if SOL_IS_ON(SOL2_CI_I_)
+
+struct pre_main {
+	pre_main() {
+#ifdef _MSC_VER
+		_set_abort_behavior(0, _WRITE_ABORT_MSG);
+#endif
+	}
+} inline sol2_ci_dont_lock_ci_please = {};
+
+#endif // Prevent lockup when doing Continuous Integration
+
+
+// clang-format off
+
+#if SOL_IS_ON(SOL_USER_C_ASSERT_I_)
+	#define sol_c_assert(...) SOL_C_ASSERT(__VA_ARGS__)
+#else
+	#if SOL_IS_ON(SOL_DEBUG_BUILD_I_)
+		#include <exception>
+		#include <iostream>
+		#include <cstdlib>
+
+			#define sol_c_assert(...)                                                                                               \
+				do {                                                                                                               \
+					if (!(__VA_ARGS__)) {                                                                                           \
+						std::cerr << "Assertion `" #__VA_ARGS__ "` failed in " << __FILE__ << " line " << __LINE__ << std::endl; \
+						std::terminate();                                                                                        \
+					}                                                                                                             \
+				} while (false)
+	#else
+		#define sol_c_assert(...)           \
+			do {                           \
+				if (false) {              \
+					(void)(__VA_ARGS__); \
+				}                         \
+			} while (false)
+	#endif
+#endif
+
+#if SOL_IS_ON(SOL_USER_M_ASSERT_I_)
+	#define sol_m_assert(message, ...) SOL_M_ASSERT(message, __VA_ARGS__)
+#else
+	#if SOL_IS_ON(SOL_DEBUG_BUILD_I_)
+		#include <exception>
+		#include <iostream>
+		#include <cstdlib>
+
+		#define sol_m_assert(message, ...)                                                                                                         \
+			do {                                                                                                                                  \
+				if (!(__VA_ARGS__)) {                                                                                                              \
+					std::cerr << "Assertion `" #__VA_ARGS__ "` failed in " << __FILE__ << " line " << __LINE__ << ": " << message << std::endl; \
+					std::terminate();                                                                                                           \
+				}                                                                                                                                \
+			} while (false)
+	#else
+		#define sol_m_assert(message, ...)    \
+			do {                             \
+				if (false) {                \
+					(void)(__VA_ARGS__);   \
+					(void)sizeof(message); \
+				}                           \
+			} while (false)
+	#endif
+#endif
+
+// clang-format on
+
+#endif // SOL_ASSERT_HPP
diff --git a/extern/sol3/sol/base_traits.hpp b/extern/sol3/sol/base_traits.hpp
new file mode 100644
index 0000000000..9fae18e2b0
--- /dev/null
+++ b/extern/sol3/sol/base_traits.hpp
@@ -0,0 +1,123 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_BASE_TRAITS_HPP
+#define SOL_BASE_TRAITS_HPP
+
+#include <type_traits>
+
+namespace sol {
+	namespace detail {
+		struct unchecked_t { };
+		const unchecked_t unchecked = unchecked_t {};
+	} // namespace detail
+
+	namespace meta {
+		using sfinae_yes_t = std::true_type;
+		using sfinae_no_t = std::false_type;
+
+		template <typename...>
+		using void_t = void;
+
+		template <typename T>
+		using unqualified = std::remove_cv<std::remove_reference_t<T>>;
+
+		template <typename T>
+		using unqualified_t = typename unqualified<T>::type;
+
+		namespace meta_detail {
+			template <typename T>
+			struct unqualified_non_alias : unqualified<T> { };
+
+			template <template <class...> class Test, class, class... Args>
+			struct is_detected : std::false_type { };
+
+			template <template <class...> class Test, class... Args>
+			struct is_detected<Test, void_t<Test<Args...>>, Args...> : std::true_type { };
+		} // namespace meta_detail
+
+		template <template <class...> class Trait, class... Args>
+		using is_detected = typename meta_detail::is_detected<Trait, void, Args...>::type;
+
+		template <template <class...> class Trait, class... Args>
+		constexpr inline bool is_detected_v = is_detected<Trait, Args...>::value;
+
+		template <std::size_t I>
+		using index_value = std::integral_constant<std::size_t, I>;
+
+		template <bool>
+		struct conditional {
+			template <typename T, typename U>
+			using type = T;
+		};
+
+		template <>
+		struct conditional<false> {
+			template <typename T, typename U>
+			using type = U;
+		};
+
+		template <bool B, typename T, typename U>
+		using conditional_t = typename conditional<B>::template type<T, U>;
+
+		namespace meta_detail {
+			template <typename T, template <typename...> class Templ>
+			struct is_specialization_of : std::false_type { };
+			template <typename... T, template <typename...> class Templ>
+			struct is_specialization_of<Templ<T...>, Templ> : std::true_type { };
+		} // namespace meta_detail
+
+		template <typename T, template <typename...> class Templ>
+		using is_specialization_of = meta_detail::is_specialization_of<std::remove_cv_t<T>, Templ>;
+
+		template <typename T, template <typename...> class Templ>
+		inline constexpr bool is_specialization_of_v = is_specialization_of<std::remove_cv_t<T>, Templ>::value;
+
+		template <typename T>
+		struct identity {
+			typedef T type;
+		};
+
+		template <typename T>
+		using identity_t = typename identity<T>::type;
+
+		template <typename T>
+		using is_builtin_type = std::integral_constant<bool, std::is_arithmetic<T>::value || std::is_pointer<T>::value || std::is_array<T>::value>;
+
+		namespace meta_detail {
+			template <typename T, typename = void>
+			struct has_internal_marker_impl : std::false_type { };
+			template <typename T>
+			struct has_internal_marker_impl<T, void_t<typename T::SOL_INTERNAL_UNSPECIALIZED_MARKER_>> : std::true_type { };
+
+			template <typename T>
+			using has_internal_marker = has_internal_marker_impl<T>;
+
+			template <typename T>
+			constexpr inline bool has_internal_marker_v = has_internal_marker<T>::value;
+		} // namespace meta_detail
+
+	} // namespace meta
+} // namespace sol
+
+#endif // SOL_BASE_TRAITS_HPP
diff --git a/extern/sol3/sol/bind_traits.hpp b/extern/sol3/sol/bind_traits.hpp
new file mode 100644
index 0000000000..e11d753d10
--- /dev/null
+++ b/extern/sol3/sol/bind_traits.hpp
@@ -0,0 +1,553 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_BIND_TRAITS_HPP
+#define SOL_BIND_TRAITS_HPP
+
+#include <sol/forward.hpp>
+#include <sol/base_traits.hpp>
+#include <sol/tuple.hpp>
+
+namespace sol { namespace meta {
+	namespace meta_detail {
+		template <typename F>
+		using detect_deducible_signature = decltype(&F::operator(), void());
+	} // namespace meta_detail
+
+	template <typename F>
+	using call_operator_deducible = typename is_detected<meta_detail::detect_deducible_signature, F>::type;
+
+	template <typename F>
+	constexpr inline bool call_operator_deducible_v = call_operator_deducible<F>::value;
+
+	namespace meta_detail {
+
+		template <std::size_t I, typename T>
+		struct void_tuple_element : meta::tuple_element<I, T> { };
+
+		template <std::size_t I>
+		struct void_tuple_element<I, std::tuple<>> {
+			typedef void type;
+		};
+
+		template <std::size_t I, typename T>
+		using void_tuple_element_t = typename void_tuple_element<I, T>::type;
+
+		template <bool it_is_noexcept, bool has_c_variadic, typename T, typename R, typename... Args>
+		struct basic_traits {
+		private:
+			using first_type = meta::conditional_t<std::is_void<T>::value, int, T>&;
+
+		public:
+			inline static constexpr const bool is_noexcept = it_is_noexcept;
+			inline static constexpr bool is_member_function = std::is_void<T>::value;
+			inline static constexpr bool has_c_var_arg = has_c_variadic;
+			inline static constexpr std::size_t arity = sizeof...(Args);
+			inline static constexpr std::size_t free_arity = sizeof...(Args) + static_cast<std::size_t>(!std::is_void<T>::value);
+			typedef types<Args...> args_list;
+			typedef std::tuple<Args...> args_tuple;
+			typedef T object_type;
+			typedef R return_type;
+			typedef tuple_types<R> returns_list;
+			typedef R(function_type)(Args...);
+			typedef meta::conditional_t<std::is_void<T>::value, args_list, types<first_type, Args...>> free_args_list;
+			typedef meta::conditional_t<std::is_void<T>::value, R(Args...), R(first_type, Args...)> free_function_type;
+			typedef meta::conditional_t<std::is_void<T>::value, R (*)(Args...), R (*)(first_type, Args...)> free_function_pointer_type;
+			typedef std::remove_pointer_t<free_function_pointer_type> signature_type;
+			template <std::size_t i>
+			using arg_at = void_tuple_element_t<i, args_tuple>;
+		};
+
+		template <typename Signature, bool b = call_operator_deducible<Signature>::value>
+		struct fx_traits : public basic_traits<false, false, void, void> { };
+
+		// Free Functions
+		template <typename R, typename... Args>
+		struct fx_traits<R(Args...), false> : public basic_traits<false, false, void, R, Args...> {
+			typedef R (*function_pointer_type)(Args...);
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R (*)(Args...), false> : public basic_traits<false, false, void, R, Args...> {
+			typedef R (*function_pointer_type)(Args...);
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R(Args..., ...), false> : public basic_traits<false, true, void, R, Args...> {
+			typedef R (*function_pointer_type)(Args..., ...);
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R (*)(Args..., ...), false> : public basic_traits<false, true, void, R, Args...> {
+			typedef R (*function_pointer_type)(Args..., ...);
+		};
+
+		// Member Functions
+		/* C-Style Variadics */
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...), false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...);
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...), false> : public basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...);
+		};
+
+		/* Const Volatile */
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const, false> : public basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const volatile, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const volatile;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const volatile, false> : public basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const volatile;
+		};
+
+		/* Member Function Qualifiers */
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...)&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) &;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...)&, false> : public basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) &;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const&, false> : public basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const volatile&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const volatile&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const volatile&, false> : public basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const volatile&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...)&&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) &&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...)&&, false> : public basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) &&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const&&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const&&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const&&, false> : public basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const&&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const volatile&&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const volatile&&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const volatile&&, false> : public basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const volatile&&;
+		};
+
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_)
+
+		template <typename R, typename... Args>
+		struct fx_traits<R(Args...) noexcept, false> : public basic_traits<true, false, void, R, Args...> {
+			typedef R (*function_pointer_type)(Args...) noexcept;
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R (*)(Args...) noexcept, false> : public basic_traits<true, false, void, R, Args...> {
+			typedef R (*function_pointer_type)(Args...) noexcept;
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R(Args..., ...) noexcept, false> : public basic_traits<true, true, void, R, Args...> {
+			typedef R (*function_pointer_type)(Args..., ...) noexcept;
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R (*)(Args..., ...) noexcept, false> : public basic_traits<true, true, void, R, Args...> {
+			typedef R (*function_pointer_type)(Args..., ...) noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) noexcept;
+		};
+
+		/* Const Volatile */
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const volatile noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const volatile noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const volatile noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const volatile noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...)& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) & noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...)& noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) & noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const& noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const& noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const& noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const volatile& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const volatile& noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const volatile& noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const volatile& noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...)&& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) && noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...)&& noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) && noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const&& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const&& noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const&& noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const&& noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const volatile&& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const volatile&& noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const volatile&& noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const volatile&& noexcept;
+		};
+
+#endif // noexcept is part of a function's type
+
+#if SOL_IS_ON(SOL_COMPILER_VCXX_I_) && SOL_IS_ON(SOL_PLATFORM_X86_I_)
+		template <typename R, typename... Args>
+		struct fx_traits<R __stdcall(Args...), false> : public basic_traits<false, false, void, R, Args...> {
+			typedef R(__stdcall* function_pointer_type)(Args...);
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R(__stdcall*)(Args...), false> : public basic_traits<false, false, void, R, Args...> {
+			typedef R(__stdcall* function_pointer_type)(Args...);
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...), false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...);
+		};
+
+		/* Const Volatile */
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const volatile, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const volatile;
+		};
+
+		/* Member Function Qualifiers */
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...)&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) &;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const volatile&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const volatile&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...)&&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) &&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const&&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const&&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const volatile&&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const volatile&&;
+		};
+
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_)
+
+		template <typename R, typename... Args>
+		struct fx_traits<R __stdcall(Args...) noexcept, false> : public basic_traits<true, false, void, R, Args...> {
+			typedef R(__stdcall* function_pointer_type)(Args...) noexcept;
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R(__stdcall*)(Args...) noexcept, false> : public basic_traits<true, false, void, R, Args...> {
+			typedef R(__stdcall* function_pointer_type)(Args...) noexcept;
+		};
+
+		/* __stdcall cannot be applied to functions with varargs*/
+		/*template <typename R, typename... Args>
+		struct fx_traits<__stdcall R(Args..., ...) noexcept, false> : public basic_traits<true, true, void, R, Args...> {
+			typedef R(__stdcall* function_pointer_type)(Args..., ...) noexcept;
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R (__stdcall *)(Args..., ...) noexcept, false> : public basic_traits<true, true, void, R, Args...> {
+			typedef R(__stdcall* function_pointer_type)(Args..., ...) noexcept;
+		};*/
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) noexcept;
+		};*/
+
+		/* Const Volatile */
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) const noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) const noexcept;
+		};*/
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const volatile noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const volatile noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) const volatile noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) const volatile noexcept;
+		};*/
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...)& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) & noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) & noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) & noexcept;
+		};*/
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const& noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) const& noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) const& noexcept;
+		};*/
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const volatile& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const volatile& noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) const volatile& noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) const volatile& noexcept;
+		};*/
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...)&& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) && noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) && noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) && noexcept;
+		};*/
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const&& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const&& noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) const&& noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) const&& noexcept;
+		};*/
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const volatile&& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const volatile&& noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) const volatile&& noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) const volatile&& noexcept;
+		};*/
+#endif // noexcept is part of a function's type
+#endif // __stdcall x86 VC++ bug
+
+		template <typename Signature>
+		struct fx_traits<Signature, true> : public fx_traits<typename fx_traits<decltype(&Signature::operator())>::function_type, false> { };
+
+		template <typename Signature, bool b = std::is_member_object_pointer<Signature>::value>
+		struct callable_traits : public fx_traits<std::decay_t<Signature>> { };
+
+		template <typename R, typename T>
+		struct callable_traits<R(T::*), true> {
+			typedef meta::conditional_t<std::is_array_v<R>, std::add_lvalue_reference_t<R>, R> return_type;
+			typedef return_type Arg;
+			typedef T object_type;
+			using signature_type = R(T::*);
+			inline static constexpr bool is_noexcept = false;
+			inline static constexpr bool is_member_function = false;
+			inline static constexpr std::size_t arity = 1;
+			inline static constexpr std::size_t free_arity = 2;
+			typedef std::tuple<Arg> args_tuple;
+			typedef types<Arg> args_list;
+			typedef types<T, Arg> free_args_list;
+			typedef meta::tuple_types<return_type> returns_list;
+			typedef return_type(function_type)(T&, return_type);
+			typedef return_type (*function_pointer_type)(T&, Arg);
+			typedef return_type (*free_function_pointer_type)(T&, Arg);
+			template <std::size_t i>
+			using arg_at = void_tuple_element_t<i, args_tuple>;
+		};
+
+	} // namespace meta_detail
+
+	template <typename Signature>
+	using bind_traits = meta_detail::callable_traits<Signature>;
+
+	namespace meta_detail {
+		template <typename, bool>
+		struct is_probably_stateless_lambda : std::false_type { };
+
+		template <typename T>
+		struct is_probably_stateless_lambda<T, true> : std::is_convertible<T, typename bind_traits<T>::function_type*>::type { };
+	} // namespace meta_detail
+
+	template <typename T>
+	using is_probably_stateless_lambda = typename meta_detail::is_probably_stateless_lambda<T, std::is_empty_v<T> && call_operator_deducible_v<T>>::type;
+
+	template <typename T>
+	inline constexpr bool is_probably_stateless_lambda_v = is_probably_stateless_lambda<T>::value;
+
+	template <typename Signature>
+	using function_args_t = typename bind_traits<Signature>::args_list;
+
+	template <typename Signature>
+	using function_signature_t = typename bind_traits<Signature>::signature_type;
+
+	template <typename Signature>
+	using function_return_t = typename bind_traits<Signature>::return_type;
+}} // namespace sol::meta
+
+#endif // SOL_BIND_TRAITS_HPP
diff --git a/extern/sol3/sol/bytecode.hpp b/extern/sol3/sol/bytecode.hpp
new file mode 100644
index 0000000000..a930d9a3b9
--- /dev/null
+++ b/extern/sol3/sol/bytecode.hpp
@@ -0,0 +1,121 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_BYTECODE_HPP
+#define SOL_BYTECODE_HPP
+
+#include <sol/compatibility.hpp>
+#include <sol/string_view.hpp>
+#include <vector>
+#include <cstdint>
+#include <cstddef>
+
+namespace sol {
+
+	template <typename Allocator = std::allocator<std::byte>>
+	class basic_bytecode : private std::vector<std::byte, Allocator> {
+	private:
+		using base_t = std::vector<std::byte, Allocator>;
+
+	public:
+		using typename base_t::allocator_type;
+		using typename base_t::const_iterator;
+		using typename base_t::const_pointer;
+		using typename base_t::const_reference;
+		using typename base_t::const_reverse_iterator;
+		using typename base_t::difference_type;
+		using typename base_t::iterator;
+		using typename base_t::pointer;
+		using typename base_t::reference;
+		using typename base_t::reverse_iterator;
+		using typename base_t::size_type;
+		using typename base_t::value_type;
+
+		using base_t::base_t;
+		using base_t::operator=;
+
+		using base_t::data;
+		using base_t::empty;
+		using base_t::max_size;
+		using base_t::size;
+
+		using base_t::at;
+		using base_t::operator[];
+		using base_t::back;
+		using base_t::front;
+
+		using base_t::begin;
+		using base_t::cbegin;
+		using base_t::cend;
+		using base_t::end;
+
+		using base_t::crbegin;
+		using base_t::crend;
+		using base_t::rbegin;
+		using base_t::rend;
+
+
+		using base_t::get_allocator;
+		using base_t::swap;
+
+		using base_t::clear;
+		using base_t::emplace;
+		using base_t::emplace_back;
+		using base_t::erase;
+		using base_t::insert;
+		using base_t::pop_back;
+		using base_t::push_back;
+		using base_t::reserve;
+		using base_t::resize;
+		using base_t::shrink_to_fit;
+
+		string_view as_string_view() const {
+			return string_view(reinterpret_cast<const char*>(this->data()), this->size());
+		}
+	};
+
+	template <typename Container>
+	inline int basic_insert_dump_writer(lua_State*, const void* memory, size_t memory_size, void* userdata_pointer) {
+		using storage_t = Container;
+		const std::byte* p_code = static_cast<const std::byte*>(memory);
+		storage_t& bc = *static_cast<storage_t*>(userdata_pointer);
+#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
+		bc.insert(bc.cend(), p_code, p_code + memory_size);
+#else
+		try {
+			bc.insert(bc.cend(), p_code, p_code + memory_size);
+		}
+		catch (...) {
+			return -1;
+		}
+#endif
+		return 0;
+	}
+
+	using bytecode = basic_bytecode<>;
+
+	constexpr inline auto bytecode_dump_writer = &basic_insert_dump_writer<bytecode>;
+
+} // namespace sol
+
+#endif // SOL_BYTECODE_HPP
diff --git a/extern/sol3/sol/call.hpp b/extern/sol3/sol/call.hpp
new file mode 100644
index 0000000000..d06cf96f86
--- /dev/null
+++ b/extern/sol3/sol/call.hpp
@@ -0,0 +1,961 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#pragma once
+
+#ifndef SOL_CALL_HPP
+#define SOL_CALL_HPP
+
+#include <sol/property.hpp>
+#include <sol/protect.hpp>
+#include <sol/wrapper.hpp>
+#include <sol/trampoline.hpp>
+#include <sol/policies.hpp>
+#include <sol/stack.hpp>
+#include <sol/unique_usertype_traits.hpp>
+
+namespace sol {
+	namespace u_detail {
+
+	} // namespace u_detail
+
+	namespace policy_detail {
+		template <int I, int... In>
+		inline void handle_policy(static_stack_dependencies<I, In...>, lua_State* L, int&) {
+			if constexpr (sizeof...(In) == 0) {
+				(void)L;
+				return;
+			}
+			else {
+				absolute_index ai(L, I);
+				if (type_of(L, ai) != type::userdata) {
+					return;
+				}
+				lua_createtable(L, static_cast<int>(sizeof...(In)), 0);
+				stack_reference deps(L, -1);
+				auto per_dep = [&L, &deps](int i) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+					luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+					lua_pushvalue(L, i);
+					luaL_ref(L, deps.stack_index());
+				};
+				(void)per_dep;
+				(void)detail::swallow { int(), (per_dep(In), int())... };
+				lua_setuservalue(L, ai);
+			}
+		}
+
+		template <int... In>
+		inline void handle_policy(returns_self_with<In...>, lua_State* L, int& pushed) {
+			pushed = stack::push(L, raw_index(1));
+			handle_policy(static_stack_dependencies<-1, In...>(), L, pushed);
+		}
+
+		inline void handle_policy(const stack_dependencies& sdeps, lua_State* L, int&) {
+			absolute_index ai(L, sdeps.target);
+			if (type_of(L, ai) != type::userdata) {
+				return;
+			}
+			lua_createtable(L, static_cast<int>(sdeps.size()), 0);
+			stack_reference deps(L, -1);
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, static_cast<int>(sdeps.size()), detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			for (std::size_t i = 0; i < sdeps.size(); ++i) {
+				lua_pushvalue(L, sdeps.stack_indices[i]);
+				luaL_ref(L, deps.stack_index());
+			}
+			lua_setuservalue(L, ai);
+		}
+
+		template <typename P, meta::disable<std::is_base_of<detail::policy_base_tag, meta::unqualified_t<P>>> = meta::enabler>
+		inline void handle_policy(P&& p, lua_State* L, int& pushed) {
+			pushed = std::forward<P>(p)(L, pushed);
+		}
+	} // namespace policy_detail
+
+	namespace function_detail {
+		inline int no_construction_error(lua_State* L) {
+			return luaL_error(L, "sol: cannot call this constructor (tagged as non-constructible)");
+		}
+	} // namespace function_detail
+
+	namespace call_detail {
+
+		template <typename R, typename W>
+		inline auto& pick(std::true_type, property_wrapper<R, W>& f) {
+			return f.read();
+		}
+
+		template <typename R, typename W>
+		inline auto& pick(std::false_type, property_wrapper<R, W>& f) {
+			return f.write();
+		}
+
+		template <typename T, typename List>
+		struct void_call : void_call<T, meta::function_args_t<List>> { };
+
+		template <typename T, typename... Args>
+		struct void_call<T, types<Args...>> {
+			static void call(Args...) {
+			}
+		};
+
+		template <typename T, bool checked, bool clean_stack>
+		struct constructor_match {
+			T* obj_;
+			reference* obj_lua_ref_;
+			stack::stack_detail::undefined_metatable* p_umf_;
+
+			constructor_match(T* obj_ptr, reference& obj_lua_ref, stack::stack_detail::undefined_metatable& umf)
+			: obj_(obj_ptr), obj_lua_ref_(&obj_lua_ref), p_umf_(&umf) {
+			}
+
+			template <typename Fx, std::size_t I, typename... R, typename... Args>
+			int operator()(types<Fx>, meta::index_value<I>, types<R...> r, types<Args...> a, lua_State* L, int, int start) const {
+				detail::default_construct func {};
+				int result = stack::call_into_lua<checked, clean_stack>(r, a, L, start, func, this->obj_);
+				// construct userdata table
+				// SPECIFICALLY, after we've created it successfully.
+				// If the constructor exits for any reason we have to break things down...
+				if constexpr (clean_stack) {
+					obj_lua_ref_->push();
+					(*this->p_umf_)();
+					obj_lua_ref_->pop();
+				}
+				else {
+					(*this->p_umf_)();
+				}
+				return result;
+			}
+		};
+
+		namespace overload_detail {
+			template <std::size_t... M, typename Match, typename... Args>
+			inline int overload_match_arity(types<>, std::index_sequence<>, std::index_sequence<M...>, Match&&, lua_State* L, int, int, Args&&...) {
+				return luaL_error(L, "sol: no matching function call takes this number of arguments and the specified types");
+			}
+
+			template <typename Fx, typename... Fxs, std::size_t I, std::size_t... In, std::size_t... M, typename Match, typename... Args>
+			inline int overload_match_arity(types<Fx, Fxs...>, std::index_sequence<I, In...>, std::index_sequence<M...>, Match&& matchfx, lua_State* L,
+			     int fxarity, int start, Args&&... args) {
+				typedef lua_bind_traits<meta::unwrap_unqualified_t<Fx>> traits;
+				typedef meta::tuple_types<typename traits::return_type> return_types;
+				typedef typename traits::free_args_list args_list;
+				// compile-time eliminate any functions that we know ahead of time are of improper arity
+				if constexpr (!traits::runtime_variadics_t::value
+				     && meta::find_in_pack_v<meta::index_value<traits::free_arity>, meta::index_value<M>...>::value) {
+					return overload_match_arity(types<Fxs...>(),
+					     std::index_sequence<In...>(),
+					     std::index_sequence<M...>(),
+					     std::forward<Match>(matchfx),
+					     L,
+					     fxarity,
+					     start,
+					     std::forward<Args>(args)...);
+				}
+				else {
+					if constexpr (!traits::runtime_variadics_t::value) {
+						if (traits::free_arity != fxarity) {
+							return overload_match_arity(types<Fxs...>(),
+							     std::index_sequence<In...>(),
+							     std::index_sequence<traits::free_arity, M...>(),
+							     std::forward<Match>(matchfx),
+							     L,
+							     fxarity,
+							     start,
+							     std::forward<Args>(args)...);
+						}
+					}
+					stack::record tracking {};
+					if (!stack::stack_detail::check_types(args_list(), L, start, &no_panic, tracking)) {
+						return overload_match_arity(types<Fxs...>(),
+						     std::index_sequence<In...>(),
+						     std::index_sequence<M...>(),
+						     std::forward<Match>(matchfx),
+						     L,
+						     fxarity,
+						     start,
+						     std::forward<Args>(args)...);
+					}
+					return matchfx(types<Fx>(), meta::index_value<I>(), return_types(), args_list(), L, fxarity, start, std::forward<Args>(args)...);
+				}
+			}
+
+			template <std::size_t... M, typename Match, typename... Args>
+			inline int overload_match_arity_single(
+			     types<>, std::index_sequence<>, std::index_sequence<M...>, Match&& matchfx, lua_State* L, int fxarity, int start, Args&&... args) {
+				return overload_match_arity(types<>(),
+				     std::index_sequence<>(),
+				     std::index_sequence<M...>(),
+				     std::forward<Match>(matchfx),
+				     L,
+				     fxarity,
+				     start,
+				     std::forward<Args>(args)...);
+			}
+
+			template <typename Fx, std::size_t I, std::size_t... M, typename Match, typename... Args>
+			inline int overload_match_arity_single(
+			     types<Fx>, std::index_sequence<I>, std::index_sequence<M...>, Match&& matchfx, lua_State* L, int fxarity, int start, Args&&... args) {
+				typedef lua_bind_traits<meta::unwrap_unqualified_t<Fx>> traits;
+				typedef meta::tuple_types<typename traits::return_type> return_types;
+				typedef typename traits::free_args_list args_list;
+				// compile-time eliminate any functions that we know ahead of time are of improper arity
+				if constexpr (!traits::runtime_variadics_t::value
+				     && meta::find_in_pack_v<meta::index_value<traits::free_arity>, meta::index_value<M>...>::value) {
+					return overload_match_arity(types<>(),
+					     std::index_sequence<>(),
+					     std::index_sequence<M...>(),
+					     std::forward<Match>(matchfx),
+					     L,
+					     fxarity,
+					     start,
+					     std::forward<Args>(args)...);
+				}
+				if constexpr (!traits::runtime_variadics_t::value) {
+					if (traits::free_arity != fxarity) {
+						return overload_match_arity(types<>(),
+						     std::index_sequence<>(),
+						     std::index_sequence<traits::free_arity, M...>(),
+						     std::forward<Match>(matchfx),
+						     L,
+						     fxarity,
+						     start,
+						     std::forward<Args>(args)...);
+					}
+				}
+				return matchfx(types<Fx>(), meta::index_value<I>(), return_types(), args_list(), L, fxarity, start, std::forward<Args>(args)...);
+			}
+
+			template <typename Fx, typename Fx1, typename... Fxs, std::size_t I, std::size_t I1, std::size_t... In, std::size_t... M, typename Match,
+			     typename... Args>
+			inline int overload_match_arity_single(types<Fx, Fx1, Fxs...>, std::index_sequence<I, I1, In...>, std::index_sequence<M...>, Match&& matchfx,
+			     lua_State* L, int fxarity, int start, Args&&... args) {
+				typedef lua_bind_traits<meta::unwrap_unqualified_t<Fx>> traits;
+				typedef meta::tuple_types<typename traits::return_type> return_types;
+				typedef typename traits::free_args_list args_list;
+				// compile-time eliminate any functions that we know ahead of time are of improper arity
+				if constexpr (!traits::runtime_variadics_t::value
+				     && meta::find_in_pack_v<meta::index_value<traits::free_arity>, meta::index_value<M>...>::value) {
+					return overload_match_arity(types<Fx1, Fxs...>(),
+					     std::index_sequence<I1, In...>(),
+					     std::index_sequence<M...>(),
+					     std::forward<Match>(matchfx),
+					     L,
+					     fxarity,
+					     start,
+					     std::forward<Args>(args)...);
+				}
+				else {
+					if constexpr (!traits::runtime_variadics_t::value) {
+						if (traits::free_arity != fxarity) {
+							return overload_match_arity(types<Fx1, Fxs...>(),
+							     std::index_sequence<I1, In...>(),
+							     std::index_sequence<traits::free_arity, M...>(),
+							     std::forward<Match>(matchfx),
+							     L,
+							     fxarity,
+							     start,
+							     std::forward<Args>(args)...);
+						}
+					}
+					stack::record tracking {};
+					if (!stack::stack_detail::check_types(args_list(), L, start, &no_panic, tracking)) {
+						return overload_match_arity(types<Fx1, Fxs...>(),
+						     std::index_sequence<I1, In...>(),
+						     std::index_sequence<M...>(),
+						     std::forward<Match>(matchfx),
+						     L,
+						     fxarity,
+						     start,
+						     std::forward<Args>(args)...);
+					}
+					return matchfx(types<Fx>(), meta::index_value<I>(), return_types(), args_list(), L, fxarity, start, std::forward<Args>(args)...);
+				}
+			}
+		} // namespace overload_detail
+
+		template <typename... Functions, typename Match, typename... Args>
+		inline int overload_match_arity(Match&& matchfx, lua_State* L, int fxarity, int start, Args&&... args) {
+			return overload_detail::overload_match_arity_single(types<Functions...>(),
+			     std::make_index_sequence<sizeof...(Functions)>(),
+			     std::index_sequence<>(),
+			     std::forward<Match>(matchfx),
+			     L,
+			     fxarity,
+			     start,
+			     std::forward<Args>(args)...);
+		}
+
+		template <typename... Functions, typename Match, typename... Args>
+		inline int overload_match(Match&& matchfx, lua_State* L, int start, Args&&... args) {
+			int fxarity = lua_gettop(L) - (start - 1);
+			return overload_match_arity<Functions...>(std::forward<Match>(matchfx), L, fxarity, start, std::forward<Args>(args)...);
+		}
+
+		template <typename T, typename... TypeLists, typename Match, typename... Args>
+		inline int construct_match(Match&& matchfx, lua_State* L, int fxarity, int start, Args&&... args) {
+			// use same overload resolution matching as all other parts of the framework
+			return overload_match_arity<decltype(void_call<T, TypeLists>::call)...>(
+			     std::forward<Match>(matchfx), L, fxarity, start, std::forward<Args>(args)...);
+		}
+
+		template <typename T, bool checked, bool clean_stack, typename... TypeLists>
+		inline int construct_trampolined(lua_State* L) {
+			static const auto& meta = usertype_traits<T>::metatable();
+			int argcount = lua_gettop(L);
+			call_syntax syntax = argcount > 0 ? stack::get_call_syntax(L, usertype_traits<T>::user_metatable(), 1) : call_syntax::dot;
+			argcount -= static_cast<int>(syntax);
+
+			T* obj = detail::usertype_allocate<T>(L);
+			reference userdataref(L, -1);
+			stack::stack_detail::undefined_metatable umf(L, &meta[0], &stack::stack_detail::set_undefined_methods_on<T>);
+
+			// put userdata at the first index
+			lua_insert(L, 1);
+			construct_match<T, TypeLists...>(constructor_match<T, checked, clean_stack>(obj, userdataref, umf), L, argcount, 1 + static_cast<int>(syntax));
+
+			userdataref.push();
+			return 1;
+		}
+
+		template <typename T, bool checked, bool clean_stack, typename... TypeLists>
+		inline int construct(lua_State* L) {
+			return detail::static_trampoline<&construct_trampolined<T, checked, clean_stack, TypeLists...>>(L);
+		}
+
+		template <typename F, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename = void>
+		struct agnostic_lua_call_wrapper {
+			template <typename Fx, typename... Args>
+			static int call(lua_State* L, Fx&& f, Args&&... args) {
+				using uFx = meta::unqualified_t<Fx>;
+				static constexpr bool is_ref = is_lua_reference_v<uFx>;
+				if constexpr (is_ref) {
+					if constexpr (is_index) {
+						return stack::push(L, std::forward<Fx>(f), std::forward<Args>(args)...);
+					}
+					else {
+						std::forward<Fx>(f) = stack::unqualified_get<F>(L, boost + (is_variable ? 3 : 1));
+						return 0;
+					}
+				}
+				else {
+					using wrap = wrapper<uFx>;
+					using traits_type = typename wrap::traits_type;
+					using fp_t = typename traits_type::function_pointer_type;
+					constexpr bool is_function_pointer_convertible = std::is_class_v<uFx> && std::is_convertible_v<std::decay_t<Fx>, fp_t>;
+					if constexpr (is_function_pointer_convertible) {
+						fp_t fx = f;
+						return agnostic_lua_call_wrapper<fp_t, is_index, is_variable, checked, boost, clean_stack> {}.call(
+						     L, fx, std::forward<Args>(args)...);
+					}
+					else {
+						using returns_list = typename wrap::returns_list;
+						using args_list = typename wrap::free_args_list;
+						using caller = typename wrap::caller;
+						return stack::call_into_lua<checked, clean_stack>(
+						     returns_list(), args_list(), L, boost + 1, caller(), std::forward<Fx>(f), std::forward<Args>(args)...);
+					}
+				}
+			}
+		};
+
+		template <typename T, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct agnostic_lua_call_wrapper<var_wrapper<T>, is_index, is_variable, checked, boost, clean_stack, C> {
+			template <typename F>
+			static int call(lua_State* L, F&& f) {
+				if constexpr (is_index) {
+					constexpr bool is_stack = is_stack_based_v<meta::unqualified_t<decltype(detail::unwrap(f.value()))>>;
+					if constexpr (clean_stack && !is_stack) {
+						lua_settop(L, 0);
+					}
+					return stack::push_reference(L, detail::unwrap(f.value()));
+				}
+				else {
+					if constexpr (std::is_const_v<meta::unwrapped_t<T>>) {
+						(void)f;
+						return luaL_error(L, "sol: cannot write to a readonly (const) variable");
+					}
+					else {
+						using R = meta::unwrapped_t<T>;
+						if constexpr (std::is_assignable_v<std::add_lvalue_reference_t<meta::unqualified_t<R>>, R>) {
+							detail::unwrap(f.value()) = stack::unqualified_get<meta::unwrapped_t<T>>(L, boost + (is_variable ? 3 : 1));
+							if (clean_stack) {
+								lua_settop(L, 0);
+							}
+							return 0;
+						}
+						else {
+							return luaL_error(L, "sol: cannot write to this variable: copy assignment/constructor not available");
+						}
+					}
+				}
+			}
+		};
+
+		template <bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct agnostic_lua_call_wrapper<lua_CFunction_ref, is_index, is_variable, checked, boost, clean_stack, C> {
+			static int call(lua_State* L, lua_CFunction_ref f) {
+				return f(L);
+			}
+		};
+
+		template <bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct agnostic_lua_call_wrapper<lua_CFunction, is_index, is_variable, checked, boost, clean_stack, C> {
+			static int call(lua_State* L, lua_CFunction f) {
+				return f(L);
+			}
+		};
+
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_)
+		template <bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct agnostic_lua_call_wrapper<detail::lua_CFunction_noexcept, is_index, is_variable, checked, boost, clean_stack, C> {
+			static int call(lua_State* L, detail::lua_CFunction_noexcept f) {
+				return f(L);
+			}
+		};
+#endif // noexcept function types
+
+		template <bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct agnostic_lua_call_wrapper<detail::no_prop, is_index, is_variable, checked, boost, clean_stack, C> {
+			static int call(lua_State* L, const detail::no_prop&) {
+				return luaL_error(L, is_index ? "sol: cannot read from a writeonly property" : "sol: cannot write to a readonly property");
+			}
+		};
+
+		template <bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct agnostic_lua_call_wrapper<no_construction, is_index, is_variable, checked, boost, clean_stack, C> {
+			static int call(lua_State* L, const no_construction&) {
+				return function_detail::no_construction_error(L);
+			}
+		};
+
+		template <typename... Args, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct agnostic_lua_call_wrapper<bases<Args...>, is_index, is_variable, checked, boost, clean_stack, C> {
+			static int call(lua_State*, const bases<Args...>&) {
+				// Uh. How did you even call this, lul
+				return 0;
+			}
+		};
+
+		template <typename T, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct agnostic_lua_call_wrapper<std::reference_wrapper<T>, is_index, is_variable, checked, boost, clean_stack, C> {
+			static int call(lua_State* L, std::reference_wrapper<T> f) {
+				agnostic_lua_call_wrapper<T, is_index, is_variable, checked, boost, clean_stack> alcw {};
+				return alcw.call(L, f.get());
+			}
+		};
+
+		template <typename T, typename F, bool is_index, bool is_variable, bool checked = detail::default_safe_function_calls, int boost = 0,
+		     bool clean_stack = true, typename = void>
+		struct lua_call_wrapper {
+			template <typename Fx, typename... Args>
+			static int call(lua_State* L, Fx&& fx, Args&&... args) {
+				if constexpr (std::is_member_function_pointer_v<F>) {
+					using wrap = wrapper<F>;
+					using object_type = typename wrap::object_type;
+					if constexpr (sizeof...(Args) < 1) {
+						using Ta = meta::conditional_t<std::is_void_v<T>, object_type, T>;
+						static_assert(std::is_base_of_v<object_type, Ta>,
+						     "It seems like you might have accidentally bound a class type with a member function method that does not correspond to the "
+						     "class. For example, there could be a small type in your new_usertype<T>(...) binding, where you specify one class \"T\" "
+						     "but then bind member methods from a complete unrelated class. Check things over!");
+#if SOL_IS_ON(SOL_SAFE_USERTYPE_I_)
+						auto maybeo = stack::check_get<Ta*>(L, 1);
+						if (!maybeo || maybeo.value() == nullptr) {
+							return luaL_error(L,
+							     "sol: received nil for 'self' argument (use ':' for accessing member functions, make sure member variables are "
+							     "preceeded by the "
+							     "actual object with '.' syntax)");
+						}
+						object_type* o = static_cast<object_type*>(maybeo.value());
+						return call(L, std::forward<Fx>(fx), *o);
+#else
+						object_type& o = static_cast<object_type&>(*stack::unqualified_get<non_null<Ta*>>(L, 1));
+						return call(L, std::forward<Fx>(fx), o);
+#endif // Safety
+					}
+					else {
+						using returns_list = typename wrap::returns_list;
+						using args_list = typename wrap::args_list;
+						using caller = typename wrap::caller;
+						return stack::call_into_lua<checked, clean_stack>(
+						     returns_list(), args_list(), L, boost + (is_variable ? 3 : 2), caller(), std::forward<Fx>(fx), std::forward<Args>(args)...);
+					}
+				}
+				else if constexpr (std::is_member_object_pointer_v<F>) {
+					using wrap = wrapper<F>;
+					using object_type = typename wrap::object_type;
+					if constexpr (is_index) {
+						if constexpr (sizeof...(Args) < 1) {
+							using Ta = meta::conditional_t<std::is_void_v<T>, object_type, T>;
+							static_assert(std::is_base_of_v<object_type, Ta>,
+							     "It seems like you might have accidentally bound a class type with a member function method that does not correspond "
+							     "to the class. For example, there could be a small type in your new_usertype<T>(...) binding, where you specify one "
+							     "class \"T\" but then bind member methods from a complete unrelated class. Check things over!");
+#if SOL_IS_ON(SOL_SAFE_USERTYPE_I_)
+							auto maybeo = stack::check_get<Ta*>(L, 1);
+							if (!maybeo || maybeo.value() == nullptr) {
+								if (is_variable) {
+									return luaL_error(L, "sol: 'self' argument is lua_nil (bad '.' access?)");
+								}
+								return luaL_error(L, "sol: 'self' argument is lua_nil (pass 'self' as first argument)");
+							}
+							object_type* o = static_cast<object_type*>(maybeo.value());
+							return call(L, std::forward<Fx>(fx), *o);
+#else
+							object_type& o = static_cast<object_type&>(*stack::get<non_null<Ta*>>(L, 1));
+							return call(L, std::forward<Fx>(fx), o);
+#endif // Safety
+						}
+						else {
+							using returns_list = typename wrap::returns_list;
+							using caller = typename wrap::caller;
+							return stack::call_into_lua<checked, clean_stack>(returns_list(),
+							     types<>(),
+							     L,
+							     boost + (is_variable ? 3 : 2),
+							     caller(),
+							     std::forward<Fx>(fx),
+							     std::forward<Args>(args)...);
+						}
+					}
+					else {
+						using traits_type = lua_bind_traits<F>;
+						using return_type = typename traits_type::return_type;
+						constexpr bool ret_is_const = std::is_const_v<std::remove_reference_t<return_type>>;
+						if constexpr (ret_is_const) {
+							(void)fx;
+							(void)detail::swallow { 0, (static_cast<void>(args), 0)... };
+							return luaL_error(L, "sol: cannot write to a readonly (const) variable");
+						}
+						else {
+							using u_return_type = meta::unqualified_t<return_type>;
+							constexpr bool is_assignable = std::is_copy_assignable_v<u_return_type> || std::is_array_v<u_return_type>;
+							if constexpr (!is_assignable) {
+								(void)fx;
+								(void)detail::swallow { 0, ((void)args, 0)... };
+								return luaL_error(L, "sol: cannot write to this variable: copy assignment/constructor not available");
+							}
+							else {
+								using args_list = typename wrap::args_list;
+								using caller = typename wrap::caller;
+								if constexpr (sizeof...(Args) > 0) {
+									return stack::call_into_lua<checked, clean_stack>(types<void>(),
+									     args_list(),
+									     L,
+									     boost + (is_variable ? 3 : 2),
+									     caller(),
+									     std::forward<Fx>(fx),
+									     std::forward<Args>(args)...);
+								}
+								else {
+									using Ta = meta::conditional_t<std::is_void_v<T>, object_type, T>;
+#if SOL_IS_ON(SOL_SAFE_USERTYPE_I_)
+									auto maybeo = stack::check_get<Ta*>(L, 1);
+									if (!maybeo || maybeo.value() == nullptr) {
+										if (is_variable) {
+											return luaL_error(L, "sol: received nil for 'self' argument (bad '.' access?)");
+										}
+										return luaL_error(L, "sol: received nil for 'self' argument (pass 'self' as first argument)");
+									}
+									object_type* po = static_cast<object_type*>(maybeo.value());
+									object_type& o = *po;
+#else
+									object_type& o = static_cast<object_type&>(*stack::get<non_null<Ta*>>(L, 1));
+#endif // Safety
+
+									return stack::call_into_lua<checked, clean_stack>(
+									     types<void>(), args_list(), L, boost + (is_variable ? 3 : 2), caller(), std::forward<Fx>(fx), o);
+								}
+							}
+						}
+					}
+				}
+				else {
+					agnostic_lua_call_wrapper<F, is_index, is_variable, checked, boost, clean_stack> alcw {};
+					return alcw.call(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+				}
+			}
+		};
+
+		template <typename T, typename F, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, readonly_wrapper<F>, is_index, is_variable, checked, boost, clean_stack, C> {
+			using traits_type = lua_bind_traits<F>;
+			using wrap = wrapper<F>;
+			using object_type = typename wrap::object_type;
+
+			static int call(lua_State* L, readonly_wrapper<F>&& rw) {
+				if constexpr (!is_index) {
+					(void)rw;
+					return luaL_error(L, "sol: cannot write to a sol::readonly variable");
+				}
+				else {
+					lua_call_wrapper<T, F, true, is_variable, checked, boost, clean_stack, C> lcw;
+					return lcw.call(L, std::move(rw.value()));
+				}
+			}
+
+			static int call(lua_State* L, readonly_wrapper<F>&& rw, object_type& o) {
+				if constexpr (!is_index) {
+					(void)o;
+					return call(L, std::move(rw));
+				}
+				else {
+					lua_call_wrapper<T, F, true, is_variable, checked, boost, clean_stack, C> lcw;
+					return lcw.call(L, rw.value(), o);
+				}
+			}
+
+			static int call(lua_State* L, const readonly_wrapper<F>& rw) {
+				if constexpr (!is_index) {
+					(void)rw;
+					return luaL_error(L, "sol: cannot write to a sol::readonly variable");
+				}
+				else {
+					lua_call_wrapper<T, F, true, is_variable, checked, boost, clean_stack, C> lcw;
+					return lcw.call(L, rw.value());
+				}
+			}
+
+			static int call(lua_State* L, const readonly_wrapper<F>& rw, object_type& o) {
+				if constexpr (!is_index) {
+					(void)o;
+					return call(L, rw);
+				}
+				else {
+					lua_call_wrapper<T, F, true, is_variable, checked, boost, clean_stack, C> lcw;
+					return lcw.call(L, rw.value(), o);
+				}
+			}
+		};
+
+		template <typename T, typename... Args, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, constructor_list<Args...>, is_index, is_variable, checked, boost, clean_stack, C> {
+			typedef constructor_list<Args...> F;
+
+			static int call(lua_State* L, F&) {
+				const auto& meta = usertype_traits<T>::metatable();
+				int argcount = lua_gettop(L);
+				call_syntax syntax = argcount > 0 ? stack::get_call_syntax(L, usertype_traits<T>::user_metatable(), 1) : call_syntax::dot;
+				argcount -= static_cast<int>(syntax);
+
+				T* obj = detail::usertype_allocate<T>(L);
+				reference userdataref(L, -1);
+				stack::stack_detail::undefined_metatable umf(L, &meta[0], &stack::stack_detail::set_undefined_methods_on<T>);
+
+				// put userdata at the first index
+				lua_insert(L, 1);
+				// Because of the way constructors work,
+				// we have to kill the data, but only if the cosntructor is successfulyl invoked...
+				// if it's not successfully invoked and we panic,
+				// we cannot actually deallcoate/delete the data.
+				construct_match<T, Args...>(
+				     constructor_match<T, checked, clean_stack>(obj, userdataref, umf), L, argcount, boost + 1 + 1 + static_cast<int>(syntax));
+
+				userdataref.push();
+				return 1;
+			}
+		};
+
+		template <typename T, typename... Cxs, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, constructor_wrapper<Cxs...>, is_index, is_variable, checked, boost, clean_stack, C> {
+			typedef constructor_wrapper<Cxs...> F;
+
+			struct onmatch {
+				template <typename Fx, std::size_t I, typename... R, typename... Args>
+				int operator()(types<Fx>, meta::index_value<I>, types<R...> r, types<Args...> a, lua_State* L, int, int start, F& f) {
+					const auto& meta = usertype_traits<T>::metatable();
+					T* obj = detail::usertype_allocate<T>(L);
+					reference userdataref(L, -1);
+					stack::stack_detail::undefined_metatable umf(L, &meta[0], &stack::stack_detail::set_undefined_methods_on<T>);
+					umf();
+
+					auto& func = std::get<I>(f.functions);
+					// put userdata at the first index
+					lua_insert(L, 1);
+					stack::call_into_lua<checked, clean_stack>(r, a, L, boost + 1 + start, func, detail::implicit_wrapper<T>(obj));
+
+					userdataref.push();
+					return 1;
+				}
+			};
+
+			static int call(lua_State* L, F& f) {
+				call_syntax syntax = stack::get_call_syntax(L, usertype_traits<T>::user_metatable(), 1);
+				int syntaxval = static_cast<int>(syntax);
+				int argcount = lua_gettop(L) - syntaxval;
+				return construct_match<T, meta::pop_front_type_t<meta::function_args_t<Cxs>>...>(onmatch(), L, argcount, 1 + syntaxval, f);
+			}
+		};
+
+		template <typename T, typename Fx, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, destructor_wrapper<Fx>, is_index, is_variable, checked, boost, clean_stack, C> {
+
+			template <typename F>
+			static int call(lua_State* L, F&& f) {
+				if constexpr (std::is_void_v<Fx>) {
+					return detail::usertype_alloc_destroy<T>(L);
+				}
+				else {
+					using uFx = meta::unqualified_t<Fx>;
+					lua_call_wrapper<T, uFx, is_index, is_variable, checked, boost, clean_stack> lcw {};
+					return lcw.call(L, std::forward<F>(f).fx);
+				}
+			}
+		};
+
+		template <typename T, typename... Fs, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, overload_set<Fs...>, is_index, is_variable, checked, boost, clean_stack, C> {
+			typedef overload_set<Fs...> F;
+
+			struct on_match {
+				template <typename Fx, std::size_t I, typename... R, typename... Args>
+				int operator()(types<Fx>, meta::index_value<I>, types<R...>, types<Args...>, lua_State* L, int, int, F& fx) {
+					auto& f = std::get<I>(fx.functions);
+					return lua_call_wrapper<T, Fx, is_index, is_variable, checked, boost> {}.call(L, f);
+				}
+			};
+
+			static int call(lua_State* L, F& fx) {
+				return overload_match_arity<Fs...>(on_match(), L, lua_gettop(L), 1, fx);
+			}
+		};
+
+		template <typename T, typename... Fs, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, factory_wrapper<Fs...>, is_index, is_variable, checked, boost, clean_stack, C> {
+			typedef factory_wrapper<Fs...> F;
+
+			struct on_match {
+				template <typename Fx, std::size_t I, typename... R, typename... Args>
+				int operator()(types<Fx>, meta::index_value<I>, types<R...>, types<Args...>, lua_State* L, int, int, F& fx) {
+					auto& f = std::get<I>(fx.functions);
+					return lua_call_wrapper<T, Fx, is_index, is_variable, checked, boost, clean_stack> {}.call(L, f);
+				}
+			};
+
+			static int call(lua_State* L, F& fx) {
+				return overload_match_arity<Fs...>(on_match(), L, lua_gettop(L) - boost, 1 + boost, fx);
+			}
+		};
+
+		template <typename T, typename R, typename W, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, property_wrapper<R, W>, is_index, is_variable, checked, boost, clean_stack, C> {
+			typedef meta::conditional_t<is_index, R, W> P;
+			typedef meta::unqualified_t<P> U;
+			typedef wrapper<U> wrap;
+			typedef lua_bind_traits<U> traits_type;
+			typedef meta::unqualified_t<typename traits_type::template arg_at<0>> object_type;
+
+			template <typename F, typename... Args>
+			static int call(lua_State* L, F&& f, Args&&... args) {
+				constexpr bool is_specialized = meta::any<std::is_same<U, detail::no_prop>,
+				     meta::is_specialization_of<U, var_wrapper>,
+				     meta::is_specialization_of<U, constructor_wrapper>,
+				     meta::is_specialization_of<U, constructor_list>,
+				     std::is_member_pointer<U>>::value;
+				if constexpr (is_specialized) {
+					if constexpr (is_index) {
+						decltype(auto) p = f.read();
+						lua_call_wrapper<T, meta::unqualified_t<decltype(p)>, is_index, is_variable, checked, boost, clean_stack> lcw {};
+						return lcw.call(L, p, std::forward<Args>(args)...);
+					}
+					else {
+						decltype(auto) p = f.write();
+						lua_call_wrapper<T, meta::unqualified_t<decltype(p)>, is_index, is_variable, checked, boost, clean_stack> lcw {};
+						return lcw.call(L, p, std::forward<Args>(args)...);
+					}
+				}
+				else {
+					constexpr bool non_class_object_type = meta::any<std::is_void<object_type>,
+					     meta::boolean<lua_type_of<meta::unwrap_unqualified_t<object_type>>::value != type::userdata>>::value;
+					if constexpr (non_class_object_type) {
+						// The type being void means we don't have any arguments, so it might be a free functions?
+						using args_list = typename traits_type::free_args_list;
+						using returns_list = typename wrap::returns_list;
+						using caller = typename wrap::caller;
+						if constexpr (is_index) {
+							decltype(auto) pf = f.read();
+							return stack::call_into_lua<checked, clean_stack>(
+							     returns_list(), args_list(), L, boost + (is_variable ? 3 : 2), caller(), pf);
+						}
+						else {
+							decltype(auto) pf = f.write();
+							return stack::call_into_lua<checked, clean_stack>(
+							     returns_list(), args_list(), L, boost + (is_variable ? 3 : 2), caller(), pf);
+						}
+					}
+					else {
+						using args_list = meta::pop_front_type_t<typename traits_type::free_args_list>;
+						using Ta = T;
+						using Oa = std::remove_pointer_t<object_type>;
+#if SOL_IS_ON(SOL_SAFE_USERTYPE_I_)
+						auto maybeo = stack::check_get<Ta*>(L, 1);
+						if (!maybeo || maybeo.value() == nullptr) {
+							if (is_variable) {
+								return luaL_error(L, "sol: 'self' argument is lua_nil (bad '.' access?)");
+							}
+							return luaL_error(L, "sol: 'self' argument is lua_nil (pass 'self' as first argument)");
+						}
+						Oa* o = static_cast<Oa*>(maybeo.value());
+#else
+						Oa* o = static_cast<Oa*>(stack::get<non_null<Ta*>>(L, 1));
+#endif // Safety
+						using returns_list = typename wrap::returns_list;
+						using caller = typename wrap::caller;
+						if constexpr (is_index) {
+							decltype(auto) pf = f.read();
+							return stack::call_into_lua<checked, clean_stack>(
+							     returns_list(), args_list(), L, boost + (is_variable ? 3 : 2), caller(), pf, detail::implicit_wrapper<Oa>(*o));
+						}
+						else {
+							decltype(auto) pf = f.write();
+							return stack::call_into_lua<checked, clean_stack>(
+							     returns_list(), args_list(), L, boost + (is_variable ? 3 : 2), caller(), pf, detail::implicit_wrapper<Oa>(*o));
+						}
+					}
+				}
+			}
+		};
+
+		template <typename T, typename V, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, protect_t<V>, is_index, is_variable, checked, boost, clean_stack, C> {
+			typedef protect_t<V> F;
+
+			template <typename... Args>
+			static int call(lua_State* L, F& fx, Args&&... args) {
+				return lua_call_wrapper<T, V, is_index, is_variable, true, boost, clean_stack> {}.call(L, fx.value, std::forward<Args>(args)...);
+			}
+		};
+
+		template <typename T, typename F, typename... Policies, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, policy_wrapper<F, Policies...>, is_index, is_variable, checked, boost, clean_stack, C> {
+			typedef policy_wrapper<F, Policies...> P;
+
+			template <std::size_t... In>
+			static int call(std::index_sequence<In...>, lua_State* L, P& fx) {
+				int pushed = lua_call_wrapper<T, F, is_index, is_variable, checked, boost, false, C> {}.call(L, fx.value);
+				(void)detail::swallow { int(), (policy_detail::handle_policy(std::get<In>(fx.policies), L, pushed), int())... };
+				return pushed;
+			}
+
+			static int call(lua_State* L, P& fx) {
+				typedef typename P::indices indices;
+				return call(indices(), L, fx);
+			}
+		};
+
+		template <typename T, typename Y, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, yielding_t<Y>, is_index, is_variable, checked, boost, clean_stack, C> {
+			template <typename F>
+			static int call(lua_State* L, F&& f) {
+				return lua_call_wrapper<T, meta::unqualified_t<Y>, is_index, is_variable, checked, boost, clean_stack> {}.call(L, f.func);
+			}
+		};
+
+		template <typename T, typename Sig, typename P, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, function_arguments<Sig, P>, is_index, is_variable, checked, boost, clean_stack, C> {
+			static int call(lua_State* L, const function_arguments<Sig, P>& f) {
+				lua_call_wrapper<T, meta::unqualified_t<P>, is_index, is_variable, checked, boost, clean_stack> lcw {};
+				return lcw.call(L, std::get<0>(f.arguments));
+			}
+
+			static int call(lua_State* L, function_arguments<Sig, P>& f) {
+				lua_call_wrapper<T, meta::unqualified_t<P>, is_index, is_variable, checked, boost, clean_stack> lcw {};
+				return lcw.call(L, std::get<0>(f.arguments));
+			}
+
+			static int call(lua_State* L, function_arguments<Sig, P>&& f) {
+				lua_call_wrapper<T, meta::unqualified_t<P>, is_index, is_variable, checked, boost, clean_stack> lcw {};
+				return lcw.call(L, std::get<0>(std::move(f.arguments)));
+			}
+		};
+
+		template <typename T, bool is_index, bool is_variable, int boost = 0, bool checked = detail::default_safe_function_calls, bool clean_stack = true,
+		     typename Fx, typename... Args>
+		inline int call_wrapped(lua_State* L, Fx&& fx, Args&&... args) {
+			using uFx = meta::unqualified_t<Fx>;
+			if constexpr (meta::is_specialization_of_v<uFx, yielding_t>) {
+				using real_fx = meta::unqualified_t<decltype(std::forward<Fx>(fx).func)>;
+				lua_call_wrapper<T, real_fx, is_index, is_variable, checked, boost, clean_stack> lcw {};
+				return lcw.call(L, std::forward<Fx>(fx).func, std::forward<Args>(args)...);
+			}
+			else {
+				lua_call_wrapper<T, uFx, is_index, is_variable, checked, boost, clean_stack> lcw {};
+				return lcw.call(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+			}
+		}
+
+		template <typename T, bool is_index, bool is_variable, typename F, int start = 1, bool checked = detail::default_safe_function_calls,
+		     bool clean_stack = true>
+		inline int call_user(lua_State* L) {
+			auto& fx = stack::unqualified_get<user<F>>(L, upvalue_index(start));
+			using uFx = meta::unqualified_t<F>;
+			int nr = call_wrapped<T, is_index, is_variable, 0, checked, clean_stack>(L, fx);
+			if constexpr (meta::is_specialization_of_v<uFx, yielding_t>) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		template <typename T, typename = void>
+		struct is_var_bind : std::false_type { };
+
+		template <typename T>
+		struct is_var_bind<T, std::enable_if_t<std::is_member_object_pointer<T>::value>> : std::true_type { };
+
+		template <typename T>
+		struct is_var_bind<T, std::enable_if_t<is_lua_reference_or_proxy<T>::value>> : std::true_type { };
+
+		template <>
+		struct is_var_bind<detail::no_prop> : std::true_type { };
+
+		template <typename R, typename W>
+		struct is_var_bind<property_wrapper<R, W>> : std::true_type { };
+
+		template <typename T>
+		struct is_var_bind<var_wrapper<T>> : std::true_type { };
+
+		template <typename T>
+		struct is_var_bind<readonly_wrapper<T>> : is_var_bind<meta::unqualified_t<T>> { };
+
+		template <typename F, typename... Policies>
+		struct is_var_bind<policy_wrapper<F, Policies...>> : is_var_bind<meta::unqualified_t<F>> { };
+	} // namespace call_detail
+
+	template <typename T>
+	struct is_variable_binding : call_detail::is_var_bind<meta::unqualified_t<T>> { };
+
+	template <typename T>
+	using is_var_wrapper = meta::is_specialization_of<T, var_wrapper>;
+
+	template <typename T>
+	struct is_function_binding : meta::neg<is_variable_binding<T>> { };
+
+} // namespace sol
+
+#endif // SOL_CALL_HPP
diff --git a/extern/sol3/sol/compatibility.hpp b/extern/sol3/sol/compatibility.hpp
new file mode 100644
index 0000000000..d2d01bd7c9
--- /dev/null
+++ b/extern/sol3/sol/compatibility.hpp
@@ -0,0 +1,51 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_COMPATIBILITY_HPP
+#define SOL_COMPATIBILITY_HPP
+
+// The various pieces of the compatibility layer
+// comes from https://github.com/keplerproject/lua-compat-5.3
+// but has been modified in many places for use with sol and luajit,
+// though the core abstractions remain the same
+
+#include <sol/version.hpp>
+#include <sol/compatibility/lua_version.hpp>
+
+#if SOL_IS_ON(SOL_USE_COMPATIBILITY_LAYER_I_)
+
+#if SOL_IS_ON(SOL_USE_CXX_LUA_I_) || SOL_IS_ON(SOL_USE_CXX_LUAJIT_I_)
+#ifndef COMPAT53_LUA_CPP
+#define COMPAT53_LUA_CPP 1
+#endif // Build Lua Compat layer as C++
+#endif
+#ifndef COMPAT53_INCLUDE_SOURCE
+#define COMPAT53_INCLUDE_SOURCE 1
+#endif // Build Compat Layer Inline
+
+#include <sol/compatibility/compat-5.3.h>
+#include <sol/compatibility/compat-5.4.h>
+
+#endif
+
+#endif // SOL_COMPATIBILITY_HPP
diff --git a/extern/sol3/sol/compatibility/compat-5.3.c.h b/extern/sol3/sol/compatibility/compat-5.3.c.h
new file mode 100644
index 0000000000..efbddae5ab
--- /dev/null
+++ b/extern/sol3/sol/compatibility/compat-5.3.c.h
@@ -0,0 +1,900 @@
+#include <sol/compatibility/compat-5.3.h>
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include <stdio.h>
+
+/* don't compile it again if it already is included via compat53.h */
+#ifndef KEPLER_PROJECT_COMPAT53_C_
+#define KEPLER_PROJECT_COMPAT53_C_
+
+
+
+/* definitions for Lua 5.1 only */
+#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM == 501
+
+#ifndef COMPAT53_FOPEN_NO_LOCK
+#if defined(_MSC_VER)
+#define COMPAT53_FOPEN_NO_LOCK 1
+#else /* otherwise */
+#define COMPAT53_FOPEN_NO_LOCK 0
+#endif /* VC++ only so far */
+#endif /* No-lock fopen_s usage if possible */
+
+#if defined(_MSC_VER) && COMPAT53_FOPEN_NO_LOCK
+#include <share.h>
+#endif /* VC++ _fsopen for share-allowed file read */
+
+#ifndef COMPAT53_HAVE_STRERROR_R
+#if defined(__GLIBC__) || defined(_POSIX_VERSION) || defined(__APPLE__) || (!defined(__MINGW32__) && defined(__GNUC__) && (__GNUC__ < 6))
+#define COMPAT53_HAVE_STRERROR_R 1
+#else /* none of the defines matched: define to 0 */
+#define COMPAT53_HAVE_STRERROR_R 0
+#endif /* have strerror_r of some form */
+#endif /* strerror_r */
+
+#ifndef COMPAT53_HAVE_STRERROR_S
+#if defined(_MSC_VER) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) || (defined(__STDC_LIB_EXT1__) && __STDC_LIB_EXT1__)
+#define COMPAT53_HAVE_STRERROR_S 1
+#else /* not VC++ or C11 */
+#define COMPAT53_HAVE_STRERROR_S 0
+#endif /* strerror_s from VC++ or C11 */
+#endif /* strerror_s */
+
+#ifndef COMPAT53_LUA_FILE_BUFFER_SIZE
+#define COMPAT53_LUA_FILE_BUFFER_SIZE 4096
+#endif /* Lua File Buffer Size */
+
+
+static char* compat53_strerror(int en, char* buff, size_t sz) {
+#if COMPAT53_HAVE_STRERROR_R
+	/* use strerror_r here, because it's available on these specific platforms */
+	if (sz > 0) {
+		buff[0] = '\0';
+		/* we don't care whether the GNU version or the XSI version is used: */
+		if (strerror_r(en, buff, sz)) {
+			/* Yes, we really DO want to ignore the return value!
+			 * GCC makes that extra hard, not even a (void) cast will do. */
+		}
+		if (buff[0] == '\0') {
+			/* Buffer is unchanged, so we probably have called GNU strerror_r which
+			 * returned a static constant string. Chances are that strerror will
+			 * return the same static constant string and therefore be thread-safe. */
+			return strerror(en);
+		}
+	}
+	return buff; /* sz is 0 *or* strerror_r wrote into the buffer */
+#elif COMPAT53_HAVE_STRERROR_S
+	/* for MSVC and other C11 implementations, use strerror_s since it's
+	 * provided by default by the libraries */
+	strerror_s(buff, sz, en);
+	return buff;
+#else
+	/* fallback, but strerror is not guaranteed to be threadsafe due to modifying
+	 * errno itself and some impls not locking a static buffer for it ... but most
+	 * known systems have threadsafe errno: this might only change if the locale
+	 * is changed out from under someone while this function is being called */
+	(void)buff;
+	(void)sz;
+	return strerror(en);
+#endif
+}
+
+
+COMPAT53_API int lua_absindex(lua_State* L, int i) {
+	if (i < 0 && i > LUA_REGISTRYINDEX)
+		i += lua_gettop(L) + 1;
+	return i;
+}
+
+
+static void compat53_call_lua(lua_State* L, char const code[], size_t len, int nargs, int nret) {
+	lua_rawgetp(L, LUA_REGISTRYINDEX, (void*)code);
+	if (lua_type(L, -1) != LUA_TFUNCTION) {
+		lua_pop(L, 1);
+		if (luaL_loadbuffer(L, code, len, "=none"))
+			lua_error(L);
+		lua_pushvalue(L, -1);
+		lua_rawsetp(L, LUA_REGISTRYINDEX, (void*)code);
+	}
+	lua_insert(L, -nargs - 1);
+	lua_call(L, nargs, nret);
+}
+
+
+COMPAT53_API void lua_arith(lua_State* L, int op) {
+	static const char compat53_arith_code[]
+	     = "local op,a,b=...\n"
+	       "if op==0 then return a+b\n"
+	       "elseif op==1 then return a-b\n"
+	       "elseif op==2 then return a*b\n"
+	       "elseif op==3 then return a/b\n"
+	       "elseif op==4 then return a%b\n"
+	       "elseif op==5 then return a^b\n"
+	       "elseif op==6 then return -a\n"
+	       "end\n";
+
+	if (op < LUA_OPADD || op > LUA_OPUNM)
+		luaL_error(L, "invalid 'op' argument for lua_arith");
+	luaL_checkstack(L, 5, "not enough stack slots");
+	if (op == LUA_OPUNM)
+		lua_pushvalue(L, -1);
+	lua_pushnumber(L, op);
+	lua_insert(L, -3);
+	compat53_call_lua(L, compat53_arith_code, sizeof(compat53_arith_code) - 1, 3, 1);
+}
+
+
+COMPAT53_API int lua_compare(lua_State* L, int idx1, int idx2, int op) {
+	static const char compat53_compare_code[]
+	     = "local a,b=...\n"
+	       "return a<=b\n";
+
+	int result = 0;
+	switch (op) {
+	case LUA_OPEQ:
+		return lua_equal(L, idx1, idx2);
+	case LUA_OPLT:
+		return lua_lessthan(L, idx1, idx2);
+	case LUA_OPLE:
+		luaL_checkstack(L, 5, "not enough stack slots");
+		idx1 = lua_absindex(L, idx1);
+		idx2 = lua_absindex(L, idx2);
+		lua_pushvalue(L, idx1);
+		lua_pushvalue(L, idx2);
+		compat53_call_lua(L, compat53_compare_code, sizeof(compat53_compare_code) - 1, 2, 1);
+		result = lua_toboolean(L, -1);
+		lua_pop(L, 1);
+		return result;
+	default:
+		luaL_error(L, "invalid 'op' argument for lua_compare");
+	}
+	return 0;
+}
+
+
+COMPAT53_API void lua_copy(lua_State* L, int from, int to) {
+	int abs_to = lua_absindex(L, to);
+	luaL_checkstack(L, 1, "not enough stack slots");
+	lua_pushvalue(L, from);
+	lua_replace(L, abs_to);
+}
+
+
+COMPAT53_API void lua_len(lua_State* L, int i) {
+	switch (lua_type(L, i)) {
+	case LUA_TSTRING:
+		lua_pushnumber(L, (lua_Number)lua_objlen(L, i));
+		break;
+	case LUA_TTABLE:
+		if (!luaL_callmeta(L, i, "__len"))
+			lua_pushnumber(L, (lua_Number)lua_objlen(L, i));
+		break;
+	case LUA_TUSERDATA:
+		if (luaL_callmeta(L, i, "__len"))
+			break;
+		/* FALLTHROUGH */
+	default:
+		luaL_error(L, "attempt to get length of a %s value", lua_typename(L, lua_type(L, i)));
+	}
+}
+
+
+COMPAT53_API int lua_rawgetp(lua_State* L, int i, const void* p) {
+	int abs_i = lua_absindex(L, i);
+	lua_pushlightuserdata(L, (void*)p);
+	lua_rawget(L, abs_i);
+	return lua_type(L, -1);
+}
+
+COMPAT53_API void lua_rawsetp(lua_State* L, int i, const void* p) {
+	int abs_i = lua_absindex(L, i);
+	luaL_checkstack(L, 1, "not enough stack slots");
+	lua_pushlightuserdata(L, (void*)p);
+	lua_insert(L, -2);
+	lua_rawset(L, abs_i);
+}
+
+
+COMPAT53_API lua_Number lua_tonumberx(lua_State* L, int i, int* isnum) {
+	lua_Number n = lua_tonumber(L, i);
+	if (isnum != NULL) {
+		*isnum = (n != 0 || lua_isnumber(L, i));
+	}
+	return n;
+}
+
+
+COMPAT53_API void luaL_checkversion(lua_State* L) {
+	(void)L;
+}
+
+
+COMPAT53_API void luaL_checkstack(lua_State* L, int sp, const char* msg) {
+	if (!lua_checkstack(L, sp + LUA_MINSTACK)) {
+		if (msg != NULL)
+			luaL_error(L, "stack overflow (%s)", msg);
+		else {
+			lua_pushliteral(L, "stack overflow");
+			lua_error(L);
+		}
+	}
+}
+
+
+COMPAT53_API int luaL_getsubtable(lua_State* L, int i, const char* name) {
+	int abs_i = lua_absindex(L, i);
+	luaL_checkstack(L, 3, "not enough stack slots");
+	lua_pushstring(L, name);
+	lua_gettable(L, abs_i);
+	if (lua_istable(L, -1))
+		return 1;
+	lua_pop(L, 1);
+	lua_newtable(L);
+	lua_pushstring(L, name);
+	lua_pushvalue(L, -2);
+	lua_settable(L, abs_i);
+	return 0;
+}
+
+
+COMPAT53_API lua_Integer luaL_len(lua_State* L, int i) {
+	lua_Integer res = 0;
+	int isnum = 0;
+	luaL_checkstack(L, 1, "not enough stack slots");
+	lua_len(L, i);
+	res = lua_tointegerx(L, -1, &isnum);
+	lua_pop(L, 1);
+	if (!isnum)
+		luaL_error(L, "object length is not an integer");
+	return res;
+}
+
+
+COMPAT53_API void luaL_setfuncs(lua_State* L, const luaL_Reg* l, int nup) {
+	luaL_checkstack(L, nup + 1, "too many upvalues");
+	for (; l->name != NULL; l++) { /* fill the table with given functions */
+		int i;
+		lua_pushstring(L, l->name);
+		for (i = 0; i < nup; i++) /* copy upvalues to the top */
+			lua_pushvalue(L, -(nup + 1));
+		lua_pushcclosure(L, l->func, nup); /* closure with those upvalues */
+		lua_settable(L, -(nup + 3));       /* table must be below the upvalues, the name and the closure */
+	}
+	lua_pop(L, nup); /* remove upvalues */
+}
+
+
+COMPAT53_API void luaL_setmetatable(lua_State* L, const char* tname) {
+	luaL_checkstack(L, 1, "not enough stack slots");
+	luaL_getmetatable(L, tname);
+	lua_setmetatable(L, -2);
+}
+
+
+COMPAT53_API void* luaL_testudata(lua_State* L, int i, const char* tname) {
+	void* p = lua_touserdata(L, i);
+	luaL_checkstack(L, 2, "not enough stack slots");
+	if (p == NULL || !lua_getmetatable(L, i))
+		return NULL;
+	else {
+		int res = 0;
+		luaL_getmetatable(L, tname);
+		res = lua_rawequal(L, -1, -2);
+		lua_pop(L, 2);
+		if (!res)
+			p = NULL;
+	}
+	return p;
+}
+
+
+static int compat53_countlevels(lua_State* L) {
+	lua_Debug ar;
+	int li = 1, le = 1;
+	/* find an upper bound */
+	while (lua_getstack(L, le, &ar)) {
+		li = le;
+		le *= 2;
+	}
+	/* do a binary search */
+	while (li < le) {
+		int m = (li + le) / 2;
+		if (lua_getstack(L, m, &ar))
+			li = m + 1;
+		else
+			le = m;
+	}
+	return le - 1;
+}
+
+static int compat53_findfield(lua_State* L, int objidx, int level) {
+	if (level == 0 || !lua_istable(L, -1))
+		return 0;                               /* not found */
+	lua_pushnil(L);                              /* start 'next' loop */
+	while (lua_next(L, -2)) {                    /* for each pair in table */
+		if (lua_type(L, -2) == LUA_TSTRING) {   /* ignore non-string keys */
+			if (lua_rawequal(L, objidx, -1)) { /* found object? */
+				lua_pop(L, 1);                /* remove value (but keep name) */
+				return 1;
+			}
+			else if (compat53_findfield(L, objidx, level - 1)) { /* try recursively */
+				lua_remove(L, -2);                              /* remove table (but keep name) */
+				lua_pushliteral(L, ".");
+				lua_insert(L, -2); /* place '.' between the two names */
+				lua_concat(L, 3);
+				return 1;
+			}
+		}
+		lua_pop(L, 1); /* remove value */
+	}
+	return 0; /* not found */
+}
+
+static int compat53_pushglobalfuncname(lua_State* L, lua_Debug* ar) {
+	int top = lua_gettop(L);
+	lua_getinfo(L, "f", ar); /* push function */
+	lua_pushvalue(L, LUA_GLOBALSINDEX);
+	if (compat53_findfield(L, top + 1, 2)) {
+		lua_copy(L, -1, top + 1); /* move name to proper place */
+		lua_pop(L, 2);            /* remove pushed values */
+		return 1;
+	}
+	else {
+		lua_settop(L, top); /* remove function and global table */
+		return 0;
+	}
+}
+
+static void compat53_pushfuncname(lua_State* L, lua_Debug* ar) {
+	if (*ar->namewhat != '\0') /* is there a name? */
+		lua_pushfstring(L, "function " LUA_QS, ar->name);
+	else if (*ar->what == 'm') /* main? */
+		lua_pushliteral(L, "main chunk");
+	else if (*ar->what == 'C') {
+		if (compat53_pushglobalfuncname(L, ar)) {
+			lua_pushfstring(L, "function " LUA_QS, lua_tostring(L, -1));
+			lua_remove(L, -2); /* remove name */
+		}
+		else
+			lua_pushliteral(L, "?");
+	}
+	else
+		lua_pushfstring(L, "function <%s:%d>", ar->short_src, ar->linedefined);
+}
+
+#define COMPAT53_LEVELS1 12 /* size of the first part of the stack */
+#define COMPAT53_LEVELS2 10 /* size of the second part of the stack */
+
+COMPAT53_API void luaL_traceback(lua_State* L, lua_State* L1, const char* msg, int level) {
+	lua_Debug ar;
+	int top = lua_gettop(L);
+	int numlevels = compat53_countlevels(L1);
+	int mark = (numlevels > COMPAT53_LEVELS1 + COMPAT53_LEVELS2) ? COMPAT53_LEVELS1 : 0;
+	if (msg)
+		lua_pushfstring(L, "%s\n", msg);
+	lua_pushliteral(L, "stack traceback:");
+	while (lua_getstack(L1, level++, &ar)) {
+		if (level == mark) {                       /* too many levels? */
+			lua_pushliteral(L, "\n\t...");        /* add a '...' */
+			level = numlevels - COMPAT53_LEVELS2; /* and skip to last ones */
+		}
+		else {
+			lua_getinfo(L1, "Slnt", &ar);
+			lua_pushfstring(L, "\n\t%s:", ar.short_src);
+			if (ar.currentline > 0)
+				lua_pushfstring(L, "%d:", ar.currentline);
+			lua_pushliteral(L, " in ");
+			compat53_pushfuncname(L, &ar);
+			lua_concat(L, lua_gettop(L) - top);
+		}
+	}
+	lua_concat(L, lua_gettop(L) - top);
+}
+
+
+COMPAT53_API int luaL_fileresult(lua_State* L, int stat, const char* fname) {
+	const char* serr = NULL;
+	int en = errno; /* calls to Lua API may change this value */
+	char buf[512] = { 0 };
+	if (stat) {
+		lua_pushboolean(L, 1);
+		return 1;
+	}
+	else {
+		lua_pushnil(L);
+		serr = compat53_strerror(en, buf, sizeof(buf));
+		if (fname)
+			lua_pushfstring(L, "%s: %s", fname, serr);
+		else
+			lua_pushstring(L, serr);
+		lua_pushnumber(L, (lua_Number)en);
+		return 3;
+	}
+}
+
+
+static int compat53_checkmode(lua_State* L, const char* mode, const char* modename, int err) {
+	if (mode && strchr(mode, modename[0]) == NULL) {
+		lua_pushfstring(L, "attempt to load a %s chunk (mode is '%s')", modename, mode);
+		return err;
+	}
+	return LUA_OK;
+}
+
+
+typedef struct {
+	lua_Reader reader;
+	void* ud;
+	int has_peeked_data;
+	const char* peeked_data;
+	size_t peeked_data_size;
+} compat53_reader_data;
+
+
+static const char* compat53_reader(lua_State* L, void* ud, size_t* size) {
+	compat53_reader_data* data = (compat53_reader_data*)ud;
+	if (data->has_peeked_data) {
+		data->has_peeked_data = 0;
+		*size = data->peeked_data_size;
+		return data->peeked_data;
+	}
+	else
+		return data->reader(L, data->ud, size);
+}
+
+
+COMPAT53_API int lua_load(lua_State* L, lua_Reader reader, void* data, const char* source, const char* mode) {
+	int status = LUA_OK;
+	compat53_reader_data compat53_data = { reader, data, 1, 0, 0 };
+	compat53_data.peeked_data = reader(L, data, &(compat53_data.peeked_data_size));
+	if (compat53_data.peeked_data && compat53_data.peeked_data_size && compat53_data.peeked_data[0] == LUA_SIGNATURE[0]) /* binary file? */
+		status = compat53_checkmode(L, mode, "binary", LUA_ERRSYNTAX);
+	else
+		status = compat53_checkmode(L, mode, "text", LUA_ERRSYNTAX);
+	if (status != LUA_OK)
+		return status;
+		/* we need to call the original 5.1 version of lua_load! */
+#undef lua_load
+	return lua_load(L, compat53_reader, &compat53_data, source);
+#define lua_load COMPAT53_CONCAT(COMPAT53_PREFIX, _load_53)
+}
+
+
+typedef struct {
+	int n;                                    /* number of pre-read characters */
+	FILE* f;                                  /* file being read */
+	char buff[COMPAT53_LUA_FILE_BUFFER_SIZE]; /* area for reading file */
+} compat53_LoadF;
+
+
+static const char* compat53_getF(lua_State* L, void* ud, size_t* size) {
+	compat53_LoadF* lf = (compat53_LoadF*)ud;
+	(void)L;            /* not used */
+	if (lf->n > 0) {    /* are there pre-read characters to be read? */
+		*size = lf->n; /* return them (chars already in buffer) */
+		lf->n = 0;     /* no more pre-read characters */
+	}
+	else { /* read a block from file */
+		  /* 'fread' can return > 0 *and* set the EOF flag. If next call to
+		  'compat53_getF' called 'fread', it might still wait for user input.
+		  The next check avoids this problem. */
+		if (feof(lf->f))
+			return NULL;
+		*size = fread(lf->buff, 1, sizeof(lf->buff), lf->f); /* read block */
+	}
+	return lf->buff;
+}
+
+
+static int compat53_errfile(lua_State* L, const char* what, int fnameindex) {
+	char buf[512] = { 0 };
+	const char* serr = compat53_strerror(errno, buf, sizeof(buf));
+	const char* filename = lua_tostring(L, fnameindex) + 1;
+	lua_pushfstring(L, "cannot %s %s: %s", what, filename, serr);
+	lua_remove(L, fnameindex);
+	return LUA_ERRFILE;
+}
+
+
+static int compat53_skipBOM(compat53_LoadF* lf) {
+	const char* p = "\xEF\xBB\xBF"; /* UTF-8 BOM mark */
+	int c;
+	lf->n = 0;
+	do {
+		c = getc(lf->f);
+		if (c == EOF || c != *(const unsigned char*)p++)
+			return c;
+		lf->buff[lf->n++] = (char)c; /* to be read by the parser */
+	} while (*p != '\0');
+	lf->n = 0;          /* prefix matched; discard it */
+	return getc(lf->f); /* return next character */
+}
+
+
+/*
+** reads the first character of file 'f' and skips an optional BOM mark
+** in its beginning plus its first line if it starts with '#'. Returns
+** true if it skipped the first line.  In any case, '*cp' has the
+** first "valid" character of the file (after the optional BOM and
+** a first-line comment).
+*/
+static int compat53_skipcomment(compat53_LoadF* lf, int* cp) {
+	int c = *cp = compat53_skipBOM(lf);
+	if (c == '#') { /* first line is a comment (Unix exec. file)? */
+		do {       /* skip first line */
+			c = getc(lf->f);
+		} while (c != EOF && c != '\n');
+		*cp = getc(lf->f); /* skip end-of-line, if present */
+		return 1;          /* there was a comment */
+	}
+	else
+		return 0; /* no comment */
+}
+
+
+COMPAT53_API int luaL_loadfilex(lua_State* L, const char* filename, const char* mode) {
+	compat53_LoadF lf;
+	int status, readstatus;
+	int c;
+	int fnameindex = lua_gettop(L) + 1; /* index of filename on the stack */
+	if (filename == NULL) {
+		lua_pushliteral(L, "=stdin");
+		lf.f = stdin;
+	}
+	else {
+		lua_pushfstring(L, "@%s", filename);
+#if defined(_MSC_VER)
+		/* This code is here to stop a deprecation error that stops builds
+		 * if a certain macro is defined. While normally not caring would
+		 * be best, some header-only libraries and builds can't afford to
+		 * dictate this to the user. A quick check shows that fopen_s this
+		 * goes back to VS 2005, and _fsopen goes back to VS 2003 .NET,
+		 * possibly even before that so we don't need to do any version
+		 * number checks, since this has been there since forever.  */
+
+		/* TO USER: if you want the behavior of typical fopen_s/fopen,
+		 * which does lock the file on VC++, define the macro used below to 0 */
+#if COMPAT53_FOPEN_NO_LOCK
+		lf.f = _fsopen(filename, "r", _SH_DENYNO); /* do not lock the file in any way */
+		if (lf.f == NULL)
+			return compat53_errfile(L, "open", fnameindex);
+#else  /* use default locking version */
+		if (fopen_s(&lf.f, filename, "r") != 0)
+			return compat53_errfile(L, "open", fnameindex);
+#endif /* Locking vs. No-locking fopen variants */
+#else
+		lf.f = fopen(filename, "r"); /* default stdlib doesn't forcefully lock files here */
+		if (lf.f == NULL)
+			return compat53_errfile(L, "open", fnameindex);
+#endif
+	}
+	if (compat53_skipcomment(&lf, &c))       /* read initial portion */
+		lf.buff[lf.n++] = '\n';             /* add line to correct line numbers */
+	if (c == LUA_SIGNATURE[0] && filename) { /* binary file? */
+#if defined(_MSC_VER)
+		if (freopen_s(&lf.f, filename, "rb", lf.f) != 0)
+			return compat53_errfile(L, "reopen", fnameindex);
+#else
+		lf.f = freopen(filename, "rb", lf.f); /* reopen in binary mode */
+		if (lf.f == NULL)
+			return compat53_errfile(L, "reopen", fnameindex);
+#endif
+		compat53_skipcomment(&lf, &c); /* re-read initial portion */
+	}
+	if (c != EOF)
+		lf.buff[lf.n++] = (char)c; /* 'c' is the first character of the stream */
+	status = lua_load(L, &compat53_getF, &lf, lua_tostring(L, -1), mode);
+	readstatus = ferror(lf.f);
+	if (filename)
+		fclose(lf.f); /* close file (even in case of errors) */
+	if (readstatus) {
+		lua_settop(L, fnameindex); /* ignore results from 'lua_load' */
+		return compat53_errfile(L, "read", fnameindex);
+	}
+	lua_remove(L, fnameindex);
+	return status;
+}
+
+
+COMPAT53_API int luaL_loadbufferx(lua_State* L, const char* buff, size_t sz, const char* name, const char* mode) {
+	int status = LUA_OK;
+	if (sz > 0 && buff[0] == LUA_SIGNATURE[0]) {
+		status = compat53_checkmode(L, mode, "binary", LUA_ERRSYNTAX);
+	}
+	else {
+		status = compat53_checkmode(L, mode, "text", LUA_ERRSYNTAX);
+	}
+	if (status != LUA_OK)
+		return status;
+	return luaL_loadbuffer(L, buff, sz, name);
+}
+
+
+#if !defined(l_inspectstat) \
+     && (defined(unix) || defined(__unix) || defined(__unix__) || defined(__TOS_AIX__) || defined(_SYSTYPE_BSD) || (defined(__APPLE__) && defined(__MACH__)))
+/* some form of unix; check feature macros in unistd.h for details */
+#include <unistd.h>
+/* check posix version; the relevant include files and macros probably
+ * were available before 2001, but I'm not sure */
+#if defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L
+#include <sys/wait.h>
+#define l_inspectstat(stat, what)   \
+	if (WIFEXITED(stat)) {         \
+		stat = WEXITSTATUS(stat); \
+	}                              \
+	else if (WIFSIGNALED(stat)) {  \
+		stat = WTERMSIG(stat);    \
+		what = "signal";          \
+	}
+#endif
+#endif
+
+/* provide default (no-op) version */
+#if !defined(l_inspectstat)
+#define l_inspectstat(stat, what) ((void)0)
+#endif
+
+
+COMPAT53_API int luaL_execresult(lua_State* L, int stat) {
+	const char* what = "exit";
+	if (stat == -1)
+		return luaL_fileresult(L, 0, NULL);
+	else {
+		l_inspectstat(stat, what);
+		if (*what == 'e' && stat == 0)
+			lua_pushboolean(L, 1);
+		else
+			lua_pushnil(L);
+		lua_pushstring(L, what);
+		lua_pushinteger(L, stat);
+		return 3;
+	}
+}
+
+
+COMPAT53_API void luaL_buffinit(lua_State* L, luaL_Buffer_53* B) {
+	/* make it crash if used via pointer to a 5.1-style luaL_Buffer */
+	B->b.p = NULL;
+	B->b.L = NULL;
+	B->b.lvl = 0;
+	/* reuse the buffer from the 5.1-style luaL_Buffer though! */
+	B->ptr = B->b.buffer;
+	B->capacity = LUAL_BUFFERSIZE;
+	B->nelems = 0;
+	B->L2 = L;
+}
+
+
+COMPAT53_API char* luaL_prepbuffsize(luaL_Buffer_53* B, size_t s) {
+	if (B->capacity - B->nelems < s) { /* needs to grow */
+		char* newptr = NULL;
+		size_t newcap = B->capacity * 2;
+		if (newcap - B->nelems < s)
+			newcap = B->nelems + s;
+		if (newcap < B->capacity) /* overflow */
+			luaL_error(B->L2, "buffer too large");
+#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 504
+		newptr = (char*)lua_newuserdatauv(B->L2, newcap, 0);
+#else
+		newptr = (char*)lua_newuserdata(B->L2, newcap);
+#endif
+		memcpy(newptr, B->ptr, B->nelems);
+		if (B->ptr != B->b.buffer)
+			lua_replace(B->L2, -2); /* remove old buffer */
+		B->ptr = newptr;
+		B->capacity = newcap;
+	}
+	return B->ptr + B->nelems;
+}
+
+
+COMPAT53_API void luaL_addlstring(luaL_Buffer_53* B, const char* s, size_t l) {
+	memcpy(luaL_prepbuffsize(B, l), s, l);
+	luaL_addsize(B, l);
+}
+
+
+COMPAT53_API void luaL_addvalue(luaL_Buffer_53* B) {
+	size_t len = 0;
+	const char* s = lua_tolstring(B->L2, -1, &len);
+	if (!s)
+		luaL_error(B->L2, "cannot convert value to string");
+	if (B->ptr != B->b.buffer)
+		lua_insert(B->L2, -2); /* userdata buffer must be at stack top */
+	luaL_addlstring(B, s, len);
+	lua_remove(B->L2, B->ptr != B->b.buffer ? -2 : -1);
+}
+
+
+void luaL_pushresult(luaL_Buffer_53* B) {
+	lua_pushlstring(B->L2, B->ptr, B->nelems);
+	if (B->ptr != B->b.buffer)
+		lua_replace(B->L2, -2); /* remove userdata buffer */
+}
+
+
+#endif /* Lua 5.1 */
+
+
+
+/* definitions for Lua 5.1 and Lua 5.2 */
+#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM <= 502
+
+
+COMPAT53_API int lua_geti(lua_State* L, int index, lua_Integer i) {
+	index = lua_absindex(L, index);
+	lua_pushinteger(L, i);
+	lua_gettable(L, index);
+	return lua_type(L, -1);
+}
+
+
+COMPAT53_API int lua_isinteger(lua_State* L, int index) {
+	if (lua_type(L, index) == LUA_TNUMBER) {
+		lua_Number n = lua_tonumber(L, index);
+		lua_Integer i = lua_tointeger(L, index);
+		if (i == n)
+			return 1;
+	}
+	return 0;
+}
+
+
+COMPAT53_API lua_Integer lua_tointegerx(lua_State* L, int i, int* isnum) {
+	int ok = 0;
+	lua_Number n = lua_tonumberx(L, i, &ok);
+	if (ok) {
+		if (n == (lua_Integer)n) {
+			if (isnum)
+				*isnum = 1;
+			return (lua_Integer)n;
+		}
+	}
+	if (isnum)
+		*isnum = 0;
+	return 0;
+}
+
+
+static void compat53_reverse(lua_State* L, int a, int b) {
+	for (; a < b; ++a, --b) {
+		lua_pushvalue(L, a);
+		lua_pushvalue(L, b);
+		lua_replace(L, a);
+		lua_replace(L, b);
+	}
+}
+
+
+COMPAT53_API void lua_rotate(lua_State* L, int idx, int n) {
+	int n_elems = 0;
+	idx = lua_absindex(L, idx);
+	n_elems = lua_gettop(L) - idx + 1;
+	if (n < 0)
+		n += n_elems;
+	if (n > 0 && n < n_elems) {
+		luaL_checkstack(L, 2, "not enough stack slots available");
+		n = n_elems - n;
+		compat53_reverse(L, idx, idx + n - 1);
+		compat53_reverse(L, idx + n, idx + n_elems - 1);
+		compat53_reverse(L, idx, idx + n_elems - 1);
+	}
+}
+
+
+COMPAT53_API void lua_seti(lua_State* L, int index, lua_Integer i) {
+	luaL_checkstack(L, 1, "not enough stack slots available");
+	index = lua_absindex(L, index);
+	lua_pushinteger(L, i);
+	lua_insert(L, -2);
+	lua_settable(L, index);
+}
+
+
+#if !defined(lua_str2number)
+#define lua_str2number(s, p) strtod((s), (p))
+#endif
+
+COMPAT53_API size_t lua_stringtonumber(lua_State* L, const char* s) {
+	char* endptr;
+	lua_Number n = lua_str2number(s, &endptr);
+	if (endptr != s) {
+		while (*endptr != '\0' && isspace((unsigned char)*endptr))
+			++endptr;
+		if (*endptr == '\0') {
+			lua_pushnumber(L, n);
+			return endptr - s + 1;
+		}
+	}
+	return 0;
+}
+
+
+COMPAT53_API const char* luaL_tolstring(lua_State* L, int idx, size_t* len) {
+	if (!luaL_callmeta(L, idx, "__tostring")) {
+		int t = lua_type(L, idx), tt = 0;
+		char const* name = NULL;
+		switch (t) {
+		case LUA_TNIL:
+			lua_pushliteral(L, "nil");
+			break;
+		case LUA_TSTRING:
+		case LUA_TNUMBER:
+			lua_pushvalue(L, idx);
+			break;
+		case LUA_TBOOLEAN:
+			if (lua_toboolean(L, idx))
+				lua_pushliteral(L, "true");
+			else
+				lua_pushliteral(L, "false");
+			break;
+		default:
+			tt = luaL_getmetafield(L, idx, "__name");
+			name = (tt == LUA_TSTRING) ? lua_tostring(L, -1) : lua_typename(L, t);
+			lua_pushfstring(L, "%s: %p", name, lua_topointer(L, idx));
+			if (tt != LUA_TNIL)
+				lua_replace(L, -2);
+			break;
+		}
+	}
+	else {
+		if (!lua_isstring(L, -1))
+			luaL_error(L, "'__tostring' must return a string");
+	}
+	return lua_tolstring(L, -1, len);
+}
+
+
+COMPAT53_API void luaL_requiref(lua_State* L, const char* modname, lua_CFunction openf, int glb) {
+	luaL_checkstack(L, 3, "not enough stack slots available");
+	luaL_getsubtable(L, LUA_REGISTRYINDEX, "_LOADED");
+	if (lua_getfield(L, -1, modname) == LUA_TNIL) {
+		lua_pop(L, 1);
+		lua_pushcfunction(L, openf);
+		lua_pushstring(L, modname);
+		lua_call(L, 1, 1);
+		lua_pushvalue(L, -1);
+		lua_setfield(L, -3, modname);
+	}
+	if (glb) {
+		lua_pushvalue(L, -1);
+		lua_setglobal(L, modname);
+	}
+	lua_replace(L, -2);
+}
+
+
+#endif /* Lua 5.1 and 5.2 */
+
+
+#endif /* KEPLER_PROJECT_COMPAT53_C_ */
+
+
+/*********************************************************************
+ * This file contains parts of Lua 5.2's and Lua 5.3's source code:
+ *
+ * Copyright (C) 1994-2014 Lua.org, PUC-Rio.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *********************************************************************/
diff --git a/extern/sol3/sol/compatibility/compat-5.3.h b/extern/sol3/sol/compatibility/compat-5.3.h
new file mode 100644
index 0000000000..c2ac03312d
--- /dev/null
+++ b/extern/sol3/sol/compatibility/compat-5.3.h
@@ -0,0 +1,424 @@
+#ifndef KEPLER_PROJECT_COMPAT53_H_
+#define KEPLER_PROJECT_COMPAT53_H_
+
+#include <stddef.h>
+#include <limits.h>
+#include <string.h>
+#if defined(__cplusplus) && !defined(COMPAT53_LUA_CPP)
+extern "C" {
+#endif
+#include <lua.h>
+#include <lauxlib.h>
+#include <lualib.h>
+#if defined(__cplusplus) && !defined(COMPAT53_LUA_CPP)
+}
+#endif
+
+#ifndef COMPAT53_PREFIX
+/* we chose this name because many other lua bindings / libs have
+* their own compatibility layer, and that use the compat53 declaration
+* frequently, causing all kinds of linker / compiler issues
+*/
+#  define COMPAT53_PREFIX kp_compat53
+#endif // COMPAT53_PREFIX
+
+#ifndef COMPAT53_API
+#  if defined(COMPAT53_INCLUDE_SOURCE) && COMPAT53_INCLUDE_SOURCE
+#    if defined(__GNUC__) || defined(__clang__)
+#      define COMPAT53_API __attribute__((__unused__)) static inline 
+#    else
+#      define COMPAT53_API static inline 
+#    endif /* Clang/GCC */
+#  else /* COMPAT53_INCLUDE_SOURCE */
+/* we are not including source, so everything is extern */
+#      define COMPAT53_API extern
+#  endif /* COMPAT53_INCLUDE_SOURCE */
+#endif /* COMPAT53_PREFIX */
+
+
+#define COMPAT53_CONCAT_HELPER(a, b) a##b
+#define COMPAT53_CONCAT(a, b) COMPAT53_CONCAT_HELPER(a, b)
+
+
+
+/* declarations for Lua 5.1 */
+#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM == 501
+
+/* XXX not implemented:
+* lua_arith (new operators)
+* lua_upvalueid
+* lua_upvaluejoin
+* lua_version
+* lua_yieldk
+*/
+
+#ifndef LUA_OK
+#  define LUA_OK 0
+#endif
+#ifndef LUA_OPADD
+#  define LUA_OPADD 0
+#endif
+#ifndef LUA_OPSUB
+#  define LUA_OPSUB 1
+#endif
+#ifndef LUA_OPMUL
+#  define LUA_OPMUL 2
+#endif
+#ifndef LUA_OPDIV
+#  define LUA_OPDIV 3
+#endif
+#ifndef LUA_OPMOD
+#  define LUA_OPMOD 4
+#endif
+#ifndef LUA_OPPOW
+#  define LUA_OPPOW 5
+#endif
+#ifndef LUA_OPUNM
+#  define LUA_OPUNM 6
+#endif
+#ifndef LUA_OPEQ
+#  define LUA_OPEQ 0
+#endif
+#ifndef LUA_OPLT
+#  define LUA_OPLT 1
+#endif
+#ifndef LUA_OPLE
+#  define LUA_OPLE 2
+#endif
+
+/* LuaJIT/Lua 5.1 does not have the updated
+* error codes for thread status/function returns (but some patched versions do)
+* define it only if it's not found
+*/
+#if !defined(LUA_ERRGCMM)
+/* Use + 2 because in some versions of Lua (Lua 5.1)
+* LUA_ERRFILE is defined as (LUA_ERRERR+1)
+* so we need to avoid it (LuaJIT might have something at this
+* integer value too)
+*/
+#  define LUA_ERRGCMM (LUA_ERRERR + 2)
+#endif /* LUA_ERRGCMM define */
+
+#if !defined(MOONJIT_VERSION)
+typedef size_t lua_Unsigned;
+#endif
+
+typedef struct luaL_Buffer_53 {
+	luaL_Buffer b; /* make incorrect code crash! */
+	char *ptr;
+	size_t nelems;
+	size_t capacity;
+	lua_State *L2;
+} luaL_Buffer_53;
+#define luaL_Buffer luaL_Buffer_53
+
+/* In PUC-Rio 5.1, userdata is a simple FILE*
+* In LuaJIT, it's a struct where the first member is a FILE*
+* We can't support the `closef` member
+*/
+typedef struct luaL_Stream {
+	FILE *f;
+} luaL_Stream;
+
+#define lua_absindex COMPAT53_CONCAT(COMPAT53_PREFIX, _absindex)
+COMPAT53_API int lua_absindex(lua_State *L, int i);
+
+#define lua_arith COMPAT53_CONCAT(COMPAT53_PREFIX, _arith)
+COMPAT53_API void lua_arith(lua_State *L, int op);
+
+#define lua_compare COMPAT53_CONCAT(COMPAT53_PREFIX, _compare)
+COMPAT53_API int lua_compare(lua_State *L, int idx1, int idx2, int op);
+
+#define lua_copy COMPAT53_CONCAT(COMPAT53_PREFIX, _copy)
+COMPAT53_API void lua_copy(lua_State *L, int from, int to);
+
+#define lua_getuservalue(L, i) \
+  (lua_getfenv((L), (i)), lua_type((L), -1))
+#define lua_setuservalue(L, i) \
+  (luaL_checktype((L), -1, LUA_TTABLE), lua_setfenv((L), (i)))
+
+#define lua_len COMPAT53_CONCAT(COMPAT53_PREFIX, _len)
+COMPAT53_API void lua_len(lua_State *L, int i);
+
+#define lua_pushstring(L, s) \
+  (lua_pushstring((L), (s)), lua_tostring((L), -1))
+
+#define lua_pushlstring(L, s, len) \
+  ((((len) == 0) ? lua_pushlstring((L), "", 0) : lua_pushlstring((L), (s), (len))), lua_tostring((L), -1))
+
+#ifndef luaL_newlibtable
+#  define luaL_newlibtable(L, l) \
+  (lua_createtable((L), 0, sizeof((l))/sizeof(*(l))-1))
+#endif
+#ifndef luaL_newlib
+#  define luaL_newlib(L, l) \
+  (luaL_newlibtable((L), (l)), luaL_register((L), NULL, (l)))
+#endif
+
+#ifndef lua_pushglobaltable
+#  define lua_pushglobaltable(L) \
+  lua_pushvalue((L), LUA_GLOBALSINDEX)
+#endif
+#define lua_rawgetp COMPAT53_CONCAT(COMPAT53_PREFIX, _rawgetp)
+COMPAT53_API int lua_rawgetp(lua_State *L, int i, const void *p);
+
+#define lua_rawsetp COMPAT53_CONCAT(COMPAT53_PREFIX, _rawsetp)
+COMPAT53_API void lua_rawsetp(lua_State *L, int i, const void *p);
+
+#define lua_rawlen(L, i) lua_objlen((L), (i))
+
+#define lua_tointeger(L, i) lua_tointegerx((L), (i), NULL)
+
+#define lua_tonumberx COMPAT53_CONCAT(COMPAT53_PREFIX, _tonumberx)
+COMPAT53_API lua_Number lua_tonumberx(lua_State *L, int i, int *isnum);
+
+#define luaL_checkversion COMPAT53_CONCAT(COMPAT53_PREFIX, L_checkversion)
+COMPAT53_API void luaL_checkversion(lua_State *L);
+
+#define lua_load COMPAT53_CONCAT(COMPAT53_PREFIX, _load_53)
+COMPAT53_API int lua_load(lua_State *L, lua_Reader reader, void *data, const char* source, const char* mode);
+
+#define luaL_loadfilex COMPAT53_CONCAT(COMPAT53_PREFIX, L_loadfilex)
+COMPAT53_API int luaL_loadfilex(lua_State *L, const char *filename, const char *mode);
+
+#define luaL_loadbufferx COMPAT53_CONCAT(COMPAT53_PREFIX, L_loadbufferx)
+COMPAT53_API int luaL_loadbufferx(lua_State *L, const char *buff, size_t sz, const char *name, const char *mode);
+
+#define luaL_checkstack COMPAT53_CONCAT(COMPAT53_PREFIX, L_checkstack_53)
+COMPAT53_API void luaL_checkstack(lua_State *L, int sp, const char *msg);
+
+#define luaL_getsubtable COMPAT53_CONCAT(COMPAT53_PREFIX, L_getsubtable)
+COMPAT53_API int luaL_getsubtable(lua_State* L, int i, const char *name);
+
+#define luaL_len COMPAT53_CONCAT(COMPAT53_PREFIX, L_len)
+COMPAT53_API lua_Integer luaL_len(lua_State *L, int i);
+
+#define luaL_setfuncs COMPAT53_CONCAT(COMPAT53_PREFIX, L_setfuncs)
+COMPAT53_API void luaL_setfuncs(lua_State *L, const luaL_Reg *l, int nup);
+
+#define luaL_setmetatable COMPAT53_CONCAT(COMPAT53_PREFIX, L_setmetatable)
+COMPAT53_API void luaL_setmetatable(lua_State *L, const char *tname);
+
+#define luaL_testudata COMPAT53_CONCAT(COMPAT53_PREFIX, L_testudata)
+COMPAT53_API void *luaL_testudata(lua_State *L, int i, const char *tname);
+
+#define luaL_traceback COMPAT53_CONCAT(COMPAT53_PREFIX, L_traceback)
+COMPAT53_API void luaL_traceback(lua_State *L, lua_State *L1, const char *msg, int level);
+
+#define luaL_fileresult COMPAT53_CONCAT(COMPAT53_PREFIX, L_fileresult)
+COMPAT53_API int luaL_fileresult(lua_State *L, int stat, const char *fname);
+
+#define luaL_execresult COMPAT53_CONCAT(COMPAT53_PREFIX, L_execresult)
+COMPAT53_API int luaL_execresult(lua_State *L, int stat);
+
+#define lua_callk(L, na, nr, ctx, cont) \
+  ((void)(ctx), (void)(cont), lua_call((L), (na), (nr)))
+#define lua_pcallk(L, na, nr, err, ctx, cont) \
+  ((void)(ctx), (void)(cont), lua_pcall((L), (na), (nr), (err)))
+
+#define lua_resume(L, from, nargs) \
+  ((void)(from), lua_resume((L), (nargs)))
+
+#define luaL_buffinit COMPAT53_CONCAT(COMPAT53_PREFIX, _buffinit_53)
+COMPAT53_API void luaL_buffinit(lua_State *L, luaL_Buffer_53 *B);
+
+#define luaL_prepbuffsize COMPAT53_CONCAT(COMPAT53_PREFIX, _prepbufsize_53)
+COMPAT53_API char *luaL_prepbuffsize(luaL_Buffer_53 *B, size_t s);
+
+#define luaL_addlstring COMPAT53_CONCAT(COMPAT53_PREFIX, _addlstring_53)
+COMPAT53_API void luaL_addlstring(luaL_Buffer_53 *B, const char *s, size_t l);
+
+#define luaL_addvalue COMPAT53_CONCAT(COMPAT53_PREFIX, _addvalue_53)
+COMPAT53_API void luaL_addvalue(luaL_Buffer_53 *B);
+
+#define luaL_pushresult COMPAT53_CONCAT(COMPAT53_PREFIX, _pushresult_53)
+COMPAT53_API void luaL_pushresult(luaL_Buffer_53 *B);
+
+#undef luaL_buffinitsize
+#define luaL_buffinitsize(L, B, s) \
+  (luaL_buffinit((L), (B)), luaL_prepbuffsize((B), (s)))
+
+#undef luaL_prepbuffer
+#define luaL_prepbuffer(B) \
+  luaL_prepbuffsize((B), LUAL_BUFFERSIZE)
+
+#undef luaL_addchar
+#define luaL_addchar(B, c) \
+  ((void)((B)->nelems < (B)->capacity || luaL_prepbuffsize((B), 1)), \
+   ((B)->ptr[(B)->nelems++] = (c)))
+
+#undef luaL_addsize
+#define luaL_addsize(B, s) \
+  ((B)->nelems += (s))
+
+#undef luaL_addstring
+#define luaL_addstring(B, s) \
+  luaL_addlstring((B), (s), strlen((s)))
+
+#undef luaL_pushresultsize
+#define luaL_pushresultsize(B, s) \
+  (luaL_addsize((B), (s)), luaL_pushresult((B)))
+
+#if defined(LUA_COMPAT_APIINTCASTS)
+#define lua_pushunsigned(L, n) \
+  lua_pushinteger((L), (lua_Integer)(n))
+#define lua_tounsignedx(L, i, is) \
+  ((lua_Unsigned)lua_tointegerx((L), (i), (is)))
+#define lua_tounsigned(L, i) \
+  lua_tounsignedx((L), (i), NULL)
+#define luaL_checkunsigned(L, a) \
+  ((lua_Unsigned)luaL_checkinteger((L), (a)))
+#define luaL_optunsigned(L, a, d) \
+  ((lua_Unsigned)luaL_optinteger((L), (a), (lua_Integer)(d)))
+#endif
+
+#endif /* Lua 5.1 only */
+
+
+
+/* declarations for Lua 5.1 and 5.2 */
+#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM <= 502
+
+typedef int lua_KContext;
+
+typedef int(*lua_KFunction)(lua_State *L, int status, lua_KContext ctx);
+
+#define lua_dump(L, w, d, s) \
+  ((void)(s), lua_dump((L), (w), (d)))
+
+#define lua_getfield(L, i, k) \
+  (lua_getfield((L), (i), (k)), lua_type((L), -1))
+
+#define lua_gettable(L, i) \
+  (lua_gettable((L), (i)), lua_type((L), -1))
+
+#define lua_geti COMPAT53_CONCAT(COMPAT53_PREFIX, _geti)
+COMPAT53_API int lua_geti(lua_State *L, int index, lua_Integer i);
+
+#define lua_isinteger COMPAT53_CONCAT(COMPAT53_PREFIX, _isinteger)
+COMPAT53_API int lua_isinteger(lua_State *L, int index);
+
+#define lua_tointegerx COMPAT53_CONCAT(COMPAT53_PREFIX, _tointegerx_53)
+COMPAT53_API lua_Integer lua_tointegerx(lua_State *L, int i, int *isnum);
+
+#define lua_numbertointeger(n, p) \
+  ((*(p) = (lua_Integer)(n)), 1)
+
+#define lua_rawget(L, i) \
+  (lua_rawget((L), (i)), lua_type((L), -1))
+
+#define lua_rawgeti(L, i, n) \
+  (lua_rawgeti((L), (i), (n)), lua_type((L), -1))
+
+#define lua_rotate COMPAT53_CONCAT(COMPAT53_PREFIX, _rotate)
+COMPAT53_API void lua_rotate(lua_State *L, int idx, int n);
+
+#define lua_seti COMPAT53_CONCAT(COMPAT53_PREFIX, _seti)
+COMPAT53_API void lua_seti(lua_State *L, int index, lua_Integer i);
+
+#define lua_stringtonumber COMPAT53_CONCAT(COMPAT53_PREFIX, _stringtonumber)
+COMPAT53_API size_t lua_stringtonumber(lua_State *L, const char *s);
+
+#define luaL_tolstring COMPAT53_CONCAT(COMPAT53_PREFIX, L_tolstring)
+COMPAT53_API const char *luaL_tolstring(lua_State *L, int idx, size_t *len);
+
+#define luaL_getmetafield(L, o, e) \
+  (luaL_getmetafield((L), (o), (e)) ? lua_type((L), -1) : LUA_TNIL)
+
+#define luaL_newmetatable(L, tn) \
+  (luaL_newmetatable((L), (tn)) ? (lua_pushstring((L), (tn)), lua_setfield((L), -2, "__name"), 1) : 0)
+
+#define luaL_requiref COMPAT53_CONCAT(COMPAT53_PREFIX, L_requiref_53)
+COMPAT53_API void luaL_requiref(lua_State *L, const char *modname,
+	lua_CFunction openf, int glb);
+
+#endif /* Lua 5.1 and Lua 5.2 */
+
+
+
+/* declarations for Lua 5.2 */
+#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM == 502
+
+/* XXX not implemented:
+* lua_isyieldable
+* lua_getextraspace
+* lua_arith (new operators)
+* lua_pushfstring (new formats)
+*/
+
+#define lua_getglobal(L, n) \
+  (lua_getglobal((L), (n)), lua_type((L), -1))
+
+#define lua_getuservalue(L, i) \
+  (lua_getuservalue((L), (i)), lua_type((L), -1))
+
+#define lua_pushlstring(L, s, len) \
+  (((len) == 0) ? lua_pushlstring((L), "", 0) : lua_pushlstring((L), (s), (len)))
+
+#define lua_rawgetp(L, i, p) \
+  (lua_rawgetp((L), (i), (p)), lua_type((L), -1))
+
+#define LUA_KFUNCTION(_name) \
+  static int (_name)(lua_State *L, int status, lua_KContext ctx); \
+  static int (_name ## _52)(lua_State *L) { \
+    lua_KContext ctx; \
+    int status = lua_getctx(L, &ctx); \
+    return (_name)(L, status, ctx); \
+  } \
+  static int (_name)(lua_State *L, int status, lua_KContext ctx)
+
+#define lua_pcallk(L, na, nr, err, ctx, cont) \
+  lua_pcallk((L), (na), (nr), (err), (ctx), cont ## _52)
+
+#define lua_callk(L, na, nr, ctx, cont) \
+  lua_callk((L), (na), (nr), (ctx), cont ## _52)
+
+#define lua_yieldk(L, nr, ctx, cont) \
+  lua_yieldk((L), (nr), (ctx), cont ## _52)
+
+#ifdef lua_call
+#  undef lua_call
+#  define lua_call(L, na, nr) \
+  (lua_callk)((L), (na), (nr), 0, NULL)
+#endif
+
+#ifdef lua_pcall
+#  undef lua_pcall
+#  define lua_pcall(L, na, nr, err) \
+  (lua_pcallk)((L), (na), (nr), (err), 0, NULL)
+#endif
+
+#ifdef lua_yield
+#  undef lua_yield
+#  define lua_yield(L, nr) \
+  (lua_yieldk)((L), (nr), 0, NULL)
+#endif
+
+#endif /* Lua 5.2 only */
+
+
+
+/* other Lua versions */
+#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 501 || LUA_VERSION_NUM > 504
+
+#  error "unsupported Lua version (i.e. not Lua 5.1, 5.2, 5.3, or 5.4)"
+
+#endif /* other Lua versions except 5.1, 5.2, 5.3, and 5.4 */
+
+
+
+/* helper macro for defining continuation functions (for every version
+* *except* Lua 5.2) */
+#ifndef LUA_KFUNCTION
+#define LUA_KFUNCTION(_name) \
+  static int (_name)(lua_State *L, int status, lua_KContext ctx)
+#endif
+
+
+#if defined(COMPAT53_INCLUDE_SOURCE) && COMPAT53_INCLUDE_SOURCE == 1
+#  include "compat-5.3.c.h"
+#endif
+
+
+#endif /* KEPLER_PROJECT_COMPAT53_H_ */
+
diff --git a/extern/sol3/sol/compatibility/compat-5.4.h b/extern/sol3/sol/compatibility/compat-5.4.h
new file mode 100644
index 0000000000..80d65bd7cb
--- /dev/null
+++ b/extern/sol3/sol/compatibility/compat-5.4.h
@@ -0,0 +1,25 @@
+#ifndef NOT_KEPLER_PROJECT_COMPAT54_H_
+#define NOT_KEPLER_PROJECT_COMPAT54_H_
+
+#if defined(__cplusplus) && !defined(COMPAT53_LUA_CPP)
+extern "C" {
+#endif
+#include <lua.h>
+#include <lauxlib.h>
+#include <lualib.h>
+#if defined(__cplusplus) && !defined(COMPAT53_LUA_CPP)
+}
+#endif
+
+#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM == 504
+
+#if !defined(LUA_ERRGCMM)
+/* So Lua 5.4 actually removes this, which breaks sol2...
+ man, this API is quite unstable...!
+*/
+#  define LUA_ERRGCMM (LUA_ERRERR + 2)
+#endif /* LUA_ERRGCMM define */
+
+#endif // Lua 5.4 only
+
+#endif // NOT_KEPLER_PROJECT_COMPAT54_H_
\ No newline at end of file
diff --git a/extern/sol3/sol/compatibility/lua_version.hpp b/extern/sol3/sol/compatibility/lua_version.hpp
new file mode 100644
index 0000000000..2101160003
--- /dev/null
+++ b/extern/sol3/sol/compatibility/lua_version.hpp
@@ -0,0 +1,218 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_COMPATIBILITY_VERSION_HPP
+#define SOL_COMPATIBILITY_VERSION_HPP
+
+#include <sol/version.hpp>
+
+// clang-format off
+
+#if SOL_IS_ON(SOL_USE_CXX_LUA_I_)
+	#include <lua.h>
+	#include <lualib.h>
+	#include <lauxlib.h>
+#elif SOL_IS_ON(SOL_USE_LUA_HPP_I_)
+	#include <lua.hpp>
+#else
+	extern "C" {
+		#include <lua.h>
+		#include <lauxlib.h>
+		#include <lualib.h>
+	}
+#endif // C++ Mangling for Lua vs. Not
+
+#if defined(SOL_LUAJIT)
+	#if (SOL_LUAJIT != 0)
+		#define SOL_USE_LUAJIT_I_ SOL_ON
+	#else
+		#define SOL_USE_LUAJIT_I_ SOL_OFF
+	#endif
+#elif defined(LUAJIT_VERSION)
+	#define SOL_USE_LUAJIT_I_ SOL_ON
+#else
+	#define SOL_USE_LUAJIT_I_ SOL_DEFAULT_OFF
+#endif // luajit
+
+#if SOL_IS_ON(SOL_USE_CXX_LUAJIT_I_)
+	#include <luajit.h>
+#elif SOL_IS_ON(SOL_USE_LUAJIT_I_)
+	extern "C" {
+		#include <luajit.h>
+	}
+#endif // C++ LuaJIT ... whatever that means
+
+#if defined(SOL_LUAJIT_VERSION)
+	#define SOL_LUAJIT_VERSION_I_ SOL_LUAJIT_VERSION
+#elif SOL_IS_ON(SOL_USE_LUAJIT_I_)
+	#define SOL_LUAJIT_VERSION_I_ LUAJIT_VERSION_NUM
+#else
+	#define SOL_LUAJIT_VERSION_I_ 0
+#endif
+
+#if defined(SOL_LUAJIT_FFI_DISABLED)
+	#define SOL_LUAJIT_FFI_DISABLED_I_ SOL_ON
+#elif defined(LUAJIT_DISABLE_FFI)
+	#define SOL_LUAJIT_FFI_DISABLED_I_ SOL_ON
+#else
+	#define SOL_LUAJIT_FFI_DISABLED_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(MOONJIT_VERSION)
+	#define SOL_USE_MOONJIT_I_ SOL_ON
+#else
+	#define SOL_USE_MOONJIT_I_ SOL_OFF
+#endif
+
+#if !defined(SOL_LUA_VERSION)
+	#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 502
+		#define SOL_LUA_VERSION LUA_VERSION_NUM
+	#elif defined(LUA_VERSION_NUM) && LUA_VERSION_NUM == 501
+		#define SOL_LUA_VERSION LUA_VERSION_NUM
+	#elif !defined(LUA_VERSION_NUM) || !(LUA_VERSION_NUM)
+		// Definitely 5.0
+		#define SOL_LUA_VERSION 500
+	#else
+		// ??? Not sure, assume latest?
+		#define SOL_LUA_VERSION 504
+	#endif // Lua Version 503, 502, 501 || luajit, 500
+#endif // SOL_LUA_VERSION
+
+#if defined(SOL_LUA_VERSION)
+	#define SOL_LUA_VERSION_I_ SOL_LUA_VERSION
+#else
+	#define SOL_LUA_VERSION_I_ 504
+#endif
+
+// Exception safety / propagation, according to Lua information
+// and user defines. Note this can sometimes change based on version information...
+#if defined(SOL_EXCEPTIONS_ALWAYS_UNSAFE)
+	#if (SOL_EXCEPTIONS_ALWAYS_UNSAFE != 0)
+		#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_OFF
+	#else
+		#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_ON
+	#endif
+#elif defined(SOL_EXCEPTIONS_SAFE_PROPAGATION)
+	#if (SOL_EXCEPTIONS_SAFE_PROPAGATION != 0)
+		#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_ON
+	#else
+		#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_OFF
+	#endif
+#elif SOL_LUAJIT_VERSION_I_ >= 20100
+	// LuaJIT 2.1.0-beta3 and better have exception support locked in for all platforms (mostly)
+	#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_DEFAULT_ON
+#elif SOL_LUAJIT_VERSION_I_ >= 20000
+	// LuaJIT 2.0.x have exception support only on x64 builds
+	#if SOL_IS_ON(SOL_PLATFORM_X64_I_)
+		#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_OFF
+	#endif
+#else
+	// otherwise, there is no exception safety for
+	// shoving exceptions through Lua and errors should
+	// always be serialized
+	#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_DEFAULT_OFF
+#endif
+
+// Some configurations work with exceptions,
+// but cannot catch-all everything...
+#if defined(SOL_EXCEPTIONS_CATCH_ALL)
+	#if (SOL_EXCEPTIONS_CATCH_ALL != 0)
+		#define SOL_EXCEPTIONS_CATCH_ALL_I_ SOL_ON
+	#else
+		#define SOL_EXCEPTIONS_CATCH_ALL_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_USE_LUAJIT_I_)
+		#define SOL_EXCEPTIONS_CATCH_ALL_I_ SOL_DEFAULT_OFF
+	#elif SOL_IS_ON(SOL_USE_CXX_LUAJIT_I_)
+		#define SOL_EXCEPTIONS_CATCH_ALL_I_ SOL_DEFAULT_OFF
+	#elif SOL_IS_ON(SOL_USE_CXX_LUA_I_)
+		#define SOL_EXCEPTIONS_CATCH_ALL_I_ SOL_DEFAULT_OFF
+	#else
+		#define SOL_EXCEPTIONS_CATCH_ALL_I_ SOL_DEFAULT_ON
+	#endif
+#endif
+
+#if defined(SOL_LUAJIT_USE_EXCEPTION_TRAMPOLINE)
+	#if (SOL_LUAJIT_USE_EXCEPTION_TRAMPOLINE != 0)
+		#define SOL_USE_LUAJIT_EXCEPTION_TRAMPOLINE_I_ SOL_ON
+	#else
+		#define SOL_USE_LUAJIT_EXCEPTION_TRAMPOLINE_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_OFF(SOL_PROPAGATE_EXCEPTIONS_I_) && SOL_IS_ON(SOL_USE_LUAJIT_I_)
+		#define SOL_USE_LUAJIT_EXCEPTION_TRAMPOLINE_I_ SOL_ON
+	#else
+		#define SOL_USE_LUAJIT_EXCEPTION_TRAMPOLINE_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_LUAL_STREAM_HAS_CLOSE_FUNCTION)
+	#if (SOL_LUAL_STREAM_HAS_CLOSE_FUNCTION != 0)
+		#define SOL_LUAL_STREAM_USE_CLOSE_FUNCTION_I_ SOL_ON
+	#else
+		#define SOL_LUAL_STREAM_USE_CLOSE_FUNCTION_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_OFF(SOL_USE_LUAJIT_I_) && (SOL_LUA_VERSION > 501)
+		#define SOL_LUAL_STREAM_USE_CLOSE_FUNCTION_I_ SOL_ON
+	#else
+		#define SOL_LUAL_STREAM_USE_CLOSE_FUNCTION_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined (SOL_LUA_BIT32_LIB)
+	#if SOL_LUA_BIT32_LIB != 0
+		#define SOL_LUA_BIT32_LIB_I_ SOL_ON
+	#else
+		#define SOL_LUA_BIT32_LIB_I_ SOL_OFF
+	#endif
+#else
+	// Lua 5.2 only (deprecated in 5.3 (503)) (Can be turned on with Compat flags)
+	// Lua 5.2, or other versions of Lua with the compat flag, or Lua that is not 5.2 with the specific define (5.4.1 either removed it entirely or broke it)
+	#if (SOL_LUA_VERSION_I_ == 502) || (defined(LUA_COMPAT_BITLIB) && (LUA_COMPAT_BITLIB != 0)) || (SOL_LUA_VERSION_I_ < 504 && (defined(LUA_COMPAT_5_2) && (LUA_COMPAT_5_2 != 0)))
+		#define SOL_LUA_BIT32_LIB_I_ SOL_ON
+	#else
+		#define SOL_LUA_BIT32_LIB_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined (SOL_LUA_NIL_IN_TABLES)
+	#if SOL_LUA_NIL_IN_TABLES != 0
+		#define SOL_LUA_NIL_IN_TABLES_I_ SOL_ON
+	#else
+		#define SOL_LUA_NIL_IN_TABLES_I_ SOL_OFF
+	#endif
+#else
+	#if defined(LUA_NILINTABLE) && (LUA_NILINTABLE != 0)
+		#define SOL_LUA_NIL_IN_TABLES_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_LUA_NIL_IN_TABLES_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+// clang-format on
+
+#endif // SOL_COMPATIBILITY_VERSION_HPP
diff --git a/extern/sol3/sol/coroutine.hpp b/extern/sol3/sol/coroutine.hpp
new file mode 100644
index 0000000000..e4b9d81413
--- /dev/null
+++ b/extern/sol3/sol/coroutine.hpp
@@ -0,0 +1,251 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_COROUTINE_HPP
+#define SOL_COROUTINE_HPP
+
+#include <sol/reference.hpp>
+#include <sol/object.hpp>
+#include <sol/stack.hpp>
+#include <sol/function_result.hpp>
+#include <sol/thread.hpp>
+#include <sol/protected_handler.hpp>
+
+namespace sol {
+	template <typename Reference>
+	class basic_coroutine : public basic_object<Reference> {
+	private:
+		using base_t = basic_object<Reference>;
+		using handler_t = reference;
+
+	private:
+		call_status stats = call_status::yielded;
+
+		void luacall(std::ptrdiff_t argcount, std::ptrdiff_t) {
+#if SOL_LUA_VERSION_I_ >= 504
+			int nresults;
+			stats = static_cast<call_status>(lua_resume(lua_state(), nullptr, static_cast<int>(argcount), &nresults));
+#else
+			stats = static_cast<call_status>(lua_resume(lua_state(), nullptr, static_cast<int>(argcount)));
+#endif
+		}
+
+		template <std::size_t... I, typename... Ret>
+		auto invoke(types<Ret...>, std::index_sequence<I...>, std::ptrdiff_t n) {
+			luacall(n, sizeof...(Ret));
+			return stack::pop<std::tuple<Ret...>>(lua_state());
+		}
+
+		template <std::size_t I, typename Ret>
+		Ret invoke(types<Ret>, std::index_sequence<I>, std::ptrdiff_t n) {
+			luacall(n, 1);
+			return stack::pop<Ret>(lua_state());
+		}
+
+		template <std::size_t I>
+		void invoke(types<void>, std::index_sequence<I>, std::ptrdiff_t n) {
+			luacall(n, 0);
+		}
+
+		protected_function_result invoke(types<>, std::index_sequence<>, std::ptrdiff_t n) {
+			int firstreturn = 1;
+			luacall(n, LUA_MULTRET);
+			int poststacksize = lua_gettop(this->lua_state());
+			int returncount = poststacksize - (firstreturn - 1);
+			if (error()) {
+				if (m_error_handler.valid()) {
+					string_view err = stack::get<string_view>(this->lua_state(), poststacksize);
+					m_error_handler.push();
+					stack::push(this->lua_state(), err);
+					lua_call(lua_state(), 1, 1);
+				}
+				return protected_function_result(this->lua_state(), lua_absindex(this->lua_state(), -1), 1, returncount, status());
+			}
+			return protected_function_result(this->lua_state(), firstreturn, returncount, returncount, status());
+		}
+
+	public:
+		using base_t::lua_state;
+
+		basic_coroutine() = default;
+		template <typename T,
+		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_coroutine>>,
+		          meta::neg<std::is_base_of<proxy_base_tag, meta::unqualified_t<T>>>, meta::neg<std::is_same<base_t, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_coroutine(T&& r) noexcept
+		: base_t(std::forward<T>(r)), m_error_handler(detail::get_default_handler<reference, is_main_threaded<base_t>::value>(r.lua_state())) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			if (!is_function<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				constructor_handler handler {};
+				stack::check<basic_coroutine>(lua_state(), -1, handler);
+			}
+#endif // Safety
+		}
+
+		basic_coroutine(const basic_coroutine& other) = default;
+		basic_coroutine& operator=(const basic_coroutine&) = default;
+
+		basic_coroutine(basic_coroutine&& other) noexcept : base_t(std::move(other)), m_error_handler(this->lua_state(), std::move(other.m_error_handler)) {
+		}
+
+		basic_coroutine& operator=(basic_coroutine&& other) noexcept {
+			base_t::operator=(std::move(other));
+			// must change the state, since it could change on the coroutine type
+			m_error_handler = handler_t(this->lua_state(), std::move(other.m_error_handler));
+			return *this;
+		}
+
+		basic_coroutine(const basic_function<base_t>& b) noexcept
+		: basic_coroutine(b, detail::get_default_handler<reference, is_main_threaded<base_t>::value>(b.lua_state())) {
+		}
+		basic_coroutine(basic_function<base_t>&& b) noexcept
+		: basic_coroutine(std::move(b), detail::get_default_handler<reference, is_main_threaded<base_t>::value>(b.lua_state())) {
+		}
+		basic_coroutine(const basic_function<base_t>& b, handler_t eh) noexcept : base_t(b), m_error_handler(std::move(eh)) {
+		}
+		basic_coroutine(basic_function<base_t>&& b, handler_t eh) noexcept : base_t(std::move(b)), m_error_handler(std::move(eh)) {
+		}
+		basic_coroutine(const stack_reference& r) noexcept
+		: basic_coroutine(r.lua_state(), r.stack_index(), detail::get_default_handler<reference, is_main_threaded<base_t>::value>(r.lua_state())) {
+		}
+		basic_coroutine(stack_reference&& r) noexcept
+		: basic_coroutine(r.lua_state(), r.stack_index(), detail::get_default_handler<reference, is_main_threaded<base_t>::value>(r.lua_state())) {
+		}
+		basic_coroutine(const stack_reference& r, handler_t eh) noexcept : basic_coroutine(r.lua_state(), r.stack_index(), std::move(eh)) {
+		}
+		basic_coroutine(stack_reference&& r, handler_t eh) noexcept : basic_coroutine(r.lua_state(), r.stack_index(), std::move(eh)) {
+		}
+
+		template <typename Super>
+		basic_coroutine(const proxy_base<Super>& p)
+		: basic_coroutine(p, detail::get_default_handler<reference, is_main_threaded<base_t>::value>(p.lua_state())) {
+		}
+		template <typename Super>
+		basic_coroutine(proxy_base<Super>&& p)
+		: basic_coroutine(std::move(p), detail::get_default_handler<reference, is_main_threaded<base_t>::value>(p.lua_state())) {
+		}
+		template <typename Proxy, typename HandlerReference,
+		     meta::enable<std::is_base_of<proxy_base_tag, meta::unqualified_t<Proxy>>,
+		          meta::neg<is_lua_index<meta::unqualified_t<HandlerReference>>>> = meta::enabler>
+		basic_coroutine(Proxy&& p, HandlerReference&& eh) : basic_coroutine(detail::force_cast<base_t>(p), std::forward<HandlerReference>(eh)) {
+		}
+
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_coroutine(lua_State* L, T&& r) noexcept
+		: basic_coroutine(L, std::forward<T>(r), detail::get_default_handler<reference, is_main_threaded<base_t>::value>(L)) {
+		}
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_coroutine(lua_State* L, T&& r, handler_t eh) : base_t(L, std::forward<T>(r)), m_error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_coroutine>(lua_state(), -1, handler);
+#endif // Safety
+		}
+
+		basic_coroutine(lua_nil_t n) : base_t(n), m_error_handler(n) {
+		}
+
+		basic_coroutine(lua_State* L, int index = -1)
+		: basic_coroutine(L, index, detail::get_default_handler<reference, is_main_threaded<base_t>::value>(L)) {
+		}
+		basic_coroutine(lua_State* L, int index, handler_t eh) : base_t(L, index), m_error_handler(std::move(eh)) {
+#ifdef SOL_SAFE_REFERENCES
+			constructor_handler handler {};
+			stack::check<basic_coroutine>(L, index, handler);
+#endif // Safety
+		}
+		basic_coroutine(lua_State* L, absolute_index index)
+		: basic_coroutine(L, index, detail::get_default_handler<reference, is_main_threaded<base_t>::value>(L)) {
+		}
+		basic_coroutine(lua_State* L, absolute_index index, handler_t eh) : base_t(L, index), m_error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			constructor_handler handler {};
+			stack::check<basic_coroutine>(L, index, handler);
+#endif // Safety
+		}
+		basic_coroutine(lua_State* L, raw_index index)
+		: basic_coroutine(L, index, detail::get_default_handler<reference, is_main_threaded<base_t>::value>(L)) {
+		}
+		basic_coroutine(lua_State* L, raw_index index, handler_t eh) : base_t(L, index), m_error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			constructor_handler handler {};
+			stack::check<basic_coroutine>(L, index, handler);
+#endif // Safety
+		}
+		basic_coroutine(lua_State* L, ref_index index)
+		: basic_coroutine(L, index, detail::get_default_handler<reference, is_main_threaded<base_t>::value>(L)) {
+		}
+		basic_coroutine(lua_State* L, ref_index index, handler_t eh) : base_t(L, index), m_error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_coroutine>(lua_state(), -1, handler);
+#endif // Safety
+		}
+
+		call_status status() const noexcept {
+			return stats;
+		}
+
+		bool error() const noexcept {
+			call_status cs = status();
+			return cs != call_status::ok && cs != call_status::yielded;
+		}
+
+		bool runnable() const noexcept {
+			return base_t::valid() && (status() == call_status::yielded);
+		}
+
+		explicit operator bool() const noexcept {
+			return runnable();
+		}
+
+		template <typename... Args>
+		protected_function_result operator()(Args&&... args) {
+			return call<>(std::forward<Args>(args)...);
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) operator()(types<Ret...>, Args&&... args) {
+			return call<Ret...>(std::forward<Args>(args)...);
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) call(Args&&... args) {
+			// some users screw up coroutine.create
+			// and try to use it with sol::coroutine without ever calling the first resume in Lua
+			// this makes the stack incompatible with other kinds of stacks: protect against this
+			// make sure coroutines don't screw us over
+			base_t::push();
+			int pushcount = stack::multi_push_reference(lua_state(), std::forward<Args>(args)...);
+			return invoke(types<Ret...>(), std::make_index_sequence<sizeof...(Ret)>(), pushcount);
+		}
+
+	private:
+		handler_t m_error_handler;
+	};
+} // namespace sol
+
+#endif // SOL_COUROUTINE_HPP
diff --git a/extern/sol3/sol/debug.hpp b/extern/sol3/sol/debug.hpp
new file mode 100644
index 0000000000..477b00ffa3
--- /dev/null
+++ b/extern/sol3/sol/debug.hpp
@@ -0,0 +1,52 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_DEBUG_HPP
+#define SOL_DEBUG_HPP
+
+#include <sol/stack.hpp>
+#include <iostream>
+
+namespace sol { namespace detail { namespace debug {
+	inline std::string dump_types(lua_State* L) {
+		std::string visual;
+		std::size_t size = lua_gettop(L) + 1;
+		for (std::size_t i = 1; i < size; ++i) {
+			if (i != 1) {
+				visual += " | ";
+			}
+			visual += type_name(L, stack::get<type>(L, static_cast<int>(i)));
+		}
+		return visual;
+	}
+
+	inline void print_stack(lua_State* L) {
+		std::cout << dump_types(L) << std::endl;
+	}
+
+	inline void print_section(const std::string& message, lua_State* L) {
+		std::cout << "-- " << message << " -- [ " << dump_types(L) << " ]" << std::endl;
+	}
+}}} // namespace sol::detail::debug
+
+#endif // SOL_DEBUG_HPP
diff --git a/extern/sol3/sol/demangle.hpp b/extern/sol3/sol/demangle.hpp
new file mode 100644
index 0000000000..8c7c5ea2bf
--- /dev/null
+++ b/extern/sol3/sol/demangle.hpp
@@ -0,0 +1,192 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_DEMANGLE_HPP
+#define SOL_DEMANGLE_HPP
+
+#include <sol/string_view.hpp>
+#include <string>
+#include <array>
+#include <cctype>
+#if SOL_IS_ON(SOL_MINGW_CCTYPE_IS_POISONED_I_)
+extern "C" {
+#include <ctype.h>
+}
+#endif // MinGW is on some stuff
+#include <locale>
+
+namespace sol { namespace detail {
+	inline constexpr std::array<string_view, 9> removals { { "{anonymous}",
+		"(anonymous namespace)",
+		"public:",
+		"private:",
+		"protected:",
+		"struct ",
+		"class ",
+		"`anonymous-namespace'",
+		"`anonymous namespace'" } };
+
+
+#if SOL_IS_ON(SOL_COMPILER_GCC_I_) || SOL_IS_ON(SOL_COMPILER_CLANG_I_)
+	inline std::string ctti_get_type_name_from_sig(std::string name) {
+		// cardinal sins from MINGW
+		using namespace std;
+		std::size_t start = name.find_first_of('[');
+		start = name.find_first_of('=', start);
+		std::size_t end = name.find_last_of(']');
+		if (end == std::string::npos)
+			end = name.size();
+		if (start == std::string::npos)
+			start = 0;
+		if (start < name.size() - 1)
+			start += 1;
+		name = name.substr(start, end - start);
+		start = name.rfind("seperator_mark");
+		if (start != std::string::npos) {
+			name.erase(start - 2, name.length());
+		}
+		while (!name.empty() && isblank(name.front()))
+			name.erase(name.begin());
+		while (!name.empty() && isblank(name.back()))
+			name.pop_back();
+
+		for (std::size_t r = 0; r < removals.size(); ++r) {
+			auto found = name.find(removals[r]);
+			while (found != std::string::npos) {
+				name.erase(found, removals[r].size());
+				found = name.find(removals[r]);
+			}
+		}
+
+		return name;
+	}
+
+	template <typename T, class seperator_mark = int>
+	inline std::string ctti_get_type_name() {
+		return ctti_get_type_name_from_sig(__PRETTY_FUNCTION__);
+	}
+#elif SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+	inline std::string ctti_get_type_name_from_sig(std::string name) {
+		std::size_t start = name.find("get_type_name");
+		if (start == std::string::npos)
+			start = 0;
+		else
+			start += 13;
+		if (start < name.size() - 1)
+			start += 1;
+		std::size_t end = name.find_last_of('>');
+		if (end == std::string::npos)
+			end = name.size();
+		name = name.substr(start, end - start);
+		if (name.find("struct", 0) == 0)
+			name.replace(0, 6, "", 0);
+		if (name.find("class", 0) == 0)
+			name.replace(0, 5, "", 0);
+		while (!name.empty() && isblank(name.front()))
+			name.erase(name.begin());
+		while (!name.empty() && isblank(name.back()))
+			name.pop_back();
+
+		for (std::size_t r = 0; r < removals.size(); ++r) {
+			auto found = name.find(removals[r]);
+			while (found != std::string::npos) {
+				name.erase(found, removals[r].size());
+				found = name.find(removals[r]);
+			}
+		}
+
+		return name;
+	}
+
+	template <typename T>
+	std::string ctti_get_type_name() {
+		return ctti_get_type_name_from_sig(__FUNCSIG__);
+	}
+#else
+#error Compiler not supported for demangling
+#endif // compilers
+
+	template <typename T>
+	std::string demangle_once() {
+		std::string realname = ctti_get_type_name<T>();
+		return realname;
+	}
+
+	inline std::string short_demangle_from_type_name(std::string realname) {
+		// This isn't the most complete but it'll do for now...?
+		static const std::array<std::string, 10> ops = {
+			{ "operator<", "operator<<", "operator<<=", "operator<=", "operator>", "operator>>", "operator>>=", "operator>=", "operator->", "operator->*" }
+		};
+		int level = 0;
+		std::size_t idx = 0;
+		for (idx = static_cast<std::size_t>(realname.empty() ? 0 : realname.size() - 1); idx > 0; --idx) {
+			if (level == 0 && realname[idx] == ':') {
+				break;
+			}
+			bool isleft = realname[idx] == '<';
+			bool isright = realname[idx] == '>';
+			if (!isleft && !isright)
+				continue;
+			bool earlybreak = false;
+			for (const auto& op : ops) {
+				std::size_t nisop = realname.rfind(op, idx);
+				if (nisop == std::string::npos)
+					continue;
+				std::size_t nisopidx = idx - op.size() + 1;
+				if (nisop == nisopidx) {
+					idx = static_cast<std::size_t>(nisopidx);
+					earlybreak = true;
+				}
+				break;
+			}
+			if (earlybreak) {
+				continue;
+			}
+			level += isleft ? -1 : 1;
+		}
+		if (idx > 0) {
+			realname.erase(0, realname.length() < static_cast<std::size_t>(idx) ? realname.length() : idx + 1);
+		}
+		return realname;
+	}
+
+	template <typename T>
+	std::string short_demangle_once() {
+		std::string realname = ctti_get_type_name<T>();
+		return short_demangle_from_type_name(realname);
+	}
+
+	template <typename T>
+	const std::string& demangle() {
+		static const std::string d = demangle_once<T>();
+		return d;
+	}
+
+	template <typename T>
+	const std::string& short_demangle() {
+		static const std::string d = short_demangle_once<T>();
+		return d;
+	}
+}} // namespace sol::detail
+
+#endif // SOL_DEMANGLE_HPP
diff --git a/extern/sol3/sol/deprecate.hpp b/extern/sol3/sol/deprecate.hpp
new file mode 100644
index 0000000000..7fbb0308f9
--- /dev/null
+++ b/extern/sol3/sol/deprecate.hpp
@@ -0,0 +1,44 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_DEPRECATE_HPP
+#define SOL_DEPRECATE_HPP
+
+#ifndef SOL_DEPRECATED
+#ifdef _MSC_VER
+#define SOL_DEPRECATED __declspec(deprecated)
+#elif __GNUC__
+#define SOL_DEPRECATED __attribute__((deprecated))
+#else
+#define SOL_DEPRECATED [[deprecated]]
+#endif // compilers
+#endif // SOL_DEPRECATED
+
+namespace sol { namespace detail {
+	template <typename T>
+	struct SOL_DEPRECATED deprecate_type {
+		using type = T;
+	};
+}} // namespace sol::detail
+
+#endif // SOL_DEPRECATE_HPP
diff --git a/extern/sol3/sol/detail/build_version.hpp b/extern/sol3/sol/detail/build_version.hpp
new file mode 100644
index 0000000000..8c26750fae
--- /dev/null
+++ b/extern/sol3/sol/detail/build_version.hpp
@@ -0,0 +1,232 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#pragma once
+
+#ifndef SOL_DETAIL_BUILD_VERSION_HPP
+#define SOL_DETAIL_BUILD_VERSION_HPP
+
+#include <sol/version.hpp>
+
+// clang-format off
+
+#if defined(SOL_DLL)
+	#if (SOL_DLL != 0)
+		#define SOL_DLL_I_ SOL_ON
+	#else
+		#define SOL_DLL_I_ SOL_OFF
+	#endif
+#elif SOL_IS_ON(SOL_COMPILER_VCXX_I_) && (defined(DLL_) || defined(_DLL))
+	#define SOL_DLL_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_DLL_I_ SOL_DEFAULT_OFF
+#endif // DLL definition
+
+#if defined(SOL_HEADER_ONLY)
+	#if (SOL_HEADER_ONLY != 0)
+		#define SOL_HEADER_ONLY_I_ SOL_ON
+	#else
+		#define SOL_HEADER_ONLY_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_HEADER_ONLY_I_ SOL_DEFAULT_OFF
+#endif // Header only library
+
+#if defined(SOL_BUILD)
+	#if (SOL_BUILD != 0)
+		#define SOL_BUILD_I_ SOL_ON
+	#else
+		#define SOL_BUILD_I_ SOL_OFF
+	#endif
+#elif SOL_IS_ON(SOL_HEADER_ONLY_I_)
+	#define SOL_BUILD_I_ SOL_DEFAULT_OFF
+#else
+	#define SOL_BUILD_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_UNITY_BUILD)
+	#if (SOL_UNITY_BUILD != 0)
+		#define SOL_UNITY_BUILD_I_ SOL_ON
+	#else
+		#define SOL_UNITY_BUILD_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_UNITY_BUILD_I_ SOL_DEFAULT_OFF
+#endif // Header only library
+
+#if defined(SOL_C_FUNCTION_LINKAGE)
+	#define SOL_C_FUNCTION_LINKAGE_I_ SOL_C_FUNCTION_LINKAGE
+#else
+	#if SOL_IS_ON(SOL_BUILD_CXX_MODE_I_)
+		// C++
+		#define SOL_C_FUNCTION_LINKAGE_I_ extern "C"
+	#else
+		// normal
+		#define SOL_C_FUNCTION_LINKAGE_I_
+	#endif // C++ or not
+#endif // Linkage specification for C functions
+
+#if defined(SOL_API_LINKAGE)
+	#define SOL_API_LINKAGE_I_ SOL_API_LINKAGE
+#else
+	#if SOL_IS_ON(SOL_DLL_I_)
+		#if SOL_IS_ON(SOL_COMPILER_VCXX_I_) || SOL_IS_ON(SOL_PLATFORM_WINDOWS_I_) || SOL_IS_ON(SOL_PLATFORM_CYGWIN_I_)
+			// MSVC Compiler; or, Windows, or Cygwin platforms
+			#if SOL_IS_ON(SOL_BUILD_I_)
+				// Building the library
+				#if SOL_IS_ON(SOL_COMPILER_GCC_I_)
+					// Using GCC
+					#define SOL_API_LINKAGE_I_ __attribute__((dllexport))
+				#else
+					// Using Clang, MSVC, etc...
+					#define SOL_API_LINKAGE_I_ __declspec(dllexport)
+				#endif
+			#else
+				#if SOL_IS_ON(SOL_COMPILER_GCC_I_)
+					#define SOL_API_LINKAGE_I_ __attribute__((dllimport))
+				#else
+					#define SOL_API_LINKAGE_I_ __declspec(dllimport)
+				#endif
+			#endif
+		#else
+			// extern if building normally on non-MSVC
+			#define SOL_API_LINKAGE_I_ extern
+		#endif
+	#elif SOL_IS_ON(SOL_UNITY_BUILD_I_)
+		// Built-in library, like how stb typical works
+		#if SOL_IS_ON(SOL_HEADER_ONLY_I_)
+			// Header only, so functions are defined "inline"
+			#define SOL_API_LINKAGE_I_ inline
+		#else
+			// Not header only, so seperately compiled files
+			#define SOL_API_LINKAGE_I_ extern
+		#endif
+	#else
+		// Normal static library
+		#if SOL_IS_ON(SOL_BUILD_CXX_MODE_I_)
+			#define SOL_API_LINKAGE_I_
+		#else
+			#define SOL_API_LINKAGE_I_ extern
+		#endif
+	#endif // DLL or not
+#endif // Build definitions
+
+#if defined(SOL_PUBLIC_FUNC_DECL)
+	#define SOL_PUBLIC_FUNC_DECL_I_ SOL_PUBLIC_FUNC_DECL
+#else
+	#define SOL_PUBLIC_FUNC_DECL_I_ SOL_API_LINKAGE_I_
+#endif
+
+#if defined(SOL_INTERNAL_FUNC_DECL_)
+	#define SOL_INTERNAL_FUNC_DECL_I_ SOL_INTERNAL_FUNC_DECL_
+#else
+	#define SOL_INTERNAL_FUNC_DECL_I_ SOL_API_LINKAGE_I_
+#endif
+
+#if defined(SOL_PUBLIC_FUNC_DEF)
+	#define SOL_PUBLIC_FUNC_DEF_I_ SOL_PUBLIC_FUNC_DEF
+#else
+	#define SOL_PUBLIC_FUNC_DEF_I_ SOL_API_LINKAGE_I_
+#endif
+
+#if defined(SOL_INTERNAL_FUNC_DEF)
+	#define SOL_INTERNAL_FUNC_DEF_I_ SOL_INTERNAL_FUNC_DEF
+#else
+	#define SOL_INTERNAL_FUNC_DEF_I_ SOL_API_LINKAGE_I_
+#endif
+
+#if defined(SOL_FUNC_DECL)
+	#define SOL_FUNC_DECL_I_ SOL_FUNC_DECL
+#elif SOL_IS_ON(SOL_HEADER_ONLY_I_)
+	#define SOL_FUNC_DECL_I_ 
+#elif SOL_IS_ON(SOL_DLL_I_)
+	#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+		#if SOL_IS_ON(SOL_BUILD_I_)
+			#define SOL_FUNC_DECL_I_ extern __declspec(dllexport)
+		#else
+			#define SOL_FUNC_DECL_I_ extern __declspec(dllimport)
+		#endif
+	#elif SOL_IS_ON(SOL_COMPILER_GCC_I_) || SOL_IS_ON(SOL_COMPILER_CLANG_I_)
+		#define SOL_FUNC_DECL_I_ extern __attribute__((visibility("default")))
+	#else
+		#define SOL_FUNC_DECL_I_ extern
+	#endif
+#endif
+
+#if defined(SOL_FUNC_DEFN)
+	#define SOL_FUNC_DEFN_I_ SOL_FUNC_DEFN
+#elif SOL_IS_ON(SOL_HEADER_ONLY_I_)
+	#define SOL_FUNC_DEFN_I_ inline
+#elif SOL_IS_ON(SOL_DLL_I_)
+	#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+		#if SOL_IS_ON(SOL_BUILD_I_)
+			#define SOL_FUNC_DEFN_I_ __declspec(dllexport)
+		#else
+			#define SOL_FUNC_DEFN_I_ __declspec(dllimport)
+		#endif
+	#elif SOL_IS_ON(SOL_COMPILER_GCC_I_) || SOL_IS_ON(SOL_COMPILER_CLANG_I_)
+		#define SOL_FUNC_DEFN_I_ __attribute__((visibility("default")))
+	#else
+		#define SOL_FUNC_DEFN_I_
+	#endif
+#endif
+
+#if defined(SOL_HIDDEN_FUNC_DECL)
+	#define SOL_HIDDEN_FUNC_DECL_I_ SOL_HIDDEN_FUNC_DECL
+#elif SOL_IS_ON(SOL_HEADER_ONLY_I_)
+	#define SOL_HIDDEN_FUNC_DECL_I_ 
+#elif SOL_IS_ON(SOL_DLL_I_)
+	#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+		#if SOL_IS_ON(SOL_BUILD_I_)
+			#define SOL_HIDDEN_FUNC_DECL_I_ extern __declspec(dllexport)
+		#else
+			#define SOL_HIDDEN_FUNC_DECL_I_ extern __declspec(dllimport)
+		#endif
+	#elif SOL_IS_ON(SOL_COMPILER_GCC_I_) || SOL_IS_ON(SOL_COMPILER_CLANG_I_)
+		#define SOL_HIDDEN_FUNC_DECL_I_ extern __attribute__((visibility("default")))
+	#else
+		#define SOL_HIDDEN_FUNC_DECL_I_ extern
+	#endif
+#endif
+
+#if defined(SOL_HIDDEN_FUNC_DEFN)
+	#define SOL_HIDDEN_FUNC_DEFN_I_ SOL_HIDDEN_FUNC_DEFN
+#elif SOL_IS_ON(SOL_HEADER_ONLY_I_)
+	#define SOL_HIDDEN_FUNC_DEFN_I_ inline
+#elif SOL_IS_ON(SOL_DLL_I_)
+	#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+		#if SOL_IS_ON(SOL_BUILD_I_)
+			#define SOL_HIDDEN_FUNC_DEFN_I_ 
+		#else
+			#define SOL_HIDDEN_FUNC_DEFN_I_ 
+		#endif
+	#elif SOL_IS_ON(SOL_COMPILER_GCC_I_) || SOL_IS_ON(SOL_COMPILER_CLANG_I_)
+		#define SOL_HIDDEN_FUNC_DEFN_I_ __attribute__((visibility("hidden")))
+	#else
+		#define SOL_HIDDEN_FUNC_DEFN_I_
+	#endif
+#endif
+
+// clang-format on 
+
+#endif // SOL_DETAIL_BUILD_VERSION_HPP
diff --git a/extern/sol3/sol/dump_handler.hpp b/extern/sol3/sol/dump_handler.hpp
new file mode 100644
index 0000000000..026136534c
--- /dev/null
+++ b/extern/sol3/sol/dump_handler.hpp
@@ -0,0 +1,77 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_DUMP_HANDLER_HPP
+#define SOL_DUMP_HANDLER_HPP
+
+#include <sol/compatibility.hpp>
+
+#include <cstdint>
+#include <exception>
+
+namespace sol {
+
+	class dump_error : public error {
+	private:
+		int m_ec;
+
+	public:
+		dump_error(int error_code_) : error("dump returned non-zero error of " + std::to_string(error_code_)), m_ec(error_code_) {
+		}
+
+		int error_code() const {
+			return m_ec;
+		}
+	};
+
+	inline int dump_pass_on_error(lua_State* L_, int result_code, lua_Writer writer_function, void* userdata_pointer_, bool strip) {
+		(void)L_;
+		(void)writer_function;
+		(void)userdata_pointer_;
+		(void)strip;
+		return result_code;
+	}
+
+	inline int dump_panic_on_error(lua_State* L_, int result_code, lua_Writer writer_function, void* userdata_pointer_, bool strip) {
+		(void)L_;
+		(void)writer_function;
+		(void)userdata_pointer_;
+		(void)strip;
+		return luaL_error(L_, "a non-zero error code (%d) was returned by the lua_Writer for the dump function", result_code);
+	}
+
+	inline int dump_throw_on_error(lua_State* L_, int result_code, lua_Writer writer_function, void* userdata_pointer_, bool strip) {
+#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
+		return dump_panic_on_error(L_, result_code, writer_function, userdata_pointer_, strip);
+#else
+		(void)L_;
+		(void)writer_function;
+		(void)userdata_pointer_;
+		(void)strip;
+		throw dump_error(result_code);
+#endif // no exceptions stuff
+	}
+
+} // namespace sol
+
+#endif // SOL_DUMP_HANDLER_HPP
diff --git a/extern/sol3/sol/ebco.hpp b/extern/sol3/sol/ebco.hpp
new file mode 100644
index 0000000000..af54024b50
--- /dev/null
+++ b/extern/sol3/sol/ebco.hpp
@@ -0,0 +1,160 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_EBCO_HPP
+#define SOL_EBCO_HPP
+
+#include <type_traits>
+#include <utility>
+
+namespace sol { namespace detail {
+
+	template <typename T, std::size_t tag = 0, typename = void>
+	struct ebco {
+		T m_value;
+
+		ebco() = default;
+		ebco(const ebco&) = default;
+		ebco(ebco&&) = default;
+		ebco& operator=(const ebco&) = default;
+		ebco& operator=(ebco&&) = default;
+		ebco(const T& v) noexcept(std::is_nothrow_copy_constructible_v<T>) : m_value(v) {};
+		ebco(T&& v) noexcept(std::is_nothrow_move_constructible_v<T>) : m_value(std::move(v)) {};
+		ebco& operator=(const T& v) noexcept(std::is_nothrow_copy_assignable_v<T>) {
+			m_value = v;
+			return *this;
+		}
+		ebco& operator=(T&& v) noexcept(std::is_nothrow_move_assignable_v<T>) {
+			m_value = std::move(v);
+			return *this;
+		};
+		template <typename Arg, typename... Args,
+			typename = std::enable_if_t<
+			     !std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>,
+			          ebco> && !std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>, T> && (sizeof...(Args) > 0 || !std::is_convertible_v<Arg, T>)>>
+		ebco(Arg&& arg, Args&&... args) noexcept(std::is_nothrow_constructible_v<T, Arg, Args...>)
+		: m_value(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+		}
+
+		T& value() & noexcept {
+			return m_value;
+		}
+
+		T const& value() const& noexcept {
+			return m_value;
+		}
+
+		T&& value() && noexcept {
+			return std::move(m_value);
+		}
+	};
+
+	template <typename T, std::size_t tag>
+	struct ebco<T, tag, std::enable_if_t<!std::is_reference_v<T> && std::is_class_v<T> && !std::is_final_v<T>>> : T {
+		ebco() = default;
+		ebco(const ebco&) = default;
+		ebco(ebco&&) = default;
+		ebco(const T& v) noexcept(std::is_nothrow_copy_constructible_v<T>) : T(v) {};
+		ebco(T&& v) noexcept(std::is_nothrow_move_constructible_v<T>) : T(std::move(v)) {};
+		template <typename Arg, typename... Args,
+			typename = std::enable_if_t<
+			     !std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>,
+			          ebco> && !std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>, T> && (sizeof...(Args) > 0 || !std::is_convertible_v<Arg, T>)>>
+		ebco(Arg&& arg, Args&&... args) noexcept(std::is_nothrow_constructible_v<T, Arg, Args...>) : T(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+		}
+
+		ebco& operator=(const ebco&) = default;
+		ebco& operator=(ebco&&) = default;
+		ebco& operator=(const T& v) noexcept(std::is_nothrow_copy_assignable_v<T>) {
+			static_cast<T&>(*this) = v;
+			return *this;
+		}
+		ebco& operator=(T&& v) noexcept(std::is_nothrow_move_assignable_v<T>) {
+			static_cast<T&>(*this) = std::move(v);
+			return *this;
+		};
+
+		T& value() & noexcept {
+			return static_cast<T&>(*this);
+		}
+
+		T const& value() const& noexcept {
+			return static_cast<T const&>(*this);
+		}
+
+		T&& value() && noexcept {
+			return std::move(static_cast<T&>(*this));
+		}
+	};
+
+	template <typename T, std::size_t tag>
+	struct ebco<T&, tag> {
+	private:
+		T* m_ref;
+
+	public:
+		ebco() = default;
+		ebco(const ebco&) = default;
+		ebco(ebco&&) = default;
+		ebco(T& v) noexcept : m_ref(std::addressof(v)) {};
+
+		ebco& operator=(const ebco&) = default;
+		ebco& operator=(ebco&&) = default;
+		ebco& operator=(T& v) noexcept {
+			m_ref = std::addressof(v);
+			return *this;
+		}
+
+		T& value() const noexcept {
+			return *(const_cast<ebco<T&, tag>&>(*this).m_ref);
+		}
+	};
+
+	template <typename T, std::size_t tag>
+	struct ebco<T&&, tag> {
+		T&& ref;
+
+		ebco() = default;
+		ebco(const ebco&) = delete;
+		ebco(ebco&&) = default;
+		ebco(T&& v) noexcept : ref(v) {};
+
+		ebco& operator=(const ebco&) = delete;
+		ebco& operator=(ebco&&) = delete;
+
+		T& value() & noexcept {
+			return ref;
+		}
+
+		const T& value() const& noexcept {
+			return ref;
+		}
+
+		T&& value() && noexcept {
+			return std::move(ref);
+		}
+	};
+
+}} // namespace sol::detail
+
+#endif // SOL_EBCO_HPP
diff --git a/extern/sol3/sol/environment.hpp b/extern/sol3/sol/environment.hpp
new file mode 100644
index 0000000000..2529403bc0
--- /dev/null
+++ b/extern/sol3/sol/environment.hpp
@@ -0,0 +1,261 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_ENVIRONMENT_HPP
+#define SOL_ENVIRONMENT_HPP
+
+#include <sol/table.hpp>
+
+namespace sol {
+
+	template <typename base_type>
+	struct basic_environment : basic_table<base_type> {
+	private:
+		typedef basic_table<base_type> base_t;
+
+	public:
+		using base_t::lua_state;
+
+		basic_environment() noexcept = default;
+		basic_environment(const basic_environment&) = default;
+		basic_environment(basic_environment&&) = default;
+		basic_environment& operator=(const basic_environment&) = default;
+		basic_environment& operator=(basic_environment&&) = default;
+		basic_environment(const stack_reference& r) : basic_environment(r.lua_state(), r.stack_index()) {
+		}
+		basic_environment(stack_reference&& r) : basic_environment(r.lua_state(), r.stack_index()) {
+		}
+
+		basic_environment(lua_State* L, new_table nt) : base_t(L, std::move(nt)) {
+		}
+		template <bool b>
+		basic_environment(lua_State* L, new_table t, const basic_reference<b>& fallback) : basic_environment(L, std::move(t)) {
+			stack_table mt(L, new_table(0, 1));
+			mt.set(meta_function::index, fallback);
+			this->set(metatable_key, mt);
+			mt.pop();
+		}
+
+		basic_environment(env_key_t, const stack_reference& extraction_target)
+		: base_t(detail::no_safety, extraction_target.lua_state(), (stack::push_environment_of(extraction_target), -1)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			constructor_handler handler {};
+			stack::check<env_key_t>(this->lua_state(), -1, handler);
+#endif // Safety
+			lua_pop(this->lua_state(), 2);
+		}
+		template <bool b>
+		basic_environment(env_key_t, const basic_reference<b>& extraction_target)
+		: base_t(detail::no_safety, extraction_target.lua_state(), (stack::push_environment_of(extraction_target), -1)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			constructor_handler handler {};
+			stack::check<env_key_t>(this->lua_state(), -1, handler);
+#endif // Safety
+			lua_pop(this->lua_state(), 2);
+		}
+		basic_environment(lua_State* L, int index = -1) : base_t(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			constructor_handler handler {};
+			stack::check<basic_environment>(L, index, handler);
+#endif // Safety
+		}
+		basic_environment(lua_State* L, ref_index index) : base_t(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_environment>(L, -1, handler);
+#endif // Safety
+		}
+		template <typename T,
+		     meta::enable<meta::neg<meta::any_same<meta::unqualified_t<T>, basic_environment>>, meta::neg<std::is_same<base_type, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_environment(T&& r) noexcept : base_t(detail::no_safety, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			if (!is_environment<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				constructor_handler handler {};
+				stack::check<basic_environment>(lua_state(), -1, handler);
+			}
+#endif // Safety
+		}
+		basic_environment(lua_nil_t r) noexcept : base_t(detail::no_safety, r) {
+		}
+
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_environment(lua_State* L, T&& r) noexcept : base_t(detail::no_safety, L, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			if (!is_environment<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				constructor_handler handler {};
+				stack::check<basic_environment>(lua_state(), -1, handler);
+			}
+#endif // Safety
+		}
+
+		template <typename T>
+		bool set_on(const T& target) const {
+			lua_State* L = target.lua_state();
+			auto pp = stack::push_pop(target);
+			int target_index = pp.index_of(target);
+#if SOL_LUA_VERSION_I_ < 502
+			// Use lua_setfenv
+			this->push();
+			int success_result = lua_setfenv(L, target_index);
+			return success_result != 0;
+#else
+			// If this is a C function, the environment is always placed in
+			// the first value, as is expected of sol2 (all upvalues have an empty name, "")
+			if (lua_iscfunction(L, target_index) != 0) {
+				const char* maybe_upvalue_name = lua_getupvalue(L, target_index, 1);
+				if (maybe_upvalue_name == nullptr) {
+					return false;
+				}
+				string_view upvalue_name(maybe_upvalue_name);
+				if (upvalue_name == "") {
+					this->push();
+					const char* success = lua_setupvalue(L, target_index, 1);
+					if (success == nullptr) {
+						// left things alone on the stack, pop them off
+						lua_pop(L, 1);
+						return false;
+					}
+					return true;
+				}
+				return false;
+			}
+			else {
+				// Must search for the right upvalue target on index
+				for (int upvalue_index = 1;; ++upvalue_index) {
+					const char* maybe_upvalue_name = lua_getupvalue(L, target_index, upvalue_index);
+					if (maybe_upvalue_name == nullptr) {
+						break;
+					}
+					string_view upvalue_name(maybe_upvalue_name);
+					if (upvalue_name == "_ENV") {
+						this->push();
+						const char* success = lua_setupvalue(L, target_index, upvalue_index);
+						if (success == nullptr) {
+							// left things alone on the stack, pop them off
+							lua_pop(L, 1);
+							break;
+						}
+						// whether or not we succeeded, we found _ENV
+						// so we need to break
+						return true;
+					}
+					lua_pop(L, 1);
+				}
+				// if we get here,
+				// we did not find an _ENV here...
+				return false;
+			}
+#endif
+		}
+	};
+
+	template <typename T, typename E>
+	bool set_environment(const basic_environment<E>& env, const T& target) {
+		return env.set_on(target);
+	}
+
+	template <typename E = reference, typename T>
+	basic_environment<E> get_environment(const T& target) {
+		lua_State* L = target.lua_state();
+		auto pp = stack::pop_n(L, stack::push_environment_of(target));
+		return basic_environment<E>(L, -1);
+	}
+
+	struct this_environment {
+		optional<environment> env;
+
+		this_environment() : env(nullopt) {
+		}
+		this_environment(environment e) : env(std::move(e)) {
+		}
+		this_environment(const this_environment&) = default;
+		this_environment(this_environment&&) = default;
+		this_environment& operator=(const this_environment&) = default;
+		this_environment& operator=(this_environment&&) = default;
+
+		explicit operator bool() const {
+			return static_cast<bool>(env);
+		}
+
+		operator optional<environment>&() {
+			return env;
+		}
+
+		operator const optional<environment>&() const {
+			return env;
+		}
+
+		operator environment&() {
+			return env.value();
+		}
+
+		operator const environment&() const {
+			return env.value();
+		}
+	};
+
+	namespace stack {
+		template <>
+		struct unqualified_getter<env_key_t> {
+			static environment get(lua_State* L, int index, record& tracking) {
+				tracking.use(1);
+				return get_environment(stack_reference(L, raw_index(index)));
+			}
+		};
+
+		template <>
+		struct unqualified_getter<this_environment> {
+			static this_environment get(lua_State* L, int, record& tracking) {
+				tracking.use(0);
+				lua_Debug info;
+				// Level 0 means current function (this C function, which may or may not be useful for us?)
+				// Level 1 means next call frame up the stack. (Can be nothing if function called directly from C++ with lua_p/call)
+				int pre_stack_size = lua_gettop(L);
+				if (lua_getstack(L, 1, &info) != 1) {
+					if (lua_getstack(L, 0, &info) != 1) {
+						lua_settop(L, pre_stack_size);
+						return this_environment();
+					}
+				}
+				if (lua_getinfo(L, "f", &info) == 0) {
+					lua_settop(L, pre_stack_size);
+					return this_environment();
+				}
+
+				stack_reference f(L, -1);
+				environment env(env_key, f);
+				if (!env.valid()) {
+					lua_settop(L, pre_stack_size);
+					return this_environment();
+				}
+				return this_environment(std::move(env));
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+#endif // SOL_ENVIRONMENT_HPP
diff --git a/extern/sol3/sol/epilogue.hpp b/extern/sol3/sol/epilogue.hpp
new file mode 100644
index 0000000000..199b98120a
--- /dev/null
+++ b/extern/sol3/sol/epilogue.hpp
@@ -0,0 +1,39 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#pragma once
+
+// clang-format off
+
+#if !defined(SOL_PROLOGUE_I_)
+	#error "[sol2] Library Prologue is missing from this translation unit."
+#else
+	#undef SOL_PROLOGUE_I_
+#endif
+
+#if SOL_IS_ON(SOL_BUILD_CXX_MODE_I_)
+	#undef _FWD
+	#undef _MOVE
+#endif
+
+// clang-format on
diff --git a/extern/sol3/sol/error.hpp b/extern/sol3/sol/error.hpp
new file mode 100644
index 0000000000..99d2a4256e
--- /dev/null
+++ b/extern/sol3/sol/error.hpp
@@ -0,0 +1,89 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_ERROR_HPP
+#define SOL_ERROR_HPP
+
+#include <sol/compatibility.hpp>
+
+#include <stdexcept>
+#include <string>
+#include <array>
+
+namespace sol {
+	namespace detail {
+		struct direct_error_tag { };
+		const auto direct_error = direct_error_tag {};
+
+		struct error_result {
+			int results;
+			const char* format_string;
+			std::array<const char*, 4> argument_strings;
+
+			error_result() : results(0), format_string(nullptr) {
+			}
+
+			error_result(int results_) : results(results_), format_string(nullptr) {
+			}
+
+			error_result(const char* format_string_, const char* first_message_) : results(0), format_string(format_string_), argument_strings() {
+				argument_strings[0] = first_message_;
+			}
+		};
+
+		inline int handle_errors(lua_State* L, const error_result& er) {
+			if (er.format_string == nullptr) {
+				return er.results;
+			}
+			return luaL_error(L, er.format_string, er.argument_strings[0], er.argument_strings[1], er.argument_strings[2], er.argument_strings[3]);
+		}
+	} // namespace detail
+
+	class error : public std::runtime_error {
+	private:
+		// Because VC++ is upsetting, most of the time!
+		std::string what_reason;
+
+	public:
+		error(const std::string& str) : error(detail::direct_error, "lua: error: " + str) {
+		}
+		error(std::string&& str) : error(detail::direct_error, "lua: error: " + std::move(str)) {
+		}
+		error(detail::direct_error_tag, const std::string& str) : std::runtime_error(""), what_reason(str) {
+		}
+		error(detail::direct_error_tag, std::string&& str) : std::runtime_error(""), what_reason(std::move(str)) {
+		}
+
+		error(const error& e) = default;
+		error(error&& e) = default;
+		error& operator=(const error& e) = default;
+		error& operator=(error&& e) = default;
+
+		virtual const char* what() const noexcept override {
+			return what_reason.c_str();
+		}
+	};
+
+} // namespace sol
+
+#endif // SOL_ERROR_HPP
diff --git a/extern/sol3/sol/error_handler.hpp b/extern/sol3/sol/error_handler.hpp
new file mode 100644
index 0000000000..cfda69bd2d
--- /dev/null
+++ b/extern/sol3/sol/error_handler.hpp
@@ -0,0 +1,175 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_ERROR_HANDLER_HPP
+#define SOL_ERROR_HANDLER_HPP
+
+#include <sol/types.hpp>
+#include <sol/demangle.hpp>
+
+#include <cstdio>
+
+namespace sol {
+
+	namespace detail {
+		constexpr const char* not_a_number = "not a numeric type";
+		constexpr const char* not_a_number_or_number_string = "not a numeric type or numeric string";
+		constexpr const char* not_a_number_integral = "not a numeric type that fits exactly an integer (number maybe has significant decimals)";
+		constexpr const char* not_a_number_or_number_string_integral
+		     = "not a numeric type or a numeric string that fits exactly an integer (e.g. number maybe has significant decimals)";
+
+		constexpr const char* not_enough_stack_space = "not enough space left on Lua stack";
+		constexpr const char* not_enough_stack_space_floating = "not enough space left on Lua stack for a floating point number";
+		constexpr const char* not_enough_stack_space_integral = "not enough space left on Lua stack for an integral number";
+		constexpr const char* not_enough_stack_space_string = "not enough space left on Lua stack for a string";
+		constexpr const char* not_enough_stack_space_meta_function_name = "not enough space left on Lua stack for the name of a meta_function";
+		constexpr const char* not_enough_stack_space_userdata = "not enough space left on Lua stack to create a sol2 userdata";
+		constexpr const char* not_enough_stack_space_generic = "not enough space left on Lua stack to push valuees";
+		constexpr const char* not_enough_stack_space_environment = "not enough space left on Lua stack to retrieve environment";
+		constexpr const char* protected_function_error = "caught (...) unknown error during protected_function call";
+
+		inline void accumulate_and_mark(const std::string& n, std::string& aux_message, int& marker) {
+			if (marker > 0) {
+				aux_message += ", ";
+			}
+			aux_message += n;
+			++marker;
+		}
+	} // namespace detail
+
+	inline std::string associated_type_name(lua_State* L, int index, type t) {
+		switch (t) {
+		case type::poly:
+			return "anything";
+		case type::userdata: {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 2, "not enough space to push get the type name");
+#endif // make sure stack doesn't overflow
+			if (lua_getmetatable(L, index) == 0) {
+				break;
+			}
+			lua_pushlstring(L, "__name", 6);
+			lua_rawget(L, -2);
+			size_t sz;
+			const char* name = lua_tolstring(L, -1, &sz);
+			std::string tn(name, static_cast<std::string::size_type>(sz));
+			lua_pop(L, 2);
+			return tn;
+		}
+		default:
+			break;
+		}
+		return lua_typename(L, static_cast<int>(t));
+	}
+
+	inline int push_type_panic_string(lua_State* L, int index, type expected, type actual, string_view message, string_view aux_message) noexcept {
+		const char* err = message.size() == 0
+		     ? (aux_message.size() == 0 ? "stack index %d, expected %s, received %s" : "stack index %d, expected %s, received %s: %s")
+		     : "stack index %d, expected %s, received %s: %s %s";
+		const char* type_name = expected == type::poly ? "anything" : lua_typename(L, static_cast<int>(expected));
+		{
+			std::string actual_name = associated_type_name(L, index, actual);
+			lua_pushfstring(L, err, index, type_name, actual_name.c_str(), message.data(), aux_message.data());
+		}
+		return 1;
+	}
+
+	inline int type_panic_string(lua_State* L, int index, type expected, type actual, string_view message = "") noexcept(false) {
+		push_type_panic_string(L, index, expected, actual, message, "");
+		return lua_error(L);
+	}
+
+	inline int type_panic_c_str(lua_State* L, int index, type expected, type actual, const char* message = nullptr) noexcept(false) {
+		push_type_panic_string(L, index, expected, actual, message == nullptr ? "" : message, "");
+		return lua_error(L);
+	}
+
+	struct type_panic_t {
+		int operator()(lua_State* L, int index, type expected, type actual) const noexcept(false) {
+			return type_panic_c_str(L, index, expected, actual, nullptr);
+		}
+		int operator()(lua_State* L, int index, type expected, type actual, string_view message) const noexcept(false) {
+			return type_panic_c_str(L, index, expected, actual, message.data());
+		}
+	};
+
+	const type_panic_t type_panic = {};
+
+	struct constructor_handler {
+		int operator()(lua_State* L, int index, type expected, type actual, string_view message) const noexcept(false) {
+			push_type_panic_string(L, index, expected, actual, message, "(type check failed in constructor)");
+			return lua_error(L);
+		}
+	};
+
+	template <typename F = void>
+	struct argument_handler {
+		int operator()(lua_State* L, int index, type expected, type actual, string_view message) const noexcept(false) {
+			push_type_panic_string(L, index, expected, actual, message, "(bad argument to variable or function call)");
+			return lua_error(L);
+		}
+	};
+
+	template <typename R, typename... Args>
+	struct argument_handler<types<R, Args...>> {
+		int operator()(lua_State* L, int index, type expected, type actual, string_view message) const noexcept(false) {
+			{
+				std::string aux_message = "(bad argument into '";
+				aux_message += detail::demangle<R>();
+				aux_message += "(";
+				int marker = 0;
+				(void)detail::swallow { int(), (detail::accumulate_and_mark(detail::demangle<Args>(), aux_message, marker), int())... };
+				aux_message += ")')";
+				push_type_panic_string(L, index, expected, actual, message, aux_message);
+			}
+			return lua_error(L);
+		}
+	};
+
+	// Specify this function as the handler for lua::check if you know there's nothing wrong
+	inline int no_panic(lua_State*, int, type, type, const char* = nullptr) noexcept {
+		return 0;
+	}
+
+	inline void type_error(lua_State* L, int expected, int actual) noexcept(false) {
+		luaL_error(L, "expected %s, received %s", lua_typename(L, expected), lua_typename(L, actual));
+	}
+
+	inline void type_error(lua_State* L, type expected, type actual) noexcept(false) {
+		type_error(L, static_cast<int>(expected), static_cast<int>(actual));
+	}
+
+	inline void type_assert(lua_State* L, int index, type expected, type actual) noexcept(false) {
+		if (expected != type::poly && expected != actual) {
+			type_panic_c_str(L, index, expected, actual, nullptr);
+		}
+	}
+
+	inline void type_assert(lua_State* L, int index, type expected) {
+		type actual = type_of(L, index);
+		type_assert(L, index, expected, actual);
+	}
+
+} // namespace sol
+
+#endif // SOL_ERROR_HANDLER_HPP
diff --git a/extern/sol3/sol/forward.hpp b/extern/sol3/sol/forward.hpp
new file mode 100644
index 0000000000..708e711e2d
--- /dev/null
+++ b/extern/sol3/sol/forward.hpp
@@ -0,0 +1,266 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_FORWARD_HPP
+#define SOL_FORWARD_HPP
+
+#include <sol/version.hpp>
+
+#include <utility>
+#include <type_traits>
+#include <string_view>
+
+#if SOL_IS_ON(SOL_USE_CXX_LUA_I_) || SOL_IS_ON(SOL_USE_CXX_LUAJIT_I_)
+struct lua_State;
+#else
+extern "C" {
+struct lua_State;
+}
+#endif // C++ Mangling for Lua vs. Not
+
+namespace sol {
+
+	enum class type;
+
+	class stateless_reference;
+	template <bool b>
+	class basic_reference;
+	using reference = basic_reference<false>;
+	using main_reference = basic_reference<true>;
+	class stateless_stack_reference;
+	class stack_reference;
+
+	template <typename A>
+	class basic_bytecode;
+
+	struct lua_value;
+
+	struct proxy_base_tag;
+	template <typename>
+	struct proxy_base;
+	template <typename, typename>
+	struct table_proxy;
+
+	template <bool, typename>
+	class basic_table_core;
+	template <bool b>
+	using table_core = basic_table_core<b, reference>;
+	template <bool b>
+	using main_table_core = basic_table_core<b, main_reference>;
+	template <bool b>
+	using stack_table_core = basic_table_core<b, stack_reference>;
+	template <typename base_type>
+	using basic_table = basic_table_core<false, base_type>;
+	using table = table_core<false>;
+	using global_table = table_core<true>;
+	using main_table = main_table_core<false>;
+	using main_global_table = main_table_core<true>;
+	using stack_table = stack_table_core<false>;
+	using stack_global_table = stack_table_core<true>;
+
+	template <typename>
+	struct basic_lua_table;
+	using lua_table = basic_lua_table<reference>;
+	using stack_lua_table = basic_lua_table<stack_reference>;
+
+	template <typename T, typename base_type>
+	class basic_usertype;
+	template <typename T>
+	using usertype = basic_usertype<T, reference>;
+	template <typename T>
+	using stack_usertype = basic_usertype<T, stack_reference>;
+
+	template <typename base_type>
+	class basic_metatable;
+	using metatable = basic_metatable<reference>;
+	using stack_metatable = basic_metatable<stack_reference>;
+
+	template <typename base_t>
+	struct basic_environment;
+	using environment = basic_environment<reference>;
+	using main_environment = basic_environment<main_reference>;
+	using stack_environment = basic_environment<stack_reference>;
+
+	template <typename T, bool>
+	class basic_function;
+	template <typename T, bool, typename H>
+	class basic_protected_function;
+	using unsafe_function = basic_function<reference, false>;
+	using safe_function = basic_protected_function<reference, false, reference>;
+	using main_unsafe_function = basic_function<main_reference, false>;
+	using main_safe_function = basic_protected_function<main_reference, false, reference>;
+	using stack_unsafe_function = basic_function<stack_reference, false>;
+	using stack_safe_function = basic_protected_function<stack_reference, false, reference>;
+	using stack_aligned_unsafe_function = basic_function<stack_reference, true>;
+	using stack_aligned_safe_function = basic_protected_function<stack_reference, true, reference>;
+	using protected_function = safe_function;
+	using main_protected_function = main_safe_function;
+	using stack_protected_function = stack_safe_function;
+	using stack_aligned_protected_function = stack_aligned_safe_function;
+#if SOL_IS_ON(SOL_SAFE_FUNCTION_OBJECTS_I_)
+	using function = protected_function;
+	using main_function = main_protected_function;
+	using stack_function = stack_protected_function;
+	using stack_aligned_function = stack_aligned_safe_function;
+#else
+	using function = unsafe_function;
+	using main_function = main_unsafe_function;
+	using stack_function = stack_unsafe_function;
+	using stack_aligned_function = stack_aligned_unsafe_function;
+#endif
+	using stack_aligned_stack_handler_function = basic_protected_function<stack_reference, true, stack_reference>;
+
+	struct unsafe_function_result;
+	struct protected_function_result;
+	using safe_function_result = protected_function_result;
+#if SOL_IS_ON(SOL_SAFE_FUNCTION_OBJECTS_I_)
+	using function_result = safe_function_result;
+#else
+	using function_result = unsafe_function_result;
+#endif
+
+	template <typename base_t>
+	class basic_object_base;
+	template <typename base_t>
+	class basic_object;
+	template <typename base_t>
+	class basic_userdata;
+	template <typename base_t>
+	class basic_lightuserdata;
+	template <typename base_t>
+	class basic_coroutine;
+	template <typename base_t>
+	class basic_packaged_coroutine;
+	template <typename base_t>
+	class basic_thread;
+
+	using object = basic_object<reference>;
+	using userdata = basic_userdata<reference>;
+	using lightuserdata = basic_lightuserdata<reference>;
+	using thread = basic_thread<reference>;
+	using coroutine = basic_coroutine<reference>;
+	using packaged_coroutine = basic_packaged_coroutine<reference>;
+	using main_object = basic_object<main_reference>;
+	using main_userdata = basic_userdata<main_reference>;
+	using main_lightuserdata = basic_lightuserdata<main_reference>;
+	using main_coroutine = basic_coroutine<main_reference>;
+	using stack_object = basic_object<stack_reference>;
+	using stack_userdata = basic_userdata<stack_reference>;
+	using stack_lightuserdata = basic_lightuserdata<stack_reference>;
+	using stack_thread = basic_thread<stack_reference>;
+	using stack_coroutine = basic_coroutine<stack_reference>;
+
+	struct stack_proxy_base;
+	struct stack_proxy;
+	struct variadic_args;
+	struct variadic_results;
+	struct stack_count;
+	struct this_state;
+	struct this_main_state;
+	struct this_environment;
+
+	class state_view;
+	class state;
+
+	template <typename T>
+	struct as_table_t;
+	template <typename T>
+	struct as_container_t;
+	template <typename T>
+	struct nested;
+	template <typename T>
+	struct light;
+	template <typename T>
+	struct user;
+	template <typename T>
+	struct as_args_t;
+	template <typename T>
+	struct protect_t;
+	template <typename F, typename... Policies>
+	struct policy_wrapper;
+
+	template <typename T>
+	struct usertype_traits;
+	template <typename T>
+	struct unique_usertype_traits;
+
+	template <typename... Args>
+	struct types {
+		typedef std::make_index_sequence<sizeof...(Args)> indices;
+		static constexpr std::size_t size() {
+			return sizeof...(Args);
+		}
+	};
+
+	template <typename T>
+	struct derive : std::false_type {
+		typedef types<> type;
+	};
+
+	template <typename T>
+	struct base : std::false_type {
+		typedef types<> type;
+	};
+
+	template <typename T>
+	struct weak_derive {
+		static bool value;
+	};
+
+	template <typename T>
+	bool weak_derive<T>::value = false;
+
+	namespace stack {
+		struct record;
+	}
+
+#if SOL_IS_OFF(SOL_USE_BOOST_I_)
+	template <class T>
+	class optional;
+
+	template <class T>
+	class optional<T&>;
+#endif
+
+	using check_handler_type = int(lua_State*, int, type, type, const char*);
+
+} // namespace sol
+
+#define SOL_BASE_CLASSES(T, ...)                       \
+	namespace sol {                                   \
+		template <>                                  \
+		struct base<T> : std::true_type {            \
+			typedef ::sol::types<__VA_ARGS__> type; \
+		};                                           \
+	}                                                 \
+	void a_sol3_detail_function_decl_please_no_collide()
+#define SOL_DERIVED_CLASSES(T, ...)                    \
+	namespace sol {                                   \
+		template <>                                  \
+		struct derive<T> : std::true_type {          \
+			typedef ::sol::types<__VA_ARGS__> type; \
+		};                                           \
+	}                                                 \
+	void a_sol3_detail_function_decl_please_no_collide()
+
+#endif // SOL_FORWARD_HPP
diff --git a/extern/sol3/sol/forward_detail.hpp b/extern/sol3/sol/forward_detail.hpp
new file mode 100644
index 0000000000..5815f485b0
--- /dev/null
+++ b/extern/sol3/sol/forward_detail.hpp
@@ -0,0 +1,56 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_FORWARD_DETAIL_HPP
+#define SOL_FORWARD_DETAIL_HPP
+
+#include <sol/version.hpp>
+
+#include <sol/forward.hpp>
+#include <sol/traits.hpp>
+
+namespace sol {
+	namespace detail {
+		const bool default_safe_function_calls =
+#if SOL_IS_ON(SOL_SAFE_FUNCTION_CALLS_I_)
+		     true;
+#else
+		     false;
+#endif
+	} // namespace detail
+
+
+	namespace meta { namespace meta_detail {
+	}} // namespace meta::meta_detail
+
+	namespace stack { namespace stack_detail {
+		using undefined_method_func = void (*)(stack_reference);
+
+		template <typename T>
+		void set_undefined_methods_on(stack_reference);
+
+		struct undefined_metatable;
+	}} // namespace stack::stack_detail
+} // namespace sol
+
+#endif // SOL_FORWARD_DETAIL_HPP
diff --git a/extern/sol3/sol/function.hpp b/extern/sol3/sol/function.hpp
new file mode 100644
index 0000000000..7afeb6c15f
--- /dev/null
+++ b/extern/sol3/sol/function.hpp
@@ -0,0 +1,142 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_FUNCTION_HPP
+#define SOL_FUNCTION_HPP
+
+#include <sol/stack.hpp>
+#include <sol/unsafe_function.hpp>
+#include <sol/protected_function.hpp>
+#include <sol/bytecode.hpp>
+#include <functional>
+
+namespace sol {
+	template <typename... Ret, typename... Args>
+	decltype(auto) stack_proxy::call(Args&&... args) {
+		stack_function sf(this->lua_state(), this->stack_index());
+		return sf.template call<Ret...>(std::forward<Args>(args)...);
+	}
+
+	inline protected_function_result::protected_function_result(unsafe_function_result&& o) noexcept
+	: L(o.lua_state()), index(o.stack_index()), returncount(o.return_count()), popcount(o.return_count()), err(o.status()) {
+		// Must be manual, otherwise destructor will screw us
+		// return count being 0 is enough to keep things clean
+		// but we will be thorough
+		o.abandon();
+	}
+
+	inline protected_function_result& protected_function_result::operator=(unsafe_function_result&& o) noexcept {
+		L = o.lua_state();
+		index = o.stack_index();
+		returncount = o.return_count();
+		popcount = o.return_count();
+		err = o.status();
+		// Must be manual, otherwise destructor will screw us
+		// return count being 0 is enough to keep things clean
+		// but we will be thorough
+		o.abandon();
+		return *this;
+	}
+
+	inline unsafe_function_result::unsafe_function_result(protected_function_result&& o) noexcept
+	: L(o.lua_state()), index(o.stack_index()), returncount(o.return_count()) {
+		// Must be manual, otherwise destructor will screw us
+		// return count being 0 is enough to keep things clean
+		// but we will be thorough
+		o.abandon();
+	}
+	inline unsafe_function_result& unsafe_function_result::operator=(protected_function_result&& o) noexcept {
+		L = o.lua_state();
+		index = o.stack_index();
+		returncount = o.return_count();
+		// Must be manual, otherwise destructor will screw us
+		// return count being 0 is enough to keep things clean
+		// but we will be thorough
+		o.abandon();
+		return *this;
+	}
+
+	namespace detail {
+		template <typename... R>
+		struct std_shim {
+			unsafe_function lua_func_;
+
+			std_shim(unsafe_function lua_func) : lua_func_(std::move(lua_func)) {
+			}
+
+			template <typename... Args>
+			meta::return_type_t<R...> operator()(Args&&... args) {
+				return lua_func_.call<R...>(std::forward<Args>(args)...);
+			}
+		};
+
+		template <>
+		struct std_shim<void> {
+			unsafe_function lua_func_;
+
+			std_shim(unsafe_function lua_func) : lua_func_(std::move(lua_func)) {
+			}
+
+			template <typename... Args>
+			void operator()(Args&&... args) {
+				lua_func_.call<void>(std::forward<Args>(args)...);
+			}
+		};
+	} // namespace detail
+
+	namespace stack {
+		template <typename Signature>
+		struct unqualified_getter<std::function<Signature>> {
+			typedef meta::bind_traits<Signature> fx_t;
+			typedef typename fx_t::args_list args_lists;
+			typedef meta::tuple_types<typename fx_t::return_type> return_types;
+
+			template <typename... R>
+			static std::function<Signature> get_std_func(types<R...>, lua_State* L, int index) {
+				detail::std_shim<R...> fx(unsafe_function(L, index));
+				return fx;
+			}
+
+			static std::function<Signature> get(lua_State* L, int index, record& tracking) {
+				tracking.use(1);
+				type t = type_of(L, index);
+				if (t == type::none || t == type::lua_nil) {
+					return nullptr;
+				}
+				return get_std_func(return_types(), L, index);
+			}
+		};
+
+		template <typename Allocator>
+		struct unqualified_getter<basic_bytecode<Allocator>> {
+			static basic_bytecode<Allocator> get(lua_State* L, int index, record& tracking) {
+				tracking.use(1);
+				stack_function sf(L, index);
+				return sf.dump(&dump_panic_on_error);
+			}
+		};
+	} // namespace stack
+
+} // namespace sol
+
+#endif // SOL_FUNCTION_HPP
diff --git a/extern/sol3/sol/function_result.hpp b/extern/sol3/sol/function_result.hpp
new file mode 100644
index 0000000000..1f998d7f3b
--- /dev/null
+++ b/extern/sol3/sol/function_result.hpp
@@ -0,0 +1,78 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_FUNCTION_RESULT_HPP
+#define SOL_FUNCTION_RESULT_HPP
+
+#include <sol/protected_function_result.hpp>
+#include <sol/unsafe_function_result.hpp>
+
+#include <cstdint>
+
+namespace sol {
+
+	namespace detail {
+		template <>
+		struct is_speshul<unsafe_function_result> : std::true_type { };
+		template <>
+		struct is_speshul<protected_function_result> : std::true_type { };
+
+		template <std::size_t I, typename... Args, typename T>
+		stack_proxy get(types<Args...>, meta::index_value<0>, meta::index_value<I>, const T& fr) {
+			return stack_proxy(fr.lua_state(), fr.stack_index() + static_cast<int>(I));
+		}
+
+		template <std::size_t I, std::size_t N, typename Arg, typename... Args, typename T, meta::enable<meta::boolean<(N > 0)>> = meta::enabler>
+		stack_proxy get(types<Arg, Args...>, meta::index_value<N>, meta::index_value<I>, const T& fr) {
+			return get(types<Args...>(), meta::index_value<N - 1>(), meta::index_value<I + lua_size<Arg>::value>(), fr);
+		}
+	} // namespace detail
+
+	template <>
+	struct tie_size<unsafe_function_result> : std::integral_constant<std::size_t, SIZE_MAX> { };
+
+	template <>
+	struct tie_size<protected_function_result> : std::integral_constant<std::size_t, SIZE_MAX> { };
+
+	template <std::size_t I>
+	stack_proxy get(const unsafe_function_result& fr) {
+		return stack_proxy(fr.lua_state(), fr.stack_index() + static_cast<int>(I));
+	}
+
+	template <std::size_t I, typename... Args>
+	stack_proxy get(types<Args...> t, const unsafe_function_result& fr) {
+		return detail::get(t, meta::index_value<I>(), meta::index_value<0>(), fr);
+	}
+
+	template <std::size_t I>
+	stack_proxy get(const protected_function_result& fr) {
+		return stack_proxy(fr.lua_state(), fr.stack_index() + static_cast<int>(I));
+	}
+
+	template <std::size_t I, typename... Args>
+	stack_proxy get(types<Args...> t, const protected_function_result& fr) {
+		return detail::get(t, meta::index_value<I>(), meta::index_value<0>(), fr);
+	}
+} // namespace sol
+
+#endif // SOL_FUNCTION_RESULT_HPP
diff --git a/extern/sol3/sol/function_types.hpp b/extern/sol3/sol/function_types.hpp
new file mode 100644
index 0000000000..1890589075
--- /dev/null
+++ b/extern/sol3/sol/function_types.hpp
@@ -0,0 +1,769 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_FUNCTION_TYPES_HPP
+#define SOL_FUNCTION_TYPES_HPP
+
+#include <sol/function_types_core.hpp>
+#include <sol/function_types_templated.hpp>
+#include <sol/function_types_stateless.hpp>
+#include <sol/function_types_stateful.hpp>
+#include <sol/function_types_overloaded.hpp>
+#include <sol/resolve.hpp>
+#include <sol/call.hpp>
+
+namespace sol {
+	namespace function_detail {
+		template <typename T>
+		struct class_indicator {
+			using type = T;
+		};
+
+		struct call_indicator { };
+
+		template <bool yielding>
+		int lua_c_wrapper(lua_State* L) {
+			lua_CFunction cf = lua_tocfunction(L, lua_upvalueindex(2));
+			int nr = cf(L);
+			if constexpr (yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		template <bool yielding>
+		int lua_c_noexcept_wrapper(lua_State* L) noexcept {
+			detail::lua_CFunction_noexcept cf = reinterpret_cast<detail::lua_CFunction_noexcept>(lua_tocfunction(L, lua_upvalueindex(2)));
+			int nr = cf(L);
+			if constexpr (yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		struct c_function_invocation { };
+
+		template <bool is_yielding, bool no_trampoline, typename Fx, typename... Args>
+		void select(lua_State* L, Fx&& fx, Args&&... args);
+
+		template <bool is_yielding, bool no_trampoline, typename Fx, typename... Args>
+		void select_set_fx(lua_State* L, Args&&... args) {
+			lua_CFunction freefunc = no_trampoline ? function_detail::call<meta::unqualified_t<Fx>, 2, is_yielding>
+			                                       : detail::static_trampoline<function_detail::call<meta::unqualified_t<Fx>, 2, is_yielding>>;
+
+			int upvalues = 0;
+			upvalues += stack::push(L, nullptr);
+			upvalues += stack::push<user<Fx>>(L, std::forward<Args>(args)...);
+			stack::push(L, c_closure(freefunc, upvalues));
+		}
+
+		template <bool is_yielding, bool no_trampoline, typename R, typename... A, typename Fx, typename... Args>
+		void select_convertible(types<R(A...)>, lua_State* L, Fx&& fx, Args&&... args) {
+			using dFx = std::decay_t<meta::unwrap_unqualified_t<Fx>>;
+			using fx_ptr_t = R (*)(A...);
+			constexpr bool is_convertible = std::is_convertible_v<dFx, fx_ptr_t>;
+			if constexpr (is_convertible) {
+				fx_ptr_t fxptr = detail::unwrap(std::forward<Fx>(fx));
+				select<is_yielding, no_trampoline>(L, std::move(fxptr), std::forward<Args>(args)...);
+			}
+			else {
+				using F = function_detail::functor_function<dFx, false, true>;
+				select_set_fx<is_yielding, no_trampoline, F>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+			}
+		}
+
+		template <bool is_yielding, bool no_trampoline, typename Fx, typename... Args>
+		void select_convertible(types<>, lua_State* L, Fx&& fx, Args&&... args) {
+			typedef meta::function_signature_t<meta::unwrap_unqualified_t<Fx>> Sig;
+			select_convertible<is_yielding, no_trampoline>(types<Sig>(), L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+		}
+
+		template <bool is_yielding, bool no_trampoline, typename Fx, typename... Args>
+		void select_member_variable(lua_State* L, Fx&& fx, Args&&... args) {
+			using uFx = meta::unqualified_t<Fx>;
+			if constexpr (sizeof...(Args) < 1) {
+				using C = typename meta::bind_traits<uFx>::object_type;
+				lua_CFunction freefunc = &function_detail::upvalue_this_member_variable<C, Fx>::template call<is_yielding, no_trampoline>;
+
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::stack_detail::push_as_upvalues(L, fx);
+				stack::push(L, c_closure(freefunc, upvalues));
+			}
+			else if constexpr (sizeof...(Args) < 2) {
+				using Tu = typename meta::meta_detail::unqualified_non_alias<Args...>::type;
+				constexpr bool is_reference = meta::is_specialization_of_v<Tu, std::reference_wrapper> || std::is_pointer_v<Tu>;
+				if constexpr (meta::is_specialization_of_v<Tu, function_detail::class_indicator>) {
+					lua_CFunction freefunc
+					     = &function_detail::upvalue_this_member_variable<typename Tu::type, Fx>::template call<is_yielding, no_trampoline>;
+
+					int upvalues = 0;
+					upvalues += stack::push(L, nullptr);
+					upvalues += stack::stack_detail::push_as_upvalues(L, fx);
+					stack::push(L, c_closure(freefunc, upvalues));
+				}
+				else if constexpr (is_reference) {
+					typedef std::decay_t<Fx> dFx;
+					dFx memfxptr(std::forward<Fx>(fx));
+					auto userptr = detail::ptr(std::forward<Args>(args)...);
+					lua_CFunction freefunc = &function_detail::upvalue_member_variable<std::decay_t<decltype(*userptr)>,
+					     meta::unqualified_t<Fx>>::template call<is_yielding, no_trampoline>;
+
+					int upvalues = 0;
+					upvalues += stack::push(L, nullptr);
+					upvalues += stack::stack_detail::push_as_upvalues(L, memfxptr);
+					upvalues += stack::push(L, static_cast<void const*>(userptr));
+					stack::push(L, c_closure(freefunc, upvalues));
+				}
+				else {
+					using clean_fx = std::remove_pointer_t<std::decay_t<Fx>>;
+					using F = function_detail::member_variable<Tu, clean_fx, is_yielding, no_trampoline>;
+					select_set_fx<is_yielding, no_trampoline, F>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+				}
+			}
+			else {
+				using C = typename meta::bind_traits<uFx>::object_type;
+				using clean_fx = std::remove_pointer_t<std::decay_t<Fx>>;
+				using F = function_detail::member_variable<C, clean_fx, is_yielding, no_trampoline>;
+				select_set_fx<is_yielding, no_trampoline, F>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+			}
+		}
+
+		template <bool is_yielding, bool no_trampoline, typename Fx, typename T, typename... Args>
+		void select_member_function_with(lua_State* L, Fx&& fx, T&& obj, Args&&... args) {
+			using dFx = std::decay_t<Fx>;
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (meta::is_specialization_of_v<Tu, function_detail::class_indicator>) {
+				(void)obj;
+				using C = typename Tu::type;
+				lua_CFunction freefunc = &function_detail::upvalue_this_member_function<C, dFx>::template call<is_yielding, no_trampoline>;
+
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<dFx>>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+				stack::push(L, c_closure(freefunc, upvalues));
+			}
+			else {
+				constexpr bool is_reference = meta::is_specialization_of_v<Tu, std::reference_wrapper> || std::is_pointer_v<Tu>;
+				if constexpr (is_reference) {
+					auto userptr = detail::ptr(std::forward<T>(obj));
+					lua_CFunction freefunc
+					     = &function_detail::upvalue_member_function<std::decay_t<decltype(*userptr)>, dFx>::template call<is_yielding, no_trampoline>;
+
+					int upvalues = 0;
+					upvalues += stack::push(L, nullptr);
+					upvalues += stack::push<user<dFx>>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+					upvalues += stack::push(L, lightuserdata_value(static_cast<void*>(userptr)));
+					stack::push(L, c_closure(freefunc, upvalues));
+				}
+				else {
+					using F = function_detail::member_function<Tu, dFx, is_yielding, no_trampoline>;
+					select_set_fx<is_yielding, no_trampoline, F>(L, std::forward<Fx>(fx), std::forward<T>(obj), std::forward<Args>(args)...);
+				}
+			}
+		}
+
+		template <bool is_yielding, bool no_trampoline, typename Fx, typename... Args>
+		void select_member_function(lua_State* L, Fx&& fx, Args&&... args) {
+			using dFx = std::decay_t<Fx>;
+			if constexpr (sizeof...(Args) < 1) {
+				using C = typename meta::bind_traits<meta::unqualified_t<Fx>>::object_type;
+				lua_CFunction freefunc = &function_detail::upvalue_this_member_function<C, dFx>::template call<is_yielding, no_trampoline>;
+
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<dFx>>(L, std::forward<Fx>(fx));
+				stack::push(L, c_closure(freefunc, upvalues));
+			}
+			else {
+				select_member_function_with<is_yielding, no_trampoline>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+			}
+		}
+
+		template <bool is_yielding, bool no_trampoline, typename Fx, typename... Args>
+		void select(lua_State* L, Fx&& fx, Args&&... args) {
+			using uFx = meta::unqualified_t<Fx>;
+			if constexpr (is_lua_reference_v<uFx>) {
+				// TODO: hoist into lambda in this case for yielding???
+				stack::push(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+			}
+			else if constexpr (is_lua_c_function_v<uFx>) {
+				if constexpr (no_trampoline) {
+					if (is_yielding) {
+						int upvalues = 0;
+						upvalues += stack::push(L, nullptr);
+						upvalues += stack::push(L, std::forward<Fx>(fx));
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_)
+						if constexpr (std::is_nothrow_invocable_r_v<int, uFx, lua_State*>) {
+							detail::lua_CFunction_noexcept cf = &lua_c_noexcept_wrapper<true>;
+							lua_pushcclosure(L, reinterpret_cast<lua_CFunction>(cf), upvalues);
+						}
+						else
+#endif
+						{
+							lua_CFunction cf = &function_detail::lua_c_wrapper<true>;
+							lua_pushcclosure(L, cf, upvalues);
+						}
+					}
+					else {
+						lua_pushcclosure(L, std::forward<Fx>(fx), 0);
+					}
+				}
+				else {
+					int upvalues = 0;
+					upvalues += stack::push(L, nullptr);
+					upvalues += stack::push(L, std::forward<Fx>(fx));
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_)
+					if constexpr (std::is_nothrow_invocable_r_v<int, uFx, lua_State*>) {
+						detail::lua_CFunction_noexcept cf = &lua_c_noexcept_wrapper<is_yielding>;
+						lua_pushcclosure(L, reinterpret_cast<lua_CFunction>(cf), upvalues);
+					}
+					else {
+						lua_CFunction cf = &function_detail::lua_c_wrapper<is_yielding>;
+						lua_pushcclosure(L, cf, upvalues);
+					}
+#else
+					lua_CFunction cf = &function_detail::lua_c_wrapper<is_yielding>;
+					lua_pushcclosure(L, cf, upvalues);
+#endif
+				}
+			}
+			else if constexpr (std::is_function_v<std::remove_pointer_t<uFx>>) {
+				std::decay_t<Fx> target(std::forward<Fx>(fx), std::forward<Args>(args)...);
+				lua_CFunction freefunc = &function_detail::upvalue_free_function<Fx>::template call<is_yielding, no_trampoline>;
+
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::stack_detail::push_as_upvalues(L, target);
+				stack::push(L, c_closure(freefunc, upvalues));
+			}
+			else if constexpr (std::is_member_function_pointer_v<uFx>) {
+				select_member_function<is_yielding, no_trampoline>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+			}
+			else if constexpr (meta::is_member_object_v<uFx>) {
+				select_member_variable<is_yielding, no_trampoline>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+			}
+			else {
+				select_convertible<is_yielding, no_trampoline>(types<>(), L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+			}
+		}
+	} // namespace function_detail
+
+	namespace stack {
+		template <typename... Sigs>
+		struct unqualified_pusher<function_sig<Sigs...>> {
+			template <bool is_yielding, typename Arg0, typename... Args>
+			static int push_yielding(lua_State* L, Arg0&& arg0, Args&&... args) {
+				if constexpr (meta::is_specialization_of_v<meta::unqualified_t<Arg0>, std::function>) {
+					if constexpr (is_yielding) {
+						return stack::push<meta::unqualified_t<Arg0>>(L, detail::yield_tag, std::forward<Arg0>(arg0), std::forward<Args>(args)...);
+					}
+					else {
+						return stack::push(L, std::forward<Arg0>(arg0), std::forward<Args>(args)...);
+					}
+				}
+				else {
+					function_detail::select<is_yielding, false>(L, std::forward<Arg0>(arg0), std::forward<Args>(args)...);
+					return 1;
+				}
+			}
+
+			template <typename Arg0, typename... Args>
+			static int push(lua_State* L, Arg0&& arg0, Args&&... args) {
+				if constexpr (std::is_same_v<meta::unqualified_t<Arg0>, detail::yield_tag_t>) {
+					push_yielding<true>(L, std::forward<Args>(args)...);
+				}
+				else if constexpr (meta::is_specialization_of_v<meta::unqualified_t<Arg0>, yielding_t>) {
+					push_yielding<true>(L, std::forward<Arg0>(arg0).func, std::forward<Args>(args)...);
+				}
+				else {
+					push_yielding<false>(L, std::forward<Arg0>(arg0), std::forward<Args>(args)...);
+				}
+				return 1;
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<yielding_t<T>> {
+			template <typename... Args>
+			static int push(lua_State* L, const yielding_t<T>& f, Args&&... args) {
+				if constexpr (meta::is_specialization_of_v<meta::unqualified_t<T>, std::function>) {
+					return stack::push<T>(L, detail::yield_tag, f.func, std::forward<Args>(args)...);
+				}
+				else {
+					function_detail::select<true, false>(L, f.func, std::forward<Args>(args)...);
+					return 1;
+				}
+			}
+
+			template <typename... Args>
+			static int push(lua_State* L, yielding_t<T>&& f, Args&&... args) {
+				if constexpr (meta::is_specialization_of_v<meta::unqualified_t<T>, std::function>) {
+					return stack::push<T>(L, detail::yield_tag, std::move(f.func), std::forward<Args>(args)...);
+				}
+				else {
+					function_detail::select<true, false>(L, std::move(f.func), std::forward<Args>(args)...);
+					return 1;
+				}
+			}
+		};
+
+		template <typename T, typename... Args>
+		struct unqualified_pusher<function_arguments<T, Args...>> {
+			template <std::size_t... I, typename FP>
+			static int push_func(std::index_sequence<I...>, lua_State* L, FP&& fp) {
+				return stack::push<T>(L, std::get<I>(std::forward<FP>(fp).arguments)...);
+			}
+
+			static int push(lua_State* L, const function_arguments<T, Args...>& fp) {
+				return push_func(std::make_index_sequence<sizeof...(Args)>(), L, fp);
+			}
+
+			static int push(lua_State* L, function_arguments<T, Args...>&& fp) {
+				return push_func(std::make_index_sequence<sizeof...(Args)>(), L, std::move(fp));
+			}
+		};
+
+		template <typename Signature>
+		struct unqualified_pusher<std::function<Signature>> {
+			using TargetFunctor = function_detail::functor_function<std::function<Signature>, false, true>;
+
+			static int push(lua_State* L, detail::yield_tag_t, const std::function<Signature>& fx) {
+				if (fx) {
+					function_detail::select_set_fx<true, false, TargetFunctor>(L, fx);
+					return 1;
+				}
+				return stack::push(L, lua_nil);
+			}
+
+			static int push(lua_State* L, detail::yield_tag_t, std::function<Signature>&& fx) {
+				if (fx) {
+					function_detail::select_set_fx<true, false, TargetFunctor>(L, std::move(fx));
+					return 1;
+				}
+				return stack::push(L, lua_nil);
+			}
+
+			static int push(lua_State* L, const std::function<Signature>& fx) {
+				if (fx) {
+					function_detail::select_set_fx<false, false, TargetFunctor>(L, fx);
+					return 1;
+				}
+				return stack::push(L, lua_nil);
+			}
+
+			static int push(lua_State* L, std::function<Signature>&& fx) {
+				if (fx) {
+					function_detail::select_set_fx<false, false, TargetFunctor>(L, std::move(fx));
+					return 1;
+				}
+				return stack::push(L, lua_nil);
+			}
+		};
+
+		template <typename Signature>
+		struct unqualified_pusher<Signature, std::enable_if_t<meta::is_member_object_or_function_v<Signature>>> {
+			template <typename... Args>
+			static int push(lua_State* L, Args&&... args) {
+				function_detail::select<false, false>(L, std::forward<Args>(args)...);
+				return 1;
+			}
+		};
+
+		template <typename Signature>
+		struct unqualified_pusher<Signature,
+		     std::enable_if_t<meta::all<std::is_function<std::remove_pointer_t<Signature>>, meta::neg<std::is_same<Signature, lua_CFunction>>,
+		          meta::neg<std::is_same<Signature, std::remove_pointer_t<lua_CFunction>>>
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_)
+		          ,
+		          meta::neg<std::is_same<Signature, detail::lua_CFunction_noexcept>>,
+		          meta::neg<std::is_same<Signature, std::remove_pointer_t<detail::lua_CFunction_noexcept>>>
+#endif // noexcept function types
+		          >::value>> {
+			template <typename F>
+			static int push(lua_State* L, F&& f) {
+				function_detail::select<false, true>(L, std::forward<F>(f));
+				return 1;
+			}
+		};
+
+		template <typename... Functions>
+		struct unqualified_pusher<overload_set<Functions...>> {
+			static int push(lua_State* L, overload_set<Functions...>&& set) {
+				using F = function_detail::overloaded_function<0, Functions...>;
+				function_detail::select_set_fx<false, false, F>(L, std::move(set.functions));
+				return 1;
+			}
+
+			static int push(lua_State* L, const overload_set<Functions...>& set) {
+				using F = function_detail::overloaded_function<0, Functions...>;
+				function_detail::select_set_fx<false, false, F>(L, set.functions);
+				return 1;
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<protect_t<T>> {
+			static int push(lua_State* L, protect_t<T>&& pw) {
+				lua_CFunction cf = call_detail::call_user<void, false, false, protect_t<T>, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<protect_t<T>>>(L, std::move(pw.value));
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+
+			static int push(lua_State* L, const protect_t<T>& pw) {
+				lua_CFunction cf = call_detail::call_user<void, false, false, protect_t<T>, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<protect_t<T>>>(L, pw.value);
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+		};
+
+		template <typename F, typename G>
+		struct unqualified_pusher<property_wrapper<F, G>> {
+			static int push(lua_State* L, property_wrapper<F, G>&& pw) {
+				if constexpr (std::is_void_v<F>) {
+					return stack::push(L, std::move(pw.write()));
+				}
+				else if constexpr (std::is_void_v<G>) {
+					return stack::push(L, std::move(pw.read()));
+				}
+				else {
+					return stack::push(L, overload(std::move(pw.read()), std::move(pw.write())));
+				}
+			}
+
+			static int push(lua_State* L, const property_wrapper<F, G>& pw) {
+				if constexpr (std::is_void_v<F>) {
+					return stack::push(L, pw.write);
+				}
+				else if constexpr (std::is_void_v<G>) {
+					return stack::push(L, pw.read);
+				}
+				else {
+					return stack::push(L, overload(pw.read, pw.write));
+				}
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<var_wrapper<T>> {
+			static int push(lua_State* L, var_wrapper<T>&& vw) {
+				return stack::push(L, std::move(vw.value()));
+			}
+			static int push(lua_State* L, const var_wrapper<T>& vw) {
+				return stack::push(L, vw.value());
+			}
+		};
+
+		template <typename... Functions>
+		struct unqualified_pusher<factory_wrapper<Functions...>> {
+			static int push(lua_State* L, const factory_wrapper<Functions...>& fw) {
+				using F = function_detail::overloaded_function<0, Functions...>;
+				function_detail::select_set_fx<false, false, F>(L, fw.functions);
+				return 1;
+			}
+
+			static int push(lua_State* L, factory_wrapper<Functions...>&& fw) {
+				using F = function_detail::overloaded_function<0, Functions...>;
+				function_detail::select_set_fx<false, false, F>(L, std::move(fw.functions));
+				return 1;
+			}
+
+			static int push(lua_State* L, const factory_wrapper<Functions...>& fw, function_detail::call_indicator) {
+				using F = function_detail::overloaded_function<1, Functions...>;
+				function_detail::select_set_fx<false, false, F>(L, fw.functions);
+				return 1;
+			}
+
+			static int push(lua_State* L, factory_wrapper<Functions...>&& fw, function_detail::call_indicator) {
+				using F = function_detail::overloaded_function<1, Functions...>;
+				function_detail::select_set_fx<false, false, F>(L, std::move(fw.functions));
+				return 1;
+			}
+		};
+
+		template <>
+		struct unqualified_pusher<no_construction> {
+			static int push(lua_State* L, no_construction) {
+				lua_CFunction cf = &function_detail::no_construction_error;
+				return stack::push(L, cf);
+			}
+
+			static int push(lua_State* L, no_construction c, function_detail::call_indicator) {
+				return push(L, c);
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<detail::tagged<T, no_construction>> {
+			static int push(lua_State* L, detail::tagged<T, no_construction>) {
+				lua_CFunction cf = &function_detail::no_construction_error;
+				return stack::push(L, cf);
+			}
+
+			static int push(lua_State* L, no_construction, function_detail::call_indicator) {
+				lua_CFunction cf = &function_detail::no_construction_error;
+				return stack::push(L, cf);
+			}
+		};
+
+		template <typename T, typename... Lists>
+		struct unqualified_pusher<detail::tagged<T, constructor_list<Lists...>>> {
+			static int push(lua_State* L, detail::tagged<T, constructor_list<Lists...>>) {
+				lua_CFunction cf = call_detail::construct<T, detail::default_safe_function_calls, true, Lists...>;
+				return stack::push(L, cf);
+			}
+
+			static int push(lua_State* L, constructor_list<Lists...>) {
+				lua_CFunction cf = call_detail::construct<T, detail::default_safe_function_calls, true, Lists...>;
+				return stack::push(L, cf);
+			}
+		};
+
+		template <typename L0, typename... Lists>
+		struct unqualified_pusher<constructor_list<L0, Lists...>> {
+			typedef constructor_list<L0, Lists...> cl_t;
+			static int push(lua_State* L, cl_t cl) {
+				typedef typename meta::bind_traits<L0>::return_type T;
+				return stack::push<detail::tagged<T, cl_t>>(L, cl);
+			}
+		};
+
+		template <typename T, typename... Fxs>
+		struct unqualified_pusher<detail::tagged<T, constructor_wrapper<Fxs...>>> {
+			static int push(lua_State* L, detail::tagged<T, constructor_wrapper<Fxs...>>&& c) {
+				return push(L, std::move(c.value()));
+			}
+
+			static int push(lua_State* L, const detail::tagged<T, const constructor_wrapper<Fxs...>>& c) {
+				return push(L, c.value());
+			}
+
+			static int push(lua_State* L, constructor_wrapper<Fxs...>&& c) {
+				lua_CFunction cf = call_detail::call_user<T, false, false, constructor_wrapper<Fxs...>, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<constructor_wrapper<Fxs...>>>(L, std::move(c));
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+
+			static int push(lua_State* L, const constructor_wrapper<Fxs...>& c) {
+				lua_CFunction cf = call_detail::call_user<T, false, false, constructor_wrapper<Fxs...>, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<constructor_wrapper<Fxs...>>>(L, c);
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+		};
+
+		template <typename F, typename... Fxs>
+		struct unqualified_pusher<constructor_wrapper<F, Fxs...>> {
+			static int push(lua_State* L, const constructor_wrapper<F, Fxs...>& c) {
+				typedef typename meta::bind_traits<F>::template arg_at<0> arg0;
+				typedef meta::unqualified_t<std::remove_pointer_t<arg0>> T;
+				return stack::push<detail::tagged<T, constructor_wrapper<F, Fxs...>>>(L, c);
+			}
+
+			static int push(lua_State* L, constructor_wrapper<F, Fxs...>&& c) {
+				typedef typename meta::bind_traits<F>::template arg_at<0> arg0;
+				typedef meta::unqualified_t<std::remove_pointer_t<arg0>> T;
+				return stack::push<detail::tagged<T, constructor_wrapper<F, Fxs...>>>(L, std::move(c));
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<detail::tagged<T, destructor_wrapper<void>>> {
+			static int push(lua_State* L, destructor_wrapper<void>) {
+				lua_CFunction cf = detail::usertype_alloc_destroy<T>;
+				return stack::push(L, cf);
+			}
+		};
+
+		template <typename T, typename Fx>
+		struct unqualified_pusher<detail::tagged<T, destructor_wrapper<Fx>>> {
+			static int push(lua_State* L, destructor_wrapper<Fx>&& c) {
+				lua_CFunction cf = call_detail::call_user<T, false, false, destructor_wrapper<Fx>, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<destructor_wrapper<Fx>>>(L, std::move(c));
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+
+			static int push(lua_State* L, const destructor_wrapper<Fx>& c) {
+				lua_CFunction cf = call_detail::call_user<T, false, false, destructor_wrapper<Fx>, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<destructor_wrapper<Fx>>>(L, c);
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+		};
+
+		template <typename Fx>
+		struct unqualified_pusher<destructor_wrapper<Fx>> {
+			static int push(lua_State* L, destructor_wrapper<Fx>&& c) {
+				lua_CFunction cf = call_detail::call_user<void, false, false, destructor_wrapper<Fx>, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<destructor_wrapper<Fx>>>(L, std::move(c));
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+
+			static int push(lua_State* L, const destructor_wrapper<Fx>& c) {
+				lua_CFunction cf = call_detail::call_user<void, false, false, destructor_wrapper<Fx>, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<destructor_wrapper<Fx>>>(L, c);
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+		};
+
+		template <typename F, typename... Policies>
+		struct unqualified_pusher<policy_wrapper<F, Policies...>> {
+			using P = policy_wrapper<F, Policies...>;
+
+			static int push(lua_State* L, const P& p) {
+				lua_CFunction cf = call_detail::call_user<void, false, false, P, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<P>>(L, p);
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+
+			static int push(lua_State* L, P&& p) {
+				lua_CFunction cf = call_detail::call_user<void, false, false, P, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<P>>(L, std::move(p));
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+		};
+
+		template <typename T, typename F, typename... Policies>
+		struct unqualified_pusher<detail::tagged<T, policy_wrapper<F, Policies...>>> {
+			using P = policy_wrapper<F, Policies...>;
+			using Tagged = detail::tagged<T, P>;
+
+			static int push(lua_State* L, const Tagged& p) {
+				lua_CFunction cf = call_detail::call_user<T, false, false, P, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<P>>(L, p.value());
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+
+			static int push(lua_State* L, Tagged&& p) {
+				lua_CFunction cf = call_detail::call_user<T, false, false, P, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<P>>(L, std::move(p.value()));
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<push_invoke_t<T>> {
+			static int push(lua_State* L, push_invoke_t<T>&& pi) {
+				if constexpr (std::is_invocable_v<std::add_rvalue_reference_t<T>, lua_State*>) {
+					return stack::push(L, std::move(pi.value())(L));
+				}
+				else {
+					return stack::push(L, std::move(pi.value())());
+				}
+			}
+
+			static int push(lua_State* L, const push_invoke_t<T>& pi) {
+				if constexpr (std::is_invocable_v<const T, lua_State*>) {
+					return stack::push(L, pi.value()(L));
+				}
+				else {
+					return stack::push(L, pi.value()());
+				}
+			}
+		};
+
+		namespace stack_detail {
+			template <typename Function, typename Handler>
+			bool check_function_pointer(lua_State* L, int index, Handler&& handler, record& tracking) noexcept {
+#if SOL_IS_ON(SOL_GET_FUNCTION_POINTER_UNSAFE_I_)
+				tracking.use(1);
+				bool success = lua_iscfunction(L, index) == 1;
+				if (success) {
+					// there must be at LEAST 2 upvalues; otherwise, we didn't serialize it.
+					const char* upvalue_name = lua_getupvalue(L, index, 2);
+					lua_pop(L, 1);
+					success = upvalue_name != nullptr;
+				}
+				if (!success) {
+					// expected type, actual type
+					handler(
+					     L, index, type::function, type_of(L, index), "type must be a Lua C Function gotten from a function pointer serialized by sol2");
+				}
+				return success;
+#else
+				(void)L;
+				(void)index;
+				(void)handler;
+				(void)tracking;
+				return false;
+#endif
+			}
+
+			template <typename Function>
+			Function* get_function_pointer(lua_State* L, int index, record& tracking) noexcept {
+#if SOL_IS_ON(SOL_GET_FUNCTION_POINTER_UNSAFE_I_)
+				tracking.use(1);
+				auto udata = stack::stack_detail::get_as_upvalues_using_function<Function*>(L, index);
+				Function* fx = udata.first;
+				return fx;
+#else
+				(void)L;
+				(void)index;
+				(void)tracking;
+				static_assert(meta::meta_detail::always_true<Function>::value,
+#if SOL_IS_DEFAULT_OFF(SOL_GET_FUNCTION_POINTER_UNSAFE_I_)
+				     "You are attempting to retrieve a function pointer type. "
+				     "This is inherently unsafe in sol2. In order to do this, you must turn on the "
+				     "SOL_GET_FUNCTION_POINTER_UNSAFE configuration macro, as detailed in the documentation. "
+				     "Please be careful!"
+#else
+				     "You are attempting to retrieve a function pointer type. "
+				     "You explicitly turned off the ability to do this by defining "
+				     "SOL_GET_FUNCTION_POINTER_UNSAFE or similar to be off. "
+				     "Please reconsider this!"
+#endif
+				);
+				return nullptr;
+#endif
+			}
+		} // namespace stack_detail
+	}      // namespace stack
+} // namespace sol
+
+#endif // SOL_FUNCTION_TYPES_HPP
diff --git a/extern/sol3/sol/function_types_core.hpp b/extern/sol3/sol/function_types_core.hpp
new file mode 100644
index 0000000000..138b2b518b
--- /dev/null
+++ b/extern/sol3/sol/function_types_core.hpp
@@ -0,0 +1,46 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_FUNCTION_TYPES_CORE_HPP
+#define SOL_FUNCTION_TYPES_CORE_HPP
+
+#include <sol/stack.hpp>
+#include <sol/wrapper.hpp>
+
+#include <memory>
+
+namespace sol { namespace function_detail {
+	template <typename Fx, int start = 1, bool is_yielding = false>
+	int call(lua_State* L) {
+		Fx& fx = stack::get<user<Fx>>(L, upvalue_index(start));
+		int nr = fx(L);
+		if (is_yielding) {
+			return lua_yield(L, nr);
+		}
+		else {
+			return nr;
+		}
+	}
+}} // namespace sol::function_detail
+
+#endif // SOL_FUNCTION_TYPES_CORE_HPP
diff --git a/extern/sol3/sol/function_types_overloaded.hpp b/extern/sol3/sol/function_types_overloaded.hpp
new file mode 100644
index 0000000000..8c8e5c1a55
--- /dev/null
+++ b/extern/sol3/sol/function_types_overloaded.hpp
@@ -0,0 +1,65 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_FUNCTION_TYPES_OVERLOAD_HPP
+#define SOL_FUNCTION_TYPES_OVERLOAD_HPP
+
+#include <sol/overload.hpp>
+#include <sol/call.hpp>
+#include <sol/function_types_core.hpp>
+
+namespace sol { namespace function_detail {
+	template <int start_skew, typename... Functions>
+	struct overloaded_function {
+		typedef std::tuple<Functions...> overload_list;
+		typedef std::make_index_sequence<sizeof...(Functions)> indices;
+		overload_list overloads;
+
+		overloaded_function(overload_list set) : overloads(std::move(set)) {
+		}
+
+		overloaded_function(Functions... fxs) : overloads(fxs...) {
+		}
+
+		template <typename Fx, std::size_t I, typename... R, typename... Args>
+		static int call(types<Fx>, meta::index_value<I>, types<R...>, types<Args...>, lua_State* L, int, int, overload_list& ol) {
+			auto& func = std::get<I>(ol);
+			int nr = call_detail::call_wrapped<void, true, false, start_skew>(L, func);
+			return nr;
+		}
+
+		struct on_success {
+			template <typename... Args>
+			int operator()(Args&&... args) const {
+				return call(std::forward<Args>(args)...);
+			}
+		};
+
+		int operator()(lua_State* L) {
+			on_success call_obj {};
+			return call_detail::overload_match<Functions...>(call_obj, L, 1 + start_skew, overloads);
+		}
+	};
+}} // namespace sol::function_detail
+
+#endif // SOL_FUNCTION_TYPES_OVERLOAD_HPP
\ No newline at end of file
diff --git a/extern/sol3/sol/function_types_stateful.hpp b/extern/sol3/sol/function_types_stateful.hpp
new file mode 100644
index 0000000000..45c97b1bc0
--- /dev/null
+++ b/extern/sol3/sol/function_types_stateful.hpp
@@ -0,0 +1,158 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_FUNCTION_TYPES_STATEFUL_HPP
+#define SOL_FUNCTION_TYPES_STATEFUL_HPP
+
+#include <sol/function_types_core.hpp>
+#include <sol/call.hpp>
+
+namespace sol { namespace function_detail {
+	template <typename Func, bool is_yielding, bool no_trampoline>
+	struct functor_function {
+		typedef std::decay_t<meta::unwrap_unqualified_t<Func>> function_type;
+		function_type invocation;
+
+		template <typename... Args>
+		functor_function(function_type f, Args&&... args) noexcept(std::is_nothrow_constructible_v<function_type, function_type, Args...>)
+		: invocation(std::move(f), std::forward<Args>(args)...) {
+		}
+
+		static int call(lua_State* L, functor_function& self) noexcept(noexcept(call_detail::call_wrapped<void, true, false>(L, self.invocation))) {
+			int nr = call_detail::call_wrapped<void, true, false>(L, self.invocation);
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L) noexcept(noexcept(call_detail::call_wrapped<void, true, false>(L, invocation))) {
+			if constexpr (no_trampoline) {
+				return call(L, *this);
+			}
+			else {
+				return detail::trampoline(L, &call, *this);
+			}
+		}
+	};
+
+	template <typename T, typename Function, bool is_yielding, bool no_trampoline>
+	struct member_function {
+		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
+		typedef meta::function_return_t<function_type> return_type;
+		typedef meta::function_args_t<function_type> args_lists;
+		using traits_type = meta::bind_traits<function_type>;
+		function_type invocation;
+		T member;
+
+		template <typename... Args>
+		member_function(function_type f, Args&&... args) noexcept(
+			std::is_nothrow_constructible_v<function_type, function_type>&& std::is_nothrow_constructible_v<T, Args...>)
+		: invocation(std::move(f)), member(std::forward<Args>(args)...) {
+		}
+
+		static int call(lua_State* L, member_function& self)
+#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			int nr = call_detail::call_wrapped<T, true, false, -1>(L, self.invocation, detail::unwrap(detail::deref(self.member)));
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			if constexpr (no_trampoline) {
+				return call(L, *this);
+			}
+			else {
+				return detail::trampoline(L, &call, *this);
+			}
+		}
+	};
+
+	template <typename T, typename Function, bool is_yielding, bool no_trampoline>
+	struct member_variable {
+		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
+		typedef typename meta::bind_traits<function_type>::return_type return_type;
+		typedef typename meta::bind_traits<function_type>::args_list args_lists;
+		function_type var;
+		T member;
+		typedef std::add_lvalue_reference_t<meta::unwrapped_t<std::remove_reference_t<decltype(detail::deref(member))>>> M;
+
+		template <typename... Args>
+		member_variable(function_type v, Args&&... args) noexcept(
+			std::is_nothrow_constructible_v<function_type, function_type>&& std::is_nothrow_constructible_v<T, Args...>)
+		: var(std::move(v)), member(std::forward<Args>(args)...) {
+		}
+
+		static int call(lua_State* L, member_variable& self) noexcept(std::is_nothrow_copy_assignable_v<T>) {
+			int nr;
+			{
+				M mem = detail::unwrap(detail::deref(self.member));
+				switch (lua_gettop(L)) {
+				case 0:
+					nr = call_detail::call_wrapped<T, true, false, -1>(L, self.var, mem);
+					break;
+				case 1:
+					nr = call_detail::call_wrapped<T, false, false, -1>(L, self.var, mem);
+					break;
+				default:
+					nr = luaL_error(L, "sol: incorrect number of arguments to member variable function");
+					break;
+				}
+			}
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L) noexcept(std::is_nothrow_copy_assignable_v<T>) {
+			if constexpr (no_trampoline) {
+				return call(L, *this);
+			}
+			else {
+				return detail::trampoline(L, &call, *this);
+			}
+		}
+	};
+}} // namespace sol::function_detail
+
+#endif // SOL_FUNCTION_TYPES_STATEFUL_HPP
diff --git a/extern/sol3/sol/function_types_stateless.hpp b/extern/sol3/sol/function_types_stateless.hpp
new file mode 100644
index 0000000000..672732fa04
--- /dev/null
+++ b/extern/sol3/sol/function_types_stateless.hpp
@@ -0,0 +1,385 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_FUNCTION_TYPES_STATELESS_HPP
+#define SOL_FUNCTION_TYPES_STATELESS_HPP
+
+#include <sol/stack.hpp>
+#include <sol/call.hpp>
+#include <sol/bind_traits.hpp>
+
+namespace sol { namespace function_detail {
+	template <typename Function>
+	struct upvalue_free_function {
+		using function_type = std::remove_pointer_t<std::decay_t<Function>>;
+		using traits_type = meta::bind_traits<function_type>;
+
+		static int real_call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			auto udata = stack::stack_detail::get_as_upvalues<function_type*>(L);
+			function_type* fx = udata.first;
+			return call_detail::call_wrapped<void, true, false>(L, fx);
+		}
+
+		template <bool is_yielding, bool no_trampoline>
+		static int call(lua_State* L) {
+			int nr;
+			if constexpr (no_trampoline) {
+				nr = real_call(L);
+			}
+			else {
+				nr = detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
+			}
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+	};
+
+	template <typename T, typename Function>
+	struct upvalue_member_function {
+		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
+		typedef lua_bind_traits<function_type> traits_type;
+
+		static int real_call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			// Layout:
+			// idx 1...n: verbatim data of member function pointer
+			// idx n + 1: is the object's void pointer
+			// We don't need to store the size, because the other side is templated
+			// with the same member function pointer type
+			function_type& memfx = stack::get<user<function_type>>(L, upvalue_index(2));
+			auto& item = *static_cast<T*>(stack::get<void*>(L, upvalue_index(3)));
+			return call_detail::call_wrapped<T, true, false, -1>(L, memfx, item);
+		}
+
+		template <bool is_yielding, bool no_trampoline>
+		static int call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			int nr;
+			if constexpr (no_trampoline) {
+				nr = real_call(L);
+			}
+			else {
+				nr = detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
+			}
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			return call(L);
+		}
+	};
+
+	template <typename T, typename Function>
+	struct upvalue_member_variable {
+		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
+		typedef lua_bind_traits<function_type> traits_type;
+
+		static int real_call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			// Layout:
+			// idx 1...n: verbatim data of member variable pointer
+			// idx n + 1: is the object's void pointer
+			// We don't need to store the size, because the other side is templated
+			// with the same member function pointer type
+			auto memberdata = stack::stack_detail::get_as_upvalues<function_type>(L);
+			auto objdata = stack::stack_detail::get_as_upvalues<T*>(L, memberdata.second);
+			auto& mem = *objdata.first;
+			function_type& var = memberdata.first;
+			switch (lua_gettop(L)) {
+			case 0:
+				return call_detail::call_wrapped<T, true, false, -1>(L, var, mem);
+			case 1:
+				return call_detail::call_wrapped<T, false, false, -1>(L, var, mem);
+			default:
+				return luaL_error(L, "sol: incorrect number of arguments to member variable function");
+			}
+		}
+
+		template <bool is_yielding, bool no_trampoline>
+		static int call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			int nr;
+			if constexpr (no_trampoline) {
+				nr = real_call(L);
+			}
+			else {
+				nr = detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
+			}
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			return call(L);
+		}
+	};
+
+	template <typename T, typename Function>
+	struct upvalue_member_variable<T, readonly_wrapper<Function>> {
+		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
+		typedef lua_bind_traits<function_type> traits_type;
+
+		static int real_call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			// Layout:
+			// idx 1...n: verbatim data of member variable pointer
+			// idx n + 1: is the object's void pointer
+			// We don't need to store the size, because the other side is templated
+			// with the same member function pointer type
+			auto memberdata = stack::stack_detail::get_as_upvalues<function_type>(L);
+			auto objdata = stack::stack_detail::get_as_upvalues<T*>(L, memberdata.second);
+			auto& mem = *objdata.first;
+			function_type& var = memberdata.first;
+			switch (lua_gettop(L)) {
+			case 0:
+				return call_detail::call_wrapped<T, true, false, -1>(L, var, mem);
+			default:
+				return luaL_error(L, "sol: incorrect number of arguments to member variable function");
+			}
+		}
+
+		template <bool is_yielding, bool no_trampoline>
+		static int call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			int nr;
+			if constexpr (no_trampoline) {
+				nr = real_call(L);
+			}
+			else {
+				nr = detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
+			}
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			return call(L);
+		}
+	};
+
+	template <typename T, typename Function>
+	struct upvalue_this_member_function {
+		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
+		typedef lua_bind_traits<function_type> traits_type;
+
+		static int real_call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			// Layout:
+			// idx 1...n: verbatim data of member variable pointer
+			function_type& memfx = stack::get<user<function_type>>(L, upvalue_index(2));
+			return call_detail::call_wrapped<T, false, false>(L, memfx);
+		}
+
+		template <bool is_yielding, bool no_trampoline>
+		static int call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			int nr;
+			if constexpr (no_trampoline) {
+				nr = real_call(L);
+			}
+			else {
+				nr = detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
+			}
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			return call(L);
+		}
+	};
+
+	template <typename T, typename Function>
+	struct upvalue_this_member_variable {
+		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
+
+		static int real_call(lua_State* L) noexcept(std::is_nothrow_copy_assignable_v<T>) {
+			// Layout:
+			// idx 1...n: verbatim data of member variable pointer
+			auto memberdata = stack::stack_detail::get_as_upvalues<function_type>(L);
+			function_type& var = memberdata.first;
+			switch (lua_gettop(L)) {
+			case 1:
+				return call_detail::call_wrapped<T, true, false>(L, var);
+			case 2:
+				return call_detail::call_wrapped<T, false, false>(L, var);
+			default:
+				return luaL_error(L, "sol: incorrect number of arguments to member variable function");
+			}
+		}
+
+		template <bool is_yielding, bool no_trampoline>
+		static int call(lua_State* L) noexcept(std::is_nothrow_copy_assignable_v<T>) {
+			int nr;
+			if constexpr (no_trampoline) {
+				nr = real_call(L);
+			}
+			else {
+				nr = detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
+			}
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L) noexcept(std::is_nothrow_copy_assignable_v<T>) {
+			return call(L);
+		}
+	};
+
+	template <typename T, typename Function>
+	struct upvalue_this_member_variable<T, readonly_wrapper<Function>> {
+		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
+		typedef lua_bind_traits<function_type> traits_type;
+
+		static int real_call(lua_State* L) noexcept(std::is_nothrow_copy_assignable_v<T>) {
+			// Layout:
+			// idx 1...n: verbatim data of member variable pointer
+			auto memberdata = stack::stack_detail::get_as_upvalues<function_type>(L);
+			function_type& var = memberdata.first;
+			switch (lua_gettop(L)) {
+			case 1:
+				return call_detail::call_wrapped<T, true, false>(L, var);
+			default:
+				return luaL_error(L, "sol: incorrect number of arguments to member variable function");
+			}
+		}
+
+		template <bool is_yielding, bool no_trampoline>
+		static int call(lua_State* L) noexcept(std::is_nothrow_copy_assignable_v<T>) {
+			int nr;
+			if constexpr (no_trampoline) {
+				nr = real_call(L);
+			}
+			else {
+				nr = detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
+			}
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L) noexcept(std::is_nothrow_copy_assignable_v<T>) {
+			return call(L);
+		}
+	};
+}} // namespace sol::function_detail
+
+#endif // SOL_FUNCTION_TYPES_STATELESS_HPP
diff --git a/extern/sol3/sol/function_types_templated.hpp b/extern/sol3/sol/function_types_templated.hpp
new file mode 100644
index 0000000000..2cc892a93c
--- /dev/null
+++ b/extern/sol3/sol/function_types_templated.hpp
@@ -0,0 +1,154 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_FUNCTION_TYPES_TEMPLATED_HPP
+#define SOL_FUNCTION_TYPES_TEMPLATED_HPP
+
+#include <sol/call.hpp>
+
+namespace sol {
+	namespace function_detail {
+		template <typename F, F fx>
+		inline int call_wrapper_variable(std::false_type, lua_State* L) {
+			typedef meta::bind_traits<meta::unqualified_t<F>> traits_type;
+			typedef typename traits_type::args_list args_list;
+			typedef meta::tuple_types<typename traits_type::return_type> return_type;
+			return stack::call_into_lua(return_type(), args_list(), L, 1, fx);
+		}
+
+		template <typename R, typename V, V, typename T>
+		inline int call_set_assignable(std::false_type, T&&, lua_State* L) {
+			return luaL_error(L, "cannot write to this type: copy assignment/constructor not available");
+		}
+
+		template <typename R, typename V, V variable, typename T>
+		inline int call_set_assignable(std::true_type, lua_State* L, T&& mem) {
+			(mem.*variable) = stack::get<R>(L, 2);
+			return 0;
+		}
+
+		template <typename R, typename V, V, typename T>
+		inline int call_set_variable(std::false_type, lua_State* L, T&&) {
+			return luaL_error(L, "cannot write to a const variable");
+		}
+
+		template <typename R, typename V, V variable, typename T>
+		inline int call_set_variable(std::true_type, lua_State* L, T&& mem) {
+			return call_set_assignable<R, V, variable>(std::is_assignable<std::add_lvalue_reference_t<R>, R>(), L, std::forward<T>(mem));
+		}
+
+		template <typename V, V variable>
+		inline int call_wrapper_variable(std::true_type, lua_State* L) {
+			typedef meta::bind_traits<meta::unqualified_t<V>> traits_type;
+			typedef typename traits_type::object_type T;
+			typedef typename traits_type::return_type R;
+			auto& mem = stack::get<T>(L, 1);
+			switch (lua_gettop(L)) {
+			case 1: {
+				decltype(auto) r = (mem.*variable);
+				stack::push_reference(L, std::forward<decltype(r)>(r));
+				return 1;
+			}
+			case 2:
+				return call_set_variable<R, V, variable>(meta::neg<std::is_const<R>>(), L, mem);
+			default:
+				return luaL_error(L, "incorrect number of arguments to member variable function call");
+			}
+		}
+
+		template <typename F, F fx>
+		inline int call_wrapper_function(std::false_type, lua_State* L) {
+			return call_wrapper_variable<F, fx>(std::is_member_object_pointer<F>(), L);
+		}
+
+		template <typename F, F fx>
+		inline int call_wrapper_function(std::true_type, lua_State* L) {
+			return call_detail::call_wrapped<void, false, false>(L, fx);
+		}
+
+		template <typename F, F fx>
+		int call_wrapper_entry(lua_State* L) noexcept(meta::bind_traits<F>::is_noexcept) {
+			return call_wrapper_function<F, fx>(std::is_member_function_pointer<meta::unqualified_t<F>>(), L);
+		}
+
+		template <typename... Fxs>
+		struct c_call_matcher {
+			template <typename Fx, std::size_t I, typename R, typename... Args>
+			int operator()(types<Fx>, meta::index_value<I>, types<R>, types<Args...>, lua_State* L, int, int) const {
+				typedef meta::at_in_pack_t<I, Fxs...> target;
+				return target::call(L);
+			}
+		};
+
+		template <typename F, F fx>
+		inline int c_call_raw(std::true_type, lua_State* L) {
+			return fx(L);
+		}
+
+		template <typename F, F fx>
+		inline int c_call_raw(std::false_type, lua_State* L) {
+#ifdef __clang__
+			return detail::trampoline(L, function_detail::call_wrapper_entry<F, fx>);
+#else
+			return detail::typed_static_trampoline<decltype(&function_detail::call_wrapper_entry<F, fx>), (&function_detail::call_wrapper_entry<F, fx>)>(L);
+#endif // fuck you clang :c
+		}
+
+	} // namespace function_detail
+
+	template <typename F, F fx>
+	inline int c_call(lua_State* L) {
+		typedef meta::unqualified_t<F> Fu;
+		typedef std::integral_constant<bool,
+		     std::is_same<Fu, lua_CFunction>::value
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_)
+		          || std::is_same<Fu, detail::lua_CFunction_noexcept>::value
+#endif
+		     >
+		     is_raw;
+		return function_detail::c_call_raw<F, fx>(is_raw(), L);
+	}
+
+	template <typename F, F f>
+	struct wrap {
+		typedef F type;
+
+		static int call(lua_State* L) noexcept(noexcept(c_call<type, f>(L))) {
+			return c_call<type, f>(L);
+		}
+	};
+
+	template <typename... Fxs>
+	inline int c_call(lua_State* L) {
+		if constexpr (sizeof...(Fxs) < 2) {
+			using target = meta::at_in_pack_t<0, Fxs...>;
+			return target::call(L);
+		}
+		else {
+			return call_detail::overload_match_arity<typename Fxs::type...>(function_detail::c_call_matcher<Fxs...>(), L, lua_gettop(L), 1);
+		}
+	}
+
+} // namespace sol
+
+#endif // SOL_FUNCTION_TYPES_TEMPLATED_HPP
diff --git a/extern/sol3/sol/in_place.hpp b/extern/sol3/sol/in_place.hpp
new file mode 100644
index 0000000000..6971629671
--- /dev/null
+++ b/extern/sol3/sol/in_place.hpp
@@ -0,0 +1,48 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_IN_PLACE_HPP
+#define SOL_IN_PLACE_HPP
+
+#include <cstddef>
+#include <utility>
+
+namespace sol {
+
+	using in_place_t = std::in_place_t;
+	constexpr std::in_place_t in_place {};
+	constexpr std::in_place_t in_place_of {};
+
+	template <typename T>
+	using in_place_type_t = std::in_place_type_t<T>;
+	template <typename T>
+	constexpr std::in_place_type_t<T> in_place_type {};
+
+	template <size_t I>
+	using in_place_index_t = std::in_place_index_t<I>;
+	template <size_t I>
+	constexpr in_place_index_t<I> in_place_index {};
+
+} // namespace sol
+
+#endif // SOL_IN_PLACE_HPP
diff --git a/extern/sol3/sol/inheritance.hpp b/extern/sol3/sol/inheritance.hpp
new file mode 100644
index 0000000000..88ba6fa81b
--- /dev/null
+++ b/extern/sol3/sol/inheritance.hpp
@@ -0,0 +1,195 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_INHERITANCE_HPP
+#define SOL_INHERITANCE_HPP
+
+#include <sol/types.hpp>
+#include <sol/usertype_traits.hpp>
+#include <sol/unique_usertype_traits.hpp>
+
+namespace sol {
+	template <typename... Args>
+	struct base_list { };
+	template <typename... Args>
+	using bases = base_list<Args...>;
+
+	typedef bases<> base_classes_tag;
+	const auto base_classes = base_classes_tag();
+
+	template <typename... Args>
+	struct is_to_stringable<base_list<Args...>> : std::false_type { };
+
+	namespace detail {
+
+		inline decltype(auto) base_class_check_key() {
+			static const auto& key = "class_check";
+			return key;
+		}
+
+		inline decltype(auto) base_class_cast_key() {
+			static const auto& key = "class_cast";
+			return key;
+		}
+
+		inline decltype(auto) base_class_index_propogation_key() {
+			static const auto& key = u8"\xF0\x9F\x8C\xB2.index";
+			return key;
+		}
+
+		inline decltype(auto) base_class_new_index_propogation_key() {
+			static const auto& key = u8"\xF0\x9F\x8C\xB2.new_index";
+			return key;
+		}
+
+		template <typename T>
+		struct inheritance {
+			typedef typename base<T>::type bases_t;
+
+			static bool type_check_bases(types<>, const string_view&) {
+				return false;
+			}
+
+			template <typename Base, typename... Args>
+			static bool type_check_bases(types<Base, Args...>, const string_view& ti) {
+				return ti == usertype_traits<Base>::qualified_name() || type_check_bases(types<Args...>(), ti);
+			}
+
+			static bool type_check(const string_view& ti) {
+				return ti == usertype_traits<T>::qualified_name() || type_check_bases(bases_t(), ti);
+			}
+
+			template <typename... Bases>
+			static bool type_check_with(const string_view& ti) {
+				return ti == usertype_traits<T>::qualified_name() || type_check_bases(types<Bases...>(), ti);
+			}
+
+			static void* type_cast_bases(types<>, T*, const string_view&) {
+				return nullptr;
+			}
+
+			template <typename Base, typename... Args>
+			static void* type_cast_bases(types<Base, Args...>, T* data, const string_view& ti) {
+				// Make sure to convert to T first, and then dynamic cast to the proper type
+				return ti != usertype_traits<Base>::qualified_name() ? type_cast_bases(types<Args...>(), data, ti)
+				                                                     : static_cast<void*>(static_cast<Base*>(data));
+			}
+
+			static void* type_cast(void* voiddata, const string_view& ti) {
+				T* data = static_cast<T*>(voiddata);
+				return static_cast<void*>(ti != usertype_traits<T>::qualified_name() ? type_cast_bases(bases_t(), data, ti) : data);
+			}
+
+			template <typename... Bases>
+			static void* type_cast_with(void* voiddata, const string_view& ti) {
+				T* data = static_cast<T*>(voiddata);
+				return static_cast<void*>(ti != usertype_traits<T>::qualified_name() ? type_cast_bases(types<Bases...>(), data, ti) : data);
+			}
+
+			template <typename U>
+			static bool type_unique_cast_bases(types<>, void*, void*, const string_view&) {
+				return 0;
+			}
+
+			template <typename U, typename Base, typename... Args>
+			static int type_unique_cast_bases(types<Base, Args...>, void* source_data, void* target_data, const string_view& ti) {
+				using uu_traits = unique_usertype_traits<U>;
+				using base_ptr = typename uu_traits::template rebind_actual_type<Base>;
+				string_view base_ti = usertype_traits<Base>::qualified_name();
+				if (base_ti == ti) {
+					if (target_data != nullptr) {
+						U* source = static_cast<U*>(source_data);
+						base_ptr* target = static_cast<base_ptr*>(target_data);
+						// perform proper derived -> base conversion
+						*target = *source;
+					}
+					return 2;
+				}
+				return type_unique_cast_bases<U>(types<Args...>(), source_data, target_data, ti);
+			}
+
+			template <typename U>
+			static int type_unique_cast(void* source_data, void* target_data, const string_view& ti, const string_view& rebind_ti) {
+				if constexpr (is_actual_type_rebindable_for_v<U>) {
+					using rebound_actual_type = unique_usertype_rebind_actual_t<U>;
+					using maybe_bases_or_empty = meta::conditional_t<std::is_void_v<rebound_actual_type>, types<>, bases_t>;
+					string_view this_rebind_ti = usertype_traits<rebound_actual_type>::qualified_name();
+					if (rebind_ti != this_rebind_ti) {
+						// this is not even of the same unique type
+						return 0;
+					}
+					string_view this_ti = usertype_traits<T>::qualified_name();
+					if (ti == this_ti) {
+						// direct match, return 1
+						return 1;
+					}
+					return type_unique_cast_bases<U>(maybe_bases_or_empty(), source_data, target_data, ti);
+				}
+				else {
+					(void)rebind_ti;
+					string_view this_ti = usertype_traits<T>::qualified_name();
+					if (ti == this_ti) {
+						// direct match, return 1
+						return 1;
+					}
+					return type_unique_cast_bases<U>(types<>(), source_data, target_data, ti);
+				}
+			}
+
+			template <typename U, typename... Bases>
+			static int type_unique_cast_with(void* source_data, void* target_data, const string_view& ti, const string_view& rebind_ti) {
+				using uc_bases_t = types<Bases...>;
+				if constexpr (is_actual_type_rebindable_for_v<U>) {
+					using rebound_actual_type = unique_usertype_rebind_actual_t<U>;
+					using cond_bases_t = meta::conditional_t<std::is_void_v<rebound_actual_type>, types<>, uc_bases_t>;
+					string_view this_rebind_ti = usertype_traits<rebound_actual_type>::qualified_name();
+					if (rebind_ti != this_rebind_ti) {
+						// this is not even of the same unique type
+						return 0;
+					}
+					string_view this_ti = usertype_traits<T>::qualified_name();
+					if (ti == this_ti) {
+						// direct match, return 1
+						return 1;
+					}
+					return type_unique_cast_bases<U>(cond_bases_t(), source_data, target_data, ti);
+				}
+				else {
+					(void)rebind_ti;
+					string_view this_ti = usertype_traits<T>::qualified_name();
+					if (ti == this_ti) {
+						// direct match, return 1
+						return 1;
+					}
+					return type_unique_cast_bases<U>(types<>(), source_data, target_data, ti);
+				}
+			}
+		};
+
+		using inheritance_check_function = decltype(&inheritance<void>::type_check);
+		using inheritance_cast_function = decltype(&inheritance<void>::type_cast);
+		using inheritance_unique_cast_function = decltype(&inheritance<void>::type_unique_cast<void>);
+	} // namespace detail
+} // namespace sol
+
+#endif // SOL_INHERITANCE_HPP
diff --git a/extern/sol3/sol/load_result.hpp b/extern/sol3/sol/load_result.hpp
new file mode 100644
index 0000000000..4bafd3ee32
--- /dev/null
+++ b/extern/sol3/sol/load_result.hpp
@@ -0,0 +1,150 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_LOAD_RESULT_HPP
+#define SOL_LOAD_RESULT_HPP
+
+#include <sol/stack.hpp>
+#include <sol/function.hpp>
+#include <sol/proxy_base.hpp>
+#include <cstdint>
+
+namespace sol {
+	struct load_result : public proxy_base<load_result> {
+	private:
+		lua_State* L;
+		int index;
+		int returncount;
+		int popcount;
+		load_status err;
+
+	public:
+		load_result() noexcept = default;
+		load_result(lua_State* Ls, int stackindex = -1, int retnum = 0, int popnum = 0, load_status lerr = load_status::ok) noexcept
+		: L(Ls), index(stackindex), returncount(retnum), popcount(popnum), err(lerr) {
+		}
+
+		// We do not want anyone to copy these around willy-nilly
+		// Will likely break people, but also will probably get rid of quiet bugs that have
+		// been lurking. (E.g., Vanilla Lua will just quietly discard over-pops and under-pops:
+		// LuaJIT and other Lua engines will implode and segfault at random later times.)
+		load_result(const load_result&) = delete;
+		load_result& operator=(const load_result&) = delete;
+
+		load_result(load_result&& o) noexcept : L(o.L), index(o.index), returncount(o.returncount), popcount(o.popcount), err(o.err) {
+			// Must be manual, otherwise destructor will screw us
+			// return count being 0 is enough to keep things clean
+			// but we will be thorough
+			o.L = nullptr;
+			o.index = 0;
+			o.returncount = 0;
+			o.popcount = 0;
+			o.err = load_status::syntax;
+		}
+		load_result& operator=(load_result&& o) noexcept {
+			L = o.L;
+			index = o.index;
+			returncount = o.returncount;
+			popcount = o.popcount;
+			err = o.err;
+			// Must be manual, otherwise destructor will screw us
+			// return count being 0 is enough to keep things clean
+			// but we will be thorough
+			o.L = nullptr;
+			o.index = 0;
+			o.returncount = 0;
+			o.popcount = 0;
+			o.err = load_status::syntax;
+			return *this;
+		}
+
+		load_status status() const noexcept {
+			return err;
+		}
+
+		bool valid() const noexcept {
+			return status() == load_status::ok;
+		}
+
+		template <typename T>
+		T get() const {
+			using UT = meta::unqualified_t<T>;
+			if constexpr (meta::is_optional_v<UT>) {
+				using ValueType = typename UT::value_type;
+				if constexpr (std::is_same_v<ValueType, error>) {
+					if (valid()) {
+						return UT(nullopt);
+					}
+					return error(detail::direct_error, stack::get<std::string>(L, index));
+				}
+				else {
+					if (!valid()) {
+						return UT(nullopt);
+					}
+					return stack::get<UT>(L, index);
+				}
+			}
+			else {
+				if constexpr (std::is_same_v<T, error>) {
+#if SOL_IS_ON(SOL_SAFE_PROXIES_I_)
+					if (valid()) {
+						type_panic_c_str(L, index, type_of(L, index), type::none, "expecting an error type (a string, from Lua)");
+					}
+#endif // Check proxy type's safety
+					return error(detail::direct_error, stack::get<std::string>(L, index));
+				}
+				else {
+#if SOL_IS_ON(SOL_SAFE_PROXIES_I_)
+					if (!valid()) {
+						type_panic_c_str(L, index, type_of(L, index), type::none);
+					}
+#endif // Check proxy type's safety
+					return stack::get<T>(L, index);
+				}
+			}
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) call(Args&&... args) {
+			return get<protected_function>().template call<Ret...>(std::forward<Args>(args)...);
+		}
+
+		template <typename... Args>
+		decltype(auto) operator()(Args&&... args) {
+			return call<>(std::forward<Args>(args)...);
+		}
+
+		lua_State* lua_state() const noexcept {
+			return L;
+		};
+		int stack_index() const noexcept {
+			return index;
+		};
+
+		~load_result() {
+			stack::remove(L, index, popcount);
+		}
+	};
+} // namespace sol
+
+#endif // SOL_LOAD_RESULT_HPP
diff --git a/extern/sol3/sol/lua_table.hpp b/extern/sol3/sol/lua_table.hpp
new file mode 100644
index 0000000000..05c5eb85a8
--- /dev/null
+++ b/extern/sol3/sol/lua_table.hpp
@@ -0,0 +1,95 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_LUA_TABLE_HPP
+#define SOL_LUA_TABLE_HPP
+
+#include <sol/table_core.hpp>
+
+namespace sol {
+
+	template <typename ref_t>
+	struct basic_lua_table : basic_table_core<false, ref_t> {
+	private:
+		using base_t = basic_table_core<false, ref_t>;
+
+		friend class state;
+		friend class state_view;
+
+	public:
+		using base_t::lua_state;
+
+		basic_lua_table() noexcept = default;
+		basic_lua_table(const basic_lua_table&) = default;
+		basic_lua_table(basic_lua_table&&) = default;
+		basic_lua_table& operator=(const basic_lua_table&) = default;
+		basic_lua_table& operator=(basic_lua_table&&) = default;
+		basic_lua_table(const stack_reference& r) : basic_lua_table(r.lua_state(), r.stack_index()) {
+		}
+		basic_lua_table(stack_reference&& r) : basic_lua_table(r.lua_state(), r.stack_index()) {
+		}
+		template <typename T, meta::enable_any<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_lua_table(lua_State* L, T&& r) : base_t(L, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_lua_table>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		basic_lua_table(lua_State* L, const new_table& nt) : base_t(L, nt) {
+			if (!is_stack_based<meta::unqualified_t<ref_t>>::value) {
+				lua_pop(L, 1);
+			}
+		}
+		basic_lua_table(lua_State* L, int index = -1) : base_t(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			constructor_handler handler {};
+			stack::check<basic_lua_table>(L, index, handler);
+#endif // Safety
+		}
+		basic_lua_table(lua_State* L, ref_index index) : base_t(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_lua_table>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		template <typename T,
+		     meta::enable<meta::neg<meta::any_same<meta::unqualified_t<T>, basic_lua_table>>, meta::neg<std::is_same<ref_t, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_lua_table(T&& r) noexcept : basic_lua_table(detail::no_safety, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			if (!is_table<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				constructor_handler handler {};
+				stack::check<basic_lua_table>(lua_state(), -1, handler);
+			}
+#endif // Safety
+		}
+		basic_lua_table(lua_nil_t r) noexcept : basic_lua_table(detail::no_safety, r) {
+		}
+	};
+
+} // namespace sol
+
+#endif // SOL_LUA_TABLE_HPP
diff --git a/extern/sol3/sol/lua_value.hpp b/extern/sol3/sol/lua_value.hpp
new file mode 100644
index 0000000000..b2b8b6b119
--- /dev/null
+++ b/extern/sol3/sol/lua_value.hpp
@@ -0,0 +1,162 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_LUA_VALUE_HPP
+#define SOL_LUA_VALUE_HPP
+
+#include <sol/stack.hpp>
+#include <sol/reference.hpp>
+#include <sol/make_reference.hpp>
+
+namespace sol {
+	struct lua_value {
+	public:
+		struct arr : detail::ebco<std::initializer_list<lua_value>> {
+		private:
+			using base_t = detail::ebco<std::initializer_list<lua_value>>;
+
+		public:
+			using base_t::base_t;
+		};
+
+	private:
+		template <typename T>
+		using is_reference_or_lua_value_init_list
+		     = meta::any<meta::is_specialization_of<T, std::initializer_list>, std::is_same<T, reference>, std::is_same<T, arr>>;
+
+		template <typename T>
+		using is_lua_value_single_constructible = meta::any<std::is_same<T, lua_value>, is_reference_or_lua_value_init_list<T>>;
+
+		static lua_State*& thread_local_lua_state() {
+#if SOL_IS_ON(SOL_USE_THREAD_LOCAL_I_)
+			static thread_local lua_State* L = nullptr;
+#else
+			static lua_State* L = nullptr;
+#endif
+			return L;
+		}
+
+		reference ref_value;
+
+	public:
+		static void set_lua_state(lua_State* L) {
+			thread_local_lua_state() = L;
+		}
+
+		template <typename T, meta::disable<is_reference_or_lua_value_init_list<meta::unqualified_t<T>>> = meta::enabler>
+		lua_value(lua_State* L_, T&& value) : lua_value(((set_lua_state(L_)), std::forward<T>(value))) {
+		}
+
+		template <typename T, meta::disable<is_lua_value_single_constructible<meta::unqualified_t<T>>> = meta::enabler>
+		lua_value(T&& value) : ref_value(make_reference(thread_local_lua_state(), std::forward<T>(value))) {
+		}
+
+		lua_value(lua_State* L_, std::initializer_list<std::pair<lua_value, lua_value>> il)
+		: lua_value([&L_, &il]() {
+			set_lua_state(L_);
+			return std::move(il);
+		}()) {
+		}
+
+		lua_value(std::initializer_list<std::pair<lua_value, lua_value>> il) : ref_value(make_reference(thread_local_lua_state(), std::move(il))) {
+		}
+
+		lua_value(lua_State* L_, arr il)
+		: lua_value([&L_, &il]() {
+			set_lua_state(L_);
+			return std::move(il);
+		}()) {
+		}
+
+		lua_value(arr il) : ref_value(make_reference(thread_local_lua_state(), std::move(il.value()))) {
+		}
+
+		lua_value(lua_State* L_, reference r)
+		: lua_value([&L_, &r]() {
+			set_lua_state(L_);
+			return std::move(r);
+		}()) {
+		}
+
+		lua_value(reference r) : ref_value(std::move(r)) {
+		}
+
+		lua_value(const lua_value&) noexcept = default;
+		lua_value(lua_value&&) = default;
+		lua_value& operator=(const lua_value&) = default;
+		lua_value& operator=(lua_value&&) = default;
+
+		const reference& value() const& {
+			return ref_value;
+		}
+
+		reference& value() & {
+			return ref_value;
+		}
+
+		reference&& value() && {
+			return std::move(ref_value);
+		}
+
+		template <typename T>
+		decltype(auto) as() const {
+			ref_value.push();
+			return stack::pop<T>(ref_value.lua_state());
+		}
+
+		template <typename T>
+		bool is() const {
+			int r = ref_value.registry_index();
+			if (r == LUA_REFNIL)
+				return meta::any_same<meta::unqualified_t<T>, lua_nil_t, nullopt_t, std::nullptr_t>::value ? true : false;
+			if (r == LUA_NOREF)
+				return false;
+			auto pp = stack::push_pop(ref_value);
+			return stack::check<T>(ref_value.lua_state(), -1, &no_panic);
+		}
+	};
+
+	using array_value = typename lua_value::arr;
+
+	namespace stack {
+		template <>
+		struct unqualified_pusher<lua_value> {
+			static int push(lua_State* L, const lua_value& lv) {
+				return stack::push(L, lv.value());
+			}
+
+			static int push(lua_State* L, lua_value&& lv) {
+				return stack::push(L, std::move(lv).value());
+			}
+		};
+
+		template <>
+		struct unqualified_getter<lua_value> {
+			static lua_value get(lua_State* L, int index, record& tracking) {
+				return lua_value(L, stack::get<reference>(L, index, tracking));
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+#endif // SOL_LUA_VALUE_HPP
diff --git a/extern/sol3/sol/make_reference.hpp b/extern/sol3/sol/make_reference.hpp
new file mode 100644
index 0000000000..6b13b1eac4
--- /dev/null
+++ b/extern/sol3/sol/make_reference.hpp
@@ -0,0 +1,74 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_MAKE_REFERENCE_HPP
+#define SOL_MAKE_REFERENCE_HPP
+
+#include <sol/reference.hpp>
+#include <sol/stack.hpp>
+
+namespace sol {
+
+	template <typename R = reference, bool should_pop = !is_stack_based_v<R>, typename T>
+	R make_reference(lua_State* L, T&& value) {
+		int backpedal = stack::push(L, std::forward<T>(value));
+		R r = stack::get<R>(L, -backpedal);
+		if (should_pop) {
+			lua_pop(L, backpedal);
+		}
+		return r;
+	}
+
+	template <typename T, typename R = reference, bool should_pop = !is_stack_based_v<R>, typename... Args>
+	R make_reference(lua_State* L, Args&&... args) {
+		int backpedal = stack::push<T>(L, std::forward<Args>(args)...);
+		R r = stack::get<R>(L, -backpedal);
+		if (should_pop) {
+			lua_pop(L, backpedal);
+		}
+		return r;
+	}
+
+	template <typename R = reference, bool should_pop = !is_stack_based_v<R>, typename T>
+	R make_reference_userdata(lua_State* L, T&& value) {
+		int backpedal = stack::push_userdata(L, std::forward<T>(value));
+		R r = stack::get<R>(L, -backpedal);
+		if (should_pop) {
+			lua_pop(L, backpedal);
+		}
+		return r;
+	}
+
+	template <typename T, typename R = reference, bool should_pop = !is_stack_based_v<R>, typename... Args>
+	R make_reference_userdata(lua_State* L, Args&&... args) {
+		int backpedal = stack::push_userdata<T>(L, std::forward<Args>(args)...);
+		R r = stack::get<R>(L, -backpedal);
+		if (should_pop) {
+			lua_pop(L, backpedal);
+		}
+		return r;
+	}
+
+} // namespace sol
+
+#endif // SOL_MAKE_REFERENCE_HPP
diff --git a/extern/sol3/sol/metatable.hpp b/extern/sol3/sol/metatable.hpp
new file mode 100644
index 0000000000..7812129360
--- /dev/null
+++ b/extern/sol3/sol/metatable.hpp
@@ -0,0 +1,203 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_METATABLE_HPP
+#define SOL_METATABLE_HPP
+
+#include <sol/table_core.hpp>
+#include <sol/usertype.hpp>
+
+namespace sol {
+
+	template <typename base_type>
+	class basic_metatable : public basic_table<base_type> {
+		typedef basic_table<base_type> base_t;
+		friend class state;
+		friend class state_view;
+
+	protected:
+		basic_metatable(detail::no_safety_tag, lua_nil_t n) : base_t(n) {
+		}
+		basic_metatable(detail::no_safety_tag, lua_State* L, int index) : base_t(L, index) {
+		}
+		basic_metatable(detail::no_safety_tag, lua_State* L, ref_index index) : base_t(L, index) {
+		}
+		template <typename T,
+		     meta::enable<meta::neg<meta::any_same<meta::unqualified_t<T>, basic_metatable>>, meta::neg<std::is_same<base_type, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_metatable(detail::no_safety_tag, T&& r) noexcept : base_t(std::forward<T>(r)) {
+		}
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_metatable(detail::no_safety_tag, lua_State* L, T&& r) noexcept : base_t(L, std::forward<T>(r)) {
+		}
+
+		template <typename R, typename... Args, typename Fx, typename Key, typename = std::invoke_result_t<Fx, Args...>>
+		void set_fx(types<R(Args...)>, Key&& key, Fx&& fx) {
+			set_resolved_function<R(Args...)>(std::forward<Key>(key), std::forward<Fx>(fx));
+		}
+
+		template <typename Fx, typename Key, meta::enable<meta::is_specialization_of<meta::unqualified_t<Fx>, overload_set>> = meta::enabler>
+		void set_fx(types<>, Key&& key, Fx&& fx) {
+			set(std::forward<Key>(key), std::forward<Fx>(fx));
+		}
+
+		template <typename Fx, typename Key, typename... Args,
+		     meta::disable<meta::is_specialization_of<meta::unqualified_t<Fx>, overload_set>> = meta::enabler>
+		void set_fx(types<>, Key&& key, Fx&& fx, Args&&... args) {
+			set(std::forward<Key>(key), as_function_reference(std::forward<Fx>(fx), std::forward<Args>(args)...));
+		}
+
+		template <typename... Sig, typename... Args, typename Key>
+		void set_resolved_function(Key&& key, Args&&... args) {
+			set(std::forward<Key>(key), as_function_reference<function_sig<Sig...>>(std::forward<Args>(args)...));
+		}
+
+	public:
+		using base_t::lua_state;
+
+		basic_metatable() noexcept = default;
+		basic_metatable(const basic_metatable&) = default;
+		basic_metatable(basic_metatable&&) = default;
+		basic_metatable& operator=(const basic_metatable&) = default;
+		basic_metatable& operator=(basic_metatable&&) = default;
+		basic_metatable(const stack_reference& r) : basic_metatable(r.lua_state(), r.stack_index()) {
+		}
+		basic_metatable(stack_reference&& r) : basic_metatable(r.lua_state(), r.stack_index()) {
+		}
+		template <typename T, meta::enable_any<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_metatable(lua_State* L, T&& r) : base_t(L, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_metatable>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		basic_metatable(lua_State* L, int index = -1) : basic_metatable(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			constructor_handler handler {};
+			stack::check<basic_metatable>(L, index, handler);
+#endif // Safety
+		}
+		basic_metatable(lua_State* L, ref_index index) : basic_metatable(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_metatable>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		template <typename T,
+		     meta::enable<meta::neg<meta::any_same<meta::unqualified_t<T>, basic_metatable>>, meta::neg<std::is_same<base_type, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_metatable(T&& r) noexcept : basic_metatable(detail::no_safety, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			if (!is_table<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				constructor_handler handler {};
+				stack::check<basic_metatable>(base_t::lua_state(), -1, handler);
+			}
+#endif // Safety
+		}
+		basic_metatable(lua_nil_t r) noexcept : basic_metatable(detail::no_safety, r) {
+		}
+
+		template <typename Key, typename Value>
+		basic_metatable<base_type>& set(Key&& key, Value&& value);
+
+		template <typename Sig, typename Key, typename... Args>
+		basic_metatable& set_function(Key&& key, Args&&... args) {
+			set_fx(types<Sig>(), std::forward<Key>(key), std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename Key, typename... Args>
+		basic_metatable& set_function(Key&& key, Args&&... args) {
+			set_fx(types<>(), std::forward<Key>(key), std::forward<Args>(args)...);
+			return *this;
+		}
+
+		void unregister() {
+			using ustorage_base = u_detail::usertype_storage_base;
+
+			lua_State* L = this->lua_state();
+
+			auto pp = stack::push_pop(*this);
+			int top = lua_gettop(L);
+
+			stack_reference mt(L, -1);
+			stack::get_field(L, meta_function::gc_names, mt.stack_index());
+			if (type_of(L, -1) != type::table) {
+				lua_settop(L, top);
+				return;
+			}
+			stack_reference gc_names_table(L, -1);
+			stack::get_field(L, meta_function::storage, mt.stack_index());
+			if (type_of(L, -1) != type::lightuserdata) {
+				lua_settop(L, top);
+				return;
+			}
+			ustorage_base& base_storage = *static_cast<ustorage_base*>(stack::get<void*>(L, -1));
+			std::array<string_view, 6> registry_traits;
+			for (std::size_t i = 0; i < registry_traits.size(); ++i) {
+				u_detail::submetatable_type smt = static_cast<u_detail::submetatable_type>(i);
+				stack::get_field<false, true>(L, smt, gc_names_table.stack_index());
+				registry_traits[i] = stack::get<string_view>(L, -1);
+			}
+
+			// get the registry
+			stack_reference registry(L, raw_index(LUA_REGISTRYINDEX));
+			registry.push();
+			// eliminate all named entries for this usertype
+			// in the registry (luaL_newmetatable does
+			// [name] = new table
+			// in registry upon creation)
+			for (std::size_t i = 0; i < registry_traits.size(); ++i) {
+				u_detail::submetatable_type smt = static_cast<u_detail::submetatable_type>(i);
+				const string_view& gcmetakey = registry_traits[i];
+				if (smt == u_detail::submetatable_type::named) {
+					// use .data() to make it treat it like a c string,
+					// which it is...
+					stack::set_field<true>(L, gcmetakey.data(), lua_nil);
+				}
+				else {
+					// do not change the values in the registry: they need to be present
+					// no matter what, for safety's sake
+					// stack::set_field(L, gcmetakey, lua_nil, registry.stack_index());
+				}
+			}
+
+			// destroy all storage and tables
+			base_storage.clear();
+
+			// 6 strings from gc_names table,
+			// + 1 registry,
+			// + 1 gc_names table
+			// + 1 light userdata of storage
+			// + 1 registry
+			// 10 total, 4 left since popping off 6 gc_names tables
+			lua_settop(L, top);
+		}
+	};
+
+} // namespace sol
+
+#endif // SOL_METATABLE_HPP
diff --git a/extern/sol3/sol/object.hpp b/extern/sol3/sol/object.hpp
new file mode 100644
index 0000000000..da39b9f019
--- /dev/null
+++ b/extern/sol3/sol/object.hpp
@@ -0,0 +1,150 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_OBJECT_HPP
+#define SOL_OBJECT_HPP
+
+#include <sol/make_reference.hpp>
+#include <sol/reference.hpp>
+#include <sol/stack.hpp>
+#include <sol/object_base.hpp>
+
+namespace sol {
+
+	template <typename base_type>
+	class basic_object : public basic_object_base<base_type> {
+	private:
+		typedef basic_object_base<base_type> base_t;
+
+		template <bool invert_and_pop = false>
+		basic_object(std::integral_constant<bool, invert_and_pop>, lua_State* L_, int index_ = -1) noexcept : base_t(L_, index_) {
+			if (invert_and_pop) {
+				lua_pop(L_, -index_);
+			}
+		}
+
+	protected:
+		basic_object(detail::no_safety_tag, lua_nil_t n) : base_t(n) {
+		}
+		basic_object(detail::no_safety_tag, lua_State* L_, int index_) : base_t(L_, index_) {
+		}
+		basic_object(detail::no_safety_tag, lua_State* L_, ref_index index_) : base_t(L_, index_) {
+		}
+		template <typename T,
+		     meta::enable<meta::neg<meta::any_same<meta::unqualified_t<T>, basic_object>>, meta::neg<std::is_same<base_type, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_object(detail::no_safety_tag, T&& r) noexcept : base_t(std::forward<T>(r)) {
+		}
+
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_object(detail::no_safety_tag, lua_State* L_, T&& r) noexcept : base_t(L_, std::forward<T>(r)) {
+		}
+
+	public:
+		basic_object() noexcept = default;
+		template <typename T,
+		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_object>>, meta::neg<std::is_same<base_type, stack_reference>>,
+		          is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_object(T&& r) : base_t(std::forward<T>(r)) {
+		}
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_object(lua_State* L_, T&& r) : base_t(L_, std::forward<T>(r)) {
+		}
+		basic_object(lua_State* L_, global_tag_t t) : base_t(L_, t) {
+		}
+		basic_object(lua_nil_t r) : base_t(r) {
+		}
+		basic_object(const basic_object&) = default;
+		basic_object(basic_object&&) = default;
+		basic_object(const stack_reference& r) noexcept : basic_object(r.lua_state(), r.stack_index()) {
+		}
+		basic_object(stack_reference&& r) noexcept : basic_object(r.lua_state(), r.stack_index()) {
+		}
+		template <typename Super>
+		basic_object(const proxy_base<Super>& r) noexcept : basic_object(r.operator basic_object()) {
+		}
+		template <typename Super>
+		basic_object(proxy_base<Super>&& r) noexcept : basic_object(r.operator basic_object()) {
+		}
+		basic_object(lua_State* L_, lua_nil_t r) noexcept : base_t(L_, r) {
+		}
+		basic_object(lua_State* L_, int index_ = -1) noexcept : base_t(L_, index_) {
+		}
+		basic_object(lua_State* L_, absolute_index index_) noexcept : base_t(L_, index_) {
+		}
+		basic_object(lua_State* L_, raw_index index_) noexcept : base_t(L_, index_) {
+		}
+		basic_object(lua_State* L_, ref_index index_) noexcept : base_t(L_, index_) {
+		}
+		template <typename T, typename... Args>
+		basic_object(lua_State* L_, in_place_type_t<T>, Args&&... args) noexcept
+		: basic_object(std::integral_constant<bool, !is_stack_based<base_t>::value>(), L_, -stack::push<T>(L_, std::forward<Args>(args)...)) {
+		}
+		template <typename T, typename... Args>
+		basic_object(lua_State* L_, in_place_t, T&& arg, Args&&... args) noexcept
+		: basic_object(L_, in_place_type<T>, std::forward<T>(arg), std::forward<Args>(args)...) {
+		}
+		basic_object& operator=(const basic_object&) = default;
+		basic_object& operator=(basic_object&&) = default;
+		basic_object& operator=(const base_type& b) {
+			base_t::operator=(b);
+			return *this;
+		}
+		basic_object& operator=(base_type&& b) {
+			base_t::operator=(std::move(b));
+			return *this;
+		}
+		template <typename Super>
+		basic_object& operator=(const proxy_base<Super>& r) {
+			this->operator=(r.operator basic_object());
+			return *this;
+		}
+		template <typename Super>
+		basic_object& operator=(proxy_base<Super>&& r) {
+			this->operator=(r.operator basic_object());
+			return *this;
+		}
+	};
+
+	template <typename T>
+	object make_object(lua_State* L_, T&& value) {
+		return make_reference<object, true>(L_, std::forward<T>(value));
+	}
+
+	template <typename T, typename... Args>
+	object make_object(lua_State* L_, Args&&... args) {
+		return make_reference<T, object, true>(L_, std::forward<Args>(args)...);
+	}
+
+	template <typename T>
+	object make_object_userdata(lua_State* L_, T&& value) {
+		return make_reference_userdata<object, true>(L_, std::forward<T>(value));
+	}
+
+	template <typename T, typename... Args>
+	object make_object_userdata(lua_State* L_, Args&&... args) {
+		return make_reference_userdata<T, object, true>(L_, std::forward<Args>(args)...);
+	}
+} // namespace sol
+
+#endif // SOL_OBJECT_HPP
diff --git a/extern/sol3/sol/object_base.hpp b/extern/sol3/sol/object_base.hpp
new file mode 100644
index 0000000000..ea9b9be160
--- /dev/null
+++ b/extern/sol3/sol/object_base.hpp
@@ -0,0 +1,86 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_OBJECT_BASE_HPP
+#define SOL_OBJECT_BASE_HPP
+
+#include <sol/reference.hpp>
+#include <sol/stack.hpp>
+
+namespace sol {
+
+	template <typename ref_t>
+	class basic_object_base : public ref_t {
+	private:
+		using base_t = ref_t;
+
+		template <typename T>
+		decltype(auto) as_stack(std::true_type) const {
+			return stack::get<T>(base_t::lua_state(), base_t::stack_index());
+		}
+
+		template <typename T>
+		decltype(auto) as_stack(std::false_type) const {
+			base_t::push();
+			return stack::pop<T>(base_t::lua_state());
+		}
+
+		template <typename T>
+		bool is_stack(std::true_type) const {
+			return stack::check<T>(base_t::lua_state(), base_t::stack_index(), &no_panic);
+		}
+
+		template <typename T>
+		bool is_stack(std::false_type) const {
+			int r = base_t::registry_index();
+			if (r == LUA_REFNIL)
+				return meta::any_same<meta::unqualified_t<T>, lua_nil_t, nullopt_t, std::nullptr_t>::value ? true : false;
+			if (r == LUA_NOREF)
+				return false;
+			auto pp = stack::push_pop(*this);
+			return stack::check<T>(base_t::lua_state(), -1, &no_panic);
+		}
+
+	public:
+		basic_object_base() noexcept = default;
+		basic_object_base(const basic_object_base&) = default;
+		basic_object_base(basic_object_base&&) = default;
+		basic_object_base& operator=(const basic_object_base&) = default;
+		basic_object_base& operator=(basic_object_base&&) = default;
+		template <typename T, typename... Args, meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_object_base>>> = meta::enabler>
+		basic_object_base(T&& arg, Args&&... args) : base_t(std::forward<T>(arg), std::forward<Args>(args)...) {
+		}
+
+		template <typename T>
+		decltype(auto) as() const {
+			return as_stack<T>(is_stack_based<base_t>());
+		}
+
+		template <typename T>
+		bool is() const {
+			return is_stack<T>(is_stack_based<base_t>());
+		}
+	};
+} // namespace sol
+
+#endif // SOL_OBJECT_BASE_HPP
diff --git a/extern/sol3/sol/optional.hpp b/extern/sol3/sol/optional.hpp
new file mode 100644
index 0000000000..e7edc33dbd
--- /dev/null
+++ b/extern/sol3/sol/optional.hpp
@@ -0,0 +1,83 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_OPTIONAL_HPP
+#define SOL_OPTIONAL_HPP
+
+#include <sol/forward.hpp>
+#include <sol/in_place.hpp>
+#include <sol/traits.hpp>
+#if SOL_IS_ON(SOL_USE_BOOST_I_)
+#include <boost/optional.hpp>
+#else
+#include <sol/optional_implementation.hpp>
+#endif // Boost vs. Better optional
+
+
+#include <optional>
+
+namespace sol {
+
+#if SOL_IS_ON(SOL_USE_BOOST_I_)
+	template <typename T>
+	using optional = boost::optional<T>;
+	using nullopt_t = boost::none_t;
+	SOL_BOOST_NONE_CONSTEXPR_I_ nullopt_t nullopt = boost::none;
+#endif // Boost vs. Better optional
+
+	namespace meta {
+		template <typename T>
+		using is_optional = any<is_specialization_of<T, optional>, is_specialization_of<T, std::optional>>;
+
+		template <typename T>
+		constexpr inline bool is_optional_v = is_optional<T>::value;
+	} // namespace meta
+
+	namespace detail {
+		template <typename T>
+		struct associated_nullopt {
+			inline static constexpr std::nullopt_t value = std::nullopt;
+		};
+
+#if SOL_IS_ON(SOL_USE_BOOST_I_)
+		template <typename T>
+		struct associated_nullopt<boost::optional<T>> {
+			inline static SOL_BOOST_NONE_CONSTEXPR_I_ boost::none_t value = boost::none;
+		};
+#endif // Boost nullopt
+
+#if SOL_IS_ON(SOL_USE_BOOST_I_)
+		template <typename T>
+		inline SOL_BOOST_NONE_CONSTEXPR_I_ auto associated_nullopt_v = associated_nullopt<T>::value;
+#else
+		template <typename T>
+		inline constexpr auto associated_nullopt_v = associated_nullopt<T>::value;
+#endif // Boost continues to lag behind, to not many people's surprise...
+	} // namespace detail
+} // namespace sol
+
+#if SOL_IS_ON(SOL_USE_BOOST_I_)
+#undef SOL_BOOST_NONE_CONSTEXPR_I_
+#endif
+
+#endif // SOL_OPTIONAL_HPP
diff --git a/extern/sol3/sol/optional_implementation.hpp b/extern/sol3/sol/optional_implementation.hpp
new file mode 100644
index 0000000000..b7673b17b1
--- /dev/null
+++ b/extern/sol3/sol/optional_implementation.hpp
@@ -0,0 +1,2303 @@
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+// Taken from: TartanLlama/optional on Github, because
+// holy shit am I done dealing with C++11 constexpr
+
+///
+// optional - An implementation of std::optional with extensions
+// Written in 2017 by Simon Brand (@TartanLlama)
+//
+// To the extent possible under law, the author(s) have dedicated all
+// copyright and related and neighboring rights to this software to the
+// public domain worldwide. This software is distributed without any warranty.
+//
+// You should have received a copy of the CC0 Public Domain Dedication
+// along with this software. If not, see
+// <http://creativecommons.org/publicdomain/zero/1.0/>.
+///
+
+#ifndef SOL_TL_OPTIONAL_HPP
+#define SOL_TL_OPTIONAL_HPP
+
+#include <sol/version.hpp>
+
+#include <sol/in_place.hpp>
+
+#define SOL_TL_OPTIONAL_VERSION_MAJOR 0
+#define SOL_TL_OPTIONAL_VERSION_MINOR 5
+
+#include <exception>
+#include <functional>
+#include <new>
+#include <type_traits>
+#include <utility>
+#include <cstdlib>
+#include <optional>
+
+#if (defined(_MSC_VER) && _MSC_VER == 1900)
+#define SOL_TL_OPTIONAL_MSVC2015
+#endif
+
+#if (defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ <= 9 && !defined(__clang__))
+#define SOL_TL_OPTIONAL_GCC49
+#endif
+
+#if (defined(__GNUC__) && __GNUC__ == 5 && __GNUC_MINOR__ <= 4 && !defined(__clang__))
+#define SOL_TL_OPTIONAL_GCC54
+#endif
+
+#if (defined(__GNUC__) && __GNUC__ == 5 && __GNUC_MINOR__ <= 5 && !defined(__clang__))
+#define SOL_TL_OPTIONAL_GCC55
+#endif
+
+#if (defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ <= 9 && !defined(__clang__))
+// GCC < 5 doesn't support overloading on const&& for member functions
+#define SOL_TL_OPTIONAL_NO_CONSTRR
+
+// GCC < 5 doesn't support some standard C++11 type traits
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_CONSTRUCTIBLE(T) std::has_trivial_copy_constructor<T>::value
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_ASSIGNABLE(T) std::has_trivial_copy_assign<T>::value
+
+// This one will be different for GCC 5.7 if it's ever supported
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_DESTRUCTIBLE(T) std::is_trivially_destructible<T>::value
+
+// GCC 5 < v < 8 has a bug in is_trivially_copy_constructible which breaks std::vector
+// for non-copyable types
+#elif (defined(__GNUC__) && __GNUC__ < 8 && !defined(__clang__))
+#ifndef SOL_TL_GCC_LESS_8_TRIVIALLY_COPY_CONSTRUCTIBLE_MUTEX
+#define SOL_TL_GCC_LESS_8_TRIVIALLY_COPY_CONSTRUCTIBLE_MUTEX
+namespace sol { namespace detail {
+	template <class T>
+	struct is_trivially_copy_constructible : std::is_trivially_copy_constructible<T> { };
+#ifdef _GLIBCXX_VECTOR
+	template <class T, class A>
+	struct is_trivially_copy_constructible<std::vector<T, A>> : std::is_trivially_copy_constructible<T> { };
+#endif
+}} // namespace sol::detail
+#endif
+
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_CONSTRUCTIBLE(T) sol::detail::is_trivially_copy_constructible<T>::value
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_ASSIGNABLE(T) std::is_trivially_copy_assignable<T>::value
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_DESTRUCTIBLE(T) std::is_trivially_destructible<T>::value
+#else
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_CONSTRUCTIBLE(T) std::is_trivially_copy_constructible<T>::value
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_ASSIGNABLE(T) std::is_trivially_copy_assignable<T>::value
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_DESTRUCTIBLE(T) std::is_trivially_destructible<T>::value
+#endif
+
+#if __cplusplus > 201103L
+#define SOL_TL_OPTIONAL_CXX14
+#endif
+
+// constexpr implies const in C++11, not C++14
+#if (__cplusplus == 201103L || defined(SOL_TL_OPTIONAL_MSVC2015) || defined(SOL_TL_OPTIONAL_GCC49))
+/// \exclude
+#define SOL_TL_OPTIONAL_11_CONSTEXPR
+#else
+   /// \exclude
+#define SOL_TL_OPTIONAL_11_CONSTEXPR constexpr
+#endif
+
+namespace sol {
+#ifndef SOL_TL_MONOSTATE_INPLACE_MUTEX
+#define SOL_TL_MONOSTATE_INPLACE_MUTEX
+	/// \brief Used to represent an optional with no data; essentially a bool
+	class monostate { };
+#endif
+
+	template <class T>
+	class optional;
+
+	/// \exclude
+	namespace detail {
+#ifndef SOL_TL_TRAITS_MUTEX
+#define SOL_TL_TRAITS_MUTEX
+		// C++14-style aliases for brevity
+		template <class T>
+		using remove_const_t = typename std::remove_const<T>::type;
+		template <class T>
+		using remove_reference_t = typename std::remove_reference<T>::type;
+		template <class T>
+		using decay_t = typename std::decay<T>::type;
+		template <bool E, class T = void>
+		using enable_if_t = typename std::enable_if<E, T>::type;
+		template <bool B, class T, class F>
+		using conditional_t = typename std::conditional<B, T, F>::type;
+
+		// std::conjunction from C++17
+		template <class...>
+		struct conjunction : std::true_type { };
+		template <class B>
+		struct conjunction<B> : B { };
+		template <class B, class... Bs>
+		struct conjunction<B, Bs...> : std::conditional<bool(B::value), conjunction<Bs...>, B>::type { };
+
+#if defined(_LIBCPP_VERSION) && __cplusplus == 201103L
+#define SOL_TL_OPTIONAL_LIBCXX_MEM_FN_WORKAROUND
+#endif
+
+// In C++11 mode, there's an issue in libc++'s std::mem_fn
+// which results in a hard-error when using it in a noexcept expression
+// in some cases. This is a check to workaround the common failing case.
+#ifdef SOL_TL_OPTIONAL_LIBCXX_MEM_FN_WORKAROUND
+		template <class T>
+		struct is_pointer_to_non_const_member_func : std::false_type { };
+		template <class T, class Ret, class... Args>
+		struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...)> : std::true_type { };
+		template <class T, class Ret, class... Args>
+		struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...)&> : std::true_type { };
+		template <class T, class Ret, class... Args>
+		struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...) &&> : std::true_type { };
+		template <class T, class Ret, class... Args>
+		struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...) volatile> : std::true_type { };
+		template <class T, class Ret, class... Args>
+		struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...) volatile&> : std::true_type { };
+		template <class T, class Ret, class... Args>
+		struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...) volatile&&> : std::true_type { };
+
+		template <class T>
+		struct is_const_or_const_ref : std::false_type { };
+		template <class T>
+		struct is_const_or_const_ref<T const&> : std::true_type { };
+		template <class T>
+		struct is_const_or_const_ref<T const> : std::true_type { };
+#endif
+
+		// std::invoke from C++17
+		// https://stackoverflow.com/questions/38288042/c11-14-invoke-workaround
+		template <typename Fn, typename... Args,
+#ifdef SOL_TL_OPTIONAL_LIBCXX_MEM_FN_WORKAROUND
+		     typename = enable_if_t<!(is_pointer_to_non_const_member_func<Fn>::value && is_const_or_const_ref<Args...>::value)>,
+#endif
+		     typename = enable_if_t<std::is_member_pointer<decay_t<Fn>>::value>, int = 0>
+		constexpr auto invoke(Fn&& f, Args&&... args) noexcept(noexcept(std::mem_fn(f)(std::forward<Args>(args)...)))
+		     -> decltype(std::mem_fn(f)(std::forward<Args>(args)...)) {
+			return std::mem_fn(f)(std::forward<Args>(args)...);
+		}
+
+		template <typename Fn, typename... Args, typename = enable_if_t<!std::is_member_pointer<decay_t<Fn>>::value>>
+		constexpr auto invoke(Fn&& f, Args&&... args) noexcept(noexcept(std::forward<Fn>(f)(std::forward<Args>(args)...)))
+		     -> decltype(std::forward<Fn>(f)(std::forward<Args>(args)...)) {
+			return std::forward<Fn>(f)(std::forward<Args>(args)...);
+		}
+
+		// std::invoke_result from C++17
+		template <class F, class, class... Us>
+		struct invoke_result_impl;
+
+		template <class F, class... Us>
+		struct invoke_result_impl<F, decltype(detail::invoke(std::declval<F>(), std::declval<Us>()...), void()), Us...> {
+			using type = decltype(detail::invoke(std::declval<F>(), std::declval<Us>()...));
+		};
+
+		template <class F, class... Us>
+		using invoke_result = invoke_result_impl<F, void, Us...>;
+
+		template <class F, class... Us>
+		using invoke_result_t = typename invoke_result<F, Us...>::type;
+#endif
+
+		// std::void_t from C++17
+		template <class...>
+		struct voider {
+			using type = void;
+		};
+		template <class... Ts>
+		using void_t = typename voider<Ts...>::type;
+
+		// Trait for checking if a type is a sol::optional
+		template <class T>
+		struct is_optional_impl : std::false_type { };
+		template <class T>
+		struct is_optional_impl<optional<T>> : std::true_type { };
+		template <class T>
+		using is_optional = is_optional_impl<decay_t<T>>;
+
+		// Change void to sol::monostate
+		template <class U>
+		using fixup_void = conditional_t<std::is_void<U>::value, monostate, U>;
+
+		template <class F, class U, class = invoke_result_t<F, U>>
+		using get_map_return = optional<fixup_void<invoke_result_t<F, U>>>;
+
+		// Check if invoking F for some Us returns void
+		template <class F, class = void, class... U>
+		struct returns_void_impl;
+		template <class F, class... U>
+		struct returns_void_impl<F, void_t<invoke_result_t<F, U...>>, U...> : std::is_void<invoke_result_t<F, U...>> { };
+		template <class F, class... U>
+		using returns_void = returns_void_impl<F, void, U...>;
+
+		template <class T, class... U>
+		using enable_if_ret_void = enable_if_t<returns_void<T&&, U...>::value>;
+
+		template <class T, class... U>
+		using disable_if_ret_void = enable_if_t<!returns_void<T&&, U...>::value>;
+
+		template <class T, class U>
+		using enable_forward_value = detail::enable_if_t<std::is_constructible<T, U&&>::value && !std::is_same<detail::decay_t<U>, in_place_t>::value
+		     && !std::is_same<optional<T>, detail::decay_t<U>>::value>;
+
+		template <class T, class U, class Other>
+		using enable_from_other = detail::enable_if_t<std::is_constructible<T, Other>::value && !std::is_constructible<T, optional<U>&>::value
+		     && !std::is_constructible<T, optional<U>&&>::value && !std::is_constructible<T, const optional<U>&>::value
+		     && !std::is_constructible<T, const optional<U>&&>::value && !std::is_convertible<optional<U>&, T>::value
+		     && !std::is_convertible<optional<U>&&, T>::value && !std::is_convertible<const optional<U>&, T>::value
+		     && !std::is_convertible<const optional<U>&&, T>::value>;
+
+		template <class T, class U>
+		using enable_assign_forward = detail::enable_if_t<!std::is_same<optional<T>, detail::decay_t<U>>::value
+		     && !detail::conjunction<std::is_scalar<T>, std::is_same<T, detail::decay_t<U>>>::value && std::is_constructible<T, U>::value
+		     && std::is_assignable<T&, U>::value>;
+
+		template <class T, class U, class Other>
+		using enable_assign_from_other = detail::enable_if_t<std::is_constructible<T, Other>::value && std::is_assignable<T&, Other>::value
+		     && !std::is_constructible<T, optional<U>&>::value && !std::is_constructible<T, optional<U>&&>::value
+		     && !std::is_constructible<T, const optional<U>&>::value && !std::is_constructible<T, const optional<U>&&>::value
+		     && !std::is_convertible<optional<U>&, T>::value && !std::is_convertible<optional<U>&&, T>::value
+		     && !std::is_convertible<const optional<U>&, T>::value && !std::is_convertible<const optional<U>&&, T>::value
+		     && !std::is_assignable<T&, optional<U>&>::value && !std::is_assignable<T&, optional<U>&&>::value
+		     && !std::is_assignable<T&, const optional<U>&>::value && !std::is_assignable<T&, const optional<U>&&>::value>;
+
+#ifdef _MSC_VER
+		// TODO make a version which works with MSVC
+		template <class T, class U = T>
+		struct is_swappable : std::true_type { };
+
+		template <class T, class U = T>
+		struct is_nothrow_swappable : std::true_type { };
+#else
+		// https://stackoverflow.com/questions/26744589/what-is-a-proper-way-to-implement-is-swappable-to-test-for-the-swappable-concept
+		namespace swap_adl_tests {
+			// if swap ADL finds this then it would call std::swap otherwise (same
+			// signature)
+			struct tag { };
+
+			template <class T>
+			tag swap(T&, T&);
+			template <class T, std::size_t N>
+			tag swap(T (&a)[N], T (&b)[N]);
+
+			// helper functions to test if an unqualified swap is possible, and if it
+			// becomes std::swap
+			template <class, class>
+			std::false_type can_swap(...) noexcept(false);
+			template <class T, class U, class = decltype(swap(std::declval<T&>(), std::declval<U&>()))>
+			std::true_type can_swap(int) noexcept(noexcept(swap(std::declval<T&>(), std::declval<U&>())));
+
+			template <class, class>
+			std::false_type uses_std(...);
+			template <class T, class U>
+			std::is_same<decltype(swap(std::declval<T&>(), std::declval<U&>())), tag> uses_std(int);
+
+			template <class T>
+			struct is_std_swap_noexcept
+			: std::integral_constant<bool, std::is_nothrow_move_constructible<T>::value && std::is_nothrow_move_assignable<T>::value> { };
+
+			template <class T, std::size_t N>
+			struct is_std_swap_noexcept<T[N]> : is_std_swap_noexcept<T> { };
+
+			template <class T, class U>
+			struct is_adl_swap_noexcept : std::integral_constant<bool, noexcept(can_swap<T, U>(0))> { };
+		} // namespace swap_adl_tests
+
+		template <class T, class U = T>
+		struct is_swappable : std::integral_constant<bool,
+		                           decltype(detail::swap_adl_tests::can_swap<T, U>(0))::value
+		                                && (!decltype(detail::swap_adl_tests::uses_std<T, U>(0))::value
+		                                     || (std::is_move_assignable<T>::value && std::is_move_constructible<T>::value))> { };
+
+		template <class T, std::size_t N>
+		struct is_swappable<T[N], T[N]> : std::integral_constant<bool,
+		                                       decltype(detail::swap_adl_tests::can_swap<T[N], T[N]>(0))::value
+		                                            && (!decltype(detail::swap_adl_tests::uses_std<T[N], T[N]>(0))::value || is_swappable<T, T>::value)> { };
+
+		template <class T, class U = T>
+		struct is_nothrow_swappable
+		: std::integral_constant<bool,
+		       is_swappable<T, U>::value
+		            && ((decltype(detail::swap_adl_tests::uses_std<T, U>(0))::value&& detail::swap_adl_tests::is_std_swap_noexcept<T>::value)
+		                 || (!decltype(detail::swap_adl_tests::uses_std<T, U>(0))::value&& detail::swap_adl_tests::is_adl_swap_noexcept<T, U>::value))> { };
+#endif
+
+		// The storage base manages the actual storage, and correctly propagates
+		// trivial destroyion from T. This case is for when T is not trivially
+		// destructible.
+		template <class T, bool = ::std::is_trivially_destructible<T>::value>
+		struct optional_storage_base {
+			SOL_TL_OPTIONAL_11_CONSTEXPR optional_storage_base() noexcept : m_dummy(), m_has_value(false) {
+			}
+
+			template <class... U>
+			SOL_TL_OPTIONAL_11_CONSTEXPR optional_storage_base(in_place_t, U&&... u) : m_value(std::forward<U>(u)...), m_has_value(true) {
+			}
+
+			~optional_storage_base() {
+				if (m_has_value) {
+					m_value.~T();
+					m_has_value = false;
+				}
+			}
+
+			struct dummy { };
+			union {
+				dummy m_dummy;
+				T m_value;
+			};
+
+			bool m_has_value;
+		};
+
+		// This case is for when T is trivially destructible.
+		template <class T>
+		struct optional_storage_base<T, true> {
+			SOL_TL_OPTIONAL_11_CONSTEXPR optional_storage_base() noexcept : m_dummy(), m_has_value(false) {
+			}
+
+			template <class... U>
+			SOL_TL_OPTIONAL_11_CONSTEXPR optional_storage_base(in_place_t, U&&... u) : m_value(std::forward<U>(u)...), m_has_value(true) {
+			}
+
+			// No destructor, so this class is trivially destructible
+
+			struct dummy { };
+			union {
+				dummy m_dummy;
+				T m_value;
+			};
+
+			bool m_has_value = false;
+		};
+
+		// This base class provides some handy member functions which can be used in
+		// further derived classes
+		template <class T>
+		struct optional_operations_base : optional_storage_base<T> {
+			using optional_storage_base<T>::optional_storage_base;
+
+			void hard_reset() noexcept {
+				get().~T();
+				this->m_has_value = false;
+			}
+
+			template <class... Args>
+			void construct(Args&&... args) noexcept {
+				new (std::addressof(this->m_value)) T(std::forward<Args>(args)...);
+				this->m_has_value = true;
+			}
+
+			template <class Opt>
+			void assign(Opt&& rhs) {
+				if (this->has_value()) {
+					if (rhs.has_value()) {
+						this->m_value = std::forward<Opt>(rhs).get();
+					}
+					else {
+						this->m_value.~T();
+						this->m_has_value = false;
+					}
+				}
+
+				else if (rhs.has_value()) {
+					construct(std::forward<Opt>(rhs).get());
+				}
+			}
+
+			bool has_value() const {
+				return this->m_has_value;
+			}
+
+			SOL_TL_OPTIONAL_11_CONSTEXPR T& get() & {
+				return this->m_value;
+			}
+			SOL_TL_OPTIONAL_11_CONSTEXPR const T& get() const& {
+				return this->m_value;
+			}
+			SOL_TL_OPTIONAL_11_CONSTEXPR T&& get() && {
+				return std::move(this->m_value);
+			}
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+			constexpr const T&& get() const&& {
+				return std::move(this->m_value);
+			}
+#endif
+		};
+
+		// This class manages conditionally having a trivial copy constructor
+		// This specialization is for when T is trivially copy constructible
+		template <class T, bool = SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_CONSTRUCTIBLE(T)>
+		struct optional_copy_base : optional_operations_base<T> {
+			using optional_operations_base<T>::optional_operations_base;
+		};
+
+		// This specialization is for when T is not trivially copy constructible
+		template <class T>
+		struct optional_copy_base<T, false> : optional_operations_base<T> {
+			using base_t = optional_operations_base<T>;
+
+			using base_t::base_t;
+
+			optional_copy_base() = default;
+			optional_copy_base(const optional_copy_base& rhs) : base_t() {
+				if (rhs.has_value()) {
+					this->construct(rhs.get());
+				}
+				else {
+					this->m_has_value = false;
+				}
+			}
+
+			optional_copy_base(optional_copy_base&& rhs) = default;
+			optional_copy_base& operator=(const optional_copy_base& rhs) = default;
+			optional_copy_base& operator=(optional_copy_base&& rhs) = default;
+		};
+
+// This class manages conditionally having a trivial move constructor
+// Unfortunately there's no way to achieve this in GCC < 5 AFAIK, since it
+// doesn't implement an analogue to std::is_trivially_move_constructible. We
+// have to make do with a non-trivial move constructor even if T is trivially
+// move constructible
+#ifndef SOL_TL_OPTIONAL_GCC49
+		template <class T, bool = std::is_trivially_move_constructible<T>::value>
+		struct optional_move_base : optional_copy_base<T> {
+			using optional_copy_base<T>::optional_copy_base;
+		};
+#else
+		template <class T, bool = false>
+		struct optional_move_base;
+#endif
+		template <class T>
+		struct optional_move_base<T, false> : optional_copy_base<T> {
+			using optional_copy_base<T>::optional_copy_base;
+
+			optional_move_base() = default;
+			optional_move_base(const optional_move_base& rhs) = default;
+
+			optional_move_base(optional_move_base&& rhs) noexcept(std::is_nothrow_move_constructible<T>::value) {
+				if (rhs.has_value()) {
+					this->construct(std::move(rhs.get()));
+				}
+				else {
+					this->m_has_value = false;
+				}
+			}
+			optional_move_base& operator=(const optional_move_base& rhs) = default;
+			optional_move_base& operator=(optional_move_base&& rhs) = default;
+		};
+
+		// This class manages conditionally having a trivial copy assignment operator
+		template <class T,
+		     bool = SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_ASSIGNABLE(T) && SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_CONSTRUCTIBLE(T)
+		          && SOL_TL_OPTIONAL_IS_TRIVIALLY_DESTRUCTIBLE(T)>
+		struct optional_copy_assign_base : optional_move_base<T> {
+			using optional_move_base<T>::optional_move_base;
+		};
+
+		template <class T>
+		struct optional_copy_assign_base<T, false> : optional_move_base<T> {
+			using optional_move_base<T>::optional_move_base;
+
+			optional_copy_assign_base() = default;
+			optional_copy_assign_base(const optional_copy_assign_base& rhs) = default;
+
+			optional_copy_assign_base(optional_copy_assign_base&& rhs) = default;
+			optional_copy_assign_base& operator=(const optional_copy_assign_base& rhs) {
+				this->assign(rhs);
+				return *this;
+			}
+			optional_copy_assign_base& operator=(optional_copy_assign_base&& rhs) = default;
+		};
+
+// This class manages conditionally having a trivial move assignment operator
+// Unfortunately there's no way to achieve this in GCC < 5 AFAIK, since it
+// doesn't implement an analogue to std::is_trivially_move_assignable. We have
+// to make do with a non-trivial move assignment operator even if T is trivially
+// move assignable
+#ifndef SOL_TL_OPTIONAL_GCC49
+		template <class T,
+		     bool = std::is_trivially_destructible<T>::value&& std::is_trivially_move_constructible<T>::value&& std::is_trivially_move_assignable<T>::value>
+		struct optional_move_assign_base : optional_copy_assign_base<T> {
+			using optional_copy_assign_base<T>::optional_copy_assign_base;
+		};
+#else
+		template <class T, bool = false>
+		struct optional_move_assign_base;
+#endif
+
+		template <class T>
+		struct optional_move_assign_base<T, false> : optional_copy_assign_base<T> {
+			using optional_copy_assign_base<T>::optional_copy_assign_base;
+
+			optional_move_assign_base() = default;
+			optional_move_assign_base(const optional_move_assign_base& rhs) = default;
+
+			optional_move_assign_base(optional_move_assign_base&& rhs) = default;
+
+			optional_move_assign_base& operator=(const optional_move_assign_base& rhs) = default;
+
+			optional_move_assign_base& operator=(optional_move_assign_base&& rhs) noexcept(
+			     std::is_nothrow_move_constructible<T>::value&& std::is_nothrow_move_assignable<T>::value) {
+				this->assign(std::move(rhs));
+				return *this;
+			}
+		};
+
+		// optional_delete_ctor_base will conditionally delete copy and move
+		// constructors depending on whether T is copy/move constructible
+		template <class T, bool EnableCopy = std::is_copy_constructible<T>::value, bool EnableMove = std::is_move_constructible<T>::value>
+		struct optional_delete_ctor_base {
+			optional_delete_ctor_base() = default;
+			optional_delete_ctor_base(const optional_delete_ctor_base&) = default;
+			optional_delete_ctor_base(optional_delete_ctor_base&&) noexcept = default;
+			optional_delete_ctor_base& operator=(const optional_delete_ctor_base&) = default;
+			optional_delete_ctor_base& operator=(optional_delete_ctor_base&&) noexcept = default;
+		};
+
+		template <class T>
+		struct optional_delete_ctor_base<T, true, false> {
+			optional_delete_ctor_base() = default;
+			optional_delete_ctor_base(const optional_delete_ctor_base&) = default;
+			optional_delete_ctor_base(optional_delete_ctor_base&&) noexcept = delete;
+			optional_delete_ctor_base& operator=(const optional_delete_ctor_base&) = default;
+			optional_delete_ctor_base& operator=(optional_delete_ctor_base&&) noexcept = default;
+		};
+
+		template <class T>
+		struct optional_delete_ctor_base<T, false, true> {
+			optional_delete_ctor_base() = default;
+			optional_delete_ctor_base(const optional_delete_ctor_base&) = delete;
+			optional_delete_ctor_base(optional_delete_ctor_base&&) noexcept = default;
+			optional_delete_ctor_base& operator=(const optional_delete_ctor_base&) = default;
+			optional_delete_ctor_base& operator=(optional_delete_ctor_base&&) noexcept = default;
+		};
+
+		template <class T>
+		struct optional_delete_ctor_base<T, false, false> {
+			optional_delete_ctor_base() = default;
+			optional_delete_ctor_base(const optional_delete_ctor_base&) = delete;
+			optional_delete_ctor_base(optional_delete_ctor_base&&) noexcept = delete;
+			optional_delete_ctor_base& operator=(const optional_delete_ctor_base&) = default;
+			optional_delete_ctor_base& operator=(optional_delete_ctor_base&&) noexcept = default;
+		};
+
+		// optional_delete_assign_base will conditionally delete copy and move
+		// constructors depending on whether T is copy/move constructible + assignable
+		template <class T, bool EnableCopy = (std::is_copy_constructible<T>::value && std::is_copy_assignable<T>::value),
+		     bool EnableMove = (std::is_move_constructible<T>::value && std::is_move_assignable<T>::value)>
+		struct optional_delete_assign_base {
+			optional_delete_assign_base() = default;
+			optional_delete_assign_base(const optional_delete_assign_base&) = default;
+			optional_delete_assign_base(optional_delete_assign_base&&) noexcept = default;
+			optional_delete_assign_base& operator=(const optional_delete_assign_base&) = default;
+			optional_delete_assign_base& operator=(optional_delete_assign_base&&) noexcept = default;
+		};
+
+		template <class T>
+		struct optional_delete_assign_base<T, true, false> {
+			optional_delete_assign_base() = default;
+			optional_delete_assign_base(const optional_delete_assign_base&) = default;
+			optional_delete_assign_base(optional_delete_assign_base&&) noexcept = default;
+			optional_delete_assign_base& operator=(const optional_delete_assign_base&) = default;
+			optional_delete_assign_base& operator=(optional_delete_assign_base&&) noexcept = delete;
+		};
+
+		template <class T>
+		struct optional_delete_assign_base<T, false, true> {
+			optional_delete_assign_base() = default;
+			optional_delete_assign_base(const optional_delete_assign_base&) = default;
+			optional_delete_assign_base(optional_delete_assign_base&&) noexcept = default;
+			optional_delete_assign_base& operator=(const optional_delete_assign_base&) = delete;
+			optional_delete_assign_base& operator=(optional_delete_assign_base&&) noexcept = default;
+		};
+
+		template <class T>
+		struct optional_delete_assign_base<T, false, false> {
+			optional_delete_assign_base() = default;
+			optional_delete_assign_base(const optional_delete_assign_base&) = default;
+			optional_delete_assign_base(optional_delete_assign_base&&) noexcept = default;
+			optional_delete_assign_base& operator=(const optional_delete_assign_base&) = delete;
+			optional_delete_assign_base& operator=(optional_delete_assign_base&&) noexcept = delete;
+		};
+
+	} // namespace detail
+
+	/// \brief A tag type to represent an empty optional
+	using nullopt_t = std::nullopt_t;
+
+	/// \brief Represents an empty optional
+	/// \synopsis static constexpr nullopt_t nullopt;
+	///
+	/// *Examples*:
+	/// ```
+	/// sol::optional<int> a = sol::nullopt;
+	/// void foo (sol::optional<int>);
+	/// foo(sol::nullopt); //pass an empty optional
+	/// ```
+	using std::nullopt;
+
+	/// @brief An exception for when an optional is accessed through specific methods while it is not engaged.
+	class bad_optional_access : public std::exception {
+	public:
+		/// @brief Default-constructs an optional exception.
+		bad_optional_access() = default;
+		/// @brief Returns a pointer to a null-terminated string containing the reason for the exception.
+		const char* what() const noexcept override {
+			return "Optional has no value";
+		}
+	};
+
+	/// An optional object is an object that contains the storage for another
+	/// object and manages the lifetime of this contained object, if any. The
+	/// contained object may be initialized after the optional object has been
+	/// initialized, and may be destroyed before the optional object has been
+	/// destroyed. The initialization state of the contained object is tracked by
+	/// the optional object.
+	template <class T>
+	class optional : private detail::optional_move_assign_base<T>,
+	                 private detail::optional_delete_ctor_base<T>,
+	                 private detail::optional_delete_assign_base<T> {
+		using base = detail::optional_move_assign_base<T>;
+
+		static_assert(!std::is_same<T, in_place_t>::value, "instantiation of optional with in_place_t is ill-formed");
+		static_assert(!std::is_same<detail::decay_t<T>, nullopt_t>::value, "instantiation of optional with nullopt_t is ill-formed");
+
+	public:
+// The different versions for C++14 and 11 are needed because deduced return
+// types are not SFINAE-safe. This provides better support for things like
+// generic lambdas. C.f.
+// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0826r0.html
+#if defined(SOL_TL_OPTIONAL_CXX14) && !defined(SOL_TL_OPTIONAL_GCC49) && !defined(SOL_TL_OPTIONAL_GCC54) && !defined(SOL_TL_OPTIONAL_GCC55)
+		/// \group and_then
+		/// Carries out some operation which returns an optional on the stored
+		/// object if there is one. \requires `std::invoke(std::forward<F>(f),
+		/// value())` returns a `std::optional<U>` for some `U`. \returns Let `U` be
+		/// the result of `std::invoke(std::forward<F>(f), value())`. Returns a
+		/// `std::optional<U>`. The return value is empty if `*this` is empty,
+		/// otherwise the return value of `std::invoke(std::forward<F>(f), value())`
+		/// is returned.
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) &;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR auto and_then(F&& f) & {
+			using result = detail::invoke_result_t<F, T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) &&;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR auto and_then(F&& f) && {
+			using result = detail::invoke_result_t<F, T&&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : result(nullopt);
+		}
+
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) const &;
+		template <class F>
+		constexpr auto and_then(F&& f) const& {
+			using result = detail::invoke_result_t<F, const T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) const &&;
+		template <class F>
+		constexpr auto and_then(F&& f) const&& {
+			using result = detail::invoke_result_t<F, const T&&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : result(nullopt);
+		}
+#endif
+#else
+		/// \group and_then
+		/// Carries out some operation which returns an optional on the stored
+		/// object if there is one. \requires `std::invoke(std::forward<F>(f),
+		/// value())` returns a `std::optional<U>` for some `U`.
+		/// \returns Let `U` be the result of `std::invoke(std::forward<F>(f),
+		/// value())`. Returns a `std::optional<U>`. The return value is empty if
+		/// `*this` is empty, otherwise the return value of
+		/// `std::invoke(std::forward<F>(f), value())` is returned.
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) &;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR detail::invoke_result_t<F, T&> and_then(F&& f) & {
+			using result = detail::invoke_result_t<F, T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) &&;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR detail::invoke_result_t<F, T&&> and_then(F&& f) && {
+			using result = detail::invoke_result_t<F, T&&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : result(nullopt);
+		}
+
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) const &;
+		template <class F>
+		constexpr detail::invoke_result_t<F, const T&> and_then(F&& f) const& {
+			using result = detail::invoke_result_t<F, const T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) const &&;
+		template <class F>
+		constexpr detail::invoke_result_t<F, const T&&> and_then(F&& f) const&& {
+			using result = detail::invoke_result_t<F, const T&&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : result(nullopt);
+		}
+#endif
+#endif
+
+#if defined(SOL_TL_OPTIONAL_CXX14) && !defined(SOL_TL_OPTIONAL_GCC49) && !defined(SOL_TL_OPTIONAL_GCC54) && !defined(SOL_TL_OPTIONAL_GCC55)
+		/// \brief Carries out some operation on the stored object if there is one.
+		/// \returns Let `U` be the result of `std::invoke(std::forward<F>(f),
+		/// value())`. Returns a `std::optional<U>`. The return value is empty if
+		/// `*this` is empty, otherwise an `optional<U>` is constructed from the
+		/// return value of `std::invoke(std::forward<F>(f), value())` and is
+		/// returned.
+		///
+		/// \group map
+		/// \synopsis template <class F> constexpr auto map(F &&f) &;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR auto map(F&& f) & {
+			return optional_map_impl(*this, std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> constexpr auto map(F &&f) &&;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR auto map(F&& f) && {
+			return optional_map_impl(std::move(*this), std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> constexpr auto map(F &&f) const&;
+		template <class F>
+		constexpr auto map(F&& f) const& {
+			return optional_map_impl(*this, std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> constexpr auto map(F &&f) const&&;
+		template <class F>
+		constexpr auto map(F&& f) const&& {
+			return optional_map_impl(std::move(*this), std::forward<F>(f));
+		}
+#else
+		/// \brief Carries out some operation on the stored object if there is one.
+		/// \returns Let `U` be the result of `std::invoke(std::forward<F>(f),
+		/// value())`. Returns a `std::optional<U>`. The return value is empty if
+		/// `*this` is empty, otherwise an `optional<U>` is constructed from the
+		/// return value of `std::invoke(std::forward<F>(f), value())` and is
+		/// returned.
+		///
+		/// \group map
+		/// \synopsis template <class F> auto map(F &&f) &;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR decltype(optional_map_impl(std::declval<optional&>(), std::declval<F&&>())) map(F&& f) & {
+			return optional_map_impl(*this, std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> auto map(F &&f) &&;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR decltype(optional_map_impl(std::declval<optional&&>(), std::declval<F&&>())) map(F&& f) && {
+			return optional_map_impl(std::move(*this), std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> auto map(F &&f) const&;
+		template <class F>
+		constexpr decltype(optional_map_impl(std::declval<const optional&>(), std::declval<F&&>())) map(F&& f) const& {
+			return optional_map_impl(*this, std::forward<F>(f));
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group map
+		/// \synopsis template <class F> auto map(F &&f) const&&;
+		template <class F>
+		constexpr decltype(optional_map_impl(std::declval<const optional&&>(), std::declval<F&&>())) map(F&& f) const&& {
+			return optional_map_impl(std::move(*this), std::forward<F>(f));
+		}
+#endif
+#endif
+
+		/// \brief Calls `f` if the optional is empty
+		/// \requires `std::invoke_result_t<F>` must be void or convertible to
+		/// `optional<T>`.
+		/// \effects If `*this` has a value, returns `*this`.
+		/// Otherwise, if `f` returns `void`, calls `std::forward<F>(f)` and returns
+		/// `std::nullopt`. Otherwise, returns `std::forward<F>(f)()`.
+		///
+		/// \group or_else
+		/// \synopsis template <class F> optional<T> or_else (F &&f) &;
+		template <class F, detail::enable_if_ret_void<F>* = nullptr>
+		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) & {
+			if (has_value())
+				return *this;
+
+			std::forward<F>(f)();
+			return nullopt;
+		}
+
+		/// \exclude
+		template <class F, detail::disable_if_ret_void<F>* = nullptr>
+		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) & {
+			return has_value() ? *this : std::forward<F>(f)();
+		}
+
+		/// \group or_else
+		/// \synopsis template <class F> optional<T> or_else (F &&f) &&;
+		template <class F, detail::enable_if_ret_void<F>* = nullptr>
+		optional<T> or_else(F&& f) && {
+			if (has_value())
+				return std::move(*this);
+
+			std::forward<F>(f)();
+			return nullopt;
+		}
+
+		/// \exclude
+		template <class F, detail::disable_if_ret_void<F>* = nullptr>
+		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) && {
+			return has_value() ? std::move(*this) : std::forward<F>(f)();
+		}
+
+		/// \group or_else
+		/// \synopsis template <class F> optional<T> or_else (F &&f) const &;
+		template <class F, detail::enable_if_ret_void<F>* = nullptr>
+		optional<T> or_else(F&& f) const& {
+			if (has_value())
+				return *this;
+
+			std::forward<F>(f)();
+			return nullopt;
+		}
+
+		/// \exclude
+		template <class F, detail::disable_if_ret_void<F>* = nullptr>
+		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) const& {
+			return has_value() ? *this : std::forward<F>(f)();
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \exclude
+		template <class F, detail::enable_if_ret_void<F>* = nullptr>
+		optional<T> or_else(F&& f) const&& {
+			if (has_value())
+				return std::move(*this);
+
+			std::forward<F>(f)();
+			return nullopt;
+		}
+
+		/// \exclude
+		template <class F, detail::disable_if_ret_void<F>* = nullptr>
+		optional<T> or_else(F&& f) const&& {
+			return has_value() ? std::move(*this) : std::forward<F>(f)();
+		}
+#endif
+
+		/// \brief Maps the stored value with `f` if there is one, otherwise returns
+		/// `u`.
+		///
+		/// \details If there is a value stored, then `f` is called with `**this`
+		/// and the value is returned. Otherwise `u` is returned.
+		///
+		/// \group map_or
+		template <class F, class U>
+		U map_or(F&& f, U&& u) & {
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u);
+		}
+
+		/// \group map_or
+		template <class F, class U>
+		U map_or(F&& f, U&& u) && {
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u);
+		}
+
+		/// \group map_or
+		template <class F, class U>
+		U map_or(F&& f, U&& u) const& {
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group map_or
+		template <class F, class U>
+		U map_or(F&& f, U&& u) const&& {
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u);
+		}
+#endif
+
+		/// \brief Maps the stored value with `f` if there is one, otherwise calls
+		/// `u` and returns the result.
+		///
+		/// \details If there is a value stored, then `f` is
+		/// called with `**this` and the value is returned. Otherwise
+		/// `std::forward<U>(u)()` is returned.
+		///
+		/// \group map_or_else
+		/// \synopsis template <class F, class U> \n auto map_or_else(F &&f, U &&u) &;
+		template <class F, class U>
+		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) & {
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u)();
+		}
+
+		/// \group map_or_else
+		/// \synopsis template <class F, class U> \n auto map_or_else(F &&f, U &&u)
+		/// &&;
+		template <class F, class U>
+		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) && {
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u)();
+		}
+
+		/// \group map_or_else
+		/// \synopsis template <class F, class U> \n auto map_or_else(F &&f, U &&u)
+		/// const &;
+		template <class F, class U>
+		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) const& {
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u)();
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group map_or_else
+		/// \synopsis template <class F, class U> \n auto map_or_else(F &&f, U &&u)
+		/// const &&;
+		template <class F, class U>
+		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) const&& {
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u)();
+		}
+#endif
+
+		/// \returns `u` if `*this` has a value, otherwise an empty optional.
+		template <class U>
+		constexpr optional<typename std::decay<U>::type> conjunction(U&& u) const {
+			using result = optional<detail::decay_t<U>>;
+			return has_value() ? result { u } : result { nullopt };
+		}
+
+		/// \returns `rhs` if `*this` is empty, otherwise the current value.
+		/// \group disjunction
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(const optional& rhs) & {
+			return has_value() ? *this : rhs;
+		}
+
+		/// \group disjunction
+		constexpr optional disjunction(const optional& rhs) const& {
+			return has_value() ? *this : rhs;
+		}
+
+		/// \group disjunction
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(const optional& rhs) && {
+			return has_value() ? std::move(*this) : rhs;
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group disjunction
+		constexpr optional disjunction(const optional& rhs) const&& {
+			return has_value() ? std::move(*this) : rhs;
+		}
+#endif
+
+		/// \group disjunction
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(optional&& rhs) & {
+			return has_value() ? *this : std::move(rhs);
+		}
+
+		/// \group disjunction
+		constexpr optional disjunction(optional&& rhs) const& {
+			return has_value() ? *this : std::move(rhs);
+		}
+
+		/// \group disjunction
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(optional&& rhs) && {
+			return has_value() ? std::move(*this) : std::move(rhs);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group disjunction
+		constexpr optional disjunction(optional&& rhs) const&& {
+			return has_value() ? std::move(*this) : std::move(rhs);
+		}
+#endif
+
+		/// Takes the value out of the optional, leaving it empty
+		/// \group take
+		optional take() & {
+			optional ret = *this;
+			reset();
+			return ret;
+		}
+
+		/// \group take
+		optional take() const& {
+			optional ret = *this;
+			reset();
+			return ret;
+		}
+
+		/// \group take
+		optional take() && {
+			optional ret = std::move(*this);
+			reset();
+			return ret;
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group take
+		optional take() const&& {
+			optional ret = std::move(*this);
+			reset();
+			return ret;
+		}
+#endif
+
+		using value_type = T;
+
+		/// Constructs an optional that does not contain a value.
+		/// \group ctor_empty
+		constexpr optional() noexcept = default;
+
+		/// \group ctor_empty
+		constexpr optional(nullopt_t) noexcept {
+		}
+
+		/// Copy constructor
+		///
+		/// If `rhs` contains a value, the stored value is direct-initialized with
+		/// it. Otherwise, the constructed optional is empty.
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional(const optional& rhs) = default;
+
+		/// Move constructor
+		///
+		/// If `rhs` contains a value, the stored value is direct-initialized with
+		/// it. Otherwise, the constructed optional is empty.
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional(optional&& rhs) = default;
+
+		/// Constructs the stored value in-place using the given arguments.
+		/// \group in_place
+		/// \synopsis template <class... Args> constexpr explicit optional(in_place_t, Args&&... args);
+		template <class... Args>
+		constexpr explicit optional(detail::enable_if_t<std::is_constructible<T, Args...>::value, in_place_t>, Args&&... args)
+		: base(in_place, std::forward<Args>(args)...) {
+		}
+
+		/// \group in_place
+		/// \synopsis template <class U, class... Args> \n constexpr explicit optional(in_place_t, std::initializer_list<U>&, Args&&... args);
+		template <class U, class... Args>
+		SOL_TL_OPTIONAL_11_CONSTEXPR explicit optional(detail::enable_if_t<std::is_constructible<T, std::initializer_list<U>&, Args&&...>::value, in_place_t>,
+		     std::initializer_list<U> il, Args&&... args) {
+			this->construct(il, std::forward<Args>(args)...);
+		}
+
+#if 0 // SOL_MODIFICATION
+      /// Constructs the stored value with `u`.
+      /// \synopsis template <class U=T> constexpr optional(U &&u);
+		template <class U = T, detail::enable_if_t<std::is_convertible<U&&, T>::value>* = nullptr, detail::enable_forward_value<T, U>* = nullptr>
+		constexpr optional(U&& u) : base(in_place, std::forward<U>(u)) {
+		}
+
+		/// \exclude
+		template <class U = T, detail::enable_if_t<!std::is_convertible<U&&, T>::value>* = nullptr, detail::enable_forward_value<T, U>* = nullptr>
+		constexpr explicit optional(U&& u) : base(in_place, std::forward<U>(u)) {
+		}
+#else
+		/// Constructs the stored value with `u`.
+		/// \synopsis template <class U=T> constexpr optional(U &&u);
+		constexpr optional(T&& u) : base(in_place, std::move(u)) {
+		}
+
+		/// \exclude
+		constexpr optional(const T& u) : base(in_place, u) {
+		}
+#endif // sol2 modification
+
+		/// Converting copy constructor.
+		/// \synopsis template <class U> optional(const optional<U> &rhs);
+		template <class U, detail::enable_from_other<T, U, const U&>* = nullptr, detail::enable_if_t<std::is_convertible<const U&, T>::value>* = nullptr>
+		optional(const optional<U>& rhs) {
+			if (rhs.has_value()) {
+				this->construct(*rhs);
+			}
+		}
+
+		/// \exclude
+		template <class U, detail::enable_from_other<T, U, const U&>* = nullptr, detail::enable_if_t<!std::is_convertible<const U&, T>::value>* = nullptr>
+		explicit optional(const optional<U>& rhs) {
+			if (rhs.has_value()) {
+				this->construct(*rhs);
+			}
+		}
+
+		/// Converting move constructor.
+		/// \synopsis template <class U> optional(optional<U> &&rhs);
+		template <class U, detail::enable_from_other<T, U, U&&>* = nullptr, detail::enable_if_t<std::is_convertible<U&&, T>::value>* = nullptr>
+		optional(optional<U>&& rhs) {
+			if (rhs.has_value()) {
+				this->construct(std::move(*rhs));
+			}
+		}
+
+		/// \exclude
+		template <class U, detail::enable_from_other<T, U, U&&>* = nullptr, detail::enable_if_t<!std::is_convertible<U&&, T>::value>* = nullptr>
+		explicit optional(optional<U>&& rhs) {
+			this->construct(std::move(*rhs));
+		}
+
+		/// Destroys the stored value if there is one.
+		~optional() = default;
+
+		/// Assignment to empty.
+		///
+		/// Destroys the current value if there is one.
+		optional& operator=(nullopt_t) noexcept {
+			if (has_value()) {
+				this->m_value.~T();
+				this->m_has_value = false;
+			}
+
+			return *this;
+		}
+
+		/// Copy assignment.
+		///
+		/// Copies the value from `rhs` if there is one. Otherwise resets the stored
+		/// value in `*this`.
+		optional& operator=(const optional& rhs) = default;
+
+		/// Move assignment.
+		///
+		/// Moves the value from `rhs` if there is one. Otherwise resets the stored
+		/// value in `*this`.
+		optional& operator=(optional&& rhs) = default;
+
+		/// Assigns the stored value from `u`, destroying the old value if there was
+		/// one.
+		/// \synopsis optional &operator=(U &&u);
+		template <class U = T, detail::enable_assign_forward<T, U>* = nullptr>
+		optional& operator=(U&& u) {
+			if (has_value()) {
+				this->m_value = std::forward<U>(u);
+			}
+			else {
+				this->construct(std::forward<U>(u));
+			}
+
+			return *this;
+		}
+
+		/// Converting copy assignment operator.
+		///
+		/// Copies the value from `rhs` if there is one. Otherwise resets the stored
+		/// value in `*this`.
+		/// \synopsis optional &operator=(const optional<U> & rhs);
+		template <class U, detail::enable_assign_from_other<T, U, const U&>* = nullptr>
+		optional& operator=(const optional<U>& rhs) {
+			if (has_value()) {
+				if (rhs.has_value()) {
+					this->m_value = *rhs;
+				}
+				else {
+					this->hard_reset();
+				}
+			}
+
+			if (rhs.has_value()) {
+				this->construct(*rhs);
+			}
+
+			return *this;
+		}
+
+		// TODO check exception guarantee
+		/// Converting move assignment operator.
+		///
+		/// Moves the value from `rhs` if there is one. Otherwise resets the stored
+		/// value in `*this`.
+		/// \synopsis optional &operator=(optional<U> && rhs);
+		template <class U, detail::enable_assign_from_other<T, U, U>* = nullptr>
+		optional& operator=(optional<U>&& rhs) {
+			if (has_value()) {
+				if (rhs.has_value()) {
+					this->m_value = std::move(*rhs);
+				}
+				else {
+					this->hard_reset();
+				}
+			}
+
+			if (rhs.has_value()) {
+				this->construct(std::move(*rhs));
+			}
+
+			return *this;
+		}
+
+		/// Constructs the value in-place, destroying the current one if there is
+		/// one.
+		/// \group emplace
+		template <class... Args>
+		T& emplace(Args&&... args) {
+			static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args");
+
+			*this = nullopt;
+			this->construct(std::forward<Args>(args)...);
+			return value();
+		}
+
+		/// \group emplace
+		/// \synopsis template <class U, class... Args> \n T& emplace(std::initializer_list<U> il, Args &&... args);
+		template <class U, class... Args>
+		detail::enable_if_t<std::is_constructible<T, std::initializer_list<U>&, Args&&...>::value, T&> emplace(std::initializer_list<U> il, Args&&... args) {
+			*this = nullopt;
+			this->construct(il, std::forward<Args>(args)...);
+			return value();
+		}
+
+		/// Swaps this optional with the other.
+		///
+		/// If neither optionals have a value, nothing happens.
+		/// If both have a value, the values are swapped.
+		/// If one has a value, it is moved to the other and the movee is left
+		/// valueless.
+		void swap(optional& rhs) noexcept(std::is_nothrow_move_constructible<T>::value&& detail::is_nothrow_swappable<T>::value) {
+			if (has_value()) {
+				if (rhs.has_value()) {
+					using std::swap;
+					swap(**this, *rhs);
+				}
+				else {
+					new (std::addressof(rhs.m_value)) T(std::move(this->m_value));
+					this->m_value.T::~T();
+				}
+			}
+			else if (rhs.has_value()) {
+				new (std::addressof(this->m_value)) T(std::move(rhs.m_value));
+				rhs.m_value.T::~T();
+			}
+		}
+
+		/// \returns a pointer to the stored value
+		/// \requires a value is stored
+		/// \group pointer
+		/// \synopsis constexpr const T *operator->() const;
+		constexpr const T* operator->() const {
+			return std::addressof(this->m_value);
+		}
+
+		/// \group pointer
+		/// \synopsis constexpr T *operator->();
+		SOL_TL_OPTIONAL_11_CONSTEXPR T* operator->() {
+			return std::addressof(this->m_value);
+		}
+
+		/// \returns the stored value
+		/// \requires a value is stored
+		/// \group deref
+		/// \synopsis constexpr T &operator*();
+		SOL_TL_OPTIONAL_11_CONSTEXPR T& operator*() & {
+			return this->m_value;
+		}
+
+		/// \group deref
+		/// \synopsis constexpr const T &operator*() const;
+		constexpr const T& operator*() const& {
+			return this->m_value;
+		}
+
+		/// \exclude
+		SOL_TL_OPTIONAL_11_CONSTEXPR T&& operator*() && {
+			return std::move(this->m_value);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \exclude
+		constexpr const T&& operator*() const&& {
+			return std::move(this->m_value);
+		}
+#endif
+
+		/// \returns whether or not the optional has a value
+		/// \group has_value
+		constexpr bool has_value() const noexcept {
+			return this->m_has_value;
+		}
+
+		/// \group has_value
+		constexpr explicit operator bool() const noexcept {
+			return this->m_has_value;
+		}
+
+		/// \returns the contained value if there is one, otherwise throws
+		/// [bad_optional_access]
+		/// \group value
+		/// \synopsis constexpr T &value();
+		SOL_TL_OPTIONAL_11_CONSTEXPR T& value() & {
+			if (has_value())
+				return this->m_value;
+#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
+			std::abort();
+#else
+			throw bad_optional_access();
+#endif // No exceptions allowed
+		}
+		/// \group value
+		/// \synopsis constexpr const T &value() const;
+		SOL_TL_OPTIONAL_11_CONSTEXPR const T& value() const& {
+			if (has_value())
+				return this->m_value;
+#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
+			std::abort();
+#else
+			throw bad_optional_access();
+#endif // No exceptions allowed
+		}
+		/// \exclude
+		SOL_TL_OPTIONAL_11_CONSTEXPR T&& value() && {
+			if (has_value())
+				return std::move(this->m_value);
+#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
+			std::abort();
+#else
+			throw bad_optional_access();
+#endif // No exceptions allowed
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \exclude
+		SOL_TL_OPTIONAL_11_CONSTEXPR const T&& value() const&& {
+			if (has_value())
+				return std::move(this->m_value);
+#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
+			std::abort();
+#else
+			throw bad_optional_access();
+#endif // No exceptions allowed
+		}
+#endif
+
+		/// \returns the stored value if there is one, otherwise returns `u`
+		/// \group value_or
+		template <class U>
+		constexpr T value_or(U&& u) const& {
+			static_assert(std::is_copy_constructible<T>::value && std::is_convertible<U&&, T>::value, "T must be copy constructible and convertible from U");
+			return has_value() ? **this : static_cast<T>(std::forward<U>(u));
+		}
+
+		/// \group value_or
+		template <class U>
+		SOL_TL_OPTIONAL_11_CONSTEXPR T value_or(U&& u) && {
+			static_assert(std::is_move_constructible<T>::value && std::is_convertible<U&&, T>::value, "T must be move constructible and convertible from U");
+			return has_value() ? **this : static_cast<T>(std::forward<U>(u));
+		}
+
+		/// Destroys the stored value if one exists, making the optional empty
+		void reset() noexcept {
+			if (has_value()) {
+				this->m_value.~T();
+				this->m_has_value = false;
+			}
+		}
+	}; // namespace sol
+
+	/// \group relop
+	/// \brief Compares two optional objects
+	/// \details If both optionals contain a value, they are compared with `T`s
+	/// relational operators. Otherwise `lhs` and `rhs` are equal only if they are
+	/// both empty, and `lhs` is less than `rhs` only if `rhs` is empty and `lhs`
+	/// is not.
+	template <class T, class U>
+	inline constexpr bool operator==(const optional<T>& lhs, const optional<U>& rhs) {
+		return lhs.has_value() == rhs.has_value() && (!lhs.has_value() || *lhs == *rhs);
+	}
+	/// \group relop
+	template <class T, class U>
+	inline constexpr bool operator!=(const optional<T>& lhs, const optional<U>& rhs) {
+		return lhs.has_value() != rhs.has_value() || (lhs.has_value() && *lhs != *rhs);
+	}
+	/// \group relop
+	template <class T, class U>
+	inline constexpr bool operator<(const optional<T>& lhs, const optional<U>& rhs) {
+		return rhs.has_value() && (!lhs.has_value() || *lhs < *rhs);
+	}
+	/// \group relop
+	template <class T, class U>
+	inline constexpr bool operator>(const optional<T>& lhs, const optional<U>& rhs) {
+		return lhs.has_value() && (!rhs.has_value() || *lhs > *rhs);
+	}
+	/// \group relop
+	template <class T, class U>
+	inline constexpr bool operator<=(const optional<T>& lhs, const optional<U>& rhs) {
+		return !lhs.has_value() || (rhs.has_value() && *lhs <= *rhs);
+	}
+	/// \group relop
+	template <class T, class U>
+	inline constexpr bool operator>=(const optional<T>& lhs, const optional<U>& rhs) {
+		return !rhs.has_value() || (lhs.has_value() && *lhs >= *rhs);
+	}
+
+	/// \group relop_nullopt
+	/// \brief Compares an optional to a `nullopt`
+	/// \details Equivalent to comparing the optional to an empty optional
+	template <class T>
+	inline constexpr bool operator==(const optional<T>& lhs, nullopt_t) noexcept {
+		return !lhs.has_value();
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator==(nullopt_t, const optional<T>& rhs) noexcept {
+		return !rhs.has_value();
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator!=(const optional<T>& lhs, nullopt_t) noexcept {
+		return lhs.has_value();
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator!=(nullopt_t, const optional<T>& rhs) noexcept {
+		return rhs.has_value();
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator<(const optional<T>&, nullopt_t) noexcept {
+		return false;
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator<(nullopt_t, const optional<T>& rhs) noexcept {
+		return rhs.has_value();
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator<=(const optional<T>& lhs, nullopt_t) noexcept {
+		return !lhs.has_value();
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator<=(nullopt_t, const optional<T>&) noexcept {
+		return true;
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator>(const optional<T>& lhs, nullopt_t) noexcept {
+		return lhs.has_value();
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator>(nullopt_t, const optional<T>&) noexcept {
+		return false;
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator>=(const optional<T>&, nullopt_t) noexcept {
+		return true;
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator>=(nullopt_t, const optional<T>& rhs) noexcept {
+		return !rhs.has_value();
+	}
+
+	/// \group relop_t
+	/// \brief Compares the optional with a value.
+	/// \details If the optional has a value, it is compared with the other value
+	/// using `T`s relational operators. Otherwise, the optional is considered
+	/// less than the value.
+	template <class T, class U>
+	inline constexpr bool operator==(const optional<T>& lhs, const U& rhs) {
+		return lhs.has_value() ? *lhs == rhs : false;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator==(const U& lhs, const optional<T>& rhs) {
+		return rhs.has_value() ? lhs == *rhs : false;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator!=(const optional<T>& lhs, const U& rhs) {
+		return lhs.has_value() ? *lhs != rhs : true;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator!=(const U& lhs, const optional<T>& rhs) {
+		return rhs.has_value() ? lhs != *rhs : true;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator<(const optional<T>& lhs, const U& rhs) {
+		return lhs.has_value() ? *lhs < rhs : true;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator<(const U& lhs, const optional<T>& rhs) {
+		return rhs.has_value() ? lhs < *rhs : false;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator<=(const optional<T>& lhs, const U& rhs) {
+		return lhs.has_value() ? *lhs <= rhs : true;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator<=(const U& lhs, const optional<T>& rhs) {
+		return rhs.has_value() ? lhs <= *rhs : false;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator>(const optional<T>& lhs, const U& rhs) {
+		return lhs.has_value() ? *lhs > rhs : false;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator>(const U& lhs, const optional<T>& rhs) {
+		return rhs.has_value() ? lhs > *rhs : true;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator>=(const optional<T>& lhs, const U& rhs) {
+		return lhs.has_value() ? *lhs >= rhs : false;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator>=(const U& lhs, const optional<T>& rhs) {
+		return rhs.has_value() ? lhs >= *rhs : true;
+	}
+
+	/// \synopsis template <class T>  \n  void swap(optional<T> &lhs, optional<T> &rhs);
+	template <class T, detail::enable_if_t<std::is_move_constructible<T>::value>* = nullptr, detail::enable_if_t<detail::is_swappable<T>::value>* = nullptr>
+	void swap(optional<T>& lhs, optional<T>& rhs) noexcept(noexcept(lhs.swap(rhs))) {
+		return lhs.swap(rhs);
+	}
+
+	namespace detail {
+		struct i_am_secret { };
+	} // namespace detail
+
+	template <class T = detail::i_am_secret, class U, class Ret = detail::conditional_t<std::is_same<T, detail::i_am_secret>::value, detail::decay_t<U>, T>>
+	inline constexpr optional<Ret> make_optional(U&& v) {
+		return optional<Ret>(std::forward<U>(v));
+	}
+
+	template <class T, class... Args>
+	inline constexpr optional<T> make_optional(Args&&... args) {
+		return optional<T>(in_place, std::forward<Args>(args)...);
+	}
+	template <class T, class U, class... Args>
+	inline constexpr optional<T> make_optional(std::initializer_list<U> il, Args&&... args) {
+		return optional<T>(in_place, il, std::forward<Args>(args)...);
+	}
+
+#if __cplusplus >= 201703L
+	template <class T>
+	optional(T) -> optional<T>;
+#endif
+
+	/// \exclude
+	namespace detail {
+#ifdef SOL_TL_OPTIONAL_CXX14
+		template <class Opt, class F, class Ret = decltype(detail::invoke(std::declval<F>(), *std::declval<Opt>())),
+		     detail::enable_if_t<!std::is_void<Ret>::value>* = nullptr>
+		constexpr auto optional_map_impl(Opt&& opt, F&& f) {
+			return opt.has_value() ? detail::invoke(std::forward<F>(f), *std::forward<Opt>(opt)) : optional<Ret>(nullopt);
+		}
+
+		template <class Opt, class F, class Ret = decltype(detail::invoke(std::declval<F>(), *std::declval<Opt>())),
+		     detail::enable_if_t<std::is_void<Ret>::value>* = nullptr>
+		auto optional_map_impl(Opt&& opt, F&& f) {
+			if (opt.has_value()) {
+				detail::invoke(std::forward<F>(f), *std::forward<Opt>(opt));
+				return make_optional(monostate {});
+			}
+
+			return optional<monostate>(nullopt);
+		}
+#else
+		template <class Opt, class F, class Ret = decltype(detail::invoke(std::declval<F>(), *std::declval<Opt>())),
+		     detail::enable_if_t<!std::is_void<Ret>::value>* = nullptr>
+
+		constexpr auto optional_map_impl(Opt&& opt, F&& f) -> optional<Ret> {
+			return opt.has_value() ? detail::invoke(std::forward<F>(f), *std::forward<Opt>(opt)) : optional<Ret>(nullopt);
+		}
+
+		template <class Opt, class F, class Ret = decltype(detail::invoke(std::declval<F>(), *std::declval<Opt>())),
+		     detail::enable_if_t<std::is_void<Ret>::value>* = nullptr>
+
+		auto optional_map_impl(Opt&& opt, F&& f) -> optional<monostate> {
+			if (opt.has_value()) {
+				detail::invoke(std::forward<F>(f), *std::forward<Opt>(opt));
+				return monostate {};
+			}
+
+			return nullopt;
+		}
+#endif
+	} // namespace detail
+
+	/// Specialization for when `T` is a reference. `optional<T&>` acts similarly
+	/// to a `T*`, but provides more operations and shows intent more clearly.
+	///
+	/// *Examples*:
+	///
+	/// ```
+	/// int i = 42;
+	/// sol::optional<int&> o = i;
+	/// *o == 42; //true
+	/// i = 12;
+	/// *o = 12; //true
+	/// &*o == &i; //true
+	/// ```
+	///
+	/// Assignment has rebind semantics rather than assign-through semantics:
+	///
+	/// ```
+	/// int j = 8;
+	/// o = j;
+	///
+	/// &*o == &j; //true
+	/// ```
+	template <class T>
+	class optional<T&> {
+	public:
+// The different versions for C++14 and 11 are needed because deduced return
+// types are not SFINAE-safe. This provides better support for things like
+// generic lambdas. C.f.
+// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0826r0.html
+#if defined(SOL_TL_OPTIONAL_CXX14) && !defined(SOL_TL_OPTIONAL_GCC49) && !defined(SOL_TL_OPTIONAL_GCC54) && !defined(SOL_TL_OPTIONAL_GCC55)
+		/// \group and_then
+		/// Carries out some operation which returns an optional on the stored
+		/// object if there is one. \requires `std::invoke(std::forward<F>(f),
+		/// value())` returns a `std::optional<U>` for some `U`. \returns Let `U` be
+		/// the result of `std::invoke(std::forward<F>(f), value())`. Returns a
+		/// `std::optional<U>`. The return value is empty if `*this` is empty,
+		/// otherwise the return value of `std::invoke(std::forward<F>(f), value())`
+		/// is returned.
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) &;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR auto and_then(F&& f) & {
+			using result = detail::invoke_result_t<F, T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) &&;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR auto and_then(F&& f) && {
+			using result = detail::invoke_result_t<F, T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) const &;
+		template <class F>
+		constexpr auto and_then(F&& f) const& {
+			using result = detail::invoke_result_t<F, const T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) const &&;
+		template <class F>
+		constexpr auto and_then(F&& f) const&& {
+			using result = detail::invoke_result_t<F, const T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+#endif
+#else
+		/// \group and_then
+		/// Carries out some operation which returns an optional on the stored
+		/// object if there is one. \requires `std::invoke(std::forward<F>(f),
+		/// value())` returns a `std::optional<U>` for some `U`. \returns Let `U` be
+		/// the result of `std::invoke(std::forward<F>(f), value())`. Returns a
+		/// `std::optional<U>`. The return value is empty if `*this` is empty,
+		/// otherwise the return value of `std::invoke(std::forward<F>(f), value())`
+		/// is returned.
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) &;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR detail::invoke_result_t<F, T&> and_then(F&& f) & {
+			using result = detail::invoke_result_t<F, T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) &&;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR detail::invoke_result_t<F, T&> and_then(F&& f) && {
+			using result = detail::invoke_result_t<F, T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) const &;
+		template <class F>
+		constexpr detail::invoke_result_t<F, const T&> and_then(F&& f) const& {
+			using result = detail::invoke_result_t<F, const T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) const &&;
+		template <class F>
+		constexpr detail::invoke_result_t<F, const T&> and_then(F&& f) const&& {
+			using result = detail::invoke_result_t<F, const T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+#endif
+#endif
+
+#if defined(SOL_TL_OPTIONAL_CXX14) && !defined(SOL_TL_OPTIONAL_GCC49) && !defined(SOL_TL_OPTIONAL_GCC54) && !defined(SOL_TL_OPTIONAL_GCC55)
+		/// \brief Carries out some operation on the stored object if there is one.
+		/// \returns Let `U` be the result of `std::invoke(std::forward<F>(f),
+		/// value())`. Returns a `std::optional<U>`. The return value is empty if
+		/// `*this` is empty, otherwise an `optional<U>` is constructed from the
+		/// return value of `std::invoke(std::forward<F>(f), value())` and is
+		/// returned.
+		///
+		/// \group map
+		/// \synopsis template <class F> constexpr auto map(F &&f) &;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR auto map(F&& f) & {
+			return detail::optional_map_impl(*this, std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> constexpr auto map(F &&f) &&;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR auto map(F&& f) && {
+			return detail::optional_map_impl(std::move(*this), std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> constexpr auto map(F &&f) const&;
+		template <class F>
+		constexpr auto map(F&& f) const& {
+			return detail::optional_map_impl(*this, std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> constexpr auto map(F &&f) const&&;
+		template <class F>
+		constexpr auto map(F&& f) const&& {
+			return detail::optional_map_impl(std::move(*this), std::forward<F>(f));
+		}
+#else
+		/// \brief Carries out some operation on the stored object if there is one.
+		/// \returns Let `U` be the result of `std::invoke(std::forward<F>(f),
+		/// value())`. Returns a `std::optional<U>`. The return value is empty if
+		/// `*this` is empty, otherwise an `optional<U>` is constructed from the
+		/// return value of `std::invoke(std::forward<F>(f), value())` and is
+		/// returned.
+		///
+		/// \group map
+		/// \synopsis template <class F> auto map(F &&f) &;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR decltype(detail::optional_map_impl(std::declval<optional&>(), std::declval<F&&>())) map(F&& f) & {
+			return detail::optional_map_impl(*this, std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> auto map(F &&f) &&;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR decltype(detail::optional_map_impl(std::declval<optional&&>(), std::declval<F&&>())) map(F&& f) && {
+			return detail::optional_map_impl(std::move(*this), std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> auto map(F &&f) const&;
+		template <class F>
+		constexpr decltype(detail::optional_map_impl(std::declval<const optional&>(), std::declval<F&&>())) map(F&& f) const& {
+			return detail::optional_map_impl(*this, std::forward<F>(f));
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group map
+		/// \synopsis template <class F> auto map(F &&f) const&&;
+		template <class F>
+		constexpr decltype(detail::optional_map_impl(std::declval<const optional&&>(), std::declval<F&&>())) map(F&& f) const&& {
+			return detail::optional_map_impl(std::move(*this), std::forward<F>(f));
+		}
+#endif
+#endif
+
+		/// \brief Calls `f` if the optional is empty
+		/// \requires `std::invoke_result_t<F>` must be void or convertible to
+		/// `optional<T>`. \effects If `*this` has a value, returns `*this`.
+		/// Otherwise, if `f` returns `void`, calls `std::forward<F>(f)` and returns
+		/// `std::nullopt`. Otherwise, returns `std::forward<F>(f)()`.
+		///
+		/// \group or_else
+		/// \synopsis template <class F> optional<T> or_else (F &&f) &;
+		template <class F, detail::enable_if_ret_void<F>* = nullptr>
+		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) & {
+			if (has_value())
+				return *this;
+
+			std::forward<F>(f)();
+			return nullopt;
+		}
+
+		/// \exclude
+		template <class F, detail::disable_if_ret_void<F>* = nullptr>
+		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) & {
+			return has_value() ? *this : std::forward<F>(f)();
+		}
+
+		/// \group or_else
+		/// \synopsis template <class F> optional<T> or_else (F &&f) &&;
+		template <class F, detail::enable_if_ret_void<F>* = nullptr>
+		optional<T> or_else(F&& f) && {
+			if (has_value())
+				return std::move(*this);
+
+			std::forward<F>(f)();
+			return nullopt;
+		}
+
+		/// \exclude
+		template <class F, detail::disable_if_ret_void<F>* = nullptr>
+		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) && {
+			return has_value() ? std::move(*this) : std::forward<F>(f)();
+		}
+
+		/// \group or_else
+		/// \synopsis template <class F> optional<T> or_else (F &&f) const &;
+		template <class F, detail::enable_if_ret_void<F>* = nullptr>
+		optional<T> or_else(F&& f) const& {
+			if (has_value())
+				return *this;
+
+			std::forward<F>(f)();
+			return nullopt;
+		}
+
+		/// \exclude
+		template <class F, detail::disable_if_ret_void<F>* = nullptr>
+		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) const& {
+			return has_value() ? *this : std::forward<F>(f)();
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \exclude
+		template <class F, detail::enable_if_ret_void<F>* = nullptr>
+		optional<T> or_else(F&& f) const&& {
+			if (has_value())
+				return std::move(*this);
+
+			std::forward<F>(f)();
+			return nullopt;
+		}
+
+		/// \exclude
+		template <class F, detail::disable_if_ret_void<F>* = nullptr>
+		optional<T> or_else(F&& f) const&& {
+			return has_value() ? std::move(*this) : std::forward<F>(f)();
+		}
+#endif
+
+		/// \brief Maps the stored value with `f` if there is one, otherwise returns
+		/// `u`.
+		///
+		/// \details If there is a value stored, then `f` is called with `**this`
+		/// and the value is returned. Otherwise `u` is returned.
+		///
+		/// \group map_or
+		template <class F, class U>
+		U map_or(F&& f, U&& u) & {
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u);
+		}
+
+		/// \group map_or
+		template <class F, class U>
+		U map_or(F&& f, U&& u) && {
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u);
+		}
+
+		/// \group map_or
+		template <class F, class U>
+		U map_or(F&& f, U&& u) const& {
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group map_or
+		template <class F, class U>
+		U map_or(F&& f, U&& u) const&& {
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u);
+		}
+#endif
+
+		/// \brief Maps the stored value with `f` if there is one, otherwise calls
+		/// `u` and returns the result.
+		///
+		/// \details If there is a value stored, then `f` is
+		/// called with `**this` and the value is returned. Otherwise
+		/// `std::forward<U>(u)()` is returned.
+		///
+		/// \group map_or_else
+		/// \synopsis template <class F, class U> \n auto map_or_else(F &&f, U &&u) &;
+		template <class F, class U>
+		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) & {
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u)();
+		}
+
+		/// \group map_or_else
+		/// \synopsis template <class F, class U> \n auto map_or_else(F &&f, U &&u)
+		/// &&;
+		template <class F, class U>
+		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) && {
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u)();
+		}
+
+		/// \group map_or_else
+		/// \synopsis template <class F, class U> \n auto map_or_else(F &&f, U &&u)
+		/// const &;
+		template <class F, class U>
+		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) const& {
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u)();
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group map_or_else
+		/// \synopsis template <class F, class U> \n auto map_or_else(F &&f, U &&u)
+		/// const &&;
+		template <class F, class U>
+		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) const&& {
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u)();
+		}
+#endif
+
+		/// \returns `u` if `*this` has a value, otherwise an empty optional.
+		template <class U>
+		constexpr optional<typename std::decay<U>::type> conjunction(U&& u) const {
+			using result = optional<detail::decay_t<U>>;
+			return has_value() ? result { u } : result { nullopt };
+		}
+
+		/// \returns `rhs` if `*this` is empty, otherwise the current value.
+		/// \group disjunction
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(const optional& rhs) & {
+			return has_value() ? *this : rhs;
+		}
+
+		/// \group disjunction
+		constexpr optional disjunction(const optional& rhs) const& {
+			return has_value() ? *this : rhs;
+		}
+
+		/// \group disjunction
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(const optional& rhs) && {
+			return has_value() ? std::move(*this) : rhs;
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group disjunction
+		constexpr optional disjunction(const optional& rhs) const&& {
+			return has_value() ? std::move(*this) : rhs;
+		}
+#endif
+
+		/// \group disjunction
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(optional&& rhs) & {
+			return has_value() ? *this : std::move(rhs);
+		}
+
+		/// \group disjunction
+		constexpr optional disjunction(optional&& rhs) const& {
+			return has_value() ? *this : std::move(rhs);
+		}
+
+		/// \group disjunction
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(optional&& rhs) && {
+			return has_value() ? std::move(*this) : std::move(rhs);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group disjunction
+		constexpr optional disjunction(optional&& rhs) const&& {
+			return has_value() ? std::move(*this) : std::move(rhs);
+		}
+#endif
+
+		/// Takes the value out of the optional, leaving it empty
+		/// \group take
+		optional take() & {
+			optional ret = *this;
+			reset();
+			return ret;
+		}
+
+		/// \group take
+		optional take() const& {
+			optional ret = *this;
+			reset();
+			return ret;
+		}
+
+		/// \group take
+		optional take() && {
+			optional ret = std::move(*this);
+			reset();
+			return ret;
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group take
+		optional take() const&& {
+			optional ret = std::move(*this);
+			reset();
+			return ret;
+		}
+#endif
+
+		using value_type = T&;
+
+		/// Constructs an optional that does not contain a value.
+		/// \group ctor_empty
+		constexpr optional() noexcept : m_value(nullptr) {
+		}
+
+		/// \group ctor_empty
+		constexpr optional(nullopt_t) noexcept : m_value(nullptr) {
+		}
+
+		/// Copy constructor
+		///
+		/// If `rhs` contains a value, the stored value is direct-initialized with
+		/// it. Otherwise, the constructed optional is empty.
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional(const optional& rhs) noexcept = default;
+
+		/// Move constructor
+		///
+		/// If `rhs` contains a value, the stored value is direct-initialized with
+		/// it. Otherwise, the constructed optional is empty.
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional(optional&& rhs) = default;
+
+		/// Constructs the stored value with `u`.
+		/// \synopsis template <class U=T> constexpr optional(U &&u);
+		template <class U = T, detail::enable_if_t<!detail::is_optional<detail::decay_t<U>>::value>* = nullptr>
+		constexpr optional(U&& u) : m_value(std::addressof(u)) {
+			static_assert(std::is_lvalue_reference<U>::value, "U must be an lvalue");
+		}
+
+		/// \exclude
+		template <class U>
+		constexpr explicit optional(const optional<U>& rhs) : optional(*rhs) {
+		}
+
+		/// No-op
+		~optional() = default;
+
+		/// Assignment to empty.
+		///
+		/// Destroys the current value if there is one.
+		optional& operator=(nullopt_t) noexcept {
+			m_value = nullptr;
+			return *this;
+		}
+
+		/// Copy assignment.
+		///
+		/// Rebinds this optional to the referee of `rhs` if there is one. Otherwise
+		/// resets the stored value in `*this`.
+		optional& operator=(const optional& rhs) = default;
+
+		/// Rebinds this optional to `u`.
+		///
+		/// \requires `U` must be an lvalue reference.
+		/// \synopsis optional &operator=(U &&u);
+		template <class U = T, detail::enable_if_t<!detail::is_optional<detail::decay_t<U>>::value>* = nullptr>
+		optional& operator=(U&& u) {
+			static_assert(std::is_lvalue_reference<U>::value, "U must be an lvalue");
+			m_value = std::addressof(u);
+			return *this;
+		}
+
+		/// Converting copy assignment operator.
+		///
+		/// Rebinds this optional to the referee of `rhs` if there is one. Otherwise
+		/// resets the stored value in `*this`.
+		template <class U>
+		optional& operator=(const optional<U>& rhs) {
+			m_value = std::addressof(rhs.value());
+			return *this;
+		}
+
+		/// Constructs the value in-place, destroying the current one if there is
+		/// one.
+		///
+		/// \group emplace
+		template <class... Args>
+		T& emplace(Args&&... args) noexcept {
+			static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args");
+
+			*this = nullopt;
+			this->construct(std::forward<Args>(args)...);
+		}
+
+		/// Swaps this optional with the other.
+		///
+		/// If neither optionals have a value, nothing happens.
+		/// If both have a value, the values are swapped.
+		/// If one has a value, it is moved to the other and the movee is left
+		/// valueless.
+		void swap(optional& rhs) noexcept {
+			std::swap(m_value, rhs.m_value);
+		}
+
+		/// \returns a pointer to the stored value
+		/// \requires a value is stored
+		/// \group pointer
+		/// \synopsis constexpr const T *operator->() const;
+		constexpr const T* operator->() const {
+			return m_value;
+		}
+
+		/// \group pointer
+		/// \synopsis constexpr T *operator->();
+		SOL_TL_OPTIONAL_11_CONSTEXPR T* operator->() {
+			return m_value;
+		}
+
+		/// \returns the stored value
+		/// \requires a value is stored
+		/// \group deref
+		/// \synopsis constexpr T &operator*();
+		SOL_TL_OPTIONAL_11_CONSTEXPR T& operator*() {
+			return *m_value;
+		}
+
+		/// \group deref
+		/// \synopsis constexpr const T &operator*() const;
+		constexpr const T& operator*() const {
+			return *m_value;
+		}
+
+		/// \returns whether or not the optional has a value
+		/// \group has_value
+		constexpr bool has_value() const noexcept {
+			return m_value != nullptr;
+		}
+
+		/// \group has_value
+		constexpr explicit operator bool() const noexcept {
+			return m_value != nullptr;
+		}
+
+		/// \returns the contained value if there is one, otherwise throws
+		/// [bad_optional_access]
+		/// \group value
+		/// synopsis constexpr T &value();
+		SOL_TL_OPTIONAL_11_CONSTEXPR T& value() {
+			if (has_value())
+				return *m_value;
+#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
+			std::abort();
+#else
+			throw bad_optional_access();
+#endif // No exceptions allowed
+		}
+		/// \group value
+		/// \synopsis constexpr const T &value() const;
+		SOL_TL_OPTIONAL_11_CONSTEXPR const T& value() const {
+			if (has_value())
+				return *m_value;
+#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
+			std::abort();
+#else
+			throw bad_optional_access();
+#endif // No exceptions allowed
+		}
+
+		/// \returns the stored value if there is one, otherwise returns `u`
+		/// \group value_or
+		template <class U>
+		constexpr T& value_or(U&& u) const {
+			static_assert(std::is_convertible<U&&, T&>::value, "T must be convertible from U");
+			return has_value() ? const_cast<T&>(**this) : static_cast<T&>(std::forward<U>(u));
+		}
+
+		/// Destroys the stored value if one exists, making the optional empty
+		void reset() noexcept {
+			m_value = nullptr;
+		}
+
+	private:
+		T* m_value;
+	};
+
+} // namespace sol
+
+namespace std {
+	// TODO SFINAE
+	template <class T>
+	struct hash<::sol::optional<T>> {
+		::std::size_t operator()(const ::sol::optional<T>& o) const {
+			if (!o.has_value())
+				return 0;
+
+			return ::std::hash<::sol::detail::remove_const_t<T>>()(*o);
+		}
+	};
+} // namespace std
+
+#endif // SOL_TL_OPTIONAL_HPP
diff --git a/extern/sol3/sol/overload.hpp b/extern/sol3/sol/overload.hpp
new file mode 100644
index 0000000000..74b7bcf6fa
--- /dev/null
+++ b/extern/sol3/sol/overload.hpp
@@ -0,0 +1,49 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_OVERLOAD_HPP
+#define SOL_OVERLOAD_HPP
+
+#include <sol/traits.hpp>
+#include <utility>
+
+namespace sol {
+	template <typename... Functions>
+	struct overload_set {
+		std::tuple<Functions...> functions;
+		template <typename Arg, typename... Args, meta::disable<std::is_same<overload_set, meta::unqualified_t<Arg>>> = meta::enabler>
+		overload_set(Arg&& arg, Args&&... args) : functions(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+		}
+		overload_set(const overload_set&) = default;
+		overload_set(overload_set&&) = default;
+		overload_set& operator=(const overload_set&) = default;
+		overload_set& operator=(overload_set&&) = default;
+	};
+
+	template <typename... Args>
+	decltype(auto) overload(Args&&... args) {
+		return overload_set<std::decay_t<Args>...>(std::forward<Args>(args)...);
+	}
+} // namespace sol
+
+#endif // SOL_OVERLOAD_HPP
\ No newline at end of file
diff --git a/extern/sol3/sol/packaged_coroutine.hpp b/extern/sol3/sol/packaged_coroutine.hpp
new file mode 100644
index 0000000000..0f242306ac
--- /dev/null
+++ b/extern/sol3/sol/packaged_coroutine.hpp
@@ -0,0 +1,262 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_PACKAGED_COROUTINE_HPP
+#define SOL_PACKAGED_COROUTINE_HPP
+
+#include <sol/reference.hpp>
+#include <sol/object.hpp>
+#include <sol/stack.hpp>
+#include <sol/function_result.hpp>
+#include <sol/thread.hpp>
+#include <sol/protected_handler.hpp>
+#include <sol/coroutine.hpp>
+
+namespace sol {
+
+#if 0
+
+	class packaged_coroutine {
+	private:
+		lua_State* m_L;
+		sol::stateless_reference m_coroutine_reference;
+		sol::stateless_reference m_error_handler;
+		sol::thread m_thread_reference;
+
+		void luacall(std::ptrdiff_t argcount, std::ptrdiff_t) {
+#if SOL_LUA_VERSION_I_ >= 504
+			int nresults;
+			stats = static_cast<call_status>(lua_resume(lua_state(), nullptr, static_cast<int>(argcount), &nresults));
+#else
+			stats = static_cast<call_status>(lua_resume(lua_state(), nullptr, static_cast<int>(argcount)));
+#endif
+		}
+
+		template <std::size_t... I, typename... Ret>
+		auto invoke(types<Ret...>, std::index_sequence<I...>, std::ptrdiff_t n) {
+			luacall(n, sizeof...(Ret));
+			return stack::pop<std::tuple<Ret...>>(lua_state());
+		}
+
+		template <std::size_t I, typename Ret>
+		Ret invoke(types<Ret>, std::index_sequence<I>, std::ptrdiff_t n) {
+			luacall(n, 1);
+			return stack::pop<Ret>(lua_state());
+		}
+
+		template <std::size_t I>
+		void invoke(types<void>, std::index_sequence<I>, std::ptrdiff_t n) {
+			luacall(n, 0);
+		}
+
+		protected_function_result invoke(types<>, std::index_sequence<>, std::ptrdiff_t n) {
+			int firstreturn = 1;
+			luacall(n, LUA_MULTRET);
+			int poststacksize = lua_gettop(this->lua_state());
+			int returncount = poststacksize - (firstreturn - 1);
+			if (error()) {
+				if (m_error_handler.valid()) {
+					string_view err = stack::get<string_view>(this->lua_state(), poststacksize);
+					m_error_handler.push();
+					stack::push(this->lua_state(), err);
+					lua_call(lua_state(), 1, 1);
+				}
+				return protected_function_result(this->lua_state(), lua_absindex(this->lua_state(), -1), 1, returncount, status());
+			}
+			return protected_function_result(this->lua_state(), firstreturn, returncount, returncount, status());
+		}
+
+	public:
+		using base_t::lua_state;
+
+		basic_packaged_coroutine() = default;
+		template <typename T,
+		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_packaged_coroutine>>,
+		          meta::neg<std::is_base_of<proxy_base_tag, meta::unqualified_t<T>>>, meta::neg<std::is_same<base_t, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_packaged_coroutine(T&& r) noexcept
+		: base_t(std::forward<T>(r)), m_error_handler(detail::get_default_handler<reference, is_main_threaded<base_t>::value>(r.lua_state())) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			if (!is_function<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				constructor_handler handler {};
+				stack::check<basic_packaged_coroutine>(lua_state(), -1, handler);
+			}
+#endif // Safety
+		}
+
+		basic_packaged_coroutine(const basic_packaged_coroutine& other) = default;
+		basic_packaged_coroutine& operator=(const basic_packaged_coroutine&) = default;
+
+		basic_packaged_coroutine(basic_packaged_coroutine&& other) noexcept
+		: base_t(std::move(other)), m_error_handler(this->lua_state(), std::move(other.m_error_handler)) {
+		}
+
+		basic_packaged_coroutine& operator=(basic_packaged_coroutine&& other) noexcept {
+			base_t::operator=(std::move(other));
+			// must change the state, since it could change on the coroutine type
+			m_error_handler.abandon();
+			m_error_handler = handler_t(this->lua_state(), std::move(other.m_error_handler));
+			return *this;
+		}
+
+		basic_packaged_coroutine(const basic_function<base_t>& b) noexcept
+		: basic_packaged_coroutine(b, detail::get_default_handler<reference, is_main_threaded_v<base_t>>(b.lua_state())) {
+		}
+		basic_packaged_coroutine(basic_function<base_t>&& b) noexcept
+		: basic_packaged_coroutine(std::move(b), detail::get_default_handler<reference, is_main_threaded_v<base_t>>(b.lua_state())) {
+		}
+		basic_packaged_coroutine(const basic_function<base_t>& b, handler_t eh) noexcept : base_t(b), m_error_handler(std::move(eh)) {
+		}
+		basic_packaged_coroutine(basic_function<base_t>&& b, handler_t eh) noexcept : base_t(std::move(b)), m_error_handler(std::move(eh)) {
+		}
+		basic_packaged_coroutine(const stack_reference& r) noexcept
+		: basic_packaged_coroutine(r.lua_state(), r.stack_index(), detail::get_default_handler<reference, is_main_threaded<base_t>::value>(r.lua_state())) {
+		}
+		basic_packaged_coroutine(stack_reference&& r) noexcept
+		: basic_packaged_coroutine(r.lua_state(), r.stack_index(), detail::get_default_handler<reference, is_main_threaded<base_t>::value>(r.lua_state())) {
+		}
+		basic_packaged_coroutine(const stack_reference& r, handler_t eh) noexcept : basic_packaged_coroutine(r.lua_state(), r.stack_index(), std::move(eh)) {
+		}
+		basic_packaged_coroutine(stack_reference&& r, handler_t eh) noexcept : basic_packaged_coroutine(r.lua_state(), r.stack_index(), std::move(eh)) {
+		}
+
+		template <typename Super>
+		basic_packaged_coroutine(const proxy_base<Super>& p)
+		: basic_packaged_coroutine(p, detail::get_default_handler<reference, is_main_threaded<base_t>::value>(p.lua_state())) {
+		}
+		template <typename Super>
+		basic_packaged_coroutine(proxy_base<Super>&& p)
+		: basic_packaged_coroutine(std::move(p), detail::get_default_handler<reference, is_main_threaded<base_t>::value>(p.lua_state())) {
+		}
+		template <typename Proxy, typename HandlerReference,
+		     meta::enable<std::is_base_of<proxy_base_tag, meta::unqualified_t<Proxy>>, meta::neg<is_lua_index<meta::unqualified_t<HandlerReference>>>> = meta::enabler>
+		basic_packaged_coroutine(Proxy&& p, HandlerReference&& eh) : basic_packaged_coroutine(detail::force_cast<base_t>(p), std::forward<HandlerReference>(eh)) {
+		}
+
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_packaged_coroutine(lua_State* L, T&& r) noexcept
+		: basic_packaged_coroutine(L, std::forward<T>(r), detail::get_default_handler<reference, is_main_threaded<base_t>::value>(L)) {
+		}
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_packaged_coroutine(lua_State* L, T&& r, handler_t eh) : base_t(L, std::forward<T>(r)), m_error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_packaged_coroutine>(lua_state(), -1, handler);
+#endif // Safety
+		}
+
+		basic_packaged_coroutine(lua_nil_t n) : base_t(n), m_error_handler(n) {
+		}
+
+		basic_packaged_coroutine(lua_State* L, int index = -1)
+		: basic_packaged_coroutine(L, index, detail::get_default_handler<reference, is_main_threaded<base_t>::value>(L)) {
+		}
+		basic_packaged_coroutine(lua_State* L, int index, handler_t eh) : base_t(L, index), m_error_handler(std::move(eh)) {
+#ifdef SOL_SAFE_REFERENCES
+			constructor_handler handler {};
+			stack::check<basic_packaged_coroutine>(L, index, handler);
+#endif // Safety
+		}
+		basic_packaged_coroutine(lua_State* L, absolute_index index)
+		: basic_packaged_coroutine(L, index, detail::get_default_handler<reference, is_main_threaded<base_t>::value>(L)) {
+		}
+		basic_packaged_coroutine(lua_State* L, absolute_index index, handler_t eh) : base_t(L, index), m_error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			constructor_handler handler {};
+			stack::check<basic_packaged_coroutine>(L, index, handler);
+#endif // Safety
+		}
+		basic_packaged_coroutine(lua_State* L, raw_index index)
+		: basic_packaged_coroutine(L, index, detail::get_default_handler<reference, is_main_threaded<base_t>::value>(L)) {
+		}
+		basic_packaged_coroutine(lua_State* L, raw_index index, handler_t eh) : base_t(L, index), m_error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			constructor_handler handler {};
+			stack::check<basic_packaged_coroutine>(L, index, handler);
+#endif // Safety
+		}
+		basic_packaged_coroutine(lua_State* L, ref_index index)
+		: basic_packaged_coroutine(L, index, detail::get_default_handler<reference, is_main_threaded<base_t>::value>(L)) {
+		}
+		basic_packaged_coroutine(lua_State* L, ref_index index, handler_t eh) : base_t(L, index), m_error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_packaged_coroutine>(lua_state(), -1, handler);
+#endif // Safety
+		}
+
+		call_status status() const noexcept {
+			return stats;
+		}
+
+		bool error() const noexcept {
+			call_status cs = status();
+			return cs != call_status::ok && cs != call_status::yielded;
+		}
+
+		bool runnable() const noexcept {
+			return base_t::valid() && (status() == call_status::yielded);
+		}
+
+		reference error_handler() const noexcept {
+			return reference(m_L, registry_index(m_error_handler.index));
+		}
+
+		set_error_handler(reference new_error_handler) noexcept {
+			this->m_error_handler = stateless_reference(this->m_L, std::move(new_error_handler));
+		}
+
+		explicit operator bool() const noexcept {
+			return runnable();
+		}
+
+		template <typename... Args>
+		protected_function_result operator()(Args&&... args) {
+			return call<>(std::forward<Args>(args)...);
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) operator()(types<Ret...>, Args&&... args) {
+			return call<Ret...>(std::forward<Args>(args)...);
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) call(Args&&... args) {
+			// some users screw up coroutine.create
+			// and try to use it with sol::coroutine without ever calling the first resume in Lua
+			// this makes the stack incompatible with other kinds of stacks: protect against this
+			// make sure coroutines don't screw us over
+			base_t::push();
+			int pushcount = stack::multi_push_reference(lua_state(), std::forward<Args>(args)...);
+			return invoke(types<Ret...>(), std::make_index_sequence<sizeof...(Ret)>(), pushcount);
+		}
+	};
+
+#endif
+
+} // namespace sol
+
+#endif // SOL_PACKAGED_COROUTINE_HPP
diff --git a/extern/sol3/sol/pairs_iterator.hpp b/extern/sol3/sol/pairs_iterator.hpp
new file mode 100644
index 0000000000..b68c18de76
--- /dev/null
+++ b/extern/sol3/sol/pairs_iterator.hpp
@@ -0,0 +1,275 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_PAIRS_ITERATOR_HPP
+#define SOL_PAIRS_ITERATOR_HPP
+
+#include <sol/version.hpp>
+
+#include <sol/reference.hpp>
+#include <sol/stack_reference.hpp>
+#include <sol/table_iterator.hpp>
+#include <sol/protected_function.hpp>
+
+#include <sol/stack/detail/pairs.hpp>
+
+namespace sol {
+
+	struct pairs_sentinel { };
+
+	class pairs_iterator {
+	private:
+		inline static constexpr int empty_key_index = -1;
+
+	public:
+		using key_type = object;
+		using mapped_type = object;
+		using value_type = std::pair<object, object>;
+		using iterator_category = std::input_iterator_tag;
+		using difference_type = std::ptrdiff_t;
+		using pointer = value_type*;
+		using const_pointer = value_type const*;
+		using reference = value_type&;
+		using const_reference = const value_type&;
+
+		pairs_iterator() noexcept
+		: m_L(nullptr)
+		, m_next_function_ref(lua_nil)
+		, m_table_ref(lua_nil)
+		, m_cached_key_value_pair({ lua_nil, lua_nil })
+		, m_key_index(empty_key_index)
+		, m_iteration_index(0) {
+		}
+
+		pairs_iterator(const pairs_iterator&) = delete;
+		pairs_iterator& operator=(const pairs_iterator&) = delete;
+
+		pairs_iterator(pairs_iterator&& right) noexcept
+		: m_L(right.m_L)
+		, m_next_function_ref(std::move(right.m_next_function_ref))
+		, m_table_ref(std::move(right.m_table_ref))
+		, m_cached_key_value_pair(std::move(right.m_cached_key_value_pair))
+		, m_key_index(right.m_key_index)
+		, m_iteration_index(right.m_iteration_index) {
+			right.m_key_index = empty_key_index;
+		}
+
+		pairs_iterator& operator=(pairs_iterator&& right) noexcept {
+			m_L = right.m_L;
+			m_next_function_ref = std::move(right.m_next_function_ref);
+			m_table_ref = std::move(right.m_table_ref);
+			m_cached_key_value_pair = std::move(right.m_cached_key_value_pair);
+			m_key_index = right.m_key_index;
+			m_iteration_index = right.m_iteration_index;
+			right.m_key_index = empty_key_index;
+			return *this;
+		}
+
+		template <typename Source>
+		pairs_iterator(const Source& source_) noexcept : m_L(source_.lua_state()), m_key_index(empty_key_index), m_iteration_index(0) {
+			if (m_L == nullptr || !source_.valid()) {
+				m_key_index = empty_key_index;
+				return;
+			}
+			int source_index = -source_.push(m_L);
+			int abs_source_index = lua_absindex(m_L, source_index);
+			int metatable_exists = lua_getmetatable(m_L, abs_source_index);
+			lua_remove(m_L, abs_source_index);
+			if (metatable_exists == 1) {
+				// just has a metatable, but does it have __pairs ?
+				stack_reference metatable(m_L, raw_index(abs_source_index));
+				stack::get_field<is_global_table_v<Source>, true>(m_L, meta_function::pairs, metatable.stack_index());
+				optional<protected_function> maybe_pairs_function = stack::pop<optional<protected_function>>(m_L);
+				if (maybe_pairs_function.has_value()) {
+					protected_function& pairs_function = *maybe_pairs_function;
+					protected_function_result next_fn_and_table_and_first_key = pairs_function(source_);
+					if (next_fn_and_table_and_first_key.valid()) {
+						m_next_function_ref = next_fn_and_table_and_first_key.get<protected_function>(0);
+						m_table_ref = next_fn_and_table_and_first_key.get<sol::reference>(1);
+						m_key_index = next_fn_and_table_and_first_key.stack_index() - 1;
+						// remove next function and table
+						lua_remove(m_L, m_key_index);
+						lua_remove(m_L, m_key_index);
+						next_fn_and_table_and_first_key.abandon();
+						lua_remove(m_L, abs_source_index);
+						this->operator++();
+						m_iteration_index = 0;
+						return;
+					}
+				}
+			}
+
+			{
+				auto maybe_next = stack::stack_detail::find_lua_next_function(m_L);
+				if (maybe_next.has_value()) {
+					m_next_function_ref = std::move(*maybe_next);
+					m_table_ref = source_;
+
+					stack::push(m_L, lua_nil);
+					m_key_index = lua_gettop(m_L);
+					this->operator++();
+					m_iteration_index = 0;
+					return;
+				}
+			}
+
+			// okay, so none of the above worked and now we need to create
+			// a shim / polyfill instead
+			stack::push(m_L, &stack::stack_detail::c_lua_next);
+			m_next_function_ref = stack::pop<protected_function>(m_L);
+			m_table_ref = source_;
+			stack::push(m_L, lua_nil);
+			m_key_index = lua_gettop(m_L);
+			this->operator++();
+			m_iteration_index = 0;
+		}
+
+		pairs_iterator& operator++() {
+			if (m_key_index == empty_key_index) {
+				return *this;
+			}
+			{
+				sol::protected_function_result next_results = m_next_function_ref(m_table_ref, stack_reference(m_L, m_key_index));
+				if (!next_results.valid()) {
+					// TODO: abort, or throw an error?
+					m_clear();
+					m_key_index = empty_key_index;
+					return *this;
+				}
+				int next_results_count = next_results.return_count();
+				if (next_results_count < 2) {
+					// iteration is over!
+					next_results.abandon();
+					lua_settop(m_L, m_key_index - 1);
+					m_key_index = empty_key_index;
+					++m_iteration_index;
+					return *this;
+				}
+				else {
+					lua_remove(m_L, m_key_index);
+					m_key_index = next_results.stack_index() - 1;
+					m_cached_key_value_pair.first = stack::get<object>(m_L, m_key_index);
+					m_cached_key_value_pair.second = stack::get<object>(m_L, m_key_index + 1);
+					lua_settop(m_L, m_key_index);
+					next_results.abandon();
+				}
+			}
+			++m_iteration_index;
+			return *this;
+		}
+
+		std::ptrdiff_t index() const {
+			return static_cast<std::ptrdiff_t>(m_iteration_index);
+		}
+
+		const_reference operator*() const noexcept {
+			return m_cached_key_value_pair;
+		}
+
+		reference operator*() noexcept {
+			return m_cached_key_value_pair;
+		}
+
+		friend bool operator==(const pairs_iterator& left, const pairs_iterator& right) noexcept {
+			return left.m_table_ref == right.m_table_ref && left.m_iteration_index == right.m_iteration_index;
+		}
+
+		friend bool operator!=(const pairs_iterator& left, const pairs_iterator& right) noexcept {
+			return left.m_table_ref != right.m_table_ref || left.m_iteration_index != right.m_iteration_index;
+		}
+
+		friend bool operator==(const pairs_iterator& left, const pairs_sentinel&) noexcept {
+			return left.m_key_index == empty_key_index;
+		}
+
+		friend bool operator!=(const pairs_iterator& left, const pairs_sentinel&) noexcept {
+			return left.m_key_index != empty_key_index;
+		}
+
+		friend bool operator==(const pairs_sentinel&, const pairs_iterator& left) noexcept {
+			return left.m_key_index == empty_key_index;
+		}
+
+		friend bool operator!=(const pairs_sentinel&, const pairs_iterator& left) noexcept {
+			return left.m_key_index != empty_key_index;
+		}
+
+		~pairs_iterator() {
+			if (m_key_index != empty_key_index) {
+				m_clear();
+			}
+		}
+
+	private:
+		void m_clear() noexcept {
+			lua_remove(m_L, m_key_index);
+		}
+
+		lua_State* m_L;
+		protected_function m_next_function_ref;
+		sol::reference m_table_ref;
+		std::pair<object, object> m_cached_key_value_pair;
+		int m_key_index;
+		int m_iteration_index;
+	};
+
+	template <typename Source>
+	class basic_pairs_range {
+	private:
+		using source_t = std::add_lvalue_reference_t<Source>;
+		source_t m_source;
+
+	public:
+		using iterator = pairs_iterator;
+		using const_iterator = pairs_iterator;
+
+		basic_pairs_range(source_t source_) noexcept : m_source(source_) {
+		}
+
+		iterator begin() noexcept {
+			return iterator(m_source);
+		}
+
+		iterator begin() const noexcept {
+			return iterator(m_source);
+		}
+
+		const_iterator cbegin() const noexcept {
+			return const_iterator(m_source);
+		}
+
+		pairs_sentinel end() noexcept {
+			return {};
+		}
+
+		pairs_sentinel end() const noexcept {
+			return {};
+		}
+
+		pairs_sentinel cend() const noexcept {
+			return {};
+		}
+	};
+} // namespace sol
+
+#endif // SOL_PAIRS_ITERATOR_HPP
diff --git a/extern/sol3/sol/pointer_like.hpp b/extern/sol3/sol/pointer_like.hpp
new file mode 100644
index 0000000000..80bf58cb76
--- /dev/null
+++ b/extern/sol3/sol/pointer_like.hpp
@@ -0,0 +1,102 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_POINTER_LIKE_HPP
+#define SOL_POINTER_LIKE_HPP
+
+#include <sol/base_traits.hpp>
+
+#include <utility>
+#include <type_traits>
+
+namespace sol {
+
+	namespace meta {
+		namespace meta_detail {
+			template <typename T>
+			using is_dereferenceable_test = decltype(*std::declval<T>());
+
+			template <typename T>
+			using is_explicitly_dereferenceable_test = decltype(std::declval<T>().operator*());
+		} // namespace meta_detail
+
+		template <typename T>
+		using is_pointer_like = std::integral_constant<bool,
+		     !std::is_array_v<T> && (std::is_pointer_v<T> || is_detected_v<meta_detail::is_explicitly_dereferenceable_test, T>)>;
+
+		template <typename T>
+		constexpr inline bool is_pointer_like_v = is_pointer_like<T>::value;
+	} // namespace meta
+
+	namespace detail {
+
+		template <typename T>
+		auto unwrap(T&& item) -> decltype(std::forward<T>(item)) {
+			return std::forward<T>(item);
+		}
+
+		template <typename T>
+		T& unwrap(std::reference_wrapper<T> arg) {
+			return arg.get();
+		}
+
+		template <typename T>
+		inline decltype(auto) deref(T&& item) {
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (meta::is_pointer_like_v<Tu>) {
+				return *std::forward<T>(item);
+			}
+			else {
+				return std::forward<T>(item);
+			}
+		}
+
+		template <typename T>
+		inline decltype(auto) deref_move_only(T&& item) {
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (meta::is_pointer_like_v<Tu> && !std::is_pointer_v<Tu> && !std::is_copy_constructible_v<Tu>) {
+				return *std::forward<T>(item);
+			}
+			else {
+				return std::forward<T>(item);
+			}
+		}
+
+		template <typename T>
+		inline T* ptr(T& val) {
+			return std::addressof(val);
+		}
+
+		template <typename T>
+		inline T* ptr(std::reference_wrapper<T> val) {
+			return std::addressof(val.get());
+		}
+
+		template <typename T>
+		inline T* ptr(T* val) {
+			return val;
+		}
+	} // namespace detail
+} // namespace sol
+
+#endif // SOL_POINTER_LIKE_HPP
diff --git a/extern/sol3/sol/policies.hpp b/extern/sol3/sol/policies.hpp
new file mode 100644
index 0000000000..90789b78e3
--- /dev/null
+++ b/extern/sol3/sol/policies.hpp
@@ -0,0 +1,98 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_FILTERS_HPP
+#define SOL_FILTERS_HPP
+
+#include <sol/traits.hpp>
+
+#include <array>
+
+namespace sol {
+	namespace detail {
+		struct policy_base_tag { };
+	} // namespace detail
+
+	template <int Target, int... In>
+	struct static_stack_dependencies : detail::policy_base_tag { };
+	typedef static_stack_dependencies<-1, 1> self_dependency;
+	template <int... In>
+	struct returns_self_with : detail::policy_base_tag { };
+	typedef returns_self_with<> returns_self;
+
+	struct stack_dependencies : detail::policy_base_tag {
+		int target;
+		std::array<int, 64> stack_indices;
+		std::size_t len;
+
+		template <typename... Args>
+		stack_dependencies(int stack_target, Args&&... args) : target(stack_target), stack_indices(), len(sizeof...(Args)) {
+			std::size_t i = 0;
+			(void)detail::swallow { int(), (stack_indices[i++] = static_cast<int>(std::forward<Args>(args)), int())... };
+		}
+
+		int& operator[](std::size_t i) {
+			return stack_indices[i];
+		}
+
+		const int& operator[](std::size_t i) const {
+			return stack_indices[i];
+		}
+
+		std::size_t size() const {
+			return len;
+		}
+	};
+
+	template <typename F, typename... Policies>
+	struct policy_wrapper {
+		typedef std::index_sequence_for<Policies...> indices;
+
+		F value;
+		std::tuple<Policies...> policies;
+
+		template <typename Fx, typename... Args, meta::enable<meta::neg<std::is_same<meta::unqualified_t<Fx>, policy_wrapper>>> = meta::enabler>
+		policy_wrapper(Fx&& fx, Args&&... args) : value(std::forward<Fx>(fx)), policies(std::forward<Args>(args)...) {
+		}
+
+		policy_wrapper(const policy_wrapper&) = default;
+		policy_wrapper& operator=(const policy_wrapper&) = default;
+		policy_wrapper(policy_wrapper&&) = default;
+		policy_wrapper& operator=(policy_wrapper&&) = default;
+	};
+
+	template <typename F, typename... Args>
+	auto policies(F&& f, Args&&... args) {
+		return policy_wrapper<std::decay_t<F>, std::decay_t<Args>...>(std::forward<F>(f), std::forward<Args>(args)...);
+	}
+
+	namespace detail {
+		template <typename T>
+		using is_policy = meta::is_specialization_of<T, policy_wrapper>;
+
+		template <typename T>
+		inline constexpr bool is_policy_v = is_policy<T>::value;
+	} // namespace detail
+} // namespace sol
+
+#endif // SOL_FILTERS_HPP
diff --git a/extern/sol3/sol/prologue.hpp b/extern/sol3/sol/prologue.hpp
new file mode 100644
index 0000000000..1829aaa254
--- /dev/null
+++ b/extern/sol3/sol/prologue.hpp
@@ -0,0 +1,47 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#pragma once
+
+// clang-format off
+
+#if defined(SOL_PROLOGUE_I_)
+	#error "[sol2] Library Prologue was already included in translation unit and not properly ended with an epilogue."
+#endif
+
+#define SOL_PROLOGUE_I_ 1
+
+
+#if SOL_IS_ON(SOL_BUILD_CXX_MODE_I_)
+	#define _FWD(...) static_cast<decltype( __VA_ARGS__ )&&>( __VA_ARGS__ )
+
+	#if SOL_IS_ON(SOL_COMPILER_GCC_I_) || SOL_IS_ON(SOL_COMPILER_CLANG_I_)
+		#define _MOVE(...) static_cast<__typeof( __VA_ARGS__ )&&>( __VA_ARGS__ )
+	#else
+		#include <type_traits>
+		
+		#define _MOVE(...) static_cast<::std::remove_reference_t<( __VA_ARGS__ )>&&>( __VA_OPT__(,) )
+	#endif
+#endif
+
+// clang-format on
diff --git a/extern/sol3/sol/property.hpp b/extern/sol3/sol/property.hpp
new file mode 100644
index 0000000000..8b818daf0c
--- /dev/null
+++ b/extern/sol3/sol/property.hpp
@@ -0,0 +1,151 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_PROPERTY_HPP
+#define SOL_PROPERTY_HPP
+
+#include <sol/types.hpp>
+#include <sol/ebco.hpp>
+#include <type_traits>
+#include <utility>
+
+namespace sol {
+	namespace detail {
+		struct no_prop { };
+	} // namespace detail
+
+	template <typename R, typename W>
+	struct property_wrapper : detail::ebco<R, 0>, detail::ebco<W, 1> {
+	private:
+		using read_base_t = detail::ebco<R, 0>;
+		using write_base_t = detail::ebco<W, 1>;
+
+	public:
+		template <typename Rx, typename Wx>
+		property_wrapper(Rx&& r, Wx&& w) : read_base_t(std::forward<Rx>(r)), write_base_t(std::forward<Wx>(w)) {
+		}
+
+		W& write() {
+			return write_base_t::value();
+		}
+
+		const W& write() const {
+			return write_base_t::value();
+		}
+
+		R& read() {
+			return read_base_t::value();
+		}
+
+		const R& read() const {
+			return read_base_t::value();
+		}
+	};
+
+	template <typename F, typename G>
+	inline decltype(auto) property(F&& f, G&& g) {
+		typedef lua_bind_traits<meta::unqualified_t<F>> left_traits;
+		typedef lua_bind_traits<meta::unqualified_t<G>> right_traits;
+		if constexpr (left_traits::free_arity < right_traits::free_arity) {
+			return property_wrapper<std::decay_t<F>, std::decay_t<G>>(std::forward<F>(f), std::forward<G>(g));
+		}
+		else {
+			return property_wrapper<std::decay_t<G>, std::decay_t<F>>(std::forward<G>(g), std::forward<F>(f));
+		}
+	}
+
+	template <typename F>
+	inline decltype(auto) property(F&& f) {
+		typedef lua_bind_traits<meta::unqualified_t<F>> left_traits;
+		if constexpr (left_traits::free_arity < 2) {
+			return property_wrapper<std::decay_t<F>, detail::no_prop>(std::forward<F>(f), detail::no_prop());
+		}
+		else {
+			return property_wrapper<detail::no_prop, std::decay_t<F>>(detail::no_prop(), std::forward<F>(f));
+		}
+	}
+
+	template <typename F>
+	inline decltype(auto) readonly_property(F&& f) {
+		return property_wrapper<std::decay_t<F>, detail::no_prop>(std::forward<F>(f), detail::no_prop());
+	}
+
+	template <typename F>
+	inline decltype(auto) writeonly_property(F&& f) {
+		return property_wrapper<detail::no_prop, std::decay_t<F>>(detail::no_prop(), std::forward<F>(f));
+	}
+
+	template <typename T>
+	struct readonly_wrapper : detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		using base_t::base_t;
+
+		operator T&() {
+			return base_t::value();
+		}
+		operator const T&() const {
+			return base_t::value();
+		}
+	};
+
+	// Allow someone to make a member variable readonly (const)
+	template <typename R, typename T>
+	inline auto readonly(R T::*v) {
+		return readonly_wrapper<meta::unqualified_t<decltype(v)>>(v);
+	}
+
+	template <typename T>
+	struct var_wrapper : detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		using base_t::base_t;
+	};
+
+	template <typename V>
+	inline auto var(V&& v) {
+		typedef std::decay_t<V> T;
+		return var_wrapper<T>(std::forward<V>(v));
+	}
+
+	namespace meta {
+		template <typename T>
+		using is_member_object = std::integral_constant<bool, std::is_member_object_pointer_v<T> || is_specialization_of_v<T, readonly_wrapper>>;
+
+		template <typename T>
+		inline constexpr bool is_member_object_v = is_member_object<T>::value;
+
+		template <typename T>
+		using is_member_object_or_function = std::integral_constant<bool, is_member_object_v<T> || std::is_member_pointer_v<T>>;
+
+		template <typename T>
+		inline constexpr bool is_member_object_or_function_v = is_member_object_or_function<T>::value;
+	} // namespace meta
+
+} // namespace sol
+
+#endif // SOL_PROPERTY_HPP
diff --git a/extern/sol3/sol/protect.hpp b/extern/sol3/sol/protect.hpp
new file mode 100644
index 0000000000..8b1221df5b
--- /dev/null
+++ b/extern/sol3/sol/protect.hpp
@@ -0,0 +1,53 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_PROTECT_HPP
+#define SOL_PROTECT_HPP
+
+#include <sol/traits.hpp>
+#include <utility>
+
+namespace sol {
+
+	template <typename T>
+	struct protect_t {
+		T value;
+
+		template <typename Arg, typename... Args, meta::disable<std::is_same<protect_t, meta::unqualified_t<Arg>>> = meta::enabler>
+		protect_t(Arg&& arg, Args&&... args) : value(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+		}
+
+		protect_t(const protect_t&) = default;
+		protect_t(protect_t&&) = default;
+		protect_t& operator=(const protect_t&) = default;
+		protect_t& operator=(protect_t&&) = default;
+	};
+
+	template <typename T>
+	auto protect(T&& value) {
+		return protect_t<std::decay_t<T>>(std::forward<T>(value));
+	}
+
+} // namespace sol
+
+#endif // SOL_PROTECT_HPP
diff --git a/extern/sol3/sol/protected_function.hpp b/extern/sol3/sol/protected_function.hpp
new file mode 100644
index 0000000000..c3e6c66aac
--- /dev/null
+++ b/extern/sol3/sol/protected_function.hpp
@@ -0,0 +1,385 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_PROTECTED_FUNCTION_HPP
+#define SOL_PROTECTED_FUNCTION_HPP
+
+#include <sol/reference.hpp>
+#include <sol/object.hpp>
+#include <sol/stack.hpp>
+#include <sol/protected_function_result.hpp>
+#include <sol/unsafe_function.hpp>
+#include <sol/protected_handler.hpp>
+#include <sol/bytecode.hpp>
+#include <sol/dump_handler.hpp>
+
+#include <cstdint>
+#include <algorithm>
+
+namespace sol {
+
+	namespace detail {
+		template <bool ShouldPush_, typename Handler_>
+		inline void handle_protected_exception(
+		     lua_State* L_, optional<const std::exception&> maybe_ex, const char* error, detail::protected_handler<ShouldPush_, Handler_>& handler_) {
+			handler_.stack_index = 0;
+			if (ShouldPush_) {
+				handler_.target.push(L_);
+				detail::call_exception_handler(L_, maybe_ex, error);
+				lua_call(L_, 1, 1);
+			}
+			else {
+				detail::call_exception_handler(L_, maybe_ex, error);
+			}
+		}
+	} // namespace detail
+
+	template <typename Reference, bool Aligned = false, typename Handler = reference>
+	class basic_protected_function : public basic_object<Reference> {
+	private:
+		using base_t = basic_object<Reference>;
+		using handler_t = Handler;
+		inline static constexpr bool is_stack_handler_v = is_stack_based_v<handler_t>;
+
+		basic_protected_function(std::true_type, const basic_protected_function& other_) noexcept
+		: base_t(other_), m_error_handler(other_.m_error_handler.copy(lua_state())) {
+		}
+
+		basic_protected_function(std::false_type, const basic_protected_function& other_) noexcept : base_t(other_), m_error_handler(other_.m_error_handler) {
+		}
+
+	public:
+		basic_protected_function() = default;
+		template <typename T,
+		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_protected_function>>,
+		          meta::neg<std::is_base_of<proxy_base_tag, meta::unqualified_t<T>>>, meta::neg<std::is_same<base_t, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_protected_function(T&& r) noexcept : base_t(std::forward<T>(r)), m_error_handler(get_default_handler(r.lua_state())) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			if (!is_function<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				constructor_handler handler {};
+				stack::check<basic_protected_function>(lua_state(), -1, handler);
+			}
+#endif // Safety
+		}
+		basic_protected_function(const basic_protected_function& other_) noexcept
+		: basic_protected_function(meta::boolean<is_stateless_lua_reference_v<Handler>>(), other_) {
+		}
+		basic_protected_function& operator=(const basic_protected_function& other_) {
+			base_t::operator=(other_);
+			if constexpr (is_stateless_lua_reference_v<Handler>) {
+				m_error_handler.copy_assign(lua_state(), other_.m_error_handler);
+			}
+			else {
+				m_error_handler = other_.m_error_handler;
+			}
+			return *this;
+		}
+		basic_protected_function(basic_protected_function&&) = default;
+		basic_protected_function& operator=(basic_protected_function&&) = default;
+		basic_protected_function(const basic_function<base_t>& b) : basic_protected_function(b, get_default_handler(b.lua_state())) {
+		}
+		basic_protected_function(basic_function<base_t>&& b) : basic_protected_function(std::move(b), get_default_handler(b.lua_state())) {
+		}
+		basic_protected_function(const basic_function<base_t>& b, handler_t eh) : base_t(b), m_error_handler(std::move(eh)) {
+		}
+		basic_protected_function(basic_function<base_t>&& b, handler_t eh) : base_t(std::move(b)), m_error_handler(std::move(eh)) {
+		}
+		basic_protected_function(const stack_reference& r) : basic_protected_function(r.lua_state(), r.stack_index(), get_default_handler(r.lua_state())) {
+		}
+		basic_protected_function(stack_reference&& r) : basic_protected_function(r.lua_state(), r.stack_index(), get_default_handler(r.lua_state())) {
+		}
+		basic_protected_function(const stack_reference& r, handler_t eh) : basic_protected_function(r.lua_state(), r.stack_index(), std::move(eh)) {
+		}
+		basic_protected_function(stack_reference&& r, handler_t eh) : basic_protected_function(r.lua_state(), r.stack_index(), std::move(eh)) {
+		}
+
+		template <typename Super>
+		basic_protected_function(const proxy_base<Super>& p) : basic_protected_function(p, get_default_handler(p.lua_state())) {
+		}
+		template <typename Super>
+		basic_protected_function(proxy_base<Super>&& p) : basic_protected_function(std::move(p), get_default_handler(p.lua_state())) {
+		}
+		template <typename Proxy, typename HandlerReference,
+		     meta::enable<std::is_base_of<proxy_base_tag, meta::unqualified_t<Proxy>>,
+		          meta::neg<is_lua_index<meta::unqualified_t<HandlerReference>>>> = meta::enabler>
+		basic_protected_function(Proxy&& p, HandlerReference&& eh)
+		: basic_protected_function(detail::force_cast<base_t>(p), make_reference<handler_t>(p.lua_state(), std::forward<HandlerReference>(eh))) {
+		}
+
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_protected_function(lua_State* L_, T&& r) : basic_protected_function(L_, std::forward<T>(r), get_default_handler(L_)) {
+		}
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_protected_function(lua_State* L_, T&& r, handler_t eh) : base_t(L_, std::forward<T>(r)), m_error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_protected_function>(lua_state(), -1, handler);
+#endif // Safety
+		}
+
+		basic_protected_function(lua_nil_t n) : base_t(n), m_error_handler(n) {
+		}
+
+		basic_protected_function(lua_State* L_, int index_ = -1) : basic_protected_function(L_, index_, get_default_handler(L_)) {
+		}
+		basic_protected_function(lua_State* L_, int index_, handler_t eh) : base_t(L_, index_), m_error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			constructor_handler handler {};
+			stack::check<basic_protected_function>(L_, index_, handler);
+#endif // Safety
+		}
+		basic_protected_function(lua_State* L_, absolute_index index_) : basic_protected_function(L_, index_, get_default_handler(L_)) {
+		}
+		basic_protected_function(lua_State* L_, absolute_index index_, handler_t eh) : base_t(L_, index_), m_error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			constructor_handler handler {};
+			stack::check<basic_protected_function>(L_, index_, handler);
+#endif // Safety
+		}
+		basic_protected_function(lua_State* L_, raw_index index_) : basic_protected_function(L_, index_, get_default_handler(L_)) {
+		}
+		basic_protected_function(lua_State* L_, raw_index index_, handler_t eh) : base_t(L_, index_), m_error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			constructor_handler handler {};
+			stack::check<basic_protected_function>(L_, index_, handler);
+#endif // Safety
+		}
+		basic_protected_function(lua_State* L_, ref_index index_) : basic_protected_function(L_, index_, get_default_handler(L_)) {
+		}
+		basic_protected_function(lua_State* L_, ref_index index_, handler_t eh) : base_t(L_, index_), m_error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_protected_function>(lua_state(), -1, handler);
+#endif // Safety
+		}
+
+		using base_t::lua_state;
+
+		template <typename Fx>
+		int dump(lua_Writer writer, void* userdata_pointer_, bool strip, Fx&& on_error) const {
+			this->push();
+			auto ppn = stack::push_popper_n<false>(this->lua_state(), 1);
+			int r = lua_dump(this->lua_state(), writer, userdata_pointer_, strip ? 1 : 0);
+			if (r != 0) {
+				return on_error(this->lua_state(), r, writer, userdata_pointer_, strip);
+			}
+			return r;
+		}
+
+		int dump(lua_Writer writer, void* userdata_pointer_, bool strip = false) const {
+			return dump(writer, userdata_pointer_, strip, &dump_pass_on_error);
+		}
+
+		template <typename Container = bytecode>
+		Container dump() const {
+			Container bc;
+			(void)dump(static_cast<lua_Writer>(&basic_insert_dump_writer<Container>), static_cast<void*>(&bc), false, &dump_throw_on_error);
+			return bc;
+		}
+
+		template <typename Container = bytecode, typename Fx>
+		Container dump(Fx&& on_error) const {
+			Container bc;
+			(void)dump(static_cast<lua_Writer>(&basic_insert_dump_writer<Container>), static_cast<void*>(&bc), false, std::forward<Fx>(on_error));
+			return bc;
+		}
+
+		template <typename... Args>
+		protected_function_result operator()(Args&&... args) const {
+			return call<>(std::forward<Args>(args)...);
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) operator()(types<Ret...>, Args&&... args) const {
+			return call<Ret...>(std::forward<Args>(args)...);
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) call(Args&&... args) const {
+			if constexpr (!Aligned) {
+				// we do not expect the function to already be on the stack: push it
+				if (m_error_handler.valid(lua_state())) {
+					detail::protected_handler<true, handler_t> h(lua_state(), m_error_handler);
+					base_t::push();
+					int pushcount = stack::multi_push_reference(lua_state(), std::forward<Args>(args)...);
+					return invoke(types<Ret...>(), std::make_index_sequence<sizeof...(Ret)>(), pushcount, h);
+				}
+				else {
+					detail::protected_handler<false, handler_t> h(lua_state(), m_error_handler);
+					base_t::push();
+					int pushcount = stack::multi_push_reference(lua_state(), std::forward<Args>(args)...);
+					return invoke(types<Ret...>(), std::make_index_sequence<sizeof...(Ret)>(), pushcount, h);
+				}
+			}
+			else {
+				// the function is already on the stack at the right location
+				if (m_error_handler.valid()) {
+					// the handler will be pushed onto the stack manually,
+					// since it's not already on the stack this means we need to push our own
+					// function on the stack too and swap things to be in-place
+					if constexpr (!is_stack_handler_v) {
+						// so, we need to remove the function at the top and then dump the handler out ourselves
+						base_t::push();
+					}
+					detail::protected_handler<true, handler_t> h(lua_state(), m_error_handler);
+					if constexpr (!is_stack_handler_v) {
+						lua_replace(lua_state(), -3);
+						h.stack_index = lua_absindex(lua_state(), -2);
+					}
+					int pushcount = stack::multi_push_reference(lua_state(), std::forward<Args>(args)...);
+					return invoke(types<Ret...>(), std::make_index_sequence<sizeof...(Ret)>(), pushcount, h);
+				}
+				else {
+					detail::protected_handler<false, handler_t> h(lua_state(), m_error_handler);
+					int pushcount = stack::multi_push_reference(lua_state(), std::forward<Args>(args)...);
+					return invoke(types<Ret...>(), std::make_index_sequence<sizeof...(Ret)>(), pushcount, h);
+				}
+			}
+		}
+
+		~basic_protected_function() {
+			if constexpr (is_stateless_lua_reference_v<handler_t>) {
+				this->m_error_handler.reset(lua_state());
+			}
+		}
+
+		static handler_t get_default_handler(lua_State* L_) {
+			return detail::get_default_handler<handler_t, is_main_threaded_v<base_t>>(L_);
+		}
+
+		template <typename T>
+		static void set_default_handler(const T& ref) {
+			detail::set_default_handler(ref.lua_state(), ref);
+		}
+
+		auto get_error_handler() const noexcept {
+			if constexpr (is_stateless_lua_reference_v<handler_t>) {
+				if constexpr (is_stack_based_v<handler_t>) {
+					return stack_reference(lua_state(), m_error_handler.stack_index());
+				}
+				else {
+					return basic_reference<is_main_threaded_v<base_t>>(lua_state(), ref_index(m_error_handler.registry_index()));
+				}
+			}
+			else {
+				return m_error_handler;
+			}
+		}
+
+		template <typename ErrorHandler_>
+		void set_error_handler(ErrorHandler_&& error_handler_) noexcept {
+			static_assert(!is_stack_based_v<handler_t> || is_stack_based_v<ErrorHandler_>,
+			     "A stack-based error handler can only be set from a parameter that is also stack-based.");
+			if constexpr (std::is_rvalue_reference_v<ErrorHandler_>) {
+				m_error_handler = std::forward<ErrorHandler_>(error_handler_);
+			}
+			else {
+				m_error_handler.copy_assign(lua_state(), std::forward<ErrorHandler_>(error_handler_));
+			}
+		}
+
+		void abandon () noexcept {
+			this->m_error_handler.abandon();
+			base_t::abandon();
+		}
+
+	private:
+		handler_t m_error_handler;
+
+		template <bool b>
+		call_status luacall(std::ptrdiff_t argcount, std::ptrdiff_t result_count_, detail::protected_handler<b, handler_t>& h) const {
+			return static_cast<call_status>(lua_pcall(lua_state(), static_cast<int>(argcount), static_cast<int>(result_count_), h.stack_index));
+		}
+
+		template <std::size_t... I, bool b, typename... Ret>
+		auto invoke(types<Ret...>, std::index_sequence<I...>, std::ptrdiff_t n, detail::protected_handler<b, handler_t>& h) const {
+			luacall(n, sizeof...(Ret), h);
+			return stack::pop<std::tuple<Ret...>>(lua_state());
+		}
+
+		template <std::size_t I, bool b, typename Ret>
+		Ret invoke(types<Ret>, std::index_sequence<I>, std::ptrdiff_t n, detail::protected_handler<b, handler_t>& h) const {
+			luacall(n, 1, h);
+			return stack::pop<Ret>(lua_state());
+		}
+
+		template <std::size_t I, bool b>
+		void invoke(types<void>, std::index_sequence<I>, std::ptrdiff_t n, detail::protected_handler<b, handler_t>& h) const {
+			luacall(n, 0, h);
+		}
+
+		template <bool b>
+		protected_function_result invoke(types<>, std::index_sequence<>, std::ptrdiff_t n, detail::protected_handler<b, handler_t>& h) const {
+			int stacksize = lua_gettop(lua_state());
+			int poststacksize = stacksize;
+			int firstreturn = 1;
+			int returncount = 0;
+			call_status code = call_status::ok;
+#if SOL_IS_ON(SOL_EXCEPTIONS_I_) && SOL_IS_OFF(SOL_PROPAGATE_EXCEPTIONS_I_)
+			try {
+#endif // No Exceptions
+				firstreturn = (std::max)(1, static_cast<int>(stacksize - n - static_cast<int>(h.valid() && !is_stack_handler_v)));
+				code = luacall(n, LUA_MULTRET, h);
+				poststacksize = lua_gettop(lua_state()) - static_cast<int>(h.valid() && !is_stack_handler_v);
+				returncount = poststacksize - (firstreturn - 1);
+#if SOL_IS_ON(SOL_EXCEPTIONS_I_) && SOL_IS_OFF(SOL_PROPAGATE_EXCEPTIONS_I_)
+			}
+			// Handle C++ errors thrown from C++ functions bound inside of lua
+			catch (const char* error) {
+				detail::handle_protected_exception(lua_state(), optional<const std::exception&>(nullopt), error, h);
+				firstreturn = lua_gettop(lua_state());
+				return protected_function_result(lua_state(), firstreturn, 0, 1, call_status::runtime);
+			}
+			catch (const std::string& error) {
+				detail::handle_protected_exception(lua_state(), optional<const std::exception&>(nullopt), error.c_str(), h);
+				firstreturn = lua_gettop(lua_state());
+				return protected_function_result(lua_state(), firstreturn, 0, 1, call_status::runtime);
+			}
+			catch (const std::exception& error) {
+				detail::handle_protected_exception(lua_state(), optional<const std::exception&>(error), error.what(), h);
+				firstreturn = lua_gettop(lua_state());
+				return protected_function_result(lua_state(), firstreturn, 0, 1, call_status::runtime);
+			}
+#if SOL_IS_ON(SOL_EXCEPTIONS_CATCH_ALL_I_)
+			// LuaJIT cannot have the catchall when the safe propagation is on
+			// but LuaJIT will swallow all C++ errors
+			// if we don't at least catch std::exception ones
+			catch (...) {
+				detail::handle_protected_exception(lua_state(), optional<const std::exception&>(nullopt), detail::protected_function_error, h);
+				firstreturn = lua_gettop(lua_state());
+				return protected_function_result(lua_state(), firstreturn, 0, 1, call_status::runtime);
+			}
+#endif // Always catch edge case
+#else
+			// do not handle exceptions: they can be propogated into C++ and keep all type information / rich information
+#endif // Exceptions vs. No Exceptions
+			return protected_function_result(lua_state(), firstreturn, returncount, returncount, code);
+		}
+	};
+} // namespace sol
+
+#endif // SOL_FUNCTION_HPP
diff --git a/extern/sol3/sol/protected_function_result.hpp b/extern/sol3/sol/protected_function_result.hpp
new file mode 100644
index 0000000000..52c7823181
--- /dev/null
+++ b/extern/sol3/sol/protected_function_result.hpp
@@ -0,0 +1,233 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_PROTECTED_FUNCTION_RESULT_HPP
+#define SOL_PROTECTED_FUNCTION_RESULT_HPP
+
+#include <sol/reference.hpp>
+#include <sol/tuple.hpp>
+#include <sol/stack.hpp>
+#include <sol/proxy_base.hpp>
+#include <sol/stack_iterator.hpp>
+#include <sol/stack_proxy.hpp>
+#include <sol/error.hpp>
+#include <sol/stack.hpp>
+#include <cstdint>
+
+namespace sol {
+	struct protected_function_result : public proxy_base<protected_function_result> {
+	private:
+		lua_State* L;
+		int index;
+		int returncount;
+		int popcount;
+		call_status err;
+
+	public:
+		typedef stack_proxy reference_type;
+		typedef stack_proxy value_type;
+		typedef stack_proxy* pointer;
+		typedef std::ptrdiff_t difference_type;
+		typedef std::size_t size_type;
+		typedef stack_iterator<stack_proxy, false> iterator;
+		typedef stack_iterator<stack_proxy, true> const_iterator;
+		typedef std::reverse_iterator<iterator> reverse_iterator;
+		typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
+
+		protected_function_result() noexcept = default;
+		protected_function_result(lua_State* Ls, int idx = -1, int retnum = 0, int popped = 0, call_status pferr = call_status::ok) noexcept
+		: L(Ls), index(idx), returncount(retnum), popcount(popped), err(pferr) {
+		}
+
+		// We do not want anyone to copy these around willy-nilly
+		// Will likely break people, but also will probably get rid of quiet bugs that have
+		// been lurking. (E.g., Vanilla Lua will just quietly discard over-pops and under-pops:
+		// LuaJIT and other Lua engines will implode and segfault at random later times.)
+		protected_function_result(const protected_function_result&) = delete;
+		protected_function_result& operator=(const protected_function_result&) = delete;
+
+		protected_function_result(protected_function_result&& o) noexcept
+		: L(o.L), index(o.index), returncount(o.returncount), popcount(o.popcount), err(o.err) {
+			// Must be manual, otherwise destructor will screw us
+			// return count being 0 is enough to keep things clean
+			// but we will be thorough
+			o.abandon();
+		}
+		protected_function_result& operator=(protected_function_result&& o) noexcept {
+			L = o.L;
+			index = o.index;
+			returncount = o.returncount;
+			popcount = o.popcount;
+			err = o.err;
+			// Must be manual, otherwise destructor will screw us
+			// return count being 0 is enough to keep things clean
+			// but we will be thorough
+			o.abandon();
+			return *this;
+		}
+
+		protected_function_result(const unsafe_function_result& o) = delete;
+		protected_function_result& operator=(const unsafe_function_result& o) = delete;
+		protected_function_result(unsafe_function_result&& o) noexcept;
+		protected_function_result& operator=(unsafe_function_result&& o) noexcept;
+
+		call_status status() const noexcept {
+			return err;
+		}
+
+		bool valid() const noexcept {
+			return status() == call_status::ok || status() == call_status::yielded;
+		}
+
+		template <typename T>
+		decltype(auto) get(int index_offset = 0) const {
+			using UT = meta::unqualified_t<T>;
+			int target = index + index_offset;
+			if constexpr (meta::is_optional_v<UT>) {
+				using ValueType = typename UT::value_type;
+				if constexpr (std::is_same_v<ValueType, error>) {
+					if (valid()) {
+						return UT();
+					}
+					return UT(error(detail::direct_error, stack::get<std::string>(L, target)));
+				}
+				else {
+					if (!valid()) {
+						return UT();
+					}
+					return stack::get<UT>(L, target);
+				}
+			}
+			else {
+				if constexpr (std::is_same_v<T, error>) {
+#if SOL_IS_ON(SOL_SAFE_PROXIES_I_)
+					if (valid()) {
+						type t = type_of(L, target);
+						type_panic_c_str(L, target, t, type::none, "bad get from protected_function_result (is an error)");
+					}
+#endif // Check Argument Safety
+					return error(detail::direct_error, stack::get<std::string>(L, target));
+				}
+				else {
+#if SOL_IS_ON(SOL_SAFE_PROXIES_I_)
+					if (!valid()) {
+						type t = type_of(L, target);
+						type_panic_c_str(L, target, t, type::none, "bad get from protected_function_result (is not an error)");
+					}
+#endif // Check Argument Safety
+					return stack::get<T>(L, target);
+				}
+			}
+		}
+
+		type get_type(int index_offset = 0) const noexcept {
+			return type_of(L, index + static_cast<int>(index_offset));
+		}
+
+		stack_proxy operator[](difference_type index_offset) const {
+			return stack_proxy(L, index + static_cast<int>(index_offset));
+		}
+
+		iterator begin() {
+			return iterator(L, index, stack_index() + return_count());
+		}
+		iterator end() {
+			return iterator(L, stack_index() + return_count(), stack_index() + return_count());
+		}
+		const_iterator begin() const {
+			return const_iterator(L, index, stack_index() + return_count());
+		}
+		const_iterator end() const {
+			return const_iterator(L, stack_index() + return_count(), stack_index() + return_count());
+		}
+		const_iterator cbegin() const {
+			return begin();
+		}
+		const_iterator cend() const {
+			return end();
+		}
+
+		reverse_iterator rbegin() {
+			return std::reverse_iterator<iterator>(begin());
+		}
+		reverse_iterator rend() {
+			return std::reverse_iterator<iterator>(end());
+		}
+		const_reverse_iterator rbegin() const {
+			return std::reverse_iterator<const_iterator>(begin());
+		}
+		const_reverse_iterator rend() const {
+			return std::reverse_iterator<const_iterator>(end());
+		}
+		const_reverse_iterator crbegin() const {
+			return std::reverse_iterator<const_iterator>(cbegin());
+		}
+		const_reverse_iterator crend() const {
+			return std::reverse_iterator<const_iterator>(cend());
+		}
+
+		lua_State* lua_state() const noexcept {
+			return L;
+		};
+		int stack_index() const noexcept {
+			return index;
+		};
+		int return_count() const noexcept {
+			return returncount;
+		};
+		int pop_count() const noexcept {
+			return popcount;
+		};
+		void abandon() noexcept {
+			// L = nullptr;
+			index = 0;
+			returncount = 0;
+			popcount = 0;
+			err = call_status::runtime;
+		}
+		~protected_function_result() {
+			if (L == nullptr)
+				return;
+			stack::remove(L, index, popcount);
+		}
+	};
+
+	namespace stack {
+		template <>
+		struct unqualified_pusher<protected_function_result> {
+			static int push(lua_State* L, const protected_function_result& pfr) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+				luaL_checkstack(L, static_cast<int>(pfr.pop_count()), detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+				int p = 0;
+				for (int i = 0; i < pfr.pop_count(); ++i) {
+					lua_pushvalue(L, i + pfr.stack_index());
+					++p;
+				}
+				return p;
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+#endif // SOL_PROTECTED_FUNCTION_RESULT_HPP
diff --git a/extern/sol3/sol/protected_handler.hpp b/extern/sol3/sol/protected_handler.hpp
new file mode 100644
index 0000000000..6d40640f02
--- /dev/null
+++ b/extern/sol3/sol/protected_handler.hpp
@@ -0,0 +1,108 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_PROTECTED_HANDLER_HPP
+#define SOL_PROTECTED_HANDLER_HPP
+
+#include <sol/reference.hpp>
+#include <sol/stack.hpp>
+#include <sol/protected_function_result.hpp>
+#include <sol/unsafe_function.hpp>
+#include <cstdint>
+
+namespace sol { namespace detail {
+	inline const char (&default_handler_name())[9] {
+		static const char name[9] = "sol.\xF0\x9F\x94\xA9";
+		return name;
+	}
+
+	template <bool ShouldPush, typename Target = reference>
+	struct protected_handler {
+		lua_State* m_L;
+		const Target& target;
+		int stack_index;
+
+		protected_handler(std::false_type, lua_State* L_, const Target& target_) : m_L(L_), target(target_), stack_index(0) {
+			if (ShouldPush) {
+				stack_index = lua_gettop(L_) + 1;
+				target.push(L_);
+			}
+		}
+
+		protected_handler(std::true_type, lua_State* L_, const Target& target_) : m_L(L_), target(target_), stack_index(0) {
+			if (ShouldPush) {
+				stack_index = target.stack_index();
+			}
+		}
+
+		protected_handler(lua_State* L_, const Target& target_) : protected_handler(meta::boolean<is_stack_based_v<Target>>(), L_, target_) {
+		}
+
+		bool valid() const noexcept {
+			return ShouldPush;
+		}
+
+		~protected_handler() {
+			if constexpr (!is_stack_based_v<Target>) {
+				if (stack_index != 0) {
+					lua_remove(m_L, stack_index);
+				}
+			}
+		}
+	};
+
+	template <typename Base, typename T>
+	inline basic_function<Base> force_cast(T& p) {
+		return p;
+	}
+
+	template <typename Reference, bool IsMainReference = false>
+	inline Reference get_default_handler(lua_State* L_) {
+		if (is_stack_based_v<Reference> || L_ == nullptr)
+			return Reference(L_, lua_nil);
+		L_ = IsMainReference ? main_thread(L_, L_) : L_;
+		lua_getglobal(L_, default_handler_name());
+		auto pp = stack::pop_n(L_, 1);
+		return Reference(L_, -1);
+	}
+
+	template <typename T>
+	inline void set_default_handler(lua_State* L, const T& ref) {
+		if (L == nullptr) {
+			return;
+		}
+		if (!ref.valid()) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushnil(L);
+			lua_setglobal(L, default_handler_name());
+		}
+		else {
+			ref.push(L);
+			lua_setglobal(L, default_handler_name());
+		}
+	}
+}} // namespace sol::detail
+
+#endif // SOL_PROTECTED_HANDLER_HPP
diff --git a/extern/sol3/sol/proxy_base.hpp b/extern/sol3/sol/proxy_base.hpp
new file mode 100644
index 0000000000..bae2000d84
--- /dev/null
+++ b/extern/sol3/sol/proxy_base.hpp
@@ -0,0 +1,68 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_PROXY_BASE_HPP
+#define SOL_PROXY_BASE_HPP
+
+#include <sol/reference.hpp>
+#include <sol/tuple.hpp>
+#include <sol/stack.hpp>
+
+namespace sol {
+	struct proxy_base_tag { };
+
+	namespace detail {
+		template <typename T>
+		using proxy_key_t = meta::conditional_t<meta::is_specialization_of_v<meta::unqualified_t<T>, std::tuple>, T,
+		     std::tuple<meta::conditional_t<std::is_array_v<meta::unqualified_t<T>>, std::remove_reference_t<T>&, meta::unqualified_t<T>>>>;
+	}
+
+	template <typename Super>
+	struct proxy_base : public proxy_base_tag {
+		lua_State* lua_state() const {
+			const Super& super = *static_cast<const Super*>(static_cast<const void*>(this));
+			return super.lua_state();
+		}
+
+		operator std::string() const {
+			const Super& super = *static_cast<const Super*>(static_cast<const void*>(this));
+			return super.template get<std::string>();
+		}
+
+		template <typename T, meta::enable<meta::neg<meta::is_string_constructible<T>>, is_proxy_primitive<meta::unqualified_t<T>>> = meta::enabler>
+		operator T() const {
+			const Super& super = *static_cast<const Super*>(static_cast<const void*>(this));
+			return super.template get<T>();
+		}
+
+		template <typename T,
+		     meta::enable<meta::neg<meta::is_string_constructible<T>>, meta::neg<is_proxy_primitive<meta::unqualified_t<T>>>> = meta::enabler>
+		operator T&() const {
+			const Super& super = *static_cast<const Super*>(static_cast<const void*>(this));
+			return super.template get<T&>();
+		}
+	};
+
+} // namespace sol
+
+#endif // SOL_PROXY_BASE_HPP
diff --git a/extern/sol3/sol/raii.hpp b/extern/sol3/sol/raii.hpp
new file mode 100644
index 0000000000..10cbb28c8d
--- /dev/null
+++ b/extern/sol3/sol/raii.hpp
@@ -0,0 +1,162 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_RAII_HPP
+#define SOL_RAII_HPP
+
+#include <sol/traits.hpp>
+#include <sol/compatibility.hpp>
+
+#include <memory>
+
+namespace sol {
+	namespace detail {
+		struct default_construct {
+			template <typename T, typename... Args>
+			static void construct(T&& obj, Args&&... args) {
+				typedef meta::unqualified_t<T> Tu;
+				std::allocator<Tu> alloc {};
+				std::allocator_traits<std::allocator<Tu>>::construct(alloc, std::forward<T>(obj), std::forward<Args>(args)...);
+			}
+
+			template <typename T, typename... Args>
+			void operator()(T&& obj, Args&&... args) const {
+				construct(std::forward<T>(obj), std::forward<Args>(args)...);
+			}
+		};
+
+		struct default_destroy {
+			template <typename T>
+			static void destroy(T&& obj) {
+				std::allocator<meta::unqualified_t<T>> alloc {};
+				alloc.destroy(obj);
+			}
+
+			template <typename T>
+			void operator()(T&& obj) const {
+				destroy(std::forward<T>(obj));
+			}
+		};
+
+		struct deleter {
+			template <typename T>
+			void operator()(T* p) const {
+				delete p;
+			}
+		};
+
+		struct state_deleter {
+			void operator()(lua_State* L) const {
+				lua_close(L);
+			}
+		};
+
+		template <typename T, typename Dx, typename... Args>
+		inline std::unique_ptr<T, Dx> make_unique_deleter(Args&&... args) {
+			return std::unique_ptr<T, Dx>(new T(std::forward<Args>(args)...));
+		}
+
+		template <typename Tag, typename T>
+		struct tagged {
+		private:
+			T value_;
+
+		public:
+			template <typename Arg, typename... Args, meta::disable<std::is_same<meta::unqualified_t<Arg>, tagged>> = meta::enabler>
+			tagged(Arg&& arg, Args&&... args) : value_(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+			}
+
+			T& value() & {
+				return value_;
+			}
+
+			T const& value() const& {
+				return value_;
+			}
+
+			T&& value() && {
+				return std::move(value_);
+			}
+		};
+	} // namespace detail
+
+	template <typename... Args>
+	struct constructor_list { };
+
+	template <typename... Args>
+	using constructors = constructor_list<Args...>;
+
+	const auto default_constructor = constructors<types<>> {};
+
+	struct no_construction { };
+	const auto no_constructor = no_construction {};
+
+	struct call_construction { };
+	const auto call_constructor = call_construction {};
+
+	template <typename... Functions>
+	struct constructor_wrapper {
+		std::tuple<Functions...> functions;
+		template <typename Arg, typename... Args, meta::disable<std::is_same<meta::unqualified_t<Arg>, constructor_wrapper>> = meta::enabler>
+		constructor_wrapper(Arg&& arg, Args&&... args) : functions(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+		}
+	};
+
+	template <typename... Functions>
+	inline auto initializers(Functions&&... functions) {
+		return constructor_wrapper<std::decay_t<Functions>...>(std::forward<Functions>(functions)...);
+	}
+
+	template <typename... Functions>
+	struct factory_wrapper {
+		std::tuple<Functions...> functions;
+		template <typename Arg, typename... Args, meta::disable<std::is_same<meta::unqualified_t<Arg>, factory_wrapper>> = meta::enabler>
+		factory_wrapper(Arg&& arg, Args&&... args) : functions(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+		}
+	};
+
+	template <typename... Functions>
+	inline auto factories(Functions&&... functions) {
+		return factory_wrapper<std::decay_t<Functions>...>(std::forward<Functions>(functions)...);
+	}
+
+	template <typename Function>
+	struct destructor_wrapper {
+		Function fx;
+		destructor_wrapper(Function f) : fx(std::move(f)) {
+		}
+	};
+
+	template <>
+	struct destructor_wrapper<void> { };
+
+	const destructor_wrapper<void> default_destructor {};
+
+	template <typename Fx>
+	inline auto destructor(Fx&& fx) {
+		return destructor_wrapper<std::decay_t<Fx>>(std::forward<Fx>(fx));
+	}
+
+} // namespace sol
+
+#endif // SOL_RAII_HPP
diff --git a/extern/sol3/sol/reference.hpp b/extern/sol3/sol/reference.hpp
new file mode 100644
index 0000000000..ed296f663a
--- /dev/null
+++ b/extern/sol3/sol/reference.hpp
@@ -0,0 +1,900 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_REFERENCE_HPP
+#define SOL_REFERENCE_HPP
+
+#include <sol/types.hpp>
+#include <sol/stack_reference.hpp>
+
+#include <functional>
+
+namespace sol {
+	namespace detail {
+		inline const char (&default_main_thread_name())[9] {
+			static const char name[9] = "sol.\xF0\x9F\x93\x8C";
+			return name;
+		}
+	} // namespace detail
+
+	namespace stack {
+		inline void remove(lua_State* L_, int rawindex, int count) {
+			if (count < 1)
+				return;
+			int top = lua_gettop(L_);
+			if (top < 1) {
+				return;
+			}
+			if (rawindex == -count || top == rawindex) {
+				// Slice them right off the top
+				lua_pop(L_, static_cast<int>(count));
+				return;
+			}
+
+			// Remove each item one at a time using stack operations
+			// Probably slower, maybe, haven't benchmarked,
+			// but necessary
+			int index = lua_absindex(L_, rawindex);
+			if (index < 0) {
+				index = lua_gettop(L_) + (index + 1);
+			}
+			int last = index + count;
+			for (int i = index; i < last; ++i) {
+				lua_remove(L_, index);
+			}
+		}
+
+		struct push_popper_at {
+			lua_State* L;
+			int index;
+			int count;
+			push_popper_at(lua_State* L_, int index_ = -1, int count_ = 1) : L(L_), index(index_), count(count_) {
+			}
+			~push_popper_at() {
+				remove(L, index, count);
+			}
+		};
+
+		template <bool top_level>
+		struct push_popper_n {
+			lua_State* L;
+			int pop_count;
+			push_popper_n(lua_State* L_, int pop_count_) : L(L_), pop_count(pop_count_) {
+			}
+			push_popper_n(const push_popper_n&) = delete;
+			push_popper_n(push_popper_n&&) = default;
+			push_popper_n& operator=(const push_popper_n&) = delete;
+			push_popper_n& operator=(push_popper_n&&) = default;
+			~push_popper_n() {
+				lua_pop(L, pop_count);
+			}
+		};
+
+		template <>
+		struct push_popper_n<true> {
+			push_popper_n(lua_State*, int) {
+			}
+		};
+
+		template <bool, typename T, typename = void>
+		struct push_popper {
+			using Tu = meta::unqualified_t<T>;
+			T m_object;
+			int m_index;
+
+			push_popper(T object_) noexcept : m_object(object_), m_index(lua_absindex(m_object.lua_state(), -m_object.push())) {
+			}
+
+			int index_of(const Tu&) const noexcept {
+				return m_index;
+			}
+
+			~push_popper() {
+				m_object.pop();
+			}
+		};
+
+		template <typename T, typename C>
+		struct push_popper<true, T, C> {
+			using Tu = meta::unqualified_t<T>;
+
+			push_popper(T) noexcept {
+			}
+
+			int index_of(const Tu&) const noexcept {
+				return -1;
+			}
+
+			~push_popper() {
+			}
+		};
+
+		template <typename T>
+		struct push_popper<false, T, std::enable_if_t<is_stack_based_v<meta::unqualified_t<T>>>> {
+			using Tu = meta::unqualified_t<T>;
+
+			push_popper(T) noexcept {
+			}
+
+			int index_of(const Tu& object_) const noexcept {
+				return object_.stack_index();
+			}
+
+			~push_popper() {
+			}
+		};
+
+		template <bool, typename T, typename = void>
+		struct stateless_push_popper {
+			using Tu = meta::unqualified_t<T>;
+			lua_State* m_L;
+			T m_object;
+			int m_index;
+
+			stateless_push_popper(lua_State* L_, T object_) noexcept : m_L(L_), m_object(object_), m_index(lua_absindex(m_L, -m_object.push(m_L))) {
+			}
+
+			int index_of(const Tu&) const noexcept {
+				return m_index;
+			}
+
+			~stateless_push_popper() {
+				m_object.pop(m_L);
+			}
+		};
+
+		template <typename T, typename C>
+		struct stateless_push_popper<true, T, C> {
+			using Tu = meta::unqualified_t<T>;
+
+			stateless_push_popper(lua_State*, T) noexcept {
+			}
+
+			int index_of(lua_State*, const Tu&) const noexcept {
+				return -1;
+			}
+
+			~stateless_push_popper() {
+			}
+		};
+
+		template <typename T>
+		struct stateless_push_popper<false, T, std::enable_if_t<is_stack_based_v<meta::unqualified_t<T>>>> {
+			using Tu = meta::unqualified_t<T>;
+			lua_State* m_L;
+
+			stateless_push_popper(lua_State* L_, T) noexcept : m_L(L_) {
+			}
+
+			int index_of(const Tu& object_) const noexcept {
+				return object_.stack_index();
+			}
+
+			~stateless_push_popper() {
+			}
+		};
+
+		template <bool top_level = false, typename T>
+		push_popper<top_level, T> push_pop(T&& x) {
+			return push_popper<top_level, T>(std::forward<T>(x));
+		}
+
+		template <bool top_level = false, typename T>
+		stateless_push_popper<top_level, T> push_pop(lua_State* L_, T&& object_) {
+			return stateless_push_popper<top_level, T>(L_, std::forward<T>(object_));
+		}
+
+		template <typename T>
+		push_popper_at push_pop_at(T&& object_) {
+			int push_count = object_.push();
+			lua_State* L = object_.lua_state();
+			return push_popper_at(L, lua_absindex(L, -push_count), push_count);
+		}
+
+		template <bool top_level = false>
+		push_popper_n<top_level> pop_n(lua_State* L_, int pop_count_) {
+			return push_popper_n<top_level>(L_, pop_count_);
+		}
+	} // namespace stack
+
+	inline lua_State* main_thread(lua_State* L_, lua_State* backup_if_unsupported_ = nullptr) {
+#if SOL_LUA_VERSION_I_ < 502
+		if (L_ == nullptr)
+			return backup_if_unsupported_;
+		lua_getglobal(L_, detail::default_main_thread_name());
+		auto pp = stack::pop_n(L_, 1);
+		if (type_of(L_, -1) == type::thread) {
+			return lua_tothread(L_, -1);
+		}
+		return backup_if_unsupported_;
+#else
+		if (L_ == nullptr)
+			return backup_if_unsupported_;
+		lua_rawgeti(L_, LUA_REGISTRYINDEX, LUA_RIDX_MAINTHREAD);
+		lua_State* Lmain = lua_tothread(L_, -1);
+		lua_pop(L_, 1);
+		return Lmain;
+#endif // Lua 5.2+ has the main thread unqualified_getter
+	}
+
+	namespace detail {
+		struct no_safety_tag {
+		} inline constexpr no_safety {};
+
+		template <bool b>
+		inline lua_State* pick_main_thread(lua_State* L_, lua_State* backup_if_unsupported = nullptr) {
+			(void)L_;
+			(void)backup_if_unsupported;
+			if (b) {
+				return main_thread(L_, backup_if_unsupported);
+			}
+			return L_;
+		}
+	} // namespace detail
+
+	class stateless_reference {
+	private:
+		template <bool o_main_only>
+		friend class basic_reference;
+
+		int ref = LUA_NOREF;
+
+		int copy_ref(lua_State* L_) const noexcept {
+			if (ref == LUA_NOREF)
+				return LUA_NOREF;
+			push(L_);
+			return luaL_ref(L_, LUA_REGISTRYINDEX);
+		}
+
+		lua_State* copy_assign_ref(lua_State* L_, lua_State* rL, const stateless_reference& r) {
+			if (valid(L_)) {
+				deref(L_);
+			}
+			ref = r.copy_ref(L_);
+			return rL;
+		}
+
+		lua_State* move_assign(lua_State* L_, lua_State* rL, stateless_reference&& r) {
+			if (valid(L_)) {
+				deref(L_);
+			}
+			ref = r.ref;
+			r.ref = LUA_NOREF;
+			return rL;
+		}
+
+	protected:
+		int stack_index() const noexcept {
+			return -1;
+		}
+
+		stateless_reference(lua_State* L_, global_tag_t) noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L_, 1, "not enough Lua stack space to push this reference value");
+#endif // make sure stack doesn't overflow
+			lua_pushglobaltable(L_);
+			ref = luaL_ref(L_, LUA_REGISTRYINDEX);
+		}
+
+		stateless_reference(int raw_ref_index) noexcept : ref(raw_ref_index) {
+		}
+
+	public:
+		stateless_reference() noexcept = default;
+		stateless_reference(lua_nil_t) noexcept : stateless_reference() {
+		}
+		stateless_reference(const stack_reference& r) noexcept : stateless_reference(r.lua_state(), r.stack_index()) {
+		}
+		stateless_reference(stack_reference&& r) noexcept : stateless_reference(r.lua_state(), r.stack_index()) {
+		}
+		stateless_reference(lua_State* L_, const stateless_reference& r) noexcept {
+			if (r.ref == LUA_REFNIL) {
+				ref = LUA_REFNIL;
+				return;
+			}
+			if (r.ref == LUA_NOREF || L_ == nullptr) {
+				ref = LUA_NOREF;
+				return;
+			}
+			ref = r.copy_ref(L_);
+		}
+
+		stateless_reference(lua_State* L_, stateless_reference&& r) noexcept {
+			if (r.ref == LUA_REFNIL) {
+				ref = LUA_REFNIL;
+				return;
+			}
+			if (r.ref == LUA_NOREF || L_ == nullptr) {
+				ref = LUA_NOREF;
+				return;
+			}
+			ref = r.ref;
+			r.ref = LUA_NOREF;
+		}
+
+		stateless_reference(lua_State* L_, const stack_reference& r) noexcept {
+			if (L_ == nullptr || r.lua_state() == nullptr || r.get_type() == type::none) {
+				ref = LUA_NOREF;
+				return;
+			}
+			if (r.get_type() == type::lua_nil) {
+				ref = LUA_REFNIL;
+				return;
+			}
+			if (L_ != r.lua_state() && !detail::xmovable(L_, r.lua_state())) {
+				return;
+			}
+			r.push(L_);
+			ref = luaL_ref(L_, LUA_REGISTRYINDEX);
+		}
+
+		stateless_reference(lua_State* L_, const stateless_stack_reference& r) noexcept : stateless_reference(L_, r.stack_index()) {
+		}
+
+		stateless_reference(lua_State* L_, int index = -1) noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L_, 1, "not enough Lua stack space to push this reference value");
+#endif // make sure stack doesn't overflow
+			lua_pushvalue(L_, index);
+			ref = luaL_ref(L_, LUA_REGISTRYINDEX);
+		}
+		stateless_reference(lua_State* L_, absolute_index index_) noexcept : stateless_reference(L_, index_.index) {
+		}
+		stateless_reference(lua_State* L_, ref_index index_) noexcept {
+			lua_rawgeti(L_, LUA_REGISTRYINDEX, index_.index);
+			ref = luaL_ref(L_, LUA_REGISTRYINDEX);
+		}
+		stateless_reference(lua_State*, lua_nil_t) noexcept {
+		}
+
+		~stateless_reference() noexcept = default;
+
+		stateless_reference(const stateless_reference& o) noexcept = delete;
+		stateless_reference& operator=(const stateless_reference& r) noexcept = delete;
+
+		stateless_reference(stateless_reference&& o) noexcept : ref(o.ref) {
+			o.ref = LUA_NOREF;
+		}
+
+		stateless_reference& operator=(stateless_reference&& o) noexcept {
+			ref = o.ref;
+			o.ref = LUA_NOREF;
+			return *this;
+		}
+
+		int push(lua_State* L_) const noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L_, 1, "not enough Lua stack space to push this reference value");
+#endif // make sure stack doesn't overflow
+			lua_rawgeti(L_, LUA_REGISTRYINDEX, ref);
+			return 1;
+		}
+
+		void pop(lua_State* L_, int n = 1) const noexcept {
+			lua_pop(L_, n);
+		}
+
+		int registry_index() const noexcept {
+			return ref;
+		}
+
+		void reset(lua_State* L_) noexcept {
+			if (valid(L_)) {
+				deref(L_);
+			}
+			ref = LUA_NOREF;
+		}
+
+		void reset(lua_State* L_, int index_) noexcept {
+			reset(L_);
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L_, 1, "not enough Lua stack space to push this reference value");
+#endif // make sure stack doesn't overflow
+			lua_pushvalue(L_, index_);
+			ref = luaL_ref(L_, LUA_REGISTRYINDEX);
+		}
+
+		bool valid(lua_State*) const noexcept {
+			return !(ref == LUA_NOREF || ref == LUA_REFNIL);
+		}
+
+		const void* pointer(lua_State* L_) const noexcept {
+			int si = push(L_);
+			const void* vp = lua_topointer(L_, -si);
+			lua_pop(L_, si);
+			return vp;
+		}
+
+		type get_type(lua_State* L_) const noexcept {
+			int p = push(L_);
+			int result = lua_type(L_, -1);
+			pop(L_, p);
+			return static_cast<type>(result);
+		}
+
+		void abandon(lua_State* = nullptr) {
+			ref = LUA_NOREF;
+		}
+
+		void deref(lua_State* L_) const noexcept {
+			luaL_unref(L_, LUA_REGISTRYINDEX, ref);
+		}
+
+		stateless_reference copy(lua_State* L_) const noexcept {
+			if (!valid(L_)) {
+				return {};
+			}
+			return stateless_reference(copy_ref(L_));
+		}
+
+		void copy_assign(lua_State* L_, const stateless_reference& right) noexcept {
+			if (valid(L_)) {
+				deref(L_);
+			}
+			if (!right.valid(L_)) {
+				return;
+			}
+			ref = right.copy_ref(L_);
+		}
+
+		bool equals(lua_State* L_, const stateless_reference& r) const noexcept {
+			auto ppl = stack::push_pop(L_, *this);
+			auto ppr = stack::push_pop(L_, r);
+			return lua_compare(L_, -1, -2, LUA_OPEQ) == 1;
+		}
+
+		bool equals(lua_State* L_, const stateless_stack_reference& r) const noexcept {
+			auto ppl = stack::push_pop(L_, *this);
+			return lua_compare(L_, -1, r.stack_index(), LUA_OPEQ) == 1;
+		}
+
+		bool equals(lua_State* L_, lua_nil_t) const noexcept {
+			return valid(L_);
+		}
+	};
+
+	template <bool main_only = false>
+	class basic_reference : public stateless_reference {
+	private:
+		template <bool o_main_only>
+		friend class basic_reference;
+		lua_State* luastate = nullptr; // non-owning
+
+		template <bool r_main_only>
+		void copy_assign_complex(const basic_reference<r_main_only>& r) {
+			if (valid()) {
+				deref();
+			}
+			if (r.ref == LUA_REFNIL) {
+				luastate = detail::pick_main_thread < main_only && !r_main_only > (r.lua_state(), r.lua_state());
+				ref = LUA_REFNIL;
+				return;
+			}
+			if (r.ref == LUA_NOREF) {
+				luastate = r.luastate;
+				ref = LUA_NOREF;
+				return;
+			}
+			if (detail::xmovable(lua_state(), r.lua_state())) {
+				r.push(lua_state());
+				ref = luaL_ref(lua_state(), LUA_REGISTRYINDEX);
+				return;
+			}
+			luastate = detail::pick_main_thread < main_only && !r_main_only > (r.lua_state(), r.lua_state());
+			ref = r.copy_ref();
+		}
+
+		template <bool r_main_only>
+		void move_assign(basic_reference<r_main_only>&& r) {
+			if (valid()) {
+				deref();
+			}
+			if (r.ref == LUA_REFNIL) {
+				luastate = detail::pick_main_thread < main_only && !r_main_only > (r.lua_state(), r.lua_state());
+				ref = LUA_REFNIL;
+				return;
+			}
+			if (r.ref == LUA_NOREF) {
+				luastate = r.luastate;
+				ref = LUA_NOREF;
+				return;
+			}
+			if (detail::xmovable(lua_state(), r.lua_state())) {
+				r.push(lua_state());
+				ref = luaL_ref(lua_state(), LUA_REGISTRYINDEX);
+				return;
+			}
+
+			luastate = detail::pick_main_thread < main_only && !r_main_only > (r.lua_state(), r.lua_state());
+			ref = r.ref;
+			r.ref = LUA_NOREF;
+			r.luastate = nullptr;
+		}
+
+	protected:
+		basic_reference(lua_State* L_, global_tag_t) noexcept : basic_reference(detail::pick_main_thread<main_only>(L_, L_), global_tag, global_tag) {
+		}
+
+		basic_reference(lua_State* L_, global_tag_t, global_tag_t) noexcept : stateless_reference(L_, global_tag), luastate(L_) {
+		}
+
+		basic_reference(lua_State* oL, const basic_reference<!main_only>& o) noexcept : stateless_reference(oL, o), luastate(oL) {
+		}
+
+		void deref() const noexcept {
+			return stateless_reference::deref(lua_state());
+		}
+
+		int copy_ref() const noexcept {
+			return copy_ref(lua_state());
+		}
+
+		int copy_ref(lua_State* L_) const noexcept {
+			return stateless_reference::copy_ref(L_);
+		}
+
+	public:
+		basic_reference() noexcept = default;
+		basic_reference(lua_nil_t) noexcept : basic_reference() {
+		}
+		basic_reference(const stack_reference& r) noexcept : basic_reference(r.lua_state(), r.stack_index()) {
+		}
+		basic_reference(stack_reference&& r) noexcept : basic_reference(r.lua_state(), r.stack_index()) {
+		}
+		template <bool r_main_only>
+		basic_reference(lua_State* L_, const basic_reference<r_main_only>& r) noexcept : luastate(detail::pick_main_thread<main_only>(L_, L_)) {
+			if (r.ref == LUA_REFNIL) {
+				ref = LUA_REFNIL;
+				return;
+			}
+			if (r.ref == LUA_NOREF || lua_state() == nullptr) {
+				ref = LUA_NOREF;
+				return;
+			}
+			if (detail::xmovable(lua_state(), r.lua_state())) {
+				r.push(lua_state());
+				ref = luaL_ref(lua_state(), LUA_REGISTRYINDEX);
+				return;
+			}
+			ref = r.copy_ref();
+		}
+
+		template <bool r_main_only>
+		basic_reference(lua_State* L_, basic_reference<r_main_only>&& r) noexcept : luastate(detail::pick_main_thread<main_only>(L_, L_)) {
+			if (r.ref == LUA_REFNIL) {
+				ref = LUA_REFNIL;
+				return;
+			}
+			if (r.ref == LUA_NOREF || lua_state() == nullptr) {
+				ref = LUA_NOREF;
+				return;
+			}
+			if (detail::xmovable(lua_state(), r.lua_state())) {
+				r.push(lua_state());
+				ref = luaL_ref(lua_state(), LUA_REGISTRYINDEX);
+				return;
+			}
+			ref = r.ref;
+			r.ref = LUA_NOREF;
+			r.luastate = nullptr;
+		}
+
+		basic_reference(lua_State* L_, const stack_reference& r) noexcept : luastate(detail::pick_main_thread<main_only>(L_, L_)) {
+			if (lua_state() == nullptr || r.lua_state() == nullptr || r.get_type() == type::none) {
+				ref = LUA_NOREF;
+				return;
+			}
+			if (r.get_type() == type::lua_nil) {
+				ref = LUA_REFNIL;
+				return;
+			}
+			if (lua_state() != r.lua_state() && !detail::xmovable(lua_state(), r.lua_state())) {
+				return;
+			}
+			r.push(lua_state());
+			ref = luaL_ref(lua_state(), LUA_REGISTRYINDEX);
+		}
+		basic_reference(lua_State* L_, int index = -1) noexcept : luastate(detail::pick_main_thread<main_only>(L_, L_)) {
+			// use L_ to stick with that state's execution stack
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L_, 1, "not enough Lua stack space to push this reference value");
+#endif // make sure stack doesn't overflow
+			lua_pushvalue(L_, index);
+			ref = luaL_ref(L_, LUA_REGISTRYINDEX);
+		}
+		basic_reference(lua_State* L_, ref_index index) noexcept : luastate(detail::pick_main_thread<main_only>(L_, L_)) {
+			lua_rawgeti(lua_state(), LUA_REGISTRYINDEX, index.index);
+			ref = luaL_ref(lua_state(), LUA_REGISTRYINDEX);
+		}
+		basic_reference(lua_State* L_, lua_nil_t) noexcept : luastate(detail::pick_main_thread<main_only>(L_, L_)) {
+		}
+
+		~basic_reference() noexcept {
+			if (lua_state() == nullptr || ref == LUA_NOREF)
+				return;
+			deref();
+		}
+
+		basic_reference(const basic_reference& o) noexcept : stateless_reference(o.copy_ref()), luastate(o.lua_state()) {
+		}
+
+		basic_reference(basic_reference&& o) noexcept : stateless_reference(std::move(o)), luastate(o.lua_state()) {
+			o.luastate = nullptr;
+		}
+
+		basic_reference(const basic_reference<!main_only>& o) noexcept
+		: basic_reference(detail::pick_main_thread<main_only>(o.lua_state(), o.lua_state()), o) {
+		}
+
+		basic_reference(basic_reference<!main_only>&& o) noexcept
+		: stateless_reference(std::move(o)), luastate(detail::pick_main_thread<main_only>(o.lua_state(), o.lua_state())) {
+			o.luastate = nullptr;
+			o.ref = LUA_NOREF;
+		}
+
+		basic_reference& operator=(basic_reference&& r) noexcept {
+			move_assign(std::move(r));
+			return *this;
+		}
+
+		basic_reference& operator=(const basic_reference& r) noexcept {
+			copy_assign_complex(r);
+			return *this;
+		}
+
+		basic_reference& operator=(basic_reference<!main_only>&& r) noexcept {
+			move_assign(std::move(r));
+			return *this;
+		}
+
+		basic_reference& operator=(const basic_reference<!main_only>& r) noexcept {
+			copy_assign_complex(r);
+			return *this;
+		}
+
+		basic_reference& operator=(const lua_nil_t&) noexcept {
+			reset();
+			return *this;
+		}
+
+		template <typename Super>
+		basic_reference& operator=(proxy_base<Super>&& r);
+
+		template <typename Super>
+		basic_reference& operator=(const proxy_base<Super>& r);
+
+		int push() const noexcept {
+			return push(lua_state());
+		}
+
+		void reset() noexcept {
+			stateless_reference::reset(luastate);
+			luastate = nullptr;
+		}
+
+		int push(lua_State* L_) const noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L_, 1, "not enough Lua stack space to push this reference value");
+#endif // make sure stack doesn't overflow
+			if (lua_state() == nullptr) {
+				lua_pushnil(L_);
+				return 1;
+			}
+			lua_rawgeti(lua_state(), LUA_REGISTRYINDEX, ref);
+			if (L_ != lua_state()) {
+				lua_xmove(lua_state(), L_, 1);
+			}
+			return 1;
+		}
+
+		void pop() const noexcept {
+			pop(lua_state());
+		}
+
+		void pop(lua_State* L_, int n = 1) const noexcept {
+			stateless_reference::pop(L_, n);
+		}
+
+		int registry_index() const noexcept {
+			return stateless_reference::registry_index();
+		}
+
+		bool valid() const noexcept {
+			return stateless_reference::valid(lua_state());
+		}
+
+		bool valid(lua_State* L_) const noexcept {
+			return stateless_reference::valid(L_);
+		}
+
+		const void* pointer() const noexcept {
+			return stateless_reference::pointer(lua_state());
+		}
+
+		explicit operator bool() const noexcept {
+			return valid();
+		}
+
+		type get_type() const noexcept {
+			return stateless_reference::get_type(lua_state());
+		}
+
+		lua_State* lua_state() const noexcept {
+			return luastate;
+		}
+	};
+
+	template <bool lb, bool rb>
+	inline bool operator==(const basic_reference<lb>& l, const basic_reference<rb>& r) noexcept {
+		auto ppl = stack::push_pop(l);
+		auto ppr = stack::push_pop(r);
+		return lua_compare(l.lua_state(), -1, -2, LUA_OPEQ) == 1;
+	}
+
+	template <bool lb, bool rb>
+	inline bool operator!=(const basic_reference<lb>& l, const basic_reference<rb>& r) noexcept {
+		return !operator==(l, r);
+	}
+
+	template <bool lb>
+	inline bool operator==(const basic_reference<lb>& l, const stack_reference& r) noexcept {
+		auto ppl = stack::push_pop(l);
+		return lua_compare(l.lua_state(), -1, r.stack_index(), LUA_OPEQ) == 1;
+	}
+
+	template <bool lb>
+	inline bool operator!=(const basic_reference<lb>& l, const stack_reference& r) noexcept {
+		return !operator==(l, r);
+	}
+
+	template <bool rb>
+	inline bool operator==(const stack_reference& l, const basic_reference<rb>& r) noexcept {
+		auto ppr = stack::push_pop(r);
+		return lua_compare(l.lua_state(), -1, r.stack_index(), LUA_OPEQ) == 1;
+	}
+
+	template <bool rb>
+	inline bool operator!=(const stack_reference& l, const basic_reference<rb>& r) noexcept {
+		return !operator==(l, r);
+	}
+
+	template <bool lb>
+	inline bool operator==(const basic_reference<lb>& lhs, const lua_nil_t&) noexcept {
+		return !lhs.valid();
+	}
+
+	template <bool rb>
+	inline bool operator==(const lua_nil_t&, const basic_reference<rb>& rhs) noexcept {
+		return !rhs.valid();
+	}
+
+	template <bool lb>
+	inline bool operator!=(const basic_reference<lb>& lhs, const lua_nil_t&) noexcept {
+		return lhs.valid();
+	}
+
+	template <bool rb>
+	inline bool operator!=(const lua_nil_t&, const basic_reference<rb>& rhs) noexcept {
+		return rhs.valid();
+	}
+
+	inline bool operator==(const stateless_reference& l, const stateless_reference& r) noexcept {
+		return l.registry_index() == r.registry_index();
+	}
+
+	inline bool operator!=(const stateless_reference& l, const stateless_reference& r) noexcept {
+		return l.registry_index() != r.registry_index();
+	}
+
+	inline bool operator==(const stateless_reference& lhs, const lua_nil_t&) noexcept {
+		return lhs.registry_index() == LUA_REFNIL;
+	}
+
+	inline bool operator==(const lua_nil_t&, const stateless_reference& rhs) noexcept {
+		return rhs.registry_index() == LUA_REFNIL;
+	}
+
+	inline bool operator!=(const stateless_reference& lhs, const lua_nil_t&) noexcept {
+		return lhs.registry_index() != LUA_REFNIL;
+	}
+
+	inline bool operator!=(const lua_nil_t&, const stateless_reference& rhs) noexcept {
+		return rhs.registry_index() != LUA_REFNIL;
+	}
+
+	struct stateless_reference_equals : public stateless_stack_reference_equals {
+		using is_transparent = std::true_type;
+
+		stateless_reference_equals(lua_State* L_) noexcept : stateless_stack_reference_equals(L_) {
+		}
+
+		bool operator()(const lua_nil_t& lhs, const stateless_reference& rhs) const noexcept {
+			return rhs.equals(lua_state(), lhs);
+		}
+
+		bool operator()(const stateless_reference& lhs, const lua_nil_t& rhs) const noexcept {
+			return lhs.equals(lua_state(), rhs);
+		}
+
+		bool operator()(const stateless_reference& lhs, const stateless_reference& rhs) const noexcept {
+			return lhs.equals(lua_state(), rhs);
+		}
+	};
+
+	struct reference_equals : public stack_reference_equals {
+		using is_transparent = std::true_type;
+
+		template <bool rb>
+		bool operator()(const lua_nil_t& lhs, const basic_reference<rb>& rhs) const noexcept {
+			return lhs == rhs;
+		}
+
+		template <bool lb>
+		bool operator()(const basic_reference<lb>& lhs, const lua_nil_t& rhs) const noexcept {
+			return lhs == rhs;
+		}
+
+		template <bool lb, bool rb>
+		bool operator()(const basic_reference<lb>& lhs, const basic_reference<rb>& rhs) const noexcept {
+			return lhs == rhs;
+		}
+
+		template <bool lb>
+		bool operator()(const basic_reference<lb>& lhs, const stack_reference& rhs) const noexcept {
+			return lhs == rhs;
+		}
+
+		template <bool rb>
+		bool operator()(const stack_reference& lhs, const basic_reference<rb>& rhs) const noexcept {
+			return lhs == rhs;
+		}
+	};
+
+	struct stateless_reference_hash : public stateless_stack_reference_hash {
+		using argument_type = stateless_reference;
+		using result_type = std::size_t;
+		using is_transparent = std::true_type;
+
+		stateless_reference_hash(lua_State* L_) noexcept : stateless_stack_reference_hash(L_) {
+		}
+
+		result_type operator()(const stateless_reference& lhs) const noexcept {
+			std::hash<const void*> h;
+			return h(lhs.pointer(lua_state()));
+		}
+	};
+
+	struct reference_hash : public stack_reference_hash {
+		using argument_type = reference;
+		using result_type = std::size_t;
+		using is_transparent = std::true_type;
+
+		template <bool lb>
+		result_type operator()(const basic_reference<lb>& lhs) const noexcept {
+			std::hash<const void*> h;
+			return h(lhs.pointer());
+		}
+	};
+} // namespace sol
+
+#endif // SOL_REFERENCE_HPP
diff --git a/extern/sol3/sol/resolve.hpp b/extern/sol3/sol/resolve.hpp
new file mode 100644
index 0000000000..2cbc8d2f5f
--- /dev/null
+++ b/extern/sol3/sol/resolve.hpp
@@ -0,0 +1,173 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_RESOLVE_HPP
+#define SOL_RESOLVE_HPP
+
+#include <sol/traits.hpp>
+#include <sol/tuple.hpp>
+
+namespace sol {
+
+#ifndef __clang__
+	// constexpr is fine for not-clang
+
+	namespace detail {
+		template <typename R, typename... Args, typename F, typename = std::invoke_result_t<meta::unqualified_t<F>, Args...>>
+		inline constexpr auto resolve_i(types<R(Args...)>, F&&) -> R (meta::unqualified_t<F>::*)(Args...) {
+			using Sig = R(Args...);
+			typedef meta::unqualified_t<F> Fu;
+			return static_cast<Sig Fu::*>(&Fu::operator());
+		}
+
+		template <typename F, typename U = meta::unqualified_t<F>>
+		inline constexpr auto resolve_f(std::true_type, F&& f)
+		     -> decltype(resolve_i(types<meta::function_signature_t<decltype(&U::operator())>>(), std::forward<F>(f))) {
+			return resolve_i(types<meta::function_signature_t<decltype(&U::operator())>>(), std::forward<F>(f));
+		}
+
+		template <typename F>
+		inline constexpr void resolve_f(std::false_type, F&&) {
+			static_assert(meta::call_operator_deducible_v<F>, "Cannot use no-template-parameter call with an overloaded functor: specify the signature");
+		}
+
+		template <typename F, typename U = meta::unqualified_t<F>>
+		inline constexpr auto resolve_i(types<>, F&& f) -> decltype(resolve_f(meta::call_operator_deducible<U>(), std::forward<F>(f))) {
+			return resolve_f(meta::call_operator_deducible<U> {}, std::forward<F>(f));
+		}
+
+		template <typename... Args, typename F, typename R = std::invoke_result_t<F&, Args...>>
+		inline constexpr auto resolve_i(types<Args...>, F&& f) -> decltype(resolve_i(types<R(Args...)>(), std::forward<F>(f))) {
+			return resolve_i(types<R(Args...)>(), std::forward<F>(f));
+		}
+
+		template <typename Sig, typename C>
+		inline constexpr Sig C::*resolve_v(std::false_type, Sig C::*mem_func_ptr) {
+			return mem_func_ptr;
+		}
+
+		template <typename Sig, typename C>
+		inline constexpr Sig C::*resolve_v(std::true_type, Sig C::*mem_variable_ptr) {
+			return mem_variable_ptr;
+		}
+	} // namespace detail
+
+	template <typename... Args, typename R>
+	inline constexpr auto resolve(R fun_ptr(Args...)) -> R (*)(Args...) {
+		return fun_ptr;
+	}
+
+	template <typename Sig>
+	inline constexpr Sig* resolve(Sig* fun_ptr) {
+		return fun_ptr;
+	}
+
+	template <typename... Args, typename R, typename C>
+	inline constexpr auto resolve(R (C::*mem_ptr)(Args...)) -> R (C::*)(Args...) {
+		return mem_ptr;
+	}
+
+	template <typename Sig, typename C>
+	inline constexpr Sig C::*resolve(Sig C::*mem_ptr) {
+		return detail::resolve_v(std::is_member_object_pointer<Sig C::*>(), mem_ptr);
+	}
+
+	template <typename... Sig, typename F, meta::disable<std::is_function<meta::unqualified_t<F>>> = meta::enabler>
+	inline constexpr auto resolve(F&& f) -> decltype(detail::resolve_i(types<Sig...>(), std::forward<F>(f))) {
+		return detail::resolve_i(types<Sig...>(), std::forward<F>(f));
+	}
+#else
+
+	// Clang has distinct problems with constexpr arguments,
+	// so don't use the constexpr versions inside of clang.
+
+	namespace detail {
+		template <typename R, typename... Args, typename F, typename = std::invoke_result_t<meta::unqualified_t<F>, Args...>>
+		inline auto resolve_i(types<R(Args...)>, F&&) -> R (meta::unqualified_t<F>::*)(Args...) {
+			using Sig = R(Args...);
+			typedef meta::unqualified_t<F> Fu;
+			return static_cast<Sig Fu::*>(&Fu::operator());
+		}
+
+		template <typename F, typename U = meta::unqualified_t<F>>
+		inline auto resolve_f(std::true_type, F&& f)
+		     -> decltype(resolve_i(types<meta::function_signature_t<decltype(&U::operator())>>(), std::forward<F>(f))) {
+			return resolve_i(types<meta::function_signature_t<decltype(&U::operator())>>(), std::forward<F>(f));
+		}
+
+		template <typename F>
+		inline void resolve_f(std::false_type, F&&) {
+			static_assert(meta::call_operator_deducible_v<F>, "Cannot use no-template-parameter call with an overloaded functor: specify the signature");
+		}
+
+		template <typename F, typename U = meta::unqualified_t<F>>
+		inline auto resolve_i(types<>, F&& f) -> decltype(resolve_f(meta::call_operator_deducible<U>(), std::forward<F>(f))) {
+			return resolve_f(meta::call_operator_deducible<U> {}, std::forward<F>(f));
+		}
+
+		template <typename... Args, typename F, typename R = std::invoke_result_t<F&, Args...>>
+		inline auto resolve_i(types<Args...>, F&& f) -> decltype(resolve_i(types<R(Args...)>(), std::forward<F>(f))) {
+			return resolve_i(types<R(Args...)>(), std::forward<F>(f));
+		}
+
+		template <typename Sig, typename C>
+		inline Sig C::*resolve_v(std::false_type, Sig C::*mem_func_ptr) {
+			return mem_func_ptr;
+		}
+
+		template <typename Sig, typename C>
+		inline Sig C::*resolve_v(std::true_type, Sig C::*mem_variable_ptr) {
+			return mem_variable_ptr;
+		}
+	} // namespace detail
+
+	template <typename... Args, typename R>
+	inline auto resolve(R fun_ptr(Args...)) -> R (*)(Args...) {
+		return fun_ptr;
+	}
+
+	template <typename Sig>
+	inline Sig* resolve(Sig* fun_ptr) {
+		return fun_ptr;
+	}
+
+	template <typename... Args, typename R, typename C>
+	inline auto resolve(R (C::*mem_ptr)(Args...)) -> R (C::*)(Args...) {
+		return mem_ptr;
+	}
+
+	template <typename Sig, typename C>
+	inline Sig C::*resolve(Sig C::*mem_ptr) {
+		return detail::resolve_v(std::is_member_object_pointer<Sig C::*>(), mem_ptr);
+	}
+
+	template <typename... Sig, typename F>
+	inline auto resolve(F&& f) -> decltype(detail::resolve_i(types<Sig...>(), std::forward<F>(f))) {
+		return detail::resolve_i(types<Sig...>(), std::forward<F>(f));
+	}
+
+#endif
+
+} // namespace sol
+
+#endif // SOL_RESOLVE_HPP
diff --git a/extern/sol3/sol/sol.hpp b/extern/sol3/sol/sol.hpp
new file mode 100644
index 0000000000..dc30088306
--- /dev/null
+++ b/extern/sol3/sol/sol.hpp
@@ -0,0 +1,79 @@
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_HPP
+#define SOL_HPP
+
+#include <sol/version.hpp>
+
+#if SOL_IS_ON(SOL_INSIDE_UNREAL_ENGINE_I_)
+#ifdef check
+#pragma push_macro("check")
+#undef check
+#endif
+#endif // Unreal Engine 4 Bullshit
+
+#if SOL_IS_ON(SOL_COMPILER_GCC_I_)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
+#pragma GCC diagnostic ignored "-Wconversion"
+#if __GNUC__ > 6
+#pragma GCC diagnostic ignored "-Wnoexcept-type"
+#endif
+#elif SOL_IS_ON(SOL_COMPILER_CLANG_I_)
+// we'll just let this alone for now
+#elif SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+#pragma warning(push)
+#pragma warning(disable : 4505) // unreferenced local function has been removed GEE THANKS
+#endif                          // clang++ vs. g++ vs. VC++
+
+#include <sol/forward.hpp>
+#include <sol/forward_detail.hpp>
+#include <sol/assert.hpp>
+#include <sol/bytecode.hpp>
+#include <sol/stack.hpp>
+#include <sol/object.hpp>
+#include <sol/function.hpp>
+#include <sol/protected_function.hpp>
+#include <sol/usertype.hpp>
+#include <sol/table.hpp>
+#include <sol/state.hpp>
+#include <sol/coroutine.hpp>
+#include <sol/thread.hpp>
+#include <sol/userdata.hpp>
+#include <sol/metatable.hpp>
+#include <sol/as_args.hpp>
+#include <sol/variadic_args.hpp>
+#include <sol/variadic_results.hpp>
+#include <sol/lua_value.hpp>
+
+#if SOL_IS_ON(SOL_COMPILER_GCC_I_)
+#pragma GCC diagnostic pop
+#elif SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+#pragma warning(pop)
+#endif // g++
+
+#if SOL_IS_ON(SOL_INSIDE_UNREAL_ENGINE_I_)
+#undef check
+#pragma pop_macro("check")
+#endif // Unreal Engine 4 Bullshit
+
+#endif // SOL_HPP
diff --git a/extern/sol3/sol/stack.hpp b/extern/sol3/sol/stack.hpp
new file mode 100644
index 0000000000..faf468d8f8
--- /dev/null
+++ b/extern/sol3/sol/stack.hpp
@@ -0,0 +1,351 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_STACK_HPP
+#define SOL_STACK_HPP
+
+#include <sol/trampoline.hpp>
+#include <sol/stack_core.hpp>
+#include <sol/stack_reference.hpp>
+#include <sol/stack_check.hpp>
+#include <sol/stack_get.hpp>
+#include <sol/stack_check_get.hpp>
+#include <sol/stack_push.hpp>
+#include <sol/stack_pop.hpp>
+#include <sol/stack_field.hpp>
+#include <sol/stack_probe.hpp>
+
+#include <cstring>
+#include <array>
+
+namespace sol {
+	namespace detail {
+		using typical_chunk_name_t = char[SOL_ID_SIZE_I_];
+		using typical_file_chunk_name_t = char[SOL_FILE_ID_SIZE_I_];
+
+		inline const std::string& default_chunk_name() {
+			static const std::string name = "";
+			return name;
+		}
+
+		template <std::size_t N>
+		const char* make_chunk_name(const string_view& code, const std::string& chunkname, char (&basechunkname)[N]) {
+			if (chunkname.empty()) {
+				auto it = code.cbegin();
+				auto e = code.cend();
+				std::size_t i = 0;
+				static const std::size_t n = N - 4;
+				for (i = 0; i < n && it != e; ++i, ++it) {
+					basechunkname[i] = *it;
+				}
+				if (it != e) {
+					for (std::size_t c = 0; c < 3; ++i, ++c) {
+						basechunkname[i] = '.';
+					}
+				}
+				basechunkname[i] = '\0';
+				return &basechunkname[0];
+			}
+			else {
+				return chunkname.c_str();
+			}
+		}
+
+		inline void clear_entries(stack_reference r) {
+			stack::push(r.lua_state(), lua_nil);
+			while (lua_next(r.lua_state(), -2)) {
+				absolute_index key(r.lua_state(), -2);
+				auto pn = stack::pop_n(r.lua_state(), 1);
+				stack::set_field<false, true>(r.lua_state(), key, lua_nil, r.stack_index());
+			}
+		}
+
+		inline void clear_entries(const reference& registry_reference) {
+			auto pp = stack::push_pop(registry_reference);
+			stack_reference ref(registry_reference.lua_state(), -1);
+			clear_entries(ref);
+		}
+	} // namespace detail
+
+	namespace stack {
+		namespace stack_detail {
+			template <typename T>
+			inline int push_as_upvalues(lua_State* L, T& item) {
+				typedef std::decay_t<T> TValue;
+				static const std::size_t itemsize = sizeof(TValue);
+				static const std::size_t voidsize = sizeof(void*);
+				static const std::size_t voidsizem1 = voidsize - 1;
+				static const std::size_t data_t_count = (sizeof(TValue) + voidsizem1) / voidsize;
+				typedef std::array<void*, data_t_count> data_t;
+
+				data_t data { {} };
+				std::memcpy(&data[0], std::addressof(item), itemsize);
+				int pushcount = 0;
+				for (const auto& v : data) {
+					lua_pushlightuserdata(L, v);
+					pushcount += 1;
+				}
+				return pushcount;
+			}
+
+			template <typename T>
+			inline std::pair<T, int> get_as_upvalues(lua_State* L, int index = 2) {
+				static const std::size_t data_t_count = (sizeof(T) + (sizeof(void*) - 1)) / sizeof(void*);
+				typedef std::array<void*, data_t_count> data_t;
+				data_t voiddata { {} };
+				for (std::size_t i = 0, d = 0; d < sizeof(T); ++i, d += sizeof(void*)) {
+					voiddata[i] = lua_touserdata(L, upvalue_index(index++));
+				}
+				return std::pair<T, int>(*reinterpret_cast<T*>(static_cast<void*>(voiddata.data())), index);
+			}
+
+			template <typename T>
+			inline std::pair<T, int> get_as_upvalues_using_function(lua_State* L, int function_index = -1) {
+				static const std::size_t data_t_count = (sizeof(T) + (sizeof(void*) - 1)) / sizeof(void*);
+				typedef std::array<void*, data_t_count> data_t;
+				function_index = lua_absindex(L, function_index);
+				int index = 0;
+				data_t voiddata { {} };
+				for (std::size_t d = 0; d < sizeof(T); d += sizeof(void*)) {
+					// first upvalue is nullptr to respect environment shenanigans
+					// So +2 instead of +1
+					const char* upvalue_name = lua_getupvalue(L, function_index, index + 2);
+					if (upvalue_name == nullptr) {
+						// We should freak out here...
+						break;
+					}
+					voiddata[index] = lua_touserdata(L, -1);
+					++index;
+				}
+				lua_pop(L, index);
+				return std::pair<T, int>(*reinterpret_cast<T*>(static_cast<void*>(voiddata.data())), index);
+			}
+
+			template <bool checked, typename Handler, typename Fx, typename... Args>
+			static decltype(auto) eval(types<>, std::index_sequence<>, lua_State*, int, Handler&&, record&, Fx&& fx, Args&&... args) {
+				return std::forward<Fx>(fx)(std::forward<Args>(args)...);
+			}
+
+			template <bool checked, typename Arg, typename... Args, std::size_t I, std::size_t... Is, typename Handler, typename Fx, typename... FxArgs>
+			static decltype(auto) eval(types<Arg, Args...>, std::index_sequence<I, Is...>, lua_State* L_, int start_index_, Handler&& handler_,
+			     record& tracking_, Fx&& fx_, FxArgs&&... fxargs_) {
+#if SOL_IS_ON(SOL_PROPAGATE_EXCEPTIONS_I_)
+				// We can save performance/time by letting errors unwind produced arguments
+				// rather than checking everything once, and then potentially re-doing work
+				if constexpr (checked) {
+					return eval<checked>(types<Args...>(),
+					     std::index_sequence<Is...>(),
+					     L_,
+					     start_index_,
+					     std::forward<Handler>(handler_),
+					     tracking_,
+					     std::forward<Fx>(fx_),
+					     std::forward<FxArgs>(fxargs_)...,
+					     *stack_detail::check_get_arg<Arg>(L_, start_index_ + tracking_.used, handler_, tracking_));
+				}
+				else
+#endif
+				{
+					return eval<checked>(types<Args...>(),
+					     std::index_sequence<Is...>(),
+					     L_,
+					     start_index_,
+					     std::forward<Handler>(handler_),
+					     tracking_,
+					     std::forward<Fx>(fx_),
+					     std::forward<FxArgs>(fxargs_)...,
+					     stack_detail::unchecked_get_arg<Arg>(L_, start_index_ + tracking_.used, tracking_));
+				}
+			}
+
+			template <bool checkargs = detail::default_safe_function_calls, std::size_t... I, typename R, typename... Args, typename Fx, typename... FxArgs>
+			inline decltype(auto) call(types<R>, types<Args...> argument_types_, std::index_sequence<I...> argument_indices_, lua_State* L_,
+			     int start_index_, Fx&& fx_, FxArgs&&... args_) {
+				static_assert(meta::all_v<meta::is_not_move_only<Args>...>,
+				     "One of the arguments being bound is a move-only type, and it is not being taken by reference: this will break your code. Please take "
+				     "a reference and std::move it manually if this was your intention.");
+				argument_handler<types<R, Args...>> handler {};
+				record tracking {};
+#if SOL_IS_OFF(SOL_PROPAGATE_EXCEPTIONS_I_)
+				if constexpr (checkargs) {
+					multi_check<Args...>(L_, start_index_, handler);
+				}
+#endif
+				if constexpr (std::is_void_v<R>) {
+					eval<checkargs>(
+					     argument_types_, argument_indices_, L_, start_index_, handler, tracking, std::forward<Fx>(fx_), std::forward<FxArgs>(args_)...);
+				}
+				else {
+					return eval<checkargs>(
+					     argument_types_, argument_indices_, L_, start_index_, handler, tracking, std::forward<Fx>(fx_), std::forward<FxArgs>(args_)...);
+				}
+			}
+		} // namespace stack_detail
+
+		template <typename T>
+		int set_ref(lua_State* L, T&& arg, int tableindex = -2) {
+			push(L, std::forward<T>(arg));
+			return luaL_ref(L, tableindex);
+		}
+
+		template <bool check_args = detail::default_safe_function_calls, typename R, typename... Args, typename Fx, typename... FxArgs>
+		inline decltype(auto) call(types<R> tr, types<Args...> ta, lua_State* L, int start, Fx&& fx, FxArgs&&... args) {
+			using args_indices = std::make_index_sequence<sizeof...(Args)>;
+			if constexpr (std::is_void_v<R>) {
+				stack_detail::call<check_args>(tr, ta, args_indices(), L, start, std::forward<Fx>(fx), std::forward<FxArgs>(args)...);
+			}
+			else {
+				return stack_detail::call<check_args>(tr, ta, args_indices(), L, start, std::forward<Fx>(fx), std::forward<FxArgs>(args)...);
+			}
+		}
+
+		template <bool check_args = detail::default_safe_function_calls, typename R, typename... Args, typename Fx, typename... FxArgs>
+		inline decltype(auto) call(types<R> tr, types<Args...> ta, lua_State* L, Fx&& fx, FxArgs&&... args) {
+			if constexpr (std::is_void_v<R>) {
+				call<check_args>(tr, ta, L, 1, std::forward<Fx>(fx), std::forward<FxArgs>(args)...);
+			}
+			else {
+				return call<check_args>(tr, ta, L, 1, std::forward<Fx>(fx), std::forward<FxArgs>(args)...);
+			}
+		}
+
+		template <bool check_args = detail::default_safe_function_calls, typename R, typename... Args, typename Fx, typename... FxArgs>
+		inline decltype(auto) call_from_top(types<R> tr, types<Args...> ta, lua_State* L, Fx&& fx, FxArgs&&... args) {
+			using expected_count_t = meta::count_for_pack<lua_size, Args...>;
+			if constexpr (std::is_void_v<R>) {
+				call<check_args>(tr,
+				     ta,
+				     L,
+				     (std::max)(static_cast<int>(lua_gettop(L) - expected_count_t::value), static_cast<int>(0)),
+				     std::forward<Fx>(fx),
+				     std::forward<FxArgs>(args)...);
+			}
+			else {
+				return call<check_args>(tr,
+				     ta,
+				     L,
+				     (std::max)(static_cast<int>(lua_gettop(L) - expected_count_t::value), static_cast<int>(0)),
+				     std::forward<Fx>(fx),
+				     std::forward<FxArgs>(args)...);
+			}
+		}
+
+		template <bool check_args = detail::default_safe_function_calls, bool clean_stack = true, typename Ret0, typename... Ret, typename... Args,
+		     typename Fx, typename... FxArgs>
+		inline int call_into_lua(types<Ret0, Ret...> tr, types<Args...> ta, lua_State* L, int start, Fx&& fx, FxArgs&&... fxargs) {
+			if constexpr (std::is_void_v<Ret0>) {
+				call<check_args>(tr, ta, L, start, std::forward<Fx>(fx), std::forward<FxArgs>(fxargs)...);
+				if constexpr (clean_stack) {
+					lua_settop(L, 0);
+				}
+				return 0;
+			}
+			else {
+				(void)tr;
+				decltype(auto) r
+				     = call<check_args>(types<meta::return_type_t<Ret0, Ret...>>(), ta, L, start, std::forward<Fx>(fx), std::forward<FxArgs>(fxargs)...);
+				using R = meta::unqualified_t<decltype(r)>;
+				using is_stack = meta::any<is_stack_based<R>, std::is_same<R, absolute_index>, std::is_same<R, ref_index>, std::is_same<R, raw_index>>;
+				if constexpr (clean_stack && !is_stack::value) {
+					lua_settop(L, 0);
+				}
+				return push_reference(L, std::forward<decltype(r)>(r));
+			}
+		}
+
+		template <bool check_args = detail::default_safe_function_calls, bool clean_stack = true, typename Fx, typename... FxArgs>
+		inline int call_lua(lua_State* L, int start, Fx&& fx, FxArgs&&... fxargs) {
+			using traits_type = lua_bind_traits<meta::unqualified_t<Fx>>;
+			using args_list = typename traits_type::args_list;
+			using returns_list = typename traits_type::returns_list;
+			return call_into_lua<check_args, clean_stack>(returns_list(), args_list(), L, start, std::forward<Fx>(fx), std::forward<FxArgs>(fxargs)...);
+		}
+
+		inline call_syntax get_call_syntax(lua_State* L, const string_view& key, int index) {
+			if (lua_gettop(L) < 1) {
+				return call_syntax::dot;
+			}
+			luaL_getmetatable(L, key.data());
+			auto pn = pop_n(L, 1);
+			if (lua_compare(L, -1, index, LUA_OPEQ) != 1) {
+				return call_syntax::dot;
+			}
+			return call_syntax::colon;
+		}
+
+		inline void script(
+		     lua_State* L, lua_Reader reader, void* data, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name("lua_Reader", chunkname, basechunkname);
+			if (lua_load(L, reader, data, chunknametarget, to_string(mode).c_str()) || lua_pcall(L, 0, LUA_MULTRET, 0)) {
+				lua_error(L);
+			}
+		}
+
+		inline void script(
+		     lua_State* L, const string_view& code, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name(code, chunkname, basechunkname);
+			if (luaL_loadbufferx(L, code.data(), code.size(), chunknametarget, to_string(mode).c_str()) || lua_pcall(L, 0, LUA_MULTRET, 0)) {
+				lua_error(L);
+			}
+		}
+
+		inline void script_file(lua_State* L, const std::string& filename, load_mode mode = load_mode::any) {
+			if (luaL_loadfilex(L, filename.c_str(), to_string(mode).c_str()) || lua_pcall(L, 0, LUA_MULTRET, 0)) {
+				lua_error(L);
+			}
+		}
+
+		inline void luajit_exception_handler(lua_State* L, int (*handler)(lua_State*, lua_CFunction) = detail::c_trampoline) {
+#if SOL_IS_ON(SOL_USE_LUAJIT_EXCEPTION_TRAMPOLINE_I_)
+			if (L == nullptr) {
+				return;
+			}
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushlightuserdata(L, (void*)handler);
+			auto pn = pop_n(L, 1);
+			luaJIT_setmode(L, -1, LUAJIT_MODE_WRAPCFUNC | LUAJIT_MODE_ON);
+#else
+			(void)L;
+			(void)handler;
+#endif
+		}
+
+		inline void luajit_exception_off(lua_State* L) {
+#if SOL_IS_ON(SOL_USE_LUAJIT_EXCEPTION_TRAMPOLINE_I_)
+			if (L == nullptr) {
+				return;
+			}
+			luaJIT_setmode(L, -1, LUAJIT_MODE_WRAPCFUNC | LUAJIT_MODE_OFF);
+#else
+			(void)L;
+#endif
+		}
+	} // namespace stack
+} // namespace sol
+
+#endif // SOL_STACK_HPP
diff --git a/extern/sol3/sol/stack/detail/pairs.hpp b/extern/sol3/sol/stack/detail/pairs.hpp
new file mode 100644
index 0000000000..e6e3670db1
--- /dev/null
+++ b/extern/sol3/sol/stack/detail/pairs.hpp
@@ -0,0 +1,98 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this Spermission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_DETAIL_PAIRS_HPP
+#define SOL_DETAIL_PAIRS_HPP
+
+#include <sol/version.hpp>
+
+#include <sol/stack.hpp>
+#include <sol/stack_reference.hpp>
+#include <sol/protected_function.hpp>
+#include <sol/assert.hpp>
+
+#include <optional>
+
+namespace sol { namespace stack { namespace stack_detail {
+
+	inline bool maybe_push_lua_next_function(lua_State* L_) {
+		stack::get_field<true, false>(L_, "next");
+		bool is_next = stack::check<protected_function>(L_);
+		if (is_next) {
+			return true;
+		}
+		stack::get_field<true, false>(L_, "table");
+		stack::record tracking{};
+		if (!stack::loose_table_check(L_, -1, &no_panic, tracking)) {
+			return false;
+		}
+		lua_getfield(L_, -1, "next");
+		bool is_table_next_func = stack::check<protected_function>(L_, -1);
+		if (is_table_next_func) {
+			return true;
+		}
+		lua_pop(L_, 1);
+		return false;
+	}
+
+	inline std::optional<protected_function> find_lua_next_function(lua_State* L_) {
+		if (maybe_push_lua_next_function(L_)) {
+			return stack::pop<protected_function>(L_);
+		}
+		return std::nullopt;
+	}
+
+	inline int c_lua_next(lua_State* L_) noexcept {
+		stack_reference table_stack_ref(L_, raw_index(1));
+		stateless_stack_reference key_stack_ref(L_, raw_index(2));
+		int result = lua_next(table_stack_ref.lua_state(), table_stack_ref.stack_index());
+		if (result == 0) {
+			stack::push(L_, lua_nil);
+			return 1;
+		}
+		return 2;
+	}
+
+	inline int readonly_pairs(lua_State* L_) noexcept {
+		int pushed = 0;
+		if (!maybe_push_lua_next_function(L_)) {
+			// we do not have the "next" function in the global namespace
+			// from the "table" global entiry, use our own
+			pushed += stack::push(L_, &c_lua_next);
+		}
+		else {
+			pushed += 1;
+		}
+		int metatable_exists = lua_getmetatable(L_, 1);
+		sol_c_assert(metatable_exists == 1);
+		const auto& index_key = to_string(sol::meta_function::index);
+		lua_getfield(L_, lua_gettop(L_), index_key.c_str());
+		lua_remove(L_, -2);
+		pushed += 1;
+		pushed += stack::push(L_, lua_nil);
+		return pushed;
+	}
+
+}}} // sol::stack::stack_detail
+
+#endif // SOL_DETAIL_PAIRS_HPP
diff --git a/extern/sol3/sol/stack_check.hpp b/extern/sol3/sol/stack_check.hpp
new file mode 100644
index 0000000000..b90d70e707
--- /dev/null
+++ b/extern/sol3/sol/stack_check.hpp
@@ -0,0 +1,30 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_STACK_CHECK_HPP
+#define SOL_STACK_CHECK_HPP
+
+#include <sol/stack_check_unqualified.hpp>
+#include <sol/stack_check_qualified.hpp>
+
+#endif // SOL_STACK_CHECK_HPP
diff --git a/extern/sol3/sol/stack_check_get.hpp b/extern/sol3/sol/stack_check_get.hpp
new file mode 100644
index 0000000000..9353c3c755
--- /dev/null
+++ b/extern/sol3/sol/stack_check_get.hpp
@@ -0,0 +1,30 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_STACK_CHECK_GET_HPP
+#define SOL_STACK_CHECK_GET_HPP
+
+#include <sol/stack_check_get_unqualified.hpp>
+#include <sol/stack_check_get_qualified.hpp>
+
+#endif // SOL_STACK_CHECK_GET_HPP
diff --git a/extern/sol3/sol/stack_check_get_qualified.hpp b/extern/sol3/sol/stack_check_get_qualified.hpp
new file mode 100644
index 0000000000..b5dfc387a8
--- /dev/null
+++ b/extern/sol3/sol/stack_check_get_qualified.hpp
@@ -0,0 +1,139 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_STACK_CHECK_QUALIFIED_GET_HPP
+#define SOL_STACK_CHECK_QUALIFIED_GET_HPP
+
+#include <sol/stack_core.hpp>
+#include <sol/stack_check_get_unqualified.hpp>
+#include <sol/optional.hpp>
+
+namespace sol { namespace stack {
+
+	namespace stack_detail {
+		template <typename OptionalType, typename T, typename Handler>
+		OptionalType get_optional(lua_State* L, int index, Handler&& handler, record& tracking) {
+			using Tu = meta::unqualified_t<T>;
+
+			if constexpr (is_lua_reference_v<T>) {
+				if constexpr (is_global_table_v<Tu>) {
+					(void)L;
+					(void)index;
+					(void)handler;
+					tracking.use(1);
+					return true;
+				}
+				else {
+					// actually check if it's none here, otherwise
+					// we'll have a none object inside an optional!
+					bool success = lua_isnoneornil(L, index) == 0 && stack::check<T>(L, index, &no_panic);
+					if (!success) {
+						// expected type, actual type
+						tracking.use(static_cast<int>(success));
+						handler(L, index, type::poly, type_of(L, index), "");
+						return {};
+					}
+					return OptionalType(stack_detail::unchecked_get<T>(L, index, tracking));
+				}
+			}
+			else if constexpr (!std::is_reference_v<T> && is_unique_usertype_v<Tu> && !is_actual_type_rebindable_for_v<Tu>) {
+				// we can take shortcuts here to save on separate checking, and just return nullopt!
+				using element = unique_usertype_element_t<Tu>;
+				using actual = unique_usertype_actual_t<Tu>;
+				tracking.use(1);
+				void* memory = lua_touserdata(L, index);
+				memory = detail::align_usertype_unique_destructor(memory);
+				detail::unique_destructor& pdx = *static_cast<detail::unique_destructor*>(memory);
+				if (&detail::usertype_unique_alloc_destroy<element, Tu> == pdx) {
+					memory = detail::align_usertype_unique_tag<true, false>(memory);
+					memory = detail::align_usertype_unique<actual, true, false>(memory);
+					actual* mem = static_cast<actual*>(memory);
+					return static_cast<actual>(*mem);
+				}
+				actual r {};
+				if constexpr (!derive<element>::value) {
+					return {};
+				}
+				else {
+					memory = detail::align_usertype_unique_tag<true, false>(memory);
+					detail::unique_tag& ic = *reinterpret_cast<detail::unique_tag*>(memory);
+					memory = detail::align_usertype_unique<actual, true, false>(memory);
+					string_view ti = usertype_traits<element>::qualified_name();
+					int cast_operation;
+					if constexpr (is_actual_type_rebindable_for_v<Tu>) {
+						using rebound_actual_type = unique_usertype_rebind_actual_t<Tu, void>;
+						string_view rebind_ti = usertype_traits<rebound_actual_type>::qualified_name();
+						cast_operation = ic(memory, &r, ti, rebind_ti);
+					}
+					else {
+						string_view rebind_ti("");
+						cast_operation = ic(memory, &r, ti, rebind_ti);
+					}
+					switch (cast_operation) {
+					case 1: {
+						// it's a perfect match,
+						// alias memory directly
+						actual* mem = static_cast<actual*>(memory);
+						return OptionalType(*mem);
+					}
+					case 2:
+						// it's a base match, return the
+						// aliased creation
+						return OptionalType(std::move(r));
+					default:
+						break;
+					}
+					return {};
+				}
+			}
+			else {
+				if (!check<T>(L, index, std::forward<Handler>(handler))) {
+					tracking.use(static_cast<int>(!lua_isnone(L, index)));
+					return {};
+				}
+				return OptionalType(stack_detail::unchecked_get<T>(L, index, tracking));
+			}
+		}
+	} // namespace stack_detail
+
+	template <typename T, typename>
+	struct qualified_check_getter {
+		typedef decltype(stack_detail::unchecked_get<T>(nullptr, -1, std::declval<record&>())) R;
+
+		template <typename Handler>
+		optional<R> get(lua_State* L, int index, Handler&& handler, record& tracking) {
+			return stack_detail::get_optional<optional<R>, T>(L, index, std::forward<Handler>(handler), tracking);
+		}
+	};
+
+	template <typename Optional>
+	struct qualified_getter<Optional, std::enable_if_t<meta::is_optional_v<Optional>>> {
+		static Optional get(lua_State* L, int index, record& tracking) {
+			using T = typename meta::unqualified_t<Optional>::value_type;
+			return stack_detail::get_optional<Optional, T>(L, index, &no_panic, tracking);
+		}
+	};
+
+}} // namespace sol::stack
+
+#endif // SOL_STACK_CHECK_QUALIFIED_GET_HPP
diff --git a/extern/sol3/sol/stack_check_get_unqualified.hpp b/extern/sol3/sol/stack_check_get_unqualified.hpp
new file mode 100644
index 0000000000..31bef9f4fb
--- /dev/null
+++ b/extern/sol3/sol/stack_check_get_unqualified.hpp
@@ -0,0 +1,186 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_STACK_CHECK_UNQUALIFIED_GET_HPP
+#define SOL_STACK_CHECK_UNQUALIFIED_GET_HPP
+
+#include <sol/stack_core.hpp>
+#include <sol/stack_get.hpp>
+#include <sol/stack_check.hpp>
+#include <sol/optional.hpp>
+
+#include <cstdlib>
+#include <cmath>
+#include <optional>
+#if SOL_IS_ON(SOL_STD_VARIANT_I_)
+#include <variant>
+#endif // variant shenanigans (thanks, Mac OSX)
+
+
+namespace sol { namespace stack {
+	template <typename T, typename>
+	struct unqualified_check_getter {
+		typedef decltype(stack_detail::unchecked_unqualified_get<T>(nullptr, -1, std::declval<record&>())) R;
+
+		template <typename Optional, typename Handler>
+		static Optional get_using(lua_State* L, int index, Handler&& handler, record& tracking) {
+			if constexpr (!meta::meta_detail::is_adl_sol_lua_check_v<T> && !meta::meta_detail::is_adl_sol_lua_get_v<T>) {
+				if constexpr (is_lua_reference_v<T>) {
+					if constexpr (is_global_table_v<T>) {
+						(void)L;
+						(void)index;
+						(void)handler;
+						tracking.use(1);
+						return true;
+					}
+					else {
+						// actually check if it's none here, otherwise
+						// we'll have a none object inside an optional!
+						bool success = lua_isnoneornil(L, index) == 0 && stack::check<T>(L, index, &no_panic);
+						if (!success) {
+							// expected type, actual type
+							tracking.use(static_cast<int>(success));
+							handler(L, index, type::poly, type_of(L, index), "");
+							return detail::associated_nullopt_v<Optional>;
+						}
+						return stack_detail::unchecked_get<T>(L, index, tracking);
+					}
+				}
+				else if constexpr ((std::is_integral_v<T> || std::is_same_v<T, lua_Integer>)&&!std::is_same_v<T, bool>) {
+#if SOL_LUA_VERSION_I_ >= 503
+					if (lua_isinteger(L, index) != 0) {
+						tracking.use(1);
+						return static_cast<T>(lua_tointeger(L, index));
+					}
+#endif
+					int isnum = 0;
+					const lua_Number value = lua_tonumberx(L, index, &isnum);
+					if (isnum != 0) {
+#if SOL_IS_ON(SOL_NUMBER_PRECISION_CHECKS_I_)
+						const auto integer_value = llround(value);
+						if (static_cast<lua_Number>(integer_value) == value) {
+							tracking.use(1);
+							return static_cast<T>(integer_value);
+						}
+#else
+						tracking.use(1);
+						return static_cast<T>(value);
+#endif
+					}
+					const type t = type_of(L, index);
+					tracking.use(static_cast<int>(t != type::none));
+					handler(L, index, type::number, t, "not an integer");
+					return detail::associated_nullopt_v<Optional>;
+				}
+				else if constexpr (std::is_floating_point_v<T> || std::is_same_v<T, lua_Number>) {
+					int isnum = 0;
+					lua_Number value = lua_tonumberx(L, index, &isnum);
+					if (isnum == 0) {
+						type t = type_of(L, index);
+						tracking.use(static_cast<int>(t != type::none));
+						handler(L, index, type::number, t, "not a valid floating point number");
+						return detail::associated_nullopt_v<Optional>;
+					}
+					tracking.use(1);
+					return static_cast<T>(value);
+				}
+				else if constexpr (std::is_enum_v<T> && !meta::any_same_v<T, meta_function, type>) {
+					int isnum = 0;
+					lua_Integer value = lua_tointegerx(L, index, &isnum);
+					if (isnum == 0) {
+						type t = type_of(L, index);
+						tracking.use(static_cast<int>(t != type::none));
+						handler(L, index, type::number, t, "not a valid enumeration value");
+						return detail::associated_nullopt_v<Optional>;
+					}
+					tracking.use(1);
+					return static_cast<T>(value);
+				}
+				else {
+					if (!unqualified_check<T>(L, index, std::forward<Handler>(handler))) {
+						tracking.use(static_cast<int>(!lua_isnone(L, index)));
+						return detail::associated_nullopt_v<Optional>;
+					}
+					return stack_detail::unchecked_unqualified_get<T>(L, index, tracking);
+				}
+			}
+			else {
+				if (!unqualified_check<T>(L, index, std::forward<Handler>(handler))) {
+					tracking.use(static_cast<int>(!lua_isnone(L, index)));
+					return detail::associated_nullopt_v<Optional>;
+				}
+				return stack_detail::unchecked_unqualified_get<T>(L, index, tracking);
+			}
+		}
+
+		template <typename Handler>
+		static optional<R> get(lua_State* L, int index, Handler&& handler, record& tracking) {
+			return get_using<optional<R>>(L, index, std::forward<Handler>(handler), tracking);
+		}
+	};
+
+#if SOL_IS_ON(SOL_STD_VARIANT_I_)
+	template <typename... Tn, typename C>
+	struct unqualified_check_getter<std::variant<Tn...>, C> {
+		typedef std::variant<Tn...> V;
+		typedef std::variant_size<V> V_size;
+		typedef std::integral_constant<bool, V_size::value == 0> V_is_empty;
+
+		template <typename Handler>
+		static optional<V> get_empty(std::true_type, lua_State*, int, Handler&&, record&) {
+			return nullopt;
+		}
+
+		template <typename Handler>
+		static optional<V> get_empty(std::false_type, lua_State* L, int index, Handler&& handler, record&) {
+			// This should never be reached...
+			// please check your code and understand what you did to bring yourself here
+			// maybe file a bug report, or 5
+			handler(
+				L, index, type::poly, type_of(L, index), "this variant code should never be reached: if it has, you have done something so terribly wrong");
+			return nullopt;
+		}
+
+		template <typename Handler>
+		static optional<V> get_one(std::integral_constant<std::size_t, 0>, lua_State* L, int index, Handler&& handler, record& tracking) {
+			return get_empty(V_is_empty(), L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <std::size_t I, typename Handler>
+		static optional<V> get_one(std::integral_constant<std::size_t, I>, lua_State* L, int index, Handler&& handler, record& tracking) {
+			typedef std::variant_alternative_t<I - 1, V> T;
+			if (stack::check<T>(L, index, &no_panic, tracking)) {
+				return V(std::in_place_index<I - 1>, stack::get<T>(L, index));
+			}
+			return get_one(std::integral_constant<std::size_t, I - 1>(), L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename Handler>
+		static optional<V> get(lua_State* L, int index, Handler&& handler, record& tracking) {
+			return get_one(std::integral_constant<std::size_t, V_size::value>(), L, index, std::forward<Handler>(handler), tracking);
+		}
+	};
+#endif // standard variant
+}}     // namespace sol::stack
+
+#endif // SOL_STACK_CHECK_UNQUALIFIED_GET_HPP
diff --git a/extern/sol3/sol/stack_check_qualified.hpp b/extern/sol3/sol/stack_check_qualified.hpp
new file mode 100644
index 0000000000..5712a168dd
--- /dev/null
+++ b/extern/sol3/sol/stack_check_qualified.hpp
@@ -0,0 +1,89 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_STACK_CHECK_QUALIFIED_HPP
+#define SOL_STACK_CHECK_QUALIFIED_HPP
+
+#include <sol/stack_check_unqualified.hpp>
+
+namespace sol { namespace stack {
+
+	template <typename X, type expected, typename>
+	struct qualified_checker {
+		template <typename Handler>
+		static bool check(lua_State* L, int index, Handler&& handler, record& tracking) {
+			using no_cv_X = meta::unqualified_t<X>;
+			if constexpr (!std::is_reference_v<X> && is_unique_usertype_v<no_cv_X>) {
+				using element = unique_usertype_element_t<no_cv_X>;
+				if constexpr (is_actual_type_rebindable_for_v<no_cv_X>) {
+					using rebound_actual_type = unique_usertype_rebind_actual_t<no_cv_X>;
+					// we have a unique pointer type that can be
+					// rebound to a base/derived type
+					const type indextype = type_of(L, index);
+					tracking.use(1);
+					if (indextype != type::userdata) {
+						handler(L, index, type::userdata, indextype, "value is not a userdata");
+						return false;
+					}
+					void* memory = lua_touserdata(L, index);
+					memory = detail::align_usertype_unique_destructor(memory);
+					detail::unique_destructor& pdx = *static_cast<detail::unique_destructor*>(memory);
+					if (&detail::usertype_unique_alloc_destroy<element, no_cv_X> == pdx) {
+						return true;
+					}
+					if constexpr (derive<element>::value) {
+						memory = detail::align_usertype_unique_tag<true, false>(memory);
+						detail::unique_tag& ic = *reinterpret_cast<detail::unique_tag*>(memory);
+						string_view ti = usertype_traits<element>::qualified_name();
+						string_view rebind_ti = usertype_traits<rebound_actual_type>::qualified_name();
+						if (ic(nullptr, nullptr, ti, rebind_ti) != 0) {
+							return true;
+						}
+					}
+					handler(L, index, type::userdata, indextype, "value is a userdata but is not the correct unique usertype");
+					return false;
+				}
+				else {
+					return stack::unqualified_check<X>(L, index, std::forward<Handler>(handler), tracking);
+				}
+			}
+			else if constexpr (!std::is_reference_v<X> && is_container_v<no_cv_X>) {
+				if (type_of(L, index) == type::userdata) {
+					return stack::unqualified_check<X>(L, index, std::forward<Handler>(handler), tracking);
+				}
+				else {
+					return stack::unqualified_check<nested<X>>(L, index, std::forward<Handler>(handler), tracking);
+				}
+			}
+			else if constexpr (!std::is_reference_v<X> && meta::is_specialization_of_v<X, nested>) {
+				using NestedX = typename meta::unqualified_t<X>::nested_type;
+				return stack::check<NestedX>(L, index, ::std::forward<Handler>(handler), tracking);
+			}
+			else {
+				return stack::unqualified_check<X>(L, index, std::forward<Handler>(handler), tracking);
+			}
+		}
+	};
+}} // namespace sol::stack
+
+#endif // SOL_STACK_CHECK_HPP
diff --git a/extern/sol3/sol/stack_check_unqualified.hpp b/extern/sol3/sol/stack_check_unqualified.hpp
new file mode 100644
index 0000000000..cd132e0c29
--- /dev/null
+++ b/extern/sol3/sol/stack_check_unqualified.hpp
@@ -0,0 +1,639 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_STACK_CHECK_UNQUALIFIED_HPP
+#define SOL_STACK_CHECK_UNQUALIFIED_HPP
+
+#include <sol/stack_core.hpp>
+#include <sol/usertype_traits.hpp>
+#include <sol/inheritance.hpp>
+#include <memory>
+#include <functional>
+#include <utility>
+#include <cmath>
+#include <optional>
+#if SOL_IS_ON(SOL_STD_VARIANT_I_)
+#include <variant>
+#endif // variant shenanigans
+
+namespace sol { namespace stack {
+	template <typename Handler>
+	bool loose_table_check(lua_State* L_, int index, Handler&& handler, record& tracking) {
+		tracking.use(1);
+		type t = type_of(L_, index);
+		if (t == type::table) {
+			return true;
+		}
+		if (t != type::userdata) {
+			handler(L_, index, type::table, t, "value is not a table or a userdata that can behave like one");
+			return false;
+		}
+		return true;
+	}
+
+	namespace stack_detail {
+		inline bool impl_check_metatable(lua_State* L_, int index, const std::string& metakey, bool poptable) {
+			luaL_getmetatable(L_, &metakey[0]);
+			const type expectedmetatabletype = static_cast<type>(lua_type(L_, -1));
+			if (expectedmetatabletype != type::lua_nil) {
+				if (lua_rawequal(L_, -1, index) == 1) {
+					lua_pop(L_, 1 + static_cast<int>(poptable));
+					return true;
+				}
+			}
+			lua_pop(L_, 1);
+			return false;
+		}
+
+		template <typename T, bool poptable = true>
+		inline bool check_metatable(lua_State* L_, int index = -2) {
+			return impl_check_metatable(L_, index, usertype_traits<T>::metatable(), poptable);
+		}
+
+		template <type expected, int (*check_func)(lua_State*, int)>
+		struct basic_check {
+			template <typename Handler>
+			static bool check(lua_State* L_, int index, Handler&& handler, record& tracking) {
+				tracking.use(1);
+				bool success = check_func(L_, index) == 1;
+				if (!success) {
+					// expected type, actual type
+					handler(L_, index, expected, type_of(L_, index), "");
+				}
+				return success;
+			}
+		};
+	} // namespace stack_detail
+
+	template <typename T, typename>
+	struct unqualified_interop_checker {
+		template <typename Handler>
+		static bool check(lua_State*, int, type, Handler&&, record&) {
+			return false;
+		}
+	};
+
+	template <typename T, typename>
+	struct qualified_interop_checker {
+		template <typename Handler>
+		static bool check(lua_State* L_, int index, type index_type, Handler&& handler, record& tracking) {
+			return stack_detail::unqualified_interop_check<T>(L_, index, index_type, std::forward<Handler>(handler), tracking);
+		}
+	};
+
+	template <typename T, type expected, typename>
+	struct unqualified_checker {
+		template <typename Handler>
+		static bool check(lua_State* L_, int index, Handler&& handler, record& tracking) {
+			if constexpr (std::is_same_v<T, bool>) {
+				tracking.use(1);
+				bool success = lua_isboolean(L_, index) == 1;
+				if (!success) {
+					// expected type, actual type
+					handler(L_, index, expected, type_of(L_, index), "");
+				}
+				return success;
+			}
+			else if constexpr (meta::any_same_v<T,
+				                   char
+#if SOL_IS_ON(SOL_CHAR8_T_I_)
+				                   ,
+				                   char8_t
+#endif
+				                   ,
+				                   char16_t,
+				                   char32_t>) {
+				return stack::check<std::basic_string<T>>(L_, index, std::forward<Handler>(handler), tracking);
+			}
+			else if constexpr (std::is_integral_v<T> || std::is_same_v<T, lua_Integer>) {
+				tracking.use(1);
+#if SOL_LUA_VERSION_I_ >= 503
+				// Lua 5.3 and greater checks for numeric precision
+#if SOL_IS_ON(SOL_STRINGS_ARE_NUMBERS_I_)
+				// imprecise, sloppy conversions
+				int isnum = 0;
+				lua_tointegerx(L_, index, &isnum);
+				const bool success = isnum != 0;
+				if (!success) {
+					// expected type, actual type
+					handler(L_, index, type::number, type_of(L_, index), detail::not_a_number_or_number_string_integral);
+				}
+#elif SOL_IS_ON(SOL_NUMBER_PRECISION_CHECKS_I_)
+				// this check is precise, do not convert
+				if (lua_isinteger(L_, index) == 1) {
+					return true;
+				}
+				const bool success = false;
+				if (!success) {
+					// expected type, actual type
+					handler(L_, index, type::number, type_of(L_, index), detail::not_a_number_integral);
+				}
+#else
+				// Numerics are neither safe nor string-convertible
+				type t = type_of(L_, index);
+				const bool success = t == type::number;
+#endif
+				if (!success) {
+					// expected type, actual type
+					handler(L_, index, type::number, type_of(L_, index), detail::not_a_number);
+				}
+				return success;
+#else
+				// Lua 5.2 and below checks
+#if SOL_IS_OFF(SOL_STRINGS_ARE_NUMBERS_I_)
+				// must pre-check, because it will convert
+				type t = type_of(L_, index);
+				if (t != type::number) {
+					// expected type, actual type
+					handler(L_, index, type::number, t, detail::not_a_number);
+					return false;
+				}
+#endif // Do not allow strings to be numbers
+
+#if SOL_IS_ON(SOL_NUMBER_PRECISION_CHECKS_I_)
+				int isnum = 0;
+				const lua_Number v = lua_tonumberx(L_, index, &isnum);
+				const bool success = isnum != 0 && static_cast<lua_Number>(llround(v)) == v;
+#else
+				const bool success = true;
+#endif // Safe numerics and number precision checking
+				if (!success) {
+					// Use defines to provide a better error message!
+#if SOL_IS_ON(SOL_STRINGS_ARE_NUMBERS_I_)
+					handler(L_, index, type::number, type_of(L_, index), detail::not_a_number_or_number_string);
+#elif SOL_IS_ON(SOL_NUMBER_PRECISION_CHECKS_I_)
+					handler(L_, index, type::number, t, detail::not_a_number_or_number_string);
+#else
+					handler(L_, index, type::number, t, detail::not_a_number);
+#endif
+				}
+				return success;
+#endif
+			}
+			else if constexpr (std::is_floating_point_v<T> || std::is_same_v<T, lua_Number>) {
+				tracking.use(1);
+#if SOL_IS_ON(SOL_STRINGS_ARE_NUMBERS_I_)
+				bool success = lua_isnumber(L_, index) == 1;
+				if (!success) {
+					// expected type, actual type
+					handler(L_, index, type::number, type_of(L_, index), detail::not_a_number_or_number_string);
+				}
+				return success;
+#else
+				type t = type_of(L_, index);
+				bool success = t == type::number;
+				if (!success) {
+					// expected type, actual type
+					handler(L_, index, type::number, t, detail::not_a_number);
+				}
+				return success;
+#endif // Strings are Numbers
+			}
+			else if constexpr (meta::any_same_v<T, type, this_state, this_main_state, this_environment, variadic_args>) {
+				(void)L_;
+				(void)index;
+				(void)handler;
+				tracking.use(0);
+				return true;
+			}
+			else if constexpr (is_unique_usertype_v<T>) {
+				using element = unique_usertype_element_t<T>;
+				using actual = unique_usertype_actual_t<T>;
+				const type indextype = type_of(L_, index);
+				tracking.use(1);
+				if (indextype != type::userdata) {
+					handler(L_, index, type::userdata, indextype, "value is not a userdata");
+					return false;
+				}
+				if (lua_getmetatable(L_, index) == 0) {
+					return true;
+				}
+				int metatableindex = lua_gettop(L_);
+				if (stack_detail::check_metatable<d::u<element>>(L_, metatableindex)) {
+					void* memory = lua_touserdata(L_, index);
+					memory = detail::align_usertype_unique_destructor(memory);
+					detail::unique_destructor& pdx = *static_cast<detail::unique_destructor*>(memory);
+					bool success = &detail::usertype_unique_alloc_destroy<element, actual> == pdx;
+					if (!success) {
+						memory = detail::align_usertype_unique_tag<true>(memory);
+#if 0
+						// New version, one day
+#else
+						const char*& name_tag = *static_cast<const char**>(memory);
+						success = usertype_traits<T>::qualified_name() == name_tag;
+#endif
+						if (!success) {
+							handler(L_, index, type::userdata, indextype, "value is a userdata but is not the correct unique usertype");
+						}
+					}
+					return success;
+				}
+				lua_pop(L_, 1);
+				handler(L_, index, type::userdata, indextype, "unrecognized userdata (not pushed by sol?)");
+				return false;
+			}
+			else if constexpr (meta::any_same_v<T, lua_nil_t, std::nullopt_t, nullopt_t>) {
+				bool success = lua_isnil(L_, index);
+				if (success) {
+					tracking.use(1);
+					return success;
+				}
+				tracking.use(0);
+				success = lua_isnone(L_, index);
+				if (!success) {
+					// expected type, actual type
+					handler(L_, index, expected, type_of(L_, index), "");
+				}
+				return success;
+			}
+			else if constexpr (std::is_same_v<T, env_key_t>) {
+				tracking.use(1);
+				type t = type_of(L_, index);
+				if (t == type::table || t == type::none || t == type::lua_nil || t == type::userdata) {
+					return true;
+				}
+				handler(L_, index, type::table, t, "value cannot not have a valid environment");
+				return true;
+			}
+			else if constexpr (std::is_same_v<T, detail::non_lua_nil_t>) {
+				return !stack::unqualified_check<lua_nil_t>(L_, index, std::forward<Handler>(handler), tracking);
+			}
+			else if constexpr (meta::is_specialization_of_v<T, basic_lua_table>) {
+				tracking.use(1);
+				type t = type_of(L_, index);
+				if (t != type::table) {
+					handler(L_, index, type::table, t, "value is not a table");
+					return false;
+				}
+				return true;
+			}
+			else if constexpr (meta::is_specialization_of_v<T, basic_bytecode>) {
+				tracking.use(1);
+				type t = type_of(L_, index);
+				if (t != type::function) {
+					handler(L_, index, type::function, t, "value is not a function that can be dumped");
+					return false;
+				}
+				return true;
+			}
+			else if constexpr (meta::is_specialization_of_v<T, basic_environment>) {
+				tracking.use(1);
+				if (lua_getmetatable(L_, index) == 0) {
+					return true;
+				}
+				type t = type_of(L_, -1);
+				if (t == type::table || t == type::none || t == type::lua_nil) {
+					lua_pop(L_, 1);
+					return true;
+				}
+				if (t != type::userdata) {
+					lua_pop(L_, 1);
+					handler(L_, index, type::table, t, "value does not have a valid metatable");
+					return false;
+				}
+				return true;
+			}
+			else if constexpr (std::is_same_v<T, metatable_key_t>) {
+				tracking.use(1);
+				if (lua_getmetatable(L_, index) == 0) {
+					return true;
+				}
+				type t = type_of(L_, -1);
+				if (t == type::table || t == type::none || t == type::lua_nil) {
+					lua_pop(L_, 1);
+					return true;
+				}
+				if (t != type::userdata) {
+					lua_pop(L_, 1);
+					handler(L_, index, expected, t, "value does not have a valid metatable");
+					return false;
+				}
+				return true;
+			}
+			else if constexpr (std::is_same_v<T, luaL_Stream*> || std::is_same_v<T, luaL_Stream>) {
+				if (lua_getmetatable(L_, index) == 0) {
+					type t = type_of(L_, index);
+					handler(L_, index, expected, t, "value is not a valid luaL_Stream (has no metatable/is not a valid value)");
+					return false;
+				}
+				luaL_getmetatable(L_, LUA_FILEHANDLE);
+				if (type_of(L_, index) != type::table) {
+					type t = type_of(L_, index);
+					lua_pop(L_, 1);
+					handler(L_,
+						index,
+						expected,
+						t,
+						"value is not a valid luaL_Stream (there is no metatable for luaL_Stream -- did you forget to "
+						"my_lua_state.open_libraries(sol::lib::state) or equivalent?)");
+					return false;
+				}
+				int is_stream_table = lua_compare(L_, -1, -2, LUA_OPEQ);
+				lua_pop(L_, 2);
+				if (is_stream_table == 0) {
+					type t = type_of(L_, index);
+					handler(L_, index, expected, t, "value is not a valid luaL_Stream (incorrect metatable)");
+					return false;
+				}
+				return true;
+			}
+			else if constexpr (meta::is_optional_v<T>) {
+				using ValueType = typename T::value_type;
+				(void)handler;
+				type t = type_of(L_, index);
+				if (t == type::none) {
+					tracking.use(0);
+					return true;
+				}
+				if (t == type::lua_nil) {
+					tracking.use(1);
+					return true;
+				}
+				return stack::unqualified_check<ValueType>(L_, index, &no_panic, tracking);
+			}
+#if SOL_IS_ON(SOL_GET_FUNCTION_POINTER_UNSAFE_I_)
+			else if constexpr (std::is_function_v<T> || (std::is_pointer_v<T> && std::is_function_v<std::remove_pointer_t<T>>)) {
+				return stack_detail::check_function_pointer<std::remove_pointer_t<T>>(L_, index, std::forward<Handler>(handler), tracking);
+			}
+#endif
+			else if constexpr (expected == type::userdata) {
+				if constexpr (meta::any_same_v<T, userdata_value> || meta::is_specialization_of_v<T, basic_userdata>) {
+					tracking.use(1);
+					type t = type_of(L_, index);
+					bool success = t == type::userdata;
+					if (!success) {
+						// expected type, actual type
+						handler(L_, index, type::userdata, t, "");
+					}
+					return success;
+				}
+				else if constexpr (meta::is_specialization_of_v<T, user>) {
+					unqualified_checker<lightuserdata_value, type::userdata> c;
+					(void)c;
+					return c.check(L_, index, std::forward<Handler>(handler), tracking);
+				}
+				else {
+					if constexpr (std::is_pointer_v<T>) {
+						return check_usertype<T>(L_, index, std::forward<Handler>(handler), tracking);
+					}
+					else if constexpr (meta::is_specialization_of_v<T, std::reference_wrapper>) {
+						using T_internal = typename T::type;
+						return stack::check<T_internal>(L_, index, std::forward<Handler>(handler), tracking);
+					}
+					else {
+						return check_usertype<T>(L_, index, std::forward<Handler>(handler), tracking);
+					}
+				}
+			}
+			else if constexpr (expected == type::poly) {
+				tracking.use(1);
+				bool success = is_lua_reference_v<T> || !lua_isnone(L_, index);
+				if (!success) {
+					// expected type, actual type
+					handler(L_, index, type::poly, type_of(L_, index), "");
+				}
+				return success;
+			}
+			else if constexpr (expected == type::lightuserdata) {
+				tracking.use(1);
+				type t = type_of(L_, index);
+				bool success = t == type::userdata || t == type::lightuserdata;
+				if (!success) {
+					// expected type, actual type
+					handler(L_, index, type::lightuserdata, t, "");
+				}
+				return success;
+			}
+			else if constexpr (expected == type::function) {
+				if constexpr (meta::any_same_v<T, lua_CFunction, std::remove_pointer_t<lua_CFunction>, c_closure>) {
+					tracking.use(1);
+					bool success = lua_iscfunction(L_, index) == 1;
+					if (!success) {
+						// expected type, actual type
+						handler(L_, index, expected, type_of(L_, index), "");
+					}
+					return success;
+				}
+				else {
+					tracking.use(1);
+					type t = type_of(L_, index);
+					if (t == type::lua_nil || t == type::none || t == type::function) {
+						// allow for lua_nil to be returned
+						return true;
+					}
+					if (t != type::userdata && t != type::table) {
+						handler(L_, index, type::function, t, "must be a function or table or a userdata");
+						return false;
+					}
+					// Do advanced check for call-style userdata?
+					static const auto& callkey = to_string(meta_function::call);
+					if (lua_getmetatable(L_, index) == 0) {
+						// No metatable, no __call key possible
+						handler(L_, index, type::function, t, "value is not a function and does not have overriden metatable");
+						return false;
+					}
+					if (lua_isnoneornil(L_, -1)) {
+						lua_pop(L_, 1);
+						handler(L_, index, type::function, t, "value is not a function and does not have valid metatable");
+						return false;
+					}
+					lua_getfield(L_, -1, &callkey[0]);
+					if (lua_isnoneornil(L_, -1)) {
+						lua_pop(L_, 2);
+						handler(L_, index, type::function, t, "value's metatable does not have __call overridden in metatable, cannot call this type");
+						return false;
+					}
+					// has call, is definitely a function
+					lua_pop(L_, 2);
+					return true;
+				}
+			}
+			else if constexpr (expected == type::table) {
+				return stack::loose_table_check(L_, index, std::forward<Handler>(handler), tracking);
+			}
+			else {
+				tracking.use(1);
+				const type indextype = type_of(L_, index);
+				bool success = expected == indextype;
+				if (!success) {
+					// expected type, actual type, message
+					handler(L_, index, expected, indextype, "");
+				}
+				return success;
+			}
+		}
+	};
+
+	template <typename T>
+	struct unqualified_checker<non_null<T>, type::userdata> : unqualified_checker<T, lua_type_of_v<T>> { };
+
+	template <typename T>
+	struct unqualified_checker<detail::as_value_tag<T>, type::userdata> {
+		template <typename Handler>
+		static bool check(lua_State* L_, int index, Handler&& handler, record& tracking) {
+			const type indextype = type_of(L_, index);
+			return check(types<T>(), L_, index, indextype, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename U, typename Handler>
+		static bool check(types<U>, lua_State* L_, int index, type indextype, Handler&& handler, record& tracking) {
+			if constexpr (
+				std::is_same_v<T,
+				     lightuserdata_value> || std::is_same_v<T, userdata_value> || std::is_same_v<T, userdata> || std::is_same_v<T, lightuserdata>) {
+				tracking.use(1);
+				if (indextype != type::userdata) {
+					handler(L_, index, type::userdata, indextype, "value is not a valid userdata");
+					return false;
+				}
+				return true;
+			}
+			else {
+#if SOL_IS_ON(SOL_USE_INTEROP_I_)
+				if (stack_detail::interop_check<U>(L_, index, indextype, handler, tracking)) {
+					return true;
+				}
+#endif // interop extensibility
+				tracking.use(1);
+#if SOL_IS_ON(SOL_GET_FUNCTION_POINTER_UNSAFE_I_)
+				if (lua_iscfunction(L_, index) != 0) {
+					// a potential match...
+					return true;
+				}
+#endif
+				if (indextype != type::userdata) {
+					handler(L_, index, type::userdata, indextype, "value is not a valid userdata");
+					return false;
+				}
+				if (lua_getmetatable(L_, index) == 0) {
+					return true;
+				}
+				int metatableindex = lua_gettop(L_);
+				if (stack_detail::check_metatable<U>(L_, metatableindex))
+					return true;
+				if (stack_detail::check_metatable<U*>(L_, metatableindex))
+					return true;
+				if (stack_detail::check_metatable<d::u<U>>(L_, metatableindex))
+					return true;
+				if (stack_detail::check_metatable<as_container_t<U>>(L_, metatableindex))
+					return true;
+				bool success = false;
+				bool has_derived = derive<T>::value || weak_derive<T>::value;
+				if (has_derived) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+					luaL_checkstack(L_, 1, detail::not_enough_stack_space_string);
+#endif // make sure stack doesn't overflow
+					auto pn = stack::pop_n(L_, 1);
+					lua_pushstring(L_, &detail::base_class_check_key()[0]);
+					lua_rawget(L_, metatableindex);
+					if (type_of(L_, -1) != type::lua_nil) {
+						void* basecastdata = lua_touserdata(L_, -1);
+						detail::inheritance_check_function ic = reinterpret_cast<detail::inheritance_check_function>(basecastdata);
+						success = ic(usertype_traits<T>::qualified_name());
+					}
+				}
+				lua_pop(L_, 1);
+				if (!success) {
+					handler(L_, index, type::userdata, indextype, "value at this index does not properly reflect the desired type");
+					return false;
+				}
+				return true;
+			}
+		}
+	};
+
+	template <typename T>
+	struct unqualified_checker<detail::as_pointer_tag<T>, type::userdata> {
+		template <typename Handler>
+		static bool check(lua_State* L_, int index, type indextype, Handler&& handler, record& tracking) {
+			if (indextype == type::lua_nil) {
+				tracking.use(1);
+				return true;
+			}
+			return check_usertype<std::remove_pointer_t<T>>(L_, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename Handler>
+		static bool check(lua_State* L_, int index, Handler&& handler, record& tracking) {
+			const type indextype = type_of(L_, index);
+			return check(L_, index, indextype, std::forward<Handler>(handler), tracking);
+		}
+	};
+
+	template <typename... Args>
+	struct unqualified_checker<std::tuple<Args...>, type::poly> {
+		template <typename Handler>
+		static bool check(lua_State* L_, int index, Handler&& handler, record& tracking) {
+			return stack::multi_check<Args...>(L_, index, std::forward<Handler>(handler), tracking);
+		}
+	};
+
+	template <typename A, typename B>
+	struct unqualified_checker<std::pair<A, B>, type::poly> {
+		template <typename Handler>
+		static bool check(lua_State* L_, int index, Handler&& handler, record& tracking) {
+			return stack::multi_check<A, B>(L_, index, std::forward<Handler>(handler), tracking);
+		}
+	};
+
+#if SOL_IS_ON(SOL_STD_VARIANT_I_)
+
+	template <typename... Tn>
+	struct unqualified_checker<std::variant<Tn...>, type::poly> {
+		typedef std::variant<Tn...> V;
+		typedef std::variant_size<V> V_size;
+		typedef std::integral_constant<bool, V_size::value == 0> V_is_empty;
+
+		template <typename Handler>
+		static bool is_one(std::integral_constant<std::size_t, 0>, lua_State* L_, int index, Handler&& handler, record& tracking) {
+			if constexpr (V_is_empty::value) {
+				if (lua_isnone(L_, index)) {
+					return true;
+				}
+			}
+			tracking.use(1);
+			handler(L_, index, type::poly, type_of(L_, index), "value does not fit any type present in the variant");
+			return false;
+		}
+
+		template <std::size_t I, typename Handler>
+		static bool is_one(std::integral_constant<std::size_t, I>, lua_State* L_, int index, Handler&& handler, record& tracking) {
+			typedef std::variant_alternative_t<I - 1, V> T;
+			record temp_tracking = tracking;
+			if (stack::check<T>(L_, index, &no_panic, temp_tracking)) {
+				tracking = temp_tracking;
+				return true;
+			}
+			return is_one(std::integral_constant<std::size_t, I - 1>(), L_, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename Handler>
+		static bool check(lua_State* L_, int index, Handler&& handler, record& tracking) {
+			return is_one(std::integral_constant<std::size_t, V_size::value>(), L_, index, std::forward<Handler>(handler), tracking);
+		}
+	};
+
+#endif // variant shenanigans
+
+}} // namespace sol::stack
+
+#endif // SOL_STACK_CHECK_UNQUALIFIED_HPP
diff --git a/extern/sol3/sol/stack_core.hpp b/extern/sol3/sol/stack_core.hpp
new file mode 100644
index 0000000000..75a406f848
--- /dev/null
+++ b/extern/sol3/sol/stack_core.hpp
@@ -0,0 +1,1456 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_STACK_CORE_HPP
+#define SOL_STACK_CORE_HPP
+
+#include <sol/types.hpp>
+#include <sol/inheritance.hpp>
+#include <sol/error_handler.hpp>
+#include <sol/reference.hpp>
+#include <sol/stack_reference.hpp>
+#include <sol/tuple.hpp>
+#include <sol/traits.hpp>
+#include <sol/tie.hpp>
+#include <sol/stack_guard.hpp>
+#include <sol/demangle.hpp>
+#include <sol/forward_detail.hpp>
+
+#include <vector>
+#include <bitset>
+#include <forward_list>
+#include <string>
+#include <limits>
+#include <algorithm>
+#include <sstream>
+#include <optional>
+#include <type_traits>
+
+namespace sol {
+	namespace detail {
+		struct with_function_tag { };
+		struct as_reference_tag { };
+		template <typename T>
+		struct as_pointer_tag { };
+		template <typename T>
+		struct as_value_tag { };
+		template <typename T>
+		struct as_unique_tag { };
+		template <typename T>
+		struct as_table_tag { };
+
+		template <typename Tag>
+		inline constexpr bool is_tagged_v
+		     = meta::is_specialization_of_v<Tag,
+		            detail::
+		                 as_pointer_tag> || meta::is_specialization_of_v<Tag, as_value_tag> || meta::is_specialization_of_v<Tag, as_unique_tag> || meta::is_specialization_of_v<Tag, as_table_tag> || std::is_same_v<Tag, as_reference_tag> || std::is_same_v<Tag, with_function_tag>;
+
+		using lua_reg_table = luaL_Reg[64];
+
+		using unique_destructor = void (*)(void*);
+		using unique_tag = detail::inheritance_unique_cast_function;
+
+		inline void* alloc_newuserdata(lua_State* L, std::size_t bytesize) {
+#if SOL_LUA_VERSION_I_ >= 504
+			return lua_newuserdatauv(L, bytesize, 1);
+#else
+			return lua_newuserdata(L, bytesize);
+#endif
+		}
+
+		constexpr std::uintptr_t align(std::size_t alignment, std::uintptr_t ptr, std::size_t& space) {
+			// this handles arbitrary alignments...
+			// make this into a power-of-2-only?
+			// actually can't: this is a C++14-compatible framework,
+			// power of 2 alignment is C++17
+			std::uintptr_t offby = static_cast<std::uintptr_t>(ptr % alignment);
+			std::uintptr_t padding = (alignment - offby) % alignment;
+			ptr += padding;
+			space -= padding;
+			return ptr;
+		}
+
+		inline void* align(std::size_t alignment, void* ptr, std::size_t& space) {
+			return reinterpret_cast<void*>(align(alignment, reinterpret_cast<std::uintptr_t>(ptr), space));
+		}
+
+		constexpr std::uintptr_t align_one(std::size_t alignment, std::size_t size, std::uintptr_t ptr) {
+			std::size_t space = (std::numeric_limits<std::size_t>::max)();
+			return align(alignment, ptr, space) + size;
+		}
+
+		template <typename... Args>
+		constexpr std::size_t aligned_space_for(std::uintptr_t ptr) {
+			std::uintptr_t end = ptr;
+			((end = align_one(alignof(Args), sizeof(Args), end)), ...);
+			return static_cast<std::size_t>(end - ptr);
+		}
+
+		template <typename... Args>
+		constexpr std::size_t aligned_space_for() {
+			static_assert(sizeof...(Args) > 0);
+
+			constexpr std::size_t max_arg_alignment = (std::max)({ alignof(Args)... });
+			if constexpr (max_arg_alignment <= alignof(std::max_align_t)) {
+				// If all types are `good enough`, simply calculate alignment in case of the worst allocator
+				std::size_t worst_required_size = 0;
+				for (std::size_t ptr = 0; ptr < max_arg_alignment; ptr++) {
+					worst_required_size = (std::max)(worst_required_size, aligned_space_for<Args...>(ptr));
+				}
+				return worst_required_size;
+			}
+			else {
+				// For over-aligned types let's assume that every Arg in Args starts at the worst aligned address
+				return (aligned_space_for<Args>(0x1) + ...);
+			}
+		}
+
+		inline void* align_usertype_pointer(void* ptr) {
+			using use_align = std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY_I_)
+			     false
+#else
+			     (std::alignment_of<void*>::value > 1)
+#endif
+			     >;
+			if (!use_align::value) {
+				return ptr;
+			}
+			std::size_t space = (std::numeric_limits<std::size_t>::max)();
+			return align(std::alignment_of<void*>::value, ptr, space);
+		}
+
+		template <bool pre_aligned = false, bool pre_shifted = false>
+		void* align_usertype_unique_destructor(void* ptr) {
+			using use_align = std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY_I_)
+			     false
+#else
+			     (std::alignment_of<unique_destructor>::value > 1)
+#endif
+			     >;
+			if (!pre_aligned) {
+				ptr = align_usertype_pointer(ptr);
+			}
+			if (!pre_shifted) {
+				ptr = static_cast<void*>(static_cast<char*>(ptr) + sizeof(void*));
+			}
+			if (!use_align::value) {
+				return static_cast<void*>(static_cast<void**>(ptr) + 1);
+			}
+			std::size_t space = (std::numeric_limits<std::size_t>::max)();
+			return align(std::alignment_of<unique_destructor>::value, ptr, space);
+		}
+
+		template <bool pre_aligned = false, bool pre_shifted = false>
+		void* align_usertype_unique_tag(void* ptr) {
+			using use_align = std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY_I_)
+			     false
+#else
+			     (std::alignment_of<unique_tag>::value > 1)
+#endif
+			     >;
+			if (!pre_aligned) {
+				ptr = align_usertype_unique_destructor(ptr);
+			}
+			if (!pre_shifted) {
+				ptr = static_cast<void*>(static_cast<char*>(ptr) + sizeof(unique_destructor));
+			}
+			if (!use_align::value) {
+				return ptr;
+			}
+			std::size_t space = (std::numeric_limits<std::size_t>::max)();
+			return align(std::alignment_of<unique_tag>::value, ptr, space);
+		}
+
+		template <typename T, bool pre_aligned = false, bool pre_shifted = false>
+		void* align_usertype_unique(void* ptr) {
+			typedef std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY_I_)
+			     false
+#else
+			     (std::alignment_of_v<T> > 1)
+#endif
+			     >
+			     use_align;
+			if (!pre_aligned) {
+				ptr = align_usertype_unique_tag(ptr);
+			}
+			if (!pre_shifted) {
+				ptr = static_cast<void*>(static_cast<char*>(ptr) + sizeof(unique_tag));
+			}
+			if (!use_align::value) {
+				return ptr;
+			}
+			std::size_t space = (std::numeric_limits<std::size_t>::max)();
+			return align(std::alignment_of_v<T>, ptr, space);
+		}
+
+		template <typename T>
+		void* align_user(void* ptr) {
+			typedef std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY_I_)
+			     false
+#else
+			     (std::alignment_of_v<T> > 1)
+#endif
+			     >
+			     use_align;
+			if (!use_align::value) {
+				return ptr;
+			}
+			std::size_t space = (std::numeric_limits<std::size_t>::max)();
+			return align(std::alignment_of_v<T>, ptr, space);
+		}
+
+		template <typename T>
+		T** usertype_allocate_pointer(lua_State* L) {
+			typedef std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY_I_)
+			     false
+#else
+			     (std::alignment_of<T*>::value > 1)
+#endif
+			     >
+			     use_align;
+			if (!use_align::value) {
+				T** pointerpointer = static_cast<T**>(alloc_newuserdata(L, sizeof(T*)));
+				return pointerpointer;
+			}
+			constexpr std::size_t initial_size = aligned_space_for<T*>();
+
+			std::size_t allocated_size = initial_size;
+			void* unadjusted = alloc_newuserdata(L, initial_size);
+			void* adjusted = align(std::alignment_of<T*>::value, unadjusted, allocated_size);
+			if (adjusted == nullptr) {
+				// trash allocator can burn in hell
+				lua_pop(L, 1);
+				// luaL_error(L, "if you are the one that wrote this allocator you should feel bad for doing a
+				// worse job than malloc/realloc and should go read some books, yeah?");
+				luaL_error(L, "cannot properly align memory for '%s'", detail::demangle<T*>().data());
+			}
+			return static_cast<T**>(adjusted);
+		}
+
+		inline bool attempt_alloc(lua_State* L, std::size_t ptr_align, std::size_t ptr_size, std::size_t value_align,
+		     std::size_t allocated_size, void*& pointer_adjusted, void*& data_adjusted) {
+			void* adjusted = alloc_newuserdata(L, allocated_size);
+			pointer_adjusted = align(ptr_align, adjusted, allocated_size);
+			if (pointer_adjusted == nullptr) {
+				lua_pop(L, 1);
+				return false;
+			}
+			// subtract size of what we're going to allocate there
+			allocated_size -= ptr_size;
+			adjusted = static_cast<void*>(static_cast<char*>(pointer_adjusted) + ptr_size);
+			data_adjusted = align(value_align, adjusted, allocated_size);
+			if (data_adjusted == nullptr) {
+				lua_pop(L, 1);
+				return false;
+			}
+			return true;
+		}
+
+		inline bool attempt_alloc_unique(lua_State* L, std::size_t ptr_align, std::size_t ptr_size, std::size_t real_align,
+		     std::size_t allocated_size, void*& pointer_adjusted, void*& dx_adjusted, void*& id_adjusted, void*& data_adjusted) {
+			void* adjusted = alloc_newuserdata(L, allocated_size);
+			pointer_adjusted = align(ptr_align, adjusted, allocated_size);
+			if (pointer_adjusted == nullptr) {
+				lua_pop(L, 1);
+				return false;
+			}
+			allocated_size -= ptr_size;
+
+			adjusted = static_cast<void*>(static_cast<char*>(pointer_adjusted) + ptr_size);
+			dx_adjusted = align(std::alignment_of_v<unique_destructor>, adjusted, allocated_size);
+			if (dx_adjusted == nullptr) {
+				lua_pop(L, 1);
+				return false;
+			}
+			allocated_size -= sizeof(unique_destructor);
+
+			adjusted = static_cast<void*>(static_cast<char*>(dx_adjusted) + sizeof(unique_destructor));
+
+			id_adjusted = align(std::alignment_of_v<unique_tag>, adjusted, allocated_size);
+			if (id_adjusted == nullptr) {
+				lua_pop(L, 1);
+				return false;
+			}
+			allocated_size -= sizeof(unique_tag);
+
+			adjusted = static_cast<void*>(static_cast<char*>(id_adjusted) + sizeof(unique_tag));
+			data_adjusted = align(real_align, adjusted, allocated_size);
+			if (data_adjusted == nullptr) {
+				lua_pop(L, 1);
+				return false;
+			}
+			return true;
+		}
+
+		template <typename T>
+		T* usertype_allocate(lua_State* L) {
+			typedef std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY_I_)
+			     false
+#else
+			     (std::alignment_of<T*>::value > 1 || std::alignment_of_v<T> > 1)
+#endif
+			     >
+			     use_align;
+			if (!use_align::value) {
+				T** pointerpointer = static_cast<T**>(alloc_newuserdata(L, sizeof(T*) + sizeof(T)));
+				T*& pointerreference = *pointerpointer;
+				T* allocationtarget = reinterpret_cast<T*>(pointerpointer + 1);
+				pointerreference = allocationtarget;
+				return allocationtarget;
+			}
+
+			constexpr std::size_t initial_size = aligned_space_for<T*, T>();
+
+			void* pointer_adjusted;
+			void* data_adjusted;
+			bool result
+			     = attempt_alloc(L, std::alignment_of_v<T*>, sizeof(T*), std::alignment_of_v<T>, initial_size, pointer_adjusted, data_adjusted);
+			if (!result) {
+				if (pointer_adjusted == nullptr) {
+					luaL_error(L, "aligned allocation of userdata block (pointer section) for '%s' failed", detail::demangle<T>().c_str());
+				}
+				else {
+					luaL_error(L, "aligned allocation of userdata block (data section) for '%s' failed", detail::demangle<T>().c_str());
+				}
+				return nullptr;
+			}
+
+			T** pointerpointer = reinterpret_cast<T**>(pointer_adjusted);
+			T*& pointerreference = *pointerpointer;
+			T* allocationtarget = reinterpret_cast<T*>(data_adjusted);
+			pointerreference = allocationtarget;
+			return allocationtarget;
+		}
+
+		template <typename T, typename Real>
+		Real* usertype_unique_allocate(lua_State* L, T**& pref, unique_destructor*& dx, unique_tag*& id) {
+			typedef std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY_I_)
+			     false
+#else
+			     (std::alignment_of<T*>::value > 1 || std::alignment_of<unique_tag>::value > 1 || std::alignment_of<unique_destructor>::value > 1
+			          || std::alignment_of<Real>::value > 1)
+#endif
+			     >
+			     use_align;
+			if (!use_align::value) {
+				pref = static_cast<T**>(alloc_newuserdata(L, sizeof(T*) + sizeof(detail::unique_destructor) + sizeof(unique_tag) + sizeof(Real)));
+				dx = static_cast<detail::unique_destructor*>(static_cast<void*>(pref + 1));
+				id = static_cast<unique_tag*>(static_cast<void*>(dx + 1));
+				Real* mem = static_cast<Real*>(static_cast<void*>(id + 1));
+				return mem;
+			}
+
+			constexpr std::size_t initial_size = aligned_space_for<T*, unique_destructor, unique_tag, Real>();
+
+			void* pointer_adjusted;
+			void* dx_adjusted;
+			void* id_adjusted;
+			void* data_adjusted;
+			bool result = attempt_alloc_unique(L,
+			     std::alignment_of_v<T*>,
+			     sizeof(T*),
+			     std::alignment_of_v<Real>,
+			     initial_size,
+			     pointer_adjusted,
+			     dx_adjusted,
+			     id_adjusted,
+			     data_adjusted);
+			if (!result) {
+				if (pointer_adjusted == nullptr) {
+					luaL_error(L, "aligned allocation of userdata block (pointer section) for '%s' failed", detail::demangle<T>().c_str());
+				}
+				else if (dx_adjusted == nullptr) {
+					luaL_error(L, "aligned allocation of userdata block (deleter section) for '%s' failed", detail::demangle<T>().c_str());
+				}
+				else {
+					luaL_error(L, "aligned allocation of userdata block (data section) for '%s' failed", detail::demangle<T>().c_str());
+				}
+				return nullptr;
+			}
+
+			pref = static_cast<T**>(pointer_adjusted);
+			dx = static_cast<detail::unique_destructor*>(dx_adjusted);
+			id = static_cast<unique_tag*>(id_adjusted);
+			Real* mem = static_cast<Real*>(data_adjusted);
+			return mem;
+		}
+
+		template <typename T>
+		T* user_allocate(lua_State* L) {
+			typedef std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY_I_)
+			     false
+#else
+			     (std::alignment_of_v<T> > 1)
+#endif
+			     >
+			     use_align;
+			if (!use_align::value) {
+				T* pointer = static_cast<T*>(alloc_newuserdata(L, sizeof(T)));
+				return pointer;
+			}
+
+			constexpr std::size_t initial_size = aligned_space_for<T>();
+
+			std::size_t allocated_size = initial_size;
+			void* unadjusted = alloc_newuserdata(L, allocated_size);
+			void* adjusted = align(std::alignment_of_v<T>, unadjusted, allocated_size);
+			if (adjusted == nullptr) {
+				lua_pop(L, 1);
+				luaL_error(L, "cannot properly align memory for '%s'", detail::demangle<T>().data());
+			}
+			return static_cast<T*>(adjusted);
+		}
+
+		template <typename T>
+		int usertype_alloc_destroy(lua_State* L) noexcept {
+			void* memory = lua_touserdata(L, 1);
+			memory = align_usertype_pointer(memory);
+			T** pdata = static_cast<T**>(memory);
+			T* data = *pdata;
+			std::allocator<T> alloc {};
+			std::allocator_traits<std::allocator<T>>::destroy(alloc, data);
+			return 0;
+		}
+
+		template <typename T>
+		int unique_destroy(lua_State* L) noexcept {
+			void* memory = lua_touserdata(L, 1);
+			memory = align_usertype_unique_destructor(memory);
+			unique_destructor& dx = *static_cast<unique_destructor*>(memory);
+			memory = align_usertype_unique_tag<true>(memory);
+			(dx)(memory);
+			return 0;
+		}
+
+		template <typename T>
+		int user_alloc_destroy(lua_State* L) noexcept {
+			void* memory = lua_touserdata(L, 1);
+			void* aligned_memory = align_user<T>(memory);
+			T* typed_memory = static_cast<T*>(aligned_memory);
+			std::allocator<T> alloc;
+			std::allocator_traits<std::allocator<T>>::destroy(alloc, typed_memory);
+			return 0;
+		}
+
+		template <typename T, typename Real>
+		void usertype_unique_alloc_destroy(void* memory) {
+			void* aligned_memory = align_usertype_unique<Real, true>(memory);
+			Real* typed_memory = static_cast<Real*>(aligned_memory);
+			std::allocator<Real> alloc;
+			std::allocator_traits<std::allocator<Real>>::destroy(alloc, typed_memory);
+		}
+
+		template <typename T>
+		int cannot_destroy(lua_State* L) {
+			return luaL_error(L,
+			     "cannot call the destructor for '%s': it is either hidden (protected/private) or removed with '= "
+			     "delete' and thusly this type is being destroyed without properly destroying, invoking undefined "
+			     "behavior: please bind a usertype and specify a custom destructor to define the behavior properly",
+			     detail::demangle<T>().data());
+		}
+
+		template <typename T>
+		void reserve(T&, std::size_t) {
+		}
+
+		template <typename T, typename Al>
+		void reserve(std::vector<T, Al>& vec, std::size_t hint) {
+			vec.reserve(hint);
+		}
+
+		template <typename T, typename Tr, typename Al>
+		void reserve(std::basic_string<T, Tr, Al>& str, std::size_t hint) {
+			str.reserve(hint);
+		}
+
+		inline bool property_always_true(meta_function) {
+			return true;
+		}
+
+		struct properties_enrollment_allowed {
+			int& times_through;
+			std::bitset<64>& properties;
+			automagic_enrollments& enrollments;
+
+			properties_enrollment_allowed(int& times_through_, std::bitset<64>& properties_, automagic_enrollments& enrollments_)
+			: times_through(times_through_), properties(properties_), enrollments(enrollments_) {
+			}
+
+			bool operator()(meta_function mf) const {
+				bool p = properties[static_cast<std::size_t>(mf)];
+				if (times_through > 0) {
+					return p;
+				}
+				switch (mf) {
+				case meta_function::length:
+					return enrollments.length_operator && !p;
+				case meta_function::pairs:
+					return enrollments.pairs_operator && !p;
+				case meta_function::call:
+					return enrollments.call_operator && !p;
+				case meta_function::less_than:
+					return enrollments.less_than_operator && !p;
+				case meta_function::less_than_or_equal_to:
+					return enrollments.less_than_or_equal_to_operator && !p;
+				case meta_function::equal_to:
+					return enrollments.equal_to_operator && !p;
+				default:
+					break;
+				}
+				return !p;
+			}
+		};
+
+		struct indexed_insert {
+			lua_reg_table& registration_table;
+			int& index;
+
+			indexed_insert(lua_reg_table& registration_table_, int& index_ref_) : registration_table(registration_table_), index(index_ref_) {
+			}
+			void operator()(meta_function meta_function_name_, lua_CFunction c_function_) {
+				registration_table[index] = luaL_Reg { to_string(meta_function_name_).c_str(), c_function_ };
+				++index;
+			}
+		};
+	} // namespace detail
+
+	namespace stack {
+
+		template <typename T, bool global = false, bool raw = false, typename = void>
+		struct field_getter;
+		template <typename T, typename P, bool global = false, bool raw = false, typename = void>
+		struct probe_field_getter;
+
+		template <typename T, bool global = false, bool raw = false, typename = void>
+		struct field_setter;
+
+		template <typename T, typename = void>
+		struct unqualified_getter;
+		template <typename T, typename = void>
+		struct qualified_getter;
+
+		template <typename T, typename = void>
+		struct qualified_interop_getter;
+		template <typename T, typename = void>
+		struct unqualified_interop_getter;
+
+		template <typename T, typename = void>
+		struct popper;
+
+		template <typename T, typename = void>
+		struct unqualified_pusher;
+
+		template <typename T, type t, typename = void>
+		struct unqualified_checker;
+		template <typename T, type t, typename = void>
+		struct qualified_checker;
+
+		template <typename T, typename = void>
+		struct unqualified_check_getter;
+		template <typename T, typename = void>
+		struct qualified_check_getter;
+
+		struct probe {
+			bool success;
+			int levels;
+
+			probe(bool s, int l) : success(s), levels(l) {
+			}
+
+			operator bool() const {
+				return success;
+			};
+		};
+
+		struct record {
+			int last;
+			int used;
+
+			record() noexcept : last(), used() {
+			}
+			void use(int count) noexcept {
+				last = count;
+				used += count;
+			}
+		};
+
+		namespace stack_detail {
+			template <typename Function>
+			Function* get_function_pointer(lua_State*, int, record&) noexcept;
+			template <typename Function, typename Handler>
+			bool check_function_pointer(lua_State* L, int index, Handler&& handler, record& tracking) noexcept;
+		} // namespace stack_detail
+
+	} // namespace stack
+
+	namespace meta { namespace meta_detail {
+		template <typename T>
+		using adl_sol_lua_get_test_t = decltype(sol_lua_get(types<T>(), static_cast<lua_State*>(nullptr), -1, std::declval<stack::record&>()));
+
+		template <typename T>
+		using adl_sol_lua_interop_get_test_t
+			= decltype(sol_lua_interop_get(types<T>(), static_cast<lua_State*>(nullptr), -1, static_cast<void*>(nullptr), std::declval<stack::record&>()));
+
+		template <typename T>
+		using adl_sol_lua_check_test_t = decltype(sol_lua_check(types<T>(), static_cast<lua_State*>(nullptr), -1, &no_panic, std::declval<stack::record&>()));
+
+		template <typename T>
+		using adl_sol_lua_interop_check_test_t
+			= decltype(sol_lua_interop_check(types<T>(), static_cast<lua_State*>(nullptr), -1, type::none, &no_panic, std::declval<stack::record&>()));
+
+		template <typename T>
+		using adl_sol_lua_check_get_test_t
+			= decltype(sol_lua_check_get(types<T>(), static_cast<lua_State*>(nullptr), -1, &no_panic, std::declval<stack::record&>()));
+
+		template <typename... Args>
+		using adl_sol_lua_push_test_t = decltype(sol_lua_push(static_cast<lua_State*>(nullptr), std::declval<Args>()...));
+
+		template <typename T, typename... Args>
+		using adl_sol_lua_push_exact_test_t = decltype(sol_lua_push(types<T>(), static_cast<lua_State*>(nullptr), std::declval<Args>()...));
+
+		template <typename T>
+		inline constexpr bool is_adl_sol_lua_get_v = meta::is_detected_v<adl_sol_lua_get_test_t, T>;
+
+		template <typename T>
+		inline constexpr bool is_adl_sol_lua_interop_get_v = meta::is_detected_v<adl_sol_lua_interop_get_test_t, T>;
+
+		template <typename T>
+		inline constexpr bool is_adl_sol_lua_check_v = meta::is_detected_v<adl_sol_lua_check_test_t, T>;
+
+		template <typename T>
+		inline constexpr bool is_adl_sol_lua_interop_check_v = meta::is_detected_v<adl_sol_lua_interop_check_test_t, T>;
+
+		template <typename T>
+		inline constexpr bool is_adl_sol_lua_check_get_v = meta::is_detected_v<adl_sol_lua_check_get_test_t, T>;
+
+		template <typename... Args>
+		inline constexpr bool is_adl_sol_lua_push_v = meta::is_detected_v<adl_sol_lua_push_test_t, Args...>;
+
+		template <typename T, typename... Args>
+		inline constexpr bool is_adl_sol_lua_push_exact_v = meta::is_detected_v<adl_sol_lua_push_exact_test_t, T, Args...>;
+	}} // namespace meta::meta_detail
+
+
+	namespace stack {
+		namespace stack_detail {
+			constexpr const char* not_enough_stack_space = "not enough space left on Lua stack";
+			constexpr const char* not_enough_stack_space_floating = "not enough space left on Lua stack for a floating point number";
+			constexpr const char* not_enough_stack_space_integral = "not enough space left on Lua stack for an integral number";
+			constexpr const char* not_enough_stack_space_string = "not enough space left on Lua stack for a string";
+			constexpr const char* not_enough_stack_space_meta_function_name = "not enough space left on Lua stack for the name of a meta_function";
+			constexpr const char* not_enough_stack_space_userdata = "not enough space left on Lua stack to create a sol2 userdata";
+			constexpr const char* not_enough_stack_space_generic = "not enough space left on Lua stack to push valuees";
+			constexpr const char* not_enough_stack_space_environment = "not enough space left on Lua stack to retrieve environment";
+
+			template <typename T>
+			struct strip {
+				typedef T type;
+			};
+			template <typename T>
+			struct strip<std::reference_wrapper<T>> {
+				typedef T& type;
+			};
+			template <typename T>
+			struct strip<user<T>> {
+				typedef T& type;
+			};
+			template <typename T>
+			struct strip<non_null<T>> {
+				typedef T type;
+			};
+			template <typename T>
+			using strip_t = typename strip<T>::type;
+
+			template <typename C>
+			static int get_size_hint(C& c) {
+				return static_cast<int>(c.size());
+			}
+
+			template <typename V, typename Al>
+			static int get_size_hint(const std::forward_list<V, Al>&) {
+				// forward_list makes me sad
+				return static_cast<int>(32);
+			}
+
+			template <typename T>
+			decltype(auto) unchecked_unqualified_get(lua_State* L, int index, record& tracking) {
+				using Tu = meta::unqualified_t<T>;
+				if constexpr (meta::meta_detail::is_adl_sol_lua_get_v<Tu>) {
+					return sol_lua_get(types<Tu>(), L, index, tracking);
+				}
+				else {
+					unqualified_getter<Tu> g {};
+					(void)g;
+					return g.get(L, index, tracking);
+				}
+			}
+
+			template <typename T>
+			decltype(auto) unchecked_get(lua_State* L, int index, record& tracking) {
+				if constexpr (meta::meta_detail::is_adl_sol_lua_get_v<T>) {
+					return sol_lua_get(types<T>(), L, index, tracking);
+				}
+				else {
+					qualified_getter<T> g {};
+					(void)g;
+					return g.get(L, index, tracking);
+				}
+			}
+
+			template <typename T>
+			decltype(auto) unqualified_interop_get(lua_State* L, int index, void* unadjusted_pointer, record& tracking) {
+				using Tu = meta::unqualified_t<T>;
+				if constexpr (meta::meta_detail::is_adl_sol_lua_interop_get_v<Tu>) {
+					return sol_lua_interop_get(types<Tu>(), L, index, unadjusted_pointer, tracking);
+				}
+				else {
+					(void)L;
+					(void)index;
+					(void)unadjusted_pointer;
+					(void)tracking;
+					using Ti = stack_detail::strip_t<Tu>;
+					return std::pair<bool, Ti*> { false, nullptr };
+				}
+			}
+
+			template <typename T>
+			decltype(auto) interop_get(lua_State* L, int index, void* unadjusted_pointer, record& tracking) {
+				if constexpr (meta::meta_detail::is_adl_sol_lua_interop_get_v<T>) {
+					return sol_lua_interop_get(types<T>(), L, index, unadjusted_pointer, tracking);
+				}
+				else {
+					return unqualified_interop_get<T>(L, index, unadjusted_pointer, tracking);
+				}
+			}
+
+			template <typename T, typename Handler>
+			bool unqualified_interop_check(lua_State* L, int index, type index_type, Handler&& handler, record& tracking) {
+				using Tu = meta::unqualified_t<T>;
+				if constexpr (meta::meta_detail::is_adl_sol_lua_interop_check_v<Tu>) {
+					return sol_lua_interop_check(types<Tu>(), L, index, index_type, std::forward<Handler>(handler), tracking);
+				}
+				else {
+					(void)L;
+					(void)index;
+					(void)index_type;
+					(void)handler;
+					(void)tracking;
+					return false;
+				}
+			}
+
+			template <typename T, typename Handler>
+			bool interop_check(lua_State* L, int index, type index_type, Handler&& handler, record& tracking) {
+				if constexpr (meta::meta_detail::is_adl_sol_lua_interop_check_v<T>) {
+					return sol_lua_interop_check(types<T>(), L, index, index_type, std::forward<Handler>(handler), tracking);
+				}
+				else {
+					return unqualified_interop_check<T>(L, index, index_type, std::forward<Handler>(handler), tracking);
+				}
+			}
+
+			using undefined_method_func = void (*)(stack_reference);
+
+			struct undefined_metatable {
+				lua_State* L;
+				const char* key;
+				undefined_method_func on_new_table;
+
+				undefined_metatable(lua_State* l, const char* k, undefined_method_func umf) : L(l), key(k), on_new_table(umf) {
+				}
+
+				void operator()() const {
+					if (luaL_newmetatable(L, key) == 1) {
+						on_new_table(stack_reference(L, -1));
+					}
+					lua_setmetatable(L, -2);
+				}
+			};
+		} // namespace stack_detail
+
+		inline bool maybe_indexable(lua_State* L, int index = -1) {
+			type t = type_of(L, index);
+			return t == type::userdata || t == type::table;
+		}
+
+		inline int top(lua_State* L) {
+			return lua_gettop(L);
+		}
+
+		inline bool is_main_thread(lua_State* L) {
+			int ismainthread = lua_pushthread(L);
+			lua_pop(L, 1);
+			return ismainthread == 1;
+		}
+
+		inline void coroutine_create_guard(lua_State* L) {
+			if (is_main_thread(L)) {
+				return;
+			}
+			int stacksize = lua_gettop(L);
+			if (stacksize < 1) {
+				return;
+			}
+			if (type_of(L, 1) != type::function) {
+				return;
+			}
+			// well now we're screwed...
+			// we can clean the stack and pray it doesn't destroy anything?
+			lua_pop(L, stacksize);
+		}
+
+		inline void clear(lua_State* L, int table_index) {
+			lua_pushnil(L);
+			while (lua_next(L, table_index) != 0) {
+				// remove value
+				lua_pop(L, 1);
+				// duplicate key to protect form rawset
+				lua_pushvalue(L, -1);
+				// push new value
+				lua_pushnil(L);
+				// table_index%[key] = nil
+				lua_rawset(L, table_index);
+			}
+		}
+
+		inline void clear(reference& r) {
+			auto pp = push_pop<false>(r);
+			int stack_index = pp.index_of(r);
+			clear(r.lua_state(), stack_index);
+		}
+
+		inline void clear(stack_reference& r) {
+			clear(r.lua_state(), r.stack_index());
+		}
+
+		inline void clear(lua_State* L_, stateless_reference& r) {
+			r.push(L_);
+			int stack_index = absolute_index(L_, -1);
+			clear(L_, stack_index);
+			r.pop(L_);
+		}
+
+		inline void clear(lua_State* L_, stateless_stack_reference& r) {
+			clear(L_, r.stack_index());
+		}
+
+		template <typename T, typename... Args>
+		int push(lua_State* L, T&& t, Args&&... args) {
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (meta::meta_detail::is_adl_sol_lua_push_exact_v<T, T, Args...>) {
+				return sol_lua_push(types<T>(), L, std::forward<T>(t), std::forward<Args>(args)...);
+			}
+			else if constexpr (meta::meta_detail::is_adl_sol_lua_push_exact_v<Tu, T, Args...>) {
+				return sol_lua_push(types<Tu>(), L, std::forward<T>(t), std::forward<Args>(args)...);
+			}
+			else if constexpr (meta::meta_detail::is_adl_sol_lua_push_v<T, Args...>) {
+				return sol_lua_push(L, std::forward<T>(t), std::forward<Args>(args)...);
+			}
+			else {
+				unqualified_pusher<Tu> p {};
+				(void)p;
+				return p.push(L, std::forward<T>(t), std::forward<Args>(args)...);
+			}
+		}
+
+		// overload allows to use a pusher of a specific type, but pass in any kind of args
+		template <typename T, typename Arg, typename... Args, typename = std::enable_if_t<!std::is_same<T, Arg>::value>>
+		int push(lua_State* L, Arg&& arg, Args&&... args) {
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (meta::meta_detail::is_adl_sol_lua_push_exact_v<T, Arg, Args...>) {
+				return sol_lua_push(types<T>(), L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+			}
+			else if constexpr (meta::meta_detail::is_adl_sol_lua_push_exact_v<Tu, Arg, Args...>) {
+				return sol_lua_push(types<Tu>(), L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+			}
+			else if constexpr (meta::meta_detail::is_adl_sol_lua_push_v<Arg, Args...> && !detail::is_tagged_v<Tu>) {
+				return sol_lua_push(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+			}
+			else {
+				unqualified_pusher<Tu> p {};
+				(void)p;
+				return p.push(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+			}
+		}
+
+		template <typename T, typename... Args>
+		int push_userdata(lua_State* L, T&& t, Args&&... args) {
+			using U = meta::unqualified_t<T>;
+			using Tr = meta::conditional_t<std::is_pointer_v<U>,
+			     detail::as_pointer_tag<std::remove_pointer_t<U>>,
+			     meta::conditional_t<is_unique_usertype_v<U>, detail::as_unique_tag<U>, detail::as_value_tag<U>>>;
+			return stack::push<Tr>(L, std::forward<T>(t), std::forward<Args>(args)...);
+		}
+
+		template <typename T, typename Arg, typename... Args>
+		int push_userdata(lua_State* L, Arg&& arg, Args&&... args) {
+			using U = meta::unqualified_t<T>;
+			using Tr = meta::conditional_t<std::is_pointer_v<U>,
+			     detail::as_pointer_tag<std::remove_pointer_t<U>>,
+			     meta::conditional_t<is_unique_usertype_v<U>, detail::as_unique_tag<U>, detail::as_value_tag<U>>>;
+			return stack::push<Tr>(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+		}
+
+		namespace stack_detail {
+
+			template <typename T, typename Arg, typename... Args>
+			int push_reference(lua_State* L, Arg&& arg, Args&&... args) {
+				// clang-format off
+				using use_reference_tag =
+				meta::all<
+					meta::neg<is_value_semantic_for_function<T>>
+#if SOL_IS_OFF(SOL_FUNCTION_CALL_VALUE_SEMANTICS_I_)
+					, std::is_lvalue_reference<T>,
+					meta::neg<std::is_const<std::remove_reference_t<T>>>,
+					meta::neg<is_lua_primitive<meta::unqualified_t<T>>>,
+					meta::neg<is_unique_usertype<meta::unqualified_t<T>>>
+#endif
+				>;
+				// clang-format on
+				using Tr = meta::conditional_t<use_reference_tag::value, detail::as_reference_tag, meta::unqualified_t<T>>;
+				return stack::push<Tr>(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+			}
+
+		} // namespace stack_detail
+
+		template <typename T, typename... Args>
+		int push_reference(lua_State* L, T&& t, Args&&... args) {
+			return stack_detail::push_reference<T>(L, std::forward<T>(t), std::forward<Args>(args)...);
+		}
+
+		template <typename T, typename Arg, typename... Args>
+		int push_reference(lua_State* L, Arg&& arg, Args&&... args) {
+			return stack_detail::push_reference<T>(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+		}
+
+		inline int multi_push(lua_State*) {
+			// do nothing
+			return 0;
+		}
+
+		template <typename T, typename... Args>
+		int multi_push(lua_State* L, T&& t, Args&&... args) {
+			int pushcount = push(L, std::forward<T>(t));
+			void(detail::swallow { (pushcount += stack::push(L, std::forward<Args>(args)), 0)... });
+			return pushcount;
+		}
+
+		inline int multi_push_reference(lua_State*) {
+			// do nothing
+			return 0;
+		}
+
+		template <typename T, typename... Args>
+		int multi_push_reference(lua_State* L, T&& t, Args&&... args) {
+			int pushcount = stack::push_reference(L, std::forward<T>(t));
+			void(detail::swallow { (pushcount += stack::push_reference(L, std::forward<Args>(args)), 0)... });
+			return pushcount;
+		}
+
+		template <typename T, typename Handler>
+		bool unqualified_check(lua_State* L, int index, Handler&& handler, record& tracking) {
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (meta::meta_detail::is_adl_sol_lua_check_v<Tu>) {
+				return sol_lua_check(types<Tu>(), L, index, std::forward<Handler>(handler), tracking);
+			}
+			else {
+				unqualified_checker<Tu, lua_type_of_v<Tu>> c;
+				// VC++ has a bad warning here: shut it up
+				(void)c;
+				return c.check(L, index, std::forward<Handler>(handler), tracking);
+			}
+		}
+
+		template <typename T, typename Handler>
+		bool unqualified_check(lua_State* L, int index, Handler&& handler) {
+			record tracking {};
+			return unqualified_check<T>(L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename T>
+		bool unqualified_check(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
+			auto handler = &no_panic;
+			return unqualified_check<T>(L, index, handler);
+		}
+
+		template <typename T, typename Handler>
+		bool check(lua_State* L, int index, Handler&& handler, record& tracking) {
+			if constexpr (meta::meta_detail::is_adl_sol_lua_check_v<T>) {
+				return sol_lua_check(types<T>(), L, index, std::forward<Handler>(handler), tracking);
+			}
+			else {
+				using Tu = meta::unqualified_t<T>;
+				qualified_checker<T, lua_type_of_v<Tu>> c;
+				// VC++ has a bad warning here: shut it up
+				(void)c;
+				return c.check(L, index, std::forward<Handler>(handler), tracking);
+			}
+		}
+
+		template <typename T, typename Handler>
+		bool check(lua_State* L, int index, Handler&& handler) {
+			record tracking {};
+			return check<T>(L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename T>
+		bool check(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
+			auto handler = &no_panic;
+			return check<T>(L, index, handler);
+		}
+
+		template <typename T, typename Handler>
+		bool check_usertype(lua_State* L, int index, type, Handler&& handler, record& tracking) {
+			using Tu = meta::unqualified_t<T>;
+			using detail_t = meta::conditional_t<std::is_pointer_v<T>, detail::as_pointer_tag<Tu>, detail::as_value_tag<Tu>>;
+			return check<detail_t>(L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename T, typename Handler>
+		bool check_usertype(lua_State* L, int index, Handler&& handler, record& tracking) {
+			using Tu = meta::unqualified_t<T>;
+			using detail_t = meta::conditional_t<std::is_pointer_v<T>, detail::as_pointer_tag<Tu>, detail::as_value_tag<Tu>>;
+			return check<detail_t>(L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename T, typename Handler>
+		bool check_usertype(lua_State* L, int index, Handler&& handler) {
+			record tracking {};
+			return check_usertype<T>(L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename T>
+		bool check_usertype(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
+			auto handler = &no_panic;
+			return check_usertype<T>(L, index, handler);
+		}
+
+		template <typename T, typename Handler>
+		decltype(auto) unqualified_check_get(lua_State* L, int index, Handler&& handler, record& tracking) {
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (meta::meta_detail::is_adl_sol_lua_check_get_v<T>) {
+				return sol_lua_check_get(types<T>(), L, index, std::forward<Handler>(handler), tracking);
+			}
+			else if constexpr (meta::meta_detail::is_adl_sol_lua_check_get_v<Tu>) {
+				return sol_lua_check_get(types<Tu>(), L, index, std::forward<Handler>(handler), tracking);
+			}
+			else {
+				unqualified_check_getter<Tu> cg {};
+				(void)cg;
+				return cg.get(L, index, std::forward<Handler>(handler), tracking);
+			}
+		}
+
+		template <typename T, typename Handler>
+		decltype(auto) unqualified_check_get(lua_State* L, int index, Handler&& handler) {
+			record tracking {};
+			return unqualified_check_get<T>(L, index, handler, tracking);
+		}
+
+		template <typename T>
+		decltype(auto) unqualified_check_get(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
+			auto handler = &no_panic;
+			return unqualified_check_get<T>(L, index, handler);
+		}
+
+		template <typename T, typename Handler>
+		decltype(auto) check_get(lua_State* L, int index, Handler&& handler, record& tracking) {
+			if constexpr (meta::meta_detail::is_adl_sol_lua_check_get_v<T>) {
+				return sol_lua_check_get(types<T>(), L, index, std::forward<Handler>(handler), tracking);
+			}
+			else {
+				qualified_check_getter<T> cg {};
+				(void)cg;
+				return cg.get(L, index, std::forward<Handler>(handler), tracking);
+			}
+		}
+
+		template <typename T, typename Handler>
+		decltype(auto) check_get(lua_State* L, int index, Handler&& handler) {
+			record tracking {};
+			return check_get<T>(L, index, handler, tracking);
+		}
+
+		template <typename T>
+		decltype(auto) check_get(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
+			auto handler = &no_panic;
+			return check_get<T>(L, index, handler);
+		}
+
+		namespace stack_detail {
+
+			template <typename Handler>
+			bool check_types(lua_State*, int, Handler&&, record&) {
+				return true;
+			}
+
+			template <typename T, typename... Args, typename Handler>
+			bool check_types(lua_State* L, int firstargument, Handler&& handler, record& tracking) {
+				if (!stack::check<T>(L, firstargument + tracking.used, handler, tracking))
+					return false;
+				return check_types<Args...>(L, firstargument, std::forward<Handler>(handler), tracking);
+			}
+
+			template <typename... Args, typename Handler>
+			bool check_types(types<Args...>, lua_State* L, int index, Handler&& handler, record& tracking) {
+				return check_types<Args...>(L, index, std::forward<Handler>(handler), tracking);
+			}
+
+		} // namespace stack_detail
+
+		template <typename... Args, typename Handler>
+		bool multi_check(lua_State* L, int index, Handler&& handler, record& tracking) {
+			return stack_detail::check_types<Args...>(L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename... Args, typename Handler>
+		bool multi_check(lua_State* L, int index, Handler&& handler) {
+			record tracking {};
+			return multi_check<Args...>(L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename... Args>
+		bool multi_check(lua_State* L, int index) {
+			return multi_check<Args...>(L, index);
+		}
+
+		template <typename T>
+		auto unqualified_get(lua_State* L, int index, record& tracking) -> decltype(stack_detail::unchecked_unqualified_get<T>(L, index, tracking)) {
+#if SOL_IS_ON(SOL_SAFE_GETTER_I_)
+			static constexpr bool is_op = meta::is_optional_v<T>;
+			if constexpr (is_op) {
+				return stack_detail::unchecked_unqualified_get<T>(L, index, tracking);
+			}
+			else {
+				if (is_lua_reference<T>::value) {
+					return stack_detail::unchecked_unqualified_get<T>(L, index, tracking);
+				}
+				auto op = unqualified_check_get<T>(L, index, type_panic_c_str, tracking);
+				return *std::move(op);
+			}
+#else
+			return stack_detail::unchecked_unqualified_get<T>(L, index, tracking);
+#endif
+		}
+
+		template <typename T>
+		decltype(auto) unqualified_get(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
+			record tracking {};
+			return unqualified_get<T>(L, index, tracking);
+		}
+
+		template <typename T>
+		auto get(lua_State* L, int index, record& tracking) -> decltype(stack_detail::unchecked_get<T>(L, index, tracking)) {
+#if SOL_IS_ON(SOL_SAFE_GETTER_I_)
+			static constexpr bool is_op = meta::is_optional_v<T>;
+			if constexpr (is_op) {
+				return stack_detail::unchecked_get<T>(L, index, tracking);
+			}
+			else {
+				if (is_lua_reference<T>::value) {
+					return stack_detail::unchecked_get<T>(L, index, tracking);
+				}
+				auto op = check_get<T>(L, index, type_panic_c_str, tracking);
+				return *std::move(op);
+			}
+#else
+			return stack_detail::unchecked_get<T>(L, index, tracking);
+#endif
+		}
+
+		template <typename T>
+		decltype(auto) get(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
+			record tracking {};
+			return get<T>(L, index, tracking);
+		}
+
+		template <typename T>
+		decltype(auto) get_usertype(lua_State* L, int index, record& tracking) {
+			using UT = meta::conditional_t<std::is_pointer<T>::value, detail::as_pointer_tag<std::remove_pointer_t<T>>, detail::as_value_tag<T>>;
+			return get<UT>(L, index, tracking);
+		}
+
+		template <typename T>
+		decltype(auto) get_usertype(lua_State* L, int index = -lua_size_v<meta::unqualified_t<T>>) {
+			record tracking {};
+			return get_usertype<T>(L, index, tracking);
+		}
+
+		template <typename T>
+		decltype(auto) pop(lua_State* L) {
+			return popper<T> {}.pop(L);
+		}
+
+		template <bool global = false, bool raw = false, typename Key>
+		void get_field(lua_State* L, Key&& key) {
+			field_getter<meta::unqualified_t<Key>, global, raw> {}.get(L, std::forward<Key>(key));
+		}
+
+		template <bool global = false, bool raw = false, typename Key>
+		void get_field(lua_State* L, Key&& key, int tableindex) {
+			field_getter<meta::unqualified_t<Key>, global, raw> {}.get(L, std::forward<Key>(key), tableindex);
+		}
+
+		template <bool global = false, typename Key>
+		void raw_get_field(lua_State* L, Key&& key) {
+			get_field<global, true>(L, std::forward<Key>(key));
+		}
+
+		template <bool global = false, typename Key>
+		void raw_get_field(lua_State* L, Key&& key, int tableindex) {
+			get_field<global, true>(L, std::forward<Key>(key), tableindex);
+		}
+
+		template <bool global = false, bool raw = false, typename C = detail::non_lua_nil_t, typename Key>
+		probe probe_get_field(lua_State* L, Key&& key) {
+			return probe_field_getter<meta::unqualified_t<Key>, C, global, raw> {}.get(L, std::forward<Key>(key));
+		}
+
+		template <bool global = false, bool raw = false, typename C = detail::non_lua_nil_t, typename Key>
+		probe probe_get_field(lua_State* L, Key&& key, int tableindex) {
+			return probe_field_getter<meta::unqualified_t<Key>, C, global, raw> {}.get(L, std::forward<Key>(key), tableindex);
+		}
+
+		template <bool global = false, typename C = detail::non_lua_nil_t, typename Key>
+		probe probe_raw_get_field(lua_State* L, Key&& key) {
+			return probe_get_field<global, true, C>(L, std::forward<Key>(key));
+		}
+
+		template <bool global = false, typename C = detail::non_lua_nil_t, typename Key>
+		probe probe_raw_get_field(lua_State* L, Key&& key, int tableindex) {
+			return probe_get_field<global, true, C>(L, std::forward<Key>(key), tableindex);
+		}
+
+		template <bool global = false, bool raw = false, typename Key, typename Value>
+		void set_field(lua_State* L, Key&& key, Value&& value) {
+			field_setter<meta::unqualified_t<Key>, global, raw> {}.set(L, std::forward<Key>(key), std::forward<Value>(value));
+		}
+
+		template <bool global = false, bool raw = false, typename Key, typename Value>
+		void set_field(lua_State* L, Key&& key, Value&& value, int tableindex) {
+			field_setter<meta::unqualified_t<Key>, global, raw> {}.set(L, std::forward<Key>(key), std::forward<Value>(value), tableindex);
+		}
+
+		template <bool global = false, typename Key, typename Value>
+		void raw_set_field(lua_State* L, Key&& key, Value&& value) {
+			set_field<global, true>(L, std::forward<Key>(key), std::forward<Value>(value));
+		}
+
+		template <bool global = false, typename Key, typename Value>
+		void raw_set_field(lua_State* L, Key&& key, Value&& value, int tableindex) {
+			set_field<global, true>(L, std::forward<Key>(key), std::forward<Value>(value), tableindex);
+		}
+
+		template <typename T, typename F>
+		void modify_unique_usertype_as(const stack_reference& obj, F&& f) {
+			void* raw = lua_touserdata(obj.lua_state(), obj.stack_index());
+			void* ptr_memory = detail::align_usertype_pointer(raw);
+			void* uu_memory = detail::align_usertype_unique<T>(raw);
+			T& uu = *static_cast<T*>(uu_memory);
+			f(uu);
+			*static_cast<void**>(ptr_memory) = static_cast<void*>(detail::unique_get(obj.lua_state(), uu));
+		}
+
+		template <typename F>
+		void modify_unique_usertype(const stack_reference& obj, F&& f) {
+			using bt = meta::bind_traits<meta::unqualified_t<F>>;
+			using T = typename bt::template arg_at<0>;
+			using Tu = meta::unqualified_t<T>;
+			modify_unique_usertype_as<Tu>(obj, std::forward<F>(f));
+		}
+
+		namespace stack_detail {
+			template <typename T, typename Handler>
+			decltype(auto) check_get_arg(lua_State* L_, int index_, Handler&& handler_, record& tracking_) {
+				if constexpr (meta::meta_detail::is_adl_sol_lua_check_access_v<T>) {
+					sol_lua_check_access(types<meta::unqualified_t<T>>(), L_, index_, tracking_);
+				}
+				return check_get<T>(L_, index_, std::forward<Handler>(handler_), tracking_);
+			}
+
+			template <typename T>
+			decltype(auto) unchecked_get_arg(lua_State* L_, int index_, record& tracking_) {
+				if constexpr (meta::meta_detail::is_adl_sol_lua_check_access_v<T>) {
+					sol_lua_check_access(types<meta::unqualified_t<T>>(), L_, index_, tracking_);
+				}
+				return unchecked_get<T>(L_, index_, tracking_);
+			}
+		} // namespace stack_detail
+
+	} // namespace stack
+
+	namespace detail {
+
+		template <typename T>
+		lua_CFunction make_destructor(std::true_type) {
+			if constexpr (is_unique_usertype_v<T>) {
+				return &unique_destroy<T>;
+			}
+			else if constexpr (!std::is_pointer_v<T>) {
+				return &usertype_alloc_destroy<T>;
+			}
+			else {
+				return &cannot_destroy<T>;
+			}
+		}
+
+		template <typename T>
+		lua_CFunction make_destructor(std::false_type) {
+			return &cannot_destroy<T>;
+		}
+
+		template <typename T>
+		lua_CFunction make_destructor() {
+			return make_destructor<T>(std::is_destructible<T>());
+		}
+
+		struct no_comp {
+			template <typename A, typename B>
+			bool operator()(A&&, B&&) const {
+				return false;
+			}
+		};
+
+		template <typename T>
+		int is_check(lua_State* L) {
+			return stack::push(L, stack::check<T>(L, 1, &no_panic));
+		}
+
+		template <typename T>
+		int member_default_to_string(std::true_type, lua_State* L) {
+			decltype(auto) ts = stack::get<T>(L, 1).to_string();
+			return stack::push(L, std::forward<decltype(ts)>(ts));
+		}
+
+		template <typename T>
+		int member_default_to_string(std::false_type, lua_State* L) {
+			return luaL_error(L,
+			     "cannot perform to_string on '%s': no 'to_string' overload in namespace, 'to_string' member "
+			     "function, or operator<<(ostream&, ...) present",
+			     detail::demangle<T>().data());
+		}
+
+		template <typename T>
+		int adl_default_to_string(std::true_type, lua_State* L) {
+			using namespace std;
+			decltype(auto) ts = to_string(stack::get<T>(L, 1));
+			return stack::push(L, std::forward<decltype(ts)>(ts));
+		}
+
+		template <typename T>
+		int adl_default_to_string(std::false_type, lua_State* L) {
+			return member_default_to_string<T>(meta::supports_to_string_member<T>(), L);
+		}
+
+		template <typename T>
+		int oss_default_to_string(std::true_type, lua_State* L) {
+			std::ostringstream oss;
+			oss << stack::unqualified_get<T>(L, 1);
+			return stack::push(L, oss.str());
+		}
+
+		template <typename T>
+		int oss_default_to_string(std::false_type, lua_State* L) {
+			return adl_default_to_string<T>(meta::supports_adl_to_string<T>(), L);
+		}
+
+		template <typename T>
+		int default_to_string(lua_State* L) {
+			return oss_default_to_string<T>(meta::supports_op_left_shift<std::ostream, T>(), L);
+		}
+
+		template <typename T>
+		int default_size(lua_State* L) {
+			decltype(auto) self = stack::unqualified_get<T>(L, 1);
+			return stack::push(L, self.size());
+		}
+
+		template <typename T, typename Op>
+		int comparsion_operator_wrap(lua_State* L) {
+			if constexpr (std::is_void_v<T>) {
+				return stack::push(L, false);
+			}
+			else {
+				auto maybel = stack::unqualified_check_get<T>(L, 1);
+				if (!maybel) {
+					return stack::push(L, false);
+				}
+				auto mayber = stack::unqualified_check_get<T>(L, 2);
+				if (!mayber) {
+					return stack::push(L, false);
+				}
+				decltype(auto) l = *maybel;
+				decltype(auto) r = *mayber;
+				if constexpr (std::is_same_v<no_comp, Op>) {
+					std::equal_to<> op;
+					return stack::push(L, op(detail::ptr(l), detail::ptr(r)));
+				}
+				else {
+					if constexpr (std::is_same_v<std::equal_to<>, Op> // clang-format hack
+					     || std::is_same_v<std::less_equal<>, Op>     //
+					     || std::is_same_v<std::less_equal<>, Op>) {  //
+						if (detail::ptr(l) == detail::ptr(r)) {
+							return stack::push(L, true);
+						}
+					}
+					Op op;
+					return stack::push(L, op(detail::deref(l), detail::deref(r)));
+				}
+			}
+		}
+
+		template <typename T, typename IFx, typename Fx>
+		void insert_default_registrations(IFx&& ifx, Fx&& fx);
+
+		template <typename T, bool, bool>
+		struct get_is_primitive : is_lua_primitive<T> { };
+
+		template <typename T>
+		struct get_is_primitive<T, true, false>
+		: meta::neg<std::is_reference<decltype(sol_lua_get(types<T>(), nullptr, -1, std::declval<stack::record&>()))>> { };
+
+		template <typename T>
+		struct get_is_primitive<T, false, true>
+		: meta::neg<std::is_reference<decltype(sol_lua_get(types<meta::unqualified_t<T>>(), nullptr, -1, std::declval<stack::record&>()))>> { };
+
+		template <typename T>
+		struct get_is_primitive<T, true, true> : get_is_primitive<T, true, false> { };
+
+	} // namespace detail
+
+	template <typename T>
+	struct is_proxy_primitive
+	: detail::get_is_primitive<T, meta::meta_detail::is_adl_sol_lua_get_v<T>, meta::meta_detail::is_adl_sol_lua_get_v<meta::unqualified_t<T>>> { };
+
+} // namespace sol
+
+#endif // SOL_STACK_CORE_HPP
diff --git a/extern/sol3/sol/stack_field.hpp b/extern/sol3/sol/stack_field.hpp
new file mode 100644
index 0000000000..a0ef28f8bd
--- /dev/null
+++ b/extern/sol3/sol/stack_field.hpp
@@ -0,0 +1,279 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_STACK_FIELD_HPP
+#define SOL_STACK_FIELD_HPP
+
+#include <sol/stack_core.hpp>
+#include <sol/stack_push.hpp>
+#include <sol/stack_get.hpp>
+#include <sol/stack_check_get.hpp>
+
+namespace sol { namespace stack {
+
+	namespace stack_detail {
+		template <typename T, bool global, bool raw>
+		inline constexpr bool is_get_direct_tableless_v = (global && !raw && meta::is_c_str_or_string_v<T>);
+
+		template <typename T, bool global, bool raw>
+		inline constexpr bool is_get_direct_v = (is_get_direct_tableless_v<T, global, raw>) // cf-hack
+			|| (!global && !raw && (meta::is_c_str_or_string_v<T> || meta::is_string_of_v<T, char>)) // cf-hack
+			|| (!global && raw && (std::is_integral_v<T> && !std::is_same_v<T, bool>))
+#if SOL_LUA_VERSION_I_ >= 503
+			|| (!global && !raw && (std::is_integral_v<T> && !std::is_same_v<T, bool>))
+#endif // integer keys 5.3 or better
+#if SOL_LUA_VERSION_I_ >= 502
+			|| (!global && raw && std::is_pointer_v<T> && std::is_void_v<std::remove_pointer_t<T>>)
+#endif // void pointer keys 5.2 or better
+			;
+
+		template <typename T, bool global, bool raw>
+		inline constexpr bool is_set_direct_tableless_v = (global && !raw && meta::is_c_str_or_string_v<T>);
+
+		template <typename T, bool global, bool raw>
+		inline constexpr bool is_set_direct_v = (is_set_direct_tableless_v<T, global, raw>) // cf-hack
+			|| (!global && !raw && (meta::is_c_str_or_string_v<T> || meta::is_string_of_v<T, char>)) // cf-hack
+			|| (!global && raw && (std::is_integral_v<T> && !std::is_same_v<T, bool>))     // cf-hack
+#if SOL_LUA_VERSION_I_ >= 503
+			|| (!global && !raw && (std::is_integral_v<T> && !std::is_same_v<T, bool>))
+#endif // integer keys 5.3 or better
+#if SOL_LUA_VERSION_I_ >= 502
+			|| (!global && raw && (std::is_pointer_v<T> && std::is_void_v<std::remove_pointer_t<T>>))
+#endif // void pointer keys 5.2 or better
+			;
+	} // namespace stack_detail
+
+	template <typename T, bool global, bool raw, typename>
+	struct field_getter {
+		static inline constexpr int default_table_index
+			= meta::conditional_t<stack_detail::is_get_direct_v<T, global, raw>, std::integral_constant<int, -1>, std::integral_constant<int, -2>>::value;
+
+		template <typename Key>
+		void get(lua_State* L, Key&& key, int tableindex = default_table_index) {
+			if constexpr (std::is_same_v<T, update_if_empty_t> || std::is_same_v<T, override_value_t> || std::is_same_v<T, create_if_nil_t>) {
+				(void)L;
+				(void)key;
+				(void)tableindex;
+			}
+			else if constexpr (std::is_same_v<T, env_key_t>) {
+				(void)key;
+#if SOL_LUA_VERSION_I_ < 502
+				// Use lua_setfenv
+				lua_getfenv(L, tableindex);
+#else
+				// Use upvalues as explained in Lua 5.2 and beyond's manual
+				if (lua_getupvalue(L, tableindex, 1) == nullptr) {
+					push(L, lua_nil);
+				}
+#endif
+			}
+			else if constexpr (std::is_same_v<T, metatable_key_t>) {
+				(void)key;
+				if (lua_getmetatable(L, tableindex) == 0)
+					push(L, lua_nil);
+			}
+			else if constexpr (raw) {
+				if constexpr (std::is_integral_v<T> && !std::is_same_v<bool, T>) {
+					lua_rawgeti(L, tableindex, static_cast<lua_Integer>(key));
+				}
+#if SOL_LUA_VERSION_I_ >= 502
+				else if constexpr (std::is_pointer_v<T> && std::is_void_v<std::remove_pointer_t<T>>) {
+					lua_rawgetp(L, tableindex, key);
+				}
+#endif // Lua 5.2.x+
+				else {
+					push(L, std::forward<Key>(key));
+					lua_rawget(L, tableindex);
+				}
+			}
+			else {
+				if constexpr (meta::is_c_str_or_string_v<T>) {
+					if constexpr (global) {
+						(void)tableindex;
+						lua_getglobal(L, &key[0]);
+					}
+					else {
+						lua_getfield(L, tableindex, &key[0]);
+					}
+				}
+				else if constexpr (std::is_same_v<T, meta_function>) {
+					const auto& real_key = to_string(key);
+					lua_getfield(L, tableindex, &real_key[0]);
+				}
+#if SOL_LUA_VERSION_I_ >= 503
+				else if constexpr (std::is_integral_v<T> && !std::is_same_v<bool, T>) {
+					lua_geti(L, tableindex, static_cast<lua_Integer>(key));
+				}
+#endif // Lua 5.3.x+
+				else {
+					push(L, std::forward<Key>(key));
+					lua_gettable(L, tableindex);
+				}
+			}
+		}
+	};
+
+	template <typename... Args, bool b, bool raw, typename C>
+	struct field_getter<std::tuple<Args...>, b, raw, C> {
+		template <std::size_t... I, typename Keys>
+		void apply(std::index_sequence<0, I...>, lua_State* L, Keys&& keys, int tableindex) {
+			get_field<b, raw>(L, std::get<0>(std::forward<Keys>(keys)), tableindex);
+			void(detail::swallow { (get_field<false, raw>(L, std::get<I>(std::forward<Keys>(keys))), 0)... });
+			reference saved(L, -1);
+			lua_pop(L, static_cast<int>(sizeof...(I)));
+			saved.push();
+		}
+
+		template <typename Keys>
+		void get(lua_State* L, Keys&& keys) {
+			apply(std::make_index_sequence<sizeof...(Args)>(), L, std::forward<Keys>(keys), lua_absindex(L, -1));
+		}
+
+		template <typename Keys>
+		void get(lua_State* L, Keys&& keys, int tableindex) {
+			apply(std::make_index_sequence<sizeof...(Args)>(), L, std::forward<Keys>(keys), tableindex);
+		}
+	};
+
+	template <typename A, typename B, bool b, bool raw, typename C>
+	struct field_getter<std::pair<A, B>, b, raw, C> {
+		template <typename Keys>
+		void get(lua_State* L, Keys&& keys, int tableindex) {
+			get_field<b, raw>(L, std::get<0>(std::forward<Keys>(keys)), tableindex);
+			get_field<false, raw>(L, std::get<1>(std::forward<Keys>(keys)));
+			reference saved(L, -1);
+			lua_pop(L, static_cast<int>(2));
+			saved.push();
+		}
+
+		template <typename Keys>
+		void get(lua_State* L, Keys&& keys) {
+			get_field<b, raw>(L, std::get<0>(std::forward<Keys>(keys)));
+			get_field<false, raw>(L, std::get<1>(std::forward<Keys>(keys)));
+			reference saved(L, -1);
+			lua_pop(L, static_cast<int>(2));
+			saved.push();
+		}
+	};
+
+	template <typename T, bool global, bool raw, typename>
+	struct field_setter {
+		static constexpr int default_table_index
+			= meta::conditional_t<stack_detail::is_set_direct_v<T, global, raw>, std::integral_constant<int, -2>, std::integral_constant<int, -3>>::value;
+
+		template <typename Key, typename Value>
+		void set(lua_State* L, Key&& key, Value&& value, int tableindex = default_table_index) {
+			if constexpr (std::is_same_v<T, update_if_empty_t> || std::is_same_v<T, override_value_t>) {
+				(void)L;
+				(void)key;
+				(void)value;
+				(void)tableindex;
+			}
+			else if constexpr (std::is_same_v<T, metatable_key_t>) {
+				(void)key;
+				push(L, std::forward<Value>(value));
+				lua_setmetatable(L, tableindex);
+			}
+			else if constexpr (raw) {
+				if constexpr (std::is_integral_v<T> && !std::is_same_v<bool, T>) {
+					push(L, std::forward<Value>(value));
+					lua_rawseti(L, tableindex, static_cast<lua_Integer>(key));
+				}
+#if SOL_LUA_VERSION_I_ >= 502
+				else if constexpr (std::is_pointer_v<T> && std::is_void_v<std::remove_pointer_t<T>>) {
+					push(L, std::forward<Value>(value));
+					lua_rawsetp(L, tableindex, std::forward<Key>(key));
+				}
+#endif // Lua 5.2.x
+				else {
+					push(L, std::forward<Key>(key));
+					push(L, std::forward<Value>(value));
+					lua_rawset(L, tableindex);
+				}
+			}
+			else {
+				if constexpr (meta::is_c_str_or_string_v<T>) {
+					if constexpr (global) {
+						push(L, std::forward<Value>(value));
+						lua_setglobal(L, &key[0]);
+						(void)tableindex;
+					}
+					else {
+						push(L, std::forward<Value>(value));
+						lua_setfield(L, tableindex, &key[0]);
+					}
+				}
+#if SOL_LUA_VERSION_I_ >= 503
+				else if constexpr (std::is_integral_v<T> && !std::is_same_v<bool, T>) {
+					push(L, std::forward<Value>(value));
+					lua_seti(L, tableindex, static_cast<lua_Integer>(key));
+				}
+#endif // Lua 5.3.x
+				else {
+					push(L, std::forward<Key>(key));
+					push(L, std::forward<Value>(value));
+					lua_settable(L, tableindex);
+				}
+			}
+		}
+	};
+
+	template <typename... Args, bool b, bool raw, typename C>
+	struct field_setter<std::tuple<Args...>, b, raw, C> {
+		template <bool g, std::size_t I, typename Keys, typename Value>
+		void apply(std::index_sequence<I>, lua_State* L, Keys&& keys, Value&& value, int tableindex) {
+			I < 1 ? set_field<g, raw>(L, std::get<I>(std::forward<Keys>(keys)), std::forward<Value>(value), tableindex)
+				 : set_field<g, raw>(L, std::get<I>(std::forward<Keys>(keys)), std::forward<Value>(value));
+		}
+
+		template <bool g, std::size_t I0, std::size_t I1, std::size_t... I, typename Keys, typename Value>
+		void apply(std::index_sequence<I0, I1, I...>, lua_State* L, Keys&& keys, Value&& value, int tableindex) {
+			I0 < 1 ? get_field<g, raw>(L, std::get<I0>(std::forward<Keys>(keys)), tableindex)
+				  : get_field<g, raw>(L, std::get<I0>(std::forward<Keys>(keys)), -1);
+			apply<false>(std::index_sequence<I1, I...>(), L, std::forward<Keys>(keys), std::forward<Value>(value), -1);
+		}
+
+		template <bool g, std::size_t I0, std::size_t... I, typename Keys, typename Value>
+		void top_apply(std::index_sequence<I0, I...>, lua_State* L, Keys&& keys, Value&& value, int tableindex) {
+			apply<g>(std::index_sequence<I0, I...>(), L, std::forward<Keys>(keys), std::forward<Value>(value), tableindex);
+			lua_pop(L, static_cast<int>(sizeof...(I)));
+		}
+
+		template <typename Keys, typename Value>
+		void set(lua_State* L, Keys&& keys, Value&& value, int tableindex = -3) {
+			top_apply<b>(std::make_index_sequence<sizeof...(Args)>(), L, std::forward<Keys>(keys), std::forward<Value>(value), tableindex);
+		}
+	};
+
+	template <typename A, typename B, bool b, bool raw, typename C>
+	struct field_setter<std::pair<A, B>, b, raw, C> {
+		template <typename Keys, typename Value>
+		void set(lua_State* L, Keys&& keys, Value&& value, int tableindex = -1) {
+			get_field<b, raw>(L, std::get<0>(std::forward<Keys>(keys)), tableindex);
+			set_field<false, raw>(L, std::get<1>(std::forward<Keys>(keys)), std::forward<Value>(value), lua_gettop(L));
+			lua_pop(L, 1);
+		}
+	};
+}} // namespace sol::stack
+
+#endif // SOL_STACK_FIELD_HPP
diff --git a/extern/sol3/sol/stack_get.hpp b/extern/sol3/sol/stack_get.hpp
new file mode 100644
index 0000000000..70e8c699ba
--- /dev/null
+++ b/extern/sol3/sol/stack_get.hpp
@@ -0,0 +1,30 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_STACK_GET_HPP
+#define SOL_STACK_GET_HPP
+
+#include <sol/stack_get_unqualified.hpp>
+#include <sol/stack_get_qualified.hpp>
+
+#endif // SOL_STACK_GET_HPP
diff --git a/extern/sol3/sol/stack_get_qualified.hpp b/extern/sol3/sol/stack_get_qualified.hpp
new file mode 100644
index 0000000000..a71c2959ef
--- /dev/null
+++ b/extern/sol3/sol/stack_get_qualified.hpp
@@ -0,0 +1,37 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_STACK_QUALIFIED_GET_HPP
+#define SOL_STACK_QUALIFIED_GET_HPP
+
+#include <sol/stack_get_unqualified.hpp>
+
+namespace sol { namespace stack {
+
+	// There are no more enable_ifs that can be used here,
+	// so this is just for posterity, I guess?
+	// maybe I'll fill this file in later.
+
+}} // namespace sol::stack
+
+#endif // SOL_STACK_QUALIFIED_GET_HPP
diff --git a/extern/sol3/sol/stack_get_unqualified.hpp b/extern/sol3/sol/stack_get_unqualified.hpp
new file mode 100644
index 0000000000..58ee34f583
--- /dev/null
+++ b/extern/sol3/sol/stack_get_unqualified.hpp
@@ -0,0 +1,1064 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_STACK_UNQUALIFIED_GET_HPP
+#define SOL_STACK_UNQUALIFIED_GET_HPP
+
+#include <sol/stack_core.hpp>
+#include <sol/usertype_traits.hpp>
+#include <sol/inheritance.hpp>
+#include <sol/overload.hpp>
+#include <sol/error.hpp>
+#include <sol/unicode.hpp>
+
+#include <memory>
+#include <functional>
+#include <utility>
+#include <cstdlib>
+#include <cmath>
+#include <string_view>
+#if SOL_IS_ON(SOL_STD_VARIANT_I_)
+#include <variant>
+#endif // Apple clang screwed up
+
+namespace sol { namespace stack {
+
+	namespace stack_detail {
+		template <typename Ch>
+		struct count_code_units_utf {
+			std::size_t needed_size;
+
+			count_code_units_utf() : needed_size(0) {
+			}
+
+			void operator()(const unicode::encoded_result<Ch> er) {
+				needed_size += er.code_units_size;
+			}
+		};
+
+		template <typename Ch, typename ErCh>
+		struct copy_code_units_utf {
+			Ch* target_;
+
+			copy_code_units_utf(Ch* target) : target_(target) {
+			}
+
+			void operator()(const unicode::encoded_result<ErCh> er) {
+				std::memcpy(target_, er.code_units.data(), er.code_units_size * sizeof(ErCh));
+				target_ += er.code_units_size;
+			}
+		};
+
+		template <typename Ch, typename F>
+		inline void convert(const char* strb, const char* stre, F&& f) {
+			char32_t cp = 0;
+			for (const char* strtarget = strb; strtarget < stre;) {
+				auto dr = unicode::utf8_to_code_point(strtarget, stre);
+				if (dr.error != unicode::error_code::ok) {
+					cp = unicode::unicode_detail::replacement;
+					++strtarget;
+				}
+				else {
+					cp = dr.codepoint;
+					strtarget = dr.next;
+				}
+				if constexpr (std::is_same_v<Ch, char32_t>) {
+					auto er = unicode::code_point_to_utf32(cp);
+					f(er);
+				}
+				else {
+					auto er = unicode::code_point_to_utf16(cp);
+					f(er);
+				}
+			}
+		}
+
+		template <typename BaseCh, typename S>
+		inline S get_into(lua_State* L, int index, record& tracking) {
+			using Ch = typename S::value_type;
+			tracking.use(1);
+			size_t len;
+			auto utf8p = lua_tolstring(L, index, &len);
+			if (len < 1)
+				return S();
+			const char* strb = utf8p;
+			const char* stre = utf8p + len;
+			stack_detail::count_code_units_utf<BaseCh> count_units;
+			convert<BaseCh>(strb, stre, count_units);
+			S r(count_units.needed_size, static_cast<Ch>(0));
+			r.resize(count_units.needed_size);
+			Ch* target = &r[0];
+			stack_detail::copy_code_units_utf<Ch, BaseCh> copy_units(target);
+			convert<BaseCh>(strb, stre, copy_units);
+			return r;
+		}
+	} // namespace stack_detail
+
+	template <typename T, typename>
+	struct unqualified_getter {
+		static decltype(auto) get(lua_State* L, int index, record& tracking) {
+			if constexpr (std::is_same_v<T, bool>) {
+				tracking.use(1);
+				return lua_toboolean(L, index) != 0;
+			}
+			else if constexpr (std::is_enum_v<T>) {
+				tracking.use(1);
+				return static_cast<T>(lua_tointegerx(L, index, nullptr));
+			}
+			else if constexpr (std::is_integral_v<T> || std::is_same_v<T, lua_Integer>) {
+				tracking.use(1);
+#if SOL_LUA_VERSION_I_ >= 503
+				if (lua_isinteger(L, index) != 0) {
+					return static_cast<T>(lua_tointeger(L, index));
+				}
+#endif
+				return static_cast<T>(llround(lua_tonumber(L, index)));
+			}
+			else if constexpr (std::is_floating_point_v<T> || std::is_same_v<T, lua_Number>) {
+				tracking.use(1);
+				return static_cast<T>(lua_tonumber(L, index));
+			}
+			else if constexpr (is_lua_reference_v<T>) {
+				if constexpr (is_global_table_v<T>) {
+					tracking.use(1);
+					return T(L, global_tag);
+				}
+				else {
+					tracking.use(1);
+					return T(L, index);
+				}
+			}
+			else if constexpr (is_unique_usertype_v<T>) {
+				using actual = unique_usertype_actual_t<T>;
+
+				tracking.use(1);
+				void* memory = lua_touserdata(L, index);
+				void* aligned_memory = detail::align_usertype_unique<actual>(memory);
+				actual* typed_memory = static_cast<actual*>(aligned_memory);
+				return *typed_memory;
+			}
+			else if constexpr (meta::is_optional_v<T>) {
+				using ValueType = typename T::value_type;
+				return unqualified_check_getter<ValueType>::template get_using<T>(L, index, &no_panic, tracking);
+			}
+			else if constexpr (std::is_same_v<T, luaL_Stream*>) {
+				luaL_Stream* pstream = static_cast<luaL_Stream*>(lua_touserdata(L, index));
+				return pstream;
+			}
+			else if constexpr (std::is_same_v<T, luaL_Stream>) {
+				luaL_Stream* pstream = static_cast<luaL_Stream*>(lua_touserdata(L, index));
+				return *pstream;
+			}
+#if SOL_IS_ON(SOL_GET_FUNCTION_POINTER_UNSAFE_I_)
+			else if constexpr (std::is_function_v<T> || (std::is_pointer_v<T> && std::is_function_v<std::remove_pointer_t<T>>)) {
+				return stack_detail::get_function_pointer<std::remove_pointer_t<T>>(L, index, tracking);
+			}
+#endif
+			else {
+				return stack_detail::unchecked_unqualified_get<detail::as_value_tag<T>>(L, index, tracking);
+			}
+		}
+	};
+
+	template <typename X, typename>
+	struct qualified_getter {
+		static decltype(auto) get(lua_State* L, int index, record& tracking) {
+			using Tu = meta::unqualified_t<X>;
+			static constexpr bool is_userdata_of_some_kind
+				= !std::is_reference_v<
+				       X> && is_container_v<Tu> && std::is_default_constructible_v<Tu> && !is_lua_primitive_v<Tu> && !is_transparent_argument_v<Tu>;
+			if constexpr (is_userdata_of_some_kind) {
+				if (type_of(L, index) == type::userdata) {
+					return static_cast<Tu>(stack_detail::unchecked_unqualified_get<Tu>(L, index, tracking));
+				}
+				else {
+					return stack_detail::unchecked_unqualified_get<sol::nested<Tu>>(L, index, tracking);
+				}
+			}
+			else if constexpr (!std::is_reference_v<X> && is_unique_usertype_v<Tu> && !is_actual_type_rebindable_for_v<Tu>) {
+				using element = unique_usertype_element_t<Tu>;
+				using actual = unique_usertype_actual_t<Tu>;
+				tracking.use(1);
+				void* memory = lua_touserdata(L, index);
+				memory = detail::align_usertype_unique_destructor(memory);
+				detail::unique_destructor& pdx = *static_cast<detail::unique_destructor*>(memory);
+				if (&detail::usertype_unique_alloc_destroy<element, Tu> == pdx) {
+					memory = detail::align_usertype_unique_tag<true, false>(memory);
+					memory = detail::align_usertype_unique<actual, true, false>(memory);
+					actual* mem = static_cast<actual*>(memory);
+					return static_cast<actual>(*mem);
+				}
+				actual r {};
+				if constexpr (!derive<element>::value) {
+#if SOL_IS_ON(SOL_DEBUG_BUILD_I_)
+					// In debug mode we would rather abort you for this grave failure rather
+					// than let you deref a null pointer and fuck everything over
+					std::abort();
+#endif
+					return static_cast<actual>(std::move(r));
+				}
+				else {
+					memory = detail::align_usertype_unique_tag<true, false>(memory);
+					detail::unique_tag& ic = *reinterpret_cast<detail::unique_tag*>(memory);
+					memory = detail::align_usertype_unique<actual, true, false>(memory);
+					string_view ti = usertype_traits<element>::qualified_name();
+					int cast_operation;
+					if constexpr (is_actual_type_rebindable_for_v<Tu>) {
+						using rebound_actual_type = unique_usertype_rebind_actual_t<Tu, void>;
+						string_view rebind_ti = usertype_traits<rebound_actual_type>::qualified_name();
+						cast_operation = ic(memory, &r, ti, rebind_ti);
+					}
+					else {
+						string_view rebind_ti("");
+						cast_operation = ic(memory, &r, ti, rebind_ti);
+					}
+					switch (cast_operation) {
+					case 1: {
+						// it's a perfect match,
+						// alias memory directly
+						actual* mem = static_cast<actual*>(memory);
+						return static_cast<actual>(*mem);
+					}
+					case 2:
+						// it's a base match, return the
+						// aliased creation
+						return static_cast<actual>(std::move(r));
+					default:
+						// uh oh..
+						break;
+					}
+#if SOL_IS_ON(SOL_DEBUG_BUILD_I_)
+					// In debug mode we would rather abort you for this grave failure rather
+					// than let you deref a null pointer and fuck everything over
+					std::abort();
+#endif
+					return static_cast<actual>(r);
+				}
+			}
+			else {
+				return stack_detail::unchecked_unqualified_get<Tu>(L, index, tracking);
+			}
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<as_table_t<T>> {
+		using Tu = meta::unqualified_t<T>;
+
+		template <typename V>
+		static void push_back_at_end(std::true_type, types<V>, lua_State* L, T& cont, std::size_t) {
+			cont.push_back(stack::get<V>(L, -lua_size<V>::value));
+		}
+
+		template <typename V>
+		static void push_back_at_end(std::false_type, types<V> t, lua_State* L, T& cont, std::size_t idx) {
+			insert_at_end(meta::has_insert<Tu>(), t, L, cont, idx);
+		}
+
+		template <typename V>
+		static void insert_at_end(std::true_type, types<V>, lua_State* L, T& cont, std::size_t) {
+			using std::cend;
+			cont.insert(cend(cont), stack::get<V>(L, -lua_size<V>::value));
+		}
+
+		template <typename V>
+		static void insert_at_end(std::false_type, types<V>, lua_State* L, T& cont, std::size_t idx) {
+			cont[idx] = stack::get<V>(L, -lua_size<V>::value);
+		}
+
+		static bool max_size_check(std::false_type, T&, std::size_t) {
+			return false;
+		}
+
+		static bool max_size_check(std::true_type, T& cont, std::size_t idx) {
+			return idx >= cont.max_size();
+		}
+
+		static T get(lua_State* L, int relindex, record& tracking) {
+			return get(meta::is_associative<Tu>(), L, relindex, tracking);
+		}
+
+		static T get(std::false_type, lua_State* L, int relindex, record& tracking) {
+			typedef typename Tu::value_type V;
+			return get(types<V>(), L, relindex, tracking);
+		}
+
+		template <typename V>
+		static T get(types<V> t, lua_State* L, int relindex, record& tracking) {
+			tracking.use(1);
+
+			// the W4 flag is really great,
+			// so great that it can tell my for loops (twice nested)
+			// below never actually terminate
+			// without hitting where the gotos have infested
+
+			// so now I would get the error W4XXX unreachable
+			// me that the return cont at the end of this function
+			// which is fair until other compilers complain
+			// that there isn't a return and that based on
+			// SOME MAGICAL FORCE
+			// control flow falls off the end of a non-void function
+			// so it needs to be there for the compilers that are
+			// too flimsy to analyze the basic blocks...
+			// (I'm sure I should file a bug but those compilers are already
+			// in the wild; it doesn't matter if I fix them,
+			// someone else is still going to get some old-ass compiler
+			// and then bother me about the unclean build for the 30th
+			// time)
+
+			// "Why not an IIFE?"
+			// Because additional lambdas / functions which serve as
+			// capture-all-and-then-invoke bloat binary sizes
+			// by an actually detectable amount
+			// (one user uses sol2 pretty heavily and 22 MB of binary size
+			// was saved by reducing reliance on lambdas in templates)
+
+			// This would really be solved by having break N;
+			// be a real, proper thing...
+			// but instead, we have to use labels and gotos
+			// and earn the universal vitriol of the dogmatic
+			// programming community
+
+			// all in all: W4 is great!~
+
+			int index = lua_absindex(L, relindex);
+			T cont;
+			std::size_t idx = 0;
+#if SOL_LUA_VERSION_I_ >= 503
+			// This method is HIGHLY performant over regular table iteration
+			// thanks to the Lua API changes in 5.3
+			// Questionable in 5.4
+			for (lua_Integer i = 0;; i += lua_size<V>::value) {
+				if (max_size_check(meta::has_max_size<Tu>(), cont, idx)) {
+					// see above comment
+					goto done;
+				}
+				bool isnil = false;
+				for (int vi = 0; vi < lua_size<V>::value; ++vi) {
+#if SOL_IS_ON(SOL_LUA_NIL_IN_TABLES_I_) && SOL_LUA_VERSION_I_ >= 600
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+					luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+					lua_pushinteger(L, static_cast<lua_Integer>(i + vi));
+					if (lua_keyin(L, index) == 0) {
+						// it's time to stop
+						isnil = true;
+					}
+					else {
+						// we have a key, have to get the value
+						lua_geti(L, index, i + vi);
+					}
+#else
+					type vt = static_cast<type>(lua_geti(L, index, i + vi));
+					isnil = vt == type::none || vt == type::lua_nil;
+#endif
+					if (isnil) {
+						if (i == 0) {
+							break;
+						}
+#if SOL_IS_ON(SOL_LUA_NIL_IN_TABLES_I_) && SOL_LUA_VERSION_I_ >= 600
+						lua_pop(L, vi);
+#else
+						lua_pop(L, (vi + 1));
+#endif
+						// see above comment
+						goto done;
+					}
+				}
+				if (isnil) {
+#if SOL_IS_ON(SOL_LUA_NIL_IN_TABLES_I_) && SOL_LUA_VERSION_I_ >= 600
+#else
+					lua_pop(L, lua_size<V>::value);
+#endif
+					continue;
+				}
+
+				push_back_at_end(meta::has_push_back<Tu>(), t, L, cont, idx);
+				++idx;
+				lua_pop(L, lua_size<V>::value);
+			}
+#else
+			// Zzzz slower but necessary thanks to the lower version API and missing functions qq
+			for (lua_Integer i = 0;; i += lua_size<V>::value, lua_pop(L, lua_size<V>::value)) {
+				if (idx >= cont.max_size()) {
+					// see above comment
+					goto done;
+				}
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+				luaL_checkstack(L, 2, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+				bool isnil = false;
+				for (int vi = 0; vi < lua_size<V>::value; ++vi) {
+					lua_pushinteger(L, i);
+					lua_gettable(L, index);
+					type vt = type_of(L, -1);
+					isnil = vt == type::lua_nil;
+					if (isnil) {
+						if (i == 0) {
+							break;
+						}
+						lua_pop(L, (vi + 1));
+						// see above comment
+						goto done;
+					}
+				}
+				if (isnil)
+					continue;
+				push_back_at_end(meta::has_push_back<Tu>(), t, L, cont, idx);
+				++idx;
+			}
+#endif
+		done:
+			return cont;
+		}
+
+		static T get(std::true_type, lua_State* L, int index, record& tracking) {
+			typedef typename Tu::value_type P;
+			typedef typename P::first_type K;
+			typedef typename P::second_type V;
+			return get(types<K, V>(), L, index, tracking);
+		}
+
+		template <typename K, typename V>
+		static T get(types<K, V>, lua_State* L, int relindex, record& tracking) {
+			tracking.use(1);
+
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 3, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+
+			T associative;
+			int index = lua_absindex(L, relindex);
+			lua_pushnil(L);
+			while (lua_next(L, index) != 0) {
+				decltype(auto) key = stack::check_get<K>(L, -2);
+				if (!key) {
+					lua_pop(L, 1);
+					continue;
+				}
+				associative.emplace(std::forward<decltype(*key)>(*key), stack::get<V>(L, -1));
+				lua_pop(L, 1);
+			}
+			return associative;
+		}
+	};
+
+	template <typename T, typename Al>
+	struct unqualified_getter<as_table_t<std::forward_list<T, Al>>> {
+		typedef std::forward_list<T, Al> C;
+
+		static C get(lua_State* L, int relindex, record& tracking) {
+			return get(meta::has_key_value_pair<C>(), L, relindex, tracking);
+		}
+
+		static C get(std::true_type, lua_State* L, int index, record& tracking) {
+			typedef typename T::value_type P;
+			typedef typename P::first_type K;
+			typedef typename P::second_type V;
+			return get(types<K, V>(), L, index, tracking);
+		}
+
+		static C get(std::false_type, lua_State* L, int relindex, record& tracking) {
+			typedef typename C::value_type V;
+			return get(types<V>(), L, relindex, tracking);
+		}
+
+		template <typename V>
+		static C get(types<V>, lua_State* L, int relindex, record& tracking) {
+			tracking.use(1);
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 3, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+
+			int index = lua_absindex(L, relindex);
+			C cont;
+			auto at = cont.cbefore_begin();
+			std::size_t idx = 0;
+#if SOL_LUA_VERSION_I_ >= 503
+			// This method is HIGHLY performant over regular table iteration thanks to the Lua API changes in 5.3
+			for (lua_Integer i = 0;; i += lua_size<V>::value, lua_pop(L, lua_size<V>::value)) {
+				if (idx >= cont.max_size()) {
+					goto done;
+				}
+				bool isnil = false;
+				for (int vi = 0; vi < lua_size<V>::value; ++vi) {
+					type t = static_cast<type>(lua_geti(L, index, i + vi));
+					isnil = t == type::lua_nil;
+					if (isnil) {
+						if (i == 0) {
+							break;
+						}
+						lua_pop(L, (vi + 1));
+						goto done;
+					}
+				}
+				if (isnil)
+					continue;
+				at = cont.insert_after(at, stack::get<V>(L, -lua_size<V>::value));
+				++idx;
+			}
+#else
+			// Zzzz slower but necessary thanks to the lower version API and missing functions qq
+			for (lua_Integer i = 0;; i += lua_size<V>::value, lua_pop(L, lua_size<V>::value)) {
+				if (idx >= cont.max_size()) {
+					goto done;
+				}
+				bool isnil = false;
+				for (int vi = 0; vi < lua_size<V>::value; ++vi) {
+					lua_pushinteger(L, i);
+					lua_gettable(L, index);
+					type t = type_of(L, -1);
+					isnil = t == type::lua_nil;
+					if (isnil) {
+						if (i == 0) {
+							break;
+						}
+						lua_pop(L, (vi + 1));
+						goto done;
+					}
+				}
+				if (isnil)
+					continue;
+				at = cont.insert_after(at, stack::get<V>(L, -lua_size<V>::value));
+				++idx;
+			}
+#endif
+		done:
+			return cont;
+		}
+
+		template <typename K, typename V>
+		static C get(types<K, V>, lua_State* L, int relindex, record& tracking) {
+			tracking.use(1);
+
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 3, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+
+			C associative;
+			auto at = associative.cbefore_begin();
+			int index = lua_absindex(L, relindex);
+			lua_pushnil(L);
+			while (lua_next(L, index) != 0) {
+				decltype(auto) key = stack::check_get<K>(L, -2);
+				if (!key) {
+					lua_pop(L, 1);
+					continue;
+				}
+				at = associative.emplace_after(at, std::forward<decltype(*key)>(*key), stack::get<V>(L, -1));
+				lua_pop(L, 1);
+			}
+			return associative;
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<nested<T>> {
+		static T get(lua_State* L, int index, record& tracking) {
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (is_container_v<Tu>) {
+				if constexpr (meta::is_associative<Tu>::value) {
+					typedef typename T::value_type P;
+					typedef typename P::first_type K;
+					typedef typename P::second_type V;
+					unqualified_getter<as_table_t<T>> g;
+					// VC++ has a bad warning here: shut it up
+					(void)g;
+					return g.get(types<K, nested<V>>(), L, index, tracking);
+				}
+				else {
+					typedef typename T::value_type V;
+					unqualified_getter<as_table_t<T>> g;
+					// VC++ has a bad warning here: shut it up
+					(void)g;
+					return g.get(types<nested<V>>(), L, index, tracking);
+				}
+			}
+			else {
+				unqualified_getter<Tu> g;
+				// VC++ has a bad warning here: shut it up
+				(void)g;
+				return g.get(L, index, tracking);
+			}
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<as_container_t<T>> {
+		static decltype(auto) get(lua_State* L, int index, record& tracking) {
+			return stack::unqualified_get<T>(L, index, tracking);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<as_container_t<T>*> {
+		static decltype(auto) get(lua_State* L, int index, record& tracking) {
+			return stack::unqualified_get<T*>(L, index, tracking);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<userdata_value> {
+		static userdata_value get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			return userdata_value(lua_touserdata(L, index));
+		}
+	};
+
+	template <>
+	struct unqualified_getter<lightuserdata_value> {
+		static lightuserdata_value get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			return lightuserdata_value(lua_touserdata(L, index));
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<light<T>> {
+		static light<T> get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			void* memory = lua_touserdata(L, index);
+			return light<T>(static_cast<T*>(memory));
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<user<T>> {
+		static std::add_lvalue_reference_t<T> get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			void* memory = lua_touserdata(L, index);
+			memory = detail::align_user<T>(memory);
+			return *static_cast<std::remove_reference_t<T>*>(memory);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<user<T*>> {
+		static T* get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			void* memory = lua_touserdata(L, index);
+			memory = detail::align_user<T*>(memory);
+			return static_cast<T*>(memory);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<type> {
+		static type get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			return static_cast<type>(lua_type(L, index));
+		}
+	};
+
+	template <>
+	struct unqualified_getter<std::string> {
+		static std::string get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			std::size_t len;
+			auto str = lua_tolstring(L, index, &len);
+			return std::string(str, len);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<const char*> {
+		static const char* get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			size_t sz;
+			return lua_tolstring(L, index, &sz);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<char> {
+		static char get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			size_t len;
+			auto str = lua_tolstring(L, index, &len);
+			return len > 0 ? str[0] : '\0';
+		}
+	};
+
+	template <typename Traits>
+	struct unqualified_getter<basic_string_view<char, Traits>> {
+		static string_view get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			size_t sz;
+			const char* str = lua_tolstring(L, index, &sz);
+			return basic_string_view<char, Traits>(str, sz);
+		}
+	};
+
+	template <typename Traits, typename Al>
+	struct unqualified_getter<std::basic_string<wchar_t, Traits, Al>> {
+		using S = std::basic_string<wchar_t, Traits, Al>;
+		static S get(lua_State* L, int index, record& tracking) {
+			using Ch = meta::conditional_t<sizeof(wchar_t) == 2, char16_t, char32_t>;
+			return stack_detail::get_into<Ch, S>(L, index, tracking);
+		}
+	};
+
+	template <typename Traits, typename Al>
+	struct unqualified_getter<std::basic_string<char16_t, Traits, Al>> {
+		static std::basic_string<char16_t, Traits, Al> get(lua_State* L, int index, record& tracking) {
+			return stack_detail::get_into<char16_t, std::basic_string<char16_t, Traits, Al>>(L, index, tracking);
+		}
+	};
+
+	template <typename Traits, typename Al>
+	struct unqualified_getter<std::basic_string<char32_t, Traits, Al>> {
+		static std::basic_string<char32_t, Traits, Al> get(lua_State* L, int index, record& tracking) {
+			return stack_detail::get_into<char32_t, std::basic_string<char32_t, Traits, Al>>(L, index, tracking);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<char16_t> {
+		static char16_t get(lua_State* L, int index, record& tracking) {
+			string_view utf8 = stack::get<string_view>(L, index, tracking);
+			const char* strb = utf8.data();
+			const char* stre = utf8.data() + utf8.size();
+			char32_t cp = 0;
+			auto dr = unicode::utf8_to_code_point(strb, stre);
+			if (dr.error != unicode::error_code::ok) {
+				cp = unicode::unicode_detail::replacement;
+			}
+			else {
+				cp = dr.codepoint;
+			}
+			auto er = unicode::code_point_to_utf16(cp);
+			return er.code_units[0];
+		}
+	};
+
+	template <>
+	struct unqualified_getter<char32_t> {
+		static char32_t get(lua_State* L, int index, record& tracking) {
+			string_view utf8 = stack::get<string_view>(L, index, tracking);
+			const char* strb = utf8.data();
+			const char* stre = utf8.data() + utf8.size();
+			char32_t cp = 0;
+			auto dr = unicode::utf8_to_code_point(strb, stre);
+			if (dr.error != unicode::error_code::ok) {
+				cp = unicode::unicode_detail::replacement;
+			}
+			else {
+				cp = dr.codepoint;
+			}
+			auto er = unicode::code_point_to_utf32(cp);
+			return er.code_units[0];
+		}
+	};
+
+	template <>
+	struct unqualified_getter<wchar_t> {
+		static wchar_t get(lua_State* L, int index, record& tracking) {
+			typedef meta::conditional_t<sizeof(wchar_t) == 2, char16_t, char32_t> Ch;
+			unqualified_getter<Ch> g;
+			(void)g;
+			auto c = g.get(L, index, tracking);
+			return static_cast<wchar_t>(c);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<meta_function> {
+		static meta_function get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			const char* name = unqualified_getter<const char*> {}.get(L, index, tracking);
+			const auto& mfnames = meta_function_names();
+			for (std::size_t i = 0; i < mfnames.size(); ++i)
+				if (mfnames[i] == name)
+					return static_cast<meta_function>(i);
+			return meta_function::construct;
+		}
+	};
+
+	template <>
+	struct unqualified_getter<lua_nil_t> {
+		static lua_nil_t get(lua_State*, int, record& tracking) {
+			tracking.use(1);
+			return lua_nil;
+		}
+	};
+
+	template <>
+	struct unqualified_getter<std::nullptr_t> {
+		static std::nullptr_t get(lua_State*, int, record& tracking) {
+			tracking.use(1);
+			return nullptr;
+		}
+	};
+
+	template <>
+	struct unqualified_getter<nullopt_t> {
+		static nullopt_t get(lua_State*, int, record& tracking) {
+			tracking.use(1);
+			return nullopt;
+		}
+	};
+
+	template <>
+	struct unqualified_getter<this_state> {
+		static this_state get(lua_State* L, int, record& tracking) {
+			tracking.use(0);
+			return this_state(L);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<this_main_state> {
+		static this_main_state get(lua_State* L, int, record& tracking) {
+			tracking.use(0);
+			return this_main_state(main_thread(L, L));
+		}
+	};
+
+	template <>
+	struct unqualified_getter<lua_CFunction> {
+		static lua_CFunction get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			return lua_tocfunction(L, index);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<c_closure> {
+		static c_closure get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			return c_closure(lua_tocfunction(L, index), -1);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<error> {
+		static error get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			size_t sz = 0;
+			const char* err = lua_tolstring(L, index, &sz);
+			if (err == nullptr) {
+				return error(detail::direct_error, "");
+			}
+			return error(detail::direct_error, std::string(err, sz));
+		}
+	};
+
+	template <>
+	struct unqualified_getter<void*> {
+		static void* get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			return lua_touserdata(L, index);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<const void*> {
+		static const void* get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			return lua_touserdata(L, index);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<detail::as_value_tag<T>> {
+		static T* get_no_lua_nil(lua_State* L, int index, record& tracking) {
+			void* memory = lua_touserdata(L, index);
+#if SOL_IS_ON(SOL_USE_INTEROP_I_)
+			auto ugr = stack_detail::interop_get<T>(L, index, memory, tracking);
+			if (ugr.first) {
+				return ugr.second;
+			}
+#endif // interop extensibility
+			tracking.use(1);
+			void* rawdata = detail::align_usertype_pointer(memory);
+			void** pudata = static_cast<void**>(rawdata);
+			void* udata = *pudata;
+			return get_no_lua_nil_from(L, udata, index, tracking);
+		}
+
+		static T* get_no_lua_nil_from(lua_State* L, void* udata, int index, record&) {
+			bool has_derived = derive<T>::value || weak_derive<T>::value;
+			if (has_derived) {
+				if (lua_getmetatable(L, index) == 1) {
+					lua_getfield(L, -1, &detail::base_class_cast_key()[0]);
+					if (type_of(L, -1) != type::lua_nil) {
+						void* basecastdata = lua_touserdata(L, -1);
+						detail::inheritance_cast_function ic = reinterpret_cast<detail::inheritance_cast_function>(basecastdata);
+						// use the casting function to properly adjust the pointer for the desired T
+						udata = ic(udata, usertype_traits<T>::qualified_name());
+					}
+					lua_pop(L, 2);
+				}
+			}
+			if constexpr (std::is_function_v<T>) {
+				T* func = reinterpret_cast<T*>(udata);
+				return func;
+			}
+			else {
+				T* obj = static_cast<T*>(udata);
+				return obj;
+			}
+		}
+
+		static T& get(lua_State* L, int index, record& tracking) {
+			return *get_no_lua_nil(L, index, tracking);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<detail::as_pointer_tag<T>> {
+		static T* get(lua_State* L, int index, record& tracking) {
+			type t = type_of(L, index);
+			if (t == type::lua_nil) {
+				tracking.use(1);
+				return nullptr;
+			}
+			unqualified_getter<detail::as_value_tag<T>> g;
+			// Avoid VC++ warning
+			(void)g;
+			return g.get_no_lua_nil(L, index, tracking);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<non_null<T*>> {
+		static T* get(lua_State* L, int index, record& tracking) {
+			unqualified_getter<detail::as_value_tag<T>> g;
+			// Avoid VC++ warning
+			(void)g;
+			return g.get_no_lua_nil(L, index, tracking);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<T&> {
+		static T& get(lua_State* L, int index, record& tracking) {
+			unqualified_getter<detail::as_value_tag<T>> g;
+			// Avoid VC++ warning
+			(void)g;
+			return g.get(L, index, tracking);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<std::reference_wrapper<T>> {
+		static T& get(lua_State* L, int index, record& tracking) {
+			unqualified_getter<T&> g;
+			// Avoid VC++ warning
+			(void)g;
+			return g.get(L, index, tracking);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<T*> {
+		static T* get(lua_State* L, int index, record& tracking) {
+#if SOL_IS_ON(SOL_GET_FUNCTION_POINTER_UNSAFE_I_)
+			if constexpr (std::is_function_v<T>) {
+				return stack_detail::get_function_pointer<T>(L, index, tracking);
+			}
+			else {
+				unqualified_getter<detail::as_pointer_tag<T>> g;
+				// Avoid VC++ warning
+				(void)g;
+				return g.get(L, index, tracking);
+			}
+#else
+			unqualified_getter<detail::as_pointer_tag<T>> g;
+			// Avoid VC++ warning
+			(void)g;
+			return g.get(L, index, tracking);
+#endif
+		}
+	};
+
+	template <typename... Tn>
+	struct unqualified_getter<std::tuple<Tn...>> {
+		typedef std::tuple<decltype(stack::get<Tn>(nullptr, 0))...> R;
+
+		template <typename... Args>
+		static R apply(std::index_sequence<>, lua_State*, int, record&, Args&&... args) {
+			// Fuck you too, VC++
+			return R { std::forward<Args>(args)... };
+		}
+
+		template <std::size_t I, std::size_t... Ix, typename... Args>
+		static R apply(std::index_sequence<I, Ix...>, lua_State* L, int index, record& tracking, Args&&... args) {
+			// Fuck you too, VC++
+			typedef std::tuple_element_t<I, std::tuple<Tn...>> T;
+			return apply(std::index_sequence<Ix...>(), L, index, tracking, std::forward<Args>(args)..., stack::get<T>(L, index + tracking.used, tracking));
+		}
+
+		static R get(lua_State* L, int index, record& tracking) {
+			return apply(std::make_index_sequence<sizeof...(Tn)>(), L, index, tracking);
+		}
+	};
+
+	template <typename A, typename B>
+	struct unqualified_getter<std::pair<A, B>> {
+		static decltype(auto) get(lua_State* L, int index, record& tracking) {
+			return std::pair<decltype(stack::get<A>(L, index)), decltype(stack::get<B>(L, index))> { stack::get<A>(L, index, tracking),
+				stack::get<B>(L, index + tracking.used, tracking) };
+		}
+	};
+
+#if SOL_IS_ON(SOL_STD_VARIANT_I_)
+
+	template <typename... Tn>
+	struct unqualified_getter<std::variant<Tn...>> {
+		using V = std::variant<Tn...>;
+
+		static V get_one(std::integral_constant<std::size_t, std::variant_size_v<V>>, lua_State* L, int index, record& tracking) {
+			(void)L;
+			(void)index;
+			(void)tracking;
+			if constexpr (std::variant_size_v<V> == 0) {
+				return V();
+			}
+			else {
+				// using T = std::variant_alternative_t<0, V>;
+				std::abort();
+				// return V(std::in_place_index<0>, stack::get<T>(L, index, tracking));
+			}
+		}
+
+		template <std::size_t I>
+		static V get_one(std::integral_constant<std::size_t, I>, lua_State* L, int index, record& tracking) {
+			typedef std::variant_alternative_t<I, V> T;
+			record temp_tracking = tracking;
+			if (stack::check<T>(L, index, &no_panic, temp_tracking)) {
+				tracking = temp_tracking;
+				return V(std::in_place_index<I>, stack::get<T>(L, index));
+			}
+			return get_one(std::integral_constant<std::size_t, I + 1>(), L, index, tracking);
+		}
+
+		static V get(lua_State* L, int index, record& tracking) {
+			return get_one(std::integral_constant<std::size_t, 0>(), L, index, tracking);
+		}
+	};
+#endif // variant
+
+}} // namespace sol::stack
+
+#endif // SOL_STACK_UNQUALIFIED_GET_HPP
diff --git a/extern/sol3/sol/stack_guard.hpp b/extern/sol3/sol/stack_guard.hpp
new file mode 100644
index 0000000000..9ae9a073d8
--- /dev/null
+++ b/extern/sol3/sol/stack_guard.hpp
@@ -0,0 +1,67 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_STACK_GUARD_HPP
+#define SOL_STACK_GUARD_HPP
+
+#include <sol/compatibility/lua_version.hpp>
+#include <sol/error.hpp>
+#include <functional>
+
+namespace sol {
+	namespace detail {
+		inline void stack_fail(int, int) {
+#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
+			throw error(detail::direct_error, "imbalanced stack after operation finish");
+#else
+			// Lol, what do you want, an error printout? :3c
+			// There's no sane default here. The right way would be C-style abort(), and that's not acceptable, so
+			// hopefully someone will register their own stack_fail thing for the `fx` parameter of stack_guard.
+#endif // No Exceptions
+		}
+	} // namespace detail
+
+	struct stack_guard {
+		lua_State* L;
+		int top;
+		std::function<void(int, int)> on_mismatch;
+
+		stack_guard(lua_State* L) : stack_guard(L, lua_gettop(L)) {
+		}
+		stack_guard(lua_State* L, int top, std::function<void(int, int)> fx = detail::stack_fail) : L(L), top(top), on_mismatch(std::move(fx)) {
+		}
+		bool check_stack(int modification = 0) const {
+			int bottom = lua_gettop(L) + modification;
+			if (top == bottom) {
+				return true;
+			}
+			on_mismatch(top, bottom);
+			return false;
+		}
+		~stack_guard() {
+			check_stack();
+		}
+	};
+} // namespace sol
+
+#endif // SOL_STACK_GUARD_HPP
diff --git a/extern/sol3/sol/stack_iterator.hpp b/extern/sol3/sol/stack_iterator.hpp
new file mode 100644
index 0000000000..e73a4df2f4
--- /dev/null
+++ b/extern/sol3/sol/stack_iterator.hpp
@@ -0,0 +1,153 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_STACK_ITERATOR_HPP
+#define SOL_STACK_ITERATOR_HPP
+
+#include <sol/stack.hpp>
+#include <limits>
+#include <iterator>
+
+namespace sol {
+	template <typename proxy_t, bool is_const>
+	struct stack_iterator {
+		typedef meta::conditional_t<is_const, const proxy_t, proxy_t> reference;
+		typedef meta::conditional_t<is_const, const proxy_t*, proxy_t*> pointer;
+		typedef proxy_t value_type;
+		typedef std::ptrdiff_t difference_type;
+		typedef std::random_access_iterator_tag iterator_category;
+		lua_State* L;
+		int index;
+		int stacktop;
+		proxy_t sp;
+
+		stack_iterator() : L(nullptr), index((std::numeric_limits<int>::max)()), stacktop((std::numeric_limits<int>::max)()), sp() {
+		}
+		stack_iterator(const stack_iterator<proxy_t, true>& r) : L(r.L), index(r.index), stacktop(r.stacktop), sp(r.sp) {
+		}
+		stack_iterator(lua_State* luastate, int idx, int topidx) : L(luastate), index(idx), stacktop(topidx), sp(luastate, idx) {
+		}
+
+		reference operator*() {
+			return proxy_t(L, index);
+		}
+
+		reference operator*() const {
+			return proxy_t(L, index);
+		}
+
+		pointer operator->() {
+			sp = proxy_t(L, index);
+			return &sp;
+		}
+
+		pointer operator->() const {
+			const_cast<proxy_t&>(sp) = proxy_t(L, index);
+			return &sp;
+		}
+
+		stack_iterator& operator++() {
+			++index;
+			return *this;
+		}
+
+		stack_iterator operator++(int) {
+			auto r = *this;
+			this->operator++();
+			return r;
+		}
+
+		stack_iterator& operator--() {
+			--index;
+			return *this;
+		}
+
+		stack_iterator operator--(int) {
+			auto r = *this;
+			this->operator--();
+			return r;
+		}
+
+		stack_iterator& operator+=(difference_type idx) {
+			index += static_cast<int>(idx);
+			return *this;
+		}
+
+		stack_iterator& operator-=(difference_type idx) {
+			index -= static_cast<int>(idx);
+			return *this;
+		}
+
+		difference_type operator-(const stack_iterator& r) const {
+			return index - r.index;
+		}
+
+		stack_iterator operator+(difference_type idx) const {
+			stack_iterator r = *this;
+			r += idx;
+			return r;
+		}
+
+		reference operator[](difference_type idx) const {
+			return proxy_t(L, index + static_cast<int>(idx));
+		}
+
+		bool operator==(const stack_iterator& r) const {
+			if (stacktop == (std::numeric_limits<int>::max)()) {
+				return r.index == r.stacktop;
+			}
+			else if (r.stacktop == (std::numeric_limits<int>::max)()) {
+				return index == stacktop;
+			}
+			return index == r.index;
+		}
+
+		bool operator!=(const stack_iterator& r) const {
+			return !(this->operator==(r));
+		}
+
+		bool operator<(const stack_iterator& r) const {
+			return index < r.index;
+		}
+
+		bool operator>(const stack_iterator& r) const {
+			return index > r.index;
+		}
+
+		bool operator<=(const stack_iterator& r) const {
+			return index <= r.index;
+		}
+
+		bool operator>=(const stack_iterator& r) const {
+			return index >= r.index;
+		}
+	};
+
+	template <typename proxy_t, bool is_const>
+	inline stack_iterator<proxy_t, is_const> operator+(
+	     typename stack_iterator<proxy_t, is_const>::difference_type n, const stack_iterator<proxy_t, is_const>& r) {
+		return r + n;
+	}
+} // namespace sol
+
+#endif // SOL_STACK_ITERATOR_HPP
diff --git a/extern/sol3/sol/stack_pop.hpp b/extern/sol3/sol/stack_pop.hpp
new file mode 100644
index 0000000000..065908fc0b
--- /dev/null
+++ b/extern/sol3/sol/stack_pop.hpp
@@ -0,0 +1,51 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_STACK_POP_HPP
+#define SOL_STACK_POP_HPP
+
+#include <sol/stack_core.hpp>
+#include <sol/stack_get.hpp>
+#include <utility>
+#include <tuple>
+
+namespace sol { namespace stack {
+	template <typename T, typename>
+	struct popper {
+		inline static decltype(auto) pop(lua_State* L) {
+			if constexpr (is_stack_based_v<meta::unqualified_t<T>>) {
+				static_assert(!is_stack_based_v<meta::unqualified_t<T>>,
+					"You cannot pop something that lives solely on the stack: it will not remain on the stack when popped and thusly will go out of "
+					"scope!");
+			}
+			else {
+				record tracking {};
+				decltype(auto) r = get<T>(L, -lua_size<T>::value, tracking);
+				lua_pop(L, tracking.used);
+				return r;
+			}
+		}
+	};
+}} // namespace sol::stack
+
+#endif // SOL_STACK_POP_HPP
diff --git a/extern/sol3/sol/stack_probe.hpp b/extern/sol3/sol/stack_probe.hpp
new file mode 100644
index 0000000000..3b97162182
--- /dev/null
+++ b/extern/sol3/sol/stack_probe.hpp
@@ -0,0 +1,94 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_STACK_PROBE_HPP
+#define SOL_STACK_PROBE_HPP
+
+#include <sol/stack_core.hpp>
+#include <sol/stack_field.hpp>
+#include <sol/stack_check.hpp>
+
+namespace sol { namespace stack {
+	template <typename T, typename P, bool b, bool raw, typename>
+	struct probe_field_getter {
+		template <typename Key>
+		probe get(lua_State* L, Key&& key, int tableindex = -2) {
+			if constexpr (!b) {
+				if (!maybe_indexable(L, tableindex)) {
+					return probe(false, 0);
+				}
+			}
+			get_field<b, raw>(L, std::forward<Key>(key), tableindex);
+			return probe(check<P>(L), 1);
+		}
+	};
+
+	template <typename A, typename B, typename P, bool b, bool raw, typename C>
+	struct probe_field_getter<std::pair<A, B>, P, b, raw, C> {
+		template <typename Keys>
+		probe get(lua_State* L, Keys&& keys, int tableindex = -2) {
+			if (!b && !maybe_indexable(L, tableindex)) {
+				return probe(false, 0);
+			}
+			get_field<b, raw>(L, std::get<0>(keys), tableindex);
+			if (!maybe_indexable(L)) {
+				return probe(false, 1);
+			}
+			get_field<false, raw>(L, std::get<1>(keys), tableindex);
+			return probe(check<P>(L), 2);
+		}
+	};
+
+	template <typename... Args, typename P, bool b, bool raw, typename C>
+	struct probe_field_getter<std::tuple<Args...>, P, b, raw, C> {
+		template <std::size_t I, typename Keys>
+		probe apply(std::index_sequence<I>, int sofar, lua_State* L, Keys&& keys, int tableindex) {
+			get_field<(I < 1) && b, raw>(L, std::get<I>(keys), tableindex);
+			return probe(check<P>(L), sofar);
+		}
+
+		template <std::size_t I, std::size_t I1, std::size_t... In, typename Keys>
+		probe apply(std::index_sequence<I, I1, In...>, int sofar, lua_State* L, Keys&& keys, int tableindex) {
+			get_field < I<1 && b, raw>(L, std::get<I>(keys), tableindex);
+			if (!maybe_indexable(L)) {
+				return probe(false, sofar);
+			}
+			return apply(std::index_sequence<I1, In...>(), sofar + 1, L, std::forward<Keys>(keys), -1);
+		}
+
+		template <typename Keys>
+		probe get(lua_State* L, Keys&& keys, int tableindex = -2) {
+			if constexpr (!b) {
+				if (!maybe_indexable(L, tableindex)) {
+					return probe(false, 0);
+				}
+				return apply(std::index_sequence_for<Args...>(), 1, L, std::forward<Keys>(keys), tableindex);
+			}
+			else {
+				return apply(std::index_sequence_for<Args...>(), 1, L, std::forward<Keys>(keys), tableindex);
+			}
+		}
+	};
+}} // namespace sol::stack
+
+#endif // SOL_STACK_PROBE_HPP
\ No newline at end of file
diff --git a/extern/sol3/sol/stack_proxy.hpp b/extern/sol3/sol/stack_proxy.hpp
new file mode 100644
index 0000000000..169efd000f
--- /dev/null
+++ b/extern/sol3/sol/stack_proxy.hpp
@@ -0,0 +1,64 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_STACK_PROXY_HPP
+#define SOL_STACK_PROXY_HPP
+
+#include <sol/stack_proxy_base.hpp>
+
+namespace sol {
+	struct stack_proxy : public stack_proxy_base {
+	public:
+		stack_proxy() : stack_proxy_base() {
+		}
+		stack_proxy(lua_State* L, int index) : stack_proxy_base(L, index) {
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) call(Args&&... args);
+
+		template <typename... Args>
+		decltype(auto) operator()(Args&&... args) {
+			return call<>(std::forward<Args>(args)...);
+		}
+	};
+
+	namespace stack {
+		template <>
+		struct unqualified_getter<stack_proxy> {
+			static stack_proxy get(lua_State* L, int index, record& tracking) {
+				tracking.use(0);
+				return stack_proxy(L, index);
+			}
+		};
+
+		template <>
+		struct unqualified_pusher<stack_proxy> {
+			static int push(lua_State*, const stack_proxy& ref) {
+				return ref.push();
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+#endif // SOL_STACK_PROXY_HPP
diff --git a/extern/sol3/sol/stack_proxy_base.hpp b/extern/sol3/sol/stack_proxy_base.hpp
new file mode 100644
index 0000000000..75c6e78123
--- /dev/null
+++ b/extern/sol3/sol/stack_proxy_base.hpp
@@ -0,0 +1,96 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_STACK_PROXY_BASE_HPP
+#define SOL_STACK_PROXY_BASE_HPP
+
+#include <sol/stack.hpp>
+#include <sol/proxy_base.hpp>
+
+namespace sol {
+	struct stack_proxy_base : public proxy_base<stack_proxy_base> {
+	private:
+		lua_State* m_L;
+		int m_index;
+
+	public:
+		stack_proxy_base() : m_L(nullptr), m_index(0) {
+		}
+		stack_proxy_base(lua_State* L_, int index_) : m_L(L_), m_index(index_) {
+		}
+
+		template <typename T>
+		decltype(auto) get() const {
+			return stack::get<T>(m_L, stack_index());
+		}
+
+		template <typename T>
+		bool is() const {
+			return stack::check<T>(m_L, stack_index());
+		}
+
+		template <typename T>
+		decltype(auto) as() const {
+			return get<T>();
+		}
+
+		type get_type() const noexcept {
+			return type_of(lua_state(), stack_index());
+		}
+
+		int push() const {
+			return push(m_L);
+		}
+
+		int push(lua_State* L_) const {
+			lua_pushvalue(L_, m_index);
+			return 1;
+		}
+
+		lua_State* lua_state() const {
+			return m_L;
+		}
+		int stack_index() const {
+			return m_index;
+		}
+	};
+
+	namespace stack {
+		template <>
+		struct unqualified_getter<stack_proxy_base> {
+			static stack_proxy_base get(lua_State* L_, int index_ = -1) {
+				return stack_proxy_base(L_, index_);
+			}
+		};
+
+		template <>
+		struct unqualified_pusher<stack_proxy_base> {
+			static int push(lua_State*, const stack_proxy_base& proxy_reference) {
+				return proxy_reference.push();
+			}
+		};
+	} // namespace stack
+
+} // namespace sol
+
+#endif // SOL_STACK_PROXY_BASE_HPP
diff --git a/extern/sol3/sol/stack_push.hpp b/extern/sol3/sol/stack_push.hpp
new file mode 100644
index 0000000000..098fa0a0b2
--- /dev/null
+++ b/extern/sol3/sol/stack_push.hpp
@@ -0,0 +1,1382 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_STACK_PUSH_HPP
+#define SOL_STACK_PUSH_HPP
+
+#include <sol/stack_core.hpp>
+#include <sol/raii.hpp>
+#include <sol/optional.hpp>
+#include <sol/usertype_traits.hpp>
+#include <sol/policies.hpp>
+#include <sol/unicode.hpp>
+
+#include <memory>
+#include <type_traits>
+#include <cassert>
+#include <limits>
+#include <cmath>
+#include <string_view>
+#if SOL_IS_ON(SOL_STD_VARIANT_I_)
+#include <variant>
+#endif // Can use variant
+
+namespace sol { namespace stack {
+	namespace stack_detail {
+		template <typename T>
+		inline bool integer_value_fits(const T& value) {
+			// We check if we can rely on casts or a lack of padding bits to satisfy
+			// the requirements here
+			// If it lacks padding bits, we can jump back and forth between lua_Integer and whatever type without
+			// loss of information
+			constexpr bool is_same_signedness
+				= (std::is_signed_v<T> && std::is_signed_v<lua_Integer>) || (std::is_unsigned_v<T> && std::is_unsigned_v<lua_Integer>);
+			constexpr bool probaby_fits_within_lua_Integer = sizeof(T) == sizeof(lua_Integer)
+#if SOL_IS_ON(SOL_ALL_INTEGER_VALUES_FIT_I_)
+				&& ((std::has_unique_object_representations_v<T> && std::has_unique_object_representations_v<lua_Integer>) ? true : is_same_signedness)
+#else
+				&& is_same_signedness
+#endif
+				;
+			if constexpr (sizeof(T) < sizeof(lua_Integer) || probaby_fits_within_lua_Integer) {
+				(void)value;
+				return true;
+			}
+			else {
+				auto u_min = static_cast<std::intmax_t>((std::numeric_limits<lua_Integer>::min)());
+				auto u_max = static_cast<std::uintmax_t>((std::numeric_limits<lua_Integer>::max)());
+				auto t_min = static_cast<std::intmax_t>((std::numeric_limits<T>::min)());
+				auto t_max = static_cast<std::uintmax_t>((std::numeric_limits<T>::max)());
+				return (u_min <= t_min || value >= static_cast<T>(u_min)) && (u_max >= t_max || value <= static_cast<T>(u_max));
+			}
+		}
+
+		template <typename T>
+		int msvc_is_ass_with_if_constexpr_push_enum(std::true_type, lua_State* L, const T& value) {
+			if constexpr (meta::any_same_v<std::underlying_type_t<T>,
+				              char
+#if SOL_IS_ON(SOL_CHAR8_T_I_)
+				              ,
+				              char8_t
+#endif
+				              ,
+				              char16_t,
+				              char32_t>) {
+				if constexpr (std::is_signed_v<T>) {
+					return stack::push(L, static_cast<std::int_least32_t>(value));
+				}
+				else {
+					return stack::push(L, static_cast<std::uint_least32_t>(value));
+				}
+			}
+			else {
+				return stack::push(L, static_cast<std::underlying_type_t<T>>(value));
+			}
+		}
+
+		template <typename T>
+		int msvc_is_ass_with_if_constexpr_push_enum(std::false_type, lua_State*, const T&) {
+			return 0;
+		}
+	} // namespace stack_detail
+
+	inline int push_environment_of(lua_State* L, int target_index = -1) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+		luaL_checkstack(L, 1, detail::not_enough_stack_space_environment);
+#endif // make sure stack doesn't overflow
+#if SOL_LUA_VERSION_I_ < 502
+		// Use lua_getfenv
+		lua_getfenv(L, target_index);
+#else
+
+		if (lua_iscfunction(L, target_index) != 0) {
+			const char* maybe_upvalue_name = lua_getupvalue(L, target_index, 1);
+			if (maybe_upvalue_name != nullptr) {
+				// it worked, take this one
+				return 1;
+			}
+		}
+		// Nominally, we search for the `"_ENV"` value.
+		// If we don't find it.... uh, well. We've got a problem?
+		for (int upvalue_index = 1;; ++upvalue_index) {
+			const char* maybe_upvalue_name = lua_getupvalue(L, target_index, upvalue_index);
+			if (maybe_upvalue_name == nullptr) {
+				push(L, lua_nil);
+				break;
+			}
+
+			string_view upvalue_name(maybe_upvalue_name);
+			if (upvalue_name == "_ENV") {
+				// Keep this one!
+				break;
+			}
+			// Discard what we received, loop back around
+			lua_pop(L, 1);
+		}
+#endif
+		return 1;
+	}
+
+	template <typename T>
+	int push_environment_of(const T& target) {
+		lua_State* target_L = target.lua_state();
+		int target_index = absolute_index(target_L, -target.push());
+		return push_environment_of(target_L, target_index);
+	}
+
+	template <typename T>
+	struct unqualified_pusher<detail::as_value_tag<T>> {
+		template <typename F, typename... Args>
+		static int push_fx(lua_State* L, F&& f, Args&&... args) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_userdata);
+#endif // make sure stack doesn't overflow
+       // Basically, we store all user-data like this:
+       // If it's a movable/copyable value (no std::ref(x)), then we store the pointer to the new
+       // data in the first sizeof(T*) bytes, and then however many bytes it takes to
+       // do the actual object. Things that are std::ref or plain T* are stored as
+       // just the sizeof(T*), and nothing else.
+			T* obj = detail::usertype_allocate<T>(L);
+			f();
+			std::allocator<T> alloc {};
+			std::allocator_traits<std::allocator<T>>::construct(alloc, obj, std::forward<Args>(args)...);
+			return 1;
+		}
+
+		template <typename K, typename... Args>
+		static int push_keyed(lua_State* L, K&& k, Args&&... args) {
+			stack_detail::undefined_metatable fx(L, &k[0], &stack::stack_detail::set_undefined_methods_on<T>);
+			return push_fx(L, fx, std::forward<Args>(args)...);
+		}
+
+		template <typename Arg, typename... Args>
+		static int push(lua_State* L, Arg&& arg, Args&&... args) {
+			if constexpr (std::is_same_v<meta::unqualified_t<Arg>, detail::with_function_tag>) {
+				(void)arg;
+				return push_fx(L, std::forward<Args>(args)...);
+			}
+			else {
+				return push_keyed(L, usertype_traits<T>::metatable(), std::forward<Arg>(arg), std::forward<Args>(args)...);
+			}
+		}
+
+		static int push(lua_State* L) {
+			return push_keyed(L, usertype_traits<T>::metatable());
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<detail::as_pointer_tag<T>> {
+		typedef meta::unqualified_t<T> U;
+
+		template <typename F>
+		static int push_fx(lua_State* L, F&& f, T* obj) {
+			if (obj == nullptr)
+				return stack::push(L, lua_nil);
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_userdata);
+#endif // make sure stack doesn't overflow
+			T** pref = detail::usertype_allocate_pointer<T>(L);
+			f();
+			*pref = obj;
+			return 1;
+		}
+
+		template <typename K>
+		static int push_keyed(lua_State* L, K&& k, T* obj) {
+			stack_detail::undefined_metatable fx(L, &k[0], &stack::stack_detail::set_undefined_methods_on<U*>);
+			return push_fx(L, fx, obj);
+		}
+
+		template <typename Arg, typename... Args>
+		static int push(lua_State* L, Arg&& arg, Args&&... args) {
+			if constexpr (std::is_same_v<meta::unqualified_t<Arg>, detail::with_function_tag>) {
+				(void)arg;
+				return push_fx(L, std::forward<Args>(args)...);
+			}
+			else {
+				return push_keyed(L, usertype_traits<U*>::metatable(), std::forward<Arg>(arg), std::forward<Args>(args)...);
+			}
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<detail::as_reference_tag> {
+		template <typename T>
+		static int push(lua_State* L, T&& obj) {
+			return stack::push(L, detail::ptr(obj));
+		}
+	};
+
+	namespace stack_detail {
+		template <typename T>
+		struct uu_pusher {
+			using element = unique_usertype_element_t<T>;
+			using actual = unique_usertype_actual_t<T>;
+
+			template <typename Arg, typename... Args>
+			static int push(lua_State* L, Arg&& arg, Args&&... args) {
+				if constexpr (std::is_base_of_v<actual, meta::unqualified_t<Arg>>) {
+					if (detail::unique_is_null(L, arg)) {
+						return stack::push(L, lua_nil);
+					}
+					return push_deep(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+				}
+				else {
+					return push_deep(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+				}
+			}
+
+			template <typename... Args>
+			static int push_deep(lua_State* L, Args&&... args) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+				luaL_checkstack(L, 1, detail::not_enough_stack_space_userdata);
+#endif // make sure stack doesn't overflow
+				element** pointer_to_memory = nullptr;
+				detail::unique_destructor* fx = nullptr;
+				detail::unique_tag* id = nullptr;
+				actual* typed_memory = detail::usertype_unique_allocate<element, actual>(L, pointer_to_memory, fx, id);
+				if (luaL_newmetatable(L, &usertype_traits<d::u<std::remove_cv_t<element>>>::metatable()[0]) == 1) {
+					detail::lua_reg_table registration_table {};
+					int index = 0;
+					detail::indexed_insert insert_callable(registration_table, index);
+					detail::insert_default_registrations<element>(insert_callable, detail::property_always_true);
+					registration_table[index] = { to_string(meta_function::garbage_collect).c_str(), detail::make_destructor<T>() };
+					luaL_setfuncs(L, registration_table, 0);
+				}
+				lua_setmetatable(L, -2);
+				*fx = detail::usertype_unique_alloc_destroy<element, actual>;
+				*id = &detail::inheritance<element>::template type_unique_cast<actual>;
+				detail::default_construct::construct(typed_memory, std::forward<Args>(args)...);
+				*pointer_to_memory = detail::unique_get<T>(L, *typed_memory);
+				return 1;
+			}
+		};
+	} // namespace stack_detail
+
+	template <typename T>
+	struct unqualified_pusher<detail::as_unique_tag<T>> {
+		template <typename... Args>
+		static int push(lua_State* L, Args&&... args) {
+			stack_detail::uu_pusher<T> p;
+			(void)p;
+			return p.push(L, std::forward<Args>(args)...);
+		}
+	};
+
+	template <typename T, typename>
+	struct unqualified_pusher {
+		template <typename... Args>
+		static int push(lua_State* L, Args&&... args) {
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (is_lua_reference_v<Tu>) {
+				using int_arr = int[];
+				int_arr p { (std::forward<Args>(args).push(L))... };
+				return p[0];
+			}
+			else if constexpr (std::is_same_v<Tu, bool>) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+				luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+				lua_pushboolean(L, std::forward<Args>(args)...);
+				return 1;
+			}
+			else if constexpr (std::is_integral_v<Tu> || std::is_same_v<Tu, lua_Integer>) {
+				const Tu& value(std::forward<Args>(args)...);
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+				luaL_checkstack(L, 1, detail::not_enough_stack_space_integral);
+#endif // make sure stack doesn't overflow
+#if SOL_LUA_VERSION_I_ >= 503
+				if (stack_detail::integer_value_fits<Tu>(value)) {
+					lua_pushinteger(L, static_cast<lua_Integer>(value));
+					return 1;
+				}
+#endif // Lua 5.3 and above
+#if SOL_IS_ON(SOL_NUMBER_PRECISION_CHECKS_I_)
+				if (static_cast<T>(llround(static_cast<lua_Number>(value))) != value) {
+#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
+					// Is this really worth it?
+					assert(false && "integer value will be misrepresented in lua");
+					lua_pushinteger(L, static_cast<lua_Integer>(value));
+					return 1;
+#else
+					throw error(detail::direct_error, "integer value will be misrepresented in lua");
+#endif // No Exceptions
+				}
+#endif // Safe Numerics and Number Precision Check
+				lua_pushnumber(L, static_cast<lua_Number>(value));
+				return 1;
+			}
+			else if constexpr (std::is_floating_point_v<Tu> || std::is_same_v<Tu, lua_Number>) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+				luaL_checkstack(L, 1, detail::not_enough_stack_space_floating);
+#endif // make sure stack doesn't overflow
+				lua_pushnumber(L, std::forward<Args>(args)...);
+				return 1;
+			}
+			else if constexpr (std::is_same_v<Tu, luaL_Stream*>) {
+				luaL_Stream* source { std::forward<Args>(args)... };
+				luaL_Stream* stream = static_cast<luaL_Stream*>(detail::alloc_newuserdata(L, sizeof(luaL_Stream)));
+				stream->f = source->f;
+#if SOL_IS_ON(SOL_LUAL_STREAM_USE_CLOSE_FUNCTION_I_)
+				stream->closef = source->closef;
+#endif // LuaJIT and Lua 5.1 and below do not have
+				return 1;
+			}
+			else if constexpr (std::is_same_v<Tu, luaL_Stream>) {
+				luaL_Stream& source(std::forward<Args>(args)...);
+				luaL_Stream* stream = static_cast<luaL_Stream*>(detail::alloc_newuserdata(L, sizeof(luaL_Stream)));
+				stream->f = source.f;
+#if SOL_IS_ON(SOL_LUAL_STREAM_USE_CLOSE_FUNCTION_I_)
+				stream->closef = source.closef;
+#endif // LuaJIT and Lua 5.1 and below do not have
+				return 1;
+			}
+			else if constexpr (std::is_enum_v<Tu>) {
+				return stack_detail::msvc_is_ass_with_if_constexpr_push_enum(std::true_type(), L, std::forward<Args>(args)...);
+			}
+			else if constexpr (std::is_pointer_v<Tu>) {
+				return stack::push<detail::as_pointer_tag<std::remove_pointer_t<T>>>(L, std::forward<Args>(args)...);
+			}
+			else if constexpr (is_unique_usertype_v<Tu>) {
+				return stack::push<detail::as_unique_tag<T>>(L, std::forward<Args>(args)...);
+			}
+			else {
+				return stack::push<detail::as_value_tag<T>>(L, std::forward<Args>(args)...);
+			}
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<std::reference_wrapper<T>> {
+		static int push(lua_State* L, const std::reference_wrapper<T>& t) {
+			return stack::push(L, std::addressof(detail::deref(t.get())));
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<detail::as_table_tag<T>> {
+		using has_kvp = meta::has_key_value_pair<meta::unqualified_t<std::remove_pointer_t<T>>>;
+
+		static int push(lua_State* L, const T& tablecont) {
+			return push(has_kvp(), std::false_type(), L, tablecont);
+		}
+
+		static int push(lua_State* L, const T& tablecont, nested_tag_t) {
+			return push(has_kvp(), std::true_type(), L, tablecont);
+		}
+
+		static int push(std::true_type, lua_State* L, const T& tablecont) {
+			return push(has_kvp(), std::true_type(), L, tablecont);
+		}
+
+		static int push(std::false_type, lua_State* L, const T& tablecont) {
+			return push(has_kvp(), std::false_type(), L, tablecont);
+		}
+
+		template <bool is_nested>
+		static int push(std::true_type, std::integral_constant<bool, is_nested>, lua_State* L, const T& tablecont) {
+			auto& cont = detail::deref(detail::unwrap(tablecont));
+			lua_createtable(L, static_cast<int>(cont.size()), 0);
+			int tableindex = lua_gettop(L);
+			for (const auto& pair : cont) {
+				if (is_nested) {
+					set_field(L, pair.first, as_nested_ref(pair.second), tableindex);
+				}
+				else {
+					set_field(L, pair.first, pair.second, tableindex);
+				}
+			}
+			return 1;
+		}
+
+		template <bool is_nested>
+		static int push(std::false_type, std::integral_constant<bool, is_nested>, lua_State* L, const T& tablecont) {
+			auto& cont = detail::deref(detail::unwrap(tablecont));
+			lua_createtable(L, stack_detail::get_size_hint(cont), 0);
+			int tableindex = lua_gettop(L);
+			std::size_t index = 1;
+			for (const auto& i : cont) {
+#if SOL_LUA_VERSION_I_ >= 503
+				int p = is_nested ? stack::push(L, as_nested_ref(i)) : stack::push(L, i);
+				for (int pi = 0; pi < p; ++pi) {
+					lua_seti(L, tableindex, static_cast<lua_Integer>(index++));
+				}
+#else
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+				luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+				lua_pushinteger(L, static_cast<lua_Integer>(index));
+				int p = is_nested ? stack::push(L, as_nested_ref(i)) : stack::push(L, i);
+				if (p == 1) {
+					++index;
+					lua_settable(L, tableindex);
+				}
+				else {
+					int firstindex = tableindex + 1 + 1;
+					for (int pi = 0; pi < p; ++pi) {
+						stack::push(L, index);
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+						luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+						lua_pushvalue(L, firstindex);
+						lua_settable(L, tableindex);
+						++index;
+						++firstindex;
+					}
+					lua_pop(L, 1 + p);
+				}
+#endif // Lua Version 5.3 and others
+			}
+			// TODO: figure out a better way to do this...?
+			// set_field(L, -1, cont.size());
+			return 1;
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<as_table_t<T>> {
+		static int push(lua_State* L, const as_table_t<T>& value_) {
+			using inner_t = std::remove_pointer_t<meta::unwrap_unqualified_t<T>>;
+			if constexpr (is_container_v<inner_t>) {
+				return stack::push<detail::as_table_tag<T>>(L, value_.value());
+			}
+			else {
+				return stack::push(L, value_.value());
+			}
+		}
+
+		static int push(lua_State* L, const T& value_) {
+			using inner_t = std::remove_pointer_t<meta::unwrap_unqualified_t<T>>;
+			if constexpr (is_container_v<inner_t>) {
+				return stack::push<detail::as_table_tag<T>>(L, value_);
+			}
+			else {
+				return stack::push(L, value_);
+			}
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<nested<T>> {
+		static int push(lua_State* L, const T& nested_value) noexcept {
+			using Tu = meta::unwrap_unqualified_t<T>;
+			using inner_t = std::remove_pointer_t<Tu>;
+			if constexpr (is_container_v<inner_t>) {
+				return stack::push<detail::as_table_tag<T>>(L, nested_value, nested_tag);
+			}
+			else {
+				return stack::push<Tu>(L, nested_value);
+			}
+		}
+
+		static int push(lua_State* L, const nested<T>& nested_wrapper_) noexcept {
+			using Tu = meta::unwrap_unqualified_t<T>;
+			using inner_t = std::remove_pointer_t<Tu>;
+			if constexpr (is_container_v<inner_t>) {
+				return stack::push<detail::as_table_tag<T>>(L, nested_wrapper_.value(), nested_tag);
+			}
+			else {
+				return stack::push<Tu>(L, nested_wrapper_.value());
+			}
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<std::initializer_list<T>> {
+		static int push(lua_State* L, const std::initializer_list<T>& il) noexcept {
+			unqualified_pusher<detail::as_table_tag<std::initializer_list<T>>> p {};
+			// silence annoying VC++ warning
+			(void)p;
+			return p.push(L, il);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<lua_nil_t> {
+		static int push(lua_State* L, lua_nil_t) noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushnil(L);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<stack_count> {
+		static int push(lua_State*, stack_count st) noexcept {
+			return st.count;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<metatable_key_t> {
+		static int push(lua_State* L, metatable_key_t) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushlstring(L, to_string(meta_function::metatable).c_str(), 4);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<std::remove_pointer_t<lua_CFunction>> {
+		static int push(lua_State* L, lua_CFunction func, int n = 0) noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushcclosure(L, func, n);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<lua_CFunction> {
+		static int push(lua_State* L, lua_CFunction func, int n = 0) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushcclosure(L, func, n);
+			return 1;
+		}
+	};
+
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_)
+	template <>
+	struct unqualified_pusher<std::remove_pointer_t<detail::lua_CFunction_noexcept>> {
+		static int push(lua_State* L, detail::lua_CFunction_noexcept func, int n = 0) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushcclosure(L, func, n);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<detail::lua_CFunction_noexcept> {
+		static int push(lua_State* L, detail::lua_CFunction_noexcept func, int n = 0) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushcclosure(L, func, n);
+			return 1;
+		}
+	};
+#endif // noexcept function type
+
+	template <>
+	struct unqualified_pusher<c_closure> {
+		static int push(lua_State* L, c_closure cc) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushcclosure(L, cc.c_function, cc.upvalues);
+			return 1;
+		}
+	};
+
+	template <typename Arg, typename... Args>
+	struct unqualified_pusher<closure<Arg, Args...>> {
+		template <std::size_t... I, typename T>
+		static int push(std::index_sequence<I...>, lua_State* L, T&& c) {
+			using f_tuple = decltype(std::forward<T>(c).upvalues);
+			int pushcount = multi_push(L, std::get<I>(std::forward<f_tuple>(std::forward<T>(c).upvalues))...);
+			return stack::push(L, c_closure(c.c_function, pushcount));
+		}
+
+		template <typename T>
+		static int push(lua_State* L, T&& c) {
+			return push(std::make_index_sequence<1 + sizeof...(Args)>(), L, std::forward<T>(c));
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<void*> {
+		static int push(lua_State* L, void* userdata) noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushlightuserdata(L, userdata);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<const void*> {
+		static int push(lua_State* L, const void* userdata) noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushlightuserdata(L, const_cast<void*>(userdata));
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<lightuserdata_value> {
+		static int push(lua_State* L, lightuserdata_value userdata) noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushlightuserdata(L, userdata);
+			return 1;
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<light<T>> {
+		static int push(lua_State* L, light<T> l) noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushlightuserdata(L, static_cast<void*>(l.value));
+			return 1;
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<user<T>> {
+		template <bool with_meta = true, typename Key, typename... Args>
+		static int push_with(lua_State* L, Key&& name, Args&&... args) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_userdata);
+#endif // make sure stack doesn't overflow
+       // A dumb pusher
+			T* data = detail::user_allocate<T>(L);
+			if (with_meta) {
+				// Make sure we have a plain GC set for this data
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+				luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+				if (luaL_newmetatable(L, name) != 0) {
+					lua_CFunction cdel = detail::user_alloc_destroy<T>;
+					lua_pushcclosure(L, cdel, 0);
+					lua_setfield(L, -2, "__gc");
+				}
+				lua_setmetatable(L, -2);
+			}
+			std::allocator<T> alloc {};
+			std::allocator_traits<std::allocator<T>>::construct(alloc, data, std::forward<Args>(args)...);
+			return 1;
+		}
+
+		template <typename Arg, typename... Args>
+		static int push(lua_State* L, Arg&& arg, Args&&... args) {
+			if constexpr (std::is_same_v<meta::unqualified_t<Arg>, metatable_key_t>) {
+				const auto name = &arg[0];
+				return push_with<true>(L, name, std::forward<Args>(args)...);
+			}
+			else if constexpr (std::is_same_v<meta::unqualified_t<Arg>, no_metatable_t>) {
+				(void)arg;
+				const auto name = &usertype_traits<meta::unqualified_t<T>>::user_gc_metatable()[0];
+				return push_with<false>(L, name, std::forward<Args>(args)...);
+			}
+			else {
+				const auto name = &usertype_traits<meta::unqualified_t<T>>::user_gc_metatable()[0];
+				return push_with(L, name, std::forward<Arg>(arg), std::forward<Args>(args)...);
+			}
+		}
+
+		static int push(lua_State* L, const user<T>& u) {
+			const auto name = &usertype_traits<meta::unqualified_t<T>>::user_gc_metatable()[0];
+			return push_with(L, name, u.value);
+		}
+
+		static int push(lua_State* L, user<T>&& u) {
+			const auto name = &usertype_traits<meta::unqualified_t<T>>::user_gc_metatable()[0];
+			return push_with(L, name, std::move(u.value()));
+		}
+
+		static int push(lua_State* L, no_metatable_t, const user<T>& u) {
+			const auto name = &usertype_traits<meta::unqualified_t<T>>::user_gc_metatable()[0];
+			return push_with<false>(L, name, u.value());
+		}
+
+		static int push(lua_State* L, no_metatable_t, user<T>&& u) {
+			const auto name = &usertype_traits<meta::unqualified_t<T>>::user_gc_metatable()[0];
+			return push_with<false>(L, name, std::move(u.value()));
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<userdata_value> {
+		static int push(lua_State* L, userdata_value data) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_userdata);
+#endif // make sure stack doesn't overflow
+			void** ud = detail::usertype_allocate_pointer<void>(L);
+			*ud = data.value();
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<const char*> {
+		static int push_sized(lua_State* L, const char* str, std::size_t len) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
+#endif // make sure stack doesn't overflow
+			lua_pushlstring(L, str, len);
+			return 1;
+		}
+
+		static int push(lua_State* L, const char* str) {
+			if (str == nullptr)
+				return stack::push(L, lua_nil);
+			return push_sized(L, str, std::char_traits<char>::length(str));
+		}
+
+		static int push(lua_State* L, const char* strb, const char* stre) {
+			return push_sized(L, strb, static_cast<std::size_t>(stre - strb));
+		}
+
+		static int push(lua_State* L, const char* str, std::size_t len) {
+			return push_sized(L, str, len);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<char*> {
+		static int push_sized(lua_State* L, const char* str, std::size_t len) {
+			unqualified_pusher<const char*> p {};
+			(void)p;
+			return p.push_sized(L, str, len);
+		}
+
+		static int push(lua_State* L, const char* str) {
+			unqualified_pusher<const char*> p {};
+			(void)p;
+			return p.push(L, str);
+		}
+
+		static int push(lua_State* L, const char* strb, const char* stre) {
+			unqualified_pusher<const char*> p {};
+			(void)p;
+			return p.push(L, strb, stre);
+		}
+
+		static int push(lua_State* L, const char* str, std::size_t len) {
+			unqualified_pusher<const char*> p {};
+			(void)p;
+			return p.push(L, str, len);
+		}
+	};
+
+	template <size_t N>
+	struct unqualified_pusher<char[N]> {
+		static int push(lua_State* L, const char (&str)[N]) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
+#endif // make sure stack doesn't overflow
+			lua_pushlstring(L, str, std::char_traits<char>::length(str));
+			return 1;
+		}
+
+		static int push(lua_State* L, const char (&str)[N], std::size_t sz) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
+#endif // make sure stack doesn't overflow
+			lua_pushlstring(L, str, sz);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<char> {
+		static int push(lua_State* L, char c) {
+			const char str[2] = { c, '\0' };
+			return stack::push(L, static_cast<const char*>(str), 1u);
+		}
+	};
+
+#if SOL_IS_ON(SOL_CHAR8_T_I_)
+	template <>
+	struct unqualified_pusher<const char8_t*> {
+		static int push_sized(lua_State* L, const char8_t* str, std::size_t len) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
+#endif // make sure stack doesn't overflow
+			lua_pushlstring(L, reinterpret_cast<const char*>(str), len);
+			return 1;
+		}
+
+		static int push(lua_State* L, const char8_t* str) {
+			if (str == nullptr)
+				return stack::push(L, lua_nil);
+			return push_sized(L, str, std::char_traits<char>::length(reinterpret_cast<const char*>(str)));
+		}
+
+		static int push(lua_State* L, const char8_t* strb, const char8_t* stre) {
+			return push_sized(L, strb, static_cast<std::size_t>(stre - strb));
+		}
+
+		static int push(lua_State* L, const char8_t* str, std::size_t len) {
+			return push_sized(L, str, len);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<char8_t*> {
+		static int push_sized(lua_State* L, const char8_t* str, std::size_t len) {
+			unqualified_pusher<const char8_t*> p {};
+			(void)p;
+			return p.push_sized(L, str, len);
+		}
+
+		static int push(lua_State* L, const char8_t* str) {
+			unqualified_pusher<const char8_t*> p {};
+			(void)p;
+			return p.push(L, str);
+		}
+
+		static int push(lua_State* L, const char8_t* strb, const char8_t* stre) {
+			unqualified_pusher<const char8_t*> p {};
+			(void)p;
+			return p.push(L, strb, stre);
+		}
+
+		static int push(lua_State* L, const char8_t* str, std::size_t len) {
+			unqualified_pusher<const char8_t*> p {};
+			(void)p;
+			return p.push(L, str, len);
+		}
+	};
+
+	template <size_t N>
+	struct unqualified_pusher<char8_t[N]> {
+		static int push(lua_State* L, const char8_t (&str)[N]) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
+#endif // make sure stack doesn't overflow
+			const char* str_as_char = reinterpret_cast<const char*>(static_cast<const char8_t*>(str));
+			lua_pushlstring(L, str_as_char, std::char_traits<char>::length(str_as_char));
+			return 1;
+		}
+
+		static int push(lua_State* L, const char8_t (&str)[N], std::size_t sz) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
+#endif // make sure stack doesn't overflow
+			lua_pushlstring(L, str, sz);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<char8_t> {
+		static int push(lua_State* L, char8_t c) {
+			const char8_t str[2] = { c, '\0' };
+			return stack::push(L, static_cast<const char8_t*>(str), 1u);
+		}
+	};
+#endif // char8_t
+
+
+	template <typename Ch, typename Traits, typename Al>
+	struct unqualified_pusher<std::basic_string<Ch, Traits, Al>> {
+		static int push(lua_State* L, const std::basic_string<Ch, Traits, Al>& str) {
+			if constexpr (!std::is_same_v<Ch, char>) {
+				return stack::push(L, str.data(), str.size());
+			}
+			else {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+				luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
+#endif // make sure stack doesn't overflow
+				lua_pushlstring(L, str.c_str(), str.size());
+				return 1;
+			}
+		}
+
+		static int push(lua_State* L, const std::basic_string<Ch, Traits, Al>& str, std::size_t sz) {
+			if constexpr (!std::is_same_v<Ch, char>) {
+				return stack::push(L, str.data(), sz);
+			}
+			else {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+				luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
+#endif // make sure stack doesn't overflow
+				lua_pushlstring(L, str.c_str(), sz);
+				return 1;
+			}
+		}
+	};
+
+	template <typename Ch, typename Traits>
+	struct unqualified_pusher<basic_string_view<Ch, Traits>> {
+		static int push(lua_State* L, const basic_string_view<Ch, Traits>& sv) {
+			return stack::push(L, sv.data(), sv.length());
+		}
+
+		static int push(lua_State* L, const basic_string_view<Ch, Traits>& sv, std::size_t n) {
+			return stack::push(L, sv.data(), n);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<meta_function> {
+		static int push(lua_State* L, meta_function m) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_meta_function_name);
+#endif // make sure stack doesn't overflow
+			const std::string& str = to_string(m);
+			lua_pushlstring(L, str.c_str(), str.size());
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<absolute_index> {
+		static int push(lua_State* L, absolute_index ai) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushvalue(L, ai);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<raw_index> {
+		static int push(lua_State* L, raw_index ri) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushvalue(L, ri);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<ref_index> {
+		static int push(lua_State* L, ref_index ri) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_rawgeti(L, LUA_REGISTRYINDEX, ri);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<const wchar_t*> {
+		static int push(lua_State* L, const wchar_t* wstr) {
+			return push(L, wstr, std::char_traits<wchar_t>::length(wstr));
+		}
+
+		static int push(lua_State* L, const wchar_t* wstr, std::size_t sz) {
+			return push(L, wstr, wstr + sz);
+		}
+
+		static int push(lua_State* L, const wchar_t* strb, const wchar_t* stre) {
+			if constexpr (sizeof(wchar_t) == 2) {
+				const char16_t* sb = reinterpret_cast<const char16_t*>(strb);
+				const char16_t* se = reinterpret_cast<const char16_t*>(stre);
+				return stack::push(L, sb, se);
+			}
+			else {
+				const char32_t* sb = reinterpret_cast<const char32_t*>(strb);
+				const char32_t* se = reinterpret_cast<const char32_t*>(stre);
+				return stack::push(L, sb, se);
+			}
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<wchar_t*> {
+		static int push(lua_State* L, const wchar_t* str) {
+			unqualified_pusher<const wchar_t*> p {};
+			(void)p;
+			return p.push(L, str);
+		}
+
+		static int push(lua_State* L, const wchar_t* strb, const wchar_t* stre) {
+			unqualified_pusher<const wchar_t*> p {};
+			(void)p;
+			return p.push(L, strb, stre);
+		}
+
+		static int push(lua_State* L, const wchar_t* str, std::size_t len) {
+			unqualified_pusher<const wchar_t*> p {};
+			(void)p;
+			return p.push(L, str, len);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<const char16_t*> {
+		static int convert_into(lua_State* L, char* start, std::size_t, const char16_t* strb, const char16_t* stre) {
+			char* target = start;
+			char32_t cp = 0;
+			for (const char16_t* strtarget = strb; strtarget < stre;) {
+				auto dr = unicode::utf16_to_code_point(strtarget, stre);
+				if (dr.error != unicode::error_code::ok) {
+					cp = unicode::unicode_detail::replacement;
+				}
+				else {
+					cp = dr.codepoint;
+				}
+				auto er = unicode::code_point_to_utf8(cp);
+				const char* utf8data = er.code_units.data();
+				std::memcpy(target, utf8data, er.code_units_size);
+				target += er.code_units_size;
+				strtarget = dr.next;
+			}
+
+			return stack::push(L, start, target);
+		}
+
+		static int push(lua_State* L, const char16_t* u16str) {
+			return push(L, u16str, std::char_traits<char16_t>::length(u16str));
+		}
+
+		static int push(lua_State* L, const char16_t* u16str, std::size_t sz) {
+			return push(L, u16str, u16str + sz);
+		}
+
+		static int push(lua_State* L, const char16_t* strb, const char16_t* stre) {
+			char sbo[SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_];
+			// if our max string space is small enough, use SBO
+			// right off the bat
+			std::size_t max_possible_code_units = static_cast<std::size_t>(static_cast<std::size_t>(stre - strb) * static_cast<std::size_t>(4));
+			if (max_possible_code_units <= SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_) {
+				return convert_into(L, sbo, max_possible_code_units, strb, stre);
+			}
+			// otherwise, we must manually count/check size
+			std::size_t needed_size = 0;
+			for (const char16_t* strtarget = strb; strtarget < stre;) {
+				auto dr = unicode::utf16_to_code_point(strtarget, stre);
+				auto er = unicode::code_point_to_utf8(dr.codepoint);
+				needed_size += er.code_units_size;
+				strtarget = dr.next;
+			}
+			if (needed_size < SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_) {
+				return convert_into(L, sbo, needed_size, strb, stre);
+			}
+			std::string u8str("", 0);
+			u8str.resize(needed_size);
+			char* target = const_cast<char*>(u8str.data());
+			return convert_into(L, target, needed_size, strb, stre);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<char16_t*> {
+		static int push(lua_State* L, const char16_t* str) {
+			unqualified_pusher<const char16_t*> p {};
+			(void)p;
+			return p.push(L, str);
+		}
+
+		static int push(lua_State* L, const char16_t* strb, const char16_t* stre) {
+			unqualified_pusher<const char16_t*> p {};
+			(void)p;
+			return p.push(L, strb, stre);
+		}
+
+		static int push(lua_State* L, const char16_t* str, std::size_t len) {
+			unqualified_pusher<const char16_t*> p {};
+			(void)p;
+			return p.push(L, str, len);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<const char32_t*> {
+		static int convert_into(lua_State* L, char* start, std::size_t, const char32_t* strb, const char32_t* stre) {
+			char* target = start;
+			char32_t cp = 0;
+			for (const char32_t* strtarget = strb; strtarget < stre;) {
+				auto dr = unicode::utf32_to_code_point(strtarget, stre);
+				if (dr.error != unicode::error_code::ok) {
+					cp = unicode::unicode_detail::replacement;
+				}
+				else {
+					cp = dr.codepoint;
+				}
+				auto er = unicode::code_point_to_utf8(cp);
+				const char* data = er.code_units.data();
+				std::memcpy(target, data, er.code_units_size);
+				target += er.code_units_size;
+				strtarget = dr.next;
+			}
+			return stack::push(L, start, target);
+		}
+
+		static int push(lua_State* L, const char32_t* u32str) {
+			return push(L, u32str, u32str + std::char_traits<char32_t>::length(u32str));
+		}
+
+		static int push(lua_State* L, const char32_t* u32str, std::size_t sz) {
+			return push(L, u32str, u32str + sz);
+		}
+
+		static int push(lua_State* L, const char32_t* strb, const char32_t* stre) {
+			char sbo[SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_];
+			// if our max string space is small enough, use SBO
+			// right off the bat
+			std::size_t max_possible_code_units = static_cast<std::size_t>(static_cast<std::size_t>(stre - strb) * static_cast<std::size_t>(4));
+			if (max_possible_code_units <= SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_) {
+				return convert_into(L, sbo, max_possible_code_units, strb, stre);
+			}
+			// otherwise, we must manually count/check size
+			std::size_t needed_size = 0;
+			for (const char32_t* strtarget = strb; strtarget < stre;) {
+				auto dr = unicode::utf32_to_code_point(strtarget, stre);
+				auto er = unicode::code_point_to_utf8(dr.codepoint);
+				needed_size += er.code_units_size;
+				strtarget = dr.next;
+			}
+			if (needed_size < SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_) {
+				return convert_into(L, sbo, needed_size, strb, stre);
+			}
+			std::string u8str("", 0);
+			u8str.resize(needed_size);
+			char* target = const_cast<char*>(u8str.data());
+			return convert_into(L, target, needed_size, strb, stre);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<char32_t*> {
+		static int push(lua_State* L, const char32_t* str) {
+			unqualified_pusher<const char32_t*> p {};
+			(void)p;
+			return p.push(L, str);
+		}
+
+		static int push(lua_State* L, const char32_t* strb, const char32_t* stre) {
+			unqualified_pusher<const char32_t*> p {};
+			(void)p;
+			return p.push(L, strb, stre);
+		}
+
+		static int push(lua_State* L, const char32_t* str, std::size_t len) {
+			unqualified_pusher<const char32_t*> p {};
+			(void)p;
+			return p.push(L, str, len);
+		}
+	};
+
+	template <size_t N>
+	struct unqualified_pusher<wchar_t[N]> {
+		static int push(lua_State* L, const wchar_t (&str)[N]) {
+			return push(L, str, std::char_traits<wchar_t>::length(str));
+		}
+
+		static int push(lua_State* L, const wchar_t (&str)[N], std::size_t sz) {
+			const wchar_t* str_ptr = static_cast<const wchar_t*>(str);
+			return stack::push<const wchar_t*>(L, str_ptr, str_ptr + sz);
+		}
+	};
+
+	template <size_t N>
+	struct unqualified_pusher<char16_t[N]> {
+		static int push(lua_State* L, const char16_t (&str)[N]) {
+			return push(L, str, std::char_traits<char16_t>::length(str));
+		}
+
+		static int push(lua_State* L, const char16_t (&str)[N], std::size_t sz) {
+			const char16_t* str_ptr = static_cast<const char16_t*>(str);
+			return stack::push<const char16_t*>(L, str_ptr, str_ptr + sz);
+		}
+	};
+
+	template <size_t N>
+	struct unqualified_pusher<char32_t[N]> {
+		static int push(lua_State* L, const char32_t (&str)[N]) {
+			return push(L, str, std::char_traits<char32_t>::length(str));
+		}
+
+		static int push(lua_State* L, const char32_t (&str)[N], std::size_t sz) {
+			const char32_t* str_ptr = static_cast<const char32_t*>(str);
+			return stack::push<const char32_t*>(L, str_ptr, str_ptr + sz);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<wchar_t> {
+		static int push(lua_State* L, wchar_t c) {
+			const wchar_t str[2] = { c, '\0' };
+			return stack::push(L, static_cast<const wchar_t*>(str), 1u);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<char16_t> {
+		static int push(lua_State* L, char16_t c) {
+			const char16_t str[2] = { c, '\0' };
+			return stack::push(L, static_cast<const char16_t*>(str), 1u);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<char32_t> {
+		static int push(lua_State* L, char32_t c) {
+			const char32_t str[2] = { c, '\0' };
+			return stack::push(L, static_cast<const char32_t*>(str), 1u);
+		}
+	};
+
+	template <typename... Args>
+	struct unqualified_pusher<std::tuple<Args...>> {
+		template <std::size_t... I, typename T>
+		static int push(std::index_sequence<I...>, lua_State* L, T&& t) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L, static_cast<int>(sizeof...(I)), detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			int pushcount = 0;
+			(void)detail::swallow { 0, (pushcount += stack::push(L, std::get<I>(std::forward<T>(t))), 0)... };
+			return pushcount;
+		}
+
+		template <typename T>
+		static int push(lua_State* L, T&& t) {
+			return push(std::index_sequence_for<Args...>(), L, std::forward<T>(t));
+		}
+	};
+
+	template <typename A, typename B>
+	struct unqualified_pusher<std::pair<A, B>> {
+		template <typename T>
+		static int push(lua_State* L, T&& t) {
+			int pushcount = stack::push(L, std::get<0>(std::forward<T>(t)));
+			pushcount += stack::push(L, std::get<1>(std::forward<T>(t)));
+			return pushcount;
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<T, std::enable_if_t<meta::is_optional_v<T>>> {
+		using ValueType = typename meta::unqualified_t<T>::value_type;
+
+		template <typename Optional>
+		static int push(lua_State* L, Optional&& op) {
+			using QualifiedValueType = meta::conditional_t<std::is_lvalue_reference_v<Optional>, ValueType&, ValueType&&>;
+			if (!op) {
+				return stack::push(L, nullopt);
+			}
+			return stack::push(L, static_cast<QualifiedValueType>(op.value()));
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<forward_as_value_t<T>> {
+		static int push(lua_State* L, const forward_as_value_t<T>& value_) {
+			return stack::push<T>(L, value_.value());
+		}
+
+		static int push(lua_State* L, forward_as_value_t<T>&& value_) {
+			return stack::push<T>(L, std::move(value_).value());
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<nullopt_t> {
+		static int push(lua_State* L, nullopt_t) noexcept {
+			return stack::push(L, lua_nil);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<std::nullptr_t> {
+		static int push(lua_State* L, std::nullptr_t) noexcept {
+			return stack::push(L, lua_nil);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<this_state> {
+		static int push(lua_State*, const this_state&) noexcept {
+			return 0;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<this_main_state> {
+		static int push(lua_State*, const this_main_state&) noexcept {
+			return 0;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<new_table> {
+		static int push(lua_State* L, const new_table& nt) {
+			lua_createtable(L, nt.sequence_hint, nt.map_hint);
+			return 1;
+		}
+	};
+
+	template <typename Allocator>
+	struct unqualified_pusher<basic_bytecode<Allocator>> {
+		template <typename T>
+		static int push(lua_State* L, T&& bc, const char* bytecode_name) {
+			const auto first = bc.data();
+			const auto bcsize = bc.size();
+			// pushes either the function, or an error
+			// if it errors, shit goes south, and people can test that upstream
+			(void)luaL_loadbuffer(
+				L, reinterpret_cast<const char*>(first), static_cast<std::size_t>(bcsize * (sizeof(*first) / sizeof(const char))), bytecode_name);
+			return 1;
+		}
+
+		template <typename T>
+		static int push(lua_State* L, T&& bc) {
+			return push(L, std::forward<bc>(bc), "bytecode");
+		}
+	};
+
+#if SOL_IS_ON(SOL_STD_VARIANT_I_)
+	namespace stack_detail {
+
+		struct push_function {
+			lua_State* L;
+
+			push_function(lua_State* L_) noexcept : L(L_) {
+			}
+
+			template <typename T>
+			int operator()(T&& value) const {
+				return stack::push<T>(L, std::forward<T>(value));
+			}
+		};
+
+	} // namespace stack_detail
+
+	template <typename... Tn>
+	struct unqualified_pusher<std::variant<Tn...>> {
+		static int push(lua_State* L, const std::variant<Tn...>& v) {
+			return std::visit(stack_detail::push_function(L), v);
+		}
+
+		static int push(lua_State* L, std::variant<Tn...>&& v) {
+			return std::visit(stack_detail::push_function(L), std::move(v));
+		}
+	};
+#endif // Variant because Clang is terrible
+
+}} // namespace sol::stack
+
+#endif // SOL_STACK_PUSH_HPP
diff --git a/extern/sol3/sol/stack_reference.hpp b/extern/sol3/sol/stack_reference.hpp
new file mode 100644
index 0000000000..18b987d6a0
--- /dev/null
+++ b/extern/sol3/sol/stack_reference.hpp
@@ -0,0 +1,314 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_STACK_REFERENCE_HPP
+#define SOL_STACK_REFERENCE_HPP
+
+#include <sol/types.hpp>
+
+namespace sol {
+	namespace detail {
+		inline bool xmovable(lua_State* leftL, lua_State* rightL) {
+			if (rightL == nullptr || leftL == nullptr || leftL == rightL) {
+				return false;
+			}
+			const void* leftregistry = lua_topointer(leftL, LUA_REGISTRYINDEX);
+			const void* rightregistry = lua_topointer(rightL, LUA_REGISTRYINDEX);
+			return leftregistry == rightregistry;
+		}
+	} // namespace detail
+
+	class stateless_stack_reference {
+	private:
+		friend class stack_reference;
+
+		int m_index = 0;
+
+		int registry_index() const noexcept {
+			return LUA_NOREF;
+		}
+
+	public:
+		stateless_stack_reference() noexcept = default;
+		stateless_stack_reference(lua_nil_t) noexcept : stateless_stack_reference() {};
+		stateless_stack_reference(lua_State* L_, int index_) noexcept : stateless_stack_reference(absolute_index(L_, index_)) {
+		}
+		stateless_stack_reference(lua_State*, absolute_index index_) noexcept : stateless_stack_reference(index_) {
+		}
+		stateless_stack_reference(lua_State*, raw_index index_) noexcept : stateless_stack_reference(index_) {
+		}
+		stateless_stack_reference(absolute_index index_) noexcept : m_index(index_) {
+		}
+		stateless_stack_reference(raw_index index_) noexcept : m_index(index_) {
+		}
+		stateless_stack_reference(lua_State*, ref_index) noexcept = delete;
+		stateless_stack_reference(ref_index) noexcept = delete;
+		stateless_stack_reference(const reference&) noexcept = delete;
+		stateless_stack_reference(const stateless_stack_reference&) noexcept = default;
+		stateless_stack_reference(stateless_stack_reference&& o) noexcept = default;
+		stateless_stack_reference& operator=(stateless_stack_reference&&) noexcept = default;
+		stateless_stack_reference& operator=(const stateless_stack_reference&) noexcept = default;
+
+		int push(lua_State* L_) const noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+			luaL_checkstack(L_, 1, "not enough Lua stack space to push a single reference value");
+#endif // make sure stack doesn't overflow
+			lua_pushvalue(L_, m_index);
+			return 1;
+		}
+
+		void pop(lua_State* L_, int pop_count = 1) const noexcept {
+			lua_pop(L_, pop_count);
+		}
+
+		int stack_index() const noexcept {
+			return m_index;
+		}
+
+		const void* pointer(lua_State* L_) const noexcept {
+			const void* pointer_id = lua_topointer(L_, stack_index());
+			return pointer_id;
+		}
+
+		type get_type(lua_State* L_) const noexcept {
+			int untyped_value = lua_type(L_, stack_index());
+			return static_cast<type>(untyped_value);
+		}
+
+		bool valid(lua_State* L) const noexcept {
+			type t = get_type(L);
+			return t != type::lua_nil && t != type::none;
+		}
+
+		void reset(lua_State*) noexcept {
+			m_index = 0;
+		}
+
+		void reset(lua_State* L_, int index_) noexcept {
+			m_index = absolute_index(L_, index_);
+		}
+
+		void abandon(lua_State* = nullptr) noexcept {
+			m_index = 0;
+		}
+
+		stateless_stack_reference copy(lua_State* L_) const noexcept {
+			return stateless_stack_reference(L_, raw_index(m_index));
+		}
+
+		void copy_assign(lua_State*, const stateless_stack_reference& right) noexcept {
+			m_index = right.m_index;
+		}
+
+		bool equals(lua_State* L_, const stateless_stack_reference& r) const noexcept {
+			return lua_compare(L_, this->stack_index(), r.stack_index(), LUA_OPEQ) == 1;
+		}
+
+		bool equals(lua_State* L_, lua_nil_t) const noexcept {
+			return valid(L_);
+		}
+	};
+
+	class stack_reference : public stateless_stack_reference {
+	private:
+		lua_State* luastate = nullptr;
+
+	public:
+		stack_reference() noexcept = default;
+		stack_reference(lua_nil_t) noexcept : stack_reference() {};
+		stack_reference(lua_State* L, lua_nil_t) noexcept : stateless_stack_reference(L, 0), luastate(L) {
+		}
+		stack_reference(lua_State* L, int i) noexcept : stateless_stack_reference(L, i), luastate(L) {
+		}
+		stack_reference(lua_State* L, absolute_index i) noexcept : stateless_stack_reference(L, i), luastate(L) {
+		}
+		stack_reference(lua_State* L, raw_index i) noexcept : stateless_stack_reference(L, i), luastate(L) {
+		}
+		stack_reference(lua_State* L, ref_index i) noexcept = delete;
+		stack_reference(lua_State* L, const reference& r) noexcept = delete;
+		stack_reference(lua_State* L, const stack_reference& r) noexcept : luastate(L) {
+			if (!r.valid()) {
+				m_index = 0;
+				return;
+			}
+			int i = r.stack_index();
+			if (detail::xmovable(lua_state(), r.lua_state())) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK_I_)
+				luaL_checkstack(L, 1, "not enough Lua stack space to push a single reference value");
+#endif // make sure stack doesn't overflow
+				lua_pushvalue(r.lua_state(), r.stack_index());
+				lua_xmove(r.lua_state(), luastate, 1);
+				i = absolute_index(luastate, -1);
+			}
+			m_index = i;
+		}
+		stack_reference(stack_reference&& o) noexcept = default;
+		stack_reference& operator=(stack_reference&&) noexcept = default;
+		stack_reference(const stack_reference&) noexcept = default;
+		stack_reference& operator=(const stack_reference&) noexcept = default;
+
+		int push() const noexcept {
+			return push(lua_state());
+		}
+
+		int push(lua_State* L_) const noexcept {
+			return stateless_stack_reference::push(L_);
+		}
+
+		void pop() const noexcept {
+			pop(lua_state());
+		}
+
+		void pop(lua_State* L_, int pop_count_ = 1) const noexcept {
+			stateless_stack_reference::pop(L_, pop_count_);
+		}
+
+		const void* pointer() const noexcept {
+			return stateless_stack_reference::pointer(lua_state());
+		}
+
+		type get_type() const noexcept {
+			return stateless_stack_reference::get_type(lua_state());
+		}
+
+		lua_State* lua_state() const noexcept {
+			return luastate;
+		}
+
+		bool valid() const noexcept {
+			return stateless_stack_reference::valid(lua_state());
+		}
+
+		void abandon() {
+			stateless_stack_reference::abandon(lua_state());
+		}
+	};
+
+	inline bool operator==(const stack_reference& l, const stack_reference& r) {
+		return lua_compare(l.lua_state(), l.stack_index(), r.stack_index(), LUA_OPEQ) == 1;
+	}
+
+	inline bool operator!=(const stack_reference& l, const stack_reference& r) {
+		return !operator==(l, r);
+	}
+
+	inline bool operator==(const stack_reference& lhs, const lua_nil_t&) {
+		return !lhs.valid();
+	}
+
+	inline bool operator==(const lua_nil_t&, const stack_reference& rhs) {
+		return !rhs.valid();
+	}
+
+	inline bool operator!=(const stack_reference& lhs, const lua_nil_t&) {
+		return lhs.valid();
+	}
+
+	inline bool operator!=(const lua_nil_t&, const stack_reference& rhs) {
+		return rhs.valid();
+	}
+
+	inline bool operator==(const stateless_stack_reference& l, const stateless_stack_reference& r) {
+		return l.stack_index() == r.stack_index();
+	}
+
+	inline bool operator!=(const stateless_stack_reference& l, const stateless_stack_reference& r) {
+		return l.stack_index() != r.stack_index();
+	}
+
+	struct stateless_stack_reference_equals {
+		using is_transparent = std::true_type;
+
+		stateless_stack_reference_equals(lua_State* L_) noexcept : m_L(L_) {
+		}
+
+		lua_State* lua_state() const noexcept {
+			return m_L;
+		}
+
+		bool operator()(const stateless_stack_reference& lhs, const stateless_stack_reference& rhs) const {
+			return lhs.equals(lua_state(), rhs);
+		}
+
+		bool operator()(lua_nil_t lhs, const stateless_stack_reference& rhs) const {
+			return rhs.equals(lua_state(), lhs);
+		}
+
+		bool operator()(const stateless_stack_reference& lhs, lua_nil_t rhs) const {
+			return lhs.equals(lua_state(), rhs);
+		}
+
+	private:
+		lua_State* m_L;
+	};
+
+	struct stack_reference_equals {
+		using is_transparent = std::true_type;
+
+		bool operator()(const lua_nil_t& lhs, const stack_reference& rhs) const {
+			return lhs == rhs;
+		}
+
+		bool operator()(const stack_reference& lhs, const lua_nil_t& rhs) const {
+			return lhs == rhs;
+		}
+
+		bool operator()(const stack_reference& lhs, const stack_reference& rhs) const {
+			return lhs == rhs;
+		}
+	};
+
+	struct stateless_stack_reference_hash {
+		using argument_type = stateless_stack_reference;
+		using result_type = std::size_t;
+		using is_transparent = std::true_type;
+
+		stateless_stack_reference_hash(lua_State* L_) noexcept : m_L(L_) {
+		}
+
+		lua_State* lua_state() const noexcept {
+			return m_L;
+		}
+
+		result_type operator()(const argument_type& lhs) const noexcept {
+			std::hash<const void*> h;
+			return h(lhs.pointer(lua_state()));
+		}
+
+	private:
+		lua_State* m_L;
+	};
+
+	struct stack_reference_hash {
+		using argument_type = stack_reference;
+		using result_type = std::size_t;
+		using is_transparent = std::true_type;
+
+		result_type operator()(const argument_type& lhs) const noexcept {
+			std::hash<const void*> h;
+			return h(lhs.pointer());
+		}
+	};
+} // namespace sol
+
+#endif // SOL_STACK_REFERENCE_HPP
diff --git a/extern/sol3/sol/state.hpp b/extern/sol3/sol/state.hpp
new file mode 100644
index 0000000000..1f0f0bc418
--- /dev/null
+++ b/extern/sol3/sol/state.hpp
@@ -0,0 +1,62 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_STATE_HPP
+#define SOL_STATE_HPP
+
+#include <sol/state_view.hpp>
+#include <sol/thread.hpp>
+
+namespace sol {
+
+	class state : private std::unique_ptr<lua_State, detail::state_deleter>, public state_view {
+	private:
+		typedef std::unique_ptr<lua_State, detail::state_deleter> unique_base;
+
+	public:
+		state(lua_CFunction panic = default_at_panic) : unique_base(luaL_newstate()), state_view(unique_base::get()) {
+			set_default_state(unique_base::get(), panic);
+		}
+
+		state(lua_CFunction panic, lua_Alloc alfunc, void* alpointer = nullptr)
+		: unique_base(lua_newstate(alfunc, alpointer)), state_view(unique_base::get()) {
+			set_default_state(unique_base::get(), panic);
+		}
+
+		state(const state&) = delete;
+		state(state&&) = default;
+		state& operator=(const state&) = delete;
+		state& operator=(state&& that) {
+			state_view::operator=(std::move(that));
+			unique_base::operator=(std::move(that));
+			return *this;
+		}
+
+		using state_view::get;
+
+		~state() {
+		}
+	};
+} // namespace sol
+
+#endif // SOL_STATE_HPP
diff --git a/extern/sol3/sol/state_handling.hpp b/extern/sol3/sol/state_handling.hpp
new file mode 100644
index 0000000000..52bfd52796
--- /dev/null
+++ b/extern/sol3/sol/state_handling.hpp
@@ -0,0 +1,194 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_STATE_DEFAULT_HPP
+#define SOL_STATE_DEFAULT_HPP
+
+#include <sol/trampoline.hpp>
+#include <sol/stack.hpp>
+#include <sol/error.hpp>
+#include <sol/function.hpp>
+#include <sol/object.hpp>
+#include <sol/lua_value.hpp>
+
+#if SOL_IS_ON(SOL_PRINT_ERRORS_I_)
+#include <iostream>
+#endif
+
+namespace sol {
+	inline void register_main_thread(lua_State* L) {
+#if SOL_LUA_VERSION_I_ < 502
+		if (L == nullptr) {
+			lua_pushnil(L);
+			lua_setglobal(L, detail::default_main_thread_name());
+			return;
+		}
+		lua_pushthread(L);
+		lua_setglobal(L, detail::default_main_thread_name());
+#else
+		(void)L;
+#endif
+	}
+
+	inline int default_at_panic(lua_State* L) {
+#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
+		(void)L;
+		return -1;
+#else
+		size_t messagesize;
+		const char* message = lua_tolstring(L, -1, &messagesize);
+		if (message) {
+			std::string err(message, messagesize);
+			lua_settop(L, 0);
+#if SOL_IS_ON(SOL_PRINT_ERRORS_I_)
+			std::cerr << "[sol2] An error occurred and panic has been invoked: ";
+			std::cerr << err;
+			std::cerr << std::endl;
+#endif
+			throw error(err);
+		}
+		lua_settop(L, 0);
+		throw error(std::string("An unexpected error occurred and panic has been invoked"));
+#endif // Printing Errors
+	}
+
+	inline int default_traceback_error_handler(lua_State* L) {
+		std::string msg = "An unknown error has triggered the default error handler";
+		optional<string_view> maybetopmsg = stack::unqualified_check_get<string_view>(L, 1, &no_panic);
+		if (maybetopmsg) {
+			const string_view& topmsg = maybetopmsg.value();
+			msg.assign(topmsg.data(), topmsg.size());
+		}
+		luaL_traceback(L, L, msg.c_str(), 1);
+		optional<string_view> maybetraceback = stack::unqualified_check_get<string_view>(L, -1, &no_panic);
+		if (maybetraceback) {
+			const string_view& traceback = maybetraceback.value();
+			msg.assign(traceback.data(), traceback.size());
+		}
+#if SOL_IS_ON(SOL_PRINT_ERRORS_I_)
+		// std::cerr << "[sol2] An error occurred and was caught in traceback: ";
+		// std::cerr << msg;
+		// std::cerr << std::endl;
+#endif // Printing
+		return stack::push(L, msg);
+	}
+
+	inline void set_default_state(lua_State* L, lua_CFunction panic_function = &default_at_panic,
+	     lua_CFunction traceback_function = c_call<decltype(&default_traceback_error_handler), &default_traceback_error_handler>,
+	     exception_handler_function exf = detail::default_exception_handler) {
+		lua_atpanic(L, panic_function);
+		protected_function::set_default_handler(object(L, in_place, traceback_function));
+		set_default_exception_handler(L, exf);
+		register_main_thread(L);
+		stack::luajit_exception_handler(L);
+		lua_value::set_lua_state(L);
+	}
+
+	inline std::size_t total_memory_used(lua_State* L) {
+		std::size_t kb = static_cast<std::size_t>(lua_gc(L, LUA_GCCOUNT, 0));
+		kb *= 1024;
+		kb += static_cast<std::size_t>(lua_gc(L, LUA_GCCOUNTB, 0));
+		return kb;
+	}
+
+	inline protected_function_result script_pass_on_error(lua_State*, protected_function_result result) {
+		return result;
+	}
+
+	inline protected_function_result script_throw_on_error(lua_State* L, protected_function_result result) {
+		type t = type_of(L, result.stack_index());
+		std::string err = "sol: ";
+		err += to_string(result.status());
+		err += " error";
+#if SOL_IS_ON(SOL_EXCEPTIONS_I_)
+		std::exception_ptr eptr = std::current_exception();
+		if (eptr) {
+			err += " with a ";
+			try {
+				std::rethrow_exception(eptr);
+			}
+			catch (const std::exception& ex) {
+				err += "std::exception -- ";
+				err.append(ex.what());
+			}
+			catch (const std::string& message) {
+				err += "thrown message -- ";
+				err.append(message);
+			}
+			catch (const char* message) {
+				err += "thrown message -- ";
+				err.append(message);
+			}
+			catch (...) {
+				err.append("thrown but unknown type, cannot serialize into error message");
+			}
+		}
+#endif // serialize exception information if possible
+		if (t == type::string) {
+			err += ": ";
+			string_view serr = stack::unqualified_get<string_view>(L, result.stack_index());
+			err.append(serr.data(), serr.size());
+		}
+#if SOL_IS_ON(SOL_PRINT_ERRORS_I_)
+		std::cerr << "[sol2] An error occurred and has been passed to an error handler: ";
+		std::cerr << err;
+		std::cerr << std::endl;
+#endif
+		// replacing information of stack error into pfr
+		int target = result.stack_index();
+		if (result.pop_count() > 0) {
+			stack::remove(L, target, result.pop_count());
+		}
+		stack::push(L, err);
+		int top = lua_gettop(L);
+		int towards = top - target;
+		if (towards != 0) {
+			lua_rotate(L, top, towards);
+		}
+#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
+		return result;
+#else
+		// just throw our error
+		throw error(detail::direct_error, err);
+#endif // If exceptions are allowed
+	}
+
+	inline protected_function_result script_default_on_error(lua_State* L, protected_function_result pfr) {
+#if SOL_IS_ON(SOL_DEFAULT_PASS_ON_ERROR_I_)
+		return script_pass_on_error(L, std::move(pfr));
+#else
+		return script_throw_on_error(L, std::move(pfr));
+#endif
+	}
+
+	namespace stack {
+		inline error get_traceback_or_errors(lua_State* L) {
+			int p = default_traceback_error_handler(L);
+			sol::error err = stack::get<sol::error>(L, -p);
+			lua_pop(L, p);
+			return err;
+		}
+	} // namespace stack
+} // namespace sol
+
+#endif // SOL_STATE_DEFAULT_HPP
diff --git a/extern/sol3/sol/state_view.hpp b/extern/sol3/sol/state_view.hpp
new file mode 100644
index 0000000000..6cbcf1188f
--- /dev/null
+++ b/extern/sol3/sol/state_view.hpp
@@ -0,0 +1,874 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_STATE_VIEW_HPP
+#define SOL_STATE_VIEW_HPP
+
+#include <sol/error.hpp>
+#include <sol/table.hpp>
+#include <sol/environment.hpp>
+#include <sol/load_result.hpp>
+#include <sol/state_handling.hpp>
+
+#include <memory>
+#include <cstddef>
+
+namespace sol {
+
+	class state_view {
+	private:
+		lua_State* L;
+		table reg;
+		global_table global;
+
+		optional<object> is_loaded_package(const std::string& key) {
+			auto loaded = reg.traverse_get<optional<object>>("_LOADED", key);
+			bool is53mod = loaded && !(loaded->is<bool>() && !loaded->as<bool>());
+			if (is53mod)
+				return loaded;
+#if SOL_LUA_VERSION_I_ <= 501
+			auto loaded51 = global.traverse_get<optional<object>>("package", "loaded", key);
+			bool is51mod = loaded51 && !(loaded51->is<bool>() && !loaded51->as<bool>());
+			if (is51mod)
+				return loaded51;
+#endif
+			return nullopt;
+		}
+
+		template <typename T>
+		void ensure_package(const std::string& key, T&& sr) {
+#if SOL_LUA_VERSION_I_ <= 501
+			auto pkg = global["package"];
+			if (!pkg.valid()) {
+				pkg = create_table_with("loaded", create_table_with(key, sr));
+			}
+			else {
+				auto ld = pkg["loaded"];
+				if (!ld.valid()) {
+					ld = create_table_with(key, sr);
+				}
+				else {
+					ld[key] = sr;
+				}
+			}
+#endif
+			auto loaded = reg["_LOADED"];
+			if (!loaded.valid()) {
+				loaded = create_table_with(key, sr);
+			}
+			else {
+				loaded[key] = sr;
+			}
+		}
+
+		template <typename Fx>
+		object require_core(const std::string& key, Fx&& action, bool create_global = true) {
+			optional<object> loaded = is_loaded_package(key);
+			if (loaded && loaded->valid())
+				return std::move(*loaded);
+			int before = lua_gettop(L);
+			action();
+			int after = lua_gettop(L);
+			if (before == after) {
+				// I mean, you were supposed to return
+				// something, ANYTHING, from your requires script. I guess I'll just
+				// but some trash in here, it's on you after that?
+				ensure_package(key, static_cast<void*>(L));
+				return object(L, lua_nil);
+			}
+			stack_reference sr(L, -1);
+			if (create_global)
+				set(key, sr);
+			ensure_package(key, sr);
+			return stack::pop<object>(L);
+		}
+
+	public:
+		using iterator = typename global_table::iterator;
+		using const_iterator = typename global_table::const_iterator;
+
+		state_view(lua_State* Ls) : L(Ls), reg(Ls, LUA_REGISTRYINDEX), global(Ls, global_tag) {
+		}
+
+		state_view(this_state Ls) : state_view(Ls.L) {
+		}
+
+		lua_State* lua_state() const {
+			return L;
+		}
+
+		template <typename... Args>
+		void open_libraries(Args&&... args) {
+			static_assert(meta::all_same<lib, meta::unqualified_t<Args>...>::value, "all types must be libraries");
+			if constexpr (sizeof...(args) == 0) {
+				luaL_openlibs(L);
+				return;
+			}
+			else {
+				lib libraries[1 + sizeof...(args)] = { lib::count, std::forward<Args>(args)... };
+
+				for (auto&& library : libraries) {
+					switch (library) {
+#if SOL_LUA_VERSION_I_ <= 501 && SOL_IS_ON(SOL_USE_LUAJIT_I_)
+					case lib::coroutine:
+#endif // luajit opens coroutine base stuff
+					case lib::base:
+						luaL_requiref(L, "base", luaopen_base, 1);
+						lua_pop(L, 1);
+						break;
+					case lib::package:
+						luaL_requiref(L, "package", luaopen_package, 1);
+						lua_pop(L, 1);
+						break;
+#if SOL_IS_OFF(SOL_USE_LUAJIT_I_)
+					case lib::coroutine:
+#if SOL_LUA_VERSION_I_ > 501
+						luaL_requiref(L, "coroutine", luaopen_coroutine, 1);
+						lua_pop(L, 1);
+#endif // Lua 5.2+ only
+						break;
+#endif // Not LuaJIT - comes builtin
+					case lib::string:
+						luaL_requiref(L, "string", luaopen_string, 1);
+						lua_pop(L, 1);
+						break;
+					case lib::table:
+						luaL_requiref(L, "table", luaopen_table, 1);
+						lua_pop(L, 1);
+						break;
+					case lib::math:
+						luaL_requiref(L, "math", luaopen_math, 1);
+						lua_pop(L, 1);
+						break;
+					case lib::bit32:
+#if SOL_IS_ON(SOL_USE_LUAJIT_I_)
+						luaL_requiref(L, "bit32", luaopen_bit, 1);
+						lua_pop(L, 1);
+#elif SOL_IS_ON(SOL_LUA_BIT32_LIB_I_)
+						luaL_requiref(L, "bit32", luaopen_bit32, 1);
+						lua_pop(L, 1);
+#else
+#endif
+						break;
+					case lib::io:
+						luaL_requiref(L, "io", luaopen_io, 1);
+						lua_pop(L, 1);
+						break;
+					case lib::os:
+						luaL_requiref(L, "os", luaopen_os, 1);
+						lua_pop(L, 1);
+						break;
+					case lib::debug:
+						luaL_requiref(L, "debug", luaopen_debug, 1);
+						lua_pop(L, 1);
+						break;
+					case lib::utf8:
+#if SOL_LUA_VERSION_I_ > 502 && SOL_IS_OFF(SOL_USE_LUAJIT_I_)
+						luaL_requiref(L, "utf8", luaopen_utf8, 1);
+						lua_pop(L, 1);
+#endif // Lua 5.3+ only
+						break;
+					case lib::ffi:
+#if SOL_IS_ON(SOL_USE_LUAJIT_I_) && SOL_IS_OFF(SOL_LUAJIT_FFI_DISABLED_I_)
+						luaL_requiref(L, "ffi", luaopen_ffi, 1);
+						lua_pop(L, 1);
+#endif // LuaJIT only
+						break;
+					case lib::jit:
+#if SOL_IS_ON(SOL_USE_LUAJIT_I_)
+						luaL_requiref(L, "jit", luaopen_jit, 0);
+						lua_pop(L, 1);
+#endif // LuaJIT Only
+						break;
+					case lib::count:
+					default:
+						break;
+					}
+				}
+			}
+		}
+
+		object require(const std::string& key, lua_CFunction open_function, bool create_global = true) {
+			luaL_requiref(L, key.c_str(), open_function, create_global ? 1 : 0);
+			return stack::pop<object>(L);
+		}
+
+		object require_script(const std::string& key, const string_view& code, bool create_global = true,
+		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			auto action = [this, &code, &chunkname, &mode]() { stack::script(L, code, chunkname, mode); };
+			return require_core(key, action, create_global);
+		}
+
+		object require_file(const std::string& key, const std::string& filename, bool create_global = true, load_mode mode = load_mode::any) {
+			auto action = [this, &filename, &mode]() { stack::script_file(L, filename, mode); };
+			return require_core(key, action, create_global);
+		}
+
+		void clear_package_loaders() {
+			optional<table> maybe_package = this->global["package"];
+			if (!maybe_package) {
+				// package lib wasn't opened
+				// open package lib
+				return;
+			}
+			table& package = *maybe_package;
+			// yay for version differences...
+			// one day Lua 5.1 will die a peaceful death
+			// and its old bones will find blissful rest
+			auto loaders_proxy = package
+#if SOL_LUA_VERSION_I_ < 502
+			     ["loaders"]
+#else
+			     ["searchers"]
+#endif
+			     ;
+			if (!loaders_proxy.valid()) {
+				// nothing to clear
+				return;
+			}
+			// we need to create the table for loaders
+			// table does not exist, so create and move forward
+			loaders_proxy = new_table(1, 0);
+		}
+
+		template <typename Fx>
+		void add_package_loader(Fx&& fx, bool clear_all_package_loaders = false) {
+			optional<table> maybe_package = this->global["package"];
+			if (!maybe_package) {
+				// package lib wasn't opened
+				// open package lib
+				return;
+			}
+			table& package = *maybe_package;
+			// yay for version differences...
+			// one day Lua 5.1 will die a peaceful death
+			// and its old bones will find blissful rest
+			auto loaders_proxy = package
+#if SOL_LUA_VERSION_I_ < 502
+			     ["loaders"]
+#else
+			     ["searchers"]
+#endif
+			     ;
+			bool make_new_table = clear_all_package_loaders || !loaders_proxy.valid();
+			if (make_new_table) {
+				// we need to create the table for loaders
+				// table does not exist, so create and move forward
+				loaders_proxy = new_table(1, 0);
+			}
+			optional<table> maybe_loaders = loaders_proxy;
+			if (!maybe_loaders) {
+				// loaders/searches
+				// thing exists in package, but it
+				// ain't a table or a table-alike...!
+				return;
+			}
+			table loaders = loaders_proxy;
+			loaders.add(std::forward<Fx>(fx));
+		}
+
+		template <typename E>
+		protected_function_result do_reader(lua_Reader reader, void* data, const basic_environment<E>& env,
+		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name("lua_Reader", chunkname, basechunkname);
+			load_status x = static_cast<load_status>(lua_load(L, reader, data, chunknametarget, to_string(mode).c_str()));
+			if (x != load_status::ok) {
+				return protected_function_result(L, absolute_index(L, -1), 0, 1, static_cast<call_status>(x));
+			}
+			stack_aligned_protected_function pf(L, -1);
+			set_environment(env, pf);
+			return pf();
+		}
+
+		protected_function_result do_reader(
+		     lua_Reader reader, void* data, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name("lua_Reader", chunkname, basechunkname);
+			load_status x = static_cast<load_status>(lua_load(L, reader, data, chunknametarget, to_string(mode).c_str()));
+			if (x != load_status::ok) {
+				return protected_function_result(L, absolute_index(L, -1), 0, 1, static_cast<call_status>(x));
+			}
+			stack_aligned_protected_function pf(L, -1);
+			return pf();
+		}
+
+		template <typename E>
+		protected_function_result do_string(const string_view& code, const basic_environment<E>& env,
+		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name(code, chunkname, basechunkname);
+			load_status x = static_cast<load_status>(luaL_loadbufferx(L, code.data(), code.size(), chunknametarget, to_string(mode).c_str()));
+			if (x != load_status::ok) {
+				return protected_function_result(L, absolute_index(L, -1), 0, 1, static_cast<call_status>(x));
+			}
+			stack_aligned_protected_function pf(L, -1);
+			set_environment(env, pf);
+			return pf();
+		}
+
+		protected_function_result do_string(
+		     const string_view& code, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name(code, chunkname, basechunkname);
+			load_status x = static_cast<load_status>(luaL_loadbufferx(L, code.data(), code.size(), chunknametarget, to_string(mode).c_str()));
+			if (x != load_status::ok) {
+				return protected_function_result(L, absolute_index(L, -1), 0, 1, static_cast<call_status>(x));
+			}
+			stack_aligned_protected_function pf(L, -1);
+			return pf();
+		}
+
+		template <typename E>
+		protected_function_result do_file(const std::string& filename, const basic_environment<E>& env, load_mode mode = load_mode::any) {
+			load_status x = static_cast<load_status>(luaL_loadfilex(L, filename.c_str(), to_string(mode).c_str()));
+			if (x != load_status::ok) {
+				return protected_function_result(L, absolute_index(L, -1), 0, 1, static_cast<call_status>(x));
+			}
+			stack_aligned_protected_function pf(L, -1);
+			set_environment(env, pf);
+			return pf();
+		}
+
+		protected_function_result do_file(const std::string& filename, load_mode mode = load_mode::any) {
+			load_status x = static_cast<load_status>(luaL_loadfilex(L, filename.c_str(), to_string(mode).c_str()));
+			if (x != load_status::ok) {
+				return protected_function_result(L, absolute_index(L, -1), 0, 1, static_cast<call_status>(x));
+			}
+			stack_aligned_protected_function pf(L, -1);
+			return pf();
+		}
+
+		template <typename Fx,
+		     meta::disable_any<meta::is_string_constructible<meta::unqualified_t<Fx>>,
+		          meta::is_specialization_of<meta::unqualified_t<Fx>, basic_environment>> = meta::enabler>
+		protected_function_result safe_script(
+		     lua_Reader reader, void* data, Fx&& on_error, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			protected_function_result pfr = do_reader(reader, data, chunkname, mode);
+			if (!pfr.valid()) {
+				return on_error(L, std::move(pfr));
+			}
+			return pfr;
+		}
+
+		protected_function_result safe_script(
+		     lua_Reader reader, void* data, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return safe_script(reader, data, script_default_on_error, chunkname, mode);
+		}
+
+		template <typename Fx,
+		     meta::disable_any<meta::is_string_constructible<meta::unqualified_t<Fx>>,
+		          meta::is_specialization_of<meta::unqualified_t<Fx>, basic_environment>> = meta::enabler>
+		protected_function_result safe_script(
+		     const string_view& code, Fx&& on_error, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			protected_function_result pfr = do_string(code, chunkname, mode);
+			if (!pfr.valid()) {
+				return on_error(L, std::move(pfr));
+			}
+			return pfr;
+		}
+
+		template <typename Fx, typename E>
+		protected_function_result safe_script(const string_view& code, const basic_environment<E>& env, Fx&& on_error,
+		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			protected_function_result pfr = do_string(code, env, chunkname, mode);
+			if (!pfr.valid()) {
+				return on_error(L, std::move(pfr));
+			}
+			return pfr;
+		}
+
+		template <typename E>
+		protected_function_result safe_script(const string_view& code, const basic_environment<E>& env,
+		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return safe_script(code, env, script_default_on_error, chunkname, mode);
+		}
+
+		protected_function_result safe_script(
+		     const string_view& code, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return safe_script(code, script_default_on_error, chunkname, mode);
+		}
+
+		template <typename Fx,
+		     meta::disable_any<meta::is_string_constructible<meta::unqualified_t<Fx>>,
+		          meta::is_specialization_of<meta::unqualified_t<Fx>, basic_environment>> = meta::enabler>
+		protected_function_result safe_script_file(const std::string& filename, Fx&& on_error, load_mode mode = load_mode::any) {
+			protected_function_result pfr = do_file(filename, mode);
+			if (!pfr.valid()) {
+				return on_error(L, std::move(pfr));
+			}
+			return pfr;
+		}
+
+		template <typename Fx, typename E>
+		protected_function_result safe_script_file(
+		     const std::string& filename, const basic_environment<E>& env, Fx&& on_error, load_mode mode = load_mode::any) {
+			protected_function_result pfr = do_file(filename, env, mode);
+			if (!pfr.valid()) {
+				return on_error(L, std::move(pfr));
+			}
+			return pfr;
+		}
+
+		template <typename E>
+		protected_function_result safe_script_file(const std::string& filename, const basic_environment<E>& env, load_mode mode = load_mode::any) {
+			return safe_script_file(filename, env, script_default_on_error, mode);
+		}
+
+		protected_function_result safe_script_file(const std::string& filename, load_mode mode = load_mode::any) {
+			return safe_script_file(filename, script_default_on_error, mode);
+		}
+
+		template <typename E>
+		unsafe_function_result unsafe_script(lua_Reader reader, void* data, const basic_environment<E>& env,
+		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name("lua_Reader", chunkname, basechunkname);
+			int index = lua_gettop(L);
+			if (lua_load(L, reader, data, chunknametarget, to_string(mode).c_str())) {
+				lua_error(L);
+			}
+			set_environment(env, stack_reference(L, raw_index(index + 1)));
+			if (lua_pcall(L, 0, LUA_MULTRET, 0)) {
+				lua_error(L);
+			}
+			int postindex = lua_gettop(L);
+			int returns = postindex - index;
+			return unsafe_function_result(L, (std::max)(postindex - (returns - 1), 1), returns);
+		}
+
+		unsafe_function_result unsafe_script(
+		     lua_Reader reader, void* data, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			int index = lua_gettop(L);
+			stack::script(L, reader, data, chunkname, mode);
+			int postindex = lua_gettop(L);
+			int returns = postindex - index;
+			return unsafe_function_result(L, (std::max)(postindex - (returns - 1), 1), returns);
+		}
+
+		template <typename E>
+		unsafe_function_result unsafe_script(const string_view& code, const basic_environment<E>& env,
+		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name(code, chunkname, basechunkname);
+			int index = lua_gettop(L);
+			if (luaL_loadbufferx(L, code.data(), code.size(), chunknametarget, to_string(mode).c_str())) {
+				lua_error(L);
+			}
+			set_environment(env, stack_reference(L, raw_index(index + 1)));
+			if (lua_pcall(L, 0, LUA_MULTRET, 0)) {
+				lua_error(L);
+			}
+			int postindex = lua_gettop(L);
+			int returns = postindex - index;
+			return unsafe_function_result(L, (std::max)(postindex - (returns - 1), 1), returns);
+		}
+
+		unsafe_function_result unsafe_script(
+		     const string_view& code, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			int index = lua_gettop(L);
+			stack::script(L, code, chunkname, mode);
+			int postindex = lua_gettop(L);
+			int returns = postindex - index;
+			return unsafe_function_result(L, (std::max)(postindex - (returns - 1), 1), returns);
+		}
+
+		template <typename E>
+		unsafe_function_result unsafe_script_file(const std::string& filename, const basic_environment<E>& env, load_mode mode = load_mode::any) {
+			int index = lua_gettop(L);
+			if (luaL_loadfilex(L, filename.c_str(), to_string(mode).c_str())) {
+				lua_error(L);
+			}
+			set_environment(env, stack_reference(L, raw_index(index + 1)));
+			if (lua_pcall(L, 0, LUA_MULTRET, 0)) {
+				lua_error(L);
+			}
+			int postindex = lua_gettop(L);
+			int returns = postindex - index;
+			return unsafe_function_result(L, (std::max)(postindex - (returns - 1), 1), returns);
+		}
+
+		unsafe_function_result unsafe_script_file(const std::string& filename, load_mode mode = load_mode::any) {
+			int index = lua_gettop(L);
+			stack::script_file(L, filename, mode);
+			int postindex = lua_gettop(L);
+			int returns = postindex - index;
+			return unsafe_function_result(L, (std::max)(postindex - (returns - 1), 1), returns);
+		}
+
+		template <typename Fx,
+		     meta::disable_any<meta::is_string_constructible<meta::unqualified_t<Fx>>,
+		          meta::is_specialization_of<meta::unqualified_t<Fx>, basic_environment>> = meta::enabler>
+		protected_function_result script(
+		     const string_view& code, Fx&& on_error, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return safe_script(code, std::forward<Fx>(on_error), chunkname, mode);
+		}
+
+		template <typename Fx,
+		     meta::disable_any<meta::is_string_constructible<meta::unqualified_t<Fx>>,
+		          meta::is_specialization_of<meta::unqualified_t<Fx>, basic_environment>> = meta::enabler>
+		protected_function_result script_file(const std::string& filename, Fx&& on_error, load_mode mode = load_mode::any) {
+			return safe_script_file(filename, std::forward<Fx>(on_error), mode);
+		}
+
+		template <typename Fx, typename E>
+		protected_function_result script(const string_view& code, const basic_environment<E>& env, Fx&& on_error,
+		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return safe_script(code, env, std::forward<Fx>(on_error), chunkname, mode);
+		}
+
+		template <typename Fx, typename E>
+		protected_function_result script_file(const std::string& filename, const basic_environment<E>& env, Fx&& on_error, load_mode mode = load_mode::any) {
+			return safe_script_file(filename, env, std::forward<Fx>(on_error), mode);
+		}
+
+		protected_function_result script(
+		     const string_view& code, const environment& env, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return safe_script(code, env, script_default_on_error, chunkname, mode);
+		}
+
+		protected_function_result script_file(const std::string& filename, const environment& env, load_mode mode = load_mode::any) {
+			return safe_script_file(filename, env, script_default_on_error, mode);
+		}
+
+#if SOL_IS_ON(SOL_SAFE_FUNCTION_OBJECTS_I_)
+		protected_function_result script(
+		     lua_Reader reader, void* data, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return safe_script(reader, data, chunkname, mode);
+		}
+
+		protected_function_result script(
+		     const string_view& code, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return safe_script(code, chunkname, mode);
+		}
+
+		protected_function_result script_file(const std::string& filename, load_mode mode = load_mode::any) {
+			return safe_script_file(filename, mode);
+		}
+#else
+		unsafe_function_result script(const string_view& code, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return unsafe_script(code, chunkname, mode);
+		}
+
+		unsafe_function_result script_file(const std::string& filename, load_mode mode = load_mode::any) {
+			return unsafe_script_file(filename, mode);
+		}
+#endif
+		load_result load(const string_view& code, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name(code, chunkname, basechunkname);
+			load_status x = static_cast<load_status>(luaL_loadbufferx(L, code.data(), code.size(), chunknametarget, to_string(mode).c_str()));
+			return load_result(L, absolute_index(L, -1), 1, 1, x);
+		}
+
+		load_result load_buffer(const char* buff, size_t size, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return load(string_view(buff, size), chunkname, mode);
+		}
+
+		load_result load_buffer(
+		     const std::byte* buff, size_t size, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return load(string_view(reinterpret_cast<const char*>(buff), size), chunkname, mode);
+		}
+
+		load_result load_file(const std::string& filename, load_mode mode = load_mode::any) {
+			load_status x = static_cast<load_status>(luaL_loadfilex(L, filename.c_str(), to_string(mode).c_str()));
+			return load_result(L, absolute_index(L, -1), 1, 1, x);
+		}
+
+		load_result load(lua_Reader reader, void* data, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name("lua_Reader", chunkname, basechunkname);
+			load_status x = static_cast<load_status>(lua_load(L, reader, data, chunknametarget, to_string(mode).c_str()));
+			return load_result(L, absolute_index(L, -1), 1, 1, x);
+		}
+
+		iterator begin() const {
+			return global.begin();
+		}
+
+		iterator end() const {
+			return global.end();
+		}
+
+		const_iterator cbegin() const {
+			return global.cbegin();
+		}
+
+		const_iterator cend() const {
+			return global.cend();
+		}
+
+		global_table globals() const {
+			// if we return a reference
+			// we'll be screwed a bit
+			return global;
+		}
+
+		global_table& globals() {
+			return global;
+		}
+
+		table registry() const {
+			return reg;
+		}
+
+		std::size_t memory_used() const {
+			return total_memory_used(lua_state());
+		}
+
+		int stack_top() const {
+			return stack::top(L);
+		}
+
+		int stack_clear() {
+			int s = stack_top();
+			lua_pop(L, s);
+			return s;
+		}
+
+		bool supports_gc_mode(gc_mode mode) const noexcept {
+#if SOL_LUA_VERSION_I_ >= 504
+			// supports all modes
+			(void)mode;
+			return true;
+#endif
+			return mode == gc_mode::default_value;
+		}
+
+		bool is_gc_on() const {
+#if SOL_LUA_VERSION_I_ >= 502
+			return lua_gc(lua_state(), LUA_GCISRUNNING, 0) == 1;
+#else
+			// You cannot turn it off in Lua 5.1
+			return true;
+#endif
+		}
+
+		void collect_garbage() {
+			lua_gc(lua_state(), LUA_GCCOLLECT, 0);
+		}
+
+		void collect_gc() {
+			collect_garbage();
+		}
+
+		bool step_gc(int step_size_kilobytes) {
+			// THOUGHT: std::chrono-alikes to map "kilobyte size" here...?
+			// Make it harder to give MB or KB to a B parameter...?
+			// Probably overkill for now.
+#if SOL_LUA_VERSION_I_ >= 504
+			// The manual implies that this function is almost always successful...
+			// is it?? It could depend on the GC mode...
+			return lua_gc(lua_state(), LUA_GCSTEP, step_size_kilobytes) != 0;
+#else
+			return lua_gc(lua_state(), LUA_GCSTEP, step_size_kilobytes) == 1;
+#endif
+		}
+
+		void restart_gc() {
+			lua_gc(lua_state(), LUA_GCRESTART, 0);
+		}
+
+		void stop_gc() {
+			lua_gc(lua_state(), LUA_GCSTOP, 0);
+		}
+
+		// Returns the old GC mode. Check support using the supports_gc_mode function.
+		gc_mode change_gc_mode_incremental(int pause, int step_multiplier, int step_byte_size) {
+			// "What the fuck does any of this mean??"
+			// http://www.lua.org/manual/5.4/manual.html#2.5.1
+
+			// THOUGHT: std::chrono-alikes to map "byte size" here...?
+			// Make it harder to give MB or KB to a B parameter...?
+			// Probably overkill for now.
+#if SOL_LUA_VERSION_I_ >= 504
+			int old_mode = lua_gc(lua_state(), LUA_GCINC, pause, step_multiplier, step_byte_size);
+			if (old_mode == LUA_GCGEN) {
+				return gc_mode::generational;
+			}
+			else if (old_mode == LUA_GCINC) {
+				return gc_mode::incremental;
+			}
+#else
+			lua_gc(lua_state(), LUA_GCSETPAUSE, pause);
+			lua_gc(lua_state(), LUA_GCSETSTEPMUL, step_multiplier);
+			(void)step_byte_size; // means nothing in older versions
+#endif
+			return gc_mode::default_value;
+		}
+
+		// Returns the old GC mode. Check support using the supports_gc_mode function.
+		gc_mode change_gc_mode_generational(int minor_multiplier, int major_multiplier) {
+#if SOL_LUA_VERSION_I_ >= 504
+			// "What does this shit mean?"
+			// http://www.lua.org/manual/5.4/manual.html#2.5.2
+			int old_mode = lua_gc(lua_state(), LUA_GCGEN, minor_multiplier, major_multiplier);
+			if (old_mode == LUA_GCGEN) {
+				return gc_mode::generational;
+			}
+			else if (old_mode == LUA_GCINC) {
+				return gc_mode::incremental;
+			}
+#else
+			(void)minor_multiplier;
+			(void)major_multiplier;
+#endif
+			return gc_mode::default_value;
+		}
+
+		operator lua_State*() const {
+			return lua_state();
+		}
+
+		void set_panic(lua_CFunction panic) {
+			lua_atpanic(lua_state(), panic);
+		}
+
+		void set_exception_handler(exception_handler_function handler) {
+			set_default_exception_handler(lua_state(), handler);
+		}
+
+		template <typename... Args, typename... Keys>
+		decltype(auto) get(Keys&&... keys) const {
+			return global.get<Args...>(std::forward<Keys>(keys)...);
+		}
+
+		template <typename T, typename Key>
+		decltype(auto) get_or(Key&& key, T&& otherwise) const {
+			return global.get_or(std::forward<Key>(key), std::forward<T>(otherwise));
+		}
+
+		template <typename T, typename Key, typename D>
+		decltype(auto) get_or(Key&& key, D&& otherwise) const {
+			return global.get_or<T>(std::forward<Key>(key), std::forward<D>(otherwise));
+		}
+
+		template <typename... Args>
+		state_view& set(Args&&... args) {
+			global.set(std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename T, typename... Keys>
+		decltype(auto) traverse_get(Keys&&... keys) const {
+			return global.traverse_get<T>(std::forward<Keys>(keys)...);
+		}
+
+		template <typename... Args>
+		state_view& traverse_set(Args&&... args) {
+			global.traverse_set(std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename Class, typename... Args>
+		usertype<Class> new_usertype(Args&&... args) {
+			return global.new_usertype<Class>(std::forward<Args>(args)...);
+		}
+
+		template <bool read_only = true, typename... Args>
+		state_view& new_enum(const string_view& name, Args&&... args) {
+			global.new_enum<read_only>(name, std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename T, bool read_only = true>
+		state_view& new_enum(const string_view& name, std::initializer_list<std::pair<string_view, T>> items) {
+			global.new_enum<T, read_only>(name, std::move(items));
+			return *this;
+		}
+
+		template <typename Fx>
+		void for_each(Fx&& fx) {
+			global.for_each(std::forward<Fx>(fx));
+		}
+
+		template <typename T>
+		table_proxy<global_table&, detail::proxy_key_t<T>> operator[](T&& key) {
+			return global[std::forward<T>(key)];
+		}
+
+		template <typename T>
+		table_proxy<const global_table&, detail::proxy_key_t<T>> operator[](T&& key) const {
+			return global[std::forward<T>(key)];
+		}
+
+		template <typename Sig, typename... Args, typename Key>
+		state_view& set_function(Key&& key, Args&&... args) {
+			global.set_function<Sig>(std::forward<Key>(key), std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename... Args, typename Key>
+		state_view& set_function(Key&& key, Args&&... args) {
+			global.set_function(std::forward<Key>(key), std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename Name>
+		table create_table(Name&& name, int narr = 0, int nrec = 0) {
+			return global.create(std::forward<Name>(name), narr, nrec);
+		}
+
+		template <typename Name, typename Key, typename Value, typename... Args>
+		table create_table(Name&& name, int narr, int nrec, Key&& key, Value&& value, Args&&... args) {
+			return global.create(std::forward<Name>(name), narr, nrec, std::forward<Key>(key), std::forward<Value>(value), std::forward<Args>(args)...);
+		}
+
+		template <typename Name, typename... Args>
+		table create_named_table(Name&& name, Args&&... args) {
+			table x = global.create_with(std::forward<Args>(args)...);
+			global.set(std::forward<Name>(name), x);
+			return x;
+		}
+
+		table create_table(int narr = 0, int nrec = 0) {
+			return create_table(lua_state(), narr, nrec);
+		}
+
+		template <typename Key, typename Value, typename... Args>
+		table create_table(int narr, int nrec, Key&& key, Value&& value, Args&&... args) {
+			return create_table(lua_state(), narr, nrec, std::forward<Key>(key), std::forward<Value>(value), std::forward<Args>(args)...);
+		}
+
+		template <typename... Args>
+		table create_table_with(Args&&... args) {
+			return create_table_with(lua_state(), std::forward<Args>(args)...);
+		}
+
+		static inline table create_table(lua_State* L, int narr = 0, int nrec = 0) {
+			return global_table::create(L, narr, nrec);
+		}
+
+		template <typename Key, typename Value, typename... Args>
+		static inline table create_table(lua_State* L, int narr, int nrec, Key&& key, Value&& value, Args&&... args) {
+			return global_table::create(L, narr, nrec, std::forward<Key>(key), std::forward<Value>(value), std::forward<Args>(args)...);
+		}
+
+		template <typename... Args>
+		static inline table create_table_with(lua_State* L, Args&&... args) {
+			return global_table::create_with(L, std::forward<Args>(args)...);
+		}
+	};
+} // namespace sol
+
+#endif // SOL_STATE_VIEW_HPP
diff --git a/extern/sol3/sol/string_view.hpp b/extern/sol3/sol/string_view.hpp
new file mode 100644
index 0000000000..19f89f53cd
--- /dev/null
+++ b/extern/sol3/sol/string_view.hpp
@@ -0,0 +1,45 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_STRING_VIEW_HPP
+#define SOL_STRING_VIEW_HPP
+
+#include <sol/version.hpp>
+
+#include <cstddef>
+#include <string>
+#include <string_view>
+#include <functional>
+
+namespace sol {
+	template <typename C, typename T = std::char_traits<C>>
+	using basic_string_view = std::basic_string_view<C, T>;
+
+	typedef std::string_view string_view;
+	typedef std::wstring_view wstring_view;
+	typedef std::u16string_view u16string_view;
+	typedef std::u32string_view u32string_view;
+	typedef std::hash<std::string_view> string_view_hash;
+} // namespace sol
+
+#endif // SOL_STRING_VIEW_HPP
diff --git a/extern/sol3/sol/table.hpp b/extern/sol3/sol/table.hpp
new file mode 100644
index 0000000000..fd0b0ea052
--- /dev/null
+++ b/extern/sol3/sol/table.hpp
@@ -0,0 +1,116 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_TABLE_HPP
+#define SOL_TABLE_HPP
+
+#include <sol/table_core.hpp>
+#include <sol/lua_table.hpp>
+#include <sol/usertype.hpp>
+
+namespace sol {
+	typedef table_core<false> table;
+
+	template <bool is_global, typename base_type>
+	template <typename Class, typename Key>
+	usertype<Class> basic_table_core<is_global, base_type>::new_usertype(Key&& key) {
+		constant_automagic_enrollments<> enrollments {};
+		return this->new_usertype<Class>(std::forward<Key>(key), std::move(enrollments));
+	}
+
+	template <bool is_global, typename base_type>
+	template <typename Class, typename Key, automagic_flags enrollment_flags>
+	usertype<Class> basic_table_core<is_global, base_type>::new_usertype(Key&& key, constant_automagic_enrollments<enrollment_flags> enrollments) {
+		int mt_index = u_detail::register_usertype<Class, enrollment_flags>(this->lua_state(), std::move(enrollments));
+		usertype<Class> mt(this->lua_state(), -mt_index);
+		lua_pop(this->lua_state(), 1);
+		set(std::forward<Key>(key), mt);
+		return mt;
+	}
+
+	template <bool is_global, typename base_type>
+	template <typename Class, typename Key>
+	usertype<Class> basic_table_core<is_global, base_type>::new_usertype(Key&& key, automagic_enrollments enrollments) {
+		int mt_index = u_detail::register_usertype<Class, automagic_flags::all>(this->lua_state(), std::move(enrollments));
+		usertype<Class> mt(this->lua_state(), -mt_index);
+		lua_pop(this->lua_state(), 1);
+		set(std::forward<Key>(key), mt);
+		return mt;
+	}
+
+	template <bool is_global, typename base_type>
+	template <typename Class, typename Key, typename Arg, typename... Args, typename>
+	usertype<Class> basic_table_core<is_global, base_type>::new_usertype(Key&& key, Arg&& arg, Args&&... args) {
+		constexpr automagic_flags enrollment_flags = meta::any_same_v<no_construction, meta::unqualified_t<Arg>, meta::unqualified_t<Args>...>
+		     ? clear_flags(automagic_flags::all, automagic_flags::default_constructor)
+		     : automagic_flags::all;
+		constant_automagic_enrollments<enrollment_flags> enrollments;
+		enrollments.default_constructor = !detail::any_is_constructor_v<Arg, Args...>;
+		enrollments.destructor = !detail::any_is_destructor_v<Arg, Args...>;
+		usertype<Class> ut = this->new_usertype<Class>(std::forward<Key>(key), std::move(enrollments));
+		static_assert(sizeof...(Args) % 2 == static_cast<std::size_t>(!detail::any_is_constructor_v<Arg>),
+		     "you must pass an even number of arguments to new_usertype after first passing a constructor");
+		if constexpr (detail::any_is_constructor_v<Arg>) {
+			ut.set(meta_function::construct, std::forward<Arg>(arg));
+			ut.tuple_set(std::make_index_sequence<(sizeof...(Args)) / 2>(), std::forward_as_tuple(std::forward<Args>(args)...));
+		}
+		else {
+			ut.tuple_set(std::make_index_sequence<(sizeof...(Args) + 1) / 2>(), std::forward_as_tuple(std::forward<Arg>(arg), std::forward<Args>(args)...));
+		}
+		return ut;
+	}
+
+	template <typename base_type>
+	template <typename Key, typename Value>
+	basic_metatable<base_type>& basic_metatable<base_type>::set(Key&& key, Value&& value) {
+		this->push();
+		lua_State* L = this->lua_state();
+		int target = lua_gettop(L);
+		optional<u_detail::usertype_storage_base&> maybe_uts = nullopt;
+		maybe_uts = u_detail::maybe_get_usertype_storage_base(L, target);
+		if (maybe_uts) {
+			u_detail::usertype_storage_base& uts = *maybe_uts;
+			uts.set(L, std::forward<Key>(key), std::forward<Value>(value));
+			return *this;
+		}
+		else {
+			base_t::set(std::forward<Key>(key), std::forward<Value>(value));
+		}
+		this->pop();
+		return *this;
+	}
+
+	namespace stack {
+		template <>
+		struct unqualified_getter<metatable_key_t> {
+			static metatable get(lua_State* L, int index = -1) {
+				if (lua_getmetatable(L, index) == 0) {
+					return metatable(L, ref_index(LUA_REFNIL));
+				}
+				return metatable(L, -1);
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+#endif // SOL_TABLE_HPP
diff --git a/extern/sol3/sol/table_core.hpp b/extern/sol3/sol/table_core.hpp
new file mode 100644
index 0000000000..df2ace5c56
--- /dev/null
+++ b/extern/sol3/sol/table_core.hpp
@@ -0,0 +1,733 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_TABLE_CORE_HPP
+#define SOL_TABLE_CORE_HPP
+
+#include <sol/table_proxy.hpp>
+#include <sol/stack.hpp>
+#include <sol/function_types.hpp>
+#include <sol/table_iterator.hpp>
+#include <sol/pairs_iterator.hpp>
+#include <sol/types.hpp>
+#include <sol/object.hpp>
+#include <sol/usertype.hpp>
+#include <sol/optional.hpp>
+
+namespace sol {
+	namespace detail {
+		template <std::size_t n>
+		struct clean {
+			lua_State* L;
+			clean(lua_State* luastate) : L(luastate) {
+			}
+			~clean() {
+				lua_pop(L, static_cast<int>(n));
+			}
+		};
+
+		struct ref_clean {
+			lua_State* L;
+			int& pop_count;
+
+			ref_clean(lua_State* L_, int& pop_count_) noexcept : L(L_), pop_count(pop_count_) {
+			}
+			~ref_clean() {
+				lua_pop(L, static_cast<int>(pop_count));
+			}
+		};
+
+		inline int fail_on_newindex(lua_State* L_) {
+			return luaL_error(L_, "sol: cannot modify the elements of an enumeration table");
+		}
+
+	} // namespace detail
+
+	template <bool top_level, typename ref_t>
+	class basic_table_core : public basic_object<ref_t> {
+	private:
+		using base_t = basic_object<ref_t>;
+
+		friend class state;
+		friend class state_view;
+		template <typename, typename>
+		friend class basic_usertype;
+		template <typename>
+		friend class basic_metatable;
+
+		template <typename T>
+		using is_get_direct_tableless = meta::boolean<stack::stack_detail::is_get_direct_tableless_v<T, top_level, false>>;
+
+		template <typename T>
+		using is_raw_get_direct_tableless = std::false_type;
+
+		template <typename T>
+		using is_set_direct_tableless = meta::boolean<stack::stack_detail::is_set_direct_tableless_v<T, top_level, false>>;
+
+		template <typename T>
+		using is_raw_set_direct_tableless = std::false_type;
+
+		template <bool raw, typename... Ret, typename... Keys>
+		decltype(auto) tuple_get(int table_index, Keys&&... keys) const {
+			if constexpr (sizeof...(Ret) < 2) {
+				return traverse_get_single_maybe_tuple<raw, Ret...>(table_index, std::forward<Keys>(keys)...);
+			}
+			else {
+				using multi_ret = decltype(stack::pop<std::tuple<Ret...>>(nullptr));
+				return multi_ret(traverse_get_single_maybe_tuple<raw, Ret>(table_index, std::forward<Keys>(keys))...);
+			}
+		}
+
+		template <bool raw, typename Ret, size_t... I, typename Key>
+		decltype(auto) traverse_get_single_tuple(int table_index, std::index_sequence<I...>, Key&& key) const {
+			return traverse_get_single<raw, Ret>(table_index, std::get<I>(std::forward<Key>(key))...);
+		}
+
+		template <bool raw, typename Ret, typename Key>
+		decltype(auto) traverse_get_single_maybe_tuple(int table_index, Key&& key) const {
+			if constexpr (meta::is_tuple_v<meta::unqualified_t<Key>>) {
+				return traverse_get_single_tuple<raw, Ret>(
+				     table_index, std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<Key>>>(), std::forward<Key>(key));
+			}
+			else {
+				return traverse_get_single<raw, Ret>(table_index, std::forward<Key>(key));
+			}
+		}
+
+		template <bool raw, typename Ret, typename... Keys>
+		decltype(auto) traverse_get_single(int table_index, Keys&&... keys) const {
+			constexpr static bool global = (meta::count_for_to_pack_v < 1, is_get_direct_tableless, meta::unqualified_t<Keys>... >> 0);
+			if constexpr (meta::is_optional_v<meta::unqualified_t<Ret>>) {
+				int popcount = 0;
+				detail::ref_clean c(base_t::lua_state(), popcount);
+				return traverse_get_deep_optional<global, raw, detail::insert_mode::none, Ret>(popcount, table_index, std::forward<Keys>(keys)...);
+			}
+			else {
+				detail::clean<sizeof...(Keys) - meta::count_for_pack_v<detail::is_insert_mode, meta::unqualified_t<Keys>...>> c(base_t::lua_state());
+				return traverse_get_deep<global, raw, detail::insert_mode::none, Ret>(table_index, std::forward<Keys>(keys)...);
+			}
+		}
+
+		template <bool raw, typename Pairs, std::size_t... I>
+		void tuple_set(std::index_sequence<I...>, Pairs&& pairs) {
+			constexpr static bool global = (meta::count_even_for_pack_v < is_set_direct_tableless,
+			     meta::unqualified_t<decltype(std::get<I * 2>(std::forward<Pairs>(pairs)))>... >> 0);
+			auto pp = stack::push_pop<global>(*this);
+			int table_index = pp.index_of(*this);
+			lua_State* L = base_t::lua_state();
+			(void)table_index;
+			(void)L;
+			void(detail::swallow { (stack::set_field<(top_level), raw>(
+			                             L, std::get<I * 2>(std::forward<Pairs>(pairs)), std::get<I * 2 + 1>(std::forward<Pairs>(pairs)), table_index),
+			     0)... });
+		}
+
+		template <bool global, bool raw, detail::insert_mode mode, typename T, typename Key, typename... Keys>
+		decltype(auto) traverse_get_deep(int table_index, Key&& key, Keys&&... keys) const {
+			if constexpr (std::is_same_v<meta::unqualified_t<Key>, create_if_nil_t>) {
+				(void)key;
+				return traverse_get_deep<false, raw, static_cast<detail::insert_mode>(mode | detail::insert_mode::create_if_nil), T>(
+				     table_index, std::forward<Keys>(keys)...);
+			}
+			else {
+				lua_State* L = base_t::lua_state();
+				stack::get_field<global, raw>(L, std::forward<Key>(key), table_index);
+				if constexpr (sizeof...(Keys) > 0) {
+					if constexpr ((mode & detail::insert_mode::create_if_nil) == detail::insert_mode::create_if_nil) {
+						type t = type_of(L, -1);
+						if (t == type::lua_nil || t == type::none) {
+							lua_pop(L, 1);
+							stack::push(L, new_table(0, 0));
+						}
+					}
+					return traverse_get_deep<false, raw, mode, T>(lua_gettop(L), std::forward<Keys>(keys)...);
+				}
+				else {
+					if constexpr ((mode & detail::insert_mode::create_if_nil) == detail::insert_mode::create_if_nil) {
+						type t = type_of(L, -1);
+						if ((t == type::lua_nil || t == type::none) && (is_table_like_v<T>)) {
+							lua_pop(L, 1);
+							stack::push(L, new_table(0, 0));
+						}
+					}
+					return stack::get<T>(L);
+				}
+			}
+		}
+
+		template <bool global, bool raw, detail::insert_mode mode, typename T, typename Key, typename... Keys>
+		decltype(auto) traverse_get_deep_optional(int& popcount, int table_index, Key&& key, Keys&&... keys) const {
+			if constexpr (std::is_same_v<meta::unqualified_t<Key>, create_if_nil_t>) {
+				constexpr detail::insert_mode new_mode = static_cast<detail::insert_mode>(mode | detail::insert_mode::create_if_nil);
+				(void)key;
+				return traverse_get_deep_optional<global, raw, new_mode, T>(popcount, table_index, std::forward<Keys>(keys)...);
+			}
+			else if constexpr (std::is_same_v<meta::unqualified_t<Key>, update_if_empty_t>) {
+				constexpr detail::insert_mode new_mode = static_cast<detail::insert_mode>(mode | detail::insert_mode::update_if_empty);
+				(void)key;
+				return traverse_get_deep_optional<global, raw, new_mode, T>(popcount, table_index, std::forward<Keys>(keys)...);
+			}
+			else if constexpr (std::is_same_v<meta::unqualified_t<Key>, override_value_t>) {
+				constexpr detail::insert_mode new_mode = static_cast<detail::insert_mode>(mode | detail::insert_mode::override_value);
+				(void)key;
+				return traverse_get_deep_optional<global, raw, new_mode, T>(popcount, table_index, std::forward<Keys>(keys)...);
+			}
+			else {
+				if constexpr (sizeof...(Keys) > 0) {
+					lua_State* L = base_t::lua_state();
+					auto p = stack::probe_get_field<global, raw>(L, std::forward<Key>(key), table_index);
+					popcount += p.levels;
+					if (!p.success) {
+						if constexpr ((mode & detail::insert_mode::create_if_nil) == detail::insert_mode::create_if_nil) {
+							lua_pop(L, 1);
+							constexpr bool is_seq = meta::count_for_to_pack_v < 1, std::is_integral, Keys... >> 0;
+							stack::push(L, new_table(static_cast<int>(is_seq), static_cast<int>(!is_seq)));
+							stack::set_field<global, raw>(L, std::forward<Key>(key), stack_reference(L, -1), table_index);
+						}
+						else {
+							return T(nullopt);
+						}
+					}
+					return traverse_get_deep_optional<false, raw, mode, T>(popcount, lua_gettop(L), std::forward<Keys>(keys)...);
+				}
+				else {
+					using R = decltype(stack::get<T>(nullptr));
+					using value_type = typename meta::unqualified_t<R>::value_type;
+					lua_State* L = base_t::lua_state();
+					auto p = stack::probe_get_field<global, raw, value_type>(L, key, table_index);
+					popcount += p.levels;
+					if (!p.success) {
+						if constexpr ((mode & detail::insert_mode::create_if_nil) == detail::insert_mode::create_if_nil) {
+							lua_pop(L, 1);
+							stack::push(L, new_table(0, 0));
+							stack::set_field<global, raw>(L, std::forward<Key>(key), stack_reference(L, -1), table_index);
+							if (stack::check<value_type>(L, lua_gettop(L), &no_panic)) {
+								return stack::get<T>(L);
+							}
+						}
+						return R(nullopt);
+					}
+					return stack::get<T>(L);
+				}
+			}
+		}
+
+		template <bool global, bool raw, detail::insert_mode mode, typename Key, typename... Keys>
+		void traverse_set_deep(int table_index, Key&& key, Keys&&... keys) const {
+			using KeyU = meta::unqualified_t<Key>;
+			if constexpr (std::is_same_v<KeyU, update_if_empty_t>) {
+				(void)key;
+				traverse_set_deep<global, raw, static_cast<detail::insert_mode>(mode | detail::insert_mode::update_if_empty)>(
+				     table_index, std::forward<Keys>(keys)...);
+			}
+			else if constexpr (std::is_same_v<KeyU, create_if_nil_t>) {
+				(void)key;
+				traverse_set_deep<global, raw, static_cast<detail::insert_mode>(mode | detail::insert_mode::create_if_nil)>(
+				     table_index, std::forward<Keys>(keys)...);
+			}
+			else if constexpr (std::is_same_v<KeyU, override_value_t>) {
+				(void)key;
+				traverse_set_deep<global, raw, static_cast<detail::insert_mode>(mode | detail::insert_mode::override_value)>(
+				     table_index, std::forward<Keys>(keys)...);
+			}
+			else {
+				lua_State* L = base_t::lua_state();
+				if constexpr (sizeof...(Keys) == 1) {
+					if constexpr ((mode & detail::insert_mode::update_if_empty) == detail::insert_mode::update_if_empty) {
+						auto p = stack::probe_get_field<global, raw>(L, key, table_index);
+						lua_pop(L, p.levels);
+						if (!p.success) {
+							stack::set_field<global, raw>(L, std::forward<Key>(key), std::forward<Keys>(keys)..., table_index);
+						}
+					}
+					else {
+						stack::set_field<global, raw>(L, std::forward<Key>(key), std::forward<Keys>(keys)..., table_index);
+					}
+				}
+				else {
+					if constexpr (mode != detail::insert_mode::none) {
+						stack::get_field<global, raw>(L, key, table_index);
+						type vt = type_of(L, -1);
+						if constexpr ((mode & detail::insert_mode::update_if_empty) == detail::insert_mode::update_if_empty
+						     || (mode & detail::insert_mode::create_if_nil) == detail::insert_mode::create_if_nil) {
+							if (vt == type::lua_nil || vt == type::none) {
+								constexpr bool is_seq = meta::count_for_to_pack_v < 1, std::is_integral, Keys... >> 0;
+								lua_pop(L, 1);
+								stack::push(L, new_table(static_cast<int>(is_seq), static_cast<int>(!is_seq)));
+								stack::set_field<global, raw>(L, std::forward<Key>(key), stack_reference(L, -1), table_index);
+							}
+						}
+						else {
+							if (vt != type::table) {
+								constexpr bool is_seq = meta::count_for_to_pack_v < 1, std::is_integral, Keys... >> 0;
+								lua_pop(L, 1);
+								stack::push(L, new_table(static_cast<int>(is_seq), static_cast<int>(!is_seq)));
+								stack::set_field<global, raw>(L, std::forward<Key>(key), stack_reference(L, -1), table_index);
+							}
+						}
+					}
+					else {
+						stack::get_field<global, raw>(L, std::forward<Key>(key), table_index);
+					}
+					traverse_set_deep<false, raw, mode>(lua_gettop(L), std::forward<Keys>(keys)...);
+				}
+			}
+		}
+
+	protected:
+		basic_table_core(detail::no_safety_tag, lua_nil_t n) : base_t(n) {
+		}
+		basic_table_core(detail::no_safety_tag, lua_State* L, int index) : base_t(L, index) {
+		}
+		basic_table_core(detail::no_safety_tag, lua_State* L, ref_index index) : base_t(L, index) {
+		}
+		template <typename T,
+		     meta::enable<meta::neg<meta::any_same<meta::unqualified_t<T>, basic_table_core>>, meta::neg<std::is_same<ref_t, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_table_core(detail::no_safety_tag, T&& r) noexcept : base_t(std::forward<T>(r)) {
+		}
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_table_core(detail::no_safety_tag, lua_State* L, T&& r) noexcept : base_t(L, std::forward<T>(r)) {
+		}
+
+	public:
+		using iterator = basic_table_iterator<ref_t>;
+		using const_iterator = iterator;
+
+		using base_t::lua_state;
+
+		basic_table_core() noexcept = default;
+		basic_table_core(const basic_table_core&) = default;
+		basic_table_core(basic_table_core&&) = default;
+		basic_table_core& operator=(const basic_table_core&) = default;
+		basic_table_core& operator=(basic_table_core&&) = default;
+
+		basic_table_core(const stack_reference& r) : basic_table_core(r.lua_state(), r.stack_index()) {
+		}
+
+		basic_table_core(stack_reference&& r) : basic_table_core(r.lua_state(), r.stack_index()) {
+		}
+
+		template <typename T, meta::enable_any<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_table_core(lua_State* L, T&& r) : base_t(L, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			int table_index = pp.index_of(*this);
+			constructor_handler handler {};
+			stack::check<basic_table_core>(lua_state(), table_index, handler);
+#endif // Safety
+		}
+
+		basic_table_core(lua_State* L, const new_table& nt) : base_t(L, -stack::push(L, nt)) {
+			if (!is_stack_based<meta::unqualified_t<ref_t>>::value) {
+				lua_pop(L, 1);
+			}
+		}
+
+		basic_table_core(lua_State* L, int index = -1) : basic_table_core(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			constructor_handler handler {};
+			stack::check<basic_table_core>(L, index, handler);
+#endif // Safety
+		}
+
+		basic_table_core(lua_State* L, ref_index index) : basic_table_core(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			int table_index = pp.index_of(*this);
+			constructor_handler handler {};
+			stack::check<basic_table_core>(lua_state(), table_index, handler);
+#endif // Safety
+		}
+
+		template <typename T,
+		     meta::enable<meta::neg<meta::any_same<meta::unqualified_t<T>, basic_table_core>>, meta::neg<std::is_same<ref_t, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_table_core(T&& r) noexcept : basic_table_core(detail::no_safety, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			if (!is_table<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				int table_index = pp.index_of(*this);
+				constructor_handler handler {};
+				stack::check<basic_table_core>(lua_state(), table_index, handler);
+			}
+#endif // Safety
+		}
+
+		basic_table_core(lua_nil_t r) noexcept : basic_table_core(detail::no_safety, r) {
+		}
+
+		basic_table_core(lua_State* L, global_tag_t t) noexcept : base_t(L, t) {
+		}
+
+		iterator begin() const {
+			if (this->get_type() == type::table) {
+				return iterator(*this);
+			}
+			return iterator();
+		}
+
+		iterator end() const {
+			return iterator();
+		}
+
+		const_iterator cbegin() const {
+			return begin();
+		}
+
+		const_iterator cend() const {
+			return end();
+		}
+
+		basic_pairs_range<basic_table_core> pairs() noexcept {
+			return basic_pairs_range<basic_table_core>(*this);
+		}
+
+		basic_pairs_range<const basic_table_core> pairs() const noexcept {
+			return basic_pairs_range<const basic_table_core>(*this);
+		}
+
+		void clear() {
+			auto pp = stack::push_pop<false>(*this);
+			int table_index = pp.index_of(*this);
+			stack::clear(lua_state(), table_index);
+		}
+
+		template <typename... Ret, typename... Keys>
+		decltype(auto) get(Keys&&... keys) const {
+			static_assert(sizeof...(Keys) == sizeof...(Ret), "number of keys and number of return types do not match");
+			constexpr static bool global = meta::all<meta::boolean<top_level>, is_get_direct_tableless<meta::unqualified_t<Keys>>...>::value;
+			auto pp = stack::push_pop<global>(*this);
+			int table_index = pp.index_of(*this);
+			return tuple_get<false, Ret...>(table_index, std::forward<Keys>(keys)...);
+		}
+
+		template <typename T, typename Key>
+		decltype(auto) get_or(Key&& key, T&& otherwise) const {
+			typedef decltype(get<T>("")) U;
+			optional<U> option = get<optional<U>>(std::forward<Key>(key));
+			if (option) {
+				return static_cast<U>(option.value());
+			}
+			return static_cast<U>(std::forward<T>(otherwise));
+		}
+
+		template <typename T, typename Key, typename D>
+		decltype(auto) get_or(Key&& key, D&& otherwise) const {
+			optional<T> option = get<optional<T>>(std::forward<Key>(key));
+			if (option) {
+				return static_cast<T>(option.value());
+			}
+			return static_cast<T>(std::forward<D>(otherwise));
+		}
+
+		template <typename T, typename... Keys>
+		decltype(auto) traverse_get(Keys&&... keys) const {
+			static_assert(sizeof...(Keys) > 0, "must pass at least 1 key to get");
+			constexpr static bool global = (meta::count_for_to_pack_v < 1, is_get_direct_tableless, meta::unqualified_t<Keys>... >> 0);
+			auto pp = stack::push_pop<global>(*this);
+			int table_index = pp.index_of(*this);
+			return traverse_get_single<false, T>(table_index, std::forward<Keys>(keys)...);
+		}
+
+		template <typename... Keys>
+		basic_table_core& traverse_set(Keys&&... keys) {
+			static_assert(sizeof...(Keys) > 1, "must pass at least 1 key and 1 value to set");
+			constexpr static bool global
+			     = (meta::count_when_for_to_pack_v < detail::is_not_insert_mode, 1, is_set_direct_tableless, meta::unqualified_t<Keys>... >> 0);
+			auto pp = stack::push_pop<global>(*this);
+			int table_index = pp.index_of(*this);
+			lua_State* L = base_t::lua_state();
+			auto pn = stack::pop_n(L, static_cast<int>(sizeof...(Keys) - 2 - meta::count_for_pack_v<detail::is_insert_mode, meta::unqualified_t<Keys>...>));
+			traverse_set_deep<top_level, false, detail::insert_mode::none>(table_index, std::forward<Keys>(keys)...);
+			return *this;
+		}
+
+		template <typename... Args>
+		basic_table_core& set(Args&&... args) {
+			if constexpr (sizeof...(Args) == 2) {
+				traverse_set(std::forward<Args>(args)...);
+			}
+			else {
+				tuple_set<false>(std::make_index_sequence<sizeof...(Args) / 2>(), std::forward_as_tuple(std::forward<Args>(args)...));
+			}
+			return *this;
+		}
+
+		template <typename... Ret, typename... Keys>
+		decltype(auto) raw_get(Keys&&... keys) const {
+			static_assert(sizeof...(Keys) == sizeof...(Ret), "number of keys and number of return types do not match");
+			constexpr static bool global = (meta::count_for_to_pack_v < 1, is_raw_get_direct_tableless, meta::unqualified_t<Keys>... >> 0);
+			auto pp = stack::push_pop<global>(*this);
+			int table_index = pp.index_of(*this);
+			return tuple_get<true, Ret...>(table_index, std::forward<Keys>(keys)...);
+		}
+
+		template <typename T, typename Key>
+		decltype(auto) raw_get_or(Key&& key, T&& otherwise) const {
+			typedef decltype(raw_get<T>("")) U;
+			optional<U> option = raw_get<optional<U>>(std::forward<Key>(key));
+			if (option) {
+				return static_cast<U>(option.value());
+			}
+			return static_cast<U>(std::forward<T>(otherwise));
+		}
+
+		template <typename T, typename Key, typename D>
+		decltype(auto) raw_get_or(Key&& key, D&& otherwise) const {
+			optional<T> option = raw_get<optional<T>>(std::forward<Key>(key));
+			if (option) {
+				return static_cast<T>(option.value());
+			}
+			return static_cast<T>(std::forward<D>(otherwise));
+		}
+
+		template <typename T, typename... Keys>
+		decltype(auto) traverse_raw_get(Keys&&... keys) const {
+			constexpr static bool global = (meta::count_for_to_pack_v < 1, is_raw_get_direct_tableless, meta::unqualified_t<Keys>... >> 0);
+			auto pp = stack::push_pop<global>(*this);
+			int table_index = pp.index_of(*this);
+			return traverse_get_single<true, T>(table_index, std::forward<Keys>(keys)...);
+		}
+
+		template <typename... Keys>
+		basic_table_core& traverse_raw_set(Keys&&... keys) {
+			constexpr static bool global = (meta::count_for_to_pack_v < 1, is_raw_set_direct_tableless, meta::unqualified_t<Keys>... >> 0);
+			auto pp = stack::push_pop<global>(*this);
+			lua_State* L = base_t::lua_state();
+			auto pn = stack::pop_n(L, static_cast<int>(sizeof...(Keys) - 2 - meta::count_for_pack_v<detail::is_insert_mode, meta::unqualified_t<Keys>...>));
+			traverse_set_deep<top_level, true, false>(std::forward<Keys>(keys)...);
+			return *this;
+		}
+
+		template <typename... Args>
+		basic_table_core& raw_set(Args&&... args) {
+			tuple_set<true>(std::make_index_sequence<sizeof...(Args) / 2>(), std::forward_as_tuple(std::forward<Args>(args)...));
+			return *this;
+		}
+
+		template <typename Class, typename Key>
+		usertype<Class> new_usertype(Key&& key);
+
+		template <typename Class, typename Key, automagic_flags enrollment_flags>
+		usertype<Class> new_usertype(Key&& key, constant_automagic_enrollments<enrollment_flags> enrollment);
+
+		template <typename Class, typename Key>
+		usertype<Class> new_usertype(Key&& key, automagic_enrollments enrollment);
+
+		template <typename Class, typename Key, typename Arg, typename... Args,
+		     typename = std::enable_if_t<!std::is_base_of_v<automagic_enrollments, meta::unqualified_t<Arg>>>>
+		usertype<Class> new_usertype(Key&& key, Arg&& arg, Args&&... args);
+
+		template <bool read_only = true, typename... Args>
+		table new_enum(const string_view& name, Args&&... args) {
+			table target = create_with(std::forward<Args>(args)...);
+			if constexpr (read_only) {
+				// Need to create a special iterator to handle this
+				table x
+				     = create_with(meta_function::new_index, detail::fail_on_newindex, meta_function::index, target, meta_function::pairs, stack::stack_detail::readonly_pairs);
+				table shim = create_named(name, metatable_key, x);
+				return shim;
+			}
+			else {
+				set(name, target);
+				return target;
+			}
+		}
+
+		template <typename T, bool read_only = true>
+		table new_enum(const string_view& name, std::initializer_list<std::pair<string_view, T>> items) {
+			table target = create(static_cast<int>(items.size()), static_cast<int>(0));
+			for (const auto& kvp : items) {
+				target.set(kvp.first, kvp.second);
+			}
+			if constexpr (read_only) {
+				table x = create_with(meta_function::new_index, detail::fail_on_newindex, meta_function::index, target);
+				table shim = create_named(name, metatable_key, x);
+				return shim;
+			}
+			else {
+				set(name, target);
+				return target;
+			}
+		}
+
+		template <typename Key = object, typename Value = object, typename Fx>
+		void for_each(Fx&& fx) const {
+			lua_State* L = base_t::lua_state();
+			if constexpr (std::is_invocable_v<Fx, Key, Value>) {
+				auto pp = stack::push_pop(*this);
+				int table_index = pp.index_of(*this);
+				stack::push(L, lua_nil);
+				while (lua_next(L, table_index)) {
+					Key key(L, -2);
+					Value value(L, -1);
+					auto pn = stack::pop_n(L, 1);
+					fx(key, value);
+				}
+			}
+			else {
+				auto pp = stack::push_pop(*this);
+				int table_index = pp.index_of(*this);
+				stack::push(L, lua_nil);
+				while (lua_next(L, table_index)) {
+					Key key(L, -2);
+					Value value(L, -1);
+					auto pn = stack::pop_n(L, 1);
+					std::pair<Key&, Value&> keyvalue(key, value);
+					fx(keyvalue);
+				}
+			}
+		}
+
+		size_t size() const {
+			auto pp = stack::push_pop(*this);
+			int table_index = pp.index_of(*this);
+			lua_State* L = base_t::lua_state();
+			lua_len(L, table_index);
+			return stack::pop<size_t>(L);
+		}
+
+		bool empty() const {
+			return cbegin() == cend();
+		}
+
+		template <typename T>
+		auto operator[](T&& key) & {
+			return table_proxy<basic_table_core&, detail::proxy_key_t<T>>(*this, std::forward<T>(key));
+		}
+
+		template <typename T>
+		auto operator[](T&& key) const& {
+			return table_proxy<const basic_table_core&, detail::proxy_key_t<T>>(*this, std::forward<T>(key));
+		}
+
+		template <typename T>
+		auto operator[](T&& key) && {
+			return table_proxy<basic_table_core, detail::proxy_key_t<T>>(std::move(*this), std::forward<T>(key));
+		}
+
+		template <typename Sig, typename Key, typename... Args>
+		basic_table_core& set_function(Key&& key, Args&&... args) {
+			set_fx(types<Sig>(), std::forward<Key>(key), std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename Key, typename... Args>
+		basic_table_core& set_function(Key&& key, Args&&... args) {
+			set_fx(types<>(), std::forward<Key>(key), std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename... Args>
+		basic_table_core& add(Args&&... args) {
+			auto pp = stack::push_pop(*this);
+			int table_index = pp.index_of(*this);
+			lua_State* L = base_t::lua_state();
+			(void)detail::swallow { 0, (stack::set_ref(L, std::forward<Args>(args), table_index), 0)... };
+			return *this;
+		}
+
+	private:
+		template <typename R, typename... Args, typename Fx, typename Key, typename = std::invoke_result_t<Fx, Args...>>
+		void set_fx(types<R(Args...)>, Key&& key, Fx&& fx) {
+			set_resolved_function<R(Args...)>(std::forward<Key>(key), std::forward<Fx>(fx));
+		}
+
+		template <typename Fx, typename Key, meta::enable<meta::is_specialization_of<meta::unqualified_t<Fx>, overload_set>> = meta::enabler>
+		void set_fx(types<>, Key&& key, Fx&& fx) {
+			set(std::forward<Key>(key), std::forward<Fx>(fx));
+		}
+
+		template <typename Fx, typename Key, typename... Args,
+		     meta::disable<meta::is_specialization_of<meta::unqualified_t<Fx>, overload_set>> = meta::enabler>
+		void set_fx(types<>, Key&& key, Fx&& fx, Args&&... args) {
+			set(std::forward<Key>(key), as_function_reference(std::forward<Fx>(fx), std::forward<Args>(args)...));
+		}
+
+		template <typename... Sig, typename... Args, typename Key>
+		void set_resolved_function(Key&& key, Args&&... args) {
+			set(std::forward<Key>(key), as_function_reference<function_sig<Sig...>>(std::forward<Args>(args)...));
+		}
+
+	public:
+		static inline table create(lua_State* L, int narr = 0, int nrec = 0) {
+			lua_createtable(L, narr, nrec);
+			table result(L);
+			lua_pop(L, 1);
+			return result;
+		}
+
+		template <typename Key, typename Value, typename... Args>
+		static inline table create(lua_State* L, int narr, int nrec, Key&& key, Value&& value, Args&&... args) {
+			lua_createtable(L, narr, nrec);
+			table result(L);
+			result.set(std::forward<Key>(key), std::forward<Value>(value), std::forward<Args>(args)...);
+			lua_pop(L, 1);
+			return result;
+		}
+
+		template <typename... Args>
+		static inline table create_with(lua_State* L, Args&&... args) {
+			static_assert(sizeof...(Args) % 2 == 0, "You must have an even number of arguments for a key, value ... list.");
+			constexpr int narr = static_cast<int>(meta::count_odd_for_pack_v<std::is_integral, Args...>);
+			return create(L, narr, static_cast<int>((sizeof...(Args) / 2) - narr), std::forward<Args>(args)...);
+		}
+
+		table create(int narr = 0, int nrec = 0) {
+			return create(base_t::lua_state(), narr, nrec);
+		}
+
+		template <typename Key, typename Value, typename... Args>
+		table create(int narr, int nrec, Key&& key, Value&& value, Args&&... args) {
+			return create(base_t::lua_state(), narr, nrec, std::forward<Key>(key), std::forward<Value>(value), std::forward<Args>(args)...);
+		}
+
+		template <typename Name>
+		table create(Name&& name, int narr = 0, int nrec = 0) {
+			table x = create(base_t::lua_state(), narr, nrec);
+			this->set(std::forward<Name>(name), x);
+			return x;
+		}
+
+		template <typename Name, typename Key, typename Value, typename... Args>
+		table create(Name&& name, int narr, int nrec, Key&& key, Value&& value, Args&&... args) {
+			table x = create(base_t::lua_state(), narr, nrec, std::forward<Key>(key), std::forward<Value>(value), std::forward<Args>(args)...);
+			this->set(std::forward<Name>(name), x);
+			return x;
+		}
+
+		template <typename... Args>
+		table create_with(Args&&... args) {
+			return create_with(base_t::lua_state(), std::forward<Args>(args)...);
+		}
+
+		template <typename Name, typename... Args>
+		table create_named(Name&& name, Args&&... args) {
+			static const int narr = static_cast<int>(meta::count_even_for_pack_v<std::is_integral, Args...>);
+			return create(std::forward<Name>(name), narr, (sizeof...(Args) / 2) - narr, std::forward<Args>(args)...);
+		}
+	};
+} // namespace sol
+
+#endif // SOL_TABLE_CORE_HPP
diff --git a/extern/sol3/sol/table_iterator.hpp b/extern/sol3/sol/table_iterator.hpp
new file mode 100644
index 0000000000..8cf6f07575
--- /dev/null
+++ b/extern/sol3/sol/table_iterator.hpp
@@ -0,0 +1,114 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_TABLE_ITERATOR_HPP
+#define SOL_TABLE_ITERATOR_HPP
+
+#include <sol/object.hpp>
+#include <iterator>
+
+namespace sol {
+
+	template <typename reference_type>
+	class basic_table_iterator {
+	public:
+		typedef object key_type;
+		typedef object mapped_type;
+		typedef std::pair<object, object> value_type;
+		typedef std::input_iterator_tag iterator_category;
+		typedef std::ptrdiff_t difference_type;
+		typedef value_type* pointer;
+		typedef value_type& reference;
+		typedef const value_type& const_reference;
+
+	private:
+		std::pair<object, object> kvp;
+		reference_type ref;
+		int tableidx = 0;
+		int keyidx = 0;
+		std::ptrdiff_t idx = 0;
+
+	public:
+		basic_table_iterator() noexcept : keyidx(-1), idx(-1) {
+		}
+
+		basic_table_iterator(reference_type x) noexcept : ref(std::move(x)) {
+			ref.push();
+			tableidx = lua_gettop(ref.lua_state());
+			stack::push(ref.lua_state(), lua_nil);
+			this->operator++();
+			if (idx == -1) {
+				return;
+			}
+			--idx;
+		}
+
+		basic_table_iterator& operator++() noexcept {
+			if (idx == -1)
+				return *this;
+
+			if (lua_next(ref.lua_state(), tableidx) == 0) {
+				idx = -1;
+				keyidx = -1;
+				return *this;
+			}
+			++idx;
+			kvp.first = object(ref.lua_state(), -2);
+			kvp.second = object(ref.lua_state(), -1);
+			lua_pop(ref.lua_state(), 1);
+			// leave key on the stack
+			keyidx = lua_gettop(ref.lua_state());
+			return *this;
+		}
+
+		basic_table_iterator operator++(int) noexcept {
+			auto saved = *this;
+			this->operator++();
+			return saved;
+		}
+
+		reference operator*() const noexcept {
+			return const_cast<reference>(kvp);
+		}
+
+		bool operator==(const basic_table_iterator& right) const noexcept {
+			return idx == right.idx;
+		}
+
+		bool operator!=(const basic_table_iterator& right) const noexcept {
+			return idx != right.idx;
+		}
+
+		~basic_table_iterator() {
+			if (keyidx != -1) {
+				stack::remove(ref.lua_state(), keyidx, 1);
+			}
+			if (ref.lua_state() != nullptr && ref.valid()) {
+				stack::remove(ref.lua_state(), tableidx, 1);
+			}
+		}
+	};
+
+} // namespace sol
+
+#endif // SOL_TABLE_ITERATOR_HPP
diff --git a/extern/sol3/sol/table_proxy.hpp b/extern/sol3/sol/table_proxy.hpp
new file mode 100644
index 0000000000..680d2329f4
--- /dev/null
+++ b/extern/sol3/sol/table_proxy.hpp
@@ -0,0 +1,337 @@
+// sol3
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_TABLE_PROXY_HPP
+#define SOL_TABLE_PROXY_HPP
+
+#include <sol/traits.hpp>
+#include <sol/function.hpp>
+#include <sol/protected_function.hpp>
+#include <sol/proxy_base.hpp>
+
+namespace sol {
+
+	template <typename Table, typename Key>
+	struct table_proxy : public proxy_base<table_proxy<Table, Key>> {
+	private:
+		using key_type = detail::proxy_key_t<Key>;
+
+		template <typename T, std::size_t... I>
+		decltype(auto) tuple_get(std::index_sequence<I...>) const& {
+			return tbl.template traverse_get<T>(std::get<I>(key)...);
+		}
+
+		template <typename T, std::size_t... I>
+		decltype(auto) tuple_get(std::index_sequence<I...>) && {
+			return tbl.template traverse_get<T>(std::get<I>(std::move(key))...);
+		}
+
+		template <std::size_t... I, typename T>
+		void tuple_set(std::index_sequence<I...>, T&& value) & {
+			tbl.traverse_set(std::get<I>(key)..., std::forward<T>(value));
+		}
+
+		template <std::size_t... I, typename T>
+		void tuple_set(std::index_sequence<I...>, T&& value) && {
+			tbl.traverse_set(std::get<I>(std::move(key))..., std::forward<T>(value));
+		}
+
+		auto setup_table(std::true_type) {
+			auto p = stack::probe_get_field<std::is_same_v<meta::unqualified_t<Table>, global_table>>(lua_state(), key, tbl.stack_index());
+			lua_pop(lua_state(), p.levels);
+			return p;
+		}
+
+		bool is_valid(std::false_type) {
+			auto pp = stack::push_pop(tbl);
+			auto p = stack::probe_get_field<std::is_same_v<meta::unqualified_t<Table>, global_table>>(lua_state(), key, lua_gettop(lua_state()));
+			lua_pop(lua_state(), p.levels);
+			return p;
+		}
+
+	public:
+		Table tbl;
+		key_type key;
+
+		template <typename T>
+		table_proxy(Table table, T&& k) : tbl(table), key(std::forward<T>(k)) {
+		}
+
+		template <typename T>
+		table_proxy& set(T&& item) & {
+			tuple_set(std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>(), std::forward<T>(item));
+			return *this;
+		}
+
+		template <typename T>
+		table_proxy&& set(T&& item) && {
+			std::move(*this).tuple_set(std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>(), std::forward<T>(item));
+			return std::move(*this);
+		}
+
+		template <typename... Args>
+		table_proxy& set_function(Args&&... args) & {
+			tbl.set_function(key, std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename... Args>
+		table_proxy&& set_function(Args&&... args) && {
+			tbl.set_function(std::move(key), std::forward<Args>(args)...);
+			return std::move(*this);
+		}
+
+		template <typename T>
+		table_proxy& operator=(T&& other) & {
+			using Tu = meta::unwrap_unqualified_t<T>;
+			if constexpr (!is_lua_reference_or_proxy_v<Tu> && meta::is_invocable_v<Tu>) {
+				return set_function(std::forward<T>(other));
+			}
+			else {
+				return set(std::forward<T>(other));
+			}
+		}
+
+		template <typename T>
+		table_proxy&& operator=(T&& other) && {
+			using Tu = meta::unwrap_unqualified_t<T>;
+			if constexpr (!is_lua_reference_or_proxy_v<Tu> && meta::is_invocable_v<Tu> && !detail::is_msvc_callable_rigged_v<T>) {
+				return std::move(*this).set_function(std::forward<T>(other));
+			}
+			else {
+				return std::move(*this).set(std::forward<T>(other));
+			}
+		}
+
+		template <typename T>
+		table_proxy& operator=(std::initializer_list<T> other) & {
+			return set(std::move(other));
+		}
+
+		template <typename T>
+		table_proxy&& operator=(std::initializer_list<T> other) && {
+			return std::move(*this).set(std::move(other));
+		}
+
+		template <typename T>
+		decltype(auto) get() const& {
+			using idx_seq = std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>;
+			return tuple_get<T>(idx_seq());
+		}
+
+		template <typename T>
+		decltype(auto) get() && {
+			using idx_seq = std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>;
+			return std::move(*this).template tuple_get<T>(idx_seq());
+		}
+
+		template <typename T>
+		decltype(auto) get_or(T&& otherwise) const {
+			typedef decltype(get<T>()) U;
+			optional<U> option = get<optional<U>>();
+			if (option) {
+				return static_cast<U>(option.value());
+			}
+			return static_cast<U>(std::forward<T>(otherwise));
+		}
+
+		template <typename T, typename D>
+		decltype(auto) get_or(D&& otherwise) const {
+			optional<T> option = get<optional<T>>();
+			if (option) {
+				return static_cast<T>(option.value());
+			}
+			return static_cast<T>(std::forward<D>(otherwise));
+		}
+
+
+		template <typename T>
+		decltype(auto) get_or_create() {
+			return get_or_create<T>(new_table());
+		}
+
+		template <typename T, typename Otherwise>
+		decltype(auto) get_or_create(Otherwise&& other) {
+			if (!this->valid()) {
+				this->set(std::forward<Otherwise>(other));
+			}
+			return get<T>();
+		}
+
+		template <typename K>
+		decltype(auto) operator[](K&& k) const& {
+			auto keys = meta::tuplefy(key, std::forward<K>(k));
+			return table_proxy<Table, decltype(keys)>(tbl, std::move(keys));
+		}
+
+		template <typename K>
+		decltype(auto) operator[](K&& k) & {
+			auto keys = meta::tuplefy(key, std::forward<K>(k));
+			return table_proxy<Table, decltype(keys)>(tbl, std::move(keys));
+		}
+
+		template <typename K>
+		decltype(auto) operator[](K&& k) && {
+			auto keys = meta::tuplefy(std::move(key), std::forward<K>(k));
+			return table_proxy<Table, decltype(keys)>(tbl, std::move(keys));
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) call(Args&&... args) {
+			lua_State* L = this->lua_state();
+			push(L);
+			int idx = lua_gettop(L);
+			stack_aligned_function func(L, idx);
+			return func.call<Ret...>(std::forward<Args>(args)...);
+		}
+
+		template <typename... Args>
+		decltype(auto) operator()(Args&&... args) {
+			return call<>(std::forward<Args>(args)...);
+		}
+
+		bool valid() const {
+			auto pp = stack::push_pop(tbl);
+			auto p = stack::probe_get_field<std::is_same<meta::unqualified_t<Table>, global_table>::value>(lua_state(), key, lua_gettop(lua_state()));
+			lua_pop(lua_state(), p.levels);
+			return p;
+		}
+
+		int push() const noexcept {
+			return push(this->lua_state());
+		}
+
+		int push(lua_State* L) const noexcept {
+			if constexpr (std::is_same_v<meta::unqualified_t<Table>, global_table> || is_stack_table_v<meta::unqualified_t<Table>>) {
+				auto pp = stack::push_pop<true>(tbl);
+				int tableindex = pp.index_of(tbl);
+				int top_index = lua_gettop(L);
+				stack::get_field<true>(lua_state(), key, tableindex);
+				lua_replace(L, top_index + 1);
+				lua_settop(L, top_index + 1);
+			}
+			else {
+				auto pp = stack::push_pop<false>(tbl);
+				int tableindex = pp.index_of(tbl);
+				int aftertableindex = lua_gettop(L);
+				stack::get_field<false>(lua_state(), key, tableindex);
+				lua_replace(L, tableindex);
+				lua_settop(L, aftertableindex + 1);
+			}
+			return 1;
+		}
+
+		type get_type() const {
+			type t = type::none;
+			auto pp = stack::push_pop(tbl);
+			auto p = stack::probe_get_field<std::is_same<meta::unqualified_t<Table>, global_table>::value>(lua_state(), key, lua_gettop(lua_state()));
+			if (p) {
+				t = type_of(lua_state(), -1);
+			}
+			lua_pop(lua_state(), p.levels);
+			return t;
+		}
+
+		lua_State* lua_state() const {
+			return tbl.lua_state();
+		}
+
+		table_proxy& force() {
+			if (!this->valid()) {
+				this->set(new_table());
+			}
+			return *this;
+		}
+	};
+
+	template <typename Table, typename Key, typename T>
+	inline bool operator==(T&& left, const table_proxy<Table, Key>& right) {
+		using G = decltype(stack::get<T>(nullptr, 0));
+		return right.template get<optional<G>>() == left;
+	}
+
+	template <typename Table, typename Key, typename T>
+	inline bool operator==(const table_proxy<Table, Key>& right, T&& left) {
+		using G = decltype(stack::get<T>(nullptr, 0));
+		return right.template get<optional<G>>() == left;
+	}
+
+	template <typename Table, typename Key, typename T>
+	inline bool operator!=(T&& left, const table_proxy<Table, Key>& right) {
+		using G = decltype(stack::get<T>(nullptr, 0));
+		return right.template get<optional<G>>() != left;
+	}
+
+	template <typename Table, typename Key, typename T>
+	inline bool operator!=(const table_proxy<Table, Key>& right, T&& left) {
+		using G = decltype(stack::get<T>(nullptr, 0));
+		return right.template get<optional<G>>() != left;
+	}
+
+	template <typename Table, typename Key>
+	inline bool operator==(lua_nil_t, const table_proxy<Table, Key>& right) {
+		return !right.valid();
+	}
+
+	template <typename Table, typename Key>
+	inline bool operator==(const table_proxy<Table, Key>& right, lua_nil_t) {
+		return !right.valid();
+	}
+
+	template <typename Table, typename Key>
+	inline bool operator!=(lua_nil_t, const table_proxy<Table, Key>& right) {
+		return right.valid();
+	}
+
+	template <typename Table, typename Key>
+	inline bool operator!=(const table_proxy<Table, Key>& right, lua_nil_t) {
+		return right.valid();
+	}
+
+	template <bool b>
+	template <typename Super>
+	basic_reference<b>& basic_reference<b>::operator=(proxy_base<Super>&& r) {
+		basic_reference<b> v = r;
+		this->operator=(std::move(v));
+		return *this;
+	}
+
+	template <bool b>
+	template <typename Super>
+	basic_reference<b>& basic_reference<b>::operator=(const proxy_base<Super>& r) {
+		basic_reference<b> v = r;
+		this->operator=(std::move(v));
+		return *this;
+	}
+
+	namespace stack {
+		template <typename Table, typename Key>
+		struct unqualified_pusher<table_proxy<Table, Key>> {
+			static int push(lua_State* L, const table_proxy<Table, Key>& p) {
+				return p.push(L);
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+#endif // SOL_TABLE_PROXY_HPP
diff --git a/extern/sol3/sol/thread.hpp b/extern/sol3/sol/thread.hpp
new file mode 100644
index 0000000000..fc933d0e9a
--- /dev/null
+++ b/extern/sol3/sol/thread.hpp
@@ -0,0 +1,189 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_THREAD_HPP
+#define SOL_THREAD_HPP
+
+#include <sol/reference.hpp>
+#include <sol/object.hpp>
+#include <sol/stack.hpp>
+#include <sol/state_view.hpp>
+
+namespace sol {
+	struct lua_thread_state {
+		lua_State* L;
+
+		lua_thread_state(lua_State* Ls) : L(Ls) {
+		}
+
+		lua_State* lua_state() const noexcept {
+			return L;
+		}
+		operator lua_State*() const noexcept {
+			return lua_state();
+		}
+		lua_State* operator->() const noexcept {
+			return lua_state();
+		}
+	};
+
+	namespace stack {
+		template <>
+		struct unqualified_pusher<lua_thread_state> {
+			int push(lua_State*, lua_thread_state lts) {
+				lua_pushthread(lts.L);
+				return 1;
+			}
+		};
+
+		template <>
+		struct unqualified_getter<lua_thread_state> {
+			lua_thread_state get(lua_State* L, int index, record& tracking) {
+				tracking.use(1);
+				lua_thread_state lts(lua_tothread(L, index));
+				return lts;
+			}
+		};
+
+		template <>
+		struct unqualified_check_getter<lua_thread_state> {
+			template <typename Handler>
+			optional<lua_thread_state> get(lua_State* L, int index, Handler&& handler, record& tracking) {
+				lua_thread_state lts(lua_tothread(L, index));
+				if (lts.lua_state() == nullptr) {
+					handler(L, index, type::thread, type_of(L, index), "value is not a valid thread type");
+					return nullopt;
+				}
+				tracking.use(1);
+				return lts;
+			}
+		};
+	} // namespace stack
+
+	template <typename ref_t>
+	class basic_thread : public basic_object<ref_t> {
+	private:
+		using base_t = basic_object<ref_t>;
+
+	public:
+		using base_t::lua_state;
+
+		basic_thread() noexcept = default;
+		basic_thread(const basic_thread&) = default;
+		basic_thread(basic_thread&&) = default;
+		template <typename T,
+		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_thread>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_thread(T&& r) : base_t(std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_thread>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		basic_thread(const stack_reference& r) : basic_thread(r.lua_state(), r.stack_index()) {};
+		basic_thread(stack_reference&& r) : basic_thread(r.lua_state(), r.stack_index()) {};
+		basic_thread& operator=(const basic_thread&) = default;
+		basic_thread& operator=(basic_thread&&) = default;
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_thread(lua_State* L, T&& r) : base_t(L, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_thread>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		basic_thread(lua_State* L, int index = -1) : base_t(L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			constructor_handler handler {};
+			stack::check<basic_thread>(L, index, handler);
+#endif // Safety
+		}
+		basic_thread(lua_State* L, ref_index index) : base_t(L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_thread>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		basic_thread(lua_State* L, lua_State* actualthread) : basic_thread(L, lua_thread_state { actualthread }) {
+		}
+		basic_thread(lua_State* L, this_state actualthread) : basic_thread(L, lua_thread_state { actualthread.L }) {
+		}
+		basic_thread(lua_State* L, lua_thread_state actualthread) : base_t(L, -stack::push(L, actualthread)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			constructor_handler handler {};
+			stack::check<basic_thread>(lua_state(), -1, handler);
+#endif // Safety
+			if (!is_stack_based<base_t>::value) {
+				lua_pop(lua_state(), 1);
+			}
+		}
+
+		state_view state() const {
+			return state_view(this->thread_state());
+		}
+
+		bool is_main_thread() const {
+			return stack::is_main_thread(this->thread_state());
+		}
+
+		lua_State* thread_state() const {
+			auto pp = stack::push_pop(*this);
+			lua_State* lthread = lua_tothread(lua_state(), -1);
+			return lthread;
+		}
+
+		thread_status status() const {
+			lua_State* lthread = thread_state();
+			auto lstat = static_cast<thread_status>(lua_status(lthread));
+			if (lstat == thread_status::ok) {
+				lua_Debug ar;
+				if (lua_getstack(lthread, 0, &ar) > 0)
+					return thread_status::ok;
+				else if (lua_gettop(lthread) == 0)
+					return thread_status::dead;
+				else
+					return thread_status::yielded;
+			}
+			return lstat;
+		}
+
+		basic_thread create() {
+			return create(lua_state());
+		}
+
+		static basic_thread create(lua_State* L) {
+			lua_newthread(L);
+			basic_thread result(L);
+			if (!is_stack_based<base_t>::value) {
+				lua_pop(L, 1);
+			}
+			return result;
+		}
+	};
+
+	typedef basic_thread<reference> thread;
+	typedef basic_thread<stack_reference> stack_thread;
+} // namespace sol
+
+#endif // SOL_THREAD_HPP
diff --git a/extern/sol3/sol/tie.hpp b/extern/sol3/sol/tie.hpp
new file mode 100644
index 0000000000..6f6b7dc46d
--- /dev/null
+++ b/extern/sol3/sol/tie.hpp
@@ -0,0 +1,98 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_TIE_HPP
+#define SOL_TIE_HPP
+
+#include <sol/traits.hpp>
+
+namespace sol {
+
+	namespace detail {
+		template <typename T>
+		struct is_speshul : std::false_type { };
+	} // namespace detail
+
+	template <typename T>
+	struct tie_size : std::tuple_size<T> { };
+
+	template <typename T>
+	struct is_tieable : std::integral_constant<bool, (::sol::tie_size<T>::value > 0)> { };
+
+	template <typename... Tn>
+	struct tie_t : public std::tuple<std::add_lvalue_reference_t<Tn>...> {
+	private:
+		typedef std::tuple<std::add_lvalue_reference_t<Tn>...> base_t;
+
+		template <typename T>
+		void set(std::false_type, T&& target) {
+			std::get<0>(*this) = std::forward<T>(target);
+		}
+
+		template <typename T>
+		void set(std::true_type, T&& target) {
+			typedef tie_size<meta::unqualified_t<T>> value_size;
+			typedef tie_size<std::tuple<Tn...>> tie_size;
+			typedef meta::conditional_t<(value_size::value < tie_size::value), value_size, tie_size> indices_size;
+			typedef std::make_index_sequence<indices_size::value> indices;
+			set_extra(detail::is_speshul<meta::unqualified_t<T>>(), indices(), std::forward<T>(target));
+		}
+
+		template <std::size_t... I, typename T>
+		void set_extra(std::true_type, std::index_sequence<I...>, T&& target) {
+			using std::get;
+			(void)detail::swallow { 0, (get<I>(static_cast<base_t&>(*this)) = get<I>(types<Tn...>(), target), 0)..., 0 };
+		}
+
+		template <std::size_t... I, typename T>
+		void set_extra(std::false_type, std::index_sequence<I...>, T&& target) {
+			using std::get;
+			(void)detail::swallow { 0, (get<I>(static_cast<base_t&>(*this)) = get<I>(target), 0)..., 0 };
+		}
+
+	public:
+		using base_t::base_t;
+
+		template <typename T>
+		tie_t& operator=(T&& value) {
+			typedef is_tieable<meta::unqualified_t<T>> tieable;
+			set(tieable(), std::forward<T>(value));
+			return *this;
+		}
+	};
+
+	template <typename... Tn>
+	struct tie_size<tie_t<Tn...>> : std::tuple_size<std::tuple<Tn...>> { };
+
+	namespace adl_barrier_detail {
+		template <typename... Tn>
+		inline tie_t<std::remove_reference_t<Tn>...> tie(Tn&&... argn) {
+			return tie_t<std::remove_reference_t<Tn>...>(std::forward<Tn>(argn)...);
+		}
+	} // namespace adl_barrier_detail
+
+	using namespace adl_barrier_detail;
+
+} // namespace sol
+
+#endif // SOL_TIE_HPP
diff --git a/extern/sol3/sol/traits.hpp b/extern/sol3/sol/traits.hpp
new file mode 100644
index 0000000000..5af4cb374a
--- /dev/null
+++ b/extern/sol3/sol/traits.hpp
@@ -0,0 +1,739 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_TRAITS_HPP
+#define SOL_TRAITS_HPP
+
+#include <sol/tuple.hpp>
+#include <sol/bind_traits.hpp>
+#include <sol/pointer_like.hpp>
+#include <sol/base_traits.hpp>
+#include <sol/string_view.hpp>
+
+#include <type_traits>
+#include <cstdint>
+#include <memory>
+#include <functional>
+#include <array>
+#include <iterator>
+#include <iosfwd>
+#if SOL_IS_ON(SOL_STD_VARIANT_I_)
+#include <variant>
+#endif // variant is weird on XCode, thanks XCode
+
+
+namespace sol { namespace meta {
+	template <typename T>
+	struct unwrapped {
+		typedef T type;
+	};
+
+	template <typename T>
+	struct unwrapped<std::reference_wrapper<T>> {
+		typedef T type;
+	};
+
+	template <typename T>
+	using unwrapped_t = typename unwrapped<T>::type;
+
+	template <typename T>
+	struct unwrap_unqualified : unwrapped<unqualified_t<T>> { };
+
+	template <typename T>
+	using unwrap_unqualified_t = typename unwrap_unqualified<T>::type;
+
+	template <typename T>
+	struct remove_member_pointer;
+
+	template <typename R, typename T>
+	struct remove_member_pointer<R T::*> {
+		typedef R type;
+	};
+
+	template <typename R, typename T>
+	struct remove_member_pointer<R T::*const> {
+		typedef R type;
+	};
+
+	template <typename T>
+	using remove_member_pointer_t = remove_member_pointer<T>;
+
+	template <typename T, typename...>
+	struct all_same : std::true_type { };
+
+	template <typename T, typename U, typename... Args>
+	struct all_same<T, U, Args...> : std::integral_constant<bool, std::is_same<T, U>::value && all_same<T, Args...>::value> { };
+
+	template <typename T, typename...>
+	struct any_same : std::false_type { };
+
+	template <typename T, typename U, typename... Args>
+	struct any_same<T, U, Args...> : std::integral_constant<bool, std::is_same<T, U>::value || any_same<T, Args...>::value> { };
+
+	template <typename T, typename... Args>
+	constexpr inline bool any_same_v = any_same<T, Args...>::value;
+
+	template <bool B>
+	using boolean = std::integral_constant<bool, B>;
+
+	template <bool B>
+	constexpr inline bool boolean_v = boolean<B>::value;
+
+	template <typename T>
+	using neg = boolean<!T::value>;
+
+	template <typename T>
+	constexpr inline bool neg_v = neg<T>::value;
+
+	template <typename... Args>
+	struct all : boolean<true> { };
+
+	template <typename T, typename... Args>
+	struct all<T, Args...> : std::conditional_t<T::value, all<Args...>, boolean<false>> { };
+
+	template <typename... Args>
+	struct any : boolean<false> { };
+
+	template <typename T, typename... Args>
+	struct any<T, Args...> : std::conditional_t<T::value, boolean<true>, any<Args...>> { };
+
+	template <typename... Args>
+	constexpr inline bool all_v = all<Args...>::value;
+
+	template <typename... Args>
+	constexpr inline bool any_v = any<Args...>::value;
+
+	enum class enable_t { _ };
+
+	constexpr const auto enabler = enable_t::_;
+
+	template <bool value, typename T = void>
+	using disable_if_t = std::enable_if_t<!value, T>;
+
+	template <typename... Args>
+	using enable = std::enable_if_t<all<Args...>::value, enable_t>;
+
+	template <typename... Args>
+	using disable = std::enable_if_t<neg<all<Args...>>::value, enable_t>;
+
+	template <typename... Args>
+	using enable_any = std::enable_if_t<any<Args...>::value, enable_t>;
+
+	template <typename... Args>
+	using disable_any = std::enable_if_t<neg<any<Args...>>::value, enable_t>;
+
+	template <typename V, typename... Vs>
+	struct find_in_pack_v : boolean<false> { };
+
+	template <typename V, typename Vs1, typename... Vs>
+	struct find_in_pack_v<V, Vs1, Vs...> : any<boolean<(V::value == Vs1::value)>, find_in_pack_v<V, Vs...>> { };
+
+	namespace meta_detail {
+		template <std::size_t I, typename T, typename... Args>
+		struct index_in_pack : std::integral_constant<std::size_t, SIZE_MAX> { };
+
+		template <std::size_t I, typename T, typename T1, typename... Args>
+		struct index_in_pack<I, T, T1, Args...>
+		: conditional_t<std::is_same<T, T1>::value, std::integral_constant<std::ptrdiff_t, I>, index_in_pack<I + 1, T, Args...>> { };
+	} // namespace meta_detail
+
+	template <typename T, typename... Args>
+	struct index_in_pack : meta_detail::index_in_pack<0, T, Args...> { };
+
+	template <typename T, typename List>
+	struct index_in : meta_detail::index_in_pack<0, T, List> { };
+
+	template <typename T, typename... Args>
+	struct index_in<T, types<Args...>> : meta_detail::index_in_pack<0, T, Args...> { };
+
+	template <std::size_t I, typename... Args>
+	struct at_in_pack { };
+
+	template <std::size_t I, typename... Args>
+	using at_in_pack_t = typename at_in_pack<I, Args...>::type;
+
+	template <std::size_t I, typename Arg, typename... Args>
+	struct at_in_pack<I, Arg, Args...> : std::conditional<I == 0, Arg, at_in_pack_t<I - 1, Args...>> { };
+
+	template <typename Arg, typename... Args>
+	struct at_in_pack<0, Arg, Args...> {
+		typedef Arg type;
+	};
+
+	namespace meta_detail {
+		template <typename, typename TI>
+		using on_even = meta::boolean<(TI::value % 2) == 0>;
+
+		template <typename, typename TI>
+		using on_odd = meta::boolean<(TI::value % 2) == 1>;
+
+		template <typename, typename>
+		using on_always = std::true_type;
+
+		template <template <typename...> class When, std::size_t Limit, std::size_t I, template <typename...> class Pred, typename... Ts>
+		struct count_when_for_pack : std::integral_constant<std::size_t, 0> { };
+		template <template <typename...> class When, std::size_t Limit, std::size_t I, template <typename...> class Pred, typename T, typename... Ts>
+			          struct count_when_for_pack<When, Limit, I, Pred, T, Ts...> : conditional_t < sizeof...(Ts)
+			     == 0
+			|| Limit<2, std::integral_constant<std::size_t, I + static_cast<std::size_t>(Limit != 0 && Pred<T>::value)>,
+			     count_when_for_pack<When, Limit - static_cast<std::size_t>(When<T, std::integral_constant<std::size_t, I>>::value),
+			          I + static_cast<std::size_t>(When<T, std::integral_constant<std::size_t, I>>::value&& Pred<T>::value), Pred, Ts...>> { };
+	} // namespace meta_detail
+
+	template <template <typename...> class Pred, typename... Ts>
+	struct count_for_pack : meta_detail::count_when_for_pack<meta_detail::on_always, sizeof...(Ts), 0, Pred, Ts...> { };
+
+	template <template <typename...> class Pred, typename... Ts>
+	inline constexpr std::size_t count_for_pack_v = count_for_pack<Pred, Ts...>::value;
+
+	template <template <typename...> class Pred, typename List>
+	struct count_for;
+
+	template <template <typename...> class Pred, typename... Args>
+	struct count_for<Pred, types<Args...>> : count_for_pack<Pred, Args...> { };
+
+	template <std::size_t Limit, template <typename...> class Pred, typename... Ts>
+	struct count_for_to_pack : meta_detail::count_when_for_pack<meta_detail::on_always, Limit, 0, Pred, Ts...> { };
+
+	template <std::size_t Limit, template <typename...> class Pred, typename... Ts>
+	inline constexpr std::size_t count_for_to_pack_v = count_for_to_pack<Limit, Pred, Ts...>::value;
+
+	template <template <typename...> class When, std::size_t Limit, template <typename...> class Pred, typename... Ts>
+	struct count_when_for_to_pack : meta_detail::count_when_for_pack<When, Limit, 0, Pred, Ts...> { };
+
+	template <template <typename...> class When, std::size_t Limit, template <typename...> class Pred, typename... Ts>
+	inline constexpr std::size_t count_when_for_to_pack_v = count_when_for_to_pack<When, Limit, Pred, Ts...>::value;
+
+	template <template <typename...> class Pred, typename... Ts>
+	using count_even_for_pack = count_when_for_to_pack<meta_detail::on_even, sizeof...(Ts), Pred, Ts...>;
+
+	template <template <typename...> class Pred, typename... Ts>
+	inline constexpr std::size_t count_even_for_pack_v = count_even_for_pack<Pred, Ts...>::value;
+
+	template <template <typename...> class Pred, typename... Ts>
+	using count_odd_for_pack = count_when_for_to_pack<meta_detail::on_odd, sizeof...(Ts), Pred, Ts...>;
+
+	template <template <typename...> class Pred, typename... Ts>
+	inline constexpr std::size_t count_odd_for_pack_v = count_odd_for_pack<Pred, Ts...>::value;
+
+	template <typename... Args>
+	struct return_type {
+		typedef std::tuple<Args...> type;
+	};
+
+	template <typename T>
+	struct return_type<T> {
+		typedef T type;
+	};
+
+	template <>
+	struct return_type<> {
+		typedef void type;
+	};
+
+	template <typename... Args>
+	using return_type_t = typename return_type<Args...>::type;
+
+	namespace meta_detail {
+		template <typename>
+		struct always_true : std::true_type { };
+		struct is_invokable_tester {
+			template <typename Fun, typename... Args>
+			static always_true<decltype(std::declval<Fun>()(std::declval<Args>()...))> test(int);
+			template <typename...>
+			static std::false_type test(...);
+		};
+	} // namespace meta_detail
+
+	template <typename T>
+	struct is_invokable;
+	template <typename Fun, typename... Args>
+	struct is_invokable<Fun(Args...)> : decltype(meta_detail::is_invokable_tester::test<Fun, Args...>(0)) { };
+
+	namespace meta_detail {
+
+		template <typename T, typename = void>
+		struct is_invocable : std::is_function<std::remove_pointer_t<T>> { };
+
+		template <typename T>
+		struct is_invocable<T,
+			std::enable_if_t<std::is_final<unqualified_t<T>>::value && std::is_class<unqualified_t<T>>::value
+			     && std::is_same<decltype(void(&T::operator())), void>::value>> { };
+
+		template <typename T>
+		struct is_invocable<T,
+			std::enable_if_t<!std::is_final<unqualified_t<T>>::value && std::is_class<unqualified_t<T>>::value
+			     && std::is_destructible<unqualified_t<T>>::value>> {
+			struct F {
+				void operator()() {};
+			};
+			struct Derived : T, F { };
+			template <typename U, U>
+			struct Check;
+
+			template <typename V>
+			static sfinae_no_t test(Check<void (F::*)(), &V::operator()>*);
+
+			template <typename>
+			static sfinae_yes_t test(...);
+
+			static constexpr bool value = std::is_same_v<decltype(test<Derived>(0)), sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct is_invocable<T,
+			std::enable_if_t<!std::is_final<unqualified_t<T>>::value && std::is_class<unqualified_t<T>>::value
+			     && !std::is_destructible<unqualified_t<T>>::value>> {
+			struct F {
+				void operator()() {};
+			};
+			struct Derived : T, F {
+				~Derived() = delete;
+			};
+			template <typename U, U>
+			struct Check;
+
+			template <typename V>
+			static sfinae_no_t test(Check<void (F::*)(), &V::operator()>*);
+
+			template <typename>
+			static sfinae_yes_t test(...);
+
+			static constexpr bool value = std::is_same_v<decltype(test<Derived>(0)), sfinae_yes_t>;
+		};
+
+		struct has_begin_end_impl {
+			template <typename T, typename U = unqualified_t<T>, typename B = decltype(std::declval<U&>().begin()),
+				typename E = decltype(std::declval<U&>().end())>
+			static std::true_type test(int);
+
+			template <typename...>
+			static std::false_type test(...);
+		};
+
+		struct has_key_type_impl {
+			template <typename T, typename U = unqualified_t<T>, typename V = typename U::key_type>
+			static std::true_type test(int);
+
+			template <typename...>
+			static std::false_type test(...);
+		};
+
+		struct has_key_comp_impl {
+			template <typename T, typename V = decltype(std::declval<unqualified_t<T>>().key_comp())>
+			static std::true_type test(int);
+
+			template <typename...>
+			static std::false_type test(...);
+		};
+
+		struct has_load_factor_impl {
+			template <typename T, typename V = decltype(std::declval<unqualified_t<T>>().load_factor())>
+			static std::true_type test(int);
+
+			template <typename...>
+			static std::false_type test(...);
+		};
+
+		struct has_mapped_type_impl {
+			template <typename T, typename V = typename unqualified_t<T>::mapped_type>
+			static std::true_type test(int);
+
+			template <typename...>
+			static std::false_type test(...);
+		};
+
+		struct has_value_type_impl {
+			template <typename T, typename V = typename unqualified_t<T>::value_type>
+			static std::true_type test(int);
+
+			template <typename...>
+			static std::false_type test(...);
+		};
+
+		struct has_iterator_impl {
+			template <typename T, typename V = typename unqualified_t<T>::iterator>
+			static std::true_type test(int);
+
+			template <typename...>
+			static std::false_type test(...);
+		};
+
+		struct has_key_value_pair_impl {
+			template <typename T, typename U = unqualified_t<T>, typename V = typename U::value_type, typename F = decltype(std::declval<V&>().first),
+				typename S = decltype(std::declval<V&>().second)>
+			static std::true_type test(int);
+
+			template <typename...>
+			static std::false_type test(...);
+		};
+
+		template <typename T>
+		struct has_push_back_test {
+		private:
+			template <typename C>
+			static sfinae_yes_t test(decltype(std::declval<C>().push_back(std::declval<std::add_rvalue_reference_t<typename C::value_type>>()))*);
+			template <typename C>
+			static sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_insert_with_iterator_test {
+		private:
+			template <typename C>
+			static sfinae_yes_t test(decltype(std::declval<C>().insert(
+				std::declval<std::add_rvalue_reference_t<typename C::iterator>>(), std::declval<std::add_rvalue_reference_t<typename C::value_type>>()))*);
+			template <typename C>
+			static sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = !std::is_same_v<decltype(test<T>(0)), sfinae_no_t>;
+		};
+
+		template <typename T>
+		struct has_insert_test {
+		private:
+			template <typename C>
+			static sfinae_yes_t test(decltype(std::declval<C>().insert(std::declval<std::add_rvalue_reference_t<typename C::value_type>>()))*);
+			template <typename C>
+			static sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = !std::is_same_v<decltype(test<T>(0)), sfinae_no_t>;
+		};
+
+		template <typename T>
+		struct has_insert_after_test {
+		private:
+			template <typename C>
+			static sfinae_yes_t test(decltype(std::declval<C>().insert_after(std::declval<std::add_rvalue_reference_t<typename C::const_iterator>>(),
+				std::declval<std::add_rvalue_reference_t<typename C::value_type>>()))*);
+			template <typename C>
+			static sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_size_test {
+		private:
+			template <typename C>
+			static sfinae_yes_t test(decltype(std::declval<C>().size())*);
+			template <typename C>
+			static sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_max_size_test {
+		private:
+			template <typename C>
+			static sfinae_yes_t test(decltype(std::declval<C>().max_size())*);
+			template <typename C>
+			static sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_to_string_test {
+		private:
+			template <typename C>
+			static sfinae_yes_t test(decltype(std::declval<C>().to_string())*);
+			template <typename C>
+			static sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), sfinae_yes_t>;
+		};
+
+		template <typename T, typename U, typename = void>
+		class supports_op_less_test : public std::false_type { };
+		template <typename T, typename U>
+		class supports_op_less_test<T, U, void_t<decltype(std::declval<T&>() < std::declval<U&>())>>
+		: public std::integral_constant<bool,
+#if SOL_IS_ON(SOL_STD_VARIANT_I_)
+			  !is_specialization_of_v<unqualified_t<T>, std::variant> && !is_specialization_of_v<unqualified_t<U>, std::variant>
+#else
+			  true
+#endif
+			  > {
+		};
+
+		template <typename T, typename U, typename = void>
+		class supports_op_equal_test : public std::false_type { };
+		template <typename T, typename U>
+		class supports_op_equal_test<T, U, void_t<decltype(std::declval<T&>() == std::declval<U&>())>>
+		: public std::integral_constant<bool,
+#if SOL_IS_ON(SOL_STD_VARIANT_I_)
+			  !is_specialization_of_v<unqualified_t<T>, std::variant> && !is_specialization_of_v<unqualified_t<U>, std::variant>
+#else
+			  true
+#endif
+			  > {
+		};
+
+		template <typename T, typename U, typename = void>
+		class supports_op_less_equal_test : public std::false_type { };
+		template <typename T, typename U>
+		class supports_op_less_equal_test<T, U, void_t<decltype(std::declval<T&>() <= std::declval<U&>())>>
+		: public std::integral_constant<bool,
+#if SOL_IS_ON(SOL_STD_VARIANT_I_)
+			  !is_specialization_of_v<unqualified_t<T>, std::variant> && !is_specialization_of_v<unqualified_t<U>, std::variant>
+#else
+			  true
+#endif
+			  > {
+		};
+
+		template <typename T, typename U, typename = void>
+		class supports_op_left_shift_test : public std::false_type { };
+		template <typename T, typename U>
+		class supports_op_left_shift_test<T, U, void_t<decltype(std::declval<T&>() << std::declval<U&>())>> : public std::true_type { };
+
+		template <typename T, typename = void>
+		class supports_adl_to_string_test : public std::false_type { };
+		template <typename T>
+		class supports_adl_to_string_test<T, void_t<decltype(to_string(std::declval<const T&>()))>> : public std::true_type { };
+
+		template <typename T, bool b>
+		struct is_matched_lookup_impl : std::false_type { };
+		template <typename T>
+		struct is_matched_lookup_impl<T, true> : std::is_same<typename T::key_type, typename T::value_type> { };
+
+		template <typename T>
+		using non_void_t = meta::conditional_t<std::is_void_v<T>, ::sol::detail::unchecked_t, T>;
+	} // namespace meta_detail
+
+	template <typename T, typename U = T>
+	class supports_op_less : public meta_detail::supports_op_less_test<T, U> { };
+
+	template <typename T, typename U = T>
+	class supports_op_equal : public meta_detail::supports_op_equal_test<T, U> { };
+
+	template <typename T, typename U = T>
+	class supports_op_less_equal : public meta_detail::supports_op_less_equal_test<T, U> { };
+
+	template <typename T, typename U = T>
+	class supports_op_left_shift : public meta_detail::supports_op_left_shift_test<T, U> { };
+
+	template <typename T>
+	class supports_adl_to_string : public meta_detail::supports_adl_to_string_test<T> { };
+
+	template <typename T>
+	class supports_to_string_member : public meta::boolean<meta_detail::has_to_string_test<meta_detail::non_void_t<T>>::value> { };
+
+	template <typename T>
+	using is_invocable = boolean<meta_detail::is_invocable<T>::value>;
+
+	template <typename T>
+	constexpr inline bool is_invocable_v = is_invocable<T>::value;
+
+	template <typename T>
+	struct has_begin_end : decltype(meta_detail::has_begin_end_impl::test<T>(0)) { };
+
+	template <typename T>
+	constexpr inline bool has_begin_end_v = has_begin_end<T>::value;
+
+	template <typename T>
+	struct has_key_value_pair : decltype(meta_detail::has_key_value_pair_impl::test<T>(0)) { };
+
+	template <typename T>
+	struct has_key_type : decltype(meta_detail::has_key_type_impl::test<T>(0)) { };
+
+	template <typename T>
+	struct has_key_comp : decltype(meta_detail::has_key_comp_impl::test<T>(0)) { };
+
+	template <typename T>
+	struct has_load_factor : decltype(meta_detail::has_load_factor_impl::test<T>(0)) { };
+
+	template <typename T>
+	struct has_mapped_type : decltype(meta_detail::has_mapped_type_impl::test<T>(0)) { };
+
+	template <typename T>
+	struct has_iterator : decltype(meta_detail::has_iterator_impl::test<T>(0)) { };
+
+	template <typename T>
+	struct has_value_type : decltype(meta_detail::has_value_type_impl::test<T>(0)) { };
+
+	template <typename T>
+	using has_push_back = meta::boolean<meta_detail::has_push_back_test<T>::value>;
+
+	template <typename T>
+	using has_max_size = meta::boolean<meta_detail::has_max_size_test<T>::value>;
+
+	template <typename T>
+	using has_insert = meta::boolean<meta_detail::has_insert_test<T>::value>;
+
+	template <typename T>
+	using has_insert_with_iterator = meta::boolean<meta_detail::has_insert_with_iterator_test<T>::value>;
+
+	template <typename T>
+	using has_insert_after = meta::boolean<meta_detail::has_insert_after_test<T>::value>;
+
+	template <typename T>
+	using has_size = meta::boolean<meta_detail::has_size_test<T>::value>;
+
+	template <typename T>
+	using is_associative = meta::all<has_key_type<T>, has_key_value_pair<T>, has_mapped_type<T>>;
+
+	template <typename T>
+	using is_lookup = meta::all<has_key_type<T>, has_value_type<T>>;
+
+	template <typename T>
+	using is_ordered = meta::all<has_key_comp<T>, meta::neg<has_load_factor<T>>>;
+
+	template <typename T>
+	using is_matched_lookup = meta_detail::is_matched_lookup_impl<T, is_lookup<T>::value>;
+
+	template <typename T>
+	using is_initializer_list = meta::is_specialization_of<T, std::initializer_list>;
+
+	template <typename T>
+	constexpr inline bool is_initializer_list_v = is_initializer_list<T>::value;
+
+	template <typename T, typename CharT = char>
+	using is_string_literal_array_of = boolean<std::is_array_v<T> && std::is_same_v<std::remove_all_extents_t<T>, CharT>>;
+
+	template <typename T, typename CharT = char>
+	constexpr inline bool is_string_literal_array_of_v = is_string_literal_array_of<T, CharT>::value;
+
+	template <typename T>
+	using is_string_literal_array = boolean<std::is_array_v<T> && any_same_v<std::remove_all_extents_t<T>, char,
+#if SOL_IS_ON(SOL_CHAR8_T_I_)
+	char8_t,
+#endif
+	char16_t, char32_t, wchar_t>>;
+
+	template <typename T>
+	constexpr inline bool is_string_literal_array_v = is_string_literal_array<T>::value;
+
+	template <typename T, typename CharT>
+	struct is_string_of : std::false_type { };
+
+	template <typename CharT, typename CharTargetT, typename TraitsT, typename AllocT>
+	struct is_string_of<std::basic_string<CharT, TraitsT, AllocT>, CharTargetT> : std::is_same<CharT, CharTargetT> { };
+
+	template <typename T, typename CharT>
+	constexpr inline bool is_string_of_v = is_string_of<T, CharT>::value;
+
+	template <typename T, typename CharT>
+	struct is_string_view_of : std::false_type { };
+
+	template <typename CharT, typename CharTargetT, typename TraitsT>
+	struct is_string_view_of<std::basic_string_view<CharT, TraitsT>, CharTargetT> : std::is_same<CharT, CharTargetT> { };
+
+	template <typename T, typename CharT>
+	constexpr inline bool is_string_view_of_v = is_string_view_of<T, CharT>::value;
+
+	template <typename T>
+	using is_string_like
+		= meta::boolean<is_specialization_of_v<T, std::basic_string> || is_specialization_of_v<T, std::basic_string_view> || is_string_literal_array_v<T>>;
+
+	template <typename T>
+	constexpr inline bool is_string_like_v = is_string_like<T>::value;
+
+	template <typename T, typename CharT = char>
+	using is_string_constructible = meta::boolean<
+		is_string_literal_array_of_v<T,
+		     CharT> || std::is_same_v<T, const CharT*> || std::is_same_v<T, CharT> || is_string_of_v<T, CharT> || std::is_same_v<T, std::initializer_list<CharT>> || is_string_view_of_v<T, CharT> || std::is_null_pointer_v<T>>;
+
+	template <typename T, typename CharT = char>
+	constexpr inline bool is_string_constructible_v = is_string_constructible<T, CharT>::value;
+
+	template <typename T>
+	using is_string_like_or_constructible = meta::boolean<is_string_like_v<T> || is_string_constructible_v<T>>;
+
+	template <typename T>
+	struct is_pair : std::false_type { };
+
+	template <typename T1, typename T2>
+	struct is_pair<std::pair<T1, T2>> : std::true_type { };
+
+	template <typename T, typename Char>
+	using is_c_str_of = any<std::is_same<T, const Char*>, std::is_same<T, Char const* const>, std::is_same<T, Char*>, is_string_literal_array_of<T, Char>>;
+
+	template <typename T, typename Char>
+	constexpr inline bool is_c_str_of_v = is_c_str_of<T, Char>::value;
+
+	template <typename T>
+	using is_c_str = is_c_str_of<T, char>;
+
+	template <typename T>
+	constexpr inline bool is_c_str_v = is_c_str<T>::value;
+
+	template <typename T, typename Char>
+	using is_c_str_or_string_of = any<is_c_str_of<T, Char>, is_string_of<T, Char>>;
+
+	template <typename T, typename Char>
+	constexpr inline bool is_c_str_or_string_of_v = is_c_str_or_string_of<T, Char>::value;
+
+	template <typename T>
+	using is_c_str_or_string = is_c_str_or_string_of<T, char>;
+
+	template <typename T>
+	constexpr inline bool is_c_str_or_string_v = is_c_str_or_string<T>::value;
+
+	template <typename T>
+	struct is_move_only : all<neg<std::is_reference<T>>, neg<std::is_copy_constructible<unqualified_t<T>>>, std::is_move_constructible<unqualified_t<T>>> { };
+
+	template <typename T>
+	using is_not_move_only = neg<is_move_only<T>>;
+
+	namespace meta_detail {
+		template <typename T>
+		decltype(auto) force_tuple(T&& x) {
+			if constexpr (meta::is_specialization_of_v<meta::unqualified_t<T>, std::tuple>) {
+				return std::forward<T>(x);
+			}
+			else {
+				return std::tuple<T>(std::forward<T>(x));
+			}
+		}
+	} // namespace meta_detail
+
+	template <typename... X>
+	decltype(auto) tuplefy(X&&... x) {
+		return std::tuple_cat(meta_detail::force_tuple(std::forward<X>(x))...);
+	}
+
+	template <typename T, typename = void>
+	struct iterator_tag {
+		using type = std::input_iterator_tag;
+	};
+
+	template <typename T>
+	struct iterator_tag<T, conditional_t<false, typename std::iterator_traits<T>::iterator_category, void>> {
+		using type = typename std::iterator_traits<T>::iterator_category;
+	};
+
+}} // namespace sol::meta
+
+#endif // SOL_TRAITS_HPP
diff --git a/extern/sol3/sol/trampoline.hpp b/extern/sol3/sol/trampoline.hpp
new file mode 100644
index 0000000000..d4e5bfc5c7
--- /dev/null
+++ b/extern/sol3/sol/trampoline.hpp
@@ -0,0 +1,214 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_TRAMPOLINE_HPP
+#define SOL_TRAMPOLINE_HPP
+
+#include <sol/types.hpp>
+#include <sol/traits.hpp>
+#include <exception>
+#include <cstring>
+
+#if SOL_IS_ON(SOL_PRINT_ERRORS_I_)
+#include <iostream>
+#endif
+
+namespace sol {
+	// must push a single object to be the error object
+	// NOTE: the VAST MAJORITY of all Lua libraries -- C or otherwise -- expect a string for the type of error
+	// break this convention at your own risk
+	using exception_handler_function = int (*)(lua_State*, optional<const std::exception&>, string_view);
+
+	namespace detail {
+		inline const char (&default_exception_handler_name())[11] {
+			static const char name[11] = "sol.\xE2\x98\xA2\xE2\x98\xA2";
+			return name;
+		}
+
+		// must push at least 1 object on the stack
+		inline int default_exception_handler(lua_State* L, optional<const std::exception&>, string_view what) {
+#if SOL_IS_ON(SOL_PRINT_ERRORS_I_)
+			std::cerr << "[sol2] An exception occurred: ";
+			std::cerr.write(what.data(), static_cast<std::streamsize>(what.size()));
+			std::cerr << std::endl;
+#endif
+			lua_pushlstring(L, what.data(), what.size());
+			return 1;
+		}
+
+		inline int call_exception_handler(lua_State* L, optional<const std::exception&> maybe_ex, string_view what) {
+			lua_getglobal(L, default_exception_handler_name());
+			type t = static_cast<type>(lua_type(L, -1));
+			if (t != type::lightuserdata) {
+				lua_pop(L, 1);
+				return default_exception_handler(L, std::move(maybe_ex), std::move(what));
+			}
+			void* vfunc = lua_touserdata(L, -1);
+			lua_pop(L, 1);
+			if (vfunc == nullptr) {
+				return default_exception_handler(L, std::move(maybe_ex), std::move(what));
+			}
+			exception_handler_function exfunc = reinterpret_cast<exception_handler_function>(vfunc);
+			return exfunc(L, std::move(maybe_ex), std::move(what));
+		}
+
+#if SOL_IS_OFF(SOL_EXCEPTIONS_I_)
+		template <lua_CFunction f>
+		int static_trampoline(lua_State* L) noexcept {
+			return f(L);
+		}
+
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_)
+		template <lua_CFunction_noexcept f>
+		int static_trampoline_noexcept(lua_State* L) noexcept {
+			return f(L);
+		}
+#else
+		template <lua_CFunction f>
+		int static_trampoline_noexcept(lua_State* L) noexcept {
+			return f(L);
+		}
+#endif
+
+		template <typename Fx, typename... Args>
+		int trampoline(lua_State* L, Fx&& f, Args&&... args) noexcept {
+			return f(L, std::forward<Args>(args)...);
+		}
+
+		inline int c_trampoline(lua_State* L, lua_CFunction f) noexcept {
+			return trampoline(L, f);
+		}
+#else
+
+		inline int lua_cfunction_trampoline(lua_State* L, lua_CFunction f) {
+#if SOL_IS_ON(SOL_PROPAGATE_EXCEPTIONS_I_)
+			return f(L);
+#else
+			try {
+				return f(L);
+			}
+			catch (const char* cs) {
+				call_exception_handler(L, optional<const std::exception&>(nullopt), string_view(cs));
+			}
+			catch (const std::string& s) {
+				call_exception_handler(L, optional<const std::exception&>(nullopt), string_view(s.c_str(), s.size()));
+			}
+			catch (const std::exception& e) {
+				call_exception_handler(L, optional<const std::exception&>(e), e.what());
+			}
+#if SOL_IS_ON(SOL_EXCEPTIONS_CATCH_ALL_I_)
+			// LuaJIT cannot have the catchall when the safe propagation is on
+			// but LuaJIT will swallow all C++ errors
+			// if we don't at least catch std::exception ones
+			catch (...) {
+				call_exception_handler(L, optional<const std::exception&>(nullopt), "caught (...) exception");
+			}
+#endif // LuaJIT cannot have the catchall, but we must catch std::exceps for it
+			return lua_error(L);
+#endif // Safe exceptions
+		}
+
+		template <lua_CFunction f>
+		int static_trampoline(lua_State* L) {
+			return lua_cfunction_trampoline(L, f);
+		}
+
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_)
+		template <lua_CFunction_noexcept f>
+		int static_trampoline_noexcept(lua_State* L) noexcept {
+			return f(L);
+		}
+#else
+		template <lua_CFunction f>
+		int static_trampoline_noexcept(lua_State* L) noexcept {
+			return f(L);
+		}
+#endif
+
+		template <typename Fx, typename... Args>
+		int trampoline(lua_State* L, Fx&& f, Args&&... args) {
+			if constexpr (meta::bind_traits<meta::unqualified_t<Fx>>::is_noexcept) {
+				return f(L, std::forward<Args>(args)...);
+			}
+			else {
+#if SOL_IS_ON(SOL_PROPAGATE_EXCEPTIONS_I_)
+				return f(L, std::forward<Args>(args)...);
+#else
+				try {
+					return f(L, std::forward<Args>(args)...);
+				}
+				catch (const char* cs) {
+					call_exception_handler(L, optional<const std::exception&>(nullopt), string_view(cs));
+				}
+				catch (const std::string& s) {
+					call_exception_handler(L, optional<const std::exception&>(nullopt), string_view(s.c_str(), s.size()));
+				}
+				catch (const std::exception& e) {
+					call_exception_handler(L, optional<const std::exception&>(e), e.what());
+				}
+#if SOL_IS_ON(SOL_EXCEPTIONS_CATCH_ALL_I_)
+				// LuaJIT cannot have the catchall when the safe propagation is on
+				// but LuaJIT will swallow all C++ errors
+				// if we don't at least catch std::exception ones
+				catch (...) {
+					call_exception_handler(L, optional<const std::exception&>(nullopt), "caught (...) exception");
+				}
+#endif
+				return lua_error(L);
+#endif
+			}
+		}
+
+		inline int c_trampoline(lua_State* L, lua_CFunction f) {
+			return trampoline(L, f);
+		}
+#endif // Exceptions vs. No Exceptions
+
+		template <typename F, F fx>
+		inline int typed_static_trampoline(lua_State* L) {
+#if 0
+			// TODO: you must evaluate the get/check_get of every
+			// argument, to ensure it doesn't throw
+			// (e.g., for the sol_lua_check_access extension point!)
+			// This incluudes properly noexcept-ing all the above
+			// trampolines / safety nets
+			if constexpr (meta::bind_traits<F>::is_noexcept) {
+				return static_trampoline_noexcept<fx>(L);
+			}
+			else
+#endif
+			{ return static_trampoline<fx>(L); }
+		}
+	} // namespace detail
+
+	inline void set_default_exception_handler(lua_State* L, exception_handler_function exf = &detail::default_exception_handler) {
+		static_assert(sizeof(void*) >= sizeof(exception_handler_function),
+		     "void* storage is too small to transport the exception handler: please file a bug on the sol2 issue tracker to get this looked at!");
+		void* storage;
+		std::memcpy(&storage, &exf, sizeof(exception_handler_function));
+		lua_pushlightuserdata(L, storage);
+		lua_setglobal(L, detail::default_exception_handler_name());
+	}
+} // namespace sol
+
+#endif // SOL_TRAMPOLINE_HPP
diff --git a/extern/sol3/sol/tuple.hpp b/extern/sol3/sol/tuple.hpp
new file mode 100644
index 0000000000..3ec1e16f90
--- /dev/null
+++ b/extern/sol3/sol/tuple.hpp
@@ -0,0 +1,93 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_TUPLE_HPP
+#define SOL_TUPLE_HPP
+
+#include <sol/forward.hpp>
+#include <sol/base_traits.hpp>
+
+#include <tuple>
+#include <cstddef>
+
+namespace sol {
+	namespace detail {
+		using swallow = std::initializer_list<int>;
+	} // namespace detail
+
+	namespace meta {
+		template <typename T>
+		using is_tuple = is_specialization_of<T, std::tuple>;
+
+		template <typename T>
+		constexpr inline bool is_tuple_v = is_tuple<T>::value;
+
+		namespace detail {
+			template <typename... Args>
+			struct tuple_types_ {
+				typedef types<Args...> type;
+			};
+
+			template <typename... Args>
+			struct tuple_types_<std::tuple<Args...>> {
+				typedef types<Args...> type;
+			};
+		} // namespace detail
+
+		template <typename... Args>
+		using tuple_types = typename detail::tuple_types_<Args...>::type;
+
+		template <typename Arg>
+		struct pop_front_type;
+
+		template <typename Arg>
+		using pop_front_type_t = typename pop_front_type<Arg>::type;
+
+		template <typename... Args>
+		struct pop_front_type<types<Args...>> {
+			typedef void front_type;
+			typedef types<Args...> type;
+		};
+
+		template <typename Arg, typename... Args>
+		struct pop_front_type<types<Arg, Args...>> {
+			typedef Arg front_type;
+			typedef types<Args...> type;
+		};
+
+		template <std::size_t N, typename Tuple>
+		using tuple_element = std::tuple_element<N, std::remove_reference_t<Tuple>>;
+
+		template <std::size_t N, typename Tuple>
+		using tuple_element_t = std::tuple_element_t<N, std::remove_reference_t<Tuple>>;
+
+		template <std::size_t N, typename Tuple>
+		using unqualified_tuple_element = unqualified<tuple_element_t<N, Tuple>>;
+
+		template <std::size_t N, typename Tuple>
+		using unqualified_tuple_element_t = unqualified_t<tuple_element_t<N, Tuple>>;
+
+	} // namespace meta
+} // namespace sol
+
+#endif // SOL_TUPLE_HPP
diff --git a/extern/sol3/sol/types.hpp b/extern/sol3/sol/types.hpp
new file mode 100644
index 0000000000..23cfbbf0f3
--- /dev/null
+++ b/extern/sol3/sol/types.hpp
@@ -0,0 +1,1496 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_TYPES_HPP
+#define SOL_TYPES_HPP
+
+#include <sol/error.hpp>
+#include <sol/optional.hpp>
+#include <sol/compatibility.hpp>
+#include <sol/forward.hpp>
+#include <sol/forward_detail.hpp>
+#include <sol/traits.hpp>
+#include <sol/string_view.hpp>
+#include <sol/raii.hpp>
+#include <sol/policies.hpp>
+#include <sol/ebco.hpp>
+
+#include <array>
+#include <initializer_list>
+#include <string>
+#include <string_view>
+#include <optional>
+#if SOL_IS_ON(SOL_STD_VARIANT_I_)
+#include <variant>
+#endif // variant shenanigans (thanks, Mac OSX)
+
+namespace sol {
+	namespace d {
+		// shortest possible hidden detail namespace
+		// when types are transcribed, this saves
+		// quite a bit of space, actually.
+		// it's a little unfortunate, but here we are?
+		template <typename T>
+		struct u { };
+	} // namespace d
+
+	namespace detail {
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_)
+		typedef int (*lua_CFunction_noexcept)(lua_State* L) noexcept;
+#else
+		typedef int (*lua_CFunction_noexcept)(lua_State* L);
+#endif // noexcept function type for lua_CFunction
+
+		template <typename T>
+		struct implicit_wrapper {
+			T& value;
+
+			implicit_wrapper(T* value_) : value(*value_) {
+			}
+
+			implicit_wrapper(T& value_) : value(value_) {
+			}
+
+			operator T&() {
+				return value;
+			}
+
+			operator T*() {
+				return std::addressof(value);
+			}
+		};
+
+		struct yield_tag_t { };
+		inline constexpr yield_tag_t yield_tag {};
+	} // namespace detail
+
+	struct lua_nil_t { };
+	inline constexpr lua_nil_t lua_nil {};
+	inline bool operator==(lua_nil_t, lua_nil_t) {
+		return true;
+	}
+	inline bool operator!=(lua_nil_t, lua_nil_t) {
+		return false;
+	}
+#if SOL_IS_ON(SOL_NIL_I_)
+	using nil_t = lua_nil_t;
+	inline constexpr const nil_t& nil = lua_nil;
+#endif
+
+	namespace detail {
+		struct non_lua_nil_t { };
+	} // namespace detail
+
+	struct metatable_key_t { };
+	inline constexpr metatable_key_t metatable_key {};
+
+	struct global_tag_t {
+	} inline constexpr global_tag {};
+
+
+	struct env_key_t { };
+	inline constexpr env_key_t env_key {};
+
+	struct no_metatable_t { };
+	inline constexpr no_metatable_t no_metatable {};
+
+	template <typename T>
+	struct yielding_t {
+		T func;
+
+		yielding_t() = default;
+		yielding_t(const yielding_t&) = default;
+		yielding_t(yielding_t&&) = default;
+		yielding_t& operator=(const yielding_t&) = default;
+		yielding_t& operator=(yielding_t&&) = default;
+		template <typename Arg,
+		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<Arg>, yielding_t>>,
+		          meta::neg<std::is_base_of<proxy_base_tag, meta::unqualified_t<Arg>>>> = meta::enabler>
+		yielding_t(Arg&& arg) : func(std::forward<Arg>(arg)) {
+		}
+		template <typename Arg0, typename Arg1, typename... Args>
+		yielding_t(Arg0&& arg0, Arg1&& arg1, Args&&... args) : func(std::forward<Arg0>(arg0), std::forward<Arg1>(arg1), std::forward<Args>(args)...) {
+		}
+	};
+
+	template <typename F>
+	inline yielding_t<std::decay_t<F>> yielding(F&& f) {
+		return yielding_t<std::decay_t<F>>(std::forward<F>(f));
+	}
+
+	typedef std::remove_pointer_t<lua_CFunction> lua_CFunction_ref;
+
+	template <typename T>
+	struct non_null { };
+
+	template <typename... Args>
+	struct function_sig { };
+
+	struct upvalue_index {
+		int index;
+		upvalue_index(int idx) : index(lua_upvalueindex(idx)) {
+		}
+
+		operator int() const {
+			return index;
+		}
+	};
+
+	struct raw_index {
+		int index;
+		raw_index(int i) : index(i) {
+		}
+
+		operator int() const {
+			return index;
+		}
+	};
+
+	struct absolute_index {
+		int index;
+		absolute_index(lua_State* L, int idx) : index(lua_absindex(L, idx)) {
+		}
+
+		operator int() const {
+			return index;
+		}
+	};
+
+	struct ref_index {
+		int index;
+		ref_index(int idx) : index(idx) {
+		}
+
+		operator int() const {
+			return index;
+		}
+	};
+
+	struct stack_count {
+		int count;
+
+		stack_count(int cnt) : count(cnt) {
+		}
+	};
+
+	struct lightuserdata_value {
+		void* value;
+		lightuserdata_value(void* data) : value(data) {
+		}
+		operator void*() const {
+			return value;
+		}
+	};
+
+	struct userdata_value {
+	private:
+		void* m_value;
+
+	public:
+		userdata_value(void* data) : m_value(data) {
+		}
+
+		void* value() const {
+			return m_value;
+		}
+
+		operator void*() const {
+			return value();
+		}
+	};
+
+	template <typename T>
+	struct light {
+	private:
+		static_assert(!std::is_void_v<T>, "the type for light will never be void");
+		T* m_value;
+
+	public:
+		light(T& x) : m_value(std::addressof(x)) {
+		}
+		light(T* x) : m_value(x) {
+		}
+		explicit light(void* x) : m_value(static_cast<T*>(x)) {
+		}
+
+		T* value() const {
+			return m_value;
+		}
+
+		operator T*() const {
+			return m_value;
+		}
+		operator T&() const {
+			return *m_value;
+		}
+
+		void* void_value() const {
+			return m_value;
+		}
+	};
+
+	template <typename T>
+	auto make_light(T& l) {
+		typedef meta::unwrapped_t<std::remove_pointer_t<std::remove_pointer_t<T>>> L;
+		return light<L>(l);
+	}
+
+	template <typename T>
+	struct user : private detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		using base_t::base_t;
+
+		using base_t::value;
+
+		operator std::add_pointer_t<std::remove_reference_t<T>>() {
+			return std::addressof(this->base_t::value());
+		}
+
+		operator std::add_pointer_t<std::add_const_t<std::remove_reference_t<T>>>() const {
+			return std::addressof(this->base_t::value());
+		}
+
+		operator std::add_lvalue_reference_t<T>() {
+			return this->base_t::value();
+		}
+
+		operator std::add_const_t<std::add_lvalue_reference_t<T>>&() const {
+			return this->base_t::value();
+		}
+	};
+
+	template <typename T>
+	auto make_user(T&& u) {
+		typedef meta::unwrapped_t<meta::unqualified_t<T>> U;
+		return user<U>(std::forward<T>(u));
+	}
+
+	template <typename T>
+	struct metatable_registry_key : private detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		using base_t::base_t;
+
+		using base_t::value;
+	};
+
+	template <typename T>
+	auto meta_registry_key(T&& key) {
+		typedef meta::unqualified_t<T> K;
+		return metatable_registry_key<K>(std::forward<T>(key));
+	}
+
+	template <typename... Upvalues>
+	struct closure {
+		lua_CFunction c_function;
+		std::tuple<Upvalues...> upvalues;
+		closure(lua_CFunction f, Upvalues... targetupvalues) : c_function(f), upvalues(std::forward<Upvalues>(targetupvalues)...) {
+		}
+	};
+
+	template <>
+	struct closure<> {
+		lua_CFunction c_function;
+		int upvalues;
+		closure(lua_CFunction f, int upvalue_count = 0) : c_function(f), upvalues(upvalue_count) {
+		}
+	};
+
+	typedef closure<> c_closure;
+
+	template <typename... Args>
+	closure<Args...> make_closure(lua_CFunction f, Args&&... args) {
+		return closure<Args...>(f, std::forward<Args>(args)...);
+	}
+
+	template <typename Sig, typename... Ps>
+	struct function_arguments {
+		std::tuple<Ps...> arguments;
+		template <typename Arg, typename... Args, meta::disable<std::is_same<meta::unqualified_t<Arg>, function_arguments>> = meta::enabler>
+		function_arguments(Arg&& arg, Args&&... args) : arguments(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+		}
+	};
+
+	template <typename Sig = function_sig<>, typename... Args>
+	auto as_function(Args&&... args) {
+		return function_arguments<Sig, std::decay_t<Args>...>(std::forward<Args>(args)...);
+	}
+
+	template <typename Sig = function_sig<>, typename... Args>
+	auto as_function_reference(Args&&... args) {
+		return function_arguments<Sig, Args...>(std::forward<Args>(args)...);
+	}
+
+	template <typename T>
+	struct as_table_t : private detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		as_table_t() = default;
+		as_table_t(const as_table_t&) = default;
+		as_table_t(as_table_t&&) = default;
+		as_table_t& operator=(const as_table_t&) = default;
+		as_table_t& operator=(as_table_t&&) = default;
+		as_table_t(const meta::unqualified_t<T>& obj) noexcept(std::is_nothrow_constructible_v<base_t, const meta::unqualified_t<T>&>) : base_t(obj) {
+		}
+		as_table_t(meta::unqualified_t<T>&& obj) noexcept(std::is_nothrow_constructible_v<base_t, meta::unqualified_t<T>&&>) : base_t(std::move(obj)) {
+		}
+		template <typename Arg, typename... Args,
+		     std::enable_if_t<
+		          !std::is_same_v<as_table_t, meta::unqualified_t<Arg>> && !std::is_same_v<meta::unqualified_t<T>, meta::unqualified_t<Arg>>>* = nullptr>
+		as_table_t(Arg&& arg, Args&&... args) noexcept(std::is_nothrow_constructible_v<base_t, Arg, Args...>)
+		: base_t(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+		}
+
+		using base_t::value;
+
+		operator std::add_lvalue_reference_t<T>() {
+			return this->base_t::value();
+		}
+
+		operator std::add_const_t<std::add_lvalue_reference_t<T>>() const {
+			return this->base_t::value();
+		}
+	};
+
+	template <typename T>
+	struct nested : private detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		using nested_type = T;
+
+		nested() = default;
+		nested(const nested&) = default;
+		nested(nested&&) = default;
+		nested& operator=(const nested&) = default;
+		nested& operator=(nested&&) = default;
+		nested(const meta::unqualified_t<T>& obj) noexcept(std::is_nothrow_constructible_v<base_t, const meta::unqualified_t<T>&>) : base_t(obj) {
+		}
+		nested(meta::unqualified_t<T>&& obj) noexcept(std::is_nothrow_constructible_v<base_t, meta::unqualified_t<T>&&>) : base_t(std::move(obj)) {
+		}
+		template <typename Arg, typename... Args,
+		     std::enable_if_t<
+		          !std::is_same_v<nested, meta::unqualified_t<Arg>> && !std::is_same_v<meta::unqualified_t<T>, meta::unqualified_t<Arg>>>* = nullptr>
+		nested(Arg&& arg, Args&&... args) noexcept(std::is_nothrow_constructible_v<base_t, Arg, Args...>)
+		: base_t(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+		}
+
+		using base_t::value;
+
+		operator std::add_lvalue_reference_t<T>() {
+			return this->base_t::value();
+		}
+
+		operator std::add_const_t<std::add_lvalue_reference_t<T>>() const {
+			return this->base_t::value();
+		}
+	};
+
+	struct nested_tag_t { };
+	constexpr inline nested_tag_t nested_tag {};
+
+	template <typename T>
+	as_table_t<T> as_table_ref(T&& container) {
+		return as_table_t<T>(std::forward<T>(container));
+	}
+
+	template <typename T>
+	as_table_t<meta::unqualified_t<T>> as_table(T&& container) {
+		return as_table_t<meta::unqualified_t<T>>(std::forward<T>(container));
+	}
+
+	template <typename T>
+	nested<T> as_nested_ref(T&& container) {
+		return nested<T>(std::forward<T>(container));
+	}
+
+	template <typename T>
+	nested<meta::unqualified_t<T>> as_nested(T&& container) {
+		return nested<meta::unqualified_t<T>>(std::forward<T>(container));
+	}
+
+	template <typename T>
+	struct as_container_t : private detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		using type = T;
+
+		as_container_t() = default;
+		as_container_t(const as_container_t&) = default;
+		as_container_t(as_container_t&&) = default;
+		as_container_t& operator=(const as_container_t&) = default;
+		as_container_t& operator=(as_container_t&&) = default;
+
+		using base_t::base_t;
+
+		using base_t::value;
+
+		operator std::add_lvalue_reference_t<T>() {
+			return value();
+		}
+	};
+
+	template <typename T>
+	auto as_container(T&& value) {
+		return as_container_t<T>(std::forward<T>(value));
+	}
+
+	template <typename T>
+	struct push_invoke_t : private detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		push_invoke_t() = default;
+		push_invoke_t(const push_invoke_t&) = default;
+		push_invoke_t(push_invoke_t&&) = default;
+		push_invoke_t& operator=(const push_invoke_t&) = default;
+		push_invoke_t& operator=(push_invoke_t&&) = default;
+
+		using base_t::base_t;
+
+		using base_t::value;
+	};
+
+	template <typename Fx>
+	auto push_invoke(Fx&& fx) {
+		return push_invoke_t<Fx>(std::forward<Fx>(fx));
+	}
+
+	template <typename T>
+	struct forward_as_value_t : private detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		forward_as_value_t() = default;
+		forward_as_value_t(const forward_as_value_t&) = default;
+		forward_as_value_t(forward_as_value_t&&) = default;
+		forward_as_value_t& operator=(const forward_as_value_t&) = default;
+		forward_as_value_t& operator=(forward_as_value_t&&) = default;
+
+		using base_t::base_t;
+
+		using base_t::value;
+	};
+
+	template <typename T>
+	auto pass_as_value(T& value_ref_) {
+		return forward_as_value_t<T>(value_ref_);
+	}
+
+	struct override_value_t { };
+	constexpr inline override_value_t override_value = override_value_t();
+	struct update_if_empty_t { };
+	constexpr inline update_if_empty_t update_if_empty = update_if_empty_t();
+	struct create_if_nil_t { };
+	constexpr inline create_if_nil_t create_if_nil = create_if_nil_t();
+
+	namespace detail {
+		enum insert_mode { none = 0x0, update_if_empty = 0x01, override_value = 0x02, create_if_nil = 0x04 };
+
+		template <typename T, typename...>
+		using is_insert_mode = std::integral_constant<bool,
+		     std::is_same_v<T, override_value_t> || std::is_same_v<T, update_if_empty_t> || std::is_same_v<T, create_if_nil_t>>;
+
+		template <typename T, typename...>
+		using is_not_insert_mode = meta::neg<is_insert_mode<T>>;
+	} // namespace detail
+
+	struct this_state {
+		lua_State* L;
+
+		this_state(lua_State* Ls) : L(Ls) {
+		}
+
+		operator lua_State*() const noexcept {
+			return lua_state();
+		}
+
+		lua_State* operator->() const noexcept {
+			return lua_state();
+		}
+
+		lua_State* lua_state() const noexcept {
+			return L;
+		}
+	};
+
+	struct this_main_state {
+		lua_State* L;
+
+		this_main_state(lua_State* Ls) : L(Ls) {
+		}
+
+		operator lua_State*() const noexcept {
+			return lua_state();
+		}
+
+		lua_State* operator->() const noexcept {
+			return lua_state();
+		}
+
+		lua_State* lua_state() const noexcept {
+			return L;
+		}
+	};
+
+	struct new_table {
+		int sequence_hint = 0;
+		int map_hint = 0;
+
+		new_table() = default;
+		new_table(const new_table&) = default;
+		new_table(new_table&&) = default;
+		new_table& operator=(const new_table&) = default;
+		new_table& operator=(new_table&&) = default;
+
+		new_table(int sequence_hint_, int map_hint_ = 0) noexcept : sequence_hint(sequence_hint_), map_hint(map_hint_) {
+		}
+	};
+
+	const new_table create = {};
+
+	enum class lib : unsigned char {
+		// print, assert, and other base functions
+		base,
+		// require and other package functions
+		package,
+		// coroutine functions and utilities
+		coroutine,
+		// string library
+		string,
+		// functionality from the OS
+		os,
+		// all things math
+		math,
+		// the table manipulator and observer functions
+		table,
+		// the debug library
+		debug,
+		// the bit library: different based on which you're using
+		bit32,
+		// input/output library
+		io,
+		// LuaJIT only
+		ffi,
+		// LuaJIT only
+		jit,
+		// library for handling utf8: new to Lua
+		utf8,
+		// do not use
+		count
+	};
+
+	enum class call_syntax { dot = 0, colon = 1 };
+
+	enum class load_mode {
+		any = 0,
+		text = 1,
+		binary = 2,
+	};
+
+	enum class call_status : int {
+		ok = LUA_OK,
+		yielded = LUA_YIELD,
+		runtime = LUA_ERRRUN,
+		memory = LUA_ERRMEM,
+		handler = LUA_ERRERR,
+		gc = LUA_ERRGCMM,
+		syntax = LUA_ERRSYNTAX,
+		file = LUA_ERRFILE,
+	};
+
+	enum class thread_status : int {
+		ok = LUA_OK,
+		yielded = LUA_YIELD,
+		runtime = LUA_ERRRUN,
+		memory = LUA_ERRMEM,
+		gc = LUA_ERRGCMM,
+		handler = LUA_ERRERR,
+		dead = -1,
+	};
+
+	enum class load_status : int {
+		ok = LUA_OK,
+		syntax = LUA_ERRSYNTAX,
+		memory = LUA_ERRMEM,
+		gc = LUA_ERRGCMM,
+		file = LUA_ERRFILE,
+	};
+
+	enum class gc_mode : int {
+		incremental = 0,
+		generational = 1,
+		default_value = incremental,
+	};
+
+	enum class type : int {
+		none = LUA_TNONE,
+		lua_nil = LUA_TNIL,
+#if SOL_IS_ON(SOL_NIL_I_)
+		nil = lua_nil,
+#endif // Objective C/C++ Keyword that's found in OSX SDK and OBJC -- check for all forms to protect
+		string = LUA_TSTRING,
+		number = LUA_TNUMBER,
+		thread = LUA_TTHREAD,
+		boolean = LUA_TBOOLEAN,
+		function = LUA_TFUNCTION,
+		userdata = LUA_TUSERDATA,
+		lightuserdata = LUA_TLIGHTUSERDATA,
+		table = LUA_TTABLE,
+		poly = -0xFFFF
+	};
+
+	inline const std::string& to_string(call_status c) {
+		static const std::array<std::string, 10> names { { "ok",
+			"yielded",
+			"runtime",
+			"memory",
+			"handler",
+			"gc",
+			"syntax",
+			"file",
+			"CRITICAL_EXCEPTION_FAILURE",
+			"CRITICAL_INDETERMINATE_STATE_FAILURE" } };
+		switch (c) {
+		case call_status::ok:
+			return names[0];
+		case call_status::yielded:
+			return names[1];
+		case call_status::runtime:
+			return names[2];
+		case call_status::memory:
+			return names[3];
+		case call_status::handler:
+			return names[4];
+		case call_status::gc:
+			return names[5];
+		case call_status::syntax:
+			return names[6];
+		case call_status::file:
+			return names[7];
+		}
+		if (static_cast<std::ptrdiff_t>(c) == -1) {
+			// One of the many cases where a critical exception error has occurred
+			return names[8];
+		}
+		return names[9];
+	}
+
+	inline bool is_indeterminate_call_failure(call_status c) {
+		switch (c) {
+		case call_status::ok:
+		case call_status::yielded:
+		case call_status::runtime:
+		case call_status::memory:
+		case call_status::handler:
+		case call_status::gc:
+		case call_status::syntax:
+		case call_status::file:
+			return false;
+		}
+		return true;
+	}
+
+	inline const std::string& to_string(load_status c) {
+		static const std::array<std::string, 7> names {
+			{ "ok", "memory", "gc", "syntax", "file", "CRITICAL_EXCEPTION_FAILURE", "CRITICAL_INDETERMINATE_STATE_FAILURE" }
+		};
+		switch (c) {
+		case load_status::ok:
+			return names[0];
+		case load_status::memory:
+			return names[1];
+		case load_status::gc:
+			return names[2];
+		case load_status::syntax:
+			return names[3];
+		case load_status::file:
+			return names[4];
+		}
+		if (static_cast<int>(c) == -1) {
+			// One of the many cases where a critical exception error has occurred
+			return names[5];
+		}
+		return names[6];
+	}
+
+	inline const std::string& to_string(load_mode c) {
+		static const std::array<std::string, 3> names { {
+			"bt",
+			"t",
+			"b",
+		} };
+		return names[static_cast<std::size_t>(c)];
+	}
+
+	enum class meta_function : unsigned {
+		construct,
+		index,
+		new_index,
+		mode,
+		call,
+		call_function = call,
+		metatable,
+		to_string,
+		length,
+		unary_minus,
+		addition,
+		subtraction,
+		multiplication,
+		division,
+		modulus,
+		power_of,
+		involution = power_of,
+		concatenation,
+		equal_to,
+		less_than,
+		less_than_or_equal_to,
+		garbage_collect,
+		floor_division,
+		bitwise_left_shift,
+		bitwise_right_shift,
+		bitwise_not,
+		bitwise_and,
+		bitwise_or,
+		bitwise_xor,
+		pairs,
+		ipairs,
+		next,
+		type,
+		type_info,
+		call_construct,
+		storage,
+		gc_names,
+		static_index,
+		static_new_index,
+	};
+
+	typedef meta_function meta_method;
+
+	inline const std::array<std::string, 37>& meta_function_names() {
+		static const std::array<std::string, 37> names = { { "new",
+			"__index",
+			"__newindex",
+			"__mode",
+			"__call",
+			"__metatable",
+			"__tostring",
+			"__len",
+			"__unm",
+			"__add",
+			"__sub",
+			"__mul",
+			"__div",
+			"__mod",
+			"__pow",
+			"__concat",
+			"__eq",
+			"__lt",
+			"__le",
+			"__gc",
+
+			"__idiv",
+			"__shl",
+			"__shr",
+			"__bnot",
+			"__band",
+			"__bor",
+			"__bxor",
+
+			"__pairs",
+			"__ipairs",
+			"next",
+
+			"__type",
+			"__typeinfo",
+			"__sol.call_new",
+			"__sol.storage",
+			"__sol.gc_names",
+			"__sol.static_index",
+			"__sol.static_new_index" } };
+		return names;
+	}
+
+	inline const std::string& to_string(meta_function mf) {
+		return meta_function_names()[static_cast<std::size_t>(mf)];
+	}
+
+	inline type type_of(lua_State* L, int index) {
+		return static_cast<type>(lua_type(L, index));
+	}
+
+	inline std::string type_name(lua_State* L, type t) {
+		return lua_typename(L, static_cast<int>(t));
+	}
+
+	template <typename T>
+	struct is_stateless_lua_reference
+	: std::integral_constant<bool,
+	       (std::is_base_of_v<stateless_stack_reference, T> || std::is_base_of_v<stateless_reference, T>)&&(
+	            !std::is_base_of_v<stack_reference, T> && !std::is_base_of_v<reference, T> && !std::is_base_of_v<main_reference, T>)> { };
+
+	template <typename T>
+	inline constexpr bool is_stateless_lua_reference_v = is_stateless_lua_reference<T>::value;
+
+	template <typename T>
+	struct is_lua_reference
+	: std::integral_constant<bool,
+	       std::is_base_of_v<reference,
+	            T> || std::is_base_of_v<main_reference, T> || std::is_base_of_v<stack_reference, T> || std::is_base_of_v<stateless_stack_reference, T> || std::is_base_of_v<stateless_reference, T>> {
+	};
+
+	template <typename T>
+	inline constexpr bool is_lua_reference_v = is_lua_reference<T>::value;
+
+	template <typename T>
+	struct is_lua_reference_or_proxy : std::integral_constant<bool, is_lua_reference_v<T> || meta::is_specialization_of_v<T, table_proxy>> { };
+
+	template <typename T>
+	inline constexpr bool is_lua_reference_or_proxy_v = is_lua_reference_or_proxy<T>::value;
+
+	template <typename T>
+	struct is_transparent_argument
+	: std::integral_constant<bool,
+	       std::is_same_v<meta::unqualified_t<T>,
+	            this_state> || std::is_same_v<meta::unqualified_t<T>, this_main_state> || std::is_same_v<meta::unqualified_t<T>, this_environment> || std::is_same_v<meta::unqualified_t<T>, variadic_args>> {
+	};
+
+	template <typename T>
+	constexpr inline bool is_transparent_argument_v = is_transparent_argument<T>::value;
+
+	template <typename T>
+	struct is_variadic_arguments : meta::any<std::is_same<T, variadic_args>, meta::is_optional<T>> { };
+
+	template <typename T>
+	struct is_container
+	: std::integral_constant<bool,
+	       !std::is_same_v<state_view,
+	            T> && !std::is_same_v<state, T> && !meta::is_initializer_list_v<T> && !meta::is_string_like_v<T> && !meta::is_string_literal_array_v<T> && !is_transparent_argument_v<T> && !is_lua_reference_v<T> && (meta::has_begin_end_v<T> || std::is_array_v<T>)> {
+	};
+
+	template <typename T>
+	constexpr inline bool is_container_v = is_container<T>::value;
+
+	template <typename T>
+	struct is_to_stringable : meta::any<meta::supports_to_string_member<meta::unqualified_t<T>>, meta::supports_adl_to_string<meta::unqualified_t<T>>,
+	                               meta::supports_op_left_shift<std::ostream, meta::unqualified_t<T>>> { };
+
+	template <typename T>
+	inline constexpr bool is_to_stringable_v = is_to_stringable<T>::value;
+
+	template <typename T>
+	struct is_callable : std::true_type { };
+
+	template <typename T>
+	inline constexpr bool is_callable_v = is_callable<T>::value;
+
+	namespace detail {
+		template <typename T, typename = void>
+		struct lua_type_of : std::integral_constant<type, type::userdata> { };
+
+		template <typename C, typename T, typename A>
+		struct lua_type_of<std::basic_string<C, T, A>> : std::integral_constant<type, type::string> { };
+
+		template <typename C, typename T>
+		struct lua_type_of<basic_string_view<C, T>> : std::integral_constant<type, type::string> { };
+
+		template <std::size_t N>
+		struct lua_type_of<char[N]> : std::integral_constant<type, type::string> { };
+
+		template <std::size_t N>
+		struct lua_type_of<wchar_t[N]> : std::integral_constant<type, type::string> { };
+
+#if SOL_IS_ON(SOL_CHAR8_T_I_)
+		template <std::size_t N>
+		struct lua_type_of<char8_t[N]> : std::integral_constant<type, type::string> { };
+#endif
+
+		template <std::size_t N>
+		struct lua_type_of<char16_t[N]> : std::integral_constant<type, type::string> { };
+
+		template <std::size_t N>
+		struct lua_type_of<char32_t[N]> : std::integral_constant<type, type::string> { };
+
+		template <>
+		struct lua_type_of<char> : std::integral_constant<type, type::string> { };
+
+		template <>
+		struct lua_type_of<wchar_t> : std::integral_constant<type, type::string> { };
+
+#if SOL_IS_ON(SOL_CHAR8_T_I_)
+		template <>
+		struct lua_type_of<char8_t> : std::integral_constant<type, type::string> { };
+#endif
+
+		template <>
+		struct lua_type_of<char16_t> : std::integral_constant<type, type::string> { };
+
+		template <>
+		struct lua_type_of<char32_t> : std::integral_constant<type, type::string> { };
+
+		template <>
+		struct lua_type_of<const char*> : std::integral_constant<type, type::string> { };
+
+		template <>
+		struct lua_type_of<const wchar_t*> : std::integral_constant<type, type::string> { };
+
+#if SOL_IS_ON(SOL_CHAR8_T_I_)
+		template <>
+		struct lua_type_of<const char8_t*> : std::integral_constant<type, type::string> { };
+#endif
+
+		template <>
+		struct lua_type_of<const char16_t*> : std::integral_constant<type, type::string> { };
+
+		template <>
+		struct lua_type_of<const char32_t*> : std::integral_constant<type, type::string> { };
+
+		template <>
+		struct lua_type_of<bool> : std::integral_constant<type, type::boolean> { };
+
+		template <>
+		struct lua_type_of<lua_nil_t> : std::integral_constant<type, type::lua_nil> { };
+
+		template <>
+		struct lua_type_of<nullopt_t> : std::integral_constant<type, type::lua_nil> { };
+
+		template <>
+		struct lua_type_of<lua_value> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<detail::non_lua_nil_t> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<std::nullptr_t> : std::integral_constant<type, type::lua_nil> { };
+
+		template <>
+		struct lua_type_of<error> : std::integral_constant<type, type::string> { };
+
+		template <bool b, typename Base>
+		struct lua_type_of<basic_table_core<b, Base>> : std::integral_constant<type, type::table> { };
+
+		template <typename Base>
+		struct lua_type_of<basic_lua_table<Base>> : std::integral_constant<type, type::table> { };
+
+		template <typename Base>
+		struct lua_type_of<basic_metatable<Base>> : std::integral_constant<type, type::table> { };
+
+		template <typename T, typename Base>
+		struct lua_type_of<basic_usertype<T, Base>> : std::integral_constant<type, type::table> { };
+
+		template <>
+		struct lua_type_of<metatable_key_t> : std::integral_constant<type, type::table> { };
+
+		template <typename B>
+		struct lua_type_of<basic_environment<B>> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<env_key_t> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<new_table> : std::integral_constant<type, type::table> { };
+
+		template <typename T>
+		struct lua_type_of<as_table_t<T>> : std::integral_constant<type, type::table> { };
+
+		template <typename T>
+		struct lua_type_of<std::initializer_list<T>> : std::integral_constant<type, type::table> { };
+
+		template <bool b>
+		struct lua_type_of<basic_reference<b>> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<stack_reference> : std::integral_constant<type, type::poly> { };
+
+		template <typename Base>
+		struct lua_type_of<basic_object<Base>> : std::integral_constant<type, type::poly> { };
+
+		template <typename... Args>
+		struct lua_type_of<std::tuple<Args...>> : std::integral_constant<type, type::poly> { };
+
+		template <typename A, typename B>
+		struct lua_type_of<std::pair<A, B>> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<void*> : std::integral_constant<type, type::lightuserdata> { };
+
+		template <>
+		struct lua_type_of<const void*> : std::integral_constant<type, type::lightuserdata> { };
+
+		template <>
+		struct lua_type_of<lightuserdata_value> : std::integral_constant<type, type::lightuserdata> { };
+
+		template <>
+		struct lua_type_of<userdata_value> : std::integral_constant<type, type::userdata> { };
+
+		template <typename T>
+		struct lua_type_of<light<T>> : std::integral_constant<type, type::lightuserdata> { };
+
+		template <typename T>
+		struct lua_type_of<user<T>> : std::integral_constant<type, type::userdata> { };
+
+		template <typename Base>
+		struct lua_type_of<basic_lightuserdata<Base>> : std::integral_constant<type, type::lightuserdata> { };
+
+		template <typename Base>
+		struct lua_type_of<basic_userdata<Base>> : std::integral_constant<type, type::userdata> { };
+
+		template <>
+		struct lua_type_of<lua_CFunction> : std::integral_constant<type, type::function> { };
+
+		template <>
+		struct lua_type_of<std::remove_pointer_t<lua_CFunction>> : std::integral_constant<type, type::function> { };
+
+		template <typename Base, bool aligned>
+		struct lua_type_of<basic_function<Base, aligned>> : std::integral_constant<type, type::function> { };
+
+		template <typename Base, bool aligned, typename Handler>
+		struct lua_type_of<basic_protected_function<Base, aligned, Handler>> : std::integral_constant<type, type::function> { };
+
+		template <typename Base>
+		struct lua_type_of<basic_coroutine<Base>> : std::integral_constant<type, type::function> { };
+
+		template <typename Base>
+		struct lua_type_of<basic_thread<Base>> : std::integral_constant<type, type::thread> { };
+
+		template <typename Signature>
+		struct lua_type_of<std::function<Signature>> : std::integral_constant<type, type::function> { };
+
+		template <typename T>
+		struct lua_type_of<optional<T>> : std::integral_constant<type, type::poly> { };
+
+		template <typename T>
+		struct lua_type_of<std::optional<T>> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<variadic_args> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<variadic_results> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<stack_count> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<this_state> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<this_main_state> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<this_environment> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<type> : std::integral_constant<type, type::poly> { };
+
+#if SOL_IS_ON(SOL_GET_FUNCTION_POINTER_UNSAFE_I_)
+		template <typename T>
+		struct lua_type_of<T*> : std::integral_constant<type, std::is_function_v<T> ? type::function : type::userdata> { };
+#else
+		template <typename T>
+		struct lua_type_of<T*> : std::integral_constant<type, type::userdata> { };
+#endif
+
+		template <typename T>
+		struct lua_type_of<T, std::enable_if_t<std::is_arithmetic_v<T> || std::is_same_v<T, lua_Number> || std::is_same_v<T, lua_Integer>>>
+		: std::integral_constant<type, type::number> { };
+
+		template <typename T>
+		struct lua_type_of<T, std::enable_if_t<std::is_function_v<T>>> : std::integral_constant<type, type::function> { };
+
+		template <typename T>
+		struct lua_type_of<T, std::enable_if_t<std::is_enum_v<T>>> : std::integral_constant<type, type::number> { };
+
+		template <>
+		struct lua_type_of<meta_function> : std::integral_constant<type, type::string> { };
+
+#if SOL_IS_ON(SOL_STD_VARIANT_I_)
+		template <typename... Tn>
+		struct lua_type_of<std::variant<Tn...>> : std::integral_constant<type, type::poly> { };
+#endif // std::variant deployment sucks on Clang
+
+		template <typename T>
+		struct lua_type_of<nested<T>> : meta::conditional_t<::sol::is_container_v<T>, std::integral_constant<type, type::table>, lua_type_of<T>> { };
+
+		template <typename C, C v, template <typename...> class V, typename... Args>
+		struct accumulate : std::integral_constant<C, v> { };
+
+		template <typename C, C v, template <typename...> class V, typename T, typename... Args>
+		struct accumulate<C, v, V, T, Args...> : accumulate<C, v + V<T>::value, V, Args...> { };
+
+		template <typename C, C v, template <typename...> class V, typename List>
+		struct accumulate_list;
+
+		template <typename C, C v, template <typename...> class V, typename... Args>
+		struct accumulate_list<C, v, V, types<Args...>> : accumulate<C, v, V, Args...> { };
+	} // namespace detail
+
+	template <typename T>
+	struct lua_type_of : detail::lua_type_of<T> {
+		typedef int SOL_INTERNAL_UNSPECIALIZED_MARKER_;
+	};
+
+	template <typename T>
+	inline constexpr type lua_type_of_v = lua_type_of<T>::value;
+
+	template <typename T>
+	struct lua_size : std::integral_constant<int, 1> {
+		typedef int SOL_INTERNAL_UNSPECIALIZED_MARKER_;
+	};
+
+	template <typename A, typename B>
+	struct lua_size<std::pair<A, B>> : std::integral_constant<int, lua_size<A>::value + lua_size<B>::value> { };
+
+	template <typename... Args>
+	struct lua_size<std::tuple<Args...>> : std::integral_constant<int, detail::accumulate<int, 0, lua_size, Args...>::value> { };
+
+	template <typename T>
+	inline constexpr int lua_size_v = lua_size<T>::value;
+
+	namespace detail {
+		// MSVC's decltype detection is broken, which breaks other
+		// parts of the code. So we add more workarounds. The moment it's fixed,
+		// we take it away and break everyone that doesn't upgrade.
+		template <typename T>
+		using is_msvc_callable_rigged = meta::any<meta::is_specialization_of<T, push_invoke_t>, meta::is_specialization_of<T, as_table_t>,
+		     meta::is_specialization_of<T, forward_as_value_t>, meta::is_specialization_of<T, as_container_t>, meta::is_specialization_of<T, nested>,
+		     meta::is_specialization_of<T, yielding_t>>;
+
+		template <typename T>
+		inline constexpr bool is_msvc_callable_rigged_v = is_msvc_callable_rigged<T>::value;
+	} // namespace detail
+
+	template <typename T>
+	struct is_lua_primitive
+	: std::integral_constant<bool,
+	       type::userdata
+	                 != lua_type_of_v<
+	                      T> || ((type::userdata == lua_type_of_v<T>)&&meta::meta_detail::has_internal_marker_v<lua_type_of<T>> && !meta::meta_detail::has_internal_marker_v<lua_size<T>>)
+	            || is_lua_reference_or_proxy_v<T> || meta::is_specialization_of_v<T, std::tuple> || meta::is_specialization_of_v<T, std::pair>> { };
+
+	template <typename T>
+	constexpr inline bool is_lua_primitive_v = is_lua_primitive<T>::value;
+
+	template <typename T>
+	struct is_value_semantic_for_function
+#if SOL_IS_ON(SOL_FUNCTION_CALL_VALUE_SEMANTICS_I_)
+	: std::true_type {
+	};
+#else
+	: std::false_type {
+	};
+#endif
+
+	template <typename T>
+	constexpr inline bool is_value_semantic_for_function_v = is_value_semantic_for_function<T>::value;
+
+	template <typename T>
+	struct is_main_threaded : std::is_base_of<main_reference, T> { };
+
+	template <typename T>
+	inline constexpr bool is_main_threaded_v = is_main_threaded<T>::value;
+
+	template <typename T>
+	struct is_stack_based : std::is_base_of<stack_reference, T> { };
+	template <>
+	struct is_stack_based<variadic_args> : std::true_type { };
+	template <>
+	struct is_stack_based<unsafe_function_result> : std::true_type { };
+	template <>
+	struct is_stack_based<protected_function_result> : std::true_type { };
+	template <>
+	struct is_stack_based<stack_proxy> : std::true_type { };
+	template <>
+	struct is_stack_based<stack_proxy_base> : std::true_type { };
+	template <>
+	struct is_stack_based<stack_count> : std::true_type { };
+
+	template <typename T>
+	constexpr inline bool is_stack_based_v = is_stack_based<T>::value;
+
+	template <typename T>
+	struct is_lua_primitive<T*> : std::true_type { };
+	template <>
+	struct is_lua_primitive<unsafe_function_result> : std::true_type { };
+	template <>
+	struct is_lua_primitive<protected_function_result> : std::true_type { };
+	template <typename T>
+	struct is_lua_primitive<std::reference_wrapper<T>> : std::true_type { };
+	template <typename T>
+	struct is_lua_primitive<user<T>> : std::true_type { };
+	template <typename T>
+	struct is_lua_primitive<light<T>> : is_lua_primitive<T*> { };
+	template <typename T>
+	struct is_lua_primitive<optional<T>> : std::true_type { };
+	template <typename T>
+	struct is_lua_primitive<std::optional<T>> : std::true_type { };
+	template <typename T>
+	struct is_lua_primitive<as_table_t<T>> : std::true_type { };
+	template <typename T>
+	struct is_lua_primitive<nested<T>> : std::true_type { };
+	template <>
+	struct is_lua_primitive<userdata_value> : std::true_type { };
+	template <>
+	struct is_lua_primitive<lightuserdata_value> : std::true_type { };
+	template <>
+	struct is_lua_primitive<stack_proxy> : std::true_type { };
+	template <>
+	struct is_lua_primitive<stack_proxy_base> : std::true_type { };
+	template <typename T>
+	struct is_lua_primitive<non_null<T>> : is_lua_primitive<T*> { };
+
+	template <typename T>
+	struct is_lua_index : std::is_integral<T> { };
+	template <>
+	struct is_lua_index<raw_index> : std::true_type { };
+	template <>
+	struct is_lua_index<absolute_index> : std::true_type { };
+	template <>
+	struct is_lua_index<ref_index> : std::true_type { };
+	template <>
+	struct is_lua_index<upvalue_index> : std::true_type { };
+
+	template <typename Signature>
+	struct lua_bind_traits : meta::bind_traits<Signature> {
+	private:
+		typedef meta::bind_traits<Signature> base_t;
+
+	public:
+		typedef std::integral_constant<bool, meta::count_for<is_variadic_arguments, typename base_t::args_list>::value != 0> runtime_variadics_t;
+		static const std::size_t true_arity = base_t::arity;
+		static const std::size_t arity = detail::accumulate_list<std::size_t, 0, lua_size, typename base_t::args_list>::value
+		     - meta::count_for<is_transparent_argument, typename base_t::args_list>::value;
+		static const std::size_t true_free_arity = base_t::free_arity;
+		static const std::size_t free_arity = detail::accumulate_list<std::size_t, 0, lua_size, typename base_t::free_args_list>::value
+		     - meta::count_for<is_transparent_argument, typename base_t::args_list>::value;
+	};
+
+	template <typename T>
+	struct is_table : std::false_type { };
+	template <bool x, typename T>
+	struct is_table<basic_table_core<x, T>> : std::true_type { };
+	template <typename T>
+	struct is_table<basic_lua_table<T>> : std::true_type { };
+
+	template <typename T>
+	inline constexpr bool is_table_v = is_table<T>::value;
+
+	template <typename T>
+	struct is_global_table : std::false_type { };
+	template <typename T>
+	struct is_global_table<basic_table_core<true, T>> : std::true_type { };
+
+	template <typename T>
+	inline constexpr bool is_global_table_v = is_global_table<T>::value;
+
+	template <typename T>
+	struct is_stack_table : std::false_type { };
+	template <bool x, typename T>
+	struct is_stack_table<basic_table_core<x, T>> : std::integral_constant<bool, std::is_base_of_v<stack_reference, T>> { };
+	template <typename T>
+	struct is_stack_table<basic_lua_table<T>> : std::integral_constant<bool, std::is_base_of_v<stack_reference, T>> { };
+
+	template <typename T>
+	inline constexpr bool is_stack_table_v = is_stack_table<T>::value;
+
+	template <typename T>
+	struct is_function : std::false_type { };
+	template <typename T, bool aligned>
+	struct is_function<basic_function<T, aligned>> : std::true_type { };
+	template <typename T, bool aligned, typename Handler>
+	struct is_function<basic_protected_function<T, aligned, Handler>> : std::true_type { };
+
+
+	template <typename T>
+	using is_lightuserdata = meta::is_specialization_of<T, basic_lightuserdata>;
+
+	template <typename T>
+	inline constexpr bool is_lightuserdata_v = is_lightuserdata<T>::value;
+
+	template <typename T>
+	using is_userdata = meta::is_specialization_of<T, basic_userdata>;
+
+	template <typename T>
+	inline constexpr bool is_userdata_v = is_userdata<T>::value;
+
+	template <typename T>
+	using is_environment = std::integral_constant<bool, is_userdata_v<T> || is_table_v<T> || meta::is_specialization_of_v<T, basic_environment>>;
+
+	template <typename T>
+	inline constexpr bool is_environment_v = is_environment<T>::value;
+
+	template <typename T>
+	using is_table_like = std::integral_constant<bool, is_table_v<T> || is_environment_v<T> || is_userdata_v<T>>;
+
+	template <typename T>
+	inline constexpr bool is_table_like_v = is_table_like<T>::value;
+
+	template <typename T>
+	struct is_automagical
+	: std::integral_constant<bool,
+	       (SOL_IS_ON(SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_))
+	            || (std::is_array_v<
+	                     meta::unqualified_t<T>> || (!std::is_same_v<meta::unqualified_t<T>, state> && !std::is_same_v<meta::unqualified_t<T>, state_view>))> {
+	};
+
+	template <typename T>
+	inline type type_of() {
+		return lua_type_of<meta::unqualified_t<T>>::value;
+	}
+
+	namespace detail {
+		template <typename T>
+		struct is_non_factory_constructor : std::false_type { };
+
+		template <typename... Args>
+		struct is_non_factory_constructor<constructors<Args...>> : std::true_type { };
+
+		template <typename... Args>
+		struct is_non_factory_constructor<constructor_wrapper<Args...>> : std::true_type { };
+
+		template <>
+		struct is_non_factory_constructor<no_construction> : std::true_type { };
+
+		template <typename T>
+		inline constexpr bool is_non_factory_constructor_v = is_non_factory_constructor<T>::value;
+
+		template <typename T>
+		struct is_constructor : is_non_factory_constructor<T> { };
+
+		template <typename... Args>
+		struct is_constructor<factory_wrapper<Args...>> : std::true_type { };
+
+		template <typename T>
+		struct is_constructor<protect_t<T>> : is_constructor<meta::unqualified_t<T>> { };
+
+		template <typename F, typename... Policies>
+		struct is_constructor<policy_wrapper<F, Policies...>> : is_constructor<meta::unqualified_t<F>> { };
+
+		template <typename T>
+		inline constexpr bool is_constructor_v = is_constructor<T>::value;
+
+		template <typename... Args>
+		using any_is_constructor = meta::any<is_constructor<meta::unqualified_t<Args>>...>;
+
+		template <typename... Args>
+		inline constexpr bool any_is_constructor_v = any_is_constructor<Args...>::value;
+
+		template <typename T>
+		struct is_destructor : std::false_type { };
+
+		template <typename Fx>
+		struct is_destructor<destructor_wrapper<Fx>> : std::true_type { };
+
+		template <typename... Args>
+		using any_is_destructor = meta::any<is_destructor<meta::unqualified_t<Args>>...>;
+
+		template <typename... Args>
+		inline constexpr bool any_is_destructor_v = any_is_destructor<Args...>::value;
+	} // namespace detail
+
+	template <typename T>
+	using is_lua_c_function = meta::any<std::is_same<lua_CFunction, T>, std::is_same<detail::lua_CFunction_noexcept, T>, std::is_same<lua_CFunction_ref, T>>;
+
+	template <typename T>
+	inline constexpr bool is_lua_c_function_v = is_lua_c_function<T>::value;
+
+	enum class automagic_flags : unsigned {
+		none = 0x000u,
+		default_constructor = 0x001,
+		destructor = 0x002u,
+		pairs_operator = 0x004u,
+		to_string_operator = 0x008u,
+		call_operator = 0x010u,
+		less_than_operator = 0x020u,
+		less_than_or_equal_to_operator = 0x040u,
+		length_operator = 0x080u,
+		equal_to_operator = 0x100u,
+		all = default_constructor | destructor | pairs_operator | to_string_operator | call_operator | less_than_operator | less_than_or_equal_to_operator
+		     | length_operator | equal_to_operator
+	};
+
+	inline constexpr automagic_flags operator|(automagic_flags left, automagic_flags right) noexcept {
+		return static_cast<automagic_flags>(
+		     static_cast<std::underlying_type_t<automagic_flags>>(left) | static_cast<std::underlying_type_t<automagic_flags>>(right));
+	}
+
+	inline constexpr automagic_flags operator&(automagic_flags left, automagic_flags right) noexcept {
+		return static_cast<automagic_flags>(
+		     static_cast<std::underlying_type_t<automagic_flags>>(left) & static_cast<std::underlying_type_t<automagic_flags>>(right));
+	}
+
+	inline constexpr automagic_flags& operator|=(automagic_flags& left, automagic_flags right) noexcept {
+		left = left | right;
+		return left;
+	}
+
+	inline constexpr automagic_flags& operator&=(automagic_flags& left, automagic_flags right) noexcept {
+		left = left & right;
+		return left;
+	}
+
+	template <typename Left, typename Right>
+	constexpr bool has_flag(Left left, Right right) noexcept {
+		return (left & right) == right;
+	}
+
+	template <typename Left, typename Right>
+	constexpr bool has_any_flag(Left left, Right right) noexcept {
+		return (left & right) != static_cast<Left>(static_cast<std::underlying_type_t<Left>>(0));
+	}
+
+	template <typename Left, typename Right>
+	constexpr auto clear_flags(Left left, Right right) noexcept {
+		return static_cast<Left>(static_cast<std::underlying_type_t<Left>>(left) & ~static_cast<std::underlying_type_t<Right>>(right));
+	}
+
+	struct automagic_enrollments {
+		bool default_constructor = true;
+		bool destructor = true;
+		bool pairs_operator = true;
+		bool to_string_operator = true;
+		bool call_operator = true;
+		bool less_than_operator = true;
+		bool less_than_or_equal_to_operator = true;
+		bool length_operator = true;
+		bool equal_to_operator = true;
+	};
+
+	template <automagic_flags compile_time_defaults = automagic_flags::all>
+	struct constant_automagic_enrollments : public automagic_enrollments { };
+
+} // namespace sol
+
+#endif // SOL_TYPES_HPP
diff --git a/extern/sol3/sol/unicode.hpp b/extern/sol3/sol/unicode.hpp
new file mode 100644
index 0000000000..3eedb70de0
--- /dev/null
+++ b/extern/sol3/sol/unicode.hpp
@@ -0,0 +1,308 @@
+#pragma once
+
+#include <sol/string_view.hpp>
+#include <array>
+#include <cstring>
+
+namespace sol {
+	// Everything here was lifted pretty much straight out of
+	// ogonek, because fuck figuring it out=
+	namespace unicode {
+		enum class error_code {
+			ok = 0,
+			invalid_code_point,
+			invalid_code_unit,
+			invalid_leading_surrogate,
+			invalid_trailing_surrogate,
+			sequence_too_short,
+			overlong_sequence,
+		};
+
+		inline const string_view& to_string(error_code ec) {
+			static const string_view storage[7] = { "ok",
+				"invalid code points",
+				"invalid code unit",
+				"invalid leading surrogate",
+				"invalid trailing surrogate",
+				"sequence too short",
+				"overlong sequence" };
+			return storage[static_cast<std::size_t>(ec)];
+		}
+
+		template <typename It>
+		struct decoded_result {
+			error_code error;
+			char32_t codepoint;
+			It next;
+		};
+
+		template <typename C>
+		struct encoded_result {
+			error_code error;
+			std::size_t code_units_size;
+			std::array<C, 4> code_units;
+		};
+
+		struct unicode_detail {
+			// codepoint related
+			static constexpr char32_t last_code_point = 0x10FFFF;
+
+			static constexpr char32_t first_lead_surrogate = 0xD800;
+			static constexpr char32_t last_lead_surrogate = 0xDBFF;
+
+			static constexpr char32_t first_trail_surrogate = 0xDC00;
+			static constexpr char32_t last_trail_surrogate = 0xDFFF;
+
+			static constexpr char32_t first_surrogate = first_lead_surrogate;
+			static constexpr char32_t last_surrogate = last_trail_surrogate;
+
+			static constexpr bool is_lead_surrogate(char32_t u) {
+				return u >= first_lead_surrogate && u <= last_lead_surrogate;
+			}
+			static constexpr bool is_trail_surrogate(char32_t u) {
+				return u >= first_trail_surrogate && u <= last_trail_surrogate;
+			}
+			static constexpr bool is_surrogate(char32_t u) {
+				return u >= first_surrogate && u <= last_surrogate;
+			}
+
+			// utf8 related
+			static constexpr auto last_1byte_value = 0x7Fu;
+			static constexpr auto last_2byte_value = 0x7FFu;
+			static constexpr auto last_3byte_value = 0xFFFFu;
+
+			static constexpr auto start_2byte_mask = 0x80u;
+			static constexpr auto start_3byte_mask = 0xE0u;
+			static constexpr auto start_4byte_mask = 0xF0u;
+
+			static constexpr auto continuation_mask = 0xC0u;
+			static constexpr auto continuation_signature = 0x80u;
+
+			static constexpr bool is_invalid(unsigned char b) {
+				return b == 0xC0 || b == 0xC1 || b > 0xF4;
+			}
+
+			static constexpr bool is_continuation(unsigned char b) {
+				return (b & unicode_detail::continuation_mask) == unicode_detail::continuation_signature;
+			}
+
+			static constexpr bool is_overlong(char32_t u, std::size_t bytes) {
+				return u <= unicode_detail::last_1byte_value || (u <= unicode_detail::last_2byte_value && bytes > 2)
+				     || (u <= unicode_detail::last_3byte_value && bytes > 3);
+			}
+
+			static constexpr int sequence_length(unsigned char b) {
+				return (b & start_2byte_mask) == 0                ? 1
+				     : (b & start_3byte_mask) != start_3byte_mask ? 2
+				     : (b & start_4byte_mask) != start_4byte_mask ? 3
+				                                                  : 4;
+			}
+
+			static constexpr char32_t decode(unsigned char b0, unsigned char b1) {
+				return (static_cast<char32_t>((b0 & 0x1Fu) << 6u) | static_cast<char32_t>(b1 & 0x3Fu));
+			}
+			static constexpr char32_t decode(unsigned char b0, unsigned char b1, unsigned char b2) {
+				return static_cast<char32_t>((b0 & 0x0Fu) << 12u) | static_cast<char32_t>((b1 & 0x3Fu) << 6u) | static_cast<char32_t>(b2 & 0x3Fu);
+			}
+			static constexpr char32_t decode(unsigned char b0, unsigned char b1, unsigned char b2, unsigned char b3) {
+				return static_cast<char32_t>(static_cast<char32_t>((b0 & 0x07u) << 18u) | static_cast<char32_t>((b1 & 0x3F) << 12)
+				     | static_cast<char32_t>((b2 & 0x3Fu) << 6u) | static_cast<char32_t>(b3 & 0x3Fu));
+			}
+
+			// utf16 related
+			static constexpr char32_t last_bmp_value = 0xFFFF;
+			static constexpr char32_t normalizing_value = 0x10000;
+			static constexpr int lead_surrogate_bitmask = 0xFFC00;
+			static constexpr int trail_surrogate_bitmask = 0x3FF;
+			static constexpr int lead_shifted_bits = 10;
+			static constexpr char32_t replacement = 0xFFFD;
+
+			static char32_t combine_surrogates(char16_t lead, char16_t trail) {
+				auto hi = lead - first_lead_surrogate;
+				auto lo = trail - first_trail_surrogate;
+				return normalizing_value + ((hi << lead_shifted_bits) | lo);
+			}
+		};
+
+		inline encoded_result<char> code_point_to_utf8(char32_t codepoint) {
+			encoded_result<char> er;
+			er.error = error_code::ok;
+			if (codepoint <= unicode_detail::last_1byte_value) {
+				er.code_units_size = 1;
+				er.code_units = std::array<char, 4> { { static_cast<char>(codepoint) } };
+			}
+			else if (codepoint <= unicode_detail::last_2byte_value) {
+				er.code_units_size = 2;
+				er.code_units = std::array<char, 4> { {
+					static_cast<char>(0xC0 | ((codepoint & 0x7C0) >> 6)),
+					static_cast<char>(0x80 | (codepoint & 0x3F)),
+				} };
+			}
+			else if (codepoint <= unicode_detail::last_3byte_value) {
+				er.code_units_size = 3;
+				er.code_units = std::array<char, 4> { {
+					static_cast<char>(0xE0 | ((codepoint & 0xF000) >> 12)),
+					static_cast<char>(0x80 | ((codepoint & 0xFC0) >> 6)),
+					static_cast<char>(0x80 | (codepoint & 0x3F)),
+				} };
+			}
+			else {
+				er.code_units_size = 4;
+				er.code_units = std::array<char, 4> { {
+					static_cast<char>(0xF0 | ((codepoint & 0x1C0000) >> 18)),
+					static_cast<char>(0x80 | ((codepoint & 0x3F000) >> 12)),
+					static_cast<char>(0x80 | ((codepoint & 0xFC0) >> 6)),
+					static_cast<char>(0x80 | (codepoint & 0x3F)),
+				} };
+			}
+			return er;
+		}
+
+		inline encoded_result<char16_t> code_point_to_utf16(char32_t codepoint) {
+			encoded_result<char16_t> er;
+
+			if (codepoint <= unicode_detail::last_bmp_value) {
+				er.code_units_size = 1;
+				er.code_units = std::array<char16_t, 4> { { static_cast<char16_t>(codepoint) } };
+				er.error = error_code::ok;
+			}
+			else {
+				auto normal = codepoint - unicode_detail::normalizing_value;
+				auto lead = unicode_detail::first_lead_surrogate + ((normal & unicode_detail::lead_surrogate_bitmask) >> unicode_detail::lead_shifted_bits);
+				auto trail = unicode_detail::first_trail_surrogate + (normal & unicode_detail::trail_surrogate_bitmask);
+				er.code_units = std::array<char16_t, 4> { { static_cast<char16_t>(lead), static_cast<char16_t>(trail) } };
+				er.code_units_size = 2;
+				er.error = error_code::ok;
+			}
+			return er;
+		}
+
+		inline encoded_result<char32_t> code_point_to_utf32(char32_t codepoint) {
+			encoded_result<char32_t> er;
+			er.code_units_size = 1;
+			er.code_units[0] = codepoint;
+			er.error = error_code::ok;
+			return er;
+		}
+
+		template <typename It>
+		inline decoded_result<It> utf8_to_code_point(It it, It last) {
+			decoded_result<It> dr;
+			if (it == last) {
+				dr.next = it;
+				dr.error = error_code::sequence_too_short;
+				return dr;
+			}
+
+			unsigned char b0 = static_cast<unsigned char>(*it);
+			std::size_t length = static_cast<std::size_t>(unicode_detail::sequence_length(b0));
+
+			if (length == 1) {
+				dr.codepoint = static_cast<char32_t>(b0);
+				dr.error = error_code::ok;
+				++it;
+				dr.next = it;
+				return dr;
+			}
+
+			if (unicode_detail::is_invalid(b0) || unicode_detail::is_continuation(b0)) {
+				dr.error = error_code::invalid_code_unit;
+				dr.next = it;
+				return dr;
+			}
+
+			++it;
+			std::array<unsigned char, 4> b;
+			b[0] = b0;
+			for (std::size_t i = 1; i < length; ++i) {
+				b[i] = static_cast<unsigned char>(*it);
+				if (!unicode_detail::is_continuation(b[i])) {
+					dr.error = error_code::invalid_code_unit;
+					dr.next = it;
+					return dr;
+				}
+				++it;
+			}
+
+			char32_t decoded;
+			switch (length) {
+			case 2:
+				decoded = unicode_detail::decode(b[0], b[1]);
+				break;
+			case 3:
+				decoded = unicode_detail::decode(b[0], b[1], b[2]);
+				break;
+			default:
+				decoded = unicode_detail::decode(b[0], b[1], b[2], b[3]);
+				break;
+			}
+
+			if (unicode_detail::is_overlong(decoded, length)) {
+				dr.error = error_code::overlong_sequence;
+				return dr;
+			}
+			if (unicode_detail::is_surrogate(decoded) || decoded > unicode_detail::last_code_point) {
+				dr.error = error_code::invalid_code_point;
+				return dr;
+			}
+
+			// then everything is fine
+			dr.codepoint = decoded;
+			dr.error = error_code::ok;
+			dr.next = it;
+			return dr;
+		}
+
+		template <typename It>
+		inline decoded_result<It> utf16_to_code_point(It it, It last) {
+			decoded_result<It> dr;
+			if (it == last) {
+				dr.next = it;
+				dr.error = error_code::sequence_too_short;
+				return dr;
+			}
+
+			char16_t lead = static_cast<char16_t>(*it);
+
+			if (!unicode_detail::is_surrogate(lead)) {
+				++it;
+				dr.codepoint = static_cast<char32_t>(lead);
+				dr.next = it;
+				dr.error = error_code::ok;
+				return dr;
+			}
+			if (!unicode_detail::is_lead_surrogate(lead)) {
+				dr.error = error_code::invalid_leading_surrogate;
+				dr.next = it;
+				return dr;
+			}
+
+			++it;
+			auto trail = *it;
+			if (!unicode_detail::is_trail_surrogate(trail)) {
+				dr.error = error_code::invalid_trailing_surrogate;
+				dr.next = it;
+				return dr;
+			}
+
+			dr.codepoint = unicode_detail::combine_surrogates(lead, trail);
+			dr.next = ++it;
+			dr.error = error_code::ok;
+			return dr;
+		}
+
+		template <typename It>
+		inline decoded_result<It> utf32_to_code_point(It it, It last) {
+			decoded_result<It> dr;
+			if (it == last) {
+				dr.next = it;
+				dr.error = error_code::sequence_too_short;
+				return dr;
+			}
+			dr.codepoint = static_cast<char32_t>(*it);
+			dr.next = ++it;
+			dr.error = error_code::ok;
+			return dr;
+		}
+	} // namespace unicode
+} // namespace sol
diff --git a/extern/sol3/sol/unique_usertype_traits.hpp b/extern/sol3/sol/unique_usertype_traits.hpp
new file mode 100644
index 0000000000..d383dc96e5
--- /dev/null
+++ b/extern/sol3/sol/unique_usertype_traits.hpp
@@ -0,0 +1,240 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_UNIQUE_USERTYPE_TRAITS_HPP
+#define SOL_UNIQUE_USERTYPE_TRAITS_HPP
+
+#include <sol/base_traits.hpp>
+#include <sol/pointer_like.hpp>
+
+#include <sol/forward.hpp>
+
+#include <memory>
+
+namespace sol {
+
+	namespace detail {
+		template <typename T>
+		struct unique_fallback {
+			using SOL_INTERNAL_UNSPECIALIZED_MARKER_ = int;
+		};
+
+		template <typename T>
+		struct unique_fallback<std::shared_ptr<T>> {
+		private:
+			using pointer = typename std::pointer_traits<std::shared_ptr<T>>::element_type*;
+
+		public:
+			// rebind is non-void
+			// if and only if unique usertype
+			// is cast-capable
+			template <typename X>
+			using rebind_actual_type = std::shared_ptr<X>;
+
+			static bool is_null(lua_State*, const std::shared_ptr<T>& p) noexcept {
+				return p == nullptr;
+			}
+
+			static pointer get(lua_State*, const std::shared_ptr<T>& p) noexcept {
+				return p.get();
+			}
+		};
+
+		template <typename T, typename D>
+		struct unique_fallback<std::unique_ptr<T, D>> {
+		private:
+			using pointer = typename std::unique_ptr<T, D>::pointer;
+
+		public:
+			static bool is_null(lua_State*, const std::unique_ptr<T, D>& p) noexcept {
+				return p == nullptr;
+			}
+
+			static pointer get(lua_State*, const std::unique_ptr<T, D>& p) noexcept {
+				return p.get();
+			}
+		};
+	} // namespace detail
+
+	namespace meta { namespace meta_detail {
+		template <typename T, typename = void>
+		struct unique_actual_type;
+
+		template <typename T>
+		struct unique_actual_type<T, meta::void_t<typename T::actual_type>> {
+			using type = typename T::actual_type;
+		};
+
+		template <typename T, typename... Rest, template <typename...> class Templ>
+		struct unique_actual_type<Templ<T, Rest...>> {
+			using type = T;
+		};
+
+	}} // namespace meta::meta_detail
+
+	template <typename T>
+	using unique_usertype_actual_t = typename meta::meta_detail::unique_actual_type<unique_usertype_traits<T>>::type;
+
+	namespace meta { namespace meta_detail {
+		template <typename T>
+		using value_test_t = decltype(T::value);
+
+		template <typename T>
+		using type_test_t = typename T::type;
+
+		template <typename T>
+		using type_element_type_t = typename T::element_type;
+
+		template <typename T, typename = void>
+		struct unique_element_type {
+			using type = typename std::pointer_traits<typename unique_actual_type<T>::type>::element_type;
+		};
+
+		template <typename T>
+		struct unique_element_type<T, std::enable_if_t<meta::is_detected_v<type_element_type_t, T>>> {
+			using type = typename T::element_type;
+		};
+
+		template <typename T>
+		struct unique_element_type<T, std::enable_if_t<meta::is_detected_v<type_test_t, T>>> {
+			using type = typename T::type;
+		};
+
+		template <typename T, typename = void>
+		struct unique_valid : std::integral_constant<bool, !has_internal_marker_v<T>> { };
+
+		template <typename T>
+		struct unique_valid<T, meta::void_t<decltype(T::value)>> : std::integral_constant<bool, T::value> { };
+	}} // namespace meta::meta_detail
+
+	template <typename T>
+	using unique_usertype_element_t = typename meta::meta_detail::unique_element_type<unique_usertype_traits<T>>::type;
+
+	template <typename T, typename Element = void>
+	using unique_usertype_rebind_actual_t = typename unique_usertype_traits<T>::template rebind_actual_type<Element>;
+
+	template <typename T>
+	struct unique_usertype_traits : public detail::unique_fallback<T> { };
+
+	template <typename T>
+	struct is_unique_usertype : std::integral_constant<bool, meta::meta_detail::unique_valid<unique_usertype_traits<T>>::value> { };
+
+	template <typename T>
+	inline constexpr bool is_unique_usertype_v = is_unique_usertype<T>::value;
+
+	namespace meta { namespace meta_detail {
+		template <typename T>
+		using adl_sol_lua_check_access_test_t
+			= decltype(sol_lua_check_access(types<T>(), static_cast<lua_State*>(nullptr), -1, std::declval<stack::record&>()));
+
+		template <typename T>
+		inline constexpr bool is_adl_sol_lua_check_access_v = meta::is_detected_v<adl_sol_lua_check_access_test_t, T>;
+
+		template <typename T>
+		using unique_usertype_get_with_state_test_t
+			= decltype(unique_usertype_traits<T>::get(static_cast<lua_State*>(nullptr), std::declval<unique_usertype_actual_t<T>>()));
+
+		template <typename T>
+		inline constexpr bool unique_usertype_get_with_state_v = meta::is_detected_v<unique_usertype_get_with_state_test_t, T>;
+
+		template <typename T>
+		using unique_usertype_is_null_with_state_test_t
+			= decltype(unique_usertype_traits<T>::is_null(static_cast<lua_State*>(nullptr), std::declval<unique_usertype_actual_t<T>>()));
+
+		template <typename T>
+		inline constexpr bool unique_usertype_is_null_with_state_v = meta::is_detected_v<unique_usertype_is_null_with_state_test_t, T>;
+	}} // namespace meta::meta_detail
+
+	namespace detail {
+		template <typename T>
+		constexpr bool unique_is_null_noexcept() noexcept {
+			if constexpr (meta::meta_detail::unique_usertype_is_null_with_state_v<std::remove_cv_t<T>>) {
+				return noexcept(
+				     unique_usertype_traits<T>::is_null(static_cast<lua_State*>(nullptr), std::declval<unique_usertype_actual_t<std::remove_cv_t<T>>>()));
+			}
+			else {
+				return noexcept(unique_usertype_traits<T>::is_null(std::declval<unique_usertype_actual_t<std::remove_cv_t<T>>>()));
+			}
+		}
+
+		template <typename T>
+		bool unique_is_null(lua_State* L_, T& value_) noexcept(unique_is_null_noexcept<std::remove_cv_t<T>>()) {
+			using Tu = std::remove_cv_t<T>;
+			if constexpr (meta::meta_detail::unique_usertype_is_null_with_state_v<Tu>) {
+				return unique_usertype_traits<Tu>::is_null(L_, value_);
+			}
+			else {
+				return unique_usertype_traits<Tu>::is_null(value_);
+			}
+		}
+
+		template <typename T>
+		constexpr bool unique_get_noexcept() noexcept {
+			if constexpr (meta::meta_detail::unique_usertype_get_with_state_v<std::remove_cv_t<T>>) {
+				return noexcept(
+				     unique_usertype_traits<T>::get(static_cast<lua_State*>(nullptr), std::declval<unique_usertype_actual_t<std::remove_cv_t<T>>>()));
+			}
+			else {
+				return noexcept(unique_usertype_traits<T>::get(std::declval<unique_usertype_actual_t<std::remove_cv_t<T>>>()));
+			}
+		}
+
+		template <typename T>
+		auto unique_get(lua_State* L_, T& value_) noexcept(unique_get_noexcept<std::remove_cv_t<T>>()) {
+			using Tu = std::remove_cv_t<T>;
+			if constexpr (meta::meta_detail::unique_usertype_get_with_state_v<Tu>) {
+				return unique_usertype_traits<Tu>::get(L_, value_);
+			}
+			else {
+				return unique_usertype_traits<Tu>::get(value_);
+			}
+		}
+	} // namespace detail
+
+	namespace meta { namespace meta_detail {
+		template <typename T, typename Element = void>
+		using is_rebind_actual_type_test_t = typename T::template rebind_actual_type<Element>;
+
+		template <typename T, typename Element = void>
+		using is_rebind_actual_type = meta::is_detected<is_rebind_actual_type_test_t, T, Element>;
+
+		template <typename T, typename Element = void>
+		inline constexpr bool is_rebind_actual_type_v = is_rebind_actual_type<T, Element>::value;
+
+		template <typename T, typename Element, bool = is_rebind_actual_type_v<T, Element>>
+		struct is_actual_type_rebindable_for_test : std::false_type { };
+
+		template <typename T, typename Element>
+		struct is_actual_type_rebindable_for_test<T, Element, true>
+		: std::integral_constant<bool, !std::is_void_v<typename T::template rebind_actual_type<Element>>> { };
+	}} // namespace meta::meta_detail
+
+	template <typename T, typename Element = void>
+	using is_actual_type_rebindable_for = typename meta::meta_detail::is_actual_type_rebindable_for_test<unique_usertype_traits<T>, Element>::type;
+
+	template <typename T, typename Element = void>
+	inline constexpr bool is_actual_type_rebindable_for_v = is_actual_type_rebindable_for<T, Element>::value;
+
+} // namespace sol
+
+#endif // SOL_UNIQUE_USERTYPE_TRAITS_HPP
diff --git a/extern/sol3/sol/unsafe_function.hpp b/extern/sol3/sol/unsafe_function.hpp
new file mode 100644
index 0000000000..281103215b
--- /dev/null
+++ b/extern/sol3/sol/unsafe_function.hpp
@@ -0,0 +1,170 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_UNSAFE_FUNCTION_HPP
+#define SOL_UNSAFE_FUNCTION_HPP
+
+#include <sol/reference.hpp>
+#include <sol/object.hpp>
+#include <sol/stack.hpp>
+#include <sol/function_result.hpp>
+#include <sol/function_types.hpp>
+#include <sol/bytecode.hpp>
+#include <sol/dump_handler.hpp>
+#include <cstdint>
+
+namespace sol {
+	template <typename ref_t, bool aligned = false>
+	class basic_function : public basic_object<ref_t> {
+	private:
+		using base_t = basic_object<ref_t>;
+
+		void luacall(std::ptrdiff_t argcount, std::ptrdiff_t resultcount) const {
+			lua_call(lua_state(), static_cast<int>(argcount), static_cast<int>(resultcount));
+		}
+
+		template <std::size_t... I, typename... Ret>
+		auto invoke(types<Ret...>, std::index_sequence<I...>, std::ptrdiff_t n) const {
+			luacall(n, lua_size<std::tuple<Ret...>>::value);
+			return stack::pop<std::tuple<Ret...>>(lua_state());
+		}
+
+		template <std::size_t I, typename Ret, meta::enable<meta::neg<std::is_void<Ret>>> = meta::enabler>
+		Ret invoke(types<Ret>, std::index_sequence<I>, std::ptrdiff_t n) const {
+			luacall(n, lua_size<Ret>::value);
+			return stack::pop<Ret>(lua_state());
+		}
+
+		template <std::size_t I>
+		void invoke(types<void>, std::index_sequence<I>, std::ptrdiff_t n) const {
+			luacall(n, 0);
+		}
+
+		unsafe_function_result invoke(types<>, std::index_sequence<>, std::ptrdiff_t n) const {
+			int stacksize = lua_gettop(lua_state());
+			int firstreturn = (std::max)(1, stacksize - static_cast<int>(n));
+			luacall(n, LUA_MULTRET);
+			int poststacksize = lua_gettop(lua_state());
+			int returncount = poststacksize - (firstreturn - 1);
+			return unsafe_function_result(lua_state(), firstreturn, returncount);
+		}
+
+	public:
+		using base_t::lua_state;
+
+		basic_function() = default;
+		template <typename T,
+		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_function>>, meta::neg<std::is_same<base_t, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_function(T&& r) noexcept : base_t(std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			if (!is_function<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				constructor_handler handler {};
+				stack::check<basic_function>(lua_state(), -1, handler);
+			}
+#endif // Safety
+		}
+		basic_function(const basic_function&) = default;
+		basic_function& operator=(const basic_function&) = default;
+		basic_function(basic_function&&) = default;
+		basic_function& operator=(basic_function&&) = default;
+		basic_function(const stack_reference& r) : basic_function(r.lua_state(), r.stack_index()) {
+		}
+		basic_function(stack_reference&& r) : basic_function(r.lua_state(), r.stack_index()) {
+		}
+		basic_function(lua_nil_t n) : base_t(n) {
+		}
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_function(lua_State* L, T&& r) : base_t(L, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_function>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		basic_function(lua_State* L, int index = -1) : base_t(L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			constructor_handler handler {};
+			stack::check<basic_function>(L, index, handler);
+#endif // Safety
+		}
+		basic_function(lua_State* L, ref_index index) : base_t(L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_function>(lua_state(), -1, handler);
+#endif // Safety
+		}
+
+		template <typename Fx>
+		int dump(lua_Writer writer, void* userdata, bool strip, Fx&& on_error) const {
+			this->push();
+			auto ppn = stack::push_popper_n<false>(this->lua_state(), 1);
+			int r = lua_dump(this->lua_state(), writer, userdata, strip ? 1 : 0);
+			if (r != 0) {
+				return on_error(this->lua_state(), r, writer, userdata, strip);
+			}
+			return r;
+		}
+
+		int dump(lua_Writer writer, void* userdata, bool strip = false) const {
+			return dump(writer, userdata, strip, &dump_throw_on_error);
+		}
+
+		template <typename Container = bytecode>
+		Container dump() const {
+			Container bc;
+			(void)dump(static_cast<lua_Writer>(&basic_insert_dump_writer<Container>), static_cast<void*>(&bc), false, &dump_panic_on_error);
+			return bc;
+		}
+
+		template <typename Container = bytecode, typename Fx>
+		Container dump(Fx&& on_error) const {
+			Container bc;
+			(void)dump(static_cast<lua_Writer>(&basic_insert_dump_writer<Container>), static_cast<void*>(&bc), false, std::forward<Fx>(on_error));
+			return bc;
+		}
+
+		template <typename... Args>
+		unsafe_function_result operator()(Args&&... args) const {
+			return call<>(std::forward<Args>(args)...);
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) operator()(types<Ret...>, Args&&... args) const {
+			return call<Ret...>(std::forward<Args>(args)...);
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) call(Args&&... args) const {
+			if (!aligned) {
+				base_t::push();
+			}
+			int pushcount = stack::multi_push_reference(lua_state(), std::forward<Args>(args)...);
+			return invoke(types<Ret...>(), std::make_index_sequence<sizeof...(Ret)>(), static_cast<std::ptrdiff_t>(pushcount));
+		}
+	};
+} // namespace sol
+
+#endif // SOL_UNSAFE_FUNCTION_HPP
diff --git a/extern/sol3/sol/unsafe_function_result.hpp b/extern/sol3/sol/unsafe_function_result.hpp
new file mode 100644
index 0000000000..d340f0de05
--- /dev/null
+++ b/extern/sol3/sol/unsafe_function_result.hpp
@@ -0,0 +1,180 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_UNSAFE_FUNCTION_RESULT_HPP
+#define SOL_UNSAFE_FUNCTION_RESULT_HPP
+
+#include <sol/reference.hpp>
+#include <sol/tuple.hpp>
+#include <sol/stack.hpp>
+#include <sol/proxy_base.hpp>
+#include <sol/stack_iterator.hpp>
+#include <sol/stack_proxy.hpp>
+#include <cstdint>
+
+namespace sol {
+	struct unsafe_function_result : public proxy_base<unsafe_function_result> {
+	private:
+		lua_State* L;
+		int index;
+		int returncount;
+
+	public:
+		typedef stack_proxy reference_type;
+		typedef stack_proxy value_type;
+		typedef stack_proxy* pointer;
+		typedef std::ptrdiff_t difference_type;
+		typedef std::size_t size_type;
+		typedef stack_iterator<stack_proxy, false> iterator;
+		typedef stack_iterator<stack_proxy, true> const_iterator;
+		typedef std::reverse_iterator<iterator> reverse_iterator;
+		typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
+
+		unsafe_function_result() noexcept = default;
+		unsafe_function_result(lua_State* Ls, int idx = -1, int retnum = 0) noexcept : L(Ls), index(idx), returncount(retnum) {
+		}
+
+
+		// We do not want anyone to copy these around willy-nilly
+		// Will likely break people, but also will probably get rid of quiet bugs that have
+		// been lurking. (E.g., Vanilla Lua will just quietly discard over-pops and under-pops:
+		// LuaJIT and other Lua engines will implode and segfault at random later times.)
+		unsafe_function_result(const unsafe_function_result&) = delete;
+		unsafe_function_result& operator=(const unsafe_function_result&) = delete;
+
+		unsafe_function_result(unsafe_function_result&& o) noexcept : L(o.L), index(o.index), returncount(o.returncount) {
+			// Must be manual, otherwise destructor will screw us
+			// return count being 0 is enough to keep things clean
+			// but will be thorough
+			o.abandon();
+		}
+		unsafe_function_result& operator=(unsafe_function_result&& o) noexcept {
+			L = o.L;
+			index = o.index;
+			returncount = o.returncount;
+			// Must be manual, otherwise destructor will screw us
+			// return count being 0 is enough to keep things clean
+			// but will be thorough
+			o.abandon();
+			return *this;
+		}
+
+		unsafe_function_result(const protected_function_result& o) = delete;
+		unsafe_function_result& operator=(const protected_function_result& o) = delete;
+		unsafe_function_result(protected_function_result&& o) noexcept;
+		unsafe_function_result& operator=(protected_function_result&& o) noexcept;
+
+		template <typename T>
+		decltype(auto) get(difference_type index_offset = 0) const {
+			return stack::get<T>(L, index + static_cast<int>(index_offset));
+		}
+
+		type get_type(difference_type index_offset = 0) const noexcept {
+			return type_of(L, index + static_cast<int>(index_offset));
+		}
+
+		stack_proxy operator[](difference_type index_offset) const {
+			return stack_proxy(L, index + static_cast<int>(index_offset));
+		}
+
+		iterator begin() {
+			return iterator(L, index, stack_index() + return_count());
+		}
+		iterator end() {
+			return iterator(L, stack_index() + return_count(), stack_index() + return_count());
+		}
+		const_iterator begin() const {
+			return const_iterator(L, index, stack_index() + return_count());
+		}
+		const_iterator end() const {
+			return const_iterator(L, stack_index() + return_count(), stack_index() + return_count());
+		}
+		const_iterator cbegin() const {
+			return begin();
+		}
+		const_iterator cend() const {
+			return end();
+		}
+
+		reverse_iterator rbegin() {
+			return std::reverse_iterator<iterator>(begin());
+		}
+		reverse_iterator rend() {
+			return std::reverse_iterator<iterator>(end());
+		}
+		const_reverse_iterator rbegin() const {
+			return std::reverse_iterator<const_iterator>(begin());
+		}
+		const_reverse_iterator rend() const {
+			return std::reverse_iterator<const_iterator>(end());
+		}
+		const_reverse_iterator crbegin() const {
+			return std::reverse_iterator<const_iterator>(cbegin());
+		}
+		const_reverse_iterator crend() const {
+			return std::reverse_iterator<const_iterator>(cend());
+		}
+
+		call_status status() const noexcept {
+			return call_status::ok;
+		}
+
+		bool valid() const noexcept {
+			return status() == call_status::ok || status() == call_status::yielded;
+		}
+
+		lua_State* lua_state() const {
+			return L;
+		};
+		int stack_index() const {
+			return index;
+		};
+		int return_count() const {
+			return returncount;
+		};
+		void abandon() noexcept {
+			// L = nullptr;
+			index = 0;
+			returncount = 0;
+		}
+		~unsafe_function_result() {
+			lua_pop(L, returncount);
+		}
+	};
+
+	namespace stack {
+		template <>
+		struct unqualified_pusher<unsafe_function_result> {
+			static int push(lua_State* L, const unsafe_function_result& fr) {
+				int p = 0;
+				for (int i = 0; i < fr.return_count(); ++i) {
+					lua_pushvalue(L, i + fr.stack_index());
+					++p;
+				}
+				return p;
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+#endif // SOL_UNSAFE_FUNCTION_RESULT_HPP
diff --git a/extern/sol3/sol/userdata.hpp b/extern/sol3/sol/userdata.hpp
new file mode 100644
index 0000000000..e878d01be0
--- /dev/null
+++ b/extern/sol3/sol/userdata.hpp
@@ -0,0 +1,134 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_USERDATA_HPP
+#define SOL_USERDATA_HPP
+
+#include <sol/object_base.hpp>
+#include <sol/table.hpp>
+
+namespace sol {
+	template <typename base_type>
+	class basic_userdata : public basic_table<base_type> {
+	private:
+		using base_t = basic_table<base_type>;
+
+	public:
+		using base_t::lua_state;
+
+		basic_userdata() noexcept = default;
+		template <typename T,
+		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_userdata>>, meta::neg<std::is_same<base_t, stack_reference>>,
+		          is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_userdata(T&& r) noexcept : base_t(std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			if (!is_userdata<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				type_assert(lua_state(), -1, type::userdata);
+			}
+#endif // Safety
+		}
+		basic_userdata(const basic_userdata&) = default;
+		basic_userdata(basic_userdata&&) = default;
+		basic_userdata& operator=(const basic_userdata&) = default;
+		basic_userdata& operator=(basic_userdata&&) = default;
+		basic_userdata(const stack_reference& r) : basic_userdata(r.lua_state(), r.stack_index()) {
+		}
+		basic_userdata(stack_reference&& r) : basic_userdata(r.lua_state(), r.stack_index()) {
+		}
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_userdata(lua_State* L, T&& r) : base_t(L, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_userdata>(L, -1, handler);
+#endif // Safety
+		}
+		basic_userdata(lua_State* L, int index = -1) : base_t(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			constructor_handler handler {};
+			stack::check<basic_userdata>(L, index, handler);
+#endif // Safety
+		}
+		basic_userdata(lua_State* L, ref_index index) : base_t(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_userdata>(L, -1, handler);
+#endif // Safety
+		}
+	};
+
+	template <typename base_type>
+	class basic_lightuserdata : public basic_object_base<base_type> {
+		typedef basic_object_base<base_type> base_t;
+
+	public:
+		using base_t::lua_state;
+
+		basic_lightuserdata() noexcept = default;
+		template <typename T,
+		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_lightuserdata>>, meta::neg<std::is_same<base_t, stack_reference>>,
+		          is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_lightuserdata(T&& r) noexcept : base_t(std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			if (!is_lightuserdata<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				type_assert(lua_state(), -1, type::lightuserdata);
+			}
+#endif // Safety
+		}
+		basic_lightuserdata(const basic_lightuserdata&) = default;
+		basic_lightuserdata(basic_lightuserdata&&) = default;
+		basic_lightuserdata& operator=(const basic_lightuserdata&) = default;
+		basic_lightuserdata& operator=(basic_lightuserdata&&) = default;
+		basic_lightuserdata(const stack_reference& r) : basic_lightuserdata(r.lua_state(), r.stack_index()) {
+		}
+		basic_lightuserdata(stack_reference&& r) : basic_lightuserdata(r.lua_state(), r.stack_index()) {
+		}
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_lightuserdata(lua_State* L, T&& r) : basic_lightuserdata(L, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_lightuserdata>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		basic_lightuserdata(lua_State* L, int index = -1) : base_t(L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			constructor_handler handler {};
+			stack::check<basic_lightuserdata>(L, index, handler);
+#endif // Safety
+		}
+		basic_lightuserdata(lua_State* L, ref_index index) : base_t(L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES_I_)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_lightuserdata>(lua_state(), index, handler);
+#endif // Safety
+		}
+	};
+
+} // namespace sol
+
+#endif // SOL_USERDATA_HPP
diff --git a/extern/sol3/sol/usertype.hpp b/extern/sol3/sol/usertype.hpp
new file mode 100644
index 0000000000..b37436ad27
--- /dev/null
+++ b/extern/sol3/sol/usertype.hpp
@@ -0,0 +1,131 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_USERTYPE_HPP
+#define SOL_USERTYPE_HPP
+
+#include <sol/usertype_core.hpp>
+#include <sol/usertype_container_launch.hpp>
+#include <sol/usertype_storage.hpp>
+#include <sol/usertype_proxy.hpp>
+#include <sol/metatable.hpp>
+
+namespace sol {
+
+	template <typename T, typename base_type>
+	class basic_usertype : private basic_metatable<base_type> {
+	private:
+		using base_t = basic_metatable<base_type>;
+		using table_base_t = basic_table<base_type>;
+
+		template <typename>
+		friend class basic_metatable;
+
+		template <bool, typename>
+		friend class basic_table_core;
+
+		template <std::size_t... I, typename... Args>
+		void tuple_set(std::index_sequence<I...>, std::tuple<Args...>&& args) {
+			(void)args;
+			(void)detail::swallow { 0, (this->set(std::get<I * 2>(std::move(args)), std::get<I * 2 + 1>(std::move(args))), 0)... };
+		}
+
+		template <typename R, typename... Args, typename Fx, typename Key, typename = std::invoke_result_t<Fx, Args...>>
+		void set_fx(types<R(Args...)>, Key&& key, Fx&& fx) {
+			set_resolved_function<R(Args...)>(std::forward<Key>(key), std::forward<Fx>(fx));
+		}
+
+		template <typename Fx, typename Key, meta::enable<meta::is_specialization_of<meta::unqualified_t<Fx>, overload_set>> = meta::enabler>
+		void set_fx(types<>, Key&& key, Fx&& fx) {
+			set(std::forward<Key>(key), std::forward<Fx>(fx));
+		}
+
+		template <typename Fx, typename Key, typename... Args,
+		     meta::disable<meta::is_specialization_of<meta::unqualified_t<Fx>, overload_set>> = meta::enabler>
+		void set_fx(types<>, Key&& key, Fx&& fx, Args&&... args) {
+			set(std::forward<Key>(key), as_function_reference(std::forward<Fx>(fx), std::forward<Args>(args)...));
+		}
+
+		template <typename... Sig, typename... Args, typename Key>
+		void set_resolved_function(Key&& key, Args&&... args) {
+			set(std::forward<Key>(key), as_function_reference<function_sig<Sig...>>(std::forward<Args>(args)...));
+		}
+
+	public:
+		using base_t::base_t;
+
+		using base_t::get;
+		using base_t::lua_state;
+		using base_t::pop;
+		using base_t::push;
+		using base_t::traverse_get;
+		using base_t::traverse_set;
+		using base_t::unregister;
+
+		template <typename Key, typename Value>
+		basic_usertype& set(Key&& key, Value&& value) {
+			optional<u_detail::usertype_storage<T>&> maybe_uts = u_detail::maybe_get_usertype_storage<T>(this->lua_state());
+			if (maybe_uts) {
+				u_detail::usertype_storage<T>& uts = *maybe_uts;
+				uts.set(this->lua_state(), std::forward<Key>(key), std::forward<Value>(value));
+			}
+			else {
+				using ValueU = meta::unqualified_t<Value>;
+				// cannot get metatable: try regular table set?
+				if constexpr (detail::is_non_factory_constructor_v<ValueU> || detail::is_policy_v<ValueU>) {
+					// tag constructors so we don't get destroyed by lack of info
+					table_base_t::set(std::forward<Key>(key), detail::tagged<T, Value>(std::forward<Value>(value)));
+				}
+				else {
+					table_base_t::set(std::forward<Key>(key), std::forward<Value>(value));
+				}
+			}
+			return *this;
+		}
+
+		template <typename Sig, typename Key, typename... Args>
+		basic_usertype& set_function(Key&& key, Args&&... args) {
+			set_fx(types<Sig>(), std::forward<Key>(key), std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename Key, typename... Args>
+		basic_usertype& set_function(Key&& key, Args&&... args) {
+			set_fx(types<>(), std::forward<Key>(key), std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename Key>
+		usertype_proxy<basic_usertype&, std::decay_t<Key>> operator[](Key&& key) {
+			return usertype_proxy<basic_usertype&, std::decay_t<Key>>(*this, std::forward<Key>(key));
+		}
+
+		template <typename Key>
+		usertype_proxy<const basic_usertype&, std::decay_t<Key>> operator[](Key&& key) const {
+			return usertype_proxy<const basic_usertype&, std::decay_t<Key>>(*this, std::forward<Key>(key));
+		}
+	};
+
+} // namespace sol
+
+#endif // SOL_USERTYPE_HPP
diff --git a/extern/sol3/sol/usertype_container.hpp b/extern/sol3/sol/usertype_container.hpp
new file mode 100644
index 0000000000..4bb99c0f55
--- /dev/null
+++ b/extern/sol3/sol/usertype_container.hpp
@@ -0,0 +1,1562 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_USERTYPE_CONTAINER_HPP
+#define SOL_USERTYPE_CONTAINER_HPP
+
+#include <sol/traits.hpp>
+#include <sol/stack.hpp>
+#include <sol/object.hpp>
+
+namespace sol {
+
+	template <typename T>
+	struct usertype_container;
+
+	namespace container_detail {
+
+		template <typename T>
+		struct has_clear_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::clear));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_empty_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::empty));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_erase_after_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(
+			     decltype(std::declval<C>().erase_after(std::declval<std::add_rvalue_reference_t<typename C::const_iterator>>()))*);
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T, typename = void>
+		struct has_find_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(std::declval<C>().find(std::declval<std::add_rvalue_reference_t<typename C::value_type>>()))*);
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_find_test<T, std::enable_if_t<meta::is_lookup<T>::value>> {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(std::declval<C>().find(std::declval<std::add_rvalue_reference_t<typename C::key_type>>()))*);
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_erase_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(std::declval<C>().erase(std::declval<typename C::iterator>()))*);
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_erase_key_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(std::declval<C>().erase(std::declval<typename C::key_type>()))*);
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_find_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::find));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_index_of_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::index_of));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_insert_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::insert));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_erase_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::erase));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_index_set_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::index_set));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_index_get_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::index_get));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_set_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::set));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_get_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::get));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_at_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::at));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_pairs_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::pairs));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_ipairs_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::ipairs));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_next_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::next));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_add_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::add));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_size_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::size));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		using has_clear = meta::boolean<has_clear_test<T>::value>;
+
+		template <typename T>
+		using has_empty = meta::boolean<has_empty_test<T>::value>;
+
+		template <typename T>
+		using has_find = meta::boolean<has_find_test<T>::value>;
+
+		template <typename T>
+		using has_erase = meta::boolean<has_erase_test<T>::value>;
+
+		template <typename T>
+		using has_erase_key = meta::boolean<has_erase_key_test<T>::value>;
+
+		template <typename T>
+		using has_erase_after = meta::boolean<has_erase_after_test<T>::value>;
+
+		template <typename T>
+		using has_traits_get = meta::boolean<has_traits_get_test<T>::value>;
+
+		template <typename T>
+		using has_traits_at = meta::boolean<has_traits_at_test<T>::value>;
+
+		template <typename T>
+		using has_traits_set = meta::boolean<has_traits_set_test<T>::value>;
+
+		template <typename T>
+		using has_traits_index_get = meta::boolean<has_traits_index_get_test<T>::value>;
+
+		template <typename T>
+		using has_traits_index_set = meta::boolean<has_traits_index_set_test<T>::value>;
+
+		template <typename T>
+		using has_traits_pairs = meta::boolean<has_traits_pairs_test<T>::value>;
+
+		template <typename T>
+		using has_traits_ipairs = meta::boolean<has_traits_ipairs_test<T>::value>;
+
+		template <typename T>
+		using has_traits_next = meta::boolean<has_traits_next_test<T>::value>;
+
+		template <typename T>
+		using has_traits_add = meta::boolean<has_traits_add_test<T>::value>;
+
+		template <typename T>
+		using has_traits_size = meta::boolean<has_traits_size_test<T>::value>;
+
+		template <typename T>
+		using has_traits_clear = has_clear<T>;
+
+		template <typename T>
+		using has_traits_empty = has_empty<T>;
+
+		template <typename T>
+		using has_traits_find = meta::boolean<has_traits_find_test<T>::value>;
+
+		template <typename T>
+		using has_traits_index_of = meta::boolean<has_traits_index_of_test<T>::value>;
+
+		template <typename T>
+		using has_traits_insert = meta::boolean<has_traits_insert_test<T>::value>;
+
+		template <typename T>
+		using has_traits_erase = meta::boolean<has_traits_erase_test<T>::value>;
+
+		template <typename T>
+		struct is_forced_container : is_container<T> { };
+
+		template <typename T>
+		struct is_forced_container<as_container_t<T>> : std::true_type { };
+
+		template <typename T>
+		struct container_decay {
+			typedef T type;
+		};
+
+		template <typename T>
+		struct container_decay<as_container_t<T>> {
+			typedef T type;
+		};
+
+		template <typename T>
+		using container_decay_t = typename container_decay<meta::unqualified_t<T>>::type;
+
+		template <typename T>
+		decltype(auto) get_key(std::false_type, T&& t) {
+			return std::forward<T>(t);
+		}
+
+		template <typename T>
+		decltype(auto) get_key(std::true_type, T&& t) {
+			return t.first;
+		}
+
+		template <typename T>
+		decltype(auto) get_value(std::false_type, T&& t) {
+			return std::forward<T>(t);
+		}
+
+		template <typename T>
+		decltype(auto) get_value(std::true_type, T&& t) {
+			return t.second;
+		}
+
+		template <typename X, typename = void>
+		struct usertype_container_default {
+		private:
+			typedef std::remove_pointer_t<meta::unwrap_unqualified_t<X>> T;
+
+		public:
+			typedef lua_nil_t iterator;
+			typedef lua_nil_t value_type;
+
+			static int at(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'at(index)' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int get(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'get(key)' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int index_get(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'container[key]' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int set(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'set(key, value)' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int index_set(lua_State* L_) {
+				return luaL_error(
+				     L_, "sol: cannot call 'container[key] = value' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int add(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'add' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int insert(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'insert' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int find(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'find' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int index_of(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'index_of' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int size(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'end' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int clear(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'clear' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int empty(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'empty' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int erase(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'erase' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int next(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'next' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int pairs(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call '__pairs/pairs' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int ipairs(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call '__ipairs' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static iterator begin(lua_State* L_, T&) {
+				luaL_error(L_, "sol: cannot call 'being' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+				return lua_nil;
+			}
+
+			static iterator end(lua_State* L_, T&) {
+				luaL_error(L_, "sol: cannot call 'end' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+				return lua_nil;
+			}
+		};
+
+		template <typename X>
+		struct usertype_container_default<X,
+		     std::enable_if_t<meta::all<is_forced_container<meta::unqualified_t<X>>, meta::has_value_type<meta::unqualified_t<container_decay_t<X>>>,
+		          meta::has_iterator<meta::unqualified_t<container_decay_t<X>>>>::value>> {
+		private:
+			using T = std::remove_pointer_t<meta::unwrap_unqualified_t<container_decay_t<X>>>;
+
+		private:
+			using deferred_uc = usertype_container<X>;
+			using is_associative = meta::is_associative<T>;
+			using is_lookup = meta::is_lookup<T>;
+			using is_ordered = meta::is_ordered<T>;
+			using is_matched_lookup = meta::is_matched_lookup<T>;
+			using iterator = typename T::iterator;
+			using value_type = typename T::value_type;
+			typedef meta::conditional_t<is_matched_lookup::value, std::pair<value_type, value_type>,
+			     meta::conditional_t<is_associative::value || is_lookup::value, value_type, std::pair<std::ptrdiff_t, value_type>>>
+			     KV;
+			typedef typename KV::first_type K;
+			typedef typename KV::second_type V;
+			typedef meta::conditional_t<is_matched_lookup::value, std::ptrdiff_t, K> next_K;
+			typedef decltype(*std::declval<iterator&>()) iterator_return;
+			typedef meta::conditional_t<is_associative::value || is_matched_lookup::value, std::add_lvalue_reference_t<V>,
+			     meta::conditional_t<is_lookup::value, V, iterator_return>>
+			     captured_type;
+			typedef typename meta::iterator_tag<iterator>::type iterator_category;
+			typedef std::is_same<iterator_category, std::input_iterator_tag> is_input_iterator;
+			typedef meta::conditional_t<is_input_iterator::value, V, decltype(detail::deref_move_only(std::declval<captured_type>()))> push_type;
+			typedef std::is_copy_assignable<V> is_copyable;
+			typedef meta::neg<meta::any<std::is_const<V>, std::is_const<std::remove_reference_t<iterator_return>>, meta::neg<is_copyable>>> is_writable;
+			typedef meta::unqualified_t<decltype(get_key(is_associative(), std::declval<std::add_lvalue_reference_t<value_type>>()))> key_type;
+			typedef meta::all<std::is_integral<K>, meta::neg<meta::any<is_associative, is_lookup>>> is_linear_integral;
+
+			struct iter {
+				reference keep_alive;
+				T& source;
+				iterator it;
+				std::size_t index;
+
+				iter(lua_State* L_, int stack_index, T& source_, iterator it_) : keep_alive(L_, stack_index), source(source_), it(std::move(it_)), index(0) {
+				}
+
+				~iter() {
+				}
+			};
+
+			static auto& get_src(lua_State* L_) {
+#if SOL_IS_ON(SOL_SAFE_USERTYPE_I_)
+				auto p = stack::unqualified_check_get<T*>(L_, 1);
+				if (!p) {
+					luaL_error(L_,
+					     "sol: 'self' is not of type '%s' (pass 'self' as first argument with ':' or call on proper type)",
+					     detail::demangle<T>().c_str());
+				}
+				if (p.value() == nullptr) {
+					luaL_error(
+					     L_, "sol: 'self' argument is nil (pass 'self' as first argument with ':' or call on a '%s' type)", detail::demangle<T>().c_str());
+				}
+				return *p.value();
+#else
+				return stack::unqualified_get<T>(L_, 1);
+#endif // Safe getting with error
+			}
+
+			static detail::error_result at_category(std::input_iterator_tag, lua_State* L_, T& self, std::ptrdiff_t pos) {
+				pos += deferred_uc::index_adjustment(L_, self);
+				if (pos < 0) {
+					return stack::push(L_, lua_nil);
+				}
+				auto it = deferred_uc::begin(L_, self);
+				auto e = deferred_uc::end(L_, self);
+				if (it == e) {
+					return stack::push(L_, lua_nil);
+				}
+				while (pos > 0) {
+					--pos;
+					++it;
+					if (it == e) {
+						return stack::push(L_, lua_nil);
+					}
+				}
+				return get_associative(is_associative(), L_, it);
+			}
+
+			static detail::error_result at_category(std::random_access_iterator_tag, lua_State* L_, T& self, std::ptrdiff_t pos) {
+				std::ptrdiff_t len = static_cast<std::ptrdiff_t>(size_start(L_, self));
+				pos += deferred_uc::index_adjustment(L_, self);
+				if (pos < 0 || pos >= len) {
+					return stack::push(L_, lua_nil);
+				}
+				auto it = std::next(deferred_uc::begin(L_, self), pos);
+				return get_associative(is_associative(), L_, it);
+			}
+
+			static detail::error_result at_start(lua_State* L_, T& self, std::ptrdiff_t pos) {
+				return at_category(iterator_category(), L_, self, pos);
+			}
+
+			template <typename Iter>
+			static detail::error_result get_associative(std::true_type, lua_State* L_, Iter& it) {
+				decltype(auto) v = *it;
+				return stack::stack_detail::push_reference<push_type>(L_, detail::deref_move_only(v.second));
+			}
+
+			template <typename Iter>
+			static detail::error_result get_associative(std::false_type, lua_State* L_, Iter& it) {
+				return stack::stack_detail::push_reference<push_type>(L_, detail::deref_move_only(*it));
+			}
+
+			static detail::error_result get_category(std::input_iterator_tag, lua_State* L_, T& self, K& key) {
+				key = static_cast<K>(key + deferred_uc::index_adjustment(L_, self));
+				if (key < 0) {
+					return stack::push(L_, lua_nil);
+				}
+				auto it = deferred_uc::begin(L_, self);
+				auto e = deferred_uc::end(L_, self);
+				if (it == e) {
+					return stack::push(L_, lua_nil);
+				}
+				while (key > 0) {
+					--key;
+					++it;
+					if (it == e) {
+						return stack::push(L_, lua_nil);
+					}
+				}
+				return get_associative(is_associative(), L_, it);
+			}
+
+			static detail::error_result get_category(std::random_access_iterator_tag, lua_State* L_, T& self, K& key) {
+				std::ptrdiff_t len = static_cast<std::ptrdiff_t>(size_start(L_, self));
+				key = static_cast<K>(static_cast<std::ptrdiff_t>(key) + deferred_uc::index_adjustment(L_, self));
+				if (key < 0 || key >= len) {
+					return stack::push(L_, lua_nil);
+				}
+				auto it = std::next(deferred_uc::begin(L_, self), key);
+				return get_associative(is_associative(), L_, it);
+			}
+
+			static detail::error_result get_it(std::true_type, lua_State* L_, T& self, K& key) {
+				return get_category(iterator_category(), L_, self, key);
+			}
+
+			static detail::error_result get_comparative(std::true_type, lua_State* L_, T& self, K& key) {
+				auto fx = [&](const value_type& r) -> bool { return key == get_key(is_associative(), r); };
+				auto e = deferred_uc::end(L_, self);
+				auto it = std::find_if(deferred_uc::begin(L_, self), e, std::ref(fx));
+				if (it == e) {
+					return stack::push(L_, lua_nil);
+				}
+				return get_associative(is_associative(), L_, it);
+			}
+
+			static detail::error_result get_comparative(std::false_type, lua_State*, T&, K&) {
+				return detail::error_result("cannot get this key on '%s': no suitable way to increment iterator and compare to key value '%s'",
+				     detail::demangle<T>().data(),
+				     detail::demangle<K>().data());
+			}
+
+			static detail::error_result get_it(std::false_type, lua_State* L_, T& self, K& key) {
+				return get_comparative(meta::supports_op_equal<K, key_type>(), L_, self, key);
+			}
+
+			static detail::error_result set_associative(std::true_type, iterator& it, stack_object value) {
+				decltype(auto) v = *it;
+				v.second = value.as<V>();
+				return {};
+			}
+
+			static detail::error_result set_associative(std::false_type, iterator& it, stack_object value) {
+				decltype(auto) v = *it;
+				v = value.as<V>();
+				return {};
+			}
+
+			static detail::error_result set_writable(std::true_type, lua_State*, T&, iterator& it, stack_object value) {
+				return set_associative(is_associative(), it, std::move(value));
+			}
+
+			static detail::error_result set_writable(std::false_type, lua_State*, T&, iterator&, stack_object) {
+				return detail::error_result(
+				     "cannot perform a 'set': '%s's iterator reference is not writable (non-copy-assignable or const)", detail::demangle<T>().data());
+			}
+
+			static detail::error_result set_category(std::input_iterator_tag, lua_State* L_, T& self, stack_object okey, stack_object value) {
+				decltype(auto) key = okey.as<K>();
+				key = static_cast<K>(static_cast<std::ptrdiff_t>(key) + deferred_uc::index_adjustment(L_, self));
+				auto e = deferred_uc::end(L_, self);
+				auto it = deferred_uc::begin(L_, self);
+				auto backit = it;
+				for (; key > 0 && it != e; --key, ++it) {
+					backit = it;
+				}
+				if (it == e) {
+					if (key == 0) {
+						return add_copyable(is_copyable(), L_, self, std::move(value), meta::has_insert_after<T>::value ? backit : it);
+					}
+					return detail::error_result("out of bounds (too big) for set on '%s'", detail::demangle<T>().c_str());
+				}
+				return set_writable(is_writable(), L_, self, it, std::move(value));
+			}
+
+			static detail::error_result set_category(std::random_access_iterator_tag, lua_State* L_, T& self, stack_object okey, stack_object value) {
+				decltype(auto) key = okey.as<K>();
+				key = static_cast<K>(static_cast<std::ptrdiff_t>(key) + deferred_uc::index_adjustment(L_, self));
+				if (key < 0) {
+					return detail::error_result("sol: out of bounds (too small) for set on '%s'", detail::demangle<T>().c_str());
+				}
+				std::ptrdiff_t len = static_cast<std::ptrdiff_t>(size_start(L_, self));
+				if (key == len) {
+					return add_copyable(is_copyable(), L_, self, std::move(value));
+				}
+				else if (key >= len) {
+					return detail::error_result("sol: out of bounds (too big) for set on '%s'", detail::demangle<T>().c_str());
+				}
+				auto it = std::next(deferred_uc::begin(L_, self), key);
+				return set_writable(is_writable(), L_, self, it, std::move(value));
+			}
+
+			static detail::error_result set_comparative(std::true_type, lua_State* L_, T& self, stack_object okey, stack_object value) {
+				decltype(auto) key = okey.as<K>();
+				if (!is_writable::value) {
+					return detail::error_result(
+					     "cannot perform a 'set': '%s's iterator reference is not writable (non-copy-assignable or const)", detail::demangle<T>().data());
+				}
+				auto fx = [&](const value_type& r) -> bool { return key == get_key(is_associative(), r); };
+				auto e = deferred_uc::end(L_, self);
+				auto it = std::find_if(deferred_uc::begin(L_, self), e, std::ref(fx));
+				if (it == e) {
+					return {};
+				}
+				return set_writable(is_writable(), L_, self, it, std::move(value));
+			}
+
+			static detail::error_result set_comparative(std::false_type, lua_State*, T&, stack_object, stack_object) {
+				return detail::error_result("cannot set this value on '%s': no suitable way to increment iterator or compare to '%s' key",
+				     detail::demangle<T>().data(),
+				     detail::demangle<K>().data());
+			}
+
+			template <typename Iter>
+			static detail::error_result set_associative_insert(std::true_type, lua_State*, T& self, Iter& it, K& key, stack_object value) {
+				if constexpr (meta::has_insert_with_iterator<T>::value) {
+					self.insert(it, value_type(key, value.as<V>()));
+					return {};
+				}
+				else if constexpr (meta::has_insert<T>::value) {
+					self.insert(value_type(key, value.as<V>()));
+					return {};
+				}
+				else {
+					(void)self;
+					(void)it;
+					(void)key;
+					return detail::error_result(
+					     "cannot call 'set' on '%s': there is no 'insert' function on this associative type", detail::demangle<T>().c_str());
+				}
+			}
+
+			template <typename Iter>
+			static detail::error_result set_associative_insert(std::false_type, lua_State*, T& self, Iter& it, K& key, stack_object) {
+				if constexpr (meta::has_insert_with_iterator<T>::value) {
+					self.insert(it, key);
+					return {};
+				}
+				else if constexpr (meta::has_insert<T>::value) {
+					self.insert(key);
+					return {};
+				}
+				else {
+					(void)self;
+					(void)it;
+					(void)key;
+					return detail::error_result(
+					     "cannot call 'set' on '%s': there is no 'insert' function on this non-associative type", detail::demangle<T>().c_str());
+				}
+			}
+
+			static detail::error_result set_associative_find(std::true_type, lua_State* L_, T& self, stack_object okey, stack_object value) {
+				decltype(auto) key = okey.as<K>();
+				auto it = self.find(key);
+				if (it == deferred_uc::end(L_, self)) {
+					return set_associative_insert(is_associative(), L_, self, it, key, std::move(value));
+				}
+				return set_writable(is_writable(), L_, self, it, std::move(value));
+			}
+
+			static detail::error_result set_associative_find(std::false_type, lua_State* L_, T& self, stack_object key, stack_object value) {
+				return set_comparative(meta::supports_op_equal<K, key_type>(), L_, self, std::move(key), std::move(value));
+			}
+
+			static detail::error_result set_it(std::true_type, lua_State* L_, T& self, stack_object key, stack_object value) {
+				return set_category(iterator_category(), L_, self, std::move(key), std::move(value));
+			}
+
+			static detail::error_result set_it(std::false_type, lua_State* L_, T& self, stack_object key, stack_object value) {
+				return set_associative_find(meta::all<has_find<T>, meta::any<is_associative, is_lookup>>(), L_, self, std::move(key), std::move(value));
+			}
+
+			template <bool idx_of = false>
+			static detail::error_result find_has_associative_lookup(std::true_type, lua_State* L_, T& self) {
+				if constexpr (!is_ordered::value && idx_of) {
+					(void)L_;
+					(void)self;
+					return detail::error_result("cannot perform an 'index_of': '%s's is not an ordered container", detail::demangle<T>().data());
+				}
+				else {
+					decltype(auto) key = stack::unqualified_get<K>(L_, 2);
+					auto it = self.find(key);
+					if (it == deferred_uc::end(L_, self)) {
+						return stack::push(L_, lua_nil);
+					}
+					if constexpr (idx_of) {
+						auto dist = std::distance(deferred_uc::begin(L_, self), it);
+						dist -= deferred_uc::index_adjustment(L_, self);
+						return stack::push(L_, dist);
+					}
+					else {
+						return get_associative(is_associative(), L_, it);
+					}
+				}
+			}
+
+			template <bool idx_of = false>
+			static detail::error_result find_has_associative_lookup(std::false_type, lua_State* L_, T& self) {
+				if constexpr (!is_ordered::value && idx_of) {
+					(void)L_;
+					(void)self;
+					return detail::error_result("cannot perform an 'index_of': '%s's is not an ordered container", detail::demangle<T>().data());
+				}
+				else {
+					decltype(auto) value = stack::unqualified_get<V>(L_, 2);
+					auto it = self.find(value);
+					if (it == deferred_uc::end(L_, self)) {
+						return stack::push(L_, lua_nil);
+					}
+					if constexpr (idx_of) {
+						auto dist = std::distance(deferred_uc::begin(L_, self), it);
+						dist -= deferred_uc::index_adjustment(L_, self);
+						return stack::push(L_, dist);
+					}
+					else {
+						return get_associative(is_associative(), L_, it);
+					}
+				}
+			}
+
+			template <bool idx_of = false>
+			static detail::error_result find_has(std::true_type, lua_State* L_, T& self) {
+				return find_has_associative_lookup<idx_of>(meta::any<is_lookup, is_associative>(), L_, self);
+			}
+
+			template <typename Iter>
+			static detail::error_result find_associative_lookup(std::true_type, lua_State* L_, T&, Iter& it, std::size_t) {
+				return get_associative(is_associative(), L_, it);
+			}
+
+			template <typename Iter>
+			static detail::error_result find_associative_lookup(std::false_type, lua_State* L_, T& self, Iter&, std::size_t idx) {
+				idx = static_cast<std::size_t>(static_cast<std::ptrdiff_t>(idx) - deferred_uc::index_adjustment(L_, self));
+				return stack::push(L_, idx);
+			}
+
+			template <bool = false>
+			static detail::error_result find_comparative(std::false_type, lua_State*, T&) {
+				return detail::error_result("cannot call 'find' on '%s': there is no 'find' function and the value_type is not equality comparable",
+				     detail::demangle<T>().c_str());
+			}
+
+			template <bool idx_of = false>
+			static detail::error_result find_comparative(std::true_type, lua_State* L_, T& self) {
+				decltype(auto) value = stack::unqualified_get<V>(L_, 2);
+				auto it = deferred_uc::begin(L_, self);
+				auto e = deferred_uc::end(L_, self);
+				std::size_t idx = 0;
+				for (;; ++it, ++idx) {
+					if (it == e) {
+						return stack::push(L_, lua_nil);
+					}
+					if (value == get_value(is_associative(), *it)) {
+						break;
+					}
+				}
+				return find_associative_lookup(meta::all<meta::boolean<!idx_of>, meta::any<is_lookup, is_associative>>(), L_, self, it, idx);
+			}
+
+			template <bool idx_of = false>
+			static detail::error_result find_has(std::false_type, lua_State* L_, T& self) {
+				return find_comparative<idx_of>(meta::supports_op_equal<V>(), L_, self);
+			}
+
+			template <typename Iter>
+			static detail::error_result add_insert_after(std::false_type, lua_State* L_, T& self, stack_object value, Iter&) {
+				return add_insert_after(std::false_type(), L_, self, value);
+			}
+
+			static detail::error_result add_insert_after(std::false_type, lua_State*, T&, stack_object) {
+				return detail::error_result("cannot call 'add' on type '%s': no suitable insert/push_back C++ functions", detail::demangle<T>().data());
+			}
+
+			template <typename Iter>
+			static detail::error_result add_insert_after(std::true_type, lua_State*, T& self, stack_object value, Iter& pos) {
+				self.insert_after(pos, value.as<V>());
+				return {};
+			}
+
+			static detail::error_result add_insert_after(std::true_type, lua_State* L_, T& self, stack_object value) {
+				auto backit = self.before_begin();
+				{
+					auto e = deferred_uc::end(L_, self);
+					for (auto it = deferred_uc::begin(L_, self); it != e; ++backit, ++it) { }
+				}
+				return add_insert_after(std::true_type(), L_, self, value, backit);
+			}
+
+			template <typename Iter>
+			static detail::error_result add_insert(std::true_type, lua_State*, T& self, stack_object value, Iter& pos) {
+				self.insert(pos, value.as<V>());
+				return {};
+			}
+
+			static detail::error_result add_insert(std::true_type, lua_State* L_, T& self, stack_object value) {
+				auto pos = deferred_uc::end(L_, self);
+				return add_insert(std::true_type(), L_, self, value, pos);
+			}
+
+			template <typename Iter>
+			static detail::error_result add_insert(std::false_type, lua_State* L_, T& self, stack_object value, Iter& pos) {
+				return add_insert_after(meta::has_insert_after<T>(), L_, self, std::move(value), pos);
+			}
+
+			static detail::error_result add_insert(std::false_type, lua_State* L_, T& self, stack_object value) {
+				return add_insert_after(meta::has_insert_after<T>(), L_, self, std::move(value));
+			}
+
+			template <typename Iter>
+			static detail::error_result add_push_back(std::true_type, lua_State*, T& self, stack_object value, Iter&) {
+				self.push_back(value.as<V>());
+				return {};
+			}
+
+			static detail::error_result add_push_back(std::true_type, lua_State*, T& self, stack_object value) {
+				self.push_back(value.as<V>());
+				return {};
+			}
+
+			template <typename Iter>
+			static detail::error_result add_push_back(std::false_type, lua_State* L_, T& self, stack_object value, Iter& pos) {
+				return add_insert(
+				     std::integral_constant < bool, meta::has_insert<T>::value || meta::has_insert_with_iterator<T>::value > (), L_, self, value, pos);
+			}
+
+			static detail::error_result add_push_back(std::false_type, lua_State* L_, T& self, stack_object value) {
+				return add_insert(
+				     std::integral_constant < bool, meta::has_insert<T>::value || meta::has_insert_with_iterator<T>::value > (), L_, self, value);
+			}
+
+			template <typename Iter>
+			static detail::error_result add_associative(std::true_type, lua_State* L_, T& self, stack_object key, Iter& pos) {
+				if constexpr (meta::has_insert_with_iterator<T>::value) {
+					self.insert(pos, value_type(key.as<K>(), stack::unqualified_get<V>(L_, 3)));
+					return {};
+				}
+				else if constexpr (meta::has_insert<T>::value) {
+					self.insert(value_type(key.as<K>(), stack::unqualified_get<V>(L_, 3)));
+					return {};
+				}
+				else {
+					(void)L_;
+					(void)self;
+					(void)key;
+					(void)pos;
+					return detail::error_result(
+					     "cannot call 'insert' on '%s': there is no 'insert' function on this associative type", detail::demangle<T>().c_str());
+				}
+			}
+
+			static detail::error_result add_associative(std::true_type, lua_State* L_, T& self, stack_object key) {
+				auto pos = deferred_uc::end(L_, self);
+				return add_associative(std::true_type(), L_, self, std::move(key), pos);
+			}
+
+			template <typename Iter>
+			static detail::error_result add_associative(std::false_type, lua_State* L_, T& self, stack_object value, Iter& pos) {
+				return add_push_back(meta::has_push_back<T>(), L_, self, value, pos);
+			}
+
+			static detail::error_result add_associative(std::false_type, lua_State* L_, T& self, stack_object value) {
+				return add_push_back(meta::has_push_back<T>(), L_, self, value);
+			}
+
+			template <typename Iter>
+			static detail::error_result add_copyable(std::true_type, lua_State* L_, T& self, stack_object value, Iter& pos) {
+				return add_associative(is_associative(), L_, self, std::move(value), pos);
+			}
+
+			static detail::error_result add_copyable(std::true_type, lua_State* L_, T& self, stack_object value) {
+				return add_associative(is_associative(), L_, self, value);
+			}
+
+			template <typename Iter>
+			static detail::error_result add_copyable(std::false_type, lua_State* L_, T& self, stack_object value, Iter&) {
+				return add_copyable(std::false_type(), L_, self, std::move(value));
+			}
+
+			static detail::error_result add_copyable(std::false_type, lua_State*, T&, stack_object) {
+				return detail::error_result("cannot call 'add' on '%s': value_type is non-copyable", detail::demangle<T>().data());
+			}
+
+			static detail::error_result insert_lookup(std::true_type, lua_State* L_, T& self, stack_object, stack_object value) {
+				// TODO: should we warn or error about someone calling insert on an ordered / lookup container with no associativity?
+				return add_copyable(std::true_type(), L_, self, std::move(value));
+			}
+
+			static detail::error_result insert_lookup(std::false_type, lua_State* L_, T& self, stack_object where, stack_object value) {
+				auto it = deferred_uc::begin(L_, self);
+				auto key = where.as<K>();
+				key = static_cast<K>(static_cast<std::ptrdiff_t>(key) + deferred_uc::index_adjustment(L_, self));
+				std::advance(it, key);
+				self.insert(it, value.as<V>());
+				return {};
+			}
+
+			static detail::error_result insert_after_has(std::true_type, lua_State* L_, T& self, stack_object where, stack_object value) {
+				auto key = where.as<K>();
+				auto backit = self.before_begin();
+				{
+					key = static_cast<K>(static_cast<std::ptrdiff_t>(key) + deferred_uc::index_adjustment(L_, self));
+					auto e = deferred_uc::end(L_, self);
+					for (auto it = deferred_uc::begin(L_, self); key > 0; ++backit, ++it, --key) {
+						if (backit == e) {
+							return detail::error_result("sol: out of bounds (too big) for set on '%s'", detail::demangle<T>().c_str());
+						}
+					}
+				}
+				self.insert_after(backit, value.as<V>());
+				return {};
+			}
+
+			static detail::error_result insert_after_has(std::false_type, lua_State*, T&, stack_object, stack_object) {
+				return detail::error_result(
+				     "cannot call 'insert' on '%s': no suitable or similar functionality detected on this container", detail::demangle<T>().data());
+			}
+
+			static detail::error_result insert_has(std::true_type, lua_State* L_, T& self, stack_object key, stack_object value) {
+				return insert_lookup(meta::any<is_associative, is_lookup>(), L_, self, std::move(key), std::move(value));
+			}
+
+			static detail::error_result insert_has(std::false_type, lua_State* L_, T& self, stack_object where, stack_object value) {
+				return insert_after_has(meta::has_insert_after<T>(), L_, self, where, value);
+			}
+
+			static detail::error_result insert_copyable(std::true_type, lua_State* L_, T& self, stack_object key, stack_object value) {
+				return insert_has(std::integral_constant < bool,
+				     meta::has_insert<T>::value || meta::has_insert_with_iterator<T>::value > (),
+				     L_,
+				     self,
+				     std::move(key),
+				     std::move(value));
+			}
+
+			static detail::error_result insert_copyable(std::false_type, lua_State*, T&, stack_object, stack_object) {
+				return detail::error_result("cannot call 'insert' on '%s': value_type is non-copyable", detail::demangle<T>().data());
+			}
+
+			static detail::error_result erase_integral(std::true_type, lua_State* L_, T& self, K& key) {
+				auto it = deferred_uc::begin(L_, self);
+				key = (static_cast<std::ptrdiff_t>(key) + deferred_uc::index_adjustment(L_, self));
+				std::advance(it, key);
+				self.erase(it);
+
+				return {};
+			}
+
+			static detail::error_result erase_integral(std::false_type, lua_State* L_, T& self, const K& key) {
+				auto fx = [&](const value_type& r) -> bool { return key == r; };
+				auto e = deferred_uc::end(L_, self);
+				auto it = std::find_if(deferred_uc::begin(L_, self), e, std::ref(fx));
+				if (it == e) {
+					return {};
+				}
+				self.erase(it);
+
+				return {};
+			}
+
+			static detail::error_result erase_associative_lookup(std::true_type, lua_State*, T& self, const K& key) {
+				self.erase(key);
+				return {};
+			}
+
+			static detail::error_result erase_associative_lookup(std::false_type, lua_State* L_, T& self, K& key) {
+				return erase_integral(std::is_integral<K>(), L_, self, key);
+			}
+
+			static detail::error_result erase_after_has(std::true_type, lua_State* L_, T& self, K& key) {
+				auto backit = self.before_begin();
+				{
+					key = static_cast<K>(static_cast<std::ptrdiff_t>(key) + deferred_uc::index_adjustment(L_, self));
+					auto e = deferred_uc::end(L_, self);
+					for (auto it = deferred_uc::begin(L_, self); key > 0; ++backit, ++it, --key) {
+						if (backit == e) {
+							return detail::error_result("sol: out of bounds for erase on '%s'", detail::demangle<T>().c_str());
+						}
+					}
+				}
+				self.erase_after(backit);
+				return {};
+			}
+
+			static detail::error_result erase_after_has(std::false_type, lua_State*, T&, const K&) {
+				return detail::error_result("sol: cannot call erase on '%s'", detail::demangle<T>().c_str());
+			}
+
+			static detail::error_result erase_key_has(std::true_type, lua_State* L_, T& self, K& key) {
+				return erase_associative_lookup(meta::any<is_associative, is_lookup>(), L_, self, key);
+			}
+
+			static detail::error_result erase_key_has(std::false_type, lua_State* L_, T& self, K& key) {
+				return erase_after_has(has_erase_after<T>(), L_, self, key);
+			}
+
+			static detail::error_result erase_has(std::true_type, lua_State* L_, T& self, K& key) {
+				return erase_associative_lookup(meta::any<is_associative, is_lookup>(), L_, self, key);
+			}
+
+			static detail::error_result erase_has(std::false_type, lua_State* L_, T& self, K& key) {
+				return erase_key_has(has_erase_key<T>(), L_, self, key);
+			}
+
+			static auto size_has(std::false_type, lua_State* L_, T& self) {
+				return std::distance(deferred_uc::begin(L_, self), deferred_uc::end(L_, self));
+			}
+
+			static auto size_has(std::true_type, lua_State*, T& self) {
+				return self.size();
+			}
+
+			static void clear_has(std::true_type, lua_State*, T& self) {
+				self.clear();
+			}
+
+			static void clear_has(std::false_type, lua_State* L_, T&) {
+				luaL_error(L_, "sol: cannot call clear on '%s'", detail::demangle<T>().c_str());
+			}
+
+			static bool empty_has(std::true_type, lua_State*, T& self) {
+				return self.empty();
+			}
+
+			static bool empty_has(std::false_type, lua_State* L_, T& self) {
+				return deferred_uc::begin(L_, self) == deferred_uc::end(L_, self);
+			}
+
+			static detail::error_result get_associative_find(std::true_type, lua_State* L_, T& self, K& key) {
+				auto it = self.find(key);
+				if (it == deferred_uc::end(L_, self)) {
+					stack::push(L_, lua_nil);
+					return {};
+				}
+				return get_associative(std::true_type(), L_, it);
+			}
+
+			static detail::error_result get_associative_find(std::false_type, lua_State* L_, T& self, K& key) {
+				return get_it(is_linear_integral(), L_, self, key);
+			}
+
+			static detail::error_result get_start(lua_State* L_, T& self, K& key) {
+				return get_associative_find(std::integral_constant < bool, is_associative::value&& has_find<T>::value > (), L_, self, key);
+			}
+
+			static detail::error_result set_start(lua_State* L_, T& self, stack_object key, stack_object value) {
+				return set_it(is_linear_integral(), L_, self, std::move(key), std::move(value));
+			}
+
+			static std::size_t size_start(lua_State* L_, T& self) {
+				return static_cast<std::size_t>(size_has(meta::has_size<T>(), L_, self));
+			}
+
+			static void clear_start(lua_State* L_, T& self) {
+				clear_has(has_clear<T>(), L_, self);
+			}
+
+			static bool empty_start(lua_State* L_, T& self) {
+				return empty_has(has_empty<T>(), L_, self);
+			}
+
+			static detail::error_result erase_start(lua_State* L_, T& self, K& key) {
+				return erase_has(has_erase<T>(), L_, self, key);
+			}
+
+			template <bool ip>
+			static int next_associative(std::true_type, lua_State* L_) {
+				iter& i = stack::unqualified_get<user<iter>>(L_, 1);
+				auto& source = i.source;
+				auto& it = i.it;
+				if (it == deferred_uc::end(L_, source)) {
+					return stack::push(L_, lua_nil);
+				}
+				int p;
+				if constexpr (ip) {
+					++i.index;
+					p = stack::push_reference(L_, i.index);
+				}
+				else {
+					p = stack::push_reference(L_, it->first);
+				}
+				p += stack::stack_detail::push_reference<push_type>(L_, detail::deref_move_only(it->second));
+				std::advance(it, 1);
+				return p;
+			}
+
+			template <bool>
+			static int next_associative(std::false_type, lua_State* L_) {
+				iter& i = stack::unqualified_get<user<iter>>(L_, 1);
+				auto& source = i.source;
+				auto& it = i.it;
+				next_K k = stack::unqualified_get<next_K>(L_, 2);
+				if (it == deferred_uc::end(L_, source)) {
+					return stack::push(L_, lua_nil);
+				}
+				int p;
+				if constexpr (std::is_integral_v<next_K>) {
+					p = stack::push_reference(L_, k + 1);
+				}
+				else {
+					p = stack::stack_detail::push_reference(L_, k + 1);
+				}
+				p += stack::stack_detail::push_reference<push_type>(L_, detail::deref_move_only(*it));
+				std::advance(it, 1);
+				return p;
+			}
+
+			template <bool ip>
+			static int next_iter(lua_State* L_) {
+				typedef meta::any<is_associative, meta::all<is_lookup, meta::neg<is_matched_lookup>>> is_assoc;
+				return next_associative<ip>(is_assoc(), L_);
+			}
+
+			template <bool ip>
+			static int pairs_associative(std::true_type, lua_State* L_) {
+				auto& src = get_src(L_);
+				stack::push(L_, next_iter<ip>);
+				stack::push<user<iter>>(L_, L_, 1, src, deferred_uc::begin(L_, src));
+				stack::push(L_, lua_nil);
+				return 3;
+			}
+
+			template <bool ip>
+			static int pairs_associative(std::false_type, lua_State* L_) {
+				auto& src = get_src(L_);
+				stack::push(L_, next_iter<ip>);
+				stack::push<user<iter>>(L_, L_, 1, src, deferred_uc::begin(L_, src));
+				stack::push(L_, 0);
+				return 3;
+			}
+
+		public:
+			static int at(lua_State* L_) {
+				auto& self = get_src(L_);
+				detail::error_result er;
+				{
+					std::ptrdiff_t pos = stack::unqualified_get<std::ptrdiff_t>(L_, 2);
+					er = at_start(L_, self, pos);
+				}
+				return handle_errors(L_, er);
+			}
+
+			static int get(lua_State* L_) {
+				auto& self = get_src(L_);
+				detail::error_result er;
+				{
+					decltype(auto) key = stack::unqualified_get<K>(L_);
+					er = get_start(L_, self, key);
+				}
+				return handle_errors(L_, er);
+			}
+
+			static int index_get(lua_State* L_) {
+				return get(L_);
+			}
+
+			static int set(lua_State* L_) {
+				stack_object value = stack_object(L_, raw_index(3));
+				if constexpr (is_linear_integral::value) {
+					// for non-associative containers,
+					// erasure only happens if it is the
+					// last index in the container
+					auto key = stack::get<K>(L_, 2);
+					auto self_size = deferred_uc::size(L_);
+					if (key == static_cast<K>(self_size)) {
+						if (type_of(L_, 3) == type::lua_nil) {
+							return erase(L_);
+						}
+					}
+				}
+				else {
+					if (type_of(L_, 3) == type::lua_nil) {
+						return erase(L_);
+					}
+				}
+				auto& self = get_src(L_);
+				detail::error_result er = set_start(L_, self, stack_object(L_, raw_index(2)), std::move(value));
+				return handle_errors(L_, er);
+			}
+
+			static int index_set(lua_State* L_) {
+				return set(L_);
+			}
+
+			static int add(lua_State* L_) {
+				auto& self = get_src(L_);
+				detail::error_result er = add_copyable(is_copyable(), L_, self, stack_object(L_, raw_index(2)));
+				return handle_errors(L_, er);
+			}
+
+			static int insert(lua_State* L_) {
+				auto& self = get_src(L_);
+				detail::error_result er = insert_copyable(is_copyable(), L_, self, stack_object(L_, raw_index(2)), stack_object(L_, raw_index(3)));
+				return handle_errors(L_, er);
+			}
+
+			static int find(lua_State* L_) {
+				auto& self = get_src(L_);
+				detail::error_result er = find_has(has_find<T>(), L_, self);
+				return handle_errors(L_, er);
+			}
+
+			static int index_of(lua_State* L_) {
+				auto& self = get_src(L_);
+				detail::error_result er = find_has<true>(has_find<T>(), L_, self);
+				return handle_errors(L_, er);
+			}
+
+			static iterator begin(lua_State*, T& self) {
+				if constexpr (meta::has_begin_end_v<T>) {
+					return self.begin();
+				}
+				else {
+					using std::begin;
+					return begin(self);
+				}
+			}
+
+			static iterator end(lua_State*, T& self) {
+				if constexpr (meta::has_begin_end_v<T>) {
+					return self.end();
+				}
+				else {
+					using std::end;
+					return end(self);
+				}
+			}
+
+			static int size(lua_State* L_) {
+				auto& self = get_src(L_);
+				std::size_t r = size_start(L_, self);
+				return stack::push(L_, r);
+			}
+
+			static int clear(lua_State* L_) {
+				auto& self = get_src(L_);
+				clear_start(L_, self);
+				return 0;
+			}
+
+			static int erase(lua_State* L_) {
+				auto& self = get_src(L_);
+				detail::error_result er;
+				{
+					decltype(auto) key = stack::unqualified_get<K>(L_, 2);
+					er = erase_start(L_, self, key);
+				}
+				return handle_errors(L_, er);
+			}
+
+			static int empty(lua_State* L_) {
+				auto& self = get_src(L_);
+				return stack::push(L_, empty_start(L_, self));
+			}
+
+			static std::ptrdiff_t index_adjustment(lua_State*, T&) {
+				return static_cast<std::ptrdiff_t>((SOL_CONTAINER_START_INDEX_I_) == 0 ? 0 : -(SOL_CONTAINER_START_INDEX_I_));
+			}
+
+			static int pairs(lua_State* L_) {
+				typedef meta::any<is_associative, meta::all<is_lookup, meta::neg<is_matched_lookup>>> is_assoc;
+				return pairs_associative<false>(is_assoc(), L_);
+			}
+
+			static int ipairs(lua_State* L_) {
+				typedef meta::any<is_associative, meta::all<is_lookup, meta::neg<is_matched_lookup>>> is_assoc;
+				return pairs_associative<true>(is_assoc(), L_);
+			}
+
+			static int next(lua_State* L_) {
+				return stack::push(L_, next_iter<false>);
+			}
+		};
+
+		template <typename X>
+		struct usertype_container_default<X, std::enable_if_t<std::is_array<std::remove_pointer_t<meta::unwrap_unqualified_t<X>>>::value>> {
+		private:
+			typedef std::remove_pointer_t<meta::unwrap_unqualified_t<X>> T;
+			typedef usertype_container<X> deferred_uc;
+
+		public:
+			typedef std::remove_extent_t<T> value_type;
+			typedef value_type* iterator;
+
+		private:
+			struct iter {
+				reference keep_alive;
+				T& source;
+				iterator it;
+
+				iter(lua_State* L_, int stack_index, T& source, iterator it) noexcept : keep_alive(L_, stack_index), source(source), it(std::move(it)) {
+				}
+
+				~iter () {
+
+				}
+			};
+
+			static auto& get_src(lua_State* L_) {
+				auto p = stack::unqualified_check_get<T*>(L_, 1);
+#if SOL_IS_ON(SOL_SAFE_USERTYPE_I_)
+				if (!p) {
+					luaL_error(L_,
+					     "sol: 'self' is not of type '%s' (pass 'self' as first argument with ':' or call on proper type)",
+					     detail::demangle<T>().c_str());
+				}
+				if (p.value() == nullptr) {
+					luaL_error(
+					     L_, "sol: 'self' argument is nil (pass 'self' as first argument with ':' or call on a '%s' type)", detail::demangle<T>().c_str());
+				}
+#endif // Safe getting with error
+				return *p.value();
+			}
+
+			static int find(std::true_type, lua_State* L_) {
+				T& self = get_src(L_);
+				decltype(auto) value = stack::unqualified_get<value_type>(L_, 2);
+				std::size_t N = std::extent<T>::value;
+				for (std::size_t idx = 0; idx < N; ++idx) {
+					using v_t = std::add_const_t<decltype(self[idx])>;
+					v_t v = self[idx];
+					if (v == value) {
+						idx = static_cast<std::size_t>(static_cast<std::ptrdiff_t>(idx) - deferred_uc::index_adjustment(L_, self));
+						return stack::push(L_, idx);
+					}
+				}
+				return stack::push(L_, lua_nil);
+			}
+
+			static int find(std::false_type, lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'find' on '%s': no supported comparison operator for the value type", detail::demangle<T>().c_str());
+			}
+
+			static int next_iter(lua_State* L_) {
+				iter& i = stack::unqualified_get<user<iter>>(L_, 1);
+				auto& source = i.source;
+				auto& it = i.it;
+				std::size_t k = stack::unqualified_get<std::size_t>(L_, 2);
+				if (it == deferred_uc::end(L_, source)) {
+					return 0;
+				}
+				int p;
+				p = stack::push(L_, k + 1);
+				p += stack::push_reference(L_, detail::deref_move_only(*it));
+				std::advance(it, 1);
+				return p;
+			}
+
+		public:
+			static int clear(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'clear' on type '%s': cannot remove all items from a fixed array", detail::demangle<T>().c_str());
+			}
+
+			static int erase(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'erase' on type '%s': cannot remove an item from fixed arrays", detail::demangle<T>().c_str());
+			}
+
+			static int add(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'add' on type '%s': cannot add to fixed arrays", detail::demangle<T>().c_str());
+			}
+
+			static int insert(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'insert' on type '%s': cannot insert new entries into fixed arrays", detail::demangle<T>().c_str());
+			}
+
+			static int at(lua_State* L_) {
+				return get(L_);
+			}
+
+			static int get(lua_State* L_) {
+				T& self = get_src(L_);
+				std::ptrdiff_t idx = stack::unqualified_get<std::ptrdiff_t>(L_, 2);
+				idx += deferred_uc::index_adjustment(L_, self);
+				if (idx >= static_cast<std::ptrdiff_t>(std::extent<T>::value) || idx < 0) {
+					return stack::push(L_, lua_nil);
+				}
+				return stack::push_reference(L_, detail::deref_move_only(self[idx]));
+			}
+
+			static int index_get(lua_State* L_) {
+				return get(L_);
+			}
+
+			static int set(lua_State* L_) {
+				T& self = get_src(L_);
+				std::ptrdiff_t idx = stack::unqualified_get<std::ptrdiff_t>(L_, 2);
+				idx += deferred_uc::index_adjustment(L_, self);
+				if (idx >= static_cast<std::ptrdiff_t>(std::extent<T>::value)) {
+					return luaL_error(L_, "sol: index out of bounds (too big) for set on '%s'", detail::demangle<T>().c_str());
+				}
+				if (idx < 0) {
+					return luaL_error(L_, "sol: index out of bounds (too small) for set on '%s'", detail::demangle<T>().c_str());
+				}
+				self[idx] = stack::unqualified_get<value_type>(L_, 3);
+				return 0;
+			}
+
+			static int index_set(lua_State* L_) {
+				return set(L_);
+			}
+
+			static int index_of(lua_State* L_) {
+				return find(L_);
+			}
+
+			static int find(lua_State* L_) {
+				return find(meta::supports_op_equal<value_type, value_type>(), L_);
+			}
+
+			static int size(lua_State* L_) {
+				return stack::push(L_, std::extent<T>::value);
+			}
+
+			static int empty(lua_State* L_) {
+				return stack::push(L_, std::extent<T>::value > 0);
+			}
+
+			static int pairs(lua_State* L_) {
+				auto& src = get_src(L_);
+				stack::push(L_, next_iter);
+				stack::push<user<iter>>(L_, L_, 1, src, deferred_uc::begin(L_, src));
+				stack::push(L_, 0);
+				return 3;
+			}
+
+			static int ipairs(lua_State* L_) {
+				return pairs(L_);
+			}
+
+			static int next(lua_State* L_) {
+				return stack::push(L_, next_iter);
+			}
+
+			static std::ptrdiff_t index_adjustment(lua_State*, T&) {
+				return (SOL_CONTAINER_START_INDEX_I_) == 0 ? 0 : -(SOL_CONTAINER_START_INDEX_I_);
+			}
+
+			static iterator begin(lua_State*, T& self) {
+				return std::addressof(self[0]);
+			}
+
+			static iterator end(lua_State*, T& self) {
+				return std::addressof(self[0]) + std::extent<T>::value;
+			}
+		};
+
+		template <typename X>
+		struct usertype_container_default<usertype_container<X>> : usertype_container_default<X> { };
+	} // namespace container_detail
+
+	template <typename T>
+	struct usertype_container : container_detail::usertype_container_default<T> { };
+
+} // namespace sol
+
+#endif // SOL_USERTYPE_CONTAINER_HPP
diff --git a/extern/sol3/sol/usertype_container_launch.hpp b/extern/sol3/sol/usertype_container_launch.hpp
new file mode 100644
index 0000000000..e25f4a7e06
--- /dev/null
+++ b/extern/sol3/sol/usertype_container_launch.hpp
@@ -0,0 +1,432 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_USERTYPE_CONTAINER_LAUNCH_HPP
+#define SOL_USERTYPE_CONTAINER_LAUNCH_HPP
+
+#include <sol/stack.hpp>
+#include <sol/usertype_container.hpp>
+
+#include <unordered_map>
+
+namespace sol {
+
+	namespace container_detail {
+		template <typename X>
+		struct u_c_launch {
+			using T = std::remove_pointer_t<meta::unqualified_t<X>>;
+			using uc = usertype_container<T>;
+			using default_uc = usertype_container_default<T>;
+
+			static inline int real_index_get_traits(std::true_type, lua_State* L) {
+				return uc::index_get(L);
+			}
+
+			static inline int real_index_get_traits(std::false_type, lua_State* L) {
+				return default_uc::index_get(L);
+			}
+
+			static inline int real_index_call(lua_State* L) {
+				static const std::unordered_map<string_view, lua_CFunction> calls {
+					{ "at", &real_at_call },
+					{ "get", &real_get_call },
+					{ "set", &real_set_call },
+					{ "size", &real_length_call },
+					{ "add", &real_add_call },
+					{ "empty", &real_empty_call },
+					{ "insert", &real_insert_call },
+					{ "clear", &real_clear_call },
+					{ "find", &real_find_call },
+					{ "index_of", &real_index_of_call },
+					{ "erase", &real_erase_call },
+					{ "pairs", &pairs_call },
+					{ "next", &next_call },
+				};
+				auto maybenameview = stack::unqualified_check_get<string_view>(L, 2);
+				if (maybenameview) {
+					const string_view& name = *maybenameview;
+					auto it = calls.find(name);
+					if (it != calls.cend()) {
+						return stack::push(L, it->second);
+					}
+				}
+				return real_index_get_traits(container_detail::has_traits_index_get<uc>(), L);
+			}
+
+			static inline int real_at_traits(std::true_type, lua_State* L) {
+				return uc::at(L);
+			}
+
+			static inline int real_at_traits(std::false_type, lua_State* L) {
+				return default_uc::at(L);
+			}
+
+			static inline int real_at_call(lua_State* L) {
+				return real_at_traits(container_detail::has_traits_at<uc>(), L);
+			}
+
+			static inline int real_get_traits(std::true_type, lua_State* L) {
+				return uc::get(L);
+			}
+
+			static inline int real_get_traits(std::false_type, lua_State* L) {
+				return default_uc::get(L);
+			}
+
+			static inline int real_get_call(lua_State* L) {
+				return real_get_traits(container_detail::has_traits_get<uc>(), L);
+			}
+
+			static inline int real_set_traits(std::true_type, lua_State* L) {
+				return uc::set(L);
+			}
+
+			static inline int real_set_traits(std::false_type, lua_State* L) {
+				return default_uc::set(L);
+			}
+
+			static inline int real_set_call(lua_State* L) {
+				return real_set_traits(container_detail::has_traits_set<uc>(), L);
+			}
+
+			static inline int real_index_set_traits(std::true_type, lua_State* L) {
+				return uc::index_set(L);
+			}
+
+			static inline int real_index_set_traits(std::false_type, lua_State* L) {
+				return default_uc::index_set(L);
+			}
+
+			static inline int real_new_index_call(lua_State* L) {
+				return real_index_set_traits(container_detail::has_traits_index_set<uc>(), L);
+			}
+
+			static inline int real_pairs_traits(std::true_type, lua_State* L) {
+				return uc::pairs(L);
+			}
+
+			static inline int real_pairs_traits(std::false_type, lua_State* L) {
+				return default_uc::pairs(L);
+			}
+
+			static inline int real_pairs_call(lua_State* L) {
+				return real_pairs_traits(container_detail::has_traits_pairs<uc>(), L);
+			}
+
+			static inline int real_ipairs_traits(std::true_type, lua_State* L) {
+				return uc::ipairs(L);
+			}
+
+			static inline int real_ipairs_traits(std::false_type, lua_State* L) {
+				return default_uc::ipairs(L);
+			}
+
+			static inline int real_ipairs_call(lua_State* L) {
+				return real_ipairs_traits(container_detail::has_traits_ipairs<uc>(), L);
+			}
+
+			static inline int real_next_traits(std::true_type, lua_State* L) {
+				return uc::next(L);
+			}
+
+			static inline int real_next_traits(std::false_type, lua_State* L) {
+				return default_uc::next(L);
+			}
+
+			static inline int real_next_call(lua_State* L) {
+				return real_next_traits(container_detail::has_traits_next<uc>(), L);
+			}
+
+			static inline int real_size_traits(std::true_type, lua_State* L) {
+				return uc::size(L);
+			}
+
+			static inline int real_size_traits(std::false_type, lua_State* L) {
+				return default_uc::size(L);
+			}
+
+			static inline int real_length_call(lua_State* L) {
+				return real_size_traits(container_detail::has_traits_size<uc>(), L);
+			}
+
+			static inline int real_add_traits(std::true_type, lua_State* L) {
+				return uc::add(L);
+			}
+
+			static inline int real_add_traits(std::false_type, lua_State* L) {
+				return default_uc::add(L);
+			}
+
+			static inline int real_add_call(lua_State* L) {
+				return real_add_traits(container_detail::has_traits_add<uc>(), L);
+			}
+
+			static inline int real_insert_traits(std::true_type, lua_State* L) {
+				return uc::insert(L);
+			}
+
+			static inline int real_insert_traits(std::false_type, lua_State* L) {
+				return default_uc::insert(L);
+			}
+
+			static inline int real_insert_call(lua_State* L) {
+				return real_insert_traits(container_detail::has_traits_insert<uc>(), L);
+			}
+
+			static inline int real_clear_traits(std::true_type, lua_State* L) {
+				return uc::clear(L);
+			}
+
+			static inline int real_clear_traits(std::false_type, lua_State* L) {
+				return default_uc::clear(L);
+			}
+
+			static inline int real_clear_call(lua_State* L) {
+				return real_clear_traits(container_detail::has_traits_clear<uc>(), L);
+			}
+
+			static inline int real_empty_traits(std::true_type, lua_State* L) {
+				return uc::empty(L);
+			}
+
+			static inline int real_empty_traits(std::false_type, lua_State* L) {
+				return default_uc::empty(L);
+			}
+
+			static inline int real_empty_call(lua_State* L) {
+				return real_empty_traits(container_detail::has_traits_empty<uc>(), L);
+			}
+
+			static inline int real_erase_traits(std::true_type, lua_State* L) {
+				return uc::erase(L);
+			}
+
+			static inline int real_erase_traits(std::false_type, lua_State* L) {
+				return default_uc::erase(L);
+			}
+
+			static inline int real_erase_call(lua_State* L) {
+				return real_erase_traits(container_detail::has_traits_erase<uc>(), L);
+			}
+
+			static inline int real_find_traits(std::true_type, lua_State* L) {
+				return uc::find(L);
+			}
+
+			static inline int real_find_traits(std::false_type, lua_State* L) {
+				return default_uc::find(L);
+			}
+
+			static inline int real_find_call(lua_State* L) {
+				return real_find_traits(container_detail::has_traits_find<uc>(), L);
+			}
+
+			static inline int real_index_of_call(lua_State* L) {
+				if constexpr (container_detail::has_traits_index_of<uc>()) {
+					return uc::index_of(L);
+				}
+				else {
+					return default_uc::index_of(L);
+				}
+			}
+
+			static inline int add_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_add_call), (&real_add_call)>(L);
+			}
+
+			static inline int erase_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_erase_call), (&real_erase_call)>(L);
+			}
+
+			static inline int insert_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_insert_call), (&real_insert_call)>(L);
+			}
+
+			static inline int clear_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_clear_call), (&real_clear_call)>(L);
+			}
+
+			static inline int empty_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_empty_call), (&real_empty_call)>(L);
+			}
+
+			static inline int find_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_find_call), (&real_find_call)>(L);
+			}
+
+			static inline int index_of_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_index_of_call), (&real_index_of_call)>(L);
+			}
+
+			static inline int length_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_length_call), (&real_length_call)>(L);
+			}
+
+			static inline int pairs_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_pairs_call), (&real_pairs_call)>(L);
+			}
+
+			static inline int ipairs_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_ipairs_call), (&real_ipairs_call)>(L);
+			}
+
+			static inline int next_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_next_call), (&real_next_call)>(L);
+			}
+
+			static inline int at_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_at_call), (&real_at_call)>(L);
+			}
+
+			static inline int get_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_get_call), (&real_get_call)>(L);
+			}
+
+			static inline int set_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_set_call), (&real_set_call)>(L);
+			}
+
+			static inline int index_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_index_call), (&real_index_call)>(L);
+			}
+
+			static inline int new_index_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_new_index_call), (&real_new_index_call)>(L);
+			}
+		};
+	} // namespace container_detail
+
+	namespace stack {
+		namespace stack_detail {
+			template <typename T, bool is_shim = false>
+			struct metatable_setup {
+				lua_State* L;
+
+				metatable_setup(lua_State* L) : L(L) {
+				}
+
+				void operator()() {
+					using meta_usertype_container
+					     = container_detail::u_c_launch<meta::conditional_t<is_shim, as_container_t<std::remove_pointer_t<T>>, std::remove_pointer_t<T>>>;
+					static const char* metakey
+					     = is_shim ? &usertype_traits<as_container_t<std::remove_pointer_t<T>>>::metatable()[0] : &usertype_traits<T>::metatable()[0];
+					static const std::array<luaL_Reg, 20> reg = { {
+						// clang-format off
+						{ "__pairs", &meta_usertype_container::pairs_call },
+						{ "__ipairs", &meta_usertype_container::ipairs_call },
+						{ "__len", &meta_usertype_container::length_call },
+						{ "__index", &meta_usertype_container::index_call },
+						{ "__newindex", &meta_usertype_container::new_index_call },
+						{ "pairs", &meta_usertype_container::pairs_call },
+						{ "next", &meta_usertype_container::next_call },
+						{ "at", &meta_usertype_container::at_call },
+						{ "get", &meta_usertype_container::get_call },
+						{ "set", &meta_usertype_container::set_call },
+						{ "size", &meta_usertype_container::length_call },
+						{ "empty", &meta_usertype_container::empty_call },
+						{ "clear", &meta_usertype_container::clear_call },
+						{ "insert", &meta_usertype_container::insert_call },
+						{ "add", &meta_usertype_container::add_call },
+						{ "find", &meta_usertype_container::find_call },
+						{ "index_of", &meta_usertype_container::index_of_call },
+						{ "erase", &meta_usertype_container::erase_call },
+						std::is_pointer<T>::value ? luaL_Reg{ nullptr, nullptr } : luaL_Reg{ "__gc", &detail::usertype_alloc_destroy<T> },
+						{ nullptr, nullptr }
+						// clang-format on 
+					} };
+
+					if (luaL_newmetatable(L, metakey) == 1) {
+						luaL_setfuncs(L, reg.data(), 0);
+					}
+					lua_setmetatable(L, -2);
+				}
+			};
+		} // namespace stack_detail
+
+		template <typename T>
+		struct unqualified_pusher<as_container_t<T>> {
+			using C = meta::unqualified_t<T>;
+
+			static int push_lvalue(std::true_type, lua_State* L, const C& cont) {
+				stack_detail::metatable_setup<C*, true> fx(L);
+				return stack::push<detail::as_pointer_tag<const C>>(L, detail::with_function_tag(), fx, detail::ptr(cont));
+			}
+
+			static int push_lvalue(std::false_type, lua_State* L, const C& cont) {
+				stack_detail::metatable_setup<C, true> fx(L);
+				return stack::push<detail::as_value_tag<C>>(L, detail::with_function_tag(), fx, cont);
+			}
+
+			static int push_rvalue(std::true_type, lua_State* L, C&& cont) {
+				stack_detail::metatable_setup<C, true> fx(L);
+				return stack::push<detail::as_value_tag<C>>(L, detail::with_function_tag(), fx, std::move(cont));
+			}
+
+			static int push_rvalue(std::false_type, lua_State* L, const C& cont) {
+				return push_lvalue(std::is_lvalue_reference<T>(), L, cont);
+			}
+
+			static int push(lua_State* L, const as_container_t<T>& as_cont) {
+				return push_lvalue(std::is_lvalue_reference<T>(), L, as_cont.value());
+			}
+
+			static int push(lua_State* L, as_container_t<T>&& as_cont) {
+				return push_rvalue(meta::all<std::is_rvalue_reference<T>, meta::neg<std::is_lvalue_reference<T>>>(), L, std::forward<T>(as_cont.value()));
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<as_container_t<T*>> {
+			using C = std::add_pointer_t<meta::unqualified_t<std::remove_pointer_t<T>>>;
+
+			static int push(lua_State* L, T* cont) {
+				stack_detail::metatable_setup<C> fx(L);
+				return stack::push<detail::as_pointer_tag<T>>(L, detail::with_function_tag(), fx, cont);
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<T, std::enable_if_t<is_container_v<T>>> {
+			using C = T;
+
+			template <typename... Args>
+			static int push(lua_State* L, Args&&... args) {
+				stack_detail::metatable_setup<C> fx(L);
+				return stack::push<detail::as_value_tag<T>>(L, detail::with_function_tag(), fx, std::forward<Args>(args)...);
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<T*, std::enable_if_t<is_container_v<T>>> {
+			using C = std::add_pointer_t<meta::unqualified_t<std::remove_pointer_t<T>>>;
+
+			static int push(lua_State* L, T* cont) {
+				stack_detail::metatable_setup<C> fx(L);
+				return stack::push<detail::as_pointer_tag<T>>(L, detail::with_function_tag(), fx, cont);
+			}
+		};
+	} // namespace stack
+
+} // namespace sol
+
+#endif // SOL_USERTYPE_CONTAINER_LAUNCH_HPP
diff --git a/extern/sol3/sol/usertype_core.hpp b/extern/sol3/sol/usertype_core.hpp
new file mode 100644
index 0000000000..51a48b9c10
--- /dev/null
+++ b/extern/sol3/sol/usertype_core.hpp
@@ -0,0 +1,214 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_USERTYPE_CORE_HPP
+#define SOL_USERTYPE_CORE_HPP
+
+#include <sol/wrapper.hpp>
+#include <sol/stack.hpp>
+#include <sol/types.hpp>
+#include <sol/stack_reference.hpp>
+#include <sol/usertype_traits.hpp>
+#include <sol/inheritance.hpp>
+#include <sol/raii.hpp>
+#include <sol/deprecate.hpp>
+#include <sol/object.hpp>
+#include <sol/function_types.hpp>
+#include <sol/usertype_container_launch.hpp>
+
+#include <sstream>
+#include <type_traits>
+
+namespace sol {
+	namespace u_detail {
+		constexpr const lua_Integer toplevel_magic = static_cast<lua_Integer>(0xCCC2CCC1);
+
+		constexpr const int environment_index = 1;
+		constexpr const int usertype_storage_index = 2;
+		constexpr const int usertype_storage_base_index = 3;
+		constexpr const int exact_function_index = 4;
+		constexpr const int magic_index = 5;
+
+		constexpr const int simple_usertype_storage_index = 2;
+		constexpr const int index_function_index = 3;
+		constexpr const int new_index_function_index = 4;
+
+		constexpr const int base_walking_failed_index = -32467;
+		constexpr const int lookup_failed_index = -42469;
+
+		enum class submetatable_type {
+			// must be sequential
+			value,
+			reference,
+			unique,
+			const_reference,
+			const_value,
+			// must be LAST!
+			named
+		};
+
+		inline auto make_string_view(string_view s) {
+			return s;
+		}
+
+#if SOL_IS_ON(SOL_CHAR8_T_I_)
+		inline auto make_string_view(const char8_t* s) {
+			return string_view(reinterpret_cast<const char*>(s));
+		}
+#endif
+
+		inline auto make_string_view(call_construction) {
+			return string_view(to_string(meta_function::call_function));
+		}
+
+		inline auto make_string_view(meta_function mf) {
+			return string_view(to_string(mf));
+		}
+
+		inline auto make_string_view(base_classes_tag) {
+			return string_view(detail::base_class_cast_key());
+		}
+
+		template <typename Arg>
+		inline std::string make_string(Arg&& arg) {
+			string_view s = make_string_view(arg);
+			return std::string(s.data(), s.size());
+		}
+
+		inline int is_indexer(string_view s) {
+			if (s == to_string(meta_function::index)) {
+				return 1;
+			}
+			else if (s == to_string(meta_function::new_index)) {
+				return 2;
+			}
+			return 0;
+		}
+
+		inline int is_indexer(meta_function mf) {
+			if (mf == meta_function::index) {
+				return 1;
+			}
+			else if (mf == meta_function::new_index) {
+				return 2;
+			}
+			return 0;
+		}
+
+		inline int is_indexer(call_construction) {
+			return 0;
+		}
+	} // namespace u_detail
+
+	namespace detail {
+
+		template <typename T, typename IFx, typename Fx>
+		inline void insert_default_registrations(IFx&& ifx, Fx&& fx) {
+			(void)ifx;
+			(void)fx;
+			if constexpr (is_automagical<T>::value) {
+				if (fx(meta_function::less_than)) {
+					if constexpr (meta::supports_op_less<T>::value) {
+						lua_CFunction f = &comparsion_operator_wrap<T, std::less<>>;
+						ifx(meta_function::less_than, f);
+					}
+				}
+				if (fx(meta_function::less_than_or_equal_to)) {
+					if constexpr (meta::supports_op_less_equal<T>::value) {
+						lua_CFunction f = &comparsion_operator_wrap<T, std::less_equal<>>;
+						ifx(meta_function::less_than_or_equal_to, f);
+					}
+				}
+				if (fx(meta_function::equal_to)) {
+					if constexpr (meta::supports_op_equal<T>::value) {
+						lua_CFunction f = &comparsion_operator_wrap<T, std::equal_to<>>;
+						ifx(meta_function::equal_to, f);
+					}
+					else {
+						lua_CFunction f = &comparsion_operator_wrap<T, no_comp>;
+						ifx(meta_function::equal_to, f);
+					}
+				}
+				if (fx(meta_function::pairs)) {
+					ifx(meta_function::pairs, &container_detail::u_c_launch<as_container_t<T>>::pairs_call);
+				}
+				if (fx(meta_function::length)) {
+					if constexpr (meta::has_size<const T>::value || meta::has_size<T>::value) {
+						auto f = &default_size<T>;
+						ifx(meta_function::length, f);
+					}
+				}
+				if (fx(meta_function::to_string)) {
+					if constexpr (is_to_stringable_v<T>) {
+						if constexpr (!meta::is_probably_stateless_lambda_v<T> && !std::is_member_pointer_v<T>) {
+							auto f = &detail::static_trampoline<&default_to_string<T>>;
+							ifx(meta_function::to_string, f);
+						}
+					}
+				}
+				if (fx(meta_function::call_function)) {
+					if constexpr (is_callable_v<T>) {
+						if constexpr (meta::call_operator_deducible_v<T>) {
+							auto f = &c_call<decltype(&T::operator()), &T::operator()>;
+							ifx(meta_function::call_function, f);
+						}
+					}
+				}
+			}
+		}
+	} // namespace detail
+
+	namespace stack { namespace stack_detail {
+		template <typename X>
+		void set_undefined_methods_on(stack_reference t) {
+			using T = std::remove_pointer_t<X>;
+
+			lua_State* L = t.lua_state();
+
+			t.push();
+
+			detail::lua_reg_table l {};
+			int index = 0;
+			detail::indexed_insert insert_fx(l, index);
+			detail::insert_default_registrations<T>(insert_fx, detail::property_always_true);
+			if constexpr (!std::is_pointer_v<X>) {
+				l[index] = luaL_Reg { to_string(meta_function::garbage_collect).c_str(), detail::make_destructor<T>() };
+			}
+			luaL_setfuncs(L, l, 0);
+
+			// __type table
+			lua_createtable(L, 0, 2);
+			const std::string& name = detail::demangle<T>();
+			lua_pushlstring(L, name.c_str(), name.size());
+			lua_setfield(L, -2, "name");
+			lua_CFunction is_func = &detail::is_check<T>;
+			lua_pushcclosure(L, is_func, 0);
+			lua_setfield(L, -2, "is");
+			lua_setfield(L, t.stack_index(), to_string(meta_function::type).c_str());
+
+			t.pop();
+		}
+	}} // namespace stack::stack_detail
+} // namespace sol
+
+#endif // SOL_USERTYPE_CORE_HPP
diff --git a/extern/sol3/sol/usertype_proxy.hpp b/extern/sol3/sol/usertype_proxy.hpp
new file mode 100644
index 0000000000..2d36ef4495
--- /dev/null
+++ b/extern/sol3/sol/usertype_proxy.hpp
@@ -0,0 +1,187 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_USERTYPE_PROXY_HPP
+#define SOL_USERTYPE_PROXY_HPP
+
+#include <sol/traits.hpp>
+#include <sol/function.hpp>
+#include <sol/protected_function.hpp>
+#include <sol/proxy_base.hpp>
+
+namespace sol {
+	template <typename Table, typename Key>
+	struct usertype_proxy : public proxy_base<usertype_proxy<Table, Key>> {
+	private:
+		using key_type = detail::proxy_key_t<Key>;
+
+		template <typename T, std::size_t... I>
+		decltype(auto) tuple_get(std::index_sequence<I...>) const& {
+			return tbl.template traverse_get<T>(std::get<I>(key)...);
+		}
+
+		template <typename T, std::size_t... I>
+		decltype(auto) tuple_get(std::index_sequence<I...>) && {
+			return tbl.template traverse_get<T>(std::get<I>(std::move(key))...);
+		}
+
+		template <std::size_t... I, typename T>
+		void tuple_set(std::index_sequence<I...>, T&& value) & {
+			if constexpr (sizeof...(I) > 1) {
+				tbl.traverse_set(std::get<I>(key)..., std::forward<T>(value));
+			}
+			else {
+				tbl.set(std::get<I>(key)..., std::forward<T>(value));
+			}
+		}
+
+		template <std::size_t... I, typename T>
+		void tuple_set(std::index_sequence<I...>, T&& value) && {
+			if constexpr (sizeof...(I) > 1) {
+				tbl.traverse_set(std::get<I>(std::move(key))..., std::forward<T>(value));
+			}
+			else {
+				tbl.set(std::get<I>(std::move(key))..., std::forward<T>(value));
+			}
+		}
+
+	public:
+		Table tbl;
+		key_type key;
+
+		template <typename T>
+		usertype_proxy(Table table, T&& k) : tbl(table), key(std::forward<T>(k)) {
+		}
+
+		template <typename T>
+		usertype_proxy& set(T&& item) & {
+			using idx_seq = std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>;
+			tuple_set(idx_seq(), std::forward<T>(item));
+			return *this;
+		}
+
+		template <typename T>
+		usertype_proxy&& set(T&& item) && {
+			using idx_seq = std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>;
+			std::move(*this).tuple_set(idx_seq(), std::forward<T>(item));
+			return std::move(*this);
+		}
+
+		template <typename T>
+		usertype_proxy& operator=(T&& other) & {
+			return set(std::forward<T>(other));
+		}
+
+		template <typename T>
+		usertype_proxy&& operator=(T&& other) && {
+			return std::move(*this).set(std::forward<T>(other));
+		}
+
+		template <typename T>
+		usertype_proxy& operator=(std::initializer_list<T> other) & {
+			return set(std::move(other));
+		}
+
+		template <typename T>
+		usertype_proxy&& operator=(std::initializer_list<T> other) && {
+			return std::move(*this).set(std::move(other));
+		}
+
+		template <typename T>
+		decltype(auto) get() const& {
+			using idx_seq = std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>;
+			return tuple_get<T>(idx_seq());
+		}
+
+		template <typename T>
+		decltype(auto) get() && {
+			using idx_seq = std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>;
+			return std::move(*this).template tuple_get<T>(idx_seq());
+		}
+
+		template <typename K>
+		decltype(auto) operator[](K&& k) const& {
+			auto keys = meta::tuplefy(key, std::forward<K>(k));
+			return usertype_proxy<Table, decltype(keys)>(tbl, std::move(keys));
+		}
+
+		template <typename K>
+		decltype(auto) operator[](K&& k) & {
+			auto keys = meta::tuplefy(key, std::forward<K>(k));
+			return usertype_proxy<Table, decltype(keys)>(tbl, std::move(keys));
+		}
+
+		template <typename K>
+		decltype(auto) operator[](K&& k) && {
+			auto keys = meta::tuplefy(std::move(key), std::forward<K>(k));
+			return usertype_proxy<Table, decltype(keys)>(tbl, std::move(keys));
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) call(Args&&... args) {
+#if !defined(__clang__) && defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 191200000
+			// MSVC is ass sometimes
+			return get<function>().call<Ret...>(std::forward<Args>(args)...);
+#else
+			return get<function>().template call<Ret...>(std::forward<Args>(args)...);
+#endif
+		}
+
+		template <typename... Args>
+		decltype(auto) operator()(Args&&... args) {
+			return call<>(std::forward<Args>(args)...);
+		}
+
+		bool valid() const {
+			auto pp = stack::push_pop(tbl);
+			auto p = stack::probe_get_field<std::is_same<meta::unqualified_t<Table>, global_table>::value>(lua_state(), key, lua_gettop(lua_state()));
+			lua_pop(lua_state(), p.levels);
+			return p;
+		}
+
+		int push() const noexcept {
+			return push(this->lua_state());
+		}
+
+		int push(lua_State* L) const noexcept {
+			return get<reference>().push(L);
+		}
+
+		type get_type() const {
+			type t = type::none;
+			auto pp = stack::push_pop(tbl);
+			auto p = stack::probe_get_field<std::is_same<meta::unqualified_t<Table>, global_table>::value>(lua_state(), key, lua_gettop(lua_state()));
+			if (p) {
+				t = type_of(lua_state(), -1);
+			}
+			lua_pop(lua_state(), p.levels);
+			return t;
+		}
+
+		lua_State* lua_state() const {
+			return tbl.lua_state();
+		}
+	};
+} // namespace sol
+
+#endif // SOL_USERTYPE_PROXY_HPP
diff --git a/extern/sol3/sol/usertype_storage.hpp b/extern/sol3/sol/usertype_storage.hpp
new file mode 100644
index 0000000000..fdfac5ff52
--- /dev/null
+++ b/extern/sol3/sol/usertype_storage.hpp
@@ -0,0 +1,1161 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_USERTYPE_STORAGE_HPP
+#define SOL_USERTYPE_STORAGE_HPP
+
+#include <sol/usertype_core.hpp>
+#include <sol/make_reference.hpp>
+
+#include <bitset>
+#include <unordered_map>
+
+namespace sol { namespace u_detail {
+
+	struct usertype_storage_base;
+	template <typename T>
+	struct usertype_storage;
+
+	optional<usertype_storage_base&> maybe_get_usertype_storage_base(lua_State* L_, int index);
+	usertype_storage_base& get_usertype_storage_base(lua_State* L_, const char* gcmetakey);
+	template <typename T>
+	optional<usertype_storage<T>&> maybe_get_usertype_storage(lua_State* L_);
+	template <typename T>
+	usertype_storage<T>& get_usertype_storage(lua_State* L_);
+
+	using index_call_function = int(lua_State*, void*);
+	using change_indexing_mem_func = void (usertype_storage_base::*)(
+		lua_State*, submetatable_type, void*, stateless_stack_reference&, lua_CFunction, lua_CFunction, lua_CFunction, lua_CFunction);
+
+	struct index_call_storage {
+		index_call_function* index;
+		index_call_function* new_index;
+		void* binding_data;
+	};
+
+	struct new_index_call_storage : index_call_storage {
+		void* new_binding_data;
+	};
+
+	struct binding_base {
+		virtual void* data() = 0;
+		virtual ~binding_base() {
+		}
+	};
+
+	template <typename K, typename Fq, typename T = void>
+	struct binding : binding_base {
+		using uF = meta::unqualified_t<Fq>;
+		using F = meta::conditional_t<meta::is_c_str_of_v<uF, char>
+#if SOL_IS_ON(SOL_CHAR8_T_I_)
+			     || meta::is_c_str_of_v<uF, char8_t>
+#endif
+			     || meta::is_c_str_of_v<uF, char16_t> || meta::is_c_str_of_v<uF, char32_t> || meta::is_c_str_of_v<uF, wchar_t>,
+			std::add_pointer_t<std::add_const_t<std::remove_all_extents_t<Fq>>>, std::decay_t<Fq>>;
+		F data_;
+
+		template <typename... Args>
+		binding(Args&&... args) : data_(std::forward<Args>(args)...) {
+		}
+
+		virtual void* data() override {
+			return static_cast<void*>(std::addressof(data_));
+		}
+
+		template <bool is_index = true, bool is_variable = false>
+		static inline int call_with_(lua_State* L_, void* target) {
+			constexpr int boost = !detail::is_non_factory_constructor<F>::value && std::is_same<K, call_construction>::value ? 1 : 0;
+			auto& f = *static_cast<F*>(target);
+			return call_detail::call_wrapped<T, is_index, is_variable, boost>(L_, f);
+		}
+
+		template <bool is_index = true, bool is_variable = false>
+		static inline int call_(lua_State* L_) {
+			void* f = stack::get<void*>(L_, upvalue_index(usertype_storage_index));
+			return call_with_<is_index, is_variable>(L_, f);
+		}
+
+		template <bool is_index = true, bool is_variable = false>
+		static inline int call(lua_State* L_) {
+			int r = detail::typed_static_trampoline<decltype(&call_<is_index, is_variable>), (&call_<is_index, is_variable>)>(L_);
+			if constexpr (meta::is_specialization_of_v<uF, yielding_t>) {
+				return lua_yield(L_, r);
+			}
+			else {
+				return r;
+			}
+		}
+
+		template <bool is_index = true, bool is_variable = false>
+		static inline int index_call_with_(lua_State* L_, void* target) {
+			if constexpr (!is_variable) {
+				if constexpr (is_lua_c_function_v<std::decay_t<F>>) {
+					auto& f = *static_cast<std::decay_t<F>*>(target);
+					return stack::push(L_, f);
+				}
+				else {
+					// set up upvalues
+					// for a chained call
+					int upvalues = 0;
+					upvalues += stack::push(L_, nullptr);
+					upvalues += stack::push(L_, target);
+					auto cfunc = &call<is_index, is_variable>;
+					return stack::push(L_, c_closure(cfunc, upvalues));
+				}
+			}
+			else {
+				constexpr int boost = !detail::is_non_factory_constructor<F>::value && std::is_same<K, call_construction>::value ? 1 : 0;
+				auto& f = *static_cast<F*>(target);
+				return call_detail::call_wrapped<T, is_index, is_variable, boost>(L_, f);
+			}
+		}
+
+		template <bool is_index = true, bool is_variable = false>
+		static inline int index_call_(lua_State* L_) {
+			void* f = stack::get<void*>(L_, upvalue_index(usertype_storage_index));
+			return index_call_with_<is_index, is_variable>(L_, f);
+		}
+
+		template <bool is_index = true, bool is_variable = false>
+		static inline int index_call(lua_State* L_) {
+			int r = detail::typed_static_trampoline<decltype(&index_call_<is_index, is_variable>), (&index_call_<is_index, is_variable>)>(L_);
+			if constexpr (meta::is_specialization_of_v<uF, yielding_t>) {
+				return lua_yield(L_, r);
+			}
+			else {
+				return r;
+			}
+		}
+	};
+
+	inline int index_fail(lua_State* L_) {
+		if (lua_getmetatable(L_, 1) == 1) {
+			int metatarget = lua_gettop(L_);
+			stack::get_field<false, true>(L_, stack_reference(L_, raw_index(2)), metatarget);
+			return 1;
+		}
+		// With runtime extensibility, we can't
+		// hard-error things. They have to
+		// return nil, like regular table types
+		return stack::push(L_, lua_nil);
+	}
+
+	inline int index_target_fail(lua_State* L_, void*) {
+		return index_fail(L_);
+	}
+
+	inline int new_index_fail(lua_State* L_) {
+		return luaL_error(L_, "sol: cannot set (new_index) into this object: no defined new_index operation on usertype");
+	}
+
+	inline int new_index_target_fail(lua_State* L_, void*) {
+		return new_index_fail(L_);
+	}
+
+	struct string_for_each_metatable_func {
+		bool is_destruction = false;
+		bool is_index = false;
+		bool is_new_index = false;
+		bool is_static_index = false;
+		bool is_static_new_index = false;
+		bool poison_indexing = false;
+		bool is_unqualified_lua_CFunction = false;
+		bool is_unqualified_lua_reference = false;
+		std::string* p_key = nullptr;
+		reference* p_binding_ref = nullptr;
+		lua_CFunction call_func = nullptr;
+		index_call_storage* p_ics = nullptr;
+		usertype_storage_base* p_usb = nullptr;
+		void* p_derived_usb = nullptr;
+		lua_CFunction idx_call = nullptr, new_idx_call = nullptr, meta_idx_call = nullptr, meta_new_idx_call = nullptr;
+		change_indexing_mem_func change_indexing;
+
+		void operator()(lua_State* L_, submetatable_type smt_, stateless_reference& fast_index_table_) {
+			std::string& key = *p_key;
+			usertype_storage_base& usb = *p_usb;
+			index_call_storage& ics = *p_ics;
+
+			if (smt_ == submetatable_type::named) {
+				// do not override __call or
+				// other specific meta functions on named metatable:
+				// we need that for call construction
+				// and other amenities
+				return;
+			}
+			int fast_index_table_push = fast_index_table_.push(L_);
+			stateless_stack_reference t(L_, -fast_index_table_push);
+			if (poison_indexing) {
+				(usb.*change_indexing)(L_, smt_, p_derived_usb, t, idx_call, new_idx_call, meta_idx_call, meta_new_idx_call);
+			}
+			if (is_destruction
+				&& (smt_ == submetatable_type::reference || smt_ == submetatable_type::const_reference || smt_ == submetatable_type::named
+				     || smt_ == submetatable_type::unique)) {
+				// gc does not apply to us here
+				// for reference types (raw T*, std::ref)
+				// for the named metatable itself,
+				// or for unique_usertypes, which do their own custom destroyion
+				t.pop(L_);
+				return;
+			}
+			if (is_index || is_new_index || is_static_index || is_static_new_index) {
+				// do not serialize the new_index and index functions here directly
+				// we control those...
+				t.pop(L_);
+				return;
+			}
+			if (is_unqualified_lua_CFunction) {
+				stack::set_field<false, true>(L_, key, call_func, t.stack_index());
+			}
+			else if (is_unqualified_lua_reference) {
+				reference& binding_ref = *p_binding_ref;
+				stack::set_field<false, true>(L_, key, binding_ref, t.stack_index());
+			}
+			else {
+				stack::set_field<false, true>(L_, key, make_closure(call_func, nullptr, ics.binding_data), t.stack_index());
+			}
+			t.pop(L_);
+		}
+	};
+
+	struct lua_reference_func {
+		reference key;
+		reference value;
+
+		void operator()(lua_State* L_, submetatable_type smt_, stateless_reference& fast_index_table_) {
+			if (smt_ == submetatable_type::named) {
+				return;
+			}
+			int fast_index_table_push = fast_index_table_.push(L_);
+			stateless_stack_reference t(L_, -fast_index_table_push);
+			stack::set_field<false, true>(L_, key, value, t.stack_index());
+			t.pop(L_);
+		}
+	};
+
+	struct update_bases_func {
+		detail::inheritance_check_function base_class_check_func;
+		detail::inheritance_cast_function base_class_cast_func;
+		lua_CFunction idx_call, new_idx_call, meta_idx_call, meta_new_idx_call;
+		usertype_storage_base* p_usb;
+		void* p_derived_usb;
+		change_indexing_mem_func change_indexing;
+
+		void operator()(lua_State* L_, submetatable_type smt_, stateless_reference& fast_index_table_) {
+			int fast_index_table_push = fast_index_table_.push(L_);
+			stateless_stack_reference t(L_, -fast_index_table_push);
+			stack::set_field(L_, detail::base_class_check_key(), reinterpret_cast<void*>(base_class_check_func), t.stack_index());
+			stack::set_field(L_, detail::base_class_cast_key(), reinterpret_cast<void*>(base_class_cast_func), t.stack_index());
+			// change indexing, forcefully
+			(p_usb->*change_indexing)(L_, smt_, p_derived_usb, t, idx_call, new_idx_call, meta_idx_call, meta_new_idx_call);
+			t.pop(L_);
+		}
+	};
+
+	struct binding_data_equals {
+		void* binding_data;
+
+		binding_data_equals(void* b) : binding_data(b) {
+		}
+
+		bool operator()(const std::unique_ptr<binding_base>& ptr) const {
+			return binding_data == ptr->data();
+		}
+	};
+
+	struct usertype_storage_base {
+	public:
+		lua_State* m_L;
+		std::vector<std::unique_ptr<binding_base>> storage;
+		std::vector<std::unique_ptr<char[]>> string_keys_storage;
+		std::unordered_map<string_view, index_call_storage> string_keys;
+		std::unordered_map<stateless_reference, stateless_reference, stateless_reference_hash, stateless_reference_equals> auxiliary_keys;
+		stateless_reference value_index_table;
+		stateless_reference reference_index_table;
+		stateless_reference unique_index_table;
+		stateless_reference const_reference_index_table;
+		stateless_reference const_value_index_table;
+		stateless_reference named_index_table;
+		stateless_reference type_table;
+		stateless_reference gc_names_table;
+		stateless_reference named_metatable;
+		new_index_call_storage base_index;
+		new_index_call_storage static_base_index;
+		bool is_using_index;
+		bool is_using_new_index;
+		std::bitset<64> properties;
+
+		usertype_storage_base(lua_State* L_)
+		: m_L(L_)
+		, storage()
+		, string_keys()
+		, auxiliary_keys(0, stateless_reference_hash(L_), stateless_reference_equals(L_))
+		, value_index_table()
+		, reference_index_table()
+		, unique_index_table()
+		, const_reference_index_table()
+		, type_table(make_reference<stateless_reference>(L_, create))
+		, gc_names_table(make_reference<stateless_reference>(L_, create))
+		, named_metatable(make_reference<stateless_reference>(L_, create))
+		, base_index()
+		, static_base_index()
+		, is_using_index(false)
+		, is_using_new_index(false)
+		, properties() {
+			base_index.binding_data = nullptr;
+			base_index.index = index_target_fail;
+			base_index.new_index = new_index_target_fail;
+			base_index.new_binding_data = nullptr;
+			static_base_index.binding_data = nullptr;
+			static_base_index.index = index_target_fail;
+			static_base_index.new_binding_data = this;
+			static_base_index.new_index = new_index_target_set;
+		}
+
+		template <typename Fx>
+		void for_each_table(lua_State* L_, Fx&& fx) {
+			for (int i = 0; i < 6; ++i) {
+				submetatable_type smt = static_cast<submetatable_type>(i);
+				stateless_reference* p_fast_index_table = nullptr;
+				switch (smt) {
+				case submetatable_type::const_value:
+					p_fast_index_table = &this->const_value_index_table;
+					break;
+				case submetatable_type::reference:
+					p_fast_index_table = &this->reference_index_table;
+					break;
+				case submetatable_type::unique:
+					p_fast_index_table = &this->unique_index_table;
+					break;
+				case submetatable_type::const_reference:
+					p_fast_index_table = &this->const_reference_index_table;
+					break;
+				case submetatable_type::named:
+					p_fast_index_table = &this->named_index_table;
+					break;
+				case submetatable_type::value:
+				default:
+					p_fast_index_table = &this->value_index_table;
+					break;
+				}
+				fx(L_, smt, *p_fast_index_table);
+			}
+		}
+
+		void add_entry(string_view sv, index_call_storage ics) {
+			string_keys_storage.emplace_back(new char[sv.size()]);
+			std::unique_ptr<char[]>& sv_storage = string_keys_storage.back();
+			std::memcpy(sv_storage.get(), sv.data(), sv.size());
+			string_view stored_sv(sv_storage.get(), sv.size());
+			string_keys.insert_or_assign(std::move(stored_sv), std::move(ics));
+		}
+
+		template <typename T, typename... Bases>
+		void update_bases(lua_State* L_, bases<Bases...>) {
+			static_assert(sizeof(void*) <= sizeof(detail::inheritance_check_function),
+				"The size of this data pointer is too small to fit the inheritance checking function: Please file "
+				"a bug report.");
+			static_assert(sizeof(void*) <= sizeof(detail::inheritance_cast_function),
+				"The size of this data pointer is too small to fit the inheritance checking function: Please file "
+				"a bug report.");
+			static_assert(!meta::any_same<T, Bases...>::value, "base classes cannot list the original class as part of the bases");
+			if constexpr (sizeof...(Bases) > 0) {
+				(void)detail::swallow { 0, ((weak_derive<Bases>::value = true), 0)... };
+
+				void* derived_this = static_cast<void*>(static_cast<usertype_storage<T>*>(this));
+
+				update_bases_func for_each_fx;
+				for_each_fx.base_class_check_func = &detail::inheritance<T>::template type_check_with<Bases...>;
+				for_each_fx.base_class_cast_func = &detail::inheritance<T>::template type_cast_with<Bases...>;
+				for_each_fx.idx_call = &usertype_storage<T>::template index_call_with_bases<false, Bases...>;
+				for_each_fx.new_idx_call = &usertype_storage<T>::template index_call_with_bases<true, Bases...>;
+				for_each_fx.meta_idx_call = &usertype_storage<T>::template meta_index_call_with_bases<false, Bases...>;
+				for_each_fx.meta_new_idx_call = &usertype_storage<T>::template meta_index_call_with_bases<true, Bases...>;
+				for_each_fx.p_usb = this;
+				for_each_fx.p_derived_usb = derived_this;
+				for_each_fx.change_indexing = &usertype_storage_base::change_indexing;
+				for_each_fx.p_derived_usb = derived_this;
+				this->for_each_table(L_, for_each_fx);
+			}
+			else {
+				(void)L_;
+			}
+		}
+
+		void clear() {
+			if (value_index_table.valid(m_L)) {
+				stack::clear(m_L, value_index_table);
+			}
+			if (reference_index_table.valid(m_L)) {
+				stack::clear(m_L, reference_index_table);
+			}
+			if (unique_index_table.valid(m_L)) {
+				stack::clear(m_L, unique_index_table);
+			}
+			if (const_reference_index_table.valid(m_L)) {
+				stack::clear(m_L, const_reference_index_table);
+			}
+			if (const_value_index_table.valid(m_L)) {
+				stack::clear(m_L, const_value_index_table);
+			}
+			if (named_index_table.valid(m_L)) {
+				stack::clear(m_L, named_index_table);
+			}
+			if (type_table.valid(m_L)) {
+				stack::clear(m_L, type_table);
+			}
+			if (gc_names_table.valid(m_L)) {
+				stack::clear(m_L, gc_names_table);
+			}
+			if (named_metatable.valid(m_L)) {
+				auto pp = stack::push_pop(m_L, named_metatable);
+				int named_metatable_index = pp.index_of(named_metatable);
+				if (lua_getmetatable(m_L, named_metatable_index) == 1) {
+					stack::clear(m_L, absolute_index(m_L, -1));
+				}
+				stack::clear(m_L, named_metatable);
+			}
+
+			value_index_table.reset(m_L);
+			reference_index_table.reset(m_L);
+			unique_index_table.reset(m_L);
+			const_reference_index_table.reset(m_L);
+			const_value_index_table.reset(m_L);
+			named_index_table.reset(m_L);
+			type_table.reset(m_L);
+			gc_names_table.reset(m_L);
+			named_metatable.reset(m_L);
+
+			storage.clear();
+			string_keys.clear();
+			auxiliary_keys.clear();
+			string_keys_storage.clear();
+		}
+
+		template <bool is_new_index, typename Base>
+		static void base_walk_index(lua_State* L_, usertype_storage_base& self, bool& keep_going, int& base_result) {
+			using bases = typename base<Base>::type;
+			if (!keep_going) {
+				return;
+			}
+			(void)L_;
+			(void)self;
+#if SOL_IS_ON(SOL_USE_UNSAFE_BASE_LOOKUP_I_)
+			usertype_storage_base& base_storage = get_usertype_storage<Base>(L_);
+			base_result = self_index_call<is_new_index, true>(bases(), L_, base_storage);
+#else
+			optional<usertype_storage<Base>&> maybe_base_storage = maybe_get_usertype_storage<Base>(L_);
+			if (static_cast<bool>(maybe_base_storage)) {
+				base_result = self_index_call<is_new_index, true>(bases(), L_, *maybe_base_storage);
+				keep_going = base_result == base_walking_failed_index;
+			}
+#endif // Fast versus slow, safe base lookup
+		}
+
+		template <bool is_new_index = false, bool base_walking = false, bool from_named_metatable = false, typename... Bases>
+		static inline int self_index_call(types<Bases...>, lua_State* L, usertype_storage_base& self) {
+			if constexpr (!from_named_metatable || !is_new_index) {
+				type k_type = stack::get<type>(L, 2);
+				if (k_type == type::string) {
+					index_call_storage* target = nullptr;
+					string_view k = stack::get<string_view>(L, 2);
+					{
+						auto it = self.string_keys.find(k);
+						if (it != self.string_keys.cend()) {
+							target = &it->second;
+						}
+					}
+					if (target != nullptr) {
+						// let the target decide what to do, unless it's named...
+						if constexpr (is_new_index) {
+							return (target->new_index)(L, target->binding_data);
+						}
+						else {
+							return (target->index)(L, target->binding_data);
+						}
+					}
+				}
+				else if (k_type != type::lua_nil && k_type != type::none) {
+					stateless_reference* target = nullptr;
+					{
+						stack_reference k = stack::get<stack_reference>(L, 2);
+						auto it = self.auxiliary_keys.find(k);
+						if (it != self.auxiliary_keys.cend()) {
+							target = &it->second;
+						}
+					}
+					if (target != nullptr) {
+						if constexpr (is_new_index) {
+							// set value and return
+							target->reset(L, 3);
+							return 0;
+						}
+						else {
+							// push target to return
+							// what we found
+							return stack::push(L, *target);
+						}
+					}
+				}
+			}
+
+			// retrieve bases and walk through them.
+			bool keep_going = true;
+			int base_result;
+			(void)keep_going;
+			(void)base_result;
+			(void)detail::swallow { 1, (base_walk_index<is_new_index, Bases>(L, self, keep_going, base_result), 1)... };
+			if constexpr (sizeof...(Bases) > 0) {
+				if (!keep_going) {
+					return base_result;
+				}
+			}
+			if constexpr (base_walking) {
+				// if we're JUST base-walking then don't index-fail, just
+				// return the false bits
+				return base_walking_failed_index;
+			}
+			else if constexpr (from_named_metatable) {
+				if constexpr (is_new_index) {
+					return self.static_base_index.new_index(L, self.static_base_index.new_binding_data);
+				}
+				else {
+					return self.static_base_index.index(L, self.static_base_index.binding_data);
+				}
+			}
+			else {
+				if constexpr (is_new_index) {
+					return self.base_index.new_index(L, self.base_index.new_binding_data);
+				}
+				else {
+					return self.base_index.index(L, self.base_index.binding_data);
+				}
+			}
+		}
+
+		void change_indexing(lua_State* L_, submetatable_type submetatable_, void* derived_this_, stateless_stack_reference& t_, lua_CFunction index_,
+			lua_CFunction new_index_, lua_CFunction meta_index_, lua_CFunction meta_new_index_) {
+			usertype_storage_base& this_base = *this;
+			void* base_this = static_cast<void*>(&this_base);
+
+			this->is_using_index |= true;
+			this->is_using_new_index |= true;
+			if (submetatable_ == submetatable_type::named) {
+				stack::set_field(L_, metatable_key, named_index_table, t_.stack_index());
+				stateless_stack_reference stack_metametatable(L_, -named_metatable.push(L_));
+				stack::set_field<false, true>(L_,
+					meta_function::index,
+					make_closure(meta_index_, nullptr, derived_this_, base_this, nullptr, toplevel_magic),
+					stack_metametatable.stack_index());
+				stack::set_field<false, true>(L_,
+					meta_function::new_index,
+					make_closure(meta_new_index_, nullptr, derived_this_, base_this, nullptr, toplevel_magic),
+					stack_metametatable.stack_index());
+				stack_metametatable.pop(L_);
+			}
+			else {
+				stack::set_field<false, true>(
+					L_, meta_function::index, make_closure(index_, nullptr, derived_this_, base_this, nullptr, toplevel_magic), t_.stack_index());
+				stack::set_field<false, true>(
+					L_, meta_function::new_index, make_closure(new_index_, nullptr, derived_this_, base_this, nullptr, toplevel_magic), t_.stack_index());
+			}
+		}
+
+		template <typename T = void, typename Key, typename Value>
+		void set(lua_State* L, Key&& key, Value&& value);
+
+		static int new_index_target_set(lua_State* L, void* target) {
+			usertype_storage_base& self = *static_cast<usertype_storage_base*>(target);
+			self.set(L, reference(L, raw_index(2)), reference(L, raw_index(3)));
+			return 0;
+		}
+
+		~usertype_storage_base() {
+			value_index_table.reset(m_L);
+			reference_index_table.reset(m_L);
+			unique_index_table.reset(m_L);
+			const_reference_index_table.reset(m_L);
+			const_value_index_table.reset(m_L);
+			named_index_table.reset(m_L);
+			type_table.reset(m_L);
+			gc_names_table.reset(m_L);
+			named_metatable.reset(m_L);
+
+			auto auxiliary_first = auxiliary_keys.cbegin();
+			auto auxiliary_last = auxiliary_keys.cend();
+			while (auxiliary_first != auxiliary_last) {
+				// save a copy to what we're going to destroy
+				auto auxiliary_target = auxiliary_first;
+				// move the iterator up by 1
+				++auxiliary_first;
+				// extract the node and destroy the key
+				auto extracted_node = auxiliary_keys.extract(auxiliary_target);
+				extracted_node.key().reset(m_L);
+				extracted_node.mapped().reset(m_L);
+				// continue if auxiliary_first hasn't been exhausted
+			}
+		}
+	};
+
+	template <typename T>
+	struct usertype_storage : usertype_storage_base {
+
+		using usertype_storage_base::usertype_storage_base;
+
+		template <bool is_new_index, bool from_named_metatable>
+		static inline int index_call_(lua_State* L) {
+			using bases = typename base<T>::type;
+			usertype_storage_base& self = stack::get<light<usertype_storage_base>>(L, upvalue_index(usertype_storage_index));
+			return self_index_call<is_new_index, false, from_named_metatable>(bases(), L, self);
+		}
+
+		template <bool is_new_index, bool from_named_metatable, typename... Bases>
+		static inline int index_call_with_bases_(lua_State* L) {
+			using bases = types<Bases...>;
+			usertype_storage_base& self = stack::get<light<usertype_storage_base>>(L, upvalue_index(usertype_storage_index));
+			return self_index_call<is_new_index, false, from_named_metatable>(bases(), L, self);
+		}
+
+		template <bool is_new_index>
+		static inline int index_call(lua_State* L) {
+			return detail::static_trampoline<&index_call_<is_new_index, false>>(L);
+		}
+
+		template <bool is_new_index, typename... Bases>
+		static inline int index_call_with_bases(lua_State* L) {
+			return detail::static_trampoline<&index_call_with_bases_<is_new_index, false, Bases...>>(L);
+		}
+
+		template <bool is_new_index>
+		static inline int meta_index_call(lua_State* L) {
+			return detail::static_trampoline<&index_call_<is_new_index, true>>(L);
+		}
+
+		template <bool is_new_index, typename... Bases>
+		static inline int meta_index_call_with_bases(lua_State* L) {
+			return detail::static_trampoline<&index_call_with_bases_<is_new_index, true, Bases...>>(L);
+		}
+
+		template <typename Key, typename Value>
+		inline void set(lua_State* L, Key&& key, Value&& value);
+	};
+
+	template <typename T, typename Key, typename Value>
+	void usertype_storage_base::set(lua_State* L, Key&& key, Value&& value) {
+		using ValueU = meta::unwrap_unqualified_t<Value>;
+		using KeyU = meta::unwrap_unqualified_t<Key>;
+		using Binding = binding<KeyU, ValueU, T>;
+		using is_var_bind = is_variable_binding<ValueU>;
+		if constexpr (std::is_same_v<KeyU, call_construction>) {
+			(void)key;
+			std::unique_ptr<Binding> p_binding = std::make_unique<Binding>(std::forward<Value>(value));
+			Binding& b = *p_binding;
+			this->storage.push_back(std::move(p_binding));
+
+			this->named_index_table.push(L);
+			absolute_index metametatable_index(L, -1);
+			std::string_view call_metamethod_name = to_string(meta_function::call);
+			lua_pushlstring(L, call_metamethod_name.data(), call_metamethod_name.size());
+			stack::push(L, nullptr);
+			stack::push(L, b.data());
+			lua_CFunction target_func = &b.template call<false, false>;
+			lua_pushcclosure(L, target_func, 2);
+			lua_rawset(L, metametatable_index);
+			this->named_index_table.pop(L);
+		}
+		else if constexpr (std::is_same_v<KeyU, base_classes_tag>) {
+			(void)key;
+			this->update_bases<T>(L, std::forward<Value>(value));
+		}
+		else if constexpr ((meta::is_string_like_or_constructible<KeyU>::value || std::is_same_v<KeyU, meta_function>)) {
+			std::string s = u_detail::make_string(std::forward<Key>(key));
+			auto storage_it = this->storage.end();
+			auto string_it = this->string_keys.find(s);
+			if (string_it != this->string_keys.cend()) {
+				const auto& binding_data = string_it->second.binding_data;
+				storage_it = std::find_if(this->storage.begin(), this->storage.end(), binding_data_equals(binding_data));
+				this->string_keys.erase(string_it);
+			}
+
+			std::unique_ptr<Binding> p_binding = std::make_unique<Binding>(std::forward<Value>(value));
+			Binding& b = *p_binding;
+			if (storage_it != this->storage.cend()) {
+				*storage_it = std::move(p_binding);
+			}
+			else {
+				this->storage.push_back(std::move(p_binding));
+			}
+
+			bool is_index = (s == to_string(meta_function::index));
+			bool is_new_index = (s == to_string(meta_function::new_index));
+			bool is_static_index = (s == to_string(meta_function::static_index));
+			bool is_static_new_index = (s == to_string(meta_function::static_new_index));
+			bool is_destruction = s == to_string(meta_function::garbage_collect);
+			bool poison_indexing = (!is_using_index || !is_using_new_index) && (is_var_bind::value || is_index || is_new_index);
+			void* derived_this = static_cast<void*>(static_cast<usertype_storage<T>*>(this));
+			index_call_storage ics;
+			ics.binding_data = b.data();
+			ics.index = is_index || is_static_index ? &Binding::template call_with_<true, is_var_bind::value>
+				                                   : &Binding::template index_call_with_<true, is_var_bind::value>;
+			ics.new_index = is_new_index || is_static_new_index ? &Binding::template call_with_<false, is_var_bind::value>
+				                                               : &Binding::template index_call_with_<false, is_var_bind::value>;
+
+			string_for_each_metatable_func for_each_fx;
+			for_each_fx.is_destruction = is_destruction;
+			for_each_fx.is_index = is_index;
+			for_each_fx.is_new_index = is_new_index;
+			for_each_fx.is_static_index = is_static_index;
+			for_each_fx.is_static_new_index = is_static_new_index;
+			for_each_fx.poison_indexing = poison_indexing;
+			for_each_fx.p_key = &s;
+			for_each_fx.p_ics = &ics;
+			if constexpr (is_lua_c_function_v<ValueU>) {
+				for_each_fx.is_unqualified_lua_CFunction = true;
+				for_each_fx.call_func = *static_cast<lua_CFunction*>(ics.binding_data);
+			}
+			else if constexpr (is_lua_reference_or_proxy_v<ValueU>) {
+				for_each_fx.is_unqualified_lua_reference = true;
+				for_each_fx.p_binding_ref = static_cast<reference*>(ics.binding_data);
+			}
+			else {
+				for_each_fx.call_func = &b.template call<false, is_var_bind::value>;
+			}
+			for_each_fx.p_usb = this;
+			for_each_fx.p_derived_usb = derived_this;
+			for_each_fx.idx_call = &usertype_storage<T>::template index_call<false>;
+			for_each_fx.new_idx_call = &usertype_storage<T>::template index_call<true>;
+			for_each_fx.meta_idx_call = &usertype_storage<T>::template meta_index_call<false>;
+			for_each_fx.meta_new_idx_call = &usertype_storage<T>::template meta_index_call<true>;
+			for_each_fx.change_indexing = &usertype_storage_base::change_indexing;
+			// set base index and base new_index
+			// functions here
+			if (is_index) {
+				this->base_index.index = ics.index;
+				this->base_index.binding_data = ics.binding_data;
+			}
+			if (is_new_index) {
+				this->base_index.new_index = ics.new_index;
+				this->base_index.new_binding_data = ics.binding_data;
+			}
+			if (is_static_index) {
+				this->static_base_index.index = ics.index;
+				this->static_base_index.binding_data = ics.binding_data;
+			}
+			if (is_static_new_index) {
+				this->static_base_index.new_index = ics.new_index;
+				this->static_base_index.new_binding_data = ics.binding_data;
+			}
+			this->for_each_table(L, for_each_fx);
+			this->add_entry(s, std::move(ics));
+		}
+		else {
+			// the reference-based implementation might compare poorly and hash
+			// poorly in some cases...
+			if constexpr (is_lua_reference_v<KeyU> && is_lua_reference_v<ValueU>) {
+				if (key.get_type() == type::string) {
+					stack::push(L, key);
+					std::string string_key = stack::pop<std::string>(L);
+					this->set<T>(L, string_key, std::forward<Value>(value));
+				}
+				else {
+					lua_reference_func ref_additions_fx { key, value };
+
+					this->for_each_table(L, ref_additions_fx);
+					this->auxiliary_keys.insert_or_assign(std::forward<Key>(key), std::forward<Value>(value));
+				}
+			}
+			else {
+				reference ref_key = make_reference(L, std::forward<Key>(key));
+				reference ref_value = make_reference(L, std::forward<Value>(value));
+				lua_reference_func ref_additions_fx { ref_key, ref_value };
+
+				this->for_each_table(L, ref_additions_fx);
+				this->auxiliary_keys.insert_or_assign(std::move(ref_key), std::move(ref_value));
+			}
+		}
+	}
+
+	template <typename T>
+	template <typename Key, typename Value>
+	void usertype_storage<T>::set(lua_State* L, Key&& key, Value&& value) {
+		static_cast<usertype_storage_base&>(*this).set<T>(L, std::forward<Key>(key), std::forward<Value>(value));
+	}
+
+	template <typename T>
+	inline void clear_usertype_registry_names(lua_State* L) {
+		using u_traits = usertype_traits<T>;
+		using u_const_traits = usertype_traits<const T>;
+		using u_unique_traits = usertype_traits<d::u<T>>;
+		using u_ref_traits = usertype_traits<T*>;
+		using u_const_ref_traits = usertype_traits<T const*>;
+
+		stack_reference registry(L, raw_index(LUA_REGISTRYINDEX));
+		registry.push();
+		// eliminate all named entries for this usertype
+		// in the registry (luaL_newmetatable does
+		// [name] = new table
+		// in registry upon creation
+		stack::set_field(L, &u_traits::metatable()[0], lua_nil, registry.stack_index());
+		stack::set_field(L, &u_const_traits::metatable()[0], lua_nil, registry.stack_index());
+		stack::set_field(L, &u_const_ref_traits::metatable()[0], lua_nil, registry.stack_index());
+		stack::set_field(L, &u_ref_traits::metatable()[0], lua_nil, registry.stack_index());
+		stack::set_field(L, &u_unique_traits::metatable()[0], lua_nil, registry.stack_index());
+		registry.pop();
+	}
+
+	template <typename T>
+	inline int destroy_usertype_storage(lua_State* L) noexcept {
+		clear_usertype_registry_names<T>(L);
+		return detail::user_alloc_destroy<usertype_storage<T>>(L);
+	}
+
+	template <typename T>
+	inline usertype_storage<T>& create_usertype_storage(lua_State* L) {
+		const char* gcmetakey = &usertype_traits<T>::gc_table()[0];
+
+		// Make sure userdata's memory is properly in lua first,
+		// otherwise all the light userdata we make later will become invalid
+		int usertype_storage_push_count = stack::push<user<usertype_storage<T>>>(L, no_metatable, L);
+		stack_reference usertype_storage_ref(L, -usertype_storage_push_count);
+
+		// create and push onto the stack a table to use as metatable for this GC
+		// we create a metatable to attach to the regular gc_table
+		// so that the destructor is called for the usertype storage
+		int usertype_storage_metatabe_count = stack::push(L, new_table(0, 1));
+		stack_reference usertype_storage_metatable(L, -usertype_storage_metatabe_count);
+		// set the destroyion routine on the metatable
+		stack::set_field(L, meta_function::garbage_collect, &destroy_usertype_storage<T>, usertype_storage_metatable.stack_index());
+		// set the metatable on the usertype storage userdata
+		stack::set_field(L, metatable_key, usertype_storage_metatable, usertype_storage_ref.stack_index());
+		usertype_storage_metatable.pop();
+
+		// set the usertype storage and its metatable
+		// into the global table...
+		stack::set_field<true>(L, gcmetakey, usertype_storage_ref);
+		usertype_storage_ref.pop();
+
+		// then retrieve the lua-stored version so we have a well-pinned
+		// reference that does not die
+		stack::get_field<true>(L, gcmetakey);
+		usertype_storage<T>& target_umt = stack::pop<user<usertype_storage<T>>>(L);
+		return target_umt;
+	}
+
+	inline optional<usertype_storage_base&> maybe_as_usertype_storage_base(lua_State* L, int index) {
+		if (type_of(L, index) != type::lightuserdata) {
+			return nullopt;
+		}
+		usertype_storage_base& base_storage = *static_cast<usertype_storage_base*>(stack::get<void*>(L, index));
+		return base_storage;
+	}
+
+	inline optional<usertype_storage_base&> maybe_get_usertype_storage_base_inside(lua_State* L, int index) {
+		// okay, maybe we're looking at a table that is nested?
+		if (type_of(L, index) != type::table) {
+			return nullopt;
+		}
+		stack::get_field(L, meta_function::storage, index);
+		auto maybe_storage_base = maybe_as_usertype_storage_base(L, -1);
+		lua_pop(L, 1);
+		return maybe_storage_base;
+	}
+
+	inline optional<usertype_storage_base&> maybe_get_usertype_storage_base(lua_State* L, int index) {
+		// If we can get the index directly as this type, go for it
+		auto maybe_already_is_usertype_storage_base = maybe_as_usertype_storage_base(L, index);
+		if (maybe_already_is_usertype_storage_base) {
+			return maybe_already_is_usertype_storage_base;
+		}
+		return maybe_get_usertype_storage_base_inside(L, index);
+	}
+
+
+	inline optional<usertype_storage_base&> maybe_get_usertype_storage_base(lua_State* L, const char* gcmetakey) {
+		stack::get_field<true>(L, gcmetakey);
+		auto maybe_storage = maybe_as_usertype_storage_base(L, lua_gettop(L));
+		lua_pop(L, 1);
+		return maybe_storage;
+	}
+
+	inline usertype_storage_base& get_usertype_storage_base(lua_State* L, const char* gcmetakey) {
+		stack::get_field<true>(L, gcmetakey);
+		stack::record tracking;
+		usertype_storage_base& target_umt = stack::stack_detail::unchecked_unqualified_get<user<usertype_storage_base>>(L, -1, tracking);
+		lua_pop(L, 1);
+		return target_umt;
+	}
+
+	template <typename T>
+	inline optional<usertype_storage<T>&> maybe_get_usertype_storage(lua_State* L) {
+		const char* gcmetakey = &usertype_traits<T>::gc_table()[0];
+		stack::get_field<true>(L, gcmetakey);
+		int target = lua_gettop(L);
+		if (!stack::check<user<usertype_storage<T>>>(L, target)) {
+			return nullopt;
+		}
+		usertype_storage<T>& target_umt = stack::pop<user<usertype_storage<T>>>(L);
+		return target_umt;
+	}
+
+	template <typename T>
+	inline usertype_storage<T>& get_usertype_storage(lua_State* L) {
+		const char* gcmetakey = &usertype_traits<T>::gc_table()[0];
+		stack::get_field<true>(L, gcmetakey);
+		usertype_storage<T>& target_umt = stack::pop<user<usertype_storage<T>>>(L);
+		return target_umt;
+	}
+
+	template <typename T>
+	inline void clear_usertype_storage(lua_State* L) {
+		using u_traits = usertype_traits<T>;
+
+		const char* gcmetakey = &u_traits::gc_table()[0];
+		stack::get_field<true>(L, gcmetakey);
+		if (!stack::check<user<usertype_storage<T>>>(L)) {
+			lua_pop(L, 1);
+			return;
+		}
+		usertype_storage<T>& target_umt = stack::pop<user<usertype_storage<T>>>(L);
+		target_umt.clear();
+
+		clear_usertype_registry_names<T>(L);
+
+		stack::set_field<true>(L, gcmetakey, lua_nil);
+	}
+
+	template <typename T, automagic_flags enrollment_flags>
+	inline int register_usertype(lua_State* L_, automagic_enrollments enrollments_ = {}) {
+		using u_traits = usertype_traits<T>;
+		using u_const_traits = usertype_traits<const T>;
+		using u_unique_traits = usertype_traits<d::u<T>>;
+		using u_ref_traits = usertype_traits<T*>;
+		using u_const_ref_traits = usertype_traits<T const*>;
+		using uts = usertype_storage<T>;
+
+		// always have __new_index point to usertype_storage method
+		// have __index always point to regular fast-lookup
+		// meta_method table
+		// if __new_index is invoked, runtime-swap
+		// to slow __index if necessary
+		// (no speed penalty because function calls
+		// are all read-only -- only depend on __index
+		// to retrieve function and then call happens VIA Lua)
+
+		// __type entry:
+		// table contains key -> value lookup,
+		// where key is entry in metatable
+		// and value is type information as a string as
+		// best as we can give it
+
+		// name entry:
+		// string that contains raw class name,
+		// as defined from C++
+
+		// is entry:
+		// checks if argument supplied is of type T
+
+		// __storage entry:
+		// a light userdata pointing to the storage
+		// mostly to enable this new abstraction
+		// to not require the type name `T`
+		// to get at the C++ usertype storage within
+
+
+		// we then let typical definitions potentially override these intrinsics
+		// it's the user's fault if they override things or screw them up:
+		// these names have been reserved and documented since sol2
+
+		// STEP 0: tell the old usertype (if it exists)
+		// to fuck off
+		clear_usertype_storage<T>(L_);
+
+		// STEP 1: Create backing store for usertype storage
+		// Pretty much the most important step.
+		// STEP 2: Create Lua tables used for fast method indexing.
+		// This is done inside of the storage table's constructor
+		usertype_storage<T>& storage = create_usertype_storage<T>(L_);
+		usertype_storage_base& base_storage = storage;
+		void* light_storage = static_cast<void*>(&storage);
+		void* light_base_storage = static_cast<void*>(&base_storage);
+
+
+		// STEP 3: set up GC escape hatch table entirely
+		storage.gc_names_table.push(L_);
+		stateless_stack_reference gnt(L_, -1);
+		stack::set_field(L_, submetatable_type::named, &u_traits::gc_table()[0], gnt.stack_index());
+		stack::set_field(L_, submetatable_type::const_value, &u_const_traits::metatable()[0], gnt.stack_index());
+		stack::set_field(L_, submetatable_type::const_reference, &u_const_ref_traits::metatable()[0], gnt.stack_index());
+		stack::set_field(L_, submetatable_type::reference, &u_ref_traits::metatable()[0], gnt.stack_index());
+		stack::set_field(L_, submetatable_type::unique, &u_unique_traits::metatable()[0], gnt.stack_index());
+		stack::set_field(L_, submetatable_type::value, &u_traits::metatable()[0], gnt.stack_index());
+		gnt.pop(L_);
+
+		// STEP 4: add some useful information to the type table
+		stateless_stack_reference stacked_type_table(L_, -storage.type_table.push(L_));
+		stack::set_field(L_, "name", detail::demangle<T>(), stacked_type_table.stack_index());
+		stack::set_field(L_, "is", &detail::is_check<T>, stacked_type_table.stack_index());
+		stacked_type_table.pop(L_);
+
+		// STEP 5: create and hook up metatable,
+		// add intrinsics
+		// this one is the actual meta-handling table,
+		// the next one will be the one for
+		int for_each_backing_metatable_calls = 0;
+		auto for_each_backing_metatable = [&](lua_State* L_, submetatable_type smt_, stateless_reference& fast_index_table_) {
+			// Pointer types, AKA "references" from C++
+			const char* metakey = nullptr;
+			switch (smt_) {
+			case submetatable_type::const_value:
+				metakey = &u_const_traits::metatable()[0];
+				break;
+			case submetatable_type::reference:
+				metakey = &u_ref_traits::metatable()[0];
+				break;
+			case submetatable_type::unique:
+				metakey = &u_unique_traits::metatable()[0];
+				break;
+			case submetatable_type::const_reference:
+				metakey = &u_const_ref_traits::metatable()[0];
+				break;
+			case submetatable_type::named:
+				metakey = &u_traits::user_metatable()[0];
+				break;
+			case submetatable_type::value:
+			default:
+				metakey = &u_traits::metatable()[0];
+				break;
+			}
+
+			luaL_newmetatable(L_, metakey);
+			if (smt_ == submetatable_type::named) {
+				// the named table itself
+				// gets the associated name value
+				storage.named_metatable.reset(L_, -1);
+				lua_pop(L_, 1);
+				// but the thing we perform the methods on
+				// is still the metatable of the named
+				// table
+				lua_createtable(L_, 0, 6);
+			}
+			stateless_stack_reference t(L_, -1);
+			fast_index_table_.reset(L_, t.stack_index());
+			stack::set_field<false, true>(L_, meta_function::type, storage.type_table, t.stack_index());
+			// destructible? serialize default destructor here
+			// otherwise, not destructible: serialize a "hey you messed up"
+			switch (smt_) {
+			case submetatable_type::const_reference:
+			case submetatable_type::reference:
+			case submetatable_type::named:
+				break;
+			case submetatable_type::unique:
+				if constexpr (std::is_destructible_v<T>) {
+					stack::set_field<false, true>(L_, meta_function::garbage_collect, &detail::unique_destroy<T>, t.stack_index());
+				}
+				else {
+					stack::set_field<false, true>(L_, meta_function::garbage_collect, &detail::cannot_destroy<T>, t.stack_index());
+				}
+				break;
+			case submetatable_type::value:
+			case submetatable_type::const_value:
+			default:
+				if constexpr (std::is_destructible_v<T>) {
+					stack::set_field<false, true>(L_, meta_function::garbage_collect, detail::make_destructor<T>(), t.stack_index());
+				}
+				else {
+					stack::set_field<false, true>(L_, meta_function::garbage_collect, &detail::cannot_destroy<T>, t.stack_index());
+				}
+				break;
+			}
+
+			static_assert(sizeof(void*) <= sizeof(detail::inheritance_check_function),
+				"The size of this data pointer is too small to fit the inheritance checking function: file a bug "
+				"report.");
+			static_assert(sizeof(void*) <= sizeof(detail::inheritance_cast_function),
+				"The size of this data pointer is too small to fit the inheritance checking function: file a bug "
+				"report.");
+			stack::set_field<false, true>(L_, detail::base_class_check_key(), reinterpret_cast<void*>(&detail::inheritance<T>::type_check), t.stack_index());
+			stack::set_field<false, true>(L_, detail::base_class_cast_key(), reinterpret_cast<void*>(&detail::inheritance<T>::type_cast), t.stack_index());
+
+			auto prop_fx = detail::properties_enrollment_allowed(for_each_backing_metatable_calls, storage.properties, enrollments_);
+			auto insert_fx = [&L_, &t, &storage](meta_function mf, lua_CFunction reg) {
+				stack::set_field<false, true>(L_, mf, reg, t.stack_index());
+				storage.properties[static_cast<std::size_t>(mf)] = true;
+			};
+			detail::insert_default_registrations<T>(insert_fx, prop_fx);
+
+			// There are no variables, so serialize the fast function stuff
+			// be sure to reset the index stuff to the non-fast version
+			// if the user ever adds something later!
+			if (smt_ == submetatable_type::named) {
+				// add escape hatch storage pointer and gc names
+				stack::set_field<false, true>(L_, meta_function::storage, light_base_storage, t.stack_index());
+				stack::set_field<false, true>(L_, meta_function::gc_names, storage.gc_names_table, t.stack_index());
+
+				// fancy new_indexing when using the named table
+				{
+					absolute_index named_metatable_index(L_, -storage.named_metatable.push(L_));
+					stack::set_field<false, true>(L_, metatable_key, t, named_metatable_index);
+					storage.named_metatable.pop(L_);
+				}
+				stack_reference stack_metametatable(L_, -storage.named_index_table.push(L_));
+				stack::set_field<false, true>(L_,
+					meta_function::index,
+					make_closure(uts::template meta_index_call<false>, nullptr, light_storage, light_base_storage, nullptr, toplevel_magic),
+					stack_metametatable.stack_index());
+				stack::set_field<false, true>(L_,
+					meta_function::new_index,
+					make_closure(uts::template meta_index_call<true>, nullptr, light_storage, light_base_storage, nullptr, toplevel_magic),
+					stack_metametatable.stack_index());
+				stack_metametatable.pop();
+			}
+			else {
+				// otherwise just plain for index,
+				// and elaborated for new_index
+				stack::set_field<false, true>(L_, meta_function::index, t, t.stack_index());
+				stack::set_field<false, true>(L_,
+					meta_function::new_index,
+					make_closure(uts::template index_call<true>, nullptr, light_storage, light_base_storage, nullptr, toplevel_magic),
+					t.stack_index());
+				storage.is_using_new_index = true;
+			}
+
+			++for_each_backing_metatable_calls;
+			fast_index_table_.reset(L_, t.stack_index());
+			t.pop(L_);
+		};
+
+		storage.for_each_table(L_, for_each_backing_metatable);
+
+		// can only use set AFTER we initialize all the metatables
+		if constexpr (std::is_default_constructible_v<T> && has_flag(enrollment_flags, automagic_flags::default_constructor)) {
+			if (enrollments_.default_constructor) {
+				storage.set(L_, meta_function::construct, constructors<T()>());
+			}
+		}
+
+		// return the named metatable we want names linked into
+		storage.named_metatable.push(L_);
+		return 1;
+	}
+}} // namespace sol::u_detail
+
+#endif // SOL_USERTYPE_STORAGE_HPP
diff --git a/extern/sol3/sol/usertype_traits.hpp b/extern/sol3/sol/usertype_traits.hpp
new file mode 100644
index 0000000000..cf60b27458
--- /dev/null
+++ b/extern/sol3/sol/usertype_traits.hpp
@@ -0,0 +1,61 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_USERTYPE_TRAITS_HPP
+#define SOL_USERTYPE_TRAITS_HPP
+
+#include <sol/demangle.hpp>
+
+namespace sol {
+
+	template <typename T>
+	struct usertype_traits {
+		static const std::string& name() {
+			static const std::string& n = detail::short_demangle<T>();
+			return n;
+		}
+		static const std::string& qualified_name() {
+			static const std::string& q_n = detail::demangle<T>();
+			return q_n;
+		}
+		static const std::string& metatable() {
+			static const std::string m = std::string("sol.").append(detail::demangle<T>());
+			return m;
+		}
+		static const std::string& user_metatable() {
+			static const std::string u_m = std::string("sol.").append(detail::demangle<T>()).append(".user");
+			return u_m;
+		}
+		static const std::string& user_gc_metatable() {
+			static const std::string u_g_m = std::string("sol.").append(detail::demangle<T>()).append(".user\xE2\x99\xBB");
+			return u_g_m;
+		}
+		static const std::string& gc_table() {
+			static const std::string g_t = std::string("sol.").append(detail::demangle<T>()).append(".\xE2\x99\xBB");
+			return g_t;
+		}
+	};
+
+} // namespace sol
+
+#endif // SOL_USERTYPE_TRAITS_HPP
diff --git a/extern/sol3/sol/variadic_args.hpp b/extern/sol3/sol/variadic_args.hpp
new file mode 100644
index 0000000000..efaad38d5c
--- /dev/null
+++ b/extern/sol3/sol/variadic_args.hpp
@@ -0,0 +1,181 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_VARIADIC_ARGS_HPP
+#define SOL_VARIADIC_ARGS_HPP
+
+#include <sol/stack.hpp>
+#include <sol/stack_proxy.hpp>
+#include <sol/stack_iterator.hpp>
+#include <limits>
+#include <iterator>
+
+namespace sol {
+	struct variadic_args {
+	private:
+		lua_State* L;
+		int index;
+		int stacktop;
+
+	public:
+		typedef stack_proxy reference_type;
+		typedef stack_proxy value_type;
+		typedef stack_proxy* pointer;
+		typedef std::ptrdiff_t difference_type;
+		typedef std::size_t size_type;
+		typedef stack_iterator<stack_proxy, false> iterator;
+		typedef stack_iterator<stack_proxy, true> const_iterator;
+		typedef std::reverse_iterator<iterator> reverse_iterator;
+		typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
+
+		variadic_args() = default;
+		variadic_args(lua_State* luastate, int stackindex = -1) : L(luastate), index(lua_absindex(luastate, stackindex)), stacktop(lua_gettop(luastate)) {
+		}
+		variadic_args(lua_State* luastate, int stackindex, int lastindex) : L(luastate), index(lua_absindex(luastate, stackindex)), stacktop(lastindex) {
+		}
+		variadic_args(const variadic_args&) = default;
+		variadic_args& operator=(const variadic_args&) = default;
+		variadic_args(variadic_args&& o) : L(o.L), index(o.index), stacktop(o.stacktop) {
+			// Must be manual, otherwise destructor will screw us
+			// return count being 0 is enough to keep things clean
+			// but will be thorough
+			o.L = nullptr;
+			o.index = 0;
+			o.stacktop = 0;
+		}
+		variadic_args& operator=(variadic_args&& o) {
+			L = o.L;
+			index = o.index;
+			stacktop = o.stacktop;
+			// Must be manual, otherwise destructor will screw us
+			// return count being 0 is enough to keep things clean
+			// but will be thorough
+			o.L = nullptr;
+			o.index = 0;
+			o.stacktop = 0;
+			return *this;
+		}
+
+		iterator begin() {
+			return iterator(L, index, stacktop + 1);
+		}
+		iterator end() {
+			return iterator(L, stacktop + 1, stacktop + 1);
+		}
+		const_iterator begin() const {
+			return const_iterator(L, index, stacktop + 1);
+		}
+		const_iterator end() const {
+			return const_iterator(L, stacktop + 1, stacktop + 1);
+		}
+		const_iterator cbegin() const {
+			return begin();
+		}
+		const_iterator cend() const {
+			return end();
+		}
+
+		reverse_iterator rbegin() {
+			return std::reverse_iterator<iterator>(begin());
+		}
+		reverse_iterator rend() {
+			return std::reverse_iterator<iterator>(end());
+		}
+		const_reverse_iterator rbegin() const {
+			return std::reverse_iterator<const_iterator>(begin());
+		}
+		const_reverse_iterator rend() const {
+			return std::reverse_iterator<const_iterator>(end());
+		}
+		const_reverse_iterator crbegin() const {
+			return std::reverse_iterator<const_iterator>(cbegin());
+		}
+		const_reverse_iterator crend() const {
+			return std::reverse_iterator<const_iterator>(cend());
+		}
+
+		int push() const {
+			return push(L);
+		}
+
+		int push(lua_State* target) const {
+			int pushcount = 0;
+			for (int i = index; i <= stacktop; ++i) {
+				lua_pushvalue(L, i);
+				pushcount += 1;
+			}
+			if (target != L) {
+				lua_xmove(L, target, pushcount);
+			}
+			return pushcount;
+		}
+
+		template <typename T>
+		decltype(auto) get(difference_type index_offset = 0) const {
+			return stack::get<T>(L, index + static_cast<int>(index_offset));
+		}
+
+		type get_type(difference_type index_offset = 0) const noexcept {
+			return type_of(L, index + static_cast<int>(index_offset));
+		}
+
+		stack_proxy operator[](difference_type index_offset) const {
+			return stack_proxy(L, index + static_cast<int>(index_offset));
+		}
+
+		lua_State* lua_state() const {
+			return L;
+		};
+		int stack_index() const {
+			return index;
+		};
+		int leftover_count() const {
+			return stacktop - (index - 1);
+		}
+		std::size_t size() const {
+			return static_cast<std::size_t>(leftover_count());
+		}
+		int top() const {
+			return stacktop;
+		}
+	};
+
+	namespace stack {
+		template <>
+		struct unqualified_getter<variadic_args> {
+			static variadic_args get(lua_State* L, int index, record& tracking) {
+				tracking.last = 0;
+				return variadic_args(L, index);
+			}
+		};
+
+		template <>
+		struct unqualified_pusher<variadic_args> {
+			static int push(lua_State* L, const variadic_args& ref) {
+				return ref.push(L);
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+#endif // SOL_VARIADIC_ARGS_HPP
diff --git a/extern/sol3/sol/variadic_results.hpp b/extern/sol3/sol/variadic_results.hpp
new file mode 100644
index 0000000000..6b8e981c20
--- /dev/null
+++ b/extern/sol3/sol/variadic_results.hpp
@@ -0,0 +1,103 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_VARIADIC_RESULTS_HPP
+#define SOL_VARIADIC_RESULTS_HPP
+
+#include <sol/stack.hpp>
+#include <sol/object.hpp>
+#include <sol/as_returns.hpp>
+#include <sol/function_result.hpp>
+#include <sol/protected_function_result.hpp>
+
+#include <vector>
+
+namespace sol {
+
+	template <typename Al = typename std::allocator<object>>
+	struct basic_variadic_results : public std::vector<object, Al> {
+	private:
+		using base_t = std::vector<object, Al>;
+
+	public:
+		basic_variadic_results() : base_t() {
+		}
+
+		basic_variadic_results(unsafe_function_result fr) : base_t() {
+			this->reserve(fr.return_count());
+			this->insert(this->cend(), fr.begin(), fr.end());
+		}
+
+		basic_variadic_results(protected_function_result fr) : base_t() {
+			this->reserve(fr.return_count());
+			this->insert(this->cend(), fr.begin(), fr.end());
+		}
+
+		template <typename Arg0, typename... Args,
+		     meta::disable_any<std::is_same<meta::unqualified_t<Arg0>, basic_variadic_results>, std::is_same<meta::unqualified_t<Arg0>, function_result>,
+		          std::is_same<meta::unqualified_t<Arg0>, protected_function_result>> = meta::enabler>
+		basic_variadic_results(Arg0&& arg0, Args&&... args) : base_t(std::forward<Arg0>(arg0), std::forward<Args>(args)...) {
+		}
+
+		basic_variadic_results(const basic_variadic_results&) = default;
+		basic_variadic_results(basic_variadic_results&&) = default;
+	};
+
+	struct variadic_results : public basic_variadic_results<> {
+	private:
+		using base_t = basic_variadic_results<>;
+
+	public:
+		using base_t::base_t;
+	};
+
+	template <typename Al>
+	struct is_container<basic_variadic_results<Al>> : std::false_type { };
+
+	template <>
+	struct is_container<variadic_results> : std::false_type { };
+
+	namespace stack {
+		template <typename Al>
+		struct unqualified_pusher<basic_variadic_results<Al>> {
+			int push(lua_State* L, const basic_variadic_results<Al>& e) {
+				int p = 0;
+				for (const auto& i : e) {
+					p += stack::push(L, i);
+				}
+				return p;
+			}
+		};
+
+		template <>
+		struct unqualified_pusher<variadic_results> {
+			int push(lua_State* L, const variadic_results& r) {
+				using base_t = basic_variadic_results<>;
+				return stack::push(L, static_cast<const base_t&>(r));
+			}
+		};
+	} // namespace stack
+
+} // namespace sol
+
+#endif // SOL_VARIADIC_RESULTS_HPP
diff --git a/extern/sol3/sol/version.hpp b/extern/sol3/sol/version.hpp
new file mode 100644
index 0000000000..9b091aaa02
--- /dev/null
+++ b/extern/sol3/sol/version.hpp
@@ -0,0 +1,831 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_VERSION_HPP
+#define SOL_VERSION_HPP
+
+#include <sol/config.hpp>
+
+// clang-format off
+
+#define SOL_VERSION_MAJOR 3
+#define SOL_VERSION_MINOR 2
+#define SOL_VERSION_PATCH 3
+#define SOL_VERSION_STRING "3.2.3"
+#define SOL_VERSION ((SOL_VERSION_MAJOR * 100000) + (SOL_VERSION_MINOR * 100) + (SOL_VERSION_PATCH))
+
+#define SOL_IS_ON(OP_SYMBOL) ((3 OP_SYMBOL 3) != 0)
+#define SOL_IS_OFF(OP_SYMBOL) ((3 OP_SYMBOL 3) == 0)
+#define SOL_IS_DEFAULT_ON(OP_SYMBOL) ((3 OP_SYMBOL 3) > 3)
+#define SOL_IS_DEFAULT_OFF(OP_SYMBOL) ((3 OP_SYMBOL 3 OP_SYMBOL 3) < 0)
+
+#define SOL_ON          |
+#define SOL_OFF         ^
+#define SOL_DEFAULT_ON  +
+#define SOL_DEFAULT_OFF -
+
+#if defined(SOL_BUILD_CXX_MODE)
+	#if (SOL_BUILD_CXX_MODE != 0)
+		#define SOL_BUILD_CXX_MODE_I_ SOL_ON
+	#else
+		#define SOL_BUILD_CXX_MODE_I_ SOL_OFF
+	#endif
+#elif defined(__cplusplus)
+	#define SOL_BUILD_CXX_MODE_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_BUILD_CXX_MODE_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_BUILD_C_MODE)
+	#if (SOL_BUILD_C_MODE != 0)
+		#define SOL_BUILD_C_MODE_I_ SOL_ON
+	#else
+		#define SOL_BUILD_C_MODE_I_ SOL_OFF
+	#endif
+#elif defined(__STDC__)
+	#define SOL_BUILD_C_MODE_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_BUILD_C_MODE_I_ SOL_DEFAULT_OFF
+#endif
+
+#if SOL_IS_ON(SOL_BUILD_C_MODE_I_)
+	#include <stddef.h>
+	#include <stdint.h>
+	#include <limits.h>
+#else
+	#include <cstddef>
+	#include <cstdint>
+	#include <climits>
+#endif
+
+#if defined(SOL_COMPILER_VCXX)
+	#if defined(SOL_COMPILER_VCXX != 0)
+		#define SOL_COMPILER_VCXX_I_ SOL_ON
+	#else
+		#define SOL_COMPILER_VCXX_I_ SOL_OFF
+	#endif
+#elif defined(_MSC_VER)
+	#define SOL_COMPILER_VCXX_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_COMPILER_VCXX_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_COMPILER_GCC)
+	#if defined(SOL_COMPILER_GCC != 0)
+		#define SOL_COMPILER_GCC_I_ SOL_ON
+	#else
+		#define SOL_COMPILER_GCC_I_ SOL_OFF
+	#endif
+#elif defined(__GNUC__)
+	#define SOL_COMPILER_GCC_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_COMPILER_GCC_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_COMPILER_CLANG)
+	#if defined(SOL_COMPILER_CLANG != 0)
+		#define SOL_COMPILER_CLANG_I_ SOL_ON
+	#else
+		#define SOL_COMPILER_CLANG_I_ SOL_OFF
+	#endif
+#elif defined(__clang__)
+	#define SOL_COMPILER_CLANG_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_COMPILER_CLANG_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_COMPILER_EDG)
+	#if defined(SOL_COMPILER_EDG != 0)
+		#define SOL_COMPILER_EDG_I_ SOL_ON
+	#else
+		#define SOL_COMPILER_EDG_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_COMPILER_EDG_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_COMPILER_MINGW)
+	#if (SOL_COMPILER_MINGW != 0)
+		#define SOL_COMPILER_MINGW_I_ SOL_ON
+	#else
+		#define SOL_COMPILER_MINGW_I_ SOL_OFF
+	#endif
+#elif defined(__MINGW32__)
+	#define SOL_COMPILER_MINGW_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_COMPILER_MINGW_I_ SOL_DEFAULT_OFF
+#endif
+
+#if SIZE_MAX <= 0xFFFFULL
+	#define SOL_PLATFORM_X16_I_ SOL_ON
+	#define SOL_PLATFORM_X86_I_ SOL_OFF
+	#define SOL_PLATFORM_X64_I_ SOL_OFF
+#elif SIZE_MAX <= 0xFFFFFFFFULL
+	#define SOL_PLATFORM_X16_I_ SOL_OFF
+	#define SOL_PLATFORM_X86_I_ SOL_ON
+	#define SOL_PLATFORM_X64_I_ SOL_OFF
+#else
+	#define SOL_PLATFORM_X16_I_ SOL_OFF
+	#define SOL_PLATFORM_X86_I_ SOL_OFF
+	#define SOL_PLATFORM_X64_I_ SOL_ON
+#endif
+
+// TODO: ARM codes? So far, not needed explicitly...
+#define SOL_PLATFORM_ARM32_I_ SOL_OFF
+#define SOL_PLATFORM_ARM64_I_ SOL_OFF
+
+#if defined(SOL_PLATFORM_WINDOWS)
+	#if (SOL_PLATFORM_WINDOWS != 0)
+		#define SOL_PLATFORM_WINDOWS_I_ SOL_ON
+	#else
+		#define SOL_PLATFORM_WINDOWS_I_ SOL_OFF
+	#endif
+#elif defined(_WIN32)
+	#define SOL_PLATFORM_WINDOWS_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_PLATFORM_WINDOWS_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_PLATFORM_CYGWIN)
+	#if (SOL_PLATFORM_CYGWIN != 0)
+		#define SOL_PLATFORM_CYGWIN_I_ SOL_ON
+	#else
+		#define SOL_PLATFORM_CYGWIN_I_ SOL_ON
+	#endif
+#elif defined(__CYGWIN__)
+	#define SOL_PLATFORM_CYGWIN_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_PLATFORM_CYGWIN_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_PLATFORM_APPLE)
+	#if (SOL_PLATFORM_APPLE != 0)
+		#define SOL_PLATFORM_APPLE_I_ SOL_ON
+	#else
+		#define SOL_PLATFORM_APPLE_I_ SOL_OFF
+	#endif
+#elif defined(__APPLE__)
+	#define SOL_PLATFORM_APPLE_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_PLATFORM_APPLE_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_PLATFORM_UNIX)
+	#if (SOL_PLATFORM_UNIX != 0)
+		#define SOL_PLATFORM_UNIXLIKE_I_ SOL_ON
+	#else
+		#define SOL_PLATFORM_UNIXLIKE_I_ SOL_OFF
+	#endif
+#elif defined(__unix__)
+	#define SOL_PLATFORM_UNIXLIKE_I_ SOL_DEFAUKT_ON
+#else
+	#define SOL_PLATFORM_UNIXLIKE_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_PLATFORM_LINUX)
+	#if (SOL_PLATFORM_LINUX != 0)
+		#define SOL_PLATFORM_LINUXLIKE_I_ SOL_ON
+	#else
+		#define SOL_PLATFORM_LINUXLIKE_I_ SOL_OFF
+	#endif
+#elif defined(__LINUX__)
+	#define SOL_PLATFORM_LINUXLIKE_I_ SOL_DEFAUKT_ON
+#else
+	#define SOL_PLATFORM_LINUXLIKE_I_ SOL_DEFAULT_OFF
+#endif
+
+#define SOL_PLATFORM_APPLE_IPHONE_I_ SOL_OFF
+#define SOL_PLATFORM_BSDLIKE_I_      SOL_OFF
+
+#if defined(SOL_IN_DEBUG_DETECTED)
+	#if SOL_IN_DEBUG_DETECTED != 0
+		#define SOL_DEBUG_BUILD_I_ SOL_ON
+	#else
+		#define SOL_DEBUG_BUILD_I_ SOL_OFF
+	#endif
+#elif !defined(NDEBUG)
+	#if SOL_IS_ON(SOL_COMPILER_VCXX_I_) && defined(_DEBUG)
+		#define SOL_DEBUG_BUILD_I_ SOL_ON
+	#elif (SOL_IS_ON(SOL_COMPILER_CLANG_I_) || SOL_IS_ON(SOL_COMPILER_GCC_I_)) && !defined(__OPTIMIZE__)
+		#define SOL_DEBUG_BUILD_I_ SOL_ON
+	#else
+		#define SOL_DEBUG_BUILD_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_DEBUG_BUILD_I_ SOL_DEFAULT_OFF
+#endif // We are in a debug mode of some sort
+
+#if defined(SOL_NO_EXCEPTIONS)
+	#if (SOL_NO_EXCEPTIONS != 0)
+		#define SOL_EXCEPTIONS_I_ SOL_OFF
+	#else
+		#define SOL_EXCEPTIONS_I_ SOL_ON
+	#endif
+#elif SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+	#if !defined(_CPPUNWIND)
+		#define SOL_EXCEPTIONS_I_ SOL_OFF
+	#else
+		#define SOL_EXCEPTIONS_I_ SOL_ON
+	#endif
+#elif SOL_IS_ON(SOL_COMPILER_CLANG_I_) || SOL_IS_ON(SOL_COMPILER_GCC_I_)
+	#if !defined(__EXCEPTIONS)
+		#define SOL_EXCEPTIONS_I_ SOL_OFF
+	#else
+		#define SOL_EXCEPTIONS_I_ SOL_ON
+	#endif
+#else
+	#define SOL_EXCEPTIONS_I_ SOL_DEFAULT_ON
+#endif
+
+
+#if defined(SOL_NO_RTTI)
+	#if (SOL_NO_RTTI != 0)
+		#define SOL_RTTI_I_ SOL_OFF
+	#else
+		#define SOL_RTTI_I_ SOL_ON
+	#endif
+#elif SOL_IS_ON(SOL_COMPILER_VCXX_I_)
+	#if !defined(_CPPRTTI)
+		#define SOL_RTTI_I_ SOL_OFF
+	#else
+		#define SOL_RTTI_I_ SOL_ON
+	#endif
+#elif SOL_IS_ON(SOL_COMPILER_CLANG_I_) || SOL_IS_ON(SOL_COMPILER_GCC_I_)
+	#if !defined(__GXX_RTTI)
+		#define SOL_RTTI_I_ SOL_OFF
+	#else
+		#define SOL_RTTI_I_ SOL_ON
+	#endif
+#else
+	#define SOL_RTTI_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_NO_THREAD_LOCAL)
+	#if SOL_NO_THREAD_LOCAL != 0
+		#define SOL_USE_THREAD_LOCAL_I_ SOL_OFF
+	#else
+		#define SOL_USE_THREAD_LOCAL_I_ SOL_ON
+	#endif
+#else
+	#define SOL_USE_THREAD_LOCAL_I_ SOL_DEFAULT_ON
+#endif // thread_local keyword is bjorked on some platforms
+
+#if defined(SOL_ALL_SAFETIES_ON)
+	#if SOL_ALL_SAFETIES_ON != 0
+		#define SOL_ALL_SAFETIES_ON_I_ SOL_ON
+	#else
+		#define SOL_ALL_SAFETIES_ON_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_ALL_SAFETIES_ON_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_SAFE_GETTER)
+	#if SOL_SAFE_GETTER != 0
+		#define SOL_SAFE_GETTER_I_ SOL_ON
+	#else
+		#define SOL_SAFE_GETTER_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON_I_)
+		#define SOL_SAFE_GETTER_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD_I_)
+		#define SOL_SAFE_GETTER_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_GETTER_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_USERTYPE)
+	#if SOL_SAFE_USERTYPE != 0
+		#define SOL_SAFE_USERTYPE_I_ SOL_ON
+	#else
+		#define SOL_SAFE_USERTYPE_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON_I_)
+		#define SOL_SAFE_USERTYPE_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD_I_)
+		#define SOL_SAFE_USERTYPE_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_USERTYPE_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_REFERENCES)
+	#if SOL_SAFE_REFERENCES != 0
+		#define SOL_SAFE_REFERENCES_I_ SOL_ON
+	#else
+		#define SOL_SAFE_REFERENCES_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON_I_)
+		#define SOL_SAFE_REFERENCES_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD_I_)
+		#define SOL_SAFE_REFERENCES_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_REFERENCES_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_FUNCTIONS)
+	#if SOL_SAFE_FUNCTIONS != 0
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_ON
+	#else
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_OFF
+	#endif
+#elif defined (SOL_SAFE_FUNCTION_OBJECTS)
+	#if SOL_SAFE_FUNCTION_OBJECTS != 0
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_ON
+	#else
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON_I_)
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD_I_)
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_FUNCTION_CALLS)
+	#if SOL_SAFE_FUNCTION_CALLS != 0
+		#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_ON
+	#else
+		#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON_I_)
+		#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD_I_)
+		#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_PROXIES)
+	#if SOL_SAFE_PROXIES != 0
+		#define SOL_SAFE_PROXIES_I_ SOL_ON
+	#else
+		#define SOL_SAFE_PROXIES_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON_I_)
+		#define SOL_SAFE_PROXIES_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD_I_)
+		#define SOL_SAFE_PROXIES_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_PROXIES_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_NUMERICS)
+	#if SOL_SAFE_NUMERICS != 0
+		#define SOL_SAFE_NUMERICS_I_ SOL_ON
+	#else
+		#define SOL_SAFE_NUMERICS_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON_I_)
+		#define SOL_SAFE_NUMERICS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD_I_)
+		#define SOL_SAFE_NUMERICS_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_NUMERICS_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_ALL_INTEGER_VALUES_FIT)
+	#if (SOL_ALL_INTEGER_VALUES_FIT != 0)
+		#define SOL_ALL_INTEGER_VALUES_FIT_I_ SOL_ON
+	#else
+		#define SOL_ALL_INTEGER_VALUES_FIT_I_ SOL_OFF
+	#endif
+#elif !SOL_IS_DEFAULT_OFF(SOL_SAFE_NUMERICS_I_) && SOL_IS_OFF(SOL_SAFE_NUMERICS_I_)
+	// if numerics is intentionally turned off, flip this on
+	#define SOL_ALL_INTEGER_VALUES_FIT_I_ SOL_DEFAULT_ON
+#else
+	// default to off
+	#define SOL_ALL_INTEGER_VALUES_FIT_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_SAFE_STACK_CHECK)
+	#if SOL_SAFE_STACK_CHECK != 0
+		#define SOL_SAFE_STACK_CHECK_I_ SOL_ON
+	#else
+		#define SOL_SAFE_STACK_CHECK_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON_I_)
+		#define SOL_SAFE_STACK_CHECK_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD_I_)
+		#define SOL_SAFE_STACK_CHECK_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_STACK_CHECK_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_NO_CHECK_NUMBER_PRECISION)
+	#if SOL_NO_CHECK_NUMBER_PRECISION != 0
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_OFF
+	#else
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_ON
+	#endif
+#elif defined(SOL_NO_CHECKING_NUMBER_PRECISION)
+	#if SOL_NO_CHECKING_NUMBER_PRECISION != 0
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_OFF
+	#else
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_ON
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON_I_)
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_SAFE_NUMERICS_I_)
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD_I_)
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_STRINGS_ARE_NUMBERS)
+	#if (SOL_STRINGS_ARE_NUMBERS != 0)
+		#define SOL_STRINGS_ARE_NUMBERS_I_ SOL_ON
+	#else
+		#define SOL_STRINGS_ARE_NUMBERS_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_STRINGS_ARE_NUMBERS_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_ENABLE_INTEROP)
+	#if SOL_ENABLE_INTEROP != 0
+		#define SOL_USE_INTEROP_I_ SOL_ON
+	#else
+		#define SOL_USE_INTEROP_I_ SOL_OFF
+	#endif
+#elif defined(SOL_USE_INTEROP)
+	#if SOL_USE_INTEROP != 0
+		#define SOL_USE_INTEROP_I_ SOL_ON
+	#else
+		#define SOL_USE_INTEROP_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_USE_INTEROP_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_NO_NIL)
+	#if (SOL_NO_NIL != 0)
+		#define SOL_NIL_I_ SOL_OFF
+	#else
+		#define SOL_NIL_I_ SOL_ON
+	#endif
+#elif defined(__MAC_OS_X_VERSION_MAX_ALLOWED) || defined(__OBJC__) || defined(nil)
+	#define SOL_NIL_I_ SOL_DEFAULT_OFF
+#else
+	#define SOL_NIL_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_USERTYPE_TYPE_BINDING_INFO)
+	#if (SOL_USERTYPE_TYPE_BINDING_INFO != 0)
+		#define SOL_USERTYPE_TYPE_BINDING_INFO_I_ SOL_ON
+	#else
+		#define SOL_USERTYPE_TYPE_BINDING_INFO_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_USERTYPE_TYPE_BINDING_INFO_I_ SOL_DEFAULT_ON
+#endif // We should generate a my_type.__type table with lots of class information for usertypes
+
+#if defined(SOL_AUTOMAGICAL_TYPES_BY_DEFAULT)
+	#if (SOL_AUTOMAGICAL_TYPES_BY_DEFAULT != 0)
+		#define SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_ SOL_ON
+	#else
+		#define SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_ SOL_OFF
+	#endif
+#elif defined(SOL_DEFAULT_AUTOMAGICAL_USERTYPES)
+	#if (SOL_DEFAULT_AUTOMAGICAL_USERTYPES != 0)
+		#define SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_ SOL_ON
+	#else
+		#define SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_ SOL_DEFAULT_ON
+#endif // make is_automagical on/off by default
+
+#if defined(SOL_STD_VARIANT)
+	#if (SOL_STD_VARIANT != 0)
+		#define SOL_STD_VARIANT_I_ SOL_ON
+	#else
+		#define SOL_STD_VARIANT_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_COMPILER_CLANG_I_) && SOL_IS_ON(SOL_PLATFORM_APPLE_I_)
+		#if defined(__has_include)
+			#if __has_include(<variant>)
+				#define SOL_STD_VARIANT_I_ SOL_DEFAULT_ON
+			#else
+				#define SOL_STD_VARIANT_I_ SOL_DEFAULT_OFF
+			#endif
+		#else
+			#define SOL_STD_VARIANT_I_ SOL_DEFAULT_OFF
+		#endif
+	#else
+		#define SOL_STD_VARIANT_I_ SOL_DEFAULT_ON
+	#endif
+#endif // make is_automagical on/off by default
+
+#if defined(SOL_NOEXCEPT_FUNCTION_TYPE)
+	#if (SOL_NOEXCEPT_FUNCTION_TYPE != 0)
+		#define SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_ SOL_ON
+	#else
+		#define SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_ SOL_OFF
+	#endif
+#else
+	#if defined(__cpp_noexcept_function_type)
+		#define SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_COMPILER_VCXX_I_) && (defined(_MSVC_LANG) && (_MSVC_LANG < 201403L))
+		// There is a bug in the VC++ compiler??
+		// on /std:c++latest under x86 conditions (VS 15.5.2),
+		// compiler errors are tossed for noexcept markings being on function types
+		// that are identical in every other way to their non-noexcept marked types function types...
+		// VS 2019: There is absolutely a bug.
+		#define SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_ SOL_OFF
+	#else
+		#define SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_ SOL_DEFAULT_ON
+	#endif
+#endif // noexcept is part of a function's type
+
+#if defined(SOL_STACK_STRING_OPTIMIZATION_SIZE) && SOL_STACK_STRING_OPTIMIZATION_SIZE > 0
+	#define SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_ SOL_STACK_STRING_OPTIMIZATION_SIZE
+#else
+	#define SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_ 1024
+#endif
+
+#if defined(SOL_ID_SIZE) && SOL_ID_SIZE > 0
+	#define SOL_ID_SIZE_I_ SOL_ID_SIZE
+#else
+	#define SOL_ID_SIZE_I_ 512
+#endif
+
+#if defined(LUA_IDSIZE) && LUA_IDSIZE > 0
+	#define SOL_FILE_ID_SIZE_I_ LUA_IDSIZE
+#elif defined(SOL_ID_SIZE) && SOL_ID_SIZE > 0
+	#define SOL_FILE_ID_SIZE_I_ SOL_FILE_ID_SIZE
+#else
+	#define SOL_FILE_ID_SIZE_I_ 2048
+#endif
+
+#if defined(SOL_PRINT_ERRORS)
+	#if (SOL_PRINT_ERRORS != 0)
+		#define SOL_PRINT_ERRORS_I_ SOL_ON
+	#else
+		#define SOL_PRINT_ERRORS_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON_I_)
+		#define SOL_PRINT_ERRORS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD_I_)
+		#define SOL_PRINT_ERRORS_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_PRINT_ERRORS_I_ SOL_OFF
+	#endif
+#endif
+
+#if defined(SOL_DEFAULT_PASS_ON_ERROR)
+	#if (SOL_DEFAULT_PASS_ON_ERROR != 0)
+		#define SOL_DEFAULT_PASS_ON_ERROR_I_ SOL_ON
+	#else
+		#define SOL_DEFAULT_PASS_ON_ERROR_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_DEFAULT_PASS_ON_ERROR_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_USING_CXX_LUA)
+	#if (SOL_USING_CXX_LUA != 0)
+		#define SOL_USE_CXX_LUA_I_ SOL_ON
+	#else
+		#define SOL_USE_CXX_LUA_I_ SOL_OFF
+	#endif
+#elif defined(SOL_USE_CXX_LUA)
+	#if (SOL_USE_CXX_LUA != 0)
+		#define SOL_USE_CXX_LUA_I_ SOL_ON
+	#else
+		#define SOL_USE_CXX_LUA_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_USE_CXX_LUA_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_USING_CXX_LUAJIT)
+	#if (SOL_USING_CXX_LUA != 0)
+		#define SOL_USE_CXX_LUAJIT_I_ SOL_ON
+	#else
+		#define SOL_USE_CXX_LUAJIT_I_ SOL_OFF
+	#endif
+#elif defined(SOL_USE_CXX_LUAJIT)
+	#if (SOL_USE_CXX_LUA != 0)
+		#define SOL_USE_CXX_LUAJIT_I_ SOL_ON
+	#else
+		#define SOL_USE_CXX_LUAJIT_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_USE_CXX_LUAJIT_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_NO_LUA_HPP)
+	#if (SOL_NO_LUA_HPP != 0)
+		#define SOL_USE_LUA_HPP_I_ SOL_OFF
+	#else
+		#define SOL_USE_LUA_HPP_I_ SOL_ON
+	#endif
+#elif defined(SOL_USING_CXX_LUA)
+	#define SOL_USE_LUA_HPP_I_ SOL_OFF
+#elif defined(__has_include)
+	#if __has_include(<lua.hpp>)
+		#define SOL_USE_LUA_HPP_I_ SOL_ON
+	#else
+		#define SOL_USE_LUA_HPP_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_USE_LUA_HPP_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_CONTAINERS_START)
+	#define SOL_CONTAINER_START_INDEX_I_ SOL_CONTAINERS_START
+#elif defined(SOL_CONTAINERS_START_INDEX)
+	#define SOL_CONTAINER_START_INDEX_I_ SOL_CONTAINERS_START_INDEX
+#elif defined(SOL_CONTAINER_START_INDEX)
+	#define SOL_CONTAINER_START_INDEX_I_ SOL_CONTAINER_START_INDEX
+#else
+	#define SOL_CONTAINER_START_INDEX_I_ 1
+#endif
+
+#if defined (SOL_NO_MEMORY_ALIGNMENT)
+	#if (SOL_NO_MEMORY_ALIGNMENT != 0)
+		#define SOL_ALIGN_MEMORY_I_ SOL_OFF
+	#else
+		#define SOL_ALIGN_MEMORY_I_ SOL_ON
+	#endif
+#else
+	#define SOL_ALIGN_MEMORY_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_USE_BOOST)
+	#if (SOL_USE_BOOST != 0)
+		#define SOL_USE_BOOST_I_ SOL_ON
+	#else
+		#define SOL_USE_BOOST_I_ SOL_OFF
+	#endif
+#else
+		#define SOL_USE_BOOST_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_USE_UNSAFE_BASE_LOOKUP)
+	#if (SOL_USE_UNSAFE_BASE_LOOKUP != 0)
+		#define SOL_USE_UNSAFE_BASE_LOOKUP_I_ SOL_ON
+	#else
+		#define SOL_USE_UNSAFE_BASE_LOOKUP_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_USE_UNSAFE_BASE_LOOKUP_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_INSIDE_UNREAL)
+	#if (SOL_INSIDE_UNREAL != 0)
+		#define SOL_INSIDE_UNREAL_ENGINE_I_ SOL_ON
+	#else
+		#define SOL_INSIDE_UNREAL_ENGINE_I_ SOL_OFF
+	#endif
+#else
+	#if defined(UE_BUILD_DEBUG) || defined(UE_BUILD_DEVELOPMENT) || defined(UE_BUILD_TEST) || defined(UE_BUILD_SHIPPING) || defined(UE_SERVER)
+		#define SOL_INSIDE_UNREAL_ENGINE_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_INSIDE_UNREAL_ENGINE_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_NO_COMPAT)
+	#if (SOL_NO_COMPAT != 0)
+		#define SOL_USE_COMPATIBILITY_LAYER_I_ SOL_OFF
+	#else
+		#define SOL_USE_COMPATIBILITY_LAYER_I_ SOL_ON
+	#endif
+#else
+	#define SOL_USE_COMPATIBILITY_LAYER_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_GET_FUNCTION_POINTER_UNSAFE)
+	#if (SOL_GET_FUNCTION_POINTER_UNSAFE != 0)
+		#define SOL_GET_FUNCTION_POINTER_UNSAFE_I_ SOL_ON
+	#else
+		#define SOL_GET_FUNCTION_POINTER_UNSAFE_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_GET_FUNCTION_POINTER_UNSAFE_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_FUNCTION_CALL_VALUE_SEMANTICS)
+	#if (SOL_FUNCTION_CALL_VALUE_SEMANTICS != 0)
+		#define SOL_FUNCTION_CALL_VALUE_SEMANTICS_I_ SOL_ON
+	#else
+		#define SOL_FUNCTION_CALL_VALUE_SEMANTICS_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_FUNCTION_CALL_VALUE_SEMANTICS_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_MINGW_CCTYPE_IS_POISONED)
+	#if (SOL_MINGW_CCTYPE_IS_POISONED != 0)
+		#define SOL_MINGW_CCTYPE_IS_POISONED_I_ SOL_ON
+	#else
+		#define SOL_MINGW_CCTYPE_IS_POISONED_I_ SOL_OFF
+	#endif
+#elif SOL_IS_ON(SOL_COMPILER_MINGW_I_) && defined(__GNUC__) && (__GNUC__ < 6)
+	// MinGW is off its rocker in some places...
+	#define SOL_MINGW_CCTYPE_IS_POISONED_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_MINGW_CCTYPE_IS_POISONED_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_CHAR8_T)
+	#if (SOL_CHAR8_T != 0)
+		#define SOL_CHAR8_T_I_ SOL_ON
+	#else
+		#define SOL_CHAR8_T_I_ SOL_OFF
+	#endif
+#else
+	#if defined(__cpp_char8_t)
+		#define SOL_CHAR8_T_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_CHAR8_T_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if SOL_IS_ON(SOL_USE_BOOST_I_)
+	#include <boost/version.hpp>
+
+	#if BOOST_VERSION >= 107500 // Since Boost 1.75.0 boost::none is constexpr
+		#define SOL_BOOST_NONE_CONSTEXPR_I_ constexpr
+	#else
+		#define SOL_BOOST_NONE_CONSTEXPR_I_ const
+	#endif // BOOST_VERSION
+#else
+	// assume boost isn't using a garbage version
+	#define SOL_BOOST_NONE_CONSTEXPR_I_ constexpr
+#endif
+
+#if defined(SOL2_CI)
+	#if (SOL2_CI != 0)
+		#define SOL2_CI_I_ SOL_ON
+	#else
+		#define SOL2_CI_I_ SOL_OFF
+	#endif
+#else
+	#define SOL2_CI_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_C_ASSERT)
+	#define SOL_USER_C_ASSERT_I_ SOL_ON
+#else
+	#define SOL_USER_C_ASSERT_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_M_ASSERT)
+	#define SOL_USER_M_ASSERT_I_ SOL_ON
+#else
+	#define SOL_USER_M_ASSERT_I_ SOL_DEFAULT_OFF
+#endif
+
+#include <sol/prologue.hpp>
+#include <sol/epilogue.hpp>
+
+// clang-format on
+
+#include <sol/detail/build_version.hpp>
+
+#endif // SOL_VERSION_HPP
diff --git a/extern/sol3/sol/wrapper.hpp b/extern/sol3/sol/wrapper.hpp
new file mode 100644
index 0000000000..608ed589a5
--- /dev/null
+++ b/extern/sol3/sol/wrapper.hpp
@@ -0,0 +1,280 @@
+// sol2
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SOL_WRAPPER_HPP
+#define SOL_WRAPPER_HPP
+
+#include <sol/types.hpp>
+
+namespace sol {
+
+	namespace detail {
+		template <typename T>
+		using array_return_type = meta::conditional_t<std::is_array<T>::value, std::add_lvalue_reference_t<T>, T>;
+	}
+
+	template <typename F, typename = void>
+	struct wrapper {
+		typedef lua_bind_traits<meta::unqualified_t<F>> traits_type;
+		typedef typename traits_type::args_list args_list;
+		typedef typename traits_type::args_list free_args_list;
+		typedef typename traits_type::returns_list returns_list;
+
+		template <typename... Args>
+		static decltype(auto) call(F& f, Args&&... args) {
+			return f(std::forward<Args>(args)...);
+		}
+
+		struct caller {
+			template <typename... Args>
+			decltype(auto) operator()(F& fx, Args&&... args) const {
+				return call(fx, std::forward<Args>(args)...);
+			}
+		};
+	};
+
+	template <typename F>
+	struct wrapper<F, std::enable_if_t<std::is_function<std::remove_pointer_t<meta::unqualified_t<F>>>::value>> {
+		typedef lua_bind_traits<std::remove_pointer_t<meta::unqualified_t<F>>> traits_type;
+		typedef typename traits_type::args_list args_list;
+		typedef typename traits_type::args_list free_args_list;
+		typedef typename traits_type::returns_list returns_list;
+
+		template <F fx, typename... Args>
+		static decltype(auto) invoke(Args&&... args) {
+			return fx(std::forward<Args>(args)...);
+		}
+
+		template <typename... Args>
+		static decltype(auto) call(F& fx, Args&&... args) {
+			return fx(std::forward<Args>(args)...);
+		}
+
+		struct caller {
+			template <typename... Args>
+			decltype(auto) operator()(F& fx, Args&&... args) const {
+				return call(fx, std::forward<Args>(args)...);
+			}
+		};
+
+		template <F fx>
+		struct invoker {
+			template <typename... Args>
+			decltype(auto) operator()(Args&&... args) const {
+				return invoke<fx>(std::forward<Args>(args)...);
+			}
+		};
+	};
+
+	template <typename F>
+	struct wrapper<F, std::enable_if_t<std::is_member_object_pointer<meta::unqualified_t<F>>::value>> {
+		typedef lua_bind_traits<meta::unqualified_t<F>> traits_type;
+		typedef typename traits_type::object_type object_type;
+		typedef typename traits_type::return_type return_type;
+		typedef typename traits_type::args_list args_list;
+		typedef types<object_type&, return_type> free_args_list;
+		typedef typename traits_type::returns_list returns_list;
+
+		template <F fx>
+		static auto call(object_type& mem) -> detail::array_return_type<decltype(mem.*fx)> {
+			return mem.*fx;
+		}
+
+		template <F fx, typename Arg, typename... Args>
+		static decltype(auto) invoke(object_type& mem, Arg&& arg, Args&&...) {
+			return mem.*fx = std::forward<Arg>(arg);
+		}
+
+		template <typename Fx>
+		static auto call(Fx&& fx, object_type& mem) -> detail::array_return_type<decltype(mem.*fx)> {
+			return mem.*fx;
+		}
+
+		template <typename Fx, typename Arg, typename... Args>
+		static void call(Fx&& fx, object_type& mem, Arg&& arg, Args&&...) {
+			using actual_type = meta::unqualified_t<detail::array_return_type<decltype(mem.*fx)>>;
+			if constexpr (std::is_array_v<actual_type>) {
+				using std::cbegin;
+				using std::cend;
+				auto first = cbegin(arg);
+				auto last = cend(arg);
+				for (std::size_t i = 0; first != last; ++i, ++first) {
+					(mem.*fx)[i] = *first;
+				}
+			}
+			else {
+				(mem.*fx) = std::forward<Arg>(arg);
+			}
+		}
+
+		struct caller {
+			template <typename Fx, typename... Args>
+			decltype(auto) operator()(Fx&& fx, object_type& mem, Args&&... args) const {
+				return call(std::forward<Fx>(fx), mem, std::forward<Args>(args)...);
+			}
+		};
+
+		template <F fx>
+		struct invoker {
+			template <typename... Args>
+			decltype(auto) operator()(Args&&... args) const {
+				return invoke<fx>(std::forward<Args>(args)...);
+			}
+		};
+	};
+
+	template <typename F, typename R, typename O, typename... FArgs>
+	struct member_function_wrapper {
+		typedef O object_type;
+		typedef lua_bind_traits<F> traits_type;
+		typedef typename traits_type::args_list args_list;
+		typedef types<object_type&, FArgs...> free_args_list;
+		typedef meta::tuple_types<R> returns_list;
+
+		template <F fx, typename... Args>
+		static R invoke(O& mem, Args&&... args) {
+			return (mem.*fx)(std::forward<Args>(args)...);
+		}
+
+		template <typename Fx, typename... Args>
+		static R call(Fx&& fx, O& mem, Args&&... args) {
+			return (mem.*fx)(std::forward<Args>(args)...);
+		}
+
+		struct caller {
+			template <typename Fx, typename... Args>
+			decltype(auto) operator()(Fx&& fx, O& mem, Args&&... args) const {
+				return call(std::forward<Fx>(fx), mem, std::forward<Args>(args)...);
+			}
+		};
+
+		template <F fx>
+		struct invoker {
+			template <typename... Args>
+			decltype(auto) operator()(O& mem, Args&&... args) const {
+				return invoke<fx>(mem, std::forward<Args>(args)...);
+			}
+		};
+	};
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...)> : public member_function_wrapper<R (O::*)(Args...), R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const> : public member_function_wrapper<R (O::*)(Args...) const, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const volatile> : public member_function_wrapper<R (O::*)(Args...) const volatile, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...)&> : public member_function_wrapper<R (O::*)(Args...)&, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const&> : public member_function_wrapper<R (O::*)(Args...) const&, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const volatile&> : public member_function_wrapper<R (O::*)(Args...) const volatile&, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...)&> : public member_function_wrapper<R (O::*)(Args..., ...)&, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) const&> : public member_function_wrapper<R (O::*)(Args..., ...) const&, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) const volatile&> : public member_function_wrapper<R (O::*)(Args..., ...) const volatile&, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) &&> : public member_function_wrapper<R (O::*)(Args...)&, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const&&> : public member_function_wrapper<R (O::*)(Args...) const&, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const volatile&&> : public member_function_wrapper<R (O::*)(Args...) const volatile&, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) &&> : public member_function_wrapper<R (O::*)(Args..., ...)&, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) const&&> : public member_function_wrapper<R (O::*)(Args..., ...) const&, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) const volatile&&> : public member_function_wrapper<R (O::*)(Args..., ...) const volatile&, R, O, Args...> { };
+
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_)
+	// noexcept has become a part of a function's type
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) noexcept> : public member_function_wrapper<R (O::*)(Args...) noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const noexcept> : public member_function_wrapper<R (O::*)(Args...) const noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const volatile noexcept> : public member_function_wrapper<R (O::*)(Args...) const volatile noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...)& noexcept> : public member_function_wrapper<R (O::*)(Args...)& noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const& noexcept> : public member_function_wrapper<R (O::*)(Args...) const& noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const volatile& noexcept> : public member_function_wrapper<R (O::*)(Args...) const volatile& noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...)& noexcept> : public member_function_wrapper<R (O::*)(Args..., ...)& noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) const& noexcept> : public member_function_wrapper<R (O::*)(Args..., ...) const& noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) const volatile& noexcept>
+	: public member_function_wrapper<R (O::*)(Args..., ...) const volatile& noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...)&& noexcept> : public member_function_wrapper<R (O::*)(Args...)& noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const&& noexcept> : public member_function_wrapper<R (O::*)(Args...) const& noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const volatile&& noexcept> : public member_function_wrapper<R (O::*)(Args...) const volatile& noexcept, R, O, Args...> {
+	};
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...)&& noexcept> : public member_function_wrapper<R (O::*)(Args..., ...)& noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) const&& noexcept> : public member_function_wrapper<R (O::*)(Args..., ...) const& noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) const volatile&& noexcept>
+	: public member_function_wrapper<R (O::*)(Args..., ...) const volatile& noexcept, R, O, Args...> { };
+
+#endif // noexcept is part of a function's type
+
+} // namespace sol
+
+#endif // SOL_WRAPPER_HPP

From 72fdf40e06ffa6a7feb3ebb2509b75b8cddbea7b Mon Sep 17 00:00:00 2001
From: cody glassman <glassmancody.info@gmail.com>
Date: Sun, 15 May 2022 13:41:52 -0700
Subject: [PATCH 2439/2859] better support for particle arrays when spawning at
 node positions

---
 components/nif/node.hpp         |  1 +
 components/nifosg/nifloader.cpp | 22 +++++++++-
 components/nifosg/particle.cpp  | 78 +++++++++++++++++++++++++++++----
 components/nifosg/particle.hpp  |  6 +--
 4 files changed, 93 insertions(+), 14 deletions(-)

diff --git a/components/nif/node.hpp b/components/nif/node.hpp
index b63fc03804..a776bd40bc 100644
--- a/components/nif/node.hpp
+++ b/components/nif/node.hpp
@@ -212,6 +212,7 @@ struct NiNode : Node
         ControllerFlag_Active = 0x8
     };
     enum BSPArrayController {
+        BSPArrayController_AtNode = 0x8,
         BSPArrayController_AtVertex = 0x10
     };
 
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 17bd381a3d..a9c2449e56 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -50,6 +50,21 @@
 
 namespace
 {
+    struct DisableOptimizer : osg::NodeVisitor
+    {
+        DisableOptimizer(osg::NodeVisitor::TraversalMode mode = TRAVERSE_ALL_CHILDREN) : osg::NodeVisitor(mode) {}
+
+        void apply(osg::Node &node) override
+        {
+            node.setDataVariance(osg::Object::DYNAMIC);
+            traverse(node);
+        }
+
+        void apply(osg::Drawable &node) override
+        {
+            traverse(node);
+        }
+    };
 
     void getAllNiNodes(const Nif::Node* node, std::vector<int>& outIndices)
     {
@@ -1072,10 +1087,10 @@ namespace NifOsg
                                                            partctrl->verticalDir, partctrl->verticalAngle,
                                                            partctrl->lifetime, partctrl->lifetimeRandom);
             emitter->setShooter(shooter);
+            emitter->setFlags(partctrl->flags);
 
-            if (atVertex && (partctrl->recType == Nif::RC_NiBSPArrayController))
+            if (partctrl->recType == Nif::RC_NiBSPArrayController && atVertex)
             {
-                emitter->setUseGeometryEmitter(true);
                 emitter->setGeometryEmitterTarget(partctrl->emitter->recIndex);
             }
             else
@@ -1107,6 +1122,9 @@ namespace NifOsg
                 // Emitter attached to the emitter node. Note one side effect of the emitter using the CullVisitor is that hiding its node
                 // actually causes the emitter to stop firing. Convenient, because MW behaves this way too!
                 emitterNode->addChild(emitterPair.second);
+
+                DisableOptimizer disableOptimizer;
+                emitterNode->accept(disableOptimizer);
             }
             mEmitterQueue.clear();
         }
diff --git a/components/nifosg/particle.cpp b/components/nifosg/particle.cpp
index 3b66a956e8..88e6e1f4c8 100644
--- a/components/nifosg/particle.cpp
+++ b/components/nifosg/particle.cpp
@@ -1,6 +1,7 @@
 #include "particle.hpp"
 
 #include <limits>
+#include <optional>
 
 #include <osg/Version>
 #include <osg/MatrixTransform>
@@ -11,6 +12,7 @@
 #include <components/misc/rng.hpp>
 #include <components/nif/controlled.hpp>
 #include <components/nif/data.hpp>
+#include <components/nif/node.hpp>
 #include <components/sceneutil/morphgeometry.hpp>
 #include <components/sceneutil/riggeometry.hpp>
 
@@ -56,6 +58,44 @@ namespace
 
         osg::Geometry* mGeometry;
     };
+
+    class LocalToWorldAccumulator : public osg::NodeVisitor
+    {
+    public:
+        LocalToWorldAccumulator(osg::Matrix& matrix) : osg::NodeVisitor(), mMatrix(matrix) {}
+
+        virtual void apply(osg::Transform& transform)
+        {
+            if (&transform != mLastAppliedTransform)
+            {
+                mLastAppliedTransform = &transform;
+                mLastMatrix = mMatrix;
+            }
+            transform.computeLocalToWorldMatrix(mMatrix, this);
+        }
+
+        void accumulate(const osg::NodePath& path)
+        {
+            if (path.empty())
+                return;
+
+            size_t i = path.size();
+
+            for (auto rit = path.rbegin(); rit != path.rend(); rit++, --i)
+            {
+                const osg::Camera* camera = (*rit)->asCamera();
+                if (camera && (camera->getReferenceFrame() != osg::Transform::RELATIVE_RF || camera->getParents().empty()))
+                    break;
+            }
+
+            for(; i < path.size(); ++i)
+                path[i]->accept(*this);
+        }
+
+        osg::Matrix& mMatrix;
+        std::optional<osg::Matrix> mLastMatrix;
+        osg::Transform* mLastAppliedTransform = nullptr;
+    };
 }
 
 namespace NifOsg
@@ -310,7 +350,7 @@ void GravityAffector::operate(osgParticle::Particle *particle, double dt)
 
 Emitter::Emitter()
     : osgParticle::Emitter()
-    , mUseGeometryEmitter(false)
+    , mFlags(0)
     , mGeometryEmitterTarget(std::nullopt)
 {
 }
@@ -322,7 +362,7 @@ Emitter::Emitter(const Emitter &copy, const osg::CopyOp &copyop)
     , mShooter(copy.mShooter)
     // need a deep copy because the remainder is stored in the object
     , mCounter(static_cast<osgParticle::Counter*>(copy.mCounter->clone(osg::CopyOp::DEEP_COPY_ALL)))
-    , mUseGeometryEmitter(copy.mUseGeometryEmitter)
+    , mFlags(copy.mFlags)
     , mGeometryEmitterTarget(copy.mGeometryEmitterTarget)
     , mCachedGeometryEmitter(copy.mCachedGeometryEmitter)
 {
@@ -330,7 +370,7 @@ Emitter::Emitter(const Emitter &copy, const osg::CopyOp &copyop)
 
 Emitter::Emitter(const std::vector<int> &targets)
     : mTargets(targets)
-    , mUseGeometryEmitter(false)
+    , mFlags(0)
     , mGeometryEmitterTarget(std::nullopt)
 {
 }
@@ -356,11 +396,13 @@ void Emitter::emitParticles(double dt)
 
     osg::ref_ptr<osg::Vec3Array> geometryVertices = nullptr;
 
-    if (mUseGeometryEmitter || !mTargets.empty())
+    const bool useGeometryEmitter = mFlags & Nif::NiNode::BSPArrayController_AtVertex;
+
+    if (useGeometryEmitter || !mTargets.empty())
     {
         int recIndex;
 
-        if (mUseGeometryEmitter)
+        if (useGeometryEmitter)
         {
             if (!mGeometryEmitterTarget.has_value())
                 return;
@@ -383,7 +425,7 @@ void Emitter::emitParticles(double dt)
             return;
         }
 
-        if (mUseGeometryEmitter)
+        if (useGeometryEmitter)
         {
             if (!mCachedGeometryEmitter.lock(geometryVertices))
             {
@@ -403,12 +445,30 @@ void Emitter::emitParticles(double dt)
 
         osg::NodePath path = visitor.mFoundPath;
         path.erase(path.begin());
-        emitterToPs = osg::computeLocalToWorld(path) * emitterToPs;
+        if (!useGeometryEmitter && (mFlags & Nif::NiNode::BSPArrayController_AtNode) && path.size())
+        {
+            osg::Matrix current;
+
+            LocalToWorldAccumulator accum(current);
+            accum.accumulate(path);
+
+            osg::Matrix parent = accum.mLastMatrix.value_or(current);
+
+            auto p1 = parent.getTrans();
+            auto p2 = current.getTrans();
+            current.setTrans((p2 - p1) * Misc::Rng::rollClosedProbability() + p1);
+
+            emitterToPs = current * emitterToPs;
+        }
+        else
+        {
+            emitterToPs = osg::computeLocalToWorld(path) * emitterToPs;
+        }
     }
 
     emitterToPs.orthoNormalize(emitterToPs);
 
-    if (mUseGeometryEmitter && (!geometryVertices.valid() || geometryVertices->empty()))
+    if (useGeometryEmitter && (!geometryVertices.valid() || geometryVertices->empty()))
         return;
 
     for (int i=0; i<n; ++i)
@@ -416,7 +476,7 @@ void Emitter::emitParticles(double dt)
         osgParticle::Particle* P = getParticleSystem()->createParticle(nullptr);
         if (P)
         {
-            if (mUseGeometryEmitter)
+            if (useGeometryEmitter)
                 P->setPosition((*geometryVertices)[Misc::Rng::rollDice(geometryVertices->getNumElements())]);
             else if (mPlacer)
                 mPlacer->place(P);
diff --git a/components/nifosg/particle.hpp b/components/nifosg/particle.hpp
index 155d35ad2c..34e6a4308d 100644
--- a/components/nifosg/particle.hpp
+++ b/components/nifosg/particle.hpp
@@ -241,9 +241,8 @@ namespace NifOsg
         void setShooter(osgParticle::Shooter* shooter) { mShooter = shooter; }
         void setPlacer(osgParticle::Placer* placer) { mPlacer = placer; }
         void setCounter(osgParticle::Counter* counter) { mCounter = counter;}
-
-        void setUseGeometryEmitter(bool useGeometryEmitter) { mUseGeometryEmitter = useGeometryEmitter; }
         void setGeometryEmitterTarget(std::optional<int> recIndex) { mGeometryEmitterTarget = recIndex; }
+        void setFlags(int flags) { mFlags = flags; }
 
     private:
         // NIF Record indices
@@ -253,7 +252,8 @@ namespace NifOsg
         osg::ref_ptr<osgParticle::Shooter> mShooter;
         osg::ref_ptr<osgParticle::Counter> mCounter;
 
-        bool mUseGeometryEmitter;
+        int mFlags;
+
         std::optional<int> mGeometryEmitterTarget;
         osg::observer_ptr<osg::Vec3Array> mCachedGeometryEmitter;
     };

From 7ccbf95503390af8bb72978854b29226b2341941 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Mon, 16 May 2022 00:16:26 +0200
Subject: [PATCH 2440/2859] [Lua] makeStrictReadOnly for enums

---
 apps/openmw/mwlua/camerabindings.cpp |  2 +-
 apps/openmw/mwlua/inputbindings.cpp  | 10 +++++-----
 apps/openmw/mwlua/nearbybindings.cpp |  2 +-
 apps/openmw/mwlua/types/actor.cpp    |  4 ++--
 apps/openmw/mwlua/types/weapon.cpp   |  2 +-
 apps/openmw/mwlua/uibindings.cpp     |  6 +++---
 components/lua/luastate.cpp          | 24 +++++++++++++++++++-----
 components/lua/luastate.hpp          |  4 +++-
 components/lua/utilpackage.cpp       |  3 ++-
 files/lua_api/openmw/util.lua        |  6 ++++++
 10 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/apps/openmw/mwlua/camerabindings.cpp b/apps/openmw/mwlua/camerabindings.cpp
index 32abb8babe..b45c4e30c6 100644
--- a/apps/openmw/mwlua/camerabindings.cpp
+++ b/apps/openmw/mwlua/camerabindings.cpp
@@ -17,7 +17,7 @@ namespace MWLua
         MWRender::RenderingManager* renderingManager = MWBase::Environment::get().getWorld()->getRenderingManager();
 
         sol::table api(context.mLua->sol(), sol::create);
-        api["MODE"] = LuaUtil::makeReadOnly(context.mLua->sol().create_table_with(
+        api["MODE"] = LuaUtil::makeStrictReadOnly(context.mLua->sol().create_table_with(
             "Static", CameraMode::Static,
             "FirstPerson", CameraMode::FirstPerson,
             "ThirdPerson", CameraMode::ThirdPerson,
diff --git a/apps/openmw/mwlua/inputbindings.cpp b/apps/openmw/mwlua/inputbindings.cpp
index 1be6e086fa..8078af2e49 100644
--- a/apps/openmw/mwlua/inputbindings.cpp
+++ b/apps/openmw/mwlua/inputbindings.cpp
@@ -87,7 +87,7 @@ namespace MWLua
             return SDL_GetKeyName(SDL_GetKeyFromScancode(code));
         };
 
-        api["ACTION"] = LuaUtil::makeReadOnly(context.mLua->tableFromPairs<std::string_view, MWInput::Actions>({
+        api["ACTION"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, MWInput::Actions>({
             {"GameMenu", MWInput::A_GameMenu},
             {"Screenshot", MWInput::A_Screenshot},
             {"Inventory", MWInput::A_Inventory},
@@ -141,7 +141,7 @@ namespace MWLua
             {"ZoomOut", MWInput::A_ZoomOut}
         }));
 
-        api["CONTROL_SWITCH"] = LuaUtil::makeReadOnly(context.mLua->tableFromPairs<std::string_view, std::string_view>({
+        api["CONTROL_SWITCH"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, std::string_view>({
             {"Controls", "playercontrols"},
             {"Fighting", "playerfighting"},
             {"Jumping", "playerjumping"},
@@ -151,7 +151,7 @@ namespace MWLua
             {"VanityMode", "vanitymode"}
         }));
 
-        api["CONTROLLER_BUTTON"] = LuaUtil::makeReadOnly(context.mLua->tableFromPairs<std::string_view, SDL_GameControllerButton>({
+        api["CONTROLLER_BUTTON"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, SDL_GameControllerButton>({
             {"A", SDL_CONTROLLER_BUTTON_A},
             {"B", SDL_CONTROLLER_BUTTON_B},
             {"X", SDL_CONTROLLER_BUTTON_X},
@@ -169,7 +169,7 @@ namespace MWLua
             {"DPadRight", SDL_CONTROLLER_BUTTON_DPAD_RIGHT}
         }));
 
-        api["CONTROLLER_AXIS"] = LuaUtil::makeReadOnly(context.mLua->tableFromPairs<std::string_view, int>({
+        api["CONTROLLER_AXIS"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, int>({
             {"LeftX", SDL_CONTROLLER_AXIS_LEFTX},
             {"LeftY", SDL_CONTROLLER_AXIS_LEFTY},
             {"RightX", SDL_CONTROLLER_AXIS_RIGHTX},
@@ -183,7 +183,7 @@ namespace MWLua
             {"MoveLeftRight", SDL_CONTROLLER_AXIS_MAX + static_cast<int>(MWInput::A_MoveLeftRight)}
         }));
 
-        api["KEY"] = LuaUtil::makeReadOnly(context.mLua->tableFromPairs<std::string_view, SDL_Scancode>({
+        api["KEY"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, SDL_Scancode>({
             {"_0", SDL_SCANCODE_0},
             {"_1", SDL_SCANCODE_1},
             {"_2", SDL_SCANCODE_2},
diff --git a/apps/openmw/mwlua/nearbybindings.cpp b/apps/openmw/mwlua/nearbybindings.cpp
index cf1458c883..3ad9baac61 100644
--- a/apps/openmw/mwlua/nearbybindings.cpp
+++ b/apps/openmw/mwlua/nearbybindings.cpp
@@ -47,7 +47,7 @@ namespace MWLua
                 return LObject(getId(r.mHitObject), worldView->getObjectRegistry());
         });
 
-        api["COLLISION_TYPE"] = LuaUtil::makeReadOnly(context.mLua->tableFromPairs<std::string_view, MWPhysics::CollisionType>({
+        api["COLLISION_TYPE"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, MWPhysics::CollisionType>({
             {"World", MWPhysics::CollisionType_World},
             {"Door", MWPhysics::CollisionType_Door},
             {"Actor", MWPhysics::CollisionType_Actor},
diff --git a/apps/openmw/mwlua/types/actor.cpp b/apps/openmw/mwlua/types/actor.cpp
index 98ff5148d5..2a272ef862 100644
--- a/apps/openmw/mwlua/types/actor.cpp
+++ b/apps/openmw/mwlua/types/actor.cpp
@@ -113,12 +113,12 @@ namespace MWLua
 
     void addActorBindings(sol::table actor, const Context& context)
     {
-        actor["STANCE"] = LuaUtil::makeReadOnly(context.mLua->tableFromPairs<std::string_view, int>({
+        actor["STANCE"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, int>({
             {"Nothing", MWMechanics::DrawState_Nothing},
             {"Weapon", MWMechanics::DrawState_Weapon},
             {"Spell", MWMechanics::DrawState_Spell},
         }));
-        actor["EQUIPMENT_SLOT"] = LuaUtil::makeReadOnly(context.mLua->tableFromPairs<std::string_view, int>({
+        actor["EQUIPMENT_SLOT"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, int>({
             {"Helmet", MWWorld::InventoryStore::Slot_Helmet},
             {"Cuirass", MWWorld::InventoryStore::Slot_Cuirass},
             {"Greaves", MWWorld::InventoryStore::Slot_Greaves},
diff --git a/apps/openmw/mwlua/types/weapon.cpp b/apps/openmw/mwlua/types/weapon.cpp
index 3b6265697e..87ae984cf9 100644
--- a/apps/openmw/mwlua/types/weapon.cpp
+++ b/apps/openmw/mwlua/types/weapon.cpp
@@ -16,7 +16,7 @@ namespace MWLua
 {
     void addWeaponBindings(sol::table weapon, const Context& context)
     {
-        weapon["TYPE"] = LuaUtil::makeReadOnly(context.mLua->tableFromPairs<std::string_view, int>({
+        weapon["TYPE"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, int>({
             {"ShortBladeOneHand", ESM::Weapon::ShortBladeOneHand},
             {"LongBladeOneHand", ESM::Weapon::LongBladeOneHand},
             {"LongBladeTwoHand", ESM::Weapon::LongBladeTwoHand},
diff --git a/apps/openmw/mwlua/uibindings.cpp b/apps/openmw/mwlua/uibindings.cpp
index b66aa35368..eec6509034 100644
--- a/apps/openmw/mwlua/uibindings.cpp
+++ b/apps/openmw/mwlua/uibindings.cpp
@@ -183,7 +183,7 @@ namespace MWLua
         {
             luaManager->addUIMessage(message);
         };
-        api["CONSOLE_COLOR"] = LuaUtil::makeReadOnly(context.mLua->tableFromPairs<std::string, Misc::Color>({
+        api["CONSOLE_COLOR"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string, Misc::Color>({
             {"Default", Misc::Color::fromHex(MWBase::WindowManager::sConsoleColor_Default.substr(1))},
             {"Error", Misc::Color::fromHex(MWBase::WindowManager::sConsoleColor_Error.substr(1))},
             {"Success", Misc::Color::fromHex(MWBase::WindowManager::sConsoleColor_Success.substr(1))},
@@ -298,9 +298,9 @@ namespace MWLua
         sol::table typeTable = context.mLua->newTable();
         for (const auto& it : LuaUi::widgetTypeToName())
             typeTable.set(it.second, it.first);
-        api["TYPE"] = LuaUtil::makeReadOnly(typeTable);
+        api["TYPE"] = LuaUtil::makeStrictReadOnly(typeTable);
 
-        api["ALIGNMENT"] = LuaUtil::makeReadOnly(context.mLua->tableFromPairs<std::string_view, LuaUi::Alignment>({
+        api["ALIGNMENT"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, LuaUi::Alignment>({
             { "Start", LuaUi::Alignment::Start },
             { "Center", LuaUi::Alignment::Center },
             { "End", LuaUi::Alignment::End }
diff --git a/components/lua/luastate.cpp b/components/lua/luastate.cpp
index ac32f12992..4056fb59f9 100644
--- a/components/lua/luastate.cpp
+++ b/components/lua/luastate.cpp
@@ -84,12 +84,22 @@ namespace LuaUtil
             end
             printGen = function(name) return function(...) return printToLog(name, ...) end end
 
+            function createStrictIndexFn(tbl)
+                return function(_, key)
+                    local res = tbl[key]
+                    if res ~= nil then
+                        return res
+                    else
+                        error('Key not found: '..tostring(key), 2)
+                    end
+                end
+            end
             function pairsForReadOnly(v)
-                local nextFn, t, firstKey = pairs(getmetatable(v).__index)
+                local nextFn, t, firstKey = pairs(getmetatable(v).t)
                 return function(_, k) return nextFn(t, k) end, v, firstKey
             end
             function ipairsForReadOnly(v)
-                local nextFn, t, firstKey = ipairs(getmetatable(v).__index)
+                local nextFn, t, firstKey = ipairs(getmetatable(v).t)
                 return function(_, k) return nextFn(t, k) end, v, firstKey
             end
             local function nextForArray(array, index)
@@ -136,7 +146,7 @@ namespace LuaUtil
         mSandboxEnv = sol::nil;
     }
 
-    sol::table makeReadOnly(sol::table table)
+    sol::table makeReadOnly(const sol::table& table, bool strictIndex)
     {
         if (table == sol::nil)
             return table;
@@ -146,7 +156,11 @@ namespace LuaUtil
         lua_State* luaState = table.lua_state();
         sol::state_view lua(luaState);
         sol::table meta(lua, sol::create);
-        meta["__index"] = table;
+        meta["t"] = table;
+        if (strictIndex)
+            meta["__index"] = lua["createStrictIndexFn"](table);
+        else
+            meta["__index"] = table;
         meta["__pairs"] = lua["pairsForReadOnly"];
         meta["__ipairs"] = lua["ipairsForReadOnly"];
 
@@ -158,7 +172,7 @@ namespace LuaUtil
 
     sol::table getMutableFromReadOnly(const sol::userdata& ro)
     {
-        return ro[sol::metatable_key].get<sol::table>()["__index"];
+        return ro[sol::metatable_key].get<sol::table>()["t"];
     }
 
     void LuaState::addCommonPackage(std::string packageName, sol::object package)
diff --git a/components/lua/luastate.hpp b/components/lua/luastate.hpp
index f9be5e9e99..bf947111dc 100644
--- a/components/lua/luastate.hpp
+++ b/components/lua/luastate.hpp
@@ -139,7 +139,9 @@ namespace LuaUtil
 
     // Makes a table read only (when accessed from Lua) by wrapping it with an empty userdata.
     // Needed to forbid any changes in common resources that can be accessed from different sandboxes.
-    sol::table makeReadOnly(sol::table);
+    // `strictIndex = true` replaces default `__index` with a strict version that throws an error if key is not found.
+    sol::table makeReadOnly(const sol::table&, bool strictIndex = false);
+    inline sol::table makeStrictReadOnly(const sol::table& tbl) { return makeReadOnly(tbl, true); }
     sol::table getMutableFromReadOnly(const sol::userdata&);
 
 }
diff --git a/components/lua/utilpackage.cpp b/components/lua/utilpackage.cpp
index 7f52a770a1..a9c5c40a7c 100644
--- a/components/lua/utilpackage.cpp
+++ b/components/lua/utilpackage.cpp
@@ -214,7 +214,8 @@ namespace LuaUtil
         util["clamp"] = [](float value, float from, float to) { return std::clamp(value, from, to); };
         // NOTE: `util["clamp"] = std::clamp<float>` causes error 'AddressSanitizer: stack-use-after-scope'
         util["normalizeAngle"] = &Misc::normalizeAngle;
-        util["makeReadOnly"] = &makeReadOnly;
+        util["makeReadOnly"] = [](const sol::table& tbl) { return makeReadOnly(tbl, /*strictIndex=*/false); };
+        util["makeStrictReadOnly"] = [](const sol::table& tbl) { return makeReadOnly(tbl, /*strictIndex=*/true); };
 
         if (lua["bit32"] != sol::nil)
         {
diff --git a/files/lua_api/openmw/util.lua b/files/lua_api/openmw/util.lua
index 3dd959b4a5..19eb3a82cd 100644
--- a/files/lua_api/openmw/util.lua
+++ b/files/lua_api/openmw/util.lua
@@ -25,6 +25,12 @@
 -- @param #table table Any table.
 -- @return #table The same table wrapped with read only userdata.
 
+---
+-- Makes a table read only and overrides `__index` with the strict version that throws an error if the key is not found.
+-- @function [parent=#util] makeStrictReadOnly
+-- @param #table table Any table.
+-- @return #table The same table wrapped with read only userdata.
+
 ---
 -- Parses Lua code from string and returns as a function.
 -- @function [parent=#util] loadCode

From c33966c4a407a3cc9f11e6ecc7b1f80db6f037a5 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 13 May 2022 12:35:58 +0200
Subject: [PATCH 2441/2859] Fix unity build

In file included from /home/elsid/dev/openmw/build/clang/unity/apps/openmw/ub_mwworld.cpp:41:
/home/elsid/dev/openmw/apps/openmw/mwworld/groundcoverstore.cpp:10:9: error: no type named 'Query' in 'MWWorld::EsmLoader'; did you mean '::EsmLoader::Query'?
        EsmLoader::Query query;
        ^~~~~~~~~~~~~~~~
        ::EsmLoader::Query
/home/elsid/dev/openmw/./components/esmloader/load.hpp:23:12: note: '::EsmLoader::Query' declared here
    struct Query
           ^
---
 apps/openmw/mwworld/groundcoverstore.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwworld/groundcoverstore.cpp b/apps/openmw/mwworld/groundcoverstore.cpp
index 543cd3e0d8..3e1301cf06 100644
--- a/apps/openmw/mwworld/groundcoverstore.cpp
+++ b/apps/openmw/mwworld/groundcoverstore.cpp
@@ -7,12 +7,12 @@ namespace MWWorld
 {
     void GroundcoverStore::init(const Store<ESM::Static>& statics, const Files::Collections& fileCollections, const std::vector<std::string>& groundcoverFiles, ToUTF8::Utf8Encoder* encoder)
     {
-        EsmLoader::Query query;
+        ::EsmLoader::Query query;
         query.mLoadStatics = true;
         query.mLoadCells = true;
 
         std::vector<ESM::ESMReader> readers(groundcoverFiles.size());
-        const EsmLoader::EsmData content = EsmLoader::loadEsmData(query, groundcoverFiles, fileCollections, readers, encoder);
+        const ::EsmLoader::EsmData content = ::EsmLoader::loadEsmData(query, groundcoverFiles, fileCollections, readers, encoder);
 
         for (const ESM::Static& stat : statics)
         {

From 94dc696f4f44efb73568edeb025c0a5f8c24920d Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 16 May 2022 15:55:21 +0200
Subject: [PATCH 2442/2859] Fix gcc build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In file included from /home/elsid/dev/openmw/apps/openmw/mwphysics/actor.hpp:7,
                 from /home/elsid/dev/openmw/apps/openmw/mwphysics/trace.cpp:9:
/home/elsid/dev/openmw/apps/openmw/mwphysics/ptrholder.hpp: In member function ‘osg::Vec3f MWPhysics::PtrHolder::velocity()’:
/home/elsid/dev/openmw/apps/openmw/mwphysics/ptrholder.hpp:42:25: error: ‘exchange’ is not a member of ‘std’
   42 |             return std::exchange(mVelocity, osg::Vec3f());
      |                         ^~~~~~~~
---
 apps/openmw/mwphysics/ptrholder.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/openmw/mwphysics/ptrholder.hpp b/apps/openmw/mwphysics/ptrholder.hpp
index 7366049cba..c4141d14bc 100644
--- a/apps/openmw/mwphysics/ptrholder.hpp
+++ b/apps/openmw/mwphysics/ptrholder.hpp
@@ -3,6 +3,7 @@
 
 #include <mutex>
 #include <memory>
+#include <utility>
 
 #include <osg/Vec3d>
 

From 22994af7288c0614278b681e8340a9c77190214e Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Mon, 16 May 2022 16:32:18 +0200
Subject: [PATCH 2443/2859] Fix Lua pairs and ipairs

---
 components/lua/luastate.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/lua/luastate.cpp b/components/lua/luastate.cpp
index 4056fb59f9..b5b0832b98 100644
--- a/components/lua/luastate.cpp
+++ b/components/lua/luastate.cpp
@@ -104,7 +104,7 @@ namespace LuaUtil
             end
             local function nextForArray(array, index)
                 index = (index or 0) + 1
-                if index < #array then
+                if index <= #array then
                     return index, array[index]
                 end
             end

From 134dc2b21b150ac3a6e18e9b153d261a9e5765bd Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 16 May 2022 17:37:45 +0200
Subject: [PATCH 2444/2859] Address feedback on !1857

---
 components/esm3/loadinfo.hpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/components/esm3/loadinfo.hpp b/components/esm3/loadinfo.hpp
index 067dc62471..77769efcce 100644
--- a/components/esm3/loadinfo.hpp
+++ b/components/esm3/loadinfo.hpp
@@ -33,18 +33,16 @@ struct DialInfo
 
     struct DATAstruct
     {
-        int mUnknown1;
+        int mUnknown1 = 0;
         union
         {
-            int mDisposition; // Used for dialogue responses
+            int mDisposition = 0; // Used for dialogue responses
             int mJournalIndex;  // Used for journal entries
         };
-        signed char mRank; // Rank of NPC
-        signed char mGender; // See Gender enum
-        signed char mPCrank; // Player rank
-        signed char mUnknown2;
-
-        DATAstruct() : mDisposition(0), mRank(-1), mGender(Gender::NA), mPCrank(-1) {}
+        signed char mRank = -1; // Rank of NPC
+        signed char mGender = Gender::NA; // See Gender enum
+        signed char mPCrank = -1; // Player rank
+        signed char mUnknown2 = 0;
     }; // 12 bytes
     DATAstruct mData;
 

From 2531e24ee36f5a0a2f99469181523908fda19ee6 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 16 May 2022 18:29:16 +0200
Subject: [PATCH 2445/2859] Fix inverted logic

---
 apps/openmw/mwmechanics/actors.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 5e2e083648..fb78beb8cf 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -76,7 +76,7 @@ bool isCommanded(const MWWorld::Ptr& actor)
 // Check for command effects having ended and remove package if necessary
 void adjustCommandedActor (const MWWorld::Ptr& actor)
 {
-    if (!isCommanded(actor))
+    if (isCommanded(actor))
         return;
 
     MWMechanics::CreatureStats& stats = actor.getClass().getCreatureStats(actor);

From cf49b46d64086afe28269631d247916e6efd1ca9 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 8 May 2022 22:43:30 +0200
Subject: [PATCH 2446/2859] Show logs in the debug window

Some part of UI code is written by @andrew-app
---
 CHANGELOG.md                                  |   1 +
 apps/openmw/mwgui/debugwindow.cpp             | 112 ++++++++++++++++--
 apps/openmw/mwgui/debugwindow.hpp             |   9 ++
 apps/openmw/mwgui/windowmanagerimp.cpp        |   6 +-
 components/debug/debugging.cpp                |   5 +
 components/debug/debugging.hpp                |   2 +
 components/debug/debuglog.hpp                 |   4 +-
 .../reference/modding/settings/general.rst    |  14 +++
 files/mygui/openmw_layers.xml                 |   4 +-
 files/settings-default.cfg                    |   3 +
 10 files changed, 143 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c64b831bc..a427f1e7c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -143,6 +143,7 @@
     Feature #6128: Soft Particles
     Feature #6161: Refactor Sky to use shaders and GLES/GL3 friendly
     Feature #6162: Refactor GUI to use shaders and to be GLES and GL3+ friendly
+    Feature #6171: In-game log viewer
     Feature #6189: Navigation mesh disk cache
     Feature #6199: Support FBO Rendering
     Feature #6248: Embedded error marker mesh
diff --git a/apps/openmw/mwgui/debugwindow.cpp b/apps/openmw/mwgui/debugwindow.cpp
index 728e16b21a..4c71874c1f 100644
--- a/apps/openmw/mwgui/debugwindow.cpp
+++ b/apps/openmw/mwgui/debugwindow.cpp
@@ -5,6 +5,8 @@
 #include <MyGUI_EditBox.h>
 
 #include <LinearMath/btQuickprof.h>
+#include <components/debug/debugging.hpp>
+#include <components/settings/settings.hpp>
 
 #ifndef BT_NO_PROFILE
 
@@ -84,28 +86,105 @@ namespace MWGui
 
         // Ideas for other tabs:
         // - Texture / compositor texture viewer
-        // - Log viewer
         // - Material editor
         // - Shader editor
 
+        initLogView();
+
+#ifndef BT_NO_PROFILE
         MyGUI::TabItem* item = mTabControl->addItem("Physics Profiler");
         mBulletProfilerEdit = item->createWidgetReal<MyGUI::EditBox>
                 ("LogEdit", MyGUI::FloatCoord(0,0,1,1), MyGUI::Align::Stretch);
+#else
+        mBulletProfilerEdit = nullptr;
+#endif
     }
 
-    void DebugWindow::onFrame(float dt)
+    void DebugWindow::initLogView()
     {
-#ifndef BT_NO_PROFILE
-        if (!isVisible())
-            return;
+        MyGUI::TabItem* itemLV = mTabControl->addItem("Log Viewer");
+        mLogView = itemLV->createWidgetReal<MyGUI::EditBox>
+                ("LogEdit", MyGUI::FloatCoord(0,0,1,1), MyGUI::Align::Stretch);
+        mLogView->setEditReadOnly(true);
 
-        static float timer = 0;
-        timer -= dt;
+        mLogCircularBuffer.resize(std::max<int64_t>(0, Settings::Manager::getInt64("log buffer size", "General")));
+        Debug::setLogListener([this](Debug::Level level, std::string_view prefix, std::string_view msg)
+        {
+            if (mLogCircularBuffer.empty())
+                return;  // Log viewer is disabled.
+            std::string_view color;
+            switch (level)
+            {
+                case Debug::Error: color = "#FF0000"; break;
+                case Debug::Warning: color = "#FFFF00"; break;
+                case Debug::Info: color = "#FFFFFF"; break;
+                case Debug::Verbose:
+                case Debug::Debug: color = "#666666"; break;
+                default: color = "#FFFFFF";
+            }
+            bool bufferOverflow = false;
+            const int64_t bufSize = mLogCircularBuffer.size();
+            auto addChar = [&](char c)
+            {
+                mLogCircularBuffer[mLogEndIndex++] = c;
+                if (mLogEndIndex == bufSize)
+                    mLogEndIndex = 0;
+                bufferOverflow = bufferOverflow || mLogEndIndex == mLogStartIndex;
+            };
+            auto addShieldedStr = [&](std::string_view s)
+            {
+                for (char c : s)
+                {
+                    addChar(c);
+                    if (c == '#')
+                        addChar(c);
+                }
+            };
+            for (char c : color)
+                addChar(c);
+            addShieldedStr(prefix);
+            addShieldedStr(msg);
+            if (bufferOverflow)
+                mLogStartIndex = (mLogEndIndex + 1) % bufSize;
+        });
+    }
 
-        if (timer > 0)
+    void DebugWindow::updateLogView()
+    {
+        if (!mLogView || mLogCircularBuffer.empty() || mLogStartIndex == mLogEndIndex)
             return;
-        timer = 1;
+        if (mLogView->isTextSelection())
+            return;  // Don't change text while player is trying to copy something
 
+        std::string addition;
+        const int64_t bufSize = mLogCircularBuffer.size();
+        {
+            std::unique_lock<std::mutex> lock = Log::lock();
+            if (mLogStartIndex < mLogEndIndex)
+                addition = std::string(mLogCircularBuffer.data() + mLogStartIndex, mLogEndIndex - mLogStartIndex);
+            else
+            {
+                addition = std::string(mLogCircularBuffer.data() + mLogStartIndex, bufSize - mLogStartIndex);
+                addition.append(mLogCircularBuffer.data(), mLogEndIndex);
+            }
+            mLogStartIndex = mLogEndIndex;
+        }
+
+        size_t scrollPos = mLogView->getVScrollPosition();
+        bool scrolledToTheEnd = scrollPos+1 >= mLogView->getVScrollRange();
+        int64_t newSizeEstimation = mLogView->getTextLength() + addition.size();
+        if (newSizeEstimation > bufSize)
+            mLogView->eraseText(0, newSizeEstimation - bufSize);
+        mLogView->addText(addition);
+        if (scrolledToTheEnd && mLogView->getVScrollRange() > 0)
+            mLogView->setVScrollPosition(mLogView->getVScrollRange() - 1);
+        else
+            mLogView->setVScrollPosition(scrollPos);
+    }
+
+    void DebugWindow::updateBulletProfile()
+    {
+#ifndef BT_NO_PROFILE
         std::stringstream stream;
         bulletDumpAll(stream);
 
@@ -118,4 +197,17 @@ namespace MWGui
 #endif
     }
 
-}
+    void DebugWindow::onFrame(float dt)
+    {
+        static float timer = 0;
+        timer -= dt;
+        if (timer > 0 || !isVisible())
+            return;
+        timer = 0.25;
+
+        if (mTabControl->getIndexSelected() == 0)
+            updateLogView();
+        else
+            updateBulletProfile();
+    }
+}
\ No newline at end of file
diff --git a/apps/openmw/mwgui/debugwindow.hpp b/apps/openmw/mwgui/debugwindow.hpp
index 33647c0789..352a58c50c 100644
--- a/apps/openmw/mwgui/debugwindow.hpp
+++ b/apps/openmw/mwgui/debugwindow.hpp
@@ -14,8 +14,17 @@ namespace MWGui
         void onFrame(float dt) override;
 
     private:
+        void initLogView();
+        void updateLogView();
+        void updateBulletProfile();
+
         MyGUI::TabControl* mTabControl;
 
+        MyGUI::EditBox* mLogView;
+        std::vector<char> mLogCircularBuffer;
+        int64_t mLogStartIndex = 0;
+        int64_t mLogEndIndex = 0;
+
         MyGUI::EditBox* mBulletProfilerEdit;
     };
 
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 3b79b21a7c..95a437ceaa 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -884,6 +884,8 @@ namespace MWGui
         if (mLocalMapRender)
             mLocalMapRender->cleanupCameras();
 
+        mDebugWindow->onFrame(frameDuration);
+
         if (!gameRunning)
             return;
 
@@ -903,8 +905,6 @@ namespace MWGui
 
         mHud->onFrame(frameDuration);
 
-        mDebugWindow->onFrame(frameDuration);
-
         mPostProcessorHud->onFrame(frameDuration);
 
         if (mCharGen)
@@ -2061,9 +2061,7 @@ namespace MWGui
 
     void WindowManager::toggleDebugWindow()
     {
-#ifndef BT_NO_PROFILE
         mDebugWindow->setVisible(!mDebugWindow->isVisible());
-#endif
     }
 
     void WindowManager::togglePostProcessorHud()
diff --git a/components/debug/debugging.cpp b/components/debug/debugging.cpp
index e1bea70954..62d1bc716d 100644
--- a/components/debug/debugging.cpp
+++ b/components/debug/debugging.cpp
@@ -61,6 +61,9 @@ namespace Debug
     }
 #endif
 
+    static LogListener logListener;
+    void setLogListener(LogListener listener) { logListener = std::move(listener); }
+
     std::streamsize DebugOutputBase::write(const char *str, std::streamsize size)
     {
         if (size <= 0)
@@ -94,6 +97,8 @@ namespace Debug
                 lineSize++;
             writeImpl(prefix, prefixSize, level);
             writeImpl(msg.data(), lineSize, level);
+            if (logListener)
+                logListener(level, std::string_view(prefix, prefixSize), std::string_view(msg.data(), lineSize));
             msg = msg.substr(lineSize);
         }
 
diff --git a/components/debug/debugging.hpp b/components/debug/debugging.hpp
index 3e6739c1e1..63c44ae8b4 100644
--- a/components/debug/debugging.hpp
+++ b/components/debug/debugging.hpp
@@ -133,6 +133,8 @@ namespace Debug
     };
 #endif
 
+    using LogListener = std::function<void(Debug::Level, std::string_view prefix, std::string_view msg)>;
+    void setLogListener(LogListener);
 
 }
 
diff --git a/components/debug/debuglog.hpp b/components/debug/debuglog.hpp
index 96b9d798e9..bcb282ab3a 100644
--- a/components/debug/debuglog.hpp
+++ b/components/debug/debuglog.hpp
@@ -35,7 +35,7 @@ public:
             return;
 
         // Locks a global lock while the object is alive
-        mLock = std::unique_lock<std::mutex>(sLock);
+        mLock = lock();
 
         // If the app has no logging system enabled, log level is not specified.
         // Show all messages without marker - we just use the plain cout in this case.
@@ -61,6 +61,8 @@ public:
             std::cout << std::endl;
     }
 
+    static std::unique_lock<std::mutex> lock() { return std::unique_lock<std::mutex>(sLock); }
+
 private:
     const bool mShouldLog;
 };
diff --git a/docs/source/reference/modding/settings/general.rst b/docs/source/reference/modding/settings/general.rst
index ae2448c38b..39045e7733 100644
--- a/docs/source/reference/modding/settings/general.rst
+++ b/docs/source/reference/modding/settings/general.rst
@@ -86,3 +86,17 @@ since if the country code isn't specified the generic language-code only locale
 refer to any of the country-specific variants.
 
 This setting can only be configured by editing the settings configuration file.
+
+log buffer size
+---------------
+
+:Type:		integer
+:Range:		>= 0
+:Default:	65536
+
+Buffer size for the in-game log viewer (press F10 to toggle the log viewer).
+When the log doesn't fit into the buffer, only the end of the log is visible in the log viewer.
+Zero disables the log viewer.
+
+This setting can only be configured by editing the settings configuration file.
+
diff --git a/files/mygui/openmw_layers.xml b/files/mygui/openmw_layers.xml
index 0b70dbb000..750c4cacd3 100644
--- a/files/mygui/openmw_layers.xml
+++ b/files/mygui/openmw_layers.xml
@@ -8,14 +8,14 @@
         <Property key="Size" value="600 520"/>
     </Layer>
     <Layer name="Windows" overlapped="true" pick="true"/>
-    <Layer name="Debug" overlapped="true" pick="true"/>
     <Layer name="DragAndDrop" overlapped="false" pick="false"/>
     <Layer name="DrowningBar" overlapped="false" pick="false"/>
     <Layer name="MainMenuBackground" overlapped="true" pick="true"/>
     <Layer name="MainMenu" overlapped="true" pick="true"/>
-    <Layer name="Console" overlapped="true" pick="true"/>
     <Layer name="LoadingScreenBackground" overlapped="false" pick="true"/>
     <Layer name="LoadingScreen" overlapped="false" pick="true"/>
+    <Layer name="Debug" overlapped="true" pick="true"/>
+    <Layer name="Console" overlapped="true" pick="true"/>
     <Layer name="Modal" overlapped="true" pick="true"/>
     <Layer name="Popup" overlapped="true" pick="true"/>
     <Layer name="Notification" overlapped="false" pick="false"/>
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index ed392d44e4..a952a9da19 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -400,6 +400,9 @@ notify on saved screenshot = false
 # For example "de,en" means German as the first prority and English as a fallback.
 preferred locales = en
 
+# Buffer size for the in-game log viewer (press F10 to toggle). Zero disables the log viewer.
+log buffer size = 65536
+
 [Shaders]
 
 # Force rendering with shaders. By default, only bump-mapped objects will use shaders.

From c88d3e712d7bec331b92b7e89c967479f50e5cb4 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 16 May 2022 17:04:41 +0200
Subject: [PATCH 2447/2859] Cleanup mwlua includes

---
 apps/openmw/mwlua/object.cpp    | 2 --
 apps/openmw/mwlua/object.hpp    | 6 +-----
 apps/openmw/mwlua/worldview.hpp | 5 +++++
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwlua/object.cpp b/apps/openmw/mwlua/object.cpp
index e81a6fbcc6..9b51729b10 100644
--- a/apps/openmw/mwlua/object.cpp
+++ b/apps/openmw/mwlua/object.cpp
@@ -1,7 +1,5 @@
 #include "object.hpp"
 
-#include <unordered_map>
-
 #include "types/types.hpp"
 
 namespace MWLua
diff --git a/apps/openmw/mwlua/object.hpp b/apps/openmw/mwlua/object.hpp
index 499c21c7e7..4c4fbd7908 100644
--- a/apps/openmw/mwlua/object.hpp
+++ b/apps/openmw/mwlua/object.hpp
@@ -2,15 +2,11 @@
 #define MWLUA_OBJECT_H
 
 #include <typeindex>
+#include <map>
 
 #include <sol/sol.hpp>
 
 #include <components/esm3/cellref.hpp>
-#include <components/esm/defs.hpp>
-#include <components/esm/luascripts.hpp>
-
-#include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 
 #include "../mwworld/ptr.hpp"
 
diff --git a/apps/openmw/mwlua/worldview.hpp b/apps/openmw/mwlua/worldview.hpp
index e5b5fe4f67..004fcfc0c3 100644
--- a/apps/openmw/mwlua/worldview.hpp
+++ b/apps/openmw/mwlua/worldview.hpp
@@ -3,6 +3,11 @@
 
 #include "object.hpp"
 
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+
+#include <set>
+
 namespace ESM
 {
     class ESMWriter;

From 98f53eca65682798f7cd28386b179d47c643ae39 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 16 May 2022 17:11:37 +0200
Subject: [PATCH 2448/2859] Fix gcc warning: -Wuninitialized
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

/home/elsid/dev/openmw/apps/opencs/model/world/data.cpp: In constructor ‘CSMWorld::Data::Data(ToUTF8::FromType, bool, const Files::PathContainer&, const std::vector<std::__cxx11::basic_string<char> >&, const boost::filesystem::path&)’:
/home/elsid/dev/openmw/apps/opencs/model/world/data.cpp:69:36: warning: member ‘CSMWorld::Data::mCells’ is used uninitialized [-Wuninitialized]
   69 | : mEncoder (encoding), mPathgrids (mCells), mRefs (mCells),
      |                                    ^~~~~~
---
 apps/opencs/model/world/data.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/opencs/model/world/data.hpp b/apps/opencs/model/world/data.hpp
index 4a5d8f51a6..a337b74879 100644
--- a/apps/opencs/model/world/data.hpp
+++ b/apps/opencs/model/world/data.hpp
@@ -98,13 +98,13 @@ namespace CSMWorld
             NestedIdCollection<ESM::Enchantment> mEnchantments;
             IdCollection<ESM::BodyPart> mBodyParts;
             IdCollection<ESM::MagicEffect> mMagicEffects;
-            SubCellCollection<Pathgrid> mPathgrids;
             IdCollection<ESM::DebugProfile> mDebugProfiles;
             IdCollection<ESM::SoundGenerator> mSoundGens;
             IdCollection<ESM::StartScript> mStartScripts;
             NestedInfoCollection mTopicInfos;
             InfoCollection mJournalInfos;
             NestedIdCollection<Cell> mCells;
+            SubCellCollection<Pathgrid> mPathgrids;
             IdCollection<LandTexture> mLandTextures;
             IdCollection<Land> mLand;
             RefIdCollection mReferenceables;

From 14d83b218e6bd4db54eb5b7bb03341c3a10ab5ac Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Mon, 16 May 2022 21:24:20 +0000
Subject: [PATCH 2449/2859] Move permanentStorage option from settings to
 groups

---
 .../scripts/omw/settings/common.lua             | 17 ++++++-----------
 .../scripts/omw/settings/player.lua             |  7 +++----
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/files/builtin_scripts/scripts/omw/settings/common.lua b/files/builtin_scripts/scripts/omw/settings/common.lua
index 8150f2cc61..0d5e6d234a 100644
--- a/files/builtin_scripts/scripts/omw/settings/common.lua
+++ b/files/builtin_scripts/scripts/omw/settings/common.lua
@@ -12,9 +12,6 @@ local function validateSettingOptions(options)
     if type(options.key) ~= 'string' then
         error('Setting must have a key')
     end
-    if type(options.permanentStorage) ~= 'boolean' then
-        error('Setting must have a permanentStorage flag')
-    end
     if type(options.renderer) ~= 'string' then
         error('Setting must have a renderer')
     end
@@ -52,6 +49,9 @@ local function validateGroupOptions(options)
     if options.description ~= nil and type(options.description) ~= 'string' then
         error('Group description key must be a string')
     end
+    if type(options.permanentStorage) ~= 'boolean' then
+        error('Group must have a permanentStorage flag')
+    end
     if type(options.settings) ~= 'table' then
         error('Group must have a table of settings')
     end
@@ -63,7 +63,6 @@ end
 local function registerSetting(options)
     return {
         key = options.key,
-        permanentStorage = options.permanentStorage,
         default = options.default,
         renderer = options.renderer,
         argument = options.argument,
@@ -85,7 +84,7 @@ local function registerGroup(options)
         l10n = options.l10n,
         name = options.name,
         description = options.description,
-
+        permanentStorage = options.permanentStorage,
         settings = {},
     }
     local valueSection = contextSection(options.key)
@@ -121,12 +120,8 @@ return {
     onSave = function()
         local saved = {}
         for groupKey, group in pairs(groupSection:asTable()) do
-            local section = contextSection(groupKey)
-            saved[groupKey] = {}
-            for key, value in pairs(section:asTable()) do
-                if group.settings[key] and not group.settings[key].permanentStorage then
-                    saved[groupKey][key] = value
-                end
+            if not group.permanentStorage then
+                saved[groupKey] = contextSection(groupKey):asTable()
             end
         end
         groupSection:reset()
diff --git a/files/builtin_scripts/scripts/omw/settings/player.lua b/files/builtin_scripts/scripts/omw/settings/player.lua
index a4201bc8a8..2efe5f0820 100644
--- a/files/builtin_scripts/scripts/omw/settings/player.lua
+++ b/files/builtin_scripts/scripts/omw/settings/player.lua
@@ -19,6 +19,7 @@ require('scripts.omw.settings.renderers')(render.registerRenderer)
 -- @field #string page Key of a page which will contain this group
 -- @field #number order Groups within the same page are sorted by this number, or their key for equal values.
 --   Defaults to 0.
+-- @field #boolean permanentStorage Whether the group should be stored in permanent storage, or in the save file
 -- @field #list<#SettingOptions> settings A [iterables#List](iterables.html#List) of #SettingOptions
 
 ---
@@ -29,7 +30,6 @@ require('scripts.omw.settings.renderers')(render.registerRenderer)
 -- @field default A default value
 -- @field #string renderer A renderer key
 -- @field argument An argument for the renderer
--- @field #boolean permanentStorage Whether the setting should is stored in permanent storage, or in the save file
 
 return {
     interfaceName = 'Settings',
@@ -51,6 +51,7 @@ return {
     --     l10n = 'MyMod',
     --     name = 'My Group Name',
     --     description = 'My Group Description',
+    --     permanentStorage = false,
     --     settings = {
     --         {
     --             key = 'Greeting',
@@ -58,7 +59,6 @@ return {
     --             name = 'Greeting',
     --             description = 'Text to display when the game starts',
     --             default = 'Hello, world!',
-    --             permanentStorage = false,
     --         },
     --     },
     -- }
@@ -118,10 +118,10 @@ return {
         --     l10n = 'test',
         --     name = 'Player',
         --     description = 'Player settings group',
+        --     permanentStorage = false,
         --     settings = {
         --         {
         --             key = 'Greeting',
-        --             permanentStorage = true,
         --             default = 'Hi',
         --             renderer = 'textLine',
         --             name = 'Text Input',
@@ -129,7 +129,6 @@ return {
         --         },
         --         {
         --             key = 'Flag',
-        --             permanentStorage = false,
         --             default = false,
         --             renderer = 'yeNo',
         --             name = 'Flag',

From 5f2e2823599b7d02b30957b2a4f8ec1ed2e12f5d Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 17 May 2022 00:58:24 +0200
Subject: [PATCH 2450/2859] Add includes for used types and functions

---
 components/myguiplatform/myguidatamanager.cpp | 5 ++++-
 components/myguiplatform/myguidatamanager.hpp | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/components/myguiplatform/myguidatamanager.cpp b/components/myguiplatform/myguidatamanager.cpp
index fc5d2bf953..1aa16946a4 100644
--- a/components/myguiplatform/myguidatamanager.cpp
+++ b/components/myguiplatform/myguidatamanager.cpp
@@ -1,8 +1,11 @@
 #include "myguidatamanager.hpp"
 
+#include <memory>
+#include <string>
+
 #include <MyGUI_DataFileStream.h>
 
-#include <boost/filesystem.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <boost/filesystem/fstream.hpp>
 
 #include <components/debug/debuglog.hpp>
diff --git a/components/myguiplatform/myguidatamanager.hpp b/components/myguiplatform/myguidatamanager.hpp
index da24763d7b..e0c4e6c436 100644
--- a/components/myguiplatform/myguidatamanager.hpp
+++ b/components/myguiplatform/myguidatamanager.hpp
@@ -3,6 +3,8 @@
 
 #include <MyGUI_DataManager.h>
 
+#include <string>
+
 namespace osgMyGUI
 {
 

From 915eaa4c91c3d1a87a7c5b5e6b8c7b058afd6c61 Mon Sep 17 00:00:00 2001
From: cody glassman <glassmancody.info@gmail.com>
Date: Mon, 16 May 2022 16:17:39 -0700
Subject: [PATCH 2451/2859] highp is not available in version 120

---
 components/fx/pass.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/fx/pass.cpp b/components/fx/pass.cpp
index 246221eb84..e0489fe0c8 100644
--- a/components/fx/pass.cpp
+++ b/components/fx/pass.cpp
@@ -75,7 +75,7 @@ namespace fx
 
 uniform @builtinSampler omw_SamplerLastShader;
 uniform @builtinSampler omw_SamplerLastPass;
-uniform highp @builtinSampler omw_SamplerDepth;
+uniform @builtinSampler omw_SamplerDepth;
 uniform @builtinSampler omw_SamplerNormals;
 
 uniform vec4 omw_PointLights[@pointLightCount];

From 215b46503c4d6c830782b8ba5adf8f156c07064d Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 3 Feb 2022 02:05:43 +0100
Subject: [PATCH 2452/2859] Support rendering for navmesh update frequency as a
 heatmap

Useful when need to find tiles with high number of updates.

Add debug Lua package with new functions to toggle render mode and set navmesh
render mode.
---
 apps/openmw/CMakeLists.txt                    |  4 +-
 apps/openmw/mwlua/debugbindings.cpp           | 51 +++++++++++++++++++
 apps/openmw/mwlua/debugbindings.hpp           | 13 +++++
 apps/openmw/mwlua/luabindings.cpp             |  2 +-
 apps/openmw/mwlua/luamanagerimp.cpp           |  3 ++
 apps/openmw/mwlua/luamanagerimp.hpp           |  1 +
 apps/openmw/mwrender/navmesh.cpp              | 39 +++++++++++---
 apps/openmw/mwrender/navmesh.hpp              |  8 ++-
 apps/openmw/mwrender/navmeshmode.cpp          | 16 ++++++
 apps/openmw/mwrender/navmeshmode.hpp          | 17 +++++++
 apps/openmw/mwrender/renderingmanager.cpp     |  8 ++-
 apps/openmw/mwrender/renderingmanager.hpp     |  4 +-
 components/sceneutil/navmesh.cpp              | 47 ++++++++++++++---
 components/sceneutil/navmesh.hpp              | 10 +++-
 docs/source/reference/lua-scripting/api.rst   | 45 ++--------------
 .../reference/lua-scripting/openmw_debug.rst  |  5 ++
 .../reference/lua-scripting/overview.rst      | 42 +--------------
 .../lua-scripting/tables/aux_packages.rst     | 11 ++++
 .../lua-scripting/tables/packages.rst         | 33 ++++++++++++
 .../reference/modding/settings/navigator.rst  | 13 ++++-
 .../scripts/omw/console/player.lua            |  1 +
 files/lua_api/CMakeLists.txt                  |  2 +-
 files/lua_api/openmw/debug.lua                | 44 ++++++++++++++++
 files/settings-default.cfg                    |  3 ++
 24 files changed, 319 insertions(+), 103 deletions(-)
 create mode 100644 apps/openmw/mwlua/debugbindings.cpp
 create mode 100644 apps/openmw/mwlua/debugbindings.hpp
 create mode 100644 apps/openmw/mwrender/navmeshmode.cpp
 create mode 100644 apps/openmw/mwrender/navmeshmode.hpp
 create mode 100644 docs/source/reference/lua-scripting/openmw_debug.rst
 create mode 100644 docs/source/reference/lua-scripting/tables/aux_packages.rst
 create mode 100644 docs/source/reference/lua-scripting/tables/packages.rst
 create mode 100644 files/lua_api/openmw/debug.lua

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 1756824164..f0ee1639a1 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -23,7 +23,7 @@ add_openmw_dir (mwrender
     creatureanimation effectmanager util renderinginterface pathgrid rendermode weaponanimation screenshotmanager
     bulletdebugdraw globalmap characterpreview camera localmap water terrainstorage ripplesimulation
     renderbin actoranimation landmanager navmesh actorspaths recastmesh fogmanager objectpaging groundcover
-    postprocessor pingpongcull hdr pingpongcanvas transparentpass
+    postprocessor pingpongcull hdr pingpongcanvas transparentpass navmeshmode
     )
 
 add_openmw_dir (mwinput
@@ -61,7 +61,7 @@ add_openmw_dir (mwscript
 add_openmw_dir (mwlua
     luamanagerimp object worldview userdataserializer eventqueue
     luabindings localscripts playerscripts objectbindings cellbindings asyncbindings settingsbindings
-    camerabindings uibindings inputbindings nearbybindings postprocessingbindings stats
+    camerabindings uibindings inputbindings nearbybindings postprocessingbindings stats debugbindings
     types/types types/door types/actor types/container types/weapon types/npc types/creature
     )
 
diff --git a/apps/openmw/mwlua/debugbindings.cpp b/apps/openmw/mwlua/debugbindings.cpp
new file mode 100644
index 0000000000..fe00fa72b2
--- /dev/null
+++ b/apps/openmw/mwlua/debugbindings.cpp
@@ -0,0 +1,51 @@
+#include "debugbindings.hpp"
+#include "context.hpp"
+#include "luamanagerimp.hpp"
+
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+#include "../mwrender/renderingmanager.hpp"
+
+#include <components/lua/luastate.hpp>
+
+namespace MWLua
+{
+    sol::table initDebugPackage(const Context& context)
+    {
+        sol::table api = context.mLua->newTable();
+
+        api["RENDER_MODE"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, MWRender::RenderMode>({
+            {"CollisionDebug", MWRender::Render_CollisionDebug},
+            {"Wireframe", MWRender::Render_Wireframe},
+            {"Pathgrid", MWRender::Render_Pathgrid},
+            {"Water", MWRender::Render_Water},
+            {"Scene", MWRender::Render_Scene},
+            {"NavMesh", MWRender::Render_NavMesh},
+            {"ActorsPaths", MWRender::Render_ActorsPaths},
+            {"RecastMesh", MWRender::Render_RecastMesh},
+        }));
+
+        api["toggleRenderMode"] = [context] (MWRender::RenderMode value)
+        {
+            context.mLuaManager->addAction([value]
+            {
+                MWBase::Environment::get().getWorld()->toggleRenderMode(value);
+            });
+        };
+
+        api["NAV_MESH_RENDER_MODE"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, MWRender::NavMeshMode>({
+            {"AreaType", MWRender::NavMeshMode::AreaType},
+            {"UpdateFrequency", MWRender::NavMeshMode::UpdateFrequency},
+        }));
+
+        api["setNavMeshRenderMode"] = [context] (MWRender::NavMeshMode value)
+        {
+            context.mLuaManager->addAction([value]
+            {
+                MWBase::Environment::get().getWorld()->getRenderingManager()->setNavMeshMode(value);
+            });
+        };
+
+        return LuaUtil::makeReadOnly(api);
+    }
+}
diff --git a/apps/openmw/mwlua/debugbindings.hpp b/apps/openmw/mwlua/debugbindings.hpp
new file mode 100644
index 0000000000..c508b54496
--- /dev/null
+++ b/apps/openmw/mwlua/debugbindings.hpp
@@ -0,0 +1,13 @@
+#ifndef OPENMW_MWLUA_DEBUGBINDINGS_H
+#define OPENMW_MWLUA_DEBUGBINDINGS_H
+
+#include <sol/sol.hpp>
+
+namespace MWLua
+{
+    struct Context;
+
+    sol::table initDebugPackage(const Context& context);
+}
+
+#endif // OPENMW_MWLUA_DEBUGBINDINGS_H
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index dc50d093ca..4878e0423e 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -41,7 +41,7 @@ namespace MWLua
     {
         auto* lua = context.mLua;
         sol::table api(lua->sol(), sol::create);
-        api["API_REVISION"] = 22;
+        api["API_REVISION"] = 23;
         api["quit"] = [lua]()
         {
             Log(Debug::Warning) << "Quit requested by a Lua script.\n" << lua->debugTraceback();
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 96b4db4f20..02b986080b 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -23,6 +23,7 @@
 #include "luabindings.hpp"
 #include "userdataserializer.hpp"
 #include "types/types.hpp"
+#include "debugbindings.hpp"
 
 namespace MWLua
 {
@@ -96,6 +97,7 @@ namespace MWLua
         mLocalStoragePackage = initLocalStoragePackage(localContext, &mGlobalStorage);
         mPlayerStoragePackage = initPlayerStoragePackage(localContext, &mGlobalStorage, &mPlayerStorage);
         mPostprocessingPackage = initPostprocessingPackage(localContext);
+        mDebugPackage = initDebugPackage(localContext);
 
         initConfiguration();
         mInitialized = true;
@@ -409,6 +411,7 @@ namespace MWLua
             scripts->addPackage("openmw.settings", mPlayerSettingsPackage);
             scripts->addPackage("openmw.storage", mPlayerStoragePackage);
             scripts->addPackage("openmw.postprocessing", mPostprocessingPackage);
+            scripts->addPackage("openmw.debug", mDebugPackage);
         }
         else
         {
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index 0700895497..0c08deb4fb 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -141,6 +141,7 @@ namespace MWLua
         sol::table mLocalStoragePackage;
         sol::table mPlayerStoragePackage;
         sol::table mPostprocessingPackage;
+        sol::table mDebugPackage;
 
         GlobalScripts mGlobalScripts{&mLua};
         std::set<LocalScripts*> mActiveLocalScripts;
diff --git a/apps/openmw/mwrender/navmesh.cpp b/apps/openmw/mwrender/navmesh.cpp
index 8345df9265..47c06abca1 100644
--- a/apps/openmw/mwrender/navmesh.cpp
+++ b/apps/openmw/mwrender/navmesh.cpp
@@ -12,6 +12,8 @@
 #include <osg/PositionAttitudeTransform>
 #include <osg/StateSet>
 
+#include <DetourNavMesh.h>
+
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 
@@ -43,6 +45,7 @@ namespace MWRender
         const osg::ref_ptr<osg::StateSet> mDebugDrawStateSet;
         const DetourNavigator::Settings mSettings;
         std::map<DetourNavigator::TilePosition, Tile> mTiles;
+        NavMeshMode mMode;
         std::atomic_bool mAborted {false};
         std::mutex mMutex;
         bool mStarted = false;
@@ -52,7 +55,8 @@ namespace MWRender
         explicit CreateNavMeshTileGroups(std::size_t id, DetourNavigator::Version version,
             std::weak_ptr<DetourNavigator::GuardedNavMeshCacheItem> navMesh,
             const osg::ref_ptr<osg::StateSet>& groupStateSet, const osg::ref_ptr<osg::StateSet>& debugDrawStateSet,
-            const DetourNavigator::Settings& settings, const std::map<DetourNavigator::TilePosition, Tile>& tiles)
+            const DetourNavigator::Settings& settings, const std::map<DetourNavigator::TilePosition, Tile>& tiles,
+            NavMeshMode mode)
             : mId(id)
             , mVersion(version)
             , mNavMesh(navMesh)
@@ -60,6 +64,7 @@ namespace MWRender
             , mDebugDrawStateSet(debugDrawStateSet)
             , mSettings(settings)
             , mTiles(tiles)
+            , mMode(mode)
         {
         }
 
@@ -79,10 +84,14 @@ namespace MWRender
                 return;
 
             std::vector<std::pair<DetourNavigator::TilePosition, Version>> existingTiles;
+            unsigned minSalt = std::numeric_limits<unsigned>::max();
+            unsigned maxSalt = 0;
 
-            navMeshPtr->lockConst()->forEachUsedTile([&] (const TilePosition& position, const Version& version, const dtMeshTile& /*meshTile*/)
+            navMeshPtr->lockConst()->forEachUsedTile([&] (const TilePosition& position, const Version& version, const dtMeshTile& meshTile)
             {
                 existingTiles.emplace_back(position, version);
+                minSalt = std::min(minSalt, meshTile.salt);
+                maxSalt = std::max(maxSalt, meshTile.salt);
             });
 
             if (mAborted.load(std::memory_order_acquire))
@@ -98,10 +107,15 @@ namespace MWRender
 
             std::vector<std::pair<TilePosition, Tile>> updatedTiles;
 
+            const unsigned char flags = SceneUtil::NavMeshTileDrawFlagsOffMeshConnections
+                | SceneUtil::NavMeshTileDrawFlagsClosedList
+                | (mMode == NavMeshMode::UpdateFrequency ? SceneUtil::NavMeshTileDrawFlagsHeat : 0);
+
             for (const auto& [position, version] : existingTiles)
             {
                 const auto it = mTiles.find(position);
-                if (it != mTiles.end() && it->second.mGroup != nullptr && it->second.mVersion == version)
+                if (it != mTiles.end() && it->second.mGroup != nullptr && it->second.mVersion == version
+                        && mMode != NavMeshMode::UpdateFrequency)
                     continue;
 
                 osg::ref_ptr<osg::Group> group;
@@ -114,7 +128,8 @@ namespace MWRender
                     if (mAborted.load(std::memory_order_acquire))
                         return;
 
-                    group = SceneUtil::createNavMeshTileGroup(navMesh->getImpl(), *meshTile, mSettings, mGroupStateSet, mDebugDrawStateSet);
+                    group = SceneUtil::createNavMeshTileGroup(navMesh->getImpl(), *meshTile, mSettings, mGroupStateSet,
+                        mDebugDrawStateSet, flags, minSalt, maxSalt);
                 }
                 if (group == nullptr)
                 {
@@ -147,12 +162,14 @@ namespace MWRender
             : mWorkItem(std::move(workItem)) {}
     };
 
-    NavMesh::NavMesh(const osg::ref_ptr<osg::Group>& root, const osg::ref_ptr<SceneUtil::WorkQueue>& workQueue, bool enabled)
+    NavMesh::NavMesh(const osg::ref_ptr<osg::Group>& root, const osg::ref_ptr<SceneUtil::WorkQueue>& workQueue,
+                     bool enabled, NavMeshMode mode)
         : mRootNode(root)
         , mWorkQueue(workQueue)
         , mGroupStateSet(SceneUtil::makeNavMeshTileStateSet())
         , mDebugDrawStateSet(SceneUtil::DebugDraw::makeStateSet())
         , mEnabled(enabled)
+        , mMode(mode)
         , mId(std::numeric_limits<std::size_t>::max())
     {
     }
@@ -261,11 +278,13 @@ namespace MWRender
             workItem->mId = id;
             workItem->mVersion = version;
             workItem->mTiles = mTiles;
+            workItem->mMode = mMode;
 
             return;
         }
 
-        osg::ref_ptr<CreateNavMeshTileGroups> workItem = new CreateNavMeshTileGroups(id, version, navMesh, mGroupStateSet, mDebugDrawStateSet, settings, mTiles);
+        osg::ref_ptr<CreateNavMeshTileGroups> workItem = new CreateNavMeshTileGroups(id, version, navMesh,
+            mGroupStateSet, mDebugDrawStateSet, settings, mTiles, mMode);
         mWorkQueue->addWorkItem(workItem);
         mWorkItems.push_back(std::move(workItem));
     }
@@ -290,4 +309,12 @@ namespace MWRender
         reset();
         mEnabled = false;
     }
+
+    void NavMesh::setMode(NavMeshMode value)
+    {
+        if (mMode == value)
+            return;
+        reset();
+        mMode = value;
+    }
 }
diff --git a/apps/openmw/mwrender/navmesh.hpp b/apps/openmw/mwrender/navmesh.hpp
index 1c2cfbd323..f4d3f07e94 100644
--- a/apps/openmw/mwrender/navmesh.hpp
+++ b/apps/openmw/mwrender/navmesh.hpp
@@ -1,6 +1,8 @@
 #ifndef OPENMW_MWRENDER_NAVMESH_H
 #define OPENMW_MWRENDER_NAVMESH_H
 
+#include "navmeshmode.hpp"
+
 #include <components/detournavigator/version.hpp>
 #include <components/detournavigator/tileposition.hpp>
 #include <components/misc/guarded.hpp>
@@ -11,6 +13,7 @@
 #include <map>
 #include <memory>
 #include <vector>
+#include <string_view>
 
 class dtNavMesh;
 
@@ -38,7 +41,7 @@ namespace MWRender
     {
     public:
         explicit NavMesh(const osg::ref_ptr<osg::Group>& root, const osg::ref_ptr<SceneUtil::WorkQueue>& workQueue,
-                         bool enabled);
+                         bool enabled, NavMeshMode mode);
         ~NavMesh();
 
         bool toggle();
@@ -57,6 +60,8 @@ namespace MWRender
             return mEnabled;
         }
 
+        void setMode(NavMeshMode value);
+
     private:
         struct Tile
         {
@@ -73,6 +78,7 @@ namespace MWRender
         osg::ref_ptr<osg::StateSet> mGroupStateSet;
         osg::ref_ptr<osg::StateSet> mDebugDrawStateSet;
         bool mEnabled;
+        NavMeshMode mMode;
         std::size_t mId;
         DetourNavigator::Version mVersion;
         std::map<DetourNavigator::TilePosition, Tile> mTiles;
diff --git a/apps/openmw/mwrender/navmeshmode.cpp b/apps/openmw/mwrender/navmeshmode.cpp
new file mode 100644
index 0000000000..d08e7cf693
--- /dev/null
+++ b/apps/openmw/mwrender/navmeshmode.cpp
@@ -0,0 +1,16 @@
+#include "navmeshmode.hpp"
+
+#include <stdexcept>
+#include <string>
+
+namespace MWRender
+{
+    NavMeshMode parseNavMeshMode(std::string_view value)
+    {
+        if (value == "area type")
+            return NavMeshMode::AreaType;
+        if (value == "update frequency")
+            return NavMeshMode::UpdateFrequency;
+        throw std::logic_error("Unsupported navigation mesh rendering mode: " + std::string(value));
+    }
+}
diff --git a/apps/openmw/mwrender/navmeshmode.hpp b/apps/openmw/mwrender/navmeshmode.hpp
new file mode 100644
index 0000000000..9401479e21
--- /dev/null
+++ b/apps/openmw/mwrender/navmeshmode.hpp
@@ -0,0 +1,17 @@
+#ifndef OPENMW_MWRENDER_NAVMESHMODE_H
+#define OPENMW_MWRENDER_NAVMESHMODE_H
+
+#include <string_view>
+
+namespace MWRender
+{
+    enum class NavMeshMode
+    {
+        AreaType,
+        UpdateFrequency,
+    };
+
+    NavMeshMode parseNavMeshMode(std::string_view value);
+}
+
+#endif
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 3c032e2fd6..e0869a45dd 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -435,7 +435,8 @@ namespace MWRender
         // It is unnecessary to stop/start the viewer as no frames are being rendered yet.
         mResourceSystem->getSceneManager()->getShaderManager().setGlobalDefines(globalDefines);
 
-        mNavMesh.reset(new NavMesh(mRootNode, mWorkQueue, Settings::Manager::getBool("enable nav mesh render", "Navigator")));
+        mNavMesh.reset(new NavMesh(mRootNode, mWorkQueue, Settings::Manager::getBool("enable nav mesh render", "Navigator"),
+                                   parseNavMeshMode(Settings::Manager::getString("nav mesh render mode", "Navigator"))));
         mActorsPaths.reset(new ActorsPaths(mRootNode, Settings::Manager::getBool("enable agents paths render", "Navigator")));
         mRecastMesh.reset(new RecastMesh(mRootNode, Settings::Manager::getBool("enable recast mesh render", "Navigator")));
         mPathgrid.reset(new Pathgrid(mRootNode));
@@ -1573,4 +1574,9 @@ namespace MWRender
         if (mObjectPaging)
             mObjectPaging->getPagedRefnums(activeGrid, out);
     }
+
+    void RenderingManager::setNavMeshMode(NavMeshMode value)
+    {
+        mNavMesh->setMode(value);
+    }
 }
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index cd4b6edca4..128ef43195 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -10,7 +10,7 @@
 #include <osgUtil/IncrementalCompileOperation>
 
 #include "objects.hpp"
-
+#include "navmeshmode.hpp"
 #include "renderinginterface.hpp"
 #include "rendermode.hpp"
 
@@ -253,6 +253,8 @@ namespace MWRender
 
         void setScreenRes(int width, int height);
 
+        void setNavMeshMode(NavMeshMode value);
+
     private:
         void updateTextureFiltering();
         void updateAmbient();
diff --git a/components/sceneutil/navmesh.cpp b/components/sceneutil/navmesh.cpp
index eac3d17156..a8a9fbac5f 100644
--- a/components/sceneutil/navmesh.cpp
+++ b/components/sceneutil/navmesh.cpp
@@ -10,6 +10,8 @@
 #include <osg/Material>
 #include <osg/PolygonOffset>
 
+#include <algorithm>
+
 namespace
 {
     // Copied from https://github.com/recastnavigation/recastnavigation/blob/c5cbd53024c8a9d8d097a4371215e3342d2fdc87/DebugUtils/Source/DetourDebugDraw.cpp#L26-L38
@@ -107,15 +109,46 @@ namespace
         dd->end();
     }
 
+    float getHeat(unsigned salt, unsigned minSalt, unsigned maxSalt)
+    {
+        if (salt < minSalt)
+            return 0;
+        if (salt > maxSalt)
+            return 1;
+        if (maxSalt <= minSalt)
+            return 0.5;
+        return static_cast<float>(salt - minSalt) / static_cast<float>(maxSalt - minSalt);
+    }
+
+    int getRgbaComponent(float v, int base)
+    {
+        return static_cast<int>(std::round(v * base));
+    }
+
+    unsigned heatToColor(float heat, int alpha)
+    {
+        constexpr int min = 100;
+        constexpr int max = 200;
+        if (heat < 0.25f)
+            return duRGBA(min, min + getRgbaComponent(4 * heat, max - min), max, alpha);
+        if (heat < 0.5f)
+            return duRGBA(min, max, min + getRgbaComponent(1 - 4 * (heat - 0.5f), max - min), alpha);
+        if (heat < 0.75f)
+            return duRGBA(min + getRgbaComponent(4 * (heat - 0.5f), max - min), max, min, alpha);
+        return duRGBA(max, min + getRgbaComponent(1 - 4 * (heat - 0.75f), max - min), min, alpha);
+    }
+
     // Based on https://github.com/recastnavigation/recastnavigation/blob/c5cbd53024c8a9d8d097a4371215e3342d2fdc87/DebugUtils/Source/DetourDebugDraw.cpp#L120-L235
     void drawMeshTile(duDebugDraw* dd, const dtNavMesh& mesh, const dtNavMeshQuery* query,
-        const dtMeshTile* tile, unsigned char flags)
+        const dtMeshTile* tile, unsigned char flags, float heat)
     {
+        using namespace SceneUtil;
+
         dtPolyRef base = mesh.getPolyRefBase(tile);
 
         int tileNum = mesh.decodePolyIdTile(base);
-        const unsigned int tileNumColor = duIntToCol(tileNum, 128);
         const unsigned alpha = tile->header->userId == 0 ? 64 : 128;
+        const unsigned int tileNumColor = duIntToCol(tileNum, alpha);
 
         dd->depthMask(false);
 
@@ -133,8 +166,10 @@ namespace
                 col = duRGBA(255, 196, 0, alpha);
             else
             {
-                if (flags & DU_DRAWNAVMESH_COLOR_TILES)
+                if (flags & NavMeshTileDrawFlagsColorTiles)
                     col = duTransCol(tileNumColor, alpha);
+                else if (flags & NavMeshTileDrawFlagsHeat)
+                    col = heatToColor(heat, alpha);
                 else
                     col = duTransCol(dd->areaToCol(p->getArea()), alpha);
             }
@@ -159,7 +194,7 @@ namespace
         // Draw outer poly boundaries
         drawPolyBoundaries(dd, tile, duRGBA(0,48,64,220), 2.5f, false);
 
-        if (flags & DU_DRAWNAVMESH_OFFMESHCONS)
+        if (flags & NavMeshTileDrawFlagsOffMeshConnections)
         {
             dd->begin(DU_DRAW_LINES, 2.0f);
             for (int i = 0; i < tile->header->polyCount; ++i)
@@ -246,7 +281,7 @@ namespace SceneUtil
 
     osg::ref_ptr<osg::Group> createNavMeshTileGroup(const dtNavMesh& navMesh, const dtMeshTile& meshTile,
         const DetourNavigator::Settings& settings, const osg::ref_ptr<osg::StateSet>& groupStateSet,
-        const osg::ref_ptr<osg::StateSet>& debugDrawStateSet)
+        const osg::ref_ptr<osg::StateSet>& debugDrawStateSet, unsigned char flags, unsigned minSalt, unsigned maxSalt)
     {
         if (meshTile.header == nullptr)
             return nullptr;
@@ -257,7 +292,7 @@ namespace SceneUtil
         DebugDraw debugDraw(*group, debugDrawStateSet, osg::Vec3f(0, 0, shift), 1.0f / settings.mRecast.mRecastScaleFactor);
         dtNavMeshQuery navMeshQuery;
         navMeshQuery.init(&navMesh, settings.mDetour.mMaxNavMeshQueryNodes);
-        drawMeshTile(&debugDraw, navMesh, &navMeshQuery, &meshTile, DU_DRAWNAVMESH_OFFMESHCONS | DU_DRAWNAVMESH_CLOSEDLIST);
+        drawMeshTile(&debugDraw, navMesh, &navMeshQuery, &meshTile, flags, getHeat(meshTile.salt, minSalt, maxSalt));
 
         return group;
     }
diff --git a/components/sceneutil/navmesh.hpp b/components/sceneutil/navmesh.hpp
index ca9b8bd570..95d79ea4de 100644
--- a/components/sceneutil/navmesh.hpp
+++ b/components/sceneutil/navmesh.hpp
@@ -19,11 +19,19 @@ namespace DetourNavigator
 
 namespace SceneUtil
 {
+    enum NavMeshTileDrawFlags : unsigned char
+    {
+        NavMeshTileDrawFlagsOffMeshConnections = 1,
+        NavMeshTileDrawFlagsClosedList = 1 << 1,
+        NavMeshTileDrawFlagsColorTiles = 1 << 2,
+        NavMeshTileDrawFlagsHeat = 1 << 3,
+    };
+
     osg::ref_ptr<osg::StateSet> makeNavMeshTileStateSet();
 
     osg::ref_ptr<osg::Group> createNavMeshTileGroup(const dtNavMesh& navMesh, const dtMeshTile& meshTile,
         const DetourNavigator::Settings& settings, const osg::ref_ptr<osg::StateSet>& groupStateSet,
-        const osg::ref_ptr<osg::StateSet>& debugDrawStateSet);
+        const osg::ref_ptr<osg::StateSet>& debugDrawStateSet, unsigned char flags, unsigned minSalt, unsigned maxSalt);
 }
 
 #endif
diff --git a/docs/source/reference/lua-scripting/api.rst b/docs/source/reference/lua-scripting/api.rst
index c3b77a15ee..3538eca9e5 100644
--- a/docs/source/reference/lua-scripting/api.rst
+++ b/docs/source/reference/lua-scripting/api.rst
@@ -21,6 +21,7 @@ Lua API reference
     openmw_ui
     openmw_camera
     openmw_postprocessing
+    openmw_debug
     openmw_aux_calendar
     openmw_aux_util
     openmw_aux_time
@@ -47,54 +48,14 @@ It can not be overloaded even if there is a lua file with the same name.
 The list of available packages is different for global and for local scripts.
 Player scripts are local scripts that are attached to a player.
 
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-| Package                                                    | Can be used        | Description                                                   |
-+============================================================+====================+===============================================================+
-|:ref:`openmw.interfaces <Script interfaces>`                | everywhere         | | Public interfaces of other scripts.                         |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.util <Package openmw.util>`                    | everywhere         | | Defines utility functions and classes like 3D vectors,      |
-|                                                            |                    | | that don't depend on the game world.                        |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.storage <Package openmw.storage>`              | everywhere         | | Storage API. In particular can be used to store data        |
-|                                                            |                    | | between game sessions.                                      |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.core <Package openmw.core>`                    | everywhere         | | Functions that are common for both global and local scripts |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.types <Package openmw.types>`                  | everywhere         | | Functions for specific types of game objects.               |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.async <Package openmw.async>`                  | everywhere         | | Timers (implemented) and coroutine utils (not implemented)  |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.world <Package openmw.world>`                  | by global scripts  | | Read-write access to the game world.                        |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.self <Package openmw.self>`                    | by local scripts   | | Full access to the object the script is attached to.        |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.nearby <Package openmw.nearby>`                | by local scripts   | | Read-only access to the nearest area of the game world.     |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.input <Package openmw.input>`                  | by player scripts  | | User input.                                                 |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.ui <Package openmw.ui>`                        | by player scripts  | | Controls :ref:`user interface <User interface reference>`.  |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.camera <Package openmw.camera>`                | by player scripts  | | Controls camera.                                            |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.postprocessing <Package openmw.postprocessing>`| by player scripts  | | Controls post-process shaders.                              |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+.. include:: tables/packages.rst
 
 **openmw_aux**
 
 ``openmw_aux.*`` are built-in libraries that are itself implemented in Lua. They can not do anything that is not possible with the basic API, they only make it more convenient.
 Sources can be found in ``resources/vfs/openmw_aux``. In theory mods can override them, but it is not recommended.
 
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-| Built-in library                                        | Can be used        | Description                                                   |
-+=========================================================+====================+===============================================================+
-|:ref:`openmw_aux.calendar <Package openmw_aux.calendar>` | everywhere         | | Game time calendar                                          |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw_aux.util <Package openmw_aux.util>`         | everywhere         | | Miscellaneous utils                                         |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw_aux.time <Package openmw_aux.time>`         | everywhere         | | Timers and game time utils                                  |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw_aux.ui <Package openmw_aux.ui>`             | by player scripts  | | User interface utils                                        |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+.. include:: tables/aux_packages.rst
 
 **Interfaces of built-in scripts**
 
diff --git a/docs/source/reference/lua-scripting/openmw_debug.rst b/docs/source/reference/lua-scripting/openmw_debug.rst
new file mode 100644
index 0000000000..5be48f6558
--- /dev/null
+++ b/docs/source/reference/lua-scripting/openmw_debug.rst
@@ -0,0 +1,5 @@
+Package openmw.debug
+====================
+
+.. raw:: html
+   :file: generated_html/openmw_debug.html
diff --git a/docs/source/reference/lua-scripting/overview.rst b/docs/source/reference/lua-scripting/overview.rst
index 74fed7195c..47f8d09e2d 100644
--- a/docs/source/reference/lua-scripting/overview.rst
+++ b/docs/source/reference/lua-scripting/overview.rst
@@ -340,37 +340,7 @@ It can not be overloaded even if there is a lua file with the same name.
 The list of available packages is different for global and for local scripts.
 Player scripts are local scripts that are attached to a player.
 
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-| Package                                                    | Can be used        | Description                                                   |
-+============================================================+====================+===============================================================+
-|:ref:`openmw.interfaces <Script interfaces>`                | everywhere         | | Public interfaces of other scripts.                         |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.util <Package openmw.util>`                    | everywhere         | | Defines utility functions and classes like 3D vectors,      |
-|                                                            |                    | | that don't depend on the game world.                        |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.storage <Package openmw.storage>`              | everywhere         | | Storage API. In particular can be used to store data        |
-|                                                            |                    | | between game sessions.                                      |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.core <Package openmw.core>`                    | everywhere         | | Functions that are common for both global and local scripts |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.types <Package openmw.types>`                  | everywhere         | | Functions for specific types of game objects.               |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.async <Package openmw.async>`                  | everywhere         | | Timers (implemented) and coroutine utils (not implemented)  |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.world <Package openmw.world>`                  | by global scripts  | | Read-write access to the game world.                        |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.self <Package openmw.self>`                    | by local scripts   | | Full access to the object the script is attached to.        |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.nearby <Package openmw.nearby>`                | by local scripts   | | Read-only access to the nearest area of the game world.     |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.input <Package openmw.input>`                  | by player scripts  | | User input                                                  |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.ui <Package openmw.ui>`                        | by player scripts  | | Controls :ref:`user interface <User interface reference>`   |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.camera <Package openmw.camera>`                | by player scripts  | | Controls camera                                             |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw.postprocessing <Package openmw.postprocessing>`| by player scripts  | | Controls postprocess shaders                                |
-+------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+.. include:: tables/packages.rst
 
 openmw_aux
 ----------
@@ -378,15 +348,7 @@ openmw_aux
 ``openmw_aux.*`` are built-in libraries that are themselves implemented in Lua. They can not do anything that is not possible with the basic API, they only make it more convenient.
 Sources can be found in ``resources/vfs/openmw_aux``. In theory mods can override them, but it is not recommended.
 
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-| Built-in library                                        | Can be used        | Description                                                   |
-+=========================================================+====================+===============================================================+
-|:ref:`openmw_aux.calendar <Package openmw_aux.calendar>` | everywhere         | | Game time calendar                                          |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw_aux.util <Package openmw_aux.util>`         | everywhere         | | Miscellaneous utils                                         |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
-|:ref:`openmw_aux.time <Package openmw_aux.time>`         | everywhere         | | Timers and game time utils                                  |
-+---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+.. include:: tables/aux_packages.rst
 
 They can be loaded with ``require`` the same as API packages. For example:
 
diff --git a/docs/source/reference/lua-scripting/tables/aux_packages.rst b/docs/source/reference/lua-scripting/tables/aux_packages.rst
new file mode 100644
index 0000000000..928e5821de
--- /dev/null
+++ b/docs/source/reference/lua-scripting/tables/aux_packages.rst
@@ -0,0 +1,11 @@
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+| Built-in library                                        | Can be used        | Description                                                   |
++=========================================================+====================+===============================================================+
+|:ref:`openmw_aux.calendar <Package openmw_aux.calendar>` | everywhere         | | Game time calendar                                          |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw_aux.util <Package openmw_aux.util>`         | everywhere         | | Miscellaneous utils                                         |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw_aux.time <Package openmw_aux.time>`         | everywhere         | | Timers and game time utils                                  |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw_aux.ui <Package openmw_aux.ui>`             | by player scripts  | | User interface utils                                        |
++---------------------------------------------------------+--------------------+---------------------------------------------------------------+
diff --git a/docs/source/reference/lua-scripting/tables/packages.rst b/docs/source/reference/lua-scripting/tables/packages.rst
new file mode 100644
index 0000000000..27f5c0ff6e
--- /dev/null
+++ b/docs/source/reference/lua-scripting/tables/packages.rst
@@ -0,0 +1,33 @@
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+| Package                                                    | Can be used        | Description                                                   |
++============================================================+====================+===============================================================+
+|:ref:`openmw.interfaces <Script interfaces>`                | everywhere         | | Public interfaces of other scripts.                         |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.util <Package openmw.util>`                    | everywhere         | | Defines utility functions and classes like 3D vectors,      |
+|                                                            |                    | | that don't depend on the game world.                        |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.storage <Package openmw.storage>`              | everywhere         | | Storage API. In particular can be used to store data        |
+|                                                            |                    | | between game sessions.                                      |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.core <Package openmw.core>`                    | everywhere         | | Functions that are common for both global and local scripts |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.types <Package openmw.types>`                  | everywhere         | | Functions for specific types of game objects.               |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.async <Package openmw.async>`                  | everywhere         | | Timers (implemented) and coroutine utils (not implemented)  |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.world <Package openmw.world>`                  | by global scripts  | | Read-write access to the game world.                        |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.self <Package openmw.self>`                    | by local scripts   | | Full access to the object the script is attached to.        |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.nearby <Package openmw.nearby>`                | by local scripts   | | Read-only access to the nearest area of the game world.     |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.input <Package openmw.input>`                  | by player scripts  | | User input.                                                 |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.ui <Package openmw.ui>`                        | by player scripts  | | Controls :ref:`user interface <User interface reference>`.  |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.camera <Package openmw.camera>`                | by player scripts  | | Controls camera.                                            |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.postprocessing <Package openmw.postprocessing>`| by player scripts  | | Controls post-process shaders.                              |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
+|:ref:`openmw.debug <Package openmw.debug>`                  | by player scripts  | | Collection of debug utils.                                  |
++------------------------------------------------------------+--------------------+---------------------------------------------------------------+
diff --git a/docs/source/reference/modding/settings/navigator.rst b/docs/source/reference/modding/settings/navigator.rst
index 85924ca8cc..5220d500fc 100644
--- a/docs/source/reference/modding/settings/navigator.rst
+++ b/docs/source/reference/modding/settings/navigator.rst
@@ -204,11 +204,22 @@ enable nav mesh render
 :Range:		True/False
 :Default:	False
 
-Render nav mesh.
+Render navigation mesh.
 Allows to do in-game debug.
 Every nav mesh is visible and every update is noticable.
 Potentially decreases performance.
 
+nav mesh render mode
+--------------------
+
+:Type:		string
+:Range:		"area type", "update frequency"
+:Default:	"area type"
+
+Render navigation mesh in specific mode.
+"area type" - show area types using different colours.
+"update frequency" - show tiles update frequency as a heatmap.
+
 enable agents paths render
 --------------------------
 
diff --git a/files/builtin_scripts/scripts/omw/console/player.lua b/files/builtin_scripts/scripts/omw/console/player.lua
index fd4309b610..464482e7ad 100644
--- a/files/builtin_scripts/scripts/omw/console/player.lua
+++ b/files/builtin_scripts/scripts/omw/console/player.lua
@@ -78,6 +78,7 @@ local env = {
     ui = require('openmw.ui'),
     camera = require('openmw.camera'),
     aux_util = require('openmw_aux.util'),
+    debug = require('openmw.debug'),
     view = require('openmw_aux.util').deepToString,
     print = printToConsole,
     exit = exitLuaMode,
diff --git a/files/lua_api/CMakeLists.txt b/files/lua_api/CMakeLists.txt
index d2447fa80c..2e8d3d7b83 100644
--- a/files/lua_api/CMakeLists.txt
+++ b/files/lua_api/CMakeLists.txt
@@ -14,9 +14,9 @@ set(LUA_API_FILES
     openmw/world.lua
     openmw/types.lua
     openmw/postprocessing.lua
+    openmw/debug.lua
 )
 
 foreach (f ${LUA_API_FILES})
     copy_resource_file("${CMAKE_CURRENT_SOURCE_DIR}/${f}" "${OpenMW_BINARY_DIR}" "resources/lua_api/${f}")
 endforeach (f)
-
diff --git a/files/lua_api/openmw/debug.lua b/files/lua_api/openmw/debug.lua
new file mode 100644
index 0000000000..1641489317
--- /dev/null
+++ b/files/lua_api/openmw/debug.lua
@@ -0,0 +1,44 @@
+---
+-- `openmw.debug` is an interface to the engine debug utils.
+-- Can be used only by local scripts, that are attached to a player.
+-- @module debug
+-- @usage local debug = require('openmw.debug')
+
+
+---
+-- Rendering modes
+-- @type RENDER_MODE
+-- @field [parent=#RENDER_MODE] #number CollisionDebug
+-- @field [parent=#RENDER_MODE] #number Wireframe
+-- @field [parent=#RENDER_MODE] #number Pathgrid
+-- @field [parent=#RENDER_MODE] #number Water
+-- @field [parent=#RENDER_MODE] #number Scene
+-- @field [parent=#RENDER_MODE] #number NavMesh
+-- @field [parent=#RENDER_MODE] #number ActorsPaths
+-- @field [parent=#RENDER_MODE] #number RecastMesh
+
+---
+-- Rendering mode values
+-- @field [parent=#debug] #RENDER_MODE RENDER_MODE
+
+---
+-- Toggles rendering mode
+-- @function [parent=#debug] toggleRenderMode
+-- @param #RENDER_MODE value
+
+---
+-- Navigation mesh rendering modes
+-- @type NAV_MESH_RENDER_MODE
+-- @field [parent=#NAV_MESH_RENDER_MODE] #number AreaType
+-- @field [parent=#NAV_MESH_RENDER_MODE] #number UpdateFrequency
+
+---
+-- Navigation mesh rendering mode values
+-- @field [parent=#debug] #NAV_MESH_RENDER_MODE NAV_MESH_RENDER_MODE
+
+---
+-- Sets navigation mesh rendering mode
+-- @function [parent=#debug] setNavMeshRenderMode
+-- @param #NAV_MESH_RENDER_MODE value
+
+return nil
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index ed392d44e4..0e2e5e4c44 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -941,6 +941,9 @@ nav mesh path prefix =
 # Render nav mesh (true, false)
 enable nav mesh render = false
 
+# Navigation mesh rendering mode (default, update frequency)
+nav mesh render mode = area type
+
 # Render agents paths (true, false)
 enable agents paths render = false
 

From f6b21b81605ea58b81c10415dc5770dc63e004c8 Mon Sep 17 00:00:00 2001
From: eldercare cognition <hatbox_lyric@protonmail.com>
Date: Tue, 17 May 2022 04:40:23 +0000
Subject: [PATCH 2453/2859] Update install-openmw.rst with instructions for
 installing via flatpak.

---
 docs/source/manuals/installation/install-openmw.rst | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/source/manuals/installation/install-openmw.rst b/docs/source/manuals/installation/install-openmw.rst
index 362637746d..31faa990fa 100644
--- a/docs/source/manuals/installation/install-openmw.rst
+++ b/docs/source/manuals/installation/install-openmw.rst
@@ -61,3 +61,13 @@ However, it depends on several packages which are not in stable,
 so it is not possible to install OpenMW in Wheezy without creating a FrankenDebian.
 This is not recommended or supported.
 
+The Flatpak Way
+===============
+
+OpenMW is available as a flatpak. With flatpak installed, run the command below. It should show up on your desktop.
+::
+
+	# flatpak install openmw
+
+
+

From 18d05c8f1a878f173fab77ebebb1ba8e3bc66bc0 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 17 May 2022 13:19:39 +0200
Subject: [PATCH 2454/2859] Use proper variable to check in if condition

---
 components/stereo/multiview.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/stereo/multiview.cpp b/components/stereo/multiview.cpp
index de48bf6d17..c5963632ce 100644
--- a/components/stereo/multiview.cpp
+++ b/components/stereo/multiview.cpp
@@ -167,8 +167,8 @@ namespace Stereo
             return;
         }
 
-        auto targetTextureObject = texture.getTextureObject(contextId);
-        if (!sourceTextureObject)
+        osg::Texture::TextureObject* const targetTextureObject = texture.getTextureObject(contextId);
+        if (targetTextureObject == nullptr)
         {
             Log(Debug::Error) << "Texture2DViewSubloadCallback: Texture2D did not have a texture object";
             return;

From cb99e8643a6b2c2afab155eb2935248b47f0e8a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Tue, 17 May 2022 17:39:00 +0300
Subject: [PATCH 2455/2859] Use World prng for selection of random creature
 spawning

---
 apps/openmw/mwworld/worldimp.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index cda1940ac4..8c1eb40c41 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -3697,7 +3697,7 @@ namespace MWWorld
         const ESM::CreatureLevList* list = mStore.get<ESM::CreatureLevList>().find(creatureList);
 
         static int iNumberCreatures = mStore.get<ESM::GameSetting>().find("iNumberCreatures")->mValue.getInteger();
-        int numCreatures = 1 + Misc::Rng::rollDice(iNumberCreatures); // [1, iNumberCreatures]
+        int numCreatures = 1 + Misc::Rng::rollDice(iNumberCreatures, mPrng); // [1, iNumberCreatures]
 
         for (int i=0; i<numCreatures; ++i)
         {

From 3a90bc71876c9b56aa06e51cc67f53349b25cedc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Tue, 17 May 2022 17:39:37 +0300
Subject: [PATCH 2456/2859] Use World prng for head/blink animations

---
 apps/openmw/mwrender/npcanimation.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 7ce5594f96..8a7da4c800 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -142,7 +142,8 @@ void HeadAnimationTime::setEnabled(bool enabled)
 
 void HeadAnimationTime::resetBlinkTimer()
 {
-    mBlinkTimer = -(2.0f + Misc::Rng::rollDice(6));
+    auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+    mBlinkTimer = -(2.0f + Misc::Rng::rollDice(6, prng));
 }
 
 void HeadAnimationTime::update(float dt)

From b2fab5f5adf4e00f33915419cb0a8fda4c2e805c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Tue, 17 May 2022 17:40:58 +0300
Subject: [PATCH 2457/2859] Use World prng for weather system as it influences
 actors

---
 apps/openmw/mwworld/weather.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index eb0226d506..1e12d0b1dd 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -226,8 +226,8 @@ namespace MWWorld
             if(transitionRatio >= mThunderThreshold && mThunderFrequency > 0.0f)
             {
                 flashDecrement(elapsedSeconds);
-
-                if(Misc::Rng::rollProbability() <= thunderChance(transitionRatio, elapsedSeconds))
+                auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+                if(Misc::Rng::rollProbability(prng) <= thunderChance(transitionRatio, elapsedSeconds))
                 {
                     lightningAndThunder();
                 }
@@ -265,7 +265,8 @@ namespace MWWorld
         // They appear to go from 0 (brightest, closest) to 3 (faintest, farthest). The value of 0.25 per distance
         // was derived by setting the Flash Decrement to 0.1 and measuring how long each value took to decay to 0.
         // TODO: Determine the distribution of each distance to see if it's evenly weighted.
-        unsigned int distance = Misc::Rng::rollDice(4);
+        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+        unsigned int distance = Misc::Rng::rollDice(4, prng);
         // Flash brightness appears additive, since if multiple strikes occur, it takes longer for it to decay to 0.
         mFlashBrightness += 1 - (distance * 0.25f);
         MWBase::Environment::get().getSoundManager()->playSound(mThunderSoundID[distance], 1.0, 1.0);
@@ -348,7 +349,8 @@ namespace MWWorld
         // All probabilities must add to 100 (responsibility of the user).
         // If chances A and B has values 30 and 70 then by generating 100 numbers 1..100, 30% will be lesser or equal 30
         // and 70% will be greater than 30 (in theory).
-        int chance = Misc::Rng::rollDice(100) + 1; // 1..100
+        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+        int chance = Misc::Rng::rollDice(100, prng) + 1; // 1..100
         int sum = 0;
         int i = 0;
         for(; static_cast<size_t>(i) < mChances.size(); ++i)
@@ -685,7 +687,8 @@ namespace MWWorld
             currentSpeed = targetSpeed;
 
         float multiplier = mWeatherSettings[weatherId].mRainEffect.empty() ? 1.f : 0.5f;
-        float updatedSpeed = (Misc::Rng::rollClosedProbability() - 0.5f) * multiplier * targetSpeed + currentSpeed;
+        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+        float updatedSpeed = (Misc::Rng::rollClosedProbability(prng) - 0.5f) * multiplier * targetSpeed + currentSpeed;
 
         if (updatedSpeed > 0.5f * targetSpeed && updatedSpeed < 2.f * targetSpeed)
             currentSpeed = updatedSpeed;

From 18f16eac4c6d8706b0d1224b14bfa3340d3fd96b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Tue, 17 May 2022 18:04:11 +0300
Subject: [PATCH 2458/2859] Refactor DetourNavigator to pass prng along, use
 world prng for AiWander

---
 apps/openmw/mwmechanics/aiwander.cpp                       | 5 ++++-
 apps/openmw_test_suite/detournavigator/navigator.cpp       | 3 ++-
 components/detournavigator/findrandompointaroundcircle.cpp | 5 +++--
 components/detournavigator/findrandompointaroundcircle.hpp | 2 +-
 components/detournavigator/navigatorutils.cpp              | 4 ++--
 components/detournavigator/navigatorutils.hpp              | 2 +-
 6 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 378e5a6351..a4da1ebd68 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -359,7 +359,10 @@ namespace MWMechanics
             {
                 // findRandomPointAroundCircle uses wanderDistance as limit for random and not as exact distance
                 if (const auto destination = DetourNavigator::findRandomPointAroundCircle(*navigator, halfExtents,
-                        mInitialActorPosition, wanderDistance, navigatorFlags))
+                    mInitialActorPosition, wanderDistance, navigatorFlags, []() {
+                        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+                        return Misc::Rng::rollProbability(prng);
+                    }))
                     mDestination = *destination;
                 else
                     mDestination = getRandomPointAround(mInitialActorPosition, wanderRadius);
diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index 0e9c20fb9a..c98a5b7a90 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -819,7 +819,8 @@ namespace
 
         Misc::Rng::init(42);
 
-        const auto result = findRandomPointAroundCircle(*mNavigator, mAgentHalfExtents, mStart, 100.0, Flag_walk);
+        const auto result = findRandomPointAroundCircle(*mNavigator, mAgentHalfExtents, mStart, 100.0, Flag_walk, 
+            []() { return Misc::Rng::rollClosedProbability(); });
 
         ASSERT_THAT(result, Optional(Vec3fEq(70.35845947265625, 335.592041015625, -2.6667339801788330078125)))
             << (result ? *result : osg::Vec3f());
diff --git a/components/detournavigator/findrandompointaroundcircle.cpp b/components/detournavigator/findrandompointaroundcircle.cpp
index 1e1e2401c5..6bd761c817 100644
--- a/components/detournavigator/findrandompointaroundcircle.cpp
+++ b/components/detournavigator/findrandompointaroundcircle.cpp
@@ -10,7 +10,7 @@
 namespace DetourNavigator
 {
     std::optional<osg::Vec3f> findRandomPointAroundCircle(const dtNavMesh& navMesh, const osg::Vec3f& halfExtents,
-        const osg::Vec3f& start, const float maxRadius, const Flags includeFlags, const DetourSettings& settings)
+        const osg::Vec3f& start, const float maxRadius, const Flags includeFlags, const DetourSettings& settings, float(*prng)())
     {
         dtNavMeshQuery navMeshQuery;
         if (!initNavMeshQuery(navMeshQuery, navMesh, settings.mMaxNavMeshQueryNodes))
@@ -25,8 +25,9 @@ namespace DetourNavigator
 
         dtPolyRef resultRef = 0;
         osg::Vec3f resultPosition;
+
         navMeshQuery.findRandomPointAroundCircle(startRef, start.ptr(), maxRadius, &queryFilter,
-            []() { return Misc::Rng::rollProbability(); }, &resultRef, resultPosition.ptr());
+            prng, &resultRef, resultPosition.ptr());
 
         if (resultRef == 0)
             return std::optional<osg::Vec3f>();
diff --git a/components/detournavigator/findrandompointaroundcircle.hpp b/components/detournavigator/findrandompointaroundcircle.hpp
index 89a3c0964c..346ad36e4e 100644
--- a/components/detournavigator/findrandompointaroundcircle.hpp
+++ b/components/detournavigator/findrandompointaroundcircle.hpp
@@ -13,7 +13,7 @@ namespace DetourNavigator
     struct DetourSettings;
 
     std::optional<osg::Vec3f> findRandomPointAroundCircle(const dtNavMesh& navMesh, const osg::Vec3f& halfExtents,
-        const osg::Vec3f& start, const float maxRadius, const Flags includeFlags, const DetourSettings& settings);
+        const osg::Vec3f& start, const float maxRadius, const Flags includeFlags, const DetourSettings& settings, float(*prng)());
 }
 
 #endif
diff --git a/components/detournavigator/navigatorutils.cpp b/components/detournavigator/navigatorutils.cpp
index bfb0946b9e..a64343905d 100644
--- a/components/detournavigator/navigatorutils.cpp
+++ b/components/detournavigator/navigatorutils.cpp
@@ -6,7 +6,7 @@
 namespace DetourNavigator
 {
     std::optional<osg::Vec3f> findRandomPointAroundCircle(const Navigator& navigator, const osg::Vec3f& agentHalfExtents,
-        const osg::Vec3f& start, const float maxRadius, const Flags includeFlags)
+        const osg::Vec3f& start, const float maxRadius, const Flags includeFlags, float(*prng)())
     {
         const auto navMesh = navigator.getNavMesh(agentHalfExtents);
         if (!navMesh)
@@ -14,7 +14,7 @@ namespace DetourNavigator
         const auto& settings = navigator.getSettings();
         const auto result = DetourNavigator::findRandomPointAroundCircle(navMesh->lockConst()->getImpl(),
             toNavMeshCoordinates(settings.mRecast, agentHalfExtents), toNavMeshCoordinates(settings.mRecast, start),
-            toNavMeshCoordinates(settings.mRecast, maxRadius), includeFlags, settings.mDetour);
+            toNavMeshCoordinates(settings.mRecast, maxRadius), includeFlags, settings.mDetour, prng);
         if (!result)
             return std::nullopt;
         return std::optional<osg::Vec3f>(fromNavMeshCoordinates(settings.mRecast, *result));
diff --git a/components/detournavigator/navigatorutils.hpp b/components/detournavigator/navigatorutils.hpp
index 8f3b6161f9..8bd1499897 100644
--- a/components/detournavigator/navigatorutils.hpp
+++ b/components/detournavigator/navigatorutils.hpp
@@ -51,7 +51,7 @@ namespace DetourNavigator
      * @return not empty optional with position if point is found and empty optional if point is not found.
      */
     std::optional<osg::Vec3f> findRandomPointAroundCircle(const Navigator& navigator, const osg::Vec3f& agentHalfExtents,
-        const osg::Vec3f& start, const float maxRadius, const Flags includeFlags);
+        const osg::Vec3f& start, const float maxRadius, const Flags includeFlags, float(*prng)());
 
     /**
      * @brief raycast finds farest navmesh point from start on a line from start to end that has path from start.

From 5df9573e543138646c3a0278f4ffca0411c36319 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Tue, 17 May 2022 21:42:14 +0200
Subject: [PATCH 2459/2859] Improve a bit our SAST

---
 .gitlab-ci.yml            | 2 +-
 .gitlab/sast-ruleset.toml | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7b8b406a64..da23280c72 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,7 @@ variables:
   ARTIFACT_COMPRESSION_LEVEL: "fast"
   CACHE_COMPRESSION_LEVEL: "fast"
   SAST_EXCLUDED_ANALYZERS: "bandit"
-  SAST_EXCLUDED_PATHS: spec,test,tests,tmp,extern
+  SAST_EXCLUDED_PATHS: "extern"
 
 .Ubuntu_Image:
   tags:
diff --git a/.gitlab/sast-ruleset.toml b/.gitlab/sast-ruleset.toml
index fb111405fa..543ceb4ca7 100644
--- a/.gitlab/sast-ruleset.toml
+++ b/.gitlab/sast-ruleset.toml
@@ -69,3 +69,8 @@
 		[flawfinder.ruleset.identifier]
 			type = "flawfinder_func_name"
 			value = "printf"  # only false positives, sigh
+	[[flawfinder.ruleset]]
+		disable = true
+		[flawfinder.ruleset.identifier]
+			type = "flawfinder_func_name"
+			value = "system"  # only false positives, sigh

From 96f4057f08190f8d0d8718cea22a5861cc95b79f Mon Sep 17 00:00:00 2001
From: Adam Ibrahim <ibrahimadam193@gmail.com>
Date: Wed, 18 May 2022 03:22:12 +0000
Subject: [PATCH 2460/2859] Update files/lua_api/openmw/types.lua,
 files/lua_api/openmw/ui.lua

---
 files/lua_api/openmw/types.lua | 2 +-
 files/lua_api/openmw/ui.lua    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/lua_api/openmw/types.lua b/files/lua_api/openmw/types.lua
index ae40cee595..93498dab06 100644
--- a/files/lua_api/openmw/types.lua
+++ b/files/lua_api/openmw/types.lua
@@ -659,7 +659,7 @@
 -- @field #string id Record id
 -- @field #string name Human-readable name
 -- @field #string model VFS path to the model
--- @field #string mwscript MWScript on this door (can be empty)
+-- @field #string mwscript MWScript on this weapon (can be empty)
 -- @field #string icon
 -- @field #string enchant
 -- @field #boolean isMagical
diff --git a/files/lua_api/openmw/ui.lua b/files/lua_api/openmw/ui.lua
index 52660a5c3e..164d8768a9 100644
--- a/files/lua_api/openmw/ui.lua
+++ b/files/lua_api/openmw/ui.lua
@@ -127,7 +127,7 @@
 -- end
 
 ---
--- Index of the layer with the givent name. Returns nil if the layer doesn't exist
+-- Index of the layer with the given name. Returns nil if the layer doesn't exist
 -- @function [parent=#Layers] indexOf
 -- @param #string name Name of the layer
 -- @return #number, #nil index

From 93aae5e116b8ef3abacf0f9bddde8f14dba7ea72 Mon Sep 17 00:00:00 2001
From: kuyondo <rdja.kyd@gmail.com>
Date: Thu, 19 May 2022 04:23:22 +0800
Subject: [PATCH 2461/2859] Add lua binding for activators

---
 apps/openmw/CMakeLists.txt            |  2 +-
 apps/openmw/mwlua/types/activator.cpp | 30 +++++++++++++++++++++++++++
 apps/openmw/mwlua/types/types.cpp     |  2 +-
 apps/openmw/mwlua/types/types.hpp     |  1 +
 files/lua_api/openmw/types.lua        | 13 ++++++++++++
 5 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 apps/openmw/mwlua/types/activator.cpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index f0ee1639a1..b4a8bdac80 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -62,7 +62,7 @@ add_openmw_dir (mwlua
     luamanagerimp object worldview userdataserializer eventqueue
     luabindings localscripts playerscripts objectbindings cellbindings asyncbindings settingsbindings
     camerabindings uibindings inputbindings nearbybindings postprocessingbindings stats debugbindings
-    types/types types/door types/actor types/container types/weapon types/npc types/creature
+    types/types types/door types/actor types/container types/weapon types/npc types/creature types/activator
     )
 
 add_openmw_dir (mwsound
diff --git a/apps/openmw/mwlua/types/activator.cpp b/apps/openmw/mwlua/types/activator.cpp
new file mode 100644
index 0000000000..825a464878
--- /dev/null
+++ b/apps/openmw/mwlua/types/activator.cpp
@@ -0,0 +1,30 @@
+#include "types.hpp"
+
+#include <components/esm3/loadacti.hpp>
+
+#include <apps/openmw/mwworld/esmstore.hpp>
+
+#include "../luabindings.hpp"
+
+namespace sol
+{
+    template <>
+    struct is_automagical<ESM::Activator> : std::false_type {};
+}
+
+namespace MWLua
+{
+    void addActivatorBindings(sol::table activator, const Context& context)
+    {
+        const MWWorld::Store<ESM::Activator>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Activator>();
+        activator["record"] = sol::overload(
+            [](const Object& obj) -> const ESM::Activator* { return obj.ptr().get<ESM::Activator>()->mBase; },
+            [store](const std::string& recordId) -> const ESM::Activator* { return store->find(recordId); });
+        sol::usertype<ESM::Activator> record = context.mLua->sol().new_usertype<ESM::Activator>("ESM3_Activator");
+        record[sol::meta_function::to_string] = [](const ESM::Activator& rec) { return "ESM3_Activator[" + rec.mId + "]"; };
+        record["id"] = sol::readonly_property([](const ESM::Activator& rec) -> std::string { return rec.mId; });
+        record["name"] = sol::readonly_property([](const ESM::Activator& rec) -> std::string { return rec.mName; });
+        record["model"] = sol::readonly_property([](const ESM::Activator& rec) -> std::string { return rec.mModel; });
+        record["mwscript"] = sol::readonly_property([](const ESM::Activator& rec) -> std::string { return rec.mScript; });
+    }
+}
diff --git a/apps/openmw/mwlua/types/types.cpp b/apps/openmw/mwlua/types/types.cpp
index f8b20ea59c..bc707059e8 100644
--- a/apps/openmw/mwlua/types/types.cpp
+++ b/apps/openmw/mwlua/types/types.cpp
@@ -172,7 +172,7 @@ namespace MWLua
         addType(ObjectTypeName::Probe, {ESM::REC_PROB}, ObjectTypeName::Item);
         addType(ObjectTypeName::Repair, {ESM::REC_REPA}, ObjectTypeName::Item);
 
-        addType(ObjectTypeName::Activator, {ESM::REC_ACTI});
+        addActivatorBindings(addType(ObjectTypeName::Activator, {ESM::REC_ACTI}), context);
         addContainerBindings(addType(ObjectTypeName::Container, {ESM::REC_CONT}), context);
         addDoorBindings(addType(ObjectTypeName::Door, {ESM::REC_DOOR}), context);
         addType(ObjectTypeName::Static, {ESM::REC_STAT});
diff --git a/apps/openmw/mwlua/types/types.hpp b/apps/openmw/mwlua/types/types.hpp
index bd4cb5e384..8373162995 100644
--- a/apps/openmw/mwlua/types/types.hpp
+++ b/apps/openmw/mwlua/types/types.hpp
@@ -24,6 +24,7 @@ namespace MWLua
     sol::table initTypesPackage(const Context& context);
 
     // used in initTypesPackage
+    void addActivatorBindings(sol::table activator, const Context& context);
     void addContainerBindings(sol::table container, const Context& context);
     void addDoorBindings(sol::table door, const Context& context);
     void addActorBindings(sol::table actor, const Context& context);
diff --git a/files/lua_api/openmw/types.lua b/files/lua_api/openmw/types.lua
index 93498dab06..257d926b50 100644
--- a/files/lua_api/openmw/types.lua
+++ b/files/lua_api/openmw/types.lua
@@ -748,6 +748,19 @@
 -- @param openmw.core#GameObject object
 -- @return #boolean
 
+---
+-- Returns the read-only @{#ActivatorRecord} of an activator
+-- @function [parent=#Activator] record
+-- @param #any objectOrRecordId
+-- @return #ActivatorRecord
+
+---
+-- @type ActivatorRecord
+-- @field #string id Record id
+-- @field #string name Human-readable name
+-- @field #string model VFS path to the model
+-- @field #string mwscript MWScript on this activator (can be empty)
+
 --- @{#Container} functions
 -- @field [parent=#types] #Container Container
 

From 3d030527175a1b128b5e1c2aba869e25d8ccef86 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Wed, 18 May 2022 19:45:09 -0700
Subject: [PATCH 2462/2859] dont bind rendertargets unless we use them,
 otherwise texture limit will be reached quickly

---
 apps/openmw/mwlua/postprocessingbindings.cpp   |  2 +-
 apps/openmw/mwrender/postprocessor.cpp         | 16 +++++++++++++---
 components/fx/pass.cpp                         |  3 +++
 components/fx/pass.hpp                         |  8 ++++++--
 components/fx/technique.cpp                    | 15 +++++++++++++++
 docs/source/reference/postprocessing/omwfx.rst | 18 +++++++++++++++++-
 6 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwlua/postprocessingbindings.cpp b/apps/openmw/mwlua/postprocessingbindings.cpp
index b016c7716a..187c9c700b 100644
--- a/apps/openmw/mwlua/postprocessingbindings.cpp
+++ b/apps/openmw/mwlua/postprocessingbindings.cpp
@@ -79,7 +79,7 @@ namespace MWLua
                 shader.mQueuedAction = true;
 
             context.mLuaManager->addAction(
-                [&] { MWBase::Environment::get().getWorld()->getPostProcessor()->enableTechnique(shader.mShader, pos); },
+                [=] { MWBase::Environment::get().getWorld()->getPostProcessor()->enableTechnique(shader.mShader, pos); },
                 "Enable shader " + (shader.mShader ? shader.mShader->getName() : "nil")
             );
         };
diff --git a/apps/openmw/mwrender/postprocessor.cpp b/apps/openmw/mwrender/postprocessor.cpp
index df42daa34c..7e347bdf6d 100644
--- a/apps/openmw/mwrender/postprocessor.cpp
+++ b/apps/openmw/mwrender/postprocessor.cpp
@@ -574,10 +574,11 @@ namespace MWRender
                     uniform->setUniform(node.mRootStateSet->getOrCreateUniform(uniform->mName, type.value()));
             }
 
-            int subTexUnit = texUnit;
+            std::unordered_map<osg::Texture2D*, osg::Texture2D*> renderTargetCache;
 
             for (const auto& pass : technique->getPasses())
             {
+                int subTexUnit = texUnit;
                 fx::DispatchNode::SubPass subPass;
 
                 pass->prepareStateSet(subPass.mStateSet, technique->getName());
@@ -591,6 +592,7 @@ namespace MWRender
                     const auto [w, h] = rt.mSize.get(mWidth, mHeight);
 
                     subPass.mRenderTexture = new osg::Texture2D(*rt.mTarget);
+                    renderTargetCache[rt.mTarget] = subPass.mRenderTexture;
                     subPass.mRenderTexture->setTextureSize(w, h);
                     subPass.mRenderTexture->setName(std::string(pass->getTarget()));
 
@@ -600,10 +602,18 @@ namespace MWRender
                     subPass.mRenderTarget = new osg::FrameBufferObject;
                     subPass.mRenderTarget->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, osg::FrameBufferAttachment(subPass.mRenderTexture));
                     subPass.mStateSet->setAttributeAndModes(new osg::Viewport(0, 0, w, h));
+                }
 
-                    node.mRootStateSet->setTextureAttributeAndModes(subTexUnit, subPass.mRenderTexture);
-                    node.mRootStateSet->addUniform(new osg::Uniform(subPass.mRenderTexture->getName().c_str(), subTexUnit++));
+                for (const auto& whitelist : pass->getRenderTargets())
+                {
+                    auto it = technique->getRenderTargetsMap().find(whitelist);
+                    if (it != technique->getRenderTargetsMap().end() && renderTargetCache[it->second.mTarget])
+                    {
+                        subPass.mStateSet->setTextureAttributeAndModes(subTexUnit, renderTargetCache[it->second.mTarget]);
+                        subPass.mStateSet->addUniform(new osg::Uniform(std::string(it->first).c_str(), subTexUnit++));
+                    }
                 }
+
                 node.mPasses.emplace_back(std::move(subPass));
             }
 
diff --git a/components/fx/pass.cpp b/components/fx/pass.cpp
index 246221eb84..5d9b9c4df7 100644
--- a/components/fx/pass.cpp
+++ b/components/fx/pass.cpp
@@ -200,6 +200,9 @@ float omw_GetPointLightRadius(int index)
             for (size_t pos = header.find(define); pos != std::string::npos; pos = header.find(define))
                 header.replace(pos, define.size(), value);
 
+        for (const auto& target : mRenderTargets)
+            header.append("uniform sampler2D " + std::string(target) + ";");
+
         for (auto& uniform : technique.getUniformMap())
             if (auto glsl = uniform->getGLSL())
                 header.append(glsl.value());
diff --git a/components/fx/pass.hpp b/components/fx/pass.hpp
index bd13c3f99b..1b8ea165e6 100644
--- a/components/fx/pass.hpp
+++ b/components/fx/pass.hpp
@@ -43,7 +43,9 @@ namespace fx
 
         void compile(Technique& technique, std::string_view preamble);
 
-        std::string_view getTarget() const { return mTarget; }
+        std::string getTarget() const { return mTarget; }
+
+        const std::array<std::string, 3>& getRenderTargets() const { return mRenderTargets; }
 
         void prepareStateSet(osg::StateSet* stateSet, const std::string& name) const;
 
@@ -67,7 +69,9 @@ namespace fx
         bool mUBO;
         bool mSupportsNormals;
 
-        std::string_view mTarget;
+        std::array<std::string, 3> mRenderTargets;
+
+        std::string mTarget;
         std::optional<osg::Vec4f> mClearColor;
 
         std::optional<osg::BlendFunc::BlendFuncMode> mBlendSource;
diff --git a/components/fx/technique.cpp b/components/fx/technique.cpp
index c186f12c0c..94284d1ccd 100644
--- a/components/fx/technique.cpp
+++ b/components/fx/technique.cpp
@@ -822,6 +822,21 @@ namespace fx
                 expect<Lexer::Literal>();
                 pass->mTarget = std::get<Lexer::Literal>(mToken).value;
             }
+            else if (key == "rt1")
+            {
+                expect<Lexer::Literal>();
+                pass->mRenderTargets[0] = std::get<Lexer::Literal>(mToken).value;
+            }
+            else if (key == "rt2")
+            {
+                expect<Lexer::Literal>();
+                pass->mRenderTargets[1] = std::get<Lexer::Literal>(mToken).value;
+            }
+            else if (key == "rt3")
+            {
+                expect<Lexer::Literal>();
+                pass->mRenderTargets[2] =std::get<Lexer::Literal>(mToken).value;
+            }
             else if (key == "blend")
             {
                 expect<Lexer::Open_Parenthesis>();
diff --git a/docs/source/reference/postprocessing/omwfx.rst b/docs/source/reference/postprocessing/omwfx.rst
index eab70ba9d5..bf194c7929 100644
--- a/docs/source/reference/postprocessing/omwfx.rst
+++ b/docs/source/reference/postprocessing/omwfx.rst
@@ -500,7 +500,8 @@ is not wanted and you want a custom render target.
 
 To use the render target you must assign passes to it, along with any optional clear modes or custom blend modes.
 
-In the code snippet below a rendertarget is used to draw the red cannel of a scene at half resolution.
+In the code snippet below a rendertarget is used to draw the red cannel of a scene at half resolution, then a quarter. As a restriction,
+only three render targets can be bound per pass with ``rt1``, ``rt2``, ``rt3``, respectively.
 
 .. code-block:: none
 
@@ -512,6 +513,11 @@ In the code snippet below a rendertarget is used to draw the red cannel of a sce
         source_format = red;
     }
 
+    render_target RT_Downsample4 {
+        width_ratio = 0.25;
+        height_ratio = 0.25;
+    }
+
     fragment downsample2x(target=RT_Downsample) {
 
         omw_In vec2 omw_TexCoord;
@@ -522,6 +528,16 @@ In the code snippet below a rendertarget is used to draw the red cannel of a sce
         }
     }
 
+    fragment downsample4x(target=RT_Downsample4, rt1=RT_Downsample) {
+
+        omw_In vec2 omw_TexCoord;
+
+        void main()
+        {
+            omw_FragColor = omw_Texture2D(RT_Downsample, omw_TexCoord);
+        }
+    }
+
 Now, if we ever run the `downsample2x` pass it will write to the target buffer instead of the default
 one assigned by the engine.
 

From e326c5bd0991e9ceaaff86a29b3da9e7b5906eff Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Thu, 19 May 2022 10:59:31 +0200
Subject: [PATCH 2463/2859] Add a couple of words about Lua console to the
 documentation

---
 docs/source/reference/lua-scripting/overview.rst | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/source/reference/lua-scripting/overview.rst b/docs/source/reference/lua-scripting/overview.rst
index 47f8d09e2d..1bffb97e17 100644
--- a/docs/source/reference/lua-scripting/overview.rst
+++ b/docs/source/reference/lua-scripting/overview.rst
@@ -176,6 +176,17 @@ It is possible to modify a script without restarting OpenMW. To apply changes, o
 This will restart all Lua scripts using the `onSave and onLoad`_ handlers the same way as if the game was saved or loaded.
 It reloads all ``.omwscripts`` files and ``.lua`` files that are not packed to any archives. ``.omwaddon`` files and scripts packed to BSA can not be changed without restarting the game.
 
+Lua console
+===========
+
+It is also possible to run Lua commands directly from the in-game console.
+
+To enter the Lua mode run one of the commands:
+
+- ``lua player`` or ``luap`` - enter player context
+- ``lua global`` or ``luag`` - enter global context
+- ``lua selected`` or ``luas`` - enter local context on the selected object
+
 Script structure
 ================
 

From cad68a5566c98177e589a1042cf728e5bdbe8c32 Mon Sep 17 00:00:00 2001
From: kuyondo <rdja.kyd@gmail.com>
Date: Thu, 19 May 2022 20:02:18 +0800
Subject: [PATCH 2464/2859] Add lua binding for books

---
 apps/openmw/CMakeLists.txt        |  2 +-
 apps/openmw/mwlua/types/book.cpp  | 68 +++++++++++++++++++++++++++++++
 apps/openmw/mwlua/types/types.cpp |  1 +
 apps/openmw/mwlua/types/types.hpp |  1 +
 files/lua_api/openmw/types.lua    | 54 ++++++++++++++++++++++++
 5 files changed, 125 insertions(+), 1 deletion(-)
 create mode 100644 apps/openmw/mwlua/types/book.cpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index b4a8bdac80..9a19c3e1d6 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -62,7 +62,7 @@ add_openmw_dir (mwlua
     luamanagerimp object worldview userdataserializer eventqueue
     luabindings localscripts playerscripts objectbindings cellbindings asyncbindings settingsbindings
     camerabindings uibindings inputbindings nearbybindings postprocessingbindings stats debugbindings
-    types/types types/door types/actor types/container types/weapon types/npc types/creature types/activator
+    types/types types/door types/actor types/container types/weapon types/npc types/creature types/activator types/book
     )
 
 add_openmw_dir (mwsound
diff --git a/apps/openmw/mwlua/types/book.cpp b/apps/openmw/mwlua/types/book.cpp
new file mode 100644
index 0000000000..a8c9563a43
--- /dev/null
+++ b/apps/openmw/mwlua/types/book.cpp
@@ -0,0 +1,68 @@
+#include "types.hpp"
+
+#include <components/esm3/loadbook.hpp>
+
+#include <apps/openmw/mwworld/esmstore.hpp>
+
+#include "../luabindings.hpp"
+
+namespace sol
+{
+    template <>
+    struct is_automagical<ESM::Book> : std::false_type {};
+}
+
+namespace MWLua
+{
+    void addBookBindings(sol::table book, const Context& context)
+    {   
+        book["SKILL"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, int>({
+            {"Acrobatics", ESM::Skill::Acrobatics},
+            {"Alchemy", ESM::Skill::Alchemy},
+            {"Alteration", ESM::Skill::Alteration},
+            {"Armorer", ESM::Skill::Armorer},
+            {"Athletics", ESM::Skill::Athletics},
+            {"Axe", ESM::Skill::Axe},
+            {"Block", ESM::Skill::Block},
+            {"BluntWeapon", ESM::Skill::BluntWeapon},
+            {"Conjuration", ESM::Skill::Conjuration},
+            {"Destruction", ESM::Skill::Destruction},
+            {"Enchant", ESM::Skill::Enchant},
+            {"HandToHand", ESM::Skill::HandToHand},
+            {"HeavyArmor", ESM::Skill::HeavyArmor},
+            {"Illusion", ESM::Skill::Illusion},
+            {"LightArmor", ESM::Skill::LightArmor},
+            {"LongBlade", ESM::Skill::LongBlade},
+            {"Marksman", ESM::Skill::Marksman},
+            {"MediumArmor", ESM::Skill::MediumArmor},
+            {"Mercantile", ESM::Skill::Mercantile},
+            {"Mysticism", ESM::Skill::Mysticism},
+            {"Restoration", ESM::Skill::Restoration},
+            {"Security", ESM::Skill::Security},
+            {"ShortBlade", ESM::Skill::ShortBlade},
+            {"Sneak", ESM::Skill::Sneak},
+            {"Spear", ESM::Skill::Spear},
+            {"Speechcraft", ESM::Skill::Speechcraft},
+            {"Unarmored", ESM::Skill::Unarmored},
+            }));
+
+        const MWWorld::Store<ESM::Book>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Book>();
+        book["record"] = sol::overload(
+            [](const Object& obj) -> const ESM::Book* { return obj.ptr().get<ESM::Book>()->mBase; },
+            [store](const std::string& recordId) -> const ESM::Book* { return store->find(recordId); });
+        sol::usertype<ESM::Book> record = context.mLua->sol().new_usertype<ESM::Book>("ESM3_Book");
+        record[sol::meta_function::to_string] = [](const ESM::Book& rec) { return "ESM3_Book[" + rec.mId + "]"; };
+        record["id"] = sol::readonly_property([](const ESM::Book& rec) -> std::string { return rec.mId; });
+        record["name"] = sol::readonly_property([](const ESM::Book& rec) -> std::string { return rec.mName; });
+        record["model"] = sol::readonly_property([](const ESM::Book& rec) -> std::string { return rec.mModel; });
+        record["mwscript"] = sol::readonly_property([](const ESM::Book& rec) -> std::string { return rec.mScript; });
+        record["icon"] = sol::readonly_property([](const ESM::Book& rec) -> std::string { return rec.mIcon; });
+        record["text"] = sol::readonly_property([](const ESM::Book& rec) -> std::string { return rec.mText; });
+        record["enchant"] = sol::readonly_property([](const ESM::Book& rec) -> std::string { return rec.mEnchant; });
+        record["isScroll"] = sol::readonly_property([](const ESM::Book& rec) -> bool { return rec.mData.mIsScroll; });
+        record["skill"] = sol::readonly_property([](const ESM::Book& rec) -> int { return rec.mData.mSkillId; });
+        record["value"] = sol::readonly_property([](const ESM::Book& rec) -> int { return rec.mData.mValue; });
+        record["weight"] = sol::readonly_property([](const ESM::Book& rec) -> float { return rec.mData.mWeight; });
+        record["enchantCapacity"] = sol::readonly_property([](const ESM::Book& rec) -> float { return rec.mData.mEnchant * 0.1f; });
+    }
+}
diff --git a/apps/openmw/mwlua/types/types.cpp b/apps/openmw/mwlua/types/types.cpp
index bc707059e8..be6dcb183c 100644
--- a/apps/openmw/mwlua/types/types.cpp
+++ b/apps/openmw/mwlua/types/types.cpp
@@ -173,6 +173,7 @@ namespace MWLua
         addType(ObjectTypeName::Repair, {ESM::REC_REPA}, ObjectTypeName::Item);
 
         addActivatorBindings(addType(ObjectTypeName::Activator, {ESM::REC_ACTI}), context);
+        addBookBindings(addType(ObjectTypeName::Book, {ESM::REC_BOOK}), context);
         addContainerBindings(addType(ObjectTypeName::Container, {ESM::REC_CONT}), context);
         addDoorBindings(addType(ObjectTypeName::Door, {ESM::REC_DOOR}), context);
         addType(ObjectTypeName::Static, {ESM::REC_STAT});
diff --git a/apps/openmw/mwlua/types/types.hpp b/apps/openmw/mwlua/types/types.hpp
index 8373162995..f92644f443 100644
--- a/apps/openmw/mwlua/types/types.hpp
+++ b/apps/openmw/mwlua/types/types.hpp
@@ -25,6 +25,7 @@ namespace MWLua
 
     // used in initTypesPackage
     void addActivatorBindings(sol::table activator, const Context& context);
+    void addBookBindings(sol::table book, const Context& context);
     void addContainerBindings(sol::table container, const Context& context);
     void addDoorBindings(sol::table door, const Context& context);
     void addActorBindings(sol::table actor, const Context& context);
diff --git a/files/lua_api/openmw/types.lua b/files/lua_api/openmw/types.lua
index 257d926b50..6a58eea7bf 100644
--- a/files/lua_api/openmw/types.lua
+++ b/files/lua_api/openmw/types.lua
@@ -532,6 +532,60 @@
 -- @param openmw.core#GameObject object
 -- @return #boolean
 
+--- Book.SKILL
+-- @type BookSKILL
+-- @field #number Acrobatics
+-- @field #number Alchemy
+-- @field #number Alteration
+-- @field #number Armorer
+-- @field #number Athletics
+-- @field #number Axe
+-- @field #number Block
+-- @field #number BluntWeapon
+-- @field #number Conjuration
+-- @field #number Destruction
+-- @field #number Enchant
+-- @field #number HandToHand
+-- @field #number HeavyArmor
+-- @field #number Illusion
+-- @field #number LightArmor
+-- @field #number LongBlade
+-- @field #number Marksman
+-- @field #number MediumArmor
+-- @field #number Mercantile
+-- @field #number Mysticism
+-- @field #number Restoration
+-- @field #number Security
+-- @field #number ShortBlade
+-- @field #number Sneak
+-- @field #number Spear
+-- @field #number Speechcraft
+-- @field #number Unarmored
+
+--- @{#BookSKILL}
+-- @field [parent=#Book] #BookSKILL SKILL
+
+---
+-- Returns the read-only @{#BookRecord} of a book
+-- @function [parent=#Book] record
+-- @param #any objectOrRecordId
+-- @return #BookRecord
+
+---
+-- @type BookRecord
+-- @field #string id The record ID of the book
+-- @field #string name Name of the book
+-- @field #string model VFS path to the model
+-- @field #string mwscript MWScript on this book (can be empty)
+-- @field #string icon VFS path to the icon
+-- @field #string enchant The enchantment ID of this book (can be empty)
+-- @field #string text The text content of the book
+-- @field #number weight
+-- @field #number value
+-- @field #number skill See @{#Book.SKILL}
+-- @field #boolean isScroll 
+-- @field #number enchantCapacity
+
 --- @{#Clothing} functions
 
 

From a26898d8eda75c670997d18569d3f76dc435b59b Mon Sep 17 00:00:00 2001
From: kuyondo <rdja.kyd@gmail.com>
Date: Thu, 19 May 2022 20:18:47 +0800
Subject: [PATCH 2465/2859] no addtype

---
 apps/openmw/mwlua/types/types.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/openmw/mwlua/types/types.cpp b/apps/openmw/mwlua/types/types.cpp
index be6dcb183c..5330526edb 100644
--- a/apps/openmw/mwlua/types/types.cpp
+++ b/apps/openmw/mwlua/types/types.cpp
@@ -160,7 +160,6 @@ namespace MWLua
         addType(ObjectTypeName::Player, {ESM::REC_INTERNAL_PLAYER}, ObjectTypeName::NPC);
 
         addType(ObjectTypeName::Armor, {ESM::REC_ARMO}, ObjectTypeName::Item);
-        addType(ObjectTypeName::Book, {ESM::REC_BOOK}, ObjectTypeName::Item);
         addType(ObjectTypeName::Clothing, {ESM::REC_CLOT}, ObjectTypeName::Item);
         addType(ObjectTypeName::Ingredient, {ESM::REC_INGR}, ObjectTypeName::Item);
         addType(ObjectTypeName::Light, {ESM::REC_LIGH}, ObjectTypeName::Item);

From 5d7fc0ab17ff256ced981d3a9dbcfad2953e929f Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Tue, 10 May 2022 19:30:46 +0200
Subject: [PATCH 2466/2859] Limit maximum Lua UI layout depth to prevent stack
 overflow

---
 components/lua_ui/element.cpp | 38 ++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/components/lua_ui/element.cpp b/components/lua_ui/element.cpp
index b55d89e613..1356409340 100644
--- a/components/lua_ui/element.cpp
+++ b/components/lua_ui/element.cpp
@@ -22,6 +22,8 @@ namespace LuaUi
 
     const std::string defaultWidgetType = "LuaWidget";
 
+    const uint64_t maxDepth = 250;
+
     std::string widgetType(const sol::table& layout)
     {
         sol::object typeField = LuaUtil::getFieldOrNil(layout, LayoutKeys::type);
@@ -44,12 +46,13 @@ namespace LuaUi
         MyGUI::Gui::getInstancePtr()->destroyWidget(ext->widget());
     }
 
-    WidgetExtension* createWidget(const sol::table& layout);
-    void updateWidget(WidgetExtension* ext, const sol::table& layout);
+    WidgetExtension* createWidget(const sol::table& layout, uint64_t depth);
+    void updateWidget(WidgetExtension* ext, const sol::table& layout, uint64_t depth);
 
     std::vector<WidgetExtension*> updateContent(
-        const std::vector<WidgetExtension*>& children, const sol::object& contentObj)
+        const std::vector<WidgetExtension*>& children, const sol::object& contentObj, uint64_t depth)
     {
+        ++depth;
         std::vector<WidgetExtension*> result;
         if (contentObj == sol::nil)
         {
@@ -68,28 +71,29 @@ namespace LuaUi
             sol::table newLayout = content.at(i);
             if (ext->widget()->getTypeName() == widgetType(newLayout))
             {
-                updateWidget(ext, newLayout);
+                updateWidget(ext, newLayout, depth);
             }
             else
             {
                 destroyWidget(ext);
-                ext = createWidget(newLayout);
+                ext = createWidget(newLayout, depth);
             }
             result[i] = ext;
         }
         for (size_t i = minSize; i < children.size(); i++)
             destroyWidget(children[i]);
         for (size_t i = minSize; i < content.size(); i++)
-            result[i] = createWidget(content.at(i));
+            result[i] = createWidget(content.at(i), depth);
         return result;
     }
 
-    void setTemplate(WidgetExtension* ext, const sol::object& templateLayout)
+    void setTemplate(WidgetExtension* ext, const sol::object& templateLayout, uint64_t depth)
     {
+        ++depth;
         sol::object props = LuaUtil::getFieldOrNil(templateLayout, LayoutKeys::props);
         ext->setTemplateProperties(props);
         sol::object content = LuaUtil::getFieldOrNil(templateLayout, LayoutKeys::content);
-        ext->setTemplateChildren(updateContent(ext->templateChildren(), content));
+        ext->setTemplateChildren(updateContent(ext->templateChildren(), content, depth));
     }
 
     void setEventCallbacks(LuaUi::WidgetExtension* ext, const sol::object& eventsObj)
@@ -112,7 +116,7 @@ namespace LuaUi
         });
     }
 
-    WidgetExtension* createWidget(const sol::table& layout)
+    WidgetExtension* createWidget(const sol::table& layout, uint64_t depth)
     {
         static auto widgetTypeMap = widgetTypeToName();
         std::string type = widgetType(layout);
@@ -130,19 +134,21 @@ namespace LuaUi
             throw std::runtime_error("Invalid widget!");
         ext->initialize(layout.lua_state(), widget);
 
-        updateWidget(ext, layout);
+        updateWidget(ext, layout, depth);
         return ext;
     }
 
-    void updateWidget(WidgetExtension* ext, const sol::table& layout)
+    void updateWidget(WidgetExtension* ext, const sol::table& layout, uint64_t depth)
     {
+        if (depth >= maxDepth)
+            throw std::runtime_error("Maximum layout depth exceeded, probably caused by a circular reference");
         ext->reset();
         ext->setLayout(layout);
         ext->setExternal(layout.get<sol::object>(LayoutKeys::external));
-        setTemplate(ext, layout.get<sol::object>(LayoutKeys::templateLayout));
+        setTemplate(ext, layout.get<sol::object>(LayoutKeys::templateLayout), depth);
         ext->setProperties(layout.get<sol::object>(LayoutKeys::props));
         setEventCallbacks(ext, layout.get<sol::object>(LayoutKeys::events));
-        ext->setChildren(updateContent(ext->children(), layout.get<sol::object>(LayoutKeys::content)));
+        ext->setChildren(updateContent(ext->children(), layout.get<sol::object>(LayoutKeys::content), depth));
         ext->updateCoord();
     }
 
@@ -184,7 +190,7 @@ namespace LuaUi
         assert(!mRoot);
         if (!mRoot)
         {
-            mRoot = createWidget(mLayout);
+            mRoot = createWidget(mLayout, 0);
             mLayer = setLayer(mRoot, mLayout);
             updateAttachment();
         }
@@ -197,11 +203,11 @@ namespace LuaUi
             if (mRoot->widget()->getTypeName() != widgetType(mLayout))
             {
                 destroyWidget(mRoot);
-                mRoot = createWidget(mLayout);
+                mRoot = createWidget(mLayout, 0);
             }
             else
             {
-                updateWidget(mRoot, mLayout);
+                updateWidget(mRoot, mLayout, 0);
             }
             mLayer = setLayer(mRoot, mLayout);
             updateAttachment();

From 9042f47f0ac091487a0beecec6570ba956ab027d Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Thu, 19 May 2022 16:10:49 +0200
Subject: [PATCH 2467/2859] Use an anonymous namespace in element.cpp

---
 components/lua_ui/element.cpp | 269 +++++++++++++++++-----------------
 1 file changed, 136 insertions(+), 133 deletions(-)

diff --git a/components/lua_ui/element.cpp b/components/lua_ui/element.cpp
index 1356409340..bd9f84fec2 100644
--- a/components/lua_ui/element.cpp
+++ b/components/lua_ui/element.cpp
@@ -8,162 +8,165 @@
 
 namespace LuaUi
 {
-    namespace LayoutKeys
+    namespace
     {
-        constexpr std::string_view type = "type";
-        constexpr std::string_view name = "name";
-        constexpr std::string_view layer = "layer";
-        constexpr std::string_view templateLayout = "template";
-        constexpr std::string_view props = "props";
-        constexpr std::string_view events = "events";
-        constexpr std::string_view content = "content";
-        constexpr std::string_view external = "external";
-    }
+        namespace LayoutKeys
+        {
+            constexpr std::string_view type = "type";
+            constexpr std::string_view name = "name";
+            constexpr std::string_view layer = "layer";
+            constexpr std::string_view templateLayout = "template";
+            constexpr std::string_view props = "props";
+            constexpr std::string_view events = "events";
+            constexpr std::string_view content = "content";
+            constexpr std::string_view external = "external";
+        }
 
-    const std::string defaultWidgetType = "LuaWidget";
+        const std::string defaultWidgetType = "LuaWidget";
 
-    const uint64_t maxDepth = 250;
+        constexpr uint64_t maxDepth = 250;
 
-    std::string widgetType(const sol::table& layout)
-    {
-        sol::object typeField = LuaUtil::getFieldOrNil(layout, LayoutKeys::type);
-        std::string type = LuaUtil::getValueOrDefault(typeField, defaultWidgetType);
-        sol::object templateTypeField = LuaUtil::getFieldOrNil(layout, LayoutKeys::templateLayout, LayoutKeys::type);
-        if (templateTypeField != sol::nil)
+        std::string widgetType(const sol::table& layout)
         {
-            std::string templateType = LuaUtil::getValueOrDefault(templateTypeField, defaultWidgetType);
-            if (typeField != sol::nil && templateType != type)
-                throw std::logic_error(std::string("Template layout type ") + type
-                    + std::string(" doesn't match template type ") + templateType);
-            type = templateType;
+            sol::object typeField = LuaUtil::getFieldOrNil(layout, LayoutKeys::type);
+            std::string type = LuaUtil::getValueOrDefault(typeField, defaultWidgetType);
+            sol::object templateTypeField = LuaUtil::getFieldOrNil(layout, LayoutKeys::templateLayout, LayoutKeys::type);
+            if (templateTypeField != sol::nil)
+            {
+                std::string templateType = LuaUtil::getValueOrDefault(templateTypeField, defaultWidgetType);
+                if (typeField != sol::nil && templateType != type)
+                    throw std::logic_error(std::string("Template layout type ") + type
+                        + std::string(" doesn't match template type ") + templateType);
+                type = templateType;
+            }
+            return type;
         }
-        return type;
-    }
-
-    void destroyWidget(LuaUi::WidgetExtension* ext)
-    {
-        ext->deinitialize();
-        MyGUI::Gui::getInstancePtr()->destroyWidget(ext->widget());
-    }
-
-    WidgetExtension* createWidget(const sol::table& layout, uint64_t depth);
-    void updateWidget(WidgetExtension* ext, const sol::table& layout, uint64_t depth);
 
-    std::vector<WidgetExtension*> updateContent(
-        const std::vector<WidgetExtension*>& children, const sol::object& contentObj, uint64_t depth)
-    {
-        ++depth;
-        std::vector<WidgetExtension*> result;
-        if (contentObj == sol::nil)
+        void destroyWidget(LuaUi::WidgetExtension* ext)
         {
-            for (WidgetExtension* w : children)
-                destroyWidget(w);
-            return result;
+            ext->deinitialize();
+            MyGUI::Gui::getInstancePtr()->destroyWidget(ext->widget());
         }
-        if (!contentObj.is<Content>())
-            throw std::logic_error("Layout content field must be a openmw.ui.content");
-        Content content = contentObj.as<Content>();
-        result.resize(content.size());
-        size_t minSize = std::min(children.size(), content.size());
-        for (size_t i = 0; i < minSize; i++)
+
+        WidgetExtension* createWidget(const sol::table& layout, uint64_t depth);
+        void updateWidget(WidgetExtension* ext, const sol::table& layout, uint64_t depth);
+
+        std::vector<WidgetExtension*> updateContent(
+            const std::vector<WidgetExtension*>& children, const sol::object& contentObj, uint64_t depth)
         {
-            WidgetExtension* ext = children[i];
-            sol::table newLayout = content.at(i);
-            if (ext->widget()->getTypeName() == widgetType(newLayout))
+            ++depth;
+            std::vector<WidgetExtension*> result;
+            if (contentObj == sol::nil)
             {
-                updateWidget(ext, newLayout, depth);
+                for (WidgetExtension* w : children)
+                    destroyWidget(w);
+                return result;
             }
-            else
+            if (!contentObj.is<Content>())
+                throw std::logic_error("Layout content field must be a openmw.ui.content");
+            Content content = contentObj.as<Content>();
+            result.resize(content.size());
+            size_t minSize = std::min(children.size(), content.size());
+            for (size_t i = 0; i < minSize; i++)
             {
-                destroyWidget(ext);
-                ext = createWidget(newLayout, depth);
+                WidgetExtension* ext = children[i];
+                sol::table newLayout = content.at(i);
+                if (ext->widget()->getTypeName() == widgetType(newLayout))
+                {
+                    updateWidget(ext, newLayout, depth);
+                }
+                else
+                {
+                    destroyWidget(ext);
+                    ext = createWidget(newLayout, depth);
+                }
+                result[i] = ext;
             }
-            result[i] = ext;
+            for (size_t i = minSize; i < children.size(); i++)
+                destroyWidget(children[i]);
+            for (size_t i = minSize; i < content.size(); i++)
+                result[i] = createWidget(content.at(i), depth);
+            return result;
         }
-        for (size_t i = minSize; i < children.size(); i++)
-            destroyWidget(children[i]);
-        for (size_t i = minSize; i < content.size(); i++)
-            result[i] = createWidget(content.at(i), depth);
-        return result;
-    }
 
-    void setTemplate(WidgetExtension* ext, const sol::object& templateLayout, uint64_t depth)
-    {
-        ++depth;
-        sol::object props = LuaUtil::getFieldOrNil(templateLayout, LayoutKeys::props);
-        ext->setTemplateProperties(props);
-        sol::object content = LuaUtil::getFieldOrNil(templateLayout, LayoutKeys::content);
-        ext->setTemplateChildren(updateContent(ext->templateChildren(), content, depth));
-    }
+        void setTemplate(WidgetExtension* ext, const sol::object& templateLayout, uint64_t depth)
+        {
+            ++depth;
+            sol::object props = LuaUtil::getFieldOrNil(templateLayout, LayoutKeys::props);
+            ext->setTemplateProperties(props);
+            sol::object content = LuaUtil::getFieldOrNil(templateLayout, LayoutKeys::content);
+            ext->setTemplateChildren(updateContent(ext->templateChildren(), content, depth));
+        }
 
-    void setEventCallbacks(LuaUi::WidgetExtension* ext, const sol::object& eventsObj)
-    {
-        ext->clearCallbacks();
-        if (eventsObj == sol::nil)
-            return;
-        if (!eventsObj.is<sol::table>())
-            throw std::logic_error("The \"events\" layout field must be a table of callbacks");
-        auto events = eventsObj.as<sol::table>();
-        events.for_each([ext](const sol::object& name, const sol::object& callback)
+        void setEventCallbacks(LuaUi::WidgetExtension* ext, const sol::object& eventsObj)
         {
-            if (name.is<std::string>() && callback.is<LuaUtil::Callback>())
-                ext->setCallback(name.as<std::string>(), callback.as<LuaUtil::Callback>());
-            else if (!name.is<std::string>())
-                Log(Debug::Warning) << "UI event key must be a string";
-            else if (!callback.is<LuaUtil::Callback>())
-                Log(Debug::Warning) << "UI event handler for key \"" << name.as<std::string>()
-                                    << "\" must be an openmw.async.callback";
-        });
-    }
+            ext->clearCallbacks();
+            if (eventsObj == sol::nil)
+                return;
+            if (!eventsObj.is<sol::table>())
+                throw std::logic_error("The \"events\" layout field must be a table of callbacks");
+            auto events = eventsObj.as<sol::table>();
+            events.for_each([ext](const sol::object& name, const sol::object& callback)
+            {
+                if (name.is<std::string>() && callback.is<LuaUtil::Callback>())
+                    ext->setCallback(name.as<std::string>(), callback.as<LuaUtil::Callback>());
+                else if (!name.is<std::string>())
+                    Log(Debug::Warning) << "UI event key must be a string";
+                else if (!callback.is<LuaUtil::Callback>())
+                    Log(Debug::Warning) << "UI event handler for key \"" << name.as<std::string>()
+                                        << "\" must be an openmw.async.callback";
+            });
+        }
 
-    WidgetExtension* createWidget(const sol::table& layout, uint64_t depth)
-    {
-        static auto widgetTypeMap = widgetTypeToName();
-        std::string type = widgetType(layout);
-        if (widgetTypeMap.find(type) == widgetTypeMap.end())
-            throw std::logic_error(std::string("Invalid widget type ") += type);
-
-        std::string name = layout.get_or(LayoutKeys::name, std::string());
-        MyGUI::Widget* widget = MyGUI::Gui::getInstancePtr()->createWidgetT(
-            type, "",
-            MyGUI::IntCoord(), MyGUI::Align::Default,
-            std::string(), name);
-
-        WidgetExtension* ext = dynamic_cast<WidgetExtension*>(widget);
-        if (!ext)
-            throw std::runtime_error("Invalid widget!");
-        ext->initialize(layout.lua_state(), widget);
-
-        updateWidget(ext, layout, depth);
-        return ext;
-    }
+        WidgetExtension* createWidget(const sol::table& layout, uint64_t depth)
+        {
+            static auto widgetTypeMap = widgetTypeToName();
+            std::string type = widgetType(layout);
+            if (widgetTypeMap.find(type) == widgetTypeMap.end())
+                throw std::logic_error(std::string("Invalid widget type ") += type);
 
-    void updateWidget(WidgetExtension* ext, const sol::table& layout, uint64_t depth)
-    {
-        if (depth >= maxDepth)
-            throw std::runtime_error("Maximum layout depth exceeded, probably caused by a circular reference");
-        ext->reset();
-        ext->setLayout(layout);
-        ext->setExternal(layout.get<sol::object>(LayoutKeys::external));
-        setTemplate(ext, layout.get<sol::object>(LayoutKeys::templateLayout), depth);
-        ext->setProperties(layout.get<sol::object>(LayoutKeys::props));
-        setEventCallbacks(ext, layout.get<sol::object>(LayoutKeys::events));
-        ext->setChildren(updateContent(ext->children(), layout.get<sol::object>(LayoutKeys::content), depth));
-        ext->updateCoord();
-    }
+            std::string name = layout.get_or(LayoutKeys::name, std::string());
+            MyGUI::Widget* widget = MyGUI::Gui::getInstancePtr()->createWidgetT(
+                type, "",
+                MyGUI::IntCoord(), MyGUI::Align::Default,
+                std::string(), name);
 
-    std::string setLayer(WidgetExtension* ext, const sol::table& layout)
-    {
-        MyGUI::ILayer* layerNode = ext->widget()->getLayer();
-        std::string currentLayer = layerNode ? layerNode->getName() : std::string();
-        std::string newLayer = layout.get_or(LayoutKeys::layer, std::string());
-        if (!newLayer.empty() && !MyGUI::LayerManager::getInstance().isExist(newLayer))
-            throw std::logic_error(std::string("Layer ") + newLayer + " doesn't exist");
-        else if (newLayer != currentLayer)
+            WidgetExtension* ext = dynamic_cast<WidgetExtension*>(widget);
+            if (!ext)
+                throw std::runtime_error("Invalid widget!");
+            ext->initialize(layout.lua_state(), widget);
+
+            updateWidget(ext, layout, depth);
+            return ext;
+        }
+
+        void updateWidget(WidgetExtension* ext, const sol::table& layout, uint64_t depth)
         {
-            MyGUI::LayerManager::getInstance().attachToLayerNode(newLayer, ext->widget());
+            if (depth >= maxDepth)
+                throw std::runtime_error("Maximum layout depth exceeded, probably caused by a circular reference");
+            ext->reset();
+            ext->setLayout(layout);
+            ext->setExternal(layout.get<sol::object>(LayoutKeys::external));
+            setTemplate(ext, layout.get<sol::object>(LayoutKeys::templateLayout), depth);
+            ext->setProperties(layout.get<sol::object>(LayoutKeys::props));
+            setEventCallbacks(ext, layout.get<sol::object>(LayoutKeys::events));
+            ext->setChildren(updateContent(ext->children(), layout.get<sol::object>(LayoutKeys::content), depth));
+            ext->updateCoord();
+        }
+
+        std::string setLayer(WidgetExtension* ext, const sol::table& layout)
+        {
+            MyGUI::ILayer* layerNode = ext->widget()->getLayer();
+            std::string currentLayer = layerNode ? layerNode->getName() : std::string();
+            std::string newLayer = layout.get_or(LayoutKeys::layer, std::string());
+            if (!newLayer.empty() && !MyGUI::LayerManager::getInstance().isExist(newLayer))
+                throw std::logic_error(std::string("Layer ") + newLayer + " doesn't exist");
+            else if (newLayer != currentLayer)
+            {
+                MyGUI::LayerManager::getInstance().attachToLayerNode(newLayer, ext->widget());
+            }
+            return newLayer;
         }
-        return newLayer;
     }
 
     std::map<Element*, std::shared_ptr<Element>> Element::sAllElements;

From 8a1a838ffa4e19076c4013c275e06642281e0504 Mon Sep 17 00:00:00 2001
From: kuyondo <rdja.kyd@gmail.com>
Date: Fri, 20 May 2022 00:39:19 +0800
Subject: [PATCH 2468/2859] update book.cpp and weapon.cpp

---
 apps/openmw/mwlua/types/book.cpp   | 33 ++++--------------------------
 apps/openmw/mwlua/types/weapon.cpp |  2 +-
 files/lua_api/openmw/types.lua     |  4 ++--
 3 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/apps/openmw/mwlua/types/book.cpp b/apps/openmw/mwlua/types/book.cpp
index a8c9563a43..597c1a07a0 100644
--- a/apps/openmw/mwlua/types/book.cpp
+++ b/apps/openmw/mwlua/types/book.cpp
@@ -16,35 +16,10 @@ namespace MWLua
 {
     void addBookBindings(sol::table book, const Context& context)
     {   
-        book["SKILL"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, int>({
-            {"Acrobatics", ESM::Skill::Acrobatics},
-            {"Alchemy", ESM::Skill::Alchemy},
-            {"Alteration", ESM::Skill::Alteration},
-            {"Armorer", ESM::Skill::Armorer},
-            {"Athletics", ESM::Skill::Athletics},
-            {"Axe", ESM::Skill::Axe},
-            {"Block", ESM::Skill::Block},
-            {"BluntWeapon", ESM::Skill::BluntWeapon},
-            {"Conjuration", ESM::Skill::Conjuration},
-            {"Destruction", ESM::Skill::Destruction},
-            {"Enchant", ESM::Skill::Enchant},
-            {"HandToHand", ESM::Skill::HandToHand},
-            {"HeavyArmor", ESM::Skill::HeavyArmor},
-            {"Illusion", ESM::Skill::Illusion},
-            {"LightArmor", ESM::Skill::LightArmor},
-            {"LongBlade", ESM::Skill::LongBlade},
-            {"Marksman", ESM::Skill::Marksman},
-            {"MediumArmor", ESM::Skill::MediumArmor},
-            {"Mercantile", ESM::Skill::Mercantile},
-            {"Mysticism", ESM::Skill::Mysticism},
-            {"Restoration", ESM::Skill::Restoration},
-            {"Security", ESM::Skill::Security},
-            {"ShortBlade", ESM::Skill::ShortBlade},
-            {"Sneak", ESM::Skill::Sneak},
-            {"Spear", ESM::Skill::Spear},
-            {"Speechcraft", ESM::Skill::Speechcraft},
-            {"Unarmored", ESM::Skill::Unarmored},
-            }));
+        sol::table skill(context.mLua->sol(), sol::create);
+        book["SKILL"] = LuaUtil::makeStrictReadOnly(skill);
+        for (int id = ESM::Skill::Block; id < ESM::Skill::Length; ++id)
+            skill[(ESM::Skill::sSkillNames[id])] = id;
 
         const MWWorld::Store<ESM::Book>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Book>();
         book["record"] = sol::overload(
diff --git a/apps/openmw/mwlua/types/weapon.cpp b/apps/openmw/mwlua/types/weapon.cpp
index 87ae984cf9..594e447f00 100644
--- a/apps/openmw/mwlua/types/weapon.cpp
+++ b/apps/openmw/mwlua/types/weapon.cpp
@@ -55,7 +55,7 @@ namespace MWLua
         record["health"] = sol::readonly_property([](const ESM::Weapon& rec) -> int { return rec.mData.mHealth; });
         record["speed"] = sol::readonly_property([](const ESM::Weapon& rec) -> float { return rec.mData.mSpeed; });
         record["reach"] = sol::readonly_property([](const ESM::Weapon& rec) -> float { return rec.mData.mReach; });
-        record["enchant"] = sol::readonly_property([](const ESM::Weapon& rec) -> float { return rec.mData.mEnchant * 0.1f; });
+        record["enchantCapacity"] = sol::readonly_property([](const ESM::Weapon& rec) -> float { return rec.mData.mEnchant * 0.1f; });
         record["chopMinDamage"] = sol::readonly_property([](const ESM::Weapon& rec) -> int { return rec.mData.mChop[0]; });
         record["chopMaxDamage"] = sol::readonly_property([](const ESM::Weapon& rec) -> int { return rec.mData.mChop[1]; });
         record["slashMinDamage"] = sol::readonly_property([](const ESM::Weapon& rec) -> int { return rec.mData.mSlash[0]; });
diff --git a/files/lua_api/openmw/types.lua b/files/lua_api/openmw/types.lua
index 6a58eea7bf..d7a917711b 100644
--- a/files/lua_api/openmw/types.lua
+++ b/files/lua_api/openmw/types.lua
@@ -582,7 +582,7 @@
 -- @field #string text The text content of the book
 -- @field #number weight
 -- @field #number value
--- @field #number skill See @{#Book.SKILL}
+-- @field #number skill See @{#Book.SKILL} The skill that this book teaches
 -- @field #boolean isScroll 
 -- @field #number enchantCapacity
 
@@ -724,7 +724,7 @@
 -- @field #number health
 -- @field #number speed
 -- @field #number reach
--- @field #number enchant
+-- @field #number enchantCapacity
 -- @field #number chopMinDamage
 -- @field #number chopMaxDamage
 -- @field #number slashMinDamage

From 1fe794d9353ffd0b4c2e380a0063864c64daa84f Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Thu, 19 May 2022 19:49:14 +0000
Subject: [PATCH 2469/2859] Changing setting renderer arguments

---
 components/lua/storage.cpp                    | 18 ++--
 components/lua/storage.hpp                    |  3 +-
 files/builtin_scripts/CMakeLists.txt          |  2 +-
 .../scripts/omw/mwui/borders.lua              |  2 +-
 .../builtin_scripts/scripts/omw/mwui/box.lua  | 45 ---------
 .../scripts/omw/mwui/constants.lua            |  2 +
 .../scripts/omw/mwui/filters.lua              | 31 ++++++
 .../builtin_scripts/scripts/omw/mwui/init.lua |  5 +
 .../scripts/omw/settings/common.lua           | 18 +++-
 .../scripts/omw/settings/global.lua           |  1 +
 .../scripts/omw/settings/player.lua           |  7 ++
 .../scripts/omw/settings/render.lua           | 17 +++-
 .../scripts/omw/settings/renderers.lua        | 94 ++++++++++++++-----
 13 files changed, 161 insertions(+), 84 deletions(-)
 delete mode 100644 files/builtin_scripts/scripts/omw/mwui/box.lua
 create mode 100644 files/builtin_scripts/scripts/omw/mwui/filters.lua

diff --git a/components/lua/storage.cpp b/components/lua/storage.cpp
index eff4578d00..bff978b633 100644
--- a/components/lua/storage.cpp
+++ b/components/lua/storage.cpp
@@ -38,7 +38,7 @@ namespace LuaUtil
 
     void LuaStorage::Section::runCallbacks(sol::optional<std::string_view> changedKey)
     {
-        mStorage->mRunningCallbacks = true;
+        mStorage->mRunningCallbacks.insert(this);
         mCallbacks.erase(std::remove_if(mCallbacks.begin(), mCallbacks.end(), [&](const Callback& callback)
         {
             bool valid = callback.isValid();
@@ -46,13 +46,20 @@ namespace LuaUtil
                 callback.tryCall(mSectionName, changedKey);
             return !valid;
         }), mCallbacks.end());
-        mStorage->mRunningCallbacks = false;
+        mStorage->mRunningCallbacks.erase(this);
+    }
+
+    void LuaStorage::Section::throwIfCallbackRecursionIsTooDeep()
+    {
+        if (mStorage->mRunningCallbacks.count(this) > 0)
+            throw std::runtime_error("Storage handler shouldn't change the storage section it handles (leads to an infinite recursion)");
+        if (mStorage->mRunningCallbacks.size() > 10)
+            throw std::runtime_error("Too many subscribe callbacks triggering in a chain, likely an infinite recursion");
     }
 
     void LuaStorage::Section::set(std::string_view key, const sol::object& value)
     {
-        if (mStorage->mRunningCallbacks)
-            throw std::runtime_error("Not allowed to change storage in storage handlers because it can lead to an infinite recursion");
+        throwIfCallbackRecursionIsTooDeep();
         if (value != sol::nil)
             mValues[std::string(key)] = Value(value);
         else
@@ -68,8 +75,7 @@ namespace LuaUtil
 
     void LuaStorage::Section::setAll(const sol::optional<sol::table>& values)
     {
-        if (mStorage->mRunningCallbacks)
-            throw std::runtime_error("Not allowed to change storage in storage handlers because it can lead to an infinite recursion");
+        throwIfCallbackRecursionIsTooDeep();
         mValues.clear();
         if (values)
         {
diff --git a/components/lua/storage.hpp b/components/lua/storage.hpp
index 11ea91f039..8ae944c5ab 100644
--- a/components/lua/storage.hpp
+++ b/components/lua/storage.hpp
@@ -62,6 +62,7 @@ namespace LuaUtil
             void setAll(const sol::optional<sol::table>& values);
             sol::table asTable();
             void runCallbacks(sol::optional<std::string_view> changedKey);
+            void throwIfCallbackRecursionIsTooDeep();
 
             LuaStorage* mStorage;
             std::string mSectionName;
@@ -81,7 +82,7 @@ namespace LuaUtil
         lua_State* mLua;
         std::map<std::string_view, std::shared_ptr<Section>> mData;
         const Listener* mListener = nullptr;
-        bool mRunningCallbacks = false;
+        std::set<const Section*> mRunningCallbacks;
     };
 
 }
diff --git a/files/builtin_scripts/CMakeLists.txt b/files/builtin_scripts/CMakeLists.txt
index 103351d044..e7425cccbb 100644
--- a/files/builtin_scripts/CMakeLists.txt
+++ b/files/builtin_scripts/CMakeLists.txt
@@ -27,7 +27,7 @@ set(LUA_BUILTIN_FILES
 
     scripts/omw/mwui/constants.lua
     scripts/omw/mwui/borders.lua
-    scripts/omw/mwui/box.lua
+    scripts/omw/mwui/filters.lua
     scripts/omw/mwui/text.lua
     scripts/omw/mwui/textEdit.lua
     scripts/omw/mwui/space.lua
diff --git a/files/builtin_scripts/scripts/omw/mwui/borders.lua b/files/builtin_scripts/scripts/omw/mwui/borders.lua
index bd8d99a7b7..5d056254fc 100644
--- a/files/builtin_scripts/scripts/omw/mwui/borders.lua
+++ b/files/builtin_scripts/scripts/omw/mwui/borders.lua
@@ -6,7 +6,7 @@ local auxUi = require('openmw_aux.ui')
 local constants = require('scripts.omw.mwui.constants')
 
 local v2 = util.vector2
-local whiteTexture = ui.texture{ path = 'white' }
+local whiteTexture = constants.whiteTexture
 local menuTransparency = ui._getMenuTransparency()
 
 local sideParts = {
diff --git a/files/builtin_scripts/scripts/omw/mwui/box.lua b/files/builtin_scripts/scripts/omw/mwui/box.lua
deleted file mode 100644
index e7737165ae..0000000000
--- a/files/builtin_scripts/scripts/omw/mwui/box.lua
+++ /dev/null
@@ -1,45 +0,0 @@
-local ui = require('openmw.ui')
-local util = require('openmw.util')
-
-local whiteTexture = ui.texture{ path = 'white' }
-
-local menuTransparency = ui._getMenuTransparency()
-
-return function(templates)
-    templates.backgroundTransparent = {
-        props = {
-            resource = whiteTexture,
-            color = util.color.rgb(0, 0, 0),
-            alpha = menuTransparency,
-        },
-    }
-    templates.backgroundSolid = {
-        props = {
-            resource = whiteTexture,
-            color = util.color.rgb(0, 0, 0),
-        },
-    }
-    templates.box = {
-        props = {
-            inheritAlpha = false,
-        },
-        content = ui.content {
-            {
-                type = ui.TYPE.Image,
-                template = templates.backgroundTransparent,
-                props = {
-                    relativeSize = util.vector2(1, 1),
-                },
-            },
-            {
-                template = templates.borders,
-                props = {
-                    relativeSize = util.vector2(1, 1),
-                },
-                external = {
-                    slot = true,
-                },
-            },
-        },
-    }
-end
\ No newline at end of file
diff --git a/files/builtin_scripts/scripts/omw/mwui/constants.lua b/files/builtin_scripts/scripts/omw/mwui/constants.lua
index 3791025717..8a02268f77 100644
--- a/files/builtin_scripts/scripts/omw/mwui/constants.lua
+++ b/files/builtin_scripts/scripts/omw/mwui/constants.lua
@@ -1,3 +1,4 @@
+local ui = require('openmw.ui')
 local util = require('openmw.util')
 
 return {
@@ -8,4 +9,5 @@ return {
     border = 2,
     thickBorder = 4,
     padding = 2,
+    whiteTexture = ui.texture { path = 'white' },
 }
\ No newline at end of file
diff --git a/files/builtin_scripts/scripts/omw/mwui/filters.lua b/files/builtin_scripts/scripts/omw/mwui/filters.lua
new file mode 100644
index 0000000000..684ee5e680
--- /dev/null
+++ b/files/builtin_scripts/scripts/omw/mwui/filters.lua
@@ -0,0 +1,31 @@
+local ui = require('openmw.ui')
+local util = require('openmw.util')
+
+local constants = require('scripts.omw.mwui.constants')
+
+return function(templates)
+    templates.disabled = {
+        type = ui.TYPE.Container,
+        props = {
+            alpha = 0.6,
+        },
+        content = ui.content {
+            {
+                props = {
+                    relativeSize = util.vector2(1, 1),
+                },
+                external = {
+                    slot = true,
+                },
+            },
+            {
+                type = ui.TYPE.Image,
+                props = {
+                    resource = constants.whiteTexture,
+                    color = util.color.rgb(0, 0, 0),
+                    relativeSize = util.vector2(1, 1),
+                },
+            },
+        },
+    }
+end
\ No newline at end of file
diff --git a/files/builtin_scripts/scripts/omw/mwui/init.lua b/files/builtin_scripts/scripts/omw/mwui/init.lua
index d95a07040b..a9d798ef2a 100644
--- a/files/builtin_scripts/scripts/omw/mwui/init.lua
+++ b/files/builtin_scripts/scripts/omw/mwui/init.lua
@@ -93,6 +93,11 @@ require('scripts.omw.mwui.text')(templates)
 -- @field [parent=#Templates] openmw.ui#Layout textEditBox
 require('scripts.omw.mwui.textEdit')(templates)
 
+---
+-- Shades its children and makes them uninteractible
+-- @field [parent=#Templates] openmw.ui#Layout disabled
+require('scripts.omw.mwui.filters')(templates)
+
 ---
 -- Interface version
 -- @field [parent=#MWUI] #number version
diff --git a/files/builtin_scripts/scripts/omw/settings/common.lua b/files/builtin_scripts/scripts/omw/settings/common.lua
index 0d5e6d234a..b917d14a93 100644
--- a/files/builtin_scripts/scripts/omw/settings/common.lua
+++ b/files/builtin_scripts/scripts/omw/settings/common.lua
@@ -1,7 +1,10 @@
 local storage = require('openmw.storage')
 
-local contextSection = storage.playerSection or storage.globalSection
 local groupSectionKey = 'OmwSettingGroups'
+local conventionPrefix = 'Settings'
+local argumentSectionPostfix = 'Arguments'
+
+local contextSection = storage.playerSection or storage.globalSection
 local groupSection = contextSection(groupSectionKey)
 groupSection:removeOnExit()
 
@@ -30,7 +33,6 @@ local function validateGroupOptions(options)
     if type(options.key) ~= 'string' then
         error('Group must have a key')
     end
-    local conventionPrefix = "Settings"
     if options.key:sub(1, conventionPrefix:len()) ~= conventionPrefix then
         print(("Group key %s doesn't start with %s"):format(options.key, conventionPrefix))
     end
@@ -88,6 +90,8 @@ local function registerGroup(options)
         settings = {},
     }
     local valueSection = contextSection(options.key)
+    local argumentSection = contextSection(options.key .. argumentSectionPostfix)
+    argumentSection:removeOnExit()
     for i, opt in ipairs(options.settings) do
         local setting = registerSetting(opt)
         setting.order = i
@@ -95,9 +99,10 @@ local function registerGroup(options)
             error(('Duplicate setting key %s'):format(options.key))
         end
         group.settings[setting.key] = setting
-        if not valueSection:get(setting.key) then
+        if valueSection:get(setting.key) == nil then
             valueSection:set(setting.key, setting.default)
         end
+        argumentSection:set(setting.key, setting.argument)
     end
     groupSection:set(group.key, group)
 end
@@ -106,6 +111,13 @@ return {
     getSection = function(global, key)
         return (global and storage.globalSection or storage.playerSection)(key)
     end,
+    getArgumentSection = function(global, key)
+        return (global and storage.globalSection or storage.playerSection)(key .. argumentSectionPostfix)
+    end,
+    updateRendererArgument = function(groupKey, settingKey, argument)
+        local argumentSection = contextSection(groupKey .. argumentSectionPostfix)
+        argumentSection:set(settingKey, argument)
+    end,
     setGlobalEvent = 'OMWSettingsGlobalSet',
     groupSectionKey = groupSectionKey,
     onLoad = function(saved)
diff --git a/files/builtin_scripts/scripts/omw/settings/global.lua b/files/builtin_scripts/scripts/omw/settings/global.lua
index 5818668b0e..d84794f61d 100644
--- a/files/builtin_scripts/scripts/omw/settings/global.lua
+++ b/files/builtin_scripts/scripts/omw/settings/global.lua
@@ -6,6 +6,7 @@ return {
     interfaceName = 'Settings',
     interface = {
         registerGroup = common.registerGroup,
+        updateRendererArgument = common.updateRendererArgument,
     },
     engineHandlers = {
         onLoad = common.onLoad,
diff --git a/files/builtin_scripts/scripts/omw/settings/player.lua b/files/builtin_scripts/scripts/omw/settings/player.lua
index 2efe5f0820..e072d7a4c1 100644
--- a/files/builtin_scripts/scripts/omw/settings/player.lua
+++ b/files/builtin_scripts/scripts/omw/settings/player.lua
@@ -137,6 +137,13 @@ return {
         --     }
         -- }
         registerGroup = common.registerGroup,
+        ---
+        -- @function [parent=#Settings] updateRendererArgument Change the renderer argument of a setting
+        --   available both in player and global scripts
+        -- @param #string groupKey A settings group key
+        -- @param #string settingKey A setting key
+        -- @param argument A renderer argument
+        updateRendererArgument = common.updateRendererArgument,
     },
     engineHandlers = {
         onLoad = common.onLoad,
diff --git a/files/builtin_scripts/scripts/omw/settings/render.lua b/files/builtin_scripts/scripts/omw/settings/render.lua
index 8274f04670..18aa41be40 100644
--- a/files/builtin_scripts/scripts/omw/settings/render.lua
+++ b/files/builtin_scripts/scripts/omw/settings/render.lua
@@ -110,6 +110,7 @@ local function renderSetting(group, setting, value, global)
             },
         }
     end
+    local argument = common.getArgumentSection(global, group.key):get(setting.key)
     return {
         name = setting.key,
         type = ui.TYPE.Flex,
@@ -123,7 +124,7 @@ local function renderSetting(group, setting, value, global)
         content = ui.content {
             titleLayout,
             growingIntreval,
-            renderFunction(value, set, setting.argument),
+            renderFunction(value, set, argument),
         },
     }
 end
@@ -350,6 +351,20 @@ local function onGroupRegistered(global, key)
     }
     table.insert(groups[group.page], pageGroup)
     common.getSection(global, group.key):subscribe(onSettingChanged(global))
+    common.getArgumentSection(global, group.key):subscribe(async:callback(function(_, settingKey)
+        local groupKey = group.key
+        local group = common.getSection(global, common.groupSectionKey):get(groupKey)
+        if not group or not pageOptions[group.page] then return end
+
+        local value = common.getSection(global, group.key):get(settingKey)
+
+        local element = pageOptions[group.page].element
+        local groupsLayout = element.layout.content.groups
+        local groupLayout = groupsLayout.content[groupLayoutName(group.key, global)]
+        local settingsContent = groupLayout.content.settings.content
+        settingsContent[settingKey] = renderSetting(group, group.settings[settingKey], value, global)
+        element:update()
+    end))
 
     if not pages[group.page] then return end
     local options = renderPage(pages[group.page])
diff --git a/files/builtin_scripts/scripts/omw/settings/renderers.lua b/files/builtin_scripts/scripts/omw/settings/renderers.lua
index 9b862c3b4b..561849f862 100644
--- a/files/builtin_scripts/scripts/omw/settings/renderers.lua
+++ b/files/builtin_scripts/scripts/omw/settings/renderers.lua
@@ -2,38 +2,80 @@ local ui = require('openmw.ui')
 local async = require('openmw.async')
 local I = require('openmw.interfaces')
 
-return function(registerRenderer)
-    registerRenderer('textLine', function(value, set)
+local function applyDefaults(argument, defaults)
+    if not argument then return defaults end
+    if pairs(defaults) and pairs(argument) then
+        local result = {}
+        for k, v in pairs(defaults) do
+            result[k] = v
+        end
+        for k, v in pairs(argument) do
+            result[k] = v
+        end
+        return result
+    end
+    return argument
+end
+
+local function disable(disabled, layout)
+    if disabled then
         return {
-            template = I.MWUI.templates.textEditLine,
-            props = {
-                text = tostring(value),
-            },
-            events = {
-                textChanged = async:callback(function(s) set(s) end),
+            template = I.MWUI.templates.disabled,
+            content = ui.content {
+                layout,
             },
         }
-    end)
+    else
+        return layout
+    end
+end
 
-    registerRenderer('yesNo', function(value, set)
-        return {
-            template = I.MWUI.templates.box,
-            content = ui.content {
-                {
-                    template = I.MWUI.templates.padding,
-                    content = ui.content {
-                        {
-                            template = I.MWUI.templates.textNormal,
-                            props = {
-                                text = value and 'Yes' or 'No',
-                            },
-                            events = {
-                                mouseClick = async:callback(function() set(not value) end),
+return function(registerRenderer)
+    do
+        local defaultArgument = {
+            disabled = false,
+        }
+        registerRenderer('textLine', function(value, set, argument)
+            argument = applyDefaults(argument, defaultArgument)
+            return disable(argument.disabled, {
+                template = I.MWUI.templates.textEditLine,
+                props = {
+                    text = tostring(value),
+                },
+                events = {
+                    textChanged = async:callback(function(s) set(s) end),
+                },
+            })
+        end)
+    end
+
+    do
+        local defaultArgument = {
+            disabled = false,
+            trueLabel = 'Yes',
+            falseLabel = 'No',
+        }
+        registerRenderer('checkbox', function(value, set, argument)
+            argument = applyDefaults(argument, defaultArgument)
+            return disable(argument.disabled, {
+                template = I.MWUI.templates.box,
+                content = ui.content {
+                    {
+                        template = I.MWUI.templates.padding,
+                        content = ui.content {
+                            {
+                                template = I.MWUI.templates.textNormal,
+                                props = {
+                                    text = value and argument.trueLabel or argument.falseLabel
+                                },
+                                events = {
+                                    mouseClick = async:callback(function() set(not value) end),
+                                },
                             },
                         },
                     },
                 },
-            },
-        }
-    end)
+            })
+        end)
+    end
 end
\ No newline at end of file

From 7dbccc914a146cee05ad5330864f35bd96c9b6c7 Mon Sep 17 00:00:00 2001
From: kuyondo <rdja.kyd@gmail.com>
Date: Fri, 20 May 2022 06:03:12 +0800
Subject: [PATCH 2470/2859] no skill returns nil

---
 apps/openmw/mwlua/types/book.cpp | 10 ++++--
 files/lua_api/openmw/types.lua   | 56 ++++++++++++++++----------------
 2 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/apps/openmw/mwlua/types/book.cpp b/apps/openmw/mwlua/types/book.cpp
index 597c1a07a0..3fcdbec86d 100644
--- a/apps/openmw/mwlua/types/book.cpp
+++ b/apps/openmw/mwlua/types/book.cpp
@@ -19,7 +19,7 @@ namespace MWLua
         sol::table skill(context.mLua->sol(), sol::create);
         book["SKILL"] = LuaUtil::makeStrictReadOnly(skill);
         for (int id = ESM::Skill::Block; id < ESM::Skill::Length; ++id)
-            skill[(ESM::Skill::sSkillNames[id])] = id;
+            skill[Misc::StringUtils::lowerCase(ESM::Skill::sSkillNames[id])] = Misc::StringUtils::lowerCase(ESM::Skill::sSkillNames[id]);
 
         const MWWorld::Store<ESM::Book>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Book>();
         book["record"] = sol::overload(
@@ -35,9 +35,15 @@ namespace MWLua
         record["text"] = sol::readonly_property([](const ESM::Book& rec) -> std::string { return rec.mText; });
         record["enchant"] = sol::readonly_property([](const ESM::Book& rec) -> std::string { return rec.mEnchant; });
         record["isScroll"] = sol::readonly_property([](const ESM::Book& rec) -> bool { return rec.mData.mIsScroll; });
-        record["skill"] = sol::readonly_property([](const ESM::Book& rec) -> int { return rec.mData.mSkillId; });
         record["value"] = sol::readonly_property([](const ESM::Book& rec) -> int { return rec.mData.mValue; });
         record["weight"] = sol::readonly_property([](const ESM::Book& rec) -> float { return rec.mData.mWeight; });
         record["enchantCapacity"] = sol::readonly_property([](const ESM::Book& rec) -> float { return rec.mData.mEnchant * 0.1f; });
+        record["skill"] = sol::readonly_property([](const ESM::Book& rec) -> sol::optional<std::string>
+        { 
+            if (rec.mData.mSkillId >= 0)
+                return Misc::StringUtils::lowerCase(ESM::Skill::sSkillNames[rec.mData.mSkillId]);
+            else
+                return sol::nullopt;
+        });
     }
 }
diff --git a/files/lua_api/openmw/types.lua b/files/lua_api/openmw/types.lua
index d7a917711b..d9a4d36439 100644
--- a/files/lua_api/openmw/types.lua
+++ b/files/lua_api/openmw/types.lua
@@ -534,33 +534,33 @@
 
 --- Book.SKILL
 -- @type BookSKILL
--- @field #number Acrobatics
--- @field #number Alchemy
--- @field #number Alteration
--- @field #number Armorer
--- @field #number Athletics
--- @field #number Axe
--- @field #number Block
--- @field #number BluntWeapon
--- @field #number Conjuration
--- @field #number Destruction
--- @field #number Enchant
--- @field #number HandToHand
--- @field #number HeavyArmor
--- @field #number Illusion
--- @field #number LightArmor
--- @field #number LongBlade
--- @field #number Marksman
--- @field #number MediumArmor
--- @field #number Mercantile
--- @field #number Mysticism
--- @field #number Restoration
--- @field #number Security
--- @field #number ShortBlade
--- @field #number Sneak
--- @field #number Spear
--- @field #number Speechcraft
--- @field #number Unarmored
+-- @field #string acrobatics "acrobatics"
+-- @field #string alchemy "alchemy"
+-- @field #string alteration "alteration"
+-- @field #string armorer "armorer"
+-- @field #string athletics "athletics"
+-- @field #string axe "axe"
+-- @field #string block "block"
+-- @field #string bluntWeapon "bluntweapon"
+-- @field #string conjuration "conjuration"
+-- @field #string destruction "destruction"
+-- @field #string enchant "enchant"
+-- @field #string handToHand "handtohand"
+-- @field #string heavyArmor "heavyarmor"
+-- @field #string illusion "illusion"
+-- @field #string lightArmor "lightarmor"
+-- @field #string longBlade "longblade"
+-- @field #string marksman "marksman"
+-- @field #string mediumArmor "mediumarmor"
+-- @field #string mercantile "mercantile"
+-- @field #string mysticism "mysticism"
+-- @field #string restoration "restoration"
+-- @field #string security "security"
+-- @field #string shortBlade "shortblade"
+-- @field #string sneak "sneak"
+-- @field #string spear "spear"
+-- @field #string speechcraft "speechcraft"
+-- @field #string unarmored "unarmored"
 
 --- @{#BookSKILL}
 -- @field [parent=#Book] #BookSKILL SKILL
@@ -582,7 +582,7 @@
 -- @field #string text The text content of the book
 -- @field #number weight
 -- @field #number value
--- @field #number skill See @{#Book.SKILL} The skill that this book teaches
+-- @field #string skill The skill that this book teaches. See @{#Book.SKILL} 
 -- @field #boolean isScroll 
 -- @field #number enchantCapacity
 

From ce3bba0cdc02a0f58bb67f7f1e12d62619c7deb3 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 18 May 2022 19:40:54 +0200
Subject: [PATCH 2471/2859] Use std::list to store mechanics objects

To make the order of elements deterministic. Using memory address based objects
as map key makes order of elements there nondeterministic. Later it can be
replaced with vector when there are no indirect munipulations with container
inside iteration loops.

Change map key to const MWWorld::LiveCellRefBase* to avoid erasing and inserting
elements on MWWorld::Ptr update.

Store CharacterController by value instead of pointer to avoid redundant memory
allocation.
---
 apps/openmw/mwmechanics/character.hpp |  2 +
 apps/openmw/mwmechanics/objects.cpp   | 88 +++++++++++----------------
 apps/openmw/mwmechanics/objects.hpp   | 14 ++---
 3 files changed, 45 insertions(+), 59 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index e7f445054e..e8e7f2b721 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -241,6 +241,8 @@ public:
     CharacterController(const MWWorld::Ptr &ptr, MWRender::Animation *anim);
     virtual ~CharacterController();
 
+    const MWWorld::Ptr& getPtr() const { return mPtr; };
+
     void handleTextKey(const std::string &groupname, SceneUtil::TextKeyMap::ConstIterator key, const SceneUtil::TextKeyMap& map) override;
 
     // Be careful when to call this, see comment in Actors
diff --git a/apps/openmw/mwmechanics/objects.cpp b/apps/openmw/mwmechanics/objects.cpp
index 2b5157b4ec..c77521d06e 100644
--- a/apps/openmw/mwmechanics/objects.cpp
+++ b/apps/openmw/mwmechanics/objects.cpp
@@ -13,55 +13,43 @@
 namespace MWMechanics
 {
 
-Objects::~Objects()
-{
-  for(auto& object : mObjects)
-  {
-    delete object.second;
-    object.second = nullptr;
-  }
-}
-
 void Objects::addObject(const MWWorld::Ptr& ptr)
 {
     removeObject(ptr);
 
     MWRender::Animation *anim = MWBase::Environment::get().getWorld()->getAnimation(ptr);
-    if(anim) mObjects.insert(std::make_pair(ptr, new CharacterController(ptr, anim)));
+    if (anim == nullptr)
+        return;
+
+    const auto it = mObjects.emplace(mObjects.end(), ptr, anim);
+    mIndex.emplace(ptr.getBase(), it);
 }
 
 void Objects::removeObject(const MWWorld::Ptr& ptr)
 {
-    PtrControllerMap::iterator iter = mObjects.find(ptr);
-    if(iter != mObjects.end())
+    const auto iter = mIndex.find(ptr.getBase());
+    if (iter != mIndex.end())
     {
-        delete iter->second;
-        mObjects.erase(iter);
+        mObjects.erase(iter->second);
+        mIndex.erase(iter);
     }
 }
 
 void Objects::updateObject(const MWWorld::Ptr &old, const MWWorld::Ptr &ptr)
 {
-    PtrControllerMap::iterator iter = mObjects.find(old);
-    if(iter != mObjects.end())
-    {
-        CharacterController *ctrl = iter->second;
-        mObjects.erase(iter);
-
-        ctrl->updatePtr(ptr);
-        mObjects.insert(std::make_pair(ptr, ctrl));
-    }
+    const auto iter = mIndex.find(old.getBase());
+    if (iter != mIndex.end())
+        iter->second->updatePtr(ptr);
 }
 
 void Objects::dropObjects (const MWWorld::CellStore *cellStore)
 {
-    PtrControllerMap::iterator iter = mObjects.begin();
-    while(iter != mObjects.end())
+    for (auto iter = mObjects.begin(); iter != mObjects.end();)
     {
-        if(iter->first.getCell()==cellStore)
+        if (iter->getPtr().getCell() == cellStore)
         {
-            delete iter->second;
-            mObjects.erase(iter++);
+            mIndex.erase(iter->getPtr().getBase());
+            iter = mObjects.erase(iter);
         }
         else
             ++iter;
@@ -72,8 +60,8 @@ void Objects::update(float duration, bool paused)
 {
     if(!paused)
     {
-        for(auto& object : mObjects)
-            object.second->update(duration);
+        for (CharacterController& object : mObjects)
+            object.update(duration);
     }
     else
     {
@@ -82,15 +70,15 @@ void Objects::update(float duration, bool paused)
         if(mode != MWGui::GM_Container)
             return;
 
-        for(auto& object : mObjects)
+        for (CharacterController& object : mObjects)
         {
-            if (object.first.getType() != ESM::Container::sRecordId)
+            if (object.getPtr().getType() != ESM::Container::sRecordId)
                 continue;
 
-            if (object.second->isAnimPlaying("containeropen"))
+            if (object.isAnimPlaying("containeropen"))
             {
-                object.second->update(duration);
-                MWBase::Environment::get().getWorld()->updateAnimatedCollisionShape(object.first);
+                object.update(duration);
+                MWBase::Environment::get().getWorld()->updateAnimatedCollisionShape(object.getPtr());
             }
         }
     }
@@ -98,23 +86,23 @@ void Objects::update(float duration, bool paused)
 
 bool Objects::onOpen(const MWWorld::Ptr& ptr)
 {
-    PtrControllerMap::iterator iter = mObjects.find(ptr);
-    if(iter != mObjects.end())
+    const auto iter = mIndex.find(ptr.getBase());
+    if (iter != mIndex.end())
         return iter->second->onOpen();
     return true;
 }
 
 void Objects::onClose(const MWWorld::Ptr& ptr)
 {
-    PtrControllerMap::iterator iter = mObjects.find(ptr);
-    if(iter != mObjects.end())
+    const auto iter = mIndex.find(ptr.getBase());
+    if (iter != mIndex.end())
         iter->second->onClose();
 }
 
 bool Objects::playAnimationGroup(const MWWorld::Ptr& ptr, const std::string& groupName, int mode, int number, bool persist)
 {
-    PtrControllerMap::iterator iter = mObjects.find(ptr);
-    if(iter != mObjects.end())
+    const auto iter = mIndex.find(ptr.getBase());
+    if (iter != mIndex.end())
     {
         return iter->second->playGroup(groupName, mode, number, persist);
     }
@@ -126,24 +114,22 @@ bool Objects::playAnimationGroup(const MWWorld::Ptr& ptr, const std::string& gro
 }
 void Objects::skipAnimation(const MWWorld::Ptr& ptr)
 {
-    PtrControllerMap::iterator iter = mObjects.find(ptr);
-    if(iter != mObjects.end())
+    const auto iter = mIndex.find(ptr.getBase());
+    if (iter != mIndex.end())
         iter->second->skipAnim();
 }
 
 void Objects::persistAnimationStates()
 {
-    for (PtrControllerMap::iterator iter = mObjects.begin(); iter != mObjects.end(); ++iter)
-        iter->second->persistAnimationState();
+    for (CharacterController& object : mObjects)
+        object.persistAnimationState();
 }
 
-void Objects::getObjectsInRange(const osg::Vec3f& position, float radius, std::vector<MWWorld::Ptr>& out)
+void Objects::getObjectsInRange(const osg::Vec3f& position, float radius, std::vector<MWWorld::Ptr>& out) const
 {
-    for (PtrControllerMap::iterator iter = mObjects.begin(); iter != mObjects.end(); ++iter)
-    {
-        if ((position - iter->first.getRefData().getPosition().asVec3()).length2() <= radius*radius)
-            out.push_back(iter->first);
-    }
+    for (const CharacterController& object : mObjects)
+        if ((position - object.getPtr().getRefData().getPosition().asVec3()).length2() <= radius * radius)
+            out.push_back(object.getPtr());
 }
 
 }
diff --git a/apps/openmw/mwmechanics/objects.hpp b/apps/openmw/mwmechanics/objects.hpp
index ba39fdbd4f..a6b2d7c675 100644
--- a/apps/openmw/mwmechanics/objects.hpp
+++ b/apps/openmw/mwmechanics/objects.hpp
@@ -1,9 +1,12 @@
 #ifndef GAME_MWMECHANICS_ACTIVATORS_H
 #define GAME_MWMECHANICS_ACTIVATORS_H
 
+#include "character.hpp"
+
 #include <string>
 #include <map>
 #include <vector>
+#include <list>
 
 namespace osg
 {
@@ -18,17 +21,12 @@ namespace MWWorld
 
 namespace MWMechanics
 {
-    class CharacterController;
-
     class Objects
     {
-        typedef std::map<MWWorld::Ptr,CharacterController*> PtrControllerMap;
-        PtrControllerMap mObjects;
+        std::list<CharacterController> mObjects;
+        std::map<const MWWorld::LiveCellRefBase*, std::list<CharacterController>::iterator> mIndex;
 
     public:
-        Objects() = default;
-        ~Objects();
-
         void addObject (const MWWorld::Ptr& ptr);
         ///< Register an animated object
 
@@ -51,7 +49,7 @@ namespace MWMechanics
         void skipAnimation(const MWWorld::Ptr& ptr);
         void persistAnimationStates();
 
-        void getObjectsInRange (const osg::Vec3f& position, float radius, std::vector<MWWorld::Ptr>& out);
+        void getObjectsInRange(const osg::Vec3f& position, float radius, std::vector<MWWorld::Ptr>& out) const;
 
         std::size_t size() const
         {

From 7684d7e660485c85ccee554329f16a66bc185950 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Thu, 19 May 2022 17:22:16 -0700
Subject: [PATCH 2472/2859] documentation typo

---
 docs/source/reference/postprocessing/omwfx.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/reference/postprocessing/omwfx.rst b/docs/source/reference/postprocessing/omwfx.rst
index bf194c7929..8354090b67 100644
--- a/docs/source/reference/postprocessing/omwfx.rst
+++ b/docs/source/reference/postprocessing/omwfx.rst
@@ -330,7 +330,7 @@ In the code snippet below, a shader is defined that requires GLSL `330`, HDR cap
         passes = dummy;
         glsl_version = 330;
         hdr = true;
-        flags = disable_interiors | disable_abovewater;
+        flags = disable_interiors, disable_abovewater;
     }
 
 

From 5109777d3b4aabd7e58f3940ed7e43488caa2174 Mon Sep 17 00:00:00 2001
From: kuyondo <rdja.kyd@gmail.com>
Date: Fri, 20 May 2022 18:50:00 +0800
Subject: [PATCH 2473/2859] remove duplication

---
 apps/openmw/mwlua/types/book.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwlua/types/book.cpp b/apps/openmw/mwlua/types/book.cpp
index 3fcdbec86d..9d34a2026e 100644
--- a/apps/openmw/mwlua/types/book.cpp
+++ b/apps/openmw/mwlua/types/book.cpp
@@ -19,7 +19,10 @@ namespace MWLua
         sol::table skill(context.mLua->sol(), sol::create);
         book["SKILL"] = LuaUtil::makeStrictReadOnly(skill);
         for (int id = ESM::Skill::Block; id < ESM::Skill::Length; ++id)
-            skill[Misc::StringUtils::lowerCase(ESM::Skill::sSkillNames[id])] = Misc::StringUtils::lowerCase(ESM::Skill::sSkillNames[id]);
+        {
+            std::string skillName = Misc::StringUtils::lowerCase(ESM::Skill::sSkillNames[id]);
+            skill[skillName] = skillName;
+        }
 
         const MWWorld::Store<ESM::Book>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Book>();
         book["record"] = sol::overload(

From 70eacbbefc666b6366628206028a0b5e9fcd1183 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Fri, 20 May 2022 19:27:21 +0000
Subject: [PATCH 2474/2859] onObjectActive and onItemActive Lua engine handlers

---
 apps/openmw/mwlua/globalscripts.hpp           | 12 +++++++++-
 apps/openmw/mwlua/luamanagerimp.cpp           | 22 +++++++++++++------
 apps/openmw/mwlua/luamanagerimp.hpp           |  2 +-
 apps/openmw/mwlua/worldview.hpp               |  3 +++
 .../lua-scripting/engine_handlers.rst         |  5 +++++
 5 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwlua/globalscripts.hpp b/apps/openmw/mwlua/globalscripts.hpp
index 2737dabaca..2b40aabd9d 100644
--- a/apps/openmw/mwlua/globalscripts.hpp
+++ b/apps/openmw/mwlua/globalscripts.hpp
@@ -19,15 +19,25 @@ namespace MWLua
         GlobalScripts(LuaUtil::LuaState* lua) :
             LuaUtil::ScriptsContainer(lua, "Global", ESM::LuaScriptCfg::sGlobal)
         {
-            registerEngineHandlers({&mActorActiveHandlers, &mNewGameHandlers, &mPlayerAddedHandlers});
+            registerEngineHandlers({
+                &mObjectActiveHandlers,
+                &mActorActiveHandlers,
+                &mItemActiveHandlers,
+                &mNewGameHandlers,
+                &mPlayerAddedHandlers
+            });
         }
 
         void newGameStarted() { callEngineHandlers(mNewGameHandlers); }
+        void objectActive(const GObject& obj) { callEngineHandlers(mObjectActiveHandlers, obj); }
         void actorActive(const GObject& obj) { callEngineHandlers(mActorActiveHandlers, obj); }
+        void itemActive(const GObject& obj) { callEngineHandlers(mItemActiveHandlers, obj); }
         void playerAdded(const GObject& obj) { callEngineHandlers(mPlayerAddedHandlers, obj); }
 
     private:
+        EngineHandlerList mObjectActiveHandlers{"onObjectActive"};
         EngineHandlerList mActorActiveHandlers{"onActorActive"};
+        EngineHandlerList mItemActiveHandlers{"onItemActive"};
         EngineHandlerList mNewGameHandlers{"onNewGame"};
         EngineHandlerList mPlayerAddedHandlers{"onPlayerAdded"};
     };
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 5cfc52d737..6894208c07 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -209,15 +209,23 @@ namespace MWLua
             mGlobalScripts.newGameStarted();
         }
 
-        for (ObjectId id : mActorAddedEvents)
+        for (ObjectId id : mObjectAddedEvents)
         {
             GObject obj(id, objectRegistry);
             if (obj.isValid())
-                mGlobalScripts.actorActive(obj);
+            {
+                mGlobalScripts.objectActive(obj);
+                const MWWorld::Class& objClass = obj.ptr().getClass();
+                if (objClass.isActor())
+                    mGlobalScripts.actorActive(obj);
+                if (mWorldView.isItem(obj.ptr()))
+                    mGlobalScripts.itemActive(obj);
+            }
             else if (luaDebug)
-                Log(Debug::Verbose) << "Can not call onActorActive engine handler: object" << idToString(id) << " is already removed";
+                Log(Debug::Verbose) << "Could not resolve a Lua object added event: object" << idToString(id)
+                    << " is already removed";
         }
-        mActorAddedEvents.clear();
+        mObjectAddedEvents.clear();
 
         if (!mWorldView.isPaused())
             mGlobalScripts.update(frameDuration);
@@ -267,7 +275,7 @@ namespace MWLua
         mLocalEvents.clear();
         mGlobalEvents.clear();
         mInputEvents.clear();
-        mActorAddedEvents.clear();
+        mObjectAddedEvents.clear();
         mLocalEngineEvents.clear();
         mNewGameStarted = false;
         mPlayerChanged = false;
@@ -338,8 +346,8 @@ namespace MWLua
             mLocalEngineEvents.push_back({getId(ptr), LocalScripts::OnActive{}});
         }
 
-        if (ptr.getClass().isActor() && ptr != mPlayer)
-            mActorAddedEvents.push_back(getId(ptr));
+        if (ptr != mPlayer)
+            mObjectAddedEvents.push_back(getId(ptr));
     }
 
     void LuaManager::objectRemovedFromScene(const MWWorld::Ptr& ptr)
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index 0c08deb4fb..871ab0af26 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -162,7 +162,7 @@ namespace MWLua
         std::unique_ptr<LuaUtil::UserdataSerializer> mLocalLoader;
 
         std::vector<MWBase::LuaManager::InputEvent> mInputEvents;
-        std::vector<ObjectId> mActorAddedEvents;
+        std::vector<ObjectId> mObjectAddedEvents;
 
         struct CallbackWithData
         {
diff --git a/apps/openmw/mwlua/worldview.hpp b/apps/openmw/mwlua/worldview.hpp
index 004fcfc0c3..accf2758f0 100644
--- a/apps/openmw/mwlua/worldview.hpp
+++ b/apps/openmw/mwlua/worldview.hpp
@@ -62,6 +62,9 @@ namespace MWLua
         void load(ESM::ESMReader& esm);
         void save(ESM::ESMWriter& esm) const;
 
+        // TODO: move this functionality to MWClass
+        bool isItem(const MWWorld::Ptr& ptr) { return chooseGroup(ptr) == &mItemsInScene; }
+
     private:
         struct ObjectGroup
         {
diff --git a/docs/source/reference/lua-scripting/engine_handlers.rst b/docs/source/reference/lua-scripting/engine_handlers.rst
index 524314341c..ca05c9b8e1 100644
--- a/docs/source/reference/lua-scripting/engine_handlers.rst
+++ b/docs/source/reference/lua-scripting/engine_handlers.rst
@@ -40,8 +40,13 @@ Engine handler is a function defined by a script, that can be called by the engi
     - New game is started
   * - onPlayerAdded(player)
     - Player added to the game world. The argument is a `Game object`.
+  * - onObjectActive(object)
+    - Object becomes active.
   * - onActorActive(actor)
     - Actor (NPC or Creature) becomes active.
+  * - onItemActive(item)
+    - | Item (Weapon, Potion, ...) becomes active in a cell.
+      | Does not apply to items in inventories or containers.
 
 **Only for local scripts**
 

From 6a0a2eed3336ce315d0e96b86cb96cb84ee56e5d Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Wed, 18 May 2022 12:11:36 +0200
Subject: [PATCH 2475/2859] [Lua] core.getRealTime()

---
 apps/openmw/mwlua/luabindings.cpp | 6 ++++++
 files/lua_api/openmw/core.lua     | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index 4878e0423e..c9bf99462a 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -1,5 +1,7 @@
 #include "luabindings.hpp"
 
+#include <chrono>
+
 #include <components/lua/luastate.hpp>
 #include <components/lua/l10n.hpp>
 
@@ -23,6 +25,10 @@ namespace MWLua
         api["getGameTime"] = [world=context.mWorldView]() { return world->getGameTime(); };
         api["getGameTimeScale"] = [world=context.mWorldView]() { return world->getGameTimeScale(); };
         api["isWorldPaused"] = [world=context.mWorldView]() { return world->isPaused(); };
+        api["getRealTime"] = []()
+        {
+            return std::chrono::duration<double>(std::chrono::steady_clock::now().time_since_epoch()).count();
+        };
 
         if (!global)
             return;
diff --git a/files/lua_api/openmw/core.lua b/files/lua_api/openmw/core.lua
index d719853da0..659a17beb1 100644
--- a/files/lua_api/openmw/core.lua
+++ b/files/lua_api/openmw/core.lua
@@ -46,6 +46,11 @@
 -- @function [parent=#core] isWorldPaused
 -- @return #boolean
 
+---
+-- Real time in seconds; starting point is not fixed (can be time since last reboot), use only for measuring intervals. For Unix time use `os.time()`.
+-- @function [parent=#core] getRealTime
+-- @return #number
+
 ---
 -- Get a GMST setting from content files.
 -- @function [parent=#core] getGMST

From e2c44d13f3f95c7cc5d8fe1ca9bab5d69146c532 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 18 May 2022 19:24:57 +0200
Subject: [PATCH 2476/2859] Use std::list to store mechanics actors

To make the order of elements deterministic. Using memory address based objects
as map key makes order of elements there nondeterministic. Later it can be
replaced with vector when there are no indirect munipulations with container
inside iteration loops.

Change map key to const MWWorld::LiveCellRefBase* to avoid erasing and inserting
elements on MWWorld::Ptr update.
---
 apps/openmw/mwmechanics/actor.cpp             |   5 +
 apps/openmw/mwmechanics/actor.hpp             |   4 +-
 apps/openmw/mwmechanics/actors.cpp            | 366 +++++++++---------
 apps/openmw/mwmechanics/actors.hpp            |  13 +-
 .../mwmechanics/mechanicsmanagerimp.cpp       |   9 +-
 5 files changed, 193 insertions(+), 204 deletions(-)

diff --git a/apps/openmw/mwmechanics/actor.cpp b/apps/openmw/mwmechanics/actor.cpp
index d1d37eeb56..818ce41b84 100644
--- a/apps/openmw/mwmechanics/actor.cpp
+++ b/apps/openmw/mwmechanics/actor.cpp
@@ -10,6 +10,11 @@ namespace MWMechanics
         mCharacterController.reset(new CharacterController(ptr, animation));
     }
 
+    const MWWorld::Ptr& Actor::getPtr() const
+    {
+        return mCharacterController->getPtr();
+    }
+
     void Actor::updatePtr(const MWWorld::Ptr &newPtr)
     {
         mCharacterController->updatePtr(newPtr);
diff --git a/apps/openmw/mwmechanics/actor.hpp b/apps/openmw/mwmechanics/actor.hpp
index 231c756810..dac9fc4d70 100644
--- a/apps/openmw/mwmechanics/actor.hpp
+++ b/apps/openmw/mwmechanics/actor.hpp
@@ -3,7 +3,7 @@
 
 #include <memory>
 
-#include "../mwmechanics/actorutil.hpp"
+#include "actorutil.hpp"
 
 #include <components/misc/timer.hpp>
 
@@ -26,6 +26,8 @@ namespace MWMechanics
     public:
         Actor(const MWWorld::Ptr& ptr, MWRender::Animation* animation);
 
+        const MWWorld::Ptr& getPtr() const;
+
         /// Notify this actor of its new base object Ptr, use when the object changed cells
         void updatePtr(const MWWorld::Ptr& newPtr);
 
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index fb78beb8cf..22d159594d 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -105,12 +105,12 @@ void getRestorationPerHourOfSleep (const MWWorld::Ptr& ptr, float& health, float
 }
 
 template<class T>
-void forEachFollowingPackage(MWMechanics::Actors::PtrActorMap& actors, const MWWorld::Ptr& actor, const MWWorld::Ptr& player, T&& func)
+void forEachFollowingPackage(std::list<MWMechanics::Actor>& actors, const MWWorld::Ptr& actorPtr, const MWWorld::Ptr& player, T&& func)
 {
-    for(auto& iter : actors)
+    for (const MWMechanics::Actor& actor : actors)
     {
-        const MWWorld::Ptr &iteratedActor = iter.first;
-        if (iteratedActor == player || iteratedActor == actor)
+        const MWWorld::Ptr &iteratedActor = actor.getPtr();
+        if (iteratedActor == player || iteratedActor == actorPtr)
             continue;
 
         const MWMechanics::CreatureStats &stats = iteratedActor.getClass().getCreatureStats(iteratedActor);
@@ -121,7 +121,7 @@ void forEachFollowingPackage(MWMechanics::Actors::PtrActorMap& actors, const MWW
         // or there are only Combat and Wander packages before the AiFollow package
         for (const auto& package : stats.getAiSequence())
         {
-            if(!func(iter, package))
+            if (!func(actor, package))
                 break;
         }
     }
@@ -771,8 +771,8 @@ namespace MWMechanics
 
     bool Actors::isAttackPreparing(const MWWorld::Ptr& ptr)
     {
-        PtrActorMap::iterator it = mActors.find(ptr);
-        if (it == mActors.end())
+        const auto it = mIndex.find(ptr.mRef);
+        if (it == mIndex.end())
             return false;
         CharacterController* ctrl = it->second->getCharacterController();
 
@@ -781,8 +781,8 @@ namespace MWMechanics
 
     bool Actors::isRunning(const MWWorld::Ptr& ptr)
     {
-        PtrActorMap::iterator it = mActors.find(ptr);
-        if (it == mActors.end())
+        const auto it = mIndex.find(ptr.mRef);
+        if (it == mIndex.end())
             return false;
         CharacterController* ctrl = it->second->getCharacterController();
 
@@ -791,8 +791,8 @@ namespace MWMechanics
 
     bool Actors::isSneaking(const MWWorld::Ptr& ptr)
     {
-        PtrActorMap::iterator it = mActors.find(ptr);
-        if (it == mActors.end())
+        const auto it = mIndex.find(ptr.mRef);
+        if (it == mIndex.end())
             return false;
         CharacterController* ctrl = it->second->getCharacterController();
 
@@ -1031,11 +1031,6 @@ namespace MWMechanics
         updateProcessingRange();
     }
 
-    Actors::~Actors()
-    {
-        clear();
-    }
-
     float Actors::getProcessingRange() const
     {
         return mActorsProcessingRange;
@@ -1057,9 +1052,10 @@ namespace MWMechanics
         MWRender::Animation *anim = MWBase::Environment::get().getWorld()->getAnimation(ptr);
         if (!anim)
             return;
-        mActors.emplace(ptr, new Actor(ptr, anim));
+        const auto it = mActors.emplace(mActors.end(), ptr, anim);
+        mIndex.emplace(ptr.mRef, it);
 
-        CharacterController* ctrl = mActors[ptr]->getCharacterController();
+        CharacterController* ctrl = it->getCharacterController();
         if (updateImmediately)
             ctrl->update(0);
 
@@ -1102,20 +1098,20 @@ namespace MWMechanics
 
     void Actors::removeActor (const MWWorld::Ptr& ptr, bool keepActive)
     {
-        PtrActorMap::iterator iter = mActors.find(ptr);
-        if(iter != mActors.end())
+        const auto iter = mIndex.find(ptr.mRef);
+        if (iter != mIndex.end())
         {
             if(!keepActive)
-                removeTemporaryEffects(iter->first);
-            delete iter->second;
-            mActors.erase(iter);
+                removeTemporaryEffects(iter->second->getPtr());
+            mActors.erase(iter->second);
+            mIndex.erase(iter);
         }
     }
 
     void Actors::castSpell(const MWWorld::Ptr& ptr, const std::string& spellId, bool manualSpell)
     {
-        PtrActorMap::iterator iter = mActors.find(ptr);
-        if(iter != mActors.end())
+        const auto iter = mIndex.find(ptr.mRef);
+        if (iter != mIndex.end())
             iter->second->getCharacterController()->castSpell(spellId, manualSpell);
     }
 
@@ -1153,27 +1149,20 @@ namespace MWMechanics
 
     void Actors::updateActor(const MWWorld::Ptr &old, const MWWorld::Ptr &ptr)
     {
-        PtrActorMap::iterator iter = mActors.find(old);
-        if(iter != mActors.end())
-        {
-            Actor *actor = iter->second;
-            mActors.erase(iter);
-
-            actor->updatePtr(ptr);
-            mActors.insert(std::make_pair(ptr, actor));
-        }
+        const auto iter = mIndex.find(old.mRef);
+        if (iter != mIndex.end())
+            iter->second->updatePtr(ptr);
     }
 
     void Actors::dropActors (const MWWorld::CellStore *cellStore, const MWWorld::Ptr& ignore)
     {
-        PtrActorMap::iterator iter = mActors.begin();
-        while(iter != mActors.end())
+        for (auto iter = mActors.begin(); iter != mActors.end();)
         {
-            if((iter->first.isInCell() && iter->first.getCell()==cellStore) && iter->first != ignore)
+            if ((iter->getPtr().isInCell() && iter->getPtr().getCell() == cellStore) && iter->getPtr() != ignore)
             {
-                removeTemporaryEffects(iter->first);
-                delete iter->second;
-                mActors.erase(iter++);
+                removeTemporaryEffects(iter->getPtr());
+                mIndex.erase(iter->getPtr().mRef);
+                iter = mActors.erase(iter);
             }
             else
                 ++iter;
@@ -1189,14 +1178,14 @@ namespace MWMechanics
 
         if (aiActive)
         {
-            for(PtrActorMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
+            for (const Actor& actor : mActors)
             {
-                if (iter->first == player) continue;
+                if (actor.getPtr() == player) continue;
 
-                bool inProcessingRange = (playerPos - iter->first.getRefData().getPosition().asVec3()).length2() <= mActorsProcessingRange*mActorsProcessingRange;
+                bool inProcessingRange = (playerPos - actor.getPtr().getRefData().getPosition().asVec3()).length2() <= mActorsProcessingRange*mActorsProcessingRange;
                 if (inProcessingRange)
                 {
-                    MWMechanics::CreatureStats& stats = iter->first.getClass().getCreatureStats(iter->first);
+                    MWMechanics::CreatureStats& stats = actor.getPtr().getClass().getCreatureStats(actor.getPtr());
                     if (!stats.isDead() && stats.getAiSequence().isInCombat())
                     {
                         hasHostiles = true;
@@ -1235,9 +1224,9 @@ namespace MWMechanics
 
         const MWWorld::Ptr player = getPlayer();
         const MWBase::World* world = MWBase::Environment::get().getWorld();
-        for(PtrActorMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
+        for (const Actor& actor : mActors)
         {
-            const MWWorld::Ptr& ptr = iter->first;
+            const MWWorld::Ptr& ptr = actor.getPtr();
             if (ptr == player)
                 continue; // Don't interfere with player controls.
 
@@ -1297,9 +1286,9 @@ namespace MWMechanics
             float angleToApproachingActor = 0;
 
             // Iterate through all other actors and predict collisions.
-            for(PtrActorMap::iterator otherIter(mActors.begin()); otherIter != mActors.end(); ++otherIter)
+            for (const Actor& otherActor : mActors)
             {
-                const MWWorld::Ptr& otherPtr = otherIter->first;
+                const MWWorld::Ptr& otherPtr = otherActor.getPtr();
                 if (otherPtr == ptr || otherPtr == currentTarget)
                     continue;
 
@@ -1410,42 +1399,42 @@ namespace MWMechanics
             bool godmode = MWBase::Environment::get().getWorld()->getGodModeState();
 
              // AI and magic effects update
-            for(PtrActorMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
+            for (Actor& actor : mActors)
             {
-                bool isPlayer = iter->first == player;
-                CharacterController* ctrl = iter->second->getCharacterController();
+                const bool isPlayer = actor.getPtr() == player;
+                CharacterController* const  ctrl = actor.getCharacterController();
                 MWBase::LuaManager::ActorControls* luaControls =
-                    MWBase::Environment::get().getLuaManager()->getActorControls(iter->first);
+                    MWBase::Environment::get().getLuaManager()->getActorControls(actor.getPtr());
 
-                float distSqr = (playerPos - iter->first.getRefData().getPosition().asVec3()).length2();
+                const float distSqr = (playerPos - actor.getPtr().getRefData().getPosition().asVec3()).length2();
                 // AI processing is only done within given distance to the player.
                 bool inProcessingRange = distSqr <= mActorsProcessingRange*mActorsProcessingRange;
 
                 // If dead or no longer in combat, no longer store any actors who attempted to hit us. Also remove for the player.
-                if (iter->first != player && (iter->first.getClass().getCreatureStats(iter->first).isDead()
-                    || !iter->first.getClass().getCreatureStats(iter->first).getAiSequence().isInCombat()
+                if (actor.getPtr() != player && (actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isDead()
+                    || !actor.getPtr().getClass().getCreatureStats(actor.getPtr()).getAiSequence().isInCombat()
                     || !inProcessingRange))
                 {
-                    iter->first.getClass().getCreatureStats(iter->first).setHitAttemptActorId(-1);
-                    if (player.getClass().getCreatureStats(player).getHitAttemptActorId() == iter->first.getClass().getCreatureStats(iter->first).getActorId())
+                    actor.getPtr().getClass().getCreatureStats(actor.getPtr()).setHitAttemptActorId(-1);
+                    if (player.getClass().getCreatureStats(player).getHitAttemptActorId() == actor.getPtr().getClass().getCreatureStats(actor.getPtr()).getActorId())
                         player.getClass().getCreatureStats(player).setHitAttemptActorId(-1);
                 }
 
-                const Misc::TimerStatus engageCombatTimerStatus = iter->second->updateEngageCombatTimer(duration);
+                const Misc::TimerStatus engageCombatTimerStatus = actor.updateEngageCombatTimer(duration);
 
                 // For dead actors we need to update looping spell particles
-                if (iter->first.getClass().getCreatureStats(iter->first).isDead())
+                if (actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isDead())
                 {
                     // They can be added during the death animation
-                    if (!iter->first.getClass().getCreatureStats(iter->first).isDeathAnimationFinished())
-                        adjustMagicEffects(iter->first, duration);
+                    if (!actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isDeathAnimationFinished())
+                        adjustMagicEffects(actor.getPtr(), duration);
                     ctrl->updateContinuousVfx();
                 }
                 else
                 {
                     bool cellChanged = world->hasCellChanged();
-                    MWWorld::Ptr actor = iter->first; // make a copy of the map key to avoid it being invalidated when the player teleports
-                    updateActor(actor, duration);
+                    const MWWorld::Ptr actorPtr = actor.getPtr(); // make a copy of the map key to avoid it being invalidated when the player teleports
+                    updateActor(actorPtr, duration);
 
                     // Looping magic VFX update
                     // Note: we need to do this before any of the animations are updated.
@@ -1464,13 +1453,13 @@ namespace MWMechanics
                         if (engageCombatTimerStatus == Misc::TimerStatus::Elapsed)
                         {
                             if (!isPlayer)
-                                adjustCommandedActor(iter->first);
+                                adjustCommandedActor(actor.getPtr());
 
-                            for(PtrActorMap::iterator it(mActors.begin()); it != mActors.end(); ++it)
+                            for (const Actor& otherActor : mActors)
                             {
-                                if (it->first == iter->first || isPlayer) // player is not AI-controlled
+                                if (otherActor.getPtr() == actor.getPtr() || isPlayer) // player is not AI-controlled
                                     continue;
-                                engageCombat(iter->first, it->first, cachedAllies, it->first == player);
+                                engageCombat(actor.getPtr(), otherActor.getPtr(), cachedAllies, otherActor.getPtr() == player);
                             }
                         }
                         if (mTimerUpdateHeadTrack == 0)
@@ -1478,7 +1467,7 @@ namespace MWMechanics
                             float sqrHeadTrackDistance = std::numeric_limits<float>::max();
                             MWWorld::Ptr headTrackTarget;
 
-                            MWMechanics::CreatureStats& stats = iter->first.getClass().getCreatureStats(iter->first);
+                            MWMechanics::CreatureStats& stats = actor.getPtr().getClass().getCreatureStats(actor.getPtr());
                             bool firstPersonPlayer = isPlayer && world->isFirstPerson();
   
                             // 1. Unconsious actor can not track target
@@ -1493,18 +1482,18 @@ namespace MWMechanics
                                     if (!activePackageTarget.isEmpty())
                                     {
                                         // Track the specified target of package.
-                                        updateHeadTracking(iter->first, activePackageTarget, headTrackTarget, sqrHeadTrackDistance, inCombatOrPursue);
+                                        updateHeadTracking(actor.getPtr(), activePackageTarget, headTrackTarget, sqrHeadTrackDistance, inCombatOrPursue);
                                     }
                                 }
                                 else
                                 {
                                     // Find something nearby.
-                                    for (auto& [ptr, _] : mActors)
+                                    for (const Actor& otherActor : mActors)
                                     {
-                                        if (ptr == iter->first)
+                                        if (otherActor.getPtr() == actor.getPtr())
                                             continue;
 
-                                        updateHeadTracking(iter->first, ptr, headTrackTarget, sqrHeadTrackDistance, inCombatOrPursue);
+                                        updateHeadTracking(actor.getPtr(), otherActor.getPtr(), headTrackTarget, sqrHeadTrackDistance, inCombatOrPursue);
                                     }
                                 }
                             }
@@ -1512,39 +1501,39 @@ namespace MWMechanics
                             ctrl->setHeadTrackTarget(headTrackTarget);
                         }
 
-                        if (iter->first.getClass().isNpc() && iter->first != player)
-                            updateCrimePursuit(iter->first, duration);
+                        if (actor.getPtr().getClass().isNpc() && actor.getPtr() != player)
+                            updateCrimePursuit(actor.getPtr(), duration);
 
-                        if (iter->first != player)
+                        if (actor.getPtr() != player)
                         {
-                            CreatureStats &stats = iter->first.getClass().getCreatureStats(iter->first);
-                            if (isConscious(iter->first) && !(luaControls && luaControls->mDisableAI))
+                            CreatureStats &stats = actor.getPtr().getClass().getCreatureStats(actor.getPtr());
+                            if (isConscious(actor.getPtr()) && !(luaControls && luaControls->mDisableAI))
                             {
-                                stats.getAiSequence().execute(iter->first, *ctrl, duration);
-                                updateGreetingState(iter->first, *iter->second, mTimerUpdateHello > 0);
-                                playIdleDialogue(iter->first);
-                                updateMovementSpeed(iter->first);
+                                stats.getAiSequence().execute(actor.getPtr(), *ctrl, duration);
+                                updateGreetingState(actor.getPtr(), actor, mTimerUpdateHello > 0);
+                                playIdleDialogue(actor.getPtr());
+                                updateMovementSpeed(actor.getPtr());
                             }
                         }
                     }
-                    else if (aiActive && iter->first != player && isConscious(iter->first) && !(luaControls && luaControls->mDisableAI))
+                    else if (aiActive && actor.getPtr() != player && isConscious(actor.getPtr()) && !(luaControls && luaControls->mDisableAI))
                     {
-                        CreatureStats &stats = iter->first.getClass().getCreatureStats(iter->first);
-                        stats.getAiSequence().execute(iter->first, *ctrl, duration, /*outOfRange*/true);
+                        CreatureStats &stats = actor.getPtr().getClass().getCreatureStats(actor.getPtr());
+                        stats.getAiSequence().execute(actor.getPtr(), *ctrl, duration, /*outOfRange*/true);
                     }
 
-                    if(inProcessingRange && iter->first.getClass().isNpc())
+                    if (inProcessingRange && actor.getPtr().getClass().isNpc())
                     {
                         // We can not update drowning state for actors outside of AI distance - they can not resurface to breathe
-                        updateDrowning(iter->first, duration, ctrl->isKnockedOut(), isPlayer);
+                        updateDrowning(actor.getPtr(), duration, ctrl->isKnockedOut(), isPlayer);
                     }
-                    if(mTimerUpdateEquippedLight == 0 && iter->first.getClass().hasInventoryStore(iter->first))
-                        updateEquippedLight(iter->first, updateEquippedLightInterval, showTorches);
+                    if (mTimerUpdateEquippedLight == 0 && actor.getPtr().getClass().hasInventoryStore(actor.getPtr()))
+                        updateEquippedLight(actor.getPtr(), updateEquippedLightInterval, showTorches);
 
-                    if (luaControls && isConscious(iter->first))
+                    if (luaControls && isConscious(actor.getPtr()))
                     {
-                        Movement& mov = iter->first.getClass().getMovementSettings(iter->first);
-                        CreatureStats& stats = iter->first.getClass().getCreatureStats(iter->first);
+                        Movement& mov = actor.getPtr().getClass().getMovementSettings(actor.getPtr());
+                        CreatureStats& stats = actor.getPtr().getClass().getCreatureStats(actor.getPtr());
                         float speedFactor = isPlayer ? 1.f : mov.mSpeedFactor;
                         osg::Vec2f movement = osg::Vec2f(mov.mPosition[0], mov.mPosition[1]) * speedFactor;
                         float rotationX = mov.mRotation[0];
@@ -1587,14 +1576,14 @@ namespace MWMechanics
 
             // Animation/movement update
             CharacterController* playerCharacter = nullptr;
-            for(PtrActorMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
+            for (Actor& actor : mActors)
             {
-                const float dist = (playerPos - iter->first.getRefData().getPosition().asVec3()).length();
-                bool isPlayer = iter->first == player;
-                CreatureStats &stats = iter->first.getClass().getCreatureStats(iter->first);
+                const float dist = (playerPos - actor.getPtr().getRefData().getPosition().asVec3()).length();
+                const bool isPlayer = actor.getPtr() == player;
+                CreatureStats &stats = actor.getPtr().getClass().getCreatureStats(actor.getPtr());
                 // Actors with active AI should be able to move.
                 bool alwaysActive = false;
-                if (!isPlayer && isConscious(iter->first) && !stats.isParalyzed())
+                if (!isPlayer && isConscious(actor.getPtr()) && !stats.isParalyzed())
                 {
                     MWMechanics::AiSequence& seq = stats.getAiSequence();
                     alwaysActive = !seq.isEmpty() && seq.getActivePackage().alwaysActive();
@@ -1605,41 +1594,41 @@ namespace MWMechanics
                     activeFlag = 2;
                 int active = inRange ? activeFlag : 0;
 
-                CharacterController* ctrl = iter->second->getCharacterController();
+                CharacterController* const ctrl = actor.getCharacterController();
                 ctrl->setActive(active);
 
                 if (!inRange)
                 {
-                    iter->first.getRefData().getBaseNode()->setNodeMask(0);
-                    world->setActorCollisionMode(iter->first, false, false);
+                    actor.getPtr().getRefData().getBaseNode()->setNodeMask(0);
+                    world->setActorCollisionMode(actor.getPtr(), false, false);
                     continue;
                 }
                 else if (!isPlayer)
                 {
-                    iter->first.getRefData().getBaseNode()->setNodeMask(MWRender::Mask_Actor);
-                    if (!iter->second->getPositionAdjusted())
+                    actor.getPtr().getRefData().getBaseNode()->setNodeMask(MWRender::Mask_Actor);
+                    if (!actor.getPositionAdjusted())
                     {
-                        iter->first.getClass().adjustPosition(iter->first, false);
-                        iter->second->setPositionAdjusted(true);
+                        actor.getPtr().getClass().adjustPosition(actor.getPtr(), false);
+                        actor.setPositionAdjusted(true);
                     }
                 }
 
-                const bool isDead = iter->first.getClass().getCreatureStats(iter->first).isDead();
-                if (!isDead && (!godmode || !isPlayer) && iter->first.getClass().getCreatureStats(iter->first).isParalyzed())
+                const bool isDead = actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isDead();
+                if (!isDead && (!godmode || !isPlayer) && actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isParalyzed())
                     ctrl->skipAnim();
 
                 // Handle player last, in case a cell transition occurs by casting a teleportation spell
                 // (would invalidate the iterator)
-                if (iter->first == getPlayer())
+                if (actor.getPtr() == getPlayer())
                 {
                     playerCharacter = ctrl;
                     continue;
                 }
 
-                world->setActorCollisionMode(iter->first, true, !iter->first.getClass().getCreatureStats(iter->first).isDeathAnimationFinished());
+                world->setActorCollisionMode(actor.getPtr(), true, !actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isDeathAnimationFinished());
                 ctrl->update(duration);
 
-                updateVisibility(iter->first, ctrl);
+                updateVisibility(actor.getPtr(), ctrl);
             }
 
             if (playerCharacter)
@@ -1649,10 +1638,10 @@ namespace MWMechanics
                 playerCharacter->setVisibility(1.f);
             }
 
-            for(PtrActorMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
+            for (const Actor& actor : mActors)
             {
-                const MWWorld::Class &cls = iter->first.getClass();
-                CreatureStats &stats = cls.getCreatureStats(iter->first);
+                const MWWorld::Class &cls = actor.getPtr().getClass();
+                CreatureStats &stats = cls.getCreatureStats(actor.getPtr());
 
                 //KnockedOutOneFrameLogic
                 //Used for "OnKnockedOut" command
@@ -1684,13 +1673,13 @@ namespace MWMechanics
 
     void Actors::resurrect(const MWWorld::Ptr &ptr)
     {
-        PtrActorMap::iterator iter = mActors.find(ptr);
-        if(iter != mActors.end())
+        const auto iter = mIndex.find(ptr.mRef);
+        if (iter != mIndex.end())
         {
-            if(iter->second->getCharacterController()->isDead())
+            if (iter->second->getCharacterController()->isDead())
             {
                 // Actor has been resurrected. Notify the CharacterController and re-enable collision.
-                MWBase::Environment::get().getWorld()->enableActorCollision(iter->first, true);
+                MWBase::Environment::get().getWorld()->enableActorCollision(iter->second->getPtr(), true);
                 iter->second->getCharacterController()->resurrect();
             }
         }
@@ -1698,39 +1687,39 @@ namespace MWMechanics
 
     void Actors::killDeadActors()
     {
-        for(PtrActorMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
+        for (Actor& actor : mActors)
         {
-            const MWWorld::Class &cls = iter->first.getClass();
-            CreatureStats &stats = cls.getCreatureStats(iter->first);
+            const MWWorld::Class &cls = actor.getPtr().getClass();
+            CreatureStats &stats = cls.getCreatureStats(actor.getPtr());
 
             if(!stats.isDead())
                 continue;
 
-            MWBase::Environment::get().getWorld()->removeActorPath(iter->first);
-            CharacterController::KillResult killResult = iter->second->getCharacterController()->kill();
+            MWBase::Environment::get().getWorld()->removeActorPath(actor.getPtr());
+            CharacterController::KillResult killResult = actor.getCharacterController()->kill();
             if (killResult == CharacterController::Result_DeathAnimStarted)
             {
                 // Play dying words
                 // Note: It's not known whether the soundgen tags scream, roar, and moan are reliable
                 // for NPCs since some of the npc death animation files are missing them.
-                MWBase::Environment::get().getDialogueManager()->say(iter->first, "hit");
+                MWBase::Environment::get().getDialogueManager()->say(actor.getPtr(), "hit");
 
                 // Apply soultrap
-                if (iter->first.getType() == ESM::Creature::sRecordId)
-                    soulTrap(iter->first);
+                if (actor.getPtr().getType() == ESM::Creature::sRecordId)
+                    soulTrap(actor.getPtr());
 
-                if (cls.isEssential(iter->first))
+                if (cls.isEssential(actor.getPtr()))
                     MWBase::Environment::get().getWindowManager()->messageBox("#{sKilledEssential}");
             }
             else if (killResult == CharacterController::Result_DeathAnimJustFinished)
             {
-                bool isPlayer = iter->first == getPlayer();
-                notifyDied(iter->first);
+                const bool isPlayer = actor.getPtr() == getPlayer();
+                notifyDied(actor.getPtr());
 
                 // Reset magic effects and recalculate derived effects
                 // One case where we need this is to make sure bound items are removed upon death
                 float vampirism = stats.getMagicEffects().get(ESM::MagicEffect::Vampirism).getMagnitude();
-                stats.getActiveSpells().clear(iter->first);
+                stats.getActiveSpells().clear(actor.getPtr());
                 // Make sure spell effects are removed
                 purgeSpellEffects(stats.getActorId());
 
@@ -1746,7 +1735,7 @@ namespace MWMechanics
                 else
                 {
                     // NPC death animation is over, disable actor collision
-                    MWBase::Environment::get().getWorld()->enableActorCollision(iter->first, false);
+                    MWBase::Environment::get().getWorld()->enableActorCollision(actor.getPtr(), false);
                 }
             }
         }
@@ -1785,10 +1774,10 @@ namespace MWMechanics
 
     void Actors::purgeSpellEffects(int casterActorId)
     {
-        for (PtrActorMap::iterator iter(mActors.begin());iter != mActors.end();++iter)
+        for (const Actor& actor : mActors)
         {
-            MWMechanics::ActiveSpells& spells = iter->first.getClass().getCreatureStats(iter->first).getActiveSpells();
-            spells.purge(iter->first, casterActorId);
+            MWMechanics::ActiveSpells& spells = actor.getPtr().getClass().getCreatureStats(actor.getPtr()).getActiveSpells();
+            spells.purge(actor.getPtr(), casterActorId);
         }
     }
 
@@ -1802,28 +1791,28 @@ namespace MWMechanics
         const MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
         const osg::Vec3f playerPos = player.getRefData().getPosition().asVec3();
 
-        for(PtrActorMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
+        for (const Actor& actor : mActors)
         {
-            if (iter->first.getClass().getCreatureStats(iter->first).isDead())
+            if (actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isDead())
             {
-                adjustMagicEffects (iter->first, duration);
+                adjustMagicEffects(actor.getPtr(), duration);
                 continue;
             }
 
-            if (!sleep || iter->first == player)
-                restoreDynamicStats(iter->first, hours, sleep);
+            if (!sleep || actor.getPtr() == player)
+                restoreDynamicStats(actor.getPtr(), hours, sleep);
 
-            if ((!iter->first.getRefData().getBaseNode()) ||
-                    (playerPos - iter->first.getRefData().getPosition().asVec3()).length2() > mActorsProcessingRange*mActorsProcessingRange)
+            if ((!actor.getPtr().getRefData().getBaseNode()) ||
+                    (playerPos - actor.getPtr().getRefData().getPosition().asVec3()).length2() > mActorsProcessingRange*mActorsProcessingRange)
                 continue;
 
-            adjustMagicEffects (iter->first, duration);
+            adjustMagicEffects (actor.getPtr(), duration);
 
-            MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(iter->first);
+            MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(actor.getPtr());
             if (animation)
             {
                 animation->removeEffects();
-                MWBase::Environment::get().getWorld()->applyLoopingParticles(iter->first);
+                MWBase::Environment::get().getWorld()->applyLoopingParticles(actor.getPtr());
             }
         }
 
@@ -1935,15 +1924,15 @@ namespace MWMechanics
 
     void Actors::forceStateUpdate(const MWWorld::Ptr & ptr)
     {
-        PtrActorMap::iterator iter = mActors.find(ptr);
-        if(iter != mActors.end())
+        const auto iter = mIndex.find(ptr.mRef);
+        if (iter != mIndex.end())
             iter->second->getCharacterController()->forceStateUpdate();
     }
 
     bool Actors::playAnimationGroup(const MWWorld::Ptr& ptr, const std::string& groupName, int mode, int number, bool persist)
     {
-        PtrActorMap::iterator iter = mActors.find(ptr);
-        if(iter != mActors.end())
+        const auto iter = mIndex.find(ptr.mRef);
+        if(iter != mIndex.end())
         {
             return iter->second->getCharacterController()->playGroup(groupName, mode, number, persist);
         }
@@ -1955,55 +1944,55 @@ namespace MWMechanics
     }
     void Actors::skipAnimation(const MWWorld::Ptr& ptr)
     {
-        PtrActorMap::iterator iter = mActors.find(ptr);
-        if(iter != mActors.end())
+        const auto iter = mIndex.find(ptr.mRef);
+        if (iter != mIndex.end())
             iter->second->getCharacterController()->skipAnim();
     }
 
     bool Actors::checkAnimationPlaying(const MWWorld::Ptr& ptr, const std::string& groupName)
     {
-        PtrActorMap::iterator iter = mActors.find(ptr);
-        if(iter != mActors.end())
+        const auto iter = mIndex.find(ptr.mRef);
+        if(iter != mIndex.end())
             return iter->second->getCharacterController()->isAnimPlaying(groupName);
         return false;
     }
 
     void Actors::persistAnimationStates()
     {
-        for (PtrActorMap::iterator iter = mActors.begin(); iter != mActors.end(); ++iter)
-            iter->second->getCharacterController()->persistAnimationState();
+        for (Actor& actor : mActors)
+            actor.getCharacterController()->persistAnimationState();
     }
 
     void Actors::getObjectsInRange(const osg::Vec3f& position, float radius, std::vector<MWWorld::Ptr>& out)
     {
-        for (PtrActorMap::iterator iter = mActors.begin(); iter != mActors.end(); ++iter)
+        for (const Actor& actor : mActors)
         {
-            if ((iter->first.getRefData().getPosition().asVec3() - position).length2() <= radius*radius)
-                out.push_back(iter->first);
+            if ((actor.getPtr().getRefData().getPosition().asVec3() - position).length2() <= radius*radius)
+                out.push_back(actor.getPtr());
         }
     }
 
     bool Actors::isAnyObjectInRange(const osg::Vec3f& position, float radius)
     {
-        for (PtrActorMap::iterator iter = mActors.begin(); iter != mActors.end(); ++iter)
+        for (const Actor& actor : mActors)
         {
-            if ((iter->first.getRefData().getPosition().asVec3() - position).length2() <= radius*radius)
+            if ((actor.getPtr().getRefData().getPosition().asVec3() - position).length2() <= radius*radius)
                 return true;
         }
 
         return false;
     }
 
-    std::vector<MWWorld::Ptr> Actors::getActorsSidingWith(const MWWorld::Ptr& actor)
+    std::vector<MWWorld::Ptr> Actors::getActorsSidingWith(const MWWorld::Ptr& actorPtr)
     {
         std::vector<MWWorld::Ptr> list;
-        for(PtrActorMap::iterator iter = mActors.begin(); iter != mActors.end(); ++iter)
+        for (const Actor& actor : mActors)
         {
-            const MWWorld::Ptr &iteratedActor = iter->first;
+            const MWWorld::Ptr& iteratedActor = actor.getPtr();
             if (iteratedActor == getPlayer())
                 continue;
 
-            const bool sameActor = (iteratedActor == actor);
+            const bool sameActor = (iteratedActor == actorPtr);
 
             const CreatureStats &stats = iteratedActor.getClass().getCreatureStats(iteratedActor);
             if (stats.isDead())
@@ -2019,7 +2008,7 @@ namespace MWMechanics
                     {
                         list.push_back(package->getTarget());
                     }
-                    else if (package->getTarget() == actor)
+                    else if (package->getTarget() == actorPtr)
                     {
                         list.push_back(iteratedActor);
                     }
@@ -2032,13 +2021,13 @@ namespace MWMechanics
         return list;
     }
 
-    std::vector<MWWorld::Ptr> Actors::getActorsFollowing(const MWWorld::Ptr& actor)
+    std::vector<MWWorld::Ptr> Actors::getActorsFollowing(const MWWorld::Ptr& actorPtr)
     {
         std::vector<MWWorld::Ptr> list;
-        forEachFollowingPackage(mActors, actor, getPlayer(), [&] (auto& iter, const std::shared_ptr<AiPackage>& package)
+        forEachFollowingPackage(mActors, actorPtr, getPlayer(), [&] (const Actor& actor, const std::shared_ptr<AiPackage>& package)
         {
-            if (package->followTargetThroughDoors() && package->getTarget() == actor)
-                list.push_back(iter.first);
+            if (package->followTargetThroughDoors() && package->getTarget() == actorPtr)
+                list.push_back(actor.getPtr());
             else if (package->getTypeId() != AiPackageTypeId::Combat && package->getTypeId() != AiPackageTypeId::Wander)
                 return false;
             return true;
@@ -2086,7 +2075,7 @@ namespace MWMechanics
     std::vector<int> Actors::getActorsFollowingIndices(const MWWorld::Ptr &actor)
     {
         std::vector<int> list;
-        forEachFollowingPackage(mActors, actor, getPlayer(), [&] (auto& iter, const std::shared_ptr<AiPackage>& package)
+        forEachFollowingPackage(mActors, actor, getPlayer(), [&] (const Actor&, const std::shared_ptr<AiPackage>& package)
         {
             if (package->followTargetThroughDoors() && package->getTarget() == actor)
             {
@@ -2103,12 +2092,12 @@ namespace MWMechanics
     std::map<int, MWWorld::Ptr> Actors::getActorsFollowingByIndex(const MWWorld::Ptr &actor)
     {
         std::map<int, MWWorld::Ptr> map;
-        forEachFollowingPackage(mActors, actor, getPlayer(), [&] (auto& iter, const std::shared_ptr<AiPackage>& package)
+        forEachFollowingPackage(mActors, actor, getPlayer(), [&] (const Actor& otherActor, const std::shared_ptr<AiPackage>& package)
         {
             if (package->followTargetThroughDoors() && package->getTarget() == actor)
             {
                 int index = static_cast<const AiFollow*>(package.get())->getFollowIndex();
-                map[index] = iter.first;
+                map[index] = otherActor.getPtr();
                 return false;
             }
             else if (package->getTypeId() != AiPackageTypeId::Combat && package->getTypeId() != AiPackageTypeId::Wander)
@@ -2190,12 +2179,7 @@ namespace MWMechanics
 
     void Actors::clear()
     {
-        PtrActorMap::iterator it(mActors.begin());
-        for (; it != mActors.end(); ++it)
-        {
-            delete it->second;
-            it->second = nullptr;
-        }
+        mIndex.clear();
         mActors.clear();
         mDeathCount.clear();
     }
@@ -2207,8 +2191,8 @@ namespace MWMechanics
 
     bool Actors::isReadyToBlock(const MWWorld::Ptr &ptr) const
     {
-        PtrActorMap::const_iterator it = mActors.find(ptr);
-        if (it == mActors.end())
+        const auto it = mIndex.find(ptr.mRef);
+        if (it == mIndex.end())
             return false;
 
         return it->second->getCharacterController()->isReadyToBlock();
@@ -2216,8 +2200,8 @@ namespace MWMechanics
 
     bool Actors::isCastingSpell(const MWWorld::Ptr &ptr) const
     {
-        PtrActorMap::const_iterator it = mActors.find(ptr);
-        if (it == mActors.end())
+        const auto it = mIndex.find(ptr.mRef);
+        if (it == mIndex.end())
             return false;
 
         return it->second->getCharacterController()->isCastingSpell();
@@ -2225,8 +2209,8 @@ namespace MWMechanics
 
     bool Actors::isAttackingOrSpell(const MWWorld::Ptr& ptr) const
     {
-        PtrActorMap::const_iterator it = mActors.find(ptr);
-        if (it == mActors.end())
+        const auto it = mIndex.find(ptr.mRef);
+        if (it == mIndex.end())
             return false;
         CharacterController* ctrl = it->second->getCharacterController();
 
@@ -2235,8 +2219,8 @@ namespace MWMechanics
 
     int Actors::getGreetingTimer(const MWWorld::Ptr& ptr) const
     {
-        PtrActorMap::const_iterator it = mActors.find(ptr);
-        if (it == mActors.end())
+        const auto it = mIndex.find(ptr.mRef);
+        if (it == mIndex.end())
             return 0;
 
         return it->second->getGreetingTimer();
@@ -2244,8 +2228,8 @@ namespace MWMechanics
 
     float Actors::getAngleToPlayer(const MWWorld::Ptr& ptr) const
     {
-        PtrActorMap::const_iterator it = mActors.find(ptr);
-        if (it == mActors.end())
+        const auto it = mIndex.find(ptr.mRef);
+        if (it == mIndex.end())
             return 0.f;
 
         return it->second->getAngleToPlayer();
@@ -2253,8 +2237,8 @@ namespace MWMechanics
 
     GreetingState Actors::getGreetingState(const MWWorld::Ptr& ptr) const
     {
-        PtrActorMap::const_iterator it = mActors.find(ptr);
-        if (it == mActors.end())
+        const auto it = mIndex.find(ptr.mRef);
+        if (it == mIndex.end())
             return Greet_None;
 
         return it->second->getGreetingState();
@@ -2262,8 +2246,8 @@ namespace MWMechanics
 
     bool Actors::isTurningToPlayer(const MWWorld::Ptr& ptr) const
     {
-        PtrActorMap::const_iterator it = mActors.find(ptr);
-        if (it == mActors.end())
+        const auto it = mIndex.find(ptr.mRef);
+        if (it == mIndex.end())
             return false;
 
         return it->second->isTurningToPlayer();
@@ -2274,11 +2258,9 @@ namespace MWMechanics
         if (!MWBase::Environment::get().getMechanicsManager()->isAIActive())
             return;
 
-        // making a copy since fast-forward could move actor to a different cell and invalidate the mActors iterator
-        PtrActorMap map = mActors;
-        for (PtrActorMap::iterator it = map.begin(); it != map.end(); ++it)
+        for (const Actor& actor : mActors)
         {
-            MWWorld::Ptr ptr = it->first;
+            const MWWorld::Ptr ptr = actor.getPtr();
             if (ptr == getPlayer()
                     || !isConscious(ptr)
                     || ptr.getClass().getCreatureStats(ptr).isParalyzed())
diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index 1bc45774d0..fef1f8f59a 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -7,7 +7,8 @@
 #include <list>
 #include <map>
 
-#include "../mwmechanics/actorutil.hpp"
+#include "actorutil.hpp"
+#include "actor.hpp"
 
 namespace ESM
 {
@@ -42,12 +43,9 @@ namespace MWMechanics
         public:
 
             Actors();
-            ~Actors();
 
-            typedef std::map<MWWorld::Ptr,Actor*> PtrActorMap;
-
-            PtrActorMap::const_iterator begin() { return mActors.begin(); }
-            PtrActorMap::const_iterator end() { return mActors.end(); }
+            std::list<Actor>::const_iterator begin() const { return mActors.begin(); }
+            std::list<Actor>::const_iterator end() const { return mActors.end(); }
             std::size_t size() const { return mActors.size(); }
 
             void notifyDied(const MWWorld::Ptr &actor);
@@ -190,7 +188,8 @@ namespace MWMechanics
             };
 
             std::map<std::string, int> mDeathCount;
-            PtrActorMap mActors;
+            std::list<Actor> mActors;
+            std::map<const MWWorld::LiveCellRefBase*, std::list<Actor>::iterator> mIndex;
             float mTimerDisposeSummonsCorpses;
             float mTimerUpdateHeadTrack = 0;
             float mTimerUpdateEquippedLight = 0;
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 8cf6126cba..2fd5a81f0d 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -30,6 +30,7 @@
 #include "npcstats.hpp"
 #include "actorutil.hpp"
 #include "combat.hpp"
+#include "actor.hpp"
 
 namespace
 {
@@ -1599,16 +1600,16 @@ namespace MWMechanics
             if (ptr.getClass().isClass(ptr, "Guard"))
             {
                 stats.setHitAttemptActorId(target.getClass().getCreatureStats(target).getActorId()); // Stops guard from ending combat if player is unreachable
-                for (Actors::PtrActorMap::const_iterator iter = mActors.begin(); iter != mActors.end(); ++iter)
+                for (const Actor& actor : mActors)
                 {
-                    if (iter->first.getClass().isClass(iter->first, "Guard"))
+                    if (actor.getPtr().getClass().isClass(actor.getPtr(), "Guard"))
                     {
-                        MWMechanics::AiSequence& aiSeq = iter->first.getClass().getCreatureStats(iter->first).getAiSequence();
+                        MWMechanics::AiSequence& aiSeq = actor.getPtr().getClass().getCreatureStats(actor.getPtr()).getAiSequence();
                         if (aiSeq.getTypeId() == MWMechanics::AiPackageTypeId::Pursue)
                         {
                             aiSeq.stopPursuit();
                             aiSeq.stack(MWMechanics::AiCombat(target), ptr);
-                            iter->first.getClass().getCreatureStats(iter->first).setHitAttemptActorId(target.getClass().getCreatureStats(target).getActorId()); // Stops guard from ending combat if player is unreachable
+                            actor.getPtr().getClass().getCreatureStats(actor.getPtr()).setHitAttemptActorId(target.getClass().getCreatureStats(target).getActorId()); // Stops guard from ending combat if player is unreachable
                         }
                     }
                 }

From 24712e2cb1a5f9e76d5e3102532a483f72efa94f Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 20 May 2022 23:07:50 +0200
Subject: [PATCH 2477/2859] Avoid changing map when updating ptr

This is not necessary and has overhead.
---
 apps/openmw/mwrender/actorspaths.cpp    |  26 +++--
 apps/openmw/mwrender/actorspaths.hpp    |   8 +-
 apps/openmw/mwrender/objects.cpp        |  23 ++--
 apps/openmw/mwrender/objects.hpp        |   5 +-
 apps/openmw/mwsound/soundmanagerimp.cpp | 135 +++++++++++-------------
 apps/openmw/mwsound/soundmanagerimp.hpp |  17 ++-
 6 files changed, 108 insertions(+), 106 deletions(-)

diff --git a/apps/openmw/mwrender/actorspaths.cpp b/apps/openmw/mwrender/actorspaths.cpp
index c8c5f56d8f..ae2d6bccb8 100644
--- a/apps/openmw/mwrender/actorspaths.cpp
+++ b/apps/openmw/mwrender/actorspaths.cpp
@@ -44,26 +44,26 @@ namespace MWRender
         if (!mEnabled)
             return;
 
-        const auto group = mGroups.find(actor);
+        const auto group = mGroups.find(actor.mRef);
         if (group != mGroups.end())
-            mRootNode->removeChild(group->second);
+            mRootNode->removeChild(group->second.mNode);
 
-        const auto newGroup = SceneUtil::createAgentPathGroup(path, halfExtents, start, end, settings.mRecast);
+        auto newGroup = SceneUtil::createAgentPathGroup(path, halfExtents, start, end, settings.mRecast);
         if (newGroup)
         {
             MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(newGroup, "debug");
             newGroup->setNodeMask(Mask_Debug);
             mRootNode->addChild(newGroup);
-            mGroups[actor] = newGroup;
+            mGroups[actor.mRef] = Group {actor.mCell, std::move(newGroup)};
         }
     }
 
     void ActorsPaths::remove(const MWWorld::ConstPtr& actor)
     {
-        const auto group = mGroups.find(actor);
+        const auto group = mGroups.find(actor.mRef);
         if (group != mGroups.end())
         {
-            mRootNode->removeChild(group->second);
+            mRootNode->removeChild(group->second.mNode);
             mGroups.erase(group);
         }
     }
@@ -72,9 +72,9 @@ namespace MWRender
     {
         for (auto it = mGroups.begin(); it != mGroups.end(); )
         {
-            if (it->first.getCell() == store)
+            if (it->second.mCell == store)
             {
-                mRootNode->removeChild(it->second);
+                mRootNode->removeChild(it->second.mNode);
                 it = mGroups.erase(it);
             }
             else
@@ -84,25 +84,23 @@ namespace MWRender
 
     void ActorsPaths::updatePtr(const MWWorld::ConstPtr& old, const MWWorld::ConstPtr& updated)
     {
-        const auto it = mGroups.find(old);
+        const auto it = mGroups.find(old.mRef);
         if (it == mGroups.end())
             return;
-        auto group = std::move(it->second);
-        mGroups.erase(it);
-        mGroups.insert(std::make_pair(updated, std::move(group)));
+        it->second.mCell = updated.mCell;
     }
 
     void ActorsPaths::enable()
     {
         std::for_each(mGroups.begin(), mGroups.end(),
-            [&] (const Groups::value_type& v) { mRootNode->addChild(v.second); });
+            [&] (const Groups::value_type& v) { mRootNode->addChild(v.second.mNode); });
         mEnabled = true;
     }
 
     void ActorsPaths::disable()
     {
         std::for_each(mGroups.begin(), mGroups.end(),
-            [&] (const Groups::value_type& v) { mRootNode->removeChild(v.second); });
+            [&] (const Groups::value_type& v) { mRootNode->removeChild(v.second.mNode); });
         mEnabled = false;
     }
 }
diff --git a/apps/openmw/mwrender/actorspaths.hpp b/apps/openmw/mwrender/actorspaths.hpp
index 12f102093b..d6cec9357b 100644
--- a/apps/openmw/mwrender/actorspaths.hpp
+++ b/apps/openmw/mwrender/actorspaths.hpp
@@ -44,7 +44,13 @@ namespace MWRender
         void disable();
 
     private:
-        using Groups = std::map<MWWorld::ConstPtr, osg::ref_ptr<osg::Group>>;
+        struct Group
+        {
+            const MWWorld::CellStore* mCell;
+            osg::ref_ptr<osg::Group> mNode;
+        };
+
+        using Groups = std::map<const MWWorld::LiveCellRefBase*, Group>;
 
         osg::ref_ptr<osg::Group> mRootNode;
         Groups mGroups;
diff --git a/apps/openmw/mwrender/objects.cpp b/apps/openmw/mwrender/objects.cpp
index 7e3433bd92..9dc4e04e24 100644
--- a/apps/openmw/mwrender/objects.cpp
+++ b/apps/openmw/mwrender/objects.cpp
@@ -34,7 +34,7 @@ Objects::~Objects()
 
 void Objects::insertBegin(const MWWorld::Ptr& ptr)
 {
-    assert(mObjects.find(ptr) == mObjects.end());
+    assert(mObjects.find(ptr.mRef) == mObjects.end());
 
     osg::ref_ptr<osg::Group> cellnode;
 
@@ -73,7 +73,7 @@ void Objects::insertModel(const MWWorld::Ptr &ptr, const std::string &mesh, bool
 
     osg::ref_ptr<ObjectAnimation> anim (new ObjectAnimation(ptr, mesh, mResourceSystem, animated, allowLight));
 
-    mObjects.insert(std::make_pair(ptr, anim));
+    mObjects.emplace(ptr.mRef, std::move(anim));
 }
 
 void Objects::insertCreature(const MWWorld::Ptr &ptr, const std::string &mesh, bool weaponsShields)
@@ -89,7 +89,7 @@ void Objects::insertCreature(const MWWorld::Ptr &ptr, const std::string &mesh, b
     else
         anim = new CreatureAnimation(ptr, mesh, mResourceSystem);
 
-    if (mObjects.insert(std::make_pair(ptr, anim)).second)
+    if (mObjects.emplace(ptr.mRef, anim).second)
         ptr.getClass().getContainerStore(ptr).setContListener(static_cast<ActorAnimation*>(anim.get()));
 }
 
@@ -100,7 +100,7 @@ void Objects::insertNPC(const MWWorld::Ptr &ptr)
 
     osg::ref_ptr<NpcAnimation> anim (new NpcAnimation(ptr, osg::ref_ptr<osg::Group>(ptr.getRefData().getBaseNode()), mResourceSystem));
 
-    if (mObjects.insert(std::make_pair(ptr, anim)).second)
+    if (mObjects.emplace(ptr.mRef, anim).second)
     {
         ptr.getClass().getInventoryStore(ptr).setInvListener(anim.get(), ptr);
         ptr.getClass().getInventoryStore(ptr).setContListener(anim.get());
@@ -112,7 +112,7 @@ bool Objects::removeObject (const MWWorld::Ptr& ptr)
     if(!ptr.getRefData().getBaseNode())
         return true;
 
-    PtrAnimationMap::iterator iter = mObjects.find(ptr);
+    const auto iter = mObjects.find(ptr.mRef);
     if(iter != mObjects.end())
     {
         mObjects.erase(iter);
@@ -191,19 +191,14 @@ void Objects::updatePtr(const MWWorld::Ptr &old, const MWWorld::Ptr &cur)
         objectNode->getParent(0)->removeChild(objectNode);
     cellnode->addChild(objectNode);
 
-    PtrAnimationMap::iterator iter = mObjects.find(old);
+    PtrAnimationMap::iterator iter = mObjects.find(old.mRef);
     if(iter != mObjects.end())
-    {
-        osg::ref_ptr<Animation> anim = iter->second;
-        mObjects.erase(iter);
-        anim->updatePtr(cur);
-        mObjects[cur] = anim;
-    }
+        iter->second->updatePtr(cur);
 }
 
 Animation* Objects::getAnimation(const MWWorld::Ptr &ptr)
 {
-    PtrAnimationMap::const_iterator iter = mObjects.find(ptr);
+    PtrAnimationMap::const_iterator iter = mObjects.find(ptr.mRef);
     if(iter != mObjects.end())
         return iter->second;
 
@@ -212,7 +207,7 @@ Animation* Objects::getAnimation(const MWWorld::Ptr &ptr)
 
 const Animation* Objects::getAnimation(const MWWorld::ConstPtr &ptr) const
 {
-    PtrAnimationMap::const_iterator iter = mObjects.find(ptr);
+    PtrAnimationMap::const_iterator iter = mObjects.find(ptr.mRef);
     if(iter != mObjects.end())
         return iter->second;
 
diff --git a/apps/openmw/mwrender/objects.hpp b/apps/openmw/mwrender/objects.hpp
index 5f8b7dfc9e..793239c26e 100644
--- a/apps/openmw/mwrender/objects.hpp
+++ b/apps/openmw/mwrender/objects.hpp
@@ -50,8 +50,9 @@ public:
     MWWorld::Ptr mPtr;
 };
 
-class Objects{
-    typedef std::map<MWWorld::ConstPtr,osg::ref_ptr<Animation> > PtrAnimationMap;
+class Objects
+{
+    using PtrAnimationMap = std::map<const MWWorld::LiveCellRefBase*, osg::ref_ptr<Animation>>;
 
     typedef std::map<const MWWorld::CellStore*, osg::ref_ptr<osg::Group> > CellMap;
     CellMap mCellSceneNodes;
diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index 5399b95c97..222c95437f 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -371,15 +371,15 @@ namespace MWSound
         StreamPtr sound = playVoice(decoder, pos, (ptr == MWMechanics::getPlayer()));
         if(!sound) return;
 
-        mSaySoundsQueue.emplace(ptr, std::move(sound));
+        mSaySoundsQueue.emplace(ptr.mRef, SaySound {ptr.mCell, std::move(sound)});
     }
 
     float SoundManager::getSaySoundLoudness(const MWWorld::ConstPtr &ptr) const
     {
-        SaySoundMap::const_iterator snditer = mActiveSaySounds.find(ptr);
+        SaySoundMap::const_iterator snditer = mActiveSaySounds.find(ptr.mRef);
         if(snditer != mActiveSaySounds.end())
         {
-            Stream *sound = snditer->second.get();
+            Stream *sound = snditer->second.mStream.get();
             return mOutput->getStreamLoudness(sound);
         }
 
@@ -399,15 +399,15 @@ namespace MWSound
         StreamPtr sound = playVoice(decoder, osg::Vec3f(), true);
         if(!sound) return;
 
-        mActiveSaySounds.emplace(MWWorld::ConstPtr(), std::move(sound));
+        mActiveSaySounds.emplace(nullptr, SaySound {nullptr, std::move(sound)});
     }
 
     bool SoundManager::sayDone(const MWWorld::ConstPtr &ptr) const
     {
-        SaySoundMap::const_iterator snditer = mActiveSaySounds.find(ptr);
+        SaySoundMap::const_iterator snditer = mActiveSaySounds.find(ptr.mRef);
         if(snditer != mActiveSaySounds.end())
         {
-            if(mOutput->isStreamPlaying(snditer->second.get()))
+            if(mOutput->isStreamPlaying(snditer->second.mStream.get()))
                 return false;
             return true;
         }
@@ -416,18 +416,18 @@ namespace MWSound
 
     bool SoundManager::sayActive(const MWWorld::ConstPtr &ptr) const
     {
-        SaySoundMap::const_iterator snditer = mSaySoundsQueue.find(ptr);
+        SaySoundMap::const_iterator snditer = mSaySoundsQueue.find(ptr.mRef);
         if(snditer != mSaySoundsQueue.end())
         {
-            if(mOutput->isStreamPlaying(snditer->second.get()))
+            if(mOutput->isStreamPlaying(snditer->second.mStream.get()))
                 return true;
             return false;
         }
 
-        snditer = mActiveSaySounds.find(ptr);
+        snditer = mActiveSaySounds.find(ptr.mRef);
         if(snditer != mActiveSaySounds.end())
         {
-            if(mOutput->isStreamPlaying(snditer->second.get()))
+            if(mOutput->isStreamPlaying(snditer->second.mStream.get()))
                 return true;
             return false;
         }
@@ -437,17 +437,17 @@ namespace MWSound
 
     void SoundManager::stopSay(const MWWorld::ConstPtr &ptr)
     {
-        SaySoundMap::iterator snditer = mSaySoundsQueue.find(ptr);
+        SaySoundMap::iterator snditer = mSaySoundsQueue.find(ptr.mRef);
         if(snditer != mSaySoundsQueue.end())
         {
-            mOutput->finishStream(snditer->second.get());
+            mOutput->finishStream(snditer->second.mStream.get());
             mSaySoundsQueue.erase(snditer);
         }
 
-        snditer = mActiveSaySounds.find(ptr);
+        snditer = mActiveSaySounds.find(ptr.mRef);
         if(snditer != mActiveSaySounds.end())
         {
-            mOutput->finishStream(snditer->second.get());
+            mOutput->finishStream(snditer->second.mStream.get());
             mActiveSaySounds.erase(snditer);
         }
     }
@@ -513,7 +513,7 @@ namespace MWSound
             return nullptr;
 
         Sound* result = sound.get();
-        mActiveSounds[MWWorld::ConstPtr()].emplace_back(std::move(sound), sfx);
+        mActiveSounds[nullptr].mList.emplace_back(std::move(sound), sfx);
         mSoundBuffers.use(*sfx);
         return result;
     }
@@ -571,7 +571,10 @@ namespace MWSound
             return nullptr;
 
         Sound* result = sound.get();
-        mActiveSounds[ptr].emplace_back(std::move(sound), sfx);
+        auto it = mActiveSounds.find(ptr.mRef);
+        if (it == mActiveSounds.end())
+            it = mActiveSounds.emplace(ptr.mRef, ActiveSound {ptr.mCell, {}}).first;
+        it->second.mList.emplace_back(std::move(sound), sfx);
         mSoundBuffers.use(*sfx);
         return result;
     }
@@ -606,7 +609,7 @@ namespace MWSound
             return nullptr;
 
         Sound* result = sound.get();
-        mActiveSounds[MWWorld::ConstPtr()].emplace_back(std::move(sound), sfx);
+        mActiveSounds[nullptr].mList.emplace_back(std::move(sound), sfx);
         mSoundBuffers.use(*sfx);
         return result;
     }
@@ -619,10 +622,10 @@ namespace MWSound
 
     void SoundManager::stopSound(Sound_Buffer *sfx, const MWWorld::ConstPtr &ptr)
     {
-        SoundMap::iterator snditer = mActiveSounds.find(ptr);
+        SoundMap::iterator snditer = mActiveSounds.find(ptr.mRef);
         if(snditer != mActiveSounds.end())
         {
-            for(SoundBufferRefPair &snd : snditer->second)
+            for (SoundBufferRefPair &snd : snditer->second.mList)
             {
                 if(snd.second == sfx)
                     mOutput->finishSound(snd.first.get());
@@ -643,54 +646,54 @@ namespace MWSound
 
     void SoundManager::stopSound3D(const MWWorld::ConstPtr &ptr)
     {
-        SoundMap::iterator snditer = mActiveSounds.find(ptr);
+        SoundMap::iterator snditer = mActiveSounds.find(ptr.mRef);
         if(snditer != mActiveSounds.end())
         {
-            for(SoundBufferRefPair &snd : snditer->second)
+            for (SoundBufferRefPair &snd : snditer->second.mList)
                 mOutput->finishSound(snd.first.get());
         }
-        SaySoundMap::iterator sayiter = mSaySoundsQueue.find(ptr);
+        SaySoundMap::iterator sayiter = mSaySoundsQueue.find(ptr.mRef);
         if(sayiter != mSaySoundsQueue.end())
-            mOutput->finishStream(sayiter->second.get());
-        sayiter = mActiveSaySounds.find(ptr);
+            mOutput->finishStream(sayiter->second.mStream.get());
+        sayiter = mActiveSaySounds.find(ptr.mRef);
         if(sayiter != mActiveSaySounds.end())
-            mOutput->finishStream(sayiter->second.get());
+            mOutput->finishStream(sayiter->second.mStream.get());
     }
 
     void SoundManager::stopSound(const MWWorld::CellStore *cell)
     {
-        for(SoundMap::value_type &snd : mActiveSounds)
+        for (auto& [ref, sound] : mActiveSounds)
         {
-            if(!snd.first.isEmpty() && snd.first != MWMechanics::getPlayer() && snd.first.getCell() == cell)
+            if (ref != nullptr && ref != MWMechanics::getPlayer().mRef && sound.mCell == cell)
             {
-                for(SoundBufferRefPair &sndbuf : snd.second)
+                for (SoundBufferRefPair& sndbuf : sound.mList)
                     mOutput->finishSound(sndbuf.first.get());
             }
         }
 
-        for(SaySoundMap::value_type &snd : mSaySoundsQueue)
+        for (const auto& [ref, sound] : mSaySoundsQueue)
         {
-            if(!snd.first.isEmpty() && snd.first != MWMechanics::getPlayer() && snd.first.getCell() == cell)
-                mOutput->finishStream(snd.second.get());
+            if (ref != nullptr && ref != MWMechanics::getPlayer().mRef && sound.mCell == cell)
+                mOutput->finishStream(sound.mStream.get());
         }
 
-        for(SaySoundMap::value_type &snd : mActiveSaySounds)
+        for (const auto& [ref, sound]: mActiveSaySounds)
         {
-            if(!snd.first.isEmpty() && snd.first != MWMechanics::getPlayer() && snd.first.getCell() == cell)
-                mOutput->finishStream(snd.second.get());
+            if (ref != nullptr && ref != MWMechanics::getPlayer().mRef && sound.mCell == cell)
+                mOutput->finishStream(sound.mStream.get());
         }
     }
 
     void SoundManager::fadeOutSound3D(const MWWorld::ConstPtr &ptr,
             const std::string& soundId, float duration)
     {
-        SoundMap::iterator snditer = mActiveSounds.find(ptr);
+        SoundMap::iterator snditer = mActiveSounds.find(ptr.mRef);
         if(snditer != mActiveSounds.end())
         {
             Sound_Buffer *sfx = mSoundBuffers.lookup(Misc::StringUtils::lowerCase(soundId));
             if (sfx == nullptr)
                 return;
-            for(SoundBufferRefPair &sndbuf : snditer->second)
+            for (SoundBufferRefPair &sndbuf : snditer->second.mList)
             {
                 if(sndbuf.second == sfx)
                     sndbuf.first->setFadeout(duration);
@@ -700,14 +703,14 @@ namespace MWSound
 
     bool SoundManager::getSoundPlaying(const MWWorld::ConstPtr &ptr, const std::string& soundId) const
     {
-        SoundMap::const_iterator snditer = mActiveSounds.find(ptr);
+        SoundMap::const_iterator snditer = mActiveSounds.find(ptr.mRef);
         if(snditer != mActiveSounds.end())
         {
             Sound_Buffer *sfx = mSoundBuffers.lookup(Misc::StringUtils::lowerCase(soundId));
-            return std::find_if(snditer->second.cbegin(), snditer->second.cend(),
+            return std::find_if(snditer->second.mList.cbegin(), snditer->second.mList.cend(),
                 [this,sfx](const SoundBufferRefPair &snd) -> bool
                 { return snd.second == sfx && mOutput->isSoundPlaying(snd.first.get()); }
-            ) != snditer->second.cend();
+            ) != snditer->second.mList.cend();
         }
         return false;
     }
@@ -819,15 +822,15 @@ namespace MWSound
             Sound_Buffer* sfx = mSoundBuffers.lookup(update.mId);
             if (mLastCell != cell)
             {
-                const auto snditer = mActiveSounds.find(MWWorld::ConstPtr());
+                const auto snditer = mActiveSounds.find(nullptr);
                 if (snditer != mActiveSounds.end())
                 {
                     const auto pairiter = std::find_if(
-                        snditer->second.begin(), snditer->second.end(),
+                        snditer->second.mList.begin(), snditer->second.mList.end(),
                         [this](const SoundBufferRefPairList::value_type &item) -> bool
                         { return mNearWaterSound == item.first.get(); }
                     );
-                    if (pairiter != snditer->second.end() && pairiter->second != sfx)
+                    if (pairiter != snditer->second.mList.end() && pairiter->second != sfx)
                         soundIdChanged = true;
                 }
             }
@@ -915,8 +918,8 @@ namespace MWSound
         while(snditer != mActiveSounds.end())
         {
             MWWorld::ConstPtr ptr = snditer->first;
-            SoundBufferRefPairList::iterator sndidx = snditer->second.begin();
-            while(sndidx != snditer->second.end())
+            SoundBufferRefPairList::iterator sndidx = snditer->second.mList.begin();
+            while(sndidx != snditer->second.mList.end())
             {
                 Sound *sound = sndidx->first.get();
 
@@ -936,7 +939,7 @@ namespace MWSound
                     if (sound == mNearWaterSound)
                         mNearWaterSound = nullptr;
                     mSoundBuffers.release(*sndidx->second);
-                    sndidx = snditer->second.erase(sndidx);
+                    sndidx = snditer->second.mList.erase(sndidx);
                 }
                 else
                 {
@@ -944,7 +947,7 @@ namespace MWSound
                     ++sndidx;
                 }
             }
-            if(snditer->second.empty())
+            if(snditer->second.mList.empty())
                 snditer = mActiveSounds.erase(snditer);
             else
                 ++snditer;
@@ -954,7 +957,7 @@ namespace MWSound
         while(sayiter != mActiveSaySounds.end())
         {
             MWWorld::ConstPtr ptr = sayiter->first;
-            Stream *sound = sayiter->second.get();
+            Stream *sound = sayiter->second.mStream.get();
             if (sound->getIs3D())
             {
                 if (!ptr.isEmpty())
@@ -1047,7 +1050,7 @@ namespace MWSound
         mOutput->startUpdate();
         for(SoundMap::value_type &snd : mActiveSounds)
         {
-            for(SoundBufferRefPair &sndbuf : snd.second)
+            for (SoundBufferRefPair& sndbuf : snd.second.mList)
             {
                 Sound *sound = sndbuf.first.get();
                 sound->setBaseVolume(volumeFromType(sound->getPlayType()));
@@ -1056,13 +1059,13 @@ namespace MWSound
         }
         for(SaySoundMap::value_type &snd : mActiveSaySounds)
         {
-            Stream *sound = snd.second.get();
+            Stream *sound = snd.second.mStream.get();
             sound->setBaseVolume(volumeFromType(sound->getPlayType()));
             mOutput->updateStream(sound);
         }
         for(SaySoundMap::value_type &snd : mSaySoundsQueue)
         {
-            Stream *sound = snd.second.get();
+            Stream *sound = snd.second.mStream.get();
             sound->setBaseVolume(volumeFromType(sound->getPlayType()));
             mOutput->updateStream(sound);
         }
@@ -1092,29 +1095,15 @@ namespace MWSound
 
     void SoundManager::updatePtr(const MWWorld::ConstPtr &old, const MWWorld::ConstPtr &updated)
     {
-        SoundMap::iterator snditer = mActiveSounds.find(old);
+        SoundMap::iterator snditer = mActiveSounds.find(old.mRef);
         if(snditer != mActiveSounds.end())
-        {
-            SoundBufferRefPairList sndlist = std::move(snditer->second);
-            mActiveSounds.erase(snditer);
-            mActiveSounds.emplace(updated, std::move(sndlist));
-        }
+            snditer->second.mCell = updated.mCell;
 
-        SaySoundMap::iterator sayiter = mSaySoundsQueue.find(old);
-        if(sayiter != mSaySoundsQueue.end())
-        {
-            StreamPtr stream = std::move(sayiter->second);
-            mSaySoundsQueue.erase(sayiter);
-            mSaySoundsQueue.emplace(updated, std::move(stream));
-        }
+        if (const auto it = mSaySoundsQueue.find(old.mRef); it != mSaySoundsQueue.end())
+            it->second.mCell = updated.mCell;
 
-        sayiter = mActiveSaySounds.find(old);
-        if(sayiter != mActiveSaySounds.end())
-        {
-            StreamPtr stream = std::move(sayiter->second);
-            mActiveSaySounds.erase(sayiter);
-            mActiveSaySounds.emplace(updated, std::move(stream));
-        }
+        if (const auto it = mActiveSaySounds.find(old.mRef); it != mActiveSaySounds.end())
+            it->second.mCell = updated.mCell;
     }
 
     // Default readAll implementation, for decoders that can't do anything
@@ -1188,7 +1177,7 @@ namespace MWSound
 
         for(SoundMap::value_type &snd : mActiveSounds)
         {
-            for(SoundBufferRefPair &sndbuf : snd.second)
+            for (SoundBufferRefPair &sndbuf : snd.second.mList)
             {
                 mOutput->finishSound(sndbuf.first.get());
                 mSoundBuffers.release(*sndbuf.second);
@@ -1199,11 +1188,11 @@ namespace MWSound
         mNearWaterSound = nullptr;
 
         for(SaySoundMap::value_type &snd : mSaySoundsQueue)
-            mOutput->finishStream(snd.second.get());
+            mOutput->finishStream(snd.second.mStream.get());
         mSaySoundsQueue.clear();
 
         for(SaySoundMap::value_type &snd : mActiveSaySounds)
-            mOutput->finishStream(snd.second.get());
+            mOutput->finishStream(snd.second.mStream.get());
         mActiveSaySounds.clear();
 
         for(StreamPtr& sound : mActiveTracks)
diff --git a/apps/openmw/mwsound/soundmanagerimp.hpp b/apps/openmw/mwsound/soundmanagerimp.hpp
index d03059ba3e..4c4df8c0b6 100644
--- a/apps/openmw/mwsound/soundmanagerimp.hpp
+++ b/apps/openmw/mwsound/soundmanagerimp.hpp
@@ -64,10 +64,23 @@ namespace MWSound
 
         typedef std::pair<SoundPtr, Sound_Buffer*> SoundBufferRefPair;
         typedef std::vector<SoundBufferRefPair> SoundBufferRefPairList;
-        typedef std::map<MWWorld::ConstPtr,SoundBufferRefPairList> SoundMap;
+
+        struct ActiveSound
+        {
+            const MWWorld::CellStore* mCell = nullptr;
+            SoundBufferRefPairList mList;
+        };
+
+        typedef std::map<const MWWorld::LiveCellRefBase*, ActiveSound> SoundMap;
         SoundMap mActiveSounds;
 
-        typedef std::map<MWWorld::ConstPtr, StreamPtr> SaySoundMap;
+        struct SaySound
+        {
+            const MWWorld::CellStore* mCell;
+            StreamPtr mStream;
+        };
+
+        typedef std::map<const MWWorld::LiveCellRefBase*, SaySound> SaySoundMap;
         SaySoundMap mSaySoundsQueue;
         SaySoundMap mActiveSaySounds;
 

From 77c09dff39d9b9b256abfbce72b7e29dfa34b599 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 18 May 2022 19:55:13 +0200
Subject: [PATCH 2478/2859] Store CharacterController by value in
 MWMechanics::Actor

---
 apps/openmw/mwmechanics/actor.cpp     | 12 ++---
 apps/openmw/mwmechanics/actor.hpp     |  7 ++-
 apps/openmw/mwmechanics/actors.cpp    | 70 ++++++++++++---------------
 apps/openmw/mwmechanics/actors.hpp    |  2 +-
 apps/openmw/mwmechanics/character.hpp |  5 +-
 5 files changed, 45 insertions(+), 51 deletions(-)

diff --git a/apps/openmw/mwmechanics/actor.cpp b/apps/openmw/mwmechanics/actor.cpp
index 818ce41b84..2af3b50aa1 100644
--- a/apps/openmw/mwmechanics/actor.cpp
+++ b/apps/openmw/mwmechanics/actor.cpp
@@ -5,24 +5,24 @@
 namespace MWMechanics
 {
     Actor::Actor(const MWWorld::Ptr &ptr, MWRender::Animation *animation)
-     : mPositionAdjusted(false)
+        : mCharacterController(ptr, animation)
+        , mPositionAdjusted(false)
     {
-        mCharacterController.reset(new CharacterController(ptr, animation));
     }
 
     const MWWorld::Ptr& Actor::getPtr() const
     {
-        return mCharacterController->getPtr();
+        return mCharacterController.getPtr();
     }
 
     void Actor::updatePtr(const MWWorld::Ptr &newPtr)
     {
-        mCharacterController->updatePtr(newPtr);
+        mCharacterController.updatePtr(newPtr);
     }
 
-    CharacterController* Actor::getCharacterController()
+    CharacterController& Actor::getCharacterController()
     {
-        return mCharacterController.get();
+        return mCharacterController;
     }
 
     int Actor::getGreetingTimer() const
diff --git a/apps/openmw/mwmechanics/actor.hpp b/apps/openmw/mwmechanics/actor.hpp
index dac9fc4d70..06fdc79a14 100644
--- a/apps/openmw/mwmechanics/actor.hpp
+++ b/apps/openmw/mwmechanics/actor.hpp
@@ -4,6 +4,7 @@
 #include <memory>
 
 #include "actorutil.hpp"
+#include "character.hpp"
 
 #include <components/misc/timer.hpp>
 
@@ -18,8 +19,6 @@ namespace MWWorld
 
 namespace MWMechanics
 {
-    class CharacterController;
-
     /// @brief Holds temporary state for an actor that will be discarded when the actor leaves the scene.
     class Actor
     {
@@ -31,7 +30,7 @@ namespace MWMechanics
         /// Notify this actor of its new base object Ptr, use when the object changed cells
         void updatePtr(const MWWorld::Ptr& newPtr);
 
-        CharacterController* getCharacterController();
+        CharacterController& getCharacterController();
 
         int getGreetingTimer() const;
         void setGreetingTimer(int timer);
@@ -51,7 +50,7 @@ namespace MWMechanics
         bool getPositionAdjusted() const;
 
     private:
-        std::unique_ptr<CharacterController> mCharacterController;
+        CharacterController mCharacterController;
         int mGreetingTimer{0};
         float mTargetAngleRadians{0.f};
         GreetingState mGreetingState{Greet_None};
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 22d159594d..c063748bdc 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -774,9 +774,7 @@ namespace MWMechanics
         const auto it = mIndex.find(ptr.mRef);
         if (it == mIndex.end())
             return false;
-        CharacterController* ctrl = it->second->getCharacterController();
-
-        return ctrl->isAttackPreparing();
+        return it->second->getCharacterController().isAttackPreparing();
     }
 
     bool Actors::isRunning(const MWWorld::Ptr& ptr)
@@ -784,9 +782,7 @@ namespace MWMechanics
         const auto it = mIndex.find(ptr.mRef);
         if (it == mIndex.end())
             return false;
-        CharacterController* ctrl = it->second->getCharacterController();
-
-        return ctrl->isRunning();
+        return it->second->getCharacterController().isRunning();
     }
 
     bool Actors::isSneaking(const MWWorld::Ptr& ptr)
@@ -794,9 +790,7 @@ namespace MWMechanics
         const auto it = mIndex.find(ptr.mRef);
         if (it == mIndex.end())
             return false;
-        CharacterController* ctrl = it->second->getCharacterController();
-
-        return ctrl->isSneaking();
+        return it->second->getCharacterController().isSneaking();
     }
 
     void Actors::updateDrowning(const MWWorld::Ptr& ptr, float duration, bool isKnockedOut, bool isPlayer)
@@ -1055,9 +1049,8 @@ namespace MWMechanics
         const auto it = mActors.emplace(mActors.end(), ptr, anim);
         mIndex.emplace(ptr.mRef, it);
 
-        CharacterController* ctrl = it->getCharacterController();
         if (updateImmediately)
-            ctrl->update(0);
+            it->getCharacterController().update(0);
 
         // We should initially hide actors outside of processing range.
         // Note: since we update player after other actors, distance will be incorrect during teleportation.
@@ -1065,10 +1058,10 @@ namespace MWMechanics
         if (MWBase::Environment::get().getWorld()->getPlayer().wasTeleported())
             return;
 
-        updateVisibility(ptr, ctrl);
+        updateVisibility(ptr, it->getCharacterController());
     }
 
-    void Actors::updateVisibility (const MWWorld::Ptr& ptr, CharacterController* ctrl)
+    void Actors::updateVisibility (const MWWorld::Ptr& ptr, CharacterController& ctrl)
     {
         MWWorld::Ptr player = MWMechanics::getPlayer();
         if (ptr == player)
@@ -1093,7 +1086,7 @@ namespace MWMechanics
 
         visibilityRatio = std::min(1.f, visibilityRatio);
 
-        ctrl->setVisibility(visibilityRatio);
+        ctrl.setVisibility(visibilityRatio);
     }
 
     void Actors::removeActor (const MWWorld::Ptr& ptr, bool keepActive)
@@ -1112,7 +1105,7 @@ namespace MWMechanics
     {
         const auto iter = mIndex.find(ptr.mRef);
         if (iter != mIndex.end())
-            iter->second->getCharacterController()->castSpell(spellId, manualSpell);
+            iter->second->getCharacterController().castSpell(spellId, manualSpell);
     }
 
     bool Actors::isActorDetected(const MWWorld::Ptr& actor, const MWWorld::Ptr& observer)
@@ -1402,7 +1395,7 @@ namespace MWMechanics
             for (Actor& actor : mActors)
             {
                 const bool isPlayer = actor.getPtr() == player;
-                CharacterController* const  ctrl = actor.getCharacterController();
+                CharacterController& ctrl = actor.getCharacterController();
                 MWBase::LuaManager::ActorControls* luaControls =
                     MWBase::Environment::get().getLuaManager()->getActorControls(actor.getPtr());
 
@@ -1428,7 +1421,7 @@ namespace MWMechanics
                     // They can be added during the death animation
                     if (!actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isDeathAnimationFinished())
                         adjustMagicEffects(actor.getPtr(), duration);
-                    ctrl->updateContinuousVfx();
+                    ctrl.updateContinuousVfx();
                 }
                 else
                 {
@@ -1441,7 +1434,7 @@ namespace MWMechanics
                     // Reaching the text keys may trigger Hit / Spellcast (and as such, particles),
                     // so updating VFX immediately after that would just remove the particle effects instantly.
                     // There needs to be a magic effect update in between.
-                    ctrl->updateContinuousVfx();
+                    ctrl.updateContinuousVfx();
 
                     if (!cellChanged && world->hasCellChanged())
                     {
@@ -1498,7 +1491,7 @@ namespace MWMechanics
                                 }
                             }
 
-                            ctrl->setHeadTrackTarget(headTrackTarget);
+                            ctrl.setHeadTrackTarget(headTrackTarget);
                         }
 
                         if (actor.getPtr().getClass().isNpc() && actor.getPtr() != player)
@@ -1509,7 +1502,7 @@ namespace MWMechanics
                             CreatureStats &stats = actor.getPtr().getClass().getCreatureStats(actor.getPtr());
                             if (isConscious(actor.getPtr()) && !(luaControls && luaControls->mDisableAI))
                             {
-                                stats.getAiSequence().execute(actor.getPtr(), *ctrl, duration);
+                                stats.getAiSequence().execute(actor.getPtr(), ctrl, duration);
                                 updateGreetingState(actor.getPtr(), actor, mTimerUpdateHello > 0);
                                 playIdleDialogue(actor.getPtr());
                                 updateMovementSpeed(actor.getPtr());
@@ -1519,13 +1512,13 @@ namespace MWMechanics
                     else if (aiActive && actor.getPtr() != player && isConscious(actor.getPtr()) && !(luaControls && luaControls->mDisableAI))
                     {
                         CreatureStats &stats = actor.getPtr().getClass().getCreatureStats(actor.getPtr());
-                        stats.getAiSequence().execute(actor.getPtr(), *ctrl, duration, /*outOfRange*/true);
+                        stats.getAiSequence().execute(actor.getPtr(), ctrl, duration, /*outOfRange*/true);
                     }
 
                     if (inProcessingRange && actor.getPtr().getClass().isNpc())
                     {
                         // We can not update drowning state for actors outside of AI distance - they can not resurface to breathe
-                        updateDrowning(actor.getPtr(), duration, ctrl->isKnockedOut(), isPlayer);
+                        updateDrowning(actor.getPtr(), duration, ctrl.isKnockedOut(), isPlayer);
                     }
                     if (mTimerUpdateEquippedLight == 0 && actor.getPtr().getClass().hasInventoryStore(actor.getPtr()))
                         updateEquippedLight(actor.getPtr(), updateEquippedLightInterval, showTorches);
@@ -1594,8 +1587,8 @@ namespace MWMechanics
                     activeFlag = 2;
                 int active = inRange ? activeFlag : 0;
 
-                CharacterController* const ctrl = actor.getCharacterController();
-                ctrl->setActive(active);
+                CharacterController& ctrl = actor.getCharacterController();
+                ctrl.setActive(active);
 
                 if (!inRange)
                 {
@@ -1615,18 +1608,18 @@ namespace MWMechanics
 
                 const bool isDead = actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isDead();
                 if (!isDead && (!godmode || !isPlayer) && actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isParalyzed())
-                    ctrl->skipAnim();
+                    ctrl.skipAnim();
 
                 // Handle player last, in case a cell transition occurs by casting a teleportation spell
                 // (would invalidate the iterator)
                 if (actor.getPtr() == getPlayer())
                 {
-                    playerCharacter = ctrl;
+                    playerCharacter = &ctrl;
                     continue;
                 }
 
                 world->setActorCollisionMode(actor.getPtr(), true, !actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isDeathAnimationFinished());
-                ctrl->update(duration);
+                ctrl.update(duration);
 
                 updateVisibility(actor.getPtr(), ctrl);
             }
@@ -1676,11 +1669,11 @@ namespace MWMechanics
         const auto iter = mIndex.find(ptr.mRef);
         if (iter != mIndex.end())
         {
-            if (iter->second->getCharacterController()->isDead())
+            if (iter->second->getCharacterController().isDead())
             {
                 // Actor has been resurrected. Notify the CharacterController and re-enable collision.
                 MWBase::Environment::get().getWorld()->enableActorCollision(iter->second->getPtr(), true);
-                iter->second->getCharacterController()->resurrect();
+                iter->second->getCharacterController().resurrect();
             }
         }
     }
@@ -1696,7 +1689,7 @@ namespace MWMechanics
                 continue;
 
             MWBase::Environment::get().getWorld()->removeActorPath(actor.getPtr());
-            CharacterController::KillResult killResult = actor.getCharacterController()->kill();
+            CharacterController::KillResult killResult = actor.getCharacterController().kill();
             if (killResult == CharacterController::Result_DeathAnimStarted)
             {
                 // Play dying words
@@ -1926,7 +1919,7 @@ namespace MWMechanics
     {
         const auto iter = mIndex.find(ptr.mRef);
         if (iter != mIndex.end())
-            iter->second->getCharacterController()->forceStateUpdate();
+            iter->second->getCharacterController().forceStateUpdate();
     }
 
     bool Actors::playAnimationGroup(const MWWorld::Ptr& ptr, const std::string& groupName, int mode, int number, bool persist)
@@ -1934,7 +1927,7 @@ namespace MWMechanics
         const auto iter = mIndex.find(ptr.mRef);
         if(iter != mIndex.end())
         {
-            return iter->second->getCharacterController()->playGroup(groupName, mode, number, persist);
+            return iter->second->getCharacterController().playGroup(groupName, mode, number, persist);
         }
         else
         {
@@ -1946,21 +1939,21 @@ namespace MWMechanics
     {
         const auto iter = mIndex.find(ptr.mRef);
         if (iter != mIndex.end())
-            iter->second->getCharacterController()->skipAnim();
+            iter->second->getCharacterController().skipAnim();
     }
 
     bool Actors::checkAnimationPlaying(const MWWorld::Ptr& ptr, const std::string& groupName)
     {
         const auto iter = mIndex.find(ptr.mRef);
         if(iter != mIndex.end())
-            return iter->second->getCharacterController()->isAnimPlaying(groupName);
+            return iter->second->getCharacterController().isAnimPlaying(groupName);
         return false;
     }
 
     void Actors::persistAnimationStates()
     {
         for (Actor& actor : mActors)
-            actor.getCharacterController()->persistAnimationState();
+            actor.getCharacterController().persistAnimationState();
     }
 
     void Actors::getObjectsInRange(const osg::Vec3f& position, float radius, std::vector<MWWorld::Ptr>& out)
@@ -2195,7 +2188,7 @@ namespace MWMechanics
         if (it == mIndex.end())
             return false;
 
-        return it->second->getCharacterController()->isReadyToBlock();
+        return it->second->getCharacterController().isReadyToBlock();
     }
 
     bool Actors::isCastingSpell(const MWWorld::Ptr &ptr) const
@@ -2204,7 +2197,7 @@ namespace MWMechanics
         if (it == mIndex.end())
             return false;
 
-        return it->second->getCharacterController()->isCastingSpell();
+        return it->second->getCharacterController().isCastingSpell();
     }
 
     bool Actors::isAttackingOrSpell(const MWWorld::Ptr& ptr) const
@@ -2212,9 +2205,8 @@ namespace MWMechanics
         const auto it = mIndex.find(ptr.mRef);
         if (it == mIndex.end())
             return false;
-        CharacterController* ctrl = it->second->getCharacterController();
 
-        return ctrl->isAttackingOrSpell();
+        return it->second->getCharacterController().isAttackingOrSpell();
     }
 
     int Actors::getGreetingTimer(const MWWorld::Ptr& ptr) const
diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index fef1f8f59a..a1f93a5dc5 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -200,7 +200,7 @@ namespace MWMechanics
             bool mSmoothMovement;
             MusicType mCurrentMusic = MusicType::Explore;
 
-            void updateVisibility (const MWWorld::Ptr& ptr, CharacterController* ctrl);
+            void updateVisibility (const MWWorld::Ptr& ptr, CharacterController& ctrl);
 
             void adjustMagicEffects (const MWWorld::Ptr& creature, float duration);
 
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index e8e7f2b721..38f7a48a2b 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -241,7 +241,10 @@ public:
     CharacterController(const MWWorld::Ptr &ptr, MWRender::Animation *anim);
     virtual ~CharacterController();
 
-    const MWWorld::Ptr& getPtr() const { return mPtr; };
+    CharacterController(const CharacterController&) = delete;
+    CharacterController(CharacterController&&) = delete;
+
+    const MWWorld::Ptr& getPtr() const { return mPtr; }
 
     void handleTextKey(const std::string &groupname, SceneUtil::TextKeyMap::ConstIterator key, const SceneUtil::TextKeyMap& map) override;
 

From 1bb1053569f42d27e5a4f995a4c69aa6ce8c386a Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 18 May 2022 19:58:53 +0200
Subject: [PATCH 2479/2859] Make all MWMechanics::Actor functions inline

---
 apps/openmw/CMakeLists.txt        |  2 +-
 apps/openmw/mwmechanics/actor.cpp | 82 -------------------------------
 apps/openmw/mwmechanics/actor.hpp | 36 ++++++++------
 3 files changed, 22 insertions(+), 98 deletions(-)
 delete mode 100644 apps/openmw/mwmechanics/actor.cpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 9a19c3e1d6..3ec86df232 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -95,7 +95,7 @@ add_openmw_dir (mwmechanics
     mechanicsmanagerimp stat creaturestats magiceffects movement actorutil spelllist
     drawstate spells activespells npcstats aipackage aisequence aipursue alchemy aiwander aitravel aifollow aiavoiddoor aibreathe
     aicast aiescort aiface aiactivate aicombat recharge repair enchanting pathfinding pathgrid security spellcasting spellresistance
-    disease pickpocket levelledlist combat steering obstacle autocalcspell difficultyscaling aicombataction actor summoning
+    disease pickpocket levelledlist combat steering obstacle autocalcspell difficultyscaling aicombataction summoning
     character actors objects aistate trading weaponpriority spellpriority weapontype spellutil
     spelleffects
     )
diff --git a/apps/openmw/mwmechanics/actor.cpp b/apps/openmw/mwmechanics/actor.cpp
deleted file mode 100644
index 2af3b50aa1..0000000000
--- a/apps/openmw/mwmechanics/actor.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-#include "actor.hpp"
-
-#include "character.hpp"
-
-namespace MWMechanics
-{
-    Actor::Actor(const MWWorld::Ptr &ptr, MWRender::Animation *animation)
-        : mCharacterController(ptr, animation)
-        , mPositionAdjusted(false)
-    {
-    }
-
-    const MWWorld::Ptr& Actor::getPtr() const
-    {
-        return mCharacterController.getPtr();
-    }
-
-    void Actor::updatePtr(const MWWorld::Ptr &newPtr)
-    {
-        mCharacterController.updatePtr(newPtr);
-    }
-
-    CharacterController& Actor::getCharacterController()
-    {
-        return mCharacterController;
-    }
-
-    int Actor::getGreetingTimer() const
-    {
-        return mGreetingTimer;
-    }
-
-    void Actor::setGreetingTimer(int timer)
-    {
-        mGreetingTimer = timer;
-    }
-
-    float Actor::getAngleToPlayer() const
-    {
-        return mTargetAngleRadians;
-    }
-
-    void Actor::setAngleToPlayer(float angle)
-    {
-        mTargetAngleRadians = angle;
-    }
-
-    GreetingState Actor::getGreetingState() const
-    {
-        return mGreetingState;
-    }
-
-    void Actor::setGreetingState(GreetingState state)
-    {
-        mGreetingState = state;
-    }
-
-    bool Actor::isTurningToPlayer() const
-    {
-        return mIsTurningToPlayer;
-    }
-
-    void Actor::setTurningToPlayer(bool turning)
-    {
-        mIsTurningToPlayer = turning;
-    }
-
-    Misc::TimerStatus Actor::updateEngageCombatTimer(float duration)
-    {
-        return mEngageCombat.update(duration, MWBase::Environment::get().getWorld()->getPrng());
-    }
-
-    void Actor::setPositionAdjusted(bool adjusted)
-    {
-        mPositionAdjusted = adjusted;
-    }
-
-    bool Actor::getPositionAdjusted() const
-    {
-        return mPositionAdjusted;
-    }
-}
diff --git a/apps/openmw/mwmechanics/actor.hpp b/apps/openmw/mwmechanics/actor.hpp
index 06fdc79a14..14f21193ea 100644
--- a/apps/openmw/mwmechanics/actor.hpp
+++ b/apps/openmw/mwmechanics/actor.hpp
@@ -23,31 +23,37 @@ namespace MWMechanics
     class Actor
     {
     public:
-        Actor(const MWWorld::Ptr& ptr, MWRender::Animation* animation);
+        Actor(const MWWorld::Ptr& ptr, MWRender::Animation* animation)
+            : mCharacterController(ptr, animation)
+            , mPositionAdjusted(false)
+        {}
 
-        const MWWorld::Ptr& getPtr() const;
+        const MWWorld::Ptr& getPtr() const { return mCharacterController.getPtr(); }
 
         /// Notify this actor of its new base object Ptr, use when the object changed cells
-        void updatePtr(const MWWorld::Ptr& newPtr);
+        void updatePtr(const MWWorld::Ptr& newPtr) { mCharacterController.updatePtr(newPtr); }
 
-        CharacterController& getCharacterController();
+        CharacterController& getCharacterController() { return mCharacterController; }
 
-        int getGreetingTimer() const;
-        void setGreetingTimer(int timer);
+        int getGreetingTimer() const { return mGreetingTimer; }
+        void setGreetingTimer(int timer) { mGreetingTimer = timer; }
 
-        float getAngleToPlayer() const;
-        void setAngleToPlayer(float angle);
+        float getAngleToPlayer() const { return mTargetAngleRadians; }
+        void setAngleToPlayer(float angle) { mTargetAngleRadians = angle; }
 
-        GreetingState getGreetingState() const;
-        void setGreetingState(GreetingState state);
+        GreetingState getGreetingState() const { return mGreetingState; }
+        void setGreetingState(GreetingState state) { mGreetingState = state; }
 
-        bool isTurningToPlayer() const;
-        void setTurningToPlayer(bool turning);
+        bool isTurningToPlayer() const { return mIsTurningToPlayer; }
+        void setTurningToPlayer(bool turning) { mIsTurningToPlayer = turning; }
 
-        Misc::TimerStatus updateEngageCombatTimer(float duration);
+        Misc::TimerStatus updateEngageCombatTimer(float duration)
+        {
+            return mEngageCombat.update(duration, MWBase::Environment::get().getWorld()->getPrng());
+        }
 
-        void setPositionAdjusted(bool adjusted);
-        bool getPositionAdjusted() const;
+        void setPositionAdjusted(bool adjusted) { mPositionAdjusted = adjusted; }
+        bool getPositionAdjusted() const { return mPositionAdjusted; }
 
     private:
         CharacterController mCharacterController;

From 19e471741a96275915c805709da97e3e1102b932 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 20 May 2022 23:11:43 +0200
Subject: [PATCH 2480/2859] Use PtrBase::mRef instead of getBase for mechanics
 objects

getBase adds a condition and can throw an exception. Which is redundant for
MWMechanics::Objects functions.
---
 apps/openmw/mwmechanics/objects.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwmechanics/objects.cpp b/apps/openmw/mwmechanics/objects.cpp
index c77521d06e..5a474abf1c 100644
--- a/apps/openmw/mwmechanics/objects.cpp
+++ b/apps/openmw/mwmechanics/objects.cpp
@@ -22,12 +22,12 @@ void Objects::addObject(const MWWorld::Ptr& ptr)
         return;
 
     const auto it = mObjects.emplace(mObjects.end(), ptr, anim);
-    mIndex.emplace(ptr.getBase(), it);
+    mIndex.emplace(ptr.mRef, it);
 }
 
 void Objects::removeObject(const MWWorld::Ptr& ptr)
 {
-    const auto iter = mIndex.find(ptr.getBase());
+    const auto iter = mIndex.find(ptr.mRef);
     if (iter != mIndex.end())
     {
         mObjects.erase(iter->second);
@@ -37,7 +37,7 @@ void Objects::removeObject(const MWWorld::Ptr& ptr)
 
 void Objects::updateObject(const MWWorld::Ptr &old, const MWWorld::Ptr &ptr)
 {
-    const auto iter = mIndex.find(old.getBase());
+    const auto iter = mIndex.find(old.mRef);
     if (iter != mIndex.end())
         iter->second->updatePtr(ptr);
 }
@@ -48,7 +48,7 @@ void Objects::dropObjects (const MWWorld::CellStore *cellStore)
     {
         if (iter->getPtr().getCell() == cellStore)
         {
-            mIndex.erase(iter->getPtr().getBase());
+            mIndex.erase(iter->getPtr().mRef);
             iter = mObjects.erase(iter);
         }
         else
@@ -86,7 +86,7 @@ void Objects::update(float duration, bool paused)
 
 bool Objects::onOpen(const MWWorld::Ptr& ptr)
 {
-    const auto iter = mIndex.find(ptr.getBase());
+    const auto iter = mIndex.find(ptr.mRef);
     if (iter != mIndex.end())
         return iter->second->onOpen();
     return true;
@@ -94,14 +94,14 @@ bool Objects::onOpen(const MWWorld::Ptr& ptr)
 
 void Objects::onClose(const MWWorld::Ptr& ptr)
 {
-    const auto iter = mIndex.find(ptr.getBase());
+    const auto iter = mIndex.find(ptr.mRef);
     if (iter != mIndex.end())
         iter->second->onClose();
 }
 
 bool Objects::playAnimationGroup(const MWWorld::Ptr& ptr, const std::string& groupName, int mode, int number, bool persist)
 {
-    const auto iter = mIndex.find(ptr.getBase());
+    const auto iter = mIndex.find(ptr.mRef);
     if (iter != mIndex.end())
     {
         return iter->second->playGroup(groupName, mode, number, persist);
@@ -114,7 +114,7 @@ bool Objects::playAnimationGroup(const MWWorld::Ptr& ptr, const std::string& gro
 }
 void Objects::skipAnimation(const MWWorld::Ptr& ptr)
 {
-    const auto iter = mIndex.find(ptr.getBase());
+    const auto iter = mIndex.find(ptr.mRef);
     if (iter != mIndex.end())
         iter->second->skipAnim();
 }

From c6ca0e78c9e909682424af609e4b66878467d471 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 21 May 2022 01:21:55 +0200
Subject: [PATCH 2481/2859] Make getStringLiteral return a string_view

---
 apps/openmw/mwbase/dialoguemanager.hpp        | 10 +-
 apps/openmw/mwbase/soundmanager.hpp           | 12 +--
 apps/openmw/mwbase/world.hpp                  | 14 +--
 apps/openmw/mwdialogue/dialoguemanagerimp.cpp | 12 +--
 apps/openmw/mwdialogue/dialoguemanagerimp.hpp | 10 +-
 apps/openmw/mwmechanics/activespells.cpp      |  4 +-
 apps/openmw/mwmechanics/activespells.hpp      |  4 +-
 apps/openmw/mwscript/aiextensions.cpp         | 24 ++---
 apps/openmw/mwscript/animationextensions.cpp  |  8 +-
 apps/openmw/mwscript/cellextensions.cpp       |  5 +-
 apps/openmw/mwscript/containerextensions.cpp  | 20 ++--
 apps/openmw/mwscript/dialogueextensions.cpp   | 27 +++---
 apps/openmw/mwscript/globalscripts.cpp        | 19 ++--
 apps/openmw/mwscript/globalscripts.hpp        | 10 +-
 apps/openmw/mwscript/guiextensions.cpp        |  3 +-
 apps/openmw/mwscript/interpretercontext.cpp   | 30 +++---
 apps/openmw/mwscript/interpretercontext.hpp   | 30 +++---
 apps/openmw/mwscript/locals.cpp               |  8 +-
 apps/openmw/mwscript/locals.hpp               |  8 +-
 apps/openmw/mwscript/miscextensions.cpp       | 91 ++++++++++---------
 apps/openmw/mwscript/ref.cpp                  |  2 +-
 apps/openmw/mwscript/skyextensions.cpp        |  6 +-
 apps/openmw/mwscript/soundextensions.cpp      | 22 ++---
 apps/openmw/mwscript/statsextensions.cpp      | 28 +++---
 .../mwscript/transformationextensions.cpp     | 37 ++++----
 apps/openmw/mwsound/soundmanagerimp.cpp       | 12 +--
 apps/openmw/mwsound/soundmanagerimp.hpp       | 12 +--
 apps/openmw/mwworld/containerstore.cpp        |  4 +-
 apps/openmw/mwworld/containerstore.hpp        |  4 +-
 apps/openmw/mwworld/datetimemanager.cpp       |  4 +-
 apps/openmw/mwworld/datetimemanager.hpp       |  4 +-
 apps/openmw/mwworld/globals.cpp               | 14 +--
 apps/openmw/mwworld/globals.hpp               | 10 +-
 apps/openmw/mwworld/manualref.cpp             |  2 +-
 apps/openmw/mwworld/manualref.hpp             |  2 +-
 apps/openmw/mwworld/worldimp.cpp              | 17 ++--
 apps/openmw/mwworld/worldimp.hpp              | 14 +--
 .../openmw_test_suite/mwscript/test_utils.hpp | 50 +++++-----
 components/compiler/lineparser.hpp            |  2 +-
 components/compiler/locals.cpp                | 10 +-
 components/compiler/locals.hpp                | 10 +-
 components/interpreter/context.hpp            | 28 +++---
 components/interpreter/localopcodes.hpp       | 36 ++++----
 components/interpreter/miscopcodes.hpp        | 11 ++-
 components/interpreter/runtime.cpp            |  8 +-
 components/interpreter/runtime.hpp            |  2 +-
 components/misc/messageformatparser.cpp       |  2 +-
 components/misc/messageformatparser.hpp       |  2 +-
 48 files changed, 356 insertions(+), 348 deletions(-)

diff --git a/apps/openmw/mwbase/dialoguemanager.hpp b/apps/openmw/mwbase/dialoguemanager.hpp
index 4fbd958381..8b0d66dad5 100644
--- a/apps/openmw/mwbase/dialoguemanager.hpp
+++ b/apps/openmw/mwbase/dialoguemanager.hpp
@@ -55,9 +55,9 @@ namespace MWBase
 
             virtual bool inJournal (const std::string& topicId, const std::string& infoId) = 0;
 
-            virtual void addTopic (const std::string& topic) = 0;
+            virtual void addTopic(std::string_view topic) = 0;
 
-            virtual void addChoice (const std::string& text,int choice) = 0;
+            virtual void addChoice(std::string_view text,int choice) = 0;
             virtual const std::vector<std::pair<std::string, int> >& getChoices() = 0;
 
             virtual bool isGoodbye() = 0;
@@ -105,12 +105,12 @@ namespace MWBase
             virtual void readRecord (ESM::ESMReader& reader, uint32_t type) = 0;
 
             /// Changes faction1's opinion of faction2 by \a diff.
-            virtual void modFactionReaction (const std::string& faction1, const std::string& faction2, int diff) = 0;
+            virtual void modFactionReaction (std::string_view faction1, std::string_view faction2, int diff) = 0;
 
-            virtual void setFactionReaction (const std::string& faction1, const std::string& faction2, int absolute) = 0;
+            virtual void setFactionReaction (std::string_view faction1, std::string_view faction2, int absolute) = 0;
 
             /// @return faction1's opinion of faction2
-            virtual int getFactionReaction (const std::string& faction1, const std::string& faction2) const = 0;
+            virtual int getFactionReaction (std::string_view faction1, std::string_view faction2) const = 0;
 
             /// Removes the last added topic response for the given actor from the journal
             virtual void clearInfoActor (const MWWorld::Ptr& actor) const = 0;
diff --git a/apps/openmw/mwbase/soundmanager.hpp b/apps/openmw/mwbase/soundmanager.hpp
index 9d3e99d06b..4148bed085 100644
--- a/apps/openmw/mwbase/soundmanager.hpp
+++ b/apps/openmw/mwbase/soundmanager.hpp
@@ -128,19 +128,19 @@ namespace MWBase
             /// returned by \ref playTrack). Only intended to be called by the track
             /// decoder's read method.
 
-            virtual Sound *playSound(const std::string& soundId, float volume, float pitch,
+            virtual Sound *playSound(std::string_view soundId, float volume, float pitch,
                                      Type type=Type::Sfx, PlayMode mode=PlayMode::Normal,
                                      float offset=0) = 0;
             ///< Play a sound, independently of 3D-position
             ///< @param offset Number of seconds into the sound to start playback.
 
-            virtual Sound *playSound3D(const MWWorld::ConstPtr &reference, const std::string& soundId,
+            virtual Sound *playSound3D(const MWWorld::ConstPtr &reference, std::string_view soundId,
                                        float volume, float pitch, Type type=Type::Sfx,
                                        PlayMode mode=PlayMode::Normal, float offset=0) = 0;
             ///< Play a 3D sound attached to an MWWorld::Ptr. Will be updated automatically with the Ptr's position, unless Play_NoTrack is specified.
             ///< @param offset Number of seconds into the sound to start playback.
 
-            virtual Sound *playSound3D(const osg::Vec3f& initialPos, const std::string& soundId,
+            virtual Sound *playSound3D(const osg::Vec3f& initialPos, std::string_view soundId,
                                        float volume, float pitch, Type type=Type::Sfx,
                                        PlayMode mode=PlayMode::Normal, float offset=0) = 0;
             ///< Play a 3D sound at \a initialPos. If the sound should be moving, it must be updated using Sound::setPosition.
@@ -148,7 +148,7 @@ namespace MWBase
             virtual void stopSound(Sound *sound) = 0;
             ///< Stop the given sound from playing
 
-            virtual void stopSound3D(const MWWorld::ConstPtr &reference, const std::string& soundId) = 0;
+            virtual void stopSound3D(const MWWorld::ConstPtr &reference, std::string_view soundId) = 0;
             ///< Stop the given object from playing the given sound,
 
             virtual void stopSound3D(const MWWorld::ConstPtr &reference) = 0;
@@ -157,13 +157,13 @@ namespace MWBase
             virtual void stopSound(const MWWorld::CellStore *cell) = 0;
             ///< Stop all sounds for the given cell.
 
-            virtual void fadeOutSound3D(const MWWorld::ConstPtr &reference, const std::string& soundId, float duration) = 0;
+            virtual void fadeOutSound3D(const MWWorld::ConstPtr &reference, std::string_view soundId, float duration) = 0;
             ///< Fade out given sound (that is already playing) of given object
             ///< @param reference Reference to object, whose sound is faded out
             ///< @param soundId ID of the sound to fade out.
             ///< @param duration Time until volume reaches 0.
 
-            virtual bool getSoundPlaying(const MWWorld::ConstPtr &reference, const std::string& soundId) const = 0;
+            virtual bool getSoundPlaying(const MWWorld::ConstPtr &reference, std::string_view soundId) const = 0;
             ///< Is the given sound currently playing on the given object?
             ///  If you want to check if sound played with playSound is playing, use empty Ptr
 
diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 15177b4301..0057814e1e 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -174,19 +174,19 @@ namespace MWBase
             virtual void getDoorMarkers (MWWorld::CellStore* cell, std::vector<DoorMarker>& out) = 0;
             ///< get a list of teleport door markers for a given cell, to be displayed on the local map
 
-            virtual void setGlobalInt (const std::string& name, int value) = 0;
+            virtual void setGlobalInt(std::string_view name, int value) = 0;
             ///< Set value independently from real type.
 
-            virtual void setGlobalFloat (const std::string& name, float value) = 0;
+            virtual void setGlobalFloat(std::string_view name, float value) = 0;
             ///< Set value independently from real type.
 
-            virtual int getGlobalInt (const std::string& name) const = 0;
+            virtual int getGlobalInt(std::string_view name) const = 0;
             ///< Get value independently from real type.
 
-            virtual float getGlobalFloat (const std::string& name) const = 0;
+            virtual float getGlobalFloat(std::string_view name) const = 0;
             ///< Get value independently from real type.
 
-            virtual char getGlobalVariableType (const std::string& name) const = 0;
+            virtual char getGlobalVariableType(std::string_view name) const = 0;
             ///< Return ' ', if there is no global variable with this name.
 
             virtual std::string getCellName (const MWWorld::CellStore *cell = nullptr) const = 0;
@@ -199,11 +199,11 @@ namespace MWBase
             virtual void removeRefScript (MWWorld::RefData *ref) = 0;
             //< Remove the script attached to ref from mLocalScripts
 
-            virtual MWWorld::Ptr getPtr (const std::string& name, bool activeOnly) = 0;
+            virtual MWWorld::Ptr getPtr (std::string_view name, bool activeOnly) = 0;
             ///< Return a pointer to a liveCellRef with the given name.
             /// \param activeOnly do non search inactive cells.
 
-            virtual MWWorld::Ptr searchPtr (const std::string& name, bool activeOnly, bool searchInContainers = true) = 0;
+            virtual MWWorld::Ptr searchPtr (std::string_view name, bool activeOnly, bool searchInContainers = true) = 0;
             ///< Return a pointer to a liveCellRef with the given name.
             /// \param activeOnly do non search inactive cells.
 
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index 9d8516ae79..e7e29a58b4 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -71,7 +71,7 @@ namespace MWDialogue
         mPermanentDispositionChange = 0;
     }
 
-    void DialogueManager::addTopic (const std::string& topic)
+    void DialogueManager::addTopic(std::string_view topic)
     {
         mKnownTopics.insert( Misc::StringUtils::lowerCase(topic) );
     }
@@ -516,10 +516,10 @@ namespace MWDialogue
         updateActorKnownTopics();
     }
 
-    void DialogueManager::addChoice (const std::string& text, int choice)
+    void DialogueManager::addChoice(std::string_view text, int choice)
     {
         mIsInChoice = true;
-        mChoices.emplace_back(text, choice);
+        mChoices.emplace_back(std::string{text.begin(), text.end()}, choice);
     }
 
     const std::vector<std::pair<std::string, int> >& DialogueManager::getChoices()
@@ -704,7 +704,7 @@ namespace MWDialogue
         }
     }
 
-    void DialogueManager::modFactionReaction(const std::string &faction1, const std::string &faction2, int diff)
+    void DialogueManager::modFactionReaction(std::string_view faction1, std::string_view faction2, int diff)
     {
         std::string fact1 = Misc::StringUtils::lowerCase(faction1);
         std::string fact2 = Misc::StringUtils::lowerCase(faction2);
@@ -719,7 +719,7 @@ namespace MWDialogue
         map[fact2] = newValue;
     }
 
-    void DialogueManager::setFactionReaction(const std::string &faction1, const std::string &faction2, int absolute)
+    void DialogueManager::setFactionReaction(std::string_view faction1, std::string_view faction2, int absolute)
     {
         std::string fact1 = Misc::StringUtils::lowerCase(faction1);
         std::string fact2 = Misc::StringUtils::lowerCase(faction2);
@@ -732,7 +732,7 @@ namespace MWDialogue
         map[fact2] = absolute;
     }
 
-    int DialogueManager::getFactionReaction(const std::string &faction1, const std::string &faction2) const
+    int DialogueManager::getFactionReaction(std::string_view faction1, std::string_view faction2) const
     {
         std::string fact1 = Misc::StringUtils::lowerCase(faction1);
         std::string fact2 = Misc::StringUtils::lowerCase(faction2);
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.hpp b/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
index 7a3e44349e..5d0c5279d2 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
@@ -87,9 +87,9 @@ namespace MWDialogue
 
             bool inJournal (const std::string& topicId, const std::string& infoId) override;
 
-            void addTopic (const std::string& topic) override;
+            void addTopic(std::string_view topic) override;
 
-            void addChoice (const std::string& text,int choice) override;
+            void addChoice(std::string_view text,int choice) override;
             const std::vector<std::pair<std::string, int> >& getChoices() override;
 
             bool isGoodbye() override;
@@ -117,12 +117,12 @@ namespace MWDialogue
             void readRecord (ESM::ESMReader& reader, uint32_t type) override;
 
             /// Changes faction1's opinion of faction2 by \a diff.
-            void modFactionReaction (const std::string& faction1, const std::string& faction2, int diff) override;
+            void modFactionReaction (std::string_view faction1, std::string_view faction2, int diff) override;
 
-            void setFactionReaction (const std::string& faction1, const std::string& faction2, int absolute) override;
+            void setFactionReaction (std::string_view faction1, std::string_view faction2, int absolute) override;
 
             /// @return faction1's opinion of faction2
-            int getFactionReaction (const std::string& faction1, const std::string& faction2) const override;
+            int getFactionReaction (std::string_view faction1, std::string_view faction2) const override;
 
             /// Removes the last added topic response for the given actor from the journal
             void clearInfoActor (const MWWorld::Ptr& actor) const override;
diff --git a/apps/openmw/mwmechanics/activespells.cpp b/apps/openmw/mwmechanics/activespells.cpp
index d0cdb4b8bb..8dcf6ca90c 100644
--- a/apps/openmw/mwmechanics/activespells.cpp
+++ b/apps/openmw/mwmechanics/activespells.cpp
@@ -333,7 +333,7 @@ namespace MWMechanics
         return mSpells.end();
     }
 
-    bool ActiveSpells::isSpellActive(const std::string& id) const
+    bool ActiveSpells::isSpellActive(std::string_view id) const
     {
         return std::find_if(mSpells.begin(), mSpells.end(), [&] (const auto& spell)
         {
@@ -434,7 +434,7 @@ namespace MWMechanics
         return removedCurrentSpell;
     }
 
-    void ActiveSpells::removeEffects(const MWWorld::Ptr& ptr, const std::string &id)
+    void ActiveSpells::removeEffects(const MWWorld::Ptr& ptr, std::string_view id)
     {
         purge([=] (const ActiveSpellParams& params)
         {
diff --git a/apps/openmw/mwmechanics/activespells.hpp b/apps/openmw/mwmechanics/activespells.hpp
index 5fb732ea8a..55b089dc52 100644
--- a/apps/openmw/mwmechanics/activespells.hpp
+++ b/apps/openmw/mwmechanics/activespells.hpp
@@ -127,7 +127,7 @@ namespace MWMechanics
             void addSpell(const ESM::Spell* spell, const MWWorld::Ptr& actor);
 
             /// Removes the active effects from this spell/potion/.. with \a id
-            void removeEffects (const MWWorld::Ptr& ptr, const std::string& id);
+            void removeEffects (const MWWorld::Ptr& ptr, std::string_view id);
 
             /// Remove all active effects with this effect id
             void purgeEffect (const MWWorld::Ptr& ptr, short effectId);
@@ -141,7 +141,7 @@ namespace MWMechanics
             /// Remove all spells
             void clear(const MWWorld::Ptr& ptr);
 
-            bool isSpellActive (const std::string& id) const;
+            bool isSpellActive (std::string_view id) const;
             ///< case insensitive
 
             void skipWorsenings(double hours);
diff --git a/apps/openmw/mwscript/aiextensions.cpp b/apps/openmw/mwscript/aiextensions.cpp
index f862508ee4..3b6b47bc80 100644
--- a/apps/openmw/mwscript/aiextensions.cpp
+++ b/apps/openmw/mwscript/aiextensions.cpp
@@ -45,7 +45,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string objectID = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view objectID = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     // The value of the reset argument doesn't actually matter
@@ -102,7 +102,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string actorID = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view actorID = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     Interpreter::Type_Float duration = runtime[0].mFloat;
@@ -140,10 +140,10 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string actorID = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view actorID = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
-                    std::string cellID = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view cellID = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     Interpreter::Type_Float duration = runtime[0].mFloat;
@@ -168,7 +168,7 @@ namespace MWScript
                     if (cellID.empty())
                         return;
 
-                    if (!MWBase::Environment::get().getWorld()->getStore().get<ESM::Cell>().search(cellID))
+                    if (!MWBase::Environment::get().getWorld()->getStore().get<ESM::Cell>().search({cellID.begin(), cellID.end()}))
                         return;
 
                     MWMechanics::AiEscort escortPackage(actorID, cellID, static_cast<int>(duration), x, y, z, repeat);
@@ -320,7 +320,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string actorID = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view actorID = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     Interpreter::Type_Float duration = runtime[0].mFloat;
@@ -358,10 +358,10 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string actorID = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view actorID = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
-                    std::string cellID = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view cellID = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     Interpreter::Type_Float duration = runtime[0].mFloat;
@@ -421,7 +421,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr observer = R()(runtime, false); // required=false
 
-                    std::string actorID = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view actorID = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     MWWorld::Ptr actor = MWBase::Environment::get().getWorld()->searchPtr(actorID, true, false);
@@ -444,7 +444,7 @@ namespace MWScript
 
                     MWWorld::Ptr source = R()(runtime);
 
-                    std::string actorID = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view actorID = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
 
@@ -465,7 +465,7 @@ namespace MWScript
                 void execute (Interpreter::Runtime &runtime) override
                 {
                     MWWorld::Ptr actor = R()(runtime);
-                    std::string testedTargetId = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view testedTargetId = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     bool targetsAreEqual = false;
@@ -497,7 +497,7 @@ namespace MWScript
                 void execute (Interpreter::Runtime &runtime) override
                 {
                     MWWorld::Ptr actor = R()(runtime);
-                    std::string targetID = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view targetID = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     MWWorld::Ptr target = MWBase::Environment::get().getWorld()->searchPtr(targetID, true, false);
diff --git a/apps/openmw/mwscript/animationextensions.cpp b/apps/openmw/mwscript/animationextensions.cpp
index 9320c86a88..a53b08d516 100644
--- a/apps/openmw/mwscript/animationextensions.cpp
+++ b/apps/openmw/mwscript/animationextensions.cpp
@@ -44,7 +44,7 @@ namespace MWScript
                     if (!ptr.getRefData().isEnabled())
                         return;
 
-                    std::string group = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view group = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     Interpreter::Type_Integer mode = 0;
@@ -58,7 +58,7 @@ namespace MWScript
                             throw std::runtime_error ("animation mode out of range");
                     }
 
-                    MWBase::Environment::get().getMechanicsManager()->playAnimationGroup (ptr, group, mode, std::numeric_limits<int>::max(), true);
+                    MWBase::Environment::get().getMechanicsManager()->playAnimationGroup(ptr, {group.begin(), group.end()}, mode, std::numeric_limits<int>::max(), true);
                }
         };
 
@@ -74,7 +74,7 @@ namespace MWScript
                     if (!ptr.getRefData().isEnabled())
                         return;
 
-                    std::string group = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view group = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     Interpreter::Type_Integer loops = runtime[0].mInteger;
@@ -94,7 +94,7 @@ namespace MWScript
                             throw std::runtime_error ("animation mode out of range");
                     }
 
-                    MWBase::Environment::get().getMechanicsManager()->playAnimationGroup (ptr, group, mode, loops + 1, true);
+                    MWBase::Environment::get().getMechanicsManager()->playAnimationGroup(ptr, {group.begin(), group.end()}, mode, loops + 1, true);
                }
         };
         
diff --git a/apps/openmw/mwscript/cellextensions.cpp b/apps/openmw/mwscript/cellextensions.cpp
index f00fcfd447..2e11631a28 100644
--- a/apps/openmw/mwscript/cellextensions.cpp
+++ b/apps/openmw/mwscript/cellextensions.cpp
@@ -87,7 +87,8 @@ namespace MWScript
 
                 void execute (Interpreter::Runtime& runtime) override
                 {
-                    std::string cell = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view cellView = runtime.getStringLiteral(runtime[0].mInteger);
+                    std::string cell{cellView.begin(), cellView.end()};
                     runtime.pop();
 
                     ESM::Position pos;
@@ -160,7 +161,7 @@ namespace MWScript
 
                 void execute (Interpreter::Runtime& runtime) override
                 {
-                    std::string name = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view name = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     if (!MWMechanics::getPlayer().isInCell())
diff --git a/apps/openmw/mwscript/containerextensions.cpp b/apps/openmw/mwscript/containerextensions.cpp
index 8db1c04551..78919d4b48 100644
--- a/apps/openmw/mwscript/containerextensions.cpp
+++ b/apps/openmw/mwscript/containerextensions.cpp
@@ -87,7 +87,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string item = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view item = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     Interpreter::Type_Integer count = runtime[0].mInteger;
@@ -116,7 +116,7 @@ namespace MWScript
                     // Explicit calls to non-unique actors affect the base record
                     if(!R::implicit && ptr.getClass().isActor() && MWBase::Environment::get().getWorld()->getStore().getRefCount(ptr.getCellRef().getRefId()) > 1)
                     {
-                        ptr.getClass().modifyBaseInventory(ptr.getCellRef().getRefId(), item, count);
+                        ptr.getClass().modifyBaseInventory(ptr.getCellRef().getRefId(), {item.begin(), item.end()}, count);
                         return;
                     }
 
@@ -124,7 +124,7 @@ namespace MWScript
                     if(ptr.getClass().getType() == ESM::Container::sRecordId && (!ptr.getRefData().getCustomData() ||
                     !ptr.getClass().getContainerStore(ptr).isResolved()))
                     {
-                        ptr.getClass().modifyBaseInventory(ptr.getCellRef().getRefId(), item, count);
+                        ptr.getClass().modifyBaseInventory(ptr.getCellRef().getRefId(), {item.begin(), item.end()}, count);
                         const ESM::Container* baseRecord = MWBase::Environment::get().getWorld()->getStore().get<ESM::Container>().find(ptr.getCellRef().getRefId());
                         const auto& ptrs = MWBase::Environment::get().getWorld()->getAll(ptr.getCellRef().getRefId());
                         for(const auto& container : ptrs)
@@ -183,7 +183,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string item = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view item = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     if(::Misc::StringUtils::ciEqual(item, "gold_005")
@@ -207,7 +207,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string item = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view item = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     Interpreter::Type_Integer count = runtime[0].mInteger;
@@ -229,14 +229,14 @@ namespace MWScript
                     // Explicit calls to non-unique actors affect the base record
                     if(!R::implicit && ptr.getClass().isActor() && MWBase::Environment::get().getWorld()->getStore().getRefCount(ptr.getCellRef().getRefId()) > 1)
                     {
-                        ptr.getClass().modifyBaseInventory(ptr.getCellRef().getRefId(), item, -count);
+                        ptr.getClass().modifyBaseInventory(ptr.getCellRef().getRefId(), {item.begin(), item.end()}, -count);
                         return;
                     }
                     // Calls to unresolved containers affect the base record instead
                     else if(ptr.getClass().getType() == ESM::Container::sRecordId &&
                         (!ptr.getRefData().getCustomData() || !ptr.getClass().getContainerStore(ptr).isResolved()))
                     {
-                        ptr.getClass().modifyBaseInventory(ptr.getCellRef().getRefId(), item, -count);
+                        ptr.getClass().modifyBaseInventory(ptr.getCellRef().getRefId(), {item.begin(), item.end()}, -count);
                         const ESM::Container* baseRecord = MWBase::Environment::get().getWorld()->getStore().get<ESM::Container>().find(ptr.getCellRef().getRefId());
                         const auto& ptrs = MWBase::Environment::get().getWorld()->getAll(ptr.getCellRef().getRefId());
                         for(const auto& container : ptrs)
@@ -297,7 +297,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string item = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view item = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore (ptr);
@@ -408,7 +408,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string item = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view item = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     const MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore (ptr);
@@ -434,7 +434,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    const std::string &name = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view name = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     int count = 0;
diff --git a/apps/openmw/mwscript/dialogueextensions.cpp b/apps/openmw/mwscript/dialogueextensions.cpp
index a147bce6ea..e03aa4cb1c 100644
--- a/apps/openmw/mwscript/dialogueextensions.cpp
+++ b/apps/openmw/mwscript/dialogueextensions.cpp
@@ -34,7 +34,8 @@ namespace MWScript
                     if (ptr.isEmpty())
                         ptr = MWBase::Environment::get().getWorld()->getPlayerPtr();
 
-                    std::string quest = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view questView = runtime.getStringLiteral(runtime[0].mInteger);
+                    std::string quest{questView.begin(), questView.end()};
                     runtime.pop();
 
                     Interpreter::Type_Integer index = runtime[0].mInteger;
@@ -59,13 +60,13 @@ namespace MWScript
 
                 void execute (Interpreter::Runtime& runtime) override
                 {
-                    std::string quest = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view quest = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     Interpreter::Type_Integer index = runtime[0].mInteger;
                     runtime.pop();
 
-                    MWBase::Environment::get().getJournal()->setJournalIndex (quest, index);
+                    MWBase::Environment::get().getJournal()->setJournalIndex({quest.begin(), quest.end()}, index);
                 }
         };
 
@@ -75,10 +76,10 @@ namespace MWScript
 
                 void execute (Interpreter::Runtime& runtime) override
                 {
-                    std::string quest = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view quest = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
-                    int index = MWBase::Environment::get().getJournal()->getJournalIndex (quest);
+                    int index = MWBase::Environment::get().getJournal()->getJournalIndex({quest.begin(), quest.end()});
 
                     runtime.push (index);
 
@@ -91,7 +92,7 @@ namespace MWScript
 
                 void execute (Interpreter::Runtime& runtime) override
                 {
-                    std::string topic = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view topic = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     MWBase::Environment::get().getDialogueManager()->addTopic(topic);
@@ -107,7 +108,7 @@ namespace MWScript
                     MWBase::DialogueManager* dialogue = MWBase::Environment::get().getDialogueManager();
                     while(arg0>0)
                     {
-                        std::string question = runtime.getStringLiteral (runtime[0].mInteger);
+                        std::string_view question = runtime.getStringLiteral(runtime[0].mInteger);
                         runtime.pop();
                         arg0 = arg0 -1;
                         Interpreter::Type_Integer choice = 1;
@@ -220,10 +221,10 @@ namespace MWScript
 
             void execute (Interpreter::Runtime& runtime) override
             {
-                std::string faction1 = runtime.getStringLiteral (runtime[0].mInteger);
+                std::string_view faction1 = runtime.getStringLiteral(runtime[0].mInteger);
                 runtime.pop();
 
-                std::string faction2 = runtime.getStringLiteral (runtime[0].mInteger);
+                std::string_view faction2 = runtime.getStringLiteral(runtime[0].mInteger);
                 runtime.pop();
 
                 int modReaction = runtime[0].mInteger;
@@ -239,10 +240,10 @@ namespace MWScript
 
             void execute (Interpreter::Runtime& runtime) override
             {
-                std::string faction1 = runtime.getStringLiteral (runtime[0].mInteger);
+                std::string_view faction1 = runtime.getStringLiteral(runtime[0].mInteger);
                 runtime.pop();
 
-                std::string faction2 = runtime.getStringLiteral (runtime[0].mInteger);
+                std::string_view faction2 = runtime.getStringLiteral(runtime[0].mInteger);
                 runtime.pop();
 
                 runtime.push(MWBase::Environment::get().getDialogueManager()
@@ -256,10 +257,10 @@ namespace MWScript
 
             void execute (Interpreter::Runtime& runtime) override
             {
-                std::string faction1 = runtime.getStringLiteral (runtime[0].mInteger);
+                std::string_view faction1 = runtime.getStringLiteral(runtime[0].mInteger);
                 runtime.pop();
 
-                std::string faction2 = runtime.getStringLiteral (runtime[0].mInteger);
+                std::string_view faction2 = runtime.getStringLiteral(runtime[0].mInteger);
                 runtime.pop();
 
                 int newValue = runtime[0].mInteger;
diff --git a/apps/openmw/mwscript/globalscripts.cpp b/apps/openmw/mwscript/globalscripts.cpp
index 4a38d09bd0..16a32a0a12 100644
--- a/apps/openmw/mwscript/globalscripts.cpp
+++ b/apps/openmw/mwscript/globalscripts.cpp
@@ -135,20 +135,21 @@ namespace MWScript
     : mStore (store)
     {}
 
-    void GlobalScripts::addScript (const std::string& name, const MWWorld::Ptr& target)
+    void GlobalScripts::addScript(std::string_view name, const MWWorld::Ptr& target)
     {
-        const auto iter = mScripts.find (::Misc::StringUtils::lowerCase (name));
+        std::string lowerName = ::Misc::StringUtils::lowerCase(name);
+        const auto iter = mScripts.find(lowerName);
 
         if (iter==mScripts.end())
         {
-            if (const ESM::Script *script = mStore.get<ESM::Script>().search(name))
+            if (const ESM::Script *script = mStore.get<ESM::Script>().search(lowerName))
             {
                 auto desc = std::make_shared<GlobalScriptDesc>();
                 MWWorld::Ptr ptr = target;
                 desc->mTarget = ptr;
                 desc->mRunning = true;
                 desc->mLocals.configure (*script);
-                mScripts.insert (std::make_pair(name, desc));
+                mScripts.insert (std::make_pair(lowerName, desc));
             }
             else
             {
@@ -163,7 +164,7 @@ namespace MWScript
         }
     }
 
-    void GlobalScripts::removeScript (const std::string& name)
+    void GlobalScripts::removeScript (std::string_view name)
     {
         const auto iter = mScripts.find (::Misc::StringUtils::lowerCase (name));
 
@@ -171,7 +172,7 @@ namespace MWScript
             iter->second->mRunning = false;
     }
 
-    bool GlobalScripts::isRunning (const std::string& name) const
+    bool GlobalScripts::isRunning (std::string_view name) const
     {
         const auto iter = mScripts.find (::Misc::StringUtils::lowerCase (name));
 
@@ -306,14 +307,14 @@ namespace MWScript
         return false;
     }
 
-    Locals& GlobalScripts::getLocals (const std::string& name)
+    Locals& GlobalScripts::getLocals(std::string_view name)
     {
         std::string name2 = ::Misc::StringUtils::lowerCase (name);
         auto iter = mScripts.find (name2);
 
         if (iter==mScripts.end())
         {
-            const ESM::Script *script = mStore.get<ESM::Script>().find (name);
+            const ESM::Script *script = mStore.get<ESM::Script>().find(name2);
 
             auto desc = std::make_shared<GlobalScriptDesc>();
             desc->mLocals.configure (*script);
@@ -324,7 +325,7 @@ namespace MWScript
         return iter->second->mLocals;
     }
 
-    const Locals* GlobalScripts::getLocalsIfPresent (const std::string& name) const
+    const Locals* GlobalScripts::getLocalsIfPresent(std::string_view name) const
     {
         std::string name2 = ::Misc::StringUtils::lowerCase (name);
         auto iter = mScripts.find (name2);
diff --git a/apps/openmw/mwscript/globalscripts.hpp b/apps/openmw/mwscript/globalscripts.hpp
index 8725959e66..556f815238 100644
--- a/apps/openmw/mwscript/globalscripts.hpp
+++ b/apps/openmw/mwscript/globalscripts.hpp
@@ -56,11 +56,11 @@ namespace MWScript
 
             GlobalScripts (const MWWorld::ESMStore& store);
 
-            void addScript (const std::string& name, const MWWorld::Ptr& target = MWWorld::Ptr());
+            void addScript(std::string_view name, const MWWorld::Ptr& target = MWWorld::Ptr());
 
-            void removeScript (const std::string& name);
+            void removeScript (std::string_view name);
 
-            bool isRunning (const std::string& name) const;
+            bool isRunning (std::string_view name) const;
 
             void run();
             ///< run all active global scripts
@@ -79,11 +79,11 @@ namespace MWScript
             ///
             /// \return Known type?
 
-            Locals& getLocals (const std::string& name);
+            Locals& getLocals(std::string_view name);
             ///< If the script \a name has not been added as a global script yet, it is added
             /// automatically, but is not set to running state.
 
-            const Locals* getLocalsIfPresent (const std::string& name) const;
+            const Locals* getLocalsIfPresent(std::string_view name) const;
 
             void updatePtrs(const MWWorld::Ptr& base, const MWWorld::Ptr& updated);
             ///< Update the Ptrs stored in mTarget. Should be called after the reference has been moved to a new cell.
diff --git a/apps/openmw/mwscript/guiextensions.cpp b/apps/openmw/mwscript/guiextensions.cpp
index e44c94e686..f240747f6e 100644
--- a/apps/openmw/mwscript/guiextensions.cpp
+++ b/apps/openmw/mwscript/guiextensions.cpp
@@ -114,8 +114,7 @@ namespace MWScript
 
             void execute (Interpreter::Runtime& runtime) override
             {
-                std::string cell = (runtime.getStringLiteral (runtime[0].mInteger));
-                ::Misc::StringUtils::lowerCaseInPlace(cell);
+                std::string cell = ::Misc::StringUtils::lowerCase(runtime.getStringLiteral(runtime[0].mInteger));
                 runtime.pop();
 
                 // "Will match complete or partial cells, so ShowMap, "Vivec" will show cells Vivec and Vivec, Fred's House as well."
diff --git a/apps/openmw/mwscript/interpretercontext.cpp b/apps/openmw/mwscript/interpretercontext.cpp
index 72922aa5f3..733bc9260f 100644
--- a/apps/openmw/mwscript/interpretercontext.cpp
+++ b/apps/openmw/mwscript/interpretercontext.cpp
@@ -89,7 +89,7 @@ namespace MWScript
     MissingImplicitRefError::MissingImplicitRefError() : std::runtime_error("no implicit reference") {}
 
     int InterpreterContext::findLocalVariableIndex (const std::string& scriptId,
-        const std::string& name, char type) const
+        std::string_view name, char type) const
     {
         int index = MWBase::Environment::get().getScriptManager()->getLocals (scriptId).
             searchIndex (type, name);
@@ -200,33 +200,33 @@ namespace MWScript
     {
     }
 
-    int InterpreterContext::getGlobalShort (const std::string& name) const
+    int InterpreterContext::getGlobalShort(std::string_view name) const
     {
         return MWBase::Environment::get().getWorld()->getGlobalInt (name);
     }
 
-    int InterpreterContext::getGlobalLong (const std::string& name) const
+    int InterpreterContext::getGlobalLong(std::string_view name) const
     {
         // a global long is internally a float.
         return MWBase::Environment::get().getWorld()->getGlobalInt (name);
     }
 
-    float InterpreterContext::getGlobalFloat (const std::string& name) const
+    float InterpreterContext::getGlobalFloat(std::string_view name) const
     {
         return MWBase::Environment::get().getWorld()->getGlobalFloat (name);
     }
 
-    void InterpreterContext::setGlobalShort (const std::string& name, int value)
+    void InterpreterContext::setGlobalShort(std::string_view name, int value)
     {
         MWBase::Environment::get().getWorld()->setGlobalInt (name, value);
     }
 
-    void InterpreterContext::setGlobalLong (const std::string& name, int value)
+    void InterpreterContext::setGlobalLong(std::string_view name, int value)
     {
         MWBase::Environment::get().getWorld()->setGlobalInt (name, value);
     }
 
-    void InterpreterContext::setGlobalFloat (const std::string& name, float value)
+    void InterpreterContext::setGlobalFloat(std::string_view name, float value)
     {
         MWBase::Environment::get().getWorld()->setGlobalFloat (name, value);
     }
@@ -245,13 +245,13 @@ namespace MWScript
         return ids;
     }
 
-    char InterpreterContext::getGlobalType (const std::string& name) const
+    char InterpreterContext::getGlobalType(std::string_view name) const
     {
         MWBase::World *world = MWBase::Environment::get().getWorld();
         return world->getGlobalVariableType(name);
     }
 
-    std::string InterpreterContext::getActionBinding(const std::string& targetAction) const
+    std::string InterpreterContext::getActionBinding(std::string_view targetAction) const
     {
         MWBase::InputManager* input = MWBase::Environment::get().getInputManager();
         std::vector<int> actions = input->getActionKeySorting ();
@@ -427,7 +427,7 @@ namespace MWScript
         }
     }
 
-    int InterpreterContext::getMemberShort (const std::string& id, const std::string& name,
+    int InterpreterContext::getMemberShort(std::string_view id, std::string_view name,
         bool global) const
     {
         std::string scriptId (id);
@@ -437,7 +437,7 @@ namespace MWScript
         return locals.mShorts[findLocalVariableIndex (scriptId, name, 's')];
     }
 
-    int InterpreterContext::getMemberLong (const std::string& id, const std::string& name,
+    int InterpreterContext::getMemberLong(std::string_view id, std::string_view name,
         bool global) const
     {
         std::string scriptId (id);
@@ -447,7 +447,7 @@ namespace MWScript
         return locals.mLongs[findLocalVariableIndex (scriptId, name, 'l')];
     }
 
-    float InterpreterContext::getMemberFloat (const std::string& id, const std::string& name,
+    float InterpreterContext::getMemberFloat(std::string_view id, std::string_view name,
         bool global) const
     {
         std::string scriptId (id);
@@ -457,7 +457,7 @@ namespace MWScript
         return locals.mFloats[findLocalVariableIndex (scriptId, name, 'f')];
     }
 
-    void InterpreterContext::setMemberShort (const std::string& id, const std::string& name,
+    void InterpreterContext::setMemberShort(std::string_view id, std::string_view name,
         int value, bool global)
     {
         std::string scriptId (id);
@@ -467,7 +467,7 @@ namespace MWScript
         locals.mShorts[findLocalVariableIndex (scriptId, name, 's')] = value;
     }
 
-    void InterpreterContext::setMemberLong (const std::string& id, const std::string& name, int value, bool global)
+    void InterpreterContext::setMemberLong(std::string_view id, std::string_view name, int value, bool global)
     {
         std::string scriptId (id);
 
@@ -476,7 +476,7 @@ namespace MWScript
         locals.mLongs[findLocalVariableIndex (scriptId, name, 'l')] = value;
     }
 
-    void InterpreterContext::setMemberFloat (const std::string& id, const std::string& name, float value, bool global)
+    void InterpreterContext::setMemberFloat(std::string_view id, std::string_view name, float value, bool global)
     {
         std::string scriptId (id);
 
diff --git a/apps/openmw/mwscript/interpretercontext.hpp b/apps/openmw/mwscript/interpretercontext.hpp
index ee40883eac..b675e850d2 100644
--- a/apps/openmw/mwscript/interpretercontext.hpp
+++ b/apps/openmw/mwscript/interpretercontext.hpp
@@ -38,7 +38,7 @@ namespace MWScript
             ///< \a id is changed to the respective script ID, if \a id wasn't a script ID before
 
             /// Throws an exception if local variable can't be found.
-            int findLocalVariableIndex (const std::string& scriptId, const std::string& name,
+            int findLocalVariableIndex (const std::string& scriptId, std::string_view name,
                 char type) const;
 
         public:
@@ -69,23 +69,23 @@ namespace MWScript
             void report (const std::string& message) override;
             ///< By default, do nothing.
 
-            int getGlobalShort (const std::string& name) const override;
+            int getGlobalShort(std::string_view name) const override;
 
-            int getGlobalLong (const std::string& name) const override;
+            int getGlobalLong(std::string_view name) const override;
 
-            float getGlobalFloat (const std::string& name) const override;
+            float getGlobalFloat(std::string_view name) const override;
 
-            void setGlobalShort (const std::string& name, int value) override;
+            void setGlobalShort(std::string_view name, int value) override;
 
-            void setGlobalLong (const std::string& name, int value) override;
+            void setGlobalLong(std::string_view name, int value) override;
 
-            void setGlobalFloat (const std::string& name, float value) override;
+            void setGlobalFloat(std::string_view name, float value) override;
 
             std::vector<std::string> getGlobals () const override;
 
-            char getGlobalType (const std::string& name) const override;
+            char getGlobalType(std::string_view name) const override;
 
-            std::string getActionBinding(const std::string& action) const override;
+            std::string getActionBinding(std::string_view action) const override;
 
             std::string getActorName() const override;
 
@@ -114,17 +114,17 @@ namespace MWScript
             void executeActivation(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor);
             ///< Execute the activation action for this ptr. If ptr is mActivated, mark activation as handled.
 
-            int getMemberShort (const std::string& id, const std::string& name, bool global) const override;
+            int getMemberShort(std::string_view id, std::string_view name, bool global) const override;
 
-            int getMemberLong (const std::string& id, const std::string& name, bool global) const override;
+            int getMemberLong(std::string_view id, std::string_view name, bool global) const override;
 
-            float getMemberFloat (const std::string& id, const std::string& name, bool global) const override;
+            float getMemberFloat(std::string_view id, std::string_view name, bool global) const override;
 
-            void setMemberShort (const std::string& id, const std::string& name, int value, bool global) override;
+            void setMemberShort(std::string_view id, std::string_view name, int value, bool global) override;
 
-            void setMemberLong (const std::string& id, const std::string& name, int value, bool global) override;
+            void setMemberLong(std::string_view id, std::string_view name, int value, bool global) override;
 
-            void setMemberFloat (const std::string& id, const std::string& name, float value, bool global) override;
+            void setMemberFloat(std::string_view id, std::string_view name, float value, bool global) override;
 
             MWWorld::Ptr getReference(bool required=true) const;
             ///< Reference, that the script is running from (can be empty)
diff --git a/apps/openmw/mwscript/locals.cpp b/apps/openmw/mwscript/locals.cpp
index 4c395f83d4..9b9fbc66ad 100644
--- a/apps/openmw/mwscript/locals.cpp
+++ b/apps/openmw/mwscript/locals.cpp
@@ -62,7 +62,7 @@ namespace MWScript
         return (mShorts.empty() && mLongs.empty() && mFloats.empty());
     }
 
-    bool Locals::hasVar(const std::string &script, const std::string &var)
+    bool Locals::hasVar(const std::string &script, std::string_view var)
     {
         ensure (script);
 
@@ -72,7 +72,7 @@ namespace MWScript
         return (index != -1);
     }
 
-    int Locals::getIntVar(const std::string &script, const std::string &var)
+    int Locals::getIntVar(const std::string &script, std::string_view var)
     {
         ensure (script);
 
@@ -98,7 +98,7 @@ namespace MWScript
         return 0;
     }
 
-    float Locals::getFloatVar(const std::string &script, const std::string &var)
+    float Locals::getFloatVar(const std::string &script, std::string_view var)
     {
         ensure (script);
 
@@ -124,7 +124,7 @@ namespace MWScript
         return 0;
     }
 
-    bool Locals::setVarByInt(const std::string& script, const std::string& var, int val)
+    bool Locals::setVarByInt(const std::string& script, std::string_view var, int val)
     {
         ensure (script);
 
diff --git a/apps/openmw/mwscript/locals.hpp b/apps/openmw/mwscript/locals.hpp
index d63411a942..55437c9e51 100644
--- a/apps/openmw/mwscript/locals.hpp
+++ b/apps/openmw/mwscript/locals.hpp
@@ -37,25 +37,25 @@ namespace MWScript
             /// @note var needs to be in lowercase
             ///
             /// \note Locals will be automatically configured first, if necessary
-            bool setVarByInt(const std::string& script, const std::string& var, int val);
+            bool setVarByInt(const std::string& script, std::string_view var, int val);
 
             /// \note Locals will be automatically configured first, if necessary
             //
             // \note If it can not be determined if the variable exists, the error will be
             // ignored and false will be returned.
-            bool hasVar(const std::string& script, const std::string& var);
+            bool hasVar(const std::string& script, std::string_view var);
 
             /// if var does not exist, returns 0
             /// @note var needs to be in lowercase
             ///
             /// \note Locals will be automatically configured first, if necessary
-            int getIntVar (const std::string& script, const std::string& var);
+            int getIntVar (const std::string& script, std::string_view var);
 
             /// if var does not exist, returns 0
             /// @note var needs to be in lowercase
             ///
             /// \note Locals will be automatically configured first, if necessary
-            float getFloatVar (const std::string& script, const std::string& var);
+            float getFloatVar (const std::string& script, std::string_view var);
 
             /// \note If locals have not been configured yet, no data is written.
             ///
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index 678e195808..341bb0d6dd 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -51,7 +51,7 @@
 namespace
 {
 
-    void addToLevList(ESM::LevelledListBase* list, const std::string& itemId, int level)
+    void addToLevList(ESM::LevelledListBase* list, std::string_view itemId, int level)
     {
         for (auto& levelItem : list->mList)
         {
@@ -60,12 +60,12 @@ namespace
         }
 
         ESM::LevelledListBase::LevelItem item;
-        item.mId = itemId;
+        item.mId = {itemId.begin(), itemId.end()};
         item.mLevel = level;
         list->mList.push_back(item);
     }
 
-    void removeFromLevList(ESM::LevelledListBase* list, const std::string& itemId, int level)
+    void removeFromLevList(ESM::LevelledListBase* list, std::string_view itemId, int level)
     {
         // level of -1 removes all items with that itemId
         for (std::vector<ESM::LevelledListBase::LevelItem>::iterator it = list->mList.begin(); it != list->mList.end();)
@@ -124,7 +124,7 @@ namespace MWScript
                 void execute (Interpreter::Runtime& runtime) override
                 {
                     MWWorld::Ptr target = R()(runtime, false);
-                    std::string name = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view name = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
                     MWBase::Environment::get().getScriptManager()->getGlobalScripts().addScript (name, target);
                 }
@@ -136,7 +136,7 @@ namespace MWScript
 
                 void execute (Interpreter::Runtime& runtime) override
                 {
-                    std::string name = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view name = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
                     runtime.push(MWBase::Environment::get().getScriptManager()->getGlobalScripts().isRunning (name));
                 }
@@ -148,7 +148,7 @@ namespace MWScript
 
                 void execute (Interpreter::Runtime& runtime) override
                 {
-                    std::string name = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view name = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
                     MWBase::Environment::get().getScriptManager()->getGlobalScripts().removeScript (name);
                 }
@@ -206,13 +206,13 @@ namespace MWScript
 
             void execute (Interpreter::Runtime& runtime) override
             {
-                std::string name = runtime.getStringLiteral (runtime[0].mInteger);
+                std::string_view name = runtime.getStringLiteral(runtime[0].mInteger);
                 runtime.pop();
 
                 bool allowSkipping = runtime[0].mInteger != 0;
                 runtime.pop();
 
-                MWBase::Environment::get().getWindowManager()->playVideo (name, allowSkipping);
+                MWBase::Environment::get().getWindowManager()->playVideo({name.begin(), name.end()}, allowSkipping);
             }
         };
 
@@ -548,7 +548,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string effect = runtime.getStringLiteral(runtime[0].mInteger);
+                    std::string_view effect = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     if (!ptr.getClass().isActor())
@@ -558,9 +558,9 @@ namespace MWScript
                     }
 
                     char *end;
-                    long key = strtol(effect.c_str(), &end, 10);
+                    long key = strtol(effect.data(), &end, 10);
                     if(key < 0 || key > 32767 || *end != '\0')
-                        key = ESM::MagicEffect::effectStringToId(effect);
+                        key = ESM::MagicEffect::effectStringToId({effect.begin(), effect.end()});
 
                     const MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
 
@@ -587,10 +587,11 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string creature = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view creatureView = runtime.getStringLiteral(runtime[0].mInteger);
+                    std::string creature{creatureView.begin(), creatureView.end()};
                     runtime.pop();
 
-                    std::string gem = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view gem = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     if (!ptr.getClass().hasInventoryStore(ptr))
@@ -599,7 +600,7 @@ namespace MWScript
                     const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
                     store.get<ESM::Creature>().find(creature); // This line throws an exception if it can't find the creature
 
-                    MWWorld::Ptr item = *ptr.getClass().getContainerStore(ptr).add(gem, 1, ptr);
+                    MWWorld::Ptr item = *ptr.getClass().getContainerStore(ptr).add({gem.begin(), gem.end()}, 1, ptr);
 
                     // Set the soul on just one of the gems, not the whole stack
                     item.getContainerStore()->unstack(item, ptr);
@@ -619,7 +620,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string soul = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view soul = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     // throw away additional arguments
@@ -651,7 +652,7 @@ namespace MWScript
 
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string item = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view item = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     Interpreter::Type_Integer amount = runtime[0].mInteger;
@@ -738,7 +739,7 @@ namespace MWScript
 
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string soul = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view soul = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     if (!ptr.getClass().hasInventoryStore(ptr))
@@ -806,7 +807,7 @@ namespace MWScript
                 void execute (Interpreter::Runtime& runtime) override
                 {
                     MWWorld::Ptr ptr = R()(runtime);
-                    std::string id = runtime.getStringLiteral(runtime[0].mInteger);
+                    std::string_view id = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     if (!ptr.getClass().isActor())
@@ -973,7 +974,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string objectID = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view objectID = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     MWMechanics::CreatureStats &stats = ptr.getClass().getCreatureStats(ptr);
@@ -993,7 +994,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string objectID = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view objectID = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     MWMechanics::CreatureStats &stats = ptr.getClass().getCreatureStats(ptr);
@@ -1036,7 +1037,7 @@ namespace MWScript
             void execute (Interpreter::Runtime& runtime) override
             {
                 MWWorld::Ptr ptr = R()(runtime, false);
-                std::string var = runtime.getStringLiteral(runtime[0].mInteger);
+                std::string_view var = runtime.getStringLiteral(runtime[0].mInteger);
                 runtime.pop();
 
                 std::stringstream output;
@@ -1213,22 +1214,22 @@ namespace MWScript
             {
                 MWWorld::Ptr ptr = R()(runtime);
 
-                std::string spellId = runtime.getStringLiteral (runtime[0].mInteger);
+                std::string_view spellId = runtime.getStringLiteral(runtime[0].mInteger);
                 runtime.pop();
 
-                std::string targetId = ::Misc::StringUtils::lowerCase(runtime.getStringLiteral (runtime[0].mInteger));
+                std::string targetId = ::Misc::StringUtils::lowerCase(runtime.getStringLiteral(runtime[0].mInteger));
                 runtime.pop();
 
-                const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(spellId);
+                const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search({spellId.begin(), spellId.end()});
                 if (!spell)
                 {
-                    runtime.getContext().report("spellcasting failed: cannot find spell \""+spellId+"\"");
+                    runtime.getContext().report("spellcasting failed: cannot find spell \""+std::string{spellId.begin(), spellId.end()}+"\"");
                     return;
                 }
 
                 if (ptr == MWMechanics::getPlayer())
                 {
-                    MWBase::Environment::get().getWorld()->getPlayer().setSelectedSpell(spellId);
+                    MWBase::Environment::get().getWorld()->getPlayer().setSelectedSpell(spell->mId);
                     return;
                 }
 
@@ -1236,7 +1237,7 @@ namespace MWScript
                 {
                     if (!MWBase::Environment::get().getMechanicsManager()->isCastingSpell(ptr))
                     {
-                        MWMechanics::AiCast castPackage(targetId, spellId, true);
+                        MWMechanics::AiCast castPackage(targetId, spell->mId, true);
                         ptr.getClass().getCreatureStats (ptr).getAiSequence().stack(castPackage, ptr);
                     }
                     return;
@@ -1262,19 +1263,19 @@ namespace MWScript
             {
                 MWWorld::Ptr ptr = R()(runtime);
 
-                std::string spellId = runtime.getStringLiteral (runtime[0].mInteger);
+                std::string_view spellId = runtime.getStringLiteral(runtime[0].mInteger);
                 runtime.pop();
 
-                const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(spellId);
+                const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search({spellId.begin(), spellId.end()});
                 if (!spell)
                 {
-                    runtime.getContext().report("spellcasting failed: cannot find spell \""+spellId+"\"");
+                    runtime.getContext().report("spellcasting failed: cannot find spell \""+std::string{spellId.begin(), spellId.end()}+"\"");
                     return;
                 }
 
                 if (ptr == MWMechanics::getPlayer())
                 {
-                    MWBase::Environment::get().getWorld()->getPlayer().setSelectedSpell(spellId);
+                    MWBase::Environment::get().getWorld()->getPlayer().setSelectedSpell(spell->mId);
                     return;
                 }
 
@@ -1282,7 +1283,7 @@ namespace MWScript
                 {
                     if (!MWBase::Environment::get().getMechanicsManager()->isCastingSpell(ptr))
                     {
-                        MWMechanics::AiCast castPackage(ptr.getCellRef().getRefId(), spellId, true);
+                        MWMechanics::AiCast castPackage(ptr.getCellRef().getRefId(), spell->mId, true);
                         ptr.getClass().getCreatureStats (ptr).getAiSequence().stack(castPackage, ptr);
                     }
                     return;
@@ -1407,7 +1408,7 @@ namespace MWScript
 
                 while (arg0 > 0)
                 {
-                    std::string notes = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view notes = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
                     if (!notes.empty())
                         msg << "Notes: " << notes << std::endl;
@@ -1425,14 +1426,14 @@ namespace MWScript
         public:
             void execute(Interpreter::Runtime &runtime) override
             {
-                const std::string& levId = runtime.getStringLiteral(runtime[0].mInteger);
+                std::string_view levId = runtime.getStringLiteral(runtime[0].mInteger);
                 runtime.pop();
-                const std::string& creatureId = runtime.getStringLiteral(runtime[0].mInteger);
+                std::string_view creatureId = runtime.getStringLiteral(runtime[0].mInteger);
                 runtime.pop();
                 int level = runtime[0].mInteger;
                 runtime.pop();
 
-                ESM::CreatureLevList listCopy = *MWBase::Environment::get().getWorld()->getStore().get<ESM::CreatureLevList>().find(levId);
+                ESM::CreatureLevList listCopy = *MWBase::Environment::get().getWorld()->getStore().get<ESM::CreatureLevList>().find({levId.begin(), levId.end()});
                 addToLevList(&listCopy, creatureId, level);
                 MWBase::Environment::get().getWorld()->createOverrideRecord(listCopy);
             }
@@ -1443,14 +1444,14 @@ namespace MWScript
         public:
             void execute(Interpreter::Runtime &runtime) override
             {
-                const std::string& levId = runtime.getStringLiteral(runtime[0].mInteger);
+                std::string_view levId = runtime.getStringLiteral(runtime[0].mInteger);
                 runtime.pop();
-                const std::string& creatureId = runtime.getStringLiteral(runtime[0].mInteger);
+                std::string_view creatureId = runtime.getStringLiteral(runtime[0].mInteger);
                 runtime.pop();
                 int level = runtime[0].mInteger;
                 runtime.pop();
 
-                ESM::CreatureLevList listCopy = *MWBase::Environment::get().getWorld()->getStore().get<ESM::CreatureLevList>().find(levId);
+                ESM::CreatureLevList listCopy = *MWBase::Environment::get().getWorld()->getStore().get<ESM::CreatureLevList>().find({levId.begin(), levId.end()});
                 removeFromLevList(&listCopy, creatureId, level);
                 MWBase::Environment::get().getWorld()->createOverrideRecord(listCopy);
             }
@@ -1461,14 +1462,14 @@ namespace MWScript
         public:
             void execute(Interpreter::Runtime &runtime) override
             {
-                const std::string& levId = runtime.getStringLiteral(runtime[0].mInteger);
+                std::string_view levId = runtime.getStringLiteral(runtime[0].mInteger);
                 runtime.pop();
-                const std::string& itemId = runtime.getStringLiteral(runtime[0].mInteger);
+                std::string_view itemId = runtime.getStringLiteral(runtime[0].mInteger);
                 runtime.pop();
                 int level = runtime[0].mInteger;
                 runtime.pop();
 
-                ESM::ItemLevList listCopy = *MWBase::Environment::get().getWorld()->getStore().get<ESM::ItemLevList>().find(levId);
+                ESM::ItemLevList listCopy = *MWBase::Environment::get().getWorld()->getStore().get<ESM::ItemLevList>().find({levId.begin(), levId.end()});
                 addToLevList(&listCopy, itemId, level);
                 MWBase::Environment::get().getWorld()->createOverrideRecord(listCopy);
             }
@@ -1479,14 +1480,14 @@ namespace MWScript
         public:
             void execute(Interpreter::Runtime &runtime) override
             {
-                const std::string& levId = runtime.getStringLiteral(runtime[0].mInteger);
+                std::string_view levId = runtime.getStringLiteral(runtime[0].mInteger);
                 runtime.pop();
-                const std::string& itemId = runtime.getStringLiteral(runtime[0].mInteger);
+                std::string_view itemId = runtime.getStringLiteral(runtime[0].mInteger);
                 runtime.pop();
                 int level = runtime[0].mInteger;
                 runtime.pop();
 
-                ESM::ItemLevList listCopy = *MWBase::Environment::get().getWorld()->getStore().get<ESM::ItemLevList>().find(levId);
+                ESM::ItemLevList listCopy = *MWBase::Environment::get().getWorld()->getStore().get<ESM::ItemLevList>().find({levId.begin(), levId.end()});
                 removeFromLevList(&listCopy, itemId, level);
                 MWBase::Environment::get().getWorld()->createOverrideRecord(listCopy);
             }
diff --git a/apps/openmw/mwscript/ref.cpp b/apps/openmw/mwscript/ref.cpp
index 6347c2c2e5..145cd2cd25 100644
--- a/apps/openmw/mwscript/ref.cpp
+++ b/apps/openmw/mwscript/ref.cpp
@@ -10,7 +10,7 @@
 MWWorld::Ptr MWScript::ExplicitRef::operator() (Interpreter::Runtime& runtime, bool required,
     bool activeOnly) const
 {
-    std::string id = runtime.getStringLiteral(runtime[0].mInteger);
+    std::string_view id = runtime.getStringLiteral(runtime[0].mInteger);
     runtime.pop();
 
     if (required)
diff --git a/apps/openmw/mwscript/skyextensions.cpp b/apps/openmw/mwscript/skyextensions.cpp
index 1d00b8c052..b7b79f8ed4 100644
--- a/apps/openmw/mwscript/skyextensions.cpp
+++ b/apps/openmw/mwscript/skyextensions.cpp
@@ -87,7 +87,8 @@ namespace MWScript
 
                 void execute (Interpreter::Runtime& runtime) override
                 {
-                    std::string region = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view regionView = runtime.getStringLiteral(runtime[0].mInteger);
+                    std::string region{regionView.begin(), regionView.end()};
                     runtime.pop();
 
                     Interpreter::Type_Integer id = runtime[0].mInteger;
@@ -107,7 +108,8 @@ namespace MWScript
 
                 void execute (Interpreter::Runtime& runtime, unsigned int arg0) override
                 {
-                    std::string region = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view regionView = runtime.getStringLiteral(runtime[0].mInteger);
+                    std::string region{regionView.begin(), regionView.end()};
                     runtime.pop();
 
                     std::vector<char> chances;
diff --git a/apps/openmw/mwscript/soundextensions.cpp b/apps/openmw/mwscript/soundextensions.cpp
index b8d1470ea8..42bb59d1ec 100644
--- a/apps/openmw/mwscript/soundextensions.cpp
+++ b/apps/openmw/mwscript/soundextensions.cpp
@@ -33,16 +33,16 @@ namespace MWScript
                     MWScript::InterpreterContext& context
                         = static_cast<MWScript::InterpreterContext&> (runtime.getContext());
 
-                    std::string file = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view file = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
-                    std::string text = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view text = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
-                    MWBase::Environment::get().getSoundManager()->say (ptr, file);
+                    MWBase::Environment::get().getSoundManager()->say(ptr, {file.begin(), file.end()});
 
                     if (MWBase::Environment::get().getWindowManager ()->getSubtitlesEnabled())
-                        context.messageBox (text);
+                        context.messageBox({text.begin(), text.end()});
                 }
         };
 
@@ -65,10 +65,10 @@ namespace MWScript
 
                 void execute (Interpreter::Runtime& runtime) override
                 {
-                    std::string sound = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view sound = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
-                    MWBase::Environment::get().getSoundManager()->streamMusic (sound);
+                    MWBase::Environment::get().getSoundManager()->streamMusic({sound.begin(), sound.end()});
                 }
         };
 
@@ -78,7 +78,7 @@ namespace MWScript
 
                 void execute (Interpreter::Runtime& runtime) override
                 {
-                    std::string sound = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view sound = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     MWBase::Environment::get().getSoundManager()->playSound(sound, 1.0, 1.0, MWSound::Type::Sfx, MWSound::PlayMode::NoEnv);
@@ -91,7 +91,7 @@ namespace MWScript
 
                 void execute (Interpreter::Runtime& runtime) override
                 {
-                    std::string sound = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view sound = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     Interpreter::Type_Float volume = runtime[0].mFloat;
@@ -113,7 +113,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string sound = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view sound = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     MWBase::Environment::get().getSoundManager()->playSound3D(ptr, sound, 1.0, 1.0,
@@ -132,7 +132,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string sound = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view sound = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     Interpreter::Type_Float volume = runtime[0].mFloat;
@@ -158,7 +158,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string sound = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view sound = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     MWBase::Environment::get().getSoundManager()->stopSound3D (ptr, sound);
diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp
index 9a9a315bdb..1df763cf8e 100644
--- a/apps/openmw/mwscript/statsextensions.cpp
+++ b/apps/openmw/mwscript/statsextensions.cpp
@@ -447,13 +447,13 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string id = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view id = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
-                    const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find (id);
+                    const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find({id.begin(), id.end()});
 
                     MWMechanics::CreatureStats& creatureStats = ptr.getClass().getCreatureStats(ptr);
-                    creatureStats.getSpells().add(id);
+                    creatureStats.getSpells().add(spell);
                     ESM::Spell::SpellType type = static_cast<ESM::Spell::SpellType>(spell->mData.mType);
                     if (type != ESM::Spell::ST_Spell && type != ESM::Spell::ST_Power)
                     {
@@ -474,11 +474,11 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string id = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view id = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     MWMechanics::CreatureStats& creatureStats = ptr.getClass().getCreatureStats(ptr);
-                    creatureStats.getSpells().remove (id);
+                    creatureStats.getSpells().remove({id.begin(), id.end()});
 
                     MWBase::WindowManager *wm = MWBase::Environment::get().getWindowManager();
 
@@ -499,7 +499,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string spellid = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view spellid = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     ptr.getClass().getCreatureStats (ptr).getActiveSpells().removeEffects(ptr, spellid);
@@ -532,12 +532,12 @@ namespace MWScript
 
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string id = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view id = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     Interpreter::Type_Integer value = 0;
 
-                    if (ptr.getClass().isActor() && ptr.getClass().getCreatureStats(ptr).getSpells().hasSpell(id))
+                    if (ptr.getClass().isActor() && ptr.getClass().getCreatureStats(ptr).getSpells().hasSpell({id.begin(), id.end()}))
                         value = 1;
 
                     runtime.push (value);
@@ -748,8 +748,8 @@ namespace MWScript
 
                 void execute (Interpreter::Runtime& runtime) override
                 {
-                    std::string id = runtime.getStringLiteral (runtime[0].mInteger);
-                    runtime[0].mInteger = MWBase::Environment::get().getMechanicsManager()->countDeaths (id);
+                    std::string_view id = runtime.getStringLiteral(runtime[0].mInteger);
+                    runtime[0].mInteger = MWBase::Environment::get().getMechanicsManager()->countDeaths({id.begin(), id.end()});
                 }
         };
 
@@ -890,14 +890,12 @@ namespace MWScript
                 {
                     MWWorld::ConstPtr ptr = R()(runtime);
 
-                    std::string race = runtime.getStringLiteral(runtime[0].mInteger);
-                    ::Misc::StringUtils::lowerCaseInPlace(race);
+                    std::string_view race = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
-                    std::string npcRace = ptr.get<ESM::NPC>()->mBase->mRace;
-                    ::Misc::StringUtils::lowerCaseInPlace(npcRace);
+                    const std::string& npcRace = ptr.get<ESM::NPC>()->mBase->mRace;
 
-                    runtime.push (npcRace == race);
+                    runtime.push(::Misc::StringUtils::ciEqual(race, npcRace));
             }
         };
 
diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index d87888c282..8617d7eedd 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -43,7 +43,7 @@ namespace MWScript
                 void execute (Interpreter::Runtime& runtime) override
                 {
                     MWWorld::Ptr from = R()(runtime, !R::implicit);
-                    std::string name = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view name = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     if (from.isEmpty())
@@ -74,7 +74,8 @@ namespace MWScript
                     const MWWorld::Ptr to = MWBase::Environment::get().getWorld()->searchPtr(name, false);
                     if (to.isEmpty())
                     {
-                        std::string error = "Failed to find an instance of object '" + name + "'";
+                        std::string error = "Failed to find an instance of object '";
+                        error += name; error += "'";
                         runtime.getContext().report(error);
                         Log(Debug::Error) << error;
                         runtime.push(0.f);
@@ -155,7 +156,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string axis = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view axis = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
                     Interpreter::Type_Float angle = osg::DegreesToRadians(runtime[0].mFloat);
                     runtime.pop();
@@ -190,7 +191,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string axis = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view axis = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     float ret = 0.f;
@@ -222,7 +223,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string axis = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view axis = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     float ret = 0.f;
@@ -254,7 +255,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string axis = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view axis = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     float ret = 0.f;
@@ -286,7 +287,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string axis = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view axis = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
                     Interpreter::Type_Float pos = runtime[0].mFloat;
                     runtime.pop();
@@ -340,7 +341,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string axis = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view axis = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     float ret = 0.f;
@@ -380,7 +381,8 @@ namespace MWScript
                     runtime.pop();
                     Interpreter::Type_Float zRot = runtime[0].mFloat;
                     runtime.pop();
-                    std::string cellID = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view cellIDView = runtime.getStringLiteral(runtime[0].mInteger);
+                    std::string cellID{cellIDView.begin(), cellIDView.end()};
                     runtime.pop();
 
                     if (ptr.getContainerStore())
@@ -495,9 +497,10 @@ namespace MWScript
 
                 void execute (Interpreter::Runtime& runtime) override
                 {
-                    std::string itemID = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view itemID = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
-                    std::string cellID = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view cellIDView = runtime.getStringLiteral(runtime[0].mInteger);
+                    std::string cellID{cellIDView.begin(), cellIDView.end()};
                     runtime.pop();
 
                     Interpreter::Type_Float x = runtime[0].mFloat;
@@ -549,7 +552,7 @@ namespace MWScript
 
                 void execute (Interpreter::Runtime& runtime) override
                 {
-                    std::string itemID = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view itemID = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     Interpreter::Type_Float x = runtime[0].mFloat;
@@ -601,7 +604,7 @@ namespace MWScript
                         ? MWMechanics::getPlayer()
                         : R()(runtime);
 
-                    std::string itemID = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view itemID = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
                     Interpreter::Type_Integer count = runtime[0].mInteger;
@@ -641,7 +644,7 @@ namespace MWScript
                 {
                     const MWWorld::Ptr& ptr = R()(runtime);
 
-                    std::string axis = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view axis = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
                     Interpreter::Type_Float rotation = osg::DegreesToRadians(runtime[0].mFloat*MWBase::Environment::get().getFrameDuration());
                     runtime.pop();
@@ -667,7 +670,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string axis = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view axis = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
                     Interpreter::Type_Float rotation = osg::DegreesToRadians(runtime[0].mFloat*MWBase::Environment::get().getFrameDuration());
                     runtime.pop();
@@ -726,7 +729,7 @@ namespace MWScript
                     if (!ptr.isInCell())
                         return;
 
-                    std::string axis = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view axis = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
                     Interpreter::Type_Float movement = (runtime[0].mFloat*MWBase::Environment::get().getFrameDuration());
                     runtime.pop();
@@ -773,7 +776,7 @@ namespace MWScript
                     if (!ptr.isInCell())
                         return;
 
-                    std::string axis = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string_view axis = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
                     Interpreter::Type_Float movement = (runtime[0].mFloat*MWBase::Environment::get().getFrameDuration());
                     runtime.pop();
diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index 5399b95c97..5523391de0 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -489,7 +489,7 @@ namespace MWSound
     }
 
 
-    Sound* SoundManager::playSound(const std::string& soundId, float volume, float pitch, Type type, PlayMode mode, float offset)
+    Sound* SoundManager::playSound(std::string_view soundId, float volume, float pitch, Type type, PlayMode mode, float offset)
     {
         if(!mOutput->isInitialized())
             return nullptr;
@@ -518,7 +518,7 @@ namespace MWSound
         return result;
     }
 
-    Sound *SoundManager::playSound3D(const MWWorld::ConstPtr &ptr, const std::string& soundId,
+    Sound *SoundManager::playSound3D(const MWWorld::ConstPtr &ptr, std::string_view soundId,
                                      float volume, float pitch, Type type, PlayMode mode,
                                      float offset)
     {
@@ -576,7 +576,7 @@ namespace MWSound
         return result;
     }
 
-    Sound *SoundManager::playSound3D(const osg::Vec3f& initialPos, const std::string& soundId,
+    Sound *SoundManager::playSound3D(const osg::Vec3f& initialPos, std::string_view soundId,
                                      float volume, float pitch, Type type, PlayMode mode,
                                      float offset)
     {
@@ -630,7 +630,7 @@ namespace MWSound
         }
     }
 
-    void SoundManager::stopSound3D(const MWWorld::ConstPtr &ptr, const std::string& soundId)
+    void SoundManager::stopSound3D(const MWWorld::ConstPtr &ptr, std::string_view soundId)
     {
         if(!mOutput->isInitialized())
             return;
@@ -682,7 +682,7 @@ namespace MWSound
     }
 
     void SoundManager::fadeOutSound3D(const MWWorld::ConstPtr &ptr,
-            const std::string& soundId, float duration)
+            std::string_view soundId, float duration)
     {
         SoundMap::iterator snditer = mActiveSounds.find(ptr);
         if(snditer != mActiveSounds.end())
@@ -698,7 +698,7 @@ namespace MWSound
         }
     }
 
-    bool SoundManager::getSoundPlaying(const MWWorld::ConstPtr &ptr, const std::string& soundId) const
+    bool SoundManager::getSoundPlaying(const MWWorld::ConstPtr &ptr, std::string_view soundId) const
     {
         SoundMap::const_iterator snditer = mActiveSounds.find(ptr);
         if(snditer != mActiveSounds.end())
diff --git a/apps/openmw/mwsound/soundmanagerimp.hpp b/apps/openmw/mwsound/soundmanagerimp.hpp
index d03059ba3e..0c29884425 100644
--- a/apps/openmw/mwsound/soundmanagerimp.hpp
+++ b/apps/openmw/mwsound/soundmanagerimp.hpp
@@ -198,17 +198,17 @@ namespace MWSound
         /// returned by \ref playTrack). Only intended to be called by the track
         /// decoder's read method.
 
-        Sound *playSound(const std::string& soundId, float volume, float pitch, Type type=Type::Sfx, PlayMode mode=PlayMode::Normal, float offset=0) override;
+        Sound *playSound(std::string_view soundId, float volume, float pitch, Type type=Type::Sfx, PlayMode mode=PlayMode::Normal, float offset=0) override;
         ///< Play a sound, independently of 3D-position
         ///< @param offset Number of seconds into the sound to start playback.
 
-        Sound *playSound3D(const MWWorld::ConstPtr &reference, const std::string& soundId,
+        Sound *playSound3D(const MWWorld::ConstPtr &reference, std::string_view soundId,
                                    float volume, float pitch, Type type=Type::Sfx,
                                    PlayMode mode=PlayMode::Normal, float offset=0) override;
         ///< Play a 3D sound attached to an MWWorld::Ptr. Will be updated automatically with the Ptr's position, unless Play_NoTrack is specified.
         ///< @param offset Number of seconds into the sound to start playback.
 
-        Sound *playSound3D(const osg::Vec3f& initialPos, const std::string& soundId,
+        Sound *playSound3D(const osg::Vec3f& initialPos, std::string_view soundId,
                                    float volume, float pitch, Type type, PlayMode mode, float offset=0) override;
         ///< Play a 3D sound at \a initialPos. If the sound should be moving, it must be updated using Sound::setPosition.
         ///< @param offset Number of seconds into the sound to start playback.
@@ -217,7 +217,7 @@ namespace MWSound
         ///< Stop the given sound from playing
         /// @note no-op if \a sound is null
 
-        void stopSound3D(const MWWorld::ConstPtr &reference, const std::string& soundId) override;
+        void stopSound3D(const MWWorld::ConstPtr &reference, std::string_view soundId) override;
         ///< Stop the given object from playing the given sound,
 
         void stopSound3D(const MWWorld::ConstPtr &reference) override;
@@ -226,13 +226,13 @@ namespace MWSound
         void stopSound(const MWWorld::CellStore *cell) override;
         ///< Stop all sounds for the given cell.
 
-        void fadeOutSound3D(const MWWorld::ConstPtr &reference, const std::string& soundId, float duration) override;
+        void fadeOutSound3D(const MWWorld::ConstPtr &reference, std::string_view soundId, float duration) override;
         ///< Fade out given sound (that is already playing) of given object
         ///< @param reference Reference to object, whose sound is faded out
         ///< @param soundId ID of the sound to fade out.
         ///< @param duration Time until volume reaches 0.
 
-        bool getSoundPlaying(const MWWorld::ConstPtr &reference, const std::string& soundId) const override;
+        bool getSoundPlaying(const MWWorld::ConstPtr &reference, std::string_view soundId) const override;
         ///< Is the given sound currently playing on the given object?
 
         void pauseSounds(MWSound::BlockerType blocker, int types=int(Type::Mask)) override;
diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index a096231f2d..aee110286e 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -179,7 +179,7 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::end()
     return ContainerStoreIterator (this);
 }
 
-int MWWorld::ContainerStore::count(const std::string &id) const
+int MWWorld::ContainerStore::count(std::string_view id) const
 {
     int total=0;
     for (const auto&& iter : *this)
@@ -457,7 +457,7 @@ void MWWorld::ContainerStore::updateRechargingItems()
     }
 }
 
-int MWWorld::ContainerStore::remove(const std::string& itemId, int count, const Ptr& actor, bool equipReplacement, bool resolveFirst)
+int MWWorld::ContainerStore::remove(std::string_view itemId, int count, const Ptr& actor, bool equipReplacement, bool resolveFirst)
 {
     if(resolveFirst)
         resolve();
diff --git a/apps/openmw/mwworld/containerstore.hpp b/apps/openmw/mwworld/containerstore.hpp
index 92c28bbcb5..38ae933581 100644
--- a/apps/openmw/mwworld/containerstore.hpp
+++ b/apps/openmw/mwworld/containerstore.hpp
@@ -178,7 +178,7 @@ namespace MWWorld
             ContainerStoreIterator add(const std::string& id, int count, const Ptr& actorPtr);
             ///< Utility to construct a ManualRef and call add(ptr, count, actorPtr, true)
 
-            int remove(const std::string& itemId, int count, const Ptr& actor, bool equipReplacement = 0, bool resolve = true);
+            int remove(std::string_view itemId, int count, const Ptr& actor, bool equipReplacement = 0, bool resolve = true);
             ///< Remove \a count item(s) designated by \a itemId from this container.
             ///
             /// @return the number of items actually removed
@@ -201,7 +201,7 @@ namespace MWWorld
             /// If a compatible stack is found, the item's count is added to that stack, then the original is deleted.
             /// @return If the item was stacked, return the stack, otherwise return the old (untouched) item.
 
-            int count (const std::string& id) const;
+            int count(std::string_view id) const;
             ///< @return How many items with refID \a id are in this container?
 
             ContainerStoreListener* getContListener() const;
diff --git a/apps/openmw/mwworld/datetimemanager.cpp b/apps/openmw/mwworld/datetimemanager.cpp
index 0894c974d3..67d1ce1fbc 100644
--- a/apps/openmw/mwworld/datetimemanager.cpp
+++ b/apps/openmw/mwworld/datetimemanager.cpp
@@ -159,7 +159,7 @@ namespace MWWorld
         return setting->mValue.getString();
     }
 
-    bool DateTimeManager::updateGlobalFloat(const std::string& name, float value)
+    bool DateTimeManager::updateGlobalFloat(std::string_view name, float value)
     {
         if (name=="gamehour")
         {
@@ -192,7 +192,7 @@ namespace MWWorld
         return false;
     }
 
-    bool DateTimeManager::updateGlobalInt(const std::string& name, int value)
+    bool DateTimeManager::updateGlobalInt(std::string_view name, int value)
     {
         if (name=="gamehour")
         {
diff --git a/apps/openmw/mwworld/datetimemanager.hpp b/apps/openmw/mwworld/datetimemanager.hpp
index b460be746a..e48eec5184 100644
--- a/apps/openmw/mwworld/datetimemanager.hpp
+++ b/apps/openmw/mwworld/datetimemanager.hpp
@@ -35,8 +35,8 @@ namespace MWWorld
         void advanceTime(double hours, Globals& globalVariables);
 
         void setup(Globals& globalVariables);
-        bool updateGlobalInt(const std::string& name, int value);
-        bool updateGlobalFloat(const std::string& name, float value);
+        bool updateGlobalInt(std::string_view name, int value);
+        bool updateGlobalFloat(std::string_view name, float value);
     };
 }
 
diff --git a/apps/openmw/mwworld/globals.cpp b/apps/openmw/mwworld/globals.cpp
index cb1d26cb71..5b236996b3 100644
--- a/apps/openmw/mwworld/globals.cpp
+++ b/apps/openmw/mwworld/globals.cpp
@@ -10,22 +10,22 @@
 
 namespace MWWorld
 {
-    Globals::Collection::const_iterator Globals::find (const std::string& name) const
+    Globals::Collection::const_iterator Globals::find (std::string_view name) const
     {
         Collection::const_iterator iter = mVariables.find (Misc::StringUtils::lowerCase (name));
 
         if (iter==mVariables.end())
-            throw std::runtime_error ("unknown global variable: " + name);
+            throw std::runtime_error ("unknown global variable: " + std::string{name});
 
         return iter;
     }
 
-    Globals::Collection::iterator Globals::find (const std::string& name)
+    Globals::Collection::iterator Globals::find (std::string_view name)
     {
         Collection::iterator iter = mVariables.find (Misc::StringUtils::lowerCase (name));
 
         if (iter==mVariables.end())
-            throw std::runtime_error ("unknown global variable: " + name);
+            throw std::runtime_error ("unknown global variable: " + std::string{name});
 
         return iter;
     }
@@ -42,17 +42,17 @@ namespace MWWorld
         }
     }
 
-    const ESM::Variant& Globals::operator[] (const std::string& name) const
+    const ESM::Variant& Globals::operator[] (std::string_view name) const
     {
         return find (Misc::StringUtils::lowerCase (name))->second.mValue;
     }
 
-    ESM::Variant& Globals::operator[] (const std::string& name)
+    ESM::Variant& Globals::operator[] (std::string_view name)
     {
         return find (Misc::StringUtils::lowerCase (name))->second.mValue;
     }
 
-    char Globals::getType (const std::string& name) const
+    char Globals::getType (std::string_view name) const
     {
         Collection::const_iterator iter = mVariables.find (Misc::StringUtils::lowerCase (name));
 
diff --git a/apps/openmw/mwworld/globals.hpp b/apps/openmw/mwworld/globals.hpp
index 85cb7c39ce..ff9caadd73 100644
--- a/apps/openmw/mwworld/globals.hpp
+++ b/apps/openmw/mwworld/globals.hpp
@@ -32,17 +32,17 @@ namespace MWWorld
 
             Collection mVariables; // type, value
 
-            Collection::const_iterator find (const std::string& name) const;
+            Collection::const_iterator find (std::string_view name) const;
 
-            Collection::iterator find (const std::string& name);
+            Collection::iterator find (std::string_view name);
 
         public:
 
-            const ESM::Variant& operator[] (const std::string& name) const;
+            const ESM::Variant& operator[] (std::string_view name) const;
 
-            ESM::Variant& operator[] (const std::string& name);
+            ESM::Variant& operator[] (std::string_view name);
 
-            char getType (const std::string& name) const;
+            char getType (std::string_view name) const;
             ///< If there is no global variable with this name, ' ' is returned.
 
             void fill (const MWWorld::ESMStore& store);
diff --git a/apps/openmw/mwworld/manualref.cpp b/apps/openmw/mwworld/manualref.cpp
index 7f7fd60335..6afb3e4142 100644
--- a/apps/openmw/mwworld/manualref.cpp
+++ b/apps/openmw/mwworld/manualref.cpp
@@ -30,7 +30,7 @@ namespace
     }
 }
 
-MWWorld::ManualRef::ManualRef(const MWWorld::ESMStore& store, const std::string& name, const int count)
+MWWorld::ManualRef::ManualRef(const MWWorld::ESMStore& store, std::string_view name, const int count)
 {
     std::string lowerName = Misc::StringUtils::lowerCase(name);
     switch (store.find(lowerName))
diff --git a/apps/openmw/mwworld/manualref.hpp b/apps/openmw/mwworld/manualref.hpp
index 2fc5994710..84aa0751f2 100644
--- a/apps/openmw/mwworld/manualref.hpp
+++ b/apps/openmw/mwworld/manualref.hpp
@@ -17,7 +17,7 @@ namespace MWWorld
             ManualRef& operator= (const ManualRef&);
 
         public:
-            ManualRef(const MWWorld::ESMStore& store, const std::string& name, const int count = 1);
+            ManualRef(const MWWorld::ESMStore& store, std::string_view name, const int count = 1);
 
             const Ptr& getPtr() const
             {
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 8c1eb40c41..54dc94d0b0 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -656,7 +656,7 @@ namespace MWWorld
         return mWorldScene->hasCellChanged();
     }
 
-    void World::setGlobalInt (const std::string& name, int value)
+    void World::setGlobalInt(std::string_view name, int value)
     {
         bool dateUpdated = mCurrentDate->updateGlobalInt(name, value);
         if (dateUpdated)
@@ -665,7 +665,7 @@ namespace MWWorld
         mGlobalVariables[name].setInteger (value);
     }
 
-    void World::setGlobalFloat (const std::string& name, float value)
+    void World::setGlobalFloat(std::string_view name, float value)
     {
         bool dateUpdated = mCurrentDate->updateGlobalFloat(name, value);
         if (dateUpdated)
@@ -674,17 +674,17 @@ namespace MWWorld
         mGlobalVariables[name].setFloat(value);
     }
 
-    int World::getGlobalInt (const std::string& name) const
+    int World::getGlobalInt(std::string_view name) const
     {
         return mGlobalVariables[name].getInteger();
     }
 
-    float World::getGlobalFloat (const std::string& name) const
+    float World::getGlobalFloat(std::string_view name) const
     {
         return mGlobalVariables[name].getFloat();
     }
 
-    char World::getGlobalVariableType (const std::string& name) const
+    char World::getGlobalVariableType (std::string_view name) const
     {
         return mGlobalVariables.getType (name);
     }
@@ -719,7 +719,7 @@ namespace MWWorld
         mLocalScripts.remove (ref);
     }
 
-    Ptr World::searchPtr (const std::string& name, bool activeOnly, bool searchInContainers)
+    Ptr World::searchPtr (std::string_view name, bool activeOnly, bool searchInContainers)
     {
         Ptr ret;
         // the player is always in an active cell.
@@ -762,12 +762,13 @@ namespace MWWorld
         return ptr;
     }
 
-    Ptr World::getPtr (const std::string& name, bool activeOnly)
+    Ptr World::getPtr (std::string_view name, bool activeOnly)
     {
         Ptr ret = searchPtr(name, activeOnly);
         if (!ret.isEmpty())
             return ret;
-        std::string error = "failed to find an instance of object '" + name + "'";
+        std::string error = "failed to find an instance of object '";
+        error += name; error += "'";
         if (activeOnly)
             error += " in active cells";
         throw std::runtime_error(error);
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 088c4097aa..c6e316c25a 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -258,19 +258,19 @@ namespace MWWorld
             void getDoorMarkers (MWWorld::CellStore* cell, std::vector<DoorMarker>& out) override;
             ///< get a list of teleport door markers for a given cell, to be displayed on the local map
 
-            void setGlobalInt (const std::string& name, int value) override;
+            void setGlobalInt(std::string_view name, int value) override;
             ///< Set value independently from real type.
 
-            void setGlobalFloat (const std::string& name, float value) override;
+            void setGlobalFloat(std::string_view name, float value) override;
             ///< Set value independently from real type.
 
-            int getGlobalInt (const std::string& name) const override;
+            int getGlobalInt(std::string_view name) const override;
             ///< Get value independently from real type.
 
-            float getGlobalFloat (const std::string& name) const override;
+            float getGlobalFloat(std::string_view name) const override;
             ///< Get value independently from real type.
 
-            char getGlobalVariableType (const std::string& name) const override;
+            char getGlobalVariableType(std::string_view name) const override;
             ///< Return ' ', if there is no global variable with this name.
 
             std::string getCellName (const MWWorld::CellStore *cell = nullptr) const override;
@@ -283,11 +283,11 @@ namespace MWWorld
             void removeRefScript (MWWorld::RefData *ref) override;
             //< Remove the script attached to ref from mLocalScripts
 
-            Ptr getPtr (const std::string& name, bool activeOnly) override;
+            Ptr getPtr (std::string_view name, bool activeOnly) override;
             ///< Return a pointer to a liveCellRef with the given name.
             /// \param activeOnly do non search inactive cells.
 
-            Ptr searchPtr (const std::string& name, bool activeOnly, bool searchInContainers = false) override;
+            Ptr searchPtr (std::string_view name, bool activeOnly, bool searchInContainers = false) override;
             ///< Return a pointer to a liveCellRef with the given name.
             /// \param activeOnly do not search inactive cells.
 
diff --git a/apps/openmw_test_suite/mwscript/test_utils.hpp b/apps/openmw_test_suite/mwscript/test_utils.hpp
index f29cb7bb89..e0bf8d0440 100644
--- a/apps/openmw_test_suite/mwscript/test_utils.hpp
+++ b/apps/openmw_test_suite/mwscript/test_utils.hpp
@@ -102,12 +102,12 @@ namespace
 
     class GlobalVariables
     {
-        std::map<std::string, int> mShorts;
-        std::map<std::string, int> mLongs;
-        std::map<std::string, float> mFloats;
+        std::map<std::string, int, std::less<>> mShorts;
+        std::map<std::string, int, std::less<>> mLongs;
+        std::map<std::string, float, std::less<>> mFloats;
 
         template<class T>
-        T getGlobal(const std::string& name, const std::map<std::string, T>& map) const
+        T getGlobal(std::string_view name, const std::map<std::string, T, std::less<>>& map) const
         {
             auto it = map.find(name);
             if(it != map.end())
@@ -122,23 +122,23 @@ namespace
             mFloats.clear();
         }
 
-        int getShort(const std::string& name) const { return getGlobal(name, mShorts); };
+        int getShort(std::string_view name) const { return getGlobal(name, mShorts); };
 
-        int getLong(const std::string& name) const { return getGlobal(name, mLongs); };
+        int getLong(std::string_view name) const { return getGlobal(name, mLongs); };
 
-        float getFloat(const std::string& name) const { return getGlobal(name, mFloats); };
+        float getFloat(std::string_view name) const { return getGlobal(name, mFloats); };
 
-        void setShort(const std::string& name, int value) { mShorts[name] = value; };
+        void setShort(std::string_view name, int value) { mShorts[{name.begin(), name.end()}] = value; };
 
-        void setLong(const std::string& name, int value) { mLongs[name] = value; };
+        void setLong(std::string_view name, int value) { mLongs[{name.begin(), name.end()}] = value; };
 
-        void setFloat(const std::string& name, float value) { mFloats[name] = value; };
+        void setFloat(std::string_view name, float value) { mFloats[{name.begin(), name.end()}] = value; };
     };
 
     class TestInterpreterContext : public Interpreter::Context
     {
         LocalVariables mLocals;
-        std::map<std::string, GlobalVariables> mMembers;
+        std::map<std::string, GlobalVariables, std::less<>> mMembers;
     public:
         std::string getTarget() const override { return {}; };
 
@@ -158,23 +158,23 @@ namespace
 
         void report(const std::string& message) override {};
 
-        int getGlobalShort(const std::string& name) const override { return {}; };
+        int getGlobalShort(std::string_view name) const override { return {}; };
 
-        int getGlobalLong(const std::string& name) const override { return {}; };
+        int getGlobalLong(std::string_view name) const override { return {}; };
 
-        float getGlobalFloat(const std::string& name) const override { return {}; };
+        float getGlobalFloat(std::string_view name) const override { return {}; };
 
-        void setGlobalShort(const std::string& name, int value) override {};
+        void setGlobalShort(std::string_view name, int value) override {};
 
-        void setGlobalLong(const std::string& name, int value) override {};
+        void setGlobalLong(std::string_view name, int value) override {};
 
-        void setGlobalFloat(const std::string& name, float value) override {};
+        void setGlobalFloat(std::string_view name, float value) override {};
 
         std::vector<std::string> getGlobals() const override { return {}; };
 
-        char getGlobalType(const std::string& name) const override { return ' '; };
+        char getGlobalType(std::string_view name) const override { return ' '; };
 
-        std::string getActionBinding(const std::string& action) const override { return {}; };
+        std::string getActionBinding(std::string_view action) const override { return {}; };
 
         std::string getActorName() const override { return {}; };
 
@@ -200,7 +200,7 @@ namespace
 
         std::string getCurrentCellName() const override { return {}; };
 
-        int getMemberShort(const std::string& id, const std::string& name, bool global) const override
+        int getMemberShort(std::string_view id, std::string_view name, bool global) const override
         {
             auto it = mMembers.find(id);
             if(it != mMembers.end())
@@ -208,7 +208,7 @@ namespace
             return {};
         };
 
-        int getMemberLong(const std::string& id, const std::string& name, bool global) const override
+        int getMemberLong(std::string_view id, std::string_view name, bool global) const override
         {
             auto it = mMembers.find(id);
             if(it != mMembers.end())
@@ -216,7 +216,7 @@ namespace
             return {};
         };
 
-        float getMemberFloat(const std::string& id, const std::string& name, bool global) const override
+        float getMemberFloat(std::string_view id, std::string_view name, bool global) const override
         {
             auto it = mMembers.find(id);
             if(it != mMembers.end())
@@ -224,11 +224,11 @@ namespace
             return {};
         };
 
-        void setMemberShort(const std::string& id, const std::string& name, int value, bool global) override { mMembers[id].setShort(name, value); };
+        void setMemberShort(std::string_view id, std::string_view name, int value, bool global) override { mMembers[{id.begin(), id.end()}].setShort(name, value); };
 
-        void setMemberLong(const std::string& id, const std::string& name, int value, bool global) override { mMembers[id].setLong(name, value); };
+        void setMemberLong(std::string_view id, std::string_view name, int value, bool global) override { mMembers[{id.begin(), id.end()}].setLong(name, value); };
 
-        void setMemberFloat(const std::string& id, const std::string& name, float value, bool global) override { mMembers[id].setFloat(name, value); };
+        void setMemberFloat(std::string_view id, std::string_view name, float value, bool global) override { mMembers[{id.begin(), id.end()}].setFloat(name, value); };
     };
 
     struct CompiledScript
diff --git a/components/compiler/lineparser.hpp b/components/compiler/lineparser.hpp
index 2a0e5d6630..2fd113478f 100644
--- a/components/compiler/lineparser.hpp
+++ b/components/compiler/lineparser.hpp
@@ -86,7 +86,7 @@ namespace Compiler
             void visitedCharacter(char c) override {}
 
         public:
-            void process(const std::string& message) override
+            void process(std::string_view message) override
             {
                 mArguments.clear();
                 ::Misc::MessageFormatParser::process(message);
diff --git a/components/compiler/locals.cpp b/components/compiler/locals.cpp
index f31acb1a8b..8492b8649e 100644
--- a/components/compiler/locals.cpp
+++ b/components/compiler/locals.cpp
@@ -21,7 +21,7 @@ namespace Compiler
         throw std::logic_error ("Unknown variable type");
     }
 
-    int Locals::searchIndex (char type, const std::string& name) const
+    int Locals::searchIndex (char type, std::string_view name) const
     {
         const std::vector<std::string>& collection = get (type);
 
@@ -33,7 +33,7 @@ namespace Compiler
         return static_cast<int>(iter-collection.begin());
     }
 
-    bool Locals::search (char type, const std::string& name) const
+    bool Locals::search (char type, std::string_view name) const
     {
         return searchIndex (type, name)!=-1;
     }
@@ -50,7 +50,7 @@ namespace Compiler
         throw std::logic_error ("Unknown variable type");
     }
 
-    char Locals::getType (const std::string& name) const
+    char Locals::getType (std::string_view name) const
     {
         if (search ('s', name))
             return 's';
@@ -64,7 +64,7 @@ namespace Compiler
         return ' ';
     }
 
-    int Locals::getIndex (const std::string& name) const
+    int Locals::getIndex (std::string_view name) const
     {
         int index = searchIndex ('s', name);
 
@@ -94,7 +94,7 @@ namespace Compiler
             std::ostream_iterator<std::string> (localFile, " "));
     }
 
-    void Locals::declare (char type, const std::string& name)
+    void Locals::declare (char type, std::string_view name)
     {
         get (type).push_back (Misc::StringUtils::lowerCase (name));
     }
diff --git a/components/compiler/locals.hpp b/components/compiler/locals.hpp
index 1b2ae60426..7e6d4f0a45 100644
--- a/components/compiler/locals.hpp
+++ b/components/compiler/locals.hpp
@@ -19,24 +19,24 @@ namespace Compiler
 
         public:
 
-            char getType (const std::string& name) const;
+            char getType (std::string_view name) const;
             ///< 's': short, 'l': long, 'f': float, ' ': does not exist.
 
-            int getIndex (const std::string& name) const;
+            int getIndex (std::string_view name) const;
             ///< return index for local variable \a name (-1: does not exist).
 
-            bool search (char type, const std::string& name) const;
+            bool search (char type, std::string_view name) const;
 
             /// Return index for local variable \a name of type \a type (-1: variable does not
             /// exit).
-            int searchIndex (char type, const std::string& name) const;
+            int searchIndex (char type, std::string_view name) const;
 
             const std::vector<std::string>& get (char type) const;
 
             void write (std::ostream& localFile) const;
             ///< write declarations to file.
 
-            void declare (char type, const std::string& name);
+            void declare (char type, std::string_view name);
             ///< declares a variable.
 
             void clear();
diff --git a/components/interpreter/context.hpp b/components/interpreter/context.hpp
index 18d36ffee9..1ea98fd1a4 100644
--- a/components/interpreter/context.hpp
+++ b/components/interpreter/context.hpp
@@ -37,23 +37,23 @@ namespace Interpreter
 
             virtual void report (const std::string& message) = 0;
 
-            virtual int getGlobalShort (const std::string& name) const = 0;
+            virtual int getGlobalShort(std::string_view name) const = 0;
 
-            virtual int getGlobalLong (const std::string& name) const = 0;
+            virtual int getGlobalLong(std::string_view name) const = 0;
 
-            virtual float getGlobalFloat (const std::string& name) const = 0;
+            virtual float getGlobalFloat(std::string_view name) const = 0;
 
-            virtual void setGlobalShort (const std::string& name, int value) = 0;
+            virtual void setGlobalShort(std::string_view name, int value) = 0;
 
-            virtual void setGlobalLong (const std::string& name, int value) = 0;
+            virtual void setGlobalLong(std::string_view name, int value) = 0;
 
-            virtual void setGlobalFloat (const std::string& name, float value) = 0;
+            virtual void setGlobalFloat(std::string_view name, float value) = 0;
 
             virtual std::vector<std::string> getGlobals () const = 0;
 
-            virtual char getGlobalType (const std::string& name) const = 0;
+            virtual char getGlobalType(std::string_view name) const = 0;
 
-            virtual std::string getActionBinding(const std::string& action) const = 0;
+            virtual std::string getActionBinding(std::string_view action) const = 0;
 
             virtual std::string getActorName() const = 0;
 
@@ -79,17 +79,17 @@ namespace Interpreter
 
             virtual std::string getCurrentCellName() const = 0;
 
-            virtual int getMemberShort (const std::string& id, const std::string& name, bool global) const = 0;
+            virtual int getMemberShort(std::string_view id, std::string_view name, bool global) const = 0;
 
-            virtual int getMemberLong (const std::string& id, const std::string& name, bool global) const = 0;
+            virtual int getMemberLong(std::string_view id, std::string_view name, bool global) const = 0;
 
-            virtual float getMemberFloat (const std::string& id, const std::string& name, bool global) const = 0;
+            virtual float getMemberFloat(std::string_view id, std::string_view name, bool global) const = 0;
 
-            virtual void setMemberShort (const std::string& id, const std::string& name, int value, bool global) = 0;
+            virtual void setMemberShort(std::string_view id, std::string_view name, int value, bool global) = 0;
 
-            virtual void setMemberLong (const std::string& id, const std::string& name, int value, bool global) = 0;
+            virtual void setMemberLong(std::string_view id, std::string_view name, int value, bool global) = 0;
 
-            virtual void setMemberFloat (const std::string& id, const std::string& name, float value, bool global)
+            virtual void setMemberFloat(std::string_view id, std::string_view name, float value, bool global)
                 = 0;
     };
 }
diff --git a/components/interpreter/localopcodes.hpp b/components/interpreter/localopcodes.hpp
index 72a730ae99..6fe779493f 100644
--- a/components/interpreter/localopcodes.hpp
+++ b/components/interpreter/localopcodes.hpp
@@ -122,7 +122,7 @@ namespace Interpreter
                 Type_Integer data = runtime[0].mInteger;
                 int index = runtime[1].mInteger;
 
-                std::string name = runtime.getStringLiteral (index);
+                std::string_view name = runtime.getStringLiteral (index);
 
                 runtime.getContext().setGlobalShort (name, data);
 
@@ -140,7 +140,7 @@ namespace Interpreter
                 Type_Integer data = runtime[0].mInteger;
                 int index = runtime[1].mInteger;
 
-                std::string name = runtime.getStringLiteral (index);
+                std::string_view name = runtime.getStringLiteral (index);
 
                 runtime.getContext().setGlobalLong (name, data);
 
@@ -158,7 +158,7 @@ namespace Interpreter
                 Type_Float data = runtime[0].mFloat;
                 int index = runtime[1].mInteger;
 
-                std::string name = runtime.getStringLiteral (index);
+                std::string_view name = runtime.getStringLiteral (index);
 
                 runtime.getContext().setGlobalFloat (name, data);
 
@@ -174,7 +174,7 @@ namespace Interpreter
             void execute (Runtime& runtime) override
             {
                 int index = runtime[0].mInteger;
-                std::string name = runtime.getStringLiteral (index);
+                std::string_view name = runtime.getStringLiteral (index);
                 Type_Integer value = runtime.getContext().getGlobalShort (name);
                 runtime[0].mInteger = value;
             }
@@ -187,7 +187,7 @@ namespace Interpreter
             void execute (Runtime& runtime) override
             {
                 int index = runtime[0].mInteger;
-                std::string name = runtime.getStringLiteral (index);
+                std::string_view name = runtime.getStringLiteral (index);
                 Type_Integer value = runtime.getContext().getGlobalLong (name);
                 runtime[0].mInteger = value;
             }
@@ -200,7 +200,7 @@ namespace Interpreter
             void execute (Runtime& runtime) override
             {
                 int index = runtime[0].mInteger;
-                std::string name = runtime.getStringLiteral (index);
+                std::string_view name = runtime.getStringLiteral (index);
                 Type_Float value = runtime.getContext().getGlobalFloat (name);
                 runtime[0].mFloat = value;
             }
@@ -215,9 +215,9 @@ namespace Interpreter
             {
                 Type_Integer data = runtime[0].mInteger;
                 Type_Integer index = runtime[1].mInteger;
-                std::string id = runtime.getStringLiteral (index);
+                std::string_view id = runtime.getStringLiteral (index);
                 index = runtime[2].mInteger;
-                std::string variable = runtime.getStringLiteral (index);
+                std::string_view variable = runtime.getStringLiteral (index);
 
                 runtime.getContext().setMemberShort (id, variable, data, TGlobal);
 
@@ -236,9 +236,9 @@ namespace Interpreter
             {
                 Type_Integer data = runtime[0].mInteger;
                 Type_Integer index = runtime[1].mInteger;
-                std::string id = runtime.getStringLiteral (index);
+                std::string_view id = runtime.getStringLiteral (index);
                 index = runtime[2].mInteger;
-                std::string variable = runtime.getStringLiteral (index);
+                std::string_view variable = runtime.getStringLiteral (index);
 
                 runtime.getContext().setMemberLong (id, variable, data, TGlobal);
 
@@ -257,9 +257,9 @@ namespace Interpreter
             {
                 Type_Float data = runtime[0].mFloat;
                 Type_Integer index = runtime[1].mInteger;
-                std::string id = runtime.getStringLiteral (index);
+                std::string_view id = runtime.getStringLiteral (index);
                 index = runtime[2].mInteger;
-                std::string variable = runtime.getStringLiteral (index);
+                std::string_view variable = runtime.getStringLiteral (index);
 
                 runtime.getContext().setMemberFloat (id, variable, data, TGlobal);
 
@@ -277,9 +277,9 @@ namespace Interpreter
             void execute (Runtime& runtime) override
             {
                 Type_Integer index = runtime[0].mInteger;
-                std::string id = runtime.getStringLiteral (index);
+                std::string_view id = runtime.getStringLiteral (index);
                 index = runtime[1].mInteger;
-                std::string variable = runtime.getStringLiteral (index);
+                std::string_view variable = runtime.getStringLiteral (index);
                 runtime.pop();
 
                 int value = runtime.getContext().getMemberShort (id, variable, TGlobal);
@@ -295,9 +295,9 @@ namespace Interpreter
             void execute (Runtime& runtime) override
             {
                 Type_Integer index = runtime[0].mInteger;
-                std::string id = runtime.getStringLiteral (index);
+                std::string_view id = runtime.getStringLiteral (index);
                 index = runtime[1].mInteger;
-                std::string variable = runtime.getStringLiteral (index);
+                std::string_view variable = runtime.getStringLiteral (index);
                 runtime.pop();
 
                 int value = runtime.getContext().getMemberLong (id, variable, TGlobal);
@@ -313,9 +313,9 @@ namespace Interpreter
             void execute (Runtime& runtime) override
             {
                 Type_Integer index = runtime[0].mInteger;
-                std::string id = runtime.getStringLiteral (index);
+                std::string_view id = runtime.getStringLiteral (index);
                 index = runtime[1].mInteger;
-                std::string variable = runtime.getStringLiteral (index);
+                std::string_view variable = runtime.getStringLiteral (index);
                 runtime.pop();
 
                 float value = runtime.getContext().getMemberFloat (id, variable, TGlobal);
diff --git a/components/interpreter/miscopcodes.hpp b/components/interpreter/miscopcodes.hpp
index 5a9311346a..1a35dda0ce 100644
--- a/components/interpreter/miscopcodes.hpp
+++ b/components/interpreter/miscopcodes.hpp
@@ -97,7 +97,7 @@ namespace Interpreter
             {
             }
 
-            void process(const std::string& message) override
+            void process(std::string_view message) override
             {
                 mFormattedMessage.clear();
                 MessageFormatParser::process(message);
@@ -109,7 +109,7 @@ namespace Interpreter
             }
     };
 
-    inline std::string formatMessage (const std::string& message, Runtime& runtime)
+    inline std::string formatMessage (std::string_view message, Runtime& runtime)
     {
         RuntimeMessageFormatter formatter(runtime);
         formatter.process(message);
@@ -128,7 +128,7 @@ namespace Interpreter
                 // message
                 int index = runtime[0].mInteger;
                 runtime.pop();
-                std::string message = runtime.getStringLiteral (index);
+                std::string_view message = runtime.getStringLiteral (index);
 
                 // buttons
                 std::vector<std::string> buttons;
@@ -137,7 +137,8 @@ namespace Interpreter
                 {
                     index = runtime[0].mInteger;
                     runtime.pop();
-                    buttons.push_back (runtime.getStringLiteral (index));
+                    std::string_view button = runtime.getStringLiteral(index);
+                    buttons.emplace_back(button.begin(), button.end());
                 }
 
                 std::reverse (buttons.begin(), buttons.end());
@@ -158,7 +159,7 @@ namespace Interpreter
                 // message
                 int index = runtime[0].mInteger;
                 runtime.pop();
-                std::string message = runtime.getStringLiteral (index);
+                std::string_view message = runtime.getStringLiteral (index);
 
                 // handle additional parameters
                 std::string formattedMessage = formatMessage (message, runtime);
diff --git a/components/interpreter/runtime.cpp b/components/interpreter/runtime.cpp
index 8170526f35..d5bedfba57 100644
--- a/components/interpreter/runtime.cpp
+++ b/components/interpreter/runtime.cpp
@@ -33,7 +33,7 @@ namespace Interpreter
         return *reinterpret_cast<const float *> (&literalBlock[index]);
     }
 
-    std::string Runtime::getStringLiteral (int index) const
+    std::string_view Runtime::getStringLiteral(int index) const
     {
         if (index < 0 || static_cast<int> (mCode[3]) <= 0)
             throw std::out_of_range("out of range");
@@ -41,12 +41,12 @@ namespace Interpreter
         const char *literalBlock =
             reinterpret_cast<const char *> (mCode + 4 + mCode[0] + mCode[1] + mCode[2]);
 
-        int offset = 0;
+        size_t offset = 0;
 
         for (; index; --index)
         {
-            offset += static_cast<int>(std::strlen (literalBlock+offset)) + 1;
-            if (offset / 4 >= static_cast<int> (mCode[3]))
+            offset += std::strlen(literalBlock + offset) + 1;
+            if (offset / 4 >= mCode[3])
                 throw std::out_of_range("out of range");
         }
 
diff --git a/components/interpreter/runtime.hpp b/components/interpreter/runtime.hpp
index 2811ab0f0c..29f6168e57 100644
--- a/components/interpreter/runtime.hpp
+++ b/components/interpreter/runtime.hpp
@@ -31,7 +31,7 @@ namespace Interpreter
 
             float getFloatLiteral (int index) const;
 
-            std::string getStringLiteral (int index) const;
+            std::string_view getStringLiteral(int index) const;
 
             void configure (const Type_Code *code, int codeSize, Context& context);
             ///< \a context and \a code must exist as least until either configure, clear or
diff --git a/components/misc/messageformatparser.cpp b/components/misc/messageformatparser.cpp
index 6f0e471325..a40dcccd52 100644
--- a/components/misc/messageformatparser.cpp
+++ b/components/misc/messageformatparser.cpp
@@ -4,7 +4,7 @@ namespace Misc
 {
     MessageFormatParser::~MessageFormatParser() {}
 
-    void MessageFormatParser::process(const std::string& m)
+    void MessageFormatParser::process(std::string_view m)
     {
         for (unsigned int i = 0; i < m.size(); ++i)
         {
diff --git a/components/misc/messageformatparser.hpp b/components/misc/messageformatparser.hpp
index db2a8b0af4..16ced8d289 100644
--- a/components/misc/messageformatparser.hpp
+++ b/components/misc/messageformatparser.hpp
@@ -28,7 +28,7 @@ namespace Misc
         public:
             virtual ~MessageFormatParser();
 
-            virtual void process(const std::string& message);
+            virtual void process(std::string_view message);
     };
 }
 

From 395de4b251a2550aef92a221d3e60500e98de38f Mon Sep 17 00:00:00 2001
From: Matt <3397065-ZehMatt@users.noreply.gitlab.com>
Date: Sat, 21 May 2022 06:42:05 +0000
Subject: [PATCH 2482/2859] Refactor PostProcessor code

---
 apps/openmw/mwrender/postprocessor.cpp | 117 +++++++++++++------------
 apps/openmw/mwrender/postprocessor.hpp |   7 ++
 components/fx/technique.cpp            |  17 ++--
 components/fx/technique.hpp            |   7 +-
 components/settings/shadermanager.hpp  |   2 +-
 5 files changed, 79 insertions(+), 71 deletions(-)

diff --git a/apps/openmw/mwrender/postprocessor.cpp b/apps/openmw/mwrender/postprocessor.cpp
index 7e347bdf6d..a55fd3f38a 100644
--- a/apps/openmw/mwrender/postprocessor.cpp
+++ b/apps/openmw/mwrender/postprocessor.cpp
@@ -1,5 +1,6 @@
 #include "postprocessor.hpp"
 
+#include <algorithm>
 #include <SDL_opengl_glext.h>
 
 #include <osg/Texture1D>
@@ -172,6 +173,21 @@ namespace MWRender
             Stereo::Manager::instance().screenResolutionChanged();
     }
 
+    void PostProcessor::populateTechniqueFiles()
+    {
+        for (const auto& name : mVFS->getRecursiveDirectoryIterator(fx::Technique::sSubdir))
+        {
+            std::filesystem::path path = name;
+            std::string fileExt = Misc::StringUtils::lowerCase(path.extension().string());
+            if (!path.parent_path().has_parent_path() && fileExt == fx::Technique::sExt)
+            {
+                auto absolutePath = std::filesystem::path(mVFS->getAbsoluteFileName(name));
+
+                mTechniqueFileMap[absolutePath.stem().string()] = absolutePath;
+            }
+        }
+    }
+
     void PostProcessor::enable(bool usePostProcessing)
     {
         mReload = true;
@@ -193,17 +209,8 @@ namespace MWRender
 
         if (mUsePostProcessing && mTechniqueFileMap.empty())
         {
-            for (const auto& name : mVFS->getRecursiveDirectoryIterator(fx::Technique::sSubdir))
-            {
-                std::filesystem::path path = name;
-                std::string fileExt = Misc::StringUtils::lowerCase(path.extension().string());
-                if (!path.parent_path().has_parent_path() && fileExt == fx::Technique::sExt)
-                {
-                    auto absolutePath = std::filesystem::path(mVFS->getAbsoluteFileName(name));
+            populateTechniqueFiles();
 
-                    mTechniqueFileMap[absolutePath.stem().string()] = absolutePath;
-                }
-            }
         }
 
         mMainTemplate->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
@@ -357,47 +364,51 @@ namespace MWRender
         }
     }
 
-    void PostProcessor::update(size_t frameId)
+    void PostProcessor::updateLiveReload()
     {
         static const bool liveReload = Settings::Manager::getBool("live reload", "Post Processing");
+        if (!liveReload)
+            return;
 
-        if (liveReload)
+        for (auto& technique : mTechniques)
         {
-            for (auto& technique : mTechniques)
-            {
-                if (technique->getStatus() == fx::Technique::Status::File_Not_exists)
-                    continue;
-
-                technique->setLastModificationTime(std::filesystem::last_write_time(mTechniqueFileMap[technique->getName()]));
+            if (technique->getStatus() == fx::Technique::Status::File_Not_exists)
+                continue;
 
-                if(technique->isValid() && !technique->isDirty())
-                    continue;
+            const auto lastWriteTime = std::filesystem::last_write_time(mTechniqueFileMap[technique->getName()]);
+            const bool isDirty = technique->setLastModificationTime(lastWriteTime);
 
-                if (technique->isDirty())
-                {
-                    technique->compile();
+            if (technique->isValid() && !isDirty)
+                continue;
 
-                    if (technique->isValid())
-                        Log(Debug::Info) << "Reloaded technique : " << mTechniqueFileMap[technique->getName()].string();
+            if (technique->compile())
+                Log(Debug::Info) << "Reloaded technique : " << mTechniqueFileMap[technique->getName()].string();
 
-                    if (!mReload)
-                        mReload = technique->isValid();
-                }
-            }
+            mReload = technique->isValid();
         }
+    }
 
-        if (mReload)
-        {
-            mReload = false;
+    void PostProcessor::reloadIfRequired()
+    {
+        if (!mReload)
+            return;
 
-            if (!mTechniques.empty())
-                reloadMainPass(*mTechniques[0]);
+        mReload = false;
 
-            reloadTechniques();
+        if (!mTechniques.empty())
+            reloadMainPass(*mTechniques[0]);
 
-            if (!mUsePostProcessing)
-                resize();
-        }
+        reloadTechniques();
+
+        if (!mUsePostProcessing)
+            resize();
+    }
+
+    void PostProcessor::update(size_t frameId)
+    {
+        updateLiveReload();
+
+        reloadIfRequired();
 
         if (mDirty && mDirtyFrameId == frameId)
         {
@@ -647,29 +658,23 @@ namespace MWRender
 
     bool PostProcessor::disableTechnique(std::shared_ptr<fx::Technique> technique, bool dirty)
     {
-        for (size_t i = 1; i < mTechniques.size(); ++i)
-        {
-            if (technique.get() == mTechniques[i].get())
-            {
-                mTechniques.erase(mTechniques.begin() + i);
-                if (dirty)
-                    dirtyTechniques();
-                return true;
-            }
-        }
+        auto it = std::find(mTechniques.begin(), mTechniques.end(), technique);
+        if (it == std::end(mTechniques))
+            return false;
 
-        return false;
+        mTechniques.erase(it);
+        if (dirty)
+            dirtyTechniques();
+
+        return true;
     }
 
     bool PostProcessor::isTechniqueEnabled(const std::shared_ptr<fx::Technique>& technique) const
     {
-        for (const auto& t : mTechniques)
-        {
-            if (technique.get() == t.get())
-                return technique->isValid();
-        }
+        if (auto it = std::find(mTechniques.begin(), mTechniques.end(), technique); it == mTechniques.end())
+            return false;
 
-        return false;
+        return technique->isValid();
     }
 
     void PostProcessor::createTexturesAndCamera(size_t frameId)
@@ -762,7 +767,7 @@ namespace MWRender
         technique->compile();
 
         if (technique->getStatus() != fx::Technique::Status::File_Not_exists)
-            technique->setLastModificationTime(std::filesystem::last_write_time(mTechniqueFileMap[technique->getName()]), false);
+            technique->setLastModificationTime(std::filesystem::last_write_time(mTechniqueFileMap[technique->getName()]));
 
         if (!insert)
             return technique;
diff --git a/apps/openmw/mwrender/postprocessor.hpp b/apps/openmw/mwrender/postprocessor.hpp
index f81615c90b..a015abda4d 100644
--- a/apps/openmw/mwrender/postprocessor.hpp
+++ b/apps/openmw/mwrender/postprocessor.hpp
@@ -161,6 +161,9 @@ namespace MWRender
         void setRenderTargetSize(int width, int height) { mWidth = width; mHeight = height; }
 
     private:
+
+        void populateTechniqueFiles();
+
         size_t frame() const { return mViewer->getFrameStamp()->getFrameNumber(); }
 
         void createObjectsForFrame(size_t frameId);
@@ -175,6 +178,10 @@ namespace MWRender
 
         void update(size_t frameId);
 
+        void reloadIfRequired();
+
+        void updateLiveReload();
+
         void cull(size_t frameId, osgUtil::CullVisitor* cv);
 
         osg::ref_ptr<osg::Group> mRootNode;
diff --git a/components/fx/technique.cpp b/components/fx/technique.cpp
index 94284d1ccd..8b03810b73 100644
--- a/components/fx/technique.cpp
+++ b/components/fx/technique.cpp
@@ -55,7 +55,6 @@ namespace fx
     {
         mTextures.clear();
         mStatus = Status::Uncompiled;
-        mDirty = false;
         mValid = false;
         mHDR = false;
         mNormals = false;
@@ -180,12 +179,11 @@ namespace fx
         return mFileName;
     }
 
-    void Technique::setLastModificationTime(std::filesystem::file_time_type timeStamp, bool dirty)
+    bool Technique::setLastModificationTime(std::filesystem::file_time_type timeStamp)
     {
-        if (dirty && mLastModificationTime != timeStamp)
-            mDirty = true;
-
+        const bool isDirty = timeStamp != mLastModificationTime;
         mLastModificationTime = timeStamp;
+        return isDirty;
     }
 
     [[noreturn]] void Technique::error(const std::string& msg)
@@ -541,6 +539,9 @@ namespace fx
             constexpr bool isVec = std::is_same_v<osg::Vec2f, SrcT> || std::is_same_v<osg::Vec3f, SrcT> || std::is_same_v<osg::Vec4f, SrcT>;
             constexpr bool isFloat = std::is_same_v<float, SrcT>;
             constexpr bool isInt = std::is_same_v<int, SrcT>;
+            constexpr bool isBool = std::is_same_v<bool, SrcT>;
+
+            static_assert(isVec || isFloat || isInt || isBool, "Unsupported type");
 
             std::optional<double> step;
 
@@ -555,7 +556,7 @@ namespace fx
                     data.mDefault = parseFloat();
                 else if constexpr (isInt)
                     data.mDefault = parseInteger();
-                else
+                else if constexpr (isBool)
                     data.mDefault = parseBool();
             }
             else if (key == "min")
@@ -566,7 +567,7 @@ namespace fx
                     data.mMin = parseFloat();
                 else if constexpr (isInt)
                     data.mMin = parseInteger();
-                else
+                else if constexpr (isBool)
                     data.mMin = parseBool();
             }
             else if (key == "max")
@@ -577,7 +578,7 @@ namespace fx
                     data.mMax = parseFloat();
                 else if constexpr (isInt)
                     data.mMax = parseInteger();
-                else
+                else if constexpr (isBool)
                     data.mMax = parseBool();
             }
             else if (key == "step")
diff --git a/components/fx/technique.hpp b/components/fx/technique.hpp
index 85a28d9944..577c592ad0 100644
--- a/components/fx/technique.hpp
+++ b/components/fx/technique.hpp
@@ -117,11 +117,7 @@ namespace fx
 
         std::string getFileName() const;
 
-        void setLastModificationTime(std::filesystem::file_time_type timeStamp, bool dirty = true);
-
-        bool isDirty() const { return mDirty; }
-
-        void setDirty(bool dirty) { mDirty = dirty; }
+        bool setLastModificationTime(std::filesystem::file_time_type timeStamp);
 
         bool isValid() const { return mValid; }
 
@@ -251,7 +247,6 @@ namespace fx
         bool mEnabled;
 
         std::filesystem::file_time_type mLastModificationTime;
-        bool mDirty;
         bool mValid;
         bool mHDR;
         bool mNormals;
diff --git a/components/settings/shadermanager.hpp b/components/settings/shadermanager.hpp
index 322d6169b3..aec9fd4987 100644
--- a/components/settings/shadermanager.hpp
+++ b/components/settings/shadermanager.hpp
@@ -95,7 +95,7 @@ namespace Settings
 
                 return value.as<T>();
             }
-            catch(const YAML::BadConversion& e)
+            catch(const YAML::BadConversion&)
             {
                 Log(Debug::Warning) << "Failed retrieving " << tname << ", " << uname << " : mismatched types in config file.";
             }

From e79f80340224670c51a1062ad73d20f007232904 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 21 May 2022 10:48:32 +0200
Subject: [PATCH 2483/2859] Change includes

---
 apps/openmw/mwbase/dialoguemanager.hpp  | 1 +
 apps/openmw/mwbase/soundmanager.hpp     | 1 +
 apps/openmw/mwbase/world.hpp            | 1 +
 apps/openmw/mwscript/ref.hpp            | 2 --
 components/compiler/locals.hpp          | 1 +
 components/interpreter/context.hpp      | 1 +
 components/interpreter/runtime.hpp      | 2 +-
 components/misc/messageformatparser.hpp | 2 +-
 8 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwbase/dialoguemanager.hpp b/apps/openmw/mwbase/dialoguemanager.hpp
index 8b0d66dad5..94543ed955 100644
--- a/apps/openmw/mwbase/dialoguemanager.hpp
+++ b/apps/openmw/mwbase/dialoguemanager.hpp
@@ -2,6 +2,7 @@
 #define GAME_MWBASE_DIALOGUEMANAGER_H
 
 #include <string>
+#include <string_view>
 #include <vector>
 #include <list>
 
diff --git a/apps/openmw/mwbase/soundmanager.hpp b/apps/openmw/mwbase/soundmanager.hpp
index 4148bed085..641be742ff 100644
--- a/apps/openmw/mwbase/soundmanager.hpp
+++ b/apps/openmw/mwbase/soundmanager.hpp
@@ -3,6 +3,7 @@
 
 #include <memory>
 #include <string>
+#include <string_view>
 #include <set>
 
 #include "../mwworld/ptr.hpp"
diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 0057814e1e..3d904631cd 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -6,6 +6,7 @@
 #include <vector>
 #include <map>
 #include <set>
+#include <string_view>
 #include <deque>
 
 #include <components/esm3/cellid.hpp>
diff --git a/apps/openmw/mwscript/ref.hpp b/apps/openmw/mwscript/ref.hpp
index c52b419c1d..8c7657280f 100644
--- a/apps/openmw/mwscript/ref.hpp
+++ b/apps/openmw/mwscript/ref.hpp
@@ -1,8 +1,6 @@
 #ifndef GAME_MWSCRIPT_REF_H
 #define GAME_MWSCRIPT_REF_H
 
-#include <string>
-
 #include "../mwworld/ptr.hpp"
 
 namespace Interpreter
diff --git a/components/compiler/locals.hpp b/components/compiler/locals.hpp
index 7e6d4f0a45..c7636ed2a0 100644
--- a/components/compiler/locals.hpp
+++ b/components/compiler/locals.hpp
@@ -3,6 +3,7 @@
 
 #include <vector>
 #include <string>
+#include <string_view>
 #include <iosfwd>
 
 namespace Compiler
diff --git a/components/interpreter/context.hpp b/components/interpreter/context.hpp
index 1ea98fd1a4..df97bcf232 100644
--- a/components/interpreter/context.hpp
+++ b/components/interpreter/context.hpp
@@ -2,6 +2,7 @@
 #define INTERPRETER_CONTEXT_H_INCLUDED
 
 #include <string>
+#include <string_view>
 #include <vector>
 
 namespace Interpreter
diff --git a/components/interpreter/runtime.hpp b/components/interpreter/runtime.hpp
index 29f6168e57..7f48ca8d3e 100644
--- a/components/interpreter/runtime.hpp
+++ b/components/interpreter/runtime.hpp
@@ -2,7 +2,7 @@
 #define INTERPRETER_RUNTIME_H_INCLUDED
 
 #include <vector>
-#include <string>
+#include <string_view>
 
 #include "types.hpp"
 
diff --git a/components/misc/messageformatparser.hpp b/components/misc/messageformatparser.hpp
index 16ced8d289..4ceac2be2f 100644
--- a/components/misc/messageformatparser.hpp
+++ b/components/misc/messageformatparser.hpp
@@ -1,7 +1,7 @@
 #ifndef OPENMW_COMPONENTS_MISC_MESSAGEFORMATPARSER_H
 #define OPENMW_COMPONENTS_MISC_MESSAGEFORMATPARSER_H
 
-#include <string>
+#include <string_view>
 
 namespace Misc
 {

From 15fda78ddf7fe837a206f86aa5b10e28be1b738c Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 21 May 2022 12:00:15 +0200
Subject: [PATCH 2484/2859] Include string

---
 components/interpreter/interpreter.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/interpreter/interpreter.cpp b/components/interpreter/interpreter.cpp
index 69f3111440..7047dec05f 100644
--- a/components/interpreter/interpreter.cpp
+++ b/components/interpreter/interpreter.cpp
@@ -2,6 +2,7 @@
 
 #include <cassert>
 #include <stdexcept>
+#include <string>
 
 #include "opcodes.hpp"
 

From 266a0634eb7fd89b190b7d6137c9a04c1091101b Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 21 May 2022 12:41:56 +0200
Subject: [PATCH 2485/2859] Add more includes

---
 apps/openmw/mwscript/locals.hpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/openmw/mwscript/locals.hpp b/apps/openmw/mwscript/locals.hpp
index 55437c9e51..6f3d4d5f07 100644
--- a/apps/openmw/mwscript/locals.hpp
+++ b/apps/openmw/mwscript/locals.hpp
@@ -1,6 +1,8 @@
 #ifndef GAME_SCRIPT_LOCALS_H
 #define GAME_SCRIPT_LOCALS_H
 
+#include <string>
+#include <string_view>
 #include <vector>
 
 #include <components/interpreter/types.hpp>

From 148519fe482c4bd1e52770ba0d52fe843d2c3fbd Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 21 May 2022 17:00:02 +0200
Subject: [PATCH 2486/2859] Destruct Stereo::Manager after World

ShadowManager access Stereo::Manager in destructor. ShadowManager owned by
RenderingManager owned by World.
---
 apps/openmw/engine.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index af3db12b5f..de4700c775 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -468,14 +468,13 @@ OMW::Engine::~Engine()
     if (mScreenCaptureOperation != nullptr)
         mScreenCaptureOperation->stop();
 
-    mStereoManager = nullptr;
-
     mMechanicsManager = nullptr;
     mDialogueManager = nullptr;
     mJournal = nullptr;
     mScriptManager = nullptr;
     mWindowManager = nullptr;
     mWorld = nullptr;
+    mStereoManager = nullptr;
     mSoundManager = nullptr;
     mInputManager = nullptr;
     mStateManager = nullptr;

From 5269ba6f3c304bb1c5149b88c7c433ecf3789efb Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 21 May 2022 18:17:36 +0000
Subject: [PATCH 2487/2859] Fix warning: -Wunused-lambda-capture

---
 apps/openmw_test_suite/settings/shadermanager.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/openmw_test_suite/settings/shadermanager.cpp b/apps/openmw_test_suite/settings/shadermanager.cpp
index 8f8e09e134..7f6e73c4c1 100644
--- a/apps/openmw_test_suite/settings/shadermanager.cpp
+++ b/apps/openmw_test_suite/settings/shadermanager.cpp
@@ -36,7 +36,8 @@ config:
         vec3_uniform: [1.0, 2.0]
 )YAML";
 
-        withSettingsFile(content, [this] (const auto& path) {
+        withSettingsFile(content, [] (const auto& path)
+        {
             EXPECT_TRUE(ShaderManager::get().load(path));
             EXPECT_FALSE(ShaderManager::get().getValue<osg::Vec3f>("shader", "vec3_uniform").has_value());
             EXPECT_TRUE(ShaderManager::get().setValue<osg::Vec3f>("shader", "vec3_uniform", osg::Vec3f(1, 2, 3)));
@@ -56,7 +57,8 @@ config:
  >Defeated by a sideways carrot
 )YAML";
 
-        withSettingsFile(content, [this] (const auto& path) {
+        withSettingsFile(content, [] (const auto& path)
+        {
             EXPECT_FALSE(ShaderManager::get().load(path));
             EXPECT_FALSE(ShaderManager::get().setValue("shader", "uniform", 12.0));
             EXPECT_FALSE(ShaderManager::get().getValue<float>("shader", "uniform").has_value());

From 23eccebe9e4aa7ac62c0be51e30c4db2e5ecf64c Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sat, 21 May 2022 21:39:26 +0200
Subject: [PATCH 2488/2859] Convert esmtool from `const std::string&` to
 `std::string_view`

---
 apps/esmtool/esmtool.cpp      | 2 +-
 components/esm3/esmreader.cpp | 6 +++---
 components/esm3/esmreader.hpp | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp
index 2e64168046..9d90a542be 100644
--- a/apps/esmtool/esmtool.cpp
+++ b/apps/esmtool/esmtool.cpp
@@ -284,7 +284,7 @@ void loadCell(const Arguments& info, ESM::Cell &cell, ESM::ESMReader &esm, ESMDa
     }
 }
 
-void printRawTes3(const std::string& path)
+void printRawTes3(std::string_view path)
 {
     std::cout << "TES3 RAW file listing: " << path << '\n';
     ESM::ESMReader esm;
diff --git a/components/esm3/esmreader.cpp b/components/esm3/esmreader.cpp
index 08cd100ab1..68228a8156 100644
--- a/components/esm3/esmreader.cpp
+++ b/components/esm3/esmreader.cpp
@@ -84,7 +84,7 @@ void ESMReader::resolveParentFileIndices(const std::vector<ESMReader>& allPlugin
     }
 }
 
-void ESMReader::openRaw(std::unique_ptr<std::istream>&& stream, const std::string& name)
+void ESMReader::openRaw(std::unique_ptr<std::istream>&& stream, std::string_view name)
 {
     close();
     mEsm = std::move(stream);
@@ -94,9 +94,9 @@ void ESMReader::openRaw(std::unique_ptr<std::istream>&& stream, const std::strin
     mEsm->seekg(0, mEsm->beg);
 }
 
-void ESMReader::openRaw(const std::string& filename)
+void ESMReader::openRaw(std::string_view filename)
 {
-    openRaw(Files::openBinaryInputFileStream(filename), filename);
+    openRaw(Files::openBinaryInputFileStream(std::string(filename)), filename);
 }
 
 void ESMReader::open(std::unique_ptr<std::istream>&& stream, const std::string &name)
diff --git a/components/esm3/esmreader.hpp b/components/esm3/esmreader.hpp
index 2c987ef025..658a409ed6 100644
--- a/components/esm3/esmreader.hpp
+++ b/components/esm3/esmreader.hpp
@@ -61,7 +61,7 @@ public:
 
   /// Raw opening. Opens the file and sets everything up but doesn't
   /// parse the header.
-  void openRaw(std::unique_ptr<std::istream>&& stream, const std::string &name);
+  void openRaw(std::unique_ptr<std::istream>&& stream, std::string_view name);
 
   /// Load ES file from a new stream, parses the header. Closes the
   /// currently open file first, if any.
@@ -69,7 +69,7 @@ public:
 
   void open(const std::string &file);
 
-  void openRaw(const std::string &filename);
+  void openRaw(std::string_view filename);
 
   /// Get the current position in the file. Make sure that the file has been opened!
   size_t getFileOffset() const { return mEsm->tellg(); };

From 9ce26ef4b6fd68c919b23ec76a0367d48fb6ea5e Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sat, 21 May 2022 21:44:47 +0200
Subject: [PATCH 2489/2859] Move to_utf8 from `const std::string&` to
 `std::string_view`

---
 components/to_utf8/to_utf8.cpp | 8 ++++----
 components/to_utf8/to_utf8.hpp | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/to_utf8/to_utf8.cpp b/components/to_utf8/to_utf8.cpp
index 7e7d3101fc..6e04db8db4 100644
--- a/components/to_utf8/to_utf8.cpp
+++ b/components/to_utf8/to_utf8.cpp
@@ -348,7 +348,7 @@ std::string_view Utf8Encoder::getLegacyEnc(std::string_view input)
     return mImpl.getLegacyEnc(input, BufferAllocationPolicy::UseGrowFactor, mBuffer);
 }
 
-ToUTF8::FromType ToUTF8::calculateEncoding(const std::string& encodingName)
+ToUTF8::FromType ToUTF8::calculateEncoding(std::string_view encodingName)
 {
     if (encodingName == "win1250")
         return ToUTF8::WINDOWS_1250;
@@ -357,10 +357,10 @@ ToUTF8::FromType ToUTF8::calculateEncoding(const std::string& encodingName)
     else if (encodingName == "win1252")
         return ToUTF8::WINDOWS_1252;
     else
-        throw std::runtime_error(std::string("Unknown encoding '") + encodingName + std::string("', see openmw --help for available options."));
+        throw std::runtime_error("Unknown encoding '" + std::string(encodingName) + "', see openmw --help for available options.");
 }
 
-std::string ToUTF8::encodingUsingMessage(const std::string& encodingName)
+std::string ToUTF8::encodingUsingMessage(std::string_view encodingName)
 {
     if (encodingName == "win1250")
         return "Using Central and Eastern European font encoding.";
@@ -369,5 +369,5 @@ std::string ToUTF8::encodingUsingMessage(const std::string& encodingName)
     else if (encodingName == "win1252")
         return "Using default (English) font encoding.";
     else
-        throw std::runtime_error(std::string("Unknown encoding '") + encodingName + std::string("', see openmw --help for available options."));
+        throw std::runtime_error("Unknown encoding '" + std::string(encodingName) + "', see openmw --help for available options.");
 }
diff --git a/components/to_utf8/to_utf8.hpp b/components/to_utf8/to_utf8.hpp
index 037e3ea3bf..918f03aa9f 100644
--- a/components/to_utf8/to_utf8.hpp
+++ b/components/to_utf8/to_utf8.hpp
@@ -24,8 +24,8 @@ namespace ToUTF8
         UseGrowFactor,
     };
 
-    FromType calculateEncoding(const std::string& encodingName);
-    std::string encodingUsingMessage(const std::string& encodingName);
+    FromType calculateEncoding(std::string_view encodingName);
+    std::string encodingUsingMessage(std::string_view encodingName);
 
     class StatelessUtf8Encoder
     {

From 02cafc3b98bd601f7ce3adb87907a8b6a8e0b477 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sat, 21 May 2022 22:08:20 +0200
Subject: [PATCH 2490/2859] And one more

---
 components/shader/shadervisitor.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 4ef0d7a0ea..57fe2cb0e8 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -292,12 +292,9 @@ namespace Shader
     }
 
     const char* defaultTextures[] = { "diffuseMap", "normalMap", "emissiveMap", "darkMap", "detailMap", "envMap", "specularMap", "decalMap", "bumpMap", "glossMap" };
-    bool isTextureNameRecognized(const std::string& name)
+    bool isTextureNameRecognized(std::string_view name)
     {
-        for (unsigned int i=0; i<sizeof(defaultTextures)/sizeof(defaultTextures[0]); ++i)
-            if (name == defaultTextures[i])
-                return true;
-        return false;
+        return std::find(std::begin(defaultTextures), std::end(defaultTextures), name) != std::end(defaultTextures);
     }
 
     void ShaderVisitor::applyStateSet(osg::ref_ptr<osg::StateSet> stateset, osg::Node& node)

From 68caff9c7b7fe5007b8ea2fb45d7dc287e96837e Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 22 May 2022 01:47:06 +0200
Subject: [PATCH 2491/2859] Use unique_ptr to manage scripts context and
 encoder lifetime

---
 apps/openmw/engine.cpp | 12 ++++--------
 apps/openmw/engine.hpp |  4 ++--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index de4700c775..b619ab00ca 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -429,7 +429,6 @@ bool OMW::Engine::frame(float frametime)
 OMW::Engine::Engine(Files::ConfigurationManager& configurationManager)
   : mWindow(nullptr)
   , mEncoding(ToUTF8::WINDOWS_1252)
-  , mEncoder(nullptr)
   , mScreenCaptureOperation(nullptr)
   , mSelectDepthFormatOperation(new SceneUtil::SelectDepthFormatOperation())
   , mSelectColorFormatOperation(new SceneUtil::Color::SelectColorFormatOperation())
@@ -444,7 +443,6 @@ OMW::Engine::Engine(Files::ConfigurationManager& configurationManager)
   , mGrab(true)
   , mExportFonts(false)
   , mRandomSeed(0)
-  , mScriptContext (nullptr)
   , mFSStrict (false)
   , mScriptBlacklistUse (true)
   , mNewGame (false)
@@ -480,7 +478,6 @@ OMW::Engine::~Engine()
     mStateManager = nullptr;
     mLuaManager = nullptr;
 
-    delete mScriptContext;
     mScriptContext = nullptr;
 
     mWorkQueue = nullptr;
@@ -489,7 +486,6 @@ OMW::Engine::~Engine()
 
     mResourceSystem.reset();
 
-    delete mEncoder;
     mEncoder = nullptr;
 
     if (mWindow)
@@ -833,7 +829,7 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
 
     // Create the world
     mWorld = std::make_unique<MWWorld::World>(mViewer, rootNode, mResourceSystem.get(), mWorkQueue.get(),
-        mFileCollections, mContentFiles, mGroundcoverFiles, mEncoder, mActivationDistanceOverride, mCellName,
+        mFileCollections, mContentFiles, mGroundcoverFiles, mEncoder.get(), mActivationDistanceOverride, mCellName,
         mStartupScript, mResDir.string(), mCfgMgr.getUserDataPath().string());
     mWorld->setupPlayer();
     mWorld->setRandomSeed(mRandomSeed);
@@ -843,14 +839,14 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     mWindowManager->initUI();
 
     //Load translation data
-    mTranslationDataStorage.setEncoder(mEncoder);
+    mTranslationDataStorage.setEncoder(mEncoder.get());
     for (size_t i = 0; i < mContentFiles.size(); i++)
       mTranslationDataStorage.loadTranslationData(mFileCollections, mContentFiles[i]);
 
     Compiler::registerExtensions (mExtensions);
 
     // Create script system
-    mScriptContext = new MWScript::CompilerContext (MWScript::CompilerContext::Type_Full);
+    mScriptContext = std::make_unique<MWScript::CompilerContext>(MWScript::CompilerContext::Type_Full);
     mScriptContext->setExtensions (&mExtensions);
 
     mScriptManager = std::make_unique<MWScript::ScriptManager>(mWorld->getStore(), *mScriptContext, mWarningsMode,
@@ -993,7 +989,7 @@ void OMW::Engine::go()
     MWClass::registerClasses();
 
     // Create encoder
-    mEncoder = new ToUTF8::Utf8Encoder(mEncoding);
+    mEncoder = std::make_unique<ToUTF8::Utf8Encoder>(mEncoding);
 
     // Setup viewer
     mViewer = new osgViewer::Viewer;
diff --git a/apps/openmw/engine.hpp b/apps/openmw/engine.hpp
index c281f032ea..ca0da0856f 100644
--- a/apps/openmw/engine.hpp
+++ b/apps/openmw/engine.hpp
@@ -132,7 +132,7 @@ namespace OMW
             std::unique_ptr<MWLua::LuaManager> mLuaManager;
             MWBase::Environment mEnvironment;
             ToUTF8::FromType mEncoding;
-            ToUTF8::Utf8Encoder* mEncoder;
+            std::unique_ptr<ToUTF8::Utf8Encoder> mEncoder;
             Files::PathContainer mDataDirs;
             std::vector<std::string> mArchives;
             boost::filesystem::path mResDir;
@@ -164,7 +164,7 @@ namespace OMW
             unsigned int mRandomSeed;
 
             Compiler::Extensions mExtensions;
-            Compiler::Context *mScriptContext;
+            std::unique_ptr<Compiler::Context> mScriptContext;
 
             Files::Collections mFileCollections;
             bool mFSStrict;

From 9abfaef7a17ada6556fed1b83183acf9267f4696 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 22 May 2022 02:16:01 +0200
Subject: [PATCH 2492/2859] Use std::any instead of boost::any

---
 apps/openmw/mwworld/manualref.cpp | 4 ++--
 apps/openmw/mwworld/manualref.hpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwworld/manualref.cpp b/apps/openmw/mwworld/manualref.cpp
index 7f7fd60335..ef89775279 100644
--- a/apps/openmw/mwworld/manualref.cpp
+++ b/apps/openmw/mwworld/manualref.cpp
@@ -6,7 +6,7 @@ namespace
 {
 
     template<typename T>
-    void create(const MWWorld::Store<T>& list, const std::string& name, boost::any& refValue, MWWorld::Ptr& ptrValue)
+    void create(const MWWorld::Store<T>& list, const std::string& name, std::any& refValue, MWWorld::Ptr& ptrValue)
     {
         const T* base = list.find(name);
 
@@ -26,7 +26,7 @@ namespace
         MWWorld::LiveCellRef<T> ref(cellRef, base);
 
         refValue = ref;
-        ptrValue = MWWorld::Ptr(&boost::any_cast<MWWorld::LiveCellRef<T>&>(refValue), nullptr);
+        ptrValue = MWWorld::Ptr(&std::any_cast<MWWorld::LiveCellRef<T>&>(refValue), nullptr);
     }
 }
 
diff --git a/apps/openmw/mwworld/manualref.hpp b/apps/openmw/mwworld/manualref.hpp
index 2fc5994710..2bb1f95303 100644
--- a/apps/openmw/mwworld/manualref.hpp
+++ b/apps/openmw/mwworld/manualref.hpp
@@ -1,7 +1,7 @@
 #ifndef GAME_MWWORLD_MANUALREF_H
 #define GAME_MWWORLD_MANUALREF_H
 
-#include <boost/any.hpp>
+#include <any>
 
 #include "ptr.hpp"
 
@@ -10,7 +10,7 @@ namespace MWWorld
     /// \brief Manually constructed live cell ref
     class ManualRef
     {
-            boost::any mRef;
+            std::any mRef;
             Ptr mPtr;
 
             ManualRef (const ManualRef&);

From ea107bdd53bc4a3b461aa91bfe0c0db23727a5a1 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 22 May 2022 02:30:55 +0200
Subject: [PATCH 2493/2859] Remove unused boost include

---
 components/esm3/loadcell.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/components/esm3/loadcell.cpp b/components/esm3/loadcell.cpp
index 9ab9eacba1..204dba2879 100644
--- a/components/esm3/loadcell.cpp
+++ b/components/esm3/loadcell.cpp
@@ -4,8 +4,6 @@
 #include <limits>
 #include <list>
 
-#include <boost/concept_check.hpp>
-
 #include <components/debug/debuglog.hpp>
 #include <components/misc/stringops.hpp>
 

From 42841002b512171277238fb8ddb1b9180f2dcaa9 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 22 May 2022 02:32:41 +0200
Subject: [PATCH 2494/2859] Remove unused dependency to Boost.Thread

---
 apps/openmw/CMakeLists.txt                   | 1 -
 extern/osg-ffmpeg-videoplayer/CMakeLists.txt | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 9a19c3e1d6..e3d39019fa 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -145,7 +145,6 @@ target_link_libraries(openmw
     ${OSG_LIBRARIES}
 
     ${Boost_SYSTEM_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
     ${Boost_FILESYSTEM_LIBRARY}
     ${Boost_PROGRAM_OPTIONS_LIBRARY}
     ${OPENAL_LIBRARY}
diff --git a/extern/osg-ffmpeg-videoplayer/CMakeLists.txt b/extern/osg-ffmpeg-videoplayer/CMakeLists.txt
index 8ab51196a8..ae19be8659 100644
--- a/extern/osg-ffmpeg-videoplayer/CMakeLists.txt
+++ b/extern/osg-ffmpeg-videoplayer/CMakeLists.txt
@@ -12,7 +12,7 @@ set(OSG_FFMPEG_VIDEOPLAYER_SOURCE_FILES
 
 include_directories(${FFmpeg_INCLUDE_DIRS})
 add_library(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} STATIC ${OSG_FFMPEG_VIDEOPLAYER_SOURCE_FILES})
-target_link_libraries(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} ${FFmpeg_LIBRARIES} ${Boost_THREAD_LIBRARY})
+target_link_libraries(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} ${FFmpeg_LIBRARIES})
 target_link_libraries(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} ${OSG_LIBRARIES})
 
 link_directories(${CMAKE_CURRENT_BINARY_DIR})

From 7f8d433775236fc11bcf73750293781e2e5280fd Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 22 May 2022 02:47:58 +0200
Subject: [PATCH 2495/2859] Initialize log recorder right after initializing
 the logging

---
 apps/openmw/engine.cpp            | 28 ++++++++----------
 apps/openmw/engine.hpp            |  7 ++---
 apps/openmw/main.cpp              |  4 +++
 apps/openmw/mwgui/debugwindow.cpp | 48 ++++++++++++++++---------------
 apps/openmw/mwgui/debugwindow.hpp | 10 ++++---
 components/settings/settings.hpp  |  6 ++--
 6 files changed, 52 insertions(+), 51 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index de4700c775..74007b6515 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -548,15 +548,15 @@ void OMW::Engine::setSkipMenu (bool skipMenu, bool newGame)
     mNewGame = newGame;
 }
 
-void OMW::Engine::createWindow(Settings::Manager& settings)
+void OMW::Engine::createWindow()
 {
-    int screen = settings.getInt("screen", "Video");
-    int width = settings.getInt("resolution x", "Video");
-    int height = settings.getInt("resolution y", "Video");
+    int screen = Settings::Manager::getInt("screen", "Video");
+    int width = Settings::Manager::getInt("resolution x", "Video");
+    int height = Settings::Manager::getInt("resolution y", "Video");
     Settings::WindowMode windowMode = static_cast<Settings::WindowMode>(Settings::Manager::getInt("window mode", "Video"));
-    bool windowBorder = settings.getBool("window border", "Video");
-    bool vsync = settings.getBool("vsync", "Video");
-    unsigned int antialiasing = std::max(0, settings.getInt("antialiasing", "Video"));
+    bool windowBorder = Settings::Manager::getBool("window border", "Video");
+    bool vsync = Settings::Manager::getBool("vsync", "Video");
+    unsigned int antialiasing = std::max(0, Settings::Manager::getInt("antialiasing", "Video"));
 
     int pos_x = SDL_WINDOWPOS_CENTERED_DISPLAY(screen),
         pos_y = SDL_WINDOWPOS_CENTERED_DISPLAY(screen);
@@ -581,7 +581,7 @@ void OMW::Engine::createWindow(Settings::Manager& settings)
         flags |= SDL_WINDOW_BORDERLESS;
 
     SDL_SetHint(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS,
-                settings.getBool("minimize on focus loss", "Video") ? "1" : "0");
+                Settings::Manager::getBool("minimize on focus loss", "Video") ? "1" : "0");
 
     checkSDLError(SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8));
     checkSDLError(SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8));
@@ -710,7 +710,7 @@ void OMW::Engine::setWindowIcon()
     }
 }
 
-void OMW::Engine::prepareEngine (Settings::Manager & settings)
+void OMW::Engine::prepareEngine()
 {
     mStateManager = std::make_unique<MWState::StateManager>(mCfgMgr.getUserDataPath() / "saves", mContentFiles);
     mEnvironment.setStateManager(*mStateManager);
@@ -720,7 +720,7 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     osg::ref_ptr<osg::Group> rootNode(new osg::Group);
     mViewer->setSceneData(rootNode);
 
-    createWindow(settings);
+    createWindow();
 
     mVFS = std::make_unique<VFS::Manager>(mFSStrict);
 
@@ -984,10 +984,6 @@ void OMW::Engine::go()
 
     Misc::Rng::init(mRandomSeed);
 
-    // Load settings
-    Settings::Manager settings;
-    std::string settingspath = settings.load(mCfgMgr);
-
     Settings::ShaderManager::get().load((mCfgMgr.getUserConfigPath() / "shaders.yaml").string());
 
     MWClass::registerClasses();
@@ -1006,7 +1002,7 @@ void OMW::Engine::go()
 
     mEnvironment.setFrameRateLimit(Settings::Manager::getFloat("framerate limit", "Video"));
 
-    prepareEngine (settings);
+    prepareEngine();
 
     std::ofstream stats;
     if (const auto path = std::getenv("OPENMW_OSG_STATS_FILE"))
@@ -1112,7 +1108,7 @@ void OMW::Engine::go()
     luaWorker.join();
 
     // Save user settings
-    settings.saveUser(settingspath);
+    Settings::Manager::saveUser((mCfgMgr.getUserConfigPath() / "settings.cfg").string());
     Settings::ShaderManager::get().save();
     mLuaManager->savePermanentStorage(mCfgMgr.getUserConfigPath().string());
 
diff --git a/apps/openmw/engine.hpp b/apps/openmw/engine.hpp
index c281f032ea..30a43f7411 100644
--- a/apps/openmw/engine.hpp
+++ b/apps/openmw/engine.hpp
@@ -181,13 +181,10 @@ namespace OMW
 
             bool frame (float dt);
 
-            /// Load settings from various files, returns the path to the user settings file
-            std::string loadSettings (Settings::Manager & settings);
-
             /// Prepare engine for game play
-            void prepareEngine (Settings::Manager & settings);
+            void prepareEngine();
 
-            void createWindow(Settings::Manager& settings);
+            void createWindow();
             void setWindowIcon();
 
         public:
diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index a0967ec14b..7800335ddb 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -5,6 +5,8 @@
 #include <components/debug/debugging.hpp>
 #include <components/misc/rng.hpp>
 
+#include "mwgui/debugwindow.hpp"
+
 #include "engine.hpp"
 #include "options.hpp"
 
@@ -58,8 +60,10 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     }
 
     cfgMgr.readConfiguration(variables, desc);
+    Settings::Manager::load(cfgMgr);
 
     setupLogging(cfgMgr.getLogPath().string(), "OpenMW");
+    MWGui::DebugWindow::startLogRecording();
 
     Version::Version v = Version::getOpenmwVersion(variables["resources"].as<Files::MaybeQuotedPath>().string());
     Log(Debug::Info) << v.describe();
diff --git a/apps/openmw/mwgui/debugwindow.cpp b/apps/openmw/mwgui/debugwindow.cpp
index 4c71874c1f..79375849c7 100644
--- a/apps/openmw/mwgui/debugwindow.cpp
+++ b/apps/openmw/mwgui/debugwindow.cpp
@@ -89,7 +89,10 @@ namespace MWGui
         // - Material editor
         // - Shader editor
 
-        initLogView();
+        MyGUI::TabItem* itemLV = mTabControl->addItem("Log Viewer");
+        mLogView = itemLV->createWidgetReal<MyGUI::EditBox>
+                ("LogEdit", MyGUI::FloatCoord(0,0,1,1), MyGUI::Align::Stretch);
+        mLogView->setEditReadOnly(true);
 
 #ifndef BT_NO_PROFILE
         MyGUI::TabItem* item = mTabControl->addItem("Physics Profiler");
@@ -100,17 +103,16 @@ namespace MWGui
 #endif
     }
 
-    void DebugWindow::initLogView()
-    {
-        MyGUI::TabItem* itemLV = mTabControl->addItem("Log Viewer");
-        mLogView = itemLV->createWidgetReal<MyGUI::EditBox>
-                ("LogEdit", MyGUI::FloatCoord(0,0,1,1), MyGUI::Align::Stretch);
-        mLogView->setEditReadOnly(true);
+    std::vector<char> DebugWindow::sLogCircularBuffer;
+    int64_t DebugWindow::sLogStartIndex = 0;
+    int64_t DebugWindow::sLogEndIndex = 0;
 
-        mLogCircularBuffer.resize(std::max<int64_t>(0, Settings::Manager::getInt64("log buffer size", "General")));
-        Debug::setLogListener([this](Debug::Level level, std::string_view prefix, std::string_view msg)
+    void DebugWindow::startLogRecording()
+    {
+        sLogCircularBuffer.resize(std::max<int64_t>(0, Settings::Manager::getInt64("log buffer size", "General")));
+        Debug::setLogListener([](Debug::Level level, std::string_view prefix, std::string_view msg)
         {
-            if (mLogCircularBuffer.empty())
+            if (sLogCircularBuffer.empty())
                 return;  // Log viewer is disabled.
             std::string_view color;
             switch (level)
@@ -123,13 +125,13 @@ namespace MWGui
                 default: color = "#FFFFFF";
             }
             bool bufferOverflow = false;
-            const int64_t bufSize = mLogCircularBuffer.size();
+            const int64_t bufSize = sLogCircularBuffer.size();
             auto addChar = [&](char c)
             {
-                mLogCircularBuffer[mLogEndIndex++] = c;
-                if (mLogEndIndex == bufSize)
-                    mLogEndIndex = 0;
-                bufferOverflow = bufferOverflow || mLogEndIndex == mLogStartIndex;
+                sLogCircularBuffer[sLogEndIndex++] = c;
+                if (sLogEndIndex == bufSize)
+                    sLogEndIndex = 0;
+                bufferOverflow = bufferOverflow || sLogEndIndex == sLogStartIndex;
             };
             auto addShieldedStr = [&](std::string_view s)
             {
@@ -145,29 +147,29 @@ namespace MWGui
             addShieldedStr(prefix);
             addShieldedStr(msg);
             if (bufferOverflow)
-                mLogStartIndex = (mLogEndIndex + 1) % bufSize;
+                sLogStartIndex = (sLogEndIndex + 1) % bufSize;
         });
     }
 
     void DebugWindow::updateLogView()
     {
-        if (!mLogView || mLogCircularBuffer.empty() || mLogStartIndex == mLogEndIndex)
+        if (!mLogView || sLogCircularBuffer.empty() || sLogStartIndex == sLogEndIndex)
             return;
         if (mLogView->isTextSelection())
             return;  // Don't change text while player is trying to copy something
 
         std::string addition;
-        const int64_t bufSize = mLogCircularBuffer.size();
+        const int64_t bufSize = sLogCircularBuffer.size();
         {
             std::unique_lock<std::mutex> lock = Log::lock();
-            if (mLogStartIndex < mLogEndIndex)
-                addition = std::string(mLogCircularBuffer.data() + mLogStartIndex, mLogEndIndex - mLogStartIndex);
+            if (sLogStartIndex < sLogEndIndex)
+                addition = std::string(sLogCircularBuffer.data() + sLogStartIndex, sLogEndIndex - sLogStartIndex);
             else
             {
-                addition = std::string(mLogCircularBuffer.data() + mLogStartIndex, bufSize - mLogStartIndex);
-                addition.append(mLogCircularBuffer.data(), mLogEndIndex);
+                addition = std::string(sLogCircularBuffer.data() + sLogStartIndex, bufSize - sLogStartIndex);
+                addition.append(sLogCircularBuffer.data(), sLogEndIndex);
             }
-            mLogStartIndex = mLogEndIndex;
+            sLogStartIndex = sLogEndIndex;
         }
 
         size_t scrollPos = mLogView->getVScrollPosition();
diff --git a/apps/openmw/mwgui/debugwindow.hpp b/apps/openmw/mwgui/debugwindow.hpp
index 352a58c50c..dba7436bc3 100644
--- a/apps/openmw/mwgui/debugwindow.hpp
+++ b/apps/openmw/mwgui/debugwindow.hpp
@@ -13,17 +13,19 @@ namespace MWGui
 
         void onFrame(float dt) override;
 
+        static void startLogRecording();
+
     private:
-        void initLogView();
         void updateLogView();
         void updateBulletProfile();
 
         MyGUI::TabControl* mTabControl;
 
         MyGUI::EditBox* mLogView;
-        std::vector<char> mLogCircularBuffer;
-        int64_t mLogStartIndex = 0;
-        int64_t mLogEndIndex = 0;
+
+        static std::vector<char> sLogCircularBuffer;
+        static int64_t sLogStartIndex;
+        static int64_t sLogEndIndex;
 
         MyGUI::EditBox* mBulletProfilerEdit;
     };
diff --git a/components/settings/settings.hpp b/components/settings/settings.hpp
index 693941df10..eb35ddbe8c 100644
--- a/components/settings/settings.hpp
+++ b/components/settings/settings.hpp
@@ -35,13 +35,13 @@ namespace Settings
         static CategorySettingVector mChangedSettings;
         ///< tracks all the settings that were changed since the last apply() call
 
-        void clear();
+        static void clear();
         ///< clears all settings and default settings
 
-        std::string load(const Files::ConfigurationManager& cfgMgr, bool loadEditorSettings = false);
+        static std::string load(const Files::ConfigurationManager& cfgMgr, bool loadEditorSettings = false);
         ///< load settings from all active config dirs. Returns the path of the last loaded file.
 
-        void saveUser (const std::string& file);
+        static void saveUser (const std::string& file);
         ///< save user settings to file
 
         static void resetPendingChange(const std::string &setting, const std::string &category);

From ac78b537d29c2f6fd1372a374f859e92c3229ae4 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 22 May 2022 09:29:03 +0200
Subject: [PATCH 2496/2859] Address feedback

---
 apps/openmw/mwdialogue/dialoguemanagerimp.cpp |  2 +-
 apps/openmw/mwscript/aiextensions.cpp         |  2 +-
 apps/openmw/mwscript/animationextensions.cpp  |  4 +-
 apps/openmw/mwscript/cellextensions.cpp       |  3 +-
 apps/openmw/mwscript/containerextensions.cpp  |  8 ++--
 apps/openmw/mwscript/dialogueextensions.cpp   | 11 +++--
 apps/openmw/mwscript/miscextensions.cpp       | 41 +++++++++----------
 apps/openmw/mwscript/skyextensions.cpp        |  6 +--
 apps/openmw/mwscript/soundextensions.cpp      | 12 +++---
 apps/openmw/mwscript/statsextensions.cpp      | 16 ++++----
 .../mwscript/transformationextensions.cpp     |  9 ++--
 apps/openmw/mwworld/containerstore.cpp        |  2 +-
 apps/openmw/mwworld/containerstore.hpp        |  2 +-
 apps/openmw/mwworld/worldimp.cpp              |  3 +-
 .../openmw_test_suite/mwscript/test_utils.hpp | 12 +++---
 components/esm3/loadmgef.cpp                  |  8 ++--
 components/esm3/loadmgef.hpp                  |  3 +-
 components/interpreter/miscopcodes.hpp        |  3 +-
 18 files changed, 69 insertions(+), 78 deletions(-)

diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index e7e29a58b4..e0b88bba12 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -519,7 +519,7 @@ namespace MWDialogue
     void DialogueManager::addChoice(std::string_view text, int choice)
     {
         mIsInChoice = true;
-        mChoices.emplace_back(std::string{text.begin(), text.end()}, choice);
+        mChoices.emplace_back(text, choice);
     }
 
     const std::vector<std::pair<std::string, int> >& DialogueManager::getChoices()
diff --git a/apps/openmw/mwscript/aiextensions.cpp b/apps/openmw/mwscript/aiextensions.cpp
index 3b6b47bc80..519af584f0 100644
--- a/apps/openmw/mwscript/aiextensions.cpp
+++ b/apps/openmw/mwscript/aiextensions.cpp
@@ -168,7 +168,7 @@ namespace MWScript
                     if (cellID.empty())
                         return;
 
-                    if (!MWBase::Environment::get().getWorld()->getStore().get<ESM::Cell>().search({cellID.begin(), cellID.end()}))
+                    if (!MWBase::Environment::get().getWorld()->getStore().get<ESM::Cell>().search(std::string{cellID}))
                         return;
 
                     MWMechanics::AiEscort escortPackage(actorID, cellID, static_cast<int>(duration), x, y, z, repeat);
diff --git a/apps/openmw/mwscript/animationextensions.cpp b/apps/openmw/mwscript/animationextensions.cpp
index a53b08d516..12fe5256be 100644
--- a/apps/openmw/mwscript/animationextensions.cpp
+++ b/apps/openmw/mwscript/animationextensions.cpp
@@ -58,7 +58,7 @@ namespace MWScript
                             throw std::runtime_error ("animation mode out of range");
                     }
 
-                    MWBase::Environment::get().getMechanicsManager()->playAnimationGroup(ptr, {group.begin(), group.end()}, mode, std::numeric_limits<int>::max(), true);
+                    MWBase::Environment::get().getMechanicsManager()->playAnimationGroup(ptr, std::string{group}, mode, std::numeric_limits<int>::max(), true);
                }
         };
 
@@ -94,7 +94,7 @@ namespace MWScript
                             throw std::runtime_error ("animation mode out of range");
                     }
 
-                    MWBase::Environment::get().getMechanicsManager()->playAnimationGroup(ptr, {group.begin(), group.end()}, mode, loops + 1, true);
+                    MWBase::Environment::get().getMechanicsManager()->playAnimationGroup(ptr, std::string{group}, mode, loops + 1, true);
                }
         };
         
diff --git a/apps/openmw/mwscript/cellextensions.cpp b/apps/openmw/mwscript/cellextensions.cpp
index 2e11631a28..0419d37962 100644
--- a/apps/openmw/mwscript/cellextensions.cpp
+++ b/apps/openmw/mwscript/cellextensions.cpp
@@ -87,8 +87,7 @@ namespace MWScript
 
                 void execute (Interpreter::Runtime& runtime) override
                 {
-                    std::string_view cellView = runtime.getStringLiteral(runtime[0].mInteger);
-                    std::string cell{cellView.begin(), cellView.end()};
+                    std::string cell{runtime.getStringLiteral(runtime[0].mInteger)};
                     runtime.pop();
 
                     ESM::Position pos;
diff --git a/apps/openmw/mwscript/containerextensions.cpp b/apps/openmw/mwscript/containerextensions.cpp
index 78919d4b48..11e9095e2c 100644
--- a/apps/openmw/mwscript/containerextensions.cpp
+++ b/apps/openmw/mwscript/containerextensions.cpp
@@ -116,7 +116,7 @@ namespace MWScript
                     // Explicit calls to non-unique actors affect the base record
                     if(!R::implicit && ptr.getClass().isActor() && MWBase::Environment::get().getWorld()->getStore().getRefCount(ptr.getCellRef().getRefId()) > 1)
                     {
-                        ptr.getClass().modifyBaseInventory(ptr.getCellRef().getRefId(), {item.begin(), item.end()}, count);
+                        ptr.getClass().modifyBaseInventory(ptr.getCellRef().getRefId(), std::string{item}, count);
                         return;
                     }
 
@@ -124,7 +124,7 @@ namespace MWScript
                     if(ptr.getClass().getType() == ESM::Container::sRecordId && (!ptr.getRefData().getCustomData() ||
                     !ptr.getClass().getContainerStore(ptr).isResolved()))
                     {
-                        ptr.getClass().modifyBaseInventory(ptr.getCellRef().getRefId(), {item.begin(), item.end()}, count);
+                        ptr.getClass().modifyBaseInventory(ptr.getCellRef().getRefId(), std::string{item}, count);
                         const ESM::Container* baseRecord = MWBase::Environment::get().getWorld()->getStore().get<ESM::Container>().find(ptr.getCellRef().getRefId());
                         const auto& ptrs = MWBase::Environment::get().getWorld()->getAll(ptr.getCellRef().getRefId());
                         for(const auto& container : ptrs)
@@ -229,14 +229,14 @@ namespace MWScript
                     // Explicit calls to non-unique actors affect the base record
                     if(!R::implicit && ptr.getClass().isActor() && MWBase::Environment::get().getWorld()->getStore().getRefCount(ptr.getCellRef().getRefId()) > 1)
                     {
-                        ptr.getClass().modifyBaseInventory(ptr.getCellRef().getRefId(), {item.begin(), item.end()}, -count);
+                        ptr.getClass().modifyBaseInventory(ptr.getCellRef().getRefId(), std::string{item}, -count);
                         return;
                     }
                     // Calls to unresolved containers affect the base record instead
                     else if(ptr.getClass().getType() == ESM::Container::sRecordId &&
                         (!ptr.getRefData().getCustomData() || !ptr.getClass().getContainerStore(ptr).isResolved()))
                     {
-                        ptr.getClass().modifyBaseInventory(ptr.getCellRef().getRefId(), {item.begin(), item.end()}, -count);
+                        ptr.getClass().modifyBaseInventory(ptr.getCellRef().getRefId(), std::string{item}, -count);
                         const ESM::Container* baseRecord = MWBase::Environment::get().getWorld()->getStore().get<ESM::Container>().find(ptr.getCellRef().getRefId());
                         const auto& ptrs = MWBase::Environment::get().getWorld()->getAll(ptr.getCellRef().getRefId());
                         for(const auto& container : ptrs)
diff --git a/apps/openmw/mwscript/dialogueextensions.cpp b/apps/openmw/mwscript/dialogueextensions.cpp
index e03aa4cb1c..f06ee022e2 100644
--- a/apps/openmw/mwscript/dialogueextensions.cpp
+++ b/apps/openmw/mwscript/dialogueextensions.cpp
@@ -34,8 +34,7 @@ namespace MWScript
                     if (ptr.isEmpty())
                         ptr = MWBase::Environment::get().getWorld()->getPlayerPtr();
 
-                    std::string_view questView = runtime.getStringLiteral(runtime[0].mInteger);
-                    std::string quest{questView.begin(), questView.end()};
+                    std::string quest{runtime.getStringLiteral(runtime[0].mInteger)};
                     runtime.pop();
 
                     Interpreter::Type_Integer index = runtime[0].mInteger;
@@ -60,13 +59,13 @@ namespace MWScript
 
                 void execute (Interpreter::Runtime& runtime) override
                 {
-                    std::string_view quest = runtime.getStringLiteral(runtime[0].mInteger);
+                    std::string quest{runtime.getStringLiteral(runtime[0].mInteger)};
                     runtime.pop();
 
                     Interpreter::Type_Integer index = runtime[0].mInteger;
                     runtime.pop();
 
-                    MWBase::Environment::get().getJournal()->setJournalIndex({quest.begin(), quest.end()}, index);
+                    MWBase::Environment::get().getJournal()->setJournalIndex (quest, index);
                 }
         };
 
@@ -76,10 +75,10 @@ namespace MWScript
 
                 void execute (Interpreter::Runtime& runtime) override
                 {
-                    std::string_view quest = runtime.getStringLiteral(runtime[0].mInteger);
+                    std::string quest{runtime.getStringLiteral(runtime[0].mInteger)};
                     runtime.pop();
 
-                    int index = MWBase::Environment::get().getJournal()->getJournalIndex({quest.begin(), quest.end()});
+                    int index = MWBase::Environment::get().getJournal()->getJournalIndex (quest);
 
                     runtime.push (index);
 
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index 341bb0d6dd..d620882dde 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -60,7 +60,7 @@ namespace
         }
 
         ESM::LevelledListBase::LevelItem item;
-        item.mId = {itemId.begin(), itemId.end()};
+        item.mId = std::string{itemId};
         item.mLevel = level;
         list->mList.push_back(item);
     }
@@ -206,13 +206,13 @@ namespace MWScript
 
             void execute (Interpreter::Runtime& runtime) override
             {
-                std::string_view name = runtime.getStringLiteral(runtime[0].mInteger);
+                std::string name{runtime.getStringLiteral(runtime[0].mInteger)};
                 runtime.pop();
 
                 bool allowSkipping = runtime[0].mInteger != 0;
                 runtime.pop();
 
-                MWBase::Environment::get().getWindowManager()->playVideo({name.begin(), name.end()}, allowSkipping);
+                MWBase::Environment::get().getWindowManager()->playVideo (name, allowSkipping);
             }
         };
 
@@ -560,7 +560,7 @@ namespace MWScript
                     char *end;
                     long key = strtol(effect.data(), &end, 10);
                     if(key < 0 || key > 32767 || *end != '\0')
-                        key = ESM::MagicEffect::effectStringToId({effect.begin(), effect.end()});
+                        key = ESM::MagicEffect::effectStringToId({effect});
 
                     const MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
 
@@ -587,8 +587,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string_view creatureView = runtime.getStringLiteral(runtime[0].mInteger);
-                    std::string creature{creatureView.begin(), creatureView.end()};
+                    std::string creature{runtime.getStringLiteral(runtime[0].mInteger)};
                     runtime.pop();
 
                     std::string_view gem = runtime.getStringLiteral(runtime[0].mInteger);
@@ -600,7 +599,7 @@ namespace MWScript
                     const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
                     store.get<ESM::Creature>().find(creature); // This line throws an exception if it can't find the creature
 
-                    MWWorld::Ptr item = *ptr.getClass().getContainerStore(ptr).add({gem.begin(), gem.end()}, 1, ptr);
+                    MWWorld::Ptr item = *ptr.getClass().getContainerStore(ptr).add(gem, 1, ptr);
 
                     // Set the soul on just one of the gems, not the whole stack
                     item.getContainerStore()->unstack(item, ptr);
@@ -1214,16 +1213,16 @@ namespace MWScript
             {
                 MWWorld::Ptr ptr = R()(runtime);
 
-                std::string_view spellId = runtime.getStringLiteral(runtime[0].mInteger);
+                std::string spellId{runtime.getStringLiteral(runtime[0].mInteger)};
                 runtime.pop();
 
                 std::string targetId = ::Misc::StringUtils::lowerCase(runtime.getStringLiteral(runtime[0].mInteger));
                 runtime.pop();
 
-                const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search({spellId.begin(), spellId.end()});
+                const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(spellId);
                 if (!spell)
                 {
-                    runtime.getContext().report("spellcasting failed: cannot find spell \""+std::string{spellId.begin(), spellId.end()}+"\"");
+                    runtime.getContext().report("spellcasting failed: cannot find spell \""+spellId+"\"");
                     return;
                 }
 
@@ -1263,13 +1262,13 @@ namespace MWScript
             {
                 MWWorld::Ptr ptr = R()(runtime);
 
-                std::string_view spellId = runtime.getStringLiteral(runtime[0].mInteger);
+                std::string spellId{runtime.getStringLiteral(runtime[0].mInteger)};
                 runtime.pop();
 
-                const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search({spellId.begin(), spellId.end()});
+                const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(spellId);
                 if (!spell)
                 {
-                    runtime.getContext().report("spellcasting failed: cannot find spell \""+std::string{spellId.begin(), spellId.end()}+"\"");
+                    runtime.getContext().report("spellcasting failed: cannot find spell \""+spellId+"\"");
                     return;
                 }
 
@@ -1426,14 +1425,14 @@ namespace MWScript
         public:
             void execute(Interpreter::Runtime &runtime) override
             {
-                std::string_view levId = runtime.getStringLiteral(runtime[0].mInteger);
+                std::string levId{runtime.getStringLiteral(runtime[0].mInteger)};
                 runtime.pop();
                 std::string_view creatureId = runtime.getStringLiteral(runtime[0].mInteger);
                 runtime.pop();
                 int level = runtime[0].mInteger;
                 runtime.pop();
 
-                ESM::CreatureLevList listCopy = *MWBase::Environment::get().getWorld()->getStore().get<ESM::CreatureLevList>().find({levId.begin(), levId.end()});
+                ESM::CreatureLevList listCopy = *MWBase::Environment::get().getWorld()->getStore().get<ESM::CreatureLevList>().find(levId);
                 addToLevList(&listCopy, creatureId, level);
                 MWBase::Environment::get().getWorld()->createOverrideRecord(listCopy);
             }
@@ -1444,14 +1443,14 @@ namespace MWScript
         public:
             void execute(Interpreter::Runtime &runtime) override
             {
-                std::string_view levId = runtime.getStringLiteral(runtime[0].mInteger);
+                std::string levId{runtime.getStringLiteral(runtime[0].mInteger)};
                 runtime.pop();
                 std::string_view creatureId = runtime.getStringLiteral(runtime[0].mInteger);
                 runtime.pop();
                 int level = runtime[0].mInteger;
                 runtime.pop();
 
-                ESM::CreatureLevList listCopy = *MWBase::Environment::get().getWorld()->getStore().get<ESM::CreatureLevList>().find({levId.begin(), levId.end()});
+                ESM::CreatureLevList listCopy = *MWBase::Environment::get().getWorld()->getStore().get<ESM::CreatureLevList>().find(levId);
                 removeFromLevList(&listCopy, creatureId, level);
                 MWBase::Environment::get().getWorld()->createOverrideRecord(listCopy);
             }
@@ -1462,14 +1461,14 @@ namespace MWScript
         public:
             void execute(Interpreter::Runtime &runtime) override
             {
-                std::string_view levId = runtime.getStringLiteral(runtime[0].mInteger);
+                std::string levId{runtime.getStringLiteral(runtime[0].mInteger)};
                 runtime.pop();
                 std::string_view itemId = runtime.getStringLiteral(runtime[0].mInteger);
                 runtime.pop();
                 int level = runtime[0].mInteger;
                 runtime.pop();
 
-                ESM::ItemLevList listCopy = *MWBase::Environment::get().getWorld()->getStore().get<ESM::ItemLevList>().find({levId.begin(), levId.end()});
+                ESM::ItemLevList listCopy = *MWBase::Environment::get().getWorld()->getStore().get<ESM::ItemLevList>().find(levId);
                 addToLevList(&listCopy, itemId, level);
                 MWBase::Environment::get().getWorld()->createOverrideRecord(listCopy);
             }
@@ -1480,14 +1479,14 @@ namespace MWScript
         public:
             void execute(Interpreter::Runtime &runtime) override
             {
-                std::string_view levId = runtime.getStringLiteral(runtime[0].mInteger);
+                std::string levId{runtime.getStringLiteral(runtime[0].mInteger)};
                 runtime.pop();
                 std::string_view itemId = runtime.getStringLiteral(runtime[0].mInteger);
                 runtime.pop();
                 int level = runtime[0].mInteger;
                 runtime.pop();
 
-                ESM::ItemLevList listCopy = *MWBase::Environment::get().getWorld()->getStore().get<ESM::ItemLevList>().find({levId.begin(), levId.end()});
+                ESM::ItemLevList listCopy = *MWBase::Environment::get().getWorld()->getStore().get<ESM::ItemLevList>().find(levId);
                 removeFromLevList(&listCopy, itemId, level);
                 MWBase::Environment::get().getWorld()->createOverrideRecord(listCopy);
             }
diff --git a/apps/openmw/mwscript/skyextensions.cpp b/apps/openmw/mwscript/skyextensions.cpp
index b7b79f8ed4..f81645b280 100644
--- a/apps/openmw/mwscript/skyextensions.cpp
+++ b/apps/openmw/mwscript/skyextensions.cpp
@@ -87,8 +87,7 @@ namespace MWScript
 
                 void execute (Interpreter::Runtime& runtime) override
                 {
-                    std::string_view regionView = runtime.getStringLiteral(runtime[0].mInteger);
-                    std::string region{regionView.begin(), regionView.end()};
+                    std::string region{runtime.getStringLiteral(runtime[0].mInteger)};
                     runtime.pop();
 
                     Interpreter::Type_Integer id = runtime[0].mInteger;
@@ -108,8 +107,7 @@ namespace MWScript
 
                 void execute (Interpreter::Runtime& runtime, unsigned int arg0) override
                 {
-                    std::string_view regionView = runtime.getStringLiteral(runtime[0].mInteger);
-                    std::string region{regionView.begin(), regionView.end()};
+                    std::string region{runtime.getStringLiteral(runtime[0].mInteger)};
                     runtime.pop();
 
                     std::vector<char> chances;
diff --git a/apps/openmw/mwscript/soundextensions.cpp b/apps/openmw/mwscript/soundextensions.cpp
index 42bb59d1ec..1e0ad12946 100644
--- a/apps/openmw/mwscript/soundextensions.cpp
+++ b/apps/openmw/mwscript/soundextensions.cpp
@@ -33,16 +33,16 @@ namespace MWScript
                     MWScript::InterpreterContext& context
                         = static_cast<MWScript::InterpreterContext&> (runtime.getContext());
 
-                    std::string_view file = runtime.getStringLiteral(runtime[0].mInteger);
+                    std::string file{runtime.getStringLiteral(runtime[0].mInteger)};
                     runtime.pop();
 
-                    std::string_view text = runtime.getStringLiteral(runtime[0].mInteger);
+                    std::string text{runtime.getStringLiteral(runtime[0].mInteger)};
                     runtime.pop();
 
-                    MWBase::Environment::get().getSoundManager()->say(ptr, {file.begin(), file.end()});
+                    MWBase::Environment::get().getSoundManager()->say (ptr, file);
 
                     if (MWBase::Environment::get().getWindowManager ()->getSubtitlesEnabled())
-                        context.messageBox({text.begin(), text.end()});
+                        context.messageBox (text);
                 }
         };
 
@@ -65,10 +65,10 @@ namespace MWScript
 
                 void execute (Interpreter::Runtime& runtime) override
                 {
-                    std::string_view sound = runtime.getStringLiteral(runtime[0].mInteger);
+                    std::string sound{runtime.getStringLiteral(runtime[0].mInteger)};
                     runtime.pop();
 
-                    MWBase::Environment::get().getSoundManager()->streamMusic({sound.begin(), sound.end()});
+                    MWBase::Environment::get().getSoundManager()->streamMusic (sound);
                 }
         };
 
diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp
index 1df763cf8e..4be2b9b8f4 100644
--- a/apps/openmw/mwscript/statsextensions.cpp
+++ b/apps/openmw/mwscript/statsextensions.cpp
@@ -447,10 +447,10 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string_view id = runtime.getStringLiteral(runtime[0].mInteger);
+                    std::string id{runtime.getStringLiteral(runtime[0].mInteger)};
                     runtime.pop();
 
-                    const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find({id.begin(), id.end()});
+                    const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find (id);
 
                     MWMechanics::CreatureStats& creatureStats = ptr.getClass().getCreatureStats(ptr);
                     creatureStats.getSpells().add(spell);
@@ -474,11 +474,11 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string_view id = runtime.getStringLiteral(runtime[0].mInteger);
+                    std::string id{runtime.getStringLiteral(runtime[0].mInteger)};
                     runtime.pop();
 
                     MWMechanics::CreatureStats& creatureStats = ptr.getClass().getCreatureStats(ptr);
-                    creatureStats.getSpells().remove({id.begin(), id.end()});
+                    creatureStats.getSpells().remove (id);
 
                     MWBase::WindowManager *wm = MWBase::Environment::get().getWindowManager();
 
@@ -532,12 +532,12 @@ namespace MWScript
 
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string_view id = runtime.getStringLiteral(runtime[0].mInteger);
+                    std::string id{runtime.getStringLiteral(runtime[0].mInteger)};
                     runtime.pop();
 
                     Interpreter::Type_Integer value = 0;
 
-                    if (ptr.getClass().isActor() && ptr.getClass().getCreatureStats(ptr).getSpells().hasSpell({id.begin(), id.end()}))
+                    if (ptr.getClass().isActor() && ptr.getClass().getCreatureStats(ptr).getSpells().hasSpell(id))
                         value = 1;
 
                     runtime.push (value);
@@ -748,8 +748,8 @@ namespace MWScript
 
                 void execute (Interpreter::Runtime& runtime) override
                 {
-                    std::string_view id = runtime.getStringLiteral(runtime[0].mInteger);
-                    runtime[0].mInteger = MWBase::Environment::get().getMechanicsManager()->countDeaths({id.begin(), id.end()});
+                    std::string id{runtime.getStringLiteral(runtime[0].mInteger)};
+                    runtime[0].mInteger = MWBase::Environment::get().getMechanicsManager()->countDeaths (id);
                 }
         };
 
diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index 8617d7eedd..dbcb1087f9 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -74,8 +74,7 @@ namespace MWScript
                     const MWWorld::Ptr to = MWBase::Environment::get().getWorld()->searchPtr(name, false);
                     if (to.isEmpty())
                     {
-                        std::string error = "Failed to find an instance of object '";
-                        error += name; error += "'";
+                        std::string error = "Failed to find an instance of object '" + std::string(name) + "'";
                         runtime.getContext().report(error);
                         Log(Debug::Error) << error;
                         runtime.push(0.f);
@@ -381,8 +380,7 @@ namespace MWScript
                     runtime.pop();
                     Interpreter::Type_Float zRot = runtime[0].mFloat;
                     runtime.pop();
-                    std::string_view cellIDView = runtime.getStringLiteral(runtime[0].mInteger);
-                    std::string cellID{cellIDView.begin(), cellIDView.end()};
+                    std::string cellID{runtime.getStringLiteral(runtime[0].mInteger)};
                     runtime.pop();
 
                     if (ptr.getContainerStore())
@@ -499,8 +497,7 @@ namespace MWScript
                 {
                     std::string_view itemID = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
-                    std::string_view cellIDView = runtime.getStringLiteral(runtime[0].mInteger);
-                    std::string cellID{cellIDView.begin(), cellIDView.end()};
+                    std::string cellID{runtime.getStringLiteral(runtime[0].mInteger)};
                     runtime.pop();
 
                     Interpreter::Type_Float x = runtime[0].mFloat;
diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index aee110286e..14a19c482c 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -278,7 +278,7 @@ bool MWWorld::ContainerStore::stacks(const ConstPtr& ptr1, const ConstPtr& ptr2)
             && cls2.getItemHealth(ptr2) == cls2.getItemMaxHealth(ptr2)));
 }
 
-MWWorld::ContainerStoreIterator MWWorld::ContainerStore::add(const std::string &id, int count, const Ptr &actorPtr)
+MWWorld::ContainerStoreIterator MWWorld::ContainerStore::add(std::string_view id, int count, const Ptr &actorPtr)
 {
     MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), id, count);
     return add(ref.getPtr(), count, actorPtr);
diff --git a/apps/openmw/mwworld/containerstore.hpp b/apps/openmw/mwworld/containerstore.hpp
index 38ae933581..74e46ea5f4 100644
--- a/apps/openmw/mwworld/containerstore.hpp
+++ b/apps/openmw/mwworld/containerstore.hpp
@@ -175,7 +175,7 @@ namespace MWWorld
             ///
             /// @return if stacking happened, return iterator to the item that was stacked against, otherwise iterator to the newly inserted item.
 
-            ContainerStoreIterator add(const std::string& id, int count, const Ptr& actorPtr);
+            ContainerStoreIterator add(std::string_view id, int count, const Ptr& actorPtr);
             ///< Utility to construct a ManualRef and call add(ptr, count, actorPtr, true)
 
             int remove(std::string_view itemId, int count, const Ptr& actor, bool equipReplacement = 0, bool resolve = true);
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 54dc94d0b0..a4405ae75a 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -767,8 +767,7 @@ namespace MWWorld
         Ptr ret = searchPtr(name, activeOnly);
         if (!ret.isEmpty())
             return ret;
-        std::string error = "failed to find an instance of object '";
-        error += name; error += "'";
+        std::string error = "failed to find an instance of object '" + std::string(name) + error;
         if (activeOnly)
             error += " in active cells";
         throw std::runtime_error(error);
diff --git a/apps/openmw_test_suite/mwscript/test_utils.hpp b/apps/openmw_test_suite/mwscript/test_utils.hpp
index e0bf8d0440..15f2fae661 100644
--- a/apps/openmw_test_suite/mwscript/test_utils.hpp
+++ b/apps/openmw_test_suite/mwscript/test_utils.hpp
@@ -128,11 +128,11 @@ namespace
 
         float getFloat(std::string_view name) const { return getGlobal(name, mFloats); };
 
-        void setShort(std::string_view name, int value) { mShorts[{name.begin(), name.end()}] = value; };
+        void setShort(std::string_view name, int value) { mShorts[std::string(name)] = value; };
 
-        void setLong(std::string_view name, int value) { mLongs[{name.begin(), name.end()}] = value; };
+        void setLong(std::string_view name, int value) { mLongs[std::string(name)] = value; };
 
-        void setFloat(std::string_view name, float value) { mFloats[{name.begin(), name.end()}] = value; };
+        void setFloat(std::string_view name, float value) { mFloats[std::string(name)] = value; };
     };
 
     class TestInterpreterContext : public Interpreter::Context
@@ -224,11 +224,11 @@ namespace
             return {};
         };
 
-        void setMemberShort(std::string_view id, std::string_view name, int value, bool global) override { mMembers[{id.begin(), id.end()}].setShort(name, value); };
+        void setMemberShort(std::string_view id, std::string_view name, int value, bool global) override { mMembers[std::string(id)].setShort(name, value); };
 
-        void setMemberLong(std::string_view id, std::string_view name, int value, bool global) override { mMembers[{id.begin(), id.end()}].setLong(name, value); };
+        void setMemberLong(std::string_view id, std::string_view name, int value, bool global) override { mMembers[std::string(id)].setLong(name, value); };
 
-        void setMemberFloat(std::string_view id, std::string_view name, float value, bool global) override { mMembers[{id.begin(), id.end()}].setFloat(name, value); };
+        void setMemberFloat(std::string_view id, std::string_view name, float value, bool global) override { mMembers[std::string(id)].setFloat(name, value); };
     };
 
     struct CompiledScript
diff --git a/components/esm3/loadmgef.cpp b/components/esm3/loadmgef.cpp
index 9707f2f255..5fb88a3606 100644
--- a/components/esm3/loadmgef.cpp
+++ b/components/esm3/loadmgef.cpp
@@ -533,10 +533,10 @@ const std::string &MagicEffect::effectIdToString(short effectID)
 }
 
 class FindSecond {
-    const std::string &mName;
+    std::string_view mName;
 
 public:
-    FindSecond(const std::string &name) : mName(name) { }
+    FindSecond(std::string_view name) : mName(name) { }
 
     bool operator()(const std::pair<short,std::string> &item) const
     {
@@ -546,13 +546,13 @@ public:
     }
 };
 
-short MagicEffect::effectStringToId(const std::string &effect)
+short MagicEffect::effectStringToId(std::string_view effect)
 {
     std::map<short,std::string>::const_iterator name;
 
     name = std::find_if(sNames.begin(), sNames.end(), FindSecond(effect));
     if(name == sNames.end())
-        throw std::runtime_error(std::string("Unimplemented effect ")+effect);
+        throw std::runtime_error("Unimplemented effect " + std::string(effect));
 
     return name->first;
 }
diff --git a/components/esm3/loadmgef.hpp b/components/esm3/loadmgef.hpp
index 64d89dab39..b9151f5d33 100644
--- a/components/esm3/loadmgef.hpp
+++ b/components/esm3/loadmgef.hpp
@@ -2,6 +2,7 @@
 #define OPENMW_ESM_MGEF_H
 
 #include <string>
+#include <string_view>
 #include <map>
 
 namespace ESM
@@ -70,7 +71,7 @@ struct MagicEffect
     static const std::map<short,std::string> sNames;
 
     static const std::string &effectIdToString(short effectID);
-    static short effectStringToId(const std::string &effect);
+    static short effectStringToId(std::string_view effect);
 
     /// Returns the effect that provides resistance against \a effect (or -1 if there's none)
     static short getResistanceEffect(short effect);
diff --git a/components/interpreter/miscopcodes.hpp b/components/interpreter/miscopcodes.hpp
index 1a35dda0ce..32b4df2e47 100644
--- a/components/interpreter/miscopcodes.hpp
+++ b/components/interpreter/miscopcodes.hpp
@@ -137,8 +137,7 @@ namespace Interpreter
                 {
                     index = runtime[0].mInteger;
                     runtime.pop();
-                    std::string_view button = runtime.getStringLiteral(index);
-                    buttons.emplace_back(button.begin(), button.end());
+                    buttons.emplace_back(runtime.getStringLiteral(index));
                 }
 
                 std::reverse (buttons.begin(), buttons.end());

From 5146d9fc55c2543e4e3c124a0df5dd36e4880699 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 22 May 2022 09:51:08 +0200
Subject: [PATCH 2497/2859] Fix

---
 apps/openmw/mwworld/worldimp.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index a4405ae75a..6b9930a989 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -767,7 +767,7 @@ namespace MWWorld
         Ptr ret = searchPtr(name, activeOnly);
         if (!ret.isEmpty())
             return ret;
-        std::string error = "failed to find an instance of object '" + std::string(name) + error;
+        std::string error = "failed to find an instance of object '" + std::string(name) + "'";
         if (activeOnly)
             error += " in active cells";
         throw std::runtime_error(error);

From ea295a2ac3d44734706703b9ae44e8cd88efd837 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 22 May 2022 02:40:03 +0200
Subject: [PATCH 2498/2859] Fix build with lld linker

Boost.Filesystem started to depend on Boost.Atomic on 1.77.0 version but lld
can't find library on its own:

libboost_atomic.so.1.79.0 => not found
---
 CMakeLists.txt            | 5 +++++
 components/CMakeLists.txt | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index de0469c7c9..074b1bcd33 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -432,6 +432,11 @@ endif()
 set(Boost_NO_BOOST_CMAKE ON)
 
 find_package(Boost 1.6.2 REQUIRED COMPONENTS ${BOOST_COMPONENTS} OPTIONAL_COMPONENTS ${BOOST_OPTIONAL_COMPONENTS})
+
+if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.77.0)
+    find_package(Boost 1.77.0 REQUIRED COMPONENTS atomic)
+endif()
+
 if(OPENMW_USE_SYSTEM_MYGUI)
     find_package(MyGUI 3.4.1 REQUIRED)
 endif()
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 8e7f1bbfa5..ad6bddee82 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -411,6 +411,10 @@ target_link_libraries(components
     yaml-cpp
     )
 
+if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.77.0)
+    target_link_libraries(components ${Boost_ATOMIC_LIBRARY})
+endif()
+
 target_link_libraries(components ${BULLET_LIBRARIES})
 
 if (WIN32)

From fb732d74a276e2bf9cad60a656bfdf377d979815 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sun, 22 May 2022 18:52:05 +0200
Subject: [PATCH 2499/2859] Remove boost::filesystem from bsatool

---
 apps/bsatool/bsatool.cpp     | 31 +++++++++++++++----------------
 components/esm3/loadcell.cpp |  2 --
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/apps/bsatool/bsatool.cpp b/apps/bsatool/bsatool.cpp
index 24c98fd139..a8e28fcfb3 100644
--- a/apps/bsatool/bsatool.cpp
+++ b/apps/bsatool/bsatool.cpp
@@ -1,10 +1,10 @@
+#include <filesystem>
+#include <fstream>
 #include <iostream>
 #include <iomanip>
 #include <vector>
 
 #include <boost/program_options.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/filesystem/fstream.hpp>
 
 #include <components/bsa/compressedbsafile.hpp>
 #include <components/misc/stringops.hpp>
@@ -13,7 +13,6 @@
 
 // Create local aliases for brevity
 namespace bpo = boost::program_options;
-namespace bfs = boost::filesystem;
 
 struct Arguments
 {
@@ -201,26 +200,26 @@ int extract(std::unique_ptr<File>& bsa, Arguments& info)
     }
 
     // Get the target path (the path the file will be extracted to)
-    bfs::path relPath (extractPath);
-    bfs::path outdir (info.outdir);
+    std::filesystem::path relPath (extractPath);
+    std::filesystem::path outdir (info.outdir);
 
-    bfs::path target;
+    std::filesystem::path target;
     if (info.fullpath)
         target = outdir / relPath;
     else
         target = outdir / relPath.filename();
 
     // Create the directory hierarchy
-    bfs::create_directories(target.parent_path());
+    std::filesystem::create_directories(target.parent_path());
 
-    bfs::file_status s = bfs::status(target.parent_path());
-    if (!bfs::is_directory(s))
+    std::filesystem::file_status s = std::filesystem::status(target.parent_path());
+    if (!std::filesystem::is_directory(s))
     {
         std::cout << "ERROR: " << target.parent_path() << " is not a directory." << std::endl;
         return 3;
     }
 
-    bfs::ofstream out(target, std::ios::binary);
+    std::ofstream out(target, std::ios::binary);
 
     // Write the file to disk
     std::cout << "Extracting " << info.extractfile << " to " << target << std::endl;
@@ -240,14 +239,14 @@ int extractAll(std::unique_ptr<File>& bsa, Arguments& info)
         Misc::StringUtils::replaceAll(extractPath, "\\", "/");
 
         // Get the target path (the path the file will be extracted to)
-        bfs::path target (info.outdir);
+        std::filesystem::path target (info.outdir);
         target /= extractPath;
 
         // Create the directory hierarchy
-        bfs::create_directories(target.parent_path());
+        std::filesystem::create_directories(target.parent_path());
 
-        bfs::file_status s = bfs::status(target.parent_path());
-        if (!bfs::is_directory(s))
+        std::filesystem::file_status s = std::filesystem::status(target.parent_path());
+        if (!std::filesystem::is_directory(s))
         {
             std::cout << "ERROR: " << target.parent_path() << " is not a directory." << std::endl;
             return 3;
@@ -255,7 +254,7 @@ int extractAll(std::unique_ptr<File>& bsa, Arguments& info)
 
         // Get a stream for the file to extract
         Files::IStreamPtr data = bsa->getFile(&file);
-        bfs::ofstream out(target, std::ios::binary);
+        std::ofstream out(target, std::ios::binary);
 
         // Write the file to disk
         std::cout << "Extracting " << target << std::endl;
@@ -269,7 +268,7 @@ int extractAll(std::unique_ptr<File>& bsa, Arguments& info)
 template<typename File>
 int add(std::unique_ptr<File>& bsa, Arguments& info)
 {
-    boost::filesystem::fstream stream(info.addfile, std::ios_base::binary | std::ios_base::out | std::ios_base::in);
+    std::fstream stream(info.addfile, std::ios_base::binary | std::ios_base::out | std::ios_base::in);
     bsa->addFile(info.addfile, stream);
 
     return 0;
diff --git a/components/esm3/loadcell.cpp b/components/esm3/loadcell.cpp
index 9ab9eacba1..204dba2879 100644
--- a/components/esm3/loadcell.cpp
+++ b/components/esm3/loadcell.cpp
@@ -4,8 +4,6 @@
 #include <limits>
 #include <list>
 
-#include <boost/concept_check.hpp>
-
 #include <components/debug/debuglog.hpp>
 #include <components/misc/stringops.hpp>
 

From 472af7c16453f586551d1d0f09ca375ccdb0bafd Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sun, 22 May 2022 18:56:14 +0200
Subject: [PATCH 2500/2859] Remove boost::filesystem from niftest

---
 apps/niftest/niftest.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/niftest/niftest.cpp b/apps/niftest/niftest.cpp
index 8f8f9c979e..4a13e56e80 100644
--- a/apps/niftest/niftest.cpp
+++ b/apps/niftest/niftest.cpp
@@ -1,6 +1,7 @@
 ///Program to test .nif files both on the FileSystem and in BSA archives.
 
 #include <iostream>
+#include <filesystem>
 
 #include <components/misc/stringops.hpp>
 #include <components/nif/niffile.hpp>
@@ -10,11 +11,9 @@
 #include <components/vfs/filesystemarchive.hpp>
 
 #include <boost/program_options.hpp>
-#include <boost/filesystem.hpp>
 
 // Create local aliases for brevity
 namespace bpo = boost::program_options;
-namespace bfs = boost::filesystem;
 
 ///See if the file has the named extension
 bool hasExtension(std::string filename, std::string extensionToFind)
@@ -138,7 +137,7 @@ int main(int argc, char **argv)
 //                 std::cout << "Reading BSA File: " << name << std::endl;
                 readVFS(new VFS::BsaArchive(name));
              }
-             else if(bfs::is_directory(bfs::path(name)))
+             else if(std::filesystem::is_directory(std::filesystem::path(name)))
              {
 //                 std::cout << "Reading All Files in: " << name << std::endl;
                 readVFS(new VFS::FileSystemArchive(name),name);

From 6db4b78dcb82ae20f94695d20afa71b6c809ebb3 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 23 May 2022 01:08:53 +0200
Subject: [PATCH 2501/2859] Fix playing explore music after loading the game
 from main menu

---
 apps/openmw/mwmechanics/actors.hpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index a1f93a5dc5..547c2916e2 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -183,6 +183,7 @@ namespace MWMechanics
         private:
             enum class MusicType
             {
+                Title,
                 Explore,
                 Battle
             };
@@ -198,7 +199,7 @@ namespace MWMechanics
             float mSneakSkillTimer = 0; // Times sneak skill progress from "avoid notice"
             float mActorsProcessingRange;
             bool mSmoothMovement;
-            MusicType mCurrentMusic = MusicType::Explore;
+            MusicType mCurrentMusic = MusicType::Title;
 
             void updateVisibility (const MWWorld::Ptr& ptr, CharacterController& ctrl);
 

From 6093cb5f2cc9b7ab89f8cc59a54165b91cb67f3b Mon Sep 17 00:00:00 2001
From: cody glassman <glassmancody.info@gmail.com>
Date: Sun, 22 May 2022 18:53:38 -0700
Subject: [PATCH 2502/2859] postprocessing lua api extensions

---
 apps/openmw/mwgui/postprocessorhud.cpp        |  15 +--
 apps/openmw/mwlua/postprocessingbindings.cpp  | 105 ++++++++++++------
 apps/openmw/mwrender/postprocessor.cpp        |  51 +++++----
 apps/openmw/mwrender/postprocessor.hpp        |  15 ++-
 apps/openmw_test_suite/fx/technique.cpp       |   2 +-
 components/fx/technique.cpp                   |  38 +++++--
 components/fx/types.hpp                       |  73 +++++++++---
 components/settings/shadermanager.hpp         |   1 +
 .../source/reference/postprocessing/omwfx.rst |  12 +-
 .../reference/postprocessing/overview.rst     |   2 +-
 files/lua_api/openmw/postprocessing.lua       |  54 +++++++--
 11 files changed, 264 insertions(+), 104 deletions(-)

diff --git a/apps/openmw/mwgui/postprocessorhud.cpp b/apps/openmw/mwgui/postprocessorhud.cpp
index cfdbfda7e8..5e46f1e735 100644
--- a/apps/openmw/mwgui/postprocessorhud.cpp
+++ b/apps/openmw/mwgui/postprocessorhud.cpp
@@ -296,7 +296,7 @@ namespace MWGui
 
         auto technique = processor->loadTechnique(name);
 
-        if (!technique)
+        if (!technique || technique->getStatus() == fx::Technique::Status::File_Not_exists)
             return;
 
         while (mConfigArea->getChildCount() > 0)
@@ -304,9 +304,6 @@ namespace MWGui
 
         mShaderInfo->setCaption("");
 
-        if (!technique)
-            return;
-
         std::ostringstream ss;
 
         const std::string NA = "NA";
@@ -322,8 +319,8 @@ namespace MWGui
 
         const auto flags = technique->getFlags();
 
-        const auto flag_interior = serializeBool (!(flags & fx::Technique::Flag_Disable_Interiors));
-        const auto flag_exterior = serializeBool (!(flags & fx::Technique::Flag_Disable_Exteriors));
+        const auto flag_interior = serializeBool(!(flags & fx::Technique::Flag_Disable_Interiors));
+        const auto flag_exterior = serializeBool(!(flags & fx::Technique::Flag_Disable_Exteriors));
         const auto flag_underwater = serializeBool(!(flags & fx::Technique::Flag_Disable_Underwater));
         const auto flag_abovewater = serializeBool(!(flags & fx::Technique::Flag_Disable_Abovewater));
 
@@ -339,14 +336,12 @@ namespace MWGui
                     << "#{fontcolourhtml=header}   Underwater: #{fontcolourhtml=normal} " << flag_underwater
                     << "#{fontcolourhtml=header}   Abovewater: #{fontcolourhtml=normal} " << flag_abovewater;
                 break;
-            case fx::Technique::Status::File_Not_exists:
-                ss  << "#{fontcolourhtml=negative}Shader Error: #{fontcolourhtml=header} <" << std::string(technique->getFileName()) << ">#{fontcolourhtml=normal} not found." << endl << endl
-                    << "Ensure the shader file is in a 'Shaders/' sub directory in a data files directory";
-                break;
             case fx::Technique::Status::Parse_Error:
                 ss  << "#{fontcolourhtml=negative}Shader Compile Error: #{fontcolourhtml=normal} <" << std::string(technique->getName()) << "> failed to compile." << endl << endl
                     << technique->getLastError();
                 break;
+            case fx::Technique::Status::File_Not_exists:
+                break;
         }
 
         mShaderInfo->setCaptionWithReplacing(ss.str());
diff --git a/apps/openmw/mwlua/postprocessingbindings.cpp b/apps/openmw/mwlua/postprocessingbindings.cpp
index 187c9c700b..8699c5654a 100644
--- a/apps/openmw/mwlua/postprocessingbindings.cpp
+++ b/apps/openmw/mwlua/postprocessingbindings.cpp
@@ -59,9 +59,44 @@ namespace MWLua
             return Misc::StringUtils::format("Shader(%s, %s)", mShader->getName(), mShader->getFileName());
         }
 
-        bool mQueuedAction = false;
+        enum { Action_None, Action_Enable, Action_Disable } mQueuedAction = Action_None;
     };
 
+    template <class T>
+    auto getSetter(const Context& context)
+    {
+        return [context](const Shader& shader, const std::string& name, const T& value) {
+            context.mLuaManager->addAction(std::make_unique<SetUniformShaderAction<T>>(context.mLua, shader.mShader, name, value));
+        };
+    }
+
+    template <class T>
+    auto getArraySetter(const Context& context)
+    {
+        return [context](const Shader& shader, const std::string& name, const sol::table& table) {
+            auto targetSize = MWBase::Environment::get().getWorld()->getPostProcessor()->getUniformSize(shader.mShader, name);
+
+            if (!targetSize.has_value())
+                throw std::runtime_error(Misc::StringUtils::format("Failed setting uniform array '%s'", name));
+
+            if (*targetSize != table.size())
+                throw std::runtime_error(Misc::StringUtils::format("Mismatching uniform array size, got %zu expected %zu", table.size(), *targetSize));
+
+            std::vector<T> values;
+            values.reserve(*targetSize);
+
+            for (size_t i = 0; i < *targetSize; ++i)
+            {
+                sol::object obj = table[i+1];
+                if (!obj.is<T>())
+                    throw std::runtime_error("Invalid type for uniform array");
+                values.push_back(obj.as<T>());
+            }
+
+            context.mLuaManager->addAction(std::make_unique<SetUniformShaderAction<std::vector<T>>>(context.mLua, shader.mShader, name, values));
+        };
+    }
+
     sol::table initPostprocessingPackage(const Context& context)
     {
         sol::table api(context.mLua->sol(), sol::create);
@@ -76,62 +111,64 @@ namespace MWLua
                 pos = optPos.value();
 
             if (shader.mShader && shader.mShader->isValid())
-                shader.mQueuedAction = true;
+                shader.mQueuedAction = Shader::Action_Enable;
 
             context.mLuaManager->addAction(
-                [=] { MWBase::Environment::get().getWorld()->getPostProcessor()->enableTechnique(shader.mShader, pos); },
+                [=, &shader] {
+                    shader.mQueuedAction = Shader::Action_None;
+
+                    if (!MWBase::Environment::get().getWorld()->getPostProcessor()->enableTechnique(shader.mShader, pos))
+                        throw std::runtime_error("Failed enabling shader '" + shader.mShader->getName() + "'");
+                },
                 "Enable shader " + (shader.mShader ? shader.mShader->getName() : "nil")
             );
         };
 
         shader["disable"] = [context](Shader& shader)
         {
-            shader.mQueuedAction = false;
+            shader.mQueuedAction = Shader::Action_Disable;
 
             context.mLuaManager->addAction(
-                [&] { MWBase::Environment::get().getWorld()->getPostProcessor()->disableTechnique(shader.mShader); },
+                [&] {
+                    shader.mQueuedAction = Shader::Action_None;
+
+                    if (!MWBase::Environment::get().getWorld()->getPostProcessor()->disableTechnique(shader.mShader))
+                        throw std::runtime_error("Failed disabling shader '" + shader.mShader->getName() + "'");
+                },
                 "Disable shader " + (shader.mShader ? shader.mShader->getName() : "nil")
             );
         };
 
         shader["isEnabled"] = [](const Shader& shader)
         {
-            return shader.mQueuedAction;
+            if (shader.mQueuedAction == Shader::Action_Enable)
+                return true;
+            else if (shader.mQueuedAction == Shader::Action_Disable)
+                return false;
+            return MWBase::Environment::get().getWorld()->getPostProcessor()->isTechniqueEnabled(shader.mShader);
         };
 
-        shader["setBool"] = [context](const Shader& shader, const std::string& name, bool value)
-        {
-            context.mLuaManager->addAction(std::make_unique<SetUniformShaderAction<bool>>(context.mLua, shader.mShader, name, value));
-        };
-
-        shader["setFloat"] = [context](const Shader& shader, const std::string& name, float value)
-        {
-            context.mLuaManager->addAction(std::make_unique<SetUniformShaderAction<float>>(context.mLua, shader.mShader, name, value));
-        };
-
-        shader["setInt"] = [context](const Shader& shader, const std::string& name, int value)
-        {
-            context.mLuaManager->addAction(std::make_unique<SetUniformShaderAction<int>>(context.mLua, shader.mShader, name, value));
-        };
+        shader["setBool"] = getSetter<bool>(context);
+        shader["setFloat"] = getSetter<float>(context);
+        shader["setInt"] = getSetter<int>(context);
+        shader["setVector2"] = getSetter<osg::Vec2f>(context);
+        shader["setVector3"] = getSetter<osg::Vec3f>(context);
+        shader["setVector4"] = getSetter<osg::Vec4f>(context);
 
-        shader["setVector2"] = [context](const Shader& shader, const std::string& name, const osg::Vec2f& value)
-        {
-            context.mLuaManager->addAction(std::make_unique<SetUniformShaderAction<osg::Vec2f>>(context.mLua, shader.mShader, name, value));
-        };
+        shader["setFloatArray"] = getArraySetter<float>(context);
+        shader["setIntArray"] = getArraySetter<int>(context);
+        shader["setVector2Array"] = getArraySetter<osg::Vec2f>(context);
+        shader["setVector3Array"] = getArraySetter<osg::Vec3f>(context);
+        shader["setVector4Array"] = getArraySetter<osg::Vec4f>(context);
 
-        shader["setVector3"] = [context](const Shader& shader, const std::string& name, const osg::Vec3f& value)
+        api["load"] = [](const std::string& name)
         {
-            context.mLuaManager->addAction(std::make_unique<SetUniformShaderAction<osg::Vec3f>>(context.mLua, shader.mShader, name, value));
-        };
+            Shader shader{MWBase::Environment::get().getWorld()->getPostProcessor()->loadTechnique(name, false)};
 
-        shader["setVector4"] = [context](const Shader& shader, const std::string& name, const osg::Vec4f& value)
-        {
-            context.mLuaManager->addAction(std::make_unique<SetUniformShaderAction<osg::Vec4f>>(context.mLua, shader.mShader, name, value));
-        };
+            if (!shader.mShader || !shader.mShader->isValid())
+                throw std::runtime_error(Misc::StringUtils::format("Failed loading shader '%s'", name));
 
-        api["load"] = [](const std::string& name)
-        {
-            return Shader(MWBase::Environment::get().getWorld()->getPostProcessor()->loadTechnique(name, false));
+            return shader;
         };
 
         return LuaUtil::makeReadOnly(api);
diff --git a/apps/openmw/mwrender/postprocessor.cpp b/apps/openmw/mwrender/postprocessor.cpp
index a55fd3f38a..78016ceceb 100644
--- a/apps/openmw/mwrender/postprocessor.cpp
+++ b/apps/openmw/mwrender/postprocessor.cpp
@@ -406,6 +406,13 @@ namespace MWRender
 
     void PostProcessor::update(size_t frameId)
     {
+        while (!mQueuedTemplates.empty())
+        {
+            mTemplates.push_back(std::move(mQueuedTemplates.back()));
+
+            mQueuedTemplates.pop_back();
+        }
+
         updateLiveReload();
 
         reloadIfRequired();
@@ -582,7 +589,7 @@ namespace MWRender
                 if (uniform->mSamplerType) continue;
 
                 if (auto type = uniform->getType())
-                    uniform->setUniform(node.mRootStateSet->getOrCreateUniform(uniform->mName, type.value()));
+                    uniform->setUniform(node.mRootStateSet->getOrCreateUniform(uniform->mName.c_str(), *type, uniform->getNumElements()));
             }
 
             std::unordered_map<osg::Texture2D*, osg::Texture2D*> renderTargetCache;
@@ -643,7 +650,13 @@ namespace MWRender
 
     bool PostProcessor::enableTechnique(std::shared_ptr<fx::Technique> technique, std::optional<int> location)
     {
-        if (!technique || technique->getName() == "main" || (location.has_value() && location.value() <= 0))
+        if (!isEnabled())
+        {
+            Log(Debug::Warning) << "PostProcessing disabled, cannot load technique '" << technique->getName() << "'";
+            return false;
+        }
+
+        if (!technique || Misc::StringUtils::ciEqual(technique->getName(), "main") || (location.has_value() && location.value() <= 0))
             return false;
 
         disableTechnique(technique, false);
@@ -753,14 +766,21 @@ namespace MWRender
         mHUDCamera->getOrCreateStateSet()->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
     }
 
-    std::shared_ptr<fx::Technique> PostProcessor::loadTechnique(const std::string& name, bool insert)
+    std::shared_ptr<fx::Technique> PostProcessor::loadTechnique(const std::string& name, bool loadNextFrame)
     {
         if (!isEnabled())
+        {
+            Log(Debug::Warning) << "PostProcessing disabled, cannot load technique '" << name << "'";
             return nullptr;
+        }
 
-        for (size_t i = 0; i < mTemplates.size(); ++i)
-            if (name == mTemplates[i]->getName())
-                return mTemplates[i];
+        for (const auto& technique : mTemplates)
+            if (Misc::StringUtils::ciEqual(technique->getName(), name))
+                return technique;
+
+        for (const auto& technique : mQueuedTemplates)
+            if (Misc::StringUtils::ciEqual(technique->getName(), name))
+                return technique;
 
         auto technique = std::make_shared<fx::Technique>(*mVFS, *mRendering.getResourceSystem()->getImageManager(), name, mWidth, mHeight, mUBO, mNormalsSupported);
 
@@ -769,8 +789,11 @@ namespace MWRender
         if (technique->getStatus() != fx::Technique::Status::File_Not_exists)
             technique->setLastModificationTime(std::filesystem::last_write_time(mTechniqueFileMap[technique->getName()]));
 
-        if (!insert)
+        if (!loadNextFrame)
+        {
+            mQueuedTemplates.push_back(technique);
             return technique;
+        }
 
         reloadMainPass(*technique);
 
@@ -779,18 +802,6 @@ namespace MWRender
         return mTemplates.back();
     }
 
-    void PostProcessor::addTemplate(std::shared_ptr<fx::Technique> technique)
-    {
-        if (!isEnabled())
-            return;
-
-        for (size_t i = 0; i < mTemplates.size(); ++i)
-            if (technique.get() == mTemplates[i].get())
-                return;
-
-        mTemplates.push_back(technique);
-    }
-
     void PostProcessor::reloadTechniques()
     {
         if (!isEnabled())
@@ -810,7 +821,7 @@ namespace MWRender
             if (techniqueName.empty())
                 continue;
 
-            if ((&techniqueName != &techniqueStrings.front()) && Misc::StringUtils::ciEqual(techniqueName, "main"))
+            if ((&techniqueName != &techniqueStrings.front()) && techniqueName == "main")
             {
                 Log(Debug::Warning) << "main.omwfx techniqued specified in chain, this is not allowed. technique file will be ignored if it exists.";
                 continue;
diff --git a/apps/openmw/mwrender/postprocessor.hpp b/apps/openmw/mwrender/postprocessor.hpp
index a015abda4d..6663710ced 100644
--- a/apps/openmw/mwrender/postprocessor.hpp
+++ b/apps/openmw/mwrender/postprocessor.hpp
@@ -136,6 +136,16 @@ namespace MWRender
             (*it)->setValue(value);
         }
 
+        std::optional<size_t> getUniformSize(std::shared_ptr<fx::Technique> technique, const std::string& name)
+        {
+            auto it = technique->findUniform(name);
+
+            if (it == technique->getUniformMap().end())
+                return std::nullopt;
+
+            return (*it)->getNumElements();
+        }
+
         bool isTechniqueEnabled(const std::shared_ptr<fx::Technique>& technique) const;
 
         void setExteriorFlag(bool exterior) { mExteriorFlag = exterior; }
@@ -144,9 +154,7 @@ namespace MWRender
 
         void toggleMode();
 
-        std::shared_ptr<fx::Technique> loadTechnique(const std::string& name, bool insert=true);
-
-        void addTemplate(std::shared_ptr<fx::Technique> technique);
+        std::shared_ptr<fx::Technique> loadTechnique(const std::string& name, bool loadNextFrame=true);
 
         bool isEnabled() const { return mUsePostProcessing && mEnabled; }
 
@@ -192,6 +200,7 @@ namespace MWRender
 
         TechniqueList mTechniques;
         TechniqueList mTemplates;
+        TechniqueList mQueuedTemplates;
 
         std::unordered_map<std::string, std::filesystem::path> mTechniqueFileMap;
 
diff --git a/apps/openmw_test_suite/fx/technique.cpp b/apps/openmw_test_suite/fx/technique.cpp
index d10e1f1b37..9a382ad8ea 100644
--- a/apps/openmw_test_suite/fx/technique.cpp
+++ b/apps/openmw_test_suite/fx/technique.cpp
@@ -171,7 +171,7 @@ TestFile repeated_shared_block{R"(
         const auto& uniform = mTechnique->getUniformMap().front();
 
         EXPECT_TRUE(uniform->mStatic);
-        EXPECT_FLOAT_EQ(uniform->mStep, 0.5f);
+        EXPECT_DOUBLE_EQ(uniform->mStep, 0.5);
         EXPECT_EQ(uniform->getDefault<osg::Vec4f>(), osg::Vec4f(0,0,0,0));
         EXPECT_EQ(uniform->getMin<osg::Vec4f>(), osg::Vec4f(0,1,0,0));
         EXPECT_EQ(uniform->getMax<osg::Vec4f>(), osg::Vec4f(0,0,1,0));
diff --git a/components/fx/technique.cpp b/components/fx/technique.cpp
index 8b03810b73..8090a27b76 100644
--- a/components/fx/technique.cpp
+++ b/components/fx/technique.cpp
@@ -526,7 +526,7 @@ namespace fx
             error(Misc::StringUtils::format("redeclaration of uniform '%s'", std::string(mBlockName)));
 
         std::shared_ptr<Types::UniformBase> uniform = std::make_shared<Types::UniformBase>();
-        Types::Uniform<SrcT> data;
+        Types::Uniform<SrcT> data = Types::Uniform<SrcT>();
 
         while (!isNext<Lexer::Close_bracket>() && !isNext<Lexer::Eof>())
         {
@@ -543,11 +543,6 @@ namespace fx
 
             static_assert(isVec || isFloat || isInt || isBool, "Unsupported type");
 
-            std::optional<double> step;
-
-            if constexpr (isInt)
-                step = 1.0;
-
             if (key == "default")
             {
                 if constexpr (isVec)
@@ -559,6 +554,15 @@ namespace fx
                 else if constexpr (isBool)
                     data.mDefault = parseBool();
             }
+            else if (key == "size")
+            {
+                if constexpr (isBool)
+                    error("bool arrays currently unsupported");
+
+                int size = parseInteger();
+                if (size > 1)
+                    data.mArray = std::vector<SrcT>(size);
+            }
             else if (key == "min")
             {
                 if constexpr (isVec)
@@ -582,7 +586,7 @@ namespace fx
                     data.mMax = parseBool();
             }
             else if (key == "step")
-                step = parseFloat();
+                uniform->mStep = parseFloat();
             else if (key == "static")
                 uniform->mStatic = parseBool();
             else if (key == "description")
@@ -598,18 +602,28 @@ namespace fx
             else
                 error(Misc::StringUtils::format("unexpected key '%s'", std::string{key}));
 
-            if (step)
-                uniform->mStep = step.value();
-
             expect<Lexer::SemiColon>();
         }
 
+        if (data.isArray())
+            uniform->mStatic = false;
+
         uniform->mName = std::string(mBlockName);
         uniform->mData = data;
         uniform->mTechniqueName = mName;
 
-        if (auto cached = Settings::ShaderManager::get().getValue<SrcT>(mName, uniform->mName))
-            uniform->setValue<SrcT>(cached.value());
+        if (data.mArray)
+        {
+            if constexpr (!std::is_same_v<bool, SrcT>)
+            {
+                if (auto cached = Settings::ShaderManager::get().getValue<std::vector<SrcT>>(mName, uniform->mName))
+                    uniform->setValue(cached.value());
+            }
+        }
+        else if (auto cached = Settings::ShaderManager::get().getValue<SrcT>(mName, uniform->mName))
+        {
+            uniform->setValue(cached.value());
+        }
 
         mDefinedUniforms.emplace_back(std::move(uniform));
     }
diff --git a/components/fx/types.hpp b/components/fx/types.hpp
index f12810197f..40eee003f2 100644
--- a/components/fx/types.hpp
+++ b/components/fx/types.hpp
@@ -60,12 +60,24 @@ namespace fx
         struct Uniform
         {
             std::optional<T> mValue;
-            T mDefault;
+            std::optional<std::vector<T>> mArray;
+
+            T mDefault = {};
             T mMin = std::numeric_limits<T>::lowest();
             T mMax = std::numeric_limits<T>::max();
 
             using value_type = T;
 
+            bool isArray() const
+            {
+                return mArray.has_value();
+            }
+
+            const std::vector<T>& getArray() const
+            {
+                return *mArray;
+            }
+
             T getValue() const
             {
                 return mValue.value_or(mDefault);
@@ -97,7 +109,7 @@ namespace fx
 
             bool mStatic = true;
             std::optional<SamplerType> mSamplerType = std::nullopt;
-            double mStep;
+            double mStep = 1.0;
 
             Uniform_t mData;
 
@@ -109,6 +121,11 @@ namespace fx
                 return value.value_or(std::get<Uniform<T>>(mData).getValue());
             }
 
+            size_t getNumElements() const
+            {
+                return std::visit([&](auto&& arg) { ;return arg.isArray() ? arg.getArray().size() : 1; }, mData);
+            }
+
             template <class T>
             T getMin() const
             {
@@ -137,8 +154,7 @@ namespace fx
                     {
                         arg.mValue = value;
 
-                        if (mStatic)
-                            Settings::ShaderManager::get().setValue<T>(mTechniqueName, mName, value);
+                        Settings::ShaderManager::get().setValue(mTechniqueName, mName, value);
                     }
                     else
                     {
@@ -147,6 +163,28 @@ namespace fx
                 }, mData);
             }
 
+            template <class T, class A>
+            void setValue(const std::vector<T, A>& value)
+            {
+                std::visit([&, value](auto&& arg) {
+                    using U = typename std::decay_t<decltype(arg)>::value_type;
+
+                    if (!arg.isArray() || arg.getArray().size() != value.size())
+                    {
+                        Log(Debug::Error) << "Attempting to set uniform array '" << mName << "' with mismatching array sizes";
+                        return;
+                    }
+
+                    if constexpr (std::is_same_v<T, U>)
+                    {
+                        arg.mArray = value;
+                        Settings::ShaderManager::get().setValue(mTechniqueName, mName, value);
+                    }
+                    else
+                        Log(Debug::Warning) << "Attempting to set uniform array '" << mName << "' with wrong type";
+                }, mData);
+            }
+
             void setUniform(osg::Uniform* uniform)
             {
                 auto type = getType();
@@ -155,8 +193,14 @@ namespace fx
 
                 std::visit([&](auto&& arg)
                 {
-                    const auto value = arg.getValue();
-                    uniform->set(value);
+                    if (arg.isArray())
+                    {
+                        for (size_t i = 0; i < arg.getArray().size(); ++i)
+                            uniform->setElement(i, arg.getArray()[i]);
+                        uniform->dirty();
+                    }
+                    else
+                        uniform->set(arg.getValue());
                 }, mData);
             }
 
@@ -197,52 +241,53 @@ namespace fx
                     }
                 }
 
-                bool useUniform = (Settings::ShaderManager::get().getMode() == Settings::ShaderManager::Mode::Debug || mStatic == false);
-
                 return std::visit([&](auto&& arg) -> std::optional<std::string> {
                     using T = typename std::decay_t<decltype(arg)>::value_type;
 
                     auto value = arg.getValue();
 
+                    const bool useUniform = arg.isArray() || (Settings::ShaderManager::get().getMode() == Settings::ShaderManager::Mode::Debug || mStatic == false);
+                    const std::string uname = arg.isArray() ? Misc::StringUtils::format("%s[%zu]", mName, arg.getArray().size()) : mName;
+
                     if constexpr (std::is_same_v<T, osg::Vec2f>)
                     {
                         if (useUniform)
-                            return Misc::StringUtils::format("uniform vec2 %s;", mName);
+                            return Misc::StringUtils::format("uniform vec2 %s;", uname);
 
                         return Misc::StringUtils::format("const vec2 %s=vec2(%f,%f);", mName, value[0], value[1]);
                     }
                     else if constexpr (std::is_same_v<T, osg::Vec3f>)
                     {
                         if (useUniform)
-                            return Misc::StringUtils::format("uniform vec3 %s;", mName);
+                            return Misc::StringUtils::format("uniform vec3 %s;", uname);
 
                         return Misc::StringUtils::format("const vec3 %s=vec3(%f,%f,%f);", mName, value[0], value[1], value[2]);
                     }
                     else if constexpr (std::is_same_v<T, osg::Vec4f>)
                     {
                         if (useUniform)
-                            return Misc::StringUtils::format("uniform vec4 %s;", mName);
+                            return Misc::StringUtils::format("uniform vec4 %s;", uname);
 
                         return Misc::StringUtils::format("const vec4 %s=vec4(%f,%f,%f,%f);", mName, value[0], value[1], value[2], value[3]);
                     }
                     else if constexpr (std::is_same_v<T, float>)
                     {
                         if (useUniform)
-                            return Misc::StringUtils::format("uniform float %s;",  mName);
+                            return Misc::StringUtils::format("uniform float %s;", uname);
 
                         return Misc::StringUtils::format("const float %s=%f;", mName, value);
                     }
                     else if constexpr (std::is_same_v<T, int>)
                     {
                         if (useUniform)
-                            return Misc::StringUtils::format("uniform int %s;",  mName);
+                            return Misc::StringUtils::format("uniform int %s;", uname);
 
                         return Misc::StringUtils::format("const int %s=%i;", mName, value);
                     }
                     else if constexpr (std::is_same_v<T, bool>)
                     {
                         if (useUniform)
-                            return Misc::StringUtils::format("uniform bool %s;", mName);
+                            return Misc::StringUtils::format("uniform bool %s;", uname);
 
                         return Misc::StringUtils::format("const bool %s=%s;", mName, value ? "true" : "false");
                     }
diff --git a/components/settings/shadermanager.hpp b/components/settings/shadermanager.hpp
index aec9fd4987..eaf10a3a34 100644
--- a/components/settings/shadermanager.hpp
+++ b/components/settings/shadermanager.hpp
@@ -5,6 +5,7 @@
 #include <filesystem>
 #include <optional>
 #include <fstream>
+#include <vector>
 
 #include <yaml-cpp/yaml.h>
 
diff --git a/docs/source/reference/postprocessing/omwfx.rst b/docs/source/reference/postprocessing/omwfx.rst
index 8354090b67..188fc9cebb 100644
--- a/docs/source/reference/postprocessing/omwfx.rst
+++ b/docs/source/reference/postprocessing/omwfx.rst
@@ -271,10 +271,10 @@ Below is an example of passing a value through a custom vertex shader to the fra
     }
 
     fragment pass {
-        omw_Out vec2 omw_TexCoord;
+        omw_In vec2 omw_TexCoord;
 
         // our custom output from the vertex shader is available
-        omw_Out float noise;
+        omw_In float noise;
 
         void main()
         {
@@ -461,6 +461,14 @@ To use the uniform you can reference it in any pass, it should **not** be declar
         }
     }
 
+You can use uniform arrays as well, but they are restricted to the `Lua API <../lua-scripting/openmw_postprocessing.html>`_ scripts.
+These uniform blocks must be defined with the new ``size`` parameter.
+
+.. code-block:: none
+
+    uniform_vec3 uArray {
+        size = 10;
+    }
 
 ``render_target``
 *****************
diff --git a/docs/source/reference/postprocessing/overview.rst b/docs/source/reference/postprocessing/overview.rst
index 05d5e428c0..8262895b72 100644
--- a/docs/source/reference/postprocessing/overview.rst
+++ b/docs/source/reference/postprocessing/overview.rst
@@ -7,7 +7,7 @@ Overview
 
 OpenMW supports a moddable post process framework for creating and
 controlling screenspace effects. This is integrated into OpenMW's Lua API, see
-`reference <../lua-scripting/openmw_shader.html>`_ for details.
+`reference <../lua-scripting/openmw_postprocessing.html>`_ for details.
 
 Basic concepts
 ==============
diff --git a/files/lua_api/openmw/postprocessing.lua b/files/lua_api/openmw/postprocessing.lua
index 36c96c2efc..18e2edd376 100644
--- a/files/lua_api/openmw/postprocessing.lua
+++ b/files/lua_api/openmw/postprocessing.lua
@@ -1,19 +1,18 @@
 ---
 -- `openmw.postprocessing` is an interface to postprocessing shaders.
 -- Can be used only by local scripts, that are attached to a player.
--- @module shader
+-- @module postprocessing
 -- @usage local postprocessing = require('openmw.postprocessing')
 
 
-
 ---
 -- Load a shader and return its handle.
 -- @function [parent=#postprocessing] load
 -- @param #string name Name of the shader without its extension
 -- @return #Shader
 -- @usage
--- If the shader exists and compiles, the shader will still be off by default.
--- It must be enabled to see its effect.
+-- -- If the shader exists and compiles, the shader will still be off by default.
+-- -- It must be enabled to see its effect.
 -- local vignetteShader = postprocessing.load('vignette')
 
 ---
@@ -72,21 +71,62 @@
 -- @function [parent=#Shader] setVector2
 -- @param self
 -- @param #string name Name of uniform
--- @param #Vector2 value Value of uniform.
+-- @param openmw.util#Vector2 value Value of uniform.
 
 ---
 -- Set a non static Vector3 shader variable.
 -- @function [parent=#Shader] setVector3
 -- @param self
 -- @param #string name Name of uniform
--- @param #Vector3 value Value of uniform.
+-- @param openmw.util#Vector3 value Value of uniform.
 
 ---
 -- Set a non static Vector4 shader variable.
 -- @function [parent=#Shader] setVector4
 -- @param self
 -- @param #string name Name of uniform
--- @param #Vector4 value Value of uniform.
+-- @param openmw.util#Vector4 value Value of uniform.
+
+---
+-- Set a non static integer array shader variable.
+-- @function [parent=#Shader] setIntArray
+-- @param self
+-- @param #string name Name of uniform
+-- @param #table array Contains equal number of #number elements as the uniform array.
+
+---
+-- Set a non static float array shader variable.
+-- @function [parent=#Shader] setFloatArray
+-- @param self
+-- @param #string name Name of uniform
+-- @param #table array Contains equal number of #number elements as the uniform array.
+
+---
+-- Set a non static Vector2 array shader variable.
+-- @function [parent=#Shader] setVector2Array
+-- @param self
+-- @param #string name Name of uniform
+-- @param #table array Contains equal number of @{openmw.util#Vector2} elements as the uniform array.
+
+---
+-- Set a non static Vector3 array shader variable.
+-- @function [parent=#Shader] setVector3Array
+-- @param self
+-- @param #string name Name of uniform
+-- @param #table array Contains equal number of @{openmw.util#Vector3} elements as the uniform array.
 
+---
+-- Set a non static Vector4 array shader variable.
+-- @function [parent=#Shader] setVector4Array
+-- @param self
+-- @param #string name Name of uniform
+-- @param #table array Contains equal number of @{openmw.util#Vector4} elements as the uniform array.
+-- @usage
+-- -- Setting an array
+-- local shader = postprocessing.load('godrays')
+-- -- Toggle shader on
+-- shader:enable()
+-- -- Set new array uniform which was defined with length 2
+-- shader:setVector4Array('myArray', { util.vector4(1,0,0,1), util.vector4(1,0,1,1) })
 
 return nil

From 5b592e09e6114d8b380d9134b6c08014821be998 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 23 May 2022 13:01:30 +0200
Subject: [PATCH 2503/2859] Log more information when navmeshtool fails on not
 enough space

---
 apps/navmeshtool/main.cpp                     | 23 +++++++++++++++----
 apps/navmeshtool/navmesh.cpp                  | 22 +++++++++++-------
 apps/navmeshtool/navmesh.hpp                  |  9 +++++++-
 .../detournavigator/generatenavmeshtile.cpp   |  2 +-
 .../detournavigator/generatenavmeshtile.hpp   |  2 +-
 5 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/apps/navmeshtool/main.cpp b/apps/navmeshtool/main.cpp
index e024a35530..58b7ca4847 100644
--- a/apps/navmeshtool/main.cpp
+++ b/apps/navmeshtool/main.cpp
@@ -171,8 +171,9 @@ namespace NavMeshTool
 
             const osg::Vec3f agentHalfExtents = Settings::Manager::getVector3("default actor pathfind half extents", "Game");
             const std::uint64_t maxDbFileSize = static_cast<std::uint64_t>(Settings::Manager::getInt64("max navmeshdb file size", "Navigator"));
+            const std::string dbPath = (config.getUserDataPath() / "navmesh.db").string();
 
-            DetourNavigator::NavMeshDb db((config.getUserDataPath() / "navmesh.db").string(), maxDbFileSize);
+            DetourNavigator::NavMeshDb db(dbPath, maxDbFileSize);
 
             std::vector<ESM::ESMReader> readers(contentFiles.size());
             EsmLoader::Query query;
@@ -196,10 +197,24 @@ namespace NavMeshTool
             WorldspaceData cellsData = gatherWorldspaceData(navigatorSettings, readers, vfs, bulletShapeManager,
                                                             esmData, processInteriorCells, writeBinaryLog);
 
-            generateAllNavMeshTiles(agentHalfExtents, navigatorSettings, threadsNumber, removeUnusedTiles,
-                                    writeBinaryLog, cellsData, std::move(db));
+            const Status status = generateAllNavMeshTiles(agentHalfExtents, navigatorSettings, threadsNumber,
+                removeUnusedTiles, writeBinaryLog, cellsData, std::move(db));
 
-            Log(Debug::Info) << "Done";
+            switch (status)
+            {
+                case Status::Ok:
+                    Log(Debug::Info) << "Done";
+                    break;
+                case Status::Cancelled:
+                    Log(Debug::Warning) << "Cancelled";
+                    break;
+                case Status::NotEnoughSpace:
+                    Log(Debug::Warning) << "Navmesh genration is cancelled due to running out of disk space or limits "
+                        << "for navmesh db. Check disk space at the db location \"" << dbPath
+                        << "\". If there is enough space, adjust \"max navmeshdb file size\" setting (see "
+                        << "https://openmw.readthedocs.io/en/latest/reference/modding/settings/navigator.html?highlight=navmesh#max-navmeshdb-file-size).";
+                    break;
+            }
 
             return 0;
         }
diff --git a/apps/navmeshtool/navmesh.cpp b/apps/navmeshtool/navmesh.cpp
index 975f697a20..a51d0bbc81 100644
--- a/apps/navmeshtool/navmesh.cpp
+++ b/apps/navmeshtool/navmesh.cpp
@@ -169,19 +169,22 @@ namespace NavMeshTool
                 report();
             }
 
-            void cancel() override
+            void cancel(std::string_view reason) override
             {
                 std::unique_lock lock(mMutex);
-                mCancelled = true;
+                if (reason.find("database or disk is full") != std::string_view::npos)
+                    mStatus = Status::NotEnoughSpace;
+                else
+                    mStatus = Status::Cancelled;
                 mHasTile.notify_one();
             }
 
-            bool wait()
+            Status wait()
             {
                 constexpr std::chrono::seconds transactionInterval(1);
                 std::unique_lock lock(mMutex);
                 auto start = std::chrono::steady_clock::now();
-                while (mProvided < mExpected && !mCancelled)
+                while (mProvided < mExpected && mStatus == Status::Ok)
                 {
                     mHasTile.wait(lock);
                     const auto now = std::chrono::steady_clock::now();
@@ -195,7 +198,7 @@ namespace NavMeshTool
                 logGeneratedTiles(mProvided, mExpected);
                 if (mWriteBinaryLog)
                     logGeneratedTilesMessage(mProvided);
-                return !mCancelled;
+                return mStatus;
             }
 
             void commit()
@@ -224,7 +227,7 @@ namespace NavMeshTool
             std::atomic_size_t mInserted {0};
             std::atomic_size_t mUpdated {0};
             std::size_t mDeleted = 0;
-            bool mCancelled = false;
+            Status mStatus = Status::Ok;
             mutable std::mutex mMutex;
             NavMeshDb mDb;
             const bool mRemoveUnusedTiles;
@@ -247,7 +250,7 @@ namespace NavMeshTool
         };
     }
 
-    void generateAllNavMeshTiles(const osg::Vec3f& agentHalfExtents, const Settings& settings,
+    Status generateAllNavMeshTiles(const osg::Vec3f& agentHalfExtents, const Settings& settings,
         std::size_t threadsNumber, bool removeUnusedTiles, bool writeBinaryLog, WorldspaceData& data,
         NavMeshDb&& db)
     {
@@ -294,7 +297,8 @@ namespace NavMeshTool
                 ));
         }
 
-        if (navMeshTileConsumer->wait())
+        const Status status = navMeshTileConsumer->wait();
+        if (status == Status::Ok)
             navMeshTileConsumer->commit();
 
         const auto inserted = navMeshTileConsumer->getInserted();
@@ -311,5 +315,7 @@ namespace NavMeshTool
             Log(Debug::Info) << "Vacuuming the database...";
             navMeshTileConsumer->vacuum();
         }
+
+        return status;
     }
 }
diff --git a/apps/navmeshtool/navmesh.hpp b/apps/navmeshtool/navmesh.hpp
index e25f1dd845..fa340b5de7 100644
--- a/apps/navmeshtool/navmesh.hpp
+++ b/apps/navmeshtool/navmesh.hpp
@@ -15,7 +15,14 @@ namespace NavMeshTool
 {
     struct WorldspaceData;
 
-    void generateAllNavMeshTiles(const osg::Vec3f& agentHalfExtents, const DetourNavigator::Settings& settings,
+    enum class Status
+    {
+        Ok,
+        Cancelled,
+        NotEnoughSpace,
+    };
+
+    Status generateAllNavMeshTiles(const osg::Vec3f& agentHalfExtents, const DetourNavigator::Settings& settings,
         std::size_t threadsNumber, bool removeUnusedTiles, bool writeBinaryLog, WorldspaceData& cellsData,
         DetourNavigator::NavMeshDb&& db);
 }
diff --git a/components/detournavigator/generatenavmeshtile.cpp b/components/detournavigator/generatenavmeshtile.cpp
index a725c5bc23..3475b4ee8a 100644
--- a/components/detournavigator/generatenavmeshtile.cpp
+++ b/components/detournavigator/generatenavmeshtile.cpp
@@ -96,7 +96,7 @@ namespace DetourNavigator
         {
             Log(Debug::Warning) << "Failed to generate navmesh for worldspace \"" << mWorldspace
                                 << "\" tile " << mTilePosition << ": " << e.what();
-            consumer->cancel();
+            consumer->cancel(e.what());
         }
     }
 }
diff --git a/components/detournavigator/generatenavmeshtile.hpp b/components/detournavigator/generatenavmeshtile.hpp
index 2cd669c8ec..ecdf1c8bc0 100644
--- a/components/detournavigator/generatenavmeshtile.hpp
+++ b/components/detournavigator/generatenavmeshtile.hpp
@@ -50,7 +50,7 @@ namespace DetourNavigator
         virtual void update(std::string_view worldspace, const TilePosition& tilePosition,
                             std::int64_t tileId, std::int64_t version, PreparedNavMeshData& data) = 0;
 
-        virtual void cancel() = 0;
+        virtual void cancel(std::string_view reason) = 0;
     };
 
     class GenerateNavMeshTile final : public SceneUtil::WorkItem

From 87073e26f2f4c45b45fae261d6701f0185b27e4a Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 23 May 2022 17:18:00 +0200
Subject: [PATCH 2504/2859] Increase precision error for navigator tests

---
 apps/openmw_test_suite/detournavigator/navigator.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index c98a5b7a90..d8df4e00ae 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -27,7 +27,7 @@
 
 MATCHER_P3(Vec3fEq, x, y, z, "")
 {
-    return std::abs(arg.x() - x) < 1e-4 && std::abs(arg.y() - y) < 1e-4 && std::abs(arg.z() - z) < 1e-4;
+    return std::abs(arg.x() - x) < 1e-3 && std::abs(arg.y() - y) < 1e-3 && std::abs(arg.z() - z) < 1e-3;
 }
 
 namespace

From a4b23aad0513eff49a8e6a0b6efc4e150ff90316 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Mon, 23 May 2022 19:25:30 +0200
Subject: [PATCH 2505/2859] Validate l10n context name

---
 components/lua/l10n.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/components/lua/l10n.cpp b/components/lua/l10n.cpp
index 94d46f2522..1da6693f3d 100644
--- a/components/lua/l10n.cpp
+++ b/components/lua/l10n.cpp
@@ -122,6 +122,16 @@ namespace LuaUtil
         auto it = mContexts.find(contextName);
         if (it != mContexts.end())
             return sol::make_object(mLua->sol(), it->second);
+        auto allowedChar = [](char c)
+        {
+            return (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') ||
+                   (c >= '0' && c <= '9') || c == '_';
+        };
+        bool valid = !contextName.empty();
+        for (char c : contextName)
+            valid = valid && allowedChar(c);
+        if (!valid)
+            throw std::runtime_error(std::string("Invalid l10n context name: ") + contextName);
         icu::Locale fallbackLocale(fallbackLocaleName.c_str());
         Context ctx{contextName, std::make_shared<l10n::MessageBundles>(mPreferredLocales, fallbackLocale)};
         {

From 4188bb4e3390616ffede6e51523498523351bf67 Mon Sep 17 00:00:00 2001
From: "Hristos N. Triantafillou" <me@hristos.triantafillou.us>
Date: Mon, 23 May 2022 13:01:02 -0500
Subject: [PATCH 2506/2859] Fix formatting so that docs can render correctly

---
 files/builtin_scripts/scripts/omw/mwui/init.lua | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/files/builtin_scripts/scripts/omw/mwui/init.lua b/files/builtin_scripts/scripts/omw/mwui/init.lua
index a9d798ef2a..b0d7e4346d 100644
--- a/files/builtin_scripts/scripts/omw/mwui/init.lua
+++ b/files/builtin_scripts/scripts/omw/mwui/init.lua
@@ -60,6 +60,7 @@ local templates = {}
 ---
 -- Container that adds padding around its content.
 -- @field [parent=#MWUI] #table padding
+
 ---
 -- Standard spacing interval
 -- @field [parent=#MWUI] #number interval
@@ -68,9 +69,11 @@ require('scripts.omw.mwui.space')(templates)
 ---
 -- Standard rectangular border
 -- @field [parent=#Templates] openmw.ui#Layout border
+
 ---
 -- Container wrapping the content with borders
 -- @field [parent=#Templates] openmw.ui#Layout box
+
 ---
 -- Same as box, but with a semi-transparent background
 -- @field [parent=#Templates] openmw.ui#Layout boxTransparent

From 998f1c960e004cd9223ce957f4e4f4485935b707 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Fri, 20 May 2022 20:21:27 +0200
Subject: [PATCH 2507/2859] Improve the speed of toLower

This significantly improves the speed of my fuzzer,
by something like 15%.
---
 .../openmw_test_suite/misc/test_stringops.cpp |  4 ++--
 components/misc/stringops.hpp                 | 23 +++++++++++++++++--
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/apps/openmw_test_suite/misc/test_stringops.cpp b/apps/openmw_test_suite/misc/test_stringops.cpp
index 7d8e93dc28..d21a74700c 100644
--- a/apps/openmw_test_suite/misc/test_stringops.cpp
+++ b/apps/openmw_test_suite/misc/test_stringops.cpp
@@ -93,8 +93,8 @@ namespace
 
     using RawValue = const char[4];
 
-    constexpr RawValue foo = "foo";
-    constexpr RawValue fooUpper = "FOO";
+    constexpr RawValue foo = "f0#";
+    constexpr RawValue fooUpper = "F0#";
     constexpr RawValue bar = "bar";
 
     template <typename T>
diff --git a/components/misc/stringops.hpp b/components/misc/stringops.hpp
index fe4be00006..50bcf6a1d0 100644
--- a/components/misc/stringops.hpp
+++ b/components/misc/stringops.hpp
@@ -8,6 +8,25 @@
 #include <iterator>
 #include <functional>
 
+/* Mapping table to go from uppercase to lowercase for plain ASCII.*/
+static constexpr unsigned char tolowermap[256] = {
+    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+    22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+    42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
+    62, 63, 64, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110,
+    111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 91, 92, 93, 94, 95,
+    96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+    112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+    128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+    144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+    160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+    176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+    192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+    208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
+    224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+    240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255
+};
+
 namespace Misc
 {
 class StringUtils
@@ -38,9 +57,9 @@ public:
     /// Plain and simple locale-unaware toLower. Anything from A to Z is lower-cased, multibyte characters are unchanged.
     /// Don't use std::tolower(char, locale&) because that is abysmally slow.
     /// Don't use tolower(int) because that depends on global locale.
-    static char toLower(char c)
+    static constexpr char toLower(char c)
     {
-        return (c >= 'A' && c <= 'Z') ? c + 'a' - 'A' : c;
+        return tolowermap[static_cast<unsigned char>(c)];
     }
 
     static bool ciLess(const std::string &x, const std::string &y) {

From 6f5025e6fd04abec5a1469f612f8a623dacdbdac Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Mon, 23 May 2022 21:35:07 +0200
Subject: [PATCH 2508/2859] Remove some unused includes from bulletobjecttool

---
 apps/bulletobjecttool/main.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/apps/bulletobjecttool/main.cpp b/apps/bulletobjecttool/main.cpp
index 36ec8df9ed..9a6f2877ac 100644
--- a/apps/bulletobjecttool/main.cpp
+++ b/apps/bulletobjecttool/main.cpp
@@ -1,7 +1,6 @@
 #include <components/debug/debugging.hpp>
 #include <components/esm3/esmreader.hpp>
 #include <components/esm3/loadcell.hpp>
-#include <components/esm3/variant.hpp>
 #include <components/esmloader/esmdata.hpp>
 #include <components/esmloader/load.hpp>
 #include <components/fallback/fallback.hpp>
@@ -13,14 +12,10 @@
 #include <components/resource/niffilemanager.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/settings/settings.hpp>
-#include <components/to_utf8/to_utf8.hpp>
 #include <components/version/version.hpp>
 #include <components/vfs/manager.hpp>
 #include <components/vfs/registerarchives.hpp>
 
-#include <osg/Vec3f>
-
-#include <boost/filesystem.hpp>
 #include <boost/program_options.hpp>
 
 #include <charconv>

From 8a63bc0def7eb5146f26a33c4223413bd4a3b94c Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Mon, 23 May 2022 21:36:53 +0200
Subject: [PATCH 2509/2859] Remove boost::filesystem from essimporter

---
 apps/essimporter/CMakeLists.txt | 1 -
 apps/essimporter/main.cpp       | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/apps/essimporter/CMakeLists.txt b/apps/essimporter/CMakeLists.txt
index 0e742ff548..3dafba09ba 100644
--- a/apps/essimporter/CMakeLists.txt
+++ b/apps/essimporter/CMakeLists.txt
@@ -36,7 +36,6 @@ openmw_add_executable(openmw-essimporter
 
 target_link_libraries(openmw-essimporter
     ${Boost_PROGRAM_OPTIONS_LIBRARY}
-    ${Boost_FILESYSTEM_LIBRARY}
     components
 )
 
diff --git a/apps/essimporter/main.cpp b/apps/essimporter/main.cpp
index bc5d34bc03..9517df2d2a 100644
--- a/apps/essimporter/main.cpp
+++ b/apps/essimporter/main.cpp
@@ -1,14 +1,13 @@
 #include <iostream>
+#include <filesystem>
 
 #include <boost/program_options.hpp>
-#include <boost/filesystem.hpp>
 
 #include <components/files/configurationmanager.hpp>
 
 #include "importer.hpp"
 
 namespace bpo = boost::program_options;
-namespace bfs = boost::filesystem;
 
 
 int main(int argc, char** argv)
@@ -57,7 +56,7 @@ int main(int argc, char** argv)
         else
         {
             const std::string& ext = ".omwsave";
-            if (bfs::exists(bfs::path(outputFile))
+            if (std::filesystem::exists(std::filesystem::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?");

From 34ae6e82217cce57ae64c879fde1e25fb3f5aee4 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Mon, 23 May 2022 21:52:22 +0200
Subject: [PATCH 2510/2859] Remove dependency on boost::filesystem in bsatool
 and niftest CMakeLists.txt

---
 apps/bsatool/CMakeLists.txt | 1 -
 apps/niftest/CMakeLists.txt | 1 -
 2 files changed, 2 deletions(-)

diff --git a/apps/bsatool/CMakeLists.txt b/apps/bsatool/CMakeLists.txt
index ec0615ff9c..85188dbe9f 100644
--- a/apps/bsatool/CMakeLists.txt
+++ b/apps/bsatool/CMakeLists.txt
@@ -10,7 +10,6 @@ openmw_add_executable(bsatool
 
 target_link_libraries(bsatool
   ${Boost_PROGRAM_OPTIONS_LIBRARY}
-  ${Boost_FILESYSTEM_LIBRARY}
   components
 )
 
diff --git a/apps/niftest/CMakeLists.txt b/apps/niftest/CMakeLists.txt
index 3cbee2b7e8..856404c1ce 100644
--- a/apps/niftest/CMakeLists.txt
+++ b/apps/niftest/CMakeLists.txt
@@ -9,7 +9,6 @@ openmw_add_executable(niftest
 )
 
 target_link_libraries(niftest
-  ${Boost_FILESYSTEM_LIBRARY}
   components
 )
 

From 0554afeb67b5bb8c1dd2c7f40c781bbcd6cf299a Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Mon, 23 May 2022 21:55:06 +0200
Subject: [PATCH 2511/2859] Remove boost::filesystem from navmashtool

---
 apps/navmeshtool/main.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/navmeshtool/main.cpp b/apps/navmeshtool/main.cpp
index 58b7ca4847..28f50a655e 100644
--- a/apps/navmeshtool/main.cpp
+++ b/apps/navmeshtool/main.cpp
@@ -23,7 +23,6 @@
 
 #include <osg/Vec3f>
 
-#include <boost/filesystem.hpp>
 #include <boost/program_options.hpp>
 
 #include <cstddef>

From a987b017178e78e94137b9e7a2d9e5c889d7d579 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Mon, 23 May 2022 19:44:39 -0700
Subject: [PATCH 2512/2859] don't resize user defined samplers to power of 2

---
 components/fx/technique.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/fx/technique.cpp b/components/fx/technique.cpp
index 8090a27b76..019744e70d 100644
--- a/components/fx/technique.cpp
+++ b/components/fx/technique.cpp
@@ -510,6 +510,7 @@ namespace fx
         if (proxy.internal_format.has_value())
             sampler->setSourceFormat(proxy.internal_format.value());
         sampler->setName(std::string{mBlockName});
+        sampler->setResizeNonPowerOfTwoHint(false);
 
         mTextures.emplace_back(sampler);
 

From ee6e60005b887fc8649cb7548132f1ca14cda392 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Mon, 23 May 2022 21:27:32 -0700
Subject: [PATCH 2513/2859] remove log spam on failures

---
 apps/openmw/mwrender/pingpongcanvas.cpp | 10 +++++++++-
 apps/openmw/mwrender/pingpongcanvas.hpp |  2 ++
 apps/openmw/mwrender/postprocessor.cpp  |  5 ++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwrender/pingpongcanvas.cpp b/apps/openmw/mwrender/pingpongcanvas.cpp
index 9592a8bbba..157e325ee5 100644
--- a/apps/openmw/mwrender/pingpongcanvas.cpp
+++ b/apps/openmw/mwrender/pingpongcanvas.cpp
@@ -103,7 +103,15 @@ namespace MWRender
         if (filtered.empty() || !bufferData.postprocessing)
         {
             if (bufferData.postprocessing)
-                Log(Debug::Error) << "Critical error, postprocess shaders failed to compile. Using default shader.";
+            {
+                if (!mLoggedLastError)
+                {
+                    Log(Debug::Error) << "Critical error, postprocess shaders failed to compile. Using default shader.";
+                    mLoggedLastError = true;
+                }
+            }
+            else
+                mLoggedLastError = false;
 
             mFallbackStateSet->setTextureAttributeAndModes(0, bufferData.sceneTex);
 
diff --git a/apps/openmw/mwrender/pingpongcanvas.hpp b/apps/openmw/mwrender/pingpongcanvas.hpp
index bb39f9bcf3..9a3906a006 100644
--- a/apps/openmw/mwrender/pingpongcanvas.hpp
+++ b/apps/openmw/mwrender/pingpongcanvas.hpp
@@ -82,6 +82,8 @@ namespace MWRender
 
         mutable std::optional<fx::DispatchArray> mQueuedDispatchArray;
         mutable size_t mQueuedDispatchFrameId;
+
+        mutable bool mLoggedLastError = false;
     };
 }
 
diff --git a/apps/openmw/mwrender/postprocessor.cpp b/apps/openmw/mwrender/postprocessor.cpp
index 78016ceceb..61468df7da 100644
--- a/apps/openmw/mwrender/postprocessor.cpp
+++ b/apps/openmw/mwrender/postprocessor.cpp
@@ -378,7 +378,7 @@ namespace MWRender
             const auto lastWriteTime = std::filesystem::last_write_time(mTechniqueFileMap[technique->getName()]);
             const bool isDirty = technique->setLastModificationTime(lastWriteTime);
 
-            if (technique->isValid() && !isDirty)
+            if (!isDirty)
                 continue;
 
             if (technique->compile())
@@ -671,6 +671,9 @@ namespace MWRender
 
     bool PostProcessor::disableTechnique(std::shared_ptr<fx::Technique> technique, bool dirty)
     {
+        if (Misc::StringUtils::ciEqual(technique->getName(), "main"))
+            return false;
+
         auto it = std::find(mTechniques.begin(), mTechniques.end(), technique);
         if (it == std::end(mTechniques))
             return false;

From 1b37d5d2ad934c4a07186d5ba6ccded91db8f05d Mon Sep 17 00:00:00 2001
From: Kindi <2538602-Kuyondo@users.noreply.gitlab.com>
Date: Tue, 24 May 2022 11:48:13 +0000
Subject: [PATCH 2514/2859] Lua API for Lockpick and Probe records

---
 apps/openmw/CMakeLists.txt           |  2 +-
 apps/openmw/mwlua/types/lockpick.cpp | 35 +++++++++++++++++++++++++++
 apps/openmw/mwlua/types/probe.cpp    | 35 +++++++++++++++++++++++++++
 apps/openmw/mwlua/types/types.cpp    |  6 ++---
 apps/openmw/mwlua/types/types.hpp    |  2 ++
 files/lua_api/openmw/types.lua       | 36 ++++++++++++++++++++++++++++
 6 files changed, 112 insertions(+), 4 deletions(-)
 create mode 100644 apps/openmw/mwlua/types/lockpick.cpp
 create mode 100644 apps/openmw/mwlua/types/probe.cpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 20ea6f7452..0ccb517a33 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -62,7 +62,7 @@ add_openmw_dir (mwlua
     luamanagerimp object worldview userdataserializer eventqueue
     luabindings localscripts playerscripts objectbindings cellbindings asyncbindings settingsbindings
     camerabindings uibindings inputbindings nearbybindings postprocessingbindings stats debugbindings
-    types/types types/door types/actor types/container types/weapon types/npc types/creature types/activator types/book
+    types/types types/door types/actor types/container types/weapon types/npc types/creature types/activator types/book types/lockpick types/probe
     )
 
 add_openmw_dir (mwsound
diff --git a/apps/openmw/mwlua/types/lockpick.cpp b/apps/openmw/mwlua/types/lockpick.cpp
new file mode 100644
index 0000000000..71c7ec5646
--- /dev/null
+++ b/apps/openmw/mwlua/types/lockpick.cpp
@@ -0,0 +1,35 @@
+#include "types.hpp"
+
+#include <components/esm3/loadlock.hpp>
+
+#include <apps/openmw/mwworld/esmstore.hpp>
+
+#include "../luabindings.hpp"
+
+namespace sol
+{
+    template <>
+    struct is_automagical<ESM::Lockpick> : std::false_type {};
+}
+
+namespace MWLua
+{
+    void addLockpickBindings(sol::table lockpick, const Context& context)
+    {
+        const MWWorld::Store<ESM::Lockpick>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Lockpick>();
+        lockpick["record"] = sol::overload(
+            [](const Object& obj) -> const ESM::Lockpick* { return obj.ptr().get<ESM::Lockpick>()->mBase;},
+            [store](const std::string& recordId) -> const ESM::Lockpick* { return store->find(recordId);});
+        sol::usertype<ESM::Lockpick> record = context.mLua->sol().new_usertype<ESM::Lockpick>("ESM3_Lockpick");
+        record[sol::meta_function::to_string] = [](const ESM::Lockpick& rec) { return "ESM3_Lockpick[" + rec.mId + "]";};
+        record["id"] = sol::readonly_property([](const ESM::Lockpick& rec) -> std::string { return rec.mId;});
+        record["name"] = sol::readonly_property([](const ESM::Lockpick& rec) -> std::string { return rec.mName;});
+        record["model"] = sol::readonly_property([](const ESM::Lockpick& rec) -> std::string { return rec.mModel;});
+        record["mwscript"] = sol::readonly_property([](const ESM::Lockpick& rec) -> std::string { return rec.mScript;});
+        record["icon"] = sol::readonly_property([](const ESM::Lockpick& rec) -> std::string { return rec.mIcon;});
+        record["maxCondition"] = sol::readonly_property([](const ESM::Lockpick& rec) -> int { return rec.mData.mUses;});
+        record["value"] = sol::readonly_property([](const ESM::Lockpick& rec) -> int { return rec.mData.mValue;});
+        record["weight"] = sol::readonly_property([](const ESM::Lockpick& rec) -> float { return rec.mData.mWeight;});
+        record["quality"] = sol::readonly_property([](const ESM::Lockpick& rec) -> float { return rec.mData.mQuality;});
+    }
+}
diff --git a/apps/openmw/mwlua/types/probe.cpp b/apps/openmw/mwlua/types/probe.cpp
new file mode 100644
index 0000000000..771824fce1
--- /dev/null
+++ b/apps/openmw/mwlua/types/probe.cpp
@@ -0,0 +1,35 @@
+#include "types.hpp"
+
+#include <components/esm3/loadprob.hpp>
+
+#include <apps/openmw/mwworld/esmstore.hpp>
+
+#include "../luabindings.hpp"
+
+namespace sol
+{
+    template <>
+    struct is_automagical<ESM::Probe> : std::false_type {};
+}
+
+namespace MWLua
+{
+    void addProbeBindings(sol::table probe, const Context& context)
+    {
+        const MWWorld::Store<ESM::Probe>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Probe>();
+        probe["record"] = sol::overload(
+            [](const Object& obj) -> const ESM::Probe* { return obj.ptr().get<ESM::Probe>()->mBase;},
+            [store](const std::string& recordId) -> const ESM::Probe* { return store->find(recordId);});
+        sol::usertype<ESM::Probe> record = context.mLua->sol().new_usertype<ESM::Probe>("ESM3_Probe");
+        record[sol::meta_function::to_string] = [](const ESM::Probe& rec) { return "ESM3_Probe[" + rec.mId + "]";};
+        record["id"] = sol::readonly_property([](const ESM::Probe& rec) -> std::string { return rec.mId;});
+        record["name"] = sol::readonly_property([](const ESM::Probe& rec) -> std::string { return rec.mName;});
+        record["model"] = sol::readonly_property([](const ESM::Probe& rec) -> std::string { return rec.mModel;});
+        record["mwscript"] = sol::readonly_property([](const ESM::Probe& rec) -> std::string { return rec.mScript;});
+        record["icon"] = sol::readonly_property([](const ESM::Probe& rec) -> std::string { return rec.mIcon;});
+        record["maxCondition"] = sol::readonly_property([](const ESM::Probe& rec) -> int { return rec.mData.mUses;});
+        record["value"] = sol::readonly_property([](const ESM::Probe& rec) -> int { return rec.mData.mValue;});
+        record["weight"] = sol::readonly_property([](const ESM::Probe& rec) -> float { return rec.mData.mWeight;});
+        record["quality"] = sol::readonly_property([](const ESM::Probe& rec) -> float { return rec.mData.mQuality;});
+    }
+}
diff --git a/apps/openmw/mwlua/types/types.cpp b/apps/openmw/mwlua/types/types.cpp
index 5330526edb..f52d09ba7e 100644
--- a/apps/openmw/mwlua/types/types.cpp
+++ b/apps/openmw/mwlua/types/types.cpp
@@ -166,13 +166,13 @@ namespace MWLua
         addType(ObjectTypeName::MiscItem, {ESM::REC_MISC}, ObjectTypeName::Item);
         addType(ObjectTypeName::Potion, {ESM::REC_ALCH}, ObjectTypeName::Item);
         addWeaponBindings(addType(ObjectTypeName::Weapon, {ESM::REC_WEAP}, ObjectTypeName::Item), context);
+        addBookBindings(addType(ObjectTypeName::Book, {ESM::REC_BOOK}, ObjectTypeName::Item), context);
+        addLockpickBindings(addType(ObjectTypeName::Lockpick, {ESM::REC_LOCK}, ObjectTypeName::Item), context);
+        addProbeBindings(addType(ObjectTypeName::Probe, {ESM::REC_PROB}, ObjectTypeName::Item), context);
         addType(ObjectTypeName::Apparatus, {ESM::REC_APPA}, ObjectTypeName::Item);
-        addType(ObjectTypeName::Lockpick, {ESM::REC_LOCK}, ObjectTypeName::Item);
-        addType(ObjectTypeName::Probe, {ESM::REC_PROB}, ObjectTypeName::Item);
         addType(ObjectTypeName::Repair, {ESM::REC_REPA}, ObjectTypeName::Item);
 
         addActivatorBindings(addType(ObjectTypeName::Activator, {ESM::REC_ACTI}), context);
-        addBookBindings(addType(ObjectTypeName::Book, {ESM::REC_BOOK}), context);
         addContainerBindings(addType(ObjectTypeName::Container, {ESM::REC_CONT}), context);
         addDoorBindings(addType(ObjectTypeName::Door, {ESM::REC_DOOR}), context);
         addType(ObjectTypeName::Static, {ESM::REC_STAT});
diff --git a/apps/openmw/mwlua/types/types.hpp b/apps/openmw/mwlua/types/types.hpp
index f92644f443..9145752c58 100644
--- a/apps/openmw/mwlua/types/types.hpp
+++ b/apps/openmw/mwlua/types/types.hpp
@@ -32,6 +32,8 @@ namespace MWLua
     void addWeaponBindings(sol::table weapon, const Context& context);
     void addNpcBindings(sol::table npc, const Context& context);
     void addCreatureBindings(sol::table creature, const Context& context);
+    void addLockpickBindings(sol::table lockpick, const Context& context);
+    void addProbeBindings(sol::table probe, const Context& context);
 }
 
 #endif // MWLUA_TYPES_H
diff --git a/files/lua_api/openmw/types.lua b/files/lua_api/openmw/types.lua
index d9a4d36439..b77c3ec054 100644
--- a/files/lua_api/openmw/types.lua
+++ b/files/lua_api/openmw/types.lua
@@ -762,6 +762,24 @@
 -- @param openmw.core#GameObject object
 -- @return #boolean
 
+---
+-- Returns the read-only @{#LockpickRecord} of a lockpick
+-- @function [parent=#Lockpick] record
+-- @param #any objectOrRecordId
+-- @return #LockpickRecord
+
+---
+-- @type LockpickRecord
+-- @field #string id The record ID of the lockpick
+-- @field #string name The name of the lockpick
+-- @field #string model VFS path to the model
+-- @field #string mwscript MWScript on this lockpick (can be empty)
+-- @field #string icon VFS path to the icon
+-- @field #number maxCondition The maximum number of uses of this lockpick
+-- @field #number weight
+-- @field #number value
+-- @field #number quality The quality of the lockpick
+
 --- @{#Probe} functions
 -- @field [parent=#types] #Probe Probe
 
@@ -776,6 +794,24 @@
 -- @param openmw.core#GameObject object
 -- @return #boolean
 
+---
+-- Returns the read-only @{#ProbeRecord} of a probe
+-- @function [parent=#Probe] record
+-- @param #any objectOrRecordId
+-- @return #ProbeRecord
+
+---
+-- @type ProbeRecord
+-- @field #string id The record ID of the probe
+-- @field #string name The name of the probe
+-- @field #string model VFS path to the model
+-- @field #string mwscript MWScript on this probe (can be empty)
+-- @field #string icon VFS path to the icon
+-- @field #number maxCondition The maximum number of uses of this probe
+-- @field #number weight
+-- @field #number value
+-- @field #number quality The quality of the probe
+
 --- @{#Repair} functions
 -- @field [parent=#types] #Repair Repair
 

From 5ee5e8f2f76528a4e398a7399bee7b13c1a86b94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Plichta?= <mplichta@gmail.com>
Date: Tue, 24 May 2022 17:06:58 +0200
Subject: [PATCH 2515/2859] Correct CS typo described in #6704

---
 apps/opencs/model/world/columns.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/opencs/model/world/columns.cpp b/apps/opencs/model/world/columns.cpp
index 3c5ea52586..deaf5823c3 100644
--- a/apps/opencs/model/world/columns.cpp
+++ b/apps/opencs/model/world/columns.cpp
@@ -269,7 +269,7 @@ namespace CSMWorld
             { ColumnId_LevelledItemId,"Levelled Item" },
             { ColumnId_LevelledItemLevel,"Item Level" },
             { ColumnId_LevelledItemType, "Calculate all levels <= player" },
-            { ColumnId_LevelledItemTypeEach, "Select a new item each instance" },
+            { ColumnId_LevelledItemTypeEach, "Select a new item for each instance" },
             { ColumnId_LevelledItemChanceNone, "Chance None" },
 
             { ColumnId_PowerList, "Powers" },

From 92a64b0bbdd6118aa49fe679c2b80fd97ec520a8 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 24 May 2022 19:28:48 +0200
Subject: [PATCH 2516/2859] Fix typo in navmeshtool log message

---
 apps/navmeshtool/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/navmeshtool/main.cpp b/apps/navmeshtool/main.cpp
index 28f50a655e..7fef578684 100644
--- a/apps/navmeshtool/main.cpp
+++ b/apps/navmeshtool/main.cpp
@@ -208,7 +208,7 @@ namespace NavMeshTool
                     Log(Debug::Warning) << "Cancelled";
                     break;
                 case Status::NotEnoughSpace:
-                    Log(Debug::Warning) << "Navmesh genration is cancelled due to running out of disk space or limits "
+                    Log(Debug::Warning) << "Navmesh generation is cancelled due to running out of disk space or limits "
                         << "for navmesh db. Check disk space at the db location \"" << dbPath
                         << "\". If there is enough space, adjust \"max navmeshdb file size\" setting (see "
                         << "https://openmw.readthedocs.io/en/latest/reference/modding/settings/navigator.html?highlight=navmesh#max-navmeshdb-file-size).";

From 639bdd5801e7ef609e2c9a9a1085d73faa825f0f Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 23 May 2022 19:21:44 +0200
Subject: [PATCH 2517/2859] Use free function instead of virtual
 MWBase::World::positionToIndex

The virtual function does the same thing.

* Change return type to osg::Vec2i to avoid dependency on ESM3.
* Rename to positionToCellIndex to make it clear what is the index.
---
 apps/openmw/mwbase/world.hpp                  |  3 ---
 apps/openmw/mwclass/door.cpp                  |  7 +++---
 apps/openmw/mwgui/mapwindow.cpp               | 15 ++++++------
 apps/openmw/mwgui/travelwindow.cpp            |  7 +++---
 apps/openmw/mwlua/worldview.cpp               |  6 ++---
 .../mwscript/transformationextensions.cpp     | 21 +++++++---------
 apps/openmw/mwworld/actionteleport.cpp        |  8 +++----
 apps/openmw/mwworld/cellutils.hpp             |  5 ++--
 apps/openmw/mwworld/scene.cpp                 | 24 +++++++------------
 apps/openmw/mwworld/worldimp.cpp              | 23 +++++++-----------
 apps/openmw/mwworld/worldimp.hpp              |  3 ---
 11 files changed, 51 insertions(+), 71 deletions(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 3d904631cd..38b7f8b4d1 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -319,9 +319,6 @@ namespace MWBase
                 const = 0;
             ///< Convert cell numbers to position.
 
-            virtual void positionToIndex (float x, float y, int &cellX, int &cellY) const = 0;
-            ///< Convert position to cell numbers
-
             virtual void queueMovement(const MWWorld::Ptr &ptr, const osg::Vec3f &velocity) = 0;
             ///< Queues movement for \a ptr (in local space), to be applied in the next call to
             /// doPhysics.
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index 17f0cadbb6..8a044ffb4d 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -19,6 +19,7 @@
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/actiontrap.hpp"
 #include "../mwworld/customdata.hpp"
+#include "../mwworld/cellutils.hpp"
 
 #include "../mwgui/tooltips.hpp"
 
@@ -303,10 +304,10 @@ namespace MWClass
         if (dest.empty())
         {
             // door leads to exterior, use cell name (if any), otherwise translated region name
-            int x,y;
             auto world = MWBase::Environment::get().getWorld();
-            world->positionToIndex (door.mRef.getDoorDest().pos[0], door.mRef.getDoorDest().pos[1], x, y);
-            const ESM::Cell* cell = world->getStore().get<ESM::Cell>().search(x,y);
+            const osg::Vec2i index = MWWorld::positionToCellIndex(door.mRef.getDoorDest().pos[0],
+                door.mRef.getDoorDest().pos[1]);
+            const ESM::Cell* cell = world->getStore().get<ESM::Cell>().search(index.x(), index.y());
             dest = world->getCellName(cell);
         }
 
diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index b15ff1d178..dc1e47bf7d 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -23,6 +23,7 @@
 #include "../mwworld/player.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/esmstore.hpp"
+#include "../mwworld/cellutils.hpp"
 
 #include "../mwrender/globalmap.hpp"
 #include "../mwrender/localmap.hpp"
@@ -277,22 +278,22 @@ namespace MWGui
 
     MyGUI::IntPoint LocalMapBase::getMarkerPosition(float worldX, float worldY, MarkerUserData& markerPos) const
     {
-        int cellX, cellY;
+        osg::Vec2i cellIndex;
         // normalized cell coordinates
         float nX,nY;
 
         if (!mInterior)
         {
-            MWBase::Environment::get().getWorld()->positionToIndex(worldX, worldY, cellX, cellY);
-            nX = (worldX - cellSize * cellX) / cellSize;
+            cellIndex = MWWorld::positionToCellIndex(worldX, worldY);
+            nX = (worldX - cellSize * cellIndex.x()) / cellSize;
             // Image space is -Y up, cells are Y up
-            nY = 1 - (worldY - cellSize * cellY) / cellSize;
+            nY = 1 - (worldY - cellSize * cellIndex.y()) / cellSize;
         }
         else
-            mLocalMapRender->worldToInteriorMapPosition({ worldX, worldY }, nX, nY, cellX, cellY);
+            mLocalMapRender->worldToInteriorMapPosition({ worldX, worldY }, nX, nY, cellIndex.x(), cellIndex.y());
 
-        markerPos.cellX = cellX;
-        markerPos.cellY = cellY;
+        markerPos.cellX = cellIndex.x();
+        markerPos.cellY = cellIndex.y();
         markerPos.nX = nX;
         markerPos.nY = nY;
         return getPosition(markerPos.cellX, markerPos.cellY, markerPos.nX, markerPos.nY);
diff --git a/apps/openmw/mwgui/travelwindow.cpp b/apps/openmw/mwgui/travelwindow.cpp
index 4ce3729033..0553b5c368 100644
--- a/apps/openmw/mwgui/travelwindow.cpp
+++ b/apps/openmw/mwgui/travelwindow.cpp
@@ -15,6 +15,7 @@
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/actionteleport.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/cellutils.hpp"
 
 
 namespace MWGui
@@ -119,12 +120,10 @@ namespace MWGui
         {
             std::string cellname = transport[i].mCellName;
             bool interior = true;
-            int x,y;
-            MWBase::Environment::get().getWorld()->positionToIndex(transport[i].mPos.pos[0],
-                                                                   transport[i].mPos.pos[1],x,y);
+            const osg::Vec2i cellIndex = MWWorld::positionToCellIndex(transport[i].mPos.pos[0], transport[i].mPos.pos[1]);
             if (cellname == "")
             {
-                MWWorld::CellStore* cell = MWBase::Environment::get().getWorld()->getExterior(x,y);
+                MWWorld::CellStore* cell = MWBase::Environment::get().getWorld()->getExterior(cellIndex.x(), cellIndex.y());
                 cellname = MWBase::Environment::get().getWorld()->getCellName(cell);
                 interior = false;
             }
diff --git a/apps/openmw/mwlua/worldview.cpp b/apps/openmw/mwlua/worldview.cpp
index be712386c0..e1bf3002a7 100644
--- a/apps/openmw/mwlua/worldview.cpp
+++ b/apps/openmw/mwlua/worldview.cpp
@@ -10,6 +10,7 @@
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/timestamp.hpp"
+#include "../mwworld/cellutils.hpp"
 
 namespace MWLua
 {
@@ -128,9 +129,8 @@ namespace MWLua
         bool exterior = name.empty() || world->getExterior(name);
         if (exterior)
         {
-            int cellX, cellY;
-            world->positionToIndex(position.x(), position.y(), cellX, cellY);
-            return world->getExterior(cellX, cellY);
+            const osg::Vec2i cellIndex = MWWorld::positionToCellIndex(position.x(), position.y());
+            return world->getExterior(cellIndex.x(), cellIndex.y());
         }
         else
             return world->getInterior(name);
diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index dbcb1087f9..ef99e21880 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -17,6 +17,7 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/manualref.hpp"
 #include "../mwworld/player.hpp"
+#include "../mwworld/cellutils.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
 
@@ -411,9 +412,8 @@ namespace MWScript
                             if(!isPlayer)
                                 return;
                         }
-                        int cx,cy;
-                        MWBase::Environment::get().getWorld()->positionToIndex(x,y,cx,cy);
-                        store = MWBase::Environment::get().getWorld()->getExterior(cx,cy);
+                        const osg::Vec2i cellIndex = MWWorld::positionToCellIndex(x, y);
+                        store = MWBase::Environment::get().getWorld()->getExterior(cellIndex.x(), cellIndex.y());
                     }
                     if(store)
                     {
@@ -460,15 +460,14 @@ namespace MWScript
                     {
                         MWBase::Environment::get().getWorld()->getPlayer().setTeleported(true);
                     }
-                    int cx,cy;
-                    MWBase::Environment::get().getWorld()->positionToIndex(x,y,cx,cy);
+                    const osg::Vec2i cellIndex = MWWorld::positionToCellIndex(x, y);
 
                     // another morrowind oddity: player will be moved to the exterior cell at this location,
                     // non-player actors will move within the cell they are in.
                     MWWorld::Ptr base = ptr;
                     if (ptr == MWMechanics::getPlayer())
                     {
-                        MWWorld::CellStore* cell = MWBase::Environment::get().getWorld()->getExterior(cx,cy);
+                        MWWorld::CellStore* cell = MWBase::Environment::get().getWorld()->getExterior(cellIndex.x(), cellIndex.y());
                         ptr = MWBase::Environment::get().getWorld()->moveObject(ptr, cell, osg::Vec3(x, y, z));
                     }
                     else
@@ -517,9 +516,8 @@ namespace MWScript
                     catch(std::exception&)
                     {
                         const ESM::Cell* cell = MWBase::Environment::get().getWorld()->getExterior(cellID);
-                        int cx,cy;
-                        MWBase::Environment::get().getWorld()->positionToIndex(x,y,cx,cy);
-                        store = MWBase::Environment::get().getWorld()->getExterior(cx,cy);
+                        const osg::Vec2i cellIndex = MWWorld::positionToCellIndex(x, y);
+                        store = MWBase::Environment::get().getWorld()->getExterior(cellIndex.x(), cellIndex.y());
                         if(!cell)
                         {
                             runtime.getContext().report ("unknown cell (" + cellID + ")");
@@ -569,9 +567,8 @@ namespace MWScript
                     MWWorld::CellStore* store = nullptr;
                     if (player.getCell()->isExterior())
                     {
-                        int cx,cy;
-                        MWBase::Environment::get().getWorld()->positionToIndex(x,y,cx,cy);
-                        store = MWBase::Environment::get().getWorld()->getExterior(cx,cy);
+                        const osg::Vec2i cellIndex = MWWorld::positionToCellIndex(x, y);
+                        store = MWBase::Environment::get().getWorld()->getExterior(cellIndex.x(), cellIndex.y());
                     }
                     else
                         store = player.getCell();
diff --git a/apps/openmw/mwworld/actionteleport.cpp b/apps/openmw/mwworld/actionteleport.cpp
index d74dcd82f7..644e23a521 100644
--- a/apps/openmw/mwworld/actionteleport.cpp
+++ b/apps/openmw/mwworld/actionteleport.cpp
@@ -8,6 +8,7 @@
 
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/class.hpp"
+#include "../mwworld/cellutils.hpp"
 
 #include "player.hpp"
 
@@ -52,11 +53,8 @@ namespace MWWorld
                 actor.getClass().getCreatureStats(actor).getAiSequence().stopCombat();
             else if (mCellName.empty())
             {
-                int cellX;
-                int cellY;
-                world->positionToIndex(mPosition.pos[0],mPosition.pos[1],cellX,cellY);
-                world->moveObject(actor,world->getExterior(cellX,cellY),
-                    mPosition.asVec3(), true, true);
+                const osg::Vec2i index = positionToCellIndex(mPosition.pos[0], mPosition.pos[1]);
+                world->moveObject(actor, world->getExterior(index.x(), index.y()), mPosition.asVec3(), true, true);
             }
             else
                 world->moveObject(actor,world->getInterior(mCellName),mPosition.asVec3(), true, true);
diff --git a/apps/openmw/mwworld/cellutils.hpp b/apps/openmw/mwworld/cellutils.hpp
index c699982af5..c827974c35 100644
--- a/apps/openmw/mwworld/cellutils.hpp
+++ b/apps/openmw/mwworld/cellutils.hpp
@@ -2,13 +2,14 @@
 #define OPENMW_MWWORLD_CELLUTILS_H
 
 #include <components/misc/constants.hpp>
-#include <components/esm3/cellid.hpp>
+
+#include <osg/Vec2i>
 
 #include <cmath>
 
 namespace MWWorld
 {
-    inline ESM::CellId::CellIndex positionToIndex(float x, float y)
+    inline osg::Vec2i positionToCellIndex(float x, float y)
     {
         return {
             static_cast<int>(std::floor(x / Constants::CellSizeInUnits)),
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index db1b9e592f..c362cddd38 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -42,6 +42,7 @@
 #include "cellstore.hpp"
 #include "cellpreloader.hpp"
 #include "worldimp.hpp"
+#include "cellutils.hpp"
 
 namespace
 {
@@ -504,9 +505,7 @@ namespace MWWorld
             if (distance <= maxDistance)
                 return *currentGridCenter;
         }
-        osg::Vec2i newCenter;
-        mWorld.positionToIndex(pos.x(), pos.y(), newCenter.x(), newCenter.y());
-        return newCenter;
+        return positionToCellIndex(pos.x(), pos.y());
     }
 
     void Scene::playerMoved(const osg::Vec3f &pos)
@@ -867,17 +866,14 @@ namespace MWWorld
 
     void Scene::changeToExteriorCell (const ESM::Position& position, bool adjustPlayerPos, bool changeEvent)
     {
-        int x = 0;
-        int y = 0;
-
-        mWorld.positionToIndex (position.pos[0], position.pos[1], x, y);
+        const osg::Vec2i cellIndex = positionToCellIndex(position.pos[0], position.pos[1]);
 
         if (changeEvent)
             MWBase::Environment::get().getWindowManager()->fadeScreenOut(0.5);
 
-        changeCellGrid(position.asVec3(), x, y, changeEvent);
+        changeCellGrid(position.asVec3(), cellIndex.x(), cellIndex.y(), changeEvent);
 
-        CellStore* current = mWorld.getExterior(x, y);
+        CellStore* current = mWorld.getExterior(cellIndex.x(), cellIndex.y());
         changePlayerCell(current, position, adjustPlayerPos);
 
         if (changeEvent)
@@ -1078,9 +1074,8 @@ namespace MWWorld
                     else
                     {
                         osg::Vec3f pos = door.getCellRef().getDoorDest().asVec3();
-                        int x,y;
-                        mWorld.positionToIndex (pos.x(), pos.y(), x, y);
-                        preloadCell(mWorld.getExterior(x,y), true);
+                        const osg::Vec2i cellIndex = positionToCellIndex(pos.x(), pos.y());
+                        preloadCell(mWorld.getExterior(cellIndex.x(), cellIndex.y()), true);
                         exteriorPositions.emplace_back(pos, gridCenterToBounds(getNewGridCenter(pos)));
                     }
                 }
@@ -1216,9 +1211,8 @@ namespace MWWorld
             else
             {
                 osg::Vec3f pos = dest.mPos.asVec3();
-                int x,y;
-                mWorld.positionToIndex( pos.x(), pos.y(), x, y);
-                preloadCell(mWorld.getExterior(x,y), true);
+                const osg::Vec2i cellIndex = positionToCellIndex(pos.x(), pos.y());
+                preloadCell(mWorld.getExterior(cellIndex.x(), cellIndex.y()), true);
                 exteriorPositions.emplace_back(pos, gridCenterToBounds(getNewGridCenter(pos)));
             }
         }
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 6b9930a989..333ced2116 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1279,10 +1279,10 @@ namespace MWWorld
 
     MWWorld::Ptr World::moveObject(const Ptr& ptr, const osg::Vec3f& position, bool movePhysics, bool moveToActive)
     {
-        const auto index = MWWorld::positionToIndex(position.x(), position.y());
+        const osg::Vec2i index = positionToCellIndex(position.x(), position.y());
 
         CellStore* cell = ptr.getCell();
-        CellStore* newCell = getExterior(index.mX, index.mY);
+        CellStore* newCell = getExterior(index.x(), index.y());
         bool isCellActive = getPlayerPtr().isInCell() && getPlayerPtr().getCell()->isExterior() && mWorldScene->isCellActive(*newCell);
 
         if (cell->isExterior() || (moveToActive && isCellActive && ptr.getClass().isActor()))
@@ -1518,13 +1518,6 @@ namespace MWWorld
         }
     }
 
-    void World::positionToIndex (float x, float y, int &cellX, int &cellY) const
-    {
-        const auto index = MWWorld::positionToIndex(x, y);
-        cellX = index.mX;
-        cellY = index.mY;
-    }
-
     void World::queueMovement(const Ptr &ptr, const osg::Vec3f &velocity)
     {
         mPhysics->queueObjectMovement(ptr, velocity);
@@ -2112,7 +2105,9 @@ namespace MWWorld
                 else
                 {
                     cellid.mPaged = true;
-                    cellid.mIndex = MWWorld::positionToIndex(ref.mRef.getDoorDest().pos[0], ref.mRef.getDoorDest().pos[1]);
+                    const osg::Vec2i index = positionToCellIndex(ref.mRef.getDoorDest().pos[0], ref.mRef.getDoorDest().pos[1]);
+                    cellid.mIndex.mX = index.x();
+                    cellid.mIndex.mY = index.y();
                 }
                 newMarker.dest = cellid;
 
@@ -2214,8 +2209,8 @@ namespace MWWorld
             throw std::runtime_error("copyObjectToCell(): cannot copy object to null cell");
         if (cell->isExterior())
         {
-            const auto index = MWWorld::positionToIndex(pos.pos[0], pos.pos[1]);
-            cell = mCells.getExterior(index.mX, index.mY);
+            const osg::Vec2i index = positionToCellIndex(pos.pos[0], pos.pos[1]);
+            cell = mCells.getExterior(index.x(), index.y());
         }
 
         MWWorld::Ptr dropped =
@@ -2823,8 +2818,8 @@ namespace MWWorld
             if (door->getDestCell().empty())
             {
                 ESM::Position doorDest = door->getDoorDest();
-                const auto index = MWWorld::positionToIndex(doorDest.pos[0], doorDest.pos[1]);
-                source = getExterior(index.mX, index.mY);
+                const osg::Vec2i index = positionToCellIndex(doorDest.pos[0], doorDest.pos[1]);
+                source = getExterior(index.x(), index.y());
             }
             // door to interior
             else
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index c6e316c25a..ef8cb931d0 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -407,9 +407,6 @@ namespace MWWorld
                 const override;
             ///< Convert cell numbers to position.
 
-            void positionToIndex (float x, float y, int &cellX, int &cellY) const override;
-            ///< Convert position to cell numbers
-
             void queueMovement(const Ptr &ptr, const osg::Vec3f &velocity) override;
             ///< Queues movement for \a ptr (in local space), to be applied in the next call to
             /// doPhysics.

From e591f856fb41c557eb3e42b9a332d665a85830a6 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Tue, 24 May 2022 19:11:13 +0000
Subject: [PATCH 2518/2859] Renderers

---
 docs/source/reference/lua-scripting/api.rst   |   1 +
 .../lua-scripting/setting_renderers.rst       | 126 ++++++++++++
 files/builtin_scripts/CMakeLists.txt          |   1 +
 files/builtin_scripts/l10n/Interface/en.yaml  |   3 +
 .../scripts/omw/settings/player.lua           |   2 +-
 .../scripts/omw/settings/render.lua           |  10 +-
 .../scripts/omw/settings/renderers.lua        | 187 +++++++++++++++++-
 7 files changed, 326 insertions(+), 4 deletions(-)
 create mode 100644 docs/source/reference/lua-scripting/setting_renderers.rst
 create mode 100644 files/builtin_scripts/l10n/Interface/en.yaml

diff --git a/docs/source/reference/lua-scripting/api.rst b/docs/source/reference/lua-scripting/api.rst
index 3538eca9e5..23bf9cb3a2 100644
--- a/docs/source/reference/lua-scripting/api.rst
+++ b/docs/source/reference/lua-scripting/api.rst
@@ -8,6 +8,7 @@ Lua API reference
     engine_handlers
     user_interface
     aipackages
+    setting_renderers
     events
     openmw_util
     openmw_storage
diff --git a/docs/source/reference/lua-scripting/setting_renderers.rst b/docs/source/reference/lua-scripting/setting_renderers.rst
new file mode 100644
index 0000000000..a0ce9e99f9
--- /dev/null
+++ b/docs/source/reference/lua-scripting/setting_renderers.rst
@@ -0,0 +1,126 @@
+Built-in Setting Renderers
+==========================
+
+textLine
+--------
+
+Single line text input
+
+**Argument**
+
+Table with the following optional fields:
+
+.. list-table::
+  :header-rows: 1
+  :widths: 20 20 60
+
+  * - name
+    - type (default)
+    - description
+  * - disabled
+    - bool (false)
+    - Disables changing the setting from the UI
+
+checkbox
+--------
+
+True / false (yes/no) toggle
+
+**Argument**
+
+Table with the following optional fields:
+
+.. list-table::
+  :header-rows: 1
+  :widths: 20 20 60
+
+  * - name
+    - type (default)
+    - description
+  * - disabled
+    - bool (false)
+    - Disables changing the setting from the UI
+  * - l10n
+    - string ('Interface')
+    - Localization context with display values for the true/false values
+  * - trueLabel
+    - string ('Yes')
+    - Localization key to display for the true value
+  * - falseLabel
+    - string ('No')
+    - Localization key to display for the false value
+
+number
+------
+
+Numeric input
+
+**Argument**
+
+Table with the following optional fields:
+
+.. list-table::
+  :header-rows: 1
+  :widths: 20 20 60
+
+  * - name
+    - type (default)
+    - description
+  * - disabled
+    - bool (false)
+    - Disables changing the setting from the UI
+  * - integer
+    - bool (false)
+    - Only allow integer values
+  * - min
+    - number (nil)
+    - If set, restricts setting values to numbers larger than min
+  * - max
+    - number (nil)
+    - If set, restricts setting values to numbers smaller than max
+
+select
+------
+
+A small selection box with two next / previous arrows on the sides
+
+**Argument**
+
+Table with the following optional fields:
+
+.. list-table::
+  :header-rows: 1
+  :widths: 20 20 60
+
+  * - name
+    - type (default)
+    - description
+  * - disabled
+    - bool (false)
+    - Disables changing the setting from the UI
+  * - l10n
+    - string (required)
+    - Localization context with display values for items
+  * - items
+    - #list<string> ({})
+    - List of options to choose from, all the viable values of the setting
+
+color
+-----
+
+Hex-code color input with a preview
+
+**Argument**
+
+Table with the following optional fields:
+
+.. list-table::
+  :header-rows: 1
+  :widths: 20 20 60
+
+  * - name
+    - type (default)
+    - description
+  * - disabled
+    - bool (false)
+    - Disables changing the setting from the UI
diff --git a/files/builtin_scripts/CMakeLists.txt b/files/builtin_scripts/CMakeLists.txt
index e7425cccbb..38070f7d33 100644
--- a/files/builtin_scripts/CMakeLists.txt
+++ b/files/builtin_scripts/CMakeLists.txt
@@ -24,6 +24,7 @@ set(LUA_BUILTIN_FILES
     scripts/omw/settings/renderers.lua
 
     l10n/Calendar/en.yaml
+    l10n/Interface/en.yaml
 
     scripts/omw/mwui/constants.lua
     scripts/omw/mwui/borders.lua
diff --git a/files/builtin_scripts/l10n/Interface/en.yaml b/files/builtin_scripts/l10n/Interface/en.yaml
new file mode 100644
index 0000000000..4b4ed1584f
--- /dev/null
+++ b/files/builtin_scripts/l10n/Interface/en.yaml
@@ -0,0 +1,3 @@
+Yes: "Yes"
+No: "No"
+Reset: "Reset"
\ No newline at end of file
diff --git a/files/builtin_scripts/scripts/omw/settings/player.lua b/files/builtin_scripts/scripts/omw/settings/player.lua
index e072d7a4c1..a8d1018f35 100644
--- a/files/builtin_scripts/scripts/omw/settings/player.lua
+++ b/files/builtin_scripts/scripts/omw/settings/player.lua
@@ -28,7 +28,7 @@ require('scripts.omw.settings.renderers')(render.registerRenderer)
 -- @field #string name A key from the localization context
 -- @field #string description A key from the localization context (optional, can be `nil`)
 -- @field default A default value
--- @field #string renderer A renderer key
+-- @field #string renderer A renderer key (see the "Built-in Setting Renderers" page)
 -- @field argument An argument for the renderer
 
 return {
diff --git a/files/builtin_scripts/scripts/omw/settings/render.lua b/files/builtin_scripts/scripts/omw/settings/render.lua
index 18aa41be40..c57d8fb838 100644
--- a/files/builtin_scripts/scripts/omw/settings/render.lua
+++ b/files/builtin_scripts/scripts/omw/settings/render.lua
@@ -12,6 +12,8 @@ local function registerRenderer(name, renderFunction)
     renderers[name] = renderFunction
 end
 
+local interfaceL10n = core.l10n('Interface')
+
 local pages = {}
 local groups = {}
 local pageOptions = {}
@@ -156,7 +158,7 @@ local function renderGroup(group, global)
                     {
                         template = I.MWUI.templates.textNormal,
                         props = {
-                            text = 'Reset',
+                            text = interfaceL10n('Reset')
                         },
                         events = {
                             mouseClick = async:callback(function()
@@ -368,7 +370,11 @@ local function onGroupRegistered(global, key)
 
     if not pages[group.page] then return end
     local options = renderPage(pages[group.page])
-    pageOptions[group.page].element:destroy()
+    if pageOptions[group.page] then
+        pageOptions[group.page].element:destroy()
+    else
+        pageOptions[group.page] = {}
+    end
     for k, v in pairs(options) do
         pageOptions[group.page][k] = v
     end
diff --git a/files/builtin_scripts/scripts/omw/settings/renderers.lua b/files/builtin_scripts/scripts/omw/settings/renderers.lua
index 561849f862..9f7a46eb2e 100644
--- a/files/builtin_scripts/scripts/omw/settings/renderers.lua
+++ b/files/builtin_scripts/scripts/omw/settings/renderers.lua
@@ -1,5 +1,7 @@
+local core = require('openmw.core')
 local ui = require('openmw.ui')
 local async = require('openmw.async')
+local util = require('openmw.util')
 local I = require('openmw.interfaces')
 
 local function applyDefaults(argument, defaults)
@@ -52,11 +54,13 @@ return function(registerRenderer)
     do
         local defaultArgument = {
             disabled = false,
+            l10n = 'Interface',
             trueLabel = 'Yes',
             falseLabel = 'No',
         }
         registerRenderer('checkbox', function(value, set, argument)
             argument = applyDefaults(argument, defaultArgument)
+            local l10n = core.l10n(argument.l10n)
             return disable(argument.disabled, {
                 template = I.MWUI.templates.box,
                 content = ui.content {
@@ -66,7 +70,7 @@ return function(registerRenderer)
                             {
                                 template = I.MWUI.templates.textNormal,
                                 props = {
-                                    text = value and argument.trueLabel or argument.falseLabel
+                                    text = l10n(value and argument.trueLabel or argument.falseLabel)
                                 },
                                 events = {
                                     mouseClick = async:callback(function() set(not value) end),
@@ -78,4 +82,185 @@ return function(registerRenderer)
             })
         end)
     end
+
+    do
+        local function validateNumber(text, argument)
+            local number = tonumber(text)
+            if not number then return end
+            if argument.min and number < argument.min then return end
+            if argument.max and number > argument.max then return end
+            if argument.integer and math.floor(number) ~= number then return end
+            return number
+        end
+        local defaultArgument = {
+            disabled = false,
+            integer = false,
+            min = nil,
+            max = nil,
+        }
+        registerRenderer('number', function(value, set, argument)
+            argument = applyDefaults(argument, defaultArgument)
+            local lastInput = nil
+            return disable(argument.disabled, {
+                template = I.MWUI.templates.textEditLine,
+                props = {
+                    text = tostring(value),
+                },
+                events = {
+                    textChanged = async:callback(function(text)
+                        lastInput = text
+                    end),
+                    focusLoss = async:callback(function()
+                        if not lastInput then return end
+                        local number = validateNumber(lastInput, argument)
+                        if not number then
+                            set(value)
+                        end
+                        if number and number ~= value then
+                            set(number)
+                        end
+                    end),
+                },
+            })
+        end)
+    end
+
+    do
+        local defaultArgument = {
+            disabled = false,
+            l10n = nil,
+            items = {},
+        }
+        local leftArrow = ui.texture {
+            path = 'textures/omw_menu_scroll_left.dds',
+        }
+        local rightArrow = ui.texture {
+            path = 'textures/omw_menu_scroll_right.dds',
+        }
+        registerRenderer('select', function(value, set, argument)
+            argument = applyDefaults(argument, defaultArgument)
+            if not argument.l10n then
+                error('"select" renderer requires a "l10n" argument')
+            end
+            local l10n = core.l10n(argument.l10n)
+            local index = nil
+            local itemCount = 0
+            for i, item in ipairs(argument.items) do
+                itemCount = itemCount + 1
+                if item == value then
+                    index = i
+                end
+            end
+            if not index then return {} end
+            local label = l10n(value)
+            local body = {
+                type = ui.TYPE.Flex,
+                props = {
+                    horizontal = true,
+                    arrange = ui.ALIGNMENT.Center,
+                },
+                content = ui.content {
+                    {
+                        type = ui.TYPE.Image,
+                        props = {
+                            resource = leftArrow,
+                            size = util.vector2(1, 1) * 12,
+                        },
+                        events = {
+                            mouseClick = async:callback(function()
+                                index = (index - 2) % itemCount + 1
+                                set(argument.items[index])
+                            end),
+                        },
+                    },
+                    {
+                        template = I.MWUI.templates.textNormal,
+                        props = {
+                            text = label,
+                        },
+                        external = {
+                            grow = 1,
+                        },
+                    },
+                    {
+                        type = ui.TYPE.Image,
+                        props = {
+                            resource = rightArrow,
+                            size = util.vector2(1, 1) * 12,
+                        },
+                        events = {
+                            mouseClick = async:callback(function()
+                                index = (index) % itemCount + 1
+                                set(argument.items[index])
+                            end),
+                        },
+                    },
+                },
+            }
+            return disable(argument.disabled, {
+                template = I.MWUI.templates.box,
+                content = ui.content {
+                    {
+                        template = I.MWUI.templates.padding,
+                        content = ui.content {
+                            body,
+                        },
+                    },
+                },
+            })
+        end)
+    end
+
+    do
+        local whiteTexture = ui.texture { path = 'white' }
+        local defaultArgument = {
+            disabled = false,
+        }
+        registerRenderer('color', function(value, set, argument)
+            argument = applyDefaults(argument, defaultArgument)
+            local colorDisplay = {
+                template = I.MWUI.templates.box,
+                content = ui.content {
+                    {
+                        type = ui.TYPE.Image,
+                        props = {
+                            resource = whiteTexture,
+                            color = value,
+                            -- TODO: remove hardcoded size when possible
+                            size = util.vector2(1, 1) * 20,
+                        },
+                    }
+                },
+            }
+            local lastInput = nil
+            local hexInput = {
+                template = I.MWUI.templates.textEditLine,
+                props = {
+                    text = value:asHex(),
+                },
+                events = {
+                    textChanged = async:callback(function(text)
+                        lastInput = text
+                    end),
+                    focusLoss = async:callback(function()
+                        if not lastInput then return end
+                        if not pcall(function() set(util.color.hex(lastInput)) end)
+                        then set(value) end
+                    end),
+                },
+            }
+            return disable(argument.disabled, {
+                type = ui.TYPE.Flex,
+                props = {
+                    horizontal = true,
+                    arrange = ui.ALIGNMENT.Center,
+                },
+                content = ui.content {
+                    colorDisplay,
+                    { template = I.MWUI.templates.interval },
+                    hexInput,
+                }
+            })
+        end)
+    end
 end
\ No newline at end of file

From 6feb92a9bfae7270f8fe3da309dce8c5b7f25726 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Tue, 24 May 2022 21:18:21 +0000
Subject: [PATCH 2519/2859] Remove boost::filesystem from a couple of files

---
 apps/openmw/mwgui/console.cpp                 |  7 +++---
 apps/openmw/mwgui/windowmanagerimp.cpp        |  3 ++-
 components/bsa/bsa_file.cpp                   | 23 ++++++++-----------
 components/bsa/compressedbsafile.cpp          | 12 ++++------
 components/config/launchersettings.cpp        |  2 --
 components/esm3/esmreader.cpp                 |  4 ++--
 components/fontloader/fontloader.cpp          |  3 ++-
 components/fontloader/fontloader.hpp          |  2 --
 components/myguiplatform/myguidatamanager.cpp | 10 ++++----
 components/sceneutil/screencapture.cpp        | 10 ++++----
 components/sceneutil/writescene.cpp           |  4 ++--
 components/version/version.cpp                |  8 +++----
 components/vfs/filesystemarchive.cpp          |  6 ++---
 13 files changed, 43 insertions(+), 51 deletions(-)

diff --git a/apps/openmw/mwgui/console.cpp b/apps/openmw/mwgui/console.cpp
index aaf36aab59..a382bbeb07 100644
--- a/apps/openmw/mwgui/console.cpp
+++ b/apps/openmw/mwgui/console.cpp
@@ -4,8 +4,8 @@
 #include <MyGUI_InputManager.h>
 #include <MyGUI_LayerManager.h>
 
-#include <boost/filesystem.hpp>
-#include <boost/filesystem/fstream.hpp>
+#include <filesystem>
+#include <fstream>
 
 #include <components/compiler/exception.hpp>
 #include <components/compiler/extensions0.hpp>
@@ -220,8 +220,7 @@ namespace MWGui
 
     void Console::executeFile (const std::string& path)
     {
-        namespace bfs = boost::filesystem;
-        bfs::ifstream stream ((bfs::path(path)));
+        std::ifstream stream ((std::filesystem::path(path)));
 
         if (!stream.is_open())
             printError ("failed to open file: " + path);
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 95a437ceaa..2a4855f4a3 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -3,6 +3,7 @@
 #include <algorithm>
 #include <cassert>
 #include <chrono>
+#include <filesystem>
 #include <thread>
 
 #include <osgViewer/Viewer>
@@ -195,7 +196,7 @@ namespace MWGui
     {
         mScalingFactor = std::clamp(Settings::Manager::getFloat("scaling factor", "GUI"), 0.5f, 8.f);
         mGuiPlatform = new osgMyGUI::Platform(viewer, guiRoot, resourceSystem->getImageManager(), mScalingFactor);
-        mGuiPlatform->initialise(resourcePath, (boost::filesystem::path(logpath) / "MyGUI.log").generic_string());
+        mGuiPlatform->initialise(resourcePath, (std::filesystem::path(logpath) / "MyGUI.log").generic_string());
 
         mGui = new MyGUI::Gui;
         mGui->initialise("");
diff --git a/components/bsa/bsa_file.cpp b/components/bsa/bsa_file.cpp
index e5b730b4c4..02c70d29cb 100644
--- a/components/bsa/bsa_file.cpp
+++ b/components/bsa/bsa_file.cpp
@@ -23,11 +23,11 @@
 
 #include "bsa_file.hpp"
 
+#include <algorithm>
 #include <cassert>
-
-#include <boost/filesystem/path.hpp>
-#include <boost/filesystem/fstream.hpp>
-#include <boost/filesystem/operations.hpp>
+#include <cstring>
+#include <filesystem>
+#include <fstream>
 
 using namespace Bsa;
 
@@ -98,8 +98,7 @@ void BSAFile::readHeader()
      */
     assert(!mIsLoaded);
 
-    namespace bfs = boost::filesystem;
-    bfs::ifstream input(bfs::path(mFilename), std::ios_base::binary);
+    std::ifstream input(std::filesystem::path(mFilename), std::ios_base::binary);
 
     // Total archive size
     std::streamoff fsize = 0;
@@ -195,8 +194,7 @@ void BSAFile::readHeader()
 /// Write header information to the output sink
 void Bsa::BSAFile::writeHeader()
 {
-    namespace bfs = boost::filesystem;
-    bfs::fstream output(mFilename, std::ios::binary | std::ios::in | std::ios::out);
+    std::fstream output(mFilename, std::ios::binary | std::ios::in | std::ios::out);
 
     uint32_t head[3];
     head[0] = 0x100;
@@ -237,11 +235,11 @@ void BSAFile::open(const std::string &file)
         close();
 
     mFilename = file;
-    if(boost::filesystem::exists(file))
+    if(std::filesystem::exists(file))
         readHeader();
     else
     {
-        { boost::filesystem::fstream(mFilename, std::ios::binary | std::ios::out); }
+        { std::fstream(mFilename, std::ios::binary | std::ios::out); }
         writeHeader();
         mIsLoaded = true;
     }
@@ -262,13 +260,12 @@ void Bsa::BSAFile::addFile(const std::string& filename, std::istream& file)
 {
     if (!mIsLoaded)
         fail("Unable to add file " + filename + " the archive is not opened");
-    namespace bfs = boost::filesystem;
 
     auto newStartOfDataBuffer = 12 + (12 + 8) * (mFiles.size() + 1) + mStringBuf.size() + filename.size() + 1;
     if (mFiles.empty())
-        bfs::resize_file(mFilename, newStartOfDataBuffer);
+        std::filesystem::resize_file(mFilename, newStartOfDataBuffer);
 
-    bfs::fstream stream(mFilename, std::ios::binary | std::ios::in | std::ios::out);
+    std::fstream stream(mFilename, std::ios::binary | std::ios::in | std::ios::out);
 
     FileStruct newFile;
     file.seekg(0, std::ios::end);
diff --git a/components/bsa/compressedbsafile.cpp b/components/bsa/compressedbsafile.cpp
index e4117a0b89..6c0eb47319 100644
--- a/components/bsa/compressedbsafile.cpp
+++ b/components/bsa/compressedbsafile.cpp
@@ -26,12 +26,12 @@
 
 #include <stdexcept>
 #include <cassert>
+#include <filesystem>
+#include <fstream>
 
 #include <lz4frame.h>
 
 #include <boost/scoped_array.hpp>
-#include <boost/filesystem/path.hpp>
-#include <boost/filesystem/fstream.hpp>
 
 #include <boost/iostreams/filtering_streambuf.hpp>
 #include <boost/iostreams/copy.hpp>
@@ -119,8 +119,7 @@ void CompressedBSAFile::readHeader()
 {
     assert(!mIsLoaded);
 
-    namespace bfs = boost::filesystem;
-    bfs::ifstream input(bfs::path(mFilename), std::ios_base::binary);
+    std::ifstream input(std::filesystem::path(mFilename), std::ios_base::binary);
 
     // Total archive size
     std::streamoff fsize = 0;
@@ -306,7 +305,7 @@ CompressedBSAFile::FileRecord CompressedBSAFile::getFileRecord(const std::string
     std::string path = str;
     std::replace(path.begin(), path.end(), '\\', '/');
 
-    boost::filesystem::path p(path);
+    std::filesystem::path p(path);
     std::string stem = p.stem().string();
     std::string ext = p.extension().string();
     p.remove_filename();
@@ -408,8 +407,7 @@ Files::IStreamPtr CompressedBSAFile::getFile(const FileRecord& fileRecord)
 
 BsaVersion CompressedBSAFile::detectVersion(const std::string& filePath)
 {
-    namespace bfs = boost::filesystem;
-    bfs::ifstream input(bfs::path(filePath), std::ios_base::binary);
+    std::ifstream input(std::filesystem::path(filePath), std::ios_base::binary);
 
     // Total archive size
     std::streamoff fsize = 0;
diff --git a/components/config/launchersettings.cpp b/components/config/launchersettings.cpp
index f0d9093993..11ced3c145 100644
--- a/components/config/launchersettings.cpp
+++ b/components/config/launchersettings.cpp
@@ -7,8 +7,6 @@
 
 #include <QDebug>
 
-#include <boost/filesystem/operations.hpp>
-
 #include <components/files/configurationmanager.hpp>
 
 const char Config::LauncherSettings::sCurrentContentListKey[] = "Profiles/currentprofile";
diff --git a/components/esm3/esmreader.cpp b/components/esm3/esmreader.cpp
index 68228a8156..290dfe1a5a 100644
--- a/components/esm3/esmreader.cpp
+++ b/components/esm3/esmreader.cpp
@@ -1,11 +1,11 @@
 #include "esmreader.hpp"
 
-#include <boost/filesystem/path.hpp>
 #include <components/misc/stringops.hpp>
 #include <components/files/openfile.hpp>
 
 #include <stdexcept>
 #include <sstream>
+#include <filesystem>
 #include <fstream>
 
 namespace ESM
@@ -74,7 +74,7 @@ void ESMReader::resolveParentFileIndices(const std::vector<ESMReader>& allPlugin
             if (reader.getFileSize() == 0)
                 continue;  // Content file in non-ESM format
             const std::string& candidate = reader.getName();
-            std::string fnamecandidate = boost::filesystem::path(candidate).filename().string();
+            std::string fnamecandidate = std::filesystem::path(candidate).filename().string();
             if (Misc::StringUtils::ciEqual(fname, fnamecandidate)) {
                 index = i;
                 break;
diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index b67283d01f..657a887cbd 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -1,5 +1,6 @@
 #include "fontloader.hpp"
 
+#include <filesystem>
 #include <stdexcept>
 #include <string_view>
 #include <array>
@@ -216,7 +217,7 @@ namespace Gui
 
         const std::string cfg = dataManager->getDataPath("");
         const std::string fontFile = mUserDataPath + "/" + "Fonts" + "/" + "openmw_font.xml";
-        if (!boost::filesystem::exists(fontFile))
+        if (!std::filesystem::exists(fontFile))
             return;
 
         dataManager->setResourcePath(mUserDataPath + "/" + "Fonts");
diff --git a/components/fontloader/fontloader.hpp b/components/fontloader/fontloader.hpp
index 8a46a0069e..ee54e077a5 100644
--- a/components/fontloader/fontloader.hpp
+++ b/components/fontloader/fontloader.hpp
@@ -1,8 +1,6 @@
 #ifndef OPENMW_COMPONENTS_FONTLOADER_H
 #define OPENMW_COMPONENTS_FONTLOADER_H
 
-#include "boost/filesystem/operations.hpp"
-
 #include <MyGUI_XmlDocument.h>
 #include <MyGUI_Version.h>
 
diff --git a/components/myguiplatform/myguidatamanager.cpp b/components/myguiplatform/myguidatamanager.cpp
index 1aa16946a4..62023c8366 100644
--- a/components/myguiplatform/myguidatamanager.cpp
+++ b/components/myguiplatform/myguidatamanager.cpp
@@ -5,8 +5,8 @@
 
 #include <MyGUI_DataFileStream.h>
 
-#include <boost/filesystem/operations.hpp>
-#include <boost/filesystem/fstream.hpp>
+#include <filesystem>
+#include <fstream>
 
 #include <components/debug/debuglog.hpp>
 
@@ -21,8 +21,8 @@ void DataManager::setResourcePath(const std::string &path)
 MyGUI::IDataStream *DataManager::getData(const std::string &name) const
 {
     std::string fullpath = getDataPath(name);
-    std::unique_ptr<boost::filesystem::ifstream> stream;
-    stream.reset(new boost::filesystem::ifstream);
+    std::unique_ptr<std::ifstream> stream;
+    stream.reset(new std::ifstream);
     stream->open(fullpath, std::ios::binary);
     if (stream->fail())
     {
@@ -40,7 +40,7 @@ void DataManager::freeData(MyGUI::IDataStream *data)
 bool DataManager::isDataExist(const std::string &name) const
 {
     std::string fullpath = mResourcePath + "/" + name;
-    return boost::filesystem::exists(fullpath);
+    return std::filesystem::exists(fullpath);
 }
 
 const MyGUI::VectorString &DataManager::getDataListNames(const std::string &pattern) const
diff --git a/components/sceneutil/screencapture.cpp b/components/sceneutil/screencapture.cpp
index 99cb535326..97a22e94aa 100644
--- a/components/sceneutil/screencapture.cpp
+++ b/components/sceneutil/screencapture.cpp
@@ -8,10 +8,10 @@
 #include <osgDB/ReaderWriter>
 #include <osgDB/Registry>
 
-#include <boost/filesystem/fstream.hpp>
-#include <boost/filesystem/operations.hpp>
 
 #include <cassert>
+#include <fstream>
+#include <filesystem>
 #include <iomanip>
 #include <sstream>
 #include <string>
@@ -82,10 +82,10 @@ namespace SceneUtil
             lastFileName = stream.str();
             lastFilePath = screenshotPath + "/" + lastFileName;
 
-        } while (boost::filesystem::exists(lastFilePath));
+        } while (std::filesystem::exists(lastFilePath));
 
-        boost::filesystem::ofstream outStream;
-        outStream.open(boost::filesystem::path(std::move(lastFilePath)), std::ios::binary);
+        std::ofstream outStream;
+        outStream.open(std::filesystem::path(std::move(lastFilePath)), std::ios::binary);
 
         osgDB::ReaderWriter* readerwriter = osgDB::Registry::instance()->getReaderWriterForExtension(screenshotFormat);
         if (!readerwriter)
diff --git a/components/sceneutil/writescene.cpp b/components/sceneutil/writescene.cpp
index 6be963ef2e..d243f521c0 100644
--- a/components/sceneutil/writescene.cpp
+++ b/components/sceneutil/writescene.cpp
@@ -1,10 +1,10 @@
 #include "writescene.hpp"
 
 #include <stdexcept>
+#include <fstream>
 
 #include <osgDB/Registry>
 
-#include <boost/filesystem/fstream.hpp>
 
 #include "serialize.hpp"
 
@@ -16,7 +16,7 @@ void SceneUtil::writeScene(osg::Node *node, const std::string& filename, const s
     if (!rw)
         throw std::runtime_error("can not find readerwriter for " + format);
 
-    boost::filesystem::ofstream stream;
+    std::ofstream stream;
     stream.open(filename);
 
     osg::ref_ptr<osgDB::Options> options = new osgDB::Options;
diff --git a/components/version/version.cpp b/components/version/version.cpp
index fecbdcb3f9..32b8f44ae6 100644
--- a/components/version/version.cpp
+++ b/components/version/version.cpp
@@ -1,16 +1,16 @@
 #include "version.hpp"
 
-#include <boost/filesystem/path.hpp>
-#include <boost/filesystem/fstream.hpp>
+#include <filesystem>
+#include <fstream>
 
 namespace Version
 {
 
 Version getOpenmwVersion(const std::string &resourcePath)
 {
-    boost::filesystem::path path (resourcePath + "/version");
+    std::filesystem::path path (resourcePath + "/version");
 
-    boost::filesystem::ifstream stream (path);
+    std::ifstream stream (path);
 
     Version v;
     std::getline(stream, v.mVersion);
diff --git a/components/vfs/filesystemarchive.cpp b/components/vfs/filesystemarchive.cpp
index 839f84de57..206d9aff0c 100644
--- a/components/vfs/filesystemarchive.cpp
+++ b/components/vfs/filesystemarchive.cpp
@@ -2,7 +2,7 @@
 
 #include <algorithm>
 
-#include <boost/filesystem.hpp>
+#include <filesystem>
 
 #include <components/debug/debuglog.hpp>
 
@@ -20,7 +20,7 @@ namespace VFS
     {
         if (!mBuiltIndex)
         {
-            typedef boost::filesystem::recursive_directory_iterator directory_iterator;
+            typedef std::filesystem::recursive_directory_iterator directory_iterator;
 
             directory_iterator end;
 
@@ -31,7 +31,7 @@ namespace VFS
 
             for (directory_iterator i (mPath); i != end; ++i)
             {
-                if(boost::filesystem::is_directory (*i))
+                if(std::filesystem::is_directory (*i))
                     continue;
 
                 std::string proper = i->path ().string ();

From 617cd4ceb6c4d754fe09da225038f97d75256ced Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 24 May 2022 23:24:52 +0200
Subject: [PATCH 2520/2859] Make sure physics simulation does not reset flags
 for nonprocessed actors

Actor::getOnGround and Actor::getOnSlope is used to initialize ActorFrameData.
After a physics simulation the result is copied back. But when actor is outside
processing range, Actor::mInternalCollisionMode is false and physics simulation
does not recalculate OnGround and OnSlope flags. So the flags are always set to
false that makes actor play landing animation when they exit and then enter
actors processing range.
---
 apps/openmw/mwphysics/actor.hpp         | 10 ++--------
 apps/openmw/mwphysics/physicssystem.cpp |  4 ++--
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index 01d8037f6b..d19211d49e 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -116,17 +116,11 @@ namespace MWPhysics
 
         void setOnGround(bool grounded);
 
-        bool getOnGround() const
-        {
-            return mInternalCollisionMode && mOnGround;
-        }
+        bool getOnGround() const { return mOnGround; }
 
         void setOnSlope(bool slope);
 
-        bool getOnSlope() const
-        {
-            return mInternalCollisionMode && mOnSlope;
-        }
+        bool getOnSlope() const { return mOnSlope; }
 
         /// Sets whether this actor should be able to collide with the water surface
         void setCanWaterWalk(bool waterWalk);
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 1c1a2d6fbd..4de60f4900 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -176,7 +176,7 @@ namespace MWPhysics
     bool PhysicsSystem::isOnSolidGround (const MWWorld::Ptr& actor) const
     {
         const Actor* physactor = getActor(actor);
-        if (!physactor || !physactor->getOnGround())
+        if (!physactor || !physactor->getOnGround() || !physactor->getCollisionMode())
             return false;
 
         const auto obj = physactor->getStandingOnPtr();
@@ -374,7 +374,7 @@ namespace MWPhysics
     bool PhysicsSystem::isOnGround(const MWWorld::Ptr &actor)
     {
         Actor* physactor = getActor(actor);
-        return physactor && physactor->getOnGround();
+        return physactor && physactor->getOnGround() && physactor->getCollisionMode();
     }
 
     bool PhysicsSystem::canMoveToWaterSurface(const MWWorld::ConstPtr &actor, const float waterlevel)

From 85c79d382c328e1484357206e98d4586b7ab3465 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 24 May 2022 23:25:23 +0200
Subject: [PATCH 2521/2859] Enable collisions for actor before adjusting
 position

Otherwise adjustPosition does not call traceDown and actor appears flying for
the first physics simulation.
---
 apps/openmw/mwmechanics/actors.cpp | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index c063748bdc..7dfad96126 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1596,15 +1596,6 @@ namespace MWMechanics
                     world->setActorCollisionMode(actor.getPtr(), false, false);
                     continue;
                 }
-                else if (!isPlayer)
-                {
-                    actor.getPtr().getRefData().getBaseNode()->setNodeMask(MWRender::Mask_Actor);
-                    if (!actor.getPositionAdjusted())
-                    {
-                        actor.getPtr().getClass().adjustPosition(actor.getPtr(), false);
-                        actor.setPositionAdjusted(true);
-                    }
-                }
 
                 const bool isDead = actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isDead();
                 if (!isDead && (!godmode || !isPlayer) && actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isParalyzed())
@@ -1612,13 +1603,21 @@ namespace MWMechanics
 
                 // Handle player last, in case a cell transition occurs by casting a teleportation spell
                 // (would invalidate the iterator)
-                if (actor.getPtr() == getPlayer())
+                if (isPlayer)
                 {
                     playerCharacter = &ctrl;
                     continue;
                 }
 
+                actor.getPtr().getRefData().getBaseNode()->setNodeMask(MWRender::Mask_Actor);
                 world->setActorCollisionMode(actor.getPtr(), true, !actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isDeathAnimationFinished());
+
+                if (!actor.getPositionAdjusted())
+                {
+                    actor.getPtr().getClass().adjustPosition(actor.getPtr(), false);
+                    actor.setPositionAdjusted(true);
+                }
+
                 ctrl.update(duration);
 
                 updateVisibility(actor.getPtr(), ctrl);

From 30a64ee82ae00fb2ab19224754385932ff4b6bcf Mon Sep 17 00:00:00 2001
From: cody glassman <glassmancody.info@gmail.com>
Date: Tue, 24 May 2022 22:30:25 -0700
Subject: [PATCH 2522/2859] move to world space, fix bug with uniform size
 updates

---
 components/fx/pass.cpp                |  2 +-
 components/sceneutil/lightmanager.cpp | 18 ++++++++++++------
 components/sceneutil/lightmanager.hpp |  7 ++++++-
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/components/fx/pass.cpp b/components/fx/pass.cpp
index d8fb07efd5..16480128b7 100644
--- a/components/fx/pass.cpp
+++ b/components/fx/pass.cpp
@@ -86,7 +86,7 @@ int omw_GetPointLightCount()
     return omw_PointLightsCount;
 }
 
-vec3 omw_GetPointLightViewPos(int index)
+vec3 omw_GetPointLightWorldPos(int index)
 {
     return omw_PointLights[(index * 3)].xyz;
 }
diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 3092fc6f40..db5fe6b479 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -635,6 +635,9 @@ namespace SceneUtil
             cv->pushStateSet(stateset);
             traverse(node, cv);
             cv->popStateSet();
+
+            if (node->getPPLightsBuffer() && cv->getCurrentCamera()->getName() == Constants::SceneCamera)
+                node->getPPLightsBuffer()->updateCount(cv->getTraversalNumber());
         }
     };
 
@@ -1141,12 +1144,15 @@ namespace SceneUtil
                 if (mPPLightBuffer && it->first->getName() == Constants::SceneCamera)
                 {
                     const auto* light = l.mLightSource->getLight(frameNum);
-                    mPPLightBuffer->setLight(frameNum, light->getPosition() * (*viewMatrix),
-                                            light->getDiffuse(),
-                                            light->getConstantAttenuation(),
-                                            light->getLinearAttenuation(),
-                                            light->getQuadraticAttenuation(),
-                                            l.mLightSource->getRadius());
+                    if (light->getDiffuse().x() >= 0.f)
+                    {
+                        mPPLightBuffer->setLight(frameNum, light->getPosition(),
+                                                light->getDiffuse(),
+                                                light->getConstantAttenuation(),
+                                                light->getLinearAttenuation(),
+                                                light->getQuadraticAttenuation(),
+                                                l.mLightSource->getRadius());
+                    }
                 }
             }
         }
diff --git a/components/sceneutil/lightmanager.hpp b/components/sceneutil/lightmanager.hpp
index ab48e9a23a..0457dc323e 100644
--- a/components/sceneutil/lightmanager.hpp
+++ b/components/sceneutil/lightmanager.hpp
@@ -29,7 +29,7 @@ namespace SceneUtil
     class PPLightBuffer
     {
     public:
-        inline static constexpr auto sMaxPPLights = 30;
+        inline static constexpr auto sMaxPPLights = 40;
         inline static constexpr auto sMaxPPLightsArraySize = sMaxPPLights * 3;
 
         PPLightBuffer()
@@ -75,6 +75,11 @@ namespace SceneUtil
             mUniformBuffers[frameId]->setElement(i + 2, osg::Vec4f(ac, al, aq, radius));
 
             mIndex[frameId]++;
+        }
+
+        void updateCount(size_t frame)
+        {
+            size_t frameId = frame % 2;
             mUniformCount[frameId]->set(static_cast<int>(mIndex[frameId]));
         }
 

From 921a4c7bcad026090564aedc32792fb7c25e022f Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 25 May 2022 16:49:03 +0200
Subject: [PATCH 2523/2859] Fix inverted logic

---
 apps/openmw/mwmechanics/actors.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index c063748bdc..b318e5a503 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -971,7 +971,7 @@ namespace MWMechanics
         const auto mechanicsManager = MWBase::Environment::get().getMechanicsManager();
         const auto world = MWBase::Environment::get().getWorld();
 
-        if (actorClass.isClass(ptr, "Guard") && creatureStats.getAiSequence().isInPursuit() && !creatureStats.getAiSequence().isInCombat()
+        if (actorClass.isClass(ptr, "Guard") && !creatureStats.getAiSequence().isInPursuit() && !creatureStats.getAiSequence().isInCombat()
             && creatureStats.getMagicEffects().get(ESM::MagicEffect::CalmHumanoid).getMagnitude() == 0)
         {
             const MWWorld::ESMStore& esmStore = world->getStore();

From 4e4debb1cb65bd9f6fdd0d975e0373566b9f3423 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Wed, 25 May 2022 18:29:02 +0000
Subject: [PATCH 2524/2859] Remove even more of boost::filesystem

---
 apps/essimporter/importer.cpp            |  6 +++---
 apps/openmw/engine.cpp                   | 17 +++++++++--------
 apps/openmw/mwrender/water.cpp           |  6 ++----
 components/crashcatcher/crashcatcher.cpp | 14 ++++++--------
 components/debug/debugging.cpp           |  6 ++++--
 components/detournavigator/debug.cpp     |  8 ++++----
 components/esm4/reader.cpp               |  5 ++---
 components/esmloader/load.cpp            |  3 ++-
 components/settings/parser.cpp           | 13 +++++++------
 9 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/apps/essimporter/importer.cpp b/apps/essimporter/importer.cpp
index a683bf7047..0eb377c219 100644
--- a/apps/essimporter/importer.cpp
+++ b/apps/essimporter/importer.cpp
@@ -1,8 +1,8 @@
 #include "importer.hpp"
 
 #include <iomanip>
-
-#include <boost/filesystem/fstream.hpp>
+#include <filesystem>
+#include <fstream>
 
 #include <osgDB/ReadFile>
 #include <osg/ImageUtils>
@@ -345,7 +345,7 @@ namespace ESSImport
 
         writer.setFormat (ESM::SavedGame::sCurrentFormat);
 
-        boost::filesystem::ofstream stream(boost::filesystem::path(mOutFile), std::ios::out | std::ios::binary);
+        std::ofstream stream(std::filesystem::path(mOutFile), std::ios::out | std::ios::binary);
         // all unused
         writer.setVersion(0);
         writer.setType(0);
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 9fedd8f909..b2b1dbd0d6 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -3,6 +3,7 @@
 #include <iomanip>
 #include <chrono>
 #include <thread>
+#include <filesystem>
 
 #include <boost/filesystem/fstream.hpp>
 
@@ -684,7 +685,7 @@ void OMW::Engine::createWindow()
 
 void OMW::Engine::setWindowIcon()
 {
-    boost::filesystem::ifstream windowIconStream;
+    std::ifstream windowIconStream;
     std::string windowIcon = (mResDir / "mygui" / "openmw.png").string();
     windowIconStream.open(windowIcon, std::ios_base::in | std::ios_base::binary);
     if (windowIconStream.fail())
@@ -759,13 +760,13 @@ void OMW::Engine::prepareEngine()
     // showing a loading screen and keeping the window responsive while doing so
 
     std::string keybinderUser = (mCfgMgr.getUserConfigPath() / "input_v3.xml").string();
-    bool keybinderUserExists = boost::filesystem::exists(keybinderUser);
+    bool keybinderUserExists = std::filesystem::exists(keybinderUser);
     if(!keybinderUserExists)
     {
         std::string input2 = (mCfgMgr.getUserConfigPath() / "input_v2.xml").string();
-        if(boost::filesystem::exists(input2)) {
-            boost::filesystem::copy_file(input2, keybinderUser);
-            keybinderUserExists = boost::filesystem::exists(keybinderUser);
+        if(std::filesystem::exists(input2)) {
+            std::filesystem::copy_file(input2, keybinderUser);
+            keybinderUserExists = std::filesystem::exists(keybinderUser);
             Log(Debug::Info) << "Loading keybindings file: " << keybinderUser;
         }
     }
@@ -777,13 +778,13 @@ void OMW::Engine::prepareEngine()
     const std::string globaldefault = mCfgMgr.getGlobalPath().string() + "/gamecontrollerdb.txt";
 
     std::string userGameControllerdb;
-    if (boost::filesystem::exists(userdefault))
+    if (std::filesystem::exists(userdefault))
         userGameControllerdb = userdefault;
 
     std::string gameControllerdb;
-    if (boost::filesystem::exists(localdefault))
+    if (std::filesystem::exists(localdefault))
         gameControllerdb = localdefault;
-    else if (boost::filesystem::exists(globaldefault))
+    else if (std::filesystem::exists(globaldefault))
         gameControllerdb = globaldefault;
     //else if it doesn't exist, pass in an empty string
 
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index 9896893da2..822eab04fe 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -14,8 +14,7 @@
 
 #include <osgDB/ReadFile>
 
-#include <boost/filesystem/path.hpp>
-#include <boost/filesystem/fstream.hpp>
+#include <fstream>
 
 #include <osgUtil/IncrementalCompileOperation>
 #include <osgUtil/CullVisitor>
@@ -242,8 +241,7 @@ private:
 
 osg::ref_ptr<osg::Image> readPngImage (const std::string& file)
 {
-    // use boost in favor of osgDB::readImage, to handle utf-8 path issues on Windows
-    boost::filesystem::ifstream inStream;
+    std::ifstream inStream;
     inStream.open(file, std::ios_base::in | std::ios_base::binary);
     if (inStream.fail())
         Log(Debug::Error) << "Error: Failed to open " << file;
diff --git a/components/crashcatcher/crashcatcher.cpp b/components/crashcatcher/crashcatcher.cpp
index c828e1ca81..efdd7c254b 100644
--- a/components/crashcatcher/crashcatcher.cpp
+++ b/components/crashcatcher/crashcatcher.cpp
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <cstring>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
@@ -9,6 +10,8 @@
 #include <string.h>
 #include <errno.h>
 #include <limits.h>
+#include <fstream>
+#include <filesystem>
 
 #include <pthread.h>
 #include <stdbool.h>
@@ -16,11 +19,6 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <boost/filesystem/fstream.hpp>
-#include <boost/filesystem/operations.hpp>
-
-namespace bfs = boost::filesystem;
-
 #include <SDL_messagebox.h>
 
 #ifdef __linux__
@@ -501,10 +499,10 @@ int crashCatcherInstallHandlers(int argc, char **argv, int num_signals, int *sig
 static bool is_debugger_present()
 {
 #if defined (__linux__)
-    bfs::path procstatus = bfs::path("/proc/self/status");
-    if (bfs::exists(procstatus))
+    std::filesystem::path procstatus = std::filesystem::path("/proc/self/status");
+    if (std::filesystem::exists(procstatus))
     {
-        bfs::ifstream file((procstatus));
+        std::ifstream file((procstatus));
         while (!file.eof())
         {
             std::string word;
diff --git a/components/debug/debugging.cpp b/components/debug/debugging.cpp
index 62d1bc716d..c46971d651 100644
--- a/components/debug/debugging.cpp
+++ b/components/debug/debugging.cpp
@@ -3,6 +3,8 @@
 #include <chrono>
 #include <memory>
 #include <functional>
+#include <fstream>
+#include <filesystem>
 
 #include <components/crashcatcher/crashcatcher.hpp>
 
@@ -142,7 +144,7 @@ namespace Debug
 static std::unique_ptr<std::ostream> rawStdout = nullptr;
 static std::unique_ptr<std::ostream> rawStderr = nullptr;
 static std::unique_ptr<std::mutex> rawStderrMutex = nullptr;
-static boost::filesystem::ofstream logfile;
+static std::ofstream logfile;
 
 #if defined(_WIN32) && defined(_DEBUG)
 static boost::iostreams::stream_buffer<Debug::DebugOutput> sb;
@@ -176,7 +178,7 @@ void setupLogging(const std::string& logDir, const std::string& appName, std::io
     std::cerr.rdbuf(&sb);
 #else
     const std::string logName = Misc::StringUtils::lowerCase(appName) + ".log";
-    logfile.open(boost::filesystem::path(logDir) / logName, mode);
+    logfile.open(std::filesystem::path(logDir) / logName, mode);
 
     coutsb.open(Debug::Tee(logfile, *rawStdout));
     cerrsb.open(Debug::Tee(logfile, *rawStderr));
diff --git a/components/detournavigator/debug.cpp b/components/detournavigator/debug.cpp
index 8394c6696d..0ddd27da5e 100644
--- a/components/detournavigator/debug.cpp
+++ b/components/detournavigator/debug.cpp
@@ -6,8 +6,8 @@
 
 #include <DetourNavMesh.h>
 
-#include <boost/filesystem.hpp>
-#include <boost/filesystem/fstream.hpp>
+#include <filesystem>
+#include <fstream>
 
 namespace DetourNavigator
 {
@@ -15,7 +15,7 @@ namespace DetourNavigator
         const std::string& revision, const RecastSettings& settings)
     {
         const auto path = pathPrefix + "recastmesh" + revision + ".obj";
-        boost::filesystem::ofstream file(boost::filesystem::path(path), std::ios::out);
+        std::ofstream file(std::filesystem::path(path), std::ios::out);
         if (!file.is_open())
             throw NavigatorException("Open file failed: " + path);
         file.exceptions(std::ios::failbit | std::ios::badbit);
@@ -62,7 +62,7 @@ namespace DetourNavigator
         };
 
         const auto path = pathPrefix + "all_tiles_navmesh" + revision + ".bin";
-        boost::filesystem::ofstream file(boost::filesystem::path(path), std::ios::out | std::ios::binary);
+        std::ofstream file(std::filesystem::path(path), std::ios::out | std::ios::binary);
         if (!file.is_open())
             throw NavigatorException("Open file failed: " + path);
         file.exceptions(std::ios::failbit | std::ios::badbit);
diff --git a/components/esm4/reader.cpp b/components/esm4/reader.cpp
index 9ac8da8802..3966a18bc4 100644
--- a/components/esm4/reader.cpp
+++ b/components/esm4/reader.cpp
@@ -31,6 +31,7 @@
 #include <cassert>
 #include <stdexcept>
 #include <unordered_map>
+#include <filesystem>
 #include <iostream> // for debugging
 #include <sstream>  // for debugging
 #include <iomanip>  // for debugging
@@ -46,8 +47,6 @@
 #include <boost/iostreams/filtering_streambuf.hpp>
 #include <boost/iostreams/copy.hpp>
 #include <boost/algorithm/string.hpp>
-#include <boost/filesystem/path.hpp>
-#include <boost/filesystem/operations.hpp>
 
 #include <components/bsa/memorystream.hpp>
 
@@ -192,7 +191,7 @@ void Reader::buildLStringIndex()
     if ((mHeader.mFlags & Rec_ESM) == 0 || (mHeader.mFlags & Rec_Localized) == 0)
         return;
 
-    boost::filesystem::path p(mCtx.filename);
+    std::filesystem::path p(mCtx.filename);
     std::string filename = p.stem().filename().string();
 
     buildLStringIndex("Strings/" + filename + "_English.STRINGS",   Type_Strings);
diff --git a/components/esmloader/load.cpp b/components/esmloader/load.cpp
index 2705c43c49..9ab857c9f0 100644
--- a/components/esmloader/load.cpp
+++ b/components/esmloader/load.cpp
@@ -20,6 +20,7 @@
 #include <components/misc/stringops.hpp>
 
 #include <algorithm>
+#include <filesystem>
 #include <cstddef>
 #include <map>
 #include <set>
@@ -222,7 +223,7 @@ namespace EsmLoader
             for (std::size_t i = 0; i < contentFiles.size(); ++i)
             {
                 const std::string &file = contentFiles[i];
-                const std::string extension = Misc::StringUtils::lowerCase(boost::filesystem::path(file).extension().string());
+                const std::string extension = Misc::StringUtils::lowerCase(std::filesystem::path(file).extension().string());
 
                 if (supportedFormats.find(extension) == supportedFormats.end())
                 {
diff --git a/components/settings/parser.cpp b/components/settings/parser.cpp
index dd1b8c1a20..778888d2d2 100644
--- a/components/settings/parser.cpp
+++ b/components/settings/parser.cpp
@@ -5,7 +5,8 @@
 #include <components/debug/debuglog.hpp>
 #include <components/misc/stringops.hpp>
 
-#include <boost/filesystem/fstream.hpp>
+#include <fstream>
+#include <filesystem>
 
 #include <Base64.h>
 
@@ -13,8 +14,8 @@ void Settings::SettingsFileParser::loadSettingsFile(const std::string& file, Cat
                                                     bool base64Encoded, bool overrideExisting)
 {
     mFile = file;
-    boost::filesystem::ifstream fstream;
-    fstream.open(boost::filesystem::path(file));
+    std::ifstream fstream;
+    fstream.open(std::filesystem::path(file));
     auto stream = std::ref<std::istream>(fstream);
 
     std::istringstream decodedStream;
@@ -106,8 +107,8 @@ void Settings::SettingsFileParser::saveSettingsFile(const std::string& file, con
     // Open the existing settings.cfg file to copy comments.  This might not be the same file
     // as the output file if we're copying the setting from the default settings.cfg for the
     // first time.  A minor change in API to pass the source file might be in order here.
-    boost::filesystem::ifstream istream;
-    boost::filesystem::path ipath(file);
+    std::ifstream istream;
+    std::filesystem::path ipath(file);
     istream.open(ipath);
 
     // Create a new string stream to write the current settings to.  It's likely that the
@@ -305,7 +306,7 @@ void Settings::SettingsFileParser::saveSettingsFile(const std::string& file, con
     // Now install the newly written file in the requested place.
     if (changed) {
         Log(Debug::Info) << "Updating settings file: " << ipath;
-        boost::filesystem::ofstream ofstream;
+        std::ofstream ofstream;
         ofstream.open(ipath);
         ofstream << ostream.rdbuf();
         ofstream.close();

From cb226e00f9617852444aaebcf256bdcd22a86d09 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Wed, 25 May 2022 21:16:26 +0200
Subject: [PATCH 2525/2859] Remove some more of boost::

---
 apps/openmw/mwstate/statemanagerimp.cpp         | 4 +++-
 apps/openmw_test_suite/mwworld/test_store.cpp   | 7 ++++---
 apps/openmw_test_suite/settings/parser.cpp      | 4 ++--
 apps/openmw_test_suite/shader/shadermanager.cpp | 4 ++--
 components/settings/settings.cpp                | 7 ++++---
 components/translation/translation.cpp          | 6 +++---
 6 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index 50a3a48ad8..9f572fde9e 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -1,5 +1,7 @@
 #include "statemanagerimp.hpp"
 
+#include <filesystem>
+
 #include <components/debug/debuglog.hpp>
 
 #include <components/esm3/esmwriter.hpp>
@@ -388,7 +390,7 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
     {
         cleanup();
 
-        Log(Debug::Info) << "Reading save file " << boost::filesystem::path(filepath).filename().string();
+        Log(Debug::Info) << "Reading save file " << std::filesystem::path(filepath).filename().string();
 
         ESM::ESMReader reader;
         reader.open (filepath);
diff --git a/apps/openmw_test_suite/mwworld/test_store.cpp b/apps/openmw_test_suite/mwworld/test_store.cpp
index ab1fdd4995..c656064a96 100644
--- a/apps/openmw_test_suite/mwworld/test_store.cpp
+++ b/apps/openmw_test_suite/mwworld/test_store.cpp
@@ -1,6 +1,7 @@
 #include <gtest/gtest.h>
 
-#include <boost/filesystem/fstream.hpp>
+#include <fstream>
+#include <filesystem>
 
 #include <components/files/configurationmanager.hpp>
 #include <components/esm3/esmreader.hpp>
@@ -110,7 +111,7 @@ TEST_F(ContentFileTest, dialogue_merging_test)
 
     const std::string file = "test_dialogue_merging.txt";
 
-    boost::filesystem::ofstream stream;
+    std::ofstream stream;
     stream.open(file);
 
     const MWWorld::Store<ESM::Dialogue>& dialStore = mEsmStore.get<ESM::Dialogue>();
@@ -192,7 +193,7 @@ TEST_F(ContentFileTest, content_diagnostics_test)
 
     const std::string file = "test_content_diagnostics.txt";
 
-    boost::filesystem::ofstream stream;
+    std::ofstream stream;
     stream.open(file);
 
     RUN_TEST_FOR_TYPES(printRecords, mEsmStore, stream);
diff --git a/apps/openmw_test_suite/settings/parser.cpp b/apps/openmw_test_suite/settings/parser.cpp
index d54360fc28..abaa700730 100644
--- a/apps/openmw_test_suite/settings/parser.cpp
+++ b/apps/openmw_test_suite/settings/parser.cpp
@@ -1,6 +1,6 @@
 #include <components/settings/parser.hpp>
 
-#include <boost/filesystem/fstream.hpp>
+#include <fstream>
 
 #include <gtest/gtest.h>
 
@@ -20,7 +20,7 @@ namespace
             const auto path = std::string(UnitTest::GetInstance()->current_test_info()->name()) + ".cfg";
 
             {
-                boost::filesystem::ofstream stream;
+                std::ofstream stream;
                 stream.open(path);
                 stream << content;
                 stream.close();
diff --git a/apps/openmw_test_suite/shader/shadermanager.cpp b/apps/openmw_test_suite/shader/shadermanager.cpp
index a25e5e9ba6..1b0cd7c741 100644
--- a/apps/openmw_test_suite/shader/shadermanager.cpp
+++ b/apps/openmw_test_suite/shader/shadermanager.cpp
@@ -1,6 +1,6 @@
 #include <components/shader/shadermanager.hpp>
 
-#include <boost/filesystem/fstream.hpp>
+#include <fstream>
 
 #include <gtest/gtest.h>
 
@@ -31,7 +31,7 @@ namespace
             const auto path = UnitTest::GetInstance()->current_test_info()->name() + suffix + ".glsl";
 
             {
-                boost::filesystem::ofstream stream;
+                std::ofstream stream;
                 stream.open(path);
                 stream << content;
                 stream.close();
diff --git a/components/settings/settings.cpp b/components/settings/settings.cpp
index e9ad6a1bf5..99093d7a1d 100644
--- a/components/settings/settings.cpp
+++ b/components/settings/settings.cpp
@@ -1,6 +1,7 @@
 #include "settings.hpp"
 #include "parser.hpp"
 
+#include <filesystem>
 #include <sstream>
 
 #include <components/files/configurationmanager.hpp>
@@ -44,7 +45,7 @@ std::string Manager::load(const Files::ConfigurationManager& cfgMgr, bool loadEd
 
     // Create the settings manager and load default settings file.
     const std::string defaultsBin = (paths.front() / defaultSettingsFile).string();
-    if (!boost::filesystem::exists(defaultsBin))
+    if (!std::filesystem::exists(defaultsBin))
         throw std::runtime_error ("No default settings file found! Make sure the file \"" + defaultSettingsFile + "\" was properly installed.");
     parser.loadSettingsFile(defaultsBin, mDefaultSettings, true, false);
 
@@ -52,13 +53,13 @@ std::string Manager::load(const Files::ConfigurationManager& cfgMgr, bool loadEd
     for (int i = 0; i < static_cast<int>(paths.size()) - 1; ++i)
     {
         const std::string additionalDefaults = (paths[i] / userSettingsFile).string();
-        if (boost::filesystem::exists(additionalDefaults))
+        if (std::filesystem::exists(additionalDefaults))
             parser.loadSettingsFile(additionalDefaults, mDefaultSettings, false, true);
     }
 
     // Load "settings.cfg" or "openmw-cs.cfg" from the last config dir as user settings. This path will be used to save modified settings.
     std::string settingspath = (paths.back() / userSettingsFile).string();
-    if (boost::filesystem::exists(settingspath))
+    if (std::filesystem::exists(settingspath))
         parser.loadSettingsFile(settingspath, mUserSettings, false, false);
 
     return settingspath;
diff --git a/components/translation/translation.cpp b/components/translation/translation.cpp
index f2cdd803e7..bc6ba1c44d 100644
--- a/components/translation/translation.cpp
+++ b/components/translation/translation.cpp
@@ -1,6 +1,6 @@
 #include "translation.hpp"
 
-#include <boost/filesystem/fstream.hpp>
+#include <fstream>
 
 namespace Translation
 {
@@ -32,8 +32,8 @@ namespace Translation
 
         if (dataFileCollections.getCollection (extension).doesExist (fileName))
         {
-            boost::filesystem::ifstream stream (
-                dataFileCollections.getCollection (extension).getPath (fileName));
+            std::ifstream stream (
+                dataFileCollections.getCollection (extension).getPath (fileName).c_str());
 
             if (!stream.is_open())
                 throw std::runtime_error ("failed to open translation file: " + fileName);

From 6d5a0542e7ffa2f486757fd07c9cbdc40c5bbe7a Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Thu, 26 May 2022 01:47:38 +0200
Subject: [PATCH 2526/2859] Merge files/builtin_scripts and files/vfs into one
 dir

---
 files/CMakeLists.txt                          |   3 +--
 .../{builtin_scripts => data}/CMakeLists.txt  |  23 +++++++++++-----
 .../builtin.omwscripts                        |   0
 .../l10n/Calendar/en.yaml                     |   0
 .../l10n/Interface/en.yaml                    |   0
 .../openmw_aux/calendar.lua                   |   0
 .../openmw_aux/time.lua                       |   0
 .../openmw_aux/ui.lua                         |   0
 .../openmw_aux/util.lua                       |   0
 .../scripts/omw/ai.lua                        |   0
 .../scripts/omw/camera.lua                    |   0
 .../scripts/omw/console/global.lua            |   0
 .../scripts/omw/console/local.lua             |   0
 .../scripts/omw/console/player.lua            |   0
 .../scripts/omw/head_bobbing.lua              |   0
 .../scripts/omw/mwui/borders.lua              |   0
 .../scripts/omw/mwui/constants.lua            |   0
 .../scripts/omw/mwui/filters.lua              |   0
 .../scripts/omw/mwui/init.lua                 |   0
 .../scripts/omw/mwui/space.lua                |   0
 .../scripts/omw/mwui/text.lua                 |   0
 .../scripts/omw/mwui/textEdit.lua             |   0
 .../scripts/omw/settings/common.lua           |   0
 .../scripts/omw/settings/global.lua           |   0
 .../scripts/omw/settings/player.lua           |   0
 .../scripts/omw/settings/render.lua           |   0
 .../scripts/omw/settings/renderers.lua        |   0
 .../scripts/omw/third_person.lua              |   0
 .../{vfs => data}/shaders/displaydepth.omwfx  |   0
 files/{vfs => data}/shaders/main.omwfx        |   0
 .../textures/omw_menu_scroll_center_h.dds     | Bin
 .../textures/omw_menu_scroll_center_v.dds     | Bin
 .../textures/omw_menu_scroll_down.dds         | Bin
 .../textures/omw_menu_scroll_left.dds         | Bin
 .../textures/omw_menu_scroll_right.dds        | Bin
 .../textures/omw_menu_scroll_up.dds           | Bin
 files/vfs/CMakeLists.txt                      |  25 ------------------
 37 files changed, 17 insertions(+), 34 deletions(-)
 rename files/{builtin_scripts => data}/CMakeLists.txt (74%)
 rename files/{builtin_scripts => data}/builtin.omwscripts (100%)
 rename files/{builtin_scripts => data}/l10n/Calendar/en.yaml (100%)
 rename files/{builtin_scripts => data}/l10n/Interface/en.yaml (100%)
 rename files/{builtin_scripts => data}/openmw_aux/calendar.lua (100%)
 rename files/{builtin_scripts => data}/openmw_aux/time.lua (100%)
 rename files/{builtin_scripts => data}/openmw_aux/ui.lua (100%)
 rename files/{builtin_scripts => data}/openmw_aux/util.lua (100%)
 rename files/{builtin_scripts => data}/scripts/omw/ai.lua (100%)
 rename files/{builtin_scripts => data}/scripts/omw/camera.lua (100%)
 rename files/{builtin_scripts => data}/scripts/omw/console/global.lua (100%)
 rename files/{builtin_scripts => data}/scripts/omw/console/local.lua (100%)
 rename files/{builtin_scripts => data}/scripts/omw/console/player.lua (100%)
 rename files/{builtin_scripts => data}/scripts/omw/head_bobbing.lua (100%)
 rename files/{builtin_scripts => data}/scripts/omw/mwui/borders.lua (100%)
 rename files/{builtin_scripts => data}/scripts/omw/mwui/constants.lua (100%)
 rename files/{builtin_scripts => data}/scripts/omw/mwui/filters.lua (100%)
 rename files/{builtin_scripts => data}/scripts/omw/mwui/init.lua (100%)
 rename files/{builtin_scripts => data}/scripts/omw/mwui/space.lua (100%)
 rename files/{builtin_scripts => data}/scripts/omw/mwui/text.lua (100%)
 rename files/{builtin_scripts => data}/scripts/omw/mwui/textEdit.lua (100%)
 rename files/{builtin_scripts => data}/scripts/omw/settings/common.lua (100%)
 rename files/{builtin_scripts => data}/scripts/omw/settings/global.lua (100%)
 rename files/{builtin_scripts => data}/scripts/omw/settings/player.lua (100%)
 rename files/{builtin_scripts => data}/scripts/omw/settings/render.lua (100%)
 rename files/{builtin_scripts => data}/scripts/omw/settings/renderers.lua (100%)
 rename files/{builtin_scripts => data}/scripts/omw/third_person.lua (100%)
 rename files/{vfs => data}/shaders/displaydepth.omwfx (100%)
 rename files/{vfs => data}/shaders/main.omwfx (100%)
 rename files/{vfs => data}/textures/omw_menu_scroll_center_h.dds (100%)
 rename files/{vfs => data}/textures/omw_menu_scroll_center_v.dds (100%)
 rename files/{vfs => data}/textures/omw_menu_scroll_down.dds (100%)
 rename files/{vfs => data}/textures/omw_menu_scroll_left.dds (100%)
 rename files/{vfs => data}/textures/omw_menu_scroll_right.dds (100%)
 rename files/{vfs => data}/textures/omw_menu_scroll_up.dds (100%)
 delete mode 100644 files/vfs/CMakeLists.txt

diff --git a/files/CMakeLists.txt b/files/CMakeLists.txt
index cea33f0f40..a3d5c14e5c 100644
--- a/files/CMakeLists.txt
+++ b/files/CMakeLists.txt
@@ -1,5 +1,4 @@
 add_subdirectory(mygui)
 add_subdirectory(shaders)
-add_subdirectory(vfs)
-add_subdirectory(builtin_scripts)
+add_subdirectory(data)
 add_subdirectory(lua_api)
diff --git a/files/builtin_scripts/CMakeLists.txt b/files/data/CMakeLists.txt
similarity index 74%
rename from files/builtin_scripts/CMakeLists.txt
rename to files/data/CMakeLists.txt
index 38070f7d33..4705355d30 100644
--- a/files/builtin_scripts/CMakeLists.txt
+++ b/files/data/CMakeLists.txt
@@ -2,14 +2,24 @@ if (NOT DEFINED OPENMW_RESOURCES_ROOT)
     return()
 endif()
 
-set(LUA_BUILTIN_FILES
-    builtin.omwscripts
+set(BUILTIN_DATA_FILES
+    textures/omw_menu_scroll_down.dds
+    textures/omw_menu_scroll_up.dds
+    textures/omw_menu_scroll_left.dds
+    textures/omw_menu_scroll_right.dds
+    textures/omw_menu_scroll_center_h.dds
+    textures/omw_menu_scroll_center_v.dds
+
+    l10n/Calendar/en.yaml
+    l10n/Interface/en.yaml
 
     openmw_aux/util.lua
     openmw_aux/time.lua
     openmw_aux/calendar.lua
     openmw_aux/ui.lua
 
+    builtin.omwscripts
+
     scripts/omw/ai.lua
     scripts/omw/camera.lua
     scripts/omw/head_bobbing.lua
@@ -22,10 +32,6 @@ set(LUA_BUILTIN_FILES
     scripts/omw/settings/common.lua
     scripts/omw/settings/render.lua
     scripts/omw/settings/renderers.lua
-
-    l10n/Calendar/en.yaml
-    l10n/Interface/en.yaml
-
     scripts/omw/mwui/constants.lua
     scripts/omw/mwui/borders.lua
     scripts/omw/mwui/filters.lua
@@ -33,8 +39,11 @@ set(LUA_BUILTIN_FILES
     scripts/omw/mwui/textEdit.lua
     scripts/omw/mwui/space.lua
     scripts/omw/mwui/init.lua
+
+    shaders/main.omwfx
+    shaders/displaydepth.omwfx
 )
 
-foreach (f ${LUA_BUILTIN_FILES})
+foreach (f ${BUILTIN_DATA_FILES})
     copy_resource_file("${CMAKE_CURRENT_SOURCE_DIR}/${f}" "${OPENMW_RESOURCES_ROOT}" "resources/vfs/${f}")
 endforeach (f)
diff --git a/files/builtin_scripts/builtin.omwscripts b/files/data/builtin.omwscripts
similarity index 100%
rename from files/builtin_scripts/builtin.omwscripts
rename to files/data/builtin.omwscripts
diff --git a/files/builtin_scripts/l10n/Calendar/en.yaml b/files/data/l10n/Calendar/en.yaml
similarity index 100%
rename from files/builtin_scripts/l10n/Calendar/en.yaml
rename to files/data/l10n/Calendar/en.yaml
diff --git a/files/builtin_scripts/l10n/Interface/en.yaml b/files/data/l10n/Interface/en.yaml
similarity index 100%
rename from files/builtin_scripts/l10n/Interface/en.yaml
rename to files/data/l10n/Interface/en.yaml
diff --git a/files/builtin_scripts/openmw_aux/calendar.lua b/files/data/openmw_aux/calendar.lua
similarity index 100%
rename from files/builtin_scripts/openmw_aux/calendar.lua
rename to files/data/openmw_aux/calendar.lua
diff --git a/files/builtin_scripts/openmw_aux/time.lua b/files/data/openmw_aux/time.lua
similarity index 100%
rename from files/builtin_scripts/openmw_aux/time.lua
rename to files/data/openmw_aux/time.lua
diff --git a/files/builtin_scripts/openmw_aux/ui.lua b/files/data/openmw_aux/ui.lua
similarity index 100%
rename from files/builtin_scripts/openmw_aux/ui.lua
rename to files/data/openmw_aux/ui.lua
diff --git a/files/builtin_scripts/openmw_aux/util.lua b/files/data/openmw_aux/util.lua
similarity index 100%
rename from files/builtin_scripts/openmw_aux/util.lua
rename to files/data/openmw_aux/util.lua
diff --git a/files/builtin_scripts/scripts/omw/ai.lua b/files/data/scripts/omw/ai.lua
similarity index 100%
rename from files/builtin_scripts/scripts/omw/ai.lua
rename to files/data/scripts/omw/ai.lua
diff --git a/files/builtin_scripts/scripts/omw/camera.lua b/files/data/scripts/omw/camera.lua
similarity index 100%
rename from files/builtin_scripts/scripts/omw/camera.lua
rename to files/data/scripts/omw/camera.lua
diff --git a/files/builtin_scripts/scripts/omw/console/global.lua b/files/data/scripts/omw/console/global.lua
similarity index 100%
rename from files/builtin_scripts/scripts/omw/console/global.lua
rename to files/data/scripts/omw/console/global.lua
diff --git a/files/builtin_scripts/scripts/omw/console/local.lua b/files/data/scripts/omw/console/local.lua
similarity index 100%
rename from files/builtin_scripts/scripts/omw/console/local.lua
rename to files/data/scripts/omw/console/local.lua
diff --git a/files/builtin_scripts/scripts/omw/console/player.lua b/files/data/scripts/omw/console/player.lua
similarity index 100%
rename from files/builtin_scripts/scripts/omw/console/player.lua
rename to files/data/scripts/omw/console/player.lua
diff --git a/files/builtin_scripts/scripts/omw/head_bobbing.lua b/files/data/scripts/omw/head_bobbing.lua
similarity index 100%
rename from files/builtin_scripts/scripts/omw/head_bobbing.lua
rename to files/data/scripts/omw/head_bobbing.lua
diff --git a/files/builtin_scripts/scripts/omw/mwui/borders.lua b/files/data/scripts/omw/mwui/borders.lua
similarity index 100%
rename from files/builtin_scripts/scripts/omw/mwui/borders.lua
rename to files/data/scripts/omw/mwui/borders.lua
diff --git a/files/builtin_scripts/scripts/omw/mwui/constants.lua b/files/data/scripts/omw/mwui/constants.lua
similarity index 100%
rename from files/builtin_scripts/scripts/omw/mwui/constants.lua
rename to files/data/scripts/omw/mwui/constants.lua
diff --git a/files/builtin_scripts/scripts/omw/mwui/filters.lua b/files/data/scripts/omw/mwui/filters.lua
similarity index 100%
rename from files/builtin_scripts/scripts/omw/mwui/filters.lua
rename to files/data/scripts/omw/mwui/filters.lua
diff --git a/files/builtin_scripts/scripts/omw/mwui/init.lua b/files/data/scripts/omw/mwui/init.lua
similarity index 100%
rename from files/builtin_scripts/scripts/omw/mwui/init.lua
rename to files/data/scripts/omw/mwui/init.lua
diff --git a/files/builtin_scripts/scripts/omw/mwui/space.lua b/files/data/scripts/omw/mwui/space.lua
similarity index 100%
rename from files/builtin_scripts/scripts/omw/mwui/space.lua
rename to files/data/scripts/omw/mwui/space.lua
diff --git a/files/builtin_scripts/scripts/omw/mwui/text.lua b/files/data/scripts/omw/mwui/text.lua
similarity index 100%
rename from files/builtin_scripts/scripts/omw/mwui/text.lua
rename to files/data/scripts/omw/mwui/text.lua
diff --git a/files/builtin_scripts/scripts/omw/mwui/textEdit.lua b/files/data/scripts/omw/mwui/textEdit.lua
similarity index 100%
rename from files/builtin_scripts/scripts/omw/mwui/textEdit.lua
rename to files/data/scripts/omw/mwui/textEdit.lua
diff --git a/files/builtin_scripts/scripts/omw/settings/common.lua b/files/data/scripts/omw/settings/common.lua
similarity index 100%
rename from files/builtin_scripts/scripts/omw/settings/common.lua
rename to files/data/scripts/omw/settings/common.lua
diff --git a/files/builtin_scripts/scripts/omw/settings/global.lua b/files/data/scripts/omw/settings/global.lua
similarity index 100%
rename from files/builtin_scripts/scripts/omw/settings/global.lua
rename to files/data/scripts/omw/settings/global.lua
diff --git a/files/builtin_scripts/scripts/omw/settings/player.lua b/files/data/scripts/omw/settings/player.lua
similarity index 100%
rename from files/builtin_scripts/scripts/omw/settings/player.lua
rename to files/data/scripts/omw/settings/player.lua
diff --git a/files/builtin_scripts/scripts/omw/settings/render.lua b/files/data/scripts/omw/settings/render.lua
similarity index 100%
rename from files/builtin_scripts/scripts/omw/settings/render.lua
rename to files/data/scripts/omw/settings/render.lua
diff --git a/files/builtin_scripts/scripts/omw/settings/renderers.lua b/files/data/scripts/omw/settings/renderers.lua
similarity index 100%
rename from files/builtin_scripts/scripts/omw/settings/renderers.lua
rename to files/data/scripts/omw/settings/renderers.lua
diff --git a/files/builtin_scripts/scripts/omw/third_person.lua b/files/data/scripts/omw/third_person.lua
similarity index 100%
rename from files/builtin_scripts/scripts/omw/third_person.lua
rename to files/data/scripts/omw/third_person.lua
diff --git a/files/vfs/shaders/displaydepth.omwfx b/files/data/shaders/displaydepth.omwfx
similarity index 100%
rename from files/vfs/shaders/displaydepth.omwfx
rename to files/data/shaders/displaydepth.omwfx
diff --git a/files/vfs/shaders/main.omwfx b/files/data/shaders/main.omwfx
similarity index 100%
rename from files/vfs/shaders/main.omwfx
rename to files/data/shaders/main.omwfx
diff --git a/files/vfs/textures/omw_menu_scroll_center_h.dds b/files/data/textures/omw_menu_scroll_center_h.dds
similarity index 100%
rename from files/vfs/textures/omw_menu_scroll_center_h.dds
rename to files/data/textures/omw_menu_scroll_center_h.dds
diff --git a/files/vfs/textures/omw_menu_scroll_center_v.dds b/files/data/textures/omw_menu_scroll_center_v.dds
similarity index 100%
rename from files/vfs/textures/omw_menu_scroll_center_v.dds
rename to files/data/textures/omw_menu_scroll_center_v.dds
diff --git a/files/vfs/textures/omw_menu_scroll_down.dds b/files/data/textures/omw_menu_scroll_down.dds
similarity index 100%
rename from files/vfs/textures/omw_menu_scroll_down.dds
rename to files/data/textures/omw_menu_scroll_down.dds
diff --git a/files/vfs/textures/omw_menu_scroll_left.dds b/files/data/textures/omw_menu_scroll_left.dds
similarity index 100%
rename from files/vfs/textures/omw_menu_scroll_left.dds
rename to files/data/textures/omw_menu_scroll_left.dds
diff --git a/files/vfs/textures/omw_menu_scroll_right.dds b/files/data/textures/omw_menu_scroll_right.dds
similarity index 100%
rename from files/vfs/textures/omw_menu_scroll_right.dds
rename to files/data/textures/omw_menu_scroll_right.dds
diff --git a/files/vfs/textures/omw_menu_scroll_up.dds b/files/data/textures/omw_menu_scroll_up.dds
similarity index 100%
rename from files/vfs/textures/omw_menu_scroll_up.dds
rename to files/data/textures/omw_menu_scroll_up.dds
diff --git a/files/vfs/CMakeLists.txt b/files/vfs/CMakeLists.txt
deleted file mode 100644
index 16911df573..0000000000
--- a/files/vfs/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-if (NOT DEFINED OPENMW_RESOURCES_ROOT)
-    return()
-endif()
-
-# Copy resource files into the build directory
-set(SDIR ${CMAKE_CURRENT_SOURCE_DIR})
-set(DDIRRELATIVE resources/vfs/textures)
-set(DDIRRELATIVE_SHADERS resources/vfs/shaders)
-
-set(TEXTURE_FILES
-    textures/omw_menu_scroll_down.dds
-    textures/omw_menu_scroll_up.dds
-    textures/omw_menu_scroll_left.dds
-    textures/omw_menu_scroll_right.dds
-    textures/omw_menu_scroll_center_h.dds
-    textures/omw_menu_scroll_center_v.dds
-)
-
-set(SHADER_FILES
-    shaders/main.omwfx
-    shaders/displaydepth.omwfx
-)
-
-copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_ROOT} ${DDIRRELATIVE} "${TEXTURE_FILES}")
-copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_ROOT} ${DDIRRELATIVE_SHADERS} "${SHADER_FILES}")

From aa56e40bc31e787de994a3144c07d4aafbe4505c Mon Sep 17 00:00:00 2001
From: adam <ibrahimadam193@gmail.com>
Date: Thu, 26 May 2022 01:11:22 +0000
Subject: [PATCH 2527/2859] Add bindings for container record

---
 apps/openmw/mwlua/types/container.cpp | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwlua/types/container.cpp b/apps/openmw/mwlua/types/container.cpp
index b603b6d3f4..ccbbc74625 100644
--- a/apps/openmw/mwlua/types/container.cpp
+++ b/apps/openmw/mwlua/types/container.cpp
@@ -1,5 +1,9 @@
 #include "types.hpp"
 
+#include <components/esm3/loadcont.hpp>
+
+#include <apps/openmw/mwworld/esmstore.hpp>
+
 #include "../luabindings.hpp"
 
 namespace MWLua
@@ -13,6 +17,21 @@ namespace MWLua
             [](const LObject& o) { containerPtr(o); return Inventory<LObject>{o}; },
             [](const GObject& o) { containerPtr(o); return Inventory<GObject>{o}; }
         );
-    }
+        //container["capacity"] = [](const Object& o) { 
+            //const MWWorld::Class& cls = o.ptr().getClass();
+            //return cls.getCapacity(o);
+        //};
 
+        const MWWorld::Store<ESM::Container>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Container>();
+        container["record"] = sol::overload(
+            [](const Object& obj) -> const ESM::Container* { return obj.ptr().get<ESM::Container>()->mBase; },
+            [store](const std::string& recordId) -> const ESM::Container* { return store->find(recordId); });
+        sol::usertype<ESM::Container> record = context.mLua->sol().new_usertype<ESM::Container>("ESM3_Container");
+        record[sol::meta_function::to_string] = [](const ESM::Container& rec) -> std::string { return "ESM3_Container[" + rec.mId + "]"; };
+        record["id"] = sol::readonly_property([](const ESM::Container& rec) -> std::string { return rec.mId; });
+        record["name"] = sol::readonly_property([](const ESM::Container& rec) -> std::string { return rec.mName; });
+        record["model"] = sol::readonly_property([](const ESM::Container& rec) -> std::string { return rec.mModel; });
+        record["mwscript"] = sol::readonly_property([](const ESM::Container& rec) -> std::string { return rec.mScript; });
+        record["weight"] = sol::readonly_property([](const ESM::Container& rec) -> float { return rec.mWeight; });
+    }
 }

From 11845e7d9b764a3de00a61041b45665812a92226 Mon Sep 17 00:00:00 2001
From: cody glassman <glassmancody.info@gmail.com>
Date: Wed, 25 May 2022 19:07:01 -0700
Subject: [PATCH 2528/2859] improve layout of postprocessor hud

---
 apps/openmw/mwgui/postprocessorhud.cpp        | 26 ++++++++++--------
 apps/openmw/mwgui/postprocessorhud.hpp        |  5 ++--
 components/fx/widgets.hpp                     |  2 ++
 files/mygui/openmw_postprocessor_hud.layout   | 27 +------------------
 files/mygui/openmw_postprocessor_hud.skin.xml |  2 +-
 5 files changed, 21 insertions(+), 41 deletions(-)

diff --git a/apps/openmw/mwgui/postprocessorhud.cpp b/apps/openmw/mwgui/postprocessorhud.cpp
index 5e46f1e735..777468e8b0 100644
--- a/apps/openmw/mwgui/postprocessorhud.cpp
+++ b/apps/openmw/mwgui/postprocessorhud.cpp
@@ -59,7 +59,6 @@ namespace MWGui
         getWidget(mTabConfiguration, "TabConfiguration");
         getWidget(mActiveList, "ActiveList");
         getWidget(mInactiveList, "InactiveList");
-        getWidget(mModeToggle, "ModeToggle");
         getWidget(mConfigLayout, "ConfigLayout");
         getWidget(mFilter, "Filter");
         getWidget(mButtonActivate, "ButtonActivate");
@@ -78,8 +77,6 @@ namespace MWGui
         mActiveList->eventListChangePosition += MyGUI::newDelegate(this, &PostProcessorHud::notifyListChangePosition);
         mInactiveList->eventListChangePosition += MyGUI::newDelegate(this, &PostProcessorHud::notifyListChangePosition);
 
-        mModeToggle->eventMouseButtonClick += MyGUI::newDelegate(this, &PostProcessorHud::notifyModeToggle);
-
         mFilter->eventEditTextChange += MyGUI::newDelegate(this, &PostProcessorHud::notifyFilterChanged);
 
         mMainWidget->castType<MyGUI::Window>()->eventWindowChangeCoord += MyGUI::newDelegate(this, &PostProcessorHud::notifyWindowResize);
@@ -91,10 +88,14 @@ namespace MWGui
         mShaderInfo->setEditReadOnly(true);
         mShaderInfo->setEditWordWrap(true);
         mShaderInfo->setEditMultiLine(true);
+        mShaderInfo->setNeedMouseFocus(false);
 
         mConfigLayout->setVisibleVScroll(true);
 
         mConfigArea = mConfigLayout->createWidget<MyGUI::Widget>("", {}, MyGUI::Align::Default);
+
+        mConfigLayout->eventMouseWheel += MyGUI::newDelegate(this, &PostProcessorHud::notifyMouseWheel);
+        mConfigArea->eventMouseWheel += MyGUI::newDelegate(this, &PostProcessorHud::notifyMouseWheel);
     }
 
     void PostProcessorHud::notifyFilterChanged(MyGUI::EditBox* sender)
@@ -225,12 +226,6 @@ namespace MWGui
         }
     }
 
-    void PostProcessorHud::notifyModeToggle(MyGUI::Widget* sender)
-    {
-        Settings::ShaderManager::Mode prev = Settings::ShaderManager::get().getMode();
-        toggleMode(prev == Settings::ShaderManager::Mode::Debug ? Settings::ShaderManager::Mode::Normal : Settings::ShaderManager::Mode::Debug);
-    }
-
     void PostProcessorHud::onOpen()
     {
         toggleMode(Settings::ShaderManager::Mode::Debug);
@@ -267,6 +262,15 @@ namespace MWGui
         mConfigLayout->setSize(mConfigLayout->getWidth(), mConfigLayout->getParentSize().height - padding2);
     }
 
+    void PostProcessorHud::notifyMouseWheel(MyGUI::Widget *sender, int rel)
+    {
+        int offset = mConfigLayout->getViewOffset().top + rel * 0.3;
+        if (offset > 0)
+            mConfigLayout->setViewOffset(MyGUI::IntPoint(0, 0));
+        else
+            mConfigLayout->setViewOffset(MyGUI::IntPoint(0, static_cast<int>(offset)));
+    }
+
     void PostProcessorHud::select(ListWrapper* list, size_t index)
     {
         list->setIndexSelected(index);
@@ -277,8 +281,6 @@ namespace MWGui
     {
         Settings::ShaderManager::get().setMode(mode);
 
-        mModeToggle->setCaptionWithReplacing(mode == Settings::ShaderManager::Mode::Debug ? "#{sOn}" :"#{sOff}");
-
         MWBase::Environment::get().getWorld()->getPostProcessor()->toggleMode();
 
         if (!isVisible())
@@ -353,6 +355,7 @@ namespace MWGui
                 MyGUI::Button* resetButton = mConfigArea->createWidget<MyGUI::Button>("MW_Button", {0,0,0,24}, MyGUI::Align::Default);
                 resetButton->setCaption("Reset all to default");
                 resetButton->setTextAlign(MyGUI::Align::Center);
+                resetButton->eventMouseWheel += MyGUI::newDelegate(this, &PostProcessorHud::notifyMouseWheel);
                 resetButton->eventMouseButtonClick += MyGUI::newDelegate(this, &PostProcessorHud::notifyResetButtonClicked);
             }
 
@@ -366,6 +369,7 @@ namespace MWGui
 
                 fx::Widgets::UniformBase* uwidget = mConfigArea->createWidget<fx::Widgets::UniformBase>("MW_UniformEdit", {0,0,0,22}, MyGUI::Align::Default);
                 uwidget->init(uniform);
+                uwidget->getLabel()->eventMouseWheel += MyGUI::newDelegate(this, &PostProcessorHud::notifyMouseWheel);
             }
         }
 
diff --git a/apps/openmw/mwgui/postprocessorhud.hpp b/apps/openmw/mwgui/postprocessorhud.hpp
index 44baf79b63..116d53c2e0 100644
--- a/apps/openmw/mwgui/postprocessorhud.hpp
+++ b/apps/openmw/mwgui/postprocessorhud.hpp
@@ -52,8 +52,6 @@ namespace MWGui
 
         void updateConfigView(const std::string& name);
 
-        void notifyModeToggle(MyGUI::Widget* sender);
-
         void notifyResetButtonClicked(MyGUI::Widget* sender);
 
         void notifyListChangePosition(MyGUI::ListBox* sender, size_t index);
@@ -68,6 +66,8 @@ namespace MWGui
 
         void notifyShaderDownPressed(MyGUI::Widget* sender);
 
+        void notifyMouseWheel(MyGUI::Widget *sender, int rel);
+
         enum class Direction
         {
             Up,
@@ -97,7 +97,6 @@ namespace MWGui
         MyGUI::Widget* mConfigArea;
 
         MyGUI::EditBox* mFilter;
-        Gui::AutoSizedButton* mModeToggle;
         Gui::AutoSizedEditBox* mShaderInfo;
 
         std::string mOverrideHint;
diff --git a/components/fx/widgets.hpp b/components/fx/widgets.hpp
index f15e676fb6..ed50e6d4d4 100644
--- a/components/fx/widgets.hpp
+++ b/components/fx/widgets.hpp
@@ -249,6 +249,8 @@ namespace fx
 
             void addItem(EditBase* item);
 
+            Gui::AutoSizedTextBox* getLabel() { return mLabel; }
+
         private:
 
             void notifyResetClicked(MyGUI::Widget* sender);
diff --git a/files/mygui/openmw_postprocessor_hud.layout b/files/mygui/openmw_postprocessor_hud.layout
index 1030c83d2c..7a04a2f8b0 100644
--- a/files/mygui/openmw_postprocessor_hud.layout
+++ b/files/mygui/openmw_postprocessor_hud.layout
@@ -28,7 +28,7 @@
 				<Property key="Padding" value="0"/>
 				<Property key="Spacing" value="8"/>
 
-				<Widget type="Widget" position ="0 0 0 400">
+				<Widget type="Widget" position ="0 0 0 300">
 					<UserString key="HStretch" value="true"/>
 					<UserString key="VStretch" value="false"/>
 
@@ -103,31 +103,6 @@
 					</Widget>
 				</Widget>
 
-				<Widget type="Widget" position="0 0 230 28" align="Bottom Left">
-					<UserString key="HStretch" value="false"/>
-					<UserString key="VStretch" value="false"/>
-
-					<Widget type="HBox" position_real="0 0 1 1" align="Stretch">
-						<UserString key="HStretch" value="true"/>
-						<Property key="Spacing" value="4"/>
-
-						<Widget type="AutoSizedTextBox" skin="SandText">
-							<UserString key="HStretch" value="true"/>
-							<UserString key="VStretch" value="true"/>
-							<Property key="Caption" value="Enable Config Mode"/>
-							<Property key="TextAlign" value="Left VCenter"/>
-						</Widget>
-
-						<Widget type="AutoSizedButton" skin="MW_Button" name="ModeToggle">
-							<UserString key="VStretch" value="true"/>
-							<Property key="Caption" value="#{sOff}"/>
-						</Widget>
-					</Widget>
-
-				</Widget>
-
-				<Widget type="Widget" />
-
 			</Widget>
 
         </Widget>
diff --git a/files/mygui/openmw_postprocessor_hud.skin.xml b/files/mygui/openmw_postprocessor_hud.skin.xml
index bf3a470b94..ad9a5667be 100644
--- a/files/mygui/openmw_postprocessor_hud.skin.xml
+++ b/files/mygui/openmw_postprocessor_hud.skin.xml
@@ -59,7 +59,7 @@
                 <Widget type="AutoSizedTextBox" skin="SandText" name="Label" align="Top Right">
                     <UserString key="HStretch" value="true"/>
                     <UserString key="VStretch" value="true"/>
-                <Property key="Padding" value="8"/>
+                    <Property key="Padding" value="8"/>
                     <Property key="TextAlign" value="Left Top"/>
                     <Property key="NeedMouse" value="true"/>
                 </Widget>

From 424b828ff86ac49776877786bb4d83323440a757 Mon Sep 17 00:00:00 2001
From: cody glassman <glassmancody.info@gmail.com>
Date: Wed, 25 May 2022 19:17:31 -0700
Subject: [PATCH 2529/2859] add ability to use display names

---
 components/fx/technique.cpp                   |  5 +++
 components/fx/types.hpp                       |  1 +
 components/fx/widgets.cpp                     |  2 +-
 .../source/reference/postprocessing/omwfx.rst | 34 ++++++++++---------
 4 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/components/fx/technique.cpp b/components/fx/technique.cpp
index 019744e70d..2b8f37c96f 100644
--- a/components/fx/technique.cpp
+++ b/components/fx/technique.cpp
@@ -600,6 +600,11 @@ namespace fx
                 expect<Lexer::String>();
                 uniform->mHeader = std::get<Lexer::String>(mToken).value;
             }
+            else if (key == "display_name")
+            {
+                expect<Lexer::String>();
+                uniform->mDisplayName = std::get<Lexer::String>(mToken).value;
+            }
             else
                 error(Misc::StringUtils::format("unexpected key '%s'", std::string{key}));
 
diff --git a/components/fx/types.hpp b/components/fx/types.hpp
index 40eee003f2..ba809cdd9a 100644
--- a/components/fx/types.hpp
+++ b/components/fx/types.hpp
@@ -103,6 +103,7 @@ namespace fx
         struct UniformBase
         {
             std::string mName;
+            std::string mDisplayName;
             std::string mHeader;
             std::string mTechniqueName;
             std::string mDescription;
diff --git a/components/fx/widgets.cpp b/components/fx/widgets.cpp
index 2206fd8c7f..4316e8d7fe 100644
--- a/components/fx/widgets.cpp
+++ b/components/fx/widgets.cpp
@@ -78,7 +78,7 @@ namespace fx
 
         void UniformBase::init(const std::shared_ptr<fx::Types::UniformBase>& uniform)
         {
-            mLabel->setCaption(uniform->mName);
+            mLabel->setCaption(uniform->mDisplayName.empty() ? uniform->mName : uniform->mDisplayName);
 
             if (uniform->mDescription.empty())
             {
diff --git a/docs/source/reference/postprocessing/omwfx.rst b/docs/source/reference/postprocessing/omwfx.rst
index 188fc9cebb..8e8cab2c5a 100644
--- a/docs/source/reference/postprocessing/omwfx.rst
+++ b/docs/source/reference/postprocessing/omwfx.rst
@@ -413,24 +413,25 @@ To use the sampler, define the appropriately named `sampler2D` in any of your pa
 It is possible to define settings for your shaders that can be adjusted by either users or a Lua script.
 
 
-+-----------------+----------+----------+----------+---------+----------+--------------+---------+
-| Block           | default  | min      | max      | static  | step     | description  | header  |
-+=================+==========+==========+==========+=========+==========+==============+=========+
-|``uniform_bool`` | boolean  | x        | x        | boolean | x        | string       | string  |
-+-----------------+----------+----------+----------+---------+----------+--------------+---------+
-|``uniform_float``| float    | float    | float    | boolean | float    | string       | string  |
-+-----------------+----------+----------+----------+---------+----------+--------------+---------+
-|``uniform_int``  | integer  | integer  | integer  | boolean | integer  | string       | string  |
-+-----------------+----------+----------+----------+---------+----------+--------------+---------+
-|``uniform_vec2`` | vec2     | vec2     | vec2     | boolean | vec2     | string       | string  |
-+-----------------+----------+----------+----------+---------+----------+--------------+---------+
-|``uniform_vec3`` | vec3     | vec3     | vec3     | boolean | vec3     | string       | string  |
-+-----------------+----------+----------+----------+---------+----------+--------------+---------+
-|``uniform_vec4`` | vec4     | vec4     | vec4     | boolean | vec4     | string       | string  |
-+-----------------+----------+----------+----------+---------+----------+--------------+---------+
++-----------------+----------+----------+----------+---------+----------+--------------+-------------------+---------+
+| Block           | default  | min      | max      | static  | step     | description  |  display_name     | header  |
++=================+==========+==========+==========+=========+==========+==============+===================+=========+
+|``uniform_bool`` | boolean  | x        | x        | boolean | x        | string       |  string           | string  |
++-----------------+----------+----------+----------+---------+----------+--------------+-------------------+---------+
+|``uniform_float``| float    | float    | float    | boolean | float    | string       |  string           | string  |
++-----------------+----------+----------+----------+---------+----------+--------------+-------------------+---------+
+|``uniform_int``  | integer  | integer  | integer  | boolean | integer  | string       |  string           | string  |
++-----------------+----------+----------+----------+---------+----------+--------------+-------------------+---------+
+|``uniform_vec2`` | vec2     | vec2     | vec2     | boolean | vec2     | string       |  string           | string  |
++-----------------+----------+----------+----------+---------+----------+--------------+-------------------+---------+
+|``uniform_vec3`` | vec3     | vec3     | vec3     | boolean | vec3     | string       |  string           | string  |
++-----------------+----------+----------+----------+---------+----------+--------------+-------------------+---------+
+|``uniform_vec4`` | vec4     | vec4     | vec4     | boolean | vec4     | string       |  string           | string  |
++-----------------+----------+----------+----------+---------+----------+--------------+-------------------+---------+
 
 The ``description`` field is used to display a toolip when viewed in the in-game HUD. The ``header`` field
-field can be used to organize uniforms into groups in the HUD.
+field can be used to organize uniforms into groups in the HUD. The ``display_name`` field can be used to create a
+more user friendly uniform name for display in the HUD.
 
 If you would like a uniform to be adjustable with Lua API you `must` set ``static = false;``. Doing this
 will also remove the uniform from the players HUD.
@@ -580,6 +581,7 @@ desaturation to apply to the scene. Here we setup a new variable of type
         max = 1.0;
         step = 0.05;
         static = true;
+        display_name = "Desaturation Factor";
         description = "Desaturation factor. A value of 1.0 is full grayscale.";
     }
 

From dddc1dc2bbb6e1cb3e72d498ffb4262a3f0e6ac6 Mon Sep 17 00:00:00 2001
From: adam <ibrahimadam193@gmail.com>
Date: Thu, 26 May 2022 06:41:53 +0000
Subject: [PATCH 2530/2859] Add bindings for capacity and encumbrance

---
 apps/openmw/mwlua/types/container.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwlua/types/container.cpp b/apps/openmw/mwlua/types/container.cpp
index ccbbc74625..5dc7e70e6c 100644
--- a/apps/openmw/mwlua/types/container.cpp
+++ b/apps/openmw/mwlua/types/container.cpp
@@ -4,6 +4,9 @@
 
 #include <apps/openmw/mwworld/esmstore.hpp>
 
+//#include "../mwworld/class.hpp"
+#include "apps/openmw/mwworld/class.hpp"
+
 #include "../luabindings.hpp"
 
 namespace MWLua
@@ -17,10 +20,14 @@ namespace MWLua
             [](const LObject& o) { containerPtr(o); return Inventory<LObject>{o}; },
             [](const GObject& o) { containerPtr(o); return Inventory<GObject>{o}; }
         );
-        //container["capacity"] = [](const Object& o) { 
-            //const MWWorld::Class& cls = o.ptr().getClass();
-            //return cls.getCapacity(o);
-        //};
+        container["encumbrance"] = [](const Object& obj) -> float {
+            const MWWorld::Ptr& ptr = containerPtr(obj);
+            return ptr.getClass().getEncumbrance(ptr);
+        };
+        container["capacity"] = [](const Object& obj) -> float {
+            const MWWorld::Ptr& ptr = containerPtr(obj);
+            return ptr.getClass().getCapacity(ptr);
+        };
 
         const MWWorld::Store<ESM::Container>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Container>();
         container["record"] = sol::overload(

From e2528a1562949923c89bb5be0494f9082e32502c Mon Sep 17 00:00:00 2001
From: adam <ibrahimadam193@gmail.com>
Date: Thu, 26 May 2022 07:20:50 +0000
Subject: [PATCH 2531/2859] Add docs and automagical declaration

---
 apps/openmw/mwlua/types/container.cpp | 10 +++++++---
 files/lua_api/openmw/types.lua        | 24 ++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwlua/types/container.cpp b/apps/openmw/mwlua/types/container.cpp
index 5dc7e70e6c..729363435b 100644
--- a/apps/openmw/mwlua/types/container.cpp
+++ b/apps/openmw/mwlua/types/container.cpp
@@ -3,12 +3,16 @@
 #include <components/esm3/loadcont.hpp>
 
 #include <apps/openmw/mwworld/esmstore.hpp>
-
-//#include "../mwworld/class.hpp"
-#include "apps/openmw/mwworld/class.hpp"
+#include <apps/openmw/mwworld/class.hpp>
 
 #include "../luabindings.hpp"
 
+namespace sol
+{
+    template <>
+    struct is_automagical<ESM::Container> : std::false_type {};
+}
+
 namespace MWLua
 {
 
diff --git a/files/lua_api/openmw/types.lua b/files/lua_api/openmw/types.lua
index b77c3ec054..be022b4ef2 100644
--- a/files/lua_api/openmw/types.lua
+++ b/files/lua_api/openmw/types.lua
@@ -869,7 +869,31 @@
 -- @param openmw.core#GameObject object
 -- @return #boolean
 
+---
+-- Returns the total weight of everything in a container
+-- @function [parent=#Container] encumbrance
+-- @param openmw.core#GameObject object
+-- @return #number
+
+---
+-- Returns the capacity of a container
+-- @function [parent=#Container] capacity
+-- @param openmw.core#GameObject object
+-- @return #number
 
+---
+-- Returns the read-only @{#ContainerRecord} of a container
+-- @function [parent=#Container] record
+-- @param #any objectOrRecordId
+-- @return #ContainerRecord
+
+---
+-- @type ContainerRecord
+-- @field #string id Record id
+-- @field #string name Human-readable name
+-- @field #string model VFS path to the model
+-- @field #string mwscript MWScript on this container (can be empty)
+-- @field #number weight capacity of this container (can be empty)
 
 --- @{#Door} functions
 -- @field [parent=#types] #Door Door

From ac5844cad25ceab73ed1067e0cda7f72ae244f05 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 25 May 2022 20:41:11 +0200
Subject: [PATCH 2532/2859] Do not perform physics simulation for actors
 outside processing range

Actors with disabled collisions still have physics simulations. Assuming they
should not be processed at all instead of disabling collision add a new flag to
make them inactive.
---
 apps/openmw/mwbase/world.hpp            | 2 ++
 apps/openmw/mwmechanics/actors.cpp      | 4 +++-
 apps/openmw/mwphysics/actor.cpp         | 1 +
 apps/openmw/mwphysics/actor.hpp         | 5 +++++
 apps/openmw/mwphysics/physicssystem.cpp | 3 +++
 apps/openmw/mwworld/worldimp.cpp        | 6 ++++++
 apps/openmw/mwworld/worldimp.hpp        | 2 ++
 7 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 3d904631cd..23bd70d8db 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -672,6 +672,8 @@ namespace MWBase
             virtual MWRender::RenderingManager* getRenderingManager() = 0;
 
             virtual MWRender::PostProcessor* getPostProcessor() = 0;
+
+            virtual void setActorActive(const MWWorld::Ptr& ptr, bool value) = 0;
     };
 }
 
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index a60d5ce0f3..cd53220c23 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1593,10 +1593,12 @@ namespace MWMechanics
                 if (!inRange)
                 {
                     actor.getPtr().getRefData().getBaseNode()->setNodeMask(0);
-                    world->setActorCollisionMode(actor.getPtr(), false, false);
+                    world->setActorActive(actor.getPtr(), false);
                     continue;
                 }
 
+                world->setActorActive(actor.getPtr(), true);
+
                 const bool isDead = actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isDead();
                 if (!isDead && (!godmode || !isPlayer) && actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isParalyzed())
                     ctrl.skipAnim();
diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index a1f5a48388..e4edb32845 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -27,6 +27,7 @@ Actor::Actor(const MWWorld::Ptr& ptr, const Resource::BulletShape* shape, Physic
   , mForce(0.f, 0.f, 0.f), mOnGround(true), mOnSlope(false)
   , mInternalCollisionMode(true)
   , mExternalCollisionMode(true)
+  , mActive(false)
   , mTaskScheduler(scheduler)
 {
     mPtr = ptr;
diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index d19211d49e..2b67f265c6 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -152,6 +152,10 @@ namespace MWPhysics
 
         bool canMoveToWaterSurface(float waterlevel, const btCollisionWorld* world) const;
 
+        bool isActive() const { return mActive; }
+
+        void setActive(bool value) { mActive = value; }
+
     private:
         MWWorld::Ptr mStandingOnPtr;
         /// Removes then re-adds the collision object to the dynamics world
@@ -190,6 +194,7 @@ namespace MWPhysics
         bool mOnSlope;
         bool mInternalCollisionMode;
         bool mExternalCollisionMode;
+        bool mActive;
 
         PhysicsTaskScheduler* mTaskScheduler;
 
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 4de60f4900..e20d5c0439 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -712,6 +712,9 @@ namespace MWPhysics
         const MWBase::World *world = MWBase::Environment::get().getWorld();
         for (const auto& [ref, physicActor] : mActors)
         {
+            if (!physicActor->isActive())
+                continue;
+
             auto ptr = physicActor->getPtr();
             if (!ptr.getClass().isMobile(ptr))
                 continue;
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 6b9930a989..5036c1721d 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -4002,4 +4002,10 @@ namespace MWWorld
     {
         return mRendering->getPostProcessor();
     }
+
+    void World::setActorActive(const MWWorld::Ptr& ptr, bool value)
+    {
+        if (MWPhysics::Actor* const actor = mPhysics->getActor(ptr))
+            actor->setActive(value);
+    }
 }
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index c6e316c25a..91ca90090b 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -754,6 +754,8 @@ namespace MWWorld
             MWRender::RenderingManager* getRenderingManager() override { return mRendering.get(); }
 
             MWRender::PostProcessor* getPostProcessor() override;
+
+            void setActorActive(const MWWorld::Ptr& ptr, bool value) override;
     };
 }
 

From 21efb74b58479b93f7f7cc7ab7ff34728c2d7912 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Thu, 26 May 2022 16:13:07 +0200
Subject: [PATCH 2533/2859] Remove even most boost::

---
 components/shader/shadermanager.cpp | 16 ++++++++--------
 components/vfs/registerarchives.cpp |  5 +++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/components/shader/shadermanager.cpp b/components/shader/shadermanager.cpp
index b15825126a..c4d45a9958 100644
--- a/components/shader/shadermanager.cpp
+++ b/components/shader/shadermanager.cpp
@@ -7,8 +7,8 @@
 
 #include <osg/Program>
 
-#include <boost/filesystem/path.hpp>
-#include <boost/filesystem/fstream.hpp>
+#include <filesystem>
+#include <fstream>
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/stringops.hpp>
@@ -69,7 +69,7 @@ namespace Shader
     // Recursively replaces include statements with the actual source of the included files.
     // Adjusts #line statements accordingly and detects cyclic includes.
     // includingFiles is the set of files that include this file directly or indirectly, and is intentionally not a reference to allow automatic cleanup.
-    static bool parseIncludes(const boost::filesystem::path& shaderPath, std::string& source, const std::string& fileName, int& fileNumber, std::set<boost::filesystem::path> includingFiles)
+    static bool parseIncludes(const std::filesystem::path& shaderPath, std::string& source, const std::string& fileName, int& fileNumber, std::set<std::filesystem::path> includingFiles)
     {
         // An include is cyclic if it is being included by itself
         if (includingFiles.insert(shaderPath/fileName).second == false)
@@ -96,7 +96,7 @@ namespace Shader
                 return false;
             }
             std::string includeFilename = source.substr(start + 1, end - (start + 1));
-            boost::filesystem::path includePath = shaderPath / includeFilename;
+            std::filesystem::path includePath = shaderPath / includeFilename;
 
             // Determine the line number that will be used for the #line directive following the included source
             size_t lineDirectivePosition = source.rfind("#line", foundPos);
@@ -116,7 +116,7 @@ namespace Shader
             lineNumber += std::count(source.begin() + lineDirectivePosition, source.begin() + foundPos, '\n');
 
             // Include the file recursively
-            boost::filesystem::ifstream includeFstream;
+            std::ifstream includeFstream;
             includeFstream.open(includePath);
             if (includeFstream.fail())
             {
@@ -364,8 +364,8 @@ namespace Shader
         TemplateMap::iterator templateIt = mShaderTemplates.find(templateName);
         if (templateIt == mShaderTemplates.end())
         {
-            boost::filesystem::path path = (boost::filesystem::path(mPath) / templateName);
-            boost::filesystem::ifstream stream;
+            std::filesystem::path path = (std::filesystem::path(mPath) / templateName);
+            std::ifstream stream;
             stream.open(path);
             if (stream.fail())
             {
@@ -379,7 +379,7 @@ namespace Shader
             int fileNumber = 1;
             std::string source = buffer.str();
             if (!addLineDirectivesAfterConditionalBlocks(source)
-                || !parseIncludes(boost::filesystem::path(mPath), source, templateName, fileNumber, {}))
+                || !parseIncludes(std::filesystem::path(mPath), source, templateName, fileNumber, {}))
                 return nullptr;
 
             templateIt = mShaderTemplates.insert(std::make_pair(templateName, source)).first;
diff --git a/components/vfs/registerarchives.cpp b/components/vfs/registerarchives.cpp
index 4dc44fb25e..5d8d30f0f6 100644
--- a/components/vfs/registerarchives.cpp
+++ b/components/vfs/registerarchives.cpp
@@ -2,6 +2,7 @@
 
 #include <set>
 #include <sstream>
+#include <filesystem>
 
 #include <components/debug/debuglog.hpp>
 
@@ -40,10 +41,10 @@ namespace VFS
 
         if (useLooseFiles)
         {
-            std::set<boost::filesystem::path> seen;
+            std::set<std::filesystem::path> seen;
             for (Files::PathContainer::const_iterator iter = dataDirs.begin(); iter != dataDirs.end(); ++iter)
             {
-                if (seen.insert(*iter).second)
+                if (seen.insert((*iter).c_str()).second)
                 {
                     Log(Debug::Info) << "Adding data directory " << iter->string();
                     // Last data dir has the highest priority

From 7b819c54b502d29c0bcda4075053707b74112743 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 24 May 2022 12:58:31 +0200
Subject: [PATCH 2534/2859] Remove redundant build output before archiving
 artifacts and packing the cache

---
 .gitlab-ci.yml | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index da23280c72..4dc0bf952c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,6 +34,7 @@ variables:
     - ccache/
   stage: build
   script:
+    - df -h
     - export CCACHE_BASEDIR="`pwd`"
     - export CCACHE_DIR="`pwd`/ccache" && mkdir -pv "$CCACHE_DIR"
     - ccache -z -M "${CCACHE_SIZE}"
@@ -44,6 +45,15 @@ variables:
     - if [[ "${BUILD_TESTS_ONLY}" ]]; then ./openmw_test_suite --gtest_output="xml:tests.xml"; fi
     - if [[ "${BUILD_TESTS_ONLY}" && ! "${BUILD_WITH_CODE_COVERAGE}" ]]; then ./openmw_detournavigator_navmeshtilescache_benchmark; fi
     - ccache -s
+    - df -h
+    - if [[ "${BUILD_WITH_CODE_COVERAGE}" ]]; then gcovr --xml-pretty --exclude-unreachable-branches --print-summary --root "${CI_PROJECT_DIR}" -j $(nproc) -o ../coverage.xml; fi
+    - ls | grep -v -e '^extern$' -e '^install$' -e '^tests.xml$' | xargs -I '{}' rm -rf './{}'
+    - cd ..
+    - df -h
+    - du -sh build/
+    - du -sh build/install/
+    - du -sh apt-cache/
+    - du -sh ccache/
   artifacts:
     paths:
       - build/install/
@@ -199,8 +209,6 @@ Ubuntu_GCC_tests_coverage:
     BUILD_WITH_CODE_COVERAGE: 1
   before_script:
     - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic openmw-coverage
-  after_script:
-    - gcovr --xml-pretty --exclude-unreachable-branches --print-summary --root ${CI_PROJECT_DIR} -j $(nproc) -o coverage.xml
   coverage: /^\s*lines:\s*\d+.\d+\%/
   artifacts:
     paths: []
@@ -642,6 +650,7 @@ Ubuntu_AndroidNDK_arm64-v8a:
     - CI/install_debian_deps.sh gcc
   stage: build
   script:
+    - df -h
     - export CCACHE_BASEDIR="`pwd`"
     - export CCACHE_DIR="`pwd`/ccache" && mkdir -pv "$CCACHE_DIR"
     - ccache -z -M "${CCACHE_SIZE}"
@@ -651,6 +660,15 @@ Ubuntu_AndroidNDK_arm64-v8a:
     - cmake --build . -- -j $(nproc)
     - cmake --install .
     - ccache -s
+    - df -h
+    - ls | grep -v -e '^extern$' -e '^install$' | xargs -I '{}' rm -rf './{}'
+    - cd ..
+    - df -h
+    - du -sh build/
+    - du -sh build/install/
+    - du -sh apt-cache/
+    - du -sh ccache/
+    - du -sh build/extern/fetched/
   artifacts:
     paths:
       - build/install/

From bf76faeb2d32da6726b166f4b40d3c119d283ab6 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 27 May 2022 13:31:58 +0200
Subject: [PATCH 2535/2859] Increment iterator before fast forward

When player is located in the exterior cell AiTravel::fastForward may move
another actor into a cell outside active grid. This will remove the actor from
MWMechanics::Actors::mActors which invalidates current iterator in the
Actors::fastForwardAi loop.
---
 apps/openmw/mwmechanics/actors.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index a60d5ce0f3..2a0a4f2afc 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -2249,9 +2249,10 @@ namespace MWMechanics
         if (!MWBase::Environment::get().getMechanicsManager()->isAIActive())
             return;
 
-        for (const Actor& actor : mActors)
+        for (auto it = mActors.begin(); it != mActors.end();)
         {
-            const MWWorld::Ptr ptr = actor.getPtr();
+            const MWWorld::Ptr ptr = it->getPtr();
+            ++it;
             if (ptr == getPlayer()
                     || !isConscious(ptr)
                     || ptr.getClass().getCreatureStats(ptr).isParalyzed())

From bd5ccaac3ce0903d47d6220b940cfc871443390a Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Fri, 27 May 2022 19:09:34 +0200
Subject: [PATCH 2536/2859] Followup to
 21efb74b58479b93f7f7cc7ab7ff34728c2d7912

---
 components/vfs/registerarchives.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/vfs/registerarchives.cpp b/components/vfs/registerarchives.cpp
index 5d8d30f0f6..9e1b13fede 100644
--- a/components/vfs/registerarchives.cpp
+++ b/components/vfs/registerarchives.cpp
@@ -44,7 +44,8 @@ namespace VFS
             std::set<std::filesystem::path> seen;
             for (Files::PathContainer::const_iterator iter = dataDirs.begin(); iter != dataDirs.end(); ++iter)
             {
-                if (seen.insert((*iter).c_str()).second)
+                // TODO(jvoisin) Get rid of `->native()` when we move PathContainer from boost::filesystem to std::filesystem.
+                if (seen.insert(iter->native()).second)
                 {
                     Log(Debug::Info) << "Adding data directory " << iter->string();
                     // Last data dir has the highest priority

From d903e4b1b2cb0974f27574a158101b912b6661d0 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sat, 28 May 2022 22:51:32 +0200
Subject: [PATCH 2537/2859] Remove boost:: from openmw/main.cpp

---
 apps/openmw/main.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index 7800335ddb..4cdb52c073 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -16,6 +16,8 @@
 #include <cstdlib>
 #endif
 
+#include <filesystem>
+
 #if (defined(__APPLE__) || defined(__linux) || defined(__unix) || defined(__posix))
 #include <unistd.h>
 #endif
@@ -206,8 +208,8 @@ namespace
 int runApplication(int argc, char *argv[])
 {
 #ifdef __APPLE__
-    boost::filesystem::path binary_path = boost::filesystem::system_complete(boost::filesystem::path(argv[0]));
-    boost::filesystem::current_path(binary_path.parent_path());
+    std::filesystem::path binary_path = std::filesystem::system_complete(std::filesystem::path(argv[0]));
+    std::filesystem::current_path(binary_path.parent_path());
     setenv("OSG_GL_TEXTURE_STORAGE", "OFF", 0);
 #endif
 

From ad9fc5a0ea69e1daad949d58fb1f1a6e2a35b836 Mon Sep 17 00:00:00 2001
From: Loop Zoop <hatbox_lyric@protonmail.com>
Date: Sun, 29 May 2022 09:26:32 +0000
Subject: [PATCH 2538/2859] Update install-openmw.rst

---
 docs/source/manuals/installation/install-openmw.rst | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docs/source/manuals/installation/install-openmw.rst b/docs/source/manuals/installation/install-openmw.rst
index 31faa990fa..2c7ec6fde1 100644
--- a/docs/source/manuals/installation/install-openmw.rst
+++ b/docs/source/manuals/installation/install-openmw.rst
@@ -68,6 +68,3 @@ OpenMW is available as a flatpak. With flatpak installed, run the command below.
 ::
 
 	# flatpak install openmw
-
-
-

From a95b6e050ac1eb91071dce232a80e74f69f76255 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 29 May 2022 13:24:32 +0200
Subject: [PATCH 2539/2859] Replace new with make_unique in components

---
 components/myguiplatform/myguidatamanager.cpp |  3 +--
 components/nifbullet/bulletnifloader.cpp      | 12 ++++++------
 components/resource/resourcesystem.cpp        |  8 ++++----
 components/sceneutil/skeleton.cpp             |  2 +-
 components/terrain/quadtreeworld.cpp          |  2 +-
 components/terrain/world.cpp                  |  6 +++---
 6 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/components/myguiplatform/myguidatamanager.cpp b/components/myguiplatform/myguidatamanager.cpp
index 62023c8366..b01c5bbcf6 100644
--- a/components/myguiplatform/myguidatamanager.cpp
+++ b/components/myguiplatform/myguidatamanager.cpp
@@ -21,8 +21,7 @@ void DataManager::setResourcePath(const std::string &path)
 MyGUI::IDataStream *DataManager::getData(const std::string &name) const
 {
     std::string fullpath = getDataPath(name);
-    std::unique_ptr<std::ifstream> stream;
-    stream.reset(new std::ifstream);
+    auto stream = std::make_unique<std::ifstream>();
     stream->open(fullpath, std::ios::binary);
     if (stream->fail())
     {
diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index 52be8d4a07..364f79e98e 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -140,7 +140,7 @@ std::monostate fillTriangleMesh(std::unique_ptr<btTriangleMesh>& mesh, const Nif
     return handleNiGeometry(geometry, [&] (const auto& data)
     {
         if (mesh == nullptr)
-            mesh.reset(new btTriangleMesh(false));
+            mesh = std::make_unique<btTriangleMesh>(false);
         fillTriangleMesh(*mesh, data, transform);
         return std::monostate {};
     });
@@ -150,7 +150,7 @@ std::unique_ptr<btTriangleMesh> makeChildMesh(const Nif::NiGeometry& geometry)
 {
     return handleNiGeometry(geometry, [&] (const auto& data)
     {
-        std::unique_ptr<btTriangleMesh> mesh(new btTriangleMesh);
+        auto mesh = std::make_unique<btTriangleMesh>();
         fillTriangleMesh(*mesh, data, osg::Matrixf());
         return mesh;
     });
@@ -197,8 +197,8 @@ osg::ref_ptr<Resource::BulletShape> BulletNifLoader::load(const Nif::File& nif)
         {
             const btVector3 extents = Misc::Convert::toBullet(mShape->mCollisionBox.mExtents);
             const btVector3 center = Misc::Convert::toBullet(mShape->mCollisionBox.mCenter);
-            std::unique_ptr<btCompoundShape> compound (new btCompoundShape);
-            std::unique_ptr<btBoxShape> boxShape(new btBoxShape(extents));
+            auto compound = std::make_unique<btCompoundShape>();
+            auto boxShape = std::make_unique<btBoxShape>(extents);
             btTransform transform = btTransform::getIdentity();
             transform.setOrigin(center);
             compound->addChildShape(transform, boxShape.get());
@@ -226,7 +226,7 @@ osg::ref_ptr<Resource::BulletShape> BulletNifLoader::load(const Nif::File& nif)
         {
             btTransform trans;
             trans.setIdentity();
-            std::unique_ptr<btCollisionShape> child(new Resource::TriangleMeshShape(mStaticMesh.get(), true));
+            std::unique_ptr<btCollisionShape> child = std::make_unique<Resource::TriangleMeshShape>(mStaticMesh.get(), true);
             mCompoundShape->addChildShape(trans, child.get());
             child.release();
             mStaticMesh.release();
@@ -407,7 +407,7 @@ void BulletNifLoader::handleNiTriShape(const Nif::NiGeometry& niGeometry, const
         if (!mCompoundShape)
             mCompoundShape.reset(new btCompoundShape);
 
-        std::unique_ptr<Resource::TriangleMeshShape> childShape(new Resource::TriangleMeshShape(childMesh.get(), true));
+        auto childShape = std::make_unique<Resource::TriangleMeshShape>(childMesh.get(), true);
         childMesh.release();
 
         float scale = niGeometry.trafo.scale;
diff --git a/components/resource/resourcesystem.cpp b/components/resource/resourcesystem.cpp
index ab9d0aba2c..a62dd0016a 100644
--- a/components/resource/resourcesystem.cpp
+++ b/components/resource/resourcesystem.cpp
@@ -13,10 +13,10 @@ namespace Resource
     ResourceSystem::ResourceSystem(const VFS::Manager *vfs)
         : mVFS(vfs)
     {
-        mNifFileManager.reset(new NifFileManager(vfs));
-        mImageManager.reset(new ImageManager(vfs));
-        mSceneManager.reset(new SceneManager(vfs, mImageManager.get(), mNifFileManager.get()));
-        mKeyframeManager.reset(new KeyframeManager(vfs, mSceneManager.get()));
+        mNifFileManager = std::make_unique<NifFileManager>(vfs);
+        mImageManager = std::make_unique<ImageManager>(vfs);
+        mSceneManager = std::make_unique<SceneManager>(vfs, mImageManager.get(), mNifFileManager.get());
+        mKeyframeManager = std::make_unique<KeyframeManager>(vfs, mSceneManager.get());
 
         addResourceManager(mNifFileManager.get());
         addResourceManager(mKeyframeManager.get());
diff --git a/components/sceneutil/skeleton.cpp b/components/sceneutil/skeleton.cpp
index c465333fb4..9f646ade5c 100644
--- a/components/sceneutil/skeleton.cpp
+++ b/components/sceneutil/skeleton.cpp
@@ -69,7 +69,7 @@ Bone* Skeleton::getBone(const std::string &name)
 
     if (!mRootBone.get())
     {
-        mRootBone.reset(new Bone);
+        mRootBone = std::make_unique<Bone>();
     }
 
     Bone* bone = mRootBone.get();
diff --git a/components/terrain/quadtreeworld.cpp b/components/terrain/quadtreeworld.cpp
index eba69ad42d..1266e440a3 100644
--- a/components/terrain/quadtreeworld.cpp
+++ b/components/terrain/quadtreeworld.cpp
@@ -287,7 +287,7 @@ QuadTreeWorld::QuadTreeWorld(osg::Group *parent, osg::Group *compileRoot, Resour
 
     if (mDebugTerrainChunks)
     {
-        mDebugChunkManager = std::unique_ptr<DebugChunkManager>(new DebugChunkManager(mResourceSystem->getSceneManager(), mStorage, borderMask));
+        mDebugChunkManager = std::make_unique<DebugChunkManager>(mResourceSystem->getSceneManager(), mStorage, borderMask);
         addChunkManager(mDebugChunkManager.get());
     }
 }
diff --git a/components/terrain/world.cpp b/components/terrain/world.cpp
index 582cc68b1b..186687b37d 100644
--- a/components/terrain/world.cpp
+++ b/components/terrain/world.cpp
@@ -41,10 +41,10 @@ World::World(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSyst
 
     mParent->addChild(mTerrainRoot);
 
-    mTextureManager.reset(new TextureManager(mResourceSystem->getSceneManager()));
-    mChunkManager.reset(new ChunkManager(mStorage, mResourceSystem->getSceneManager(), mTextureManager.get(), mCompositeMapRenderer));
+    mTextureManager = std::make_unique<TextureManager>(mResourceSystem->getSceneManager());
+    mChunkManager = std::make_unique<ChunkManager>(mStorage, mResourceSystem->getSceneManager(), mTextureManager.get(), mCompositeMapRenderer);
     mChunkManager->setNodeMask(nodeMask);
-    mCellBorder.reset(new CellBorder(this,mTerrainRoot.get(),borderMask,mResourceSystem->getSceneManager()));
+    mCellBorder = std::make_unique<CellBorder>(this,mTerrainRoot.get(),borderMask,mResourceSystem->getSceneManager());
 
     mResourceSystem->addResourceManager(mChunkManager.get());
     mResourceSystem->addResourceManager(mTextureManager.get());

From 3c83117e995a0684ebc532f0fdb434121c77d5c3 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 29 May 2022 13:24:48 +0200
Subject: [PATCH 2540/2859] Replace new with make_unique in openmw

---
 apps/openmw/main.cpp                       |  3 +-
 apps/openmw/mwclass/activator.cpp          |  4 +--
 apps/openmw/mwclass/apparatus.cpp          |  2 +-
 apps/openmw/mwclass/armor.cpp              |  2 +-
 apps/openmw/mwclass/book.cpp               |  6 ++--
 apps/openmw/mwclass/clothing.cpp           |  2 +-
 apps/openmw/mwclass/container.cpp          | 14 ++++----
 apps/openmw/mwclass/creature.cpp           | 14 ++++----
 apps/openmw/mwclass/door.cpp               | 13 ++++----
 apps/openmw/mwclass/ingredient.cpp         |  2 +-
 apps/openmw/mwclass/light.cpp              |  6 ++--
 apps/openmw/mwclass/lockpick.cpp           |  2 +-
 apps/openmw/mwclass/misc.cpp               |  5 ++-
 apps/openmw/mwclass/npc.cpp                | 18 +++++-----
 apps/openmw/mwclass/probe.cpp              |  2 +-
 apps/openmw/mwclass/repair.cpp             |  2 +-
 apps/openmw/mwclass/weapon.cpp             |  2 +-
 apps/openmw/mwgui/bookpage.cpp             |  2 +-
 apps/openmw/mwgui/inventorywindow.cpp      |  4 +--
 apps/openmw/mwgui/loadingscreen.cpp        |  2 +-
 apps/openmw/mwgui/mapwindow.cpp            | 12 +++----
 apps/openmw/mwgui/race.cpp                 |  4 +--
 apps/openmw/mwgui/savegamedialog.cpp       |  2 +-
 apps/openmw/mwgui/videowidget.cpp          |  4 +--
 apps/openmw/mwgui/windowmanagerimp.cpp     |  6 ++--
 apps/openmw/mwmechanics/aiactivate.cpp     |  2 +-
 apps/openmw/mwmechanics/aicombat.cpp       |  6 ++--
 apps/openmw/mwmechanics/aicombataction.cpp | 12 +++----
 apps/openmw/mwmechanics/aiescort.cpp       |  2 +-
 apps/openmw/mwmechanics/aifollow.cpp       |  2 +-
 apps/openmw/mwmechanics/aipursue.cpp       |  2 +-
 apps/openmw/mwmechanics/aisequence.cpp     | 16 ++++-----
 apps/openmw/mwmechanics/aitravel.cpp       |  2 +-
 apps/openmw/mwmechanics/aiwander.cpp       |  2 +-
 apps/openmw/mwphysics/actor.cpp            |  2 +-
 apps/openmw/mwphysics/physicssystem.cpp    |  6 ++--
 apps/openmw/mwrender/creatureanimation.cpp |  4 +--
 apps/openmw/mwrender/localmap.cpp          |  4 +--
 apps/openmw/mwrender/renderingmanager.cpp  | 38 +++++++++++-----------
 apps/openmw/mwrender/sky.cpp               |  6 ++--
 apps/openmw/mwrender/water.cpp             |  2 +-
 apps/openmw/mwsound/movieaudiofactory.cpp  |  2 +-
 apps/openmw/mwsound/openal_output.cpp      |  4 +--
 apps/openmw/mwworld/cellstore.cpp          |  2 +-
 apps/openmw/mwworld/class.cpp              | 10 +++---
 apps/openmw/mwworld/scene.cpp              |  2 +-
 apps/openmw/mwworld/worldimp.cpp           | 16 ++++-----
 47 files changed, 137 insertions(+), 142 deletions(-)

diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index 7800335ddb..632c3d4530 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -213,8 +213,7 @@ int runApplication(int argc, char *argv[])
 
     osg::setNotifyHandler(new OSGLogHandler());
     Files::ConfigurationManager cfgMgr;
-    std::unique_ptr<OMW::Engine> engine;
-    engine.reset(new OMW::Engine(cfgMgr));
+    std::unique_ptr<OMW::Engine> engine = std::make_unique<OMW::Engine>(cfgMgr);
 
     if (parseOptions(argc, argv, *engine, cfgMgr))
     {
diff --git a/apps/openmw/mwclass/activator.cpp b/apps/openmw/mwclass/activator.cpp
index 2d386addb8..83d84254a3 100644
--- a/apps/openmw/mwclass/activator.cpp
+++ b/apps/openmw/mwclass/activator.cpp
@@ -119,12 +119,12 @@ namespace MWClass
             auto& prng = MWBase::Environment::get().getWorld()->getPrng();
             const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfActivator", prng);
 
-            std::unique_ptr<MWWorld::Action> action(new MWWorld::FailedAction("#{sWerewolfRefusal}"));
+            std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::FailedAction>("#{sWerewolfRefusal}");
             if(sound) action->setSound(sound->mId);
 
             return action;
         }
-        return std::unique_ptr<MWWorld::Action>(new MWWorld::NullAction);
+        return std::make_unique<MWWorld::NullAction>();
     }
 
 
diff --git a/apps/openmw/mwclass/apparatus.cpp b/apps/openmw/mwclass/apparatus.cpp
index 99a2d7887b..57b59b5b9d 100644
--- a/apps/openmw/mwclass/apparatus.cpp
+++ b/apps/openmw/mwclass/apparatus.cpp
@@ -110,7 +110,7 @@ namespace MWClass
 
     std::unique_ptr<MWWorld::Action> Apparatus::use (const MWWorld::Ptr& ptr, bool force) const
     {
-        return std::unique_ptr<MWWorld::Action>(new MWWorld::ActionAlchemy(force));
+        return std::make_unique<MWWorld::ActionAlchemy>(force);
     }
 
     MWWorld::Ptr Apparatus::copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const
diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index da2420d94a..e86f0430f5 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -336,7 +336,7 @@ namespace MWClass
 
     std::unique_ptr<MWWorld::Action> Armor::use (const MWWorld::Ptr& ptr, bool force) const
     {
-        std::unique_ptr<MWWorld::Action> action(new MWWorld::ActionEquip(ptr, force));
+        std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::ActionEquip>(ptr, force);
 
         action->setSound(getUpSoundId(ptr));
 
diff --git a/apps/openmw/mwclass/book.cpp b/apps/openmw/mwclass/book.cpp
index 86a0c56b9b..5d4d723be9 100644
--- a/apps/openmw/mwclass/book.cpp
+++ b/apps/openmw/mwclass/book.cpp
@@ -63,13 +63,13 @@ namespace MWClass
             auto& prng = MWBase::Environment::get().getWorld()->getPrng();
             const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfItem", prng);
 
-            std::unique_ptr<MWWorld::Action> action(new MWWorld::FailedAction("#{sWerewolfRefusal}"));
+            std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::FailedAction>("#{sWerewolfRefusal}");
             if(sound) action->setSound(sound->mId);
 
             return action;
         }
 
-        return std::unique_ptr<MWWorld::Action>(new MWWorld::ActionRead(ptr));
+        return std::make_unique<MWWorld::ActionRead>(ptr);
     }
 
     std::string Book::getScript (const MWWorld::ConstPtr& ptr) const
@@ -151,7 +151,7 @@ namespace MWClass
 
     std::unique_ptr<MWWorld::Action> Book::use (const MWWorld::Ptr& ptr, bool force) const
     {
-        return std::unique_ptr<MWWorld::Action>(new MWWorld::ActionRead(ptr));
+        return std::make_unique<MWWorld::ActionRead>(ptr);
     }
 
     MWWorld::Ptr Book::copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index 79c502d673..1dd048ca9f 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -230,7 +230,7 @@ namespace MWClass
 
     std::unique_ptr<MWWorld::Action> Clothing::use (const MWWorld::Ptr& ptr, bool force) const
     {
-        std::unique_ptr<MWWorld::Action> action(new MWWorld::ActionEquip(ptr, force));
+        std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::ActionEquip>(ptr, force);
 
         action->setSound(getUpSoundId(ptr));
 
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index ad0b6169a9..992d9b02d1 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -135,7 +135,7 @@ namespace MWClass
         const MWWorld::Ptr& actor) const
     {
         if (!MWBase::Environment::get().getWindowManager()->isAllowed(MWGui::GW_Inventory))
-            return std::unique_ptr<MWWorld::Action> (new MWWorld::NullAction ());
+            return std::make_unique<MWWorld::NullAction>();
 
         if(actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
         {
@@ -143,7 +143,7 @@ namespace MWClass
             auto& prng = MWBase::Environment::get().getWorld()->getPrng();
             const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfContainer", prng);
 
-            std::unique_ptr<MWWorld::Action> action(new MWWorld::FailedAction("#{sWerewolfRefusal}"));
+            std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::FailedAction>("#{sWerewolfRefusal}");
             if(sound) action->setSound(sound->mId);
 
             return action;
@@ -191,24 +191,22 @@ namespace MWClass
             {
                 if (canBeHarvested(ptr))
                 {
-                    std::unique_ptr<MWWorld::Action> action (new MWWorld::ActionHarvest(ptr));
-                    return action;
+                    return std::make_unique<MWWorld::ActionHarvest>(ptr);
                 }
 
-                std::unique_ptr<MWWorld::Action> action (new MWWorld::ActionOpen(ptr));
-                return action;
+                return std::make_unique<MWWorld::ActionOpen>(ptr);
             }
             else
             {
                 // Activate trap
-                std::unique_ptr<MWWorld::Action> action(new MWWorld::ActionTrap(ptr.getCellRef().getTrap(), ptr));
+                std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::ActionTrap>(ptr.getCellRef().getTrap(), ptr);
                 action->setSound(trapActivationSound);
                 return action;
             }
         }
         else
         {
-            std::unique_ptr<MWWorld::Action> action(new MWWorld::FailedAction(std::string(), ptr));
+            std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::FailedAction>(std::string(), ptr);
             action->setSound(lockedSound);
             return action;
         }
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index fc3504b947..667942b320 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -439,7 +439,7 @@ namespace MWClass
             auto& prng = MWBase::Environment::get().getWorld()->getPrng();
             const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfCreature", prng);
 
-            std::unique_ptr<MWWorld::Action> action(new MWWorld::FailedAction("#{sWerewolfRefusal}"));
+            std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::FailedAction>("#{sWerewolfRefusal}");
             if(sound) action->setSound(sound->mId);
 
             return action;
@@ -453,20 +453,20 @@ namespace MWClass
 
             // by default user can loot friendly actors during death animation
             if (canLoot && !stats.getAiSequence().isInCombat())
-                return std::unique_ptr<MWWorld::Action>(new MWWorld::ActionOpen(ptr));
+                return std::make_unique<MWWorld::ActionOpen>(ptr);
 
             // otherwise wait until death animation
             if(stats.isDeathAnimationFinished())
-                return std::unique_ptr<MWWorld::Action>(new MWWorld::ActionOpen(ptr));
+                return std::make_unique<MWWorld::ActionOpen>(ptr);
         }
         else if (!stats.getAiSequence().isInCombat() && !stats.getKnockedDown())
-            return std::unique_ptr<MWWorld::Action>(new MWWorld::ActionTalk(ptr));
+            return std::make_unique<MWWorld::ActionTalk>(ptr);
 
         // Tribunal and some mod companions oddly enough must use open action as fallback
         if (!getScript(ptr).empty() && ptr.getRefData().getLocals().getIntVar(getScript(ptr), "companion"))
-            return std::unique_ptr<MWWorld::Action>(new MWWorld::ActionOpen(ptr));
+            return std::make_unique<MWWorld::ActionOpen>(ptr);
 
-        return std::unique_ptr<MWWorld::Action>(new MWWorld::FailedAction(""));
+        return std::make_unique<MWWorld::FailedAction>();
     }
 
     MWWorld::ContainerStore& Creature::getContainerStore (const MWWorld::Ptr& ptr) const
@@ -763,7 +763,7 @@ namespace MWClass
                 else
                 {
                     // Create a CustomData, but don't fill it from ESM records (not needed)
-                    std::unique_ptr<CreatureCustomData> data (new CreatureCustomData);
+                    auto data = std::make_unique<CreatureCustomData>();
 
                     if (hasInventoryStore(ptr))
                         data->mContainerStore = std::make_unique<MWWorld::InventoryStore>();
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index 8a044ffb4d..6fcd45b6ba 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -131,7 +131,7 @@ namespace MWClass
         // Make such activation a no-op for now, like how it is in the vanilla game.
         if (actor != MWMechanics::getPlayer() && ptr.getCellRef().getTeleport())
         {
-            std::unique_ptr<MWWorld::Action> action(new MWWorld::FailedAction(std::string(), ptr));
+            std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::FailedAction>(std::string(), ptr);
             action->setSound(lockedSound);
             return action;
         }
@@ -182,7 +182,7 @@ namespace MWClass
             if(isTrapped)
             {
                 // Trap activation
-                std::unique_ptr<MWWorld::Action> action(new MWWorld::ActionTrap(ptr.getCellRef().getTrap(), ptr));
+                std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::ActionTrap>(ptr.getCellRef().getTrap(), ptr);
                 action->setSound(trapActivationSound);
                 return action;
             }
@@ -192,12 +192,11 @@ namespace MWClass
                 if (actor == MWMechanics::getPlayer() && MWBase::Environment::get().getWorld()->getDistanceToFacedObject() > MWBase::Environment::get().getWorld()->getMaxActivationDistance())
                 {
                     // player activated teleport door with telekinesis
-                    std::unique_ptr<MWWorld::Action> action(new MWWorld::FailedAction);
-                    return action;
+                    return std::make_unique<MWWorld::FailedAction>();
                 }
                 else
                 {
-                    std::unique_ptr<MWWorld::Action> action(new MWWorld::ActionTeleport (ptr.getCellRef().getDestCell(), ptr.getCellRef().getDoorDest(), true));
+                    std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::ActionTeleport>(ptr.getCellRef().getDestCell(), ptr.getCellRef().getDoorDest(), true);
                     action->setSound(openSound);
                     return action;
                 }
@@ -205,7 +204,7 @@ namespace MWClass
             else
             {
                 // animated door
-                std::unique_ptr<MWWorld::Action> action(new MWWorld::ActionDoor(ptr));
+                std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::ActionDoor>(ptr);
                 const auto doorState = getDoorState(ptr);
                 bool opening = true;
                 float doorRot = ptr.getRefData().getPosition().rot[2] - ptr.getCellRef().getPosition().rot[2];
@@ -239,7 +238,7 @@ namespace MWClass
         else
         {
             // locked, and we can't open.
-            std::unique_ptr<MWWorld::Action> action(new MWWorld::FailedAction(std::string(), ptr));
+            std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::FailedAction>(std::string(), ptr);
             action->setSound(lockedSound);
             return action;
         }
diff --git a/apps/openmw/mwclass/ingredient.cpp b/apps/openmw/mwclass/ingredient.cpp
index 2331361477..e8e7f5bd3e 100644
--- a/apps/openmw/mwclass/ingredient.cpp
+++ b/apps/openmw/mwclass/ingredient.cpp
@@ -74,7 +74,7 @@ namespace MWClass
 
     std::unique_ptr<MWWorld::Action> Ingredient::use (const MWWorld::Ptr& ptr, bool force) const
     {
-        std::unique_ptr<MWWorld::Action> action (new MWWorld::ActionEat (ptr));
+        std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::ActionEat>(ptr);
 
         action->setSound ("Swallow");
 
diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index a7d49da54a..81256d06d3 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -89,11 +89,11 @@ namespace MWClass
         const MWWorld::Ptr& actor) const
     {
         if(!MWBase::Environment::get().getWindowManager()->isAllowed(MWGui::GW_Inventory))
-            return std::unique_ptr<MWWorld::Action>(new MWWorld::NullAction());
+            return std::make_unique<MWWorld::NullAction>();
 
         MWWorld::LiveCellRef<ESM::Light> *ref = ptr.get<ESM::Light>();
         if(!(ref->mBase->mData.mFlags&ESM::Light::Carry))
-            return std::unique_ptr<MWWorld::Action>(new MWWorld::FailedAction());
+            return std::make_unique<MWWorld::FailedAction>();
 
         return defaultItemActivate(ptr, actor);
     }
@@ -186,7 +186,7 @@ namespace MWClass
 
     std::unique_ptr<MWWorld::Action> Light::use (const MWWorld::Ptr& ptr, bool force) const
     {
-        std::unique_ptr<MWWorld::Action> action(new MWWorld::ActionEquip(ptr, force));
+        std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::ActionEquip>(ptr, force);
 
         action->setSound(getUpSoundId(ptr));
 
diff --git a/apps/openmw/mwclass/lockpick.cpp b/apps/openmw/mwclass/lockpick.cpp
index c8860df4ce..1d898381b9 100644
--- a/apps/openmw/mwclass/lockpick.cpp
+++ b/apps/openmw/mwclass/lockpick.cpp
@@ -126,7 +126,7 @@ namespace MWClass
 
     std::unique_ptr<MWWorld::Action> Lockpick::use (const MWWorld::Ptr& ptr, bool force) const
     {
-        std::unique_ptr<MWWorld::Action> action(new MWWorld::ActionEquip(ptr, force));
+        std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::ActionEquip>(ptr, force);
 
         action->setSound(getUpSoundId(ptr));
 
diff --git a/apps/openmw/mwclass/misc.cpp b/apps/openmw/mwclass/misc.cpp
index 51e75650fb..ac332cc47f 100644
--- a/apps/openmw/mwclass/misc.cpp
+++ b/apps/openmw/mwclass/misc.cpp
@@ -206,9 +206,8 @@ namespace MWClass
     std::unique_ptr<MWWorld::Action> Miscellaneous::use (const MWWorld::Ptr& ptr, bool force) const
     {
         if (ptr.getCellRef().getSoul().empty() || !MWBase::Environment::get().getWorld()->getStore().get<ESM::Creature>().search(ptr.getCellRef().getSoul()))
-            return std::unique_ptr<MWWorld::Action>(new MWWorld::NullAction());
-        else
-            return std::unique_ptr<MWWorld::Action>(new MWWorld::ActionSoulgem(ptr));
+            return std::make_unique<MWWorld::NullAction>();
+        return std::make_unique<MWWorld::ActionSoulgem>(ptr);
     }
 
     bool Miscellaneous::canSell (const MWWorld::ConstPtr& item, int npcServices) const
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index f3fcb848fd..297684de53 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -865,7 +865,7 @@ namespace MWClass
     {
         // player got activated by another NPC
         if(ptr == MWMechanics::getPlayer())
-            return std::unique_ptr<MWWorld::Action>(new MWWorld::ActionTalk(actor));
+            return std::make_unique<MWWorld::ActionTalk>(actor);
 
         // Werewolfs can't activate NPCs
         if(actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
@@ -874,7 +874,7 @@ namespace MWClass
             auto& prng = MWBase::Environment::get().getWorld()->getPrng();
             const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfNPC", prng);
 
-            std::unique_ptr<MWWorld::Action> action(new MWWorld::FailedAction("#{sWerewolfRefusal}"));
+            std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::FailedAction>("#{sWerewolfRefusal}");
             if(sound) action->setSound(sound->mId);
 
             return action;
@@ -888,33 +888,33 @@ namespace MWClass
 
             // by default user can loot friendly actors during death animation
             if (canLoot && !stats.getAiSequence().isInCombat())
-                return std::unique_ptr<MWWorld::Action>(new MWWorld::ActionOpen(ptr));
+                return std::make_unique<MWWorld::ActionOpen>(ptr);
 
             // otherwise wait until death animation
             if(stats.isDeathAnimationFinished())
-                return std::unique_ptr<MWWorld::Action>(new MWWorld::ActionOpen(ptr));
+                return std::make_unique<MWWorld::ActionOpen>(ptr);
         }
         else if (!stats.getAiSequence().isInCombat())
         {
             if (stats.getKnockedDown() || MWBase::Environment::get().getMechanicsManager()->isSneaking(actor))
-                return std::unique_ptr<MWWorld::Action>(new MWWorld::ActionOpen(ptr)); // stealing
+                return std::make_unique<MWWorld::ActionOpen>(ptr); // stealing
 
             // Can't talk to werewolves
             if (!getNpcStats(ptr).isWerewolf())
-                return std::unique_ptr<MWWorld::Action>(new MWWorld::ActionTalk(ptr));
+                return std::make_unique<MWWorld::ActionTalk>(ptr);
         }
         else // In combat
         {
             const bool stealingInCombat = Settings::Manager::getBool ("always allow stealing from knocked out actors", "Game");
             if (stealingInCombat && stats.getKnockedDown())
-                return std::unique_ptr<MWWorld::Action>(new MWWorld::ActionOpen(ptr)); // stealing
+                return std::make_unique<MWWorld::ActionOpen>(ptr); // stealing
         }
 
         // Tribunal and some mod companions oddly enough must use open action as fallback
         if (!getScript(ptr).empty() && ptr.getRefData().getLocals().getIntVar(getScript(ptr), "companion"))
-            return std::unique_ptr<MWWorld::Action>(new MWWorld::ActionOpen(ptr));
+            return std::make_unique<MWWorld::ActionOpen>(ptr);
 
-        return std::unique_ptr<MWWorld::Action> (new MWWorld::FailedAction(""));
+        return std::make_unique<MWWorld::FailedAction>();
     }
 
     MWWorld::ContainerStore& Npc::getContainerStore (const MWWorld::Ptr& ptr)
diff --git a/apps/openmw/mwclass/probe.cpp b/apps/openmw/mwclass/probe.cpp
index 369f5efd6d..93ef46a67b 100644
--- a/apps/openmw/mwclass/probe.cpp
+++ b/apps/openmw/mwclass/probe.cpp
@@ -126,7 +126,7 @@ namespace MWClass
 
     std::unique_ptr<MWWorld::Action> Probe::use (const MWWorld::Ptr& ptr, bool force) const
     {
-        std::unique_ptr<MWWorld::Action> action(new MWWorld::ActionEquip(ptr, force));
+        std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::ActionEquip>(ptr, force);
 
         action->setSound(getUpSoundId(ptr));
 
diff --git a/apps/openmw/mwclass/repair.cpp b/apps/openmw/mwclass/repair.cpp
index c3a67a6086..748f2822f0 100644
--- a/apps/openmw/mwclass/repair.cpp
+++ b/apps/openmw/mwclass/repair.cpp
@@ -134,7 +134,7 @@ namespace MWClass
 
     std::unique_ptr<MWWorld::Action> Repair::use (const MWWorld::Ptr& ptr, bool force) const
     {
-        return std::unique_ptr<MWWorld::Action>(new MWWorld::ActionRepair(ptr, force));
+        return std::make_unique<MWWorld::ActionRepair>(ptr, force);
     }
 
     bool Repair::canSell (const MWWorld::ConstPtr& item, int npcServices) const
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index 9fbc7a8da9..04aa2cb83d 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -301,7 +301,7 @@ namespace MWClass
 
     std::unique_ptr<MWWorld::Action> Weapon::use (const MWWorld::Ptr& ptr, bool force) const
     {
-        std::unique_ptr<MWWorld::Action> action(new MWWorld::ActionEquip(ptr, force));
+        std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::ActionEquip>(ptr, force);
 
         action->setSound(getUpSoundId(ptr));
 
diff --git a/apps/openmw/mwgui/bookpage.cpp b/apps/openmw/mwgui/bookpage.cpp
index 56ab2be8c2..0c84e0ce7a 100644
--- a/apps/openmw/mwgui/bookpage.cpp
+++ b/apps/openmw/mwgui/bookpage.cpp
@@ -1116,7 +1116,7 @@ public:
 
             if (j == this_->mActiveTextFormats.end ())
             {
-                std::unique_ptr<TextFormat> textFormat(new TextFormat (Font, this_));
+                auto textFormat = std::make_unique<TextFormat>(Font, this_);
 
                 textFormat->mTexture = Font->getTextureFont ();
 
diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index 680356b353..8279da089e 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -63,11 +63,11 @@ namespace MWGui
         , mGuiMode(GM_Inventory)
         , mLastXSize(0)
         , mLastYSize(0)
-        , mPreview(new MWRender::InventoryPreview(parent, resourceSystem, MWMechanics::getPlayer()))
+        , mPreview(std::make_unique<MWRender::InventoryPreview>(parent, resourceSystem, MWMechanics::getPlayer()))
         , mTrading(false)
         , mUpdateTimer(0.f)
     {
-        mPreviewTexture.reset(new osgMyGUI::OSGTexture(mPreview->getTexture(), mPreview->getTextureStateSet()));
+        mPreviewTexture = std::make_unique<osgMyGUI::OSGTexture>(mPreview->getTexture(), mPreview->getTextureStateSet());
         mPreview->rebuild();
 
         mMainWidget->castType<MyGUI::Window>()->eventWindowChangeCoord += MyGUI::newDelegate(this, &InventoryWindow::onWindowResize);
diff --git a/apps/openmw/mwgui/loadingscreen.cpp b/apps/openmw/mwgui/loadingscreen.cpp
index 1ea53a6ec7..61eca3d1d0 100644
--- a/apps/openmw/mwgui/loadingscreen.cpp
+++ b/apps/openmw/mwgui/loadingscreen.cpp
@@ -297,7 +297,7 @@ namespace MWGui
 
         if (!mGuiTexture.get())
         {
-            mGuiTexture.reset(new osgMyGUI::OSGTexture(mTexture));
+            mGuiTexture = std::make_unique<osgMyGUI::OSGTexture>(mTexture);
         }
 
         if (!mCopyFramebufferToTextureCallback)
diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index dc1e47bf7d..1f24a66969 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -596,27 +596,27 @@ namespace MWGui
                 osg::ref_ptr<osg::Texture2D> texture = mLocalMapRender->getMapTexture(entry.mCellX, entry.mCellY);
                 if (texture)
                 {
-                    entry.mMapTexture.reset(new osgMyGUI::OSGTexture(texture));
+                    entry.mMapTexture = std::make_unique<osgMyGUI::OSGTexture>(texture);
                     entry.mMapWidget->setRenderItemTexture(entry.mMapTexture.get());
                     entry.mMapWidget->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 0.f, 1.f, 1.f));
                     needRedraw = true;
                 }
                 else
-                    entry.mMapTexture.reset(new osgMyGUI::OSGTexture("", nullptr));
+                    entry.mMapTexture = std::make_unique<osgMyGUI::OSGTexture>(std::string(), nullptr);
             }
             if (!entry.mFogTexture && mFogOfWarToggled && mFogOfWarEnabled)
             {
                 osg::ref_ptr<osg::Texture2D> tex = mLocalMapRender->getFogOfWarTexture(entry.mCellX, entry.mCellY);
                 if (tex)
                 {
-                    entry.mFogTexture.reset(new osgMyGUI::OSGTexture(tex));
+                    entry.mFogTexture = std::make_unique<osgMyGUI::OSGTexture>(tex);
                     entry.mFogWidget->setRenderItemTexture(entry.mFogTexture.get());
                     entry.mFogWidget->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 1.f, 1.f, 0.f));
                 }
                 else
                 {
                     entry.mFogWidget->setImageTexture("black");
-                    entry.mFogTexture.reset(new osgMyGUI::OSGTexture("", nullptr));
+                    entry.mFogTexture = std::make_unique<osgMyGUI::OSGTexture>(std::string(), nullptr);
                 }
                 needRedraw = true;
             }
@@ -1279,11 +1279,11 @@ namespace MWGui
     {
         if (!mGlobalMapTexture.get())
         {
-            mGlobalMapTexture.reset(new osgMyGUI::OSGTexture(mGlobalMapRender->getBaseTexture()));
+            mGlobalMapTexture = std::make_unique<osgMyGUI::OSGTexture>(mGlobalMapRender->getBaseTexture());
             mGlobalMapImage->setRenderItemTexture(mGlobalMapTexture.get());
             mGlobalMapImage->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 0.f, 1.f, 1.f));
 
-            mGlobalMapOverlayTexture.reset(new osgMyGUI::OSGTexture(mGlobalMapRender->getOverlayTexture()));
+            mGlobalMapOverlayTexture = std::make_unique<osgMyGUI::OSGTexture>(mGlobalMapRender->getOverlayTexture());
             mGlobalMapOverlay->setRenderItemTexture(mGlobalMapOverlayTexture.get());
             mGlobalMapOverlay->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 0.f, 1.f, 1.f));
 
diff --git a/apps/openmw/mwgui/race.cpp b/apps/openmw/mwgui/race.cpp
index efa4cea981..25679e4858 100644
--- a/apps/openmw/mwgui/race.cpp
+++ b/apps/openmw/mwgui/race.cpp
@@ -134,11 +134,11 @@ namespace MWGui
         mPreview.reset(nullptr);
         mPreviewTexture.reset(nullptr);
 
-        mPreview.reset(new MWRender::RaceSelectionPreview(mParent, mResourceSystem));
+        mPreview = std::make_unique<MWRender::RaceSelectionPreview>(mParent, mResourceSystem);
         mPreview->rebuild();
         mPreview->setAngle (mCurrentAngle);
 
-        mPreviewTexture.reset(new osgMyGUI::OSGTexture(mPreview->getTexture(), mPreview->getTextureStateSet()));
+        mPreviewTexture = std::make_unique<osgMyGUI::OSGTexture>(mPreview->getTexture(), mPreview->getTextureStateSet());
         mPreviewImage->setRenderItemTexture(mPreviewTexture.get());
         mPreviewImage->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 0.f, 1.f, 1.f));
 
diff --git a/apps/openmw/mwgui/savegamedialog.cpp b/apps/openmw/mwgui/savegamedialog.cpp
index 086135d035..c17f229f6b 100644
--- a/apps/openmw/mwgui/savegamedialog.cpp
+++ b/apps/openmw/mwgui/savegamedialog.cpp
@@ -458,7 +458,7 @@ namespace MWGui
         texture->setResizeNonPowerOfTwoHint(false);
         texture->setUnRefImageDataAfterApply(true);
 
-        mScreenshotTexture.reset(new osgMyGUI::OSGTexture(texture));
+        mScreenshotTexture = std::make_unique<osgMyGUI::OSGTexture>(texture);
 
         mScreenshot->setRenderItemTexture(mScreenshotTexture.get());
         mScreenshot->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 0.f, 1.f, 1.f));
diff --git a/apps/openmw/mwgui/videowidget.cpp b/apps/openmw/mwgui/videowidget.cpp
index 36dd7fd3e2..a973db3a61 100644
--- a/apps/openmw/mwgui/videowidget.cpp
+++ b/apps/openmw/mwgui/videowidget.cpp
@@ -18,7 +18,7 @@ namespace MWGui
 VideoWidget::VideoWidget()
     : mVFS(nullptr)
 {
-    mPlayer.reset(new Video::VideoPlayer());
+    mPlayer = std::make_unique<Video::VideoPlayer>();
     setNeedKeyFocus(true);
 }
 
@@ -50,7 +50,7 @@ void VideoWidget::playVideo(const std::string &video)
     if (!texture)
         return;
 
-    mTexture.reset(new osgMyGUI::OSGTexture(texture));
+    mTexture = std::make_unique<osgMyGUI::OSGTexture>(texture);
 
     setRenderItemTexture(mTexture.get());
     getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 1.f, 1.f, 0.f));
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 2a4855f4a3..a8043791bf 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -206,7 +206,7 @@ namespace MWGui
         MyGUI::LanguageManager::getInstance().eventRequestTag = MyGUI::newDelegate(this, &WindowManager::onRetrieveTag);
 
         // Load fonts
-        mFontLoader.reset(new Gui::FontLoader(encoding, resourceSystem->getVFS(), userDataPath, mScalingFactor));
+        mFontLoader = std::make_unique<Gui::FontLoader>(encoding, resourceSystem->getVFS(), userDataPath, mScalingFactor);
         mFontLoader->loadBitmapFonts(exportFonts);
 
         //Register own widgets with MyGUI
@@ -238,7 +238,7 @@ namespace MWGui
         WindowManager::loadUserFonts();
 
         bool keyboardNav = Settings::Manager::getBool("keyboard navigation", "GUI");
-        mKeyboardNavigation.reset(new KeyboardNavigation());
+        mKeyboardNavigation = std::make_unique<KeyboardNavigation>();
         mKeyboardNavigation->setEnabled(keyboardNav);
         Gui::ImageButton::setDefaultNeedKeyFocus(keyboardNav);
 
@@ -288,7 +288,7 @@ namespace MWGui
         if (useShaders)
             mGuiPlatform->getRenderManagerPtr()->enableShaders(mResourceSystem->getSceneManager()->getShaderManager());
 
-        mStatsWatcher.reset(new StatsWatcher());
+        mStatsWatcher = std::make_unique<StatsWatcher>();
     }
 
     void WindowManager::loadUserFonts()
diff --git a/apps/openmw/mwmechanics/aiactivate.cpp b/apps/openmw/mwmechanics/aiactivate.cpp
index c2bcab2297..21287af1f6 100644
--- a/apps/openmw/mwmechanics/aiactivate.cpp
+++ b/apps/openmw/mwmechanics/aiactivate.cpp
@@ -46,7 +46,7 @@ namespace MWMechanics
 
     void AiActivate::writeState(ESM::AiSequence::AiSequence &sequence) const
     {
-        std::unique_ptr<ESM::AiSequence::AiActivate> activate(new ESM::AiSequence::AiActivate());
+        auto activate = std::make_unique<ESM::AiSequence::AiActivate>();
         activate->mTargetId = mObjectId;
         activate->mRepeat = getRepeat();
 
diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index bd6bd385e8..a3e7cb6a26 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -200,7 +200,7 @@ namespace MWMechanics
         }
         else
         {
-            currentAction.reset(new ActionFlee());
+            currentAction = std::make_unique<ActionFlee>();
             actionCooldown = currentAction->getActionCooldown();
         }
 
@@ -300,7 +300,7 @@ namespace MWMechanics
                     storage.mUseCustomDestination = false;
                     storage.stopAttack();
                     actor.getClass().getCreatureStats(actor).setAttackingOrSpell(false);
-                    currentAction.reset(new ActionFlee());
+                    currentAction = std::make_unique<ActionFlee>();
                     actionCooldown = currentAction->getActionCooldown();
                     storage.startFleeing();
                     MWBase::Environment::get().getDialogueManager()->say(actor, "flee");
@@ -460,7 +460,7 @@ namespace MWMechanics
 
     void AiCombat::writeState(ESM::AiSequence::AiSequence &sequence) const
     {
-        std::unique_ptr<ESM::AiSequence::AiCombat> combat(new ESM::AiSequence::AiCombat());
+        auto combat = std::make_unique<ESM::AiSequence::AiCombat>();
         combat->mTargetActorId = mTargetActorId;
 
         ESM::AiSequence::AiPackageContainer package;
diff --git a/apps/openmw/mwmechanics/aicombataction.cpp b/apps/openmw/mwmechanics/aicombataction.cpp
index 30573c131e..3b3ff1da89 100644
--- a/apps/openmw/mwmechanics/aicombataction.cpp
+++ b/apps/openmw/mwmechanics/aicombataction.cpp
@@ -148,7 +148,7 @@ namespace MWMechanics
         float bestActionRating = 0.f;
         float antiFleeRating = 0.f;
         // Default to hand-to-hand combat
-        std::unique_ptr<Action> bestAction (new ActionWeapon(MWWorld::Ptr()));
+        std::unique_ptr<Action> bestAction = std::make_unique<ActionWeapon>(MWWorld::Ptr());
         if (actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
         {
             bestAction->prepare(actor);
@@ -165,7 +165,7 @@ namespace MWMechanics
                 if (rating > bestActionRating)
                 {
                     bestActionRating = rating;
-                    bestAction.reset(new ActionPotion(*it));
+                    bestAction = std::make_unique<ActionPotion>(*it);
                     antiFleeRating = std::numeric_limits<float>::max();
                 }
             }
@@ -176,7 +176,7 @@ namespace MWMechanics
                 if (rating > bestActionRating)
                 {
                     bestActionRating = rating;
-                    bestAction.reset(new ActionEnchantedItem(it));
+                    bestAction = std::make_unique<ActionEnchantedItem>(it);
                     antiFleeRating = std::numeric_limits<float>::max();
                 }
             }
@@ -202,7 +202,7 @@ namespace MWMechanics
                         ammo = bestBolt;
 
                     bestActionRating = rating;
-                    bestAction.reset(new ActionWeapon(*it, ammo));
+                    bestAction = std::make_unique<ActionWeapon>(*it, ammo);
                     antiFleeRating = vanillaRateWeaponAndAmmo(*it, ammo, actor, enemy);
                 }
             }
@@ -214,13 +214,13 @@ namespace MWMechanics
             if (rating > bestActionRating)
             {
                 bestActionRating = rating;
-                bestAction.reset(new ActionSpell(spell->mId));
+                bestAction = std::make_unique<ActionSpell>(spell->mId);
                 antiFleeRating = vanillaRateSpell(spell, actor, enemy);
             }
         }
 
         if (makeFleeDecision(actor, enemy, antiFleeRating))
-            bestAction.reset(new ActionFlee());
+            bestAction = std::make_unique<ActionFlee>();
 
         if (bestAction.get())
             bestAction->prepare(actor);
diff --git a/apps/openmw/mwmechanics/aiescort.cpp b/apps/openmw/mwmechanics/aiescort.cpp
index 2e7d55712f..aa58dacd8f 100644
--- a/apps/openmw/mwmechanics/aiescort.cpp
+++ b/apps/openmw/mwmechanics/aiescort.cpp
@@ -96,7 +96,7 @@ namespace MWMechanics
 
     void AiEscort::writeState(ESM::AiSequence::AiSequence &sequence) const
     {
-        std::unique_ptr<ESM::AiSequence::AiEscort> escort(new ESM::AiSequence::AiEscort());
+        auto escort = std::make_unique<ESM::AiSequence::AiEscort>();
         escort->mData.mX = mX;
         escort->mData.mY = mY;
         escort->mData.mZ = mZ;
diff --git a/apps/openmw/mwmechanics/aifollow.cpp b/apps/openmw/mwmechanics/aifollow.cpp
index 9444303821..f1ced856f0 100644
--- a/apps/openmw/mwmechanics/aifollow.cpp
+++ b/apps/openmw/mwmechanics/aifollow.cpp
@@ -201,7 +201,7 @@ bool AiFollow::isCommanded() const
 
 void AiFollow::writeState(ESM::AiSequence::AiSequence &sequence) const
 {
-    std::unique_ptr<ESM::AiSequence::AiFollow> follow(new ESM::AiSequence::AiFollow());
+    auto follow = std::make_unique<ESM::AiSequence::AiFollow>();
     follow->mData.mX = mX;
     follow->mData.mY = mY;
     follow->mData.mZ = mZ;
diff --git a/apps/openmw/mwmechanics/aipursue.cpp b/apps/openmw/mwmechanics/aipursue.cpp
index 25dd08436b..e5e1b0297c 100644
--- a/apps/openmw/mwmechanics/aipursue.cpp
+++ b/apps/openmw/mwmechanics/aipursue.cpp
@@ -84,7 +84,7 @@ MWWorld::Ptr AiPursue::getTarget() const
 
 void AiPursue::writeState(ESM::AiSequence::AiSequence &sequence) const
 {
-    std::unique_ptr<ESM::AiSequence::AiPursue> pursue(new ESM::AiSequence::AiPursue());
+    auto pursue = std::make_unique<ESM::AiSequence::AiPursue>();
     pursue->mTargetActorId = mTargetActorId;
 
     ESM::AiSequence::AiPackageContainer package;
diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index f138d8dc97..fc91ce0c42 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -498,41 +498,41 @@ void AiSequence::readState(const ESM::AiSequence::AiSequence &sequence)
         {
         case ESM::AiSequence::Ai_Wander:
         {
-            package.reset(new AiWander(&static_cast<const ESM::AiSequence::AiWander&>(*container.mPackage)));
+            package = std::make_unique<AiWander>(&static_cast<const ESM::AiSequence::AiWander&>(*container.mPackage));
             break;
         }
         case ESM::AiSequence::Ai_Travel:
         {
             const ESM::AiSequence::AiTravel& source = static_cast<const ESM::AiSequence::AiTravel&>(*container.mPackage);
             if (source.mHidden)
-                package.reset(new AiInternalTravel(&source));
+                package = std::make_unique<AiInternalTravel>(&source);
             else
-                package.reset(new AiTravel(&source));
+                package = std::make_unique<AiTravel>(&source);
             break;
         }
         case ESM::AiSequence::Ai_Escort:
         {
-            package.reset(new AiEscort(&static_cast<const ESM::AiSequence::AiEscort&>(*container.mPackage)));
+            package = std::make_unique<AiEscort>(&static_cast<const ESM::AiSequence::AiEscort&>(*container.mPackage));
             break;
         }
         case ESM::AiSequence::Ai_Follow:
         {
-            package.reset(new AiFollow(&static_cast<const ESM::AiSequence::AiFollow&>(*container.mPackage)));
+            package = std::make_unique<AiFollow>(&static_cast<const ESM::AiSequence::AiFollow&>(*container.mPackage));
             break;
         }
         case ESM::AiSequence::Ai_Activate:
         {
-            package.reset(new AiActivate(&static_cast<const ESM::AiSequence::AiActivate&>(*container.mPackage)));
+            package = std::make_unique<AiActivate>(&static_cast<const ESM::AiSequence::AiActivate&>(*container.mPackage));
             break;
         }
         case ESM::AiSequence::Ai_Combat:
         {
-            package.reset(new AiCombat(&static_cast<const ESM::AiSequence::AiCombat&>(*container.mPackage)));
+            package = std::make_unique<AiCombat>(&static_cast<const ESM::AiSequence::AiCombat&>(*container.mPackage));
             break;
         }
         case ESM::AiSequence::Ai_Pursue:
         {
-            package.reset(new AiPursue(&static_cast<const ESM::AiSequence::AiPursue&>(*container.mPackage)));
+            package = std::make_unique<AiPursue>(&static_cast<const ESM::AiSequence::AiPursue&>(*container.mPackage));
             break;
         }
         default:
diff --git a/apps/openmw/mwmechanics/aitravel.cpp b/apps/openmw/mwmechanics/aitravel.cpp
index 770d2f7ba6..5d453c4b44 100644
--- a/apps/openmw/mwmechanics/aitravel.cpp
+++ b/apps/openmw/mwmechanics/aitravel.cpp
@@ -123,7 +123,7 @@ namespace MWMechanics
 
     void AiTravel::writeState(ESM::AiSequence::AiSequence &sequence) const
     {
-        std::unique_ptr<ESM::AiSequence::AiTravel> travel(new ESM::AiSequence::AiTravel());
+        auto travel = std::make_unique<ESM::AiSequence::AiTravel>();
         travel->mData.mX = mX;
         travel->mData.mY = mY;
         travel->mData.mZ = mZ;
diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index a4da1ebd68..d7f2026b82 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -899,7 +899,7 @@ namespace MWMechanics
         else
             remainingDuration = mDuration;
 
-        std::unique_ptr<ESM::AiSequence::AiWander> wander(new ESM::AiSequence::AiWander());
+        auto wander = std::make_unique<ESM::AiSequence::AiWander>();
         wander->mData.mDistance = mDistance;
         wander->mData.mDuration = mDuration;
         wander->mData.mTimeOfDay = mTimeOfDay;
diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index a1f5a48388..bfaa15edfe 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -55,7 +55,7 @@ Actor::Actor(const MWWorld::Ptr& ptr, const Resource::BulletShape* shape, Physic
             Log(Debug::Error) << "Error: Failed to calculate bounding box for actor \"" << ptr.getCellRef().getRefId() << "\".";
     }
 
-    mShape.reset(new btBoxShape(Misc::Convert::toBullet(mOriginalHalfExtents)));
+    mShape = std::make_unique<btBoxShape>(Misc::Convert::toBullet(mOriginalHalfExtents));
     mRotationallyInvariant = (mMeshTranslation.x() == 0.0 && mMeshTranslation.y() == 0.0) && std::fabs(mOriginalHalfExtents.x() - mOriginalHalfExtents.y()) < 2.2;
 
     mConvexShape = static_cast<btConvexShape*>(mShape.get());
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 4de60f4900..05c7a37262 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -98,7 +98,7 @@ namespace
 namespace MWPhysics
 {
     PhysicsSystem::PhysicsSystem(Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Group> parentNode)
-        : mShapeManager(new Resource::BulletShapeManager(resourceSystem->getVFS(), resourceSystem->getSceneManager(), resourceSystem->getNifFileManager()))
+        : mShapeManager(std::make_unique<Resource::BulletShapeManager>(resourceSystem->getVFS(), resourceSystem->getSceneManager(), resourceSystem->getNifFileManager()))
         , mResourceSystem(resourceSystem)
         , mDebugDrawEnabled(false)
         , mTimeAccum(0.0f)
@@ -891,8 +891,8 @@ namespace MWPhysics
             return;
         }
 
-        mWaterCollisionObject.reset(new btCollisionObject());
-        mWaterCollisionShape.reset(new btStaticPlaneShape(btVector3(0,0,1), mWaterHeight));
+        mWaterCollisionObject = std::make_unique<btCollisionObject>();
+        mWaterCollisionShape = std::make_unique<btStaticPlaneShape>(btVector3(0,0,1), mWaterHeight);
         mWaterCollisionObject->setCollisionShape(mWaterCollisionShape.get());
         mTaskScheduler->addCollisionObject(mWaterCollisionObject.get(), CollisionType_Water,
                                                     CollisionType_Actor|CollisionType_Projectile);
diff --git a/apps/openmw/mwrender/creatureanimation.cpp b/apps/openmw/mwrender/creatureanimation.cpp
index f3a92bff46..174ea036e1 100644
--- a/apps/openmw/mwrender/creatureanimation.cpp
+++ b/apps/openmw/mwrender/creatureanimation.cpp
@@ -147,7 +147,7 @@ void CreatureWeaponAnimation::updatePart(PartHolderPtr& scene, int slot)
     {
         osg::ref_ptr<osg::Node> attached = attach(itemModel, bonename, bonename, item.getType() == ESM::Light::sRecordId);
 
-        scene.reset(new PartHolder(attached));
+        scene = std::make_unique<PartHolder>(attached);
 
         if (!item.getClass().getEnchantment(item).empty())
             mGlowUpdater = SceneUtil::addEnchantedGlow(attached, mResourceSystem, item.getClass().getEnchantmentColor(item));
@@ -173,7 +173,7 @@ void CreatureWeaponAnimation::updatePart(PartHolderPtr& scene, int slot)
         if (slot == MWWorld::InventoryStore::Slot_CarriedRight)
             source = mWeaponAnimationTime;
         else
-            source.reset(new NullAnimationTime);
+            source = std::make_shared<NullAnimationTime>();
 
         SceneUtil::AssignControllerSourcesVisitor assignVisitor(source);
         attached->accept(assignVisitor);
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index fda98a1589..9e7b95fb0c 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -122,7 +122,7 @@ void LocalMap::saveFogOfWar(MWWorld::CellStore* cell)
 
         if (segment.mFogOfWarImage && segment.mHasFogState)
         {
-            std::unique_ptr<ESM::FogState> fog (new ESM::FogState());
+            auto fog = std::make_unique<ESM::FogState>();
             fog->mFogTextures.emplace_back();
 
             segment.saveFogOfWar(fog->mFogTextures.back());
@@ -134,7 +134,7 @@ void LocalMap::saveFogOfWar(MWWorld::CellStore* cell)
     {
         auto segments = divideIntoSegments(mBounds, mMapWorldSize);
 
-        std::unique_ptr<ESM::FogState> fog (new ESM::FogState());
+        auto fog = std::make_unique<ESM::FogState>();
 
         fog->mBounds.mMinX = mBounds.xMin();
         fog->mBounds.mMaxX = mBounds.xMax();
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index e0869a45dd..5292886754 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -401,7 +401,7 @@ namespace MWRender
         if (Settings::Manager::getBool("terrain shadows", "Shadows"))
             shadowCastingTraversalMask |= Mask_Terrain;
 
-        mShadowManager.reset(new SceneUtil::ShadowManager(sceneRoot, mRootNode, shadowCastingTraversalMask, indoorShadowCastingTraversalMask, Mask_Terrain|Mask_Object|Mask_Static, mResourceSystem->getSceneManager()->getShaderManager()));
+        mShadowManager = std::make_unique<SceneUtil::ShadowManager>(sceneRoot, mRootNode, shadowCastingTraversalMask, indoorShadowCastingTraversalMask, Mask_Terrain|Mask_Object|Mask_Static, mResourceSystem->getSceneManager()->getShaderManager());
 
         Shader::ShaderManager::DefineMap shadowDefines = mShadowManager->getShadowDefines();
         Shader::ShaderManager::DefineMap lightDefines = sceneRoot->getLightDefines();
@@ -435,13 +435,13 @@ namespace MWRender
         // It is unnecessary to stop/start the viewer as no frames are being rendered yet.
         mResourceSystem->getSceneManager()->getShaderManager().setGlobalDefines(globalDefines);
 
-        mNavMesh.reset(new NavMesh(mRootNode, mWorkQueue, Settings::Manager::getBool("enable nav mesh render", "Navigator"),
-                                   parseNavMeshMode(Settings::Manager::getString("nav mesh render mode", "Navigator"))));
-        mActorsPaths.reset(new ActorsPaths(mRootNode, Settings::Manager::getBool("enable agents paths render", "Navigator")));
-        mRecastMesh.reset(new RecastMesh(mRootNode, Settings::Manager::getBool("enable recast mesh render", "Navigator")));
-        mPathgrid.reset(new Pathgrid(mRootNode));
+        mNavMesh = std::make_unique<NavMesh>(mRootNode, mWorkQueue, Settings::Manager::getBool("enable nav mesh render", "Navigator"),
+                                   parseNavMeshMode(Settings::Manager::getString("nav mesh render mode", "Navigator")));
+        mActorsPaths = std::make_unique<ActorsPaths>(mRootNode, Settings::Manager::getBool("enable agents paths render", "Navigator"));
+        mRecastMesh = std::make_unique<RecastMesh>(mRootNode, Settings::Manager::getBool("enable recast mesh render", "Navigator"));
+        mPathgrid = std::make_unique<Pathgrid>(mRootNode);
 
-        mObjects.reset(new Objects(mResourceSystem, sceneRoot));
+        mObjects = std::make_unique<Objects>(mResourceSystem, sceneRoot);
 
         if (getenv("OPENMW_DONT_PRECOMPILE") == nullptr)
         {
@@ -451,7 +451,7 @@ namespace MWRender
 
         mResourceSystem->getSceneManager()->setIncrementalCompileOperation(mViewer->getIncrementalCompileOperation());
 
-        mEffectManager.reset(new EffectManager(sceneRoot, mResourceSystem));
+        mEffectManager = std::make_unique<EffectManager>(sceneRoot, mResourceSystem);
 
         const std::string normalMapPattern = Settings::Manager::getString("normal map pattern", "Shaders");
         const std::string heightMapPattern = Settings::Manager::getString("normal height map pattern", "Shaders");
@@ -459,7 +459,7 @@ namespace MWRender
         const bool useTerrainNormalMaps = Settings::Manager::getBool("auto use terrain normal maps", "Shaders");
         const bool useTerrainSpecularMaps = Settings::Manager::getBool("auto use terrain specular maps", "Shaders");
 
-        mTerrainStorage.reset(new TerrainStorage(mResourceSystem, normalMapPattern, heightMapPattern, useTerrainNormalMaps, specularMapPattern, useTerrainSpecularMaps));
+        mTerrainStorage = std::make_unique<TerrainStorage>(mResourceSystem, normalMapPattern, heightMapPattern, useTerrainNormalMaps, specularMapPattern, useTerrainSpecularMaps);
         const float lodFactor = Settings::Manager::getFloat("lod factor", "Terrain");
 
         bool groundcover = Settings::Manager::getBool("enabled", "Groundcover");
@@ -474,18 +474,18 @@ namespace MWRender
             float maxCompGeometrySize = Settings::Manager::getFloat("max composite geometry size", "Terrain");
             maxCompGeometrySize = std::max(maxCompGeometrySize, 1.f);
             bool debugChunks = Settings::Manager::getBool("debug chunks", "Terrain");
-            mTerrain.reset(new Terrain::QuadTreeWorld(
+            mTerrain = std::make_unique<Terrain::QuadTreeWorld>(
                 sceneRoot, mRootNode, mResourceSystem, mTerrainStorage.get(), Mask_Terrain, Mask_PreCompile, Mask_Debug,
-                compMapResolution, compMapLevel, lodFactor, vertexLodMod, maxCompGeometrySize, debugChunks));
+                compMapResolution, compMapLevel, lodFactor, vertexLodMod, maxCompGeometrySize, debugChunks);
             if (Settings::Manager::getBool("object paging", "Terrain"))
             {
-                mObjectPaging.reset(new ObjectPaging(mResourceSystem->getSceneManager()));
+                mObjectPaging = std::make_unique<ObjectPaging>(mResourceSystem->getSceneManager());
                 static_cast<Terrain::QuadTreeWorld*>(mTerrain.get())->addChunkManager(mObjectPaging.get());
                 mResourceSystem->addResourceManager(mObjectPaging.get());
             }
         }
         else
-            mTerrain.reset(new Terrain::TerrainGrid(sceneRoot, mRootNode, mResourceSystem, mTerrainStorage.get(), Mask_Terrain, Mask_PreCompile, Mask_Debug));
+            mTerrain = std::make_unique<Terrain::TerrainGrid>(sceneRoot, mRootNode, mResourceSystem, mTerrainStorage.get(), Mask_Terrain, Mask_PreCompile, Mask_Debug);
 
         mTerrain->setTargetFrameRate(Settings::Manager::getFloat("target framerate", "Cells"));
 
@@ -494,7 +494,7 @@ namespace MWRender
             float density = Settings::Manager::getFloat("density", "Groundcover");
             density = std::clamp(density, 0.f, 1.f);
 
-            mGroundcover.reset(new Groundcover(mResourceSystem->getSceneManager(), density, groundcoverDistance, groundcoverStore));
+            mGroundcover = std::make_unique<Groundcover>(mResourceSystem->getSceneManager(), density, groundcoverDistance, groundcoverStore);
             static_cast<Terrain::QuadTreeWorld*>(mTerrain.get())->addChunkManager(mGroundcover.get());
             mResourceSystem->addResourceManager(mGroundcover.get());
         }
@@ -513,11 +513,11 @@ namespace MWRender
         resourceSystem->getSceneManager()->setSupportsNormalsRT(mPostProcessor->getSupportsNormalsRT());
 
         // water goes after terrain for correct waterculling order
-        mWater.reset(new Water(sceneRoot->getParent(0), sceneRoot, mResourceSystem, mViewer->getIncrementalCompileOperation(), resourcePath));
+        mWater = std::make_unique<Water>(sceneRoot->getParent(0), sceneRoot, mResourceSystem, mViewer->getIncrementalCompileOperation(), resourcePath);
 
-        mCamera.reset(new Camera(mViewer->getCamera()));
+        mCamera = std::make_unique<Camera>(mViewer->getCamera());
 
-        mScreenshotManager.reset(new ScreenshotManager(viewer, mRootNode, sceneRoot, mResourceSystem, mWater.get()));
+        mScreenshotManager = std::make_unique<ScreenshotManager>(viewer, mRootNode, sceneRoot, mResourceSystem, mWater.get());
 
         mViewer->setLightingMode(osgViewer::View::NO_LIGHT);
 
@@ -544,9 +544,9 @@ namespace MWRender
         sceneRoot->getOrCreateStateSet()->addUniform(new osg::Uniform("emissiveMult", 1.f));
         sceneRoot->getOrCreateStateSet()->addUniform(new osg::Uniform("specStrength", 1.f));
 
-        mFog.reset(new FogManager());
+        mFog = std::make_unique<FogManager>();
 
-        mSky.reset(new SkyManager(sceneRoot, resourceSystem->getSceneManager()));
+        mSky = std::make_unique<SkyManager>(sceneRoot, resourceSystem->getSceneManager());
         mSky->setCamera(mViewer->getCamera());
 
         source->setStateSetModes(*mRootNode->getOrCreateStateSet(), osg::StateAttribute::ON);
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index d8add9a685..754810fc8c 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -303,10 +303,10 @@ namespace MWRender
         mAtmosphereNightUpdater = new AtmosphereNightUpdater(mSceneManager->getImageManager(), forceShaders);
         atmosphereNight->addUpdateCallback(mAtmosphereNightUpdater);
 
-        mSun.reset(new Sun(mEarlyRenderBinRoot, *mSceneManager));
+        mSun = std::make_unique<Sun>(mEarlyRenderBinRoot, *mSceneManager);
         mSun->setSunglare(mSunglareEnabled);
-        mMasser.reset(new Moon(mEarlyRenderBinRoot, *mSceneManager, Fallback::Map::getFloat("Moons_Masser_Size")/125, Moon::Type_Masser));
-        mSecunda.reset(new Moon(mEarlyRenderBinRoot, *mSceneManager, Fallback::Map::getFloat("Moons_Secunda_Size")/125, Moon::Type_Secunda));
+        mMasser = std::make_unique<Moon>(mEarlyRenderBinRoot, *mSceneManager, Fallback::Map::getFloat("Moons_Masser_Size")/125, Moon::Type_Masser);
+        mSecunda = std::make_unique<Moon>(mEarlyRenderBinRoot, *mSceneManager, Fallback::Map::getFloat("Moons_Secunda_Size")/125, Moon::Type_Secunda);
 
         mCloudNode = new osg::Group;
         mEarlyRenderBinRoot->addChild(mCloudNode);
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index 822eab04fe..41fbc1c05b 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -456,7 +456,7 @@ Water::Water(osg::Group *parent, osg::Group* sceneRoot, Resource::ResourceSystem
     , mCullCallback(nullptr)
     , mShaderWaterStateSetUpdater(nullptr)
 {
-    mSimulation.reset(new RippleSimulation(mSceneRoot, resourceSystem));
+    mSimulation = std::make_unique<RippleSimulation>(mSceneRoot, resourceSystem);
 
     mWaterGeom = SceneUtil::createWaterGeometry(Constants::CellSizeInUnits*150, 40, 900);
     mWaterGeom->setDrawCallback(new DepthClampCallback);
diff --git a/apps/openmw/mwsound/movieaudiofactory.cpp b/apps/openmw/mwsound/movieaudiofactory.cpp
index e5bda0ad02..aef8f7fe93 100644
--- a/apps/openmw/mwsound/movieaudiofactory.cpp
+++ b/apps/openmw/mwsound/movieaudiofactory.cpp
@@ -155,7 +155,7 @@ namespace MWSound
 
     std::unique_ptr<Video::MovieAudioDecoder> MovieAudioFactory::createDecoder(Video::VideoState* videoState)
     {
-        std::unique_ptr<MWSound::MovieAudioDecoder> decoder(new MWSound::MovieAudioDecoder(videoState));
+        auto decoder = std::make_unique<MWSound::MovieAudioDecoder>(videoState);
         decoder->setupFormat();
 
         MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
diff --git a/apps/openmw/mwsound/openal_output.cpp b/apps/openmw/mwsound/openal_output.cpp
index 649c67961d..3fe220019d 100644
--- a/apps/openmw/mwsound/openal_output.cpp
+++ b/apps/openmw/mwsound/openal_output.cpp
@@ -428,7 +428,7 @@ bool OpenAL_SoundStream::init(bool getLoudnessData)
     mBufferSize *= mFrameSize;
 
     if (getLoudnessData)
-        mLoudnessAnalyzer.reset(new Sound_Loudness(sLoudnessFPS, mSampleRate, chans, type));
+        mLoudnessAnalyzer = std::make_unique<Sound_Loudness>(sLoudnessFPS, mSampleRate, chans, type);
 
     mIsFinished = false;
     return true;
@@ -1501,7 +1501,7 @@ OpenAL_Output::OpenAL_Output(SoundManager &mgr)
   , mDevice(nullptr), mContext(nullptr)
   , mListenerPos(0.0f, 0.0f, 0.0f), mListenerEnv(Env_Normal)
   , mWaterFilter(0), mWaterEffect(0), mDefaultEffect(0), mEffectSlot(0)
-  , mStreamThread(new StreamThread)
+  , mStreamThread(std::make_unique<StreamThread>())
 {
 }
 
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 0c7cc631b7..44dcc0de15 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -792,7 +792,7 @@ namespace MWWorld
 
     void CellStore::readFog(ESM::ESMReader &reader)
     {
-        mFogState.reset(new ESM::FogState());
+        mFogState = std::make_unique<ESM::FogState>();
         mFogState->load(reader);
     }
 
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index 9dc8ba5631..f8a9164fa2 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -117,12 +117,12 @@ namespace MWWorld
 
     std::unique_ptr<Action> Class::activate (const Ptr& ptr, const Ptr& actor) const
     {
-        return std::unique_ptr<Action> (new NullAction);
+        return std::make_unique<NullAction>();
     }
 
     std::unique_ptr<Action> Class::use (const Ptr& ptr, bool force) const
     {
-        return std::unique_ptr<Action> (new NullAction);
+        return std::make_unique<NullAction>();
     }
 
     ContainerStore& Class::getContainerStore (const Ptr& ptr) const
@@ -332,7 +332,7 @@ namespace MWWorld
     std::unique_ptr<Action> Class::defaultItemActivate(const Ptr &ptr, const Ptr &actor) const
     {
         if(!MWBase::Environment::get().getWindowManager()->isAllowed(MWGui::GW_Inventory))
-            return std::unique_ptr<Action>(new NullAction());
+            return std::make_unique<NullAction>();
 
         if(actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
         {
@@ -340,13 +340,13 @@ namespace MWWorld
             auto& prng = MWBase::Environment::get().getWorld()->getPrng();
             const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfItem", prng);
 
-            std::unique_ptr<MWWorld::Action> action(new MWWorld::FailedAction("#{sWerewolfRefusal}"));
+            std::unique_ptr<MWWorld::Action> action = std::make_unique<MWWorld::FailedAction>("#{sWerewolfRefusal}");
             if(sound) action->setSound(sound->mId);
 
             return action;
         }
 
-        std::unique_ptr<MWWorld::Action> action(new ActionTake(ptr));
+        std::unique_ptr<MWWorld::Action> action = std::make_unique<ActionTake>(ptr);
         action->setSound(getUpSoundId(ptr));
 
         return action;
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index c362cddd38..9cd0c2e4e4 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -772,7 +772,7 @@ namespace MWWorld
     , mPreloadFastTravel(Settings::Manager::getBool("preload fast travel", "Cells"))
     , mPredictionTime(Settings::Manager::getFloat("prediction time", "Cells"))
     {
-        mPreloader.reset(new CellPreloader(rendering.getResourceSystem(), physics->getShapeManager(), rendering.getTerrain(), rendering.getLandManager()));
+        mPreloader = std::make_unique<CellPreloader>(rendering.getResourceSystem(), physics->getShapeManager(), rendering.getTerrain(), rendering.getLandManager());
         mPreloader->setWorkQueue(mRendering.getWorkQueue());
 
         rendering.getResourceSystem()->setExpiryDelay(Settings::Manager::getFloat("cache expiry delay", "Cells"));
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 333ced2116..15034b9b12 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -175,7 +175,7 @@ namespace MWWorld
             break;
         }
 
-        mCurrentDate.reset(new DateTimeManager());
+        mCurrentDate = std::make_unique<DateTimeManager>();
 
         fillGlobalVariables();
 
@@ -184,7 +184,7 @@ namespace MWWorld
 
         mSwimHeightScale = mStore.get<ESM::GameSetting>().find("fSwimHeightScale")->mValue.getFloat();
 
-        mPhysics.reset(new MWPhysics::PhysicsSystem(resourceSystem, rootNode));
+        mPhysics = std::make_unique<MWPhysics::PhysicsSystem>(resourceSystem, rootNode);
 
         if (Settings::Manager::getBool("enable", "Navigator"))
         {
@@ -197,13 +197,13 @@ namespace MWWorld
             mNavigator = DetourNavigator::makeNavigatorStub();
         }
 
-        mRendering.reset(new MWRender::RenderingManager(viewer, rootNode, resourceSystem, workQueue, resourcePath, *mNavigator, mGroundcoverStore));
-        mProjectileManager.reset(new ProjectileManager(mRendering->getLightRoot()->asGroup(), resourceSystem, mRendering.get(), mPhysics.get()));
+        mRendering = std::make_unique<MWRender::RenderingManager>(viewer, rootNode, resourceSystem, workQueue, resourcePath, *mNavigator, mGroundcoverStore);
+        mProjectileManager = std::make_unique<ProjectileManager>(mRendering->getLightRoot()->asGroup(), resourceSystem, mRendering.get(), mPhysics.get());
         mRendering->preloadCommonAssets();
 
-        mWeatherManager.reset(new MWWorld::WeatherManager(*mRendering, mStore));
+        mWeatherManager = std::make_unique<MWWorld::WeatherManager>(*mRendering, mStore);
 
-        mWorldScene.reset(new Scene(*this, *mRendering.get(), mPhysics.get(), *mNavigator));
+        mWorldScene = std::make_unique<Scene>(*this, *mRendering.get(), mPhysics.get(), *mNavigator);
     }
 
     void World::fillGlobalVariables()
@@ -231,7 +231,7 @@ namespace MWWorld
         // we don't want old weather to persist on a new game
         // Note that if reset later, the initial ChangeWeather that the chargen script calls will be lost.
         mWeatherManager.reset();
-        mWeatherManager.reset(new MWWorld::WeatherManager(*mRendering.get(), mStore));
+        mWeatherManager = std::make_unique<MWWorld::WeatherManager>(*mRendering.get(), mStore);
 
         if (!bypass)
         {
@@ -2443,7 +2443,7 @@ namespace MWWorld
     {
         const ESM::NPC *player = mStore.get<ESM::NPC>().find("player");
         if (!mPlayer)
-            mPlayer.reset(new MWWorld::Player(player));
+            mPlayer = std::make_unique<MWWorld::Player>(player);
         else
         {
             // Remove the old CharacterController

From db1a372e5b576b099f58eee4bfde903944999390 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 29 May 2022 13:25:17 +0200
Subject: [PATCH 2541/2859] Replace new with make_unique in opencs

---
 apps/opencs/model/doc/document.cpp            |  6 ++---
 apps/opencs/model/filter/parser.cpp           |  2 +-
 apps/opencs/model/world/actoradapter.cpp      |  4 ++--
 apps/opencs/model/world/collection.hpp        | 15 ++++++------
 apps/opencs/model/world/commanddispatcher.cpp |  5 ++--
 apps/opencs/model/world/data.cpp              | 12 +++++-----
 apps/opencs/model/world/idcollection.cpp      |  2 +-
 apps/opencs/model/world/idcollection.hpp      | 10 ++++----
 apps/opencs/model/world/infocollection.cpp    | 10 ++++----
 .../opencs/model/world/nestedidcollection.hpp |  8 +++----
 .../model/world/nestedinfocollection.cpp      |  8 +++----
 apps/opencs/model/world/refcollection.cpp     | 22 +++++++++---------
 apps/opencs/model/world/refiddata.hpp         |  2 +-
 apps/opencs/view/render/cell.cpp              | 16 ++++++-------
 apps/opencs/view/render/object.cpp            |  2 +-
 .../view/render/pagedworldspacewidget.cpp     |  8 +++----
 apps/opencs/view/render/terrainshapemode.cpp  | 23 +++++++++----------
 .../opencs/view/render/terraintexturemode.cpp |  7 +++---
 .../view/render/unpagedworldspacewidget.cpp   |  4 ++--
 apps/opencs/view/world/creator.hpp            |  2 +-
 apps/opencs/view/world/dialoguesubview.cpp    |  2 +-
 apps/opencs/view/world/genericcreator.cpp     |  8 +++----
 22 files changed, 86 insertions(+), 92 deletions(-)

diff --git a/apps/opencs/model/doc/document.cpp b/apps/opencs/model/doc/document.cpp
index f4071c525d..0b7b73693c 100644
--- a/apps/opencs/model/doc/document.cpp
+++ b/apps/opencs/model/doc/document.cpp
@@ -116,7 +116,7 @@ void CSMDoc::Document::addOptionalGmst (const ESM::GameSetting& gmst)
 {
     if (getData().getGmsts().searchId (gmst.mId)==-1)
     {
-        std::unique_ptr<CSMWorld::Record<ESM::GameSetting> > record(new CSMWorld::Record<ESM::GameSetting>);
+        auto record = std::make_unique<CSMWorld::Record<ESM::GameSetting>>();
         record->mBase = gmst;
         record->mState = CSMWorld::RecordBase::State_BaseOnly;
         getData().getGmsts().appendRecord (std::move(record));
@@ -127,7 +127,7 @@ void CSMDoc::Document::addOptionalGlobal (const ESM::Global& global)
 {
     if (getData().getGlobals().searchId (global.mId)==-1)
     {
-        std::unique_ptr<CSMWorld::Record<ESM::Global> > record(new CSMWorld::Record<ESM::Global>);
+        auto record = std::make_unique<CSMWorld::Record<ESM::Global>>();
         record->mBase = global;
         record->mState = CSMWorld::RecordBase::State_BaseOnly;
         getData().getGlobals().appendRecord (std::move(record));
@@ -138,7 +138,7 @@ void CSMDoc::Document::addOptionalMagicEffect (const ESM::MagicEffect& magicEffe
 {
     if (getData().getMagicEffects().searchId (magicEffect.mId)==-1)
     {
-        std::unique_ptr<CSMWorld::Record<ESM::MagicEffect> > record(new CSMWorld::Record<ESM::MagicEffect>);
+        auto record = std::make_unique<CSMWorld::Record<ESM::MagicEffect>>();
         record->mBase = magicEffect;
         record->mState = CSMWorld::RecordBase::State_BaseOnly;
         getData().getMagicEffects().appendRecord (std::move(record));
diff --git a/apps/opencs/model/filter/parser.cpp b/apps/opencs/model/filter/parser.cpp
index c69a54726d..d02205d596 100644
--- a/apps/opencs/model/filter/parser.cpp
+++ b/apps/opencs/model/filter/parser.cpp
@@ -579,7 +579,7 @@ bool CSMFilter::Parser::parse (const std::string& filter, bool allowPredefined)
         else
         {
             // Empty filter string equals to filter "true".
-            mFilter.reset (new BooleanNode (true));
+            mFilter = std::make_shared<BooleanNode>(true);
         }
 
         return true;
diff --git a/apps/opencs/model/world/actoradapter.cpp b/apps/opencs/model/world/actoradapter.cpp
index bc8f519dcd..e6a193b3e0 100644
--- a/apps/opencs/model/world/actoradapter.cpp
+++ b/apps/opencs/model/world/actoradapter.cpp
@@ -228,7 +228,7 @@ namespace CSMWorld
         }
 
         // Create the actor data
-        data.reset(new ActorData());
+        data = std::make_shared<ActorData>();
         setupActor(id, data);
         mCachedActors.insert(id, data);
         return data;
@@ -431,7 +431,7 @@ namespace CSMWorld
         if (data) return data;
 
         // Create the race data
-        data.reset(new RaceData());
+        data = std::make_shared<RaceData>();
         setupRace(id, data);
         mCachedRaces.insert(id, data);
         return data;
diff --git a/apps/opencs/model/world/collection.hpp b/apps/opencs/model/world/collection.hpp
index d15a4ff54d..25e350f3a3 100644
--- a/apps/opencs/model/world/collection.hpp
+++ b/apps/opencs/model/world/collection.hpp
@@ -249,12 +249,13 @@ namespace CSMWorld
     int Collection<ESXRecordT, IdAccessorT>::cloneRecordImp(const std::string& origin,
         const std::string& destination, UniversalId::Type type)
     {
-       std::unique_ptr<Record<ESXRecordT> > copy(new Record<ESXRecordT>);
-       copy->mModified = getRecord(origin).get();
-       copy->mState = RecordBase::State_ModifiedOnly;
-       IdAccessorT().setId(copy->get(), destination);
+        auto copy = std::make_unique<Record<ESXRecordT>>();
+        copy->mModified = getRecord(origin).get();
+        copy->mState = RecordBase::State_ModifiedOnly;
+        IdAccessorT().setId(copy->get(), destination);
 
-        if (type == UniversalId::Type_Reference) {
+        if (type == UniversalId::Type_Reference)
+        {
             CSMWorld::CellRef* ptr = (CSMWorld::CellRef*) &copy->mModified;
             ptr->mRefNum.mIndex = 0;
         }
@@ -338,7 +339,7 @@ namespace CSMWorld
 
         if (iter==mIndex.end())
         {
-            std::unique_ptr<Record<ESXRecordT> > record2(new Record<ESXRecordT>);
+            auto record2 = std::make_unique<Record<ESXRecordT>>();
             record2->mState = Record<ESXRecordT>::State_ModifiedOnly;
             record2->mModified = record;
 
@@ -469,7 +470,7 @@ namespace CSMWorld
         IdAccessorT().setId(record, id);
         record.blank();
 
-        std::unique_ptr<Record<ESXRecordT> > record2(new Record<ESXRecordT>);
+        auto record2 = std::make_unique<Record<ESXRecordT>>();
         record2->mState = Record<ESXRecordT>::State_ModifiedOnly;
         record2->mModified = record;
 
diff --git a/apps/opencs/model/world/commanddispatcher.cpp b/apps/opencs/model/world/commanddispatcher.cpp
index c5d78b6586..dc815f43f3 100644
--- a/apps/opencs/model/world/commanddispatcher.cpp
+++ b/apps/opencs/model/world/commanddispatcher.cpp
@@ -170,14 +170,13 @@ void CSMWorld::CommandDispatcher::executeModify (QAbstractItemModel *model, cons
                 if (cellId.find ('#')!=std::string::npos)
                 {
                     // Need to recalculate the cell
-                    modifyCell.reset (new UpdateCellCommand (model2, row));
+                    modifyCell = std::make_unique<UpdateCellCommand>(model2, row);
                 }
             }
         }
     }
 
-    std::unique_ptr<CSMWorld::ModifyCommand> modifyData (
-        new CSMWorld::ModifyCommand (*model, index, new_));
+    auto modifyData = std::make_unique<CSMWorld::ModifyCommand>(*model, index, new_);
 
     if (modifyCell.get())
     {
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index b10efaa3a4..939316fa60 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -70,11 +70,11 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding, bool fsStrict, const Files::Pat
   mReader (nullptr), mDialogue (nullptr), mReaderIndex(1),
   mFsStrict(fsStrict), mDataPaths(dataPaths), mArchives(archives)
 {
-    mVFS.reset(new VFS::Manager(mFsStrict));
+    mVFS = std::make_unique<VFS::Manager>(mFsStrict);
     VFS::registerArchives(mVFS.get(), Files::Collections(mDataPaths, !mFsStrict), mArchives, true);
 
     mResourcesManager.setVFS(mVFS.get());
-    mResourceSystem.reset(new Resource::ResourceSystem(mVFS.get()));
+    mResourceSystem = std::make_unique<Resource::ResourceSystem>(mVFS.get());
 
     Shader::ShaderManager::DefineMap defines = mResourceSystem->getSceneManager()->getShaderManager().getGlobalDefines();
     Shader::ShaderManager::DefineMap shadowDefines = SceneUtil::ShadowManager::getShadowsDisabledDefines();
@@ -602,7 +602,7 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding, bool fsStrict, const Files::Pat
         UniversalId::Type_Video);
     addModel (new IdTable (&mMetaData), UniversalId::Type_MetaData);
 
-    mActorAdapter.reset(new ActorAdapter(*this));
+    mActorAdapter = std::make_unique<ActorAdapter>(*this);
 
     mRefLoadCache.clear(); // clear here rather than startLoading() and continueLoading() for multiple content files
 }
@@ -963,7 +963,7 @@ int CSMWorld::Data::getTotalRecords (const std::vector<boost::filesystem::path>&
 {
     int records = 0;
 
-    std::unique_ptr<ESM::ESMReader> reader = std::unique_ptr<ESM::ESMReader>(new ESM::ESMReader);
+    std::unique_ptr<ESM::ESMReader> reader = std::make_unique<ESM::ESMReader>();
 
     for (unsigned int i = 0; i < files.size(); ++i)
     {
@@ -1032,7 +1032,7 @@ void CSMWorld::Data::loadFallbackEntries()
             ESM::Static newMarker;
             newMarker.mId = marker.first;
             newMarker.mModel = marker.second;
-            std::unique_ptr<CSMWorld::Record<ESM::Static> > record(new CSMWorld::Record<ESM::Static>);
+            auto record = std::make_unique<CSMWorld::Record<ESM::Static>>();
             record->mBase = newMarker;
             record->mState = CSMWorld::RecordBase::State_BaseOnly;
             mReferenceables.appendRecord (std::move(record), CSMWorld::UniversalId::Type_Static);
@@ -1046,7 +1046,7 @@ void CSMWorld::Data::loadFallbackEntries()
             ESM::Door newMarker;
             newMarker.mId = marker.first;
             newMarker.mModel = marker.second;
-            std::unique_ptr<CSMWorld::Record<ESM::Door> > record(new CSMWorld::Record<ESM::Door>);
+            auto record = std::make_unique<CSMWorld::Record<ESM::Door>>();
             record->mBase = newMarker;
             record->mState = CSMWorld::RecordBase::State_BaseOnly;
             mReferenceables.appendRecord (std::move(record), CSMWorld::UniversalId::Type_Door);
diff --git a/apps/opencs/model/world/idcollection.cpp b/apps/opencs/model/world/idcollection.cpp
index d06a47e32b..802ffe2487 100644
--- a/apps/opencs/model/world/idcollection.cpp
+++ b/apps/opencs/model/world/idcollection.cpp
@@ -32,7 +32,7 @@ namespace CSMWorld
                 return -1;
             }
 
-            std::unique_ptr<Record<Pathgrid> > baseRecord(new Record<Pathgrid>(this->getRecord(index)));
+            auto baseRecord = std::make_unique<Record<Pathgrid>>(this->getRecord(index));
             baseRecord->mState = RecordBase::State_Deleted;
             this->setRecord(index, std::move(baseRecord));
             return index;
diff --git a/apps/opencs/model/world/idcollection.hpp b/apps/opencs/model/world/idcollection.hpp
index 9261d287f5..d246dc6852 100644
--- a/apps/opencs/model/world/idcollection.hpp
+++ b/apps/opencs/model/world/idcollection.hpp
@@ -84,7 +84,7 @@ namespace CSMWorld
                 return -1;
             }
 
-            std::unique_ptr<Record<ESXRecordT> > baseRecord(new Record<ESXRecordT>(this->getRecord(index)));
+            auto baseRecord = std::make_unique<Record<ESXRecordT>>(this->getRecord(index));
             baseRecord->mState = RecordBase::State_Deleted;
             this->setRecord(index, std::move(baseRecord));
             return index;
@@ -103,7 +103,7 @@ namespace CSMWorld
         if (index==-1)
         {
             // new record
-            std::unique_ptr<Record<ESXRecordT> > record2(new Record<ESXRecordT>);
+            auto record2 = std::make_unique<Record<ESXRecordT>>();
             record2->mState = base ? RecordBase::State_BaseOnly : RecordBase::State_ModifiedOnly;
             (base ? record2->mBase : record2->mModified) = record;
 
@@ -113,8 +113,7 @@ namespace CSMWorld
         else
         {
             // old record
-            std::unique_ptr<Record<ESXRecordT> > record2(
-                    new Record<ESXRecordT>(Collection<ESXRecordT, IdAccessorT>::getRecord(index)));
+            auto record2 = std::make_unique<Record<ESXRecordT>>(Collection<ESXRecordT, IdAccessorT>::getRecord(index));
 
             if (base)
                 record2->mBase = record;
@@ -146,8 +145,7 @@ namespace CSMWorld
         }
         else
         {
-            std::unique_ptr<Record<ESXRecordT> > record2(
-                    new Record<ESXRecordT>(Collection<ESXRecordT, IdAccessorT>::getRecord(index)));
+            auto record2 = std::make_unique<Record<ESXRecordT>>(Collection<ESXRecordT, IdAccessorT>::getRecord(index));
             record2->mState = RecordBase::State_Deleted;
             this->setRecord(index, std::move(record2));
         }
diff --git a/apps/opencs/model/world/infocollection.cpp b/apps/opencs/model/world/infocollection.cpp
index a7cdc28d28..ced7938fc2 100644
--- a/apps/opencs/model/world/infocollection.cpp
+++ b/apps/opencs/model/world/infocollection.cpp
@@ -77,7 +77,7 @@ void CSMWorld::InfoCollection::load (const Info& record, bool base)
     if (index==-1)
     {
         // new record
-        std::unique_ptr<Record<Info> > record2(new Record<Info>);
+        auto record2 = std::make_unique<Record<Info>>();
         record2->mState = base ? RecordBase::State_BaseOnly : RecordBase::State_ModifiedOnly;
         (base ? record2->mBase : record2->mModified) = record;
 
@@ -86,7 +86,7 @@ void CSMWorld::InfoCollection::load (const Info& record, bool base)
     else
     {
         // old record
-        std::unique_ptr<Record<Info> > record2(new Record<Info>(getRecord(index)));
+        auto record2 = std::make_unique<Record<Info>>(getRecord(index));
 
         if (base)
             record2->mBase = record;
@@ -220,7 +220,7 @@ void CSMWorld::InfoCollection::load (ESM::ESMReader& reader, bool base, const ES
         }
         else
         {
-            std::unique_ptr<Record<Info> > record(new Record<Info>(getRecord(index)));
+            auto record = std::make_unique<Record<Info>>(getRecord(index));
             record->mState = RecordBase::State_Deleted;
             setRecord (index, std::move(record));
         }
@@ -281,7 +281,7 @@ void CSMWorld::InfoCollection::removeDialogueInfos(const std::string& dialogueId
             }
             else
             {
-                std::unique_ptr<Record<Info> > record2(new Record<Info>(record));
+                auto record2 = std::make_unique<Record<Info>>(record);
                 record2->mState = RecordBase::State_Deleted;
                 setRecord(range.first - getRecords().begin(), std::move(record2));
             }
@@ -335,7 +335,7 @@ void CSMWorld::InfoCollection::removeRows (int index, int count)
 
 void  CSMWorld::InfoCollection::appendBlankRecord (const std::string& id, UniversalId::Type type)
 {
-    std::unique_ptr<Record<Info> > record2(new Record<Info>);
+    auto record2 = std::make_unique<Record<Info>>();
 
     record2->mState = Record<Info>::State_ModifiedOnly;
     record2->mModified.blank();
diff --git a/apps/opencs/model/world/nestedidcollection.hpp b/apps/opencs/model/world/nestedidcollection.hpp
index 4af864eb42..1928786c78 100644
--- a/apps/opencs/model/world/nestedidcollection.hpp
+++ b/apps/opencs/model/world/nestedidcollection.hpp
@@ -90,7 +90,7 @@ namespace CSMWorld
     template<typename ESXRecordT, typename IdAccessorT>
     void NestedIdCollection<ESXRecordT, IdAccessorT>::addNestedRow(int row, int column, int position)
     {
-        std::unique_ptr<Record<ESXRecordT> > record(new Record<ESXRecordT>);
+        auto record = std::make_unique<Record<ESXRecordT>>();
         record->assign(Collection<ESXRecordT, IdAccessorT>::getRecord(row));
 
         getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column)).addRow(*record, position);
@@ -101,7 +101,7 @@ namespace CSMWorld
     template<typename ESXRecordT, typename IdAccessorT>
     void NestedIdCollection<ESXRecordT, IdAccessorT>::removeNestedRows(int row, int column, int subRow)
     {
-        std::unique_ptr<Record<ESXRecordT> > record(new Record<ESXRecordT>);
+        auto record = std::make_unique<Record<ESXRecordT>>();
         record->assign(Collection<ESXRecordT, IdAccessorT>::getRecord(row));
 
         getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column)).removeRow(*record, subRow);
@@ -121,7 +121,7 @@ namespace CSMWorld
     void NestedIdCollection<ESXRecordT, IdAccessorT>::setNestedData(int row,
             int column, const QVariant& data, int subRow, int subColumn)
     {
-        std::unique_ptr<Record<ESXRecordT> > record(new Record<ESXRecordT>);
+        auto record = std::make_unique<Record<ESXRecordT>>();
         record->assign(Collection<ESXRecordT, IdAccessorT>::getRecord(row));
 
         getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column)).setData(
@@ -142,7 +142,7 @@ namespace CSMWorld
     void NestedIdCollection<ESXRecordT, IdAccessorT>::setNestedTable(int row,
             int column, const CSMWorld::NestedTableWrapperBase& nestedTable)
     {
-        std::unique_ptr<Record<ESXRecordT> > record(new Record<ESXRecordT>);
+        auto record = std::make_unique<Record<ESXRecordT>>();
         record->assign(Collection<ESXRecordT, IdAccessorT>::getRecord(row));
 
         getAdapter(Collection<ESXRecordT, IdAccessorT>::getColumn(column)).setTable(
diff --git a/apps/opencs/model/world/nestedinfocollection.cpp b/apps/opencs/model/world/nestedinfocollection.cpp
index d404bb9a63..e2e90c49d1 100644
--- a/apps/opencs/model/world/nestedinfocollection.cpp
+++ b/apps/opencs/model/world/nestedinfocollection.cpp
@@ -35,7 +35,7 @@ namespace CSMWorld
 
     void NestedInfoCollection::addNestedRow(int row, int column, int position)
     {
-        std::unique_ptr<Record<Info> > record(new Record<Info>);
+        auto record = std::make_unique<Record<Info>>();
         record->assign(Collection<Info, IdAccessor<Info> >::getRecord(row));
 
         getAdapter(Collection<Info, IdAccessor<Info> >::getColumn(column)).addRow(*record, position);
@@ -45,7 +45,7 @@ namespace CSMWorld
 
     void NestedInfoCollection::removeNestedRows(int row, int column, int subRow)
     {
-        std::unique_ptr<Record<Info> > record(new Record<Info>);
+        auto record = std::make_unique<Record<Info>>();
         record->assign(Collection<Info, IdAccessor<Info> >::getRecord(row));
 
         getAdapter(Collection<Info, IdAccessor<Info> >::getColumn(column)).removeRow(*record, subRow);
@@ -63,7 +63,7 @@ namespace CSMWorld
     void NestedInfoCollection::setNestedData(int row,
             int column, const QVariant& data, int subRow, int subColumn)
     {
-        std::unique_ptr<Record<Info> > record(new Record<Info>);
+        auto record = std::make_unique<Record<Info>>();
         record->assign(Collection<Info, IdAccessor<Info> >::getRecord(row));
 
         getAdapter(Collection<Info, IdAccessor<Info> >::getColumn(column)).setData(
@@ -82,7 +82,7 @@ namespace CSMWorld
     void NestedInfoCollection::setNestedTable(int row,
             int column, const CSMWorld::NestedTableWrapperBase& nestedTable)
     {
-        std::unique_ptr<Record<Info> > record(new Record<Info>);
+        auto record = std::make_unique<Record<Info>>();
         record->assign(Collection<Info, IdAccessor<Info> >::getRecord(row));
 
         getAdapter(Collection<Info, IdAccessor<Info> >::getColumn(column)).setTable(
diff --git a/apps/opencs/model/world/refcollection.cpp b/apps/opencs/model/world/refcollection.cpp
index 76a3b7311a..804a13cf7b 100644
--- a/apps/opencs/model/world/refcollection.cpp
+++ b/apps/opencs/model/world/refcollection.cpp
@@ -123,7 +123,7 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
             ref.mId = getRecord(index).get().mId;
             ref.mIdNum = extractIdNum(ref.mId);
 
-            std::unique_ptr<Record<CellRef> > record(new Record<CellRef>);
+            auto record = std::make_unique<Record<CellRef>>();
             // TODO: check whether a base record be moved
             record->mState = base ? RecordBase::State_BaseOnly : RecordBase::State_ModifiedOnly;
             (base ? record->mBase : record->mModified) = std::move(ref);
@@ -158,7 +158,7 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
             }
             else
             {
-                std::unique_ptr<Record<CellRef> > record(new Record<CellRef>(getRecord(index)));
+                auto record = std::make_unique<Record<CellRef>>(getRecord(index));
                 record->mState = RecordBase::State_Deleted;
                 setRecord(index, std::move(record));
             }
@@ -174,7 +174,7 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
 
             cache.emplace(refNum, ref.mIdNum);
 
-            std::unique_ptr<Record<CellRef> > record(new Record<CellRef>);
+            auto record = std::make_unique<Record<CellRef>>();
             record->mState = base ? RecordBase::State_BaseOnly : RecordBase::State_ModifiedOnly;
             (base ? record->mBase : record->mModified) = std::move(ref);
 
@@ -205,7 +205,7 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
             ref.mId = getRecord(index).get().mId;
             ref.mIdNum = extractIdNum(ref.mId);
 
-            std::unique_ptr<Record<CellRef> > record(new Record<CellRef>(getRecord(index)));
+            auto record = std::make_unique<Record<CellRef>>(getRecord(index));
             record->mState = base ? RecordBase::State_BaseOnly : RecordBase::State_Modified;
             (base ? record->mBase : record->mModified) = std::move(ref);
 
@@ -273,7 +273,7 @@ void CSMWorld::RefCollection::removeRows (int index, int count)
 
 void  CSMWorld::RefCollection::appendBlankRecord (const std::string& id, UniversalId::Type type)
 {
-    std::unique_ptr<Record<CellRef> > record(new Record<CellRef>);
+    auto record = std::make_unique<Record<CellRef>>();
 
     record->mState = Record<CellRef>::State_ModifiedOnly;
     record->mModified.blank();
@@ -288,15 +288,15 @@ void CSMWorld::RefCollection::cloneRecord (const std::string& origin,
                                            const std::string& destination,
                                            const UniversalId::Type type)
 {
-   std::unique_ptr<Record<CellRef> > copy(new Record<CellRef>);
+    auto copy = std::make_unique<Record<CellRef>>();
 
-   copy->mModified = getRecord(origin).get();
-   copy->mState = RecordBase::State_ModifiedOnly;
+    copy->mModified = getRecord(origin).get();
+    copy->mState = RecordBase::State_ModifiedOnly;
 
-   copy->get().mId = destination;
-   copy->get().mIdNum = extractIdNum(destination);
+    copy->get().mId = destination;
+    copy->get().mIdNum = extractIdNum(destination);
 
-   insertRecord(std::move(copy), getAppendIndex(destination, type)); // call RefCollection::insertRecord()
+    insertRecord(std::move(copy), getAppendIndex(destination, type)); // call RefCollection::insertRecord()
 }
 
 int CSMWorld::RefCollection::searchId(std::string_view id) const
diff --git a/apps/opencs/model/world/refiddata.hpp b/apps/opencs/model/world/refiddata.hpp
index ff2232dffe..0b9fc66b53 100644
--- a/apps/opencs/model/world/refiddata.hpp
+++ b/apps/opencs/model/world/refiddata.hpp
@@ -130,7 +130,7 @@ namespace CSMWorld
     template<typename RecordT>
     void RefIdDataContainer<RecordT>::appendRecord (const std::string& id, bool base)
     {
-        std::unique_ptr<Record<RecordT> > record(new Record<RecordT>);
+        auto record = std::make_unique<Record<RecordT>>();
 
         record->mState = base ? RecordBase::State_BaseOnly : RecordBase::State_ModifiedOnly;
 
diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index b6aa5c2fd7..3395e90e11 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -85,7 +85,7 @@ bool CSVRender::Cell::addObjects (int start, int end)
         {
             std::string id = Misc::StringUtils::lowerCase (collection.getRecord (i).get().mId);
 
-            std::unique_ptr<Object> object (new Object (mData, mCellNode, id, false));
+            auto object = std::make_unique<Object>(mData, mCellNode, id, false);
 
             if (mSubModeElementMask & Mask_Reference)
                 object->setSubMode (mSubMode);
@@ -128,14 +128,14 @@ void CSVRender::Cell::updateLand()
             }
             else
             {
-                mTerrain.reset(new Terrain::TerrainGrid(mCellNode, mCellNode,
-                    mData.getResourceSystem().get(), mTerrainStorage, Mask_Terrain));
+                mTerrain = std::make_unique<Terrain::TerrainGrid>(mCellNode, mCellNode,
+                    mData.getResourceSystem().get(), mTerrainStorage, Mask_Terrain);
             }
 
             mTerrain->loadCell(esmLand.mX, esmLand.mY);
 
             if (!mCellBorder)
-                mCellBorder.reset(new CellBorder(mCellNode, mCoordinates));
+                mCellBorder = std::make_unique<CellBorder>(mCellNode, mCoordinates);
 
             mCellBorder->buildShape(esmLand);
 
@@ -186,8 +186,8 @@ CSVRender::Cell::Cell (CSMWorld::Data& data, osg::Group* rootNode, const std::st
 
         updateLand();
 
-        mPathgrid.reset(new Pathgrid(mData, mCellNode, mId, mCoordinates));
-        mCellWater.reset(new CellWater(mData, mCellNode, mId, mCoordinates));
+        mPathgrid = std::make_unique<Pathgrid>(mData, mCellNode, mId, mCoordinates);
+        mCellWater = std::make_unique<CellWater>(mData, mCellNode, mId, mCoordinates);
     }
 }
 
@@ -546,7 +546,7 @@ void CSVRender::Cell::setCellArrows (int mask)
         if (enable!=(mCellArrows[i].get()!=nullptr))
         {
             if (enable)
-                mCellArrows[i].reset (new CellArrow (mCellNode, direction, mCoordinates));
+                mCellArrows[i] = std::make_unique<CellArrow>(mCellNode, direction, mCoordinates);
             else
                 mCellArrows[i].reset (nullptr);
         }
@@ -567,7 +567,7 @@ void CSVRender::Cell::setCellMarker()
     }
 
     if (!isInteriorCell) {
-        mCellMarker.reset(new CellMarker(mCellNode, mCoordinates, cellExists));
+        mCellMarker = std::make_unique<CellMarker>(mCellNode, mCoordinates, cellExists);
     }
 }
 
diff --git a/apps/opencs/view/render/object.cpp b/apps/opencs/view/render/object.cpp
index 9f4fd29966..2def43df70 100644
--- a/apps/opencs/view/render/object.cpp
+++ b/apps/opencs/view/render/object.cpp
@@ -117,7 +117,7 @@ void CSVRender::Object::update()
     {
         if (recordType == CSMWorld::UniversalId::Type_Npc || recordType == CSMWorld::UniversalId::Type_Creature)
         {
-            if (!mActor) mActor.reset(new Actor(mReferenceableId, mData));
+            if (!mActor) mActor = std::make_unique<Actor>(mReferenceableId, mData);
             mActor->update();
             mBaseNode->addChild(mActor->getBaseNode());
         }
diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index a0b4de979d..09306174c1 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -55,8 +55,8 @@ bool CSVRender::PagedWorldspaceWidget::adjustCells()
                 {
                     modified = true;
 
-                    std::unique_ptr<Cell> cell (new Cell (mDocument.getData(), mRootNode,
-                        iter->first.getId (mWorldspace), deleted));
+                    auto cell = std::make_unique<Cell>(mDocument.getData(), mRootNode,
+                        iter->first.getId (mWorldspace), deleted);
 
                     delete iter->second;
                     iter->second = cell.release();
@@ -443,9 +443,7 @@ void CSVRender::PagedWorldspaceWidget::addCellToScene (
     bool deleted = index==-1 ||
         cells.getRecord (index).mState==CSMWorld::RecordBase::State_Deleted;
 
-    std::unique_ptr<Cell> cell (
-        new Cell (mDocument.getData(), mRootNode, coordinates.getId (mWorldspace),
-        deleted));
+    auto cell = std::make_unique<Cell>(mDocument.getData(), mRootNode, coordinates.getId (mWorldspace), deleted);
     EditMode *editMode = getEditMode();
     cell->setSubMode (editMode->getSubMode(), editMode->getInteractionMask());
 
diff --git a/apps/opencs/view/render/terrainshapemode.cpp b/apps/opencs/view/render/terrainshapemode.cpp
index baae1807fd..bd023b9b76 100644
--- a/apps/opencs/view/render/terrainshapemode.cpp
+++ b/apps/opencs/view/render/terrainshapemode.cpp
@@ -41,7 +41,7 @@ void CSVRender::TerrainShapeMode::activate(CSVWidget::SceneToolbar* toolbar)
 {
     if (!mTerrainShapeSelection)
     {
-        mTerrainShapeSelection.reset(new TerrainSelection(mParentNode, &getWorldspaceWidget(), TerrainSelectionType::Shape));
+        mTerrainShapeSelection = std::make_shared<TerrainSelection>(mParentNode, &getWorldspaceWidget(), TerrainSelectionType::Shape);
     }
 
     if(!mShapeBrushScenetool)
@@ -56,7 +56,7 @@ void CSVRender::TerrainShapeMode::activate(CSVWidget::SceneToolbar* toolbar)
     }
 
     if (!mBrushDraw)
-        mBrushDraw.reset(new BrushDraw(mParentNode));
+        mBrushDraw = std::make_unique<BrushDraw>(mParentNode);
 
     EditMode::activate(toolbar);
     toolbar->addTool (mShapeBrushScenetool);
@@ -956,15 +956,15 @@ bool CSVRender::TerrainShapeMode::limitAlteredHeights(const CSMWorld::CellCoordi
 
                     // Check for height limits on x-axis
                     if (leftHeight - thisHeight > limitHeightChange)
-                        limitedAlteredHeightXAxis.reset(new float(leftHeight - limitHeightChange - (thisHeight - thisAlteredHeight)));
+                        limitedAlteredHeightXAxis = std::make_unique<float>(leftHeight - limitHeightChange - (thisHeight - thisAlteredHeight));
                     else if (leftHeight - thisHeight < -limitHeightChange)
-                        limitedAlteredHeightXAxis.reset(new float(leftHeight + limitHeightChange - (thisHeight - thisAlteredHeight)));
+                        limitedAlteredHeightXAxis = std::make_unique<float>(leftHeight + limitHeightChange - (thisHeight - thisAlteredHeight));
 
                     // Check for height limits on y-axis
                     if (upHeight - thisHeight > limitHeightChange)
-                        limitedAlteredHeightYAxis.reset(new float(upHeight - limitHeightChange - (thisHeight - thisAlteredHeight)));
+                        limitedAlteredHeightYAxis = std::make_unique<float>(upHeight - limitHeightChange - (thisHeight - thisAlteredHeight));
                     else if (upHeight - thisHeight < -limitHeightChange)
-                        limitedAlteredHeightYAxis.reset(new float(upHeight + limitHeightChange - (thisHeight - thisAlteredHeight)));
+                        limitedAlteredHeightYAxis = std::make_unique<float>(upHeight + limitHeightChange - (thisHeight - thisAlteredHeight));
 
                     // Limit altered height value based on x or y, whichever is the smallest
                     compareAndLimit(cellCoords, inCellX, inCellY, limitedAlteredHeightXAxis.get(), limitedAlteredHeightYAxis.get(), &steepnessIsWithinLimits);
@@ -985,15 +985,15 @@ bool CSVRender::TerrainShapeMode::limitAlteredHeights(const CSMWorld::CellCoordi
 
                     // Check for height limits on x-axis
                     if (rightHeight - thisHeight > limitHeightChange)
-                        limitedAlteredHeightXAxis.reset(new float(rightHeight - limitHeightChange - (thisHeight - thisAlteredHeight)));
+                        limitedAlteredHeightXAxis = std::make_unique<float>(rightHeight - limitHeightChange - (thisHeight - thisAlteredHeight));
                     else if (rightHeight - thisHeight < -limitHeightChange)
-                        limitedAlteredHeightXAxis.reset(new float(rightHeight + limitHeightChange - (thisHeight - thisAlteredHeight)));
+                        limitedAlteredHeightXAxis = std::make_unique<float>(rightHeight + limitHeightChange - (thisHeight - thisAlteredHeight));
 
                     // Check for height limits on y-axis
                     if (downHeight - thisHeight > limitHeightChange)
-                        limitedAlteredHeightYAxis.reset(new float(downHeight - limitHeightChange - (thisHeight - thisAlteredHeight)));
+                        limitedAlteredHeightYAxis = std::make_unique<float>(downHeight - limitHeightChange - (thisHeight - thisAlteredHeight));
                     else if (downHeight - thisHeight < -limitHeightChange)
-                        limitedAlteredHeightYAxis.reset(new float(downHeight + limitHeightChange - (thisHeight - thisAlteredHeight)));
+                        limitedAlteredHeightYAxis = std::make_unique<float>(downHeight + limitHeightChange - (thisHeight - thisAlteredHeight));
 
                     // Limit altered height value based on x or y, whichever is the smallest
                     compareAndLimit(cellCoords, inCellX, inCellY, limitedAlteredHeightXAxis.get(), limitedAlteredHeightYAxis.get(), &steepnessIsWithinLimits);
@@ -1298,8 +1298,7 @@ bool CSVRender::TerrainShapeMode::allowLandShapeEditing(const std::string& cellI
 
         if (mode=="Create cell and land, then edit" && useTool)
         {
-            std::unique_ptr<CSMWorld::CreateCommand> createCommand (
-                new CSMWorld::CreateCommand (cellTable, cellId));
+            auto createCommand = std::make_unique<CSMWorld::CreateCommand>(cellTable, cellId);
             int parentIndex = cellTable.findColumnIndex (CSMWorld::Columns::ColumnId_Cell);
             int index = cellTable.findNestedColumnIndex (parentIndex, CSMWorld::Columns::ColumnId_Interior);
             createCommand->addNestedValue (parentIndex, index, false);
diff --git a/apps/opencs/view/render/terraintexturemode.cpp b/apps/opencs/view/render/terraintexturemode.cpp
index 113acd2a21..226ac36f3b 100644
--- a/apps/opencs/view/render/terraintexturemode.cpp
+++ b/apps/opencs/view/render/terraintexturemode.cpp
@@ -65,11 +65,11 @@ void CSVRender::TerrainTextureMode::activate(CSVWidget::SceneToolbar* toolbar)
 
     if (!mTerrainTextureSelection)
     {
-        mTerrainTextureSelection.reset(new TerrainSelection(mParentNode, &getWorldspaceWidget(), TerrainSelectionType::Texture));
+        mTerrainTextureSelection = std::make_shared<TerrainSelection>(mParentNode, &getWorldspaceWidget(), TerrainSelectionType::Texture);
     }
 
     if (!mBrushDraw)
-        mBrushDraw.reset(new BrushDraw(mParentNode, true));
+        mBrushDraw = std::make_unique<BrushDraw>(mParentNode, true);
 
     EditMode::activate(toolbar);
     toolbar->addTool (mTextureBrushScenetool);
@@ -662,8 +662,7 @@ bool CSVRender::TerrainTextureMode::allowLandTextureEditing(std::string cellId)
 
         if (mode=="Create cell and land, then edit")
         {
-            std::unique_ptr<CSMWorld::CreateCommand> createCommand (
-                new CSMWorld::CreateCommand (cellTable, cellId));
+            auto createCommand = std::make_unique<CSMWorld::CreateCommand>(cellTable, cellId);
             int parentIndex = cellTable.findColumnIndex (CSMWorld::Columns::ColumnId_Cell);
             int index = cellTable.findNestedColumnIndex (parentIndex, CSMWorld::Columns::ColumnId_Interior);
             createCommand->addNestedValue (parentIndex, index, false);
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.cpp b/apps/opencs/view/render/unpagedworldspacewidget.cpp
index 20dc5b8d1e..943de15691 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.cpp
@@ -56,7 +56,7 @@ CSVRender::UnpagedWorldspaceWidget::UnpagedWorldspaceWidget (const std::string&
 
     update();
 
-    mCell.reset (new Cell (document.getData(), mRootNode, mCellId));
+    mCell = std::make_unique<Cell>(document.getData(), mRootNode, mCellId);
 }
 
 void CSVRender::UnpagedWorldspaceWidget::cellDataChanged (const QModelIndex& topLeft,
@@ -105,7 +105,7 @@ bool CSVRender::UnpagedWorldspaceWidget::handleDrop (const std::vector<CSMWorld:
 
     mCellId = universalIdData.begin()->getId();
 
-    mCell.reset (new Cell (getDocument().getData(), mRootNode, mCellId));
+    mCell = std::make_unique<Cell>(getDocument().getData(), mRootNode, mCellId);
     mCamPositionSet = false;
     mOrbitCamControl->reset();
 
diff --git a/apps/opencs/view/world/creator.hpp b/apps/opencs/view/world/creator.hpp
index 516f71f15c..7c61c6e6be 100644
--- a/apps/opencs/view/world/creator.hpp
+++ b/apps/opencs/view/world/creator.hpp
@@ -96,7 +96,7 @@ namespace CSVWorld
     Creator *CreatorFactory<CreatorT, scope>::makeCreator (CSMDoc::Document& document,
                                                            const CSMWorld::UniversalId& id) const
     {
-        std::unique_ptr<CreatorT> creator (new CreatorT (document.getData(), document.getUndoStack(), id));
+        auto creator = std::make_unique<CreatorT>(document.getData(), document.getUndoStack(), id);
 
         creator->setScope (scope);
 
diff --git a/apps/opencs/view/world/dialoguesubview.cpp b/apps/opencs/view/world/dialoguesubview.cpp
index 152472f504..311c80a490 100644
--- a/apps/opencs/view/world/dialoguesubview.cpp
+++ b/apps/opencs/view/world/dialoguesubview.cpp
@@ -133,7 +133,7 @@ void CSVWorld::DialogueDelegateDispatcherProxy::editorDataCommited()
 
 void CSVWorld::DialogueDelegateDispatcherProxy::setIndex(const QModelIndex& index)
 {
-    mIndexWrapper.reset(new refWrapper(index));
+    mIndexWrapper = std::make_unique<refWrapper>(index);
 }
 
 QWidget* CSVWorld::DialogueDelegateDispatcherProxy::getEditor() const
diff --git a/apps/opencs/view/world/genericcreator.cpp b/apps/opencs/view/world/genericcreator.cpp
index 8ae8f8764d..7061c8a8b5 100644
--- a/apps/opencs/view/world/genericcreator.cpp
+++ b/apps/opencs/view/world/genericcreator.cpp
@@ -238,13 +238,13 @@ void CSVWorld::GenericCreator::create()
 
         if (mCloneMode)
         {
-            command.reset (new CSMWorld::CloneCommand (
-                dynamic_cast<CSMWorld::IdTable&> (*mData.getTableModel(mListId)), mClonedId, id, mClonedType));
+            command = std::make_unique<CSMWorld::CloneCommand>(
+                dynamic_cast<CSMWorld::IdTable&> (*mData.getTableModel(mListId)), mClonedId, id, mClonedType);
         }
         else
         {
-            command.reset (new CSMWorld::CreateCommand (
-                dynamic_cast<CSMWorld::IdTable&> (*mData.getTableModel (mListId)), id));
+            command = std::make_unique<CSMWorld::CreateCommand>(
+                dynamic_cast<CSMWorld::IdTable&> (*mData.getTableModel (mListId)), id);
 
         }
 

From c231c3e3605d465248a28299350932347257ab3f Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 29 May 2022 13:25:59 +0200
Subject: [PATCH 2542/2859] Replace new with make_unique in essimporter

---
 apps/essimporter/importer.cpp | 64 +++++++++++++++++------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/apps/essimporter/importer.cpp b/apps/essimporter/importer.cpp
index 0eb377c219..577185b8d9 100644
--- a/apps/essimporter/importer.cpp
+++ b/apps/essimporter/importer.cpp
@@ -273,38 +273,38 @@ namespace ESSImport
         const unsigned int recSPLM = ESM::fourCC("SPLM");
 
         std::map<unsigned int, std::unique_ptr<Converter>> converters;
-        converters[ESM::REC_GLOB] = std::unique_ptr<Converter>(new ConvertGlobal());
-        converters[ESM::REC_BOOK] = std::unique_ptr<Converter>(new ConvertBook());
-        converters[ESM::REC_NPC_] = std::unique_ptr<Converter>(new ConvertNPC());
-        converters[ESM::REC_CREA] = std::unique_ptr<Converter>(new ConvertCREA());
-        converters[ESM::REC_NPCC] = std::unique_ptr<Converter>(new ConvertNPCC());
-        converters[ESM::REC_CREC] = std::unique_ptr<Converter>(new ConvertCREC());
-        converters[recREFR      ] = std::unique_ptr<Converter>(new ConvertREFR());
-        converters[recPCDT      ] = std::unique_ptr<Converter>(new ConvertPCDT());
-        converters[recFMAP      ] = std::unique_ptr<Converter>(new ConvertFMAP());
-        converters[recKLST      ] = std::unique_ptr<Converter>(new ConvertKLST());
-        converters[recSTLN      ] = std::unique_ptr<Converter>(new ConvertSTLN());
-        converters[recGAME      ] = std::unique_ptr<Converter>(new ConvertGAME());
-        converters[ESM::REC_CELL] = std::unique_ptr<Converter>(new ConvertCell());
-        converters[ESM::REC_ALCH] = std::unique_ptr<Converter>(new DefaultConverter<ESM::Potion>());
-        converters[ESM::REC_CLAS] = std::unique_ptr<Converter>(new ConvertClass());
-        converters[ESM::REC_SPEL] = std::unique_ptr<Converter>(new DefaultConverter<ESM::Spell>());
-        converters[ESM::REC_ARMO] = std::unique_ptr<Converter>(new DefaultConverter<ESM::Armor>());
-        converters[ESM::REC_WEAP] = std::unique_ptr<Converter>(new DefaultConverter<ESM::Weapon>());
-        converters[ESM::REC_CLOT] = std::unique_ptr<Converter>(new DefaultConverter<ESM::Clothing>());
-        converters[ESM::REC_ENCH] = std::unique_ptr<Converter>(new DefaultConverter<ESM::Enchantment>());
-        converters[ESM::REC_WEAP] = std::unique_ptr<Converter>(new DefaultConverter<ESM::Weapon>());
-        converters[ESM::REC_LEVC] = std::unique_ptr<Converter>(new DefaultConverter<ESM::CreatureLevList>());
-        converters[ESM::REC_LEVI] = std::unique_ptr<Converter>(new DefaultConverter<ESM::ItemLevList>());
-        converters[ESM::REC_CNTC] = std::unique_ptr<Converter>(new ConvertCNTC());
-        converters[ESM::REC_FACT] = std::unique_ptr<Converter>(new ConvertFACT());
-        converters[ESM::REC_INFO] = std::unique_ptr<Converter>(new ConvertINFO());
-        converters[ESM::REC_DIAL] = std::unique_ptr<Converter>(new ConvertDIAL());
-        converters[ESM::REC_QUES] = std::unique_ptr<Converter>(new ConvertQUES());
-        converters[recJOUR      ] = std::unique_ptr<Converter>(new ConvertJOUR());
-        converters[ESM::REC_SCPT] = std::unique_ptr<Converter>(new ConvertSCPT());
-        converters[ESM::REC_PROJ] = std::unique_ptr<Converter>(new ConvertPROJ());
-        converters[recSPLM] = std::unique_ptr<Converter>(new ConvertSPLM());
+        converters[ESM::REC_GLOB] = std::make_unique<ConvertGlobal>();
+        converters[ESM::REC_BOOK] = std::make_unique<ConvertBook>();
+        converters[ESM::REC_NPC_] = std::make_unique<ConvertNPC>();
+        converters[ESM::REC_CREA] = std::make_unique<ConvertCREA>();
+        converters[ESM::REC_NPCC] = std::make_unique<ConvertNPCC>();
+        converters[ESM::REC_CREC] = std::make_unique<ConvertCREC>();
+        converters[recREFR      ] = std::make_unique<ConvertREFR>();
+        converters[recPCDT      ] = std::make_unique<ConvertPCDT>();
+        converters[recFMAP      ] = std::make_unique<ConvertFMAP>();
+        converters[recKLST      ] = std::make_unique<ConvertKLST>();
+        converters[recSTLN      ] = std::make_unique<ConvertSTLN>();
+        converters[recGAME      ] = std::make_unique<ConvertGAME>();
+        converters[ESM::REC_CELL] = std::make_unique<ConvertCell>();
+        converters[ESM::REC_ALCH] = std::make_unique<DefaultConverter<ESM::Potion>>();
+        converters[ESM::REC_CLAS] = std::make_unique<ConvertClass>();
+        converters[ESM::REC_SPEL] = std::make_unique<DefaultConverter<ESM::Spell>>();
+        converters[ESM::REC_ARMO] = std::make_unique<DefaultConverter<ESM::Armor>>();
+        converters[ESM::REC_WEAP] = std::make_unique<DefaultConverter<ESM::Weapon>>();
+        converters[ESM::REC_CLOT] = std::make_unique<DefaultConverter<ESM::Clothing>>();
+        converters[ESM::REC_ENCH] = std::make_unique<DefaultConverter<ESM::Enchantment>>();
+        converters[ESM::REC_WEAP] = std::make_unique<DefaultConverter<ESM::Weapon>>();
+        converters[ESM::REC_LEVC] = std::make_unique<DefaultConverter<ESM::CreatureLevList>>();
+        converters[ESM::REC_LEVI] = std::make_unique<DefaultConverter<ESM::ItemLevList>>();
+        converters[ESM::REC_CNTC] = std::make_unique<ConvertCNTC>();
+        converters[ESM::REC_FACT] = std::make_unique<ConvertFACT>();
+        converters[ESM::REC_INFO] = std::make_unique<ConvertINFO>();
+        converters[ESM::REC_DIAL] = std::make_unique<ConvertDIAL>();
+        converters[ESM::REC_QUES] = std::make_unique<ConvertQUES>();
+        converters[recJOUR      ] = std::make_unique<ConvertJOUR>();
+        converters[ESM::REC_SCPT] = std::make_unique<ConvertSCPT>();
+        converters[ESM::REC_PROJ] = std::make_unique<ConvertPROJ>();
+        converters[recSPLM] = std::make_unique<ConvertSPLM>();
 
         // TODO:
         // - REGN (weather in certain regions?)

From aeb3733e575a3ca73f48f074ba703f27004306d5 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sun, 29 May 2022 21:16:00 +0200
Subject: [PATCH 2543/2859] Remove boost:: constructs

Namely boost::scoped_array and boost::to_lower_copy.
---
 components/bsa/compressedbsafile.cpp | 15 +++++++--------
 components/esm4/reader.cpp           |  6 +++---
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/components/bsa/compressedbsafile.cpp b/components/bsa/compressedbsafile.cpp
index 6c0eb47319..337b03b6cb 100644
--- a/components/bsa/compressedbsafile.cpp
+++ b/components/bsa/compressedbsafile.cpp
@@ -31,7 +31,6 @@
 
 #include <lz4frame.h>
 
-#include <boost/scoped_array.hpp>
 
 #include <boost/iostreams/filtering_streambuf.hpp>
 #include <boost/iostreams/copy.hpp>
@@ -89,19 +88,19 @@ void CompressedBSAFile::getBZString(std::string& str, std::istream& filestream)
     char size = 0;
     filestream.read(&size, 1);
 
-    boost::scoped_array<char> buf(new char[size]);
-    filestream.read(buf.get(), size);
+    auto buf = std::vector<char>(size);
+    filestream.read(buf.data(), size);
 
     if (buf[size - 1] != 0)
     {
-        str.assign(buf.get(), size);
+        str.assign(buf.data(), size);
         if (str.size() != ((size_t)size)) {
             fail("getBZString string size mismatch");
         }
     }
     else
     {
-        str.assign(buf.get(), size - 1); // don't copy null terminator
+        str.assign(buf.data(), size - 1); // don't copy null terminator
         if (str.size() != ((size_t)size - 1)) {
             fail("getBZString string size mismatch (null terminator)");
         }
@@ -384,12 +383,12 @@ Files::IStreamPtr CompressedBSAFile::getFile(const FileRecord& fileRecord)
         }
         else // SSE: lz4
         {
-            boost::scoped_array<char> buffer(new char[size]);
-            fileStream->read(buffer.get(), size);
+            auto buffer = std::vector<char>(size);
+            fileStream->read(buffer.data(), size);
             LZ4F_decompressionContext_t context = nullptr;
             LZ4F_createDecompressionContext(&context, LZ4F_VERSION);
             LZ4F_decompressOptions_t options = {};
-            LZ4F_errorCode_t errorCode = LZ4F_decompress(context, memoryStreamPtr->getRawData(), &uncompressedSize, buffer.get(), &size, &options);
+            LZ4F_errorCode_t errorCode = LZ4F_decompress(context, memoryStreamPtr->getRawData(), &uncompressedSize, buffer.data(), &size, &options);
             if (LZ4F_isError(errorCode))
                 fail("LZ4 decompression error (file " + mFilename + "): " + LZ4F_getErrorName(errorCode));
             errorCode = LZ4F_freeDecompressionContext(context);
diff --git a/components/esm4/reader.cpp b/components/esm4/reader.cpp
index 3966a18bc4..19649c4fa6 100644
--- a/components/esm4/reader.cpp
+++ b/components/esm4/reader.cpp
@@ -46,9 +46,9 @@
 #endif
 #include <boost/iostreams/filtering_streambuf.hpp>
 #include <boost/iostreams/copy.hpp>
-#include <boost/algorithm/string.hpp>
 
 #include <components/bsa/memorystream.hpp>
+#include <components/misc/stringops.hpp>
 
 #include "formid.hpp"
 
@@ -559,14 +559,14 @@ void Reader::updateModIndices(const std::vector<std::string>& files)
     std::unordered_map<std::string, size_t> fileIndex;
 
     for (size_t i = 0; i < files.size(); ++i) // ATTENTION: assumes current file is not included
-        fileIndex[boost::to_lower_copy<std::string>(files[i])] = i;
+        fileIndex[Misc::StringUtils::lowerCase(files[i])] = i;
 
     mCtx.parentFileIndices.resize(mHeader.mMaster.size());
     for (unsigned int i = 0; i < mHeader.mMaster.size(); ++i)
     {
         // locate the position of the dependency in already loaded files
         std::unordered_map<std::string, size_t>::const_iterator it
-            = fileIndex.find(boost::to_lower_copy<std::string>(mHeader.mMaster[i].name));
+            = fileIndex.find(Misc::StringUtils::lowerCase(mHeader.mMaster[i].name));
 
         if (it != fileIndex.end())
             mCtx.parentFileIndices[i] = (std::uint32_t)((it->second << 24) & 0xff000000);

From 248e3d3c2eb15cdc56ac488ed08d1668afc98ece Mon Sep 17 00:00:00 2001
From: Benjamin Winger <bmw@disroot.org>
Date: Sun, 29 May 2022 19:32:53 +0000
Subject: [PATCH 2544/2859] macOS CI changes

---
 .gitlab-ci.yml | 2 +-
 CMakeLists.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4dc0bf952c..667f007660 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -310,7 +310,7 @@ Ubuntu_Clang_tests_Debug:
   stage: build
   only:
     variables:
-      - $CI_PROJECT_ID == "7107382" && $CI_PIPELINE_SOURCE == "push"
+      - $CI_PROJECT_ID == "7107382"
   cache:
     paths:
     - ccache/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 074b1bcd33..5008d369dd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -251,7 +251,7 @@ set(USED_OSG_PLUGINS
 
 option(OPENMW_USE_SYSTEM_ICU "Use system ICU library instead of internal. If disabled, requires autotools" ON)
 if(OPENMW_USE_SYSTEM_ICU)
-    find_package(ICU REQUIRED COMPONENTS uc i18n)
+    find_package(ICU REQUIRED COMPONENTS uc i18n data)
 endif()
 
 option(OPENMW_USE_SYSTEM_YAML_CPP "Use system yaml-cpp library instead of internal." ON)

From bb495bffeb810f9ef54992ba3b6df9b476be4b09 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 29 May 2022 22:12:30 +0200
Subject: [PATCH 2545/2859] 0 initialize mRecordFlags

---
 components/esm3/filter.cpp      | 1 +
 components/esm3/loadacti.cpp    | 1 +
 components/esm3/loadalch.cpp    | 1 +
 components/esm3/loadappa.cpp    | 1 +
 components/esm3/loadarmo.cpp    | 1 +
 components/esm3/loadbody.cpp    | 1 +
 components/esm3/loadbook.cpp    | 1 +
 components/esm3/loadbsgn.cpp    | 1 +
 components/esm3/loadclas.cpp    | 1 +
 components/esm3/loadclot.cpp    | 1 +
 components/esm3/loadcont.cpp    | 1 +
 components/esm3/loadcrea.cpp    | 1 +
 components/esm3/loaddoor.cpp    | 1 +
 components/esm3/loadench.cpp    | 1 +
 components/esm3/loadfact.cpp    | 1 +
 components/esm3/loadglob.cpp    | 1 +
 components/esm3/loadgmst.cpp    | 1 +
 components/esm3/loadingr.cpp    | 1 +
 components/esm3/loadlevlist.cpp | 1 +
 components/esm3/loadligh.cpp    | 1 +
 components/esm3/loadlock.cpp    | 1 +
 components/esm3/loadmgef.cpp    | 1 +
 components/esm3/loadmisc.cpp    | 1 +
 components/esm3/loadnpc.cpp     | 1 +
 components/esm3/loadprob.cpp    | 1 +
 components/esm3/loadrace.cpp    | 1 +
 components/esm3/loadregn.cpp    | 1 +
 components/esm3/loadrepa.cpp    | 1 +
 components/esm3/loadscpt.cpp    | 1 +
 components/esm3/loadskil.cpp    | 1 +
 components/esm3/loadsndg.cpp    | 1 +
 components/esm3/loadsoun.cpp    | 1 +
 components/esm3/loadspel.cpp    | 1 +
 components/esm3/loadsscr.cpp    | 1 +
 components/esm3/loadstat.cpp    | 1 +
 components/esm3/loadweap.cpp    | 1 +
 36 files changed, 36 insertions(+)

diff --git a/components/esm3/filter.cpp b/components/esm3/filter.cpp
index d432f789d3..4c6f56def7 100644
--- a/components/esm3/filter.cpp
+++ b/components/esm3/filter.cpp
@@ -56,6 +56,7 @@ void Filter::save (ESMWriter& esm, bool isDeleted) const
 
 void Filter::blank()
 {
+    mRecordFlags = 0;
     mFilter.clear();
     mDescription.clear();
 }
diff --git a/components/esm3/loadacti.cpp b/components/esm3/loadacti.cpp
index a8689bf78c..89b5b85fbd 100644
--- a/components/esm3/loadacti.cpp
+++ b/components/esm3/loadacti.cpp
@@ -62,6 +62,7 @@ namespace ESM
 
     void Activator::blank()
     {
+        mRecordFlags = 0;
         mName.clear();
         mScript.clear();
         mModel.clear();
diff --git a/components/esm3/loadalch.cpp b/components/esm3/loadalch.cpp
index 888e049079..9632e26fd9 100644
--- a/components/esm3/loadalch.cpp
+++ b/components/esm3/loadalch.cpp
@@ -80,6 +80,7 @@ namespace ESM
 
     void Potion::blank()
     {
+        mRecordFlags = 0;
         mData.mWeight = 0;
         mData.mValue = 0;
         mData.mAutoCalc = 0;
diff --git a/components/esm3/loadappa.cpp b/components/esm3/loadappa.cpp
index 8bf87f1e69..009f0bc53f 100644
--- a/components/esm3/loadappa.cpp
+++ b/components/esm3/loadappa.cpp
@@ -75,6 +75,7 @@ namespace ESM
 
     void Apparatus::blank()
     {
+        mRecordFlags = 0;
         mData.mType = 0;
         mData.mQuality = 0;
         mData.mWeight = 0;
diff --git a/components/esm3/loadarmo.cpp b/components/esm3/loadarmo.cpp
index 77cfd2ff39..86e3eb19cd 100644
--- a/components/esm3/loadarmo.cpp
+++ b/components/esm3/loadarmo.cpp
@@ -115,6 +115,7 @@ namespace ESM
 
     void Armor::blank()
     {
+        mRecordFlags = 0;
         mData.mType = 0;
         mData.mWeight = 0;
         mData.mValue = 0;
diff --git a/components/esm3/loadbody.cpp b/components/esm3/loadbody.cpp
index 0275f3a63e..0075c51dd8 100644
--- a/components/esm3/loadbody.cpp
+++ b/components/esm3/loadbody.cpp
@@ -67,6 +67,7 @@ namespace ESM
 
     void BodyPart::blank()
     {
+        mRecordFlags = 0;
         mData.mPart = 0;
         mData.mVampire = 0;
         mData.mFlags = 0;
diff --git a/components/esm3/loadbook.cpp b/components/esm3/loadbook.cpp
index 2845e67622..aef30e650a 100644
--- a/components/esm3/loadbook.cpp
+++ b/components/esm3/loadbook.cpp
@@ -82,6 +82,7 @@ namespace ESM
 
     void Book::blank()
     {
+        mRecordFlags = 0;
         mData.mWeight = 0;
         mData.mValue = 0;
         mData.mIsScroll = 0;
diff --git a/components/esm3/loadbsgn.cpp b/components/esm3/loadbsgn.cpp
index 5be175e72e..f037de5059 100644
--- a/components/esm3/loadbsgn.cpp
+++ b/components/esm3/loadbsgn.cpp
@@ -69,6 +69,7 @@ namespace ESM
 
     void BirthSign::blank()
     {
+        mRecordFlags = 0;
         mName.clear();
         mDescription.clear();
         mTexture.clear();
diff --git a/components/esm3/loadclas.cpp b/components/esm3/loadclas.cpp
index 9b34fbd541..8c12a268a3 100644
--- a/components/esm3/loadclas.cpp
+++ b/components/esm3/loadclas.cpp
@@ -98,6 +98,7 @@ namespace ESM
 
     void Class::blank()
     {
+        mRecordFlags = 0;
         mName.clear();
         mDescription.clear();
 
diff --git a/components/esm3/loadclot.cpp b/components/esm3/loadclot.cpp
index ea87d1566b..4267602119 100644
--- a/components/esm3/loadclot.cpp
+++ b/components/esm3/loadclot.cpp
@@ -88,6 +88,7 @@ namespace ESM
 
     void Clothing::blank()
     {
+        mRecordFlags = 0;
         mData.mType = 0;
         mData.mWeight = 0;
         mData.mValue = 0;
diff --git a/components/esm3/loadcont.cpp b/components/esm3/loadcont.cpp
index b74f9f2ba2..83aa3d0935 100644
--- a/components/esm3/loadcont.cpp
+++ b/components/esm3/loadcont.cpp
@@ -112,6 +112,7 @@ namespace ESM
 
     void Container::blank()
     {
+        mRecordFlags = 0;
         mName.clear();
         mModel.clear();
         mScript.clear();
diff --git a/components/esm3/loadcrea.cpp b/components/esm3/loadcrea.cpp
index c9d4e6ad14..ecd58615e1 100644
--- a/components/esm3/loadcrea.cpp
+++ b/components/esm3/loadcrea.cpp
@@ -138,6 +138,7 @@ namespace ESM
 
     void Creature::blank()
     {
+        mRecordFlags = 0;
         mData.mType = 0;
         mData.mLevel = 0;
         mData.mStrength = mData.mIntelligence = mData.mWillpower = mData.mAgility =
diff --git a/components/esm3/loaddoor.cpp b/components/esm3/loaddoor.cpp
index c866fc96c0..7aa6b3a17b 100644
--- a/components/esm3/loaddoor.cpp
+++ b/components/esm3/loaddoor.cpp
@@ -71,6 +71,7 @@ namespace ESM
 
     void Door::blank()
     {
+        mRecordFlags = 0;
         mName.clear();
         mModel.clear();
         mScript.clear();
diff --git a/components/esm3/loadench.cpp b/components/esm3/loadench.cpp
index 533ba154b7..25bf23748e 100644
--- a/components/esm3/loadench.cpp
+++ b/components/esm3/loadench.cpp
@@ -64,6 +64,7 @@ namespace ESM
 
     void Enchantment::blank()
     {
+        mRecordFlags = 0;
         mData.mType = 0;
         mData.mCost = 0;
         mData.mCharge = 0;
diff --git a/components/esm3/loadfact.cpp b/components/esm3/loadfact.cpp
index 513f8c3199..e18d490f9e 100644
--- a/components/esm3/loadfact.cpp
+++ b/components/esm3/loadfact.cpp
@@ -116,6 +116,7 @@ namespace ESM
 
     void Faction::blank()
     {
+        mRecordFlags = 0;
         mName.clear();
         mData.mAttribute[0] = mData.mAttribute[1] = 0;
         mData.mIsHidden = 0;
diff --git a/components/esm3/loadglob.cpp b/components/esm3/loadglob.cpp
index cc2188a5b5..ea4a4256ee 100644
--- a/components/esm3/loadglob.cpp
+++ b/components/esm3/loadglob.cpp
@@ -42,6 +42,7 @@ namespace ESM
 
     void Global::blank()
     {
+        mRecordFlags = 0;
         mValue.setType (VT_None);
     }
 
diff --git a/components/esm3/loadgmst.cpp b/components/esm3/loadgmst.cpp
index 31439dc268..4a02696948 100644
--- a/components/esm3/loadgmst.cpp
+++ b/components/esm3/loadgmst.cpp
@@ -25,6 +25,7 @@ namespace ESM
 
     void GameSetting::blank()
     {
+        mRecordFlags = 0;
         mValue.setType (VT_None);
     }
 
diff --git a/components/esm3/loadingr.cpp b/components/esm3/loadingr.cpp
index ea10da42b9..f746ff32cf 100644
--- a/components/esm3/loadingr.cpp
+++ b/components/esm3/loadingr.cpp
@@ -98,6 +98,7 @@ namespace ESM
 
     void Ingredient::blank()
     {
+        mRecordFlags = 0;
         mData.mWeight = 0;
         mData.mValue = 0;
         for (int i=0; i<4; ++i)
diff --git a/components/esm3/loadlevlist.cpp b/components/esm3/loadlevlist.cpp
index 51055103bf..d16ab89231 100644
--- a/components/esm3/loadlevlist.cpp
+++ b/components/esm3/loadlevlist.cpp
@@ -98,6 +98,7 @@ namespace ESM
 
     void LevelledListBase::blank()
     {
+        mRecordFlags = 0;
         mFlags = 0;
         mChanceNone = 0;
         mList.clear();
diff --git a/components/esm3/loadligh.cpp b/components/esm3/loadligh.cpp
index da45674e85..7c9281bbd1 100644
--- a/components/esm3/loadligh.cpp
+++ b/components/esm3/loadligh.cpp
@@ -78,6 +78,7 @@ namespace ESM
 
     void Light::blank()
     {
+        mRecordFlags = 0;
         mData.mWeight = 0;
         mData.mValue = 0;
         mData.mTime = 0;
diff --git a/components/esm3/loadlock.cpp b/components/esm3/loadlock.cpp
index e298001cb6..7d80a77b8a 100644
--- a/components/esm3/loadlock.cpp
+++ b/components/esm3/loadlock.cpp
@@ -76,6 +76,7 @@ namespace ESM
 
     void Lockpick::blank()
     {
+        mRecordFlags = 0;
         mData.mWeight = 0;
         mData.mValue = 0;
         mData.mQuality = 0;
diff --git a/components/esm3/loadmgef.cpp b/components/esm3/loadmgef.cpp
index 5fb88a3606..973acd050c 100644
--- a/components/esm3/loadmgef.cpp
+++ b/components/esm3/loadmgef.cpp
@@ -578,6 +578,7 @@ MagicEffect::MagnitudeDisplayType MagicEffect::getMagnitudeDisplayType() const {
 
     void MagicEffect::blank()
     {
+        mRecordFlags = 0;
         mData.mSchool = 0;
         mData.mBaseCost = 0;
         mData.mFlags = 0;
diff --git a/components/esm3/loadmisc.cpp b/components/esm3/loadmisc.cpp
index db6a050a24..932e3d60a3 100644
--- a/components/esm3/loadmisc.cpp
+++ b/components/esm3/loadmisc.cpp
@@ -75,6 +75,7 @@ namespace ESM
 
     void Miscellaneous::blank()
     {
+        mRecordFlags = 0;
         mData.mWeight = 0;
         mData.mValue = 0;
         mData.mIsKey = 0;
diff --git a/components/esm3/loadnpc.cpp b/components/esm3/loadnpc.cpp
index dc91c5ea0c..117c545b84 100644
--- a/components/esm3/loadnpc.cpp
+++ b/components/esm3/loadnpc.cpp
@@ -189,6 +189,7 @@ namespace ESM
 
     void NPC::blank()
     {
+        mRecordFlags = 0;
         mNpdtType = NPC_DEFAULT;
         blankNpdt();
         mBloodType = 0;
diff --git a/components/esm3/loadprob.cpp b/components/esm3/loadprob.cpp
index 6299286ea8..3acd68dbd8 100644
--- a/components/esm3/loadprob.cpp
+++ b/components/esm3/loadprob.cpp
@@ -76,6 +76,7 @@ namespace ESM
 
     void Probe::blank()
     {
+        mRecordFlags = 0;
         mData.mWeight = 0;
         mData.mValue = 0;
         mData.mQuality = 0;
diff --git a/components/esm3/loadrace.cpp b/components/esm3/loadrace.cpp
index e2b5a1fcf8..9d2880f1bc 100644
--- a/components/esm3/loadrace.cpp
+++ b/components/esm3/loadrace.cpp
@@ -81,6 +81,7 @@ namespace ESM
 
     void Race::blank()
     {
+        mRecordFlags = 0;
         mName.clear();
         mDescription.clear();
 
diff --git a/components/esm3/loadregn.cpp b/components/esm3/loadregn.cpp
index 4f097a5e2b..7af3e532f5 100644
--- a/components/esm3/loadregn.cpp
+++ b/components/esm3/loadregn.cpp
@@ -106,6 +106,7 @@ namespace ESM
 
     void Region::blank()
     {
+        mRecordFlags = 0;
         mData.mClear = mData.mCloudy = mData.mFoggy = mData.mOvercast = mData.mRain =
             mData.mThunder = mData.mAsh = mData.mBlight = mData.mA = mData.mB = 0;
 
diff --git a/components/esm3/loadrepa.cpp b/components/esm3/loadrepa.cpp
index 8d09083cad..26ec851317 100644
--- a/components/esm3/loadrepa.cpp
+++ b/components/esm3/loadrepa.cpp
@@ -76,6 +76,7 @@ namespace ESM
 
     void Repair::blank()
     {
+        mRecordFlags = 0;
         mData.mWeight = 0;
         mData.mValue = 0;
         mData.mQuality = 0;
diff --git a/components/esm3/loadscpt.cpp b/components/esm3/loadscpt.cpp
index 1e5d342fa3..0bb1916370 100644
--- a/components/esm3/loadscpt.cpp
+++ b/components/esm3/loadscpt.cpp
@@ -181,6 +181,7 @@ namespace ESM
 
     void Script::blank()
     {
+        mRecordFlags = 0;
         mData.mNumShorts = mData.mNumLongs = mData.mNumFloats = 0;
         mData.mScriptDataSize = 0;
         mData.mStringTableSize = 0;
diff --git a/components/esm3/loadskil.cpp b/components/esm3/loadskil.cpp
index 86ffda4fd9..98b965398e 100644
--- a/components/esm3/loadskil.cpp
+++ b/components/esm3/loadskil.cpp
@@ -173,6 +173,7 @@ namespace ESM
 
     void Skill::blank()
     {
+        mRecordFlags = 0;
         mData.mAttribute = 0;
         mData.mSpecialization = 0;
         mData.mUseValue[0] = mData.mUseValue[1] = mData.mUseValue[2] = mData.mUseValue[3] = 1.0;
diff --git a/components/esm3/loadsndg.cpp b/components/esm3/loadsndg.cpp
index 9113d1ac3d..90231ebd9b 100644
--- a/components/esm3/loadsndg.cpp
+++ b/components/esm3/loadsndg.cpp
@@ -67,6 +67,7 @@ namespace ESM
 
     void SoundGenerator::blank()
     {
+        mRecordFlags = 0;
         mType = LeftFoot;
         mCreature.clear();
         mSound.clear();
diff --git a/components/esm3/loadsoun.cpp b/components/esm3/loadsoun.cpp
index 9904d5d0fb..552132cd8d 100644
--- a/components/esm3/loadsoun.cpp
+++ b/components/esm3/loadsoun.cpp
@@ -63,6 +63,7 @@ namespace ESM
 
     void Sound::blank()
     {
+        mRecordFlags = 0;
         mSound.clear();
 
         mData.mVolume = 128;
diff --git a/components/esm3/loadspel.cpp b/components/esm3/loadspel.cpp
index bb0c866c5e..eb1f5748e7 100644
--- a/components/esm3/loadspel.cpp
+++ b/components/esm3/loadspel.cpp
@@ -71,6 +71,7 @@ namespace ESM
 
     void Spell::blank()
     {
+        mRecordFlags = 0;
         mData.mType = 0;
         mData.mCost = 0;
         mData.mFlags = 0;
diff --git a/components/esm3/loadsscr.cpp b/components/esm3/loadsscr.cpp
index 3f7a4fe19d..f24b2ef997 100644
--- a/components/esm3/loadsscr.cpp
+++ b/components/esm3/loadsscr.cpp
@@ -58,6 +58,7 @@ namespace ESM
 
     void StartScript::blank()
     {
+        mRecordFlags = 0;
         mData.clear();
     }
 }
diff --git a/components/esm3/loadstat.cpp b/components/esm3/loadstat.cpp
index cb7c9fa2df..5bd98b086e 100644
--- a/components/esm3/loadstat.cpp
+++ b/components/esm3/loadstat.cpp
@@ -56,6 +56,7 @@ namespace ESM
 
     void Static::blank()
     {
+        mRecordFlags = 0;
         mModel.clear();
     }
 }
diff --git a/components/esm3/loadweap.cpp b/components/esm3/loadweap.cpp
index 696194f969..e1f63a26c6 100644
--- a/components/esm3/loadweap.cpp
+++ b/components/esm3/loadweap.cpp
@@ -77,6 +77,7 @@ namespace ESM
 
     void Weapon::blank()
     {
+        mRecordFlags = 0;
         mData.mWeight = 0;
         mData.mValue = 0;
         mData.mType = 0;

From a6d46ecc75bfff310582879a14f6d2192ffa0509 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sun, 29 May 2022 23:27:50 +0200
Subject: [PATCH 2546/2859] Don't pass a std::string to C's sprintf

This should fix #6762
---
 apps/openmw/mwgui/waitdialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/waitdialog.cpp b/apps/openmw/mwgui/waitdialog.cpp
index 9cda792a86..6fd96ea554 100644
--- a/apps/openmw/mwgui/waitdialog.cpp
+++ b/apps/openmw/mwgui/waitdialog.cpp
@@ -160,7 +160,7 @@ namespace MWGui
 
         ESM::EpochTimeStamp currentDate = MWBase::Environment::get().getWorld()->getEpochTimeStamp();
         int daysPassed = MWBase::Environment::get().getWorld()->getTimeStamp().getDay();
-        std::string formattedHour = pm ? "#{sSaveMenuHelp05}" : "#{sSaveMenuHelp04}";
+        const char* formattedHour = pm ? "#{sSaveMenuHelp05}" : "#{sSaveMenuHelp04}";
         std::string dateTimeText = Misc::StringUtils::format("%i %s (#{sDay} %i) %i %s", currentDate.mDay, month, daysPassed, hour, formattedHour);
         mDateTimeText->setCaptionWithReplacing (dateTimeText);
     }

From 3d0adf259b5a583d74f8ff6c6289c802e0ab6c5f Mon Sep 17 00:00:00 2001
From: Kindi <2538602-Kuyondo@users.noreply.gitlab.com>
Date: Sun, 29 May 2022 23:03:36 +0000
Subject: [PATCH 2547/2859] Lua API for Apparatus records

---
 apps/openmw/CMakeLists.txt            |  2 +-
 apps/openmw/mwlua/types/apparatus.cpp | 42 +++++++++++++++++++++++++++
 apps/openmw/mwlua/types/types.cpp     |  2 +-
 apps/openmw/mwlua/types/types.hpp     |  1 +
 files/lua_api/openmw/types.lua        | 28 ++++++++++++++++++
 5 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 apps/openmw/mwlua/types/apparatus.cpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 0ccb517a33..21fb2a6ca5 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -62,7 +62,7 @@ add_openmw_dir (mwlua
     luamanagerimp object worldview userdataserializer eventqueue
     luabindings localscripts playerscripts objectbindings cellbindings asyncbindings settingsbindings
     camerabindings uibindings inputbindings nearbybindings postprocessingbindings stats debugbindings
-    types/types types/door types/actor types/container types/weapon types/npc types/creature types/activator types/book types/lockpick types/probe
+    types/types types/door types/actor types/container types/weapon types/npc types/creature types/activator types/book types/lockpick types/probe types/apparatus
     )
 
 add_openmw_dir (mwsound
diff --git a/apps/openmw/mwlua/types/apparatus.cpp b/apps/openmw/mwlua/types/apparatus.cpp
new file mode 100644
index 0000000000..385040b3d6
--- /dev/null
+++ b/apps/openmw/mwlua/types/apparatus.cpp
@@ -0,0 +1,42 @@
+#include "types.hpp"
+
+#include <components/esm3/loadappa.hpp>
+
+#include <apps/openmw/mwworld/esmstore.hpp>
+
+#include "../luabindings.hpp"
+
+namespace sol
+{
+    template <>
+    struct is_automagical<ESM::Apparatus> : std::false_type {};
+}
+
+namespace MWLua
+{
+    void addApparatusBindings(sol::table apparatus, const Context& context)
+    {
+        apparatus["TYPE"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, int>({
+            {"MortarPestle", ESM::Apparatus::MortarPestle},
+            {"Alembic", ESM::Apparatus::Alembic},
+            {"Calcinator", ESM::Apparatus::Calcinator},
+            {"Retort", ESM::Apparatus::Retort},
+            }));
+
+        const MWWorld::Store<ESM::Apparatus>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Apparatus>();
+        apparatus["record"] = sol::overload(
+            [](const Object& obj) -> const ESM::Apparatus* { return obj.ptr().get<ESM::Apparatus>()->mBase; },
+            [store](const std::string& recordId) -> const ESM::Apparatus* { return store->find(recordId); });
+        sol::usertype<ESM::Apparatus> record = context.mLua->sol().new_usertype<ESM::Apparatus>("ESM3_Apparatus");
+        record[sol::meta_function::to_string] = [](const ESM::Apparatus& rec) { return "ESM3_Apparatus[" + rec.mId + "]"; };
+        record["id"] = sol::readonly_property([](const ESM::Apparatus& rec) -> std::string { return rec.mId; });
+        record["name"] = sol::readonly_property([](const ESM::Apparatus& rec) -> std::string { return rec.mName; });
+        record["model"] = sol::readonly_property([](const ESM::Apparatus& rec) -> std::string { return rec.mModel; });
+        record["mwscript"] = sol::readonly_property([](const ESM::Apparatus& rec) -> std::string { return rec.mScript; });
+        record["icon"] = sol::readonly_property([](const ESM::Apparatus& rec) -> std::string { return rec.mIcon; });
+        record["type"] = sol::readonly_property([](const ESM::Apparatus& rec) -> int { return rec.mData.mType; });
+        record["value"] = sol::readonly_property([](const ESM::Apparatus& rec) -> int { return rec.mData.mValue; });
+        record["weight"] = sol::readonly_property([](const ESM::Apparatus& rec) -> float { return rec.mData.mWeight; });
+        record["quality"] = sol::readonly_property([](const ESM::Apparatus& rec) -> float { return rec.mData.mQuality; });
+    }
+}
diff --git a/apps/openmw/mwlua/types/types.cpp b/apps/openmw/mwlua/types/types.cpp
index f52d09ba7e..a7f2322f20 100644
--- a/apps/openmw/mwlua/types/types.cpp
+++ b/apps/openmw/mwlua/types/types.cpp
@@ -169,7 +169,7 @@ namespace MWLua
         addBookBindings(addType(ObjectTypeName::Book, {ESM::REC_BOOK}, ObjectTypeName::Item), context);
         addLockpickBindings(addType(ObjectTypeName::Lockpick, {ESM::REC_LOCK}, ObjectTypeName::Item), context);
         addProbeBindings(addType(ObjectTypeName::Probe, {ESM::REC_PROB}, ObjectTypeName::Item), context);
-        addType(ObjectTypeName::Apparatus, {ESM::REC_APPA}, ObjectTypeName::Item);
+        addApparatusBindings(addType(ObjectTypeName::Apparatus, {ESM::REC_APPA}, ObjectTypeName::Item), context);
         addType(ObjectTypeName::Repair, {ESM::REC_REPA}, ObjectTypeName::Item);
 
         addActivatorBindings(addType(ObjectTypeName::Activator, {ESM::REC_ACTI}), context);
diff --git a/apps/openmw/mwlua/types/types.hpp b/apps/openmw/mwlua/types/types.hpp
index 9145752c58..655aca12e6 100644
--- a/apps/openmw/mwlua/types/types.hpp
+++ b/apps/openmw/mwlua/types/types.hpp
@@ -34,6 +34,7 @@ namespace MWLua
     void addCreatureBindings(sol::table creature, const Context& context);
     void addLockpickBindings(sol::table lockpick, const Context& context);
     void addProbeBindings(sol::table probe, const Context& context);
+    void addApparatusBindings(sol::table apparatus, const Context& context);
 }
 
 #endif // MWLUA_TYPES_H
diff --git a/files/lua_api/openmw/types.lua b/files/lua_api/openmw/types.lua
index be022b4ef2..b6a303cd74 100644
--- a/files/lua_api/openmw/types.lua
+++ b/files/lua_api/openmw/types.lua
@@ -748,6 +748,34 @@
 -- @param openmw.core#GameObject object
 -- @return #boolean
 
+--- Apparatus.TYPE
+-- @type ApparatusTYPE
+-- @field #number MortarPestle
+-- @field #number Alembic
+-- @field #number Calcinator
+-- @field #number Retort
+
+--- @{#ApparatusTYPE}
+-- @field [parent=#Apparatus] #ApparatusTYPE TYPE
+
+---
+-- Returns the read-only @{#ApparatusRecord} of an apparatus
+-- @function [parent=#Apparatus] record
+-- @param #any objectOrRecordId
+-- @return #ApparatusRecord
+
+---
+-- @type ApparatusRecord
+-- @field #string id The record ID of the apparatus
+-- @field #string name The name of the apparatus
+-- @field #string model VFS path to the model
+-- @field #string mwscript MWScript on this apparatus (can be empty)
+-- @field #string icon VFS path to the icon
+-- @field #number type The type of apparatus. See @{#Apparatus.TYPE} 
+-- @field #number weight
+-- @field #number value
+-- @field #number quality The quality of the apparatus
+
 --- @{#Lockpick} functions
 -- @field [parent=#types] #Lockpick Lockpick
 

From 709d186b8d40512dcacff0fc78566c5bb5182fa8 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Tue, 24 May 2022 22:31:29 +0200
Subject: [PATCH 2548/2859] Put tests output files to a separate dir

---
 apps/openmw_test_suite/CMakeLists.txt         |  2 ++
 apps/openmw_test_suite/files/hash.cpp         |  8 +++--
 apps/openmw_test_suite/fx/technique.cpp       | 14 ++++----
 .../lua/test_configuration.cpp                |  2 +-
 apps/openmw_test_suite/lua/test_l10n.cpp      | 23 ++++++++-----
 apps/openmw_test_suite/lua/test_lua.cpp       | 10 +++---
 .../lua/test_scriptscontainer.cpp             | 21 ++++++------
 .../lua/test_serialization.cpp                |  2 +-
 .../lua/test_utilpackage.cpp                  |  8 ++++-
 .../misc/test_resourcehelpers.cpp             | 10 +++---
 apps/openmw_test_suite/mwworld/test_store.cpp | 20 ++++--------
 apps/openmw_test_suite/settings/parser.cpp    |  8 +++--
 .../settings/shadermanager.cpp                |  6 +++-
 .../shader/shadermanager.cpp                  |  8 +++--
 .../{lua => }/testing_util.hpp                | 32 +++++++++++--------
 15 files changed, 100 insertions(+), 74 deletions(-)
 rename apps/openmw_test_suite/{lua => }/testing_util.hpp (61%)

diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index b17e49207d..2695b64c05 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -6,6 +6,8 @@ if (GTEST_FOUND AND GMOCK_FOUND)
     include_directories(SYSTEM ${GMOCK_INCLUDE_DIRS})
 
     file(GLOB UNITTEST_SRC_FILES
+        testing_util.hpp
+
         ../openmw/mwworld/store.cpp
         ../openmw/mwworld/esmstore.cpp
         mwworld/test_store.cpp
diff --git a/apps/openmw_test_suite/files/hash.cpp b/apps/openmw_test_suite/files/hash.cpp
index 645258f60e..f8303ac1f3 100644
--- a/apps/openmw_test_suite/files/hash.cpp
+++ b/apps/openmw_test_suite/files/hash.cpp
@@ -9,9 +9,12 @@
 #include <sstream>
 #include <string>
 
+#include "../testing_util.hpp"
+
 namespace
 {
     using namespace testing;
+    using namespace TestingOpenMW;
     using namespace Files;
 
     struct Params
@@ -24,7 +27,7 @@ namespace
 
     TEST(FilesGetHash, shouldClearErrors)
     {
-        const std::string fileName = "fileName";
+        const std::string fileName = temporaryFilePath("fileName");
         std::string content;
         std::fill_n(std::back_inserter(content), 1, 'a');
         std::istringstream stream(content);
@@ -34,7 +37,7 @@ namespace
 
     TEST_P(FilesGetHash, shouldReturnHashForStringStream)
     {
-        const std::string fileName = "fileName";
+        const std::string fileName = temporaryFilePath("fileName");
         std::string content;
         std::fill_n(std::back_inserter(content), GetParam().mSize, 'a');
         std::istringstream stream(content);
@@ -47,6 +50,7 @@ namespace
         std::replace(fileName.begin(), fileName.end(), '/', '_');
         std::string content;
         std::fill_n(std::back_inserter(content), GetParam().mSize, 'a');
+        fileName = outputFilePath(fileName);
         std::fstream(fileName, std::ios_base::out | std::ios_base::binary)
             .write(content.data(), static_cast<std::streamsize>(content.size()));
         const auto stream = Files::openConstrainedFileStream(fileName, 0, content.size());
diff --git a/apps/openmw_test_suite/fx/technique.cpp b/apps/openmw_test_suite/fx/technique.cpp
index 9a382ad8ea..d4b5bb0f8c 100644
--- a/apps/openmw_test_suite/fx/technique.cpp
+++ b/apps/openmw_test_suite/fx/technique.cpp
@@ -6,12 +6,12 @@
 #include <components/resource/imagemanager.hpp>
 #include <components/files/configurationmanager.hpp>
 
-#include "../lua/testing_util.hpp"
+#include "../testing_util.hpp"
 
 namespace
 {
 
-TestFile technique_properties(R"(
+TestingOpenMW::VFSTestFile technique_properties(R"(
     fragment main {}
     vertex main {}
     technique {
@@ -27,7 +27,7 @@ TestFile technique_properties(R"(
     }
 )");
 
-TestFile rendertarget_properties{R"(
+TestingOpenMW::VFSTestFile rendertarget_properties{R"(
     render_target rendertarget {
         width_ratio = 0.5;
         height_ratio = 0.5;
@@ -54,7 +54,7 @@ TestFile rendertarget_properties{R"(
 )"};
 
 
-TestFile uniform_properties{R"(
+TestingOpenMW::VFSTestFile uniform_properties{R"(
     uniform_vec4 uVec4 {
         default = vec4(0,0,0,0);
         min = vec4(0,1,0,0);
@@ -69,13 +69,13 @@ TestFile uniform_properties{R"(
 )"};
 
 
-TestFile missing_sampler_source{R"(
+TestingOpenMW::VFSTestFile missing_sampler_source{R"(
     sampler_1d mysampler1d { }
     fragment main { }
     technique { passes = main; }
 )"};
 
-TestFile repeated_shared_block{R"(
+TestingOpenMW::VFSTestFile repeated_shared_block{R"(
     shared {
         float myfloat = 1.0;
     }
@@ -95,7 +95,7 @@ TestFile repeated_shared_block{R"(
         std::unique_ptr<Technique> mTechnique;
 
         TechniqueTest()
-            : mVFS(createTestVFS({
+            : mVFS(TestingOpenMW::createTestVFS({
                 {"shaders/technique_properties.omwfx", &technique_properties},
                 {"shaders/rendertarget_properties.omwfx", &rendertarget_properties},
                 {"shaders/uniform_properties.omwfx", &uniform_properties},
diff --git a/apps/openmw_test_suite/lua/test_configuration.cpp b/apps/openmw_test_suite/lua/test_configuration.cpp
index 054ea8cbda..4869d42284 100644
--- a/apps/openmw_test_suite/lua/test_configuration.cpp
+++ b/apps/openmw_test_suite/lua/test_configuration.cpp
@@ -3,7 +3,7 @@
 
 #include <components/lua/configuration.hpp>
 
-#include "testing_util.hpp"
+#include "../testing_util.hpp"
 
 namespace
 {
diff --git a/apps/openmw_test_suite/lua/test_l10n.cpp b/apps/openmw_test_suite/lua/test_l10n.cpp
index c989d56e72..6204a8022a 100644
--- a/apps/openmw_test_suite/lua/test_l10n.cpp
+++ b/apps/openmw_test_suite/lua/test_l10n.cpp
@@ -6,17 +6,24 @@
 #include <components/lua/luastate.hpp>
 #include <components/lua/l10n.hpp>
 
-#include "testing_util.hpp"
+#include "../testing_util.hpp"
 
 namespace
 {
     using namespace testing;
+    using namespace TestingOpenMW;
 
-    TestFile invalidScript("not a script");
-    TestFile incorrectScript("return { incorrectSection = {}, engineHandlers = { incorrectHandler = function() end } }");
-    TestFile emptyScript("");
+    template <typename T>
+    T get(sol::state& lua, const std::string& luaCode)
+    {
+        return lua.safe_script("return " + luaCode).get<T>();
+    }
+
+    VFSTestFile invalidScript("not a script");
+    VFSTestFile incorrectScript("return { incorrectSection = {}, engineHandlers = { incorrectHandler = function() end } }");
+    VFSTestFile emptyScript("");
     
-    TestFile test1En(R"X(
+    VFSTestFile test1En(R"X(
 good_morning: "Good morning."
 you_have_arrows: |-
   {count, plural,
@@ -38,7 +45,7 @@ numbers: "{int} and {double, number, integer} are integers, but {double} is a do
 rounding: "{value, number, :: .00}"
 )X");
 
-    TestFile test1De(R"X(
+    VFSTestFile test1De(R"X(
 good_morning: "Guten Morgen."
 you_have_arrows: |-
   {count, plural,
@@ -48,11 +55,11 @@ you_have_arrows: |-
 "Hello {name}!": "Hallo {name}!"
 )X");
 
-     TestFile test1EnUS(R"X(
+     VFSTestFile test1EnUS(R"X(
 currency: "You have {money, number, currency}"
 )X");
 
-TestFile test2En(R"X(
+VFSTestFile test2En(R"X(
 good_morning: "Morning!"
 you_have_arrows: "Arrows count: {count}"
 )X");
diff --git a/apps/openmw_test_suite/lua/test_lua.cpp b/apps/openmw_test_suite/lua/test_lua.cpp
index 539390f2af..566fefa726 100644
--- a/apps/openmw_test_suite/lua/test_lua.cpp
+++ b/apps/openmw_test_suite/lua/test_lua.cpp
@@ -3,13 +3,13 @@
 
 #include <components/lua/luastate.hpp>
 
-#include "testing_util.hpp"
+#include "../testing_util.hpp"
 
 namespace
 {
     using namespace testing;
 
-    TestFile counterFile(R"X(
+    TestingOpenMW::VFSTestFile counterFile(R"X(
 x = 42
 return {
     get = function() return x end,
@@ -17,9 +17,9 @@ return {
 }
 )X");
 
-    TestFile invalidScriptFile("Invalid script");
+    TestingOpenMW::VFSTestFile invalidScriptFile("Invalid script");
 
-    TestFile testsFile(R"X(
+    TestingOpenMW::VFSTestFile testsFile(R"X(
 return {
     -- should work
     sin = function(x) return math.sin(x) end,
@@ -53,7 +53,7 @@ return {
 
     struct LuaStateTest : Test
     {
-        std::unique_ptr<VFS::Manager> mVFS = createTestVFS({
+        std::unique_ptr<VFS::Manager> mVFS = TestingOpenMW::createTestVFS({
             {"aaa/counter.lua", &counterFile},
             {"bbb/tests.lua", &testsFile},
             {"invalid.lua", &invalidScriptFile}
diff --git a/apps/openmw_test_suite/lua/test_scriptscontainer.cpp b/apps/openmw_test_suite/lua/test_scriptscontainer.cpp
index 900888929d..18aeffbbf2 100644
--- a/apps/openmw_test_suite/lua/test_scriptscontainer.cpp
+++ b/apps/openmw_test_suite/lua/test_scriptscontainer.cpp
@@ -6,17 +6,18 @@
 #include <components/lua/luastate.hpp>
 #include <components/lua/scriptscontainer.hpp>
 
-#include "testing_util.hpp"
+#include "../testing_util.hpp"
 
 namespace
 {
     using namespace testing;
+    using namespace TestingOpenMW;
 
-    TestFile invalidScript("not a script");
-    TestFile incorrectScript("return { incorrectSection = {}, engineHandlers = { incorrectHandler = function() end } }");
-    TestFile emptyScript("");
+    VFSTestFile invalidScript("not a script");
+    VFSTestFile incorrectScript("return { incorrectSection = {}, engineHandlers = { incorrectHandler = function() end } }");
+    VFSTestFile emptyScript("");
     
-    TestFile testScript(R"X(
+    VFSTestFile testScript(R"X(
 return {
     engineHandlers = {
         onUpdate = function(dt) print(' update ' .. tostring(dt)) end,
@@ -30,7 +31,7 @@ return {
 }
 )X");
 
-    TestFile stopEventScript(R"X(
+    VFSTestFile stopEventScript(R"X(
 return {
     eventHandlers = {
         Event1 = function(eventData)
@@ -41,7 +42,7 @@ return {
 }
 )X");
 
-    TestFile loadSaveScript(R"X(
+    VFSTestFile loadSaveScript(R"X(
 x = 0
 y = 0
 return {
@@ -67,7 +68,7 @@ return {
 }
 )X");
 
-    TestFile interfaceScript(R"X(
+    VFSTestFile interfaceScript(R"X(
 return {
     interfaceName = "TestInterface",
     interface = {
@@ -77,7 +78,7 @@ return {
 }
 )X");
 
-    TestFile overrideInterfaceScript(R"X(
+    VFSTestFile overrideInterfaceScript(R"X(
 local old = nil
 local interface = {
     fn = function(x)
@@ -101,7 +102,7 @@ return {
 }
 )X");
 
-    TestFile useInterfaceScript(R"X(
+    VFSTestFile useInterfaceScript(R"X(
 local interfaces = require('openmw.interfaces')
 return {
     engineHandlers = {
diff --git a/apps/openmw_test_suite/lua/test_serialization.cpp b/apps/openmw_test_suite/lua/test_serialization.cpp
index 5a6d5b7e51..610d5b43c1 100644
--- a/apps/openmw_test_suite/lua/test_serialization.cpp
+++ b/apps/openmw_test_suite/lua/test_serialization.cpp
@@ -13,7 +13,7 @@
 #include <components/misc/endianness.hpp>
 #include <components/misc/color.hpp>
 
-#include "testing_util.hpp"
+#include "../testing_util.hpp"
 
 namespace
 {
diff --git a/apps/openmw_test_suite/lua/test_utilpackage.cpp b/apps/openmw_test_suite/lua/test_utilpackage.cpp
index 5e27b36916..b7aa534c1d 100644
--- a/apps/openmw_test_suite/lua/test_utilpackage.cpp
+++ b/apps/openmw_test_suite/lua/test_utilpackage.cpp
@@ -4,12 +4,18 @@
 #include <components/lua/luastate.hpp>
 #include <components/lua/utilpackage.hpp>
 
-#include "testing_util.hpp"
+#include "../testing_util.hpp"
 
 namespace
 {
     using namespace testing;
 
+    template <typename T>
+    T get(sol::state& lua, const std::string& luaCode)
+    {
+        return lua.safe_script("return " + luaCode).get<T>();
+    }
+
     std::string getAsString(sol::state& lua, std::string luaCode)
     {
         return LuaUtil::toString(lua.safe_script("return " + luaCode));
diff --git a/apps/openmw_test_suite/misc/test_resourcehelpers.cpp b/apps/openmw_test_suite/misc/test_resourcehelpers.cpp
index ee062c6da8..c4130b9cca 100644
--- a/apps/openmw_test_suite/misc/test_resourcehelpers.cpp
+++ b/apps/openmw_test_suite/misc/test_resourcehelpers.cpp
@@ -1,13 +1,13 @@
 #include <gtest/gtest.h>
 #include "components/misc/resourcehelpers.hpp"
-#include "../lua/testing_util.hpp"
+#include "../testing_util.hpp"
 
 namespace
 {
     using namespace Misc::ResourceHelpers;
     TEST(CorrectSoundPath, wav_files_not_overridden_with_mp3_in_vfs_are_not_corrected)
     {
-        std::unique_ptr<VFS::Manager> mVFS = createTestVFS({
+        std::unique_ptr<VFS::Manager> mVFS = TestingOpenMW::createTestVFS({
             {"sound/bar.wav", nullptr}
         });
         EXPECT_EQ(correctSoundPath("sound/bar.wav", mVFS.get()), "sound/bar.wav");
@@ -15,7 +15,7 @@ namespace
 
     TEST(CorrectSoundPath, wav_files_overridden_with_mp3_in_vfs_are_corrected)
     {
-        std::unique_ptr<VFS::Manager> mVFS = createTestVFS({
+        std::unique_ptr<VFS::Manager> mVFS = TestingOpenMW::createTestVFS({
             {"sound/foo.mp3", nullptr}
         });
         EXPECT_EQ(correctSoundPath("sound/foo.wav", mVFS.get()), "sound/foo.mp3");
@@ -23,14 +23,14 @@ namespace
 
     TEST(CorrectSoundPath, corrected_path_does_not_check_existence_in_vfs)
     {
-        std::unique_ptr<VFS::Manager> mVFS = createTestVFS({
+        std::unique_ptr<VFS::Manager> mVFS = TestingOpenMW::createTestVFS({
         });
         EXPECT_EQ(correctSoundPath("sound/foo.wav", mVFS.get()), "sound/foo.mp3");
     }
 
     TEST(CorrectSoundPath, correct_path_normalize_paths)
     {
-        std::unique_ptr<VFS::Manager> mVFS = createTestVFS({
+        std::unique_ptr<VFS::Manager> mVFS = TestingOpenMW::createTestVFS({
         });
         EXPECT_EQ(correctSoundPath("sound\\foo.wav", mVFS.get()), "sound/foo.mp3");
         EXPECT_EQ(correctSoundPath("SOUND\\foo.WAV", mVFS.get()), "SOUND/foo.mp3");
diff --git a/apps/openmw_test_suite/mwworld/test_store.cpp b/apps/openmw_test_suite/mwworld/test_store.cpp
index c656064a96..7df5940596 100644
--- a/apps/openmw_test_suite/mwworld/test_store.cpp
+++ b/apps/openmw_test_suite/mwworld/test_store.cpp
@@ -1,7 +1,6 @@
 #include <gtest/gtest.h>
 
 #include <fstream>
-#include <filesystem>
 
 #include <components/files/configurationmanager.hpp>
 #include <components/esm3/esmreader.hpp>
@@ -12,6 +11,8 @@
 #include "apps/openmw/mwworld/esmstore.hpp"
 #include "apps/openmw/mwmechanics/spelllist.hpp"
 
+#include "../testing_util.hpp"
+
 namespace MWMechanics
 {
     SpellList::SpellList(const std::string& id, int type) : mId(id), mType(type) {}
@@ -62,8 +63,6 @@ struct ContentFileTest : public ::testing::Test
         ("data-local", boost::program_options::value<Files::MaybeQuotedPathContainer::value_type>()->default_value(Files::MaybeQuotedPathContainer::value_type(), ""));
         Files::ConfigurationManager::addCommonOptions(desc);
 
-        boost::program_options::notify(variables);
-
         mConfigurationManager.readConfiguration(variables, desc, true);
 
         Files::PathContainer dataDirs, dataLocal;
@@ -73,10 +72,7 @@ struct ContentFileTest : public ::testing::Test
 
         Files::PathContainer::value_type local(variables["data-local"].as<Files::MaybeQuotedPathContainer::value_type>());
         if (!local.empty())
-        {
-            boost::filesystem::create_directories(local);
             dataLocal.push_back(local);
-        }
 
         mConfigurationManager.filterOutNonExistingPaths(dataDirs);
         mConfigurationManager.filterOutNonExistingPaths(dataLocal);
@@ -109,10 +105,8 @@ TEST_F(ContentFileTest, dialogue_merging_test)
         return;
     }
 
-    const std::string file = "test_dialogue_merging.txt";
-
-    std::ofstream stream;
-    stream.open(file);
+    const std::string file = TestingOpenMW::outputFilePath("test_dialogue_merging.txt");
+    std::ofstream stream(file);
 
     const MWWorld::Store<ESM::Dialogue>& dialStore = mEsmStore.get<ESM::Dialogue>();
     for (const auto & dial : dialStore)
@@ -191,10 +185,8 @@ TEST_F(ContentFileTest, content_diagnostics_test)
         return;
     }
 
-    const std::string file = "test_content_diagnostics.txt";
-
-    std::ofstream stream;
-    stream.open(file);
+    const std::string file = TestingOpenMW::outputFilePath("test_content_diagnostics.txt");
+    std::ofstream stream(file);
 
     RUN_TEST_FOR_TYPES(printRecords, mEsmStore, stream);
 
diff --git a/apps/openmw_test_suite/settings/parser.cpp b/apps/openmw_test_suite/settings/parser.cpp
index abaa700730..7e250b43aa 100644
--- a/apps/openmw_test_suite/settings/parser.cpp
+++ b/apps/openmw_test_suite/settings/parser.cpp
@@ -4,6 +4,8 @@
 
 #include <gtest/gtest.h>
 
+#include "../testing_util.hpp"
+
 namespace
 {
     using namespace testing;
@@ -17,11 +19,11 @@ namespace
         template <typename F>
         void withSettingsFile( const std::string& content, F&& f)
         {
-            const auto path = std::string(UnitTest::GetInstance()->current_test_info()->name()) + ".cfg";
+            std::string path = TestingOpenMW::outputFilePath(
+                std::string(UnitTest::GetInstance()->current_test_info()->name()) + ".cfg");
 
             {
-                std::ofstream stream;
-                stream.open(path);
+                std::ofstream stream(path);
                 stream << content;
                 stream.close();
             }
diff --git a/apps/openmw_test_suite/settings/shadermanager.cpp b/apps/openmw_test_suite/settings/shadermanager.cpp
index 7f6e73c4c1..e4f40aaa03 100644
--- a/apps/openmw_test_suite/settings/shadermanager.cpp
+++ b/apps/openmw_test_suite/settings/shadermanager.cpp
@@ -1,9 +1,12 @@
 #include <components/settings/shadermanager.hpp>
 
+#include <filesystem>
 #include <fstream>
 
 #include <gtest/gtest.h>
 
+#include "../testing_util.hpp"
+
 namespace
 {
     using namespace testing;
@@ -14,7 +17,8 @@ namespace
         template <typename F>
         void withSettingsFile( const std::string& content, F&& f)
         {
-            const auto path = std::string(UnitTest::GetInstance()->current_test_info()->name()) + ".yaml";
+            std::string path = TestingOpenMW::outputFilePath(
+                std::string(UnitTest::GetInstance()->current_test_info()->name()) + ".yaml");
 
             {
                 std::ofstream stream;
diff --git a/apps/openmw_test_suite/shader/shadermanager.cpp b/apps/openmw_test_suite/shader/shadermanager.cpp
index 1b0cd7c741..58ca3b6f3f 100644
--- a/apps/openmw_test_suite/shader/shadermanager.cpp
+++ b/apps/openmw_test_suite/shader/shadermanager.cpp
@@ -4,6 +4,8 @@
 
 #include <gtest/gtest.h>
 
+#include "../testing_util.hpp"
+
 namespace
 {
     using namespace testing;
@@ -28,11 +30,11 @@ namespace
         template <class F>
         void withShaderFile(const std::string& suffix, const std::string& content, F&& f)
         {
-            const auto path = UnitTest::GetInstance()->current_test_info()->name() + suffix + ".glsl";
+            std::string path = TestingOpenMW::outputFilePath(
+                std::string(UnitTest::GetInstance()->current_test_info()->name()) + suffix + ".glsl");
 
             {
-                std::ofstream stream;
-                stream.open(path);
+                std::ofstream stream(path);
                 stream << content;
                 stream.close();
             }
diff --git a/apps/openmw_test_suite/lua/testing_util.hpp b/apps/openmw_test_suite/testing_util.hpp
similarity index 61%
rename from apps/openmw_test_suite/lua/testing_util.hpp
rename to apps/openmw_test_suite/testing_util.hpp
index 217c8ae5d5..e583552a21 100644
--- a/apps/openmw_test_suite/lua/testing_util.hpp
+++ b/apps/openmw_test_suite/testing_util.hpp
@@ -1,25 +1,31 @@
-#ifndef LUA_TESTING_UTIL_H
-#define LUA_TESTING_UTIL_H
+#ifndef TESTING_UTIL_H
+#define TESTING_UTIL_H
 
+#include <filesystem>
 #include <sstream>
-#include <sol/sol.hpp>
 
 #include <components/vfs/archive.hpp>
 #include <components/vfs/manager.hpp>
 
-namespace
+namespace TestingOpenMW
 {
 
-    template <typename T>
-    T get(sol::state& lua, const std::string& luaCode)
+    inline std::string outputFilePath(const std::string name)
     {
-        return lua.safe_script("return " + luaCode).get<T>();
+        std::filesystem::path dir("tests_output");
+        std::filesystem::create_directory(dir);
+        return (dir / name).string();
     }
 
-    class TestFile : public VFS::File
+    inline std::string temporaryFilePath(const std::string name)
+    {
+        return (std::filesystem::temp_directory_path() / name).string();
+    }
+
+    class VFSTestFile : public VFS::File
     {
     public:
-        explicit TestFile(std::string content) : mContent(std::move(content)) {}
+        explicit VFSTestFile(std::string content) : mContent(std::move(content)) {}
 
         Files::IStreamPtr open() override
         {
@@ -35,11 +41,11 @@ namespace
         const std::string mContent;
     };
 
-    struct TestData : public VFS::Archive
+    struct VFSTestData : public VFS::Archive
     {
         std::map<std::string, VFS::File*> mFiles;
 
-        TestData(std::map<std::string, VFS::File*> files) : mFiles(std::move(files)) {}
+        VFSTestData(std::map<std::string, VFS::File*> files) : mFiles(std::move(files)) {}
 
         void listResources(std::map<std::string, VFS::File*>& out, char (*normalize_function) (char)) override
         {
@@ -58,7 +64,7 @@ namespace
     inline std::unique_ptr<VFS::Manager> createTestVFS(std::map<std::string, VFS::File*> files)
     {
         auto vfs = std::make_unique<VFS::Manager>(true);
-        vfs->addArchive(new TestData(std::move(files)));
+        vfs->addArchive(new VFSTestData(std::move(files)));
         vfs->buildIndex();
         return vfs;
     }
@@ -68,4 +74,4 @@ namespace
 
 }
 
-#endif // LUA_TESTING_UTIL_H
+#endif // TESTING_UTIL_H

From 447b586d7d0845a382800891d94abba438e55b29 Mon Sep 17 00:00:00 2001
From: Cody Glassman <glassmancody.info@gmail.com>
Date: Tue, 31 May 2022 08:45:27 +0000
Subject: [PATCH 2549/2859] [Postprocessing] Fix a couple awkward issues with
 Lua API

---
 apps/openmw/mwgui/postprocessorhud.cpp        | 21 ++++++++++++---
 apps/openmw/mwlua/luamanagerimp.cpp           |  3 +++
 apps/openmw/mwlua/postprocessingbindings.cpp  | 13 ++++-----
 apps/openmw/mwrender/postprocessor.cpp        | 27 +++++++++++--------
 apps/openmw/mwrender/postprocessor.hpp        | 15 ++++++++---
 components/fx/technique.cpp                   |  5 +++-
 components/fx/technique.hpp                   |  4 +++
 docs/source/reference/postprocessing/lua.rst  | 10 ++++---
 .../source/reference/postprocessing/omwfx.rst |  5 ++++
 9 files changed, 74 insertions(+), 29 deletions(-)

diff --git a/apps/openmw/mwgui/postprocessorhud.cpp b/apps/openmw/mwgui/postprocessorhud.cpp
index 777468e8b0..2fa4760867 100644
--- a/apps/openmw/mwgui/postprocessorhud.cpp
+++ b/apps/openmw/mwgui/postprocessorhud.cpp
@@ -30,7 +30,7 @@ namespace
         {
             auto technique = processor->getTechniques()[i];
 
-            if (!technique)
+            if (!technique || technique->getDynamic())
                 continue;
 
             chain << technique->getName();
@@ -140,10 +140,15 @@ namespace MWGui
         {
             auto* processor = MWBase::Environment::get().getWorld()->getPostProcessor();
             mOverrideHint = list->getItemNameAt(selected);
+
+            auto technique = *list->getItemDataAt<std::shared_ptr<fx::Technique>>(selected);
+            if (technique->getDynamic())
+                return;
+
             if (enabled)
-                processor->enableTechnique(*list->getItemDataAt<std::shared_ptr<fx::Technique>>(selected));
+                processor->enableTechnique(technique);
             else
-                processor->disableTechnique(*list->getItemDataAt<std::shared_ptr<fx::Technique>>(selected));
+                processor->disableTechnique(technique);
             saveChain();
         }
     }
@@ -172,7 +177,11 @@ namespace MWGui
 
         if (static_cast<size_t>(index) != selected)
         {
-            if (processor->enableTechnique(*mActiveList->getItemDataAt<std::shared_ptr<fx::Technique>>(selected), index))
+            auto technique = *mActiveList->getItemDataAt<std::shared_ptr<fx::Technique>>(selected);
+            if (technique->getDynamic())
+                return;
+
+            if (processor->enableTechnique(technique, index) != MWRender::PostProcessor::Status_Error)
                 saveChain();
         }
     }
@@ -330,6 +339,9 @@ namespace MWGui
         {
             case fx::Technique::Status::Success:
             case fx::Technique::Status::Uncompiled:
+            {
+                if (technique->getDynamic())
+                    ss  << "#{fontcolourhtml=header}Locked:      #{fontcolourhtml=normal} Cannot be toggled or moved, controlled by external Lua script" << endl << endl;
                 ss  << "#{fontcolourhtml=header}Author:      #{fontcolourhtml=normal} " << author << endl << endl
                     << "#{fontcolourhtml=header}Version:     #{fontcolourhtml=normal} " << version << endl << endl
                     << "#{fontcolourhtml=header}Description: #{fontcolourhtml=normal} " << description << endl << endl
@@ -338,6 +350,7 @@ namespace MWGui
                     << "#{fontcolourhtml=header}   Underwater: #{fontcolourhtml=normal} " << flag_underwater
                     << "#{fontcolourhtml=header}   Abovewater: #{fontcolourhtml=normal} " << flag_abovewater;
                 break;
+            }
             case fx::Technique::Status::Parse_Error:
                 ss  << "#{fontcolourhtml=negative}Shader Compile Error: #{fontcolourhtml=normal} <" << std::string(technique->getName()) << "> failed to compile." << endl << endl
                     << technique->getLastError();
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 6894208c07..3525906aac 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -16,6 +16,8 @@
 
 #include "../mwbase/windowmanager.hpp"
 
+#include "../mwrender/postprocessor.hpp"
+
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/ptr.hpp"
@@ -271,6 +273,7 @@ namespace MWLua
         LuaUi::clearUserInterface();
         mUiResourceManager.clear();
         MWBase::Environment::get().getWindowManager()->setConsoleMode("");
+        MWBase::Environment::get().getWorld()->getPostProcessor()->disableDynamicShaders();
         mActiveLocalScripts.clear();
         mLocalEvents.clear();
         mGlobalEvents.clear();
diff --git a/apps/openmw/mwlua/postprocessingbindings.cpp b/apps/openmw/mwlua/postprocessingbindings.cpp
index 8699c5654a..8ae9cd10a8 100644
--- a/apps/openmw/mwlua/postprocessingbindings.cpp
+++ b/apps/openmw/mwlua/postprocessingbindings.cpp
@@ -117,10 +117,9 @@ namespace MWLua
                 [=, &shader] {
                     shader.mQueuedAction = Shader::Action_None;
 
-                    if (!MWBase::Environment::get().getWorld()->getPostProcessor()->enableTechnique(shader.mShader, pos))
+                    if (MWBase::Environment::get().getWorld()->getPostProcessor()->enableTechnique(shader.mShader, pos) == MWRender::PostProcessor::Status_Error)
                         throw std::runtime_error("Failed enabling shader '" + shader.mShader->getName() + "'");
-                },
-                "Enable shader " + (shader.mShader ? shader.mShader->getName() : "nil")
+                }
             );
         };
 
@@ -132,10 +131,9 @@ namespace MWLua
                 [&] {
                     shader.mQueuedAction = Shader::Action_None;
 
-                    if (!MWBase::Environment::get().getWorld()->getPostProcessor()->disableTechnique(shader.mShader))
+                    if (MWBase::Environment::get().getWorld()->getPostProcessor()->disableTechnique(shader.mShader) == MWRender::PostProcessor::Status_Error)
                         throw std::runtime_error("Failed disabling shader '" + shader.mShader->getName() + "'");
-                },
-                "Disable shader " + (shader.mShader ? shader.mShader->getName() : "nil")
+                }
             );
         };
 
@@ -168,6 +166,9 @@ namespace MWLua
             if (!shader.mShader || !shader.mShader->isValid())
                 throw std::runtime_error(Misc::StringUtils::format("Failed loading shader '%s'", name));
 
+            if (!shader.mShader->getDynamic())
+                throw std::runtime_error(Misc::StringUtils::format("Shader '%s' is not marked as dynamic", name));
+
             return shader;
         };
 
diff --git a/apps/openmw/mwrender/postprocessor.cpp b/apps/openmw/mwrender/postprocessor.cpp
index 61468df7da..38ee13831c 100644
--- a/apps/openmw/mwrender/postprocessor.cpp
+++ b/apps/openmw/mwrender/postprocessor.cpp
@@ -182,7 +182,6 @@ namespace MWRender
             if (!path.parent_path().has_parent_path() && fileExt == fx::Technique::sExt)
             {
                 auto absolutePath = std::filesystem::path(mVFS->getAbsoluteFileName(name));
-
                 mTechniqueFileMap[absolutePath.stem().string()] = absolutePath;
             }
         }
@@ -210,7 +209,6 @@ namespace MWRender
         if (mUsePostProcessing && mTechniqueFileMap.empty())
         {
             populateTechniqueFiles();
-
         }
 
         mMainTemplate->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
@@ -648,16 +646,16 @@ namespace MWRender
         mRendering.getSkyManager()->setSunglare(sunglare);
     }
 
-    bool PostProcessor::enableTechnique(std::shared_ptr<fx::Technique> technique, std::optional<int> location)
+    PostProcessor::Status PostProcessor::enableTechnique(std::shared_ptr<fx::Technique> technique, std::optional<int> location)
     {
         if (!isEnabled())
         {
             Log(Debug::Warning) << "PostProcessing disabled, cannot load technique '" << technique->getName() << "'";
-            return false;
+            return Status_Error;
         }
 
         if (!technique || Misc::StringUtils::ciEqual(technique->getName(), "main") || (location.has_value() && location.value() <= 0))
-            return false;
+            return Status_Error;
 
         disableTechnique(technique, false);
 
@@ -666,23 +664,23 @@ namespace MWRender
         mTechniques.insert(mTechniques.begin() + pos, technique);
         dirtyTechniques();
 
-        return true;
+        return Status_Toggled;
     }
 
-    bool PostProcessor::disableTechnique(std::shared_ptr<fx::Technique> technique, bool dirty)
+    PostProcessor::Status PostProcessor::disableTechnique(std::shared_ptr<fx::Technique> technique, bool dirty)
     {
         if (Misc::StringUtils::ciEqual(technique->getName(), "main"))
-            return false;
+            return Status_Error;
 
         auto it = std::find(mTechniques.begin(), mTechniques.end(), technique);
         if (it == std::end(mTechniques))
-            return false;
+            return Status_Unchanged;
 
         mTechniques.erase(it);
         if (dirty)
             dirtyTechniques();
 
-        return true;
+        return Status_Toggled;
     }
 
     bool PostProcessor::isTechniqueEnabled(const std::shared_ptr<fx::Technique>& technique) const
@@ -792,7 +790,7 @@ namespace MWRender
         if (technique->getStatus() != fx::Technique::Status::File_Not_exists)
             technique->setLastModificationTime(std::filesystem::last_write_time(mTechniqueFileMap[technique->getName()]));
 
-        if (!loadNextFrame)
+        if (loadNextFrame)
         {
             mQueuedTemplates.push_back(technique);
             return technique;
@@ -853,5 +851,12 @@ namespace MWRender
 
         dirtyTechniques();
     }
+
+    void PostProcessor::disableDynamicShaders()
+    {
+        for (auto& technique : mTechniques)
+            if (technique->getDynamic())
+                disableTechnique(technique);
+    }
 }
 
diff --git a/apps/openmw/mwrender/postprocessor.hpp b/apps/openmw/mwrender/postprocessor.hpp
index 6663710ced..1229d4da88 100644
--- a/apps/openmw/mwrender/postprocessor.hpp
+++ b/apps/openmw/mwrender/postprocessor.hpp
@@ -110,9 +110,16 @@ namespace MWRender
 
         void resize();
 
-        bool enableTechnique(std::shared_ptr<fx::Technique> technique, std::optional<int> location = std::nullopt);
+        enum Status
+        {
+            Status_Error,
+            Status_Toggled,
+            Status_Unchanged
+        };
 
-        bool disableTechnique(std::shared_ptr<fx::Technique> technique, bool dirty = true);
+        Status enableTechnique(std::shared_ptr<fx::Technique> technique, std::optional<int> location = std::nullopt);
+
+        Status disableTechnique(std::shared_ptr<fx::Technique> technique, bool dirty = true);
 
         bool getSupportsNormalsRT() const { return mNormalsSupported; }
 
@@ -154,7 +161,7 @@ namespace MWRender
 
         void toggleMode();
 
-        std::shared_ptr<fx::Technique> loadTechnique(const std::string& name, bool loadNextFrame=true);
+        std::shared_ptr<fx::Technique> loadTechnique(const std::string& name, bool loadNextFrame=false);
 
         bool isEnabled() const { return mUsePostProcessing && mEnabled; }
 
@@ -168,6 +175,8 @@ namespace MWRender
 
         void setRenderTargetSize(int width, int height) { mWidth = width; mHeight = height; }
 
+        void disableDynamicShaders();
+
     private:
 
         void populateTechniqueFiles();
diff --git a/components/fx/technique.cpp b/components/fx/technique.cpp
index 2b8f37c96f..69999f1aa9 100644
--- a/components/fx/technique.cpp
+++ b/components/fx/technique.cpp
@@ -75,6 +75,7 @@ namespace fx
         mGLSLExtensions.clear();
         mGLSLVersion = mUBO ? 330 : 120;
         mGLSLProfile.clear();
+        mDynamic = false;
     }
 
     std::string Technique::getBlockWithLineDirective()
@@ -249,11 +250,13 @@ namespace fx
                 for (const auto& ext : parseLiteralList<Lexer::Comma>())
                     mGLSLExtensions.emplace(ext);
             }
+            else if (key == "dynamic")
+                mDynamic = parseBool();
             else
                 error(Misc::StringUtils::format("unexpected key '%s'", std::string{key}));
 
             expect<Lexer::SemiColon>();
-        }
+    }
 
         if (mPassKeys.empty())
             error("pass list in 'technique' block cannot be empty.");
diff --git a/components/fx/technique.hpp b/components/fx/technique.hpp
index 577c592ad0..057738e952 100644
--- a/components/fx/technique.hpp
+++ b/components/fx/technique.hpp
@@ -159,6 +159,8 @@ namespace fx
 
         UniformMap::iterator findUniform(const std::string& name);
 
+        bool getDynamic() const { return mDynamic; }
+
     private:
         [[noreturn]] void error(const std::string& msg);
 
@@ -275,6 +277,8 @@ namespace fx
         std::string mBuffer;
 
         std::string mLastError;
+
+        bool mDynamic = false;
     };
 
     template<> void Technique::parseBlockImp<Lexer::Shared>();
diff --git a/docs/source/reference/postprocessing/lua.rst b/docs/source/reference/postprocessing/lua.rst
index cdc6dd93d0..45ccdd3631 100644
--- a/docs/source/reference/postprocessing/lua.rst
+++ b/docs/source/reference/postprocessing/lua.rst
@@ -5,8 +5,8 @@ Connecting With Lua
 Overview
 ########
 
-Every shader can be controlled through the Lua scripting system. While shaders can be disabled and enabled,
-shader uniforms can also be controlled. For details reference the API documentation, found :doc:`here<../lua-scripting/openmw_postprocessing>`.
+Every shader that is marked as ``dynamic`` can be controlled through the Lua scripting system. Shaders can be disabled and enabled,
+and their uniforms can be controlled via scripts. For details, reference the API documentation :doc:`here<../lua-scripting/openmw_postprocessing>`.
 
 Toggling Shaders With a Keybind
 ###############################
@@ -42,12 +42,14 @@ It is assumed the shader has the filename ``desaturate.omwfx`` in this example.
 
     technique {
         description = "Desaturates scene";
-        passes = desaturate;
         version = "1.0";
         author = "Fargoth";
         passes = desaturate;
+        dynamic = true;
     }
 
+.. note::
+    The ``dynamic`` flag here is very important, otherwise Lua will not be able to interact with this shader.
 
 Next, a script that is attached to the player is needed. The shader is loaded first, then toggled on and off in response to key presses.
 Below is a working example to illustrate this.
@@ -83,11 +85,11 @@ hidden in this HUD, this can done by adding the ``hidden`` flag to the main tech
 
     technique {
         description = "Desaturates scene";
-        passes = desaturate;
         version = "1.0";
         author = "Fargoth";
         passes = desaturate;
         flags = hidden;
+        dynamic = true;
     }
 
 This flag is usually used when the shader is associated with something special, like special weather, spell, or alcohol effects.
diff --git a/docs/source/reference/postprocessing/omwfx.rst b/docs/source/reference/postprocessing/omwfx.rst
index 8e8cab2c5a..7b5c6d2e79 100644
--- a/docs/source/reference/postprocessing/omwfx.rst
+++ b/docs/source/reference/postprocessing/omwfx.rst
@@ -314,6 +314,11 @@ Exactly one ``technique`` block is required for every shader file. In this we de
 +------------------+--------------------+---------------------------------------------------+
 | flags            | `SHADER_FLAG`_     | ``,`` separated list of shader flags              |
 +------------------+--------------------+---------------------------------------------------+
+| dynamic          | boolean            | Whether shader is exposed to Lua                  |
++------------------+--------------------+---------------------------------------------------+
+
+When ``dynamic`` is set to ``true``, the shaders order cannot be manually moved, enabled, or disabled. The shaders state
+can only be controlled via a Lua script.
 
 In the code snippet below, a shader is defined that requires GLSL `330`, HDR capatiblities, and is only enabled underwater in exteriors.
 

From 638ad15af825ef8379d34390a83fd055fbb3707e Mon Sep 17 00:00:00 2001
From: Kindi <2538602-Kuyondo@users.noreply.gitlab.com>
Date: Tue, 31 May 2022 08:54:07 +0000
Subject: [PATCH 2550/2859] Lua API for Miscellaneous records

---
 apps/openmw/CMakeLists.txt        |  2 +-
 apps/openmw/mwlua/types/misc.cpp  | 34 +++++++++++++++++++++++++++++++
 apps/openmw/mwlua/types/types.cpp |  2 +-
 apps/openmw/mwlua/types/types.hpp |  1 +
 files/lua_api/openmw/types.lua    | 15 ++++++++++++++
 5 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 apps/openmw/mwlua/types/misc.cpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 21fb2a6ca5..2985d89579 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -62,7 +62,7 @@ add_openmw_dir (mwlua
     luamanagerimp object worldview userdataserializer eventqueue
     luabindings localscripts playerscripts objectbindings cellbindings asyncbindings settingsbindings
     camerabindings uibindings inputbindings nearbybindings postprocessingbindings stats debugbindings
-    types/types types/door types/actor types/container types/weapon types/npc types/creature types/activator types/book types/lockpick types/probe types/apparatus
+    types/types types/door types/actor types/container types/weapon types/npc types/creature types/activator types/book types/lockpick types/probe types/apparatus types/misc
     )
 
 add_openmw_dir (mwsound
diff --git a/apps/openmw/mwlua/types/misc.cpp b/apps/openmw/mwlua/types/misc.cpp
new file mode 100644
index 0000000000..7546561dad
--- /dev/null
+++ b/apps/openmw/mwlua/types/misc.cpp
@@ -0,0 +1,34 @@
+#include "types.hpp"
+
+#include <components/esm3/loadmisc.hpp>
+
+#include <apps/openmw/mwworld/esmstore.hpp>
+
+#include "../luabindings.hpp"
+
+namespace sol
+{
+    template <>
+    struct is_automagical<ESM::Miscellaneous> : std::false_type {};
+}
+
+namespace MWLua
+{
+    void addMiscellaneousBindings(sol::table miscellaneous, const Context& context)
+    {
+        const MWWorld::Store<ESM::Miscellaneous>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Miscellaneous>();
+        miscellaneous["record"] = sol::overload(
+            [](const Object& obj) -> const ESM::Miscellaneous* { return obj.ptr().get<ESM::Miscellaneous>()->mBase; },
+            [store](const std::string& recordId) -> const ESM::Miscellaneous* { return store->find(recordId); });
+        sol::usertype<ESM::Miscellaneous> record = context.mLua->sol().new_usertype<ESM::Miscellaneous>("ESM3_Miscellaneous");
+        record[sol::meta_function::to_string] = [](const ESM::Miscellaneous& rec) { return "ESM3_Miscellaneous[" + rec.mId + "]"; };
+        record["id"] = sol::readonly_property([](const ESM::Miscellaneous& rec) -> std::string { return rec.mId; });
+        record["name"] = sol::readonly_property([](const ESM::Miscellaneous& rec) -> std::string { return rec.mName; });
+        record["model"] = sol::readonly_property([](const ESM::Miscellaneous& rec) -> std::string { return rec.mModel; });
+        record["mwscript"] = sol::readonly_property([](const ESM::Miscellaneous& rec) -> std::string { return rec.mScript; });
+        record["icon"] = sol::readonly_property([](const ESM::Miscellaneous& rec) -> std::string { return rec.mIcon; });
+        record["isKey"] = sol::readonly_property([](const ESM::Miscellaneous& rec) -> bool { return rec.mData.mIsKey; });
+        record["value"] = sol::readonly_property([](const ESM::Miscellaneous& rec) -> int { return rec.mData.mValue; });
+        record["weight"] = sol::readonly_property([](const ESM::Miscellaneous& rec) -> float { return rec.mData.mWeight; });
+    }
+}
diff --git a/apps/openmw/mwlua/types/types.cpp b/apps/openmw/mwlua/types/types.cpp
index a7f2322f20..23ce976d4f 100644
--- a/apps/openmw/mwlua/types/types.cpp
+++ b/apps/openmw/mwlua/types/types.cpp
@@ -163,7 +163,7 @@ namespace MWLua
         addType(ObjectTypeName::Clothing, {ESM::REC_CLOT}, ObjectTypeName::Item);
         addType(ObjectTypeName::Ingredient, {ESM::REC_INGR}, ObjectTypeName::Item);
         addType(ObjectTypeName::Light, {ESM::REC_LIGH}, ObjectTypeName::Item);
-        addType(ObjectTypeName::MiscItem, {ESM::REC_MISC}, ObjectTypeName::Item);
+        addMiscellaneousBindings(addType(ObjectTypeName::MiscItem, {ESM::REC_MISC}, ObjectTypeName::Item), context);
         addType(ObjectTypeName::Potion, {ESM::REC_ALCH}, ObjectTypeName::Item);
         addWeaponBindings(addType(ObjectTypeName::Weapon, {ESM::REC_WEAP}, ObjectTypeName::Item), context);
         addBookBindings(addType(ObjectTypeName::Book, {ESM::REC_BOOK}, ObjectTypeName::Item), context);
diff --git a/apps/openmw/mwlua/types/types.hpp b/apps/openmw/mwlua/types/types.hpp
index 655aca12e6..464359152e 100644
--- a/apps/openmw/mwlua/types/types.hpp
+++ b/apps/openmw/mwlua/types/types.hpp
@@ -35,6 +35,7 @@ namespace MWLua
     void addLockpickBindings(sol::table lockpick, const Context& context);
     void addProbeBindings(sol::table probe, const Context& context);
     void addApparatusBindings(sol::table apparatus, const Context& context);
+    void addMiscellaneousBindings(sol::table miscellaneous, const Context& context);
 }
 
 #endif // MWLUA_TYPES_H
diff --git a/files/lua_api/openmw/types.lua b/files/lua_api/openmw/types.lua
index b6a303cd74..34f7f8b442 100644
--- a/files/lua_api/openmw/types.lua
+++ b/files/lua_api/openmw/types.lua
@@ -650,7 +650,22 @@
 -- @param openmw.core#GameObject object
 -- @return #boolean
 
+---
+-- Returns the read-only @{#MiscellaneousRecord} of a miscellaneous item
+-- @function [parent=#Miscellaneous] record
+-- @param #any objectOrRecordId
+-- @return #MiscellaneousRecord
 
+---
+-- @type MiscellaneousRecord
+-- @field #string id The record ID of the miscellaneous item
+-- @field #string name The name of the miscellaneous item
+-- @field #string model VFS path to the model
+-- @field #string mwscript MWScript on this miscellaneous item (can be empty)
+-- @field #string icon VFS path to the icon
+-- @field #number weight
+-- @field #number value
+-- @field #boolean isKey
 
 --- @{#Potion} functions
 -- @field [parent=#types] #Potion Potion

From 9441d6266d42d37acee089ffe4869444dd8f679e Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Tue, 31 May 2022 12:34:40 +0000
Subject: [PATCH 2551/2859] Update docs/source/generate_luadoc.sh

---
 docs/source/generate_luadoc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/generate_luadoc.sh b/docs/source/generate_luadoc.sh
index d6bbbe3634..f518c96202 100755
--- a/docs/source/generate_luadoc.sh
+++ b/docs/source/generate_luadoc.sh
@@ -63,7 +63,7 @@ rm -f $OUTPUT_DIR/*.html
 cd $FILES_DIR/lua_api
 $DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR openmw/*lua
 
-cd $FILES_DIR/builtin_scripts
+cd $FILES_DIR/data
 $DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR openmw_aux/*lua
 $DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR scripts/omw/ai.lua
 $DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR scripts/omw/camera.lua

From e4b2f730c76c119a1c5a086ba255c44395bc20a5 Mon Sep 17 00:00:00 2001
From: adam <ibrahimadam193@gmail.com>
Date: Tue, 31 May 2022 13:12:40 +0000
Subject: [PATCH 2552/2859] Make inventory example runnable in a script

---
 files/lua_api/openmw/core.lua | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/files/lua_api/openmw/core.lua b/files/lua_api/openmw/core.lua
index 659a17beb1..24bddabd6d 100644
--- a/files/lua_api/openmw/core.lua
+++ b/files/lua_api/openmw/core.lua
@@ -230,9 +230,11 @@
 -- @param type (optional) items type (see @{openmw.types#types})
 -- @return #ObjectList
 -- @usage
--- local type = require('openmw.types')
--- local all = inventory:getAll()
--- local weapons = inventory:getAll(types.Weapon)
+-- local types = require('openmw.types')
+-- local self = require('openmw.self')
+-- local playerInventory = types.Actor.inventory(self.object)
+-- local all = playerInventory:getAll()
+-- local weapons = playerInventory:getAll(types.Weapon)
 
 
 return nil

From ad3b83432c1a87d20fca76f7b91604cc094b7695 Mon Sep 17 00:00:00 2001
From: beelzebielsk <ibrahimadam193@gmail.com>
Date: Tue, 31 May 2022 13:16:19 +0000
Subject: [PATCH 2553/2859] Fix docs typos

---
 files/lua_api/openmw/types.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/lua_api/openmw/types.lua b/files/lua_api/openmw/types.lua
index 34f7f8b442..3504c0dcd0 100644
--- a/files/lua_api/openmw/types.lua
+++ b/files/lua_api/openmw/types.lua
@@ -729,7 +729,7 @@
 -- @field #string name Human-readable name
 -- @field #string model VFS path to the model
 -- @field #string mwscript MWScript on this weapon (can be empty)
--- @field #string icon
+-- @field #string icon VFS path to the icon
 -- @field #string enchant
 -- @field #boolean isMagical
 -- @field #boolean isSilver
@@ -936,7 +936,7 @@
 -- @field #string name Human-readable name
 -- @field #string model VFS path to the model
 -- @field #string mwscript MWScript on this container (can be empty)
--- @field #number weight capacity of this container (can be empty)
+-- @field #number weight capacity of this container
 
 --- @{#Door} functions
 -- @field [parent=#types] #Door Door

From 4dee9acd1ea0a58ad3dce7ecf24c85225c06936e Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Tue, 31 May 2022 16:26:51 -0700
Subject: [PATCH 2554/2859] fill bars to postprocess hud

---
 components/fx/widgets.cpp                     |  2 ++
 components/fx/widgets.hpp                     | 12 ++++++++++++
 files/mygui/openmw_postprocessor_hud.skin.xml | 14 ++++++++++++--
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/components/fx/widgets.cpp b/components/fx/widgets.cpp
index 4316e8d7fe..749f0a1c6a 100644
--- a/components/fx/widgets.cpp
+++ b/components/fx/widgets.cpp
@@ -32,6 +32,7 @@ namespace fx
                 return;
 
             mCheckbutton->setCaptionWithReplacing(value ? "#{sOn}" : "#{sOff}");
+            mFill->setVisible(value);
 
             uniform->setValue<bool>(value);
         }
@@ -61,6 +62,7 @@ namespace fx
             Base::initialiseOverride();
 
             assignWidget(mCheckbutton, "Checkbutton");
+            assignWidget(mFill, "Fill");
 
             mCheckbutton->eventMouseButtonClick += MyGUI::newDelegate(this, &EditBool::notifyMouseButtonClick);
         }
diff --git a/components/fx/widgets.hpp b/components/fx/widgets.hpp
index ed50e6d4d4..0019bd349c 100644
--- a/components/fx/widgets.hpp
+++ b/components/fx/widgets.hpp
@@ -68,6 +68,7 @@ namespace fx
             void notifyMouseButtonClick(MyGUI::Widget* sender);
 
             MyGUI::Button* mCheckbutton;
+            MyGUI::Widget* mFill;
         };
 
         template <class T, class UType>
@@ -86,17 +87,26 @@ namespace fx
                 else
                     mValueLabel->setCaption(std::to_string(mValue));
 
+                float range = 0.f;
+
                 if (auto uniform = mUniform.lock())
                 {
                     if constexpr (std::is_fundamental_v<UType>)
+                    {
                         uniform->template setValue<UType>(mValue);
+                        range = uniform->template getMax<UType>() - uniform->template getMin<UType>();
+                    }
                     else
                     {
                         UType uvalue = uniform->template getValue<UType>();
                         uvalue[mIndex] = mValue;
                         uniform->template setValue<UType>(uvalue);
+                        range = uniform->template getMax<UType>()[mIndex] - uniform->template getMin<UType>()[mIndex];
                     }
                 }
+
+                float fill = (range == 0.f) ? 1.f : mValue / range;
+                mFill->setRealSize(fill, 1.0);
             }
 
             void setValueFromUniform() override
@@ -135,6 +145,7 @@ namespace fx
                 assignWidget(mValueLabel, "Value");
                 assignWidget(mButtonIncrease, "ButtonIncrease");
                 assignWidget(mButtonDecrease, "ButtonDecrease");
+                assignWidget(mFill, "Fill");
 
                 mButtonIncrease->eventMouseButtonClick += MyGUI::newDelegate(this, &EditNumber::notifyButtonClicked);
                 mButtonDecrease->eventMouseButtonClick += MyGUI::newDelegate(this, &EditNumber::notifyButtonClicked);
@@ -226,6 +237,7 @@ namespace fx
             MyGUI::Button* mButtonDecrease;
             MyGUI::Button* mButtonIncrease;
             MyGUI::Widget* mDragger;
+            MyGUI::Widget* mFill;
             MyGUI::TextBox* mValueLabel;
             T mValue;
 
diff --git a/files/mygui/openmw_postprocessor_hud.skin.xml b/files/mygui/openmw_postprocessor_hud.skin.xml
index ad9a5667be..094330620c 100644
--- a/files/mygui/openmw_postprocessor_hud.skin.xml
+++ b/files/mygui/openmw_postprocessor_hud.skin.xml
@@ -3,6 +3,11 @@
 
 	<Resource type="ResourceLayout" name="MW_ValueEditNumber" version="3.2.0">
 		<Widget type="Widget" skin="" position="0 0 100 50" align="Stretch" name="Root">
+            <Widget type="Widget" skin="BlackBG" position="0 0 100 50" name="Fill" align="Stretch">
+                <Property key="NeedMouse" value="false"/>
+                <Property key="NeedKey" value="false"/>
+                <Property key="Colour" value="#25436b"/>
+            </Widget>
             <Widget type="HBox" skin="MW_Box" position_real="0 0 1 1" align="Stretch" name="Layout">
                 <UserString key="HStretch" value="true"/>
                 <UserString key="VStretch" value="true"/>
@@ -26,6 +31,12 @@
 
 	<Resource type="ResourceLayout" name="MW_ValueEditBool" version="3.2.0">
 		<Widget type="Widget" skin="" position="0 0 100 50" align="Stretch" name="Root">
+            <Widget type="Widget" skin="BlackBG" position_real="0 0 1 1" name="Fill" align="Stretch">
+                <Property key="NeedMouse" value="false"/>
+                <Property key="NeedKey" value="false"/>
+                <Property key="Colour" value="#25436b"/>
+                <Property key="Visible" value="false"/>
+            </Widget>
             <Widget type="HBox" skin="MW_Box" position_real="0 0 1 1" align="Stretch" name="Layout">
                 <UserString key="HStretch" value="true"/>
                 <UserString key="VStretch" value="true"/>
@@ -35,7 +46,6 @@
                     <UserString key="VStretch" value="true"/>
                     <Property key="TextAlign" value="Center"/>
                     <Property key="Caption" value="On"/>
-                    <Property key="Colour" value="1 0 0 1"/>
                 </Widget>
             </Widget>
 		</Widget>
@@ -71,7 +81,7 @@
         <Property key="FontName" value="Default"/>
         <Property key="TextAlign" value="Left VCenter"/>
         <Property key="TextColour" value="#{fontcolour=header}"/>
-        
+
         <Child type="Widget" skin="IB_B" offset="0 14 16 2" align="Bottom HStretch"/>
         <BasisSkin type="SimpleText" offset="0 0 16 14" align="Stretch"/>
     </Resource>

From fb5eb542ff43f7d48047eaf71c33ab3c9c4d880f Mon Sep 17 00:00:00 2001
From: beelzebielsk <ibrahimadam193@gmail.com>
Date: Wed, 1 Jun 2022 13:19:03 +0000
Subject: [PATCH 2555/2859] Lua api for potion records

---
 apps/openmw/CMakeLists.txt         |  2 +-
 apps/openmw/mwlua/types/potion.cpp | 34 ++++++++++++++++++++++++++++++
 apps/openmw/mwlua/types/types.cpp  |  2 +-
 apps/openmw/mwlua/types/types.hpp  |  1 +
 files/lua_api/openmw/types.lua     | 16 ++++++++++++++
 5 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 apps/openmw/mwlua/types/potion.cpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 2985d89579..925dbdef49 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -62,7 +62,7 @@ add_openmw_dir (mwlua
     luamanagerimp object worldview userdataserializer eventqueue
     luabindings localscripts playerscripts objectbindings cellbindings asyncbindings settingsbindings
     camerabindings uibindings inputbindings nearbybindings postprocessingbindings stats debugbindings
-    types/types types/door types/actor types/container types/weapon types/npc types/creature types/activator types/book types/lockpick types/probe types/apparatus types/misc
+    types/types types/door types/actor types/container types/weapon types/npc types/creature types/activator types/book types/lockpick types/probe types/apparatus types/potion types/misc
     )
 
 add_openmw_dir (mwsound
diff --git a/apps/openmw/mwlua/types/potion.cpp b/apps/openmw/mwlua/types/potion.cpp
new file mode 100644
index 0000000000..0d1b7e202e
--- /dev/null
+++ b/apps/openmw/mwlua/types/potion.cpp
@@ -0,0 +1,34 @@
+#include "types.hpp"
+
+#include <components/esm3/loadalch.hpp>
+
+#include <apps/openmw/mwworld/esmstore.hpp>
+
+#include "../luabindings.hpp"
+
+namespace sol
+{
+    template <>
+    struct is_automagical<ESM::Potion> : std::false_type {};
+}
+
+namespace MWLua
+{
+    void addPotionBindings(sol::table potion, const Context& context)
+    {
+        const MWWorld::Store<ESM::Potion>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Potion>();
+        potion["record"] = sol::overload(
+            [](const Object& obj) -> const ESM::Potion* { return obj.ptr().get<ESM::Potion>()->mBase; },
+            [store](const std::string& recordId) -> const ESM::Potion* { return store->find(recordId); });
+
+        sol::usertype<ESM::Potion> record = context.mLua->sol().new_usertype<ESM::Potion>("ESM3_Potion");
+        record[sol::meta_function::to_string] = [](const ESM::Potion& rec) { return "ESM3_Potion[" + rec.mId + "]"; };
+        record["id"] = sol::readonly_property([](const ESM::Potion& rec) -> std::string { return rec.mId; });
+        record["name"] = sol::readonly_property([](const ESM::Potion& rec) -> std::string { return rec.mName; });
+        record["model"] = sol::readonly_property([](const ESM::Potion& rec) -> std::string { return rec.mModel; });
+        record["icon"] = sol::readonly_property([](const ESM::Potion& rec) -> std::string { return rec.mIcon; });
+        record["mwscript"] = sol::readonly_property([](const ESM::Potion& rec) -> std::string { return rec.mScript; });
+        record["weight"] = sol::readonly_property([](const ESM::Potion& rec) -> float { return rec.mData.mWeight; });
+        record["value"] = sol::readonly_property([](const ESM::Potion& rec) -> int { return rec.mData.mValue; });
+    }
+}
diff --git a/apps/openmw/mwlua/types/types.cpp b/apps/openmw/mwlua/types/types.cpp
index 23ce976d4f..6533696896 100644
--- a/apps/openmw/mwlua/types/types.cpp
+++ b/apps/openmw/mwlua/types/types.cpp
@@ -164,7 +164,7 @@ namespace MWLua
         addType(ObjectTypeName::Ingredient, {ESM::REC_INGR}, ObjectTypeName::Item);
         addType(ObjectTypeName::Light, {ESM::REC_LIGH}, ObjectTypeName::Item);
         addMiscellaneousBindings(addType(ObjectTypeName::MiscItem, {ESM::REC_MISC}, ObjectTypeName::Item), context);
-        addType(ObjectTypeName::Potion, {ESM::REC_ALCH}, ObjectTypeName::Item);
+        addPotionBindings(addType(ObjectTypeName::Potion, {ESM::REC_ALCH}, ObjectTypeName::Item), context);
         addWeaponBindings(addType(ObjectTypeName::Weapon, {ESM::REC_WEAP}, ObjectTypeName::Item), context);
         addBookBindings(addType(ObjectTypeName::Book, {ESM::REC_BOOK}, ObjectTypeName::Item), context);
         addLockpickBindings(addType(ObjectTypeName::Lockpick, {ESM::REC_LOCK}, ObjectTypeName::Item), context);
diff --git a/apps/openmw/mwlua/types/types.hpp b/apps/openmw/mwlua/types/types.hpp
index 464359152e..63df9a37f1 100644
--- a/apps/openmw/mwlua/types/types.hpp
+++ b/apps/openmw/mwlua/types/types.hpp
@@ -36,6 +36,7 @@ namespace MWLua
     void addProbeBindings(sol::table probe, const Context& context);
     void addApparatusBindings(sol::table apparatus, const Context& context);
     void addMiscellaneousBindings(sol::table miscellaneous, const Context& context);
+    void addPotionBindings(sol::table potion, const Context& context);
 }
 
 #endif // MWLUA_TYPES_H
diff --git a/files/lua_api/openmw/types.lua b/files/lua_api/openmw/types.lua
index 3504c0dcd0..b7a5948d56 100644
--- a/files/lua_api/openmw/types.lua
+++ b/files/lua_api/openmw/types.lua
@@ -681,6 +681,22 @@
 -- @param openmw.core#GameObject object
 -- @return #boolean
 
+---
+-- Returns the read-only @{#PotionRecord} of a potion
+-- @function [parent=#Potion] record
+-- @param #any objectOrRecordId
+-- @return #PotionRecord
+
+---
+-- @type PotionRecord
+-- @field #string id Record id
+-- @field #string name Human-readable name
+-- @field #string model VFS path to the model
+-- @field #string mwscript MWScript on this potion (can be empty)
+-- @field #string icon VFS path to the icon
+-- @field #number weight
+-- @field #number value
+
 
 
 --- @{#Weapon} functions

From 6bb296723e896c3cf8fb4069581d8c755dacd64c Mon Sep 17 00:00:00 2001
From: Mads Buvik Sandvei <madssandvei@protonmail.com>
Date: Wed, 1 Jun 2022 21:28:15 +0200
Subject: [PATCH 2556/2859] Apply Mask_RenderToTexture to local map RTT node

---
 apps/openmw/mwrender/localmap.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index 9e7b95fb0c..ccd3220efe 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -662,6 +662,8 @@ LocalMapRenderToTexture::LocalMapRenderToTexture(osg::Node* sceneRoot, int res,
     , mSceneRoot(sceneRoot)
     , mActive(true)
 {
+    setNodeMask(Mask_RenderToTexture);
+
     if (SceneUtil::AutoDepth::isReversed())
         mProjectionMatrix = SceneUtil::getReversedZProjectionMatrixAsOrtho(-mapWorldSize / 2, mapWorldSize / 2, -mapWorldSize / 2, mapWorldSize / 2, 5, (zmax - zmin) + 10);
     else

From 23f1d21e48e959410a9723696a74cd19c088262d Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Thu, 2 Jun 2022 01:35:39 +0200
Subject: [PATCH 2557/2859] Make the behaviour of `omw.weatherTransition` in
 omwfx more reasonable

---
 components/fx/stateupdater.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/fx/stateupdater.hpp b/components/fx/stateupdater.hpp
index 8b181729d1..39098c5e2f 100644
--- a/components/fx/stateupdater.hpp
+++ b/components/fx/stateupdater.hpp
@@ -85,7 +85,7 @@ namespace fx
 
         void setWindSpeed(float speed) { mData.get<WindSpeed>() = speed; }
 
-        void setWeatherTransition(float transition) { mData.get<WeatherTransition>() = transition; }
+        void setWeatherTransition(float transition) { mData.get<WeatherTransition>() = transition > 0 ? 1 - transition : 0; }
 
         void bindPointLights(std::shared_ptr<SceneUtil::PPLightBuffer> buffer)
         {

From a3d95785d7df55d0f4f724b70ced6fce81e30300 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Wed, 1 Jun 2022 22:03:58 -0700
Subject: [PATCH 2558/2859] remove unecassary dirty, don't allow dividers to
 have mouse input

---
 apps/openmw/mwgui/postprocessorhud.cpp | 6 +++++-
 apps/openmw/mwrender/postprocessor.cpp | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwgui/postprocessorhud.cpp b/apps/openmw/mwgui/postprocessorhud.cpp
index 2fa4760867..e21531da54 100644
--- a/apps/openmw/mwgui/postprocessorhud.cpp
+++ b/apps/openmw/mwgui/postprocessorhud.cpp
@@ -378,7 +378,11 @@ namespace MWGui
                     continue;
 
                 if (!uniform->mHeader.empty())
-                    mConfigArea->createWidget<Gui::AutoSizedTextBox>("MW_UniformGroup", {0,0,0,34}, MyGUI::Align::Default)->setCaption(uniform->mHeader);
+                {
+                    Gui::AutoSizedTextBox* divider = mConfigArea->createWidget<Gui::AutoSizedTextBox>("MW_UniformGroup", {0,0,0,34}, MyGUI::Align::Default);
+                    divider->setNeedMouseFocus(false);
+                    divider->setCaption(uniform->mHeader);
+                }
 
                 fx::Widgets::UniformBase* uwidget = mConfigArea->createWidget<fx::Widgets::UniformBase>("MW_UniformEdit", {0,0,0,22}, MyGUI::Align::Default);
                 uwidget->init(uniform);
diff --git a/apps/openmw/mwrender/postprocessor.cpp b/apps/openmw/mwrender/postprocessor.cpp
index 38ee13831c..d149a23e50 100644
--- a/apps/openmw/mwrender/postprocessor.cpp
+++ b/apps/openmw/mwrender/postprocessor.cpp
@@ -148,7 +148,6 @@ namespace MWRender
             {
                 const auto [w, h] = rt.mSize.get(mWidth, mHeight);
                 rt.mTarget->setTextureSize(w, h);
-                rt.mTarget->dirtyTextureObject();
             }
         }
 

From a204f392c983e132f46c82c5890eae5f2d4dbb50 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Wed, 1 Jun 2022 22:09:13 +0200
Subject: [PATCH 2559/2859] Minor simplification in multidircollection.cpp

---
 components/files/multidircollection.cpp | 17 +----------------
 components/files/multidircollection.hpp | 16 +---------------
 2 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/components/files/multidircollection.cpp b/components/files/multidircollection.cpp
index 98e25fcc86..a052b3016e 100644
--- a/components/files/multidircollection.cpp
+++ b/components/files/multidircollection.cpp
@@ -16,22 +16,7 @@ namespace Files
         {
             if (mStrict)
                 return left==right;
-
-            std::size_t len = left.length();
-
-            if (len!=right.length())
-                return false;
-
-            for (std::size_t i=0; i<len; ++i)
-            {
-                char l = Misc::StringUtils::toLower (left[i]);
-                char r = Misc::StringUtils::toLower (right[i]);
-
-                if (l!=r)
-                    return false;
-            }
-
-            return true;
+            return Misc::StringUtils::ciEqual(left, right);
         }
     };
 
diff --git a/components/files/multidircollection.hpp b/components/files/multidircollection.hpp
index c213c8f892..c967f30169 100644
--- a/components/files/multidircollection.hpp
+++ b/components/files/multidircollection.hpp
@@ -24,21 +24,7 @@ namespace Files
         {
             if (mStrict)
                 return left<right;
-
-            std::size_t min = std::min (left.length(), right.length());
-
-            for (std::size_t i=0; i<min; ++i)
-            {
-                char l = Misc::StringUtils::toLower (left[i]);
-                char r = Misc::StringUtils::toLower (right[i]);
-
-                if (l<r)
-                    return true;
-                if (l>r)
-                    return false;
-            }
-
-            return left.length()<right.length();
+            return Misc::StringUtils::ciLess(left, right);
         }
     };
 

From 72f0174ed0a146a8c7ca9563ee035267e6a095e2 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Thu, 2 Jun 2022 22:56:24 +0200
Subject: [PATCH 2560/2859] Do not filter `files/data` in .gitignore

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 5c07d3e54a..cc9cb3e116 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,7 +34,6 @@ CMakeLists.txt.user*
 .vscode
 
 ## resources
-data
 resources
 /*.cfg
 /*.desktop

From 3affe9913f8145e089d1e2168b812e9fdd14bd7e Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 1 Jun 2022 22:53:18 +0200
Subject: [PATCH 2561/2859] Limit the number of simultaneously open not
 actively used content files

Use LRU cache for ESMReaders. When cache capacity is reached close least
recently used ESMReader. Remember the file name if a reader was open. Once the
reader requested again open the file if there is stored name for it. Put
released ESMReader to the back of the free items list. Close ESMReader's from
the front of the free items list.

Cached item can be used only by one client at the same time. If the same item is
requested twice exception is thrown. This should never happen in practice. If
this happens need to fix the client logic.

It's allowed to go over the capacity limit when requesting different readers.
Ideally this should never happen but there will be system error anyway
signalizing about too many open files. Need to fix client logic in this case.

All places that were using a vector of ESMReaders now using the cache. Cache is
local for each use case and there is no need for a thread safety.
---
 apps/bulletobjecttool/main.cpp               |  3 +-
 apps/navmeshtool/main.cpp                    |  3 +-
 apps/navmeshtool/worldspacedata.cpp          | 13 +--
 apps/navmeshtool/worldspacedata.hpp          |  3 +-
 apps/openmw/mwbase/world.hpp                 |  2 -
 apps/openmw/mwrender/groundcover.cpp         | 12 +--
 apps/openmw/mwrender/objectpaging.cpp        | 12 +--
 apps/openmw/mwworld/cells.cpp                | 23 ++---
 apps/openmw/mwworld/cells.hpp                |  5 +-
 apps/openmw/mwworld/cellstore.cpp            | 29 ++++---
 apps/openmw/mwworld/cellstore.hpp            |  7 +-
 apps/openmw/mwworld/esmloader.cpp            | 32 ++++---
 apps/openmw/mwworld/esmloader.hpp            | 12 +--
 apps/openmw/mwworld/esmstore.cpp             | 27 +++---
 apps/openmw/mwworld/esmstore.hpp             | 10 ++-
 apps/openmw/mwworld/groundcoverstore.cpp     |  3 +-
 apps/openmw/mwworld/worldimp.cpp             | 53 +++---------
 apps/openmw/mwworld/worldimp.hpp             |  9 +-
 apps/openmw_test_suite/CMakeLists.txt        |  2 +
 apps/openmw_test_suite/esm3/readerscache.cpp | 91 ++++++++++++++++++++
 apps/openmw_test_suite/esmloader/load.cpp    | 11 +--
 components/CMakeLists.txt                    |  2 +-
 components/esm3/esmreader.cpp                | 23 ++---
 components/esm3/esmreader.hpp                |  6 +-
 components/esm3/readerscache.cpp             | 87 +++++++++++++++++++
 components/esm3/readerscache.hpp             | 71 +++++++++++++++
 components/esmloader/load.cpp                | 17 ++--
 components/esmloader/load.hpp                |  2 +-
 components/resource/foreachbulletobject.cpp  | 13 +--
 components/resource/foreachbulletobject.hpp  |  4 +-
 30 files changed, 419 insertions(+), 168 deletions(-)
 create mode 100644 apps/openmw_test_suite/esm3/readerscache.cpp
 create mode 100644 components/esm3/readerscache.cpp
 create mode 100644 components/esm3/readerscache.hpp

diff --git a/apps/bulletobjecttool/main.cpp b/apps/bulletobjecttool/main.cpp
index 9a6f2877ac..973ec3ee8b 100644
--- a/apps/bulletobjecttool/main.cpp
+++ b/apps/bulletobjecttool/main.cpp
@@ -15,6 +15,7 @@
 #include <components/version/version.hpp>
 #include <components/vfs/manager.hpp>
 #include <components/vfs/registerarchives.hpp>
+#include <components/esm3/readerscache.hpp>
 
 #include <boost/program_options.hpp>
 
@@ -156,7 +157,7 @@ namespace
         Settings::Manager settings;
         settings.load(config);
 
-        std::vector<ESM::ESMReader> readers(contentFiles.size());
+        ESM::ReadersCache readers;
         EsmLoader::Query query;
         query.mLoadActivators = true;
         query.mLoadCells = true;
diff --git a/apps/navmeshtool/main.cpp b/apps/navmeshtool/main.cpp
index 7fef578684..9b49fa2fff 100644
--- a/apps/navmeshtool/main.cpp
+++ b/apps/navmeshtool/main.cpp
@@ -20,6 +20,7 @@
 #include <components/version/version.hpp>
 #include <components/vfs/manager.hpp>
 #include <components/vfs/registerarchives.hpp>
+#include <components/esm3/readerscache.hpp>
 
 #include <osg/Vec3f>
 
@@ -174,7 +175,7 @@ namespace NavMeshTool
 
             DetourNavigator::NavMeshDb db(dbPath, maxDbFileSize);
 
-            std::vector<ESM::ESMReader> readers(contentFiles.size());
+            ESM::ReadersCache readers;
             EsmLoader::Query query;
             query.mLoadActivators = true;
             query.mLoadCells = true;
diff --git a/apps/navmeshtool/worldspacedata.cpp b/apps/navmeshtool/worldspacedata.cpp
index fae58c363e..56f9147ff3 100644
--- a/apps/navmeshtool/worldspacedata.cpp
+++ b/apps/navmeshtool/worldspacedata.cpp
@@ -20,6 +20,7 @@
 #include <components/vfs/manager.hpp>
 #include <components/debug/debugging.hpp>
 #include <components/navmeshtool/protocol.hpp>
+#include <components/esm3/readerscache.hpp>
 
 #include <LinearMath/btVector3.h>
 
@@ -68,17 +69,17 @@ namespace NavMeshTool
         }
 
         std::vector<CellRef> loadCellRefs(const ESM::Cell& cell, const EsmLoader::EsmData& esmData,
-            std::vector<ESM::ESMReader>& readers)
+            ESM::ReadersCache& readers)
         {
             std::vector<EsmLoader::Record<CellRef>> cellRefs;
 
             for (std::size_t i = 0; i < cell.mContextList.size(); i++)
             {
-                ESM::ESMReader& reader = readers[static_cast<std::size_t>(cell.mContextList[i].index)];
-                cell.restore(reader, static_cast<int>(i));
+                ESM::ReadersCache::BusyItem reader = readers.get(static_cast<std::size_t>(cell.mContextList[i].index));
+                cell.restore(*reader, static_cast<int>(i));
                 ESM::CellRef cellRef;
                 bool deleted = false;
-                while (ESM::Cell::getNextRef(reader, cellRef, deleted))
+                while (ESM::Cell::getNextRef(*reader, cellRef, deleted))
                 {
                     Misc::StringUtils::lowerCaseInPlace(cellRef.mRefID);
                     const ESM::RecNameInts type = getType(esmData, cellRef.mRefID);
@@ -101,7 +102,7 @@ namespace NavMeshTool
 
         template <class F>
         void forEachObject(const ESM::Cell& cell, const EsmLoader::EsmData& esmData, const VFS::Manager& vfs,
-            Resource::BulletShapeManager& bulletShapeManager, std::vector<ESM::ESMReader>& readers,
+            Resource::BulletShapeManager& bulletShapeManager, ESM::ReadersCache& readers,
             F&& f)
         {
             std::vector<CellRef> cellRefs = loadCellRefs(cell, esmData, readers);
@@ -233,7 +234,7 @@ namespace NavMeshTool
         mAabb.m_max = btVector3(0, 0, 0);
     }
 
-    WorldspaceData gatherWorldspaceData(const DetourNavigator::Settings& settings, std::vector<ESM::ESMReader>& readers,
+    WorldspaceData gatherWorldspaceData(const DetourNavigator::Settings& settings, ESM::ReadersCache& readers,
         const VFS::Manager& vfs, Resource::BulletShapeManager& bulletShapeManager, const EsmLoader::EsmData& esmData,
         bool processInteriorCells, bool writeBinaryLog)
     {
diff --git a/apps/navmeshtool/worldspacedata.hpp b/apps/navmeshtool/worldspacedata.hpp
index dc2ca30c73..ca229ad1fa 100644
--- a/apps/navmeshtool/worldspacedata.hpp
+++ b/apps/navmeshtool/worldspacedata.hpp
@@ -18,6 +18,7 @@
 namespace ESM
 {
     class ESMReader;
+    class ReadersCache;
 }
 
 namespace VFS
@@ -89,7 +90,7 @@ namespace NavMeshTool
         std::vector<std::vector<float>> mHeightfields;
     };
 
-    WorldspaceData gatherWorldspaceData(const DetourNavigator::Settings& settings, std::vector<ESM::ESMReader>& readers,
+    WorldspaceData gatherWorldspaceData(const DetourNavigator::Settings& settings, ESM::ReadersCache& readers,
         const VFS::Manager& vfs, Resource::BulletShapeManager& bulletShapeManager, const EsmLoader::EsmData& esmData,
         bool processInteriorCells, bool writeBinaryLog);
 }
diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 1d9afc9b64..b20ae33d63 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -158,8 +158,6 @@ namespace MWBase
 
             virtual const MWWorld::ESMStore& getStore() const = 0;
 
-            virtual std::vector<ESM::ESMReader>& getEsmReader() = 0;
-
             virtual MWWorld::LocalScripts& getLocalScripts() = 0;
 
             virtual bool hasCellChanged() const = 0;
diff --git a/apps/openmw/mwrender/groundcover.cpp b/apps/openmw/mwrender/groundcover.cpp
index a25ff004c0..7271a06df9 100644
--- a/apps/openmw/mwrender/groundcover.cpp
+++ b/apps/openmw/mwrender/groundcover.cpp
@@ -12,6 +12,7 @@
 #include <components/sceneutil/nodecallback.hpp>
 #include <components/terrain/quadtreenode.hpp>
 #include <components/shader/shadermanager.hpp>
+#include <components/esm3/readerscache.hpp>
 
 #include "../mwworld/groundcoverstore.hpp"
 
@@ -176,7 +177,7 @@ namespace MWRender
         osg::Vec2f minBound = (center - osg::Vec2f(size/2.f, size/2.f));
         osg::Vec2f maxBound = (center + osg::Vec2f(size/2.f, size/2.f));
         DensityCalculator calculator(mDensity);
-        std::vector<ESM::ESMReader> esm;
+        ESM::ReadersCache readers;
         osg::Vec2i startCell = osg::Vec2i(std::floor(center.x() - size/2.f), std::floor(center.y() - size/2.f));
         for (int cellX = startCell.x(); cellX < startCell.x() + size; ++cellX)
         {
@@ -190,14 +191,13 @@ namespace MWRender
                 std::map<ESM::RefNum, ESM::CellRef> refs;
                 for (size_t i=0; i<cell.mContextList.size(); ++i)
                 {
-                    unsigned int index = cell.mContextList[i].index;
-                    if (esm.size() <= index)
-                        esm.resize(index+1);
-                    cell.restore(esm[index], i);
+                    const std::size_t index = static_cast<std::size_t>(cell.mContextList[i].index);
+                    const ESM::ReadersCache::BusyItem reader = readers.get(index);
+                    cell.restore(*reader, i);
                     ESM::CellRef ref;
                     ref.mRefNum.unset();
                     bool deleted = false;
-                    while(cell.getNextRef(esm[index], ref, deleted))
+                    while (cell.getNextRef(*reader, ref, deleted))
                     {
                         if (!deleted && refs.find(ref.mRefNum) == refs.end() && !calculator.isInstanceEnabled()) deleted = true;
                         if (!deleted && !isInChunkBorders(ref, minBound, maxBound)) deleted = true;
diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index 7afb1bd4ba..23532f8b07 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -17,6 +17,7 @@
 #include <components/sceneutil/clone.hpp>
 #include <components/sceneutil/util.hpp>
 #include <components/vfs/manager.hpp>
+#include <components/esm3/readerscache.hpp>
 
 #include <osgParticle/ParticleProcessor>
 #include <osgParticle/ParticleSystemUpdater>
@@ -412,7 +413,7 @@ namespace MWRender
         osg::Vec3f relativeViewPoint = viewPoint - worldCenter;
 
         std::map<ESM::RefNum, ESM::CellRef> refs;
-        std::vector<ESM::ESMReader> esm;
+        ESM::ReadersCache readers;
         const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
 
         for (int cellX = startCell.x(); cellX < startCell.x() + size; ++cellX)
@@ -425,17 +426,16 @@ namespace MWRender
                 {
                     try
                     {
-                        unsigned int index = cell->mContextList[i].index;
-                        if (esm.size()<=index)
-                            esm.resize(index+1);
-                        cell->restore(esm[index], i);
+                        const std::size_t index = static_cast<std::size_t>(cell->mContextList[i].index);
+                        const ESM::ReadersCache::BusyItem reader = readers.get(index);
+                        cell->restore(*reader, i);
                         ESM::CellRef ref;
                         ref.mRefNum.unset();
                         ESM::MovedCellRef cMRef;
                         cMRef.mRefNum.mIndex = 0;
                         bool deleted = false;
                         bool moved = false;
-                        while (ESM::Cell::getNextRef(esm[index], ref, deleted, cMRef, moved, ESM::Cell::GetNextRefMode::LoadOnlyNotMoved))
+                        while (ESM::Cell::getNextRef(*reader, ref, deleted, cMRef, moved, ESM::Cell::GetNextRefMode::LoadOnlyNotMoved))
                         {
                             if (moved)
                                 continue;
diff --git a/apps/openmw/mwworld/cells.cpp b/apps/openmw/mwworld/cells.cpp
index b7b0338635..1105da897a 100644
--- a/apps/openmw/mwworld/cells.cpp
+++ b/apps/openmw/mwworld/cells.cpp
@@ -68,9 +68,7 @@ MWWorld::CellStore *MWWorld::Cells::getCellStore (const ESM::Cell *cell)
         std::map<std::string, CellStore>::iterator result = mInteriors.find (lowerName);
 
         if (result==mInteriors.end())
-        {
-            result = mInteriors.insert (std::make_pair (lowerName, CellStore (cell, mStore, mReader))).first;
-        }
+            result = mInteriors.emplace(std::move(lowerName), CellStore(cell, mStore, mReaders)).first;
 
         return &result->second;
     }
@@ -80,11 +78,8 @@ MWWorld::CellStore *MWWorld::Cells::getCellStore (const ESM::Cell *cell)
             mExteriors.find (std::make_pair (cell->getGridX(), cell->getGridY()));
 
         if (result==mExteriors.end())
-        {
-            result = mExteriors.insert (std::make_pair (
-                std::make_pair (cell->getGridX(), cell->getGridY()), CellStore (cell, mStore, mReader))).first;
-
-        }
+            result = mExteriors.emplace(std::make_pair(cell->getGridX(), cell->getGridY()),
+                                        CellStore(cell, mStore, mReaders)).first;
 
         return &result->second;
     }
@@ -130,9 +125,10 @@ void MWWorld::Cells::writeCell (ESM::ESMWriter& writer, CellStore& cell) const
     writer.endRecord (ESM::REC_CSTA);
 }
 
-MWWorld::Cells::Cells (const MWWorld::ESMStore& store, std::vector<ESM::ESMReader>& reader)
-: mStore (store), mReader (reader),
-  mIdCacheIndex (0)
+MWWorld::Cells::Cells (const MWWorld::ESMStore& store, ESM::ReadersCache& readers)
+    : mStore(store)
+    , mReaders(readers)
+    , mIdCacheIndex(0)
 {
     int cacheSize = std::clamp(Settings::Manager::getInt("pointers cache size", "Cells"), 40, 1000);
     mIdCache = IdCache(cacheSize, std::pair<std::string, CellStore *> ("", (CellStore*)nullptr));
@@ -165,8 +161,7 @@ MWWorld::CellStore *MWWorld::Cells::getExterior (int x, int y)
             cell = MWBase::Environment::get().getWorld()->createRecord (record);
         }
 
-        result = mExteriors.insert (std::make_pair (
-            std::make_pair (x, y), CellStore (cell, mStore, mReader))).first;
+        result = mExteriors.emplace(std::make_pair(x, y), CellStore(cell, mStore, mReaders)).first;
     }
 
     if (result->second.getState()!=CellStore::State_Loaded)
@@ -186,7 +181,7 @@ MWWorld::CellStore *MWWorld::Cells::getInterior (const std::string& name)
     {
         const ESM::Cell *cell = mStore.get<ESM::Cell>().find(lowerName);
 
-        result = mInteriors.insert (std::make_pair (lowerName, CellStore (cell, mStore, mReader))).first;
+        result = mInteriors.emplace(std::move(lowerName), CellStore(cell, mStore, mReaders)).first;
     }
 
     if (result->second.getState()!=CellStore::State_Loaded)
diff --git a/apps/openmw/mwworld/cells.hpp b/apps/openmw/mwworld/cells.hpp
index 654d9a14b5..5c2244a2d6 100644
--- a/apps/openmw/mwworld/cells.hpp
+++ b/apps/openmw/mwworld/cells.hpp
@@ -11,6 +11,7 @@ namespace ESM
 {
     class ESMReader;
     class ESMWriter;
+    class ReadersCache;
     struct CellId;
     struct Cell;
     struct RefNum;
@@ -30,7 +31,7 @@ namespace MWWorld
     {
             typedef std::vector<std::pair<std::string, CellStore *> > IdCache;
             const MWWorld::ESMStore& mStore;
-            std::vector<ESM::ESMReader>& mReader;
+            ESM::ReadersCache& mReaders;
             mutable std::map<std::string, CellStore> mInteriors;
             mutable std::map<std::pair<int, int>, CellStore> mExteriors;
             IdCache mIdCache;
@@ -51,7 +52,7 @@ namespace MWWorld
 
             void clear();
 
-            Cells (const MWWorld::ESMStore& store, std::vector<ESM::ESMReader>& reader);
+            explicit Cells(const MWWorld::ESMStore& store, ESM::ReadersCache& reader);
 
             CellStore *getExterior (int x, int y);
 
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 44dcc0de15..7b9dd57d09 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -17,6 +17,7 @@
 #include <components/esm3/fogstate.hpp>
 #include <components/esm3/creaturelevliststate.hpp>
 #include <components/esm3/doorstate.hpp>
+#include <components/esm3/readerscache.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/luamanager.hpp"
@@ -387,8 +388,14 @@ namespace MWWorld
         return false;
     }
 
-    CellStore::CellStore (const ESM::Cell *cell, const MWWorld::ESMStore& esmStore, std::vector<ESM::ESMReader>& readerList)
-        : mStore(esmStore), mReader(readerList), mCell (cell), mState (State_Unloaded), mHasState (false), mLastRespawn(0,0), mRechargingItemsUpToDate(false)
+    CellStore::CellStore(const ESM::Cell* cell, const MWWorld::ESMStore& esmStore, ESM::ReadersCache& readers)
+        : mStore(esmStore)
+        , mReaders(readers)
+        , mCell(cell)
+        , mState(State_Unloaded)
+        , mHasState(false)
+        , mLastRespawn(0, 0)
+        , mRechargingItemsUpToDate(false)
     {
         mWaterLevel = cell->mWater;
     }
@@ -545,8 +552,6 @@ namespace MWWorld
 
     void CellStore::listRefs()
     {
-        std::vector<ESM::ESMReader>& esm = mReader;
-
         assert (mCell);
 
         if (mCell->mContextList.empty())
@@ -558,8 +563,9 @@ namespace MWWorld
             try
             {
                 // Reopen the ESM reader and seek to the right position.
-                int index = mCell->mContextList[i].index;
-                mCell->restore (esm[index], i);
+                const std::size_t index = static_cast<std::size_t>(mCell->mContextList[i].index);
+                const ESM::ReadersCache::BusyItem reader = mReaders.get(index);
+                mCell->restore(*reader, i);
 
                 ESM::CellRef ref;
 
@@ -568,7 +574,7 @@ namespace MWWorld
                 cMRef.mRefNum.mIndex = 0;
                 bool deleted = false;
                 bool moved = false;
-                while (ESM::Cell::getNextRef(esm[index], ref, deleted, cMRef, moved, ESM::Cell::GetNextRefMode::LoadOnlyNotMoved))
+                while (ESM::Cell::getNextRef(*reader, ref, deleted, cMRef, moved, ESM::Cell::GetNextRefMode::LoadOnlyNotMoved))
                 {
                     if (deleted || moved)
                         continue;
@@ -602,8 +608,6 @@ namespace MWWorld
 
     void CellStore::loadRefs()
     {
-        std::vector<ESM::ESMReader>& esm = mReader;
-
         assert (mCell);
 
         if (mCell->mContextList.empty())
@@ -617,8 +621,9 @@ namespace MWWorld
             try
             {
                 // Reopen the ESM reader and seek to the right position.
-                int index = mCell->mContextList[i].index;
-                mCell->restore (esm[index], i);
+                const std::size_t index = static_cast<std::size_t>(mCell->mContextList[i].index);
+                const ESM::ReadersCache::BusyItem reader = mReaders.get(index);
+                mCell->restore(*reader, i);
 
                 ESM::CellRef ref;
                 ref.mRefNum.unset();
@@ -628,7 +633,7 @@ namespace MWWorld
                 cMRef.mRefNum.mIndex = 0;
                 bool deleted = false;
                 bool moved = false;
-                while (ESM::Cell::getNextRef(esm[index], ref, deleted, cMRef, moved, ESM::Cell::GetNextRefMode::LoadOnlyNotMoved))
+                while (ESM::Cell::getNextRef(*reader, ref, deleted, cMRef, moved, ESM::Cell::GetNextRefMode::LoadOnlyNotMoved))
                 {
                     if (moved)
                         continue;
diff --git a/apps/openmw/mwworld/cellstore.hpp b/apps/openmw/mwworld/cellstore.hpp
index 7eea398f6e..091deaf2c5 100644
--- a/apps/openmw/mwworld/cellstore.hpp
+++ b/apps/openmw/mwworld/cellstore.hpp
@@ -38,6 +38,7 @@
 
 namespace ESM
 {
+    class ReadersCache;
     struct Cell;
     struct CellState;
     struct CellId;
@@ -61,7 +62,7 @@ namespace MWWorld
         private:
 
             const MWWorld::ESMStore& mStore;
-            std::vector<ESM::ESMReader>& mReader;
+            ESM::ReadersCache& mReaders;
 
             // Even though fog actually belongs to the player and not cells,
             // it makes sense to store it here since we need it once for each cell.
@@ -211,9 +212,7 @@ namespace MWWorld
             }
 
             /// @param readerList The readers to use for loading of the cell on-demand.
-            CellStore (const ESM::Cell *cell_,
-                       const MWWorld::ESMStore& store,
-                       std::vector<ESM::ESMReader>& readerList);
+            CellStore(const ESM::Cell* cell, const MWWorld::ESMStore& store, ESM::ReadersCache& readers);
 
             const ESM::Cell *getCell() const;
 
diff --git a/apps/openmw/mwworld/esmloader.cpp b/apps/openmw/mwworld/esmloader.cpp
index d9c7d1389f..e9aa590e87 100644
--- a/apps/openmw/mwworld/esmloader.cpp
+++ b/apps/openmw/mwworld/esmloader.cpp
@@ -2,13 +2,13 @@
 #include "esmstore.hpp"
 
 #include <components/esm3/esmreader.hpp>
+#include <components/esm3/readerscache.hpp>
 
 namespace MWWorld
 {
 
-EsmLoader::EsmLoader(MWWorld::ESMStore& store, std::vector<ESM::ESMReader>& readers,
-    ToUTF8::Utf8Encoder* encoder)
-    : mEsm(readers)
+EsmLoader::EsmLoader(MWWorld::ESMStore& store, ESM::ReadersCache& readers, ToUTF8::Utf8Encoder* encoder)
+    : mReaders(readers)
     , mStore(store)
     , mEncoder(encoder)
     , mDialogue(nullptr) // A content file containing INFO records without a DIAL record appends them to the previous file's dialogue
@@ -17,13 +17,25 @@ EsmLoader::EsmLoader(MWWorld::ESMStore& store, std::vector<ESM::ESMReader>& read
 
 void EsmLoader::load(const boost::filesystem::path& filepath, int& index, Loading::Listener* listener)
 {
-    ESM::ESMReader lEsm;
-    lEsm.setEncoder(mEncoder);
-    lEsm.setIndex(index);
-    lEsm.open(filepath.string());
-    lEsm.resolveParentFileIndices(mEsm);
-    mEsm[index] = std::move(lEsm);
-    mStore.load(mEsm[index], listener, mDialogue);
+    const ESM::ReadersCache::BusyItem reader = mReaders.get(static_cast<std::size_t>(index));
+
+    reader->setEncoder(mEncoder);
+    reader->setIndex(index);
+    reader->open(filepath.string());
+    reader->resolveParentFileIndices(mReaders);
+
+    assert(reader->getGameFiles().size() == reader->getParentFileIndices().size());
+    for (std::size_t i = 0, n = reader->getParentFileIndices().size(); i < n; ++i)
+        if (i == static_cast<std::size_t>(reader->getIndex()))
+            throw std::runtime_error("File " + reader->getName() + " asks for parent file "
+                + reader->getGameFiles()[i].name
+                + ", but it is not available or has been loaded in the wrong order. "
+                  "Please run the launcher to fix this issue.");
+
+    mStore.load(*reader, listener, mDialogue);
+
+    if (!mMasterFileFormat.has_value() && Misc::StringUtils::ciEndsWith(reader->getName(), ".esm") && !Misc::StringUtils::ciEndsWith(reader->getName(), ".omwgame"))
+        mMasterFileFormat = reader->getFormat();
 }
 
 } /* namespace MWWorld */
diff --git a/apps/openmw/mwworld/esmloader.hpp b/apps/openmw/mwworld/esmloader.hpp
index 4dfb48c2d1..c1cc406d92 100644
--- a/apps/openmw/mwworld/esmloader.hpp
+++ b/apps/openmw/mwworld/esmloader.hpp
@@ -1,7 +1,7 @@
 #ifndef ESMLOADER_HPP
 #define ESMLOADER_HPP
 
-#include <vector>
+#include <optional>
 
 #include "contentloader.hpp"
 
@@ -12,7 +12,7 @@ namespace ToUTF8
 
 namespace ESM
 {
-    class ESMReader;
+    class ReadersCache;
     struct Dialogue;
 }
 
@@ -23,16 +23,18 @@ class ESMStore;
 
 struct EsmLoader : public ContentLoader
 {
-    EsmLoader(MWWorld::ESMStore& store, std::vector<ESM::ESMReader>& readers,
-        ToUTF8::Utf8Encoder* encoder);
+    explicit EsmLoader(MWWorld::ESMStore& store, ESM::ReadersCache& readers, ToUTF8::Utf8Encoder* encoder);
+
+    std::optional<int> getMasterFileFormat() const { return mMasterFileFormat; }
 
     void load(const boost::filesystem::path& filepath, int& index, Loading::Listener* listener) override;
 
     private:
-        std::vector<ESM::ESMReader>& mEsm;
+        ESM::ReadersCache& mReaders;
         MWWorld::ESMStore& mStore;
         ToUTF8::Utf8Encoder* mEncoder;
         ESM::Dialogue* mDialogue;
+        std::optional<int> mMasterFileFormat;
 };
 
 } /* namespace MWWorld */
diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index bad5685a7f..bd93cc7c4e 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -9,6 +9,7 @@
 #include <components/loadinglistener/loadinglistener.hpp>
 #include <components/lua/configuration.hpp>
 #include <components/misc/algorithm.hpp>
+#include <components/esm3/readerscache.hpp>
 
 #include "../mwmechanics/spelllist.hpp"
 
@@ -24,19 +25,18 @@ namespace
 
     constexpr std::size_t deletedRefID = std::numeric_limits<std::size_t>::max();
 
-    void readRefs(const ESM::Cell& cell, std::vector<Ref>& refs, std::vector<std::string>& refIDs, std::vector<ESM::ESMReader>& readers)
+    void readRefs(const ESM::Cell& cell, std::vector<Ref>& refs, std::vector<std::string>& refIDs, ESM::ReadersCache& readers)
     {
         // TODO: we have many similar copies of this code.
         for (size_t i = 0; i < cell.mContextList.size(); i++)
         {
-            size_t index = cell.mContextList[i].index;
-            if (readers.size() <= index)
-                readers.resize(index + 1);
-            cell.restore(readers[index], i);
+            const std::size_t index = static_cast<std::size_t>(cell.mContextList[i].index);
+            const ESM::ReadersCache::BusyItem reader = readers.get(index);
+            cell.restore(*reader, i);
             ESM::CellRef ref;
             ref.mRefNum.unset();
             bool deleted = false;
-            while(cell.getNextRef(readers[index], ref, deleted))
+            while (cell.getNextRef(*reader, ref, deleted))
             {
                 if(deleted)
                     refs.emplace_back(ref.mRefNum, deletedRefID);
@@ -241,7 +241,7 @@ ESM::LuaScriptsCfg ESMStore::getLuaScriptsCfg() const
     return cfg;
 }
 
-void ESMStore::setUp(bool validateRecords)
+void ESMStore::setUp()
 {
     mIds.clear();
 
@@ -267,15 +267,15 @@ void ESMStore::setUp(bool validateRecords)
     mMagicEffects.setUp();
     mAttributes.setUp();
     mDialogs.setUp();
+}
 
-    if (validateRecords)
-    {
-        validate();
-        countAllCellRefs();
-    }
+void ESMStore::validateRecords(ESM::ReadersCache& readers)
+{
+    validate();
+    countAllCellRefs(readers);
 }
 
-void ESMStore::countAllCellRefs()
+void ESMStore::countAllCellRefs(ESM::ReadersCache& readers)
 {
     // TODO: We currently need to read entire files here again.
     // We should consider consolidating or deferring this reading.
@@ -283,7 +283,6 @@ void ESMStore::countAllCellRefs()
         return;
     std::vector<Ref> refs;
     std::vector<std::string> refIDs;
-    std::vector<ESM::ESMReader> readers;
     for(auto it = mCells.intBegin(); it != mCells.intEnd(); ++it)
         readRefs(*it, refs, refIDs, readers);
     for(auto it = mCells.extBegin(); it != mCells.extEnd(); ++it)
diff --git a/apps/openmw/mwworld/esmstore.hpp b/apps/openmw/mwworld/esmstore.hpp
index 8ad374350e..dd0be016c2 100644
--- a/apps/openmw/mwworld/esmstore.hpp
+++ b/apps/openmw/mwworld/esmstore.hpp
@@ -20,6 +20,11 @@ namespace MWMechanics
     class SpellList;
 }
 
+namespace ESM
+{
+    class ReadersCache;
+}
+
 namespace MWWorld
 {
     class ESMStore
@@ -90,7 +95,7 @@ namespace MWWorld
         /// Validate entries in store after setup
         void validate();
 
-        void countAllCellRefs();
+        void countAllCellRefs(ESM::ReadersCache& readers);
 
         template<class T>
         void removeMissingObjects(Store<T>& store);
@@ -266,7 +271,8 @@ namespace MWWorld
 
         // This method must be called once, after loading all master/plugin files. This can only be done
         //  from the outside, so it must be public.
-        void setUp(bool validateRecords = false);
+        void setUp();
+        void validateRecords(ESM::ReadersCache& readers);
 
         int countSavedGameRecords() const;
 
diff --git a/apps/openmw/mwworld/groundcoverstore.cpp b/apps/openmw/mwworld/groundcoverstore.cpp
index 3e1301cf06..1b27f8eed3 100644
--- a/apps/openmw/mwworld/groundcoverstore.cpp
+++ b/apps/openmw/mwworld/groundcoverstore.cpp
@@ -2,6 +2,7 @@
 
 #include <components/esmloader/load.hpp>
 #include <components/misc/stringops.hpp>
+#include <components/esm3/readerscache.hpp>
 
 namespace MWWorld
 {
@@ -11,7 +12,7 @@ namespace MWWorld
         query.mLoadStatics = true;
         query.mLoadCells = true;
 
-        std::vector<ESM::ESMReader> readers(groundcoverFiles.size());
+        ESM::ReadersCache readers;
         const ::EsmLoader::EsmData content = ::EsmLoader::loadEsmData(query, groundcoverFiles, fileCollections, readers, encoder);
 
         for (const ESM::Static& stat : statics)
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index e70098e177..02ab5785db 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -145,8 +145,8 @@ namespace MWWorld
         ToUTF8::Utf8Encoder* encoder, int activationDistanceOverride,
         const std::string& startCell, const std::string& startupScript,
         const std::string& resourcePath, const std::string& userDataPath)
-    : mResourceSystem(resourceSystem), mLocalScripts (mStore),
-      mCells (mStore, mEsm), mSky (true),
+    : mResourceSystem(resourceSystem), mLocalScripts(mStore),
+      mCells(mStore, mReaders), mSky(true),
       mGodMode(false), mScriptsEnabled(true), mDiscardMovements(true), mContentFiles (contentFiles),
       mUserDataPath(userDataPath),
       mDefaultHalfExtents(Settings::Manager::getVector3("default actor pathfind half extents", "Game")),
@@ -156,30 +156,20 @@ namespace MWWorld
       mLevitationEnabled(true), mGoToJail(false), mDaysInPrison(0),
       mPlayerTraveling(false), mPlayerInJail(false), mSpellPreloadTimer(0.f)
     {
-        mEsm.resize(contentFiles.size());
         Loading::Listener* listener = MWBase::Environment::get().getWindowManager()->getLoadingScreen();
         listener->loadingOn();
 
-        loadContentFiles(fileCollections, contentFiles, mStore, mEsm, encoder, listener);
+        loadContentFiles(fileCollections, contentFiles, encoder, listener);
         loadGroundcoverFiles(fileCollections, groundcoverFiles, encoder);
 
         listener->loadingOff();
 
-        // Find main game file
-        for (const ESM::ESMReader& reader : mEsm)
-        {
-            if (!Misc::StringUtils::ciEndsWith(reader.getName(), ".esm") && !Misc::StringUtils::ciEndsWith(reader.getName(), ".omwgame"))
-                continue;
-            if (reader.getFormat() == 0)
-                ensureNeededRecords();  // and insert records that may not be present in all versions of MW.
-            break;
-        }
-
         mCurrentDate = std::make_unique<DateTimeManager>();
 
         fillGlobalVariables();
 
-        mStore.setUp(true);
+        mStore.setUp();
+        mStore.validateRecords(mReaders);
         mStore.movePlayerRecord();
 
         mSwimHeightScale = mStore.get<ESM::GameSetting>().find("fSwimHeightScale")->mValue.getFloat();
@@ -417,23 +407,6 @@ namespace MWWorld
         }
     }
 
-    void World::validateMasterFiles(const std::vector<ESM::ESMReader>& readers)
-    {
-        for (const auto& esm : readers)
-        {
-            assert(esm.getGameFiles().size() == esm.getParentFileIndices().size());
-            for (unsigned int i=0; i<esm.getParentFileIndices().size(); ++i)
-            {
-                if (!esm.isValidParentFileIndex(i))
-                {
-                    std::string fstring = "File " + esm.getName() + " asks for parent file " + esm.getGameFiles()[i].name
-                        + ", but it is not available or has been loaded in the wrong order. Please run the launcher to fix this issue.";
-                    throw std::runtime_error(fstring);
-                }
-            }
-        }
-    }
-
     void World::ensureNeededRecords()
     {
         std::map<std::string, ESM::Variant> gmst;
@@ -641,11 +614,6 @@ namespace MWWorld
         return mStore;
     }
 
-    std::vector<ESM::ESMReader>& World::getEsmReader()
-    {
-        return mEsm;
-    }
-
     LocalScripts& World::getLocalScripts()
     {
         return mLocalScripts;
@@ -2939,11 +2907,11 @@ namespace MWWorld
         return mScriptsEnabled;
     }
 
-    void World::loadContentFiles(const Files::Collections& fileCollections, const std::vector<std::string>& content, ESMStore& store, std::vector<ESM::ESMReader>& readers, ToUTF8::Utf8Encoder* encoder, Loading::Listener* listener)
+    void World::loadContentFiles(const Files::Collections& fileCollections, const std::vector<std::string>& content,
+        ToUTF8::Utf8Encoder* encoder, Loading::Listener* listener)
     {
         GameContentLoader gameContentLoader;
-        EsmLoader esmLoader(store, readers, encoder);
-        validateMasterFiles(readers);
+        EsmLoader esmLoader(mStore, mReaders, encoder);
 
         gameContentLoader.addLoader(".esm", esmLoader);
         gameContentLoader.addLoader(".esp", esmLoader);
@@ -2951,7 +2919,7 @@ namespace MWWorld
         gameContentLoader.addLoader(".omwaddon", esmLoader);
         gameContentLoader.addLoader(".project", esmLoader);
 
-        OMWScriptsLoader omwScriptsLoader(store);
+        OMWScriptsLoader omwScriptsLoader(mStore);
         gameContentLoader.addLoader(".omwscripts", omwScriptsLoader);
 
         int idx = 0;
@@ -2970,6 +2938,9 @@ namespace MWWorld
             }
             idx++;
         }
+
+        if (const auto v = esmLoader.getMasterFileFormat(); v.has_value() && *v == 0)
+            ensureNeededRecords(); // Insert records that may not be present in all versions of master files.
     }
 
     void World::loadGroundcoverFiles(const Files::Collections& fileCollections, const std::vector<std::string>& groundcoverFiles, ToUTF8::Utf8Encoder* encoder)
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index e77b5d7801..50aff408d5 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -5,6 +5,7 @@
 
 #include <components/settings/settings.hpp>
 #include <components/misc/rng.hpp>
+#include <components/esm3/readerscache.hpp>
 
 #include "../mwbase/world.hpp"
 
@@ -81,7 +82,7 @@ namespace MWWorld
         private:
             Resource::ResourceSystem* mResourceSystem;
 
-            std::vector<ESM::ESMReader> mEsm;
+            ESM::ReadersCache mReaders;
             MWWorld::ESMStore mStore;
             GroundcoverStore mGroundcoverStore;
             LocalScripts mLocalScripts;
@@ -162,13 +163,13 @@ namespace MWWorld
             void updateNavigatorObject(const MWPhysics::Object& object);
 
             void ensureNeededRecords();
-            void validateMasterFiles(const std::vector<ESM::ESMReader>& readers);
 
             void fillGlobalVariables();
 
             void updateSkyDate();
 
-            void loadContentFiles(const Files::Collections& fileCollections, const std::vector<std::string>& content, ESMStore& store, std::vector<ESM::ESMReader>& readers, ToUTF8::Utf8Encoder* encoder, Loading::Listener* listener);
+            void loadContentFiles(const Files::Collections& fileCollections, const std::vector<std::string>& content,
+                ToUTF8::Utf8Encoder* encoder, Loading::Listener* listener);
 
             void loadGroundcoverFiles(const Files::Collections& fileCollections, const std::vector<std::string>& groundcoverFiles, ToUTF8::Utf8Encoder* encoder);
 
@@ -241,8 +242,6 @@ namespace MWWorld
 
             const MWWorld::ESMStore& getStore() const override;
 
-            std::vector<ESM::ESMReader>& getEsmReader() override;
-
             LocalScripts& getLocalScripts() override;
 
             bool hasCellChanged() const override;
diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index 2695b64c05..739d3394b4 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -81,6 +81,8 @@ if (GTEST_FOUND AND GMOCK_FOUND)
 
         fx/lexer.cpp
         fx/technique.cpp
+
+        esm3/readerscache.cpp
     )
 
     source_group(apps\\openmw_test_suite FILES openmw_test_suite.cpp ${UNITTEST_SRC_FILES})
diff --git a/apps/openmw_test_suite/esm3/readerscache.cpp b/apps/openmw_test_suite/esm3/readerscache.cpp
new file mode 100644
index 0000000000..720b66a04f
--- /dev/null
+++ b/apps/openmw_test_suite/esm3/readerscache.cpp
@@ -0,0 +1,91 @@
+#include <components/esm3/readerscache.hpp>
+#include <components/files/collections.hpp>
+#include <components/files/multidircollection.hpp>
+
+#include <gtest/gtest.h>
+
+#ifndef OPENMW_DATA_DIR
+#error "OPENMW_DATA_DIR is not defined"
+#endif
+
+namespace
+{
+    using namespace testing;
+    using namespace ESM;
+
+    TEST(ESM3ReadersCache, onAttemptToRequestTheSameReaderTwiceShouldThrowException)
+    {
+        ReadersCache readers(1);
+        const ReadersCache::BusyItem reader = readers.get(0);
+        EXPECT_THROW(readers.get(0), std::logic_error);
+    }
+
+    TEST(ESM3ReadersCache, shouldAllowToHaveBusyItemsMoreThanCapacity)
+    {
+        ReadersCache readers(1);
+        const ReadersCache::BusyItem reader0 = readers.get(0);
+        const ReadersCache::BusyItem reader1 = readers.get(1);
+    }
+
+    TEST(ESM3ReadersCache, shouldKeepClosedReleasedClosedItem)
+    {
+        ReadersCache readers(1);
+        readers.get(0);
+        const ReadersCache::BusyItem reader = readers.get(0);
+        EXPECT_FALSE(reader->isOpen());
+    }
+
+    struct ESM3ReadersCacheWithContentFile : Test
+    {
+        static constexpr std::size_t sInitialOffset = 324;
+        static constexpr std::size_t sSkip = 100;
+        const Files::PathContainer mDataDirs {{std::string(OPENMW_DATA_DIR)}};
+        const Files::Collections mFileCollections {mDataDirs, true};
+        const std::string mContentFile = "template.omwgame";
+        const std::string mContentFilePath = mFileCollections.getCollection(".omwgame").getPath(mContentFile).string();
+    };
+
+    TEST_F(ESM3ReadersCacheWithContentFile, shouldKeepOpenReleasedOpenReader)
+    {
+        ReadersCache readers(1);
+        {
+            const ReadersCache::BusyItem reader = readers.get(0);
+            reader->open(mContentFilePath);
+            ASSERT_TRUE(reader->isOpen());
+            ASSERT_EQ(reader->getFileOffset(), sInitialOffset);
+            ASSERT_GT(reader->getFileSize(), sInitialOffset + sSkip);
+            reader->skip(sSkip);
+            ASSERT_EQ(reader->getFileOffset(), sInitialOffset + sSkip);
+        }
+        {
+            const ReadersCache::BusyItem reader = readers.get(0);
+            EXPECT_TRUE(reader->isOpen());
+            EXPECT_EQ(reader->getName(), mContentFilePath);
+            EXPECT_EQ(reader->getFileOffset(), sInitialOffset + sSkip);
+        }
+    }
+
+    TEST_F(ESM3ReadersCacheWithContentFile, shouldCloseFreeReaderWhenReachingCapacityLimit)
+    {
+        ReadersCache readers(1);
+        {
+            const ReadersCache::BusyItem reader = readers.get(0);
+            reader->open(mContentFilePath);
+            ASSERT_TRUE(reader->isOpen());
+            ASSERT_EQ(reader->getFileOffset(), sInitialOffset);
+            ASSERT_GT(reader->getFileSize(), sInitialOffset + sSkip);
+            reader->skip(sSkip);
+            ASSERT_EQ(reader->getFileOffset(), sInitialOffset + sSkip);
+        }
+        {
+            const ReadersCache::BusyItem reader = readers.get(1);
+            reader->open(mContentFilePath);
+            ASSERT_TRUE(reader->isOpen());
+        }
+        {
+            const ReadersCache::BusyItem reader = readers.get(0);
+            EXPECT_TRUE(reader->isOpen());
+            EXPECT_EQ(reader->getFileOffset(), sInitialOffset);
+        }
+    }
+}
diff --git a/apps/openmw_test_suite/esmloader/load.cpp b/apps/openmw_test_suite/esmloader/load.cpp
index d1647d138e..ea090466a3 100644
--- a/apps/openmw_test_suite/esmloader/load.cpp
+++ b/apps/openmw_test_suite/esmloader/load.cpp
@@ -10,6 +10,7 @@
 #include <components/files/collections.hpp>
 #include <components/files/multidircollection.hpp>
 #include <components/to_utf8/to_utf8.hpp>
+#include <components/esm3/readerscache.hpp>
 
 #include <gtest/gtest.h>
 
@@ -39,7 +40,7 @@ namespace
         query.mLoadGameSettings = true;
         query.mLoadLands = true;
         query.mLoadStatics = true;
-        std::vector<ESM::ESMReader> readers(mContentFiles.size());
+        ESM::ReadersCache readers;
         ToUTF8::Utf8Encoder* const encoder = nullptr;
         const EsmData esmData = loadEsmData(query, mContentFiles, mFileCollections, readers, encoder);
         EXPECT_EQ(esmData.mActivators.size(), 0);
@@ -61,7 +62,7 @@ namespace
         query.mLoadGameSettings = true;
         query.mLoadLands = true;
         query.mLoadStatics = true;
-        std::vector<ESM::ESMReader> readers(mContentFiles.size());
+        ESM::ReadersCache readers;
         ToUTF8::Utf8Encoder* const encoder = nullptr;
         const EsmData esmData = loadEsmData(query, mContentFiles, mFileCollections, readers, encoder);
         EXPECT_EQ(esmData.mActivators.size(), 0);
@@ -83,7 +84,7 @@ namespace
         query.mLoadGameSettings = false;
         query.mLoadLands = true;
         query.mLoadStatics = true;
-        std::vector<ESM::ESMReader> readers(mContentFiles.size());
+        ESM::ReadersCache readers;
         ToUTF8::Utf8Encoder* const encoder = nullptr;
         const EsmData esmData = loadEsmData(query, mContentFiles, mFileCollections, readers, encoder);
         EXPECT_EQ(esmData.mActivators.size(), 0);
@@ -98,7 +99,7 @@ namespace
     TEST_F(EsmLoaderTest, shouldIgnoreAllWithDefaultQuery)
     {
         const Query query;
-        std::vector<ESM::ESMReader> readers(mContentFiles.size());
+        ESM::ReadersCache readers;
         ToUTF8::Utf8Encoder* const encoder = nullptr;
         const EsmData esmData = loadEsmData(query, mContentFiles, mFileCollections, readers, encoder);
         EXPECT_EQ(esmData.mActivators.size(), 0);
@@ -121,7 +122,7 @@ namespace
         query.mLoadLands = true;
         query.mLoadStatics = true;
         const std::vector<std::string> contentFiles {{"script.omwscripts"}};
-        std::vector<ESM::ESMReader> readers(contentFiles.size());
+        ESM::ReadersCache readers;
         ToUTF8::Utf8Encoder* const encoder = nullptr;
         const EsmData esmData = loadEsmData(query, contentFiles, mFileCollections, readers, encoder);
         EXPECT_EQ(esmData.mActivators.size(), 0);
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index ad6bddee82..1465d9c3f2 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -95,7 +95,7 @@ add_component_dir (esm3
     savedgame journalentry queststate locals globalscript player objectstate cellid cellstate globalmap
     inventorystate containerstate npcstate creaturestate dialoguestate statstate npcstats creaturestats
     weatherstate quickkeys fogstate spellstate activespells creaturelevliststate doorstate projectilestate debugprofile
-    aisequence magiceffects custommarkerstate stolenitems transport animationstate controlsstate mappings
+    aisequence magiceffects custommarkerstate stolenitems transport animationstate controlsstate mappings readerscache
     )
 
 add_component_dir (esm3terrain
diff --git a/components/esm3/esmreader.cpp b/components/esm3/esmreader.cpp
index 290dfe1a5a..3e318cb2a6 100644
--- a/components/esm3/esmreader.cpp
+++ b/components/esm3/esmreader.cpp
@@ -1,5 +1,7 @@
 #include "esmreader.hpp"
 
+#include "readerscache.hpp"
+
 #include <components/misc/stringops.hpp>
 #include <components/files/openfile.hpp>
 
@@ -61,21 +63,22 @@ void ESMReader::clearCtx()
    mCtx.subName.clear();
 }
 
-void ESMReader::resolveParentFileIndices(const std::vector<ESMReader>& allPlugins)
+void ESMReader::resolveParentFileIndices(ReadersCache& readers)
 {
     mCtx.parentFileIndices.clear();
-    const std::vector<Header::MasterData> &masters = getGameFiles();
-    for (size_t j = 0; j < masters.size(); j++) {
-        const Header::MasterData &mast = masters[j];
-        std::string fname = mast.name;
+    for (const Header::MasterData &mast : getGameFiles())
+    {
+        const std::string& fname = mast.name;
         int index = getIndex(); 
-        for (int i = 0; i < getIndex(); i++) {
-            const ESMReader& reader = allPlugins.at(i);
-            if (reader.getFileSize() == 0)
+        for (int i = 0; i < getIndex(); i++)
+        {
+            const ESM::ReadersCache::BusyItem reader = readers.get(static_cast<std::size_t>(i));
+            if (reader->getFileSize() == 0)
                 continue;  // Content file in non-ESM format
-            const std::string& candidate = reader.getName();
+            const std::string& candidate = reader->getName();
             std::string fnamecandidate = std::filesystem::path(candidate).filename().string();
-            if (Misc::StringUtils::ciEqual(fname, fnamecandidate)) {
+            if (Misc::StringUtils::ciEqual(fname, fnamecandidate))
+            {
                 index = i;
                 break;
             }
diff --git a/components/esm3/esmreader.hpp b/components/esm3/esmreader.hpp
index 658a409ed6..4255428729 100644
--- a/components/esm3/esmreader.hpp
+++ b/components/esm3/esmreader.hpp
@@ -16,6 +16,8 @@
 namespace ESM
 {
 
+class ReadersCache;
+
 class ESMReader
 {
 public:
@@ -39,6 +41,7 @@ public:
   const NAME &retSubName() const { return mCtx.subName; }
   uint32_t getSubSize() const { return mCtx.leftSub; }
   const std::string& getName() const { return mCtx.filename; };
+  bool isOpen() const { return mEsm != nullptr; }
 
   /*************************************************************************
    *
@@ -85,9 +88,8 @@ public:
   // all files/readers used by the engine. This is required for correct adjustRefNum() results
   // as required for handling moved, deleted and edited CellRefs.
   /// @note Does not validate.
-  void resolveParentFileIndices(const std::vector<ESMReader>& files);
+  void resolveParentFileIndices(ReadersCache& readers);
   const std::vector<int>& getParentFileIndices() const { return mCtx.parentFileIndices; }
-  bool isValidParentFileIndex(int i) const { return i != getIndex(); }
 
   /*************************************************************************
    *
diff --git a/components/esm3/readerscache.cpp b/components/esm3/readerscache.cpp
new file mode 100644
index 0000000000..c3b9d3d03c
--- /dev/null
+++ b/components/esm3/readerscache.cpp
@@ -0,0 +1,87 @@
+#include "readerscache.hpp"
+
+#include <stdexcept>
+
+namespace ESM
+{
+    ReadersCache::BusyItem::BusyItem(ReadersCache& owner, std::list<Item>::iterator item) noexcept
+        : mOwner(owner)
+        , mItem(item)
+    {}
+
+    ReadersCache::BusyItem::~BusyItem() noexcept
+    {
+        mOwner.releaseItem(mItem);
+    }
+
+    ReadersCache::ReadersCache(std::size_t capacity)
+        : mCapacity(capacity)
+    {}
+
+    ReadersCache::BusyItem ReadersCache::get(std::size_t index)
+    {
+        const auto indexIt = mIndex.find(index);
+        std::list<Item>::iterator it;
+        if (indexIt == mIndex.end())
+        {
+            closeExtraReaders();
+            it = mBusyItems.emplace(mBusyItems.end());
+            mIndex.emplace(index, it);
+        }
+        else
+        {
+            switch (indexIt->second->mState)
+            {
+                case State::Busy:
+                    throw std::logic_error("ESMReader at index " + std::to_string(index) + " is busy");
+                case State::Free:
+                    it = indexIt->second;
+                    mBusyItems.splice(mBusyItems.end(), mFreeItems, it);
+                    break;
+                case State::Closed:
+                    closeExtraReaders();
+                    it = indexIt->second;
+                    if (it->mName.has_value())
+                    {
+                        it->mReader.open(*it->mName);
+                        it->mName.reset();
+                    }
+                    mBusyItems.splice(mBusyItems.end(), mClosedItems, it);
+                    break;
+            }
+            it->mState = State::Busy;
+        }
+
+        return BusyItem(*this, it);
+    }
+
+    void ReadersCache::closeExtraReaders()
+    {
+        while (!mFreeItems.empty() && mBusyItems.size() + mFreeItems.size() + 1 > mCapacity)
+        {
+            const auto it = mFreeItems.begin();
+            if (it->mReader.isOpen())
+            {
+                it->mName = it->mReader.getName();
+                it->mReader.close();
+            }
+            mClosedItems.splice(mClosedItems.end(), mFreeItems, it);
+            it->mState = State::Closed;
+        }
+    }
+
+    void ReadersCache::releaseItem(std::list<Item>::iterator it) noexcept
+    {
+        assert(it->mState == State::Busy);
+        if (it->mReader.isOpen())
+        {
+            mFreeItems.splice(mFreeItems.end(), mBusyItems, it);
+            it->mState = State::Free;
+        }
+        else
+        {
+            mClosedItems.splice(mClosedItems.end(), mBusyItems, it);
+            it->mState = State::Closed;
+        }
+    }
+}
diff --git a/components/esm3/readerscache.hpp b/components/esm3/readerscache.hpp
new file mode 100644
index 0000000000..16511efdd7
--- /dev/null
+++ b/components/esm3/readerscache.hpp
@@ -0,0 +1,71 @@
+#ifndef OPENMW_COMPONENTS_ESM3_READERSCACHE_H
+#define OPENMW_COMPONENTS_ESM3_READERSCACHE_H
+
+#include "esmreader.hpp"
+
+#include <cstddef>
+#include <list>
+#include <map>
+#include <optional>
+#include <string>
+
+namespace ESM
+{
+    class ReadersCache
+    {
+        private:
+            enum class State
+            {
+                Busy,
+                Free,
+                Closed,
+            };
+
+            struct Item
+            {
+                State mState = State::Busy;
+                ESMReader mReader;
+                std::optional<std::string> mName;
+
+                Item() = default;
+            };
+
+        public:
+            class BusyItem
+            {
+                public:
+                    explicit BusyItem(ReadersCache& owner, std::list<Item>::iterator item) noexcept;
+
+                    BusyItem(const BusyItem& other) = delete;
+
+                    ~BusyItem() noexcept;
+
+                    BusyItem& operator=(const BusyItem& other) = delete;
+
+                    ESMReader& operator*() const noexcept { return mItem->mReader; }
+
+                    ESMReader* operator->() const noexcept { return &mItem->mReader; }
+
+                private:
+                    ReadersCache& mOwner;
+                    std::list<Item>::iterator mItem;
+            };
+
+            explicit ReadersCache(std::size_t capacity = 100);
+
+            BusyItem get(std::size_t index);
+
+        private:
+            const std::size_t mCapacity;
+            std::map<std::size_t, std::list<Item>::iterator> mIndex;
+            std::list<Item> mBusyItems;
+            std::list<Item> mFreeItems;
+            std::list<Item> mClosedItems;
+
+            inline void closeExtraReaders();
+
+            inline void releaseItem(std::list<Item>::iterator it) noexcept;
+    };
+}
+
+#endif
diff --git a/components/esmloader/load.cpp b/components/esmloader/load.cpp
index 9ab857c9f0..0db1d726a7 100644
--- a/components/esmloader/load.cpp
+++ b/components/esmloader/load.cpp
@@ -18,6 +18,7 @@
 #include <components/files/multidircollection.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/misc/stringops.hpp>
+#include <components/esm3/readerscache.hpp>
 
 #include <algorithm>
 #include <filesystem>
@@ -207,7 +208,7 @@ namespace EsmLoader
         }
 
         ShallowContent shallowLoad(const Query& query, const std::vector<std::string>& contentFiles,
-            const Files::Collections& fileCollections, std::vector<ESM::ESMReader>& readers,
+            const Files::Collections& fileCollections, ESM::ReadersCache& readers,
             ToUTF8::Utf8Encoder* encoder)
         {
             ShallowContent result;
@@ -233,14 +234,14 @@ namespace EsmLoader
 
                 const Files::MultiDirCollection& collection = fileCollections.getCollection(extension);
 
-                ESM::ESMReader& reader = readers[i];
-                reader.setEncoder(encoder);
-                reader.setIndex(static_cast<int>(i));
-                reader.open(collection.getPath(file).string());
+                const ESM::ReadersCache::BusyItem reader = readers.get(i);
+                reader->setEncoder(encoder);
+                reader->setIndex(static_cast<int>(i));
+                reader->open(collection.getPath(file).string());
                 if (query.mLoadCells)
-                    reader.resolveParentFileIndices(readers);
+                    reader->resolveParentFileIndices(readers);
 
-                loadEsm(query, readers[i], result);
+                loadEsm(query, *reader, result);
             }
 
             return result;
@@ -289,7 +290,7 @@ namespace EsmLoader
     }
 
     EsmData loadEsmData(const Query& query, const std::vector<std::string>& contentFiles,
-        const Files::Collections& fileCollections, std::vector<ESM::ESMReader>& readers, ToUTF8::Utf8Encoder* encoder)
+        const Files::Collections& fileCollections, ESM::ReadersCache& readers, ToUTF8::Utf8Encoder* encoder)
     {
         Log(Debug::Info) << "Loading ESM data...";
 
diff --git a/components/esmloader/load.hpp b/components/esmloader/load.hpp
index eae592260a..8bb8df35fe 100644
--- a/components/esmloader/load.hpp
+++ b/components/esmloader/load.hpp
@@ -32,7 +32,7 @@ namespace EsmLoader
     };
 
     EsmData loadEsmData(const Query& query, const std::vector<std::string>& contentFiles,
-        const Files::Collections& fileCollections, std::vector<ESM::ESMReader>& readers,
+        const Files::Collections& fileCollections, ESM::ReadersCache& readers,
         ToUTF8::Utf8Encoder* encoder);
 }
 
diff --git a/components/resource/foreachbulletobject.cpp b/components/resource/foreachbulletobject.cpp
index aaaa6fa5f9..dc154802e0 100644
--- a/components/resource/foreachbulletobject.cpp
+++ b/components/resource/foreachbulletobject.cpp
@@ -13,6 +13,7 @@
 #include <components/resource/bulletshapemanager.hpp>
 #include <components/settings/settings.hpp>
 #include <components/vfs/manager.hpp>
+#include <components/esm3/readerscache.hpp>
 
 #include <osg/ref_ptr>
 
@@ -50,17 +51,17 @@ namespace Resource
         }
 
         std::vector<CellRef> loadCellRefs(const ESM::Cell& cell, const EsmLoader::EsmData& esmData,
-            std::vector<ESM::ESMReader>& readers)
+            ESM::ReadersCache& readers)
         {
             std::vector<EsmLoader::Record<CellRef>> cellRefs;
 
             for (std::size_t i = 0; i < cell.mContextList.size(); i++)
             {
-                ESM::ESMReader& reader = readers[static_cast<std::size_t>(cell.mContextList[i].index)];
-                cell.restore(reader, static_cast<int>(i));
+                const ESM::ReadersCache::BusyItem reader = readers.get(static_cast<std::size_t>(cell.mContextList[i].index));
+                cell.restore(*reader, static_cast<int>(i));
                 ESM::CellRef cellRef;
                 bool deleted = false;
-                while (ESM::Cell::getNextRef(reader, cellRef, deleted))
+                while (ESM::Cell::getNextRef(*reader, cellRef, deleted))
                 {
                     Misc::StringUtils::lowerCaseInPlace(cellRef.mRefID);
                     const ESM::RecNameInts type = getType(esmData, cellRef.mRefID);
@@ -83,7 +84,7 @@ namespace Resource
 
         template <class F>
         void forEachObject(const ESM::Cell& cell, const EsmLoader::EsmData& esmData, const VFS::Manager& vfs,
-            Resource::BulletShapeManager& bulletShapeManager, std::vector<ESM::ESMReader>& readers,
+            Resource::BulletShapeManager& bulletShapeManager, ESM::ReadersCache& readers,
             F&& f)
         {
             std::vector<CellRef> cellRefs = loadCellRefs(cell, esmData, readers);
@@ -130,7 +131,7 @@ namespace Resource
         }
     }
 
-    void forEachBulletObject(std::vector<ESM::ESMReader>& readers, const VFS::Manager& vfs,
+    void forEachBulletObject(ESM::ReadersCache& readers, const VFS::Manager& vfs,
         Resource::BulletShapeManager& bulletShapeManager, const EsmLoader::EsmData& esmData,
         std::function<void (const ESM::Cell& cell, const BulletObject& object)> callback)
     {
diff --git a/components/resource/foreachbulletobject.hpp b/components/resource/foreachbulletobject.hpp
index 5b1495e4cc..0ccaf729ad 100644
--- a/components/resource/foreachbulletobject.hpp
+++ b/components/resource/foreachbulletobject.hpp
@@ -12,7 +12,7 @@
 
 namespace ESM
 {
-    class ESMReader;
+    class ReadersCache;
     struct Cell;
 }
 
@@ -40,7 +40,7 @@ namespace Resource
         float mScale;
     };
 
-    void forEachBulletObject(std::vector<ESM::ESMReader>& readers, const VFS::Manager& vfs,
+    void forEachBulletObject(ESM::ReadersCache& readers, const VFS::Manager& vfs,
         Resource::BulletShapeManager& bulletShapeManager, const EsmLoader::EsmData& esmData,
         std::function<void (const ESM::Cell&, const BulletObject& object)> callback);
 }

From 0cc304e659a2383086e36dd0a3dd72216eee357d Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sat, 4 Jun 2022 15:26:36 +0200
Subject: [PATCH 2562/2859] Clean up MyGUI includes

This should improve incremental compilation.
---
 apps/openmw/mwclass/activator.cpp               | 2 ++
 apps/openmw/mwclass/apparatus.cpp               | 2 ++
 apps/openmw/mwclass/armor.cpp                   | 2 ++
 apps/openmw/mwclass/book.cpp                    | 2 ++
 apps/openmw/mwclass/clothing.cpp                | 2 ++
 apps/openmw/mwclass/container.cpp               | 2 ++
 apps/openmw/mwclass/creature.hpp                | 2 ++
 apps/openmw/mwclass/door.cpp                    | 2 ++
 apps/openmw/mwclass/ingredient.cpp              | 2 ++
 apps/openmw/mwclass/light.cpp                   | 2 ++
 apps/openmw/mwclass/lockpick.cpp                | 2 ++
 apps/openmw/mwclass/misc.cpp                    | 2 ++
 apps/openmw/mwclass/npc.cpp                     | 2 ++
 apps/openmw/mwclass/potion.cpp                  | 2 ++
 apps/openmw/mwclass/probe.cpp                   | 2 ++
 apps/openmw/mwclass/repair.cpp                  | 2 ++
 apps/openmw/mwclass/weapon.cpp                  | 2 ++
 apps/openmw/mwgui/charactercreation.cpp         | 2 ++
 apps/openmw/mwgui/class.hpp                     | 3 +++
 apps/openmw/mwgui/companionwindow.cpp           | 2 ++
 apps/openmw/mwgui/keyboardnavigation.cpp        | 1 -
 apps/openmw/mwgui/layout.hpp                    | 2 +-
 apps/openmw/mwgui/mapwindow.cpp                 | 2 ++
 apps/openmw/mwgui/postprocessorhud.cpp          | 3 +--
 apps/openmw/mwgui/postprocessorhud.hpp          | 1 -
 apps/openmw/mwgui/race.cpp                      | 1 +
 apps/openmw/mwgui/race.hpp                      | 1 -
 apps/openmw/mwgui/review.cpp                    | 1 +
 apps/openmw/mwgui/savegamedialog.cpp            | 1 -
 apps/openmw/mwgui/settingswindow.cpp            | 1 -
 apps/openmw/mwgui/spellcreationdialog.cpp       | 2 ++
 apps/openmw/mwgui/statswindow.cpp               | 1 +
 apps/openmw/mwgui/timeadvancer.hpp              | 2 +-
 apps/openmw/mwgui/trainingwindow.cpp            | 1 +
 apps/openmw/mwgui/widgets.cpp                   | 1 +
 apps/openmw/mwgui/widgets.hpp                   | 8 ++++----
 apps/openmw/mwgui/windowmanagerimp.cpp          | 2 --
 apps/openmw/mwinput/controllermanager.cpp       | 1 -
 apps/openmw/mwinput/mousemanager.cpp            | 1 -
 components/fontloader/fontloader.cpp            | 1 -
 components/fx/widgets.hpp                       | 1 -
 components/lua_ui/scriptsettings.hpp            | 2 --
 components/lua_ui/window.cpp                    | 4 +++-
 components/myguiplatform/myguirendermanager.cpp | 1 -
 components/widgets/box.hpp                      | 1 -
 45 files changed, 60 insertions(+), 24 deletions(-)

diff --git a/apps/openmw/mwclass/activator.cpp b/apps/openmw/mwclass/activator.cpp
index 83d84254a3..f2212e7c95 100644
--- a/apps/openmw/mwclass/activator.cpp
+++ b/apps/openmw/mwclass/activator.cpp
@@ -1,5 +1,7 @@
 #include "activator.hpp"
 
+#include <MyGUI_TextIterator.h>
+
 #include <components/esm3/loadacti.hpp>
 #include <components/misc/rng.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
diff --git a/apps/openmw/mwclass/apparatus.cpp b/apps/openmw/mwclass/apparatus.cpp
index 57b59b5b9d..6004868ac0 100644
--- a/apps/openmw/mwclass/apparatus.cpp
+++ b/apps/openmw/mwclass/apparatus.cpp
@@ -1,5 +1,7 @@
 #include "apparatus.hpp"
 
+#include <MyGUI_TextIterator.h>
+
 #include <components/esm3/loadappa.hpp>
 
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index e86f0430f5..9bd7deb38f 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -1,5 +1,7 @@
 #include "armor.hpp"
 
+#include <MyGUI_TextIterator.h>
+
 #include <components/esm3/loadarmo.hpp>
 #include <components/esm3/loadskil.hpp>
 #include <components/esm3/loadgmst.hpp>
diff --git a/apps/openmw/mwclass/book.cpp b/apps/openmw/mwclass/book.cpp
index 5d4d723be9..2247d388e8 100644
--- a/apps/openmw/mwclass/book.cpp
+++ b/apps/openmw/mwclass/book.cpp
@@ -1,5 +1,7 @@
 #include "book.hpp"
 
+#include <MyGUI_TextIterator.h>
+
 #include <components/esm3/loadbook.hpp>
 
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index 1dd048ca9f..de2b1c870f 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -1,5 +1,7 @@
 #include "clothing.hpp"
 
+#include <MyGUI_TextIterator.h>
+
 #include <components/esm3/loadclot.hpp>
 
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index 992d9b02d1..d4fa3e2f1c 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -1,5 +1,7 @@
 #include "container.hpp"
 
+#include <MyGUI_TextIterator.h>
+
 #include <components/esm3/loadcont.hpp>
 #include <components/esm3/containerstate.hpp>
 #include <components/settings/settings.hpp>
diff --git a/apps/openmw/mwclass/creature.hpp b/apps/openmw/mwclass/creature.hpp
index 558ea00643..bc5d44ad36 100644
--- a/apps/openmw/mwclass/creature.hpp
+++ b/apps/openmw/mwclass/creature.hpp
@@ -1,6 +1,8 @@
 #ifndef GAME_MWCLASS_CREATURE_H
 #define GAME_MWCLASS_CREATURE_H
 
+#include <MyGUI_TextIterator.h>
+
 #include "../mwworld/registeredclass.hpp"
 
 #include "actor.hpp"
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index 6fcd45b6ba..37b45e531b 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -1,5 +1,7 @@
 #include "door.hpp"
 
+#include <MyGUI_TextIterator.h>
+
 #include <components/esm3/loaddoor.hpp>
 #include <components/esm3/doorstate.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
diff --git a/apps/openmw/mwclass/ingredient.cpp b/apps/openmw/mwclass/ingredient.cpp
index e8e7f5bd3e..73f9fb4ac9 100644
--- a/apps/openmw/mwclass/ingredient.cpp
+++ b/apps/openmw/mwclass/ingredient.cpp
@@ -1,5 +1,7 @@
 #include "ingredient.hpp"
 
+#include <MyGUI_TextIterator.h>
+
 #include <components/esm3/loadingr.hpp>
 
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index 81256d06d3..3ab9d3b630 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -1,5 +1,7 @@
 #include "light.hpp"
 
+#include <MyGUI_TextIterator.h>
+
 #include <components/esm3/loadligh.hpp>
 #include <components/esm3/objectstate.hpp>
 #include <components/settings/settings.hpp>
diff --git a/apps/openmw/mwclass/lockpick.cpp b/apps/openmw/mwclass/lockpick.cpp
index 1d898381b9..ef4af50c6a 100644
--- a/apps/openmw/mwclass/lockpick.cpp
+++ b/apps/openmw/mwclass/lockpick.cpp
@@ -1,5 +1,7 @@
 #include "lockpick.hpp"
 
+#include <MyGUI_TextIterator.h>
+
 #include <components/esm3/loadlock.hpp>
 
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwclass/misc.cpp b/apps/openmw/mwclass/misc.cpp
index ac332cc47f..571bbda0ea 100644
--- a/apps/openmw/mwclass/misc.cpp
+++ b/apps/openmw/mwclass/misc.cpp
@@ -1,5 +1,7 @@
 #include "misc.hpp"
 
+#include <MyGUI_TextIterator.h>
+
 #include <components/esm3/loadmisc.hpp>
 #include <components/settings/settings.hpp>
 
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 297684de53..b6105df4d7 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -1,5 +1,7 @@
 #include "npc.hpp"
 
+#include <MyGUI_TextIterator.h>
+
 #include <memory>
 
 #include <components/misc/constants.hpp>
diff --git a/apps/openmw/mwclass/potion.cpp b/apps/openmw/mwclass/potion.cpp
index 2267f24b37..3b55cbc679 100644
--- a/apps/openmw/mwclass/potion.cpp
+++ b/apps/openmw/mwclass/potion.cpp
@@ -1,5 +1,7 @@
 #include "potion.hpp"
 
+#include <MyGUI_TextIterator.h>
+
 #include <components/esm3/loadalch.hpp>
 
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwclass/probe.cpp b/apps/openmw/mwclass/probe.cpp
index 93ef46a67b..a528068f23 100644
--- a/apps/openmw/mwclass/probe.cpp
+++ b/apps/openmw/mwclass/probe.cpp
@@ -1,5 +1,7 @@
 #include "probe.hpp"
 
+#include <MyGUI_TextIterator.h>
+
 #include <components/esm3/loadprob.hpp>
 
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwclass/repair.cpp b/apps/openmw/mwclass/repair.cpp
index 748f2822f0..e9a504f22c 100644
--- a/apps/openmw/mwclass/repair.cpp
+++ b/apps/openmw/mwclass/repair.cpp
@@ -1,5 +1,7 @@
 #include "repair.hpp"
 
+#include <MyGUI_TextIterator.h>
+
 #include <components/esm3/loadrepa.hpp>
 
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index 04aa2cb83d..505b2a4d1e 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -1,5 +1,7 @@
 #include "weapon.hpp"
 
+#include <MyGUI_TextIterator.h>
+
 #include <components/esm3/loadweap.hpp>
 #include <components/misc/constants.hpp>
 #include <components/settings/settings.hpp>
diff --git a/apps/openmw/mwgui/charactercreation.cpp b/apps/openmw/mwgui/charactercreation.cpp
index 19ba432d58..ed5a5e12d1 100644
--- a/apps/openmw/mwgui/charactercreation.cpp
+++ b/apps/openmw/mwgui/charactercreation.cpp
@@ -1,5 +1,7 @@
 #include "charactercreation.hpp"
 
+#include <MyGUI_ITexture.h>
+
 #include <components/debug/debuglog.hpp>
 #include <components/fallback/fallback.hpp>
 #include <components/misc/rng.hpp>
diff --git a/apps/openmw/mwgui/class.hpp b/apps/openmw/mwgui/class.hpp
index 4c5c23535f..f765fa3da2 100644
--- a/apps/openmw/mwgui/class.hpp
+++ b/apps/openmw/mwgui/class.hpp
@@ -1,8 +1,11 @@
 #ifndef MWGUI_CLASS_H
 #define MWGUI_CLASS_H
 
+#include <MyGUI_EditBox.h>
+
 #include <components/esm/attr.hpp>
 #include <components/esm3/loadclas.hpp>
+
 #include "widgets.hpp"
 #include "windowbase.hpp"
 
diff --git a/apps/openmw/mwgui/companionwindow.cpp b/apps/openmw/mwgui/companionwindow.cpp
index 926456219e..852efa7583 100644
--- a/apps/openmw/mwgui/companionwindow.cpp
+++ b/apps/openmw/mwgui/companionwindow.cpp
@@ -2,7 +2,9 @@
 
 #include <cmath>
 
+#include <MyGUI_Button.h>
 #include <MyGUI_InputManager.h>
+#include <MyGUI_EditBox.h>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
diff --git a/apps/openmw/mwgui/keyboardnavigation.cpp b/apps/openmw/mwgui/keyboardnavigation.cpp
index 249e5d0240..37b64f276c 100644
--- a/apps/openmw/mwgui/keyboardnavigation.cpp
+++ b/apps/openmw/mwgui/keyboardnavigation.cpp
@@ -2,7 +2,6 @@
 
 #include <MyGUI_InputManager.h>
 #include <MyGUI_WidgetManager.h>
-#include <MyGUI_Button.h>
 #include <MyGUI_Gui.h>
 #include <MyGUI_Window.h>
 
diff --git a/apps/openmw/mwgui/layout.hpp b/apps/openmw/mwgui/layout.hpp
index ea51bf541e..39dfc99bf3 100644
--- a/apps/openmw/mwgui/layout.hpp
+++ b/apps/openmw/mwgui/layout.hpp
@@ -2,7 +2,7 @@
 #define OPENMW_MWGUI_LAYOUT_H
 
 #include <string>
-#include <MyGUI_WidgetDefines.h>
+
 #include <MyGUI_Widget.h>
 
 #include <components/debug/debuglog.hpp>
diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index 1f24a66969..bda94f6439 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -10,6 +10,8 @@
 #include <MyGUI_InputManager.h>
 #include <MyGUI_RotatingSkin.h>
 #include <MyGUI_FactoryManager.h>
+#include <MyGUI_TextIterator.h>
+#include <MyGUI_Button.h>
 
 #include <components/esm3/globalmap.hpp>
 #include <components/esm3/esmwriter.hpp>
diff --git a/apps/openmw/mwgui/postprocessorhud.cpp b/apps/openmw/mwgui/postprocessorhud.cpp
index e21531da54..4d84fedf38 100644
--- a/apps/openmw/mwgui/postprocessorhud.cpp
+++ b/apps/openmw/mwgui/postprocessorhud.cpp
@@ -3,8 +3,7 @@
 #include <MyGUI_Window.h>
 #include <MyGUI_Button.h>
 #include <MyGUI_TabItem.h>
-#include <MyGUI_TabControl.h>
-#include <MyGUI_RenderManager.h>
+#include <MyGUI_ScrollView.h>
 #include <MyGUI_FactoryManager.h>
 
 #include <components/fx/widgets.hpp>
diff --git a/apps/openmw/mwgui/postprocessorhud.hpp b/apps/openmw/mwgui/postprocessorhud.hpp
index 116d53c2e0..7473cfcfa5 100644
--- a/apps/openmw/mwgui/postprocessorhud.hpp
+++ b/apps/openmw/mwgui/postprocessorhud.hpp
@@ -3,7 +3,6 @@
 
 #include "windowbase.hpp"
 
-#include <MyGUI_Gui.h>
 #include <MyGUI_ListBox.h>
 
 #include <components/settings/shadermanager.hpp>
diff --git a/apps/openmw/mwgui/race.cpp b/apps/openmw/mwgui/race.cpp
index 25679e4858..6477d907b7 100644
--- a/apps/openmw/mwgui/race.cpp
+++ b/apps/openmw/mwgui/race.cpp
@@ -3,6 +3,7 @@
 #include <MyGUI_ListBox.h>
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_Gui.h>
+#include <MyGUI_ScrollBar.h>
 
 #include <osg/Texture2D>
 
diff --git a/apps/openmw/mwgui/race.hpp b/apps/openmw/mwgui/race.hpp
index 170c1dbce3..160999213e 100644
--- a/apps/openmw/mwgui/race.hpp
+++ b/apps/openmw/mwgui/race.hpp
@@ -4,7 +4,6 @@
 #include <memory>
 
 #include "windowbase.hpp"
-#include <MyGUI_RenderManager.h>
 
 
 namespace MWRender
diff --git a/apps/openmw/mwgui/review.cpp b/apps/openmw/mwgui/review.cpp
index 101b6956d0..77249948ab 100644
--- a/apps/openmw/mwgui/review.cpp
+++ b/apps/openmw/mwgui/review.cpp
@@ -2,6 +2,7 @@
 
 #include <cmath>
 
+#include <MyGUI_Button.h>
 #include <MyGUI_ScrollView.h>
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_Gui.h>
diff --git a/apps/openmw/mwgui/savegamedialog.cpp b/apps/openmw/mwgui/savegamedialog.cpp
index c17f229f6b..a29928c152 100644
--- a/apps/openmw/mwgui/savegamedialog.cpp
+++ b/apps/openmw/mwgui/savegamedialog.cpp
@@ -5,7 +5,6 @@
 
 #include <MyGUI_ComboBox.h>
 #include <MyGUI_ImageBox.h>
-#include <MyGUI_ListBox.h>
 #include <MyGUI_InputManager.h>
 #include <MyGUI_LanguageManager.h>
 
diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index 785cec9ef6..0063fb1778 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -11,7 +11,6 @@
 #include <MyGUI_ScrollView.h>
 #include <MyGUI_Gui.h>
 #include <MyGUI_TabControl.h>
-#include <MyGUI_TabItem.h>
 
 #include <SDL_video.h>
 
diff --git a/apps/openmw/mwgui/spellcreationdialog.cpp b/apps/openmw/mwgui/spellcreationdialog.cpp
index d3da26b8bf..9bfd72adce 100644
--- a/apps/openmw/mwgui/spellcreationdialog.cpp
+++ b/apps/openmw/mwgui/spellcreationdialog.cpp
@@ -1,7 +1,9 @@
 #include "spellcreationdialog.hpp"
 
+#include <MyGUI_Button.h>
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_Gui.h>
+#include <MyGUI_ScrollBar.h>
 
 #include <components/esm/records.hpp>
 #include <components/widgets/list.hpp>
diff --git a/apps/openmw/mwgui/statswindow.cpp b/apps/openmw/mwgui/statswindow.cpp
index 49ee7698ee..f3d98a4fcd 100644
--- a/apps/openmw/mwgui/statswindow.cpp
+++ b/apps/openmw/mwgui/statswindow.cpp
@@ -6,6 +6,7 @@
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_InputManager.h>
 #include <MyGUI_LanguageManager.h>
+#include <MyGUI_TextIterator.h>
 #include <MyGUI_Gui.h>
 
 #include <components/settings/settings.hpp>
diff --git a/apps/openmw/mwgui/timeadvancer.hpp b/apps/openmw/mwgui/timeadvancer.hpp
index b8456f3761..40fce978b9 100644
--- a/apps/openmw/mwgui/timeadvancer.hpp
+++ b/apps/openmw/mwgui/timeadvancer.hpp
@@ -1,7 +1,7 @@
 #ifndef MWGUI_TIMEADVANCER_H
 #define MWGUI_TIMEADVANCER_H
 
-#include <MyGUI_Widget.h>
+#include <MyGUI_Delegate.h>
 
 namespace MWGui
 {
diff --git a/apps/openmw/mwgui/trainingwindow.cpp b/apps/openmw/mwgui/trainingwindow.cpp
index 7fae33bae5..96267cc7b2 100644
--- a/apps/openmw/mwgui/trainingwindow.cpp
+++ b/apps/openmw/mwgui/trainingwindow.cpp
@@ -1,5 +1,6 @@
 #include "trainingwindow.hpp"
 
+#include <MyGUI_Button.h>
 #include <MyGUI_Gui.h>
 
 #include "../mwbase/windowmanager.hpp"
diff --git a/apps/openmw/mwgui/widgets.cpp b/apps/openmw/mwgui/widgets.cpp
index 6f4c5d9551..3d5fa949c3 100644
--- a/apps/openmw/mwgui/widgets.cpp
+++ b/apps/openmw/mwgui/widgets.cpp
@@ -2,6 +2,7 @@
 
 #include <iomanip>
 
+#include <MyGUI_Button.h>
 #include <MyGUI_ProgressBar.h>
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_ControllerManager.h>
diff --git a/apps/openmw/mwgui/widgets.hpp b/apps/openmw/mwgui/widgets.hpp
index e430872487..61d1ced750 100644
--- a/apps/openmw/mwgui/widgets.hpp
+++ b/apps/openmw/mwgui/widgets.hpp
@@ -3,13 +3,13 @@
 
 #include "../mwmechanics/stat.hpp"
 
+#include <MyGUI_Delegate.h>
+#include <MyGUI_TextBox.h>
+#include <MyGUI_Widget.h>
+
 #include <components/esm3/effectlist.hpp>
 #include <components/esm3/loadskil.hpp>
 
-#include <MyGUI_Button.h>
-#include <MyGUI_EditBox.h>
-#include <MyGUI_ScrollBar.h>
-
 namespace MyGUI
 {
     class ImageBox;
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index a8043791bf..1d964f09ec 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -9,14 +9,12 @@
 #include <osgViewer/Viewer>
 
 #include <MyGUI_UString.h>
-#include <MyGUI_IPointer.h>
 #include <MyGUI_FactoryManager.h>
 #include <MyGUI_LanguageManager.h>
 #include <MyGUI_PointerManager.h>
 #include <MyGUI_InputManager.h>
 #include <MyGUI_Gui.h>
 #include <MyGUI_ClipboardManager.h>
-#include <MyGUI_WidgetManager.h>
 
 // For BT_NO_PROFILE
 #include <LinearMath/btQuickprof.h>
diff --git a/apps/openmw/mwinput/controllermanager.cpp b/apps/openmw/mwinput/controllermanager.cpp
index f4d307e7d0..1160b3a0b3 100644
--- a/apps/openmw/mwinput/controllermanager.cpp
+++ b/apps/openmw/mwinput/controllermanager.cpp
@@ -2,7 +2,6 @@
 
 #include <MyGUI_Button.h>
 #include <MyGUI_InputManager.h>
-#include <MyGUI_Widget.h>
 
 #include <SDL.h>
 
diff --git a/apps/openmw/mwinput/mousemanager.cpp b/apps/openmw/mwinput/mousemanager.cpp
index f646501607..26bccc79c4 100644
--- a/apps/openmw/mwinput/mousemanager.cpp
+++ b/apps/openmw/mwinput/mousemanager.cpp
@@ -3,7 +3,6 @@
 #include <MyGUI_Button.h>
 #include <MyGUI_InputManager.h>
 #include <MyGUI_RenderManager.h>
-#include <MyGUI_Widget.h>
 
 #include <components/debug/debuglog.hpp>
 #include <components/sdlutil/sdlinputwrapper.hpp>
diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index 657a887cbd..4e370a729a 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -10,7 +10,6 @@
 #include <osgDB/WriteFile>
 
 #include <MyGUI_ResourceManager.h>
-#include <MyGUI_FontManager.h>
 #include <MyGUI_ResourceManualFont.h>
 #include <MyGUI_XmlDocument.h>
 #include <MyGUI_FactoryManager.h>
diff --git a/components/fx/widgets.hpp b/components/fx/widgets.hpp
index 0019bd349c..fcb1350179 100644
--- a/components/fx/widgets.hpp
+++ b/components/fx/widgets.hpp
@@ -3,7 +3,6 @@
 
 #include <MyGUI_Gui.h>
 #include <MyGUI_Button.h>
-#include <MyGUI_ScrollView.h>
 #include <MyGUI_InputManager.h>
 
 #include <osg/Vec2f>
diff --git a/components/lua_ui/scriptsettings.hpp b/components/lua_ui/scriptsettings.hpp
index c468f9eb0b..99d43bb518 100644
--- a/components/lua_ui/scriptsettings.hpp
+++ b/components/lua_ui/scriptsettings.hpp
@@ -5,8 +5,6 @@
 #include <string_view>
 #include <memory>
 
-#include <MyGUI_Widget.h>
-
 namespace LuaUi
 {
     class LuaAdapter;
diff --git a/components/lua_ui/window.cpp b/components/lua_ui/window.cpp
index a9fff5ff47..5dbf3f5219 100644
--- a/components/lua_ui/window.cpp
+++ b/components/lua_ui/window.cpp
@@ -1,6 +1,8 @@
 #include "window.hpp"
 
-#include <MyGUI_InputManager.h>
+#include <MyGUI_Delegate.h>
+#include <MyGUI_MouseButton.h>
+#include <MyGUI_Types.h>
 
 namespace LuaUi
 {
diff --git a/components/myguiplatform/myguirendermanager.cpp b/components/myguiplatform/myguirendermanager.cpp
index b8ca06a181..77b20ae5c7 100644
--- a/components/myguiplatform/myguirendermanager.cpp
+++ b/components/myguiplatform/myguirendermanager.cpp
@@ -1,6 +1,5 @@
 #include "myguirendermanager.hpp"
 
-#include <MyGUI_Gui.h>
 #include <MyGUI_Timer.h>
 
 #include <osg/Drawable>
diff --git a/components/widgets/box.hpp b/components/widgets/box.hpp
index 60d0ea67a4..a96d37ead5 100644
--- a/components/widgets/box.hpp
+++ b/components/widgets/box.hpp
@@ -4,7 +4,6 @@
 #include <MyGUI_Widget.h>
 #include <MyGUI_TextBox.h>
 #include <MyGUI_EditBox.h>
-#include <MyGUI_ListBox.h>
 #include <MyGUI_Button.h>
 
 #include "fontwrapper.hpp"

From 0745ed590bc7f82aca743c8f83aa64a3b57f3cc9 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sat, 4 Jun 2022 13:28:04 +0000
Subject: [PATCH 2563/2859] Fix incorrect package name in lua docs

---
 files/lua_api/openmw/world.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/files/lua_api/openmw/world.lua b/files/lua_api/openmw/world.lua
index 1f5d9a539b..c29ac4efaf 100644
--- a/files/lua_api/openmw/world.lua
+++ b/files/lua_api/openmw/world.lua
@@ -26,22 +26,22 @@
 ---
 -- Simulation time in seconds.
 -- The number of simulation seconds passed in the game world since starting a new game.
--- @function [parent=#core] getSimulationTime
+-- @function [parent=#world] getSimulationTime
 -- @return #number
 
 ---
 -- The scale of simulation time relative to real time.
--- @function [parent=#core] getSimulationTimeScale
+-- @function [parent=#world] getSimulationTimeScale
 -- @return #number
 
 ---
 -- Game time in seconds.
--- @function [parent=#core] getGameTime
+-- @function [parent=#world] getGameTime
 -- @return #number
 
 ---
 -- The scale of game time relative to simulation time.
--- @function [parent=#core] getGameTimeScale
+-- @function [parent=#world] getGameTimeScale
 -- @return #number
 
 ---

From bc0eed9843929033c02a52ce9680fc99529582cc Mon Sep 17 00:00:00 2001
From: Cody Glassman <glassmancody.info@gmail.com>
Date: Sat, 4 Jun 2022 13:33:35 +0000
Subject: [PATCH 2564/2859] [Postprocessing] Typos in docs and state attributes

---
 components/fx/pass.cpp                        |  6 +++---
 .../source/reference/postprocessing/omwfx.rst | 21 ++++---------------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/components/fx/pass.cpp b/components/fx/pass.cpp
index 16480128b7..b2fb8b2ffb 100644
--- a/components/fx/pass.cpp
+++ b/components/fx/pass.cpp
@@ -239,13 +239,13 @@ float omw_GetPointLightRadius(int index)
         stateSet->setAttribute(program);
 
         if (mBlendSource && mBlendDest)
-            stateSet->setAttribute(new osg::BlendFunc(mBlendSource.value(), mBlendDest.value()));
+            stateSet->setAttributeAndModes(new osg::BlendFunc(mBlendSource.value(), mBlendDest.value()));
 
         if (mBlendEq)
-            stateSet->setAttribute(new osg::BlendEquation(mBlendEq.value()));
+            stateSet->setAttributeAndModes(new osg::BlendEquation(mBlendEq.value()));
 
         if (mClearColor)
-            stateSet->setAttribute(new SceneUtil::ClearColor(mClearColor.value(), GL_COLOR_BUFFER_BIT));
+            stateSet->setAttributeAndModes(new SceneUtil::ClearColor(mClearColor.value(), GL_COLOR_BUFFER_BIT));
     }
 
     void Pass::dirty()
diff --git a/docs/source/reference/postprocessing/omwfx.rst b/docs/source/reference/postprocessing/omwfx.rst
index 7b5c6d2e79..e828bd8e6f 100644
--- a/docs/source/reference/postprocessing/omwfx.rst
+++ b/docs/source/reference/postprocessing/omwfx.rst
@@ -502,7 +502,7 @@ is not wanted and you want a custom render target.
 +------------------+---------------------+-----------------------------------------------------------------------------+
 | width_ratio      | float               | Automatic width as a percentage of screen width                             |
 +------------------+---------------------+-----------------------------------------------------------------------------+
-| height_ratio     | float               | Automatic width as a percentage of screen height                            |
+| height_ratio     | float               | Automatic height as a percentage of screen height                           |
 +------------------+---------------------+-----------------------------------------------------------------------------+
 | width            | float               | Width in pixels                                                             |
 +------------------+---------------------+-----------------------------------------------------------------------------+
@@ -511,10 +511,9 @@ is not wanted and you want a custom render target.
 | mipmaps          | boolean             | Whether mipmaps should be generated every frame                             |
 +------------------+---------------------+-----------------------------------------------------------------------------+
 
+To use the render target a pass must be assigned to it, along with any optional clear or blend modes.
 
-To use the render target you must assign passes to it, along with any optional clear modes or custom blend modes.
-
-In the code snippet below a rendertarget is used to draw the red cannel of a scene at half resolution, then a quarter. As a restriction,
+In the code snippet below a rendertarget is used to draw the red channel of a scene at half resolution, then a quarter. As a restriction,
 only three render targets can be bound per pass with ``rt1``, ``rt2``, ``rt3``, respectively.
 
 .. code-block:: none
@@ -552,21 +551,9 @@ only three render targets can be bound per pass with ``rt1``, ``rt2``, ``rt3``,
         }
     }
 
-Now, if we ever run the `downsample2x` pass it will write to the target buffer instead of the default
+Now, when the `downsample2x` pass runs it will write to the target buffer instead of the default
 one assigned by the engine.
 
-To use the uniform you can reference it in any pass, it should **not** be declared with the ``uniform`` keyword.
-
-.. code-block:: none
-
-    fragment pass {
-        void main()
-        {
-            // ...
-            vec3 color = uColor;
-        }
-    }
-
 Simple Example
 ##############
 

From ce49aa1202e3ee8f03bfbce33480c64b95cf2e8f Mon Sep 17 00:00:00 2001
From: Cody Glassman <glassmancody.info@gmail.com>
Date: Sat, 4 Jun 2022 13:35:27 +0000
Subject: [PATCH 2565/2859] Attach lights at origin when missing AttachLight
 node

---
 CHANGELOG.md                       |  1 +
 apps/opencs/view/render/object.cpp |  2 +-
 apps/openmw/mwrender/animation.cpp |  2 +-
 components/sceneutil/lightutil.cpp | 28 ++--------------------------
 components/sceneutil/lightutil.hpp |  5 ++---
 5 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a427f1e7c1..2cbc553151 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -119,6 +119,7 @@
     Bug #6718: Throwable weapons cause arrow enchantment effect to be applied to the whole body
     Bug #6730: LoopGroup stalls animation after playing :Stop frame until another animation is played
     Bug #6753: Info records without a DATA subrecords are loaded incorrectly
+    Bug #6794: Light sources are attached to mesh bounds centers instead of mesh origins when AttachLight NiNode is missing
     Feature #890: OpenMW-CS: Column filtering
     Feature #1465: "Reset" argument for AI functions
     Feature #2491: Ability to make OpenMW "portable"
diff --git a/apps/opencs/view/render/object.cpp b/apps/opencs/view/render/object.cpp
index 2def43df70..93c348ecc5 100644
--- a/apps/opencs/view/render/object.cpp
+++ b/apps/opencs/view/render/object.cpp
@@ -140,7 +140,7 @@ void CSVRender::Object::update()
     if (light)
     {
         bool isExterior = false; // FIXME
-        SceneUtil::addLight(mBaseNode, light, Mask_ParticleSystem, Mask_Lighting, isExterior);
+        SceneUtil::addLight(mBaseNode, light, Mask_Lighting, isExterior);
     }
 }
 
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 0ec8d8885d..f50ef156b9 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -1507,7 +1507,7 @@ namespace MWRender
     {
         bool exterior = mPtr.isInCell() && mPtr.getCell()->getCell()->isExterior();
 
-        mExtraLightSource = SceneUtil::addLight(parent, esmLight, Mask_ParticleSystem, Mask_Lighting, exterior);
+        mExtraLightSource = SceneUtil::addLight(parent, esmLight, Mask_Lighting, exterior);
         mExtraLightSource->setActorFade(mAlpha);
     }
 
diff --git a/components/sceneutil/lightutil.cpp b/components/sceneutil/lightutil.cpp
index 07b41ac814..031899848d 100644
--- a/components/sceneutil/lightutil.cpp
+++ b/components/sceneutil/lightutil.cpp
@@ -2,7 +2,6 @@
 
 #include <osg/Light>
 #include <osg/Group>
-#include <osg/ComputeBoundsVisitor>
 
 #include <components/esm3/loadligh.hpp>
 #include <components/fallback/fallback.hpp>
@@ -11,7 +10,6 @@
 #include "lightcontroller.hpp"
 #include "util.hpp"
 #include "visitor.hpp"
-#include "positionattitudetransform.hpp"
 
 namespace SceneUtil
 {
@@ -58,34 +56,12 @@ namespace SceneUtil
         light->setQuadraticAttenuation(quadraticAttenuation);
     }
 
-    osg::ref_ptr<LightSource> addLight(osg::Group* node, const ESM::Light* esmLight, unsigned int partsysMask, unsigned int lightMask, bool isExterior)
+    osg::ref_ptr<LightSource> addLight(osg::Group* node, const ESM::Light* esmLight, unsigned int lightMask, bool isExterior)
     {
         SceneUtil::FindByNameVisitor visitor("AttachLight");
         node->accept(visitor);
 
-        osg::Group* attachTo = nullptr;
-        if (visitor.mFoundNode)
-        {
-            attachTo = visitor.mFoundNode;
-        }
-        else
-        {
-            osg::ComputeBoundsVisitor computeBound;
-            computeBound.setTraversalMask(~partsysMask);
-            // We want the bounds of all children of the node, ignoring the node's local transformation
-            // So do a traverse(), not accept()
-            computeBound.traverse(*node);
-
-            // PositionAttitudeTransform seems to be slightly faster than MatrixTransform
-            osg::ref_ptr<SceneUtil::PositionAttitudeTransform> trans(new SceneUtil::PositionAttitudeTransform);
-            trans->setPosition(computeBound.getBoundingBox().center());
-            trans->setNodeMask(lightMask);
-
-            node->addChild(trans);
-
-            attachTo = trans;
-        }
-
+        osg::Group* attachTo = visitor.mFoundNode ? visitor.mFoundNode : node;
         osg::ref_ptr<LightSource> lightSource = createLightSource(esmLight, lightMask, isExterior, osg::Vec4f(0,0,0,1));
         attachTo->addChild(lightSource);
         return lightSource;
diff --git a/components/sceneutil/lightutil.hpp b/components/sceneutil/lightutil.hpp
index 1ddfa3d45f..aabeec58ab 100644
--- a/components/sceneutil/lightutil.hpp
+++ b/components/sceneutil/lightutil.hpp
@@ -26,13 +26,12 @@ namespace SceneUtil
 
     /// @brief Convert an ESM::Light to a SceneUtil::LightSource, and add it to a sub graph.
     /// @note If the sub graph contains a node named "AttachLight" (case insensitive), then the light is added to that.
-    /// Otherwise, the light is added in the center of the node's bounds.
+    /// Otherwise, the light is attached directly to the root node of the subgraph.
     /// @param node The sub graph to add a light to
     /// @param esmLight The light definition coming from the game files containing radius, color, flicker, etc.
-    /// @param partsysMask Node mask to ignore when computing the sub graph's bounding box.
     /// @param lightMask Mask to assign to the newly created LightSource.
     /// @param isExterior Is the light outside? May be used for deciding which attenuation settings to use.
-    osg::ref_ptr<LightSource> addLight (osg::Group* node, const ESM::Light* esmLight, unsigned int partsysMask, unsigned int lightMask, bool isExterior);
+    osg::ref_ptr<LightSource> addLight (osg::Group* node, const ESM::Light* esmLight, unsigned int lightMask, bool isExterior);
 
     /// @brief Convert an ESM::Light to a SceneUtil::LightSource, and return it.
     /// @param esmLight The light definition coming from the game files containing radius, color, flicker, etc.

From 6c71071083fa834ba10118472ae7dfbd0d0fbc03 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sat, 4 Jun 2022 16:07:59 +0200
Subject: [PATCH 2566/2859] Make the sRedcordId constexpr

---
 components/esm3/debugprofile.cpp | 3 ---
 components/esm3/debugprofile.hpp | 5 ++++-
 components/esm3/filter.cpp       | 3 ---
 components/esm3/filter.hpp       | 4 +++-
 components/esm3/globalmap.cpp    | 3 ---
 components/esm3/globalmap.hpp    | 5 ++++-
 components/esm3/loadacti.cpp     | 2 --
 components/esm3/loadacti.hpp     | 4 +++-
 components/esm3/loadalch.cpp     | 3 ---
 components/esm3/loadalch.hpp     | 4 +++-
 components/esm3/loadappa.cpp     | 3 ---
 components/esm3/loadappa.hpp     | 5 ++++-
 components/esm3/loadarmo.cpp     | 2 --
 components/esm3/loadarmo.hpp     | 5 ++++-
 components/esm3/loadbody.cpp     | 3 ---
 components/esm3/loadbody.hpp     | 4 +++-
 components/esm3/loadbook.cpp     | 3 ---
 components/esm3/loadbook.hpp     | 4 +++-
 components/esm3/loadbsgn.cpp     | 3 ---
 components/esm3/loadbsgn.hpp     | 4 +++-
 components/esm3/loadcell.cpp     | 3 ---
 components/esm3/loadcell.hpp     | 3 ++-
 components/esm3/loadclas.cpp     | 2 --
 components/esm3/loadclas.hpp     | 5 ++++-
 components/esm3/loadclot.cpp     | 3 ---
 components/esm3/loadclot.hpp     | 4 +++-
 components/esm3/loadcont.cpp     | 2 --
 components/esm3/loadcont.hpp     | 4 +++-
 components/esm3/loadcrea.cpp     | 3 ---
 components/esm3/loadcrea.hpp     | 5 ++++-
 components/esm3/loaddial.cpp     | 2 --
 components/esm3/loaddial.hpp     | 3 ++-
 components/esm3/loaddoor.cpp     | 3 ---
 components/esm3/loaddoor.hpp     | 5 ++++-
 components/esm3/loadench.cpp     | 3 ---
 components/esm3/loadench.hpp     | 4 +++-
 components/esm3/loadfact.cpp     | 3 ---
 components/esm3/loadfact.hpp     | 5 ++++-
 components/esm3/loadglob.cpp     | 3 ---
 components/esm3/loadglob.hpp     | 5 ++++-
 components/esm3/loadgmst.cpp     | 3 ---
 components/esm3/loadgmst.hpp     | 5 ++++-
 components/esm3/loadinfo.cpp     | 3 ---
 components/esm3/loadinfo.hpp     | 3 ++-
 components/esm3/loadingr.cpp     | 3 ---
 components/esm3/loadingr.hpp     | 5 ++++-
 components/esm3/loadland.cpp     | 2 --
 components/esm3/loadland.hpp     | 4 +++-
 components/esm3/loadligh.cpp     | 3 ---
 components/esm3/loadligh.hpp     | 5 ++++-
 components/esm3/loadlock.cpp     | 3 ---
 components/esm3/loadlock.hpp     | 5 ++++-
 components/esm3/loadltex.cpp     | 2 --
 components/esm3/loadltex.hpp     | 5 ++++-
 components/esm3/loadmgef.cpp     | 2 --
 components/esm3/loadmgef.hpp     | 5 ++++-
 components/esm3/loadmisc.cpp     | 3 ---
 components/esm3/loadmisc.hpp     | 5 ++++-
 components/esm3/loadnpc.cpp      | 3 ---
 components/esm3/loadnpc.hpp      | 3 ++-
 components/esm3/loadpgrd.cpp     | 3 ---
 components/esm3/loadpgrd.hpp     | 5 ++++-
 components/esm3/loadprob.cpp     | 3 ---
 components/esm3/loadprob.hpp     | 5 ++++-
 components/esm3/loadrace.cpp     | 3 ---
 components/esm3/loadrace.hpp     | 4 +++-
 components/esm3/loadregn.cpp     | 3 ---
 components/esm3/loadregn.hpp     | 4 +++-
 components/esm3/loadrepa.cpp     | 3 ---
 components/esm3/loadrepa.hpp     | 5 ++++-
 components/esm3/loadscpt.cpp     | 3 ---
 components/esm3/loadscpt.hpp     | 4 +++-
 components/esm3/loadskil.cpp     | 2 --
 components/esm3/loadskil.hpp     | 3 ++-
 components/esm3/loadsndg.cpp     | 2 --
 components/esm3/loadsndg.hpp     | 5 ++++-
 components/esm3/loadsoun.cpp     | 3 ---
 components/esm3/loadsoun.hpp     | 5 ++++-
 components/esm3/loadspel.cpp     | 3 ---
 components/esm3/loadspel.hpp     | 4 +++-
 components/esm3/loadsscr.cpp     | 3 ---
 components/esm3/loadsscr.hpp     | 5 ++++-
 components/esm3/loadstat.cpp     | 3 ---
 components/esm3/loadstat.hpp     | 5 ++++-
 components/esm3/loadweap.cpp     | 2 --
 components/esm3/loadweap.hpp     | 3 ++-
 components/esm3/savedgame.cpp    | 1 -
 components/esm3/savedgame.hpp    | 2 +-
 88 files changed, 147 insertions(+), 163 deletions(-)

diff --git a/components/esm3/debugprofile.cpp b/components/esm3/debugprofile.cpp
index cdbd47bce4..69f33d5f2d 100644
--- a/components/esm3/debugprofile.cpp
+++ b/components/esm3/debugprofile.cpp
@@ -2,13 +2,10 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
 
-unsigned int DebugProfile::sRecordId = REC_DBGP;
-
 void DebugProfile::load (ESMReader& esm, bool &isDeleted)
 {
     isDeleted = false;
diff --git a/components/esm3/debugprofile.hpp b/components/esm3/debugprofile.hpp
index 8340404c23..72695af062 100644
--- a/components/esm3/debugprofile.hpp
+++ b/components/esm3/debugprofile.hpp
@@ -3,6 +3,8 @@
 
 #include <string>
 
+#include "components/esm/defs.hpp"
+
 namespace ESM
 {
     class ESMReader;
@@ -10,7 +12,8 @@ namespace ESM
 
     struct DebugProfile
     {
-        static unsigned int sRecordId;
+        constexpr static unsigned int sRecordId = REC_DBGP;
+
 
         enum Flags
         {
diff --git a/components/esm3/filter.cpp b/components/esm3/filter.cpp
index 4c6f56def7..217b090b3a 100644
--- a/components/esm3/filter.cpp
+++ b/components/esm3/filter.cpp
@@ -2,13 +2,10 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
 
-unsigned int Filter::sRecordId = REC_FILT;
-
 void Filter::load (ESMReader& esm, bool &isDeleted)
 {
     isDeleted = false;
diff --git a/components/esm3/filter.hpp b/components/esm3/filter.hpp
index 78d51cec00..65845eabfb 100644
--- a/components/esm3/filter.hpp
+++ b/components/esm3/filter.hpp
@@ -2,6 +2,7 @@
 #define COMPONENTS_ESM_FILTER_H
 
 #include <string>
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
@@ -10,7 +11,8 @@ namespace ESM
 
     struct Filter
     {
-        static unsigned int sRecordId;
+        constexpr static unsigned int sRecordId = REC_FILT;
+
 
         unsigned int mRecordFlags;
         std::string mId;
diff --git a/components/esm3/globalmap.cpp b/components/esm3/globalmap.cpp
index 8eb4aebd8b..8a0dc016b5 100644
--- a/components/esm3/globalmap.cpp
+++ b/components/esm3/globalmap.cpp
@@ -2,13 +2,10 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
 
-unsigned int GlobalMap::sRecordId = REC_GMAP;
-
 void GlobalMap::load (ESMReader &esm)
 {
     esm.getHNT(mBounds, "BNDS");
diff --git a/components/esm3/globalmap.hpp b/components/esm3/globalmap.hpp
index e89123f898..25d674b939 100644
--- a/components/esm3/globalmap.hpp
+++ b/components/esm3/globalmap.hpp
@@ -4,6 +4,8 @@
 #include <vector>
 #include <set>
 
+#include "components/esm/defs.hpp"
+
 namespace ESM
 {
     class ESMReader;
@@ -14,7 +16,8 @@ namespace ESM
     ///< \brief An image containing the explored areas on the global map.
     struct GlobalMap
     {
-        static unsigned int sRecordId;
+        constexpr static unsigned int sRecordId = REC_GMAP;
+
 
         // The minimum and maximum cell coordinates
         struct Bounds
diff --git a/components/esm3/loadacti.cpp b/components/esm3/loadacti.cpp
index 89b5b85fbd..a6e28321ed 100644
--- a/components/esm3/loadacti.cpp
+++ b/components/esm3/loadacti.cpp
@@ -6,8 +6,6 @@
 
 namespace ESM
 {
-    unsigned int Activator::sRecordId = REC_ACTI;
-
     void Activator::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
diff --git a/components/esm3/loadacti.hpp b/components/esm3/loadacti.hpp
index c0cf274ed9..9924e02740 100644
--- a/components/esm3/loadacti.hpp
+++ b/components/esm3/loadacti.hpp
@@ -2,6 +2,7 @@
 #define OPENMW_ESM_ACTI_H
 
 #include <string>
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
@@ -11,7 +12,8 @@ class ESMWriter;
 
 struct Activator
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_ACTI;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Activator"; }
 
diff --git a/components/esm3/loadalch.cpp b/components/esm3/loadalch.cpp
index 9632e26fd9..e6504c61d8 100644
--- a/components/esm3/loadalch.cpp
+++ b/components/esm3/loadalch.cpp
@@ -2,12 +2,9 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
-    unsigned int Potion::sRecordId = REC_ALCH;
-
     void Potion::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
diff --git a/components/esm3/loadalch.hpp b/components/esm3/loadalch.hpp
index e032464abe..7ff0b0a779 100644
--- a/components/esm3/loadalch.hpp
+++ b/components/esm3/loadalch.hpp
@@ -4,6 +4,7 @@
 #include <string>
 
 #include "effectlist.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
@@ -17,7 +18,8 @@ class ESMWriter;
 
 struct Potion
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_ALCH;
+
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Potion"; }
diff --git a/components/esm3/loadappa.cpp b/components/esm3/loadappa.cpp
index 009f0bc53f..124d709973 100644
--- a/components/esm3/loadappa.cpp
+++ b/components/esm3/loadappa.cpp
@@ -2,12 +2,9 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
-    unsigned int Apparatus::sRecordId = REC_APPA;
-
     void Apparatus::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
diff --git a/components/esm3/loadappa.hpp b/components/esm3/loadappa.hpp
index 026a471f5b..006575ed64 100644
--- a/components/esm3/loadappa.hpp
+++ b/components/esm3/loadappa.hpp
@@ -3,6 +3,8 @@
 
 #include <string>
 
+#include "components/esm/defs.hpp"
+
 namespace ESM
 {
 
@@ -15,7 +17,8 @@ class ESMWriter;
 
 struct Apparatus
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_APPA;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Apparatus"; }
 
diff --git a/components/esm3/loadarmo.cpp b/components/esm3/loadarmo.cpp
index 86e3eb19cd..e7927219b7 100644
--- a/components/esm3/loadarmo.cpp
+++ b/components/esm3/loadarmo.cpp
@@ -36,8 +36,6 @@ namespace ESM
         }
     }
 
-    unsigned int Armor::sRecordId = REC_ARMO;
-
     void Armor::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
diff --git a/components/esm3/loadarmo.hpp b/components/esm3/loadarmo.hpp
index f11e3509d5..1095d3c22a 100644
--- a/components/esm3/loadarmo.hpp
+++ b/components/esm3/loadarmo.hpp
@@ -4,6 +4,8 @@
 #include <vector>
 #include <string>
 
+#include "components/esm/defs.hpp"
+
 namespace ESM
 {
 
@@ -65,7 +67,8 @@ struct PartReferenceList
 
 struct Armor
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_ARMO;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Armor"; }
 
diff --git a/components/esm3/loadbody.cpp b/components/esm3/loadbody.cpp
index 0075c51dd8..6b00d9a650 100644
--- a/components/esm3/loadbody.cpp
+++ b/components/esm3/loadbody.cpp
@@ -2,12 +2,9 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
-    unsigned int BodyPart::sRecordId = REC_BODY;
-
     void BodyPart::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
diff --git a/components/esm3/loadbody.hpp b/components/esm3/loadbody.hpp
index 145fe4b6f6..000215d718 100644
--- a/components/esm3/loadbody.hpp
+++ b/components/esm3/loadbody.hpp
@@ -2,6 +2,7 @@
 #define OPENMW_ESM_BODY_H
 
 #include <string>
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
@@ -11,7 +12,8 @@ class ESMWriter;
 
 struct BodyPart
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_BODY;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "BodyPart"; }
 
diff --git a/components/esm3/loadbook.cpp b/components/esm3/loadbook.cpp
index aef30e650a..4bd04cd810 100644
--- a/components/esm3/loadbook.cpp
+++ b/components/esm3/loadbook.cpp
@@ -2,12 +2,9 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
-    unsigned int Book::sRecordId = REC_BOOK;
-
     void Book::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
diff --git a/components/esm3/loadbook.hpp b/components/esm3/loadbook.hpp
index e46bec6272..bf0db3ed59 100644
--- a/components/esm3/loadbook.hpp
+++ b/components/esm3/loadbook.hpp
@@ -2,6 +2,7 @@
 #define OPENMW_ESM_BOOK_H
 
 #include <string>
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
@@ -14,7 +15,8 @@ class ESMWriter;
 
 struct Book
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_BOOK;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Book"; }
 
diff --git a/components/esm3/loadbsgn.cpp b/components/esm3/loadbsgn.cpp
index f037de5059..431a36a40f 100644
--- a/components/esm3/loadbsgn.cpp
+++ b/components/esm3/loadbsgn.cpp
@@ -2,12 +2,9 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
-    unsigned int BirthSign::sRecordId = REC_BSGN;
-
     void BirthSign::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
diff --git a/components/esm3/loadbsgn.hpp b/components/esm3/loadbsgn.hpp
index a199503a76..a9b935e601 100644
--- a/components/esm3/loadbsgn.hpp
+++ b/components/esm3/loadbsgn.hpp
@@ -4,6 +4,7 @@
 #include <string>
 
 #include "spelllist.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
@@ -13,7 +14,8 @@ class ESMWriter;
 
 struct BirthSign
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_BSGN;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "BirthSign"; }
 
diff --git a/components/esm3/loadcell.cpp b/components/esm3/loadcell.cpp
index 204dba2879..c8cb58b190 100644
--- a/components/esm3/loadcell.cpp
+++ b/components/esm3/loadcell.cpp
@@ -9,7 +9,6 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 #include "cellid.hpp"
 
 namespace ESM
@@ -41,8 +40,6 @@ namespace
 
 namespace ESM
 {
-    unsigned int Cell::sRecordId = REC_CELL;
-
     // Some overloaded compare operators.
     bool operator== (const MovedCellRef& ref, const RefNum& refNum)
     {
diff --git a/components/esm3/loadcell.hpp b/components/esm3/loadcell.hpp
index 13c14b30e9..1960e3b94a 100644
--- a/components/esm3/loadcell.hpp
+++ b/components/esm3/loadcell.hpp
@@ -63,7 +63,8 @@ struct CellRefTrackerPredicate
  */
 struct Cell
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_CELL;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Cell"; }
 
diff --git a/components/esm3/loadclas.cpp b/components/esm3/loadclas.cpp
index 8c12a268a3..2166382013 100644
--- a/components/esm3/loadclas.cpp
+++ b/components/esm3/loadclas.cpp
@@ -8,8 +8,6 @@
 
 namespace ESM
 {
-    unsigned int Class::sRecordId = REC_CLAS;
-
     const Class::Specialization Class::sSpecializationIds[3] = {
       Class::Combat,
       Class::Magic,
diff --git a/components/esm3/loadclas.hpp b/components/esm3/loadclas.hpp
index e1e8b2ff0f..493c44ffda 100644
--- a/components/esm3/loadclas.hpp
+++ b/components/esm3/loadclas.hpp
@@ -3,6 +3,8 @@
 
 #include <string>
 
+#include "components/esm/defs.hpp"
+
 namespace ESM
 {
 
@@ -17,7 +19,8 @@ class ESMWriter;
 // class
 struct Class
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_CLAS;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Class"; }
 
diff --git a/components/esm3/loadclot.cpp b/components/esm3/loadclot.cpp
index 4267602119..a9a4121997 100644
--- a/components/esm3/loadclot.cpp
+++ b/components/esm3/loadclot.cpp
@@ -2,12 +2,9 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
-    unsigned int Clothing::sRecordId = REC_CLOT;
-
     void Clothing::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
diff --git a/components/esm3/loadclot.hpp b/components/esm3/loadclot.hpp
index 26e82254ab..96e97751fb 100644
--- a/components/esm3/loadclot.hpp
+++ b/components/esm3/loadclot.hpp
@@ -4,6 +4,7 @@
 #include <string>
 
 #include "loadarmo.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
@@ -17,7 +18,8 @@ class ESMWriter;
 
 struct Clothing
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_CLOT;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Clothing"; }
 
diff --git a/components/esm3/loadcont.cpp b/components/esm3/loadcont.cpp
index 83aa3d0935..21ed46310a 100644
--- a/components/esm3/loadcont.cpp
+++ b/components/esm3/loadcont.cpp
@@ -27,8 +27,6 @@ namespace ESM
         }
     }
 
-    unsigned int Container::sRecordId = REC_CONT;
-
     void Container::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
diff --git a/components/esm3/loadcont.hpp b/components/esm3/loadcont.hpp
index a236f0a3e5..2fe352d0bb 100644
--- a/components/esm3/loadcont.hpp
+++ b/components/esm3/loadcont.hpp
@@ -5,6 +5,7 @@
 #include <vector>
 
 #include "components/esm/esmcommon.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
@@ -35,7 +36,8 @@ struct InventoryList
 
 struct Container
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_CONT;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Container"; }
 
diff --git a/components/esm3/loadcrea.cpp b/components/esm3/loadcrea.cpp
index ecd58615e1..5f44f0f655 100644
--- a/components/esm3/loadcrea.cpp
+++ b/components/esm3/loadcrea.cpp
@@ -4,13 +4,10 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
 
-    unsigned int Creature::sRecordId = REC_CREA;
-
     void Creature::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
diff --git a/components/esm3/loadcrea.hpp b/components/esm3/loadcrea.hpp
index 9d664d440e..b4a204c5ae 100644
--- a/components/esm3/loadcrea.hpp
+++ b/components/esm3/loadcrea.hpp
@@ -8,6 +8,8 @@
 #include "aipackage.hpp"
 #include "transport.hpp"
 
+#include "components/esm/defs.hpp"
+
 namespace ESM
 {
 
@@ -21,7 +23,8 @@ class ESMWriter;
 
 struct Creature
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_CREA;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Creature"; }
 
diff --git a/components/esm3/loaddial.cpp b/components/esm3/loaddial.cpp
index b3b42b9989..b29d75d92b 100644
--- a/components/esm3/loaddial.cpp
+++ b/components/esm3/loaddial.cpp
@@ -4,11 +4,9 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
-    unsigned int Dialogue::sRecordId = REC_DIAL;
 
     void Dialogue::load(ESMReader &esm, bool &isDeleted)
     {
diff --git a/components/esm3/loaddial.hpp b/components/esm3/loaddial.hpp
index 7998623998..e0c4af5f43 100644
--- a/components/esm3/loaddial.hpp
+++ b/components/esm3/loaddial.hpp
@@ -5,6 +5,7 @@
 #include <list>
 #include <map>
 
+#include "components/esm/defs.hpp"
 #include "loadinfo.hpp"
 
 namespace ESM
@@ -20,7 +21,7 @@ class ESMWriter;
 
 struct Dialogue
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_DIAL;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Dialogue"; }
 
diff --git a/components/esm3/loaddoor.cpp b/components/esm3/loaddoor.cpp
index 7aa6b3a17b..a1f0b16a5f 100644
--- a/components/esm3/loaddoor.cpp
+++ b/components/esm3/loaddoor.cpp
@@ -2,12 +2,9 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
-    unsigned int Door::sRecordId = REC_DOOR;
-
     void Door::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
diff --git a/components/esm3/loaddoor.hpp b/components/esm3/loaddoor.hpp
index 84dbcbfa56..349182d8b8 100644
--- a/components/esm3/loaddoor.hpp
+++ b/components/esm3/loaddoor.hpp
@@ -3,6 +3,8 @@
 
 #include <string>
 
+#include "components/esm/defs.hpp"
+
 namespace ESM
 {
 
@@ -11,7 +13,8 @@ class ESMWriter;
 
 struct Door
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_DOOR;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Door"; }
 
diff --git a/components/esm3/loadench.cpp b/components/esm3/loadench.cpp
index 25bf23748e..32a65b35aa 100644
--- a/components/esm3/loadench.cpp
+++ b/components/esm3/loadench.cpp
@@ -2,12 +2,9 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
-    unsigned int Enchantment::sRecordId = REC_ENCH;
-
     void Enchantment::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
diff --git a/components/esm3/loadench.hpp b/components/esm3/loadench.hpp
index 3f094f754c..4b3a422f8a 100644
--- a/components/esm3/loadench.hpp
+++ b/components/esm3/loadench.hpp
@@ -3,6 +3,7 @@
 
 #include <string>
 
+#include "components/esm/defs.hpp"
 #include "effectlist.hpp"
 
 namespace ESM
@@ -17,7 +18,8 @@ class ESMWriter;
 
 struct Enchantment
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_ENCH;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Enchantment"; }
 
diff --git a/components/esm3/loadfact.cpp b/components/esm3/loadfact.cpp
index e18d490f9e..350cfa3891 100644
--- a/components/esm3/loadfact.cpp
+++ b/components/esm3/loadfact.cpp
@@ -4,12 +4,9 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
-    unsigned int Faction::sRecordId = REC_FACT;
-
     int& Faction::FADTstruct::getSkill (int index, bool ignored)
     {
         if (index<0 || index>=7)
diff --git a/components/esm3/loadfact.hpp b/components/esm3/loadfact.hpp
index d47ff5a43e..2f03d3aeb1 100644
--- a/components/esm3/loadfact.hpp
+++ b/components/esm3/loadfact.hpp
@@ -4,6 +4,8 @@
 #include <string>
 #include <map>
 
+#include "components/esm/defs.hpp"
+
 namespace ESM
 {
 
@@ -30,7 +32,8 @@ struct RankData
 
 struct Faction
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_FACT;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Faction"; }
 
diff --git a/components/esm3/loadglob.cpp b/components/esm3/loadglob.cpp
index ea4a4256ee..595d31c85d 100644
--- a/components/esm3/loadglob.cpp
+++ b/components/esm3/loadglob.cpp
@@ -2,12 +2,9 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
-    unsigned int Global::sRecordId = REC_GLOB;
-
     void Global::load (ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
diff --git a/components/esm3/loadglob.hpp b/components/esm3/loadglob.hpp
index 7fcbe4b8e6..1a80251b0c 100644
--- a/components/esm3/loadglob.hpp
+++ b/components/esm3/loadglob.hpp
@@ -5,6 +5,8 @@
 
 #include "variant.hpp"
 
+#include "components/esm/defs.hpp"
+
 namespace ESM
 {
 
@@ -17,7 +19,8 @@ class ESMWriter;
 
 struct Global
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_GLOB;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Global"; }
 
diff --git a/components/esm3/loadgmst.cpp b/components/esm3/loadgmst.cpp
index 4a02696948..832ba80f63 100644
--- a/components/esm3/loadgmst.cpp
+++ b/components/esm3/loadgmst.cpp
@@ -2,12 +2,9 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
-    unsigned int GameSetting::sRecordId = REC_GMST;
-
     void GameSetting::load (ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false; // GameSetting record can't be deleted now (may be changed in the future)
diff --git a/components/esm3/loadgmst.hpp b/components/esm3/loadgmst.hpp
index a3981736f1..18ab494efe 100644
--- a/components/esm3/loadgmst.hpp
+++ b/components/esm3/loadgmst.hpp
@@ -5,6 +5,8 @@
 
 #include "variant.hpp"
 
+#include "components/esm/defs.hpp"
+
 namespace ESM
 {
 
@@ -18,7 +20,8 @@ class ESMWriter;
 
 struct GameSetting
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_GMST;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "GameSetting"; }
 
diff --git a/components/esm3/loadinfo.cpp b/components/esm3/loadinfo.cpp
index 20604c8be4..366582c10b 100644
--- a/components/esm3/loadinfo.cpp
+++ b/components/esm3/loadinfo.cpp
@@ -2,12 +2,9 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
-    unsigned int DialInfo::sRecordId = REC_INFO;
-
     void DialInfo::load(ESMReader &esm, bool &isDeleted)
     {
         mId = esm.getHNString("INAM");
diff --git a/components/esm3/loadinfo.hpp b/components/esm3/loadinfo.hpp
index 77769efcce..bfe504f404 100644
--- a/components/esm3/loadinfo.hpp
+++ b/components/esm3/loadinfo.hpp
@@ -20,7 +20,8 @@ class ESMWriter;
 
 struct DialInfo
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_INFO;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "DialInfo"; }
 
diff --git a/components/esm3/loadingr.cpp b/components/esm3/loadingr.cpp
index f746ff32cf..0bb2cdd6d7 100644
--- a/components/esm3/loadingr.cpp
+++ b/components/esm3/loadingr.cpp
@@ -2,12 +2,9 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
-    unsigned int Ingredient::sRecordId = REC_INGR;
-
     void Ingredient::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
diff --git a/components/esm3/loadingr.hpp b/components/esm3/loadingr.hpp
index 2ee572123d..667fdef15b 100644
--- a/components/esm3/loadingr.hpp
+++ b/components/esm3/loadingr.hpp
@@ -3,6 +3,8 @@
 
 #include <string>
 
+#include "components/esm/defs.hpp"
+
 namespace ESM
 {
 
@@ -15,7 +17,8 @@ class ESMWriter;
 
 struct Ingredient
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_INGR;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Ingredient"; }
 
diff --git a/components/esm3/loadland.cpp b/components/esm3/loadland.cpp
index 71b020f767..e9012a92f0 100644
--- a/components/esm3/loadland.cpp
+++ b/components/esm3/loadland.cpp
@@ -9,8 +9,6 @@
 
 namespace ESM
 {
-    unsigned int Land::sRecordId = REC_LAND;
-
     Land::Land()
         : mFlags(0)
         , mX(0)
diff --git a/components/esm3/loadland.hpp b/components/esm3/loadland.hpp
index 28bd36b8c7..1097f1c0bc 100644
--- a/components/esm3/loadland.hpp
+++ b/components/esm3/loadland.hpp
@@ -5,6 +5,7 @@
 
 #include <components/misc/constants.hpp>
 
+#include "components/esm/defs.hpp"
 #include "components/esm/esmcommon.hpp"
 
 namespace ESM
@@ -19,7 +20,8 @@ class ESMWriter;
 
 struct Land
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_LAND;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Land"; }
 
diff --git a/components/esm3/loadligh.cpp b/components/esm3/loadligh.cpp
index 7c9281bbd1..a8797b347a 100644
--- a/components/esm3/loadligh.cpp
+++ b/components/esm3/loadligh.cpp
@@ -2,12 +2,9 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
-    unsigned int Light::sRecordId = REC_LIGH;
-
     void Light::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
diff --git a/components/esm3/loadligh.hpp b/components/esm3/loadligh.hpp
index 9bd608e4d9..9667937ea8 100644
--- a/components/esm3/loadligh.hpp
+++ b/components/esm3/loadligh.hpp
@@ -3,6 +3,8 @@
 
 #include <string>
 
+#include "components/esm/defs.hpp"
+
 namespace ESM
 {
 
@@ -16,7 +18,8 @@ class ESMWriter;
 
 struct Light
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_LIGH;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Light"; }
 
diff --git a/components/esm3/loadlock.cpp b/components/esm3/loadlock.cpp
index 7d80a77b8a..4a2693ebf1 100644
--- a/components/esm3/loadlock.cpp
+++ b/components/esm3/loadlock.cpp
@@ -2,12 +2,9 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
-    unsigned int Lockpick::sRecordId = REC_LOCK;
-
     void Lockpick::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
diff --git a/components/esm3/loadlock.hpp b/components/esm3/loadlock.hpp
index 4f8a3575fc..c6c8ee2ee3 100644
--- a/components/esm3/loadlock.hpp
+++ b/components/esm3/loadlock.hpp
@@ -3,6 +3,8 @@
 
 #include <string>
 
+#include "components/esm/defs.hpp"
+
 namespace ESM
 {
 
@@ -11,7 +13,8 @@ class ESMWriter;
 
 struct Lockpick
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_LOCK;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Lockpick"; }
 
diff --git a/components/esm3/loadltex.cpp b/components/esm3/loadltex.cpp
index 26ce41c5b3..f7e75f079e 100644
--- a/components/esm3/loadltex.cpp
+++ b/components/esm3/loadltex.cpp
@@ -6,8 +6,6 @@
 
 namespace ESM
 {
-    unsigned int LandTexture::sRecordId = REC_LTEX;
-
     void LandTexture::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
diff --git a/components/esm3/loadltex.hpp b/components/esm3/loadltex.hpp
index b2e937c01a..977950c89f 100644
--- a/components/esm3/loadltex.hpp
+++ b/components/esm3/loadltex.hpp
@@ -3,6 +3,8 @@
 
 #include <string>
 
+#include "components/esm/defs.hpp"
+
 namespace ESM
 {
 
@@ -18,7 +20,8 @@ class ESMWriter;
 
 struct LandTexture
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_LTEX;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "LandTexture"; }
 
diff --git a/components/esm3/loadmgef.cpp b/components/esm3/loadmgef.cpp
index 973acd050c..28f9982ab7 100644
--- a/components/esm3/loadmgef.cpp
+++ b/components/esm3/loadmgef.cpp
@@ -187,8 +187,6 @@ namespace
 
 namespace ESM
 {
-    unsigned int MagicEffect::sRecordId = REC_MGEF;
-
 void MagicEffect::load(ESMReader &esm, bool &isDeleted)
 {
     isDeleted = false; // MagicEffect record can't be deleted now (may be changed in the future)
diff --git a/components/esm3/loadmgef.hpp b/components/esm3/loadmgef.hpp
index b9151f5d33..257c0f6bfb 100644
--- a/components/esm3/loadmgef.hpp
+++ b/components/esm3/loadmgef.hpp
@@ -5,6 +5,8 @@
 #include <string_view>
 #include <map>
 
+#include "components/esm/defs.hpp"
+
 namespace ESM
 {
 
@@ -13,7 +15,8 @@ class ESMWriter;
 
 struct MagicEffect
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_MGEF;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "MagicEffect"; }
 
diff --git a/components/esm3/loadmisc.cpp b/components/esm3/loadmisc.cpp
index 932e3d60a3..48c66d08b6 100644
--- a/components/esm3/loadmisc.cpp
+++ b/components/esm3/loadmisc.cpp
@@ -2,12 +2,9 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
-    unsigned int Miscellaneous::sRecordId = REC_MISC;
-
     void Miscellaneous::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
diff --git a/components/esm3/loadmisc.hpp b/components/esm3/loadmisc.hpp
index a0f46349a8..1e114e569e 100644
--- a/components/esm3/loadmisc.hpp
+++ b/components/esm3/loadmisc.hpp
@@ -3,6 +3,8 @@
 
 #include <string>
 
+#include "components/esm/defs.hpp"
+
 namespace ESM
 {
 
@@ -16,7 +18,8 @@ class ESMWriter;
 
 struct Miscellaneous
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_MISC;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Miscellaneous"; }
 
diff --git a/components/esm3/loadnpc.cpp b/components/esm3/loadnpc.cpp
index 117c545b84..08677838a8 100644
--- a/components/esm3/loadnpc.cpp
+++ b/components/esm3/loadnpc.cpp
@@ -2,12 +2,9 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
-    unsigned int NPC::sRecordId = REC_NPC_;
-
     void NPC::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
diff --git a/components/esm3/loadnpc.hpp b/components/esm3/loadnpc.hpp
index b215a346bc..10655a840d 100644
--- a/components/esm3/loadnpc.hpp
+++ b/components/esm3/loadnpc.hpp
@@ -23,7 +23,8 @@ class ESMWriter;
 
 struct NPC
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_NPC_;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "NPC"; }
 
diff --git a/components/esm3/loadpgrd.cpp b/components/esm3/loadpgrd.cpp
index f9204175fb..461a4194ee 100644
--- a/components/esm3/loadpgrd.cpp
+++ b/components/esm3/loadpgrd.cpp
@@ -2,12 +2,9 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
-    unsigned int Pathgrid::sRecordId = REC_PGRD;
-
     Pathgrid::Point& Pathgrid::Point::operator=(const float rhs[3])
     {
         mX = static_cast<int>(rhs[0]);
diff --git a/components/esm3/loadpgrd.hpp b/components/esm3/loadpgrd.hpp
index 02ce231fe3..d1c36e0043 100644
--- a/components/esm3/loadpgrd.hpp
+++ b/components/esm3/loadpgrd.hpp
@@ -4,6 +4,8 @@
 #include <string>
 #include <vector>
 
+#include "components/esm/defs.hpp"
+
 namespace ESM
 {
 
@@ -15,7 +17,8 @@ class ESMWriter;
  */
 struct Pathgrid
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_PGRD;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Pathgrid"; }
 
diff --git a/components/esm3/loadprob.cpp b/components/esm3/loadprob.cpp
index 3acd68dbd8..419b716ebc 100644
--- a/components/esm3/loadprob.cpp
+++ b/components/esm3/loadprob.cpp
@@ -2,12 +2,9 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
-    unsigned int Probe::sRecordId = REC_PROB;
-
     void Probe::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
diff --git a/components/esm3/loadprob.hpp b/components/esm3/loadprob.hpp
index 583aa24523..37c78e1b9b 100644
--- a/components/esm3/loadprob.hpp
+++ b/components/esm3/loadprob.hpp
@@ -3,6 +3,8 @@
 
 #include <string>
 
+#include "components/esm/defs.hpp"
+
 namespace ESM
 {
 
@@ -11,7 +13,8 @@ class ESMWriter;
 
 struct Probe
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_PROB;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Probe"; }
 
diff --git a/components/esm3/loadrace.cpp b/components/esm3/loadrace.cpp
index 9d2880f1bc..53174219df 100644
--- a/components/esm3/loadrace.cpp
+++ b/components/esm3/loadrace.cpp
@@ -2,12 +2,9 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
-    unsigned int Race::sRecordId = REC_RACE;
-
     int Race::MaleFemale::getValue (bool male) const
     {
         return male ? mMale : mFemale;
diff --git a/components/esm3/loadrace.hpp b/components/esm3/loadrace.hpp
index ba42261e73..273be8fbe7 100644
--- a/components/esm3/loadrace.hpp
+++ b/components/esm3/loadrace.hpp
@@ -4,6 +4,7 @@
 #include <string>
 
 #include "spelllist.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
@@ -17,7 +18,8 @@ class ESMWriter;
 
 struct Race
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_RACE;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Race"; }
 
diff --git a/components/esm3/loadregn.cpp b/components/esm3/loadregn.cpp
index 7af3e532f5..54f722f89a 100644
--- a/components/esm3/loadregn.cpp
+++ b/components/esm3/loadregn.cpp
@@ -2,12 +2,9 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
-    unsigned int Region::sRecordId = REC_REGN;
-
     void Region::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
diff --git a/components/esm3/loadregn.hpp b/components/esm3/loadregn.hpp
index 7944f69cfe..f3c19fa0fd 100644
--- a/components/esm3/loadregn.hpp
+++ b/components/esm3/loadregn.hpp
@@ -4,6 +4,7 @@
 #include <string>
 #include <vector>
 
+#include "components/esm/defs.hpp"
 #include "components/esm/esmcommon.hpp"
 
 namespace ESM
@@ -18,7 +19,8 @@ class ESMWriter;
 
 struct Region
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_REGN;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Region"; }
 
diff --git a/components/esm3/loadrepa.cpp b/components/esm3/loadrepa.cpp
index 26ec851317..3580359873 100644
--- a/components/esm3/loadrepa.cpp
+++ b/components/esm3/loadrepa.cpp
@@ -2,12 +2,9 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
-    unsigned int Repair::sRecordId = REC_REPA;
-
     void Repair::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
diff --git a/components/esm3/loadrepa.hpp b/components/esm3/loadrepa.hpp
index c3b2a076af..94e490bef0 100644
--- a/components/esm3/loadrepa.hpp
+++ b/components/esm3/loadrepa.hpp
@@ -3,6 +3,8 @@
 
 #include <string>
 
+#include "components/esm/defs.hpp"
+
 namespace ESM
 {
 
@@ -11,7 +13,8 @@ class ESMWriter;
 
 struct Repair
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_REPA;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Repair"; }
 
diff --git a/components/esm3/loadscpt.cpp b/components/esm3/loadscpt.cpp
index 0bb1916370..9f59dfbf23 100644
--- a/components/esm3/loadscpt.cpp
+++ b/components/esm3/loadscpt.cpp
@@ -6,12 +6,9 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
-    unsigned int Script::sRecordId = REC_SCPT;
-
     void Script::loadSCVR(ESMReader &esm)
     {
         int s = mData.mStringTableSize;
diff --git a/components/esm3/loadscpt.hpp b/components/esm3/loadscpt.hpp
index d40a571ec6..f195bc8464 100644
--- a/components/esm3/loadscpt.hpp
+++ b/components/esm3/loadscpt.hpp
@@ -4,6 +4,7 @@
 #include <string>
 #include <vector>
 
+#include "components/esm/defs.hpp"
 #include "components/esm/esmcommon.hpp"
 
 namespace ESM
@@ -19,7 +20,8 @@ class ESMWriter;
 class Script
 {
 public:
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_SCPT;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Script"; }
 
diff --git a/components/esm3/loadskil.cpp b/components/esm3/loadskil.cpp
index 98b965398e..6ad0faaf75 100644
--- a/components/esm3/loadskil.cpp
+++ b/components/esm3/loadskil.cpp
@@ -125,8 +125,6 @@ namespace ESM
         HandToHand
     }};
 
-    unsigned int Skill::sRecordId = REC_SKIL;
-
     void Skill::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false; // Skill record can't be deleted now (may be changed in the future)
diff --git a/components/esm3/loadskil.hpp b/components/esm3/loadskil.hpp
index 58e1fa6deb..71fb570388 100644
--- a/components/esm3/loadskil.hpp
+++ b/components/esm3/loadskil.hpp
@@ -19,7 +19,8 @@ class ESMWriter;
 
 struct Skill
 {
-    static unsigned int sRecordId;
+
+    constexpr static unsigned int sRecordId = REC_SKIL;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Skill"; }
 
diff --git a/components/esm3/loadsndg.cpp b/components/esm3/loadsndg.cpp
index 90231ebd9b..c81ff87099 100644
--- a/components/esm3/loadsndg.cpp
+++ b/components/esm3/loadsndg.cpp
@@ -6,8 +6,6 @@
 
 namespace ESM
 {
-    unsigned int SoundGenerator::sRecordId = REC_SNDG;
-
     void SoundGenerator::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
diff --git a/components/esm3/loadsndg.hpp b/components/esm3/loadsndg.hpp
index 565a29b156..96077635da 100644
--- a/components/esm3/loadsndg.hpp
+++ b/components/esm3/loadsndg.hpp
@@ -3,6 +3,8 @@
 
 #include <string>
 
+#include "components/esm/defs.hpp"
+
 namespace ESM
 {
 
@@ -15,7 +17,8 @@ class ESMWriter;
 
 struct SoundGenerator
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_SNDG;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "SoundGenerator"; }
 
diff --git a/components/esm3/loadsoun.cpp b/components/esm3/loadsoun.cpp
index 552132cd8d..95be333e13 100644
--- a/components/esm3/loadsoun.cpp
+++ b/components/esm3/loadsoun.cpp
@@ -2,12 +2,9 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
-    unsigned int Sound::sRecordId = REC_SOUN;
-
     void Sound::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
diff --git a/components/esm3/loadsoun.hpp b/components/esm3/loadsoun.hpp
index 4149a34b7d..8ba838b487 100644
--- a/components/esm3/loadsoun.hpp
+++ b/components/esm3/loadsoun.hpp
@@ -3,6 +3,8 @@
 
 #include <string>
 
+#include "components/esm/defs.hpp"
+
 namespace ESM
 {
 
@@ -16,7 +18,8 @@ struct SOUNstruct
 
 struct Sound
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_SOUN;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Sound"; }
 
diff --git a/components/esm3/loadspel.cpp b/components/esm3/loadspel.cpp
index eb1f5748e7..1415528f88 100644
--- a/components/esm3/loadspel.cpp
+++ b/components/esm3/loadspel.cpp
@@ -2,12 +2,9 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
-    unsigned int Spell::sRecordId = REC_SPEL;
-
     void Spell::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
diff --git a/components/esm3/loadspel.hpp b/components/esm3/loadspel.hpp
index 6a2d02d286..0096828e7f 100644
--- a/components/esm3/loadspel.hpp
+++ b/components/esm3/loadspel.hpp
@@ -4,6 +4,7 @@
 #include <string>
 
 #include "effectlist.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
@@ -13,7 +14,8 @@ class ESMWriter;
 
 struct Spell
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_SPEL;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Spell"; }
 
diff --git a/components/esm3/loadsscr.cpp b/components/esm3/loadsscr.cpp
index f24b2ef997..6f30980f04 100644
--- a/components/esm3/loadsscr.cpp
+++ b/components/esm3/loadsscr.cpp
@@ -2,12 +2,9 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
-    unsigned int StartScript::sRecordId = REC_SSCR;
-
     void StartScript::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
diff --git a/components/esm3/loadsscr.hpp b/components/esm3/loadsscr.hpp
index 277c4eb731..87c2e1f292 100644
--- a/components/esm3/loadsscr.hpp
+++ b/components/esm3/loadsscr.hpp
@@ -3,6 +3,8 @@
 
 #include <string>
 
+#include "components/esm/defs.hpp"
+
 namespace ESM
 {
 
@@ -19,7 +21,8 @@ class ESMWriter;
 
 struct StartScript
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_SSCR;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "StartScript"; }
 
diff --git a/components/esm3/loadstat.cpp b/components/esm3/loadstat.cpp
index 5bd98b086e..fba92cd467 100644
--- a/components/esm3/loadstat.cpp
+++ b/components/esm3/loadstat.cpp
@@ -2,12 +2,9 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
-    unsigned int Static::sRecordId = REC_STAT;
-
     void Static::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
diff --git a/components/esm3/loadstat.hpp b/components/esm3/loadstat.hpp
index 71f927d21c..7e964f23fd 100644
--- a/components/esm3/loadstat.hpp
+++ b/components/esm3/loadstat.hpp
@@ -3,6 +3,8 @@
 
 #include <string>
 
+#include "components/esm/defs.hpp"
+
 namespace ESM
 {
 
@@ -23,7 +25,8 @@ class ESMWriter;
 
 struct Static
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_STAT;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Static"; }
 
diff --git a/components/esm3/loadweap.cpp b/components/esm3/loadweap.cpp
index e1f63a26c6..cdc81f2aa7 100644
--- a/components/esm3/loadweap.cpp
+++ b/components/esm3/loadweap.cpp
@@ -6,8 +6,6 @@
 
 namespace ESM
 {
-    unsigned int Weapon::sRecordId = REC_WEAP;
-
     void Weapon::load(ESMReader &esm, bool &isDeleted)
     {
         isDeleted = false;
diff --git a/components/esm3/loadweap.hpp b/components/esm3/loadweap.hpp
index e75e12d685..2960fb0b5c 100644
--- a/components/esm3/loadweap.hpp
+++ b/components/esm3/loadweap.hpp
@@ -17,7 +17,8 @@ class ESMWriter;
 
 struct Weapon
 {
-    static unsigned int sRecordId;
+    constexpr static unsigned int sRecordId = REC_WEAP;
+
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Weapon"; }
 
diff --git a/components/esm3/savedgame.cpp b/components/esm3/savedgame.cpp
index 9a4997842c..69da8d087f 100644
--- a/components/esm3/savedgame.cpp
+++ b/components/esm3/savedgame.cpp
@@ -6,7 +6,6 @@
 namespace ESM
 {
 
-unsigned int SavedGame::sRecordId = REC_SAVE;
 int SavedGame::sCurrentFormat = 21;
 
 void SavedGame::load (ESMReader &esm)
diff --git a/components/esm3/savedgame.hpp b/components/esm3/savedgame.hpp
index 46180bb704..1ceee90e78 100644
--- a/components/esm3/savedgame.hpp
+++ b/components/esm3/savedgame.hpp
@@ -15,7 +15,7 @@ namespace ESM
 
     struct SavedGame
     {
-        static unsigned int sRecordId;
+        constexpr static unsigned int sRecordId = REC_SAVE;
 
         static int sCurrentFormat;
 

From df0cd86cf4694b258454c1debbf968783c282a1b Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sat, 4 Jun 2022 16:34:23 +0200
Subject: [PATCH 2567/2859] Use the proper types

---
 components/esm3/debugprofile.hpp | 2 +-
 components/esm3/filter.hpp       | 2 +-
 components/esm3/globalmap.hpp    | 2 +-
 components/esm3/loadacti.cpp     | 1 -
 components/esm3/loadacti.hpp     | 2 +-
 components/esm3/loadalch.hpp     | 2 +-
 components/esm3/loadappa.hpp     | 2 +-
 components/esm3/loadarmo.cpp     | 1 -
 components/esm3/loadarmo.hpp     | 2 +-
 components/esm3/loadbody.hpp     | 2 +-
 components/esm3/loadbook.hpp     | 2 +-
 components/esm3/loadbsgn.hpp     | 2 +-
 components/esm3/loadcell.hpp     | 2 +-
 components/esm3/loadclas.hpp     | 2 +-
 components/esm3/loadclot.hpp     | 2 +-
 components/esm3/loadcont.hpp     | 2 +-
 components/esm3/loadcrea.hpp     | 2 +-
 components/esm3/loaddial.hpp     | 2 +-
 components/esm3/loaddoor.hpp     | 2 +-
 components/esm3/loadench.hpp     | 2 +-
 components/esm3/loadfact.hpp     | 2 +-
 components/esm3/loadglob.hpp     | 2 +-
 components/esm3/loadgmst.hpp     | 2 +-
 components/esm3/loadinfo.hpp     | 2 +-
 components/esm3/loadingr.hpp     | 2 +-
 components/esm3/loadland.hpp     | 2 +-
 components/esm3/loadligh.hpp     | 2 +-
 components/esm3/loadlock.hpp     | 2 +-
 components/esm3/loadltex.hpp     | 2 +-
 components/esm3/loadmgef.hpp     | 2 +-
 components/esm3/loadmisc.hpp     | 2 +-
 components/esm3/loadnpc.hpp      | 2 +-
 components/esm3/loadpgrd.hpp     | 2 +-
 components/esm3/loadprob.hpp     | 2 +-
 components/esm3/loadrace.hpp     | 2 +-
 components/esm3/loadregn.hpp     | 2 +-
 components/esm3/loadrepa.hpp     | 2 +-
 components/esm3/loadscpt.hpp     | 2 +-
 components/esm3/loadskil.hpp     | 2 +-
 components/esm3/loadsndg.hpp     | 2 +-
 components/esm3/loadsoun.hpp     | 2 +-
 components/esm3/loadspel.hpp     | 2 +-
 components/esm3/loadsscr.hpp     | 2 +-
 components/esm3/loadstat.hpp     | 2 +-
 components/esm3/loadweap.hpp     | 2 +-
 components/esm3/savedgame.hpp    | 2 +-
 46 files changed, 44 insertions(+), 46 deletions(-)

diff --git a/components/esm3/debugprofile.hpp b/components/esm3/debugprofile.hpp
index 72695af062..e6fcbcd7f0 100644
--- a/components/esm3/debugprofile.hpp
+++ b/components/esm3/debugprofile.hpp
@@ -12,7 +12,7 @@ namespace ESM
 
     struct DebugProfile
     {
-        constexpr static unsigned int sRecordId = REC_DBGP;
+        constexpr static RecNameInts sRecordId = REC_DBGP;
 
 
         enum Flags
diff --git a/components/esm3/filter.hpp b/components/esm3/filter.hpp
index 65845eabfb..2284718d8f 100644
--- a/components/esm3/filter.hpp
+++ b/components/esm3/filter.hpp
@@ -11,7 +11,7 @@ namespace ESM
 
     struct Filter
     {
-        constexpr static unsigned int sRecordId = REC_FILT;
+        constexpr static RecNameInts sRecordId = REC_FILT;
 
 
         unsigned int mRecordFlags;
diff --git a/components/esm3/globalmap.hpp b/components/esm3/globalmap.hpp
index 25d674b939..593f8726b9 100644
--- a/components/esm3/globalmap.hpp
+++ b/components/esm3/globalmap.hpp
@@ -16,7 +16,7 @@ namespace ESM
     ///< \brief An image containing the explored areas on the global map.
     struct GlobalMap
     {
-        constexpr static unsigned int sRecordId = REC_GMAP;
+        constexpr static RecNameInts sRecordId = REC_GMAP;
 
 
         // The minimum and maximum cell coordinates
diff --git a/components/esm3/loadacti.cpp b/components/esm3/loadacti.cpp
index a6e28321ed..4ef11f8563 100644
--- a/components/esm3/loadacti.cpp
+++ b/components/esm3/loadacti.cpp
@@ -2,7 +2,6 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm3/loadacti.hpp b/components/esm3/loadacti.hpp
index 9924e02740..e0dac3f85a 100644
--- a/components/esm3/loadacti.hpp
+++ b/components/esm3/loadacti.hpp
@@ -12,7 +12,7 @@ class ESMWriter;
 
 struct Activator
 {
-    constexpr static unsigned int sRecordId = REC_ACTI;
+    constexpr static RecNameInts sRecordId = REC_ACTI;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Activator"; }
diff --git a/components/esm3/loadalch.hpp b/components/esm3/loadalch.hpp
index 7ff0b0a779..76d87bed63 100644
--- a/components/esm3/loadalch.hpp
+++ b/components/esm3/loadalch.hpp
@@ -18,7 +18,7 @@ class ESMWriter;
 
 struct Potion
 {
-    constexpr static unsigned int sRecordId = REC_ALCH;
+    constexpr static RecNameInts sRecordId = REC_ALCH;
 
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
diff --git a/components/esm3/loadappa.hpp b/components/esm3/loadappa.hpp
index 006575ed64..67dd462523 100644
--- a/components/esm3/loadappa.hpp
+++ b/components/esm3/loadappa.hpp
@@ -17,7 +17,7 @@ class ESMWriter;
 
 struct Apparatus
 {
-    constexpr static unsigned int sRecordId = REC_APPA;
+    constexpr static RecNameInts sRecordId = REC_APPA;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Apparatus"; }
diff --git a/components/esm3/loadarmo.cpp b/components/esm3/loadarmo.cpp
index e7927219b7..6b9225d883 100644
--- a/components/esm3/loadarmo.cpp
+++ b/components/esm3/loadarmo.cpp
@@ -2,7 +2,6 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm3/loadarmo.hpp b/components/esm3/loadarmo.hpp
index 1095d3c22a..3c16e9c6cf 100644
--- a/components/esm3/loadarmo.hpp
+++ b/components/esm3/loadarmo.hpp
@@ -67,7 +67,7 @@ struct PartReferenceList
 
 struct Armor
 {
-    constexpr static unsigned int sRecordId = REC_ARMO;
+    constexpr static RecNameInts sRecordId = REC_ARMO;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Armor"; }
diff --git a/components/esm3/loadbody.hpp b/components/esm3/loadbody.hpp
index 000215d718..7186b5bb52 100644
--- a/components/esm3/loadbody.hpp
+++ b/components/esm3/loadbody.hpp
@@ -12,7 +12,7 @@ class ESMWriter;
 
 struct BodyPart
 {
-    constexpr static unsigned int sRecordId = REC_BODY;
+    constexpr static RecNameInts sRecordId = REC_BODY;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "BodyPart"; }
diff --git a/components/esm3/loadbook.hpp b/components/esm3/loadbook.hpp
index bf0db3ed59..0e4b83c7ea 100644
--- a/components/esm3/loadbook.hpp
+++ b/components/esm3/loadbook.hpp
@@ -15,7 +15,7 @@ class ESMWriter;
 
 struct Book
 {
-    constexpr static unsigned int sRecordId = REC_BOOK;
+    constexpr static RecNameInts sRecordId = REC_BOOK;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Book"; }
diff --git a/components/esm3/loadbsgn.hpp b/components/esm3/loadbsgn.hpp
index a9b935e601..89832d0a43 100644
--- a/components/esm3/loadbsgn.hpp
+++ b/components/esm3/loadbsgn.hpp
@@ -14,7 +14,7 @@ class ESMWriter;
 
 struct BirthSign
 {
-    constexpr static unsigned int sRecordId = REC_BSGN;
+    constexpr static RecNameInts sRecordId = REC_BSGN;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "BirthSign"; }
diff --git a/components/esm3/loadcell.hpp b/components/esm3/loadcell.hpp
index 1960e3b94a..41876dfc6f 100644
--- a/components/esm3/loadcell.hpp
+++ b/components/esm3/loadcell.hpp
@@ -63,7 +63,7 @@ struct CellRefTrackerPredicate
  */
 struct Cell
 {
-    constexpr static unsigned int sRecordId = REC_CELL;
+    constexpr static RecNameInts sRecordId = REC_CELL;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Cell"; }
diff --git a/components/esm3/loadclas.hpp b/components/esm3/loadclas.hpp
index 493c44ffda..ce22622975 100644
--- a/components/esm3/loadclas.hpp
+++ b/components/esm3/loadclas.hpp
@@ -19,7 +19,7 @@ class ESMWriter;
 // class
 struct Class
 {
-    constexpr static unsigned int sRecordId = REC_CLAS;
+    constexpr static RecNameInts sRecordId = REC_CLAS;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Class"; }
diff --git a/components/esm3/loadclot.hpp b/components/esm3/loadclot.hpp
index 96e97751fb..d007e7f76e 100644
--- a/components/esm3/loadclot.hpp
+++ b/components/esm3/loadclot.hpp
@@ -18,7 +18,7 @@ class ESMWriter;
 
 struct Clothing
 {
-    constexpr static unsigned int sRecordId = REC_CLOT;
+    constexpr static RecNameInts sRecordId = REC_CLOT;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Clothing"; }
diff --git a/components/esm3/loadcont.hpp b/components/esm3/loadcont.hpp
index 2fe352d0bb..3fbb180d1b 100644
--- a/components/esm3/loadcont.hpp
+++ b/components/esm3/loadcont.hpp
@@ -36,7 +36,7 @@ struct InventoryList
 
 struct Container
 {
-    constexpr static unsigned int sRecordId = REC_CONT;
+    constexpr static RecNameInts sRecordId = REC_CONT;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Container"; }
diff --git a/components/esm3/loadcrea.hpp b/components/esm3/loadcrea.hpp
index b4a204c5ae..e5734e9b32 100644
--- a/components/esm3/loadcrea.hpp
+++ b/components/esm3/loadcrea.hpp
@@ -23,7 +23,7 @@ class ESMWriter;
 
 struct Creature
 {
-    constexpr static unsigned int sRecordId = REC_CREA;
+    constexpr static RecNameInts sRecordId = REC_CREA;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Creature"; }
diff --git a/components/esm3/loaddial.hpp b/components/esm3/loaddial.hpp
index e0c4af5f43..8f02c00425 100644
--- a/components/esm3/loaddial.hpp
+++ b/components/esm3/loaddial.hpp
@@ -21,7 +21,7 @@ class ESMWriter;
 
 struct Dialogue
 {
-    constexpr static unsigned int sRecordId = REC_DIAL;
+    constexpr static RecNameInts sRecordId = REC_DIAL;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Dialogue"; }
 
diff --git a/components/esm3/loaddoor.hpp b/components/esm3/loaddoor.hpp
index 349182d8b8..37b8ea85a9 100644
--- a/components/esm3/loaddoor.hpp
+++ b/components/esm3/loaddoor.hpp
@@ -13,7 +13,7 @@ class ESMWriter;
 
 struct Door
 {
-    constexpr static unsigned int sRecordId = REC_DOOR;
+    constexpr static RecNameInts sRecordId = REC_DOOR;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Door"; }
diff --git a/components/esm3/loadench.hpp b/components/esm3/loadench.hpp
index 4b3a422f8a..d20cf5a593 100644
--- a/components/esm3/loadench.hpp
+++ b/components/esm3/loadench.hpp
@@ -18,7 +18,7 @@ class ESMWriter;
 
 struct Enchantment
 {
-    constexpr static unsigned int sRecordId = REC_ENCH;
+    constexpr static RecNameInts sRecordId = REC_ENCH;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Enchantment"; }
diff --git a/components/esm3/loadfact.hpp b/components/esm3/loadfact.hpp
index 2f03d3aeb1..ec2df70c0e 100644
--- a/components/esm3/loadfact.hpp
+++ b/components/esm3/loadfact.hpp
@@ -32,7 +32,7 @@ struct RankData
 
 struct Faction
 {
-    constexpr static unsigned int sRecordId = REC_FACT;
+    constexpr static RecNameInts sRecordId = REC_FACT;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Faction"; }
diff --git a/components/esm3/loadglob.hpp b/components/esm3/loadglob.hpp
index 1a80251b0c..138d64e765 100644
--- a/components/esm3/loadglob.hpp
+++ b/components/esm3/loadglob.hpp
@@ -19,7 +19,7 @@ class ESMWriter;
 
 struct Global
 {
-    constexpr static unsigned int sRecordId = REC_GLOB;
+    constexpr static RecNameInts sRecordId = REC_GLOB;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Global"; }
diff --git a/components/esm3/loadgmst.hpp b/components/esm3/loadgmst.hpp
index 18ab494efe..da5a1baea6 100644
--- a/components/esm3/loadgmst.hpp
+++ b/components/esm3/loadgmst.hpp
@@ -20,7 +20,7 @@ class ESMWriter;
 
 struct GameSetting
 {
-    constexpr static unsigned int sRecordId = REC_GMST;
+    constexpr static RecNameInts sRecordId = REC_GMST;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "GameSetting"; }
diff --git a/components/esm3/loadinfo.hpp b/components/esm3/loadinfo.hpp
index bfe504f404..088ce074aa 100644
--- a/components/esm3/loadinfo.hpp
+++ b/components/esm3/loadinfo.hpp
@@ -20,7 +20,7 @@ class ESMWriter;
 
 struct DialInfo
 {
-    constexpr static unsigned int sRecordId = REC_INFO;
+    constexpr static RecNameInts sRecordId = REC_INFO;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "DialInfo"; }
diff --git a/components/esm3/loadingr.hpp b/components/esm3/loadingr.hpp
index 667fdef15b..587a342407 100644
--- a/components/esm3/loadingr.hpp
+++ b/components/esm3/loadingr.hpp
@@ -17,7 +17,7 @@ class ESMWriter;
 
 struct Ingredient
 {
-    constexpr static unsigned int sRecordId = REC_INGR;
+    constexpr static RecNameInts sRecordId = REC_INGR;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Ingredient"; }
diff --git a/components/esm3/loadland.hpp b/components/esm3/loadland.hpp
index 1097f1c0bc..bb71350b4f 100644
--- a/components/esm3/loadland.hpp
+++ b/components/esm3/loadland.hpp
@@ -20,7 +20,7 @@ class ESMWriter;
 
 struct Land
 {
-    constexpr static unsigned int sRecordId = REC_LAND;
+    constexpr static RecNameInts sRecordId = REC_LAND;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Land"; }
diff --git a/components/esm3/loadligh.hpp b/components/esm3/loadligh.hpp
index 9667937ea8..422d2b1d4e 100644
--- a/components/esm3/loadligh.hpp
+++ b/components/esm3/loadligh.hpp
@@ -18,7 +18,7 @@ class ESMWriter;
 
 struct Light
 {
-    constexpr static unsigned int sRecordId = REC_LIGH;
+    constexpr static RecNameInts sRecordId = REC_LIGH;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Light"; }
diff --git a/components/esm3/loadlock.hpp b/components/esm3/loadlock.hpp
index c6c8ee2ee3..1ebc6c902c 100644
--- a/components/esm3/loadlock.hpp
+++ b/components/esm3/loadlock.hpp
@@ -13,7 +13,7 @@ class ESMWriter;
 
 struct Lockpick
 {
-    constexpr static unsigned int sRecordId = REC_LOCK;
+    constexpr static RecNameInts sRecordId = REC_LOCK;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Lockpick"; }
diff --git a/components/esm3/loadltex.hpp b/components/esm3/loadltex.hpp
index 977950c89f..c645cb1d4f 100644
--- a/components/esm3/loadltex.hpp
+++ b/components/esm3/loadltex.hpp
@@ -20,7 +20,7 @@ class ESMWriter;
 
 struct LandTexture
 {
-    constexpr static unsigned int sRecordId = REC_LTEX;
+    constexpr static RecNameInts sRecordId = REC_LTEX;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "LandTexture"; }
diff --git a/components/esm3/loadmgef.hpp b/components/esm3/loadmgef.hpp
index 257c0f6bfb..6cd1ffad9b 100644
--- a/components/esm3/loadmgef.hpp
+++ b/components/esm3/loadmgef.hpp
@@ -15,7 +15,7 @@ class ESMWriter;
 
 struct MagicEffect
 {
-    constexpr static unsigned int sRecordId = REC_MGEF;
+    constexpr static RecNameInts sRecordId = REC_MGEF;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "MagicEffect"; }
diff --git a/components/esm3/loadmisc.hpp b/components/esm3/loadmisc.hpp
index 1e114e569e..2af4784a3c 100644
--- a/components/esm3/loadmisc.hpp
+++ b/components/esm3/loadmisc.hpp
@@ -18,7 +18,7 @@ class ESMWriter;
 
 struct Miscellaneous
 {
-    constexpr static unsigned int sRecordId = REC_MISC;
+    constexpr static RecNameInts sRecordId = REC_MISC;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Miscellaneous"; }
diff --git a/components/esm3/loadnpc.hpp b/components/esm3/loadnpc.hpp
index 10655a840d..b766a58394 100644
--- a/components/esm3/loadnpc.hpp
+++ b/components/esm3/loadnpc.hpp
@@ -23,7 +23,7 @@ class ESMWriter;
 
 struct NPC
 {
-    constexpr static unsigned int sRecordId = REC_NPC_;
+    constexpr static RecNameInts sRecordId = REC_NPC_;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "NPC"; }
diff --git a/components/esm3/loadpgrd.hpp b/components/esm3/loadpgrd.hpp
index d1c36e0043..b9490ae221 100644
--- a/components/esm3/loadpgrd.hpp
+++ b/components/esm3/loadpgrd.hpp
@@ -17,7 +17,7 @@ class ESMWriter;
  */
 struct Pathgrid
 {
-    constexpr static unsigned int sRecordId = REC_PGRD;
+    constexpr static RecNameInts sRecordId = REC_PGRD;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Pathgrid"; }
diff --git a/components/esm3/loadprob.hpp b/components/esm3/loadprob.hpp
index 37c78e1b9b..58e65d6c64 100644
--- a/components/esm3/loadprob.hpp
+++ b/components/esm3/loadprob.hpp
@@ -13,7 +13,7 @@ class ESMWriter;
 
 struct Probe
 {
-    constexpr static unsigned int sRecordId = REC_PROB;
+    constexpr static RecNameInts sRecordId = REC_PROB;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Probe"; }
diff --git a/components/esm3/loadrace.hpp b/components/esm3/loadrace.hpp
index 273be8fbe7..74459bab3d 100644
--- a/components/esm3/loadrace.hpp
+++ b/components/esm3/loadrace.hpp
@@ -18,7 +18,7 @@ class ESMWriter;
 
 struct Race
 {
-    constexpr static unsigned int sRecordId = REC_RACE;
+    constexpr static RecNameInts sRecordId = REC_RACE;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Race"; }
diff --git a/components/esm3/loadregn.hpp b/components/esm3/loadregn.hpp
index f3c19fa0fd..e47c30d2d2 100644
--- a/components/esm3/loadregn.hpp
+++ b/components/esm3/loadregn.hpp
@@ -19,7 +19,7 @@ class ESMWriter;
 
 struct Region
 {
-    constexpr static unsigned int sRecordId = REC_REGN;
+    constexpr static RecNameInts sRecordId = REC_REGN;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Region"; }
diff --git a/components/esm3/loadrepa.hpp b/components/esm3/loadrepa.hpp
index 94e490bef0..d4e94feaf4 100644
--- a/components/esm3/loadrepa.hpp
+++ b/components/esm3/loadrepa.hpp
@@ -13,7 +13,7 @@ class ESMWriter;
 
 struct Repair
 {
-    constexpr static unsigned int sRecordId = REC_REPA;
+    constexpr static RecNameInts sRecordId = REC_REPA;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Repair"; }
diff --git a/components/esm3/loadscpt.hpp b/components/esm3/loadscpt.hpp
index f195bc8464..fdb31ad6a4 100644
--- a/components/esm3/loadscpt.hpp
+++ b/components/esm3/loadscpt.hpp
@@ -20,7 +20,7 @@ class ESMWriter;
 class Script
 {
 public:
-    constexpr static unsigned int sRecordId = REC_SCPT;
+    constexpr static RecNameInts sRecordId = REC_SCPT;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Script"; }
diff --git a/components/esm3/loadskil.hpp b/components/esm3/loadskil.hpp
index 71fb570388..3fed87f136 100644
--- a/components/esm3/loadskil.hpp
+++ b/components/esm3/loadskil.hpp
@@ -20,7 +20,7 @@ class ESMWriter;
 struct Skill
 {
 
-    constexpr static unsigned int sRecordId = REC_SKIL;
+    constexpr static RecNameInts sRecordId = REC_SKIL;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Skill"; }
 
diff --git a/components/esm3/loadsndg.hpp b/components/esm3/loadsndg.hpp
index 96077635da..ad8c26f3ed 100644
--- a/components/esm3/loadsndg.hpp
+++ b/components/esm3/loadsndg.hpp
@@ -17,7 +17,7 @@ class ESMWriter;
 
 struct SoundGenerator
 {
-    constexpr static unsigned int sRecordId = REC_SNDG;
+    constexpr static RecNameInts sRecordId = REC_SNDG;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "SoundGenerator"; }
diff --git a/components/esm3/loadsoun.hpp b/components/esm3/loadsoun.hpp
index 8ba838b487..5fea039f4f 100644
--- a/components/esm3/loadsoun.hpp
+++ b/components/esm3/loadsoun.hpp
@@ -18,7 +18,7 @@ struct SOUNstruct
 
 struct Sound
 {
-    constexpr static unsigned int sRecordId = REC_SOUN;
+    constexpr static RecNameInts sRecordId = REC_SOUN;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Sound"; }
diff --git a/components/esm3/loadspel.hpp b/components/esm3/loadspel.hpp
index 0096828e7f..59fbe7fd95 100644
--- a/components/esm3/loadspel.hpp
+++ b/components/esm3/loadspel.hpp
@@ -14,7 +14,7 @@ class ESMWriter;
 
 struct Spell
 {
-    constexpr static unsigned int sRecordId = REC_SPEL;
+    constexpr static RecNameInts sRecordId = REC_SPEL;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Spell"; }
diff --git a/components/esm3/loadsscr.hpp b/components/esm3/loadsscr.hpp
index 87c2e1f292..64c8e78cda 100644
--- a/components/esm3/loadsscr.hpp
+++ b/components/esm3/loadsscr.hpp
@@ -21,7 +21,7 @@ class ESMWriter;
 
 struct StartScript
 {
-    constexpr static unsigned int sRecordId = REC_SSCR;
+    constexpr static RecNameInts sRecordId = REC_SSCR;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "StartScript"; }
diff --git a/components/esm3/loadstat.hpp b/components/esm3/loadstat.hpp
index 7e964f23fd..d107cc0ffd 100644
--- a/components/esm3/loadstat.hpp
+++ b/components/esm3/loadstat.hpp
@@ -25,7 +25,7 @@ class ESMWriter;
 
 struct Static
 {
-    constexpr static unsigned int sRecordId = REC_STAT;
+    constexpr static RecNameInts sRecordId = REC_STAT;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Static"; }
diff --git a/components/esm3/loadweap.hpp b/components/esm3/loadweap.hpp
index 2960fb0b5c..ee7fc845c4 100644
--- a/components/esm3/loadweap.hpp
+++ b/components/esm3/loadweap.hpp
@@ -17,7 +17,7 @@ class ESMWriter;
 
 struct Weapon
 {
-    constexpr static unsigned int sRecordId = REC_WEAP;
+    constexpr static RecNameInts sRecordId = REC_WEAP;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Weapon"; }
diff --git a/components/esm3/savedgame.hpp b/components/esm3/savedgame.hpp
index 1ceee90e78..a51fd3e817 100644
--- a/components/esm3/savedgame.hpp
+++ b/components/esm3/savedgame.hpp
@@ -15,7 +15,7 @@ namespace ESM
 
     struct SavedGame
     {
-        constexpr static unsigned int sRecordId = REC_SAVE;
+        constexpr static RecNameInts sRecordId = REC_SAVE;
 
         static int sCurrentFormat;
 

From 72a6d1f69f129b619059add68d648af09ddafabc Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sat, 4 Jun 2022 19:48:28 +0200
Subject: [PATCH 2568/2859] Clean up bullet includes

---
 apps/navmeshtool/worldspacedata.hpp                         | 1 -
 apps/openmw/mwphysics/hasspherecollisioncallback.hpp        | 2 --
 apps/openmw/mwphysics/object.cpp                            | 1 -
 apps/openmw/mwphysics/physicssystem.cpp                     | 5 +----
 apps/openmw/mwphysics/projectile.cpp                        | 1 -
 apps/openmw/mwworld/worldimp.cpp                            | 3 ---
 .../detournavigator/asyncnavmeshupdater.cpp                 | 2 ++
 components/bullethelpers/aabb.hpp                           | 2 --
 components/bullethelpers/operators.hpp                      | 6 +++---
 components/detournavigator/asyncnavmeshupdater.cpp          | 2 ++
 components/detournavigator/navmeshmanager.hpp               | 1 -
 11 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/apps/navmeshtool/worldspacedata.hpp b/apps/navmeshtool/worldspacedata.hpp
index dc2ca30c73..ce316b1f71 100644
--- a/apps/navmeshtool/worldspacedata.hpp
+++ b/apps/navmeshtool/worldspacedata.hpp
@@ -8,7 +8,6 @@
 #include <components/resource/bulletshape.hpp>
 
 #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
-#include <BulletCollision/Gimpact/btBoxCollision.h>
 #include <LinearMath/btVector3.h>
 
 #include <memory>
diff --git a/apps/openmw/mwphysics/hasspherecollisioncallback.hpp b/apps/openmw/mwphysics/hasspherecollisioncallback.hpp
index 2d271a8fba..09be0fd306 100644
--- a/apps/openmw/mwphysics/hasspherecollisioncallback.hpp
+++ b/apps/openmw/mwphysics/hasspherecollisioncallback.hpp
@@ -2,9 +2,7 @@
 #define OPENMW_MWPHYSICS_HASSPHERECOLLISIONCALLBACK_H
 
 #include <LinearMath/btVector3.h>
-#include <BulletCollision/BroadphaseCollision/btBroadphaseInterface.h>
 #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
-#include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 
 #include <algorithm>
 
diff --git a/apps/openmw/mwphysics/object.cpp b/apps/openmw/mwphysics/object.cpp
index 76661b86a0..f222a38340 100644
--- a/apps/openmw/mwphysics/object.cpp
+++ b/apps/openmw/mwphysics/object.cpp
@@ -9,7 +9,6 @@
 #include <components/bullethelpers/collisionobject.hpp>
 
 #include <BulletCollision/CollisionShapes/btCompoundShape.h>
-#include <BulletCollision/CollisionDispatch/btCollisionObject.h>
 
 #include <LinearMath/btTransform.h>
 
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 197a8f38ca..f4718e0d8f 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -1,8 +1,5 @@
 #include "physicssystem.hpp"
 
-#include <LinearMath/btIDebugDraw.h>
-#include <LinearMath/btVector3.h>
-
 #include <memory>
 #include <algorithm>
 #include <vector>
@@ -14,12 +11,12 @@
 #include <BulletCollision/CollisionShapes/btConeShape.h>
 #include <BulletCollision/CollisionShapes/btSphereShape.h>
 #include <BulletCollision/CollisionShapes/btStaticPlaneShape.h>
-#include <BulletCollision/CollisionShapes/btCompoundShape.h>
 #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 #include <BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h>
 #include <BulletCollision/BroadphaseCollision/btDbvtBroadphase.h>
 
+#include <LinearMath/btVector3.h>
 #include <LinearMath/btQuickprof.h>
 
 #include <components/nifbullet/bulletnifloader.hpp>
diff --git a/apps/openmw/mwphysics/projectile.cpp b/apps/openmw/mwphysics/projectile.cpp
index 6176738043..29ec4387b1 100644
--- a/apps/openmw/mwphysics/projectile.cpp
+++ b/apps/openmw/mwphysics/projectile.cpp
@@ -1,7 +1,6 @@
 #include <memory>
 
 #include <BulletCollision/CollisionShapes/btSphereShape.h>
-#include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 
 #include <components/misc/convert.hpp>
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index e70098e177..6ffba68a49 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -4,9 +4,6 @@
 #include <osg/ComputeBoundsVisitor>
 #include <osg/Timer>
 
-#include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
-#include <BulletCollision/CollisionShapes/btCompoundShape.h>
-
 #include <MyGUI_TextIterator.h>
 
 #include <components/debug/debuglog.hpp>
diff --git a/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp b/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp
index 06de335d50..db8cfb83dc 100644
--- a/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp
+++ b/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp
@@ -7,6 +7,8 @@
 #include <components/detournavigator/navmeshdbutils.hpp>
 #include <components/detournavigator/dbrefgeometryobject.hpp>
 
+#include <BulletCollision/CollisionShapes/btBoxShape.h>
+
 #include <DetourNavMesh.h>
 
 #include <gtest/gtest.h>
diff --git a/components/bullethelpers/aabb.hpp b/components/bullethelpers/aabb.hpp
index 6509b946ca..bfa1dd6e4e 100644
--- a/components/bullethelpers/aabb.hpp
+++ b/components/bullethelpers/aabb.hpp
@@ -1,10 +1,8 @@
 #ifndef OPENMW_COMPONENTS_BULLETHELPERS_AABB_H
 #define OPENMW_COMPONENTS_BULLETHELPERS_AABB_H
 
-#include <LinearMath/btVector3.h>
 #include <LinearMath/btTransform.h>
 #include <BulletCollision/CollisionShapes/btCollisionShape.h>
-#include <BulletCollision/Gimpact/btBoxCollision.h>
 
 inline bool operator==(const btAABB& lhs, const btAABB& rhs)
 {
diff --git a/components/bullethelpers/operators.hpp b/components/bullethelpers/operators.hpp
index 9250563ae9..1f5aa55425 100644
--- a/components/bullethelpers/operators.hpp
+++ b/components/bullethelpers/operators.hpp
@@ -6,10 +6,10 @@
 #include <ostream>
 #include <tuple>
 
-#include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
-#include <BulletCollision/CollisionShapes/btCompoundShape.h>
-#include <BulletCollision/CollisionShapes/btBoxShape.h>
+#include <BulletCollision/BroadphaseCollision/btBroadphaseProxy.h>
+
 #include <LinearMath/btTransform.h>
+#include <LinearMath/btAabbUtil2.h>
 
 inline std::ostream& operator <<(std::ostream& stream, const btVector3& value)
 {
diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index 36c54a99b0..22086c67ea 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -11,6 +11,8 @@
 #include <components/misc/thread.hpp>
 #include <components/loadinglistener/loadinglistener.hpp>
 
+#include <BulletCollision/CollisionShapes/btBoxShape.h>
+
 #include <DetourNavMesh.h>
 
 #include <osg/Stats>
diff --git a/components/detournavigator/navmeshmanager.hpp b/components/detournavigator/navmeshmanager.hpp
index 01937d22bd..dbe45b684f 100644
--- a/components/detournavigator/navmeshmanager.hpp
+++ b/components/detournavigator/navmeshmanager.hpp
@@ -8,7 +8,6 @@
 #include "waitconditiontype.hpp"
 #include "heightfieldshape.hpp"
 
-#include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
 
 #include <osg/Vec3f>
 

From a70d5831c5ef1a61f0171c5fa76112b423047a7c Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Fri, 20 May 2022 21:47:13 +0200
Subject: [PATCH 2569/2859] Lua scripts configuration in omwaddon

---
 apps/opencs/model/doc/savingstages.cpp        |   5 +-
 apps/opencs/model/world/metadata.cpp          |   4 +-
 apps/openmw/mwlua/globalscripts.hpp           |   3 +-
 apps/openmw/mwlua/localscripts.cpp            |   4 +-
 apps/openmw/mwlua/localscripts.hpp            |   2 +-
 apps/openmw/mwlua/luamanagerimp.cpp           |  40 ++--
 apps/openmw/mwlua/luamanagerimp.hpp           |   3 +-
 apps/openmw/mwlua/objectbindings.cpp          |   3 +-
 apps/openmw/mwlua/playerscripts.hpp           |   2 +-
 apps/openmw/mwlua/types/types.cpp             |  63 ++----
 apps/openmw/mwlua/types/types.hpp             |   4 -
 apps/openmw/mwlua/userdataserializer.cpp      |  15 +-
 apps/openmw/mwworld/esmstore.cpp              |   2 +-
 .../lua/test_configuration.cpp                | 209 ++++++++++++++++-
 .../lua/test_scriptscontainer.cpp             |  39 ++--
 components/esm/defs.hpp                       |   2 +-
 components/esm/luascripts.cpp                 | 113 +++++++++-
 components/esm/luascripts.hpp                 |  49 ++--
 components/esm3/loadtes3.hpp                  |   2 +-
 components/lua/configuration.cpp              | 213 ++++++++++++------
 components/lua/configuration.hpp              |  22 +-
 components/lua/scriptscontainer.cpp           |  52 +++--
 components/lua/scriptscontainer.hpp           |  17 +-
 components/lua/serialization.cpp              |  36 +++
 components/lua/serialization.hpp              |  22 ++
 .../reference/lua-scripting/overview.rst      |   6 +-
 26 files changed, 698 insertions(+), 234 deletions(-)

diff --git a/apps/opencs/model/doc/savingstages.cpp b/apps/opencs/model/doc/savingstages.cpp
index bba5aea92f..6fdf75eb84 100644
--- a/apps/opencs/model/doc/savingstages.cpp
+++ b/apps/opencs/model/doc/savingstages.cpp
@@ -53,7 +53,10 @@ void CSMDoc::WriteHeaderStage::perform (int stage, Messages& messages)
         mState.getWriter().setAuthor ("");
         mState.getWriter().setDescription ("");
         mState.getWriter().setRecordCount (0);
-        mState.getWriter().setFormat (ESM::Header::CurrentFormat);
+
+        // ESM::Header::CurrentFormat is `1` but since new records are not yet used in opencs
+        // we use the format `0` for compatibility with old versions.
+        mState.getWriter().setFormat(0);
     }
     else
     {
diff --git a/apps/opencs/model/world/metadata.cpp b/apps/opencs/model/world/metadata.cpp
index acee441883..e7d6c8900c 100644
--- a/apps/opencs/model/world/metadata.cpp
+++ b/apps/opencs/model/world/metadata.cpp
@@ -6,7 +6,9 @@
 
 void CSMWorld::MetaData::blank()
 {
-    mFormat = ESM::Header::CurrentFormat;
+    // ESM::Header::CurrentFormat is `1` but since new records are not yet used in opencs
+    // we use the format `0` for compatibility with old versions.
+    mFormat = 0;
     mAuthor.clear();
     mDescription.clear();
 }
diff --git a/apps/openmw/mwlua/globalscripts.hpp b/apps/openmw/mwlua/globalscripts.hpp
index 2b40aabd9d..5f8dc1ecf0 100644
--- a/apps/openmw/mwlua/globalscripts.hpp
+++ b/apps/openmw/mwlua/globalscripts.hpp
@@ -16,8 +16,7 @@ namespace MWLua
     class GlobalScripts : public LuaUtil::ScriptsContainer
     {
     public:
-        GlobalScripts(LuaUtil::LuaState* lua) :
-            LuaUtil::ScriptsContainer(lua, "Global", ESM::LuaScriptCfg::sGlobal)
+        GlobalScripts(LuaUtil::LuaState* lua) : LuaUtil::ScriptsContainer(lua, "Global")
         {
             registerEngineHandlers({
                 &mObjectActiveHandlers,
diff --git a/apps/openmw/mwlua/localscripts.cpp b/apps/openmw/mwlua/localscripts.cpp
index 948bc1e869..1224411453 100644
--- a/apps/openmw/mwlua/localscripts.cpp
+++ b/apps/openmw/mwlua/localscripts.cpp
@@ -148,8 +148,8 @@ namespace MWLua
         };
     }
 
-    LocalScripts::LocalScripts(LuaUtil::LuaState* lua, const LObject& obj, ESM::LuaScriptCfg::Flags autoStartMode)
-        : LuaUtil::ScriptsContainer(lua, "L" + idToString(obj.id()), autoStartMode), mData(obj)
+    LocalScripts::LocalScripts(LuaUtil::LuaState* lua, const LObject& obj)
+        : LuaUtil::ScriptsContainer(lua, "L" + idToString(obj.id())), mData(obj)
     {
         this->addPackage("openmw.self", sol::make_object(lua->sol(), &mData));
         registerEngineHandlers({&mOnActiveHandlers, &mOnInactiveHandlers, &mOnConsumeHandlers, &mOnActivatedHandlers});
diff --git a/apps/openmw/mwlua/localscripts.hpp b/apps/openmw/mwlua/localscripts.hpp
index b5bd8f95c8..58cf421d4a 100644
--- a/apps/openmw/mwlua/localscripts.hpp
+++ b/apps/openmw/mwlua/localscripts.hpp
@@ -20,7 +20,7 @@ namespace MWLua
     {
     public:
         static void initializeSelfPackage(const Context&);
-        LocalScripts(LuaUtil::LuaState* lua, const LObject& obj, ESM::LuaScriptCfg::Flags autoStartMode);
+        LocalScripts(LuaUtil::LuaState* lua, const LObject& obj);
 
         MWBase::LuaManager::ActorControls* getActorControls() { return &mData.mControls; }
 
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 3525906aac..7e15faee47 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -52,6 +52,7 @@ namespace MWLua
         Log(Debug::Verbose) << "Lua scripts configuration (" << mConfiguration.size() << " scripts):";
         for (size_t i = 0; i < mConfiguration.size(); ++i)
             Log(Debug::Verbose) << "#" << i << " " << LuaUtil::scriptCfgToString(mConfiguration[i]);
+        mGlobalScripts.setAutoStartConf(mConfiguration.getGlobalConf());
     }
 
     void LuaManager::init()
@@ -306,7 +307,7 @@ namespace MWLua
         LocalScripts* localScripts = ptr.getRefData().getLuaScripts();
         if (!localScripts)
         {
-            localScripts = createLocalScripts(ptr, ESM::LuaScriptCfg::sPlayer);
+            localScripts = createLocalScripts(ptr);
             localScripts->addAutoStartedScripts();
         }
         mActiveLocalScripts.insert(localScripts);
@@ -336,10 +337,11 @@ namespace MWLua
         LocalScripts* localScripts = ptr.getRefData().getLuaScripts();
         if (!localScripts)
         {
-            ESM::LuaScriptCfg::Flags flag = getLuaScriptFlag(ptr);
-            if (!mConfiguration.getListByFlag(flag).empty())
+            LuaUtil::ScriptIdsWithInitializationData autoStartConf =
+                mConfiguration.getLocalConf(ptr.getLuaType(), ptr.getCellRef().getRefId(), getId(ptr));
+            if (!autoStartConf.empty())
             {
-                localScripts = createLocalScripts(ptr, flag);
+                localScripts = createLocalScripts(ptr, std::move(autoStartConf));
                 localScripts->addAutoStartedScripts();  // TODO: put to a queue and apply on next `update()`
             }
         }
@@ -398,7 +400,7 @@ namespace MWLua
         LocalScripts* localScripts = ptr.getRefData().getLuaScripts();
         if (!localScripts)
         {
-            localScripts = createLocalScripts(ptr, getLuaScriptFlag(ptr));
+            localScripts = createLocalScripts(ptr);
             localScripts->addAutoStartedScripts();
             if (ptr.isInCell() && MWBase::Environment::get().getWorld()->isCellActive(ptr.getCell()))
                 mActiveLocalScripts.insert(localScripts);
@@ -406,16 +408,18 @@ namespace MWLua
         localScripts->addCustomScript(scriptId);
     }
 
-    LocalScripts* LuaManager::createLocalScripts(const MWWorld::Ptr& ptr, ESM::LuaScriptCfg::Flags flag)
+    LocalScripts* LuaManager::createLocalScripts(const MWWorld::Ptr& ptr,
+                                                 std::optional<LuaUtil::ScriptIdsWithInitializationData> autoStartConf)
     {
         assert(mInitialized);
-        assert(flag != ESM::LuaScriptCfg::sGlobal);
-        assert(ptr.getType() != ESM::REC_STAT);
         std::shared_ptr<LocalScripts> scripts;
-        if (flag == ESM::LuaScriptCfg::sPlayer)
+        uint32_t type = ptr.getLuaType();
+        if (type == ESM::REC_STAT)
+            throw std::runtime_error("Lua scripts on static objects are not allowed");
+        else if (type == ESM::REC_INTERNAL_PLAYER)
         {
-            assert(ptr.getCellRef().getRefId() == "player");
             scripts = std::make_shared<PlayerScripts>(&mLua, LObject(getId(ptr), mWorldView.getObjectRegistry()));
+            scripts->setAutoStartConf(mConfiguration.getPlayerConf());
             scripts->addPackage("openmw.ui", mUserInterfacePackage);
             scripts->addPackage("openmw.camera", mCameraPackage);
             scripts->addPackage("openmw.input", mInputPackage);
@@ -426,7 +430,10 @@ namespace MWLua
         }
         else
         {
-            scripts = std::make_shared<LocalScripts>(&mLua, LObject(getId(ptr), mWorldView.getObjectRegistry()), flag);
+            scripts = std::make_shared<LocalScripts>(&mLua, LObject(getId(ptr), mWorldView.getObjectRegistry()));
+            if (!autoStartConf.has_value())
+                autoStartConf = mConfiguration.getLocalConf(type, ptr.getCellRef().getRefId(), getId(ptr));
+            scripts->setAutoStartConf(std::move(*autoStartConf));
             scripts->addPackage("openmw.settings", mLocalSettingsPackage);
             scripts->addPackage("openmw.storage", mLocalStoragePackage);
         }
@@ -461,9 +468,8 @@ namespace MWLua
         globalScripts.load(reader);
         loadEvents(mLua.sol(), reader, mGlobalEvents, mLocalEvents, mContentFileMapping, mGlobalLoader.get());
 
-        mGlobalScripts.setSerializer(mGlobalLoader.get());
+        mGlobalScripts.setSavedDataDeserializer(mGlobalLoader.get());
         mGlobalScripts.load(globalScripts);
-        mGlobalScripts.setSerializer(mGlobalSerializer.get());
         mGlobalScriptsStarted = true;
     }
 
@@ -485,11 +491,11 @@ namespace MWLua
         }
 
         mWorldView.getObjectRegistry()->registerPtr(ptr);
-        LocalScripts* scripts = createLocalScripts(ptr, getLuaScriptFlag(ptr));
+        LocalScripts* scripts = createLocalScripts(ptr);
 
-        scripts->setSerializer(mLocalLoader.get());
-        scripts->load(data);
         scripts->setSerializer(mLocalSerializer.get());
+        scripts->setSavedDataDeserializer(mLocalLoader.get());
+        scripts->load(data);
 
         // LiveCellRef is usually copied after loading, so this Ptr will become invalid and should be deregistered.
         mWorldView.getObjectRegistry()->deregisterPtr(ptr);
@@ -506,6 +512,7 @@ namespace MWLua
         initConfiguration();
 
         {  // Reload global scripts
+            mGlobalScripts.setSavedDataDeserializer(mGlobalSerializer.get());
             ESM::LuaScripts data;
             mGlobalScripts.save(data);
             mGlobalScripts.load(data);
@@ -516,6 +523,7 @@ namespace MWLua
             LocalScripts* scripts = ptr.getRefData().getLuaScripts();
             if (scripts == nullptr)
                 continue;
+            scripts->setSavedDataDeserializer(mLocalSerializer.get());
             ESM::LuaScripts data;
             scripts->save(data);
             scripts->load(data);
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index 871ab0af26..e1eaac9ff8 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -123,7 +123,8 @@ namespace MWLua
 
     private:
         void initConfiguration();
-        LocalScripts* createLocalScripts(const MWWorld::Ptr& ptr, ESM::LuaScriptCfg::Flags);
+        LocalScripts* createLocalScripts(const MWWorld::Ptr& ptr,
+                                         std::optional<LuaUtil::ScriptIdsWithInitializationData> autoStartConf = std::nullopt);
 
         bool mInitialized = false;
         bool mGlobalScriptsStarted = false;
diff --git a/apps/openmw/mwlua/objectbindings.cpp b/apps/openmw/mwlua/objectbindings.cpp
index 113e3acde5..1b0436ab7f 100644
--- a/apps/openmw/mwlua/objectbindings.cpp
+++ b/apps/openmw/mwlua/objectbindings.cpp
@@ -222,8 +222,7 @@ namespace MWLua
                     LocalScripts* localScripts = ptr.getRefData().getLuaScripts();
                     if (!localScripts || !localScripts->hasScript(*scriptId))
                         throw std::runtime_error("There is no script " + std::string(path) + " on " + ptrToString(ptr));
-                    ESM::LuaScriptCfg::Flags flags = cfg[*scriptId].mFlags;
-                    if ((flags & (localScripts->getAutoStartMode() | ESM::LuaScriptCfg::sCustom)) != ESM::LuaScriptCfg::sCustom)
+                    if (localScripts->getAutoStartConf().count(*scriptId) > 0)
                         throw std::runtime_error("Autostarted script can not be removed: " + std::string(path));
                     localScripts->removeScript(*scriptId);
                 };
diff --git a/apps/openmw/mwlua/playerscripts.hpp b/apps/openmw/mwlua/playerscripts.hpp
index eb248ccc40..b8173f6b7b 100644
--- a/apps/openmw/mwlua/playerscripts.hpp
+++ b/apps/openmw/mwlua/playerscripts.hpp
@@ -15,7 +15,7 @@ namespace MWLua
     class PlayerScripts : public LocalScripts
     {
     public:
-        PlayerScripts(LuaUtil::LuaState* lua, const LObject& obj) : LocalScripts(lua, obj, ESM::LuaScriptCfg::sPlayer)
+        PlayerScripts(LuaUtil::LuaState* lua, const LObject& obj) : LocalScripts(lua, obj)
         {
             registerEngineHandlers({
                 &mConsoleCommandHandlers, &mKeyPressHandlers, &mKeyReleaseHandlers,
diff --git a/apps/openmw/mwlua/types/types.cpp b/apps/openmw/mwlua/types/types.cpp
index 6533696896..4ff72d7cea 100644
--- a/apps/openmw/mwlua/types/types.cpp
+++ b/apps/openmw/mwlua/types/types.cpp
@@ -35,33 +35,27 @@ namespace MWLua
 
     namespace
     {
-        struct LuaObjectTypeInfo
-        {
-            std::string_view mName;
-            ESM::LuaScriptCfg::Flags mFlag = 0;
-        };
-
-        const static std::unordered_map<ESM::RecNameInts, LuaObjectTypeInfo> luaObjectTypeInfo = {
-            {ESM::REC_INTERNAL_PLAYER, {ObjectTypeName::Player, ESM::LuaScriptCfg::sPlayer}},
-            {ESM::REC_INTERNAL_MARKER, {ObjectTypeName::Marker}},
-            {ESM::REC_ACTI, {ObjectTypeName::Activator, ESM::LuaScriptCfg::sActivator}},
-            {ESM::REC_ARMO, {ObjectTypeName::Armor, ESM::LuaScriptCfg::sArmor}},
-            {ESM::REC_BOOK, {ObjectTypeName::Book, ESM::LuaScriptCfg::sBook}},
-            {ESM::REC_CLOT, {ObjectTypeName::Clothing, ESM::LuaScriptCfg::sClothing}},
-            {ESM::REC_CONT, {ObjectTypeName::Container, ESM::LuaScriptCfg::sContainer}},
-            {ESM::REC_CREA, {ObjectTypeName::Creature, ESM::LuaScriptCfg::sCreature}},
-            {ESM::REC_DOOR, {ObjectTypeName::Door, ESM::LuaScriptCfg::sDoor}},
-            {ESM::REC_INGR, {ObjectTypeName::Ingredient, ESM::LuaScriptCfg::sIngredient}},
-            {ESM::REC_LIGH, {ObjectTypeName::Light, ESM::LuaScriptCfg::sLight}},
-            {ESM::REC_MISC, {ObjectTypeName::MiscItem, ESM::LuaScriptCfg::sMiscItem}},
-            {ESM::REC_NPC_, {ObjectTypeName::NPC, ESM::LuaScriptCfg::sNPC}},
-            {ESM::REC_ALCH, {ObjectTypeName::Potion, ESM::LuaScriptCfg::sPotion}},
-            {ESM::REC_STAT, {ObjectTypeName::Static}},
-            {ESM::REC_WEAP, {ObjectTypeName::Weapon, ESM::LuaScriptCfg::sWeapon}},
-            {ESM::REC_APPA, {ObjectTypeName::Apparatus}},
-            {ESM::REC_LOCK, {ObjectTypeName::Lockpick}},
-            {ESM::REC_PROB, {ObjectTypeName::Probe}},
-            {ESM::REC_REPA, {ObjectTypeName::Repair}},
+        const static std::unordered_map<ESM::RecNameInts, std::string_view> luaObjectTypeInfo = {
+            {ESM::REC_INTERNAL_PLAYER, ObjectTypeName::Player},
+            {ESM::REC_INTERNAL_MARKER, ObjectTypeName::Marker},
+            {ESM::REC_ACTI, ObjectTypeName::Activator},
+            {ESM::REC_ARMO, ObjectTypeName::Armor},
+            {ESM::REC_BOOK, ObjectTypeName::Book},
+            {ESM::REC_CLOT, ObjectTypeName::Clothing},
+            {ESM::REC_CONT, ObjectTypeName::Container},
+            {ESM::REC_CREA, ObjectTypeName::Creature},
+            {ESM::REC_DOOR, ObjectTypeName::Door},
+            {ESM::REC_INGR, ObjectTypeName::Ingredient},
+            {ESM::REC_LIGH, ObjectTypeName::Light},
+            {ESM::REC_MISC, ObjectTypeName::MiscItem},
+            {ESM::REC_NPC_, ObjectTypeName::NPC},
+            {ESM::REC_ALCH, ObjectTypeName::Potion},
+            {ESM::REC_STAT, ObjectTypeName::Static},
+            {ESM::REC_WEAP, ObjectTypeName::Weapon},
+            {ESM::REC_APPA, ObjectTypeName::Apparatus},
+            {ESM::REC_LOCK, ObjectTypeName::Lockpick},
+            {ESM::REC_PROB, ObjectTypeName::Probe},
+            {ESM::REC_REPA, ObjectTypeName::Repair},
         };
 
     }
@@ -70,7 +64,7 @@ namespace MWLua
     {
         auto it = luaObjectTypeInfo.find(type);
         if (it != luaObjectTypeInfo.end())
-            return it->second.mName;
+            return it->second;
         else
             return fallback;
     }
@@ -80,15 +74,6 @@ namespace MWLua
         return getLuaObjectTypeName(static_cast<ESM::RecNameInts>(ptr.getLuaType()), /*fallback=*/ptr.getTypeDescription());
     }
 
-    ESM::LuaScriptCfg::Flags getLuaScriptFlag(const MWWorld::Ptr& ptr)
-    {
-        auto it = luaObjectTypeInfo.find(static_cast<ESM::RecNameInts>(ptr.getLuaType()));
-        if (it != luaObjectTypeInfo.end())
-            return it->second.mFlag;
-        else
-            return 0;
-    }
-
     const MWWorld::Ptr& verifyType(ESM::RecNameInts recordType, const MWWorld::Ptr& ptr)
     {
         if (ptr.getType() != recordType)
@@ -179,9 +164,9 @@ namespace MWLua
 
         sol::table typeToPackage = getTypeToPackageTable(context.mLua->sol());
         sol::table packageToType = getPackageToTypeTable(context.mLua->sol());
-        for (const auto& [type, v] : luaObjectTypeInfo)
+        for (const auto& [type, name] : luaObjectTypeInfo)
         {
-            sol::object t = types[v.mName];
+            sol::object t = types[name];
             if (t == sol::nil)
                 continue;
             typeToPackage[type] = t;
diff --git a/apps/openmw/mwlua/types/types.hpp b/apps/openmw/mwlua/types/types.hpp
index 63df9a37f1..11d31ee673 100644
--- a/apps/openmw/mwlua/types/types.hpp
+++ b/apps/openmw/mwlua/types/types.hpp
@@ -17,10 +17,6 @@ namespace MWLua
     sol::table getTypeToPackageTable(lua_State* L);
     sol::table getPackageToTypeTable(lua_State* L);
 
-    // Each script has a set of flags that controls to which objects the script should be
-    // automatically attached. This function maps each object types to one of the flags. 
-    ESM::LuaScriptCfg::Flags getLuaScriptFlag(const MWWorld::Ptr& ptr);
-
     sol::table initTypesPackage(const Context& context);
 
     // used in initTypesPackage
diff --git a/apps/openmw/mwlua/userdataserializer.cpp b/apps/openmw/mwlua/userdataserializer.cpp
index b675774c53..3aabbfe0ac 100644
--- a/apps/openmw/mwlua/userdataserializer.cpp
+++ b/apps/openmw/mwlua/userdataserializer.cpp
@@ -21,11 +21,7 @@ namespace MWLua
         {
             if (data.is<GObject>() || data.is<LObject>())
             {
-                ObjectId id = data.as<Object>().id();
-                static_assert(sizeof(ObjectId) == 8);
-                id.mIndex = Misc::toLittleEndian(id.mIndex);
-                id.mContentFile = Misc::toLittleEndian(id.mContentFile);
-                append(out, "o", &id, sizeof(ObjectId));
+                appendRefNum(out, data.as<Object>().id());
                 return true;
             }
             return false;
@@ -35,14 +31,9 @@ namespace MWLua
         // Returns false if this type is not supported by this serializer.
         bool deserialize(std::string_view typeName, std::string_view binaryData, lua_State* lua) const override
         {
-            if (typeName == "o")
+            if (typeName == sRefNumTypeName)
             {
-                if (binaryData.size() != sizeof(ObjectId))
-                    throw std::runtime_error("Incorrect serialization format. Size of ObjectId doesn't match.");
-                ObjectId id;
-                std::memcpy(&id, binaryData.data(), sizeof(ObjectId));
-                id.mIndex = Misc::fromLittleEndian(id.mIndex);
-                id.mContentFile = Misc::fromLittleEndian(id.mContentFile);
+                ObjectId id = loadRefNum(binaryData);
                 if (id.hasContentFile() && mContentFileMapping)
                 {
                     auto iter = mContentFileMapping->find(id.mContentFile);
diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index bd93cc7c4e..c611155cf4 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -191,7 +191,7 @@ void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener, ESM::Dialo
             {
                 ESM::LuaScriptsCfg cfg;
                 cfg.load(esm);
-                // TODO: update refnums in cfg.mScripts[].mInitializationData according to load order
+                cfg.adjustRefNums(esm);
                 mLuaContent.push_back(std::move(cfg));
             }
             else {
diff --git a/apps/openmw_test_suite/lua/test_configuration.cpp b/apps/openmw_test_suite/lua/test_configuration.cpp
index 4869d42284..7170f33849 100644
--- a/apps/openmw_test_suite/lua/test_configuration.cpp
+++ b/apps/openmw_test_suite/lua/test_configuration.cpp
@@ -1,14 +1,31 @@
 #include "gmock/gmock.h"
 #include <gtest/gtest.h>
 
+#include <fstream>
+
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/esm3/readerscache.hpp>
 #include <components/lua/configuration.hpp>
+#include <components/lua/serialization.hpp>
 
 #include "../testing_util.hpp"
 
 namespace
 {
 
-    TEST(LuaConfigurationTest, ValidConfiguration)
+    using testing::ElementsAre;
+    using testing::Pair;
+
+    std::vector<std::pair<int, std::string>> asVector(const LuaUtil::ScriptIdsWithInitializationData& d)
+    {
+        std::vector<std::pair<int, std::string>> res;
+        for (const auto& [k, v] : d)
+            res.emplace_back(k, std::string(v));
+        return res;
+    }
+
+    TEST(LuaConfigurationTest, ValidOMWScripts)
     {
         ESM::LuaScriptsCfg cfg;
         LuaUtil::parseOMWScripts(cfg, R"X(
@@ -19,40 +36,208 @@ namespace
             PLAYER :my_mod/player.lua
             CUSTOM : my_mod/some_other_script.lua
             NPC , CREATURE PLAYER : my_mod/some_other_script.lua)X");
-        LuaUtil::parseOMWScripts(cfg, ":my_mod/player.LUA  \r\nCONTAINER,CUSTOM: my_mod/container.lua\r\n");
+        LuaUtil::parseOMWScripts(cfg, ":my_mod/player.LUA  \r\nCREATURE,CUSTOM: my_mod/creature.lua\r\n");
 
         ASSERT_EQ(cfg.mScripts.size(), 6);
         EXPECT_EQ(LuaUtil::scriptCfgToString(cfg.mScripts[0]), "GLOBAL : my_mod/#some_global_script.lua");
         EXPECT_EQ(LuaUtil::scriptCfgToString(cfg.mScripts[1]), "PLAYER : my_mod/player.lua");
         EXPECT_EQ(LuaUtil::scriptCfgToString(cfg.mScripts[2]), "CUSTOM : my_mod/some_other_script.lua");
-        EXPECT_EQ(LuaUtil::scriptCfgToString(cfg.mScripts[3]), "CREATURE NPC PLAYER : my_mod/some_other_script.lua");
+        EXPECT_EQ(LuaUtil::scriptCfgToString(cfg.mScripts[3]), "PLAYER NPC CREATURE : my_mod/some_other_script.lua");
         EXPECT_EQ(LuaUtil::scriptCfgToString(cfg.mScripts[4]), ": my_mod/player.LUA");
-        EXPECT_EQ(LuaUtil::scriptCfgToString(cfg.mScripts[5]), "CONTAINER CUSTOM : my_mod/container.lua");
+        EXPECT_EQ(LuaUtil::scriptCfgToString(cfg.mScripts[5]), "CUSTOM CREATURE : my_mod/creature.lua");
 
         LuaUtil::ScriptsConfiguration conf;
         conf.init(std::move(cfg));
-        ASSERT_EQ(conf.size(), 3);
+        ASSERT_EQ(conf.size(), 4);
         EXPECT_EQ(LuaUtil::scriptCfgToString(conf[0]), "GLOBAL : my_mod/#some_global_script.lua");
         // cfg.mScripts[1] is overridden by cfg.mScripts[4]
         // cfg.mScripts[2] is overridden by cfg.mScripts[3]
-        EXPECT_EQ(LuaUtil::scriptCfgToString(conf[1]), "CREATURE NPC PLAYER : my_mod/some_other_script.lua");
-        // cfg.mScripts[4] is removed because there are no flags
-        EXPECT_EQ(LuaUtil::scriptCfgToString(conf[2]), "CONTAINER CUSTOM : my_mod/container.lua");
+        EXPECT_EQ(LuaUtil::scriptCfgToString(conf[1]), "PLAYER NPC CREATURE : my_mod/some_other_script.lua");
+        EXPECT_EQ(LuaUtil::scriptCfgToString(conf[2]), ": my_mod/player.LUA");
+        EXPECT_EQ(LuaUtil::scriptCfgToString(conf[3]), "CUSTOM CREATURE : my_mod/creature.lua");
+
+        EXPECT_THAT(asVector(conf.getGlobalConf()), ElementsAre(Pair(0, "")));
+        EXPECT_THAT(asVector(conf.getPlayerConf()), ElementsAre(Pair(1, "")));
+        EXPECT_THAT(asVector(conf.getLocalConf(ESM::REC_CONT, "something", ESM::RefNum())), ElementsAre());
+        EXPECT_THAT(asVector(conf.getLocalConf(ESM::REC_NPC_, "something", ESM::RefNum())), ElementsAre(Pair(1, "")));
+        EXPECT_THAT(asVector(conf.getLocalConf(ESM::REC_CREA, "something", ESM::RefNum())), ElementsAre(Pair(1, ""), Pair(3, "")));
 
+        // Check that initialization cleans old data
         cfg = ESM::LuaScriptsCfg();
         conf.init(std::move(cfg));
-        ASSERT_EQ(conf.size(), 0);
+        EXPECT_EQ(conf.size(), 0);
     }
 
-    TEST(LuaConfigurationTest, Errors)
+    TEST(LuaConfigurationTest, InvalidOMWScripts)
     {
         ESM::LuaScriptsCfg cfg;
         EXPECT_ERROR(LuaUtil::parseOMWScripts(cfg, "GLOBAL: something"),
                      "Lua script should have suffix '.lua', got: GLOBAL: something");
         EXPECT_ERROR(LuaUtil::parseOMWScripts(cfg, "something.lua"),
                      "No flags found in: something.lua");
-        EXPECT_ERROR(LuaUtil::parseOMWScripts(cfg, "GLOBAL, PLAYER: something.lua"),
-                     "Global script can not have local flags");
+
+        cfg.mScripts.clear();
+        EXPECT_NO_THROW(LuaUtil::parseOMWScripts(cfg, "GLOBAL, PLAYER: something.lua"));
+        LuaUtil::ScriptsConfiguration conf;
+        EXPECT_ERROR(conf.init(std::move(cfg)), "Global script can not have local flags");
+    }
+
+    TEST(LuaConfigurationTest, ConfInit)
+    {
+        ESM::LuaScriptsCfg cfg;
+        ESM::LuaScriptCfg& script1 = cfg.mScripts.emplace_back();
+        script1.mScriptPath = "Script1.lua";
+        script1.mInitializationData = "data1";
+        script1.mFlags = ESM::LuaScriptCfg::sPlayer;
+        script1.mTypes.push_back(ESM::REC_CREA);
+        script1.mRecords.push_back({true, "record1", "dataRecord1"});
+        script1.mRefs.push_back({true, 2, 3, ""});
+        script1.mRefs.push_back({true, 2, 4, ""});
+
+        ESM::LuaScriptCfg& script2 = cfg.mScripts.emplace_back();
+        script2.mScriptPath = "Script2.lua";
+        script2.mFlags = ESM::LuaScriptCfg::sCustom;
+        script2.mTypes.push_back(ESM::REC_CONT);
+
+        ESM::LuaScriptCfg& script1Extra = cfg.mScripts.emplace_back();
+        script1Extra.mScriptPath = "script1.LUA";
+        script1Extra.mFlags = ESM::LuaScriptCfg::sCustom | ESM::LuaScriptCfg::sMerge;
+        script1Extra.mTypes.push_back(ESM::REC_NPC_);
+        script1Extra.mRecords.push_back({false, "rat", ""});
+        script1Extra.mRecords.push_back({true, "record2", ""});
+        script1Extra.mRefs.push_back({true, 3, 5, "dataRef35"});
+        script1Extra.mRefs.push_back({false, 2, 3, ""});
+
+        LuaUtil::ScriptsConfiguration conf;
+        conf.init(cfg);
+        ASSERT_EQ(conf.size(), 2);
+        EXPECT_EQ(LuaUtil::scriptCfgToString(conf[0]),
+                  "CUSTOM PLAYER CREATURE NPC : Script1.lua ; data 5 bytes ; 3 records ; 4 objects");
+        EXPECT_EQ(LuaUtil::scriptCfgToString(conf[1]), "CUSTOM CONTAINER : Script2.lua");
+
+        EXPECT_THAT(asVector(conf.getPlayerConf()), ElementsAre(Pair(0, "data1")));
+        EXPECT_THAT(asVector(conf.getLocalConf(ESM::REC_CONT, "something", ESM::RefNum())), ElementsAre(Pair(1, "")));
+        EXPECT_THAT(asVector(conf.getLocalConf(ESM::REC_CREA, "guar", ESM::RefNum())), ElementsAre(Pair(0, "data1")));
+        EXPECT_THAT(asVector(conf.getLocalConf(ESM::REC_CREA, "rat", ESM::RefNum())), ElementsAre());
+        EXPECT_THAT(asVector(conf.getLocalConf(ESM::REC_DOOR, "record1", ESM::RefNum())), ElementsAre(Pair(0, "dataRecord1")));
+        EXPECT_THAT(asVector(conf.getLocalConf(ESM::REC_DOOR, "record2", ESM::RefNum())), ElementsAre(Pair(0, "data1")));
+        EXPECT_THAT(asVector(conf.getLocalConf(ESM::REC_NPC_, "record3", {1, 1})), ElementsAre(Pair(0, "data1")));
+        EXPECT_THAT(asVector(conf.getLocalConf(ESM::REC_NPC_, "record3", {2, 3})), ElementsAre());
+        EXPECT_THAT(asVector(conf.getLocalConf(ESM::REC_NPC_, "record3", {3, 5})), ElementsAre(Pair(0, "dataRef35")));
+        EXPECT_THAT(asVector(conf.getLocalConf(ESM::REC_CONT, "record4", {2, 4})), ElementsAre(Pair(0, "data1"), Pair(1, "")));
+
+        ESM::LuaScriptCfg& script3 = cfg.mScripts.emplace_back();
+        script3.mScriptPath = "script1.lua";
+        script3.mFlags = ESM::LuaScriptCfg::sGlobal;
+        EXPECT_ERROR(conf.init(cfg), "Flags mismatch for script1.lua");
     }
 
+    TEST(LuaConfigurationTest, Serialization)
+    {
+        sol::state lua;
+        LuaUtil::BasicSerializer serializer;
+
+        ESM::ESMWriter writer;
+        writer.setAuthor("");
+        writer.setDescription("");
+        writer.setRecordCount(1);
+        writer.setFormat(ESM::Header::CurrentFormat);
+        writer.setVersion();
+        writer.addMaster("morrowind.esm", 0);
+
+        ESM::LuaScriptsCfg cfg;
+        std::string luaData;
+        {
+            sol::table data(lua, sol::create);
+            data["number"] = 5;
+            data["string"] = "some value";
+            data["fargoth"] = ESM::RefNum{128964, 1};
+            luaData = LuaUtil::serialize(data, &serializer);
+        }
+        {
+            ESM::LuaScriptCfg& script = cfg.mScripts.emplace_back();
+            script.mScriptPath = "test_global.lua";
+            script.mFlags = ESM::LuaScriptCfg::sGlobal;
+            script.mInitializationData = luaData;
+        }
+        {
+            ESM::LuaScriptCfg& script = cfg.mScripts.emplace_back();
+            script.mScriptPath = "test_local.lua";
+            script.mFlags = ESM::LuaScriptCfg::sMerge;
+            script.mTypes.push_back(ESM::REC_DOOR);
+            script.mTypes.push_back(ESM::REC_MISC);
+            script.mRecords.push_back({true, "rat", luaData});
+            script.mRecords.push_back({false, "chargendoorjournal", ""});
+            script.mRefs.push_back({true, 128964, 1, ""});
+            script.mRefs.push_back({true, 128962, 1, luaData});
+        }
+
+        std::stringstream stream;
+        writer.save(stream);
+        writer.startRecord(ESM::REC_LUAL);
+        cfg.save(writer);
+        writer.endRecord(ESM::REC_LUAL);
+        writer.close();
+        std::string serializedOMWAddon = stream.str();
+
+        {
+            // Save for manual testing.
+            std::ofstream f(TestingOpenMW::outputFilePath("lua_conf_test.omwaddon"), std::ios::binary);
+            f << serializedOMWAddon;
+            f.close();
+        }
+
+        ESM::ESMReader reader;
+        reader.open(std::make_unique<std::istringstream>(serializedOMWAddon), "lua_conf_test.omwaddon");
+        ASSERT_EQ(reader.getRecordCount(), 1);
+        ASSERT_EQ(reader.getRecName().toInt(), ESM::REC_LUAL);
+        reader.getRecHeader();
+        ESM::LuaScriptsCfg loadedCfg;
+        loadedCfg.load(reader);
+
+        ASSERT_EQ(loadedCfg.mScripts.size(), cfg.mScripts.size());
+        for (size_t i = 0; i < cfg.mScripts.size(); ++i)
+        {
+            EXPECT_EQ(loadedCfg.mScripts[i].mScriptPath, cfg.mScripts[i].mScriptPath);
+            EXPECT_EQ(loadedCfg.mScripts[i].mFlags, cfg.mScripts[i].mFlags);
+            EXPECT_EQ(loadedCfg.mScripts[i].mInitializationData, cfg.mScripts[i].mInitializationData);
+            ASSERT_EQ(loadedCfg.mScripts[i].mTypes.size(), cfg.mScripts[i].mTypes.size());
+            for (size_t j = 0; j < cfg.mScripts[i].mTypes.size(); ++j)
+                EXPECT_EQ(loadedCfg.mScripts[i].mTypes[j], cfg.mScripts[i].mTypes[j]);
+            ASSERT_EQ(loadedCfg.mScripts[i].mRecords.size(), cfg.mScripts[i].mRecords.size());
+            for (size_t j = 0; j < cfg.mScripts[i].mRecords.size(); ++j)
+            {
+                EXPECT_EQ(loadedCfg.mScripts[i].mRecords[j].mAttach, cfg.mScripts[i].mRecords[j].mAttach);
+                EXPECT_EQ(loadedCfg.mScripts[i].mRecords[j].mRecordId, cfg.mScripts[i].mRecords[j].mRecordId);
+                EXPECT_EQ(loadedCfg.mScripts[i].mRecords[j].mInitializationData, cfg.mScripts[i].mRecords[j].mInitializationData);
+            }
+            ASSERT_EQ(loadedCfg.mScripts[i].mRefs.size(), cfg.mScripts[i].mRefs.size());
+            for (size_t j = 0; j < cfg.mScripts[i].mRefs.size(); ++j)
+            {
+                EXPECT_EQ(loadedCfg.mScripts[i].mRefs[j].mAttach, cfg.mScripts[i].mRefs[j].mAttach);
+                EXPECT_EQ(loadedCfg.mScripts[i].mRefs[j].mRefnumIndex, cfg.mScripts[i].mRefs[j].mRefnumIndex);
+                EXPECT_EQ(loadedCfg.mScripts[i].mRefs[j].mRefnumContentFile, cfg.mScripts[i].mRefs[j].mRefnumContentFile);
+                EXPECT_EQ(loadedCfg.mScripts[i].mRefs[j].mInitializationData, cfg.mScripts[i].mRefs[j].mInitializationData);
+            }
+        }
+
+        {
+            ESM::ReadersCache readers(4);
+            readers.get(0)->openRaw(std::make_unique<std::istringstream>("dummyData"), "a.omwaddon");
+            readers.get(1)->openRaw(std::make_unique<std::istringstream>("dummyData"), "b.omwaddon");
+            readers.get(2)->openRaw(std::make_unique<std::istringstream>("dummyData"), "Morrowind.esm");
+            readers.get(3)->openRaw(std::make_unique<std::istringstream>("dummyData"), "c.omwaddon");
+            reader.setIndex(3);
+            reader.resolveParentFileIndices(readers);
+        }
+        loadedCfg.adjustRefNums(reader);
+        EXPECT_EQ(loadedCfg.mScripts[1].mRefs[0].mRefnumIndex, cfg.mScripts[1].mRefs[0].mRefnumIndex);
+        EXPECT_EQ(loadedCfg.mScripts[1].mRefs[0].mRefnumContentFile, 2);
+        {
+            sol::table data = LuaUtil::deserialize(lua.lua_state(), loadedCfg.mScripts[1].mRefs[1].mInitializationData, &serializer);
+            ESM::RefNum adjustedRef = data["fargoth"].get<ESM::RefNum>();
+            EXPECT_EQ(adjustedRef.mIndex, 128964);
+            EXPECT_EQ(adjustedRef.mContentFile, 2);
+        }
+    }
 }
diff --git a/apps/openmw_test_suite/lua/test_scriptscontainer.cpp b/apps/openmw_test_suite/lua/test_scriptscontainer.cpp
index 18aeffbbf2..84b632913c 100644
--- a/apps/openmw_test_suite/lua/test_scriptscontainer.cpp
+++ b/apps/openmw_test_suite/lua/test_scriptscontainer.cpp
@@ -135,17 +135,19 @@ return {
         LuaScriptsContainerTest()
         {
             ESM::LuaScriptsCfg cfg;
-            cfg.mScripts.push_back({"invalid.lua", "", ESM::LuaScriptCfg::sCustom});
-            cfg.mScripts.push_back({"incorrect.lua", "", ESM::LuaScriptCfg::sCustom});
-            cfg.mScripts.push_back({"empty.lua", "", ESM::LuaScriptCfg::sCustom});
-            cfg.mScripts.push_back({"test1.lua", "", ESM::LuaScriptCfg::sCustom});
-            cfg.mScripts.push_back({"stopEvent.lua", "", ESM::LuaScriptCfg::sCustom});
-            cfg.mScripts.push_back({"test2.lua", "", ESM::LuaScriptCfg::sCustom});
-            cfg.mScripts.push_back({"loadSave1.lua", "", ESM::LuaScriptCfg::sNPC});
-            cfg.mScripts.push_back({"loadSave2.lua", "", ESM::LuaScriptCfg::sCustom | ESM::LuaScriptCfg::sNPC});
-            cfg.mScripts.push_back({"testInterface.lua", "", ESM::LuaScriptCfg::sCustom | ESM::LuaScriptCfg::sPlayer});
-            cfg.mScripts.push_back({"overrideInterface.lua", "", ESM::LuaScriptCfg::sCustom | ESM::LuaScriptCfg::sPlayer});
-            cfg.mScripts.push_back({"useInterface.lua", "", ESM::LuaScriptCfg::sCustom | ESM::LuaScriptCfg::sPlayer});
+            LuaUtil::parseOMWScripts(cfg, R"X(
+CUSTOM: invalid.lua
+CUSTOM: incorrect.lua
+CUSTOM: empty.lua
+CUSTOM: test1.lua
+CUSTOM: stopEvent.lua
+CUSTOM: test2.lua
+NPC: loadSave1.lua
+CUSTOM, NPC: loadSave2.lua
+CUSTOM, PLAYER: testInterface.lua
+CUSTOM, PLAYER: overrideInterface.lua
+CUSTOM, PLAYER: useInterface.lua
+)X");
             mCfg.init(std::move(cfg));
         }
     };
@@ -278,7 +280,8 @@ return {
 
     TEST_F(LuaScriptsContainerTest, AutoStart)
     {
-        LuaUtil::ScriptsContainer scripts(&mLua, "Test", ESM::LuaScriptCfg::sPlayer);
+        LuaUtil::ScriptsContainer scripts(&mLua, "Test");
+        scripts.setAutoStartConf(mCfg.getPlayerConf());
         testing::internal::CaptureStdout();
         scripts.addAutoStartedScripts();
         scripts.update(1.5f);
@@ -291,7 +294,8 @@ return {
 
     TEST_F(LuaScriptsContainerTest, Interface)
     {
-        LuaUtil::ScriptsContainer scripts(&mLua, "Test", ESM::LuaScriptCfg::sCreature);
+        LuaUtil::ScriptsContainer scripts(&mLua, "Test");
+        scripts.setAutoStartConf(mCfg.getLocalConf(ESM::REC_CREA, "", ESM::RefNum()));
         int addIfaceId = *mCfg.findId("testInterface.lua");
         int overrideIfaceId = *mCfg.findId("overrideInterface.lua");
         int useIfaceId = *mCfg.findId("useInterface.lua");
@@ -318,9 +322,12 @@ return {
 
     TEST_F(LuaScriptsContainerTest, LoadSave)
     {
-        LuaUtil::ScriptsContainer scripts1(&mLua, "Test", ESM::LuaScriptCfg::sNPC);
-        LuaUtil::ScriptsContainer scripts2(&mLua, "Test", ESM::LuaScriptCfg::sNPC);
-        LuaUtil::ScriptsContainer scripts3(&mLua, "Test", ESM::LuaScriptCfg::sPlayer);
+        LuaUtil::ScriptsContainer scripts1(&mLua, "Test");
+        LuaUtil::ScriptsContainer scripts2(&mLua, "Test");
+        LuaUtil::ScriptsContainer scripts3(&mLua, "Test");
+        scripts1.setAutoStartConf(mCfg.getLocalConf(ESM::REC_NPC_, "", ESM::RefNum()));
+        scripts2.setAutoStartConf(mCfg.getLocalConf(ESM::REC_NPC_, "", ESM::RefNum()));
+        scripts3.setAutoStartConf(mCfg.getPlayerConf());
 
         scripts1.addAutoStartedScripts();
         EXPECT_TRUE(scripts1.addCustomScript(*mCfg.findId("test1.lua")));
diff --git a/components/esm/defs.hpp b/components/esm/defs.hpp
index 04019c65e7..f3e7e9506c 100644
--- a/components/esm/defs.hpp
+++ b/components/esm/defs.hpp
@@ -174,7 +174,7 @@ enum RecNameInts : unsigned int
     // format 1
     REC_FILT = fourCC("FILT"),
     REC_DBGP = fourCC("DBGP"), ///< only used in project files
-    REC_LUAL = fourCC("LUAL"),  // LuaScriptsCfg
+    REC_LUAL = fourCC("LUAL"),  // LuaScriptsCfg (only in omwgame or omwaddon)
 
     // format 16 - Lua scripts in saved games
     REC_LUAM = fourCC("LUAM"),  // LuaManager data
diff --git a/components/esm/luascripts.cpp b/components/esm/luascripts.cpp
index 17c5e2843a..d541482ad6 100644
--- a/components/esm/luascripts.cpp
+++ b/components/esm/luascripts.cpp
@@ -3,6 +3,8 @@
 #include "components/esm3/esmreader.hpp"
 #include "components/esm3/esmwriter.hpp"
 
+#include <components/lua/serialization.hpp>
+
 // List of all records, that are related to Lua.
 //
 // Records:
@@ -10,13 +12,15 @@
 // LUAM - MWLua::LuaManager (in saves)
 //
 // Subrecords:
-// LUAF - LuaScriptCfg::mFlags
+// LUAF - LuaScriptCfg::mFlags and ESM::RecNameInts list
 // LUAW - Start of MWLua::WorldView data
 // LUAE - Start of MWLua::LocalEvent or MWLua::GlobalEvent (eventName)
 // LUAS - VFS path to a Lua script
 // LUAD - Serialized Lua variable
 // LUAT - MWLua::ScriptsContainer::Timer
 // LUAC - Name of a timer callback (string)
+// LUAR - Attach script to a specific record (LuaScriptCfg::PerRecordCfg)
+// LUAI - Attach script to a specific instance (LuaScriptCfg::PerRefCfg)
 
 void ESM::saveLuaBinaryData(ESMWriter& esm, const std::string& data)
 {
@@ -39,25 +43,120 @@ std::string ESM::loadLuaBinaryData(ESMReader& esm)
     return data;
 }
 
+static bool readBool(ESM::ESMReader& esm)
+{
+    char c;
+    esm.getT<char>(c);
+    return c != 0;
+}
+
 void ESM::LuaScriptsCfg::load(ESMReader& esm)
 {
     while (esm.isNextSub("LUAS"))
     {
-        std::string name = esm.getHString();
-        uint64_t flags;
-        esm.getHNT(flags, "LUAF");
-        std::string data = loadLuaBinaryData(esm);
-        mScripts.push_back({std::move(name), std::move(data), flags});
+        mScripts.emplace_back();
+        ESM::LuaScriptCfg& script = mScripts.back();
+        script.mScriptPath = esm.getHString();
+
+        esm.getSubNameIs("LUAF");
+        esm.getSubHeader();
+        if (esm.getSubSize() < 4 || (esm.getSubSize() % 4 != 0))
+            esm.fail("Incorrect LUAF size");
+        esm.getT(script.mFlags);
+        script.mTypes.resize((esm.getSubSize() - 4) / 4);
+        for (uint32_t& type : script.mTypes)
+            esm.getT(type);
+
+        script.mInitializationData = loadLuaBinaryData(esm);
+
+        while (esm.isNextSub("LUAR"))
+        {
+            esm.getSubHeader();
+            script.mRecords.emplace_back();
+            ESM::LuaScriptCfg::PerRecordCfg& recordCfg = script.mRecords.back();
+            recordCfg.mRecordId.resize(esm.getSubSize() - 1);
+            recordCfg.mAttach = readBool(esm);
+            esm.getExact(recordCfg.mRecordId.data(), static_cast<int>(recordCfg.mRecordId.size()));
+            recordCfg.mInitializationData = loadLuaBinaryData(esm);
+        }
+        while (esm.isNextSub("LUAI"))
+        {
+            esm.getSubHeader();
+            script.mRefs.emplace_back();
+            ESM::LuaScriptCfg::PerRefCfg& refCfg = script.mRefs.back();
+            refCfg.mAttach = readBool(esm);
+            esm.getT<uint32_t>(refCfg.mRefnumIndex);
+            esm.getT<int32_t>(refCfg.mRefnumContentFile);
+            refCfg.mInitializationData = loadLuaBinaryData(esm);
+        }
     }
 }
 
+void ESM::LuaScriptsCfg::adjustRefNums(const ESMReader& esm)
+{
+    auto adjustRefNumFn = [&esm](int contentFile) -> int
+    {
+        if (contentFile == 0)
+            return esm.getIndex();
+        else if (contentFile > 0 && contentFile <= static_cast<int>(esm.getParentFileIndices().size()))
+            return esm.getParentFileIndices()[contentFile - 1];
+        else
+            throw std::runtime_error("Incorrect contentFile index");
+    };
+
+    lua_State* L = lua_open();
+    LuaUtil::BasicSerializer serializer(adjustRefNumFn);
+
+    auto adjustLuaData = [&](std::string& data)
+    {
+        if (data.empty())
+            return;
+        sol::object luaData = LuaUtil::deserialize(L, data, &serializer);
+        data = LuaUtil::serialize(luaData, &serializer);
+    };
+
+    for (LuaScriptCfg& script : mScripts)
+    {
+        adjustLuaData(script.mInitializationData);
+        for (LuaScriptCfg::PerRecordCfg& recordCfg : script.mRecords)
+            adjustLuaData(recordCfg.mInitializationData);
+        for (LuaScriptCfg::PerRefCfg& refCfg : script.mRefs)
+        {
+            adjustLuaData(refCfg.mInitializationData);
+            refCfg.mRefnumContentFile = adjustRefNumFn(refCfg.mRefnumContentFile);
+        }
+    }
+    lua_close(L);
+}
+
 void ESM::LuaScriptsCfg::save(ESMWriter& esm) const
 {
     for (const LuaScriptCfg& script : mScripts)
     {
         esm.writeHNString("LUAS", script.mScriptPath);
-        esm.writeHNT("LUAF", script.mFlags);
+        esm.startSubRecord("LUAF");
+        esm.writeT<uint32_t>(script.mFlags);
+        for (uint32_t type : script.mTypes)
+            esm.writeT<uint32_t>(type);
+        esm.endRecord("LUAF");
         saveLuaBinaryData(esm, script.mInitializationData);
+        for (const LuaScriptCfg::PerRecordCfg& recordCfg : script.mRecords)
+        {
+            esm.startSubRecord("LUAR");
+            esm.writeT<char>(recordCfg.mAttach ? 1 : 0);
+            esm.write(recordCfg.mRecordId.data(), recordCfg.mRecordId.size());
+            esm.endRecord("LUAR");
+            saveLuaBinaryData(esm, recordCfg.mInitializationData);
+        }
+        for (const LuaScriptCfg::PerRefCfg& refCfg : script.mRefs)
+        {
+            esm.startSubRecord("LUAI");
+            esm.writeT<char>(refCfg.mAttach ? 1 : 0);
+            esm.writeT<uint32_t>(refCfg.mRefnumIndex);
+            esm.writeT<int32_t>(refCfg.mRefnumContentFile);
+            esm.endRecord("LUAI");
+            saveLuaBinaryData(esm, refCfg.mInitializationData);
+        }
     }
 }
 
diff --git a/components/esm/luascripts.hpp b/components/esm/luascripts.hpp
index 985d756fce..c3bb94ac70 100644
--- a/components/esm/luascripts.hpp
+++ b/components/esm/luascripts.hpp
@@ -13,28 +13,41 @@ namespace ESM
 
     struct LuaScriptCfg
     {
-        using Flags = uint64_t;
-        static constexpr Flags sGlobal = 1ull << 0;
+        using Flags = uint32_t;
+        static constexpr Flags sGlobal = 1ull << 0;  // start as a global script
         static constexpr Flags sCustom = 1ull << 1;  // local; can be attached/detached by a global script
         static constexpr Flags sPlayer = 1ull << 2;  // auto attach to players
-        // auto attach for other classes:
-        static constexpr Flags sActivator = 1ull << 3;
-        static constexpr Flags sArmor = 1ull << 4;
-        static constexpr Flags sBook = 1ull << 5;
-        static constexpr Flags sClothing = 1ull << 6;
-        static constexpr Flags sContainer = 1ull << 7;
-        static constexpr Flags sCreature = 1ull << 8;
-        static constexpr Flags sDoor = 1ull << 9;
-        static constexpr Flags sIngredient = 1ull << 10;
-        static constexpr Flags sLight = 1ull << 11;
-        static constexpr Flags sMiscItem = 1ull << 12;
-        static constexpr Flags sNPC = 1ull << 13;
-        static constexpr Flags sPotion = 1ull << 14;
-        static constexpr Flags sWeapon = 1ull << 15;
 
-        std::string mScriptPath;
+        static constexpr Flags sMerge = 1ull << 3;  // merge with configuration for this script from previous content files.
+
+        std::string mScriptPath;  // VFS path to the script.
         std::string mInitializationData;  // Serialized Lua table. It is a binary data. Can contain '\0'.
         Flags mFlags;  // bitwise OR of Flags.
+
+        // Auto attach as a local script to objects of specific types (i.e. Container, Door, Activator, etc.)
+        std::vector<uint32_t> mTypes;  // values are ESM::RecNameInts
+
+        // Auto attach as a local script to objects with specific recordIds (i.e. specific door type, or an unique NPC)
+        struct PerRecordCfg
+        {
+            bool mAttach;  // true - attach, false - don't attach (overrides previous attach)
+            std::string mRecordId;
+            // Initialization data for this specific record. If empty than LuaScriptCfg::mInitializationData is used.
+            std::string mInitializationData;
+        };
+        std::vector<PerRecordCfg> mRecords;
+
+        // Auto attach as a local script to specific objects by their Refnums. The reference must be defined in the same
+        // content file as this LuaScriptCfg or in one of its deps.
+        struct PerRefCfg
+        {
+            bool mAttach;  // true - attach, false - don't attach (overrides previous attach)
+            uint32_t mRefnumIndex;
+            int32_t mRefnumContentFile;
+            // Initialization data for this specific refnum. If empty than LuaScriptCfg::mInitializationData is used.
+            std::string mInitializationData;
+        };
+        std::vector<PerRefCfg> mRefs;
     };
 
     struct LuaScriptsCfg
@@ -42,6 +55,8 @@ namespace ESM
         std::vector<LuaScriptCfg> mScripts;
 
         void load(ESMReader &esm);
+        void adjustRefNums(const ESMReader &esm);
+
         void save(ESMWriter &esm) const;
     };
 
diff --git a/components/esm3/loadtes3.hpp b/components/esm3/loadtes3.hpp
index 8f5ed68413..ea41ce9fb6 100644
--- a/components/esm3/loadtes3.hpp
+++ b/components/esm3/loadtes3.hpp
@@ -42,7 +42,7 @@ namespace ESM
     /// \brief File header record
     struct Header
     {
-        static const int CurrentFormat = 0; // most recent known format
+        static constexpr int CurrentFormat = 1; // most recent known format
 
         // Defines another files (esm or esp) that this file depends upon.
         struct MasterData
diff --git a/components/lua/configuration.cpp b/components/lua/configuration.cpp
index 172d958029..b4889c44d1 100644
--- a/components/lua/configuration.cpp
+++ b/components/lua/configuration.cpp
@@ -16,19 +16,26 @@ namespace LuaUtil
             {"GLOBAL", ESM::LuaScriptCfg::sGlobal},
             {"CUSTOM", ESM::LuaScriptCfg::sCustom},
             {"PLAYER", ESM::LuaScriptCfg::sPlayer},
-            {"ACTIVATOR", ESM::LuaScriptCfg::sActivator},
-            {"ARMOR", ESM::LuaScriptCfg::sArmor},
-            {"BOOK", ESM::LuaScriptCfg::sBook},
-            {"CLOTHING", ESM::LuaScriptCfg::sClothing},
-            {"CONTAINER", ESM::LuaScriptCfg::sContainer},
-            {"CREATURE", ESM::LuaScriptCfg::sCreature},
-            {"DOOR", ESM::LuaScriptCfg::sDoor},
-            {"INGREDIENT", ESM::LuaScriptCfg::sIngredient},
-            {"LIGHT", ESM::LuaScriptCfg::sLight},
-            {"MISC_ITEM", ESM::LuaScriptCfg::sMiscItem},
-            {"NPC", ESM::LuaScriptCfg::sNPC},
-            {"POTION", ESM::LuaScriptCfg::sPotion},
-            {"WEAPON", ESM::LuaScriptCfg::sWeapon},
+        };
+
+        const std::map<std::string, ESM::RecNameInts, std::less<>> typeTagsByName{
+            {"ACTIVATOR", ESM::REC_ACTI},
+            {"ARMOR", ESM::REC_ARMO},
+            {"BOOK", ESM::REC_BOOK},
+            {"CLOTHING", ESM::REC_CLOT},
+            {"CONTAINER", ESM::REC_CONT},
+            {"CREATURE", ESM::REC_CREA},
+            {"DOOR", ESM::REC_DOOR},
+            {"INGREDIENT", ESM::REC_INGR},
+            {"LIGHT", ESM::REC_LIGH},
+            {"MISC_ITEM", ESM::REC_MISC},
+            {"NPC", ESM::REC_NPC_},
+            {"POTION", ESM::REC_ALCH},
+            {"WEAPON", ESM::REC_WEAP},
+            {"APPARATUS", ESM::REC_APPA},
+            {"LOCKPICK", ESM::REC_LOCK},
+            {"PROBE", ESM::REC_PROB},
+            {"REPAIR", ESM::REC_REPA},
         };
 
         bool isSpace(char c)
@@ -37,43 +44,69 @@ namespace LuaUtil
         }
     }
 
-    const std::vector<int> ScriptsConfiguration::sEmpty;
-
     void ScriptsConfiguration::init(ESM::LuaScriptsCfg cfg)
     {
         mScripts.clear();
-        mScriptsByFlag.clear();
         mPathToIndex.clear();
 
-        // Find duplicates; only the last occurrence will be used.
+        // Find duplicates; only the last occurrence will be used (unless `sMerge` flag is used).
         // Search for duplicates is case insensitive.
         std::vector<bool> skip(cfg.mScripts.size(), false);
-        for (int i = cfg.mScripts.size() - 1; i >= 0; --i)
+        for (size_t i = 0; i < cfg.mScripts.size(); ++i)
         {
-            auto [_, inserted] = mPathToIndex.insert_or_assign(
-                Misc::StringUtils::lowerCase(cfg.mScripts[i].mScriptPath), -1);
-            if (!inserted || cfg.mScripts[i].mFlags == 0)
+            const ESM::LuaScriptCfg& script = cfg.mScripts[i];
+            bool global = script.mFlags & ESM::LuaScriptCfg::sGlobal;
+            if (global && (script.mFlags & ~ESM::LuaScriptCfg::sMerge) != ESM::LuaScriptCfg::sGlobal)
+                throw std::runtime_error(std::string("Global script can not have local flags: ") + script.mScriptPath);
+            if (global && (!script.mTypes.empty() || !script.mRecords.empty() || !script.mRefs.empty()))
+                throw std::runtime_error(std::string(
+                    "Global script can not have per-type and per-object configuration") + script.mScriptPath);
+            auto [it, inserted] = mPathToIndex.emplace(
+                Misc::StringUtils::lowerCase(script.mScriptPath), i);
+            if (inserted)
+                continue;
+            ESM::LuaScriptCfg& oldScript = cfg.mScripts[it->second];
+            if (global != bool(oldScript.mFlags & ESM::LuaScriptCfg::sGlobal))
+                throw std::runtime_error(std::string("Flags mismatch for ") + script.mScriptPath);
+            if (script.mFlags & ESM::LuaScriptCfg::sMerge)
+            {
+                oldScript.mFlags |= (script.mFlags & ~ESM::LuaScriptCfg::sMerge);
+                if (!script.mInitializationData.empty())
+                    oldScript.mInitializationData = script.mInitializationData;
+                oldScript.mTypes.insert(oldScript.mTypes.end(), script.mTypes.begin(), script.mTypes.end());
+                oldScript.mRecords.insert(oldScript.mRecords.end(), script.mRecords.begin(), script.mRecords.end());
+                oldScript.mRefs.insert(oldScript.mRefs.end(), script.mRefs.begin(), script.mRefs.end());
                 skip[i] = true;
+            }
+            else
+                skip[it->second] = true;
         }
-        mPathToIndex.clear();
-        int index = 0;
+
+        // Filter duplicates
         for (size_t i = 0; i < cfg.mScripts.size(); ++i)
         {
-            if (skip[i])
-                continue;
-            ESM::LuaScriptCfg& s = cfg.mScripts[i];
-            mPathToIndex[s.mScriptPath] = index;  // Stored paths are case sensitive.
-            ESM::LuaScriptCfg::Flags flags = s.mFlags;
-            ESM::LuaScriptCfg::Flags flag = 1;
-            while (flags != 0)
+            if (!skip[i])
+                mScripts.push_back(std::move(cfg.mScripts[i]));
+        }
+
+        // Initialize mappings
+        mPathToIndex.clear();
+        for (int i = 0; i < static_cast<int>(mScripts.size()); ++i)
+        {
+            const ESM::LuaScriptCfg& s = mScripts[i];
+            mPathToIndex[s.mScriptPath] = i;  // Stored paths are case sensitive.
+            for (uint32_t t : s.mTypes)
+                mScriptsPerType[t].push_back(i);
+            for (const ESM::LuaScriptCfg::PerRecordCfg& r : s.mRecords)
             {
-                if (flags & flag)
-                    mScriptsByFlag[flag].push_back(index);
-                flags &= ~flag;
-                flag = flag << 1;
+                std::string_view data = r.mInitializationData.empty() ? s.mInitializationData : r.mInitializationData;
+                mScriptsPerRecordId[r.mRecordId].push_back(DetailedConf{i, r.mAttach, data});
+            }
+            for (const ESM::LuaScriptCfg::PerRefCfg& r : s.mRefs)
+            {
+                std::string_view data = r.mInitializationData.empty() ? s.mInitializationData : r.mInitializationData;
+                mScriptsPerRefNum[ESM::RefNum{r.mRefnumIndex, r.mRefnumContentFile}].push_back(DetailedConf{i, r.mAttach, data});
             }
-            mScripts.push_back(std::move(s));
-            index++;
         }
     }
 
@@ -86,14 +119,50 @@ namespace LuaUtil
             return std::nullopt;
     }
 
-    const std::vector<int>& ScriptsConfiguration::getListByFlag(ESM::LuaScriptCfg::Flags type) const
+    ScriptIdsWithInitializationData ScriptsConfiguration::getConfByFlag(ESM::LuaScriptCfg::Flags flag) const
     {
-        assert(std::bitset<64>(type).count() <= 1);
-        auto it = mScriptsByFlag.find(type);
-        if (it != mScriptsByFlag.end())
-            return it->second;
-        else
-            return sEmpty;
+        ScriptIdsWithInitializationData res;
+        for (size_t id = 0; id < mScripts.size(); ++id)
+        {
+            const ESM::LuaScriptCfg& script = mScripts[id];
+            if (script.mFlags & flag)
+                res[id] = script.mInitializationData;
+        }
+        return res;
+    }
+
+    ScriptIdsWithInitializationData ScriptsConfiguration::getLocalConf(
+        uint32_t type, std::string_view recordId, ESM::RefNum refnum) const
+    {
+        ScriptIdsWithInitializationData res;
+        auto typeIt = mScriptsPerType.find(type);
+        if (typeIt != mScriptsPerType.end())
+            for (int scriptId : typeIt->second)
+                res[scriptId] = mScripts[scriptId].mInitializationData;
+        auto recordIt = mScriptsPerRecordId.find(recordId);
+        if (recordIt != mScriptsPerRecordId.end())
+        {
+            for (const DetailedConf& d : recordIt->second)
+            {
+                if (d.mAttach)
+                    res[d.mScriptId] = d.mInitializationData;
+                else
+                    res.erase(d.mScriptId);
+            }
+        }
+        if (!refnum.hasContentFile())
+            return res;
+        auto refIt = mScriptsPerRefNum.find(refnum);
+        if (refIt == mScriptsPerRefNum.end())
+            return res;
+        for (const DetailedConf& d : refIt->second)
+        {
+            if (d.mAttach)
+                res[d.mScriptId] = d.mInitializationData;
+            else
+                res.erase(d.mScriptId);
+        }
+        return res;
     }
 
     void parseOMWScripts(ESM::LuaScriptsCfg& cfg, std::string_view data)
@@ -117,53 +186,69 @@ namespace LuaUtil
                 throw std::runtime_error(Misc::StringUtils::format(
                     "Lua script should have suffix '.lua', got: %s", std::string(line.substr(0, 300))));
 
-            // Split flags and script path
+            // Split tags and script path
             size_t semicolonPos = line.find(':');
             if (semicolonPos == std::string::npos)
                 throw std::runtime_error(Misc::StringUtils::format("No flags found in: %s", std::string(line)));
-            std::string_view flagsStr = line.substr(0, semicolonPos);
+            std::string_view tagsStr = line.substr(0, semicolonPos);
             std::string_view scriptPath = line.substr(semicolonPos + 1);
             while (isSpace(scriptPath[0]))
                 scriptPath = scriptPath.substr(1);
 
-            // Parse flags
-            ESM::LuaScriptCfg::Flags flags = 0;
-            size_t flagsPos = 0;
+            ESM::LuaScriptCfg& script = cfg.mScripts.emplace_back();
+            script.mScriptPath = std::string(scriptPath);
+            script.mFlags = 0;
+
+            // Parse tags
+            size_t tagsPos = 0;
             while (true)
             {
-                while (flagsPos < flagsStr.size() && (isSpace(flagsStr[flagsPos]) || flagsStr[flagsPos] == ','))
-                    flagsPos++;
-                size_t startPos = flagsPos;
-                while (flagsPos < flagsStr.size() && !isSpace(flagsStr[flagsPos]) && flagsStr[flagsPos] != ',')
-                    flagsPos++;
-                if (startPos == flagsPos)
+                while (tagsPos < tagsStr.size() && (isSpace(tagsStr[tagsPos]) || tagsStr[tagsPos] == ','))
+                    tagsPos++;
+                size_t startPos = tagsPos;
+                while (tagsPos < tagsStr.size() && !isSpace(tagsStr[tagsPos]) && tagsStr[tagsPos] != ',')
+                    tagsPos++;
+                if (startPos == tagsPos)
                     break;
-                std::string_view flagName = flagsStr.substr(startPos, flagsPos - startPos);
-                auto it = flagsByName.find(flagName);
+                std::string_view tagName = tagsStr.substr(startPos, tagsPos - startPos);
+                auto it = flagsByName.find(tagName);
+                auto typesIt = typeTagsByName.find(tagName);
                 if (it != flagsByName.end())
-                    flags |= it->second;
+                    script.mFlags |= it->second;
+                else if (typesIt != typeTagsByName.end())
+                    script.mTypes.push_back(typesIt->second);
                 else
-                    throw std::runtime_error(Misc::StringUtils::format("Unknown flag '%s' in: %s",
-                                                                       std::string(flagName), std::string(line)));
+                    throw std::runtime_error(Misc::StringUtils::format("Unknown tag '%s' in: %s",
+                                                                       std::string(tagName), std::string(line)));
             }
-            if ((flags & ESM::LuaScriptCfg::sGlobal) && flags != ESM::LuaScriptCfg::sGlobal)
-                throw std::runtime_error("Global script can not have local flags");
-
-            cfg.mScripts.push_back(ESM::LuaScriptCfg{std::string(scriptPath), "", flags});
         }
     }
 
     std::string scriptCfgToString(const ESM::LuaScriptCfg& script)
     {
         std::stringstream ss;
+        if (script.mFlags & ESM::LuaScriptCfg::sMerge)
+            ss << "+ ";
         for (const auto& [flagName, flag] : flagsByName)
         {
             if (script.mFlags & flag)
                 ss << flagName << " ";
         }
+        for (uint32_t type : script.mTypes)
+        {
+            for (const auto& [tagName, t] : typeTagsByName)
+            {
+                if (type == t)
+                    ss << tagName << " ";
+            }
+        }
         ss << ": " << script.mScriptPath;
         if (!script.mInitializationData.empty())
-            ss << " (with data, " << script.mInitializationData.size() << " bytes)";
+            ss << " ; data " << script.mInitializationData.size() << " bytes";
+        if (!script.mRecords.empty())
+            ss << " ; " << script.mRecords.size() << " records";
+        if (!script.mRefs.empty())
+            ss << " ; " << script.mRefs.size() << " objects";
         return ss.str();
     }
 
diff --git a/components/lua/configuration.hpp b/components/lua/configuration.hpp
index 5baa4f24cf..87159068be 100644
--- a/components/lua/configuration.hpp
+++ b/components/lua/configuration.hpp
@@ -5,9 +5,11 @@
 #include <optional>
 
 #include "components/esm/luascripts.hpp"
+#include "components/esm3/cellref.hpp"
 
 namespace LuaUtil
 {
+    using ScriptIdsWithInitializationData = std::map<int, std::string_view>;
 
     class ScriptsConfiguration
     {
@@ -18,13 +20,27 @@ namespace LuaUtil
         const ESM::LuaScriptCfg& operator[](int id) const { return mScripts[id]; }
 
         std::optional<int> findId(std::string_view path) const;
-        const std::vector<int>& getListByFlag(ESM::LuaScriptCfg::Flags type) const;
+        bool isCustomScript(int id) const { return mScripts[id].mFlags & ESM::LuaScriptCfg::sCustom; }
+
+        ScriptIdsWithInitializationData getGlobalConf() const { return getConfByFlag(ESM::LuaScriptCfg::sGlobal); }
+        ScriptIdsWithInitializationData getPlayerConf() const { return getConfByFlag(ESM::LuaScriptCfg::sPlayer); }
+        ScriptIdsWithInitializationData getLocalConf(uint32_t type, std::string_view recordId, ESM::RefNum refnum) const;
 
     private:
+        ScriptIdsWithInitializationData getConfByFlag(ESM::LuaScriptCfg::Flags flag) const;
+
         std::vector<ESM::LuaScriptCfg> mScripts;
         std::map<std::string, int, std::less<>> mPathToIndex;
-        std::map<ESM::LuaScriptCfg::Flags, std::vector<int>> mScriptsByFlag;
-        static const std::vector<int> sEmpty;
+
+        struct DetailedConf
+        {
+            int mScriptId;
+            bool mAttach;
+            std::string_view mInitializationData;
+        };
+        std::map<uint32_t, std::vector<int>> mScriptsPerType;
+        std::map<std::string, std::vector<DetailedConf>, std::less<>> mScriptsPerRecordId;
+        std::map<ESM::RefNum, std::vector<DetailedConf>> mScriptsPerRefNum;
     };
 
     // Parse ESM::LuaScriptsCfg from text and add to `cfg`.
diff --git a/components/lua/scriptscontainer.cpp b/components/lua/scriptscontainer.cpp
index 11ca28de08..9e20a215fa 100644
--- a/components/lua/scriptscontainer.cpp
+++ b/components/lua/scriptscontainer.cpp
@@ -15,8 +15,8 @@ namespace LuaUtil
     static constexpr std::string_view HANDLER_LOAD = "onLoad";
     static constexpr std::string_view HANDLER_INTERFACE_OVERRIDE = "onInterfaceOverride";
 
-    ScriptsContainer::ScriptsContainer(LuaUtil::LuaState* lua, std::string_view namePrefix, ESM::LuaScriptCfg::Flags autoStartMode)
-        : mNamePrefix(namePrefix), mLua(*lua), mAutoStartMode(autoStartMode)
+    ScriptsContainer::ScriptsContainer(LuaUtil::LuaState* lua, std::string_view namePrefix)
+        : mNamePrefix(namePrefix), mLua(*lua)
     {
         registerEngineHandlers({&mUpdateHandlers});
         mPublicInterfaces = sol::table(lua->sol(), sol::create);
@@ -35,22 +35,23 @@ namespace LuaUtil
 
     bool ScriptsContainer::addCustomScript(int scriptId)
     {
-        assert(mLua.getConfiguration()[scriptId].mFlags & ESM::LuaScriptCfg::sCustom);
+        const ScriptsConfiguration& conf = mLua.getConfiguration();
+        assert(conf.isCustomScript(scriptId));
         std::optional<sol::function> onInit, onLoad;
         bool ok = addScript(scriptId, onInit, onLoad);
         if (ok && onInit)
-            callOnInit(scriptId, *onInit);
+            callOnInit(scriptId, *onInit, conf[scriptId].mInitializationData);
         return ok;
     }
 
     void ScriptsContainer::addAutoStartedScripts()
     {
-        for (int scriptId : mLua.getConfiguration().getListByFlag(mAutoStartMode))
+        for (const auto& [scriptId, data] : mAutoStartScripts)
         {
             std::optional<sol::function> onInit, onLoad;
             bool ok = addScript(scriptId, onInit, onLoad);
             if (ok && onInit)
-                callOnInit(scriptId, *onInit);
+                callOnInit(scriptId, *onInit, data);
         }
     }
 
@@ -296,11 +297,10 @@ namespace LuaUtil
             mEngineHandlers[h->mName] = h;
     }
 
-    void ScriptsContainer::callOnInit(int scriptId, const sol::function& onInit)
+    void ScriptsContainer::callOnInit(int scriptId, const sol::function& onInit, std::string_view data)
     {
         try
         {
-            const std::string& data = mLua.getConfiguration()[scriptId].mInitializationData;
             LuaUtil::call(onInit, deserialize(mLua.sol(), data, mSerializer));
         }
         catch (std::exception& e) { printError(scriptId, "onInit failed", e); }
@@ -352,9 +352,14 @@ namespace LuaUtil
         removeAllScripts();
         const ScriptsConfiguration& cfg = mLua.getConfiguration();
 
-        std::map<int, const ESM::LuaScript*> scripts;
-        for (int scriptId : mLua.getConfiguration().getListByFlag(mAutoStartMode))
-            scripts[scriptId] = nullptr;
+        struct ScriptInfo
+        {
+            std::string_view mInitData;
+            const ESM::LuaScript* mSavedData;
+        };
+        std::map<int, ScriptInfo> scripts;
+        for (const auto& [scriptId, initData] : mAutoStartScripts)
+            scripts[scriptId] = {initData, nullptr};
         for (const ESM::LuaScript& s : data.mScripts)
         {
             std::optional<int> scriptId = cfg.findId(s.mScriptPath);
@@ -363,37 +368,38 @@ namespace LuaUtil
                 Log(Debug::Verbose) << "Ignoring " << mNamePrefix << "[" << s.mScriptPath << "]; script not registered";
                 continue;
             }
-            if (!(cfg[*scriptId].mFlags & (ESM::LuaScriptCfg::sCustom | mAutoStartMode)))
-            {
+            auto it = scripts.find(*scriptId);
+            if (it != scripts.end())
+                it->second.mSavedData = &s;
+            else if (cfg.isCustomScript(*scriptId))
+                scripts[*scriptId] = {cfg[*scriptId].mInitializationData, &s};
+            else
                 Log(Debug::Verbose) << "Ignoring " << mNamePrefix << "[" << s.mScriptPath << "]; this script is not allowed here";
-                continue;
-            }
-            scripts[*scriptId] = &s;
         }
 
-        for (const auto& [scriptId, savedScript] : scripts)
+        for (const auto& [scriptId, scriptInfo] : scripts)
         {
             std::optional<sol::function> onInit, onLoad;
             if (!addScript(scriptId, onInit, onLoad))
                 continue;
-            if (savedScript == nullptr)
+            if (scriptInfo.mSavedData == nullptr)
             {
                 if (onInit)
-                    callOnInit(scriptId, *onInit);
+                    callOnInit(scriptId, *onInit, scriptInfo.mInitData);
                 continue;
             }
             if (onLoad)
             {
                 try
                 {
-                    sol::object state = deserialize(mLua.sol(), savedScript->mData, mSerializer);
+                    sol::object state = deserialize(mLua.sol(), scriptInfo.mSavedData->mData, mSavedDataDeserializer);
                     sol::object initializationData =
-                        deserialize(mLua.sol(), mLua.getConfiguration()[scriptId].mInitializationData, mSerializer);
+                        deserialize(mLua.sol(), scriptInfo.mInitData, mSerializer);
                     LuaUtil::call(*onLoad, state, initializationData);
                 }
                 catch (std::exception& e) { printError(scriptId, "onLoad failed", e); }
             }
-            for (const ESM::LuaTimer& savedTimer : savedScript->mTimers)
+            for (const ESM::LuaTimer& savedTimer : scriptInfo.mSavedData->mTimers)
             {
                 Timer timer;
                 timer.mCallback = savedTimer.mCallbackName;
@@ -403,7 +409,7 @@ namespace LuaUtil
 
                 try
                 {
-                    timer.mArg = deserialize(mLua.sol(), savedTimer.mCallbackArgument, mSerializer);
+                    timer.mArg = deserialize(mLua.sol(), savedTimer.mCallbackArgument, mSavedDataDeserializer);
                     // It is important if the order of content files was changed. The deserialize-serialize procedure
                     // updates refnums, so timer.mSerializedArg may be not equal to savedTimer.mCallbackArgument.
                     timer.mSerializedArg = serialize(timer.mArg, mSerializer);
diff --git a/components/lua/scriptscontainer.hpp b/components/lua/scriptscontainer.hpp
index f64ec97722..1599966376 100644
--- a/components/lua/scriptscontainer.hpp
+++ b/components/lua/scriptscontainer.hpp
@@ -76,15 +76,16 @@ namespace LuaUtil
         using TimerType = ESM::LuaTimer::Type;
 
         // `namePrefix` is a common prefix for all scripts in the container. Used in logs for error messages and `print` output.
-        // `autoStartMode` specifies the list of scripts that should be autostarted in this container; the list itself is
-        //     stored in ScriptsConfiguration: lua->getConfiguration().getListByFlag(autoStartMode).
-        ScriptsContainer(LuaState* lua, std::string_view namePrefix, ESM::LuaScriptCfg::Flags autoStartMode = 0);
+        // `autoStartScripts` specifies the list of scripts that should be autostarted in this container;
+        //     the script names themselves are stored in ScriptsConfiguration.
+        ScriptsContainer(LuaState* lua, std::string_view namePrefix);
 
         ScriptsContainer(const ScriptsContainer&) = delete;
         ScriptsContainer(ScriptsContainer&&) = delete;
         virtual ~ScriptsContainer();
 
-        ESM::LuaScriptCfg::Flags getAutoStartMode() const { return mAutoStartMode; }
+        void setAutoStartConf(ScriptIdsWithInitializationData conf) { mAutoStartScripts = std::move(conf); }
+        const ScriptIdsWithInitializationData& getAutoStartConf() const { return mAutoStartScripts; }
 
         // Adds package that will be available (via `require`) for all scripts in the container.
         // Automatically applies LuaUtil::makeReadOnly to the package.
@@ -115,6 +116,9 @@ namespace LuaUtil
         // only built-in types and types from util package can be serialized.
         void setSerializer(const UserdataSerializer* serializer) { mSerializer = serializer; }
 
+        // Special deserializer to use when load data from saves. Can be used to remap content files in Refnums.
+        void setSavedDataDeserializer(const UserdataSerializer* serializer) { mSavedDataDeserializer = serializer; }
+
         // Starts scripts according to `autoStartMode` and calls `onInit` for them. Not needed if `load` is used.
         void addAutoStartedScripts();
 
@@ -216,7 +220,7 @@ namespace LuaUtil
 
         void printError(int scriptId, std::string_view msg, const std::exception& e);
         const std::string& scriptPath(int scriptId) const { return mLua.getConfiguration()[scriptId].mScriptPath; }
-        void callOnInit(int scriptId, const sol::function& onInit);
+        void callOnInit(int scriptId, const sol::function& onInit, std::string_view data);
         void callTimer(const Timer& t);
         void updateTimerQueue(std::vector<Timer>& timerQueue, double time);
         static void insertTimer(std::vector<Timer>& timerQueue, Timer&& t);
@@ -225,8 +229,9 @@ namespace LuaUtil
         void insertInterface(int scriptId, const Script& script);
         void removeInterface(int scriptId, const Script& script);
 
-        ESM::LuaScriptCfg::Flags mAutoStartMode;
+        ScriptIdsWithInitializationData mAutoStartScripts;
         const UserdataSerializer* mSerializer = nullptr;
+        const UserdataSerializer* mSavedDataDeserializer = nullptr;
         std::map<std::string, sol::object> mAPI;
 
         std::map<int, Script> mScripts;
diff --git a/components/lua/serialization.cpp b/components/lua/serialization.cpp
index d0bbbc9dc5..f1ee7c1aae 100644
--- a/components/lua/serialization.cpp
+++ b/components/lua/serialization.cpp
@@ -96,6 +96,42 @@ namespace LuaUtil
         appendData(out, data, dataSize);
     }
 
+    void UserdataSerializer::appendRefNum(BinaryData& out, ESM::RefNum refnum)
+    {
+        static_assert(sizeof(ESM::RefNum) == 8);
+        refnum.mIndex = Misc::toLittleEndian(refnum.mIndex);
+        refnum.mContentFile = Misc::toLittleEndian(refnum.mContentFile);
+        append(out, sRefNumTypeName, &refnum, sizeof(ESM::RefNum));
+    }
+
+    bool BasicSerializer::serialize(BinaryData& out, const sol::userdata& data) const
+    {
+        appendRefNum(out, data.as<ESM::RefNum>());
+        return true;
+    }
+
+    bool BasicSerializer::deserialize(std::string_view typeName, std::string_view binaryData, lua_State* lua) const
+    {
+        if (typeName != sRefNumTypeName)
+            return false;
+        ESM::RefNum refnum = loadRefNum(binaryData);
+        if (mAdjustContentFilesIndexFn)
+            refnum.mContentFile = mAdjustContentFilesIndexFn(refnum.mContentFile);
+        sol::stack::push<ESM::RefNum>(lua, refnum);
+        return true;
+    }
+
+    ESM::RefNum UserdataSerializer::loadRefNum(std::string_view data)
+    {
+        if (data.size() != sizeof(ESM::RefNum))
+            throw std::runtime_error("Incorrect serialization format. Size of RefNum doesn't match.");
+        ESM::RefNum refnum;
+        std::memcpy(&refnum, data.data(), sizeof(ESM::RefNum));
+        refnum.mIndex = Misc::fromLittleEndian(refnum.mIndex);
+        refnum.mContentFile = Misc::fromLittleEndian(refnum.mContentFile);
+        return refnum;
+    }
+
     static void serializeUserdata(BinaryData& out, const sol::userdata& data, const UserdataSerializer* customSerializer)
     {
         if (data.is<osg::Vec2f>())
diff --git a/components/lua/serialization.hpp b/components/lua/serialization.hpp
index d685bb2ad6..03de88cf8e 100644
--- a/components/lua/serialization.hpp
+++ b/components/lua/serialization.hpp
@@ -3,6 +3,8 @@
 
 #include <sol/sol.hpp>
 
+#include <components/esm3/cellref.hpp>
+
 namespace LuaUtil
 {
 
@@ -24,6 +26,26 @@ namespace LuaUtil
 
     protected:
         static void append(BinaryData&, std::string_view typeName, const void* data, size_t dataSize);
+
+        static constexpr std::string_view sRefNumTypeName = "o";
+        static void appendRefNum(BinaryData&, ESM::RefNum);
+        static ESM::RefNum loadRefNum(std::string_view data);
+    };
+
+    // Serializer that can load Lua data from content files and saved games, but doesn't depend on apps/openmw.
+    // Instead of LObject/GObject (that are defined in apps/openmw) it loads refnums directly as ESM::RefNum.
+    class BasicSerializer final : public UserdataSerializer
+    {
+    public:
+        BasicSerializer() = default;
+        explicit BasicSerializer(std::function<int(int)> adjustContentFileIndexFn) :
+            mAdjustContentFilesIndexFn(std::move(adjustContentFileIndexFn)) {}
+
+    private:
+        bool serialize(LuaUtil::BinaryData& out, const sol::userdata& data) const override;
+        bool deserialize(std::string_view typeName, std::string_view binaryData, lua_State* lua) const override;
+
+        std::function<int(int)> mAdjustContentFilesIndexFn;
     };
 
     BinaryData serialize(const sol::object&, const UserdataSerializer* customSerializer = nullptr);
diff --git a/docs/source/reference/lua-scripting/overview.rst b/docs/source/reference/lua-scripting/overview.rst
index 1bffb97e17..4cceb26088 100644
--- a/docs/source/reference/lua-scripting/overview.rst
+++ b/docs/source/reference/lua-scripting/overview.rst
@@ -165,7 +165,11 @@ Possible flags are:
 - ``MISC_ITEM`` - a local script that will be automatically attached to any miscellaneous item;
 - ``NPC`` - a local script that will be automatically attached to any NPC;
 - ``POTION`` - a local script that will be automatically attached to any potion;
-- ``WEAPON`` - a local script that will be automatically attached to any weapon.
+- ``WEAPON`` - a local script that will be automatically attached to any weapon;
+- ``APPARATUS`` - a local script that will be automatically attached to any apparatus;
+- ``LOCKPICK`` - a local script that will be automatically attached to any lockpick;
+- ``PROBE`` - a local script that will be automatically attached to any probe tool;
+- ``REPAIR`` - a local script that will be automatically attached to any repair tool.
 
 Several flags (except ``GLOBAL``) can be used with a single script. Use space or comma as a separator.
 

From 327b8ecdcbb9bf904ac5023f5868f651773dc009 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Sat, 4 Jun 2022 20:33:21 -0700
Subject: [PATCH 2570/2859] pass sorted lights to light postprocess light
 buffers

---
 components/sceneutil/lightmanager.cpp | 38 +++++++++++++--------------
 components/sceneutil/lightmanager.hpp |  8 +++---
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index db5fe6b479..9fcc86a32e 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -1140,32 +1140,30 @@ namespace SceneUtil
                 l.mLightSource = transform.mLightSource;
                 l.mViewBound = viewBound;
                 it->second.push_back(l);
-
-                if (mPPLightBuffer && it->first->getName() == Constants::SceneCamera)
-                {
-                    const auto* light = l.mLightSource->getLight(frameNum);
-                    if (light->getDiffuse().x() >= 0.f)
-                    {
-                        mPPLightBuffer->setLight(frameNum, light->getPosition(),
-                                                light->getDiffuse(),
-                                                light->getConstantAttenuation(),
-                                                light->getLinearAttenuation(),
-                                                light->getQuadraticAttenuation(),
-                                                l.mLightSource->getRadius());
-                    }
-                }
             }
-        }
 
-        if (getLightingMethod() == LightingMethod::SingleUBO)
-        {
-            if (it->second.size() > static_cast<size_t>(getMaxLightsInScene() - 1))
+            const bool fillPPLights = mPPLightBuffer && it->first->getName() == Constants::SceneCamera;
+
+            if (fillPPLights || getLightingMethod() == LightingMethod::SingleUBO)
             {
                 auto sorter = [] (const LightSourceViewBound& left, const LightSourceViewBound& right) {
                     return left.mViewBound.center().length2() - left.mViewBound.radius2() < right.mViewBound.center().length2() - right.mViewBound.radius2();
                 };
-                std::sort(it->second.begin() + 1, it->second.end(), sorter);
-                it->second.erase((it->second.begin() + 1) + (getMaxLightsInScene() - 2), it->second.end());
+
+                std::sort(it->second.begin(), it->second.end(), sorter);
+
+                if (fillPPLights)
+                {
+                    for (const auto& bound : it->second)
+                    {
+                        const auto* light = bound.mLightSource->getLight(frameNum);
+                        if (light->getDiffuse().x() >= 0.f)
+                            mPPLightBuffer->setLight(frameNum, light, bound.mLightSource->getRadius());
+                    }
+                }
+
+                if (it->second.size() > static_cast<size_t>(getMaxLightsInScene() - 1))
+                    it->second.resize(getMaxLightsInScene() - 1);
             }
         }
 
diff --git a/components/sceneutil/lightmanager.hpp b/components/sceneutil/lightmanager.hpp
index 0457dc323e..915f95c829 100644
--- a/components/sceneutil/lightmanager.hpp
+++ b/components/sceneutil/lightmanager.hpp
@@ -60,7 +60,7 @@ namespace SceneUtil
             mIndex[frame % 2] = 0;
         }
 
-        void setLight(size_t frame, const osg::Vec4f& position, osg::Vec4f diffuse, float ac, float al, float aq, float radius)
+        void setLight(size_t frame, const osg::Light* light, float radius)
         {
             size_t frameId = frame % 2;
             size_t i = mIndex[frameId];
@@ -70,9 +70,9 @@ namespace SceneUtil
 
             i *= 3;
 
-            mUniformBuffers[frameId]->setElement(i + 0, position);
-            mUniformBuffers[frameId]->setElement(i + 1, diffuse);
-            mUniformBuffers[frameId]->setElement(i + 2, osg::Vec4f(ac, al, aq, radius));
+            mUniformBuffers[frameId]->setElement(i + 0, light->getPosition());
+            mUniformBuffers[frameId]->setElement(i + 1, light->getDiffuse());
+            mUniformBuffers[frameId]->setElement(i + 2, osg::Vec4f(light->getConstantAttenuation(), light->getLinearAttenuation(), light->getQuadraticAttenuation(), radius));
 
             mIndex[frameId]++;
         }

From 8146b05c925cf61a344b7c7f22337dfe9165f506 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Sat, 4 Jun 2022 21:01:01 -0700
Subject: [PATCH 2571/2859] pass only lights with visible geometry

---
 components/sceneutil/lightmanager.cpp |  2 ++
 components/sceneutil/lightmanager.hpp | 12 +++++++++
 components/sceneutil/lightutil.cpp    | 35 +++++++++++++++++++++++++++
 3 files changed, 49 insertions(+)

diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 9fcc86a32e..5c81626d9b 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -1156,6 +1156,8 @@ namespace SceneUtil
                 {
                     for (const auto& bound : it->second)
                     {
+                        if (bound.mLightSource->getEmpty())
+                            continue;
                         const auto* light = bound.mLightSource->getLight(frameNum);
                         if (light->getDiffuse().x() >= 0.f)
                             mPPLightBuffer->setLight(frameNum, light, bound.mLightSource->getRadius());
diff --git a/components/sceneutil/lightmanager.hpp b/components/sceneutil/lightmanager.hpp
index 915f95c829..b4d4755056 100644
--- a/components/sceneutil/lightmanager.hpp
+++ b/components/sceneutil/lightmanager.hpp
@@ -118,6 +118,8 @@ namespace SceneUtil
 
         unsigned int mLastAppliedFrame;
 
+        bool mEmpty = false;
+
     public:
 
         META_Node(SceneUtil, LightSource)
@@ -147,6 +149,16 @@ namespace SceneUtil
             return mActorFade;
         }
 
+        void setEmpty(bool empty)
+        {
+            mEmpty = empty;
+        }
+
+        bool getEmpty() const
+        {
+            return mEmpty;
+        }
+
         /// Get the osg::Light safe for modification in the given frame.
         /// @par May be used externally to animate the light's color/attenuation properties,
         /// and is used internally to synchronize the light's position with the position of the LightSource.
diff --git a/components/sceneutil/lightutil.cpp b/components/sceneutil/lightutil.cpp
index 031899848d..adf36ff04f 100644
--- a/components/sceneutil/lightutil.cpp
+++ b/components/sceneutil/lightutil.cpp
@@ -3,6 +3,8 @@
 #include <osg/Light>
 #include <osg/Group>
 
+#include <osgParticle/ParticleSystem>
+
 #include <components/esm3/loadligh.hpp>
 #include <components/fallback/fallback.hpp>
 
@@ -11,6 +13,33 @@
 #include "util.hpp"
 #include "visitor.hpp"
 
+namespace
+{
+    class CheckEmptyLightVisitor : public osg::NodeVisitor
+    {
+    public:
+        CheckEmptyLightVisitor() : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN) {}
+
+        void apply(osg::Drawable& drawable) override
+        {
+            if (!mEmpty)
+                return;
+
+            if (dynamic_cast<const osgParticle::ParticleSystem*>(&drawable))
+                mEmpty = false;
+            else
+                traverse(drawable);
+        }
+
+        void apply(osg::Geometry& geometry) override
+        {
+            mEmpty = false;
+        }
+
+        bool mEmpty = true;
+    };
+}
+
 namespace SceneUtil
 {
 
@@ -64,6 +93,12 @@ namespace SceneUtil
         osg::Group* attachTo = visitor.mFoundNode ? visitor.mFoundNode : node;
         osg::ref_ptr<LightSource> lightSource = createLightSource(esmLight, lightMask, isExterior, osg::Vec4f(0,0,0,1));
         attachTo->addChild(lightSource);
+
+        CheckEmptyLightVisitor emptyVisitor;
+        node->accept(emptyVisitor);
+
+        lightSource->setEmpty(emptyVisitor.mEmpty);
+
         return lightSource;
     }
 

From 9c93de65be810e80d44a3d1144a77a22eb683309 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 3 Jun 2022 18:59:08 +0200
Subject: [PATCH 2572/2859] Show groundcover loading progress

---
 apps/openmw/mwworld/esmstore.cpp         |  7 +++++--
 apps/openmw/mwworld/groundcoverstore.cpp |  6 ++++--
 apps/openmw/mwworld/groundcoverstore.hpp |  5 ++++-
 apps/openmw/mwworld/worldimp.cpp         |  7 ++++---
 apps/openmw/mwworld/worldimp.hpp         |  4 +++-
 components/esmloader/load.cpp            | 21 ++++++++++++++++-----
 components/esmloader/load.hpp            |  9 ++++++++-
 7 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index bd93cc7c4e..30bf044ae4 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -10,6 +10,7 @@
 #include <components/lua/configuration.hpp>
 #include <components/misc/algorithm.hpp>
 #include <components/esm3/readerscache.hpp>
+#include <components/esmloader/load.hpp>
 
 #include "../mwmechanics/spelllist.hpp"
 
@@ -145,7 +146,8 @@ static bool isCacheableRecord(int id)
 
 void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener, ESM::Dialogue*& dialogue)
 {
-    listener->setProgressRange(1000);
+    if (listener != nullptr)
+        listener->setProgressRange(::EsmLoader::fileProgress);
 
     // Land texture loading needs to use a separate internal store for each plugin.
     // We set the number of plugins here so we can properly verify if valid plugin
@@ -211,7 +213,8 @@ void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener, ESM::Dialo
                 dialogue = nullptr;
             }
         }
-        listener->setProgress(static_cast<size_t>(esm.getFileOffset() / (float)esm.getFileSize() * 1000));
+        if (listener != nullptr)
+            listener->setProgress(::EsmLoader::fileProgress * esm.getFileOffset() / esm.getFileSize());
     }
 }
 
diff --git a/apps/openmw/mwworld/groundcoverstore.cpp b/apps/openmw/mwworld/groundcoverstore.cpp
index 1b27f8eed3..52e9b07a4d 100644
--- a/apps/openmw/mwworld/groundcoverstore.cpp
+++ b/apps/openmw/mwworld/groundcoverstore.cpp
@@ -6,14 +6,16 @@
 
 namespace MWWorld
 {
-    void GroundcoverStore::init(const Store<ESM::Static>& statics, const Files::Collections& fileCollections, const std::vector<std::string>& groundcoverFiles, ToUTF8::Utf8Encoder* encoder)
+    void GroundcoverStore::init(const Store<ESM::Static>& statics, const Files::Collections& fileCollections,
+        const std::vector<std::string>& groundcoverFiles, ToUTF8::Utf8Encoder* encoder, Loading::Listener* listener)
     {
         ::EsmLoader::Query query;
         query.mLoadStatics = true;
         query.mLoadCells = true;
 
         ESM::ReadersCache readers;
-        const ::EsmLoader::EsmData content = ::EsmLoader::loadEsmData(query, groundcoverFiles, fileCollections, readers, encoder);
+        const ::EsmLoader::EsmData content = ::EsmLoader::loadEsmData(query, groundcoverFiles, fileCollections,
+                                                                      readers, encoder, listener);
 
         for (const ESM::Static& stat : statics)
         {
diff --git a/apps/openmw/mwworld/groundcoverstore.hpp b/apps/openmw/mwworld/groundcoverstore.hpp
index 6c48a63c58..ffeb111134 100644
--- a/apps/openmw/mwworld/groundcoverstore.hpp
+++ b/apps/openmw/mwworld/groundcoverstore.hpp
@@ -20,7 +20,10 @@ namespace MWWorld
             std::map<std::pair<int, int>, std::vector<ESM::ESM_Context>> mCellContexts;
 
         public:
-            void init(const Store<ESM::Static>& statics, const Files::Collections& fileCollections, const std::vector<std::string>& groundcoverFiles, ToUTF8::Utf8Encoder* encoder);
+            void init(const Store<ESM::Static>& statics, const Files::Collections& fileCollections,
+                const std::vector<std::string>& groundcoverFiles, ToUTF8::Utf8Encoder* encoder,
+                Loading::Listener* listener);
+
             std::string getGroundcoverModel(const std::string& id) const;
             void initCell(ESM::Cell& cell, int cellX, int cellY) const;
     };
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 3c0d796e9b..2387002ec4 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -157,7 +157,7 @@ namespace MWWorld
         listener->loadingOn();
 
         loadContentFiles(fileCollections, contentFiles, encoder, listener);
-        loadGroundcoverFiles(fileCollections, groundcoverFiles, encoder);
+        loadGroundcoverFiles(fileCollections, groundcoverFiles, encoder, listener);
 
         listener->loadingOff();
 
@@ -2940,13 +2940,14 @@ namespace MWWorld
             ensureNeededRecords(); // Insert records that may not be present in all versions of master files.
     }
 
-    void World::loadGroundcoverFiles(const Files::Collections& fileCollections, const std::vector<std::string>& groundcoverFiles, ToUTF8::Utf8Encoder* encoder)
+    void World::loadGroundcoverFiles(const Files::Collections& fileCollections,
+        const std::vector<std::string>& groundcoverFiles, ToUTF8::Utf8Encoder* encoder, Loading::Listener* listener)
     {
         if (!Settings::Manager::getBool("enabled", "Groundcover")) return;
 
         Log(Debug::Info) << "Loading groundcover:";
 
-        mGroundcoverStore.init(mStore.get<ESM::Static>(), fileCollections, groundcoverFiles, encoder);
+        mGroundcoverStore.init(mStore.get<ESM::Static>(), fileCollections, groundcoverFiles, encoder, listener);
     }
 
     bool World::startSpellCast(const Ptr &actor)
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 50aff408d5..17f66cbd4e 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -171,7 +171,9 @@ namespace MWWorld
             void loadContentFiles(const Files::Collections& fileCollections, const std::vector<std::string>& content,
                 ToUTF8::Utf8Encoder* encoder, Loading::Listener* listener);
 
-            void loadGroundcoverFiles(const Files::Collections& fileCollections, const std::vector<std::string>& groundcoverFiles, ToUTF8::Utf8Encoder* encoder);
+            void loadGroundcoverFiles(const Files::Collections& fileCollections,
+                const std::vector<std::string>& groundcoverFiles, ToUTF8::Utf8Encoder* encoder,
+                Loading::Listener* listener);
 
             float feetToGameUnits(float feet);
             float getActivationDistancePlusTelekinesis();
diff --git a/components/esmloader/load.cpp b/components/esmloader/load.cpp
index 0db1d726a7..d3c170bc4c 100644
--- a/components/esmloader/load.cpp
+++ b/components/esmloader/load.cpp
@@ -19,6 +19,7 @@
 #include <components/misc/resourcehelpers.hpp>
 #include <components/misc/stringops.hpp>
 #include <components/esm3/readerscache.hpp>
+#include <components/loadinglistener/loadinglistener.hpp>
 
 #include <algorithm>
 #include <filesystem>
@@ -190,7 +191,7 @@ namespace EsmLoader
             reader.skipRecord();
         }
 
-        void loadEsm(const Query& query, ESM::ESMReader& reader, ShallowContent& content)
+        void loadEsm(const Query& query, ESM::ESMReader& reader, ShallowContent& content, Loading::Listener* listener)
         {
             Log(Debug::Info) << "Loading ESM file " << reader.getName();
 
@@ -204,12 +205,15 @@ namespace EsmLoader
                     continue;
                 }
                 loadRecord(query, recName, reader, content);
+
+                if (listener != nullptr)
+                    listener->setProgress(fileProgress * reader.getFileOffset() / reader.getFileSize());
             }
         }
 
         ShallowContent shallowLoad(const Query& query, const std::vector<std::string>& contentFiles,
             const Files::Collections& fileCollections, ESM::ReadersCache& readers,
-            ToUTF8::Utf8Encoder* encoder)
+            ToUTF8::Utf8Encoder* encoder, Loading::Listener* listener)
         {
             ShallowContent result;
 
@@ -232,6 +236,12 @@ namespace EsmLoader
                     continue;
                 }
 
+                if (listener != nullptr)
+                {
+                    listener->setLabel(file);
+                    listener->setProgressRange(fileProgress);
+                }
+
                 const Files::MultiDirCollection& collection = fileCollections.getCollection(extension);
 
                 const ESM::ReadersCache::BusyItem reader = readers.get(i);
@@ -241,7 +251,7 @@ namespace EsmLoader
                 if (query.mLoadCells)
                     reader->resolveParentFileIndices(readers);
 
-                loadEsm(query, *reader, result);
+                loadEsm(query, *reader, result, listener);
             }
 
             return result;
@@ -290,11 +300,12 @@ namespace EsmLoader
     }
 
     EsmData loadEsmData(const Query& query, const std::vector<std::string>& contentFiles,
-        const Files::Collections& fileCollections, ESM::ReadersCache& readers, ToUTF8::Utf8Encoder* encoder)
+        const Files::Collections& fileCollections, ESM::ReadersCache& readers, ToUTF8::Utf8Encoder* encoder,
+        Loading::Listener* listener)
     {
         Log(Debug::Info) << "Loading ESM data...";
 
-        ShallowContent content = shallowLoad(query, contentFiles, fileCollections, readers, encoder);
+        ShallowContent content = shallowLoad(query, contentFiles, fileCollections, readers, encoder, listener);
 
         std::ostringstream loaded;
 
diff --git a/components/esmloader/load.hpp b/components/esmloader/load.hpp
index 8bb8df35fe..d7a64a1c85 100644
--- a/components/esmloader/load.hpp
+++ b/components/esmloader/load.hpp
@@ -16,10 +16,17 @@ namespace Files
     class Collections;
 }
 
+namespace Loading
+{
+    class Listener;
+}
+
 namespace EsmLoader
 {
     struct EsmData;
 
+    inline constexpr std::size_t fileProgress = 1000;
+
     struct Query
     {
         bool mLoadActivators = false;
@@ -33,7 +40,7 @@ namespace EsmLoader
 
     EsmData loadEsmData(const Query& query, const std::vector<std::string>& contentFiles,
         const Files::Collections& fileCollections, ESM::ReadersCache& readers,
-        ToUTF8::Utf8Encoder* encoder);
+        ToUTF8::Utf8Encoder* encoder, Loading::Listener* listener = nullptr);
 }
 
 #endif

From acc209c294fe6a22c93c3b00fc982e7b824f4e4c Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Sun, 5 Jun 2022 15:46:25 -0700
Subject: [PATCH 2573/2859] fix threading issue when dispatching frame
 dependent data

---
 apps/openmw/mwrender/pingpongcanvas.cpp | 27 ++-----------------------
 apps/openmw/mwrender/pingpongcanvas.hpp |  3 ---
 apps/openmw/mwrender/postprocessor.cpp  | 17 +++++++++++-----
 apps/openmw/mwrender/postprocessor.hpp  |  2 ++
 components/fx/technique.hpp             | 14 +++++++++++++
 components/fx/widgets.hpp               |  5 ++++-
 6 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/apps/openmw/mwrender/pingpongcanvas.cpp b/apps/openmw/mwrender/pingpongcanvas.cpp
index 157e325ee5..507a41e1f0 100644
--- a/apps/openmw/mwrender/pingpongcanvas.cpp
+++ b/apps/openmw/mwrender/pingpongcanvas.cpp
@@ -9,8 +9,6 @@ namespace MWRender
 {
     PingPongCanvas::PingPongCanvas(Shader::ShaderManager& shaderManager)
         : mFallbackStateSet(new osg::StateSet)
-        , mQueuedDispatchArray(std::nullopt)
-        , mQueuedDispatchFrameId(0)
     {
         setUseDisplayList(false);
         setUseVertexBufferObjects(true);
@@ -37,9 +35,6 @@ namespace MWRender
 
     void PingPongCanvas::setCurrentFrameData(size_t frameId, fx::DispatchArray&& data)
     {
-        mQueuedDispatchArray = fx::DispatchArray(data);
-        mQueuedDispatchFrameId = !frameId;
-
         mBufferData[frameId].data = std::move(data);
     }
 
@@ -65,20 +60,12 @@ namespace MWRender
 
         auto& bufferData = mBufferData[frameId];
 
-        if (mQueuedDispatchArray && mQueuedDispatchFrameId == frameId)
-        {
-            mBufferData[frameId].data = std::move(mQueuedDispatchArray.value());
-            mQueuedDispatchArray = std::nullopt;
-        }
-
         const auto& data = bufferData.data;
 
         std::vector<size_t> filtered;
 
         filtered.reserve(data.size());
 
-        const fx::DispatchNode::SubPass* resolvePass = nullptr;
-
         for (size_t i = 0; i < data.size(); ++i)
         {
             const auto& node = data[i];
@@ -86,15 +73,6 @@ namespace MWRender
             if (bufferData.mask & node.mFlags)
                 continue;
 
-            for (auto it = node.mPasses.crbegin(); it != node.mPasses.crend(); ++it)
-            {
-                if (!(*it).mRenderTarget)
-                {
-                    resolvePass = &(*it);
-                    break;
-                }
-            }
-
             filtered.push_back(i);
         }
 
@@ -113,10 +91,9 @@ namespace MWRender
             else
                 mLoggedLastError = false;
 
-            mFallbackStateSet->setTextureAttributeAndModes(0, bufferData.sceneTex);
-
             state.pushStateSet(mFallbackStateSet);
             state.apply();
+            state.applyTextureAttribute(0, bufferData.sceneTex);
             viewport->apply(state);
 
             drawGeometry(renderInfo);
@@ -223,7 +200,7 @@ namespace MWRender
 
                     lastApplied = pass.mRenderTarget->getHandle(state.getContextID());;
                 }
-                else if (&pass == resolvePass)
+                else if (pass.mResolve && index == filtered.back())
                 {
                     bindDestinationFbo();
                 }
diff --git a/apps/openmw/mwrender/pingpongcanvas.hpp b/apps/openmw/mwrender/pingpongcanvas.hpp
index 9a3906a006..1887c97325 100644
--- a/apps/openmw/mwrender/pingpongcanvas.hpp
+++ b/apps/openmw/mwrender/pingpongcanvas.hpp
@@ -80,9 +80,6 @@ namespace MWRender
         mutable std::array<BufferData, 2> mBufferData;
         mutable std::array<osg::ref_ptr<osg::FrameBufferObject>, 3> mFbos;
 
-        mutable std::optional<fx::DispatchArray> mQueuedDispatchArray;
-        mutable size_t mQueuedDispatchFrameId;
-
         mutable bool mLoggedLastError = false;
     };
 }
diff --git a/apps/openmw/mwrender/postprocessor.cpp b/apps/openmw/mwrender/postprocessor.cpp
index d149a23e50..fe3d616f23 100644
--- a/apps/openmw/mwrender/postprocessor.cpp
+++ b/apps/openmw/mwrender/postprocessor.cpp
@@ -419,6 +419,8 @@ namespace MWRender
             createTexturesAndCamera(frameId);
             createObjectsForFrame(frameId);
             mDirty = false;
+
+            mPingPongCanvas->setCurrentFrameData(frameId, fx::DispatchArray(mTemplateData));
         }
 
         if ((mNormalsSupported && mNormals != mPrevNormals) || (mPassLights != mPrevPassLights))
@@ -520,7 +522,12 @@ namespace MWRender
         if (!isEnabled())
             return;
 
-        fx::DispatchArray data;
+        size_t frameId = frame() % 2;
+
+        mDirty = true;
+        mDirtyFrameId = !frameId;
+
+        mTemplateData = {};
 
         bool sunglare = true;
         mHDR = false;
@@ -632,12 +639,12 @@ namespace MWRender
                 node.mPasses.emplace_back(std::move(subPass));
             }
 
-            data.emplace_back(std::move(node));
-        }
+            node.compile();
 
-        size_t frameId = frame() % 2;
+            mTemplateData.emplace_back(std::move(node));
+        }
 
-        mPingPongCanvas->setCurrentFrameData(frameId, std::move(data));
+        mPingPongCanvas->setCurrentFrameData(frameId, fx::DispatchArray(mTemplateData));
 
         if (auto hud = MWBase::Environment::get().getWindowManager()->getPostProcessorHud())
             hud->updateTechniques();
diff --git a/apps/openmw/mwrender/postprocessor.hpp b/apps/openmw/mwrender/postprocessor.hpp
index 1229d4da88..01a9e1088c 100644
--- a/apps/openmw/mwrender/postprocessor.hpp
+++ b/apps/openmw/mwrender/postprocessor.hpp
@@ -251,6 +251,8 @@ namespace MWRender
     
         int mWidth;
         int mHeight;
+
+        fx::DispatchArray mTemplateData;
     };
 }
 
diff --git a/components/fx/technique.hpp b/components/fx/technique.hpp
index 057738e952..498d86dc0a 100644
--- a/components/fx/technique.hpp
+++ b/components/fx/technique.hpp
@@ -59,9 +59,11 @@ namespace fx
             osg::ref_ptr<osg::StateSet> mStateSet = new osg::StateSet;
             osg::ref_ptr<osg::FrameBufferObject> mRenderTarget;
             osg::ref_ptr<osg::Texture2D> mRenderTexture;
+            bool mResolve = false;
 
             SubPass(const SubPass& other, const osg::CopyOp& copyOp = osg::CopyOp::SHALLOW_COPY)
                 : mStateSet(new osg::StateSet(*other.mStateSet, copyOp))
+                , mResolve(other.mResolve)
             {
                 if (other.mRenderTarget)
                     mRenderTarget = new osg::FrameBufferObject(*other.mRenderTarget, copyOp);
@@ -70,6 +72,18 @@ namespace fx
             }
         };
 
+        void compile()
+        {
+            for (auto rit = mPasses.rbegin(); rit != mPasses.rend(); ++rit)
+            {
+                if (!rit->mRenderTarget)
+                {
+                    rit->mResolve = true;
+                    break;
+                }
+            }
+        }
+
         // not safe to read/write in draw thread
         std::shared_ptr<fx::Technique> mHandle = nullptr;
 
diff --git a/components/fx/widgets.hpp b/components/fx/widgets.hpp
index fcb1350179..f787b910c8 100644
--- a/components/fx/widgets.hpp
+++ b/components/fx/widgets.hpp
@@ -87,6 +87,7 @@ namespace fx
                     mValueLabel->setCaption(std::to_string(mValue));
 
                 float range = 0.f;
+                float min = 0.f;
 
                 if (auto uniform = mUniform.lock())
                 {
@@ -94,6 +95,7 @@ namespace fx
                     {
                         uniform->template setValue<UType>(mValue);
                         range = uniform->template getMax<UType>() - uniform->template getMin<UType>();
+                        min = uniform->template getMin<UType>();
                     }
                     else
                     {
@@ -101,10 +103,11 @@ namespace fx
                         uvalue[mIndex] = mValue;
                         uniform->template setValue<UType>(uvalue);
                         range = uniform->template getMax<UType>()[mIndex] - uniform->template getMin<UType>()[mIndex];
+                        min = uniform->template getMin<UType>()[mIndex];
                     }
                 }
 
-                float fill = (range == 0.f) ? 1.f : mValue / range;
+                float fill = (range == 0.f) ? 1.f : (mValue - min) / range;
                 mFill->setRealSize(fill, 1.0);
             }
 

From f8eafe0dfda7a1b88c2e94ae73391d0274292979 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 6 Jun 2022 00:57:44 +0200
Subject: [PATCH 2574/2859] Fix checking whether content file is master file

---
 apps/openmw/mwworld/esmloader.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/esmloader.cpp b/apps/openmw/mwworld/esmloader.cpp
index e9aa590e87..795b070dfa 100644
--- a/apps/openmw/mwworld/esmloader.cpp
+++ b/apps/openmw/mwworld/esmloader.cpp
@@ -34,7 +34,8 @@ void EsmLoader::load(const boost::filesystem::path& filepath, int& index, Loadin
 
     mStore.load(*reader, listener, mDialogue);
 
-    if (!mMasterFileFormat.has_value() && Misc::StringUtils::ciEndsWith(reader->getName(), ".esm") && !Misc::StringUtils::ciEndsWith(reader->getName(), ".omwgame"))
+    if (!mMasterFileFormat.has_value() && (Misc::StringUtils::ciEndsWith(reader->getName(), ".esm")
+                                           || Misc::StringUtils::ciEndsWith(reader->getName(), ".omwgame")))
         mMasterFileFormat = reader->getFormat();
 }
 

From 10e4eb8e8e536a57d75faa26253aad16cb49a856 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 6 Jun 2022 10:12:36 +0200
Subject: [PATCH 2575/2859] Append orphaned dialogue instead of always
 appending it

---
 components/esm3/loaddial.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/components/esm3/loaddial.cpp b/components/esm3/loaddial.cpp
index b29d75d92b..f1c102250d 100644
--- a/components/esm3/loaddial.cpp
+++ b/components/esm3/loaddial.cpp
@@ -102,10 +102,12 @@ namespace ESM
                 auto it = lookup->second.first;
 
                 mLookup[info.mId] = std::make_pair(mInfo.insert(++it, info), isDeleted);
-                return;
             }
+            else
+                mLookup[info.mId] = std::make_pair(mInfo.insert(mInfo.end(), info), isDeleted);
         }
-        mLookup[info.mId] = std::make_pair(mInfo.insert(mInfo.begin(), info), isDeleted);
+        else
+            mLookup[info.mId] = std::make_pair(mInfo.insert(mInfo.begin(), info), isDeleted);
     }
 
     void Dialogue::clearDeletedInfos()

From f41e46db641e7592ccc083be6250c9943df7da7a Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 6 Jun 2022 10:59:26 +0200
Subject: [PATCH 2576/2859] Replace empty NPC class with fallback

---
 CHANGELOG.md                     |  1 +
 apps/openmw/mwworld/esmstore.cpp | 32 ++++++++++++++++----------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2cbc553151..ae1d9c5e2b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -120,6 +120,7 @@
     Bug #6730: LoopGroup stalls animation after playing :Stop frame until another animation is played
     Bug #6753: Info records without a DATA subrecords are loaded incorrectly
     Bug #6794: Light sources are attached to mesh bounds centers instead of mesh origins when AttachLight NiNode is missing
+    Bug #6799: Game crashes if an NPC has no Class attached
     Feature #890: OpenMW-CS: Column filtering
     Feature #1465: "Reset" argument for AI functions
     Feature #2491: Ability to make OpenMW "portable"
diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index bd93cc7c4e..690d1d3a63 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -59,15 +59,18 @@ namespace
         }
     }
 
-    std::vector<ESM::NPC> getNPCsToReplace(const MWWorld::Store<ESM::Faction>& factions, const MWWorld::Store<ESM::Class>& classes, const std::unordered_map<std::string, ESM::NPC, Misc::StringUtils::CiHash, Misc::StringUtils::CiEqual>& npcs)
+    const std::string& getDefaultClass(const MWWorld::Store<ESM::Class>& classes)
     {
-        // Cache first class from store - we will use it if current class is not found
-        std::string defaultCls;
         auto it = classes.begin();
         if (it != classes.end())
-            defaultCls = it->mId;
-        else
-            throw std::runtime_error("List of NPC classes is empty!");
+            return it->mId;
+        throw std::runtime_error("List of NPC classes is empty!");
+    }
+
+    std::vector<ESM::NPC> getNPCsToReplace(const MWWorld::Store<ESM::Faction>& factions, const MWWorld::Store<ESM::Class>& classes, const std::unordered_map<std::string, ESM::NPC, Misc::StringUtils::CiHash, Misc::StringUtils::CiEqual>& npcs)
+    {
+        // Cache first class from store - we will use it if current class is not found
+        const std::string& defaultCls = getDefaultClass(classes);
 
         // Validate NPCs for non-existing class and faction.
         // We will replace invalid entries by fixed ones
@@ -78,7 +81,7 @@ namespace
             ESM::NPC npc = npcIter.second;
             bool changed = false;
 
-            const std::string npcFaction = npc.mFaction;
+            const std::string& npcFaction = npc.mFaction;
             if (!npcFaction.empty())
             {
                 const ESM::Faction *fact = factions.search(npcFaction);
@@ -91,16 +94,13 @@ namespace
                 }
             }
 
-            std::string npcClass = npc.mClass;
-            if (!npcClass.empty())
+            const std::string& npcClass = npc.mClass;
+            const ESM::Class *cls = classes.search(npcClass);
+            if (!cls)
             {
-                const ESM::Class *cls = classes.search(npcClass);
-                if (!cls)
-                {
-                    Log(Debug::Verbose) << "NPC '" << npc.mId << "' (" << npc.mName << ") has nonexistent class '" << npc.mClass << "', using '" << defaultCls << "' class as replacement.";
-                    npc.mClass = defaultCls;
-                    changed = true;
-                }
+                Log(Debug::Verbose) << "NPC '" << npc.mId << "' (" << npc.mName << ") has nonexistent class '" << npc.mClass << "', using '" << defaultCls << "' class as replacement.";
+                npc.mClass = defaultCls;
+                changed = true;
             }
 
             if (changed)

From d840f4e995b30397659bb1cfc2f877a543028776 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Mon, 6 Jun 2022 12:40:17 +0300
Subject: [PATCH 2577/2859] Launcher: Stop making redundant setting changes

---
 apps/launcher/advancedpage.cpp | 24 ++++++++++++++++--------
 apps/launcher/graphicspage.cpp |  4 +++-
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index 6f4ca60edf..a5a7cab8d4 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -312,19 +312,24 @@ void Launcher::AdvancedPage::saveSettings()
         saveSettingBool(postprocessEnabledCheckBox, "enabled", "Post Processing");
         saveSettingBool(postprocessLiveReloadCheckBox, "live reload", "Post Processing");
         saveSettingBool(postprocessTransparentPostpassCheckBox, "transparent postpass", "Post Processing");
-        Settings::Manager::setDouble("hdr exposure time", "Post Processing", postprocessHDRTimeComboBox->value());
+        double hdrExposureTime = postprocessHDRTimeComboBox->value();
+        if (hdrExposureTime != Settings::Manager::getDouble("hdr exposure time", "Post Processing"))
+            Settings::Manager::setDouble("hdr exposure time", "Post Processing", hdrExposureTime);
     }
     
     // Audio
     {
         int audioDeviceIndex = audioDeviceSelectorComboBox->currentIndex();
+        std::string prevAudioDevice = Settings::Manager::getString("device", "Sound");
         if (audioDeviceIndex != 0)
         {
-            Settings::Manager::setString("device", "Sound", audioDeviceSelectorComboBox->currentText().toUtf8().constData());
-        } 
-        else 
+            const std::string& newAudioDevice = audioDeviceSelectorComboBox->currentText().toUtf8().constData();
+            if (newAudioDevice != prevAudioDevice)
+                Settings::Manager::setString("device", "Sound", newAudioDevice);
+        }
+        else if (!prevAudioDevice.empty())
         {
-            Settings::Manager::setString("device", "Sound", "");
+            Settings::Manager::setString("device", "Sound", {});
         }
         int hrtfEnabledIndex = enableHRTFComboBox->currentIndex() - 1;
         if (hrtfEnabledIndex != Settings::Manager::getInt("hrtf enable", "Sound"))
@@ -332,13 +337,16 @@ void Launcher::AdvancedPage::saveSettings()
             Settings::Manager::setInt("hrtf enable", "Sound", hrtfEnabledIndex);
         }
         int selectedHRTFProfileIndex = hrtfProfileSelectorComboBox->currentIndex();
+        std::string prevHRTFProfile = Settings::Manager::getString("hrtf", "Sound");
         if (selectedHRTFProfileIndex != 0)
         {
-            Settings::Manager::setString("hrtf", "Sound", hrtfProfileSelectorComboBox->currentText().toUtf8().constData());
+            const std::string& newHRTFProfile  = hrtfProfileSelectorComboBox->currentText().toUtf8().constData();
+            if (newHRTFProfile != prevHRTFProfile)
+                Settings::Manager::setString("hrtf", "Sound", newHRTFProfile);
         }
-        else 
+        else if (!prevHRTFProfile.empty())
         {
-            Settings::Manager::setString("hrtf", "Sound", "");
+            Settings::Manager::setString("hrtf", "Sound", {});
         }
     }
 
diff --git a/apps/launcher/graphicspage.cpp b/apps/launcher/graphicspage.cpp
index 5a57be0e53..67b1380130 100644
--- a/apps/launcher/graphicspage.cpp
+++ b/apps/launcher/graphicspage.cpp
@@ -233,7 +233,9 @@ void Launcher::GraphicsPage::saveSettings()
 
     // Lighting
     static std::array<std::string, 3> lightingMethodMap = {"legacy", "shaders compatibility", "shaders"};
-    Settings::Manager::setString("lighting method", "Shaders", lightingMethodMap[lightingMethodComboBox->currentIndex()]);
+    const std::string& cLightingMethod = lightingMethodMap[lightingMethodComboBox->currentIndex()];
+    if (cLightingMethod != Settings::Manager::getString("lighting method", "Shaders"))
+        Settings::Manager::setString("lighting method", "Shaders", cLightingMethod);
 
     // Shadows
     int cShadowDist = shadowDistanceCheckBox->checkState() != Qt::Unchecked ? shadowDistanceSpinBox->value() : 0;

From 323b671f6dd838747a725975da992d129034889e Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Mon, 6 Jun 2022 12:42:52 +0300
Subject: [PATCH 2578/2859] Launcher: Properly capitalize navmesh cache tab
 name

---
 files/ui/datafilespage.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/ui/datafilespage.ui b/files/ui/datafilespage.ui
index 813d0109ee..c2cbfe6f2e 100644
--- a/files/ui/datafilespage.ui
+++ b/files/ui/datafilespage.ui
@@ -156,7 +156,7 @@
      </widget>
      <widget class="QWidget" name="tab_2">
       <attribute name="title">
-       <string>Navigation mesh cache</string>
+       <string>Navigation Mesh Cache</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_3">
        <item>

From 6cbda10bd511f7ceb25a5e473dbeb42e806cfb2c Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Mon, 6 Jun 2022 12:43:28 +0300
Subject: [PATCH 2579/2859] Content selector: Remove the title

---
 files/ui/contentselector.ui | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/files/ui/contentselector.ui b/files/ui/contentselector.ui
index c099649b31..f19e2ba487 100644
--- a/files/ui/contentselector.ui
+++ b/files/ui/contentselector.ui
@@ -34,9 +34,6 @@
    </property>
    <item>
     <widget class="QGroupBox" name="contentGroupBox">
-     <property name="title">
-      <string>Content</string>
-     </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <property name="bottomMargin">
        <number>3</number>

From aa2e7243426af54788eab93d2e5c3068d6f3ead8 Mon Sep 17 00:00:00 2001
From: Kindi <2538602-Kuyondo@users.noreply.gitlab.com>
Date: Mon, 6 Jun 2022 16:24:54 +0000
Subject: [PATCH 2580/2859] Lua API for Repair records

---
 apps/openmw/CMakeLists.txt         |  2 +-
 apps/openmw/mwlua/types/repair.cpp | 35 ++++++++++++++++++++++++++++++
 apps/openmw/mwlua/types/types.cpp  |  2 +-
 apps/openmw/mwlua/types/types.hpp  |  1 +
 files/lua_api/openmw/types.lua     | 18 +++++++++++++++
 5 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 apps/openmw/mwlua/types/repair.cpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 925dbdef49..c166b11ae3 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -62,7 +62,7 @@ add_openmw_dir (mwlua
     luamanagerimp object worldview userdataserializer eventqueue
     luabindings localscripts playerscripts objectbindings cellbindings asyncbindings settingsbindings
     camerabindings uibindings inputbindings nearbybindings postprocessingbindings stats debugbindings
-    types/types types/door types/actor types/container types/weapon types/npc types/creature types/activator types/book types/lockpick types/probe types/apparatus types/potion types/misc
+    types/types types/door types/actor types/container types/weapon types/npc types/creature types/activator types/book types/lockpick types/probe types/apparatus types/potion types/misc types/repair
     )
 
 add_openmw_dir (mwsound
diff --git a/apps/openmw/mwlua/types/repair.cpp b/apps/openmw/mwlua/types/repair.cpp
new file mode 100644
index 0000000000..fa1e34ac63
--- /dev/null
+++ b/apps/openmw/mwlua/types/repair.cpp
@@ -0,0 +1,35 @@
+#include "types.hpp"
+
+#include <components/esm3/loadrepa.hpp>
+
+#include <apps/openmw/mwworld/esmstore.hpp>
+
+#include "../luabindings.hpp"
+
+namespace sol
+{
+    template <>
+    struct is_automagical<ESM::Repair> : std::false_type {};
+}
+
+namespace MWLua
+{
+    void addRepairBindings(sol::table repair, const Context& context)
+    {
+        const MWWorld::Store<ESM::Repair>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Repair>();
+        repair["record"] = sol::overload(
+            [](const Object& obj) -> const ESM::Repair* { return obj.ptr().get<ESM::Repair>()->mBase; },
+            [store](const std::string& recordId) -> const ESM::Repair* { return store->find(recordId); });
+        sol::usertype<ESM::Repair> record = context.mLua->sol().new_usertype<ESM::Repair>("ESM3_Repair");
+        record[sol::meta_function::to_string] = [](const ESM::Repair& rec) { return "ESM3_Repair[" + rec.mId + "]"; };
+        record["id"] = sol::readonly_property([](const ESM::Repair& rec) -> std::string { return rec.mId; });
+        record["name"] = sol::readonly_property([](const ESM::Repair& rec) -> std::string { return rec.mName; });
+        record["model"] = sol::readonly_property([](const ESM::Repair& rec) -> std::string { return rec.mModel; });
+        record["mwscript"] = sol::readonly_property([](const ESM::Repair& rec) -> std::string { return rec.mScript; });
+        record["icon"] = sol::readonly_property([](const ESM::Repair& rec) -> std::string { return rec.mIcon; });
+        record["maxCondition"] = sol::readonly_property([](const ESM::Repair& rec) -> int { return rec.mData.mUses; });
+        record["value"] = sol::readonly_property([](const ESM::Repair& rec) -> int { return rec.mData.mValue; });
+        record["weight"] = sol::readonly_property([](const ESM::Repair& rec) -> float { return rec.mData.mWeight; });
+        record["quality"] = sol::readonly_property([](const ESM::Repair& rec) -> float { return rec.mData.mQuality; });
+    }
+}
diff --git a/apps/openmw/mwlua/types/types.cpp b/apps/openmw/mwlua/types/types.cpp
index 6533696896..ea2748dd07 100644
--- a/apps/openmw/mwlua/types/types.cpp
+++ b/apps/openmw/mwlua/types/types.cpp
@@ -170,7 +170,7 @@ namespace MWLua
         addLockpickBindings(addType(ObjectTypeName::Lockpick, {ESM::REC_LOCK}, ObjectTypeName::Item), context);
         addProbeBindings(addType(ObjectTypeName::Probe, {ESM::REC_PROB}, ObjectTypeName::Item), context);
         addApparatusBindings(addType(ObjectTypeName::Apparatus, {ESM::REC_APPA}, ObjectTypeName::Item), context);
-        addType(ObjectTypeName::Repair, {ESM::REC_REPA}, ObjectTypeName::Item);
+        addRepairBindings(addType(ObjectTypeName::Repair, {ESM::REC_REPA}, ObjectTypeName::Item), context);
 
         addActivatorBindings(addType(ObjectTypeName::Activator, {ESM::REC_ACTI}), context);
         addContainerBindings(addType(ObjectTypeName::Container, {ESM::REC_CONT}), context);
diff --git a/apps/openmw/mwlua/types/types.hpp b/apps/openmw/mwlua/types/types.hpp
index 63df9a37f1..aeb4125f79 100644
--- a/apps/openmw/mwlua/types/types.hpp
+++ b/apps/openmw/mwlua/types/types.hpp
@@ -35,6 +35,7 @@ namespace MWLua
     void addLockpickBindings(sol::table lockpick, const Context& context);
     void addProbeBindings(sol::table probe, const Context& context);
     void addApparatusBindings(sol::table apparatus, const Context& context);
+    void addRepairBindings(sol::table repair, const Context& context);
     void addMiscellaneousBindings(sol::table miscellaneous, const Context& context);
     void addPotionBindings(sol::table potion, const Context& context);
 }
diff --git a/files/lua_api/openmw/types.lua b/files/lua_api/openmw/types.lua
index b7a5948d56..8ecd7458ba 100644
--- a/files/lua_api/openmw/types.lua
+++ b/files/lua_api/openmw/types.lua
@@ -885,6 +885,24 @@
 -- @param openmw.core#GameObject object
 -- @return #boolean
 
+---
+-- Returns the read-only @{#RepairRecord} of a repair tool
+-- @function [parent=#Repair] record
+-- @param #any objectOrRecordId
+-- @return #RepairRecord
+
+---
+-- @type RepairRecord
+-- @field #string id The record ID of the repair tool
+-- @field #string name The name of the repair tool
+-- @field #string model VFS path to the model
+-- @field #string mwscript MWScript on this repair tool (can be empty)
+-- @field #string icon VFS path to the icon
+-- @field #number maxCondition The maximum number of uses of this repair tool
+-- @field #number weight
+-- @field #number value
+-- @field #number quality The quality of the repair tool
+
 --- @{#Activator} functions
 -- @field [parent=#types] #Activator Activator
 

From d5ec9594499266a00f9a36c0eca3e455843e302a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Wed, 1 Jun 2022 10:34:53 +0300
Subject: [PATCH 2581/2859] Create platform component for platform specific
 things

---
 apps/bulletobjecttool/main.cpp   |  4 ++++
 apps/launcher/main.cpp           |  3 +++
 apps/navmeshtool/main.cpp        |  4 ++++
 apps/opencs/main.cpp             |  3 +++
 apps/openmw/main.cpp             |  3 +++
 components/CMakeLists.txt        |  4 ++++
 components/platform/platform.cpp | 23 +++++++++++++++++++++++
 components/platform/platform.hpp | 10 ++++++++++
 8 files changed, 54 insertions(+)
 create mode 100644 components/platform/platform.cpp
 create mode 100644 components/platform/platform.hpp

diff --git a/apps/bulletobjecttool/main.cpp b/apps/bulletobjecttool/main.cpp
index 973ec3ee8b..aad8c5e082 100644
--- a/apps/bulletobjecttool/main.cpp
+++ b/apps/bulletobjecttool/main.cpp
@@ -16,6 +16,7 @@
 #include <components/vfs/manager.hpp>
 #include <components/vfs/registerarchives.hpp>
 #include <components/esm3/readerscache.hpp>
+#include <components/platform/platform.hpp>
 
 #include <boost/program_options.hpp>
 
@@ -26,6 +27,7 @@
 #include <string>
 #include <vector>
 
+
 namespace
 {
     namespace bpo = boost::program_options;
@@ -106,6 +108,8 @@ namespace
 
     int runBulletObjectTool(int argc, char *argv[])
     {
+        Platform::init();
+
         bpo::options_description desc = makeOptionsDescription();
 
         bpo::parsed_options options = bpo::command_line_parser(argc, argv)
diff --git a/apps/launcher/main.cpp b/apps/launcher/main.cpp
index 4e054867f4..57b8ee4b78 100644
--- a/apps/launcher/main.cpp
+++ b/apps/launcher/main.cpp
@@ -5,6 +5,7 @@
 #include <QDir>
 
 #include <components/debug/debugging.hpp>
+#include <components/platform/platform.hpp>
 
 #ifdef MAC_OS_X_VERSION_MIN_REQUIRED
 #undef MAC_OS_X_VERSION_MIN_REQUIRED
@@ -16,6 +17,8 @@
 
 int runLauncher(int argc, char *argv[])
 {
+    Platform::init();
+
     try
     {
         QApplication app(argc, argv);
diff --git a/apps/navmeshtool/main.cpp b/apps/navmeshtool/main.cpp
index 9b49fa2fff..c1f8a8e90a 100644
--- a/apps/navmeshtool/main.cpp
+++ b/apps/navmeshtool/main.cpp
@@ -21,6 +21,7 @@
 #include <components/vfs/manager.hpp>
 #include <components/vfs/registerarchives.hpp>
 #include <components/esm3/readerscache.hpp>
+#include <components/platform/platform.hpp>
 
 #include <osg/Vec3f>
 
@@ -36,6 +37,7 @@
 #include <io.h>
 #endif
 
+
 namespace NavMeshTool
 {
     namespace
@@ -102,6 +104,8 @@ namespace NavMeshTool
 
         int runNavMeshTool(int argc, char *argv[])
         {
+            Platform::init();
+
             bpo::options_description desc = makeOptionsDescription();
 
             bpo::parsed_options options = bpo::command_line_parser(argc, argv)
diff --git a/apps/opencs/main.cpp b/apps/opencs/main.cpp
index 1e6e718983..a15ab17fa2 100644
--- a/apps/opencs/main.cpp
+++ b/apps/opencs/main.cpp
@@ -8,6 +8,7 @@
 #include <QMetaType>
 
 #include <components/debug/debugging.hpp>
+#include <components/platform/platform.hpp>
 
 #include "model/doc/messages.hpp"
 #include "model/world/universalid.hpp"
@@ -43,6 +44,8 @@ class Application : public QApplication
 
 int runApplication(int argc, char *argv[])
 {
+    Platform::init();
+
 #ifdef Q_OS_MAC
     setenv("OSG_GL_TEXTURE_STORAGE", "OFF", 0);
 #endif
diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index e73dac113c..730342cacb 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -4,6 +4,7 @@
 #include <components/fallback/validate.hpp>
 #include <components/debug/debugging.hpp>
 #include <components/misc/rng.hpp>
+#include <components/platform/platform.hpp>
 
 #include "mwgui/debugwindow.hpp"
 
@@ -207,6 +208,8 @@ namespace
 
 int runApplication(int argc, char *argv[])
 {
+    Platform::init();
+
 #ifdef __APPLE__
     std::filesystem::path binary_path = std::filesystem::system_complete(std::filesystem::path(argv[0]));
     std::filesystem::current_path(binary_path.parent_path());
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 1465d9c3f2..779c8d28f5 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -335,6 +335,10 @@ add_component_dir(navmeshtool
     protocol
     )
 
+add_component_dir(platform
+    platform
+    )
+
 set (ESM_UI ${CMAKE_SOURCE_DIR}/files/ui/contentselector.ui
     )
 
diff --git a/components/platform/platform.cpp b/components/platform/platform.cpp
new file mode 100644
index 0000000000..9044ba3792
--- /dev/null
+++ b/components/platform/platform.cpp
@@ -0,0 +1,23 @@
+#include "platform.hpp"
+
+#include <stdio.h>
+
+namespace Platform {
+
+    static void increaseFileHandleLimit()
+    {
+#ifdef WIN32
+        // Increase limit for open files at the stream I/O level, see
+        // https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/setmaxstdio?view=msvc-170#remarks
+        _setmaxstdio(8192);
+#else
+        // No-op on any other platform.
+#endif
+    }
+
+    void init()
+    {
+        increaseFileHandleLimit();
+    }
+
+}
diff --git a/components/platform/platform.hpp b/components/platform/platform.hpp
new file mode 100644
index 0000000000..d8f2058217
--- /dev/null
+++ b/components/platform/platform.hpp
@@ -0,0 +1,10 @@
+#ifndef OPENMW_COMPONENTS_PLATFORM_PLATFORM_HPP
+#define OPENMW_COMPONENTS_PLATFORM_PLATFORM_HPP
+
+namespace Platform {
+
+    void init();
+
+}
+
+#endif // OPENMW_COMPONENTS_PLATFORM_PLATFORM_HPP

From 6c9c8329279c64377cc81a48fce2edd246c709b1 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Mon, 6 Jun 2022 21:52:55 +0000
Subject: [PATCH 2582/2859] Lua UI: Support autosized multiline text

---
 components/lua_ui/textedit.cpp                | 31 ++++++++---
 components/lua_ui/textedit.hpp                |  4 +-
 .../lua-scripting/widgets/textedit.rst        |  4 ++
 files/data/scripts/omw/mwui/init.lua          |  8 +++
 files/data/scripts/omw/mwui/text.lua          | 15 +++++
 files/data/scripts/omw/mwui/textEdit.lua      | 28 +---------
 files/data/scripts/omw/settings/render.lua    | 15 +++--
 files/data/scripts/omw/settings/renderers.lua | 55 +++++++++----------
 8 files changed, 88 insertions(+), 72 deletions(-)

diff --git a/components/lua_ui/textedit.cpp b/components/lua_ui/textedit.cpp
index 0441eb4e5d..9a98920bb7 100644
--- a/components/lua_ui/textedit.cpp
+++ b/components/lua_ui/textedit.cpp
@@ -21,17 +21,23 @@ namespace LuaUi
 
     void LuaTextEdit::updateProperties()
     {
-        mEditBox->setCaption(propertyValue("text", std::string()));
         mEditBox->setFontHeight(propertyValue("textSize", 10));
         mEditBox->setTextColour(propertyValue("textColor", MyGUI::Colour(0, 0, 0, 1)));
-        mEditBox->setEditMultiLine(propertyValue("multiline", false));
         mEditBox->setEditWordWrap(propertyValue("wordWrap", false));
 
         Alignment horizontal(propertyValue("textAlignH", Alignment::Start));
         Alignment vertical(propertyValue("textAlignV", Alignment::Start));
         mEditBox->setTextAlign(alignmentToMyGui(horizontal, vertical));
 
-        mEditBox->setEditStatic(propertyValue("readOnly", false));
+        mEditBox->setEditMultiLine(propertyValue("multiline", false));
+
+        bool readOnly = propertyValue("readOnly", false);
+        mEditBox->setEditStatic(readOnly);
+
+        mAutoSize = readOnly && propertyValue("autoSize", false);
+
+        // change caption last, for multiline and wordwrap to apply
+        mEditBox->setCaption(propertyValue("text", std::string()));
 
         WidgetExtension::updateProperties();
     }
@@ -44,12 +50,7 @@ namespace LuaUi
     void LuaTextEdit::updateCoord()
     {
         WidgetExtension::updateCoord();
-        {
-            MyGUI::IntSize slotSize = slot()->calculateSize();
-            MyGUI::IntPoint slotPosition = slot()->widget()->getAbsolutePosition() - widget()->getAbsolutePosition();
-            MyGUI::IntCoord slotCoord(slotPosition, slotSize);
-            mEditBox->setCoord(slotCoord);
-        }
+        mEditBox->setSize(widget()->getSize());
     }
 
     void LuaTextEdit::updateChildren()
@@ -59,4 +60,16 @@ namespace LuaUi
         mEditBox->detachFromWidget();
         mEditBox->attachToWidget(this);
     }
+    
+    MyGUI::IntSize LuaTextEdit::calculateSize()
+    {
+        MyGUI::IntSize normalSize = WidgetExtension::calculateSize();
+        if (mAutoSize)
+        {
+            mEditBox->setSize(normalSize);
+            MyGUI::IntSize textSize = mEditBox->getTextSize();
+            normalSize.height = std::max(normalSize.height, textSize.height);
+        }
+        return normalSize;
+    }
 }
diff --git a/components/lua_ui/textedit.hpp b/components/lua_ui/textedit.hpp
index 1158e91e2c..c26292416b 100644
--- a/components/lua_ui/textedit.hpp
+++ b/components/lua_ui/textedit.hpp
@@ -17,11 +17,13 @@ namespace LuaUi
             void updateProperties() override;
             void updateCoord() override;
             void updateChildren() override;
+            MyGUI::IntSize calculateSize() override;
 
         private:
             void textChange(MyGUI::EditBox*);
 
-        MyGUI::EditBox* mEditBox;
+            MyGUI::EditBox* mEditBox = nullptr;
+            bool mAutoSize;
     };
 }
 
diff --git a/docs/source/reference/lua-scripting/widgets/textedit.rst b/docs/source/reference/lua-scripting/widgets/textedit.rst
index 16e640d1b0..f0b31b6971 100644
--- a/docs/source/reference/lua-scripting/widgets/textedit.rst
+++ b/docs/source/reference/lua-scripting/widgets/textedit.rst
@@ -35,6 +35,10 @@ Properties
   * - readOnly
     - boolean (false)
     - Whether the text can be edited.
+  * - autoSize
+    - boolean (false)
+    - | Automatically changes widget height to fix all the text.
+      | Only applies for readOnly = true.
 
 Events
 ------
diff --git a/files/data/scripts/omw/mwui/init.lua b/files/data/scripts/omw/mwui/init.lua
index b0d7e4346d..7f1fec7f59 100644
--- a/files/data/scripts/omw/mwui/init.lua
+++ b/files/data/scripts/omw/mwui/init.lua
@@ -85,6 +85,14 @@ require('scripts.omw.mwui.borders')(templates)
 ---
 -- Standard "sand" colored text
 -- @field [parent=#Templates] openmw.ui#Layout textNormal
+
+---
+-- Header white colored text
+-- @field [parent=#Templates] openmw.ui#Layout textHeader
+
+---
+-- Standard "sand" colored multiline text
+-- @field [parent=#Templates] openmw.ui#Layout textParagraph
 require('scripts.omw.mwui.text')(templates)
 
 ---
diff --git a/files/data/scripts/omw/mwui/text.lua b/files/data/scripts/omw/mwui/text.lua
index 8fc1133000..93ccba94cc 100644
--- a/files/data/scripts/omw/mwui/text.lua
+++ b/files/data/scripts/omw/mwui/text.lua
@@ -1,4 +1,5 @@
 local ui = require('openmw.ui')
+local util = require('openmw.util')
 
 local constants = require('scripts.omw.mwui.constants')
 
@@ -18,7 +19,21 @@ local textHeader = {
     },
 }
 
+local textParagraph = {
+    type = ui.TYPE.TextEdit,
+    props = {
+        textSize = constants.textNormalSize,
+        textColor = constants.normalColor,
+        autoSize = true,
+        readOnly = true,
+        multiline = true,
+        wordWrap = true,
+        size = util.vector2(100, 0),
+    },
+}
+
 return function(templates)
     templates.textNormal = textNormal
     templates.textHeader = textHeader
+    templates.textParagraph = textParagraph
 end
\ No newline at end of file
diff --git a/files/data/scripts/omw/mwui/textEdit.lua b/files/data/scripts/omw/mwui/textEdit.lua
index 4f86aa356f..99a42190c8 100644
--- a/files/data/scripts/omw/mwui/textEdit.lua
+++ b/files/data/scripts/omw/mwui/textEdit.lua
@@ -3,49 +3,25 @@ local ui = require('openmw.ui')
 
 local constants = require('scripts.omw.mwui.constants')
 
-local borderOffset = util.vector2(1, 1) * constants.border
-
 return function(templates)
-    local borderContent = ui.content {
-        {
-            template = templates.borders,
-            props = {
-                relativeSize = util.vector2(1, 1),
-            },
-            content = ui.content {
-                {
-                    props = {
-                        position = borderOffset,
-                        relativeSize = util.vector2(1, 1),
-                    },
-                    external = {
-                        slot = true,
-                    },
-                }
-            }
-        },
-    }
-
     templates.textEditLine = {
         type = ui.TYPE.TextEdit,
         props = {
-            size = util.vector2(150, constants.textNormalSize) + borderOffset * 4,
+            size = util.vector2(150, constants.textNormalSize),
             textSize = constants.textNormalSize,
             textColor = constants.normalColor,
             multiline = false,
         },
-        content = borderContent,
     }
 
     templates.textEditBox = {
         type = ui.TYPE.TextEdit,
         props = {
-            size = util.vector2(150, 5 * constants.textNormalSize) + borderOffset * 4,
+            size = util.vector2(150, 5 * constants.textNormalSize),
             textSize = constants.textNormalSize,
             textColor = constants.normalColor,
             multiline = true,
             wordWrap = true,
         },
-        content = borderContent,
     }
 end
\ No newline at end of file
diff --git a/files/data/scripts/omw/settings/render.lua b/files/data/scripts/omw/settings/render.lua
index c57d8fb838..8aebf76661 100644
--- a/files/data/scripts/omw/settings/render.lua
+++ b/files/data/scripts/omw/settings/render.lua
@@ -94,10 +94,9 @@ local function renderSetting(group, setting, value, global)
         type = ui.TYPE.Flex,
         content = ui.content {
             {
-                template = I.MWUI.templates.textNormal,
+                template = I.MWUI.templates.textHeader,
                 props = {
                     text = l10n(setting.name),
-                    textSize = 18,
                 },
             },
         },
@@ -105,10 +104,10 @@ local function renderSetting(group, setting, value, global)
     if setting.description then
         titleLayout.content:add(interval)
         titleLayout.content:add {
-            template = I.MWUI.templates.textNormal,
+            template = I.MWUI.templates.textParagraph,
             props = {
                 text = l10n(setting.description),
-                textSize = 16,
+                size = util.vector2(300, 0),
             },
         }
     end
@@ -191,10 +190,10 @@ local function renderGroup(group, global)
     if group.description then
         titleLayout.content:add(interval)
         titleLayout.content:add {
-            template = I.MWUI.templates.textHeader,
+            template = I.MWUI.templates.textParagraph,
             props = {
                 text = l10n(group.description),
-                textSize = 18,
+                size = util.vector2(300, 0),
             },
         }
     end
@@ -301,10 +300,10 @@ local function renderPage(page)
     }
     if page.description then
         titleLayout.content:add {
-            template = I.MWUI.templates.textNormal,
+            template = I.MWUI.templates.textParagraph,
             props = {
                 text = l10n(page.description),
-                textSize = 20,
+                size = util.vector2(300, 0),
             },
         }
     end
diff --git a/files/data/scripts/omw/settings/renderers.lua b/files/data/scripts/omw/settings/renderers.lua
index 9f7a46eb2e..2b1739e5a3 100644
--- a/files/data/scripts/omw/settings/renderers.lua
+++ b/files/data/scripts/omw/settings/renderers.lua
@@ -19,6 +19,18 @@ local function applyDefaults(argument, defaults)
     return argument
 end
 
+local function paddedBox(layout)
+    return {
+        template = I.MWUI.templates.box,
+        content = ui.content {
+            {
+                template = I.MWUI.templates.padding,
+                content = ui.content { layout },
+            },
+        }
+    }
+end
+
 local function disable(disabled, layout)
     if disabled then
         return {
@@ -39,7 +51,7 @@ return function(registerRenderer)
         }
         registerRenderer('textLine', function(value, set, argument)
             argument = applyDefaults(argument, defaultArgument)
-            return disable(argument.disabled, {
+            return disable(argument.disabled, paddedBox {
                 template = I.MWUI.templates.textEditLine,
                 props = {
                     text = tostring(value),
@@ -61,24 +73,19 @@ return function(registerRenderer)
         registerRenderer('checkbox', function(value, set, argument)
             argument = applyDefaults(argument, defaultArgument)
             local l10n = core.l10n(argument.l10n)
-            return disable(argument.disabled, {
-                template = I.MWUI.templates.box,
+            return disable(argument.disabled, paddedBox {
+                template = I.MWUI.templates.padding,
                 content = ui.content {
                     {
-                        template = I.MWUI.templates.padding,
-                        content = ui.content {
-                            {
-                                template = I.MWUI.templates.textNormal,
-                                props = {
-                                    text = l10n(value and argument.trueLabel or argument.falseLabel)
-                                },
-                                events = {
-                                    mouseClick = async:callback(function() set(not value) end),
-                                },
-                            },
+                        template = I.MWUI.templates.textNormal,
+                        props = {
+                            text = l10n(value and argument.trueLabel or argument.falseLabel)
+                        },
+                        events = {
+                            mouseClick = async:callback(function() set(not value) end),
                         },
                     },
-                },
+                }
             })
         end)
     end
@@ -101,7 +108,7 @@ return function(registerRenderer)
         registerRenderer('number', function(value, set, argument)
             argument = applyDefaults(argument, defaultArgument)
             local lastInput = nil
-            return disable(argument.disabled, {
+            return disable(argument.disabled, paddedBox {
                 template = I.MWUI.templates.textEditLine,
                 props = {
                     text = tostring(value),
@@ -173,6 +180,7 @@ return function(registerRenderer)
                             end),
                         },
                     },
+                    { template = I.MWUI.templates.interval },
                     {
                         template = I.MWUI.templates.textNormal,
                         props = {
@@ -182,6 +190,7 @@ return function(registerRenderer)
                             grow = 1,
                         },
                     },
+                    { template = I.MWUI.templates.interval },
                     {
                         type = ui.TYPE.Image,
                         props = {
@@ -197,17 +206,7 @@ return function(registerRenderer)
                     },
                 },
             }
-            return disable(argument.disabled, {
-                template = I.MWUI.templates.box,
-                content = ui.content {
-                    {
-                        template = I.MWUI.templates.padding,
-                        content = ui.content {
-                            body,
-                        },
-                    },
-                },
-            })
+            return disable(argument.disabled, paddedBox(body))
         end)
     end
 
@@ -233,7 +232,7 @@ return function(registerRenderer)
                 },
             }
             local lastInput = nil
-            local hexInput = {
+            local hexInput = paddedBox {
                 template = I.MWUI.templates.textEditLine,
                 props = {
                     text = value:asHex(),

From 1240b60a248770d68dea63ac0a3411cd47ee190c Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Mon, 6 Jun 2022 23:54:22 +0200
Subject: [PATCH 2583/2859] Console command `reloadlua` also reloads l10n used
 by Lua scripts

---
 apps/openmw/mwlua/luamanagerimp.cpp | 1 +
 components/lua/l10n.hpp             | 1 +
 2 files changed, 2 insertions(+)

diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 3525906aac..ceec0cd57a 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -503,6 +503,7 @@ namespace MWLua
         MWBase::Environment::get().getWindowManager()->setConsoleMode("");
         mUiResourceManager.clear();
         mLua.dropScriptCache();
+        mL10n.clear();
         initConfiguration();
 
         {  // Reload global scripts
diff --git a/components/lua/l10n.hpp b/components/lua/l10n.hpp
index 04a3ad9c2c..a630797933 100644
--- a/components/lua/l10n.hpp
+++ b/components/lua/l10n.hpp
@@ -13,6 +13,7 @@ namespace LuaUtil
     public:
         L10nManager(const VFS::Manager* vfs, LuaState* lua) : mVFS(vfs), mLua(lua) {}
         void init();
+        void clear() { mContexts.clear(); }
 
         void setPreferredLocales(const std::vector<std::string>& locales);
         const std::vector<icu::Locale>& getPreferredLocales() const { return mPreferredLocales; }

From 14bf9af056fa47293c01bd6ad8d3102be3c7b52b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Tue, 7 Jun 2022 01:22:43 +0300
Subject: [PATCH 2584/2859] Move implementation details of debugging.hpp to
 cpp, reduce includes

---
 components/debug/debugging.cpp | 208 ++++++++++++++++++++++++---------
 components/debug/debugging.hpp | 111 ------------------
 2 files changed, 154 insertions(+), 165 deletions(-)

diff --git a/components/debug/debugging.cpp b/components/debug/debugging.cpp
index c46971d651..61de1ef4c1 100644
--- a/components/debug/debugging.cpp
+++ b/components/debug/debugging.cpp
@@ -7,12 +7,14 @@
 #include <filesystem>
 
 #include <components/crashcatcher/crashcatcher.hpp>
-
+#include <components/files/configurationmanager.hpp>
 #ifdef _WIN32
 #include <components/crashcatcher/windows_crashcatcher.hpp>
 #include <components/windows.hpp>
 #endif
 
+#include <SDL_messagebox.h>
+
 namespace Debug
 {
 #ifdef _WIN32
@@ -66,79 +68,177 @@ namespace Debug
     static LogListener logListener;
     void setLogListener(LogListener listener) { logListener = std::move(listener); }
 
-    std::streamsize DebugOutputBase::write(const char *str, std::streamsize size)
+    class DebugOutputBase : public boost::iostreams::sink
     {
-        if (size <= 0)
+    public:
+        DebugOutputBase()
+        {
+            if (CurrentDebugLevel == NoLevel)
+                fillCurrentDebugLevel();
+        }
+
+        virtual std::streamsize write(const char* str, std::streamsize size)
+        {
+            if (size <= 0)
+                return size;
+            std::string_view msg{ str, size_t(size) };
+
+            // Skip debug level marker
+            Level level = getLevelMarker(str);
+            if (level != NoLevel)
+                msg = msg.substr(1);
+
+            char prefix[32];
+            int prefixSize;
+            {
+                prefix[0] = '[';
+                const auto now = std::chrono::system_clock::now();
+                const auto time = std::chrono::system_clock::to_time_t(now);
+                prefixSize = std::strftime(prefix + 1, sizeof(prefix) - 1, "%T", std::localtime(&time)) + 1;
+                char levelLetter = " EWIVD*"[int(level)];
+                const auto ms = std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()).count();
+                prefixSize += snprintf(prefix + prefixSize, sizeof(prefix) - prefixSize,
+                    ".%03u %c] ", static_cast<unsigned>(ms % 1000), levelLetter);
+            }
+
+            while (!msg.empty())
+            {
+                if (msg[0] == 0)
+                    break;
+                size_t lineSize = 1;
+                while (lineSize < msg.size() && msg[lineSize - 1] != '\n')
+                    lineSize++;
+                writeImpl(prefix, prefixSize, level);
+                writeImpl(msg.data(), lineSize, level);
+                if (logListener)
+                    logListener(level, std::string_view(prefix, prefixSize), std::string_view(msg.data(), lineSize));
+                msg = msg.substr(lineSize);
+            }
+
             return size;
-        std::string_view msg{str, size_t(size)};
+        }
 
-        // Skip debug level marker
-        Level level = getLevelMarker(str);
-        if (level != NoLevel)
-            msg = msg.substr(1);
+        virtual ~DebugOutputBase() = default;
 
-        char prefix[32];
-        int prefixSize;
+    protected:
+        static Level getLevelMarker(const char* str)
         {
-            prefix[0] = '[';
-            const auto now = std::chrono::system_clock::now();
-            const auto time = std::chrono::system_clock::to_time_t(now);
-            prefixSize = std::strftime(prefix + 1, sizeof(prefix) - 1, "%T", std::localtime(&time)) + 1;
-            char levelLetter = " EWIVD*"[int(level)];
-            const auto ms = std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()).count();
-            prefixSize += snprintf(prefix + prefixSize, sizeof(prefix) - prefixSize,
-                                   ".%03u %c] ", static_cast<unsigned>(ms % 1000), levelLetter);
+            if (unsigned(*str) <= unsigned(Marker))
+            {
+                return Level(*str);
+            }
+
+            return NoLevel;
         }
 
-        while (!msg.empty())
+        static void fillCurrentDebugLevel()
         {
-            if (msg[0] == 0)
-                break;
-            size_t lineSize = 1;
-            while (lineSize < msg.size() && msg[lineSize - 1] != '\n')
-                lineSize++;
-            writeImpl(prefix, prefixSize, level);
-            writeImpl(msg.data(), lineSize, level);
-            if (logListener)
-                logListener(level, std::string_view(prefix, prefixSize), std::string_view(msg.data(), lineSize));
-            msg = msg.substr(lineSize);
+            const char* env = getenv("OPENMW_DEBUG_LEVEL");
+            if (env)
+            {
+                std::string value(env);
+                if (value == "ERROR")
+                    CurrentDebugLevel = Error;
+                else if (value == "WARNING")
+                    CurrentDebugLevel = Warning;
+                else if (value == "INFO")
+                    CurrentDebugLevel = Info;
+                else if (value == "VERBOSE")
+                    CurrentDebugLevel = Verbose;
+                else if (value == "DEBUG")
+                    CurrentDebugLevel = Debug;
+
+                return;
+            }
+
+            CurrentDebugLevel = Verbose;
         }
 
-        return size;
-    }
+        virtual std::streamsize writeImpl(const char* str, std::streamsize size, Level debugLevel)
+        {
+            return size;
+        }
+    };
 
-    Level DebugOutputBase::getLevelMarker(const char *str)
+#if defined _WIN32 && defined _DEBUG
+    class DebugOutput : public DebugOutputBase
     {
-        if (unsigned(*str) <= unsigned(Marker))
+    public:
+        std::streamsize writeImpl(const char* str, std::streamsize size, Level debugLevel)
         {
-            return Level(*str);
+            // Make a copy for null termination
+            std::string tmp(str, static_cast<unsigned int>(size));
+            // Write string to Visual Studio Debug output
+            OutputDebugString(tmp.c_str());
+            return size;
         }
 
-        return NoLevel;
-    }
+        virtual ~DebugOutput() = default;
+    };
+#else
 
-    void DebugOutputBase::fillCurrentDebugLevel()
+    class Tee : public DebugOutputBase
     {
-        const char* env = getenv("OPENMW_DEBUG_LEVEL");
-        if (env)
+    public:
+        Tee(std::ostream& stream, std::ostream& stream2)
+            : out(stream), out2(stream2)
         {
-            std::string value(env);
-            if (value == "ERROR")
-                CurrentDebugLevel = Error;
-            else if (value == "WARNING")
-                CurrentDebugLevel = Warning;
-            else if (value == "INFO")
-                CurrentDebugLevel = Info;
-            else if (value == "VERBOSE")
-                CurrentDebugLevel = Verbose;
-            else if (value == "DEBUG")
-                CurrentDebugLevel = Debug;
-
-            return;
+            // TODO: check which stream is stderr?
+            mUseColor = useColoredOutput();
+
+            mColors[Error] = Red;
+            mColors[Warning] = Yellow;
+            mColors[Info] = Reset;
+            mColors[Verbose] = DarkGray;
+            mColors[Debug] = DarkGray;
+            mColors[NoLevel] = Reset;
         }
 
-        CurrentDebugLevel = Verbose;
-    }
+        std::streamsize writeImpl(const char* str, std::streamsize size, Level debugLevel) override
+        {
+            out.write(str, size);
+            out.flush();
+
+            if (mUseColor)
+            {
+                out2 << "\033[0;" << mColors[debugLevel] << "m";
+                out2.write(str, size);
+                out2 << "\033[0;" << Reset << "m";
+            }
+            else
+            {
+                out2.write(str, size);
+            }
+            out2.flush();
+
+            return size;
+        }
+
+        virtual ~Tee() = default;
+
+    private:
+
+        static bool useColoredOutput()
+        {
+            // Note: cmd.exe in Win10 should support ANSI colors, but in its own way.
+#if defined(_WIN32)
+            return 0;
+#else
+            char* term = getenv("TERM");
+            bool useColor = term && !getenv("NO_COLOR") && isatty(fileno(stderr));
+
+            return useColor;
+#endif
+        }
+
+        std::ostream& out;
+        std::ostream& out2;
+        bool mUseColor;
+
+        std::map<Level, int> mColors;
+    };
+#endif
+
 }
 
 static std::unique_ptr<std::ostream> rawStdout = nullptr;
diff --git a/components/debug/debugging.hpp b/components/debug/debugging.hpp
index 63c44ae8b4..8ac4bcd8ef 100644
--- a/components/debug/debugging.hpp
+++ b/components/debug/debugging.hpp
@@ -4,17 +4,10 @@
 #include <boost/filesystem/fstream.hpp>
 #include <boost/iostreams/stream.hpp>
 
-#include <components/files/configurationmanager.hpp>
 #include <components/misc/guarded.hpp>
 
-#include <SDL_messagebox.h>
-
 #include "debuglog.hpp"
 
-#if defined _WIN32 && defined _DEBUG
-#include <components/windows.hpp>
-#endif
-
 namespace Debug
 {
     // ANSI colors for terminal
@@ -26,116 +19,12 @@ namespace Debug
         Yellow = 93
     };
 
-    class DebugOutputBase : public boost::iostreams::sink
-    {
-    public:
-        DebugOutputBase()
-        {
-            if (CurrentDebugLevel == NoLevel)
-                fillCurrentDebugLevel();
-        }
-
-        virtual std::streamsize write(const char *str, std::streamsize size);
-
-        virtual ~DebugOutputBase() = default;
-
-    protected:
-        static Level getLevelMarker(const char *str);
-
-        static void fillCurrentDebugLevel();
-
-        virtual std::streamsize writeImpl(const char *str, std::streamsize size, Level debugLevel)
-        {
-            return size;
-        }
-    };
-
 #ifdef _WIN32
     bool attachParentConsole();
 #endif
 
-#if defined _WIN32 && defined _DEBUG
-    class DebugOutput : public DebugOutputBase
-    {
-    public:
-        std::streamsize writeImpl(const char *str, std::streamsize size, Level debugLevel)
-        {
-            // Make a copy for null termination
-            std::string tmp (str, static_cast<unsigned int>(size));
-            // Write string to Visual Studio Debug output
-            OutputDebugString (tmp.c_str ());
-            return size;
-        }
-
-        virtual ~DebugOutput() {}
-    };
-#else
-
-    class Tee : public DebugOutputBase
-    {
-    public:
-        Tee(std::ostream &stream, std::ostream &stream2)
-            : out(stream), out2(stream2)
-        {
-            // TODO: check which stream is stderr?
-            mUseColor = useColoredOutput();
-
-            mColors[Error] = Red;
-            mColors[Warning] = Yellow;
-            mColors[Info] = Reset;
-            mColors[Verbose] = DarkGray;
-            mColors[Debug] = DarkGray;
-            mColors[NoLevel] = Reset;
-        }
-
-        std::streamsize writeImpl(const char *str, std::streamsize size, Level debugLevel) override
-        {
-            out.write (str, size);
-            out.flush();
-
-            if(mUseColor)
-            {
-                out2 << "\033[0;" << mColors[debugLevel] << "m";
-                out2.write (str, size);
-                out2 << "\033[0;" << Reset << "m";
-            }
-            else
-            {
-                out2.write(str, size);
-            }
-            out2.flush();
-
-            return size;
-        }
-
-        virtual ~Tee() {}
-
-    private:
-
-        static bool useColoredOutput()
-        {
-    // Note: cmd.exe in Win10 should support ANSI colors, but in its own way.
-#if defined(_WIN32)
-            return 0;
-#else
-            char *term = getenv("TERM");
-            bool useColor = term && !getenv("NO_COLOR") && isatty(fileno(stderr));
-
-            return useColor;
-#endif
-        }
-
-        std::ostream &out;
-        std::ostream &out2;
-        bool mUseColor;
-
-        std::map<Level, int> mColors;
-    };
-#endif
-
     using LogListener = std::function<void(Debug::Level, std::string_view prefix, std::string_view msg)>;
     void setLogListener(LogListener);
-
 }
 
 // Can be used to print messages without timestamps

From e185d186bf99b9abba6529eaa818ee9205d6641b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Tue, 7 Jun 2022 01:36:08 +0300
Subject: [PATCH 2585/2859] Move Log implementation to cpp, remove expensive
 mutex include in hpp

---
 components/debug/debuglog.cpp | 30 +++++++++++++++++++++++++++++-
 components/debug/debuglog.hpp | 31 ++-----------------------------
 2 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/components/debug/debuglog.cpp b/components/debug/debuglog.cpp
index 510c638614..f4f0fdffa6 100644
--- a/components/debug/debuglog.cpp
+++ b/components/debug/debuglog.cpp
@@ -1,8 +1,36 @@
 #include "debuglog.hpp"
+#include <mutex>
 
 namespace Debug
 {
     Level CurrentDebugLevel = Level::NoLevel;
 }
 
-std::mutex Log::sLock;
+static std::mutex sLock;
+
+Log::Log(Debug::Level level) 
+    : mShouldLog(level <= Debug::CurrentDebugLevel)
+{
+    // No need to hold the lock if there will be no logging anyway
+    if (!mShouldLog)
+        return;
+
+    // Locks a global lock while the object is alive
+    sLock.lock();
+
+    // If the app has no logging system enabled, log level is not specified.
+    // Show all messages without marker - we just use the plain cout in this case.
+    if (Debug::CurrentDebugLevel == Debug::NoLevel)
+        return;
+
+    std::cout << static_cast<unsigned char>(level);
+}
+
+Log::~Log()
+{
+    if (!mShouldLog)
+        return;
+
+    std::cout << std::endl;
+    sLock.unlock();
+}
diff --git a/components/debug/debuglog.hpp b/components/debug/debuglog.hpp
index bcb282ab3a..aa8156e119 100644
--- a/components/debug/debuglog.hpp
+++ b/components/debug/debuglog.hpp
@@ -1,7 +1,6 @@
 #ifndef DEBUG_LOG_H
 #define DEBUG_LOG_H
 
-#include <mutex>
 #include <iostream>
 
 namespace Debug
@@ -23,27 +22,9 @@ namespace Debug
 
 class Log
 {
-    static std::mutex sLock;
-
-    std::unique_lock<std::mutex> mLock;
 public:
-    explicit Log(Debug::Level level)
-        : mShouldLog(level <= Debug::CurrentDebugLevel)
-    {
-        // No need to hold the lock if there will be no logging anyway
-        if (!mShouldLog)
-            return;
-
-        // Locks a global lock while the object is alive
-        mLock = lock();
-
-        // If the app has no logging system enabled, log level is not specified.
-        // Show all messages without marker - we just use the plain cout in this case.
-        if (Debug::CurrentDebugLevel == Debug::NoLevel)
-            return;
-
-        std::cout << static_cast<unsigned char>(level);
-    }
+    explicit Log(Debug::Level level);
+    ~Log();
 
     // Perfect forwarding wrappers to give the chain of objects to cout
     template<typename T>
@@ -55,14 +36,6 @@ public:
         return *this;
     }
 
-    ~Log()
-    {
-        if (mShouldLog)
-            std::cout << std::endl;
-    }
-
-    static std::unique_lock<std::mutex> lock() { return std::unique_lock<std::mutex>(sLock); }
-
 private:
     const bool mShouldLog;
 };

From 38b6927b31ac1d3f4380c1593e1e90daad6280af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Tue, 7 Jun 2022 02:08:50 +0300
Subject: [PATCH 2586/2859] Fix missing includes

---
 apps/openmw/mwgui/debugwindow.cpp                | 5 +++--
 apps/openmw/mwscript/miscextensions.cpp          | 1 +
 components/crashcatcher/windows_crashmonitor.cpp | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwgui/debugwindow.cpp b/apps/openmw/mwgui/debugwindow.cpp
index 79375849c7..6fab0d6a24 100644
--- a/apps/openmw/mwgui/debugwindow.cpp
+++ b/apps/openmw/mwgui/debugwindow.cpp
@@ -161,7 +161,8 @@ namespace MWGui
         std::string addition;
         const int64_t bufSize = sLogCircularBuffer.size();
         {
-            std::unique_lock<std::mutex> lock = Log::lock();
+            // Keep log object to stay keep the lock.
+            Log log(Debug::Debug);
             if (sLogStartIndex < sLogEndIndex)
                 addition = std::string(sLogCircularBuffer.data() + sLogStartIndex, sLogEndIndex - sLogStartIndex);
             else
@@ -212,4 +213,4 @@ namespace MWGui
         else
             updateBulletProfile();
     }
-}
\ No newline at end of file
+}
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index d620882dde..f641f0ee4b 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -2,6 +2,7 @@
 
 #include <cstdlib>
 #include <iomanip>
+#include <chrono>
 
 #include <components/compiler/extensions.hpp>
 #include <components/compiler/opcodes.hpp>
diff --git a/components/crashcatcher/windows_crashmonitor.cpp b/components/crashcatcher/windows_crashmonitor.cpp
index 5688d0eeb8..2693f7681d 100644
--- a/components/crashcatcher/windows_crashmonitor.cpp
+++ b/components/crashcatcher/windows_crashmonitor.cpp
@@ -8,6 +8,7 @@
 #include <iostream>
 #include <memory>
 #include <sstream>
+#include <thread>
 
 #include <SDL_messagebox.h>
 

From e0936b04c0d9b29f3fe2ecb6bc0360332230afce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Tue, 7 Jun 2022 02:21:57 +0300
Subject: [PATCH 2587/2859] Correct the comment

---
 apps/openmw/mwgui/debugwindow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/debugwindow.cpp b/apps/openmw/mwgui/debugwindow.cpp
index 6fab0d6a24..d5b703d1fb 100644
--- a/apps/openmw/mwgui/debugwindow.cpp
+++ b/apps/openmw/mwgui/debugwindow.cpp
@@ -161,7 +161,7 @@ namespace MWGui
         std::string addition;
         const int64_t bufSize = sLogCircularBuffer.size();
         {
-            // Keep log object to stay keep the lock.
+            // Log object is only required for locking at this point.
             Log log(Debug::Debug);
             if (sLogStartIndex < sLogEndIndex)
                 addition = std::string(sLogCircularBuffer.data() + sLogStartIndex, sLogEndIndex - sLogStartIndex);

From f6943f9f6683d3ceed105c21d93b18c4dd989e15 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Mon, 6 Jun 2022 20:52:40 -0700
Subject: [PATCH 2588/2859] bind framebuffer when msaa enabled in transparent
 postpass

---
 apps/openmw/mwrender/transparentpass.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwrender/transparentpass.cpp b/apps/openmw/mwrender/transparentpass.cpp
index 8bb5713230..e5368e7f3e 100644
--- a/apps/openmw/mwrender/transparentpass.cpp
+++ b/apps/openmw/mwrender/transparentpass.cpp
@@ -63,10 +63,7 @@ namespace MWRender
 
             ext->glBlitFramebuffer(0, 0, tex->getTextureWidth(), tex->getTextureHeight(), 0, 0, tex->getTextureWidth(), tex->getTextureHeight(), GL_DEPTH_BUFFER_BIT, GL_NEAREST);
 
-            if (msaaFbo)
-                msaaFbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
-            else
-                fbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
+            msaaFbo ? msaaFbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER) : fbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
 
             // draws scene into primary attachments
             bin->drawImplementation(renderInfo, previous);
@@ -82,8 +79,7 @@ namespace MWRender
             bin->drawImplementation(renderInfo, previous);
             bin->setStateSet(restore);
 
-            if (!msaaFbo)
-                fbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
+            msaaFbo ? msaaFbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER) : fbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
         }
 
 }
\ No newline at end of file

From 952999153cf0c75ece3132734e08bd338612597f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Tue, 7 Jun 2022 16:59:44 +0300
Subject: [PATCH 2589/2859] Move statics into cpp and properly guard buffer
 from race conditions

---
 apps/openmw/mwgui/debugwindow.cpp | 14 +++++++++-----
 apps/openmw/mwgui/debugwindow.hpp |  6 ------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/apps/openmw/mwgui/debugwindow.cpp b/apps/openmw/mwgui/debugwindow.cpp
index d5b703d1fb..23c8dbfe2e 100644
--- a/apps/openmw/mwgui/debugwindow.cpp
+++ b/apps/openmw/mwgui/debugwindow.cpp
@@ -8,6 +8,8 @@
 #include <components/debug/debugging.hpp>
 #include <components/settings/settings.hpp>
 
+#include <mutex>
+
 #ifndef BT_NO_PROFILE
 
 namespace
@@ -103,9 +105,10 @@ namespace MWGui
 #endif
     }
 
-    std::vector<char> DebugWindow::sLogCircularBuffer;
-    int64_t DebugWindow::sLogStartIndex = 0;
-    int64_t DebugWindow::sLogEndIndex = 0;
+    static std::vector<char> sLogCircularBuffer;
+    static std::mutex sBufferMutex;
+    static int64_t sLogStartIndex;
+    static int64_t sLogEndIndex;
 
     void DebugWindow::startLogRecording()
     {
@@ -125,6 +128,7 @@ namespace MWGui
                 default: color = "#FFFFFF";
             }
             bool bufferOverflow = false;
+            std::lock_guard lock(sBufferMutex);
             const int64_t bufSize = sLogCircularBuffer.size();
             auto addChar = [&](char c)
             {
@@ -153,6 +157,8 @@ namespace MWGui
 
     void DebugWindow::updateLogView()
     {
+        std::lock_guard lock(sBufferMutex);
+
         if (!mLogView || sLogCircularBuffer.empty() || sLogStartIndex == sLogEndIndex)
             return;
         if (mLogView->isTextSelection())
@@ -161,8 +167,6 @@ namespace MWGui
         std::string addition;
         const int64_t bufSize = sLogCircularBuffer.size();
         {
-            // Log object is only required for locking at this point.
-            Log log(Debug::Debug);
             if (sLogStartIndex < sLogEndIndex)
                 addition = std::string(sLogCircularBuffer.data() + sLogStartIndex, sLogEndIndex - sLogStartIndex);
             else
diff --git a/apps/openmw/mwgui/debugwindow.hpp b/apps/openmw/mwgui/debugwindow.hpp
index dba7436bc3..9b8711137a 100644
--- a/apps/openmw/mwgui/debugwindow.hpp
+++ b/apps/openmw/mwgui/debugwindow.hpp
@@ -20,13 +20,7 @@ namespace MWGui
         void updateBulletProfile();
 
         MyGUI::TabControl* mTabControl;
-
         MyGUI::EditBox* mLogView;
-
-        static std::vector<char> sLogCircularBuffer;
-        static int64_t sLogStartIndex;
-        static int64_t sLogEndIndex;
-
         MyGUI::EditBox* mBulletProfilerEdit;
     };
 

From fa72e14d92f6389e9c23cbe76396d30065d2fcf5 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Tue, 7 Jun 2022 16:18:13 +0200
Subject: [PATCH 2590/2859] Keep the scripts settings page open

---
 apps/openmw/mwgui/settingswindow.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index 0063fb1778..5ba9460bd0 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -788,7 +788,7 @@ namespace MWGui
     void SettingsWindow::renderScriptSettings()
     {
         mScriptAdapter->detach();
-        mCurrentPage = -1;
+
         mScriptList->removeAllItems();
         mScriptView->setCanvasSize({0, 0});
 
@@ -824,6 +824,9 @@ namespace MWGui
         mScriptFilter->setVisible(!disabled);
         mScriptList->setVisible(!disabled);
         mScriptBox->setVisible(!disabled);
+
+        LuaUi::attachPageAt(mCurrentPage, mScriptAdapter);
+        mScriptView->setCanvasSize(mScriptAdapter->getSize());
     }
 
     void SettingsWindow::onScriptFilterChange(MyGUI::EditBox*)

From c5cdb0c27797281dfde72761baf2cc6554a86189 Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Sat, 28 May 2022 13:43:37 +0900
Subject: [PATCH 2591/2859] ffmpeg_decoder: signal EOF/errors on readPacket

openmw with ffmpeg 5 would hang in an infinite loop trying to read at end of
files in avformat_open_input()
avio_read() apparently now no longer handlers 0 as a return value to signal
EOF and we need ot explicitly return AVERROR_EOF; their documentation
explicitely states "For stream protocols, must never return 0 but rather
a proper AVERROR code." for avio_alloc_context's read_context.

Also fix the exception case to return AVERROR_UNKNOWN -- I assume we'd
otherwise get stuck there too, but I don't know what would trigger this
case.

Fixes #6631
---
 CHANGELOG.md                           | 1 +
 apps/openmw/mwsound/ffmpeg_decoder.cpp | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a427f1e7c1..21b9f4b761 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -109,6 +109,7 @@
     Bug #6606: Quests with multiple IDs cannot always be restarted
     Bug #6653: With default settings the in-game console doesn't fit into screen
     Bug #6655: Constant effect absorb attribute causes the game to break
+    Bug #6631: Fix ffmpeg avio API usage causing hangs in ffmpeg version 5
     Bug #6667: Pressing the Esc key while resting or waiting causes black screen.
     Bug #6670: Dialogue order is incorrect
     Bug #6680: object.cpp handles nodetree unsafely, memory access with dangling pointer
diff --git a/apps/openmw/mwsound/ffmpeg_decoder.cpp b/apps/openmw/mwsound/ffmpeg_decoder.cpp
index 0a9641635f..997b4e30c6 100644
--- a/apps/openmw/mwsound/ffmpeg_decoder.cpp
+++ b/apps/openmw/mwsound/ffmpeg_decoder.cpp
@@ -18,11 +18,14 @@ int FFmpeg_Decoder::readPacket(void *user_data, uint8_t *buf, int buf_size)
         std::istream& stream = *static_cast<FFmpeg_Decoder*>(user_data)->mDataStream;
         stream.clear();
         stream.read((char*)buf, buf_size);
-        return stream.gcount();
+        std::streamsize count = stream.gcount();
+        if (count == 0)
+            return AVERROR_EOF;
+        return count;
     }
     catch (std::exception& )
     {
-        return 0;
+        return AVERROR_UNKNOWN;
     }
 }
 

From 21f6e2e419db18cb6a938d3210f5b2abaf5686f0 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Wed, 8 Jun 2022 00:16:16 +0300
Subject: [PATCH 2592/2859] Encapsulate NIF transformations, round 2 (task
 #6709)

---
 CHANGELOG.md                          |  1 +
 components/nifosg/controller.cpp      | 63 +++++++--------------------
 components/nifosg/controller.hpp      |  4 +-
 components/nifosg/matrixtransform.cpp | 49 ++++++++++++++++++---
 components/nifosg/matrixtransform.hpp |  9 +++-
 5 files changed, 70 insertions(+), 56 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae1d9c5e2b..c0d0fd0369 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -169,6 +169,7 @@
     Task #6264: Remove the old classes in animation.cpp
     Task #6553: Simplify interpreter instruction registration
     Task #6564: Remove predefined data paths `data="?global?data"`, `data=./data`
+    Task #6709: Move KeyframeController transformation magic to NifOsg::MatrixTransform
 
 0.47.0
 ------
diff --git a/components/nifosg/controller.cpp b/components/nifosg/controller.cpp
index 91bd94c74f..3f9262797b 100644
--- a/components/nifosg/controller.cpp
+++ b/components/nifosg/controller.cpp
@@ -165,48 +165,17 @@ void KeyframeController::operator() (NifOsg::MatrixTransform* node, osg::NodeVis
 {
     if (hasInput())
     {
-        osg::Matrix mat = node->getMatrix();
-
         float time = getInputValue(nv);
 
-        Nif::Matrix3& rot = node->mRotationScale;
-
-        bool setRot = false;
-        if(!mRotations.empty())
-        {
-            mat.setRotate(mRotations.interpKey(time));
-            setRot = true;
-        }
+        if (!mRotations.empty())
+            node->setRotation(mRotations.interpKey(time));
         else if (!mXRotations.empty() || !mYRotations.empty() || !mZRotations.empty())
-        {
-            mat.setRotate(getXYZRotation(time));
-            setRot = true;
-        }
-        else
-        {
-            // no rotation specified, use the previous value
-            for (int i=0;i<3;++i)
-                for (int j=0;j<3;++j)
-                    mat(j,i) = rot.mValues[i][j]; // NB column/row major difference
-        }
-
-        if (setRot) // copy the new values back
-            for (int i=0;i<3;++i)
-                for (int j=0;j<3;++j)
-                    rot.mValues[i][j] = mat(j,i); // NB column/row major difference
-
-        float& scale = node->mScale;
-        if(!mScales.empty())
-            scale = mScales.interpKey(time);
-
-        for (int i=0;i<3;++i)
-            for (int j=0;j<3;++j)
-                mat(i,j) *= scale;
+            node->setRotation(getXYZRotation(time));
 
-        if(!mTranslations.empty())
-            mat.setTrans(mTranslations.interpKey(time));
-
-        node->setMatrix(mat);
+        if (!mScales.empty())
+            node->setScale(mScales.interpKey(time));
+        if (!mTranslations.empty())
+            node->setTranslation(mTranslations.interpKey(time));
     }
 
     traverse(node, nv);
@@ -396,14 +365,16 @@ void RollController::operator() (osg::MatrixTransform* node, osg::NodeVisitor* n
         mStartingTime = newTime;
 
         float value = mData.interpKey(getInputValue(nv));
-        osg::Matrix matrix = node->getMatrix();
 
         // Rotate around "roll" axis.
         // Note: in original game rotation speed is the framerate-dependent in a very tricky way.
         // Do not replicate this behaviour until we will really need it.
         // For now consider controller's current value as an angular speed in radians per 1/60 seconds.
-        matrix = osg::Matrix::rotate(value * duration * 60.f, 0, 0, 1) * matrix;
-        node->setMatrix(matrix);
+        node->preMult(osg::Matrix::rotate(value * duration * 60.f, 0, 0, 1));
+
+        // Note: doing it like this means RollControllers are not compatible with KeyframeControllers.
+        // KeyframeController currently wins the conflict.
+        // However unlikely that is, NetImmerse might combine the transformations somehow.
     }
 }
 
@@ -590,7 +561,7 @@ void ParticleSystemController::operator() (osgParticle::ParticleProcessor* node,
 }
 
 PathController::PathController(const PathController &copy, const osg::CopyOp &copyop)
-    : SceneUtil::NodeCallback<PathController, osg::MatrixTransform*>(copy, copyop)
+    : SceneUtil::NodeCallback<PathController, NifOsg::MatrixTransform*>(copy, copyop)
     , Controller(copy)
     , mPath(copy.mPath)
     , mPercent(copy.mPercent)
@@ -615,7 +586,7 @@ float PathController::getPercent(float time) const
     return percent;
 }
 
-void PathController::operator() (osg::MatrixTransform* node, osg::NodeVisitor* nv)
+void PathController::operator() (NifOsg::MatrixTransform* node, osg::NodeVisitor* nv)
 {
     if (mPath.empty() || mPercent.empty() || !hasInput())
     {
@@ -623,13 +594,9 @@ void PathController::operator() (osg::MatrixTransform* node, osg::NodeVisitor* n
         return;
     }
 
-    osg::Matrix mat = node->getMatrix();
-
     float time = getInputValue(nv);
     float percent = getPercent(time);
-    osg::Vec3f pos(mPath.interpKey(percent));
-    mat.setTrans(pos);
-    node->setMatrix(mat);
+    node->setTranslation(mPath.interpKey(percent));
 
     traverse(node, nv);
 }
diff --git a/components/nifosg/controller.hpp b/components/nifosg/controller.hpp
index acd96afd1e..8d461f0547 100644
--- a/components/nifosg/controller.hpp
+++ b/components/nifosg/controller.hpp
@@ -397,7 +397,7 @@ namespace NifOsg
         float mEmitStop;
     };
 
-    class PathController : public SceneUtil::NodeCallback<PathController, osg::MatrixTransform*>, public SceneUtil::Controller
+    class PathController : public SceneUtil::NodeCallback<PathController, NifOsg::MatrixTransform*>, public SceneUtil::Controller
     {
     public:
         PathController(const Nif::NiPathController* ctrl);
@@ -406,7 +406,7 @@ namespace NifOsg
 
         META_Object(NifOsg, PathController)
 
-        void operator() (osg::MatrixTransform*, osg::NodeVisitor*);
+        void operator() (NifOsg::MatrixTransform*, osg::NodeVisitor*);
 
     private:
         Vec3Interpolator mPath;
diff --git a/components/nifosg/matrixtransform.cpp b/components/nifosg/matrixtransform.cpp
index bc461b9c10..fcbea337b1 100644
--- a/components/nifosg/matrixtransform.cpp
+++ b/components/nifosg/matrixtransform.cpp
@@ -2,11 +2,6 @@
 
 namespace NifOsg
 {
-    MatrixTransform::MatrixTransform()
-        : osg::MatrixTransform()
-    {
-    }
-
     MatrixTransform::MatrixTransform(const Nif::Transformation &trafo)
         : osg::MatrixTransform(trafo.toMatrix())
         , mScale(trafo.scale)
@@ -20,4 +15,48 @@ namespace NifOsg
         , mRotationScale(copy.mRotationScale)
     {
     }
+
+    void MatrixTransform::setScale(float scale)
+    {
+        if (mScale == scale)
+            return;
+
+        // Rescale the node using the known decomposed rotation.
+        for (int i = 0; i < 3; ++i)
+            for (int j = 0; j < 3; ++j)
+                _matrix(i,j) = mRotationScale.mValues[j][i] * scale; // NB: column/row major difference
+
+        // Update the current decomposed scale.
+        mScale = scale;
+
+        _inverseDirty = true;
+        dirtyBound();
+    }
+
+    void MatrixTransform::setRotation(const osg::Quat &rotation)
+    {
+        // First override the rotation ignoring the scale.
+        _matrix.setRotate(rotation);
+        for (int i = 0; i < 3; ++i)
+        {
+            for (int j = 0; j < 3; ++j)
+            {
+                // Update the current decomposed rotation and restore the known scale.
+                mRotationScale.mValues[j][i] = _matrix(i,j); // NB: column/row major difference
+                _matrix(i,j) *= mScale;
+            }
+        }
+
+        _inverseDirty = true;
+        dirtyBound();
+    }
+
+    void MatrixTransform::setTranslation(const osg::Vec3f &translation)
+    {
+        // The translation is independent from the rotation and scale so we can apply it directly.
+        _matrix.setTrans(translation);
+
+        _inverseDirty = true;
+        dirtyBound();
+    }
 }
diff --git a/components/nifosg/matrixtransform.hpp b/components/nifosg/matrixtransform.hpp
index 975f71c622..24d24ba3fa 100644
--- a/components/nifosg/matrixtransform.hpp
+++ b/components/nifosg/matrixtransform.hpp
@@ -11,7 +11,7 @@ namespace NifOsg
     class MatrixTransform : public osg::MatrixTransform
     {
     public:
-        MatrixTransform();
+        MatrixTransform() = default;
         MatrixTransform(const Nif::Transformation &trafo);
         MatrixTransform(const MatrixTransform &copy, const osg::CopyOp &copyop);
 
@@ -24,6 +24,13 @@ namespace NifOsg
         // we store the scale and rotation components separately here.
         float mScale{0.f};
         Nif::Matrix3 mRotationScale;
+
+        // Utility methods to transform the node and keep these components up-to-date.
+        // The matrix's components should not be overridden manually or using preMult/postMult
+        // unless you're sure you know what you are doing.
+        void setScale(float scale);
+        void setRotation(const osg::Quat &rotation);
+        void setTranslation(const osg::Vec3f &translation);
     };
 
 }

From 339169b60a4ad1e7379f290dee63760b5deeb0c7 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 8 Jun 2022 15:35:35 +0200
Subject: [PATCH 2593/2859] make use of std::filesystem::absolute as
 ::system_complete was dropped from spec

---
 apps/openmw/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index e73dac113c..1c0d3b8a8d 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -208,7 +208,7 @@ namespace
 int runApplication(int argc, char *argv[])
 {
 #ifdef __APPLE__
-    std::filesystem::path binary_path = std::filesystem::system_complete(std::filesystem::path(argv[0]));
+    std::filesystem::path binary_path = std::filesystem::absolute(std::filesystem::path(argv[0]));
     std::filesystem::current_path(binary_path.parent_path());
     setenv("OSG_GL_TEXTURE_STORAGE", "OFF", 0);
 #endif

From a6b9ce9a7ab010b990a3bfc207540f281e5d1f4f Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 8 Jun 2022 15:43:57 +0200
Subject: [PATCH 2594/2859] remove macos11 build as it uses 6x times more CI
 minutes; expensive

---
 .gitlab-ci.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 667f007660..3e917bc141 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -330,14 +330,6 @@ Ubuntu_Clang_tests_Debug:
       - build/OpenMW-*.dmg
       - "build/**/*.log"
 
-macOS11_Xcode12:
-  extends: .MacOS
-  image: macos-11-xcode-12
-  cache:
-    key: macOS11_Xcode12.v1
-  variables:
-    CCACHE_SIZE: 3G
-
 macOS12_Xcode13:
   extends: .MacOS
   image: macos-12-xcode-13

From 63413fba3a70704955561552e84fd84e604e7d34 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Wed, 8 Jun 2022 19:05:13 +0000
Subject: [PATCH 2595/2859] reduce the number of builds, by a lot

---
 .gitlab-ci.yml | 71 ++++++++++++++++++++++++++------------------------
 1 file changed, 37 insertions(+), 34 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3e917bc141..2844768a0c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,6 @@
+default:
+  interruptible: true
+
 include:
   - template: Security/SAST.gitlab-ci.yml
 
@@ -23,7 +26,7 @@ variables:
     - linux
   image: ubuntu:focal
   rules:
-    - if: $CI_PIPELINE_SOURCE == "push"  
+    - if: $CI_PIPELINE_SOURCE == "push"
   
 
 .Ubuntu:
@@ -118,7 +121,7 @@ Ubuntu_GCC:
   # 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
 
-Ubuntu_GCC_tests:
+.Ubuntu_GCC_tests:
   extends: Ubuntu_GCC
   cache:
     key: Ubuntu_GCC_tests.v3
@@ -132,7 +135,7 @@ Ubuntu_GCC_tests:
     reports:
       junit: build/tests.xml
 
-Ubuntu_GCC_tests_Debug:
+.Ubuntu_GCC_tests_Debug:
   extends: Ubuntu_GCC
   cache:
     key: Ubuntu_GCC_tests_Debug.v2
@@ -148,7 +151,7 @@ Ubuntu_GCC_tests_Debug:
     reports:
       junit: build/tests.xml
 
-Ubuntu_GCC_tests_asan:
+.Ubuntu_GCC_tests_asan:
   extends: Ubuntu_GCC
   cache:
     key: Ubuntu_GCC_asan.v1
@@ -166,7 +169,7 @@ Ubuntu_GCC_tests_asan:
     reports:
       junit: build/tests.xml
 
-Ubuntu_GCC_tests_ubsan:
+.Ubuntu_GCC_tests_ubsan:
   extends: Ubuntu_GCC
   cache:
     key: Ubuntu_GCC_ubsan.v1
@@ -183,7 +186,7 @@ Ubuntu_GCC_tests_ubsan:
     reports:
       junit: build/tests.xml
 
-Ubuntu_GCC_tests_tsan:
+.Ubuntu_GCC_tests_tsan:
   extends: Ubuntu_GCC
   cache:
     key: Ubuntu_GCC_tsan.v1
@@ -201,8 +204,8 @@ Ubuntu_GCC_tests_tsan:
     reports:
       junit: build/tests.xml
 
-Ubuntu_GCC_tests_coverage:
-  extends: Ubuntu_GCC_tests_Debug
+.Ubuntu_GCC_tests_coverage:
+  extends: .Ubuntu_GCC_tests_Debug
   cache:
     key: Ubuntu_GCC_tests_coverage.v1
   variables:
@@ -220,10 +223,10 @@ Ubuntu_GCC_tests_coverage:
         path: coverage.xml
       junit: build/tests.xml
 
-Ubuntu_Static_Deps:
+.Ubuntu_Static_Deps:
   extends: Ubuntu_Clang
   rules:
-    - if: $CI_PIPELINE_SOURCE == "push"  
+    - if: $CI_PIPELINE_SOURCE == "push"
       changes:
         - "**/CMakeLists.txt"
         - "cmake/**/*"
@@ -244,8 +247,8 @@ Ubuntu_Static_Deps:
     CXXFLAGS: -O0
   timeout: 3h
 
-Ubuntu_Static_Deps_tests:
-  extends: Ubuntu_Static_Deps
+.Ubuntu_Static_Deps_tests:
+  extends: .Ubuntu_Static_Deps
   cache:
     key: Ubuntu_Static_Deps_tests.V1
   variables:
@@ -274,7 +277,7 @@ Ubuntu_Clang:
   # 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
 
-Ubuntu_Clang_tests:
+.Ubuntu_Clang_tests:
   extends: Ubuntu_Clang
   cache:
     key: Ubuntu_Clang_tests.v3
@@ -354,7 +357,7 @@ variables: &tests-targets
   tags:
     - windows
   rules:
-    - if: $CI_PIPELINE_SOURCE == "push"    
+    - if: $CI_PIPELINE_SOURCE == "push"
   before_script:
   - Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1"
   - choco source add -n=openmw-proxy -s="https://repo.openmw.org/repository/Chocolatey/" --priority=1
@@ -425,15 +428,15 @@ variables: &tests-targets
     - MSVC2019_64_Ninja/*/*/*/*/*/*/*/*.log
   # 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
-  
-Windows_Ninja_Engine_Release:
+
+.Windows_Ninja_Engine_Release:
   extends:
     - .Windows_Ninja_Base
   variables:
     <<: *engine-targets
     config: "Release"
 
-Windows_Ninja_Engine_Release_MultiView:
+.Windows_Ninja_Engine_Release_MultiView:
   extends:
     - .Windows_Ninja_Base
   variables:
@@ -441,42 +444,42 @@ Windows_Ninja_Engine_Release_MultiView:
     multiview: "-M"
     config: "Release"
 
-Windows_Ninja_Engine_Debug:
+.Windows_Ninja_Engine_Debug:
   extends:
     - .Windows_Ninja_Base
   variables:
     <<: *engine-targets
     config: "Debug"
 
-Windows_Ninja_Engine_RelWithDebInfo:
+.Windows_Ninja_Engine_RelWithDebInfo:
   extends:
     - .Windows_Ninja_Base
   variables:
     <<: *engine-targets
     config: "RelWithDebInfo"
 
-Windows_Ninja_CS_Release:
+.Windows_Ninja_CS_Release:
   extends:
     - .Windows_Ninja_Base
   variables:
     <<: *cs-targets
     config: "Release"
 
-Windows_Ninja_CS_Debug:
+.Windows_Ninja_CS_Debug:
   extends:
     - .Windows_Ninja_Base
   variables:
     <<: *cs-targets
     config: "Debug"
 
-Windows_Ninja_CS_RelWithDebInfo:
+.Windows_Ninja_CS_RelWithDebInfo:
   extends:
     - .Windows_Ninja_Base
   variables:
     <<: *cs-targets
     config: "RelWithDebInfo"
 
-Windows_Ninja_Tests_RelWithDebInfo:
+.Windows_Ninja_Tests_RelWithDebInfo:
   extends: .Windows_Ninja_Base
   stage: build
   variables:
@@ -492,7 +495,7 @@ Windows_Ninja_Tests_RelWithDebInfo:
   tags:
     - windows
   rules:
-    - if: $CI_PIPELINE_SOURCE == "push"    
+    - if: $CI_PIPELINE_SOURCE == "push"
   before_script:
   - Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1"
   - choco source add -n=openmw-proxy -s="https://repo.openmw.org/repository/Chocolatey/" --priority=1
@@ -562,7 +565,7 @@ Windows_Ninja_Tests_RelWithDebInfo:
   # 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
 
-Windows_MSBuild_Engine_Release:
+.Windows_MSBuild_Engine_Release:
   extends:
     - .Windows_MSBuild_Base
   variables:
@@ -571,9 +574,9 @@ Windows_MSBuild_Engine_Release:
   rules:
     # run this for both pushes and schedules so 'latest successful pipeline for branch' always includes it
     - if: $CI_PIPELINE_SOURCE == "push"
-    - if: $CI_PIPELINE_SOURCE == "schedule" 
+    - if: $CI_PIPELINE_SOURCE == "schedule"
 
-Windows_MSBuild_Engine_Debug:
+.Windows_MSBuild_Engine_Debug:
   extends:
     - .Windows_MSBuild_Base
   variables:
@@ -587,7 +590,7 @@ Windows_MSBuild_Engine_RelWithDebInfo:
     <<: *engine-targets
     config: "RelWithDebInfo"
 
-Windows_MSBuild_CS_Release:
+.Windows_MSBuild_CS_Release:
   extends:
     - .Windows_MSBuild_Base
   variables:
@@ -596,23 +599,23 @@ Windows_MSBuild_CS_Release:
   rules:
     # run this for both pushes and schedules so 'latest successful pipeline for branch' always includes it
     - if: $CI_PIPELINE_SOURCE == "push"
-    - if: $CI_PIPELINE_SOURCE == "schedule" 
+    - if: $CI_PIPELINE_SOURCE == "schedule"
 
-Windows_MSBuild_CS_Debug:
+.Windows_MSBuild_CS_Debug:
   extends:
     - .Windows_MSBuild_Base
   variables:
     <<: *cs-targets
     config: "Debug"
 
-Windows_MSBuild_CS_RelWithDebInfo:
+.Windows_MSBuild_CS_RelWithDebInfo:
   extends:
     - .Windows_MSBuild_Base
   variables:
     <<: *cs-targets
     config: "RelWithDebInfo"
 
-Windows_MSBuild_Tests_RelWithDebInfo:
+.Windows_MSBuild_Tests_RelWithDebInfo:
   extends: .Windows_MSBuild_Base
   stage: build
   variables:
@@ -629,7 +632,7 @@ Ubuntu_AndroidNDK_arm64-v8a:
     - linux
   image: psi29a/android-ndk:focal-ndk22
   rules:
-    - if: $CI_PIPELINE_SOURCE == "push"  
+    - if: $CI_PIPELINE_SOURCE == "push"
   variables:
     CCACHE_SIZE: 3G
   cache:
@@ -667,7 +670,7 @@ Ubuntu_AndroidNDK_arm64-v8a:
   # 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
 
-FindMissingMergeRequests:
+.FindMissingMergeRequests:
   image: python:latest
   stage: build
   rules:

From 4d74f8137cc5876f5819151592db367c6817c2d4 Mon Sep 17 00:00:00 2001
From: Matt <3397065-ZehMatt@users.noreply.gitlab.com>
Date: Thu, 9 Jun 2022 20:43:53 +0000
Subject: [PATCH 2596/2859] Use vector for EffectManager effects

---
 apps/openmw/mwrender/effectmanager.cpp | 33 ++++++++++++++------------
 apps/openmw/mwrender/effectmanager.hpp | 10 ++++----
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/apps/openmw/mwrender/effectmanager.cpp b/apps/openmw/mwrender/effectmanager.cpp
index d5d01a5e41..5513765dcd 100644
--- a/apps/openmw/mwrender/effectmanager.cpp
+++ b/apps/openmw/mwrender/effectmanager.cpp
@@ -11,6 +11,8 @@
 #include "vismask.hpp"
 #include "util.hpp"
 
+#include <algorithm>
+
 namespace MWRender
 {
 
@@ -43,6 +45,8 @@ void EffectManager::addEffect(const std::string &model, const std::string& textu
     trans->setScale(osg::Vec3f(scale, scale, scale));
     trans->addChild(node);
 
+    effect.mTransform = trans;
+
     SceneUtil::AssignControllerSourcesVisitor assignVisitor(effect.mAnimTime);
     node->accept(assignVisitor);
 
@@ -53,30 +57,29 @@ void EffectManager::addEffect(const std::string &model, const std::string& textu
 
     mParentNode->addChild(trans);
 
-    mEffects[trans] = effect;
+    mEffects.push_back(std::move(effect));
 }
 
 void EffectManager::update(float dt)
 {
-    for (EffectMap::iterator it = mEffects.begin(); it != mEffects.end(); )
-    {
-        it->second.mAnimTime->addTime(dt);
-
-        if (it->second.mAnimTime->getTime() >= it->second.mMaxControllerLength)
-        {
-            mParentNode->removeChild(it->first);
-            mEffects.erase(it++);
-        }
-        else
-            ++it;
-    }
+    mEffects.erase(
+        std::remove_if(
+            mEffects.begin(), 
+            mEffects.end(), 
+            [dt](Effect& effect)
+            {
+                effect.mAnimTime->addTime(dt);
+                return effect.mAnimTime->getTime() >= effect.mMaxControllerLength;
+            }), 
+        mEffects.end()
+    );
 }
 
 void EffectManager::clear()
 {
-    for (EffectMap::iterator it = mEffects.begin(); it != mEffects.end(); ++it)
+    for(const auto& effect : mEffects)
     {
-        mParentNode->removeChild(it->first);
+        mParentNode->removeChild(effect.mTransform);
     }
     mEffects.clear();
 }
diff --git a/apps/openmw/mwrender/effectmanager.hpp b/apps/openmw/mwrender/effectmanager.hpp
index 5873c00dd8..0d94a63c8f 100644
--- a/apps/openmw/mwrender/effectmanager.hpp
+++ b/apps/openmw/mwrender/effectmanager.hpp
@@ -1,9 +1,9 @@
 #ifndef OPENMW_MWRENDER_EFFECTMANAGER_H
 #define OPENMW_MWRENDER_EFFECTMANAGER_H
 
-#include <map>
 #include <memory>
 #include <string>
+#include <vector>
 
 #include <osg/ref_ptr>
 
@@ -29,6 +29,7 @@ namespace MWRender
     {
     public:
         EffectManager(osg::ref_ptr<osg::Group> parent, Resource::ResourceSystem* resourceSystem);
+        EffectManager(const EffectManager&) = delete;
         ~EffectManager();
 
         /// Add an effect. When it's finished playing, it will be removed automatically.
@@ -44,16 +45,13 @@ namespace MWRender
         {
             float mMaxControllerLength;
             std::shared_ptr<EffectAnimationTime> mAnimTime;
+            osg::ref_ptr<osg::PositionAttitudeTransform> mTransform;
         };
 
-        typedef std::map<osg::ref_ptr<osg::PositionAttitudeTransform>, Effect> EffectMap;
-        EffectMap mEffects;
+        std::vector<Effect> mEffects;
 
         osg::ref_ptr<osg::Group> mParentNode;
         Resource::ResourceSystem* mResourceSystem;
-
-        EffectManager(const EffectManager&);
-        void operator=(const EffectManager&);
     };
 
 }

From 92b9e9269df0ad840ccb7f9167a5cc80efc6c6f7 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 10 Jun 2022 01:37:34 +0200
Subject: [PATCH 2597/2859] Run sast jobs in parallel with build jobs

---
 .gitlab-ci.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2844768a0c..88a82358a1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,8 +7,8 @@ include:
 # Note: We set `needs` on each job to control the job DAG.
 # See https://docs.gitlab.com/ee/ci/yaml/#needs
 stages:
-  - test
   - build
+  - test
 
 # https://blog.nimbleways.com/let-s-make-faster-gitlab-ci-cd-pipelines/
 variables:
@@ -20,6 +20,12 @@ variables:
   SAST_EXCLUDED_ANALYZERS: "bandit"
   SAST_EXCLUDED_PATHS: "extern"
 
+sast:
+  tags:
+    - docker
+    - linux
+  needs: []
+
 .Ubuntu_Image:
   tags:
     - docker

From 9559feaa9058dd80b6f2e053c1f4393b5ca1a268 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Fri, 10 Jun 2022 22:59:01 +0300
Subject: [PATCH 2598/2859] Fix effects not being removed from scene graph

---
 apps/openmw/mwrender/effectmanager.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwrender/effectmanager.cpp b/apps/openmw/mwrender/effectmanager.cpp
index 5513765dcd..371f488c3d 100644
--- a/apps/openmw/mwrender/effectmanager.cpp
+++ b/apps/openmw/mwrender/effectmanager.cpp
@@ -66,10 +66,13 @@ void EffectManager::update(float dt)
         std::remove_if(
             mEffects.begin(), 
             mEffects.end(), 
-            [dt](Effect& effect)
+            [dt, this](Effect& effect)
             {
                 effect.mAnimTime->addTime(dt);
-                return effect.mAnimTime->getTime() >= effect.mMaxControllerLength;
+                const auto remove = effect.mAnimTime->getTime() >= effect.mMaxControllerLength;
+                if (remove)
+                    mParentNode->removeChild(effect.mTransform);
+                return remove;
             }), 
         mEffects.end()
     );

From 788de7edcb45b14ca6ee9bc2d88663e0e39cdff4 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Sat, 11 Jun 2022 00:40:14 +0300
Subject: [PATCH 2599/2859] Initialize most of CharacterController in-class

See C++ Core Guidelines C.48
---
 apps/openmw/mwmechanics/character.cpp | 21 --------------
 apps/openmw/mwmechanics/character.hpp | 40 +++++++++++++--------------
 2 files changed, 20 insertions(+), 41 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 209229efc5..21029b6605 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -842,28 +842,7 @@ std::string CharacterController::chooseRandomAttackAnimation() const
 
 CharacterController::CharacterController(const MWWorld::Ptr &ptr, MWRender::Animation *anim)
     : mPtr(ptr)
-    , mWeapon(MWWorld::Ptr())
     , mAnimation(anim)
-    , mIdleState(CharState_None)
-    , mMovementState(CharState_None)
-    , mMovementAnimSpeed(0.f)
-    , mAdjustMovementAnimSpeed(false)
-    , mHasMovedInXY(false)
-    , mMovementAnimationControlled(true)
-    , mDeathState(CharState_None)
-    , mFloatToSurface(true)
-    , mHitState(CharState_None)
-    , mUpperBodyState(UpperCharState_Nothing)
-    , mJumpState(JumpState_None)
-    , mWeaponType(ESM::Weapon::None)
-    , mAttackStrength(0.f)
-    , mSkipAnim(false)
-    , mSecondsOfSwimming(0)
-    , mSecondsOfRunning(0)
-    , mTurnAnimationThreshold(0)
-    , mCastingManualSpell(false)
-    , mTimeUntilWake(0.f)
-    , mIsMovingBackward(false)
 {
     if(!mAnimation)
         return;
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index 38f7a48a2b..2f50f56c58 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -149,50 +149,50 @@ class CharacterController : public MWRender::Animation::TextKeyListener
     typedef std::deque<AnimationQueueEntry> AnimationQueue;
     AnimationQueue mAnimQueue;
 
-    CharacterState mIdleState;
+    CharacterState mIdleState{CharState_None};
     std::string mCurrentIdle;
 
-    CharacterState mMovementState;
+    CharacterState mMovementState{CharState_None};
     std::string mCurrentMovement;
-    float mMovementAnimSpeed;
-    bool mAdjustMovementAnimSpeed;
-    bool mHasMovedInXY;
-    bool mMovementAnimationControlled;
+    float mMovementAnimSpeed{0.f};
+    bool mAdjustMovementAnimSpeed{false};
+    bool mHasMovedInXY{false};
+    bool mMovementAnimationControlled{true};
 
-    CharacterState mDeathState;
+    CharacterState mDeathState{CharState_None};
     std::string mCurrentDeath;
-    bool mFloatToSurface;
+    bool mFloatToSurface{true};
 
-    CharacterState mHitState;
+    CharacterState mHitState{CharState_None};
     std::string mCurrentHit;
 
-    UpperBodyCharacterState mUpperBodyState;
+    UpperBodyCharacterState mUpperBodyState{UpperCharState_Nothing};
 
-    JumpingState mJumpState;
+    JumpingState mJumpState{JumpState_None};
     std::string mCurrentJump;
 
-    int mWeaponType;
+    int mWeaponType{ESM::Weapon::None};
     std::string mCurrentWeapon;
 
-    float mAttackStrength;
+    float mAttackStrength{0.f};
 
-    bool mSkipAnim;
+    bool mSkipAnim{false};
 
     // counted for skill increase
-    float mSecondsOfSwimming;
-    float mSecondsOfRunning;
+    float mSecondsOfSwimming{0.f};
+    float mSecondsOfRunning{0.f};
 
     MWWorld::ConstPtr mHeadTrackTarget;
 
-    float mTurnAnimationThreshold; // how long to continue playing turning animation after actor stopped turning
+    float mTurnAnimationThreshold{0.f}; // how long to continue playing turning animation after actor stopped turning
 
     std::string mAttackType; // slash, chop or thrust
 
-    bool mCastingManualSpell;
+    bool mCastingManualSpell{false};
 
-    float mTimeUntilWake;
+    float mTimeUntilWake{0.f};
 
-    bool mIsMovingBackward;
+    bool mIsMovingBackward{false};
     osg::Vec2f mSmoothedSpeed;
 
     void setAttackTypeBasedOnMovement();

From 97d4206a3dc232540d4cc0dfdbe6ee86f8cd6d0f Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Sat, 11 Jun 2022 02:08:43 +0300
Subject: [PATCH 2600/2859] Improve CharacterController const-correctness

C++ Core Guidelines Con. 2
---
 apps/openmw/mwmechanics/aicombat.cpp  |  2 +-
 apps/openmw/mwmechanics/character.cpp | 56 +++++++++++++--------------
 apps/openmw/mwmechanics/character.hpp | 32 +++++++--------
 3 files changed, 44 insertions(+), 46 deletions(-)

diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index a3e7cb6a26..38bd9ed4b5 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -703,7 +703,7 @@ std::string chooseBestAttack(const ESM::Weapon* weapon)
             attackType = "chop";
     }
     else
-        MWMechanics::CharacterController::setAttackTypeRandomly(attackType);
+        attackType = MWMechanics::CharacterController::getRandomAttackType();
 
     return attackType;
 }
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 21029b6605..312a325cc1 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -385,7 +385,7 @@ void CharacterController::refreshJumpAnims(const std::string& weapShortGroup, Ju
     }
 }
 
-bool CharacterController::onOpen()
+bool CharacterController::onOpen() const
 {
     if (mPtr.getType() == ESM::Container::sRecordId)
     {
@@ -406,7 +406,7 @@ bool CharacterController::onOpen()
     return true;
 }
 
-void CharacterController::onClose()
+void CharacterController::onClose() const
 {
     if (mPtr.getType() == ESM::Container::sRecordId)
     {
@@ -445,7 +445,7 @@ std::string CharacterController::getWeaponAnimation(int weaponType) const
     return weaponGroup;
 }
 
-std::string CharacterController::fallbackShortWeaponGroup(const std::string& baseGroupName, MWRender::Animation::BlendMask* blendMask)
+std::string CharacterController::fallbackShortWeaponGroup(const std::string& baseGroupName, MWRender::Animation::BlendMask* blendMask) const
 {
     bool isRealWeapon = mWeaponType != ESM::Weapon::HandToHand && mWeaponType != ESM::Weapon::Spell && mWeaponType != ESM::Weapon::None;
     if (!isRealWeapon)
@@ -1072,7 +1072,7 @@ void CharacterController::updatePtr(const MWWorld::Ptr &ptr)
     mPtr = ptr;
 }
 
-void CharacterController::updateIdleStormState(bool inwater)
+void CharacterController::updateIdleStormState(bool inwater) const
 {
     if (!mAnimation->hasAnimation("idlestorm") || mUpperBodyState != UpperCharState_Nothing || inwater)
     {
@@ -1527,12 +1527,12 @@ bool CharacterController::updateState(CharacterState idle)
                             else
                             {
                                 // There is no "best attack" for Hand-to-Hand
-                                setAttackTypeRandomly(mAttackType);
+                                mAttackType = getRandomAttackType();
                             }
                         }
                         else
                         {
-                            setAttackTypeBasedOnMovement();
+                            mAttackType = getMovementBasedAttackType();
                         }
                     }
                     // else if (mPtr != getPlayer()) use mAttackType set by AiCombat
@@ -2361,7 +2361,7 @@ void CharacterController::update(float duration)
     mAnimation->enableHeadAnimation(cls.isActor() && !cls.getCreatureStats(mPtr).isDead());
 }
 
-void CharacterController::persistAnimationState()
+void CharacterController::persistAnimationState() const
 {
     ESM::AnimationState& state = mPtr.getRefData().getAnimationState();
 
@@ -2497,18 +2497,18 @@ void CharacterController::skipAnim()
     mSkipAnim = true;
 }
 
-bool CharacterController::isPersistentAnimPlaying()
+bool CharacterController::isPersistentAnimPlaying() const
 {
     if (!mAnimQueue.empty())
     {
-        AnimationQueueEntry& first = mAnimQueue.front();
+        const AnimationQueueEntry& first = mAnimQueue.front();
         return first.mPersist && isAnimPlaying(first.mGroup);
     }
 
     return false;
 }
 
-bool CharacterController::isAnimPlaying(const std::string &groupName)
+bool CharacterController::isAnimPlaying(const std::string &groupName) const
 {
     if(mAnimation == nullptr)
         return false;
@@ -2589,7 +2589,7 @@ void CharacterController::resurrect()
     mWeaponType = ESM::Weapon::None;
 }
 
-void CharacterController::updateContinuousVfx()
+void CharacterController::updateContinuousVfx() const
 {
     // Keeping track of when to stop a continuous VFX seems to be very difficult to do inside the spells code,
     // as it's extremely spread out (ActiveSpells, Spells, InventoryStore effects, etc...) so we do it here.
@@ -2606,7 +2606,7 @@ void CharacterController::updateContinuousVfx()
     }
 }
 
-void CharacterController::updateMagicEffects()
+void CharacterController::updateMagicEffects() const
 {
     if (!mPtr.getClass().isActor())
         return;
@@ -2622,7 +2622,7 @@ void CharacterController::updateMagicEffects()
     mAnimation->setVampire(vampire);
 }
 
-void CharacterController::setVisibility(float visibility)
+void CharacterController::setVisibility(float visibility) const
 {
     // We should take actor's invisibility in account
     if (mPtr.getClass().isActor())
@@ -2648,18 +2648,17 @@ void CharacterController::setVisibility(float visibility)
     mAnimation->setAlpha(visibility);
 }
 
-void CharacterController::setAttackTypeBasedOnMovement()
+std::string CharacterController::getMovementBasedAttackType() const
 {
     float *move = mPtr.getClass().getMovementSettings(mPtr).mPosition;
     if (std::abs(move[1]) > std::abs(move[0]) + 0.2f) // forward-backward
-        mAttackType = "thrust";
-    else if (std::abs(move[0]) > std::abs(move[1]) + 0.2f) // sideway
-        mAttackType = "slash";
-    else
-        mAttackType = "chop";
+        return "thrust";
+    if (std::abs(move[0]) > std::abs(move[1]) + 0.2f) // sideway
+        return "slash";
+    return "chop";
 }
 
-bool CharacterController::isRandomAttackAnimation(const std::string& group) const
+bool CharacterController::isRandomAttackAnimation(const std::string& group)
 {
     return (group == "attack1" || group == "swimattack1" ||
             group == "attack2" || group == "swimattack2" ||
@@ -2753,16 +2752,15 @@ void CharacterController::setAIAttackType(const std::string& attackType)
     mAttackType = attackType;
 }
 
-void CharacterController::setAttackTypeRandomly(std::string& attackType)
+std::string CharacterController::getRandomAttackType()
 {
     MWBase::World* world = MWBase::Environment::get().getWorld();
     float random = Misc::Rng::rollProbability(world->getPrng());
     if (random >= 2/3.f)
-        attackType = "thrust";
-    else if (random >= 1/3.f)
-        attackType = "slash";
-    else
-        attackType = "chop";
+        return "thrust";
+    if (random >= 1/3.f)
+        return "slash";
+    return "chop";
 }
 
 bool CharacterController::readyToPrepareAttack() const
@@ -2784,12 +2782,12 @@ float CharacterController::getAttackStrength() const
     return mAttackStrength;
 }
 
-bool CharacterController::getAttackingOrSpell()
+bool CharacterController::getAttackingOrSpell() const
 {
     return mPtr.getClass().getCreatureStats(mPtr).getAttackingOrSpell();
 }
 
-void CharacterController::setActive(int active)
+void CharacterController::setActive(int active) const
 {
     mAnimation->setActive(active);
 }
@@ -2799,7 +2797,7 @@ void CharacterController::setHeadTrackTarget(const MWWorld::ConstPtr &target)
     mHeadTrackTarget = target;
 }
 
-void CharacterController::playSwishSound(float attackStrength)
+void CharacterController::playSwishSound(float attackStrength) const
 {
     MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
 
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index 2f50f56c58..abbc04f8f9 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -195,7 +195,7 @@ class CharacterController : public MWRender::Animation::TextKeyListener
     bool mIsMovingBackward{false};
     osg::Vec2f mSmoothedSpeed;
 
-    void setAttackTypeBasedOnMovement();
+    std::string getMovementBasedAttackType() const;
 
     void refreshCurrentAnims(CharacterState idle, CharacterState movement, JumpingState jump, bool force=false);
     void refreshHitRecoilAnims(CharacterState& idle);
@@ -206,18 +206,18 @@ class CharacterController : public MWRender::Animation::TextKeyListener
     void clearAnimQueue(bool clearPersistAnims = false);
 
     bool updateState(CharacterState idle);
-    void updateIdleStormState(bool inwater);
+    void updateIdleStormState(bool inwater) const;
 
     std::string chooseRandomAttackAnimation() const;
-    bool isRandomAttackAnimation(const std::string& group) const;
+    static bool isRandomAttackAnimation(const std::string& group);
 
-    bool isPersistentAnimPlaying();
+    bool isPersistentAnimPlaying() const;
 
     void updateAnimQueue();
 
     void updateHeadTracking(float duration);
 
-    void updateMagicEffects();
+    void updateMagicEffects() const;
 
     void playDeath(float startpoint, CharacterState death);
     CharacterState chooseRandomDeathState() const;
@@ -229,11 +229,11 @@ class CharacterController : public MWRender::Animation::TextKeyListener
 
     bool updateCarriedLeftVisible(int weaptype) const;
 
-    std::string fallbackShortWeaponGroup(const std::string& baseGroupName, MWRender::Animation::BlendMask* blendMask = nullptr);
+    std::string fallbackShortWeaponGroup(const std::string& baseGroupName, MWRender::Animation::BlendMask* blendMask = nullptr) const;
 
     std::string getWeaponAnimation(int weaponType) const;
 
-    bool getAttackingOrSpell();
+    bool getAttackingOrSpell() const;
     void setAttackingOrSpell(bool attackingOrSpell);
 
 
@@ -249,21 +249,21 @@ public:
     void handleTextKey(const std::string &groupname, SceneUtil::TextKeyMap::ConstIterator key, const SceneUtil::TextKeyMap& map) override;
 
     // Be careful when to call this, see comment in Actors
-    void updateContinuousVfx();
+    void updateContinuousVfx() const;
 
     void updatePtr(const MWWorld::Ptr &ptr);
 
     void update(float duration);
 
-    bool onOpen();
-    void onClose();
+    bool onOpen() const;
+    void onClose() const;
 
-    void persistAnimationState();
+    void persistAnimationState() const;
     void unpersistAnimationState();
 
     bool playGroup(const std::string &groupname, int mode, int count, bool persist=false);
     void skipAnim();
-    bool isAnimPlaying(const std::string &groupName);
+    bool isAnimPlaying(const std::string &groupName) const;
 
     enum KillResult
     {
@@ -291,10 +291,10 @@ public:
     bool isTurning() const;
     bool isAttackingOrSpell() const;
 
-    void setVisibility(float visibility);
+    void setVisibility(float visibility) const;
     void castSpell(const std::string& spellId, bool manualSpell=false);
     void setAIAttackType(const std::string& attackType);
-    static void setAttackTypeRandomly(std::string& attackType);
+    static std::string getRandomAttackType();
 
     bool readyToPrepareAttack() const;
     bool readyToStartAttack() const;
@@ -302,12 +302,12 @@ public:
     float getAttackStrength() const;
 
     /// @see Animation::setActive
-    void setActive(int active);
+    void setActive(int active) const;
 
     /// Make this character turn its head towards \a target. To turn off head tracking, pass an empty Ptr.
     void setHeadTrackTarget(const MWWorld::ConstPtr& target);
 
-    void playSwishSound(float attackStrength);
+    void playSwishSound(float attackStrength) const;
 };
 }
 

From 93068d71ea78501f64ca2f13491d5ba1a9d933c0 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Sat, 11 Jun 2022 03:12:43 +0300
Subject: [PATCH 2601/2859] Use std::string_view whenever reasonable in
 CharacterController

C++ Core Guidelines SL.str.2
---
 apps/openmw/mwmechanics/character.cpp | 14 ++++++++------
 apps/openmw/mwmechanics/character.hpp |  4 ++--
 apps/openmw/mwrender/animation.hpp    |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 312a325cc1..1922a87dab 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -928,9 +928,9 @@ CharacterController::~CharacterController()
     }
 }
 
-void CharacterController::handleTextKey(const std::string &groupname, SceneUtil::TextKeyMap::ConstIterator key, const SceneUtil::TextKeyMap& map)
+void CharacterController::handleTextKey(std::string_view groupname, SceneUtil::TextKeyMap::ConstIterator key, const SceneUtil::TextKeyMap& map)
 {
-    const std::string &evt = key->second;
+    std::string_view evt = key->second;
 
     if(evt.compare(0, 7, "sound: ") == 0)
     {
@@ -942,7 +942,7 @@ void CharacterController::handleTextKey(const std::string &groupname, SceneUtil:
     auto& charClass = mPtr.getClass();
     if(evt.compare(0, 10, "soundgen: ") == 0)
     {
-        std::string soundgen = evt.substr(10);
+        std::string soundgen = std::string(evt.substr(10));
 
         // The event can optionally contain volume and pitch modifiers
         float volume=1.f, pitch=1.f;
@@ -1022,16 +1022,18 @@ void CharacterController::handleTextKey(const std::string &groupname, SceneUtil:
     {
         std::multimap<float, std::string>::const_iterator hitKey = key;
 
+        std::string hitKeyName = std::string(groupname) + ": hit";
+        std::string stopKeyName = std::string(groupname) + ": stop";
         // Not all animations have a hit key defined. If there is none, the hit happens with the start key.
         bool hasHitKey = false;
         while (hitKey != map.end())
         {
-            if (hitKey->second == groupname + ": hit")
+            if (hitKey->second == hitKeyName)
             {
                 hasHitKey = true;
                 break;
             }
-            if (hitKey->second == groupname + ": stop")
+            if (hitKey->second == stopKeyName)
                 break;
             ++hitKey;
         }
@@ -2658,7 +2660,7 @@ std::string CharacterController::getMovementBasedAttackType() const
     return "chop";
 }
 
-bool CharacterController::isRandomAttackAnimation(const std::string& group)
+bool CharacterController::isRandomAttackAnimation(std::string_view group)
 {
     return (group == "attack1" || group == "swimattack1" ||
             group == "attack2" || group == "swimattack2" ||
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index abbc04f8f9..ac53dd4d45 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -209,7 +209,7 @@ class CharacterController : public MWRender::Animation::TextKeyListener
     void updateIdleStormState(bool inwater) const;
 
     std::string chooseRandomAttackAnimation() const;
-    static bool isRandomAttackAnimation(const std::string& group);
+    static bool isRandomAttackAnimation(std::string_view group);
 
     bool isPersistentAnimPlaying() const;
 
@@ -246,7 +246,7 @@ public:
 
     const MWWorld::Ptr& getPtr() const { return mPtr; }
 
-    void handleTextKey(const std::string &groupname, SceneUtil::TextKeyMap::ConstIterator key, const SceneUtil::TextKeyMap& map) override;
+    void handleTextKey(std::string_view groupname, SceneUtil::TextKeyMap::ConstIterator key, const SceneUtil::TextKeyMap& map) override;
 
     // Be careful when to call this, see comment in Actors
     void updateContinuousVfx() const;
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index 1bad0f8d95..ed1ddb78d2 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -149,7 +149,7 @@ public:
     class TextKeyListener
     {
     public:
-        virtual void handleTextKey(const std::string &groupname, SceneUtil::TextKeyMap::ConstIterator key,
+        virtual void handleTextKey(std::string_view groupname, SceneUtil::TextKeyMap::ConstIterator key,
                                    const SceneUtil::TextKeyMap& map) = 0;
 
         virtual ~TextKeyListener() = default;

From d4d4304f1e2187643f16d16e9cd93214f3e5c919 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Sat, 11 Jun 2022 03:21:14 +0300
Subject: [PATCH 2602/2859] Fix walk animation fallback replace call

---
 apps/openmw/mwmechanics/character.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 1922a87dab..013d158661 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -561,7 +561,7 @@ void CharacterController::refreshMovementAnims(const std::string& weapShortGroup
                     std::string::size_type runpos = movementAnimName.find("run");
                     if (runpos != std::string::npos)
                     {
-                        movementAnimName.replace(runpos, runpos+3, "walk");
+                        movementAnimName.replace(runpos, 3, "walk");
                         if (!mAnimation->hasAnimation(movementAnimName))
                             movementAnimName.clear();
                     }

From 45e6add5f554e66dd93cd825093de04fc2c18b43 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Sat, 11 Jun 2022 03:24:01 +0300
Subject: [PATCH 2603/2859] Optimize clearAnimQueue(true)

---
 apps/openmw/mwmechanics/character.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 013d158661..471ec7b5f4 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -2523,9 +2523,15 @@ void CharacterController::clearAnimQueue(bool clearPersistAnims)
     if ((!isPersistentAnimPlaying() || clearPersistAnims) && !mAnimQueue.empty())
         mAnimation->disable(mAnimQueue.front().mGroup);
 
+    if (clearPersistAnims)
+    {
+        mAnimQueue.clear();
+        return;
+    }
+
     for (AnimationQueue::iterator it = mAnimQueue.begin(); it != mAnimQueue.end();)
     {
-        if (clearPersistAnims || !it->mPersist)
+        if (!it->mPersist)
             it = mAnimQueue.erase(it);
         else
             ++it;

From dd758f8fd10226239ea58b3ff07d04cffff2a774 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Sat, 11 Jun 2022 05:44:35 +0300
Subject: [PATCH 2604/2859] Always update the current matrix in
 KeyframeController

---
 components/nifosg/controller.cpp      |  3 +++
 components/nifosg/matrixtransform.cpp | 26 +++++++++++++++++++-------
 components/nifosg/matrixtransform.hpp |  1 +
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/components/nifosg/controller.cpp b/components/nifosg/controller.cpp
index 3f9262797b..beb47ddd76 100644
--- a/components/nifosg/controller.cpp
+++ b/components/nifosg/controller.cpp
@@ -171,9 +171,12 @@ void KeyframeController::operator() (NifOsg::MatrixTransform* node, osg::NodeVis
             node->setRotation(mRotations.interpKey(time));
         else if (!mXRotations.empty() || !mYRotations.empty() || !mZRotations.empty())
             node->setRotation(getXYZRotation(time));
+        else
+            node->setRotation(node->mRotationScale);
 
         if (!mScales.empty())
             node->setScale(mScales.interpKey(time));
+
         if (!mTranslations.empty())
             node->setTranslation(mTranslations.interpKey(time));
     }
diff --git a/components/nifosg/matrixtransform.cpp b/components/nifosg/matrixtransform.cpp
index fcbea337b1..2170c84e5c 100644
--- a/components/nifosg/matrixtransform.cpp
+++ b/components/nifosg/matrixtransform.cpp
@@ -18,16 +18,13 @@ namespace NifOsg
 
     void MatrixTransform::setScale(float scale)
     {
-        if (mScale == scale)
-            return;
+        // Update the decomposed scale.
+        mScale = scale;
 
-        // Rescale the node using the known decomposed rotation.
+        // Rescale the node using the known components.
         for (int i = 0; i < 3; ++i)
             for (int j = 0; j < 3; ++j)
-                _matrix(i,j) = mRotationScale.mValues[j][i] * scale; // NB: column/row major difference
-
-        // Update the current decomposed scale.
-        mScale = scale;
+                _matrix(i,j) = mRotationScale.mValues[j][i] * mScale; // NB: column/row major difference
 
         _inverseDirty = true;
         dirtyBound();
@@ -37,6 +34,7 @@ namespace NifOsg
     {
         // First override the rotation ignoring the scale.
         _matrix.setRotate(rotation);
+
         for (int i = 0; i < 3; ++i)
         {
             for (int j = 0; j < 3; ++j)
@@ -51,6 +49,20 @@ namespace NifOsg
         dirtyBound();
     }
 
+    void MatrixTransform::setRotation(const Nif::Matrix3 &rotation)
+    {
+        // Update the decomposed rotation.
+        mRotationScale = rotation;
+
+        // Reorient the node using the known components.
+        for (int i = 0; i < 3; ++i)
+            for (int j = 0; j < 3; ++j)
+                _matrix(i,j) = mRotationScale.mValues[j][i] * mScale; // NB: column/row major difference
+
+        _inverseDirty = true;
+        dirtyBound();
+    }
+
     void MatrixTransform::setTranslation(const osg::Vec3f &translation)
     {
         // The translation is independent from the rotation and scale so we can apply it directly.
diff --git a/components/nifosg/matrixtransform.hpp b/components/nifosg/matrixtransform.hpp
index 24d24ba3fa..ffb3c1c37d 100644
--- a/components/nifosg/matrixtransform.hpp
+++ b/components/nifosg/matrixtransform.hpp
@@ -30,6 +30,7 @@ namespace NifOsg
         // unless you're sure you know what you are doing.
         void setScale(float scale);
         void setRotation(const osg::Quat &rotation);
+        void setRotation(const Nif::Matrix3 &rotation);
         void setTranslation(const osg::Vec3f &translation);
     };
 

From d7425cc0161f882bc42b12df4494eb7dbe17f455 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Sat, 11 Jun 2022 00:09:33 -0700
Subject: [PATCH 2605/2859] change update visitor to only traverse active
 children in scenegraph

---
 apps/openmw/mwrender/renderingmanager.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 5292886754..5464992544 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -593,6 +593,7 @@ namespace MWRender
         updateProjectionMatrix();
 
         mViewer->getCamera()->setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+        mViewer->getUpdateVisitor()->setTraversalMode(osg::NodeVisitor::TRAVERSE_ACTIVE_CHILDREN);
     }
 
     RenderingManager::~RenderingManager()

From 6d2dcaea5009ee954e5efa77f83cb80f15ea14e6 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sat, 11 Jun 2022 22:24:20 +0200
Subject: [PATCH 2606/2859] Lua UI: Enable autoSize for single line text edit

---
 components/lua_ui/textedit.cpp                           | 9 +++++----
 components/lua_ui/textedit.hpp                           | 1 +
 docs/source/reference/lua-scripting/widgets/textedit.rst | 2 +-
 files/data/scripts/omw/mwui/textEdit.lua                 | 3 ++-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/components/lua_ui/textedit.cpp b/components/lua_ui/textedit.cpp
index 9a98920bb7..c6fda38416 100644
--- a/components/lua_ui/textedit.cpp
+++ b/components/lua_ui/textedit.cpp
@@ -29,12 +29,13 @@ namespace LuaUi
         Alignment vertical(propertyValue("textAlignV", Alignment::Start));
         mEditBox->setTextAlign(alignmentToMyGui(horizontal, vertical));
 
-        mEditBox->setEditMultiLine(propertyValue("multiline", false));
+        mMultiline = propertyValue("multiline", false);
+        mEditBox->setEditMultiLine(mMultiline);
 
         bool readOnly = propertyValue("readOnly", false);
         mEditBox->setEditStatic(readOnly);
 
-        mAutoSize = readOnly && propertyValue("autoSize", false);
+        mAutoSize = (readOnly || !mMultiline) && propertyValue("autoSize", false);
 
         // change caption last, for multiline and wordwrap to apply
         mEditBox->setCaption(propertyValue("text", std::string()));
@@ -67,8 +68,8 @@ namespace LuaUi
         if (mAutoSize)
         {
             mEditBox->setSize(normalSize);
-            MyGUI::IntSize textSize = mEditBox->getTextSize();
-            normalSize.height = std::max(normalSize.height, textSize.height);
+            int targetHeight = mMultiline ? mEditBox->getTextSize().height : mEditBox->getFontHeight();
+            normalSize.height = std::max(normalSize.height, targetHeight);
         }
         return normalSize;
     }
diff --git a/components/lua_ui/textedit.hpp b/components/lua_ui/textedit.hpp
index c26292416b..c2f7f6340c 100644
--- a/components/lua_ui/textedit.hpp
+++ b/components/lua_ui/textedit.hpp
@@ -23,6 +23,7 @@ namespace LuaUi
             void textChange(MyGUI::EditBox*);
 
             MyGUI::EditBox* mEditBox = nullptr;
+            bool mMultiline;
             bool mAutoSize;
     };
 }
diff --git a/docs/source/reference/lua-scripting/widgets/textedit.rst b/docs/source/reference/lua-scripting/widgets/textedit.rst
index f0b31b6971..4e80c18197 100644
--- a/docs/source/reference/lua-scripting/widgets/textedit.rst
+++ b/docs/source/reference/lua-scripting/widgets/textedit.rst
@@ -38,7 +38,7 @@ Properties
   * - autoSize
     - boolean (false)
     - | Automatically changes widget height to fix all the text.
-      | Only applies for readOnly = true.
+      | Only applies when readOnly = true or multiline = false.
 
 Events
 ------
diff --git a/files/data/scripts/omw/mwui/textEdit.lua b/files/data/scripts/omw/mwui/textEdit.lua
index 99a42190c8..56baa3abc8 100644
--- a/files/data/scripts/omw/mwui/textEdit.lua
+++ b/files/data/scripts/omw/mwui/textEdit.lua
@@ -7,7 +7,8 @@ return function(templates)
     templates.textEditLine = {
         type = ui.TYPE.TextEdit,
         props = {
-            size = util.vector2(150, constants.textNormalSize),
+            size = util.vector2(150, 0),
+            autoSize = true,
             textSize = constants.textNormalSize,
             textColor = constants.normalColor,
             multiline = false,

From 860d5899c4075d5917dfc974cf610ad9475dc3a9 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sat, 14 May 2022 13:37:32 +0200
Subject: [PATCH 2607/2859] Control camera settings in-game

---
 docs/source/generate_luadoc.sh                |  2 +-
 .../lua-scripting/interface_camera.rst        |  2 +-
 files/data/CMakeLists.txt                     |  8 +-
 files/data/builtin.omwscripts                 |  8 +-
 files/data/l10n/OMWCamera/en.yaml             | 59 ++++++++++++
 .../data/scripts/omw/{ => camera}/camera.lua  | 34 +++++--
 .../scripts/omw/{ => camera}/head_bobbing.lua | 24 +++--
 files/data/scripts/omw/camera/settings.lua    | 95 +++++++++++++++++++
 .../scripts/omw/{ => camera}/third_person.lua | 50 +++++++---
 9 files changed, 241 insertions(+), 41 deletions(-)
 create mode 100644 files/data/l10n/OMWCamera/en.yaml
 rename files/data/scripts/omw/{ => camera}/camera.lua (89%)
 rename files/data/scripts/omw/{ => camera}/head_bobbing.lua (79%)
 create mode 100644 files/data/scripts/omw/camera/settings.lua
 rename files/data/scripts/omw/{ => camera}/third_person.lua (77%)

diff --git a/docs/source/generate_luadoc.sh b/docs/source/generate_luadoc.sh
index f518c96202..f71e3110cb 100755
--- a/docs/source/generate_luadoc.sh
+++ b/docs/source/generate_luadoc.sh
@@ -66,6 +66,6 @@ $DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR openmw/*lua
 cd $FILES_DIR/data
 $DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR openmw_aux/*lua
 $DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR scripts/omw/ai.lua
-$DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR scripts/omw/camera.lua
+$DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR scripts/omw/camera/camera.lua
 $DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR scripts/omw/mwui/init.lua
 $DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR scripts/omw/settings/player.lua
diff --git a/docs/source/reference/lua-scripting/interface_camera.rst b/docs/source/reference/lua-scripting/interface_camera.rst
index c2db83b721..6a0f19d47b 100644
--- a/docs/source/reference/lua-scripting/interface_camera.rst
+++ b/docs/source/reference/lua-scripting/interface_camera.rst
@@ -2,5 +2,5 @@ Interface Camera
 ================
 
 .. raw:: html
-   :file: generated_html/scripts_omw_camera.html
+   :file: generated_html/scripts_omw_camera_camera.html
 
diff --git a/files/data/CMakeLists.txt b/files/data/CMakeLists.txt
index 4705355d30..a7d6cf320f 100644
--- a/files/data/CMakeLists.txt
+++ b/files/data/CMakeLists.txt
@@ -12,6 +12,7 @@ set(BUILTIN_DATA_FILES
 
     l10n/Calendar/en.yaml
     l10n/Interface/en.yaml
+    l10n/OMWCamera/en.yaml
 
     openmw_aux/util.lua
     openmw_aux/time.lua
@@ -21,9 +22,10 @@ set(BUILTIN_DATA_FILES
     builtin.omwscripts
 
     scripts/omw/ai.lua
-    scripts/omw/camera.lua
-    scripts/omw/head_bobbing.lua
-    scripts/omw/third_person.lua
+    scripts/omw/camera/camera.lua
+    scripts/omw/camera/head_bobbing.lua
+    scripts/omw/camera/third_person.lua
+    scripts/omw/camera/settings.lua
     scripts/omw/console/player.lua
     scripts/omw/console/global.lua
     scripts/omw/console/local.lua
diff --git a/files/data/builtin.omwscripts b/files/data/builtin.omwscripts
index 989575ee1a..8c88045ad7 100644
--- a/files/data/builtin.omwscripts
+++ b/files/data/builtin.omwscripts
@@ -1,8 +1,8 @@
-PLAYER: scripts/omw/camera.lua
+PLAYER: scripts/omw/mwui/init.lua
+GLOBAL: scripts/omw/settings/global.lua
+PLAYER: scripts/omw/settings/player.lua
+PLAYER: scripts/omw/camera/camera.lua
 NPC,CREATURE: scripts/omw/ai.lua
 PLAYER: scripts/omw/console/player.lua
 GLOBAL: scripts/omw/console/global.lua
 CUSTOM: scripts/omw/console/local.lua
-PLAYER: scripts/omw/mwui/init.lua
-GLOBAL: scripts/omw/settings/global.lua
-PLAYER: scripts/omw/settings/player.lua
diff --git a/files/data/l10n/OMWCamera/en.yaml b/files/data/l10n/OMWCamera/en.yaml
new file mode 100644
index 0000000000..9d5e7ac7ee
--- /dev/null
+++ b/files/data/l10n/OMWCamera/en.yaml
@@ -0,0 +1,59 @@
+Camera: "Camera"
+settingsPageDescription: "OpenMW camera settings"
+
+thirdPersonSettings: "Third person mode"
+
+viewOverShoulder: "View over the shoulder"
+viewOverShoulderDescription: |
+    Controls third person view mode.
+      No: view is centered on the character's head. Crosshair is hidden.
+      Yes: in non-combat mode camera is positioned behind the character's shoulder, crosshair is always visible.
+
+shoulderOffsetX: "Shoulder view horizontal offset"
+shoulderOffsetXDescription: >
+    Horizontal offset of the camera in the view-over-the-shoulder mode.
+    For the left shoulder use a negative value.
+
+shoulderOffsetY: "Shoulder view vertical offset"
+shoulderOffsetYDescription: >
+    Vertical offset of the camera in the view-over-the-shoulder mode.
+
+autoSwitchShoulder: "Auto switch shoulder"
+autoSwitchShoulderDescription: >
+    When player is close to an obstacle, automatically switches camera
+    to the shoulder that is farther away from the obstacle.
+
+zoomOutWhenMoveCoef: "Zoom out when move coef"
+zoomOutWhenMoveCoefDescription: >
+    Slightly pulls camera away (or closer in case of a negative value) when the character moves.
+    Works only if "view over the shoulder" is enabled. To disable set it to zero (default: 20.0).
+
+previewIfStandStill: "Preview if stand still"
+previewIfStandStillDescription: >
+    If enabled then the character rotation is not synchonized with the camera rotation
+    while the character doesn't move and not in combat mode.
+
+deferredPreviewRotation: "Deferred preview rotation"
+deferredPreviewRotationDescription: |
+    If enabled then the character smoothly rotates to the view direction after exiting preview or vanity mode.
+    If disabled then the camera rotates rather than the character.
+
+ignoreNC: "Ignore 'No Collision' flag"
+ignoreNCDescription: >
+    Prevents camera from clipping through the objects with the NC (No Collision) NIF flag.
+
+
+headBobbingSettings: "Head bobbing in first person view"
+
+headBobbing_enabled: "Enabled"
+headBobbing_enabledDescription: ""
+
+headBobbing_step: "Base step length"
+headBobbing_stepDescription: "The length of each step (default: 90.0)."
+
+headBobbing_height: "Step height"
+headBobbing_heightDescription: "The amplitude of the head bobbing (default: 3.0)."
+
+headBobbing_roll: "Max roll angle"
+headBobbing_rollDescription: "The maximum roll angle in degrees (default: 0.2)."
+
diff --git a/files/data/scripts/omw/camera.lua b/files/data/scripts/omw/camera/camera.lua
similarity index 89%
rename from files/data/scripts/omw/camera.lua
rename to files/data/scripts/omw/camera/camera.lua
index 8a614c9ac3..26dcfc036c 100644
--- a/files/data/scripts/omw/camera.lua
+++ b/files/data/scripts/omw/camera/camera.lua
@@ -1,20 +1,33 @@
 local camera = require('openmw.camera')
 local core = require('openmw.core')
 local input = require('openmw.input')
-local settings = require('openmw.settings')
 local util = require('openmw.util')
 local self = require('openmw.self')
 local nearby = require('openmw.nearby')
+local async = require('openmw.async')
 
 local Actor = require('openmw.types').Actor
 
-local head_bobbing = require('scripts.omw.head_bobbing')
-local third_person = require('scripts.omw.third_person')
+local settings = require('scripts.omw.camera.settings').thirdPerson
+local head_bobbing = require('scripts.omw.camera.head_bobbing')
+local third_person = require('scripts.omw.camera.third_person')
 
 local MODE = camera.MODE
 
-local previewIfStandSill = settings._getBoolFromSettingsCfg('Camera', 'preview if stand still')
-local showCrosshairInThirdPerson = settings._getBoolFromSettingsCfg('Camera', 'view over shoulder')
+local previewIfStandStill = false
+local showCrosshairInThirdPerson = false
+
+local function updateSettings()
+    previewIfStandStill = settings:get('previewIfStandStill')
+    showCrosshairInThirdPerson = settings:get('viewOverShoulder')
+    camera.allowCharacterDeferredRotation(settings:get('deferredPreviewRotation'))
+    local collisionType = util.bitAnd(nearby.COLLISION_TYPE.Default, util.bitNot(nearby.COLLISION_TYPE.Actor))
+    collisionType = util.bitOr(collisionType, nearby.COLLISION_TYPE.Camera)
+    if settings:get('ignoreNC') then
+        collisionType = util.bitOr(collisionType, nearby.COLLISION_TYPE.VisualOnly)
+    end
+    camera.setCollisionType(collisionType)
+end
 
 local primaryMode
 
@@ -24,17 +37,18 @@ local noHeadBobbing = 0
 local noZoom = 0
 
 local function init()
-    camera.setCollisionType(util.bitOr(util.bitAnd(nearby.COLLISION_TYPE.Default, util.bitNot(nearby.COLLISION_TYPE.Actor)), nearby.COLLISION_TYPE.Camera))
     camera.setFieldOfView(camera.getBaseFieldOfView())
-    camera.allowCharacterDeferredRotation(settings._getBoolFromSettingsCfg('Camera', 'deferred preview rotation'))
     if camera.getMode() == MODE.FirstPerson then
         primaryMode = MODE.FirstPerson
     else
         primaryMode = MODE.ThirdPerson
         camera.setMode(MODE.ThirdPerson)
     end
+    updateSettings()
 end
 
+settings:subscribe(async:callback(updateSettings))
+
 local smoothedSpeed = 0
 local previewTimer = 0
 
@@ -60,7 +74,7 @@ local function updatePOV(dt)
 end
 
 local idleTimer = 0
-local vanityDelay = settings.getGMST('fVanityDelay')
+local vanityDelay = core.getGMST('fVanityDelay')
 
 local function updateVanity(dt)
     if input.isIdle() then
@@ -126,7 +140,7 @@ end
 
 local function updateStandingPreview()
     local mode = camera.getMode()
-    if not previewIfStandSill or noStandingPreview > 0
+    if not previewIfStandStill or noStandingPreview > 0
        or mode == MODE.FirstPerson or mode == MODE.Static or mode == MODE.Vanity then
         third_person.standingPreview = false
         return
@@ -204,7 +218,7 @@ return {
         enableModeControl = function() noModeControl = math.max(0, noModeControl - 1) end,
 
         --- @function [parent=#Camera] isStandingPreviewEnabled
-        isStandingPreviewEnabled = function() return previewIfStandSill and noStandingPreview == 0 end,
+        isStandingPreviewEnabled = function() return previewIfStandStill and noStandingPreview == 0 end,
         --- @function [parent=#Camera] disableStandingPreview
         disableStandingPreview = function() noStandingPreview = noStandingPreview + 1 end,
         --- @function [parent=#Camera] enableStandingPreview
diff --git a/files/data/scripts/omw/head_bobbing.lua b/files/data/scripts/omw/camera/head_bobbing.lua
similarity index 79%
rename from files/data/scripts/omw/head_bobbing.lua
rename to files/data/scripts/omw/camera/head_bobbing.lua
index b3d96a7eba..5b48c94fed 100644
--- a/files/data/scripts/omw/head_bobbing.lua
+++ b/files/data/scripts/omw/camera/head_bobbing.lua
@@ -1,21 +1,29 @@
 local camera = require('openmw.camera')
 local self = require('openmw.self')
-local settings = require('openmw.settings')
 local util = require('openmw.util')
+local async = require('openmw.async')
 
 local Actor = require('openmw.types').Actor
 
-local doubleStepLength = settings._getFloatFromSettingsCfg('Camera', 'head bobbing step') * 2
-local stepHeight = settings._getFloatFromSettingsCfg('Camera', 'head bobbing height')
-local maxRoll = math.rad(settings._getFloatFromSettingsCfg('Camera', 'head bobbing roll'))
+local M = {}
+
+local settings = require('scripts.omw.camera.settings').headBobbing
+
+local doubleStepLength, stepHeight, maxRoll
+
+local function updateSettings()
+    M.enabled = settings:get('enabled')
+    doubleStepLength = settings:get('step') * 2
+    stepHeight = settings:get('height')
+    maxRoll = math.rad(settings:get('roll'))
+end
+
+updateSettings()
+settings:subscribe(async:callback(updateSettings))
 
 local effectWeight = 0
 local totalMovement = 0
 
-local M = {
-    enabled = settings._getBoolFromSettingsCfg('Camera', 'head bobbing')
-}
-
 -- Trajectory of each step is a scaled arc of 60 degrees.
 local halfArc = math.rad(30)
 local sampleArc = function(x) return 1 - math.cos(x * halfArc) end
diff --git a/files/data/scripts/omw/camera/settings.lua b/files/data/scripts/omw/camera/settings.lua
new file mode 100644
index 0000000000..ec7f8a9c07
--- /dev/null
+++ b/files/data/scripts/omw/camera/settings.lua
@@ -0,0 +1,95 @@
+local storage = require('openmw.storage')
+local async = require('openmw.async')
+local I = require('openmw.interfaces')
+
+I.Settings.registerPage({
+  key = 'OMWCamera',
+  l10n = 'OMWCamera',
+  name = 'Camera',
+  description = 'settingsPageDescription',
+})
+
+local thirdPersonGroup = 'SettingsOMWCameraThirdPerson'
+local headBobbingGroup = 'SettingsOMWCameraHeadBobbing'
+
+local function boolSetting(prefix, key, default)
+    return {
+        key = key,
+        renderer = 'checkbox',
+        name = prefix..key,
+        description = prefix..key..'Description',
+        default = default,
+    }
+end
+
+local function floatSetting(prefix, key, default)
+    return {
+        key = key,
+        renderer = 'number',
+        name = prefix..key,
+        description = prefix..key..'Description',
+        default = default,
+    }
+end
+
+I.Settings.registerGroup({
+    key = thirdPersonGroup,
+    page = 'OMWCamera',
+    l10n = 'OMWCamera',
+    name = 'thirdPersonSettings',
+    permanentStorage = true,
+    order = 0,
+    settings = {
+        boolSetting('', 'viewOverShoulder', true),
+        floatSetting('', 'shoulderOffsetX', 30),
+        floatSetting('', 'shoulderOffsetY', -10),
+        boolSetting('', 'autoSwitchShoulder', true),
+        floatSetting('', 'zoomOutWhenMoveCoef', 20),
+        boolSetting('', 'previewIfStandStill', true),
+        boolSetting('', 'deferredPreviewRotation', true),
+        boolSetting('', 'ignoreNC', true),
+    },
+})
+
+I.Settings.registerGroup({
+    key = headBobbingGroup,
+    page = 'OMWCamera',
+    l10n = 'OMWCamera',
+    name = 'headBobbingSettings',
+    permanentStorage = true,
+    order = 1,
+    settings = {
+        boolSetting('headBobbing_', 'enabled', true),
+        floatSetting('headBobbing_', 'step', 90),
+        floatSetting('headBobbing_', 'height', 3),
+        floatSetting('headBobbing_', 'roll', 0.2),
+    },
+})
+
+local settings = {
+    thirdPerson = storage.playerSection(thirdPersonGroup),
+    headBobbing = storage.playerSection(headBobbingGroup),
+}
+
+local function updateViewOverShoulderDisabled()
+    local disabled = not settings.thirdPerson:get('viewOverShoulder')
+    I.Settings.updateRendererArgument(thirdPersonGroup, 'shoulderOffsetX', {disabled = disabled})
+    I.Settings.updateRendererArgument(thirdPersonGroup, 'shoulderOffsetY', {disabled = disabled})
+    I.Settings.updateRendererArgument(thirdPersonGroup, 'autoSwitchShoulder', {disabled = disabled})
+    I.Settings.updateRendererArgument(thirdPersonGroup, 'zoomOutWhenMoveCoef', {disabled = disabled})
+end
+
+local function updateHeadBobbingDisabled()
+    local disabled = not settings.headBobbing:get('enabled')
+    I.Settings.updateRendererArgument(headBobbingGroup, 'step', {disabled = disabled, min = 1})
+    I.Settings.updateRendererArgument(headBobbingGroup, 'height', {disabled = disabled})
+    I.Settings.updateRendererArgument(headBobbingGroup, 'roll', {disabled = disabled, min = 0, max = 90})
+end
+
+updateViewOverShoulderDisabled()
+updateHeadBobbingDisabled()
+
+settings.thirdPerson:subscribe(async:callback(updateViewOverShoulderDisabled))
+settings.headBobbing:subscribe(async:callback(updateHeadBobbingDisabled))
+
+return settings
diff --git a/files/data/scripts/omw/third_person.lua b/files/data/scripts/omw/camera/third_person.lua
similarity index 77%
rename from files/data/scripts/omw/third_person.lua
rename to files/data/scripts/omw/camera/third_person.lua
index 311dbde48b..c28cbe2a4f 100644
--- a/files/data/scripts/omw/third_person.lua
+++ b/files/data/scripts/omw/camera/third_person.lua
@@ -1,31 +1,47 @@
 local camera = require('openmw.camera')
-local settings = require('openmw.settings')
 local util = require('openmw.util')
 local self = require('openmw.self')
 local nearby = require('openmw.nearby')
+local async = require('openmw.async')
 
 local Actor = require('openmw.types').Actor
 
+local settings = require('scripts.omw.camera.settings').thirdPerson
+
 local MODE = camera.MODE
 local STATE = { RightShoulder = 0, LeftShoulder = 1, Combat = 2, Swimming = 3 }
 
 local M = {
-    baseDistance = settings._getFloatFromSettingsCfg('Camera', 'third person camera distance'),
+    baseDistance = 192,
     preferredDistance = 0,
     standingPreview = false,
     noOffsetControl = 0,
 }
 
-local viewOverShoulder = settings._getBoolFromSettingsCfg('Camera', 'view over shoulder')
-local autoSwitchShoulder = settings._getBoolFromSettingsCfg('Camera', 'auto switch shoulder')
-local shoulderOffset = settings._getVector2FromSettingsCfg('Camera', 'view over shoulder offset')
-local zoomOutWhenMoveCoef = settings._getFloatFromSettingsCfg('Camera', 'zoom out when move coef')
+local viewOverShoulder, autoSwitchShoulder
+local shoulderOffset
+local zoomOutWhenMoveCoef
 
-local defaultShoulder = (shoulderOffset.x > 0 and STATE.RightShoulder) or STATE.LeftShoulder
-local rightShoulderOffset = util.vector2(math.abs(shoulderOffset.x), shoulderOffset.y)
-local leftShoulderOffset = util.vector2(-math.abs(shoulderOffset.x), shoulderOffset.y)
+local defaultShoulder, rightShoulderOffset, leftShoulderOffset
 local combatOffset = util.vector2(0, 15)
 
+local noThirdPersonLastFrame = true
+
+local function updateSettings()
+    viewOverShoulder = settings:get('viewOverShoulder')
+    autoSwitchShoulder = settings:get('autoSwitchShoulder')
+    shoulderOffset = util.vector2(settings:get('shoulderOffsetX'),
+                                  settings:get('shoulderOffsetY'))
+    zoomOutWhenMoveCoef = settings:get('zoomOutWhenMoveCoef')
+
+    defaultShoulder = (shoulderOffset.x > 0 and STATE.RightShoulder) or STATE.LeftShoulder
+    rightShoulderOffset = util.vector2(math.abs(shoulderOffset.x), shoulderOffset.y)
+    leftShoulderOffset = util.vector2(-math.abs(shoulderOffset.x), shoulderOffset.y)
+    noThirdPersonLastFrame = true
+end
+updateSettings()
+settings:subscribe(async:callback(updateSettings))
+
 local state = defaultShoulder
 
 local function ray(from, angle, limit)
@@ -66,8 +82,6 @@ local function calculateDistance(smoothedSpeed)
             + smoothedSpeedSqr / (smoothedSpeedSqr + 300*300) * zoomOutWhenMoveCoef)
 end
 
-local noThirdPersonLastFrame = true
-
 local function updateState()
     local mode = camera.getMode()
     local oldState = state
@@ -80,9 +94,13 @@ local function updateState()
     elseif not state then
         state = defaultShoulder
     end
-    if autoSwitchShoulder and (mode == MODE.ThirdPerson or state ~= oldState or noThirdPersonLastFrame)
+    if (mode == MODE.ThirdPerson or Actor.currentSpeed(self) > 0 or state ~= oldState or noThirdPersonLastFrame)
        and (state == STATE.LeftShoulder or state == STATE.RightShoulder) then
-        trySwitchShoulder()
+        if autoSwitchShoulder then
+            trySwitchShoulder()
+        else
+            state = defaultShoulder
+        end
     end
     if oldState ~= state or noThirdPersonLastFrame then
         -- State was changed, start focal point transition.
@@ -116,7 +134,11 @@ function M.update(dt, smoothedSpeed)
     if not viewOverShoulder then
         M.preferredDistance = M.baseDistance
         camera.setPreferredThirdPersonDistance(M.baseDistance)
-        noThirdPersonLastFrame = false
+        if noThirdPersonLastFrame then
+            camera.setFocalPreferredOffset(util.vector2(0, 0))
+            camera.instantTransition()
+            noThirdPersonLastFrame = false
+        end
         return
     end
 

From c548708a27b3a2fe47d192b22dae9eed32683d77 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sat, 21 May 2022 19:23:40 +0200
Subject: [PATCH 2608/2859] Remove Lua package openmw.settings

---
 apps/openmw/CMakeLists.txt             |  2 +-
 apps/openmw/mwlua/luabindings.hpp      |  4 --
 apps/openmw/mwlua/luamanagerimp.cpp    |  5 --
 apps/openmw/mwlua/luamanagerimp.hpp    |  2 -
 apps/openmw/mwlua/settingsbindings.cpp | 71 --------------------------
 5 files changed, 1 insertion(+), 83 deletions(-)
 delete mode 100644 apps/openmw/mwlua/settingsbindings.cpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index c166b11ae3..24152d59ab 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -60,7 +60,7 @@ add_openmw_dir (mwscript
 
 add_openmw_dir (mwlua
     luamanagerimp object worldview userdataserializer eventqueue
-    luabindings localscripts playerscripts objectbindings cellbindings asyncbindings settingsbindings
+    luabindings localscripts playerscripts objectbindings cellbindings asyncbindings
     camerabindings uibindings inputbindings nearbybindings postprocessingbindings stats debugbindings
     types/types types/door types/actor types/container types/weapon types/npc types/creature types/activator types/book types/lockpick types/probe types/apparatus types/potion types/misc types/repair
     )
diff --git a/apps/openmw/mwlua/luabindings.hpp b/apps/openmw/mwlua/luabindings.hpp
index af41199ad9..5760a383ec 100644
--- a/apps/openmw/mwlua/luabindings.hpp
+++ b/apps/openmw/mwlua/luabindings.hpp
@@ -56,10 +56,6 @@ namespace MWLua
     // Implemented in inputbindings.cpp
     sol::table initInputPackage(const Context&);
 
-    // Implemented in settingsbindings.cpp
-    sol::table initGlobalSettingsPackage(const Context&);
-    sol::table initPlayerSettingsPackage(const Context&);
-
     // openmw.self package is implemented in localscripts.cpp
 }
 
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index c3dff4f04c..b71f5919c3 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -88,15 +88,12 @@ namespace MWLua
         mLua.addCommonPackage("openmw.core", initCorePackage(context));
         mLua.addCommonPackage("openmw.types", initTypesPackage(context));
         mGlobalScripts.addPackage("openmw.world", initWorldPackage(context));
-        mGlobalScripts.addPackage("openmw.settings", initGlobalSettingsPackage(context));
         mGlobalScripts.addPackage("openmw.storage", initGlobalStoragePackage(context, &mGlobalStorage));
 
         mCameraPackage = initCameraPackage(localContext);
         mUserInterfacePackage = initUserInterfacePackage(localContext);
         mInputPackage = initInputPackage(localContext);
         mNearbyPackage = initNearbyPackage(localContext);
-        mLocalSettingsPackage = initGlobalSettingsPackage(localContext);
-        mPlayerSettingsPackage = initPlayerSettingsPackage(localContext);
         mLocalStoragePackage = initLocalStoragePackage(localContext, &mGlobalStorage);
         mPlayerStoragePackage = initPlayerStoragePackage(localContext, &mGlobalStorage, &mPlayerStorage);
         mPostprocessingPackage = initPostprocessingPackage(localContext);
@@ -423,7 +420,6 @@ namespace MWLua
             scripts->addPackage("openmw.ui", mUserInterfacePackage);
             scripts->addPackage("openmw.camera", mCameraPackage);
             scripts->addPackage("openmw.input", mInputPackage);
-            scripts->addPackage("openmw.settings", mPlayerSettingsPackage);
             scripts->addPackage("openmw.storage", mPlayerStoragePackage);
             scripts->addPackage("openmw.postprocessing", mPostprocessingPackage);
             scripts->addPackage("openmw.debug", mDebugPackage);
@@ -434,7 +430,6 @@ namespace MWLua
             if (!autoStartConf.has_value())
                 autoStartConf = mConfiguration.getLocalConf(type, ptr.getCellRef().getRefId(), getId(ptr));
             scripts->setAutoStartConf(std::move(*autoStartConf));
-            scripts->addPackage("openmw.settings", mLocalSettingsPackage);
             scripts->addPackage("openmw.storage", mLocalStoragePackage);
         }
         scripts->addPackage("openmw.nearby", mNearbyPackage);
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index e1eaac9ff8..41eb076783 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -137,8 +137,6 @@ namespace MWLua
         sol::table mUserInterfacePackage;
         sol::table mCameraPackage;
         sol::table mInputPackage;
-        sol::table mLocalSettingsPackage;
-        sol::table mPlayerSettingsPackage;
         sol::table mLocalStoragePackage;
         sol::table mPlayerStoragePackage;
         sol::table mPostprocessingPackage;
diff --git a/apps/openmw/mwlua/settingsbindings.cpp b/apps/openmw/mwlua/settingsbindings.cpp
deleted file mode 100644
index afd852b1a0..0000000000
--- a/apps/openmw/mwlua/settingsbindings.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-#include "luabindings.hpp"
-
-#include <components/settings/settings.hpp>
-
-#include "../mwworld/esmstore.hpp"
-#include "../mwworld/store.hpp"
-
-namespace MWLua
-{
-
-    static sol::table initSettingsPackage(const Context& context, bool player)
-    {
-        LuaUtil::LuaState* lua = context.mLua;
-        sol::table config(lua->sol(), sol::create);
-
-        // Access to settings.cfg. Temporary, will be removed at some point.
-        auto checkRead = [player](std::string_view category)
-        {
-            if ((category == "Camera" || category == "GUI" || category == "Hud" ||
-                 category == "Windows" || category == "Input") && !player)
-                throw std::runtime_error("This setting is only available in player scripts");
-        };
-        config["_getBoolFromSettingsCfg"] = [=](const std::string& category, const std::string& setting)
-        {
-            checkRead(category);
-            return Settings::Manager::getBool(setting, category);
-        };
-        config["_getIntFromSettingsCfg"] = [=](const std::string& category, const std::string& setting)
-        {
-            checkRead(category);
-            return Settings::Manager::getInt(setting, category);
-        };
-        config["_getFloatFromSettingsCfg"] = [=](const std::string& category, const std::string& setting)
-        {
-            checkRead(category);
-            return Settings::Manager::getFloat(setting, category);
-        };
-        config["_getStringFromSettingsCfg"] = [=](const std::string& category, const std::string& setting)
-        {
-            checkRead(category);
-            return Settings::Manager::getString(setting, category);
-        };
-        config["_getVector2FromSettingsCfg"] = [=](const std::string& category, const std::string& setting)
-        {
-            checkRead(category);
-            return Settings::Manager::getVector2(setting, category);
-        };
-        config["_getVector3FromSettingsCfg"] = [=](const std::string& category, const std::string& setting)
-        {
-            checkRead(category);
-            return Settings::Manager::getVector3(setting, category);
-        };
-
-        const MWWorld::Store<ESM::GameSetting>* gmst = &MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
-        config["getGMST"] = [lua, gmst](const std::string setting) -> sol::object
-        {
-            const ESM::Variant& value = gmst->find(setting)->mValue;
-            if (value.getType() == ESM::VT_String)
-                return sol::make_object<std::string>(lua->sol(), value.getString());
-            else if (value.getType() == ESM::VT_Int)
-                return sol::make_object<int>(lua->sol(), value.getInteger());
-            else
-                return sol::make_object<float>(lua->sol(), value.getFloat());
-        };
-        return LuaUtil::makeReadOnly(config);
-    }
-
-    sol::table initGlobalSettingsPackage(const Context& context) { return initSettingsPackage(context, false); }
-    sol::table initPlayerSettingsPackage(const Context& context) { return initSettingsPackage(context, true); }
-
-}

From 65efd6f1c27d647786df3c24f2ec4ce0d0991b51 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sat, 21 May 2022 19:49:05 +0200
Subject: [PATCH 2609/2859] Remove from settings.cfg camera settings that are
 controlled from Lua

---
 apps/launcher/advancedpage.cpp                |  38 -----
 apps/launcher/advancedpage.hpp                |   1 -
 .../reference/modding/settings/camera.rst     | 135 +----------------
 files/settings-default.cfg                    |  33 ----
 files/ui/advancedpage.ui                      | 141 ------------------
 5 files changed, 3 insertions(+), 345 deletions(-)

diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index a5a7cab8d4..6566bd8d51 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -180,20 +180,6 @@ bool Launcher::AdvancedPage::loadSettings()
         }
     }
 
-
-    // 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");
@@ -350,25 +336,6 @@ void Launcher::AdvancedPage::saveSettings()
         }
     }
 
-    // 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");
@@ -479,11 +446,6 @@ void Launcher::AdvancedPage::slotAnimSourcesToggled(bool checked)
     }
 }
 
-void Launcher::AdvancedPage::slotViewOverShoulderToggled(bool checked)
-{
-    viewOverShoulderVerticalLayout->setEnabled(viewOverShoulderCheckBox->checkState());
-}
-
 void Launcher::AdvancedPage::slotPostProcessToggled(bool checked)
 {
     postprocessLiveReloadCheckBox->setEnabled(checked);
diff --git a/apps/launcher/advancedpage.hpp b/apps/launcher/advancedpage.hpp
index 6a3f8319d2..20b44ff9da 100644
--- a/apps/launcher/advancedpage.hpp
+++ b/apps/launcher/advancedpage.hpp
@@ -29,7 +29,6 @@ namespace Launcher
         void on_skipMenuCheckBox_stateChanged(int state);
         void on_runScriptAfterStartupBrowseButton_clicked();
         void slotAnimSourcesToggled(bool checked);
-        void slotViewOverShoulderToggled(bool checked);
         void slotPostProcessToggled(bool checked);
 
     private:
diff --git a/docs/source/reference/modding/settings/camera.rst b/docs/source/reference/modding/settings/camera.rst
index fe6217b22b..5011885919 100644
--- a/docs/source/reference/modding/settings/camera.rst
+++ b/docs/source/reference/modding/settings/camera.rst
@@ -1,6 +1,9 @@
 Camera Settings
 ###############
 
+.. note::
+    Some camera settings are available only in the in-game settings menu. See the tab "Scripts/OpenMW Camera".
+
 near clip
 ---------
 
@@ -103,138 +106,6 @@ while small values can result in the hands not being visible.
 
 This setting can only be configured by editing the settings configuration file.
 
-third person camera distance
-----------------------------
-
-:Type:		floating point
-:Range:		30-800
-:Default:	192.0
-
-Distance from the camera to the character in third person mode.
-
-This setting can be changed in game using "Zoom In" / "Zoom Out" controls.
-
-view over shoulder
-------------------
-
-:Type:		boolean
-:Range:		True/False
-:Default:	False
-
-This setting controls third person view mode.
-False: View is centered on the character's head. Crosshair is hidden.
-True: In non-combat mode camera is positioned behind the character's shoulder. Crosshair is visible in third person mode as well.
-
-This setting can be controlled in Advanced tab of the launcher.
-
-view over shoulder offset
--------------------------
-
-:Type:		2D vector floating point
-:Range:		Any
-:Default:	30 -10
-
-This setting makes sense only if 'view over shoulder' is enabled. Controls horizontal (first number) and vertical (second number) offset of the camera in third person mode.
-Recommened values: 30 -10 for the right shoulder, -30 -10 for the left shoulder.
-
-This setting can only be configured by editing the settings configuration file.
-
-auto switch shoulder
---------------------
-
-:Type:		boolean
-:Range:		True/False
-:Default:	True
-
-This setting makes difference only in third person mode if 'view over shoulder' is enabled.
-When player is close to an obstacle, automatically switches camera to the shoulder that is farther away from the obstacle.
-
-This setting can be controlled in Advanced tab of the launcher.
-
-zoom out when move coef
------------------------
-
-:Type:		floating point
-:Range:		Any
-:Default:	20
-
-This setting makes difference only in third person mode if 'view over shoulder' is enabled.
-Slightly pulls camera away (or closer in case of negative value) when the character moves. To disable set it to zero.
-
-This setting can only be configured by editing the settings configuration file.
-
-preview if stand still
-----------------------
-
-:Type:		boolean
-:Range:		True/False
-:Default:	False
-
-Makes difference only in third person mode.
-If enabled then the character rotation is not synchonized with the camera rotation while the character doesn't move and not in combat mode.
-
-This setting can be controlled in Advanced tab of the launcher.
-
-deferred preview rotation
--------------------------
-
-:Type:		boolean
-:Range:		True/False
-:Default:	True
-
-Makes difference only in third person mode.
-If enabled then the character smoothly rotates to the view direction after exiting preview or vanity mode.
-If disabled then the camera rotates rather than the character.
-
-This setting can be controlled in Advanced tab of the launcher.
-
-head bobbing
-------------
-
-:Type:		boolean
-:Range:		True/False
-:Default:	False
-
-Enables head bobbing when move in first person mode.
-
-This setting can be controlled in Advanced tab of the launcher.
-
-head bobbing step
------------------
-
-:Type:		floating point
-:Range:		>0
-:Default:	90.0
-
-Makes diffence only in first person mode if 'head bobbing' is enabled.
-Length of each step.
-
-This setting can only be configured by editing the settings configuration file.
-
-head bobbing height
--------------------
-
-:Type:		floating point
-:Range:		Any
-:Default:	3.0
-
-Makes diffence only in first person mode if 'head bobbing' is enabled.
-Amplitude of the head bobbing.
-
-This setting can only be configured by editing the settings configuration file.
-
-head bobbing roll
------------------
-
-:Type:		floating point
-:Range:		0-90
-:Default:	0.2
-
-Makes diffence only in first person mode if 'head bobbing' is enabled.
-Maximum roll angle in degrees.
-
-This setting can only be configured by editing the settings configuration file.
-
 reverse z
 ---------
 
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index da50ca5fc7..3f4446535e 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -26,39 +26,6 @@ field of view = 60.0
 # Best to leave this at the default since vanilla assets are not complete enough to adapt to high FoV's. Too low FoV would clip the hands off screen.
 first person field of view = 60.0
 
-# Distance from the camera to the character in third person mode.
-third person camera distance = 192
-
-# If enabled then third person camera is positioned above character's shoulder and crosshair is visible.
-view over shoulder = false
-
-# Makes sense only if 'view over shoulder' is true. First number is horizontal offset (negative value means offset to the left), second number is vertical offset.
-view over shoulder offset = 30 -10
-
-# Switch shoulder automatically when player is close to an obstacle.
-auto switch shoulder = true
-
-# Slightly pulls camera away when the character moves. Works only in 'view over shoulder' mode. Set to 0 to disable.
-zoom out when move coef = 20
-
-# Automatically enable preview mode when player doesn't move.
-preview if stand still = false
-
-# Rotate the character to the view direction after exiting preview mode.
-deferred preview rotation = true
-
-# Enables head bobbing in first person mode
-head bobbing = false
-
-# Length of each step
-head bobbing step = 90.0
-
-# Amplitude of the bobbing effect
-head bobbing height = 3.0
-
-# Maximum camera roll angle (degrees)
-head bobbing roll = 0.2
-
 # Reverse the depth range, reduces z-fighting of distant objects and terrain
 reverse z = true
 
diff --git a/files/ui/advancedpage.ui b/files/ui/advancedpage.ui
index 520b089965..66ebd90a80 100644
--- a/files/ui/advancedpage.ui
+++ b/files/ui/advancedpage.ui
@@ -827,147 +827,6 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="cameraSettings">
-      <attribute name="title">
-       <string>Camera</string>
-      </attribute>
-      <layout class="QVBoxLayout">
-       <item>
-        <widget class="QCheckBox" name="viewOverShoulderCheckBox">
-         <property name="toolTip">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This setting controls third person view mode.&lt;/p&gt;&lt;p&gt;False: View is centered on the character's head. Crosshair is hidden.
-True: In non-combat mode camera is positioned behind the character's shoulder. Crosshair is visible in third person mode as well.
-&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-         <property name="text">
-          <string>View over the shoulder</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QCheckBox" name="autoSwitchShoulderCheckBox">
-         <property name="toolTip">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When player is close to an obstacle, automatically switches camera to the shoulder that is farther away from the obstacle.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-         <property name="text">
-          <string>Auto switch shoulder</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <layout class="QVBoxLayout" name="viewOverShoulderVerticalLayout">
-         <property name="leftMargin">
-          <number>20</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <item>
-          <layout class="QHBoxLayout" name="defaultShoulderHorizontalLayout">
-           <property name="leftMargin">
-            <number>0</number>
-           </property>
-           <property name="topMargin">
-            <number>0</number>
-           </property>
-           <property name="rightMargin">
-            <number>0</number>
-           </property>
-           <property name="bottomMargin">
-            <number>0</number>
-           </property>
-           <item>
-            <widget class="QLabel" name="defaultShoulderLabel">
-             <property name="text">
-              <string>Default shoulder:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QComboBox" name="defaultShoulderComboBox">
-             <property name="currentIndex">
-              <number>0</number>
-             </property>
-             <item>
-              <property name="text">
-               <string>Right</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>Left</string>
-              </property>
-             </item>
-            </widget>
-           </item>
-           <item>
-            <spacer name="horizontalSpacer_3">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>40</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-          </layout>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <widget class="QCheckBox" name="previewIfStandStillCheckBox">
-         <property name="toolTip">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled then the character rotation is not synchonized with the camera rotation while the character doesn't move and not in combat mode.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-         <property name="text">
-          <string>Preview if stand still</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QCheckBox" name="deferredPreviewRotationCheckBox">
-         <property name="toolTip">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled then the character smoothly rotates to the view direction after exiting preview or vanity mode. If disabled then the camera rotates rather than the character.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-         <property name="text">
-          <string>Deferred preview rotation</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QCheckBox" name="headBobbingCheckBox">
-         <property name="toolTip">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enables head bobbing when move in first person mode.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-         <property name="text">
-          <string>Head bobbing in 1st person mode</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer>
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
      <widget class="QWidget" name="Interface">
       <attribute name="title">
        <string>Interface</string>

From 3fb470dcce410bbfb5a06b1cf1d5eaa3ca145da5 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Tue, 7 Jun 2022 00:36:44 +0200
Subject: [PATCH 2610/2859] Increase the size of the settings menu; reduce the
 size of Lua settings "number" in order to make camera settings look good with
 the default size of the settings menu.

---
 docs/source/reference/modding/settings/windows.rst | 8 ++++----
 files/data/scripts/omw/settings/renderers.lua      | 3 ++-
 files/mygui/openmw_settings_window.layout          | 6 +++---
 files/settings-default.cfg                         | 8 ++++----
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/docs/source/reference/modding/settings/windows.rst b/docs/source/reference/modding/settings/windows.rst
index 6426802ab9..dd6bb3aee5 100644
--- a/docs/source/reference/modding/settings/windows.rst
+++ b/docs/source/reference/modding/settings/windows.rst
@@ -249,13 +249,13 @@ settings
 --------
 
 :Default:
-	x = 0.33
+	x = 0.1
 
-	y = 0.18
+	y = 0.1
 
-	w = 0.33
+	w = 0.8
 
-	h = 0.66
+	h = 0.8
 
 The settings window.
 Activated by clicking Options in the main menu.
diff --git a/files/data/scripts/omw/settings/renderers.lua b/files/data/scripts/omw/settings/renderers.lua
index 2b1739e5a3..3c187740e6 100644
--- a/files/data/scripts/omw/settings/renderers.lua
+++ b/files/data/scripts/omw/settings/renderers.lua
@@ -112,6 +112,7 @@ return function(registerRenderer)
                 template = I.MWUI.templates.textEditLine,
                 props = {
                     text = tostring(value),
+                    size = util.vector2(80, 0),
                 },
                 events = {
                     textChanged = async:callback(function(text)
@@ -262,4 +263,4 @@ return function(registerRenderer)
             })
         end)
     end
-end
\ No newline at end of file
+end
diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index cfc80b1368..71890fec27 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout" version="3.2.0">
     <Widget type="Window" skin="MW_Window" position="0 0 400 485" layer="MainMenu" name="_Main">
-        <Property key="MinSize" value="430 446"/>
+        <Property key="MinSize" value="640 480"/>
         <Widget type="TabControl" skin="TabControl" position="8 8 368 405" align="Stretch" name="SettingsTab">
             <Property key="ButtonAutoWidth" value="true"/>
             <Widget type="TabItem" skin="" position="4 32 360 358">
@@ -302,7 +302,7 @@
                         </Widget>
 
                         <Widget type="TextBox" skin="SandText" position="182 124 300 32" align="Left Top">
-                            <Property key="Caption" value="Hint: press F3 to show \nthe current frame rate."/>
+                            <Property key="Caption" value="Hint: press F3 to show the current frame rate."/>
                         </Widget>
 
                         <Widget type="HBox" skin="" position="182 160 300 24">
@@ -317,7 +317,7 @@
                         </Widget>
 
                         <Widget type="TextBox" skin="SandText" position="182 190 300 32" align="Left Top">
-                            <Property key="Caption" value="Hint: press F2 to show \nthe config HUD."/>
+                            <Property key="Caption" value="Hint: press F2 to show the config HUD."/>
                         </Widget>
 
                         <Widget type="TextBox" skin="NormalText" position="0 228 352 18" align="Left Top" name="FovText">
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 3f4446535e..fd9826104a 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -794,10 +794,10 @@ companion maximized h = 0.875
 companion maximized = false
 
 # Settings menu
-settings x = 0.33
-settings y = 0.18
-settings w = 0.33
-settings h = 0.67
+settings x = 0.1
+settings y = 0.1
+settings w = 0.8
+settings h = 0.8
 settings maximized x = 0.015
 settings maximized y = 0.02
 settings maximized w = 0.97

From 1ca0a3a555902ad6fa36edf8098aa3f9ba8d920f Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Wed, 8 Jun 2022 23:34:34 +0200
Subject: [PATCH 2611/2859] Addition camera features: move360, pov_auto_switch,
 slow_view_change

---
 files/data/CMakeLists.txt                     |  2 +
 files/data/l10n/OMWCamera/en.yaml             | 17 ++++-
 files/data/scripts/omw/camera/camera.lua      | 16 +++-
 .../omw/camera/first_person_auto_switch.lua   | 52 +++++++++++++
 files/data/scripts/omw/camera/move360.lua     | 73 +++++++++++++++++++
 files/data/scripts/omw/camera/settings.lua    | 17 +++--
 6 files changed, 169 insertions(+), 8 deletions(-)
 create mode 100644 files/data/scripts/omw/camera/first_person_auto_switch.lua
 create mode 100644 files/data/scripts/omw/camera/move360.lua

diff --git a/files/data/CMakeLists.txt b/files/data/CMakeLists.txt
index a7d6cf320f..40c5456f8a 100644
--- a/files/data/CMakeLists.txt
+++ b/files/data/CMakeLists.txt
@@ -26,6 +26,8 @@ set(BUILTIN_DATA_FILES
     scripts/omw/camera/head_bobbing.lua
     scripts/omw/camera/third_person.lua
     scripts/omw/camera/settings.lua
+    scripts/omw/camera/move360.lua
+    scripts/omw/camera/first_person_auto_switch.lua
     scripts/omw/console/player.lua
     scripts/omw/console/global.lua
     scripts/omw/console/local.lua
diff --git a/files/data/l10n/OMWCamera/en.yaml b/files/data/l10n/OMWCamera/en.yaml
index 9d5e7ac7ee..eefc192960 100644
--- a/files/data/l10n/OMWCamera/en.yaml
+++ b/files/data/l10n/OMWCamera/en.yaml
@@ -1,5 +1,5 @@
-Camera: "Camera"
-settingsPageDescription: "OpenMW camera settings"
+Camera: "OpenMW Camera"
+settingsPageDescription: "OpenMW Camera settings"
 
 thirdPersonSettings: "Third person mode"
 
@@ -42,6 +42,19 @@ ignoreNC: "Ignore 'No Collision' flag"
 ignoreNCDescription: >
     Prevents camera from clipping through the objects with the NC (No Collision) NIF flag.
 
+move360: "Move 360"
+move360Description: >
+    When without weapon in hands the character rotates to the direction of movement. I.e. looks to the camera when run backwards.
+
+move360TurnSpeed: "Move 360 turning speed"
+move360TurnSpeedDescription: A multiplier for the turning speed (5.0 by default)
+
+slowViewChange: "Smooth view change"
+slowViewChangeDescription: "Makes switching from 1st person to 3rd person view not instant."
+
+povAutoSwitch: "First person auto switch"
+povAutoSwitchDescription: "Auto switch to 1st person view if there is an obstacle right behind the player."
+
 
 headBobbingSettings: "Head bobbing in first person view"
 
diff --git a/files/data/scripts/omw/camera/camera.lua b/files/data/scripts/omw/camera/camera.lua
index 26dcfc036c..ce1bd2d48b 100644
--- a/files/data/scripts/omw/camera/camera.lua
+++ b/files/data/scripts/omw/camera/camera.lua
@@ -11,11 +11,14 @@ local Actor = require('openmw.types').Actor
 local settings = require('scripts.omw.camera.settings').thirdPerson
 local head_bobbing = require('scripts.omw.camera.head_bobbing')
 local third_person = require('scripts.omw.camera.third_person')
+local pov_auto_switch = require('scripts.omw.camera.first_person_auto_switch')
+local move360 = require('scripts.omw.camera.move360')
 
 local MODE = camera.MODE
 
 local previewIfStandStill = false
 local showCrosshairInThirdPerson = false
+local slowViewChange = false
 
 local function updateSettings()
     previewIfStandStill = settings:get('previewIfStandStill')
@@ -27,6 +30,10 @@ local function updateSettings()
         collisionType = util.bitOr(collisionType, nearby.COLLISION_TYPE.VisualOnly)
     end
     camera.setCollisionType(collisionType)
+    move360.enabled = settings:get('move360')
+    move360.turnSpeed = settings:get('move360TurnSpeed')
+    pov_auto_switch.enabled = settings:get('povAutoSwitch')
+    slowViewChange = settings:get('slowViewChange')
 end
 
 local primaryMode
@@ -167,6 +174,7 @@ local function onUpdate(dt)
     camera.setExtraRoll(0)
     camera.setFirstPersonOffset(util.vector3(0, 0, 0))
     updateSmoothedSpeed(dt)
+    pov_auto_switch.onUpdate(dt)
 end
 
 local function onFrame(dt)
@@ -188,6 +196,12 @@ local function onFrame(dt)
     applyControllerZoom(dt)
     third_person.update(dt, smoothedSpeed)
     if noHeadBobbing == 0 then head_bobbing.update(dt, smoothedSpeed) end
+    if slowViewChange then
+        local maxIncrease = dt * (100 + third_person.baseDistance)
+        camera.setPreferredThirdPersonDistance(
+            math.min(camera.getThirdPersonDistance() + maxIncrease, third_person.preferredDistance))
+    end
+    move360.onFrame(dt)
 end
 
 return {
@@ -255,6 +269,7 @@ return {
             elseif action == input.ACTION.ZoomOut then
                 zoom(-10)
             end
+            move360.onInputAction(action)
         end,
         onActive = init,
         onLoad = function(data)
@@ -265,4 +280,3 @@ return {
         end,
     },
 }
-
diff --git a/files/data/scripts/omw/camera/first_person_auto_switch.lua b/files/data/scripts/omw/camera/first_person_auto_switch.lua
new file mode 100644
index 0000000000..a1c0b863c9
--- /dev/null
+++ b/files/data/scripts/omw/camera/first_person_auto_switch.lua
@@ -0,0 +1,52 @@
+local camera = require('openmw.camera')
+local util = require('openmw.util')
+local nearby = require('openmw.nearby')
+local self = require('openmw.self')
+
+local forcedFirstPerson = false
+local limitSwitch = 40
+local limitReturn = 65
+
+local rayOptions = {collisionType = nearby.COLLISION_TYPE.Default - nearby.COLLISION_TYPE.Actor}
+local function castRayBackward()
+    local from = camera.getTrackedPosition()
+    local orient = util.transform.rotateZ(camera.getYaw()) * util.transform.rotateX(camera.getPitch())
+    local resLeft = nearby.castRay(from, from + orient * util.vector3(-30, -limitReturn, 0), rayOptions)
+    local resRight = nearby.castRay(from, from + orient * util.vector3(30, -limitReturn, 0), rayOptions)
+    local distLeft = limitReturn + 1
+    local distRight = limitReturn + 1
+    if resLeft.hit then distLeft = (resLeft.hitPos - from):length() end
+    if resRight.hit then distRight = (resRight.hitPos - from):length() end
+    return math.min(distLeft, distRight)
+end
+
+local M = {
+    enabled = false,
+}
+
+function M.onUpdate(dt)
+    if camera.getMode() ~= camera.MODE.FirstPerson then forcedFirstPerson = false end
+    if not M.enabled then
+        if forcedFirstPerson then
+            camera.setMode(camera.MODE.ThirdPerson, false)
+            forcedFirstPerson = false
+        end
+        return
+    end
+    if camera.getMode() == camera.MODE.ThirdPerson and camera.getThirdPersonDistance() < limitSwitch
+            and math.abs(util.normalizeAngle(camera.getYaw() - self.rotation.z)) < math.rad(10) then
+        if castRayBackward() <= limitSwitch then
+            camera.setMode(camera.MODE.FirstPerson, true)
+            forcedFirstPerson = true
+        end
+        return
+    end
+    if forcedFirstPerson then
+        if castRayBackward() > limitReturn then
+            camera.setMode(camera.MODE.ThirdPerson, false)
+            forcedFirstPerson = false
+        end
+    end
+end
+
+return M
diff --git a/files/data/scripts/omw/camera/move360.lua b/files/data/scripts/omw/camera/move360.lua
new file mode 100644
index 0000000000..5247c03a30
--- /dev/null
+++ b/files/data/scripts/omw/camera/move360.lua
@@ -0,0 +1,73 @@
+local core = require('openmw.core')
+local camera = require('openmw.camera')
+local input = require('openmw.input')
+local self = require('openmw.self')
+local util = require('openmw.util')
+local I = require('openmw.interfaces')
+
+local Actor = require('openmw.types').Actor
+
+local MODE = camera.MODE
+
+local active = false
+
+local M = {
+    enabled = false,
+    turnSpeed = 5,
+}
+
+local function turnOn()
+    I.Camera.disableStandingPreview()
+    active = true
+end
+
+local function turnOff()
+    I.Camera.enableStandingPreview()
+    active = false
+    if camera.getMode() == MODE.Preview then
+        camera.setMode(MODE.ThirdPerson)
+    end
+end
+
+function M.onFrame(dt)
+    if core.isWorldPaused() then return end
+    local newActive = M.enabled and Actor.stance(self) == Actor.STANCE.Nothing
+    if newActive and not active then
+        turnOn()
+    elseif not newActive and active then
+        turnOff()
+    end
+    if not active then return end
+    if camera.getMode() == MODE.Static then return end
+    if camera.getMode() == MODE.ThirdPerson then camera.setMode(MODE.Preview) end
+    if camera.getMode() == MODE.Preview and not input.isActionPressed(input.ACTION.TogglePOV) then
+        camera.showCrosshair(camera.getFocalPreferredOffset():length() > 5)
+        local move = util.vector2(self.controls.sideMovement, self.controls.movement)
+        local yawDelta = camera.getYaw() - self.rotation.z
+        move = move:rotate(-yawDelta)
+        self.controls.sideMovement = move.x
+        self.controls.movement = move.y
+        self.controls.pitchChange = camera.getPitch() * math.cos(yawDelta) - self.rotation.x
+        if move:length() > 0.05 then
+            local delta = math.atan2(move.x, move.y)
+            local maxDelta = math.max(delta, 1) * M.turnSpeed * dt
+            self.controls.yawChange = util.clamp(delta, -maxDelta, maxDelta)
+        else
+            self.controls.yawChange = 0
+        end
+    end
+end
+
+function M.onInputAction(action)
+    if not active or core.isWorldPaused() then return end
+    if action == input.ACTION.ZoomIn and camera.getMode() == MODE.Preview
+       and I.Camera.getBaseThirdPersonDistance() == 30 then
+        self.controls.yawChange = camera.getYaw() - self.rotation.z
+        camera.setMode(MODE.FirstPerson)
+    elseif action == input.ACTION.ZoomOut and camera.getMode() == MODE.FirstPerson then
+        camera.setMode(MODE.Preview)
+        I.Camera.setBaseThirdPersonDistance(30)
+    end
+end
+
+return M
diff --git a/files/data/scripts/omw/camera/settings.lua b/files/data/scripts/omw/camera/settings.lua
index ec7f8a9c07..06cbbfc6f0 100644
--- a/files/data/scripts/omw/camera/settings.lua
+++ b/files/data/scripts/omw/camera/settings.lua
@@ -48,6 +48,10 @@ I.Settings.registerGroup({
         boolSetting('', 'previewIfStandStill', true),
         boolSetting('', 'deferredPreviewRotation', true),
         boolSetting('', 'ignoreNC', true),
+        boolSetting('', 'move360', false),
+        floatSetting('', 'move360TurnSpeed', 5),
+        boolSetting('', 'slowViewChange', false),
+        boolSetting('', 'povAutoSwitch', false),
     },
 })
 
@@ -72,11 +76,14 @@ local settings = {
 }
 
 local function updateViewOverShoulderDisabled()
-    local disabled = not settings.thirdPerson:get('viewOverShoulder')
-    I.Settings.updateRendererArgument(thirdPersonGroup, 'shoulderOffsetX', {disabled = disabled})
-    I.Settings.updateRendererArgument(thirdPersonGroup, 'shoulderOffsetY', {disabled = disabled})
-    I.Settings.updateRendererArgument(thirdPersonGroup, 'autoSwitchShoulder', {disabled = disabled})
-    I.Settings.updateRendererArgument(thirdPersonGroup, 'zoomOutWhenMoveCoef', {disabled = disabled})
+    local shoulderDisabled = not settings.thirdPerson:get('viewOverShoulder')
+    I.Settings.updateRendererArgument(thirdPersonGroup, 'shoulderOffsetX', {disabled = shoulderDisabled})
+    I.Settings.updateRendererArgument(thirdPersonGroup, 'shoulderOffsetY', {disabled = shoulderDisabled})
+    I.Settings.updateRendererArgument(thirdPersonGroup, 'autoSwitchShoulder', {disabled = shoulderDisabled})
+    I.Settings.updateRendererArgument(thirdPersonGroup, 'zoomOutWhenMoveCoef', {disabled = shoulderDisabled})
+
+    local move360Disabled = not settings.thirdPerson:get('move360')
+    I.Settings.updateRendererArgument(thirdPersonGroup, 'move360TurnSpeed', {disabled = move360Disabled})
 end
 
 local function updateHeadBobbingDisabled()

From 5f0a7c2b169788099f2985b20b0cd5313c5a9cfe Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Wed, 8 Jun 2022 21:23:20 +0200
Subject: [PATCH 2612/2859] Fix jumping when using move360 with a controller

---
 apps/openmw/mwinput/controllermanager.cpp | 2 +-
 files/data/scripts/omw/camera/camera.lua  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwinput/controllermanager.cpp b/apps/openmw/mwinput/controllermanager.cpp
index 1160b3a0b3..4db9fad595 100644
--- a/apps/openmw/mwinput/controllermanager.cpp
+++ b/apps/openmw/mwinput/controllermanager.cpp
@@ -277,7 +277,7 @@ namespace MWInput
         {
             gamepadToGuiControl(arg);
         }
-        else if (MWBase::Environment::get().getWorld()->isPreviewModeEnabled() &&
+        else if (mBindingsManager->actionIsActive(A_TogglePOV) &&
                 (arg.axis == SDL_CONTROLLER_AXIS_TRIGGERRIGHT || arg.axis == SDL_CONTROLLER_AXIS_TRIGGERLEFT))
         {
             // Preview Mode Gamepad Zooming; do not propagate to mBindingsManager
diff --git a/files/data/scripts/omw/camera/camera.lua b/files/data/scripts/omw/camera/camera.lua
index ce1bd2d48b..46fa732247 100644
--- a/files/data/scripts/omw/camera/camera.lua
+++ b/files/data/scripts/omw/camera/camera.lua
@@ -135,7 +135,7 @@ local function zoom(delta)
 end
 
 local function applyControllerZoom(dt)
-    if camera.getMode() == MODE.Preview then
+    if input.isActionPressed(input.ACTION.TogglePOV) then
         local triggerLeft = input.getAxisValue(input.CONTROLLER_AXIS.TriggerLeft)
         local triggerRight = input.getAxisValue(input.CONTROLLER_AXIS.TriggerRight)
         local controllerZoom = (triggerRight - triggerLeft) * 100 * dt

From 73eda27e7f2e8029d72f23798af436c3b0fe54f9 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 12 Jun 2022 00:59:03 +0200
Subject: [PATCH 2613/2859] Update l10n/OMWCamera/en.yaml

---
 files/data/l10n/OMWCamera/en.yaml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/files/data/l10n/OMWCamera/en.yaml b/files/data/l10n/OMWCamera/en.yaml
index eefc192960..d030bd22ec 100644
--- a/files/data/l10n/OMWCamera/en.yaml
+++ b/files/data/l10n/OMWCamera/en.yaml
@@ -7,31 +7,30 @@ viewOverShoulder: "View over the shoulder"
 viewOverShoulderDescription: |
     Controls third person view mode.
       No: view is centered on the character's head. Crosshair is hidden.
-      Yes: in non-combat mode camera is positioned behind the character's shoulder, crosshair is always visible.
+      Yes: while weapon sheathed the camera is positioned behind the character's shoulder, crosshair is always visible.
 
 shoulderOffsetX: "Shoulder view horizontal offset"
 shoulderOffsetXDescription: >
-    Horizontal offset of the camera in the view-over-the-shoulder mode.
+    Horizontal offset of the over-the-shoulder view.
     For the left shoulder use a negative value.
 
 shoulderOffsetY: "Shoulder view vertical offset"
 shoulderOffsetYDescription: >
-    Vertical offset of the camera in the view-over-the-shoulder mode.
+    Vertical offset of the over-the-shoulder view.
 
 autoSwitchShoulder: "Auto switch shoulder"
 autoSwitchShoulderDescription: >
-    When player is close to an obstacle, automatically switches camera
-    to the shoulder that is farther away from the obstacle.
+    When there are obstacles that would push the camera close to the player character,
+    this setting makes the camera automatically switch to the shoulder farther away from the obstacles.
 
 zoomOutWhenMoveCoef: "Zoom out when move coef"
 zoomOutWhenMoveCoefDescription: >
-    Slightly pulls camera away (or closer in case of a negative value) when the character moves.
-    Works only if "view over the shoulder" is enabled. To disable set it to zero (default: 20.0).
+    Moves the camera away (positive value) or towards (negative value) the player character while the character is moving.
+    Works only if "view over the shoulder" is enabled. Set this to zero to disable (default: 20.0).
 
 previewIfStandStill: "Preview if stand still"
 previewIfStandStillDescription: >
-    If enabled then the character rotation is not synchonized with the camera rotation
-    while the character doesn't move and not in combat mode.
+    Prevents the player character from turning towards the camera direction while they're idle and have their weapon sheathed.
 
 deferredPreviewRotation: "Deferred preview rotation"
 deferredPreviewRotationDescription: |
@@ -40,20 +39,21 @@ deferredPreviewRotationDescription: |
 
 ignoreNC: "Ignore 'No Collision' flag"
 ignoreNCDescription: >
-    Prevents camera from clipping through the objects with the NC (No Collision) NIF flag.
+    Prevents the camera from clipping through objects that have NC (No Collision) flag turned on in the NIF model.
 
 move360: "Move 360"
 move360Description: >
-    When without weapon in hands the character rotates to the direction of movement. I.e. looks to the camera when run backwards.
+    Makes the movement direction independent from the camera direction while the player character's weapon
+    is sheathed. For example, the player character will look at the camera while running backwards.
 
 move360TurnSpeed: "Move 360 turning speed"
-move360TurnSpeedDescription: A multiplier for the turning speed (5.0 by default)
+move360TurnSpeedDescription: "Turning speed multiplier (default: 5.0)."
 
 slowViewChange: "Smooth view change"
-slowViewChangeDescription: "Makes switching from 1st person to 3rd person view not instant."
+slowViewChangeDescription: "Makes the transition from 1st person to 3rd person view non-instantaneous."
 
 povAutoSwitch: "First person auto switch"
-povAutoSwitchDescription: "Auto switch to 1st person view if there is an obstacle right behind the player."
+povAutoSwitchDescription: "Auto switch to the first person view if there is an obstacle right behind the player."
 
 
 headBobbingSettings: "Head bobbing in first person view"

From 31d636ea2025361a9491cbf0d6046d2051197040 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Sun, 12 Jun 2022 02:25:09 +0300
Subject: [PATCH 2614/2859] Map movement animation groups with a switch

---
 apps/openmw/mwmechanics/character.cpp | 127 +++++++++++---------------
 1 file changed, 54 insertions(+), 73 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 471ec7b5f4..4fbb0bb869 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -105,6 +105,47 @@ MWMechanics::CharacterState runStateToWalkState (MWMechanics::CharacterState sta
     return ret;
 }
 
+// Converts a movement state to its equivalent base animation group as long as it is a movement state.
+std::string movementStateToAnimGroup(MWMechanics::CharacterState state)
+{
+    using namespace MWMechanics;
+    switch (state)
+    {
+        case CharState_WalkForward: return "walkforward";
+        case CharState_WalkBack: return "walkback";
+        case CharState_WalkLeft: return "walkleft";
+        case CharState_WalkRight: return "walkright";
+
+        case CharState_SwimWalkForward: return "swimwalkforward";
+        case CharState_SwimWalkBack: return "swimwalkback";
+        case CharState_SwimWalkLeft: return "swimwalkleft";
+        case CharState_SwimWalkRight: return "swimwalkright";
+
+        case CharState_RunForward: return "runforward";
+        case CharState_RunBack: return "runback";
+        case CharState_RunLeft: return "runleft";
+        case CharState_RunRight: return "runright";
+
+        case CharState_SwimRunForward: return "swimrunforward";
+        case CharState_SwimRunBack: return "swimrunback";
+        case CharState_SwimRunLeft: return "swimrunleft";
+        case CharState_SwimRunRight: return "swimrunright";
+
+        case CharState_SneakForward: return "sneakforward";
+        case CharState_SneakBack: return "sneakback";
+        case CharState_SneakLeft: return "sneakleft";
+        case CharState_SneakRight: return "sneakright";
+
+        case CharState_Jump: return "jump";
+
+        case CharState_TurnLeft: return "turnleft";
+        case CharState_TurnRight: return "turnright";
+        case CharState_SwimTurnLeft: return "swimturnleft";
+        case CharState_SwimTurnRight: return "swimturnright";
+        default: return {};
+    }
+}
+
 float getFallDamage(const MWWorld::Ptr& ptr, float fallHeight)
 {
     MWBase::World *world = MWBase::Environment::get().getWorld();
@@ -139,58 +180,6 @@ float getFallDamage(const MWWorld::Ptr& ptr, float fallHeight)
 namespace MWMechanics
 {
 
-struct StateInfo {
-    CharacterState state;
-    const char groupname[32];
-};
-
-static const StateInfo sMovementList[] = {
-    { CharState_WalkForward, "walkforward" },
-    { CharState_WalkBack, "walkback" },
-    { CharState_WalkLeft, "walkleft" },
-    { CharState_WalkRight, "walkright" },
-
-    { CharState_SwimWalkForward, "swimwalkforward" },
-    { CharState_SwimWalkBack, "swimwalkback" },
-    { CharState_SwimWalkLeft, "swimwalkleft" },
-    { CharState_SwimWalkRight, "swimwalkright" },
-
-    { CharState_RunForward, "runforward" },
-    { CharState_RunBack, "runback" },
-    { CharState_RunLeft, "runleft" },
-    { CharState_RunRight, "runright" },
-
-    { CharState_SwimRunForward, "swimrunforward" },
-    { CharState_SwimRunBack, "swimrunback" },
-    { CharState_SwimRunLeft, "swimrunleft" },
-    { CharState_SwimRunRight, "swimrunright" },
-
-    { CharState_SneakForward, "sneakforward" },
-    { CharState_SneakBack, "sneakback" },
-    { CharState_SneakLeft, "sneakleft" },
-    { CharState_SneakRight, "sneakright" },
-
-    { CharState_Jump, "jump" },
-
-    { CharState_TurnLeft, "turnleft" },
-    { CharState_TurnRight, "turnright" },
-    { CharState_SwimTurnLeft, "swimturnleft" },
-    { CharState_SwimTurnRight, "swimturnright" },
-};
-static const StateInfo *sMovementListEnd = &sMovementList[sizeof(sMovementList)/sizeof(sMovementList[0])];
-
-
-class FindCharState {
-    CharacterState state;
-
-public:
-    FindCharState(CharacterState _state) : state(_state) { }
-
-    bool operator()(const StateInfo &info) const
-    { return info.state == state; }
-};
-
-
 std::string CharacterController::chooseRandomGroup (const std::string& prefix, int* num) const
 {
     auto& prng = MWBase::Environment::get().getWorld()->getPrng();
@@ -492,33 +481,25 @@ void CharacterController::refreshMovementAnims(const std::string& weapShortGroup
     // 2. When we use a fallback animation for lower body since movement animation for given weapon is missing (e.g. for crossbows and spellcasting)
     bool resetIdle = (movement != CharState_None && !isTurning());
 
-    std::string movementAnimName;
-    MWRender::Animation::BlendMask movemask;
-    const StateInfo *movestate;
+    std::string movementAnimName = movementStateToAnimGroup(movement);
+    MWRender::Animation::BlendMask movemask = MWRender::Animation::BlendMask_All;
 
-    movemask = MWRender::Animation::BlendMask_All;
-    movestate = std::find_if(sMovementList, sMovementListEnd, FindCharState(movement));
-    if(movestate != sMovementListEnd)
+    if (!movementAnimName.empty())
     {
-        movementAnimName = movestate->groupname;
         if(!weapShortGroup.empty())
         {
             std::string::size_type swimpos = movementAnimName.find("swim");
             if (swimpos == std::string::npos)
             {
+                std::string weapMovementAnimName;
                 if (mWeaponType == ESM::Weapon::Spell && (movement == CharState_TurnLeft || movement == CharState_TurnRight)) // Spellcasting stance turning is a special case
-                    movementAnimName = weapShortGroup + movementAnimName;
+                    weapMovementAnimName = weapShortGroup + movementAnimName;
                 else
-                    movementAnimName += weapShortGroup;
-            }
+                    weapMovementAnimName = movementAnimName + weapShortGroup;
 
-            if(!mAnimation->hasAnimation(movementAnimName))
-            {
-                movementAnimName = movestate->groupname;
-                if (swimpos == std::string::npos)
+                if (!mAnimation->hasAnimation(weapMovementAnimName))
                 {
-                    movementAnimName = fallbackShortWeaponGroup(movementAnimName, &movemask);
-
+                    weapMovementAnimName = fallbackShortWeaponGroup(movementAnimName, &movemask);
                     // If we apply movement only for lower body, do not reset idle animations.
                     // For upper body there will be idle animation.
                     if (movemask == MWRender::Animation::BlendMask_LowerBody && idle == CharState_None)
@@ -527,6 +508,8 @@ void CharacterController::refreshMovementAnims(const std::string& weapShortGroup
                     if (movemask == MWRender::Animation::BlendMask_LowerBody)
                         resetIdle = false;
                 }
+
+                movementAnimName = weapMovementAnimName;
             }
         }
     }
@@ -534,7 +517,7 @@ void CharacterController::refreshMovementAnims(const std::string& weapShortGroup
     if(force || movement != mMovementState)
     {
         mMovementState = movement;
-        if(movestate != sMovementListEnd)
+        if (!movementAnimName.empty())
         {
             if(!mAnimation->hasAnimation(movementAnimName))
             {
@@ -595,14 +578,12 @@ void CharacterController::refreshMovementAnims(const std::string& weapShortGroup
 
             // For non-flying creatures, MW uses the Walk animation to calculate the animation velocity
             // even if we are running. This must be replicated, otherwise the observed speed would differ drastically.
-            std::string anim = mCurrentMovement;
             mAdjustMovementAnimSpeed = true;
             if (mPtr.getClass().getType() == ESM::Creature::sRecordId
                     && !(mPtr.get<ESM::Creature>()->mBase->mFlags & ESM::Creature::Flies))
             {
                 CharacterState walkState = runStateToWalkState(mMovementState);
-                const StateInfo *stateinfo = std::find_if(sMovementList, sMovementListEnd, FindCharState(walkState));
-                anim = stateinfo->groupname;
+                std::string anim = movementStateToAnimGroup(walkState);
 
                 mMovementAnimSpeed = mAnimation->getVelocity(anim);
                 if (mMovementAnimSpeed <= 1.0f)
@@ -618,7 +599,7 @@ void CharacterController::refreshMovementAnims(const std::string& weapShortGroup
             }
             else
             {
-                mMovementAnimSpeed = mAnimation->getVelocity(anim);
+                mMovementAnimSpeed = mAnimation->getVelocity(mCurrentMovement);
 
                 if (mMovementAnimSpeed <= 1.0f)
                 {

From b4e87abfe1ab33d5381b4f74803e2272295caf15 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Sun, 12 Jun 2022 02:52:49 +0300
Subject: [PATCH 2615/2859] Clean up run-to-walk state conversion

---
 apps/openmw/mwmechanics/character.cpp | 39 +++++++--------------------
 1 file changed, 10 insertions(+), 29 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 4fbb0bb869..ed5c89dd05 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -68,41 +68,22 @@ std::string getBestAttack (const ESM::Weapon* weapon)
         return "chop";
 }
 
-// Converts a movement Run state to its equivalent Walk state.
+// Converts a movement Run state to its equivalent Walk state, if there is one.
 MWMechanics::CharacterState runStateToWalkState (MWMechanics::CharacterState state)
 {
     using namespace MWMechanics;
-    CharacterState ret = state;
     switch (state)
     {
-        case CharState_RunForward:
-            ret = CharState_WalkForward;
-            break;
-        case CharState_RunBack:
-            ret = CharState_WalkBack;
-            break;
-        case CharState_RunLeft:
-            ret = CharState_WalkLeft;
-            break;
-        case CharState_RunRight:
-            ret = CharState_WalkRight;
-            break;
-        case CharState_SwimRunForward:
-            ret = CharState_SwimWalkForward;
-            break;
-        case CharState_SwimRunBack:
-            ret = CharState_SwimWalkBack;
-            break;
-        case CharState_SwimRunLeft:
-            ret = CharState_SwimWalkLeft;
-            break;
-        case CharState_SwimRunRight:
-            ret = CharState_SwimWalkRight;
-            break;
-        default:
-            break;
+        case CharState_RunForward: return CharState_WalkForward;
+        case CharState_RunBack: return CharState_WalkBack;
+        case CharState_RunLeft: return CharState_WalkLeft;
+        case CharState_RunRight: return CharState_WalkRight;
+        case CharState_SwimRunForward: return CharState_SwimWalkForward;
+        case CharState_SwimRunBack: return CharState_SwimWalkBack;
+        case CharState_SwimRunLeft: return CharState_SwimWalkLeft;
+        case CharState_SwimRunRight: return CharState_SwimWalkRight;
+        default: return state;
     }
-    return ret;
 }
 
 // Converts a movement state to its equivalent base animation group as long as it is a movement state.

From 47f574e14b0bb35ddf7a06c3ceb13e5a07c87fd5 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Sun, 12 Jun 2022 02:58:04 +0300
Subject: [PATCH 2616/2859] Move death state mapping out of
 playDeath/playRandomDeath

---
 apps/openmw/mwmechanics/character.cpp | 91 ++++++++++++++-------------
 1 file changed, 47 insertions(+), 44 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index ed5c89dd05..aef09fed5f 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -86,6 +86,20 @@ MWMechanics::CharacterState runStateToWalkState (MWMechanics::CharacterState sta
     }
 }
 
+// Converts a Hit state to its equivalent Death state.
+MWMechanics::CharacterState hitStateToDeathState (MWMechanics::CharacterState state)
+{
+    using namespace MWMechanics;
+    switch (state)
+    {
+        case CharState_SwimKnockDown: return CharState_SwimDeathKnockDown;
+        case CharState_SwimKnockOut: return CharState_SwimDeathKnockOut;
+        case CharState_KnockDown: return CharState_DeathKnockDown;
+        case CharState_DeathKnockOut: return CharState_DeathKnockOut;
+        default: return CharState_None;
+    }
+}
+
 // Converts a movement state to its equivalent base animation group as long as it is a movement state.
 std::string movementStateToAnimGroup(MWMechanics::CharacterState state)
 {
@@ -127,6 +141,26 @@ std::string movementStateToAnimGroup(MWMechanics::CharacterState state)
     }
 }
 
+// Converts a death state to its equivalent animation group as long as it is a death state.
+std::string deathStateToAnimGroup(MWMechanics::CharacterState state)
+{
+    using namespace MWMechanics;
+    switch (state)
+    {
+        case CharState_SwimDeath: return "swimdeath";
+        case CharState_SwimDeathKnockDown: return "swimdeathknockdown";
+        case CharState_SwimDeathKnockOut: return "swimdeathknockout";
+        case CharState_DeathKnockDown: return "deathknockdown";
+        case CharState_DeathKnockOut: return "deathknockout";
+        case CharState_Death1: return "death1";
+        case CharState_Death2: return "death2";
+        case CharState_Death3: return "death3";
+        case CharState_Death4: return "death4";
+        case CharState_Death5: return "death5";
+        default: return {};
+    }
+}
+
 float getFallDamage(const MWWorld::Ptr& ptr, float fallHeight)
 {
     MWBase::World *world = MWBase::Environment::get().getWorld();
@@ -689,30 +723,17 @@ void CharacterController::refreshCurrentAnims(CharacterState idle, CharacterStat
 
 void CharacterController::playDeath(float startpoint, CharacterState death)
 {
+    mDeathState = death;
+    mCurrentDeath = deathStateToAnimGroup(mDeathState);
+
     // Make sure the character was swimming upon death for forward-compatibility
-    const bool wasSwimming = MWBase::Environment::get().getWorld()->isSwimming(mPtr);
-
-    switch (death)
-    {
-    case CharState_SwimDeath:
-        mCurrentDeath = "swimdeath";
-        break;
-    case CharState_SwimDeathKnockDown:
-        mCurrentDeath = (wasSwimming ? "swimdeathknockdown" : "deathknockdown");
-        break;
-    case CharState_SwimDeathKnockOut:
-        mCurrentDeath = (wasSwimming ? "swimdeathknockout" : "deathknockout");
-        break;
-    case CharState_DeathKnockDown:
-        mCurrentDeath = "deathknockdown";
-        break;
-    case CharState_DeathKnockOut:
-        mCurrentDeath = "deathknockout";
-        break;
-    default:
-        mCurrentDeath = "death" + std::to_string(death - CharState_Death1 + 1);
+    if (!MWBase::Environment::get().getWorld()->isSwimming(mPtr))
+    {
+        if (mDeathState == CharState_SwimDeathKnockDown)
+            mCurrentDeath = "deathknockdown";
+        else if (mDeathState == CharState_SwimDeathKnockOut)
+            mCurrentDeath = "deathknockout";
     }
-    mDeathState = death;
 
     mPtr.getClass().getCreatureStats(mPtr).setDeathAnimation(mDeathState - CharState_Death1);
 
@@ -756,30 +777,12 @@ void CharacterController::playRandomDeath(float startpoint)
         MWBase::Environment::get().getWorld()->useDeathCamera();
     }
 
-    if(mHitState == CharState_SwimKnockDown && mAnimation->hasAnimation("swimdeathknockdown"))
-    {
-        mDeathState = CharState_SwimDeathKnockDown;
-    }
-    else if(mHitState == CharState_SwimKnockOut && mAnimation->hasAnimation("swimdeathknockout"))
-    {
-        mDeathState = CharState_SwimDeathKnockOut;
-    }
-    else if(MWBase::Environment::get().getWorld()->isSwimming(mPtr) && mAnimation->hasAnimation("swimdeath"))
-    {
+    mDeathState = hitStateToDeathState(mHitState);
+    if (mDeathState == CharState_None && MWBase::Environment::get().getWorld()->isSwimming(mPtr))
         mDeathState = CharState_SwimDeath;
-    }
-    else if (mHitState == CharState_KnockDown && mAnimation->hasAnimation("deathknockdown"))
-    {
-        mDeathState = CharState_DeathKnockDown;
-    }
-    else if (mHitState == CharState_KnockOut && mAnimation->hasAnimation("deathknockout"))
-    {
-        mDeathState = CharState_DeathKnockOut;
-    }
-    else
-    {
+
+    if (mDeathState == CharState_None || !mAnimation->hasAnimation(deathStateToAnimGroup(mDeathState)))
         mDeathState = chooseRandomDeathState();
-    }
 
     // Do not interrupt scripted animation by death
     if (isPersistentAnimPlaying())

From c2e637d6610718559166e29ed592d1ac2d80a537 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Sun, 12 Jun 2022 03:02:23 +0300
Subject: [PATCH 2617/2859] Mark setAttackingOrSpell as const

---
 apps/openmw/mwmechanics/character.cpp | 2 +-
 apps/openmw/mwmechanics/character.hpp | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index aef09fed5f..5f6d7e0eec 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -2707,7 +2707,7 @@ bool CharacterController::isRunning() const
             mMovementState == CharState_SwimRunRight;
 }
 
-void CharacterController::setAttackingOrSpell(bool attackingOrSpell)
+void CharacterController::setAttackingOrSpell(bool attackingOrSpell) const
 {
     mPtr.getClass().getCreatureStats(mPtr).setAttackingOrSpell(attackingOrSpell);
 }
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index ac53dd4d45..1ae09c9d1a 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -234,8 +234,7 @@ class CharacterController : public MWRender::Animation::TextKeyListener
     std::string getWeaponAnimation(int weaponType) const;
 
     bool getAttackingOrSpell() const;
-    void setAttackingOrSpell(bool attackingOrSpell);
-
+    void setAttackingOrSpell(bool attackingOrSpell) const;
 
 public:
     CharacterController(const MWWorld::Ptr &ptr, MWRender::Animation *anim);

From bb0dad7c087b42e9187e4dd3908ff379d58086ae Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Sun, 12 Jun 2022 08:00:11 +0000
Subject: [PATCH 2618/2859] Update to C++20 and see if our CI can handle it.

---
 .gitlab-ci.yml                  | 10 +++++-----
 CI/before_install.osx.sh        |  3 ++-
 CI/before_script.msvc.sh        | 10 +++++-----
 CMakeLists.txt                  |  2 +-
 apps/launcher/datafilespage.cpp | 16 ++++++++--------
 apps/openmw/mwlua/stats.cpp     |  8 ++++----
 components/fx/technique.cpp     |  2 +-
 7 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 88a82358a1..c9630e3bd5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -117,13 +117,13 @@ Coverity:
 Ubuntu_GCC:
   extends: .Ubuntu
   cache:
-    key: Ubuntu_GCC.v2
+    key: Ubuntu_GCC.v3
   before_script:
     - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic
   variables:
     CC: gcc
     CXX: g++
-    CCACHE_SIZE: 3G
+    CCACHE_SIZE: 4G
   # 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
 
@@ -414,7 +414,7 @@ variables: &tests-targets
   after_script:
     - Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log
   cache:
-    key: ninja-v2
+    key: ninja-v3
     paths:
     - ccache
     - deps
@@ -550,7 +550,7 @@ variables: &tests-targets
   after_script:
     - Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log
   cache:
-    key: msbuild-v2
+    key: msbuild-v3
     paths:
     - ccache
     - deps
@@ -614,7 +614,7 @@ Windows_MSBuild_Engine_RelWithDebInfo:
     <<: *cs-targets
     config: "Debug"
 
-.Windows_MSBuild_CS_RelWithDebInfo:
+Windows_MSBuild_CS_RelWithDebInfo:
   extends:
     - .Windows_MSBuild_Base
   variables:
diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index ba269ae0e0..87013df1ae 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -9,6 +9,7 @@ brew update --quiet
 [ -z "${TRAVIS}" ] && brew uninstall --ignore-dependencies qt@6 || true
 
 # Some of these tools can come from places other than brew, so check before installing
+[ -z "${TRAVIS}" ] && brew reinstall xquartz
 [ -z "${TRAVIS}" ] && brew reinstall fontconfig
 command -v ccache >/dev/null 2>&1 || brew install ccache
 command -v cmake >/dev/null 2>&1 || brew install cmake
@@ -21,6 +22,6 @@ ccache --version
 cmake --version
 qmake --version
 
-curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/macos/openmw-deps-20210716.zip -o ~/openmw-deps.zip
+curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/macos/openmw-deps-20220225.zip -o ~/openmw-deps.zip
 unzip -o ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null
 
diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 17ff27f9f1..94c0f5fa46 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -608,12 +608,12 @@ if [ -z $SKIP_DOWNLOAD ]; then
 		"LuaJIT-2.1.0-beta3-msvc${MSVC_REAL_YEAR}-win${BITS}.7z"
 
 	# Google test and mock
-	if [ ! -z $TEST_FRAMEWORK ]; then
-		echo "Google test 1.10.0..."
+	if [ -n "$TEST_FRAMEWORK" ]; then
+		echo "Google test 1.11.0..."
 		if [ -d googletest ]; then
 			printf "  Google test exists, skipping."
 		else
-			git clone -b release-1.10.0 https://github.com/google/googletest.git
+			git clone -b release-1.11.0 https://github.com/google/googletest.git
 		fi
 	fi
 
@@ -1002,8 +1002,8 @@ printf "LuaJIT 2.1.0-beta3... "
 cd $DEPS
 echo
 # Google Test and Google Mock
-if [ ! -z $TEST_FRAMEWORK ]; then
-	printf "Google test 1.10.0 ..."
+if [ -n "$TEST_FRAMEWORK" ]; then
+	printf "Google test 1.11.0 ..."
 
 	cd googletest
 	mkdir -p build${MSVC_REAL_YEAR}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5008d369dd..99eab68118 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 project(OpenMW)
 cmake_minimum_required(VERSION 3.1.0)
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 include(GNUInstallDirs)
diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index 29042a72a6..c096198462 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -139,14 +139,14 @@ Launcher::DataFilesPage::DataFilesPage(Files::ConfigurationManager &cfg, Config:
             this, SLOT(updateNewProfileOkButton(QString)));
     connect(mCloneProfileDialog->lineEdit(), SIGNAL(textChanged(QString)),
             this, SLOT(updateCloneProfileOkButton(QString)));
-    connect(ui.directoryAddSubdirsButton, &QPushButton::released, this, [=]() { this->addSubdirectories(true); });
-    connect(ui.directoryInsertButton,     &QPushButton::released, this, [=]() { this->addSubdirectories(false); });
-    connect(ui.directoryUpButton,         &QPushButton::released, this, [=]() { this->moveDirectory(-1); });
-    connect(ui.directoryDownButton,       &QPushButton::released, this, [=]() { this->moveDirectory(1); });
-    connect(ui.directoryRemoveButton,     &QPushButton::released, this, [=]() { this->removeDirectory(); });
-    connect(ui.archiveUpButton,           &QPushButton::released, this, [=]() { this->moveArchive(-1); });
-    connect(ui.archiveDownButton,         &QPushButton::released, this, [=]() { this->moveArchive(1); });
-    connect(ui.directoryListWidget->model(), &QAbstractItemModel::rowsMoved, this, [=]() { this->sortDirectories(); });
+    connect(ui.directoryAddSubdirsButton, &QPushButton::released, this, [this]() { this->addSubdirectories(true); });
+    connect(ui.directoryInsertButton,     &QPushButton::released, this, [this]() { this->addSubdirectories(false); });
+    connect(ui.directoryUpButton,         &QPushButton::released, this, [this]() { this->moveDirectory(-1); });
+    connect(ui.directoryDownButton,       &QPushButton::released, this, [this]() { this->moveDirectory(1); });
+    connect(ui.directoryRemoveButton,     &QPushButton::released, this, [this]() { this->removeDirectory(); });
+    connect(ui.archiveUpButton,           &QPushButton::released, this, [this]() { this->moveArchive(-1); });
+    connect(ui.archiveDownButton,         &QPushButton::released, this, [this]() { this->moveArchive(1); });
+    connect(ui.directoryListWidget->model(), &QAbstractItemModel::rowsMoved, this, [this]() { this->sortDirectories(); });
 
     buildView();
     loadSettings();
diff --git a/apps/openmw/mwlua/stats.cpp b/apps/openmw/mwlua/stats.cpp
index f81293513d..d1983c6077 100644
--- a/apps/openmw/mwlua/stats.cpp
+++ b/apps/openmw/mwlua/stats.cpp
@@ -155,7 +155,7 @@ namespace MWLua
         template<class G>
         sol::object get(const Context& context, std::string_view prop, G getter) const
         {
-            return getValue(context, mObject, &DynamicStat::setValue, mIndex, prop, [=](const MWLua::Object* obj)
+            return getValue(context, mObject, &DynamicStat::setValue, mIndex, prop, [this, getter](const MWLua::Object* obj)
             {
                 const auto& ptr = obj->ptr();
                 return (ptr.getClass().getCreatureStats(ptr).getDynamic(mIndex).*getter)();
@@ -202,7 +202,7 @@ namespace MWLua
         template<class G>
         sol::object get(const Context& context, std::string_view prop, G getter) const
         {
-            return getValue(context, mObject, &AttributeStat::setValue, mIndex, prop, [=](const MWLua::Object* obj)
+            return getValue(context, mObject, &AttributeStat::setValue, mIndex, prop, [this, getter](const MWLua::Object* obj)
             {
                 const auto& ptr = obj->ptr();
                 return (ptr.getClass().getCreatureStats(ptr).getAttribute(mIndex).*getter)();
@@ -266,7 +266,7 @@ namespace MWLua
         template<class G>
         sol::object get(const Context& context, std::string_view prop, G getter) const
         {
-            return getValue(context, mObject, &SkillStat::setValue, mIndex, prop, [=](const MWLua::Object* obj)
+            return getValue(context, mObject, &SkillStat::setValue, mIndex, prop, [this, getter](const MWLua::Object* obj)
             {
                 const auto& ptr = obj->ptr();
                 return (ptr.getClass().getNpcStats(ptr).getSkill(mIndex).*getter)();
@@ -275,7 +275,7 @@ namespace MWLua
 
         sol::object getProgress(const Context& context) const
         {
-            return getValue(context, mObject, &SkillStat::setValue, mIndex, "progress", [=](const MWLua::Object* obj)
+            return getValue(context, mObject, &SkillStat::setValue, mIndex, "progress", [this](const MWLua::Object* obj)
             {
                 const auto& ptr = obj->ptr();
                 return getProgress(ptr, mIndex, ptr.getClass().getNpcStats(ptr).getSkill(mIndex));
diff --git a/components/fx/technique.cpp b/components/fx/technique.cpp
index 69999f1aa9..eaa74e3e3b 100644
--- a/components/fx/technique.cpp
+++ b/components/fx/technique.cpp
@@ -731,7 +731,7 @@ namespace fx
 
         for (auto t = mLexer->next(); !std::holds_alternative<Lexer::Eof>(t); t = mLexer->next())
         {
-            std::visit([=](auto&& arg) {
+            std::visit([this](auto&& arg) {
                 using T = std::decay_t<decltype(arg)>;
 
                 if constexpr (std::is_same_v<Lexer::Shared, T>)

From 1fb136a41712d5be77f862193e333cc5d1d7aacc Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Fri, 13 May 2022 18:45:03 +0200
Subject: [PATCH 2619/2859] Correct icon and mesh paths in Lua records

---
 apps/openmw/mwbase/windowmanager.hpp   |  1 +
 apps/openmw/mwgui/windowmanagerimp.cpp |  5 +++++
 apps/openmw/mwgui/windowmanagerimp.hpp |  1 +
 apps/openmw/mwlua/types/creature.cpp   |  6 +++++-
 apps/openmw/mwlua/types/door.cpp       |  6 +++++-
 apps/openmw/mwlua/types/weapon.cpp     | 11 +++++++++--
 components/misc/resourcehelpers.cpp    |  5 +++++
 components/misc/resourcehelpers.hpp    |  1 +
 8 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index c1c99436cb..470eaf3d26 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -341,6 +341,7 @@ namespace MWBase
             virtual std::string correctIconPath(const std::string& path) = 0;
             virtual std::string correctBookartPath(const std::string& path, int width, int height, bool* exists = nullptr) = 0;
             virtual std::string correctTexturePath(const std::string& path) = 0;
+            virtual std::string correctMeshPath(const std::string& path) = 0;
             virtual bool textureExists(const std::string& path) = 0;
 
             virtual void addCell(MWWorld::CellStore* cell) = 0;
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 1d964f09ec..872ac1980c 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -2140,6 +2140,11 @@ namespace MWGui
         return Misc::ResourceHelpers::correctTexturePath(path, mResourceSystem->getVFS());
     }
 
+    std::string WindowManager::correctMeshPath(const std::string& path)
+    {
+        return Misc::ResourceHelpers::correctMeshPath(path, mResourceSystem->getVFS());
+    }
+
     bool WindowManager::textureExists(const std::string &path)
     {
         std::string corrected = Misc::ResourceHelpers::correctTexturePath(path, mResourceSystem->getVFS());
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index 58400ec76b..483c7e5c32 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -381,6 +381,7 @@ namespace MWGui
     std::string correctIconPath(const std::string& path) override;
     std::string correctBookartPath(const std::string& path, int width, int height, bool* exists = nullptr) override;
     std::string correctTexturePath(const std::string& path) override;
+    std::string correctMeshPath(const std::string& path) override;
     bool textureExists(const std::string& path) override;
 
     void addCell(MWWorld::CellStore* cell) override;
diff --git a/apps/openmw/mwlua/types/creature.cpp b/apps/openmw/mwlua/types/creature.cpp
index 87be291493..2358c3f41d 100644
--- a/apps/openmw/mwlua/types/creature.cpp
+++ b/apps/openmw/mwlua/types/creature.cpp
@@ -3,6 +3,7 @@
 #include <components/esm3/loadcrea.hpp>
 
 #include <apps/openmw/mwworld/esmstore.hpp>
+#include <apps/openmw/mwbase/windowmanager.hpp>
 
 #include "../stats.hpp"
 #include "../luabindings.hpp"
@@ -24,7 +25,10 @@ namespace MWLua
         sol::usertype<ESM::Creature> record = context.mLua->sol().new_usertype<ESM::Creature>("ESM3_Creature");
         record[sol::meta_function::to_string] = [](const ESM::Creature& rec) { return "ESM3_Creature[" + rec.mId + "]"; };
         record["name"] = sol::readonly_property([](const ESM::Creature& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([](const ESM::Creature& rec) -> std::string { return rec.mModel; });
+        record["model"] = sol::readonly_property([](const ESM::Creature& rec) -> std::string
+        {
+            return MWBase::Environment::get().getWindowManager()->correctMeshPath(rec.mModel);
+        });
         record["mwscript"] = sol::readonly_property([](const ESM::Creature& rec) -> std::string { return rec.mScript; });
         record["baseCreature"] = sol::readonly_property([](const ESM::Creature& rec) -> std::string { return rec.mOriginal; });
     }
diff --git a/apps/openmw/mwlua/types/door.cpp b/apps/openmw/mwlua/types/door.cpp
index 3b5e9a29cc..a6d2a7bc0d 100644
--- a/apps/openmw/mwlua/types/door.cpp
+++ b/apps/openmw/mwlua/types/door.cpp
@@ -3,6 +3,7 @@
 #include <components/esm3/loaddoor.hpp>
 
 #include <apps/openmw/mwworld/esmstore.hpp>
+#include <apps/openmw/mwbase/windowmanager.hpp>
 
 #include "../luabindings.hpp"
 
@@ -48,7 +49,10 @@ namespace MWLua
         record[sol::meta_function::to_string] = [](const ESM::Door& rec) -> std::string { return "ESM3_Door[" + rec.mId + "]"; };
         record["id"] = sol::readonly_property([](const ESM::Door& rec) -> std::string { return rec.mId; });
         record["name"] = sol::readonly_property([](const ESM::Door& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([](const ESM::Door& rec) -> std::string { return rec.mModel; });
+        record["model"] = sol::readonly_property([](const ESM::Door& rec) -> std::string
+        {
+            return MWBase::Environment::get().getWindowManager()->correctMeshPath(rec.mModel);
+        });
         record["mwscript"] = sol::readonly_property([](const ESM::Door& rec) -> std::string { return rec.mScript; });
         record["openSound"] = sol::readonly_property([](const ESM::Door& rec) -> std::string { return rec.mOpenSound; });
         record["closeSound"] = sol::readonly_property([](const ESM::Door& rec) -> std::string { return rec.mCloseSound; });
diff --git a/apps/openmw/mwlua/types/weapon.cpp b/apps/openmw/mwlua/types/weapon.cpp
index 594e447f00..beca109216 100644
--- a/apps/openmw/mwlua/types/weapon.cpp
+++ b/apps/openmw/mwlua/types/weapon.cpp
@@ -3,6 +3,7 @@
 #include <components/esm3/loadweap.hpp>
 
 #include <apps/openmw/mwworld/esmstore.hpp>
+#include <apps/openmw/mwbase/windowmanager.hpp>
 
 #include "../luabindings.hpp"
 
@@ -41,8 +42,14 @@ namespace MWLua
         record[sol::meta_function::to_string] = [](const ESM::Weapon& rec) -> std::string { return "ESM3_Weapon[" + rec.mId + "]"; };
         record["id"] = sol::readonly_property([](const ESM::Weapon& rec) -> std::string { return rec.mId; });
         record["name"] = sol::readonly_property([](const ESM::Weapon& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([](const ESM::Weapon& rec) -> std::string { return rec.mModel; });
-        record["icon"] = sol::readonly_property([](const ESM::Weapon& rec) -> std::string { return rec.mIcon; });
+        record["model"] = sol::readonly_property([](const ESM::Weapon& rec) -> std::string
+        {
+            return MWBase::Environment::get().getWindowManager()->correctMeshPath(rec.mModel);
+        });
+        record["icon"] = sol::readonly_property([](const ESM::Weapon& rec) -> std::string
+        {
+            return MWBase::Environment::get().getWindowManager()->correctIconPath(rec.mIcon);
+        });
         record["enchant"] = sol::readonly_property([](const ESM::Weapon& rec) -> std::string { return rec.mEnchant; });
         record["mwscript"] = sol::readonly_property([](const ESM::Weapon& rec) -> std::string { return rec.mScript; });
         record["isMagical"] = sol::readonly_property(
diff --git a/components/misc/resourcehelpers.cpp b/components/misc/resourcehelpers.cpp
index 0095568653..73a1d961e7 100644
--- a/components/misc/resourcehelpers.cpp
+++ b/components/misc/resourcehelpers.cpp
@@ -145,6 +145,11 @@ std::string Misc::ResourceHelpers::correctActorModelPath(const std::string &resP
     return mdlname;
 }
 
+std::string Misc::ResourceHelpers::correctMeshPath(const std::string &resPath, const VFS::Manager* vfs)
+{
+    return "meshes\\" + resPath;
+}
+
 std::string Misc::ResourceHelpers::correctSoundPath(const std::string& resPath, const VFS::Manager* vfs)
 {
     std::string sound = resPath;
diff --git a/components/misc/resourcehelpers.hpp b/components/misc/resourcehelpers.hpp
index 4ea5f5e121..0be1076d7d 100644
--- a/components/misc/resourcehelpers.hpp
+++ b/components/misc/resourcehelpers.hpp
@@ -24,6 +24,7 @@ namespace Misc
         std::string correctBookartPath(const std::string &resPath, int width, int height, const VFS::Manager* vfs);
         /// Use "xfoo.nif" instead of "foo.nif" if available
         std::string correctActorModelPath(const std::string &resPath, const VFS::Manager* vfs);
+        std::string correctMeshPath(const std::string &resPath, const VFS::Manager* vfs);
 
         std::string correctSoundPath(const std::string& resPath, const VFS::Manager* vfs);
 

From fd7965d77fea28146c1546df413b26d7c7bc96c2 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Fri, 13 May 2022 19:28:53 +0200
Subject: [PATCH 2620/2859] Use correctMeshPath instead of string constants

---
 apps/navmeshtool/worldspacedata.cpp       |  2 +-
 apps/openmw/mwclass/activator.cpp         |  5 +++--
 apps/openmw/mwclass/apparatus.cpp         |  2 +-
 apps/openmw/mwclass/armor.cpp             |  2 +-
 apps/openmw/mwclass/bodypart.cpp          |  5 ++++-
 apps/openmw/mwclass/book.cpp              |  2 +-
 apps/openmw/mwclass/clothing.cpp          |  2 +-
 apps/openmw/mwclass/container.cpp         |  2 +-
 apps/openmw/mwclass/creature.cpp          |  5 +++--
 apps/openmw/mwclass/door.cpp              |  2 +-
 apps/openmw/mwclass/ingredient.cpp        |  2 +-
 apps/openmw/mwclass/light.cpp             |  2 +-
 apps/openmw/mwclass/lockpick.cpp          |  2 +-
 apps/openmw/mwclass/misc.cpp              |  2 +-
 apps/openmw/mwclass/npc.cpp               | 10 +++++-----
 apps/openmw/mwclass/potion.cpp            |  2 +-
 apps/openmw/mwclass/probe.cpp             |  2 +-
 apps/openmw/mwclass/repair.cpp            |  2 +-
 apps/openmw/mwclass/static.cpp            |  5 ++++-
 apps/openmw/mwclass/weapon.cpp            |  2 +-
 apps/openmw/mwmechanics/activespells.cpp  |  5 ++++-
 apps/openmw/mwmechanics/actors.cpp        |  7 +++++--
 apps/openmw/mwmechanics/character.cpp     |  8 ++++++--
 apps/openmw/mwmechanics/spellcasting.cpp  | 18 +++++++++++++-----
 apps/openmw/mwmechanics/spelleffects.cpp  |  6 ++++--
 apps/openmw/mwmechanics/summoning.cpp     |  3 ++-
 apps/openmw/mwrender/actoranimation.cpp   |  3 ++-
 apps/openmw/mwrender/npcanimation.cpp     | 19 +++++++++++--------
 apps/openmw/mwrender/objectpaging.cpp     |  3 ++-
 apps/openmw/mwworld/groundcoverstore.cpp  |  9 +++++++--
 apps/openmw/mwworld/projectilemanager.cpp |  7 +++++--
 apps/openmw/mwworld/worldimp.cpp          | 11 ++++++++---
 32 files changed, 103 insertions(+), 56 deletions(-)

diff --git a/apps/navmeshtool/worldspacedata.cpp b/apps/navmeshtool/worldspacedata.cpp
index 56f9147ff3..e93b50842c 100644
--- a/apps/navmeshtool/worldspacedata.cpp
+++ b/apps/navmeshtool/worldspacedata.cpp
@@ -122,7 +122,7 @@ namespace NavMeshTool
                 {
                     try
                     {
-                        return bulletShapeManager.getShape("meshes/" + model);
+                        return bulletShapeManager.getShape(Misc::ResourceHelpers::correctMeshPath(model, &vfs));
                     }
                     catch (const std::exception& e)
                     {
diff --git a/apps/openmw/mwclass/activator.cpp b/apps/openmw/mwclass/activator.cpp
index f2212e7c95..e50b3cca85 100644
--- a/apps/openmw/mwclass/activator.cpp
+++ b/apps/openmw/mwclass/activator.cpp
@@ -60,7 +60,7 @@ namespace MWClass
 
         const std::string &model = ref->mBase->mModel;
         if (!model.empty()) {
-            return "meshes\\" + model;
+            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
         }
         return "";
     }
@@ -145,7 +145,8 @@ namespace MWClass
 
         for (const ESM::Creature &iter : store.get<ESM::Creature>())
         {
-            if (!iter.mModel.empty() && Misc::StringUtils::ciEqual(model, "meshes\\" + iter.mModel))
+            if (!iter.mModel.empty() && Misc::StringUtils::ciEqual(model,
+                MWBase::Environment::get().getWindowManager()->correctMeshPath(iter.mModel)))
             {
                 creatureId = !iter.mOriginal.empty() ? iter.mOriginal : iter.mId;
                 break;
diff --git a/apps/openmw/mwclass/apparatus.cpp b/apps/openmw/mwclass/apparatus.cpp
index 6004868ac0..07dac3e2d7 100644
--- a/apps/openmw/mwclass/apparatus.cpp
+++ b/apps/openmw/mwclass/apparatus.cpp
@@ -38,7 +38,7 @@ namespace MWClass
 
         const std::string &model = ref->mBase->mModel;
         if (!model.empty()) {
-            return "meshes\\" + model;
+            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
         }
         return "";
     }
diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index 9bd7deb38f..d2b5c096cb 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -46,7 +46,7 @@ namespace MWClass
 
         const std::string &model = ref->mBase->mModel;
         if (!model.empty()) {
-            return "meshes\\" + model;
+            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
         }
         return "";
     }
diff --git a/apps/openmw/mwclass/bodypart.cpp b/apps/openmw/mwclass/bodypart.cpp
index ecc59f5459..bd32784a7d 100644
--- a/apps/openmw/mwclass/bodypart.cpp
+++ b/apps/openmw/mwclass/bodypart.cpp
@@ -5,6 +5,9 @@
 
 #include "../mwworld/cellstore.hpp"
 
+#include "../mwbase/environment.hpp"
+#include "../mwbase/windowmanager.hpp"
+
 namespace MWClass
 {
     BodyPart::BodyPart()
@@ -42,7 +45,7 @@ namespace MWClass
 
         const std::string &model = ref->mBase->mModel;
         if (!model.empty()) {
-            return "meshes\\" + model;
+            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
         }
         return "";
     }
diff --git a/apps/openmw/mwclass/book.cpp b/apps/openmw/mwclass/book.cpp
index 2247d388e8..c057182187 100644
--- a/apps/openmw/mwclass/book.cpp
+++ b/apps/openmw/mwclass/book.cpp
@@ -43,7 +43,7 @@ namespace MWClass
 
         const std::string &model = ref->mBase->mModel;
         if (!model.empty()) {
-            return "meshes\\" + model;
+            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
         }
         return "";
     }
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index de2b1c870f..0a922b30af 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -41,7 +41,7 @@ namespace MWClass
 
         const std::string &model = ref->mBase->mModel;
         if (!model.empty()) {
-            return "meshes\\" + model;
+            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
         }
         return "";
     }
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index d4fa3e2f1c..9f9666534d 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -123,7 +123,7 @@ namespace MWClass
 
         const std::string &model = ref->mBase->mModel;
         if (!model.empty()) {
-            return "meshes\\" + model;
+            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
         }
         return "";
     }
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 667942b320..026ef268fe 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -184,7 +184,7 @@ namespace MWClass
 
         const std::string &model = ref->mBase->mModel;
         if (!model.empty()) {
-            return "meshes\\" + model;
+            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
         }
         return "";
     }
@@ -626,7 +626,8 @@ namespace MWClass
                 for (const ESM::Creature &creature : store.get<ESM::Creature>())
                 {
                     if (creature.mId != ourId && creature.mOriginal != ourId && !creature.mModel.empty()
-                     && Misc::StringUtils::ciEqual(model, "meshes\\" + creature.mModel))
+                        && Misc::StringUtils::ciEqual(model,
+                            MWBase::Environment::get().getWindowManager()->correctMeshPath(creature.mModel)))
                     {
                         const std::string& fallbackId = !creature.mOriginal.empty() ? creature.mOriginal : creature.mId;
                         sound = store.get<ESM::SoundGenerator>().begin();
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index 37b45e531b..23e492bec4 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -99,7 +99,7 @@ namespace MWClass
 
         const std::string &model = ref->mBase->mModel;
         if (!model.empty()) {
-            return "meshes\\" + model;
+            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
         }
         return "";
     }
diff --git a/apps/openmw/mwclass/ingredient.cpp b/apps/openmw/mwclass/ingredient.cpp
index 73f9fb4ac9..1996e1742e 100644
--- a/apps/openmw/mwclass/ingredient.cpp
+++ b/apps/openmw/mwclass/ingredient.cpp
@@ -40,7 +40,7 @@ namespace MWClass
 
         const std::string &model = ref->mBase->mModel;
         if (!model.empty()) {
-            return "meshes\\" + model;
+            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
         }
         return "";
     }
diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index 3ab9d3b630..3b1cb19068 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -71,7 +71,7 @@ namespace MWClass
 
         const std::string &model = ref->mBase->mModel;
         if (!model.empty()) {
-            return "meshes\\" + model;
+            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
         }
         return "";
     }
diff --git a/apps/openmw/mwclass/lockpick.cpp b/apps/openmw/mwclass/lockpick.cpp
index ef4af50c6a..ff23535145 100644
--- a/apps/openmw/mwclass/lockpick.cpp
+++ b/apps/openmw/mwclass/lockpick.cpp
@@ -40,7 +40,7 @@ namespace MWClass
 
         const std::string &model = ref->mBase->mModel;
         if (!model.empty()) {
-            return "meshes\\" + model;
+            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
         }
         return "";
     }
diff --git a/apps/openmw/mwclass/misc.cpp b/apps/openmw/mwclass/misc.cpp
index 571bbda0ea..10fada6dbb 100644
--- a/apps/openmw/mwclass/misc.cpp
+++ b/apps/openmw/mwclass/misc.cpp
@@ -50,7 +50,7 @@ namespace MWClass
 
         const std::string &model = ref->mBase->mModel;
         if (!model.empty()) {
-            return "meshes\\" + model;
+            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
         }
         return "";
     }
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index b6105df4d7..76e60c7880 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -443,19 +443,19 @@ namespace MWClass
         models.emplace_back(Settings::Manager::getString("xbaseanim", "Models"));
 
         if (!npc->mBase->mModel.empty())
-            models.push_back("meshes/"+npc->mBase->mModel);
+            models.push_back(MWBase::Environment::get().getWindowManager()->correctMeshPath(npc->mBase->mModel));
 
         if (!npc->mBase->mHead.empty())
         {
             const ESM::BodyPart* head = MWBase::Environment::get().getWorld()->getStore().get<ESM::BodyPart>().search(npc->mBase->mHead);
             if (head)
-                models.push_back("meshes/"+head->mModel);
+                models.push_back(MWBase::Environment::get().getWindowManager()->correctMeshPath(head->mModel));
         }
         if (!npc->mBase->mHair.empty())
         {
             const ESM::BodyPart* hair = MWBase::Environment::get().getWorld()->getStore().get<ESM::BodyPart>().search(npc->mBase->mHair);
             if (hair)
-                models.push_back("meshes/"+hair->mModel);
+                models.push_back(MWBase::Environment::get().getWindowManager()->correctMeshPath(hair->mModel));
         }
 
         bool female = (npc->mBase->mFlags & ESM::NPC::Female);
@@ -493,7 +493,7 @@ namespace MWClass
                         partname = female ? it->mMale : it->mFemale;
                     const ESM::BodyPart* part = MWBase::Environment::get().getWorld()->getStore().get<ESM::BodyPart>().search(partname);
                     if (part && !part->mModel.empty())
-                        models.push_back("meshes/"+part->mModel);
+                        models.push_back(MWBase::Environment::get().getWindowManager()->correctMeshPath(part->mModel));
                 }
             }
         }
@@ -506,7 +506,7 @@ namespace MWClass
             {
                 const ESM::BodyPart* part = *it;
                 if (part && !part->mModel.empty())
-                    models.push_back("meshes/"+part->mModel);
+                    models.push_back(MWBase::Environment::get().getWindowManager()->correctMeshPath(part->mModel));
             }
         }
 
diff --git a/apps/openmw/mwclass/potion.cpp b/apps/openmw/mwclass/potion.cpp
index 3b55cbc679..20f4c3bcce 100644
--- a/apps/openmw/mwclass/potion.cpp
+++ b/apps/openmw/mwclass/potion.cpp
@@ -42,7 +42,7 @@ namespace MWClass
 
         const std::string &model = ref->mBase->mModel;
         if (!model.empty()) {
-            return "meshes\\" + model;
+            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
         }
         return "";
     }
diff --git a/apps/openmw/mwclass/probe.cpp b/apps/openmw/mwclass/probe.cpp
index a528068f23..ea90c1e78c 100644
--- a/apps/openmw/mwclass/probe.cpp
+++ b/apps/openmw/mwclass/probe.cpp
@@ -40,7 +40,7 @@ namespace MWClass
 
         const std::string &model = ref->mBase->mModel;
         if (!model.empty()) {
-            return "meshes\\" + model;
+            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
         }
         return "";
     }
diff --git a/apps/openmw/mwclass/repair.cpp b/apps/openmw/mwclass/repair.cpp
index e9a504f22c..6a23c43303 100644
--- a/apps/openmw/mwclass/repair.cpp
+++ b/apps/openmw/mwclass/repair.cpp
@@ -37,7 +37,7 @@ namespace MWClass
 
         const std::string &model = ref->mBase->mModel;
         if (!model.empty()) {
-            return "meshes\\" + model;
+            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
         }
         return "";
     }
diff --git a/apps/openmw/mwclass/static.cpp b/apps/openmw/mwclass/static.cpp
index 8b793dbc67..27b04481ad 100644
--- a/apps/openmw/mwclass/static.cpp
+++ b/apps/openmw/mwclass/static.cpp
@@ -11,6 +11,9 @@
 #include "../mwrender/renderinginterface.hpp"
 #include "../mwrender/vismask.hpp"
 
+#include "../mwbase/environment.hpp"
+#include "../mwbase/windowmanager.hpp"
+
 namespace MWClass
 {
     Static::Static()
@@ -43,7 +46,7 @@ namespace MWClass
 
         const std::string &model = ref->mBase->mModel;
         if (!model.empty()) {
-            return "meshes\\" + model;
+            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
         }
         return "";
     }
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index 505b2a4d1e..478e67036c 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -46,7 +46,7 @@ namespace MWClass
 
         const std::string &model = ref->mBase->mModel;
         if (!model.empty()) {
-            return "meshes\\" + model;
+            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
         }
         return "";
     }
diff --git a/apps/openmw/mwmechanics/activespells.cpp b/apps/openmw/mwmechanics/activespells.cpp
index 8dcf6ca90c..663809d109 100644
--- a/apps/openmw/mwmechanics/activespells.cpp
+++ b/apps/openmw/mwmechanics/activespells.cpp
@@ -17,6 +17,7 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 #include "../mwrender/animation.hpp"
 
@@ -261,7 +262,9 @@ namespace MWMechanics
                 const ESM::Static* reflectStatic = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>().find("VFX_Reflect");
                 MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(ptr);
                 if(animation && !reflectStatic->mModel.empty())
-                    animation->addEffect("meshes\\" + reflectStatic->mModel, ESM::MagicEffect::Reflect, false, std::string());
+                    animation->addEffect(
+                        MWBase::Environment::get().getWindowManager()->correctMeshPath(reflectStatic->mModel),
+                        ESM::MagicEffect::Reflect, false, std::string());
                 caster.getClass().getCreatureStats(caster).getActiveSpells().addSpell(*reflected);
             }
             if(removedSpell)
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index a384a2edfa..2353f3729d 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -203,7 +203,9 @@ void soulTrap(const MWWorld::Ptr& creature)
             const ESM::Static* fx = world->getStore().get<ESM::Static>()
                     .search("VFX_Soul_Trap");
             if (fx)
-                world->spawnEffect("meshes\\" + fx->mModel, "", creature.getRefData().getPosition().asVec3());
+                world->spawnEffect(
+                    MWBase::Environment::get().getWindowManager()->correctMeshPath(fx->mModel),
+                    "", creature.getRefData().getPosition().asVec3());
 
             MWBase::Environment::get().getSoundManager()->playSound3D(creature.getRefData().getPosition().asVec3(), "conjuration hit", 1.f, 1.f);
             return; //remove to get vanilla behaviour
@@ -1745,7 +1747,8 @@ namespace MWMechanics
             const ESM::Static* fx = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>()
                     .search("VFX_Summon_End");
             if (fx)
-                MWBase::Environment::get().getWorld()->spawnEffect("meshes\\" + fx->mModel,
+                MWBase::Environment::get().getWorld()->spawnEffect(
+                    MWBase::Environment::get().getWindowManager()->correctMeshPath(fx->mModel),
                     "", ptr.getRefData().getPosition().asVec3());
 
             // Remove the summoned creature's summoned creatures as well
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 471ec7b5f4..b76ebc91a7 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -1433,10 +1433,14 @@ bool CharacterController::updateState(CharacterState idle)
                     for (size_t iter = 0; iter < effects.size(); ++iter) // play hands vfx for each effect
                     {
                         if (mAnimation->getNode("Bip01 L Hand"))
-                            mAnimation->addEffect("meshes\\" + castStatic->mModel, -1, false, "Bip01 L Hand", effect->mParticle);
+                            mAnimation->addEffect(
+                                MWBase::Environment::get().getWindowManager()->correctMeshPath(castStatic->mModel),
+                                -1, false, "Bip01 L Hand", effect->mParticle);
 
                         if (mAnimation->getNode("Bip01 R Hand"))
-                            mAnimation->addEffect("meshes\\" + castStatic->mModel, -1, false, "Bip01 R Hand", effect->mParticle);
+                            mAnimation->addEffect(
+                                MWBase::Environment::get().getWindowManager()->correctMeshPath(castStatic->mModel),
+                                -1, false, "Bip01 R Hand", effect->mParticle);
                     }
 
                     const ESM::ENAMstruct &firstEffect = effects.at(0); // first effect used for casting animation
diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index b92cbc74fb..dcfd125519 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -476,13 +476,17 @@ namespace MWMechanics
                 castStatic = store.get<ESM::Static>().find ("VFX_DefaultCast");
 
             // check if the effect was already added
-            if (std::find(addedEffects.begin(), addedEffects.end(), "meshes\\" + castStatic->mModel) != addedEffects.end())
+            if (std::find(addedEffects.begin(), addedEffects.end(),
+                MWBase::Environment::get().getWindowManager()->correctMeshPath(castStatic->mModel))
+                != addedEffects.end())
                 continue;
 
             MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(mCaster);
             if (animation)
             {
-                animation->addEffect("meshes\\" + castStatic->mModel, effect->mIndex, false, "", effect->mParticle);
+                animation->addEffect(
+                    MWBase::Environment::get().getWindowManager()->correctMeshPath(castStatic->mModel),
+                    effect->mIndex, false, "", effect->mParticle);
             }
             else
             {
@@ -511,7 +515,9 @@ namespace MWMechanics
                     scale *= npcScaleVec.z();
                 }
                 scale = std::max(scale, 1.f);
-                MWBase::Environment::get().getWorld()->spawnEffect("meshes\\" + castStatic->mModel, effect->mParticle, pos, scale);
+                MWBase::Environment::get().getWorld()->spawnEffect(
+                    MWBase::Environment::get().getWindowManager()->correctMeshPath(castStatic->mModel),
+                    effect->mParticle, pos, scale);
             }
 
             if (animation && !mCaster.getClass().isActor())
@@ -521,7 +527,7 @@ namespace MWMechanics
                 "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration"
             };
 
-            addedEffects.push_back("meshes\\" + castStatic->mModel);
+            addedEffects.push_back(MWBase::Environment::get().getWindowManager()->correctMeshPath(castStatic->mModel));
 
             MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
             if(!effect->mCastSound.empty())
@@ -559,7 +565,9 @@ namespace MWMechanics
         {
             // Don't play particle VFX unless the effect is new or it should be looping.
             if (playNonLooping || loop)
-                anim->addEffect("meshes\\" + castStatic->mModel, magicEffect.mIndex, loop, "", magicEffect.mParticle);
+                anim->addEffect(
+                    MWBase::Environment::get().getWindowManager()->correctMeshPath(castStatic->mModel),
+                    magicEffect.mIndex, loop, "", magicEffect.mParticle);
         }
     }
 }
diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp
index ae18c6ae0c..e10eaa3ff9 100644
--- a/apps/openmw/mwmechanics/spelleffects.cpp
+++ b/apps/openmw/mwmechanics/spelleffects.cpp
@@ -272,7 +272,9 @@ namespace
         const ESM::Static* absorbStatic = esmStore.get<ESM::Static>().find("VFX_Absorb");
         MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(target);
         if (animation && !absorbStatic->mModel.empty())
-            animation->addEffect( "meshes\\" + absorbStatic->mModel, ESM::MagicEffect::SpellAbsorption, false, std::string());
+            animation->addEffect(
+                MWBase::Environment::get().getWindowManager()->correctMeshPath(absorbStatic->mModel),
+                ESM::MagicEffect::SpellAbsorption, false, std::string());
         const ESM::Spell* spell = esmStore.get<ESM::Spell>().search(spellId);
         int spellCost = 0;
         if (spell)
@@ -430,7 +432,7 @@ void applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, co
                     anim->removeEffect(effect.mEffectId);
                     const ESM::Static* fx = world->getStore().get<ESM::Static>().search("VFX_Summon_end");
                     if (fx)
-                        anim->addEffect("meshes\\" + fx->mModel, -1);
+                        anim->addEffect(MWBase::Environment::get().getWindowManager()->correctMeshPath(fx->mModel), -1);
                 }
             }
             else if (caster == getPlayer())
diff --git a/apps/openmw/mwmechanics/summoning.cpp b/apps/openmw/mwmechanics/summoning.cpp
index c1923d4337..5fc39f416b 100644
--- a/apps/openmw/mwmechanics/summoning.cpp
+++ b/apps/openmw/mwmechanics/summoning.cpp
@@ -5,6 +5,7 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/class.hpp"
@@ -85,7 +86,7 @@ namespace MWMechanics
                 {
                     const ESM::Static* fx = world->getStore().get<ESM::Static>().search("VFX_Summon_Start");
                     if (fx)
-                        anim->addEffect("meshes\\" + fx->mModel, -1, false);
+                        anim->addEffect(MWBase::Environment::get().getWindowManager()->correctMeshPath(fx->mModel), -1, false);
                 }
             }
             catch (std::exception& e)
diff --git a/apps/openmw/mwrender/actoranimation.cpp b/apps/openmw/mwrender/actoranimation.cpp
index b3d76d423c..777a095c9e 100644
--- a/apps/openmw/mwrender/actoranimation.cpp
+++ b/apps/openmw/mwrender/actoranimation.cpp
@@ -24,6 +24,7 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
+#include "../mwbase/windowmanager.hpp"
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
@@ -127,7 +128,7 @@ std::string ActorAnimation::getShieldMesh(const MWWorld::ConstPtr& shield, bool
                 if (bodypart == nullptr || bodypart->mData.mType != ESM::BodyPart::MT_Armor)
                     return std::string();
                 if (!bodypart->mModel.empty())
-                    return "meshes\\" + bodypart->mModel;
+                    return MWBase::Environment::get().getWindowManager()->correctMeshPath(bodypart->mModel);
             }
         }
     }
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 8a7da4c800..ba44a94cd9 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -39,6 +39,7 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 #include "camera.hpp"
 #include "rotatecontroller.hpp"
@@ -80,7 +81,7 @@ std::string getVampireHead(const std::string& race, bool female)
     const ESM::BodyPart* bodyPart = sVampireMapping[thisCombination];
     if (!bodyPart)
         return std::string();
-    return "meshes\\" + bodyPart->mModel;
+    return MWBase::Environment::get().getWindowManager()->correctMeshPath(bodyPart->mModel);
 }
 
 }
@@ -467,7 +468,7 @@ void NpcAnimation::updateNpcBase()
     {
         const ESM::BodyPart* bp = store.get<ESM::BodyPart>().search(headName);
         if (bp)
-            mHeadModel = "meshes\\" + bp->mModel;
+            mHeadModel = MWBase::Environment::get().getWindowManager()->correctMeshPath(bp->mModel);
         else
             Log(Debug::Warning) << "Warning: Failed to load body part '" << headName << "'";
     }
@@ -476,7 +477,7 @@ void NpcAnimation::updateNpcBase()
     {
         const ESM::BodyPart* bp = store.get<ESM::BodyPart>().search(hairName);
         if (bp)
-            mHairModel = "meshes\\" + bp->mModel;
+            mHairModel = MWBase::Environment::get().getWindowManager()->correctMeshPath(bp->mModel);
         else
             Log(Debug::Warning) << "Warning: Failed to load body part '" << hairName << "'";
     }
@@ -493,7 +494,8 @@ void NpcAnimation::updateNpcBase()
 
     std::string smodel = defaultSkeleton;
     if (!is1stPerson && !isWerewolf && !mNpc->mModel.empty())
-        smodel = Misc::ResourceHelpers::correctActorModelPath("meshes\\" + mNpc->mModel, mResourceSystem->getVFS());
+        smodel = Misc::ResourceHelpers::correctActorModelPath(
+            MWBase::Environment::get().getWindowManager()->correctMeshPath(mNpc->mModel), mResourceSystem->getVFS());
 
     setObjectRoot(smodel, true, true, false);
 
@@ -653,8 +655,8 @@ void NpcAnimation::updateParts()
         if(store != inv.end() && (part=*store).getType() == ESM::Light::sRecordId)
         {
             const ESM::Light *light = part.get<ESM::Light>()->mBase;
-            addOrReplaceIndividualPart(ESM::PRT_Shield, MWWorld::InventoryStore::Slot_CarriedLeft,
-                                       1, "meshes\\"+light->mModel, false, nullptr, true);
+            addOrReplaceIndividualPart(ESM::PRT_Shield, MWWorld::InventoryStore::Slot_CarriedLeft, 1,
+                MWBase::Environment::get().getWindowManager()->correctMeshPath(light->mModel), false, nullptr, true);
             if (mObjectParts[ESM::PRT_Shield])
                 addExtraLight(mObjectParts[ESM::PRT_Shield]->getNode()->asGroup(), light);
         }
@@ -674,7 +676,7 @@ void NpcAnimation::updateParts()
             const ESM::BodyPart* bodypart = parts[part];
             if(bodypart)
                 addOrReplaceIndividualPart((ESM::PartReferenceType)part, -1, 1,
-                                           "meshes\\"+bodypart->mModel);
+                    MWBase::Environment::get().getWindowManager()->correctMeshPath(bodypart->mModel));
         }
     }
 
@@ -904,7 +906,8 @@ void NpcAnimation::addPartGroup(int group, int priority, const std::vector<ESM::
         }
 
         if(bodypart)
-            addOrReplaceIndividualPart((ESM::PartReferenceType)part.mPart, group, priority, "meshes\\"+bodypart->mModel, enchantedGlow, glowColor);
+            addOrReplaceIndividualPart((ESM::PartReferenceType)part.mPart, group, priority,
+                MWBase::Environment::get().getWindowManager()->correctMeshPath(bodypart->mModel), enchantedGlow, glowColor);
         else
             reserveIndividualPart((ESM::PartReferenceType)part.mPart, group, priority);
     }
diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index 23532f8b07..7513ecdabe 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -31,6 +31,7 @@
 #include "apps/openmw/mwworld/esmstore.hpp"
 #include "apps/openmw/mwbase/environment.hpp"
 #include "apps/openmw/mwbase/world.hpp"
+#include "apps/openmw/mwbase/windowmanager.hpp"
 
 #include "vismask.hpp"
 
@@ -528,7 +529,7 @@ namespace MWRender
             int type = store.findStatic(ref.mRefID);
             std::string model = getModel(type, ref.mRefID, store);
             if (model.empty()) continue;
-            model = "meshes/" + model;
+            model = MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
 
             if (activeGrid && type != ESM::REC_STAT)
             {
diff --git a/apps/openmw/mwworld/groundcoverstore.cpp b/apps/openmw/mwworld/groundcoverstore.cpp
index 1b27f8eed3..1c75ce19f2 100644
--- a/apps/openmw/mwworld/groundcoverstore.cpp
+++ b/apps/openmw/mwworld/groundcoverstore.cpp
@@ -4,6 +4,9 @@
 #include <components/misc/stringops.hpp>
 #include <components/esm3/readerscache.hpp>
 
+#include <apps/openmw/mwbase/environment.hpp>
+#include <apps/openmw/mwbase/windowmanager.hpp>
+
 namespace MWWorld
 {
     void GroundcoverStore::init(const Store<ESM::Static>& statics, const Files::Collections& fileCollections, const std::vector<std::string>& groundcoverFiles, ToUTF8::Utf8Encoder* encoder)
@@ -18,13 +21,15 @@ namespace MWWorld
         for (const ESM::Static& stat : statics)
         {
             std::string id = Misc::StringUtils::lowerCase(stat.mId);
-            mMeshCache[id] = "meshes\\" + Misc::StringUtils::lowerCase(stat.mModel);
+            mMeshCache[id] = Misc::StringUtils::lowerCase(
+                MWBase::Environment::get().getWindowManager()->correctMeshPath(stat.mModel));
         }
 
         for (const ESM::Static& stat : content.mStatics)
         {
             std::string id = Misc::StringUtils::lowerCase(stat.mId);
-            mMeshCache[id] = "meshes\\" + Misc::StringUtils::lowerCase(stat.mModel);
+            mMeshCache[id] = Misc::StringUtils::lowerCase(
+                MWBase::Environment::get().getWindowManager()->correctMeshPath(stat.mModel));
         }
 
         for (const ESM::Cell& cell : content.mCells)
diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index e931afa07b..3acef2db3f 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -32,6 +32,7 @@
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 #include "../mwmechanics/combat.hpp"
 #include "../mwmechanics/creaturestats.hpp"
@@ -218,7 +219,8 @@ namespace MWWorld
                 SceneUtil::FindByNameVisitor findVisitor(nodeName.str());
                 attachTo->accept(findVisitor);
                 if (findVisitor.mFoundNode)
-                    mResourceSystem->getSceneManager()->getInstance("meshes\\" + weapon->mModel, findVisitor.mFoundNode);
+                    mResourceSystem->getSceneManager()->getInstance(
+                        MWBase::Environment::get().getWindowManager()->correctMeshPath(weapon->mModel), findVisitor.mFoundNode);
             }
 
         if (createLight)
@@ -318,7 +320,8 @@ namespace MWWorld
 
         // in case there are multiple effects, the model is a dummy without geometry. Use the second effect for physics shape
         if (state.mIdMagic.size() > 1)
-            model = "meshes\\" + MWBase::Environment::get().getWorld()->getStore().get<ESM::Weapon>().find(state.mIdMagic[1])->mModel;
+            model = MWBase::Environment::get().getWindowManager()->correctMeshPath(
+                MWBase::Environment::get().getWorld()->getStore().get<ESM::Weapon>().find(state.mIdMagic[1])->mModel);
         state.mProjectileId = mPhysics->addProjectile(caster, pos, model, true);
         state.mToDelete = false;
         mMagicBolts.push_back(state);
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 3c0d796e9b..0c0b3d593d 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -3683,7 +3683,8 @@ namespace MWWorld
         if (texture.empty())
             texture = Fallback::Map::getString("Blood_Texture_0");
 
-        std::string model = "meshes\\" + Fallback::Map::getString("Blood_Model_" + std::to_string(Misc::Rng::rollDice(3))); // [0, 2]
+        std::string model = MWBase::Environment::get().getWindowManager()->correctMeshPath(
+            Fallback::Map::getString("Blood_Model_" + std::to_string(Misc::Rng::rollDice(3)))); // [0, 2]
 
         mRendering->spawnEffect(model, texture, worldPosition, 1.0f, false);
     }
@@ -3722,11 +3723,15 @@ namespace MWWorld
             if (effectInfo.mArea <= 0)
             {
                 if (effectInfo.mRange == ESM::RT_Target)
-                    mRendering->spawnEffect("meshes\\" + areaStatic->mModel, texture, origin, 1.0f);
+                    mRendering->spawnEffect(
+                        MWBase::Environment::get().getWindowManager()->correctMeshPath(areaStatic->mModel),
+                        texture, origin, 1.0f);
                 continue;
             }
             else
-                mRendering->spawnEffect("meshes\\" + areaStatic->mModel, texture, origin, static_cast<float>(effectInfo.mArea * 2));
+                mRendering->spawnEffect(
+                    MWBase::Environment::get().getWindowManager()->correctMeshPath(areaStatic->mModel),
+                    texture, origin, static_cast<float>(effectInfo.mArea * 2));
 
             // Play explosion sound (make sure to use NoTrack, since we will delete the projectile now)
             static const std::string schools[] = {

From bf905fce4cbcb2454b538c99adaa114d9397ef6b Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sun, 12 Jun 2022 13:07:50 +0200
Subject: [PATCH 2621/2859] Don't use WindowManager outside of UI, correct
 paths for new record types

---
 apps/openmw/mwbase/windowmanager.hpp   |  1 -
 apps/openmw/mwgui/formatting.cpp       | 17 +++++++++--------
 apps/openmw/mwgui/windowmanagerimp.cpp |  8 --------
 apps/openmw/mwgui/windowmanagerimp.hpp |  1 -
 apps/openmw/mwlua/types/activator.cpp  |  9 ++++++++-
 apps/openmw/mwlua/types/apparatus.cpp  | 14 ++++++++++++--
 apps/openmw/mwlua/types/book.cpp       | 14 ++++++++++++--
 apps/openmw/mwlua/types/container.cpp  |  9 ++++++++-
 apps/openmw/mwlua/types/creature.cpp   |  9 ++++++---
 apps/openmw/mwlua/types/door.cpp       |  9 ++++++---
 apps/openmw/mwlua/types/lockpick.cpp   | 14 ++++++++++++--
 apps/openmw/mwlua/types/misc.cpp       | 14 ++++++++++++--
 apps/openmw/mwlua/types/potion.cpp     | 13 +++++++++++--
 apps/openmw/mwlua/types/probe.cpp      | 14 ++++++++++++--
 apps/openmw/mwlua/types/repair.cpp     | 14 ++++++++++++--
 apps/openmw/mwlua/types/weapon.cpp     | 15 +++++++++------
 16 files changed, 129 insertions(+), 46 deletions(-)

diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index 470eaf3d26..2d7c2299a6 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -339,7 +339,6 @@ namespace MWBase
 
             // In WindowManager for now since there isn't a VFS singleton
             virtual std::string correctIconPath(const std::string& path) = 0;
-            virtual std::string correctBookartPath(const std::string& path, int width, int height, bool* exists = nullptr) = 0;
             virtual std::string correctTexturePath(const std::string& path) = 0;
             virtual std::string correctMeshPath(const std::string& path) = 0;
             virtual bool textureExists(const std::string& path) = 0;
diff --git a/apps/openmw/mwgui/formatting.cpp b/apps/openmw/mwgui/formatting.cpp
index f416fbe07c..c9a9da6066 100644
--- a/apps/openmw/mwgui/formatting.cpp
+++ b/apps/openmw/mwgui/formatting.cpp
@@ -5,14 +5,15 @@
 #include <MyGUI_EditBox.h>
 #include <MyGUI_ImageBox.h>
 
-// correctBookartPath
-#include "../mwbase/environment.hpp"
-#include "../mwbase/windowmanager.hpp"
-
 #include <components/debug/debuglog.hpp>
 #include <components/interpreter/defines.hpp>
+#include <components/resource/resourcesystem.hpp>
+#include <components/vfs/manager.hpp>
 #include <components/misc/stringops.hpp>
+#include <components/misc/resourcehelpers.hpp>
 
+#include "../mwbase/environment.hpp"
+#include "../mwbase/windowmanager.hpp"
 #include "../mwscript/interpretercontext.hpp"
 
 namespace MWGui::Formatting
@@ -285,8 +286,9 @@ namespace MWGui::Formatting
                         int width = MyGUI::utility::parseInt(attr.at("width"));
                         int height = MyGUI::utility::parseInt(attr.at("height"));
 
-                        bool exists;
-                        std::string correctedSrc = MWBase::Environment::get().getWindowManager()->correctBookartPath(src, width, height, &exists);
+                        auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+                        std::string correctedSrc = Misc::ResourceHelpers::correctBookartPath(src, width, height, vfs);
+                        bool exists = vfs->exists(correctedSrc);
 
                         if (!exists)
                         {
@@ -296,8 +298,7 @@ namespace MWGui::Formatting
 
                         pag.setIgnoreLeadingEmptyLines(false);
 
-                        ImageElement elem(paper, pag, mBlockStyle,
-                                          correctedSrc, width, height);
+                        ImageElement elem(paper, pag, mBlockStyle, correctedSrc, width, height);
                         elem.paginate();
                         break;
                     }
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 872ac1980c..f768b784eb 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -2127,14 +2127,6 @@ namespace MWGui
         return Misc::ResourceHelpers::correctIconPath(path, mResourceSystem->getVFS());
     }
 
-    std::string WindowManager::correctBookartPath(const std::string& path, int width, int height, bool* exists)
-    {
-        std::string corrected = Misc::ResourceHelpers::correctBookartPath(path, width, height, mResourceSystem->getVFS());
-        if (exists)
-            *exists = mResourceSystem->getVFS()->exists(corrected);
-        return corrected;
-    }
-
     std::string WindowManager::correctTexturePath(const std::string& path)
     {
         return Misc::ResourceHelpers::correctTexturePath(path, mResourceSystem->getVFS());
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index 483c7e5c32..dc17e31a77 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -379,7 +379,6 @@ namespace MWGui
 
     // In WindowManager for now since there isn't a VFS singleton
     std::string correctIconPath(const std::string& path) override;
-    std::string correctBookartPath(const std::string& path, int width, int height, bool* exists = nullptr) override;
     std::string correctTexturePath(const std::string& path) override;
     std::string correctMeshPath(const std::string& path) override;
     bool textureExists(const std::string& path) override;
diff --git a/apps/openmw/mwlua/types/activator.cpp b/apps/openmw/mwlua/types/activator.cpp
index 825a464878..6d5d86722d 100644
--- a/apps/openmw/mwlua/types/activator.cpp
+++ b/apps/openmw/mwlua/types/activator.cpp
@@ -1,6 +1,8 @@
 #include "types.hpp"
 
 #include <components/esm3/loadacti.hpp>
+#include <components/misc/resourcehelpers.hpp>
+#include <components/resource/resourcesystem.hpp>
 
 #include <apps/openmw/mwworld/esmstore.hpp>
 
@@ -16,6 +18,8 @@ namespace MWLua
 {
     void addActivatorBindings(sol::table activator, const Context& context)
     {
+        auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+
         const MWWorld::Store<ESM::Activator>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Activator>();
         activator["record"] = sol::overload(
             [](const Object& obj) -> const ESM::Activator* { return obj.ptr().get<ESM::Activator>()->mBase; },
@@ -24,7 +28,10 @@ namespace MWLua
         record[sol::meta_function::to_string] = [](const ESM::Activator& rec) { return "ESM3_Activator[" + rec.mId + "]"; };
         record["id"] = sol::readonly_property([](const ESM::Activator& rec) -> std::string { return rec.mId; });
         record["name"] = sol::readonly_property([](const ESM::Activator& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([](const ESM::Activator& rec) -> std::string { return rec.mModel; });
+        record["model"] = sol::readonly_property([vfs](const ESM::Activator& rec) -> std::string
+        {
+            return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
+        });
         record["mwscript"] = sol::readonly_property([](const ESM::Activator& rec) -> std::string { return rec.mScript; });
     }
 }
diff --git a/apps/openmw/mwlua/types/apparatus.cpp b/apps/openmw/mwlua/types/apparatus.cpp
index 385040b3d6..5957feab60 100644
--- a/apps/openmw/mwlua/types/apparatus.cpp
+++ b/apps/openmw/mwlua/types/apparatus.cpp
@@ -1,6 +1,8 @@
 #include "types.hpp"
 
 #include <components/esm3/loadappa.hpp>
+#include <components/misc/resourcehelpers.hpp>
+#include <components/resource/resourcesystem.hpp>
 
 #include <apps/openmw/mwworld/esmstore.hpp>
 
@@ -23,6 +25,8 @@ namespace MWLua
             {"Retort", ESM::Apparatus::Retort},
             }));
 
+        auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+
         const MWWorld::Store<ESM::Apparatus>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Apparatus>();
         apparatus["record"] = sol::overload(
             [](const Object& obj) -> const ESM::Apparatus* { return obj.ptr().get<ESM::Apparatus>()->mBase; },
@@ -31,9 +35,15 @@ namespace MWLua
         record[sol::meta_function::to_string] = [](const ESM::Apparatus& rec) { return "ESM3_Apparatus[" + rec.mId + "]"; };
         record["id"] = sol::readonly_property([](const ESM::Apparatus& rec) -> std::string { return rec.mId; });
         record["name"] = sol::readonly_property([](const ESM::Apparatus& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([](const ESM::Apparatus& rec) -> std::string { return rec.mModel; });
+        record["model"] = sol::readonly_property([vfs](const ESM::Apparatus& rec) -> std::string
+        {
+            return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
+        });
         record["mwscript"] = sol::readonly_property([](const ESM::Apparatus& rec) -> std::string { return rec.mScript; });
-        record["icon"] = sol::readonly_property([](const ESM::Apparatus& rec) -> std::string { return rec.mIcon; });
+        record["icon"] = sol::readonly_property([vfs](const ESM::Apparatus& rec) -> std::string
+        {
+            return Misc::ResourceHelpers::correctIconPath(rec.mIcon, vfs);
+        });
         record["type"] = sol::readonly_property([](const ESM::Apparatus& rec) -> int { return rec.mData.mType; });
         record["value"] = sol::readonly_property([](const ESM::Apparatus& rec) -> int { return rec.mData.mValue; });
         record["weight"] = sol::readonly_property([](const ESM::Apparatus& rec) -> float { return rec.mData.mWeight; });
diff --git a/apps/openmw/mwlua/types/book.cpp b/apps/openmw/mwlua/types/book.cpp
index 9d34a2026e..5129f94049 100644
--- a/apps/openmw/mwlua/types/book.cpp
+++ b/apps/openmw/mwlua/types/book.cpp
@@ -1,6 +1,8 @@
 #include "types.hpp"
 
 #include <components/esm3/loadbook.hpp>
+#include <components/misc/resourcehelpers.hpp>
+#include <components/resource/resourcesystem.hpp>
 
 #include <apps/openmw/mwworld/esmstore.hpp>
 
@@ -24,6 +26,8 @@ namespace MWLua
             skill[skillName] = skillName;
         }
 
+        auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+
         const MWWorld::Store<ESM::Book>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Book>();
         book["record"] = sol::overload(
             [](const Object& obj) -> const ESM::Book* { return obj.ptr().get<ESM::Book>()->mBase; },
@@ -32,9 +36,15 @@ namespace MWLua
         record[sol::meta_function::to_string] = [](const ESM::Book& rec) { return "ESM3_Book[" + rec.mId + "]"; };
         record["id"] = sol::readonly_property([](const ESM::Book& rec) -> std::string { return rec.mId; });
         record["name"] = sol::readonly_property([](const ESM::Book& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([](const ESM::Book& rec) -> std::string { return rec.mModel; });
+        record["model"] = sol::readonly_property([vfs](const ESM::Book& rec) -> std::string
+        {
+            return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
+        });
         record["mwscript"] = sol::readonly_property([](const ESM::Book& rec) -> std::string { return rec.mScript; });
-        record["icon"] = sol::readonly_property([](const ESM::Book& rec) -> std::string { return rec.mIcon; });
+        record["icon"] = sol::readonly_property([vfs](const ESM::Book& rec) -> std::string
+        {
+            return Misc::ResourceHelpers::correctIconPath(rec.mIcon, vfs);
+        });
         record["text"] = sol::readonly_property([](const ESM::Book& rec) -> std::string { return rec.mText; });
         record["enchant"] = sol::readonly_property([](const ESM::Book& rec) -> std::string { return rec.mEnchant; });
         record["isScroll"] = sol::readonly_property([](const ESM::Book& rec) -> bool { return rec.mData.mIsScroll; });
diff --git a/apps/openmw/mwlua/types/container.cpp b/apps/openmw/mwlua/types/container.cpp
index 729363435b..e1ce587e2c 100644
--- a/apps/openmw/mwlua/types/container.cpp
+++ b/apps/openmw/mwlua/types/container.cpp
@@ -1,6 +1,8 @@
 #include "types.hpp"
 
 #include <components/esm3/loadcont.hpp>
+#include <components/misc/resourcehelpers.hpp>
+#include <components/resource/resourcesystem.hpp>
 
 #include <apps/openmw/mwworld/esmstore.hpp>
 #include <apps/openmw/mwworld/class.hpp>
@@ -33,6 +35,8 @@ namespace MWLua
             return ptr.getClass().getCapacity(ptr);
         };
 
+        auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+
         const MWWorld::Store<ESM::Container>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Container>();
         container["record"] = sol::overload(
             [](const Object& obj) -> const ESM::Container* { return obj.ptr().get<ESM::Container>()->mBase; },
@@ -41,7 +45,10 @@ namespace MWLua
         record[sol::meta_function::to_string] = [](const ESM::Container& rec) -> std::string { return "ESM3_Container[" + rec.mId + "]"; };
         record["id"] = sol::readonly_property([](const ESM::Container& rec) -> std::string { return rec.mId; });
         record["name"] = sol::readonly_property([](const ESM::Container& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([](const ESM::Container& rec) -> std::string { return rec.mModel; });
+        record["model"] = sol::readonly_property([vfs](const ESM::Container& rec) -> std::string
+        {
+            return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
+        });
         record["mwscript"] = sol::readonly_property([](const ESM::Container& rec) -> std::string { return rec.mScript; });
         record["weight"] = sol::readonly_property([](const ESM::Container& rec) -> float { return rec.mWeight; });
     }
diff --git a/apps/openmw/mwlua/types/creature.cpp b/apps/openmw/mwlua/types/creature.cpp
index 2358c3f41d..251edd24e0 100644
--- a/apps/openmw/mwlua/types/creature.cpp
+++ b/apps/openmw/mwlua/types/creature.cpp
@@ -3,7 +3,8 @@
 #include <components/esm3/loadcrea.hpp>
 
 #include <apps/openmw/mwworld/esmstore.hpp>
-#include <apps/openmw/mwbase/windowmanager.hpp>
+#include <components/misc/resourcehelpers.hpp>
+#include <components/resource/resourcesystem.hpp>
 
 #include "../stats.hpp"
 #include "../luabindings.hpp"
@@ -18,6 +19,8 @@ namespace MWLua
 {
     void addCreatureBindings(sol::table creature, const Context& context)
     {
+        auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+
         const MWWorld::Store<ESM::Creature>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Creature>();
         creature["record"] = sol::overload(
             [](const Object& obj) -> const ESM::Creature* { return obj.ptr().get<ESM::Creature>()->mBase; },
@@ -25,9 +28,9 @@ namespace MWLua
         sol::usertype<ESM::Creature> record = context.mLua->sol().new_usertype<ESM::Creature>("ESM3_Creature");
         record[sol::meta_function::to_string] = [](const ESM::Creature& rec) { return "ESM3_Creature[" + rec.mId + "]"; };
         record["name"] = sol::readonly_property([](const ESM::Creature& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([](const ESM::Creature& rec) -> std::string
+        record["model"] = sol::readonly_property([vfs](const ESM::Creature& rec) -> std::string
         {
-            return MWBase::Environment::get().getWindowManager()->correctMeshPath(rec.mModel);
+            return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
         });
         record["mwscript"] = sol::readonly_property([](const ESM::Creature& rec) -> std::string { return rec.mScript; });
         record["baseCreature"] = sol::readonly_property([](const ESM::Creature& rec) -> std::string { return rec.mOriginal; });
diff --git a/apps/openmw/mwlua/types/door.cpp b/apps/openmw/mwlua/types/door.cpp
index a6d2a7bc0d..4b215d0881 100644
--- a/apps/openmw/mwlua/types/door.cpp
+++ b/apps/openmw/mwlua/types/door.cpp
@@ -1,9 +1,10 @@
 #include "types.hpp"
 
 #include <components/esm3/loaddoor.hpp>
+#include <components/misc/resourcehelpers.hpp>
+#include <components/resource/resourcesystem.hpp>
 
 #include <apps/openmw/mwworld/esmstore.hpp>
-#include <apps/openmw/mwbase/windowmanager.hpp>
 
 #include "../luabindings.hpp"
 
@@ -41,6 +42,8 @@ namespace MWLua
                 return sol::nil;
         };
 
+        auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+
         const MWWorld::Store<ESM::Door>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Door>();
         door["record"] = sol::overload(
             [](const Object& obj) -> const ESM::Door* { return obj.ptr().get<ESM::Door>()->mBase; },
@@ -49,9 +52,9 @@ namespace MWLua
         record[sol::meta_function::to_string] = [](const ESM::Door& rec) -> std::string { return "ESM3_Door[" + rec.mId + "]"; };
         record["id"] = sol::readonly_property([](const ESM::Door& rec) -> std::string { return rec.mId; });
         record["name"] = sol::readonly_property([](const ESM::Door& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([](const ESM::Door& rec) -> std::string
+        record["model"] = sol::readonly_property([vfs](const ESM::Door& rec) -> std::string
         {
-            return MWBase::Environment::get().getWindowManager()->correctMeshPath(rec.mModel);
+            return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
         });
         record["mwscript"] = sol::readonly_property([](const ESM::Door& rec) -> std::string { return rec.mScript; });
         record["openSound"] = sol::readonly_property([](const ESM::Door& rec) -> std::string { return rec.mOpenSound; });
diff --git a/apps/openmw/mwlua/types/lockpick.cpp b/apps/openmw/mwlua/types/lockpick.cpp
index 71c7ec5646..9a46399982 100644
--- a/apps/openmw/mwlua/types/lockpick.cpp
+++ b/apps/openmw/mwlua/types/lockpick.cpp
@@ -1,6 +1,8 @@
 #include "types.hpp"
 
 #include <components/esm3/loadlock.hpp>
+#include <components/misc/resourcehelpers.hpp>
+#include <components/resource/resourcesystem.hpp>
 
 #include <apps/openmw/mwworld/esmstore.hpp>
 
@@ -16,6 +18,8 @@ namespace MWLua
 {
     void addLockpickBindings(sol::table lockpick, const Context& context)
     {
+        auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+
         const MWWorld::Store<ESM::Lockpick>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Lockpick>();
         lockpick["record"] = sol::overload(
             [](const Object& obj) -> const ESM::Lockpick* { return obj.ptr().get<ESM::Lockpick>()->mBase;},
@@ -24,9 +28,15 @@ namespace MWLua
         record[sol::meta_function::to_string] = [](const ESM::Lockpick& rec) { return "ESM3_Lockpick[" + rec.mId + "]";};
         record["id"] = sol::readonly_property([](const ESM::Lockpick& rec) -> std::string { return rec.mId;});
         record["name"] = sol::readonly_property([](const ESM::Lockpick& rec) -> std::string { return rec.mName;});
-        record["model"] = sol::readonly_property([](const ESM::Lockpick& rec) -> std::string { return rec.mModel;});
+        record["model"] = sol::readonly_property([vfs](const ESM::Lockpick& rec) -> std::string
+        {
+            return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
+        });
         record["mwscript"] = sol::readonly_property([](const ESM::Lockpick& rec) -> std::string { return rec.mScript;});
-        record["icon"] = sol::readonly_property([](const ESM::Lockpick& rec) -> std::string { return rec.mIcon;});
+        record["icon"] = sol::readonly_property([vfs](const ESM::Lockpick& rec) -> std::string
+        {
+            return Misc::ResourceHelpers::correctIconPath(rec.mIcon, vfs);
+        });
         record["maxCondition"] = sol::readonly_property([](const ESM::Lockpick& rec) -> int { return rec.mData.mUses;});
         record["value"] = sol::readonly_property([](const ESM::Lockpick& rec) -> int { return rec.mData.mValue;});
         record["weight"] = sol::readonly_property([](const ESM::Lockpick& rec) -> float { return rec.mData.mWeight;});
diff --git a/apps/openmw/mwlua/types/misc.cpp b/apps/openmw/mwlua/types/misc.cpp
index 7546561dad..be53d03d93 100644
--- a/apps/openmw/mwlua/types/misc.cpp
+++ b/apps/openmw/mwlua/types/misc.cpp
@@ -1,6 +1,8 @@
 #include "types.hpp"
 
 #include <components/esm3/loadmisc.hpp>
+#include <components/misc/resourcehelpers.hpp>
+#include <components/resource/resourcesystem.hpp>
 
 #include <apps/openmw/mwworld/esmstore.hpp>
 
@@ -16,6 +18,8 @@ namespace MWLua
 {
     void addMiscellaneousBindings(sol::table miscellaneous, const Context& context)
     {
+        auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+
         const MWWorld::Store<ESM::Miscellaneous>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Miscellaneous>();
         miscellaneous["record"] = sol::overload(
             [](const Object& obj) -> const ESM::Miscellaneous* { return obj.ptr().get<ESM::Miscellaneous>()->mBase; },
@@ -24,9 +28,15 @@ namespace MWLua
         record[sol::meta_function::to_string] = [](const ESM::Miscellaneous& rec) { return "ESM3_Miscellaneous[" + rec.mId + "]"; };
         record["id"] = sol::readonly_property([](const ESM::Miscellaneous& rec) -> std::string { return rec.mId; });
         record["name"] = sol::readonly_property([](const ESM::Miscellaneous& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([](const ESM::Miscellaneous& rec) -> std::string { return rec.mModel; });
+        record["model"] = sol::readonly_property([vfs](const ESM::Miscellaneous& rec) -> std::string
+        {
+            return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
+        });
         record["mwscript"] = sol::readonly_property([](const ESM::Miscellaneous& rec) -> std::string { return rec.mScript; });
-        record["icon"] = sol::readonly_property([](const ESM::Miscellaneous& rec) -> std::string { return rec.mIcon; });
+        record["icon"] = sol::readonly_property([vfs](const ESM::Miscellaneous& rec) -> std::string
+        {
+            return Misc::ResourceHelpers::correctIconPath(rec.mIcon, vfs);
+        });
         record["isKey"] = sol::readonly_property([](const ESM::Miscellaneous& rec) -> bool { return rec.mData.mIsKey; });
         record["value"] = sol::readonly_property([](const ESM::Miscellaneous& rec) -> int { return rec.mData.mValue; });
         record["weight"] = sol::readonly_property([](const ESM::Miscellaneous& rec) -> float { return rec.mData.mWeight; });
diff --git a/apps/openmw/mwlua/types/potion.cpp b/apps/openmw/mwlua/types/potion.cpp
index 0d1b7e202e..c3c5ace281 100644
--- a/apps/openmw/mwlua/types/potion.cpp
+++ b/apps/openmw/mwlua/types/potion.cpp
@@ -1,6 +1,8 @@
 #include "types.hpp"
 
 #include <components/esm3/loadalch.hpp>
+#include <components/misc/resourcehelpers.hpp>
+#include <components/resource/resourcesystem.hpp>
 
 #include <apps/openmw/mwworld/esmstore.hpp>
 
@@ -21,12 +23,19 @@ namespace MWLua
             [](const Object& obj) -> const ESM::Potion* { return obj.ptr().get<ESM::Potion>()->mBase; },
             [store](const std::string& recordId) -> const ESM::Potion* { return store->find(recordId); });
 
+        auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
         sol::usertype<ESM::Potion> record = context.mLua->sol().new_usertype<ESM::Potion>("ESM3_Potion");
         record[sol::meta_function::to_string] = [](const ESM::Potion& rec) { return "ESM3_Potion[" + rec.mId + "]"; };
         record["id"] = sol::readonly_property([](const ESM::Potion& rec) -> std::string { return rec.mId; });
         record["name"] = sol::readonly_property([](const ESM::Potion& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([](const ESM::Potion& rec) -> std::string { return rec.mModel; });
-        record["icon"] = sol::readonly_property([](const ESM::Potion& rec) -> std::string { return rec.mIcon; });
+        record["model"] = sol::readonly_property([vfs](const ESM::Potion& rec) -> std::string
+        {
+            return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
+        });
+        record["icon"] = sol::readonly_property([vfs](const ESM::Potion& rec) -> std::string
+        {
+            return Misc::ResourceHelpers::correctIconPath(rec.mIcon, vfs);
+        });
         record["mwscript"] = sol::readonly_property([](const ESM::Potion& rec) -> std::string { return rec.mScript; });
         record["weight"] = sol::readonly_property([](const ESM::Potion& rec) -> float { return rec.mData.mWeight; });
         record["value"] = sol::readonly_property([](const ESM::Potion& rec) -> int { return rec.mData.mValue; });
diff --git a/apps/openmw/mwlua/types/probe.cpp b/apps/openmw/mwlua/types/probe.cpp
index 771824fce1..373ac622ef 100644
--- a/apps/openmw/mwlua/types/probe.cpp
+++ b/apps/openmw/mwlua/types/probe.cpp
@@ -1,6 +1,8 @@
 #include "types.hpp"
 
 #include <components/esm3/loadprob.hpp>
+#include <components/misc/resourcehelpers.hpp>
+#include <components/resource/resourcesystem.hpp>
 
 #include <apps/openmw/mwworld/esmstore.hpp>
 
@@ -16,6 +18,8 @@ namespace MWLua
 {
     void addProbeBindings(sol::table probe, const Context& context)
     {
+        auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+
         const MWWorld::Store<ESM::Probe>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Probe>();
         probe["record"] = sol::overload(
             [](const Object& obj) -> const ESM::Probe* { return obj.ptr().get<ESM::Probe>()->mBase;},
@@ -24,9 +28,15 @@ namespace MWLua
         record[sol::meta_function::to_string] = [](const ESM::Probe& rec) { return "ESM3_Probe[" + rec.mId + "]";};
         record["id"] = sol::readonly_property([](const ESM::Probe& rec) -> std::string { return rec.mId;});
         record["name"] = sol::readonly_property([](const ESM::Probe& rec) -> std::string { return rec.mName;});
-        record["model"] = sol::readonly_property([](const ESM::Probe& rec) -> std::string { return rec.mModel;});
+        record["model"] = sol::readonly_property([vfs](const ESM::Probe& rec) -> std::string
+        {
+            return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
+        });
         record["mwscript"] = sol::readonly_property([](const ESM::Probe& rec) -> std::string { return rec.mScript;});
-        record["icon"] = sol::readonly_property([](const ESM::Probe& rec) -> std::string { return rec.mIcon;});
+        record["icon"] = sol::readonly_property([vfs](const ESM::Probe& rec) -> std::string
+        {
+            return Misc::ResourceHelpers::correctIconPath(rec.mIcon, vfs);
+        });
         record["maxCondition"] = sol::readonly_property([](const ESM::Probe& rec) -> int { return rec.mData.mUses;});
         record["value"] = sol::readonly_property([](const ESM::Probe& rec) -> int { return rec.mData.mValue;});
         record["weight"] = sol::readonly_property([](const ESM::Probe& rec) -> float { return rec.mData.mWeight;});
diff --git a/apps/openmw/mwlua/types/repair.cpp b/apps/openmw/mwlua/types/repair.cpp
index fa1e34ac63..5b73e713c5 100644
--- a/apps/openmw/mwlua/types/repair.cpp
+++ b/apps/openmw/mwlua/types/repair.cpp
@@ -1,6 +1,8 @@
 #include "types.hpp"
 
 #include <components/esm3/loadrepa.hpp>
+#include <components/misc/resourcehelpers.hpp>
+#include <components/resource/resourcesystem.hpp>
 
 #include <apps/openmw/mwworld/esmstore.hpp>
 
@@ -16,6 +18,8 @@ namespace MWLua
 {
     void addRepairBindings(sol::table repair, const Context& context)
     {
+        auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+
         const MWWorld::Store<ESM::Repair>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Repair>();
         repair["record"] = sol::overload(
             [](const Object& obj) -> const ESM::Repair* { return obj.ptr().get<ESM::Repair>()->mBase; },
@@ -24,9 +28,15 @@ namespace MWLua
         record[sol::meta_function::to_string] = [](const ESM::Repair& rec) { return "ESM3_Repair[" + rec.mId + "]"; };
         record["id"] = sol::readonly_property([](const ESM::Repair& rec) -> std::string { return rec.mId; });
         record["name"] = sol::readonly_property([](const ESM::Repair& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([](const ESM::Repair& rec) -> std::string { return rec.mModel; });
+        record["model"] = sol::readonly_property([vfs](const ESM::Repair& rec) -> std::string
+        {
+            return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
+        });
         record["mwscript"] = sol::readonly_property([](const ESM::Repair& rec) -> std::string { return rec.mScript; });
-        record["icon"] = sol::readonly_property([](const ESM::Repair& rec) -> std::string { return rec.mIcon; });
+        record["icon"] = sol::readonly_property([vfs](const ESM::Repair& rec) -> std::string
+        {
+            return Misc::ResourceHelpers::correctIconPath(rec.mIcon, vfs);
+        });
         record["maxCondition"] = sol::readonly_property([](const ESM::Repair& rec) -> int { return rec.mData.mUses; });
         record["value"] = sol::readonly_property([](const ESM::Repair& rec) -> int { return rec.mData.mValue; });
         record["weight"] = sol::readonly_property([](const ESM::Repair& rec) -> float { return rec.mData.mWeight; });
diff --git a/apps/openmw/mwlua/types/weapon.cpp b/apps/openmw/mwlua/types/weapon.cpp
index beca109216..628e47fc68 100644
--- a/apps/openmw/mwlua/types/weapon.cpp
+++ b/apps/openmw/mwlua/types/weapon.cpp
@@ -1,9 +1,10 @@
 #include "types.hpp"
 
 #include <components/esm3/loadweap.hpp>
+#include <components/misc/resourcehelpers.hpp>
+#include <components/resource/resourcesystem.hpp>
 
 #include <apps/openmw/mwworld/esmstore.hpp>
-#include <apps/openmw/mwbase/windowmanager.hpp>
 
 #include "../luabindings.hpp"
 
@@ -12,7 +13,7 @@ namespace sol
     template <>
     struct is_automagical<ESM::Weapon> : std::false_type {};
 }
-
+#include <components/resource/resourcesystem.hpp>
 namespace MWLua
 {
     void addWeaponBindings(sol::table weapon, const Context& context)
@@ -34,6 +35,8 @@ namespace MWLua
             {"Bolt", ESM::Weapon::Bolt},
         }));
 
+        auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+
         const MWWorld::Store<ESM::Weapon>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Weapon>();
         weapon["record"] = sol::overload(
             [](const Object& obj) -> const ESM::Weapon* { return obj.ptr().get<ESM::Weapon>()->mBase; },
@@ -42,13 +45,13 @@ namespace MWLua
         record[sol::meta_function::to_string] = [](const ESM::Weapon& rec) -> std::string { return "ESM3_Weapon[" + rec.mId + "]"; };
         record["id"] = sol::readonly_property([](const ESM::Weapon& rec) -> std::string { return rec.mId; });
         record["name"] = sol::readonly_property([](const ESM::Weapon& rec) -> std::string { return rec.mName; });
-        record["model"] = sol::readonly_property([](const ESM::Weapon& rec) -> std::string
+        record["model"] = sol::readonly_property([vfs](const ESM::Weapon& rec) -> std::string
         {
-            return MWBase::Environment::get().getWindowManager()->correctMeshPath(rec.mModel);
+            return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs);
         });
-        record["icon"] = sol::readonly_property([](const ESM::Weapon& rec) -> std::string
+        record["icon"] = sol::readonly_property([vfs](const ESM::Weapon& rec) -> std::string
         {
-            return MWBase::Environment::get().getWindowManager()->correctIconPath(rec.mIcon);
+            return Misc::ResourceHelpers::correctIconPath(rec.mIcon, vfs);
         });
         record["enchant"] = sol::readonly_property([](const ESM::Weapon& rec) -> std::string { return rec.mEnchant; });
         record["mwscript"] = sol::readonly_property([](const ESM::Weapon& rec) -> std::string { return rec.mScript; });

From d3d9e66ffd423acc79a042f05d6a434212ad50ef Mon Sep 17 00:00:00 2001
From: Project579 <star579avatar@gmail.com>
Date: Sun, 12 Jun 2022 12:07:40 +0000
Subject: [PATCH 2622/2859] Update CI/build_googletest.sh googletest v1.11.0 is
 required for building with C++20.

---
 CI/build_googletest.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CI/build_googletest.sh b/CI/build_googletest.sh
index a9a50fee7a..8da5b44232 100755
--- a/CI/build_googletest.sh
+++ b/CI/build_googletest.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -ex
 
-git clone -b release-1.10.0 https://github.com/google/googletest.git
+git clone -b release-1.11.0 https://github.com/google/googletest.git
 cd googletest
 mkdir build
 cd build

From 8d56e79877e71529c7c583224825f7d4a34837dc Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sun, 12 Jun 2022 16:58:08 +0200
Subject: [PATCH 2623/2859] Minor simplifications in sortfilteritemmodel.cpp
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Change an if-else-if-else… spaghetti into a switch-case
- Replace a linear search in a dynamically constructed
  vector with a switch-case. Thanks elsid for the idea!
---
 apps/openmw/mwgui/sortfilteritemmodel.cpp | 81 +++++++++++++----------
 1 file changed, 45 insertions(+), 36 deletions(-)

diff --git a/apps/openmw/mwgui/sortfilteritemmodel.cpp b/apps/openmw/mwgui/sortfilteritemmodel.cpp
index acb324baca..f1351218e5 100644
--- a/apps/openmw/mwgui/sortfilteritemmodel.cpp
+++ b/apps/openmw/mwgui/sortfilteritemmodel.cpp
@@ -28,27 +28,30 @@
 
 namespace
 {
+    unsigned int getTypeOrder(unsigned int type)
+    {
+        switch (type)
+        {
+            case ESM::Weapon::sRecordId: return 0;
+            case ESM::Armor::sRecordId: return 1;
+            case ESM::Clothing::sRecordId: return 2;
+            case ESM::Potion::sRecordId: return 3;
+            case ESM::Ingredient::sRecordId: return 4;
+            case ESM::Apparatus::sRecordId: return 5;
+            case ESM::Book::sRecordId: return 6;
+            case ESM::Light::sRecordId: return 7;
+            case ESM::Miscellaneous::sRecordId: return 8;
+            case ESM::Lockpick::sRecordId: return 9;
+            case ESM::Repair::sRecordId: return 10;
+            case ESM::Probe::sRecordId: return 11;
+        }
+        assert(false && "Invalid type value");
+        return std::numeric_limits<unsigned int>::max();
+    }
+
     bool compareType(unsigned int type1, unsigned int type2)
     {
-        // this defines the sorting order of types. types that are first in the vector appear before other types.
-        std::vector<unsigned int> mapping;
-        mapping.emplace_back(ESM::Weapon::sRecordId );
-        mapping.emplace_back(ESM::Armor::sRecordId );
-        mapping.emplace_back(ESM::Clothing::sRecordId );
-        mapping.emplace_back(ESM::Potion::sRecordId );
-        mapping.emplace_back(ESM::Ingredient::sRecordId );
-        mapping.emplace_back(ESM::Apparatus::sRecordId );
-        mapping.emplace_back(ESM::Book::sRecordId );
-        mapping.emplace_back(ESM::Light::sRecordId );
-        mapping.emplace_back(ESM::Miscellaneous::sRecordId );
-        mapping.emplace_back(ESM::Lockpick::sRecordId );
-        mapping.emplace_back(ESM::Repair::sRecordId );
-        mapping.emplace_back(ESM::Probe::sRecordId );
-
-        assert( std::find(mapping.begin(), mapping.end(), type1) != mapping.end() );
-        assert( std::find(mapping.begin(), mapping.end(), type2) != mapping.end() );
-
-        return std::find(mapping.begin(), mapping.end(), type1) < std::find(mapping.begin(), mapping.end(), type2);
+        return getTypeOrder(type1) < getTypeOrder(type2);
     }
 
     struct Compare
@@ -180,23 +183,29 @@ namespace MWGui
         MWWorld::Ptr base = item.mBase;
 
         int category = 0;
-        if (base.getType() == ESM::Armor::sRecordId
-                || base.getType() == ESM::Clothing::sRecordId)
-            category = Category_Apparel;
-        else if (base.getType() == ESM::Weapon::sRecordId)
-            category = Category_Weapon;
-        else if (base.getType() == ESM::Ingredient::sRecordId
-                     || base.getType() == ESM::Potion::sRecordId)
-            category = Category_Magic;
-        else if (base.getType() == ESM::Miscellaneous::sRecordId
-                 || base.getType() == ESM::Ingredient::sRecordId
-                 || base.getType() == ESM::Repair::sRecordId
-                 || base.getType() == ESM::Lockpick::sRecordId
-                 || base.getType() == ESM::Light::sRecordId
-                 || base.getType() == ESM::Apparatus::sRecordId
-                 || base.getType() == ESM::Book::sRecordId
-                 || base.getType() == ESM::Probe::sRecordId)
-            category = Category_Misc;
+        switch (base.getType())
+        {
+            case ESM::Armor::sRecordId:
+            case ESM::Clothing::sRecordId:
+                category = Category_Apparel;
+                break;
+            case ESM::Weapon::sRecordId:
+                category = Category_Weapon;
+                break;
+            case ESM::Ingredient::sRecordId:
+            case ESM::Potion::sRecordId:
+                category = Category_Magic;
+                break;
+            case ESM::Miscellaneous::sRecordId:
+            case ESM::Repair::sRecordId:
+            case ESM::Lockpick::sRecordId:
+            case ESM::Light::sRecordId:
+            case ESM::Apparatus::sRecordId:
+            case ESM::Book::sRecordId:
+            case ESM::Probe::sRecordId:
+                category = Category_Misc;
+                break;
+        }
 
         if (item.mFlags & ItemStack::Flag_Enchanted)
             category |= Category_Magic;

From e9567e5b3d7537e6a64d6f6b816db419af9f3260 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Sun, 12 Jun 2022 19:03:50 +0000
Subject: [PATCH 2624/2859] macos for all!

---
 .gitlab-ci.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c9630e3bd5..4ae7b4bb45 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -317,9 +317,6 @@ Ubuntu_Clang_tests_Debug:
   tags:
     - shared-macos-amd64
   stage: build
-  only:
-    variables:
-      - $CI_PROJECT_ID == "7107382"
   cache:
     paths:
     - ccache/

From 9e6b7fed1aa5b058f64a721fc0c0f7e4af9b1b9a Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Mon, 13 Jun 2022 11:34:17 +0300
Subject: [PATCH 2625/2859] Consolidate refreshMovementAnims()

---
 apps/openmw/mwmechanics/character.cpp | 223 ++++++++++++--------------
 1 file changed, 106 insertions(+), 117 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index c44b7d19d1..2da4f9ab1d 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -491,149 +491,138 @@ void CharacterController::refreshMovementAnims(const std::string& weapShortGroup
     if (movement == mMovementState && idle == mIdleState && !force)
         return;
 
-    // Reset idle if we actually play movement animations excepts of these cases:
-    // 1. When we play turning animations
-    // 2. When we use a fallback animation for lower body since movement animation for given weapon is missing (e.g. for crossbows and spellcasting)
-    bool resetIdle = (movement != CharState_None && !isTurning());
-
     std::string movementAnimName = movementStateToAnimGroup(movement);
-    MWRender::Animation::BlendMask movemask = MWRender::Animation::BlendMask_All;
 
-    if (!movementAnimName.empty())
+    if (movementAnimName.empty())
     {
-        if(!weapShortGroup.empty())
+        if (!mCurrentMovement.empty())
         {
-            std::string::size_type swimpos = movementAnimName.find("swim");
-            if (swimpos == std::string::npos)
-            {
-                std::string weapMovementAnimName;
-                if (mWeaponType == ESM::Weapon::Spell && (movement == CharState_TurnLeft || movement == CharState_TurnRight)) // Spellcasting stance turning is a special case
-                    weapMovementAnimName = weapShortGroup + movementAnimName;
-                else
-                    weapMovementAnimName = movementAnimName + weapShortGroup;
+            mAnimation->disable(mCurrentMovement);
+            mCurrentMovement.clear();
+        }
+        mMovementState = CharState_None;
+        return;
+    }
 
-                if (!mAnimation->hasAnimation(weapMovementAnimName))
-                {
-                    weapMovementAnimName = fallbackShortWeaponGroup(movementAnimName, &movemask);
-                    // If we apply movement only for lower body, do not reset idle animations.
-                    // For upper body there will be idle animation.
-                    if (movemask == MWRender::Animation::BlendMask_LowerBody && idle == CharState_None)
-                        idle = CharState_Idle;
-
-                    if (movemask == MWRender::Animation::BlendMask_LowerBody)
-                        resetIdle = false;
-                }
+    std::string::size_type swimpos = movementAnimName.find("swim");
+    if (!mAnimation->hasAnimation(movementAnimName))
+    {
+        if (swimpos != std::string::npos)
+        {
+            movementAnimName.erase(swimpos, 4);
+            swimpos = std::string::npos;
+        }
+    }
 
-                movementAnimName = weapMovementAnimName;
-            }
+    MWRender::Animation::BlendMask movemask = MWRender::Animation::BlendMask_All;
+
+    if (swimpos == std::string::npos && !weapShortGroup.empty())
+    {
+        std::string weapMovementAnimName;
+        // Spellcasting stance turning is a special case
+        if (mWeaponType == ESM::Weapon::Spell && (movement == CharState_TurnLeft || movement == CharState_TurnRight))
+            weapMovementAnimName = weapShortGroup + movementAnimName;
+        else
+            weapMovementAnimName = movementAnimName + weapShortGroup;
+
+        if (!mAnimation->hasAnimation(weapMovementAnimName))
+        {
+            weapMovementAnimName = fallbackShortWeaponGroup(movementAnimName, &movemask);
+            // If we apply movement only for lower body, do not reset idle animations.
+            // For upper body there will be idle animation.
+            if (movemask == MWRender::Animation::BlendMask_LowerBody && idle == CharState_None)
+                idle = CharState_Idle;
         }
+
+        movementAnimName = weapMovementAnimName;
     }
 
-    if(force || movement != mMovementState)
+    if (!force && movement == mMovementState)
+        return;
+
+    if (!mAnimation->hasAnimation(movementAnimName))
     {
-        mMovementState = movement;
-        if (!movementAnimName.empty())
+        std::string::size_type runpos = movementAnimName.find("run");
+        if (runpos != std::string::npos)
+            movementAnimName.replace(runpos, 3, "walk");
+
+        if (!mAnimation->hasAnimation(movementAnimName))
         {
-            if(!mAnimation->hasAnimation(movementAnimName))
+            if (!mCurrentMovement.empty())
             {
-                std::string::size_type swimpos = movementAnimName.find("swim");
-                if (swimpos != std::string::npos)
-                {
-                    movementAnimName.erase(swimpos, 4);
-                    if (!weapShortGroup.empty())
-                    {
-                        std::string weapMovementAnimName = movementAnimName + weapShortGroup;
-                        if(mAnimation->hasAnimation(weapMovementAnimName))
-                            movementAnimName = weapMovementAnimName;
-                        else
-                        {
-                            movementAnimName = fallbackShortWeaponGroup(movementAnimName, &movemask);
-                            if (movemask == MWRender::Animation::BlendMask_LowerBody)
-                                resetIdle = false;
-                        }
-                    }
-                }
-
-                if (swimpos == std::string::npos || !mAnimation->hasAnimation(movementAnimName))
-                {
-                    std::string::size_type runpos = movementAnimName.find("run");
-                    if (runpos != std::string::npos)
-                    {
-                        movementAnimName.replace(runpos, 3, "walk");
-                        if (!mAnimation->hasAnimation(movementAnimName))
-                            movementAnimName.clear();
-                    }
-                    else
-                        movementAnimName.clear();
-                }
+                mAnimation->disable(mCurrentMovement);
+                mCurrentMovement.clear();
             }
+            mMovementState = CharState_None;
+            return;
         }
+    }
 
-        // If we're playing the same animation, start it from the point it ended
-        float startpoint = 0.f;
-        if (!mCurrentMovement.empty() && movementAnimName == mCurrentMovement)
-            mAnimation->getInfo(mCurrentMovement, &startpoint);
+    mMovementState = movement;
 
-        mMovementAnimationControlled = true;
+    // If we're playing the same animation, start it from the point it ended
+    float startpoint = 0.f;
+    if (!mCurrentMovement.empty() && movementAnimName == mCurrentMovement)
+        mAnimation->getInfo(mCurrentMovement, &startpoint);
 
+    mMovementAnimationControlled = true;
+
+    if (!mCurrentMovement.empty())
         mAnimation->disable(mCurrentMovement);
 
-        if (!mAnimation->hasAnimation(movementAnimName))
-            movementAnimName.clear();
+    mCurrentMovement = movementAnimName;
 
-        mCurrentMovement = movementAnimName;
-        if(!mCurrentMovement.empty())
+    // Reset idle if we actually play movement animations excepts of these cases:
+    // 1. When we play turning animations
+    // 2. When we use a fallback animation for lower body since movement animation for given weapon is missing (e.g. for crossbows and spellcasting)
+    if (!isTurning() && movemask == MWRender::Animation::BlendMask_All)
+    {
+        if (!mCurrentIdle.empty())
         {
-            if (resetIdle)
-            {
-                mAnimation->disable(mCurrentIdle);
-                mIdleState = CharState_None;
-                idle = CharState_None;
-            }
-
-            // For non-flying creatures, MW uses the Walk animation to calculate the animation velocity
-            // even if we are running. This must be replicated, otherwise the observed speed would differ drastically.
-            mAdjustMovementAnimSpeed = true;
-            if (mPtr.getClass().getType() == ESM::Creature::sRecordId
-                    && !(mPtr.get<ESM::Creature>()->mBase->mFlags & ESM::Creature::Flies))
-            {
-                CharacterState walkState = runStateToWalkState(mMovementState);
-                std::string anim = movementStateToAnimGroup(walkState);
+            mAnimation->disable(mCurrentIdle);
+            mCurrentIdle.clear();
+        }
+        mIdleState = CharState_None;
+        idle = CharState_None;
+    }
 
-                mMovementAnimSpeed = mAnimation->getVelocity(anim);
-                if (mMovementAnimSpeed <= 1.0f)
-                {
-                    // Another bug: when using a fallback animation (e.g. RunForward as fallback to SwimRunForward),
-                    // then the equivalent Walk animation will not use a fallback, and if that animation doesn't exist
-                    // we will play without any scaling.
-                    // Makes the speed attribute of most water creatures totally useless.
-                    // And again, this can not be fixed without patching game data.
-                    mAdjustMovementAnimSpeed = false;
-                    mMovementAnimSpeed = 1.f;
-                }
-            }
-            else
-            {
-                mMovementAnimSpeed = mAnimation->getVelocity(mCurrentMovement);
+    // For non-flying creatures, MW uses the Walk animation to calculate the animation velocity
+    // even if we are running. This must be replicated, otherwise the observed speed would differ drastically.
+    mAdjustMovementAnimSpeed = true;
+    if (mPtr.getClass().getType() == ESM::Creature::sRecordId && !(mPtr.get<ESM::Creature>()->mBase->mFlags & ESM::Creature::Flies))
+    {
+        CharacterState walkState = runStateToWalkState(mMovementState);
+        std::string anim = movementStateToAnimGroup(walkState);
 
-                if (mMovementAnimSpeed <= 1.0f)
-                {
-                    // The first person anims don't have any velocity to calculate a speed multiplier from.
-                    // We use the third person velocities instead.
-                    // FIXME: should be pulled from the actual animation, but it is not presently loaded.
-                    bool sneaking = mMovementState == CharState_SneakForward || mMovementState == CharState_SneakBack
-                                 || mMovementState == CharState_SneakLeft    || mMovementState == CharState_SneakRight;
-                    mMovementAnimSpeed = (sneaking ? 33.5452f : (isRunning() ? 222.857f : 154.064f));
-                    mMovementAnimationControlled = false;
-                }
-            }
+        mMovementAnimSpeed = mAnimation->getVelocity(anim);
+        if (mMovementAnimSpeed <= 1.0f)
+        {
+            // Another bug: when using a fallback animation (e.g. RunForward as fallback to SwimRunForward),
+            // then the equivalent Walk animation will not use a fallback, and if that animation doesn't exist
+            // we will play without any scaling.
+            // Makes the speed attribute of most water creatures totally useless.
+            // And again, this can not be fixed without patching game data.
+            mAdjustMovementAnimSpeed = false;
+            mMovementAnimSpeed = 1.f;
+        }
+    }
+    else
+    {
+        mMovementAnimSpeed = mAnimation->getVelocity(mCurrentMovement);
 
-            mAnimation->play(mCurrentMovement, Priority_Movement, movemask, false,
-                             1.f, "start", "stop", startpoint, ~0ul, true);
+        if (mMovementAnimSpeed <= 1.0f)
+        {
+            // The first person anims don't have any velocity to calculate a speed multiplier from.
+            // We use the third person velocities instead.
+            // FIXME: should be pulled from the actual animation, but it is not presently loaded.
+            bool sneaking = mMovementState == CharState_SneakForward || mMovementState == CharState_SneakBack
+                         || mMovementState == CharState_SneakLeft    || mMovementState == CharState_SneakRight;
+            mMovementAnimSpeed = (sneaking ? 33.5452f : (isRunning() ? 222.857f : 154.064f));
+            mMovementAnimationControlled = false;
         }
-        else
-            mMovementState = CharState_None;
     }
+
+    mAnimation->play(mCurrentMovement, Priority_Movement, movemask, false, 1.f, "start", "stop", startpoint, ~0ul, true);
 }
 
 void CharacterController::refreshIdleAnims(const std::string& weapShortGroup, CharacterState idle, bool force)

From ab46337c4131f85a0b422891d20c31a2646e2c99 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Mon, 13 Jun 2022 12:28:12 +0300
Subject: [PATCH 2626/2859] Rewrite handleTextKey using substring views

---
 apps/openmw/mwmechanics/character.cpp | 63 +++++++++++++--------------
 1 file changed, 31 insertions(+), 32 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 2da4f9ab1d..fbe53b94d9 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -886,7 +886,7 @@ void CharacterController::handleTextKey(std::string_view groupname, SceneUtil::T
 {
     std::string_view evt = key->second;
 
-    if(evt.compare(0, 7, "sound: ") == 0)
+    if (evt.substr(0, 7) == "sound: ")
     {
         MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
         sndMgr->playSound3D(mPtr, evt.substr(7), 1.0f, 1.0f);
@@ -894,7 +894,7 @@ void CharacterController::handleTextKey(std::string_view groupname, SceneUtil::T
     }
 
     auto& charClass = mPtr.getClass();
-    if(evt.compare(0, 10, "soundgen: ") == 0)
+    if (evt.substr(0, 10) == "soundgen: ")
     {
         std::string soundgen = std::string(evt.substr(10));
 
@@ -936,30 +936,34 @@ void CharacterController::handleTextKey(std::string_view groupname, SceneUtil::T
         return;
     }
 
-    if(evt.compare(0, groupname.size(), groupname) != 0 ||
-       evt.compare(groupname.size(), 2, ": ") != 0)
+    if (evt.substr(0, groupname.size()) != groupname || evt.substr(groupname.size(), 2) != ": ")
     {
         // Not ours, skip it
         return;
     }
-    const size_t off = groupname.size()+2;
-    const size_t len = evt.size() - off;
 
-    if(groupname == "shield" && evt.compare(off, len, "equip attach") == 0)
-        mAnimation->showCarriedLeft(true);
-    else if(groupname == "shield" && evt.compare(off, len, "unequip detach") == 0)
-        mAnimation->showCarriedLeft(false);
-    else if(evt.compare(off, len, "equip attach") == 0)
-        mAnimation->showWeapons(true);
-    else if(evt.compare(off, len, "unequip detach") == 0)
-        mAnimation->showWeapons(false);
-    else if(evt.compare(off, len, "chop hit") == 0)
+    std::string_view action = evt.substr(groupname.size() + 2);
+    if (action == "equip attach")
+    {
+        if (groupname == "shield")
+            mAnimation->showCarriedLeft(true);
+        else
+            mAnimation->showWeapons(true);
+    }
+    else if (action == "unequip detach")
+    {
+        if (groupname == "shield")
+            mAnimation->showCarriedLeft(false);
+        else
+            mAnimation->showWeapons(false);
+    }
+    else if (action == "chop hit")
         charClass.hit(mPtr, mAttackStrength, ESM::Weapon::AT_Chop);
-    else if(evt.compare(off, len, "slash hit") == 0)
+    else if (action == "slash hit")
         charClass.hit(mPtr, mAttackStrength, ESM::Weapon::AT_Slash);
-    else if(evt.compare(off, len, "thrust hit") == 0)
+    else if (action == "thrust hit")
         charClass.hit(mPtr, mAttackStrength, ESM::Weapon::AT_Thrust);
-    else if(evt.compare(off, len, "hit") == 0)
+    else if (action == "hit")
     {
         if (groupname == "attack1" || groupname == "swimattack1")
             charClass.hit(mPtr, mAttackStrength, ESM::Weapon::AT_Chop);
@@ -970,9 +974,7 @@ void CharacterController::handleTextKey(std::string_view groupname, SceneUtil::T
         else
             charClass.hit(mPtr, mAttackStrength);
     }
-    else if (!groupname.empty()
-             && (groupname.compare(0, groupname.size()-1, "attack") == 0 || groupname.compare(0, groupname.size()-1, "swimattack") == 0)
-             && evt.compare(off, len, "start") == 0)
+    else if (isRandomAttackAnimation(groupname) && action == "start")
     {
         std::multimap<float, std::string>::const_iterator hitKey = key;
 
@@ -1001,25 +1003,22 @@ void CharacterController::handleTextKey(std::string_view groupname, SceneUtil::T
                 charClass.hit(mPtr, mAttackStrength, ESM::Weapon::AT_Thrust);
         }
     }
-    else if (evt.compare(off, len, "shoot attach") == 0)
+    else if (action == "shoot attach")
         mAnimation->attachArrow();
-    else if (evt.compare(off, len, "shoot release") == 0)
+    else if (action == "shoot release")
         mAnimation->releaseArrow(mAttackStrength);
-    else if (evt.compare(off, len, "shoot follow attach") == 0)
+    else if (action == "shoot follow attach")
         mAnimation->attachArrow();
-
-    else if (groupname == "spellcast" && evt.substr(evt.size()-7, 7) == "release"
-             // Make sure this key is actually for the RangeType we are casting. The flame atronach has
-             // the same animation for all range types, so there are 3 "release" keys on the same time, one for each range type.
-             && evt.compare(off, len, mAttackType + " release") == 0)
+    // Make sure this key is actually for the RangeType we are casting. The flame atronach has
+    // the same animation for all range types, so there are 3 "release" keys on the same time, one for each range type.
+    else if (groupname == "spellcast" && action == mAttackType + " release")
     {
         MWBase::Environment::get().getWorld()->castSpell(mPtr, mCastingManualSpell);
         mCastingManualSpell = false;
     }
-
-    else if (groupname == "shield" && evt.compare(off, len, "block hit") == 0)
+    else if (groupname == "shield" && action == "block hit")
         charClass.block(mPtr);
-    else if (groupname == "containeropen" && evt.compare(off, len, "loot") == 0)
+    else if (groupname == "containeropen" && action == "loot")
         MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Container, mPtr);
 }
 

From a105ba14e4ac952a1ecfb261186c561313b50371 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Mon, 13 Jun 2022 12:59:18 +0300
Subject: [PATCH 2627/2859] Consolidate refreshJumpAnims

---
 apps/openmw/mwmechanics/character.cpp | 55 ++++++++++++---------------
 1 file changed, 24 insertions(+), 31 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index fbe53b94d9..96aea48fa2 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -337,24 +337,27 @@ void CharacterController::refreshJumpAnims(const std::string& weapShortGroup, Ju
     if (!force && jump == mJumpState && idle == CharState_None)
         return;
 
-    std::string jumpAnimName;
-    MWRender::Animation::BlendMask jumpmask = MWRender::Animation::BlendMask_All;
-    if (jump != JumpState_None)
+    if (jump == JumpState_None)
     {
-        jumpAnimName = "jump";
-        if(!weapShortGroup.empty())
+        if (!mCurrentJump.empty())
         {
-            jumpAnimName += weapShortGroup;
-            if(!mAnimation->hasAnimation(jumpAnimName))
-            {
-                jumpAnimName = fallbackShortWeaponGroup("jump", &jumpmask);
-
-                // If we apply jump only for lower body, do not reset idle animations.
-                // For upper body there will be idle animation.
-                if (jumpmask == MWRender::Animation::BlendMask_LowerBody && idle == CharState_None)
-                    idle = CharState_Idle;
-            }
+            mAnimation->disable(mCurrentJump);
+            mCurrentJump.clear();
         }
+        mJumpState = JumpState_None;
+        return;
+    }
+
+    std::string jumpAnimName = "jump" + weapShortGroup;
+    MWRender::Animation::BlendMask jumpmask = MWRender::Animation::BlendMask_All;
+    if (!weapShortGroup.empty() && !mAnimation->hasAnimation(jumpAnimName))
+    {
+        jumpAnimName = fallbackShortWeaponGroup("jump", &jumpmask);
+
+        // If we apply jump only for lower body, do not reset idle animations.
+        // For upper body there will be idle animation.
+        if (jumpmask == MWRender::Animation::BlendMask_LowerBody && idle == CharState_None)
+            idle = CharState_Idle;
     }
 
     if (!force && jump == mJumpState)
@@ -369,24 +372,14 @@ void CharacterController::refreshJumpAnims(const std::string& weapShortGroup, Ju
         mCurrentJump.clear();
     }
 
+    if (!mAnimation->hasAnimation(jumpAnimName))
+        return;
+
+    mCurrentJump = jumpAnimName;
     if(mJumpState == JumpState_InAir)
-    {
-        if (mAnimation->hasAnimation(jumpAnimName))
-        {
-            mAnimation->play(jumpAnimName, Priority_Jump, jumpmask, false,
-                         1.0f, startAtLoop ? "loop start" : "start", "stop", 0.f, ~0ul);
-            mCurrentJump = jumpAnimName;
-        }
-    }
+        mAnimation->play(jumpAnimName, Priority_Jump, jumpmask, false, 1.0f, startAtLoop ? "loop start" : "start", "stop", 0.f, ~0ul);
     else if (mJumpState == JumpState_Landing)
-    {
-        if (mAnimation->hasAnimation(jumpAnimName))
-        {
-            mAnimation->play(jumpAnimName, Priority_Jump, jumpmask, true,
-                         1.0f, "loop stop", "stop", 0.0f, 0);
-            mCurrentJump = jumpAnimName;
-        }
-    }
+        mAnimation->play(jumpAnimName, Priority_Jump, jumpmask, true, 1.0f, "loop stop", "stop", 0.0f, 0);
 }
 
 bool CharacterController::onOpen() const

From 2c3d38567270e6df518bbc1200e7a3fe5b6a10a7 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Mon, 13 Jun 2022 14:50:59 +0300
Subject: [PATCH 2628/2859] Consolidate refreshHitRecoilAnims

---
 apps/openmw/mwmechanics/character.cpp | 212 +++++++++++++-------------
 1 file changed, 110 insertions(+), 102 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 96aea48fa2..ad786ca06f 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -161,6 +161,26 @@ std::string deathStateToAnimGroup(MWMechanics::CharacterState state)
     }
 }
 
+// Converts a hit state to its equivalent animation group as long as it is a hit state.
+std::string hitStateToAnimGroup(MWMechanics::CharacterState state)
+{
+    using namespace MWMechanics;
+    switch (state)
+    {
+        case CharState_SwimHit: return "swimhit";
+        case CharState_SwimKnockDown: return "swimknockdown";
+        case CharState_SwimKnockOut: return "swimknockout";
+
+        case CharState_Hit: return "hit";
+        case CharState_KnockDown: return "knockdown";
+        case CharState_KnockOut: return "knockout";
+
+        case CharState_Block: return "shield";
+
+        default: return {};
+    }
+}
+
 float getFallDamage(const MWWorld::Ptr& ptr, float fallHeight)
 {
     MWBase::World *world = MWBase::Environment::get().getWorld();
@@ -211,125 +231,114 @@ std::string CharacterController::chooseRandomGroup (const std::string& prefix, i
 
 void CharacterController::refreshHitRecoilAnims(CharacterState& idle)
 {
-    const auto world = MWBase::Environment::get().getWorld();
     auto& charClass = mPtr.getClass();
+    if (!charClass.isActor())
+        return;
+    const auto world = MWBase::Environment::get().getWorld();
     auto& stats = charClass.getCreatureStats(mPtr);
+    bool knockout = stats.getFatigue().getCurrent() < 0 || stats.getFatigue().getBase() == 0;
     bool recovery = stats.getHitRecovery();
     bool knockdown = stats.getKnockedDown();
     bool block = stats.getBlock();
     bool isSwimming = world->isSwimming(mPtr);
     auto& prng = world->getPrng();
-    if(mHitState == CharState_None)
-    {
-        if (stats.getFatigue().getCurrent() < 0 || stats.getFatigue().getBase() == 0)
-        {
-            mTimeUntilWake = Misc::Rng::rollClosedProbability(prng) * 2 + 1; // Wake up after 1 to 3 seconds
-            if (isSwimming && mAnimation->hasAnimation("swimknockout"))
-            {
-                mHitState = CharState_SwimKnockOut;
-                mCurrentHit = "swimknockout";
-                mAnimation->play(mCurrentHit, Priority_Knockdown, MWRender::Animation::BlendMask_All, false, 1, "start", "stop", 0.0f, ~0ul);
-            }
-            else if (!isSwimming && mAnimation->hasAnimation("knockout"))
-            {
-                mHitState = CharState_KnockOut;
-                mCurrentHit = "knockout";
-                mAnimation->play(mCurrentHit, Priority_Knockdown, MWRender::Animation::BlendMask_All, false, 1, "start", "stop", 0.0f, ~0ul);
-            }
-            else
-            {
-                // Knockout animations are missing. Fall back to idle animation, so target actor still can be killed via HtH.
-                mCurrentHit.erase();
-            }
 
-            stats.setKnockedDown(true);
-        }
-        else if (knockdown)
-        {
-            if (isSwimming && mAnimation->hasAnimation("swimknockdown"))
-            {
-                mHitState = CharState_SwimKnockDown;
-                mCurrentHit = "swimknockdown";
-                mAnimation->play(mCurrentHit, Priority_Knockdown, MWRender::Animation::BlendMask_All, true, 1, "start", "stop", 0.0f, 0);
-            }
-            else if (!isSwimming && mAnimation->hasAnimation("knockdown"))
-            {
-                mHitState = CharState_KnockDown;
-                mCurrentHit = "knockdown";
-                mAnimation->play(mCurrentHit, Priority_Knockdown, MWRender::Animation::BlendMask_All, true, 1, "start", "stop", 0.0f, 0);
-            }
-            else
-            {
-                // Knockdown animation is missing. Cancel knockdown state.
-                stats.setKnockedDown(false);
-            }
-        }
-        else if (recovery)
+    if (mHitState != CharState_None)
+    {
+        if (!mAnimation->isPlaying(mCurrentHit))
         {
-            std::string anim = chooseRandomGroup("swimhit");
-            if (isSwimming && mAnimation->hasAnimation(anim))
-            {
-                mHitState = CharState_SwimHit;
-                mCurrentHit = anim;
-                mAnimation->play(mCurrentHit, Priority_Hit, MWRender::Animation::BlendMask_All, true, 1, "start", "stop", 0.0f, 0);
-            }
-            else
-            {
-                anim = chooseRandomGroup("hit");
-                if (mAnimation->hasAnimation(anim))
-                {
-                    mHitState = CharState_Hit;
-                    mCurrentHit = anim;
-                    mAnimation->play(mCurrentHit, Priority_Hit, MWRender::Animation::BlendMask_All, true, 1, "start", "stop", 0.0f, 0);
-                }
-            }
+            mHitState = CharState_None;
+            mCurrentHit.clear();
+            stats.setKnockedDown(false);
+            stats.setHitRecovery(false);
+            stats.setBlock(false);
         }
-        else if (block && mAnimation->hasAnimation("shield"))
+        else if (isKnockedOut() && !knockout && mTimeUntilWake <= 0)
         {
-            mHitState = CharState_Block;
-            mCurrentHit = "shield";
-            MWRender::Animation::AnimPriority priorityBlock (Priority_Hit);
-            priorityBlock[MWRender::Animation::BoneGroup_LeftArm] = Priority_Block;
-            priorityBlock[MWRender::Animation::BoneGroup_LowerBody] = Priority_WeaponLowerBody;
-            mAnimation->play(mCurrentHit, priorityBlock, MWRender::Animation::BlendMask_All, true, 1, "block start", "block stop", 0.0f, 0);
+            mAnimation->disable(mCurrentHit);
+            mAnimation->play(mCurrentHit, Priority_Knockdown, MWRender::Animation::BlendMask_All, true, 1, "loop stop", "stop", 0.0f, 0);
         }
+        return;
+    }
 
-        // Cancel upper body animations
-        if (isKnockedOut() || isKnockedDown())
-        {
-            if (mUpperBodyState > UpperCharState_WeapEquiped)
-            {
-                mAnimation->disable(mCurrentWeapon);
-                mUpperBodyState = UpperCharState_WeapEquiped;
-                if (mWeaponType > ESM::Weapon::None)
-                    mAnimation->showWeapons(true);
-            }
-            else if (mUpperBodyState > UpperCharState_Nothing && mUpperBodyState < UpperCharState_WeapEquiped)
-            {
-                mAnimation->disable(mCurrentWeapon);
-                mUpperBodyState = UpperCharState_Nothing;
-            }
-        }
-        if (mHitState != CharState_None)
-            idle = CharState_None;
+    if (!knockout && !knockdown && !recovery && !block)
+        return;
+
+    if (knockout)
+        mTimeUntilWake = Misc::Rng::rollClosedProbability(prng) * 2 + 1; // Wake up after 1 to 3 seconds
+
+    MWRender::Animation::AnimPriority priority(Priority_Knockdown);
+    bool autodisable = true;
+    std::string startKey = "start";
+    std::string stopKey = "stop";
+    if (knockout)
+    {
+        mHitState = isSwimming ? CharState_SwimKnockOut : CharState_KnockOut;
+        stats.setKnockedDown(true);
+        autodisable = false;
     }
-    else if(!mAnimation->isPlaying(mCurrentHit))
+    else if (knockdown)
     {
-        mCurrentHit.erase();
-        if (knockdown)
-            stats.setKnockedDown(false);
-        if (recovery)
-            stats.setHitRecovery(false);
-        if (block)
-            stats.setBlock(false);
+        mHitState = isSwimming ? CharState_SwimKnockDown : CharState_KnockDown;
+    }
+    else if (recovery)
+    {
+        mHitState = isSwimming ? CharState_SwimHit : CharState_Hit;
+        priority = Priority_Hit;
+    }
+    else if (block)
+    {
+        mHitState = CharState_Block;
+        priority = Priority_Block;
+        priority[MWRender::Animation::BoneGroup_LeftArm] = Priority_Block;
+        priority[MWRender::Animation::BoneGroup_LowerBody] = Priority_WeaponLowerBody;
+        startKey = "block start";
+        stopKey = "block stop";
+    }
+
+    mCurrentHit = hitStateToAnimGroup(mHitState);
+
+    if (isRecovery())
+    {
+        mCurrentHit = chooseRandomGroup(mCurrentHit);
+        if (mHitState == CharState_SwimHit && !mAnimation->hasAnimation(mCurrentHit))
+            mCurrentHit = chooseRandomGroup(hitStateToAnimGroup(CharState_Hit));
+    }
+
+    if (!mAnimation->hasAnimation(mCurrentHit))
+    {
+        // The hit animation is missing. Reset the current hit state and immediately cancel all states as if the animation were instantaneous.
         mHitState = CharState_None;
+        mCurrentHit.clear();
+        stats.setKnockedDown(false);
+        stats.setHitRecovery(false);
+        stats.setBlock(false);
+        return;
     }
-    else if (isKnockedOut() && stats.getFatigue().getCurrent() > 0 && mTimeUntilWake <= 0)
+
+    // Cancel upper body animations
+    if (isKnockedOut() || isKnockedDown())
     {
-        mHitState = isSwimming ? CharState_SwimKnockDown : CharState_KnockDown;
-        mAnimation->disable(mCurrentHit);
-        mAnimation->play(mCurrentHit, Priority_Knockdown, MWRender::Animation::BlendMask_All, true, 1, "loop stop", "stop", 0.0f, 0);
+        if (!mCurrentWeapon.empty())
+        {
+            mAnimation->disable(mCurrentWeapon);
+            mCurrentWeapon.clear();
+        }
+        if (mUpperBodyState > UpperCharState_WeapEquiped)
+        {
+            mUpperBodyState = UpperCharState_WeapEquiped;
+            if (mWeaponType > ESM::Weapon::None)
+                mAnimation->showWeapons(true);
+        }
+        else if (mUpperBodyState < UpperCharState_WeapEquiped)
+        {
+            mUpperBodyState = UpperCharState_Nothing;
+        }
     }
+
+    mAnimation->play(mCurrentHit, priority, MWRender::Animation::BlendMask_All, autodisable, 1, startKey, stopKey, 0.0f, ~0ul);
+
+    idle = CharState_None;
 }
 
 void CharacterController::refreshJumpAnims(const std::string& weapShortGroup, JumpingState jump, CharacterState& idle, bool force)
@@ -689,8 +698,7 @@ void CharacterController::refreshCurrentAnims(CharacterState idle, CharacterStat
     if (isPersistentAnimPlaying())
         return;
 
-    if (mPtr.getClass().isActor())
-        refreshHitRecoilAnims(idle);
+    refreshHitRecoilAnims(idle);
 
     std::string weap;
     if (mWeaponType != ESM::Weapon::HandToHand || mPtr.getClass().isBipedal(mPtr))

From dd42a69ca5f32ceeb393f9e5e4c6a994ff6dc2ea Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Mon, 13 Jun 2022 15:41:56 +0300
Subject: [PATCH 2629/2859] Consolidate refreshIdleAnims

---
 apps/openmw/mwmechanics/character.cpp | 137 ++++++++++++++++++--------
 1 file changed, 94 insertions(+), 43 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index ad786ca06f..d39f04f456 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -181,6 +181,48 @@ std::string hitStateToAnimGroup(MWMechanics::CharacterState state)
     }
 }
 
+// Converts an idle state to its equivalent animation group.
+std::string idleStateToAnimGroup(MWMechanics::CharacterState state)
+{
+    using namespace MWMechanics;
+    switch (state)
+    {
+        case CharState_IdleSwim:
+            return "idleswim";
+        case CharState_IdleSneak:
+            return "idlesneak";
+        case CharState_Idle:
+        case CharState_Idle2:
+        case CharState_Idle3:
+        case CharState_Idle4:
+        case CharState_Idle5:
+        case CharState_Idle6:
+        case CharState_Idle7:
+        case CharState_Idle8:
+        case CharState_Idle9:
+        case CharState_SpecialIdle:
+            return "idle";
+        default:
+            return {};
+    }
+}
+
+MWRender::Animation::AnimPriority getIdlePriority(MWMechanics::CharacterState state)
+{
+    using namespace MWMechanics;
+    MWRender::Animation::AnimPriority priority(Priority_Default);
+    switch (state)
+    {
+        case CharState_IdleSwim:
+            return Priority_SwimIdle;
+        case CharState_IdleSneak:
+            priority[MWRender::Animation::BoneGroup_LowerBody] = Priority_SneakIdleLowerBody;
+            [[fallthrough]];
+        default:
+            return priority;
+    }
+}
+
 float getFallDamage(const MWWorld::Ptr& ptr, float fallHeight)
 {
     MWBase::World *world = MWBase::Environment::get().getWorld();
@@ -637,59 +679,68 @@ void CharacterController::refreshIdleAnims(const std::string& weapShortGroup, Ch
             && !mPtr.getClass().isBipedal(mPtr))
         idle = CharState_None;
 
-    if(force || idle != mIdleState || (!mAnimation->isPlaying(mCurrentIdle) && mAnimQueue.empty()))
-    {
-        mIdleState = idle;
-        size_t numLoops = ~0ul;
+    if (!force && idle == mIdleState && (mAnimation->isPlaying(mCurrentIdle) || !mAnimQueue.empty()))
+        return;
 
-        std::string idleGroup;
-        MWRender::Animation::AnimPriority idlePriority (Priority_Default);
-        // Only play "idleswim" or "idlesneak" if they exist. Otherwise, fallback to
-        // "idle"+weapon or "idle".
-        if(mIdleState == CharState_IdleSwim && mAnimation->hasAnimation("idleswim"))
-        {
-            idleGroup = "idleswim";
-            idlePriority = Priority_SwimIdle;
-        }
-        else if(mIdleState == CharState_IdleSneak && mAnimation->hasAnimation("idlesneak"))
+    mIdleState = idle;
+    size_t numLoops = ~0ul;
+
+    std::string idleGroup = idleStateToAnimGroup(mIdleState);
+    MWRender::Animation::AnimPriority priority = getIdlePriority(mIdleState);
+
+    // Only play "idleswim" or "idlesneak" if they exist. Otherwise, fallback to
+    // "idle"+weapon or "idle".
+    if ((mIdleState == CharState_IdleSwim || mIdleState == CharState_IdleSneak) && !mAnimation->hasAnimation(idleGroup))
+        idleGroup = idleStateToAnimGroup(CharState_Idle);
+
+    if (idleGroup.empty())
+    {
+        if (mCurrentIdle.empty())
         {
-            idleGroup = "idlesneak";
-            idlePriority[MWRender::Animation::BoneGroup_LowerBody] = Priority_SneakIdleLowerBody;
+            mAnimation->disable(mCurrentIdle);
+            mCurrentIdle.clear();
         }
-        else if(mIdleState != CharState_None)
-        {
-            idleGroup = "idle";
-            if(!weapShortGroup.empty())
-            {
-                idleGroup += weapShortGroup;
-                if(!mAnimation->hasAnimation(idleGroup))
-                {
-                    idleGroup = fallbackShortWeaponGroup("idle");
-                }
+        mIdleState = CharState_None;
+        return;
+    }
 
-                // play until the Loop Stop key 2 to 5 times, then play until the Stop key
-                // this replicates original engine behavior for the "Idle1h" 1st-person animation
-                auto& prng = MWBase::Environment::get().getWorld()->getPrng();
-                numLoops = 1 + Misc::Rng::rollDice(4, prng); 
-            }
-        }
+    if (mIdleState != CharState_IdleSwim && mIdleState != CharState_IdleSneak && mIdleState != CharState_None && !weapShortGroup.empty())
+    {
+        std::string weapIdleGroup = idleGroup + weapShortGroup;
+        if (!mAnimation->hasAnimation(weapIdleGroup))
+            weapIdleGroup = fallbackShortWeaponGroup(idleGroup);
+        idleGroup = weapIdleGroup;
 
-        // There is no need to restart anim if the new and old anims are the same.
-        // Just update a number of loops.
-        float startPoint = 0;
-        if (!mCurrentIdle.empty() && mCurrentIdle == idleGroup)
+        // play until the Loop Stop key 2 to 5 times, then play until the Stop key
+        // this replicates original engine behavior for the "Idle1h" 1st-person animation
+        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+        numLoops = 1 + Misc::Rng::rollDice(4, prng);
+    }
+
+    if (!mAnimation->hasAnimation(idleGroup))
+    {
+        if (mCurrentIdle.empty())
         {
-            mAnimation->getInfo(mCurrentIdle, &startPoint);
+            mAnimation->disable(mCurrentIdle);
+            mCurrentIdle.clear();
         }
+        mIdleState = CharState_None;
+        return;
+    }
 
-        if(!mCurrentIdle.empty())
-            mAnimation->disable(mCurrentIdle);
+    float startPoint = 0.f;
+    if (!mCurrentIdle.empty())
+    {
+        // There is no need to restart anim if the new and old anims are the same.
+        // Just update the number of loops.
+        if (mCurrentIdle == idleGroup)
+            mAnimation->getInfo(mCurrentIdle, &startPoint);
 
-        mCurrentIdle = idleGroup;
-        if(!mCurrentIdle.empty())
-            mAnimation->play(mCurrentIdle, idlePriority, MWRender::Animation::BlendMask_All, false,
-                             1.0f, "start", "stop", startPoint, numLoops, true);
+        mAnimation->disable(mCurrentIdle);
     }
+
+    mCurrentIdle = idleGroup;
+    mAnimation->play(mCurrentIdle, priority, MWRender::Animation::BlendMask_All, false, 1.0f, "start", "stop", startPoint, numLoops, true);
 }
 
 void CharacterController::refreshCurrentAnims(CharacterState idle, CharacterState movement, JumpingState jump, bool force)

From 0a38c3ab7847cc0a1c97d6f96111ce8b5bdf1b9d Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Mon, 13 Jun 2022 16:14:19 +0300
Subject: [PATCH 2630/2859] Reset current animation states in a consistent way

---
 apps/openmw/mwmechanics/character.cpp | 174 ++++++++++++--------------
 apps/openmw/mwmechanics/character.hpp |   8 ++
 2 files changed, 85 insertions(+), 97 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index d39f04f456..2a975fa649 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -271,6 +271,52 @@ std::string CharacterController::chooseRandomGroup (const std::string& prefix, i
     return prefix + std::to_string(roll);
 }
 
+
+void CharacterController::clearStateAnimation(std::string &anim) const
+{
+    if (anim.empty())
+        return;
+    if (mAnimation)
+        mAnimation->disable(anim);
+    anim.clear();
+}
+
+void CharacterController::resetCurrentJumpState()
+{
+    clearStateAnimation(mCurrentJump);
+    mJumpState = JumpState_None;
+}
+
+void CharacterController::resetCurrentMovementState()
+{
+    clearStateAnimation(mCurrentMovement);
+    mMovementState = CharState_None;
+}
+
+void CharacterController::resetCurrentIdleState()
+{
+    clearStateAnimation(mCurrentIdle);
+    mIdleState = CharState_None;
+}
+
+void CharacterController::resetCurrentHitState()
+{
+    clearStateAnimation(mCurrentHit);
+    mHitState = CharState_None;
+}
+
+void CharacterController::resetCurrentWeaponState()
+{
+    clearStateAnimation(mCurrentWeapon);
+    mUpperBodyState = UpperCharState_Nothing;
+}
+
+void CharacterController::resetCurrentDeathState()
+{
+    clearStateAnimation(mCurrentDeath);
+    mDeathState = CharState_None;
+}
+
 void CharacterController::refreshHitRecoilAnims(CharacterState& idle)
 {
     auto& charClass = mPtr.getClass();
@@ -361,11 +407,7 @@ void CharacterController::refreshHitRecoilAnims(CharacterState& idle)
     // Cancel upper body animations
     if (isKnockedOut() || isKnockedDown())
     {
-        if (!mCurrentWeapon.empty())
-        {
-            mAnimation->disable(mCurrentWeapon);
-            mCurrentWeapon.clear();
-        }
+        clearStateAnimation(mCurrentWeapon);
         if (mUpperBodyState > UpperCharState_WeapEquiped)
         {
             mUpperBodyState = UpperCharState_WeapEquiped;
@@ -390,12 +432,7 @@ void CharacterController::refreshJumpAnims(const std::string& weapShortGroup, Ju
 
     if (jump == JumpState_None)
     {
-        if (!mCurrentJump.empty())
-        {
-            mAnimation->disable(mCurrentJump);
-            mCurrentJump.clear();
-        }
-        mJumpState = JumpState_None;
+        resetCurrentJumpState();
         return;
     }
 
@@ -416,12 +453,7 @@ void CharacterController::refreshJumpAnims(const std::string& weapShortGroup, Ju
 
     bool startAtLoop = (jump == mJumpState);
     mJumpState = jump;
-
-    if (!mCurrentJump.empty())
-    {
-        mAnimation->disable(mCurrentJump);
-        mCurrentJump.clear();
-    }
+    clearStateAnimation(mCurrentJump);
 
     if (!mAnimation->hasAnimation(jumpAnimName))
         return;
@@ -539,12 +571,7 @@ void CharacterController::refreshMovementAnims(const std::string& weapShortGroup
 
     if (movementAnimName.empty())
     {
-        if (!mCurrentMovement.empty())
-        {
-            mAnimation->disable(mCurrentMovement);
-            mCurrentMovement.clear();
-        }
-        mMovementState = CharState_None;
+        resetCurrentMovementState();
         return;
     }
 
@@ -592,12 +619,7 @@ void CharacterController::refreshMovementAnims(const std::string& weapShortGroup
 
         if (!mAnimation->hasAnimation(movementAnimName))
         {
-            if (!mCurrentMovement.empty())
-            {
-                mAnimation->disable(mCurrentMovement);
-                mCurrentMovement.clear();
-            }
-            mMovementState = CharState_None;
+            resetCurrentMovementState();
             return;
         }
     }
@@ -611,9 +633,7 @@ void CharacterController::refreshMovementAnims(const std::string& weapShortGroup
 
     mMovementAnimationControlled = true;
 
-    if (!mCurrentMovement.empty())
-        mAnimation->disable(mCurrentMovement);
-
+    clearStateAnimation(mCurrentMovement);
     mCurrentMovement = movementAnimName;
 
     // Reset idle if we actually play movement animations excepts of these cases:
@@ -621,12 +641,7 @@ void CharacterController::refreshMovementAnims(const std::string& weapShortGroup
     // 2. When we use a fallback animation for lower body since movement animation for given weapon is missing (e.g. for crossbows and spellcasting)
     if (!isTurning() && movemask == MWRender::Animation::BlendMask_All)
     {
-        if (!mCurrentIdle.empty())
-        {
-            mAnimation->disable(mCurrentIdle);
-            mCurrentIdle.clear();
-        }
-        mIdleState = CharState_None;
+        resetCurrentIdleState();
         idle = CharState_None;
     }
 
@@ -695,12 +710,7 @@ void CharacterController::refreshIdleAnims(const std::string& weapShortGroup, Ch
 
     if (idleGroup.empty())
     {
-        if (mCurrentIdle.empty())
-        {
-            mAnimation->disable(mCurrentIdle);
-            mCurrentIdle.clear();
-        }
-        mIdleState = CharState_None;
+        resetCurrentIdleState();
         return;
     }
 
@@ -719,26 +729,17 @@ void CharacterController::refreshIdleAnims(const std::string& weapShortGroup, Ch
 
     if (!mAnimation->hasAnimation(idleGroup))
     {
-        if (mCurrentIdle.empty())
-        {
-            mAnimation->disable(mCurrentIdle);
-            mCurrentIdle.clear();
-        }
-        mIdleState = CharState_None;
+        resetCurrentIdleState();
         return;
     }
 
     float startPoint = 0.f;
-    if (!mCurrentIdle.empty())
-    {
-        // There is no need to restart anim if the new and old anims are the same.
-        // Just update the number of loops.
-        if (mCurrentIdle == idleGroup)
-            mAnimation->getInfo(mCurrentIdle, &startPoint);
-
-        mAnimation->disable(mCurrentIdle);
-    }
+    // There is no need to restart anim if the new and old anims are the same.
+    // Just update the number of loops.
+    if (mCurrentIdle == idleGroup)
+        mAnimation->getInfo(mCurrentIdle, &startPoint);
 
+    clearStateAnimation(mCurrentIdle);
     mCurrentIdle = idleGroup;
     mAnimation->play(mCurrentIdle, priority, MWRender::Animation::BlendMask_All, false, 1.0f, "start", "stop", startPoint, numLoops, true);
 }
@@ -781,21 +782,11 @@ void CharacterController::playDeath(float startpoint, CharacterState death)
     // For dead actors, refreshCurrentAnims is no longer called, so we need to disable the movement state manually.
     // Note that these animations wouldn't actually be visible (due to the Death animation's priority being higher).
     // However, they could still trigger text keys, such as Hit events, or sounds.
-    mMovementState = CharState_None;
-    mAnimation->disable(mCurrentMovement);
-    mCurrentMovement.clear();
-    mUpperBodyState = UpperCharState_Nothing;
-    mAnimation->disable(mCurrentWeapon);
-    mCurrentWeapon.clear();
-    mHitState = CharState_None;
-    mAnimation->disable(mCurrentHit);
-    mCurrentHit.clear();
-    mIdleState = CharState_None;
-    mAnimation->disable(mCurrentIdle);
-    mCurrentIdle.clear();
-    mJumpState = JumpState_None;
-    mAnimation->disable(mCurrentJump);
-    mCurrentJump.clear();
+    resetCurrentMovementState();
+    resetCurrentWeaponState();
+    resetCurrentHitState();
+    resetCurrentIdleState();
+    resetCurrentJumpState();
     mMovementAnimationControlled = true;
 
     mAnimation->play(mCurrentDeath, Priority_Death, MWRender::Animation::BlendMask_All,
@@ -1184,9 +1175,9 @@ bool CharacterController::updateState(CharacterState idle)
     if (isStillWeapon && mWeaponType != weaptype && mUpperBodyState > UpperCharState_WeapEquiped)
     {
         forcestateupdate = true;
+        clearStateAnimation(mCurrentWeapon);
         mUpperBodyState = UpperCharState_WeapEquiped;
         setAttackingOrSpell(false);
-        mAnimation->disable(mCurrentWeapon);
         mAnimation->showWeapons(true);
         stats.setAttackingOrSpell(false);
     }
@@ -1256,7 +1247,7 @@ bool CharacterController::updateState(CharacterState idle)
 
                 if (!isStillWeapon)
                 {
-                    mAnimation->disable(mCurrentWeapon);
+                    clearStateAnimation(mCurrentWeapon);
                     if (weaptype != ESM::Weapon::None)
                     {
                         mAnimation->showWeapons(false);
@@ -1304,8 +1295,7 @@ bool CharacterController::updateState(CharacterState idle)
             // Make sure that we disabled unequipping animation
             if (mUpperBodyState == UpperCharState_UnEquipingWeap)
             {
-                mUpperBodyState = UpperCharState_Nothing;
-                mAnimation->disable(mCurrentWeapon);
+                resetCurrentWeaponState();
                 mWeaponType = ESM::Weapon::None;
                 mCurrentWeapon = getWeaponAnimation(mWeaponType);
             }
@@ -1347,7 +1337,7 @@ bool CharacterController::updateState(CharacterState idle)
 
         if (!ammunition && mUpperBodyState > UpperCharState_WeapEquiped)
         {
-            mAnimation->disable(mCurrentWeapon);
+            clearStateAnimation(mCurrentWeapon);
             mUpperBodyState = UpperCharState_WeapEquiped;
         }
     }
@@ -1572,8 +1562,7 @@ bool CharacterController::updateState(CharacterState idle)
             idle != CharState_IdleSneak && idle != CharState_IdleSwim &&
             mIdleState != CharState_IdleSneak && mIdleState != CharState_IdleSwim)
         {
-            mAnimation->disable(mCurrentIdle);
-            mIdleState = CharState_None;
+            resetCurrentIdleState();
         }
 
         animPlaying = mAnimation->getInfo(mCurrentWeapon, &complete);
@@ -1629,7 +1618,7 @@ bool CharacterController::updateState(CharacterState idle)
                 if (mWeaponType > ESM::Weapon::None)
                     mAnimation->showWeapons(true);
             }
-            mAnimation->disable(mCurrentWeapon);
+            clearStateAnimation(mCurrentWeapon);
         }
     }
 
@@ -1766,7 +1755,7 @@ bool CharacterController::updateState(CharacterState idle)
     }
     else if(complete >= 1.0f && isRandomAttackAnimation(mCurrentWeapon))
     {
-        mAnimation->disable(mCurrentWeapon);
+        clearStateAnimation(mCurrentWeapon);
         mUpperBodyState = UpperCharState_WeapEquiped;
     }
 
@@ -2086,7 +2075,7 @@ void CharacterController::update(float duration)
             vec.z() = 0.0f;
 
             // We should reset idle animation during landing
-            mAnimation->disable(mCurrentIdle);
+            clearStateAnimation(mCurrentIdle);
 
             float height = cls.getCreatureStats(mPtr).land(isPlayer);
             float healthLost = getFallDamage(mPtr, height);
@@ -2429,8 +2418,7 @@ void CharacterController::unpersistAnimationState()
             complete = (time - start) / (stop - start);
         }
 
-        mAnimation->disable(mCurrentIdle);
-        mCurrentIdle.clear();
+        clearStateAnimation(mCurrentIdle);
         mIdleState = CharState_SpecialIdle;
 
         bool loopfallback = (mAnimQueue.front().mGroup.compare(0,4,"idle") == 0);
@@ -2480,8 +2468,7 @@ bool CharacterController::playGroup(const std::string &groupname, int mode, int
     {
         clearAnimQueue(persist);
 
-        mAnimation->disable(mCurrentIdle);
-        mCurrentIdle.clear();
+        clearStateAnimation(mCurrentIdle);
 
         mIdleState = CharState_SpecialIdle;
         bool loopfallback = (entry.mGroup.compare(0,4,"idle") == 0);
@@ -2575,11 +2562,7 @@ CharacterController::KillResult CharacterController::kill()
     if (mDeathState == CharState_None)
     {
         playRandomDeath();
-
-        mAnimation->disable(mCurrentIdle);
-
-        mIdleState = CharState_None;
-        mCurrentIdle.clear();
+        resetCurrentIdleState();
         return Result_DeathAnimStarted;
     }
 
@@ -2599,10 +2582,7 @@ void CharacterController::resurrect()
     if(mDeathState == CharState_None)
         return;
 
-    if(mAnimation)
-        mAnimation->disable(mCurrentDeath);
-    mCurrentDeath.clear();
-    mDeathState = CharState_None;
+    resetCurrentDeathState();
     mWeaponType = ESM::Weapon::None;
 }
 
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index 1ae09c9d1a..1f1effed28 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -197,6 +197,14 @@ class CharacterController : public MWRender::Animation::TextKeyListener
 
     std::string getMovementBasedAttackType() const;
 
+    void clearStateAnimation(std::string &anim) const;
+    void resetCurrentJumpState();
+    void resetCurrentMovementState();
+    void resetCurrentIdleState();
+    void resetCurrentHitState();
+    void resetCurrentWeaponState();
+    void resetCurrentDeathState();
+
     void refreshCurrentAnims(CharacterState idle, CharacterState movement, JumpingState jump, bool force=false);
     void refreshHitRecoilAnims(CharacterState& idle);
     void refreshJumpAnims(const std::string& weapShortGroup, JumpingState jump, CharacterState& idle, bool force=false);

From b8018024a690da86c4a5cead5d316f576246e632 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Mon, 13 Jun 2022 16:21:48 +0300
Subject: [PATCH 2631/2859] Avoid passing weapon short group to refreshXAnims

---
 apps/openmw/mwmechanics/character.cpp | 31 ++++++++++++++++-----------
 apps/openmw/mwmechanics/character.hpp |  7 +++---
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 2a975fa649..2e3777e5b0 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -425,7 +425,7 @@ void CharacterController::refreshHitRecoilAnims(CharacterState& idle)
     idle = CharState_None;
 }
 
-void CharacterController::refreshJumpAnims(const std::string& weapShortGroup, JumpingState jump, CharacterState& idle, bool force)
+void CharacterController::refreshJumpAnims(JumpingState jump, CharacterState& idle, bool force)
 {
     if (!force && jump == mJumpState && idle == CharState_None)
         return;
@@ -436,6 +436,7 @@ void CharacterController::refreshJumpAnims(const std::string& weapShortGroup, Ju
         return;
     }
 
+    std::string weapShortGroup = getWeaponShortGroup(mWeaponType);
     std::string jumpAnimName = "jump" + weapShortGroup;
     MWRender::Animation::BlendMask jumpmask = MWRender::Animation::BlendMask_All;
     if (!weapShortGroup.empty() && !mAnimation->hasAnimation(jumpAnimName))
@@ -525,6 +526,13 @@ std::string CharacterController::getWeaponAnimation(int weaponType) const
     return weaponGroup;
 }
 
+std::string CharacterController::getWeaponShortGroup(int weaponType) const
+{
+    if (weaponType == ESM::Weapon::HandToHand && !mPtr.getClass().isBipedal(mPtr))
+        return {};
+    return getWeaponType(weaponType)->mShortGroup;
+}
+
 std::string CharacterController::fallbackShortWeaponGroup(const std::string& baseGroupName, MWRender::Animation::BlendMask* blendMask) const
 {
     bool isRealWeapon = mWeaponType != ESM::Weapon::HandToHand && mWeaponType != ESM::Weapon::Spell && mWeaponType != ESM::Weapon::None;
@@ -536,8 +544,8 @@ std::string CharacterController::fallbackShortWeaponGroup(const std::string& bas
         return baseGroupName;
     }
 
-    static const std::string oneHandFallback = getWeaponType(ESM::Weapon::LongBladeOneHand)->mShortGroup;
-    static const std::string twoHandFallback = getWeaponType(ESM::Weapon::LongBladeTwoHand)->mShortGroup;
+    static const std::string oneHandFallback = getWeaponShortGroup(ESM::Weapon::LongBladeOneHand);
+    static const std::string twoHandFallback = getWeaponShortGroup(ESM::Weapon::LongBladeTwoHand);
 
     std::string groupName = baseGroupName;
     const ESM::WeaponType* weapInfo = getWeaponType(mWeaponType);
@@ -562,7 +570,7 @@ std::string CharacterController::fallbackShortWeaponGroup(const std::string& bas
     return groupName;
 }
 
-void CharacterController::refreshMovementAnims(const std::string& weapShortGroup, CharacterState movement, CharacterState& idle, bool force)
+void CharacterController::refreshMovementAnims(CharacterState movement, CharacterState& idle, bool force)
 {
     if (movement == mMovementState && idle == mIdleState && !force)
         return;
@@ -587,6 +595,7 @@ void CharacterController::refreshMovementAnims(const std::string& weapShortGroup
 
     MWRender::Animation::BlendMask movemask = MWRender::Animation::BlendMask_All;
 
+    std::string weapShortGroup = getWeaponShortGroup(mWeaponType);
     if (swimpos == std::string::npos && !weapShortGroup.empty())
     {
         std::string weapMovementAnimName;
@@ -684,7 +693,7 @@ void CharacterController::refreshMovementAnims(const std::string& weapShortGroup
     mAnimation->play(mCurrentMovement, Priority_Movement, movemask, false, 1.f, "start", "stop", startpoint, ~0ul, true);
 }
 
-void CharacterController::refreshIdleAnims(const std::string& weapShortGroup, CharacterState idle, bool force)
+void CharacterController::refreshIdleAnims(CharacterState idle, bool force)
 {
     // FIXME: if one of the below states is close to their last animation frame (i.e. will be disabled in the coming update),
     // the idle animation should be displayed
@@ -714,6 +723,7 @@ void CharacterController::refreshIdleAnims(const std::string& weapShortGroup, Ch
         return;
     }
 
+    std::string weapShortGroup = getWeaponShortGroup(mWeaponType);
     if (mIdleState != CharState_IdleSwim && mIdleState != CharState_IdleSneak && mIdleState != CharState_None && !weapShortGroup.empty())
     {
         std::string weapIdleGroup = idleGroup + weapShortGroup;
@@ -751,16 +761,11 @@ void CharacterController::refreshCurrentAnims(CharacterState idle, CharacterStat
         return;
 
     refreshHitRecoilAnims(idle);
-
-    std::string weap;
-    if (mWeaponType != ESM::Weapon::HandToHand || mPtr.getClass().isBipedal(mPtr))
-        weap = getWeaponType(mWeaponType)->mShortGroup;
-
-    refreshJumpAnims(weap, jump, idle, force);
-    refreshMovementAnims(weap, movement, idle, force);
+    refreshJumpAnims(jump, idle, force);
+    refreshMovementAnims(movement, idle, force);
 
     // idle handled last as it can depend on the other states
-    refreshIdleAnims(weap, idle, force);
+    refreshIdleAnims(idle, force);
 }
 
 void CharacterController::playDeath(float startpoint, CharacterState death)
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index 1f1effed28..bd9fa70711 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -207,9 +207,9 @@ class CharacterController : public MWRender::Animation::TextKeyListener
 
     void refreshCurrentAnims(CharacterState idle, CharacterState movement, JumpingState jump, bool force=false);
     void refreshHitRecoilAnims(CharacterState& idle);
-    void refreshJumpAnims(const std::string& weapShortGroup, JumpingState jump, CharacterState& idle, bool force=false);
-    void refreshMovementAnims(const std::string& weapShortGroup, CharacterState movement, CharacterState& idle, bool force=false);
-    void refreshIdleAnims(const std::string& weapShortGroup, CharacterState idle, bool force=false);
+    void refreshJumpAnims(JumpingState jump, CharacterState& idle, bool force=false);
+    void refreshMovementAnims(CharacterState movement, CharacterState& idle, bool force=false);
+    void refreshIdleAnims(CharacterState idle, bool force=false);
 
     void clearAnimQueue(bool clearPersistAnims = false);
 
@@ -240,6 +240,7 @@ class CharacterController : public MWRender::Animation::TextKeyListener
     std::string fallbackShortWeaponGroup(const std::string& baseGroupName, MWRender::Animation::BlendMask* blendMask = nullptr) const;
 
     std::string getWeaponAnimation(int weaponType) const;
+    std::string getWeaponShortGroup(int weaponType) const;
 
     bool getAttackingOrSpell() const;
     void setAttackingOrSpell(bool attackingOrSpell) const;

From 253de65d13f93dee18fd7cc3f027ca5bdb3c51d5 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Mon, 13 Jun 2022 17:14:12 +0300
Subject: [PATCH 2632/2859] Fix knockout animation interruption/looping

---
 apps/openmw/mwmechanics/character.cpp | 18 +++---------------
 apps/openmw/mwmechanics/character.hpp |  2 --
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 2e3777e5b0..1f1aa80856 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -329,7 +329,6 @@ void CharacterController::refreshHitRecoilAnims(CharacterState& idle)
     bool knockdown = stats.getKnockedDown();
     bool block = stats.getBlock();
     bool isSwimming = world->isSwimming(mPtr);
-    auto& prng = world->getPrng();
 
     if (mHitState != CharState_None)
     {
@@ -341,29 +340,21 @@ void CharacterController::refreshHitRecoilAnims(CharacterState& idle)
             stats.setHitRecovery(false);
             stats.setBlock(false);
         }
-        else if (isKnockedOut() && !knockout && mTimeUntilWake <= 0)
-        {
-            mAnimation->disable(mCurrentHit);
-            mAnimation->play(mCurrentHit, Priority_Knockdown, MWRender::Animation::BlendMask_All, true, 1, "loop stop", "stop", 0.0f, 0);
-        }
+        else if (isKnockedOut())
+            mAnimation->setLoopingEnabled(mCurrentHit, knockout);
         return;
     }
 
     if (!knockout && !knockdown && !recovery && !block)
         return;
 
-    if (knockout)
-        mTimeUntilWake = Misc::Rng::rollClosedProbability(prng) * 2 + 1; // Wake up after 1 to 3 seconds
-
     MWRender::Animation::AnimPriority priority(Priority_Knockdown);
-    bool autodisable = true;
     std::string startKey = "start";
     std::string stopKey = "stop";
     if (knockout)
     {
         mHitState = isSwimming ? CharState_SwimKnockOut : CharState_KnockOut;
         stats.setKnockedDown(true);
-        autodisable = false;
     }
     else if (knockdown)
     {
@@ -420,7 +411,7 @@ void CharacterController::refreshHitRecoilAnims(CharacterState& idle)
         }
     }
 
-    mAnimation->play(mCurrentHit, priority, MWRender::Animation::BlendMask_All, autodisable, 1, startKey, stopKey, 0.0f, ~0ul);
+    mAnimation->play(mCurrentHit, priority, MWRender::Animation::BlendMask_All, true, 1, startKey, stopKey, 0.0f, ~0ul);
 
     idle = CharState_None;
 }
@@ -1817,9 +1808,6 @@ void CharacterController::update(float duration)
 
     updateMagicEffects();
 
-    if (isKnockedOut())
-        mTimeUntilWake -= duration;
-
     bool isPlayer = mPtr == MWMechanics::getPlayer();
     bool isFirstPersonPlayer = isPlayer && MWBase::Environment::get().getWorld()->isFirstPerson();
     bool godmode = isPlayer && MWBase::Environment::get().getWorld()->getGodModeState();
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index bd9fa70711..a15647d5be 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -190,8 +190,6 @@ class CharacterController : public MWRender::Animation::TextKeyListener
 
     bool mCastingManualSpell{false};
 
-    float mTimeUntilWake{0.f};
-
     bool mIsMovingBackward{false};
     osg::Vec2f mSmoothedSpeed;
 

From 54896e4883f1290c66322d2d55b2cda29b342190 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Mon, 13 Jun 2022 18:19:47 +0300
Subject: [PATCH 2633/2859] Disable all the non-vanilla Lua camera settings by
 default

---
 files/data/scripts/omw/camera/settings.lua | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/files/data/scripts/omw/camera/settings.lua b/files/data/scripts/omw/camera/settings.lua
index 06cbbfc6f0..be95ce586c 100644
--- a/files/data/scripts/omw/camera/settings.lua
+++ b/files/data/scripts/omw/camera/settings.lua
@@ -40,14 +40,14 @@ I.Settings.registerGroup({
     permanentStorage = true,
     order = 0,
     settings = {
-        boolSetting('', 'viewOverShoulder', true),
+        boolSetting('', 'viewOverShoulder', false),
         floatSetting('', 'shoulderOffsetX', 30),
         floatSetting('', 'shoulderOffsetY', -10),
-        boolSetting('', 'autoSwitchShoulder', true),
+        boolSetting('', 'autoSwitchShoulder', false),
         floatSetting('', 'zoomOutWhenMoveCoef', 20),
-        boolSetting('', 'previewIfStandStill', true),
-        boolSetting('', 'deferredPreviewRotation', true),
-        boolSetting('', 'ignoreNC', true),
+        boolSetting('', 'previewIfStandStill', false),
+        boolSetting('', 'deferredPreviewRotation', false),
+        boolSetting('', 'ignoreNC', false),
         boolSetting('', 'move360', false),
         floatSetting('', 'move360TurnSpeed', 5),
         boolSetting('', 'slowViewChange', false),
@@ -63,7 +63,7 @@ I.Settings.registerGroup({
     permanentStorage = true,
     order = 1,
     settings = {
-        boolSetting('headBobbing_', 'enabled', true),
+        boolSetting('headBobbing_', 'enabled', false),
         floatSetting('headBobbing_', 'step', 90),
         floatSetting('headBobbing_', 'height', 3),
         floatSetting('headBobbing_', 'roll', 0.2),

From 9067db523b092e592e21b7f38f0c293cc86f8611 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Mon, 13 Jun 2022 20:10:25 +0200
Subject: [PATCH 2634/2859] Get rid of Gitlab SAST

It's completely broken currently, beside
being useless: grepping C++ code to find problem
isn't SAST, it's noise.
---
 .gitlab-ci.yml            | 12 -------
 .gitlab/sast-ruleset.toml | 76 ---------------------------------------
 2 files changed, 88 deletions(-)
 delete mode 100644 .gitlab/sast-ruleset.toml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4ae7b4bb45..b012e07440 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,14 +1,10 @@
 default:
   interruptible: true
 
-include:
-  - template: Security/SAST.gitlab-ci.yml
-
 # Note: We set `needs` on each job to control the job DAG.
 # See https://docs.gitlab.com/ee/ci/yaml/#needs
 stages:
   - build
-  - test
 
 # https://blog.nimbleways.com/let-s-make-faster-gitlab-ci-cd-pipelines/
 variables:
@@ -17,14 +13,6 @@ variables:
   # These can be specified per job or per pipeline
   ARTIFACT_COMPRESSION_LEVEL: "fast"
   CACHE_COMPRESSION_LEVEL: "fast"
-  SAST_EXCLUDED_ANALYZERS: "bandit"
-  SAST_EXCLUDED_PATHS: "extern"
-
-sast:
-  tags:
-    - docker
-    - linux
-  needs: []
 
 .Ubuntu_Image:
   tags:
diff --git a/.gitlab/sast-ruleset.toml b/.gitlab/sast-ruleset.toml
deleted file mode 100644
index 543ceb4ca7..0000000000
--- a/.gitlab/sast-ruleset.toml
+++ /dev/null
@@ -1,76 +0,0 @@
-[flawfinder]
-	[[flawfinder.ruleset]]
-		disable = true
-		[flawfinder.ruleset.identifier]
-			type = "flawfinder_func_name"
-			value = "readlink"  # openmw isn't a privileged process
-	[[flawfinder.ruleset]]
-		disable = true
-		[flawfinder.ruleset.identifier]
-			type = "flawfinder_func_name"
-			value = "access"  # openmw isn't a privileged process
-	[[flawfinder.ruleset]]
-		disable = true
-		[flawfinder.ruleset.identifier]
-			type = "flawfinder_func_name"
-			value = "random"  # duh.
-	[[flawfinder.ruleset]]
-		disable = true
-		[flawfinder.ruleset.identifier]
-			type = "flawfinder_func_name"
-			value = "getenv"  # duh.
-	[[flawfinder.ruleset]]
-		disable = true
-		[flawfinder.ruleset.identifier]
-			type = "flawfinder_func_name"
-			value = "open" # openmw isn't a privileged process
-	[[flawfinder.ruleset]]
-		disable = true
-		[flawfinder.ruleset.identifier]
-			type = "flawfinder_func_name"
-			value = "char"  # too many false positives
-	[[flawfinder.ruleset]]
-		disable = true
-		[flawfinder.ruleset.identifier]
-			type = "flawfinder_func_name"
-			value = "read"  # too many false positives
-	[[flawfinder.ruleset]]
-		disable = true
-		[flawfinder.ruleset.identifier]
-			type = "flawfinder_func_name"
-			value = "snprintf"  # too many false positives
-	[[flawfinder.ruleset]]
-		disable = true
-		[flawfinder.ruleset.identifier]
-			type = "flawfinder_func_name"
-			value = "strlen"  # too many false positives
-	[[flawfinder.ruleset]]
-		disable = true
-		[flawfinder.ruleset.identifier]
-			type = "flawfinder_func_name"
-			value = "mkstemp"  # openmw doesn't run on old Unix systems
-	[[flawfinder.ruleset]]
-		disable = true
-		[flawfinder.ruleset.identifier]
-			type = "flawfinder_func_name"
-			value = "fopen"   # openmw isn't a privileged process
-	[[flawfinder.ruleset]]
-		disable = true
-		[flawfinder.ruleset.identifier]
-			type = "flawfinder_func_name"
-			value = "equal"  # only false positives, sigh
-	[[flawfinder.ruleset]]
-		disable = true
-		[flawfinder.ruleset.identifier]
-			type = "flawfinder_func_name"
-			value = "_snprintf"  # only false positives, sigh
-	[[flawfinder.ruleset]]
-		disable = true
-		[flawfinder.ruleset.identifier]
-			type = "flawfinder_func_name"
-			value = "printf"  # only false positives, sigh
-	[[flawfinder.ruleset]]
-		disable = true
-		[flawfinder.ruleset.identifier]
-			type = "flawfinder_func_name"
-			value = "system"  # only false positives, sigh

From f04ea4a7a833bbf2afa85eacd81aaa95c26cad63 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Mon, 13 Jun 2022 22:08:58 +0000
Subject: [PATCH 2635/2859] See if 1h time limit for Windows has been removed

https://gitlab.com/gitlab-org/gitlab-runner/-/issues/27771 has been closed and GitLab's published an update since
---
 .gitlab-ci.yml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b012e07440..25855bf913 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -344,6 +344,9 @@ variables: &tests-targets
   targets: "openmw_test_suite,openmw_detournavigator_navmeshtilescache_benchmark"
   package: "Tests"
 
+variables: &combined-targets
+  targets: "openmw,openmw-iniimporter,openmw-launcher,openmw-wizard,openmw-navmeshtool,openmw-bulletobjecttool,openmw-cs,bsatool,esmtool,niftest,openmw-essimporter"
+
 .Windows_Ninja_Base:
   tags:
     - windows
@@ -574,7 +577,7 @@ variables: &tests-targets
     <<: *engine-targets
     config: "Debug"
 
-Windows_MSBuild_Engine_RelWithDebInfo:
+.Windows_MSBuild_Engine_RelWithDebInfo:
   extends:
     - .Windows_MSBuild_Base
   variables:
@@ -599,13 +602,20 @@ Windows_MSBuild_Engine_RelWithDebInfo:
     <<: *cs-targets
     config: "Debug"
 
-Windows_MSBuild_CS_RelWithDebInfo:
+.Windows_MSBuild_CS_RelWithDebInfo:
   extends:
     - .Windows_MSBuild_Base
   variables:
     <<: *cs-targets
     config: "RelWithDebInfo"
 
+Windows_MSBuild_Combined_RelWithDebInfo:
+  extends:
+    - .Windows_MSBuild_Base
+  variables:
+    <<: *combined-targets
+    config: "RelWithDebInfo"
+
 .Windows_MSBuild_Tests_RelWithDebInfo:
   extends: .Windows_MSBuild_Base
   stage: build

From 35db7b83194bfcc4fc6abc1fb0da945ab63ab4a5 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Tue, 14 Jun 2022 01:00:00 +0300
Subject: [PATCH 2636/2859] Fix fallback for missing swim/sneak idle animations

---
 apps/openmw/mwmechanics/character.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 1f1aa80856..84d28953d0 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -701,12 +701,16 @@ void CharacterController::refreshIdleAnims(CharacterState idle, bool force)
     size_t numLoops = ~0ul;
 
     std::string idleGroup = idleStateToAnimGroup(mIdleState);
-    MWRender::Animation::AnimPriority priority = getIdlePriority(mIdleState);
 
     // Only play "idleswim" or "idlesneak" if they exist. Otherwise, fallback to
     // "idle"+weapon or "idle".
     if ((mIdleState == CharState_IdleSwim || mIdleState == CharState_IdleSneak) && !mAnimation->hasAnimation(idleGroup))
-        idleGroup = idleStateToAnimGroup(CharState_Idle);
+    {
+        mIdleState = CharState_Idle;
+        idleGroup = idleStateToAnimGroup(mIdleState);
+    }
+
+    MWRender::Animation::AnimPriority priority = getIdlePriority(mIdleState);
 
     if (idleGroup.empty())
     {

From 69a1d8ac866cc0702fa31e78289f7dcfce0c6320 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Mon, 13 Jun 2022 23:21:39 +0300
Subject: [PATCH 2637/2859] Restart idle instantly only after the hit state
 ends

---
 apps/openmw/mwmechanics/character.cpp | 8 ++++----
 apps/openmw/mwmechanics/character.hpp | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 84d28953d0..0c56d8c8d9 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -317,7 +317,7 @@ void CharacterController::resetCurrentDeathState()
     mDeathState = CharState_None;
 }
 
-void CharacterController::refreshHitRecoilAnims(CharacterState& idle)
+void CharacterController::refreshHitRecoilAnims()
 {
     auto& charClass = mPtr.getClass();
     if (!charClass.isActor())
@@ -339,6 +339,7 @@ void CharacterController::refreshHitRecoilAnims(CharacterState& idle)
             stats.setKnockedDown(false);
             stats.setHitRecovery(false);
             stats.setBlock(false);
+            resetCurrentIdleState();
         }
         else if (isKnockedOut())
             mAnimation->setLoopingEnabled(mCurrentHit, knockout);
@@ -392,6 +393,7 @@ void CharacterController::refreshHitRecoilAnims(CharacterState& idle)
         stats.setKnockedDown(false);
         stats.setHitRecovery(false);
         stats.setBlock(false);
+        resetCurrentIdleState();
         return;
     }
 
@@ -412,8 +414,6 @@ void CharacterController::refreshHitRecoilAnims(CharacterState& idle)
     }
 
     mAnimation->play(mCurrentHit, priority, MWRender::Animation::BlendMask_All, true, 1, startKey, stopKey, 0.0f, ~0ul);
-
-    idle = CharState_None;
 }
 
 void CharacterController::refreshJumpAnims(JumpingState jump, CharacterState& idle, bool force)
@@ -755,7 +755,7 @@ void CharacterController::refreshCurrentAnims(CharacterState idle, CharacterStat
     if (isPersistentAnimPlaying())
         return;
 
-    refreshHitRecoilAnims(idle);
+    refreshHitRecoilAnims();
     refreshJumpAnims(jump, idle, force);
     refreshMovementAnims(movement, idle, force);
 
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index a15647d5be..6844f08f30 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -204,7 +204,7 @@ class CharacterController : public MWRender::Animation::TextKeyListener
     void resetCurrentDeathState();
 
     void refreshCurrentAnims(CharacterState idle, CharacterState movement, JumpingState jump, bool force=false);
-    void refreshHitRecoilAnims(CharacterState& idle);
+    void refreshHitRecoilAnims();
     void refreshJumpAnims(JumpingState jump, CharacterState& idle, bool force=false);
     void refreshMovementAnims(CharacterState movement, CharacterState& idle, bool force=false);
     void refreshIdleAnims(CharacterState idle, bool force=false);

From 1a646374b0a39fce87fa856c29c4e4d2c5ecd127 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Mon, 13 Jun 2022 23:36:06 +0300
Subject: [PATCH 2638/2859] Always reset the idle animation after the landing
 animation ends

---
 apps/openmw/mwmechanics/character.cpp | 28 +++++++++++----------------
 apps/openmw/mwmechanics/character.hpp |  2 +-
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 0c56d8c8d9..7cf4dea70d 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -416,13 +416,15 @@ void CharacterController::refreshHitRecoilAnims()
     mAnimation->play(mCurrentHit, priority, MWRender::Animation::BlendMask_All, true, 1, startKey, stopKey, 0.0f, ~0ul);
 }
 
-void CharacterController::refreshJumpAnims(JumpingState jump, CharacterState& idle, bool force)
+void CharacterController::refreshJumpAnims(JumpingState jump, bool force)
 {
-    if (!force && jump == mJumpState && idle == CharState_None)
+    if (!force && jump == mJumpState)
         return;
 
     if (jump == JumpState_None)
     {
+        if (!mCurrentJump.empty())
+            resetCurrentIdleState();
         resetCurrentJumpState();
         return;
     }
@@ -431,25 +433,20 @@ void CharacterController::refreshJumpAnims(JumpingState jump, CharacterState& id
     std::string jumpAnimName = "jump" + weapShortGroup;
     MWRender::Animation::BlendMask jumpmask = MWRender::Animation::BlendMask_All;
     if (!weapShortGroup.empty() && !mAnimation->hasAnimation(jumpAnimName))
-    {
         jumpAnimName = fallbackShortWeaponGroup("jump", &jumpmask);
 
-        // If we apply jump only for lower body, do not reset idle animations.
-        // For upper body there will be idle animation.
-        if (jumpmask == MWRender::Animation::BlendMask_LowerBody && idle == CharState_None)
-            idle = CharState_Idle;
-    }
-
-    if (!force && jump == mJumpState)
+    if (!mAnimation->hasAnimation(jumpAnimName))
+    {
+        if (!mCurrentJump.empty())
+            resetCurrentIdleState();
+        resetCurrentJumpState();
         return;
+    }
 
     bool startAtLoop = (jump == mJumpState);
     mJumpState = jump;
     clearStateAnimation(mCurrentJump);
 
-    if (!mAnimation->hasAnimation(jumpAnimName))
-        return;
-
     mCurrentJump = jumpAnimName;
     if(mJumpState == JumpState_InAir)
         mAnimation->play(jumpAnimName, Priority_Jump, jumpmask, false, 1.0f, startAtLoop ? "loop start" : "start", "stop", 0.f, ~0ul);
@@ -756,7 +753,7 @@ void CharacterController::refreshCurrentAnims(CharacterState idle, CharacterStat
         return;
 
     refreshHitRecoilAnims();
-    refreshJumpAnims(jump, idle, force);
+    refreshJumpAnims(jump, force);
     refreshMovementAnims(movement, idle, force);
 
     // idle handled last as it can depend on the other states
@@ -2071,9 +2068,6 @@ void CharacterController::update(float duration)
             jumpstate = JumpState_Landing;
             vec.z() = 0.0f;
 
-            // We should reset idle animation during landing
-            clearStateAnimation(mCurrentIdle);
-
             float height = cls.getCreatureStats(mPtr).land(isPlayer);
             float healthLost = getFallDamage(mPtr, height);
 
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index 6844f08f30..4b2bb3c72f 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -205,7 +205,7 @@ class CharacterController : public MWRender::Animation::TextKeyListener
 
     void refreshCurrentAnims(CharacterState idle, CharacterState movement, JumpingState jump, bool force=false);
     void refreshHitRecoilAnims();
-    void refreshJumpAnims(JumpingState jump, CharacterState& idle, bool force=false);
+    void refreshJumpAnims(JumpingState jump, bool force=false);
     void refreshMovementAnims(CharacterState movement, CharacterState& idle, bool force=false);
     void refreshIdleAnims(CharacterState idle, bool force=false);
 

From 5dfce6205af93037e292973bce640d57d88091ca Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Mon, 13 Jun 2022 23:40:17 +0300
Subject: [PATCH 2639/2859] Reset the idle animation after a movement animation
 ends

Fix non-biped actor idle reset
---
 apps/openmw/mwmechanics/character.cpp | 39 +++++++++------------------
 apps/openmw/mwmechanics/character.hpp |  2 +-
 2 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 7cf4dea70d..37302d2caf 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -558,15 +558,17 @@ std::string CharacterController::fallbackShortWeaponGroup(const std::string& bas
     return groupName;
 }
 
-void CharacterController::refreshMovementAnims(CharacterState movement, CharacterState& idle, bool force)
+void CharacterController::refreshMovementAnims(CharacterState movement, bool force)
 {
-    if (movement == mMovementState && idle == mIdleState && !force)
+    if (movement == mMovementState && !force)
         return;
 
     std::string movementAnimName = movementStateToAnimGroup(movement);
 
     if (movementAnimName.empty())
     {
+        if (!mCurrentMovement.empty())
+            resetCurrentIdleState();
         resetCurrentMovementState();
         return;
     }
@@ -594,20 +596,11 @@ void CharacterController::refreshMovementAnims(CharacterState movement, Characte
             weapMovementAnimName = movementAnimName + weapShortGroup;
 
         if (!mAnimation->hasAnimation(weapMovementAnimName))
-        {
             weapMovementAnimName = fallbackShortWeaponGroup(movementAnimName, &movemask);
-            // If we apply movement only for lower body, do not reset idle animations.
-            // For upper body there will be idle animation.
-            if (movemask == MWRender::Animation::BlendMask_LowerBody && idle == CharState_None)
-                idle = CharState_Idle;
-        }
 
         movementAnimName = weapMovementAnimName;
     }
 
-    if (!force && movement == mMovementState)
-        return;
-
     if (!mAnimation->hasAnimation(movementAnimName))
     {
         std::string::size_type runpos = movementAnimName.find("run");
@@ -616,6 +609,8 @@ void CharacterController::refreshMovementAnims(CharacterState movement, Characte
 
         if (!mAnimation->hasAnimation(movementAnimName))
         {
+            if (!mCurrentMovement.empty())
+                resetCurrentIdleState();
             resetCurrentMovementState();
             return;
         }
@@ -633,15 +628,6 @@ void CharacterController::refreshMovementAnims(CharacterState movement, Characte
     clearStateAnimation(mCurrentMovement);
     mCurrentMovement = movementAnimName;
 
-    // Reset idle if we actually play movement animations excepts of these cases:
-    // 1. When we play turning animations
-    // 2. When we use a fallback animation for lower body since movement animation for given weapon is missing (e.g. for crossbows and spellcasting)
-    if (!isTurning() && movemask == MWRender::Animation::BlendMask_All)
-    {
-        resetCurrentIdleState();
-        idle = CharState_None;
-    }
-
     // For non-flying creatures, MW uses the Walk animation to calculate the animation velocity
     // even if we are running. This must be replicated, otherwise the observed speed would differ drastically.
     mAdjustMovementAnimSpeed = true;
@@ -686,10 +672,11 @@ void CharacterController::refreshIdleAnims(CharacterState idle, bool force)
     // FIXME: if one of the below states is close to their last animation frame (i.e. will be disabled in the coming update),
     // the idle animation should be displayed
     if (((mUpperBodyState != UpperCharState_Nothing && mUpperBodyState != UpperCharState_WeapEquiped)
-            || (mMovementState != CharState_None && !isTurning())
-            || mHitState != CharState_None)
-            && !mPtr.getClass().isBipedal(mPtr))
-        idle = CharState_None;
+       || mMovementState != CharState_None || mHitState != CharState_None) && !mPtr.getClass().isBipedal(mPtr))
+    {
+        resetCurrentIdleState();
+        return;
+    }
 
     if (!force && idle == mIdleState && (mAnimation->isPlaying(mCurrentIdle) || !mAnimQueue.empty()))
         return;
@@ -754,7 +741,7 @@ void CharacterController::refreshCurrentAnims(CharacterState idle, CharacterStat
 
     refreshHitRecoilAnims();
     refreshJumpAnims(jump, force);
-    refreshMovementAnims(movement, idle, force);
+    refreshMovementAnims(movement, force);
 
     // idle handled last as it can depend on the other states
     refreshIdleAnims(idle, force);
@@ -2220,7 +2207,7 @@ void CharacterController::update(float duration)
             }
         }
 
-        if(movestate != CharState_None && !isTurning())
+        if (movestate != CharState_None)
             clearAnimQueue();
 
         if(mAnimQueue.empty() || inwater || (sneak && mIdleState != CharState_SpecialIdle))
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index 4b2bb3c72f..c1c7fd9cf5 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -206,7 +206,7 @@ class CharacterController : public MWRender::Animation::TextKeyListener
     void refreshCurrentAnims(CharacterState idle, CharacterState movement, JumpingState jump, bool force=false);
     void refreshHitRecoilAnims();
     void refreshJumpAnims(JumpingState jump, bool force=false);
-    void refreshMovementAnims(CharacterState movement, CharacterState& idle, bool force=false);
+    void refreshMovementAnims(CharacterState movement, bool force=false);
     void refreshIdleAnims(CharacterState idle, bool force=false);
 
     void clearAnimQueue(bool clearPersistAnims = false);

From 4ce08664e956c115a0546404a1fb430d6ecf643c Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Mon, 13 Jun 2022 23:58:36 +0300
Subject: [PATCH 2640/2859] Fix swim spellcasting stance turning fallback

---
 apps/openmw/mwmechanics/character.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 37302d2caf..38c5fb472a 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -573,6 +573,7 @@ void CharacterController::refreshMovementAnims(CharacterState movement, bool for
         return;
     }
 
+    mMovementState = movement;
     std::string::size_type swimpos = movementAnimName.find("swim");
     if (!mAnimation->hasAnimation(movementAnimName))
     {
@@ -590,7 +591,7 @@ void CharacterController::refreshMovementAnims(CharacterState movement, bool for
     {
         std::string weapMovementAnimName;
         // Spellcasting stance turning is a special case
-        if (mWeaponType == ESM::Weapon::Spell && (movement == CharState_TurnLeft || movement == CharState_TurnRight))
+        if (mWeaponType == ESM::Weapon::Spell && isTurning())
             weapMovementAnimName = weapShortGroup + movementAnimName;
         else
             weapMovementAnimName = movementAnimName + weapShortGroup;
@@ -616,8 +617,6 @@ void CharacterController::refreshMovementAnims(CharacterState movement, bool for
         }
     }
 
-    mMovementState = movement;
-
     // If we're playing the same animation, start it from the point it ended
     float startpoint = 0.f;
     if (!mCurrentMovement.empty() && movementAnimName == mCurrentMovement)

From 61d382dc9fe836cc42e92018b86083023c744b8e Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Tue, 14 Jun 2022 00:04:19 +0300
Subject: [PATCH 2641/2859] Set the initial IdleState to CharState_None

---
 apps/openmw/mwmechanics/character.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 38c5fb472a..651ef6c5e5 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -1941,7 +1941,7 @@ void CharacterController::update(float duration)
             vec = osg::Vec3f();
 
         CharacterState movestate = CharState_None;
-        CharacterState idlestate = CharState_SpecialIdle;
+        CharacterState idlestate = CharState_None;
         JumpingState jumpstate = JumpState_None;
 
         bool forcestateupdate = false;

From 456277ba6a82abbedfad3f314c306dd79e93f444 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Tue, 14 Jun 2022 00:46:45 +0300
Subject: [PATCH 2642/2859] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e52937c08b..defd0e7542 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@
     Bug #5453: Magic effect VFX are offset for creatures
     Bug #5483: AutoCalc flag is not used to calculate spells cost
     Bug #5508: Engine binary links to Qt without using it
+    Bug #5592: Weapon idle animations do not work properly
     Bug #5596: Effects in constant spells should not be merged
     Bug #5621: Drained stats cannot be restored
     Bug #5766: Active grid object paging - disappearing textures

From c2ac52c82a513ecee95fe8a41e46a4acc4bb5b45 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Tue, 14 Jun 2022 02:43:48 +0300
Subject: [PATCH 2643/2859] Remove dead code

---
 apps/openmw/mwmechanics/character.cpp | 11 +----------
 apps/openmw/mwmechanics/character.hpp |  2 --
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 651ef6c5e5..ad6f324d77 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -131,8 +131,6 @@ std::string movementStateToAnimGroup(MWMechanics::CharacterState state)
         case CharState_SneakLeft: return "sneakleft";
         case CharState_SneakRight: return "sneakright";
 
-        case CharState_Jump: return "jump";
-
         case CharState_TurnLeft: return "turnleft";
         case CharState_TurnRight: return "turnright";
         case CharState_SwimTurnLeft: return "swimturnleft";
@@ -1944,8 +1942,6 @@ void CharacterController::update(float duration)
         CharacterState idlestate = CharState_None;
         JumpingState jumpstate = JumpState_None;
 
-        bool forcestateupdate = false;
-
         mHasMovedInXY = std::abs(vec.x())+std::abs(vec.y()) > 0.0f;
         isrunning = isrunning && mHasMovedInXY;
 
@@ -2021,8 +2017,6 @@ void CharacterController::update(float duration)
         if(!onground && !flying && !inwater && solid)
         {
             // In the air (either getting up —ascending part of jump— or falling).
-
-            forcestateupdate = (mJumpState != JumpState_InAir);
             jumpstate = JumpState_InAir;
 
             static const float fJumpMoveBase = gmst.find("fJumpMoveBase")->mValue.getFloat();
@@ -2050,7 +2044,6 @@ void CharacterController::update(float duration)
         }
         else if(mJumpState == JumpState_InAir && !inwater && !flying && solid)
         {
-            forcestateupdate = true;
             jumpstate = JumpState_Landing;
             vec.z() = 0.0f;
 
@@ -2223,9 +2216,7 @@ void CharacterController::update(float duration)
 
         if (!mSkipAnim)
         {
-            forcestateupdate = updateState(idlestate) || forcestateupdate;
-
-            refreshCurrentAnims(idlestate, movestate, jumpstate, forcestateupdate);
+            refreshCurrentAnims(idlestate, movestate, jumpstate, updateState(idlestate));
             updateIdleStormState(inwater);
         }
 
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index c1c7fd9cf5..003f64953d 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -91,8 +91,6 @@ enum CharacterState {
     CharState_SwimTurnLeft,
     CharState_SwimTurnRight,
 
-    CharState_Jump,
-
     CharState_Death1,
     CharState_Death2,
     CharState_Death3,

From 30ef7ad81bdd1f358aafa5657e295d6cdf45caf4 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Tue, 14 Jun 2022 02:45:50 +0300
Subject: [PATCH 2644/2859] Properly cancel the landing animation during
 movement

---
 apps/openmw/mwmechanics/character.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index ad6f324d77..eef594855d 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -2200,7 +2200,10 @@ void CharacterController::update(float duration)
         }
 
         if (movestate != CharState_None)
+        {
             clearAnimQueue();
+            jumpstate = JumpState_None;
+        }
 
         if(mAnimQueue.empty() || inwater || (sneak && mIdleState != CharState_SpecialIdle))
         {

From 2b019864b741191b66cf7fa22e6f3dee3f60326b Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Tue, 14 Jun 2022 13:47:16 +0300
Subject: [PATCH 2645/2859] Remove more legacy states

---
 apps/openmw/mwmechanics/character.cpp | 8 --------
 apps/openmw/mwmechanics/character.hpp | 8 --------
 2 files changed, 16 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index eef594855d..c7e5cf70a3 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -190,14 +190,6 @@ std::string idleStateToAnimGroup(MWMechanics::CharacterState state)
         case CharState_IdleSneak:
             return "idlesneak";
         case CharState_Idle:
-        case CharState_Idle2:
-        case CharState_Idle3:
-        case CharState_Idle4:
-        case CharState_Idle5:
-        case CharState_Idle6:
-        case CharState_Idle7:
-        case CharState_Idle8:
-        case CharState_Idle9:
         case CharState_SpecialIdle:
             return "idle";
         default:
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index 003f64953d..2de6713396 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -50,14 +50,6 @@ enum CharacterState {
 
     CharState_SpecialIdle,
     CharState_Idle,
-    CharState_Idle2,
-    CharState_Idle3,
-    CharState_Idle4,
-    CharState_Idle5,
-    CharState_Idle6,
-    CharState_Idle7,
-    CharState_Idle8,
-    CharState_Idle9,
     CharState_IdleSwim,
     CharState_IdleSneak,
 

From 467fda0110deac2ff8654597fc02079a71de7ba6 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Tue, 14 Jun 2022 20:43:49 +0000
Subject: [PATCH 2646/2859] Properly combine jobs

---
 .gitlab-ci.yml | 121 ++++++-------------------------------------------
 1 file changed, 13 insertions(+), 108 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 25855bf913..49aa41a7a6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -332,21 +332,6 @@ macOS12_Xcode13:
   variables:
     CCACHE_SIZE: 3G
 
-variables: &engine-targets
-  targets: "openmw,openmw-iniimporter,openmw-launcher,openmw-wizard,openmw-navmeshtool,openmw-bulletobjecttool"
-  package: "Engine"
-
-variables: &cs-targets
-  targets: "openmw-cs,bsatool,esmtool,niftest,openmw-essimporter"
-  package: "CS"
-
-variables: &tests-targets
-  targets: "openmw_test_suite,openmw_detournavigator_navmeshtilescache_benchmark"
-  package: "Tests"
-
-variables: &combined-targets
-  targets: "openmw,openmw-iniimporter,openmw-launcher,openmw-wizard,openmw-navmeshtool,openmw-bulletobjecttool,openmw-cs,bsatool,esmtool,niftest,openmw-essimporter"
-
 .Windows_Ninja_Base:
   tags:
     - windows
@@ -387,17 +372,17 @@ variables: &combined-targets
     - sh CI/before_script.msvc.sh -c $config -p Win64 -v 2019 -k -V -N -b -t -C $multiview
     - cd MSVC2019_64_Ninja
     - .\ActivateMSVC.ps1
-    - cmake --build . --config $config --target ($targets.Split(','))
+    - cmake --build . --config $config
     - ccache --show-stats
     - 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
     - Get-ChildItem -Recurse *.ilk | Remove-Item
     - |
       if (Get-ChildItem -Recurse *.pdb) {
-        7z a -tzip "..\..\$(Make-SafeFileName("OpenMW_MSVC2019_64_${package}_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_symbols.zip"))" '*.pdb' CI-ID.txt
+        7z a -tzip "..\..\$(Make-SafeFileName("OpenMW_MSVC2019_64_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_symbols.zip"))" '*.pdb' CI-ID.txt
         Get-ChildItem -Recurse *.pdb | Remove-Item
       }
-    - 7z a -tzip "..\..\$(Make-SafeFileName("OpenMW_MSVC2019_64_${package}_${config}_${CI_COMMIT_REF_NAME}.zip"))" '*'
+    - 7z a -tzip "..\..\$(Make-SafeFileName("OpenMW_MSVC2019_64_${config}_${CI_COMMIT_REF_NAME}.zip"))" '*'
     - if ($executables) { foreach ($exe in $executables.Split(',')) { & .\$exe } }
   after_script:
     - Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log
@@ -423,67 +408,32 @@ variables: &combined-targets
   # 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
 
-.Windows_Ninja_Engine_Release:
+.Windows_Ninja_Release:
   extends:
     - .Windows_Ninja_Base
   variables:
-    <<: *engine-targets
     config: "Release"
 
-.Windows_Ninja_Engine_Release_MultiView:
+.Windows_Ninja_Release_MultiView:
   extends:
     - .Windows_Ninja_Base
   variables:
-    <<: *engine-targets
     multiview: "-M"
     config: "Release"
 
-.Windows_Ninja_Engine_Debug:
+.Windows_Ninja_Debug:
   extends:
     - .Windows_Ninja_Base
   variables:
-    <<: *engine-targets
     config: "Debug"
 
-.Windows_Ninja_Engine_RelWithDebInfo:
+.Windows_Ninja_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"
-  artifacts:
-    paths: []
-    expire_in: 1 minute
 
 .Windows_MSBuild_Base:
   tags:
@@ -523,17 +473,17 @@ variables: &combined-targets
     - New-Item -Type Directory -Force -Path $env:CCACHE_DIR
     - sh CI/before_script.msvc.sh -c $config -p Win64 -v 2019 -k -V -b -t -C $multiview
     - cd MSVC2019_64
-    - cmake --build . --config $config --target ($targets.Split(','))
+    - cmake --build . --config $config
     - ccache --show-stats
     - 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
     - Get-ChildItem -Recurse *.ilk | Remove-Item
     - |
       if (Get-ChildItem -Recurse *.pdb) {
-        7z a -tzip "..\..\$(Make-SafeFileName("OpenMW_MSVC2019_64_${package}_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_symbols.zip"))" '*.pdb' CI-ID.txt
+        7z a -tzip "..\..\$(Make-SafeFileName("OpenMW_MSVC2019_64_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_symbols.zip"))" '*.pdb' CI-ID.txt
         Get-ChildItem -Recurse *.pdb | Remove-Item
       }
-    - 7z a -tzip "..\..\$(Make-SafeFileName("OpenMW_MSVC2019_64_${package}_${config}_${CI_COMMIT_REF_NAME}.zip"))" '*'
+    - 7z a -tzip "..\..\$(Make-SafeFileName("OpenMW_MSVC2019_64_${config}_${CI_COMMIT_REF_NAME}.zip"))" '*'
     - if ($executables) { foreach ($exe in $executables.Split(',')) { & .\$exe } }
   after_script:
     - Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log
@@ -559,74 +509,29 @@ variables: &combined-targets
   # 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
 
-.Windows_MSBuild_Engine_Release:
+.Windows_MSBuild_Release:
   extends:
     - .Windows_MSBuild_Base
   variables:
-    <<: *engine-targets
     config: "Release"
   rules:
     # run this for both pushes and schedules so 'latest successful pipeline for branch' always includes it
     - if: $CI_PIPELINE_SOURCE == "push"
     - if: $CI_PIPELINE_SOURCE == "schedule"
 
-.Windows_MSBuild_Engine_Debug:
+.Windows_MSBuild_Debug:
   extends:
     - .Windows_MSBuild_Base
   variables:
-    <<: *engine-targets
     config: "Debug"
 
-.Windows_MSBuild_Engine_RelWithDebInfo:
+Windows_MSBuild_RelWithDebInfo:
   extends:
     - .Windows_MSBuild_Base
   variables:
-    <<: *engine-targets
-    config: "RelWithDebInfo"
-
-.Windows_MSBuild_CS_Release:
-  extends:
-    - .Windows_MSBuild_Base
-  variables:
-    <<: *cs-targets
-    config: "Release"
-  rules:
-    # run this for both pushes and schedules so 'latest successful pipeline for branch' always includes it
-    - if: $CI_PIPELINE_SOURCE == "push"
-    - if: $CI_PIPELINE_SOURCE == "schedule"
-
-.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_Combined_RelWithDebInfo:
-  extends:
-    - .Windows_MSBuild_Base
-  variables:
-    <<: *combined-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"
-  artifacts:
-    paths: []
-    expire_in: 1 minute
 
 Ubuntu_AndroidNDK_arm64-v8a:
   tags:

From fdd84265b3fcc6b7790869287163d80c8078449e Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 15 Jun 2022 01:09:33 +0200
Subject: [PATCH 2647/2859] Use proper agent height and radius when render
 actor path

That are based on half extents used to find path over navmesh which is different
for interior and exterior cells.

Use common functions to get agent height and radius for actor path rendering and
navmesh generation.
---
 apps/openmw/mwmechanics/aipackage.cpp       |  7 +++----
 components/detournavigator/makenavmesh.cpp  |  5 +++--
 components/detournavigator/recastparams.hpp | 21 +++++++++++++++++++++
 components/sceneutil/agentpath.cpp          |  5 +++--
 4 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100644 components/detournavigator/recastparams.hpp

diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index 7057a99393..24bfe41165 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -114,8 +114,6 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
     const osg::Vec3f position = actor.getRefData().getPosition().asVec3(); //position of the actor
     MWBase::World* world = MWBase::Environment::get().getWorld();
 
-    const osg::Vec3f halfExtents = world->getHalfExtents(actor);
-
     /// Stops the actor when it gets too close to a unloaded cell
     //... At current time, this test is unnecessary. AI shuts down when actor is more than "actors processing range" setting value
     //... units from player, and exterior cells are 8192 units long and wide.
@@ -124,7 +122,7 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
     {
         actor.getClass().getMovementSettings(actor).mPosition[0] = 0;
         actor.getClass().getMovementSettings(actor).mPosition[1] = 0;
-        world->updateActorPath(actor, mPathFinder.getPath(), halfExtents, position, dest);
+        world->updateActorPath(actor, mPathFinder.getPath(), world->getPathfindingHalfExtents(actor), position, dest);
         return false;
     }
 
@@ -180,6 +178,7 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
         }
     }
 
+    const osg::Vec3f halfExtents = world->getHalfExtents(actor);
     const float pointTolerance = getPointTolerance(actor.getClass().getMaxSpeed(actor), duration, halfExtents);
 
     static const bool smoothMovement = Settings::Manager::getBool("smooth movement", "Game");
@@ -198,7 +197,7 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
     else if (mPathFinder.getPath().empty())
         return false;
 
-    world->updateActorPath(actor, mPathFinder.getPath(), halfExtents, position, dest);
+    world->updateActorPath(actor, mPathFinder.getPath(), world->getPathfindingHalfExtents(actor), position, dest);
 
     if (mRotateOnTheRunChecks == 0
         || isReachableRotatingOnTheRun(actor, *mPathFinder.getPath().begin())) // to prevent circling around a path point
diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index 070a227454..97c5377558 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -14,6 +14,7 @@
 #include "serialization.hpp"
 #include "dbrefgeometryobject.hpp"
 #include "navmeshdbutils.hpp"
+#include "recastparams.hpp"
 
 #include <components/misc/convert.hpp>
 #include <components/bullethelpers/processtrianglecallback.hpp>
@@ -102,7 +103,7 @@ namespace
 
     float getHeight(const RecastSettings& settings,const osg::Vec3f& agentHalfExtents)
     {
-        return 2.0f * agentHalfExtents.z() * settings.mRecastScaleFactor;
+        return getAgentHeight(agentHalfExtents) * settings.mRecastScaleFactor;
     }
 
     float getMaxClimb(const RecastSettings& settings)
@@ -112,7 +113,7 @@ namespace
 
     float getRadius(const RecastSettings& settings, const osg::Vec3f& agentHalfExtents)
     {
-        return std::max(agentHalfExtents.x(), agentHalfExtents.y()) * std::sqrt(2) * settings.mRecastScaleFactor;
+        return getAgentRadius(agentHalfExtents) * settings.mRecastScaleFactor;
     }
 
     float getSwimLevel(const RecastSettings& settings, const float waterLevel, const float agentHalfExtentsZ)
diff --git a/components/detournavigator/recastparams.hpp b/components/detournavigator/recastparams.hpp
new file mode 100644
index 0000000000..7e07d2c085
--- /dev/null
+++ b/components/detournavigator/recastparams.hpp
@@ -0,0 +1,21 @@
+#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_RECASTPARAMS_H
+#define OPENMW_COMPONENTS_DETOURNAVIGATOR_RECASTPARAMS_H
+
+#include <osg/Vec3f>
+
+#include <cmath>
+
+namespace DetourNavigator
+{
+    inline float getAgentHeight(const osg::Vec3f& agentHalfExtents)
+    {
+        return 2.0f * agentHalfExtents.z();
+    }
+
+    inline float getAgentRadius(const osg::Vec3f& agentHalfExtents)
+    {
+        return std::max(agentHalfExtents.x(), agentHalfExtents.y()) * std::sqrt(2);
+    }
+}
+
+#endif
diff --git a/components/sceneutil/agentpath.cpp b/components/sceneutil/agentpath.cpp
index db026a3332..8d90475a82 100644
--- a/components/sceneutil/agentpath.cpp
+++ b/components/sceneutil/agentpath.cpp
@@ -4,6 +4,7 @@
 #include <osg/Material>
 
 #include <components/detournavigator/settings.hpp>
+#include <components/detournavigator/recastparams.hpp>
 
 #include <algorithm>
 
@@ -45,8 +46,8 @@ namespace SceneUtil
 
         DebugDraw debugDraw(*group, DebugDraw::makeStateSet(), osg::Vec3f(0, 0, 0), 1);
 
-        const auto agentRadius = halfExtents.x();
-        const auto agentHeight = 2.0f * halfExtents.z();
+        const auto agentRadius = DetourNavigator::getAgentRadius(halfExtents);
+        const auto agentHeight = DetourNavigator::getAgentHeight(halfExtents);
         const auto agentClimb = settings.mMaxClimb;
         const auto startColor = duRGBA(128, 25, 0, 192);
         const auto endColor = duRGBA(51, 102, 0, 129);

From a40ec4edd6459e54003d6df3f1b05f2c4241f028 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 15 Jun 2022 10:47:49 +0200
Subject: [PATCH 2648/2859] Avoid D9025 warning by not adding /W3 by default
 using CMP0092 policy

See https://gitlab.kitware.com/cmake/cmake/-/issues/18317

Set policies before declaring the project otherwise they might not take effect.
Specifically CMP0092 does not have effect added after project.
---
 CMakeLists.txt | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99eab68118..10edfb0f97 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,25 +1,32 @@
-project(OpenMW)
 cmake_minimum_required(VERSION 3.1.0)
-set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-include(GNUInstallDirs)
 
 # for link time optimization, remove if cmake version is >= 3.9
 if(POLICY CMP0069) # LTO
-  cmake_policy(SET CMP0069 NEW)
+    cmake_policy(SET CMP0069 NEW)
 endif()
 
 # for position-independent executable, remove if cmake version is >= 3.14
 if(POLICY CMP0083)
-  cmake_policy(SET CMP0083 NEW)
+    cmake_policy(SET CMP0083 NEW)
 endif()
 
 # to link with freetype library
 if(POLICY CMP0079)
-  cmake_policy(SET CMP0079 NEW)
+    cmake_policy(SET CMP0079 NEW)
+endif()
+
+# don't add /W3 flag by default for MSVC
+if(POLICY CMP0092)
+    cmake_policy(SET CMP0092 NEW)
 endif()
 
+project(OpenMW)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+include(GNUInstallDirs)
+
 option(OPENMW_GL4ES_MANUAL_INIT "Manually initialize gl4es. This is more reliable on platforms without a windowing system. Requires gl4es to be configured with -DNOEGL=ON -DNO_LOADER=ON -DNO_INIT_CONSTRUCTOR=ON." OFF)
 if(OPENMW_GL4ES_MANUAL_INIT)
     add_definitions(-DOPENMW_GL4ES_MANUAL_INIT)

From 2586beed729d4ad2c990fe709edd22cdf04856a0 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Wed, 15 Jun 2022 14:55:42 +0000
Subject: [PATCH 2649/2859] Updating Boost on windows to 1.79 to support C++20

---
 CI/before_script.msvc.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 94c0f5fa46..a2bc4bd9d3 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -361,9 +361,9 @@ case $VS_VERSION in
 		MSVC_YEAR="2015"
 		MSVC_REAL_YEAR="2019"
 		MSVC_DISPLAY_YEAR="2019"
-		BOOST_VER="1.71.0"
-		BOOST_VER_URL="1_71_0"
-		BOOST_VER_SDK="107100"
+		BOOST_VER="1.79.0"
+		BOOST_VER_URL="1_79_0"
+		BOOST_VER_SDK="107900"
 		;;
 
 	15|15.0|2017 )

From 706f6ed78872e64a266a32508b4c133c8d9b54f3 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Wed, 15 Jun 2022 21:39:24 +0000
Subject: [PATCH 2650/2859] Ensure we don't clobber the download link while
 we're using RelWithDebInfo dev builds

---
 .gitlab-ci.yml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 49aa41a7a6..d2a1c1423b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -514,10 +514,11 @@ macOS12_Xcode13:
     - .Windows_MSBuild_Base
   variables:
     config: "Release"
-  rules:
-    # run this for both pushes and schedules so 'latest successful pipeline for branch' always includes it
-    - if: $CI_PIPELINE_SOURCE == "push"
-    - if: $CI_PIPELINE_SOURCE == "schedule"
+# temporarily disabled while this isn't the thing we link on the downloads page
+#  rules:
+#    # run this for both pushes and schedules so 'latest successful pipeline for branch' always includes it
+#    - if: $CI_PIPELINE_SOURCE == "push"
+#    - if: $CI_PIPELINE_SOURCE == "schedule"
 
 .Windows_MSBuild_Debug:
   extends:
@@ -532,6 +533,12 @@ Windows_MSBuild_RelWithDebInfo:
     config: "RelWithDebInfo"
     # Gitlab can't successfully execute following binaries due to unknown reason
     # executables: "openmw_test_suite.exe,openmw_detournavigator_navmeshtilescache_benchmark.exe"
+  # temporarily enabled while we're linking these on the downloads page
+  rules:
+    # run this for both pushes and schedules so 'latest successful pipeline for branch' always includes it
+    - if: $CI_PIPELINE_SOURCE == "push"
+    - if: $CI_PIPELINE_SOURCE == "schedule"
+
 
 Ubuntu_AndroidNDK_arm64-v8a:
   tags:

From 6a5ad4ca43876e13f3a6fcf499c4b5b4c1335687 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Thu, 16 Jun 2022 00:28:41 +0100
Subject: [PATCH 2651/2859] Fix regression from
 https://gitlab.com/OpenMW/openmw/-/merge_requests/1776

---
 components/files/openfile.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/components/files/openfile.cpp b/components/files/openfile.cpp
index 61a177b038..54b0b28058 100644
--- a/components/files/openfile.cpp
+++ b/components/files/openfile.cpp
@@ -3,11 +3,20 @@
 #include <cstring>
 #include <fstream>
 
+#if defined(_WIN32) || defined(__WINDOWS__)
+#include <boost/locale.hpp>
+#endif
+
 namespace Files
 {
     std::unique_ptr<std::ifstream> openBinaryInputFileStream(const std::string& path)
     {
+#if defined(_WIN32) || defined(__WINDOWS__)
+        std::wstring wpath = boost::locale::conv::utf_to_utf<wchar_t>(path);
+        auto stream = std::make_unique<std::ifstream>(wpath, std::ios::binary);
+#else
         auto stream = std::make_unique<std::ifstream>(path, std::ios::binary);
+#endif
         if (!stream->is_open())
             throw std::runtime_error("Failed to open '" + path + "' for reading: " + std::strerror(errno));
         stream->exceptions(std::ios::badbit);

From bdcac26d8c673ae9835fee26a25806860985c5c8 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Thu, 16 Jun 2022 00:30:11 +0100
Subject: [PATCH 2652/2859] Fix regressions from
 https://gitlab.com/OpenMW/openmw/-/merge_requests/1917

---
 components/vfs/filesystemarchive.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/vfs/filesystemarchive.cpp b/components/vfs/filesystemarchive.cpp
index 206d9aff0c..0caa4c62b9 100644
--- a/components/vfs/filesystemarchive.cpp
+++ b/components/vfs/filesystemarchive.cpp
@@ -29,14 +29,14 @@ namespace VFS
             if (mPath.size () > 0 && mPath [prefix - 1] != '\\' && mPath [prefix - 1] != '/')
                 ++prefix;
 
-            for (directory_iterator i (mPath); i != end; ++i)
+            for (directory_iterator i (std::filesystem::u8path(mPath)); i != end; ++i)
             {
                 if(std::filesystem::is_directory (*i))
                     continue;
 
-                std::string proper = i->path ().string ();
+                std::u8string proper = i->path ().u8string ();
 
-                FileSystemArchiveFile file(proper);
+                FileSystemArchiveFile file(std::string((char*)proper.c_str(), proper.size()));
 
                 std::string searchable;
 
@@ -44,7 +44,7 @@ namespace VFS
 
                 const auto inserted = mIndex.insert(std::make_pair(searchable, file));
                 if (!inserted.second)
-                    Log(Debug::Warning) << "Warning: found duplicate file for '" << proper << "', please check your file system for two files with the same name in different cases.";
+                    Log(Debug::Warning) << "Warning: found duplicate file for '" << std::string((char*)proper.c_str(), proper.size()) << "', please check your file system for two files with the same name in different cases.";
                 else
                     out[inserted.first->first] = &inserted.first->second;
             }

From a5d8286cf2c6186f236d59f011e87ddb63d19efd Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Thu, 16 Jun 2022 15:46:08 +0300
Subject: [PATCH 2653/2859] Reject models that don't have grass\ prefix from
 groundcover cache

---
 CHANGELOG.md                             |  1 +
 apps/openmw/mwworld/groundcoverstore.cpp | 15 +++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index defd0e7542..7f1014a6a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -113,6 +113,7 @@
     Bug #6631: Fix ffmpeg avio API usage causing hangs in ffmpeg version 5
     Bug #6667: Pressing the Esc key while resting or waiting causes black screen.
     Bug #6670: Dialogue order is incorrect
+    Bug #6672: Garbage object refs in groundcover plugins like Vurt's grass plugins
     Bug #6680: object.cpp handles nodetree unsafely, memory access with dangling pointer
     Bug #6682: HitOnMe doesn't fire as intended
     Bug #6697: Shaders vertex lighting incorrectly clamped
diff --git a/apps/openmw/mwworld/groundcoverstore.cpp b/apps/openmw/mwworld/groundcoverstore.cpp
index 1c75ce19f2..4f3136d557 100644
--- a/apps/openmw/mwworld/groundcoverstore.cpp
+++ b/apps/openmw/mwworld/groundcoverstore.cpp
@@ -18,18 +18,25 @@ namespace MWWorld
         ESM::ReadersCache readers;
         const ::EsmLoader::EsmData content = ::EsmLoader::loadEsmData(query, groundcoverFiles, fileCollections, readers, encoder);
 
+        static constexpr std::string_view prefix = "grass\\";
         for (const ESM::Static& stat : statics)
         {
             std::string id = Misc::StringUtils::lowerCase(stat.mId);
-            mMeshCache[id] = Misc::StringUtils::lowerCase(
-                MWBase::Environment::get().getWindowManager()->correctMeshPath(stat.mModel));
+            std::string model = Misc::StringUtils::lowerCase(stat.mModel);
+            std::replace(model.begin(), model.end(), '/', '\\');
+            if (model.compare(0, prefix.size(), prefix) != 0)
+                continue;
+            mMeshCache[id] = MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
         }
 
         for (const ESM::Static& stat : content.mStatics)
         {
             std::string id = Misc::StringUtils::lowerCase(stat.mId);
-            mMeshCache[id] = Misc::StringUtils::lowerCase(
-                MWBase::Environment::get().getWindowManager()->correctMeshPath(stat.mModel));
+            std::string model = Misc::StringUtils::lowerCase(stat.mModel);
+            std::replace(model.begin(), model.end(), '/', '\\');
+            if (model.compare(0, prefix.size(), prefix) != 0)
+                continue;
+            mMeshCache[id] = MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
         }
 
         for (const ESM::Cell& cell : content.mCells)

From 12bace3552dcf181d007043f2bfd4a53f2d05ff4 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Thu, 16 Jun 2022 21:45:50 +0200
Subject: [PATCH 2654/2859] Silence a minor git warning

No need to pollute the CI log output.
---
 CI/before_script.android.sh | 3 +++
 CI/before_script.linux.sh   | 3 +++
 CI/before_script.osx.sh     | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/CI/before_script.android.sh b/CI/before_script.android.sh
index 47655f8ace..cbf8d64905 100755
--- a/CI/before_script.android.sh
+++ b/CI/before_script.android.sh
@@ -3,6 +3,9 @@
 # hack to work around: FFmpeg version is too old, 3.2 is required
 sed -i s/"NOT FFVER_OK"/"FALSE"/ CMakeLists.txt
 
+# Silence a git warning
+git config --global advice.detachedHead false
+
 mkdir -p build
 cd build
 
diff --git a/CI/before_script.linux.sh b/CI/before_script.linux.sh
index 41d271fc70..8b0918827f 100755
--- a/CI/before_script.linux.sh
+++ b/CI/before_script.linux.sh
@@ -4,6 +4,9 @@ set -xeo pipefail
 
 free -m
 
+# Silence a git warning
+git config --global advice.detachedHead false
+
 BUILD_UNITTESTS=OFF
 BUILD_BENCHMARKS=OFF
 
diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh
index c51eeb61d0..cd293a9cc9 100755
--- a/CI/before_script.osx.sh
+++ b/CI/before_script.osx.sh
@@ -3,6 +3,9 @@
 export CXX=clang++
 export CC=clang
 
+# Silence a git warning
+git config --global advice.detachedHead false
+
 DEPENDENCIES_ROOT="/private/tmp/openmw-deps/openmw-deps"
 QT_PATH=$(brew --prefix qt@5)
 CCACHE_EXECUTABLE=$(brew --prefix ccache)/bin/ccache

From 0b38e165f70927814202b9c4f7c700b9e69ee8c6 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Fri, 17 Jun 2022 09:53:13 +0000
Subject: [PATCH 2655/2859] Avoid clearing the current weapon animation group
 if it's still going to be in use

---
 apps/openmw/mwmechanics/character.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index c7e5cf70a3..8766230e9c 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -390,7 +390,8 @@ void CharacterController::refreshHitRecoilAnims()
     // Cancel upper body animations
     if (isKnockedOut() || isKnockedDown())
     {
-        clearStateAnimation(mCurrentWeapon);
+        if (!mCurrentWeapon.empty())
+            mAnimation->disable(mCurrentWeapon);
         if (mUpperBodyState > UpperCharState_WeapEquiped)
         {
             mUpperBodyState = UpperCharState_WeapEquiped;
@@ -1148,7 +1149,8 @@ bool CharacterController::updateState(CharacterState idle)
     if (isStillWeapon && mWeaponType != weaptype && mUpperBodyState > UpperCharState_WeapEquiped)
     {
         forcestateupdate = true;
-        clearStateAnimation(mCurrentWeapon);
+        if (!mCurrentWeapon.empty())
+            mAnimation->disable(mCurrentWeapon);
         mUpperBodyState = UpperCharState_WeapEquiped;
         setAttackingOrSpell(false);
         mAnimation->showWeapons(true);
@@ -1310,7 +1312,8 @@ bool CharacterController::updateState(CharacterState idle)
 
         if (!ammunition && mUpperBodyState > UpperCharState_WeapEquiped)
         {
-            clearStateAnimation(mCurrentWeapon);
+            if (!mCurrentWeapon.empty())
+                mAnimation->disable(mCurrentWeapon);
             mUpperBodyState = UpperCharState_WeapEquiped;
         }
     }
@@ -1591,7 +1594,8 @@ bool CharacterController::updateState(CharacterState idle)
                 if (mWeaponType > ESM::Weapon::None)
                     mAnimation->showWeapons(true);
             }
-            clearStateAnimation(mCurrentWeapon);
+            if (!mCurrentWeapon.empty())
+                mAnimation->disable(mCurrentWeapon);
         }
     }
 

From 8b9ed5734871fad887b52c544f328a8433190e19 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Thu, 16 Jun 2022 21:29:55 +0200
Subject: [PATCH 2656/2859] Clean up Qt includes

---
 apps/launcher/advancedpage.cpp                |  6 ++---
 apps/launcher/datafilespage.cpp               |  6 +----
 apps/launcher/graphicspage.cpp                |  2 --
 apps/launcher/main.cpp                        |  1 -
 apps/launcher/maindialog.cpp                  |  5 ++--
 apps/launcher/settingspage.cpp                |  1 +
 apps/launcher/utils/profilescombobox.cpp      |  2 --
 apps/launcher/utils/profilescombobox.hpp      |  2 +-
 apps/opencs/main.cpp                          |  1 -
 apps/opencs/model/doc/document.hpp            |  1 -
 apps/opencs/model/doc/messages.hpp            |  2 --
 apps/opencs/model/doc/operation.hpp           |  1 -
 apps/opencs/model/doc/runner.cpp              |  1 -
 apps/opencs/model/prefs/boolsetting.cpp       |  1 -
 apps/opencs/model/prefs/coloursetting.cpp     |  1 -
 apps/opencs/model/prefs/shortcutmanager.cpp   |  1 -
 apps/opencs/model/tools/tools.cpp             |  2 --
 apps/opencs/model/world/columnbase.hpp        |  1 -
 apps/opencs/model/world/columnimp.cpp         |  1 -
 apps/opencs/model/world/columnimp.hpp         |  1 -
 apps/opencs/model/world/commands.hpp          |  1 -
 apps/opencs/view/doc/filedialog.cpp           |  3 ---
 apps/opencs/view/doc/loader.hpp               |  1 -
 apps/opencs/view/doc/newgame.cpp              |  3 +--
 apps/opencs/view/doc/operation.cpp            |  2 +-
 apps/opencs/view/doc/operations.cpp           |  1 -
 apps/opencs/view/doc/startup.cpp              |  3 +--
 apps/opencs/view/doc/subview.cpp              |  1 -
 apps/opencs/view/doc/view.cpp                 |  4 ---
 apps/opencs/view/doc/viewmanager.cpp          |  1 -
 apps/opencs/view/filter/editwidget.cpp        |  1 -
 apps/opencs/view/filter/editwidget.hpp        |  1 -
 apps/opencs/view/filter/filterbox.hpp         |  1 -
 apps/opencs/view/filter/recordfilterbox.hpp   |  3 ---
 apps/opencs/view/prefs/dialogue.cpp           |  2 --
 .../view/render/pagedworldspacewidget.cpp     |  2 --
 apps/opencs/view/render/pathgridmode.cpp      |  1 -
 apps/opencs/view/render/scenewidget.cpp       |  4 +--
 .../opencs/view/render/terraintexturemode.cpp |  3 ---
 .../view/render/unpagedworldspacewidget.cpp   |  2 --
 apps/opencs/view/render/worldspacewidget.cpp  |  3 ---
 apps/opencs/view/tools/searchbox.cpp          |  2 --
 apps/opencs/view/widget/coloreditor.cpp       |  4 +--
 apps/opencs/view/widget/colorpickerpopup.cpp  |  4 +--
 apps/opencs/view/widget/scenetoolmode.cpp     |  1 -
 .../view/widget/scenetoolshapebrush.cpp       | 27 ++++++++-----------
 .../view/widget/scenetoolshapebrush.hpp       |  4 ---
 .../view/widget/scenetooltexturebrush.cpp     | 25 +++++++----------
 .../view/widget/scenetooltexturebrush.hpp     | 13 ++++-----
 apps/opencs/view/widget/scenetooltoggle2.cpp  |  1 -
 apps/opencs/view/world/colordelegate.cpp      |  1 -
 .../opencs/view/world/datadisplaydelegate.hpp |  1 -
 apps/opencs/view/world/dialoguesubview.cpp    | 18 +++++--------
 apps/opencs/view/world/dragrecordtable.hpp    |  1 -
 apps/opencs/view/world/enumdelegate.cpp       |  1 -
 apps/opencs/view/world/enumdelegate.hpp       |  1 -
 .../world/extendedcommandconfigurator.cpp     |  1 -
 apps/opencs/view/world/nestedtable.cpp        |  1 -
 apps/opencs/view/world/nestedtable.hpp        |  2 --
 .../view/world/recordstatusdelegate.cpp       |  4 ---
 .../view/world/recordstatusdelegate.hpp       |  2 --
 apps/opencs/view/world/regionmap.hpp          |  3 ---
 apps/opencs/view/world/scriptedit.cpp         |  1 -
 apps/opencs/view/world/scriptsubview.cpp      |  2 --
 apps/opencs/view/world/scriptsubview.hpp      |  1 -
 apps/opencs/view/world/table.cpp              |  1 -
 apps/opencs/view/world/table.hpp              |  2 --
 .../world/tableheadermouseeventhandler.cpp    |  1 +
 .../world/tableheadermouseeventhandler.hpp    |  2 +-
 apps/opencs/view/world/tablesubview.hpp       |  2 --
 apps/opencs/view/world/util.cpp               |  3 ---
 apps/opencs/view/world/vartypedelegate.cpp    |  2 --
 apps/wizard/existinginstallationpage.cpp      |  1 -
 apps/wizard/installationpage.cpp              |  3 +--
 apps/wizard/mainwizard.cpp                    |  3 +--
 apps/wizard/unshield/unshieldworker.cpp       |  3 ---
 apps/wizard/unshield/unshieldworker.hpp       |  2 --
 components/config/settingsbase.hpp            |  1 -
 .../contentselector/model/contentmodel.cpp    |  1 -
 components/contentselector/model/esmfile.cpp  |  1 -
 components/contentselector/view/combobox.cpp  |  2 ++
 components/contentselector/view/combobox.hpp  |  1 -
 .../contentselector/view/contentselector.cpp  |  3 ---
 components/process/processinvoker.cpp         |  4 ++-
 84 files changed, 57 insertions(+), 184 deletions(-)

diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index 6566bd8d51..9eed0605f0 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -2,16 +2,16 @@
 
 #include <array>
 #include <string>
+#include <cmath>
 
-#include <components/config/gamesettings.hpp>
 #include <QFileDialog>
 #include <QCompleter>
 #include <QString>
+
+#include <components/config/gamesettings.hpp>
 #include <components/contentselector/view/contentselector.hpp>
 #include <components/contentselector/model/esmfile.hpp>
 
-#include <cmath>
-
 #include "utils/openalutil.hpp"
 
 Launcher::AdvancedPage::AdvancedPage(Config::GameSettings &gameSettings, QWidget *parent)
diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index c096198462..cb94eddd78 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -2,14 +2,10 @@
 #include "maindialog.hpp"
 
 #include <QDebug>
-
 #include <QPushButton>
 #include <QMessageBox>
-#include <QMenu>
-#include <QSortFilterProxyModel>
 #include <QFileDialog>
-#include <QTreeView>
-#include <qnamespace.h>
+
 #include <thread>
 #include <mutex>
 #include <algorithm>
diff --git a/apps/launcher/graphicspage.cpp b/apps/launcher/graphicspage.cpp
index 67b1380130..5cdfb578da 100644
--- a/apps/launcher/graphicspage.cpp
+++ b/apps/launcher/graphicspage.cpp
@@ -1,8 +1,6 @@
 #include "graphicspage.hpp"
 
-#include <QDesktopWidget>
 #include <QMessageBox>
-#include <QDir>
 #include <QScreen>
 
 #ifdef MAC_OS_X_VERSION_MIN_REQUIRED
diff --git a/apps/launcher/main.cpp b/apps/launcher/main.cpp
index 57b8ee4b78..486f771366 100644
--- a/apps/launcher/main.cpp
+++ b/apps/launcher/main.cpp
@@ -1,7 +1,6 @@
 #include <iostream>
 
 #include <QTranslator>
-#include <QTextCodec>
 #include <QDir>
 
 #include <components/debug/debugging.hpp>
diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp
index 62534e95bd..ba7de5b7e7 100644
--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@@ -3,11 +3,10 @@
 #include <components/version/version.hpp>
 #include <components/misc/helpviewer.hpp>
 
-#include <QDate>
+#include <QTime>
 #include <QDir>
+#include <QDebug>
 #include <QMessageBox>
-#include <QFontDatabase>
-#include <QFileDialog>
 #include <QCloseEvent>
 #include <QTextCodec>
 
diff --git a/apps/launcher/settingspage.cpp b/apps/launcher/settingspage.cpp
index 9c750a7c25..1739c5cc05 100644
--- a/apps/launcher/settingspage.cpp
+++ b/apps/launcher/settingspage.cpp
@@ -2,6 +2,7 @@
 
 #include <QFileDialog>
 #include <QMessageBox>
+#include <QDebug>
 #include <QDir>
 
 #include "utils/textinputdialog.hpp"
diff --git a/apps/launcher/utils/profilescombobox.cpp b/apps/launcher/utils/profilescombobox.cpp
index d06cfacff6..dc0a806c9f 100644
--- a/apps/launcher/utils/profilescombobox.cpp
+++ b/apps/launcher/utils/profilescombobox.cpp
@@ -1,7 +1,5 @@
-#include <QRegExpValidator>
 #include <QString>
 #include <QApplication>
-#include <QKeyEvent>
 
 #include "profilescombobox.hpp"
 
diff --git a/apps/launcher/utils/profilescombobox.hpp b/apps/launcher/utils/profilescombobox.hpp
index 065682f3d1..f29ac58e12 100644
--- a/apps/launcher/utils/profilescombobox.hpp
+++ b/apps/launcher/utils/profilescombobox.hpp
@@ -4,7 +4,7 @@
 #include "components/contentselector/view/combobox.hpp"
 #include "lineedit.hpp"
 
-#include <QDebug>
+#include <QWidget>
 
 class QString;
 
diff --git a/apps/opencs/main.cpp b/apps/opencs/main.cpp
index a15ab17fa2..e46a46a34e 100644
--- a/apps/opencs/main.cpp
+++ b/apps/opencs/main.cpp
@@ -5,7 +5,6 @@
 
 #include <QApplication>
 #include <QIcon>
-#include <QMetaType>
 
 #include <components/debug/debugging.hpp>
 #include <components/platform/platform.hpp>
diff --git a/apps/opencs/model/doc/document.hpp b/apps/opencs/model/doc/document.hpp
index 0332cb43a1..4aae282fb6 100644
--- a/apps/opencs/model/doc/document.hpp
+++ b/apps/opencs/model/doc/document.hpp
@@ -7,7 +7,6 @@
 
 #include <QUndoStack>
 #include <QObject>
-#include <QTimer>
 
 #include <components/files/multidircollection.hpp>
 #include <components/to_utf8/to_utf8.hpp>
diff --git a/apps/opencs/model/doc/messages.hpp b/apps/opencs/model/doc/messages.hpp
index 671ded82a0..355493b79b 100644
--- a/apps/opencs/model/doc/messages.hpp
+++ b/apps/opencs/model/doc/messages.hpp
@@ -4,8 +4,6 @@
 #include <string>
 #include <vector>
 
-#include <QMetaType>
-
 #include "../world/universalid.hpp"
 
 namespace CSMDoc
diff --git a/apps/opencs/model/doc/operation.hpp b/apps/opencs/model/doc/operation.hpp
index ff396fa3ce..b094c08b4c 100644
--- a/apps/opencs/model/doc/operation.hpp
+++ b/apps/opencs/model/doc/operation.hpp
@@ -6,7 +6,6 @@
 
 #include <QObject>
 #include <QTimer>
-#include <QStringList>
 
 #include "messages.hpp"
 
diff --git a/apps/opencs/model/doc/runner.cpp b/apps/opencs/model/doc/runner.cpp
index f1179b1624..9320941841 100644
--- a/apps/opencs/model/doc/runner.cpp
+++ b/apps/opencs/model/doc/runner.cpp
@@ -1,6 +1,5 @@
 #include "runner.hpp"
 
-#include <QApplication>
 #include <QDir>
 #include <QTemporaryFile>
 #include <QTextStream>
diff --git a/apps/opencs/model/prefs/boolsetting.cpp b/apps/opencs/model/prefs/boolsetting.cpp
index 0058753490..c8a2c7c5e2 100644
--- a/apps/opencs/model/prefs/boolsetting.cpp
+++ b/apps/opencs/model/prefs/boolsetting.cpp
@@ -1,4 +1,3 @@
-
 #include "boolsetting.hpp"
 
 #include <QCheckBox>
diff --git a/apps/opencs/model/prefs/coloursetting.cpp b/apps/opencs/model/prefs/coloursetting.cpp
index e676ad91c3..24735a3bac 100644
--- a/apps/opencs/model/prefs/coloursetting.cpp
+++ b/apps/opencs/model/prefs/coloursetting.cpp
@@ -1,4 +1,3 @@
-
 #include "coloursetting.hpp"
 
 #include <QLabel>
diff --git a/apps/opencs/model/prefs/shortcutmanager.cpp b/apps/opencs/model/prefs/shortcutmanager.cpp
index 4c5f77900c..4b3f81d0ef 100644
--- a/apps/opencs/model/prefs/shortcutmanager.cpp
+++ b/apps/opencs/model/prefs/shortcutmanager.cpp
@@ -2,7 +2,6 @@
 
 #include <algorithm>
 
-#include <QApplication>
 #include <QStringList>
 
 #include "shortcut.hpp"
diff --git a/apps/opencs/model/tools/tools.cpp b/apps/opencs/model/tools/tools.cpp
index a3d7db497f..07e0cc038e 100644
--- a/apps/opencs/model/tools/tools.cpp
+++ b/apps/opencs/model/tools/tools.cpp
@@ -1,7 +1,5 @@
 #include "tools.hpp"
 
-#include <QThreadPool>
-
 #include "../doc/state.hpp"
 #include "../doc/operation.hpp"
 #include "../doc/document.hpp"
diff --git a/apps/opencs/model/world/columnbase.hpp b/apps/opencs/model/world/columnbase.hpp
index b7c0d8a248..688cdffb74 100644
--- a/apps/opencs/model/world/columnbase.hpp
+++ b/apps/opencs/model/world/columnbase.hpp
@@ -5,7 +5,6 @@
 #include <vector>
 #include <stdexcept>
 
-#include <Qt>
 #include <QVariant>
 
 #include "record.hpp"
diff --git a/apps/opencs/model/world/columnimp.cpp b/apps/opencs/model/world/columnimp.cpp
index 0244ab1e8d..78c7bc02d5 100644
--- a/apps/opencs/model/world/columnimp.cpp
+++ b/apps/opencs/model/world/columnimp.cpp
@@ -1,7 +1,6 @@
 #include "columnimp.hpp"
 
 #include <stdexcept>
-#include <QVector>
 
 namespace CSMWorld
 {
diff --git a/apps/opencs/model/world/columnimp.hpp b/apps/opencs/model/world/columnimp.hpp
index 493f62694e..2d69c664d4 100644
--- a/apps/opencs/model/world/columnimp.hpp
+++ b/apps/opencs/model/world/columnimp.hpp
@@ -6,7 +6,6 @@
 #include <sstream>
 #include <stdexcept>
 
-#include <QColor>
 #include <QVector>
 
 #include <components/esm3/loadbody.hpp>
diff --git a/apps/opencs/model/world/commands.hpp b/apps/opencs/model/world/commands.hpp
index 2ed629ef5c..4b619d11ed 100644
--- a/apps/opencs/model/world/commands.hpp
+++ b/apps/opencs/model/world/commands.hpp
@@ -16,7 +16,6 @@
 #include "universalid.hpp"
 #include "nestedtablewrapper.hpp"
 
-class QModelIndex;
 class QAbstractItemModel;
 
 namespace CSMWorld
diff --git a/apps/opencs/view/doc/filedialog.cpp b/apps/opencs/view/doc/filedialog.cpp
index 51745be0a7..1eca8d68a6 100644
--- a/apps/opencs/view/doc/filedialog.cpp
+++ b/apps/opencs/view/doc/filedialog.cpp
@@ -2,9 +2,6 @@
 
 #include <QPushButton>
 #include <QDialogButtonBox>
-#include <QSortFilterProxyModel>
-#include <QRegExp>
-#include <QLabel>
 
 #include "components/contentselector/model/esmfile.hpp"
 #include "components/contentselector/view/contentselector.hpp"
diff --git a/apps/opencs/view/doc/loader.hpp b/apps/opencs/view/doc/loader.hpp
index 1d21d1e02e..80d986283d 100644
--- a/apps/opencs/view/doc/loader.hpp
+++ b/apps/opencs/view/doc/loader.hpp
@@ -5,7 +5,6 @@
 
 #include <QObject>
 #include <QWidget>
-#include <QSignalMapper>
 
 class QLabel;
 class QProgressBar;
diff --git a/apps/opencs/view/doc/newgame.cpp b/apps/opencs/view/doc/newgame.cpp
index 7b247652ed..dc7e12423e 100644
--- a/apps/opencs/view/doc/newgame.cpp
+++ b/apps/opencs/view/doc/newgame.cpp
@@ -1,7 +1,6 @@
 #include "newgame.hpp"
 
-#include <QApplication>
-#include <QDesktopWidget>
+#include <QGuiApplication>
 #include <QVBoxLayout>
 #include <QDialogButtonBox>
 #include <QPushButton>
diff --git a/apps/opencs/view/doc/operation.cpp b/apps/opencs/view/doc/operation.cpp
index e5c1e7b89e..c3714a001e 100644
--- a/apps/opencs/view/doc/operation.cpp
+++ b/apps/opencs/view/doc/operation.cpp
@@ -4,7 +4,7 @@
 
 #include <QProgressBar>
 #include <QPushButton>
-#include <QVBoxLayout>
+#include <QHBoxLayout>
 
 #include "../../model/doc/document.hpp"
 
diff --git a/apps/opencs/view/doc/operations.cpp b/apps/opencs/view/doc/operations.cpp
index 9ed77ff9c5..2177679b00 100644
--- a/apps/opencs/view/doc/operations.cpp
+++ b/apps/opencs/view/doc/operations.cpp
@@ -1,7 +1,6 @@
 #include "operations.hpp"
 
 #include <QVBoxLayout>
-#include <QHBoxLayout>
 
 #include "operation.hpp"
 
diff --git a/apps/opencs/view/doc/startup.cpp b/apps/opencs/view/doc/startup.cpp
index 3a1950a6e3..df4701d8c1 100644
--- a/apps/opencs/view/doc/startup.cpp
+++ b/apps/opencs/view/doc/startup.cpp
@@ -1,7 +1,6 @@
 #include "startup.hpp"
 
-#include <QApplication>
-#include <QDesktopWidget>
+#include <QGuiApplication>
 #include <QVBoxLayout>
 #include <QHBoxLayout>
 #include <QRect>
diff --git a/apps/opencs/view/doc/subview.cpp b/apps/opencs/view/doc/subview.cpp
index 82cbe835e7..a566a6e26f 100644
--- a/apps/opencs/view/doc/subview.cpp
+++ b/apps/opencs/view/doc/subview.cpp
@@ -2,7 +2,6 @@
 
 #include "view.hpp"
 
-#include <QShortcut>
 #include <QEvent>
 #include <QKeyEvent>
 
diff --git a/apps/opencs/view/doc/view.cpp b/apps/opencs/view/doc/view.cpp
index 1fea81ce97..68658248eb 100644
--- a/apps/opencs/view/doc/view.cpp
+++ b/apps/opencs/view/doc/view.cpp
@@ -6,13 +6,9 @@
 #include <QCloseEvent>
 #include <QMenuBar>
 #include <QMessageBox>
-#include <QMdiArea>
-#include <QDockWidget>
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QScrollArea>
-#include <QHBoxLayout>
-#include <QDesktopWidget>
 #include <QScrollBar>
 #include <QScreen>
 
diff --git a/apps/opencs/view/doc/viewmanager.cpp b/apps/opencs/view/doc/viewmanager.cpp
index 95f9f606da..b417a5b499 100644
--- a/apps/opencs/view/doc/viewmanager.cpp
+++ b/apps/opencs/view/doc/viewmanager.cpp
@@ -4,7 +4,6 @@
 #include <map>
 
 #include <QApplication>
-#include <QDesktopWidget>
 #include <QMessageBox>
 #include <QPushButton>
 
diff --git a/apps/opencs/view/filter/editwidget.cpp b/apps/opencs/view/filter/editwidget.cpp
index 78dfef704b..6db8751a0c 100644
--- a/apps/opencs/view/filter/editwidget.cpp
+++ b/apps/opencs/view/filter/editwidget.cpp
@@ -2,7 +2,6 @@
 
 #include <sstream>
 
-#include <QAbstractItemModel>
 #include <QAction>
 #include <QContextMenuEvent>
 #include <QMenu>
diff --git a/apps/opencs/view/filter/editwidget.hpp b/apps/opencs/view/filter/editwidget.hpp
index f933ec92eb..c15e4ef913 100644
--- a/apps/opencs/view/filter/editwidget.hpp
+++ b/apps/opencs/view/filter/editwidget.hpp
@@ -3,7 +3,6 @@
 
 #include <QLineEdit>
 #include <QPalette>
-#include <QtCore/qnamespace.h>
 
 #include "../../model/filter/parser.hpp"
 #include "../../model/filter/node.hpp"
diff --git a/apps/opencs/view/filter/filterbox.hpp b/apps/opencs/view/filter/filterbox.hpp
index 94b5fced30..e01f77ce6b 100644
--- a/apps/opencs/view/filter/filterbox.hpp
+++ b/apps/opencs/view/filter/filterbox.hpp
@@ -4,7 +4,6 @@
 #include <vector>
 
 #include <QWidget>
-#include <QtCore/qnamespace.h>
 
 #include "../../model/filter/node.hpp"
 #include "../../model/world/universalid.hpp"
diff --git a/apps/opencs/view/filter/recordfilterbox.hpp b/apps/opencs/view/filter/recordfilterbox.hpp
index 3bcd7c57b4..b6e04b2758 100644
--- a/apps/opencs/view/filter/recordfilterbox.hpp
+++ b/apps/opencs/view/filter/recordfilterbox.hpp
@@ -2,9 +2,6 @@
 #define CSV_FILTER_RECORDFILTERBOX_H
 
 #include <QWidget>
-#include <QtCore/qnamespace.h>
-
-#include <QHBoxLayout>
 
 #include "../../model/filter/node.hpp"
 
diff --git a/apps/opencs/view/prefs/dialogue.cpp b/apps/opencs/view/prefs/dialogue.cpp
index 7e41fcf822..2dd92901ea 100644
--- a/apps/opencs/view/prefs/dialogue.cpp
+++ b/apps/opencs/view/prefs/dialogue.cpp
@@ -1,9 +1,7 @@
 #include "dialogue.hpp"
 
 #include <QApplication>
-#include <QDesktopWidget>
 #include <QSplitter>
-#include <QListWidget>
 #include <QStackedWidget>
 #include <QListWidgetItem>
 #include <QScreen>
diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index 09306174c1..f0299c5ace 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -4,8 +4,6 @@
 #include <sstream>
 #include <string>
 
-#include <QMouseEvent>
-#include <QApplication>
 
 #include <components/misc/constants.hpp>
 
diff --git a/apps/opencs/view/render/pathgridmode.cpp b/apps/opencs/view/render/pathgridmode.cpp
index 193cb664db..c267f5762d 100644
--- a/apps/opencs/view/render/pathgridmode.cpp
+++ b/apps/opencs/view/render/pathgridmode.cpp
@@ -1,6 +1,5 @@
 #include "pathgridmode.hpp"
 
-#include <QMenu>
 #include <QPoint>
 
 #include <components/sceneutil/pathgridutil.hpp>
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index 2cc3b3a582..578723ccd8 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -3,9 +3,7 @@
 #include <chrono>
 #include <thread>
 
-#include <QEvent>
-#include <QResizeEvent>
-#include <QTimer>
+#include <QMouseEvent>
 #include <QLayout>
 
 #include <extern/osgQt/GraphicsWindowQt>
diff --git a/apps/opencs/view/render/terraintexturemode.cpp b/apps/opencs/view/render/terraintexturemode.cpp
index 226ac36f3b..20467e9514 100644
--- a/apps/opencs/view/render/terraintexturemode.cpp
+++ b/apps/opencs/view/render/terraintexturemode.cpp
@@ -5,10 +5,7 @@
 
 #include <QWidget>
 #include <QIcon>
-#include <QEvent>
 #include <QDropEvent>
-#include <QDragEnterEvent>
-#include <QDrag>
 
 #include <osg/Group>
 
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.cpp b/apps/opencs/view/render/unpagedworldspacewidget.cpp
index 943de15691..d9ba551ccb 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.cpp
@@ -2,8 +2,6 @@
 
 #include <sstream>
 
-#include <QEvent>
-
 #include <components/sceneutil/util.hpp>
 
 #include "../../model/doc/document.hpp"
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index d3bf1fcf0c..a145d13d30 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -2,13 +2,10 @@
 
 #include <algorithm>
 
-#include <QEvent>
 #include <QDragEnterEvent>
 #include <QDragMoveEvent>
 #include <QDropEvent>
 #include <QMouseEvent>
-#include <QKeyEvent>
-#include <QApplication>
 #include <QToolTip>
 
 #include <osgUtil/LineSegmentIntersector>
diff --git a/apps/opencs/view/tools/searchbox.cpp b/apps/opencs/view/tools/searchbox.cpp
index e0f965e3c8..f89f82ef79 100644
--- a/apps/opencs/view/tools/searchbox.cpp
+++ b/apps/opencs/view/tools/searchbox.cpp
@@ -3,8 +3,6 @@
 #include <stdexcept>
 
 #include <QGridLayout>
-#include <QComboBox>
-#include <QPushButton>
 
 #include "../../model/world/columns.hpp"
 
diff --git a/apps/opencs/view/widget/coloreditor.cpp b/apps/opencs/view/widget/coloreditor.cpp
index 1cc649313b..1d1f4af1ce 100644
--- a/apps/opencs/view/widget/coloreditor.cpp
+++ b/apps/opencs/view/widget/coloreditor.cpp
@@ -1,8 +1,6 @@
 #include "coloreditor.hpp"
 
-#include <QApplication>
-#include <QColorDialog>
-#include <QDesktopWidget>
+#include <QGuiApplication>
 #include <QPainter>
 #include <QShowEvent>
 #include <QScreen>
diff --git a/apps/opencs/view/widget/colorpickerpopup.cpp b/apps/opencs/view/widget/colorpickerpopup.cpp
index 3d69523924..0c98698ea6 100644
--- a/apps/opencs/view/widget/colorpickerpopup.cpp
+++ b/apps/opencs/view/widget/colorpickerpopup.cpp
@@ -4,8 +4,8 @@
 #include <QPushButton>
 #include <QEvent>
 #include <QKeyEvent>
-#include <QLayout>
-#include <QStyleOption>
+#include <QStyleOptionButton>
+#include <QVBoxLayout>
 
 CSVWidget::ColorPickerPopup::ColorPickerPopup(QWidget *parent) 
     : QFrame(parent)
diff --git a/apps/opencs/view/widget/scenetoolmode.cpp b/apps/opencs/view/widget/scenetoolmode.cpp
index 3aec44f1ba..ae923f5b37 100644
--- a/apps/opencs/view/widget/scenetoolmode.cpp
+++ b/apps/opencs/view/widget/scenetoolmode.cpp
@@ -2,7 +2,6 @@
 
 #include <QHBoxLayout>
 #include <QFrame>
-#include <QSignalMapper>
 #include <QMenu>
 #include <QContextMenuEvent>
 #include <QEvent>
diff --git a/apps/opencs/view/widget/scenetoolshapebrush.cpp b/apps/opencs/view/widget/scenetoolshapebrush.cpp
index d0419a13ad..dcb2fe8e41 100644
--- a/apps/opencs/view/widget/scenetoolshapebrush.cpp
+++ b/apps/opencs/view/widget/scenetoolshapebrush.cpp
@@ -1,25 +1,20 @@
 #include "scenetoolshapebrush.hpp"
 
-#include <QFrame>
-#include <QIcon>
-#include <QTableWidget>
-#include <QHBoxLayout>
-
-#include <QWidget>
-#include <QComboBox>
-#include <QSpinBox>
-#include <QGroupBox>
-#include <QSlider>
-#include <QEvent>
-#include <QDropEvent>
 #include <QButtonGroup>
-#include <QVBoxLayout>
+#include <QComboBox>
 #include <QDragEnterEvent>
-#include <QDrag>
-#include <QTableWidget>
+#include <QDropEvent>
+#include <QFrame>
+#include <QGroupBox>
+#include <QHBoxLayout>
 #include <QHeaderView>
-#include <QApplication>
+#include <QIcon>
+#include <QLabel>
 #include <QSizePolicy>
+#include <QSlider>
+#include <QTableWidget>
+#include <QVBoxLayout>
+#include <QWidget>
 
 #include "brushshapes.hpp"
 #include "scenetool.hpp"
diff --git a/apps/opencs/view/widget/scenetoolshapebrush.hpp b/apps/opencs/view/widget/scenetoolshapebrush.hpp
index 3afd7f8b3b..e616e6958e 100644
--- a/apps/opencs/view/widget/scenetoolshapebrush.hpp
+++ b/apps/opencs/view/widget/scenetoolshapebrush.hpp
@@ -1,18 +1,14 @@
 #ifndef CSV_WIDGET_SCENETOOLSHAPEBRUSH_H
 #define CSV_WIDGET_SCENETOOLSHAPEBRUSH_H
 
-#include <QIcon>
 #include <QFrame>
 #include <QModelIndex>
 
 #include <QWidget>
-#include <QLabel>
 #include <QComboBox>
 #include <QSpinBox>
 #include <QGroupBox>
 #include <QSlider>
-#include <QEvent>
-#include <QHBoxLayout>
 #include <QPushButton>
 
 #ifndef Q_MOC_RUN
diff --git a/apps/opencs/view/widget/scenetooltexturebrush.cpp b/apps/opencs/view/widget/scenetooltexturebrush.cpp
index f55bda0464..e412392dfc 100644
--- a/apps/opencs/view/widget/scenetooltexturebrush.cpp
+++ b/apps/opencs/view/widget/scenetooltexturebrush.cpp
@@ -1,24 +1,19 @@
 #include "scenetooltexturebrush.hpp"
 
-#include <QFrame>
-#include <QIcon>
-#include <QTableWidget>
-#include <QHBoxLayout>
-
-#include <QWidget>
-#include <QSpinBox>
-#include <QGroupBox>
-#include <QSlider>
-#include <QEvent>
-#include <QDropEvent>
 #include <QButtonGroup>
-#include <QVBoxLayout>
 #include <QDragEnterEvent>
-#include <QDrag>
-#include <QTableWidget>
+#include <QDropEvent>
+#include <QFrame>
+#include <QGroupBox>
+#include <QHBoxLayout>
 #include <QHeaderView>
-#include <QApplication>
+#include <QIcon>
 #include <QSizePolicy>
+#include <QSlider>
+#include <QSpinBox>
+#include <QTableWidget>
+#include <QVBoxLayout>
+#include <QWidget>
 
 #include "scenetool.hpp"
 
diff --git a/apps/opencs/view/widget/scenetooltexturebrush.hpp b/apps/opencs/view/widget/scenetooltexturebrush.hpp
index 5f42800cb3..929ed1ebae 100644
--- a/apps/opencs/view/widget/scenetooltexturebrush.hpp
+++ b/apps/opencs/view/widget/scenetooltexturebrush.hpp
@@ -1,18 +1,15 @@
 #ifndef CSV_WIDGET_SCENETOOLTEXTUREBRUSH_H
 #define CSV_WIDGET_SCENETOOLTEXTUREBRUSH_H
 
-#include <QIcon>
 #include <QFrame>
-#include <QModelIndex>
-
-#include <QWidget>
-#include <QLabel>
-#include <QSpinBox>
 #include <QGroupBox>
-#include <QSlider>
-#include <QEvent>
 #include <QHBoxLayout>
+#include <QLabel>
+#include <QModelIndex>
 #include <QPushButton>
+#include <QSlider>
+#include <QSpinBox>
+#include <QWidget>
 
 #ifndef Q_MOC_RUN
 #include "brushshapes.hpp"
diff --git a/apps/opencs/view/widget/scenetooltoggle2.cpp b/apps/opencs/view/widget/scenetooltoggle2.cpp
index 363cae5709..4042c1fccb 100644
--- a/apps/opencs/view/widget/scenetooltoggle2.cpp
+++ b/apps/opencs/view/widget/scenetooltoggle2.cpp
@@ -6,7 +6,6 @@
 #include <QHBoxLayout>
 #include <QFrame>
 #include <QIcon>
-#include <QPainter>
 
 #include "scenetoolbar.hpp"
 #include "pushbutton.hpp"
diff --git a/apps/opencs/view/world/colordelegate.cpp b/apps/opencs/view/world/colordelegate.cpp
index 3b5f692fe2..8d5f5485df 100644
--- a/apps/opencs/view/world/colordelegate.cpp
+++ b/apps/opencs/view/world/colordelegate.cpp
@@ -1,7 +1,6 @@
 #include "colordelegate.hpp"
 
 #include <QPainter>
-#include <QPushButton>
 
 CSVWorld::ColorDelegate::ColorDelegate(CSMWorld::CommandDispatcher *dispatcher,
                                        CSMDoc::Document& document,
diff --git a/apps/opencs/view/world/datadisplaydelegate.hpp b/apps/opencs/view/world/datadisplaydelegate.hpp
index df06359a04..52e2294f03 100755
--- a/apps/opencs/view/world/datadisplaydelegate.hpp
+++ b/apps/opencs/view/world/datadisplaydelegate.hpp
@@ -1,7 +1,6 @@
 #ifndef DATADISPLAYDELEGATE_HPP
 #define DATADISPLAYDELEGATE_HPP
 
-#include <QTextOption>
 #include "enumdelegate.hpp"
 
 namespace CSMPrefs
diff --git a/apps/opencs/view/world/dialoguesubview.cpp b/apps/opencs/view/world/dialoguesubview.cpp
index 311c80a490..459f55780a 100644
--- a/apps/opencs/view/world/dialoguesubview.cpp
+++ b/apps/opencs/view/world/dialoguesubview.cpp
@@ -4,22 +4,18 @@
 #include <memory>
 #include <stdexcept>
 
-#include <QGridLayout>
-#include <QLabel>
-#include <QSize>
 #include <QAbstractItemModel>
-#include <QDoubleSpinBox>
-#include <QSpinBox>
-#include <QLineEdit>
-#include <QEvent>
-#include <QDataWidgetMapper>
 #include <QCheckBox>
-#include <QLineEdit>
-#include <QPlainTextEdit>
 #include <QComboBox>
+#include <QDataWidgetMapper>
+#include <QGridLayout>
 #include <QHeaderView>
-#include <QScrollBar>
+#include <QLabel>
+#include <QLineEdit>
 #include <QMenu>
+#include <QPlainTextEdit>
+#include <QScrollBar>
+#include <QSize>
 
 #include "../../model/world/nestedtableproxymodel.hpp"
 #include "../../model/world/columnbase.hpp"
diff --git a/apps/opencs/view/world/dragrecordtable.hpp b/apps/opencs/view/world/dragrecordtable.hpp
index f6c3fa8909..4b986f759a 100644
--- a/apps/opencs/view/world/dragrecordtable.hpp
+++ b/apps/opencs/view/world/dragrecordtable.hpp
@@ -2,7 +2,6 @@
 #define CSV_WORLD_DRAGRECORDTABLE_H
 
 #include <QTableView>
-#include <QEvent>
 
 #include "../../model/world/columnbase.hpp"
 
diff --git a/apps/opencs/view/world/enumdelegate.cpp b/apps/opencs/view/world/enumdelegate.cpp
index 2681a398b2..6ec585381c 100644
--- a/apps/opencs/view/world/enumdelegate.cpp
+++ b/apps/opencs/view/world/enumdelegate.cpp
@@ -5,7 +5,6 @@
 
 #include <QComboBox>
 #include <QApplication>
-#include <QUndoStack>
 
 #include "../../model/world/commands.hpp"
 
diff --git a/apps/opencs/view/world/enumdelegate.hpp b/apps/opencs/view/world/enumdelegate.hpp
index 91326e2c05..c5a851c9f8 100644
--- a/apps/opencs/view/world/enumdelegate.hpp
+++ b/apps/opencs/view/world/enumdelegate.hpp
@@ -4,7 +4,6 @@
 #include <vector>
 
 #include <QString>
-#include <QStyledItemDelegate>
 
 #include <components/esm/defs.hpp>
 
diff --git a/apps/opencs/view/world/extendedcommandconfigurator.cpp b/apps/opencs/view/world/extendedcommandconfigurator.cpp
index 8947420242..d7ed39e19e 100644
--- a/apps/opencs/view/world/extendedcommandconfigurator.cpp
+++ b/apps/opencs/view/world/extendedcommandconfigurator.cpp
@@ -5,7 +5,6 @@
 #include <QPushButton>
 #include <QGroupBox>
 #include <QCheckBox>
-#include <QLabel>
 #include <QLayout>
 
 #include "../../model/doc/document.hpp"
diff --git a/apps/opencs/view/world/nestedtable.cpp b/apps/opencs/view/world/nestedtable.cpp
index d52f7ca736..c69913f0ac 100644
--- a/apps/opencs/view/world/nestedtable.cpp
+++ b/apps/opencs/view/world/nestedtable.cpp
@@ -3,7 +3,6 @@
 #include <QHeaderView>
 #include <QContextMenuEvent>
 #include <QMenu>
-#include <QDebug>
 
 #include "../../model/prefs/shortcut.hpp"
 
diff --git a/apps/opencs/view/world/nestedtable.hpp b/apps/opencs/view/world/nestedtable.hpp
index f864f5d80c..da4afe6420 100644
--- a/apps/opencs/view/world/nestedtable.hpp
+++ b/apps/opencs/view/world/nestedtable.hpp
@@ -1,8 +1,6 @@
 #ifndef CSV_WORLD_NESTEDTABLE_H
 #define CSV_WORLD_NESTEDTABLE_H
 
-#include <QEvent>
-
 #include "dragrecordtable.hpp"
 
 class QAction;
diff --git a/apps/opencs/view/world/recordstatusdelegate.cpp b/apps/opencs/view/world/recordstatusdelegate.cpp
index fd98fe6cd9..dd45baff0f 100644
--- a/apps/opencs/view/world/recordstatusdelegate.cpp
+++ b/apps/opencs/view/world/recordstatusdelegate.cpp
@@ -1,9 +1,5 @@
 #include "recordstatusdelegate.hpp"
 
-#include <QPainter>
-#include <QApplication>
-#include <QUndoStack>
-
 #include "../../model/world/columns.hpp"
 
 CSVWorld::RecordStatusDelegate::RecordStatusDelegate(const ValueList& values,
diff --git a/apps/opencs/view/world/recordstatusdelegate.hpp b/apps/opencs/view/world/recordstatusdelegate.hpp
index 38f066862b..ece19e26d5 100644
--- a/apps/opencs/view/world/recordstatusdelegate.hpp
+++ b/apps/opencs/view/world/recordstatusdelegate.hpp
@@ -2,8 +2,6 @@
 #define RECORDSTATUSDELEGATE_H
 
 #include "util.hpp"
-#include <QTextOption>
-#include <QFont>
 
 #include "datadisplaydelegate.hpp"
 #include "../../model/world/record.hpp"
diff --git a/apps/opencs/view/world/regionmap.hpp b/apps/opencs/view/world/regionmap.hpp
index 443de9ce3d..fe88987848 100644
--- a/apps/opencs/view/world/regionmap.hpp
+++ b/apps/opencs/view/world/regionmap.hpp
@@ -4,9 +4,6 @@
 #include <cstddef>
 #include <vector>
 
-#include <QObject>
-#include <QTableView>
-
 #include "./dragrecordtable.hpp"
 
 class QAction;
diff --git a/apps/opencs/view/world/scriptedit.cpp b/apps/opencs/view/world/scriptedit.cpp
index 743df9c765..1217d36f64 100644
--- a/apps/opencs/view/world/scriptedit.cpp
+++ b/apps/opencs/view/world/scriptedit.cpp
@@ -3,7 +3,6 @@
 #include <algorithm>
 
 #include <QDragEnterEvent>
-#include <QRegExp>
 #include <QString>
 #include <QPainter>
 #include <QTextDocumentFragment>
diff --git a/apps/opencs/view/world/scriptsubview.cpp b/apps/opencs/view/world/scriptsubview.cpp
index 6b07f2ea71..5036077fc3 100644
--- a/apps/opencs/view/world/scriptsubview.cpp
+++ b/apps/opencs/view/world/scriptsubview.cpp
@@ -2,8 +2,6 @@
 
 #include <stdexcept>
 
-#include <QStatusBar>
-#include <QStackedLayout>
 #include <QSplitter>
 #include <QTimer>
 
diff --git a/apps/opencs/view/world/scriptsubview.hpp b/apps/opencs/view/world/scriptsubview.hpp
index dc352cc5b0..a4171db6ee 100644
--- a/apps/opencs/view/world/scriptsubview.hpp
+++ b/apps/opencs/view/world/scriptsubview.hpp
@@ -9,7 +9,6 @@
 
 class QModelIndex;
 class QLabel;
-class QVBoxLayout;
 class QSplitter;
 class QTime;
 
diff --git a/apps/opencs/view/world/table.cpp b/apps/opencs/view/world/table.cpp
index 69242fbca3..a3ab3d19d3 100644
--- a/apps/opencs/view/world/table.cpp
+++ b/apps/opencs/view/world/table.cpp
@@ -6,7 +6,6 @@
 #include <QContextMenuEvent>
 #include <QString>
 #include <QMetaObject>
-#include <QtCore/qnamespace.h>
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/helpviewer.hpp>
diff --git a/apps/opencs/view/world/table.hpp b/apps/opencs/view/world/table.hpp
index a7c932a383..caae3165cf 100644
--- a/apps/opencs/view/world/table.hpp
+++ b/apps/opencs/view/world/table.hpp
@@ -4,8 +4,6 @@
 #include <vector>
 #include <string>
 
-#include <QEvent>
-
 #include "../../model/filter/node.hpp"
 #include "../../model/world/columnbase.hpp"
 #include "../../model/world/universalid.hpp"
diff --git a/apps/opencs/view/world/tableheadermouseeventhandler.cpp b/apps/opencs/view/world/tableheadermouseeventhandler.cpp
index a9d34ce7ab..9c76cfaffe 100644
--- a/apps/opencs/view/world/tableheadermouseeventhandler.cpp
+++ b/apps/opencs/view/world/tableheadermouseeventhandler.cpp
@@ -3,6 +3,7 @@
 
 #include <QMenu>
 #include <QPoint>
+#include <QMouseEvent>
 
 namespace CSVWorld
 {
diff --git a/apps/opencs/view/world/tableheadermouseeventhandler.hpp b/apps/opencs/view/world/tableheadermouseeventhandler.hpp
index 934bc1dbb7..381e127624 100644
--- a/apps/opencs/view/world/tableheadermouseeventhandler.hpp
+++ b/apps/opencs/view/world/tableheadermouseeventhandler.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <QHeaderView>
-#include <QtGui>
+#include <QEvent>
 
 namespace CSVWorld
 {
diff --git a/apps/opencs/view/world/tablesubview.hpp b/apps/opencs/view/world/tablesubview.hpp
index d89f71e8a4..97d2bf15f2 100644
--- a/apps/opencs/view/world/tablesubview.hpp
+++ b/apps/opencs/view/world/tablesubview.hpp
@@ -3,8 +3,6 @@
 
 #include "../doc/subview.hpp"
 
-#include <QtCore/qnamespace.h>
-
 class QModelIndex;
 class QWidget;
 
diff --git a/apps/opencs/view/world/util.cpp b/apps/opencs/view/world/util.cpp
index 80bd4580c8..14033f20fb 100644
--- a/apps/opencs/view/world/util.cpp
+++ b/apps/opencs/view/world/util.cpp
@@ -4,13 +4,10 @@
 #include <stdexcept>
 
 #include <QUndoStack>
-#include <QMetaProperty>
 #include <QStyledItemDelegate>
 #include <QLineEdit>
-#include <QComboBox>
 #include <QCheckBox>
 #include <QPlainTextEdit>
-#include <QEvent>
 #include <QItemEditorFactory>
 
 #include "../../model/world/commands.hpp"
diff --git a/apps/opencs/view/world/vartypedelegate.cpp b/apps/opencs/view/world/vartypedelegate.cpp
index 48fb4ab874..80c96afce4 100644
--- a/apps/opencs/view/world/vartypedelegate.cpp
+++ b/apps/opencs/view/world/vartypedelegate.cpp
@@ -1,7 +1,5 @@
 #include "vartypedelegate.hpp"
 
-#include <QUndoStack>
-
 #include "../../model/world/commands.hpp"
 #include "../../model/world/columns.hpp"
 #include "../../model/world/commandmacro.hpp"
diff --git a/apps/wizard/existinginstallationpage.cpp b/apps/wizard/existinginstallationpage.cpp
index 42b7766693..35f3c8c257 100644
--- a/apps/wizard/existinginstallationpage.cpp
+++ b/apps/wizard/existinginstallationpage.cpp
@@ -1,6 +1,5 @@
 #include "existinginstallationpage.hpp"
 
-#include <QDebug>
 #include <QMessageBox>
 #include <QFileDialog>
 #include <QFileInfo>
diff --git a/apps/wizard/installationpage.cpp b/apps/wizard/installationpage.cpp
index 8aad714be3..24e573f1b5 100644
--- a/apps/wizard/installationpage.cpp
+++ b/apps/wizard/installationpage.cpp
@@ -1,10 +1,9 @@
 #include "installationpage.hpp"
 
-#include <QDebug>
 #include <QTextCodec>
-#include <QFileInfo>
 #include <QFileDialog>
 #include <QMessageBox>
+#include <QThread>
 
 #include "mainwizard.hpp"
 
diff --git a/apps/wizard/mainwizard.cpp b/apps/wizard/mainwizard.cpp
index 8f3b5d01a0..840027323a 100644
--- a/apps/wizard/mainwizard.cpp
+++ b/apps/wizard/mainwizard.cpp
@@ -1,8 +1,7 @@
 #include "mainwizard.hpp"
 
 #include <QDebug>
-
-#include <QTime>
+#include <QDateTime>
 #include <QMessageBox>
 #include <QTextCodec>
 #include <QDir>
diff --git a/apps/wizard/unshield/unshieldworker.cpp b/apps/wizard/unshield/unshieldworker.cpp
index 3b68f87cc1..8ff0690667 100644
--- a/apps/wizard/unshield/unshieldworker.cpp
+++ b/apps/wizard/unshield/unshieldworker.cpp
@@ -1,16 +1,13 @@
 #include "unshieldworker.hpp"
 
 #include <QDebug>
-
 #include <QReadLocker>
-#include <QFileDialog>
 #include <QFileInfo>
 #include <QStringList>
 #include <QTextStream>
 #include <QTextCodec>
 #include <QFile>
 #include <QDir>
-#include <QDirIterator>
 
 Wizard::UnshieldWorker::UnshieldWorker(qint64 expectedMorrowindBsaSize, QObject *parent) :
     QObject(parent),
diff --git a/apps/wizard/unshield/unshieldworker.hpp b/apps/wizard/unshield/unshieldworker.hpp
index 483264e990..6e37e734d6 100644
--- a/apps/wizard/unshield/unshieldworker.hpp
+++ b/apps/wizard/unshield/unshieldworker.hpp
@@ -2,8 +2,6 @@
 #define UNSHIELDWORKER_HPP
 
 #include <QObject>
-#include <QThread>
-#include <QMutex>
 #include <QWaitCondition>
 #include <QReadWriteLock>
 #include <QStringList>
diff --git a/components/config/settingsbase.hpp b/components/config/settingsbase.hpp
index 03ce9d3551..595fb9d78f 100644
--- a/components/config/settingsbase.hpp
+++ b/components/config/settingsbase.hpp
@@ -5,7 +5,6 @@
 #include <QStringList>
 #include <QString>
 #include <QRegExp>
-#include <QMultiMap>
 
 namespace Config
 {
diff --git a/components/contentselector/model/contentmodel.cpp b/components/contentselector/model/contentmodel.cpp
index c1d35ad1e2..8f69f6bc0f 100644
--- a/components/contentselector/model/contentmodel.cpp
+++ b/components/contentselector/model/contentmodel.cpp
@@ -5,7 +5,6 @@
 #include <unordered_set>
 
 #include <QDir>
-#include <QTextCodec>
 #include <QDebug>
 
 #include <components/esm3/esmreader.hpp>
diff --git a/components/contentselector/model/esmfile.cpp b/components/contentselector/model/esmfile.cpp
index c6223128a4..60ca199a3b 100644
--- a/components/contentselector/model/esmfile.cpp
+++ b/components/contentselector/model/esmfile.cpp
@@ -1,6 +1,5 @@
 #include "esmfile.hpp"
 
-#include <QMimeData>
 #include <QDataStream>
 
 int ContentSelectorModel::EsmFile::sPropertyCount = 7;
diff --git a/components/contentselector/view/combobox.cpp b/components/contentselector/view/combobox.cpp
index 742e236b30..310806240d 100644
--- a/components/contentselector/view/combobox.cpp
+++ b/components/contentselector/view/combobox.cpp
@@ -1,6 +1,8 @@
 #include <QString>
 #include <QKeyEvent>
 
+#include <QStylePainter>
+
 #include "combobox.hpp"
 
 ContentSelectorView::ComboBox::ComboBox(QWidget *parent) :
diff --git a/components/contentselector/view/combobox.hpp b/components/contentselector/view/combobox.hpp
index 9af3c83af8..ebca824c3d 100644
--- a/components/contentselector/view/combobox.hpp
+++ b/components/contentselector/view/combobox.hpp
@@ -2,7 +2,6 @@
 #define COMBOBOX_HPP
 
 #include <QComboBox>
-#include <QStylePainter>
 
 class QString;
 class QRegExpValidator;
diff --git a/components/contentselector/view/contentselector.cpp b/components/contentselector/view/contentselector.cpp
index 441caa3b23..0a12b01942 100644
--- a/components/contentselector/view/contentselector.cpp
+++ b/components/contentselector/view/contentselector.cpp
@@ -3,10 +3,7 @@
 #include <components/contentselector/model/esmfile.hpp>
 
 #include <QSortFilterProxyModel>
-
 #include <QMenu>
-#include <QContextMenuEvent>
-
 #include <QClipboard>
 #include <QModelIndex>
 
diff --git a/components/process/processinvoker.cpp b/components/process/processinvoker.cpp
index 7c45c865a1..54462acb9c 100644
--- a/components/process/processinvoker.cpp
+++ b/components/process/processinvoker.cpp
@@ -4,8 +4,10 @@
 #include <QStringList>
 #include <QString>
 #include <QDir>
-#include <QDebug>
+
+#if defined(Q_OS_MAC)
 #include <QCoreApplication>
+#endif
 
 Process::ProcessInvoker::ProcessInvoker(QObject* parent)
     : QObject(parent)

From e6f7a2f1ef152ff5703b4397003c89af08fd683f Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Fri, 17 Jun 2022 14:35:33 +0300
Subject: [PATCH 2657/2859] Correct NiBoundingVolume loading

---
 components/nif/node.hpp | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/components/nif/node.hpp b/components/nif/node.hpp
index a776bd40bc..4ebb2d5804 100644
--- a/components/nif/node.hpp
+++ b/components/nif/node.hpp
@@ -1,6 +1,8 @@
 #ifndef OPENMW_COMPONENTS_NIF_NODE_HPP
 #define OPENMW_COMPONENTS_NIF_NODE_HPP
 
+#include <osg/Plane>
+
 #include "controlled.hpp"
 #include "extra.hpp"
 #include "data.hpp"
@@ -21,6 +23,7 @@ struct NiBoundingVolume
 {
     enum Type
     {
+        BASE_BV = 0xFFFFFFFF,
         SPHERE_BV = 0,
         BOX_BV = 1,
         CAPSULE_BV = 2,
@@ -38,7 +41,7 @@ struct NiBoundingVolume
     struct NiBoxBV
     {
         osg::Vec3f center;
-        Matrix3 axis;
+        Matrix3 axes;
         osg::Vec3f extents;
     };
 
@@ -56,7 +59,8 @@ struct NiBoundingVolume
 
     struct NiHalfSpaceBV
     {
-        osg::Vec3f center, normal;
+        osg::Plane plane;
+        osg::Vec3f origin;
     };
 
     unsigned int type;
@@ -65,12 +69,14 @@ struct NiBoundingVolume
     NiCapsuleBV capsule;
     NiLozengeBV lozenge;
     std::vector<NiBoundingVolume> children;
-    NiHalfSpaceBV plane;
+    NiHalfSpaceBV halfSpace;
     void read(NIFStream* nif)
     {
         type = nif->getUInt();
         switch (type)
         {
+            case BASE_BV:
+                break;
             case SPHERE_BV:
             {
                 sphere.center = nif->getVector3();
@@ -80,7 +86,7 @@ struct NiBoundingVolume
             case BOX_BV:
             {
                 box.center = nif->getVector3();
-                box.axis = nif->getMatrix3();
+                box.axes = nif->getMatrix3();
                 box.extents = nif->getVector3();
                 break;
             }
@@ -95,8 +101,11 @@ struct NiBoundingVolume
             case LOZENGE_BV:
             {
                 lozenge.radius = nif->getFloat();
-                lozenge.extent0 = nif->getFloat();
-                lozenge.extent1 = nif->getFloat();
+                if (nif->getVersion() >= NIFStream::generateVersion(4,2,1,0))
+                {
+                    lozenge.extent0 = nif->getFloat();
+                    lozenge.extent1 = nif->getFloat();
+                }
                 lozenge.center = nif->getVector3();
                 lozenge.axis0 = nif->getVector3();
                 lozenge.axis1 = nif->getVector3();
@@ -114,8 +123,9 @@ struct NiBoundingVolume
             }
             case HALFSPACE_BV:
             {
-                plane.center = nif->getVector3();
-                plane.normal = nif->getVector3();
+                halfSpace.plane = osg::Plane(nif->getVector4());
+                if (nif->getVersion() >= NIFStream::generateVersion(4,2,1,0))
+                    halfSpace.origin = nif->getVector3();
                 break;
             }
             default:

From 183378e34a5c47ad4b0b7acc539428ca3292359b Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Sat, 18 Jun 2022 02:58:53 +0300
Subject: [PATCH 2658/2859] Fix idle swim/sneak animation fallback again

---
 apps/openmw/mwmechanics/character.cpp | 43 ++++++++++++++-------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 8766230e9c..b518ead034 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -672,38 +672,41 @@ void CharacterController::refreshIdleAnims(CharacterState idle, bool force)
         return;
 
     mIdleState = idle;
-    size_t numLoops = ~0ul;
 
     std::string idleGroup = idleStateToAnimGroup(mIdleState);
-
-    // Only play "idleswim" or "idlesneak" if they exist. Otherwise, fallback to
-    // "idle"+weapon or "idle".
-    if ((mIdleState == CharState_IdleSwim || mIdleState == CharState_IdleSneak) && !mAnimation->hasAnimation(idleGroup))
+    if (idleGroup.empty())
     {
-        mIdleState = CharState_Idle;
-        idleGroup = idleStateToAnimGroup(mIdleState);
+        resetCurrentIdleState();
+        return;
     }
 
     MWRender::Animation::AnimPriority priority = getIdlePriority(mIdleState);
+    size_t numLoops = ~0ul;
 
-    if (idleGroup.empty())
+    // Only play "idleswim" or "idlesneak" if they exist. Otherwise, fallback to
+    // "idle"+weapon or "idle".
+    bool fallback = mIdleState != CharState_Idle && !mAnimation->hasAnimation(idleGroup);
+    if (fallback)
     {
-        resetCurrentIdleState();
-        return;
+        priority = getIdlePriority(CharState_Idle);
+        idleGroup = idleStateToAnimGroup(CharState_Idle);
     }
 
-    std::string weapShortGroup = getWeaponShortGroup(mWeaponType);
-    if (mIdleState != CharState_IdleSwim && mIdleState != CharState_IdleSneak && mIdleState != CharState_None && !weapShortGroup.empty())
+    if (fallback || mIdleState == CharState_Idle || mIdleState == CharState_SpecialIdle)
     {
-        std::string weapIdleGroup = idleGroup + weapShortGroup;
-        if (!mAnimation->hasAnimation(weapIdleGroup))
-            weapIdleGroup = fallbackShortWeaponGroup(idleGroup);
-        idleGroup = weapIdleGroup;
+        std::string weapShortGroup = getWeaponShortGroup(mWeaponType);
+        if (!weapShortGroup.empty())
+        {
+            std::string weapIdleGroup = idleGroup + weapShortGroup;
+            if (!mAnimation->hasAnimation(weapIdleGroup))
+                weapIdleGroup = fallbackShortWeaponGroup(idleGroup);
+            idleGroup = weapIdleGroup;
 
-        // play until the Loop Stop key 2 to 5 times, then play until the Stop key
-        // this replicates original engine behavior for the "Idle1h" 1st-person animation
-        auto& prng = MWBase::Environment::get().getWorld()->getPrng();
-        numLoops = 1 + Misc::Rng::rollDice(4, prng);
+            // play until the Loop Stop key 2 to 5 times, then play until the Stop key
+            // this replicates original engine behavior for the "Idle1h" 1st-person animation
+            auto& prng = MWBase::Environment::get().getWorld()->getPrng();
+            numLoops = 1 + Misc::Rng::rollDice(4, prng);
+        }
     }
 
     if (!mAnimation->hasAnimation(idleGroup))

From c3c48f21d7f7ff1b7e7c3ae8f770c65955157bf5 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Thu, 12 May 2022 17:29:12 +0200
Subject: [PATCH 2659/2859] Consolidate item consumption code

---
 apps/openmw/mwclass/npc.cpp                | 12 +++++++-----
 apps/openmw/mwclass/npc.hpp                |  6 +-----
 apps/openmw/mwmechanics/aicombataction.cpp |  3 +--
 apps/openmw/mwworld/actionapply.cpp        | 13 +++----------
 apps/openmw/mwworld/actioneat.cpp          |  8 +-------
 apps/openmw/mwworld/class.cpp              |  2 +-
 apps/openmw/mwworld/class.hpp              |  9 ++-------
 7 files changed, 16 insertions(+), 37 deletions(-)

diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 76e60c7880..d7a74ee7c1 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -1100,12 +1100,14 @@ namespace MWClass
         return getNpcStats(ptr).isWerewolf() ? 0.0f : Actor::getEncumbrance(ptr);
     }
 
-    bool Npc::apply (const MWWorld::Ptr& ptr, const std::string& id,
-        const MWWorld::Ptr& actor) const
+    bool Npc::consume(const MWWorld::Ptr& consumable, const MWWorld::Ptr& actor) const
     {
-        MWBase::Environment::get().getLuaManager()->appliedToObject(ptr, id, actor);
-        MWMechanics::CastSpell cast(ptr, ptr);
-        return cast.cast(id);
+        MWBase::Environment::get().getWorld()->breakInvisibility(actor);
+        MWMechanics::CastSpell cast(actor, actor);
+        std::string recordId = consumable.getCellRef().getRefId();
+        MWBase::Environment::get().getLuaManager()->appliedToObject(actor, recordId, actor);
+        actor.getClass().getContainerStore(actor).remove(consumable, 1, actor);
+        return cast.cast(recordId);
     }
 
     void Npc::skillUsageSucceeded (const MWWorld::Ptr& ptr, int skill, int usageType, float extraFactor) const
diff --git a/apps/openmw/mwclass/npc.hpp b/apps/openmw/mwclass/npc.hpp
index ba937a4cfa..d6ae7cbca5 100644
--- a/apps/openmw/mwclass/npc.hpp
+++ b/apps/openmw/mwclass/npc.hpp
@@ -110,11 +110,7 @@ namespace MWClass
             float getArmorRating (const MWWorld::Ptr& ptr) const override;
             ///< @return combined armor rating of this actor
 
-            bool apply (const MWWorld::Ptr& ptr, const std::string& id,
-                const MWWorld::Ptr& actor) const override;
-            ///< Apply \a id on \a ptr.
-            /// \param actor Actor that is resposible for the ID being applied to \a ptr.
-            /// \return Any effect?
+            bool consume(const MWWorld::Ptr& consumable, const MWWorld::Ptr& actor) const override;
 
             void adjustScale (const MWWorld::ConstPtr &ptr, osg::Vec3f &scale, bool rendering) const override;
             /// @param rendering Indicates if the scale to adjust is for the rendering mesh, or for the collision mesh
diff --git a/apps/openmw/mwmechanics/aicombataction.cpp b/apps/openmw/mwmechanics/aicombataction.cpp
index 3b3ff1da89..c4d2bf9bec 100644
--- a/apps/openmw/mwmechanics/aicombataction.cpp
+++ b/apps/openmw/mwmechanics/aicombataction.cpp
@@ -85,8 +85,7 @@ namespace MWMechanics
 
     void ActionPotion::prepare(const MWWorld::Ptr &actor)
     {
-        actor.getClass().apply(actor, mPotion.getCellRef().getRefId(), actor);
-        actor.getClass().getContainerStore(actor).remove(mPotion, 1, actor);
+        actor.getClass().consume(mPotion, actor);
     }
 
     void ActionWeapon::prepare(const MWWorld::Ptr &actor)
diff --git a/apps/openmw/mwworld/actionapply.cpp b/apps/openmw/mwworld/actionapply.cpp
index e3699a6ac3..1699a6aa53 100644
--- a/apps/openmw/mwworld/actionapply.cpp
+++ b/apps/openmw/mwworld/actionapply.cpp
@@ -17,11 +17,7 @@ namespace MWWorld
 
     void ActionApply::executeImp (const Ptr& actor)
     {
-        MWBase::Environment::get().getWorld()->breakInvisibility(actor);
-
-        actor.getClass().apply (actor, mId, actor);
-
-        actor.getClass().getContainerStore(actor).remove(getTarget(), 1, actor);
+        actor.getClass().consume(getTarget(), actor);
     }
 
 
@@ -32,11 +28,8 @@ namespace MWWorld
 
     void ActionApplyWithSkill::executeImp (const Ptr& actor)
     {
-        MWBase::Environment::get().getWorld()->breakInvisibility(actor);
-
-        if (actor.getClass().apply (actor, mId, actor) && mUsageType!=-1 && actor == MWMechanics::getPlayer())
+        bool consumed = actor.getClass().consume(getTarget(), actor);
+        if (consumed && mUsageType != -1 && actor == MWMechanics::getPlayer())
             actor.getClass().skillUsageSucceeded (actor, mSkillIndex, mUsageType);
-
-        actor.getClass().getContainerStore(actor).remove(getTarget(), 1, actor);
     }
 }
diff --git a/apps/openmw/mwworld/actioneat.cpp b/apps/openmw/mwworld/actioneat.cpp
index a1f568383b..c97c83c0c2 100644
--- a/apps/openmw/mwworld/actioneat.cpp
+++ b/apps/openmw/mwworld/actioneat.cpp
@@ -12,13 +12,7 @@ namespace MWWorld
 {
     void ActionEat::executeImp (const Ptr& actor)
     {
-        // remove used item (assume the item is present in inventory)
-        getTarget().getContainerStore()->remove(getTarget(), 1, actor);
-
-        // apply to actor
-        std::string id = getTarget().getCellRef().getRefId();
-
-        if (actor.getClass().apply (actor, id, actor) && actor == MWMechanics::getPlayer())
+        if (actor.getClass().consume(getTarget(), actor) && actor == MWMechanics::getPlayer())
             actor.getClass().skillUsageSucceeded (actor, ESM::Skill::Alchemy, 1);
     }
 
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index f8a9164fa2..f9b5c53ebd 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -40,7 +40,7 @@ namespace MWWorld
     void Class::insertObjectPhysics(const Ptr& ptr, const std::string& mesh, const osg::Quat& rotation, MWPhysics::PhysicsSystem& physics) const
     {}
 
-    bool Class::apply (const MWWorld::Ptr& ptr, const std::string& id,  const MWWorld::Ptr& actor) const
+    bool Class::consume(const MWWorld::Ptr& consumable, const MWWorld::Ptr& actor) const
     {
         return false;
     }
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index 8c52021256..dcef942367 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -220,13 +220,8 @@ namespace MWWorld
             virtual float getNormalizedEncumbrance (const MWWorld::Ptr& ptr) const;
             ///< Returns encumbrance re-scaled to capacity
 
-            virtual bool apply (const MWWorld::Ptr& ptr, const std::string& id,
-                const MWWorld::Ptr& actor) const;
-            ///< Apply \a id on \a ptr.
-            /// \param actor Actor that is resposible for the ID being applied to \a ptr.
-            /// \return Any effect?
-            ///
-            /// (default implementation: ignore and return false)
+            virtual bool consume(const MWWorld::Ptr& consumable, const MWWorld::Ptr& actor) const;
+            /// Consume an item, e. g. a potion.
 
             virtual void skillUsageSucceeded (const MWWorld::Ptr& ptr, int skill, int usageType, float extraFactor=1.f) const;
             ///< Inform actor \a ptr that a skill use has succeeded.

From 3761e7b24ec235c7afe8bcf1e324c815c5ebd33e Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Thu, 12 May 2022 18:03:50 +0200
Subject: [PATCH 2660/2859] Pass a 0-count object to onConsume instead of the
 record id

---
 apps/openmw/mwbase/luamanager.hpp                       | 2 +-
 apps/openmw/mwclass/npc.cpp                             | 2 +-
 apps/openmw/mwlua/localscripts.cpp                      | 2 +-
 apps/openmw/mwlua/localscripts.hpp                      | 2 +-
 apps/openmw/mwlua/luamanagerimp.cpp                     | 5 +++--
 apps/openmw/mwlua/luamanagerimp.hpp                     | 2 +-
 docs/source/reference/lua-scripting/engine_handlers.rst | 6 ++++--
 7 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwbase/luamanager.hpp b/apps/openmw/mwbase/luamanager.hpp
index 6c1ce6a27b..c174dddce3 100644
--- a/apps/openmw/mwbase/luamanager.hpp
+++ b/apps/openmw/mwbase/luamanager.hpp
@@ -37,7 +37,7 @@ namespace MWBase
         virtual void deregisterObject(const MWWorld::Ptr& ptr) = 0;
         virtual void objectAddedToScene(const MWWorld::Ptr& ptr) = 0;
         virtual void objectRemovedFromScene(const MWWorld::Ptr& ptr) = 0;
-        virtual void appliedToObject(const MWWorld::Ptr& toPtr, std::string_view recordId, const MWWorld::Ptr& fromPtr) = 0;
+        virtual void itemConsumed(const MWWorld::Ptr& consumable, const MWWorld::Ptr& actor) = 0;
         virtual void objectActivated(const MWWorld::Ptr& object, const MWWorld::Ptr& actor) = 0;
         // TODO: notify LuaManager about other events
         // virtual void objectOnHit(const MWWorld::Ptr &ptr, float damage, bool ishealth, const MWWorld::Ptr &object,
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index d7a74ee7c1..74de6fb764 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -1105,7 +1105,7 @@ namespace MWClass
         MWBase::Environment::get().getWorld()->breakInvisibility(actor);
         MWMechanics::CastSpell cast(actor, actor);
         std::string recordId = consumable.getCellRef().getRefId();
-        MWBase::Environment::get().getLuaManager()->appliedToObject(actor, recordId, actor);
+        MWBase::Environment::get().getLuaManager()->itemConsumed(consumable, actor);
         actor.getClass().getContainerStore(actor).remove(consumable, 1, actor);
         return cast.cast(recordId);
     }
diff --git a/apps/openmw/mwlua/localscripts.cpp b/apps/openmw/mwlua/localscripts.cpp
index 1224411453..cca31361ff 100644
--- a/apps/openmw/mwlua/localscripts.cpp
+++ b/apps/openmw/mwlua/localscripts.cpp
@@ -177,7 +177,7 @@ namespace MWLua
             else
             {
                 static_assert(std::is_same_v<EventT, OnConsume>);
-                callEngineHandlers(mOnConsumeHandlers, arg.mRecordId);
+                callEngineHandlers(mOnConsumeHandlers, arg.mConsumable);
             }
         }, event);
     }
diff --git a/apps/openmw/mwlua/localscripts.hpp b/apps/openmw/mwlua/localscripts.hpp
index 58cf421d4a..ff2e2bff25 100644
--- a/apps/openmw/mwlua/localscripts.hpp
+++ b/apps/openmw/mwlua/localscripts.hpp
@@ -62,7 +62,7 @@ namespace MWLua
         };
         struct OnConsume
         {
-            std::string mRecordId;
+            LObject mConsumable;
         };
         using EngineEvent = std::variant<OnActive, OnInactive, OnConsume, OnActivated>;
 
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index b71f5919c3..5854820361 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -374,9 +374,10 @@ namespace MWLua
         mWorldView.getObjectRegistry()->deregisterPtr(ptr);
     }
 
-    void LuaManager::appliedToObject(const MWWorld::Ptr& toPtr, std::string_view recordId, const MWWorld::Ptr& fromPtr)
+    void LuaManager::itemConsumed(const MWWorld::Ptr& consumable, const MWWorld::Ptr& actor)
     {
-        mLocalEngineEvents.push_back({getId(toPtr), LocalScripts::OnConsume{std::string(recordId)}});
+        mWorldView.getObjectRegistry()->registerPtr(consumable);
+        mLocalEngineEvents.push_back({getId(actor), LocalScripts::OnConsume{LObject(getId(consumable), mWorldView.getObjectRegistry())}});
     }
 
     void LuaManager::objectActivated(const MWWorld::Ptr& object, const MWWorld::Ptr& actor)
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index 41eb076783..0e94e37f24 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -51,7 +51,7 @@ namespace MWLua
         void registerObject(const MWWorld::Ptr& ptr) override;
         void deregisterObject(const MWWorld::Ptr& ptr) override;
         void inputEvent(const InputEvent& event) override { mInputEvents.push_back(event); }
-        void appliedToObject(const MWWorld::Ptr& toPtr, std::string_view recordId, const MWWorld::Ptr& fromPtr) override;
+        void itemConsumed(const MWWorld::Ptr& consumable, const MWWorld::Ptr& actor) override;
         void objectActivated(const MWWorld::Ptr& object, const MWWorld::Ptr& actor) override;
 
         MWBase::LuaManager::ActorControls* getActorControls(const MWWorld::Ptr&) const override;
diff --git a/docs/source/reference/lua-scripting/engine_handlers.rst b/docs/source/reference/lua-scripting/engine_handlers.rst
index ca05c9b8e1..a731ceef6f 100644
--- a/docs/source/reference/lua-scripting/engine_handlers.rst
+++ b/docs/source/reference/lua-scripting/engine_handlers.rst
@@ -66,8 +66,10 @@ Engine handler is a function defined by a script, that can be called by the engi
       | the item is placed to the actor's inventory, (2) count of
       | the original item is set to zero, (3) and only then onActivated is
       | called on the original item, so self.count is already zero.
-  * - onConsume(recordId)
-    - Called if `recordId` (e.g. a potion) is consumed.
+  * - onConsume(item)
+    - | Called on an actor when they consume an item (e.g. a potion).
+      | Similarly to onActivated, the item has already been removed
+      | from the actor's inventory, and the count was set to zero.
 
 **Only for local scripts attached to a player**
 

From e03e0db55d45510e13737ee190ec78b824aa67e5 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 18 Jun 2022 02:44:56 +0200
Subject: [PATCH 2661/2859] Use std::string_view to access settings

There is no more need to copy std::string into a pair when need to call
std::map::find.

Remove unused resetPendingChange function.
---
 components/settings/categories.hpp | 14 +++++++-
 components/settings/settings.cpp   | 54 ++++++++++++++----------------
 components/settings/settings.hpp   | 39 +++++++++++----------
 3 files changed, 57 insertions(+), 50 deletions(-)

diff --git a/components/settings/categories.hpp b/components/settings/categories.hpp
index 6a2da2fa10..246d6c2a44 100644
--- a/components/settings/categories.hpp
+++ b/components/settings/categories.hpp
@@ -5,12 +5,24 @@
 #include <set>
 #include <string>
 #include <utility>
+#include <string_view>
 
 namespace Settings
 {
+    struct Less
+    {
+        using is_transparent = void;
+
+        bool operator()(const std::pair<std::string_view, std::string_view>& l,
+            const std::pair<std::string_view, std::string_view>& r) const
+        {
+            return l < r;
+        }
+    };
+
     using CategorySetting = std::pair<std::string, std::string>;
     using CategorySettingVector = std::set<CategorySetting>;
-    using CategorySettingValueMap = std::map<CategorySetting, std::string>;
+    using CategorySettingValueMap = std::map<CategorySetting, std::string, Less>;
 }
 
 #endif // COMPONENTS_SETTINGS_CATEGORIES_H
diff --git a/components/settings/settings.cpp b/components/settings/settings.cpp
index 99093d7a1d..ff4a40d707 100644
--- a/components/settings/settings.cpp
+++ b/components/settings/settings.cpp
@@ -71,9 +71,9 @@ void Manager::saveUser(const std::string &file)
     parser.saveSettingsFile(file, mUserSettings);
 }
 
-std::string Manager::getString(const std::string &setting, const std::string &category)
+std::string Manager::getString(std::string_view setting, std::string_view category)
 {
-    CategorySettingValueMap::key_type key (category, setting);
+    const auto key = std::make_pair(category, setting);
     CategorySettingValueMap::iterator it = mUserSettings.find(key);
     if (it != mUserSettings.end())
         return it->second;
@@ -82,11 +82,13 @@ std::string Manager::getString(const std::string &setting, const std::string &ca
     if (it != mDefaultSettings.end())
         return it->second;
 
-    throw std::runtime_error(std::string("Trying to retrieve a non-existing setting: ") + setting
-                             + ".\nMake sure the defaults.bin file was properly installed.");
+    std::string error("Trying to retrieve a non-existing setting: ");
+    error += setting;
+    error += ".\nMake sure the defaults.bin file was properly installed.";
+    throw std::runtime_error(error);
 }
 
-float Manager::getFloat (const std::string& setting, const std::string& category)
+float Manager::getFloat(std::string_view setting, std::string_view category)
 {
     const std::string& value = getString(setting, category);
     std::stringstream stream(value);
@@ -95,7 +97,7 @@ float Manager::getFloat (const std::string& setting, const std::string& category
     return number;
 }
 
-double Manager::getDouble (const std::string& setting, const std::string& category)
+double Manager::getDouble(std::string_view setting, std::string_view category)
 {
     const std::string& value = getString(setting, category);
     std::stringstream stream(value);
@@ -104,7 +106,7 @@ double Manager::getDouble (const std::string& setting, const std::string& catego
     return number;
 }
 
-int Manager::getInt (const std::string& setting, const std::string& category)
+int Manager::getInt(std::string_view setting, std::string_view category)
 {
     const std::string& value = getString(setting, category);
     std::stringstream stream(value);
@@ -113,7 +115,7 @@ int Manager::getInt (const std::string& setting, const std::string& category)
     return number;
 }
 
-std::int64_t Manager::getInt64 (const std::string& setting, const std::string& category)
+std::int64_t Manager::getInt64(std::string_view setting, std::string_view category)
 {
     const std::string& value = getString(setting, category);
     std::stringstream stream(value);
@@ -122,13 +124,13 @@ std::int64_t Manager::getInt64 (const std::string& setting, const std::string& c
     return number;
 }
 
-bool Manager::getBool (const std::string& setting, const std::string& category)
+bool Manager::getBool(std::string_view setting, std::string_view category)
 {
     const std::string& string = getString(setting, category);
     return Misc::StringUtils::ciEqual(string, "true");
 }
 
-osg::Vec2f Manager::getVector2 (const std::string& setting, const std::string& category)
+osg::Vec2f Manager::getVector2(std::string_view setting, std::string_view category)
 {
     const std::string& value = getString(setting, category);
     std::stringstream stream(value);
@@ -139,7 +141,7 @@ osg::Vec2f Manager::getVector2 (const std::string& setting, const std::string& c
     return {x, y};
 }
 
-osg::Vec3f Manager::getVector3 (const std::string& setting, const std::string& category)
+osg::Vec3f Manager::getVector3(std::string_view setting, std::string_view category)
 {
     const std::string& value = getString(setting, category);
     std::stringstream stream(value);
@@ -150,75 +152,69 @@ osg::Vec3f Manager::getVector3 (const std::string& setting, const std::string& c
     return {x, y, z};
 }
 
-void Manager::setString(const std::string &setting, const std::string &category, const std::string &value)
+void Manager::setString(std::string_view setting, std::string_view category, const std::string &value)
 {
-    CategorySettingValueMap::key_type key (category, setting);
-
-    auto found = mUserSettings.find(key);
+    auto found = mUserSettings.find(std::make_pair(category, setting));
     if (found != mUserSettings.end())
     {
         if (found->second == value)
             return;
     }
 
+    CategorySettingValueMap::key_type key(category, setting);
+
     mUserSettings[key] = value;
 
-    mChangedSettings.insert(key);
+    mChangedSettings.insert(std::move(key));
 }
 
-void Manager::setInt (const std::string& setting, const std::string& category, const int value)
+void Manager::setInt(std::string_view setting, std::string_view category, const int value)
 {
     std::ostringstream stream;
     stream << value;
     setString(setting, category, stream.str());
 }
 
-void Manager::setInt64 (const std::string& setting, const std::string& category, const std::int64_t value)
+void Manager::setInt64(std::string_view setting, std::string_view category, const std::int64_t value)
 {
     std::ostringstream stream;
     stream << value;
     setString(setting, category, stream.str());
 }
 
-void Manager::setFloat (const std::string &setting, const std::string &category, const float value)
+void Manager::setFloat (std::string_view setting, std::string_view category, const float value)
 {
     std::ostringstream stream;
     stream << value;
     setString(setting, category, stream.str());
 }
 
-void Manager::setDouble (const std::string &setting, const std::string &category, const double value)
+void Manager::setDouble (std::string_view setting, std::string_view category, const double value)
 {
     std::ostringstream stream;
     stream << value;
     setString(setting, category, stream.str());
 }
 
-void Manager::setBool(const std::string &setting, const std::string &category, const bool value)
+void Manager::setBool(std::string_view setting, std::string_view category, const bool value)
 {
     setString(setting, category, value ? "true" : "false");
 }
 
-void Manager::setVector2 (const std::string &setting, const std::string &category, const osg::Vec2f value)
+void Manager::setVector2 (std::string_view setting, std::string_view category, const osg::Vec2f value)
 {
     std::ostringstream stream;
     stream << value.x() << " " << value.y();
     setString(setting, category, stream.str());
 }
 
-void Manager::setVector3 (const std::string &setting, const std::string &category, const osg::Vec3f value)
+void Manager::setVector3 (std::string_view setting, std::string_view category, const osg::Vec3f value)
 {
     std::ostringstream stream;
     stream << value.x() << ' ' << value.y() << ' ' << value.z();
     setString(setting, category, stream.str());
 }
 
-void Manager::resetPendingChange(const std::string &setting, const std::string &category)
-{
-    CategorySettingValueMap::key_type key (category, setting);
-    mChangedSettings.erase(key);
-}
-
 CategorySettingVector Manager::getPendingChanges()
 {
     return mChangedSettings;
diff --git a/components/settings/settings.hpp b/components/settings/settings.hpp
index eb35ddbe8c..32157bd3d2 100644
--- a/components/settings/settings.hpp
+++ b/components/settings/settings.hpp
@@ -6,6 +6,8 @@
 #include <set>
 #include <map>
 #include <string>
+#include <string_view>
+
 #include <osg/Vec2f>
 #include <osg/Vec3f>
 
@@ -44,9 +46,6 @@ namespace Settings
         static void saveUser (const std::string& file);
         ///< save user settings to file
 
-        static void resetPendingChange(const std::string &setting, const std::string &category);
-        ///< resets a single pending change
-
         static void resetPendingChanges();
         ///< resets the list of all pending changes
 
@@ -59,23 +58,23 @@ namespace Settings
         static CategorySettingVector getPendingChanges(const CategorySettingVector& filter);
         ///< returns the list of changed settings intersecting with the filter
 
-        static int getInt (const std::string& setting, const std::string& category);
-        static std::int64_t getInt64 (const std::string& setting, const std::string& category);
-        static float getFloat (const std::string& setting, const std::string& category);
-        static double getDouble (const std::string& setting, const std::string& category);
-        static std::string getString (const std::string& setting, const std::string& category);
-        static bool getBool (const std::string& setting, const std::string& category);
-        static osg::Vec2f getVector2 (const std::string& setting, const std::string& category);
-        static osg::Vec3f getVector3 (const std::string& setting, const std::string& category);
-
-        static void setInt (const std::string& setting, const std::string& category, int value);
-        static void setInt64 (const std::string& setting, const std::string& category, std::int64_t value);
-        static void setFloat (const std::string& setting, const std::string& category, float value);
-        static void setDouble (const std::string& setting, const std::string& category, double value);
-        static void setString (const std::string& setting, const std::string& category, const std::string& value);
-        static void setBool (const std::string& setting, const std::string& category, bool value);
-        static void setVector2 (const std::string& setting, const std::string& category, osg::Vec2f value);
-        static void setVector3 (const std::string& setting, const std::string& category, osg::Vec3f value);
+        static int getInt(std::string_view setting, std::string_view category);
+        static std::int64_t getInt64(std::string_view setting, std::string_view category);
+        static float getFloat(std::string_view setting, std::string_view category);
+        static double getDouble(std::string_view setting, std::string_view category);
+        static std::string getString(std::string_view setting, std::string_view category);
+        static bool getBool(std::string_view setting, std::string_view category);
+        static osg::Vec2f getVector2(std::string_view setting, std::string_view category);
+        static osg::Vec3f getVector3(std::string_view setting, std::string_view category);
+
+        static void setInt(std::string_view setting, std::string_view category, int value);
+        static void setInt64(std::string_view setting, std::string_view category, std::int64_t value);
+        static void setFloat(std::string_view setting, std::string_view category, float value);
+        static void setDouble(std::string_view setting, std::string_view category, double value);
+        static void setString(std::string_view setting, std::string_view category, const std::string& value);
+        static void setBool(std::string_view setting, std::string_view category, bool value);
+        static void setVector2(std::string_view setting, std::string_view category, osg::Vec2f value);
+        static void setVector3(std::string_view setting, std::string_view category, osg::Vec3f value);
     };
 
 }

From c3d23b49483ac6b4f99bdf7af06840a293fc1d18 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Sat, 18 Jun 2022 22:43:12 +0100
Subject: [PATCH 2662/2859] Extra hack to make this build on Ubuntu with old
 CMake

---
 components/vfs/filesystemarchive.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/vfs/filesystemarchive.cpp b/components/vfs/filesystemarchive.cpp
index 0caa4c62b9..8b74fb788a 100644
--- a/components/vfs/filesystemarchive.cpp
+++ b/components/vfs/filesystemarchive.cpp
@@ -34,7 +34,7 @@ namespace VFS
                 if(std::filesystem::is_directory (*i))
                     continue;
 
-                std::u8string proper = i->path ().u8string ();
+                auto proper = i->path ().u8string ();
 
                 FileSystemArchiveFile file(std::string((char*)proper.c_str(), proper.size()));
 

From 3baf3462000ea9169bf82b21ce988cf51156ad16 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Sun, 19 Jun 2022 08:58:12 +0300
Subject: [PATCH 2663/2859] Use numeric_limits for indefinite idle looping

---
 apps/openmw/mwmechanics/character.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index b518ead034..e3cbd3bb62 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -681,7 +681,7 @@ void CharacterController::refreshIdleAnims(CharacterState idle, bool force)
     }
 
     MWRender::Animation::AnimPriority priority = getIdlePriority(mIdleState);
-    size_t numLoops = ~0ul;
+    size_t numLoops = std::numeric_limits<size_t>::max();
 
     // Only play "idleswim" or "idlesneak" if they exist. Otherwise, fallback to
     // "idle"+weapon or "idle".

From c1f8d7c20aa0271a9e961deacceac44c8b3f754f Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sun, 19 Jun 2022 17:31:18 +0200
Subject: [PATCH 2664/2859] Make comment style consistently inconsistent

---
 apps/openmw/mwworld/class.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index dcef942367..8b62d21064 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -221,7 +221,7 @@ namespace MWWorld
             ///< Returns encumbrance re-scaled to capacity
 
             virtual bool consume(const MWWorld::Ptr& consumable, const MWWorld::Ptr& actor) const;
-            /// Consume an item, e. g. a potion.
+            ///< Consume an item, e. g. a potion.
 
             virtual void skillUsageSucceeded (const MWWorld::Ptr& ptr, int skill, int usageType, float extraFactor=1.f) const;
             ///< Inform actor \a ptr that a skill use has succeeded.

From 36a1e18b6f8890e73687cae8a61c96726769385e Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sun, 19 Jun 2022 17:31:53 +0200
Subject: [PATCH 2665/2859] Increment Lua API revision

---
 apps/openmw/mwlua/luabindings.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index c9bf99462a..e95d415bf5 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -47,7 +47,7 @@ namespace MWLua
     {
         auto* lua = context.mLua;
         sol::table api(lua->sol(), sol::create);
-        api["API_REVISION"] = 23;
+        api["API_REVISION"] = 24;
         api["quit"] = [lua]()
         {
             Log(Debug::Warning) << "Quit requested by a Lua script.\n" << lua->debugTraceback();

From a8e409deef311e709047598b84057b01d1dbd269 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Sun, 19 Jun 2022 19:40:59 +0300
Subject: [PATCH 2666/2859] Make launcher viewing distance setup more precise

---
 apps/launcher/advancedpage.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index 6566bd8d51..f61f8e1fdd 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -74,12 +74,12 @@ namespace
 
     double convertToCells(double unitRadius)
     {
-        return std::round((unitRadius + 1024) / CellSizeInUnits);
+        return unitRadius / CellSizeInUnits;
     }
 
-    double convertToUnits(double CellGridRadius)
+    int convertToUnits(double CellGridRadius)
     {
-        return CellSizeInUnits * CellGridRadius - 1024;
+        return static_cast<int>(CellSizeInUnits * CellGridRadius);
     }
 }
 
@@ -284,10 +284,10 @@ void Launcher::AdvancedPage::saveSettings()
         }
 
         saveSettingBool(activeGridObjectPagingCheckBox, "object paging active grid", "Terrain");
-        double viewingDistance = viewingDistanceComboBox->value();
-        if (viewingDistance != convertToCells(Settings::Manager::getInt("viewing distance", "Camera")))
+        int viewingDistance = convertToUnits(viewingDistanceComboBox->value());
+        if (viewingDistance != Settings::Manager::getInt("viewing distance", "Camera"))
         {
-            Settings::Manager::setInt("viewing distance", "Camera", convertToUnits(viewingDistance));
+            Settings::Manager::setInt("viewing distance", "Camera", viewingDistance);
         }
         double objectPagingMinSize = objectPagingMinSizeComboBox->value();
         if (objectPagingMinSize != Settings::Manager::getDouble("object paging min size", "Terrain"))

From aa2fab8db5bd5d5c58e570d8d8f52c44d4aaaa3e Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 19 Jun 2022 20:16:31 +0200
Subject: [PATCH 2667/2859] Enable collision for postponed objects when any
 object is disabled

---
 apps/openmw/mwworld/scene.cpp    | 45 ++++++++++++++++++--------------
 apps/openmw/mwworld/scene.hpp    |  2 ++
 apps/openmw/mwworld/worldimp.cpp |  3 +++
 3 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 9cd0c2e4e4..24b4786759 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -575,26 +575,7 @@ namespace MWWorld
             return cellsPositionsToLoad;
         };
 
-        for(const auto& cell : mActiveCells)
-        {
-            cell->forEach([&](const MWWorld::Ptr& ptr)
-            {
-                if(ptr.mRef->mData.mPhysicsPostponed)
-                {
-                    ptr.mRef->mData.mPhysicsPostponed = false;
-                    if (ptr.mRef->mData.isEnabled() && ptr.mRef->mData.getCount() > 0)
-                    {
-                        std::string model = getModel(ptr, MWBase::Environment::get().getResourceSystem()->getVFS());
-                        if (!model.empty())
-                        {
-                            const auto rotation = makeNodeRotation(ptr, RotationOrder::direct);
-                            ptr.getClass().insertObjectPhysics(ptr, model, rotation, *mPhysics);
-                        }
-                    }
-                }
-                return true;
-            });
-        }
+        addPostponedPhysicsObjects();
 
         auto cellsPositionsToLoad = cellsToLoad(mActiveCells,mHalfGridSize);
 
@@ -637,6 +618,30 @@ namespace MWWorld
         mNavigator.wait(*loadingListener, DetourNavigator::WaitConditionType::requiredTilesPresent);
     }
 
+    void Scene::addPostponedPhysicsObjects()
+    {
+        for(const auto& cell : mActiveCells)
+        {
+            cell->forEach([&](const MWWorld::Ptr& ptr)
+            {
+                if(ptr.mRef->mData.mPhysicsPostponed)
+                {
+                    ptr.mRef->mData.mPhysicsPostponed = false;
+                    if (ptr.mRef->mData.isEnabled() && ptr.mRef->mData.getCount() > 0)
+                    {
+                        std::string model = getModel(ptr, MWBase::Environment::get().getResourceSystem()->getVFS());
+                        if (!model.empty())
+                        {
+                            const auto rotation = makeNodeRotation(ptr, RotationOrder::direct);
+                            ptr.getClass().insertObjectPhysics(ptr, model, rotation, *mPhysics);
+                        }
+                    }
+                }
+                return true;
+            });
+        }
+    }
+
     void Scene::testExteriorCells()
     {
         // Note: temporary disable ICO to decrease memory usage
diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp
index fd66d71cf2..c504a2cf73 100644
--- a/apps/openmw/mwworld/scene.hpp
+++ b/apps/openmw/mwworld/scene.hpp
@@ -174,6 +174,8 @@ namespace MWWorld
             void removeObjectFromScene (const Ptr& ptr, bool keepActive = false);
             ///< Remove an object from the scene, but not from the world model.
 
+            void addPostponedPhysicsObjects();
+
             void removeFromPagedRefs(const Ptr &ptr);
 
             void updateObjectRotation(const Ptr& ptr, RotationOrder order);
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 0c0b3d593d..bec6a9064a 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -881,7 +881,10 @@ namespace MWWorld
         }
 
         if(mWorldScene->getActiveCells().find (reference.getCell())!=mWorldScene->getActiveCells().end() && reference.getRefData().getCount())
+        {
             mWorldScene->removeObjectFromScene (reference);
+            mWorldScene->addPostponedPhysicsObjects();
+        }
     }
 
     void World::advanceTime (double hours, bool incremental)

From 66aa546e974b2751a3588188566350cb1a86d5db Mon Sep 17 00:00:00 2001
From: Cody Glassman <glassmancody.info@gmail.com>
Date: Mon, 20 Jun 2022 06:58:40 +0000
Subject: [PATCH 2668/2859] [Postprocessing] Small cleanup

---
 apps/openmw/mwrender/postprocessor.cpp | 34 +++++++++-----------------
 components/fx/technique.hpp            |  4 +++
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/apps/openmw/mwrender/postprocessor.cpp b/apps/openmw/mwrender/postprocessor.cpp
index fe3d616f23..fc9bcb693a 100644
--- a/apps/openmw/mwrender/postprocessor.cpp
+++ b/apps/openmw/mwrender/postprocessor.cpp
@@ -228,22 +228,11 @@ namespace MWRender
 
         mViewer->setSceneData(this);
         mViewer->getCamera()->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT);
-        mViewer->getCamera()->setImplicitBufferAttachmentMask(0, 0);
         mViewer->getCamera()->getGraphicsContext()->setResizedCallback(new ResizedCallback(this));
         mViewer->getCamera()->setUserData(this);
 
         setCullCallback(mStateUpdater);
         mHUDCamera->setCullCallback(new HUDCullCallback);
-
-        static bool init = false;
-
-        if (init)
-        {
-            resize();
-            init = true;
-        }
-
-        init = true;
     }
 
     void PostProcessor::disable()
@@ -631,7 +620,7 @@ namespace MWRender
                     auto it = technique->getRenderTargetsMap().find(whitelist);
                     if (it != technique->getRenderTargetsMap().end() && renderTargetCache[it->second.mTarget])
                     {
-                        subPass.mStateSet->setTextureAttributeAndModes(subTexUnit, renderTargetCache[it->second.mTarget]);
+                        subPass.mStateSet->setTextureAttribute(subTexUnit, renderTargetCache[it->second.mTarget]);
                         subPass.mStateSet->addUniform(new osg::Uniform(std::string(it->first).c_str(), subTexUnit++));
                     }
                 }
@@ -660,7 +649,7 @@ namespace MWRender
             return Status_Error;
         }
 
-        if (!technique || Misc::StringUtils::ciEqual(technique->getName(), "main") || (location.has_value() && location.value() <= 0))
+        if (!technique || technique->getLocked() || (location.has_value() && location.value() <= 0))
             return Status_Error;
 
         disableTechnique(technique, false);
@@ -675,7 +664,7 @@ namespace MWRender
 
     PostProcessor::Status PostProcessor::disableTechnique(std::shared_ptr<fx::Technique> technique, bool dirty)
     {
-        if (Misc::StringUtils::ciEqual(technique->getName(), "main"))
+        if (technique->getLocked())
             return Status_Error;
 
         auto it = std::find(mTechniques.begin(), mTechniques.end(), technique);
@@ -819,20 +808,21 @@ namespace MWRender
         std::vector<std::string> techniqueStrings;
         Misc::StringUtils::split(Settings::Manager::getString("chain", "Post Processing"), techniqueStrings, ",");
 
-        techniqueStrings.insert(techniqueStrings.begin(), "main");
+        const std::string& mainIdentifier = "main";
+
+        auto main = loadTechnique(mainIdentifier);
+
+        if (main)
+            main->setLocked(true);
+
+        mTechniques.push_back(std::move(main));
 
         for (auto& techniqueName : techniqueStrings)
         {
             Misc::StringUtils::trim(techniqueName);
 
-            if (techniqueName.empty())
-                continue;
-
-            if ((&techniqueName != &techniqueStrings.front()) && techniqueName == "main")
-            {
-                Log(Debug::Warning) << "main.omwfx techniqued specified in chain, this is not allowed. technique file will be ignored if it exists.";
+            if (techniqueName.empty() || Misc::StringUtils::ciEqual(techniqueName, mainIdentifier))
                 continue;
-            }
 
             mTechniques.push_back(loadTechnique(techniqueName));
         }
diff --git a/components/fx/technique.hpp b/components/fx/technique.hpp
index 498d86dc0a..1cb4e3e743 100644
--- a/components/fx/technique.hpp
+++ b/components/fx/technique.hpp
@@ -175,6 +175,9 @@ namespace fx
 
         bool getDynamic() const { return mDynamic; }
 
+        void setLocked(bool locked) { mLocked = locked; }
+        bool getLocked() const { return mLocked; }
+
     private:
         [[noreturn]] void error(const std::string& msg);
 
@@ -293,6 +296,7 @@ namespace fx
         std::string mLastError;
 
         bool mDynamic = false;
+        bool mLocked = false;
     };
 
     template<> void Technique::parseBlockImp<Lexer::Shared>();

From bd6716d89d869478f3e4f8b1444463fa1cf7743e Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Sun, 19 Jun 2022 22:21:41 +0300
Subject: [PATCH 2669/2859] Give AITravel time to end if the actor is close to
 the destination

---
 apps/openmw/mwmechanics/aitravel.cpp | 62 +++++++++++++---------------
 apps/openmw/mwmechanics/aitravel.hpp |  2 +-
 2 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/apps/openmw/mwmechanics/aitravel.cpp b/apps/openmw/mwmechanics/aitravel.cpp
index 5d453c4b44..378099e7d1 100644
--- a/apps/openmw/mwmechanics/aitravel.cpp
+++ b/apps/openmw/mwmechanics/aitravel.cpp
@@ -17,6 +17,8 @@
 namespace
 {
 
+    constexpr float TRAVEL_FINISH_TIME = 2.f;
+
 bool isWithinMaxRange(const osg::Vec3f& pos1, const osg::Vec3f& pos2)
 {
     // Maximum travel distance for vanilla compatibility.
@@ -25,24 +27,17 @@ bool isWithinMaxRange(const osg::Vec3f& pos1, const osg::Vec3f& pos2)
     return (pos1 - pos2).length2() <= 7168*7168;
 }
 
-    float getActorRadius(const MWWorld::ConstPtr& actor)
-    {
-        const osg::Vec3f halfExtents = MWBase::Environment::get().getWorld()->getPathfindingHalfExtents(actor);
-        return std::max(halfExtents.x(), std::max(halfExtents.y(), halfExtents.z()));
-    }
 }
 
 namespace MWMechanics
 {
     AiTravel::AiTravel(float x, float y, float z, bool repeat, AiTravel*)
-        : TypedAiPackage<AiTravel>(repeat), mX(x), mY(y), mZ(z), mHidden(false)
-        , mDestinationCheck(MWBase::Environment::get().getWorld()->getPrng())
+        : TypedAiPackage<AiTravel>(repeat), mX(x), mY(y), mZ(z), mHidden(false), mDestinationTimer(TRAVEL_FINISH_TIME)
     {
     }
 
     AiTravel::AiTravel(float x, float y, float z, AiInternalTravel* derived)
-        : TypedAiPackage<AiTravel>(derived), mX(x), mY(y), mZ(z), mHidden(true)
-        , mDestinationCheck(MWBase::Environment::get().getWorld()->getPrng())
+        : TypedAiPackage<AiTravel>(derived), mX(x), mY(y), mZ(z), mHidden(true), mDestinationTimer(TRAVEL_FINISH_TIME)
     {
     }
 
@@ -53,7 +48,7 @@ namespace MWMechanics
 
     AiTravel::AiTravel(const ESM::AiSequence::AiTravel *travel)
         : TypedAiPackage<AiTravel>(travel->mRepeat), mX(travel->mData.mX), mY(travel->mData.mY), mZ(travel->mData.mZ), mHidden(false)
-        , mDestinationCheck(MWBase::Environment::get().getWorld()->getPrng())
+        , mDestinationTimer(TRAVEL_FINISH_TIME)
     {
         // Hidden ESM::AiSequence::AiTravel package should be converted into MWMechanics::AiInternalTravel type
         assert(!travel->mHidden);
@@ -78,35 +73,34 @@ namespace MWMechanics
         if (!isWithinMaxRange(targetPos, actorPos))
             return mHidden;
 
-        // Unfortunately, with vanilla assets destination is sometimes blocked by other actor.
-        // If we got close to target, check for actors nearby. If they are, finish AI package.
-        if (mDestinationCheck.update(duration) == Misc::TimerStatus::Elapsed)
-        {
-            std::vector<MWWorld::Ptr> occupyingActors;
-            if (isAreaOccupiedByOtherActor(actor, targetPos, true, &occupyingActors))
-            {
-                const float actorRadius = getActorRadius(actor);
-                const float distanceToTarget = distance(actorPos, targetPos);
-                for (const MWWorld::Ptr& other : occupyingActors)
-                {
-                    const float otherRadius = getActorRadius(other);
-                    const auto [minRadius, maxRadius] = std::minmax(actorRadius, otherRadius);
-                    constexpr float toleranceFactor = 1.25;
-                    if (minRadius * toleranceFactor + maxRadius > distanceToTarget)
-                    {
-                        actor.getClass().getMovementSettings(actor).mPosition[1] = 0;
-                        return true;
-                    }
-                }
-            }
-        }
-
         if (pathTo(actor, targetPos, duration))
         {
             actor.getClass().getMovementSettings(actor).mPosition[1] = 0;
             return true;
         }
-        return false;
+
+        // If we've been close enough to the destination for some time give up like Morrowind.
+        // The end condition should be pretty much accurate.
+        // FIXME: But the timing isn't. Right now we're being very generous,
+        // but Morrowind might stop the actor prematurely under unclear conditions.
+
+        // Note Morrowind uses the halved eye level, but this is close enough.
+        float dist = distanceIgnoreZ(actorPos, targetPos) - MWBase::Environment::get().getWorld()->getHalfExtents(actor).z();
+        const float endTolerance = std::max(64.f, actor.getClass().getCurrentSpeed(actor) * duration);
+
+        // Even if we have entered the threshold, we might have been pushed away. Reset the timer if we're currently too far.
+        if (dist > endTolerance)
+        {
+            mDestinationTimer = TRAVEL_FINISH_TIME;
+            return false;
+        }
+
+        mDestinationTimer -= duration;
+        if (mDestinationTimer > 0)
+            return false;
+
+        actor.getClass().getMovementSettings(actor).mPosition[1] = 0;
+        return true;
     }
 
     void AiTravel::fastForward(const MWWorld::Ptr& actor, AiState& state)
diff --git a/apps/openmw/mwmechanics/aitravel.hpp b/apps/openmw/mwmechanics/aitravel.hpp
index 303df7b105..60a68d9cc5 100644
--- a/apps/openmw/mwmechanics/aitravel.hpp
+++ b/apps/openmw/mwmechanics/aitravel.hpp
@@ -53,7 +53,7 @@ namespace MWMechanics
 
             const bool mHidden;
 
-            AiReactionTimer mDestinationCheck;
+            float mDestinationTimer;
     };
 
     struct AiInternalTravel final : public AiTravel

From 37a440a0ee70622772f3d304deffa075ccf99c4c Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Mon, 20 Jun 2022 16:26:52 +0200
Subject: [PATCH 2670/2859] add one include back

---
 apps/opencs/model/doc/runner.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/opencs/model/doc/runner.cpp b/apps/opencs/model/doc/runner.cpp
index 9320941841..3b2178ce7c 100644
--- a/apps/opencs/model/doc/runner.cpp
+++ b/apps/opencs/model/doc/runner.cpp
@@ -3,6 +3,7 @@
 #include <QDir>
 #include <QTemporaryFile>
 #include <QTextStream>
+#include <QCoreApplication>
 
 #include "operationholder.hpp"
 

From 116825a5217b2b0248e960bb9ead78dae9af576d Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 20 Jun 2022 19:52:24 +0200
Subject: [PATCH 2671/2859] Align the changelog with the milestone

---
 CHANGELOG.md | 52 ++++++++++++++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f1014a6a8..b991b4fd28 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,12 +12,12 @@
     Bug #3846: Strings starting with "-" fail to compile if not enclosed in quotes
     Bug #3855: AI sometimes spams defensive spells
     Bug #3905: Great House Dagoth issues
-    Bug #4203: Resurrecting an actor should close the loot GUI
+    Bug #4203: Resurrecting an actor doesn't close the loot GUI
     Bug #4376: Moved actors don't respawn in their original cells
     Bug #4389: NPC's lips do not move if his head model has the NiBSAnimationNode root node
     Bug #4602: Robert's Bodies: crash inside createInstance()
     Bug #4700: Editor: Incorrect command implementation
-    Bug #4744: Invisible particles must still be processed
+    Bug #4744: Invisible particles aren't always processed
     Bug #4949: Incorrect particle lighting
     Bug #5054: Non-biped creatures don't use spellcast equip/unequip animations
     Bug #5088: Sky abruptly changes direction during certain weather transitions
@@ -26,7 +26,7 @@
     Bug #5192: Actor turn rate is too slow
     Bug #5207: Loose summons can be present in scene
     Bug #5279: Ingame console stops auto-scrolling after clicking output
-    Bug #5377: console does not appear after using menutest in inventory
+    Bug #5377: Console does not appear after using menutest in inventory
     Bug #5379: Wandering NPCs falling through cantons
     Bug #5394: Windows snapping no longer works
     Bug #5434: Pinned windows shouldn't cover breath progress bar
@@ -40,15 +40,15 @@
     Bug #5788: Texture editing parses the selected indexes wrongly
     Bug #5801: A multi-effect spell with the intervention effects and recall always favors Almsivi intervention
     Bug #5842: GetDisposition adds temporary disposition change from different actors
+    Bug #5858: Visible modal windows and dropdowns crashing game on exit
     Bug #5863: GetEffect should return true after the player has teleported
     Bug #5913: Failed assertion during Ritual of Trees quest
-    Bug #5928: Glow in the Dahrk functionality used without mod installed
     Bug #5937: Lights always need to be rotated by 90 degrees
     Bug #5989: Simple water isn't affected by texture filter settings
-    Bug #6037: Morrowind Content Language Cannot be Set to English in OpenMW Launcher
+    Bug #6037: Launcher: Morrowind content language cannot be set to English
     Bug #6051: NaN water height in ESM file is not handled gracefully
-    Bug #6066: addtopic "return" does not work from within script. No errors thrown
-    Bug #6067: esp loader fails in for certain subrecord orders
+    Bug #6066: Addtopic "return" does not work from within script. No errors thrown
+    Bug #6067: ESP loader fails for certain subrecord orders
     Bug #6087: Bound items added directly to the inventory disappear if their corresponding spell effect ends
     Bug #6101: Disarming trapped unlocked owned objects isn't considered a crime
     Bug #6107: Fatigue is incorrectly recalculated when fortify effect is applied or removed
@@ -58,7 +58,8 @@
     Bug #6129: Player avatar not displayed correctly for large window sizes when GUI scaling active
     Bug #6131: Item selection in the avatar window not working correctly for large window sizes
     Bug #6133: Cannot reliably sneak or steal in the sight of the NPCs siding with player
-    Bug #6143: Capturing a screenshot makes engine to be a temporary unresponsive
+    Bug #6142: Groundcover plugins change cells flags
+    Bug #6143: Capturing a screenshot renders the engine temporarily unresponsive
     Bug #6165: Paralyzed player character can pickup items when the inventory is open
     Bug #6168: Weather particles flicker for a frame at start of storms
     Bug #6172: Some creatures can't open doors
@@ -69,15 +70,17 @@
     Bug #6197: Infinite Casting Loop
     Bug #6253: Multiple instances of Reflect stack additively
     Bug #6255: Reflect is different from vanilla
+    Bug #6256: Crash on exit with enabled shadows and statically linked OpenSceneGraph
     Bug #6258: Barter menu glitches out when modifying prices
     Bug #6273: Respawning NPCs rotation is inconsistent
+    Bug #6276: Deleted groundcover instances are not deleted in game
     Bug #6282: Laura craft doesn't follow the player character
     Bug #6283: Avis Dorsey follows you after her death
     Bug #6285: Brush template drawing and terrain selection drawing performance is very bad
     Bug #6289: Keyword search in dialogues expected the text to be all ASCII characters
     Bug #6291: Can't pickup the dead mage's journal from the mysterious hunter mod
     Bug #6302: Teleporting disabled actor breaks its disabled state
-    Bug #6303: After "go to jail" weapon can stuck in the ready to attack state
+    Bug #6303: After "go to jail" weapon can be stuck in the ready to attack state
     Bug #6307: Pathfinding in Infidelities quest from Tribunal addon is broken
     Bug #6321: Arrow enchantments should always be applied to the target
     Bug #6322: Total sold/cost should reset to 0 when there are no items offered
@@ -88,11 +91,13 @@
     Bug #6333: Werewolf stat changes should be implemented as damage/fortifications
     Bug #6343: Magic projectile speed doesn't take race weight into account
     Bug #6347: PlaceItem/PlaceItemCell/PlaceAt should work with levelled creatures
-    Bug #6354: SFX abruptly cut off after crossing max distance; implement soft fading of sound effects
+    Bug #6354: SFX abruptly cut off after crossing max distance
     Bug #6358: Changeweather command does not report an error when entering non-existent region
     Bug #6363: Some scripts in Morrowland fail to work
     Bug #6376: Creatures should be able to use torches
     Bug #6386: Artifacts in water reflection due to imprecise screen-space coordinate computation
+    Bug #6389: Maximum light distance setting doesn't affect water reflections
+    Bug #6395: Translations with longer tab titles may cause tabs to disappear from the options menu
     Bug #6396: Inputting certain Unicode characters triggers an assertion
     Bug #6416: Morphs are applied to the wrong target
     Bug #6417: OpenMW doesn't always use the right node to accumulate movement
@@ -110,7 +115,6 @@
     Bug #6606: Quests with multiple IDs cannot always be restarted
     Bug #6653: With default settings the in-game console doesn't fit into screen
     Bug #6655: Constant effect absorb attribute causes the game to break
-    Bug #6631: Fix ffmpeg avio API usage causing hangs in ffmpeg version 5
     Bug #6667: Pressing the Esc key while resting or waiting causes black screen.
     Bug #6670: Dialogue order is incorrect
     Bug #6672: Garbage object refs in groundcover plugins like Vurt's grass plugins
@@ -127,7 +131,7 @@
     Feature #890: OpenMW-CS: Column filtering
     Feature #1465: "Reset" argument for AI functions
     Feature #2491: Ability to make OpenMW "portable"
-    Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
+    Feature #2554: OpenMW-CS: Modifying an object in the cell view should trigger the instances table to scroll to the corresponding record
     Feature #2766: Warn user if their version of Morrowind is not the latest.
     Feature #2780: A way to see current OpenMW version in the console
     Feature #2858: Add a tab to the launcher for handling datafolders
@@ -141,13 +145,12 @@
     Feature #5454: Clear active spells from actor when he disappears from scene
     Feature #5489: MCP: Telekinesis fix for activators
     Feature #5737: Handle instance move from one cell to another
+    Feature #5928: Allow Glow in the Dahrk to be disabled
     Feature #5996: Support Lua scripts in OpenMW
     Feature #6017: Separate persistent and temporary cell references when saving
+    Feature #6019: Add antialias alpha test to the launcher or enable by default if possible
     Feature #6032: Reverse-z depth buffer
-    Feature #6078: First person should not clear depth buffer
     Feature #6128: Soft Particles
-    Feature #6161: Refactor Sky to use shaders and GLES/GL3 friendly
-    Feature #6162: Refactor GUI to use shaders and to be GLES and GL3+ friendly
     Feature #6171: In-game log viewer
     Feature #6189: Navigation mesh disk cache
     Feature #6199: Support FBO Rendering
@@ -155,24 +158,31 @@
     Feature #6249: Alpha testing support for Collada
     Feature #6251: OpenMW-CS: Set instance movement based on camera zoom
     Feature #6288: Preserve the "blocked" record flag for referenceable objects.
-    Feature #6380: Commas are treated as whitespace in vanilla
-    Feature #6419: Topics shouldn't be greyed out if they can produce another topic reference
+    Feature #6360: More realistic raindrop ripples
+    Feature #6380: Treat commas as whitespace in scripts
+    Feature #6419: Don't grey out topics if they can produce another topic reference
     Feature #6443: Support NiStencilProperty
-    Feature #6496: NCC flag isn't handled properly
+    Feature #6496: Handle NCC flag in NIF files
     Feature #6534: Shader-based object texture blending
     Feature #6541: Gloss-mapping
-    Feature #6592: Missing support for NiTriShape particle emitters
+    Feature #6557: Add support for controller gyroscope
+    Feature #6592: Support for NiTriShape particle emitters
     Feature #6600: Support NiSortAdjustNode
     Feature #6684: Support NiFltAnimationNode
-    Feature #6699: Ignored flag
+    Feature #6699: Support Ignored flag
     Feature #6700: Support windowed fullscreen
     Feature #6706: Save the size of the Options window
     Feature #6721: [OpenMW-CS] Add option to open records in new window
+    Task #6078: First person should not clear depth buffer
+    Task #6161: Refactor Sky to use shaders and be GLES/GL3 friendly
+    Task #6162: Refactor GUI to use shaders and to be GLES and GL3+ friendly
     Task #6201: Remove the "Note: No relevant classes found. No output generated" warnings
     Task #6264: Remove the old classes in animation.cpp
     Task #6553: Simplify interpreter instruction registration
     Task #6564: Remove predefined data paths `data="?global?data"`, `data=./data`
+    Task #6631: Fix ffmpeg avio API usage causing hangs in ffmpeg version 5
     Task #6709: Move KeyframeController transformation magic to NifOsg::MatrixTransform
+    Task #6763: gcc 12.1 multiple compiler warnings
 
 0.47.0
 ------
@@ -307,8 +317,6 @@
     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 #6142: Groundcover plugins change cells flags
-    Bug #6276: Deleted groundcover instances are not deleted in game
     Bug #6294: Game crashes with empty pathgrid
     Feature #390: 3rd person look "over the shoulder"
     Feature #832: OpenMW-CS: Handle deleted references

From 591fa9b700789a44f5fbde7db4b910232ad0b0f0 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Mon, 20 Jun 2022 21:43:17 +0200
Subject: [PATCH 2672/2859] Add missing workaround for a MyGUI visibility bug

---
 components/lua_ui/adapter.cpp | 1 +
 components/lua_ui/widget.cpp  | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/components/lua_ui/adapter.cpp b/components/lua_ui/adapter.cpp
index aa04f4c374..88f282c970 100644
--- a/components/lua_ui/adapter.cpp
+++ b/components/lua_ui/adapter.cpp
@@ -58,3 +58,4 @@ namespace LuaUi
         mElement = nullptr;
     }
 }
+
diff --git a/components/lua_ui/widget.cpp b/components/lua_ui/widget.cpp
index c98b7ad38f..5a747a79d9 100644
--- a/components/lua_ui/widget.cpp
+++ b/components/lua_ui/widget.cpp
@@ -96,6 +96,10 @@ namespace LuaUi
         ext->mParent = this;
         ext->mTemplateChild = false;
         ext->widget()->attachToWidget(mSlot->widget());
+        // workaround for MyGUI bug
+        // parent visibility doesn't affect added children
+        ext->widget()->setVisible(!ext->widget()->getVisible());
+        ext->widget()->setVisible(!ext->widget()->getVisible());
     }
 
     void WidgetExtension::attachTemplate(WidgetExtension* ext)
@@ -103,6 +107,10 @@ namespace LuaUi
         ext->mParent = this;
         ext->mTemplateChild = true;
         ext->widget()->attachToWidget(widget());
+        // workaround for MyGUI bug
+        // parent visibility doesn't affect added children
+        ext->widget()->setVisible(!ext->widget()->getVisible());
+        ext->widget()->setVisible(!ext->widget()->getVisible());
     }
 
     WidgetExtension* WidgetExtension::findDeep(std::string_view flagName)

From 3bf18c601c0d0b58a85d60fee0cabc0bfb6dfce8 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Mon, 6 Jun 2022 22:40:38 +0200
Subject: [PATCH 2673/2859] Better fog

---
 apps/launcher/advancedpage.cpp                |  4 +-
 apps/openmw/engine.cpp                        | 16 +++++-
 apps/openmw/engine.hpp                        |  1 +
 apps/openmw/mwrender/characterpreview.cpp     |  6 +++
 apps/openmw/mwrender/localmap.cpp             |  6 +++
 apps/openmw/mwrender/renderingmanager.cpp     | 45 ++++++++++++++---
 apps/openmw/mwrender/renderingmanager.hpp     |  1 +
 apps/openmw/mwrender/sky.cpp                  | 33 +++++++++++-
 apps/openmw/mwrender/sky.hpp                  | 11 +++-
 apps/openmw_test_suite/fx/technique.cpp       |  2 +-
 components/fx/pass.cpp                        |  2 +-
 components/sceneutil/waterutil.cpp            |  3 --
 components/shader/shadermanager.cpp           | 19 +++++++
 components/shader/shadermanager.hpp           |  9 ++++
 .../source/reference/modding/settings/fog.rst | 50 +++++++++++++++++++
 .../reference/modding/settings/shaders.rst    | 13 +----
 files/settings-default.cfg                    | 21 ++++++--
 files/shaders/CMakeLists.txt                  |  1 +
 files/shaders/fog.glsl                        | 34 +++++++++++++
 files/shaders/groundcover_fragment.glsl       | 10 ++--
 files/shaders/nv_default_fragment.glsl        | 11 ++--
 files/shaders/nv_nolighting_fragment.glsl     | 13 ++---
 files/shaders/objects_fragment.glsl           | 22 ++------
 files/shaders/objects_vertex.glsl             |  6 ---
 files/shaders/softparticles.glsl              |  2 -
 files/shaders/terrain_fragment.glsl           | 10 ++--
 files/shaders/water_fragment.glsl             | 12 ++---
 27 files changed, 268 insertions(+), 95 deletions(-)
 create mode 100644 files/shaders/fog.glsl

diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index 5e01443008..fe94c945f6 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -117,7 +117,7 @@ bool Launcher::AdvancedPage::loadSettings()
         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(radialFogCheckBox, "radial fog", "Fog");
         loadSettingBool(softParticlesCheckBox, "soft particles", "Shaders");
         loadSettingBool(antialiasAlphaTestCheckBox, "antialias alpha test", "Shaders");
         if (Settings::Manager::getInt("antialiasing", "Video") == 0) {
@@ -265,7 +265,7 @@ void Launcher::AdvancedPage::saveSettings()
         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(radialFogCheckBox, "radial fog", "Fog");
         saveSettingBool(softParticlesCheckBox, "soft particles", "Shaders");
         saveSettingBool(antialiasAlphaTestCheckBox, "antialias alpha test", "Shaders");
         saveSettingBool(magicItemAnimationsCheckBox, "use magic item animations", "Game");
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index b2b1dbd0d6..4234662d31 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -256,7 +256,18 @@ namespace
             Log(Debug::Info) << "OpenGL Vendor: " << glGetString(GL_VENDOR);
             Log(Debug::Info) << "OpenGL Renderer: " << glGetString(GL_RENDERER);
             Log(Debug::Info) << "OpenGL Version: " << glGetString(GL_VERSION);
+            glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &mMaxTextureImageUnits);
         }
+
+        int getMaxTextureImageUnits() const
+        {
+            if (mMaxTextureImageUnits == 0)
+                throw std::logic_error("mMaxTextureImageUnits is not initialized");
+            return mMaxTextureImageUnits;
+        }
+
+    private:
+        int mMaxTextureImageUnits = 0;
     };
 
     class InitializeStereoOperation final : public osg::GraphicsOperation
@@ -664,7 +675,8 @@ void OMW::Engine::createWindow()
 
     osg::ref_ptr<SceneUtil::OperationSequence> realizeOperations = new SceneUtil::OperationSequence(false);
     mViewer->setRealizeOperation(realizeOperations);
-    realizeOperations->add(new IdentifyOpenGLOperation());
+    osg::ref_ptr<IdentifyOpenGLOperation> identifyOp = new IdentifyOpenGLOperation();
+    realizeOperations->add(identifyOp);
 
     if (Debug::shouldDebugOpenGL())
         realizeOperations->add(new Debug::EnableGLDebugOperation());
@@ -679,6 +691,7 @@ void OMW::Engine::createWindow()
     }
 
     mViewer->realize();
+    mGlMaxTextureImageUnits = identifyOp->getMaxTextureImageUnits();
 
     mViewer->getEventQueue()->getCurrentEventState()->setWindowRectangle(0, 0, graphicsWindow->getTraits()->width, graphicsWindow->getTraits()->height);
 }
@@ -724,6 +737,7 @@ void OMW::Engine::prepareEngine()
     VFS::registerArchives(mVFS.get(), mFileCollections, mArchives, true);
 
     mResourceSystem = std::make_unique<Resource::ResourceSystem>(mVFS.get());
+    mResourceSystem->getSceneManager()->getShaderManager().setMaxTextureUnits(mGlMaxTextureImageUnits);
     mResourceSystem->getSceneManager()->setUnRefImageDataAfterApply(false); // keep to Off for now to allow better state sharing
     mResourceSystem->getSceneManager()->setFilterSettings(
         Settings::Manager::getString("texture mag filter", "General"),
diff --git a/apps/openmw/engine.hpp b/apps/openmw/engine.hpp
index e8db06a33e..ba39132b04 100644
--- a/apps/openmw/engine.hpp
+++ b/apps/openmw/engine.hpp
@@ -264,6 +264,7 @@ namespace OMW
         private:
             Files::ConfigurationManager& mCfgMgr;
             class LuaWorker;
+            int mGlMaxTextureImageUnits;
     };
 }
 
diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index 3a6d2df7ff..f986c71045 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -268,6 +268,12 @@ namespace MWRender
         fog->setEnd(10000000);
         stateset->setAttributeAndModes(fog, osg::StateAttribute::OFF|osg::StateAttribute::OVERRIDE);
 
+        // turn of sky blending
+        stateset->addUniform(new osg::Uniform("far", 10000000.0f));
+        stateset->addUniform(new osg::Uniform("skyBlendingStart", 8000000.0f));
+        stateset->addUniform(new osg::Uniform("sky", 0));
+        stateset->addUniform(new osg::Uniform("screenRes", osg::Vec2f{1, 1}));
+
         // Opaque stuff must have 1 as its fragment alpha as the FBO is translucent, so having blending off isn't enough
         osg::ref_ptr<osg::TexEnvCombine> noBlendAlphaEnv = new osg::TexEnvCombine();
         noBlendAlphaEnv->setCombine_Alpha(osg::TexEnvCombine::REPLACE);
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index ccd3220efe..ecfb2d6387 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -720,6 +720,12 @@ void LocalMapRenderToTexture::setDefaults(osg::Camera* camera)
     fog->setEnd(10000000);
     stateset->setAttributeAndModes(fog, osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE);
 
+    // turn of sky blending
+    stateset->addUniform(new osg::Uniform("far", 10000000.0f));
+    stateset->addUniform(new osg::Uniform("skyBlendingStart", 8000000.0f));
+    stateset->addUniform(new osg::Uniform("sky", 0));
+    stateset->addUniform(new osg::Uniform("screenRes", osg::Vec2f{1, 1}));
+
     osg::ref_ptr<osg::LightModel> lightmodel = new osg::LightModel;
     lightmodel->setAmbientIntensity(osg::Vec4(0.3f, 0.3f, 0.3f, 1.f));
     stateset->setAttributeAndModes(lightmodel, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 5464992544..e639880b37 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -41,6 +41,7 @@
 #include <components/sceneutil/workqueue.hpp>
 #include <components/sceneutil/writescene.hpp>
 #include <components/sceneutil/shadow.hpp>
+#include <components/sceneutil/rtt.hpp>
 
 #include <components/misc/constants.hpp>
 
@@ -81,7 +82,6 @@ namespace MWRender
 {
     class PerViewUniformStateUpdater final : public SceneUtil::StateSetUpdater
     {
-    public:
     public:
         PerViewUniformStateUpdater()
         {
@@ -90,6 +90,8 @@ namespace MWRender
         void setDefaults(osg::StateSet* stateset) override
         {
             stateset->addUniform(new osg::Uniform("projectionMatrix", osg::Matrixf{}));
+            if (mSkyRTT)
+                stateset->addUniform(new osg::Uniform("sky", mSkyTextureUnit));
         }
 
         void apply(osg::StateSet* stateset, osg::NodeVisitor* nv) override
@@ -97,6 +99,11 @@ namespace MWRender
             auto* uProjectionMatrix = stateset->getUniform("projectionMatrix");
             if (uProjectionMatrix)
                 uProjectionMatrix->set(mProjectionMatrix);
+            if (mSkyRTT && nv->getVisitorType() == osg::NodeVisitor::CULL_VISITOR)
+            {
+                osg::Texture* skyTexture = mSkyRTT->getColorTexture(static_cast<osgUtil::CullVisitor*>(nv));
+                stateset->setTextureAttribute(mSkyTextureUnit, skyTexture, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+            }
         }
 
         void applyLeft(osg::StateSet* stateset, osgUtil::CullVisitor* nv) override
@@ -123,8 +130,16 @@ namespace MWRender
             return mProjectionMatrix;
         }
 
+        void enableSkyRTT(int skyTextureUnit, SceneUtil::RTTNode* skyRTT)
+        {
+            mSkyTextureUnit = skyTextureUnit;
+            mSkyRTT = skyRTT;
+        }
+
     private:
         osg::Matrixf mProjectionMatrix;
+        int mSkyTextureUnit = -1;
+        SceneUtil::RTTNode* mSkyRTT = nullptr;
     };
 
     class SharedUniformStateUpdater : public SceneUtil::StateSetUpdater
@@ -144,6 +159,7 @@ namespace MWRender
             stateset->addUniform(new osg::Uniform("linearFac", 0.f));
             stateset->addUniform(new osg::Uniform("near", 0.f));
             stateset->addUniform(new osg::Uniform("far", 0.f));
+            stateset->addUniform(new osg::Uniform("skyBlendingStart", 0.f));
             stateset->addUniform(new osg::Uniform("screenRes", osg::Vec2f{}));
             if (mUsePlayerUniforms)
             {
@@ -166,6 +182,11 @@ namespace MWRender
             if (uFar)
                 uFar->set(mFar);
 
+            static const float mSkyBlendingStartCoef = Settings::Manager::getFloat("sky blending start", "Fog");
+            auto* uSkyBlendingStart = stateset->getUniform("skyBlendingStart");
+            if (uSkyBlendingStart)
+                uSkyBlendingStart->set(mFar * mSkyBlendingStartCoef);
+
             auto* uScreenRes = stateset->getUniform("screenRes");
             if (uScreenRes)
                 uScreenRes->set(mScreenRes);
@@ -337,7 +358,8 @@ namespace MWRender
     RenderingManager::RenderingManager(osgViewer::Viewer* viewer, osg::ref_ptr<osg::Group> rootNode,
                                        Resource::ResourceSystem* resourceSystem, SceneUtil::WorkQueue* workQueue,
                                        const std::string& resourcePath, DetourNavigator::Navigator& navigator, const MWWorld::GroundcoverStore& groundcoverStore)
-        : mViewer(viewer)
+        : mSkyBlending(Settings::Manager::getBool("sky blending", "Fog"))
+        , mViewer(viewer)
         , mRootNode(rootNode)
         , mResourceSystem(resourceSystem)
         , mWorkQueue(workQueue)
@@ -358,12 +380,14 @@ namespace MWRender
 
         resourceSystem->getSceneManager()->setParticleSystemMask(MWRender::Mask_ParticleSystem);
         // Shadows and radial fog have problems with fixed-function mode.
-        bool forceShaders = Settings::Manager::getBool("radial fog", "Shaders")
+        bool forceShaders = Settings::Manager::getBool("radial fog", "Fog")
+                            || Settings::Manager::getBool("exponential fog", "Fog")
                             || Settings::Manager::getBool("soft particles", "Shaders")
                             || Settings::Manager::getBool("force shaders", "Shaders")
                             || Settings::Manager::getBool("enable shadows", "Shadows")
                             || lightingMethod != SceneUtil::LightingMethod::FFP
                             || reverseZ
+                            || mSkyBlending
                             || Stereo::getMultiview();
         resourceSystem->getSceneManager()->setForceShaders(forceShaders);
 
@@ -413,7 +437,10 @@ namespace MWRender
         globalDefines["forcePPL"] = Settings::Manager::getBool("force per pixel lighting", "Shaders") ? "1" : "0";
         globalDefines["clamp"] = Settings::Manager::getBool("clamp lighting", "Shaders") ? "1" : "0";
         globalDefines["preLightEnv"] = Settings::Manager::getBool("apply lighting to environment maps", "Shaders") ? "1" : "0";
-        globalDefines["radialFog"] = Settings::Manager::getBool("radial fog", "Shaders") ? "1" : "0";
+        bool exponentialFog = Settings::Manager::getBool("exponential fog", "Fog");
+        globalDefines["radialFog"] = (exponentialFog || Settings::Manager::getBool("radial fog", "Fog")) ? "1" : "0";
+        globalDefines["exponentialFog"] = exponentialFog ? "1" : "0";
+        globalDefines["skyBlending"] = mSkyBlending ? "1" : "0";
         globalDefines["refraction_enabled"] = "0";
         globalDefines["useGPUShader4"] = "0";
         globalDefines["useOVR_multiview"] = "0";
@@ -546,8 +573,14 @@ namespace MWRender
 
         mFog = std::make_unique<FogManager>();
 
-        mSky = std::make_unique<SkyManager>(sceneRoot, resourceSystem->getSceneManager());
+        mSky = std::make_unique<SkyManager>(sceneRoot, resourceSystem->getSceneManager(), mSkyBlending);
         mSky->setCamera(mViewer->getCamera());
+        if (mSkyBlending)
+        {
+            int skyTextureUnit = mResourceSystem->getSceneManager()->getShaderManager().reserveGlobalTextureUnits(1);
+            Log(Debug::Info) << "Reserving texture unit for sky RTT: " << skyTextureUnit;
+            mPerViewUniformStateUpdater->enableSkyRTT(skyTextureUnit, mSky->getSkyRTT());
+        }
 
         source->setStateSetModes(*mRootNode->getOrCreateStateSet(), osg::StateAttribute::ON);
 
@@ -573,8 +606,6 @@ namespace MWRender
 
         mStateUpdater->setFogEnd(mViewDistance);
 
-        mRootNode->getOrCreateStateSet()->addUniform(new osg::Uniform("simpleWater", false));
-
         // Hopefully, anything genuinely requiring the default alpha func of GL_ALWAYS explicitly sets it
         mRootNode->getOrCreateStateSet()->setAttribute(Shader::RemovedAlphaFunc::getInstance(GL_ALWAYS));
         // The transparent renderbin sets alpha testing on because that was faster on old GPUs. It's now slower and breaks things.
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index 128ef43195..12f5bb073d 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -267,6 +267,7 @@ namespace MWRender
 
         void updateRecastMesh();
 
+        const bool mSkyBlending;
 
         osg::ref_ptr<osgUtil::IntersectionVisitor> getIntersectionVisitor(osgUtil::Intersector* intersector, bool ignorePlayer, bool ignoreActors);
 
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index 754810fc8c..7a37a69a3d 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -15,6 +15,7 @@
 #include <components/sceneutil/shadow.hpp>
 #include <components/sceneutil/visitor.hpp>
 #include <components/sceneutil/depth.hpp>
+#include <components/sceneutil/rtt.hpp>
 
 #include <components/resource/scenemanager.hpp>
 #include <components/resource/imagemanager.hpp>
@@ -215,11 +216,35 @@ namespace
     private:
         const float &mAlpha;
     };
+
+    class SkyRTT : public SceneUtil::RTTNode
+    {
+    public:
+        SkyRTT(osg::Vec2f size, osg::Group* earlyRenderBinRoot) :
+            RTTNode(static_cast<int>(size.x()), static_cast<int>(size.y()), 0, false, 1, StereoAwareness::Aware),
+            mEarlyRenderBinRoot(earlyRenderBinRoot)
+        {
+            setDepthBufferInternalFormat(GL_DEPTH24_STENCIL8);
+        }
+
+        void setDefaults(osg::Camera* camera) override
+        {
+            camera->setReferenceFrame(osg::Camera::RELATIVE_RF);
+            camera->setName("SkyCamera");
+            camera->setNodeMask(MWRender::Mask_RenderToTexture);
+            camera->addChild(mEarlyRenderBinRoot);
+            SceneUtil::ShadowManager::disableShadowsForStateSet(camera->getOrCreateStateSet());
+        }
+
+    private:
+        osg::ref_ptr<osg::Group> mEarlyRenderBinRoot;
+    };
+
 }
 
 namespace MWRender
 {
-    SkyManager::SkyManager(osg::Group* parentNode, Resource::SceneManager* sceneManager)
+    SkyManager::SkyManager(osg::Group* parentNode, Resource::SceneManager* sceneManager, bool enableSkyRTT)
         : mSceneManager(sceneManager)
         , mCamera(nullptr)
         , mAtmosphereNightRoll(0.f)
@@ -271,6 +296,12 @@ namespace MWRender
         mEarlyRenderBinRoot->getOrCreateStateSet()->setMode(GL_CLIP_PLANE0, osg::StateAttribute::OFF);
         mRootNode->addChild(mEarlyRenderBinRoot);
 
+        if (enableSkyRTT)
+        {
+            mSkyRTT = new SkyRTT(Settings::Manager::getVector2("sky rtt resolution", "Fog"), mEarlyRenderBinRoot);
+            mRootNode->addChild(mSkyRTT);
+        }
+
         mUnderwaterSwitch = new UnderwaterSwitchCallback(skyroot);
     }
 
diff --git a/apps/openmw/mwrender/sky.hpp b/apps/openmw/mwrender/sky.hpp
index 1fdf476bd5..8682a6f17f 100644
--- a/apps/openmw/mwrender/sky.hpp
+++ b/apps/openmw/mwrender/sky.hpp
@@ -30,6 +30,11 @@ namespace Resource
     class SceneManager;
 }
 
+namespace SceneUtil
+{
+    class RTTNode;
+}
+
 namespace MWRender
 {
     ///@brief The SkyManager handles rendering of the sky domes, celestial bodies as well as other objects that need to be rendered
@@ -37,7 +42,7 @@ namespace MWRender
     class SkyManager
     {
     public:
-        SkyManager(osg::Group* parentNode, Resource::SceneManager* sceneManager);
+        SkyManager(osg::Group* parentNode, Resource::SceneManager* sceneManager, bool enableSkyRTT);
         ~SkyManager();
 
         void update(float duration);
@@ -98,6 +103,8 @@ namespace MWRender
 
         void setSunglare(bool enabled);
 
+        SceneUtil::RTTNode* getSkyRTT() { return mSkyRTT.get(); }
+
     private:
         void create();
         ///< no need to call this, automatically done on first enable()
@@ -192,6 +199,8 @@ namespace MWRender
         bool mDirtyParticlesEffect;
 
         osg::Vec4f mMoonScriptColor;
+
+        osg::ref_ptr<SceneUtil::RTTNode> mSkyRTT;
     };
 }
 
diff --git a/apps/openmw_test_suite/fx/technique.cpp b/apps/openmw_test_suite/fx/technique.cpp
index d4b5bb0f8c..3273d69eb2 100644
--- a/apps/openmw_test_suite/fx/technique.cpp
+++ b/apps/openmw_test_suite/fx/technique.cpp
@@ -104,7 +104,7 @@ TestingOpenMW::VFSTestFile repeated_shared_block{R"(
             }))
             , mImageManager(mVFS.get())
         {
-            Settings::Manager::setBool("radial fog", "Shaders", true);
+            Settings::Manager::setBool("radial fog", "Fog", true);
             Settings::Manager::setBool("stereo enabled", "Stereo", false);
         }
 
diff --git a/components/fx/pass.cpp b/components/fx/pass.cpp
index b2fb8b2ffb..d264ceae2a 100644
--- a/components/fx/pass.cpp
+++ b/components/fx/pass.cpp
@@ -182,7 +182,7 @@ float omw_GetPointLightRadius(int index)
             {"@ubo", mUBO ? "1" : "0"},
             {"@normals", technique.getNormals() ? "1" : "0"},
             {"@reverseZ", SceneUtil::AutoDepth::isReversed() ? "1" : "0"},
-            {"@radialFog", Settings::Manager::getBool("radial fog", "Shaders") ? "1" : "0"},
+            {"@radialFog", Settings::Manager::getBool("radial fog", "Fog") ? "1" : "0"},
             {"@hdr", technique.getHDR() ? "1" : "0"},
             {"@in", mLegacyGLSL ? "varying" : "in"},
             {"@out", mLegacyGLSL ? "varying" : "out"},
diff --git a/components/sceneutil/waterutil.cpp b/components/sceneutil/waterutil.cpp
index e22070f40f..10a0d4e885 100644
--- a/components/sceneutil/waterutil.cpp
+++ b/components/sceneutil/waterutil.cpp
@@ -84,9 +84,6 @@ namespace SceneUtil
 
         stateset->setRenderBinDetails(renderBin, "RenderBin");
 
-        // Let the shader know we're dealing with simple water here.
-        stateset->addUniform(new osg::Uniform("simpleWater", true));
-
         return stateset;
     }
 }
diff --git a/components/shader/shadermanager.cpp b/components/shader/shadermanager.cpp
index c4d45a9958..0ac96ce4dc 100644
--- a/components/shader/shadermanager.cpp
+++ b/components/shader/shadermanager.cpp
@@ -12,6 +12,7 @@
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/stringops.hpp>
+#include <components/settings/settings.hpp>
 
 namespace Shader
 {
@@ -509,4 +510,22 @@ namespace Shader
                 program->addShader(linkedShader);
     }
 
+    int ShaderManager::reserveGlobalTextureUnits(int count)
+    {
+        {
+            // Texture units from `8 - numberOfShadowMaps` to `8` are used for shadows, so we skip them here.
+            // TODO: Maybe instead of fixed texture units use `reserveGlobalTextureUnits` for shadows as well.
+            static const int numberOfShadowMaps = Settings::Manager::getBool("enable shadows", "Shadows") ?
+                                                  std::clamp(Settings::Manager::getInt("number of shadow maps", "Shadows"), 1, 8) :
+                                                  0;
+            if (getAvailableTextureUnits() >= 8 && getAvailableTextureUnits() - count < 8)
+                mReservedTextureUnits = mMaxTextureUnits - (8 - numberOfShadowMaps);
+        }
+
+        if (getAvailableTextureUnits() < count + 1)
+            throw std::runtime_error("Can't reserve texture unit; no available units");
+        mReservedTextureUnits += count;
+        return mMaxTextureUnits - mReservedTextureUnits;
+    }
+
 }
diff --git a/components/shader/shadermanager.hpp b/components/shader/shadermanager.hpp
index 598dde85bb..05c1b17bb4 100644
--- a/components/shader/shadermanager.hpp
+++ b/components/shader/shadermanager.hpp
@@ -54,6 +54,12 @@ namespace Shader
 
         bool createSourceFromTemplate(std::string& source, std::vector<std::string>& linkedShaderTemplateNames, const std::string& templateName, const ShaderManager::DefineMap& defines);
 
+        void setMaxTextureUnits(int maxTextureUnits) { mMaxTextureUnits = maxTextureUnits; }
+        int getMaxTextureUnits() const { return mMaxTextureUnits; }
+        int getAvailableTextureUnits() const { return mMaxTextureUnits - mReservedTextureUnits; }
+
+        int reserveGlobalTextureUnits(int count);
+
     private:
         void getLinkedShaders(osg::ref_ptr<osg::Shader> shader, const std::vector<std::string>& linkedShaderNames, const DefineMap& defines);
         void addLinkedShaders(osg::ref_ptr<osg::Shader> shader, osg::ref_ptr<osg::Program> program);
@@ -80,6 +86,9 @@ namespace Shader
         std::mutex mMutex;
 
         osg::ref_ptr<const osg::Program> mProgramTemplate;
+
+        int mMaxTextureUnits = 0;
+        int mReservedTextureUnits = 0;
     };
 
     bool parseForeachDirective(std::string& source, const std::string& templateName, size_t foundPos);
diff --git a/docs/source/reference/modding/settings/fog.rst b/docs/source/reference/modding/settings/fog.rst
index 10ab0bbe30..b05112162e 100644
--- a/docs/source/reference/modding/settings/fog.rst
+++ b/docs/source/reference/modding/settings/fog.rst
@@ -113,3 +113,53 @@ distant interior fog end
 :Default:	16384 (2 cells)
 
 This is the base fog end distance used for distant fog calculations in interior locations.
+
+radial fog
+----------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	False
+
+By default, the fog becomes thicker proportionally to your distance from the clipping plane set at the clipping distance, which causes distortion at the edges of the screen.
+This setting makes the fog use the actual eye point distance (or so called Euclidean distance) to calculate the fog, which makes the fog look less artificial, especially if you have a wide FOV.
+Note that the rendering will act as if you have 'force shaders' option enabled with this on, which means that shaders will be used to render all objects and the terrain.
+
+exponential fog
+---------------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	False
+
+Similar to "radial fog" but uses an exponential formula for the fog.
+Note that the rendering will act as if you have 'force shaders' option enabled with this on, which means that shaders will be used to render all objects and the terrain.
+
+sky blending
+------------
+
+:Type:		boolean
+:Range:		True/False
+:Default:	False
+
+Whether to use blending with the sky for everything that is close to the clipping plane.
+If enabled the clipping plane becomes invisible.
+Note that the rendering will act as if you have 'force shaders' option enabled with this on, which means that shaders will be used to render all objects and the terrain.
+
+sky blending start
+------------------
+
+:Type:		floating point
+:Range:		from 0.0 (including) to 1.0 (excluding)
+:Default:	0.8
+
+The fraction of the maximum distance at which blending with the sky starts.
+
+sky rtt resolution
+------------------
+
+:Type:		two positive integers
+:Default:	512 256
+
+The sky RTT texture size, used only for sky blending. Smaller values
+reduce quality of the sky blending, but can have slightly better performance.
diff --git a/docs/source/reference/modding/settings/shaders.rst b/docs/source/reference/modding/settings/shaders.rst
index 5629e321d0..10752d8ba4 100644
--- a/docs/source/reference/modding/settings/shaders.rst
+++ b/docs/source/reference/modding/settings/shaders.rst
@@ -137,17 +137,6 @@ Normally environment map reflections aren't affected by lighting, which makes en
 Morrowind Code Patch includes an option to remedy that by doing environment-mapping before applying lighting, this is the equivalent of that option.
 Affected objects will use shaders.
 
-radial fog
-----------
-
-:Type:		boolean
-:Range:		True/False
-:Default:	False
-
-By default, the fog becomes thicker proportionally to your distance from the clipping plane set at the clipping distance, which causes distortion at the edges of the screen.
-This setting makes the fog use the actual eye point distance (or so called Euclidean distance) to calculate the fog, which makes the fog look less artificial, especially if you have a wide FOV.
-Note that the rendering will act as if you have 'force shaders' option enabled with this on, which means that shaders will be used to render all objects and the terrain.
-
 lighting method
 ---------------
 
@@ -284,4 +273,4 @@ systems that potentially differ from the source content, this setting may change
 the look of some particle systems.
 
 Note that the rendering will act as if you have 'force shaders' option enabled.
-This means that shaders will be used to render all objects and the terrain.
\ No newline at end of file
+This means that shaders will be used to render all objects and the terrain.
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index fd9826104a..807f00b41f 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -137,6 +137,23 @@ distant interior fog start = 0
 
 distant interior fog end = 16384
 
+# Determine fog intensity based on the distance from the eye point.
+# This makes fogging independent from the viewing angle. Shaders will be used to render all objects.
+radial fog = false
+
+# Whether to use exponential formula for fog.
+exponential fog = false
+
+# Whether to hide the clipping plane by blending with sky.
+sky blending = false
+
+# Fraction of the maximum distance at which blending with the sky starts.
+sky blending start = 0.8
+
+# The sky RTT texture size, used only for sky blending. Smaller values
+# reduce quality of the sky blending, but can have slightly better performance.
+sky rtt resolution = 512 256
+
 [Map]
 
 # Size of each exterior cell in pixels in the world map. (e.g. 12 to 24).
@@ -427,10 +444,6 @@ terrain specular map pattern = _diffusespec
 # Affected objects use shaders.
 apply lighting to environment maps = false
 
-# Determine fog intensity based on the distance from the eye point.
-# This makes fogging independent from the viewing angle. Shaders will be used to render all objects.
-radial fog = false
-
 # Internal handling of lights, ignored if 'force shaders' is off. "legacy"
 # provides fixed function pipeline emulation."shaders compatibility" (default)
 # uncaps the light limit, enables groundcover lighting, and uses a modified
diff --git a/files/shaders/CMakeLists.txt b/files/shaders/CMakeLists.txt
index 88fd6d45ca..affb3fc940 100644
--- a/files/shaders/CMakeLists.txt
+++ b/files/shaders/CMakeLists.txt
@@ -52,6 +52,7 @@ set(SHADER_FILES
     hdr_luminance_fragment.glsl
     fullscreen_tri_vertex.glsl
     fullscreen_tri_fragment.glsl
+    fog.glsl
 )
 
 copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_ROOT} ${DDIRRELATIVE} "${SHADER_FILES}")
diff --git a/files/shaders/fog.glsl b/files/shaders/fog.glsl
new file mode 100644
index 0000000000..d327d6a345
--- /dev/null
+++ b/files/shaders/fog.glsl
@@ -0,0 +1,34 @@
+uniform float far;
+
+#if @skyBlending
+uniform sampler2D sky;
+uniform float skyBlendingStart;
+#endif
+
+vec4 applyFogAtDist(vec4 color, float euclideanDist, float linearDist)
+{
+#if @radialFog
+    float dist = euclideanDist;
+#else
+    float dist = abs(linearDist);
+#endif
+#if @exponentialFog
+    float fogValue = 1.0 - exp(-2.0 * max(0.0, dist - gl_Fog.start/2.0) / (gl_Fog.end - gl_Fog.start/2.0));
+#else
+    float fogValue = clamp((dist - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);
+#endif
+    color.xyz = mix(color.xyz, gl_Fog.color.xyz, fogValue);
+
+#if @skyBlending && !@useOVR_multiview
+    float fadeValue = clamp((far - dist) / (far - skyBlendingStart), 0.0, 1.0);
+    vec3 skyColor = texture2D(sky, gl_FragCoord.xy / screenRes).xyz;
+    color.xyz = mix(skyColor, color.xyz, fadeValue * fadeValue);
+#endif
+
+    return color;
+}
+
+vec4 applyFogAtPos(vec4 color, vec3 pos)
+{
+    return applyFogAtDist(color, length(pos), pos.z);
+}
diff --git a/files/shaders/groundcover_fragment.glsl b/files/shaders/groundcover_fragment.glsl
index b7ff102079..0bdc3d915d 100644
--- a/files/shaders/groundcover_fragment.glsl
+++ b/files/shaders/groundcover_fragment.glsl
@@ -27,6 +27,7 @@ varying vec4 passTangent;
 
 varying float euclideanDepth;
 varying float linearDepth;
+uniform vec2 screenRes;
 
 #if PER_PIXEL_LIGHTING
 varying vec3 passViewPos;
@@ -40,6 +41,7 @@ varying vec3 passNormal;
 #include "shadows_fragment.glsl"
 #include "lighting.glsl"
 #include "alpha.glsl"
+#include "fog.glsl"
 
 void main()
 {
@@ -82,13 +84,7 @@ void main()
     clampLightingResult(lighting);
 
     gl_FragData[0].xyz *= lighting;
-
-#if @radialFog
-    float fogValue = clamp((euclideanDepth - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);
-#else
-    float fogValue = clamp((linearDepth - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);
-#endif
-    gl_FragData[0].xyz = mix(gl_FragData[0].xyz, gl_Fog.color.xyz, fogValue);
+    gl_FragData[0] = applyFogAtDist(gl_FragData[0], euclideanDepth, linearDepth);
 
 #if !@disableNormals
     gl_FragData[1].xyz = worldNormal * 0.5 + 0.5;
diff --git a/files/shaders/nv_default_fragment.glsl b/files/shaders/nv_default_fragment.glsl
index 9cb784ab98..57ef7b14df 100644
--- a/files/shaders/nv_default_fragment.glsl
+++ b/files/shaders/nv_default_fragment.glsl
@@ -33,10 +33,13 @@ varying float linearDepth;
 varying vec3 passViewPos;
 varying vec3 passNormal;
 
+uniform vec2 screenRes;
+
 #include "vertexcolors.glsl"
 #include "shadows_fragment.glsl"
 #include "lighting.glsl"
 #include "alpha.glsl"
+#include "fog.glsl"
 
 uniform float emissiveMult;
 uniform float specStrength;
@@ -91,12 +94,8 @@ void main()
 
     if (matSpec != vec3(0.0))
         gl_FragData[0].xyz += getSpecular(normalize(viewNormal), normalize(passViewPos.xyz), shininess, matSpec) * shadowing;
-#if @radialFog
-    float fogValue = clamp((euclideanDepth - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);
-#else
-    float fogValue = clamp((linearDepth - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);
-#endif
-    gl_FragData[0].xyz = mix(gl_FragData[0].xyz, gl_Fog.color.xyz, fogValue);
+
+    gl_FragData[0] = applyFogAtDist(gl_FragData[0], euclideanDepth, linearDepth);
 
 #if defined(FORCE_OPAQUE) && FORCE_OPAQUE
     // having testing & blending isn't enough - we need to write an opaque pixel to be opaque
diff --git a/files/shaders/nv_nolighting_fragment.glsl b/files/shaders/nv_nolighting_fragment.glsl
index 7c4f4737e0..59dfda9ee8 100644
--- a/files/shaders/nv_nolighting_fragment.glsl
+++ b/files/shaders/nv_nolighting_fragment.glsl
@@ -10,18 +10,17 @@ uniform sampler2D diffuseMap;
 varying vec2 diffuseMapUV;
 #endif
 
-#if @radialFog
 varying float euclideanDepth;
-#else
 varying float linearDepth;
-#endif
 
 uniform bool useFalloff;
+uniform vec2 screenRes;
 
 varying float passFalloff;
 
 #include "vertexcolors.glsl"
 #include "alpha.glsl"
+#include "fog.glsl"
 
 void main()
 {
@@ -39,15 +38,9 @@ void main()
 
     alphaTest();
 
-#if @radialFog
-    float fogValue = clamp((euclideanDepth - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);
-#else
-    float fogValue = clamp((linearDepth - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);
-#endif
-
 #if defined(FORCE_OPAQUE) && FORCE_OPAQUE
     gl_FragData[0].a = 1.0;
 #endif
 
-    gl_FragData[0].xyz = mix(gl_FragData[0].xyz, gl_Fog.color.xyz, fogValue);
+    gl_FragData[0] = applyFogAtDist(gl_FragData[0], euclideanDepth, linearDepth);
 }
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index 16cbf9bbbd..6ebc7cbd62 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -63,10 +63,7 @@ uniform sampler2D glossMap;
 varying vec2 glossMapUV;
 #endif
 
-uniform bool simpleWater;
-
-varying float euclideanDepth;
-varying float linearDepth;
+uniform vec2 screenRes;
 
 #define PER_PIXEL_LIGHTING (@normalMap || @forcePPL)
 
@@ -85,6 +82,7 @@ varying vec3 passNormal;
 #include "lighting.glsl"
 #include "parallax.glsl"
 #include "alpha.glsl"
+#include "fog.glsl"
 
 #if @softParticles
 #include "softparticles.glsl"
@@ -190,7 +188,7 @@ void main()
 
 #endif
 
-    float shadowing = unshadowedLightRatio(linearDepth);
+    float shadowing = unshadowedLightRatio(passViewPos.z);
     vec3 lighting;
 #if !PER_PIXEL_LIGHTING
     lighting = passLighting + shadowDiffuseLighting * shadowing;
@@ -230,18 +228,8 @@ void main()
 #endif
         gl_FragData[0].xyz += getSpecular(normalize(viewNormal), normalize(passViewPos.xyz), shininess, matSpec) * shadowing;
     }
-#if @radialFog
-    float depth;
-    // For the less detailed mesh of simple water we need to recalculate depth on per-pixel basis
-    if (simpleWater)
-        depth = length(passViewPos);
-    else
-        depth = euclideanDepth;
-    float fogValue = clamp((depth - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);
-#else
-    float fogValue = clamp((linearDepth - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);
-#endif
-    gl_FragData[0].xyz = mix(gl_FragData[0].xyz, gl_Fog.color.xyz, fogValue);
+
+    gl_FragData[0] = applyFogAtPos(gl_FragData[0], passViewPos);
 
 #if !defined(FORCE_OPAQUE) && @softParticles
     gl_FragData[0].a *= calcSoftParticleFade();
diff --git a/files/shaders/objects_vertex.glsl b/files/shaders/objects_vertex.glsl
index 5c94417491..971b95d8e0 100644
--- a/files/shaders/objects_vertex.glsl
+++ b/files/shaders/objects_vertex.glsl
@@ -50,9 +50,6 @@ varying vec2 specularMapUV;
 varying vec2 glossMapUV;
 #endif
 
-varying float euclideanDepth;
-varying float linearDepth;
-
 #define PER_PIXEL_LIGHTING (@normalMap || @forcePPL)
 
 #if !PER_PIXEL_LIGHTING
@@ -74,10 +71,7 @@ void main(void)
     gl_Position = mw_modelToClip(gl_Vertex);
 
     vec4 viewPos = mw_modelToView(gl_Vertex);
-
     gl_ClipVertex = viewPos;
-    euclideanDepth = length(viewPos.xyz);
-    linearDepth = getLinearDepth(gl_Position.z, viewPos.z);
 
 #if (@envMap || !PER_PIXEL_LIGHTING || @shadows_enabled)
     vec3 viewNormal = normalize((gl_NormalMatrix * gl_Normal).xyz);
diff --git a/files/shaders/softparticles.glsl b/files/shaders/softparticles.glsl
index fa8b4de4c1..f2ed36a8ad 100644
--- a/files/shaders/softparticles.glsl
+++ b/files/shaders/softparticles.glsl
@@ -1,7 +1,5 @@
 uniform float near;
-uniform float far;
 uniform sampler2D opaqueDepthTex;
-uniform vec2 screenRes;
 uniform float particleSize;
 
 float viewDepth(float depth)
diff --git a/files/shaders/terrain_fragment.glsl b/files/shaders/terrain_fragment.glsl
index 7ff696e083..1e72cf5828 100644
--- a/files/shaders/terrain_fragment.glsl
+++ b/files/shaders/terrain_fragment.glsl
@@ -32,10 +32,13 @@ centroid varying vec3 shadowDiffuseLighting;
 varying vec3 passViewPos;
 varying vec3 passNormal;
 
+uniform vec2 screenRes;
+
 #include "vertexcolors.glsl"
 #include "shadows_fragment.glsl"
 #include "lighting.glsl"
 #include "parallax.glsl"
+#include "fog.glsl"
 
 void main()
 {
@@ -116,12 +119,7 @@ void main()
         gl_FragData[0].xyz += getSpecular(normalize(viewNormal), normalize(passViewPos), shininess, matSpec) * shadowing;
     }
 
-#if @radialFog
-    float fogValue = clamp((euclideanDepth - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);
-#else
-    float fogValue = clamp((linearDepth - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);
-#endif
-    gl_FragData[0].xyz = mix(gl_FragData[0].xyz, gl_Fog.color.xyz, fogValue);
+    gl_FragData[0] = applyFogAtDist(gl_FragData[0], euclideanDepth, linearDepth);
 
 #if !@disableNormals && @writeNormals
     gl_FragData[1].xyz = worldNormal.xyz * 0.5 + 0.5;
diff --git a/files/shaders/water_fragment.glsl b/files/shaders/water_fragment.glsl
index 51d30be2d4..f60ec765b1 100644
--- a/files/shaders/water_fragment.glsl
+++ b/files/shaders/water_fragment.glsl
@@ -212,7 +212,6 @@ uniform sampler2D normalMap;
 uniform float osg_SimulationTime;
 
 uniform float near;
-uniform float far;
 uniform vec3 nodePosition;
 
 uniform float rainIntensity;
@@ -223,6 +222,7 @@ uniform vec2 screenRes;
 
 #include "shadows_fragment.glsl"
 #include "lighting.glsl"
+#include "fog.glsl"
 
 float frustumDepth;
 
@@ -291,6 +291,8 @@ void main(void)
     // TODO: Figure out how to properly radialise refraction depth and thus underwater fog
     // while avoiding oddities when the water plane is close to the clipping plane
     // radialise = radialDepth / linearDepth;
+#else
+    float radialDepth = 0.0;
 #endif
 
     vec2 screenCoordsOffset = normal.xy * REFL_BUMP;
@@ -355,13 +357,7 @@ void main(void)
     gl_FragData[0].w = clamp(fresnel*6.0 + specular * sunSpec.w, 0.0, 1.0);     //clamp(fresnel*2.0 + specular * gl_LightSource[0].specular.w, 0.0, 1.0);
 #endif
 
-    // fog
-#if @radialFog
-    float fogValue = clamp((radialDepth - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);
-#else
-    float fogValue = clamp((linearDepth - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);
-#endif
-    gl_FragData[0].xyz = mix(gl_FragData[0].xyz, gl_Fog.color.xyz, fogValue);
+    gl_FragData[0] = applyFogAtDist(gl_FragData[0], radialDepth, linearDepth);
 
 #if !@disableNormals
     gl_FragData[1].rgb = normal * 0.5 + 0.5;

From 1a12c453d60cbbbcc8b50e1823b9dc0164b1549f Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 17 Jun 2022 00:28:44 +0200
Subject: [PATCH 2674/2859] Support different agent collision shape type for
 pathfinding

Actors may have different collision shapes. Currently there are axis-aligned
bounding boxes and rotating bounding boxes. With AABB it's required to use
bounding cylinder for navmesh agent to avoid providing paths where actor can't
pass. But for rotating bounding boxes cylinder with diameter equal to the front
face width should be used to not reduce of available paths. For example rats
have rotating bounding box as collision shape because of the difference between
front and side faces width.

* Add agent bounds to navmesh tile db cache key. This is required to distinguish
  tiles for agents with different bounds.
* Increase navmesh version because navmesh tile db cache key and data has changed.
* Move navmesh version to the code to avoid misconfiguration by users.
* Fix all places where wrong half extents were used for pathfinding.
---
 .../detournavigator/navmeshtilescache.cpp     | 11 ++-
 apps/navmeshtool/main.cpp                     |  5 +-
 apps/navmeshtool/navmesh.cpp                  |  5 +-
 apps/navmeshtool/navmesh.hpp                  |  3 +-
 apps/openmw/mwbase/world.hpp                  |  6 +-
 apps/openmw/mwmechanics/aicombat.cpp          |  8 +-
 apps/openmw/mwmechanics/aipackage.cpp         | 14 +--
 apps/openmw/mwmechanics/aitravel.cpp          |  1 +
 apps/openmw/mwmechanics/aiwander.cpp          | 16 +--
 apps/openmw/mwmechanics/obstacle.cpp          |  3 +-
 apps/openmw/mwmechanics/pathfinding.cpp       | 41 ++++----
 apps/openmw/mwmechanics/pathfinding.hpp       | 24 +++--
 apps/openmw/mwphysics/actor.cpp               | 13 ++-
 apps/openmw/mwphysics/actor.hpp               |  6 ++
 apps/openmw/mwrender/actorspaths.cpp          |  4 +-
 apps/openmw/mwrender/actorspaths.hpp          |  3 +-
 apps/openmw/mwrender/renderingmanager.cpp     |  4 +-
 apps/openmw/mwrender/renderingmanager.hpp     |  3 +-
 apps/openmw/mwworld/scene.cpp                 |  6 +-
 apps/openmw/mwworld/worldimp.cpp              | 21 ++--
 apps/openmw/mwworld/worldimp.hpp              |  5 +-
 .../detournavigator/asyncnavmeshupdater.cpp   | 40 ++++----
 .../detournavigator/navigator.cpp             | 97 +++++++++---------
 .../detournavigator/navmeshtilescache.cpp     | 98 +++++++++----------
 components/detournavigator/agentbounds.hpp    | 34 +++++++
 .../detournavigator/asyncnavmeshupdater.cpp   | 72 +++++++-------
 .../detournavigator/asyncnavmeshupdater.hpp   | 19 ++--
 .../detournavigator/collisionshapetype.hpp    | 17 ++++
 components/detournavigator/debug.hpp          | 16 +++
 .../detournavigator/generatenavmeshtile.cpp   | 14 +--
 .../detournavigator/generatenavmeshtile.hpp   |  5 +-
 components/detournavigator/makenavmesh.cpp    | 44 ++++-----
 components/detournavigator/makenavmesh.hpp    |  4 +-
 components/detournavigator/navigator.hpp      | 13 +--
 components/detournavigator/navigatorimpl.cpp  | 18 ++--
 components/detournavigator/navigatorimpl.hpp  | 10 +-
 components/detournavigator/navigatorstub.hpp  | 11 ++-
 components/detournavigator/navigatorutils.cpp | 12 +--
 components/detournavigator/navigatorutils.hpp | 18 ++--
 components/detournavigator/navmeshmanager.cpp | 48 ++++-----
 components/detournavigator/navmeshmanager.hpp | 22 ++---
 .../detournavigator/navmeshtilescache.cpp     | 12 +--
 .../detournavigator/navmeshtilescache.hpp     | 13 +--
 components/detournavigator/recastparams.hpp   | 20 +++-
 components/detournavigator/serialization.cpp  | 21 ++--
 components/detournavigator/serialization.hpp  |  7 +-
 components/detournavigator/settings.cpp       |  1 -
 components/detournavigator/settings.hpp       |  3 +-
 components/sceneutil/agentpath.cpp            |  6 +-
 components/sceneutil/agentpath.hpp            |  3 +-
 files/settings-default.cfg                    |  4 -
 51 files changed, 515 insertions(+), 389 deletions(-)
 create mode 100644 components/detournavigator/agentbounds.hpp
 create mode 100644 components/detournavigator/collisionshapetype.hpp

diff --git a/apps/benchmarks/detournavigator/navmeshtilescache.cpp b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
index e8a4be1e46..976f7a46e1 100644
--- a/apps/benchmarks/detournavigator/navmeshtilescache.cpp
+++ b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
@@ -13,7 +13,7 @@ namespace
 
     struct Key
     {
-        osg::Vec3f mAgentHalfExtents;
+        AgentBounds mAgentBounds;
         TilePosition mTilePosition;
         RecastMesh mRecastMesh;
     };
@@ -137,6 +137,7 @@ namespace
     template <class Random>
     Key generateKey(std::size_t triangles, Random& random)
     {
+        const CollisionShapeType agentShapeType = CollisionShapeType::Aabb;
         const osg::Vec3f agentHalfExtents = generateAgentHalfExtents(0.5, 1.5, random);
         const TilePosition tilePosition = generateVec2i(10000, random);
         const std::size_t generation = std::uniform_int_distribution<std::size_t>(0, 100)(random);
@@ -146,7 +147,7 @@ namespace
         generateWater(std::back_inserter(water), 1, random);
         RecastMesh recastMesh(generation, revision, std::move(mesh), std::move(water),
                               {generateHeightfield(random)}, {generateFlatHeightfield(random)}, {});
-        return Key {agentHalfExtents, tilePosition, std::move(recastMesh)};
+        return Key {AgentBounds {agentShapeType, agentHalfExtents}, tilePosition, std::move(recastMesh)};
     }
 
     constexpr std::size_t trianglesPerTile = 239;
@@ -165,7 +166,7 @@ namespace
         while (true)
         {
             Key key = generateKey(trianglesPerTile, random);
-            cache.set(key.mAgentHalfExtents, key.mTilePosition, key.mRecastMesh,
+            cache.set(key.mAgentBounds, key.mTilePosition, key.mRecastMesh,
                       std::make_unique<PreparedNavMeshData>());
             *out++ = std::move(key);
             const std::size_t newSize = cache.getStats().mNavMeshCacheSize;
@@ -188,7 +189,7 @@ namespace
         while (state.KeepRunning())
         {
             const auto& key = keys[n++ % keys.size()];
-            const auto result = cache.get(key.mAgentHalfExtents, key.mTilePosition, key.mRecastMesh);
+            const auto result = cache.get(key.mAgentBounds, key.mTilePosition, key.mRecastMesh);
             benchmark::DoNotOptimize(result);
         }
     }
@@ -216,7 +217,7 @@ namespace
         while (state.KeepRunning())
         {
             const auto& key = keys[n++ % keys.size()];
-            const auto result = cache.set(key.mAgentHalfExtents, key.mTilePosition, key.mRecastMesh,
+            const auto result = cache.set(key.mAgentBounds, key.mTilePosition, key.mRecastMesh,
                                           std::make_unique<PreparedNavMeshData>());
             benchmark::DoNotOptimize(result);
         }
diff --git a/apps/navmeshtool/main.cpp b/apps/navmeshtool/main.cpp
index c1f8a8e90a..ea0046b1ae 100644
--- a/apps/navmeshtool/main.cpp
+++ b/apps/navmeshtool/main.cpp
@@ -22,6 +22,7 @@
 #include <components/vfs/registerarchives.hpp>
 #include <components/esm3/readerscache.hpp>
 #include <components/platform/platform.hpp>
+#include <components/detournavigator/agentbounds.hpp>
 
 #include <osg/Vec3f>
 
@@ -173,7 +174,9 @@ namespace NavMeshTool
             Settings::Manager settings;
             settings.load(config);
 
+            const DetourNavigator::CollisionShapeType agentCollisionShape = DetourNavigator::defaultCollisionShapeType;
             const osg::Vec3f agentHalfExtents = Settings::Manager::getVector3("default actor pathfind half extents", "Game");
+            const DetourNavigator::AgentBounds agentBounds {agentCollisionShape, agentHalfExtents};
             const std::uint64_t maxDbFileSize = static_cast<std::uint64_t>(Settings::Manager::getInt64("max navmeshdb file size", "Navigator"));
             const std::string dbPath = (config.getUserDataPath() / "navmesh.db").string();
 
@@ -201,7 +204,7 @@ namespace NavMeshTool
             WorldspaceData cellsData = gatherWorldspaceData(navigatorSettings, readers, vfs, bulletShapeManager,
                                                             esmData, processInteriorCells, writeBinaryLog);
 
-            const Status status = generateAllNavMeshTiles(agentHalfExtents, navigatorSettings, threadsNumber,
+            const Status status = generateAllNavMeshTiles(agentBounds, navigatorSettings, threadsNumber,
                 removeUnusedTiles, writeBinaryLog, cellsData, std::move(db));
 
             switch (status)
diff --git a/apps/navmeshtool/navmesh.cpp b/apps/navmeshtool/navmesh.cpp
index a51d0bbc81..053809eca4 100644
--- a/apps/navmeshtool/navmesh.cpp
+++ b/apps/navmeshtool/navmesh.cpp
@@ -32,6 +32,7 @@ namespace NavMeshTool
 {
     namespace
     {
+        using DetourNavigator::AgentBounds;
         using DetourNavigator::GenerateNavMeshTile;
         using DetourNavigator::NavMeshDb;
         using DetourNavigator::NavMeshTileInfo;
@@ -250,7 +251,7 @@ namespace NavMeshTool
         };
     }
 
-    Status generateAllNavMeshTiles(const osg::Vec3f& agentHalfExtents, const Settings& settings,
+    Status generateAllNavMeshTiles(const AgentBounds& agentBounds, const Settings& settings,
         std::size_t threadsNumber, bool removeUnusedTiles, bool writeBinaryLog, WorldspaceData& data,
         NavMeshDb&& db)
     {
@@ -291,7 +292,7 @@ namespace NavMeshTool
                     input->mWorldspace,
                     tilePosition,
                     RecastMeshProvider(input->mTileCachedRecastMeshManager),
-                    agentHalfExtents,
+                    agentBounds,
                     settings,
                     navMeshTileConsumer
                 ));
diff --git a/apps/navmeshtool/navmesh.hpp b/apps/navmeshtool/navmesh.hpp
index fa340b5de7..f0199ea1c4 100644
--- a/apps/navmeshtool/navmesh.hpp
+++ b/apps/navmeshtool/navmesh.hpp
@@ -9,6 +9,7 @@ namespace DetourNavigator
 {
     class NavMeshDb;
     struct Settings;
+    struct AgentBounds;
 }
 
 namespace NavMeshTool
@@ -22,7 +23,7 @@ namespace NavMeshTool
         NotEnoughSpace,
     };
 
-    Status generateAllNavMeshTiles(const osg::Vec3f& agentHalfExtents, const DetourNavigator::Settings& settings,
+    Status generateAllNavMeshTiles(const DetourNavigator::AgentBounds& agentBounds, const DetourNavigator::Settings& settings,
         std::size_t threadsNumber, bool removeUnusedTiles, bool writeBinaryLog, WorldspaceData& cellsData,
         DetourNavigator::NavMeshDb&& db);
 }
diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index b20ae33d63..2c96a07851 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -79,6 +79,7 @@ namespace MWMechanics
 namespace DetourNavigator
 {
     struct Navigator;
+    struct AgentBounds;
 }
 
 namespace MWWorld
@@ -644,14 +645,13 @@ namespace MWBase
             virtual DetourNavigator::Navigator* getNavigator() const = 0;
 
             virtual void updateActorPath(const MWWorld::ConstPtr& actor, const std::deque<osg::Vec3f>& path,
-                    const osg::Vec3f& halfExtents, const osg::Vec3f& start, const osg::Vec3f& end) const = 0;
+                const DetourNavigator::AgentBounds& agentBounds, const osg::Vec3f& start, const osg::Vec3f& end) const = 0;
 
             virtual void removeActorPath(const MWWorld::ConstPtr& actor) const = 0;
 
             virtual void setNavMeshNumberToRender(const std::size_t value) = 0;
 
-            /// Return physical half extents of the given actor to be used in pathfinding
-            virtual osg::Vec3f getPathfindingHalfExtents(const MWWorld::ConstPtr& actor) const = 0;
+            virtual DetourNavigator::AgentBounds getPathfindingAgentBounds(const MWWorld::ConstPtr& actor) const = 0;
 
             virtual bool hasCollisionWithDoor(const MWWorld::ConstPtr& door, const osg::Vec3f& position, const osg::Vec3f& destination) const = 0;
 
diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index 38bd9ed4b5..5bb03bb751 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -268,11 +268,11 @@ namespace MWMechanics
         {
             const MWBase::World* world = MWBase::Environment::get().getWorld();
             // Try to build path to the target.
-            const auto halfExtents = world->getPathfindingHalfExtents(actor);
+            const auto agentBounds = world->getPathfindingAgentBounds(actor);
             const auto navigatorFlags = getNavigatorFlags(actor);
             const auto areaCosts = getAreaCosts(actor);
             const auto pathGridGraph = getPathGridGraph(actor.getCell());
-            mPathFinder.buildPath(actor, vActorPos, vTargetPos, actor.getCell(), pathGridGraph, halfExtents,
+            mPathFinder.buildPath(actor, vActorPos, vTargetPos, actor.getCell(), pathGridGraph, agentBounds,
                                   navigatorFlags, areaCosts, storage.mAttackRange, PathType::Full);
 
             if (!mPathFinder.isPathConstructed())
@@ -280,12 +280,12 @@ namespace MWMechanics
                 // If there is no path, try to find a point on a line from the actor position to target projected
                 // on navmesh to attack the target from there.
                 const auto navigator = world->getNavigator();
-                const auto hit = DetourNavigator::raycast(*navigator, halfExtents, vActorPos, vTargetPos, navigatorFlags);
+                const auto hit = DetourNavigator::raycast(*navigator, agentBounds, vActorPos, vTargetPos, navigatorFlags);
 
                 if (hit.has_value() && (*hit - vTargetPos).length() <= rangeAttack)
                 {
                     // If the point is close enough, try to find a path to that point.
-                    mPathFinder.buildPath(actor, vActorPos, *hit, actor.getCell(), pathGridGraph, halfExtents,
+                    mPathFinder.buildPath(actor, vActorPos, *hit, actor.getCell(), pathGridGraph, agentBounds,
                                           navigatorFlags, areaCosts, storage.mAttackRange, PathType::Full);
                     if (mPathFinder.isPathConstructed())
                     {
diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index 24bfe41165..906894dd9c 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -113,6 +113,7 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
 
     const osg::Vec3f position = actor.getRefData().getPosition().asVec3(); //position of the actor
     MWBase::World* world = MWBase::Environment::get().getWorld();
+    const DetourNavigator::AgentBounds agentBounds = world->getPathfindingAgentBounds(actor);
 
     /// Stops the actor when it gets too close to a unloaded cell
     //... At current time, this test is unnecessary. AI shuts down when actor is more than "actors processing range" setting value
@@ -122,7 +123,7 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
     {
         actor.getClass().getMovementSettings(actor).mPosition[0] = 0;
         actor.getClass().getMovementSettings(actor).mPosition[1] = 0;
-        world->updateActorPath(actor, mPathFinder.getPath(), world->getPathfindingHalfExtents(actor), position, dest);
+        world->updateActorPath(actor, mPathFinder.getPath(), agentBounds, position, dest);
         return false;
     }
 
@@ -148,9 +149,8 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
         {
             if (wasShortcutting || doesPathNeedRecalc(dest, actor)) // if need to rebuild path
             {
-                const auto pathfindingHalfExtents = world->getPathfindingHalfExtents(actor);
                 mPathFinder.buildLimitedPath(actor, position, dest, actor.getCell(), getPathGridGraph(actor.getCell()),
-                    pathfindingHalfExtents, getNavigatorFlags(actor), getAreaCosts(actor), endTolerance, pathType);
+                    agentBounds, getNavigatorFlags(actor), getAreaCosts(actor), endTolerance, pathType);
                 mRotateOnTheRunChecks = 3;
 
                 // give priority to go directly on target if there is minimal opportunity
@@ -178,13 +178,13 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
         }
     }
 
-    const osg::Vec3f halfExtents = world->getHalfExtents(actor);
-    const float pointTolerance = getPointTolerance(actor.getClass().getMaxSpeed(actor), duration, halfExtents);
+    const float pointTolerance = getPointTolerance(actor.getClass().getMaxSpeed(actor), duration,
+                                                   world->getHalfExtents(actor));
 
     static const bool smoothMovement = Settings::Manager::getBool("smooth movement", "Game");
     mPathFinder.update(position, pointTolerance, DEFAULT_TOLERANCE,
                        /*shortenIfAlmostStraight=*/smoothMovement, actorCanMoveByZ,
-                       halfExtents, getNavigatorFlags(actor));
+                       agentBounds, getNavigatorFlags(actor));
 
     if (isDestReached || mPathFinder.checkPathCompleted()) // if path is finished
     {
@@ -197,7 +197,7 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
     else if (mPathFinder.getPath().empty())
         return false;
 
-    world->updateActorPath(actor, mPathFinder.getPath(), world->getPathfindingHalfExtents(actor), position, dest);
+    world->updateActorPath(actor, mPathFinder.getPath(), agentBounds, position, dest);
 
     if (mRotateOnTheRunChecks == 0
         || isReachableRotatingOnTheRun(actor, *mPathFinder.getPath().begin())) // to prevent circling around a path point
diff --git a/apps/openmw/mwmechanics/aitravel.cpp b/apps/openmw/mwmechanics/aitravel.cpp
index 378099e7d1..14b416ac61 100644
--- a/apps/openmw/mwmechanics/aitravel.cpp
+++ b/apps/openmw/mwmechanics/aitravel.cpp
@@ -3,6 +3,7 @@
 #include <algorithm>
 
 #include <components/esm3/aisequence.hpp>
+#include <components/detournavigator/agentbounds.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index d7f2026b82..0bd424785b 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -71,7 +71,7 @@ namespace MWMechanics
             const auto position = actor.getRefData().getPosition().asVec3();
             const bool isWaterCreature = actor.getClass().isPureWaterCreature(actor);
             const bool isFlyingCreature = actor.getClass().isPureFlyingCreature(actor);
-            const osg::Vec3f halfExtents = MWBase::Environment::get().getWorld()->getPathfindingHalfExtents(actor);
+            const osg::Vec3f halfExtents = MWBase::Environment::get().getWorld()->getPathfindingAgentBounds(actor).mHalfExtents;
             osg::Vec3f direction = destination - position;
             direction.normalize();
             const auto visibleDestination = (
@@ -210,10 +210,10 @@ namespace MWMechanics
             }
             else
             {
-                const osg::Vec3f halfExtents = MWBase::Environment::get().getWorld()->getPathfindingHalfExtents(actor);
+                const auto agentBounds = MWBase::Environment::get().getWorld()->getPathfindingAgentBounds(actor);
                 constexpr float endTolerance = 0;
                 mPathFinder.buildPath(actor, pos.asVec3(), mDestination, actor.getCell(),
-                    getPathGridGraph(actor.getCell()), halfExtents, getNavigatorFlags(actor), getAreaCosts(actor),
+                    getPathGridGraph(actor.getCell()), agentBounds, getNavigatorFlags(actor), getAreaCosts(actor),
                     endTolerance, PathType::Full);
             }
 
@@ -345,7 +345,7 @@ namespace MWMechanics
         const bool isWaterCreature = actor.getClass().isPureWaterCreature(actor);
         const bool isFlyingCreature = actor.getClass().isPureFlyingCreature(actor);
         const auto world = MWBase::Environment::get().getWorld();
-        const auto halfExtents = world->getPathfindingHalfExtents(actor);
+        const auto agentBounds = world->getPathfindingAgentBounds(actor);
         const auto navigator = world->getNavigator();
         const auto navigatorFlags = getNavigatorFlags(actor);
         const auto areaCosts = getAreaCosts(actor);
@@ -358,7 +358,7 @@ namespace MWMechanics
             if (!isWaterCreature && !isFlyingCreature)
             {
                 // findRandomPointAroundCircle uses wanderDistance as limit for random and not as exact distance
-                if (const auto destination = DetourNavigator::findRandomPointAroundCircle(*navigator, halfExtents,
+                if (const auto destination = DetourNavigator::findRandomPointAroundCircle(*navigator, agentBounds,
                     mInitialActorPosition, wanderDistance, navigatorFlags, []() {
                         auto& prng = MWBase::Environment::get().getWorld()->getPrng();
                         return Misc::Rng::rollProbability(prng);
@@ -385,7 +385,7 @@ namespace MWMechanics
             if (isWaterCreature || isFlyingCreature)
                 mPathFinder.buildStraightPath(mDestination);
             else
-                mPathFinder.buildPathByNavMesh(actor, currentPosition, mDestination, halfExtents, navigatorFlags,
+                mPathFinder.buildPathByNavMesh(actor, currentPosition, mDestination, agentBounds, navigatorFlags,
                                                areaCosts, endTolerance, PathType::Full);
 
             if (mPathFinder.isPathConstructed())
@@ -532,8 +532,8 @@ namespace MWMechanics
     {
         if (mUsePathgrid)
         {
-            const auto halfExtents = MWBase::Environment::get().getWorld()->getHalfExtents(actor);
-            mPathFinder.buildPathByNavMeshToNextPoint(actor, halfExtents, getNavigatorFlags(actor),
+            const auto agentBounds = MWBase::Environment::get().getWorld()->getPathfindingAgentBounds(actor);
+            mPathFinder.buildPathByNavMeshToNextPoint(actor, agentBounds, getNavigatorFlags(actor),
                                                       getAreaCosts(actor));
         }
 
diff --git a/apps/openmw/mwmechanics/obstacle.cpp b/apps/openmw/mwmechanics/obstacle.cpp
index 3d64eae862..0f73890eb7 100644
--- a/apps/openmw/mwmechanics/obstacle.cpp
+++ b/apps/openmw/mwmechanics/obstacle.cpp
@@ -3,6 +3,7 @@
 #include <array>
 
 #include <components/sceneutil/positionattitudetransform.hpp>
+#include <components/detournavigator/agentbounds.hpp>
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
@@ -80,7 +81,7 @@ namespace MWMechanics
         std::vector<MWWorld::Ptr>* occupyingActors)
     {
         const auto world = MWBase::Environment::get().getWorld();
-        const osg::Vec3f halfExtents = world->getPathfindingHalfExtents(actor);
+        const osg::Vec3f halfExtents = world->getPathfindingAgentBounds(actor).mHalfExtents;
         const auto maxHalfExtent = std::max(halfExtents.x(), std::max(halfExtents.y(), halfExtents.z()));
         if (ignorePlayer)
         {
diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp
index 1cc4526193..4f4c35bb40 100644
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@@ -109,12 +109,12 @@ namespace
     struct IsValidShortcut
     {
         const DetourNavigator::Navigator* mNavigator;
-        const osg::Vec3f mHalfExtents;
+        const DetourNavigator::AgentBounds mAgentBounds;
         const DetourNavigator::Flags mFlags;
 
         bool operator()(const osg::Vec3f& start, const osg::Vec3f& end) const
         {
-            const auto position = DetourNavigator::raycast(*mNavigator, mHalfExtents, start, end, mFlags);
+            const auto position = DetourNavigator::raycast(*mNavigator, mAgentBounds, start, end, mFlags);
             return position.has_value() && std::abs((position.value() - start).length2() - (end - start).length2()) <= 1;
         }
     };
@@ -307,8 +307,8 @@ namespace MWMechanics
     }
 
     void PathFinder::update(const osg::Vec3f& position, float pointTolerance, float destinationTolerance,
-                            bool shortenIfAlmostStraight, bool canMoveByZ, const osg::Vec3f& halfExtents,
-                            const DetourNavigator::Flags flags)
+        bool shortenIfAlmostStraight, bool canMoveByZ, const DetourNavigator::AgentBounds& agentBounds,
+        const DetourNavigator::Flags flags)
     {
         if (mPath.empty())
             return;
@@ -318,7 +318,7 @@ namespace MWMechanics
 
         const IsValidShortcut isValidShortcut {
             MWBase::Environment::get().getWorld()->getNavigator(),
-            halfExtents, flags
+            agentBounds, flags
         };
 
         if (shortenIfAlmostStraight)
@@ -375,13 +375,13 @@ namespace MWMechanics
     }
 
     void PathFinder::buildPathByNavMesh(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint,
-        const osg::Vec3f& endPoint, const osg::Vec3f& halfExtents, const DetourNavigator::Flags flags,
+        const osg::Vec3f& endPoint, const DetourNavigator::AgentBounds& agentBounds, const DetourNavigator::Flags flags,
         const DetourNavigator::AreaCosts& areaCosts, float endTolerance, PathType pathType)
     {
         mPath.clear();
 
         // If it's not possible to build path over navmesh due to disabled navmesh generation fallback to straight path
-        DetourNavigator::Status status = buildPathByNavigatorImpl(actor, startPoint, endPoint, halfExtents, flags,
+        DetourNavigator::Status status = buildPathByNavigatorImpl(actor, startPoint, endPoint, agentBounds, flags,
             areaCosts, endTolerance, pathType, std::back_inserter(mPath));
 
         if (status != DetourNavigator::Status::Success)
@@ -394,7 +394,7 @@ namespace MWMechanics
     }
 
     void PathFinder::buildPath(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint, const osg::Vec3f& endPoint,
-        const MWWorld::CellStore* cell, const PathgridGraph& pathgridGraph, const osg::Vec3f& halfExtents,
+        const MWWorld::CellStore* cell, const PathgridGraph& pathgridGraph, const DetourNavigator::AgentBounds& agentBounds,
         const DetourNavigator::Flags flags, const DetourNavigator::AreaCosts& areaCosts, float endTolerance,
         PathType pathType)
     {
@@ -405,7 +405,7 @@ namespace MWMechanics
 
         if (!actor.getClass().isPureWaterCreature(actor) && !actor.getClass().isPureFlyingCreature(actor))
         {
-            status = buildPathByNavigatorImpl(actor, startPoint, endPoint, halfExtents, flags, areaCosts,
+            status = buildPathByNavigatorImpl(actor, startPoint, endPoint, agentBounds, flags, areaCosts,
                                               endTolerance, pathType, std::back_inserter(mPath));
             if (status != DetourNavigator::Status::Success)
                 mPath.clear();
@@ -413,7 +413,7 @@ namespace MWMechanics
 
         if (status != DetourNavigator::Status::NavMeshNotFound && mPath.empty() && (flags & DetourNavigator::Flag_usePathgrid) == 0)
         {
-            status = buildPathByNavigatorImpl(actor, startPoint, endPoint, halfExtents,
+            status = buildPathByNavigatorImpl(actor, startPoint, endPoint, agentBounds,
                 flags | DetourNavigator::Flag_usePathgrid, areaCosts, endTolerance, pathType, std::back_inserter(mPath));
             if (status != DetourNavigator::Status::Success)
                 mPath.clear();
@@ -429,14 +429,14 @@ namespace MWMechanics
     }
 
     DetourNavigator::Status PathFinder::buildPathByNavigatorImpl(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint,
-        const osg::Vec3f& endPoint, const osg::Vec3f& halfExtents, const DetourNavigator::Flags flags,
+        const osg::Vec3f& endPoint, const DetourNavigator::AgentBounds& agentBounds, const DetourNavigator::Flags flags,
         const DetourNavigator::AreaCosts& areaCosts, float endTolerance, PathType pathType,
         std::back_insert_iterator<std::deque<osg::Vec3f>> out)
     {
         const auto world = MWBase::Environment::get().getWorld();
         const auto stepSize = getPathStepSize(actor);
         const auto navigator = world->getNavigator();
-        const auto status = DetourNavigator::findPath(*navigator, halfExtents, stepSize,
+        const auto status = DetourNavigator::findPath(*navigator, agentBounds, stepSize,
             startPoint, endPoint, flags, areaCosts, endTolerance, out);
 
         if (pathType == PathType::Partial && status == DetourNavigator::Status::PartialPath)
@@ -453,8 +453,9 @@ namespace MWMechanics
         return status;
     }
 
-    void PathFinder::buildPathByNavMeshToNextPoint(const MWWorld::ConstPtr& actor, const osg::Vec3f& halfExtents,
-        const DetourNavigator::Flags flags, const DetourNavigator::AreaCosts& areaCosts)
+    void PathFinder::buildPathByNavMeshToNextPoint(const MWWorld::ConstPtr& actor,
+        const DetourNavigator::AgentBounds& agentBounds, const DetourNavigator::Flags flags,
+        const DetourNavigator::AreaCosts& areaCosts)
     {
         if (mPath.empty())
             return;
@@ -469,7 +470,7 @@ namespace MWMechanics
         std::deque<osg::Vec3f> prePath;
         auto prePathInserter = std::back_inserter(prePath);
         const float endTolerance = 0;
-        const auto status = DetourNavigator::findPath(*navigator, halfExtents, stepSize,
+        const auto status = DetourNavigator::findPath(*navigator, agentBounds, stepSize,
             startPoint, mPath.front(), flags, areaCosts, endTolerance, prePathInserter);
 
         if (status == DetourNavigator::Status::NavMeshNotFound)
@@ -494,9 +495,9 @@ namespace MWMechanics
     }
 
     void PathFinder::buildLimitedPath(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint, const osg::Vec3f& endPoint,
-        const MWWorld::CellStore* cell, const PathgridGraph& pathgridGraph, const osg::Vec3f& halfExtents,
-        const DetourNavigator::Flags flags, const DetourNavigator::AreaCosts& areaCosts, float endTolerance,
-        PathType pathType)
+        const MWWorld::CellStore* cell, const PathgridGraph& pathgridGraph,
+        const DetourNavigator::AgentBounds& agentBounds, const DetourNavigator::Flags flags,
+        const DetourNavigator::AreaCosts& areaCosts, float endTolerance, PathType pathType)
     {
         const auto navigator = MWBase::Environment::get().getWorld()->getNavigator();
         const auto maxDistance = std::min(
@@ -506,9 +507,9 @@ namespace MWMechanics
         const auto startToEnd = endPoint - startPoint;
         const auto distance = startToEnd.length();
         if (distance <= maxDistance)
-            return buildPath(actor, startPoint, endPoint, cell, pathgridGraph, halfExtents, flags, areaCosts,
+            return buildPath(actor, startPoint, endPoint, cell, pathgridGraph, agentBounds, flags, areaCosts,
                              endTolerance, pathType);
         const auto end = startPoint + startToEnd * maxDistance / distance;
-        buildPath(actor, startPoint, end, cell, pathgridGraph, halfExtents, flags, areaCosts, endTolerance, pathType);
+        buildPath(actor, startPoint, end, cell, pathgridGraph, agentBounds, flags, areaCosts, endTolerance, pathType);
     }
 }
diff --git a/apps/openmw/mwmechanics/pathfinding.hpp b/apps/openmw/mwmechanics/pathfinding.hpp
index 17b355682a..c07b085e5a 100644
--- a/apps/openmw/mwmechanics/pathfinding.hpp
+++ b/apps/openmw/mwmechanics/pathfinding.hpp
@@ -18,6 +18,11 @@ namespace MWWorld
     class Ptr;
 }
 
+namespace DetourNavigator
+{
+    struct AgentBounds;
+}
+
 namespace MWMechanics
 {
     class PathgridGraph;
@@ -98,25 +103,26 @@ namespace MWMechanics
                 const MWWorld::CellStore* cell, const PathgridGraph& pathgridGraph);
 
             void buildPathByNavMesh(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint,
-                const osg::Vec3f& endPoint, const osg::Vec3f& halfExtents, const DetourNavigator::Flags flags,
-                const DetourNavigator::AreaCosts& areaCosts, float endTolerance, PathType pathType);
-
-            void buildPath(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint, const osg::Vec3f& endPoint,
-                const MWWorld::CellStore* cell, const PathgridGraph& pathgridGraph, const osg::Vec3f& halfExtents,
+                const osg::Vec3f& endPoint, const DetourNavigator::AgentBounds& agentBounds,
                 const DetourNavigator::Flags flags, const DetourNavigator::AreaCosts& areaCosts, float endTolerance,
                 PathType pathType);
 
-            void buildPathByNavMeshToNextPoint(const MWWorld::ConstPtr& actor, const osg::Vec3f& halfExtents,
+            void buildPath(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint, const osg::Vec3f& endPoint,
+                const MWWorld::CellStore* cell, const PathgridGraph& pathgridGraph,
+                const DetourNavigator::AgentBounds& agentBounds, const DetourNavigator::Flags flags,
+                const DetourNavigator::AreaCosts& areaCosts, float endTolerance, PathType pathType);
+
+            void buildPathByNavMeshToNextPoint(const MWWorld::ConstPtr& actor, const DetourNavigator::AgentBounds& agentBounds,
                 const DetourNavigator::Flags flags, const DetourNavigator::AreaCosts& areaCosts);
 
             void buildLimitedPath(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint, const osg::Vec3f& endPoint,
-                const MWWorld::CellStore* cell, const PathgridGraph& pathgridGraph, const osg::Vec3f& halfExtents,
+                const MWWorld::CellStore* cell, const PathgridGraph& pathgridGraph, const DetourNavigator::AgentBounds& agentBounds,
                 const DetourNavigator::Flags flags, const DetourNavigator::AreaCosts& areaCosts, float endTolerance,
                 PathType pathType);
 
             /// Remove front point if exist and within tolerance
             void update(const osg::Vec3f& position, float pointTolerance, float destinationTolerance,
-                        bool shortenIfAlmostStraight, bool canMoveByZ, const osg::Vec3f& halfExtents,
+                        bool shortenIfAlmostStraight, bool canMoveByZ, const DetourNavigator::AgentBounds& agentBounds,
                         const DetourNavigator::Flags flags);
 
             bool checkPathCompleted() const
@@ -219,7 +225,7 @@ namespace MWMechanics
                 const PathgridGraph& pathgridGraph, std::back_insert_iterator<std::deque<osg::Vec3f>> out);
 
             [[nodiscard]] DetourNavigator::Status buildPathByNavigatorImpl(const MWWorld::ConstPtr& actor,
-                const osg::Vec3f& startPoint, const osg::Vec3f& endPoint, const osg::Vec3f& halfExtents,
+                const osg::Vec3f& startPoint, const osg::Vec3f& endPoint, const DetourNavigator::AgentBounds& agentBounds,
                 const DetourNavigator::Flags flags, const DetourNavigator::AreaCosts& areaCosts, float endTolerance, PathType pathType,
                 std::back_insert_iterator<std::deque<osg::Vec3f>> out);
     };
diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index 455237dfc8..64e38559f6 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -57,7 +57,18 @@ Actor::Actor(const MWWorld::Ptr& ptr, const Resource::BulletShape* shape, Physic
     }
 
     mShape = std::make_unique<btBoxShape>(Misc::Convert::toBullet(mOriginalHalfExtents));
-    mRotationallyInvariant = (mMeshTranslation.x() == 0.0 && mMeshTranslation.y() == 0.0) && std::fabs(mOriginalHalfExtents.x() - mOriginalHalfExtents.y()) < 2.2;
+
+    if ((mMeshTranslation.x() == 0.0 && mMeshTranslation.y() == 0.0)
+            && std::fabs(mOriginalHalfExtents.x() - mOriginalHalfExtents.y()) < 2.2)
+    {
+        mRotationallyInvariant = true;
+        mCollisionShapeType = DetourNavigator::CollisionShapeType::Aabb;
+    }
+    else
+    {
+        mRotationallyInvariant = false;
+        mCollisionShapeType = DetourNavigator::CollisionShapeType::RotatingBox;
+    }
 
     mConvexShape = static_cast<btConvexShape*>(mShape.get());
     mConvexShape->setMargin(0.001); // make sure bullet isn't using the huge default convex shape margin of 0.04
diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index 2b67f265c6..322ad74d7c 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -6,6 +6,8 @@
 
 #include "ptrholder.hpp"
 
+#include <components/detournavigator/collisionshapetype.hpp>
+
 #include <LinearMath/btTransform.h>
 #include <osg/Vec3f>
 #include <osg/Quat>
@@ -156,6 +158,8 @@ namespace MWPhysics
 
         void setActive(bool value) { mActive = value; }
 
+        DetourNavigator::CollisionShapeType getCollisionShapeType() const { return mCollisionShapeType; }
+
     private:
         MWWorld::Ptr mStandingOnPtr;
         /// Removes then re-adds the collision object to the dynamics world
@@ -171,6 +175,8 @@ namespace MWPhysics
 
         bool mRotationallyInvariant;
 
+        DetourNavigator::CollisionShapeType mCollisionShapeType;
+
         std::unique_ptr<btCollisionShape> mShape;
         btConvexShape* mConvexShape;
 
diff --git a/apps/openmw/mwrender/actorspaths.cpp b/apps/openmw/mwrender/actorspaths.cpp
index ae2d6bccb8..45b35df4b9 100644
--- a/apps/openmw/mwrender/actorspaths.cpp
+++ b/apps/openmw/mwrender/actorspaths.cpp
@@ -38,7 +38,7 @@ namespace MWRender
     }
 
     void ActorsPaths::update(const MWWorld::ConstPtr& actor, const std::deque<osg::Vec3f>& path,
-            const osg::Vec3f& halfExtents, const osg::Vec3f& start, const osg::Vec3f& end,
+            const DetourNavigator::AgentBounds& agentBounds, const osg::Vec3f& start, const osg::Vec3f& end,
             const DetourNavigator::Settings& settings)
     {
         if (!mEnabled)
@@ -48,7 +48,7 @@ namespace MWRender
         if (group != mGroups.end())
             mRootNode->removeChild(group->second.mNode);
 
-        auto newGroup = SceneUtil::createAgentPathGroup(path, halfExtents, start, end, settings.mRecast);
+        auto newGroup = SceneUtil::createAgentPathGroup(path, agentBounds, start, end, settings.mRecast);
         if (newGroup)
         {
             MWBase::Environment::get().getResourceSystem()->getSceneManager()->recreateShaders(newGroup, "debug");
diff --git a/apps/openmw/mwrender/actorspaths.hpp b/apps/openmw/mwrender/actorspaths.hpp
index d6cec9357b..304d5c09b3 100644
--- a/apps/openmw/mwrender/actorspaths.hpp
+++ b/apps/openmw/mwrender/actorspaths.hpp
@@ -17,6 +17,7 @@ namespace osg
 namespace DetourNavigator
 {
     struct Settings;
+    struct AgentBounds;
 }
 
 namespace MWRender
@@ -30,7 +31,7 @@ namespace MWRender
         bool toggle();
 
         void update(const MWWorld::ConstPtr& actor, const std::deque<osg::Vec3f>& path,
-                const osg::Vec3f& halfExtents, const osg::Vec3f& start, const osg::Vec3f& end,
+                const DetourNavigator::AgentBounds& agentBounds, const osg::Vec3f& start, const osg::Vec3f& end,
                 const DetourNavigator::Settings& settings);
 
         void remove(const MWWorld::ConstPtr& actor);
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index e639880b37..214e6cf731 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -1518,9 +1518,9 @@ namespace MWRender
     }
 
     void RenderingManager::updateActorPath(const MWWorld::ConstPtr& actor, const std::deque<osg::Vec3f>& path,
-            const osg::Vec3f& halfExtents, const osg::Vec3f& start, const osg::Vec3f& end) const
+        const DetourNavigator::AgentBounds& agentBounds, const osg::Vec3f& start, const osg::Vec3f& end) const
     {
-        mActorsPaths->update(actor, path, halfExtents, start, end, mNavigator.getSettings());
+        mActorsPaths->update(actor, path, agentBounds, start, end, mNavigator.getSettings());
     }
 
     void RenderingManager::removeActorPath(const MWWorld::ConstPtr& actor) const
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index 12f5bb073d..0424d20b23 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -66,6 +66,7 @@ namespace DetourNavigator
 {
     struct Navigator;
     struct Settings;
+    struct AgentBounds;
 }
 
 namespace MWWorld
@@ -236,7 +237,7 @@ namespace MWRender
         bool toggleBorders();
 
         void updateActorPath(const MWWorld::ConstPtr& actor, const std::deque<osg::Vec3f>& path,
-                const osg::Vec3f& halfExtents, const osg::Vec3f& start, const osg::Vec3f& end) const;
+            const DetourNavigator::AgentBounds& agentBounds, const osg::Vec3f& start, const osg::Vec3f& end) const;
 
         void removeActorPath(const MWWorld::ConstPtr& actor) const;
 
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 24b4786759..57eec9d2dd 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -187,7 +187,7 @@ namespace
         }
         else if (physics.getActor(ptr))
         {
-            navigator.addAgent(world.getPathfindingHalfExtents(ptr));
+            navigator.addAgent(world.getPathfindingAgentBounds(ptr));
         }
     }
 
@@ -332,7 +332,7 @@ namespace MWWorld
             }
             else if (mPhysics->getActor(ptr))
             {
-                mNavigator.removeAgent(mWorld.getPathfindingHalfExtents(ptr));
+                mNavigator.removeAgent(mWorld.getPathfindingAgentBounds(ptr));
                 mRendering.removeActorPath(ptr);
                 mPhysics->remove(ptr);
             }
@@ -940,7 +940,7 @@ namespace MWWorld
         }
         else if (mPhysics->getActor(ptr))
         {
-            mNavigator.removeAgent(mWorld.getPathfindingHalfExtents(ptr));
+            mNavigator.removeAgent(mWorld.getPathfindingAgentBounds(ptr));
         }
         mPhysics->remove(ptr);
         mRendering.removeObject (ptr);
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index bec6a9064a..d2470fd678 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1275,7 +1275,7 @@ namespace MWWorld
         if (!force && scale == ptr.getCellRef().getScale())
             return;
         if (mPhysics->getActor(ptr))
-            mNavigator->removeAgent(getPathfindingHalfExtents(ptr));
+            mNavigator->removeAgent(getPathfindingAgentBounds(ptr));
 
         ptr.getCellRef().setScale(scale);
         mRendering->pagingBlacklistObject(mStore.find(ptr.getCellRef().getRefId()), ptr);
@@ -1285,7 +1285,7 @@ namespace MWWorld
             mWorldScene->updateObjectScale(ptr);
 
         if (mPhysics->getActor(ptr))
-            mNavigator->addAgent(getPathfindingHalfExtents(ptr));
+            mNavigator->addAgent(getPathfindingAgentBounds(ptr));
         else if (const auto object = mPhysics->getObject(ptr))
             updateNavigatorObject(*object);
     }
@@ -2416,7 +2416,7 @@ namespace MWWorld
         {
             // Remove the old CharacterController
             MWBase::Environment::get().getMechanicsManager()->remove(getPlayerPtr(), true);
-            mNavigator->removeAgent(getPathfindingHalfExtents(getPlayerConstPtr()));
+            mNavigator->removeAgent(getPathfindingAgentBounds(getPlayerConstPtr()));
             mPhysics->remove(getPlayerPtr());
             mRendering->removePlayer(getPlayerPtr());
             MWBase::Environment::get().getLuaManager()->objectRemovedFromScene(getPlayerPtr());
@@ -2453,7 +2453,7 @@ namespace MWWorld
 
         applyLoopingParticles(player);
 
-        mNavigator->addAgent(getPathfindingHalfExtents(getPlayerConstPtr()));
+        mNavigator->addAgent(getPathfindingAgentBounds(getPlayerConstPtr()));
     }
 
     World::RestPermitted World::canRest () const
@@ -3898,9 +3898,9 @@ namespace MWWorld
     }
 
     void World::updateActorPath(const MWWorld::ConstPtr& actor, const std::deque<osg::Vec3f>& path,
-            const osg::Vec3f& halfExtents, const osg::Vec3f& start, const osg::Vec3f& end) const
+        const DetourNavigator::AgentBounds& agentBounds, const osg::Vec3f& start, const osg::Vec3f& end) const
     {
-        mRendering->updateActorPath(actor, path, halfExtents, start, end);
+        mRendering->updateActorPath(actor, path, agentBounds, start, end);
     }
 
     void World::removeActorPath(const MWWorld::ConstPtr& actor) const
@@ -3913,12 +3913,13 @@ namespace MWWorld
         mRendering->setNavMeshNumber(value);
     }
 
-    osg::Vec3f World::getPathfindingHalfExtents(const MWWorld::ConstPtr& actor) const
+    DetourNavigator::AgentBounds World::getPathfindingAgentBounds(const MWWorld::ConstPtr& actor) const
     {
-        if (actor.isInCell() && actor.getCell()->isExterior())
-            return mDefaultHalfExtents; // Using default half extents for better performance
+        const MWPhysics::Actor* physicsActor = mPhysics->getActor(actor);
+        if (physicsActor == nullptr || (actor.isInCell() && actor.getCell()->isExterior()))
+            return DetourNavigator::AgentBounds {DetourNavigator::defaultCollisionShapeType, mDefaultHalfExtents};
         else
-            return getHalfExtents(actor);
+            return DetourNavigator::AgentBounds {physicsActor->getCollisionShapeType(), physicsActor->getHalfExtents()};
     }
 
     bool World::hasCollisionWithDoor(const MWWorld::ConstPtr& door, const osg::Vec3f& position, const osg::Vec3f& destination) const
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 50aff408d5..c4024cec29 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -727,14 +727,13 @@ namespace MWWorld
             DetourNavigator::Navigator* getNavigator() const override;
 
             void updateActorPath(const MWWorld::ConstPtr& actor, const std::deque<osg::Vec3f>& path,
-                    const osg::Vec3f& halfExtents, const osg::Vec3f& start, const osg::Vec3f& end) const override;
+                const DetourNavigator::AgentBounds& agentBounds, const osg::Vec3f& start, const osg::Vec3f& end) const override;
 
             void removeActorPath(const MWWorld::ConstPtr& actor) const override;
 
             void setNavMeshNumberToRender(const std::size_t value) override;
 
-            /// Return physical half extents of the given actor to be used in pathfinding
-            osg::Vec3f getPathfindingHalfExtents(const MWWorld::ConstPtr& actor) const override;
+            DetourNavigator::AgentBounds getPathfindingAgentBounds(const MWWorld::ConstPtr& actor) const override;
 
             bool hasCollisionWithDoor(const MWWorld::ConstPtr& door, const osg::Vec3f& position, const osg::Vec3f& destination) const override;
 
diff --git a/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp b/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp
index db8cfb83dc..71a833cc26 100644
--- a/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp
+++ b/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp
@@ -50,7 +50,7 @@ namespace
         Settings mSettings = makeSettings();
         TileCachedRecastMeshManager mRecastMeshManager {mSettings.mRecast};
         OffMeshConnectionsManager mOffMeshConnectionsManager {mSettings.mRecast};
-        const osg::Vec3f mAgentHalfExtents {29, 29, 66};
+        const AgentBounds mAgentBounds {CollisionShapeType::Aabb, {29, 29, 66}};
         const TilePosition mPlayerTile {0, 0};
         const std::string mWorldspace = "sys::default";
         const btBoxShape mBox {btVector3(100, 100, 20)};
@@ -76,7 +76,7 @@ namespace
         AsyncNavMeshUpdater updater(mSettings, mRecastMeshManager, mOffMeshConnectionsManager, nullptr);
         const auto navMeshCacheItem = std::make_shared<GuardedNavMeshCacheItem>(makeEmptyNavMesh(mSettings), 1);
         const std::map<TilePosition, ChangeType> changedTiles {{TilePosition {0, 0}, ChangeType::add}};
-        updater.post(mAgentHalfExtents, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
+        updater.post(mAgentBounds, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
         updater.wait(mListener, WaitConditionType::allJobsDone);
         EXPECT_NE(navMeshCacheItem->lockConst()->getImpl().getTileRefAt(0, 0, 0), 0);
     }
@@ -88,14 +88,14 @@ namespace
         AsyncNavMeshUpdater updater(mSettings, mRecastMeshManager, mOffMeshConnectionsManager, nullptr);
         const auto navMeshCacheItem = std::make_shared<GuardedNavMeshCacheItem>(makeEmptyNavMesh(mSettings), 1);
         const std::map<TilePosition, ChangeType> changedTiles {{TilePosition {0, 0}, ChangeType::add}};
-        updater.post(mAgentHalfExtents, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
+        updater.post(mAgentBounds, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
         updater.wait(mListener, WaitConditionType::allJobsDone);
         {
             const auto stats = updater.getStats();
             ASSERT_EQ(stats.mCache.mGetCount, 1);
             ASSERT_EQ(stats.mCache.mHitCount, 0);
         }
-        updater.post(mAgentHalfExtents, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
+        updater.post(mAgentBounds, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
         updater.wait(mListener, WaitConditionType::allJobsDone);
         {
             const auto stats = updater.getStats();
@@ -111,14 +111,14 @@ namespace
         AsyncNavMeshUpdater updater(mSettings, mRecastMeshManager, mOffMeshConnectionsManager, nullptr);
         const auto navMeshCacheItem = std::make_shared<GuardedNavMeshCacheItem>(makeEmptyNavMesh(mSettings), 1);
         const std::map<TilePosition, ChangeType> changedTiles {{TilePosition {0, 0}, ChangeType::update}};
-        updater.post(mAgentHalfExtents, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
+        updater.post(mAgentBounds, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
         updater.wait(mListener, WaitConditionType::allJobsDone);
         {
             const auto stats = updater.getStats();
             ASSERT_EQ(stats.mCache.mGetCount, 1);
             ASSERT_EQ(stats.mCache.mHitCount, 0);
         }
-        updater.post(mAgentHalfExtents, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
+        updater.post(mAgentBounds, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
         updater.wait(mListener, WaitConditionType::allJobsDone);
         {
             const auto stats = updater.getStats();
@@ -138,7 +138,7 @@ namespace
         const auto navMeshCacheItem = std::make_shared<GuardedNavMeshCacheItem>(makeEmptyNavMesh(mSettings), 1);
         const TilePosition tilePosition {0, 0};
         const std::map<TilePosition, ChangeType> changedTiles {{tilePosition, ChangeType::add}};
-        updater.post(mAgentHalfExtents, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
+        updater.post(mAgentBounds, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
         updater.wait(mListener, WaitConditionType::allJobsDone);
         updater.stop();
         const auto recastMesh = mRecastMeshManager.getMesh(mWorldspace, tilePosition);
@@ -146,10 +146,11 @@ namespace
         ShapeId nextShapeId {1};
         const std::vector<DbRefGeometryObject> objects = makeDbRefGeometryObjects(recastMesh->getMeshSources(),
             [&] (const MeshSource& v) { return resolveMeshSource(*dbPtr, v, nextShapeId); });
-        const auto tile = dbPtr->findTile(mWorldspace, tilePosition, serialize(mSettings.mRecast, *recastMesh, objects));
+        const auto tile = dbPtr->findTile(mWorldspace, tilePosition,
+                                          serialize(mSettings.mRecast, mAgentBounds, *recastMesh, objects));
         ASSERT_TRUE(tile.has_value());
         EXPECT_EQ(tile->mTileId, 1);
-        EXPECT_EQ(tile->mVersion, mSettings.mNavMeshVersion);
+        EXPECT_EQ(tile->mVersion, navMeshVersion);
     }
 
     TEST_F(DetourNavigatorAsyncNavMeshUpdaterTest, post_when_writing_to_db_disabled_should_not_write_tiles)
@@ -164,7 +165,7 @@ namespace
         const auto navMeshCacheItem = std::make_shared<GuardedNavMeshCacheItem>(makeEmptyNavMesh(mSettings), 1);
         const TilePosition tilePosition {0, 0};
         const std::map<TilePosition, ChangeType> changedTiles {{tilePosition, ChangeType::add}};
-        updater.post(mAgentHalfExtents, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
+        updater.post(mAgentBounds, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
         updater.wait(mListener, WaitConditionType::allJobsDone);
         updater.stop();
         const auto recastMesh = mRecastMeshManager.getMesh(mWorldspace, tilePosition);
@@ -172,7 +173,8 @@ namespace
         ShapeId nextShapeId {1};
         const std::vector<DbRefGeometryObject> objects = makeDbRefGeometryObjects(recastMesh->getMeshSources(),
             [&] (const MeshSource& v) { return resolveMeshSource(*dbPtr, v, nextShapeId); });
-        const auto tile = dbPtr->findTile(mWorldspace, tilePosition, serialize(mSettings.mRecast, *recastMesh, objects));
+        const auto tile = dbPtr->findTile(mWorldspace, tilePosition,
+                                          serialize(mSettings.mRecast, mAgentBounds, *recastMesh, objects));
         ASSERT_FALSE(tile.has_value());
     }
 
@@ -188,7 +190,7 @@ namespace
         const auto navMeshCacheItem = std::make_shared<GuardedNavMeshCacheItem>(makeEmptyNavMesh(mSettings), 1);
         const TilePosition tilePosition {0, 0};
         const std::map<TilePosition, ChangeType> changedTiles {{tilePosition, ChangeType::add}};
-        updater.post(mAgentHalfExtents, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
+        updater.post(mAgentBounds, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
         updater.wait(mListener, WaitConditionType::allJobsDone);
         updater.stop();
         const auto recastMesh = mRecastMeshManager.getMesh(mWorldspace, tilePosition);
@@ -207,7 +209,7 @@ namespace
                                     std::make_unique<NavMeshDb>(":memory:", std::numeric_limits<std::uint64_t>::max()));
         const auto navMeshCacheItem = std::make_shared<GuardedNavMeshCacheItem>(makeEmptyNavMesh(mSettings), 1);
         const std::map<TilePosition, ChangeType> changedTiles {{TilePosition {0, 0}, ChangeType::add}};
-        updater.post(mAgentHalfExtents, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
+        updater.post(mAgentBounds, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
         updater.wait(mListener, WaitConditionType::allJobsDone);
         {
             const auto stats = updater.getStats();
@@ -217,7 +219,7 @@ namespace
             ASSERT_EQ(stats.mDb->mGetTileCount, 1);
             ASSERT_EQ(stats.mDbGetTileHits, 0);
         }
-        updater.post(mAgentHalfExtents, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
+        updater.post(mAgentBounds, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
         updater.wait(mListener, WaitConditionType::allJobsDone);
         {
             const auto stats = updater.getStats();
@@ -236,12 +238,12 @@ namespace
         AsyncNavMeshUpdater updater(mSettings, mRecastMeshManager, mOffMeshConnectionsManager, nullptr);
         const auto navMeshCacheItem = std::make_shared<GuardedNavMeshCacheItem>(makeEmptyNavMesh(mSettings), 1);
         const std::map<TilePosition, ChangeType> changedTilesAdd {{TilePosition {0, 0}, ChangeType::add}};
-        updater.post(mAgentHalfExtents, navMeshCacheItem, mPlayerTile, mWorldspace, changedTilesAdd);
+        updater.post(mAgentBounds, navMeshCacheItem, mPlayerTile, mWorldspace, changedTilesAdd);
         updater.wait(mListener, WaitConditionType::allJobsDone);
         ASSERT_NE(navMeshCacheItem->lockConst()->getImpl().getTileRefAt(0, 0, 0), 0);
         const std::map<TilePosition, ChangeType> changedTilesRemove {{TilePosition {0, 0}, ChangeType::remove}};
         const TilePosition playerTile(100, 100);
-        updater.post(mAgentHalfExtents, navMeshCacheItem, playerTile, mWorldspace, changedTilesRemove);
+        updater.post(mAgentBounds, navMeshCacheItem, playerTile, mWorldspace, changedTilesRemove);
         updater.wait(mListener, WaitConditionType::allJobsDone);
         EXPECT_EQ(navMeshCacheItem->lockConst()->getImpl().getTileRefAt(0, 0, 0), 0);
     }
@@ -261,7 +263,7 @@ namespace
         for (int x = -5; x <= 5; ++x)
             for (int y = -5; y <= 5; ++y)
                 changedTiles.emplace(TilePosition {x, y}, ChangeType::add);
-        updater.post(mAgentHalfExtents, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
+        updater.post(mAgentBounds, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
         updater.wait(mListener, WaitConditionType::allJobsDone);
         updater.stop();
         const std::set<TilePosition> present {
@@ -276,7 +278,6 @@ namespace
             TilePosition(0, 2),
             TilePosition(1, -1),
             TilePosition(1, 0),
-            TilePosition(1, 1),
         };
         for (int x = -5; x <= 5; ++x)
             for (int y = -5; y <= 5; ++y)
@@ -288,7 +289,8 @@ namespace
                     [&] (const MeshSource& v) { return resolveMeshSource(*dbPtr, v); });
                 if (!objects.has_value())
                     continue;
-                EXPECT_EQ(dbPtr->findTile(mWorldspace, tilePosition, serialize(mSettings.mRecast, *recastMesh, *objects)).has_value(),
+                EXPECT_EQ(dbPtr->findTile(mWorldspace, tilePosition,
+                                          serialize(mSettings.mRecast, mAgentBounds, *recastMesh, *objects)).has_value(),
                           present.find(tilePosition) != present.end())
                     << tilePosition.x() << " " << tilePosition.y() << " present=" << (present.find(tilePosition) != present.end());
             }
diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index d8df4e00ae..f49f3cdc74 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -42,7 +42,7 @@ namespace
         std::unique_ptr<Navigator> mNavigator;
         const osg::Vec3f mPlayerPosition;
         const std::string mWorldspace;
-        const osg::Vec3f mAgentHalfExtents;
+        const AgentBounds mAgentBounds {CollisionShapeType::Aabb, {29, 29, 66}};
         osg::Vec3f mStart;
         osg::Vec3f mEnd;
         std::deque<osg::Vec3f> mPath;
@@ -59,7 +59,6 @@ namespace
         DetourNavigatorNavigatorTest()
             : mPlayerPosition(256, 256, 0)
             , mWorldspace("sys::default")
-            , mAgentHalfExtents(29, 29, 66)
             , mStart(52, 460, 1)
             , mEnd(460, 52, 1)
             , mOut(mPath)
@@ -122,24 +121,24 @@ namespace
 
     TEST_F(DetourNavigatorNavigatorTest, find_path_for_empty_should_return_empty)
     {
-        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::NavMeshNotFound);
         EXPECT_EQ(mPath, std::deque<osg::Vec3f>());
     }
 
     TEST_F(DetourNavigatorNavigatorTest, find_path_for_existing_agent_with_no_navmesh_should_throw_exception)
     {
-        mNavigator->addAgent(mAgentHalfExtents);
-        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        mNavigator->addAgent(mAgentBounds);
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::StartPolygonNotFound);
     }
 
     TEST_F(DetourNavigatorNavigatorTest, add_agent_should_count_each_agent)
     {
-        mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->addAgent(mAgentHalfExtents);
-        mNavigator->removeAgent(mAgentHalfExtents);
-        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        mNavigator->addAgent(mAgentBounds);
+        mNavigator->addAgent(mAgentBounds);
+        mNavigator->removeAgent(mAgentBounds);
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::StartPolygonNotFound);
     }
 
@@ -155,12 +154,12 @@ namespace
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
 
-        mNavigator->addAgent(mAgentHalfExtents);
+        mNavigator->addAgent(mAgentBounds);
         mNavigator->addHeightfield(mCellPosition, cellSize, surface);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::requiredTilesPresent);
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
@@ -204,12 +203,12 @@ namespace
         CollisionShapeInstance compound(std::make_unique<btCompoundShape>());
         compound.shape().addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(0, 0, 0)), new btBoxShape(btVector3(20, 20, 100)));
 
-        mNavigator->addAgent(mAgentHalfExtents);
+        mNavigator->addAgent(mAgentBounds);
         mNavigator->addHeightfield(mCellPosition, cellSize, surface);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
@@ -243,7 +242,7 @@ namespace
 
         mPath.clear();
         mOut = std::back_inserter(mPath);
-        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
@@ -288,13 +287,13 @@ namespace
         CollisionShapeInstance compound(std::make_unique<btCompoundShape>());
         compound.shape().addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(0, 0, 0)), new btBoxShape(btVector3(20, 20, 100)));
 
-        mNavigator->addAgent(mAgentHalfExtents);
+        mNavigator->addAgent(mAgentBounds);
         mNavigator->addHeightfield(mCellPosition, cellSize, surface);
         mNavigator->addObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance(), mObjectTransform), mTransform);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
@@ -331,7 +330,7 @@ namespace
 
         mPath.clear();
         mOut = std::back_inserter(mPath);
-        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
@@ -382,13 +381,13 @@ namespace
         CollisionShapeInstance heightfield2(makeSquareHeightfieldTerrainShape(heightfieldData2));
         heightfield2.shape().setLocalScaling(btVector3(128, 128, 1));
 
-        mNavigator->addAgent(mAgentHalfExtents);
+        mNavigator->addAgent(mAgentBounds);
         mNavigator->addObject(ObjectId(&heightfield1.shape()), ObjectShapes(heightfield1.instance(), mObjectTransform), mTransform);
         mNavigator->addObject(ObjectId(&heightfield2.shape()), ObjectShapes(heightfield2.instance(), mObjectTransform), mTransform);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
@@ -439,7 +438,7 @@ namespace
         const HeightfieldSurface surface2 = makeSquareHeightfieldSurface(heightfieldData2);
         const int cellSize2 = mHeightfieldTileSize * (surface2.mSize - 1);
 
-        mNavigator->addAgent(mAgentHalfExtents);
+        mNavigator->addAgent(mAgentBounds);
         EXPECT_TRUE(mNavigator->addHeightfield(mCellPosition, cellSize1, surface1));
         EXPECT_FALSE(mNavigator->addHeightfield(mCellPosition, cellSize2, surface2));
     }
@@ -472,12 +471,12 @@ namespace
 
         osg::ref_ptr<const Resource::BulletShapeInstance> instance(new Resource::BulletShapeInstance(bulletShape));
 
-        mNavigator->addAgent(mAgentHalfExtents);
+        mNavigator->addAgent(mAgentBounds);
         mNavigator->addObject(ObjectId(instance->mCollisionShape.get()), ObjectShapes(instance, mObjectTransform), mTransform);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
@@ -519,7 +518,7 @@ namespace
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
 
-        mNavigator->addAgent(mAgentHalfExtents);
+        mNavigator->addAgent(mAgentBounds);
         mNavigator->addWater(mCellPosition, cellSize, 300);
         mNavigator->addHeightfield(mCellPosition, cellSize, surface);
         mNavigator->update(mPlayerPosition);
@@ -530,7 +529,7 @@ namespace
         mEnd.x() = 256;
         mEnd.z() = 300;
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_swim, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_swim, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
@@ -567,7 +566,7 @@ namespace
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
 
-        mNavigator->addAgent(mAgentHalfExtents);
+        mNavigator->addAgent(mAgentBounds);
         mNavigator->addWater(mCellPosition, cellSize, -25);
         mNavigator->addHeightfield(mCellPosition, cellSize, surface);
         mNavigator->update(mPlayerPosition);
@@ -576,7 +575,7 @@ namespace
         mStart.x() = 256;
         mEnd.x() = 256;
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_swim | Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_swim | Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
@@ -613,7 +612,7 @@ namespace
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
 
-        mNavigator->addAgent(mAgentHalfExtents);
+        mNavigator->addAgent(mAgentBounds);
         mNavigator->addHeightfield(mCellPosition, cellSize, surface);
         mNavigator->addWater(mCellPosition, std::numeric_limits<int>::max(), -25);
         mNavigator->update(mPlayerPosition);
@@ -622,7 +621,7 @@ namespace
         mStart.x() = 256;
         mEnd.x() = 256;
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_swim | Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_swim | Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
@@ -659,7 +658,7 @@ namespace
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
 
-        mNavigator->addAgent(mAgentHalfExtents);
+        mNavigator->addAgent(mAgentBounds);
         mNavigator->addWater(mCellPosition, cellSize, -25);
         mNavigator->addHeightfield(mCellPosition, cellSize, surface);
         mNavigator->update(mPlayerPosition);
@@ -668,7 +667,7 @@ namespace
         mStart.x() = 256;
         mEnd.x() = 256;
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
@@ -703,7 +702,7 @@ namespace
         CollisionShapeInstance heightfield(makeSquareHeightfieldTerrainShape(heightfieldData));
         heightfield.shape().setLocalScaling(btVector3(128, 128, 1));
 
-        mNavigator->addAgent(mAgentHalfExtents);
+        mNavigator->addAgent(mAgentBounds);
         mNavigator->addObject(ObjectId(&heightfield.shape()), ObjectShapes(heightfield.instance(), mObjectTransform), mTransform);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
@@ -716,7 +715,7 @@ namespace
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
@@ -757,7 +756,7 @@ namespace
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
 
-        mNavigator->addAgent(mAgentHalfExtents);
+        mNavigator->addAgent(mAgentBounds);
         mNavigator->addHeightfield(mCellPosition, cellSize, surface);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
@@ -770,7 +769,7 @@ namespace
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
@@ -812,14 +811,14 @@ namespace
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
 
-        mNavigator->addAgent(mAgentHalfExtents);
+        mNavigator->addAgent(mAgentBounds);
         mNavigator->addHeightfield(mCellPosition, cellSize, surface);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
         Misc::Rng::init(42);
 
-        const auto result = findRandomPointAroundCircle(*mNavigator, mAgentHalfExtents, mStart, 100.0, Flag_walk, 
+        const auto result = findRandomPointAroundCircle(*mNavigator, mAgentBounds, mStart, 100.0, Flag_walk,
             []() { return Misc::Rng::rollClosedProbability(); });
 
         ASSERT_THAT(result, Optional(Vec3fEq(70.35845947265625, 335.592041015625, -2.6667339801788330078125)))
@@ -849,7 +848,7 @@ namespace
         std::vector<CollisionShapeInstance<btBoxShape>> boxes;
         std::generate_n(std::back_inserter(boxes), 100, [] { return std::make_unique<btBoxShape>(btVector3(20, 20, 100)); });
 
-        mNavigator->addAgent(mAgentHalfExtents);
+        mNavigator->addAgent(mAgentBounds);
 
         mNavigator->addHeightfield(mCellPosition, cellSize, surface);
 
@@ -870,7 +869,7 @@ namespace
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
@@ -905,7 +904,7 @@ namespace
         std::vector<CollisionShapeInstance<btBoxShape>> shapes;
         std::generate_n(std::back_inserter(shapes), 100, [] { return std::make_unique<btBoxShape>(btVector3(64, 64, 64)); });
 
-        mNavigator->addAgent(mAgentHalfExtents);
+        mNavigator->addAgent(mAgentBounds);
 
         for (std::size_t i = 0; i < shapes.size(); ++i)
         {
@@ -950,14 +949,14 @@ namespace
         const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
         const int cellSize = mHeightfieldTileSize * (surface.mSize - 1);
 
-        mNavigator->addAgent(mAgentHalfExtents);
+        mNavigator->addAgent(mAgentBounds);
         mNavigator->addHeightfield(mCellPosition, cellSize, surface);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
         const osg::Vec3f start(57, 460, 1);
         const osg::Vec3f end(460, 57, 1);
-        const auto result = raycast(*mNavigator, mAgentHalfExtents, start, end, Flag_walk);
+        const auto result = raycast(*mNavigator, mAgentBounds, start, end, Flag_walk);
 
         ASSERT_THAT(result, Optional(Vec3fEq(end.x(), end.y(), 1.95257937908172607421875)))
             << (result ? *result : osg::Vec3f());
@@ -979,7 +978,7 @@ namespace
         const btVector3 oscillatingBoxShapePosition(288, 288, 400);
         CollisionShapeInstance borderBox(std::make_unique<btBoxShape>(btVector3(50, 50, 50)));
 
-        mNavigator->addAgent(mAgentHalfExtents);
+        mNavigator->addAgent(mAgentBounds);
         mNavigator->addHeightfield(mCellPosition, cellSize, surface);
         mNavigator->addObject(ObjectId(&oscillatingBox.shape()), ObjectShapes(oscillatingBox.instance(), mObjectTransform),
                               btTransform(btMatrix3x3::getIdentity(), oscillatingBoxShapePosition));
@@ -1013,12 +1012,12 @@ namespace
         const HeightfieldPlane plane {100};
         const int cellSize = mHeightfieldTileSize * 4;
 
-        mNavigator->addAgent(mAgentHalfExtents);
+        mNavigator->addAgent(mAgentBounds);
         mNavigator->addHeightfield(mCellPosition, cellSize, plane);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::requiredTilesPresent);
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
@@ -1063,13 +1062,13 @@ namespace
         compound.shape().addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(204, -204, 0)),
                                        new btBoxShape(btVector3(200, 200, 1000)));
 
-        mNavigator->addAgent(mAgentHalfExtents);
+        mNavigator->addAgent(mAgentBounds);
         mNavigator->addHeightfield(mCellPosition, cellSize, surface);
         mNavigator->addObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance(), mObjectTransform), mTransform);
         mNavigator->update(mPlayerPosition);
         mNavigator->wait(mListener, WaitConditionType::allJobsDone);
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
                   Status::PartialPath);
 
         EXPECT_THAT(mPath, ElementsAre(
@@ -1102,7 +1101,7 @@ namespace
         compound.shape().addChildShape(btTransform(btMatrix3x3::getIdentity(), btVector3(204, -204, 0)),
                                        new btBoxShape(btVector3(100, 100, 1000)));
 
-        mNavigator->addAgent(mAgentHalfExtents);
+        mNavigator->addAgent(mAgentBounds);
         mNavigator->addHeightfield(mCellPosition, cellSize, surface);
         mNavigator->addObject(ObjectId(&compound.shape()), ObjectShapes(compound.instance(), mObjectTransform), mTransform);
         mNavigator->update(mPlayerPosition);
@@ -1110,7 +1109,7 @@ namespace
 
         const float endTolerance = 1000.0f;
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, endTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStepSize, mStart, mEnd, Flag_walk, mAreaCosts, endTolerance, mOut),
                   Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(
@@ -1142,7 +1141,7 @@ namespace
         const int cellSize2 = 200;
         const float level2 = 2;
 
-        mNavigator->addAgent(mAgentHalfExtents);
+        mNavigator->addAgent(mAgentBounds);
         EXPECT_TRUE(mNavigator->addWater(mCellPosition, cellSize1, level1));
         EXPECT_FALSE(mNavigator->addWater(mCellPosition, cellSize2, level2));
     }
diff --git a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
index cbd68e0fe1..0180373e10 100644
--- a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
+++ b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp
@@ -95,7 +95,7 @@ namespace
 
     struct DetourNavigatorNavMeshTilesCacheTest : Test
     {
-        const osg::Vec3f mAgentHalfExtents {1, 2, 3};
+        const AgentBounds mAgentBounds {CollisionShapeType::Aabb, {1, 2, 3}};
         const TilePosition mTilePosition {0, 0};
         const std::size_t mGeneration = 0;
         const std::size_t mRevision = 0;
@@ -117,7 +117,7 @@ namespace
         const std::size_t maxSize = 0;
         NavMeshTilesCache cache(maxSize);
 
-        EXPECT_FALSE(cache.get(mAgentHalfExtents, mTilePosition, mRecastMesh));
+        EXPECT_FALSE(cache.get(mAgentBounds, mTilePosition, mRecastMesh));
     }
 
     TEST_F(DetourNavigatorNavMeshTilesCacheTest, set_for_not_enought_cache_size_should_return_empty_value)
@@ -125,7 +125,7 @@ namespace
         const std::size_t maxSize = 0;
         NavMeshTilesCache cache(maxSize);
 
-        EXPECT_FALSE(cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData)));
+        EXPECT_FALSE(cache.set(mAgentBounds, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData)));
         EXPECT_NE(mPreparedNavMeshData, nullptr);
     }
 
@@ -136,7 +136,7 @@ namespace
         const auto copy = clone(*mPreparedNavMeshData);
         ASSERT_EQ(*mPreparedNavMeshData, *copy);
 
-        const auto result = cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
+        const auto result = cache.set(mAgentBounds, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
         ASSERT_TRUE(result);
         EXPECT_EQ(result.get(), *copy);
     }
@@ -148,9 +148,9 @@ namespace
         auto copy = clone(*mPreparedNavMeshData);
         const auto sameCopy = clone(*mPreparedNavMeshData);
 
-        cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
+        cache.set(mAgentBounds, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
         EXPECT_EQ(mPreparedNavMeshData, nullptr);
-        const auto result = cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(copy));
+        const auto result = cache.set(mAgentBounds, mTilePosition, mRecastMesh, std::move(copy));
         ASSERT_TRUE(result);
         EXPECT_EQ(result.get(), *sameCopy);
     }
@@ -161,8 +161,8 @@ namespace
         NavMeshTilesCache cache(maxSize);
         const auto copy = clone(*mPreparedNavMeshData);
 
-        cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
-        const auto result = cache.get(mAgentHalfExtents, mTilePosition, mRecastMesh);
+        cache.set(mAgentBounds, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
+        const auto result = cache.get(mAgentBounds, mTilePosition, mRecastMesh);
         ASSERT_TRUE(result);
         EXPECT_EQ(result.get(), *copy);
     }
@@ -171,10 +171,10 @@ namespace
     {
         const std::size_t maxSize = 1;
         NavMeshTilesCache cache(maxSize);
-        const osg::Vec3f unexsistentAgentHalfExtents {1, 1, 1};
+        const AgentBounds absentAgentBounds {CollisionShapeType::Aabb, {1, 1, 1}};
 
-        cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
-        EXPECT_FALSE(cache.get(unexsistentAgentHalfExtents, mTilePosition, mRecastMesh));
+        cache.set(mAgentBounds, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
+        EXPECT_FALSE(cache.get(absentAgentBounds, mTilePosition, mRecastMesh));
     }
 
     TEST_F(DetourNavigatorNavMeshTilesCacheTest, get_for_cache_miss_by_tile_position_should_return_empty_value)
@@ -183,8 +183,8 @@ namespace
         NavMeshTilesCache cache(maxSize);
         const TilePosition unexistentTilePosition {1, 1};
 
-        cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
-        EXPECT_FALSE(cache.get(mAgentHalfExtents, unexistentTilePosition, mRecastMesh));
+        cache.set(mAgentBounds, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
+        EXPECT_FALSE(cache.get(mAgentBounds, unexistentTilePosition, mRecastMesh));
     }
 
     TEST_F(DetourNavigatorNavMeshTilesCacheTest, get_for_cache_miss_by_recast_mesh_should_return_empty_value)
@@ -194,8 +194,8 @@ namespace
         const std::vector<CellWater> water(1, CellWater {osg::Vec2i(), Water {1, 0.0f}});
         const RecastMesh unexistentRecastMesh(mGeneration, mRevision, mMesh, water, mHeightfields, mFlatHeightfields, mSources);
 
-        cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
-        EXPECT_FALSE(cache.get(mAgentHalfExtents, mTilePosition, unexistentRecastMesh));
+        cache.set(mAgentBounds, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
+        EXPECT_FALSE(cache.get(mAgentBounds, mTilePosition, unexistentRecastMesh));
     }
 
     TEST_F(DetourNavigatorNavMeshTilesCacheTest, set_should_replace_unused_value)
@@ -208,12 +208,12 @@ namespace
         auto anotherPreparedNavMeshData = makePeparedNavMeshData(3);
         const auto copy = clone(*anotherPreparedNavMeshData);
 
-        cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
-        const auto result = cache.set(mAgentHalfExtents, mTilePosition, anotherRecastMesh,
+        cache.set(mAgentBounds, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
+        const auto result = cache.set(mAgentBounds, mTilePosition, anotherRecastMesh,
                                       std::move(anotherPreparedNavMeshData));
         ASSERT_TRUE(result);
         EXPECT_EQ(result.get(), *copy);
-        EXPECT_FALSE(cache.get(mAgentHalfExtents, mTilePosition, mRecastMesh));
+        EXPECT_FALSE(cache.get(mAgentBounds, mTilePosition, mRecastMesh));
     }
 
     TEST_F(DetourNavigatorNavMeshTilesCacheTest, set_should_not_replace_used_value)
@@ -225,9 +225,9 @@ namespace
         const RecastMesh anotherRecastMesh(mGeneration, mRevision, mMesh, water, mHeightfields, mFlatHeightfields, mSources);
         auto anotherPreparedNavMeshData = makePeparedNavMeshData(3);
 
-        const auto value = cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh,
+        const auto value = cache.set(mAgentBounds, mTilePosition, mRecastMesh,
                                      std::move(mPreparedNavMeshData));
-        EXPECT_FALSE(cache.set(mAgentHalfExtents, mTilePosition, anotherRecastMesh,
+        EXPECT_FALSE(cache.set(mAgentBounds, mTilePosition, anotherRecastMesh,
                                std::move(anotherPreparedNavMeshData)));
     }
 
@@ -247,17 +247,17 @@ namespace
                     mHeightfields, mFlatHeightfields, mSources);
         auto mostRecentlySetData = makePeparedNavMeshData(3);
 
-        ASSERT_TRUE(cache.set(mAgentHalfExtents, mTilePosition, leastRecentlySetRecastMesh,
+        ASSERT_TRUE(cache.set(mAgentBounds, mTilePosition, leastRecentlySetRecastMesh,
                               std::move(leastRecentlySetData)));
-        ASSERT_TRUE(cache.set(mAgentHalfExtents, mTilePosition, mostRecentlySetRecastMesh,
+        ASSERT_TRUE(cache.set(mAgentBounds, mTilePosition, mostRecentlySetRecastMesh,
                               std::move(mostRecentlySetData)));
 
-        const auto result = cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh,
+        const auto result = cache.set(mAgentBounds, mTilePosition, mRecastMesh,
                                       std::move(mPreparedNavMeshData));
         EXPECT_EQ(result.get(), *copy);
 
-        EXPECT_FALSE(cache.get(mAgentHalfExtents, mTilePosition, leastRecentlySetRecastMesh));
-        EXPECT_TRUE(cache.get(mAgentHalfExtents, mTilePosition, mostRecentlySetRecastMesh));
+        EXPECT_FALSE(cache.get(mAgentBounds, mTilePosition, leastRecentlySetRecastMesh));
+        EXPECT_TRUE(cache.get(mAgentBounds, mTilePosition, mostRecentlySetRecastMesh));
     }
 
     TEST_F(DetourNavigatorNavMeshTilesCacheTest, set_should_replace_unused_least_recently_used_value)
@@ -277,28 +277,28 @@ namespace
         auto mostRecentlyUsedData = makePeparedNavMeshData(3);
         const auto mostRecentlyUsedCopy = clone(*mostRecentlyUsedData);
 
-        cache.set(mAgentHalfExtents, mTilePosition, leastRecentlyUsedRecastMesh, std::move(leastRecentlyUsedData));
-        cache.set(mAgentHalfExtents, mTilePosition, mostRecentlyUsedRecastMesh, std::move(mostRecentlyUsedData));
+        cache.set(mAgentBounds, mTilePosition, leastRecentlyUsedRecastMesh, std::move(leastRecentlyUsedData));
+        cache.set(mAgentBounds, mTilePosition, mostRecentlyUsedRecastMesh, std::move(mostRecentlyUsedData));
 
         {
-            const auto value = cache.get(mAgentHalfExtents, mTilePosition, leastRecentlyUsedRecastMesh);
+            const auto value = cache.get(mAgentBounds, mTilePosition, leastRecentlyUsedRecastMesh);
             ASSERT_TRUE(value);
             ASSERT_EQ(value.get(), *leastRecentlyUsedCopy);
         }
 
         {
-            const auto value = cache.get(mAgentHalfExtents, mTilePosition, mostRecentlyUsedRecastMesh);
+            const auto value = cache.get(mAgentBounds, mTilePosition, mostRecentlyUsedRecastMesh);
             ASSERT_TRUE(value);
             ASSERT_EQ(value.get(), *mostRecentlyUsedCopy);
         }
 
         const auto copy = clone(*mPreparedNavMeshData);
-        const auto result = cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh,
+        const auto result = cache.set(mAgentBounds, mTilePosition, mRecastMesh,
                                       std::move(mPreparedNavMeshData));
         EXPECT_EQ(result.get(), *copy);
 
-        EXPECT_FALSE(cache.get(mAgentHalfExtents, mTilePosition, leastRecentlyUsedRecastMesh));
-        EXPECT_TRUE(cache.get(mAgentHalfExtents, mTilePosition, mostRecentlyUsedRecastMesh));
+        EXPECT_FALSE(cache.get(mAgentBounds, mTilePosition, leastRecentlyUsedRecastMesh));
+        EXPECT_TRUE(cache.get(mAgentBounds, mTilePosition, mostRecentlyUsedRecastMesh));
     }
 
     TEST_F(DetourNavigatorNavMeshTilesCacheTest, set_should_not_replace_unused_least_recently_used_value_when_item_does_not_not_fit_cache_max_size)
@@ -311,9 +311,9 @@ namespace
                     mHeightfields, mFlatHeightfields, mSources);
         auto tooLargeData = makePeparedNavMeshData(10);
 
-        cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
-        EXPECT_FALSE(cache.set(mAgentHalfExtents, mTilePosition, tooLargeRecastMesh, std::move(tooLargeData)));
-        EXPECT_TRUE(cache.get(mAgentHalfExtents, mTilePosition, mRecastMesh));
+        cache.set(mAgentBounds, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
+        EXPECT_FALSE(cache.set(mAgentBounds, mTilePosition, tooLargeRecastMesh, std::move(tooLargeData)));
+        EXPECT_TRUE(cache.get(mAgentBounds, mTilePosition, mRecastMesh));
     }
 
     TEST_F(DetourNavigatorNavMeshTilesCacheTest, set_should_not_replace_unused_least_recently_used_value_when_item_does_not_not_fit_size_of_unused_items)
@@ -331,15 +331,15 @@ namespace
                     mHeightfields, mFlatHeightfields, mSources);
         auto tooLargeData = makePeparedNavMeshData(10);
 
-        const auto value = cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh,
+        const auto value = cache.set(mAgentBounds, mTilePosition, mRecastMesh,
                                      std::move(mPreparedNavMeshData));
         ASSERT_TRUE(value);
-        ASSERT_TRUE(cache.set(mAgentHalfExtents, mTilePosition, anotherRecastMesh,
+        ASSERT_TRUE(cache.set(mAgentBounds, mTilePosition, anotherRecastMesh,
                               std::move(anotherData)));
-        EXPECT_FALSE(cache.set(mAgentHalfExtents, mTilePosition, tooLargeRecastMesh,
+        EXPECT_FALSE(cache.set(mAgentBounds, mTilePosition, tooLargeRecastMesh,
                                std::move(tooLargeData)));
-        EXPECT_TRUE(cache.get(mAgentHalfExtents, mTilePosition, mRecastMesh));
-        EXPECT_TRUE(cache.get(mAgentHalfExtents, mTilePosition, anotherRecastMesh));
+        EXPECT_TRUE(cache.get(mAgentBounds, mTilePosition, mRecastMesh));
+        EXPECT_TRUE(cache.get(mAgentBounds, mTilePosition, anotherRecastMesh));
     }
 
     TEST_F(DetourNavigatorNavMeshTilesCacheTest, release_used_after_set_then_used_by_get_item_should_left_this_item_available)
@@ -351,14 +351,14 @@ namespace
         const RecastMesh anotherRecastMesh(mGeneration, mRevision, mMesh, water, mHeightfields, mFlatHeightfields, mSources);
         auto anotherData = makePeparedNavMeshData(3);
 
-        const auto firstCopy = cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
+        const auto firstCopy = cache.set(mAgentBounds, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
         ASSERT_TRUE(firstCopy);
         {
-            const auto secondCopy = cache.get(mAgentHalfExtents, mTilePosition, mRecastMesh);
+            const auto secondCopy = cache.get(mAgentBounds, mTilePosition, mRecastMesh);
             ASSERT_TRUE(secondCopy);
         }
-        EXPECT_FALSE(cache.set(mAgentHalfExtents, mTilePosition, anotherRecastMesh, std::move(anotherData)));
-        EXPECT_TRUE(cache.get(mAgentHalfExtents, mTilePosition, mRecastMesh));
+        EXPECT_FALSE(cache.set(mAgentBounds, mTilePosition, anotherRecastMesh, std::move(anotherData)));
+        EXPECT_TRUE(cache.get(mAgentBounds, mTilePosition, mRecastMesh));
     }
 
     TEST_F(DetourNavigatorNavMeshTilesCacheTest, release_twice_used_item_should_left_this_item_available)
@@ -370,14 +370,14 @@ namespace
         const RecastMesh anotherRecastMesh(mGeneration, mRevision, mMesh, water, mHeightfields, mFlatHeightfields, mSources);
         auto anotherData = makePeparedNavMeshData(3);
 
-        cache.set(mAgentHalfExtents, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
-        const auto firstCopy = cache.get(mAgentHalfExtents, mTilePosition, mRecastMesh);
+        cache.set(mAgentBounds, mTilePosition, mRecastMesh, std::move(mPreparedNavMeshData));
+        const auto firstCopy = cache.get(mAgentBounds, mTilePosition, mRecastMesh);
         ASSERT_TRUE(firstCopy);
         {
-            const auto secondCopy = cache.get(mAgentHalfExtents, mTilePosition, mRecastMesh);
+            const auto secondCopy = cache.get(mAgentBounds, mTilePosition, mRecastMesh);
             ASSERT_TRUE(secondCopy);
         }
-        EXPECT_FALSE(cache.set(mAgentHalfExtents, mTilePosition, anotherRecastMesh, std::move(anotherData)));
-        EXPECT_TRUE(cache.get(mAgentHalfExtents, mTilePosition, mRecastMesh));
+        EXPECT_FALSE(cache.set(mAgentBounds, mTilePosition, anotherRecastMesh, std::move(anotherData)));
+        EXPECT_TRUE(cache.get(mAgentBounds, mTilePosition, mRecastMesh));
     }
 }
diff --git a/components/detournavigator/agentbounds.hpp b/components/detournavigator/agentbounds.hpp
new file mode 100644
index 0000000000..b45a2fa6cc
--- /dev/null
+++ b/components/detournavigator/agentbounds.hpp
@@ -0,0 +1,34 @@
+#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_AGENTBOUNDS_H
+#define OPENMW_COMPONENTS_DETOURNAVIGATOR_AGENTBOUNDS_H
+
+#include "collisionshapetype.hpp"
+
+#include <osg/Vec3f>
+
+#include <tuple>
+
+namespace DetourNavigator
+{
+    struct AgentBounds
+    {
+        CollisionShapeType mShapeType;
+        osg::Vec3f mHalfExtents;
+    };
+
+    inline auto tie(const AgentBounds& value)
+    {
+        return std::tie(value.mShapeType, value.mHalfExtents);
+    }
+
+    inline bool operator==(const AgentBounds& lhs, const AgentBounds& rhs)
+    {
+        return tie(lhs) == tie(rhs);
+    }
+
+    inline bool operator<(const AgentBounds& lhs, const AgentBounds& rhs)
+    {
+        return tie(lhs) < tie(rhs);
+    }
+}
+
+#endif
diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index 22086c67ea..b9424e406a 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -32,12 +32,12 @@ namespace DetourNavigator
         }
 
         int getMinDistanceTo(const TilePosition& position, int maxDistance,
-                             const std::set<std::tuple<osg::Vec3f, TilePosition>>& pushedTiles,
-                             const std::set<std::tuple<osg::Vec3f, TilePosition>>& presentTiles)
+                             const std::set<std::tuple<AgentBounds, TilePosition>>& pushedTiles,
+                             const std::set<std::tuple<AgentBounds, TilePosition>>& presentTiles)
         {
             int result = maxDistance;
-            for (const auto& [halfExtents, tile] : pushedTiles)
-                if (presentTiles.find(std::tie(halfExtents, tile)) == presentTiles.end())
+            for (const auto& [agentBounds, tile] : pushedTiles)
+                if (presentTiles.find(std::tie(agentBounds, tile)) == presentTiles.end())
                     result = std::min(result, getManhattanDistance(position, tile));
             return result;
         }
@@ -84,14 +84,14 @@ namespace DetourNavigator
 
         auto getAgentAndTile(const Job& job) noexcept
         {
-            return std::make_tuple(job.mAgentHalfExtents, job.mChangedTile);
+            return std::make_tuple(job.mAgentBounds, job.mChangedTile);
         }
 
         std::unique_ptr<DbWorker> makeDbWorker(AsyncNavMeshUpdater& updater, std::unique_ptr<NavMeshDb>&& db, const Settings& settings)
         {
             if (db == nullptr)
                 return nullptr;
-            return std::make_unique<DbWorker>(updater, std::move(db), TileVersion(settings.mNavMeshVersion),
+            return std::make_unique<DbWorker>(updater, std::move(db), TileVersion(navMeshVersion),
                                               settings.mRecast, settings.mWriteToNavMeshDb);
         }
 
@@ -112,11 +112,11 @@ namespace DetourNavigator
         }
     }
 
-    Job::Job(const osg::Vec3f& agentHalfExtents, std::weak_ptr<GuardedNavMeshCacheItem> navMeshCacheItem,
+    Job::Job(const AgentBounds& agentBounds, std::weak_ptr<GuardedNavMeshCacheItem> navMeshCacheItem,
         std::string_view worldspace, const TilePosition& changedTile, ChangeType changeType, int distanceToPlayer,
         std::chrono::steady_clock::time_point processTime)
         : mId(getNextJobId())
-        , mAgentHalfExtents(agentHalfExtents)
+        , mAgentBounds(agentBounds)
         , mNavMeshCacheItem(std::move(navMeshCacheItem))
         , mWorldspace(worldspace)
         , mChangedTile(changedTile)
@@ -145,7 +145,7 @@ namespace DetourNavigator
         stop();
     }
 
-    void AsyncNavMeshUpdater::post(const osg::Vec3f& agentHalfExtents, const SharedNavMeshCacheItem& navMeshCacheItem,
+    void AsyncNavMeshUpdater::post(const AgentBounds& agentBounds, const SharedNavMeshCacheItem& navMeshCacheItem,
         const TilePosition& playerTile, std::string_view worldspace,
         const std::map<TilePosition, ChangeType>& changedTiles)
     {
@@ -169,16 +169,16 @@ namespace DetourNavigator
 
         for (const auto& [changedTile, changeType] : changedTiles)
         {
-            if (mPushed.emplace(agentHalfExtents, changedTile).second)
+            if (mPushed.emplace(agentBounds, changedTile).second)
             {
                 const auto processTime = changeType == ChangeType::update
-                    ? mLastUpdates[std::tie(agentHalfExtents, changedTile)] + mSettings.get().mMinUpdateInterval
+                    ? mLastUpdates[std::tie(agentBounds, changedTile)] + mSettings.get().mMinUpdateInterval
                     : std::chrono::steady_clock::time_point();
 
-                const JobIt it = mJobs.emplace(mJobs.end(), agentHalfExtents, navMeshCacheItem, worldspace,
+                const JobIt it = mJobs.emplace(mJobs.end(), agentBounds, navMeshCacheItem, worldspace,
                     changedTile, changeType, getManhattanDistance(changedTile, playerTile), processTime);
 
-                Log(Debug::Debug) << "Post job " << it->mId << " for agent=(" << it->mAgentHalfExtents << ")"
+                Log(Debug::Debug) << "Post job " << it->mId << " for agent=(" << it->mAgentBounds << ")"
                     << " changedTile=(" << it->mChangedTile << ")";
 
                 if (playerTileChanged)
@@ -342,7 +342,7 @@ namespace DetourNavigator
                     switch (status)
                     {
                         case JobStatus::Done:
-                            unlockTile(job->mAgentHalfExtents, job->mChangedTile);
+                            unlockTile(job->mAgentBounds, job->mChangedTile);
                             if (job->mGeneratedNavMeshData != nullptr)
                                 mDbWorker->enqueueJob(job);
                             else
@@ -419,7 +419,7 @@ namespace DetourNavigator
             return JobStatus::Done;
         }
 
-        NavMeshTilesCache::Value cachedNavMeshData = mNavMeshTilesCache.get(job.mAgentHalfExtents, job.mChangedTile, *recastMesh);
+        NavMeshTilesCache::Value cachedNavMeshData = mNavMeshTilesCache.get(job.mAgentBounds, job.mChangedTile, *recastMesh);
         std::unique_ptr<PreparedNavMeshData> preparedNavMeshData;
         const PreparedNavMeshData* preparedNavMeshDataPtr = nullptr;
 
@@ -435,7 +435,7 @@ namespace DetourNavigator
                 return JobStatus::MemoryCacheMiss;
             }
 
-            preparedNavMeshData = prepareNavMeshTileData(*recastMesh, job.mChangedTile, job.mAgentHalfExtents, mSettings.get().mRecast);
+            preparedNavMeshData = prepareNavMeshTileData(*recastMesh, job.mChangedTile, job.mAgentBounds, mSettings.get().mRecast);
 
             if (preparedNavMeshData == nullptr)
             {
@@ -450,7 +450,7 @@ namespace DetourNavigator
             }
             else
             {
-                cachedNavMeshData = mNavMeshTilesCache.set(job.mAgentHalfExtents, job.mChangedTile,
+                cachedNavMeshData = mNavMeshTilesCache.set(job.mAgentBounds, job.mChangedTile,
                                                            *recastMesh, std::move(preparedNavMeshData));
                 preparedNavMeshDataPtr = cachedNavMeshData ? &cachedNavMeshData.get() : preparedNavMeshData.get();
             }
@@ -459,7 +459,7 @@ namespace DetourNavigator
         const auto offMeshConnections = mOffMeshConnectionsManager.get().get(job.mChangedTile);
 
         const UpdateNavMeshStatus status = navMeshCacheItem.lock()->updateTile(job.mChangedTile, std::move(cachedNavMeshData),
-            makeNavMeshTileData(*preparedNavMeshDataPtr, offMeshConnections, job.mAgentHalfExtents, job.mChangedTile, mSettings.get().mRecast));
+            makeNavMeshTileData(*preparedNavMeshDataPtr, offMeshConnections, job.mAgentBounds, job.mChangedTile, mSettings.get().mRecast));
 
         return handleUpdateNavMeshStatus(status, job, navMeshCacheItem, *recastMesh);
     }
@@ -471,7 +471,7 @@ namespace DetourNavigator
         std::unique_ptr<PreparedNavMeshData> preparedNavMeshData;
         bool generatedNavMeshData = false;
 
-        if (job.mCachedTileData.has_value() && job.mCachedTileData->mVersion == mSettings.get().mNavMeshVersion)
+        if (job.mCachedTileData.has_value() && job.mCachedTileData->mVersion == navMeshVersion)
         {
             preparedNavMeshData = std::make_unique<PreparedNavMeshData>();
             if (deserialize(job.mCachedTileData->mData, *preparedNavMeshData))
@@ -482,7 +482,7 @@ namespace DetourNavigator
 
         if (preparedNavMeshData == nullptr)
         {
-            preparedNavMeshData = prepareNavMeshTileData(*job.mRecastMesh, job.mChangedTile, job.mAgentHalfExtents, mSettings.get().mRecast);
+            preparedNavMeshData = prepareNavMeshTileData(*job.mRecastMesh, job.mChangedTile, job.mAgentBounds, mSettings.get().mRecast);
             generatedNavMeshData = true;
         }
 
@@ -493,14 +493,14 @@ namespace DetourNavigator
             return JobStatus::Done;
         }
 
-        auto cachedNavMeshData = mNavMeshTilesCache.set(job.mAgentHalfExtents, job.mChangedTile, *job.mRecastMesh,
+        auto cachedNavMeshData = mNavMeshTilesCache.set(job.mAgentBounds, job.mChangedTile, *job.mRecastMesh,
                                                         std::move(preparedNavMeshData));
 
         const auto offMeshConnections = mOffMeshConnectionsManager.get().get(job.mChangedTile);
 
         const PreparedNavMeshData* preparedNavMeshDataPtr = cachedNavMeshData ? &cachedNavMeshData.get() : preparedNavMeshData.get();
         const UpdateNavMeshStatus status = navMeshCacheItem.lock()->updateTile(job.mChangedTile, std::move(cachedNavMeshData),
-            makeNavMeshTileData(*preparedNavMeshDataPtr, offMeshConnections, job.mAgentHalfExtents, job.mChangedTile, mSettings.get().mRecast));
+            makeNavMeshTileData(*preparedNavMeshDataPtr, offMeshConnections, job.mAgentBounds, job.mChangedTile, mSettings.get().mRecast));
 
         const JobStatus result = handleUpdateNavMeshStatus(status, job, navMeshCacheItem, *job.mRecastMesh);
 
@@ -522,12 +522,12 @@ namespace DetourNavigator
         if (status == UpdateNavMeshStatus::removed || status == UpdateNavMeshStatus::lost)
         {
             const std::scoped_lock lock(mMutex);
-            mPresentTiles.erase(std::make_tuple(job.mAgentHalfExtents, job.mChangedTile));
+            mPresentTiles.erase(std::make_tuple(job.mAgentBounds, job.mChangedTile));
         }
         else if (isSuccess(status) && status != UpdateNavMeshStatus::ignored)
         {
             const std::scoped_lock lock(mMutex);
-            mPresentTiles.insert(std::make_tuple(job.mAgentHalfExtents, job.mChangedTile));
+            mPresentTiles.insert(std::make_tuple(job.mAgentBounds, job.mChangedTile));
         }
 
         writeDebugFiles(job, &recastMesh);
@@ -564,7 +564,7 @@ namespace DetourNavigator
         if (job->mRecastMesh != nullptr)
             return job;
 
-        if (!lockTile(job->mAgentHalfExtents, job->mChangedTile))
+        if (!lockTile(job->mAgentBounds, job->mChangedTile))
         {
             Log(Debug::Debug) << "Failed to lock tile by " << job->mId;
             ++job->mTryNumber;
@@ -604,14 +604,14 @@ namespace DetourNavigator
 
     void AsyncNavMeshUpdater::repost(JobIt job)
     {
-        unlockTile(job->mAgentHalfExtents, job->mChangedTile);
+        unlockTile(job->mAgentBounds, job->mChangedTile);
 
         if (mShouldStop || job->mTryNumber > 2)
             return;
 
         const std::lock_guard<std::mutex> lock(mMutex);
 
-        if (mPushed.emplace(job->mAgentHalfExtents, job->mChangedTile).second)
+        if (mPushed.emplace(job->mAgentBounds, job->mChangedTile).second)
         {
             ++job->mTryNumber;
             insertPrioritizedJob(job, mWaiting);
@@ -622,17 +622,17 @@ namespace DetourNavigator
         mJobs.erase(job);
     }
 
-    bool AsyncNavMeshUpdater::lockTile(const osg::Vec3f& agentHalfExtents, const TilePosition& changedTile)
+    bool AsyncNavMeshUpdater::lockTile(const AgentBounds& agentBounds, const TilePosition& changedTile)
     {
-        Log(Debug::Debug) << "Locking tile agent=(" << agentHalfExtents << ") changedTile=(" << changedTile << ")";
-        return mProcessingTiles.lock()->emplace(agentHalfExtents, changedTile).second;
+        Log(Debug::Debug) << "Locking tile agent=" << agentBounds << " changedTile=(" << changedTile << ")";
+        return mProcessingTiles.lock()->emplace(agentBounds, changedTile).second;
     }
 
-    void AsyncNavMeshUpdater::unlockTile(const osg::Vec3f& agentHalfExtents, const TilePosition& changedTile)
+    void AsyncNavMeshUpdater::unlockTile(const AgentBounds& agentBounds, const TilePosition& changedTile)
     {
         auto locked = mProcessingTiles.lock();
-        locked->erase(std::tie(agentHalfExtents, changedTile));
-        Log(Debug::Debug) << "Unlocked tile agent=(" << agentHalfExtents << ") changedTile=(" << changedTile << ")";
+        locked->erase(std::tie(agentBounds, changedTile));
+        Log(Debug::Debug) << "Unlocked tile agent=" << agentBounds << " changedTile=(" << changedTile << ")";
         if (locked->empty())
             mProcessed.notify_all();
     }
@@ -819,7 +819,7 @@ namespace DetourNavigator
             {
                 const auto objects = makeDbRefGeometryObjects(job->mRecastMesh->getMeshSources(),
                     [&] (const MeshSource& v) { return resolveMeshSource(*mDb, v, mNextShapeId); });
-                job->mInput = serialize(mRecastSettings, *job->mRecastMesh, objects);
+                job->mInput = serialize(mRecastSettings, job->mAgentBounds, *job->mRecastMesh, objects);
             }
             else
             {
@@ -827,7 +827,7 @@ namespace DetourNavigator
                     [&] (const MeshSource& v) { return resolveMeshSource(*mDb, v); });
                 if (!objects.has_value())
                     return;
-                job->mInput = serialize(mRecastSettings, *job->mRecastMesh, *objects);
+                job->mInput = serialize(mRecastSettings, job->mAgentBounds, *job->mRecastMesh, *objects);
             }
         }
 
@@ -850,7 +850,7 @@ namespace DetourNavigator
             Log(Debug::Debug) << "Serializing input for job " << job->mId;
             const std::vector<DbRefGeometryObject> objects = makeDbRefGeometryObjects(job->mRecastMesh->getMeshSources(),
                 [&] (const MeshSource& v) { return resolveMeshSource(*mDb, v, mNextShapeId); });
-            job->mInput = serialize(mRecastSettings, *job->mRecastMesh, objects);
+            job->mInput = serialize(mRecastSettings, job->mAgentBounds, *job->mRecastMesh, objects);
         }
 
         if (const auto& cachedTileData = job->mCachedTileData)
diff --git a/components/detournavigator/asyncnavmeshupdater.hpp b/components/detournavigator/asyncnavmeshupdater.hpp
index ec8c849ca8..d0850f0249 100644
--- a/components/detournavigator/asyncnavmeshupdater.hpp
+++ b/components/detournavigator/asyncnavmeshupdater.hpp
@@ -9,6 +9,7 @@
 #include "waitconditiontype.hpp"
 #include "navmeshdb.hpp"
 #include "changetype.hpp"
+#include "agentbounds.hpp"
 
 #include <osg/Vec3f>
 
@@ -42,7 +43,7 @@ namespace DetourNavigator
     struct Job
     {
         const std::size_t mId;
-        const osg::Vec3f mAgentHalfExtents;
+        const AgentBounds mAgentBounds;
         const std::weak_ptr<GuardedNavMeshCacheItem> mNavMeshCacheItem;
         const std::string mWorldspace;
         const TilePosition mChangedTile;
@@ -57,7 +58,7 @@ namespace DetourNavigator
         std::optional<TileData> mCachedTileData;
         std::unique_ptr<PreparedNavMeshData> mGeneratedNavMeshData;
 
-        Job(const osg::Vec3f& agentHalfExtents, std::weak_ptr<GuardedNavMeshCacheItem> navMeshCacheItem,
+        Job(const AgentBounds& agentBounds, std::weak_ptr<GuardedNavMeshCacheItem> navMeshCacheItem,
             std::string_view worldspace, const TilePosition& changedTile, ChangeType changeType, int distanceToPlayer,
             std::chrono::steady_clock::time_point processTime);
     };
@@ -166,7 +167,7 @@ namespace DetourNavigator
             OffMeshConnectionsManager& offMeshConnectionsManager, std::unique_ptr<NavMeshDb>&& db);
         ~AsyncNavMeshUpdater();
 
-        void post(const osg::Vec3f& agentHalfExtents, const SharedNavMeshCacheItem& navMeshCacheItem,
+        void post(const AgentBounds& agentBounds, const SharedNavMeshCacheItem& navMeshCacheItem,
             const TilePosition& playerTile, std::string_view worldspace,
             const std::map<TilePosition, ChangeType>& changedTiles);
 
@@ -191,12 +192,12 @@ namespace DetourNavigator
         std::condition_variable mProcessed;
         std::list<Job> mJobs;
         std::deque<JobIt> mWaiting;
-        std::set<std::tuple<osg::Vec3f, TilePosition>> mPushed;
+        std::set<std::tuple<AgentBounds, TilePosition>> mPushed;
         Misc::ScopeGuarded<TilePosition> mPlayerTile;
         NavMeshTilesCache mNavMeshTilesCache;
-        Misc::ScopeGuarded<std::set<std::tuple<osg::Vec3f, TilePosition>>> mProcessingTiles;
-        std::map<std::tuple<osg::Vec3f, TilePosition>, std::chrono::steady_clock::time_point> mLastUpdates;
-        std::set<std::tuple<osg::Vec3f, TilePosition>> mPresentTiles;
+        Misc::ScopeGuarded<std::set<std::tuple<AgentBounds, TilePosition>>> mProcessingTiles;
+        std::map<std::tuple<AgentBounds, TilePosition>, std::chrono::steady_clock::time_point> mLastUpdates;
+        std::set<std::tuple<AgentBounds, TilePosition>> mPresentTiles;
         std::vector<std::thread> mThreads;
         std::unique_ptr<DbWorker> mDbWorker;
         std::atomic_size_t mDbGetTileHits {0};
@@ -220,9 +221,9 @@ namespace DetourNavigator
 
         void repost(JobIt job);
 
-        bool lockTile(const osg::Vec3f& agentHalfExtents, const TilePosition& changedTile);
+        bool lockTile(const AgentBounds& agentBounds, const TilePosition& changedTile);
 
-        void unlockTile(const osg::Vec3f& agentHalfExtents, const TilePosition& changedTile);
+        void unlockTile(const AgentBounds& agentBounds, const TilePosition& changedTile);
 
         inline std::size_t getTotalJobs() const;
 
diff --git a/components/detournavigator/collisionshapetype.hpp b/components/detournavigator/collisionshapetype.hpp
new file mode 100644
index 0000000000..3964840ecf
--- /dev/null
+++ b/components/detournavigator/collisionshapetype.hpp
@@ -0,0 +1,17 @@
+#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_COLLISIONSHAPETYPE_H
+#define OPENMW_COMPONENTS_DETOURNAVIGATOR_COLLISIONSHAPETYPE_H
+
+#include <cstdint>
+
+namespace DetourNavigator
+{
+    enum class CollisionShapeType : std::uint8_t
+    {
+        Aabb = 0,
+        RotatingBox = 1,
+    };
+
+    inline constexpr CollisionShapeType defaultCollisionShapeType = CollisionShapeType::Aabb;
+}
+
+#endif
diff --git a/components/detournavigator/debug.hpp b/components/detournavigator/debug.hpp
index ce1e2d2023..091e49821c 100644
--- a/components/detournavigator/debug.hpp
+++ b/components/detournavigator/debug.hpp
@@ -4,6 +4,7 @@
 #include "tilebounds.hpp"
 #include "status.hpp"
 #include "recastmesh.hpp"
+#include "agentbounds.hpp"
 
 #include <osg/io_utils>
 
@@ -69,6 +70,21 @@ namespace DetourNavigator
         return s << ", .mOriginalSize=" << v.mOriginalSize << "}";
     }
 
+    inline std::ostream& operator<<(std::ostream& s, CollisionShapeType v)
+    {
+        switch (v)
+        {
+            case CollisionShapeType::Aabb: return s << "AgentShapeType::Aabb";
+            case CollisionShapeType::RotatingBox: return s << "AgentShapeType::RotatingBox";
+        }
+        return s << "AgentShapeType::" << static_cast<std::underlying_type_t<CollisionShapeType>>(v);
+    }
+
+    inline std::ostream& operator<<(std::ostream& s, const AgentBounds& v)
+    {
+        return s << "AgentBounds {" << v.mShapeType << ", " << v.mHalfExtents << "}";
+    }
+
     class RecastMesh;
     struct RecastSettings;
 
diff --git a/components/detournavigator/generatenavmeshtile.cpp b/components/detournavigator/generatenavmeshtile.cpp
index 3475b4ee8a..41b60d4a75 100644
--- a/components/detournavigator/generatenavmeshtile.cpp
+++ b/components/detournavigator/generatenavmeshtile.cpp
@@ -38,12 +38,12 @@ namespace DetourNavigator
     }
 
     GenerateNavMeshTile::GenerateNavMeshTile(std::string worldspace, const TilePosition& tilePosition,
-            RecastMeshProvider recastMeshProvider, const osg::Vec3f& agentHalfExtents,
+            RecastMeshProvider recastMeshProvider, const AgentBounds& agentBounds,
             const DetourNavigator::Settings& settings, std::weak_ptr<NavMeshTileConsumer> consumer)
         : mWorldspace(std::move(worldspace))
         , mTilePosition(tilePosition)
         , mRecastMeshProvider(recastMeshProvider)
-        , mAgentHalfExtents(agentHalfExtents)
+        , mAgentBounds(agentBounds)
         , mSettings(settings)
         , mConsumer(std::move(consumer)) {}
 
@@ -70,25 +70,25 @@ namespace DetourNavigator
 
             const std::vector<DbRefGeometryObject> objects = makeDbRefGeometryObjects(recastMesh->getMeshSources(),
                 [&] (const MeshSource& v) { return consumer->resolveMeshSource(v); });
-            std::vector<std::byte> input = serialize(mSettings.mRecast, *recastMesh, objects);
+            std::vector<std::byte> input = serialize(mSettings.mRecast, mAgentBounds, *recastMesh, objects);
             const std::optional<NavMeshTileInfo> info = consumer->find(mWorldspace, mTilePosition, input);
 
-            if (info.has_value() && info->mVersion == mSettings.mNavMeshVersion)
+            if (info.has_value() && info->mVersion == navMeshVersion)
             {
                 consumer->identity(mWorldspace, mTilePosition, info->mTileId);
                 ignore.mConsumer = nullptr;
                 return;
             }
 
-            const auto data = prepareNavMeshTileData(*recastMesh, mTilePosition, mAgentHalfExtents, mSettings.mRecast);
+            const auto data = prepareNavMeshTileData(*recastMesh, mTilePosition, mAgentBounds, mSettings.mRecast);
 
             if (data == nullptr)
                 return;
 
             if (info.has_value())
-                consumer->update(mWorldspace, mTilePosition, info->mTileId, mSettings.mNavMeshVersion, *data);
+                consumer->update(mWorldspace, mTilePosition, info->mTileId, navMeshVersion, *data);
             else
-                consumer->insert(mWorldspace, mTilePosition, mSettings.mNavMeshVersion, input, *data);
+                consumer->insert(mWorldspace, mTilePosition, navMeshVersion, input, *data);
 
             ignore.mConsumer = nullptr;
         }
diff --git a/components/detournavigator/generatenavmeshtile.hpp b/components/detournavigator/generatenavmeshtile.hpp
index ecdf1c8bc0..0fc7341ff1 100644
--- a/components/detournavigator/generatenavmeshtile.hpp
+++ b/components/detournavigator/generatenavmeshtile.hpp
@@ -3,6 +3,7 @@
 
 #include "recastmeshprovider.hpp"
 #include "tileposition.hpp"
+#include "agentbounds.hpp"
 
 #include <components/sceneutil/workqueue.hpp>
 
@@ -57,7 +58,7 @@ namespace DetourNavigator
     {
     public:
         GenerateNavMeshTile(std::string worldspace, const TilePosition& tilePosition,
-                RecastMeshProvider recastMeshProvider, const osg::Vec3f& agentHalfExtents, const Settings& settings,
+                RecastMeshProvider recastMeshProvider, const AgentBounds& agentBounds, const Settings& settings,
                 std::weak_ptr<NavMeshTileConsumer> consumer);
 
         void doWork() final;
@@ -66,7 +67,7 @@ namespace DetourNavigator
         const std::string mWorldspace;
         const TilePosition mTilePosition;
         const RecastMeshProvider mRecastMeshProvider;
-        const osg::Vec3f mAgentHalfExtents;
+        const AgentBounds mAgentBounds;
         const Settings& mSettings;
         std::weak_ptr<NavMeshTileConsumer> mConsumer;
 
diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index 97c5377558..3b26ad696f 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -101,9 +101,9 @@ namespace
         return result;
     }
 
-    float getHeight(const RecastSettings& settings,const osg::Vec3f& agentHalfExtents)
+    float getHeight(const RecastSettings& settings,const AgentBounds& agentBounds)
     {
-        return getAgentHeight(agentHalfExtents) * settings.mRecastScaleFactor;
+        return getAgentHeight(agentBounds) * settings.mRecastScaleFactor;
     }
 
     float getMaxClimb(const RecastSettings& settings)
@@ -111,14 +111,14 @@ namespace
         return settings.mMaxClimb * settings.mRecastScaleFactor;
     }
 
-    float getRadius(const RecastSettings& settings, const osg::Vec3f& agentHalfExtents)
+    float getRadius(const RecastSettings& settings, const AgentBounds& agentBounds)
     {
-        return getAgentRadius(agentHalfExtents) * settings.mRecastScaleFactor;
+        return getAgentRadius(agentBounds) * settings.mRecastScaleFactor;
     }
 
     float getSwimLevel(const RecastSettings& settings, const float waterLevel, const float agentHalfExtentsZ)
     {
-        return waterLevel - settings.mSwimHeightScale * agentHalfExtentsZ - agentHalfExtentsZ;;
+        return waterLevel - settings.mSwimHeightScale * agentHalfExtentsZ - agentHalfExtentsZ;
     }
 
     struct RecastParams
@@ -131,13 +131,13 @@ namespace
         int mWalkableRadius = 0;
     };
 
-    RecastParams makeRecastParams(const RecastSettings& settings, const osg::Vec3f& agentHalfExtents)
+    RecastParams makeRecastParams(const RecastSettings& settings, const AgentBounds& agentBounds)
     {
         RecastParams result;
 
-        result.mWalkableHeight = static_cast<int>(std::ceil(getHeight(settings, agentHalfExtents) / settings.mCellHeight));
+        result.mWalkableHeight = static_cast<int>(std::ceil(getHeight(settings, agentBounds) / settings.mCellHeight));
         result.mWalkableClimb = static_cast<int>(std::floor(getMaxClimb(settings) / settings.mCellHeight));
-        result.mWalkableRadius = static_cast<int>(std::ceil(getRadius(settings, agentHalfExtents) / settings.mCellSize));
+        result.mWalkableRadius = static_cast<int>(std::ceil(getRadius(settings, agentBounds) / settings.mCellSize));
         result.mMaxEdgeLen = static_cast<int>(std::round(static_cast<float>(settings.mMaxEdgeLen) / settings.mCellSize));
         result.mSampleDist = settings.mDetailSampleDist < 0.9f ? 0 : settings.mCellSize * settings.mDetailSampleDist;
         result.mSampleMaxError = settings.mCellHeight * settings.mDetailSampleMaxError;
@@ -227,7 +227,7 @@ namespace
         );
     }
 
-    bool rasterizeTriangles(rcContext& context, const osg::Vec3f& agentHalfExtents, const std::vector<CellWater>& water,
+    bool rasterizeTriangles(rcContext& context, float agentHalfExtentsZ, const std::vector<CellWater>& water,
         const RecastSettings& settings, const RecastParams& params, const TileBounds& realTileBounds, rcHeightfield& solid)
     {
         for (const CellWater& cellWater : water)
@@ -237,7 +237,7 @@ namespace
             {
                 const Rectangle rectangle {
                     toNavMeshCoordinates(settings, *intersection),
-                    toNavMeshCoordinates(settings, getSwimLevel(settings, cellWater.mWater.mLevel, agentHalfExtents.z()))
+                    toNavMeshCoordinates(settings, getSwimLevel(settings, cellWater.mWater.mLevel, agentHalfExtentsZ))
                 };
                 if (!rasterizeTriangles(context, rectangle, AreaType_water, params, solid))
                     return false;
@@ -277,12 +277,12 @@ namespace
         return true;
     }
 
-    bool rasterizeTriangles(rcContext& context, const TilePosition& tilePosition, const osg::Vec3f& agentHalfExtents,
+    bool rasterizeTriangles(rcContext& context, const TilePosition& tilePosition, float agentHalfExtentsZ,
         const RecastMesh& recastMesh, const RecastSettings& settings, const RecastParams& params, rcHeightfield& solid)
     {
         const TileBounds realTileBounds = makeRealTileBoundsWithBorder(settings, tilePosition);
         return rasterizeTriangles(context, recastMesh.getMesh(), settings, params, solid)
-            && rasterizeTriangles(context, agentHalfExtents, recastMesh.getWater(), settings, params, realTileBounds, solid)
+            && rasterizeTriangles(context, agentHalfExtentsZ, recastMesh.getWater(), settings, params, realTileBounds, solid)
             && rasterizeTriangles(context, recastMesh.getHeightfields(), settings, params, solid)
             && rasterizeTriangles(context, realTileBounds, recastMesh.getFlatHeightfields(), settings, params, solid);
     }
@@ -389,7 +389,7 @@ namespace
         return power;
     }
 
-    std::pair<float, float> getBoundsByZ(const RecastMesh& recastMesh, const osg::Vec3f& agentHalfExtents, const RecastSettings& settings)
+    std::pair<float, float> getBoundsByZ(const RecastMesh& recastMesh, float agentHalfExtentsZ, const RecastSettings& settings)
     {
         float minZ = 0;
         float maxZ = 0;
@@ -403,7 +403,7 @@ namespace
 
         for (const CellWater& water : recastMesh.getWater())
         {
-            const float swimLevel = getSwimLevel(settings, water.mWater.mLevel, agentHalfExtents.z());
+            const float swimLevel = getSwimLevel(settings, water.mWater.mLevel, agentHalfExtentsZ);
             minZ = std::min(minZ, swimLevel);
             maxZ = std::max(maxZ, swimLevel);
         }
@@ -431,19 +431,19 @@ namespace
 namespace DetourNavigator
 {
     std::unique_ptr<PreparedNavMeshData> prepareNavMeshTileData(const RecastMesh& recastMesh,
-        const TilePosition& tilePosition, const osg::Vec3f& agentHalfExtents, const RecastSettings& settings)
+        const TilePosition& tilePosition, const AgentBounds& agentBounds, const RecastSettings& settings)
     {
         rcContext context;
 
-        const auto [minZ, maxZ] = getBoundsByZ(recastMesh, agentHalfExtents, settings);
+        const auto [minZ, maxZ] = getBoundsByZ(recastMesh, agentBounds.mHalfExtents.z(), settings);
 
         rcHeightfield solid;
         initHeightfield(context, tilePosition, toNavMeshCoordinates(settings, minZ),
                         toNavMeshCoordinates(settings, maxZ), settings, solid);
 
-        const RecastParams params = makeRecastParams(settings, agentHalfExtents);
+        const RecastParams params = makeRecastParams(settings, agentBounds);
 
-        if (!rasterizeTriangles(context, tilePosition, agentHalfExtents, recastMesh, settings, params, solid))
+        if (!rasterizeTriangles(context, tilePosition, agentBounds.mHalfExtents.z(), recastMesh, settings, params, solid))
             return nullptr;
 
         rcFilterLowHangingWalkableObstacles(&context, params.mWalkableClimb, solid);
@@ -462,11 +462,11 @@ namespace DetourNavigator
     }
 
     NavMeshData makeNavMeshTileData(const PreparedNavMeshData& data,
-        const std::vector<OffMeshConnection>& offMeshConnections, const osg::Vec3f& agentHalfExtents,
+        const std::vector<OffMeshConnection>& offMeshConnections, const AgentBounds& agentBounds,
         const TilePosition& tile, const RecastSettings& settings)
     {
         const auto offMeshConVerts = getOffMeshVerts(offMeshConnections);
-        const std::vector<float> offMeshConRad(offMeshConnections.size(), getRadius(settings, agentHalfExtents));
+        const std::vector<float> offMeshConRad(offMeshConnections.size(), getRadius(settings, agentBounds));
         const std::vector<unsigned char> offMeshConDir(offMeshConnections.size(), 0);
         const std::vector<unsigned char> offMeshConAreas = getOffMeshConAreas(offMeshConnections);
         const std::vector<unsigned short> offMeshConFlags = getOffMeshFlags(offMeshConnections);
@@ -491,8 +491,8 @@ namespace DetourNavigator
         params.offMeshConFlags = offMeshConFlags.data();
         params.offMeshConUserID = nullptr;
         params.offMeshConCount = static_cast<int>(offMeshConnections.size());
-        params.walkableHeight = getHeight(settings, agentHalfExtents);
-        params.walkableRadius = getRadius(settings, agentHalfExtents);
+        params.walkableHeight = getHeight(settings, agentBounds);
+        params.walkableRadius = getRadius(settings, agentBounds);
         params.walkableClimb = getMaxClimb(settings);
         rcVcopy(params.bmin, data.mPolyMesh.bmin);
         rcVcopy(params.bmax, data.mPolyMesh.bmax);
diff --git a/components/detournavigator/makenavmesh.hpp b/components/detournavigator/makenavmesh.hpp
index 14919ab134..b890c5fcff 100644
--- a/components/detournavigator/makenavmesh.hpp
+++ b/components/detournavigator/makenavmesh.hpp
@@ -51,10 +51,10 @@ namespace DetourNavigator
     }
 
     std::unique_ptr<PreparedNavMeshData> prepareNavMeshTileData(const RecastMesh& recastMesh,
-        const TilePosition& tilePosition, const osg::Vec3f& agentHalfExtents, const RecastSettings& settings);
+        const TilePosition& tilePosition, const AgentBounds& agentBounds, const RecastSettings& settings);
 
     NavMeshData makeNavMeshTileData(const PreparedNavMeshData& data,
-        const std::vector<OffMeshConnection>& offMeshConnections, const osg::Vec3f& agentHalfExtents,
+        const std::vector<OffMeshConnection>& offMeshConnections, const AgentBounds& agentBounds,
         const TilePosition& tile, const RecastSettings& settings);
 
     NavMeshPtr makeEmptyNavMesh(const Settings& settings);
diff --git a/components/detournavigator/navigator.hpp b/components/detournavigator/navigator.hpp
index 65f7c43fc1..df2b202cdd 100644
--- a/components/detournavigator/navigator.hpp
+++ b/components/detournavigator/navigator.hpp
@@ -26,6 +26,7 @@ namespace Loading
 namespace DetourNavigator
 {
     struct Settings;
+    struct AgentBounds;
 
     struct ObjectShapes
     {
@@ -66,16 +67,16 @@ namespace DetourNavigator
 
         /**
          * @brief addAgent should be called for each agent even if all of them has same half extents.
-         * @param agentHalfExtents allows to setup bounding cylinder for each agent, for each different half extents
+         * @param agentBounds allows to setup bounding cylinder for each agent, for each different half extents
          * there is different navmesh.
          */
-        virtual void addAgent(const osg::Vec3f& agentHalfExtents) = 0;
+        virtual void addAgent(const AgentBounds& agentBounds) = 0;
 
         /**
          * @brief removeAgent should be called for each agent even if all of them has same half extents
-         * @param agentHalfExtents allows determine which agent to remove
+         * @param agentBounds allows determine which agent to remove
          */
-        virtual void removeAgent(const osg::Vec3f& agentHalfExtents) = 0;
+        virtual void removeAgent(const AgentBounds& agentBounds) = 0;
 
         /**
          * @brief setWorldspace should be called before adding object from new worldspace
@@ -185,13 +186,13 @@ namespace DetourNavigator
          * @brief getNavMesh returns navmesh for specific agent half extents
          * @return navmesh
          */
-        virtual SharedNavMeshCacheItem getNavMesh(const osg::Vec3f& agentHalfExtents) const = 0;
+        virtual SharedNavMeshCacheItem getNavMesh(const AgentBounds& agentBounds) const = 0;
 
         /**
          * @brief getNavMeshes returns all current navmeshes
          * @return map of agent half extents to navmesh
          */
-        virtual std::map<osg::Vec3f, SharedNavMeshCacheItem> getNavMeshes() const = 0;
+        virtual std::map<AgentBounds, SharedNavMeshCacheItem> getNavMeshes() const = 0;
 
         virtual const Settings& getSettings() const = 0;
 
diff --git a/components/detournavigator/navigatorimpl.cpp b/components/detournavigator/navigatorimpl.cpp
index 42cd8bd9d1..e1b2df55ed 100644
--- a/components/detournavigator/navigatorimpl.cpp
+++ b/components/detournavigator/navigatorimpl.cpp
@@ -16,17 +16,17 @@ namespace DetourNavigator
     {
     }
 
-    void NavigatorImpl::addAgent(const osg::Vec3f& agentHalfExtents)
+    void NavigatorImpl::addAgent(const AgentBounds& agentBounds)
     {
-        if(agentHalfExtents.length2() <= 0)
+        if(agentBounds.mHalfExtents.length2() <= 0)
             return;
-        ++mAgents[agentHalfExtents];
-        mNavMeshManager.addAgent(agentHalfExtents);
+        ++mAgents[agentBounds];
+        mNavMeshManager.addAgent(agentBounds);
     }
 
-    void NavigatorImpl::removeAgent(const osg::Vec3f& agentHalfExtents)
+    void NavigatorImpl::removeAgent(const AgentBounds& agentBounds)
     {
-        const auto it = mAgents.find(agentHalfExtents);
+        const auto it = mAgents.find(agentBounds);
         if (it == mAgents.end())
             return;
         if (it->second > 0)
@@ -178,12 +178,12 @@ namespace DetourNavigator
         mNavMeshManager.wait(listener, waitConditionType);
     }
 
-    SharedNavMeshCacheItem NavigatorImpl::getNavMesh(const osg::Vec3f& agentHalfExtents) const
+    SharedNavMeshCacheItem NavigatorImpl::getNavMesh(const AgentBounds& agentBounds) const
     {
-        return mNavMeshManager.getNavMesh(agentHalfExtents);
+        return mNavMeshManager.getNavMesh(agentBounds);
     }
 
-    std::map<osg::Vec3f, SharedNavMeshCacheItem> NavigatorImpl::getNavMeshes() const
+    std::map<AgentBounds, SharedNavMeshCacheItem> NavigatorImpl::getNavMeshes() const
     {
         return mNavMeshManager.getNavMeshes();
     }
diff --git a/components/detournavigator/navigatorimpl.hpp b/components/detournavigator/navigatorimpl.hpp
index 58c4c6c05d..f7b2d6d8c8 100644
--- a/components/detournavigator/navigatorimpl.hpp
+++ b/components/detournavigator/navigatorimpl.hpp
@@ -18,9 +18,9 @@ namespace DetourNavigator
          */
         explicit NavigatorImpl(const Settings& settings, std::unique_ptr<NavMeshDb>&& db);
 
-        void addAgent(const osg::Vec3f& agentHalfExtents) override;
+        void addAgent(const AgentBounds& agentBounds) override;
 
-        void removeAgent(const osg::Vec3f& agentHalfExtents) override;
+        void removeAgent(const AgentBounds& agentBounds) override;
 
         void setWorldspace(std::string_view worldspace) override;
 
@@ -56,9 +56,9 @@ namespace DetourNavigator
 
         void wait(Loading::Listener& listener, WaitConditionType waitConditionType) override;
 
-        SharedNavMeshCacheItem getNavMesh(const osg::Vec3f& agentHalfExtents) const override;
+        SharedNavMeshCacheItem getNavMesh(const AgentBounds& agentBounds) const override;
 
-        std::map<osg::Vec3f, SharedNavMeshCacheItem> getNavMeshes() const override;
+        std::map<AgentBounds, SharedNavMeshCacheItem> getNavMeshes() const override;
 
         const Settings& getSettings() const override;
 
@@ -73,7 +73,7 @@ namespace DetourNavigator
         NavMeshManager mNavMeshManager;
         bool mUpdatesEnabled;
         std::optional<TilePosition> mLastPlayerPosition;
-        std::map<osg::Vec3f, std::size_t> mAgents;
+        std::map<AgentBounds, std::size_t> mAgents;
         std::unordered_map<ObjectId, ObjectId> mAvoidIds;
         std::unordered_map<ObjectId, ObjectId> mWaterIds;
 
diff --git a/components/detournavigator/navigatorstub.hpp b/components/detournavigator/navigatorstub.hpp
index 466ff5c912..1eb1860217 100644
--- a/components/detournavigator/navigatorstub.hpp
+++ b/components/detournavigator/navigatorstub.hpp
@@ -2,6 +2,7 @@
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_NAVIGATORSTUB_H
 
 #include "navigator.hpp"
+#include "settings.hpp"
 
 namespace Loading
 {
@@ -15,9 +16,9 @@ namespace DetourNavigator
     public:
         NavigatorStub() = default;
 
-        void addAgent(const osg::Vec3f& /*agentHalfExtents*/) override {}
+        void addAgent(const AgentBounds& /*agentBounds*/) override {}
 
-        void removeAgent(const osg::Vec3f& /*agentHalfExtents*/) override {}
+        void removeAgent(const AgentBounds& /*agentBounds*/) override {}
 
         void setWorldspace(std::string_view /*worldspace*/) override {}
 
@@ -80,14 +81,14 @@ namespace DetourNavigator
 
         void wait(Loading::Listener& /*listener*/, WaitConditionType /*waitConditionType*/) override {}
 
-        SharedNavMeshCacheItem getNavMesh(const osg::Vec3f& /*agentHalfExtents*/) const override
+        SharedNavMeshCacheItem getNavMesh(const AgentBounds& /*agentBounds*/) const override
         {
             return mEmptyNavMeshCacheItem;
         }
 
-        std::map<osg::Vec3f, SharedNavMeshCacheItem> getNavMeshes() const override
+        std::map<AgentBounds, SharedNavMeshCacheItem> getNavMeshes() const override
         {
-            return std::map<osg::Vec3f, SharedNavMeshCacheItem>();
+            return {};
         }
 
         const Settings& getSettings() const override
diff --git a/components/detournavigator/navigatorutils.cpp b/components/detournavigator/navigatorutils.cpp
index a64343905d..450fab6a6d 100644
--- a/components/detournavigator/navigatorutils.cpp
+++ b/components/detournavigator/navigatorutils.cpp
@@ -5,30 +5,30 @@
 
 namespace DetourNavigator
 {
-    std::optional<osg::Vec3f> findRandomPointAroundCircle(const Navigator& navigator, const osg::Vec3f& agentHalfExtents,
+    std::optional<osg::Vec3f> findRandomPointAroundCircle(const Navigator& navigator, const AgentBounds& agentBounds,
         const osg::Vec3f& start, const float maxRadius, const Flags includeFlags, float(*prng)())
     {
-        const auto navMesh = navigator.getNavMesh(agentHalfExtents);
+        const auto navMesh = navigator.getNavMesh(agentBounds);
         if (!navMesh)
             return std::nullopt;
         const auto& settings = navigator.getSettings();
         const auto result = DetourNavigator::findRandomPointAroundCircle(navMesh->lockConst()->getImpl(),
-            toNavMeshCoordinates(settings.mRecast, agentHalfExtents), toNavMeshCoordinates(settings.mRecast, start),
+            toNavMeshCoordinates(settings.mRecast, agentBounds.mHalfExtents), toNavMeshCoordinates(settings.mRecast, start),
             toNavMeshCoordinates(settings.mRecast, maxRadius), includeFlags, settings.mDetour, prng);
         if (!result)
             return std::nullopt;
         return std::optional<osg::Vec3f>(fromNavMeshCoordinates(settings.mRecast, *result));
     }
 
-    std::optional<osg::Vec3f> raycast(const Navigator& navigator, const osg::Vec3f& agentHalfExtents, const osg::Vec3f& start,
+    std::optional<osg::Vec3f> raycast(const Navigator& navigator, const AgentBounds& agentBounds, const osg::Vec3f& start,
         const osg::Vec3f& end, const Flags includeFlags)
     {
-        const auto navMesh = navigator.getNavMesh(agentHalfExtents);
+        const auto navMesh = navigator.getNavMesh(agentBounds);
         if (navMesh == nullptr)
             return std::nullopt;
         const auto& settings = navigator.getSettings();
         const auto result = DetourNavigator::raycast(navMesh->lockConst()->getImpl(),
-            toNavMeshCoordinates(settings.mRecast, agentHalfExtents), toNavMeshCoordinates(settings.mRecast, start),
+            toNavMeshCoordinates(settings.mRecast, agentBounds.mHalfExtents), toNavMeshCoordinates(settings.mRecast, start),
             toNavMeshCoordinates(settings.mRecast, end), includeFlags, settings.mDetour);
         if (!result)
             return std::nullopt;
diff --git a/components/detournavigator/navigatorutils.hpp b/components/detournavigator/navigatorutils.hpp
index 8bd1499897..44db7b40fe 100644
--- a/components/detournavigator/navigatorutils.hpp
+++ b/components/detournavigator/navigatorutils.hpp
@@ -12,7 +12,7 @@ namespace DetourNavigator
 {
     /**
      * @brief findPath fills output iterator with points of scene surfaces to be used for actor to walk through.
-     * @param agentHalfExtents allows to find navmesh for given actor.
+     * @param agentBounds allows to find navmesh for given actor.
      * @param start path from given point.
      * @param end path at given point.
      * @param includeFlags setup allowed surfaces for actor to walk.
@@ -22,8 +22,8 @@ namespace DetourNavigator
      * Equal to out if no path is found.
      */
     template <class OutputIterator>
-    inline Status findPath(const Navigator& navigator, const osg::Vec3f& agentHalfExtents, const float stepSize, const osg::Vec3f& start,
-        const osg::Vec3f& end, const Flags includeFlags, const DetourNavigator::AreaCosts& areaCosts,
+    inline Status findPath(const Navigator& navigator, const AgentBounds& agentBounds, const float stepSize,
+        const osg::Vec3f& start, const osg::Vec3f& end, const Flags includeFlags, const AreaCosts& areaCosts,
         float endTolerance, OutputIterator& out)
     {
         static_assert(
@@ -33,35 +33,35 @@ namespace DetourNavigator
             >::value,
             "out is not an OutputIterator"
         );
-        const auto navMesh = navigator.getNavMesh(agentHalfExtents);
+        const auto navMesh = navigator.getNavMesh(agentBounds);
         if (navMesh == nullptr)
             return Status::NavMeshNotFound;
         const auto settings = navigator.getSettings();
-        return findSmoothPath(navMesh->lockConst()->getImpl(), toNavMeshCoordinates(settings.mRecast, agentHalfExtents),
+        return findSmoothPath(navMesh->lockConst()->getImpl(), toNavMeshCoordinates(settings.mRecast, agentBounds.mHalfExtents),
             toNavMeshCoordinates(settings.mRecast, stepSize), toNavMeshCoordinates(settings.mRecast, start),
             toNavMeshCoordinates(settings.mRecast, end), includeFlags, areaCosts, settings, endTolerance, out);
     }
 
     /**
      * @brief findRandomPointAroundCircle returns random location on navmesh within the reach of specified location.
-     * @param agentHalfExtents allows to find navmesh for given actor.
+     * @param agentBounds allows to find navmesh for given actor.
      * @param start path from given point.
      * @param maxRadius limit maximum distance from start.
      * @param includeFlags setup allowed surfaces for actor to walk.
      * @return not empty optional with position if point is found and empty optional if point is not found.
      */
-    std::optional<osg::Vec3f> findRandomPointAroundCircle(const Navigator& navigator, const osg::Vec3f& agentHalfExtents,
+    std::optional<osg::Vec3f> findRandomPointAroundCircle(const Navigator& navigator, const AgentBounds& agentBounds,
         const osg::Vec3f& start, const float maxRadius, const Flags includeFlags, float(*prng)());
 
     /**
      * @brief raycast finds farest navmesh point from start on a line from start to end that has path from start.
-     * @param agentHalfExtents allows to find navmesh for given actor.
+     * @param agentBounds allows to find navmesh for given actor.
      * @param start of the line
      * @param end of the line
      * @param includeFlags setup allowed surfaces for actor to walk.
      * @return not empty optional with position if point is found and empty optional if point is not found.
      */
-    std::optional<osg::Vec3f> raycast(const Navigator& navigator, const osg::Vec3f& agentHalfExtents, const osg::Vec3f& start,
+    std::optional<osg::Vec3f> raycast(const Navigator& navigator, const AgentBounds& agentBounds, const osg::Vec3f& start,
         const osg::Vec3f& end, const Flags includeFlags);
 }
 
diff --git a/components/detournavigator/navmeshmanager.cpp b/components/detournavigator/navmeshmanager.cpp
index bbaf010807..ccab20a5aa 100644
--- a/components/detournavigator/navmeshmanager.cpp
+++ b/components/detournavigator/navmeshmanager.cpp
@@ -151,27 +151,27 @@ namespace DetourNavigator
         return true;
     }
 
-    void NavMeshManager::addAgent(const osg::Vec3f& agentHalfExtents)
+    void NavMeshManager::addAgent(const AgentBounds& agentBounds)
     {
-        auto cached = mCache.find(agentHalfExtents);
+        auto cached = mCache.find(agentBounds);
         if (cached != mCache.end())
             return;
-        mCache.insert(std::make_pair(agentHalfExtents,
+        mCache.insert(std::make_pair(agentBounds,
             std::make_shared<GuardedNavMeshCacheItem>(makeEmptyNavMesh(mSettings), ++mGenerationCounter)));
-        Log(Debug::Debug) << "cache add for agent=" << agentHalfExtents;
+        Log(Debug::Debug) << "cache add for agent=" << agentBounds;
     }
 
-    bool NavMeshManager::reset(const osg::Vec3f& agentHalfExtents)
+    bool NavMeshManager::reset(const AgentBounds& agentBounds)
     {
-        const auto it = mCache.find(agentHalfExtents);
+        const auto it = mCache.find(agentBounds);
         if (it == mCache.end())
             return true;
         if (!resetIfUnique(it->second))
             return false;
-        mCache.erase(agentHalfExtents);
-        mChangedTiles.erase(agentHalfExtents);
-        mPlayerTile.erase(agentHalfExtents);
-        mLastRecastMeshManagerRevision.erase(agentHalfExtents);
+        mCache.erase(agentBounds);
+        mChangedTiles.erase(agentBounds);
+        mPlayerTile.erase(agentBounds);
+        mLastRecastMeshManagerRevision.erase(agentBounds);
         return true;
     }
 
@@ -195,28 +195,28 @@ namespace DetourNavigator
             addChangedTile(tile, ChangeType::update);
     }
 
-    void NavMeshManager::update(const osg::Vec3f& playerPosition, const osg::Vec3f& agentHalfExtents)
+    void NavMeshManager::update(const osg::Vec3f& playerPosition, const AgentBounds& agentBounds)
     {
         const auto playerTile = getTilePosition(mSettings.mRecast, toNavMeshCoordinates(mSettings.mRecast, playerPosition));
-        auto& lastRevision = mLastRecastMeshManagerRevision[agentHalfExtents];
-        auto lastPlayerTile = mPlayerTile.find(agentHalfExtents);
+        auto& lastRevision = mLastRecastMeshManagerRevision[agentBounds];
+        auto lastPlayerTile = mPlayerTile.find(agentBounds);
         if (lastRevision == mRecastMeshManager.getRevision() && lastPlayerTile != mPlayerTile.end()
                 && lastPlayerTile->second == playerTile)
             return;
         lastRevision = mRecastMeshManager.getRevision();
         if (lastPlayerTile == mPlayerTile.end())
-            lastPlayerTile = mPlayerTile.insert(std::make_pair(agentHalfExtents, playerTile)).first;
+            lastPlayerTile = mPlayerTile.insert(std::make_pair(agentBounds, playerTile)).first;
         else
             lastPlayerTile->second = playerTile;
         std::map<TilePosition, ChangeType> tilesToPost;
-        const auto cached = getCached(agentHalfExtents);
+        const auto cached = getCached(agentBounds);
         if (!cached)
         {
             std::ostringstream stream;
-            stream << "Agent with half extents is not found: " << agentHalfExtents;
+            stream << "Agent with half extents is not found: " << agentBounds;
             throw InvalidArgument(stream.str());
         }
-        const auto changedTiles = mChangedTiles.find(agentHalfExtents);
+        const auto changedTiles = mChangedTiles.find(agentBounds);
         {
             const auto locked = cached->lockConst();
             const auto& navMesh = locked->getImpl();
@@ -247,10 +247,10 @@ namespace DetourNavigator
                     recastMeshManager.reportNavMeshChange(recastMeshManager.getVersion(), Version {0, 0});
             });
         }
-        mAsyncNavMeshUpdater.post(agentHalfExtents, cached, playerTile, mRecastMeshManager.getWorldspace(), tilesToPost);
+        mAsyncNavMeshUpdater.post(agentBounds, cached, playerTile, mRecastMeshManager.getWorldspace(), tilesToPost);
         if (changedTiles != mChangedTiles.end())
             changedTiles->second.clear();
-        Log(Debug::Debug) << "Cache update posted for agent=" << agentHalfExtents <<
+        Log(Debug::Debug) << "Cache update posted for agent=" << agentBounds <<
             " playerTile=" << lastPlayerTile->second <<
             " recastMeshManagerRevision=" << lastRevision;
     }
@@ -260,12 +260,12 @@ namespace DetourNavigator
         mAsyncNavMeshUpdater.wait(listener, waitConditionType);
     }
 
-    SharedNavMeshCacheItem NavMeshManager::getNavMesh(const osg::Vec3f& agentHalfExtents) const
+    SharedNavMeshCacheItem NavMeshManager::getNavMesh(const AgentBounds& agentBounds) const
     {
-        return getCached(agentHalfExtents);
+        return getCached(agentBounds);
     }
 
-    std::map<osg::Vec3f, SharedNavMeshCacheItem> NavMeshManager::getNavMeshes() const
+    std::map<AgentBounds, SharedNavMeshCacheItem> NavMeshManager::getNavMeshes() const
     {
         return mCache;
     }
@@ -319,9 +319,9 @@ namespace DetourNavigator
         }
     }
 
-    SharedNavMeshCacheItem NavMeshManager::getCached(const osg::Vec3f& agentHalfExtents) const
+    SharedNavMeshCacheItem NavMeshManager::getCached(const AgentBounds& agentBounds) const
     {
-        const auto cached = mCache.find(agentHalfExtents);
+        const auto cached = mCache.find(agentBounds);
         if (cached != mCache.end())
             return cached->second;
         return SharedNavMeshCacheItem();
diff --git a/components/detournavigator/navmeshmanager.hpp b/components/detournavigator/navmeshmanager.hpp
index dbe45b684f..d4a5a58122 100644
--- a/components/detournavigator/navmeshmanager.hpp
+++ b/components/detournavigator/navmeshmanager.hpp
@@ -7,7 +7,7 @@
 #include "recastmeshtiles.hpp"
 #include "waitconditiontype.hpp"
 #include "heightfieldshape.hpp"
-
+#include "agentbounds.hpp"
 
 #include <osg/Vec3f>
 
@@ -35,7 +35,7 @@ namespace DetourNavigator
 
         bool removeObject(const ObjectId id);
 
-        void addAgent(const osg::Vec3f& agentHalfExtents);
+        void addAgent(const AgentBounds& agentBounds);
 
         bool addWater(const osg::Vec2i& cellPosition, int cellSize, float level);
 
@@ -45,19 +45,19 @@ namespace DetourNavigator
 
         bool removeHeightfield(const osg::Vec2i& cellPosition);
 
-        bool reset(const osg::Vec3f& agentHalfExtents);
+        bool reset(const AgentBounds& agentBounds);
 
         void addOffMeshConnection(const ObjectId id, const osg::Vec3f& start, const osg::Vec3f& end, const AreaType areaType);
 
         void removeOffMeshConnections(const ObjectId id);
 
-        void update(const osg::Vec3f& playerPosition, const osg::Vec3f& agentHalfExtents);
+        void update(const osg::Vec3f& playerPosition, const AgentBounds& agentBounds);
 
         void wait(Loading::Listener& listener, WaitConditionType waitConditionType);
 
-        SharedNavMeshCacheItem getNavMesh(const osg::Vec3f& agentHalfExtents) const;
+        SharedNavMeshCacheItem getNavMesh(const AgentBounds& agentBounds) const;
 
-        std::map<osg::Vec3f, SharedNavMeshCacheItem> getNavMeshes() const;
+        std::map<AgentBounds, SharedNavMeshCacheItem> getNavMeshes() const;
 
         void reportStats(unsigned int frameNumber, osg::Stats& stats) const;
 
@@ -69,11 +69,11 @@ namespace DetourNavigator
         TileCachedRecastMeshManager mRecastMeshManager;
         OffMeshConnectionsManager mOffMeshConnectionsManager;
         AsyncNavMeshUpdater mAsyncNavMeshUpdater;
-        std::map<osg::Vec3f, SharedNavMeshCacheItem> mCache;
-        std::map<osg::Vec3f, std::map<TilePosition, ChangeType>> mChangedTiles;
+        std::map<AgentBounds, SharedNavMeshCacheItem> mCache;
+        std::map<AgentBounds, std::map<TilePosition, ChangeType>> mChangedTiles;
         std::size_t mGenerationCounter = 0;
-        std::map<osg::Vec3f, TilePosition> mPlayerTile;
-        std::map<osg::Vec3f, std::size_t> mLastRecastMeshManagerRevision;
+        std::map<AgentBounds, TilePosition> mPlayerTile;
+        std::map<AgentBounds, std::size_t> mLastRecastMeshManagerRevision;
 
         void addChangedTiles(const btCollisionShape& shape, const btTransform& transform, const ChangeType changeType);
 
@@ -81,7 +81,7 @@ namespace DetourNavigator
 
         void addChangedTile(const TilePosition& tilePosition, const ChangeType changeType);
 
-        SharedNavMeshCacheItem getCached(const osg::Vec3f& agentHalfExtents) const;
+        SharedNavMeshCacheItem getCached(const AgentBounds& agentBounds) const;
     };
 }
 
diff --git a/components/detournavigator/navmeshtilescache.cpp b/components/detournavigator/navmeshtilescache.cpp
index bbda8a3179..6938ff3650 100644
--- a/components/detournavigator/navmeshtilescache.cpp
+++ b/components/detournavigator/navmeshtilescache.cpp
@@ -10,14 +10,14 @@ namespace DetourNavigator
         : mMaxNavMeshDataSize(maxNavMeshDataSize), mUsedNavMeshDataSize(0), mFreeNavMeshDataSize(0),
           mHitCount(0), mGetCount(0) {}
 
-    NavMeshTilesCache::Value NavMeshTilesCache::get(const osg::Vec3f& agentHalfExtents, const TilePosition& changedTile,
+    NavMeshTilesCache::Value NavMeshTilesCache::get(const AgentBounds& agentBounds, const TilePosition& changedTile,
         const RecastMesh& recastMesh)
     {
         const std::lock_guard<std::mutex> lock(mMutex);
 
         ++mGetCount;
 
-        const auto tile = mValues.find(std::make_tuple(agentHalfExtents, changedTile, recastMesh));
+        const auto tile = mValues.find(std::make_tuple(agentBounds, changedTile, recastMesh));
         if (tile == mValues.end())
             return Value();
 
@@ -28,7 +28,7 @@ namespace DetourNavigator
         return Value(*this, tile->second);
     }
 
-    NavMeshTilesCache::Value NavMeshTilesCache::set(const osg::Vec3f& agentHalfExtents, const TilePosition& changedTile,
+    NavMeshTilesCache::Value NavMeshTilesCache::set(const AgentBounds& agentBounds, const TilePosition& changedTile,
         const RecastMesh& recastMesh, std::unique_ptr<PreparedNavMeshData>&& value)
     {
         const auto itemSize = sizeof(RecastMesh) + getSize(recastMesh)
@@ -45,8 +45,8 @@ namespace DetourNavigator
         RecastMeshData key {recastMesh.getMesh(), recastMesh.getWater(),
                     recastMesh.getHeightfields(), recastMesh.getFlatHeightfields()};
 
-        const auto iterator = mFreeItems.emplace(mFreeItems.end(), agentHalfExtents, changedTile, std::move(key), itemSize);
-        const auto emplaced = mValues.emplace(std::make_tuple(agentHalfExtents, changedTile, std::cref(iterator->mRecastMeshData)), iterator);
+        const auto iterator = mFreeItems.emplace(mFreeItems.end(), agentBounds, changedTile, std::move(key), itemSize);
+        const auto emplaced = mValues.emplace(std::make_tuple(agentBounds, changedTile, std::cref(iterator->mRecastMeshData)), iterator);
 
         if (!emplaced.second)
         {
@@ -92,7 +92,7 @@ namespace DetourNavigator
     {
         const auto& item = mFreeItems.back();
 
-        const auto value = mValues.find(std::make_tuple(item.mAgentHalfExtents, item.mChangedTile, std::cref(item.mRecastMeshData)));
+        const auto value = mValues.find(std::make_tuple(item.mAgentBounds, item.mChangedTile, std::cref(item.mRecastMeshData)));
         if (value == mValues.end())
             return;
 
diff --git a/components/detournavigator/navmeshtilescache.hpp b/components/detournavigator/navmeshtilescache.hpp
index e7e0b6c7a8..572f7fdb4b 100644
--- a/components/detournavigator/navmeshtilescache.hpp
+++ b/components/detournavigator/navmeshtilescache.hpp
@@ -4,6 +4,7 @@
 #include "preparednavmeshdata.hpp"
 #include "recastmesh.hpp"
 #include "tileposition.hpp"
+#include "agentbounds.hpp"
 
 #include <atomic>
 #include <map>
@@ -52,16 +53,16 @@ namespace DetourNavigator
         struct Item
         {
             std::atomic<std::int64_t> mUseCount;
-            osg::Vec3f mAgentHalfExtents;
+            AgentBounds mAgentBounds;
             TilePosition mChangedTile;
             RecastMeshData mRecastMeshData;
             std::unique_ptr<PreparedNavMeshData> mPreparedNavMeshData;
             std::size_t mSize;
 
-            Item(const osg::Vec3f& agentHalfExtents, const TilePosition& changedTile,
+            Item(const AgentBounds& agentBounds, const TilePosition& changedTile,
                  RecastMeshData&& recastMeshData, std::size_t size)
                 : mUseCount(0)
-                , mAgentHalfExtents(agentHalfExtents)
+                , mAgentBounds(agentBounds)
                 , mChangedTile(changedTile)
                 , mRecastMeshData(std::move(recastMeshData))
                 , mSize(size)
@@ -136,10 +137,10 @@ namespace DetourNavigator
 
         NavMeshTilesCache(const std::size_t maxNavMeshDataSize);
 
-        Value get(const osg::Vec3f& agentHalfExtents, const TilePosition& changedTile,
+        Value get(const AgentBounds& agentBounds, const TilePosition& changedTile,
             const RecastMesh& recastMesh);
 
-        Value set(const osg::Vec3f& agentHalfExtents, const TilePosition& changedTile,
+        Value set(const AgentBounds& agentBounds, const TilePosition& changedTile,
             const RecastMesh& recastMesh, std::unique_ptr<PreparedNavMeshData>&& value);
 
         Stats getStats() const;
@@ -153,7 +154,7 @@ namespace DetourNavigator
         std::size_t mGetCount;
         std::list<Item> mBusyItems;
         std::list<Item> mFreeItems;
-        std::map<std::tuple<osg::Vec3f, TilePosition, std::reference_wrapper<const RecastMeshData>>, ItemIterator, std::less<>> mValues;
+        std::map<std::tuple<AgentBounds, TilePosition, std::reference_wrapper<const RecastMeshData>>, ItemIterator, std::less<>> mValues;
 
         void removeLeastRecentlyUsed();
 
diff --git a/components/detournavigator/recastparams.hpp b/components/detournavigator/recastparams.hpp
index 7e07d2c085..e765623431 100644
--- a/components/detournavigator/recastparams.hpp
+++ b/components/detournavigator/recastparams.hpp
@@ -1,20 +1,32 @@
 #ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_RECASTPARAMS_H
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_RECASTPARAMS_H
 
+#include "agentbounds.hpp"
+
 #include <osg/Vec3f>
 
+#include <cassert>
 #include <cmath>
+#include <algorithm>
 
 namespace DetourNavigator
 {
-    inline float getAgentHeight(const osg::Vec3f& agentHalfExtents)
+    inline float getAgentHeight(const AgentBounds& agentBounds)
     {
-        return 2.0f * agentHalfExtents.z();
+        return 2.0f * agentBounds.mHalfExtents.z();
     }
 
-    inline float getAgentRadius(const osg::Vec3f& agentHalfExtents)
+    inline float getAgentRadius(const AgentBounds& agentBounds)
     {
-        return std::max(agentHalfExtents.x(), agentHalfExtents.y()) * std::sqrt(2);
+        switch (agentBounds.mShapeType)
+        {
+            case CollisionShapeType::Aabb:
+                return std::max(agentBounds.mHalfExtents.x(), agentBounds.mHalfExtents.y()) * std::sqrt(2);
+            case CollisionShapeType::RotatingBox:
+                return agentBounds.mHalfExtents.x();
+        }
+        assert(false && "Unsupported agent shape type");
+        return 0;
     }
 }
 
diff --git a/components/detournavigator/serialization.cpp b/components/detournavigator/serialization.cpp
index 50b014acb1..a0a097ab0b 100644
--- a/components/detournavigator/serialization.cpp
+++ b/components/detournavigator/serialization.cpp
@@ -5,6 +5,7 @@
 #include "recast.hpp"
 #include "recastmesh.hpp"
 #include "settings.hpp"
+#include "agentbounds.hpp"
 
 #include <components/serialization/binaryreader.hpp>
 #include <components/serialization/binarywriter.hpp>
@@ -136,12 +137,13 @@ namespace
         }
 
         template <class Visitor>
-        void operator()(Visitor&& visitor, const RecastSettings& settings, const RecastMesh& recastMesh,
-            const std::vector<DbRefGeometryObject>& dbRefGeometryObjects) const
+        void operator()(Visitor&& visitor, const RecastSettings& settings, const AgentBounds& agentBounds,
+            const RecastMesh& recastMesh, const std::vector<DbRefGeometryObject>& dbRefGeometryObjects) const
         {
             visitor(*this, DetourNavigator::recastMeshMagic);
             visitor(*this, DetourNavigator::recastMeshVersion);
             visitor(*this, settings);
+            visitor(*this, agentBounds);
             visitor(*this, recastMesh);
             visitor(*this, dbRefGeometryObjects);
         }
@@ -228,21 +230,28 @@ namespace
             visitor(*this, value.mPolyMesh);
             visitor(*this, value.mPolyMeshDetail);
         }
+
+        template <class Visitor>
+        void operator()(Visitor&& visitor, const AgentBounds& value) const
+        {
+            visitor(*this, value.mShapeType);
+            visitor(*this, value.mHalfExtents);
+        }
     };
 }
 } // namespace DetourNavigator
 
 namespace DetourNavigator
 {
-    std::vector<std::byte> serialize(const RecastSettings& settings, const RecastMesh& recastMesh,
-        const std::vector<DbRefGeometryObject>& dbRefGeometryObjects)
+    std::vector<std::byte> serialize(const RecastSettings& settings, const AgentBounds& agentBounds,
+        const RecastMesh& recastMesh, const std::vector<DbRefGeometryObject>& dbRefGeometryObjects)
     {
         constexpr Format<Serialization::Mode::Write> format;
         Serialization::SizeAccumulator sizeAccumulator;
-        format(sizeAccumulator, settings, recastMesh, dbRefGeometryObjects);
+        format(sizeAccumulator, settings, agentBounds, recastMesh, dbRefGeometryObjects);
         std::vector<std::byte> result(sizeAccumulator.value());
         format(Serialization::BinaryWriter(result.data(), result.data() + result.size()),
-               settings, recastMesh, dbRefGeometryObjects);
+               settings, agentBounds, recastMesh, dbRefGeometryObjects);
         return result;
     }
 
diff --git a/components/detournavigator/serialization.hpp b/components/detournavigator/serialization.hpp
index 194e50a994..93022df97e 100644
--- a/components/detournavigator/serialization.hpp
+++ b/components/detournavigator/serialization.hpp
@@ -11,15 +11,16 @@ namespace DetourNavigator
     struct DbRefGeometryObject;
     struct PreparedNavMeshData;
     struct RecastSettings;
+    struct AgentBounds;
 
     constexpr char recastMeshMagic[] = {'r', 'c', 's', 't'};
-    constexpr std::uint32_t recastMeshVersion = 1;
+    constexpr std::uint32_t recastMeshVersion = 2;
 
     constexpr char preparedNavMeshDataMagic[] = {'p', 'n', 'a', 'v'};
     constexpr std::uint32_t preparedNavMeshDataVersion = 1;
 
-    std::vector<std::byte> serialize(const RecastSettings& settings, const RecastMesh& value,
-        const std::vector<DbRefGeometryObject>& dbRefGeometryObjects);
+    std::vector<std::byte> serialize(const RecastSettings& settings, const AgentBounds& agentBounds,
+        const RecastMesh& recastMesh, const std::vector<DbRefGeometryObject>& dbRefGeometryObjects);
 
     std::vector<std::byte> serialize(const PreparedNavMeshData& value);
 
diff --git a/components/detournavigator/settings.cpp b/components/detournavigator/settings.cpp
index 040a0a7b29..178a1215a5 100644
--- a/components/detournavigator/settings.cpp
+++ b/components/detournavigator/settings.cpp
@@ -61,7 +61,6 @@ namespace DetourNavigator
         result.mEnableRecastMeshFileNameRevision = ::Settings::Manager::getBool("enable recast mesh file name revision", "Navigator");
         result.mEnableNavMeshFileNameRevision = ::Settings::Manager::getBool("enable nav mesh file name revision", "Navigator");
         result.mMinUpdateInterval = std::chrono::milliseconds(::Settings::Manager::getInt("min update interval ms", "Navigator"));
-        result.mNavMeshVersion = ::Settings::Manager::getInt("nav mesh version", "Navigator");
         result.mEnableNavMeshDiskCache = ::Settings::Manager::getBool("enable nav mesh disk cache", "Navigator");
         result.mWriteToNavMeshDb = ::Settings::Manager::getBool("write to navmeshdb", "Navigator");
         result.mMaxDbFileSize = static_cast<std::uint64_t>(::Settings::Manager::getInt64("max navmeshdb file size", "Navigator"));
diff --git a/components/detournavigator/settings.hpp b/components/detournavigator/settings.hpp
index b107a6eb85..67e0a5a958 100644
--- a/components/detournavigator/settings.hpp
+++ b/components/detournavigator/settings.hpp
@@ -50,10 +50,11 @@ namespace DetourNavigator
         std::string mRecastMeshPathPrefix;
         std::string mNavMeshPathPrefix;
         std::chrono::milliseconds mMinUpdateInterval;
-        std::int64_t mNavMeshVersion = 0;
         std::uint64_t mMaxDbFileSize = 0;
     };
 
+    inline constexpr std::int64_t navMeshVersion = 2;
+
     RecastSettings makeRecastSettingsFromSettingsManager();
 
     DetourSettings makeDetourSettingsFromSettingsManager();
diff --git a/components/sceneutil/agentpath.cpp b/components/sceneutil/agentpath.cpp
index 8d90475a82..e1fa9fe3c8 100644
--- a/components/sceneutil/agentpath.cpp
+++ b/components/sceneutil/agentpath.cpp
@@ -37,7 +37,7 @@ namespace
 namespace SceneUtil
 {
     osg::ref_ptr<osg::Group> createAgentPathGroup(const std::deque<osg::Vec3f>& path,
-            const osg::Vec3f& halfExtents, const osg::Vec3f& start, const osg::Vec3f& end,
+            const DetourNavigator::AgentBounds& agentBounds, const osg::Vec3f& start, const osg::Vec3f& end,
             const DetourNavigator::RecastSettings& settings)
     {
         using namespace DetourNavigator;
@@ -46,8 +46,8 @@ namespace SceneUtil
 
         DebugDraw debugDraw(*group, DebugDraw::makeStateSet(), osg::Vec3f(0, 0, 0), 1);
 
-        const auto agentRadius = DetourNavigator::getAgentRadius(halfExtents);
-        const auto agentHeight = DetourNavigator::getAgentHeight(halfExtents);
+        const auto agentRadius = DetourNavigator::getAgentRadius(agentBounds);
+        const auto agentHeight = DetourNavigator::getAgentHeight(agentBounds);
         const auto agentClimb = settings.mMaxClimb;
         const auto startColor = duRGBA(128, 25, 0, 192);
         const auto endColor = duRGBA(51, 102, 0, 129);
diff --git a/components/sceneutil/agentpath.hpp b/components/sceneutil/agentpath.hpp
index 1194fa512a..53a41e02d8 100644
--- a/components/sceneutil/agentpath.hpp
+++ b/components/sceneutil/agentpath.hpp
@@ -14,12 +14,13 @@ namespace osg
 namespace DetourNavigator
 {
     struct RecastSettings;
+    struct AgentBounds;
 }
 
 namespace SceneUtil
 {
     osg::ref_ptr<osg::Group> createAgentPathGroup(const std::deque<osg::Vec3f>& path,
-            const osg::Vec3f& halfExtents, const osg::Vec3f& start, const osg::Vec3f& end,
+            const DetourNavigator::AgentBounds& agentBounds, const osg::Vec3f& start, const osg::Vec3f& end,
             const DetourNavigator::RecastSettings& settings);
 }
 
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 807f00b41f..2675004907 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -943,10 +943,6 @@ min update interval ms = 250
 # Distance is measured in the number of tiles and can be only an integer value.
 wait until min distance to player = 5
 
-# Version of navigation mesh generation algorithm.
-# Should be increased each time there is a difference between output of makeNavMeshTileData function for the same input.
-nav mesh version = 1
-
 # Use navigation mesh cache stored on disk (true, false)
 enable nav mesh disk cache = true
 

From 334c6dde0bff84fb0b8efaa47e303d416949bc07 Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Tue, 21 Jun 2022 15:27:34 +0000
Subject: [PATCH 2675/2859] custom class for osgAnimation::RigGeometry, Collada
 animated deforming body parts

---
 CHANGELOG.md                                  |   1 +
 apps/openmw/mwrender/objectpaging.cpp         |   3 +
 components/CMakeLists.txt                     |   2 +-
 components/resource/scenemanager.cpp          |  86 +++++-
 components/sceneutil/clone.cpp                |   5 +-
 .../sceneutil/riggeometryosgaextension.cpp    | 281 ++++++++++++++++++
 .../sceneutil/riggeometryosgaextension.hpp    |  72 +++++
 components/sceneutil/serialize.cpp            |  21 ++
 components/shader/shadervisitor.cpp           |  12 +
 9 files changed, 473 insertions(+), 10 deletions(-)
 create mode 100644 components/sceneutil/riggeometryosgaextension.cpp
 create mode 100644 components/sceneutil/riggeometryosgaextension.hpp

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f1014a6a8..dd6c20ac9f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -140,6 +140,7 @@
     Feature #5198: Implement "Magic effect expired" event
     Feature #5454: Clear active spells from actor when he disappears from scene
     Feature #5489: MCP: Telekinesis fix for activators
+    Feature #5701: Convert osgAnimation::RigGeometry to double-buffered custom version
     Feature #5737: Handle instance move from one cell to another
     Feature #5996: Support Lua scripts in OpenMW
     Feature #6017: Separate persistent and temporary cell references when saving
diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index 7513ecdabe..848c27db47 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -24,6 +24,7 @@
 
 #include <components/sceneutil/lightmanager.hpp>
 #include <components/sceneutil/morphgeometry.hpp>
+#include <components/sceneutil/riggeometryosgaextension.hpp>
 #include <components/sceneutil/riggeometry.hpp>
 #include <components/settings/settings.hpp>
 #include <components/misc/rng.hpp>
@@ -244,6 +245,8 @@ namespace MWRender
             if (dynamic_cast<const osgParticle::ParticleSystem*>(drawable))
                 return nullptr;
 
+            if (dynamic_cast<const SceneUtil::OsgaRigGeometry*>(drawable))
+                return nullptr;
             if (const SceneUtil::RigGeometry* rig = dynamic_cast<const SceneUtil::RigGeometry*>(drawable))
                 return operator()(rig->getSourceGeometry());
             if (const SceneUtil::MorphGeometry* morph = dynamic_cast<const SceneUtil::MorphGeometry*>(drawable))
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 779c8d28f5..2d3fc01e3b 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -61,7 +61,7 @@ add_component_dir (sceneutil
     clone attach visitor util statesetupdater controller skeleton riggeometry morphgeometry lightcontroller
     lightmanager lightutil positionattitudetransform workqueue pathgridutil waterutil writescene serialize optimizer
     actorutil detourdebugdraw navmesh agentpath shadow mwshadowtechnique recastmesh shadowsbin osgacontroller rtt
-    screencapture depth color
+    screencapture depth color riggeometryosgaextension
     )
 
 add_component_dir (nif
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index a2779109ac..1bb3ee0963 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -4,9 +4,12 @@
 #include <filesystem>
 
 #include <osg/AlphaFunc>
+#include <osg/Group>
 #include <osg/Node>
 #include <osg/UserDataContainer>
 
+#include <osgAnimation/RigGeometry>
+
 #include <osgParticle/ParticleSystem>
 
 #include <osgUtil/IncrementalCompileOperation>
@@ -35,6 +38,7 @@
 #include <components/sceneutil/visitor.hpp>
 #include <components/sceneutil/lightmanager.hpp>
 #include <components/sceneutil/depth.hpp>
+#include <components/sceneutil/riggeometryosgaextension.hpp>
 
 #include <components/shader/shadervisitor.hpp>
 #include <components/shader/shadermanager.hpp>
@@ -226,11 +230,12 @@ namespace Resource
     };
 
     // Check Collada extra descriptions
-    class ColladaAlphaTrickVisitor : public osg::NodeVisitor
+    class ColladaDescriptionVisitor : public osg::NodeVisitor
     {
     public:
-        ColladaAlphaTrickVisitor()
-            : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+        ColladaDescriptionVisitor()
+            : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN),
+            mSkeleton(nullptr)
         {
         }
 
@@ -268,7 +273,6 @@ namespace Resource
                     stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
                 }
             }
-
             /* Check if the <node> has <extra type="Node"> <technique profile="OpenSceneGraph"> <Descriptions> <Description>
                correct format for OpenMW: <Description>alphatest mode value MaterialName</Description>
                                       e.g <Description>alphatest GEQUAL 0.8 MyAlphaTestedMaterial</Description> */
@@ -299,6 +303,25 @@ namespace Resource
                             node.getStateSet()->setAttributeAndModes(alphaFunc, osg::StateAttribute::ON);
                         }
                     }
+
+                    if (descriptionParts.size() > (0) && descriptionParts.at(0) == "bodypart")
+                    {
+                        SceneUtil::FindByClassVisitor osgaRigFinder("RigGeometryHolder");
+                        node.accept(osgaRigFinder);
+                        for(osg::Node* foundRigNode : osgaRigFinder.mFoundNodes)
+                        {
+                            if (SceneUtil::RigGeometryHolder* rigGeometryHolder = dynamic_cast<SceneUtil::RigGeometryHolder*> (foundRigNode))
+                                mRigGeometryHolders.emplace_back(osg::ref_ptr<SceneUtil::RigGeometryHolder> (rigGeometryHolder));
+                            else Log(Debug::Error) << "Converted RigGeometryHolder is of a wrong type.";
+                        }
+
+                        if (!mRigGeometryHolders.empty())
+                        {
+                            osgAnimation::RigGeometry::FindNearestParentSkeleton skeletonFinder;
+                            mRigGeometryHolders[0]->accept(skeletonFinder);
+                            if (skeletonFinder._root.valid()) mSkeleton = skeletonFinder._root;
+                        }
+                    }
                 }
             }
 
@@ -306,6 +329,9 @@ namespace Resource
         }
         private:
             std::vector<std::string> mDescriptions;
+        public:
+            osgAnimation::Skeleton* mSkeleton; //pointer is valid only if the model is a bodypart, osg::ref_ptr<Skeleton>
+            std::vector<osg::ref_ptr<SceneUtil::RigGeometryHolder>> mRigGeometryHolders;
     };
 
     SceneManager::SceneManager(const VFS::Manager *vfs, Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager)
@@ -424,7 +450,7 @@ namespace Resource
     {
         return mLightingMethod;
     }
-    
+
     void SceneManager::setConvertAlphaTestToAlphaToCoverage(bool convert)
     {
         mConvertAlphaTestToAlphaToCoverage = convert;
@@ -525,11 +551,55 @@ namespace Resource
             if (nameFinder.mFoundNode)
                 nameFinder.mFoundNode->setNodeMask(hiddenNodeMask);
 
+            // Recognize and convert osgAnimation::RigGeometry to OpenMW-optimized type
+            SceneUtil::FindByClassVisitor rigFinder("RigGeometry");
+            node->accept(rigFinder);
+            for(osg::Node* foundRigNode : rigFinder.mFoundNodes)
+            {
+                if (foundRigNode->libraryName() == std::string("osgAnimation"))
+                {
+                    osgAnimation::RigGeometry* foundRigGeometry = static_cast<osgAnimation::RigGeometry*> (foundRigNode);
+                    osg::ref_ptr<SceneUtil::RigGeometryHolder> newRig = new SceneUtil::RigGeometryHolder(*foundRigGeometry, osg::CopyOp::DEEP_COPY_ALL);
+
+                    if (foundRigGeometry->getStateSet()) newRig->setStateSet(foundRigGeometry->getStateSet());
+
+                    if (osg::Group* parent = dynamic_cast<osg::Group*> (foundRigGeometry->getParent(0)))
+                    {
+                        parent->removeChild(foundRigGeometry);
+                        parent->addChild(newRig);
+                    }
+                }
+            }
+
             if (ext == "dae")
             {
-                // Collada alpha testing
-                Resource::ColladaAlphaTrickVisitor colladaAlphaTrickVisitor;
-                node->accept(colladaAlphaTrickVisitor);
+                Resource::ColladaDescriptionVisitor colladaDescriptionVisitor;
+                node->accept(colladaDescriptionVisitor);
+
+                if (colladaDescriptionVisitor.mSkeleton)
+                {
+                    if ( osg::Group* group = dynamic_cast<osg::Group*> (node) )
+                    {
+                        group->removeChildren(0, group->getNumChildren());
+                        for (osg::ref_ptr<SceneUtil::RigGeometryHolder> newRiggeometryHolder : colladaDescriptionVisitor.mRigGeometryHolders)
+                        {
+                            osg::ref_ptr<osg::MatrixTransform> backToOriginTrans = new osg::MatrixTransform();
+
+                            newRiggeometryHolder->getOrCreateUserDataContainer()->addUserObject(new TemplateRef(newRiggeometryHolder->getGeometry(0)));
+                            backToOriginTrans->getOrCreateUserDataContainer()->addUserObject(new TemplateRef(newRiggeometryHolder->getGeometry(0)));
+
+                            newRiggeometryHolder->setBodyPart(true);
+
+                            for (int i = 0; i < 2; ++i)
+                            {
+                                if (newRiggeometryHolder->getGeometry(i)) newRiggeometryHolder->getGeometry(i)->setSkeleton(nullptr);
+                            }
+
+                            backToOriginTrans->addChild(newRiggeometryHolder);
+                            group->addChild(backToOriginTrans);
+                        }
+                    }
+                }
 
                 node->getOrCreateStateSet()->addUniform(new osg::Uniform("emissiveMult", 1.f));
                 node->getOrCreateStateSet()->addUniform(new osg::Uniform("specStrength", 1.f));
diff --git a/components/sceneutil/clone.cpp b/components/sceneutil/clone.cpp
index eaf5668c4a..99a12c1677 100644
--- a/components/sceneutil/clone.cpp
+++ b/components/sceneutil/clone.cpp
@@ -11,6 +11,7 @@
 
 #include <components/sceneutil/morphgeometry.hpp>
 #include <components/sceneutil/riggeometry.hpp>
+#include <components/sceneutil/riggeometryosgaextension.hpp>
 
 namespace SceneUtil
 {
@@ -41,7 +42,9 @@ namespace SceneUtil
         if (const osgParticle::ParticleSystem* partsys = dynamic_cast<const osgParticle::ParticleSystem*>(drawable))
             return operator()(partsys);
 
-        if (dynamic_cast<const SceneUtil::RigGeometry*>(drawable) || dynamic_cast<const SceneUtil::MorphGeometry*>(drawable) || dynamic_cast<const osgAnimation::RigGeometry*>(drawable) || dynamic_cast<const osgAnimation::MorphGeometry*>(drawable))
+        if (dynamic_cast<const SceneUtil::RigGeometry*>(drawable) || dynamic_cast<const SceneUtil::MorphGeometry*>(drawable) ||
+            dynamic_cast<const osgAnimation::RigGeometry*>(drawable) || dynamic_cast<const osgAnimation::MorphGeometry*>(drawable) ||
+            dynamic_cast<const SceneUtil::RigGeometryHolder*>(drawable))
         {
             return static_cast<osg::Drawable*>(drawable->clone(*this));
         }
diff --git a/components/sceneutil/riggeometryosgaextension.cpp b/components/sceneutil/riggeometryosgaextension.cpp
new file mode 100644
index 0000000000..75af4c4b82
--- /dev/null
+++ b/components/sceneutil/riggeometryosgaextension.cpp
@@ -0,0 +1,281 @@
+#include "riggeometryosgaextension.hpp"
+
+#include <osgAnimation/RigGeometry>
+
+#include <osg/Drawable>
+#include <osg/NodeVisitor>
+#include <osg/Version>
+
+#include <components/debug/debuglog.hpp>
+#include <components/resource/scenemanager.hpp>
+
+namespace SceneUtil
+{
+
+OsgaRigGeometry::OsgaRigGeometry() : osgAnimation::RigGeometry()
+{
+    setDataVariance(osg::Object::STATIC);
+}
+
+OsgaRigGeometry::OsgaRigGeometry(const osgAnimation::RigGeometry& copy, const osg::CopyOp& copyop) : osgAnimation::RigGeometry(copy, copyop)
+{
+    setDataVariance(osg::Object::STATIC);
+}
+
+OsgaRigGeometry::OsgaRigGeometry(const OsgaRigGeometry& copy, const osg::CopyOp& copyop) :
+    osgAnimation::RigGeometry(copy, copyop)
+{
+    setDataVariance(osg::Object::STATIC);
+}
+
+void OsgaRigGeometry::computeMatrixFromRootSkeleton(osg::MatrixList mtxList)
+{
+    if (!_root.valid())
+    {
+    	Log(Debug::Warning) << "Warning " << className() <<"::computeMatrixFromRootSkeleton if you have this message it means you miss to call buildTransformer(Skeleton* root), or your RigGeometry (" << getName() <<") is not attached to a Skeleton subgraph";
+        return;
+    }
+    osg::Matrix notRoot = _root->getMatrix();
+    _matrixFromSkeletonToGeometry = mtxList[0] * osg::Matrix::inverse(notRoot);
+    _invMatrixFromSkeletonToGeometry = osg::Matrix::inverse(_matrixFromSkeletonToGeometry);
+    _needToComputeMatrix = false;
+}
+
+RigGeometryHolder::RigGeometryHolder() :
+	mBackToOrigin(nullptr),
+    mLastFrameNumber(0),
+	mIsBodyPart(false)
+{
+}
+
+RigGeometryHolder::RigGeometryHolder(const RigGeometryHolder& copy, const osg::CopyOp& copyop) :
+    Drawable(copy, copyop),
+	mBackToOrigin(copy.mBackToOrigin),
+    mLastFrameNumber(0),
+	mIsBodyPart(copy.mIsBodyPart)
+{
+    setUseVertexBufferObjects(true);
+
+    if (!copy.getSourceRigGeometry())
+    {
+        Log(Debug::Error) << "copy constructor of RigGeometryHolder partially failed (no source RigGeometry)";
+        return;
+    }
+
+    osg::ref_ptr<OsgaRigGeometry> rigGeometry = new OsgaRigGeometry(*copy.getSourceRigGeometry(), copyop);
+    setSourceRigGeometry(rigGeometry);
+}
+
+RigGeometryHolder::RigGeometryHolder(const osgAnimation::RigGeometry& copy, const osg::CopyOp& copyop) :
+	mBackToOrigin(nullptr),
+    mLastFrameNumber(0),
+	mIsBodyPart(false)
+{
+    setUseVertexBufferObjects(true);
+
+    osg::ref_ptr<OsgaRigGeometry> rigGeometry = new OsgaRigGeometry(copy, copyop);
+    setSourceRigGeometry(rigGeometry);
+}
+
+void RigGeometryHolder::setSourceRigGeometry(osg::ref_ptr<OsgaRigGeometry> sourceRigGeometry)
+{
+    for (unsigned int i=0; i<2; ++i)
+        mGeometry.at(i) = nullptr;
+
+    mSourceRigGeometry = sourceRigGeometry;
+
+    _boundingBox = mSourceRigGeometry->getComputeBoundingBoxCallback()->computeBound(*mSourceRigGeometry);
+    _boundingSphere = osg::BoundingSphere(_boundingBox);
+
+    for (unsigned int i=0; i<2; ++i)
+    {
+        const OsgaRigGeometry& from = *sourceRigGeometry;
+
+        // DO NOT COPY AND PASTE THIS CODE. Cloning osg::Geometry without also cloning its contained Arrays is generally unsafe.
+        // In this specific case the operation is safe under the following two assumptions:
+        // - When Arrays are removed or replaced in the cloned geometry, the original Arrays in their place must outlive the cloned geometry regardless. (ensured by mSourceRigGeometry, possibly also RigGeometry._geometry)
+        // - Arrays that we add or replace in the cloned geometry must be explicitely forbidden from reusing BufferObjects of the original geometry.
+        mGeometry.at(i) = new OsgaRigGeometry(from, osg::CopyOp::SHALLOW_COPY);
+        mGeometry.at(i)->getOrCreateUserDataContainer()->addUserObject(new Resource::TemplateRef(mSourceRigGeometry));
+
+        OsgaRigGeometry& to = *mGeometry.at(i);
+        to.setSupportsDisplayList(false);
+        to.setUseVertexBufferObjects(true);
+        to.setCullingActive(false); // make sure to disable culling since that's handled by this class
+
+        to.setDataVariance(osg::Object::STATIC);
+        to.setNeedToComputeMatrix(true);
+
+        // vertices and normals are modified every frame, so we need to deep copy them.
+        // assign a dedicated VBO to make sure that modifications don't interfere with source geometry's VBO.
+        osg::ref_ptr<osg::VertexBufferObject> vbo (new osg::VertexBufferObject);
+        vbo->setUsage(GL_DYNAMIC_DRAW_ARB);
+
+        osg::ref_ptr<osg::Array> vertexArray = static_cast<osg::Array*>(from.getVertexArray()->clone(osg::CopyOp::DEEP_COPY_ALL));
+        if (vertexArray)
+        {
+            vertexArray->setVertexBufferObject(vbo);
+            to.setVertexArray(vertexArray);
+        }
+
+        if (const osg::Array* normals = from.getNormalArray())
+        {
+            osg::ref_ptr<osg::Array> normalArray = static_cast<osg::Array*>(normals->clone(osg::CopyOp::DEEP_COPY_ALL));
+            if (normalArray)
+            {
+                normalArray->setVertexBufferObject(vbo);
+                to.setNormalArray(normalArray, osg::Array::BIND_PER_VERTEX);
+            }
+        }
+
+        if (const osg::Vec4Array* tangents = dynamic_cast<const osg::Vec4Array*>(from.getTexCoordArray(7)))
+        {
+            osg::ref_ptr<osg::Array> tangentArray = static_cast<osg::Array*>(tangents->clone(osg::CopyOp::DEEP_COPY_ALL));
+            tangentArray->setVertexBufferObject(vbo);
+            to.setTexCoordArray(7, tangentArray, osg::Array::BIND_PER_VERTEX);
+        }
+    }
+
+}
+
+osg::ref_ptr<OsgaRigGeometry> RigGeometryHolder::getSourceRigGeometry() const
+{
+    return mSourceRigGeometry;
+}
+
+void RigGeometryHolder::updateRigGeometry(OsgaRigGeometry* geom, osg::NodeVisitor *nv)
+{
+    if(!geom)
+        return;
+
+    if(!geom->getSkeleton() && !this->getParents().empty())
+    {
+        osgAnimation::RigGeometry::FindNearestParentSkeleton finder;
+        if(this->getParents().size() > 1)
+        Log(Debug::Warning) << "A RigGeometry should not have multi parent ( " << geom->getName() << " )";
+        this->getParents()[0]->accept(finder);
+
+        if(!finder._root.valid())
+        {
+        	Log(Debug::Warning) << "A RigGeometry did not find a parent skeleton for RigGeometry ( " << geom->getName() << " )";
+            return;
+        }
+        geom->getRigTransformImplementation()->prepareData(*geom);
+        geom->setSkeleton(finder._root.get());
+    }
+
+    if(!geom->getSkeleton())
+        return;
+
+    if(geom->getNeedToComputeMatrix())
+    {
+        osgAnimation::Skeleton* root = geom->getSkeleton();
+        if (!root)
+        {
+            Log(Debug::Warning) << "Warning: if you have this message it means you miss to call buildTransformer(Skeleton* root), or your RigGeometry is not attached to a Skeleton subgraph";
+            return;
+        }
+        osg::MatrixList mtxList = root->getWorldMatrices(root); //We always assume that RigGeometries have origin at their root
+        geom->computeMatrixFromRootSkeleton(mtxList);
+
+        if (mIsBodyPart && mBackToOrigin) updateBackToOriginTransform(geom);
+    }
+
+    if(geom->getSourceGeometry())
+    {
+        osg::Drawable::UpdateCallback * up = dynamic_cast<osg::Drawable::UpdateCallback*>(geom->getSourceGeometry()->getUpdateCallback());
+        if(up)
+        {
+            up->update(nv, geom->getSourceGeometry());
+        }
+    }
+
+    geom->update();
+}
+
+OsgaRigGeometry* RigGeometryHolder::getGeometry(int geometry)
+{
+    return mGeometry.at(geometry).get();
+}
+
+
+void RigGeometryHolder::updateBackToOriginTransform(OsgaRigGeometry* geometry)
+{
+    osgAnimation::Skeleton* skeleton = geometry->getSkeleton();
+    if (skeleton)
+    {
+        osg::MatrixList mtxList = mBackToOrigin->getParents()[0]->getWorldMatrices(skeleton);
+        osg::Matrix skeletonMatrix = skeleton->getMatrix();
+        osg::Matrixf matrixFromSkeletonToGeometry = mtxList[0] * osg::Matrix::inverse(skeletonMatrix);
+        osg::Matrixf invMatrixFromSkeletonToGeometry = osg::Matrix::inverse(matrixFromSkeletonToGeometry);
+        mBackToOrigin->setMatrix(invMatrixFromSkeletonToGeometry);
+    }
+}
+
+void RigGeometryHolder::accept(osg::NodeVisitor &nv)
+{
+    if (!nv.validNodeMask(*this))
+        return;
+
+    nv.pushOntoNodePath(this);
+
+    if (nv.getVisitorType() == osg::NodeVisitor::CULL_VISITOR && mSourceRigGeometry.get())
+    {
+        unsigned int traversalNumber = nv.getTraversalNumber();
+        if (mLastFrameNumber == traversalNumber)
+        {
+            OsgaRigGeometry& geom = *getRigGeometryPerFrame(mLastFrameNumber);
+
+            nv.pushOntoNodePath(&geom);
+            nv.apply(geom);
+            nv.popFromNodePath();                
+        }
+        else
+        {
+            mLastFrameNumber = traversalNumber;
+
+            OsgaRigGeometry& geom = *getRigGeometryPerFrame(mLastFrameNumber);
+            
+            if (mIsBodyPart)
+            {
+                if (mBackToOrigin) updateBackToOriginTransform(&geom);
+                else
+                {
+                 	osg::MatrixTransform* matrixTransform = dynamic_cast<osg::MatrixTransform*> (this->getParents()[0]);
+                 	if (matrixTransform)
+                 	{
+                 		mBackToOrigin = matrixTransform;
+                     	updateBackToOriginTransform(&geom);
+                	}
+                }
+            }
+            
+            updateRigGeometry(&geom, &nv);
+            
+            nv.pushOntoNodePath(&geom);
+            nv.apply(geom);
+            nv.popFromNodePath();
+        }
+    }
+    else if (nv.getVisitorType() == osg::NodeVisitor::UPDATE_VISITOR)
+    {
+    }
+    else
+        nv.apply(*this);
+
+    nv.popFromNodePath();
+}
+
+
+void RigGeometryHolder::accept(osg::PrimitiveFunctor& func) const
+{
+    getRigGeometryPerFrame(mLastFrameNumber)->accept(func);
+}
+
+OsgaRigGeometry* RigGeometryHolder::getRigGeometryPerFrame(unsigned int frame) const
+{
+    return mGeometry.at(frame%2).get();
+}
+
+
+}
diff --git a/components/sceneutil/riggeometryosgaextension.hpp b/components/sceneutil/riggeometryosgaextension.hpp
new file mode 100644
index 0000000000..6098bd9608
--- /dev/null
+++ b/components/sceneutil/riggeometryosgaextension.hpp
@@ -0,0 +1,72 @@
+#ifndef OPENMW_COMPONENTS_OSGAEXTENSION_RIGGEOMETRY_H
+#define OPENMW_COMPONENTS_OSGAEXTENSION_RIGGEOMETRY_H
+
+#include <array>
+
+#include <osg/Drawable>
+#include <osgAnimation/RigGeometry>
+
+#include <osg/NodeVisitor>
+
+namespace SceneUtil
+{
+    /// @brief Custom RigGeometry-class for osgAnimation-formats (collada)
+    class OsgaRigGeometry : public osgAnimation::RigGeometry
+    {
+    public:
+
+        OsgaRigGeometry();
+
+        OsgaRigGeometry(const osgAnimation::RigGeometry& copy, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY);
+
+        OsgaRigGeometry(const OsgaRigGeometry& copy, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY);
+
+        META_Object(SceneUtil, OsgaRigGeometry);
+
+        void computeMatrixFromRootSkeleton(osg::MatrixList mtxList);
+    };
+
+    /// @brief OpenMW-compatible double buffered static datavariance version of osgAnimation::RigGeometry
+    /// This class is based on osgAnimation::RigGeometry and SceneUtil::RigGeometry
+    class RigGeometryHolder : public osg::Drawable
+    {
+    public:
+        RigGeometryHolder();
+
+        RigGeometryHolder(const RigGeometryHolder& copy, const osg::CopyOp& copyop);
+
+        RigGeometryHolder(const osgAnimation::RigGeometry& copy, const osg::CopyOp& copyop);
+
+        META_Object(SceneUtil, RigGeometryHolder);
+
+        void setSourceRigGeometry(osg::ref_ptr<OsgaRigGeometry> sourceRigGeometry);
+        osg::ref_ptr<OsgaRigGeometry> getSourceRigGeometry() const;
+
+        /// @brief Modified rig update, code based on osgAnimation::UpdateRigGeometry : public osg::Drawable::UpdateCallback
+        void updateRigGeometry(OsgaRigGeometry* geom, osg::NodeVisitor *nv);
+
+        OsgaRigGeometry* getGeometry(int geometry);
+
+        void accept(osg::NodeVisitor &nv) override;
+        void accept(osg::PrimitiveFunctor&) const override;
+        bool supports(const osg::PrimitiveFunctor&) const override{ return true; }
+        
+        void setBackToOrigin(osg::MatrixTransform* backToOrigin) {mBackToOrigin = backToOrigin;}
+        void setBodyPart(bool isBodyPart) {mIsBodyPart = isBodyPart;}
+
+    private:
+        std::array<osg::ref_ptr<OsgaRigGeometry>, 2> mGeometry;
+        osg::ref_ptr<OsgaRigGeometry> mSourceRigGeometry;
+        osg::MatrixTransform* mBackToOrigin; //This is used to move riggeometries from their slot locations to skeleton origin in order to get correct deformations for bodyparts
+
+        unsigned int mLastFrameNumber;
+        bool mIsBodyPart;
+        
+        void updateBackToOriginTransform(OsgaRigGeometry* geometry);
+
+        OsgaRigGeometry* getRigGeometryPerFrame(unsigned int frame) const;
+    };
+
+}
+
+#endif
diff --git a/components/sceneutil/serialize.cpp b/components/sceneutil/serialize.cpp
index 964b8bc4c2..748b3a708d 100644
--- a/components/sceneutil/serialize.cpp
+++ b/components/sceneutil/serialize.cpp
@@ -8,6 +8,7 @@
 #include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/sceneutil/skeleton.hpp>
 #include <components/sceneutil/riggeometry.hpp>
+#include <components/sceneutil/riggeometryosgaextension.hpp>
 #include <components/sceneutil/morphgeometry.hpp>
 
 namespace SceneUtil
@@ -49,6 +50,24 @@ public:
     }
 };
 
+class RigGeometryHolderSerializer : public osgDB::ObjectWrapper
+{
+public:
+    RigGeometryHolderSerializer()
+        : osgDB::ObjectWrapper(createInstanceFunc<SceneUtil::RigGeometryHolder>, "SceneUtil::RigGeometryHolder", "osg::Object osg::Node osg::Drawable SceneUtil::RigGeometryHolder")
+    {
+    }
+};
+
+class OsgaRigGeometrySerializer : public osgDB::ObjectWrapper
+{
+public:
+    OsgaRigGeometrySerializer()
+        : osgDB::ObjectWrapper(createInstanceFunc<SceneUtil::OsgaRigGeometry>, "SceneUtil::OsgaRigGeometry", "osg::Object osg::Node osg::Geometry osgAnimation::RigGeometry SceneUtil::OsgaRigGeometry")
+    {
+    }
+};
+
 class MorphGeometrySerializer : public osgDB::ObjectWrapper
 {
 public:
@@ -108,6 +127,8 @@ void registerSerializers()
         mgr->addWrapper(new PositionAttitudeTransformSerializer);
         mgr->addWrapper(new SkeletonSerializer);
         mgr->addWrapper(new RigGeometrySerializer);
+        mgr->addWrapper(new RigGeometryHolderSerializer);
+        mgr->addWrapper(new OsgaRigGeometrySerializer);
         mgr->addWrapper(new MorphGeometrySerializer);
         mgr->addWrapper(new LightManagerSerializer);
         mgr->addWrapper(new CameraRelativeTransformSerializer);
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 57fe2cb0e8..894af5c82a 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -25,6 +25,7 @@
 #include <components/sceneutil/riggeometry.hpp>
 #include <components/sceneutil/morphgeometry.hpp>
 #include <components/sceneutil/depth.hpp>
+#include <components/sceneutil/riggeometryosgaextension.hpp>
 
 #include "removedalphafunc.hpp"
 #include "shadermanager.hpp"
@@ -922,6 +923,17 @@ namespace Shader
                 if (sourceGeometry && adjustGeometry(*sourceGeometry, reqs))
                     morph->setSourceGeometry(sourceGeometry);
             }
+            else if (auto osgaRig = dynamic_cast<SceneUtil::RigGeometryHolder*>(&drawable))
+            {
+                osg::ref_ptr<SceneUtil::OsgaRigGeometry> sourceOsgaRigGeometry = osgaRig->getSourceRigGeometry();
+                osg::ref_ptr<osg::Geometry> sourceGeometry = sourceOsgaRigGeometry->getSourceGeometry();
+                if (sourceGeometry && adjustGeometry(*sourceGeometry, reqs))
+                {
+                    sourceOsgaRigGeometry->setSourceGeometry(sourceGeometry);
+                    osgaRig->setSourceRigGeometry(sourceOsgaRigGeometry);
+                }
+            }
+
         }
         else
             ensureFFP(drawable);

From b0e4c7e76a2b97f14eedfa333746effc38fe8b8b Mon Sep 17 00:00:00 2001
From: Mads Buvik Sandvei <madssandvei@protonmail.com>
Date: Tue, 21 Jun 2022 15:55:06 +0000
Subject: [PATCH 2676/2859] [Postprocessing] Stereo integration

---
 apps/openmw/mwrender/npcanimation.cpp         |   2 +
 apps/openmw/mwrender/pingpongcanvas.cpp       |  94 ++++++-
 apps/openmw/mwrender/pingpongcanvas.hpp       |  12 +-
 apps/openmw/mwrender/pingpongcull.cpp         |  51 +++-
 apps/openmw/mwrender/pingpongcull.hpp         |  14 +-
 apps/openmw/mwrender/postprocessor.cpp        | 244 +++++++++++++-----
 apps/openmw/mwrender/postprocessor.hpp        |   9 +-
 apps/openmw/mwrender/renderingmanager.cpp     |   4 +-
 apps/openmw/mwrender/screenshotmanager.cpp    |   4 +-
 apps/openmw/mwrender/skyutil.cpp              |  60 ++++-
 apps/openmw/mwrender/transparentpass.cpp      |  75 +++++-
 apps/openmw/mwrender/transparentpass.hpp      |   9 +-
 components/debug/gldebug.cpp                  |   5 +
 components/fx/pass.cpp                        |  39 ++-
 components/fx/stateupdater.hpp                |  10 +-
 components/resource/scenemanager.cpp          |   2 +-
 components/resource/scenemanager.hpp          |   4 +-
 components/shader/shadervisitor.cpp           |   6 +-
 components/shader/shadervisitor.hpp           |   4 +-
 components/stereo/stereomanager.cpp           |  51 ++--
 components/stereo/stereomanager.hpp           |   2 -
 files/shaders/CMakeLists.txt                  |   2 +
 .../blended_depth_postpass_vertex.glsl        |   3 +-
 files/shaders/fullscreen_tri_vertex.glsl      |   2 +
 files/shaders/multiview_resolve_fragment.glsl |  18 ++
 files/shaders/multiview_resolve_vertex.glsl   |   9 +
 files/shaders/openmw_vertex.glsl              |   5 -
 files/shaders/openmw_vertex.h.glsl            |   3 +-
 files/shaders/openmw_vertex_multiview.glsl    |  14 +-
 29 files changed, 578 insertions(+), 179 deletions(-)
 create mode 100644 files/shaders/multiview_resolve_fragment.glsl
 create mode 100644 files/shaders/multiview_resolve_vertex.glsl

diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index ba44a94cd9..00798604ce 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -361,6 +361,8 @@ public:
             glClear(GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
             bin->drawImplementation(renderInfo, previous);
         }
+
+        state->checkGLErrors("after DepthClearCallback::drawImplementation");
     }
 
     osg::ref_ptr<osg::Depth> mDepth;
diff --git a/apps/openmw/mwrender/pingpongcanvas.cpp b/apps/openmw/mwrender/pingpongcanvas.cpp
index 507a41e1f0..3fea60f216 100644
--- a/apps/openmw/mwrender/pingpongcanvas.cpp
+++ b/apps/openmw/mwrender/pingpongcanvas.cpp
@@ -2,6 +2,10 @@
 
 #include <components/shader/shadermanager.hpp>
 #include <components/debug/debuglog.hpp>
+#include <components/stereo/stereomanager.hpp>
+#include <components/stereo/multiview.hpp>
+
+#include <osg/Texture2DArray>
 
 #include "postprocessor.hpp"
 
@@ -9,6 +13,7 @@ namespace MWRender
 {
     PingPongCanvas::PingPongCanvas(Shader::ShaderManager& shaderManager)
         : mFallbackStateSet(new osg::StateSet)
+        , mMultiviewResolveStateSet(new osg::StateSet)
     {
         setUseDisplayList(false);
         setUseVertexBufferObjects(true);
@@ -25,12 +30,21 @@ namespace MWRender
         mHDRDriver = HDRDriver(shaderManager);
         mHDRDriver.disable();
 
-        auto fallbackVertex = shaderManager.getShader("fullscreen_tri_vertex.glsl", {}, osg::Shader::VERTEX);
-        auto fallbackFragment = shaderManager.getShader("fullscreen_tri_fragment.glsl", {}, osg::Shader::FRAGMENT);
+        Shader::ShaderManager::DefineMap defines;
+        Stereo::Manager::instance().shaderStereoDefines(defines);
+
+        auto fallbackVertex = shaderManager.getShader("fullscreen_tri_vertex.glsl", defines, osg::Shader::VERTEX);
+        auto fallbackFragment = shaderManager.getShader("fullscreen_tri_fragment.glsl", defines, osg::Shader::FRAGMENT);
         mFallbackProgram = shaderManager.getProgram(fallbackVertex, fallbackFragment);
 
         mFallbackStateSet->setAttributeAndModes(mFallbackProgram);
         mFallbackStateSet->addUniform(new osg::Uniform("omw_SamplerLastShader", 0));
+
+        auto multiviewResolveVertex = shaderManager.getShader("multiview_resolve_vertex.glsl", {}, osg::Shader::VERTEX);
+        auto multiviewResolveFragment = shaderManager.getShader("multiview_resolve_fragment.glsl", {}, osg::Shader::FRAGMENT);
+        mMultiviewResolveProgram = shaderManager.getProgram(multiviewResolveVertex, multiviewResolveFragment);
+        mMultiviewResolveStateSet->setAttributeAndModes(mMultiviewResolveProgram);
+        mMultiviewResolveStateSet->addUniform(new osg::Uniform("omw_SamplerLastShader", 0));
     }
 
     void PingPongCanvas::setCurrentFrameData(size_t frameId, fx::DispatchArray&& data)
@@ -51,6 +65,29 @@ namespace MWRender
         osg::Geometry::drawImplementation(renderInfo);
     }
 
+    static void attachCloneOfTemplate(osg::FrameBufferObject* fbo, osg::Camera::BufferComponent component, osg::Texture* tex)
+    {
+        switch (tex->getTextureTarget())
+        {
+        case GL_TEXTURE_2D:
+        {
+            auto* tex2d = new osg::Texture2D(*static_cast<osg::Texture2D*>(tex));
+            fbo->setAttachment(component, osg::FrameBufferAttachment(tex2d));
+        }
+        break;
+        case GL_TEXTURE_2D_ARRAY:
+        {
+#ifdef OSG_HAS_MULTIVIEW
+            auto* tex2dArray = new osg::Texture2DArray(*static_cast<osg::Texture2DArray*>(tex));
+            fbo->setAttachment(component, osg::FrameBufferAttachment(tex2dArray, osg::Camera::FACE_CONTROLLED_BY_MULTIVIEW_SHADER, 0));
+#endif
+        }
+        break;
+        default:
+            throw std::logic_error("Invalid texture type received");
+        }
+    }
+
     void PingPongCanvas::drawImplementation(osg::RenderInfo& renderInfo) const
     {
         osg::State& state = *renderInfo.getState();
@@ -76,7 +113,7 @@ namespace MWRender
             filtered.push_back(i);
         }
 
-        auto* viewport = state.getCurrentViewport();
+        auto* resolveViewport = state.getCurrentViewport();
 
         if (filtered.empty() || !bufferData.postprocessing)
         {
@@ -94,7 +131,7 @@ namespace MWRender
             state.pushStateSet(mFallbackStateSet);
             state.apply();
             state.applyTextureAttribute(0, bufferData.sceneTex);
-            viewport->apply(state);
+            resolveViewport->apply(state);
 
             drawGeometry(renderInfo);
             state.popStateSet();
@@ -108,14 +145,30 @@ namespace MWRender
             for (auto& fbo : mFbos)
             {
                 fbo = new osg::FrameBufferObject;
-                fbo->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, osg::FrameBufferAttachment(new osg::Texture2D(*bufferData.sceneTexLDR)));
+                attachCloneOfTemplate(fbo, osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, bufferData.sceneTexLDR);
                 fbo->apply(state);
                 glClearColor(0.5, 0.5, 0.5, 1);
                 glClear(GL_COLOR_BUFFER_BIT);
             }
 
+            if (Stereo::getMultiview())
+            {
+                mMultiviewResolveFramebuffer = new osg::FrameBufferObject();
+                attachCloneOfTemplate(mMultiviewResolveFramebuffer, osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, bufferData.sceneTexLDR);
+                mMultiviewResolveFramebuffer->apply(state);
+                glClearColor(0.5, 0.5, 0.5, 1);
+                glClear(GL_COLOR_BUFFER_BIT);
+
+                mMultiviewResolveStateSet->setTextureAttribute(PostProcessor::Unit_LastShader, (osg::Texture*)mMultiviewResolveFramebuffer->getAttachment(osg::Camera::COLOR_BUFFER0).getTexture());
+            }
+
             mHDRDriver.dirty(bufferData.sceneTex->getTextureWidth(), bufferData.sceneTex->getTextureHeight());
 
+            if (Stereo::getStereo())
+                mRenderViewport = new osg::Viewport(0, 0, bufferData.sceneTex->getTextureWidth(), bufferData.sceneTex->getTextureHeight());
+            else
+                mRenderViewport = nullptr;
+
             bufferData.dirty = false;
         }
 
@@ -148,6 +201,11 @@ namespace MWRender
                 destinationFbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
                 lastApplied = destinationHandle;
             }
+            else if (Stereo::getMultiview())
+            {
+                mMultiviewResolveFramebuffer->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
+                lastApplied = mMultiviewResolveFramebuffer->getHandle(cid);
+            }
             else
             {
                 ext->glBindFramebuffer(GL_DRAW_FRAMEBUFFER_EXT, 0);
@@ -173,19 +231,22 @@ namespace MWRender
 
             for (size_t passIndex = 0; passIndex < node.mPasses.size(); ++passIndex)
             {
+                if (mRenderViewport)
+                    mRenderViewport->apply(state);
                 const auto& pass = node.mPasses[passIndex];
 
                 bool lastPass = passIndex == node.mPasses.size() - 1;
 
+                //VR-TODO: This won't actually work for tex2darrays
                 if (lastShader == 0)
                     pass.mStateSet->setTextureAttribute(PostProcessor::Unit_LastShader, bufferData.sceneTex);
                 else
-                    pass.mStateSet->setTextureAttribute(PostProcessor::Unit_LastShader, (osg::Texture2D*)mFbos[lastShader - GL_COLOR_ATTACHMENT0_EXT]->getAttachment(osg::Camera::COLOR_BUFFER0).getTexture());
+                    pass.mStateSet->setTextureAttribute(PostProcessor::Unit_LastShader, (osg::Texture*)mFbos[lastShader - GL_COLOR_ATTACHMENT0_EXT]->getAttachment(osg::Camera::COLOR_BUFFER0).getTexture());
 
                 if (lastDraw == 0)
                     pass.mStateSet->setTextureAttribute(PostProcessor::Unit_LastPass, bufferData.sceneTex);
                 else
-                    pass.mStateSet->setTextureAttribute(PostProcessor::Unit_LastPass, (osg::Texture2D*)mFbos[lastDraw - GL_COLOR_ATTACHMENT0_EXT]->getAttachment(osg::Camera::COLOR_BUFFER0).getTexture());
+                    pass.mStateSet->setTextureAttribute(PostProcessor::Unit_LastPass, (osg::Texture*)mFbos[lastDraw - GL_COLOR_ATTACHMENT0_EXT]->getAttachment(osg::Camera::COLOR_BUFFER0).getTexture());
 
                 if (pass.mRenderTarget)
                 {
@@ -203,6 +264,10 @@ namespace MWRender
                 else if (pass.mResolve && index == filtered.back())
                 {
                     bindDestinationFbo();
+                    if (!destinationFbo && !Stereo::getMultiview())
+                    {
+                        resolveViewport->apply(state);
+                    }
                 }
                 else if (lastPass)
                 {
@@ -237,6 +302,21 @@ namespace MWRender
             state.popStateSet();
         }
 
+        if (Stereo::getMultiview() && mMultiviewResolveProgram)
+        {
+            ext->glBindFramebuffer(GL_DRAW_FRAMEBUFFER_EXT, 0);
+            lastApplied = 0;
+
+            resolveViewport->apply(state);
+            state.pushStateSet(mMultiviewResolveStateSet);
+            state.apply();
+
+            drawGeometry(renderInfo);
+
+            state.popStateSet();
+            state.apply();
+        }
+
         if (lastApplied != destinationHandle)
         {
             bindDestinationFbo();
diff --git a/apps/openmw/mwrender/pingpongcanvas.hpp b/apps/openmw/mwrender/pingpongcanvas.hpp
index 1887c97325..8df141f587 100644
--- a/apps/openmw/mwrender/pingpongcanvas.hpp
+++ b/apps/openmw/mwrender/pingpongcanvas.hpp
@@ -38,11 +38,11 @@ namespace MWRender
 
         void setSceneTexture(size_t frameId, osg::ref_ptr<osg::Texture> tex) { mBufferData[frameId].sceneTex = tex; }
 
-        void setLDRSceneTexture(size_t frameId, osg::ref_ptr<osg::Texture2D> tex) { mBufferData[frameId].sceneTexLDR = tex; }
+        void setLDRSceneTexture(size_t frameId, osg::ref_ptr<osg::Texture> tex) { mBufferData[frameId].sceneTexLDR = tex; }
 
         void setDepthTexture(size_t frameId, osg::ref_ptr<osg::Texture> tex) { mBufferData[frameId].depthTex = tex; }
 
-        void setNormalsTexture(size_t frameId, osg::ref_ptr<osg::Texture2D> tex) { mBufferData[frameId].normalsTex = tex; }
+        void setNormalsTexture(size_t frameId, osg::ref_ptr<osg::Texture> tex) { mBufferData[frameId].normalsTex = tex; }
 
         void setHDR(size_t frameId, bool hdr) { mBufferData[frameId].hdr = hdr; }
 
@@ -58,7 +58,10 @@ namespace MWRender
         mutable HDRDriver mHDRDriver;
 
         osg::ref_ptr<osg::Program> mFallbackProgram;
+        osg::ref_ptr<osg::Program> mMultiviewResolveProgram;
         osg::ref_ptr<osg::StateSet> mFallbackStateSet;
+        osg::ref_ptr<osg::StateSet> mMultiviewResolveStateSet;
+        mutable osg::ref_ptr<osg::FrameBufferObject> mMultiviewResolveFramebuffer;
 
         struct BufferData
         {
@@ -73,12 +76,13 @@ namespace MWRender
 
             osg::ref_ptr<osg::Texture> sceneTex;
             osg::ref_ptr<osg::Texture> depthTex;
-            osg::ref_ptr<osg::Texture2D> sceneTexLDR;
-            osg::ref_ptr<osg::Texture2D> normalsTex;
+            osg::ref_ptr<osg::Texture> sceneTexLDR;
+            osg::ref_ptr<osg::Texture> normalsTex;
         };
 
         mutable std::array<BufferData, 2> mBufferData;
         mutable std::array<osg::ref_ptr<osg::FrameBufferObject>, 3> mFbos;
+        mutable osg::ref_ptr<osg::Viewport> mRenderViewport;
 
         mutable bool mLoggedLastError = false;
     };
diff --git a/apps/openmw/mwrender/pingpongcull.cpp b/apps/openmw/mwrender/pingpongcull.cpp
index 2bec155bbb..7c3f774a61 100644
--- a/apps/openmw/mwrender/pingpongcull.cpp
+++ b/apps/openmw/mwrender/pingpongcull.cpp
@@ -4,11 +4,31 @@
 #include <osg/FrameBufferObject>
 #include <osgUtil/CullVisitor>
 
+#include <components/stereo/stereomanager.hpp>
+#include <components/stereo/multiview.hpp>
+
 #include "postprocessor.hpp"
 #include "pingpongcanvas.hpp"
 
 namespace MWRender
 {
+    PingPongCull::PingPongCull(PostProcessor* pp)
+        : mViewportStateset(nullptr)
+        , mPostProcessor(pp)
+    {
+        if (Stereo::getStereo())
+        {
+            mViewportStateset = new osg::StateSet();
+            mViewport = new osg::Viewport(0, 0, pp->renderWidth(), pp->renderHeight());
+            mViewportStateset->setAttribute(mViewport);
+        }
+    }
+
+    PingPongCull::~PingPongCull()
+    {
+        // Instantiate osg::ref_ptr<> destructor
+    }
+
     void PingPongCull::operator()(osg::Node* node, osgUtil::CullVisitor* cv)
     {
         osgUtil::RenderStage* renderStage = cv->getCurrentRenderStage();
@@ -17,10 +37,19 @@ namespace MWRender
 
         MWRender::PostProcessor* postProcessor = dynamic_cast<MWRender::PostProcessor*>(cv->getCurrentCamera()->getUserData());
 
+        if (Stereo::getStereo())
+        {
+            auto& sm = Stereo::Manager::instance();
+            auto view = sm.getEye(cv);
+            int index = view == Stereo::Eye::Right ? 1 : 0;
+            auto projectionMatrix = sm.computeEyeViewOffset(index) * sm.computeEyeProjection(index, true);
+            postProcessor->getStateUpdater()->setProjectionMatrix(projectionMatrix);
+        }
+
         postProcessor->getStateUpdater()->setViewMatrix(cv->getCurrentCamera()->getViewMatrix());
-        postProcessor->getStateUpdater()->setInvViewMatrix(cv->getCurrentCamera()->getInverseViewMatrix());
-        postProcessor->getStateUpdater()->setPrevViewMatrix(mLastViewMatrix);
-        mLastViewMatrix = cv->getCurrentCamera()->getViewMatrix();
+        postProcessor->getStateUpdater()->setPrevViewMatrix(mLastViewMatrix[0]);
+        mLastViewMatrix[0] = cv->getCurrentCamera()->getViewMatrix();
+
         postProcessor->getStateUpdater()->setEyePos(cv->getEyePoint());
         postProcessor->getStateUpdater()->setEyeVec(cv->getLookVectorLocal());
 
@@ -28,11 +57,8 @@ namespace MWRender
         {
             renderStage->setMultisampleResolveFramebufferObject(nullptr);
             renderStage->setFrameBufferObject(nullptr);
-            traverse(node, cv);
-            return;
         }
-
-        if (!postProcessor->getFbo(PostProcessor::FBO_Multisample, frameId))
+        else if (!postProcessor->getFbo(PostProcessor::FBO_Multisample, frameId))
         {
             renderStage->setFrameBufferObject(postProcessor->getFbo(PostProcessor::FBO_Primary, frameId));
         }
@@ -42,6 +68,15 @@ namespace MWRender
             renderStage->setFrameBufferObject(postProcessor->getFbo(PostProcessor::FBO_Multisample, frameId));
         }
 
-        traverse(node, cv);
+        if (mViewportStateset)
+        {
+            mViewport->setViewport(0, 0, mPostProcessor->renderWidth(), mPostProcessor->renderHeight());
+            renderStage->setViewport(mViewport);
+            cv->pushStateSet(mViewportStateset.get());
+            traverse(node, cv);
+            cv->popStateSet();
+        }
+        else
+            traverse(node, cv);
     }
 }
diff --git a/apps/openmw/mwrender/pingpongcull.hpp b/apps/openmw/mwrender/pingpongcull.hpp
index d4514e20d3..da6c0c3c68 100644
--- a/apps/openmw/mwrender/pingpongcull.hpp
+++ b/apps/openmw/mwrender/pingpongcull.hpp
@@ -7,15 +7,27 @@
 
 #include "postprocessor.hpp"
 
+namespace osg
+{
+    class StateSet;
+    class Viewport;
+}
+
 namespace MWRender
 {
     class PostProcessor;
     class PingPongCull : public SceneUtil::NodeCallback<PingPongCull, osg::Node*, osgUtil::CullVisitor*>
     {
     public:
+        PingPongCull(PostProcessor* pp);
+        ~PingPongCull();
+
         void operator()(osg::Node* node, osgUtil::CullVisitor* nv);
     private:
-        osg::Matrixf mLastViewMatrix;
+        std::array<osg::Matrixf, 2> mLastViewMatrix;
+        osg::ref_ptr<osg::StateSet> mViewportStateset;
+        osg::ref_ptr<osg::Viewport> mViewport;
+        PostProcessor* mPostProcessor;
     };
 }
 
diff --git a/apps/openmw/mwrender/postprocessor.cpp b/apps/openmw/mwrender/postprocessor.cpp
index fc9bcb693a..8fb2a2bbe9 100644
--- a/apps/openmw/mwrender/postprocessor.cpp
+++ b/apps/openmw/mwrender/postprocessor.cpp
@@ -5,9 +5,14 @@
 
 #include <osg/Texture1D>
 #include <osg/Texture2D>
+#include <osg/Texture2DMultisample>
 #include <osg/Texture3D>
 #include <osg/Texture2DArray>
 
+#ifdef OSG_HAS_MULTIVIEW
+#include <osg/Texture2DMultisampleArray>
+#endif
+
 #include <components/settings/settings.hpp>
 #include <components/sceneutil/depth.hpp>
 #include <components/sceneutil/color.hpp>
@@ -66,9 +71,102 @@ namespace
 
             cv->pushStateSet(stateset);
             traverse(camera, cv);
-            cv->popViewport();
+            cv->popStateSet();
         }
     };
+
+
+    static void setTextureSize(osg::Texture* tex, int w, int h)
+    {
+        switch (tex->getTextureTarget())
+        {
+        case GL_TEXTURE_2D:
+            static_cast<osg::Texture2D*>(tex)->setTextureSize(w, h);
+            break;
+        case GL_TEXTURE_2D_ARRAY:
+            static_cast<osg::Texture2DArray*>(tex)->setTextureSize(w, h, 2);
+            break;
+        default:
+            throw std::logic_error("Invalid texture type received");
+        }
+    }
+
+    static void setAttachment(osg::FrameBufferObject* fbo, osg::Camera::BufferComponent component, osg::Texture* tex)
+    {
+        switch (tex->getTextureTarget())
+        {
+        case GL_TEXTURE_2D:
+        {
+            auto* tex2d = static_cast<osg::Texture2D*>(tex);
+            fbo->setAttachment(component, osg::FrameBufferAttachment(tex2d));
+        }
+        break;
+        case GL_TEXTURE_2D_ARRAY:
+        {
+#ifdef OSG_HAS_MULTIVIEW
+            auto* tex2dArray = static_cast<osg::Texture2DArray*>(tex);
+            fbo->setAttachment(component, osg::FrameBufferAttachment(tex2dArray, osg::Camera::FACE_CONTROLLED_BY_MULTIVIEW_SHADER, 0));
+#endif
+        }
+        break;
+        default:
+            throw std::logic_error("Invalid texture type received");
+        }
+    }
+
+    enum class Usage
+    {
+        RENDER_BUFFER,
+        TEXTURE,
+    };
+
+    static osg::FrameBufferAttachment createFrameBufferAttachmentFromTemplate(Usage usage, int width, int height, osg::Texture* template_, int samples)
+    {
+        if (usage == Usage::RENDER_BUFFER && !Stereo::getMultiview())
+        {
+            osg::ref_ptr<osg::RenderBuffer> attachment = new osg::RenderBuffer(width, height, template_->getInternalFormat(), samples);
+            return osg::FrameBufferAttachment(attachment);
+        }
+
+        osg::FrameBufferAttachment attachment;
+
+#ifdef OSG_HAS_MULTIVIEW
+        if (Stereo::getMultiview())
+        {
+            if (samples > 1)
+            {
+                attachment = osg::FrameBufferAttachment(new osg::Texture2DMultisampleArray(), osg::Camera::FACE_CONTROLLED_BY_MULTIVIEW_SHADER, 0);
+            }
+            else
+            {
+                attachment = osg::FrameBufferAttachment(new osg::Texture2DArray(), osg::Camera::FACE_CONTROLLED_BY_MULTIVIEW_SHADER, 0);
+            }
+        }
+        else
+#endif
+        {
+            if (samples > 1)
+            {
+                attachment = osg::FrameBufferAttachment(new osg::Texture2DMultisample());
+            }
+            else
+            {
+                attachment =  osg::FrameBufferAttachment(new osg::Texture2D());
+            }
+        }
+
+        osg::Texture* texture = attachment.getTexture();
+        setTextureSize(texture, width, height);
+        texture->setSourceFormat(template_->getSourceFormat());
+        texture->setSourceType(template_->getSourceType());
+        texture->setInternalFormat(template_->getInternalFormat());
+        texture->setFilter(osg::Texture2D::MIN_FILTER, template_->getFilter(osg::Texture2D::MIN_FILTER));
+        texture->setFilter(osg::Texture2D::MAG_FILTER, template_->getFilter(osg::Texture2D::MAG_FILTER));
+        texture->setWrap(osg::Texture::WRAP_S, template_->getWrap(osg::Texture2D::WRAP_S));
+        texture->setWrap(osg::Texture::WRAP_T, template_->getWrap(osg::Texture2D::WRAP_T));
+
+        return attachment;
+    }
 }
 
 namespace MWRender
@@ -99,7 +197,7 @@ namespace MWRender
         , mPrevPassLights(false)
         , mMainTemplate(new osg::Texture2D)
     {
-        mSoftParticles = Settings::Manager::getBool("soft particles", "Shaders") && !Stereo::getStereo() && !Stereo::getMultiview();
+        mSoftParticles = Settings::Manager::getBool("soft particles", "Shaders");
         mUsePostProcessing = Settings::Manager::getBool("enabled", "Post Processing");
 
         osg::GraphicsContext* gc = viewer->getCamera()->getGraphicsContext();
@@ -121,14 +219,21 @@ namespace MWRender
             Log(Debug::Error) << "'glDisablei' unsupported, pass normals will not be available to shaders.";
 
         if (mSoftParticles)
+        {
             for (int i = 0; i < 2; ++i)
-                mTextures[i][Tex_OpaqueDepth] = new osg::Texture2D;
+            {
+                if (Stereo::getMultiview())
+                    mTextures[i][Tex_OpaqueDepth] = new osg::Texture2DArray;
+                else
+                    mTextures[i][Tex_OpaqueDepth] = new osg::Texture2D;
+            }
+        }
 
         mGLSLVersion = ext->glslLanguageVersion * 100;
         mUBO = ext && ext->isUniformBufferObjectSupported && mGLSLVersion >= 330;
         mStateUpdater = new fx::StateUpdater(mUBO);
 
-        if (!SceneUtil::AutoDepth::isReversed() && !mSoftParticles && !mUsePostProcessing && !Stereo::getStereo() && !Stereo::getMultiview())
+        if (!SceneUtil::AutoDepth::isReversed() && !mSoftParticles && !mUsePostProcessing)
             return;
 
         enable(mUsePostProcessing);
@@ -142,11 +247,18 @@ namespace MWRender
 
     void PostProcessor::resize()
     {
+        mHUDCamera->resize(mWidth, mHeight);
+        mViewer->getCamera()->resize(mWidth, mHeight);
+        if (Stereo::getStereo())
+            Stereo::Manager::instance().screenResolutionChanged();
+
+        auto width = renderWidth();
+        auto height = renderHeight();
         for (auto& technique : mTechniques)
         {
             for (auto& [name, rt] : technique->getRenderTargetsMap())
             {
-                const auto [w, h] = rt.mSize.get(mWidth, mHeight);
+                const auto [w, h] = rt.mSize.get(width, height);
                 rt.mTarget->setTextureSize(w, h);
             }
         }
@@ -156,10 +268,8 @@ namespace MWRender
         createTexturesAndCamera(frameId);
         createObjectsForFrame(frameId);
 
-        mHUDCamera->resize(mWidth, mHeight);
-        mViewer->getCamera()->resize(mWidth, mHeight);
         mRendering.updateProjectionMatrix();
-        mRendering.setScreenRes(mWidth, mHeight);
+        mRendering.setScreenRes(width, height);
 
         dirtyTechniques();
 
@@ -168,8 +278,6 @@ namespace MWRender
         mDirty = true;
         mDirtyFrameId = !frameId;
 
-        if (Stereo::getStereo())
-            Stereo::Manager::instance().screenResolutionChanged();
     }
 
     void PostProcessor::populateTechniqueFiles()
@@ -191,7 +299,7 @@ namespace MWRender
         mReload = true;
         mEnabled = true;
         bool postPass = Settings::Manager::getBool("transparent postpass", "Post Processing");
-        mUsePostProcessing = usePostProcessing && !Stereo::getStereo() && !Stereo::getMultiview();
+        mUsePostProcessing = usePostProcessing;
 
         mDisableDepthPasses = !mSoftParticles && !postPass;
 
@@ -199,7 +307,7 @@ namespace MWRender
         mDisableDepthPasses = true;
 #endif
 
-        if (!mDisableDepthPasses && !Stereo::getStereo() && !Stereo::getMultiview())
+        if (!mDisableDepthPasses)
         {
             mTransparentDepthPostPass = new TransparentDepthBinCallback(mRendering.getResourceSystem()->getSceneManager()->getShaderManager(), postPass);
             osgUtil::RenderBin::getRenderBinPrototype("DepthSortedBin")->setDrawCallback(mTransparentDepthPostPass);
@@ -240,7 +348,7 @@ namespace MWRender
         if (!mSoftParticles)
             osgUtil::RenderBin::getRenderBinPrototype("DepthSortedBin")->setDrawCallback(nullptr);
 
-        if (!SceneUtil::AutoDepth::isReversed() && !mSoftParticles && !Stereo::getStereo() && !Stereo::getMultiview())
+        if (!SceneUtil::AutoDepth::isReversed() && !mSoftParticles)
         {
             removeChild(mHUDCamera);
             setCullCallback(nullptr);
@@ -289,25 +397,7 @@ namespace MWRender
         mPingPongCanvas->setMask(frameId, mUnderwater, mExteriorFlag);
         mPingPongCanvas->setHDR(frameId, getHDR());
 
-        if (Stereo::getStereo())
-        {
-            auto& sm = Stereo::Manager::instance();
-
-            int index = sm.getEye(cv) == Stereo::Eye::Left ? 0 : 1;
-
-            mPingPongCanvas->setSceneTexture(frameId, sm.multiviewFramebuffer()->layerColorBuffer(index));
-            mPingPongCanvas->setDepthTexture(frameId, sm.multiviewFramebuffer()->layerDepthBuffer(index));
-        }
-        else if (Stereo::getMultiview())
-        {
-            auto& sm = Stereo::Manager::instance();
-
-            mPingPongCanvas->setSceneTexture(frameId, sm.multiviewFramebuffer()->multiviewColorBuffer());
-            mPingPongCanvas->setDepthTexture(frameId, sm.multiviewFramebuffer()->multiviewDepthBuffer());
-        }
-        else
-        {
-            mPingPongCanvas->setSceneTexture(frameId, getTexture(Tex_Scene, frameId));
+        mPingPongCanvas->setSceneTexture(frameId, getTexture(Tex_Scene, frameId));
             if (mDisableDepthPasses)
                 mPingPongCanvas->setDepthTexture(frameId, getTexture(Tex_Depth, frameId));
             else
@@ -315,12 +405,12 @@ namespace MWRender
 
             mPingPongCanvas->setLDRSceneTexture(frameId, getTexture(Tex_Scene_LDR, frameId));
 
-            if (mTransparentDepthPostPass)
-            {
-                mTransparentDepthPostPass->mFbo[frameId] = mFbos[frameId][FBO_Primary];
-                mTransparentDepthPostPass->mMsaaFbo[frameId] = mFbos[frameId][FBO_Multisample];
-                mTransparentDepthPostPass->mOpaqueFbo[frameId] = mFbos[frameId][FBO_OpaqueDepth];
-            }
+        if (mTransparentDepthPostPass)
+        {
+            mTransparentDepthPostPass->mFbo[frameId] = mFbos[frameId][FBO_Primary];
+            mTransparentDepthPostPass->mMsaaFbo[frameId] = mFbos[frameId][FBO_Multisample];
+            mTransparentDepthPostPass->mOpaqueFbo[frameId] = mFbos[frameId][FBO_OpaqueDepth];
+            mTransparentDepthPostPass->dirtyFrame(frameId);
         }
 
         size_t frame = cv->getTraversalNumber();
@@ -331,7 +421,6 @@ namespace MWRender
         if (frame != mLastFrameNumber)
         {
             mLastFrameNumber = frame;
-
             auto stamp = cv->getFrameStamp();
 
             mStateUpdater->setSimulationTime(static_cast<float>(stamp->getSimulationTime()));
@@ -440,29 +529,29 @@ namespace MWRender
 
     void PostProcessor::createObjectsForFrame(size_t frameId)
     {
-        if (Stereo::getStereo() || Stereo::getMultiview())
-            return;
-
         auto& fbos = mFbos[frameId];
         auto& textures = mTextures[frameId];
+        auto width = renderWidth();
+        auto height = renderHeight();
 
         for (auto& tex : textures)
         {
             if (!tex)
                 continue;
 
-            tex->setTextureSize(mWidth, mHeight);
+            setTextureSize(tex, width, height);
             tex->dirtyTextureObject();
         }
 
         fbos[FBO_Primary] = new osg::FrameBufferObject;
-        fbos[FBO_Primary]->setAttachment(osg::Camera::COLOR_BUFFER0, osg::FrameBufferAttachment(textures[Tex_Scene]));
+        setAttachment(fbos[FBO_Primary], osg::Camera::COLOR_BUFFER0, textures[Tex_Scene]);
         if (mNormals && mNormalsSupported)
-            fbos[FBO_Primary]->setAttachment(osg::Camera::COLOR_BUFFER1, osg::FrameBufferAttachment(textures[Tex_Normal]));
-        fbos[FBO_Primary]->setAttachment(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, osg::FrameBufferAttachment(textures[Tex_Depth]));
+            setAttachment(fbos[FBO_Primary], osg::Camera::COLOR_BUFFER1, textures[Tex_Normal]);
+        setAttachment(fbos[FBO_Primary], osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, textures[Tex_Depth]);
 
         fbos[FBO_FirstPerson] = new osg::FrameBufferObject;
-        osg::ref_ptr<osg::RenderBuffer> fpDepthRb = new osg::RenderBuffer(mWidth, mHeight, textures[Tex_Depth]->getInternalFormat(), mSamples > 1 ? mSamples : 0);
+
+        auto fpDepthRb = createFrameBufferAttachmentFromTemplate(Usage::RENDER_BUFFER, width, height, textures[Tex_Depth], mSamples);
         fbos[FBO_FirstPerson]->setAttachment(osg::FrameBufferObject::BufferComponent::PACKED_DEPTH_STENCIL_BUFFER, osg::FrameBufferAttachment(fpDepthRb));
 
         // When MSAA is enabled we must first render to a render buffer, then
@@ -471,33 +560,33 @@ namespace MWRender
         if (mSamples > 1)
         {
             fbos[FBO_Multisample] = new osg::FrameBufferObject;
-            osg::ref_ptr<osg::RenderBuffer> colorRB = new osg::RenderBuffer(mWidth, mHeight, textures[Tex_Scene]->getInternalFormat(), mSamples);
+            auto colorRB = createFrameBufferAttachmentFromTemplate(Usage::RENDER_BUFFER, width, height, textures[Tex_Scene], mSamples);
             if (mNormals && mNormalsSupported)
             {
-                osg::ref_ptr<osg::RenderBuffer> normalRB = new osg::RenderBuffer(mWidth, mHeight, textures[Tex_Normal]->getInternalFormat(), mSamples);
-                fbos[FBO_Multisample]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER1, osg::FrameBufferAttachment(normalRB));
-                fbos[FBO_FirstPerson]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER1, osg::FrameBufferAttachment(normalRB));
+                auto normalRB = createFrameBufferAttachmentFromTemplate(Usage::RENDER_BUFFER, width, height, textures[Tex_Normal], mSamples);
+                fbos[FBO_Multisample]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER1, normalRB);
+                fbos[FBO_FirstPerson]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER1, normalRB);
             }
-            osg::ref_ptr<osg::RenderBuffer> depthRB = new osg::RenderBuffer(mWidth, mHeight, textures[Tex_Depth]->getInternalFormat(), mSamples);
-            fbos[FBO_Multisample]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, osg::FrameBufferAttachment(colorRB));
-            fbos[FBO_Multisample]->setAttachment(osg::FrameBufferObject::BufferComponent::PACKED_DEPTH_STENCIL_BUFFER, osg::FrameBufferAttachment(depthRB));
-            fbos[FBO_FirstPerson]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, osg::FrameBufferAttachment(colorRB));
+            auto depthRB = createFrameBufferAttachmentFromTemplate(Usage::RENDER_BUFFER, width, height, textures[Tex_Depth], mSamples);
+            fbos[FBO_Multisample]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, colorRB);
+            fbos[FBO_Multisample]->setAttachment(osg::FrameBufferObject::BufferComponent::PACKED_DEPTH_STENCIL_BUFFER, depthRB);
+            fbos[FBO_FirstPerson]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, colorRB);
 
             fbos[FBO_Intercept] = new osg::FrameBufferObject;
-            fbos[FBO_Intercept]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, osg::FrameBufferAttachment(textures[Tex_Scene]));
-            fbos[FBO_Intercept]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER1, osg::FrameBufferAttachment(textures[Tex_Normal]));
+            setAttachment(fbos[FBO_Intercept], osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, textures[Tex_Scene]);
+            setAttachment(fbos[FBO_Intercept], osg::FrameBufferObject::BufferComponent::COLOR_BUFFER1, textures[Tex_Normal]);
         }
         else
         {
-            fbos[FBO_FirstPerson]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, osg::FrameBufferAttachment(textures[Tex_Scene]));
+            setAttachment(fbos[FBO_FirstPerson], osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, textures[Tex_Scene]);
             if (mNormals && mNormalsSupported)
-                fbos[FBO_FirstPerson]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER1, osg::FrameBufferAttachment(textures[Tex_Normal]));
+                setAttachment(fbos[FBO_FirstPerson], osg::FrameBufferObject::BufferComponent::COLOR_BUFFER1, textures[Tex_Normal]);
         }
 
         if (textures[Tex_OpaqueDepth])
         {
             fbos[FBO_OpaqueDepth] = new osg::FrameBufferObject;
-            fbos[FBO_OpaqueDepth]->setAttachment(osg::FrameBufferObject::BufferComponent::PACKED_DEPTH_STENCIL_BUFFER, osg::FrameBufferAttachment(textures[Tex_OpaqueDepth]));
+            setAttachment(fbos[FBO_OpaqueDepth], osg::FrameBufferObject::BufferComponent::PACKED_DEPTH_STENCIL_BUFFER, textures[Tex_OpaqueDepth]);
         }
 
 #ifdef __APPLE__
@@ -600,7 +689,7 @@ namespace MWRender
                 {
                     const auto& rt = technique->getRenderTargetsMap()[pass->getTarget()];
 
-                    const auto [w, h] = rt.mSize.get(mWidth, mHeight);
+                    const auto [w, h] = rt.mSize.get(renderWidth(), renderHeight());
 
                     subPass.mRenderTexture = new osg::Texture2D(*rt.mTarget);
                     renderTargetCache[rt.mTarget] = subPass.mRenderTexture;
@@ -690,11 +779,19 @@ namespace MWRender
     {
         auto& textures = mTextures[frameId];
 
+        auto width = renderWidth();
+        auto height = renderHeight();
+
         for (auto& texture : textures)
         {
             if (!texture)
-                texture = new osg::Texture2D;
-            texture->setTextureSize(mWidth, mHeight);
+            {
+                if (Stereo::getMultiview())
+                    texture = new osg::Texture2DArray;
+                else
+                    texture = new osg::Texture2D;
+            }
+            setTextureSize(texture, width, height);
             texture->setSourceFormat(GL_RGBA);
             texture->setSourceType(GL_UNSIGNED_BYTE);
             texture->setInternalFormat(GL_RGBA);
@@ -719,7 +816,7 @@ namespace MWRender
             textures[Tex_Scene]->setWrap(osg::Texture::WRAP_T, mMainTemplate->getWrap(osg::Texture2D::WRAP_T));
         }
 
-        auto setupDepth = [] (osg::Texture2D* tex) {
+        auto setupDepth = [] (osg::Texture* tex) {
             tex->setSourceFormat(GL_DEPTH_STENCIL_EXT);
             tex->setSourceType(SceneUtil::AutoDepth::depthSourceType());
             tex->setInternalFormat(SceneUtil::AutoDepth::depthInternalFormat());
@@ -750,11 +847,10 @@ namespace MWRender
         mHUDCamera->setViewport(0, 0, mWidth, mHeight);
 
         mViewer->getCamera()->removeCullCallback(mPingPongCull);
-        mPingPongCull = new PingPongCull;
+        mPingPongCull = new PingPongCull(this);
         mViewer->getCamera()->addCullCallback(mPingPongCull);
 
         mPingPongCanvas = new PingPongCanvas(mRendering.getResourceSystem()->getSceneManager()->getShaderManager());
-
         mHUDCamera->addChild(mPingPongCanvas);
         mHUDCamera->setNodeMask(Mask_RenderToTexture);
 
@@ -778,7 +874,7 @@ namespace MWRender
             if (Misc::StringUtils::ciEqual(technique->getName(), name))
                 return technique;
 
-        auto technique = std::make_shared<fx::Technique>(*mVFS, *mRendering.getResourceSystem()->getImageManager(), name, mWidth, mHeight, mUBO, mNormalsSupported);
+        auto technique = std::make_shared<fx::Technique>(*mVFS, *mRendering.getResourceSystem()->getImageManager(), name, renderWidth(), renderHeight(), mUBO, mNormalsSupported);
 
         technique->compile();
 
@@ -854,5 +950,19 @@ namespace MWRender
             if (technique->getDynamic())
                 disableTechnique(technique);
     }
+
+    int PostProcessor::renderWidth() const
+    {
+        if (Stereo::getStereo())
+            return Stereo::Manager::instance().eyeResolution().x();
+        return mWidth;
+    }
+
+    int PostProcessor::renderHeight() const
+    {
+        if (Stereo::getStereo())
+            return Stereo::Manager::instance().eyeResolution().y();
+        return mHeight;
+    }
 }
 
diff --git a/apps/openmw/mwrender/postprocessor.hpp b/apps/openmw/mwrender/postprocessor.hpp
index 01a9e1088c..2fa3e5622a 100644
--- a/apps/openmw/mwrender/postprocessor.hpp
+++ b/apps/openmw/mwrender/postprocessor.hpp
@@ -55,7 +55,7 @@ namespace MWRender
     {
     public:
         using FBOArray = std::array<osg::ref_ptr<osg::FrameBufferObject>, 5>;
-        using TextureArray = std::array<osg::ref_ptr<osg::Texture2D>, 5>;
+        using TextureArray = std::array<osg::ref_ptr<osg::Texture>, 5>;
         using TechniqueList = std::vector<std::shared_ptr<fx::Technique>>;
 
         enum TextureIndex
@@ -94,7 +94,7 @@ namespace MWRender
 
         osg::ref_ptr<osg::FrameBufferObject> getFbo(FBOIndex index, unsigned int frameId) { return mFbos[frameId][index]; }
 
-        osg::ref_ptr<osg::Texture2D> getTexture(TextureIndex index, unsigned int frameId) { return mTextures[frameId][index]; }
+        osg::ref_ptr<osg::Texture> getTexture(TextureIndex index, unsigned int frameId) { return mTextures[frameId][index]; }
 
         osg::ref_ptr<osg::FrameBufferObject> getPrimaryFbo(unsigned int frameId) { return mFbos[frameId][FBO_Multisample] ? mFbos[frameId][FBO_Multisample] : mFbos[frameId][FBO_Primary]; }
 
@@ -177,6 +177,9 @@ namespace MWRender
 
         void disableDynamicShaders();
 
+        int renderWidth() const;
+        int renderHeight() const;
+
     private:
 
         void populateTechniqueFiles();
@@ -242,7 +245,7 @@ namespace MWRender
         bool mUBO;
         int mGLSLVersion;
 
-        osg::ref_ptr<osg::Texture2D> mMainTemplate;
+        osg::ref_ptr<osg::Texture> mMainTemplate;
 
         osg::ref_ptr<fx::StateUpdater> mStateUpdater;
         osg::ref_ptr<PingPongCull> mPingPongCull;
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index e639880b37..df14f7263c 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -110,14 +110,14 @@ namespace MWRender
         {
             auto* uProjectionMatrix = stateset->getUniform("projectionMatrix");
             if (uProjectionMatrix)
-                uProjectionMatrix->set(Stereo::Manager::instance().computeEyeProjection(0, SceneUtil::AutoDepth::isReversed()));
+                uProjectionMatrix->set(Stereo::Manager::instance().computeEyeViewOffset(0) * Stereo::Manager::instance().computeEyeProjection(0, SceneUtil::AutoDepth::isReversed()));
         }
 
         void applyRight(osg::StateSet* stateset, osgUtil::CullVisitor* nv) override
         {
             auto* uProjectionMatrix = stateset->getUniform("projectionMatrix");
             if (uProjectionMatrix)
-                uProjectionMatrix->set(Stereo::Manager::instance().computeEyeProjection(1, SceneUtil::AutoDepth::isReversed()));
+                uProjectionMatrix->set(Stereo::Manager::instance().computeEyeViewOffset(1) * Stereo::Manager::instance().computeEyeProjection(1, SceneUtil::AutoDepth::isReversed()));
         }
 
         void setProjectionMatrix(const osg::Matrixf& projectionMatrix)
diff --git a/apps/openmw/mwrender/screenshotmanager.cpp b/apps/openmw/mwrender/screenshotmanager.cpp
index 64961bf037..40665cc250 100644
--- a/apps/openmw/mwrender/screenshotmanager.cpp
+++ b/apps/openmw/mwrender/screenshotmanager.cpp
@@ -109,9 +109,7 @@ namespace MWRender
                 size_t frameId = renderInfo.getState()->getFrameStamp()->getFrameNumber() % 2;
                 osg::FrameBufferObject* fbo = nullptr;
 
-                if (Stereo::getStereo())
-                    fbo = Stereo::Manager::instance().multiviewFramebuffer()->layerFbo(0);
-                else if (postProcessor && postProcessor->getFbo(PostProcessor::FBO_Primary, frameId))
+                if (postProcessor && postProcessor->getFbo(PostProcessor::FBO_Primary, frameId))
                     fbo = postProcessor->getFbo(PostProcessor::FBO_Primary, frameId);
 
                 if (fbo)
diff --git a/apps/openmw/mwrender/skyutil.cpp b/apps/openmw/mwrender/skyutil.cpp
index 843582064b..00bc2aef89 100644
--- a/apps/openmw/mwrender/skyutil.cpp
+++ b/apps/openmw/mwrender/skyutil.cpp
@@ -22,6 +22,7 @@
 
 #include <components/misc/rng.hpp>
 #include <components/stereo/stereomanager.hpp>
+#include <components/stereo/multiview.hpp>
 
 #include <components/resource/scenemanager.hpp>
 #include <components/resource/imagemanager.hpp>
@@ -604,33 +605,63 @@ namespace MWRender
     }
 
 
-    class SkyMultiviewStatesetUpdater: public SceneUtil::StateSetUpdater
+    class SkyStereoStatesetUpdater : public SceneUtil::StateSetUpdater
     {
     public:
-        SkyMultiviewStatesetUpdater()
+        SkyStereoStatesetUpdater()
         {
         }
 
     protected:
-        virtual void setDefaults(osg::StateSet* stateset)
+        void setDefaults(osg::StateSet* stateset) override
         {
-            stateset->addUniform(new osg::Uniform(osg::Uniform::FLOAT_MAT4, "viewMatrixMultiView", 2), osg::StateAttribute::OVERRIDE);
+            if (Stereo::getMultiview())
+                stateset->addUniform(new osg::Uniform(osg::Uniform::FLOAT_MAT4, "projectionMatrixMultiView", 2), osg::StateAttribute::OVERRIDE);
+            else
+                stateset->addUniform(new osg::Uniform(osg::Uniform::FLOAT_MAT4, "projectionMatrix"), osg::StateAttribute::OVERRIDE);
+
         }
 
-        virtual void apply(osg::StateSet* stateset, osg::NodeVisitor* /*nv*/)
+        void apply(osg::StateSet* stateset, osg::NodeVisitor* /*nv*/) override
         {
-            auto* viewMatrixMultiViewUniform = stateset->getUniform("viewMatrixMultiView");
-            auto& sm = Stereo::Manager::instance();
-
-            for (int view : {0, 1})
+            if (Stereo::getMultiview())
             {
-                auto viewOffsetMatrix = sm.computeEyeViewOffset(view);
-                for (int col : {0, 1, 2})
-                    viewOffsetMatrix(3, col) = 0;
+                auto* projectionMatrixMultiViewUniform = stateset->getUniform("projectionMatrixMultiView");
+                auto& sm = Stereo::Manager::instance();
+
+                for (int view : {0, 1})
+                {
+                    auto projectionMatrix = sm.computeEyeProjection(view, true);
+                    auto viewOffsetMatrix = sm.computeEyeViewOffset(view);
+                    for (int col : {0, 1, 2})
+                        viewOffsetMatrix(3, col) = 0;
 
-                viewMatrixMultiViewUniform->setElement(view, viewOffsetMatrix);
+                    projectionMatrixMultiViewUniform->setElement(view, viewOffsetMatrix * projectionMatrix);
+                }
             }
         }
+        void applyLeft(osg::StateSet* stateset, osgUtil::CullVisitor* /*cv*/) override
+        {
+            auto& sm = Stereo::Manager::instance();
+            auto* projectionMatrixUniform = stateset->getUniform("projectionMatrix");
+            auto projectionMatrix = sm.computeEyeProjection(0, true);
+            auto viewOffsetMatrix = sm.computeEyeViewOffset(0);
+            for (int col : {0, 1, 2})
+                viewOffsetMatrix(3, col) = 0;
+
+            projectionMatrixUniform->set(viewOffsetMatrix * projectionMatrix);
+        }
+        void applyRight(osg::StateSet* stateset, osgUtil::CullVisitor* /*cv*/) override
+        {
+            auto& sm = Stereo::Manager::instance();
+            auto* projectionMatrixUniform = stateset->getUniform("projectionMatrix");
+            auto projectionMatrix = sm.computeEyeProjection(1, true);
+            auto viewOffsetMatrix = sm.computeEyeViewOffset(1);
+            for (int col : {0, 1, 2})
+                viewOffsetMatrix(3, col) = 0;
+
+            projectionMatrixUniform->set(viewOffsetMatrix * projectionMatrix);
+        }
 
     private:
     };
@@ -643,7 +674,8 @@ namespace MWRender
         setCullingActive(false);
 
         addCullCallback(new CameraRelativeTransformCullCallback);
-        addCullCallback(new SkyMultiviewStatesetUpdater);
+        if (Stereo::getStereo())
+            addCullCallback(new SkyStereoStatesetUpdater);
     }
 
     CameraRelativeTransform::CameraRelativeTransform(const CameraRelativeTransform& copy, const osg::CopyOp& copyop)
diff --git a/apps/openmw/mwrender/transparentpass.cpp b/apps/openmw/mwrender/transparentpass.cpp
index e5368e7f3e..084eca1cdb 100644
--- a/apps/openmw/mwrender/transparentpass.cpp
+++ b/apps/openmw/mwrender/transparentpass.cpp
@@ -2,10 +2,17 @@
 
 #include <osg/BlendFunc>
 #include <osg/Texture2D>
+#include <osg/Texture2DArray>
+
+#ifdef OSG_HAS_MULTIVIEW
+#include <osg/Texture2DMultisampleArray>
+#endif
 
 #include <osgUtil/RenderStage>
 
 #include <components/shader/shadermanager.hpp>
+#include <components/stereo/multiview.hpp>
+#include <components/stereo/stereomanager.hpp>
 
 namespace MWRender
 {
@@ -24,8 +31,10 @@ namespace MWRender
 
             mStateSet->setTextureAttributeAndModes(0, dummyTexture);
 
-            osg::ref_ptr<osg::Shader> vertex = shaderManager.getShader("blended_depth_postpass_vertex.glsl", {}, osg::Shader::VERTEX);
-            osg::ref_ptr<osg::Shader> fragment = shaderManager.getShader("blended_depth_postpass_fragment.glsl", {}, osg::Shader::FRAGMENT);
+            Shader::ShaderManager::DefineMap defines;
+            Stereo::Manager::instance().shaderStereoDefines(defines);
+            osg::ref_ptr<osg::Shader> vertex = shaderManager.getShader("blended_depth_postpass_vertex.glsl", defines, osg::Shader::VERTEX);
+            osg::ref_ptr<osg::Shader> fragment = shaderManager.getShader("blended_depth_postpass_fragment.glsl", defines, osg::Shader::FRAGMENT);
 
             mStateSet->setAttributeAndModes(new osg::BlendFunc, modeOff);
             mStateSet->setAttributeAndModes(shaderManager.getProgram(vertex, fragment), modeOn);
@@ -59,9 +68,22 @@ namespace MWRender
 
             const osg::Texture* tex = opaqueFbo->getAttachment(osg::FrameBufferObject::BufferComponent::PACKED_DEPTH_STENCIL_BUFFER).getTexture();
 
-            opaqueFbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
-
-            ext->glBlitFramebuffer(0, 0, tex->getTextureWidth(), tex->getTextureHeight(), 0, 0, tex->getTextureWidth(), tex->getTextureHeight(), GL_DEPTH_BUFFER_BIT, GL_NEAREST);
+            if (Stereo::getMultiview())
+            {
+                if (!mMultiviewDepthResolveLeftSource[frameId])
+                    setupMultiviewDepthResolveBuffers(frameId);
+                mMultiviewDepthResolveLeftTarget[frameId]->apply(state, osg::FrameBufferObject::BindTarget::DRAW_FRAMEBUFFER);
+                mMultiviewDepthResolveLeftSource[frameId]->apply(state, osg::FrameBufferObject::BindTarget::READ_FRAMEBUFFER);
+                ext->glBlitFramebuffer(0, 0, tex->getTextureWidth(), tex->getTextureHeight(), 0, 0, tex->getTextureWidth(), tex->getTextureHeight(), GL_DEPTH_BUFFER_BIT, GL_NEAREST);
+                mMultiviewDepthResolveRightTarget[frameId]->apply(state, osg::FrameBufferObject::BindTarget::DRAW_FRAMEBUFFER);
+                mMultiviewDepthResolveRightSource[frameId]->apply(state, osg::FrameBufferObject::BindTarget::READ_FRAMEBUFFER);
+                ext->glBlitFramebuffer(0, 0, tex->getTextureWidth(), tex->getTextureHeight(), 0, 0, tex->getTextureWidth(), tex->getTextureHeight(), GL_DEPTH_BUFFER_BIT, GL_NEAREST);
+            }
+            else
+            {
+                opaqueFbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
+                ext->glBlitFramebuffer(0, 0, tex->getTextureWidth(), tex->getTextureHeight(), 0, 0, tex->getTextureWidth(), tex->getTextureHeight(), GL_DEPTH_BUFFER_BIT, GL_NEAREST);
+            }
 
             msaaFbo ? msaaFbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER) : fbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
 
@@ -80,6 +102,47 @@ namespace MWRender
             bin->setStateSet(restore);
 
             msaaFbo ? msaaFbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER) : fbo->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
+            state.checkGLErrors("after TransparentDepthBinCallback::drawImplementation");
+        }
+
+        void TransparentDepthBinCallback::dirtyFrame(int frameId)
+        {
+            mMultiviewDepthResolveLeftSource[frameId] = mMultiviewDepthResolveRightSource[frameId] = nullptr;
+            mMultiviewDepthResolveLeftTarget[frameId] = mMultiviewDepthResolveRightTarget[frameId] = nullptr;
+        }
+
+        osg::FrameBufferAttachment makeSingleLayerAttachmentFromMultilayerAttachment(osg::FrameBufferAttachment attachment, int layer)
+        {
+            osg::Texture* tex = attachment.getTexture();
+
+            if (tex->getTextureTarget() == GL_TEXTURE_2D_ARRAY)
+                return osg::FrameBufferAttachment(static_cast<osg::Texture2DArray*>(tex), layer, 0);
+
+#ifdef OSG_HAS_MULTIVIEW
+            if (tex->getTextureTarget() == GL_TEXTURE_2D_MULTISAMPLE_ARRAY)
+                return osg::FrameBufferAttachment(static_cast<osg::Texture2DMultisampleArray*>(tex), layer, 0);
+#endif
+
+            Log(Debug::Error) << "Attempted to extract a layer from an unlayered texture";
+
+            return osg::FrameBufferAttachment();
+        }
+
+        void TransparentDepthBinCallback::setupMultiviewDepthResolveBuffers(int frameId)
+        {
+            const osg::FrameBufferObject::BufferComponent component = osg::FrameBufferObject::BufferComponent::PACKED_DEPTH_STENCIL_BUFFER;
+            const auto& sourceFbo = mMsaaFbo[frameId] ? mMsaaFbo[frameId] : mFbo[frameId];
+            const auto& sourceAttachment = sourceFbo->getAttachment(component);
+            mMultiviewDepthResolveLeftSource[frameId] = new osg::FrameBufferObject;
+            mMultiviewDepthResolveLeftSource[frameId]->setAttachment(component, makeSingleLayerAttachmentFromMultilayerAttachment(sourceAttachment, 0));
+            mMultiviewDepthResolveRightSource[frameId] = new osg::FrameBufferObject;
+            mMultiviewDepthResolveRightSource[frameId]->setAttachment(component, makeSingleLayerAttachmentFromMultilayerAttachment(sourceAttachment, 1));
+            const auto& targetFbo = mOpaqueFbo[frameId];
+            const auto& targetAttachment = targetFbo->getAttachment(component);
+            mMultiviewDepthResolveLeftTarget[frameId] = new osg::FrameBufferObject;
+            mMultiviewDepthResolveLeftTarget[frameId]->setAttachment(component, makeSingleLayerAttachmentFromMultilayerAttachment(targetAttachment, 0));
+            mMultiviewDepthResolveRightTarget[frameId] = new osg::FrameBufferObject;
+            mMultiviewDepthResolveRightTarget[frameId]->setAttachment(component, makeSingleLayerAttachmentFromMultilayerAttachment(targetAttachment, 1));
         }
 
-}
\ No newline at end of file
+}
diff --git a/apps/openmw/mwrender/transparentpass.hpp b/apps/openmw/mwrender/transparentpass.hpp
index a933dde989..a9093acbf1 100644
--- a/apps/openmw/mwrender/transparentpass.hpp
+++ b/apps/openmw/mwrender/transparentpass.hpp
@@ -23,11 +23,18 @@ namespace MWRender
         TransparentDepthBinCallback(Shader::ShaderManager& shaderManager, bool postPass);
 
         void drawImplementation(osgUtil::RenderBin* bin, osg::RenderInfo& renderInfo, osgUtil::RenderLeaf*& previous) override;
+        void dirtyFrame(int frameId);
+        void setupMultiviewDepthResolveBuffers(int frameId);
 
         std::array<osg::ref_ptr<osg::FrameBufferObject>, 2> mFbo;
         std::array<osg::ref_ptr<osg::FrameBufferObject>, 2> mMsaaFbo;
         std::array<osg::ref_ptr<osg::FrameBufferObject>, 2> mOpaqueFbo;
 
+        std::array<osg::ref_ptr<osg::FrameBufferObject>, 2> mMultiviewDepthResolveLeftSource;
+        std::array<osg::ref_ptr<osg::FrameBufferObject>, 2> mMultiviewDepthResolveRightSource;
+        std::array<osg::ref_ptr<osg::FrameBufferObject>, 2> mMultiviewDepthResolveLeftTarget;
+        std::array<osg::ref_ptr<osg::FrameBufferObject>, 2> mMultiviewDepthResolveRightTarget;
+
     private:
         osg::ref_ptr<osg::StateSet> mStateSet;
         bool mPostPass;
@@ -35,4 +42,4 @@ namespace MWRender
 
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/components/debug/gldebug.cpp b/components/debug/gldebug.cpp
index a0c7aa6206..81bd7eb003 100644
--- a/components/debug/gldebug.cpp
+++ b/components/debug/gldebug.cpp
@@ -82,18 +82,23 @@ namespace Debug
             break;
         case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR:
             typeStr = "DEPRECATED_BEHAVIOR";
+            logSeverity = Warning;
             break;
         case GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR:
             typeStr = "UNDEFINED_BEHAVIOR";
+            logSeverity = Warning;
             break;
         case GL_DEBUG_TYPE_PORTABILITY:
             typeStr = "PORTABILITY";
+            logSeverity = Debug;
             break;
         case GL_DEBUG_TYPE_PERFORMANCE:
             typeStr = "PERFORMANCE";
+            logSeverity = Debug;
             break;
         case GL_DEBUG_TYPE_OTHER:
             typeStr = "OTHER";
+            logSeverity = Debug;
             break;
         default:
             typeStr = "UNDEFINED";
diff --git a/components/fx/pass.cpp b/components/fx/pass.cpp
index d264ceae2a..b32dd2e0b1 100644
--- a/components/fx/pass.cpp
+++ b/components/fx/pass.cpp
@@ -29,6 +29,19 @@ namespace
 #endif
 omw_Out vec2 omw_TexCoord;
 
+void main()
+{
+    omw_Position = vec4(omw_Vertex.xy, 0.0, 1.0);
+    omw_TexCoord = omw_Position.xy * 0.5 + 0.5;
+})GLSL";
+
+    constexpr char s_DefaultVertexMultiview[] = R"GLSL(
+layout(num_views = 2) in;
+#if OMW_USE_BINDINGS
+    omw_In vec2 omw_Vertex;
+#endif
+omw_Out vec2 omw_TexCoord;
+
 void main()
 {
     omw_Position = vec4(omw_Vertex.xy, 0.0, 1.0);
@@ -81,6 +94,11 @@ uniform @builtinSampler omw_SamplerNormals;
 uniform vec4 omw_PointLights[@pointLightCount];
 uniform int omw_PointLightsCount;
 
+#if OMW_MULTIVIEW
+uniform mat4 projectionMatrixMultiView[2];
+uniform mat4 invProjectionMatrixMultiView[2];
+#endif
+
 int omw_GetPointLightCount()
 {
     return omw_PointLightsCount;
@@ -112,6 +130,25 @@ float omw_GetPointLightRadius(int index)
     uniform _omw_data omw;
 #endif
 
+
+mat4 omw_ProjectionMatrix()
+{
+#if OMW_MULTIVIEW
+    return projectionMatrixMultiView[gl_ViewID_OVR];
+#else
+    return omw.projectionMatrix;
+#endif
+}
+
+mat4 omw_InvProjectionMatrix()
+{
+#if OMW_MULTIVIEW
+    return invProjectionMatrixMultiView[gl_ViewID_OVR];
+#else
+    return omw.invProjectionMatrix;
+#endif
+}
+
     float omw_GetDepth(vec2 uv)
     {
 #if OMW_MULTIVIEW
@@ -266,7 +303,7 @@ float omw_GetPointLightRadius(int index)
         if (mType == Type::Pixel)
         {
             if (!mVertex)
-                mVertex = new osg::Shader(osg::Shader::VERTEX, s_DefaultVertex);
+                mVertex = new osg::Shader(osg::Shader::VERTEX, Stereo::getMultiview() ? s_DefaultVertexMultiview : s_DefaultVertex);
 
             mVertex->setShaderSource(getPassHeader(technique, preamble).append(mVertex->getShaderSource()));
             mFragment->setShaderSource(getPassHeader(technique, preamble, true).append(mFragment->getShaderSource()));
diff --git a/components/fx/stateupdater.hpp b/components/fx/stateupdater.hpp
index 39098c5e2f..b2beb8d576 100644
--- a/components/fx/stateupdater.hpp
+++ b/components/fx/stateupdater.hpp
@@ -20,9 +20,11 @@ namespace fx
             mData.get<InvProjectionMatrix>() = osg::Matrixf::inverse(matrix);
         }
 
-        void setViewMatrix(const osg::Matrixf& matrix) { mData.get<ViewMatrix>() = matrix; }
-
-        void setInvViewMatrix(const osg::Matrixf& matrix) { mData.get<InvViewMatrix>() = matrix; }
+        void setViewMatrix(const osg::Matrixf& matrix) 
+        { 
+            mData.get<ViewMatrix>() = matrix;
+            mData.get<InvViewMatrix>() = osg::Matrixf::inverse(matrix);
+        }
 
         void setPrevViewMatrix(const osg::Matrixf& matrix) { mData.get<PrevViewMatrix>() = matrix;}
 
@@ -197,4 +199,4 @@ namespace fx
     };
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index a2779109ac..7dc2c6af41 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -430,7 +430,7 @@ namespace Resource
         mConvertAlphaTestToAlphaToCoverage = convert;
     }
 
-    void SceneManager::setOpaqueDepthTex(osg::ref_ptr<osg::Texture2D> texturePing, osg::ref_ptr<osg::Texture2D> texturePong)
+    void SceneManager::setOpaqueDepthTex(osg::ref_ptr<osg::Texture> texturePing, osg::ref_ptr<osg::Texture> texturePong)
     {
         mOpaqueDepthTex = { texturePing, texturePong };
     }
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index ba5c75f7ea..82adef9dc9 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -109,7 +109,7 @@ namespace Resource
         void setSupportedLightingMethods(const SceneUtil::LightManager::SupportedMethods& supported);
         bool isSupportedLightingMethod(SceneUtil::LightingMethod method) const;
 
-        void setOpaqueDepthTex(osg::ref_ptr<osg::Texture2D> texturePing, osg::ref_ptr<osg::Texture2D> texturePong);
+        void setOpaqueDepthTex(osg::ref_ptr<osg::Texture> texturePing, osg::ref_ptr<osg::Texture> texturePong);
 
         enum class UBOBinding
         {
@@ -213,7 +213,7 @@ namespace Resource
         SceneUtil::LightManager::SupportedMethods mSupportedLightingMethods;
         bool mConvertAlphaTestToAlphaToCoverage;
         bool mSupportsNormalsRT;
-        std::array<osg::ref_ptr<osg::Texture2D>, 2> mOpaqueDepthTex;
+        std::array<osg::ref_ptr<osg::Texture>, 2> mOpaqueDepthTex;
 
         osg::ref_ptr<Resource::SharedStateManager> mSharedStateManager;
         mutable std::mutex mSharedStateMutex;
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 57fe2cb0e8..b1a1832946 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -39,7 +39,7 @@ namespace
         OpaqueDepthAttribute(const OpaqueDepthAttribute& copy, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY)
             : osg::StateAttribute(copy, copyop), mTextures(copy.mTextures), mUnit(copy.mUnit) {}
 
-        void setTexturesAndUnit(const std::array<osg::ref_ptr<osg::Texture2D>, 2>& textures, int unit)
+        void setTexturesAndUnit(const std::array<osg::ref_ptr<osg::Texture>, 2>& textures, int unit)
         {
             mTextures = textures;
             mUnit = unit;
@@ -68,7 +68,7 @@ namespace
         }
 
     private:
-        mutable std::array<osg::ref_ptr<osg::Texture2D>, 2> mTextures;
+        mutable std::array<osg::ref_ptr<osg::Texture>, 2> mTextures;
         int mUnit;
     };
 }
@@ -970,7 +970,7 @@ namespace Shader
         mConvertAlphaTestToAlphaToCoverage = convert;
     }
 
-    void ShaderVisitor::setOpaqueDepthTex(osg::ref_ptr<osg::Texture2D> texturePing, osg::ref_ptr<osg::Texture2D> texturePong)
+    void ShaderVisitor::setOpaqueDepthTex(osg::ref_ptr<osg::Texture> texturePing, osg::ref_ptr<osg::Texture> texturePong)
     {
         mOpaqueDepthTex = { texturePing, texturePong };
     }
diff --git a/components/shader/shadervisitor.hpp b/components/shader/shadervisitor.hpp
index cd1ca421d9..3ddcd9815f 100644
--- a/components/shader/shadervisitor.hpp
+++ b/components/shader/shadervisitor.hpp
@@ -48,7 +48,7 @@ namespace Shader
 
         void setConvertAlphaTestToAlphaToCoverage(bool convert);
 
-        void setOpaqueDepthTex(osg::ref_ptr<osg::Texture2D> texturePing, osg::ref_ptr<osg::Texture2D> texturePong);
+        void setOpaqueDepthTex(osg::ref_ptr<osg::Texture> texturePing, osg::ref_ptr<osg::Texture> texturePong);
 
         void setSupportsNormalsRT(bool supports) { mSupportsNormalsRT = supports; }
 
@@ -122,7 +122,7 @@ namespace Shader
         bool adjustGeometry(osg::Geometry& sourceGeometry, const ShaderRequirements& reqs);
 
         osg::ref_ptr<const osg::Program> mProgramTemplate;
-        std::array<osg::ref_ptr<osg::Texture2D>, 2> mOpaqueDepthTex;
+        std::array<osg::ref_ptr<osg::Texture>, 2> mOpaqueDepthTex;
     };
 
     class ReinstateRemovedStateVisitor : public osg::NodeVisitor
diff --git a/components/stereo/stereomanager.cpp b/components/stereo/stereomanager.cpp
index 3cca855e7e..645fc59f29 100644
--- a/components/stereo/stereomanager.cpp
+++ b/components/stereo/stereomanager.cpp
@@ -72,7 +72,7 @@ namespace Stereo
             osg::Matrix dummy;
             auto* uProjectionMatrix = stateset->getUniform("projectionMatrix");
             if (uProjectionMatrix)
-                uProjectionMatrix->set(mManager->computeEyeProjection(0, SceneUtil::AutoDepth::isReversed()));
+                uProjectionMatrix->set(mManager->computeEyeViewOffset(0) * mManager->computeEyeProjection(0, SceneUtil::AutoDepth::isReversed()));
         }
 
         void applyRight(osg::StateSet* stateset, osgUtil::CullVisitor* nv) override
@@ -80,7 +80,7 @@ namespace Stereo
             osg::Matrix dummy;
             auto* uProjectionMatrix = stateset->getUniform("projectionMatrix");
             if (uProjectionMatrix)
-                uProjectionMatrix->set(mManager->computeEyeProjection(1, SceneUtil::AutoDepth::isReversed()));
+                uProjectionMatrix->set(mManager->computeEyeViewOffset(1) * mManager->computeEyeProjection(1, SceneUtil::AutoDepth::isReversed()));
         }
 
     private:
@@ -99,8 +99,8 @@ namespace Stereo
     protected:
         virtual void setDefaults(osg::StateSet* stateset)
         {
-            stateset->addUniform(new osg::Uniform(osg::Uniform::FLOAT_MAT4, "viewMatrixMultiView", 2));
             stateset->addUniform(new osg::Uniform(osg::Uniform::FLOAT_MAT4, "projectionMatrixMultiView", 2));
+            stateset->addUniform(new osg::Uniform(osg::Uniform::FLOAT_MAT4, "invProjectionMatrixMultiView", 2));
         }
 
         virtual void apply(osg::StateSet* stateset, osg::NodeVisitor* /*nv*/)
@@ -248,25 +248,23 @@ namespace Stereo
             osg::Matrixd computeLeftEyeProjection(const osg::Matrixd& projection) const override
             {
                 (void)projection;
-                return mManager->computeEyeProjection(0, false);
+                return mManager->computeEyeViewOffset(0) * mManager->computeEyeProjection(0, false);
             }
 
             osg::Matrixd computeLeftEyeView(const osg::Matrixd& view) const override
             {
-                (void)view;
-                return mManager->computeEyeView(0);
+                return view;
             }
 
             osg::Matrixd computeRightEyeProjection(const osg::Matrixd& projection) const override
             {
                 (void)projection;
-                return mManager->computeEyeProjection(1, false);
+                return mManager->computeEyeViewOffset(1) * mManager->computeEyeProjection(1, false);
             }
 
             osg::Matrixd computeRightEyeView(const osg::Matrixd& view) const override
             {
-                (void)view;
-                return mManager->computeEyeView(1);
+                return view;
             }
 
             Manager* mManager;
@@ -305,15 +303,16 @@ namespace Stereo
 
     void Manager::updateStereoFramebuffer()
     {
+        //VR-TODO: in VR, still need to have this framebuffer attached before the postprocessor is created
         auto samples = Settings::Manager::getInt("antialiasing", "Video");
         auto eyeRes = eyeResolution();
 
-        if (mMultiviewFramebuffer)
-            mMultiviewFramebuffer->detachFrom(mMainCamera);
+        //if (mMultiviewFramebuffer)
+        //    mMultiviewFramebuffer->detachFrom(mMainCamera);
         mMultiviewFramebuffer = std::make_shared<MultiviewFramebuffer>(static_cast<int>(eyeRes.x()), static_cast<int>(eyeRes.y()), samples);
         mMultiviewFramebuffer->attachColorComponent(SceneUtil::Color::colorSourceFormat(), SceneUtil::Color::colorSourceType(), SceneUtil::Color::colorInternalFormat());
         mMultiviewFramebuffer->attachDepthComponent(SceneUtil::AutoDepth::depthSourceFormat(), SceneUtil::AutoDepth::depthSourceType(), SceneUtil::AutoDepth::depthInternalFormat());
-        mMultiviewFramebuffer->attachTo(mMainCamera);
+        //mMultiviewFramebuffer->attachTo(mMainCamera);
     }
 
     void Manager::update()
@@ -328,17 +327,14 @@ namespace Stereo
         if (mUpdateViewCallback)
         {
             mUpdateViewCallback->updateView(mView[0], mView[1]);
-            auto viewMatrix = mMainCamera->getViewMatrix();
             mViewOffsetMatrix[0] = mView[0].viewMatrix(true);
             mViewOffsetMatrix[1] = mView[1].viewMatrix(true);
-            mViewMatrix[0] = viewMatrix * mViewOffsetMatrix[0];
-            mViewMatrix[1] = viewMatrix * mViewOffsetMatrix[1];
             mProjectionMatrix[0] = mView[0].perspectiveMatrix(near_, far_, false);
             mProjectionMatrix[1] = mView[1].perspectiveMatrix(near_, far_, false);
             if (SceneUtil::AutoDepth::isReversed())
             {
                 mProjectionMatrixReverseZ[0] = mView[0].perspectiveMatrix(near_, far_, true);
-                mProjectionMatrixReverseZ[1] = mView[1].perspectiveMatrix(near_, far_, true);
+                mProjectionMatrixReverseZ[1] =  mView[1].perspectiveMatrix(near_, far_, true);
             }
 
             View masterView;
@@ -353,10 +349,8 @@ namespace Stereo
         {
             auto* ds = osg::DisplaySettings::instance().get();
             auto viewMatrix = mMainCamera->getViewMatrix();
-            mViewMatrix[0] = ds->computeLeftEyeViewImplementation(viewMatrix);
-            mViewMatrix[1] = ds->computeRightEyeViewImplementation(viewMatrix);
-            mViewOffsetMatrix[0] = osg::Matrix::inverse(viewMatrix) * mViewMatrix[0];
-            mViewOffsetMatrix[1] = osg::Matrix::inverse(viewMatrix) * mViewMatrix[1];
+            mViewOffsetMatrix[0] = osg::Matrix::inverse(viewMatrix) * ds->computeLeftEyeViewImplementation(viewMatrix);
+            mViewOffsetMatrix[1] = osg::Matrix::inverse(viewMatrix) * ds->computeRightEyeViewImplementation(viewMatrix);
             mProjectionMatrix[0] = ds->computeLeftEyeProjectionImplementation(projectionMatrix);
             mProjectionMatrix[1] = ds->computeRightEyeProjectionImplementation(projectionMatrix);
             if (SceneUtil::AutoDepth::isReversed())
@@ -368,21 +362,23 @@ namespace Stereo
 
         mFrustumManager->update(
             { 
-                mViewOffsetMatrix[0] * mProjectionMatrix[0], 
-                mViewOffsetMatrix[1] * mProjectionMatrix[1] 
+                mViewOffsetMatrix[0] * mProjectionMatrix[0],
+                mViewOffsetMatrix[1] * mProjectionMatrix[1]
             });
     }
 
     void Manager::updateMultiviewStateset(osg::StateSet* stateset)
     {
         // Update stereo uniforms
-        auto * viewMatrixMultiViewUniform = stateset->getUniform("viewMatrixMultiView");
         auto * projectionMatrixMultiViewUniform = stateset->getUniform("projectionMatrixMultiView");
+        auto * invProjectionMatrixMultiViewUniform = stateset->getUniform("invProjectionMatrixMultiView");
 
         for (int view : {0, 1})
         {
-            viewMatrixMultiViewUniform->setElement(view, mViewOffsetMatrix[view]);
-            projectionMatrixMultiViewUniform->setElement(view, computeEyeProjection(view, SceneUtil::AutoDepth::isReversed()));
+            auto projectionMatrix = computeEyeViewOffset(view) * computeEyeProjection(view, SceneUtil::AutoDepth::isReversed());
+            auto invProjectionMatrix = osg::Matrix::inverse(projectionMatrix);
+            projectionMatrixMultiViewUniform->setElement(view, projectionMatrix);
+            invProjectionMatrixMultiViewUniform->setElement(view, invProjectionMatrix);
         }
     }
 
@@ -401,11 +397,6 @@ namespace Stereo
         return reverseZ ? mProjectionMatrixReverseZ[view] : mProjectionMatrix[view];
     }
 
-    osg::Matrixd Manager::computeEyeView(int view) const
-    {
-        return mViewMatrix[view];
-    }
-
     osg::Matrixd Manager::computeEyeViewOffset(int view) const
     {
         return mViewOffsetMatrix[view];
diff --git a/components/stereo/stereomanager.hpp b/components/stereo/stereomanager.hpp
index 41c05b8785..48af043fd7 100644
--- a/components/stereo/stereomanager.hpp
+++ b/components/stereo/stereomanager.hpp
@@ -68,7 +68,6 @@ namespace Stereo
         void setCullCallback(osg::ref_ptr<osg::NodeCallback> cb);
 
         osg::Matrixd computeEyeProjection(int view, bool reverseZ) const;
-        osg::Matrixd computeEyeView(int view) const;
         osg::Matrixd computeEyeViewOffset(int view) const;
 
         //! Sets up any definitions necessary for stereo rendering
@@ -116,7 +115,6 @@ namespace Stereo
         osg::Vec2i                      mEyeResolutionOverride;
 
         std::array<View, 2>         mView;
-        std::array<osg::Matrix, 2>  mViewMatrix;
         std::array<osg::Matrix, 2>  mViewOffsetMatrix;
         std::array<osg::Matrix, 2>  mProjectionMatrix;
         std::array<osg::Matrix, 2>  mProjectionMatrixReverseZ;
diff --git a/files/shaders/CMakeLists.txt b/files/shaders/CMakeLists.txt
index affb3fc940..05fe62bf0a 100644
--- a/files/shaders/CMakeLists.txt
+++ b/files/shaders/CMakeLists.txt
@@ -34,6 +34,8 @@ set(SHADER_FILES
     shadowcasting_vertex.glsl
     shadowcasting_fragment.glsl
     vertexcolors.glsl
+	multiview_resolve_vertex.glsl
+	multiview_resolve_fragment.glsl
     nv_default_vertex.glsl
     nv_default_fragment.glsl
     nv_nolighting_vertex.glsl
diff --git a/files/shaders/blended_depth_postpass_vertex.glsl b/files/shaders/blended_depth_postpass_vertex.glsl
index 471a2df16a..ee27507983 100644
--- a/files/shaders/blended_depth_postpass_vertex.glsl
+++ b/files/shaders/blended_depth_postpass_vertex.glsl
@@ -5,11 +5,12 @@ uniform mat4 projectionMatrix;
 varying vec2 diffuseMapUV;
 varying float alphaPassthrough;
 
+#include "openmw_vertex.h.glsl"
 #include "vertexcolors.glsl"
 
 void main()
 {
-    gl_Position = projectionMatrix * (gl_ModelViewMatrix * gl_Vertex);
+    gl_Position = mw_modelToClip(gl_Vertex);
 
     if (colorMode == 2)
         alphaPassthrough = gl_Color.a;
diff --git a/files/shaders/fullscreen_tri_vertex.glsl b/files/shaders/fullscreen_tri_vertex.glsl
index 794e0827c4..1166a44a54 100644
--- a/files/shaders/fullscreen_tri_vertex.glsl
+++ b/files/shaders/fullscreen_tri_vertex.glsl
@@ -2,6 +2,8 @@
 
 varying vec2 uv;
 
+#include "openmw_vertex.h.glsl"
+
 void main()
 {
     gl_Position = vec4(gl_Vertex.xy, 0.0, 1.0);
diff --git a/files/shaders/multiview_resolve_fragment.glsl b/files/shaders/multiview_resolve_fragment.glsl
new file mode 100644
index 0000000000..c0a137464f
--- /dev/null
+++ b/files/shaders/multiview_resolve_fragment.glsl
@@ -0,0 +1,18 @@
+#version 120
+#extension GL_EXT_texture_array : require
+
+varying vec2 uv;
+uniform sampler2DArray omw_SamplerLastShader;
+
+void main()
+{
+	int view = 0;
+	vec3 uvz = vec3(uv.x * 2., uv.y, 0);
+	if(uvz.x > 1.)
+	{
+		uvz.x -= 1.;
+		uvz.z = 1;
+	}
+	
+    gl_FragColor = texture2DArray(omw_SamplerLastShader, uvz);
+}
\ No newline at end of file
diff --git a/files/shaders/multiview_resolve_vertex.glsl b/files/shaders/multiview_resolve_vertex.glsl
new file mode 100644
index 0000000000..794e0827c4
--- /dev/null
+++ b/files/shaders/multiview_resolve_vertex.glsl
@@ -0,0 +1,9 @@
+#version 120
+
+varying vec2 uv;
+
+void main()
+{
+    gl_Position = vec4(gl_Vertex.xy, 0.0, 1.0);
+    uv = gl_Position.xy * 0.5 + 0.5;
+}
diff --git a/files/shaders/openmw_vertex.glsl b/files/shaders/openmw_vertex.glsl
index 68a98c7880..b671570348 100644
--- a/files/shaders/openmw_vertex.glsl
+++ b/files/shaders/openmw_vertex.glsl
@@ -18,8 +18,3 @@ vec4 mw_viewToClip(vec4 pos)
 {
     return projectionMatrix * pos;
 }
-
-vec4 mw_viewStereoAdjust(vec4 pos)
-{
-    return pos;
-}
diff --git a/files/shaders/openmw_vertex.h.glsl b/files/shaders/openmw_vertex.h.glsl
index 3794121656..9d7f496a6a 100644
--- a/files/shaders/openmw_vertex.h.glsl
+++ b/files/shaders/openmw_vertex.h.glsl
@@ -3,5 +3,4 @@
 
 vec4 mw_modelToClip(vec4 pos);
 vec4 mw_modelToView(vec4 pos);
-vec4 mw_viewToClip(vec4 pos);
-vec4 mw_viewStereoAdjust(vec4 pos);
\ No newline at end of file
+vec4 mw_viewToClip(vec4 pos);
\ No newline at end of file
diff --git a/files/shaders/openmw_vertex_multiview.glsl b/files/shaders/openmw_vertex_multiview.glsl
index c860112d5c..64230a6e4a 100644
--- a/files/shaders/openmw_vertex_multiview.glsl
+++ b/files/shaders/openmw_vertex_multiview.glsl
@@ -8,24 +8,18 @@ layout(num_views = @numViews) in;
 #include "openmw_vertex.h.glsl"
 
 uniform mat4 projectionMatrixMultiView[@numViews];
-uniform mat4 viewMatrixMultiView[@numViews];
 
 vec4 mw_modelToClip(vec4 pos)
 {
-    return projectionMatrixMultiView[gl_ViewID_OVR] * mw_modelToView(pos);
+    return mw_viewToClip(mw_modelToView(pos));
 }
 
 vec4 mw_modelToView(vec4 pos)
 {
-    return viewMatrixMultiView[gl_ViewID_OVR] * gl_ModelViewMatrix * pos;
+    return gl_ModelViewMatrix * pos;
 }
 
 vec4 mw_viewToClip(vec4 pos)
 {
-    return projectionMatrixMultiView[gl_ViewID_OVR] * viewMatrixMultiView[gl_ViewID_OVR] * pos;
-}
-
-vec4 mw_viewStereoAdjust(vec4 pos)
-{
-    return viewMatrixMultiView[gl_ViewID_OVR] * pos;
-}
+    return projectionMatrixMultiView[gl_ViewID_OVR] * pos;
+}
\ No newline at end of file

From 6abb963bd9ab24d86ca01b1fe37eb0dcf21e308a Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 18 Jun 2022 18:43:25 +0200
Subject: [PATCH 2677/2859] Use string_view for StringUtils functions

---
 components/misc/stringops.hpp | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/components/misc/stringops.hpp b/components/misc/stringops.hpp
index 50bcf6a1d0..3fa82a27fe 100644
--- a/components/misc/stringops.hpp
+++ b/components/misc/stringops.hpp
@@ -62,7 +62,8 @@ public:
         return tolowermap[static_cast<unsigned char>(c)];
     }
 
-    static bool ciLess(const std::string &x, const std::string &y) {
+    static bool ciLess(std::string_view x, std::string_view y)
+    {
         return std::lexicographical_compare(x.begin(), x.end(), y.begin(), y.end(), ci());
     }
 
@@ -96,10 +97,10 @@ public:
         return ciEqual(x, std::string_view(y, n - 1));
     }
 
-    static int ciCompareLen(const std::string &x, const std::string &y, size_t len)
+    static int ciCompareLen(std::string_view x, std::string_view y, std::size_t len)
     {
-        std::string::const_iterator xit = x.begin();
-        std::string::const_iterator yit = y.begin();
+        std::string_view::const_iterator xit = x.begin();
+        std::string_view::const_iterator yit = y.begin();
         for(;xit != x.end() && yit != y.end() && len > 0;++xit,++yit,--len)
         {
             char left = *xit;
@@ -139,11 +140,12 @@ public:
 
     struct CiEqual
     {
-        bool operator()(const std::string& left, const std::string& right) const
+        bool operator()(std::string_view left, std::string_view right) const
         {
             return ciEqual(left, right);
         }
     };
+
     struct CiHash
     {
         std::size_t operator()(std::string str) const
@@ -152,9 +154,10 @@ public:
             return std::hash<std::string>{}(str);
         }
     };
+
     struct CiComp
     {
-        bool operator()(const std::string& left, const std::string& right) const
+        bool operator()(std::string_view left, std::string_view right) const
         {
             return ciLess(left, right);
         }
@@ -216,20 +219,20 @@ public:
     }
 
     template <class Container>
-    static inline void split(const std::string& str, Container& cont, const std::string& delims = " ")
+    static inline void split(std::string_view str, Container& cont, std::string_view delims = " ")
     {
-        std::size_t current, previous = 0;
-        current = str.find_first_of(delims);
+        std::size_t current = str.find_first_of(delims);
+        std::size_t previous = 0;
         while (current != std::string::npos)
         {
-            cont.push_back(str.substr(previous, current - previous));
+            cont.emplace_back(str.substr(previous, current - previous));
             previous = current + 1;
             current = str.find_first_of(delims, previous);
         }
-        cont.push_back(str.substr(previous, current - previous));
+        cont.emplace_back(str.substr(previous, current - previous));
     }
 
-    static inline void replaceLast(std::string& str, const std::string& substr, const std::string& with)
+    static inline void replaceLast(std::string& str, std::string_view substr, std::string_view with)
     {
         size_t pos = str.rfind(substr);
         if (pos == std::string::npos)

From 241b414aa6b8f080363055ec233eb421135bb7d6 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Tue, 21 Jun 2022 20:56:19 +0200
Subject: [PATCH 2678/2859] Correctly terminate LuaWorker if the game is being
 terminated due to an unhanded exception.

---
 apps/openmw/engine.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 4234662d31..cac6be3658 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -912,6 +912,15 @@ public:
             mThread = std::thread([this]{ threadBody(); });
     };
 
+    ~LuaWorker()
+    {
+        if (mThread && mThread->joinable())
+        {
+            Log(Debug::Error) << "Unexpected destruction of LuaWorker; likely there is an unhandled exception in the main thread.";
+            join();
+        }
+    }
+
     void allowUpdate()
     {
         if (!mThread)

From 8123e41a759a45e017b853b6e685d4326a8ced0e Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Tue, 21 Jun 2022 21:06:37 +0200
Subject: [PATCH 2679/2859] Fix #6824

---
 apps/openmw/mwlua/localscripts.cpp | 2 +-
 apps/openmw/mwlua/luabindings.cpp  | 2 +-
 files/data/scripts/omw/ai.lua      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwlua/localscripts.cpp b/apps/openmw/mwlua/localscripts.cpp
index cca31361ff..270379fe6d 100644
--- a/apps/openmw/mwlua/localscripts.cpp
+++ b/apps/openmw/mwlua/localscripts.cpp
@@ -79,7 +79,7 @@ namespace MWLua
                 return LObject(getId(target), worldView->getObjectRegistry());
         });
         aiPackage["sideWithTarget"] = sol::readonly_property([](const AiPackage& p) { return p.sideWithTarget(); });
-        aiPackage["destination"] = sol::readonly_property([](const AiPackage& p) { return p.getDestination(); });
+        aiPackage["destPosition"] = sol::readonly_property([](const AiPackage& p) { return p.getDestination(); });
 
         selfAPI["_getActiveAiPackage"] = [](SelfObject& self) -> sol::optional<std::shared_ptr<AiPackage>>
         {
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index e95d415bf5..2383be8137 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -47,7 +47,7 @@ namespace MWLua
     {
         auto* lua = context.mLua;
         sol::table api(lua->sol(), sol::create);
-        api["API_REVISION"] = 24;
+        api["API_REVISION"] = 25;
         api["quit"] = [lua]()
         {
             Log(Debug::Warning) << "Quit requested by a Lua script.\n" << lua->debugTraceback();
diff --git a/files/data/scripts/omw/ai.lua b/files/data/scripts/omw/ai.lua
index 5d76a7d9be..0040406226 100644
--- a/files/data/scripts/omw/ai.lua
+++ b/files/data/scripts/omw/ai.lua
@@ -44,7 +44,7 @@ return {
         -- @field #string type Type of the AI package.
         -- @field openmw.core#GameObject target Target (usually an actor) of the AI package (can be nil).
         -- @field #boolean sideWithTarget Whether to help the target in combat (true or false).
-        -- @field openmw.util#Vector3 position Destination point of the AI package (can be nil).
+        -- @field openmw.util#Vector3 destPosition Destination point of the AI package.
 
         --- Return the currently active AI package (or `nil` if there are no AI packages).
         -- @function [parent=#AI] getActivePackage

From e673f9fa76a4f65aea3b406c7559bedc257dac5f Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Wed, 22 Jun 2022 00:43:16 +0300
Subject: [PATCH 2680/2859] Clean up NIF flags

---
 .../nifloader/testbulletnifloader.cpp         | 14 ++--
 components/nif/base.hpp                       | 15 ++++
 components/nif/controller.hpp                 | 14 +++-
 components/nif/effect.hpp                     |  3 +
 components/nif/node.hpp                       | 29 ++++----
 components/nif/property.hpp                   | 37 +++++++---
 components/nifbullet/bulletnifloader.cpp      |  7 +-
 components/nifosg/controller.cpp              |  8 +--
 components/nifosg/controller.hpp              |  8 +--
 components/nifosg/nifloader.cpp               | 71 ++++++++-----------
 components/nifosg/particle.cpp                |  4 +-
 11 files changed, 116 insertions(+), 94 deletions(-)

diff --git a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
index f2f6cb3985..e52e2f34a0 100644
--- a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
+++ b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
@@ -484,7 +484,7 @@ namespace
     TEST_F(TestBulletNifLoader, for_root_nif_node_with_bounding_box_should_return_shape_with_compound_shape_and_box_inside)
     {
         mNode.hasBounds = true;
-        mNode.flags |= Nif::NiNode::Flag_BBoxCollision;
+        mNode.flags |= Nif::Node::Flag_BBoxCollision;
         mNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
         mNode.bounds.box.extents = osg::Vec3f(1, 2, 3);
         mNode.bounds.box.center = osg::Vec3f(-1, -2, -3);
@@ -508,7 +508,7 @@ namespace
     TEST_F(TestBulletNifLoader, for_child_nif_node_with_bounding_box)
     {
         mNode.hasBounds = true;
-        mNode.flags |= Nif::NiNode::Flag_BBoxCollision;
+        mNode.flags |= Nif::Node::Flag_BBoxCollision;
         mNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
         mNode.bounds.box.extents = osg::Vec3f(1, 2, 3);
         mNode.bounds.box.center = osg::Vec3f(-1, -2, -3);
@@ -534,7 +534,7 @@ namespace
     TEST_F(TestBulletNifLoader, for_root_and_child_nif_node_with_bounding_box_but_root_without_flag_should_use_child_bounds)
     {
         mNode.hasBounds = true;
-        mNode.flags |= Nif::NiNode::Flag_BBoxCollision;
+        mNode.flags |= Nif::Node::Flag_BBoxCollision;
         mNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
         mNode.bounds.box.extents = osg::Vec3f(1, 2, 3);
         mNode.bounds.box.center = osg::Vec3f(-1, -2, -3);
@@ -565,7 +565,7 @@ namespace
     TEST_F(TestBulletNifLoader, for_root_and_two_children_where_both_with_bounds_but_only_first_with_flag_should_use_first_bounds)
     {
         mNode.hasBounds = true;
-        mNode.flags |= Nif::NiNode::Flag_BBoxCollision;
+        mNode.flags |= Nif::Node::Flag_BBoxCollision;
         mNode.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
         mNode.bounds.box.extents = osg::Vec3f(1, 2, 3);
         mNode.bounds.box.center = osg::Vec3f(-1, -2, -3);
@@ -608,7 +608,7 @@ namespace
         mNode.parents.push_back(&mNiNode);
 
         mNode2.hasBounds = true;
-        mNode2.flags |= Nif::NiNode::Flag_BBoxCollision;
+        mNode2.flags |= Nif::Node::Flag_BBoxCollision;
         mNode2.bounds.type = Nif::NiBoundingVolume::Type::BOX_BV;
         mNode2.bounds.box.extents = osg::Vec3f(4, 5, 6);
         mNode2.bounds.box.center = osg::Vec3f(-4, -5, -6);
@@ -861,7 +861,7 @@ namespace
     TEST_F(TestBulletNifLoader, for_tri_shape_child_node_with_controller_should_return_shape_with_compound_shape)
     {
         mController.recType = Nif::RC_NiKeyframeController;
-        mController.flags |= Nif::NiNode::ControllerFlag_Active;
+        mController.flags |= Nif::Controller::Flag_Active;
         copy(mTransform, mNiTriShape.trafo);
         mNiTriShape.trafo.scale = 3;
         mNiTriShape.parents.push_back(&mNiNode);
@@ -890,7 +890,7 @@ namespace
     TEST_F(TestBulletNifLoader, for_two_tri_shape_children_nodes_where_one_with_controller_should_return_shape_with_compound_shape)
     {
         mController.recType = Nif::RC_NiKeyframeController;
-        mController.flags |= Nif::NiNode::ControllerFlag_Active;
+        mController.flags |= Nif::Controller::Flag_Active;
         copy(mTransform, mNiTriShape.trafo);
         mNiTriShape.trafo.scale = 3;
         mNiTriShape.parents.push_back(&mNiNode);
diff --git a/components/nif/base.hpp b/components/nif/base.hpp
index 0728a46512..3c7ee160ea 100644
--- a/components/nif/base.hpp
+++ b/components/nif/base.hpp
@@ -33,6 +33,18 @@ struct Extra : public Record
 
 struct Controller : public Record
 {
+    enum Flags {
+        Flag_Active = 0x8
+    };
+
+    enum ExtrapolationMode
+    {
+        Cycle = 0,
+        Reverse = 2,
+        Constant = 4,
+        Mask = 6
+    };
+
     ControllerPtr next;
     int flags;
     float frequency, phase;
@@ -41,6 +53,9 @@ struct Controller : public Record
 
     void read(NIFStream *nif) override;
     void post(NIFFile *nif) override;
+
+    bool isActive() const { return flags & Flag_Active; }
+    ExtrapolationMode extrapolationMode() const { return static_cast<ExtrapolationMode>(flags & Mask); }
 };
 
 /// Has name, extra-data and controller
diff --git a/components/nif/controller.hpp b/components/nif/controller.hpp
index 210eaab217..ca31307b2d 100644
--- a/components/nif/controller.hpp
+++ b/components/nif/controller.hpp
@@ -31,6 +31,11 @@ namespace Nif
 
 struct NiParticleSystemController : public Controller
 {
+    enum BSPArrayController {
+        BSPArrayController_AtNode = 0x8,
+        BSPArrayController_AtVertex = 0x10
+    };
+
     struct Particle {
         osg::Vec3f velocity;
         float lifetime;
@@ -57,9 +62,9 @@ struct NiParticleSystemController : public Controller
 
     enum EmitFlags
     {
-        NoAutoAdjust = 0x1 // If this flag is set, we use the emitRate value. Otherwise,
-                           // we calculate an emit rate so that the maximum number of particles
-                           // in the system (numParticles) is never exceeded.
+        EmitFlag_NoAutoAdjust = 0x1 // If this flag is set, we use the emitRate value. Otherwise,
+                                    // we calculate an emit rate so that the maximum number of particles
+                                    // in the system (numParticles) is never exceeded.
     };
     int emitFlags;
 
@@ -76,6 +81,9 @@ struct NiParticleSystemController : public Controller
 
     void read(NIFStream *nif) override;
     void post(NIFFile *nif) override;
+
+    bool noAutoAdjust() const { return flags & EmitFlag_NoAutoAdjust; }
+    bool emitAtVertex() const { return flags & BSPArrayController_AtVertex; }
 };
 using NiBSPArrayController = NiParticleSystemController;
 
diff --git a/components/nif/effect.hpp b/components/nif/effect.hpp
index 32eb3d80d8..4c546a1aef 100644
--- a/components/nif/effect.hpp
+++ b/components/nif/effect.hpp
@@ -96,6 +96,9 @@ struct NiTextureEffect : NiDynamicEffect
 
     void read(NIFStream *nif) override;
     void post(NIFFile *nif) override;
+
+    bool wrapT() const { return clamp & 1; }
+    bool wrapS() const { return (clamp >> 1) & 1; }
 };
 
 } // Namespace
diff --git a/components/nif/node.hpp b/components/nif/node.hpp
index 4ebb2d5804..725511e997 100644
--- a/components/nif/node.hpp
+++ b/components/nif/node.hpp
@@ -144,8 +144,16 @@ struct NiBoundingVolume
  */
 struct Node : public Named
 {
+    enum Flags {
+        Flag_Hidden = 0x0001,
+        Flag_MeshCollision = 0x0002,
+        Flag_BBoxCollision = 0x0004,
+        Flag_ActiveCollision = 0x0020
+    };
+
     // Node flags. Interpretation depends somewhat on the type of node.
     unsigned int flags;
+
     Transformation trafo;
     osg::Vec3f velocity; // Unused? Might be a run-time game state
     PropertyList props;
@@ -198,6 +206,11 @@ struct Node : public Named
     {
         isBone = true;
     }
+
+    bool isHidden() const { return flags & Flag_Hidden; }
+    bool hasMeshCollision() const { return flags & Flag_MeshCollision; }
+    bool hasBBoxCollision() const { return flags & Flag_BBoxCollision; }
+    bool collisionActive() const { return flags & Flag_ActiveCollision; }
 };
 
 struct NiNode : Node
@@ -205,12 +218,6 @@ struct NiNode : Node
     NodeList children;
     NodeList effects;
 
-    enum Flags {
-        Flag_Hidden = 0x0001,
-        Flag_MeshCollision = 0x0002,
-        Flag_BBoxCollision = 0x0004,
-        Flag_ActiveCollision = 0x0020
-    };
     enum BSAnimFlags {
         AnimFlag_AutoPlay = 0x0020
     };
@@ -218,13 +225,6 @@ struct NiNode : Node
         ParticleFlag_AutoPlay = 0x0020,
         ParticleFlag_LocalSpace = 0x0080
     };
-    enum ControllerFlags {
-        ControllerFlag_Active = 0x8
-    };
-    enum BSPArrayController {
-        BSPArrayController_AtNode = 0x8,
-        BSPArrayController_AtVertex = 0x10
-    };
 
     void read(NIFStream *nif) override
     {
@@ -450,12 +450,13 @@ struct NiFltAnimationNode : public NiSwitchNode
         Flag_Swing = 0x40
     };
 
-
     void read(NIFStream *nif) override
     {
         NiSwitchNode::read(nif);
         mDuration = nif->getFloat();
     }
+
+    bool swing() const { return flags & Flag_Swing; }
 };
 
 // Abstract
diff --git a/components/nif/property.hpp b/components/nif/property.hpp
index a428d6a7e1..fd7d47402f 100644
--- a/components/nif/property.hpp
+++ b/components/nif/property.hpp
@@ -52,6 +52,9 @@ struct NiTexturingProperty : public Property
 
         void read(NIFStream *nif);
         void post(NIFFile *nif);
+
+        bool wrapT() const { return clamp & 1; }
+        bool wrapS() const { return (clamp >> 1) & 1; }
     };
 
     /* Apply mode:
@@ -140,6 +143,9 @@ struct BSShaderLightingProperty : public BSShaderProperty
 {
     unsigned int clamp{0u};
     void read(NIFStream *nif) override;
+
+    bool wrapT() const { return clamp & 1; }
+    bool wrapS() const { return (clamp >> 1) & 1; }
 };
 
 struct BSShaderPPLightingProperty : public BSShaderLightingProperty
@@ -230,6 +236,10 @@ struct NiZBufferProperty : public Property
         if (nif->getVersion() >= NIFStream::generateVersion(4,1,0,12) && nif->getVersion() <= NIFFile::NIFVersion::VER_OB)
             testFunction = nif->getUInt();
     }
+
+    bool depthTest() const { return flags & 1; }
+
+    bool depthWrite() const { return (flags >> 1) & 1; }
 };
 
 struct NiSpecularProperty : public Property
@@ -240,6 +250,8 @@ struct NiSpecularProperty : public Property
         Property::read(nif);
         flags = nif->getUShort();
     }
+
+    bool isEnabled() const { return flags & 1; }
 };
 
 struct NiWireframeProperty : public Property
@@ -250,6 +262,8 @@ struct NiWireframeProperty : public Property
         Property::read(nif);
         flags = nif->getUShort();
     }
+
+    bool isEnabled() const { return flags & 1; }
 };
 
 // The rest are all struct-based
@@ -296,16 +310,7 @@ struct S_VertexColorProperty
 struct S_AlphaProperty
 {
     /*
-        In NiAlphaProperty, the flags have the following meaning:
-
-        Bit 0 : alpha blending enable
-        Bits 1-4 : source blend mode
-        Bits 5-8 : destination blend mode
-        Bit 9 : alpha test enable
-        Bit 10-12 : alpha test mode
-        Bit 13 : no sorter flag ( disables triangle sorting )
-
-        blend modes (glBlendFunc):
+        NiAlphaProperty blend modes (glBlendFunc):
         0000 GL_ONE
         0001 GL_ZERO
         0010 GL_SRC_COLOR
@@ -384,7 +389,17 @@ struct S_StencilProperty
     void read(NIFStream *nif);
 };
 
-struct NiAlphaProperty : public StructPropT<S_AlphaProperty> { };
+struct NiAlphaProperty : public StructPropT<S_AlphaProperty>
+{
+    bool useAlphaBlending() const { return flags & 1; }
+    int sourceBlendMode() const { return (flags >> 1) & 0xF; }
+    int destinationBlendMode() const { return (flags >> 5) & 0xF; }
+    bool noSorter() const { return (flags >> 13) & 1; }
+
+    bool useAlphaTesting() const { return (flags >> 9) & 1; }
+    int alphaTestMode() const { return (flags >> 10) & 0x7; }
+};
+
 struct NiVertexColorProperty : public StructPropT<S_VertexColorProperty> { };
 struct NiStencilProperty : public Property
 {
diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index 364f79e98e..ec86e2ccb5 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -270,7 +270,7 @@ bool BulletNifLoader::findBoundingBox(const Nif::Node& node, const std::string&
             }
         }
 
-        if (node.flags & Nif::NiNode::Flag_BBoxCollision)
+        if (node.hasBBoxCollision())
         {
             return true;
         }
@@ -312,15 +312,14 @@ void BulletNifLoader::handleNode(const std::string& fileName, const Nif::Node& n
     int flags, bool isCollisionNode, bool isAnimated, bool autogenerated, bool avoid, unsigned int& collisionType)
 {
     // TODO: allow on-the fly collision switching via toggling this flag
-    if (node.recType == Nif::RC_NiCollisionSwitch && !(node.flags & Nif::NiNode::Flag_ActiveCollision))
+    if (node.recType == Nif::RC_NiCollisionSwitch && !node.collisionActive())
         return;
 
     // Accumulate the flags from all the child nodes. This works for all
     // the flags we currently use, at least.
     flags |= node.flags;
 
-    if (!node.controller.empty() && node.controller->recType == Nif::RC_NiKeyframeController
-            && (node.controller->flags & Nif::NiNode::ControllerFlag_Active))
+    if (!node.controller.empty() && node.controller->recType == Nif::RC_NiKeyframeController && node.controller->isActive())
         isAnimated = true;
 
     isCollisionNode = isCollisionNode || (node.recType == Nif::RC_RootCollisionNode);
diff --git a/components/nifosg/controller.cpp b/components/nifosg/controller.cpp
index beb47ddd76..071541c196 100644
--- a/components/nifosg/controller.cpp
+++ b/components/nifosg/controller.cpp
@@ -20,7 +20,7 @@ ControllerFunction::ControllerFunction(const Nif::Controller *ctrl)
     , mPhase(ctrl->phase)
     , mStartTime(ctrl->timeStart)
     , mStopTime(ctrl->timeStop)
-    , mExtrapolationMode(static_cast<ExtrapolationMode>((ctrl->flags&0x6) >> 1))
+    , mExtrapolationMode(ctrl->extrapolationMode())
 {
 }
 
@@ -31,7 +31,7 @@ float ControllerFunction::calculate(float value) const
         return time;
     switch (mExtrapolationMode)
     {
-    case Cycle:
+    case Nif::Controller::ExtrapolationMode::Cycle:
     {
         float delta = mStopTime - mStartTime;
         if ( delta <= 0 )
@@ -40,7 +40,7 @@ float ControllerFunction::calculate(float value) const
         float remainder = ( cycles - std::floor( cycles ) ) * delta;
         return mStartTime + remainder;
     }
-    case Reverse:
+    case Nif::Controller::ExtrapolationMode::Reverse:
     {
         float delta = mStopTime - mStartTime;
         if ( delta <= 0 )
@@ -55,7 +55,7 @@ float ControllerFunction::calculate(float value) const
 
         return mStopTime - remainder;
     }
-    case Constant:
+    case Nif::Controller::ExtrapolationMode::Constant:
     default:
         return std::clamp(time, mStartTime, mStopTime);
     }
diff --git a/components/nifosg/controller.hpp b/components/nifosg/controller.hpp
index 8d461f0547..14ad0b9ed0 100644
--- a/components/nifosg/controller.hpp
+++ b/components/nifosg/controller.hpp
@@ -200,13 +200,7 @@ namespace NifOsg
         float mPhase;
         float mStartTime;
         float mStopTime;
-        enum ExtrapolationMode
-        {
-            Cycle = 0,
-            Reverse = 1,
-            Constant = 2
-        };
-        ExtrapolationMode mExtrapolationMode;
+        Nif::Controller::ExtrapolationMode mExtrapolationMode;
 
     public:
         ControllerFunction(const Nif::Controller *ctrl);
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index a9c2449e56..8f7b02eaa4 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -439,7 +439,7 @@ namespace NifOsg
             sequenceNode->setName(niFltAnimationNode->name);
             if (niFltAnimationNode->children.length()!=0)
             {
-                if (niFltAnimationNode->flags & Nif::NiFltAnimationNode::Flag_Swing)
+                if (niFltAnimationNode->swing())
                     sequenceNode->setDefaultTime(niFltAnimationNode->mDuration/(niFltAnimationNode->children.length()*2));
                 else
                     sequenceNode->setDefaultTime(niFltAnimationNode->mDuration/niFltAnimationNode->children.length());
@@ -451,7 +451,7 @@ namespace NifOsg
         {
             const Nif::NiFltAnimationNode* niFltAnimationNode = static_cast<const Nif::NiFltAnimationNode*>(nifNode);
             osg::Sequence* sequenceNode = static_cast<osg::Sequence*>(osgNode);
-            if (niFltAnimationNode->flags & Nif::NiFltAnimationNode::Flag_Swing)
+            if (niFltAnimationNode->swing())
                 sequenceNode->setInterval(osg::Sequence::SWING, 0,-1);
             else
                 sequenceNode->setInterval(osg::Sequence::LOOP, 0,-1);
@@ -520,10 +520,8 @@ namespace NifOsg
             if (image)
                 texture2d->setTextureSize(image->s(), image->t());
             texture2d->setName("envMap");
-            bool wrapT = textureEffect->clamp & 0x1;
-            bool wrapS = (textureEffect->clamp >> 1) & 0x1;
-            texture2d->setWrap(osg::Texture::WRAP_S, wrapS ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
-            texture2d->setWrap(osg::Texture::WRAP_T, wrapT ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
+            texture2d->setWrap(osg::Texture::WRAP_S, textureEffect->wrapS() ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
+            texture2d->setWrap(osg::Texture::WRAP_T, textureEffect->wrapT() ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
 
             int texUnit = 3; // FIXME
 
@@ -659,7 +657,7 @@ namespace NifOsg
 
             // We can skip creating meshes for hidden nodes if they don't have a VisController that
             // might make them visible later
-            if (nifNode->flags & Nif::NiNode::Flag_Hidden)
+            if (nifNode->isHidden())
             {
                 bool hasVisController = false;
                 for (Nif::ControllerPtr ctrl = nifNode->controller; !ctrl.empty(); ctrl = ctrl->next)
@@ -675,7 +673,7 @@ namespace NifOsg
                 node->setNodeMask(Loader::getHiddenNodeMask());
             }
 
-            if (nifNode->recType == Nif::RC_NiCollisionSwitch && !(nifNode->flags & Nif::NiNode::Flag_ActiveCollision))
+            if (nifNode->recType == Nif::RC_NiCollisionSwitch && !nifNode->collisionActive())
                 node->setNodeMask(Loader::getIntersectionDisabledNodeMask());
 
             osg::ref_ptr<SceneUtil::CompositeStateSetUpdater> composite = new SceneUtil::CompositeStateSetUpdater;
@@ -786,7 +784,7 @@ namespace NifOsg
         {
             for (Nif::ControllerPtr ctrl = nifNode->controller; !ctrl.empty(); ctrl = ctrl->next)
             {
-                if (!(ctrl->flags & Nif::NiNode::ControllerFlag_Active))
+                if (!ctrl->isActive())
                     continue;
                 if (ctrl->recType == Nif::RC_NiUVController)
                 {
@@ -813,7 +811,7 @@ namespace NifOsg
         {
             for (Nif::ControllerPtr ctrl = nifNode->controller; !ctrl.empty(); ctrl = ctrl->next)
             {
-                if (!(ctrl->flags & Nif::NiNode::ControllerFlag_Active))
+                if (!ctrl->isActive())
                     continue;
                 if (ctrl->recType == Nif::RC_NiKeyframeController)
                 {
@@ -874,7 +872,7 @@ namespace NifOsg
         {
             for (Nif::ControllerPtr ctrl = materialProperty->controller; !ctrl.empty(); ctrl = ctrl->next)
             {
-                if (!(ctrl->flags & Nif::NiNode::ControllerFlag_Active))
+                if (!ctrl->isActive())
                     continue;
                 if (ctrl->recType == Nif::RC_NiAlphaController)
                 {
@@ -914,7 +912,7 @@ namespace NifOsg
         {
             for (Nif::ControllerPtr ctrl = texProperty->controller; !ctrl.empty(); ctrl = ctrl->next)
             {
-                if (!(ctrl->flags & Nif::NiNode::ControllerFlag_Active))
+                if (!ctrl->isActive())
                     continue;
                 if (ctrl->recType == Nif::RC_NiFlipController)
                 {
@@ -1063,8 +1061,7 @@ namespace NifOsg
         osg::ref_ptr<Emitter> handleParticleEmitter(const Nif::NiParticleSystemController* partctrl)
         {
             std::vector<int> targets;
-            const bool atVertex = (partctrl->flags & Nif::NiNode::BSPArrayController_AtVertex);
-            if (partctrl->recType == Nif::RC_NiBSPArrayController && !atVertex)
+            if (partctrl->recType == Nif::RC_NiBSPArrayController && !partctrl->emitAtVertex())
             {
                 getAllNiNodes(partctrl->emitter.getPtr(), targets);
             }
@@ -1072,7 +1069,7 @@ namespace NifOsg
             osg::ref_ptr<Emitter> emitter = new Emitter(targets);
 
             osgParticle::ConstantRateCounter* counter = new osgParticle::ConstantRateCounter;
-            if (partctrl->emitFlags & Nif::NiParticleSystemController::NoAutoAdjust)
+            if (partctrl->noAutoAdjust())
                 counter->setNumberOfParticlesPerSecondToCreate(partctrl->emitRate);
             else if (partctrl->lifetime == 0 && partctrl->lifetimeRandom == 0)
                 counter->setNumberOfParticlesPerSecondToCreate(0);
@@ -1089,7 +1086,7 @@ namespace NifOsg
             emitter->setShooter(shooter);
             emitter->setFlags(partctrl->flags);
 
-            if (partctrl->recType == Nif::RC_NiBSPArrayController && atVertex)
+            if (partctrl->recType == Nif::RC_NiBSPArrayController && partctrl->emitAtVertex())
             {
                 emitter->setGeometryEmitterTarget(partctrl->emitter->recIndex);
             }
@@ -1138,7 +1135,7 @@ namespace NifOsg
             const Nif::NiParticleSystemController* partctrl = nullptr;
             for (Nif::ControllerPtr ctrl = nifNode->controller; !ctrl.empty(); ctrl = ctrl->next)
             {
-                if (!(ctrl->flags & Nif::NiNode::ControllerFlag_Active))
+                if (!ctrl->isActive())
                     continue;
                 if(ctrl->recType == Nif::RC_NiParticleSystemController || ctrl->recType == Nif::RC_NiBSPArrayController)
                     partctrl = static_cast<Nif::NiParticleSystemController*>(ctrl.getPtr());
@@ -1321,7 +1318,7 @@ namespace NifOsg
             osg::ref_ptr<osg::Drawable> drawable;
             for (Nif::ControllerPtr ctrl = nifNode->controller; !ctrl.empty(); ctrl = ctrl->next)
             {
-                if (!(ctrl->flags & Nif::NiNode::ControllerFlag_Active))
+                if (!ctrl->isActive())
                     continue;
                 if(ctrl->recType == Nif::RC_NiGeomMorpherController)
                 {
@@ -1636,11 +1633,8 @@ namespace NifOsg
                         else
                             texture2d = new osg::Texture2D;
 
-                        bool wrapT = tex.clamp & 0x1;
-                        bool wrapS = (tex.clamp >> 1) & 0x1;
-
-                        texture2d->setWrap(osg::Texture::WRAP_S, wrapS ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
-                        texture2d->setWrap(osg::Texture::WRAP_T, wrapT ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
+                        texture2d->setWrap(osg::Texture::WRAP_S, tex.wrapS() ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
+                        texture2d->setWrap(osg::Texture::WRAP_T, tex.wrapT() ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
 
                         uvSet = tex.uvSet;
                     }
@@ -1909,8 +1903,7 @@ namespace NifOsg
             {
                 const Nif::NiWireframeProperty* wireprop = static_cast<const Nif::NiWireframeProperty*>(property);
                 osg::ref_ptr<osg::PolygonMode> mode = new osg::PolygonMode;
-                mode->setMode(osg::PolygonMode::FRONT_AND_BACK, wireprop->flags == 0 ? osg::PolygonMode::FILL
-                                                                                     : osg::PolygonMode::LINE);
+                mode->setMode(osg::PolygonMode::FRONT_AND_BACK, wireprop->isEnabled() ? osg::PolygonMode::LINE : osg::PolygonMode::FILL);
                 mode = shareAttribute(mode);
                 node->getOrCreateStateSet()->setAttributeAndModes(mode, osg::StateAttribute::ON);
                 break;
@@ -1919,12 +1912,9 @@ namespace NifOsg
             {
                 const Nif::NiZBufferProperty* zprop = static_cast<const Nif::NiZBufferProperty*>(property);
                 osg::StateSet* stateset = node->getOrCreateStateSet();
-                // Depth test flag
-                stateset->setMode(GL_DEPTH_TEST, zprop->flags&1 ? osg::StateAttribute::ON
-                                                                : osg::StateAttribute::OFF);
+                stateset->setMode(GL_DEPTH_TEST, zprop->depthTest() ? osg::StateAttribute::ON : osg::StateAttribute::OFF);
                 osg::ref_ptr<osg::Depth> depth = new osg::Depth;
-                // Depth write flag
-                depth->setWriteMask((zprop->flags>>1)&1);
+                depth->setWriteMask(zprop->depthWrite());
                 // Morrowind ignores depth test function, unless a NiStencilProperty is present, in which case it uses a fixed depth function of GL_ALWAYS.
                 if (hasStencilProperty)
                     depth->setFunction(osg::Depth::ALWAYS);
@@ -1988,10 +1978,8 @@ namespace NifOsg
                     texture2d->setName("diffuseMap");
                     if (image)
                         texture2d->setTextureSize(image->s(), image->t());
-                    bool wrapT = texprop->clamp & 0x1;
-                    bool wrapS = (texprop->clamp >> 1) & 0x1;
-                    texture2d->setWrap(osg::Texture::WRAP_S, wrapS ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
-                    texture2d->setWrap(osg::Texture::WRAP_T, wrapT ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
+                    texture2d->setWrap(osg::Texture::WRAP_S, texprop->wrapS() ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
+                    texture2d->setWrap(osg::Texture::WRAP_T, texprop->wrapT() ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
                     const unsigned int texUnit = 0;
                     const unsigned int uvSet = 0;
                     stateset->setTextureAttributeAndModes(texUnit, texture2d, osg::StateAttribute::ON);
@@ -2090,7 +2078,7 @@ namespace NifOsg
                     // Specular property can turn specular lighting off.
                     // FIXME: NiMaterialColorController doesn't care about this.
                     auto specprop = static_cast<const Nif::NiSpecularProperty*>(property);
-                    specEnabled = specprop->flags & 1;
+                    specEnabled = specprop->isEnabled();
                     break;
                 }
                 case Nif::RC_NiMaterialProperty:
@@ -2138,10 +2126,10 @@ namespace NifOsg
                 case Nif::RC_NiAlphaProperty:
                 {
                     const Nif::NiAlphaProperty* alphaprop = static_cast<const Nif::NiAlphaProperty*>(property);
-                    if (alphaprop->flags&1)
+                    if (alphaprop->useAlphaBlending())
                     {
-                        osg::ref_ptr<osg::BlendFunc> blendFunc (new osg::BlendFunc(getBlendMode((alphaprop->flags>>1)&0xf),
-                                                                                   getBlendMode((alphaprop->flags>>5)&0xf)));
+                        osg::ref_ptr<osg::BlendFunc> blendFunc (new osg::BlendFunc(getBlendMode(alphaprop->sourceBlendMode()),
+                                                                                   getBlendMode(alphaprop->destinationBlendMode())));
                         // on AMD hardware, alpha still seems to be stored with an RGBA framebuffer with OpenGL.
                         // This might be mandated by the OpenGL 2.1 specification section 2.14.9, or might be a bug.
                         // Either way, D3D8.1 doesn't do that, so adapt the destination factor.
@@ -2150,8 +2138,7 @@ namespace NifOsg
                         blendFunc = shareAttribute(blendFunc);
                         node->getOrCreateStateSet()->setAttributeAndModes(blendFunc, osg::StateAttribute::ON);
 
-                        bool noSort = (alphaprop->flags>>13)&1;
-                        if (!noSort)
+                        if (!alphaprop->noSorter())
                         {
                             hasSortAlpha = true;
                             if (!mPushedSorter)
@@ -2172,9 +2159,9 @@ namespace NifOsg
                             blendFuncStateSet->setRenderBinToInherit();
                     }
 
-                    if((alphaprop->flags>>9)&1)
+                    if (alphaprop->useAlphaTesting())
                     {
-                        osg::ref_ptr<osg::AlphaFunc> alphaFunc (new osg::AlphaFunc(getTestMode((alphaprop->flags>>10)&0x7), alphaprop->data.threshold/255.f));
+                        osg::ref_ptr<osg::AlphaFunc> alphaFunc (new osg::AlphaFunc(getTestMode(alphaprop->alphaTestMode()), alphaprop->data.threshold/255.f));
                         alphaFunc = shareAttribute(alphaFunc);
                         node->getOrCreateStateSet()->setAttributeAndModes(alphaFunc, osg::StateAttribute::ON);
                     }
diff --git a/components/nifosg/particle.cpp b/components/nifosg/particle.cpp
index 88e6e1f4c8..9706a1f91b 100644
--- a/components/nifosg/particle.cpp
+++ b/components/nifosg/particle.cpp
@@ -396,7 +396,7 @@ void Emitter::emitParticles(double dt)
 
     osg::ref_ptr<osg::Vec3Array> geometryVertices = nullptr;
 
-    const bool useGeometryEmitter = mFlags & Nif::NiNode::BSPArrayController_AtVertex;
+    const bool useGeometryEmitter = mFlags & Nif::NiParticleSystemController::BSPArrayController_AtVertex;
 
     if (useGeometryEmitter || !mTargets.empty())
     {
@@ -445,7 +445,7 @@ void Emitter::emitParticles(double dt)
 
         osg::NodePath path = visitor.mFoundPath;
         path.erase(path.begin());
-        if (!useGeometryEmitter && (mFlags & Nif::NiNode::BSPArrayController_AtNode) && path.size())
+        if (!useGeometryEmitter && (mFlags & Nif::NiParticleSystemController::BSPArrayController_AtNode) && path.size())
         {
             osg::Matrix current;
 

From fbb0004aae9d0bd52687e4dffdd690495fc2515c Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Wed, 22 Jun 2022 03:41:31 +0300
Subject: [PATCH 2681/2859] Avoid assigning idle animations to non-actors (bug
 #5371)

---
 CHANGELOG.md                          | 1 +
 apps/openmw/mwmechanics/character.cpp | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index deee89fa03..a95e960528 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@
     Bug #5192: Actor turn rate is too slow
     Bug #5207: Loose summons can be present in scene
     Bug #5279: Ingame console stops auto-scrolling after clicking output
+    Bug #5371: 'Dead' slaughterfish added by mod are animated/alive
     Bug #5377: Console does not appear after using menutest in inventory
     Bug #5379: Wandering NPCs falling through cantons
     Bug #5394: Windows snapping no longer works
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index e3cbd3bb62..c60f64884f 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -880,12 +880,10 @@ CharacterController::CharacterController(const MWWorld::Ptr &ptr, MWRender::Anim
     {
         /* Don't accumulate with non-actors. */
         mAnimation->setAccumulation(osg::Vec3f(0.f, 0.f, 0.f));
-
-        mIdleState = CharState_Idle;
     }
 
-    // Do not update animation status for dead actors
-    if(mDeathState == CharState_None && (!cls.isActor() || !cls.getCreatureStats(mPtr).isDead()))
+    // Update animation status for living actors
+    if (mDeathState == CharState_None && cls.isActor() && !cls.getCreatureStats(mPtr).isDead())
         refreshCurrentAnims(mIdleState, mMovementState, mJumpState, true);
 
     mAnimation->runAnimation(0.f);

From cc081c3d2d05a11ea39d1d89dce332dcdd736d75 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Tue, 23 Nov 2021 22:44:47 +0100
Subject: [PATCH 2682/2859] Don't add additional targets to allies that are
 already in combat

---
 CHANGELOG.md                                    | 2 ++
 apps/openmw/mwmechanics/actors.cpp              | 3 +++
 apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 7 +++++++
 3 files changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a95e960528..4d6918cffc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
     Bug #3792: 1 frame late magicka recalc breaks early scripted magicka reactions to Intelligence change
     Bug #3846: Strings starting with "-" fail to compile if not enclosed in quotes
     Bug #3855: AI sometimes spams defensive spells
+    Bug #3867: All followers attack player when one follower enters combat with player
     Bug #3905: Great House Dagoth issues
     Bug #4203: Resurrecting an actor doesn't close the loot GUI
     Bug #4376: Moved actors don't respawn in their original cells
@@ -26,6 +27,7 @@
     Bug #5192: Actor turn rate is too slow
     Bug #5207: Loose summons can be present in scene
     Bug #5279: Ingame console stops auto-scrolling after clicking output
+    Bug #5318: Aiescort behaves differently from vanilla
     Bug #5371: 'Dead' slaughterfish added by mod are animated/alive
     Bug #5377: Console does not appear after using menutest in inventory
     Bug #5379: Wandering NPCs falling through cantons
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 2353f3729d..c0165f507b 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -501,6 +501,9 @@ namespace MWMechanics
         // If an ally of actor1 has been attacked by actor2 or has attacked actor2, start combat between actor1 and actor2
         for (const MWWorld::Ptr& ally : allies1)
         {
+            // Don't let allies that are already in combat choose additional sides
+            if (ally.getClass().getCreatureStats(ally).getAiSequence().isInCombat())
+                continue;
             if (creatureStats1.getAiSequence().isInCombat(ally))
                 continue;
 
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 2fd5a81f0d..f20381ea91 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -1457,7 +1457,14 @@ namespace MWMechanics
                 }
 
                 if (!peaceful)
+                {
                     startCombat(target, attacker);
+                    // Force friendly actors into combat to prevent infighting between followers
+                    std::set<MWWorld::Ptr> followersTarget;
+                    getActorsSidingWith(target, followersTarget);
+                    for(const auto& follower : followersTarget)
+                        startCombat(follower, attacker);
+                }
             }
         }
 

From b79c42fa77ec6104d409652570298846ec3569d6 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 27 Nov 2021 14:20:55 +0100
Subject: [PATCH 2683/2859] Exclude followers in combat with their leader

---
 apps/openmw/mwmechanics/actors.cpp | 23 +++++++++++++++--------
 apps/openmw/mwmechanics/actors.hpp | 21 ++++++++++++---------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index c0165f507b..b24149827c 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -501,9 +501,6 @@ namespace MWMechanics
         // If an ally of actor1 has been attacked by actor2 or has attacked actor2, start combat between actor1 and actor2
         for (const MWWorld::Ptr& ally : allies1)
         {
-            // Don't let allies that are already in combat choose additional sides
-            if (ally.getClass().getCreatureStats(ally).getAiSequence().isInCombat())
-                continue;
             if (creatureStats1.getAiSequence().isInCombat(ally))
                 continue;
 
@@ -1983,7 +1980,7 @@ namespace MWMechanics
         return false;
     }
 
-    std::vector<MWWorld::Ptr> Actors::getActorsSidingWith(const MWWorld::Ptr& actorPtr)
+    std::vector<MWWorld::Ptr> Actors::getActorsSidingWith(const MWWorld::Ptr& actorPtr, bool excludeInfighting)
     {
         std::vector<MWWorld::Ptr> list;
         for (const Actor& actor : mActors)
@@ -2002,10 +1999,20 @@ namespace MWMechanics
             // Actors that are targeted by this actor's Follow or Escort packages also side with them
             for (const auto& package : stats.getAiSequence())
             {
+                if (excludeInfighting && !sameActor && package->getTypeId() == AiPackageTypeId::Combat && package->getTarget() == actorPtr)
+                    break;
                 if (package->sideWithTarget() && !package->getTarget().isEmpty())
                 {
                     if (sameActor)
                     {
+                        if(excludeInfighting)
+                        {
+                            MWWorld::Ptr ally = package->getTarget();
+                            std::vector<MWWorld::Ptr> enemies;
+                            if(ally.getClass().getCreatureStats(ally).getAiSequence().getCombatTargets(enemies)
+                                && std::find(enemies.begin(), enemies.end(), actorPtr) != enemies.end())
+                                break;
+                        }
                         list.push_back(package->getTarget());
                     }
                     else if (package->getTarget() == actorPtr)
@@ -2042,11 +2049,11 @@ namespace MWMechanics
                 getActorsFollowing(follower, out);
     }
 
-    void Actors::getActorsSidingWith(const MWWorld::Ptr &actor, std::set<MWWorld::Ptr>& out) {
-        auto followers = getActorsSidingWith(actor);
+    void Actors::getActorsSidingWith(const MWWorld::Ptr &actor, std::set<MWWorld::Ptr>& out, bool excludeInfighting) {
+        auto followers = getActorsSidingWith(actor, excludeInfighting);
         for(const MWWorld::Ptr &follower : followers)
             if (out.insert(follower).second)
-                getActorsSidingWith(follower, out);
+                getActorsSidingWith(follower, out, excludeInfighting);
     }
 
     void Actors::getActorsSidingWith(const MWWorld::Ptr &actor, std::set<MWWorld::Ptr>& out, std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr> >& cachedAllies) {
@@ -2056,7 +2063,7 @@ namespace MWMechanics
             out.insert(search->second.begin(), search->second.end());
         else
         {
-            auto followers = getActorsSidingWith(actor);
+            auto followers = getActorsSidingWith(actor, true);
             for (const MWWorld::Ptr &follower : followers)
                 if (out.insert(follower).second)
                     getActorsSidingWith(follower, out, cachedAllies);
diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index 547c2916e2..7b54a98198 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -93,11 +93,6 @@ namespace MWMechanics
 
             /// Removes an actor from combat and makes all of their allies stop fighting the actor's targets
             void stopCombat(const MWWorld::Ptr& ptr);
-            /** Start combat between two actors
-                @Notes: If againstPlayer = true then actor2 should be the Player.
-                        If one of the combatants is creature it should be actor1.
-            */
-            void engageCombat(const MWWorld::Ptr& actor1, const MWWorld::Ptr& actor2, std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr> >& cachedAllies, bool againstPlayer);
 
             void playIdleDialogue(const MWWorld::Ptr& actor);
             void updateMovementSpeed(const MWWorld::Ptr& actor);
@@ -144,15 +139,13 @@ namespace MWMechanics
 
             ///Returns the list of actors which are siding with the given actor in fights
             /**ie AiFollow or AiEscort is active and the target is the actor **/
-            std::vector<MWWorld::Ptr> getActorsSidingWith(const MWWorld::Ptr& actor);
+            std::vector<MWWorld::Ptr> getActorsSidingWith(const MWWorld::Ptr& actor, bool excludeInfighting = false);
             std::vector<MWWorld::Ptr> getActorsFollowing(const MWWorld::Ptr& actor);
 
             /// Recursive version of getActorsFollowing
             void getActorsFollowing(const MWWorld::Ptr &actor, std::set<MWWorld::Ptr>& out);
             /// Recursive version of getActorsSidingWith
-            void getActorsSidingWith(const MWWorld::Ptr &actor, std::set<MWWorld::Ptr>& out);
-            /// Recursive version of getActorsSidingWith that takes, adds to and returns a cache of actors mapped to their allies
-            void getActorsSidingWith(const MWWorld::Ptr &actor, std::set<MWWorld::Ptr>& out, std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr> >& cachedAllies);
+            void getActorsSidingWith(const MWWorld::Ptr &actor, std::set<MWWorld::Ptr>& out, bool excludeInfighting = false);
 
             /// Get the list of AiFollow::mFollowIndex for all actors following this target
             std::vector<int> getActorsFollowingIndices(const MWWorld::Ptr& actor);
@@ -218,6 +211,16 @@ namespace MWMechanics
             void purgeSpellEffects (int casterActorId);
 
             void predictAndAvoidCollisions(float duration);
+
+            /** Start combat between two actors
+                @Notes: If againstPlayer = true then actor2 should be the Player.
+                        If one of the combatants is creature it should be actor1.
+            */
+            void engageCombat(const MWWorld::Ptr& actor1, const MWWorld::Ptr& actor2, std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr> >& cachedAllies, bool againstPlayer);
+
+            /// Recursive version of getActorsSidingWith that takes, adds to and returns a cache of actors mapped to their allies. Excludes infighting
+            void getActorsSidingWith(const MWWorld::Ptr &actor, std::set<MWWorld::Ptr>& out, std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr> >& cachedAllies);
+
     };
 }
 

From 377c00261ab2daf382a42469138b483a81657006 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Thu, 23 Jun 2022 20:21:06 +0200
Subject: [PATCH 2684/2859] [Lua] Ability to distinguish normal interiors and
 quasi exteriors (like Mournhold).

---
 apps/openmw/mwlua/cellbindings.cpp | 6 +++++-
 apps/openmw/mwlua/luabindings.cpp  | 2 +-
 files/lua_api/openmw/core.lua      | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwlua/cellbindings.cpp b/apps/openmw/mwlua/cellbindings.cpp
index 3d0c4d26df..5c8c5a5084 100644
--- a/apps/openmw/mwlua/cellbindings.cpp
+++ b/apps/openmw/mwlua/cellbindings.cpp
@@ -37,8 +37,12 @@ namespace MWLua
         cellT["region"] = sol::readonly_property([](const CellT& c) { return c.mStore->getCell()->mRegion; });
         cellT["gridX"] = sol::readonly_property([](const CellT& c) { return c.mStore->getCell()->getGridX(); });
         cellT["gridY"] = sol::readonly_property([](const CellT& c) { return c.mStore->getCell()->getGridY(); });
-        cellT["isExterior"] = sol::readonly_property([](const CellT& c) { return c.mStore->isExterior(); });
         cellT["hasWater"] = sol::readonly_property([](const CellT& c) { return c.mStore->getCell()->hasWater(); });
+        cellT["isExterior"] = sol::readonly_property([](const CellT& c) { return c.mStore->isExterior(); });
+        cellT["isQuasiExterior"] = sol::readonly_property([](const CellT& c)
+        {
+            return c.mStore->getCell()->mData.mFlags & ESM::Cell::QuasiEx;
+        });
 
         cellT["isInSameSpace"] = [](const CellT& c, const ObjectT& obj)
         {
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index 2383be8137..9e9520cbe2 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -47,7 +47,7 @@ namespace MWLua
     {
         auto* lua = context.mLua;
         sol::table api(lua->sol(), sol::create);
-        api["API_REVISION"] = 25;
+        api["API_REVISION"] = 26;
         api["quit"] = [lua]()
         {
             Log(Debug::Warning) << "Quit requested by a Lua script.\n" << lua->debugTraceback();
diff --git a/files/lua_api/openmw/core.lua b/files/lua_api/openmw/core.lua
index 24bddabd6d..38f73ec669 100644
--- a/files/lua_api/openmw/core.lua
+++ b/files/lua_api/openmw/core.lua
@@ -182,7 +182,8 @@
 -- @type Cell
 -- @field #string name Name of the cell (can be empty string).
 -- @field #string region Region of the cell.
--- @field #boolean isExterior Is it exterior or interior.
+-- @field #boolean isExterior Whether the cell is an exterior.
+-- @field #boolean isQuasiExterior Whether the cell is a quasi exterior (like interior but with the sky and the wheather).
 -- @field #number gridX Index of the cell by X (only for exteriors).
 -- @field #number gridY Index of the cell by Y (only for exteriors).
 -- @field #boolean hasWater True if the cell contains water.

From 50b143b53f3709a4c604c47210677513d1c323f1 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Fri, 24 Jun 2022 23:41:11 +0000
Subject: [PATCH 2685/2859] Fast fix in cellbindings.cpp

---
 apps/openmw/mwlua/cellbindings.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwlua/cellbindings.cpp b/apps/openmw/mwlua/cellbindings.cpp
index 5c8c5a5084..183774ebf9 100644
--- a/apps/openmw/mwlua/cellbindings.cpp
+++ b/apps/openmw/mwlua/cellbindings.cpp
@@ -41,7 +41,7 @@ namespace MWLua
         cellT["isExterior"] = sol::readonly_property([](const CellT& c) { return c.mStore->isExterior(); });
         cellT["isQuasiExterior"] = sol::readonly_property([](const CellT& c)
         {
-            return c.mStore->getCell()->mData.mFlags & ESM::Cell::QuasiEx;
+            return (c.mStore->getCell()->mData.mFlags & ESM::Cell::QuasiEx) != 0;
         });
 
         cellT["isInSameSpace"] = [](const CellT& c, const ObjectT& obj)

From 10fbf170a2b8ee118328353be0b4dcf4d45092a1 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 25 Jun 2022 17:51:01 +0200
Subject: [PATCH 2686/2859] Reduce number of includes for boost/program_options

---
 apps/launcher/maindialog.cpp                  | 3 +++
 apps/opencs/editor.cpp                        | 2 ++
 apps/opencs/editor.hpp                        | 1 +
 apps/openmw/main.cpp                          | 2 ++
 apps/openmw_test_suite/mwworld/test_store.cpp | 3 +++
 apps/openmw_test_suite/openmw/options.cpp     | 3 +++
 components/fallback/validate.cpp              | 3 +++
 components/fallback/validate.hpp              | 9 ++++++++-
 components/files/configurationmanager.cpp     | 3 +++
 components/files/configurationmanager.hpp     | 8 ++++++--
 10 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp
index ba7de5b7e7..5492538306 100644
--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@@ -10,6 +10,9 @@
 #include <QCloseEvent>
 #include <QTextCodec>
 
+#include <boost/program_options/options_description.hpp>
+#include <boost/program_options/variables_map.hpp>
+
 #include "playpage.hpp"
 #include "graphicspage.hpp"
 #include "datafilespage.hpp"
diff --git a/apps/opencs/editor.cpp b/apps/opencs/editor.cpp
index d8672cd84b..5dfa3fbf4e 100644
--- a/apps/opencs/editor.cpp
+++ b/apps/opencs/editor.cpp
@@ -5,6 +5,8 @@
 #include <QLocalSocket>
 #include <QMessageBox>
 
+#include <boost/program_options/options_description.hpp>
+
 #include <components/debug/debugging.hpp>
 #include <components/debug/debuglog.hpp>
 #include <components/fallback/validate.hpp>
diff --git a/apps/opencs/editor.hpp b/apps/opencs/editor.hpp
index 7b258c8049..b99c2d91e8 100644
--- a/apps/opencs/editor.hpp
+++ b/apps/opencs/editor.hpp
@@ -3,6 +3,7 @@
 
 #include <boost/interprocess/sync/file_lock.hpp>
 #include <boost/filesystem/fstream.hpp>
+#include <boost/program_options/variables_map.hpp>
 
 #include <QObject>
 #include <QString>
diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index ab20db8caa..cf6e29d9d8 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -11,6 +11,8 @@
 #include "engine.hpp"
 #include "options.hpp"
 
+#include <boost/program_options/variables_map.hpp>
+
 #if defined(_WIN32)
 #include <components/windows.hpp>
 // makes __argc and __argv available on windows
diff --git a/apps/openmw_test_suite/mwworld/test_store.cpp b/apps/openmw_test_suite/mwworld/test_store.cpp
index 7df5940596..34079a8172 100644
--- a/apps/openmw_test_suite/mwworld/test_store.cpp
+++ b/apps/openmw_test_suite/mwworld/test_store.cpp
@@ -2,6 +2,9 @@
 
 #include <fstream>
 
+#include <boost/program_options/options_description.hpp>
+#include <boost/program_options/variables_map.hpp>
+
 #include <components/files/configurationmanager.hpp>
 #include <components/esm3/esmreader.hpp>
 #include <components/esm3/esmwriter.hpp>
diff --git a/apps/openmw_test_suite/openmw/options.cpp b/apps/openmw_test_suite/openmw/options.cpp
index b65da5d157..33c38da5df 100644
--- a/apps/openmw_test_suite/openmw/options.cpp
+++ b/apps/openmw_test_suite/openmw/options.cpp
@@ -4,6 +4,9 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
+#include <boost/program_options/options_description.hpp>
+#include <boost/program_options/variables_map.hpp>
+
 #include <array>
 #include <algorithm>
 #include <string>
diff --git a/components/fallback/validate.cpp b/components/fallback/validate.cpp
index 6f5d529e05..e47c6f878e 100644
--- a/components/fallback/validate.cpp
+++ b/components/fallback/validate.cpp
@@ -1,5 +1,8 @@
 #include "validate.hpp"
 
+#include <boost/any.hpp>
+#include <boost/program_options/errors.hpp>
+
 void Fallback::validate(boost::any& v, std::vector<std::string> const& tokens, FallbackMap*, int)
 {
     if (v.empty())
diff --git a/components/fallback/validate.hpp b/components/fallback/validate.hpp
index 2b9af88da2..49046be6fc 100644
--- a/components/fallback/validate.hpp
+++ b/components/fallback/validate.hpp
@@ -1,12 +1,19 @@
 #ifndef OPENMW_COMPONENTS_FALLBACK_VALIDATE_H
 #define OPENMW_COMPONENTS_FALLBACK_VALIDATE_H
 
-#include <boost/program_options.hpp>
+#include <map>
+#include <string>
+#include <vector>
 
 // Parses and validates a fallback map from boost program_options.
 // Note: for boost to pick up the validate function, you need to pull in the namespace e.g.
 // by using namespace Fallback;
 
+namespace boost
+{
+    class any;
+}
+
 namespace Fallback
 {
 
diff --git a/components/files/configurationmanager.cpp b/components/files/configurationmanager.cpp
index 74fe03b3e2..be9890750f 100644
--- a/components/files/configurationmanager.cpp
+++ b/components/files/configurationmanager.cpp
@@ -5,6 +5,9 @@
 #include <components/fallback/validate.hpp>
 
 #include <boost/filesystem/fstream.hpp>
+#include <boost/program_options/variables_map.hpp>
+#include <boost/program_options/options_description.hpp>
+
 /**
  * \namespace Files
  */
diff --git a/components/files/configurationmanager.hpp b/components/files/configurationmanager.hpp
index f45df612ef..20387c1ba5 100644
--- a/components/files/configurationmanager.hpp
+++ b/components/files/configurationmanager.hpp
@@ -5,11 +5,15 @@
 #include <optional>
 #include <stack>
 
-#include <boost/program_options.hpp>
-
 #include <components/files/fixedpath.hpp>
 #include <components/files/collections.hpp>
 
+namespace boost::program_options
+{
+    class options_description;
+    class variables_map;
+}
+
 /**
  * \namespace Files
  */

From 54e2e74c2a497ba20a29cfc4567ddc8ec52cfd3b Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Sat, 25 Jun 2022 22:41:03 -0700
Subject: [PATCH 2687/2859] quickfix

---
 apps/openmw/mwrender/postprocessor.cpp         | 2 +-
 docs/source/reference/postprocessing/omwfx.rst | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/openmw/mwrender/postprocessor.cpp b/apps/openmw/mwrender/postprocessor.cpp
index 8fb2a2bbe9..fd3b25ae2c 100644
--- a/apps/openmw/mwrender/postprocessor.cpp
+++ b/apps/openmw/mwrender/postprocessor.cpp
@@ -904,7 +904,7 @@ namespace MWRender
         std::vector<std::string> techniqueStrings;
         Misc::StringUtils::split(Settings::Manager::getString("chain", "Post Processing"), techniqueStrings, ",");
 
-        const std::string& mainIdentifier = "main";
+        const std::string mainIdentifier = "main";
 
         auto main = loadTechnique(mainIdentifier);
 
diff --git a/docs/source/reference/postprocessing/omwfx.rst b/docs/source/reference/postprocessing/omwfx.rst
index e828bd8e6f..4168399daa 100644
--- a/docs/source/reference/postprocessing/omwfx.rst
+++ b/docs/source/reference/postprocessing/omwfx.rst
@@ -173,8 +173,6 @@ The following functions can be accessed in any fragment or vertex shader.
 |                                        |                                                                               |
 |                                        |  Scene luminance is always calculated on original scene texture.              |
 +----------------------------------------+-------------------------------------------------------------------------------+
-| ``vec4 omw_GetDepth(vec2 uv)``         | Returns non-linear normalized depth                                           |
-+----------------------------------------+-------------------------------------------------------------------------------+
 | ``vec4 omw_GetLastShader(vec2 uv)``    | Returns RGBA color output of the last shader                                  |
 +----------------------------------------+-------------------------------------------------------------------------------+
 | ``vec4 omw_GetLastPass(vec2 uv)``      | Returns RGBA color output of the last pass                                    |

From fdf6e58ea3e0b750b1570158a5cae4a35112053e Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 26 Jun 2022 16:42:29 +0200
Subject: [PATCH 2688/2859] Split apps/openmw/mwmechanics/actorutil.hpp

---
 apps/openmw/mwbase/mechanicsmanager.hpp       |  4 +-
 apps/openmw/mwclass/container.cpp             |  2 +-
 apps/openmw/mwclass/creature.cpp              | 16 ++--
 apps/openmw/mwclass/creaturelevlist.cpp       |  6 ++
 apps/openmw/mwclass/npc.cpp                   |  9 +-
 apps/openmw/mwgui/alchemywindow.cpp           |  1 +
 apps/openmw/mwgui/inventorywindow.cpp         |  1 +
 apps/openmw/mwgui/pickpocketitemmodel.cpp     |  1 +
 apps/openmw/mwgui/spellbuyingwindow.cpp       |  4 +
 apps/openmw/mwgui/spellcreationdialog.cpp     |  5 ++
 apps/openmw/mwgui/travelwindow.cpp            |  4 +
 apps/openmw/mwmechanics/actor.hpp             |  5 +-
 apps/openmw/mwmechanics/actors.hpp            |  1 -
 apps/openmw/mwmechanics/actorutil.cpp         | 10 +--
 apps/openmw/mwmechanics/actorutil.hpp         | 82 -------------------
 apps/openmw/mwmechanics/aisetting.hpp         | 40 +++++++++
 .../creaturecustomdataresetter.hpp            | 20 +++++
 apps/openmw/mwmechanics/greetingstate.hpp     | 14 ++++
 apps/openmw/mwmechanics/inventory.hpp         | 42 ++++++++++
 apps/openmw/mwphysics/mtphysics.cpp           |  4 +
 apps/openmw/mwrender/renderingmanager.cpp     |  6 +-
 apps/openmw/mwscript/containerextensions.cpp  |  2 +
 apps/openmw/mwworld/actionopen.cpp            |  1 +
 apps/openmw/mwworld/actionteleport.cpp        |  2 +
 apps/openmw/mwworld/containerstore.cpp        |  2 +
 apps/openmw/mwworld/weather.cpp               |  1 +
 apps/openmw/mwworld/worldimp.cpp              |  1 +
 27 files changed, 182 insertions(+), 104 deletions(-)
 create mode 100644 apps/openmw/mwmechanics/aisetting.hpp
 create mode 100644 apps/openmw/mwmechanics/creaturecustomdataresetter.hpp
 create mode 100644 apps/openmw/mwmechanics/greetingstate.hpp
 create mode 100644 apps/openmw/mwmechanics/inventory.hpp

diff --git a/apps/openmw/mwbase/mechanicsmanager.hpp b/apps/openmw/mwbase/mechanicsmanager.hpp
index b6e167ab9e..e542883012 100644
--- a/apps/openmw/mwbase/mechanicsmanager.hpp
+++ b/apps/openmw/mwbase/mechanicsmanager.hpp
@@ -5,9 +5,9 @@
 #include <vector>
 #include <set>
 #include <cstdint>
+#include <map>
 
-#include "../mwmechanics/actorutil.hpp"
-// For MWMechanics::GreetingState
+#include "../mwmechanics/greetingstate.hpp"
 
 #include "../mwworld/ptr.hpp"
 
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index 9f9666534d..38c55cdd52 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -27,8 +27,8 @@
 #include "../mwrender/objects.hpp"
 #include "../mwrender/renderinginterface.hpp"
 
-#include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/npcstats.hpp"
+#include "../mwmechanics/inventory.hpp"
 
 namespace MWClass
 {
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 026ef268fe..b587fdf146 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -12,6 +12,12 @@
 #include "../mwmechanics/disease.hpp"
 #include "../mwmechanics/spellcasting.hpp"
 #include "../mwmechanics/difficultyscaling.hpp"
+#include "../mwmechanics/npcstats.hpp"
+#include "../mwmechanics/combat.hpp"
+#include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/creaturecustomdataresetter.hpp"
+#include "../mwmechanics/aisetting.hpp"
+#include "../mwmechanics/inventory.hpp"
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
@@ -27,18 +33,14 @@
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/localscripts.hpp"
+#include "../mwworld/inventorystore.hpp"
+#include "../mwworld/esmstore.hpp"
 
 #include "../mwrender/renderinginterface.hpp"
 #include "../mwrender/objects.hpp"
 
 #include "../mwgui/tooltips.hpp"
 
-#include "../mwworld/inventorystore.hpp"
-
-#include "../mwmechanics/npcstats.hpp"
-#include "../mwmechanics/combat.hpp"
-#include "../mwmechanics/actorutil.hpp"
-
 namespace
 {
     bool isFlagBitSet(const MWWorld::ConstPtr &ptr, ESM::Creature::Flags bitMask)
@@ -117,7 +119,7 @@ namespace MWClass
         {
             auto tempData = std::make_unique<CreatureCustomData>();
             CreatureCustomData* data = tempData.get();
-            MWMechanics::CreatureCustomDataResetter resetter(ptr);
+            MWMechanics::CreatureCustomDataResetter resetter {ptr};
             ptr.getRefData().setCustomData(std::move(tempData));
 
             MWWorld::LiveCellRef<ESM::Creature> *ref = ptr.get<ESM::Creature>();
diff --git a/apps/openmw/mwclass/creaturelevlist.cpp b/apps/openmw/mwclass/creaturelevlist.cpp
index f22fbaebaa..431f9675b6 100644
--- a/apps/openmw/mwclass/creaturelevlist.cpp
+++ b/apps/openmw/mwclass/creaturelevlist.cpp
@@ -7,8 +7,14 @@
 
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/customdata.hpp"
+#include "../mwworld/esmstore.hpp"
+#include "../mwworld/manualref.hpp"
+
 #include "../mwmechanics/creaturestats.hpp"
 
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+
 namespace MWClass
 {
     class CreatureLevListCustomData : public MWWorld::TypedCustomData<CreatureLevListCustomData>
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 74de6fb764..5f2ce00690 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -12,6 +12,9 @@
 #include <components/esm3/loadnpc.hpp>
 #include <components/esm3/npcstate.hpp>
 #include <components/settings/settings.hpp>
+#include <components/esm3/loadrace.hpp>
+#include <components/esm3/loadclas.hpp>
+#include <components/esm3/loadnpc.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
@@ -31,6 +34,9 @@
 #include "../mwmechanics/difficultyscaling.hpp"
 #include "../mwmechanics/weapontype.hpp"
 #include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/creaturecustomdataresetter.hpp"
+#include "../mwmechanics/inventory.hpp"
+#include "../mwmechanics/aisetting.hpp"
 
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontalk.hpp"
@@ -40,6 +46,7 @@
 #include "../mwworld/customdata.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/localscripts.hpp"
+#include "../mwworld/esmstore.hpp"
 
 #include "../mwrender/objects.hpp"
 #include "../mwrender/renderinginterface.hpp"
@@ -311,7 +318,7 @@ namespace MWClass
             bool recalculate = false;
             auto tempData = std::make_unique<NpcCustomData>();
             NpcCustomData* data = tempData.get();
-            MWMechanics::CreatureCustomDataResetter resetter(ptr);
+            MWMechanics::CreatureCustomDataResetter resetter {ptr};
             ptr.getRefData().setCustomData(std::move(tempData));
 
             MWWorld::LiveCellRef<ESM::NPC> *ref = ptr.get<ESM::NPC>();
diff --git a/apps/openmw/mwgui/alchemywindow.cpp b/apps/openmw/mwgui/alchemywindow.cpp
index 618017a7cd..fd4a21cf10 100644
--- a/apps/openmw/mwgui/alchemywindow.cpp
+++ b/apps/openmw/mwgui/alchemywindow.cpp
@@ -16,6 +16,7 @@
 #include "../mwmechanics/actorutil.hpp"
 
 #include "../mwworld/class.hpp"
+#include "../mwworld/esmstore.hpp"
 
 #include <MyGUI_Macros.h>
 #include <components/esm/records.hpp>
diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index 8279da089e..f7cbc30ae1 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -28,6 +28,7 @@
 #include "../mwworld/actionequip.hpp"
 
 #include "../mwmechanics/npcstats.hpp"
+#include "../mwmechanics/actorutil.hpp"
 
 #include "itemview.hpp"
 #include "inventoryitemmodel.hpp"
diff --git a/apps/openmw/mwgui/pickpocketitemmodel.cpp b/apps/openmw/mwgui/pickpocketitemmodel.cpp
index 2b4d474059..976485c23a 100644
--- a/apps/openmw/mwgui/pickpocketitemmodel.cpp
+++ b/apps/openmw/mwgui/pickpocketitemmodel.cpp
@@ -12,6 +12,7 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
 namespace MWGui
 {
diff --git a/apps/openmw/mwgui/spellbuyingwindow.cpp b/apps/openmw/mwgui/spellbuyingwindow.cpp
index 716fd7a0b5..934936f1ab 100644
--- a/apps/openmw/mwgui/spellbuyingwindow.cpp
+++ b/apps/openmw/mwgui/spellbuyingwindow.cpp
@@ -4,6 +4,8 @@
 #include <MyGUI_Button.h>
 #include <MyGUI_ScrollView.h>
 
+#include <components/misc/stringops.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
@@ -11,7 +13,9 @@
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
+#include "../mwworld/esmstore.hpp"
 
+#include "../mwmechanics/actorutil.hpp"
 
 namespace MWGui
 {
diff --git a/apps/openmw/mwgui/spellcreationdialog.cpp b/apps/openmw/mwgui/spellcreationdialog.cpp
index 9bfd72adce..4fa6076ec9 100644
--- a/apps/openmw/mwgui/spellcreationdialog.cpp
+++ b/apps/openmw/mwgui/spellcreationdialog.cpp
@@ -10,11 +10,16 @@
 
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/class.hpp"
+#include "../mwworld/store.hpp"
+#include "../mwworld/esmstore.hpp"
 
 #include "../mwmechanics/spellutil.hpp"
+#include "../mwmechanics/actorutil.hpp"
 
 #include "tooltips.hpp"
 #include "class.hpp"
diff --git a/apps/openmw/mwgui/travelwindow.cpp b/apps/openmw/mwgui/travelwindow.cpp
index 0553b5c368..1cdb22d88f 100644
--- a/apps/openmw/mwgui/travelwindow.cpp
+++ b/apps/openmw/mwgui/travelwindow.cpp
@@ -5,6 +5,7 @@
 #include <MyGUI_Gui.h>
 
 #include <components/settings/settings.hpp>
+#include <components/esm3/loadgmst.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
@@ -16,7 +17,10 @@
 #include "../mwworld/actionteleport.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/cellutils.hpp"
+#include "../mwworld/store.hpp"
+#include "../mwworld/esmstore.hpp"
 
+#include "../mwmechanics/actorutil.hpp"
 
 namespace MWGui
 {
diff --git a/apps/openmw/mwmechanics/actor.hpp b/apps/openmw/mwmechanics/actor.hpp
index 14f21193ea..3a3b0baa67 100644
--- a/apps/openmw/mwmechanics/actor.hpp
+++ b/apps/openmw/mwmechanics/actor.hpp
@@ -3,8 +3,11 @@
 
 #include <memory>
 
-#include "actorutil.hpp"
 #include "character.hpp"
+#include "greetingstate.hpp"
+
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
 
 #include <components/misc/timer.hpp>
 
diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index 7b54a98198..ff9face4f3 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -7,7 +7,6 @@
 #include <list>
 #include <map>
 
-#include "actorutil.hpp"
 #include "actor.hpp"
 
 namespace ESM
diff --git a/apps/openmw/mwmechanics/actorutil.cpp b/apps/openmw/mwmechanics/actorutil.cpp
index 4a587dd662..4e1b7706db 100644
--- a/apps/openmw/mwmechanics/actorutil.cpp
+++ b/apps/openmw/mwmechanics/actorutil.cpp
@@ -6,6 +6,8 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/player.hpp"
 
+#include <components/esm3/loadmgef.hpp>
+
 namespace MWMechanics
 {
     MWWorld::Ptr getPlayer()
@@ -29,12 +31,4 @@ namespace MWMechanics
         const MWMechanics::MagicEffects& effects = actor.getClass().getCreatureStats(actor).getMagicEffects();
         return effects.get(ESM::MagicEffect::WaterWalking).getMagnitude() > 0;
     }
-
-    CreatureCustomDataResetter::CreatureCustomDataResetter(const MWWorld::Ptr& ptr) : mPtr(ptr) {}
-
-    CreatureCustomDataResetter::~CreatureCustomDataResetter()
-    {
-        if(!mPtr.isEmpty())
-            mPtr.getRefData().setCustomData({});
-    }
 }
diff --git a/apps/openmw/mwmechanics/actorutil.hpp b/apps/openmw/mwmechanics/actorutil.hpp
index 91770ddfec..608e26774e 100644
--- a/apps/openmw/mwmechanics/actorutil.hpp
+++ b/apps/openmw/mwmechanics/actorutil.hpp
@@ -1,19 +1,6 @@
 #ifndef OPENMW_MWMECHANICS_ACTORUTIL_H
 #define OPENMW_MWMECHANICS_ACTORUTIL_H
 
-#include <algorithm>
-
-#include <components/esm3/loadcont.hpp>
-#include <components/esm3/loadcrea.hpp>
-#include <components/esm3/loadnpc.hpp>
-
-#include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
-
-#include "../mwworld/esmstore.hpp"
-
-#include "./creaturestats.hpp"
-
 namespace MWWorld
 {
     class Ptr;
@@ -21,79 +8,10 @@ namespace MWWorld
 
 namespace MWMechanics
 {
-    enum GreetingState
-    {
-        Greet_None,
-        Greet_InProgress,
-        Greet_Done
-    };
-
     MWWorld::Ptr getPlayer();
     bool isPlayerInCombat();
     bool canActorMoveByZAxis(const MWWorld::Ptr& actor);
     bool hasWaterWalking(const MWWorld::Ptr& actor);
-
-    template<class T>
-    void setBaseAISetting(const std::string& id, MWMechanics::CreatureStats::AiSetting setting, int value)
-    {
-        T copy = *MWBase::Environment::get().getWorld()->getStore().get<T>().find(id);
-        switch(setting)
-        {
-            case MWMechanics::CreatureStats::AiSetting::AI_Hello:
-                copy.mAiData.mHello = value;
-                break;
-            case MWMechanics::CreatureStats::AiSetting::AI_Fight:
-                copy.mAiData.mFight = value;
-                break;
-            case MWMechanics::CreatureStats::AiSetting::AI_Flee:
-                copy.mAiData.mFlee = value;
-                break;
-            case MWMechanics::CreatureStats::AiSetting::AI_Alarm:
-                copy.mAiData.mAlarm = value;
-                break;
-            default:
-                assert(0);
-        }
-        MWBase::Environment::get().getWorld()->createOverrideRecord(copy);
-    }
-
-    template<class T>
-    void modifyBaseInventory(const std::string& actorId, const std::string& itemId, int amount)
-    {
-        T copy = *MWBase::Environment::get().getWorld()->getStore().get<T>().find(actorId);
-        for(auto& it : copy.mInventory.mList)
-        {
-            if(Misc::StringUtils::ciEqual(it.mItem, itemId))
-            {
-                int sign = it.mCount < 1 ? -1 : 1;
-                it.mCount = sign * std::max(it.mCount * sign + amount, 0);
-                MWBase::Environment::get().getWorld()->createOverrideRecord(copy);
-                return;
-            }
-        }
-        if(amount > 0)
-        {
-            ESM::ContItem cont;
-            cont.mItem = itemId;
-            cont.mCount = amount;
-            copy.mInventory.mList.push_back(cont);
-            MWBase::Environment::get().getWorld()->createOverrideRecord(copy);
-        }
-    }
-
-    template void setBaseAISetting<ESM::Creature>(const std::string& id, MWMechanics::CreatureStats::AiSetting setting, int value);
-    template void setBaseAISetting<ESM::NPC>(const std::string& id, MWMechanics::CreatureStats::AiSetting setting, int value);
-    template void modifyBaseInventory<ESM::Creature>(const std::string& actorId, const std::string& itemId, int amount);
-    template void modifyBaseInventory<ESM::NPC>(const std::string& actorId, const std::string& itemId, int amount);
-    template void modifyBaseInventory<ESM::Container>(const std::string& containerId, const std::string& itemId, int amount);
-
-    struct CreatureCustomDataResetter
-    {
-        MWWorld::Ptr mPtr;
-
-        CreatureCustomDataResetter(const MWWorld::Ptr& ptr);
-        ~CreatureCustomDataResetter();
-    };
 }
 
 #endif
diff --git a/apps/openmw/mwmechanics/aisetting.hpp b/apps/openmw/mwmechanics/aisetting.hpp
new file mode 100644
index 0000000000..d11769ac6f
--- /dev/null
+++ b/apps/openmw/mwmechanics/aisetting.hpp
@@ -0,0 +1,40 @@
+#ifndef OPENMW_MWMECHANICS_AISETTING_H
+#define OPENMW_MWMECHANICS_AISETTING_H
+
+#include <string>
+
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+
+#include "../mwworld/esmstore.hpp"
+
+#include "creaturestats.hpp"
+
+namespace MWMechanics
+{
+    template<class T>
+    void setBaseAISetting(const std::string& id, MWMechanics::CreatureStats::AiSetting setting, int value)
+    {
+        T copy = *MWBase::Environment::get().getWorld()->getStore().get<T>().find(id);
+        switch (setting)
+        {
+            case MWMechanics::CreatureStats::AiSetting::AI_Hello:
+                copy.mAiData.mHello = value;
+                break;
+            case MWMechanics::CreatureStats::AiSetting::AI_Fight:
+                copy.mAiData.mFight = value;
+                break;
+            case MWMechanics::CreatureStats::AiSetting::AI_Flee:
+                copy.mAiData.mFlee = value;
+                break;
+            case MWMechanics::CreatureStats::AiSetting::AI_Alarm:
+                copy.mAiData.mAlarm = value;
+                break;
+            default:
+                assert(false);
+        }
+        MWBase::Environment::get().getWorld()->createOverrideRecord(copy);
+    }
+}
+
+#endif
diff --git a/apps/openmw/mwmechanics/creaturecustomdataresetter.hpp b/apps/openmw/mwmechanics/creaturecustomdataresetter.hpp
new file mode 100644
index 0000000000..667a0b9c45
--- /dev/null
+++ b/apps/openmw/mwmechanics/creaturecustomdataresetter.hpp
@@ -0,0 +1,20 @@
+#ifndef OPENMW_MWMECHANICS_CREATURECUSTOMDATARESETTER_H
+#define OPENMW_MWMECHANICS_CREATURECUSTOMDATARESETTER_H
+
+#include "../mwworld/ptr.hpp"
+
+namespace MWMechanics
+{
+    struct CreatureCustomDataResetter
+    {
+        MWWorld::Ptr mPtr;
+
+        ~CreatureCustomDataResetter()
+        {
+            if (!mPtr.isEmpty())
+                mPtr.getRefData().setCustomData({});
+        }
+    };
+}
+
+#endif
diff --git a/apps/openmw/mwmechanics/greetingstate.hpp b/apps/openmw/mwmechanics/greetingstate.hpp
new file mode 100644
index 0000000000..9b37096322
--- /dev/null
+++ b/apps/openmw/mwmechanics/greetingstate.hpp
@@ -0,0 +1,14 @@
+#ifndef OPENMW_MWMECHANICS_GREETINGSTATE_H
+#define OPENMW_MWMECHANICS_GREETINGSTATE_H
+
+namespace MWMechanics
+{
+    enum GreetingState
+    {
+        Greet_None,
+        Greet_InProgress,
+        Greet_Done
+    };
+}
+
+#endif
diff --git a/apps/openmw/mwmechanics/inventory.hpp b/apps/openmw/mwmechanics/inventory.hpp
new file mode 100644
index 0000000000..ddd4b3351a
--- /dev/null
+++ b/apps/openmw/mwmechanics/inventory.hpp
@@ -0,0 +1,42 @@
+#ifndef OPENMW_MWMECHANICS_INVENTORY_H
+#define OPENMW_MWMECHANICS_INVENTORY_H
+
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+
+#include "../mwworld/esmstore.hpp"
+
+#include <components/misc/stringops.hpp>
+#include <components/esm3/loadcont.hpp>
+
+#include <algorithm>
+#include <string>
+
+namespace MWMechanics
+{
+    template <class T>
+    void modifyBaseInventory(const std::string& actorId, const std::string& itemId, int amount)
+    {
+        T copy = *MWBase::Environment::get().getWorld()->getStore().get<T>().find(actorId);
+        for (auto& it : copy.mInventory.mList)
+        {
+            if (Misc::StringUtils::ciEqual(it.mItem, itemId))
+            {
+                const int sign = it.mCount < 1 ? -1 : 1;
+                it.mCount = sign * std::max(it.mCount * sign + amount, 0);
+                MWBase::Environment::get().getWorld()->createOverrideRecord(copy);
+                return;
+            }
+        }
+        if (amount > 0)
+        {
+            ESM::ContItem cont;
+            cont.mItem = itemId;
+            cont.mCount = amount;
+            copy.mInventory.mList.push_back(cont);
+            MWBase::Environment::get().getWorld()->createOverrideRecord(copy);
+        }
+    }
+}
+
+#endif
diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index cb8e520384..9bc6f942f0 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -9,11 +9,15 @@
 #include <components/misc/barrier.hpp>
 #include "components/misc/convert.hpp"
 #include "components/settings/settings.hpp"
+
 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/movement.hpp"
 #include "../mwrender/bulletdebugdraw.hpp"
 #include "../mwworld/class.hpp"
 
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+
 #include "actor.hpp"
 #include "contacttestwrapper.h"
 #include "movementsolver.hpp"
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index cbee0ba07d..449217fa68 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -52,14 +52,18 @@
 
 #include <components/detournavigator/navigator.hpp>
 
-#include "../mwbase/windowmanager.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/groundcoverstore.hpp"
+
 #include "../mwgui/loadingscreen.hpp"
 #include "../mwgui/postprocessorhud.hpp"
+
 #include "../mwmechanics/actorutil.hpp"
+
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
 
 #include "sky.hpp"
 #include "effectmanager.hpp"
diff --git a/apps/openmw/mwscript/containerextensions.cpp b/apps/openmw/mwscript/containerextensions.cpp
index 11e9095e2c..bb63ec84cc 100644
--- a/apps/openmw/mwscript/containerextensions.cpp
+++ b/apps/openmw/mwscript/containerextensions.cpp
@@ -14,6 +14,7 @@
 #include <components/misc/stringops.hpp>
 
 #include <components/esm3/loadskil.hpp>
+#include <components/esm3/loadlevlist.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
@@ -26,6 +27,7 @@
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/manualref.hpp"
+#include "../mwworld/esmstore.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/levelledlist.hpp"
diff --git a/apps/openmw/mwworld/actionopen.cpp b/apps/openmw/mwworld/actionopen.cpp
index 266ea4d95f..61f2f3e30c 100644
--- a/apps/openmw/mwworld/actionopen.cpp
+++ b/apps/openmw/mwworld/actionopen.cpp
@@ -5,6 +5,7 @@
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwmechanics/disease.hpp"
+#include "../mwmechanics/actorutil.hpp"
 
 namespace MWWorld
 {
diff --git a/apps/openmw/mwworld/actionteleport.cpp b/apps/openmw/mwworld/actionteleport.cpp
index 644e23a521..bbf4952063 100644
--- a/apps/openmw/mwworld/actionteleport.cpp
+++ b/apps/openmw/mwworld/actionteleport.cpp
@@ -1,5 +1,7 @@
 #include "actionteleport.hpp"
 
+#include <components/esm3/loadcell.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index 14a19c482c..140582c1a8 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -5,6 +5,7 @@
 
 #include <components/debug/debuglog.hpp>
 #include <components/esm3/inventorystate.hpp>
+#include <components/misc/stringops.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
@@ -19,6 +20,7 @@
 #include "class.hpp"
 #include "localscripts.hpp"
 #include "player.hpp"
+#include "esmstore.hpp"
 
 namespace
 {
diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index 1e12d0b1dd..74cab7a461 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -8,6 +8,7 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/soundmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index de90c2e52a..628ac60727 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -47,6 +47,7 @@
 #include "../mwmechanics/combat.hpp"
 #include "../mwmechanics/aiavoiddoor.hpp" //Used to tell actors to avoid doors
 #include "../mwmechanics/summoning.hpp"
+#include "../mwmechanics/actorutil.hpp"
 
 #include "../mwrender/animation.hpp"
 #include "../mwrender/npcanimation.hpp"

From cbf48b43822a2ee453077e10e0d2ff69e20d27b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Mocquillon?= <cedric.mocquillon@gmail.com>
Date: Sun, 26 Jun 2022 21:39:05 +0200
Subject: [PATCH 2689/2859] Avoid double move when an area with same
 coordinates already exists

---
 apps/openmw/mwworld/store.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index ba33703668..9d6e11f141 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -404,12 +404,15 @@ namespace MWWorld
         land.load(esm, isDeleted);
 
         // Same area defined in multiple plugins? -> last plugin wins
-        auto [it, inserted] = mStatic.insert(std::move(land));
-        if (!inserted) {
+        auto it = mStatic.lower_bound(land);
+        if (it != mStatic.end() && (std::tie(it->mX, it->mY) == std::tie(land.mX, land.mY)))
+        {
             auto nh = mStatic.extract(it);
             nh.value() = std::move(land);
             mStatic.insert(std::move(nh));
         }
+        else
+            mStatic.insert(it, std::move(land));
 
         return RecordId("", isDeleted);
     }

From ffd1bd30ef71a51be27b3c67efdbfa1f7b24f3fe Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 26 Jun 2022 19:05:00 +0200
Subject: [PATCH 2690/2859] Remove redundant includes from groundcoverstore.hpp

---
 apps/openmw/mwrender/groundcover.cpp     |  1 +
 apps/openmw/mwworld/groundcoverstore.cpp |  3 +++
 apps/openmw/mwworld/groundcoverstore.hpp | 27 ++++++++++++++++++++----
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwrender/groundcover.cpp b/apps/openmw/mwrender/groundcover.cpp
index 7271a06df9..194227f758 100644
--- a/apps/openmw/mwrender/groundcover.cpp
+++ b/apps/openmw/mwrender/groundcover.cpp
@@ -13,6 +13,7 @@
 #include <components/terrain/quadtreenode.hpp>
 #include <components/shader/shadermanager.hpp>
 #include <components/esm3/readerscache.hpp>
+#include <components/esm3/loadland.hpp>
 
 #include "../mwworld/groundcoverstore.hpp"
 
diff --git a/apps/openmw/mwworld/groundcoverstore.cpp b/apps/openmw/mwworld/groundcoverstore.cpp
index 980eb09e46..567735e02a 100644
--- a/apps/openmw/mwworld/groundcoverstore.cpp
+++ b/apps/openmw/mwworld/groundcoverstore.cpp
@@ -1,12 +1,15 @@
 #include "groundcoverstore.hpp"
 
 #include <components/esmloader/load.hpp>
+#include <components/esmloader/esmdata.hpp>
 #include <components/misc/stringops.hpp>
 #include <components/esm3/readerscache.hpp>
 
 #include <apps/openmw/mwbase/environment.hpp>
 #include <apps/openmw/mwbase/windowmanager.hpp>
 
+#include "store.hpp"
+
 namespace MWWorld
 {
     void GroundcoverStore::init(const Store<ESM::Static>& statics, const Files::Collections& fileCollections,
diff --git a/apps/openmw/mwworld/groundcoverstore.hpp b/apps/openmw/mwworld/groundcoverstore.hpp
index ffeb111134..d955f731fc 100644
--- a/apps/openmw/mwworld/groundcoverstore.hpp
+++ b/apps/openmw/mwworld/groundcoverstore.hpp
@@ -5,14 +5,33 @@
 #include <string>
 #include <map>
 
-#include <components/esm3/esmreader.hpp>
-#include <components/esmloader/esmdata.hpp>
-#include <components/files/collections.hpp>
+namespace ESM
+{
+    struct ESM_Context;
+    struct Static;
+    struct Cell;
+}
 
-#include "esmstore.hpp"
+namespace Loading
+{
+    class Listener;
+}
+
+namespace Files
+{
+    class Collections;
+}
+
+namespace ToUTF8
+{
+    class Utf8Encoder;
+}
 
 namespace MWWorld
 {
+    template <class T>
+    class Store;
+
     class GroundcoverStore
     {
         private:

From 1a5932a6690583ae104aceb6b3950fbb890fe1f6 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 26 Jun 2022 19:36:03 +0200
Subject: [PATCH 2691/2859] Move std::ostream& operator<< to .cpp

---
 apps/openmw/mwmechanics/aiwander.cpp          |   2 +
 apps/openmw/mwmechanics/pathfinding.cpp       |   3 +
 apps/openmw/mwworld/scene.cpp                 |   1 -
 apps/openmw/mwworld/worldimp.cpp              |   2 +
 components/bullethelpers/debug.hpp            |  70 +++++++
 components/bullethelpers/operators.hpp        |  65 +------
 components/detournavigator/areatype.hpp       |  15 --
 .../detournavigator/asyncnavmeshupdater.cpp   |  12 ++
 .../detournavigator/asyncnavmeshupdater.hpp   |  12 +-
 components/detournavigator/changetype.hpp     |  18 --
 components/detournavigator/debug.cpp          | 179 ++++++++++++++++++
 components/detournavigator/debug.hpp          |  99 ++++------
 components/detournavigator/dtstatus.hpp       |  38 ----
 components/detournavigator/findsmoothpath.hpp |   2 -
 components/detournavigator/flags.hpp          |  50 -----
 .../detournavigator/navmeshcacheitem.cpp      |  29 ++-
 .../detournavigator/navmeshcacheitem.hpp      |  29 +--
 components/detournavigator/navmeshmanager.cpp |   2 +
 components/sceneutil/detourdebugdraw.cpp      |   4 -
 19 files changed, 337 insertions(+), 295 deletions(-)
 create mode 100644 components/bullethelpers/debug.hpp
 delete mode 100644 components/detournavigator/dtstatus.hpp

diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 0bd424785b..f6c46945b1 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -2,6 +2,8 @@
 
 #include <algorithm>
 
+#include <osg/Matrixf>
+
 #include <components/debug/debuglog.hpp>
 #include <components/misc/rng.hpp>
 #include <components/esm3/aisequence.hpp>
diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp
index 4f4c35bb40..9a75585cc1 100644
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@@ -3,7 +3,10 @@
 #include <iterator>
 #include <limits>
 
+#include <osg/io_utils>
+
 #include <components/detournavigator/navigatorutils.hpp>
+#include <components/detournavigator/debug.hpp>
 #include <components/debug/debuglog.hpp>
 #include <components/misc/coordinateconverter.hpp>
 #include <components/misc/math.hpp>
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 57eec9d2dd..f23c086827 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -14,7 +14,6 @@
 #include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/detournavigator/navigator.hpp>
-#include <components/detournavigator/debug.hpp>
 #include <components/misc/convert.hpp>
 #include <components/detournavigator/heightfieldshape.hpp>
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 628ac60727..bd89bca0df 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -6,6 +6,8 @@
 
 #include <MyGUI_TextIterator.h>
 
+#include <LinearMath/btAabbUtil2.h>
+
 #include <components/debug/debuglog.hpp>
 
 #include <components/esm3/esmreader.hpp>
diff --git a/components/bullethelpers/debug.hpp b/components/bullethelpers/debug.hpp
new file mode 100644
index 0000000000..564616043d
--- /dev/null
+++ b/components/bullethelpers/debug.hpp
@@ -0,0 +1,70 @@
+#ifndef OPENMW_COMPONENTS_BULLETHELPERS_DEBUG_H
+#define OPENMW_COMPONENTS_BULLETHELPERS_DEBUG_H
+
+#include <iomanip>
+#include <limits>
+#include <ostream>
+
+#include <BulletCollision/BroadphaseCollision/btBroadphaseProxy.h>
+
+#include <LinearMath/btVector3.h>
+
+inline std::ostream& operator <<(std::ostream& stream, const btVector3& value)
+{
+    return stream << "btVector3(" << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.x()
+                  << ", " << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.y()
+                  << ", " << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.z()
+                  << ')';
+}
+
+inline std::ostream& operator <<(std::ostream& stream, BroadphaseNativeTypes value)
+{
+    switch (value)
+    {
+#ifndef SHAPE_NAME
+#define SHAPE_NAME(name) case name: return stream << #name;
+        SHAPE_NAME(BOX_SHAPE_PROXYTYPE)
+        SHAPE_NAME(TRIANGLE_SHAPE_PROXYTYPE)
+        SHAPE_NAME(TETRAHEDRAL_SHAPE_PROXYTYPE)
+        SHAPE_NAME(CONVEX_TRIANGLEMESH_SHAPE_PROXYTYPE)
+        SHAPE_NAME(CONVEX_HULL_SHAPE_PROXYTYPE)
+        SHAPE_NAME(CONVEX_POINT_CLOUD_SHAPE_PROXYTYPE)
+        SHAPE_NAME(CUSTOM_POLYHEDRAL_SHAPE_TYPE)
+        SHAPE_NAME(IMPLICIT_CONVEX_SHAPES_START_HERE)
+        SHAPE_NAME(SPHERE_SHAPE_PROXYTYPE)
+        SHAPE_NAME(MULTI_SPHERE_SHAPE_PROXYTYPE)
+        SHAPE_NAME(CAPSULE_SHAPE_PROXYTYPE)
+        SHAPE_NAME(CONE_SHAPE_PROXYTYPE)
+        SHAPE_NAME(CONVEX_SHAPE_PROXYTYPE)
+        SHAPE_NAME(CYLINDER_SHAPE_PROXYTYPE)
+        SHAPE_NAME(UNIFORM_SCALING_SHAPE_PROXYTYPE)
+        SHAPE_NAME(MINKOWSKI_SUM_SHAPE_PROXYTYPE)
+        SHAPE_NAME(MINKOWSKI_DIFFERENCE_SHAPE_PROXYTYPE)
+        SHAPE_NAME(BOX_2D_SHAPE_PROXYTYPE)
+        SHAPE_NAME(CONVEX_2D_SHAPE_PROXYTYPE)
+        SHAPE_NAME(CUSTOM_CONVEX_SHAPE_TYPE)
+        SHAPE_NAME(CONCAVE_SHAPES_START_HERE)
+        SHAPE_NAME(TRIANGLE_MESH_SHAPE_PROXYTYPE)
+        SHAPE_NAME(SCALED_TRIANGLE_MESH_SHAPE_PROXYTYPE)
+        SHAPE_NAME(FAST_CONCAVE_MESH_PROXYTYPE)
+        SHAPE_NAME(TERRAIN_SHAPE_PROXYTYPE)
+        SHAPE_NAME(GIMPACT_SHAPE_PROXYTYPE)
+        SHAPE_NAME(MULTIMATERIAL_TRIANGLE_MESH_PROXYTYPE)
+        SHAPE_NAME(EMPTY_SHAPE_PROXYTYPE)
+        SHAPE_NAME(STATIC_PLANE_PROXYTYPE)
+        SHAPE_NAME(CUSTOM_CONCAVE_SHAPE_TYPE)
+        SHAPE_NAME(CONCAVE_SHAPES_END_HERE)
+        SHAPE_NAME(COMPOUND_SHAPE_PROXYTYPE)
+        SHAPE_NAME(SOFTBODY_SHAPE_PROXYTYPE)
+        SHAPE_NAME(HFFLUID_SHAPE_PROXYTYPE)
+        SHAPE_NAME(HFFLUID_BUOYANT_CONVEX_SHAPE_PROXYTYPE)
+        SHAPE_NAME(INVALID_SHAPE_PROXYTYPE)
+        SHAPE_NAME(MAX_BROADPHASE_COLLISION_TYPES)
+#undef SHAPE_NAME
+#endif
+        default:
+            return stream << "undefined(" << static_cast<int>(value) << ")";
+    }
+}
+
+#endif
diff --git a/components/bullethelpers/operators.hpp b/components/bullethelpers/operators.hpp
index 1f5aa55425..f1e52938db 100644
--- a/components/bullethelpers/operators.hpp
+++ b/components/bullethelpers/operators.hpp
@@ -1,73 +1,10 @@
 #ifndef OPENMW_COMPONENTS_BULLETHELPERS_OPERATORS_H
 #define OPENMW_COMPONENTS_BULLETHELPERS_OPERATORS_H
 
-#include <iomanip>
-#include <limits>
-#include <ostream>
 #include <tuple>
 
-#include <BulletCollision/BroadphaseCollision/btBroadphaseProxy.h>
-
+#include <LinearMath/btVector3.h>
 #include <LinearMath/btTransform.h>
-#include <LinearMath/btAabbUtil2.h>
-
-inline std::ostream& operator <<(std::ostream& stream, const btVector3& value)
-{
-    return stream << "btVector3(" << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.x()
-                  << ", " << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.y()
-                  << ", " << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.z()
-                  << ')';
-}
-
-inline std::ostream& operator <<(std::ostream& stream, BroadphaseNativeTypes value)
-{
-    switch (value)
-    {
-#ifndef SHAPE_NAME
-#define SHAPE_NAME(name) case name: return stream << #name;
-        SHAPE_NAME(BOX_SHAPE_PROXYTYPE)
-        SHAPE_NAME(TRIANGLE_SHAPE_PROXYTYPE)
-        SHAPE_NAME(TETRAHEDRAL_SHAPE_PROXYTYPE)
-        SHAPE_NAME(CONVEX_TRIANGLEMESH_SHAPE_PROXYTYPE)
-        SHAPE_NAME(CONVEX_HULL_SHAPE_PROXYTYPE)
-        SHAPE_NAME(CONVEX_POINT_CLOUD_SHAPE_PROXYTYPE)
-        SHAPE_NAME(CUSTOM_POLYHEDRAL_SHAPE_TYPE)
-        SHAPE_NAME(IMPLICIT_CONVEX_SHAPES_START_HERE)
-        SHAPE_NAME(SPHERE_SHAPE_PROXYTYPE)
-        SHAPE_NAME(MULTI_SPHERE_SHAPE_PROXYTYPE)
-        SHAPE_NAME(CAPSULE_SHAPE_PROXYTYPE)
-        SHAPE_NAME(CONE_SHAPE_PROXYTYPE)
-        SHAPE_NAME(CONVEX_SHAPE_PROXYTYPE)
-        SHAPE_NAME(CYLINDER_SHAPE_PROXYTYPE)
-        SHAPE_NAME(UNIFORM_SCALING_SHAPE_PROXYTYPE)
-        SHAPE_NAME(MINKOWSKI_SUM_SHAPE_PROXYTYPE)
-        SHAPE_NAME(MINKOWSKI_DIFFERENCE_SHAPE_PROXYTYPE)
-        SHAPE_NAME(BOX_2D_SHAPE_PROXYTYPE)
-        SHAPE_NAME(CONVEX_2D_SHAPE_PROXYTYPE)
-        SHAPE_NAME(CUSTOM_CONVEX_SHAPE_TYPE)
-        SHAPE_NAME(CONCAVE_SHAPES_START_HERE)
-        SHAPE_NAME(TRIANGLE_MESH_SHAPE_PROXYTYPE)
-        SHAPE_NAME(SCALED_TRIANGLE_MESH_SHAPE_PROXYTYPE)
-        SHAPE_NAME(FAST_CONCAVE_MESH_PROXYTYPE)
-        SHAPE_NAME(TERRAIN_SHAPE_PROXYTYPE)
-        SHAPE_NAME(GIMPACT_SHAPE_PROXYTYPE)
-        SHAPE_NAME(MULTIMATERIAL_TRIANGLE_MESH_PROXYTYPE)
-        SHAPE_NAME(EMPTY_SHAPE_PROXYTYPE)
-        SHAPE_NAME(STATIC_PLANE_PROXYTYPE)
-        SHAPE_NAME(CUSTOM_CONCAVE_SHAPE_TYPE)
-        SHAPE_NAME(CONCAVE_SHAPES_END_HERE)
-        SHAPE_NAME(COMPOUND_SHAPE_PROXYTYPE)
-        SHAPE_NAME(SOFTBODY_SHAPE_PROXYTYPE)
-        SHAPE_NAME(HFFLUID_SHAPE_PROXYTYPE)
-        SHAPE_NAME(HFFLUID_BUOYANT_CONVEX_SHAPE_PROXYTYPE)
-        SHAPE_NAME(INVALID_SHAPE_PROXYTYPE)
-        SHAPE_NAME(MAX_BROADPHASE_COLLISION_TYPES)
-#undef SHAPE_NAME
-#endif
-        default:
-            return stream << "undefined(" << static_cast<int>(value) << ")";
-    }
-}
 
 inline bool operator <(const btVector3& lhs, const btVector3& rhs)
 {
diff --git a/components/detournavigator/areatype.hpp b/components/detournavigator/areatype.hpp
index 125b7ed7b9..9d99421af0 100644
--- a/components/detournavigator/areatype.hpp
+++ b/components/detournavigator/areatype.hpp
@@ -3,8 +3,6 @@
 
 #include <Recast.h>
 
-#include <ostream>
-
 namespace DetourNavigator
 {
     enum AreaType : unsigned char
@@ -23,19 +21,6 @@ namespace DetourNavigator
         float mPathgrid = 1.0f;
         float mGround = 1.0f;
     };
-
-    inline std::ostream& operator<<(std::ostream& stream, AreaType value)
-    {
-        switch (value)
-        {
-            case AreaType_null: return stream << "null";
-            case AreaType_water: return stream << "water";
-            case AreaType_door: return stream << "door";
-            case AreaType_pathgrid: return stream << "pathgrid";
-            case AreaType_ground: return stream << "ground";
-        }
-        return stream << "unknown area type (" << static_cast<std::underlying_type_t<AreaType>>(value) << ")";
-    }
 }
 
 #endif
diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index b9424e406a..e6b07d3f36 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -16,6 +16,7 @@
 #include <DetourNavMesh.h>
 
 #include <osg/Stats>
+#include <osg/io_utils>
 
 #include <algorithm>
 #include <numeric>
@@ -112,6 +113,17 @@ namespace DetourNavigator
         }
     }
 
+    std::ostream& operator<<(std::ostream& stream, JobStatus value)
+    {
+        switch (value)
+        {
+            case JobStatus::Done: return stream << "JobStatus::Done";
+            case JobStatus::Fail: return stream << "JobStatus::Fail";
+            case JobStatus::MemoryCacheMiss: return stream << "JobStatus::MemoryCacheMiss";
+        }
+        return stream << "JobStatus::" << static_cast<std::underlying_type_t<JobState>>(value);
+    }
+
     Job::Job(const AgentBounds& agentBounds, std::weak_ptr<GuardedNavMeshCacheItem> navMeshCacheItem,
         std::string_view worldspace, const TilePosition& changedTile, ChangeType changeType, int distanceToPlayer,
         std::chrono::steady_clock::time_point processTime)
diff --git a/components/detournavigator/asyncnavmeshupdater.hpp b/components/detournavigator/asyncnavmeshupdater.hpp
index d0850f0249..abdd235678 100644
--- a/components/detournavigator/asyncnavmeshupdater.hpp
+++ b/components/detournavigator/asyncnavmeshupdater.hpp
@@ -24,6 +24,7 @@
 #include <tuple>
 #include <list>
 #include <optional>
+#include <iosfwd>
 
 class dtNavMesh;
 
@@ -72,16 +73,7 @@ namespace DetourNavigator
         MemoryCacheMiss,
     };
 
-    inline std::ostream& operator<<(std::ostream& stream, JobStatus value)
-    {
-        switch (value)
-        {
-            case JobStatus::Done: return stream << "JobStatus::Done";
-            case JobStatus::Fail: return stream << "JobStatus::Fail";
-            case JobStatus::MemoryCacheMiss: return stream << "JobStatus::MemoryCacheMiss";
-        }
-        return stream << "JobStatus::" << static_cast<std::underlying_type_t<JobState>>(value);
-    }
+    std::ostream& operator<<(std::ostream& stream, JobStatus value);
 
     class DbJobQueue
     {
diff --git a/components/detournavigator/changetype.hpp b/components/detournavigator/changetype.hpp
index 1ede6aec13..15b3056e55 100644
--- a/components/detournavigator/changetype.hpp
+++ b/components/detournavigator/changetype.hpp
@@ -1,8 +1,6 @@
 #ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_CHANGETYPE_H
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_CHANGETYPE_H
 
-#include <ostream>
-
 namespace DetourNavigator
 {
     enum class ChangeType
@@ -12,22 +10,6 @@ namespace DetourNavigator
         add = 2,
         update = 3,
     };
-
-    inline std::ostream& operator <<(std::ostream& stream, ChangeType value)
-    {
-        switch (value)
-        {
-            case ChangeType::remove:
-                return stream << "ChangeType::remove";
-            case ChangeType::mixed:
-                return stream << "ChangeType::mixed";
-            case ChangeType::add:
-                return stream << "ChangeType::add";
-            case ChangeType::update:
-                return stream << "ChangeType::update";
-        }
-        return stream << "ChangeType::" << static_cast<int>(value);
-    }
 }
 
 #endif
diff --git a/components/detournavigator/debug.cpp b/components/detournavigator/debug.cpp
index 0ddd27da5e..c76e2bc562 100644
--- a/components/detournavigator/debug.cpp
+++ b/components/detournavigator/debug.cpp
@@ -4,13 +4,192 @@
 #include "settings.hpp"
 #include "settingsutils.hpp"
 
+#include <components/bullethelpers/operators.hpp>
+
 #include <DetourNavMesh.h>
+#include <DetourStatus.h>
+
+#include <osg/io_utils>
 
 #include <filesystem>
 #include <fstream>
+#include <ostream>
+#include <array>
+#include <string_view>
 
 namespace DetourNavigator
 {
+    std::ostream& operator<<(std::ostream& stream, const TileBounds& value)
+    {
+        return stream << "TileBounds {" << value.mMin << ", " << value.mMax << "}";
+    }
+
+    std::ostream& operator<<(std::ostream& stream, Status value)
+    {
+#define OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE(name) \
+    case Status::name: return stream << "DetourNavigator::Status::"#name;
+        switch (value)
+        {
+            OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE(Success)
+            OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE(PartialPath)
+            OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE(NavMeshNotFound)
+            OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE(StartPolygonNotFound)
+            OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE(EndPolygonNotFound)
+            OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE(MoveAlongSurfaceFailed)
+            OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE(FindPathOverPolygonsFailed)
+            OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE(GetPolyHeightFailed)
+            OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE(InitNavMeshQueryFailed)
+        }
+#undef OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE
+        return stream << "DetourNavigator::Error::" << static_cast<int>(value);
+    }
+
+    std::ostream& operator<<(std::ostream& s, const Water& v)
+    {
+        return s << "Water {" << v.mCellSize << ", " << v.mLevel << "}";
+    }
+
+    std::ostream& operator<<(std::ostream& s, const CellWater& v)
+    {
+        return s << "CellWater {" << v.mCellPosition << ", " << v.mWater << "}";
+    }
+
+    std::ostream& operator<<(std::ostream& s, const FlatHeightfield& v)
+    {
+        return s << "FlatHeightfield {" << v.mCellPosition << ", " << v.mCellSize << ", " << v.mHeight << "}";
+    }
+
+    std::ostream& operator<<(std::ostream& s, const Heightfield& v)
+    {
+        s << "Heightfield {.mCellPosition=" << v.mCellPosition
+          << ", .mCellSize=" << v.mCellSize
+          << ", .mLength=" << static_cast<int>(v.mLength)
+          << ", .mMinHeight=" << v.mMinHeight
+          << ", .mMaxHeight=" << v.mMaxHeight
+          << ", .mHeights={";
+        for (float h : v.mHeights)
+            s << h << ", ";
+        s << "}";
+        return s << ", .mOriginalSize=" << v.mOriginalSize << "}";
+    }
+
+    std::ostream& operator<<(std::ostream& s, CollisionShapeType v)
+    {
+        switch (v)
+        {
+            case CollisionShapeType::Aabb: return s << "AgentShapeType::Aabb";
+            case CollisionShapeType::RotatingBox: return s << "AgentShapeType::RotatingBox";
+        }
+        return s << "AgentShapeType::" << static_cast<std::underlying_type_t<CollisionShapeType>>(v);
+    }
+
+    std::ostream& operator<<(std::ostream& s, const AgentBounds& v)
+    {
+        return s << "AgentBounds {" << v.mShapeType << ", " << v.mHalfExtents << "}";
+    }
+
+    namespace
+    {
+        struct StatusString
+        {
+            dtStatus mStatus;
+            std::string_view mString;
+        };
+    }
+
+    static constexpr std::array dtStatuses {
+        StatusString {DT_FAILURE, "DT_FAILURE"},
+        StatusString {DT_SUCCESS, "DT_SUCCESS"},
+        StatusString {DT_IN_PROGRESS, "DT_IN_PROGRESS"},
+        StatusString {DT_WRONG_MAGIC, "DT_WRONG_MAGIC"},
+        StatusString {DT_WRONG_VERSION, "DT_WRONG_VERSION"},
+        StatusString {DT_OUT_OF_MEMORY, "DT_OUT_OF_MEMORY"},
+        StatusString {DT_INVALID_PARAM, "DT_INVALID_PARAM"},
+        StatusString {DT_BUFFER_TOO_SMALL, "DT_BUFFER_TOO_SMALL"},
+        StatusString {DT_OUT_OF_NODES, "DT_OUT_OF_NODES"},
+        StatusString {DT_PARTIAL_RESULT, "DT_PARTIAL_RESULT"},
+    };
+
+    std::ostream& operator<<(std::ostream& stream, const WriteDtStatus& value)
+    {
+        for (const auto& status : dtStatuses)
+            if (value.mStatus & status.mStatus)
+                stream << status.mString;
+        return stream;
+    }
+
+    std::ostream& operator<<(std::ostream& stream, const Flag value)
+    {
+        switch (value)
+        {
+            case Flag_none:
+                return stream << "none";
+            case Flag_walk:
+                return stream << "walk";
+            case Flag_swim:
+                return stream << "swim";
+            case Flag_openDoor:
+                return stream << "openDoor";
+            case Flag_usePathgrid:
+                return stream << "usePathgrid";
+        }
+
+        return stream;
+    }
+
+    std::ostream& operator<<(std::ostream& stream, const WriteFlags& value)
+    {
+        if (value.mValue == Flag_none)
+        {
+            return stream << Flag_none;
+        }
+        else
+        {
+            bool first = true;
+            for (const auto flag : {Flag_walk, Flag_swim, Flag_openDoor, Flag_usePathgrid})
+            {
+                if (value.mValue & flag)
+                {
+                    if (!first)
+                        stream << " | ";
+                    first = false;
+                    stream << flag;
+                }
+            }
+
+            return stream;
+        }
+    }
+
+    std::ostream& operator<<(std::ostream& stream, AreaType value)
+    {
+        switch (value)
+        {
+            case AreaType_null: return stream << "null";
+            case AreaType_water: return stream << "water";
+            case AreaType_door: return stream << "door";
+            case AreaType_pathgrid: return stream << "pathgrid";
+            case AreaType_ground: return stream << "ground";
+        }
+        return stream << "unknown area type (" << static_cast<std::underlying_type_t<AreaType>>(value) << ")";
+    }
+
+    std::ostream& operator<<(std::ostream& stream, ChangeType value)
+    {
+        switch (value)
+        {
+            case ChangeType::remove:
+                return stream << "ChangeType::remove";
+            case ChangeType::mixed:
+                return stream << "ChangeType::mixed";
+            case ChangeType::add:
+                return stream << "ChangeType::add";
+            case ChangeType::update:
+                return stream << "ChangeType::update";
+        }
+        return stream << "ChangeType::" << static_cast<int>(value);
+    }
+
     void writeToFile(const RecastMesh& recastMesh, const std::string& pathPrefix,
         const std::string& revision, const RecastSettings& settings)
     {
diff --git a/components/detournavigator/debug.hpp b/components/detournavigator/debug.hpp
index 091e49821c..818be0616c 100644
--- a/components/detournavigator/debug.hpp
+++ b/components/detournavigator/debug.hpp
@@ -5,85 +5,54 @@
 #include "status.hpp"
 #include "recastmesh.hpp"
 #include "agentbounds.hpp"
+#include "flags.hpp"
+#include "areatype.hpp"
+#include "changetype.hpp"
 
-#include <osg/io_utils>
-
-#include <components/bullethelpers/operators.hpp>
+#include <DetourStatus.h>
 
 #include <string>
+#include <iosfwd>
 
 class dtNavMesh;
 
 namespace DetourNavigator
 {
-    inline std::ostream& operator <<(std::ostream& stream, const TileBounds& value)
-    {
-        return stream << "TileBounds {" << value.mMin << ", " << value.mMax << "}";
-    }
+    std::ostream& operator<<(std::ostream& stream, const TileBounds& value);
 
-    inline std::ostream& operator <<(std::ostream& stream, Status value)
-    {
-#define OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE(name) \
-    case Status::name: return stream << "DetourNavigator::Status::"#name;
-        switch (value)
-        {
-            OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE(Success)
-            OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE(PartialPath)
-            OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE(NavMeshNotFound)
-            OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE(StartPolygonNotFound)
-            OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE(EndPolygonNotFound)
-            OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE(MoveAlongSurfaceFailed)
-            OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE(FindPathOverPolygonsFailed)
-            OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE(GetPolyHeightFailed)
-            OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE(InitNavMeshQueryFailed)
-        }
-#undef OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE
-        return stream << "DetourNavigator::Error::" << static_cast<int>(value);
-    }
-
-    inline std::ostream& operator<<(std::ostream& s, const Water& v)
-    {
-        return s << "Water {" << v.mCellSize << ", " << v.mLevel << "}";
-    }
+    std::ostream& operator<<(std::ostream& stream, Status value);
 
-    inline std::ostream& operator<<(std::ostream& s, const CellWater& v)
-    {
-        return s << "CellWater {" << v.mCellPosition << ", " << v.mWater << "}";
-    }
+    std::ostream& operator<<(std::ostream& s, const Water& v);
 
-    inline std::ostream& operator<<(std::ostream& s, const FlatHeightfield& v)
-    {
-        return s << "FlatHeightfield {" << v.mCellPosition << ", " << v.mCellSize << ", " << v.mHeight << "}";
-    }
+    std::ostream& operator<<(std::ostream& s, const CellWater& v);
 
-    inline std::ostream& operator<<(std::ostream& s, const Heightfield& v)
-    {
-        s << "Heightfield {.mCellPosition=" << v.mCellPosition
-          << ", .mCellSize=" << v.mCellSize
-          << ", .mLength=" << static_cast<int>(v.mLength)
-          << ", .mMinHeight=" << v.mMinHeight
-          << ", .mMaxHeight=" << v.mMaxHeight
-          << ", .mHeights={";
-        for (float h : v.mHeights)
-            s << h << ", ";
-        s << "}";
-        return s << ", .mOriginalSize=" << v.mOriginalSize << "}";
-    }
-
-    inline std::ostream& operator<<(std::ostream& s, CollisionShapeType v)
+    std::ostream& operator<<(std::ostream& s, const FlatHeightfield& v);
+
+    std::ostream& operator<<(std::ostream& s, const Heightfield& v);
+
+    std::ostream& operator<<(std::ostream& s, CollisionShapeType v);
+
+    std::ostream& operator<<(std::ostream& s, const AgentBounds& v);
+
+    struct WriteDtStatus
     {
-        switch (v)
-        {
-            case CollisionShapeType::Aabb: return s << "AgentShapeType::Aabb";
-            case CollisionShapeType::RotatingBox: return s << "AgentShapeType::RotatingBox";
-        }
-        return s << "AgentShapeType::" << static_cast<std::underlying_type_t<CollisionShapeType>>(v);
-    }
-
-    inline std::ostream& operator<<(std::ostream& s, const AgentBounds& v)
+        dtStatus mStatus;
+    };
+
+    std::ostream& operator<<(std::ostream& stream, const WriteDtStatus& value);
+
+    std::ostream& operator<<(std::ostream& stream, const Flag value);
+
+    struct WriteFlags
     {
-        return s << "AgentBounds {" << v.mShapeType << ", " << v.mHalfExtents << "}";
-    }
+        Flags mValue;
+    };
+
+    std::ostream& operator<<(std::ostream& stream, const WriteFlags& value);
+
+    std::ostream& operator<<(std::ostream& stream, AreaType value);
+
+    std::ostream& operator<<(std::ostream& stream, ChangeType value);
 
     class RecastMesh;
     struct RecastSettings;
diff --git a/components/detournavigator/dtstatus.hpp b/components/detournavigator/dtstatus.hpp
deleted file mode 100644
index a73d33be1e..0000000000
--- a/components/detournavigator/dtstatus.hpp
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_DTSTATUS_H
-#define OPENMW_COMPONENTS_DETOURNAVIGATOR_DTSTATUS_H
-
-#include <DetourStatus.h>
-
-#include <sstream>
-#include <vector>
-
-namespace DetourNavigator
-{
-    struct WriteDtStatus
-    {
-        dtStatus status;
-    };
-
-    static const std::vector<std::pair<const dtStatus, const char* const>> dtStatuses {
-        {DT_FAILURE, "DT_FAILURE"},
-        {DT_SUCCESS, "DT_SUCCESS"},
-        {DT_IN_PROGRESS, "DT_IN_PROGRESS"},
-        {DT_WRONG_MAGIC, "DT_WRONG_MAGIC"},
-        {DT_WRONG_VERSION, "DT_WRONG_VERSION"},
-        {DT_OUT_OF_MEMORY, "DT_OUT_OF_MEMORY"},
-        {DT_INVALID_PARAM, "DT_INVALID_PARAM"},
-        {DT_BUFFER_TOO_SMALL, "DT_BUFFER_TOO_SMALL"},
-        {DT_OUT_OF_NODES, "DT_OUT_OF_NODES"},
-        {DT_PARTIAL_RESULT, "DT_PARTIAL_RESULT"},
-    };
-
-    inline std::ostream& operator <<(std::ostream& stream, const WriteDtStatus& value)
-    {
-        for (const auto& status : dtStatuses)
-            if (value.status & status.first)
-                stream << status.second << " ";
-        return stream;
-    }
-}
-
-#endif
diff --git a/components/detournavigator/findsmoothpath.hpp b/components/detournavigator/findsmoothpath.hpp
index fa35470c42..aade62ad62 100644
--- a/components/detournavigator/findsmoothpath.hpp
+++ b/components/detournavigator/findsmoothpath.hpp
@@ -1,12 +1,10 @@
 #ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_FINDSMOOTHPATH_H
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_FINDSMOOTHPATH_H
 
-#include "dtstatus.hpp"
 #include "exceptions.hpp"
 #include "flags.hpp"
 #include "settings.hpp"
 #include "settingsutils.hpp"
-#include "debug.hpp"
 #include "status.hpp"
 #include "areatype.hpp"
 
diff --git a/components/detournavigator/flags.hpp b/components/detournavigator/flags.hpp
index 887fd42640..981895ca94 100644
--- a/components/detournavigator/flags.hpp
+++ b/components/detournavigator/flags.hpp
@@ -1,8 +1,6 @@
 #ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_FLAGS_H
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_FLAGS_H
 
-#include <ostream>
-
 namespace DetourNavigator
 {
     using Flags = unsigned short;
@@ -15,54 +13,6 @@ namespace DetourNavigator
         Flag_openDoor = 1 << 2,
         Flag_usePathgrid = 1 << 3,
     };
-
-    inline std::ostream& operator <<(std::ostream& stream, const Flag value)
-    {
-        switch (value)
-        {
-            case Flag_none:
-                return stream << "none";
-            case Flag_walk:
-                return stream << "walk";
-            case Flag_swim:
-                return stream << "swim";
-            case Flag_openDoor:
-                return stream << "openDoor";
-            case Flag_usePathgrid:
-                return stream << "usePathgrid";
-        }
-
-        return stream;
-    }
-
-    struct WriteFlags
-    {
-        Flags mValue;
-
-        friend inline std::ostream& operator <<(std::ostream& stream, const WriteFlags& value)
-        {
-            if (value.mValue == Flag_none)
-            {
-                return stream << Flag_none;
-            }
-            else
-            {
-                bool first = true;
-                for (const auto flag : {Flag_walk, Flag_swim, Flag_openDoor, Flag_usePathgrid})
-                {
-                    if (value.mValue & flag)
-                    {
-                        if (!first)
-                            stream << " | ";
-                        first = false;
-                        stream << flag;
-                    }
-                }
-
-                return stream;
-            }
-        }
-    };
 }
 
 #endif
diff --git a/components/detournavigator/navmeshcacheitem.cpp b/components/detournavigator/navmeshcacheitem.cpp
index ffcb0a7359..41a177a367 100644
--- a/components/detournavigator/navmeshcacheitem.cpp
+++ b/components/detournavigator/navmeshcacheitem.cpp
@@ -1,6 +1,5 @@
 #include "tileposition.hpp"
 #include "navmeshtilescache.hpp"
-#include "dtstatus.hpp"
 #include "navmeshtileview.hpp"
 #include "navmeshcacheitem.hpp"
 #include "navmeshdata.hpp"
@@ -9,6 +8,8 @@
 
 #include <DetourNavMesh.h>
 
+#include <ostream>
+
 namespace
 {
     using DetourNavigator::TilePosition;
@@ -35,6 +36,32 @@ namespace
 
 namespace DetourNavigator
 {
+    std::ostream& operator<<(std::ostream& stream, UpdateNavMeshStatus value)
+    {
+        switch (value)
+        {
+            case UpdateNavMeshStatus::ignored:
+                return stream << "ignore";
+            case UpdateNavMeshStatus::removed:
+                return stream << "removed";
+            case UpdateNavMeshStatus::added:
+                return stream << "add";
+            case UpdateNavMeshStatus::replaced:
+                return stream << "replaced";
+            case UpdateNavMeshStatus::failed:
+                return stream << "failed";
+            case UpdateNavMeshStatus::lost:
+                return stream << "lost";
+            case UpdateNavMeshStatus::cached:
+                return stream << "cached";
+            case UpdateNavMeshStatus::unchanged:
+                return stream << "unchanged";
+            case UpdateNavMeshStatus::restored:
+                return stream << "restored";
+        }
+        return stream << "unknown(" << static_cast<unsigned>(value) << ")";
+    }
+
     const dtMeshTile* getTile(const dtNavMesh& navMesh, const TilePosition& position)
     {
         const int layer = 0;
diff --git a/components/detournavigator/navmeshcacheitem.hpp b/components/detournavigator/navmeshcacheitem.hpp
index ae4a2de66b..97ad68f1c7 100644
--- a/components/detournavigator/navmeshcacheitem.hpp
+++ b/components/detournavigator/navmeshcacheitem.hpp
@@ -4,14 +4,13 @@
 #include "sharednavmesh.hpp"
 #include "tileposition.hpp"
 #include "navmeshtilescache.hpp"
-#include "dtstatus.hpp"
 #include "navmeshdata.hpp"
 #include "version.hpp"
 
 #include <components/misc/guarded.hpp>
 
 #include <map>
-#include <ostream>
+#include <iosfwd>
 #include <set>
 
 struct dtMeshTile;
@@ -36,31 +35,7 @@ namespace DetourNavigator
         return (static_cast<unsigned>(value) & static_cast<unsigned>(UpdateNavMeshStatus::failed)) == 0;
     }
 
-    inline std::ostream& operator <<(std::ostream& stream, UpdateNavMeshStatus value)
-    {
-        switch (value)
-        {
-            case UpdateNavMeshStatus::ignored:
-                return stream << "ignore";
-            case UpdateNavMeshStatus::removed:
-                return stream << "removed";
-            case UpdateNavMeshStatus::added:
-                return stream << "add";
-            case UpdateNavMeshStatus::replaced:
-                return stream << "replaced";
-            case UpdateNavMeshStatus::failed:
-                return stream << "failed";
-            case UpdateNavMeshStatus::lost:
-                return stream << "lost";
-            case UpdateNavMeshStatus::cached:
-                return stream << "cached";
-            case UpdateNavMeshStatus::unchanged:
-                return stream << "unchanged";
-            case UpdateNavMeshStatus::restored:
-                return stream << "restored";
-        }
-        return stream << "unknown(" << static_cast<unsigned>(value) << ")";
-    }
+    std::ostream& operator<<(std::ostream& stream, UpdateNavMeshStatus value);
 
     class UpdateNavMeshStatusBuilder
     {
diff --git a/components/detournavigator/navmeshmanager.cpp b/components/detournavigator/navmeshmanager.cpp
index ccab20a5aa..672741e089 100644
--- a/components/detournavigator/navmeshmanager.cpp
+++ b/components/detournavigator/navmeshmanager.cpp
@@ -11,6 +11,8 @@
 #include <components/bullethelpers/heightfield.hpp>
 #include <components/misc/convert.hpp>
 
+#include <osg/io_utils>
+
 #include <DetourNavMesh.h>
 
 #include <iterator>
diff --git a/components/sceneutil/detourdebugdraw.cpp b/components/sceneutil/detourdebugdraw.cpp
index f1325340ea..62e7ea71c0 100644
--- a/components/sceneutil/detourdebugdraw.cpp
+++ b/components/sceneutil/detourdebugdraw.cpp
@@ -1,16 +1,12 @@
 #include "detourdebugdraw.hpp"
 #include "util.hpp"
 
-#include <components/detournavigator/debug.hpp>
-
 #include <osg/BlendFunc>
 #include <osg/Group>
 #include <osg/LineWidth>
 
 namespace
 {
-    using DetourNavigator::operator<<;
-
     osg::PrimitiveSet::Mode toOsgPrimitiveSetMode(duDebugDrawPrimitives value)
     {
         switch (value)

From 81ec7e80bbbdb5f7ecfa0869d70d06dafe2c5bda Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 27 Jun 2022 19:13:17 +0200
Subject: [PATCH 2692/2859] Use string_view in Layout and remove dead code

---
 apps/openmw/mwgui/layout.cpp     | 37 +++++++++++++++-----------------
 apps/openmw/mwgui/layout.hpp     | 19 +++++++++-------
 apps/openmw/mwgui/windowbase.cpp |  6 +++---
 apps/openmw/mwgui/windowbase.hpp |  6 +++---
 4 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/apps/openmw/mwgui/layout.cpp b/apps/openmw/mwgui/layout.cpp
index 9ac39f9a00..0f2af30a60 100644
--- a/apps/openmw/mwgui/layout.cpp
+++ b/apps/openmw/mwgui/layout.cpp
@@ -8,29 +8,24 @@
 
 namespace MWGui
 {
-    void Layout::initialise(const std::string& _layout, MyGUI::Widget* _parent)
+    void Layout::initialise(std::string_view _layout)
     {
-        const std::string MAIN_WINDOW = "_Main";
+        const auto MAIN_WINDOW = "_Main";
         mLayoutName = _layout;
 
-        if (mLayoutName.empty())
-            mMainWidget = _parent;
-        else
-        {
-            mPrefix = MyGUI::utility::toString(this, "_");
-            mListWindowRoot = MyGUI::LayoutManager::getInstance().loadLayout(mLayoutName, mPrefix, _parent);
+        mPrefix = MyGUI::utility::toString(this, "_");
+        mListWindowRoot = MyGUI::LayoutManager::getInstance().loadLayout(mLayoutName, mPrefix);
 
-            const std::string main_name = mPrefix + MAIN_WINDOW;
-            for (MyGUI::Widget* widget : mListWindowRoot)
-            {
-                if (widget->getName() == main_name)
-                    mMainWidget = widget;
+        const std::string main_name = mPrefix + MAIN_WINDOW;
+        for (MyGUI::Widget* widget : mListWindowRoot)
+        {
+            if (widget->getName() == main_name)
+                mMainWidget = widget;
 
-                // Force the alignment to update immediately
-                widget->_setAlign(widget->getSize(), widget->getParentSize());
-            }
-            MYGUI_ASSERT(mMainWidget, "root widget name '" << MAIN_WINDOW << "' in layout '" << mLayoutName << "' not found.");
+            // Force the alignment to update immediately
+            widget->_setAlign(widget->getSize(), widget->getParentSize());
         }
+        MYGUI_ASSERT(mMainWidget, "root widget name '" << MAIN_WINDOW << "' in layout '" << mLayoutName << "' not found.");
     }
 
     void Layout::shutdown()
@@ -50,7 +45,7 @@ namespace MWGui
         mMainWidget->setVisible(b);
     }
 
-    void Layout::setText(const std::string &name, const std::string &caption)
+    void Layout::setText(std::string_view name, const std::string &caption)
     {
         MyGUI::Widget* pt;
         getWidget(pt, name);
@@ -65,11 +60,13 @@ namespace MWGui
             window->setCaptionWithReplacing(title);
     }
 
-    MyGUI::Widget* Layout::getWidget(const std::string &_name)
+    MyGUI::Widget* Layout::getWidget(std::string_view _name)
     {
+        std::string target = mPrefix;
+        target += _name;
         for (MyGUI::Widget* widget : mListWindowRoot)
         {
-            MyGUI::Widget* find = widget->findWidget(mPrefix + _name);
+            MyGUI::Widget* find = widget->findWidget(target);
             if (nullptr != find)
             {
                 return find;
diff --git a/apps/openmw/mwgui/layout.hpp b/apps/openmw/mwgui/layout.hpp
index 39dfc99bf3..f0fd633ee2 100644
--- a/apps/openmw/mwgui/layout.hpp
+++ b/apps/openmw/mwgui/layout.hpp
@@ -2,6 +2,7 @@
 #define OPENMW_MWGUI_LAYOUT_H
 
 #include <string>
+#include <string_view>
 
 #include <MyGUI_Widget.h>
 
@@ -15,9 +16,12 @@ namespace MWGui
   class Layout
   {
   public:
-    Layout(const std::string & _layout, MyGUI::Widget* _parent = nullptr)
-      : mMainWidget(nullptr)
-    { initialise(_layout, _parent); }
+    Layout(std::string_view layout) : mMainWidget(nullptr)
+    {
+      initialise(layout);
+      assert(mMainWidget);
+    }
+
     virtual ~Layout()
     {
         try
@@ -30,10 +34,10 @@ namespace MWGui
         }
     }
 
-    MyGUI::Widget* getWidget(const std::string& _name);
+    MyGUI::Widget* getWidget(std::string_view name);
 
     template <typename T>
-    void getWidget(T * & _widget, const std::string & _name)
+    void getWidget(T * & _widget, std::string_view _name)
     {
         MyGUI::Widget* w = getWidget(_name);
         T* cast = w->castType<T>(false);
@@ -48,8 +52,7 @@ namespace MWGui
     }
 
   private:
-    void initialise(const std::string & _layout,
-                    MyGUI::Widget* _parent = nullptr);
+    void initialise(std::string_view layout);
 
     void shutdown();
 
@@ -58,7 +61,7 @@ namespace MWGui
 
     virtual void setVisible(bool b);
 
-    void setText(const std::string& name, const std::string& caption);
+    void setText(std::string_view name, const std::string& caption);
 
     // NOTE: this assume that mMainWidget is of type Window.
     void setTitle(const std::string& title);
diff --git a/apps/openmw/mwgui/windowbase.cpp b/apps/openmw/mwgui/windowbase.cpp
index 84e557fcdc..9e476e4dab 100644
--- a/apps/openmw/mwgui/windowbase.cpp
+++ b/apps/openmw/mwgui/windowbase.cpp
@@ -14,7 +14,7 @@
 
 using namespace MWGui;
 
-WindowBase::WindowBase(const std::string& parLayout)
+WindowBase::WindowBase(std::string_view parLayout)
   : Layout(parLayout)
 {
     mMainWidget->setVisible(false);
@@ -139,12 +139,12 @@ void NoDrop::setAlpha(float alpha)
         mWidget->setAlpha(alpha);
 }
 
-BookWindowBase::BookWindowBase(const std::string& parLayout)
+BookWindowBase::BookWindowBase(std::string_view parLayout)
   : WindowBase(parLayout)
 {
 }
 
-float BookWindowBase::adjustButton (char const * name)
+float BookWindowBase::adjustButton(std::string_view name)
 {
     Gui::ImageButton* button;
     WindowBase::getWidget (button, name);
diff --git a/apps/openmw/mwgui/windowbase.hpp b/apps/openmw/mwgui/windowbase.hpp
index 395bb8414f..dde9190666 100644
--- a/apps/openmw/mwgui/windowbase.hpp
+++ b/apps/openmw/mwgui/windowbase.hpp
@@ -15,7 +15,7 @@ namespace MWGui
     class WindowBase: public Layout
     {
     public:
-        WindowBase(const std::string& parLayout);
+        WindowBase(std::string_view parLayout);
 
         virtual MyGUI::Widget* getDefaultKeyFocus() { return nullptr; }
 
@@ -88,10 +88,10 @@ namespace MWGui
     class BookWindowBase : public WindowBase
     {
     public:
-        BookWindowBase(const std::string& parLayout);
+        BookWindowBase(std::string_view parLayout);
 
     protected:
-        float adjustButton (char const * name);
+        float adjustButton(std::string_view name);
     };
 }
 

From d0deb37f5cc03f9cf5318ecd9923998795b52199 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Tue, 21 Jun 2022 22:28:17 +0200
Subject: [PATCH 2693/2859] Fix several issues with sky blending

---
 apps/openmw/mwrender/sky.cpp        | 14 ++++++++------
 components/shader/shadervisitor.cpp | 17 +++++++++++++++++
 components/shader/shadervisitor.hpp |  3 +++
 files/shaders/fog.glsl              | 11 ++++++++++-
 files/shaders/objects_fragment.glsl |  6 +++++-
 5 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index 7a37a69a3d..c850c1ad8a 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -232,6 +232,7 @@ namespace
             camera->setReferenceFrame(osg::Camera::RELATIVE_RF);
             camera->setName("SkyCamera");
             camera->setNodeMask(MWRender::Mask_RenderToTexture);
+            camera->setCullMask(MWRender::Mask_Sky);
             camera->addChild(mEarlyRenderBinRoot);
             SceneUtil::ShadowManager::disableShadowsForStateSet(camera->getOrCreateStateSet());
         }
@@ -283,25 +284,26 @@ namespace MWRender
         if (!mSceneManager->getForceShaders())
             skyroot->getOrCreateStateSet()->setAttributeAndModes(new osg::Program(), osg::StateAttribute::OVERRIDE|osg::StateAttribute::PROTECTED|osg::StateAttribute::ON);
         SceneUtil::ShadowManager::disableShadowsForStateSet(skyroot->getOrCreateStateSet());
-
-        skyroot->setNodeMask(Mask_Sky);
         parentNode->addChild(skyroot);
 
-        mRootNode = skyroot;
-
         mEarlyRenderBinRoot = new osg::Group;
         // render before the world is rendered
         mEarlyRenderBinRoot->getOrCreateStateSet()->setRenderBinDetails(RenderBin_Sky, "RenderBin");
         // Prevent unwanted clipping by water reflection camera's clipping plane
         mEarlyRenderBinRoot->getOrCreateStateSet()->setMode(GL_CLIP_PLANE0, osg::StateAttribute::OFF);
-        mRootNode->addChild(mEarlyRenderBinRoot);
 
         if (enableSkyRTT)
         {
             mSkyRTT = new SkyRTT(Settings::Manager::getVector2("sky rtt resolution", "Fog"), mEarlyRenderBinRoot);
-            mRootNode->addChild(mSkyRTT);
+            skyroot->addChild(mSkyRTT);
+            mRootNode = new osg::Group;
+            skyroot->addChild(mRootNode);
         }
+        else
+            mRootNode = skyroot;
 
+        mRootNode->setNodeMask(Mask_Sky);
+        mRootNode->addChild(mEarlyRenderBinRoot);
         mUnderwaterSwitch = new UnderwaterSwitchCallback(skyroot);
     }
 
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index b1b657daa1..9896879fec 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -5,6 +5,7 @@
 #include <set>
 
 #include <osg/AlphaFunc>
+#include <osg/BlendFunc>
 #include <osg/Geometry>
 #include <osg/GLExtensions>
 #include <osg/Material>
@@ -195,6 +196,8 @@ namespace Shader
         , mAlphaFunc(GL_ALWAYS)
         , mAlphaRef(1.0)
         , mAlphaBlend(false)
+        , mBlendFuncOverridden(false)
+        , mAdditiveBlending(false)
         , mNormalHeight(false)
         , mTexStageRequiringTangents(-1)
         , mSoftParticles(false)
@@ -517,6 +520,18 @@ namespace Shader
                         mRequirements.back().mAlphaRef = alpha->getReferenceValue();
                     }
                 }
+                else if (it->first.first == osg::StateAttribute::BLENDFUNC)
+                {
+                    if (!mRequirements.back().mBlendFuncOverridden || it->second.second & osg::StateAttribute::PROTECTED)
+                    {
+                        if (it->second.second & osg::StateAttribute::OVERRIDE)
+                            mRequirements.back().mBlendFuncOverridden = true;
+
+                        const osg::BlendFunc* blend = static_cast<const osg::BlendFunc*>(it->second.first.get());
+                        mRequirements.back().mAdditiveBlending =
+                            blend->getSource() == osg::BlendFunc::SRC_ALPHA && blend->getDestination() == osg::BlendFunc::ONE;
+                    }
+                }
             }
         }
 
@@ -604,6 +619,8 @@ namespace Shader
 
         defineMap["alphaFunc"] = std::to_string(reqs.mAlphaFunc);
 
+        defineMap["additiveBlending"] = reqs.mAdditiveBlending ? "1" : "0";
+
         osg::ref_ptr<osg::StateSet> removedState;
         if ((removedState = getRemovedState(*writableStateSet)) && !mAllowedToModifyStateSets)
             removedState = new osg::StateSet(*removedState, osg::CopyOp::SHALLOW_COPY);
diff --git a/components/shader/shadervisitor.hpp b/components/shader/shadervisitor.hpp
index 3ddcd9815f..68deef6586 100644
--- a/components/shader/shadervisitor.hpp
+++ b/components/shader/shadervisitor.hpp
@@ -102,6 +102,9 @@ namespace Shader
             float mAlphaRef;
             bool mAlphaBlend;
 
+            bool mBlendFuncOverridden;
+            bool mAdditiveBlending;
+
             bool mNormalHeight; // true if normal map has height info in alpha channel
 
             // -1 == no tangents required
diff --git a/files/shaders/fog.glsl b/files/shaders/fog.glsl
index d327d6a345..7a56179399 100644
--- a/files/shaders/fog.glsl
+++ b/files/shaders/fog.glsl
@@ -17,12 +17,21 @@ vec4 applyFogAtDist(vec4 color, float euclideanDist, float linearDist)
 #else
     float fogValue = clamp((dist - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);
 #endif
+#ifdef ADDITIVE_BLENDING
+    color.xyz *= 1 - fogValue;
+#else
     color.xyz = mix(color.xyz, gl_Fog.color.xyz, fogValue);
+#endif
 
 #if @skyBlending && !@useOVR_multiview
     float fadeValue = clamp((far - dist) / (far - skyBlendingStart), 0.0, 1.0);
+    fadeValue *= fadeValue;
+#ifdef ADDITIVE_BLENDING
+    color.xyz *= fadeValue;
+#else
     vec3 skyColor = texture2D(sky, gl_FragCoord.xy / screenRes).xyz;
-    color.xyz = mix(skyColor, color.xyz, fadeValue * fadeValue);
+    color.xyz = mix(skyColor, color.xyz, fadeValue);
+#endif
 #endif
 
     return color;
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index 6ebc7cbd62..613785fdd8 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -77,6 +77,10 @@ uniform float specStrength;
 varying vec3 passViewPos;
 varying vec3 passNormal;
 
+#if @additiveBlending
+#define ADDITIVE_BLENDING
+#endif
+
 #include "vertexcolors.glsl"
 #include "shadows_fragment.glsl"
 #include "lighting.glsl"
@@ -188,7 +192,7 @@ void main()
 
 #endif
 
-    float shadowing = unshadowedLightRatio(passViewPos.z);
+    float shadowing = unshadowedLightRatio(-passViewPos.z);
     vec3 lighting;
 #if !PER_PIXEL_LIGHTING
     lighting = passLighting + shadowDiffuseLighting * shadowing;

From cfe6a7d78bbccffb4c0912754e26295c4c32530a Mon Sep 17 00:00:00 2001
From: Mick McCuen <503geek@gmail.com>
Date: Tue, 28 Jun 2022 16:42:20 +0000
Subject: [PATCH 2694/2859] Update
 docs/source/manuals/installation/install-game-files.rst

---
 .../manuals/installation/install-game-files.rst      | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/docs/source/manuals/installation/install-game-files.rst b/docs/source/manuals/installation/install-game-files.rst
index 2af7946536..57460c4983 100644
--- a/docs/source/manuals/installation/install-game-files.rst
+++ b/docs/source/manuals/installation/install-game-files.rst
@@ -80,6 +80,18 @@ Afterwards, you can point OpenMW to the Steam install location at
 ``C:\Program Files\Steam\SteamApps\common\Morrowind\Data Files\``
 and find ``Morrowind.esm`` there.
 
+XBox Game Pass for PC
+---------------------
+
+Default Morrowind Game Pass files are in a restricted WindowsApps folder 
+that OpenMW cannot scan for content files in the usual way.
+However, in the Xbox App for PC, inside the Manage game settings
+(three-dots menu-> Manage), there is an option to enable advanced
+management options (or similar phrasing) for Morrowind. Choose this
+option and the app will prompt you to move the Morrowind files to a
+new folder. Once done you can find ``Morrowind.esm`` in the folder you 
+chose.
+
 macOS
 -----
 

From ce263af3936f90d31fdf682ce8dbc155970244e6 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 29 Jun 2022 00:32:11 +0200
Subject: [PATCH 2695/2859] Use existing functions and objects to call
 correctMeshPath etc

Remove WindowManager wrappers.

It's not safe to use WindowManager in all places and it's not required.
Environment stores resource system providing VFS required to call these
functions. In the case of ObjectPaging it's available from the member variable.
Also ObjectPaging::createChunk may access WindowManager when it's already
destructed when exiting the game because it's destructed before CellPreloader
finishes all background jobs. Engine::mResourceSystem is destructed after all
other systems so it's safe to use it.
---
 apps/openmw/mwbase/windowmanager.hpp      |  6 -----
 apps/openmw/mwclass/activator.cpp         | 12 +++------
 apps/openmw/mwclass/apparatus.cpp         | 10 +++-----
 apps/openmw/mwclass/armor.cpp             | 10 +++-----
 apps/openmw/mwclass/bodypart.cpp          | 11 ++-------
 apps/openmw/mwclass/book.cpp              | 10 +++-----
 apps/openmw/mwclass/classmodel.hpp        | 29 ++++++++++++++++++++++
 apps/openmw/mwclass/clothing.cpp          | 10 +++-----
 apps/openmw/mwclass/container.cpp         | 10 +++-----
 apps/openmw/mwclass/creature.cpp          | 13 ++++------
 apps/openmw/mwclass/door.cpp              | 10 +++-----
 apps/openmw/mwclass/ingredient.cpp        | 10 +++-----
 apps/openmw/mwclass/light.cpp             | 10 +++-----
 apps/openmw/mwclass/lockpick.cpp          | 10 +++-----
 apps/openmw/mwclass/misc.cpp              | 10 +++-----
 apps/openmw/mwclass/npc.cpp               | 13 ++++++----
 apps/openmw/mwclass/potion.cpp            | 10 +++-----
 apps/openmw/mwclass/probe.cpp             | 10 +++-----
 apps/openmw/mwclass/repair.cpp            | 10 +++-----
 apps/openmw/mwclass/static.cpp            | 11 ++-------
 apps/openmw/mwclass/weapon.cpp            | 10 +++-----
 apps/openmw/mwgui/birth.cpp               |  6 ++++-
 apps/openmw/mwgui/class.cpp               |  8 ++++--
 apps/openmw/mwgui/hud.cpp                 |  4 ++-
 apps/openmw/mwgui/itemwidget.cpp          |  8 +++---
 apps/openmw/mwgui/quickkeysmenu.cpp       |  4 ++-
 apps/openmw/mwgui/spellcreationdialog.cpp |  5 +++-
 apps/openmw/mwgui/spellicons.cpp          |  5 +++-
 apps/openmw/mwgui/tooltips.cpp            |  9 ++++---
 apps/openmw/mwgui/widgets.cpp             |  5 +++-
 apps/openmw/mwgui/windowmanagerimp.cpp    | 21 ----------------
 apps/openmw/mwgui/windowmanagerimp.hpp    |  6 -----
 apps/openmw/mwmechanics/activespells.cpp  |  7 ++++--
 apps/openmw/mwmechanics/actors.cpp        | 11 +++++++--
 apps/openmw/mwmechanics/character.cpp     |  7 ++++--
 apps/openmw/mwmechanics/spellcasting.cpp  | 16 ++++++++----
 apps/openmw/mwmechanics/spelleffects.cpp  | 11 +++++++--
 apps/openmw/mwmechanics/spellutil.cpp     |  1 -
 apps/openmw/mwmechanics/summoning.cpp     |  7 ++++--
 apps/openmw/mwrender/actoranimation.cpp   |  5 ++--
 apps/openmw/mwrender/npcanimation.cpp     | 30 ++++++++++++++---------
 apps/openmw/mwrender/objectpaging.cpp     |  5 ++--
 apps/openmw/mwworld/groundcoverstore.cpp  |  9 ++++---
 apps/openmw/mwworld/projectilemanager.cpp | 14 ++++++++---
 apps/openmw/mwworld/worldimp.cpp          |  9 ++++---
 45 files changed, 222 insertions(+), 226 deletions(-)
 create mode 100644 apps/openmw/mwclass/classmodel.hpp

diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index 2d7c2299a6..a65ccd6932 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -337,12 +337,6 @@ namespace MWBase
 
             virtual void playSound(const std::string& soundId, float volume = 1.f, float pitch = 1.f) = 0;
 
-            // In WindowManager for now since there isn't a VFS singleton
-            virtual std::string correctIconPath(const std::string& path) = 0;
-            virtual std::string correctTexturePath(const std::string& path) = 0;
-            virtual std::string correctMeshPath(const std::string& path) = 0;
-            virtual bool textureExists(const std::string& path) = 0;
-
             virtual void addCell(MWWorld::CellStore* cell) = 0;
             virtual void removeCell(MWWorld::CellStore* cell) = 0;
             virtual void writeFog(MWWorld::CellStore* cell) = 0;
diff --git a/apps/openmw/mwclass/activator.cpp b/apps/openmw/mwclass/activator.cpp
index e50b3cca85..4937ca3b03 100644
--- a/apps/openmw/mwclass/activator.cpp
+++ b/apps/openmw/mwclass/activator.cpp
@@ -27,6 +27,7 @@
 
 #include "../mwmechanics/npcstats.hpp"
 
+#include "classmodel.hpp"
 
 namespace MWClass
 {
@@ -56,13 +57,7 @@ namespace MWClass
 
     std::string Activator::getModel(const MWWorld::ConstPtr &ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Activator> *ref = ptr.get<ESM::Activator>();
-
-        const std::string &model = ref->mBase->mModel;
-        if (!model.empty()) {
-            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
-        }
-        return "";
+        return getClassModel<ESM::Activator>(ptr);
     }
 
     bool Activator::isActivator() const
@@ -142,11 +137,12 @@ namespace MWClass
         const std::string model = getModel(ptr); // Assume it's not empty, since we wouldn't have gotten the soundgen otherwise
         const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore(); 
         std::string creatureId;
+        const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
 
         for (const ESM::Creature &iter : store.get<ESM::Creature>())
         {
             if (!iter.mModel.empty() && Misc::StringUtils::ciEqual(model,
-                MWBase::Environment::get().getWindowManager()->correctMeshPath(iter.mModel)))
+                Misc::ResourceHelpers::correctMeshPath(iter.mModel, vfs)))
             {
                 creatureId = !iter.mOriginal.empty() ? iter.mOriginal : iter.mId;
                 break;
diff --git a/apps/openmw/mwclass/apparatus.cpp b/apps/openmw/mwclass/apparatus.cpp
index 07dac3e2d7..39dd864f99 100644
--- a/apps/openmw/mwclass/apparatus.cpp
+++ b/apps/openmw/mwclass/apparatus.cpp
@@ -18,6 +18,8 @@
 
 #include "../mwgui/tooltips.hpp"
 
+#include "classmodel.hpp"
+
 namespace MWClass
 {
     Apparatus::Apparatus()
@@ -34,13 +36,7 @@ namespace MWClass
 
     std::string Apparatus::getModel(const MWWorld::ConstPtr &ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Apparatus> *ref = ptr.get<ESM::Apparatus>();
-
-        const std::string &model = ref->mBase->mModel;
-        if (!model.empty()) {
-            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
-        }
-        return "";
+        return getClassModel<ESM::Apparatus>(ptr);
     }
 
     std::string Apparatus::getName (const MWWorld::ConstPtr& ptr) const
diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index d2b5c096cb..2fb6ecba34 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -26,6 +26,8 @@
 
 #include "../mwgui/tooltips.hpp"
 
+#include "classmodel.hpp"
+
 namespace MWClass
 {
     Armor::Armor()
@@ -42,13 +44,7 @@ namespace MWClass
 
     std::string Armor::getModel(const MWWorld::ConstPtr &ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Armor> *ref = ptr.get<ESM::Armor>();
-
-        const std::string &model = ref->mBase->mModel;
-        if (!model.empty()) {
-            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
-        }
-        return "";
+        return getClassModel<ESM::Armor>(ptr);
     }
 
     std::string Armor::getName (const MWWorld::ConstPtr& ptr) const
diff --git a/apps/openmw/mwclass/bodypart.cpp b/apps/openmw/mwclass/bodypart.cpp
index bd32784a7d..d9438f80c1 100644
--- a/apps/openmw/mwclass/bodypart.cpp
+++ b/apps/openmw/mwclass/bodypart.cpp
@@ -5,8 +5,7 @@
 
 #include "../mwworld/cellstore.hpp"
 
-#include "../mwbase/environment.hpp"
-#include "../mwbase/windowmanager.hpp"
+#include "classmodel.hpp"
 
 namespace MWClass
 {
@@ -41,13 +40,7 @@ namespace MWClass
 
     std::string BodyPart::getModel(const MWWorld::ConstPtr &ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::BodyPart> *ref = ptr.get<ESM::BodyPart>();
-
-        const std::string &model = ref->mBase->mModel;
-        if (!model.empty()) {
-            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
-        }
-        return "";
+        return getClassModel<ESM::BodyPart>(ptr);
     }
 
 }
diff --git a/apps/openmw/mwclass/book.cpp b/apps/openmw/mwclass/book.cpp
index c057182187..75648a1180 100644
--- a/apps/openmw/mwclass/book.cpp
+++ b/apps/openmw/mwclass/book.cpp
@@ -23,6 +23,8 @@
 
 #include "../mwmechanics/npcstats.hpp"
 
+#include "classmodel.hpp"
+
 namespace MWClass
 {
     Book::Book()
@@ -39,13 +41,7 @@ namespace MWClass
 
     std::string Book::getModel(const MWWorld::ConstPtr &ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Book> *ref = ptr.get<ESM::Book>();
-
-        const std::string &model = ref->mBase->mModel;
-        if (!model.empty()) {
-            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
-        }
-        return "";
+        return getClassModel<ESM::Book>(ptr);
     }
 
     std::string Book::getName (const MWWorld::ConstPtr& ptr) const
diff --git a/apps/openmw/mwclass/classmodel.hpp b/apps/openmw/mwclass/classmodel.hpp
new file mode 100644
index 0000000000..3f5997cf4d
--- /dev/null
+++ b/apps/openmw/mwclass/classmodel.hpp
@@ -0,0 +1,29 @@
+#ifndef OPENMW_MWCLASS_CLASSMODEL_H
+#define OPENMW_MWCLASS_CLASSMODEL_H
+
+#include "../mwbase/environment.hpp"
+
+#include "../mwworld/ptr.hpp"
+#include "../mwworld/livecellref.hpp"
+
+#include <components/misc/resourcehelpers.hpp>
+#include <components/resource/resourcesystem.hpp>
+
+#include <string>
+
+namespace MWClass
+{
+    template <class Class>
+    std::string getClassModel(const MWWorld::ConstPtr& ptr)
+    {
+        const MWWorld::LiveCellRef<Class> *ref = ptr.get<Class>();
+
+        if (!ref->mBase->mModel.empty())
+            return Misc::ResourceHelpers::correctMeshPath(ref->mBase->mModel,
+                MWBase::Environment::get().getResourceSystem()->getVFS());
+
+        return {};
+    }
+}
+
+#endif
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index 0a922b30af..c20a7dae22 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -21,6 +21,8 @@
 #include "../mwrender/objects.hpp"
 #include "../mwrender/renderinginterface.hpp"
 
+#include "classmodel.hpp"
+
 namespace MWClass
 {
     Clothing::Clothing()
@@ -37,13 +39,7 @@ namespace MWClass
 
     std::string Clothing::getModel(const MWWorld::ConstPtr &ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Clothing> *ref = ptr.get<ESM::Clothing>();
-
-        const std::string &model = ref->mBase->mModel;
-        if (!model.empty()) {
-            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
-        }
-        return "";
+        return getClassModel<ESM::Clothing>(ptr);
     }
 
     std::string Clothing::getName (const MWWorld::ConstPtr& ptr) const
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index 38c55cdd52..63b511cadd 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -30,6 +30,8 @@
 #include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/inventory.hpp"
 
+#include "classmodel.hpp"
+
 namespace MWClass
 {
     ContainerCustomData::ContainerCustomData(const ESM::Container& container, MWWorld::CellStore* cell)
@@ -119,13 +121,7 @@ namespace MWClass
 
     std::string Container::getModel(const MWWorld::ConstPtr &ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Container> *ref = ptr.get<ESM::Container>();
-
-        const std::string &model = ref->mBase->mModel;
-        if (!model.empty()) {
-            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
-        }
-        return "";
+        return getClassModel<ESM::Container>(ptr);
     }
 
     bool Container::useAnim() const
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index b587fdf146..620315d0a3 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -41,6 +41,8 @@
 
 #include "../mwgui/tooltips.hpp"
 
+#include "classmodel.hpp"
+
 namespace
 {
     bool isFlagBitSet(const MWWorld::ConstPtr &ptr, ESM::Creature::Flags bitMask)
@@ -182,13 +184,7 @@ namespace MWClass
 
     std::string Creature::getModel(const MWWorld::ConstPtr &ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Creature> *ref = ptr.get<ESM::Creature>();
-
-        const std::string &model = ref->mBase->mModel;
-        if (!model.empty()) {
-            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
-        }
-        return "";
+        return getClassModel<ESM::Creature>(ptr);
     }
 
     void Creature::getModelsToPreload(const MWWorld::Ptr &ptr, std::vector<std::string> &models) const
@@ -625,11 +621,12 @@ namespace MWClass
             const std::string model = getModel(ptr);
             if (!model.empty())
             {
+                const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
                 for (const ESM::Creature &creature : store.get<ESM::Creature>())
                 {
                     if (creature.mId != ourId && creature.mOriginal != ourId && !creature.mModel.empty()
                         && Misc::StringUtils::ciEqual(model,
-                            MWBase::Environment::get().getWindowManager()->correctMeshPath(creature.mModel)))
+                            Misc::ResourceHelpers::correctMeshPath(creature.mModel, vfs)))
                     {
                         const std::string& fallbackId = !creature.mOriginal.empty() ? creature.mOriginal : creature.mId;
                         sound = store.get<ESM::SoundGenerator>().begin();
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index 23e492bec4..1a8c01571d 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -32,6 +32,8 @@
 
 #include "../mwmechanics/actorutil.hpp"
 
+#include "classmodel.hpp"
+
 namespace MWClass
 {
     class DoorCustomData : public MWWorld::TypedCustomData<DoorCustomData>
@@ -95,13 +97,7 @@ namespace MWClass
 
     std::string Door::getModel(const MWWorld::ConstPtr &ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Door> *ref = ptr.get<ESM::Door>();
-
-        const std::string &model = ref->mBase->mModel;
-        if (!model.empty()) {
-            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
-        }
-        return "";
+        return getClassModel<ESM::Door>(ptr);
     }
 
     std::string Door::getName (const MWWorld::ConstPtr& ptr) const
diff --git a/apps/openmw/mwclass/ingredient.cpp b/apps/openmw/mwclass/ingredient.cpp
index 1996e1742e..bd830dc6b7 100644
--- a/apps/openmw/mwclass/ingredient.cpp
+++ b/apps/openmw/mwclass/ingredient.cpp
@@ -20,6 +20,8 @@
 #include "../mwrender/objects.hpp"
 #include "../mwrender/renderinginterface.hpp"
 
+#include "classmodel.hpp"
+
 namespace MWClass
 {
     Ingredient::Ingredient()
@@ -36,13 +38,7 @@ namespace MWClass
 
     std::string Ingredient::getModel(const MWWorld::ConstPtr &ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Ingredient> *ref = ptr.get<ESM::Ingredient>();
-
-        const std::string &model = ref->mBase->mModel;
-        if (!model.empty()) {
-            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
-        }
-        return "";
+        return getClassModel<ESM::Ingredient>(ptr);
     }
 
     std::string Ingredient::getName (const MWWorld::ConstPtr& ptr) const
diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index 3b1cb19068..564775b5d2 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -23,6 +23,8 @@
 #include "../mwrender/objects.hpp"
 #include "../mwrender/renderinginterface.hpp"
 
+#include "classmodel.hpp"
+
 namespace MWClass
 {
     Light::Light()
@@ -67,13 +69,7 @@ namespace MWClass
 
     std::string Light::getModel(const MWWorld::ConstPtr &ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Light> *ref = ptr.get<ESM::Light>();
-
-        const std::string &model = ref->mBase->mModel;
-        if (!model.empty()) {
-            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
-        }
-        return "";
+        return getClassModel<ESM::Light>(ptr);
     }
 
     std::string Light::getName (const MWWorld::ConstPtr& ptr) const
diff --git a/apps/openmw/mwclass/lockpick.cpp b/apps/openmw/mwclass/lockpick.cpp
index ff23535145..ee32e2945c 100644
--- a/apps/openmw/mwclass/lockpick.cpp
+++ b/apps/openmw/mwclass/lockpick.cpp
@@ -20,6 +20,8 @@
 #include "../mwrender/objects.hpp"
 #include "../mwrender/renderinginterface.hpp"
 
+#include "classmodel.hpp"
+
 namespace MWClass
 {
     Lockpick::Lockpick()
@@ -36,13 +38,7 @@ namespace MWClass
 
     std::string Lockpick::getModel(const MWWorld::ConstPtr &ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Lockpick> *ref = ptr.get<ESM::Lockpick>();
-
-        const std::string &model = ref->mBase->mModel;
-        if (!model.empty()) {
-            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
-        }
-        return "";
+        return getClassModel<ESM::Lockpick>(ptr);
     }
 
     std::string Lockpick::getName (const MWWorld::ConstPtr& ptr) const
diff --git a/apps/openmw/mwclass/misc.cpp b/apps/openmw/mwclass/misc.cpp
index 10fada6dbb..be5cf9c143 100644
--- a/apps/openmw/mwclass/misc.cpp
+++ b/apps/openmw/mwclass/misc.cpp
@@ -21,6 +21,8 @@
 #include "../mwrender/objects.hpp"
 #include "../mwrender/renderinginterface.hpp"
 
+#include "classmodel.hpp"
+
 namespace MWClass
 {
     Miscellaneous::Miscellaneous()
@@ -46,13 +48,7 @@ namespace MWClass
 
     std::string Miscellaneous::getModel(const MWWorld::ConstPtr &ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Miscellaneous> *ref = ptr.get<ESM::Miscellaneous>();
-
-        const std::string &model = ref->mBase->mModel;
-        if (!model.empty()) {
-            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
-        }
-        return "";
+        return getClassModel<ESM::Miscellaneous>(ptr);
     }
 
     std::string Miscellaneous::getName (const MWWorld::ConstPtr& ptr) const
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 5f2ce00690..1baff60455 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -6,6 +6,7 @@
 
 #include <components/misc/constants.hpp>
 #include <components/misc/rng.hpp>
+#include <components/misc/resourcehelpers.hpp>
 
 #include <components/debug/debuglog.hpp>
 #include <components/esm3/loadmgef.hpp>
@@ -449,20 +450,22 @@ namespace MWClass
         models.emplace_back(Settings::Manager::getString("xbaseanimfemale", "Models"));
         models.emplace_back(Settings::Manager::getString("xbaseanim", "Models"));
 
+        const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+
         if (!npc->mBase->mModel.empty())
-            models.push_back(MWBase::Environment::get().getWindowManager()->correctMeshPath(npc->mBase->mModel));
+            models.push_back(Misc::ResourceHelpers::correctMeshPath(npc->mBase->mModel, vfs));
 
         if (!npc->mBase->mHead.empty())
         {
             const ESM::BodyPart* head = MWBase::Environment::get().getWorld()->getStore().get<ESM::BodyPart>().search(npc->mBase->mHead);
             if (head)
-                models.push_back(MWBase::Environment::get().getWindowManager()->correctMeshPath(head->mModel));
+                models.push_back(Misc::ResourceHelpers::correctMeshPath(head->mModel, vfs));
         }
         if (!npc->mBase->mHair.empty())
         {
             const ESM::BodyPart* hair = MWBase::Environment::get().getWorld()->getStore().get<ESM::BodyPart>().search(npc->mBase->mHair);
             if (hair)
-                models.push_back(MWBase::Environment::get().getWindowManager()->correctMeshPath(hair->mModel));
+                models.push_back(Misc::ResourceHelpers::correctMeshPath(hair->mModel, vfs));
         }
 
         bool female = (npc->mBase->mFlags & ESM::NPC::Female);
@@ -500,7 +503,7 @@ namespace MWClass
                         partname = female ? it->mMale : it->mFemale;
                     const ESM::BodyPart* part = MWBase::Environment::get().getWorld()->getStore().get<ESM::BodyPart>().search(partname);
                     if (part && !part->mModel.empty())
-                        models.push_back(MWBase::Environment::get().getWindowManager()->correctMeshPath(part->mModel));
+                        models.push_back(Misc::ResourceHelpers::correctMeshPath(part->mModel, vfs));
                 }
             }
         }
@@ -513,7 +516,7 @@ namespace MWClass
             {
                 const ESM::BodyPart* part = *it;
                 if (part && !part->mModel.empty())
-                    models.push_back(MWBase::Environment::get().getWindowManager()->correctMeshPath(part->mModel));
+                    models.push_back(Misc::ResourceHelpers::correctMeshPath(part->mModel, vfs));
             }
         }
 
diff --git a/apps/openmw/mwclass/potion.cpp b/apps/openmw/mwclass/potion.cpp
index 20f4c3bcce..6e3bf24a5b 100644
--- a/apps/openmw/mwclass/potion.cpp
+++ b/apps/openmw/mwclass/potion.cpp
@@ -22,6 +22,8 @@
 
 #include "../mwmechanics/alchemy.hpp"
 
+#include "classmodel.hpp"
+
 namespace MWClass
 {
     Potion::Potion()
@@ -38,13 +40,7 @@ namespace MWClass
 
     std::string Potion::getModel(const MWWorld::ConstPtr &ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Potion> *ref = ptr.get<ESM::Potion>();
-
-        const std::string &model = ref->mBase->mModel;
-        if (!model.empty()) {
-            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
-        }
-        return "";
+        return getClassModel<ESM::Potion>(ptr);
     }
 
     std::string Potion::getName (const MWWorld::ConstPtr& ptr) const
diff --git a/apps/openmw/mwclass/probe.cpp b/apps/openmw/mwclass/probe.cpp
index ea90c1e78c..e3b22514d5 100644
--- a/apps/openmw/mwclass/probe.cpp
+++ b/apps/openmw/mwclass/probe.cpp
@@ -20,6 +20,8 @@
 #include "../mwrender/objects.hpp"
 #include "../mwrender/renderinginterface.hpp"
 
+#include "classmodel.hpp"
+
 namespace MWClass
 {
     Probe::Probe()
@@ -36,13 +38,7 @@ namespace MWClass
 
     std::string Probe::getModel(const MWWorld::ConstPtr &ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Probe> *ref = ptr.get<ESM::Probe>();
-
-        const std::string &model = ref->mBase->mModel;
-        if (!model.empty()) {
-            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
-        }
-        return "";
+        return getClassModel<ESM::Probe>(ptr);
     }
 
     std::string Probe::getName (const MWWorld::ConstPtr& ptr) const
diff --git a/apps/openmw/mwclass/repair.cpp b/apps/openmw/mwclass/repair.cpp
index 6a23c43303..9da2f7775f 100644
--- a/apps/openmw/mwclass/repair.cpp
+++ b/apps/openmw/mwclass/repair.cpp
@@ -17,6 +17,8 @@
 #include "../mwrender/objects.hpp"
 #include "../mwrender/renderinginterface.hpp"
 
+#include "classmodel.hpp"
+
 namespace MWClass
 {
     Repair::Repair()
@@ -33,13 +35,7 @@ namespace MWClass
 
     std::string Repair::getModel(const MWWorld::ConstPtr &ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Repair> *ref = ptr.get<ESM::Repair>();
-
-        const std::string &model = ref->mBase->mModel;
-        if (!model.empty()) {
-            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
-        }
-        return "";
+        return getClassModel<ESM::Repair>(ptr);
     }
 
     std::string Repair::getName (const MWWorld::ConstPtr& ptr) const
diff --git a/apps/openmw/mwclass/static.cpp b/apps/openmw/mwclass/static.cpp
index 27b04481ad..f587199237 100644
--- a/apps/openmw/mwclass/static.cpp
+++ b/apps/openmw/mwclass/static.cpp
@@ -11,8 +11,7 @@
 #include "../mwrender/renderinginterface.hpp"
 #include "../mwrender/vismask.hpp"
 
-#include "../mwbase/environment.hpp"
-#include "../mwbase/windowmanager.hpp"
+#include "classmodel.hpp"
 
 namespace MWClass
 {
@@ -42,13 +41,7 @@ namespace MWClass
 
     std::string Static::getModel(const MWWorld::ConstPtr &ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Static> *ref = ptr.get<ESM::Static>();
-
-        const std::string &model = ref->mBase->mModel;
-        if (!model.empty()) {
-            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
-        }
-        return "";
+        return getClassModel<ESM::Static>(ptr);
     }
 
     std::string Static::getName (const MWWorld::ConstPtr& ptr) const
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index 478e67036c..43bb2b110d 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -26,6 +26,8 @@
 #include "../mwrender/objects.hpp"
 #include "../mwrender/renderinginterface.hpp"
 
+#include "classmodel.hpp"
+
 namespace MWClass
 {
     Weapon::Weapon()
@@ -42,13 +44,7 @@ namespace MWClass
 
     std::string Weapon::getModel(const MWWorld::ConstPtr &ptr) const
     {
-        const MWWorld::LiveCellRef<ESM::Weapon> *ref = ptr.get<ESM::Weapon>();
-
-        const std::string &model = ref->mBase->mModel;
-        if (!model.empty()) {
-            return MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
-        }
-        return "";
+        return getClassModel<ESM::Weapon>(ptr);
     }
 
     std::string Weapon::getName (const MWWorld::ConstPtr& ptr) const
diff --git a/apps/openmw/mwgui/birth.cpp b/apps/openmw/mwgui/birth.cpp
index 41711f5e4e..f5fc164ee2 100644
--- a/apps/openmw/mwgui/birth.cpp
+++ b/apps/openmw/mwgui/birth.cpp
@@ -5,6 +5,9 @@
 #include <MyGUI_Gui.h>
 #include <MyGUI_ScrollView.h>
 
+#include <components/resource/resourcesystem.hpp>
+#include <components/misc/resourcehelpers.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
@@ -190,7 +193,8 @@ namespace MWGui
         const ESM::BirthSign *birth =
             store.get<ESM::BirthSign>().find(mCurrentBirthId);
 
-        mBirthImage->setImageTexture(MWBase::Environment::get().getWindowManager()->correctTexturePath(birth->mTexture));
+        mBirthImage->setImageTexture(Misc::ResourceHelpers::correctTexturePath(birth->mTexture,
+            MWBase::Environment::get().getResourceSystem()->getVFS()));
 
         std::vector<std::string> abilities, powers, spells;
 
diff --git a/apps/openmw/mwgui/class.cpp b/apps/openmw/mwgui/class.cpp
index 1732bc24ea..9568ba578a 100644
--- a/apps/openmw/mwgui/class.cpp
+++ b/apps/openmw/mwgui/class.cpp
@@ -13,6 +13,9 @@
 #include "../mwworld/esmstore.hpp"
 
 #include <components/debug/debuglog.hpp>
+#include <components/resource/resourcesystem.hpp>
+#include <components/misc/resourcehelpers.hpp>
+#include <components/vfs/manager.hpp>
 
 #include "tooltips.hpp"
 
@@ -920,8 +923,9 @@ namespace MWGui
 
     void setClassImage(MyGUI::ImageBox* imageBox, const std::string &classId)
     {
-        std::string classImage = std::string("textures\\levelup\\") + classId + ".dds";
-        if (!MWBase::Environment::get().getWindowManager()->textureExists(classImage))
+        const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+        std::string classImage = Misc::ResourceHelpers::correctTexturePath("textures\\levelup\\" + classId + ".dds", vfs);
+        if (!vfs->exists(classImage))
         {
             Log(Debug::Warning) << "No class image for " << classId << ", falling back to default";
             classImage = "textures\\levelup\\warrior.dds";
diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp
index 1aa0496ae9..989cd8e258 100644
--- a/apps/openmw/mwgui/hud.cpp
+++ b/apps/openmw/mwgui/hud.cpp
@@ -8,6 +8,8 @@
 #include <MyGUI_ScrollView.h>
 
 #include <components/settings/settings.hpp>
+#include <components/misc/resourcehelpers.hpp>
+#include <components/resource/resourcesystem.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
@@ -413,7 +415,7 @@ namespace MWGui
         std::string icon = effect->mIcon;
         int slashPos = icon.rfind('\\');
         icon.insert(slashPos+1, "b_");
-        icon = MWBase::Environment::get().getWindowManager()->correctIconPath(icon);
+        icon = Misc::ResourceHelpers::correctIconPath(icon, MWBase::Environment::get().getResourceSystem()->getVFS());
 
         mSpellImage->setSpellIcon(icon);
     }
diff --git a/apps/openmw/mwgui/itemwidget.cpp b/apps/openmw/mwgui/itemwidget.cpp
index f914ee8556..1ae683f3b4 100644
--- a/apps/openmw/mwgui/itemwidget.cpp
+++ b/apps/openmw/mwgui/itemwidget.cpp
@@ -9,6 +9,7 @@
 // correctIconPath
 #include <components/resource/resourcesystem.hpp>
 #include <components/vfs/manager.hpp>
+#include <components/misc/resourcehelpers.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
@@ -110,11 +111,12 @@ namespace MWGui
         std::string invIcon = ptr.getClass().getInventoryIcon(ptr);
         if (invIcon.empty())
             invIcon = "default icon.tga";
-        invIcon = MWBase::Environment::get().getWindowManager()->correctIconPath(invIcon);
-        if (!MWBase::Environment::get().getResourceSystem()->getVFS()->exists(invIcon))
+        const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+        invIcon = Misc::ResourceHelpers::correctIconPath(invIcon, vfs);
+        if (!vfs->exists(invIcon))
         {
             Log(Debug::Error) << "Failed to open image: '" << invIcon << "' not found, falling back to 'default-icon.tga'";
-            invIcon = MWBase::Environment::get().getWindowManager()->correctIconPath("default icon.tga");
+            invIcon = Misc::ResourceHelpers::correctIconPath("default icon.tga", vfs);
         }
         setIcon(invIcon);
     }
diff --git a/apps/openmw/mwgui/quickkeysmenu.cpp b/apps/openmw/mwgui/quickkeysmenu.cpp
index 7f53916d65..793c232e2e 100644
--- a/apps/openmw/mwgui/quickkeysmenu.cpp
+++ b/apps/openmw/mwgui/quickkeysmenu.cpp
@@ -8,6 +8,8 @@
 
 #include <components/esm3/esmwriter.hpp>
 #include <components/esm3/quickkeys.hpp>
+#include <components/resource/resourcesystem.hpp>
+#include <components/misc/resourcehelpers.hpp>
 
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/class.hpp"
@@ -300,7 +302,7 @@ namespace MWGui
         std::string path = effect->mIcon;
         int slashPos = path.rfind('\\');
         path.insert(slashPos+1, "b_");
-        path = MWBase::Environment::get().getWindowManager()->correctIconPath(path);
+        path = Misc::ResourceHelpers::correctIconPath(path, MWBase::Environment::get().getResourceSystem()->getVFS());
 
         float scale = 1.f;
         MyGUI::ITexture* texture = MyGUI::RenderManager::getInstance().getTexture("textures\\menu_icon_select_magic.dds");
diff --git a/apps/openmw/mwgui/spellcreationdialog.cpp b/apps/openmw/mwgui/spellcreationdialog.cpp
index 4fa6076ec9..c6ee5b5e66 100644
--- a/apps/openmw/mwgui/spellcreationdialog.cpp
+++ b/apps/openmw/mwgui/spellcreationdialog.cpp
@@ -7,6 +7,8 @@
 
 #include <components/esm/records.hpp>
 #include <components/widgets/list.hpp>
+#include <components/misc/resourcehelpers.hpp>
+#include <components/resource/resourcesystem.hpp>
 
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
@@ -187,7 +189,8 @@ namespace MWGui
 
     void EditEffectDialog::setMagicEffect (const ESM::MagicEffect *effect)
     {
-        mEffectImage->setImageTexture(MWBase::Environment::get().getWindowManager()->correctIconPath(effect->mIcon));
+        mEffectImage->setImageTexture(Misc::ResourceHelpers::correctIconPath(effect->mIcon,
+            MWBase::Environment::get().getResourceSystem()->getVFS()));
 
         mEffectName->setCaptionWithReplacing("#{"+ESM::MagicEffect::effectIdToString  (effect->mIndex)+"}");
 
diff --git a/apps/openmw/mwgui/spellicons.cpp b/apps/openmw/mwgui/spellicons.cpp
index acc5131a22..0934feec1e 100644
--- a/apps/openmw/mwgui/spellicons.cpp
+++ b/apps/openmw/mwgui/spellicons.cpp
@@ -7,6 +7,8 @@
 
 #include <components/esm3/loadmgef.hpp>
 #include <components/settings/settings.hpp>
+#include <components/misc/resourcehelpers.hpp>
+#include <components/resource/resourcesystem.hpp>
 
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
@@ -134,7 +136,8 @@ namespace MWGui
                         ("ImageBox", MyGUI::IntCoord(w,2,16,16), MyGUI::Align::Default);
                     mWidgetMap[effectId] = image;
 
-                    image->setImageTexture(MWBase::Environment::get().getWindowManager()->correctIconPath(effect->mIcon));
+                    image->setImageTexture(Misc::ResourceHelpers::correctIconPath(effect->mIcon,
+                        MWBase::Environment::get().getResourceSystem()->getVFS()));
 
                     std::string name = ESM::MagicEffect::effectIdToString (effectId);
 
diff --git a/apps/openmw/mwgui/tooltips.cpp b/apps/openmw/mwgui/tooltips.cpp
index 10ed206e3f..0b37e97245 100644
--- a/apps/openmw/mwgui/tooltips.cpp
+++ b/apps/openmw/mwgui/tooltips.cpp
@@ -9,6 +9,7 @@
 
 #include <components/settings/settings.hpp>
 #include <components/widgets/box.hpp>
+#include <components/misc/resourcehelpers.hpp>
 
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
@@ -436,7 +437,8 @@ namespace MWGui
 
         const int maximumWidth = MyGUI::RenderManager::getInstance().getViewSize().width - imageCaptionHPadding * 2;
 
-        std::string realImage = MWBase::Environment::get().getWindowManager()->correctIconPath(image);
+        const std::string realImage = Misc::ResourceHelpers::correctIconPath(image,
+            MWBase::Environment::get().getResourceSystem()->getVFS());
 
         Gui::EditBox* captionWidget = mDynamicToolTipBox->createWidget<Gui::EditBox>("NormalText", MyGUI::IntCoord(0, 0, 300, 300), MyGUI::Align::Left | MyGUI::Align::Top, "ToolTipCaption");
         captionWidget->setEditStatic(true);
@@ -843,10 +845,11 @@ namespace MWGui
             MWBase::Environment::get().getWorld()->getStore();
 
         const ESM::BirthSign *sign = store.get<ESM::BirthSign>().find(birthsignId);
+        const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
 
         widget->setUserString("ToolTipType", "Layout");
         widget->setUserString("ToolTipLayout", "BirthSignToolTip");
-        widget->setUserString("ImageTexture_BirthSignImage", MWBase::Environment::get().getWindowManager()->correctTexturePath(sign->mTexture));
+        widget->setUserString("ImageTexture_BirthSignImage", Misc::ResourceHelpers::correctTexturePath(sign->mTexture, vfs));
         std::string text;
 
         text += sign->mName;
@@ -938,7 +941,7 @@ namespace MWGui
         std::string icon = effect->mIcon;
         int slashPos = icon.rfind('\\');
         icon.insert(slashPos+1, "b_");
-        icon = MWBase::Environment::get().getWindowManager()->correctIconPath(icon);
+        icon = Misc::ResourceHelpers::correctIconPath(icon, MWBase::Environment::get().getResourceSystem()->getVFS());
 
         widget->setUserString("ToolTipType", "Layout");
         widget->setUserString("ToolTipLayout", "MagicEffectToolTip");
diff --git a/apps/openmw/mwgui/widgets.cpp b/apps/openmw/mwgui/widgets.cpp
index 3d5fa949c3..97d70240c0 100644
--- a/apps/openmw/mwgui/widgets.cpp
+++ b/apps/openmw/mwgui/widgets.cpp
@@ -7,6 +7,9 @@
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_ControllerManager.h>
 
+#include <components/resource/resourcesystem.hpp>
+#include <components/misc/resourcehelpers.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
@@ -470,7 +473,7 @@ namespace MWGui::Widgets
             mTextWidget->setCaptionWithReplacing(spellLine);
             mRequestedWidth = mTextWidget->getTextSize().width + sIconOffset;
 
-            mImageWidget->setImageTexture(MWBase::Environment::get().getWindowManager()->correctIconPath(magicEffect->mIcon));
+            mImageWidget->setImageTexture(Misc::ResourceHelpers::correctIconPath(magicEffect->mIcon, MWBase::Environment::get().getResourceSystem()->getVFS()));
         }
 
         MWSpellEffect::~MWSpellEffect()
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index f768b784eb..a3f039e351 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -2122,27 +2122,6 @@ namespace MWGui
         mConsole->setConsoleMode(mode);
     }
 
-    std::string WindowManager::correctIconPath(const std::string& path)
-    {
-        return Misc::ResourceHelpers::correctIconPath(path, mResourceSystem->getVFS());
-    }
-
-    std::string WindowManager::correctTexturePath(const std::string& path)
-    {
-        return Misc::ResourceHelpers::correctTexturePath(path, mResourceSystem->getVFS());
-    }
-
-    std::string WindowManager::correctMeshPath(const std::string& path)
-    {
-        return Misc::ResourceHelpers::correctMeshPath(path, mResourceSystem->getVFS());
-    }
-
-    bool WindowManager::textureExists(const std::string &path)
-    {
-        std::string corrected = Misc::ResourceHelpers::correctTexturePath(path, mResourceSystem->getVFS());
-        return mResourceSystem->getVFS()->exists(corrected);
-    }
-
     void WindowManager::createCursors()
     {
         // FIXME: currently we do not scale cursor since it is not a MyGUI widget.
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index dc17e31a77..2367470223 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -377,12 +377,6 @@ namespace MWGui
 
     void playSound(const std::string& soundId, float volume = 1.f, float pitch = 1.f) override;
 
-    // In WindowManager for now since there isn't a VFS singleton
-    std::string correctIconPath(const std::string& path) override;
-    std::string correctTexturePath(const std::string& path) override;
-    std::string correctMeshPath(const std::string& path) override;
-    bool textureExists(const std::string& path) override;
-
     void addCell(MWWorld::CellStore* cell) override;
     void removeCell(MWWorld::CellStore* cell) override;
     void writeFog(MWWorld::CellStore* cell) override;
diff --git a/apps/openmw/mwmechanics/activespells.cpp b/apps/openmw/mwmechanics/activespells.cpp
index 663809d109..e03947d7fc 100644
--- a/apps/openmw/mwmechanics/activespells.cpp
+++ b/apps/openmw/mwmechanics/activespells.cpp
@@ -6,6 +6,7 @@
 
 #include <components/misc/rng.hpp>
 #include <components/misc/stringops.hpp>
+#include <components/misc/resourcehelpers.hpp>
 
 #include <components/esm3/loadmgef.hpp>
 
@@ -17,7 +18,6 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
-#include "../mwbase/windowmanager.hpp"
 
 #include "../mwrender/animation.hpp"
 
@@ -262,9 +262,12 @@ namespace MWMechanics
                 const ESM::Static* reflectStatic = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>().find("VFX_Reflect");
                 MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(ptr);
                 if(animation && !reflectStatic->mModel.empty())
+                {
+                    const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
                     animation->addEffect(
-                        MWBase::Environment::get().getWindowManager()->correctMeshPath(reflectStatic->mModel),
+                        Misc::ResourceHelpers::correctMeshPath(reflectStatic->mModel, vfs),
                         ESM::MagicEffect::Reflect, false, std::string());
+                }
                 caster.getClass().getCreatureStats(caster).getActiveSpells().addSpell(*reflected);
             }
             if(removedSpell)
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index b24149827c..129dda8c19 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -10,6 +10,7 @@
 #include <components/misc/rng.hpp>
 #include <components/misc/mathutil.hpp>
 #include <components/settings/settings.hpp>
+#include <components/misc/resourcehelpers.hpp>
 
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/class.hpp"
@@ -203,9 +204,12 @@ void soulTrap(const MWWorld::Ptr& creature)
             const ESM::Static* fx = world->getStore().get<ESM::Static>()
                     .search("VFX_Soul_Trap");
             if (fx)
+            {
+                const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
                 world->spawnEffect(
-                    MWBase::Environment::get().getWindowManager()->correctMeshPath(fx->mModel),
+                    Misc::ResourceHelpers::correctMeshPath(fx->mModel, vfs),
                     "", creature.getRefData().getPosition().asVec3());
+            }
 
             MWBase::Environment::get().getSoundManager()->playSound3D(creature.getRefData().getPosition().asVec3(), "conjuration hit", 1.f, 1.f);
             return; //remove to get vanilla behaviour
@@ -1747,9 +1751,12 @@ namespace MWMechanics
             const ESM::Static* fx = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>()
                     .search("VFX_Summon_End");
             if (fx)
+            {
+                const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
                 MWBase::Environment::get().getWorld()->spawnEffect(
-                    MWBase::Environment::get().getWindowManager()->correctMeshPath(fx->mModel),
+                    Misc::ResourceHelpers::correctMeshPath(fx->mModel, vfs),
                     "", ptr.getRefData().getPosition().asVec3());
+            }
 
             // Remove the summoned creature's summoned creatures as well
             MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index c60f64884f..7ea3b9a205 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -24,6 +24,7 @@
 #include <components/misc/mathutil.hpp>
 #include <components/misc/rng.hpp>
 #include <components/misc/stringops.hpp>
+#include <components/misc/resourcehelpers.hpp>
 
 #include <components/settings/settings.hpp>
 
@@ -1402,16 +1403,18 @@ bool CharacterController::updateState(CharacterState idle)
 
                     const ESM::Static* castStatic = world->getStore().get<ESM::Static>().find ("VFX_Hands");
 
+                    const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+
                     for (size_t iter = 0; iter < effects.size(); ++iter) // play hands vfx for each effect
                     {
                         if (mAnimation->getNode("Bip01 L Hand"))
                             mAnimation->addEffect(
-                                MWBase::Environment::get().getWindowManager()->correctMeshPath(castStatic->mModel),
+                                Misc::ResourceHelpers::correctMeshPath(castStatic->mModel, vfs),
                                 -1, false, "Bip01 L Hand", effect->mParticle);
 
                         if (mAnimation->getNode("Bip01 R Hand"))
                             mAnimation->addEffect(
-                                MWBase::Environment::get().getWindowManager()->correctMeshPath(castStatic->mModel),
+                                Misc::ResourceHelpers::correctMeshPath(castStatic->mModel, vfs),
                                 -1, false, "Bip01 R Hand", effect->mParticle);
                     }
 
diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index dcfd125519..3852d3f61a 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -2,6 +2,7 @@
 
 #include <components/misc/constants.hpp>
 #include <components/misc/rng.hpp>
+#include <components/misc/resourcehelpers.hpp>
 
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
@@ -464,6 +465,8 @@ namespace MWMechanics
     {
         const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
         std::vector<std::string> addedEffects;
+        const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+
         for (const ESM::ENAMstruct& effectData : effects)
         {
             const auto effect = store.get<ESM::MagicEffect>().find(effectData.mEffectID);
@@ -477,7 +480,7 @@ namespace MWMechanics
 
             // check if the effect was already added
             if (std::find(addedEffects.begin(), addedEffects.end(),
-                MWBase::Environment::get().getWindowManager()->correctMeshPath(castStatic->mModel))
+                Misc::ResourceHelpers::correctMeshPath(castStatic->mModel, vfs))
                 != addedEffects.end())
                 continue;
 
@@ -485,7 +488,7 @@ namespace MWMechanics
             if (animation)
             {
                 animation->addEffect(
-                    MWBase::Environment::get().getWindowManager()->correctMeshPath(castStatic->mModel),
+                    Misc::ResourceHelpers::correctMeshPath(castStatic->mModel, vfs),
                     effect->mIndex, false, "", effect->mParticle);
             }
             else
@@ -516,7 +519,7 @@ namespace MWMechanics
                 }
                 scale = std::max(scale, 1.f);
                 MWBase::Environment::get().getWorld()->spawnEffect(
-                    MWBase::Environment::get().getWindowManager()->correctMeshPath(castStatic->mModel),
+                    Misc::ResourceHelpers::correctMeshPath(castStatic->mModel, vfs),
                     effect->mParticle, pos, scale);
             }
 
@@ -527,7 +530,7 @@ namespace MWMechanics
                 "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration"
             };
 
-            addedEffects.push_back(MWBase::Environment::get().getWindowManager()->correctMeshPath(castStatic->mModel));
+            addedEffects.push_back(Misc::ResourceHelpers::correctMeshPath(castStatic->mModel, vfs));
 
             MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
             if(!effect->mCastSound.empty())
@@ -565,9 +568,12 @@ namespace MWMechanics
         {
             // Don't play particle VFX unless the effect is new or it should be looping.
             if (playNonLooping || loop)
+            {
+                const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
                 anim->addEffect(
-                    MWBase::Environment::get().getWindowManager()->correctMeshPath(castStatic->mModel),
+                    Misc::ResourceHelpers::correctMeshPath(castStatic->mModel, vfs),
                     magicEffect.mIndex, loop, "", magicEffect.mParticle);
+            }
         }
     }
 }
diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp
index e10eaa3ff9..8a92dd5b68 100644
--- a/apps/openmw/mwmechanics/spelleffects.cpp
+++ b/apps/openmw/mwmechanics/spelleffects.cpp
@@ -5,6 +5,7 @@
 #include <components/esm3/loadmgef.hpp>
 #include <components/misc/rng.hpp>
 #include <components/settings/settings.hpp>
+#include <components/misc/resourcehelpers.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
@@ -272,9 +273,12 @@ namespace
         const ESM::Static* absorbStatic = esmStore.get<ESM::Static>().find("VFX_Absorb");
         MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(target);
         if (animation && !absorbStatic->mModel.empty())
+        {
+            const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
             animation->addEffect(
-                MWBase::Environment::get().getWindowManager()->correctMeshPath(absorbStatic->mModel),
+                Misc::ResourceHelpers::correctMeshPath(absorbStatic->mModel, vfs),
                 ESM::MagicEffect::SpellAbsorption, false, std::string());
+        }
         const ESM::Spell* spell = esmStore.get<ESM::Spell>().search(spellId);
         int spellCost = 0;
         if (spell)
@@ -432,7 +436,10 @@ void applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, co
                     anim->removeEffect(effect.mEffectId);
                     const ESM::Static* fx = world->getStore().get<ESM::Static>().search("VFX_Summon_end");
                     if (fx)
-                        anim->addEffect(MWBase::Environment::get().getWindowManager()->correctMeshPath(fx->mModel), -1);
+                    {
+                        const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+                        anim->addEffect(Misc::ResourceHelpers::correctMeshPath(fx->mModel, vfs), -1);
+                    }
                 }
             }
             else if (caster == getPlayer())
diff --git a/apps/openmw/mwmechanics/spellutil.cpp b/apps/openmw/mwmechanics/spellutil.cpp
index 3c4f094be4..7fa9687189 100644
--- a/apps/openmw/mwmechanics/spellutil.cpp
+++ b/apps/openmw/mwmechanics/spellutil.cpp
@@ -3,7 +3,6 @@
 #include <limits>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
 
 #include "../mwworld/class.hpp"
diff --git a/apps/openmw/mwmechanics/summoning.cpp b/apps/openmw/mwmechanics/summoning.cpp
index 5fc39f416b..0cf2e26f47 100644
--- a/apps/openmw/mwmechanics/summoning.cpp
+++ b/apps/openmw/mwmechanics/summoning.cpp
@@ -1,11 +1,11 @@
 #include "summoning.hpp"
 
 #include <components/debug/debuglog.hpp>
+#include <components/misc/resourcehelpers.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
-#include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/class.hpp"
@@ -86,7 +86,10 @@ namespace MWMechanics
                 {
                     const ESM::Static* fx = world->getStore().get<ESM::Static>().search("VFX_Summon_Start");
                     if (fx)
-                        anim->addEffect(MWBase::Environment::get().getWindowManager()->correctMeshPath(fx->mModel), -1, false);
+                    {
+                        const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+                        anim->addEffect(Misc::ResourceHelpers::correctMeshPath(fx->mModel, vfs), -1, false);
+                    }
                 }
             }
             catch (std::exception& e)
diff --git a/apps/openmw/mwrender/actoranimation.cpp b/apps/openmw/mwrender/actoranimation.cpp
index 777a095c9e..373a29bc1a 100644
--- a/apps/openmw/mwrender/actoranimation.cpp
+++ b/apps/openmw/mwrender/actoranimation.cpp
@@ -17,6 +17,7 @@
 #include <components/sceneutil/visitor.hpp>
 
 #include <components/misc/stringops.hpp>
+#include <components/misc/resourcehelpers.hpp>
 
 #include <components/settings/settings.hpp>
 
@@ -24,7 +25,6 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
-#include "../mwbase/windowmanager.hpp"
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
@@ -128,7 +128,8 @@ std::string ActorAnimation::getShieldMesh(const MWWorld::ConstPtr& shield, bool
                 if (bodypart == nullptr || bodypart->mData.mType != ESM::BodyPart::MT_Armor)
                     return std::string();
                 if (!bodypart->mModel.empty())
-                    return MWBase::Environment::get().getWindowManager()->correctMeshPath(bodypart->mModel);
+                    return Misc::ResourceHelpers::correctMeshPath(bodypart->mModel,
+                        MWBase::Environment::get().getResourceSystem()->getVFS());
             }
         }
     }
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 00798604ce..bd9fe543c4 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -39,7 +39,6 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
-#include "../mwbase/windowmanager.hpp"
 
 #include "camera.hpp"
 #include "rotatecontroller.hpp"
@@ -51,7 +50,7 @@
 namespace
 {
 
-std::string getVampireHead(const std::string& race, bool female)
+std::string getVampireHead(const std::string& race, bool female, const VFS::Manager& vfs)
 {
     static std::map <std::pair<std::string,int>, const ESM::BodyPart* > sVampireMapping;
 
@@ -81,7 +80,7 @@ std::string getVampireHead(const std::string& race, bool female)
     const ESM::BodyPart* bodyPart = sVampireMapping[thisCombination];
     if (!bodyPart)
         return std::string();
-    return MWBase::Environment::get().getWindowManager()->correctMeshPath(bodyPart->mModel);
+    return Misc::ResourceHelpers::correctMeshPath(bodyPart->mModel, &vfs);
 }
 
 }
@@ -470,7 +469,7 @@ void NpcAnimation::updateNpcBase()
     {
         const ESM::BodyPart* bp = store.get<ESM::BodyPart>().search(headName);
         if (bp)
-            mHeadModel = MWBase::Environment::get().getWindowManager()->correctMeshPath(bp->mModel);
+            mHeadModel = Misc::ResourceHelpers::correctMeshPath(bp->mModel, mResourceSystem->getVFS());
         else
             Log(Debug::Warning) << "Warning: Failed to load body part '" << headName << "'";
     }
@@ -479,12 +478,12 @@ void NpcAnimation::updateNpcBase()
     {
         const ESM::BodyPart* bp = store.get<ESM::BodyPart>().search(hairName);
         if (bp)
-            mHairModel = MWBase::Environment::get().getWindowManager()->correctMeshPath(bp->mModel);
+            mHairModel = Misc::ResourceHelpers::correctMeshPath(bp->mModel, mResourceSystem->getVFS());
         else
             Log(Debug::Warning) << "Warning: Failed to load body part '" << hairName << "'";
     }
 
-    const std::string& vampireHead = getVampireHead(mNpc->mRace, isFemale);
+    const std::string vampireHead = getVampireHead(mNpc->mRace, isFemale, *mResourceSystem->getVFS());
     if (!isWerewolf && isVampire && !vampireHead.empty())
         mHeadModel = vampireHead;
 
@@ -497,7 +496,7 @@ void NpcAnimation::updateNpcBase()
     std::string smodel = defaultSkeleton;
     if (!is1stPerson && !isWerewolf && !mNpc->mModel.empty())
         smodel = Misc::ResourceHelpers::correctActorModelPath(
-            MWBase::Environment::get().getWindowManager()->correctMeshPath(mNpc->mModel), mResourceSystem->getVFS());
+            Misc::ResourceHelpers::correctMeshPath(mNpc->mModel, mResourceSystem->getVFS()), mResourceSystem->getVFS());
 
     setObjectRoot(smodel, true, true, false);
 
@@ -657,8 +656,9 @@ void NpcAnimation::updateParts()
         if(store != inv.end() && (part=*store).getType() == ESM::Light::sRecordId)
         {
             const ESM::Light *light = part.get<ESM::Light>()->mBase;
+            const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
             addOrReplaceIndividualPart(ESM::PRT_Shield, MWWorld::InventoryStore::Slot_CarriedLeft, 1,
-                MWBase::Environment::get().getWindowManager()->correctMeshPath(light->mModel), false, nullptr, true);
+                Misc::ResourceHelpers::correctMeshPath(light->mModel, vfs), false, nullptr, true);
             if (mObjectParts[ESM::PRT_Shield])
                 addExtraLight(mObjectParts[ESM::PRT_Shield]->getNode()->asGroup(), light);
         }
@@ -677,8 +677,11 @@ void NpcAnimation::updateParts()
         {
             const ESM::BodyPart* bodypart = parts[part];
             if(bodypart)
-                addOrReplaceIndividualPart((ESM::PartReferenceType)part, -1, 1,
-                    MWBase::Environment::get().getWindowManager()->correctMeshPath(bodypart->mModel));
+            {
+                const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+                addOrReplaceIndividualPart(static_cast<ESM::PartReferenceType>(part), -1, 1,
+                    Misc::ResourceHelpers::correctMeshPath(bodypart->mModel, vfs));
+            }
         }
     }
 
@@ -908,8 +911,11 @@ void NpcAnimation::addPartGroup(int group, int priority, const std::vector<ESM::
         }
 
         if(bodypart)
-            addOrReplaceIndividualPart((ESM::PartReferenceType)part.mPart, group, priority,
-                MWBase::Environment::get().getWindowManager()->correctMeshPath(bodypart->mModel), enchantedGlow, glowColor);
+        {
+            const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+            addOrReplaceIndividualPart(static_cast<ESM::PartReferenceType>(part.mPart), group, priority,
+                Misc::ResourceHelpers::correctMeshPath(bodypart->mModel, vfs), enchantedGlow, glowColor);
+        }
         else
             reserveIndividualPart((ESM::PartReferenceType)part.mPart, group, priority);
     }
diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index 848c27db47..20d69bcf11 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -32,10 +32,11 @@
 #include "apps/openmw/mwworld/esmstore.hpp"
 #include "apps/openmw/mwbase/environment.hpp"
 #include "apps/openmw/mwbase/world.hpp"
-#include "apps/openmw/mwbase/windowmanager.hpp"
 
 #include "vismask.hpp"
 
+#include <condition_variable>
+
 namespace MWRender
 {
 
@@ -532,7 +533,7 @@ namespace MWRender
             int type = store.findStatic(ref.mRefID);
             std::string model = getModel(type, ref.mRefID, store);
             if (model.empty()) continue;
-            model = MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
+            model = Misc::ResourceHelpers::correctMeshPath(model, mSceneManager->getVFS());
 
             if (activeGrid && type != ESM::REC_STAT)
             {
diff --git a/apps/openmw/mwworld/groundcoverstore.cpp b/apps/openmw/mwworld/groundcoverstore.cpp
index 567735e02a..0c3b016482 100644
--- a/apps/openmw/mwworld/groundcoverstore.cpp
+++ b/apps/openmw/mwworld/groundcoverstore.cpp
@@ -4,9 +4,10 @@
 #include <components/esmloader/esmdata.hpp>
 #include <components/misc/stringops.hpp>
 #include <components/esm3/readerscache.hpp>
+#include <components/misc/resourcehelpers.hpp>
+#include <components/resource/resourcesystem.hpp>
 
 #include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/windowmanager.hpp>
 
 #include "store.hpp"
 
@@ -23,6 +24,8 @@ namespace MWWorld
         const ::EsmLoader::EsmData content = ::EsmLoader::loadEsmData(query, groundcoverFiles, fileCollections,
                                                                       readers, encoder, listener);
 
+        const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+
         static constexpr std::string_view prefix = "grass\\";
         for (const ESM::Static& stat : statics)
         {
@@ -31,7 +34,7 @@ namespace MWWorld
             std::replace(model.begin(), model.end(), '/', '\\');
             if (model.compare(0, prefix.size(), prefix) != 0)
                 continue;
-            mMeshCache[id] = MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
+            mMeshCache[id] = Misc::ResourceHelpers::correctMeshPath(model, vfs);
         }
 
         for (const ESM::Static& stat : content.mStatics)
@@ -41,7 +44,7 @@ namespace MWWorld
             std::replace(model.begin(), model.end(), '/', '\\');
             if (model.compare(0, prefix.size(), prefix) != 0)
                 continue;
-            mMeshCache[id] = MWBase::Environment::get().getWindowManager()->correctMeshPath(model);
+            mMeshCache[id] = Misc::ResourceHelpers::correctMeshPath(model, vfs);
         }
 
         for (const ESM::Cell& cell : content.mCells)
diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index 3acef2db3f..6ede604eea 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -13,6 +13,7 @@
 
 #include <components/misc/constants.hpp>
 #include <components/misc/convert.hpp>
+#include <components/misc/resourcehelpers.hpp>
 
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
@@ -211,6 +212,9 @@ namespace MWWorld
         osg::ref_ptr<osg::Node> projectile = mResourceSystem->getSceneManager()->getInstance(model, attachTo);
 
         if (state.mIdMagic.size() > 1)
+        {
+            const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+
             for (size_t iter = 1; iter != state.mIdMagic.size(); ++iter)
             {
                 std::ostringstream nodeName;
@@ -220,8 +224,9 @@ namespace MWWorld
                 attachTo->accept(findVisitor);
                 if (findVisitor.mFoundNode)
                     mResourceSystem->getSceneManager()->getInstance(
-                        MWBase::Environment::get().getWindowManager()->correctMeshPath(weapon->mModel), findVisitor.mFoundNode);
+                        Misc::ResourceHelpers::correctMeshPath(weapon->mModel, vfs), findVisitor.mFoundNode);
             }
+        }
 
         if (createLight)
         {
@@ -320,8 +325,11 @@ namespace MWWorld
 
         // in case there are multiple effects, the model is a dummy without geometry. Use the second effect for physics shape
         if (state.mIdMagic.size() > 1)
-            model = MWBase::Environment::get().getWindowManager()->correctMeshPath(
-                MWBase::Environment::get().getWorld()->getStore().get<ESM::Weapon>().find(state.mIdMagic[1])->mModel);
+        {
+            model = Misc::ResourceHelpers::correctMeshPath(
+                MWBase::Environment::get().getWorld()->getStore().get<ESM::Weapon>().find(state.mIdMagic[1])->mModel,
+                MWBase::Environment::get().getResourceSystem()->getVFS());
+        }
         state.mProjectileId = mPhysics->addProjectile(caster, pos, model, true);
         state.mToDelete = false;
         mMagicBolts.push_back(state);
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index bd89bca0df..c626ef9d46 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -3690,8 +3690,9 @@ namespace MWWorld
         if (texture.empty())
             texture = Fallback::Map::getString("Blood_Texture_0");
 
-        std::string model = MWBase::Environment::get().getWindowManager()->correctMeshPath(
-            Fallback::Map::getString("Blood_Model_" + std::to_string(Misc::Rng::rollDice(3)))); // [0, 2]
+        std::string model = Misc::ResourceHelpers::correctMeshPath(
+            Fallback::Map::getString("Blood_Model_" + std::to_string(Misc::Rng::rollDice(3))), // [0, 2]
+            mResourceSystem->getVFS());
 
         mRendering->spawnEffect(model, texture, worldPosition, 1.0f, false);
     }
@@ -3731,13 +3732,13 @@ namespace MWWorld
             {
                 if (effectInfo.mRange == ESM::RT_Target)
                     mRendering->spawnEffect(
-                        MWBase::Environment::get().getWindowManager()->correctMeshPath(areaStatic->mModel),
+                        Misc::ResourceHelpers::correctMeshPath(areaStatic->mModel, mResourceSystem->getVFS()),
                         texture, origin, 1.0f);
                 continue;
             }
             else
                 mRendering->spawnEffect(
-                    MWBase::Environment::get().getWindowManager()->correctMeshPath(areaStatic->mModel),
+                    Misc::ResourceHelpers::correctMeshPath(areaStatic->mModel, mResourceSystem->getVFS()),
                     texture, origin, static_cast<float>(effectInfo.mArea * 2));
 
             // Play explosion sound (make sure to use NoTrack, since we will delete the projectile now)

From b09411d396fe095b75bb424a537292b5f6aeb6d2 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Wed, 29 Jun 2022 18:15:12 -0700
Subject: [PATCH 2696/2859] allow soft particles on meshes and add extra data
 extensions

---
 apps/openmw/mwrender/renderingmanager.cpp     | 13 ++-
 apps/openmw/mwrender/ripplesimulation.cpp     |  2 +-
 components/CMakeLists.txt                     |  2 +-
 components/misc/osguservalues.cpp             |  2 +
 components/misc/osguservalues.hpp             |  2 +
 components/nifosg/nifloader.cpp               | 11 ++-
 components/resource/scenemanager.cpp          | 14 ++-
 components/resource/scenemanager.hpp          |  4 +-
 components/sceneutil/extradata.cpp            | 66 ++++++++++++++
 components/sceneutil/extradata.hpp            | 35 ++++++++
 components/shader/shadermanager.cpp           | 19 ++--
 components/shader/shadermanager.hpp           | 11 ++-
 components/shader/shadervisitor.cpp           | 88 ++-----------------
 components/shader/shadervisitor.hpp           |  4 -
 .../modding/custom-shader-effects.rst         | 54 ++++++++++++
 docs/source/reference/modding/index.rst       |  1 +
 files/shaders/lighting_util.glsl              |  2 -
 files/shaders/objects_fragment.glsl           |  6 +-
 files/shaders/softparticles.glsl              | 22 +++--
 19 files changed, 243 insertions(+), 115 deletions(-)
 create mode 100644 components/sceneutil/extradata.cpp
 create mode 100644 components/sceneutil/extradata.hpp
 create mode 100644 docs/source/reference/modding/custom-shader-effects.rst

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 449217fa68..55b50c9d7c 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -87,8 +87,10 @@ namespace MWRender
     class PerViewUniformStateUpdater final : public SceneUtil::StateSetUpdater
     {
     public:
-        PerViewUniformStateUpdater()
+        PerViewUniformStateUpdater(Resource::SceneManager* sceneManager)
+            : mSceneManager(sceneManager)
         {
+            mOpaqueTextureUnit = mSceneManager->getShaderManager().reserveGlobalTextureUnits(Shader::ShaderManager::Slot::OpaqueDepthTexture);
         }
 
         void setDefaults(osg::StateSet* stateset) override
@@ -108,6 +110,8 @@ namespace MWRender
                 osg::Texture* skyTexture = mSkyRTT->getColorTexture(static_cast<osgUtil::CullVisitor*>(nv));
                 stateset->setTextureAttribute(mSkyTextureUnit, skyTexture, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
             }
+
+            stateset->setTextureAttribute(mOpaqueTextureUnit, mSceneManager->getOpaqueDepthTex(nv->getTraversalNumber()), osg::StateAttribute::ON);
         }
 
         void applyLeft(osg::StateSet* stateset, osgUtil::CullVisitor* nv) override
@@ -144,6 +148,9 @@ namespace MWRender
         osg::Matrixf mProjectionMatrix;
         int mSkyTextureUnit = -1;
         SceneUtil::RTTNode* mSkyRTT = nullptr;
+
+        Resource::SceneManager* mSceneManager;
+        int mOpaqueTextureUnit = -1;
     };
 
     class SharedUniformStateUpdater : public SceneUtil::StateSetUpdater
@@ -536,7 +543,7 @@ namespace MWRender
         mSharedUniformStateUpdater = new SharedUniformStateUpdater(groundcover);
         rootNode->addUpdateCallback(mSharedUniformStateUpdater);
 
-        mPerViewUniformStateUpdater = new PerViewUniformStateUpdater();
+        mPerViewUniformStateUpdater = new PerViewUniformStateUpdater(mResourceSystem->getSceneManager());
         rootNode->addCullCallback(mPerViewUniformStateUpdater);
 
         mPostProcessor = new PostProcessor(*this, viewer, mRootNode, resourceSystem->getVFS());
@@ -581,7 +588,7 @@ namespace MWRender
         mSky->setCamera(mViewer->getCamera());
         if (mSkyBlending)
         {
-            int skyTextureUnit = mResourceSystem->getSceneManager()->getShaderManager().reserveGlobalTextureUnits(1);
+            int skyTextureUnit = mResourceSystem->getSceneManager()->getShaderManager().reserveGlobalTextureUnits(Shader::ShaderManager::Slot::SkyTexture);
             Log(Debug::Info) << "Reserving texture unit for sky RTT: " << skyTextureUnit;
             mPerViewUniformStateUpdater->enableSkyRTT(skyTextureUnit, mSky->getSkyRTT());
         }
diff --git a/apps/openmw/mwrender/ripplesimulation.cpp b/apps/openmw/mwrender/ripplesimulation.cpp
index d1a8ea1ecd..5aa7c29154 100644
--- a/apps/openmw/mwrender/ripplesimulation.cpp
+++ b/apps/openmw/mwrender/ripplesimulation.cpp
@@ -109,7 +109,7 @@ RippleSimulation::RippleSimulation(osg::Group *parent, Resource::ResourceSystem*
 
     createWaterRippleStateSet(resourceSystem, mParticleNode);
 
-    resourceSystem->getSceneManager()->recreateShaders(mParticleNode, "objects", false, nullptr, true);
+    resourceSystem->getSceneManager()->recreateShaders(mParticleNode);
 
     mParent->addChild(mParticleNode);
 }
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 2d3fc01e3b..a4e1d32e99 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -61,7 +61,7 @@ add_component_dir (sceneutil
     clone attach visitor util statesetupdater controller skeleton riggeometry morphgeometry lightcontroller
     lightmanager lightutil positionattitudetransform workqueue pathgridutil waterutil writescene serialize optimizer
     actorutil detourdebugdraw navmesh agentpath shadow mwshadowtechnique recastmesh shadowsbin osgacontroller rtt
-    screencapture depth color riggeometryosgaextension
+    screencapture depth color riggeometryosgaextension extradata
     )
 
 add_component_dir (nif
diff --git a/components/misc/osguservalues.cpp b/components/misc/osguservalues.cpp
index 3bdd0d1848..b70647a63e 100644
--- a/components/misc/osguservalues.cpp
+++ b/components/misc/osguservalues.cpp
@@ -3,4 +3,6 @@
 namespace Misc
 {
     const std::string OsgUserValues::sFileHash = "fileHash";
+    const std::string OsgUserValues::sExtraData = "xData";
+    const std::string OsgUserValues::sXSoftEffect = "xSoftEffect";
 }
diff --git a/components/misc/osguservalues.hpp b/components/misc/osguservalues.hpp
index 022e81764f..443e6132e1 100644
--- a/components/misc/osguservalues.hpp
+++ b/components/misc/osguservalues.hpp
@@ -8,6 +8,8 @@ namespace Misc
     struct OsgUserValues
     {
         static const std::string sFileHash;
+        static const std::string sExtraData;
+        static const std::string sXSoftEffect;
     };
 }
 
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 8f7b02eaa4..9b2e8db8d6 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -614,17 +614,24 @@ namespace NifOsg
                 else if(e->recType == Nif::RC_NiStringExtraData)
                 {
                     const Nif::NiStringExtraData *sd = static_cast<const Nif::NiStringExtraData*>(e.getPtr());
+
+                    constexpr std::string_view extraDataIdentifer = "omw:data";
+
                     // String markers may contain important information
                     // affecting the entire subtree of this obj
-                    if(sd->string == "MRK" && !Loader::getShowMarkers())
+                    if (sd->string == "MRK" && !Loader::getShowMarkers())
                     {
                         // Marker objects. These meshes are only visible in the editor.
                         hasMarkers = true;
                     }
-                    else if(sd->string == "BONE")
+                    else if (sd->string == "BONE")
                     {
                         node->getOrCreateUserDataContainer()->addDescription("CustomBone");
                     }
+                    else if (sd->string.rfind(extraDataIdentifer, 0) == 0)
+                    {
+                        node->setUserValue(Misc::OsgUserValues::sExtraData, sd->string.substr(extraDataIdentifer.length()));
+                    }
                 }
             }
 
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 31b8a6319f..094220938b 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -39,6 +39,7 @@
 #include <components/sceneutil/lightmanager.hpp>
 #include <components/sceneutil/depth.hpp>
 #include <components/sceneutil/riggeometryosgaextension.hpp>
+#include <components/sceneutil/extradata.hpp>
 
 #include <components/shader/shadervisitor.hpp>
 #include <components/shader/shadermanager.hpp>
@@ -366,15 +367,13 @@ namespace Resource
         return mForceShaders;
     }
 
-    void SceneManager::recreateShaders(osg::ref_ptr<osg::Node> node, const std::string& shaderPrefix, bool forceShadersForNode, const osg::Program* programTemplate, bool disableSoftParticles)
+    void SceneManager::recreateShaders(osg::ref_ptr<osg::Node> node, const std::string& shaderPrefix, bool forceShadersForNode, const osg::Program* programTemplate)
     {
         osg::ref_ptr<Shader::ShaderVisitor> shaderVisitor(createShaderVisitor(shaderPrefix));
         shaderVisitor->setAllowedToModifyStateSets(false);
         shaderVisitor->setProgramTemplate(programTemplate);
         if (forceShadersForNode)
             shaderVisitor->setForceShaders(true);
-        if (disableSoftParticles)
-            shaderVisitor->setOpaqueDepthTex(nullptr, nullptr);
         node->accept(*shaderVisitor);
     }
 
@@ -461,6 +460,11 @@ namespace Resource
         mOpaqueDepthTex = { texturePing, texturePong };
     }
 
+    osg::ref_ptr<osg::Texture> SceneManager::getOpaqueDepthTex(size_t frame)
+    {
+        return mOpaqueDepthTex[frame % 2];
+    }
+
     SceneManager::~SceneManager()
     {
         // this has to be defined in the .cpp file as we can't delete incomplete types
@@ -737,6 +741,9 @@ namespace Resource
             try
             {
                 loaded = load(normalized, mVFS, mImageManager, mNifFileManager);
+
+                SceneUtil::ProcessExtraDataVisitor extraDataVisitor(this);
+                loaded->accept(extraDataVisitor);
             }
             catch (const std::exception& e)
             {
@@ -990,7 +997,6 @@ namespace Resource
         shaderVisitor->setSpecularMapPattern(mSpecularMapPattern);
         shaderVisitor->setApplyLightingToEnvMaps(mApplyLightingToEnvMaps);
         shaderVisitor->setConvertAlphaTestToAlphaToCoverage(mConvertAlphaTestToAlphaToCoverage);
-        shaderVisitor->setOpaqueDepthTex(mOpaqueDepthTex[0], mOpaqueDepthTex[1]);
         shaderVisitor->setSupportsNormalsRT(mSupportsNormalsRT);
         return shaderVisitor;
     }
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index 82adef9dc9..669b6df758 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -77,7 +77,7 @@ namespace Resource
         Shader::ShaderManager& getShaderManager();
 
         /// Re-create shaders for this node, need to call this if alpha testing, texture stages or vertex color mode have changed.
-        void recreateShaders(osg::ref_ptr<osg::Node> node, const std::string& shaderPrefix = "objects", bool forceShadersForNode = false, const osg::Program* programTemplate = nullptr, bool disableSoftParticles = false);
+        void recreateShaders(osg::ref_ptr<osg::Node> node, const std::string& shaderPrefix = "objects", bool forceShadersForNode = false, const osg::Program* programTemplate = nullptr);
 
         /// Applying shaders to a node may replace some fixed-function state.
         /// This restores it.
@@ -111,6 +111,8 @@ namespace Resource
 
         void setOpaqueDepthTex(osg::ref_ptr<osg::Texture> texturePing, osg::ref_ptr<osg::Texture> texturePong);
 
+        osg::ref_ptr<osg::Texture> getOpaqueDepthTex(size_t frame);
+
         enum class UBOBinding
         {
             // If we add more UBO's, we should probably assign their bindings dynamically according to the current count of UBO's in the programTemplate
diff --git a/components/sceneutil/extradata.cpp b/components/sceneutil/extradata.cpp
new file mode 100644
index 0000000000..7b50e281c7
--- /dev/null
+++ b/components/sceneutil/extradata.cpp
@@ -0,0 +1,66 @@
+#include "extradata.hpp"
+
+#include <unordered_set>
+
+#include <osg/Node>
+#include <osg/ValueObject>
+#include <osgParticle/ParticleSystem>
+
+#include <yaml-cpp/yaml.h>
+
+#include <components/misc/osguservalues.hpp>
+#include <components/sceneutil/depth.hpp>
+#include <components/resource/scenemanager.hpp>
+#include <components/shader/shadermanager.hpp>
+#include <components/serialization/osgyaml.hpp>
+
+#include <components/debug/debuglog.hpp>
+
+namespace SceneUtil
+{
+    void ProcessExtraDataVisitor::setupSoftEffect(osg::Node& node, float size, bool falloff)
+    {
+        const int unitSoftEffect = mSceneMgr->getShaderManager().reserveGlobalTextureUnits(Shader::ShaderManager::Slot::OpaqueDepthTexture);
+        static const osg::ref_ptr<SceneUtil::AutoDepth> depth = new SceneUtil::AutoDepth(osg::Depth::LESS, 0, 1, false);
+
+        osg::StateSet* stateset = node.getOrCreateStateSet();
+
+        stateset->addUniform(new osg::Uniform("opaqueDepthTex", unitSoftEffect));
+        stateset->addUniform(new osg::Uniform("particleSize", size));
+        stateset->addUniform(new osg::Uniform("particleFade", falloff));
+        stateset->setAttributeAndModes(depth, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+
+        node.setUserValue(Misc::OsgUserValues::sXSoftEffect, true);
+    }
+
+    void ProcessExtraDataVisitor::apply(osg::Node& node)
+    {
+        std::string source;
+
+        if (node.getUserValue(Misc::OsgUserValues::sExtraData, source) && !source.empty())
+        {
+            YAML::Node root = YAML::Load(source);
+
+            for (const auto& it : root["shader"])
+            {
+                std::string key = it.first.as<std::string>();
+
+                if (key == "soft_effect")
+                {
+                    auto size = it.second["size"].as<float>(45.f);
+                    auto falloff = it.second["falloff"].as<bool>(false);
+
+                    setupSoftEffect(node, size, falloff);
+                }
+            }
+
+            node.setUserValue(Misc::OsgUserValues::sExtraData, std::string{});
+        }
+        else if (osgParticle::ParticleSystem* partsys = dynamic_cast<osgParticle::ParticleSystem*>(&node))
+        {
+            setupSoftEffect(node, partsys->getDefaultParticleTemplate().getSizeRange().maximum, false);
+        }
+
+        traverse(node);
+    }
+}
\ No newline at end of file
diff --git a/components/sceneutil/extradata.hpp b/components/sceneutil/extradata.hpp
new file mode 100644
index 0000000000..b460bd04d0
--- /dev/null
+++ b/components/sceneutil/extradata.hpp
@@ -0,0 +1,35 @@
+#ifndef OPENMW_COMPONENTS_RESOURCE_EXTRADATA_H
+#define OPENMW_COMPONENTS_RESOURCE_EXTRADATA_H
+
+#include <array>
+
+#include <osg/NodeVisitor>
+#include <osg/StateAttribute>
+
+namespace Resource
+{
+    class SceneManager;
+}
+
+namespace osg
+{
+    class Node;
+}
+
+namespace SceneUtil
+{
+    class ProcessExtraDataVisitor : public osg::NodeVisitor
+    {
+    public:
+        ProcessExtraDataVisitor(Resource::SceneManager* sceneMgr) : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN), mSceneMgr(sceneMgr) {}
+
+        void apply(osg::Node& node) override;
+
+    private:
+        void setupSoftEffect(osg::Node& node, float size, bool falloff);
+
+        Resource::SceneManager* mSceneMgr;
+    };
+}
+
+#endif
diff --git a/components/shader/shadermanager.cpp b/components/shader/shadermanager.cpp
index 0ac96ce4dc..97162a8986 100644
--- a/components/shader/shadermanager.cpp
+++ b/components/shader/shadermanager.cpp
@@ -510,22 +510,31 @@ namespace Shader
                 program->addShader(linkedShader);
     }
 
-    int ShaderManager::reserveGlobalTextureUnits(int count)
+    int ShaderManager::reserveGlobalTextureUnits(Slot slot)
     {
+        int unit = mReservedTextureUnitsBySlot[static_cast<int>(slot)];
+        if (unit >= 0)
+            return unit;
+
         {
             // Texture units from `8 - numberOfShadowMaps` to `8` are used for shadows, so we skip them here.
             // TODO: Maybe instead of fixed texture units use `reserveGlobalTextureUnits` for shadows as well.
             static const int numberOfShadowMaps = Settings::Manager::getBool("enable shadows", "Shadows") ?
                                                   std::clamp(Settings::Manager::getInt("number of shadow maps", "Shadows"), 1, 8) :
                                                   0;
-            if (getAvailableTextureUnits() >= 8 && getAvailableTextureUnits() - count < 8)
+            if (getAvailableTextureUnits() >= 8 && getAvailableTextureUnits() - 1 < 8)
                 mReservedTextureUnits = mMaxTextureUnits - (8 - numberOfShadowMaps);
         }
 
-        if (getAvailableTextureUnits() < count + 1)
+        if (getAvailableTextureUnits() < 2)
             throw std::runtime_error("Can't reserve texture unit; no available units");
-        mReservedTextureUnits += count;
-        return mMaxTextureUnits - mReservedTextureUnits;
+        mReservedTextureUnits++;
+
+        unit = mMaxTextureUnits - mReservedTextureUnits;
+
+        mReservedTextureUnitsBySlot[static_cast<int>(slot)] = unit;
+
+        return unit;
     }
 
 }
diff --git a/components/shader/shadermanager.hpp b/components/shader/shadermanager.hpp
index 05c1b17bb4..4d3cc9937a 100644
--- a/components/shader/shadermanager.hpp
+++ b/components/shader/shadermanager.hpp
@@ -5,6 +5,7 @@
 #include <map>
 #include <mutex>
 #include <vector>
+#include <array>
 
 #include <osg/ref_ptr>
 
@@ -58,7 +59,13 @@ namespace Shader
         int getMaxTextureUnits() const { return mMaxTextureUnits; }
         int getAvailableTextureUnits() const { return mMaxTextureUnits - mReservedTextureUnits; }
 
-        int reserveGlobalTextureUnits(int count);
+        enum class Slot
+        {
+            OpaqueDepthTexture,
+            SkyTexture,
+        };
+
+        int reserveGlobalTextureUnits(Slot slot);
 
     private:
         void getLinkedShaders(osg::ref_ptr<osg::Shader> shader, const std::vector<std::string>& linkedShaderNames, const DefineMap& defines);
@@ -89,6 +96,8 @@ namespace Shader
 
         int mMaxTextureUnits = 0;
         int mReservedTextureUnits = 0;
+
+        std::array<int, 2> mReservedTextureUnitsBySlot = {-1, -1};
     };
 
     bool parseForeachDirective(std::string& source, const std::string& templateName, size_t foundPos);
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index b1b657daa1..6769da0ee2 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -19,6 +19,7 @@
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/stringops.hpp>
+#include <components/misc/osguservalues.hpp>
 #include <components/stereo/stereomanager.hpp>
 #include <components/resource/imagemanager.hpp>
 #include <components/vfs/manager.hpp>
@@ -30,50 +31,6 @@
 #include "removedalphafunc.hpp"
 #include "shadermanager.hpp"
 
-namespace
-{
-    class OpaqueDepthAttribute : public osg::StateAttribute
-    {
-    public:
-        OpaqueDepthAttribute() = default;
-
-        OpaqueDepthAttribute(const OpaqueDepthAttribute& copy, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY)
-            : osg::StateAttribute(copy, copyop), mTextures(copy.mTextures), mUnit(copy.mUnit) {}
-
-        void setTexturesAndUnit(const std::array<osg::ref_ptr<osg::Texture>, 2>& textures, int unit)
-        {
-            mTextures = textures;
-            mUnit = unit;
-        }
-
-        META_StateAttribute(Shader, OpaqueDepthAttribute, osg::StateAttribute::TEXTURE)
-
-        int compare(const StateAttribute& sa) const override
-        {
-            COMPARE_StateAttribute_Types(OpaqueDepthAttribute, sa);
-
-            COMPARE_StateAttribute_Parameter(mTextures);
-
-            return 0;
-        }
-
-        void apply(osg::State& state) const override
-        {
-            auto index = state.getFrameStamp()->getFrameNumber() % 2;
-
-            if (!mTextures[index])
-                return;
-
-            state.setActiveTextureUnit(mUnit);
-            state.applyTextureAttribute(mUnit, mTextures[index]);
-        }
-
-    private:
-        mutable std::array<osg::ref_ptr<osg::Texture>, 2> mTextures;
-        int mUnit;
-    };
-}
-
 namespace Shader
 {
     /**
@@ -198,7 +155,6 @@ namespace Shader
         , mNormalHeight(false)
         , mTexStageRequiringTangents(-1)
         , mSoftParticles(false)
-        , mSoftParticleSize(0.f)
         , mNode(nullptr)
     {
     }
@@ -308,6 +264,10 @@ namespace Shader
         if (node.getUserValue("shaderRequired", shaderRequired) && shaderRequired)
             mRequirements.back().mShaderRequired = true;
 
+        bool softEffect = false;
+        if (node.getUserValue(Misc::OsgUserValues::sXSoftEffect, softEffect) && softEffect)
+            mRequirements.back().mSoftParticles = true;
+
         // Make sure to disregard any state that came from a previous call to createProgram
         osg::ref_ptr<AddedState> addedState = getAddedState(*stateset);
 
@@ -681,28 +641,7 @@ namespace Shader
             updateRemovedState(*writableUserData, removedState);
         }
 
-        if (reqs.mSoftParticles && mOpaqueDepthTex.front())
-        {
-            osg::ref_ptr<osg::Depth> depth = new SceneUtil::AutoDepth;
-            depth->setWriteMask(false);
-            writableStateSet->setAttributeAndModes(depth, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
-            addedState->setAttributeAndModes(depth);
-
-            writableStateSet->addUniform(new osg::Uniform("particleSize", reqs.mSoftParticleSize));
-            addedState->addUniform("particleSize");
-
-            constexpr int unit = 2;
-
-            writableStateSet->addUniform(new osg::Uniform("opaqueDepthTex", unit));
-            addedState->addUniform("opaqueDepthTex");
-
-            osg::ref_ptr<OpaqueDepthAttribute> opaqueDepthAttr = new OpaqueDepthAttribute;
-            opaqueDepthAttr->setTexturesAndUnit(mOpaqueDepthTex, unit);
-            writableStateSet->setAttributeAndModes(opaqueDepthAttr, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
-            addedState->setAttributeAndModes(opaqueDepthAttr);
-        }
-
-        defineMap["softParticles"] = reqs.mSoftParticles && mOpaqueDepthTex.front() ? "1" : "0";
+        defineMap["softParticles"] = reqs.mSoftParticles ? "1" : "0";
 
         Stereo::Manager::instance().shaderStereoDefines(defineMap);
 
@@ -888,20 +827,12 @@ namespace Shader
 
     void ShaderVisitor::apply(osg::Drawable& drawable)
     {
-        auto partsys = dynamic_cast<osgParticle::ParticleSystem*>(&drawable);
-
-        bool needPop = drawable.getStateSet() || partsys;
+        bool needPop = drawable.getStateSet();
 
         if (needPop)
         {
             pushRequirements(drawable);
 
-            if (partsys)
-            {
-                mRequirements.back().mSoftParticles = true;
-                mRequirements.back().mSoftParticleSize = partsys->getDefaultParticleTemplate().getSizeRange().maximum;
-            }
-
             if (drawable.getStateSet())
                 applyStateSet(drawable.getStateSet(), drawable);
         }
@@ -982,11 +913,6 @@ namespace Shader
         mConvertAlphaTestToAlphaToCoverage = convert;
     }
 
-    void ShaderVisitor::setOpaqueDepthTex(osg::ref_ptr<osg::Texture> texturePing, osg::ref_ptr<osg::Texture> texturePong)
-    {
-        mOpaqueDepthTex = { texturePing, texturePong };
-    }
-
     ReinstateRemovedStateVisitor::ReinstateRemovedStateVisitor(bool allowedToModifyStateSets)
         : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
         , mAllowedToModifyStateSets(allowedToModifyStateSets)
diff --git a/components/shader/shadervisitor.hpp b/components/shader/shadervisitor.hpp
index 3ddcd9815f..dca97df7b6 100644
--- a/components/shader/shadervisitor.hpp
+++ b/components/shader/shadervisitor.hpp
@@ -48,8 +48,6 @@ namespace Shader
 
         void setConvertAlphaTestToAlphaToCoverage(bool convert);
 
-        void setOpaqueDepthTex(osg::ref_ptr<osg::Texture> texturePing, osg::ref_ptr<osg::Texture> texturePong);
-
         void setSupportsNormalsRT(bool supports) { mSupportsNormalsRT = supports; }
 
         void apply(osg::Node& node) override;
@@ -108,7 +106,6 @@ namespace Shader
             int mTexStageRequiringTangents;
 
             bool mSoftParticles;
-            float mSoftParticleSize;
 
             // the Node that requested these requirements
             osg::Node* mNode;
@@ -122,7 +119,6 @@ namespace Shader
         bool adjustGeometry(osg::Geometry& sourceGeometry, const ShaderRequirements& reqs);
 
         osg::ref_ptr<const osg::Program> mProgramTemplate;
-        std::array<osg::ref_ptr<osg::Texture>, 2> mOpaqueDepthTex;
     };
 
     class ReinstateRemovedStateVisitor : public osg::NodeVisitor
diff --git a/docs/source/reference/modding/custom-shader-effects.rst b/docs/source/reference/modding/custom-shader-effects.rst
new file mode 100644
index 0000000000..a21afcc7bd
--- /dev/null
+++ b/docs/source/reference/modding/custom-shader-effects.rst
@@ -0,0 +1,54 @@
+Custom Shader Effects
+#####################
+
+OpenMW leverages the `NiStringExtraData` node to inject special shader flags and effects.
+This nodes must have the prefix `omw:data` and have a valid JSON object that follows.
+
+.. note::
+
+    This is a new feature to inject OpenMW specific effects. Only a single
+    effect is currently supported. By default, the shader effects will propogate
+    to all a nodes children. Other propogation modes and effects will come with
+    future releases.
+
+See below to see the currently supported effects.
+
+Soft Effect
+-----------
+
+This effect softens the intersection of alpha-blended planes with other opaque
+geometry. This effect is automatically applied to all particle systems, but can
+be applied to any mesh or node. This is useful when layering many alpha-blended
+planes for various effects like steam over a hotspring or low hanging fog for
+dungeons.
+
+To use this feature the :ref:`soft particles` setting must be enabled.
+This settings can either be activated in the OpenMW launcher or changed in `settings.cfg`:
+
+::
+
+    [Shaders]
+    soft particles = true
+
+Variables.
+
++---------+--------------------------------------------------------------------------------------------------------+---------+---------+
+| Name    | Description                                                                                            | Type    | Default |
++---------+--------------------------------------------------------------------------------------------------------+---------+---------+
+| size    | Scaling ratio. Larger values will make a softer fade effect. Larger geometry requires higher values.   | integer | 45      |
++---------+--------------------------------------------------------------------------------------------------------+---------+---------+
+| falloff | Fades away geometry as camera gets closer. Geometry full fades when parallel to camera.                | boolean | false   |
++---------+--------------------------------------------------------------------------------------------------------+---------+---------+
+
+Example usage.
+
+::
+
+    omw:data {
+        "shader" : {
+            "soft_effect" : {
+                "size": 250,
+                "falloff" : false,
+            }
+        }
+    }
diff --git a/docs/source/reference/modding/index.rst b/docs/source/reference/modding/index.rst
index 1e8560930a..558600b562 100644
--- a/docs/source/reference/modding/index.rst
+++ b/docs/source/reference/modding/index.rst
@@ -26,6 +26,7 @@ about creating new content for OpenMW, please refer to
 	custom-models/index
 	font
 	sky-system
+	custom-shader-effects
 	extended
 	paths
 	localisation
diff --git a/files/shaders/lighting_util.glsl b/files/shaders/lighting_util.glsl
index 30e3dbf63a..e27f1b04ae 100644
--- a/files/shaders/lighting_util.glsl
+++ b/files/shaders/lighting_util.glsl
@@ -1,4 +1,3 @@
-#if !@lightingMethodFFP
 float quickstep(float x)
 {
     x = clamp(x, 0.0, 1.0);
@@ -6,7 +5,6 @@ float quickstep(float x)
     x = 1.0 - x*x;
     return x;
 }
-#endif
 
 #if @lightingMethodUBO
 
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index 6ebc7cbd62..265ed1513f 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -95,6 +95,7 @@ void main()
 #endif
 
     vec3 worldNormal = normalize(passNormal);
+    vec3 viewVec = normalize(passViewPos.xyz);
 
 #if @normalMap
     vec4 normalTex = texture2D(normalMap, normalMapUV);
@@ -164,7 +165,6 @@ void main()
 
 #if @normalMap
     // if using normal map + env map, take advantage of per-pixel normals for envTexCoordGen
-    vec3 viewVec = normalize(passViewPos.xyz);
     vec3 r = reflect( viewVec, viewNormal );
     float m = 2.0 * sqrt( r.x*r.x + r.y*r.y + (r.z+1.0)*(r.z+1.0) );
     envTexCoordGen = vec2(r.x/m + 0.5, r.y/m + 0.5);
@@ -226,13 +226,13 @@ void main()
 #if (!@normalMap && !@parallax && !@forcePPL)
         vec3 viewNormal = gl_NormalMatrix * worldNormal;
 #endif
-        gl_FragData[0].xyz += getSpecular(normalize(viewNormal), normalize(passViewPos.xyz), shininess, matSpec) * shadowing;
+        gl_FragData[0].xyz += getSpecular(normalize(viewNormal), viewVec, shininess, matSpec) * shadowing;
     }
 
     gl_FragData[0] = applyFogAtPos(gl_FragData[0], passViewPos);
 
 #if !defined(FORCE_OPAQUE) && @softParticles
-    gl_FragData[0].a *= calcSoftParticleFade();
+    gl_FragData[0].a *= calcSoftParticleFade(viewVec, viewNormal, passViewPos);
 #endif
 
 #if defined(FORCE_OPAQUE) && FORCE_OPAQUE
diff --git a/files/shaders/softparticles.glsl b/files/shaders/softparticles.glsl
index f2ed36a8ad..9a04c1f45e 100644
--- a/files/shaders/softparticles.glsl
+++ b/files/shaders/softparticles.glsl
@@ -1,6 +1,7 @@
 uniform float near;
 uniform sampler2D opaqueDepthTex;
 uniform float particleSize;
+uniform bool particleFade;
 
 float viewDepth(float depth)
 {
@@ -10,21 +11,28 @@ float viewDepth(float depth)
     return (near * far) / ((far - near) * depth - far);
 }
 
-float calcSoftParticleFade()
+float calcSoftParticleFade(in vec3 viewDir, in vec3 viewNormal, in vec3 viewPos)
 {
+    float euclidianDepth = length(viewPos);
+
     const float falloffMultiplier = 0.33;
     const float contrast = 1.30;
 
     vec2 screenCoords = gl_FragCoord.xy / screenRes;
-    float sceneDepth = viewDepth(texture2D(opaqueDepthTex, screenCoords).x);
-    float particleDepth = viewDepth(gl_FragCoord.z);
+
+    float depth = texture2D(opaqueDepthTex, screenCoords).x;
+
+    float sceneDepth = viewDepth(depth);
+    float particleDepth = passViewPos.z;
     float falloff = particleSize * falloffMultiplier;
     float delta = particleDepth - sceneDepth;
 
-    if (delta < 0.0)
-        discard;
+    const float nearMult = 300.0;
+    float viewBias = 1.0;
 
-    const float shift = 0.845;
+    if (particleFade)
+        viewBias = abs(dot(-viewDir, viewNormal) * quickstep(euclidianDepth / nearMult));
 
-    return shift * pow(clamp(delta/falloff, 0.0, 1.0), contrast);
+    const float shift = 0.845;
+    return shift * pow(clamp(delta/falloff, 0.0, 1.0), contrast) * viewBias;
 }

From 466fc559f416acec481580b707f9b78effe5d423 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Thu, 30 Jun 2022 11:25:36 +0200
Subject: [PATCH 2697/2859] Fix move360.lua switching to 3rd person view when
 it shouldn't

---
 files/data/scripts/omw/camera/move360.lua | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/files/data/scripts/omw/camera/move360.lua b/files/data/scripts/omw/camera/move360.lua
index 5247c03a30..08b0fe29d6 100644
--- a/files/data/scripts/omw/camera/move360.lua
+++ b/files/data/scripts/omw/camera/move360.lua
@@ -59,7 +59,12 @@ function M.onFrame(dt)
 end
 
 function M.onInputAction(action)
-    if not active or core.isWorldPaused() then return end
+    if not active or core.isWorldPaused() or
+       not input.getControlSwitch(input.CONTROL_SWITCH.ViewMode) or
+       not input.getControlSwitch(input.CONTROL_SWITCH.Controls) or
+       not I.Camera.isModeControlEnabled() then
+        return
+    end
     if action == input.ACTION.ZoomIn and camera.getMode() == MODE.Preview
        and I.Camera.getBaseThirdPersonDistance() == 30 then
         self.controls.yawChange = camera.getYaw() - self.rotation.z

From 7b958148d051d431fa232fbac5ac79f901131f94 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Thu, 30 Jun 2022 08:23:28 -0700
Subject: [PATCH 2698/2859] better fade

---
 files/shaders/softparticles.glsl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/files/shaders/softparticles.glsl b/files/shaders/softparticles.glsl
index 9a04c1f45e..c4bb90ebe2 100644
--- a/files/shaders/softparticles.glsl
+++ b/files/shaders/softparticles.glsl
@@ -30,8 +30,10 @@ float calcSoftParticleFade(in vec3 viewDir, in vec3 viewNormal, in vec3 viewPos)
     const float nearMult = 300.0;
     float viewBias = 1.0;
 
-    if (particleFade)
-        viewBias = abs(dot(-viewDir, viewNormal) * quickstep(euclidianDepth / nearMult));
+    if (particleFade) {
+        float VdotN = dot(viewDir, viewNormal);
+        viewBias = abs(VdotN) * quickstep(euclidianDepth / nearMult) * (1.0 - pow(1.0 + VdotN, 1.3));
+    }
 
     const float shift = 0.845;
     return shift * pow(clamp(delta/falloff, 0.0, 1.0), contrast) * viewBias;

From c081b8cfa9624b12fe830f1455b5c3a4e81dc1aa Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Thu, 30 Jun 2022 20:57:51 +0200
Subject: [PATCH 2699/2859] Don't load content entries from global and local
 configs

---
 apps/launcher/maindialog.cpp       | 54 ++++++++++--------------------
 components/config/gamesettings.cpp | 12 ++++---
 components/config/gamesettings.hpp |  6 ++--
 3 files changed, 28 insertions(+), 44 deletions(-)

diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp
index 5492538306..b7b4c0b4b9 100644
--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@@ -334,54 +334,36 @@ bool Launcher::MainDialog::setupGameSettings()
     QString userPath = QString::fromUtf8(mCfgMgr.getUserConfigPath().string().c_str());
     QString globalPath = QString::fromUtf8(mCfgMgr.getGlobalPath().string().c_str());
 
-    // Load the user config file first, separately
-    // So we can write it properly, uncontaminated
-    QString path = userPath + QLatin1String("openmw.cfg");
-    QFile file(path);
+    QFile file;
 
-    qDebug() << "Loading config file:" << path.toUtf8().constData();
-
-    if (file.exists()) {
-        if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-            cfgError(tr("Error opening OpenMW configuration file"),
-                     tr("<br><b>Could not open %0 for reading</b><br><br> \
-                         Please make sure you have the right permissions \
-                         and try again.<br>").arg(file.fileName()));
-            return false;
-        }
-        QTextStream stream(&file);
-        stream.setCodec(QTextCodec::codecForName("UTF-8"));
-
-        mGameSettings.readUserFile(stream);
-        file.close();
-    }
-
-    // Now the rest - priority: user > local > global
-    QStringList paths;
-    paths.append(globalPath + QString("openmw.cfg"));
-    paths.append(localPath + QString("openmw.cfg"));
-    paths.append(userPath + QString("openmw.cfg"));
-
-    for (const QString &path2 : paths)
+    auto loadFile = [&] (const QString& path, bool(Config::GameSettings::*reader)(QTextStream&, bool), bool ignoreContent = false)
     {
-        qDebug() << "Loading config file:" << path2.toUtf8().constData();
-
-        file.setFileName(path2);
+        qDebug() << "Loading config file:" << path.toUtf8().constData();
+        file.setFileName(path);
         if (file.exists()) {
             if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
                 cfgError(tr("Error opening OpenMW configuration file"),
-                         tr("<br><b>Could not open %0 for reading</b><br><br> \
-                             Please make sure you have the right permissions \
-                             and try again.<br>").arg(file.fileName()));
+                        tr("<br><b>Could not open %0 for reading</b><br><br> \
+                            Please make sure you have the right permissions \
+                            and try again.<br>").arg(file.fileName()));
                 return false;
             }
             QTextStream stream(&file);
             stream.setCodec(QTextCodec::codecForName("UTF-8"));
 
-            mGameSettings.readFile(stream);
+            (mGameSettings.*reader)(stream, ignoreContent);
             file.close();
         }
-    }
+    };
+
+    // Load the user config file first, separately
+    // So we can write it properly, uncontaminated
+    loadFile(userPath + QLatin1String("openmw.cfg"), &Config::GameSettings::readUserFile);
+
+    // Now the rest - priority: user > local > global
+    loadFile(globalPath + QString("openmw.cfg"), &Config::GameSettings::readFile, true);
+    loadFile(localPath + QString("openmw.cfg"), &Config::GameSettings::readFile, true);
+    loadFile(userPath + QString("openmw.cfg"), &Config::GameSettings::readFile);
 
     return true;
 }
diff --git a/components/config/gamesettings.cpp b/components/config/gamesettings.cpp
index 0ec13abe36..3598e739b5 100644
--- a/components/config/gamesettings.cpp
+++ b/components/config/gamesettings.cpp
@@ -80,17 +80,17 @@ QStringList Config::GameSettings::values(const QString &key, const QStringList &
     return defaultValues;
 }
 
-bool Config::GameSettings::readFile(QTextStream &stream)
+bool Config::GameSettings::readFile(QTextStream &stream, bool ignoreContent)
 {
-    return readFile(stream, mSettings);
+    return readFile(stream, mSettings, ignoreContent);
 }
 
-bool Config::GameSettings::readUserFile(QTextStream &stream)
+bool Config::GameSettings::readUserFile(QTextStream &stream, bool ignoreContent)
 {
-    return readFile(stream, mUserSettings);
+    return readFile(stream, mUserSettings, ignoreContent);
 }
 
-bool Config::GameSettings::readFile(QTextStream &stream, QMultiMap<QString, QString> &settings)
+bool Config::GameSettings::readFile(QTextStream &stream, QMultiMap<QString, QString> &settings, bool ignoreContent)
 {
     QMultiMap<QString, QString> cache;
     QRegExp keyRe("^([^=]+)\\s*=\\s*(.+)$");
@@ -139,6 +139,8 @@ bool Config::GameSettings::readFile(QTextStream &stream, QMultiMap<QString, QStr
                     }
                 }
             }
+            else if(ignoreContent && key == QLatin1String("content"))
+                continue;
 
             QStringList values = cache.values(key);
             values.append(settings.values(key));
diff --git a/components/config/gamesettings.hpp b/components/config/gamesettings.hpp
index d4191523ad..970a35a504 100644
--- a/components/config/gamesettings.hpp
+++ b/components/config/gamesettings.hpp
@@ -64,9 +64,9 @@ namespace Config
 
         QStringList values(const QString &key, const QStringList &defaultValues = QStringList()) const;
 
-        bool readFile(QTextStream &stream);
-        bool readFile(QTextStream &stream, QMultiMap<QString, QString> &settings);
-        bool readUserFile(QTextStream &stream);
+        bool readFile(QTextStream &stream, bool ignoreContent = false);
+        bool readFile(QTextStream &stream, QMultiMap<QString, QString> &settings, bool ignoreContent = false);
+        bool readUserFile(QTextStream &stream, bool ignoreContent = false);
 
         bool writeFile(QTextStream &stream);
         bool writeFileWithComments(QFile &file);

From b10937ecd4fc300bc601f2ed4a44ac3be4d11f70 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Thu, 30 Jun 2022 22:08:40 +0200
Subject: [PATCH 2700/2859] Fix links to the wiki

---
 README.md                                           | 10 +++++-----
 docs/source/manuals/installation/install-openmw.rst |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index bf81c58e7e..2f21f8211b 100644
--- a/README.md
+++ b/README.md
@@ -18,18 +18,18 @@ Font Licenses:
 Current Status
 --------------
 
-The main quests in Morrowind, Tribunal and Bloodmoon are all completable. Some issues with side quests are to be expected (but rare). Check the [bug tracker](https://gitlab.com/OpenMW/openmw/issues?label_name%5B%5D=1.0) for a list of issues we need to resolve before the "1.0" release. Even before the "1.0" release however, OpenMW boasts some new [features](https://gitlab.com/OpenMW/openmw/-/wikis/features), such as improved graphics and user interfaces.
+The main quests in Morrowind, Tribunal and Bloodmoon are all completable. Some issues with side quests are to be expected (but rare). Check the [bug tracker](https://gitlab.com/OpenMW/openmw/issues?label_name%5B%5D=1.0) for a list of issues we need to resolve before the "1.0" release. Even before the "1.0" release however, OpenMW boasts some new [features](https://wiki.openmw.org/index.php?title=Features), such as improved graphics and user interfaces.
 
-Pre-existing modifications created for the original Morrowind engine can be hit-and-miss. The OpenMW script compiler performs more thorough error-checking than Morrowind does, meaning that a mod created for Morrowind may not necessarily run in OpenMW. Some mods also rely on quirky behaviour or engine bugs in order to work. We are considering such compatibility issues on a case-by-case basis - in some cases adding a workaround to OpenMW may be feasible, in other cases fixing the mod will be the only option. If you know of any mods that work or don't work, feel free to add them to the [Mod status](https://old-wiki.openmw.org/index.php?title=Mod_status) wiki page.
+Pre-existing modifications created for the original Morrowind engine can be hit-and-miss. The OpenMW script compiler performs more thorough error-checking than Morrowind does, meaning that a mod created for Morrowind may not necessarily run in OpenMW. Some mods also rely on quirky behaviour or engine bugs in order to work. We are considering such compatibility issues on a case-by-case basis - in some cases adding a workaround to OpenMW may be feasible, in other cases fixing the mod will be the only option. If you know of any mods that work or don't work, feel free to add them to the [Mod status](https://wiki.openmw.org/index.php?title=Mod_status) wiki page.
 
 Getting Started
 ---------------
 
 * [Official forums](https://forum.openmw.org/)
 * [Installation instructions](https://openmw.readthedocs.io/en/latest/manuals/installation/index.html)
-* [Build from source](https://gitlab.com/OpenMW/openmw/-/wikis/development/development_environment_setup)
-* [Testing the game](https://old-wiki.openmw.org/index.php?title=Testing)
-* [How to contribute](https://old-wiki.openmw.org/index.php?title=Contribution_Wanted)
+* [Build from source](https://wiki.openmw.org/index.php?title=Development_Environment_Setup)
+* [Testing the game](https://wiki.openmw.org/index.php?title=Testing)
+* [How to contribute](https://wiki.openmw.org/index.php?title=Contribution_Wanted)
 * [Report a bug](https://gitlab.com/OpenMW/openmw/issues) - read the [guidelines](https://wiki.openmw.org/index.php?title=Bug_Reporting_Guidelines) before submitting your first bug!
 * [Known issues](https://gitlab.com/OpenMW/openmw/issues?label_name%5B%5D=Bug)
 
diff --git a/docs/source/manuals/installation/install-openmw.rst b/docs/source/manuals/installation/install-openmw.rst
index 2c7ec6fde1..50efe7542d 100644
--- a/docs/source/manuals/installation/install-openmw.rst
+++ b/docs/source/manuals/installation/install-openmw.rst
@@ -18,7 +18,7 @@ and run the install package once downloaded. It's now installed!
 The (bleeding edge) Source Way
 ==============================
 
-Visit the `Development Environment Setup <https://gitlab.com/OpenMW/openmw/-/wikis/development/development_environment_setup>`_
+Visit the `Development Environment Setup <https://wiki.openmw.org/index.php?title=Development_Environment_Setup>`_
 section of the Wiki for detailed instructions on how to build the engine.
 
 The Ubuntu Way

From 7e6c13630a9df6d62d5320eb14af64975d9eb112 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 1 Jul 2022 14:05:17 +0000
Subject: [PATCH 2701/2859] Use target_precompile_headers for the most
 expensive headers

---
 CMakeLists.txt                               |  7 ++++-
 apps/benchmarks/CMakeLists.txt               |  4 +++
 apps/bsatool/CMakeLists.txt                  |  8 +++++
 apps/bulletobjecttool/CMakeLists.txt         |  7 +++++
 apps/esmtool/CMakeLists.txt                  |  8 +++++
 apps/essimporter/CMakeLists.txt              | 10 ++++++
 apps/launcher/CMakeLists.txt                 |  9 ++++++
 apps/mwiniimporter/CMakeLists.txt            |  9 ++++++
 apps/navmeshtool/CMakeLists.txt              |  9 ++++++
 apps/niftest/CMakeLists.txt                  |  4 +++
 apps/opencs/CMakeLists.txt                   | 15 +++++++++
 apps/openmw/CMakeLists.txt                   | 29 +++++++++++++++--
 apps/openmw/mwgui/messagebox.cpp             |  2 --
 apps/openmw/mwgui/messagebox.hpp             |  2 --
 apps/openmw/mwworld/weather.cpp              |  4 +--
 apps/openmw_test_suite/CMakeLists.txt        | 17 ++++++++++
 components/CMakeLists.txt                    | 33 ++++++++++++++++++--
 components/files/windowspath.cpp             |  6 ++++
 extern/Base64/CMakeLists.txt                 |  6 +++-
 extern/CMakeLists.txt                        |  4 +++
 extern/oics/CMakeLists.txt                   |  4 +++
 extern/osg-ffmpeg-videoplayer/CMakeLists.txt | 10 ++++++
 22 files changed, 193 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10edfb0f97..2450d0016f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -346,7 +346,12 @@ if (WIN32)
     add_definitions(-DSDL_MAIN_HANDLED)
 
     # Get rid of useless crud from windows.h
-    add_definitions(-DNOMINMAX -DWIN32_LEAN_AND_MEAN)
+    add_definitions(
+        -DNOMINMAX # name conflict with std::min, std::max
+        -DWIN32_LEAN_AND_MEAN
+        -DNOMB # name conflict with MWGui::MessageBox
+        -DNOGDI # name conflict with osgAnimation::MorphGeometry::RELATIVE
+    )
 endif()
 
 if(OPENMW_USE_SYSTEM_BULLET)
diff --git a/apps/benchmarks/CMakeLists.txt b/apps/benchmarks/CMakeLists.txt
index c96531a666..095a841742 100644
--- a/apps/benchmarks/CMakeLists.txt
+++ b/apps/benchmarks/CMakeLists.txt
@@ -9,3 +9,7 @@ target_link_libraries(openmw_detournavigator_navmeshtilescache_benchmark benchma
 if (UNIX AND NOT APPLE)
     target_link_libraries(openmw_detournavigator_navmeshtilescache_benchmark ${CMAKE_THREAD_LIBS_INIT})
 endif()
+
+if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16 AND MSVC)
+    target_precompile_headers(openmw_detournavigator_navmeshtilescache_benchmark PRIVATE <algorithm>)
+endif()
diff --git a/apps/bsatool/CMakeLists.txt b/apps/bsatool/CMakeLists.txt
index 85188dbe9f..6312c33aaf 100644
--- a/apps/bsatool/CMakeLists.txt
+++ b/apps/bsatool/CMakeLists.txt
@@ -17,3 +17,11 @@ if (BUILD_WITH_CODE_COVERAGE)
   add_definitions (--coverage)
   target_link_libraries(bsatool gcov)
 endif()
+
+if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16 AND MSVC)
+    target_precompile_headers(bsatool PRIVATE
+        <filesystem>
+        <fstream>
+        <vector>
+    )
+endif()
diff --git a/apps/bulletobjecttool/CMakeLists.txt b/apps/bulletobjecttool/CMakeLists.txt
index 6beb411e20..bc19a29e21 100644
--- a/apps/bulletobjecttool/CMakeLists.txt
+++ b/apps/bulletobjecttool/CMakeLists.txt
@@ -18,3 +18,10 @@ endif()
 if (WIN32)
     install(TARGETS openmw-bulletobjecttool RUNTIME DESTINATION ".")
 endif()
+
+if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16 AND MSVC)
+    target_precompile_headers(openmw-bulletobjecttool PRIVATE
+        <string>
+        <vector>
+    )
+endif()
diff --git a/apps/esmtool/CMakeLists.txt b/apps/esmtool/CMakeLists.txt
index 914a40699e..841fb4b219 100644
--- a/apps/esmtool/CMakeLists.txt
+++ b/apps/esmtool/CMakeLists.txt
@@ -24,3 +24,11 @@ if (BUILD_WITH_CODE_COVERAGE)
   add_definitions (--coverage)
   target_link_libraries(esmtool gcov)
 endif()
+
+if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16 AND MSVC)
+    target_precompile_headers(esmtool PRIVATE
+        <fstream>
+        <string>
+        <vector>
+    )
+endif()
diff --git a/apps/essimporter/CMakeLists.txt b/apps/essimporter/CMakeLists.txt
index 3dafba09ba..add5ad6d05 100644
--- a/apps/essimporter/CMakeLists.txt
+++ b/apps/essimporter/CMakeLists.txt
@@ -47,3 +47,13 @@ endif()
 if (WIN32)
   INSTALL(TARGETS openmw-essimporter RUNTIME DESTINATION ".")
 endif(WIN32)
+
+if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16 AND MSVC)
+    target_precompile_headers(openmw-essimporter PRIVATE
+        <algorithm>
+        <filesystem>
+        <fstream>
+        <string>
+        <vector>
+    )
+endif()
diff --git a/apps/launcher/CMakeLists.txt b/apps/launcher/CMakeLists.txt
index e3256519c3..79a27094f2 100644
--- a/apps/launcher/CMakeLists.txt
+++ b/apps/launcher/CMakeLists.txt
@@ -96,3 +96,12 @@ if(USE_QT)
     set_property(TARGET openmw-launcher PROPERTY AUTOMOC ON)
 endif(USE_QT)
 
+if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16 AND MSVC)
+    target_precompile_headers(openmw-launcher PRIVATE
+        <boost/program_options/options_description.hpp>
+
+        <algorithm>
+        <string>
+        <vector>
+    )
+endif()
diff --git a/apps/mwiniimporter/CMakeLists.txt b/apps/mwiniimporter/CMakeLists.txt
index e83656708b..d35f4f4d33 100644
--- a/apps/mwiniimporter/CMakeLists.txt
+++ b/apps/mwiniimporter/CMakeLists.txt
@@ -33,3 +33,12 @@ if (BUILD_WITH_CODE_COVERAGE)
   add_definitions (--coverage)
   target_link_libraries(openmw-iniimporter gcov)
 endif()
+
+if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16 AND MSVC)
+    target_precompile_headers(openmw-iniimporter PRIVATE
+        <boost/filesystem.hpp>
+
+        <string>
+        <vector>
+    )
+endif()
diff --git a/apps/navmeshtool/CMakeLists.txt b/apps/navmeshtool/CMakeLists.txt
index 7df049af97..9f57d52a7e 100644
--- a/apps/navmeshtool/CMakeLists.txt
+++ b/apps/navmeshtool/CMakeLists.txt
@@ -20,3 +20,12 @@ endif()
 if (WIN32)
     install(TARGETS openmw-navmeshtool RUNTIME DESTINATION ".")
 endif()
+
+if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16 AND MSVC)
+    target_precompile_headers(openmw-navmeshtool PRIVATE
+        <algorithm>
+        <memory>
+        <string>
+        <vector>
+    )
+endif()
diff --git a/apps/niftest/CMakeLists.txt b/apps/niftest/CMakeLists.txt
index 856404c1ce..2f0dcb59e3 100644
--- a/apps/niftest/CMakeLists.txt
+++ b/apps/niftest/CMakeLists.txt
@@ -16,3 +16,7 @@ if (BUILD_WITH_CODE_COVERAGE)
   add_definitions (--coverage)
   target_link_libraries(niftest gcov)
 endif()
+
+if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16 AND MSVC)
+    target_precompile_headers(niftest PRIVATE <filesystem>)
+endif()
diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index b3d405d1a3..8a3a41c824 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -261,3 +261,18 @@ endif()
 if(USE_QT)
     set_property(TARGET openmw-cs PROPERTY AUTOMOC ON)
 endif(USE_QT)
+
+if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16 AND MSVC)
+    target_precompile_headers(openmw-cs PRIVATE
+        <boost/filesystem.hpp>
+        <boost/program_options/options_description.hpp>
+
+        <algorithm>
+        <fstream>
+        <functional>
+        <ostream>
+        <string>
+        <string_view>
+        <vector>
+    )
+endif()
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 24152d59ab..75d051c63b 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -157,9 +157,32 @@ target_link_libraries(openmw
     components
 )
 
-if (MSVC AND CMAKE_VERSION VERSION_GREATER_EQUAL 3.16)
-    target_precompile_headers(openmw PRIVATE ${SOL_INCLUDE_DIR}/sol/sol.hpp)
-endif ()
+if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16 AND MSVC)
+    target_precompile_headers(openmw PRIVATE
+        <boost/filesystem.hpp>
+        <boost/program_options/options_description.hpp>
+
+        <sol/sol.hpp>
+
+        <osg/StateSet>
+        <osg/Node>
+        <osg/Drawable>
+        <osg/Camera>
+
+        <osgViewer/Viewer>
+
+        <MyGUI_Widget.h>
+
+        <algorithm>
+        <filesystem>
+        <fstream>
+        <functional>
+        <memory>
+        <string>
+        <string_view>
+        <vector>
+    )
+endif()
 
 if (ANDROID)
     target_link_libraries(openmw EGL android log z)
diff --git a/apps/openmw/mwgui/messagebox.cpp b/apps/openmw/mwgui/messagebox.cpp
index 890406cd12..ccacdba108 100644
--- a/apps/openmw/mwgui/messagebox.cpp
+++ b/apps/openmw/mwgui/messagebox.cpp
@@ -13,8 +13,6 @@
 #include "../mwbase/inputmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 
-#undef MessageBox
-
 namespace MWGui
 {
 
diff --git a/apps/openmw/mwgui/messagebox.hpp b/apps/openmw/mwgui/messagebox.hpp
index d46d31d938..59118ce6c2 100644
--- a/apps/openmw/mwgui/messagebox.hpp
+++ b/apps/openmw/mwgui/messagebox.hpp
@@ -3,8 +3,6 @@
 
 #include "windowbase.hpp"
 
-#undef MessageBox
-
 namespace MyGUI
 {
     class Widget;
diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index 74cab7a461..062796e914 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -23,6 +23,8 @@
 
 #include <cmath>
 
+namespace MWWorld
+{
 namespace
 {
     static const int invalidWeatherID = -1;
@@ -53,8 +55,6 @@ namespace
     }
 }
 
-namespace MWWorld
-{
     template <typename T>
     T TimeOfDayInterpolator<T>::getValue(const float gameHour, const TimeOfDaySettings& timeSettings, const std::string& prefix) const
     {
diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index 739d3394b4..072514d0cc 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -110,4 +110,21 @@ if (GTEST_FOUND AND GMOCK_FOUND)
         PRIVATE OPENMW_DATA_DIR="${CMAKE_CURRENT_BINARY_DIR}/data"
                 OPENMW_TEST_SUITE_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
 
+    if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16 AND MSVC)
+        target_precompile_headers(openmw_test_suite PRIVATE
+            <boost/program_options/options_description.hpp>
+
+            <gtest/gtest.h>
+
+            <sol/sol.hpp>
+
+            <algorithm>
+            <filesystem>
+            <fstream>
+            <functional>
+            <memory>
+            <string>
+            <vector>
+        )
+    endif()
 endif()
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index a4e1d32e99..9a2295671e 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -498,6 +498,33 @@ if(USE_QT)
     set_property(TARGET components_qt PROPERTY AUTOMOC ON)
 endif(USE_QT)
 
-if (MSVC AND CMAKE_VERSION VERSION_GREATER_EQUAL 3.16)
-    target_precompile_headers(components PRIVATE ${SOL_INCLUDE_DIR}/sol/sol.hpp)
-endif ()
+if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16 AND MSVC)
+    target_precompile_headers(components PUBLIC
+        <sol/sol.hpp>
+
+        <osg/State>
+        <osg/StateSet>
+        <osg/Node>
+        <osg/Drawable>
+        <osg/Camera>
+
+        <MyGUI_Widget.h>
+
+        <boost/filesystem.hpp>
+
+        <algorithm>
+        <filesystem>
+        <fstream>
+        <functional>
+        <memory>
+        <ostream>
+        <string>
+        <vector>
+    )
+
+    target_precompile_headers(components PRIVATE
+        <osgViewer/Viewer>
+
+        <boost/program_options/options_description.hpp>
+    )
+endif()
diff --git a/components/files/windowspath.cpp b/components/files/windowspath.cpp
index 92d1a9ff09..8a17acec9d 100644
--- a/components/files/windowspath.cpp
+++ b/components/files/windowspath.cpp
@@ -4,10 +4,16 @@
 
 #include <cstring>
 
+#define FAR
+#define NEAR
+
 #include <shlobj.h>
 #include <shlwapi.h>
 #include <winreg.h>
 
+#undef NEAR
+#undef FAR
+
 #include <boost/locale.hpp>
 namespace bconv = boost::locale::conv;
 
diff --git a/extern/Base64/CMakeLists.txt b/extern/Base64/CMakeLists.txt
index d1adf91bcb..4430d7648e 100644
--- a/extern/Base64/CMakeLists.txt
+++ b/extern/Base64/CMakeLists.txt
@@ -1,2 +1,6 @@
 add_library(Base64 INTERFACE)
-target_include_directories(Base64 INTERFACE .)
\ No newline at end of file
+target_include_directories(Base64 INTERFACE .)
+
+if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16 AND MSVC)
+    target_precompile_headers(Base64 INTERFACE <string>)
+endif()
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 898dfeffad..c183fe455b 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -241,6 +241,10 @@ if (NOT OPENMW_USE_SYSTEM_YAML_CPP)
         SOURCE_DIR fetched/yaml-cpp
     )
     FetchContent_MakeAvailableExcludeFromAll(yaml-cpp)
+
+    if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16 AND MSVC)
+        target_precompile_headers(yaml-cpp PRIVATE <algorithm>)
+    endif()
 endif()
 
 if (NOT OPENMW_USE_SYSTEM_ICU)
diff --git a/extern/oics/CMakeLists.txt b/extern/oics/CMakeLists.txt
index 00d77f52c6..585df5dd41 100644
--- a/extern/oics/CMakeLists.txt
+++ b/extern/oics/CMakeLists.txt
@@ -19,3 +19,7 @@ else()
     )
     target_link_libraries(oics local_tinyxml)
 endif()
+
+if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16 AND MSVC)
+    target_precompile_headers(oics PUBLIC <algorithm> <string>)
+endif()
diff --git a/extern/osg-ffmpeg-videoplayer/CMakeLists.txt b/extern/osg-ffmpeg-videoplayer/CMakeLists.txt
index ae19be8659..1bbe672d78 100644
--- a/extern/osg-ffmpeg-videoplayer/CMakeLists.txt
+++ b/extern/osg-ffmpeg-videoplayer/CMakeLists.txt
@@ -16,3 +16,13 @@ target_link_libraries(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} ${FFmpeg_LIBRARIES})
 target_link_libraries(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} ${OSG_LIBRARIES})
 
 link_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16 AND MSVC)
+    target_precompile_headers(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} PUBLIC
+        <memory>
+        <string>
+        <vector>
+    )
+
+    target_precompile_headers(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} PRIVATE <algorithm>)
+endif()

From 03616ae2d35a519942cf9e36e9c8c658ebe15ba6 Mon Sep 17 00:00:00 2001
From: Cody Glassman <glassmancody.info@gmail.com>
Date: Fri, 1 Jul 2022 14:34:59 +0000
Subject: [PATCH 2702/2859] Fix undeclared shader variable

---
 files/shaders/objects_fragment.glsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index 3a8905c2cd..caf8b672ca 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -113,7 +113,7 @@ void main()
     vec3 viewNormal = gl_NormalMatrix * worldNormal;
 #endif
 
-#if (!@normalMap && (@parallax || @forcePPL))
+#if (!@normalMap && (@parallax || @forcePPL || @softParticles))
     vec3 viewNormal = gl_NormalMatrix * worldNormal;
 #endif
 

From 2d6e048d88f8a076608fff29cdb0387b8c582a09 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 1 Jul 2022 13:59:38 +0200
Subject: [PATCH 2703/2859] Fix C4589 msvc warning

Constructor of abstract class 'SceneUtil::KeyframeController' ignores initializer for virtual base class 'osg::Object'
---
 components/nifosg/controller.cpp        | 3 ++-
 components/sceneutil/keyframe.hpp       | 5 ++---
 components/sceneutil/osgacontroller.cpp | 7 +++++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/components/nifosg/controller.cpp b/components/nifosg/controller.cpp
index 071541c196..b2beead8bd 100644
--- a/components/nifosg/controller.cpp
+++ b/components/nifosg/controller.cpp
@@ -71,7 +71,8 @@ KeyframeController::KeyframeController()
 }
 
 KeyframeController::KeyframeController(const KeyframeController &copy, const osg::CopyOp &copyop)
-    : SceneUtil::KeyframeController(copy, copyop)
+    : osg::Object(copy, copyop)
+    , SceneUtil::KeyframeController(copy)
     , SceneUtil::NodeCallback<KeyframeController, NifOsg::MatrixTransform*>(copy, copyop)
     , mRotations(copy.mRotations)
     , mXRotations(copy.mXRotations)
diff --git a/components/sceneutil/keyframe.hpp b/components/sceneutil/keyframe.hpp
index 59a87ab08e..eee8d6646c 100644
--- a/components/sceneutil/keyframe.hpp
+++ b/components/sceneutil/keyframe.hpp
@@ -17,9 +17,8 @@ namespace SceneUtil
     public:
         KeyframeController() {}
 
-        KeyframeController(const KeyframeController& copy, const osg::CopyOp& copyop)
-            : osg::Object(copy, copyop)
-            , SceneUtil::Controller(copy) {}
+        KeyframeController(const KeyframeController& copy)
+            : SceneUtil::Controller(copy) {}
 
         virtual osg::Vec3f getTranslation(float time) const  { return osg::Vec3f(); }
 
diff --git a/components/sceneutil/osgacontroller.cpp b/components/sceneutil/osgacontroller.cpp
index 4d0f7a460a..0f9cf4ce6e 100644
--- a/components/sceneutil/osgacontroller.cpp
+++ b/components/sceneutil/osgacontroller.cpp
@@ -68,8 +68,11 @@ namespace SceneUtil
             traverse( node );
     }
 
-    OsgAnimationController::OsgAnimationController(const OsgAnimationController &copy, const osg::CopyOp &copyop) : SceneUtil::KeyframeController(copy, copyop), SceneUtil::NodeCallback<OsgAnimationController>(copy, copyop)
-    , mEmulatedAnimations(copy.mEmulatedAnimations)
+    OsgAnimationController::OsgAnimationController(const OsgAnimationController &copy, const osg::CopyOp &copyop)
+        : osg::Object(copy, copyop)
+        , SceneUtil::KeyframeController(copy)
+        , SceneUtil::NodeCallback<OsgAnimationController>(copy, copyop)
+        , mEmulatedAnimations(copy.mEmulatedAnimations)
     {
         mLinker = nullptr;
         for (const auto& mergedAnimationTrack : copy.mMergedAnimationTracks)

From 8544aa481cdeeafa6443e6eb473b25ec3326fced Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 1 Jul 2022 14:25:23 +0200
Subject: [PATCH 2704/2859] Fix C4459 msvc warning

declaration of 'navMeshVersion' hides global declaration
---
 .../detournavigator/asyncnavmeshupdater.cpp                 | 2 +-
 components/detournavigator/asyncnavmeshupdater.cpp          | 4 ++--
 components/detournavigator/generatenavmeshtile.cpp          | 6 +++---
 components/detournavigator/settings.hpp                     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp b/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp
index 71a833cc26..acfd5656b2 100644
--- a/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp
+++ b/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp
@@ -150,7 +150,7 @@ namespace
                                           serialize(mSettings.mRecast, mAgentBounds, *recastMesh, objects));
         ASSERT_TRUE(tile.has_value());
         EXPECT_EQ(tile->mTileId, 1);
-        EXPECT_EQ(tile->mVersion, navMeshVersion);
+        EXPECT_EQ(tile->mVersion, navMeshFormatVersion);
     }
 
     TEST_F(DetourNavigatorAsyncNavMeshUpdaterTest, post_when_writing_to_db_disabled_should_not_write_tiles)
diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index e6b07d3f36..ee6cf453b8 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -92,7 +92,7 @@ namespace DetourNavigator
         {
             if (db == nullptr)
                 return nullptr;
-            return std::make_unique<DbWorker>(updater, std::move(db), TileVersion(navMeshVersion),
+            return std::make_unique<DbWorker>(updater, std::move(db), TileVersion(navMeshFormatVersion),
                                               settings.mRecast, settings.mWriteToNavMeshDb);
         }
 
@@ -483,7 +483,7 @@ namespace DetourNavigator
         std::unique_ptr<PreparedNavMeshData> preparedNavMeshData;
         bool generatedNavMeshData = false;
 
-        if (job.mCachedTileData.has_value() && job.mCachedTileData->mVersion == navMeshVersion)
+        if (job.mCachedTileData.has_value() && job.mCachedTileData->mVersion == navMeshFormatVersion)
         {
             preparedNavMeshData = std::make_unique<PreparedNavMeshData>();
             if (deserialize(job.mCachedTileData->mData, *preparedNavMeshData))
diff --git a/components/detournavigator/generatenavmeshtile.cpp b/components/detournavigator/generatenavmeshtile.cpp
index 41b60d4a75..2beb9d6468 100644
--- a/components/detournavigator/generatenavmeshtile.cpp
+++ b/components/detournavigator/generatenavmeshtile.cpp
@@ -73,7 +73,7 @@ namespace DetourNavigator
             std::vector<std::byte> input = serialize(mSettings.mRecast, mAgentBounds, *recastMesh, objects);
             const std::optional<NavMeshTileInfo> info = consumer->find(mWorldspace, mTilePosition, input);
 
-            if (info.has_value() && info->mVersion == navMeshVersion)
+            if (info.has_value() && info->mVersion == navMeshFormatVersion)
             {
                 consumer->identity(mWorldspace, mTilePosition, info->mTileId);
                 ignore.mConsumer = nullptr;
@@ -86,9 +86,9 @@ namespace DetourNavigator
                 return;
 
             if (info.has_value())
-                consumer->update(mWorldspace, mTilePosition, info->mTileId, navMeshVersion, *data);
+                consumer->update(mWorldspace, mTilePosition, info->mTileId, navMeshFormatVersion, *data);
             else
-                consumer->insert(mWorldspace, mTilePosition, navMeshVersion, input, *data);
+                consumer->insert(mWorldspace, mTilePosition, navMeshFormatVersion, input, *data);
 
             ignore.mConsumer = nullptr;
         }
diff --git a/components/detournavigator/settings.hpp b/components/detournavigator/settings.hpp
index 67e0a5a958..45bcf15dbf 100644
--- a/components/detournavigator/settings.hpp
+++ b/components/detournavigator/settings.hpp
@@ -53,7 +53,7 @@ namespace DetourNavigator
         std::uint64_t mMaxDbFileSize = 0;
     };
 
-    inline constexpr std::int64_t navMeshVersion = 2;
+    inline constexpr std::int64_t navMeshFormatVersion = 2;
 
     RecastSettings makeRecastSettingsFromSettingsManager();
 

From 5891d58f63c7836eff78079243c31ae11bde425d Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 1 Jul 2022 14:27:19 +0200
Subject: [PATCH 2705/2859] Fix C4456 msvc warning

declaration of 'it' hides previous local declaration
---
 components/files/configurationmanager.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/files/configurationmanager.cpp b/components/files/configurationmanager.cpp
index be9890750f..494332005a 100644
--- a/components/files/configurationmanager.cpp
+++ b/components/files/configurationmanager.cpp
@@ -128,11 +128,11 @@ void ConfigurationManager::readConfiguration(bpo::variables_map& variables,
         auto composingVariables = separateComposingVariables(variables, description);
         for (auto& [k, v] : *it)
         {
-            auto it = variables.find(k);
-            if (it == variables.end())
+            auto variable = variables.find(k);
+            if (variable == variables.end())
                 variables.insert({k, v});
-            else if (it->second.defaulted())
-                it->second = v;
+            else if (variable->second.defaulted())
+                variable->second = v;
         }
         mergeComposingVariables(variables, composingVariables, description);
     }

From 2eae3227ba0c4e5f0fb77f08ddb53c27af724512 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 1 Jul 2022 15:26:22 +0200
Subject: [PATCH 2706/2859] Fix C4305 msvc warning

'argument': truncation from 'double' to 'float'
---
 .../detournavigator/recastmeshbuilder.cpp     | 24 +++++++++----------
 .../lua/test_serialization.cpp                |  4 ++--
 .../lua/test_utilpackage.cpp                  | 10 ++++----
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
index b86fe7616b..dcdca1ee72 100644
--- a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
+++ b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
@@ -338,10 +338,10 @@ namespace
             AreaType_ground, mSource, mObjectTransform
         );
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
-        EXPECT_THAT(recastMesh->getMesh().getVertices(), Pointwise(FloatNear(1e-5), std::vector<float>({
-            0, -4.24264049530029296875, 4.44089209850062616169452667236328125e-16,
-            0, -3.535533905029296875, -0.707106769084930419921875,
-            0, -3.535533905029296875, 0.707106769084930419921875,
+        EXPECT_THAT(recastMesh->getMesh().getVertices(), Pointwise(FloatNear(1e-5f), std::vector<float>({
+            0, -4.24264049530029296875f, 4.44089209850062616169452667236328125e-16f,
+            0, -3.535533905029296875f, -0.707106769084930419921875f,
+            0, -3.535533905029296875f, 0.707106769084930419921875f,
         }))) << recastMesh->getMesh().getVertices();
         EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({1, 2, 0}));
         EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
@@ -363,10 +363,10 @@ namespace
             AreaType_ground, mSource, mObjectTransform
         );
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
-        EXPECT_THAT(recastMesh->getMesh().getVertices(), Pointwise(FloatNear(1e-5), std::vector<float>({
-            -4.24264049530029296875, 0, 4.44089209850062616169452667236328125e-16,
-            -3.535533905029296875, 0, -0.707106769084930419921875,
-            -3.535533905029296875, 0, 0.707106769084930419921875,
+        EXPECT_THAT(recastMesh->getMesh().getVertices(), Pointwise(FloatNear(1e-5f), std::vector<float>({
+            -4.24264049530029296875f, 0, 4.44089209850062616169452667236328125e-16f,
+            -3.535533905029296875f, 0, -0.707106769084930419921875f,
+            -3.535533905029296875f, 0, 0.707106769084930419921875f,
         }))) << recastMesh->getMesh().getVertices();
         EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({1, 2, 0}));
         EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
@@ -388,10 +388,10 @@ namespace
             AreaType_ground, mSource, mObjectTransform
         );
         const auto recastMesh = std::move(builder).create(mGeneration, mRevision);
-        EXPECT_THAT(recastMesh->getMesh().getVertices(), Pointwise(FloatNear(1e-5), std::vector<float>({
-            -1.41421353816986083984375, -1.1102230246251565404236316680908203125e-16, 0,
-            1.1102230246251565404236316680908203125e-16, -1.41421353816986083984375, 0,
-            1.41421353816986083984375, 1.1102230246251565404236316680908203125e-16, 0,
+        EXPECT_THAT(recastMesh->getMesh().getVertices(), Pointwise(FloatNear(1e-5f), std::vector<float>({
+            -1.41421353816986083984375f, -1.1102230246251565404236316680908203125e-16f, 0,
+            1.1102230246251565404236316680908203125e-16f, -1.41421353816986083984375f, 0,
+            1.41421353816986083984375f, 1.1102230246251565404236316680908203125e-16f, 0,
         }))) << recastMesh->getMesh().getVertices();
         EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector<int>({2, 0, 1}));
         EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
diff --git a/apps/openmw_test_suite/lua/test_serialization.cpp b/apps/openmw_test_suite/lua/test_serialization.cpp
index 610d5b43c1..a74081266f 100644
--- a/apps/openmw_test_suite/lua/test_serialization.cpp
+++ b/apps/openmw_test_suite/lua/test_serialization.cpp
@@ -33,7 +33,7 @@ namespace
         EXPECT_EQ(serialized.size(), 10);  // version, type, 8 bytes value
         sol::object value = LuaUtil::deserialize(lua, serialized);
         ASSERT_TRUE(value.is<double>());
-        EXPECT_FLOAT_EQ(value.as<double>(), 3.14);
+        EXPECT_DOUBLE_EQ(value.as<double>(), 3.14);
     }
 
     TEST(LuaSerializationTest, Boolean)
@@ -183,7 +183,7 @@ namespace
             EXPECT_EQ(t.get<bool>("ab"), true);
             EXPECT_EQ(t.get<sol::table>("nested").get<int>("aa"), 2);
             EXPECT_EQ(t.get<sol::table>("nested").get<std::string>("bb"), "something");
-            EXPECT_FLOAT_EQ(t.get<sol::table>("nested").get<double>(5), -0.5);
+            EXPECT_DOUBLE_EQ(t.get<sol::table>("nested").get<double>(5), -0.5);
             EXPECT_EQ(t.get<osg::Vec2f>(1), osg::Vec2f(1, 2));
             EXPECT_EQ(t.get<osg::Vec2f>(2), osg::Vec2f(2, 1));
         }
diff --git a/apps/openmw_test_suite/lua/test_utilpackage.cpp b/apps/openmw_test_suite/lua/test_utilpackage.cpp
index b7aa534c1d..2e8734a2df 100644
--- a/apps/openmw_test_suite/lua/test_utilpackage.cpp
+++ b/apps/openmw_test_suite/lua/test_utilpackage.cpp
@@ -172,12 +172,12 @@ namespace
         lua.open_libraries(sol::lib::base, sol::lib::math, sol::lib::string);
         lua["util"] = LuaUtil::initUtilPackage(lua);
         lua.safe_script("v = util.vector2(1, 0):rotate(math.rad(120))");
-        EXPECT_FLOAT_EQ(get<float>(lua, "v.x"), -0.5);
-        EXPECT_FLOAT_EQ(get<float>(lua, "v.y"), 0.86602539);
-        EXPECT_FLOAT_EQ(get<float>(lua, "util.normalizeAngle(math.pi * 10 + 0.1)"), 0.1);
-        EXPECT_FLOAT_EQ(get<float>(lua, "util.clamp(0.1, 0, 1.5)"), 0.1);
+        EXPECT_FLOAT_EQ(get<float>(lua, "v.x"), -0.5f);
+        EXPECT_FLOAT_EQ(get<float>(lua, "v.y"), 0.86602539f);
+        EXPECT_FLOAT_EQ(get<float>(lua, "util.normalizeAngle(math.pi * 10 + 0.1)"), 0.1f);
+        EXPECT_FLOAT_EQ(get<float>(lua, "util.clamp(0.1, 0, 1.5)"), 0.1f);
         EXPECT_FLOAT_EQ(get<float>(lua, "util.clamp(-0.1, 0, 1.5)"), 0);
-        EXPECT_FLOAT_EQ(get<float>(lua, "util.clamp(2.1, 0, 1.5)"), 1.5);
+        EXPECT_FLOAT_EQ(get<float>(lua, "util.clamp(2.1, 0, 1.5)"), 1.5f);
         lua.safe_script("t = util.makeReadOnly({x = 1})");
         EXPECT_FLOAT_EQ(get<float>(lua, "t.x"), 1);
         EXPECT_ERROR(lua.safe_script("t.y = 2"), "userdata value");

From e074ebde96f6b95c747c61e3f6cad88e8a5563be Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 1 Jul 2022 16:43:58 +0200
Subject: [PATCH 2707/2859] Fix C4389 msvc warning

'==': signed/unsigned mismatch
---
 .../detournavigator/asyncnavmeshupdater.cpp   |  6 +--
 .../lua/test_configuration.cpp                |  2 +-
 .../misc/test_endianness.cpp                  | 40 +++++++++----------
 .../serialization/binaryreader.cpp            |  2 +-
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp b/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp
index acfd5656b2..692b82ef96 100644
--- a/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp
+++ b/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp
@@ -78,7 +78,7 @@ namespace
         const std::map<TilePosition, ChangeType> changedTiles {{TilePosition {0, 0}, ChangeType::add}};
         updater.post(mAgentBounds, navMeshCacheItem, mPlayerTile, mWorldspace, changedTiles);
         updater.wait(mListener, WaitConditionType::allJobsDone);
-        EXPECT_NE(navMeshCacheItem->lockConst()->getImpl().getTileRefAt(0, 0, 0), 0);
+        EXPECT_NE(navMeshCacheItem->lockConst()->getImpl().getTileRefAt(0, 0, 0), 0u);
     }
 
     TEST_F(DetourNavigatorAsyncNavMeshUpdaterTest, repeated_post_should_lead_to_cache_hit)
@@ -240,12 +240,12 @@ namespace
         const std::map<TilePosition, ChangeType> changedTilesAdd {{TilePosition {0, 0}, ChangeType::add}};
         updater.post(mAgentBounds, navMeshCacheItem, mPlayerTile, mWorldspace, changedTilesAdd);
         updater.wait(mListener, WaitConditionType::allJobsDone);
-        ASSERT_NE(navMeshCacheItem->lockConst()->getImpl().getTileRefAt(0, 0, 0), 0);
+        ASSERT_NE(navMeshCacheItem->lockConst()->getImpl().getTileRefAt(0, 0, 0), 0u);
         const std::map<TilePosition, ChangeType> changedTilesRemove {{TilePosition {0, 0}, ChangeType::remove}};
         const TilePosition playerTile(100, 100);
         updater.post(mAgentBounds, navMeshCacheItem, playerTile, mWorldspace, changedTilesRemove);
         updater.wait(mListener, WaitConditionType::allJobsDone);
-        EXPECT_EQ(navMeshCacheItem->lockConst()->getImpl().getTileRefAt(0, 0, 0), 0);
+        EXPECT_EQ(navMeshCacheItem->lockConst()->getImpl().getTileRefAt(0, 0, 0), 0u);
     }
 
     TEST_F(DetourNavigatorAsyncNavMeshUpdaterTest, should_stop_writing_to_db_when_size_limit_is_reached)
diff --git a/apps/openmw_test_suite/lua/test_configuration.cpp b/apps/openmw_test_suite/lua/test_configuration.cpp
index 7170f33849..39c4f06201 100644
--- a/apps/openmw_test_suite/lua/test_configuration.cpp
+++ b/apps/openmw_test_suite/lua/test_configuration.cpp
@@ -236,7 +236,7 @@ namespace
         {
             sol::table data = LuaUtil::deserialize(lua.lua_state(), loadedCfg.mScripts[1].mRefs[1].mInitializationData, &serializer);
             ESM::RefNum adjustedRef = data["fargoth"].get<ESM::RefNum>();
-            EXPECT_EQ(adjustedRef.mIndex, 128964);
+            EXPECT_EQ(adjustedRef.mIndex, 128964u);
             EXPECT_EQ(adjustedRef.mContentFile, 2);
         }
     }
diff --git a/apps/openmw_test_suite/misc/test_endianness.cpp b/apps/openmw_test_suite/misc/test_endianness.cpp
index 240e4a49ac..9c3bbf61a6 100644
--- a/apps/openmw_test_suite/misc/test_endianness.cpp
+++ b/apps/openmw_test_suite/misc/test_endianness.cpp
@@ -31,24 +31,24 @@ TEST_F(EndiannessTest, test_swap_endianness_inplace2)
   uint16_t fortytwo = 0x0042;
 
   Misc::swapEndiannessInplace(zero);
-  EXPECT_EQ(zero, 0x0000);
+  EXPECT_EQ(zero, 0x0000u);
   Misc::swapEndiannessInplace(zero);
-  EXPECT_EQ(zero, 0x0000);
+  EXPECT_EQ(zero, 0x0000u);
 
   Misc::swapEndiannessInplace(ffff);
-  EXPECT_EQ(ffff, 0xFFFF);
+  EXPECT_EQ(ffff, 0xFFFFu);
   Misc::swapEndiannessInplace(ffff);
-  EXPECT_EQ(ffff, 0xFFFF);
+  EXPECT_EQ(ffff, 0xFFFFu);
 
   Misc::swapEndiannessInplace(n12);
-  EXPECT_EQ(n12, 0x0201);
+  EXPECT_EQ(n12, 0x0201u);
   Misc::swapEndiannessInplace(n12);
-  EXPECT_EQ(n12, 0x0102);
+  EXPECT_EQ(n12, 0x0102u);
 
   Misc::swapEndiannessInplace(fortytwo);
-  EXPECT_EQ(fortytwo, 0x4200);
+  EXPECT_EQ(fortytwo, 0x4200u);
   Misc::swapEndiannessInplace(fortytwo);
-  EXPECT_EQ(fortytwo, 0x0042);
+  EXPECT_EQ(fortytwo, 0x0042u);
 }
 
 TEST_F(EndiannessTest, test_swap_endianness_inplace4)
@@ -58,19 +58,19 @@ TEST_F(EndiannessTest, test_swap_endianness_inplace4)
   uint32_t ffff = 0xFFFFFFFF;
 
   Misc::swapEndiannessInplace(zero);
-  EXPECT_EQ(zero, 0x00000000);
+  EXPECT_EQ(zero, 0x00000000u);
   Misc::swapEndiannessInplace(zero);
-  EXPECT_EQ(zero, 0x00000000);
+  EXPECT_EQ(zero, 0x00000000u);
 
   Misc::swapEndiannessInplace(n1234);
-  EXPECT_EQ(n1234, 0x04030201);
+  EXPECT_EQ(n1234, 0x04030201u);
   Misc::swapEndiannessInplace(n1234);
-  EXPECT_EQ(n1234, 0x01020304);
+  EXPECT_EQ(n1234, 0x01020304u);
   
   Misc::swapEndiannessInplace(ffff);
-  EXPECT_EQ(ffff, 0xFFFFFFFF);
+  EXPECT_EQ(ffff, 0xFFFFFFFFu);
   Misc::swapEndiannessInplace(ffff);
-  EXPECT_EQ(ffff, 0xFFFFFFFF);
+  EXPECT_EQ(ffff, 0xFFFFFFFFu);
 }
 
 TEST_F(EndiannessTest, test_swap_endianness_inplace8)
@@ -80,19 +80,19 @@ TEST_F(EndiannessTest, test_swap_endianness_inplace8)
   uint64_t ffff = 0xFFFF'FFFF'FFFF'FFFF;
 
   Misc::swapEndiannessInplace(zero);
-  EXPECT_EQ(zero, 0x0000'0000'0000'0000);
+  EXPECT_EQ(zero, 0x0000'0000'0000'0000u);
   Misc::swapEndiannessInplace(zero);
-  EXPECT_EQ(zero, 0x0000'0000'0000'0000);
+  EXPECT_EQ(zero, 0x0000'0000'0000'0000u);
   
   Misc::swapEndiannessInplace(ffff);
-  EXPECT_EQ(ffff, 0xFFFF'FFFF'FFFF'FFFF);
+  EXPECT_EQ(ffff, 0xFFFF'FFFF'FFFF'FFFFu);
   Misc::swapEndiannessInplace(ffff);
-  EXPECT_EQ(ffff, 0xFFFF'FFFF'FFFF'FFFF);
+  EXPECT_EQ(ffff, 0xFFFF'FFFF'FFFF'FFFFu);
 
   Misc::swapEndiannessInplace(n1234);
-  EXPECT_EQ(n1234, 0x0807'0605'0403'0201);
+  EXPECT_EQ(n1234, 0x0807'0605'0403'0201u);
   Misc::swapEndiannessInplace(n1234);
-  EXPECT_EQ(n1234, 0x0102'0304'0506'0708);
+  EXPECT_EQ(n1234, 0x0102'0304'0506'0708u);
 }
 
 TEST_F(EndiannessTest, test_swap_endianness_inplace_float)
diff --git a/apps/openmw_test_suite/serialization/binaryreader.cpp b/apps/openmw_test_suite/serialization/binaryreader.cpp
index 071cfabb8f..b78c673d8f 100644
--- a/apps/openmw_test_suite/serialization/binaryreader.cpp
+++ b/apps/openmw_test_suite/serialization/binaryreader.cpp
@@ -24,7 +24,7 @@ namespace
         std::uint32_t result = 0;
         const TestFormat<Mode::Read> format;
         binaryReader(format, result);
-        EXPECT_EQ(result, 42);
+        EXPECT_EQ(result, 42u);
     }
 
     TEST(DetourNavigatorSerializationBinaryReaderTest, shouldReadArithmeticTypeRangeValue)

From 316f666e77d78dfab4f24f0aeddd9b56cd132f35 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 1 Jul 2022 22:29:36 +0200
Subject: [PATCH 2708/2859] Avoid constructing icu::StringPiece from
 std::string directly

Otherwise it causes a crash on Windows when OpenMW is built in debug
mode but ICU not.
---
 components/l10n/messagebundles.cpp | 4 ++--
 components/lua/l10n.cpp            | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/components/l10n/messagebundles.cpp b/components/l10n/messagebundles.cpp
index fab59a7cb8..6934dcaad8 100644
--- a/components/l10n/messagebundles.cpp
+++ b/components/l10n/messagebundles.cpp
@@ -75,7 +75,7 @@ namespace l10n
             {
                 const auto key = it.first.as<std::string>();
                 const auto value = it.second.as<std::string>();
-                icu::UnicodeString pattern = icu::UnicodeString::fromUTF8(value);
+                icu::UnicodeString pattern = icu::UnicodeString::fromUTF8(icu::StringPiece(value.data(), value.size()));
                 icu::ErrorCode status;
                 UParseError parseError;
                 icu::MessageFormat message(pattern, lang, parseError, status);
@@ -112,7 +112,7 @@ namespace l10n
         std::vector<icu::Formattable> argValues;
         for (auto& [k, v] : args)
         {
-            argNames.push_back(icu::UnicodeString::fromUTF8(k));
+            argNames.push_back(icu::UnicodeString::fromUTF8(icu::StringPiece(k.data(), k.size())));
             argValues.push_back(v);
         }
         return formatMessage(key, argNames, argValues);
diff --git a/components/lua/l10n.cpp b/components/lua/l10n.cpp
index 1da6693f3d..4a1e533f2d 100644
--- a/components/lua/l10n.cpp
+++ b/components/lua/l10n.cpp
@@ -68,7 +68,8 @@ namespace LuaUtil
             }
 
             // Argument names
-            argNames.push_back(icu::UnicodeString::fromUTF8(key.as<std::string>()));
+            const auto str = key.as<std::string>();
+            argNames.push_back(icu::UnicodeString::fromUTF8(icu::StringPiece(str.data(), str.size())));
         }
         return std::make_pair(args, argNames);
     }

From d2ed62ec3a7fb16c0c9032c5122f7d66fcecd5b0 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 1 Jul 2022 22:25:42 +0200
Subject: [PATCH 2709/2859] Allow to disable crash catcher on Windows

---
 components/crashcatcher/crashcatcher.cpp |  3 ---
 components/debug/debugging.cpp           | 19 ++++++++++++-------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/components/crashcatcher/crashcatcher.cpp b/components/crashcatcher/crashcatcher.cpp
index efdd7c254b..d2fad06c72 100644
--- a/components/crashcatcher/crashcatcher.cpp
+++ b/components/crashcatcher/crashcatcher.cpp
@@ -560,9 +560,6 @@ static bool is_debugger_present()
 
 void crashCatcherInstall(int argc, char **argv, const std::string &crashLogPath)
 {
-    if (const auto env = std::getenv("OPENMW_DISABLE_CRASH_CATCHER"))
-        if (std::atol(env) != 0)
-            return;
     if ((argc == 2 && strcmp(argv[1], crash_switch) == 0) || !is_debugger_present())
     {
         int s[5] = { SIGSEGV, SIGILL, SIGFPE, SIGBUS, SIGABRT };
diff --git a/components/debug/debugging.cpp b/components/debug/debugging.cpp
index 61de1ef4c1..e37406299d 100644
--- a/components/debug/debugging.cpp
+++ b/components/debug/debugging.cpp
@@ -314,16 +314,21 @@ int wrapApplication(int (*innerApplication)(int argc, char *argv[]), int argc, c
             setupLogging(cfgMgr.getLogPath().string(), appName, mode);
         }
 
+        if (const auto env = std::getenv("OPENMW_DISABLE_CRASH_CATCHER"); env == nullptr || std::atol(env) == 0)
+        {
 #if defined(_WIN32)
-        const std::string crashLogName = Misc::StringUtils::lowerCase(appName) + "-crash.dmp";
-        Crash::CrashCatcher crashy(argc, argv, (cfgMgr.getLogPath() / crashLogName).make_preferred().string());
+            const std::string crashLogName = Misc::StringUtils::lowerCase(appName) + "-crash.dmp";
+            Crash::CrashCatcher crashy(argc, argv, (cfgMgr.getLogPath() / crashLogName).make_preferred().string());
 #else
-        const std::string crashLogName = Misc::StringUtils::lowerCase(appName) + "-crash.log";
-        // install the crash handler as soon as possible. note that the log path
-        // does not depend on config being read.
-        crashCatcherInstall(argc, argv, (cfgMgr.getLogPath() / crashLogName).string());
+            const std::string crashLogName = Misc::StringUtils::lowerCase(appName) + "-crash.log";
+            // install the crash handler as soon as possible. note that the log path
+            // does not depend on config being read.
+            crashCatcherInstall(argc, argv, (cfgMgr.getLogPath() / crashLogName).string());
 #endif
-        ret = innerApplication(argc, argv);
+            ret = innerApplication(argc, argv);
+        }
+        else
+            ret = innerApplication(argc, argv);
     }
     catch (const std::exception& e)
     {

From 478ad07607334db528bb216d5714c5f1b3450438 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 2 Jul 2022 11:19:36 +0200
Subject: [PATCH 2710/2859] Only load global cfg if local wasn't found

---
 apps/launcher/maindialog.cpp | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp
index b7b4c0b4b9..ab6a3e52a3 100644
--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@@ -336,7 +336,7 @@ bool Launcher::MainDialog::setupGameSettings()
 
     QFile file;
 
-    auto loadFile = [&] (const QString& path, bool(Config::GameSettings::*reader)(QTextStream&, bool), bool ignoreContent = false)
+    auto loadFile = [&] (const QString& path, bool(Config::GameSettings::*reader)(QTextStream&, bool), bool ignoreContent = false) -> std::optional<bool>
     {
         qDebug() << "Loading config file:" << path.toUtf8().constData();
         file.setFileName(path);
@@ -346,24 +346,34 @@ bool Launcher::MainDialog::setupGameSettings()
                         tr("<br><b>Could not open %0 for reading</b><br><br> \
                             Please make sure you have the right permissions \
                             and try again.<br>").arg(file.fileName()));
-                return false;
+                return {};
             }
             QTextStream stream(&file);
             stream.setCodec(QTextCodec::codecForName("UTF-8"));
 
             (mGameSettings.*reader)(stream, ignoreContent);
             file.close();
+            return true;
         }
+        return false;
     };
 
     // Load the user config file first, separately
     // So we can write it properly, uncontaminated
-    loadFile(userPath + QLatin1String("openmw.cfg"), &Config::GameSettings::readUserFile);
+    if(!loadFile(userPath + QLatin1String("openmw.cfg"), &Config::GameSettings::readUserFile))
+        return false;
 
     // Now the rest - priority: user > local > global
-    loadFile(globalPath + QString("openmw.cfg"), &Config::GameSettings::readFile, true);
-    loadFile(localPath + QString("openmw.cfg"), &Config::GameSettings::readFile, true);
-    loadFile(userPath + QString("openmw.cfg"), &Config::GameSettings::readFile);
+    if(auto result = loadFile(localPath + QString("openmw.cfg"), &Config::GameSettings::readFile, true))
+    {
+        // Load global if local wasn't found
+        if(!*result && !loadFile(globalPath + QString("openmw.cfg"), &Config::GameSettings::readFile, true))
+            return false;
+    }
+    else
+        return false;
+    if(!loadFile(userPath + QString("openmw.cfg"), &Config::GameSettings::readFile))
+        return false;
 
     return true;
 }

From 4f832f479ba5d055f04e25c2442c26f2d37d73ae Mon Sep 17 00:00:00 2001
From: "florent.teppe" <florent.teppe@nadeo.com>
Date: Sat, 2 Jul 2022 15:37:26 +0200
Subject: [PATCH 2711/2859] Fixes compressed BSA loading

When creating the folders map, the folder name without / is hashed, but when trying to get a file record, when looking for a folder it was hashed wit the /
So now in getFileRecord parent_path is used instead
---
 components/bsa/compressedbsafile.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/components/bsa/compressedbsafile.cpp b/components/bsa/compressedbsafile.cpp
index 337b03b6cb..ee3a5a0a80 100644
--- a/components/bsa/compressedbsafile.cpp
+++ b/components/bsa/compressedbsafile.cpp
@@ -307,9 +307,8 @@ CompressedBSAFile::FileRecord CompressedBSAFile::getFileRecord(const std::string
     std::filesystem::path p(path);
     std::string stem = p.stem().string();
     std::string ext = p.extension().string();
-    p.remove_filename();
-
-    std::string folder = p.string();
+    
+    std::string folder = p.parent_path().string();
     std::uint64_t folderHash = generateHash(folder, std::string());
 
     auto it = mFolders.find(folderHash);

From 6dc727cf8f888731ccb68717f9046937984014c6 Mon Sep 17 00:00:00 2001
From: Mads Buvik Sandvei <madssandvei@protonmail.com>
Date: Sat, 2 Jul 2022 15:26:35 +0000
Subject: [PATCH 2712/2859] More stereo-postprocessing integration

---
 apps/openmw/mwrender/pingpongcanvas.cpp | 13 ++++
 apps/openmw/mwrender/pingpongcull.cpp   |  8 +++
 apps/openmw/mwrender/postprocessor.cpp  | 10 ++-
 components/stereo/multiview.cpp         | 95 +++++++++++++++++++++++++
 components/stereo/multiview.hpp         |  9 +++
 components/stereo/stereomanager.cpp     | 22 ++++--
 components/stereo/stereomanager.hpp     | 10 +--
 7 files changed, 154 insertions(+), 13 deletions(-)

diff --git a/apps/openmw/mwrender/pingpongcanvas.cpp b/apps/openmw/mwrender/pingpongcanvas.cpp
index 3fea60f216..581209eddb 100644
--- a/apps/openmw/mwrender/pingpongcanvas.cpp
+++ b/apps/openmw/mwrender/pingpongcanvas.cpp
@@ -130,11 +130,24 @@ namespace MWRender
 
             state.pushStateSet(mFallbackStateSet);
             state.apply();
+
+            if (Stereo::getMultiview() && mMultiviewResolveProgram)
+            {
+                state.pushStateSet(mMultiviewResolveStateSet);
+                state.apply();
+            }
+
             state.applyTextureAttribute(0, bufferData.sceneTex);
             resolveViewport->apply(state);
 
             drawGeometry(renderInfo);
             state.popStateSet();
+
+            if (Stereo::getMultiview() && mMultiviewResolveProgram)
+            {
+                state.popStateSet();
+            }
+
             return;
         }
 
diff --git a/apps/openmw/mwrender/pingpongcull.cpp b/apps/openmw/mwrender/pingpongcull.cpp
index 7c3f774a61..035f0c3011 100644
--- a/apps/openmw/mwrender/pingpongcull.cpp
+++ b/apps/openmw/mwrender/pingpongcull.cpp
@@ -2,6 +2,8 @@
 
 #include <osg/Camera>
 #include <osg/FrameBufferObject>
+#include <osg/Texture>
+#include <osg/Texture2DArray>
 #include <osgUtil/CullVisitor>
 
 #include <components/stereo/stereomanager.hpp>
@@ -12,6 +14,7 @@
 
 namespace MWRender
 {
+
     PingPongCull::PingPongCull(PostProcessor* pp)
         : mViewportStateset(nullptr)
         , mPostProcessor(pp)
@@ -66,6 +69,11 @@ namespace MWRender
         {
             renderStage->setMultisampleResolveFramebufferObject(postProcessor->getFbo(PostProcessor::FBO_Primary, frameId));
             renderStage->setFrameBufferObject(postProcessor->getFbo(PostProcessor::FBO_Multisample, frameId));
+
+            // The MultiView patch has a bug where it does not update resolve layers if the resolve framebuffer is changed.
+            // So we do blit manually in this case
+            if (Stereo::getMultiview() && !renderStage->getDrawCallback())
+                Stereo::setMultiviewMSAAResolveCallback(renderStage);
         }
 
         if (mViewportStateset)
diff --git a/apps/openmw/mwrender/postprocessor.cpp b/apps/openmw/mwrender/postprocessor.cpp
index fd3b25ae2c..2a046cb1ac 100644
--- a/apps/openmw/mwrender/postprocessor.cpp
+++ b/apps/openmw/mwrender/postprocessor.cpp
@@ -86,6 +86,14 @@ namespace
         case GL_TEXTURE_2D_ARRAY:
             static_cast<osg::Texture2DArray*>(tex)->setTextureSize(w, h, 2);
             break;
+        case GL_TEXTURE_2D_MULTISAMPLE:
+            static_cast<osg::Texture2DMultisample*>(tex)->setTextureSize(w, h);
+            break;
+#ifdef OSG_HAS_MULTIVIEW
+        case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
+            static_cast<osg::Texture2DMultisampleArray*>(tex)->setTextureSize(w, h, 2);
+            break;
+#endif
         default:
             throw std::logic_error("Invalid texture type received");
         }
@@ -233,7 +241,7 @@ namespace MWRender
         mUBO = ext && ext->isUniformBufferObjectSupported && mGLSLVersion >= 330;
         mStateUpdater = new fx::StateUpdater(mUBO);
 
-        if (!SceneUtil::AutoDepth::isReversed() && !mSoftParticles && !mUsePostProcessing)
+        if (!Stereo::getStereo() && !SceneUtil::AutoDepth::isReversed() && !mSoftParticles && !mUsePostProcessing)
             return;
 
         enable(mUsePostProcessing);
diff --git a/components/stereo/multiview.cpp b/components/stereo/multiview.cpp
index c5963632ce..0011b93687 100644
--- a/components/stereo/multiview.cpp
+++ b/components/stereo/multiview.cpp
@@ -7,6 +7,10 @@
 #include <osgUtil/RenderStage>
 #include <osgUtil/CullVisitor>
 
+#ifdef OSG_HAS_MULTIVIEW
+#include <osg/Texture2DMultisampleArray>
+#endif
+
 #include <components/sceneutil/nodecallback.hpp>
 #include <components/settings/settings.hpp>
 #include <components/debug/debuglog.hpp>
@@ -242,6 +246,97 @@ namespace Stereo
         return texture2d;
     }
 
+#ifdef OSG_HAS_MULTIVIEW
+    //! Draw callback that, if set on a RenderStage, resolves MSAA after draw. Needed when using custom fbo/resolve fbos on renderstages in combination with multiview.
+    struct MultiviewMSAAResolveCallback : public osgUtil::RenderBin::DrawCallback
+    {
+        void drawImplementation(osgUtil::RenderBin* bin, osg::RenderInfo& renderInfo, osgUtil::RenderLeaf*& previous) override
+        {
+            osgUtil::RenderStage* stage = static_cast<osgUtil::RenderStage*>(bin);
+            auto msaaFbo = stage->getFrameBufferObject();
+            auto resolveFbo = stage->getMultisampleResolveFramebufferObject();
+            if (msaaFbo != mMsaaFbo)
+            {
+                mMsaaFbo = msaaFbo;
+                setupMsaaLayers();
+            }
+            if (resolveFbo != mFbo)
+            {
+                mFbo = resolveFbo;
+                setupLayers();
+            }
+
+            // Null the resolve framebuffer to keep osg from doing redundant work.
+            stage->setMultisampleResolveFramebufferObject(nullptr);
+
+            // Do the actual render work
+            bin->drawImplementation(renderInfo, previous);
+
+            // Blit layers
+            osg::State& state = *renderInfo.getState();
+            osg::GLExtensions* ext = state.get<osg::GLExtensions>();
+            for (int i = 0; i < 2; i++)
+            {
+                mLayers[i]->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
+                mMsaaLayers[i]->apply(state, osg::FrameBufferObject::READ_FRAMEBUFFER);
+                ext->glBlitFramebuffer(0, 0, mWidth, mHeight, 0, 0, mWidth, mHeight, GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT, GL_NEAREST);
+            }
+            msaaFbo->apply(state, osg::FrameBufferObject::READ_DRAW_FRAMEBUFFER);
+        }
+
+        void setupLayers()
+        {
+            const auto& attachments = mFbo->getAttachmentMap();
+            for (int i = 0; i < 2; i++)
+            {
+                mLayers[i] = new osg::FrameBufferObject;
+                // Intentionally not using ref& so attachment can be non-const
+                for (auto [component, attachment] : attachments)
+                {
+                    osg::Texture2DArray* texture = static_cast<osg::Texture2DArray*>(attachment.getTexture());
+                    mLayers[i]->setAttachment(component, osg::FrameBufferAttachment(texture, i));
+                    mWidth = texture->getTextureWidth();
+                    mHeight = texture->getTextureHeight();
+                }
+            }
+        }
+
+        void setupMsaaLayers()
+        {
+            const auto& attachments = mMsaaFbo->getAttachmentMap();
+            for (int i = 0; i < 2; i++)
+            {
+                mMsaaLayers[i] = new osg::FrameBufferObject;
+                // Intentionally not using ref& so attachment can be non-const
+                for (auto [component, attachment] : attachments)
+                {
+                    osg::Texture2DMultisampleArray* texture = static_cast<osg::Texture2DMultisampleArray*>(attachment.getTexture());
+                    mMsaaLayers[i]->setAttachment(component, osg::FrameBufferAttachment(texture, i));
+                    mWidth = texture->getTextureWidth();
+                    mHeight = texture->getTextureHeight();
+                }
+            }
+        }
+
+        osg::ref_ptr<osg::FrameBufferObject> mFbo;
+        osg::ref_ptr<osg::FrameBufferObject> mMsaaFbo;
+        osg::ref_ptr<osg::FrameBufferObject> mLayers[2];
+        osg::ref_ptr<osg::FrameBufferObject> mMsaaLayers[2];
+        int mWidth;
+        int mHeight;
+    };
+#endif
+
+    void setMultiviewMSAAResolveCallback(osgUtil::RenderStage* renderStage)
+    {
+#ifdef OSG_HAS_MULTIVIEW
+        if (Stereo::getMultiview())
+        {
+            renderStage->setDrawCallback(new MultiviewMSAAResolveCallback);
+        }
+#endif
+    }
+
     class UpdateRenderStagesCallback : public SceneUtil::NodeCallback<UpdateRenderStagesCallback, osg::Node*, osgUtil::CullVisitor*>
     {
     public:
diff --git a/components/stereo/multiview.hpp b/components/stereo/multiview.hpp
index cfdc721d1a..3212ecc02c 100644
--- a/components/stereo/multiview.hpp
+++ b/components/stereo/multiview.hpp
@@ -16,6 +16,11 @@ namespace osg
     class Texture2DArray;
 }
 
+namespace osgUtil
+{
+    class RenderStage;
+}
+
 namespace Stereo
 {
     class UpdateRenderStagesCallback;
@@ -35,6 +40,9 @@ namespace Stereo
     //! Creates a Texture2D as a texture view into a Texture2DArray
     osg::ref_ptr<osg::Texture2D> createTextureView_Texture2DFromTexture2DArray(osg::Texture2DArray* textureArray, int layer);
 
+    //! Sets up a draw callback on the render stage that performs the MSAA resolve operation
+    void setMultiviewMSAAResolveCallback(osgUtil::RenderStage* renderStage);
+
     //! Class that manages the specifics of GL_OVR_Multiview aware framebuffers, separating the layers into separate framebuffers, and disabling
     class MultiviewFramebuffer
     {
@@ -77,6 +85,7 @@ namespace Stereo
         std::array<osg::ref_ptr<osg::Texture2D>, 2> mColorTexture;
         std::array<osg::ref_ptr<osg::Texture2D>, 2> mDepthTexture;
     };
+
 }
 
 #endif
diff --git a/components/stereo/stereomanager.cpp b/components/stereo/stereomanager.cpp
index 645fc59f29..829cb6cc9c 100644
--- a/components/stereo/stereomanager.cpp
+++ b/components/stereo/stereomanager.cpp
@@ -19,6 +19,7 @@
 #include <string>
 
 #include <components/debug/debuglog.hpp>
+#include <components/misc/constants.hpp>
 
 #include <components/sceneutil/statesetupdater.hpp>
 #include <components/sceneutil/visitor.hpp>
@@ -69,7 +70,6 @@ namespace Stereo
 
         void applyLeft(osg::StateSet* stateset, osgUtil::CullVisitor* nv) override
         {
-            osg::Matrix dummy;
             auto* uProjectionMatrix = stateset->getUniform("projectionMatrix");
             if (uProjectionMatrix)
                 uProjectionMatrix->set(mManager->computeEyeViewOffset(0) * mManager->computeEyeProjection(0, SceneUtil::AutoDepth::isReversed()));
@@ -77,7 +77,6 @@ namespace Stereo
 
         void applyRight(osg::StateSet* stateset, osgUtil::CullVisitor* nv) override
         {
-            osg::Matrix dummy;
             auto* uProjectionMatrix = stateset->getUniform("projectionMatrix");
             if (uProjectionMatrix)
                 uProjectionMatrix->set(mManager->computeEyeViewOffset(1) * mManager->computeEyeProjection(1, SceneUtil::AutoDepth::isReversed()));
@@ -135,7 +134,7 @@ namespace Stereo
         : mViewer(viewer)
         , mMainCamera(mViewer->getCamera())
         , mUpdateCallback(new StereoUpdateCallback(this))
-        , mMasterProjectionMatrix(osg::Matrix::identity())
+        , mMasterProjectionMatrix(osg::Matrixd::identity())
         , mEyeResolutionOverriden(false)
         , mEyeResolutionOverride(0,0)
         , mFrustumManager(nullptr)
@@ -322,7 +321,6 @@ namespace Stereo
 
         near_ = Settings::Manager::getFloat("near clip", "Camera");
         far_ = Settings::Manager::getFloat("viewing distance", "Camera");
-        auto projectionMatrix = mMainCamera->getProjectionMatrix();
 
         if (mUpdateViewCallback)
         {
@@ -342,15 +340,25 @@ namespace Stereo
             masterView.fov.angleUp = std::max(mView[0].fov.angleUp, mView[1].fov.angleUp);
             masterView.fov.angleLeft = std::min(mView[0].fov.angleLeft, mView[1].fov.angleLeft);
             masterView.fov.angleRight = std::max(mView[0].fov.angleRight, mView[1].fov.angleRight);
-            projectionMatrix = masterView.perspectiveMatrix(near_, far_, false);
+            auto projectionMatrix = masterView.perspectiveMatrix(near_, far_, false);
             mMainCamera->setProjectionMatrix(projectionMatrix);
         }
         else
         {
             auto* ds = osg::DisplaySettings::instance().get();
             auto viewMatrix = mMainCamera->getViewMatrix();
-            mViewOffsetMatrix[0] = osg::Matrix::inverse(viewMatrix) * ds->computeLeftEyeViewImplementation(viewMatrix);
-            mViewOffsetMatrix[1] = osg::Matrix::inverse(viewMatrix) * ds->computeRightEyeViewImplementation(viewMatrix);
+            auto projectionMatrix = mMainCamera->getProjectionMatrix();
+            auto s = ds->getEyeSeparation() * Constants::UnitsPerMeter;
+            mViewOffsetMatrix[0] = osg::Matrixd(
+                1.0, 0.0, 0.0, 0.0,
+                0.0, 1.0, 0.0, 0.0,
+                0.0, 0.0, 1.0, 0.0,
+                s, 0.0, 0.0, 1.0);
+            mViewOffsetMatrix[1] = osg::Matrixd(
+                1.0, 0.0, 0.0, 0.0,
+                0.0, 1.0, 0.0, 0.0,
+                0.0, 0.0, 1.0, 0.0,
+                -s, 0.0, 0.0, 1.0);
             mProjectionMatrix[0] = ds->computeLeftEyeProjectionImplementation(projectionMatrix);
             mProjectionMatrix[1] = ds->computeRightEyeProjectionImplementation(projectionMatrix);
             if (SceneUtil::AutoDepth::isReversed())
diff --git a/components/stereo/stereomanager.hpp b/components/stereo/stereomanager.hpp
index 48af043fd7..6a873e00f3 100644
--- a/components/stereo/stereomanager.hpp
+++ b/components/stereo/stereomanager.hpp
@@ -87,7 +87,7 @@ namespace Stereo
 
         //! The projection intended for rendering. When reverse Z is enabled, this is not the same as the camera's projection matrix, 
         //! and therefore must be provided to the manager explicitly.
-        void setMasterProjectionMatrix(const osg::Matrix& projectionMatrix) { mMasterProjectionMatrix = projectionMatrix; }
+        void setMasterProjectionMatrix(const osg::Matrixd& projectionMatrix) { mMasterProjectionMatrix = projectionMatrix; }
 
         //! Causes the subgraph represented by the node to draw to the full viewport.
         //! This has no effect if stereo is not enabled
@@ -109,15 +109,15 @@ namespace Stereo
         osg::ref_ptr<osg::Camera>       mMainCamera;
         osg::ref_ptr<osg::Callback>     mUpdateCallback;
         std::string                     mError;
-        osg::Matrix                     mMasterProjectionMatrix;
+        osg::Matrixd                     mMasterProjectionMatrix;
         std::shared_ptr<MultiviewFramebuffer> mMultiviewFramebuffer;
         bool                            mEyeResolutionOverriden;
         osg::Vec2i                      mEyeResolutionOverride;
 
         std::array<View, 2>         mView;
-        std::array<osg::Matrix, 2>  mViewOffsetMatrix;
-        std::array<osg::Matrix, 2>  mProjectionMatrix;
-        std::array<osg::Matrix, 2>  mProjectionMatrixReverseZ;
+        std::array<osg::Matrixd, 2>  mViewOffsetMatrix;
+        std::array<osg::Matrixd, 2>  mProjectionMatrix;
+        std::array<osg::Matrixd, 2>  mProjectionMatrixReverseZ;
 
         std::unique_ptr<StereoFrustumManager> mFrustumManager;
         std::shared_ptr<UpdateViewCallback> mUpdateViewCallback;

From 62d8c887c078d10149ed1e663fa970a3949ba2c1 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Sat, 2 Jul 2022 16:04:03 +0000
Subject: [PATCH 2713/2859] Revert "Merge branch 'macos_for_all' into 'master'"

This reverts merge request !2007
---
 .gitlab-ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d2a1c1423b..08882d0f0b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -305,6 +305,9 @@ Ubuntu_Clang_tests_Debug:
   tags:
     - shared-macos-amd64
   stage: build
+  only:
+    variables:
+      - $CI_PROJECT_ID == "7107382"
   cache:
     paths:
     - ccache/

From a0265ffb89357bea5a6a73c29130b7562ffd39b5 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Sat, 2 Jul 2022 09:42:15 -0700
Subject: [PATCH 2714/2859] only enable soft particles when enabled in settings

---
 apps/openmw/mwrender/renderingmanager.cpp | 1 +
 components/resource/scenemanager.hpp      | 4 ++++
 components/sceneutil/extradata.cpp        | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 55b50c9d7c..7245b62e6b 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -548,6 +548,7 @@ namespace MWRender
 
         mPostProcessor = new PostProcessor(*this, viewer, mRootNode, resourceSystem->getVFS());
         resourceSystem->getSceneManager()->setOpaqueDepthTex(mPostProcessor->getTexture(PostProcessor::Tex_OpaqueDepth, 0), mPostProcessor->getTexture(PostProcessor::Tex_OpaqueDepth, 1));
+        resourceSystem->getSceneManager()->setSoftParticles(mPostProcessor->softParticlesEnabled());
         resourceSystem->getSceneManager()->setSupportsNormalsRT(mPostProcessor->getSupportsNormalsRT());
 
         // water goes after terrain for correct waterculling order
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index 669b6df758..d3ad868a99 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -198,6 +198,9 @@ namespace Resource
         void setSupportsNormalsRT(bool supports) { mSupportsNormalsRT = supports; }
         bool getSupportsNormalsRT() const { return mSupportsNormalsRT; }
 
+        void setSoftParticles(bool enabled) { mSoftParticles = enabled; }
+        bool getSoftParticles() const { return mSoftParticles; }
+
     private:
 
         Shader::ShaderVisitor* createShaderVisitor(const std::string& shaderPrefix = "objects");
@@ -216,6 +219,7 @@ namespace Resource
         bool mConvertAlphaTestToAlphaToCoverage;
         bool mSupportsNormalsRT;
         std::array<osg::ref_ptr<osg::Texture>, 2> mOpaqueDepthTex;
+        bool mSoftParticles = false;
 
         osg::ref_ptr<Resource::SharedStateManager> mSharedStateManager;
         mutable std::mutex mSharedStateMutex;
diff --git a/components/sceneutil/extradata.cpp b/components/sceneutil/extradata.cpp
index 7b50e281c7..3f5bb6df88 100644
--- a/components/sceneutil/extradata.cpp
+++ b/components/sceneutil/extradata.cpp
@@ -20,6 +20,9 @@ namespace SceneUtil
 {
     void ProcessExtraDataVisitor::setupSoftEffect(osg::Node& node, float size, bool falloff)
     {
+        if (!mSceneMgr->getSoftParticles())
+            return;
+
         const int unitSoftEffect = mSceneMgr->getShaderManager().reserveGlobalTextureUnits(Shader::ShaderManager::Slot::OpaqueDepthTexture);
         static const osg::ref_ptr<SceneUtil::AutoDepth> depth = new SceneUtil::AutoDepth(osg::Depth::LESS, 0, 1, false);
 

From 84259d312bb1e247cb631c1419fde3d942cdb127 Mon Sep 17 00:00:00 2001
From: Alexander Olofsson <ace@haxalot.com>
Date: Sat, 2 Jul 2022 19:49:25 +0200
Subject: [PATCH 2715/2859] Fix the screenshot URLs in the appstream XML

---
 files/openmw.appdata.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/files/openmw.appdata.xml b/files/openmw.appdata.xml
index 8f3865f096..1c22876bc8 100644
--- a/files/openmw.appdata.xml
+++ b/files/openmw.appdata.xml
@@ -23,19 +23,19 @@ Copyright 2020 Bret Curtis <psi29a@gmail.com>
  <launchable type="desktop-id">org.openmw.launcher.desktop</launchable>
  <screenshots>
   <screenshot type="default">
-   <image>https://wiki.openmw.org/images/b/b2/Openmw_0.11.1_launcher_1.png</image>
+   <image>https://wiki.openmw.org/images/Openmw_0.11.1_launcher_1.png</image>
    <caption>The OpenMW launcher</caption>
   </screenshot>
   <screenshot>
-   <image>https://wiki.openmw.org/images/f/f1/Screenshot_mournhold_plaza_0.35.png</image>
+   <image>https://wiki.openmw.org/images/0.40_Screenshot-Balmora_3.png</image>
    <caption>The Mournhold's plaza on OpenMW</caption>
   </screenshot>
   <screenshot>
-   <image>https://wiki.openmw.org/images/5/5b/Screenshot_Vivec_seen_from_Ebonheart_0.35.png</image>
+   <image>https://wiki.openmw.org/images/Screenshot_mournhold_plaza_0.35.png</image>
    <caption>Vivec seen from Ebonheart on OpenMW</caption>
   </screenshot>
   <screenshot>
-   <image>http://wiki.openmw.org/images/a/a3/0.40_Screenshot-Balmora_3.png</image>
+   <image>https://wiki.openmw.org/images/Screenshot_Vivec_seen_from_Ebonheart_0.35.png</image>
    <caption>Balmora at morning on OpenMW</caption>
   </screenshot>
  </screenshots>

From 0989e273d4cde5d3811a1d05c9a52af78e628b26 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 2 Jul 2022 21:18:19 +0400
Subject: [PATCH 2716/2859] Add a Russian localization for built-in Lua content

---
 files/data/CMakeLists.txt         |  3 ++
 files/data/l10n/Calendar/ru.yaml  | 40 +++++++++++++++++
 files/data/l10n/Interface/ru.yaml |  3 ++
 files/data/l10n/OMWCamera/ru.yaml | 71 +++++++++++++++++++++++++++++++
 4 files changed, 117 insertions(+)
 create mode 100644 files/data/l10n/Calendar/ru.yaml
 create mode 100644 files/data/l10n/Interface/ru.yaml
 create mode 100644 files/data/l10n/OMWCamera/ru.yaml

diff --git a/files/data/CMakeLists.txt b/files/data/CMakeLists.txt
index 40c5456f8a..052363217f 100644
--- a/files/data/CMakeLists.txt
+++ b/files/data/CMakeLists.txt
@@ -11,8 +11,11 @@ set(BUILTIN_DATA_FILES
     textures/omw_menu_scroll_center_v.dds
 
     l10n/Calendar/en.yaml
+    l10n/Calendar/ru.yaml
     l10n/Interface/en.yaml
+    l10n/Interface/ru.yaml
     l10n/OMWCamera/en.yaml
+    l10n/OMWCamera/ru.yaml
 
     openmw_aux/util.lua
     openmw_aux/time.lua
diff --git a/files/data/l10n/Calendar/ru.yaml b/files/data/l10n/Calendar/ru.yaml
new file mode 100644
index 0000000000..880ed67f58
--- /dev/null
+++ b/files/data/l10n/Calendar/ru.yaml
@@ -0,0 +1,40 @@
+# sources:
+#1. Morrowind.esm by 1C (month names)
+#2. http://tespedia.ru/calendar (weekday names)
+
+month1: "Месяц Утренней Звезды"
+month2: "Месяц Восхода"
+month3: "Месяц Первоцвета"
+month4: "Месяц Дождя"
+month5: "Месяц Сева"
+month6: "Месяц Середины Года"
+month7: "Месяц Солнцеворота"
+month8: "Месяц Урожая"
+month9: "Месяц Огня"
+month10: "Месяц Мороза"
+month11: "Месяц Заката"
+month12: "Месяц Вечерней Звезды"
+
+# The variant of month names in the context "day X of month Y".
+monthInGenitive1: "Утренней Звезды"
+monthInGenitive2: "Восхода"
+monthInGenitive3: "Первоцвета"
+monthInGenitive4: "Дождя"
+monthInGenitive5: "Сева"
+monthInGenitive6: "Середины Года"
+monthInGenitive7: "Солнцеворота"
+monthInGenitive8: "Урожая"
+monthInGenitive9: "Огня"
+monthInGenitive10: "Мороза"
+monthInGenitive11: "Заката"
+monthInGenitive12: "Вечерней Звезды"
+
+dateFormat: "день {day} {monthInGenitive} {year}"
+
+weekday1: "Сандас"
+weekday2: "Морндас"
+weekday3: "Тирдас"
+weekday4: "Миддас"
+weekday5: "Турдас"
+weekday6: "Фредас"
+weekday7: "Лордас"
diff --git a/files/data/l10n/Interface/ru.yaml b/files/data/l10n/Interface/ru.yaml
new file mode 100644
index 0000000000..a224bb9174
--- /dev/null
+++ b/files/data/l10n/Interface/ru.yaml
@@ -0,0 +1,3 @@
+Yes: "Да"
+No: "Нет"
+Reset: "Обнулить"
diff --git a/files/data/l10n/OMWCamera/ru.yaml b/files/data/l10n/OMWCamera/ru.yaml
new file mode 100644
index 0000000000..2b41ef0ee7
--- /dev/null
+++ b/files/data/l10n/OMWCamera/ru.yaml
@@ -0,0 +1,71 @@
+Camera: "Камера OpenMW"
+settingsPageDescription: "Настройки камеры для OpenMW"
+
+thirdPersonSettings: "Режим от третьего лица"
+
+viewOverShoulder: "Взгляд через плечо"
+viewOverShoulderDescription: |
+    Управляет режимом вида от третьего лица.
+      Нет: камера находится позади головы персонажа игрока. Прицел скрыт.
+      Да: когда оружие в руках персонажа игрока, камера находится позади плеча персонажа игрока, прицел всегда виден.
+
+shoulderOffsetX: "Горизонтальное смещение камеры"
+shoulderOffsetXDescription: >
+    Горизонтальное смещение в режиме "взгляд через плечо".
+    Для левого плеча используйте отрицательное значение.
+
+shoulderOffsetY: "Вертикальное смещение камеры"
+shoulderOffsetYDescription: >
+    Вертикальное смещение в режиме "взгляд через плечо".
+
+autoSwitchShoulder: "Автоматический выбор плеча"
+autoSwitchShoulderDescription: >
+    Эта настройка включает автоматический перенос камеры за плечо с лучшим обзором.
+
+zoomOutWhenMoveCoef: "Отодвигание камеры при движении"
+zoomOutWhenMoveCoefDescription: >
+    Перемещает камеру от (положительное значение) или к (отрицательное значение) персонажу игрока, когда он двигается.
+    Работает только в режиме "взгляд через плечо". Нулевое значение отключает опцию (по умолчанию: 20.0).
+
+previewIfStandStill: "Режим обзора при отсутствии движения"
+previewIfStandStillDescription: >
+    Персонаж не поворачивается вслед за поворотом камеры, если не двигается и не держит оружие в руках.
+
+deferredPreviewRotation: "Отложенный поворот в режиме обзора"
+deferredPreviewRotationDescription: |
+    Когда включено, персонаж игрока плавно поворачивается по направлению камеры после выхода из режима обзора.
+    Когда выключено, вращается камера вместо поворота персонажа игрока.
+
+ignoreNC: "Игнорировать флаг 'No Collision'"
+ignoreNCDescription: >
+    Не позволяет камере проходить сквозь объекты с проставленным флагом NC (No Collision - "нет коллизии") в NIF-модели.
+
+move360: "Движение в любом направлении"
+move360Description: >
+    Делает направление движения персонажа игрока независимым от направления движения камеры, когда персонаж игрока не держит
+    оружие в руках. Например, движение "назад" будет происходить навстречу камере.
+
+move360TurnSpeed: "Скорость поворота при движении в любом направлении"
+move360TurnSpeedDescription: "Множитель скорости поворота (по умолчанию: 5.0)."
+
+slowViewChange: "Плавная смена вида"
+slowViewChangeDescription: "Делает переключение из режима от первого лица в режим от третьего лица не мгновенным."
+
+povAutoSwitch: "Автоматическое переключение в режим от первого лица"
+povAutoSwitchDescription: "Переключает камеру в режим от первого лица, когда персонаж игрока упирается спиной в препятствие."
+
+
+headBobbingSettings: "Покачивание камеры в режиме от первого лица"
+
+headBobbing_enabled: "Включено"
+headBobbing_enabledDescription: ""
+
+headBobbing_step: "Длина шага"
+headBobbing_stepDescription: "Длина каждого шага (по умолчанию: 90.0)."
+
+headBobbing_height: "Высота шага"
+headBobbing_heightDescription: "Амплитуда покачивания (по умолчанию: 3.0)."
+
+headBobbing_roll: "Максимальный угол крена"
+headBobbing_rollDescription: "Максимальный угол крена в градусах (по умолчанию: 0.2)."
+

From 62f5bedef5110fa50dffb67097bf1062495e2dc5 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 2 Jul 2022 23:13:44 +0400
Subject: [PATCH 2717/2859] Remove pointless check

---
 apps/openmw/mwrender/postprocessor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/postprocessor.cpp b/apps/openmw/mwrender/postprocessor.cpp
index 2a046cb1ac..8e5947ba89 100644
--- a/apps/openmw/mwrender/postprocessor.cpp
+++ b/apps/openmw/mwrender/postprocessor.cpp
@@ -238,7 +238,7 @@ namespace MWRender
         }
 
         mGLSLVersion = ext->glslLanguageVersion * 100;
-        mUBO = ext && ext->isUniformBufferObjectSupported && mGLSLVersion >= 330;
+        mUBO = ext->isUniformBufferObjectSupported && mGLSLVersion >= 330;
         mStateUpdater = new fx::StateUpdater(mUBO);
 
         if (!Stereo::getStereo() && !SceneUtil::AutoDepth::isReversed() && !mSoftParticles && !mUsePostProcessing)

From 523ad825c2003df9a2c8e4bba684c58e76789679 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 2 Jul 2022 23:14:21 +0400
Subject: [PATCH 2718/2859] There is no point to compare an unsigned value with
 0

---
 components/esm4/loadland.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/components/esm4/loadland.cpp b/components/esm4/loadland.cpp
index 4cbbfd69eb..40e9d95c58 100644
--- a/components/esm4/loadland.cpp
+++ b/components/esm4/loadland.cpp
@@ -104,7 +104,7 @@ void ESM4::Land::load(ESM4::Reader& reader)
                 BTXT base;
                 if (reader.getExact(base))
                 {
-                    assert(base.quadrant < 4 && base.quadrant >= 0 && "base texture quadrant index error");
+                    assert(base.quadrant < 4 && "base texture quadrant index error");
 
                     reader.adjustFormId(base.formId);
                     mTextures[base.quadrant].base = std::move(base);
@@ -126,8 +126,7 @@ void ESM4::Land::load(ESM4::Reader& reader)
                 }
                 reader.get(layer.texture);
                 reader.adjustFormId(layer.texture.formId);
-                assert(layer.texture.quadrant < 4 && layer.texture.quadrant >= 0
-                       && "additional texture quadrant index error");
+                assert(layer.texture.quadrant < 4 && "additional texture quadrant index error");
 #if 0
                 FormId txt = layer.texture.formId;
                 std::map<FormId, int>::iterator lb = uniqueTextures.lower_bound(txt);

From aa349f2ed928807150cc862f557b725fd2c0679b Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 2 Jul 2022 23:25:51 +0400
Subject: [PATCH 2719/2859] Initialize some missing variables

---
 apps/opencs/model/doc/document.cpp          |  4 ++++
 apps/opencs/model/world/data.cpp            |  2 ++
 apps/opencs/model/world/refidadapterimp.hpp |  5 ++++-
 apps/openmw/engine.cpp                      |  1 +
 apps/openmw/mwgui/charactercreation.cpp     |  1 +
 apps/openmw/mwworld/manualref.cpp           | 11 +----------
 apps/openmw/mwworld/worldimp.cpp            |  3 +++
 components/esm3/loadcont.hpp                |  2 +-
 components/fx/widgets.hpp                   | 20 ++++++++++----------
 components/lua_ui/textedit.hpp              |  4 ++--
 components/lua_ui/widget.cpp                |  2 +-
 11 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/apps/opencs/model/doc/document.cpp b/apps/opencs/model/doc/document.cpp
index 0b7b73693c..48a668c8cf 100644
--- a/apps/opencs/model/doc/document.cpp
+++ b/apps/opencs/model/doc/document.cpp
@@ -21,6 +21,7 @@ void CSMDoc::Document::addGmsts()
         ESM::GameSetting gmst;
         gmst.mId = CSMWorld::DefaultGmsts::Floats[i];
         gmst.mValue.setType (ESM::VT_Float);
+        gmst.mRecordFlags = 0;
         gmst.mValue.setFloat (CSMWorld::DefaultGmsts::FloatsDefaultValues[i]);
         getData().getGmsts().add (gmst);
     }
@@ -30,6 +31,7 @@ void CSMDoc::Document::addGmsts()
         ESM::GameSetting gmst;
         gmst.mId = CSMWorld::DefaultGmsts::Ints[i];
         gmst.mValue.setType (ESM::VT_Int);
+        gmst.mRecordFlags = 0;
         gmst.mValue.setInteger (CSMWorld::DefaultGmsts::IntsDefaultValues[i]);
         getData().getGmsts().add (gmst);
     }
@@ -39,6 +41,7 @@ void CSMDoc::Document::addGmsts()
         ESM::GameSetting gmst;
         gmst.mId = CSMWorld::DefaultGmsts::Strings[i];
         gmst.mValue.setType (ESM::VT_String);
+        gmst.mRecordFlags = 0;
         gmst.mValue.setString ("");
         getData().getGmsts().add (gmst);
     }
@@ -164,6 +167,7 @@ void CSMDoc::Document::createBase()
     {
         ESM::Global record;
         record.mId = sGlobals[i];
+        record.mRecordFlags = 0;
         record.mValue.setType (i==2 ? ESM::VT_Float : ESM::VT_Long);
 
         if (i==0 || i==1)
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 939316fa60..247900f407 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -1032,6 +1032,7 @@ void CSMWorld::Data::loadFallbackEntries()
             ESM::Static newMarker;
             newMarker.mId = marker.first;
             newMarker.mModel = marker.second;
+            newMarker.mRecordFlags = 0;
             auto record = std::make_unique<CSMWorld::Record<ESM::Static>>();
             record->mBase = newMarker;
             record->mState = CSMWorld::RecordBase::State_BaseOnly;
@@ -1046,6 +1047,7 @@ void CSMWorld::Data::loadFallbackEntries()
             ESM::Door newMarker;
             newMarker.mId = marker.first;
             newMarker.mModel = marker.second;
+            newMarker.mRecordFlags = 0;
             auto record = std::make_unique<CSMWorld::Record<ESM::Door>>();
             record->mBase = newMarker;
             record->mState = CSMWorld::RecordBase::State_BaseOnly;
diff --git a/apps/opencs/model/world/refidadapterimp.hpp b/apps/opencs/model/world/refidadapterimp.hpp
index 0cfde25569..99ce882688 100644
--- a/apps/opencs/model/world/refidadapterimp.hpp
+++ b/apps/opencs/model/world/refidadapterimp.hpp
@@ -27,7 +27,10 @@ namespace CSMWorld
         const RefIdColumn *mType;
         const RefIdColumn *mBlocked;
 
-        BaseColumns () : mBlocked(nullptr) {}
+        BaseColumns () : mId(nullptr)
+        , mModified(nullptr)
+        , mType(nullptr)
+        , mBlocked(nullptr) {}
     };
 
     /// \brief Base adapter for all refereceable record types
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index cac6be3658..b8b0f0b822 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -459,6 +459,7 @@ OMW::Engine::Engine(Files::ConfigurationManager& configurationManager)
   , mScriptBlacklistUse (true)
   , mNewGame (false)
   , mCfgMgr(configurationManager)
+  , mGlMaxTextureImageUnits(0)
 {
     SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, "0"); // We use only gamepads
 
diff --git a/apps/openmw/mwgui/charactercreation.cpp b/apps/openmw/mwgui/charactercreation.cpp
index ed5a5e12d1..5300f00106 100644
--- a/apps/openmw/mwgui/charactercreation.cpp
+++ b/apps/openmw/mwgui/charactercreation.cpp
@@ -494,6 +494,7 @@ namespace MWGui
             klass.mDescription = mCreateClassDialog->getDescription();
             klass.mData.mSpecialization = mCreateClassDialog->getSpecializationId();
             klass.mData.mIsPlayable = 0x1;
+            klass.mRecordFlags = 0;
 
             std::vector<int> attributes = mCreateClassDialog->getFavoriteAttributes();
             assert(attributes.size() == 2);
diff --git a/apps/openmw/mwworld/manualref.cpp b/apps/openmw/mwworld/manualref.cpp
index 42771bc72c..b809a81b3e 100644
--- a/apps/openmw/mwworld/manualref.cpp
+++ b/apps/openmw/mwworld/manualref.cpp
@@ -11,17 +11,8 @@ namespace
         const T* base = list.find(name);
 
         ESM::CellRef cellRef;
-        cellRef.mRefNum.unset();
+        cellRef.blank();
         cellRef.mRefID = name;
-        cellRef.mScale = 1;
-        cellRef.mFactionRank = 0;
-        cellRef.mChargeInt = -1;
-        cellRef.mChargeIntRemainder = 0.0f;
-        cellRef.mGoldValue = 1;
-        cellRef.mEnchantmentCharge = -1;
-        cellRef.mTeleport = false;
-        cellRef.mLockLevel = 0;
-        cellRef.mReferenceBlocked = 0;
 
         MWWorld::LiveCellRef<T> ref(cellRef, base);
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index c626ef9d46..0bcfc4f75e 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -490,6 +490,7 @@ namespace MWWorld
                 ESM::Global record;
                 record.mId = params.first;
                 record.mValue = params.second;
+                record.mRecordFlags = 0;
                 mStore.insertStatic(record);
             }
         }
@@ -509,6 +510,7 @@ namespace MWWorld
                 ESM::Static record;
                 record.mId = params.first;
                 record.mModel = params.second;
+                record.mRecordFlags = 0;
                 mStore.insertStatic(record);
             }
         }
@@ -523,6 +525,7 @@ namespace MWWorld
                 ESM::Door record;
                 record.mId = params.first;
                 record.mModel = params.second;
+                record.mRecordFlags = 0;
                 mStore.insertStatic(record);
             }
         }
diff --git a/components/esm3/loadcont.hpp b/components/esm3/loadcont.hpp
index 3fbb180d1b..0a28a89015 100644
--- a/components/esm3/loadcont.hpp
+++ b/components/esm3/loadcont.hpp
@@ -19,7 +19,7 @@ class ESMWriter;
 
 struct ContItem
 {
-    int mCount;
+    int mCount{0};
     std::string mItem;
 };
 
diff --git a/components/fx/widgets.hpp b/components/fx/widgets.hpp
index f787b910c8..67f7883a67 100644
--- a/components/fx/widgets.hpp
+++ b/components/fx/widgets.hpp
@@ -66,8 +66,8 @@ namespace fx
             void initialiseOverride() override;
             void notifyMouseButtonClick(MyGUI::Widget* sender);
 
-            MyGUI::Button* mCheckbutton;
-            MyGUI::Widget* mFill;
+            MyGUI::Button* mCheckbutton{nullptr};
+            MyGUI::Widget* mFill{nullptr};
         };
 
         template <class T, class UType>
@@ -236,11 +236,11 @@ namespace fx
                     increment(uniform->mStep);
             }
 
-            MyGUI::Button* mButtonDecrease;
-            MyGUI::Button* mButtonIncrease;
-            MyGUI::Widget* mDragger;
-            MyGUI::Widget* mFill;
-            MyGUI::TextBox* mValueLabel;
+            MyGUI::Button* mButtonDecrease{nullptr};
+            MyGUI::Button* mButtonIncrease{nullptr};
+            MyGUI::Widget* mDragger{nullptr};
+            MyGUI::Widget* mFill{nullptr};
+            MyGUI::TextBox* mValueLabel{nullptr};
             T mValue;
 
             int mLastPointerX;
@@ -271,9 +271,9 @@ namespace fx
 
             void initialiseOverride() override;
 
-            Gui::AutoSizedButton* mReset;
-            Gui::AutoSizedTextBox* mLabel;
-            MyGUI::Widget* mClient;
+            Gui::AutoSizedButton* mReset{nullptr};
+            Gui::AutoSizedTextBox* mLabel{nullptr};
+            MyGUI::Widget* mClient{nullptr};
             std::vector<EditBase*> mBases;
         };
     }
diff --git a/components/lua_ui/textedit.hpp b/components/lua_ui/textedit.hpp
index c2f7f6340c..2235842477 100644
--- a/components/lua_ui/textedit.hpp
+++ b/components/lua_ui/textedit.hpp
@@ -23,8 +23,8 @@ namespace LuaUi
             void textChange(MyGUI::EditBox*);
 
             MyGUI::EditBox* mEditBox = nullptr;
-            bool mMultiline;
-            bool mAutoSize;
+            bool mMultiline{0};
+            bool mAutoSize{0};
     };
 }
 
diff --git a/components/lua_ui/widget.cpp b/components/lua_ui/widget.cpp
index 5a747a79d9..e3f45d90dd 100644
--- a/components/lua_ui/widget.cpp
+++ b/components/lua_ui/widget.cpp
@@ -160,7 +160,7 @@ namespace LuaUi
 
     sol::object WidgetExtension::keyEvent(MyGUI::KeyCode code) const
     {
-        SDL_Keysym keySym;
+        auto keySym = SDL_Keysym();
         keySym.sym = SDLUtil::myGuiKeyToSdl(code);
         keySym.scancode = SDL_GetScancodeFromKey(keySym.sym);
         keySym.mod = SDL_GetModState();

From d2a1cc954fa6a5a5cb7d731dc3019e2d6b7c2a43 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 2 Jul 2022 22:39:47 +0400
Subject: [PATCH 2720/2859] Remove unused variable

---
 components/fx/pass.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/fx/pass.hpp b/components/fx/pass.hpp
index 1b8ea165e6..7f2e643c8c 100644
--- a/components/fx/pass.hpp
+++ b/components/fx/pass.hpp
@@ -67,7 +67,6 @@ namespace fx
         std::string mName;
         bool mLegacyGLSL;
         bool mUBO;
-        bool mSupportsNormals;
 
         std::array<std::string, 3> mRenderTargets;
 

From e97172bbb25e505c265e656d18239f603d36c96c Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 2 Jul 2022 23:48:49 +0400
Subject: [PATCH 2721/2859] Add a check for null

---
 apps/openmw/mwgui/bookpage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/bookpage.cpp b/apps/openmw/mwgui/bookpage.cpp
index 0c84e0ce7a..5d8fb898fc 100644
--- a/apps/openmw/mwgui/bookpage.cpp
+++ b/apps/openmw/mwgui/bookpage.cpp
@@ -1047,7 +1047,7 @@ public:
 
             for (ActiveTextFormats::iterator i = mActiveTextFormats.begin (); i != mActiveTextFormats.end (); ++i)
             {
-                if (mNode != nullptr)
+                if (mNode != nullptr && i->second != nullptr)
                     i->second->destroyDrawItem (mNode);
                 i->second.reset();
             }

From 1274a229d1b963018818731d817a6d599896b70a Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 2 Jul 2022 23:49:17 +0400
Subject: [PATCH 2722/2859] Remove pointless null check

---
 apps/openmw/mwrender/pingpongcull.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/pingpongcull.cpp b/apps/openmw/mwrender/pingpongcull.cpp
index 035f0c3011..ad1e7ab940 100644
--- a/apps/openmw/mwrender/pingpongcull.cpp
+++ b/apps/openmw/mwrender/pingpongcull.cpp
@@ -56,7 +56,7 @@ namespace MWRender
         postProcessor->getStateUpdater()->setEyePos(cv->getEyePoint());
         postProcessor->getStateUpdater()->setEyeVec(cv->getLookVectorLocal());
 
-        if (!postProcessor || !postProcessor->getFbo(PostProcessor::FBO_Primary, frameId))
+        if (!postProcessor->getFbo(PostProcessor::FBO_Primary, frameId))
         {
             renderStage->setMultisampleResolveFramebufferObject(nullptr);
             renderStage->setFrameBufferObject(nullptr);

From 7cce341822d3ba3a13ff390475aad87ebc1a99de Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sun, 3 Jul 2022 00:03:30 +0400
Subject: [PATCH 2723/2859] Fix initializer

---
 components/lua_ui/textedit.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/lua_ui/textedit.hpp b/components/lua_ui/textedit.hpp
index 2235842477..a9b8de1621 100644
--- a/components/lua_ui/textedit.hpp
+++ b/components/lua_ui/textedit.hpp
@@ -23,8 +23,8 @@ namespace LuaUi
             void textChange(MyGUI::EditBox*);
 
             MyGUI::EditBox* mEditBox = nullptr;
-            bool mMultiline{0};
-            bool mAutoSize{0};
+            bool mMultiline{false};
+            bool mAutoSize{false};
     };
 }
 

From 03cdffb5558692eba571de966c8c760f0dfa7dfa Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sun, 3 Jul 2022 00:13:04 +0400
Subject: [PATCH 2724/2859] Init some missing variables

---
 apps/essimporter/converter.cpp | 2 ++
 apps/essimporter/importer.cpp  | 1 +
 2 files changed, 3 insertions(+)

diff --git a/apps/essimporter/converter.cpp b/apps/essimporter/converter.cpp
index 0d5b391112..ecd315f477 100644
--- a/apps/essimporter/converter.cpp
+++ b/apps/essimporter/converter.cpp
@@ -320,6 +320,8 @@ namespace ESSImport
         esm.startRecord(ESM::REC_CSTA);
         ESM::CellState csta;
         csta.mHasFogOfWar = 0;
+        csta.mLastRespawn.mDay = 0;
+        csta.mLastRespawn.mHour = 0;
         csta.mId = esmcell.getCellId();
         csta.mId.save(esm);
         // TODO csta.mLastRespawn;
diff --git a/apps/essimporter/importer.cpp b/apps/essimporter/importer.cpp
index 577185b8d9..f0c74a7333 100644
--- a/apps/essimporter/importer.cpp
+++ b/apps/essimporter/importer.cpp
@@ -368,6 +368,7 @@ namespace ESSImport
         profile.mInGameTime.mGameHour = context.mHour;
         profile.mInGameTime.mMonth = context.mMonth;
         profile.mInGameTime.mYear = context.mYear;
+        profile.mTimePlayed = 0;
         profile.mPlayerCell = header.mGameData.mCurrentCell.toString();
         if (context.mPlayerBase.mClass == "NEWCLASSID_CHARGEN")
             profile.mPlayerClassName = context.mCustomPlayerClassName;

From 5d94a94a98c676c0f627bfd67bd897fc0ecafceb Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sun, 3 Jul 2022 12:03:12 +0400
Subject: [PATCH 2725/2859] Use a Boost API to resolve symlinks instead of
 low-level code

---
 components/files/linuxpath.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/components/files/linuxpath.cpp b/components/files/linuxpath.cpp
index c3dead2962..7f659e10ea 100644
--- a/components/files/linuxpath.cpp
+++ b/components/files/linuxpath.cpp
@@ -80,14 +80,17 @@ boost::filesystem::path LinuxPath::getGlobalConfigPath() const
 boost::filesystem::path LinuxPath::getLocalPath() const
 {
     boost::filesystem::path localPath("./");
-    std::string binPath(pathconf(".", _PC_PATH_MAX), '\0');
     const char *statusPaths[] = {"/proc/self/exe", "/proc/self/file", "/proc/curproc/exe", "/proc/curproc/file"};
 
     for(const char *path : statusPaths)
     {
-        if (readlink(path, &binPath[0], binPath.size()) != -1)
+        boost::filesystem::path statusPath(path);
+        if (!boost::filesystem::exists(statusPath)) continue;
+
+        statusPath = boost::filesystem::read_symlink(statusPath);
+        if (!boost::filesystem::is_empty(statusPath))
         {
-            localPath = boost::filesystem::path(binPath).parent_path() / "/";
+            localPath = statusPath.parent_path() / "/";
             break;
         }
     }

From 124db67496ad12f5716b45f8565280173a1f3300 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sun, 3 Jul 2022 12:13:12 +0400
Subject: [PATCH 2726/2859] Add an assert to detect possible nullptr
 dereference

---
 components/detournavigator/asyncnavmeshupdater.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index ee6cf453b8..b3d6d4151c 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -511,6 +511,8 @@ namespace DetourNavigator
         const auto offMeshConnections = mOffMeshConnectionsManager.get().get(job.mChangedTile);
 
         const PreparedNavMeshData* preparedNavMeshDataPtr = cachedNavMeshData ? &cachedNavMeshData.get() : preparedNavMeshData.get();
+        assert (preparedNavMeshDataPtr != nullptr);
+
         const UpdateNavMeshStatus status = navMeshCacheItem.lock()->updateTile(job.mChangedTile, std::move(cachedNavMeshData),
             makeNavMeshTileData(*preparedNavMeshDataPtr, offMeshConnections, job.mAgentBounds, job.mChangedTile, mSettings.get().mRecast));
 

From 14b5674d326e2509ceb52411da3651018c3f5eef Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sun, 3 Jul 2022 12:56:17 +0400
Subject: [PATCH 2727/2859] Init missing data members

---
 apps/essimporter/converter.cpp       | 5 +++--
 apps/openmw/mwworld/magiceffects.cpp | 2 ++
 components/esm4/reader.cpp           | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/apps/essimporter/converter.cpp b/apps/essimporter/converter.cpp
index ecd315f477..3c08084ca9 100644
--- a/apps/essimporter/converter.cpp
+++ b/apps/essimporter/converter.cpp
@@ -68,7 +68,7 @@ namespace
     {
         if (isIndexedRefId(indexedRefId))
         {
-            int refIndex;
+            int refIndex = 0;
             std::string refId;
             splitIndexedRefId(indexedRefId, refIndex, refId);
 
@@ -354,7 +354,7 @@ namespace ESSImport
             }
             else
             {
-                int refIndex;
+                int refIndex = 0;
                 splitIndexedRefId(cellref.mIndexedRefId, refIndex, out.mRefID);
 
                 std::string idLower = Misc::StringUtils::lowerCase(out.mRefID);
@@ -492,6 +492,7 @@ namespace ESSImport
 
                 out.mSpellId = it->mSPDT.mId.toString();
                 out.mSpeed = pnam.mSpeed * 0.001f; // not sure where this factor comes from
+                out.mSlot = 0;
 
                 esm.startRecord(ESM::REC_MPRJ);
                 out.save(esm);
diff --git a/apps/openmw/mwworld/magiceffects.cpp b/apps/openmw/mwworld/magiceffects.cpp
index 44c4061832..a99862d489 100644
--- a/apps/openmw/mwworld/magiceffects.cpp
+++ b/apps/openmw/mwworld/magiceffects.cpp
@@ -62,6 +62,7 @@ namespace MWWorld
             else
                 params.mType = ESM::ActiveSpells::Type_Permanent;
             params.mWorsenings = -1;
+            params.mNextWorsening = ESM::TimeStamp();
             int effectIndex = 0;
             for(const auto& enam : spell->mEffects.mList)
             {
@@ -131,6 +132,7 @@ namespace MWWorld
             params.mCasterActorId = creatureStats.mActorId;
             params.mType = ESM::ActiveSpells::Type_Enchantment;
             params.mWorsenings = -1;
+            params.mNextWorsening = ESM::TimeStamp();
             for(std::size_t effectIndex = 0; effectIndex < oldMagnitudes.size() && effectIndex < enchantment->mEffects.mList.size(); ++effectIndex)
             {
                 const auto& enam = enchantment->mEffects.mList[effectIndex];
diff --git a/components/esm4/reader.cpp b/components/esm4/reader.cpp
index 19649c4fa6..72421711af 100644
--- a/components/esm4/reader.cpp
+++ b/components/esm4/reader.cpp
@@ -56,11 +56,13 @@ namespace ESM4
 {
 
 ReaderContext::ReaderContext() : modIndex(0), recHeaderSize(sizeof(RecordHeader)),
-    filePos(0), recordRead(0), currWorld(0), currCell(0), cellGridValid(false)
+    filePos(0), fileRead(0), recordRead(0), currWorld(0), currCell(0), cellGridValid(false)
 {
     currCellGrid.cellId = 0;
     currCellGrid.grid.x = 0;
     currCellGrid.grid.y = 0;
+    subRecordHeader.typeId = 0;
+    subRecordHeader.dataSize = 0;
 }
 
 Reader::Reader(Files::IStreamPtr&& esmStream, const std::string& filename)

From fe785ea788cc81fcdcb26c9096df86c129a211e3 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sun, 3 Jul 2022 15:36:32 +0400
Subject: [PATCH 2728/2859] Don't cast away const when we can avoid it

---
 components/esm3/esmwriter.hpp                   | 2 +-
 components/misc/utf8stream.hpp                  | 5 ++++-
 components/myguiplatform/myguirendermanager.cpp | 6 +++---
 components/nifosg/nifloader.cpp                 | 4 ++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/components/esm3/esmwriter.hpp b/components/esm3/esmwriter.hpp
index 473e948f98..ddb9844796 100644
--- a/components/esm3/esmwriter.hpp
+++ b/components/esm3/esmwriter.hpp
@@ -115,7 +115,7 @@ class ESMWriter
         void writeT(const T& data)
         {
             static_assert(!std::is_pointer_v<T>);
-            write((char*)&data, sizeof(T));
+            write(reinterpret_cast<const char*>(&data), sizeof(T));
         }
 
         template<typename T, std::size_t size>
diff --git a/components/misc/utf8stream.hpp b/components/misc/utf8stream.hpp
index 8435816c67..847d73ceb7 100644
--- a/components/misc/utf8stream.hpp
+++ b/components/misc/utf8stream.hpp
@@ -22,7 +22,10 @@ public:
     }
 
     Utf8Stream (const char * str) :
-        cur ((unsigned char*) str), nxt ((unsigned char*) str), end ((unsigned char*) str + strlen(str)), val(Utf8Stream::sBadChar())
+        cur (reinterpret_cast<const unsigned char*>(str)),
+        nxt (reinterpret_cast<const unsigned char*>(str)),
+        end (reinterpret_cast<const unsigned char*>(str) + strlen(str)),
+        val(Utf8Stream::sBadChar())
     {
     }
 
diff --git a/components/myguiplatform/myguirendermanager.cpp b/components/myguiplatform/myguirendermanager.cpp
index 77b20ae5c7..9d48a0d35a 100644
--- a/components/myguiplatform/myguirendermanager.cpp
+++ b/components/myguiplatform/myguirendermanager.cpp
@@ -137,9 +137,9 @@ public:
             }
             else
             {
-                glVertexPointer(3, GL_FLOAT, sizeof(MyGUI::Vertex), (char*)vbo->getArray(0)->getDataPointer());
-                glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(MyGUI::Vertex), (char*)vbo->getArray(0)->getDataPointer() + 12);
-                glTexCoordPointer(2, GL_FLOAT, sizeof(MyGUI::Vertex), (char*)vbo->getArray(0)->getDataPointer() + 16);
+                glVertexPointer(3, GL_FLOAT, sizeof(MyGUI::Vertex), reinterpret_cast<const char*>(vbo->getArray(0)->getDataPointer()));
+                glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(MyGUI::Vertex), reinterpret_cast<const char*>(vbo->getArray(0)->getDataPointer()) + 12);
+                glTexCoordPointer(2, GL_FLOAT, sizeof(MyGUI::Vertex), reinterpret_cast<const char*>(vbo->getArray(0)->getDataPointer()) + 16);
             }
 
             glDrawArrays(GL_TRIANGLES, 0, batch.mVertexCount);
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 9b2e8db8d6..fd3fb40d9f 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -1284,7 +1284,7 @@ namespace NifOsg
                     if (strip.size() < 3)
                         continue;
                     geometry->addPrimitiveSet(new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLE_STRIP, strip.size(),
-                                                                            (unsigned short*)strip.data()));
+                                                                            reinterpret_cast<const unsigned short*>(strip.data())));
                     hasGeometry = true;
                 }
                 if (!hasGeometry)
@@ -1299,7 +1299,7 @@ namespace NifOsg
                 if (line.empty())
                     return;
                 geometry->addPrimitiveSet(new osg::DrawElementsUShort(osg::PrimitiveSet::LINES, line.size(),
-                                                                        (unsigned short*)line.data()));
+                                                                        reinterpret_cast<const unsigned short*>(line.data())));
             }
             handleNiGeometryData(geometry, niGeometryData, boundTextures, nifNode->name);
 

From 051832d7ae8a7c913cc93520071702dfb53c271f Mon Sep 17 00:00:00 2001
From: Cody Glassman <glassmancody.info@gmail.com>
Date: Sun, 3 Jul 2022 12:51:28 +0000
Subject: [PATCH 2729/2859] [Lua] Set simulation time scale

---
 apps/openmw/engine.cpp                  |  2 +-
 apps/openmw/mwbase/soundmanager.hpp     |  7 +++++++
 apps/openmw/mwbase/world.hpp            |  4 ++++
 apps/openmw/mwgui/windowmanagerimp.cpp  |  2 +-
 apps/openmw/mwlua/luabindings.cpp       | 15 +++++++++++----
 apps/openmw/mwlua/worldview.hpp         |  1 -
 apps/openmw/mwsound/openal_output.cpp   | 18 ++++++++++++------
 apps/openmw/mwsound/openal_output.hpp   |  3 +++
 apps/openmw/mwsound/soundmanagerimp.cpp |  4 ++--
 apps/openmw/mwsound/type.hpp            | 10 +++++-----
 apps/openmw/mwworld/worldimp.cpp        |  6 ++++++
 apps/openmw/mwworld/worldimp.hpp        |  6 ++++++
 files/lua_api/openmw/world.lua          |  5 +++++
 13 files changed, 63 insertions(+), 20 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index cac6be3658..49aa4e9e7a 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -1082,7 +1082,7 @@ void OMW::Engine::go()
         const double dt = std::chrono::duration_cast<std::chrono::duration<double>>(std::min(
             frameRateLimiter.getLastFrameDuration(),
             maxSimulationInterval
-        )).count();
+        )).count() * mEnvironment.getWorld()->getSimulationTimeScale();
 
         mViewer->advance(simulationTime);
 
diff --git a/apps/openmw/mwbase/soundmanager.hpp b/apps/openmw/mwbase/soundmanager.hpp
index 641be742ff..a60ed78154 100644
--- a/apps/openmw/mwbase/soundmanager.hpp
+++ b/apps/openmw/mwbase/soundmanager.hpp
@@ -43,6 +43,8 @@ namespace MWSound
                                   * much. */
         NoPlayerLocal = 1<<3, /* (3D only) Don't play the sound local to the listener even if the
                                * player is making it. */
+        NoScaling = 1<<4, /* Don't scale audio with simulation time */
+        NoEnvNoScaling = NoEnv | NoScaling,
         LoopNoEnv = Loop | NoEnv,
         LoopRemoveAtDistance = Loop | RemoveAtDistance
     };
@@ -72,6 +74,8 @@ namespace MWBase
             using PlayMode = MWSound::PlayMode;
             using Type = MWSound::Type;
 
+            float mSimulationTimeScale = 1.0;
+
         public:
             SoundManager() {}
             virtual ~SoundManager() {}
@@ -181,6 +185,9 @@ namespace MWBase
 
             virtual void updatePtr(const MWWorld::ConstPtr& old, const MWWorld::ConstPtr& updated) = 0;
 
+            void setSimulationTimeScale(float scale) { mSimulationTimeScale = scale; }
+            float getSimulationTimeScale() const { return mSimulationTimeScale; }
+
             virtual void clear() = 0;
     };
 }
diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 2c96a07851..cffdb6dbed 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -255,6 +255,10 @@ namespace MWBase
 
             virtual float getTimeScaleFactor() const = 0;
 
+            virtual float getSimulationTimeScale() const = 0;
+
+            virtual void setSimulationTimeScale(float scale) = 0;
+
             virtual void changeToInteriorCell (const std::string& cellName, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent=true) = 0;
             ///< Move to interior cell.
             ///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index a3f039e351..fa00f1b758 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -2098,7 +2098,7 @@ namespace MWGui
         if (soundId.empty())
             return;
 
-        MWBase::Environment::get().getSoundManager()->playSound(soundId, volume, pitch, MWSound::Type::Sfx, MWSound::PlayMode::NoEnv);
+        MWBase::Environment::get().getSoundManager()->playSound(soundId, volume, pitch, MWSound::Type::Sfx, MWSound::PlayMode::NoEnvNoScaling);
     }
 
     void WindowManager::updateSpellWindow()
diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index 9e9520cbe2..705209a603 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -13,6 +13,7 @@
 
 #include "eventqueue.hpp"
 #include "worldview.hpp"
+#include "luamanagerimp.hpp"
 #include "types/types.hpp"
 
 namespace MWLua
@@ -20,8 +21,10 @@ namespace MWLua
 
     static void addTimeBindings(sol::table& api, const Context& context, bool global)
     {
+        MWBase::World* world = MWBase::Environment::get().getWorld();
+
         api["getSimulationTime"] = [world=context.mWorldView]() { return world->getSimulationTime(); };
-        api["getSimulationTimeScale"] = [world=context.mWorldView]() { return world->getSimulationTimeScale(); };
+        api["getSimulationTimeScale"] = [world]() { return world->getSimulationTimeScale(); };
         api["getGameTime"] = [world=context.mWorldView]() { return world->getGameTime(); };
         api["getGameTimeScale"] = [world=context.mWorldView]() { return world->getGameTimeScale(); };
         api["isWorldPaused"] = [world=context.mWorldView]() { return world->isPaused(); };
@@ -35,8 +38,12 @@ namespace MWLua
 
         api["setGameTimeScale"] = [world=context.mWorldView](double scale) { world->setGameTimeScale(scale); };
 
-        // TODO: Ability to make game time slower or faster than real time (needed for example for mechanics like VATS)
-        // api["setSimulationTimeScale"] = [](double scale) {};
+        api["setSimulationTimeScale"] = [context, world](float scale)
+        {
+            context.mLuaManager->addAction([scale, world] {
+                world->setSimulationTimeScale(scale);
+            });
+        };
 
         // TODO: Ability to pause/resume world from Lua (needed for UI dehardcoding)
         // api["pause"] = []() {};
@@ -47,7 +54,7 @@ namespace MWLua
     {
         auto* lua = context.mLua;
         sol::table api(lua->sol(), sol::create);
-        api["API_REVISION"] = 26;
+        api["API_REVISION"] = 27;
         api["quit"] = [lua]()
         {
             Log(Debug::Warning) << "Quit requested by a Lua script.\n" << lua->debugTraceback();
diff --git a/apps/openmw/mwlua/worldview.hpp b/apps/openmw/mwlua/worldview.hpp
index accf2758f0..181a73c0b0 100644
--- a/apps/openmw/mwlua/worldview.hpp
+++ b/apps/openmw/mwlua/worldview.hpp
@@ -30,7 +30,6 @@ namespace MWLua
         // The number of seconds passed from the beginning of the game.
         double getSimulationTime() const { return mSimulationTime; }
         void setSimulationTime(double t) { mSimulationTime = t; }
-        double getSimulationTimeScale() const { return 1.0; }
 
         // The game time (in game seconds) passed from the beginning of the game.
         // Note that game time generally goes faster than the simulation time.
diff --git a/apps/openmw/mwsound/openal_output.cpp b/apps/openmw/mwsound/openal_output.cpp
index 3fe220019d..47f90bbcf3 100644
--- a/apps/openmw/mwsound/openal_output.cpp
+++ b/apps/openmw/mwsound/openal_output.cpp
@@ -1126,7 +1126,7 @@ bool OpenAL_Output::playSound(Sound *sound, Sound_Handle data, float offset)
     }
     source = mFreeSources.front();
 
-    initCommon2D(source, sound->getPosition(), sound->getRealVolume(), sound->getPitch(),
+    initCommon2D(source, sound->getPosition(), sound->getRealVolume(), getTimeScaledPitch(sound),
                  sound->getIsLooping(), sound->getUseEnv());
     alSourcei(source, AL_BUFFER, GET_PTRID(data));
     alSourcef(source, AL_SEC_OFFSET, offset);
@@ -1166,7 +1166,7 @@ bool OpenAL_Output::playSound3D(Sound *sound, Sound_Handle data, float offset)
     source = mFreeSources.front();
 
     initCommon3D(source, sound->getPosition(), sound->getMinDistance(), sound->getMaxDistance(),
-                 sound->getRealVolume(), sound->getPitch(), sound->getIsLooping(),
+                 sound->getRealVolume(), getTimeScaledPitch(sound), sound->getIsLooping(),
                  sound->getUseEnv());
     alSourcei(source, AL_BUFFER, GET_PTRID(data));
     alSourcef(source, AL_SEC_OFFSET, offset);
@@ -1228,7 +1228,7 @@ void OpenAL_Output::updateSound(Sound *sound)
     ALuint source = GET_PTRID(sound->mHandle);
 
     updateCommon(source, sound->getPosition(), sound->getMaxDistance(), sound->getRealVolume(),
-                 sound->getPitch(), sound->getUseEnv());
+                 getTimeScaledPitch(sound), sound->getUseEnv());
     getALError();
 }
 
@@ -1245,7 +1245,7 @@ bool OpenAL_Output::streamSound(DecoderPtr decoder, Stream *sound, bool getLoudn
     if(sound->getIsLooping())
         Log(Debug::Warning) << "Warning: cannot loop stream \"" << decoder->getName() << "\"";
 
-    initCommon2D(source, sound->getPosition(), sound->getRealVolume(), sound->getPitch(),
+    initCommon2D(source, sound->getPosition(), sound->getRealVolume(), getTimeScaledPitch(sound),
                  false, sound->getUseEnv());
     if(getALError() != AL_NO_ERROR)
         return false;
@@ -1277,7 +1277,7 @@ bool OpenAL_Output::streamSound3D(DecoderPtr decoder, Stream *sound, bool getLou
         Log(Debug::Warning) << "Warning: cannot loop stream \"" << decoder->getName() << "\"";
 
     initCommon3D(source, sound->getPosition(), sound->getMinDistance(), sound->getMaxDistance(),
-                 sound->getRealVolume(), sound->getPitch(), false, sound->getUseEnv());
+                 sound->getRealVolume(), getTimeScaledPitch(sound), false, sound->getUseEnv());
     if(getALError() != AL_NO_ERROR)
         return false;
 
@@ -1354,7 +1354,7 @@ void OpenAL_Output::updateStream(Stream *sound)
     ALuint source = stream->mSource;
 
     updateCommon(source, sound->getPosition(), sound->getMaxDistance(), sound->getRealVolume(),
-                 sound->getPitch(), sound->getUseEnv());
+                 getTimeScaledPitch(sound), sound->getUseEnv());
     getALError();
 }
 
@@ -1510,4 +1510,10 @@ OpenAL_Output::~OpenAL_Output()
     OpenAL_Output::deinit();
 }
 
+float OpenAL_Output::getTimeScaledPitch(SoundBase *sound)
+{
+    const bool shouldScale = !(sound->mParams.mFlags & PlayMode::NoScaling);
+    return shouldScale ? sound->getPitch() * mManager.getSimulationTimeScale() : sound->getPitch();
+}
+
 }
diff --git a/apps/openmw/mwsound/openal_output.hpp b/apps/openmw/mwsound/openal_output.hpp
index 47845c0802..c68c65c165 100644
--- a/apps/openmw/mwsound/openal_output.hpp
+++ b/apps/openmw/mwsound/openal_output.hpp
@@ -15,6 +15,7 @@
 namespace MWSound
 {
     class SoundManager;
+    class SoundBase;
     class Sound;
     class Stream;
 
@@ -55,6 +56,8 @@ namespace MWSound
 
         void updateCommon(ALuint source, const osg::Vec3f &pos, ALfloat maxdist, ALfloat gain, ALfloat pitch, bool useenv);
 
+        float getTimeScaledPitch(SoundBase *sound);
+
         OpenAL_Output& operator=(const OpenAL_Output &rhs);
         OpenAL_Output(const OpenAL_Output &rhs);
 
diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index 27f4589bb9..b9baee7223 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -248,7 +248,7 @@ namespace MWSound
         mMusic->init([&] {
             SoundParams params;
             params.mBaseVolume = volumeFromType(Type::Music);
-            params.mFlags = PlayMode::NoEnv | Type::Music | Play_2D;
+            params.mFlags = PlayMode::NoEnvNoScaling | Type::Music | Play_2D;
             return params;
         } ());
         mOutput->streamSound(decoder, mMusic.get());
@@ -462,7 +462,7 @@ namespace MWSound
         track->init([&] {
             SoundParams params;
             params.mBaseVolume = volumeFromType(type);
-            params.mFlags = PlayMode::NoEnv | type | Play_2D;
+            params.mFlags = PlayMode::NoEnvNoScaling | type | Play_2D;
             return params;
         } ());
         if(!mOutput->streamSound(decoder, track.get()))
diff --git a/apps/openmw/mwsound/type.hpp b/apps/openmw/mwsound/type.hpp
index 9f95bfa401..5f063c3954 100644
--- a/apps/openmw/mwsound/type.hpp
+++ b/apps/openmw/mwsound/type.hpp
@@ -5,11 +5,11 @@ namespace MWSound
 {
     enum class Type
     {
-        Sfx   = 1 << 4, /* Normal SFX sound */
-        Voice = 1 << 5, /* Voice sound */
-        Foot  = 1 << 6, /* Footstep sound */
-        Music = 1 << 7, /* Music track */
-        Movie = 1 << 8, /* Movie audio track */
+        Sfx   = 1 << 5, /* Normal SFX sound */
+        Voice = 1 << 6, /* Voice sound */
+        Foot  = 1 << 7, /* Footstep sound */
+        Music = 1 << 8, /* Music track */
+        Movie = 1 << 9, /* Movie audio track */
         Mask  = Sfx | Voice | Foot | Music | Movie
     };
 }
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index c626ef9d46..5a6a5ce864 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -921,6 +921,12 @@ namespace MWWorld
         return mCurrentDate->getTimeScaleFactor();
     }
 
+    void World::setSimulationTimeScale(float scale)
+    {
+        mSimulationTimeScale = std::max(0.f, scale);
+        MWBase::Environment::get().getSoundManager()->setSimulationTimeScale(mSimulationTimeScale);
+    }
+
     TimeStamp World::getTimeStamp() const
     {
         return mCurrentDate->getTimeStamp();
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 2f5b82d979..1849937c63 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -134,6 +134,8 @@ namespace MWWorld
 
             uint32_t mRandomSeed{};
 
+            float mSimulationTimeScale = 1.0;
+
             // not implemented
             World (const World&);
             World& operator= (const World&);
@@ -347,6 +349,10 @@ namespace MWWorld
 
             float getTimeScaleFactor() const override;
 
+            float getSimulationTimeScale() const override { return mSimulationTimeScale; }
+
+            void setSimulationTimeScale(float scale) override;
+
             void changeToInteriorCell (const std::string& cellName, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent = true) override;
             ///< Move to interior cell.
             ///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes
diff --git a/files/lua_api/openmw/world.lua b/files/lua_api/openmw/world.lua
index c29ac4efaf..4fff22bc41 100644
--- a/files/lua_api/openmw/world.lua
+++ b/files/lua_api/openmw/world.lua
@@ -34,6 +34,11 @@
 -- @function [parent=#world] getSimulationTimeScale
 -- @return #number
 
+---
+-- Set the simulation time scale.
+-- @function [parent=#world] setSimulationTimeScale
+-- @param #number scale
+
 ---
 -- Game time in seconds.
 -- @function [parent=#world] getGameTime

From 41a976b5f0dea79769eaf6a92e12f942e5a48ce7 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 2 Jul 2022 21:49:00 +0400
Subject: [PATCH 2730/2859] Suppress a GCC 11's format-overflow warning

---
 apps/openmw/mwgui/waitdialog.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwgui/waitdialog.cpp b/apps/openmw/mwgui/waitdialog.cpp
index 6fd96ea554..53194e4f3f 100644
--- a/apps/openmw/mwgui/waitdialog.cpp
+++ b/apps/openmw/mwgui/waitdialog.cpp
@@ -159,9 +159,9 @@ namespace MWGui
         if (hour == 0) hour = 12;
 
         ESM::EpochTimeStamp currentDate = MWBase::Environment::get().getWorld()->getEpochTimeStamp();
-        int daysPassed = MWBase::Environment::get().getWorld()->getTimeStamp().getDay();
-        const char* formattedHour = pm ? "#{sSaveMenuHelp05}" : "#{sSaveMenuHelp04}";
-        std::string dateTimeText = Misc::StringUtils::format("%i %s (#{sDay} %i) %i %s", currentDate.mDay, month, daysPassed, hour, formattedHour);
+        std::string daysPassed = Misc::StringUtils::format("(#{sDay} %i)", MWBase::Environment::get().getWorld()->getTimeStamp().getDay());
+        std::string formattedHour(pm ? "#{sSaveMenuHelp05}" : "#{sSaveMenuHelp04}");
+        std::string dateTimeText = Misc::StringUtils::format("%i %s %s %i %s", currentDate.mDay, month, daysPassed, hour, formattedHour);
         mDateTimeText->setCaptionWithReplacing (dateTimeText);
     }
 

From fcab4fe1ab8c632d3693f7d2626efc198b69d1b9 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Sun, 3 Jul 2022 09:09:16 -0700
Subject: [PATCH 2731/2859] make debug window a movable and resizable window

---
 files/mygui/openmw_debug_window.layout | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/mygui/openmw_debug_window.layout b/files/mygui/openmw_debug_window.layout
index 9af646c6ed..b874280274 100644
--- a/files/mygui/openmw_debug_window.layout
+++ b/files/mygui/openmw_debug_window.layout
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout">
-  <Widget type="Window" skin="" position="0 0 400 400" layer="Debug" name="_Main" align="Stretch">
+  <Widget type="Window" skin="MW_Window" position="0 0 400 400" layer="Debug" name="_Main" align="Stretch">
     <Property key="Caption" value="Debug"/>
     <Property key="Visible" value="false"/>
 

From a16c55c93f0dfe8d21850168d3df26b21b62d7b8 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 2 Jul 2022 17:52:31 +0200
Subject: [PATCH 2732/2859] Use float based scale factor for ImageButton
 texture

---
 CHANGELOG.md                       |  1 +
 components/widgets/imagebutton.cpp | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d6918cffc..0ee2e99bba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -131,6 +131,7 @@
     Bug #6753: Info records without a DATA subrecords are loaded incorrectly
     Bug #6794: Light sources are attached to mesh bounds centers instead of mesh origins when AttachLight NiNode is missing
     Bug #6799: Game crashes if an NPC has no Class attached
+    Bug #6849: ImageButton texture is not scaled properly
     Feature #890: OpenMW-CS: Column filtering
     Feature #1465: "Reset" argument for AI functions
     Feature #2491: Ability to make OpenMW "portable"
diff --git a/components/widgets/imagebutton.cpp b/components/widgets/imagebutton.cpp
index bf2b1b24cb..6d71588830 100644
--- a/components/widgets/imagebutton.cpp
+++ b/components/widgets/imagebutton.cpp
@@ -1,5 +1,7 @@
 #include "imagebutton.hpp"
 
+#include <cmath>
+
 #include <MyGUI_RenderManager.h>
 
 #include <components/debug/debuglog.hpp>
@@ -88,13 +90,17 @@ namespace Gui
 
         if (!mUseWholeTexture)
         {
-            int scale = 1.f;
+            float scale = 1.f;
             MyGUI::ITexture* texture = MyGUI::RenderManager::getInstance().getTexture(textureName);
             if (texture && getHeight() != 0)
-                scale = texture->getHeight() / getHeight();
-
-            setImageTile(MyGUI::IntSize(mTextureRect.width * scale, mTextureRect.height * scale));
-            MyGUI::IntCoord scaledSize(mTextureRect.left * scale, mTextureRect.top * scale, mTextureRect.width * scale, mTextureRect.height * scale);
+                scale = static_cast<float>(texture->getHeight()) / getHeight();
+
+            const int width = static_cast<int>(std::round(mTextureRect.width * scale));
+            const int height = static_cast<int>(std::round(mTextureRect.height * scale));
+            setImageTile(MyGUI::IntSize(width, height));
+            MyGUI::IntCoord scaledSize(static_cast<int>(std::round(mTextureRect.left * scale)),
+                                       static_cast<int>(std::round(mTextureRect.top * scale)),
+                                       width, height);
             setImageCoord(scaledSize);
         }
 

From 63d9fa55c63d2e787f456bbff376ba1ab5e9e85a Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Sun, 3 Jul 2022 12:49:37 -0700
Subject: [PATCH 2733/2859] settings window cleanup

---
 apps/openmw/mwgui/settingswindow.cpp      |  25 +-
 apps/openmw/mwgui/settingswindow.hpp      |   3 -
 files/mygui/openmw_settings_window.layout | 355 ++++++++++------------
 3 files changed, 168 insertions(+), 215 deletions(-)

diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index 5ba9460bd0..f1c573673d 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -226,7 +226,6 @@ namespace MWGui
         getWidget(mWindowModeList, "WindowModeList");
         getWidget(mWindowBorderButton, "WindowBorderButton");
         getWidget(mTextureFilteringButton, "TextureFilteringButton");
-        getWidget(mAnisotropyBox, "AnisotropyBox");
         getWidget(mControlsBox, "ControlsBox");
         getWidget(mResetControlsButton, "ResetControlsButton");
         getWidget(mKeyboardSwitch, "KeyboardButton");
@@ -242,7 +241,6 @@ namespace MWGui
         getWidget(mScriptBox, "ScriptBox");
         getWidget(mScriptView, "ScriptView");
         getWidget(mScriptAdapter, "ScriptAdapter");
-        getWidget(mScriptDisabled, "ScriptDisabled");
 
 #ifndef WIN32
         // hide gamma controls since it currently does not work under Linux
@@ -731,24 +729,6 @@ namespace MWGui
         mControlsBox->setVisibleVScroll(true);
     }
 
-    void SettingsWindow::resizeScriptSettings()
-    {
-        constexpr int minListWidth = 150;
-        constexpr float relativeListWidth = 0.2f;
-        constexpr int padding = 2;
-        constexpr int outerPadding = padding * 2;
-        MyGUI::IntSize parentSize = mScriptFilter->getParent()->getClientCoord().size();
-        int listWidth = std::max(minListWidth, static_cast<int>(parentSize.width * relativeListWidth));
-        int filterHeight = mScriptFilter->getSize().height;
-        int listHeight = parentSize.height - mScriptList->getPosition().top - outerPadding;
-        mScriptFilter->setSize({ listWidth, filterHeight });
-        mScriptList->setSize({ listWidth, listHeight });
-        mScriptBox->setPosition({ listWidth + padding, 0 });
-        mScriptBox->setSize({ parentSize.width - listWidth - padding, parentSize.height - outerPadding });
-        mScriptDisabled->setPosition({0, 0});
-        mScriptDisabled->setSize(parentSize);
-    }
-
     namespace
     {
         std::string escapeRegex(const std::string& str)
@@ -784,7 +764,7 @@ namespace MWGui
             return static_cast<double>(matches.size());
         }
     }
-         
+
     void SettingsWindow::renderScriptSettings()
     {
         mScriptAdapter->detach();
@@ -820,7 +800,6 @@ namespace MWGui
 
         // Hide script settings tab when the game world isn't loaded and scripts couldn't add their settings
         bool disabled = LuaUi::scriptSettingsPageCount() == 0;
-        mScriptDisabled->setVisible(disabled);
         mScriptFilter->setVisible(!disabled);
         mScriptList->setVisible(!disabled);
         mScriptBox->setVisible(!disabled);
@@ -893,14 +872,12 @@ namespace MWGui
         updateWindowModeSettings();
         resetScrollbars();
         renderScriptSettings();
-        resizeScriptSettings();
         MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mOkButton);
     }
 
     void SettingsWindow::onWindowResize(MyGUI::Window *_sender)
     {
         layoutControlsBox();
-        resizeScriptSettings();
     }
 
     void SettingsWindow::computeMinimumWindowSize()
diff --git a/apps/openmw/mwgui/settingswindow.hpp b/apps/openmw/mwgui/settingswindow.hpp
index bfce6c30dd..6bc6b7c610 100644
--- a/apps/openmw/mwgui/settingswindow.hpp
+++ b/apps/openmw/mwgui/settingswindow.hpp
@@ -31,7 +31,6 @@ namespace MWGui
             MyGUI::ComboBox* mWindowModeList;
             MyGUI::Button* mWindowBorderButton;
             MyGUI::ComboBox* mTextureFilteringButton;
-            MyGUI::Widget* mAnisotropyBox;
 
             MyGUI::ComboBox* mWaterTextureSize;
             MyGUI::ComboBox* mWaterReflectionDetail;
@@ -53,7 +52,6 @@ namespace MWGui
             MyGUI::Widget* mScriptBox;
             MyGUI::ScrollView* mScriptView;
             LuaUi::LuaAdapter* mScriptAdapter;
-            MyGUI::EditBox* mScriptDisabled;
             int mCurrentPage;
 
             void onTabChanged(MyGUI::TabControl* _sender, size_t index);
@@ -94,7 +92,6 @@ namespace MWGui
             void updateSliderLabel(MyGUI::ScrollBar* scroller, const std::string& value);
 
             void layoutControlsBox();
-            void resizeScriptSettings();
             void renderScriptSettings();
 
             void computeMinimumWindowSize();
diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index 71890fec27..29c927d38b 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout" version="3.2.0">
     <Widget type="Window" skin="MW_Window" position="0 0 400 485" layer="MainMenu" name="_Main">
-        <Property key="MinSize" value="640 480"/>
+        <Property key="MinSize" value="640 490"/>
         <Widget type="TabControl" skin="TabControl" position="8 8 368 405" align="Stretch" name="SettingsTab">
             <Property key="ButtonAutoWidth" value="true"/>
-            <Widget type="TabItem" skin="" position="4 32 360 358">
+            <Widget type="TabItem">
                 <Property key="Caption" value="  #{sPrefs}  "/>
-                <Widget type="Widget" skin="" position="4 4 352 54" align="Left Top HStretch">
+                <Widget type="Widget" position="4 4 352 54" align="Left Top HStretch">
                     <Widget type="TextBox" skin="NormalText" position="0 0 352 16" align="Left Top">
                         <Property key="Caption" value="#{sTransparency_Menu}"/>
                     </Widget>
@@ -27,7 +27,7 @@
                         <Property key="TextAlign" value="Right"/>
                     </Widget>
                 </Widget>
-                <Widget type="Widget" skin="" position="4 64 352 54" align="Left Top HStretch">
+                <Widget type="Widget" position="4 64 352 54" align="Left Top HStretch">
                     <Widget type="TextBox" skin="NormalText" position="0 0 352 16" align="Left Top">
                         <Property key="Caption" value="#{sMenu_Help_Delay}"/>
                     </Widget>
@@ -48,7 +48,7 @@
                         <Property key="TextAlign" value="Right"/>
                     </Widget>
                 </Widget>
-                <Widget type="Widget" skin="" position="4 124 352 54" align="Left Top HStretch">
+                <Widget type="Widget" position="4 124 352 54" align="Left Top HStretch">
                     <Widget type="TextBox" skin="NormalText" position="0 0 352 16" align="Left Top" name="DifficultyText">
                         <Property key="Caption" value="#{sDifficulty}"/>
                     </Widget>
@@ -73,7 +73,7 @@
                         <Property key="TextAlign" value="Right"/>
                     </Widget>
                 </Widget>
-                <Widget type="Widget" skin="" position="4 184 352 54" align="Left Top HStretch">
+                <Widget type="Widget" position="4 184 352 54" align="Left Top HStretch">
                     <Widget type="TextBox" skin="NormalText" position="0 0 352 16" align="Left Top" name="ActorProcessingText">
                         <Property key="Caption" value="Actors Processing Range"/>
                     </Widget>
@@ -98,7 +98,7 @@
                         <Property key="TextAlign" value="Right"/>
                     </Widget>
                 </Widget>
-                <Widget type="HBox" skin="" position="4 250 260 24">
+                <Widget type="HBox" position="4 250 260 24">
                     <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top">
                         <UserString key="SettingCategory" value="Saves"/>
                         <UserString key="SettingName" value="autosave"/>
@@ -108,7 +108,7 @@
                         <Property key="Caption" value="#{sQuick_Save}"/>
                     </Widget>
                 </Widget>
-                <Widget type="HBox" skin="" position="4 280 260 24">
+                <Widget type="HBox" position="4 280 260 24">
                     <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top">
                         <UserString key="SettingCategory" value="Game"/>
                         <UserString key="SettingName" value="best attack"/>
@@ -118,7 +118,7 @@
                         <Property key="Caption" value="#{sBestAttack}"/>
                     </Widget>
                 </Widget>
-                <Widget type="HBox" skin="" position="4 310 260 24">
+                <Widget type="HBox" position="4 310 260 24">
                     <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top">
                         <UserString key="SettingCategory" value="GUI"/>
                         <UserString key="SettingName" value="subtitles"/>
@@ -128,7 +128,7 @@
                         <Property key="Caption" value="#{sSubtitles}"/>
                     </Widget>
                 </Widget>
-                <Widget type="HBox" skin="" position="4 340 260 24">
+                <Widget type="HBox" position="4 340 260 24">
                     <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top">
                         <UserString key="SettingCategory" value="HUD"/>
                         <UserString key="SettingName" value="crosshair"/>
@@ -139,7 +139,7 @@
                     </Widget>
                 </Widget>
             </Widget>
-            <Widget type="TabItem" skin="" position="4 32 360 308">
+            <Widget type="TabItem">
                 <Property key="Caption" value="  #{sAudio}  "/>
                 <Widget type="TextBox" skin="NormalText" position="4 4 352 18" align="Left Top">
                     <Property key="Caption" value="#{sMaster}"/>
@@ -197,14 +197,20 @@
                     <UserString key="SettingValueType" value="Float"/>
                 </Widget>
             </Widget>
-            <Widget type="TabItem" skin="" position="4 32 360 308">
+            <Widget type="TabItem">
                 <Property key="Caption" value="  #{sControls}  "/>
-                <Widget type="AutoSizedButton" skin="MW_Button" position="4 4 137 24" align="Left Top" name="KeyboardButton">
-                    <Property key="Caption" value="Mouse/Keyboard"/>
-                </Widget>
-                <Widget type="AutoSizedButton" skin="MW_Button" position="145 4 137 24" align="Left Top" name="ControllerButton">
-                    <Property key="Caption" value="Controller"/>
+
+                <Widget type="HBox" position="4 4 360 24">
+                    <Property key="Padding" value="0"/>
+                    <Property key="Spacing" value="4"/>
+                    <Widget type="AutoSizedButton" skin="MW_Button" name="KeyboardButton">
+                        <Property key="Caption" value="Mouse/Keyboard"/>
+                    </Widget>
+                    <Widget type="AutoSizedButton" skin="MW_Button" name="ControllerButton">
+                        <Property key="Caption" value="Controller"/>
+                    </Widget>
                 </Widget>
+
                 <Widget type="Widget" skin="MW_Box" position="4 34 352 154" align="Stretch">
                     <Widget type="ScrollView" skin="MW_ScrollView" position="4 4 344 146" align="Stretch" name="ControlsBox">
                         <Property key="CanvasAlign" value="Left Top"/>
@@ -213,16 +219,16 @@
                 <Widget type="AutoSizedButton" skin="MW_Button" position="4 194 137 24" align="Left Bottom" name="ResetControlsButton">
                     <Property key="Caption" value="#{sControlsMenu1}"/>
                 </Widget>
-                <Widget type="HBox" skin="" position="4 224 380 24" align="Left Bottom">
-                    <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Bottom">
+                <Widget type="HBox" position="4 224 380 24" align="Left Bottom">
+                    <Widget type="AutoSizedButton" skin="MW_Button">
                         <UserString key="SettingCategory" value="Input"/>
                         <UserString key="SettingName" value="invert x axis"/>
                         <UserString key="SettingType" value="CheckButton"/>
                     </Widget>
-                    <Widget type="AutoSizedTextBox" skin="SandText" position="28 4 78 16" align="Left Bottom">
-                        <Property key="Caption" value="Invert X Axis"/>
+                    <Widget type="AutoSizedTextBox" skin="SandText">
+                        <Property key="Caption" value="Invert X Axis "/>
                     </Widget>
-                    <Widget type="AutoSizedButton" skin="MW_Button" position="28 0 24 24" align="Left Bottom">
+                    <Widget type="AutoSizedButton" skin="MW_Button">
                         <UserString key="SettingCategory" value="Input"/>
                         <UserString key="SettingName" value="invert y axis"/>
                         <UserString key="SettingType" value="CheckButton"/>
@@ -252,7 +258,7 @@
                     <Property key="Caption" value="#{sHigh}"/>
                     <Property key="TextAlign" value="Right"/>
                 </Widget>
-                <Widget type="HBox" skin="" position="4 324 352 24" align="Left Bottom">
+                <Widget type="HBox" position="4 324 352 24" align="Left Bottom">
                     <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Bottom">
                         <UserString key="SettingCategory" value="Input"/>
                         <UserString key="SettingName" value="enable controller"/>
@@ -263,24 +269,24 @@
                     </Widget>
                 </Widget>
             </Widget>
-            <Widget type="TabItem" skin="" position="4 32 360 308">
+            <Widget type="TabItem">
                 <Property key="Caption" value="  #{sVideo}  "/>
                 <Widget type="TabControl" skin="TabControlInner" position="4 4 352 390" align="Stretch">
                     <Property key="ButtonAutoWidth" value="true"/>
-                    <Widget type="TabItem" skin="" position="0 28 352 268" align="Stretch">
+                    <Widget type="TabItem">
                         <Property key="Caption" value="  Video  "/>
                         <Widget type="ListBox" skin="MW_List" position="0 4 170 215" align="Left Top" name="ResolutionList"/>
                         <Widget type="TextBox" skin="NormalText" position="182 4 170 18" align="Left Top">
                             <Property key="Caption" value="Window Mode:"/>
                         </Widget>
-                        <Widget type="HBox" skin="" position="182 28 300 24">
+                        <Widget type="HBox" position="182 28 300 24">
                             <Widget type="ComboBox" skin="MW_ComboBox" position="0 0 200 24" align="Left Top" name="WindowModeList">
                                 <Property key="AddItem" value="Fullscreen"/>
                                 <Property key="AddItem" value="Windowed Fullscreen"/>
                                 <Property key="AddItem" value="Windowed"/>
                             </Widget>
                         </Widget>
-                        <Widget type="HBox" skin="" position="182 64 300 24">
+                        <Widget type="HBox" position="182 64 300 24">
                             <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top" name="VSyncButton">
                                 <UserString key="SettingCategory" value="Video"/>
                                 <UserString key="SettingName" value="vsync"/>
@@ -290,7 +296,7 @@
                                 <Property key="Caption" value="VSync"/>
                             </Widget>
                         </Widget>
-                        <Widget type="HBox" skin="" position="182 94 300 24">
+                        <Widget type="HBox" position="182 94 300 24">
                             <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top" name="WindowBorderButton">
                                 <UserString key="SettingCategory" value="Video"/>
                                 <UserString key="SettingName" value="window border"/>
@@ -300,12 +306,7 @@
                                 <Property key="Caption" value="Window border"/>
                             </Widget>
                         </Widget>
-
-                        <Widget type="TextBox" skin="SandText" position="182 124 300 32" align="Left Top">
-                            <Property key="Caption" value="Hint: press F3 to show the current frame rate."/>
-                        </Widget>
-
-                        <Widget type="HBox" skin="" position="182 160 300 24">
+                        <Widget type="HBox" position="182 124 300 24">
                             <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top" name="WindowBorderButton">
                                 <UserString key="SettingCategory" value="Post Processing"/>
                                 <UserString key="SettingName" value="enabled"/>
@@ -313,11 +314,14 @@
                             </Widget>
                             <Widget type="AutoSizedTextBox" skin="SandText" position="28 4 48 16" align="Left Top">
                                 <Property key="Caption" value="Post Processing"/>
+                                <UserString key="ToolTipType" value="Layout"/>
+                                <UserString key="ToolTipLayout" value="TextToolTip"/>
+                                <UserString key="Caption_Text" value="Press F2 to show the config HUD"/>
                             </Widget>
                         </Widget>
 
-                        <Widget type="TextBox" skin="SandText" position="182 190 300 32" align="Left Top">
-                            <Property key="Caption" value="Hint: press F2 to show the config HUD."/>
+                        <Widget type="AutoSizedTextBox" skin="SandText" position="182 154 300 32" align="Left Top">
+                            <Property key="Caption" value="Hint: press F3 to show the current frame rate."/>
                         </Widget>
 
                         <Widget type="TextBox" skin="NormalText" position="0 228 352 18" align="Left Top" name="FovText">
@@ -364,33 +368,36 @@
                             <Property key="TextAlign" value="Right"/>
                         </Widget>
                     </Widget>
-                    <Widget type="TabItem" skin="" position="0 28 352 268">
+                    <Widget type="TabItem">
                         <Property key="Caption" value="  Detail  "/>
-                        <Widget type="TextBox" skin="NormalText" position="4 4 300 24" align="Left Top">
+
+                        <Widget type="AutoSizedTextBox" skin="NormalText" align="Left Top">
                             <Property key="Caption" value="Texture Filtering"/>
+                            <UserString key="VStretch" value="false"/>
+                            <UserString key="HStretch" value="false"/>
                         </Widget>
-                        <Widget type="ComboBox" skin="MW_ComboBox" position="14 28 110 24" align="Left Top" name="TextureFilteringButton">
+                        <Widget type="ComboBox" align="Left Top" skin="MW_ComboBox" position="0 28 200 24" name="TextureFilteringButton">
                             <Property key="AddItem" value="Bilinear"/>
                             <Property key="AddItem" value="Trilinear"/>
                         </Widget>
-                        <Widget type="Widget" skin="" position="184 4 300 50" align="Left Top" name="AnisotropyBox">
-                            <Widget type="TextBox" skin="NormalText" position="0 0 300 24" align="Left Top" name="AnisotropyLabel">
-                                <Property key="Caption" value="Anisotropy"/>
-                            </Widget>
-                            <Widget type="ScrollBar" skin="MW_HScroll" position="0 28 150 18" align="Left Top">
-                                <Property key="Range" value="17"/>
-                                <Property key="Page" value="1"/>
-                                <UserString key="SettingType" value="Slider"/>
-                                <UserString key="SettingCategory" value="General"/>
-                                <UserString key="SettingName" value="anisotropy"/>
-                                <UserString key="SettingLabelWidget" value="AnisotropyLabel"/>
-                                <UserString key="SettingLabelCaption" value="Anisotropy (%s)"/>
-                            </Widget>
+
+                        <Widget type="AutoSizedTextBox" skin="NormalText" position="0 58 200 18" name="AnisotropyLabel">
+                            <Property key="Caption" value="Anisotropy"/>
+                        </Widget>
+                        <Widget type="ScrollBar" skin="MW_HScroll" position="0 80 352 18" align="HStretch Top">
+                            <Property key="Range" value="17"/>
+                            <Property key="Page" value="1"/>
+                            <UserString key="SettingType" value="Slider"/>
+                            <UserString key="SettingCategory" value="General"/>
+                            <UserString key="SettingName" value="anisotropy"/>
+                            <UserString key="SettingLabelWidget" value="AnisotropyLabel"/>
+                            <UserString key="SettingLabelCaption" value="Anisotropy (%s)"/>
                         </Widget>
-                        <Widget type="TextBox" skin="NormalText" position="0 130 352 18" align="Left Top" name="RenderDistanceLabel">
+
+                        <Widget type="AutoSizedTextBox" skin="NormalText" position="0 104 0 18" align="Left Top" name="RenderDistanceLabel">
                             <Property key="Caption" value="#{sRender_Distance}"/>
                         </Widget>
-                        <Widget type="ScrollBar" skin="MW_HScroll" position="0 154 352 18" align="HStretch Top" name="RenderingDistanceSlider">
+                        <Widget type="ScrollBar" skin="MW_HScroll" position="0 126 352 18" align="HStretch Top" name="RenderingDistanceSlider">
                             <Property key="Range" value="4669"/>
                             <Property key="Page" value="128"/>
                             <UserString key="SettingType" value="Slider"/>
@@ -402,7 +409,7 @@
                             <UserString key="SettingLabelWidget" value="RenderDistanceLabel"/>
                             <UserString key="SettingLabelCaption" value="#{sRender_Distance} (%s)"/>
                         </Widget>
-                        <Widget type="ScrollBar" skin="MW_HScroll" position="0 154 352 18" align="HStretch Top" name="LargeRenderingDistanceSlider">
+                        <Widget type="ScrollBar" skin="MW_HScroll" position="0 126 352 18" align="HStretch Top" name="LargeRenderingDistanceSlider">
                             <Property key="Range" value="79421"/>
                             <Property key="Page" value="2048"/>
                             <UserString key="SettingType" value="Slider"/>
@@ -414,50 +421,80 @@
                             <UserString key="SettingLabelWidget" value="RenderDistanceLabel"/>
                             <UserString key="SettingLabelCaption" value="#{sRender_Distance} (x%s)"/>
                         </Widget>
-                        <Widget type="TextBox" skin="SandText" position="0 178 352 18" align="Left Top">
+                        <Widget type="TextBox" skin="SandText" position="0 148 352 18" align="Left Top">
                             <Property key="Caption" value="#{sNear}"/>
                             <Property key="TextAlign" value="Left"/>
                         </Widget>
-                        <Widget type="TextBox" skin="SandText" position="0 178 352 18" align="Right Top">
+                        <Widget type="TextBox" skin="SandText" position="0 148 352 18" align="Right Top">
                             <Property key="Caption" value="#{sFar}"/>
                             <Property key="TextAlign" value="Right"/>
                         </Widget>
+
                     </Widget>
-                    <Widget type="TabItem" skin="" position="0 28 352 268">
+                    <Widget type="TabItem">
                         <Property key="Caption" value="  Water  "/>
-                        <Widget type="HBox" skin="" position="4 4 350 24">
-                            <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top">
-                                <UserString key="SettingCategory" value="Water"/>
-                                <UserString key="SettingName" value="shader"/>
-                                <UserString key="SettingType" value="CheckButton"/>
-                            </Widget>
-                            <Widget type="AutoSizedTextBox" skin="SandText" position="28 4 75 16" align="Left Top">
-                                <Property key="Caption" value="Water shader"/>
+
+                        <Widget type="VBox" position_real="0 0 1 1" align="Stretch">
+
+                            <Widget type="HBox" align="Stretch">
+                                <UserString key="HStretch" value="true"/>
+                                <UserString key="VStretch" value="false"/>
+
+                                <Widget type="AutoSizedButton" skin="MW_Button">
+                                    <UserString key="SettingCategory" value="Water"/>
+                                    <UserString key="SettingName" value="shader"/>
+                                    <UserString key="SettingType" value="CheckButton"/>
+                                </Widget>
+                                <Widget type="AutoSizedTextBox" skin="SandText">
+                                    <Property key="Caption" value="Water shader"/>
+                                </Widget>
                             </Widget>
-                        </Widget>
-                        <Widget type="Widget" skin="" position="24 32 300 230">
-                            <Widget type="HBox" skin="" position="4 0 350 24">
-                                <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top">
+
+                            <Widget type="HBox" align="Stretch">
+                                <UserString key="HStretch" value="true"/>
+                                <UserString key="VStretch" value="false"/>
+
+                                <Widget type="AutoSizedButton" skin="MW_Button">
                                     <UserString key="SettingCategory" value="Water"/>
                                     <UserString key="SettingName" value="refraction"/>
                                     <UserString key="SettingType" value="CheckButton"/>
                                 </Widget>
-                                <Widget type="AutoSizedTextBox" skin="SandText" position="28 4 79 16" align="Left Top">
+                                <Widget type="AutoSizedTextBox" skin="SandText">
                                     <Property key="Caption" value="Refraction"/>
                                 </Widget>
                             </Widget>
-                            <Widget type="HBox" skin="" position="4 28 350 24">
-                                <Widget type="ComboBox" skin="MW_ComboBox" position="0 0 85 24" align="Left Top" name="WaterTextureSize">
+
+                            <Widget type="Widget" position="0 0 0 18" align="Top Left HStretch">
+                                <UserString key="HStretch" value="true"/>
+                                <Widget type="AutoSizedTextBox" skin="NormalText">
+                                    <Property key="Caption" value="Texture quality"/>
+                                </Widget>
+                                <Widget type="Spacer" />
+                            </Widget>
+
+                            <Widget type="HBox" align="Stretch">
+                                <UserString key="HStretch" value="true"/>
+                                <UserString key="VStretch" value="false"/>
+                                <Widget type="ComboBox" skin="MW_ComboBox" position="0 0 200 24" align="Left Top" name="WaterTextureSize">
                                     <Property key="AddItem" value="Low"/>
                                     <Property key="AddItem" value="Medium"/>
                                     <Property key="AddItem" value="High"/>
                                 </Widget>
-                                <Widget type="AutoSizedTextBox" skin="SandText" position="64 4 90 16" align="Left Top">
-                                    <Property key="Caption" value="Texture quality"/>
+                                <Widget type="Spacer" />
+                            </Widget>
+
+                            <Widget type="Widget" position="0 0 0 18" align="Top Left HStretch">
+                                <UserString key="HStretch" value="true"/>
+                                <Widget type="AutoSizedTextBox" skin="NormalText">
+                                    <Property key="Caption" value="Reflection shader detail"/>
                                 </Widget>
+                                <Widget type="Spacer" />
                             </Widget>
-                            <Widget type="HBox" skin="" position="4 56 350 24">
-                                <Widget type="ComboBox" skin="MW_ComboBox" position="0 0 115 24" align="Left Top" name="WaterReflectionDetail">
+                            <Widget type="HBox" align="Stretch">
+                                <UserString key="HStretch" value="true"/>
+                                <UserString key="VStretch" value="false"/>
+
+                                <Widget type="ComboBox" skin="MW_ComboBox" position="0 0 200 24" align="Left Top" name="WaterReflectionDetail">
                                     <Property key="AddItem" value="Sky"/>
                                     <Property key="AddItem" value="Terrain"/>
                                     <Property key="AddItem" value="World"/>
@@ -465,42 +502,50 @@
                                     <Property key="AddItem" value="Actors"/>
                                     <Property key="AddItem" value="Groundcover"/>
                                 </Widget>
-                                <Widget type="AutoSizedTextBox" skin="SandText" position="64 4 90 16" align="Left Top">
-                                    <Property key="Caption" value="Reflection shader detail"/>
+                                <Widget type="Spacer" />
+                            </Widget>
+
+                            <Widget type="Widget" position="0 0 0 18" align="Top Left HStretch">
+                                <UserString key="HStretch" value="true"/>
+                                <Widget type="AutoSizedTextBox" skin="NormalText">
+                                    <Property key="Caption" value="Rain ripple detail"/>
                                 </Widget>
+                                <Widget type="Spacer" />
                             </Widget>
-                            <Widget type="HBox" skin="" position="4 84 350 24">
-                                <Widget type="ComboBox" skin="MW_ComboBox" position="0 0 115 24" align="Left Top" name="WaterRainRippleDetail">
+
+                            <Widget type="HBox" align="Stretch">
+                                <UserString key="HStretch" value="true"/>
+                                <UserString key="VStretch" value="false"/>
+
+                                <Widget type="ComboBox" skin="MW_ComboBox" position="0 0 200 24" align="Left Top" name="WaterRainRippleDetail">
                                     <Property key="AddItem" value="Simple"/>
                                     <Property key="AddItem" value="Sparse"/>
                                     <Property key="AddItem" value="Dense"/>
                                 </Widget>
-                                <Widget type="AutoSizedTextBox" skin="SandText" position="64 4 90 16" align="Left Top">
-                                    <Property key="Caption" value="Rain ripple detail/density"/>
-                                </Widget>
+                                <Widget type="Spacer" />
                             </Widget>
+
                         </Widget>
 
                     </Widget>
-
-                    <Widget type="TabItem" skin="" position="4 32 360 308">
+                    <Widget type="TabItem">
                         <Property key="Caption" value="  Lights  "/>
                         <!-- Lighting Method -->
-                        <Widget type="TextBox" skin="NormalText" position="0 4 170 18" align="Left Top">
-                            <Property key="Caption" value="Lighting Method:"/>
+                        <Widget type="TextBox" skin="NormalText" position="0 4 200 18" align="Left Top">
+                            <Property key="Caption" value="Lighting Method"/>
                         </Widget>
-                        <Widget type="ComboBox" skin="MW_ComboBox" position="0 28 170 24" align="Left Top" name="LightingMethodButton">
+                        <Widget type="ComboBox" skin="MW_ComboBox" position="0 28 200 24" align="Left Top" name="LightingMethodButton">
                             <Property key="AddItem" value="legacy"/>
                             <Property key="AddItem" value="shaders compatibility"/>
                             <Property key="AddItem" value="shaders"/>
                         </Widget>
                         <!-- Max Lights -->
-                        <Widget type="TextBox" skin="NormalText" position="178 4 160 18" align="Left Top" name="MaxLightsText">
+                        <Widget type="TextBox" skin="NormalText" position="208 4 160 18" align="Left Top" name="MaxLightsText">
                             <UserString key="ToolTipType" value="Layout"/>
                             <UserString key="ToolTipLayout" value="TextToolTip"/>
                             <UserString key="Caption_Text" value="Default: 8\nMaximum number of lights per object.\n\nA low number near default will cause light popping similar to what you would see with legacy lighting."/>
                         </Widget>
-                        <Widget type="ScrollBar" skin="" position="0 0 0 0">
+                        <Widget type="ScrollBar" position="0 0 0 0">
                             <UserString key="SettingType" value="Slider"/>
                             <UserString key="SettingCategory" value="Shaders"/>
                             <UserString key="SettingName" value="max lights"/>
@@ -508,7 +553,7 @@
                             <UserString key="SettingLabelWidget" value="MaxLightsText"/>
                             <UserString key="SettingLabelCaption" value="Max Lights: (%s)"/>
                         </Widget>
-                        <Widget type="ComboBox" skin="MW_ComboBox" position="178 28 170 24" align="Left Top" name="MaxLights">
+                        <Widget type="ComboBox" skin="MW_ComboBox" position="208 28 200 24" align="Left Top" name="MaxLights">
                             <Property key="AddItem" value="8"/>
                             <Property key="AddItem" value="16"/>
                             <Property key="AddItem" value="24"/>
@@ -589,107 +634,41 @@
                             <Property key="Caption" value="Reset To Defaults"/>
                         </Widget>
                     </Widget>
-                    <!--
-                    <Widget type="TabItem" skin="" position="0 28 352 268">
-                    <Widget type="Widget" skin="" position="0 28 352 268">
-                        <Property key="Visible" value="false"/>
-                        <Property key="Caption" value="  Shadows  "/>
-                        <Widget type="HBox" skin="" position="4 4 350 24">
-                            <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top" name="ShadowsEnabledButton">
-                                <UserString key="SettingCategory" value="Shadows"/>
-                                <UserString key="SettingName" value="enabled"/>
-                                <UserString key="SettingType" value="CheckButton"/>
-                            </Widget>
-                            <Widget type="AutoSizedTextBox" skin="SandText" position="28 4 65 16" align="Left Top">
-                                <Property key="Caption" value="Shadows"/>
-                            </Widget>
-                        </Widget>
-                        <Widget type="Widget" skin="" position="24 32 300 230">
-                            <Widget type="HBox" skin="" position="4 0 350 24">
-                                <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top" name="ShadowsLargeDistance">
-                                    <UserString key="SettingCategory" value="Shadows"/>
-                                    <UserString key="SettingName" value="split"/>
-                                    <UserString key="SettingType" value="CheckButton"/>
-                                </Widget>
-                                <Widget type="AutoSizedTextBox" skin="SandText" position="28 4 182 16" align="Left Top">
-                                    <Property key="Caption" value="Large distance (PSSM3)"/>
-                                </Widget>
-                            </Widget>
-                            <Widget type="HBox" skin="" position="4 28 350 24">
-                                <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top" name="TerrainShadows">
-                                    <UserString key="SettingCategory" value="Shadows"/>
-                                    <UserString key="SettingName" value="terrain shadows"/>
-                                    <UserString key="SettingType" value="CheckButton"/>
-                                </Widget>
-                                <Widget type="AutoSizedTextBox" skin="SandText" position="28 4 122 16" align="Left Top">
-                                    <Property key="Caption" value="Terrain shadows"/>
-                                </Widget>
-                            </Widget>
-                            <Widget type="HBox" skin="" position="4 56 350 24">
-                                <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top" name="ActorShadows">
-                                    <UserString key="SettingCategory" value="Shadows"/>
-                                    <UserString key="SettingName" value="actor shadows"/>
-                                    <UserString key="SettingType" value="CheckButton"/>
-                                </Widget>
-                                <Widget type="AutoSizedTextBox" skin="SandText" position="28 4 108 16" align="Left Top">
-                                    <Property key="Caption" value="Actor shadows"/>
-                                </Widget>
-                            </Widget>
-                            <Widget type="HBox" skin="" position="4 84 350 24">
-                                <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top" name="StaticsShadows">
-                                    <UserString key="SettingCategory" value="Shadows"/>
-                                    <UserString key="SettingName" value="statics shadows"/>
-                                    <UserString key="SettingType" value="CheckButton"/>
-                                </Widget>
-                                <Widget type="AutoSizedTextBox" skin="SandText" position="28 4 111 16" align="Left Top">
-                                    <Property key="Caption" value="World shadows"/>
-                                </Widget>
-                            </Widget>
-                            <Widget type="HBox" skin="" position="4 112 350 24">
-                                <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top" name="MiscShadows">
-                                    <UserString key="SettingCategory" value="Shadows"/>
-                                    <UserString key="SettingName" value="misc shadows"/>
-                                    <UserString key="SettingType" value="CheckButton"/>
-                                </Widget>
-                                <Widget type="AutoSizedTextBox" skin="SandText" position="28 4 102 16" align="Left Top">
-                                    <Property key="Caption" value="Misc shadows"/>
-                                </Widget>
-                            </Widget>
-                            <Widget type="HBox" skin="" position="4 140 350 24">
-                                <Widget type="ComboBox" skin="MW_ComboBox" position="0 0 60 24" align="Left Top" name="ShadowsTextureSize">
-                                    <Property key="AddItem" value="512"/>
-                                    <Property key="AddItem" value="1024"/>
-                                    <Property key="AddItem" value="2048"/>
-                                    <Property key="AddItem" value="4096"/>
-                                </Widget>
-                                <Widget type="AutoSizedTextBox" skin="SandText" position="64 4 90 16" align="Left Top">
-                                    <Property key="Caption" value="Texture size"/>
-                                </Widget>
-                            </Widget>
-                        </Widget>
-                    </Widget>
-                    -->
                 </Widget>
             </Widget>
-            <Widget type="TabItem" skin="" position="4 32 360 308">
+            <Widget type="TabItem">
                 <Property key="Caption" value="  Scripts  "/>
-                <Widget name="ScriptFilter" type="EditBox" skin="MW_TextEdit" position="0 0 150 40"/>
-                <Widget name="ScriptList" type="ListBox" skin="MW_List" position="0 40 150 268"/>
-                <Widget name="ScriptBox" type="Widget" skin="MW_Box" position="150 0 250 250" name="ScriptBox">
-                    <Widget name="ScriptView" type="ScrollView" skin="MW_ScrollViewVH" position="2 2 246 246" align="Stretch">
-                        <Property key="CanvasAlign" value="Left Top"/>
-                        <Property key="CanvasSize" value="246 246"/>
-                        <Widget name="ScriptAdapter" type="LuaAdapter" position="0 0 246 246"/>
+
+                <Widget type="HBox" position_real="0 0 1 0.99" align="Stretch">
+                    <Property key="Padding" value="0"/>
+                    <Property key="Spacing" value="0"/>
+
+                    <Widget type="VBox" align="Left VStretch">
+                        <UserString key="VStretch" value="true"/>
+
+                        <Widget name="ScriptFilter" type="EditBox" skin="MW_TextEdit" position="0 0 300 28">
+                            <UserString key="HStretch" value="false"/>
+                            <UserString key="VStretch" value="false"/>
+                        </Widget>
+
+                        <Widget name="ScriptList" type="ListBox" skin="MW_List" align="Left VStretch">
+                            <UserString key="HStretch" value="true"/>
+                            <UserString key="VStretch" value="true"/>
+                        </Widget>
                     </Widget>
+
+                    <Widget name="ScriptBox" type="Widget" align="Stretch" name="ScriptBox">
+                        <UserString key="HStretch" value="true"/>
+                        <UserString key="VStretch" value="true"/>
+
+                        <Widget name="ScriptView" type="ScrollView" skin="MW_ScrollViewVH" align="Stretch">
+                            <Property key="CanvasAlign" value="Left Top"/>
+                            <Widget name="ScriptAdapter" type="LuaAdapter"/>
+                        </Widget>
+                    </Widget>
+
                 </Widget>
-                <Widget name="ScriptDisabled" type="EditBox" skin="SandText" position="0 0 360 308" align="Center">
-                    <Property key="Visible" value="false"/>
-                    <Property key="Caption" value="Scripts settings are only available when a game is loaded."/>
-                    <Property key="TextAlign" value="Center" />
-                    <Property key="MultiLine" value="true" />
-                    <Property key="WordWrap" value="true" />
-                    <Property key="Static" value="true"/>
-                </Widget>
+
             </Widget>
         </Widget>
         <Widget type="AutoSizedButton" skin="MW_Button" position="320 420 56 24" align="Right Bottom" name="OkButton">

From 9a0e9ac4fe8adb5fb249371daff5090b99c09bde Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Sun, 3 Jul 2022 18:46:22 -0700
Subject: [PATCH 2734/2859] fix emissives in character preview

---
 apps/openmw/mwrender/characterpreview.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index f986c71045..c026392a9f 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -268,12 +268,15 @@ namespace MWRender
         fog->setEnd(10000000);
         stateset->setAttributeAndModes(fog, osg::StateAttribute::OFF|osg::StateAttribute::OVERRIDE);
 
-        // turn of sky blending
+        // TODO: Clean up this mess of loose uniforms that shaders depend on.
+        // turn off sky blending
         stateset->addUniform(new osg::Uniform("far", 10000000.0f));
         stateset->addUniform(new osg::Uniform("skyBlendingStart", 8000000.0f));
         stateset->addUniform(new osg::Uniform("sky", 0));
         stateset->addUniform(new osg::Uniform("screenRes", osg::Vec2f{1, 1}));
 
+        stateset->addUniform(new osg::Uniform("emissiveMult", 1.f));
+
         // Opaque stuff must have 1 as its fragment alpha as the FBO is translucent, so having blending off isn't enough
         osg::ref_ptr<osg::TexEnvCombine> noBlendAlphaEnv = new osg::TexEnvCombine();
         noBlendAlphaEnv->setCombine_Alpha(osg::TexEnvCombine::REPLACE);

From c09648c34959d3f5e0c428af5228d92cb2414410 Mon Sep 17 00:00:00 2001
From: Abdu Sharif <narukomanroom@gmail.com>
Date: Mon, 4 Jul 2022 17:31:03 +0000
Subject: [PATCH 2735/2859] Add a missing 0 in fog.glsl

---
 files/shaders/fog.glsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/shaders/fog.glsl b/files/shaders/fog.glsl
index 7a56179399..9bf93079f3 100644
--- a/files/shaders/fog.glsl
+++ b/files/shaders/fog.glsl
@@ -18,7 +18,7 @@ vec4 applyFogAtDist(vec4 color, float euclideanDist, float linearDist)
     float fogValue = clamp((dist - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);
 #endif
 #ifdef ADDITIVE_BLENDING
-    color.xyz *= 1 - fogValue;
+    color.xyz *= 1.0 - fogValue;
 #else
     color.xyz = mix(color.xyz, gl_Fog.color.xyz, fogValue);
 #endif

From ed7e68524ec61d4b884a0791e9604bd3a22697c5 Mon Sep 17 00:00:00 2001
From: Abdu Sharif <narukomanroom@gmail.com>
Date: Mon, 4 Jul 2022 17:47:50 +0000
Subject: [PATCH 2736/2859] Update custom-shader-effects.rst

---
 .../source/reference/modding/custom-shader-effects.rst | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/source/reference/modding/custom-shader-effects.rst b/docs/source/reference/modding/custom-shader-effects.rst
index a21afcc7bd..5e1b4f9e66 100644
--- a/docs/source/reference/modding/custom-shader-effects.rst
+++ b/docs/source/reference/modding/custom-shader-effects.rst
@@ -2,16 +2,16 @@ Custom Shader Effects
 #####################
 
 OpenMW leverages the `NiStringExtraData` node to inject special shader flags and effects.
-This nodes must have the prefix `omw:data` and have a valid JSON object that follows.
+This node must have the prefix `omw:data` and have a valid JSON object that follows.
 
 .. note::
 
-    This is a new feature to inject OpenMW specific effects. Only a single
+    This is a new feature to inject OpenMW-specific shader effects. Only a single
     effect is currently supported. By default, the shader effects will propogate
-    to all a nodes children. Other propogation modes and effects will come with
+    to all a node's children. Other propogation modes and effects will come with
     future releases.
 
-See below to see the currently supported effects.
+Look below to see the currently supported effects.
 
 Soft Effect
 -----------
@@ -23,7 +23,7 @@ planes for various effects like steam over a hotspring or low hanging fog for
 dungeons.
 
 To use this feature the :ref:`soft particles` setting must be enabled.
-This settings can either be activated in the OpenMW launcher or changed in `settings.cfg`:
+This setting can either be activated in the OpenMW launcher or changed in `settings.cfg`:
 
 ::
 

From eddd72be62af249756397010457c4adcafaccdbd Mon Sep 17 00:00:00 2001
From: Abdu Sharif <narukomanroom@gmail.com>
Date: Mon, 4 Jul 2022 18:08:08 +0000
Subject: [PATCH 2737/2859] Remove this line

---
 docs/source/reference/modding/custom-shader-effects.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/source/reference/modding/custom-shader-effects.rst b/docs/source/reference/modding/custom-shader-effects.rst
index 5e1b4f9e66..340ed5ffed 100644
--- a/docs/source/reference/modding/custom-shader-effects.rst
+++ b/docs/source/reference/modding/custom-shader-effects.rst
@@ -11,7 +11,6 @@ This node must have the prefix `omw:data` and have a valid JSON object that foll
     to all a node's children. Other propogation modes and effects will come with
     future releases.
 
-Look below to see the currently supported effects.
 
 Soft Effect
 -----------

From 7989d1645f838e7badaae4294ae471ff5533268c Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 6 Jun 2022 01:10:33 +0200
Subject: [PATCH 2738/2859] Run integration tests in CI

---
 .gitlab-ci.yml                                | 20 ++++++++-
 CI/before_script.linux.sh                     |  1 -
 CI/install_debian_deps.sh                     | 33 +++++++++++++++
 CI/run_integration_tests.sh                   | 10 +++++
 .../integration_tests/test_lua_api/player.lua | 41 +++++++++++--------
 .../integration_tests/test_lua_api/test.lua   | 26 +++++++++---
 .../test_lua_api/testing_util.lua             |  6 +++
 scripts/integration_tests.py                  | 40 +++++++++++++++---
 scripts/osg_stats.py                          |  2 +-
 9 files changed, 150 insertions(+), 29 deletions(-)
 create mode 100755 CI/run_integration_tests.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d2a1c1423b..67898dc0af 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,6 +5,7 @@ default:
 # See https://docs.gitlab.com/ee/ci/yaml/#needs
 stages:
   - build
+  - test
 
 # https://blog.nimbleways.com/let-s-make-faster-gitlab-ci-cd-pipelines/
 variables:
@@ -21,7 +22,6 @@ variables:
   image: ubuntu:focal
   rules:
     - if: $CI_PIPELINE_SOURCE == "push"
-  
 
 .Ubuntu:
   extends: .Ubuntu_Image
@@ -300,6 +300,24 @@ Ubuntu_Clang_tests_Debug:
     reports:
       junit: build/tests.xml
 
+Ubuntu_Clang_integration_tests:
+  extends: .Ubuntu_Image
+  stage: test
+  needs:
+    - Ubuntu_Clang
+  variables:
+    PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
+  cache:
+    key: Ubuntu_Clang_integration_tests.v1
+    paths:
+      - .cache/pip
+      - apt-cache/
+  before_script:
+    - CI/install_debian_deps.sh openmw-integration-tests
+    - pip3 install --user numpy matplotlib termtables click
+  script:
+    - CI/run_integration_tests.sh
+
 .MacOS:
   image: macos-11-xcode-12
   tags:
diff --git a/CI/before_script.linux.sh b/CI/before_script.linux.sh
index 8b0918827f..cae35dff68 100755
--- a/CI/before_script.linux.sh
+++ b/CI/before_script.linux.sh
@@ -28,7 +28,6 @@ declare -a CMAKE_CONF_OPTS=(
     -DBUILD_SHARED_LIBS=OFF
     -DUSE_SYSTEM_TINYXML=ON
     -DOPENMW_USE_SYSTEM_RECASTNAVIGATION=ON
-    -DCMAKE_INSTALL_PREFIX=install
     -DOPENMW_CXX_FLAGS="-Werror -Werror=implicit-fallthrough"  # flags specific to OpenMW project
 )
 
diff --git a/CI/install_debian_deps.sh b/CI/install_debian_deps.sh
index c089558208..8342d89722 100755
--- a/CI/install_debian_deps.sh
+++ b/CI/install_debian_deps.sh
@@ -42,6 +42,39 @@ declare -rA GROUPED_DEPS=(
   "
 
   [openmw-coverage]="gcovr"
+
+  [openmw-integration-tests]="
+    ca-certificates
+    git
+    git-lfs
+    libavcodec58
+    libavformat58
+    libavutil56
+    libboost-filesystem1.71.0
+    libboost-iostreams1.71.0
+    libboost-program-options1.71.0
+    libboost-system1.71.0
+    libbullet2.88
+    libcollada-dom2.4-dp0
+    libicu66
+    libjpeg8
+    libluajit-5.1-2
+    liblz4-1
+    libmyguiengine3debian1v5
+    libopenal1
+    libopenscenegraph161
+    libpng16-16
+    libqt5opengl5
+    librecast1
+    libsdl2-2.0-0
+    libsqlite3-0
+    libswresample3
+    libswscale5
+    libtinyxml2.6.2v5
+    libyaml-cpp0.6
+    python3-pip
+    xvfb
+  "
 )
 
 if [[ $# -eq 0 ]]; then
diff --git a/CI/run_integration_tests.sh b/CI/run_integration_tests.sh
new file mode 100755
index 0000000000..d7b025df52
--- /dev/null
+++ b/CI/run_integration_tests.sh
@@ -0,0 +1,10 @@
+#!/bin/bash -ex
+
+git clone --depth=1 https://gitlab.com/OpenMW/example-suite.git
+
+xvfb-run --auto-servernum --server-args='-screen 0 640x480x24x60' \
+    scripts/integration_tests.py --omw build/install/bin/openmw --workdir integration_tests_output example-suite/
+
+ls integration_tests_output/*.osg_stats.log | while read v; do
+    scripts/osg_stats.py --stats '.*' --regexp_match < "${v}"
+done
diff --git a/scripts/data/integration_tests/test_lua_api/player.lua b/scripts/data/integration_tests/test_lua_api/player.lua
index c46ab5c46e..63e88b0556 100644
--- a/scripts/data/integration_tests/test_lua_api/player.lua
+++ b/scripts/data/integration_tests/test_lua_api/player.lua
@@ -12,23 +12,25 @@ input.setControlSwitch(input.CONTROL_SWITCH.Magic, false)
 input.setControlSwitch(input.CONTROL_SWITCH.VanityMode, false)
 input.setControlSwitch(input.CONTROL_SWITCH.ViewMode, false)
 
-testing.registerLocalTest('playerMovement',
+testing.registerLocalTest('playerRotation',
     function()
-        local startTime = core.getSimulationTime()
-        local pos = self.position
-
-        while core.getSimulationTime() < startTime + 0.5 do
+        local endTime = core.getSimulationTime() + 1
+        while core.getSimulationTime() < endTime do
             self.controls.jump = false
             self.controls.run = true
             self.controls.movement = 0
             self.controls.sideMovement = 0
-            local progress = (core.getSimulationTime() - startTime) / 0.5
-            self.controls.yawChange = util.normalizeAngle(math.rad(90) * progress - self.rotation.z)
+            self.controls.yawChange = util.normalizeAngle(math.rad(90) - self.rotation.z) * 0.5
             coroutine.yield()
         end
         testing.expectEqualWithDelta(self.rotation.z, math.rad(90), 0.05, 'Incorrect rotation')
+    end)
 
-        while core.getSimulationTime() < startTime + 1.5 do
+testing.registerLocalTest('playerForwardRunning',
+    function()
+        local startPos = self.position
+        local endTime = core.getSimulationTime() + 1
+        while core.getSimulationTime() < endTime do
             self.controls.jump = false
             self.controls.run = true
             self.controls.movement = 1
@@ -36,12 +38,18 @@ testing.registerLocalTest('playerMovement',
             self.controls.yawChange = 0
             coroutine.yield()
         end
-        direction = (self.position - pos) / types.Actor.runSpeed(self)
-        testing.expectEqualWithDelta(direction.x, 1, 0.1, 'Run forward, X coord')
-        testing.expectEqualWithDelta(direction.y, 0, 0.1, 'Run forward, Y coord')
+        local direction, distance = (self.position - startPos):normalize()
+        local normalizedDistance = distance / types.Actor.runSpeed(self)
+        testing.expectEqualWithDelta(normalizedDistance, 1, 0.2, 'Normalized forward runned distance')
+        testing.expectEqualWithDelta(direction.x, 0, 0.1, 'Run forward, X coord')
+        testing.expectEqualWithDelta(direction.y, 1, 0.1, 'Run forward, Y coord')
+    end)
 
-        pos = self.position
-        while core.getSimulationTime() < startTime + 2.5 do
+testing.registerLocalTest('playerDiagonalWalking',
+    function()
+        local startPos = self.position
+        local endTime = core.getSimulationTime() + 1
+        while core.getSimulationTime() < endTime do
             self.controls.jump = false
             self.controls.run = false
             self.controls.movement = -1
@@ -49,9 +57,11 @@ testing.registerLocalTest('playerMovement',
             self.controls.yawChange = 0
             coroutine.yield()
         end
-        direction = (self.position - pos) / types.Actor.walkSpeed(self)
+        local direction, distance = (self.position - startPos):normalize()
+        local normalizedDistance = distance / types.Actor.walkSpeed(self)
+        testing.expectEqualWithDelta(normalizedDistance, 1, 0.2, 'Normalized diagonally walked distance')
         testing.expectEqualWithDelta(direction.x, -0.707, 0.1, 'Walk diagonally, X coord')
-        testing.expectEqualWithDelta(direction.y, 0.707, 0.1, 'Walk diagonally, Y coord')
+        testing.expectEqualWithDelta(direction.y, -0.707, 0.1, 'Walk diagonally, Y coord')
     end)
 
 return {
@@ -60,4 +70,3 @@ return {
     },
     eventHandlers = testing.eventHandlers
 }
-
diff --git a/scripts/data/integration_tests/test_lua_api/test.lua b/scripts/data/integration_tests/test_lua_api/test.lua
index 573844199b..ba0d45ab23 100644
--- a/scripts/data/integration_tests/test_lua_api/test.lua
+++ b/scripts/data/integration_tests/test_lua_api/test.lua
@@ -29,10 +29,10 @@ local function testTimers()
 
     while not (ts1 and ts2 and th1 and th2) do coroutine.yield() end
 
-    testing.expectAlmostEqual(th1, 36, 'async:newGameTimer failed')
-    testing.expectAlmostEqual(ts1, 0.5, 'async:newSimulationTimer failed')
-    testing.expectAlmostEqual(th2, 72, 'async:newUnsavableGameTimer failed')
-    testing.expectAlmostEqual(ts2, 1, 'async:newUnsavableSimulationTimer failed')
+    testing.expectGreaterOrEqual(th1, 36, 'async:newGameTimer failed')
+    testing.expectGreaterOrEqual(ts1, 0.5, 'async:newSimulationTimer failed')
+    testing.expectGreaterOrEqual(th2, 72, 'async:newUnsavableGameTimer failed')
+    testing.expectGreaterOrEqual(ts2, 1, 'async:newUnsavableSimulationTimer failed')
 end
 
 local function testTeleport()
@@ -51,9 +51,25 @@ local function testTeleport()
     testing.expectEqualWithDelta(player.rotation.z, math.rad(-90), 0.05, 'teleporting changes rotation')
 end
 
+local function initPlayer()
+    player:teleport('', util.vector3(4096, 4096, 867.237), util.vector3(0, 0, 0))
+    coroutine.yield()
+end
+
 tests = {
     {'timers', testTimers},
-    {'playerMovement', function() testing.runLocalTest(player, 'playerMovement') end},
+    {'playerRotation', function()
+        initPlayer()
+        testing.runLocalTest(player, 'playerRotation')
+    end},
+    {'playerForwardRunning', function()
+        initPlayer()
+        testing.runLocalTest(player, 'playerForwardRunning')
+    end},
+    {'playerDiagonalWalking', function()
+        initPlayer()
+        testing.runLocalTest(player, 'playerDiagonalWalking')
+    end},
     {'teleport', testTeleport},
 }
 
diff --git a/scripts/data/integration_tests/test_lua_api/testing_util.lua b/scripts/data/integration_tests/test_lua_api/testing_util.lua
index 719502e741..5ce5b2ff26 100644
--- a/scripts/data/integration_tests/test_lua_api/testing_util.lua
+++ b/scripts/data/integration_tests/test_lua_api/testing_util.lua
@@ -52,6 +52,12 @@ function M.expectAlmostEqual(v1, v2, msg)
     end
 end
 
+function M.expectGreaterOrEqual(v1, v2, msg)
+    if not (v1 >= v2) then
+        error(string.format('%s: %f >= %f', msg or '', v1, v2), 2)
+    end
+end
+
 local localTests = {}
 local localTestRunner = nil
 
diff --git a/scripts/integration_tests.py b/scripts/integration_tests.py
index b125e688fb..d106c71283 100755
--- a/scripts/integration_tests.py
+++ b/scripts/integration_tests.py
@@ -51,14 +51,30 @@ def runTest(name):
         )
         if (test_dir / "test.omwscripts").exists():
             omw_cfg.write("content=test.omwscripts\n")
+    with open(config_dir / "settings.cfg", "a", encoding="utf-8") as settings_cfg:
+        settings_cfg.write(
+            "[Video]\n"
+            "resolution x = 640\n"
+            "resolution y = 480\n"
+            "framerate limit = 60\n"
+        )
+    stdout_lines = list()
+    exit_ok = True
+    test_success = True
     with subprocess.Popen(
-        [f"{openmw_binary}", "--replace=config", f"--config={config_dir}", "--skip-menu", "--no-grab"],
+        [openmw_binary, "--replace=config", "--config", config_dir, "--skip-menu", "--no-grab", "--no-sound"],
         stdout=subprocess.PIPE,
         stderr=subprocess.STDOUT,
         encoding="utf-8",
+        env={
+            "OPENMW_OSG_STATS_FILE": work_dir / f"{name}.{time_str}.osg_stats.log",
+            "OPENMW_OSG_STATS_LIST": "times",
+            **os.environ,
+        },
     ) as process:
         quit_requested = False
         for line in process.stdout:
+            stdout_lines.append(line)
             words = line.split(" ")
             if len(words) > 1 and words[1] == "E]":
                 print(line, end="")
@@ -72,16 +88,30 @@ def runTest(name):
             elif "TEST_FAILED" in line:
                 w = line.split("TEST_FAILED")[1].split("\t")
                 print(f"FAILED {w[3]}\t\t")
+                test_success = False
         process.wait(5)
         if not quit_requested:
             print("ERROR: Unexpected termination")
-    shutil.copyfile(config_dir / "openmw.log", work_dir / f"{name}.{time_str}.log")
-    print(f"{name} finished")
+            exit_ok = False
+        if process.returncode != 0:
+            print(f"ERROR: openmw exited with code {process.returncode}")
+            exit_ok = False
+    if os.path.exists(config_dir / "openmw.log"):
+        shutil.copyfile(config_dir / "openmw.log", work_dir / f"{name}.{time_str}.log")
+    if not exit_ok:
+        sys.stdout.writelines(stdout_lines)
+    if test_success and exit_ok:
+        print(f"{name} succeeded")
+    else:
+        print(f"{name} failed")
+    return test_success and exit_ok
 
 
+status = 0
 for entry in tests_dir.glob("test_*"):
     if entry.is_dir():
-        runTest(entry.name)
+        if not runTest(entry.name):
+            status = -1
 shutil.rmtree(config_dir, ignore_errors=True)
 shutil.rmtree(userdata_dir, ignore_errors=True)
-
+exit(status)
diff --git a/scripts/osg_stats.py b/scripts/osg_stats.py
index cc4314cd04..3a5067851d 100755
--- a/scripts/osg_stats.py
+++ b/scripts/osg_stats.py
@@ -76,7 +76,7 @@ def main(print_keys, regexp_match, timeseries, hist, hist_ratio, stdev_hist, plo
     def matching_keys(patterns):
         if regexp_match:
             return [key for pattern in patterns for key in keys if re.search(pattern, key)]
-        return keys
+        return patterns
     if timeseries:
         draw_timeseries(sources=frames, keys=matching_keys(timeseries), add_sum=timeseries_sum,
                         begin_frame=begin_frame, end_frame=end_frame)

From 782d3d9680eeb325d0f4b40b95601d92e37fcdbe Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 17 May 2022 13:08:31 +0200
Subject: [PATCH 2739/2859] Avoid calling getMultiview from
 ~StereoFrustumManager

Otherwise coverity complains about a function throwing exceptions called from a
destructor.
---
 components/stereo/frustum.cpp | 5 +++--
 components/stereo/frustum.hpp | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/components/stereo/frustum.cpp b/components/stereo/frustum.cpp
index 81fd022f58..31104d66f3 100644
--- a/components/stereo/frustum.cpp
+++ b/components/stereo/frustum.cpp
@@ -96,8 +96,9 @@ namespace Stereo
         : mCamera(camera)
         , mShadowTechnique(nullptr)
         , mShadowFrustumCallback(nullptr)
+        , mMultiview(Stereo::getMultiview())
     {
-        if (Stereo::getMultiview())
+        if (mMultiview)
         {
 #ifdef OSG_HAS_MULTIVIEW
             mMultiviewFrustumCallback = new MultiviewFrustumCallback(this);
@@ -118,7 +119,7 @@ namespace Stereo
 
     StereoFrustumManager::~StereoFrustumManager()
     {
-        if (Stereo::getMultiview())
+        if (mMultiview)
         {
 #ifdef OSG_HAS_MULTIVIEW
             mCamera->setInitialFrustumCallback(nullptr);
diff --git a/components/stereo/frustum.hpp b/components/stereo/frustum.hpp
index 579d3b6876..8d457c82b9 100644
--- a/components/stereo/frustum.hpp
+++ b/components/stereo/frustum.hpp
@@ -64,6 +64,7 @@ namespace Stereo
         osg::ref_ptr<osg::Camera> mCamera;
         osg::ref_ptr<SceneUtil::MWShadowTechnique> mShadowTechnique;
         osg::ref_ptr<ShadowFrustumCallback> mShadowFrustumCallback;
+        bool mMultiview;
         std::map< osgUtil::CullVisitor*, osgUtil::CullVisitor*> mSharedFrustums;
         osg::BoundingBoxd mBoundingBox;
 

From 1b117af5e1c198b2f1d3963405208344f2aa1329 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 2 Jul 2022 00:47:07 +0200
Subject: [PATCH 2740/2859] Use descriptive names for range elements

iter does not describe the nature of the object. Range-based for loop provides
elements of the iterator range, not iterators.
---
 apps/openmw/mwscript/globalscripts.cpp | 10 +++++-----
 apps/openmw/mwworld/containerstore.cpp | 22 +++++++++++-----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/apps/openmw/mwscript/globalscripts.cpp b/apps/openmw/mwscript/globalscripts.cpp
index 16a32a0a12..c1a25513e6 100644
--- a/apps/openmw/mwscript/globalscripts.cpp
+++ b/apps/openmw/mwscript/globalscripts.cpp
@@ -238,15 +238,15 @@ namespace MWScript
 
     void GlobalScripts::write (ESM::ESMWriter& writer, Loading::Listener& progress) const
     {
-        for (const auto& iter : mScripts)
+        for (const auto& [id, desc] : mScripts)
         {
-            ESM::GlobalScript script = std::visit (ScriptCreatingVisitor {}, iter.second->mTarget);
+            ESM::GlobalScript script = std::visit(ScriptCreatingVisitor {}, desc->mTarget);
 
-            script.mId = iter.first;
+            script.mId = id;
 
-            iter.second->mLocals.write (script.mLocals, iter.first);
+            desc->mLocals.write(script.mLocals, id);
 
-            script.mRunning = iter.second->mRunning ? 1 : 0;
+            script.mRunning = desc->mRunning ? 1 : 0;
 
             writer.startRecord (ESM::REC_GSCR);
             script.save (writer);
diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index 140582c1a8..b72b0e2db0 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -44,10 +44,10 @@ namespace
     {
         float sum = 0;
 
-        for (const auto& iter : cellRefList.mList)
+        for (const MWWorld::LiveCellRef<T>& liveCellRef : cellRefList.mList)
         {
-            if (iter.mData.getCount()>0)
-                sum += iter.mData.getCount()*iter.mBase->mData.mWeight;
+            if (const int count = liveCellRef.mData.getCount(); count > 0)
+                sum += count * liveCellRef.mBase->mData.mWeight;
         }
 
         return sum;
@@ -60,11 +60,11 @@ namespace
         store->resolve();
         std::string id2 = Misc::StringUtils::lowerCase (id);
 
-        for (auto& iter : list.mList)
+        for (MWWorld::LiveCellRef<T>& liveCellRef : list.mList)
         {
-            if (Misc::StringUtils::ciEqual(iter.mBase->mId, id2) && iter.mData.getCount())
+            if (Misc::StringUtils::ciEqual(liveCellRef.mBase->mId, id2) && liveCellRef.mData.getCount())
             {
-                MWWorld::Ptr ptr (&iter, nullptr);
+                MWWorld::Ptr ptr(&liveCellRef, nullptr);
                 ptr.setContainerStore (store);
                 return ptr;
             }
@@ -124,15 +124,15 @@ template<typename T>
 void MWWorld::ContainerStore::storeStates (const CellRefList<T>& collection,
     ESM::InventoryState& inventory, int& index, bool equipable) const
 {
-    for (const auto& iter : collection.mList)
+    for (const LiveCellRef<T>& liveCellRef : collection.mList)
     {
-        if (iter.mData.getCount() == 0)
+        if (liveCellRef.mData.getCount() == 0)
             continue;
         ESM::ObjectState state;
-        storeState (iter, state);
+        storeState(liveCellRef, state);
         if (equipable)
-            storeEquipmentState(iter, index, inventory);
-        inventory.mItems.push_back (state);
+            storeEquipmentState(liveCellRef, index, inventory);
+        inventory.mItems.push_back(std::move(state));
         ++index;
     }
 }

From fe206c1526a2df384c5c6b2a9714f2dda212a288 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 7 May 2022 00:16:32 +0200
Subject: [PATCH 2741/2859] Remove updateHeadTracking from member functions

---
 apps/openmw/mwmechanics/actors.cpp | 5 ++---
 apps/openmw/mwmechanics/actors.hpp | 4 ----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 129dda8c19..06f536a177 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -251,9 +251,8 @@ namespace MWMechanics
         calculateRestoration(ptr, duration);
     }
 
-    void Actors::updateHeadTracking(const MWWorld::Ptr& actor, const MWWorld::Ptr& targetActor,
-                                    MWWorld::Ptr& headTrackTarget, float& sqrHeadTrackDistance,
-                                    bool inCombatOrPursue)
+    static void updateHeadTracking(const MWWorld::Ptr& actor, const MWWorld::Ptr& targetActor,
+        MWWorld::Ptr& headTrackTarget, float& sqrHeadTrackDistance, bool inCombatOrPursue)
     {
         const auto& actorRefData = actor.getRefData();
         if (!actorRefData.getBaseNode())
diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index ff9face4f3..999063c61d 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -98,10 +98,6 @@ namespace MWMechanics
             void updateGreetingState(const MWWorld::Ptr& actor, Actor& actorState, bool turnOnly);
             void turnActorToFacePlayer(const MWWorld::Ptr& actor, Actor& actorState, const osg::Vec3f& dir);
 
-            void updateHeadTracking(const MWWorld::Ptr& actor, const MWWorld::Ptr& targetActor,
-                                          MWWorld::Ptr& headTrackTarget, float& sqrHeadTrackDistance,
-                                          bool inCombatOrPursue);
-
             void rest(double hours, bool sleep);
             ///< Update actors while the player is waiting or sleeping.
 

From 77eaf2082f17cb6f81af9c300ef0083d76d707c9 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 4 Jul 2022 21:22:52 +0200
Subject: [PATCH 2742/2859] Move head tracking update into a separate function

---
 apps/openmw/mwmechanics/actors.cpp | 159 +++++++++++++++--------------
 1 file changed, 82 insertions(+), 77 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 06f536a177..9687c3509a 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -224,6 +224,7 @@ void removeTemporaryEffects(const MWWorld::Ptr& ptr)
         return spell.getType() == ESM::ActiveSpells::Type_Consumable || spell.getType() == ESM::ActiveSpells::Type_Temporary;
     }, ptr);
 }
+
 }
 
 namespace MWMechanics
@@ -240,57 +241,97 @@ namespace MWMechanics
             const auto distanceToNextPathPoint = (package.getNextPathPoint(package.getDestination()) - position).length();
             return (distanceToNextPathPoint - package.getNextPathPointTolerance(speed, duration, halfExtents)) / speed;
         }
-    }
-
-    void Actors::updateActor (const MWWorld::Ptr& ptr, float duration)
-    {
-        // magic effects
-        adjustMagicEffects (ptr, duration);
 
-        // fatigue restoration
-        calculateRestoration(ptr, duration);
-    }
+        void updateHeadTracking(const MWWorld::Ptr& actor, const MWWorld::Ptr& targetActor,
+            MWWorld::Ptr& headTrackTarget, float& sqrHeadTrackDistance, bool inCombatOrPursue)
+        {
+            const auto& actorRefData = actor.getRefData();
+            if (!actorRefData.getBaseNode())
+                return;
 
-    static void updateHeadTracking(const MWWorld::Ptr& actor, const MWWorld::Ptr& targetActor,
-        MWWorld::Ptr& headTrackTarget, float& sqrHeadTrackDistance, bool inCombatOrPursue)
-    {
-        const auto& actorRefData = actor.getRefData();
-        if (!actorRefData.getBaseNode())
-            return;
+            if (targetActor.getClass().getCreatureStats(targetActor).isDead())
+                return;
 
-        if (targetActor.getClass().getCreatureStats(targetActor).isDead())
-            return;
+            static const float fMaxHeadTrackDistance = MWBase::Environment::get().getWorld()->getStore()
+                .get<ESM::GameSetting>().find("fMaxHeadTrackDistance")->mValue.getFloat();
+            static const float fInteriorHeadTrackMult = MWBase::Environment::get().getWorld()->getStore()
+                .get<ESM::GameSetting>().find("fInteriorHeadTrackMult")->mValue.getFloat();
+            float maxDistance = fMaxHeadTrackDistance;
+            const ESM::Cell* currentCell = actor.getCell()->getCell();
+            if (!currentCell->isExterior() && !(currentCell->mData.mFlags & ESM::Cell::QuasiEx))
+                maxDistance *= fInteriorHeadTrackMult;
 
-        static const float fMaxHeadTrackDistance = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>()
-                .find("fMaxHeadTrackDistance")->mValue.getFloat();
-        static const float fInteriorHeadTrackMult = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>()
-                .find("fInteriorHeadTrackMult")->mValue.getFloat();
-        float maxDistance = fMaxHeadTrackDistance;
-        const ESM::Cell* currentCell = actor.getCell()->getCell();
-        if (!currentCell->isExterior() && !(currentCell->mData.mFlags & ESM::Cell::QuasiEx))
-            maxDistance *= fInteriorHeadTrackMult;
+            const osg::Vec3f actor1Pos(actorRefData.getPosition().asVec3());
+            const osg::Vec3f actor2Pos(targetActor.getRefData().getPosition().asVec3());
+            float sqrDist = (actor1Pos - actor2Pos).length2();
 
-        const osg::Vec3f actor1Pos(actorRefData.getPosition().asVec3());
-        const osg::Vec3f actor2Pos(targetActor.getRefData().getPosition().asVec3());
-        float sqrDist = (actor1Pos - actor2Pos).length2();
+            if (sqrDist > std::min(maxDistance * maxDistance, sqrHeadTrackDistance) && !inCombatOrPursue)
+                return;
 
-        if (sqrDist > std::min(maxDistance * maxDistance, sqrHeadTrackDistance) && !inCombatOrPursue)
-            return;
+            // stop tracking when target is behind the actor
+            osg::Vec3f actorDirection = actorRefData.getBaseNode()->getAttitude() * osg::Vec3f(0,1,0);
+            osg::Vec3f targetDirection(actor2Pos - actor1Pos);
+            actorDirection.z() = 0;
+            targetDirection.z() = 0;
+            if ((actorDirection * targetDirection > 0 || inCombatOrPursue)
+                // check LOS and awareness last as it's the most expensive function
+                && MWBase::Environment::get().getWorld()->getLOS(actor, targetActor)
+                && MWBase::Environment::get().getMechanicsManager()->awarenessCheck(targetActor, actor))
+            {
+                sqrHeadTrackDistance = sqrDist;
+                headTrackTarget = targetActor;
+            }
+        }
 
-        // stop tracking when target is behind the actor
-        osg::Vec3f actorDirection = actorRefData.getBaseNode()->getAttitude() * osg::Vec3f(0,1,0);
-        osg::Vec3f targetDirection(actor2Pos - actor1Pos);
-        actorDirection.z() = 0;
-        targetDirection.z() = 0;
-        if ((actorDirection * targetDirection > 0 || inCombatOrPursue)
-            && MWBase::Environment::get().getWorld()->getLOS(actor, targetActor) // check LOS and awareness last as it's the most expensive function
-            && MWBase::Environment::get().getMechanicsManager()->awarenessCheck(targetActor, actor))
+        void updateHeadTracking(const MWWorld::Ptr& ptr, const std::list<Actor>& actors, bool isPlayer, CharacterController& ctrl)
         {
-            sqrHeadTrackDistance = sqrDist;
-            headTrackTarget = targetActor;
+            float sqrHeadTrackDistance = std::numeric_limits<float>::max();
+            MWWorld::Ptr headTrackTarget;
+
+            const MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
+            const bool firstPersonPlayer = isPlayer && MWBase::Environment::get().getWorld()->isFirstPerson();
+
+            // 1. Unconsious actor can not track target
+            // 2. Actors in combat and pursue mode do not bother to headtrack anyone except their target
+            // 3. Player character does not use headtracking in the 1st-person view
+            if (!stats.getKnockedDown() && !firstPersonPlayer)
+            {
+                bool inCombatOrPursue = stats.getAiSequence().isInCombat() || stats.getAiSequence().isInPursuit();
+                if (inCombatOrPursue)
+                {
+                    auto activePackageTarget = stats.getAiSequence().getActivePackage().getTarget();
+                    if (!activePackageTarget.isEmpty())
+                    {
+                        // Track the specified target of package.
+                        updateHeadTracking(ptr, activePackageTarget, headTrackTarget, sqrHeadTrackDistance, inCombatOrPursue);
+                    }
+                }
+                else
+                {
+                    // Find something nearby.
+                    for (const Actor& otherActor : actors)
+                    {
+                        if (otherActor.getPtr() == ptr)
+                            continue;
+
+                        updateHeadTracking(ptr, otherActor.getPtr(), headTrackTarget, sqrHeadTrackDistance, inCombatOrPursue);
+                    }
+                }
+            }
+
+            ctrl.setHeadTrackTarget(headTrackTarget);
         }
     }
 
+    void Actors::updateActor (const MWWorld::Ptr& ptr, float duration)
+    {
+        // magic effects
+        adjustMagicEffects (ptr, duration);
+
+        // fatigue restoration
+        calculateRestoration(ptr, duration);
+    }
+
     void Actors::playIdleDialogue(const MWWorld::Ptr& actor)
     {
         if (!actor.getClass().isActor() || actor == getPlayer() || MWBase::Environment::get().getSoundManager()->sayActive(actor))
@@ -1461,43 +1502,7 @@ namespace MWMechanics
                             }
                         }
                         if (mTimerUpdateHeadTrack == 0)
-                        {
-                            float sqrHeadTrackDistance = std::numeric_limits<float>::max();
-                            MWWorld::Ptr headTrackTarget;
-
-                            MWMechanics::CreatureStats& stats = actor.getPtr().getClass().getCreatureStats(actor.getPtr());
-                            bool firstPersonPlayer = isPlayer && world->isFirstPerson();
-  
-                            // 1. Unconsious actor can not track target
-                            // 2. Actors in combat and pursue mode do not bother to headtrack anyone except their target
-                            // 3. Player character does not use headtracking in the 1st-person view
-                            if (!stats.getKnockedDown() && !firstPersonPlayer)
-                            {
-                                bool inCombatOrPursue = stats.getAiSequence().isInCombat() || stats.getAiSequence().isInPursuit();
-                                if (inCombatOrPursue)
-                                {
-                                    auto activePackageTarget = stats.getAiSequence().getActivePackage().getTarget();
-                                    if (!activePackageTarget.isEmpty())
-                                    {
-                                        // Track the specified target of package.
-                                        updateHeadTracking(actor.getPtr(), activePackageTarget, headTrackTarget, sqrHeadTrackDistance, inCombatOrPursue);
-                                    }
-                                }
-                                else
-                                {
-                                    // Find something nearby.
-                                    for (const Actor& otherActor : mActors)
-                                    {
-                                        if (otherActor.getPtr() == actor.getPtr())
-                                            continue;
-
-                                        updateHeadTracking(actor.getPtr(), otherActor.getPtr(), headTrackTarget, sqrHeadTrackDistance, inCombatOrPursue);
-                                    }
-                                }
-                            }
-
-                            ctrl.setHeadTrackTarget(headTrackTarget);
-                        }
+                            updateHeadTracking(actor.getPtr(), mActors, isPlayer, ctrl);
 
                         if (actor.getPtr().getClass().isNpc() && actor.getPtr() != player)
                             updateCrimePursuit(actor.getPtr(), duration);

From 03792eebdbd3020b77b2beacd83ea9b0b817ccec Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 4 Jul 2022 21:24:55 +0200
Subject: [PATCH 2743/2859] Reuse isPlayer variable instead of using operator
 !=

---
 apps/openmw/mwmechanics/actors.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 9687c3509a..ca90117b8e 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1450,7 +1450,7 @@ namespace MWMechanics
                 bool inProcessingRange = distSqr <= mActorsProcessingRange*mActorsProcessingRange;
 
                 // If dead or no longer in combat, no longer store any actors who attempted to hit us. Also remove for the player.
-                if (actor.getPtr() != player && (actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isDead()
+                if (!isPlayer && (actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isDead()
                     || !actor.getPtr().getClass().getCreatureStats(actor.getPtr()).getAiSequence().isInCombat()
                     || !inProcessingRange))
                 {
@@ -1504,10 +1504,10 @@ namespace MWMechanics
                         if (mTimerUpdateHeadTrack == 0)
                             updateHeadTracking(actor.getPtr(), mActors, isPlayer, ctrl);
 
-                        if (actor.getPtr().getClass().isNpc() && actor.getPtr() != player)
+                        if (actor.getPtr().getClass().isNpc() && !isPlayer)
                             updateCrimePursuit(actor.getPtr(), duration);
 
-                        if (actor.getPtr() != player)
+                        if (!isPlayer)
                         {
                             CreatureStats &stats = actor.getPtr().getClass().getCreatureStats(actor.getPtr());
                             if (isConscious(actor.getPtr()) && !(luaControls && luaControls->mDisableAI))
@@ -1519,7 +1519,7 @@ namespace MWMechanics
                             }
                         }
                     }
-                    else if (aiActive && actor.getPtr() != player && isConscious(actor.getPtr()) && !(luaControls && luaControls->mDisableAI))
+                    else if (aiActive && !isPlayer && isConscious(actor.getPtr()) && !(luaControls && luaControls->mDisableAI))
                     {
                         CreatureStats &stats = actor.getPtr().getClass().getCreatureStats(actor.getPtr());
                         stats.getAiSequence().execute(actor.getPtr(), ctrl, duration, /*outOfRange*/true);

From a05ed48a57d47774841095f694dd56e5bbaadec4 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 4 Jul 2022 21:31:55 +0200
Subject: [PATCH 2744/2859] Move lua controls update into a separate function

---
 apps/openmw/mwmechanics/actors.cpp | 67 ++++++++++++++++--------------
 1 file changed, 35 insertions(+), 32 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index ca90117b8e..83179113a5 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -321,6 +321,39 @@ namespace MWMechanics
 
             ctrl.setHeadTrackTarget(headTrackTarget);
         }
+
+        void updateLuaControls(const MWWorld::Ptr& ptr, bool isPlayer, MWBase::LuaManager::ActorControls& controls)
+        {
+            Movement& mov = ptr.getClass().getMovementSettings(ptr);
+            CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
+            const float speedFactor = isPlayer ? 1.f : mov.mSpeedFactor;
+            const osg::Vec2f movement = osg::Vec2f(mov.mPosition[0], mov.mPosition[1]) * speedFactor;
+            const float rotationX = mov.mRotation[0];
+            const float rotationZ = mov.mRotation[2];
+            const bool jump = mov.mPosition[2] == 1;
+            const bool runFlag = stats.getMovementFlag(MWMechanics::CreatureStats::Flag_Run);
+            const bool attackingOrSpell = stats.getAttackingOrSpell();
+            if (controls.mChanged)
+            {
+                mov.mPosition[0] = controls.mSideMovement;
+                mov.mPosition[1] = controls.mMovement;
+                mov.mPosition[2] = controls.mJump ? 1 : 0;
+                mov.mRotation[0] = controls.mPitchChange;
+                mov.mRotation[1] = 0;
+                mov.mRotation[2] = controls.mYawChange;
+                mov.mSpeedFactor = osg::Vec2(controls.mMovement, controls.mSideMovement).length();
+                stats.setMovementFlag(MWMechanics::CreatureStats::Flag_Run, controls.mRun);
+                stats.setAttackingOrSpell((controls.mUse & 1) == 1);
+                controls.mChanged = false;
+            }
+            controls.mSideMovement = movement.x();
+            controls.mMovement = movement.y();
+            controls.mPitchChange = rotationX;
+            controls.mYawChange = rotationZ;
+            controls.mJump = jump;
+            controls.mRun = runFlag;
+            controls.mUse = attackingOrSpell ? controls.mUse | 1 : controls.mUse & ~1;
+        }
     }
 
     void Actors::updateActor (const MWWorld::Ptr& ptr, float duration)
@@ -1533,38 +1566,8 @@ namespace MWMechanics
                     if (mTimerUpdateEquippedLight == 0 && actor.getPtr().getClass().hasInventoryStore(actor.getPtr()))
                         updateEquippedLight(actor.getPtr(), updateEquippedLightInterval, showTorches);
 
-                    if (luaControls && isConscious(actor.getPtr()))
-                    {
-                        Movement& mov = actor.getPtr().getClass().getMovementSettings(actor.getPtr());
-                        CreatureStats& stats = actor.getPtr().getClass().getCreatureStats(actor.getPtr());
-                        float speedFactor = isPlayer ? 1.f : mov.mSpeedFactor;
-                        osg::Vec2f movement = osg::Vec2f(mov.mPosition[0], mov.mPosition[1]) * speedFactor;
-                        float rotationX = mov.mRotation[0];
-                        float rotationZ = mov.mRotation[2];
-                        bool jump = mov.mPosition[2] == 1;
-                        bool runFlag = stats.getMovementFlag(MWMechanics::CreatureStats::Flag_Run);
-                        bool attackingOrSpell = stats.getAttackingOrSpell();
-                        if (luaControls->mChanged)
-                        {
-                            mov.mPosition[0] = luaControls->mSideMovement;
-                            mov.mPosition[1] = luaControls->mMovement;
-                            mov.mPosition[2] = luaControls->mJump ? 1 : 0;
-                            mov.mRotation[0] = luaControls->mPitchChange;
-                            mov.mRotation[1] = 0;
-                            mov.mRotation[2] = luaControls->mYawChange;
-                            mov.mSpeedFactor = osg::Vec2(luaControls->mMovement, luaControls->mSideMovement).length();
-                            stats.setMovementFlag(MWMechanics::CreatureStats::Flag_Run, luaControls->mRun);
-                            stats.setAttackingOrSpell((luaControls->mUse & 1) == 1);
-                            luaControls->mChanged = false;
-                        }
-                        luaControls->mSideMovement = movement.x();
-                        luaControls->mMovement = movement.y();
-                        luaControls->mPitchChange = rotationX;
-                        luaControls->mYawChange = rotationZ;
-                        luaControls->mJump = jump;
-                        luaControls->mRun = runFlag;
-                        luaControls->mUse = attackingOrSpell ? luaControls->mUse | 1 : luaControls->mUse & ~1;
-                    }
+                    if (luaControls != nullptr && isConscious(actor.getPtr()))
+                        updateLuaControls(actor.getPtr(), isPlayer, *luaControls);
                 }
             }
 

From f8b8569f3b37bce2db513d388b2038df60bf79d6 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 4 Jul 2022 21:38:26 +0200
Subject: [PATCH 2745/2859] Initialize variables on declaration

---
 apps/openmw/mwmechanics/actors.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 83179113a5..ba098aad38 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -93,16 +93,18 @@ void adjustCommandedActor (const MWWorld::Ptr& actor)
     });
 }
 
-void getRestorationPerHourOfSleep (const MWWorld::Ptr& ptr, float& health, float& magicka)
+std::pair<float, float> getRestorationPerHourOfSleep(const MWWorld::Ptr& ptr)
 {
     MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats (ptr);
     const MWWorld::Store<ESM::GameSetting>& settings = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
     float endurance = stats.getAttribute (ESM::Attribute::Endurance).getModified ();
-    health = 0.1f * endurance;
+    const float health = 0.1f * endurance;
 
     float fRestMagicMult = settings.find("fRestMagicMult")->mValue.getFloat ();
-    magicka = fRestMagicMult * stats.getAttribute(ESM::Attribute::Intelligence).getModified();
+    const float magicka = fRestMagicMult * stats.getAttribute(ESM::Attribute::Intelligence).getModified();
+
+    return {health, magicka};
 }
 
 template<class T>
@@ -764,8 +766,7 @@ namespace MWMechanics
 
         if (sleep)
         {
-            float health, magicka;
-            getRestorationPerHourOfSleep(ptr, health, magicka);
+            auto [health, magicka] = getRestorationPerHourOfSleep(ptr);
 
             DynamicStat<float> stat = stats.getHealth();
             stat.setCurrent(stat.getCurrent() + health * hours);
@@ -1908,8 +1909,7 @@ namespace MWMechanics
 
     int Actors::getHoursToRest(const MWWorld::Ptr &ptr) const
     {
-        float healthPerHour, magickaPerHour;
-        getRestorationPerHourOfSleep(ptr, healthPerHour, magickaPerHour);
+        auto [healthPerHour, magickaPerHour] = getRestorationPerHourOfSleep(ptr);
 
         CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
         bool stunted = stats.getMagicEffects ().get(ESM::MagicEffect::StuntedMagicka).getMagnitude() > 0;

From 5e8df40718ae9b8fd9c1c2e705fbc6ed3c57b9a7 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 4 Jul 2022 21:48:26 +0200
Subject: [PATCH 2746/2859] Mark not changing variables as const

---
 apps/openmw/mwmechanics/actors.cpp | 191 ++++++++++++++---------------
 1 file changed, 93 insertions(+), 98 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index ba098aad38..c262499de4 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -95,13 +95,13 @@ void adjustCommandedActor (const MWWorld::Ptr& actor)
 
 std::pair<float, float> getRestorationPerHourOfSleep(const MWWorld::Ptr& ptr)
 {
-    MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats (ptr);
+    const MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats (ptr);
     const MWWorld::Store<ESM::GameSetting>& settings = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
-    float endurance = stats.getAttribute (ESM::Attribute::Endurance).getModified ();
+    const float endurance = stats.getAttribute (ESM::Attribute::Endurance).getModified();
     const float health = 0.1f * endurance;
 
-    float fRestMagicMult = settings.find("fRestMagicMult")->mValue.getFloat ();
+    static const float fRestMagicMult = settings.find("fRestMagicMult")->mValue.getFloat();
     const float magicka = fRestMagicMult * stats.getAttribute(ESM::Attribute::Intelligence).getModified();
 
     return {health, magicka};
@@ -153,10 +153,10 @@ void soulTrap(const MWWorld::Ptr& creature)
     const auto& stats = creature.getClass().getCreatureStats(creature);
     if(!stats.getMagicEffects().get(ESM::MagicEffect::Soultrap).getMagnitude())
         return;
-    int creatureSoulValue = creature.get<ESM::Creature>()->mBase->mData.mSoul;
+    const int creatureSoulValue = creature.get<ESM::Creature>()->mBase->mData.mSoul;
     if (creatureSoulValue == 0)
         return;
-    MWBase::World* world = MWBase::Environment::get().getWorld();
+    MWBase::World* const world = MWBase::Environment::get().getWorld();
     static const float fSoulgemMult = world->getStore().get<ESM::GameSetting>().find("fSoulgemMult")->mValue.getFloat();
     for(const auto& params : stats.getActiveSpells())
     {
@@ -203,9 +203,8 @@ void soulTrap(const MWWorld::Ptr& creature)
             if (caster == MWMechanics::getPlayer())
                 MWBase::Environment::get().getWindowManager()->messageBox("#{sSoultrapSuccess}");
 
-            const ESM::Static* fx = world->getStore().get<ESM::Static>()
-                    .search("VFX_Soul_Trap");
-            if (fx)
+            const ESM::Static* const fx = world->getStore().get<ESM::Static>().search("VFX_Soul_Trap");
+            if (fx != nullptr)
             {
                 const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
                 world->spawnEffect(
@@ -265,7 +264,7 @@ namespace MWMechanics
 
             const osg::Vec3f actor1Pos(actorRefData.getPosition().asVec3());
             const osg::Vec3f actor2Pos(targetActor.getRefData().getPosition().asVec3());
-            float sqrDist = (actor1Pos - actor2Pos).length2();
+            const float sqrDist = (actor1Pos - actor2Pos).length2();
 
             if (sqrDist > std::min(maxDistance * maxDistance, sqrHeadTrackDistance) && !inCombatOrPursue)
                 return;
@@ -382,7 +381,7 @@ namespace MWMechanics
 
         const osg::Vec3f playerPos(getPlayer().getRefData().getPosition().asVec3());
         const osg::Vec3f actorPos(actor.getRefData().getPosition().asVec3());
-        MWBase::World* world = MWBase::Environment::get().getWorld();
+        MWBase::World* const world = MWBase::Environment::get().getWorld();
         if (world->isSwimming(actor) || (playerPos - actorPos).length2() >= 3000 * 3000)
             return;
 
@@ -405,13 +404,13 @@ namespace MWMechanics
 
         if (!seq.isEmpty() && seq.getActivePackage().useVariableSpeed())
         {
-            osg::Vec3f targetPos = seq.getActivePackage().getDestination();
-            osg::Vec3f actorPos = actor.getRefData().getPosition().asVec3();
-            float distance = (targetPos - actorPos).length();
+            const osg::Vec3f targetPos = seq.getActivePackage().getDestination();
+            const osg::Vec3f actorPos = actor.getRefData().getPosition().asVec3();
+            const float distance = (targetPos - actorPos).length();
 
             if (distance < DECELERATE_DISTANCE)
             {
-                float speedCoef = std::max(0.7f, 0.2f + 0.8f * distance / DECELERATE_DISTANCE);
+                const float speedCoef = std::max(0.7f, 0.2f + 0.8f * distance / DECELERATE_DISTANCE);
                 auto& movement = actorClass.getMovementSettings(actor);
                 movement.mPosition[0] *= speedCoef;
                 movement.mPosition[1] *= speedCoef;
@@ -439,10 +438,10 @@ namespace MWMechanics
             return;
         }
 
-        MWWorld::Ptr player = getPlayer();
-        osg::Vec3f playerPos(player.getRefData().getPosition().asVec3());
-        osg::Vec3f actorPos(actor.getRefData().getPosition().asVec3());
-        osg::Vec3f dir = playerPos - actorPos;
+        const MWWorld::Ptr player = getPlayer();
+        const osg::Vec3f playerPos(player.getRefData().getPosition().asVec3());
+        const osg::Vec3f actorPos(actor.getRefData().getPosition().asVec3());
+        const osg::Vec3f dir = playerPos - actorPos;
 
         if (actorState.isTurningToPlayer())
         {
@@ -464,7 +463,7 @@ namespace MWMechanics
         static const int iGreetDistanceMultiplier = MWBase::Environment::get().getWorld()->getStore()
             .get<ESM::GameSetting>().find("iGreetDistanceMultiplier")->mValue.getInteger();
 
-        float helloDistance = static_cast<float>(actorStats.getAiSetting(CreatureStats::AI_Hello).getModified() * iGreetDistanceMultiplier);
+        const float helloDistance = static_cast<float>(actorStats.getAiSetting(CreatureStats::AI_Hello).getModified() * iGreetDistanceMultiplier);
         const auto& playerStats = player.getClass().getCreatureStats(player);
 
         int greetingTimer = actorState.getGreetingTimer();
@@ -702,7 +701,7 @@ namespace MWMechanics
     void Actors::adjustMagicEffects (const MWWorld::Ptr& creature, float duration)
     {
         CreatureStats& creatureStats = creature.getClass().getCreatureStats (creature);
-        bool wasDead = creatureStats.isDead();
+        const bool wasDead = creatureStats.isDead();
 
         creatureStats.getActiveSpells().update(creature, duration);
 
@@ -710,7 +709,7 @@ namespace MWMechanics
         {
             // The actor was killed by a magic effect. Figure out if the player was responsible for it.
             const ActiveSpells& spells = creatureStats.getActiveSpells();
-            MWWorld::Ptr player = getPlayer();
+            const MWWorld::Ptr player = getPlayer();
             std::set<MWWorld::Ptr> playerFollowers;
             getActorsSidingWith(player, playerFollowers);
 
@@ -727,7 +726,7 @@ namespace MWMechanics
                         ESM::MagicEffect::SunDamage, ESM::MagicEffect::DamageHealth, ESM::MagicEffect::AbsorbHealth
                     };
 
-                    bool isDamageEffect = std::find(damageEffects.begin(), damageEffects.end(), effect.mEffectId) != damageEffects.end();
+                    const bool isDamageEffect = std::find(damageEffects.begin(), damageEffects.end(), effect.mEffectId) != damageEffects.end();
 
                     if (isDamageEffect)
                     {
@@ -766,14 +765,14 @@ namespace MWMechanics
 
         if (sleep)
         {
-            auto [health, magicka] = getRestorationPerHourOfSleep(ptr);
+            const auto [health, magicka] = getRestorationPerHourOfSleep(ptr);
 
             DynamicStat<float> stat = stats.getHealth();
             stat.setCurrent(stat.getCurrent() + health * hours);
             stats.setHealth(stat);
 
             double restoreHours = hours;
-            bool stunted = stats.getMagicEffects ().get(ESM::MagicEffect::StuntedMagicka).getMagnitude() > 0;
+            const bool stunted = stats.getMagicEffects ().get(ESM::MagicEffect::StuntedMagicka).getMagnitude() > 0;
             if (stunted)
             {
                 // Stunted Magicka effect should be taken into account.
@@ -807,18 +806,18 @@ namespace MWMechanics
             return;
 
         // Restore fatigue
-        float fFatigueReturnBase = settings.find("fFatigueReturnBase")->mValue.getFloat ();
-        float fFatigueReturnMult = settings.find("fFatigueReturnMult")->mValue.getFloat ();
-        float fEndFatigueMult = settings.find("fEndFatigueMult")->mValue.getFloat ();
+        static const float fFatigueReturnBase = settings.find("fFatigueReturnBase")->mValue.getFloat ();
+        static const float fFatigueReturnMult = settings.find("fFatigueReturnMult")->mValue.getFloat ();
+        static const float fEndFatigueMult = settings.find("fEndFatigueMult")->mValue.getFloat ();
 
-        float endurance = stats.getAttribute (ESM::Attribute::Endurance).getModified ();
+        const float endurance = stats.getAttribute (ESM::Attribute::Endurance).getModified ();
 
         float normalizedEncumbrance = ptr.getClass().getNormalizedEncumbrance(ptr);
         if (normalizedEncumbrance > 1)
             normalizedEncumbrance = 1;
 
-        float x = fFatigueReturnBase + fFatigueReturnMult * (1 - normalizedEncumbrance);
-        x *= fEndFatigueMult * endurance;
+        const float x = (fFatigueReturnBase + fFatigueReturnMult * (1 - normalizedEncumbrance))
+                        * (fEndFatigueMult * endurance);
 
         fatigue.setCurrent (fatigue.getCurrent() + 3600 * x * hours);
         stats.setFatigue (fatigue);
@@ -838,12 +837,12 @@ namespace MWMechanics
             return;
 
         // Restore fatigue
-        float endurance = stats.getAttribute(ESM::Attribute::Endurance).getModified();
+        const float endurance = stats.getAttribute(ESM::Attribute::Endurance).getModified();
         const MWWorld::Store<ESM::GameSetting>& settings = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
         static const float fFatigueReturnBase = settings.find("fFatigueReturnBase")->mValue.getFloat ();
         static const float fFatigueReturnMult = settings.find("fFatigueReturnMult")->mValue.getFloat ();
 
-        float x = fFatigueReturnBase + fFatigueReturnMult * endurance;
+        const float x = fFatigueReturnBase + fFatigueReturnMult * endurance;
 
         fatigue.setCurrent (fatigue.getCurrent() + duration * x);
         stats.setFatigue (fatigue);
@@ -875,7 +874,7 @@ namespace MWMechanics
 
     void Actors::updateDrowning(const MWWorld::Ptr& ptr, float duration, bool isKnockedOut, bool isPlayer)
     {
-        auto& actorClass = ptr.getClass();
+        const auto& actorClass = ptr.getClass();
         NpcStats& stats = actorClass.getNpcStats(ptr);
 
         // When npc stats are just initialized, mTimeToStartDrowning == -1 and we should get value from GMST
@@ -890,8 +889,8 @@ namespace MWMechanics
                 seq.stack(AiBreathe(), ptr);
         }
 
-        MWBase::World* world = MWBase::Environment::get().getWorld();
-        bool knockedOutUnderwater = (isKnockedOut && world->isUnderwater(ptr.getCell(), osg::Vec3f(ptr.getRefData().getPosition().asVec3())));
+        const MWBase::World* const world = MWBase::Environment::get().getWorld();
+        const bool knockedOutUnderwater = (isKnockedOut && world->isUnderwater(ptr.getCell(), osg::Vec3f(ptr.getRefData().getPosition().asVec3())));
         if ((world->isSubmerged(ptr) || knockedOutUnderwater)
             && stats.getMagicEffects().get(ESM::MagicEffect::WaterBreathing).getMagnitude() == 0)
         {
@@ -906,7 +905,7 @@ namespace MWMechanics
                 stats.setTimeToStartDrowning(timeLeft);
             }
 
-            bool godmode = isPlayer && world->getGodModeState();
+            const bool godmode = isPlayer && world->getGodModeState();
 
             if (timeLeft == 0.0f && !godmode)
             {
@@ -933,7 +932,7 @@ namespace MWMechanics
     {
         const bool isPlayer = (ptr == getPlayer());
 
-        auto& actorClass = ptr.getClass();
+        const auto& actorClass = ptr.getClass();
         auto& inventoryStore = actorClass.getInventoryStore(ptr);
 
         auto heldIter = inventoryStore.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
@@ -1031,11 +1030,11 @@ namespace MWMechanics
 
     void Actors::updateCrimePursuit(const MWWorld::Ptr& ptr, float duration)
     {
-        MWWorld::Ptr player = getPlayer();
+        const MWWorld::Ptr player = getPlayer();
         if (ptr == player)
             return;
 
-        auto& actorClass = ptr.getClass();
+        const auto& actorClass = ptr.getClass();
         if (!actorClass.isNpc())
             return;
 
@@ -1158,9 +1157,9 @@ namespace MWMechanics
 
         // Fade away actors on large distance (>90% of actor's processing distance)
         float visibilityRatio = 1.0;
-        float fadeStartDistance = mActorsProcessingRange*0.9f;
-        float fadeEndDistance = mActorsProcessingRange;
-        float fadeRatio = (dist - fadeStartDistance)/(fadeEndDistance - fadeStartDistance);
+        const float fadeStartDistance = mActorsProcessingRange*0.9f;
+        const float fadeEndDistance = mActorsProcessingRange;
+        const float fadeRatio = (dist - fadeStartDistance)/(fadeEndDistance - fadeStartDistance);
         if (fadeRatio > 0)
             visibilityRatio -= std::max(0.f, fadeRatio);
 
@@ -1210,7 +1209,7 @@ namespace MWMechanics
             if (neighbor == actor)
                 continue;
 
-            bool result = MWBase::Environment::get().getWorld()->getLOS(neighbor, actor)
+            const bool result = MWBase::Environment::get().getWorld()->getLOS(neighbor, actor)
                        && MWBase::Environment::get().getMechanicsManager()->awarenessCheck(actor, neighbor);
 
             if (result)
@@ -1244,10 +1243,10 @@ namespace MWMechanics
 
     void Actors::updateCombatMusic ()
     {
-        MWWorld::Ptr player = getPlayer();
+        const MWWorld::Ptr player = getPlayer();
         const osg::Vec3f playerPos = player.getRefData().getPosition().asVec3();
         bool hasHostiles = false; // need to know this to play Battle music
-        bool aiActive = MWBase::Environment::get().getMechanicsManager()->isAIActive();
+        const bool aiActive = MWBase::Environment::get().getMechanicsManager()->isAIActive();
 
         if (aiActive)
         {
@@ -1296,20 +1295,20 @@ namespace MWMechanics
         static const bool giveWayWhenIdle = Settings::Manager::getBool("NPCs give way", "Game");
 
         const MWWorld::Ptr player = getPlayer();
-        const MWBase::World* world = MWBase::Environment::get().getWorld();
+        const MWBase::World* const world = MWBase::Environment::get().getWorld();
         for (const Actor& actor : mActors)
         {
             const MWWorld::Ptr& ptr = actor.getPtr();
             if (ptr == player)
                 continue; // Don't interfere with player controls.
 
-            float maxSpeed = ptr.getClass().getMaxSpeed(ptr);
+            const float maxSpeed = ptr.getClass().getMaxSpeed(ptr);
             if (maxSpeed == 0.0)
                 continue; // Can't move, so there is no sense to predict collisions.
 
             Movement& movement = ptr.getClass().getMovementSettings(ptr);
-            osg::Vec2f origMovement(movement.mPosition[0], movement.mPosition[1]);
-            bool isMoving = origMovement.length2() > 0.01;
+            const osg::Vec2f origMovement(movement.mPosition[0], movement.mPosition[1]);
+            const bool isMoving = origMovement.length2() > 0.01;
             if (movement.mPosition[1] < 0)
                 continue; // Actors can not see others when move backward.
 
@@ -1344,11 +1343,11 @@ namespace MWMechanics
             if (!shouldAvoidCollision && !shouldGiveWay)
                 continue;
 
-            osg::Vec2f baseSpeed = origMovement * maxSpeed;
-            osg::Vec3f basePos = ptr.getRefData().getPosition().asVec3();
-            float baseRotZ = ptr.getRefData().getPosition().rot[2];
+            const osg::Vec2f baseSpeed = origMovement * maxSpeed;
+            const osg::Vec3f basePos = ptr.getRefData().getPosition().asVec3();
+            const float baseRotZ = ptr.getRefData().getPosition().rot[2];
             const osg::Vec3f halfExtents = world->getHalfExtents(ptr);
-            float maxDistToCheck = isMoving ? maxDistForPartialAvoiding : maxDistForStrictAvoiding;
+            const float maxDistToCheck = isMoving ? maxDistForPartialAvoiding : maxDistForStrictAvoiding;
 
             float timeToCheck = maxTimeToCheck;
             if (!shouldGiveWay && !aiSequence.isEmpty())
@@ -1366,9 +1365,9 @@ namespace MWMechanics
                     continue;
 
                 const osg::Vec3f otherHalfExtents = world->getHalfExtents(otherPtr);
-                osg::Vec3f deltaPos = otherPtr.getRefData().getPosition().asVec3() - basePos;
-                osg::Vec2f relPos = Misc::rotateVec2f(osg::Vec2f(deltaPos.x(), deltaPos.y()), baseRotZ);
-                float dist = deltaPos.length();
+                const osg::Vec3f deltaPos = otherPtr.getRefData().getPosition().asVec3() - basePos;
+                const osg::Vec2f relPos = Misc::rotateVec2f(osg::Vec2f(deltaPos.x(), deltaPos.y()), baseRotZ);
+                const float dist = deltaPos.length();
 
                 // Ignore actors which are not close enough or come from behind.
                 if (dist > maxDistToCheck || relPos.y() < 0)
@@ -1378,21 +1377,21 @@ namespace MWMechanics
                 if (deltaPos.z() > halfExtents.z() * 2 || deltaPos.z() < -otherHalfExtents.z() * 2)
                     continue;
 
-                osg::Vec3f speed = otherPtr.getClass().getMovementSettings(otherPtr).asVec3() *
-                                   otherPtr.getClass().getMaxSpeed(otherPtr);
-                float rotZ = otherPtr.getRefData().getPosition().rot[2];
-                osg::Vec2f relSpeed = Misc::rotateVec2f(osg::Vec2f(speed.x(), speed.y()), baseRotZ - rotZ) - baseSpeed;
+                const osg::Vec3f speed = otherPtr.getClass().getMovementSettings(otherPtr).asVec3()
+                        * otherPtr.getClass().getMaxSpeed(otherPtr);
+                const float rotZ = otherPtr.getRefData().getPosition().rot[2];
+                const osg::Vec2f relSpeed = Misc::rotateVec2f(osg::Vec2f(speed.x(), speed.y()), baseRotZ - rotZ) - baseSpeed;
 
                 float collisionDist = minGap + halfExtents.x() + otherHalfExtents.x();
                 collisionDist = std::min(collisionDist, relPos.length());
 
                 // Find the earliest `t` when |relPos + relSpeed * t| == collisionDist.
-                float vr = relPos.x() * relSpeed.x() + relPos.y() * relSpeed.y();
-                float v2 = relSpeed.length2();
-                float Dh = vr * vr - v2 * (relPos.length2() - collisionDist * collisionDist);
+                const float vr = relPos.x() * relSpeed.x() + relPos.y() * relSpeed.y();
+                const float v2 = relSpeed.length2();
+                const float Dh = vr * vr - v2 * (relPos.length2() - collisionDist * collisionDist);
                 if (Dh <= 0 || v2 == 0)
                     continue; // No solution; distance is always >= collisionDist.
-                float t = (-vr - std::sqrt(Dh)) / v2;
+                const float t = (-vr - std::sqrt(Dh)) / v2;
 
                 if (t < 0 || t > timeToCollision)
                     continue;
@@ -1405,9 +1404,9 @@ namespace MWMechanics
 
                 timeToCollision = t;
                 angleToApproachingActor = std::atan2(deltaPos.x(), deltaPos.y());
-                osg::Vec2f posAtT = relPos + relSpeed * t;
-                float coef = (posAtT.x() * relSpeed.x() + posAtT.y() * relSpeed.y()) / (collisionDist * collisionDist * maxSpeed);
-                coef *= std::clamp((maxDistForPartialAvoiding - dist) / (maxDistForPartialAvoiding - maxDistForStrictAvoiding), 0.f, 1.f);
+                const osg::Vec2f posAtT = relPos + relSpeed * t;
+                const float coef = (posAtT.x() * relSpeed.x() + posAtT.y() * relSpeed.y()) / (collisionDist * collisionDist * maxSpeed)
+                    * std::clamp((maxDistForPartialAvoiding - dist) / (maxDistForPartialAvoiding - maxDistForStrictAvoiding), 0.f, 1.f);
                 movementCorrection = posAtT * coef;
                 if (otherPtr.getClass().getCreatureStats(otherPtr).isDead())
                     // In case of dead body still try to go around (it looks natural), but reduce the correction twice.
@@ -1450,18 +1449,18 @@ namespace MWMechanics
                 mTimerUpdateEquippedLight = 0;
 
             // show torches only when there are darkness and no precipitations
-            MWBase::World* world = MWBase::Environment::get().getWorld();
-            bool showTorches = world->useTorches();
+            MWBase::World* const world = MWBase::Environment::get().getWorld();
+            const bool showTorches = world->useTorches();
 
-            MWWorld::Ptr player = getPlayer();
+            const MWWorld::Ptr player = getPlayer();
             const osg::Vec3f playerPos = player.getRefData().getPosition().asVec3();
 
             /// \todo move update logic to Actor class where appropriate
 
             std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr> > cachedAllies; // will be filled as engageCombat iterates
 
-            bool aiActive = MWBase::Environment::get().getMechanicsManager()->isAIActive();
-            int attackedByPlayerId = player.getClass().getCreatureStats(player).getHitAttemptActorId();
+            const bool aiActive = MWBase::Environment::get().getMechanicsManager()->isAIActive();
+            const int attackedByPlayerId = player.getClass().getCreatureStats(player).getHitAttemptActorId();
             if (attackedByPlayerId != -1)
             {
                 const MWWorld::Ptr playerHitAttemptActor = world->searchPtrViaActorId(attackedByPlayerId);
@@ -1469,7 +1468,7 @@ namespace MWMechanics
                 if (!playerHitAttemptActor.isInCell())
                     player.getClass().getCreatureStats(player).setHitAttemptActorId(-1);
             }
-            bool godmode = MWBase::Environment::get().getWorld()->getGodModeState();
+            const bool godmode = MWBase::Environment::get().getWorld()->getGodModeState();
 
              // AI and magic effects update
             for (Actor& actor : mActors)
@@ -1481,7 +1480,7 @@ namespace MWMechanics
 
                 const float distSqr = (playerPos - actor.getPtr().getRefData().getPosition().asVec3()).length2();
                 // AI processing is only done within given distance to the player.
-                bool inProcessingRange = distSqr <= mActorsProcessingRange*mActorsProcessingRange;
+                const bool inProcessingRange = distSqr <= mActorsProcessingRange*mActorsProcessingRange;
 
                 // If dead or no longer in combat, no longer store any actors who attempted to hit us. Also remove for the player.
                 if (!isPlayer && (actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isDead()
@@ -1505,7 +1504,7 @@ namespace MWMechanics
                 }
                 else
                 {
-                    bool cellChanged = world->hasCellChanged();
+                    const bool cellChanged = world->hasCellChanged();
                     const MWWorld::Ptr actorPtr = actor.getPtr(); // make a copy of the map key to avoid it being invalidated when the player teleports
                     updateActor(actorPtr, duration);
 
@@ -1595,11 +1594,9 @@ namespace MWMechanics
                     MWMechanics::AiSequence& seq = stats.getAiSequence();
                     alwaysActive = !seq.isEmpty() && seq.getActivePackage().alwaysActive();
                 }
-                bool inRange = isPlayer || dist <= mActorsProcessingRange || alwaysActive;
-                int activeFlag = 1; // Can be changed back to '2' to keep updating bounding boxes off screen (more accurate, but slower)
-                if (isPlayer)
-                    activeFlag = 2;
-                int active = inRange ? activeFlag : 0;
+                const bool inRange = isPlayer || dist <= mActorsProcessingRange || alwaysActive;
+                const int activeFlag = isPlayer ? 2 : 1; // Can be changed back to '2' to keep updating bounding boxes off screen (more accurate, but slower)
+                const int active = inRange ? activeFlag : 0;
 
                 CharacterController& ctrl = actor.getCharacterController();
                 ctrl.setActive(active);
@@ -1726,7 +1723,7 @@ namespace MWMechanics
 
                 // Reset magic effects and recalculate derived effects
                 // One case where we need this is to make sure bound items are removed upon death
-                float vampirism = stats.getMagicEffects().get(ESM::MagicEffect::Vampirism).getMagnitude();
+                const float vampirism = stats.getMagicEffects().get(ESM::MagicEffect::Vampirism).getMagnitude();
                 stats.getActiveSpells().clear(actor.getPtr());
                 // Make sure spell effects are removed
                 purgeSpellEffects(stats.getActorId());
@@ -1751,7 +1748,7 @@ namespace MWMechanics
 
     void Actors::cleanupSummonedCreature (MWMechanics::CreatureStats& casterStats, int creatureActorId)
     {
-        MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->searchPtrViaActorId(creatureActorId);
+        const MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->searchPtrViaActorId(creatureActorId);
         if (!ptr.isEmpty())
         {
             MWBase::Environment::get().getWorld()->deleteObject(ptr);
@@ -1796,7 +1793,7 @@ namespace MWMechanics
     void Actors::rest(double hours, bool sleep)
     {
         float duration = hours * 3600.f;
-        float timeScale = MWBase::Environment::get().getWorld()->getTimeScaleFactor();
+        const float timeScale = MWBase::Environment::get().getWorld()->getTimeScaleFactor();
         if (timeScale != 0.f)
             duration /= timeScale;
 
@@ -1839,7 +1836,7 @@ namespace MWMechanics
             return;
         }
 
-        MWWorld::Ptr player = getPlayer();
+        const MWWorld::Ptr player = getPlayer();
 
         if (!MWBase::Environment::get().getMechanicsManager()->isSneaking(player))
         {
@@ -1847,7 +1844,7 @@ namespace MWMechanics
             return;
         }
 
-        MWBase::World* world = MWBase::Environment::get().getWorld();
+        MWBase::World* const world = MWBase::Environment::get().getWorld();
         const MWWorld::Store<ESM::GameSetting>& gmst = world->getStore().get<ESM::GameSetting>();
         static const float fSneakUseDist = gmst.find("fSneakUseDist")->mValue.getFloat();
         static const float fSneakUseDelay = gmst.find("fSneakUseDelay")->mValue.getFloat();
@@ -1862,8 +1859,8 @@ namespace MWMechanics
             bool detected = false;
 
             std::vector<MWWorld::Ptr> observers;
-            osg::Vec3f position(player.getRefData().getPosition().asVec3());
-            float radius = std::min(fSneakUseDist, mActorsProcessingRange);
+            const osg::Vec3f position(player.getRefData().getPosition().asVec3());
+            const float radius = std::min(fSneakUseDist, mActorsProcessingRange);
             getObjectsInRange(position, radius, observers);
 
             std::set<MWWorld::Ptr> sidingActors;
@@ -1909,25 +1906,24 @@ namespace MWMechanics
 
     int Actors::getHoursToRest(const MWWorld::Ptr &ptr) const
     {
-        auto [healthPerHour, magickaPerHour] = getRestorationPerHourOfSleep(ptr);
+        const auto [healthPerHour, magickaPerHour] = getRestorationPerHourOfSleep(ptr);
 
         CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
-        bool stunted = stats.getMagicEffects ().get(ESM::MagicEffect::StuntedMagicka).getMagnitude() > 0;
+        const bool stunted = stats.getMagicEffects ().get(ESM::MagicEffect::StuntedMagicka).getMagnitude() > 0;
 
-        float healthHours  = healthPerHour > 0
+        const float healthHours  = healthPerHour > 0
                              ? (stats.getHealth().getModified() - stats.getHealth().getCurrent()) / healthPerHour
                              : 1.0f;
-        float magickaHours = magickaPerHour > 0 && !stunted
+        const float magickaHours = magickaPerHour > 0 && !stunted
                               ? (stats.getMagicka().getModified() - stats.getMagicka().getCurrent()) / magickaPerHour
                               : 1.0f;
 
-        int autoHours = static_cast<int>(std::ceil(std::max(1.f, std::max(healthHours, magickaHours))));
-        return autoHours;
+        return static_cast<int>(std::ceil(std::max(1.f, std::max(healthHours, magickaHours))));
     }
 
     int Actors::countDeaths (const std::string& id) const
     {
-        std::map<std::string, int>::const_iterator iter = mDeathCount.find(id);
+        const auto iter = mDeathCount.find(id);
         if(iter != mDeathCount.end())
             return iter->second;
         return 0;
@@ -2077,8 +2073,7 @@ namespace MWMechanics
             out.insert(search->second.begin(), search->second.end());
         else
         {
-            auto followers = getActorsSidingWith(actor, true);
-            for (const MWWorld::Ptr &follower : followers)
+            for (const MWWorld::Ptr &follower : getActorsSidingWith(actor, true))
                 if (out.insert(follower).second)
                     getActorsSidingWith(follower, out, cachedAllies);
 
@@ -2117,7 +2112,7 @@ namespace MWMechanics
         {
             if (package->followTargetThroughDoors() && package->getTarget() == actor)
             {
-                int index = static_cast<const AiFollow*>(package.get())->getFollowIndex();
+                const int index = static_cast<const AiFollow*>(package.get())->getFollowIndex();
                 map[index] = otherActor.getPtr();
                 return false;
             }
@@ -2131,7 +2126,7 @@ namespace MWMechanics
     std::vector<MWWorld::Ptr> Actors::getActorsFighting(const MWWorld::Ptr& actor) {
         std::vector<MWWorld::Ptr> list;
         std::vector<MWWorld::Ptr> neighbors;
-        osg::Vec3f position (actor.getRefData().getPosition().asVec3());
+        const osg::Vec3f position(actor.getRefData().getPosition().asVec3());
         getObjectsInRange(position, mActorsProcessingRange, neighbors);
         for(const MWWorld::Ptr& neighbor : neighbors)
         {

From 0132b6e19c51127d47dff7178b470e6abfbc945c Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 4 Jul 2022 21:51:53 +0200
Subject: [PATCH 2747/2859] Use range-based for loop

---
 apps/openmw/mwmechanics/actors.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index c262499de4..07a6ea28d2 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -713,11 +713,10 @@ namespace MWMechanics
             std::set<MWWorld::Ptr> playerFollowers;
             getActorsSidingWith(player, playerFollowers);
 
-            for (ActiveSpells::TIterator it = spells.begin(); it != spells.end(); ++it)
+            for (const ActiveSpells::ActiveSpellParams& spell : spells)
             {
                 bool actorKilled = false;
 
-                const ActiveSpells::ActiveSpellParams& spell = *it;
                 MWWorld::Ptr caster = MWBase::Environment::get().getWorld()->searchPtrViaActorId(spell.getCasterActorId());
                 for (const auto& effect : spell.getEffects())
                 {
@@ -2152,16 +2151,17 @@ namespace MWMechanics
 
         std::set<MWWorld::Ptr> followers;
         getActorsFollowing(actor, followers);
-        for (auto neighbor = neighbors.begin(); neighbor != neighbors.end(); ++neighbor)
+        for (const MWWorld::Ptr& neighbor : neighbors)
         {
-            const CreatureStats &stats = neighbor->getClass().getCreatureStats(*neighbor);
-            if (stats.isDead() || *neighbor == actor || neighbor->getClass().isPureWaterCreature(*neighbor))
+            const CreatureStats &stats = neighbor.getClass().getCreatureStats(neighbor);
+            if (stats.isDead() || neighbor == actor || neighbor.getClass().isPureWaterCreature(neighbor))
                 continue;
 
-            const bool isFollower = followers.find(*neighbor) != followers.end();
+            const bool isFollower = followers.find(neighbor) != followers.end();
 
-            if (stats.getAiSequence().isInCombat(actor) || (MWBase::Environment::get().getMechanicsManager()->isAggressive(*neighbor, actor) && !isFollower))
-                list.push_back(*neighbor);
+            if (stats.getAiSequence().isInCombat(actor)
+                    || (MWBase::Environment::get().getMechanicsManager()->isAggressive(neighbor, actor) && !isFollower))
+                list.push_back(neighbor);
         }
         return list;
     }
@@ -2170,10 +2170,10 @@ namespace MWMechanics
     void Actors::write (ESM::ESMWriter& writer, Loading::Listener& listener) const
     {
         writer.startRecord(ESM::REC_DCOU);
-        for (std::map<std::string, int>::const_iterator it = mDeathCount.begin(); it != mDeathCount.end(); ++it)
+        for (const auto& [id, count] : mDeathCount)
         {
-            writer.writeHNString("ID__", it->first);
-            writer.writeHNT ("COUN", it->second);
+            writer.writeHNString("ID__", id);
+            writer.writeHNT ("COUN", count);
         }
         writer.endRecord(ESM::REC_DCOU);
     }

From 2ec757ab0f1e7e4f2dd5f8b9e8069885a8f45d23 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 4 Jul 2022 22:10:31 +0200
Subject: [PATCH 2748/2859] Remove unnecessary member functions from Actors

---
 apps/openmw/mwmechanics/actors.cpp | 4 ++--
 apps/openmw/mwmechanics/actors.hpp | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 07a6ea28d2..71e1ac1bb5 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -871,7 +871,7 @@ namespace MWMechanics
         return it->second->getCharacterController().isSneaking();
     }
 
-    void Actors::updateDrowning(const MWWorld::Ptr& ptr, float duration, bool isKnockedOut, bool isPlayer)
+    static void updateDrowning(const MWWorld::Ptr& ptr, float duration, bool isKnockedOut, bool isPlayer)
     {
         const auto& actorClass = ptr.getClass();
         NpcStats& stats = actorClass.getNpcStats(ptr);
@@ -927,7 +927,7 @@ namespace MWMechanics
             stats.setTimeToStartDrowning(fHoldBreathTime);
     }
 
-    void Actors::updateEquippedLight(const MWWorld::Ptr& ptr, float duration, bool mayEquip)
+    static void updateEquippedLight(const MWWorld::Ptr& ptr, float duration, bool mayEquip)
     {
         const bool isPlayer = (ptr == getPlayer());
 
diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index 999063c61d..aa4e7b4cb1 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -195,10 +195,6 @@ namespace MWMechanics
 
             void calculateRestoration (const MWWorld::Ptr& ptr, float duration);
 
-            void updateDrowning (const MWWorld::Ptr& ptr, float duration, bool isKnockedOut, bool isPlayer);
-
-            void updateEquippedLight (const MWWorld::Ptr& ptr, float duration, bool mayEquip);
-
             void updateCrimePursuit (const MWWorld::Ptr& ptr, float duration);
 
             void killDeadActors ();

From ae4ec0a1d0126a192e05f64221054264fad1dd54 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 4 Jul 2022 22:16:26 +0200
Subject: [PATCH 2749/2859] Convert static const to constexpr where possible

---
 apps/openmw/mwmechanics/actors.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 71e1ac1bb5..0a9546baa5 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -230,10 +230,10 @@ void removeTemporaryEffects(const MWWorld::Ptr& ptr)
 
 namespace MWMechanics
 {
-    static const int GREETING_SHOULD_START = 4; // how many updates should pass before NPC can greet player
-    static const int GREETING_SHOULD_END = 20;  // how many updates should pass before NPC stops turning to player
-    static const int GREETING_COOLDOWN = 40;    // how many updates should pass before NPC can continue movement
-    static const float DECELERATE_DISTANCE = 512.f;
+    static constexpr int GREETING_SHOULD_START = 4; // how many updates should pass before NPC can greet player
+    static constexpr int GREETING_SHOULD_END = 20;  // how many updates should pass before NPC stops turning to player
+    static constexpr int GREETING_COOLDOWN = 40;    // how many updates should pass before NPC can continue movement
+    static constexpr float DECELERATE_DISTANCE = 512.f;
 
     namespace
     {
@@ -1111,8 +1111,8 @@ namespace MWMechanics
     void Actors::updateProcessingRange()
     {
         // We have to cap it since using high values (larger than 7168) will make some quests harder or impossible to complete (bug #1876)
-        static const float maxRange = 7168.f;
-        static const float minRange = maxRange / 2.f;
+        static constexpr float maxRange = 7168.f;
+        static constexpr float minRange = maxRange / 2.f;
 
         mActorsProcessingRange = std::clamp(Settings::Manager::getFloat("actors processing range", "Game"), minRange, maxRange);
     }

From c476437b6e7084eabf8f2fe1ed044f38c90a935a Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 4 Jul 2022 22:36:08 +0200
Subject: [PATCH 2750/2859] Mark Actors member functions as const where
 possible

---
 apps/openmw/mwmechanics/actor.hpp  |  1 +
 apps/openmw/mwmechanics/actors.cpp | 90 ++++++++++++++++--------------
 apps/openmw/mwmechanics/actors.hpp | 88 +++++++++++++++--------------
 3 files changed, 96 insertions(+), 83 deletions(-)

diff --git a/apps/openmw/mwmechanics/actor.hpp b/apps/openmw/mwmechanics/actor.hpp
index 3a3b0baa67..1e257f613d 100644
--- a/apps/openmw/mwmechanics/actor.hpp
+++ b/apps/openmw/mwmechanics/actor.hpp
@@ -37,6 +37,7 @@ namespace MWMechanics
         void updatePtr(const MWWorld::Ptr& newPtr) { mCharacterController.updatePtr(newPtr); }
 
         CharacterController& getCharacterController() { return mCharacterController; }
+        const CharacterController& getCharacterController() const { return mCharacterController; }
 
         int getGreetingTimer() const { return mGreetingTimer; }
         void setGreetingTimer(int timer) { mGreetingTimer = timer; }
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 0a9546baa5..99256d1395 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -108,7 +108,7 @@ std::pair<float, float> getRestorationPerHourOfSleep(const MWWorld::Ptr& ptr)
 }
 
 template<class T>
-void forEachFollowingPackage(std::list<MWMechanics::Actor>& actors, const MWWorld::Ptr& actorPtr, const MWWorld::Ptr& player, T&& func)
+void forEachFollowingPackage(const std::list<MWMechanics::Actor>& actors, const MWWorld::Ptr& actorPtr, const MWWorld::Ptr& player, T&& func)
 {
     for (const MWMechanics::Actor& actor : actors)
     {
@@ -357,7 +357,7 @@ namespace MWMechanics
         }
     }
 
-    void Actors::updateActor (const MWWorld::Ptr& ptr, float duration)
+    void Actors::updateActor(const MWWorld::Ptr& ptr, float duration) const
     {
         // magic effects
         adjustMagicEffects (ptr, duration);
@@ -366,7 +366,7 @@ namespace MWMechanics
         calculateRestoration(ptr, duration);
     }
 
-    void Actors::playIdleDialogue(const MWWorld::Ptr& actor)
+    void Actors::playIdleDialogue(const MWWorld::Ptr& actor) const
     {
         if (!actor.getClass().isActor() || actor == getPlayer() || MWBase::Environment::get().getSoundManager()->sayActive(actor))
             return;
@@ -393,7 +393,7 @@ namespace MWMechanics
             MWBase::Environment::get().getDialogueManager()->say(actor, "idle");
     }
 
-    void Actors::updateMovementSpeed(const MWWorld::Ptr& actor)
+    void Actors::updateMovementSpeed(const MWWorld::Ptr& actor) const
     {
         if (mSmoothMovement)
             return;
@@ -510,7 +510,7 @@ namespace MWMechanics
         actorState.setGreetingState(greetingState);
     }
 
-    void Actors::turnActorToFacePlayer(const MWWorld::Ptr& actor, Actor& actorState, const osg::Vec3f& dir)
+    void Actors::turnActorToFacePlayer(const MWWorld::Ptr& actor, Actor& actorState, const osg::Vec3f& dir) const
     {
         auto& movementSettings = actor.getClass().getMovementSettings(actor);
         movementSettings.mPosition[1] = 0;
@@ -528,7 +528,7 @@ namespace MWMechanics
         }
     }
 
-    void Actors::stopCombat(const MWWorld::Ptr& ptr)
+    void Actors::stopCombat(const MWWorld::Ptr& ptr) const
     {
         auto& ai = ptr.getClass().getCreatureStats(ptr).getAiSequence();
         std::vector<MWWorld::Ptr> targets;
@@ -545,7 +545,8 @@ namespace MWMechanics
         }
     }
 
-    void Actors::engageCombat(const MWWorld::Ptr& actor1, const MWWorld::Ptr& actor2, std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr> >& cachedAllies, bool againstPlayer)
+    void Actors::engageCombat(const MWWorld::Ptr& actor1, const MWWorld::Ptr& actor2,
+        std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr>>& cachedAllies, bool againstPlayer) const
     {
         // No combat for totally static creatures
         if (!actor1.getClass().isMobile(actor1))
@@ -698,7 +699,7 @@ namespace MWMechanics
         }
     }
 
-    void Actors::adjustMagicEffects (const MWWorld::Ptr& creature, float duration)
+    void Actors::adjustMagicEffects(const MWWorld::Ptr& creature, float duration) const
     {
         CreatureStats& creatureStats = creature.getClass().getCreatureStats (creature);
         const bool wasDead = creatureStats.isDead();
@@ -754,7 +755,7 @@ namespace MWMechanics
             updateSummons(creature, mTimerDisposeSummonsCorpses == 0.f);
     }
 
-    void Actors::restoreDynamicStats (const MWWorld::Ptr& ptr, double hours, bool sleep)
+    void Actors::restoreDynamicStats(const MWWorld::Ptr& ptr, double hours, bool sleep) const
     {
         MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats (ptr);
         if (stats.isDead())
@@ -822,7 +823,7 @@ namespace MWMechanics
         stats.setFatigue (fatigue);
     }
 
-    void Actors::calculateRestoration (const MWWorld::Ptr& ptr, float duration)
+    void Actors::calculateRestoration(const MWWorld::Ptr& ptr, float duration) const
     {
         if (ptr.getClass().getCreatureStats(ptr).isDead())
             return;
@@ -847,7 +848,7 @@ namespace MWMechanics
         stats.setFatigue (fatigue);
     }
 
-    bool Actors::isAttackPreparing(const MWWorld::Ptr& ptr)
+    bool Actors::isAttackPreparing(const MWWorld::Ptr& ptr) const
     {
         const auto it = mIndex.find(ptr.mRef);
         if (it == mIndex.end())
@@ -855,7 +856,7 @@ namespace MWMechanics
         return it->second->getCharacterController().isAttackPreparing();
     }
 
-    bool Actors::isRunning(const MWWorld::Ptr& ptr)
+    bool Actors::isRunning(const MWWorld::Ptr& ptr) const
     {
         const auto it = mIndex.find(ptr.mRef);
         if (it == mIndex.end())
@@ -863,7 +864,7 @@ namespace MWMechanics
         return it->second->getCharacterController().isRunning();
     }
 
-    bool Actors::isSneaking(const MWWorld::Ptr& ptr)
+    bool Actors::isSneaking(const MWWorld::Ptr& ptr) const
     {
         const auto it = mIndex.find(ptr.mRef);
         if (it == mIndex.end())
@@ -1027,7 +1028,7 @@ namespace MWMechanics
         }
     }
 
-    void Actors::updateCrimePursuit(const MWWorld::Ptr& ptr, float duration)
+    void Actors::updateCrimePursuit(const MWWorld::Ptr& ptr, float duration) const
     {
         const MWWorld::Ptr player = getPlayer();
         if (ptr == player)
@@ -1139,7 +1140,7 @@ namespace MWMechanics
         updateVisibility(ptr, it->getCharacterController());
     }
 
-    void Actors::updateVisibility (const MWWorld::Ptr& ptr, CharacterController& ctrl)
+    void Actors::updateVisibility(const MWWorld::Ptr& ptr, CharacterController& ctrl) const
     {
         MWWorld::Ptr player = MWMechanics::getPlayer();
         if (ptr == player)
@@ -1179,14 +1180,14 @@ namespace MWMechanics
         }
     }
 
-    void Actors::castSpell(const MWWorld::Ptr& ptr, const std::string& spellId, bool manualSpell)
+    void Actors::castSpell(const MWWorld::Ptr& ptr, const std::string& spellId, bool manualSpell) const
     {
         const auto iter = mIndex.find(ptr.mRef);
         if (iter != mIndex.end())
             iter->second->getCharacterController().castSpell(spellId, manualSpell);
     }
 
-    bool Actors::isActorDetected(const MWWorld::Ptr& actor, const MWWorld::Ptr& observer)
+    bool Actors::isActorDetected(const MWWorld::Ptr& actor, const MWWorld::Ptr& observer) const
     {
         if (!actor.getClass().isActor())
             return false;
@@ -1218,7 +1219,7 @@ namespace MWMechanics
         return false;
     }
 
-    void Actors::updateActor(const MWWorld::Ptr &old, const MWWorld::Ptr &ptr)
+    void Actors::updateActor(const MWWorld::Ptr &old, const MWWorld::Ptr &ptr) const
     {
         const auto iter = mIndex.find(old.mRef);
         if (iter != mIndex.end())
@@ -1282,7 +1283,7 @@ namespace MWMechanics
 
     }
 
-    void Actors::predictAndAvoidCollisions(float duration)
+    void Actors::predictAndAvoidCollisions(float duration) const
     {
         if (!MWBase::Environment::get().getMechanicsManager()->isAIActive())
             return;
@@ -1675,7 +1676,7 @@ namespace MWMechanics
         ++mDeathCount[Misc::StringUtils::lowerCase(actor.getCellRef().getRefId())];
     }
 
-    void Actors::resurrect(const MWWorld::Ptr &ptr)
+    void Actors::resurrect(const MWWorld::Ptr &ptr) const
     {
         const auto iter = mIndex.find(ptr.mRef);
         if (iter != mIndex.end())
@@ -1745,7 +1746,7 @@ namespace MWMechanics
         }
     }
 
-    void Actors::cleanupSummonedCreature (MWMechanics::CreatureStats& casterStats, int creatureActorId)
+    void Actors::cleanupSummonedCreature(MWMechanics::CreatureStats& casterStats, int creatureActorId) const
     {
         const MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->searchPtrViaActorId(creatureActorId);
         if (!ptr.isEmpty())
@@ -1780,7 +1781,7 @@ namespace MWMechanics
         purgeSpellEffects(creatureActorId);
     }
 
-    void Actors::purgeSpellEffects(int casterActorId)
+    void Actors::purgeSpellEffects(int casterActorId) const
     {
         for (const Actor& actor : mActors)
         {
@@ -1789,7 +1790,7 @@ namespace MWMechanics
         }
     }
 
-    void Actors::rest(double hours, bool sleep)
+    void Actors::rest(double hours, bool sleep) const
     {
         float duration = hours * 3600.f;
         const float timeScale = MWBase::Environment::get().getWorld()->getTimeScaleFactor();
@@ -1928,14 +1929,14 @@ namespace MWMechanics
         return 0;
     }
 
-    void Actors::forceStateUpdate(const MWWorld::Ptr & ptr)
+    void Actors::forceStateUpdate(const MWWorld::Ptr& ptr) const
     {
         const auto iter = mIndex.find(ptr.mRef);
         if (iter != mIndex.end())
             iter->second->getCharacterController().forceStateUpdate();
     }
 
-    bool Actors::playAnimationGroup(const MWWorld::Ptr& ptr, const std::string& groupName, int mode, int number, bool persist)
+    bool Actors::playAnimationGroup(const MWWorld::Ptr& ptr, const std::string& groupName, int mode, int number, bool persist) const
     {
         const auto iter = mIndex.find(ptr.mRef);
         if(iter != mIndex.end())
@@ -1948,14 +1949,14 @@ namespace MWMechanics
             return false;
         }
     }
-    void Actors::skipAnimation(const MWWorld::Ptr& ptr)
+    void Actors::skipAnimation(const MWWorld::Ptr& ptr) const
     {
         const auto iter = mIndex.find(ptr.mRef);
         if (iter != mIndex.end())
             iter->second->getCharacterController().skipAnim();
     }
 
-    bool Actors::checkAnimationPlaying(const MWWorld::Ptr& ptr, const std::string& groupName)
+    bool Actors::checkAnimationPlaying(const MWWorld::Ptr& ptr, const std::string& groupName) const
     {
         const auto iter = mIndex.find(ptr.mRef);
         if(iter != mIndex.end())
@@ -1963,13 +1964,13 @@ namespace MWMechanics
         return false;
     }
 
-    void Actors::persistAnimationStates()
+    void Actors::persistAnimationStates() const
     {
-        for (Actor& actor : mActors)
+        for (const Actor& actor : mActors)
             actor.getCharacterController().persistAnimationState();
     }
 
-    void Actors::getObjectsInRange(const osg::Vec3f& position, float radius, std::vector<MWWorld::Ptr>& out)
+    void Actors::getObjectsInRange(const osg::Vec3f& position, float radius, std::vector<MWWorld::Ptr>& out) const
     {
         for (const Actor& actor : mActors)
         {
@@ -1978,7 +1979,7 @@ namespace MWMechanics
         }
     }
 
-    bool Actors::isAnyObjectInRange(const osg::Vec3f& position, float radius)
+    bool Actors::isAnyObjectInRange(const osg::Vec3f& position, float radius) const
     {
         for (const Actor& actor : mActors)
         {
@@ -1989,7 +1990,7 @@ namespace MWMechanics
         return false;
     }
 
-    std::vector<MWWorld::Ptr> Actors::getActorsSidingWith(const MWWorld::Ptr& actorPtr, bool excludeInfighting)
+    std::vector<MWWorld::Ptr> Actors::getActorsSidingWith(const MWWorld::Ptr& actorPtr, bool excludeInfighting) const
     {
         std::vector<MWWorld::Ptr> list;
         for (const Actor& actor : mActors)
@@ -2037,7 +2038,7 @@ namespace MWMechanics
         return list;
     }
 
-    std::vector<MWWorld::Ptr> Actors::getActorsFollowing(const MWWorld::Ptr& actorPtr)
+    std::vector<MWWorld::Ptr> Actors::getActorsFollowing(const MWWorld::Ptr& actorPtr) const
     {
         std::vector<MWWorld::Ptr> list;
         forEachFollowingPackage(mActors, actorPtr, getPlayer(), [&] (const Actor& actor, const std::shared_ptr<AiPackage>& package)
@@ -2051,21 +2052,25 @@ namespace MWMechanics
         return list;
     }
 
-    void Actors::getActorsFollowing(const MWWorld::Ptr &actor, std::set<MWWorld::Ptr>& out) {
+    void Actors::getActorsFollowing(const MWWorld::Ptr &actor, std::set<MWWorld::Ptr>& out) const
+    {
         auto followers = getActorsFollowing(actor);
         for(const MWWorld::Ptr &follower : followers)
             if (out.insert(follower).second)
                 getActorsFollowing(follower, out);
     }
 
-    void Actors::getActorsSidingWith(const MWWorld::Ptr &actor, std::set<MWWorld::Ptr>& out, bool excludeInfighting) {
+    void Actors::getActorsSidingWith(const MWWorld::Ptr &actor, std::set<MWWorld::Ptr>& out, bool excludeInfighting) const
+    {
         auto followers = getActorsSidingWith(actor, excludeInfighting);
         for(const MWWorld::Ptr &follower : followers)
             if (out.insert(follower).second)
                 getActorsSidingWith(follower, out, excludeInfighting);
     }
 
-    void Actors::getActorsSidingWith(const MWWorld::Ptr &actor, std::set<MWWorld::Ptr>& out, std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr> >& cachedAllies) {
+    void Actors::getActorsSidingWith(const MWWorld::Ptr &actor, std::set<MWWorld::Ptr>& out,
+        std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr>>& cachedAllies) const
+    {
         // If we have already found actor's allies, use the cache
         std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr> >::const_iterator search = cachedAllies.find(actor);
         if (search != cachedAllies.end())
@@ -2087,7 +2092,7 @@ namespace MWMechanics
         }
     }
 
-    std::vector<int> Actors::getActorsFollowingIndices(const MWWorld::Ptr &actor)
+    std::vector<int> Actors::getActorsFollowingIndices(const MWWorld::Ptr &actor) const
     {
         std::vector<int> list;
         forEachFollowingPackage(mActors, actor, getPlayer(), [&] (const Actor&, const std::shared_ptr<AiPackage>& package)
@@ -2104,7 +2109,7 @@ namespace MWMechanics
         return list;
     }
 
-    std::map<int, MWWorld::Ptr> Actors::getActorsFollowingByIndex(const MWWorld::Ptr &actor)
+    std::map<int, MWWorld::Ptr> Actors::getActorsFollowingByIndex(const MWWorld::Ptr &actor) const
     {
         std::map<int, MWWorld::Ptr> map;
         forEachFollowingPackage(mActors, actor, getPlayer(), [&] (const Actor& otherActor, const std::shared_ptr<AiPackage>& package)
@@ -2122,7 +2127,8 @@ namespace MWMechanics
         return map;
     }
 
-    std::vector<MWWorld::Ptr> Actors::getActorsFighting(const MWWorld::Ptr& actor) {
+    std::vector<MWWorld::Ptr> Actors::getActorsFighting(const MWWorld::Ptr& actor) const
+    {
         std::vector<MWWorld::Ptr> list;
         std::vector<MWWorld::Ptr> neighbors;
         const osg::Vec3f position(actor.getRefData().getPosition().asVec3());
@@ -2142,7 +2148,7 @@ namespace MWMechanics
         return list;
     }
 
-    std::vector<MWWorld::Ptr> Actors::getEnemiesNearby(const MWWorld::Ptr& actor)
+    std::vector<MWWorld::Ptr> Actors::getEnemiesNearby(const MWWorld::Ptr& actor) const
     {
         std::vector<MWWorld::Ptr> list;
         std::vector<MWWorld::Ptr> neighbors;
@@ -2200,7 +2206,7 @@ namespace MWMechanics
         mDeathCount.clear();
     }
 
-    void Actors::updateMagicEffects(const MWWorld::Ptr &ptr)
+    void Actors::updateMagicEffects(const MWWorld::Ptr &ptr) const
     {
         adjustMagicEffects(ptr, 0.f);
     }
@@ -2268,7 +2274,7 @@ namespace MWMechanics
         return it->second->isTurningToPlayer();
     }
 
-    void Actors::fastForwardAi()
+    void Actors::fastForwardAi() const
     {
         if (!MWBase::Environment::get().getMechanicsManager()->isAIActive())
             return;
diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index aa4e7b4cb1..071e2e5d84 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -51,11 +51,11 @@ namespace MWMechanics
 
             /// Check if the target actor was detected by an observer
             /// If the observer is a non-NPC, check all actors in AI processing distance as observers
-            bool isActorDetected(const MWWorld::Ptr& actor, const MWWorld::Ptr& observer);
+            bool isActorDetected(const MWWorld::Ptr& actor, const MWWorld::Ptr& observer) const;
 
             /// Update magic effects for an actor. Usually done automatically once per frame, but if we're currently
             /// paused we may want to do it manually (after equipping permanent enchantment)
-            void updateMagicEffects (const MWWorld::Ptr& ptr);
+            void updateMagicEffects(const MWWorld::Ptr& ptr) const;
 
             void updateProcessingRange();
             float getProcessingRange() const;
@@ -70,11 +70,11 @@ namespace MWMechanics
             ///
             /// \note Ignored, if \a ptr is not a registered actor.
 
-            void resurrect (const MWWorld::Ptr& ptr);
+            void resurrect(const MWWorld::Ptr& ptr) const;
 
-            void castSpell(const MWWorld::Ptr& ptr, const std::string& spellId, bool manualSpell=false);
+            void castSpell(const MWWorld::Ptr& ptr, const std::string& spellId, bool manualSpell = false) const;
 
-            void updateActor(const MWWorld::Ptr &old, const MWWorld::Ptr& ptr);
+            void updateActor(const MWWorld::Ptr &old, const MWWorld::Ptr& ptr) const;
             ///< Updates an actor with a new Ptr
 
             void dropActors (const MWWorld::CellStore *cellStore, const MWWorld::Ptr& ignore);
@@ -86,72 +86,75 @@ namespace MWMechanics
             void update (float duration, bool paused);
             ///< Update actor stats and store desired velocity vectors in \a movement
 
-            void updateActor (const MWWorld::Ptr& ptr, float duration);
+            void updateActor(const MWWorld::Ptr& ptr, float duration) const;
             ///< This function is normally called automatically during the update process, but it can
             /// also be called explicitly at any time to force an update.
 
             /// Removes an actor from combat and makes all of their allies stop fighting the actor's targets
-            void stopCombat(const MWWorld::Ptr& ptr);
+            void stopCombat(const MWWorld::Ptr& ptr) const;
 
-            void playIdleDialogue(const MWWorld::Ptr& actor);
-            void updateMovementSpeed(const MWWorld::Ptr& actor);
+            void playIdleDialogue(const MWWorld::Ptr& actor) const;
+            void updateMovementSpeed(const MWWorld::Ptr& actor) const;
             void updateGreetingState(const MWWorld::Ptr& actor, Actor& actorState, bool turnOnly);
-            void turnActorToFacePlayer(const MWWorld::Ptr& actor, Actor& actorState, const osg::Vec3f& dir);
+            void turnActorToFacePlayer(const MWWorld::Ptr& actor, Actor& actorState, const osg::Vec3f& dir) const;
 
-            void rest(double hours, bool sleep);
+            void rest(double hours, bool sleep) const;
             ///< Update actors while the player is waiting or sleeping.
 
             void updateSneaking(CharacterController* ctrl, float duration);
             ///< Update the sneaking indicator state according to the given player character controller.
 
-            void restoreDynamicStats(const MWWorld::Ptr& actor, double hours, bool sleep);
+            void restoreDynamicStats(const MWWorld::Ptr& actor, double hours, bool sleep) const;
 
             int getHoursToRest(const MWWorld::Ptr& ptr) const;
             ///< Calculate how many hours the given actor needs to rest in order to be fully healed
 
-            void fastForwardAi();
+            void fastForwardAi() const;
             ///< Simulate the passing of time
 
             int countDeaths (const std::string& id) const;
             ///< Return the number of deaths for actors with the given ID.
 
-            bool isAttackPreparing(const MWWorld::Ptr& ptr);
-            bool isRunning(const MWWorld::Ptr& ptr);
-            bool isSneaking(const MWWorld::Ptr& ptr);
+            bool isAttackPreparing(const MWWorld::Ptr& ptr) const;
+            bool isRunning(const MWWorld::Ptr& ptr) const;
+            bool isSneaking(const MWWorld::Ptr& ptr) const;
 
-            void forceStateUpdate(const MWWorld::Ptr &ptr);
+            void forceStateUpdate(const MWWorld::Ptr &ptr) const;
 
-            bool playAnimationGroup(const MWWorld::Ptr& ptr, const std::string& groupName, int mode, int number, bool persist=false);
-            void skipAnimation(const MWWorld::Ptr& ptr);
-            bool checkAnimationPlaying(const MWWorld::Ptr& ptr, const std::string& groupName);
-            void persistAnimationStates();
+            bool playAnimationGroup(const MWWorld::Ptr& ptr, const std::string& groupName, int mode,
+                int number, bool persist = false) const;
+            void skipAnimation(const MWWorld::Ptr& ptr) const;
+            bool checkAnimationPlaying(const MWWorld::Ptr& ptr, const std::string& groupName) const;
+            void persistAnimationStates() const;
 
-            void getObjectsInRange(const osg::Vec3f& position, float radius, std::vector<MWWorld::Ptr>& out);
+            void getObjectsInRange(const osg::Vec3f& position, float radius, std::vector<MWWorld::Ptr>& out) const;
 
-            bool isAnyObjectInRange(const osg::Vec3f& position, float radius);
+            bool isAnyObjectInRange(const osg::Vec3f& position, float radius) const;
 
-            void cleanupSummonedCreature (CreatureStats& casterStats, int creatureActorId);
+            void cleanupSummonedCreature(CreatureStats& casterStats, int creatureActorId) const;
 
             ///Returns the list of actors which are siding with the given actor in fights
             /**ie AiFollow or AiEscort is active and the target is the actor **/
-            std::vector<MWWorld::Ptr> getActorsSidingWith(const MWWorld::Ptr& actor, bool excludeInfighting = false);
-            std::vector<MWWorld::Ptr> getActorsFollowing(const MWWorld::Ptr& actor);
+            std::vector<MWWorld::Ptr> getActorsSidingWith(const MWWorld::Ptr& actor,
+                bool excludeInfighting = false) const;
+            std::vector<MWWorld::Ptr> getActorsFollowing(const MWWorld::Ptr& actor) const;
 
             /// Recursive version of getActorsFollowing
-            void getActorsFollowing(const MWWorld::Ptr &actor, std::set<MWWorld::Ptr>& out);
+            void getActorsFollowing(const MWWorld::Ptr &actor, std::set<MWWorld::Ptr>& out) const;
             /// Recursive version of getActorsSidingWith
-            void getActorsSidingWith(const MWWorld::Ptr &actor, std::set<MWWorld::Ptr>& out, bool excludeInfighting = false);
+            void getActorsSidingWith(const MWWorld::Ptr &actor, std::set<MWWorld::Ptr>& out,
+                bool excludeInfighting = false) const;
 
             /// Get the list of AiFollow::mFollowIndex for all actors following this target
-            std::vector<int> getActorsFollowingIndices(const MWWorld::Ptr& actor);
-            std::map<int, MWWorld::Ptr> getActorsFollowingByIndex(const MWWorld::Ptr& actor);
+            std::vector<int> getActorsFollowingIndices(const MWWorld::Ptr& actor) const;
+            std::map<int, MWWorld::Ptr> getActorsFollowingByIndex(const MWWorld::Ptr& actor) const;
 
             ///Returns the list of actors which are fighting the given actor
             /**ie AiCombat is active and the target is the actor **/
-            std::vector<MWWorld::Ptr> getActorsFighting(const MWWorld::Ptr& actor);
+            std::vector<MWWorld::Ptr> getActorsFighting(const MWWorld::Ptr& actor) const;
 
             /// Unlike getActorsFighting, also returns actors that *would* fight the given actor if they saw him.
-            std::vector<MWWorld::Ptr> getEnemiesNearby(const MWWorld::Ptr& actor);
+            std::vector<MWWorld::Ptr> getEnemiesNearby(const MWWorld::Ptr& actor) const;
 
             void write (ESM::ESMWriter& writer, Loading::Listener& listener) const;
 
@@ -189,28 +192,31 @@ namespace MWMechanics
             bool mSmoothMovement;
             MusicType mCurrentMusic = MusicType::Title;
 
-            void updateVisibility (const MWWorld::Ptr& ptr, CharacterController& ctrl);
+            void updateVisibility(const MWWorld::Ptr& ptr, CharacterController& ctrl) const;
 
-            void adjustMagicEffects (const MWWorld::Ptr& creature, float duration);
+            void adjustMagicEffects(const MWWorld::Ptr& creature, float duration) const;
 
-            void calculateRestoration (const MWWorld::Ptr& ptr, float duration);
+            void calculateRestoration(const MWWorld::Ptr& ptr, float duration) const;
 
-            void updateCrimePursuit (const MWWorld::Ptr& ptr, float duration);
+            void updateCrimePursuit(const MWWorld::Ptr& ptr, float duration) const;
 
             void killDeadActors ();
 
-            void purgeSpellEffects (int casterActorId);
+            void purgeSpellEffects(int casterActorId) const;
 
-            void predictAndAvoidCollisions(float duration);
+            void predictAndAvoidCollisions(float duration) const;
 
             /** Start combat between two actors
                 @Notes: If againstPlayer = true then actor2 should be the Player.
                         If one of the combatants is creature it should be actor1.
             */
-            void engageCombat(const MWWorld::Ptr& actor1, const MWWorld::Ptr& actor2, std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr> >& cachedAllies, bool againstPlayer);
+            void engageCombat(const MWWorld::Ptr& actor1, const MWWorld::Ptr& actor2,
+                std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr>>& cachedAllies, bool againstPlayer) const;
 
-            /// Recursive version of getActorsSidingWith that takes, adds to and returns a cache of actors mapped to their allies. Excludes infighting
-            void getActorsSidingWith(const MWWorld::Ptr &actor, std::set<MWWorld::Ptr>& out, std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr> >& cachedAllies);
+            /// Recursive version of getActorsSidingWith that takes, adds to and returns a cache of
+            /// actors mapped to their allies. Excludes infighting
+            void getActorsSidingWith(const MWWorld::Ptr &actor, std::set<MWWorld::Ptr>& out,
+                std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr>>& cachedAllies) const;
 
     };
 }

From 46138409149031bbd3d09ff6bf385531cfbaf228 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 5 Jul 2022 00:36:27 +0200
Subject: [PATCH 2751/2859] Use single implementation to check whether marker
 is hidden

---
 apps/openmw/mwlua/object.cpp | 5 +++--
 apps/openmw/mwworld/ptr.hpp  | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwlua/object.cpp b/apps/openmw/mwlua/object.cpp
index 9b51729b10..9fa1e22072 100644
--- a/apps/openmw/mwlua/object.cpp
+++ b/apps/openmw/mwlua/object.cpp
@@ -2,6 +2,8 @@
 
 #include "types/types.hpp"
 
+#include <components/misc/resourcehelpers.hpp>
+
 namespace MWLua
 {
 
@@ -12,8 +14,7 @@ namespace MWLua
 
     bool isMarker(const MWWorld::Ptr& ptr)
     {
-        std::string_view id = ptr.getCellRef().getRefId();
-        return id == "prisonmarker" || id == "divinemarker" || id == "templemarker" || id == "northmarker";
+        return Misc::ResourceHelpers::isHiddenMarker(ptr.getCellRef().getRefId());
     }
 
     std::string ptrToString(const MWWorld::Ptr& ptr)
diff --git a/apps/openmw/mwworld/ptr.hpp b/apps/openmw/mwworld/ptr.hpp
index 33e062df90..c96f936127 100644
--- a/apps/openmw/mwworld/ptr.hpp
+++ b/apps/openmw/mwworld/ptr.hpp
@@ -7,6 +7,8 @@
 #include <string_view>
 #include <sstream>
 
+#include <components/misc/resourcehelpers.hpp>
+
 #include "livecellref.hpp"
 
 namespace MWWorld
@@ -58,7 +60,7 @@ namespace MWWorld
                 std::string_view id = mRef->mRef.getRefId();
                 if (id == "player")
                     return ESM::REC_INTERNAL_PLAYER;
-                else if (id == "prisonmarker" || id == "divinemarker" || id == "templemarker" || id == "northmarker")
+                else if (Misc::ResourceHelpers::isHiddenMarker(id))
                     return ESM::REC_INTERNAL_MARKER;
                 else
                     return mRef->getType();

From 20c15b30de3ebeed2684a0c427fd1b3d77ffc0ab Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 5 Jul 2022 00:53:15 +0200
Subject: [PATCH 2752/2859] Move getLuaType out of MWWorld::PtrBase

This function is used only for Lua related code and don't need to be present
everywhere ptr.hpp is included.
---
 apps/openmw/mwlua/cellbindings.cpp   |  2 +-
 apps/openmw/mwlua/luamanagerimp.cpp  |  4 ++--
 apps/openmw/mwlua/objectbindings.cpp |  2 +-
 apps/openmw/mwlua/types/types.cpp    | 17 +++++++++++++++--
 apps/openmw/mwlua/types/types.hpp    |  7 +++++++
 apps/openmw/mwworld/ptr.hpp          | 19 -------------------
 6 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/apps/openmw/mwlua/cellbindings.cpp b/apps/openmw/mwlua/cellbindings.cpp
index 183774ebf9..5048e68b7e 100644
--- a/apps/openmw/mwlua/cellbindings.cpp
+++ b/apps/openmw/mwlua/cellbindings.cpp
@@ -62,7 +62,7 @@ namespace MWLua
                 auto visitor = [&](const MWWorld::Ptr& ptr)
                 {
                     worldView->getObjectRegistry()->registerPtr(ptr);
-                    if (ptr.getLuaType() == ptr.getType())
+                    if (getLiveCellRefType(ptr.mRef) == ptr.getType())
                         res->push_back(getId(ptr));
                     return true;
                 };
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 5854820361..f4ca54576e 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -335,7 +335,7 @@ namespace MWLua
         if (!localScripts)
         {
             LuaUtil::ScriptIdsWithInitializationData autoStartConf =
-                mConfiguration.getLocalConf(ptr.getLuaType(), ptr.getCellRef().getRefId(), getId(ptr));
+                mConfiguration.getLocalConf(getLiveCellRefType(ptr.mRef), ptr.getCellRef().getRefId(), getId(ptr));
             if (!autoStartConf.empty())
             {
                 localScripts = createLocalScripts(ptr, std::move(autoStartConf));
@@ -411,7 +411,7 @@ namespace MWLua
     {
         assert(mInitialized);
         std::shared_ptr<LocalScripts> scripts;
-        uint32_t type = ptr.getLuaType();
+        const uint32_t type = getLiveCellRefType(ptr.mRef);
         if (type == ESM::REC_STAT)
             throw std::runtime_error("Lua scripts on static objects are not allowed");
         else if (type == ESM::REC_INTERNAL_PLAYER)
diff --git a/apps/openmw/mwlua/objectbindings.cpp b/apps/openmw/mwlua/objectbindings.cpp
index 1b0436ab7f..90ce134f24 100644
--- a/apps/openmw/mwlua/objectbindings.cpp
+++ b/apps/openmw/mwlua/objectbindings.cpp
@@ -165,7 +165,7 @@ namespace MWLua
 
             objectT["type"] = sol::readonly_property([types=getTypeToPackageTable(context.mLua->sol())](const ObjectT& o) mutable
             {
-                return types[o.ptr().getLuaType()];
+                return types[getLiveCellRefType(o.ptr().mRef)];
             });
 
             objectT["count"] = sol::readonly_property([](const ObjectT& o) { return o.ptr().getRefData().getCount(); });
diff --git a/apps/openmw/mwlua/types/types.cpp b/apps/openmw/mwlua/types/types.cpp
index 31f370180a..6235216670 100644
--- a/apps/openmw/mwlua/types/types.cpp
+++ b/apps/openmw/mwlua/types/types.cpp
@@ -1,6 +1,7 @@
 #include "types.hpp"
 
 #include <components/lua/luastate.hpp>
+#include <components/misc/resourcehelpers.hpp>
 
 namespace MWLua
 {
@@ -60,6 +61,18 @@ namespace MWLua
 
     }
 
+    unsigned int getLiveCellRefType(const MWWorld::LiveCellRefBase* ref)
+    {
+        if (ref == nullptr)
+            throw std::runtime_error("Can't get type name from an empty object.");
+        const std::string_view id = ref->mRef.getRefId();
+        if (id == "player")
+            return ESM::REC_INTERNAL_PLAYER;
+        if (Misc::ResourceHelpers::isHiddenMarker(id))
+            return ESM::REC_INTERNAL_MARKER;
+        return ref->getType();
+    }
+
     std::string_view getLuaObjectTypeName(ESM::RecNameInts type, std::string_view fallback)
     {
         auto it = luaObjectTypeInfo.find(type);
@@ -71,7 +84,7 @@ namespace MWLua
 
     std::string_view getLuaObjectTypeName(const MWWorld::Ptr& ptr)
     {
-        return getLuaObjectTypeName(static_cast<ESM::RecNameInts>(ptr.getLuaType()), /*fallback=*/ptr.getTypeDescription());
+        return getLuaObjectTypeName(static_cast<ESM::RecNameInts>(getLiveCellRefType(ptr.mRef)), /*fallback=*/ptr.getTypeDescription());
     }
 
     const MWWorld::Ptr& verifyType(ESM::RecNameInts recordType, const MWWorld::Ptr& ptr)
@@ -125,7 +138,7 @@ namespace MWLua
             }
             t["objectIsInstance"] = [types=recTypes](const Object& o)
             {
-                unsigned int type = o.ptr().getLuaType();
+                unsigned int type = getLiveCellRefType(o.ptr().mRef);
                 for (ESM::RecNameInts t : types)
                     if (t == type)
                         return true;
diff --git a/apps/openmw/mwlua/types/types.hpp b/apps/openmw/mwlua/types/types.hpp
index 0f9d82a65b..c4b9b63a45 100644
--- a/apps/openmw/mwlua/types/types.hpp
+++ b/apps/openmw/mwlua/types/types.hpp
@@ -10,6 +10,13 @@
 
 namespace MWLua
 {
+    // `getLiveCellRefType()` is not exactly what we usually mean by "type" because some refids have special meaning.
+    // This function handles these special refids (and by this adds some performance overhead).
+    // We use this "fixed" type in Lua because we don't want to expose the weirdness of Morrowind internals to our API.
+    // TODO: Implement https://gitlab.com/OpenMW/openmw/-/issues/6617 and make `MWWorld::PtrBase::getType` work the
+    // same as `getLiveCellRefType`.
+    unsigned int getLiveCellRefType(const MWWorld::LiveCellRefBase* ref);
+
     std::string_view getLuaObjectTypeName(ESM::RecNameInts type, std::string_view fallback = "Unknown");
     std::string_view getLuaObjectTypeName(const MWWorld::Ptr& ptr);
     const MWWorld::Ptr& verifyType(ESM::RecNameInts type, const MWWorld::Ptr& ptr);
diff --git a/apps/openmw/mwworld/ptr.hpp b/apps/openmw/mwworld/ptr.hpp
index c96f936127..4dbdfa5545 100644
--- a/apps/openmw/mwworld/ptr.hpp
+++ b/apps/openmw/mwworld/ptr.hpp
@@ -7,8 +7,6 @@
 #include <string_view>
 #include <sstream>
 
-#include <components/misc/resourcehelpers.hpp>
-
 #include "livecellref.hpp"
 
 namespace MWWorld
@@ -49,23 +47,6 @@ namespace MWWorld
                 throw std::runtime_error("Can't get type name from an empty object.");
             }
 
-            // `getType()` is not exactly what we usually mean by "type" because some refids have special meaning.
-            // This function handles these special refids (and by this adds some performance overhead).
-            // We use this "fixed" type in Lua because we don't want to expose the weirdness of Morrowind internals to our API.
-            // TODO: Implement https://gitlab.com/OpenMW/openmw/-/issues/6617 and make `getType` work the same as `getLuaType`.
-            unsigned int getLuaType() const
-            {
-                if(mRef == nullptr)
-                    throw std::runtime_error("Can't get type name from an empty object.");
-                std::string_view id = mRef->mRef.getRefId();
-                if (id == "player")
-                    return ESM::REC_INTERNAL_PLAYER;
-                else if (Misc::ResourceHelpers::isHiddenMarker(id))
-                    return ESM::REC_INTERNAL_MARKER;
-                else
-                    return mRef->getType();
-            }
-
             std::string_view getTypeDescription() const
             {
                 return mRef ? mRef->getTypeDescription() : "nullptr";

From bef15edf0bb243f2142a22cd2069ab008699eea0 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 27 Jun 2022 21:32:46 +0200
Subject: [PATCH 2753/2859] Remove redundant ostream, istream, iostream and
 sstream includes

* Replace by std::to_string and operator+ where possible.
* Move the code requiring to include <sstream> from .hpp to .cpp files.
---
 .../detournavigator/navmeshtilescache.cpp     |  1 -
 apps/essimporter/converter.hpp                |  5 +---
 apps/opencs/model/filter/andnode.cpp          |  2 --
 apps/opencs/model/filter/ornode.cpp           |  2 --
 apps/opencs/model/tools/mergestages.cpp       |  3 --
 apps/opencs/model/tools/scriptcheck.cpp       |  2 ++
 apps/opencs/model/world/scriptcontext.cpp     |  1 +
 apps/opencs/model/world/universalid.cpp       |  6 ----
 apps/opencs/model/world/universalid.hpp       |  3 --
 .../opencs/view/render/terraintexturemode.cpp |  1 -
 apps/opencs/view/world/scripterrortable.cpp   |  2 ++
 apps/openmw/mwdialogue/dialoguemanagerimp.cpp |  1 +
 apps/openmw/mwdialogue/scripttest.cpp         |  2 ++
 apps/openmw/mwgui/journalviewmodel.cpp        |  1 -
 apps/openmw/mwgui/statswatcher.cpp            |  7 ++---
 apps/openmw/mwmechanics/character.cpp         |  2 +-
 apps/openmw/mwmechanics/npcstats.cpp          |  1 +
 apps/openmw/mwrender/ripplesimulation.cpp     |  1 +
 apps/openmw/mwscript/miscextensions.cpp       |  1 +
 apps/openmw/mwsound/ffmpeg_decoder.hpp        |  1 -
 apps/openmw/mwsound/soundmanagerimp.cpp       |  1 +
 apps/openmw/mwworld/actionequip.cpp           |  6 +---
 apps/openmw/mwworld/esmstore.hpp              |  1 -
 apps/openmw/mwworld/livecellref.cpp           | 19 ++++++++++++
 apps/openmw/mwworld/livecellref.hpp           | 30 ++++++++++++++++++-
 apps/openmw/mwworld/projectilemanager.cpp     |  3 +-
 apps/openmw/mwworld/ptr.hpp                   | 16 ++--------
 .../detournavigator/operators.hpp             |  2 --
 components/bsa/memorystream.hpp               |  2 +-
 components/compiler/scanner.cpp               |  1 +
 components/compiler/scanner.hpp               |  2 +-
 components/compiler/streamerrorhandler.hpp    |  2 --
 .../crashcatcher/windows_crashcatcher.cpp     |  1 -
 .../crashcatcher/windows_crashmonitor.cpp     |  2 --
 components/esm/format.cpp                     |  3 ++
 components/esm/format.hpp                     |  2 +-
 components/files/constrainedfilestream.hpp    |  2 +-
 components/files/hash.hpp                     |  2 +-
 components/fx/pass.hpp                        |  1 -
 components/nif/nifkey.hpp                     |  5 +---
 components/nif/node.hpp                       |  4 +--
 components/nifbullet/bulletnifloader.cpp      |  1 +
 components/shader/shadermanager.cpp           |  4 +--
 components/stereo/frustum.cpp                 |  1 -
 components/stereo/stereomanager.cpp           |  1 -
 components/terrain/chunkmanager.cpp           |  2 --
 components/vfs/registerarchives.cpp           |  6 ++--
 47 files changed, 85 insertions(+), 82 deletions(-)

diff --git a/apps/benchmarks/detournavigator/navmeshtilescache.cpp b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
index 976f7a46e1..9ee2d5d435 100644
--- a/apps/benchmarks/detournavigator/navmeshtilescache.cpp
+++ b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
@@ -5,7 +5,6 @@
 
 #include <algorithm>
 #include <random>
-#include <iostream>
 
 namespace
 {
diff --git a/apps/essimporter/converter.hpp b/apps/essimporter/converter.hpp
index ac891e78df..4ae39b0e65 100644
--- a/apps/essimporter/converter.hpp
+++ b/apps/essimporter/converter.hpp
@@ -2,7 +2,6 @@
 #define OPENMW_ESSIMPORT_CONVERTER_H
 
 #include <limits>
-#include <sstream>
 
 #include <osg/Image>
 #include <osg/ref_ptr>
@@ -544,9 +543,7 @@ public:
         }
         else
         {
-            std::stringstream error;
-            error << "Invalid weather ID:" << weatherID << std::endl;
-            throw std::runtime_error(error.str());
+            throw std::runtime_error("Invalid weather ID: " + std::to_string(weatherID));
         }
     }
 
diff --git a/apps/opencs/model/filter/andnode.cpp b/apps/opencs/model/filter/andnode.cpp
index 7578657178..508202edfc 100644
--- a/apps/opencs/model/filter/andnode.cpp
+++ b/apps/opencs/model/filter/andnode.cpp
@@ -1,7 +1,5 @@
 #include "andnode.hpp"
 
-#include <sstream>
-
 CSMFilter::AndNode::AndNode (const std::vector<std::shared_ptr<Node> >& nodes)
 : NAryNode (nodes, "and")
 {}
diff --git a/apps/opencs/model/filter/ornode.cpp b/apps/opencs/model/filter/ornode.cpp
index 9e6d8b2c46..d6abaca40b 100644
--- a/apps/opencs/model/filter/ornode.cpp
+++ b/apps/opencs/model/filter/ornode.cpp
@@ -1,7 +1,5 @@
 #include "ornode.hpp"
 
-#include <sstream>
-
 CSMFilter::OrNode::OrNode (const std::vector<std::shared_ptr<Node> >& nodes)
 : NAryNode (nodes, "or")
 {}
diff --git a/apps/opencs/model/tools/mergestages.cpp b/apps/opencs/model/tools/mergestages.cpp
index 021cf61d81..9b24f6ccf9 100644
--- a/apps/opencs/model/tools/mergestages.cpp
+++ b/apps/opencs/model/tools/mergestages.cpp
@@ -1,8 +1,5 @@
-
 #include "mergestages.hpp"
 
-#include <sstream>
-
 #include <components/misc/stringops.hpp>
 
 #include "mergestate.hpp"
diff --git a/apps/opencs/model/tools/scriptcheck.cpp b/apps/opencs/model/tools/scriptcheck.cpp
index 46a74362b0..6fa2dfcfc9 100644
--- a/apps/opencs/model/tools/scriptcheck.cpp
+++ b/apps/opencs/model/tools/scriptcheck.cpp
@@ -1,5 +1,7 @@
 #include "scriptcheck.hpp"
 
+#include <sstream>
+
 #include <components/compiler/tokenloc.hpp>
 #include <components/compiler/scanner.hpp>
 #include <components/compiler/fileparser.hpp>
diff --git a/apps/opencs/model/world/scriptcontext.cpp b/apps/opencs/model/world/scriptcontext.cpp
index 9b465d7ffb..2b6a9231b1 100644
--- a/apps/opencs/model/world/scriptcontext.cpp
+++ b/apps/opencs/model/world/scriptcontext.cpp
@@ -1,6 +1,7 @@
 #include "scriptcontext.hpp"
 
 #include <algorithm>
+#include <sstream>
 
 #include <components/misc/stringops.hpp>
 
diff --git a/apps/opencs/model/world/universalid.cpp b/apps/opencs/model/world/universalid.cpp
index 486f3770aa..1f11e21bdc 100644
--- a/apps/opencs/model/world/universalid.cpp
+++ b/apps/opencs/model/world/universalid.cpp
@@ -1,6 +1,5 @@
 #include "universalid.hpp"
 
-#include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <iostream>
@@ -405,8 +404,3 @@ bool CSMWorld::operator< (const UniversalId& left, const UniversalId& right)
 {
     return left.isLess (right);
 }
-
-std::ostream& CSMWorld::operator< (std::ostream& stream, const CSMWorld::UniversalId& universalId)
-{
-    return stream << universalId.toString();
-}
diff --git a/apps/opencs/model/world/universalid.hpp b/apps/opencs/model/world/universalid.hpp
index accd1b78da..09fd8f3bb9 100644
--- a/apps/opencs/model/world/universalid.hpp
+++ b/apps/opencs/model/world/universalid.hpp
@@ -2,7 +2,6 @@
 #define CSM_WOLRD_UNIVERSALID_H
 
 #include <string>
-#include <iosfwd>
 #include <vector>
 
 #include <QMetaType>
@@ -199,8 +198,6 @@ namespace CSMWorld
     bool operator!= (const UniversalId& left, const UniversalId& right);
 
     bool operator< (const UniversalId& left, const UniversalId& right);
-
-    std::ostream& operator< (std::ostream& stream, const UniversalId& universalId);
 }
 
 Q_DECLARE_METATYPE (CSMWorld::UniversalId)
diff --git a/apps/opencs/view/render/terraintexturemode.cpp b/apps/opencs/view/render/terraintexturemode.cpp
index 20467e9514..3127306522 100644
--- a/apps/opencs/view/render/terraintexturemode.cpp
+++ b/apps/opencs/view/render/terraintexturemode.cpp
@@ -1,7 +1,6 @@
 #include "terraintexturemode.hpp"
 
 #include <string>
-#include <sstream>
 
 #include <QWidget>
 #include <QIcon>
diff --git a/apps/opencs/view/world/scripterrortable.cpp b/apps/opencs/view/world/scripterrortable.cpp
index 45809b28c6..a331820a2b 100644
--- a/apps/opencs/view/world/scripterrortable.cpp
+++ b/apps/opencs/view/world/scripterrortable.cpp
@@ -1,5 +1,7 @@
 #include "scripterrortable.hpp"
 
+#include <sstream>
+
 #include <QHeaderView>
 
 #include <components/compiler/tokenloc.hpp>
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index e0b88bba12..a8ea3fdf02 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -2,6 +2,7 @@
 
 #include <algorithm>
 #include <list>
+#include <sstream>
 
 #include <components/debug/debuglog.hpp>
 
diff --git a/apps/openmw/mwdialogue/scripttest.cpp b/apps/openmw/mwdialogue/scripttest.cpp
index c3d7b12c7d..1b192aec15 100644
--- a/apps/openmw/mwdialogue/scripttest.cpp
+++ b/apps/openmw/mwdialogue/scripttest.cpp
@@ -19,6 +19,8 @@
 
 #include "filter.hpp"
 
+#include <sstream>
+
 namespace
 {
 
diff --git a/apps/openmw/mwgui/journalviewmodel.cpp b/apps/openmw/mwgui/journalviewmodel.cpp
index fc3fcc3efe..1d1c954d8a 100644
--- a/apps/openmw/mwgui/journalviewmodel.cpp
+++ b/apps/openmw/mwgui/journalviewmodel.cpp
@@ -1,7 +1,6 @@
 #include "journalviewmodel.hpp"
 
 #include <map>
-#include <sstream>
 
 #include <MyGUI_LanguageManager.h>
 
diff --git a/apps/openmw/mwgui/statswatcher.cpp b/apps/openmw/mwgui/statswatcher.cpp
index ccb77de8f2..883fd265cc 100644
--- a/apps/openmw/mwgui/statswatcher.cpp
+++ b/apps/openmw/mwgui/statswatcher.cpp
@@ -11,6 +11,8 @@
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/inventorystore.hpp"
 
+#include <string>
+
 namespace MWGui
 {
     // mWatchedTimeToStartDrowning = -1 for correct drowning state check,
@@ -36,11 +38,8 @@ namespace MWGui
         {
             if (stats.getAttribute(i) != mWatchedAttributes[i] || mWatchedStatsEmpty)
             {
-                std::stringstream attrname;
-                attrname << "AttribVal"<<(i+1);
-
                 mWatchedAttributes[i] = stats.getAttribute(i);
-                setValue(attrname.str(), stats.getAttribute(i));
+                setValue("AttribVal" + std::to_string(i + 1), stats.getAttribute(i));
             }
         }
 
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 7ea3b9a205..9005d26975 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -19,7 +19,7 @@
 
 #include "character.hpp"
 
-#include <iostream>
+#include <sstream>
 
 #include <components/misc/mathutil.hpp>
 #include <components/misc/rng.hpp>
diff --git a/apps/openmw/mwmechanics/npcstats.cpp b/apps/openmw/mwmechanics/npcstats.cpp
index ef49381eff..34dcbb79a4 100644
--- a/apps/openmw/mwmechanics/npcstats.cpp
+++ b/apps/openmw/mwmechanics/npcstats.cpp
@@ -1,6 +1,7 @@
 #include "npcstats.hpp"
 
 #include <iomanip>
+#include <sstream>
 
 #include <components/esm3/loadclas.hpp>
 #include <components/esm3/loadgmst.hpp>
diff --git a/apps/openmw/mwrender/ripplesimulation.cpp b/apps/openmw/mwrender/ripplesimulation.cpp
index 5aa7c29154..037ed4455f 100644
--- a/apps/openmw/mwrender/ripplesimulation.cpp
+++ b/apps/openmw/mwrender/ripplesimulation.cpp
@@ -1,6 +1,7 @@
 #include "ripplesimulation.hpp"
 
 #include <iomanip>
+#include <sstream>
 
 #include <osg/PolygonOffset>
 #include <osg/Texture2D>
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index f641f0ee4b..b84cc6b222 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -3,6 +3,7 @@
 #include <cstdlib>
 #include <iomanip>
 #include <chrono>
+#include <sstream>
 
 #include <components/compiler/extensions.hpp>
 #include <components/compiler/opcodes.hpp>
diff --git a/apps/openmw/mwsound/ffmpeg_decoder.hpp b/apps/openmw/mwsound/ffmpeg_decoder.hpp
index c57740ff55..0af9a77d98 100644
--- a/apps/openmw/mwsound/ffmpeg_decoder.hpp
+++ b/apps/openmw/mwsound/ffmpeg_decoder.hpp
@@ -27,7 +27,6 @@ extern "C"
 #include <components/files/constrainedfilestream.hpp>
 
 #include <string>
-#include <istream>
 
 #include "sound_decoder.hpp"
 
diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index b9baee7223..3ee76326f4 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -3,6 +3,7 @@
 #include <algorithm>
 #include <map>
 #include <numeric>
+#include <sstream>
 
 #include <osg/Matrixf>
 
diff --git a/apps/openmw/mwworld/actionequip.cpp b/apps/openmw/mwworld/actionequip.cpp
index 92cd044386..8ce3a130ab 100644
--- a/apps/openmw/mwworld/actionequip.cpp
+++ b/apps/openmw/mwworld/actionequip.cpp
@@ -65,11 +65,7 @@ namespace MWWorld
         }
 
         if (it == invStore.end())
-        {
-            std::stringstream error;
-            error << "ActionEquip can't find item " << object.getCellRef().getRefId();
-            throw std::runtime_error(error.str());
-        }
+            throw std::runtime_error("ActionEquip can't find item " + object.getCellRef().getRefId());
 
         // equip the item in the first free slot
         std::vector<int>::const_iterator slot=slots_.first.begin();
diff --git a/apps/openmw/mwworld/esmstore.hpp b/apps/openmw/mwworld/esmstore.hpp
index dd0be016c2..defefccb9c 100644
--- a/apps/openmw/mwworld/esmstore.hpp
+++ b/apps/openmw/mwworld/esmstore.hpp
@@ -2,7 +2,6 @@
 #define OPENMW_MWWORLD_ESMSTORE_H
 
 #include <memory>
-#include <sstream>
 #include <stdexcept>
 #include <unordered_map>
 
diff --git a/apps/openmw/mwworld/livecellref.cpp b/apps/openmw/mwworld/livecellref.cpp
index ad9cdabb38..53c936564b 100644
--- a/apps/openmw/mwworld/livecellref.cpp
+++ b/apps/openmw/mwworld/livecellref.cpp
@@ -1,5 +1,7 @@
 #include "livecellref.hpp"
 
+#include <sstream>
+
 #include <components/debug/debuglog.hpp>
 #include <components/esm3/objectstate.hpp>
 
@@ -78,3 +80,20 @@ unsigned int MWWorld::LiveCellRefBase::getType() const
 {
     return mClass->getType();
 }
+
+namespace MWWorld
+{
+    std::string makeDynamicCastErrorMessage(const LiveCellRefBase* value, std::string_view recordType)
+    {
+        std::stringstream message;
+
+        message << "Bad LiveCellRef cast to " << recordType << " from ";
+
+        if (value != nullptr)
+            message << value->getTypeDescription();
+        else
+            message << "an empty object";
+
+        return message.str();
+    }
+}
diff --git a/apps/openmw/mwworld/livecellref.hpp b/apps/openmw/mwworld/livecellref.hpp
index 1ead0395fd..bee6f2ba57 100644
--- a/apps/openmw/mwworld/livecellref.hpp
+++ b/apps/openmw/mwworld/livecellref.hpp
@@ -5,6 +5,8 @@
 
 #include "refdata.hpp"
 
+#include <stdexcept>
+
 namespace ESM
 {
     struct ObjectState;
@@ -16,6 +18,9 @@ namespace MWWorld
     class ESMStore;
     class Class;
 
+    template <typename X>
+    struct LiveCellRef;
+
     /// Used to create pointers to hold any type of LiveCellRef<> object.
     struct LiveCellRefBase
     {
@@ -46,6 +51,12 @@ namespace MWWorld
         unsigned int getType() const;
         ///< @see MWWorld::Class::getType
 
+        template <class T>
+        static const LiveCellRef<T>* dynamicCast(const LiveCellRefBase* value);
+
+        template <class T>
+        static LiveCellRef<T>* dynamicCast(LiveCellRefBase* value);
+
         protected:
 
             void loadImp (const ESM::ObjectState& state);
@@ -70,6 +81,24 @@ namespace MWWorld
         return cellRef.mRef.getRefNum()==refNum;
     }
 
+    std::string makeDynamicCastErrorMessage(const LiveCellRefBase* value, std::string_view recordType);
+
+    template <class T>
+    const LiveCellRef<T>* LiveCellRefBase::dynamicCast(const LiveCellRefBase* value)
+    {
+        if (const LiveCellRef<T>* ref = dynamic_cast<const LiveCellRef<T>*>(value))
+            return ref;
+        throw std::runtime_error(makeDynamicCastErrorMessage(value, T::getRecordType()));
+    }
+
+    template <class T>
+    LiveCellRef<T>* LiveCellRefBase::dynamicCast(LiveCellRefBase* value)
+    {
+        if (LiveCellRef<T>* ref = dynamic_cast<LiveCellRef<T>*>(value))
+            return ref;
+        throw std::runtime_error(makeDynamicCastErrorMessage(value, T::getRecordType()));
+    }
+
     /// A reference to one object (of any type) in a cell.
     ///
     /// Constructing this with a CellRef instance in the constructor means that
@@ -125,7 +154,6 @@ namespace MWWorld
     {
         return checkStateImp (state);
     }
-
 }
 
 #endif
diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index 6ede604eea..3894569682 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -1,9 +1,10 @@
 #include "projectilemanager.hpp"
 
 #include <iomanip>
-
+#include <sstream>
 #include <memory>
 #include <optional>
+
 #include <osg/PositionAttitudeTransform>
 
 #include <components/debug/debuglog.hpp>
diff --git a/apps/openmw/mwworld/ptr.hpp b/apps/openmw/mwworld/ptr.hpp
index 33e062df90..af5a632a98 100644
--- a/apps/openmw/mwworld/ptr.hpp
+++ b/apps/openmw/mwworld/ptr.hpp
@@ -5,7 +5,6 @@
 #include <type_traits>
 #include <string>
 #include <string_view>
-#include <sstream>
 
 #include "livecellref.hpp"
 
@@ -76,19 +75,8 @@ namespace MWWorld
                 throw std::runtime_error("Cannot get class of an empty object");
             }
 
-            template<typename T>
-            TypeTransform<MWWorld::LiveCellRef<T>> *get() const
-            {
-                TypeTransform<MWWorld::LiveCellRef<T>> *ref = dynamic_cast<TypeTransform<MWWorld::LiveCellRef<T>>*>(mRef);
-                if(ref) return ref;
-
-                std::stringstream str;
-                str<< "Bad LiveCellRef cast to "<<T::getRecordType()<<" from ";
-                if(mRef != nullptr) str<< getTypeDescription();
-                else str<< "an empty object";
-
-                throw std::runtime_error(str.str());
-            }
+            template <class T>
+            auto* get() const { return LiveCellRefBase::dynamicCast<T>(mRef); }
 
             LiveCellRefBaseType *getBase() const
             {
diff --git a/apps/openmw_test_suite/detournavigator/operators.hpp b/apps/openmw_test_suite/detournavigator/operators.hpp
index 60e1400764..c2d9424db2 100644
--- a/apps/openmw_test_suite/detournavigator/operators.hpp
+++ b/apps/openmw_test_suite/detournavigator/operators.hpp
@@ -6,9 +6,7 @@
 
 #include <deque>
 #include <iomanip>
-#include <iostream>
 #include <limits>
-#include <sstream>
 
 #include <gtest/gtest.h>
 
diff --git a/components/bsa/memorystream.hpp b/components/bsa/memorystream.hpp
index 0b7e0da9e2..f36f1e23f4 100644
--- a/components/bsa/memorystream.hpp
+++ b/components/bsa/memorystream.hpp
@@ -27,7 +27,7 @@
 #define BSA_MEMORY_STREAM_H
 
 #include <vector>
-#include <iostream>
+#include <istream>
 #include <components/files/memorystream.hpp>
 
 namespace Bsa
diff --git a/components/compiler/scanner.cpp b/components/compiler/scanner.cpp
index 6cf2d6e7c0..161de1bb76 100644
--- a/components/compiler/scanner.cpp
+++ b/components/compiler/scanner.cpp
@@ -1,6 +1,7 @@
 #include "scanner.hpp"
 
 #include <cassert>
+#include <sstream>
 
 #include "exception.hpp"
 #include "errorhandler.hpp"
diff --git a/components/compiler/scanner.hpp b/components/compiler/scanner.hpp
index 7a77811f2a..7c80f622ee 100644
--- a/components/compiler/scanner.hpp
+++ b/components/compiler/scanner.hpp
@@ -5,7 +5,7 @@
 #include <string>
 #include <iosfwd>
 #include <vector>
-#include <sstream>
+#include <istream>
 
 #include "tokenloc.hpp"
 
diff --git a/components/compiler/streamerrorhandler.hpp b/components/compiler/streamerrorhandler.hpp
index ad34166953..f70c64d25d 100644
--- a/components/compiler/streamerrorhandler.hpp
+++ b/components/compiler/streamerrorhandler.hpp
@@ -1,8 +1,6 @@
 #ifndef COMPILER_STREAMERRORHANDLER_H_INCLUDED
 #define COMPILER_STREAMERRORHANDLER_H_INCLUDED
 
-#include <ostream>
-
 #include "errorhandler.hpp"
 
 namespace Compiler
diff --git a/components/crashcatcher/windows_crashcatcher.cpp b/components/crashcatcher/windows_crashcatcher.cpp
index e9eb60e845..d31fdac578 100644
--- a/components/crashcatcher/windows_crashcatcher.cpp
+++ b/components/crashcatcher/windows_crashcatcher.cpp
@@ -2,7 +2,6 @@
 
 #include <cassert>
 #include <cwchar>
-#include <iostream>
 #include <sstream>
 #include <thread>
 
diff --git a/components/crashcatcher/windows_crashmonitor.cpp b/components/crashcatcher/windows_crashmonitor.cpp
index 2693f7681d..e76e8897e1 100644
--- a/components/crashcatcher/windows_crashmonitor.cpp
+++ b/components/crashcatcher/windows_crashmonitor.cpp
@@ -5,9 +5,7 @@
 
 #include <DbgHelp.h>
 
-#include <iostream>
 #include <memory>
-#include <sstream>
 #include <thread>
 
 #include <SDL_messagebox.h>
diff --git a/components/esm/format.cpp b/components/esm/format.cpp
index b41d81d57d..7ed109a580 100644
--- a/components/esm/format.cpp
+++ b/components/esm/format.cpp
@@ -2,6 +2,9 @@
 
 #include <components/esm/esmcommon.hpp>
 
+#include <istream>
+#include <stdexcept>
+
 namespace ESM
 {
     namespace
diff --git a/components/esm/format.hpp b/components/esm/format.hpp
index acd93b4075..6bb5e270c1 100644
--- a/components/esm/format.hpp
+++ b/components/esm/format.hpp
@@ -4,7 +4,7 @@
 #include "defs.hpp"
 
 #include <cstdint>
-#include <istream>
+#include <iosfwd>
 #include <string_view>
 
 namespace ESM
diff --git a/components/files/constrainedfilestream.hpp b/components/files/constrainedfilestream.hpp
index bed4242ec4..c32c719f22 100644
--- a/components/files/constrainedfilestream.hpp
+++ b/components/files/constrainedfilestream.hpp
@@ -4,7 +4,7 @@
 #include "constrainedfilestreambuf.hpp"
 #include "streamwithbuffer.hpp"
 
-#include <istream>
+#include <iosfwd>
 #include <memory>
 #include <limits>
 #include <string>
diff --git a/components/files/hash.hpp b/components/files/hash.hpp
index 13d56d5824..a39961e4d5 100644
--- a/components/files/hash.hpp
+++ b/components/files/hash.hpp
@@ -3,7 +3,7 @@
 
 #include <array>
 #include <cstdint>
-#include <istream>
+#include <iosfwd>
 #include <string>
 
 namespace Files
diff --git a/components/fx/pass.hpp b/components/fx/pass.hpp
index 7f2e643c8c..829fb716cf 100644
--- a/components/fx/pass.hpp
+++ b/components/fx/pass.hpp
@@ -3,7 +3,6 @@
 
 #include <array>
 #include <string>
-#include <sstream>
 #include <cstdint>
 #include <unordered_set>
 #include <optional>
diff --git a/components/nif/nifkey.hpp b/components/nif/nifkey.hpp
index 7736ab7ad9..bcf186f333 100644
--- a/components/nif/nifkey.hpp
+++ b/components/nif/nifkey.hpp
@@ -5,7 +5,6 @@
 
 #include "nifstream.hpp"
 
-#include <sstream>
 #include <map>
 
 #include "niffile.hpp"
@@ -103,9 +102,7 @@ struct KeyMapT {
         }
         else if (count != 0)
         {
-            std::stringstream error;
-            error << "Unhandled interpolation type: " << mInterpolationType;
-            nif->file->fail(error.str());
+            nif->file->fail("Unhandled interpolation type: " + std::to_string(mInterpolationType));
         }
 
         if (morph && nif->getVersion() > NIFStream::generateVersion(10,1,0,0))
diff --git a/components/nif/node.hpp b/components/nif/node.hpp
index 725511e997..29c0f03e78 100644
--- a/components/nif/node.hpp
+++ b/components/nif/node.hpp
@@ -130,9 +130,7 @@ struct NiBoundingVolume
             }
             default:
             {
-                std::stringstream error;
-                error << "Unhandled NiBoundingVolume type: " << type;
-                nif->file->fail(error.str());
+                nif->file->fail("Unhandled NiBoundingVolume type: " + std::to_string(type));
             }
         }
     }
diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index ec86e2ccb5..424a45d65a 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -3,6 +3,7 @@
 #include <cassert>
 #include <vector>
 #include <variant>
+#include <sstream>
 
 #include <BulletCollision/CollisionShapes/btBoxShape.h>
 #include <BulletCollision/CollisionShapes/btTriangleMesh.h>
diff --git a/components/shader/shadermanager.cpp b/components/shader/shadermanager.cpp
index 97162a8986..8136bab447 100644
--- a/components/shader/shadermanager.cpp
+++ b/components/shader/shadermanager.cpp
@@ -4,12 +4,10 @@
 #include <algorithm>
 #include <sstream>
 #include <regex>
+#include <filesystem>
 
 #include <osg/Program>
 
-#include <filesystem>
-#include <fstream>
-
 #include <components/debug/debuglog.hpp>
 #include <components/misc/stringops.hpp>
 #include <components/settings/settings.hpp>
diff --git a/components/stereo/frustum.cpp b/components/stereo/frustum.cpp
index 81fd022f58..93c217cd86 100644
--- a/components/stereo/frustum.cpp
+++ b/components/stereo/frustum.cpp
@@ -13,7 +13,6 @@
 #include <osgViewer/Renderer>
 #include <osgViewer/Viewer>
 
-#include <iostream>
 #include <map>
 #include <string>
 
diff --git a/components/stereo/stereomanager.cpp b/components/stereo/stereomanager.cpp
index 829cb6cc9c..7964c5c134 100644
--- a/components/stereo/stereomanager.cpp
+++ b/components/stereo/stereomanager.cpp
@@ -14,7 +14,6 @@
 #include <osgViewer/Renderer>
 #include <osgViewer/Viewer>
 
-#include <iostream>
 #include <map>
 #include <string>
 
diff --git a/components/terrain/chunkmanager.cpp b/components/terrain/chunkmanager.cpp
index badca42977..ae4fd339aa 100644
--- a/components/terrain/chunkmanager.cpp
+++ b/components/terrain/chunkmanager.cpp
@@ -1,7 +1,5 @@
 #include "chunkmanager.hpp"
 
-#include <sstream>
-
 #include <osg/Texture2D>
 #include <osg/Material>
 
diff --git a/components/vfs/registerarchives.cpp b/components/vfs/registerarchives.cpp
index 9e1b13fede..ebe2683edd 100644
--- a/components/vfs/registerarchives.cpp
+++ b/components/vfs/registerarchives.cpp
@@ -1,8 +1,8 @@
 #include "registerarchives.hpp"
 
 #include <set>
-#include <sstream>
 #include <filesystem>
+#include <stdexcept>
 
 #include <components/debug/debuglog.hpp>
 
@@ -33,9 +33,7 @@ namespace VFS
             }
             else
             {
-                std::stringstream message;
-                message << "Archive '" << *archive << "' not found";
-                throw std::runtime_error(message.str());
+                throw std::runtime_error("Archive '" + *archive + "' not found");
             }
         }
 

From 7bed2208e9f0a7cb2ba78a7286e5d472e336a949 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Mon, 4 Jul 2022 18:28:29 -0700
Subject: [PATCH 2754/2859] only force ppl on particles with normal maps

---
 components/shader/shadervisitor.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index fdcabedeb2..5f7225c6fc 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -627,10 +627,10 @@ namespace Shader
         bool simpleLighting = false;
         node.getUserValue("simpleLighting", simpleLighting);
         if (simpleLighting)
-        {
-            defineMap["forcePPL"] = "1";
             defineMap["endLight"] = "0";
-        }
+
+        if (simpleLighting || dynamic_cast<osgParticle::ParticleSystem*>(&node))
+            defineMap["forcePPL"] = "0";
 
         if (reqs.mAlphaBlend && mSupportsNormalsRT)
         {

From aed0da46a985ad924c0e3677cb4a379eb56d86dd Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Tue, 5 Jul 2022 17:19:29 +0400
Subject: [PATCH 2755/2859] Check a result of dynamic_cast

---
 apps/openmw/mwrender/pingpongcull.cpp | 2 ++
 components/fx/stateupdater.cpp        | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/pingpongcull.cpp b/apps/openmw/mwrender/pingpongcull.cpp
index ad1e7ab940..c3affa531a 100644
--- a/apps/openmw/mwrender/pingpongcull.cpp
+++ b/apps/openmw/mwrender/pingpongcull.cpp
@@ -39,6 +39,8 @@ namespace MWRender
         size_t frameId = frame % 2;
 
         MWRender::PostProcessor* postProcessor = dynamic_cast<MWRender::PostProcessor*>(cv->getCurrentCamera()->getUserData());
+        if (!postProcessor)
+            throw std::runtime_error("PingPongCull: failed to get a PostProcessor!");
 
         if (Stereo::getStereo())
         {
diff --git a/components/fx/stateupdater.cpp b/components/fx/stateupdater.cpp
index 36362e07a4..00034b54f0 100644
--- a/components/fx/stateupdater.cpp
+++ b/components/fx/stateupdater.cpp
@@ -40,6 +40,8 @@ namespace fx
         if (mUseUBO)
         {
             osg::UniformBufferBinding* ubb = dynamic_cast<osg::UniformBufferBinding*>(stateset->getAttribute(osg::StateAttribute::UNIFORMBUFFERBINDING, static_cast<int>(Resource::SceneManager::UBOBinding::PostProcessor)));
+            if (!ubb)
+                throw std::runtime_error("StateUpdater::apply: failed to get an UniformBufferBinding!");
 
             auto& dest = static_cast<osg::BufferTemplate<UniformData::BufferType>*>(ubb->getBufferData())->getData();
             mData.copyTo(dest);
@@ -60,4 +62,4 @@ namespace fx
         if (mPointLightBuffer)
             mPointLightBuffer->applyUniforms(nv->getTraversalNumber(), stateset);
     }
-}
\ No newline at end of file
+}

From 38042fd7a247213bcb08eb7a7046a38b143b2ae7 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Tue, 5 Jul 2022 17:19:47 +0400
Subject: [PATCH 2756/2859] Init missing variables

---
 apps/essimporter/importacdt.cpp  | 2 ++
 apps/openmw/mwworld/store.cpp    | 4 ++++
 apps/openmw/mwworld/worldimp.cpp | 1 +
 components/fx/widgets.hpp        | 6 ++----
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/apps/essimporter/importacdt.cpp b/apps/essimporter/importacdt.cpp
index 69760a6bdb..bab9b7b6b9 100644
--- a/apps/essimporter/importacdt.cpp
+++ b/apps/essimporter/importacdt.cpp
@@ -9,6 +9,8 @@ namespace ESSImport
 
     void ActorData::load(ESM::ESMReader &esm)
     {
+        blank();
+
         if (esm.isNextSub("ACTN"))
         {
             /*
diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index 9d6e11f141..794b87bdfd 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -528,6 +528,10 @@ namespace MWWorld
         newCell.mAmbi.mSunlight = 0;
         newCell.mAmbi.mFog = 0;
         newCell.mAmbi.mFogDensity = 0;
+        newCell.mCellId.mPaged = true;
+        newCell.mCellId.mIndex.mX = x;
+        newCell.mCellId.mIndex.mY = y;
+
         return &mExt.insert(std::make_pair(key, newCell)).first->second;
     }
     const ESM::Cell *Store<ESM::Cell>::find(const std::string &id) const
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 66e2dfa69c..1f5532655d 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -460,6 +460,7 @@ namespace MWWorld
                 ESM::GameSetting record;
                 record.mId = params.first;
                 record.mValue = params.second;
+                record.mRecordFlags = 0;
                 mStore.insertStatic(record);
             }
         }
diff --git a/components/fx/widgets.hpp b/components/fx/widgets.hpp
index 67f7883a67..061bd2d959 100644
--- a/components/fx/widgets.hpp
+++ b/components/fx/widgets.hpp
@@ -76,8 +76,6 @@ namespace fx
             MYGUI_RTTI_DERIVED(EditNumber)
 
         public:
-            EditNumber() : mLastPointerX(0) {}
-
             void setValue(T value)
             {
                 mValue = value;
@@ -241,9 +239,9 @@ namespace fx
             MyGUI::Widget* mDragger{nullptr};
             MyGUI::Widget* mFill{nullptr};
             MyGUI::TextBox* mValueLabel{nullptr};
-            T mValue;
+            T mValue{};
 
-            int mLastPointerX;
+            int mLastPointerX{0};
         };
 
         class EditNumberFloat4 : public EditNumber<float, osg::Vec4f> { MYGUI_RTTI_DERIVED(EditNumberFloat4) };

From f8f2e00ecaf25398653934b103087cd40b6f722a Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Tue, 5 Jul 2022 17:44:22 +0000
Subject: [PATCH 2757/2859] Fix mouse clicking with sdl2 2.0.22

---
 CI/before_script.msvc.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index a2bc4bd9d3..e4c4c5620d 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -593,9 +593,9 @@ if [ -z $SKIP_DOWNLOAD ]; then
 	fi
 
 	# SDL2
-	download "SDL 2.0.18" \
-		"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/SDL2-2.0.18.zip" \
-		"SDL2-2.0.18.zip"
+	download "SDL 2.0.22" \
+		"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/SDL2-2.0.22.zip" \
+		"SDL2-2.0.22.zip"
 
 	# LZ4
 	download "LZ4 1.9.2" \
@@ -941,17 +941,17 @@ fi
 cd $DEPS
 echo
 # SDL2
-printf "SDL 2.0.18... "
+printf "SDL 2.0.22... "
 {
-	if [ -d SDL2-2.0.18 ]; then
+	if [ -d SDL2-2.0.22 ]; then
 		printf "Exists. "
 	elif [ -z $SKIP_EXTRACT ]; then
-		rm -rf SDL2-2.0.18
-		eval 7z x -y SDL2-2.0.18.zip $STRIP
+		rm -rf SDL2-2.0.22
+		eval 7z x -y SDL2-2.0.22.zip $STRIP
 	fi
-	export SDL2DIR="$(real_pwd)/SDL2-2.0.18"
+	export SDL2DIR="$(real_pwd)/SDL2-2.0.22"
 	for config in ${CONFIGURATIONS[@]}; do
-		add_runtime_dlls $config "$(pwd)/SDL2-2.0.18/lib/x${ARCHSUFFIX}/SDL2.dll"
+		add_runtime_dlls $config "$(pwd)/SDL2-2.0.22/lib/x${ARCHSUFFIX}/SDL2.dll"
 	done
 	echo Done.
 }

From 0954597fa7a8a225a8f27995cb9e92b641751d22 Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Tue, 5 Jul 2022 11:00:28 -0700
Subject: [PATCH 2758/2859] fix typo with wrong flags in particle nifloader

---
 components/nif/controller.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/nif/controller.hpp b/components/nif/controller.hpp
index ca31307b2d..a3df63f913 100644
--- a/components/nif/controller.hpp
+++ b/components/nif/controller.hpp
@@ -82,7 +82,7 @@ struct NiParticleSystemController : public Controller
     void read(NIFStream *nif) override;
     void post(NIFFile *nif) override;
 
-    bool noAutoAdjust() const { return flags & EmitFlag_NoAutoAdjust; }
+    bool noAutoAdjust() const { return emitFlags & EmitFlag_NoAutoAdjust; }
     bool emitAtVertex() const { return flags & BSPArrayController_AtVertex; }
 };
 using NiBSPArrayController = NiParticleSystemController;

From cec707e994891380e62a7d8d8153ee24cce9459a Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Tue, 5 Jul 2022 18:29:21 +0000
Subject: [PATCH 2759/2859] No attack animation while blocking fix

---
 apps/openmw/mwmechanics/character.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 9005d26975..a3cba855eb 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -360,7 +360,7 @@ void CharacterController::refreshHitRecoilAnims()
     else if (block)
     {
         mHitState = CharState_Block;
-        priority = Priority_Block;
+        priority = Priority_Hit;
         priority[MWRender::Animation::BoneGroup_LeftArm] = Priority_Block;
         priority[MWRender::Animation::BoneGroup_LowerBody] = Priority_WeaponLowerBody;
         startKey = "block start";

From 89bc75673205d1abcd4d9803cdc097702104876f Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Tue, 5 Jul 2022 23:47:23 -0700
Subject: [PATCH 2760/2859] tmp_sun_fix

---
 files/shaders/sky_fragment.glsl | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/files/shaders/sky_fragment.glsl b/files/shaders/sky_fragment.glsl
index cfa3650c02..e12614c082 100644
--- a/files/shaders/sky_fragment.glsl
+++ b/files/shaders/sky_fragment.glsl
@@ -49,21 +49,20 @@ void paintSun(inout vec4 color)
     color.a *= gl_FrontMaterial.diffuse.a;
 }
 
-void paintSunflashQuery(inout vec4 color)
-{
-    const float threshold = 0.8;
-
-    color = texture2D(diffuseMap, diffuseMapUV);
-    if (color.a <= threshold)
-        discard;
-}
-
 void paintSunglare(inout vec4 color)
 {
     color = gl_FrontMaterial.emission;
     color.a = gl_FrontMaterial.diffuse.a;
 }
 
+void processSunflashQuery()
+{
+    const float threshold = 0.8;
+
+    if (texture2D(diffuseMap, diffuseMapUV).a <= threshold)
+        discard;
+}
+
 void main()
 {
     vec4 color = vec4(0.0);
@@ -78,10 +77,12 @@ void main()
         paintMoon(color);
     else if (pass == PASS_SUN)
         paintSun(color);
-    else if (pass == PASS_SUNFLASH_QUERY)
-        paintSunflashQuery(color);
     else if (pass == PASS_SUNGLARE)
         paintSunglare(color);
+    else if (pass == PASS_SUNFLASH_QUERY) {
+        processSunflashQuery();
+        return;
+    }
 
     gl_FragData[0] = color;
 }

From 94ea3e3a23c357e977c0e2109de04ee0e07944a0 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Wed, 6 Jul 2022 07:54:23 +0000
Subject: [PATCH 2761/2859] disable android's install step to work around no
 space left

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 67898dc0af..20163db409 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -584,7 +584,7 @@ Ubuntu_AndroidNDK_arm64-v8a:
     - CI/before_script.android.sh
     - cd build
     - cmake --build . -- -j $(nproc)
-    - cmake --install .
+    - # cmake --install .  # no one uses builds anyway, disable until 'no space left' is resolved
     - ccache -s
     - df -h
     - ls | grep -v -e '^extern$' -e '^install$' | xargs -I '{}' rm -rf './{}'

From 9519764a746d24b394a8d05ba1594326e97eeb30 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Wed, 6 Jul 2022 07:56:31 +0000
Subject: [PATCH 2762/2859] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 20163db409..90e81b2839 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -584,7 +584,7 @@ Ubuntu_AndroidNDK_arm64-v8a:
     - CI/before_script.android.sh
     - cd build
     - cmake --build . -- -j $(nproc)
-    - # cmake --install .  # no one uses builds anyway, disable until 'no space left' is resolved
+    # - cmake --install .  # no one uses builds anyway, disable until 'no space left' is resolved
     - ccache -s
     - df -h
     - ls | grep -v -e '^extern$' -e '^install$' | xargs -I '{}' rm -rf './{}'

From b2cf0918f5c37aa59ee1472fd2da28fcc8675b00 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Wed, 6 Jul 2022 08:41:54 +0000
Subject: [PATCH 2763/2859] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 90e81b2839..71cab73fee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -591,7 +591,7 @@ Ubuntu_AndroidNDK_arm64-v8a:
     - cd ..
     - df -h
     - du -sh build/
-    - du -sh build/install/
+    # - du -sh build/install/ # no install dir because it's commented out above
     - du -sh apt-cache/
     - du -sh ccache/
     - du -sh build/extern/fetched/

From 95a6fa8d0c09c45883fe0c5edda19d307a2f9b0e Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Wed, 6 Jul 2022 10:48:22 +0000
Subject: [PATCH 2764/2859] DeathKnockOut when KnockOut...

---
 apps/openmw/mwmechanics/character.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index a3cba855eb..f4df570a06 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -96,7 +96,7 @@ MWMechanics::CharacterState hitStateToDeathState (MWMechanics::CharacterState st
         case CharState_SwimKnockDown: return CharState_SwimDeathKnockDown;
         case CharState_SwimKnockOut: return CharState_SwimDeathKnockOut;
         case CharState_KnockDown: return CharState_DeathKnockDown;
-        case CharState_DeathKnockOut: return CharState_DeathKnockOut;
+        case CharState_KnockOut: return CharState_DeathKnockOut;
         default: return CharState_None;
     }
 }

From f1ded70366cb8a3a724ebd61bb3092fabb9a986f Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 6 Jul 2022 12:45:03 +0200
Subject: [PATCH 2765/2859] Remove redundant condition

apps/openmw/mwmechanics/character.cpp:500:14: warning: redundant condition 'isRealWeapon' [bugprone-redundant-branch-condition]
        else if (isRealWeapon)
             ^~~~~~~~~~~~~~~~~
---
 apps/openmw/mwmechanics/character.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index f4df570a06..be46f3c06d 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -243,6 +243,13 @@ float getFallDamage(const MWWorld::Ptr& ptr, float fallHeight)
     return 0.f;
 }
 
+bool isRealWeapon(int weaponType)
+{
+    return weaponType != ESM::Weapon::HandToHand
+        && weaponType != ESM::Weapon::Spell
+        && weaponType != ESM::Weapon::None;
+}
+
 }
 
 namespace MWMechanics
@@ -486,8 +493,7 @@ void CharacterController::onClose() const
 std::string CharacterController::getWeaponAnimation(int weaponType) const
 {
     std::string weaponGroup = getWeaponType(weaponType)->mLongGroup;
-    bool isRealWeapon = weaponType != ESM::Weapon::HandToHand && weaponType != ESM::Weapon::Spell && weaponType != ESM::Weapon::None;
-    if (isRealWeapon && !mAnimation->hasAnimation(weaponGroup))
+    if (isRealWeapon(weaponType) && !mAnimation->hasAnimation(weaponGroup))
     {
         static const std::string oneHandFallback = getWeaponType(ESM::Weapon::LongBladeOneHand)->mLongGroup;
         static const std::string twoHandFallback = getWeaponType(ESM::Weapon::LongBladeTwoHand)->mLongGroup;
@@ -497,7 +503,7 @@ std::string CharacterController::getWeaponAnimation(int weaponType) const
         // For real two-handed melee weapons use 2h swords animations as fallback, otherwise use the 1h ones
         if (weapInfo->mFlags & ESM::WeaponType::TwoHanded && weapInfo->mWeaponClass == ESM::WeaponType::Melee)
             weaponGroup = twoHandFallback;
-        else if (isRealWeapon)
+        else
             weaponGroup = oneHandFallback;
     }
     else if (weaponType == ESM::Weapon::HandToHand && !mPtr.getClass().isBipedal(mPtr))
@@ -515,8 +521,7 @@ std::string CharacterController::getWeaponShortGroup(int weaponType) const
 
 std::string CharacterController::fallbackShortWeaponGroup(const std::string& baseGroupName, MWRender::Animation::BlendMask* blendMask) const
 {
-    bool isRealWeapon = mWeaponType != ESM::Weapon::HandToHand && mWeaponType != ESM::Weapon::Spell && mWeaponType != ESM::Weapon::None;
-    if (!isRealWeapon)
+    if (!isRealWeapon(mWeaponType))
     {
         if (blendMask != nullptr)
             *blendMask = MWRender::Animation::BlendMask_LowerBody;

From 5b9ca3b979768e3cf93e1c4a2f830fcc9354f13f Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 6 Jul 2022 12:49:02 +0200
Subject: [PATCH 2766/2859] Avoid possible division by zero

components/detournavigator/navmeshdb.cpp:183:43: warning: Division by zero [clang-analyzer-core.DivideZero]
        setMaxPageCount(*mDb, maxFileSize / dbPageSize + static_cast<std::uint64_t>((maxFileSize % dbPageSize) != 0));
                              ~~~~~~~~~~~~^~~~~~~~~~~~
components/detournavigator/navmeshdb.cpp:182:33: note: Calling 'getPageSize'
        const auto dbPageSize = getPageSize(*mDb);
                                ^~~~~~~~~~~~~~~~~
components/detournavigator/navmeshdb.cpp:144:13: note: 'value' initialized to 0
            std::uint64_t value = 0;
            ^~~~~~~~~~~~~~~~~~~
components/detournavigator/navmeshdb.cpp:145:13: note: Calling 'request<DetourNavigator::(anonymous namespace)::GetPageSize, unsigned long *, >'
            request(db, statement, &value, 1);
            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
components/sqlite3/request.hpp:254:64: note: Left side of '&&' is false
            for (std::size_t i = 0; executeStep(db, statement) && i < max; ++i)
                                                               ^
components/detournavigator/navmeshdb.cpp:145:13: note: Returning from 'request<DetourNavigator::(anonymous namespace)::GetPageSize, unsigned long *, >'
            request(db, statement, &value, 1);
            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
components/detournavigator/navmeshdb.cpp:146:13: note: Returning zero (loaded from 'value')
            return value;
            ^~~~~~~~~~~~
components/detournavigator/navmeshdb.cpp:182:33: note: Returning from 'getPageSize'
        const auto dbPageSize = getPageSize(*mDb);
                                ^~~~~~~~~~~~~~~~~
components/detournavigator/navmeshdb.cpp:182:9: note: 'dbPageSize' initialized to 0
        const auto dbPageSize = getPageSize(*mDb);
        ^~~~~~~~~~~~~~~~~~~~~
components/detournavigator/navmeshdb.cpp:183:43: note: Division by zero
        setMaxPageCount(*mDb, maxFileSize / dbPageSize + static_cast<std::uint64_t>((maxFileSize % dbPageSize) != 0));
                              ~~~~~~~~~~~~^~~~~~~~~~~~
---
 components/detournavigator/navmeshdb.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/components/detournavigator/navmeshdb.cpp b/components/detournavigator/navmeshdb.cpp
index 4d9ab3dafa..93439387d7 100644
--- a/components/detournavigator/navmeshdb.cpp
+++ b/components/detournavigator/navmeshdb.cpp
@@ -179,7 +179,9 @@ namespace DetourNavigator
         , mInsertShape(*mDb, DbQueries::InsertShape {})
         , mVacuum(*mDb, DbQueries::Vacuum {})
     {
-        const auto dbPageSize = getPageSize(*mDb);
+        const std::uint64_t dbPageSize = getPageSize(*mDb);
+        if (dbPageSize == 0)
+            throw std::runtime_error("NavMeshDb page size is zero");
         setMaxPageCount(*mDb, maxFileSize / dbPageSize + static_cast<std::uint64_t>((maxFileSize % dbPageSize) != 0));
     }
 

From 7501597813b45f7998a31ed7af35754b91dd0577 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 6 Jul 2022 12:55:36 +0200
Subject: [PATCH 2767/2859] Do not use float as loop variable

apps/opencs/view/render/instanceselectionmode.cpp:294:9: warning: Variable 'i' with floating point type 'float' should not be used as a loop counter [clang-analyzer-security.FloatLoopCounter]
        for (float i = 0.0; i <= resolution; i += 2)
        ^                   ~                ~
---
 apps/opencs/view/render/instanceselectionmode.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/view/render/instanceselectionmode.cpp b/apps/opencs/view/render/instanceselectionmode.cpp
index 9b5fb759cc..545d35d93b 100644
--- a/apps/opencs/view/render/instanceselectionmode.cpp
+++ b/apps/opencs/view/render/instanceselectionmode.cpp
@@ -284,14 +284,14 @@ namespace CSVRender
         osg::ref_ptr<osg::Geometry> geometry (new osg::Geometry);
 
         osg::Vec3Array *vertices = new osg::Vec3Array;
-        int resolution = 32;
+        constexpr int resolution = 32;
         float radiusPerResolution = radius / resolution;
         float reciprocalResolution = 1.0f / resolution;
         float doubleReciprocalRes = reciprocalResolution * 2;
 
         osg::Vec4Array *colours = new osg::Vec4Array;
 
-        for (float i = 0.0; i <= resolution; i += 2)
+        for (int i = 0; i <= resolution; i += 2)
         {
             float iShifted = (static_cast<float>(i) - resolution / 2.0f); // i - 16 = -16 ... 16
             float xPercentile = iShifted * doubleReciprocalRes;

From 72bda2bd101023a61f00838f988279661a868c3f Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 6 Jul 2022 12:58:12 +0200
Subject: [PATCH 2768/2859] Avoid redundant initialization

components/nifbullet/bulletnifloader.cpp:79:24: warning: Value stored to 'a' during its initialization is never read [clang-analyzer-deadcode.DeadStores]
        unsigned short a = strip[0], b = strip[0], c = strip[1];
                       ^   ~~~~~~~~
---
 components/nifbullet/bulletnifloader.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index 424a45d65a..bedd2ce939 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -76,7 +76,9 @@ void fillTriangleMesh(btTriangleMesh& mesh, const Nif::NiTriStripsData& data, co
         if (strip.size() < 3)
             continue;
 
-        unsigned short a = strip[0], b = strip[0], c = strip[1];
+        unsigned short a;
+        unsigned short b = strip[0];
+        unsigned short c = strip[1];
         for (size_t i = 2; i < strip.size(); i++)
         {
             a = b;

From 4ecee2e16784b9b3b665fe754cf23bc23adfdfba Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 6 Jul 2022 13:01:03 +0200
Subject: [PATCH 2769/2859] Avoid using reserved identifier in the global
 namespace

apps/launcher/datafilespage.cpp:762:12: warning: declaration uses identifier '_reloadCellsMutex', which is reserved in the global namespace [bugprone-reserved-identifier]
std::mutex _reloadCellsMutex;
           ^~~~~~~~~~~~~~~~~
           reloadCellsMutex

apps/openmw/mwgui/journalwindow.cpp:86:103: warning: declaration uses identifier '_sender', which is reserved in the global namespace [bugprone-reserved-identifier]
        void adviseButtonClick (char const * name, void (JournalWindowImpl::*Handler) (MyGUI::Widget* _sender))
                                                                                                      ^~~~~~~
                                                                                                      sender

apps/openmw/mwgui/journalwindow.cpp:92:100: warning: declaration uses identifier '_sender', which is reserved in the global namespace [bugprone-reserved-identifier]
        void adviseKeyPress (char const * name, void (JournalWindowImpl::*Handler) (MyGUI::Widget* _sender, MyGUI::KeyCode key, MyGUI::Char character))
                                                                                                   ^~~~~~~
                                                                                                   sender
---
 apps/launcher/datafilespage.cpp     | 4 ++--
 apps/openmw/mwgui/journalwindow.cpp | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index cb94eddd78..e16202a047 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -759,13 +759,13 @@ void Launcher::DataFilesPage::slotAddonDataChanged()
 }
 
 // Mutex lock to run reloadCells synchronously.
-std::mutex _reloadCellsMutex;
+static std::mutex reloadCellsMutex;
 
 void Launcher::DataFilesPage::reloadCells(QStringList selectedFiles)
 {
     // Use a mutex lock so that we can prevent two threads from executing the rest of this code at the same time
     // Based on https://stackoverflow.com/a/5429695/531762
-    std::unique_lock<std::mutex> lock(_reloadCellsMutex);
+    std::unique_lock<std::mutex> lock(reloadCellsMutex);
 
     // The following code will run only if there is not another thread currently running it
     CellNameLoader cellNameLoader;
diff --git a/apps/openmw/mwgui/journalwindow.cpp b/apps/openmw/mwgui/journalwindow.cpp
index 96c42549a5..d215587d49 100644
--- a/apps/openmw/mwgui/journalwindow.cpp
+++ b/apps/openmw/mwgui/journalwindow.cpp
@@ -83,16 +83,16 @@ namespace
                 setVisible (visible);
         }
 
-        void adviseButtonClick (char const * name, void (JournalWindowImpl::*Handler) (MyGUI::Widget* _sender))
+        void adviseButtonClick (char const * name, void (JournalWindowImpl::*handler)(MyGUI::Widget*))
         {
             getWidget <MyGUI::Widget> (name) ->
-                eventMouseButtonClick += newDelegate(this, Handler);
+                eventMouseButtonClick += newDelegate(this, handler);
         }
 
-        void adviseKeyPress (char const * name, void (JournalWindowImpl::*Handler) (MyGUI::Widget* _sender, MyGUI::KeyCode key, MyGUI::Char character))
+        void adviseKeyPress (char const * name, void (JournalWindowImpl::*handler)(MyGUI::Widget*, MyGUI::KeyCode, MyGUI::Char))
         {
             getWidget <MyGUI::Widget> (name) ->
-                eventKeyButtonPressed += newDelegate(this, Handler);
+                eventKeyButtonPressed += newDelegate(this, handler);
         }
 
         MWGui::BookPage* getPage (char const * name)

From bd7f56ddb45b8e1b5442e8054f1caadd0b26ed2c Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 6 Jul 2022 13:09:19 +0200
Subject: [PATCH 2770/2859] Don't rely on virtual dispatch in constructor

apps/openmw/mwrender/animation.cpp:1841:60: warning: Call to virtual method 'ObjectAnimation::canBeHarvested' during construction bypasses virtual dispatch [clang-analyzer-optin.cplusplus.VirtualCall]
        if (ptr.getRefData().getCustomData() != nullptr && canBeHarvested())
                                                           ^~~~~~~~~~~~~~~~

apps/openmw/mwrender/bulletdebugdraw.cpp:33:5: warning: Call to virtual method 'DebugDrawer::setDebugMode' during construction bypasses virtual dispatch [clang-analyzer-optin.cplusplus.VirtualCall]
    setDebugMode(debugMode);
    ^~~~~~~~~~~~~~~~~~~~~~~

openmw/mwinput/controllermanager.cpp:63:17: warning: Call to virtual method 'ControllerManager::controllerAdded' during construction bypasses virtual dispatch [clang-analyzer-optin.cplusplus.VirtualCall]
                controllerAdded(fakeDeviceID, evt);
                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
---
 apps/openmw/mwinput/controllermanager.cpp | 2 +-
 apps/openmw/mwrender/animation.cpp        | 2 +-
 apps/openmw/mwrender/bulletdebugdraw.cpp  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwinput/controllermanager.cpp b/apps/openmw/mwinput/controllermanager.cpp
index 4db9fad595..adc62a80c5 100644
--- a/apps/openmw/mwinput/controllermanager.cpp
+++ b/apps/openmw/mwinput/controllermanager.cpp
@@ -60,7 +60,7 @@ namespace MWInput
                 SDL_ControllerDeviceEvent evt;
                 evt.which = i;
                 static const int fakeDeviceID = 1;
-                controllerAdded(fakeDeviceID, evt);
+                ControllerManager::controllerAdded(fakeDeviceID, evt);
                 Log(Debug::Info) << "Detected game controller: " << SDL_GameControllerNameForIndex(i);
             }
             else
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index f50ef156b9..0684550fb3 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -1838,7 +1838,7 @@ namespace MWRender
             mObjectRoot->accept(visitor);
         }
 
-        if (ptr.getRefData().getCustomData() != nullptr && canBeHarvested())
+        if (ptr.getRefData().getCustomData() != nullptr && ObjectAnimation::canBeHarvested())
         {
             const MWWorld::ContainerStore& store = ptr.getClass().getContainerStore(ptr);
             if (!store.hasVisibleItems())
diff --git a/apps/openmw/mwrender/bulletdebugdraw.cpp b/apps/openmw/mwrender/bulletdebugdraw.cpp
index b169251465..b14b64e771 100644
--- a/apps/openmw/mwrender/bulletdebugdraw.cpp
+++ b/apps/openmw/mwrender/bulletdebugdraw.cpp
@@ -30,7 +30,7 @@ DebugDrawer::DebugDrawer(osg::ref_ptr<osg::Group> parentNode, btCollisionWorld *
     : mParentNode(parentNode),
       mWorld(world)
 {
-    setDebugMode(debugMode);
+    DebugDrawer::setDebugMode(debugMode);
 }
 
 void DebugDrawer::createGeometry()

From b4f12aace15b53b67047530ce9c0272aa59327b8 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 6 Jul 2022 13:13:35 +0200
Subject: [PATCH 2771/2859] Explicitly ignore result of
 std::unique_ptr::release call

components/nifbullet/bulletnifloader.cpp:206:13: warning: the value returned by this function should be used [bugprone-unused-return-value]
            boxShape.release();
            ^~~~~~~~~~~~~~~~~~

components/nifbullet/bulletnifloader.cpp:232:13: warning: the value returned by this function should be used [bugprone-unused-return-value]
            child.release();
            ^~~~~~~~~~~~~~~

components/nifbullet/bulletnifloader.cpp:233:13: warning: the value returned by this function should be used [bugprone-unused-return-value]
            mStaticMesh.release();
            ^~~~~~~~~~~~~~~~~~~~~

components/nifbullet/bulletnifloader.cpp:240:9: warning: the value returned by this function should be used [bugprone-unused-return-value]
        mStaticMesh.release();
        ^~~~~~~~~~~~~~~~~~~~~

components/nifbullet/bulletnifloader.cpp:246:9: warning: the value returned by this function should be used [bugprone-unused-return-value]
        mAvoidStaticMesh.release();
        ^~~~~~~~~~~~~~~~~~~~~~~~~~

components/nifbullet/bulletnifloader.cpp:411:9: warning: the value returned by this function should be used [bugprone-unused-return-value]
        childMesh.release();
        ^~~~~~~~~~~~~~~~~~~

components/nifbullet/bulletnifloader.cpp:425:9: warning: the value returned by this function should be used [bugprone-unused-return-value]
        childShape.release();
        ^~~~~~~~~~~~~~~~~~~~
---
 components/nifbullet/bulletnifloader.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index bedd2ce939..49f5e8f069 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -4,6 +4,7 @@
 #include <vector>
 #include <variant>
 #include <sstream>
+#include <tuple>
 
 #include <BulletCollision/CollisionShapes/btBoxShape.h>
 #include <BulletCollision/CollisionShapes/btTriangleMesh.h>
@@ -205,7 +206,7 @@ osg::ref_ptr<Resource::BulletShape> BulletNifLoader::load(const Nif::File& nif)
             btTransform transform = btTransform::getIdentity();
             transform.setOrigin(center);
             compound->addChildShape(transform, boxShape.get());
-            boxShape.release();
+            std::ignore = boxShape.release();
 
             mShape->mCollisionShape.reset(compound.release());
             return mShape;
@@ -231,21 +232,21 @@ osg::ref_ptr<Resource::BulletShape> BulletNifLoader::load(const Nif::File& nif)
             trans.setIdentity();
             std::unique_ptr<btCollisionShape> child = std::make_unique<Resource::TriangleMeshShape>(mStaticMesh.get(), true);
             mCompoundShape->addChildShape(trans, child.get());
-            child.release();
-            mStaticMesh.release();
+            std::ignore = child.release();
+            std::ignore = mStaticMesh.release();
         }
         mShape->mCollisionShape = std::move(mCompoundShape);
     }
     else if (mStaticMesh != nullptr && mStaticMesh->getNumTriangles() > 0)
     {
         mShape->mCollisionShape.reset(new Resource::TriangleMeshShape(mStaticMesh.get(), true));
-        mStaticMesh.release();
+        std::ignore = mStaticMesh.release();
     }
 
     if (mAvoidStaticMesh != nullptr && mAvoidStaticMesh->getNumTriangles() > 0)
     {
         mShape->mAvoidCollisionShape.reset(new Resource::TriangleMeshShape(mAvoidStaticMesh.get(), false));
-        mAvoidStaticMesh.release();
+        std::ignore = mAvoidStaticMesh.release();
     }
 
     return mShape;
@@ -410,7 +411,7 @@ void BulletNifLoader::handleNiTriShape(const Nif::NiGeometry& niGeometry, const
             mCompoundShape.reset(new btCompoundShape);
 
         auto childShape = std::make_unique<Resource::TriangleMeshShape>(childMesh.get(), true);
-        childMesh.release();
+        std::ignore = childMesh.release();
 
         float scale = niGeometry.trafo.scale;
         for (const Nif::Parent* parent = nodeParent; parent != nullptr; parent = parent->mParent)
@@ -424,7 +425,7 @@ void BulletNifLoader::handleNiTriShape(const Nif::NiGeometry& niGeometry, const
         mShape->mAnimatedShapes.emplace(niGeometry.recIndex, mCompoundShape->getNumChildShapes());
 
         mCompoundShape->addChildShape(trans, childShape.get());
-        childShape.release();
+        std::ignore = childShape.release();
     }
     else if (avoid)
         fillTriangleMesh(mAvoidStaticMesh, niGeometry, transform);

From 6fb7af3b631db8e806cf1837136f3b39a91d65fd Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 6 Jul 2022 14:21:53 +0200
Subject: [PATCH 2772/2859] Avoid redundant copy when finding item in
 NavMeshTilesCache

std::make_tuple returns a tuple for types with removed references which makes it
to copy arguments. std::tie leaves references.
---
 components/detournavigator/navmeshtilescache.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/detournavigator/navmeshtilescache.cpp b/components/detournavigator/navmeshtilescache.cpp
index 6938ff3650..a07aa873c4 100644
--- a/components/detournavigator/navmeshtilescache.cpp
+++ b/components/detournavigator/navmeshtilescache.cpp
@@ -17,7 +17,7 @@ namespace DetourNavigator
 
         ++mGetCount;
 
-        const auto tile = mValues.find(std::make_tuple(agentBounds, changedTile, recastMesh));
+        const auto tile = mValues.find(std::tie(agentBounds, changedTile, recastMesh));
         if (tile == mValues.end())
             return Value();
 
@@ -92,7 +92,7 @@ namespace DetourNavigator
     {
         const auto& item = mFreeItems.back();
 
-        const auto value = mValues.find(std::make_tuple(item.mAgentBounds, item.mChangedTile, std::cref(item.mRecastMeshData)));
+        const auto value = mValues.find(std::tie(item.mAgentBounds, item.mChangedTile, item.mRecastMeshData));
         if (value == mValues.end())
             return;
 

From 520738277a101010d6582c462926b254dfa2abfa Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 6 Jul 2022 15:06:42 +0200
Subject: [PATCH 2773/2859] Support google benchmark v1.6.1

---
 .../detournavigator/navmeshtilescache.cpp     | 70 +++++++++++++++----
 1 file changed, 58 insertions(+), 12 deletions(-)

diff --git a/apps/benchmarks/detournavigator/navmeshtilescache.cpp b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
index 9ee2d5d435..49b079681e 100644
--- a/apps/benchmarks/detournavigator/navmeshtilescache.cpp
+++ b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
@@ -193,14 +193,45 @@ namespace
         }
     }
 
-    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>;
+    void getFromFilledCache_1m_100hit(benchmark::State& state)
+    {
+        getFromFilledCache<1 * 1024 * 1024, 100>(state);
+    }
+
+    void getFromFilledCache_4m_100hit(benchmark::State& state)
+    {
+        getFromFilledCache<4 * 1024 * 1024, 100>(state);
+    }
+
+    void getFromFilledCache_16m_100hit(benchmark::State& state)
+    {
+        getFromFilledCache<16 * 1024 * 1024, 100>(state);
+    }
+
+    void getFromFilledCache_64m_100hit(benchmark::State& state)
+    {
+        getFromFilledCache<64 * 1024 * 1024, 100>(state);
+    }
+
+    void getFromFilledCache_1m_70hit(benchmark::State& state)
+    {
+        getFromFilledCache<1 * 1024 * 1024, 70>(state);
+    }
+
+    void getFromFilledCache_4m_70hit(benchmark::State& state)
+    {
+        getFromFilledCache<4 * 1024 * 1024, 70>(state);
+    }
+
+    void getFromFilledCache_16m_70hit(benchmark::State& state)
+    {
+        getFromFilledCache<16 * 1024 * 1024, 70>(state);
+    }
+
+    void getFromFilledCache_64m_70hit(benchmark::State& state)
+    {
+        getFromFilledCache<64 * 1024 * 1024, 70>(state);
+    }
 
     template <std::size_t maxCacheSize>
     void setToBoundedNonEmptyCache(benchmark::State& state)
@@ -222,10 +253,25 @@ namespace
         }
     }
 
-    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>;
+    void setToBoundedNonEmptyCache_1m(benchmark::State& state)
+    {
+        setToBoundedNonEmptyCache<1 * 1024 * 1024>(state);
+    }
+
+    void setToBoundedNonEmptyCache_4m(benchmark::State& state)
+    {
+        setToBoundedNonEmptyCache<4 * 1024 * 1024>(state);
+    }
+
+    void setToBoundedNonEmptyCache_16m(benchmark::State& state)
+    {
+        setToBoundedNonEmptyCache<16 * 1024 * 1024>(state);
+    }
+
+    void setToBoundedNonEmptyCache_64m(benchmark::State& state)
+    {
+        setToBoundedNonEmptyCache<64 * 1024 * 1024>(state);
+    }
 } // namespace
 
 BENCHMARK(getFromFilledCache_1m_100hit);

From e42d63f4a40c8a942dfed16b4b8f6a2d6ea56531 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 6 Jul 2022 19:12:36 +0200
Subject: [PATCH 2774/2859] Don't try to start combat with oneself and don't
 tell the player what to do

---
 apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index f20381ea91..95842330f8 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -1463,7 +1463,10 @@ namespace MWMechanics
                     std::set<MWWorld::Ptr> followersTarget;
                     getActorsSidingWith(target, followersTarget);
                     for(const auto& follower : followersTarget)
-                        startCombat(follower, attacker);
+                    {
+                        if(follower != attacker && follower != player)
+                            startCombat(follower, attacker);
+                    }
                 }
             }
         }

From 4211cf1c24a0e0ce08e79479546d35a53f413306 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 8 Jul 2022 17:11:22 +0200
Subject: [PATCH 2775/2859] Use uniform indent and apply openmw naming policy

---
 components/sceneutil/lightmanager.cpp | 20 ++++++++++----------
 components/sceneutil/lightmanager.hpp |  8 ++++----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 5c81626d9b..9b63a9b825 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -756,16 +756,16 @@ namespace SceneUtil
         mTemplate->configureLayout(offsets[0], offsets[1], offsets[2], totalBlockSize, stride);
     }
 
-    const std::unordered_map<std::string, LightingMethod> LightManager::mLightingMethodSettingMap = {
-         {"legacy", LightingMethod::FFP}
-        ,{"shaders compatibility", LightingMethod::PerObjectUniform}
-        ,{"shaders", LightingMethod::SingleUBO}
+    const std::unordered_map<std::string, LightingMethod> LightManager::sLightingMethodSettingMap = {
+        {"legacy", LightingMethod::FFP},
+        {"shaders compatibility", LightingMethod::PerObjectUniform},
+        {"shaders", LightingMethod::SingleUBO},
     };
 
     LightingMethod LightManager::getLightingMethodFromString(const std::string& value)
     {
-        auto it = LightManager::mLightingMethodSettingMap.find(value);
-        if (it != LightManager::mLightingMethodSettingMap.end())
+        auto it = LightManager::sLightingMethodSettingMap.find(value);
+        if (it != LightManager::sLightingMethodSettingMap.end())
             return it->second;
 
         constexpr const char* fallback = "shaders compatibility";
@@ -775,7 +775,7 @@ namespace SceneUtil
 
     std::string LightManager::getLightingMethodString(LightingMethod method)
     {
-        for (const auto& p : LightManager::mLightingMethodSettingMap)
+        for (const auto& p : LightManager::sLightingMethodSettingMap)
             if (p.second == method)
                 return p.first;
         return "";
@@ -801,7 +801,7 @@ namespace SceneUtil
 
         if (ffp)
         {
-            initFFP(mFFPMaxLights);
+            initFFP(sFFPMaxLights);
             return;
         }
 
@@ -819,7 +819,7 @@ namespace SceneUtil
             hasLoggedWarnings = true;
         }
 
-        int targetLights = std::clamp(Settings::Manager::getInt("max lights", "Shaders"), mMaxLightsLowerLimit, mMaxLightsUpperLimit);
+        int targetLights = std::clamp(Settings::Manager::getInt("max lights", "Shaders"), sMaxLightsLowerLimit, sMaxLightsUpperLimit);
 
         if (!supportsUBO || !supportsGPU4 || lightingMethod == LightingMethod::PerObjectUniform)
             initPerObjectUniform(targetLights);
@@ -902,7 +902,7 @@ namespace SceneUtil
         if (usingFFP())
             return;
 
-        setMaxLights(std::clamp(Settings::Manager::getInt("max lights", "Shaders"), mMaxLightsLowerLimit, mMaxLightsUpperLimit));
+        setMaxLights(std::clamp(Settings::Manager::getInt("max lights", "Shaders"), sMaxLightsLowerLimit, sMaxLightsUpperLimit));
 
         if (getLightingMethod() == LightingMethod::PerObjectUniform)
         {
diff --git a/components/sceneutil/lightmanager.hpp b/components/sceneutil/lightmanager.hpp
index b4d4755056..ba226cb7ef 100644
--- a/components/sceneutil/lightmanager.hpp
+++ b/components/sceneutil/lightmanager.hpp
@@ -360,11 +360,11 @@ namespace SceneUtil
 
         SupportedMethods mSupported;
 
-        static constexpr auto mMaxLightsLowerLimit = 2;
-        static constexpr auto mMaxLightsUpperLimit = 64;
-        static constexpr auto mFFPMaxLights = 8;
+        static constexpr auto sMaxLightsLowerLimit = 2;
+        static constexpr auto sMaxLightsUpperLimit = 64;
+        static constexpr auto sFFPMaxLights = 8;
 
-        static const std::unordered_map<std::string, LightingMethod> mLightingMethodSettingMap;
+        static const std::unordered_map<std::string, LightingMethod> sLightingMethodSettingMap;
 
         std::shared_ptr<PPLightBuffer> mPPLightBuffer;
     };

From 9ac3bb753e0c3f7f567c6fe87dba85dcedb3f863 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 8 Jul 2022 17:20:23 +0200
Subject: [PATCH 2776/2859] Move declaration private static member variables of
 LightManager to .cpp

There is no need to expose them to other translation units.
---
 components/sceneutil/lightmanager.cpp | 32 +++++++++++++++++----------
 components/sceneutil/lightmanager.hpp |  6 -----
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 9b63a9b825..be3fe4679b 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -24,6 +24,10 @@
 
 namespace
 {
+    constexpr int maxLightsLowerLimit = 2;
+    constexpr int maxLightsUpperLimit = 64;
+    constexpr int ffpMaxLights = 8;
+
     bool sortLights(const SceneUtil::LightManager::LightSourceViewBound* left, const SceneUtil::LightManager::LightSourceViewBound* right)
     {
         static auto constexpr illuminationBias = 81.f;
@@ -70,6 +74,15 @@ namespace
 
 namespace SceneUtil
 {
+    namespace
+    {
+        const std::unordered_map<std::string, LightingMethod> lightingMethodSettingMap = {
+            {"legacy", LightingMethod::FFP},
+            {"shaders compatibility", LightingMethod::PerObjectUniform},
+            {"shaders", LightingMethod::SingleUBO},
+        };
+    }
+
     static int sLightId = 0;
 
     // Handles a GLSL shared layout by using configured offsets and strides to fill a continuous buffer, making the data upload to GPU simpler.
@@ -756,16 +769,10 @@ namespace SceneUtil
         mTemplate->configureLayout(offsets[0], offsets[1], offsets[2], totalBlockSize, stride);
     }
 
-    const std::unordered_map<std::string, LightingMethod> LightManager::sLightingMethodSettingMap = {
-        {"legacy", LightingMethod::FFP},
-        {"shaders compatibility", LightingMethod::PerObjectUniform},
-        {"shaders", LightingMethod::SingleUBO},
-    };
-
     LightingMethod LightManager::getLightingMethodFromString(const std::string& value)
     {
-        auto it = LightManager::sLightingMethodSettingMap.find(value);
-        if (it != LightManager::sLightingMethodSettingMap.end())
+        auto it = lightingMethodSettingMap.find(value);
+        if (it != lightingMethodSettingMap.end())
             return it->second;
 
         constexpr const char* fallback = "shaders compatibility";
@@ -775,7 +782,7 @@ namespace SceneUtil
 
     std::string LightManager::getLightingMethodString(LightingMethod method)
     {
-        for (const auto& p : LightManager::sLightingMethodSettingMap)
+        for (const auto& p : lightingMethodSettingMap)
             if (p.second == method)
                 return p.first;
         return "";
@@ -801,7 +808,7 @@ namespace SceneUtil
 
         if (ffp)
         {
-            initFFP(sFFPMaxLights);
+            initFFP(ffpMaxLights);
             return;
         }
 
@@ -819,7 +826,8 @@ namespace SceneUtil
             hasLoggedWarnings = true;
         }
 
-        int targetLights = std::clamp(Settings::Manager::getInt("max lights", "Shaders"), sMaxLightsLowerLimit, sMaxLightsUpperLimit);
+        const int targetLights = std::clamp(Settings::Manager::getInt("max lights", "Shaders"),
+                                            maxLightsLowerLimit, maxLightsUpperLimit);
 
         if (!supportsUBO || !supportsGPU4 || lightingMethod == LightingMethod::PerObjectUniform)
             initPerObjectUniform(targetLights);
@@ -902,7 +910,7 @@ namespace SceneUtil
         if (usingFFP())
             return;
 
-        setMaxLights(std::clamp(Settings::Manager::getInt("max lights", "Shaders"), sMaxLightsLowerLimit, sMaxLightsUpperLimit));
+        setMaxLights(std::clamp(Settings::Manager::getInt("max lights", "Shaders"), maxLightsLowerLimit, maxLightsUpperLimit));
 
         if (getLightingMethod() == LightingMethod::PerObjectUniform)
         {
diff --git a/components/sceneutil/lightmanager.hpp b/components/sceneutil/lightmanager.hpp
index ba226cb7ef..c69f7a74fb 100644
--- a/components/sceneutil/lightmanager.hpp
+++ b/components/sceneutil/lightmanager.hpp
@@ -360,12 +360,6 @@ namespace SceneUtil
 
         SupportedMethods mSupported;
 
-        static constexpr auto sMaxLightsLowerLimit = 2;
-        static constexpr auto sMaxLightsUpperLimit = 64;
-        static constexpr auto sFFPMaxLights = 8;
-
-        static const std::unordered_map<std::string, LightingMethod> sLightingMethodSettingMap;
-
         std::shared_ptr<PPLightBuffer> mPPLightBuffer;
     };
 

From 05fedafd378347c4104284fefc83e98cd84893be Mon Sep 17 00:00:00 2001
From: "glassmancody.info" <glassmancody.info@gmail.com>
Date: Sat, 9 Jul 2022 09:43:37 -0700
Subject: [PATCH 2777/2859] fixed mouse event for padded box

---
 files/data/scripts/omw/settings/render.lua    | 14 +++++++-------
 files/data/scripts/omw/settings/renderers.lua | 13 +++++++------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/files/data/scripts/omw/settings/render.lua b/files/data/scripts/omw/settings/render.lua
index 8aebf76661..d4de143b02 100644
--- a/files/data/scripts/omw/settings/render.lua
+++ b/files/data/scripts/omw/settings/render.lua
@@ -150,6 +150,13 @@ local function renderGroup(group, global)
 
     local resetButtonLayout = {
         template = I.MWUI.templates.box,
+        events = {
+            mouseClick = async:callback(function()
+                for _, setting in pairs(group.settings) do
+                    setSettingValue(global, group.key, setting.key, setting.default)
+                end
+            end),
+        },
         content = ui.content {
             {
                 template = I.MWUI.templates.padding,
@@ -159,13 +166,6 @@ local function renderGroup(group, global)
                         props = {
                             text = interfaceL10n('Reset')
                         },
-                        events = {
-                            mouseClick = async:callback(function()
-                                for _, setting in pairs(group.settings) do
-                                    setSettingValue(global, group.key, setting.key, setting.default)
-                                end
-                            end),
-                        },
                     },
                 },
             },
diff --git a/files/data/scripts/omw/settings/renderers.lua b/files/data/scripts/omw/settings/renderers.lua
index 3c187740e6..82005916de 100644
--- a/files/data/scripts/omw/settings/renderers.lua
+++ b/files/data/scripts/omw/settings/renderers.lua
@@ -73,7 +73,7 @@ return function(registerRenderer)
         registerRenderer('checkbox', function(value, set, argument)
             argument = applyDefaults(argument, defaultArgument)
             local l10n = core.l10n(argument.l10n)
-            return disable(argument.disabled, paddedBox {
+            local box = paddedBox {
                 template = I.MWUI.templates.padding,
                 content = ui.content {
                     {
@@ -81,12 +81,13 @@ return function(registerRenderer)
                         props = {
                             text = l10n(value and argument.trueLabel or argument.falseLabel)
                         },
-                        events = {
-                            mouseClick = async:callback(function() set(not value) end),
-                        },
                     },
-                }
-            })
+                },
+            }
+            box.events = {
+                mouseClick = async:callback(function() set(not value) end)
+            }
+            return disable(argument.disabled, box)
         end)
     end
 

From b3c8c8eb56227128dce4c905048c17bfa3bf91ec Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sat, 9 Jul 2022 22:21:48 +0200
Subject: [PATCH 2778/2859] Support sky blending in multiview mode

---
 files/shaders/fog.glsl                       |  8 ++++----
 files/shaders/openmw_fragment.glsl           |  9 +++++++++
 files/shaders/openmw_fragment.h.glsl         | 11 ++++++++++-
 files/shaders/openmw_fragment_multiview.glsl | 11 ++++++++++-
 4 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/files/shaders/fog.glsl b/files/shaders/fog.glsl
index 9bf93079f3..d9d0548aa9 100644
--- a/files/shaders/fog.glsl
+++ b/files/shaders/fog.glsl
@@ -1,7 +1,8 @@
 uniform float far;
 
 #if @skyBlending
-uniform sampler2D sky;
+#include "openmw_fragment.h.glsl"
+
 uniform float skyBlendingStart;
 #endif
 
@@ -23,14 +24,13 @@ vec4 applyFogAtDist(vec4 color, float euclideanDist, float linearDist)
     color.xyz = mix(color.xyz, gl_Fog.color.xyz, fogValue);
 #endif
 
-#if @skyBlending && !@useOVR_multiview
+#if @skyBlending
     float fadeValue = clamp((far - dist) / (far - skyBlendingStart), 0.0, 1.0);
     fadeValue *= fadeValue;
 #ifdef ADDITIVE_BLENDING
     color.xyz *= fadeValue;
 #else
-    vec3 skyColor = texture2D(sky, gl_FragCoord.xy / screenRes).xyz;
-    color.xyz = mix(skyColor, color.xyz, fadeValue);
+    color.xyz = mix(mw_sampleSkyColor(gl_FragCoord.xy / screenRes), color.xyz, fadeValue);
 #endif
 #endif
 
diff --git a/files/shaders/openmw_fragment.glsl b/files/shaders/openmw_fragment.glsl
index 151f8fdb13..8c8302f3ae 100644
--- a/files/shaders/openmw_fragment.glsl
+++ b/files/shaders/openmw_fragment.glsl
@@ -31,3 +31,12 @@ vec4 mw_samplerLastShader(vec2 uv)
 {
     return texture2D(omw_SamplerLastShader, uv);
 }
+
+#if @skyBlending
+uniform sampler2D sky;
+
+vec3 mw_sampleSkyColor(vec2 uv)
+{
+    return texture2D(sky, uv).xyz;
+}
+#endif
diff --git a/files/shaders/openmw_fragment.h.glsl b/files/shaders/openmw_fragment.h.glsl
index c96912ead6..f7c1e2f21e 100644
--- a/files/shaders/openmw_fragment.h.glsl
+++ b/files/shaders/openmw_fragment.h.glsl
@@ -1,3 +1,6 @@
+#ifndef OPENMW_FRAGMENT_H_GLSL
+#define OPENMW_FRAGMENT_H_GLSL
+
 @link "openmw_fragment.glsl" if !@useOVR_multiview
 @link "openmw_fragment_multiview.glsl" if @useOVR_multiview
 
@@ -8,4 +11,10 @@ vec4 mw_sampleRefractionMap(vec2 uv);
 float mw_sampleRefractionDepthMap(vec2 uv);
 #endif
 
-vec4 mw_samplerLastShader(vec2 uv);
\ No newline at end of file
+vec4 mw_samplerLastShader(vec2 uv);
+
+#if @skyBlending
+vec3 mw_sampleSkyColor(vec2 uv);
+#endif
+
+#endif  // OPENMW_FRAGMENT_H_GLSL
diff --git a/files/shaders/openmw_fragment_multiview.glsl b/files/shaders/openmw_fragment_multiview.glsl
index 0ec9a3e12b..61f69cc2d9 100644
--- a/files/shaders/openmw_fragment_multiview.glsl
+++ b/files/shaders/openmw_fragment_multiview.glsl
@@ -35,4 +35,13 @@ uniform sampler2DArray omw_SamplerLastShader;
 vec4 mw_samplerLastShader(vec2 uv)
 {
     return texture2DArray(omw_SamplerLastShader, vec3((uv), gl_ViewID_OVR));
-}
\ No newline at end of file
+}
+
+#if @skyBlending
+uniform sampler2DArray sky;
+
+vec3 mw_sampleSkyColor(vec2 uv)
+{
+    return texture2DArray(sky, vec3((uv), gl_ViewID_OVR)).xyz;
+}
+#endif

From c1344c47651a99bd55207f6b8e9214b7bb72bd15 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sat, 9 Jul 2022 22:27:23 +0200
Subject: [PATCH 2779/2859] Minor fix in move360.lua. Scrolling shouldn't
 toggle view mode when TAB is pressed.

---
 files/data/scripts/omw/camera/move360.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/files/data/scripts/omw/camera/move360.lua b/files/data/scripts/omw/camera/move360.lua
index 08b0fe29d6..08e4b09f45 100644
--- a/files/data/scripts/omw/camera/move360.lua
+++ b/files/data/scripts/omw/camera/move360.lua
@@ -62,6 +62,7 @@ function M.onInputAction(action)
     if not active or core.isWorldPaused() or
        not input.getControlSwitch(input.CONTROL_SWITCH.ViewMode) or
        not input.getControlSwitch(input.CONTROL_SWITCH.Controls) or
+       input.isActionPressed(input.ACTION.TogglePOV) or
        not I.Camera.isModeControlEnabled() then
         return
     end

From dc3ba3a75bd8ae80264bc6d9a70f533ac0b143ec Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sat, 9 Jul 2022 23:19:38 +0200
Subject: [PATCH 2780/2859] Fix #6862

---
 components/files/configurationmanager.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/files/configurationmanager.cpp b/components/files/configurationmanager.cpp
index 494332005a..5d21bfb6d3 100644
--- a/components/files/configurationmanager.cpp
+++ b/components/files/configurationmanager.cpp
@@ -106,7 +106,6 @@ void ConfigurationManager::readConfiguration(bpo::variables_map& variables,
             continue;
         }
         alreadyParsedPaths.insert(path);
-        mActiveConfigPaths.push_back(path);
         config = loadConfig(path, description);
         if (config && hasReplaceConfig(*config) && parsedConfigs.size() > 1)
         {

From 8b8c3049539b5944c628ce7159807f7752f41198 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 3 Jul 2022 02:14:32 +0200
Subject: [PATCH 2781/2859] Treat empty `RootCollisionNode` in NIF as NCC flag
 and generate CameraOnly collision shape

---
 .../nifloader/testbulletnifloader.cpp         | 35 ++++++++++++++-
 components/nifbullet/bulletnifloader.cpp      | 44 +++++++++++++++----
 components/nifbullet/bulletnifloader.hpp      |  3 +-
 3 files changed, 71 insertions(+), 11 deletions(-)

diff --git a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
index e52e2f34a0..21b9e9df3a 100644
--- a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
+++ b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
@@ -187,6 +187,7 @@ namespace Resource
         return compareObjects(lhs.mCollisionShape.get(), rhs.mCollisionShape.get())
             && compareObjects(lhs.mAvoidCollisionShape.get(), rhs.mAvoidCollisionShape.get())
             && lhs.mCollisionBox == rhs.mCollisionBox
+            && lhs.mCollisionType == rhs.mCollisionType
             && lhs.mAnimatedShapes == rhs.mAnimatedShapes;
     }
 
@@ -197,6 +198,7 @@ namespace Resource
             << value.mAvoidCollisionShape.get() << ", "
             << value.mCollisionBox << ", "
             << value.mAnimatedShapes
+            << ", collisionType=" << value.mCollisionType
             << "}";
     }
 }
@@ -1034,7 +1036,7 @@ namespace
     TEST_F(TestBulletNifLoader, for_tri_shape_child_node_with_not_first_extra_data_string_equal_ncc_should_return_shape_with_cameraonly_collision)
     {
         mNiStringExtraData.next = Nif::ExtraPtr(&mNiStringExtraData2);
-        mNiStringExtraData2.string = "NC___";
+        mNiStringExtraData2.string = "NCC__";
         mNiStringExtraData2.recType = Nif::RC_NiStringExtraData;
         mNiTriShape.extra = Nif::ExtraPtr(&mNiStringExtraData);
         mNiTriShape.parents.push_back(&mNiNode);
@@ -1054,7 +1056,6 @@ namespace
         EXPECT_EQ(*result, expected);
     }
 
-
     TEST_F(TestBulletNifLoader, for_tri_shape_child_node_with_extra_data_string_starting_with_nc_should_return_shape_with_nocollision)
     {
         mNiStringExtraData.string = "NC___";
@@ -1100,6 +1101,36 @@ namespace
         EXPECT_EQ(*result, expected);
     }
 
+    TEST_F(TestBulletNifLoader, for_empty_root_collision_node_without_nc_should_return_shape_with_cameraonly_collision)
+    {
+        Nif::NiTriShape niTriShape;
+        Nif::NiNode emptyCollisionNode;
+        init(niTriShape);
+        init(emptyCollisionNode);
+
+        niTriShape.data = Nif::NiGeometryDataPtr(&mNiTriShapeData);
+        niTriShape.parents.push_back(&mNiNode);
+
+        emptyCollisionNode.recType = Nif::RC_RootCollisionNode;
+        emptyCollisionNode.parents.push_back(&mNiNode);
+
+        mNiNode.children = Nif::NodeList(std::vector<Nif::NodePtr>(
+            {Nif::NodePtr(&niTriShape), Nif::NodePtr(&emptyCollisionNode)}));
+
+        EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
+        EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&mNiNode));
+        EXPECT_CALL(mNifFile, getFilename()).WillOnce(Return("test.nif"));
+        const auto result = mLoader.load(mNifFile);
+
+        std::unique_ptr<btTriangleMesh> triangles(new btTriangleMesh(false));
+        triangles->addTriangle(btVector3(0, 0, 0), btVector3(1, 0, 0), btVector3(1, 1, 0));
+        Resource::BulletShape expected;
+        expected.mCollisionShape.reset(new Resource::TriangleMeshShape(triangles.release(), true));
+        expected.mCollisionType = Resource::BulletShape::CollisionType::Camera;
+
+        EXPECT_EQ(*result, expected);
+    }
+
     TEST_F(TestBulletNifLoader, for_tri_shape_child_node_with_extra_data_string_mrk_should_return_shape_with_null_collision_shape)
     {
         mNiStringExtraData.string = "MRK";
diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index 49f5e8f069..bae5bd4565 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -220,8 +220,12 @@ osg::ref_ptr<Resource::BulletShape> BulletNifLoader::load(const Nif::File& nif)
     // from the collision data present in every root node.
     for (const Nif::Node* node : roots)
     {
-        bool autogenerated = hasAutoGeneratedCollision(*node);
-        handleNode(filename, *node, nullptr, 0, autogenerated, isAnimated, autogenerated, false, mShape->mCollisionType);
+        bool hasCollisionNode = hasRootCollisionNode(*node);
+        bool hasCollisionShape = hasCollisionNode && !collisionShapeIsEmpty(*node);
+        if (hasCollisionNode && !hasCollisionShape)
+            mShape->mCollisionType = Resource::BulletShape::CollisionType::Camera;
+        bool generateCollisionShape = !hasCollisionShape;
+        handleNode(filename, *node, nullptr, 0, generateCollisionShape, isAnimated, generateCollisionShape, false, mShape->mCollisionType);
     }
 
     if (mCompoundShape)
@@ -295,18 +299,37 @@ bool BulletNifLoader::findBoundingBox(const Nif::Node& node, const std::string&
     return false;
 }
 
-bool BulletNifLoader::hasAutoGeneratedCollision(const Nif::Node& rootNode)
+bool BulletNifLoader::hasRootCollisionNode(const Nif::Node& rootNode) const
 {
     if (const Nif::NiNode* ninode = dynamic_cast<const Nif::NiNode*>(&rootNode))
     {
         const Nif::NodeList &list = ninode->children;
         for(size_t i = 0;i < list.length();i++)
         {
-            if(!list[i].empty())
-            {
-                if(list[i].getPtr()->recType == Nif::RC_RootCollisionNode)
-                    return false;
-            }
+            if(list[i].empty())
+                continue;
+            if (list[i].getPtr()->recType == Nif::RC_RootCollisionNode)
+                return true;
+        }
+    }
+    return false;
+}
+
+bool BulletNifLoader::collisionShapeIsEmpty(const Nif::Node& rootNode) const
+{
+    if (const Nif::NiNode* ninode = dynamic_cast<const Nif::NiNode*>(&rootNode))
+    {
+        const Nif::NodeList &list = ninode->children;
+        for(size_t i = 0;i < list.length();i++)
+        {
+            if(list[i].empty())
+                continue;
+            const Nif::Node* childNode = list[i].getPtr();
+            if (childNode->recType != Nif::RC_RootCollisionNode)
+                continue;
+            const Nif::NiNode* niChildnode = static_cast<const Nif::NiNode*>(childNode);  // RootCollisionNode is always a NiNode
+            if (childNode->hasBounds || niChildnode->children.length() > 0)
+                return false;
         }
     }
     return true;
@@ -319,6 +342,11 @@ void BulletNifLoader::handleNode(const std::string& fileName, const Nif::Node& n
     if (node.recType == Nif::RC_NiCollisionSwitch && !node.collisionActive())
         return;
 
+    // If RootCollisionNode is empty we treat it as NCC flag and autogenerate collision shape as there was no RootCollisionNode.
+    // So ignoring it here if `autogenerated` is true and collisionType was set to `Camera`.
+    if (node.recType == Nif::RC_RootCollisionNode && autogenerated && collisionType == Resource::BulletShape::CollisionType::Camera)
+        return;
+
     // Accumulate the flags from all the child nodes. This works for all
     // the flags we currently use, at least.
     flags |= node.flags;
diff --git a/components/nifbullet/bulletnifloader.hpp b/components/nifbullet/bulletnifloader.hpp
index e90c882bc3..c674bbbd13 100644
--- a/components/nifbullet/bulletnifloader.hpp
+++ b/components/nifbullet/bulletnifloader.hpp
@@ -59,7 +59,8 @@ private:
     void handleNode(const std::string& fileName, const Nif::Node& node,const Nif::Parent* parent, int flags,
         bool isCollisionNode, bool isAnimated, bool autogenerated, bool avoid, unsigned int& cameraOnlyCollision);
 
-    bool hasAutoGeneratedCollision(const Nif::Node& rootNode);
+    bool hasRootCollisionNode(const Nif::Node& rootNode) const;
+    bool collisionShapeIsEmpty(const Nif::Node& rootNode) const;
 
     void handleNiTriShape(const Nif::NiGeometry& nifNode, const Nif::Parent* parent, const osg::Matrixf& transform,
         bool isAnimated, bool avoid);

From 9cda505ef362e94ab88161f08f6b7c5c3480451d Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 10 Jul 2022 22:48:25 +0200
Subject: [PATCH 2782/2859] Add missing save for a setting in launcher

---
 apps/launcher/advancedpage.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index fe94c945f6..dc32a80336 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -256,6 +256,7 @@ void Launcher::AdvancedPage::saveSettings()
         saveSettingBool(stealingFromKnockedOutCheckBox, "always allow stealing from knocked out actors", "Game");
         saveSettingBool(enableNavigatorCheckBox, "enable", "Navigator");
         saveSettingInt(physicsThreadsSpinBox, "async num threads", "Physics");
+        saveSettingBool(allowNPCToFollowOverWaterSurfaceCheckBox, "allow actors to follow over water surface", "Game");
     }
 
     // Visuals

From 24749b066c611a5d080ebc847c8d968407023a28 Mon Sep 17 00:00:00 2001
From: Cody Glassman <glassmancody.info@gmail.com>
Date: Mon, 11 Jul 2022 00:26:22 +0000
Subject: [PATCH 2783/2859] Add sky blending to launcher

---
 apps/launcher/advancedpage.cpp |  18 +++-
 apps/launcher/advancedpage.hpp |   1 +
 files/ui/advancedpage.ui       | 159 +++++++++++++++++++++++----------
 3 files changed, 128 insertions(+), 50 deletions(-)

diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index dc32a80336..eb1a88ea59 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -117,7 +117,6 @@ bool Launcher::AdvancedPage::loadSettings()
         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", "Fog");
         loadSettingBool(softParticlesCheckBox, "soft particles", "Shaders");
         loadSettingBool(antialiasAlphaTestCheckBox, "antialias alpha test", "Shaders");
         if (Settings::Manager::getInt("antialiasing", "Video") == 0) {
@@ -151,6 +150,12 @@ bool Launcher::AdvancedPage::loadSettings()
         loadSettingBool(postprocessLiveReloadCheckBox, "live reload", "Post Processing");
         loadSettingBool(postprocessTransparentPostpassCheckBox, "transparent postpass", "Post Processing");
         postprocessHDRTimeComboBox->setValue(Settings::Manager::getDouble("hdr exposure time", "Post Processing"));
+
+        connect(skyBlendingCheckBox, SIGNAL(toggled(bool)), this, SLOT(slotSkyBlendingToggled(bool)));
+        loadSettingBool(radialFogCheckBox, "radial fog", "Fog");
+        loadSettingBool(exponentialFogCheckBox, "exponential fog", "Fog");
+        loadSettingBool(skyBlendingCheckBox, "sky blending", "Fog");
+        skyBlendingStartComboBox->setValue(Settings::Manager::getDouble("sky blending start", "Fog"));
     }
 
     // Audio
@@ -302,6 +307,11 @@ void Launcher::AdvancedPage::saveSettings()
         double hdrExposureTime = postprocessHDRTimeComboBox->value();
         if (hdrExposureTime != Settings::Manager::getDouble("hdr exposure time", "Post Processing"))
             Settings::Manager::setDouble("hdr exposure time", "Post Processing", hdrExposureTime);
+
+        saveSettingBool(radialFogCheckBox, "radial fog", "Fog");
+        saveSettingBool(exponentialFogCheckBox, "exponential fog", "Fog");
+        saveSettingBool(skyBlendingCheckBox, "sky blending", "Fog");
+        Settings::Manager::setDouble("sky blending start", "Fog", skyBlendingStartComboBox->value());
     }
     
     // Audio
@@ -454,3 +464,9 @@ void Launcher::AdvancedPage::slotPostProcessToggled(bool checked)
     postprocessHDRTimeComboBox->setEnabled(checked);
     postprocessHDRTimeLabel->setEnabled(checked);
 }
+
+void Launcher::AdvancedPage::slotSkyBlendingToggled(bool checked)
+{
+    skyBlendingStartComboBox->setEnabled(checked);
+    skyBlendingStartLabel->setEnabled(checked);
+}
diff --git a/apps/launcher/advancedpage.hpp b/apps/launcher/advancedpage.hpp
index 20b44ff9da..a011602da8 100644
--- a/apps/launcher/advancedpage.hpp
+++ b/apps/launcher/advancedpage.hpp
@@ -30,6 +30,7 @@ namespace Launcher
         void on_runScriptAfterStartupBrowseButton_clicked();
         void slotAnimSourcesToggled(bool checked);
         void slotPostProcessToggled(bool checked);
+        void slotSkyBlendingToggled(bool checked);
 
     private:
         Config::GameSettings &mGameSettings;
diff --git a/files/ui/advancedpage.ui b/files/ui/advancedpage.ui
index 66ebd90a80..0a662fc091 100644
--- a/files/ui/advancedpage.ui
+++ b/files/ui/advancedpage.ui
@@ -434,17 +434,16 @@
                </widget>
               </item>
               <item row="2" column="1">
-               <widget class="QCheckBox" name="radialFogCheckBox">
-                <property name="toolTip">
-                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;By default, the fog becomes thicker proportionally to your distance from the clipping plane set at the clipping distance, which causes distortion at the edges of the screen.
-                  This setting makes the fog use the actual eye point distance (or so called Euclidean distance) to calculate the fog, which makes the fog look less artificial, especially if you have a wide FOV.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                </property>
-                <property name="text">
-                 <string>Radial fog</string>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="0">
+                <widget class="QCheckBox" name="antialiasAlphaTestCheckBox">
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Allows MSAA to work with alpha-tested meshes, producing better-looking edges without pixelation. Can negatively impact performance.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="text">
+                  <string>Use anti-alias alpha testing</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="3" column="0">
                <widget class="QCheckBox" name="softParticlesCheckBox">
                 <property name="toolTip">
                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enables soft particles for particle effects. This technique softens the intersection between individual particles and other opaque geometry by blending between them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -454,19 +453,81 @@
                 </property>
                </widget>
               </item>
-              <item row="3" column="1">
-               <widget class="QCheckBox" name="antialiasAlphaTestCheckBox">
-                <property name="toolTip">
-                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Allows MSAA to work with alpha-tested meshes, producing better-looking edges without pixelation. Can negatively impact performance.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                </property>
-                <property name="text">
-                 <string>Use anti-alias alpha testing</string>
-                </property>
-               </widget>
-              </item>
              </layout>
             </widget>
            </item>
+           <item>
+            <widget class="QGroupBox" name="fogGroup">
+             <property name="title">
+              <string>Fog</string>
+             </property>
+             <layout class="QGridLayout" name="fogLayout">
+                <item row="0" column="0">
+                  <widget class="QCheckBox" name="radialFogCheckBox">
+                  <property name="toolTip">
+                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;By default, the fog becomes thicker proportionally to your distance from the clipping plane set at the clipping distance, which causes distortion at the edges of the screen.
+                    This setting makes the fog use the actual eye point distance (or so called Euclidean distance) to calculate the fog, which makes the fog look less artificial, especially if you have a wide FOV.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                  </property>
+                  <property name="text">
+                    <string>Radial fog</string>
+                  </property>
+                  </widget>
+                </item>
+                <item row="0" column="1">
+                  <widget class="QCheckBox" name="exponentialFogCheckBox">
+                  <property name="toolTip">
+                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use exponential fog formula. By default, linear fog is used.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                  </property>
+                  <property name="text">
+                    <string>Exponential fog</string>
+                  </property>
+                  </widget>
+                </item>
+                <item row="1" column="0">
+                  <widget class="QCheckBox" name="skyBlendingCheckBox">
+                    <property name="toolTip">
+                      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Reduce visibility of clipping plane by blending objects with the sky.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                    </property>
+                    <property name="text">
+                    <string>Sky blending</string>
+                    </property>
+                  </widget>
+                </item>
+                <item row="2" column="0">
+                  <widget class="QLabel" name="skyBlendingStartLabel">
+                    <property name="enabled">
+                      <bool>false</bool>
+                    </property>
+                    <property name="text">
+                      <string>Sky blending start</string>
+                    </property>
+                    <property name="toolTip">
+                      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The fraction of the maximum distance at which blending with the sky starts.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                    </property>
+                  </widget>
+                </item>
+                <item row="2" column="1">
+                  <widget class="QDoubleSpinBox" name="skyBlendingStartComboBox">
+                    <property name="enabled">
+                      <bool>false</bool>
+                    </property>
+                    <property name="decimals">
+                      <number>3</number>
+                    </property>
+                    <property name="minimum">
+                      <double>0.000000000000000</double>
+                    </property>
+                    <property name="maximum">
+                      <double>1.000000000000000</double>
+                    </property>
+                    <property name="singleStep">
+                      <double>0.005000000000000</double>
+                    </property>
+                  </widget>
+                </item>
+              </layout>
+            </widget>
+           </item>
            <item>
             <widget class="QGroupBox" name="terrainGroup">
              <property name="title">
@@ -626,36 +687,36 @@
                   <item row="1" column="0">
                     <layout class="QHBoxLayout">
                       <item>
-                      <widget class="QLabel" name="postprocessHDRTimeLabel">
-                        <property name="enabled">
-                          <bool>false</bool>
-                        </property>
-                        <property name="toolTip">
-                        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Controls how much eye adaptation can change from frame to frame. Smaller values makes for slower transitions.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                        </property>
-                        <property name="text">
-                        <string>HDR exposure time</string>
-                        </property>
-                      </widget>
+                        <widget class="QLabel" name="postprocessHDRTimeLabel">
+                          <property name="enabled">
+                            <bool>false</bool>
+                          </property>
+                          <property name="toolTip">
+                            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Controls how much eye adaptation can change from frame to frame. Smaller values makes for slower transitions.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                          </property>
+                          <property name="text">
+                            <string>HDR exposure time</string>
+                          </property>
+                        </widget>
                       </item>
                       <item>
-                      <widget class="QDoubleSpinBox" name="postprocessHDRTimeComboBox">
-                        <property name="enabled">
-                          <bool>false</bool>
-                        </property>
-                        <property name="decimals">
-                        <number>3</number>
-                        </property>
-                        <property name="minimum">
-                        <double>0.000000000000000</double>
-                        </property>
-                        <property name="maximum">
-                        <double>1.000000000000000</double>
-                        </property>
-                        <property name="singleStep">
-                        <double>0.001000000000000</double>
-                        </property>
-                      </widget>
+                        <widget class="QDoubleSpinBox" name="postprocessHDRTimeComboBox">
+                          <property name="enabled">
+                            <bool>false</bool>
+                          </property>
+                          <property name="decimals">
+                            <number>3</number>
+                          </property>
+                          <property name="minimum">
+                            <double>0.000000000000000</double>
+                          </property>
+                          <property name="maximum">
+                            <double>1.000000000000000</double>
+                          </property>
+                          <property name="singleStep">
+                            <double>0.001000000000000</double>
+                          </property>
+                        </widget>
                       </item>
                     </layout>
                   </item>

From 011a822408c06494f15bbb23e89043959add97a0 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 11 Jul 2022 16:40:06 +0200
Subject: [PATCH 2784/2859] Calculate the modified property based on cached
 values

---
 apps/openmw/mwlua/stats.cpp | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwlua/stats.cpp b/apps/openmw/mwlua/stats.cpp
index d1983c6077..040d96e288 100644
--- a/apps/openmw/mwlua/stats.cpp
+++ b/apps/openmw/mwlua/stats.cpp
@@ -1,5 +1,6 @@
 #include "stats.hpp"
 
+#include <algorithm>
 #include <memory>
 #include <optional>
 #include <string_view>
@@ -29,14 +30,11 @@ namespace
     }
 
     template<class T, class G>
-    void addProp(const MWLua::Context& context, sol::usertype<T>& type, std::string_view prop, G getter, bool readOnly = false)
+    void addProp(const MWLua::Context& context, sol::usertype<T>& type, std::string_view prop, G getter)
     {
-        if(readOnly)
-            type[prop] = sol::property([=](const T& stat) { return stat.get(context, prop, getter); });
-        else
-            type[prop] = sol::property(
-                [=](const T& stat) { return stat.get(context, prop, getter); },
-                [=](const T& stat, const sol::object& value) { stat.cache(context, prop, value); });
+        type[prop] = sol::property(
+            [=](const T& stat) { return stat.get(context, prop, getter); },
+            [=](const T& stat, const sol::object& value) { stat.cache(context, prop, value); });
     }
 
     using SelfObject = MWLua::LocalScripts::SelfObject;
@@ -209,6 +207,14 @@ namespace MWLua
             });
         }
 
+        float getModified(const Context& context) const
+        {
+            auto base = get(context, "base", &MWMechanics::AttributeValue::getBase).as<float>();
+            auto damage = get(context, "damage", &MWMechanics::AttributeValue::getDamage).as<float>();
+            auto modifier = get(context, "modifier", &MWMechanics::AttributeValue::getModifier).as<float>();
+            return std::max(0.f, base - damage + modifier); // Should match AttributeValue::getModified
+        }
+
         static std::optional<AttributeStat> create(StatObject object, int index)
         {
             if(!getObject(object)->ptr().getClass().isActor())
@@ -273,6 +279,14 @@ namespace MWLua
             });
         }
 
+        float getModified(const Context& context) const
+        {
+            auto base = get(context, "base", &MWMechanics::SkillValue::getBase).as<float>();
+            auto damage = get(context, "damage", &MWMechanics::SkillValue::getDamage).as<float>();
+            auto modifier = get(context, "modifier", &MWMechanics::SkillValue::getModifier).as<float>();
+            return std::max(0.f, base - damage + modifier); // Should match SkillValue::getModified
+        }
+
         sol::object getProgress(const Context& context) const
         {
             return getValue(context, mObject, &SkillStat::setValue, mIndex, "progress", [this](const MWLua::Object* obj)
@@ -357,7 +371,7 @@ namespace MWLua
         auto attributeStatT = context.mLua->sol().new_usertype<AttributeStat>("AttributeStat");
         addProp(context, attributeStatT, "base", &MWMechanics::AttributeValue::getBase);
         addProp(context, attributeStatT, "damage", &MWMechanics::AttributeValue::getDamage);
-        addProp(context, attributeStatT, "modified", &MWMechanics::AttributeValue::getModified, true);
+        attributeStatT["modified"] = sol::property([=](const AttributeStat& stat) { return stat.getModified(context); });
         addProp(context, attributeStatT, "modifier", &MWMechanics::AttributeValue::getModifier);
         sol::table attributes(context.mLua->sol(), sol::create);
         stats["attributes"] = LuaUtil::makeReadOnly(attributes);
@@ -376,7 +390,7 @@ namespace MWLua
         auto skillStatT = context.mLua->sol().new_usertype<SkillStat>("SkillStat");
         addProp(context, skillStatT, "base", &MWMechanics::SkillValue::getBase);
         addProp(context, skillStatT, "damage", &MWMechanics::SkillValue::getDamage);
-        addProp(context, skillStatT, "modified", &MWMechanics::SkillValue::getModified, true);
+        skillStatT["modified"] = sol::property([=](const SkillStat& stat) { return stat.getModified(context); });
         addProp(context, skillStatT, "modifier", &MWMechanics::SkillValue::getModifier);
         skillStatT["progress"] = sol::property(
             [context](const SkillStat& stat) { return stat.getProgress(context); },

From b277fa48c7b72b7e753a167448584efa3ae0fb79 Mon Sep 17 00:00:00 2001
From: Mads Buvik Sandvei <madssandvei@protonmail.com>
Date: Mon, 11 Jul 2022 15:59:56 +0200
Subject: [PATCH 2785/2859] Refactor multiview to avoid littering
 OSG_HAS_MULTIVIEW and multiview-related uniforms around the code, keep them
 all in multiview.cpp.

---
 apps/openmw/mwrender/characterpreview.cpp |  18 +-
 apps/openmw/mwrender/localmap.cpp         |  11 +-
 apps/openmw/mwrender/pingpongcanvas.cpp   |  21 +-
 apps/openmw/mwrender/postprocessor.cpp    | 103 ++--------
 apps/openmw/mwrender/skyutil.cpp          |  10 +-
 apps/openmw/mwrender/transparentpass.cpp  |  55 +----
 apps/openmw/mwrender/transparentpass.hpp  |  11 +-
 components/sceneutil/rtt.cpp              |   8 +-
 components/stereo/frustum.cpp             |  34 ++--
 components/stereo/frustum.hpp             |   8 +-
 components/stereo/multiview.cpp           | 235 ++++++++++++++++++++++
 components/stereo/multiview.hpp           |  59 +++++-
 components/stereo/stereomanager.cpp       |  28 +--
 13 files changed, 355 insertions(+), 246 deletions(-)

diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index c026392a9f..73bd9db484 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -25,6 +25,7 @@
 #include <components/settings/settings.hpp>
 #include <components/sceneutil/nodecallback.hpp>
 #include <components/sceneutil/depth.hpp>
+#include <components/stereo/multiview.hpp>
 
 #include "../mwbase/world.hpp"
 #include "../mwworld/class.hpp"
@@ -179,20 +180,6 @@ namespace MWRender
             camera->setComputeNearFarMode(osg::Camera::DO_NOT_COMPUTE_NEAR_FAR);
             SceneUtil::setCameraClearDepth(camera);
 
-#ifdef OSG_HAS_MULTIVIEW
-            if (shouldDoTextureArray())
-            {
-                auto* viewUniform = new osg::Uniform(osg::Uniform::FLOAT_MAT4, "viewMatrixMultiView", 2);
-                auto* projUniform = new osg::Uniform(osg::Uniform::FLOAT_MAT4, "projectionMatrixMultiView", 2);
-                viewUniform->setElement(0, osg::Matrix::identity());
-                viewUniform->setElement(1, osg::Matrix::identity());
-                projUniform->setElement(0, mPerspectiveMatrix);
-                projUniform->setElement(1, mPerspectiveMatrix);
-                mGroup->getOrCreateStateSet()->addUniform(viewUniform, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
-                mGroup->getOrCreateStateSet()->addUniform(projUniform, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
-            }
-#endif
-
             camera->setNodeMask(Mask_RenderToTexture);
             camera->addChild(mGroup);
         };
@@ -202,6 +189,9 @@ namespace MWRender
             if(mCameraStateset)
                 camera->setStateSet(mCameraStateset);
             camera->setViewMatrix(mViewMatrix);
+
+            if (shouldDoTextureArray())
+                Stereo::setMultiviewMatrices(mGroup->getOrCreateStateSet(), { mPerspectiveMatrix, mPerspectiveMatrix });
         };
 
         void addChild(osg::Node* node)
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index ecfb2d6387..63784d2dae 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -702,16 +702,7 @@ void LocalMapRenderToTexture::setDefaults(osg::Camera* camera)
     stateset->addUniform(new osg::Uniform("projectionMatrix", static_cast<osg::Matrixf>(mProjectionMatrix)), osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
 
     if (Stereo::getMultiview())
-    {
-        auto* viewUniform = new osg::Uniform(osg::Uniform::FLOAT_MAT4, "viewMatrixMultiView", 2);
-        auto* projUniform = new osg::Uniform(osg::Uniform::FLOAT_MAT4, "projectionMatrixMultiView", 2);
-        viewUniform->setElement(0, osg::Matrix::identity());
-        viewUniform->setElement(1, osg::Matrix::identity());
-        projUniform->setElement(0, mProjectionMatrix);
-        projUniform->setElement(1, mProjectionMatrix);
-        stateset->addUniform(viewUniform, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
-        stateset->addUniform(projUniform, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
-    }
+        Stereo::setMultiviewMatrices(stateset, { mProjectionMatrix, mProjectionMatrix });
 
     // assign large value to effectively turn off fog
     // shaders don't respect glDisable(GL_FOG)
diff --git a/apps/openmw/mwrender/pingpongcanvas.cpp b/apps/openmw/mwrender/pingpongcanvas.cpp
index 581209eddb..f6b8e464fe 100644
--- a/apps/openmw/mwrender/pingpongcanvas.cpp
+++ b/apps/openmw/mwrender/pingpongcanvas.cpp
@@ -67,25 +67,8 @@ namespace MWRender
 
     static void attachCloneOfTemplate(osg::FrameBufferObject* fbo, osg::Camera::BufferComponent component, osg::Texture* tex)
     {
-        switch (tex->getTextureTarget())
-        {
-        case GL_TEXTURE_2D:
-        {
-            auto* tex2d = new osg::Texture2D(*static_cast<osg::Texture2D*>(tex));
-            fbo->setAttachment(component, osg::FrameBufferAttachment(tex2d));
-        }
-        break;
-        case GL_TEXTURE_2D_ARRAY:
-        {
-#ifdef OSG_HAS_MULTIVIEW
-            auto* tex2dArray = new osg::Texture2DArray(*static_cast<osg::Texture2DArray*>(tex));
-            fbo->setAttachment(component, osg::FrameBufferAttachment(tex2dArray, osg::Camera::FACE_CONTROLLED_BY_MULTIVIEW_SHADER, 0));
-#endif
-        }
-        break;
-        default:
-            throw std::logic_error("Invalid texture type received");
-        }
+        osg::ref_ptr<osg::Texture> clone = static_cast<osg::Texture*>(tex->clone(osg::CopyOp::SHALLOW_COPY));
+        fbo->setAttachment(component, Stereo::createMultiviewCompatibleAttachment(clone));
     }
 
     void PingPongCanvas::drawImplementation(osg::RenderInfo& renderInfo) const
diff --git a/apps/openmw/mwrender/postprocessor.cpp b/apps/openmw/mwrender/postprocessor.cpp
index 8e5947ba89..0991ede7f2 100644
--- a/apps/openmw/mwrender/postprocessor.cpp
+++ b/apps/openmw/mwrender/postprocessor.cpp
@@ -9,10 +9,6 @@
 #include <osg/Texture3D>
 #include <osg/Texture2DArray>
 
-#ifdef OSG_HAS_MULTIVIEW
-#include <osg/Texture2DMultisampleArray>
-#endif
-
 #include <components/settings/settings.hpp>
 #include <components/sceneutil/depth.hpp>
 #include <components/sceneutil/color.hpp>
@@ -75,53 +71,6 @@ namespace
         }
     };
 
-
-    static void setTextureSize(osg::Texture* tex, int w, int h)
-    {
-        switch (tex->getTextureTarget())
-        {
-        case GL_TEXTURE_2D:
-            static_cast<osg::Texture2D*>(tex)->setTextureSize(w, h);
-            break;
-        case GL_TEXTURE_2D_ARRAY:
-            static_cast<osg::Texture2DArray*>(tex)->setTextureSize(w, h, 2);
-            break;
-        case GL_TEXTURE_2D_MULTISAMPLE:
-            static_cast<osg::Texture2DMultisample*>(tex)->setTextureSize(w, h);
-            break;
-#ifdef OSG_HAS_MULTIVIEW
-        case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
-            static_cast<osg::Texture2DMultisampleArray*>(tex)->setTextureSize(w, h, 2);
-            break;
-#endif
-        default:
-            throw std::logic_error("Invalid texture type received");
-        }
-    }
-
-    static void setAttachment(osg::FrameBufferObject* fbo, osg::Camera::BufferComponent component, osg::Texture* tex)
-    {
-        switch (tex->getTextureTarget())
-        {
-        case GL_TEXTURE_2D:
-        {
-            auto* tex2d = static_cast<osg::Texture2D*>(tex);
-            fbo->setAttachment(component, osg::FrameBufferAttachment(tex2d));
-        }
-        break;
-        case GL_TEXTURE_2D_ARRAY:
-        {
-#ifdef OSG_HAS_MULTIVIEW
-            auto* tex2dArray = static_cast<osg::Texture2DArray*>(tex);
-            fbo->setAttachment(component, osg::FrameBufferAttachment(tex2dArray, osg::Camera::FACE_CONTROLLED_BY_MULTIVIEW_SHADER, 0));
-#endif
-        }
-        break;
-        default:
-            throw std::logic_error("Invalid texture type received");
-        }
-    }
-
     enum class Usage
     {
         RENDER_BUFFER,
@@ -136,35 +85,7 @@ namespace
             return osg::FrameBufferAttachment(attachment);
         }
 
-        osg::FrameBufferAttachment attachment;
-
-#ifdef OSG_HAS_MULTIVIEW
-        if (Stereo::getMultiview())
-        {
-            if (samples > 1)
-            {
-                attachment = osg::FrameBufferAttachment(new osg::Texture2DMultisampleArray(), osg::Camera::FACE_CONTROLLED_BY_MULTIVIEW_SHADER, 0);
-            }
-            else
-            {
-                attachment = osg::FrameBufferAttachment(new osg::Texture2DArray(), osg::Camera::FACE_CONTROLLED_BY_MULTIVIEW_SHADER, 0);
-            }
-        }
-        else
-#endif
-        {
-            if (samples > 1)
-            {
-                attachment = osg::FrameBufferAttachment(new osg::Texture2DMultisample());
-            }
-            else
-            {
-                attachment =  osg::FrameBufferAttachment(new osg::Texture2D());
-            }
-        }
-
-        osg::Texture* texture = attachment.getTexture();
-        setTextureSize(texture, width, height);
+        auto texture = Stereo::createMultiviewCompatibleTexture(width, height, samples);
         texture->setSourceFormat(template_->getSourceFormat());
         texture->setSourceType(template_->getSourceType());
         texture->setInternalFormat(template_->getInternalFormat());
@@ -173,7 +94,7 @@ namespace
         texture->setWrap(osg::Texture::WRAP_S, template_->getWrap(osg::Texture2D::WRAP_S));
         texture->setWrap(osg::Texture::WRAP_T, template_->getWrap(osg::Texture2D::WRAP_T));
 
-        return attachment;
+        return Stereo::createMultiviewCompatibleAttachment(texture);
     }
 }
 
@@ -547,15 +468,15 @@ namespace MWRender
             if (!tex)
                 continue;
 
-            setTextureSize(tex, width, height);
+            Stereo::setMultiviewCompatibleTextureSize(tex, width, height);
             tex->dirtyTextureObject();
         }
 
         fbos[FBO_Primary] = new osg::FrameBufferObject;
-        setAttachment(fbos[FBO_Primary], osg::Camera::COLOR_BUFFER0, textures[Tex_Scene]);
+        fbos[FBO_Primary]->setAttachment(osg::Camera::COLOR_BUFFER0, Stereo::createMultiviewCompatibleAttachment(textures[Tex_Scene]));
         if (mNormals && mNormalsSupported)
-            setAttachment(fbos[FBO_Primary], osg::Camera::COLOR_BUFFER1, textures[Tex_Normal]);
-        setAttachment(fbos[FBO_Primary], osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, textures[Tex_Depth]);
+            fbos[FBO_Primary]->setAttachment(osg::Camera::COLOR_BUFFER1, Stereo::createMultiviewCompatibleAttachment(textures[Tex_Normal]));
+        fbos[FBO_Primary]->setAttachment(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, Stereo::createMultiviewCompatibleAttachment(textures[Tex_Depth]));
 
         fbos[FBO_FirstPerson] = new osg::FrameBufferObject;
 
@@ -581,20 +502,20 @@ namespace MWRender
             fbos[FBO_FirstPerson]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, colorRB);
 
             fbos[FBO_Intercept] = new osg::FrameBufferObject;
-            setAttachment(fbos[FBO_Intercept], osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, textures[Tex_Scene]);
-            setAttachment(fbos[FBO_Intercept], osg::FrameBufferObject::BufferComponent::COLOR_BUFFER1, textures[Tex_Normal]);
+            fbos[FBO_Intercept]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, Stereo::createMultiviewCompatibleAttachment(textures[Tex_Scene]));
+            fbos[FBO_Intercept]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER1, Stereo::createMultiviewCompatibleAttachment(textures[Tex_Normal]));
         }
         else
         {
-            setAttachment(fbos[FBO_FirstPerson], osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, textures[Tex_Scene]);
+            fbos[FBO_FirstPerson]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, Stereo::createMultiviewCompatibleAttachment(textures[Tex_Scene]));
             if (mNormals && mNormalsSupported)
-                setAttachment(fbos[FBO_FirstPerson], osg::FrameBufferObject::BufferComponent::COLOR_BUFFER1, textures[Tex_Normal]);
+                fbos[FBO_FirstPerson]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER1, Stereo::createMultiviewCompatibleAttachment(textures[Tex_Normal]));
         }
 
         if (textures[Tex_OpaqueDepth])
         {
             fbos[FBO_OpaqueDepth] = new osg::FrameBufferObject;
-            setAttachment(fbos[FBO_OpaqueDepth], osg::FrameBufferObject::BufferComponent::PACKED_DEPTH_STENCIL_BUFFER, textures[Tex_OpaqueDepth]);
+            fbos[FBO_OpaqueDepth]->setAttachment(osg::FrameBufferObject::BufferComponent::PACKED_DEPTH_STENCIL_BUFFER, Stereo::createMultiviewCompatibleAttachment(textures[Tex_OpaqueDepth]));
         }
 
 #ifdef __APPLE__
@@ -799,7 +720,7 @@ namespace MWRender
                 else
                     texture = new osg::Texture2D;
             }
-            setTextureSize(texture, width, height);
+            Stereo::setMultiviewCompatibleTextureSize(texture, width, height);
             texture->setSourceFormat(GL_RGBA);
             texture->setSourceType(GL_UNSIGNED_BYTE);
             texture->setInternalFormat(GL_RGBA);
diff --git a/apps/openmw/mwrender/skyutil.cpp b/apps/openmw/mwrender/skyutil.cpp
index 00bc2aef89..29a82f7eb0 100644
--- a/apps/openmw/mwrender/skyutil.cpp
+++ b/apps/openmw/mwrender/skyutil.cpp
@@ -615,9 +615,7 @@ namespace MWRender
     protected:
         void setDefaults(osg::StateSet* stateset) override
         {
-            if (Stereo::getMultiview())
-                stateset->addUniform(new osg::Uniform(osg::Uniform::FLOAT_MAT4, "projectionMatrixMultiView", 2), osg::StateAttribute::OVERRIDE);
-            else
+            if (!Stereo::getMultiview())
                 stateset->addUniform(new osg::Uniform(osg::Uniform::FLOAT_MAT4, "projectionMatrix"), osg::StateAttribute::OVERRIDE);
 
         }
@@ -626,7 +624,7 @@ namespace MWRender
         {
             if (Stereo::getMultiview())
             {
-                auto* projectionMatrixMultiViewUniform = stateset->getUniform("projectionMatrixMultiView");
+                std::array<osg::Matrix, 2> projectionMatrices;
                 auto& sm = Stereo::Manager::instance();
 
                 for (int view : {0, 1})
@@ -636,8 +634,10 @@ namespace MWRender
                     for (int col : {0, 1, 2})
                         viewOffsetMatrix(3, col) = 0;
 
-                    projectionMatrixMultiViewUniform->setElement(view, viewOffsetMatrix * projectionMatrix);
+                    projectionMatrices[view] = viewOffsetMatrix * projectionMatrix;
                 }
+
+                Stereo::setMultiviewMatrices(stateset, projectionMatrices);
             }
         }
         void applyLeft(osg::StateSet* stateset, osgUtil::CullVisitor* /*cv*/) override
diff --git a/apps/openmw/mwrender/transparentpass.cpp b/apps/openmw/mwrender/transparentpass.cpp
index 084eca1cdb..239a11821b 100644
--- a/apps/openmw/mwrender/transparentpass.cpp
+++ b/apps/openmw/mwrender/transparentpass.cpp
@@ -4,10 +4,6 @@
 #include <osg/Texture2D>
 #include <osg/Texture2DArray>
 
-#ifdef OSG_HAS_MULTIVIEW
-#include <osg/Texture2DMultisampleArray>
-#endif
-
 #include <osgUtil/RenderStage>
 
 #include <components/shader/shadermanager.hpp>
@@ -70,14 +66,11 @@ namespace MWRender
 
             if (Stereo::getMultiview())
             {
-                if (!mMultiviewDepthResolveLeftSource[frameId])
-                    setupMultiviewDepthResolveBuffers(frameId);
-                mMultiviewDepthResolveLeftTarget[frameId]->apply(state, osg::FrameBufferObject::BindTarget::DRAW_FRAMEBUFFER);
-                mMultiviewDepthResolveLeftSource[frameId]->apply(state, osg::FrameBufferObject::BindTarget::READ_FRAMEBUFFER);
-                ext->glBlitFramebuffer(0, 0, tex->getTextureWidth(), tex->getTextureHeight(), 0, 0, tex->getTextureWidth(), tex->getTextureHeight(), GL_DEPTH_BUFFER_BIT, GL_NEAREST);
-                mMultiviewDepthResolveRightTarget[frameId]->apply(state, osg::FrameBufferObject::BindTarget::DRAW_FRAMEBUFFER);
-                mMultiviewDepthResolveRightSource[frameId]->apply(state, osg::FrameBufferObject::BindTarget::READ_FRAMEBUFFER);
-                ext->glBlitFramebuffer(0, 0, tex->getTextureWidth(), tex->getTextureHeight(), 0, 0, tex->getTextureWidth(), tex->getTextureHeight(), GL_DEPTH_BUFFER_BIT, GL_NEAREST);
+                if (!mMultiviewResolve[frameId])
+                {
+                    mMultiviewResolve[frameId] = std::make_unique<Stereo::MultiviewFramebufferResolve>(msaaFbo ? msaaFbo : fbo, opaqueFbo, GL_DEPTH_BUFFER_BIT);
+                }
+                mMultiviewResolve[frameId]->resolveImplementation(state);
             }
             else
             {
@@ -107,42 +100,8 @@ namespace MWRender
 
         void TransparentDepthBinCallback::dirtyFrame(int frameId)
         {
-            mMultiviewDepthResolveLeftSource[frameId] = mMultiviewDepthResolveRightSource[frameId] = nullptr;
-            mMultiviewDepthResolveLeftTarget[frameId] = mMultiviewDepthResolveRightTarget[frameId] = nullptr;
-        }
-
-        osg::FrameBufferAttachment makeSingleLayerAttachmentFromMultilayerAttachment(osg::FrameBufferAttachment attachment, int layer)
-        {
-            osg::Texture* tex = attachment.getTexture();
-
-            if (tex->getTextureTarget() == GL_TEXTURE_2D_ARRAY)
-                return osg::FrameBufferAttachment(static_cast<osg::Texture2DArray*>(tex), layer, 0);
-
-#ifdef OSG_HAS_MULTIVIEW
-            if (tex->getTextureTarget() == GL_TEXTURE_2D_MULTISAMPLE_ARRAY)
-                return osg::FrameBufferAttachment(static_cast<osg::Texture2DMultisampleArray*>(tex), layer, 0);
-#endif
-
-            Log(Debug::Error) << "Attempted to extract a layer from an unlayered texture";
-
-            return osg::FrameBufferAttachment();
-        }
-
-        void TransparentDepthBinCallback::setupMultiviewDepthResolveBuffers(int frameId)
-        {
-            const osg::FrameBufferObject::BufferComponent component = osg::FrameBufferObject::BufferComponent::PACKED_DEPTH_STENCIL_BUFFER;
-            const auto& sourceFbo = mMsaaFbo[frameId] ? mMsaaFbo[frameId] : mFbo[frameId];
-            const auto& sourceAttachment = sourceFbo->getAttachment(component);
-            mMultiviewDepthResolveLeftSource[frameId] = new osg::FrameBufferObject;
-            mMultiviewDepthResolveLeftSource[frameId]->setAttachment(component, makeSingleLayerAttachmentFromMultilayerAttachment(sourceAttachment, 0));
-            mMultiviewDepthResolveRightSource[frameId] = new osg::FrameBufferObject;
-            mMultiviewDepthResolveRightSource[frameId]->setAttachment(component, makeSingleLayerAttachmentFromMultilayerAttachment(sourceAttachment, 1));
-            const auto& targetFbo = mOpaqueFbo[frameId];
-            const auto& targetAttachment = targetFbo->getAttachment(component);
-            mMultiviewDepthResolveLeftTarget[frameId] = new osg::FrameBufferObject;
-            mMultiviewDepthResolveLeftTarget[frameId]->setAttachment(component, makeSingleLayerAttachmentFromMultilayerAttachment(targetAttachment, 0));
-            mMultiviewDepthResolveRightTarget[frameId] = new osg::FrameBufferObject;
-            mMultiviewDepthResolveRightTarget[frameId]->setAttachment(component, makeSingleLayerAttachmentFromMultilayerAttachment(targetAttachment, 1));
+            if (mMultiviewResolve[frameId])
+                mMultiviewResolve[frameId]->dirty();
         }
 
 }
diff --git a/apps/openmw/mwrender/transparentpass.hpp b/apps/openmw/mwrender/transparentpass.hpp
index a9093acbf1..652fe8b8b7 100644
--- a/apps/openmw/mwrender/transparentpass.hpp
+++ b/apps/openmw/mwrender/transparentpass.hpp
@@ -15,6 +15,11 @@ namespace Shader
     class ShaderManager;
 }
 
+namespace Stereo
+{
+    class MultiviewFramebufferResolve;
+}
+
 namespace MWRender
 {
     class TransparentDepthBinCallback : public osgUtil::RenderBin::DrawCallback
@@ -24,16 +29,12 @@ namespace MWRender
 
         void drawImplementation(osgUtil::RenderBin* bin, osg::RenderInfo& renderInfo, osgUtil::RenderLeaf*& previous) override;
         void dirtyFrame(int frameId);
-        void setupMultiviewDepthResolveBuffers(int frameId);
 
         std::array<osg::ref_ptr<osg::FrameBufferObject>, 2> mFbo;
         std::array<osg::ref_ptr<osg::FrameBufferObject>, 2> mMsaaFbo;
         std::array<osg::ref_ptr<osg::FrameBufferObject>, 2> mOpaqueFbo;
 
-        std::array<osg::ref_ptr<osg::FrameBufferObject>, 2> mMultiviewDepthResolveLeftSource;
-        std::array<osg::ref_ptr<osg::FrameBufferObject>, 2> mMultiviewDepthResolveRightSource;
-        std::array<osg::ref_ptr<osg::FrameBufferObject>, 2> mMultiviewDepthResolveLeftTarget;
-        std::array<osg::ref_ptr<osg::FrameBufferObject>, 2> mMultiviewDepthResolveRightTarget;
+        std::array<std::unique_ptr<Stereo::MultiviewFramebufferResolve>, 2> mMultiviewResolve;
 
     private:
         osg::ref_ptr<osg::StateSet> mStateSet;
diff --git a/components/sceneutil/rtt.cpp b/components/sceneutil/rtt.cpp
index 4ab1b4c92a..19daf2b560 100644
--- a/components/sceneutil/rtt.cpp
+++ b/components/sceneutil/rtt.cpp
@@ -200,21 +200,20 @@ namespace SceneUtil
             if (camera->getBufferAttachmentMap().count(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER))
                 vdd->mDepthTexture = camera->getBufferAttachmentMap()[osg::Camera::PACKED_DEPTH_STENCIL_BUFFER]._texture;
 
-#ifdef OSG_HAS_MULTIVIEW
             if (shouldDoTextureArray())
             {
                 // Create any buffer attachments not added in setDefaults
                 if (camera->getBufferAttachmentMap().count(osg::Camera::COLOR_BUFFER) == 0)
                 {
                     vdd->mColorTexture = createTextureArray(mColorBufferInternalFormat);
-                    camera->attach(osg::Camera::COLOR_BUFFER, vdd->mColorTexture, 0, osg::Camera::FACE_CONTROLLED_BY_MULTIVIEW_SHADER, mGenerateMipmaps, mSamples);
-                    SceneUtil::attachAlphaToCoverageFriendlyFramebufferToCamera(camera, osg::Camera::COLOR_BUFFER, vdd->mColorTexture, 0, osg::Camera::FACE_CONTROLLED_BY_MULTIVIEW_SHADER, mGenerateMipmaps);
+                    camera->attach(osg::Camera::COLOR_BUFFER, vdd->mColorTexture, 0, Stereo::osgFaceControlledByMultiviewShader(), mGenerateMipmaps, mSamples);
+                    SceneUtil::attachAlphaToCoverageFriendlyFramebufferToCamera(camera, osg::Camera::COLOR_BUFFER, vdd->mColorTexture, 0, Stereo::osgFaceControlledByMultiviewShader(), mGenerateMipmaps);
                 }
 
                 if (camera->getBufferAttachmentMap().count(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER) == 0)
                 {
                     vdd->mDepthTexture = createTextureArray(mDepthBufferInternalFormat);
-                    camera->attach(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, vdd->mDepthTexture, 0, osg::Camera::FACE_CONTROLLED_BY_MULTIVIEW_SHADER, false, mSamples);
+                    camera->attach(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, vdd->mDepthTexture, 0, Stereo::osgFaceControlledByMultiviewShader(), false, mSamples);
                 }
 
                 if (shouldDoTextureView())
@@ -226,7 +225,6 @@ namespace SceneUtil
                 }
             }
             else
-#endif
             {
                 // Create any buffer attachments not added in setDefaults
                 if (camera->getBufferAttachmentMap().count(osg::Camera::COLOR_BUFFER) == 0)
diff --git a/components/stereo/frustum.cpp b/components/stereo/frustum.cpp
index d9727e9ea6..40a355ed55 100644
--- a/components/stereo/frustum.cpp
+++ b/components/stereo/frustum.cpp
@@ -27,31 +27,32 @@
 
 #include <components/settings/settings.hpp>
 
+#include <components/stereo/multiview.hpp>
+
 #include <components/misc/stringops.hpp>
 #include "frustum.hpp"
 
 namespace Stereo
 {
-#ifdef OSG_HAS_MULTIVIEW
-    struct MultiviewFrustumCallback final : public osg::CullSettings::InitialFrustumCallback
+    struct MultiviewFrustumCallback final : public Stereo::InitialFrustumCallback
     {
-        MultiviewFrustumCallback(StereoFrustumManager* sfm)
-            : mSfm(sfm)
+        MultiviewFrustumCallback(StereoFrustumManager* sfm, osg::Camera* camera)
+            : Stereo::InitialFrustumCallback(camera)
+            , mSfm(sfm)
         {
 
         }
 
-        void setInitialFrustum(osg::CullStack& cullStack, osg::Polytope& frustum) const override
+        void setInitialFrustum(osg::CullStack& cullStack, osg::BoundingBoxd& bb, bool& nearCulling, bool& farCulling) const override
         {
             auto cm = cullStack.getCullingMode();
-            bool nearCulling = !!(cm & osg::CullSettings::NEAR_PLANE_CULLING);
-            bool farCulling = !!(cm & osg::CullSettings::FAR_PLANE_CULLING);
-            frustum.setToBoundingBox(mSfm->boundingBox(), nearCulling, farCulling);
+            nearCulling = !!(cm & osg::CullSettings::NEAR_PLANE_CULLING);
+            farCulling = !!(cm & osg::CullSettings::FAR_PLANE_CULLING);
+            bb = mSfm->boundingBox();
         }
 
         StereoFrustumManager* mSfm;
     };
-#endif
 
     struct ShadowFrustumCallback final : public SceneUtil::MWShadowTechnique::CustomFrustumCallback
     {
@@ -95,14 +96,10 @@ namespace Stereo
         : mCamera(camera)
         , mShadowTechnique(nullptr)
         , mShadowFrustumCallback(nullptr)
-        , mMultiview(Stereo::getMultiview())
     {
-        if (mMultiview)
+        if (Stereo::getMultiview())
         {
-#ifdef OSG_HAS_MULTIVIEW
-            mMultiviewFrustumCallback = new MultiviewFrustumCallback(this);
-            mCamera->setInitialFrustumCallback(mMultiviewFrustumCallback);
-#endif
+            mMultiviewFrustumCallback = std::make_unique<MultiviewFrustumCallback>(this, camera);
         }
 
         if (Settings::Manager::getBool("shared shadow maps", "Stereo"))
@@ -118,13 +115,6 @@ namespace Stereo
 
     StereoFrustumManager::~StereoFrustumManager()
     {
-        if (mMultiview)
-        {
-#ifdef OSG_HAS_MULTIVIEW
-            mCamera->setInitialFrustumCallback(nullptr);
-#endif
-        }
-
         if (mShadowTechnique)
             mShadowTechnique->setCustomFrustumCallback(nullptr);
     }
diff --git a/components/stereo/frustum.hpp b/components/stereo/frustum.hpp
index 8d457c82b9..d6a624987d 100644
--- a/components/stereo/frustum.hpp
+++ b/components/stereo/frustum.hpp
@@ -38,10 +38,7 @@ namespace SceneUtil
 
 namespace Stereo
 {
-#ifdef OSG_HAS_MULTIVIEW
     struct MultiviewFrustumCallback;
-#endif
-
     struct ShadowFrustumCallback;
 
     void joinBoundingBoxes(const osg::Matrix& masterProjection, const osg::Matrix& slaveProjection, osg::BoundingBoxd& bb);
@@ -64,13 +61,10 @@ namespace Stereo
         osg::ref_ptr<osg::Camera> mCamera;
         osg::ref_ptr<SceneUtil::MWShadowTechnique> mShadowTechnique;
         osg::ref_ptr<ShadowFrustumCallback> mShadowFrustumCallback;
-        bool mMultiview;
         std::map< osgUtil::CullVisitor*, osgUtil::CullVisitor*> mSharedFrustums;
         osg::BoundingBoxd mBoundingBox;
 
-#ifdef OSG_HAS_MULTIVIEW
-        osg::ref_ptr<MultiviewFrustumCallback> mMultiviewFrustumCallback;
-#endif
+        std::unique_ptr<MultiviewFrustumCallback> mMultiviewFrustumCallback;
     };
 }
 
diff --git a/components/stereo/multiview.cpp b/components/stereo/multiview.cpp
index 0011b93687..e0cac44714 100644
--- a/components/stereo/multiview.cpp
+++ b/components/stereo/multiview.cpp
@@ -3,6 +3,7 @@
 #include <osg/FrameBufferObject>
 #include <osg/GLExtensions>
 #include <osg/Texture2D>
+#include <osg/Texture2DMultisample>
 #include <osg/Texture2DArray>
 #include <osgUtil/RenderStage>
 #include <osgUtil/CullVisitor>
@@ -337,6 +338,133 @@ namespace Stereo
 #endif
     }
 
+    void setMultiviewMatrices(osg::StateSet* stateset, const std::array<osg::Matrix, 2>& projection, bool createInverseMatrices)
+    {
+        auto* projUniform = stateset->getUniform("projectionMatrixMultiView");
+        if (!projUniform)
+        {
+            projUniform = new osg::Uniform(osg::Uniform::FLOAT_MAT4, "projectionMatrixMultiView", 2);
+            stateset->addUniform(projUniform, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+        }
+
+        projUniform->setElement(0, projection[0]);
+        projUniform->setElement(1, projection[1]);
+
+        if (createInverseMatrices)
+        {
+            auto* invUniform = stateset->getUniform("invProjectionMatrixMultiView");
+            if (!invUniform)
+            {
+                invUniform = new osg::Uniform(osg::Uniform::FLOAT_MAT4, "invProjectionMatrixMultiView", 2);
+                stateset->addUniform(invUniform, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+            }
+
+            invUniform->setElement(0, osg::Matrix::inverse(projection[0]));
+            invUniform->setElement(1, osg::Matrix::inverse(projection[1]));
+        }
+    }
+
+    void setMultiviewCompatibleTextureSize(osg::Texture* tex, int w, int h)
+    {
+        switch (tex->getTextureTarget())
+        {
+        case GL_TEXTURE_2D:
+            static_cast<osg::Texture2D*>(tex)->setTextureSize(w, h);
+            break;
+        case GL_TEXTURE_2D_ARRAY:
+            static_cast<osg::Texture2DArray*>(tex)->setTextureSize(w, h, 2);
+            break;
+        case GL_TEXTURE_2D_MULTISAMPLE:
+            static_cast<osg::Texture2DMultisample*>(tex)->setTextureSize(w, h);
+            break;
+#ifdef OSG_HAS_MULTIVIEW
+        case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
+            static_cast<osg::Texture2DMultisampleArray*>(tex)->setTextureSize(w, h, 2);
+            break;
+#endif
+        default:
+            throw std::logic_error("Invalid texture type received");
+        }
+    }
+
+    osg::ref_ptr<osg::Texture> createMultiviewCompatibleTexture(int width, int height, int samples)
+    {
+#ifdef OSG_HAS_MULTIVIEW
+        if (Stereo::getMultiview())
+        {
+            if (samples > 1)
+            {
+                auto tex = new osg::Texture2DMultisampleArray();
+                tex->setTextureSize(width, height, 2);
+                tex->setNumSamples(samples);
+                return tex;
+            }
+            else
+            {
+                auto tex = new osg::Texture2DArray();
+                tex->setTextureSize(width, height, 2);
+                return tex;
+            }
+        }
+        else
+#endif
+        {
+            if (samples > 1)
+            {
+                auto tex = new osg::Texture2DMultisample();
+                tex->setTextureSize(width, height);
+                tex->setNumSamples(samples);
+                return tex;
+            }
+            else
+            {
+                auto tex = new osg::Texture2D();
+                tex->setTextureSize(width, height);
+                return tex;
+            }
+        }
+    }
+
+    osg::FrameBufferAttachment createMultiviewCompatibleAttachment(osg::Texture* tex)
+    {
+        switch (tex->getTextureTarget())
+        {
+        case GL_TEXTURE_2D:
+        {
+            auto* tex2d = static_cast<osg::Texture2D*>(tex);
+            return osg::FrameBufferAttachment(tex2d);
+        }
+        case GL_TEXTURE_2D_MULTISAMPLE:
+        {
+            auto* tex2dMsaa = static_cast<osg::Texture2DMultisample*>(tex);
+            return osg::FrameBufferAttachment(tex2dMsaa);
+        }
+#ifdef OSG_HAS_MULTIVIEW
+        case GL_TEXTURE_2D_ARRAY:
+        {
+            auto* tex2dArray = static_cast<osg::Texture2DArray*>(tex);
+            return osg::FrameBufferAttachment(tex2dArray, osg::Camera::FACE_CONTROLLED_BY_MULTIVIEW_SHADER, 0);
+        }
+        case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
+        {
+            auto* tex2dMsaaArray = static_cast<osg::Texture2DMultisampleArray*>(tex);
+            return osg::FrameBufferAttachment(tex2dMsaaArray, osg::Camera::FACE_CONTROLLED_BY_MULTIVIEW_SHADER, 0);
+        }
+#endif
+        default:
+            throw std::logic_error("Invalid texture type received");
+        }
+    }
+
+    unsigned int osgFaceControlledByMultiviewShader()
+    {
+#ifdef OSG_HAS_MULTIVIEW
+        return osg::Camera::FACE_CONTROLLED_BY_MULTIVIEW_SHADER;
+#else
+        return 0;
+#endif
+    }
+
     class UpdateRenderStagesCallback : public SceneUtil::NodeCallback<UpdateRenderStagesCallback, osg::Node*, osgUtil::CullVisitor*>
     {
     public:
@@ -558,4 +686,111 @@ namespace Stereo
         textureArray->setWrap(osg::Texture::WRAP_R, osg::Texture::CLAMP_TO_EDGE);
         return textureArray;
     }
+
+
+    osg::FrameBufferAttachment makeSingleLayerAttachmentFromMultilayerAttachment(osg::FrameBufferAttachment attachment, int layer)
+    {
+        osg::Texture* tex = attachment.getTexture();
+
+        if (tex->getTextureTarget() == GL_TEXTURE_2D_ARRAY)
+            return osg::FrameBufferAttachment(static_cast<osg::Texture2DArray*>(tex), layer, 0);
+
+#ifdef OSG_HAS_MULTIVIEW
+        if (tex->getTextureTarget() == GL_TEXTURE_2D_MULTISAMPLE_ARRAY)
+            return osg::FrameBufferAttachment(static_cast<osg::Texture2DMultisampleArray*>(tex), layer, 0);
+#endif
+
+        Log(Debug::Error) << "Attempted to extract a layer from an unlayered texture";
+
+        return osg::FrameBufferAttachment();
+    }
+
+    MultiviewFramebufferResolve::MultiviewFramebufferResolve(osg::FrameBufferObject* msaaFbo, osg::FrameBufferObject* resolveFbo, GLbitfield blitMask)
+        : mResolveFbo(resolveFbo)
+        , mMsaaFbo(msaaFbo)
+        , mBlitMask(blitMask)
+    {
+    }
+
+    void MultiviewFramebufferResolve::resolveImplementation(osg::State& state)
+    {
+        if (mDirtyLayers)
+            setupLayers();
+
+        osg::GLExtensions* ext = state.get<osg::GLExtensions>();
+
+        for (int view : {0, 1})
+        {
+            mResolveLayers[view]->apply(state, osg::FrameBufferObject::BindTarget::DRAW_FRAMEBUFFER);
+            mMsaaLayers[view]->apply(state, osg::FrameBufferObject::BindTarget::READ_FRAMEBUFFER);
+            ext->glBlitFramebuffer(0, 0, mWidth, mHeight, 0, 0, mWidth, mHeight, GL_DEPTH_BUFFER_BIT, GL_NEAREST);
+        }
+    }
+    void MultiviewFramebufferResolve::setupLayers()
+    {
+        mDirtyLayers = false;
+        std::vector<osg::FrameBufferObject::BufferComponent> components;
+        if (mBlitMask & GL_DEPTH_BUFFER_BIT)
+            components.push_back(osg::FrameBufferObject::BufferComponent::PACKED_DEPTH_STENCIL_BUFFER);
+        if (mBlitMask & GL_COLOR_BUFFER_BIT)
+            components.push_back(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER);
+
+        mMsaaLayers = { new osg::FrameBufferObject, new osg::FrameBufferObject };
+        mResolveLayers = { new osg::FrameBufferObject, new osg::FrameBufferObject };
+        for (auto component : components)
+        {
+            const auto& msaaAttachment = mMsaaFbo->getAttachment(component);
+            mMsaaLayers[0]->setAttachment(component, makeSingleLayerAttachmentFromMultilayerAttachment(msaaAttachment, 0));
+            mMsaaLayers[1]->setAttachment(component, makeSingleLayerAttachmentFromMultilayerAttachment(msaaAttachment, 1));
+
+            const auto& resolveAttachment = mResolveFbo->getAttachment(component);
+            mResolveLayers[0]->setAttachment(component, makeSingleLayerAttachmentFromMultilayerAttachment(resolveAttachment, 0));
+            mResolveLayers[1]->setAttachment(component, makeSingleLayerAttachmentFromMultilayerAttachment(resolveAttachment, 1));
+
+            mWidth = msaaAttachment.getTexture()->getTextureWidth();
+            mHeight = msaaAttachment.getTexture()->getTextureHeight();
+        }
+    }
+
+#ifdef OSG_HAS_MULTIVIEW
+    namespace
+    {
+        struct MultiviewFrustumCallback final : public osg::CullSettings::InitialFrustumCallback
+        {
+            MultiviewFrustumCallback(Stereo::InitialFrustumCallback* ifc)
+                : mIfc(ifc)
+            {
+
+            }
+
+            void setInitialFrustum(osg::CullStack& cullStack, osg::Polytope& frustum) const override
+            {
+                bool nearCulling = false;
+                bool farCulling = false;
+                osg::BoundingBoxd bb;
+                mIfc->setInitialFrustum(cullStack, bb, nearCulling, farCulling);
+                frustum.setToBoundingBox(bb, nearCulling, farCulling);
+            }
+
+            Stereo::InitialFrustumCallback* mIfc;
+        };
+    }
+#endif
+
+    InitialFrustumCallback::InitialFrustumCallback(osg::Camera* camera)
+        : mCamera(camera)
+    {
+#ifdef OSG_HAS_MULTIVIEW
+        camera->setInitialFrustumCallback(new MultiviewFrustumCallback(this));
+#endif
+    }
+
+    InitialFrustumCallback::~InitialFrustumCallback()
+    {
+#ifdef OSG_HAS_MULTIVIEW
+        osg::ref_ptr<osg::Camera> camera;
+        if(mCamera.lock(camera))
+            camera->setInitialFrustumCallback(nullptr);
+#endif
+    }
 }
diff --git a/components/stereo/multiview.hpp b/components/stereo/multiview.hpp
index 3212ecc02c..418c69e159 100644
--- a/components/stereo/multiview.hpp
+++ b/components/stereo/multiview.hpp
@@ -4,6 +4,7 @@
 #include <osg/ref_ptr>
 #include <osg/GL>
 #include <osg/Camera>
+#include <osg/FrameBufferObject>
 
 #include <array>
 #include <memory>
@@ -40,9 +41,6 @@ namespace Stereo
     //! Creates a Texture2D as a texture view into a Texture2DArray
     osg::ref_ptr<osg::Texture2D> createTextureView_Texture2DFromTexture2DArray(osg::Texture2DArray* textureArray, int layer);
 
-    //! Sets up a draw callback on the render stage that performs the MSAA resolve operation
-    void setMultiviewMSAAResolveCallback(osgUtil::RenderStage* renderStage);
-
     //! Class that manages the specifics of GL_OVR_Multiview aware framebuffers, separating the layers into separate framebuffers, and disabling
     class MultiviewFramebuffer
     {
@@ -86,6 +84,61 @@ namespace Stereo
         std::array<osg::ref_ptr<osg::Texture2D>, 2> mDepthTexture;
     };
 
+    //! Sets up a draw callback on the render stage that performs the MSAA resolve operation
+    void setMultiviewMSAAResolveCallback(osgUtil::RenderStage* renderStage);
+
+    //! Sets up or updates multiview matrices for the given stateset
+    void setMultiviewMatrices(osg::StateSet* stateset, const std::array<osg::Matrix, 2>& projection, bool createInverseMatrices = false);
+
+    //! Sets the width/height of a texture by first down-casting it to the appropriate type. Sets depth to 2 always for Texture2DArray and Texture2DMultisampleArray.
+    void setMultiviewCompatibleTextureSize(osg::Texture* tex, int w, int h);
+
+    //! Creates a texture (Texture2D, Texture2DMultisample, Texture2DArray, or Texture2DMultisampleArray) based on multiview settings and sample count.
+    osg::ref_ptr<osg::Texture> createMultiviewCompatibleTexture(int width, int height, int samples);
+
+    //! Returns a framebuffer attachment from the texture, returning a multiview attachment if the texture is one of Texture2DArray or Texture2DMultisampleArray
+    osg::FrameBufferAttachment createMultiviewCompatibleAttachment(osg::Texture* tex);
+
+    //! If OSG has multiview, returns the magic number used to tell OSG to create a multiview attachment. Otherwise returns 0.
+    unsigned int osgFaceControlledByMultiviewShader();
+
+    //! Implements resolving a multisamples multiview framebuffer. Does not automatically reflect changes to the fbo attachments, must call dirty() when the fbo attachments change.
+    class MultiviewFramebufferResolve
+    {
+    public:
+        MultiviewFramebufferResolve(osg::FrameBufferObject* msaaFbo, osg::FrameBufferObject* resolveFbo, GLbitfield blitMask);
+
+        void resolveImplementation(osg::State& state);
+
+        void dirty() { mDirtyLayers = true; }
+
+        const osg::FrameBufferObject* resolveFbo() const { return mResolveFbo; };
+        const osg::FrameBufferObject* msaaFbo() const { return mMsaaFbo; };
+
+    private:
+        void setupLayers();
+
+        osg::ref_ptr<osg::FrameBufferObject> mResolveFbo;
+        std::array<osg::ref_ptr<osg::FrameBufferObject>, 2> mResolveLayers{};
+        osg::ref_ptr<osg::FrameBufferObject> mMsaaFbo;
+        std::array<osg::ref_ptr<osg::FrameBufferObject>, 2> mMsaaLayers{};
+
+        GLbitfield mBlitMask;
+        bool mDirtyLayers = true;
+        int mWidth = -1;
+        int mHeight = -1;
+    };
+
+    //! Wrapper for osg::CullSettings::InitialFrustumCallback, to avoid exposing osg multiview interfaces outside of multiview.cpp
+    struct InitialFrustumCallback
+    {
+        InitialFrustumCallback(osg::Camera* camera);
+        virtual ~InitialFrustumCallback();
+
+        virtual void setInitialFrustum(osg::CullStack& cullStack, osg::BoundingBoxd& bb, bool& nearCulling, bool& farCulling) const = 0;
+
+        osg::observer_ptr<osg::Camera> mCamera;
+    };
 }
 
 #endif
diff --git a/components/stereo/stereomanager.cpp b/components/stereo/stereomanager.cpp
index 7964c5c134..2c4b8a35e6 100644
--- a/components/stereo/stereomanager.cpp
+++ b/components/stereo/stereomanager.cpp
@@ -97,7 +97,6 @@ namespace Stereo
     protected:
         virtual void setDefaults(osg::StateSet* stateset)
         {
-            stateset->addUniform(new osg::Uniform(osg::Uniform::FLOAT_MAT4, "projectionMatrixMultiView", 2));
             stateset->addUniform(new osg::Uniform(osg::Uniform::FLOAT_MAT4, "invProjectionMatrixMultiView", 2));
         }
 
@@ -195,8 +194,8 @@ namespace Stereo
         mEyeResolutionOverride = eyeResolution;
         mEyeResolutionOverriden = true;
 
-        if (mMultiviewFramebuffer)
-            updateStereoFramebuffer();
+        //if (mMultiviewFramebuffer)
+        //    updateStereoFramebuffer();
     }
 
     void Manager::screenResolutionChanged()
@@ -302,14 +301,14 @@ namespace Stereo
     void Manager::updateStereoFramebuffer()
     {
         //VR-TODO: in VR, still need to have this framebuffer attached before the postprocessor is created
-        auto samples = Settings::Manager::getInt("antialiasing", "Video");
-        auto eyeRes = eyeResolution();
+        //auto samples = Settings::Manager::getInt("antialiasing", "Video");
+        //auto eyeRes = eyeResolution();
 
         //if (mMultiviewFramebuffer)
         //    mMultiviewFramebuffer->detachFrom(mMainCamera);
-        mMultiviewFramebuffer = std::make_shared<MultiviewFramebuffer>(static_cast<int>(eyeRes.x()), static_cast<int>(eyeRes.y()), samples);
-        mMultiviewFramebuffer->attachColorComponent(SceneUtil::Color::colorSourceFormat(), SceneUtil::Color::colorSourceType(), SceneUtil::Color::colorInternalFormat());
-        mMultiviewFramebuffer->attachDepthComponent(SceneUtil::AutoDepth::depthSourceFormat(), SceneUtil::AutoDepth::depthSourceType(), SceneUtil::AutoDepth::depthInternalFormat());
+        //mMultiviewFramebuffer = std::make_shared<MultiviewFramebuffer>(static_cast<int>(eyeRes.x()), static_cast<int>(eyeRes.y()), samples);
+        //mMultiviewFramebuffer->attachColorComponent(SceneUtil::Color::colorSourceFormat(), SceneUtil::Color::colorSourceType(), SceneUtil::Color::colorInternalFormat());
+        //mMultiviewFramebuffer->attachDepthComponent(SceneUtil::AutoDepth::depthSourceFormat(), SceneUtil::AutoDepth::depthSourceType(), SceneUtil::AutoDepth::depthInternalFormat());
         //mMultiviewFramebuffer->attachTo(mMainCamera);
     }
 
@@ -376,17 +375,12 @@ namespace Stereo
 
     void Manager::updateMultiviewStateset(osg::StateSet* stateset)
     {
-        // Update stereo uniforms
-        auto * projectionMatrixMultiViewUniform = stateset->getUniform("projectionMatrixMultiView");
-        auto * invProjectionMatrixMultiViewUniform = stateset->getUniform("invProjectionMatrixMultiView");
+        std::array<osg::Matrix, 2> projectionMatrices;
 
         for (int view : {0, 1})
-        {
-            auto projectionMatrix = computeEyeViewOffset(view) * computeEyeProjection(view, SceneUtil::AutoDepth::isReversed());
-            auto invProjectionMatrix = osg::Matrix::inverse(projectionMatrix);
-            projectionMatrixMultiViewUniform->setElement(view, projectionMatrix);
-            invProjectionMatrixMultiViewUniform->setElement(view, invProjectionMatrix);
-        }
+            projectionMatrices[view] = computeEyeViewOffset(view) * computeEyeProjection(view, SceneUtil::AutoDepth::isReversed());
+
+        Stereo::setMultiviewMatrices(stateset, projectionMatrices, true);
     }
 
     void Manager::setUpdateViewCallback(std::shared_ptr<UpdateViewCallback> cb)

From bb7e40bfd8d7ec83c99a7d5eef6a16fd3d474efa Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 11 Jul 2022 22:32:59 +0200
Subject: [PATCH 2786/2859] Support generating Lua API reference from
 self-built docker container

---
 docs/source/Dockerfile.luadoc            | 26 ++++++++++++++++++++++++
 docs/source/README.md                    | 18 ++++++++++++++++
 docs/source/generate_luadoc_in_docker.sh | 22 ++++++++++++++++++++
 3 files changed, 66 insertions(+)
 create mode 100644 docs/source/Dockerfile.luadoc
 create mode 100644 docs/source/README.md
 create mode 100755 docs/source/generate_luadoc_in_docker.sh

diff --git a/docs/source/Dockerfile.luadoc b/docs/source/Dockerfile.luadoc
new file mode 100644
index 0000000000..d449b97ab7
--- /dev/null
+++ b/docs/source/Dockerfile.luadoc
@@ -0,0 +1,26 @@
+FROM ubuntu:22.04
+
+RUN apt update && \
+    apt install -y make gcc libreadline-dev wget unzip git zip && \
+    rm -rf /var/lib/apt/lists/*
+
+ADD https://www.lua.org/ftp/lua-5.1.5.tar.gz /tmp/lua-5.1.5.tar.gz
+RUN tar -zxf /tmp/lua-5.1.5.tar.gz -C /tmp && rm /tmp/lua-5.1.5.tar.gz
+RUN cd /tmp/lua-5.1.5 && \
+    make linux -j $(nproc) && \
+    make install && \
+    rm -r /tmp/lua-5.1.5
+
+ADD https://luarocks.org/releases/luarocks-2.4.2.tar.gz /tmp/luarocks-2.4.2.tar.gz
+RUN tar -zxpf /tmp/luarocks-2.4.2.tar.gz -C /tmp && rm /tmp/luarocks-2.4.2.tar.gz
+RUN cd /tmp/luarocks-2.4.2 && \
+    ./configure && \
+    make build -j $(nproc) && \
+    make install && \
+    rm -r /tmp/luarocks-2.4.2
+
+ADD https://gitlab.com/ptmikheev/openmw-luadocumentor/-/raw/master/luarocks/openmwluadocumentor-0.1.1-1.rockspec /tmp/openmwluadocumentor-0.1.1-1.rockspec
+RUN cd /tmp && \
+    luarocks pack openmwluadocumentor-0.1.1-1.rockspec && \
+    luarocks install openmwluadocumentor-0.1.1-1.src.rock && \
+    rm /tmp/openmwluadocumentor-0.1.1-1.rockspec /tmp/openmwluadocumentor-0.1.1-1.src.rock
diff --git a/docs/source/README.md b/docs/source/README.md
new file mode 100644
index 0000000000..f36a1ad3d0
--- /dev/null
+++ b/docs/source/README.md
@@ -0,0 +1,18 @@
+# Source files for OpenMW documentation
+
+## Generating Lua scripting API reference
+
+### Building Docker image
+
+Run following command from OpenMW source directory to build a new Docker image `openmw.luadoc`:
+```bash
+docker build -f docs/source/Dockerfile.luadoc -t openmw.luadoc docs/source
+```
+
+### Generating HTML
+
+Run following command from OpenMW source directory to generate HTML pages:
+```bash
+docker run --rm --tty --interactive --user "$(id -u)":"$(id -g)" \
+    --volume "${PWD}":/openmw openmw.luadoc /openmw/docs/source/generate_luadoc_in_docker.sh
+```
diff --git a/docs/source/generate_luadoc_in_docker.sh b/docs/source/generate_luadoc_in_docker.sh
new file mode 100755
index 0000000000..edd33ecb06
--- /dev/null
+++ b/docs/source/generate_luadoc_in_docker.sh
@@ -0,0 +1,22 @@
+#!/bin/bash -e
+
+if ! [[ -f "/.dockerenv" ]]; then
+    echo "Run this script inside Docker container" >&2
+    exit -1
+fi
+
+FILES_DIR=/openmw/files
+OUTPUT_DIR=/openmw/docs/source/reference/lua-scripting/generated_html
+
+rm -rf "${OUTPUT_DIR}"
+mkdir "${OUTPUT_DIR}"
+
+cd "${FILES_DIR}/lua_api"
+openmwluadocumentor -f doc -d "${OUTPUT_DIR}" openmw/*lua
+
+cd "${FILES_DIR}/data"
+openmwluadocumentor -f doc -d "${OUTPUT_DIR}" openmw_aux/*lua
+openmwluadocumentor -f doc -d "${OUTPUT_DIR}" scripts/omw/ai.lua
+openmwluadocumentor -f doc -d "${OUTPUT_DIR}" scripts/omw/camera/camera.lua
+openmwluadocumentor -f doc -d "${OUTPUT_DIR}" scripts/omw/mwui/init.lua
+openmwluadocumentor -f doc -d "${OUTPUT_DIR}" scripts/omw/settings/player.lua

From ccbb5e03fbb4e75e24860c8064b60cbe02cb3a48 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 4 Jul 2022 21:45:44 +0400
Subject: [PATCH 2787/2859] Use YAML files to translate MyGUI's localization
 tags

---
 CHANGELOG.md                                  |   1 +
 apps/openmw/engine.cpp                        |   1 +
 apps/openmw/mwbase/luamanager.hpp             |   1 +
 apps/openmw/mwgui/debugwindow.cpp             |   2 +
 apps/openmw/mwgui/postprocessorhud.cpp        |  20 +--
 apps/openmw/mwgui/savegamedialog.cpp          |   4 +-
 apps/openmw/mwgui/settingswindow.cpp          |  53 +++++--
 apps/openmw/mwgui/windowmanagerimp.cpp        |  18 ++-
 apps/openmw/mwinput/bindingsmanager.cpp       |  10 +-
 apps/openmw/mwlua/luamanagerimp.cpp           |  18 ++-
 apps/openmw/mwlua/luamanagerimp.hpp           |   5 +
 .../detournavigator/asyncnavmeshupdater.cpp   |   2 +-
 components/lua/l10n.cpp                       |   6 +
 components/lua/l10n.hpp                       |   1 +
 components/widgets/box.cpp                    |  19 +++
 components/widgets/box.hpp                    |   9 ++
 components/widgets/widgets.cpp                |   1 +
 files/data/CMakeLists.txt                     |  10 ++
 files/data/l10n/DebugMenu/en.yaml             |   3 +
 files/data/l10n/DebugMenu/ru.yaml             |   3 +
 files/data/l10n/Interface/en.yaml             |   5 +-
 files/data/l10n/Interface/ru.yaml             |   3 +-
 files/data/l10n/Navigation/en.yaml            |   1 +
 files/data/l10n/Navigation/ru.yaml            |   1 +
 files/data/l10n/PostProcessing/en.yaml        |  20 +++
 files/data/l10n/PostProcessing/ru.yaml        |  20 +++
 files/data/l10n/SavegameMenu/en.yaml          |   2 +
 files/data/l10n/SavegameMenu/ru.yaml          |   2 +
 files/data/l10n/SettingsMenu/en.yaml          |  59 ++++++++
 files/data/l10n/SettingsMenu/ru.yaml          |  59 ++++++++
 files/mygui/openmw_chargen_birth.layout       |   2 +-
 files/mygui/openmw_debug_window.layout        |   2 +-
 files/mygui/openmw_postprocessor_hud.layout   |  12 +-
 files/mygui/openmw_postprocessor_hud.skin.xml |   6 +-
 files/mygui/openmw_savegame_dialog.layout     |   2 +-
 files/mygui/openmw_settings_window.layout     | 136 +++++++++---------
 files/mygui/openmw_text_input.layout          |   2 +-
 37 files changed, 396 insertions(+), 125 deletions(-)
 create mode 100644 files/data/l10n/DebugMenu/en.yaml
 create mode 100644 files/data/l10n/DebugMenu/ru.yaml
 create mode 100644 files/data/l10n/Navigation/en.yaml
 create mode 100644 files/data/l10n/Navigation/ru.yaml
 create mode 100644 files/data/l10n/PostProcessing/en.yaml
 create mode 100644 files/data/l10n/PostProcessing/ru.yaml
 create mode 100644 files/data/l10n/SavegameMenu/en.yaml
 create mode 100644 files/data/l10n/SavegameMenu/ru.yaml
 create mode 100644 files/data/l10n/SettingsMenu/en.yaml
 create mode 100644 files/data/l10n/SettingsMenu/ru.yaml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ee2e99bba..8b121947f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -178,6 +178,7 @@
     Feature #6700: Support windowed fullscreen
     Feature #6706: Save the size of the Options window
     Feature #6721: [OpenMW-CS] Add option to open records in new window
+    Feature #6867: Add a way to localize hardcoded strings in GUI
     Task #6078: First person should not clear depth buffer
     Task #6161: Refactor Sky to use shaders and be GLES/GL3 friendly
     Task #6162: Refactor GUI to use shaders and to be GLES and GL3+ friendly
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 215b2e10c5..76c164c90e 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -852,6 +852,7 @@ void OMW::Engine::prepareEngine()
     mEnvironment.setWorld(*mWorld);
 
     mWindowManager->setStore(mWorld->getStore());
+    mLuaManager->initL10n();
     mWindowManager->initUI();
 
     //Load translation data
diff --git a/apps/openmw/mwbase/luamanager.hpp b/apps/openmw/mwbase/luamanager.hpp
index c174dddce3..64be66812b 100644
--- a/apps/openmw/mwbase/luamanager.hpp
+++ b/apps/openmw/mwbase/luamanager.hpp
@@ -31,6 +31,7 @@ namespace MWBase
     public:
         virtual ~LuaManager() = default;
 
+        virtual std::string translate(const std::string& contextName, const std::string& key) = 0;
         virtual void newGameStarted() = 0;
         virtual void gameLoaded() = 0;
         virtual void registerObject(const MWWorld::Ptr& ptr) = 0;
diff --git a/apps/openmw/mwgui/debugwindow.cpp b/apps/openmw/mwgui/debugwindow.cpp
index 23c8dbfe2e..f4a4814654 100644
--- a/apps/openmw/mwgui/debugwindow.cpp
+++ b/apps/openmw/mwgui/debugwindow.cpp
@@ -92,12 +92,14 @@ namespace MWGui
         // - Shader editor
 
         MyGUI::TabItem* itemLV = mTabControl->addItem("Log Viewer");
+        itemLV->setCaptionWithReplacing("#{DebugMenu:LogViewer}");
         mLogView = itemLV->createWidgetReal<MyGUI::EditBox>
                 ("LogEdit", MyGUI::FloatCoord(0,0,1,1), MyGUI::Align::Stretch);
         mLogView->setEditReadOnly(true);
 
 #ifndef BT_NO_PROFILE
         MyGUI::TabItem* item = mTabControl->addItem("Physics Profiler");
+        item->setCaptionWithReplacing("#{DebugMenu:PhysicsProfiler}");
         mBulletProfilerEdit = item->createWidgetReal<MyGUI::EditBox>
                 ("LogEdit", MyGUI::FloatCoord(0,0,1,1), MyGUI::Align::Stretch);
 #else
diff --git a/apps/openmw/mwgui/postprocessorhud.cpp b/apps/openmw/mwgui/postprocessorhud.cpp
index 4d84fedf38..31449bbee6 100644
--- a/apps/openmw/mwgui/postprocessorhud.cpp
+++ b/apps/openmw/mwgui/postprocessorhud.cpp
@@ -316,7 +316,7 @@ namespace MWGui
 
         std::ostringstream ss;
 
-        const std::string NA = "NA";
+        const std::string NA = "#{Interface:NotAvailableShort}";
         const std::string endl = "\n";
 
         std::string author = technique->getAuthor().empty() ? NA : std::string(technique->getAuthor());
@@ -340,14 +340,14 @@ namespace MWGui
             case fx::Technique::Status::Uncompiled:
             {
                 if (technique->getDynamic())
-                    ss  << "#{fontcolourhtml=header}Locked:      #{fontcolourhtml=normal} Cannot be toggled or moved, controlled by external Lua script" << endl << endl;
-                ss  << "#{fontcolourhtml=header}Author:      #{fontcolourhtml=normal} " << author << endl << endl
-                    << "#{fontcolourhtml=header}Version:     #{fontcolourhtml=normal} " << version << endl << endl
-                    << "#{fontcolourhtml=header}Description: #{fontcolourhtml=normal} " << description << endl << endl
-                    << "#{fontcolourhtml=header}Interiors: #{fontcolourhtml=normal} " << flag_interior
-                    << "#{fontcolourhtml=header}   Exteriors: #{fontcolourhtml=normal} " << flag_exterior
-                    << "#{fontcolourhtml=header}   Underwater: #{fontcolourhtml=normal} " << flag_underwater
-                    << "#{fontcolourhtml=header}   Abovewater: #{fontcolourhtml=normal} " << flag_abovewater;
+                    ss  << "#{fontcolourhtml=header}#{PostProcessing:ShaderLocked}:      #{fontcolourhtml=normal} #{PostProcessing:ShaderLockedDescription}" << endl << endl;
+                ss  << "#{fontcolourhtml=header}#{PostProcessing:Author}:      #{fontcolourhtml=normal} " << author << endl << endl
+                    << "#{fontcolourhtml=header}#{PostProcessing:Version}:     #{fontcolourhtml=normal} " << version << endl << endl
+                    << "#{fontcolourhtml=header}#{PostProcessing:Description}: #{fontcolourhtml=normal} " << description << endl << endl
+                    << "#{fontcolourhtml=header}#{PostProcessing:InInteriors}: #{fontcolourhtml=normal} " << flag_interior
+                    << "#{fontcolourhtml=header}   #{PostProcessing:InExteriors}: #{fontcolourhtml=normal} " << flag_exterior
+                    << "#{fontcolourhtml=header}   #{PostProcessing:Underwater}: #{fontcolourhtml=normal} " << flag_underwater
+                    << "#{fontcolourhtml=header}   #{PostProcessing:Abovewater}: #{fontcolourhtml=normal} " << flag_abovewater;
                 break;
             }
             case fx::Technique::Status::Parse_Error:
@@ -365,7 +365,7 @@ namespace MWGui
             if (technique->getUniformMap().size() > 0)
             {
                 MyGUI::Button* resetButton = mConfigArea->createWidget<MyGUI::Button>("MW_Button", {0,0,0,24}, MyGUI::Align::Default);
-                resetButton->setCaption("Reset all to default");
+                resetButton->setCaptionWithReplacing("#{PostProcessing:ResetShader}");
                 resetButton->setTextAlign(MyGUI::Align::Center);
                 resetButton->eventMouseWheel += MyGUI::newDelegate(this, &PostProcessorHud::notifyMouseWheel);
                 resetButton->eventMouseButtonClick += MyGUI::newDelegate(this, &PostProcessorHud::notifyResetButtonClicked);
diff --git a/apps/openmw/mwgui/savegamedialog.cpp b/apps/openmw/mwgui/savegamedialog.cpp
index a29928c152..700b06e81e 100644
--- a/apps/openmw/mwgui/savegamedialog.cpp
+++ b/apps/openmw/mwgui/savegamedialog.cpp
@@ -207,7 +207,7 @@ namespace MWGui
 
         mCharacterSelection->setIndexSelected(selectedIndex);
         if (selectedIndex == MyGUI::ITEM_NONE)
-            mCharacterSelection->setCaption("Select Character ...");
+            mCharacterSelection->setCaptionWithReplacing("#{SavegameMenu:SelectCharacter}");
 
         fillSaveList();
 
@@ -423,7 +423,7 @@ namespace MWGui
 
         if (Settings::Manager::getBool("timeplayed","Saves"))
         {
-            text << "\n" << "Time played: " << formatTimeplayed(mCurrentSlot->mProfile.mTimePlayed);
+            text << "\n" << "#{SavegameMenu:TimePlayed}: " << formatTimeplayed(mCurrentSlot->mProfile.mTimePlayed);
         }
 
         mInfoText->setCaptionWithReplacing(text.str());
diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index f1c573673d..d38763663a 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -11,6 +11,7 @@
 #include <MyGUI_ScrollView.h>
 #include <MyGUI_Gui.h>
 #include <MyGUI_TabControl.h>
+#include <MyGUI_LanguageManager.h>
 
 #include <SDL_video.h>
 
@@ -37,12 +38,32 @@ namespace
 {
     std::string textureMipmappingToStr(const std::string& val)
     {
-        if (val == "linear")  return "Trilinear";
-        if (val == "nearest") return "Bilinear";
-        if (val != "none")
-            Log(Debug::Warning) << "Warning: Invalid texture mipmap option: "<< val;
+        if (val == "linear")  return "#{SettingsMenu:TextureFilteringTrilinear}";
+        if (val == "nearest") return "#{SettingsMenu:TextureFilteringBilinear}";
+        if (val == "none") return "#{SettingsMenu:TextureFilteringDisabled}";
 
-        return "Other";
+        Log(Debug::Warning) << "Warning: Invalid texture mipmap option: "<< val;
+        return "#{SettingsMenu:TextureFilteringOther}";
+    }
+
+    std::string lightingMethodToStr(SceneUtil::LightingMethod method)
+    {
+        std::string result;
+        switch (method)
+        {
+        case SceneUtil::LightingMethod::FFP:
+            result = "#{SettingsMenu:LightingMethodLegacy}";
+            break;
+        case SceneUtil::LightingMethod::PerObjectUniform:
+            result = "#{SettingsMenu:LightingMethodShadersCompatibility}";
+            break;
+        case SceneUtil::LightingMethod::SingleUBO:
+        default:
+            result = "#{SettingsMenu:LightingMethodShaders}";
+            break;
+        }
+
+        return MyGUI::LanguageManager::getInstance().replaceTags(result);
     }
 
     void parseResolution (int &x, int &y, const std::string& str)
@@ -306,7 +327,7 @@ namespace MWGui
         highlightCurrentResolution();
 
         std::string tmip = Settings::Manager::getString("texture mipmap", "General");
-        mTextureFilteringButton->setCaption(textureMipmappingToStr(tmip));
+        mTextureFilteringButton->setCaptionWithReplacing(textureMipmappingToStr(tmip));
 
         int waterTextureSize = Settings::Manager::getInt("rtt size", "Water");
         if (waterTextureSize >= 512)
@@ -426,10 +447,10 @@ namespace MWGui
         if (pos == MyGUI::ITEM_NONE)
             return;
 
-        std::string message = "This change requires a restart to take effect.";
-        MWBase::Environment::get().getWindowManager()->interactiveMessageBox(message, {"#{sOK}"}, true);
+        MWBase::Environment::get().getWindowManager()->interactiveMessageBox("#{SettingsMenu:ChangeRequiresRestart}", {"#{sOK}"}, true);
 
-        Settings::Manager::setString("lighting method", "Shaders", _sender->getItemNameAt(pos));
+        const auto settingsNames = _sender->getUserData<std::vector<std::string>>();
+        Settings::Manager::setString("lighting method", "Shaders", settingsNames->at(pos));
         apply();
     }
 
@@ -454,8 +475,7 @@ namespace MWGui
     void SettingsWindow::onLightsResetButtonClicked(MyGUI::Widget* _sender)
     {
         std::vector<std::string> buttons = {"#{sYes}", "#{sNo}"};
-        std::string message = "Resets to default values, would you like to continue? Changes to lighting method will require a restart.";
-        MWBase::Environment::get().getWindowManager()->interactiveMessageBox(message, buttons, true);
+        MWBase::Environment::get().getWindowManager()->interactiveMessageBox("#{SettingsMenu:LightingResetToDefaults}", buttons, true);
         int selectedButton = MWBase::Environment::get().getWindowManager()->readPressedButton();
         if (selectedButton == 1 || selectedButton == -1)
             return;
@@ -471,7 +491,9 @@ namespace MWGui
         for (const auto& setting : settings)
             Settings::Manager::setString(setting, "Shaders", Settings::Manager::mDefaultSettings[{"Shaders", setting}]);
 
-        mLightingMethodButton->setIndexSelected(mLightingMethodButton->findItemIndexWith(Settings::Manager::mDefaultSettings[{"Shaders", "lighting method"}]));
+        auto lightingMethod = SceneUtil::LightManager::getLightingMethodFromString(Settings::Manager::mDefaultSettings[{"Shaders", "lighting method"}]);
+        auto lightIndex = mLightingMethodButton->findItemIndexWith(lightingMethodToStr(lightingMethod));
+        mLightingMethodButton->setIndexSelected(lightIndex);
         updateMaxLightsComboBox(mMaxLights);
 
         apply();
@@ -636,7 +658,7 @@ namespace MWGui
     void SettingsWindow::updateLightSettings()
     {
         auto lightingMethod = MWBase::Environment::get().getResourceSystem()->getSceneManager()->getLightingMethod();
-        std::string lightingMethodStr = SceneUtil::LightManager::getLightingMethodString(lightingMethod);
+        std::string lightingMethodStr = lightingMethodToStr(lightingMethod);
 
         mLightingMethodButton->removeAllItems();
 
@@ -646,14 +668,17 @@ namespace MWGui
             SceneUtil::LightingMethod::SingleUBO,
         };
 
+        std::vector<std::string> userData;
         for (const auto& method : methods)
         {
             if (!MWBase::Environment::get().getResourceSystem()->getSceneManager()->isSupportedLightingMethod(method))
                 continue;
 
-            mLightingMethodButton->addItem(SceneUtil::LightManager::getLightingMethodString(method));
+            mLightingMethodButton->addItem(lightingMethodToStr(method));
+            userData.emplace_back(SceneUtil::LightManager::getLightingMethodString(method));
         }
 
+        mLightingMethodButton->setUserData(userData);
         mLightingMethodButton->setIndexSelected(mLightingMethodButton->findItemIndexWith(lightingMethodStr));
     }
 
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index fa00f1b758..5442b22df2 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -55,6 +55,7 @@
 #include <components/lua_ui/util.hpp>
 
 #include "../mwbase/inputmanager.hpp"
+#include "../mwbase/luamanager.hpp"
 #include "../mwbase/statemanager.hpp"
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/world.hpp"
@@ -1065,12 +1066,27 @@ namespace MWGui
         }
         else
         {
+            std::vector<std::string> split;
+            Misc::StringUtils::split(tag, split, ":");
+
+            // TODO: LocalizationManager should not be a part of lua
+            const auto& luaManager = MWBase::Environment::get().getLuaManager();
+
+            // If a key has a "Context:KeyName" format, use YAML to translate data
+            if (split.size() == 2 && luaManager != nullptr)
+            {
+                _result = luaManager->translate(split[0], split[1]);
+                return;
+            }
+
+            // If not, treat is as GMST name from legacy localization
             if (!mStore)
             {
                 Log(Debug::Error) << "Error: WindowManager::onRetrieveTag: no Store set up yet, can not replace '" << tag << "'";
+                _result = tag;
                 return;
             }
-            const ESM::GameSetting *setting = mStore->get<ESM::GameSetting>().find(tag);
+            const ESM::GameSetting *setting = mStore->get<ESM::GameSetting>().search(tag);
 
             if (setting && setting->mValue.getType()==ESM::VT_String)
                 _result = setting->mValue.getString();
diff --git a/apps/openmw/mwinput/bindingsmanager.cpp b/apps/openmw/mwinput/bindingsmanager.cpp
index 82a469890c..4225a8c5d6 100644
--- a/apps/openmw/mwinput/bindingsmanager.cpp
+++ b/apps/openmw/mwinput/bindingsmanager.cpp
@@ -426,13 +426,13 @@ namespace MWInput
         switch (action)
         {
             case A_Screenshot:
-                return "Screenshot";
+                return "#{SettingsMenu:Screenshot}";
             case A_ZoomIn:
-                return "Zoom In";
+                return "#{SettingsMenu:CameraZoomIn}";
             case A_ZoomOut:
-                return "Zoom Out";
+                return "#{SettingsMenu:CameraZoomOut}";
             case A_ToggleHUD:
-                return "Toggle HUD";
+                return "#{SettingsMenu:ToggleHUD}";
             case A_Use:
                 return "#{sUse}";
             case A_Activate:
@@ -504,7 +504,7 @@ namespace MWInput
             case A_QuickLoad:
                 return "#{sQuickLoadCmd}";
             case A_TogglePostProcessorHUD:
-                return "Toggle Post Processor HUD";
+                return "#{SettingsMenu:TogglePostProcessorHUD}";
             default:
                 return std::string(); // not configurable
         }
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index f4ca54576e..1678743257 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -55,6 +55,14 @@ namespace MWLua
         mGlobalScripts.setAutoStartConf(mConfiguration.getGlobalConf());
     }
 
+    void LuaManager::initL10n()
+    {
+        mL10n.init();
+        std::vector<std::string> preferredLocales;
+        Misc::StringUtils::split(Settings::Manager::getString("preferred locales", "General"), preferredLocales, ", ");
+        mL10n.setPreferredLocales(preferredLocales);
+    }
+
     void LuaManager::init()
     {
         Context context;
@@ -71,11 +79,6 @@ namespace MWLua
         localContext.mIsGlobal = false;
         localContext.mSerializer = mLocalSerializer.get();
 
-        mL10n.init();
-        std::vector<std::string> preferredLocales;
-        Misc::StringUtils::split(Settings::Manager::getString("preferred locales", "General"), preferredLocales, ", ");
-        mL10n.setPreferredLocales(preferredLocales);
-
         initObjectBindingsForGlobalScripts(context);
         initCellBindingsForGlobalScripts(context);
         initObjectBindingsForLocalScripts(localContext);
@@ -103,6 +106,11 @@ namespace MWLua
         mInitialized = true;
     }
 
+    std::string LuaManager::translate(const std::string& contextName, const std::string& key)
+    {
+        return mL10n.translate(contextName, key);
+    }
+
     void LuaManager::loadPermanentStorage(const std::string& userConfigPath)
     {
         auto globalPath = std::filesystem::path(userConfigPath) / "global_storage.bin";
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index 0e94e37f24..3f3d8566a7 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -29,6 +29,9 @@ namespace MWLua
     public:
         LuaManager(const VFS::Manager* vfs, const std::string& libsDir);
 
+        // Called by engine.cpp before UI setup.
+        void initL10n();
+
         // Called by engine.cpp when the environment is fully initialized.
         void init();
 
@@ -39,6 +42,8 @@ namespace MWLua
         // thread (in parallel with osg Cull). Can not use scene graph.
         void update();
 
+        std::string translate(const std::string& contextName, const std::string& key) override;
+
         // Called by engine.cpp from the main thread. Can use scene graph.
         void synchronizedUpdate();
 
diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index b3d6d4151c..3cc19d12ba 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -218,7 +218,7 @@ namespace DetourNavigator
     {
         if (mSettings.get().mWaitUntilMinDistanceToPlayer == 0)
             return;
-        listener.setLabel("Building navigation mesh");
+        listener.setLabel("#{Navigation:BuildingNavigationMesh}");
         const std::size_t initialJobsLeft = getTotalJobs();
         std::size_t maxProgress = initialJobsLeft + mThreads.size();
         listener.setProgressRange(maxProgress);
diff --git a/components/lua/l10n.cpp b/components/lua/l10n.cpp
index 4a1e533f2d..bd9a9be4c5 100644
--- a/components/lua/l10n.cpp
+++ b/components/lua/l10n.cpp
@@ -18,6 +18,12 @@ namespace LuaUtil
         ctx[sol::meta_function::call] = &Context::translate;
     }
 
+    std::string L10nManager::translate(const std::string& contextName, const std::string& key)
+    {
+        Context& ctx = getContext(contextName).as<Context>();
+        return ctx.translate(key, sol::nil);
+    }
+
     void L10nManager::setPreferredLocales(const std::vector<std::string>& langs)
     {
         mPreferredLocales.clear();
diff --git a/components/lua/l10n.hpp b/components/lua/l10n.hpp
index a630797933..d1de193421 100644
--- a/components/lua/l10n.hpp
+++ b/components/lua/l10n.hpp
@@ -19,6 +19,7 @@ namespace LuaUtil
         const std::vector<icu::Locale>& getPreferredLocales() const { return mPreferredLocales; }
 
         sol::object getContext(const std::string& contextName, const std::string& fallbackLocale = "en");
+        std::string translate(const std::string& contextName, const std::string& key);
 
     private:
         struct Context
diff --git a/components/widgets/box.cpp b/components/widgets/box.cpp
index 3e8f62b4ba..f9a2e26142 100644
--- a/components/widgets/box.cpp
+++ b/components/widgets/box.cpp
@@ -1,9 +1,28 @@
 #include "box.hpp"
 
 #include <MyGUI_EditText.h>
+#include <MyGUI_LanguageManager.h>
 
 namespace Gui
 {
+    // TODO: Since 3.4.2 MyGUI is supposed to automatically translate tags
+    // If the 3.4.2 become a required minimum version, the ComboBox class may be removed.
+    void ComboBox::setPropertyOverride(const std::string& _key, const std::string& _value)
+    {
+#if MYGUI_VERSION >= MYGUI_DEFINE_VERSION(3,4,2)
+        MyGUI::ComboBox::setPropertyOverride (_key, _value);
+#else
+        if (_key == "AddItem")
+        {
+            const std::string value = MyGUI::LanguageManager::getInstance().replaceTags(_value);
+            MyGUI::ComboBox::setPropertyOverride (_key, value);
+        }
+        else
+        {
+            MyGUI::ComboBox::setPropertyOverride (_key, _value);
+        }
+#endif
+    }
 
     void AutoSizedWidget::notifySizeChange (MyGUI::Widget* w)
     {
diff --git a/components/widgets/box.hpp b/components/widgets/box.hpp
index a96d37ead5..1b1b71f156 100644
--- a/components/widgets/box.hpp
+++ b/components/widgets/box.hpp
@@ -5,11 +5,20 @@
 #include <MyGUI_TextBox.h>
 #include <MyGUI_EditBox.h>
 #include <MyGUI_Button.h>
+#include <MyGUI_ComboBox.h>
 
 #include "fontwrapper.hpp"
 
 namespace Gui
 {
+    class ComboBox : public FontWrapper<MyGUI::ComboBox>
+    {
+        MYGUI_RTTI_DERIVED( ComboBox )
+
+    protected:
+        void setPropertyOverride(const std::string& _key, const std::string& _value) override;
+    };
+
     class Button : public FontWrapper<MyGUI::Button>
     {
         MYGUI_RTTI_DERIVED( Button )
diff --git a/components/widgets/widgets.cpp b/components/widgets/widgets.cpp
index c1a9a50531..a5ff0b677d 100644
--- a/components/widgets/widgets.cpp
+++ b/components/widgets/widgets.cpp
@@ -28,6 +28,7 @@ namespace Gui
         MyGUI::FactoryManager::getInstance().registerFactory<Gui::NumericEditBox>("Widget");
         MyGUI::FactoryManager::getInstance().registerFactory<Gui::SharedStateButton>("Widget");
         MyGUI::FactoryManager::getInstance().registerFactory<Gui::WindowCaption>("Widget");
+        MyGUI::FactoryManager::getInstance().registerFactory<Gui::ComboBox>("Widget");
     }
 
 }
diff --git a/files/data/CMakeLists.txt b/files/data/CMakeLists.txt
index 052363217f..f476498494 100644
--- a/files/data/CMakeLists.txt
+++ b/files/data/CMakeLists.txt
@@ -12,10 +12,20 @@ set(BUILTIN_DATA_FILES
 
     l10n/Calendar/en.yaml
     l10n/Calendar/ru.yaml
+    l10n/DebugMenu/en.yaml
+    l10n/DebugMenu/ru.yaml
     l10n/Interface/en.yaml
     l10n/Interface/ru.yaml
+    l10n/Navigation/en.yaml
+    l10n/Navigation/ru.yaml
     l10n/OMWCamera/en.yaml
     l10n/OMWCamera/ru.yaml
+    l10n/PostProcessing/en.yaml
+    l10n/PostProcessing/ru.yaml
+    l10n/SavegameMenu/en.yaml
+    l10n/SavegameMenu/ru.yaml
+    l10n/SettingsMenu/en.yaml
+    l10n/SettingsMenu/ru.yaml
 
     openmw_aux/util.lua
     openmw_aux/time.lua
diff --git a/files/data/l10n/DebugMenu/en.yaml b/files/data/l10n/DebugMenu/en.yaml
new file mode 100644
index 0000000000..af3b31aacd
--- /dev/null
+++ b/files/data/l10n/DebugMenu/en.yaml
@@ -0,0 +1,3 @@
+DebugWindow: "Debug"
+LogViewer: "Log Viewer"
+PhysicsProfiler: "Physics Profiler"
diff --git a/files/data/l10n/DebugMenu/ru.yaml b/files/data/l10n/DebugMenu/ru.yaml
new file mode 100644
index 0000000000..afa8bdb904
--- /dev/null
+++ b/files/data/l10n/DebugMenu/ru.yaml
@@ -0,0 +1,3 @@
+DebugWindow: "Меню отладки"
+LogViewer: "Журнал логов"
+PhysicsProfiler: "Профилировщик физики"
diff --git a/files/data/l10n/Interface/en.yaml b/files/data/l10n/Interface/en.yaml
index 4b4ed1584f..a7aaf978e2 100644
--- a/files/data/l10n/Interface/en.yaml
+++ b/files/data/l10n/Interface/en.yaml
@@ -1,3 +1,4 @@
-Yes: "Yes"
 No: "No"
-Reset: "Reset"
\ No newline at end of file
+NotAvailableShort: "N/A"
+Reset: "Reset"
+Yes: "Yes"
diff --git a/files/data/l10n/Interface/ru.yaml b/files/data/l10n/Interface/ru.yaml
index a224bb9174..ae405abd8f 100644
--- a/files/data/l10n/Interface/ru.yaml
+++ b/files/data/l10n/Interface/ru.yaml
@@ -1,3 +1,4 @@
-Yes: "Да"
 No: "Нет"
+NotAvailableShort: "Н/Д"
 Reset: "Обнулить"
+Yes: "Да"
diff --git a/files/data/l10n/Navigation/en.yaml b/files/data/l10n/Navigation/en.yaml
new file mode 100644
index 0000000000..06fb8c26ba
--- /dev/null
+++ b/files/data/l10n/Navigation/en.yaml
@@ -0,0 +1 @@
+BuildingNavigationMesh: "Building navigation mesh"
diff --git a/files/data/l10n/Navigation/ru.yaml b/files/data/l10n/Navigation/ru.yaml
new file mode 100644
index 0000000000..509c178dea
--- /dev/null
+++ b/files/data/l10n/Navigation/ru.yaml
@@ -0,0 +1 @@
+BuildingNavigationMesh: "Построение навигационной сетки"
diff --git a/files/data/l10n/PostProcessing/en.yaml b/files/data/l10n/PostProcessing/en.yaml
new file mode 100644
index 0000000000..44cb90cacf
--- /dev/null
+++ b/files/data/l10n/PostProcessing/en.yaml
@@ -0,0 +1,20 @@
+Abovewater: "Abovewater"
+Author: "Author"
+Configuration: "Configuration"
+Description: "Description"
+InExteriors: "Exteriors"
+InInteriors: "Interiors"
+KeyboardControls: |
+    Keyboard controls:
+
+    Shift+Right-Arrow > Activate shader
+    Shift+Left-Arrow > Deactive shader
+    Shift+Up-Arrow > Move shader up
+    Shift+Down-Arrow > Move shader down
+PostProcessHUD: "Postprocess HUD"
+ResetShader: "Reset shader to default state"
+ShaderLocked: "Locked"
+ShaderLockedDescription: "Cannot be toggled or moved, controlled by external Lua script"
+ShaderResetUniform: "r"
+Underwater: "Underwater"
+Version: "Version"
diff --git a/files/data/l10n/PostProcessing/ru.yaml b/files/data/l10n/PostProcessing/ru.yaml
new file mode 100644
index 0000000000..6bbe3e1e47
--- /dev/null
+++ b/files/data/l10n/PostProcessing/ru.yaml
@@ -0,0 +1,20 @@
+Abovewater: "Над водой"
+Author: "Автор"
+Configuration: "Настройки"
+Description: "Описание"
+InExteriors: "Вне помещений"
+InInteriors: "В помещениях"
+KeyboardControls: |
+    Управление с помощью клавиатуры:
+
+    Shift+Right-Arrow > Включить шейдер
+    Shift+Left-Arrow > Выключить шейдер
+    Shift+Up-Arrow > Передвинуть шейдер выше
+    Shift+Down-Arrow > Передвинуть шейдер ниже
+PostProcessHUD: "Настройки постобработки"
+ResetShader: "Обнулить настройки этого шейдера"
+ShaderLocked: "Заблокирован"
+ShaderLockedDescription: "Не может быть выключен или перемещен, управляется внешним Lua-скриптом"
+ShaderResetUniform: "x"
+Underwater: "Под водой"
+Version: "Версия"
diff --git a/files/data/l10n/SavegameMenu/en.yaml b/files/data/l10n/SavegameMenu/en.yaml
new file mode 100644
index 0000000000..b7e3c60a5f
--- /dev/null
+++ b/files/data/l10n/SavegameMenu/en.yaml
@@ -0,0 +1,2 @@
+SelectCharacter: "Select Character..."
+TimePlayed: "Time played"
diff --git a/files/data/l10n/SavegameMenu/ru.yaml b/files/data/l10n/SavegameMenu/ru.yaml
new file mode 100644
index 0000000000..8b87500bd3
--- /dev/null
+++ b/files/data/l10n/SavegameMenu/ru.yaml
@@ -0,0 +1,2 @@
+SelectCharacter: "Выберите персонажа..."
+TimePlayed: "Время в игре"
diff --git a/files/data/l10n/SettingsMenu/en.yaml b/files/data/l10n/SettingsMenu/en.yaml
new file mode 100644
index 0000000000..da3eeaceb7
--- /dev/null
+++ b/files/data/l10n/SettingsMenu/en.yaml
@@ -0,0 +1,59 @@
+ActorsProcessingRange: "Actors Processing Range"
+Anisotropy: "Anisotropy"
+CameraSensitivity: "Camera Sensitivity"
+CameraZoomIn: "Zoom Camera In"
+CameraZoomOut: "Zoom Camera Out"
+ChangeRequiresRestart: "This change requires a restart to take effect."
+Controller: "Controller"
+FieldOfView: "Field of View"
+FrameRateHint: "Hint: press F3 to show\nthe current frame rate."
+InvertXAxis: "Invert X Axis"
+LightingMethod: "Lighting Method"
+LightingMethodLegacy: "Legacy"
+LightingMethodShaders: "Shaders"
+LightingMethodShadersCompatibility: "Shaders (compatibility)"
+LightingResetToDefaults: "Resets to default values, would you like to continue? Changes to lighting method will require a restart."
+Lights: "Lights"
+LightsBoundingSphereMultiplier: "Bounding Sphere Multiplier"
+LightsBoundingSphereMultiplierTooltip: "Default: 1.65\nMultipler for bounding sphere of lights.\nHigher numbers allows for smooth falloff but require an increase in number of max lights.\n\nDoes not effect the illumination or strength of lights."
+LightsFadeStartMultiplier: "Fade Start Multiplier"
+LightsFadeStartMultiplierTooltip: "Default: 0.85\nFraction of maximum distance at which lights will start to fade.\n\nSet this to a low value for slower transitions or a high value for quicker transitions."
+LightsMaximumDistance: "Maximum Light Distance"
+LightsMaximumDistanceTooltip: "Default: 8192\nMaximum distance at which lights will appear (measured in units).\n\nSet this to 0 to use an unlimited distance."
+LightsMinimumInteriorBrightness: "Minimum Interior Brightness"
+LightsMinimumInteriorBrightnessTooltip: "Default: 0.08\nMinimum ambient interior brightness.\n\nIncrease this if you feel interiors are too dark."
+MaxLights: "Max Lights"
+MaxLightsTooltip: "Default: 8\nMaximum number of lights per object.\n\nA low number near default will cause light popping similar to what you would see with legacy lighting."
+MouseAndKeyboard: "Mouse/Keyboard"
+PostProcessing: "Post Processing"
+PostProcessingTooltip: "Tweaked via Post Processor HUD, see input bindings."
+RainRippleDetail: "Rain ripple detail"
+RainRippleDetailDense: "Dense"
+RainRippleDetailSimple: "Simple"
+RainRippleDetailSparse: "Sparse"
+ReflectionShaderDetail: "Reflection shader detail"
+ReflectionShaderDetailActors: "Actors"
+ReflectionShaderDetailGroundcover: "Groundcover"
+ReflectionShaderDetailObjects: "Objects"
+ReflectionShaderDetailSky: "Sky"
+ReflectionShaderDetailTerrain: "Terrain"
+ReflectionShaderDetailWorld: "World"
+Refraction: "Refraction"
+Screenshot: "Screenshot"
+Scripts: "Scripts"
+TextureFiltering: "Texture Filtering"
+TextureFilteringBilinear: "Bilinear"
+TextureFilteringDisabled: "None"
+TextureFilteringOther: "Other"
+TextureFilteringTrilinear: "Trilinear"
+ToggleHUD: "Toggle HUD"
+TogglePostProcessorHUD: "Toggle Post Processor HUD"
+VSync: "VSync"
+Water: "Water"
+WaterShader: "Water shader"
+WaterShaderTextureQuality: "Texture quality"
+WindowBorder: "Window Border"
+WindowMode: "Window Mode"
+WindowModeFullscreen: "Fullscreen"
+WindowModeWindowed: "Windowed"
+WindowModeWindowedFullscreen: "Windowed Fullscreen"
diff --git a/files/data/l10n/SettingsMenu/ru.yaml b/files/data/l10n/SettingsMenu/ru.yaml
new file mode 100644
index 0000000000..1662153f7c
--- /dev/null
+++ b/files/data/l10n/SettingsMenu/ru.yaml
@@ -0,0 +1,59 @@
+ActorsProcessingRange: "Дальность обработки персонажей"
+Anisotropy: "Анизотропная фильтрация"
+CameraSensitivity: "Чувствительность камеры"
+CameraZoomIn: "Приблизить камеру"
+CameraZoomOut: "Отдалить камеру"
+ChangeRequiresRestart: "Чтобы это изменение вступило в силу, нужно перезапустить приложение."
+Controller: "Геймпад"
+FieldOfView: "Поле зрения"
+FrameRateHint: "Подсказка: нажмите F3, чтобы показать\nтекущую частоту смены кадров."
+InvertXAxis: "Инвертировать ось X"
+LightingMethod: "Способ освещения"
+LightingMethodLegacy: "Устаревший"
+LightingMethodShaders: "Шейдеры"
+LightingMethodShadersCompatibility: "Шейдеры (режим совместимости)"
+LightingResetToDefaults: "Обнулить настройки освещения? Смена метода освещения вступит в силу только после перезапуска приложения."
+Lights: "Освещение"
+LightsBoundingSphereMultiplier: "Множитель размера ограничивающей сферы"
+LightsBoundingSphereMultiplierTooltip: "Значение по умолчанию: 1.65\nМножитель размера ограничивающей сферы источников света.\nВысокие значения делают затухание света плавнее, но требуют более высокого максимального количества источников света.\n\nНастройка не влияет на уровень освещения или мощность источников света."
+LightsFadeStartMultiplier: "Множитель начала затухания"
+LightsFadeStartMultiplierTooltip: "Значение по умолчанию: 0.85\nДоля расстояния (относительно дальности отображения источников света), на которой свет начинает затухать.\n\nНизкие значения ведут к плавному затуханию, высокие - к резкому."
+LightsMaximumDistance: "Дальность отображения источников света"
+LightsMaximumDistanceTooltip: "Значение по умолчанию: 8192\nМаксимальное расстояние, на котором будут отображаться источники света (во внутриигровых единицах измерения).\n\nЕсли 0, то расстояние не ограничено."
+LightsMinimumInteriorBrightness: "Минимальный уровень освещения в помещениях"
+LightsMinimumInteriorBrightnessTooltip: "Значение по умолчанию: 0.08\nМинимальный уровень фонового освещения в помещениях.\n\nУвеличьте значение, если помещения в игре кажутся слишком темными."
+MaxLights: "Макс. кол-во источников света"
+MaxLightsTooltip: "Значение по умолчанию: 8\nМаксимальное количество источников света для каждого объекта.\n\nНизкие числа (близкие к значению по умолчанию) приводят к резким перепадам освещения, как при устаревшем методе освещения."
+MouseAndKeyboard: "Мышь/Клавиатура"
+PostProcessing: "Постобработка"
+PostProcessingTooltip: "Настраивается через меню настроек постобработки, см. привязки клавиш."
+RainRippleDetail: "Капли дождя на воде"
+RainRippleDetailDense: "Плотные"
+RainRippleDetailSimple: "Упрощенные"
+RainRippleDetailSparse: "Редкие"
+ReflectionShaderDetail: "Детализация отражений"
+ReflectionShaderDetailActors: "Персонажи"
+ReflectionShaderDetailGroundcover: "Трава"
+ReflectionShaderDetailObjects: "Предметы"
+ReflectionShaderDetailSky: "Небо"
+ReflectionShaderDetailTerrain: "Ландшафт"
+ReflectionShaderDetailWorld: "Мир"
+Refraction: "Рефракция"
+Screenshot: "Снимок экрана"
+Scripts: "Скрипты"
+TextureFiltering: "Фильтрация текстур"
+TextureFilteringBilinear: "Билинейная"
+TextureFilteringDisabled: "Отключена"
+TextureFilteringOther: "Другая"
+TextureFilteringTrilinear: "Трилинейная"
+ToggleHUD: "Переключить HUD"
+TogglePostProcessorHUD: "Меню настроек постобработки"
+VSync: "Вертикальная синхронизация"
+Water: "Вода"
+WaterShader: "Шейдер воды"
+WaterShaderTextureQuality: "Качество текстуры воды"
+WindowBorder: "Рамка окна"
+WindowMode: "Режим окна"
+WindowModeFullscreen: "Полный экран"
+WindowModeWindowed: "Оконный"
+WindowModeWindowedFullscreen: "Оконный без полей"
diff --git a/files/mygui/openmw_chargen_birth.layout b/files/mygui/openmw_chargen_birth.layout
index 206e559e45..05f92b9b33 100644
--- a/files/mygui/openmw_chargen_birth.layout
+++ b/files/mygui/openmw_chargen_birth.layout
@@ -22,7 +22,7 @@
                 <Property key="Caption" value="#{sBack}"/>
             </Widget>
             <Widget type="AutoSizedButton" skin="MW_Button" name="OKButton">
-                <Property key="Caption" value="OK"/>
+                <Property key="Caption" value="#{sOk}"/>
             </Widget>
         </Widget>
 
diff --git a/files/mygui/openmw_debug_window.layout b/files/mygui/openmw_debug_window.layout
index b874280274..a2635c3c46 100644
--- a/files/mygui/openmw_debug_window.layout
+++ b/files/mygui/openmw_debug_window.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout">
   <Widget type="Window" skin="MW_Window" position="0 0 400 400" layer="Debug" name="_Main" align="Stretch">
-    <Property key="Caption" value="Debug"/>
+    <Property key="Caption" value="#{DebugMenu:DebugWindow}"/>
     <Property key="Visible" value="false"/>
 
     <Widget type="Widget" skin="DialogBG" position_real="0 0 1 1" name="Background" align="Stretch">
diff --git a/files/mygui/openmw_postprocessor_hud.layout b/files/mygui/openmw_postprocessor_hud.layout
index 7a04a2f8b0..e299596032 100644
--- a/files/mygui/openmw_postprocessor_hud.layout
+++ b/files/mygui/openmw_postprocessor_hud.layout
@@ -2,7 +2,7 @@
 <MyGUI type="Layout">
   <Widget type="Window" skin="MW_Window" position="0 0 500 500" layer="Debug" name="_Main" align="Stretch">
     <Property key="Visible" value="false"/>
-    <Property key="Caption" value="Postprocess HUD"/>
+    <Property key="Caption" value="#{PostProcessing:PostProcessHUD}"/>
 	<Property key="MinSize" value="600 600"/>
 
     <Widget type="TabControl" skin="TabControl_NoBorder" position="8 8 468 450" align="Stretch" name="TabControl">
@@ -12,17 +12,11 @@
 			<Property key="Caption" value="[?]"/>
 			<UserString key="ToolTipType" value="Layout"/>
 			<UserString key="ToolTipLayout" value="TextToolTip"/>
-			<UserString key="Caption_Text" value="Keyboard controls:\n\n
-				Shift+Right-Arrow > Activate shader\n
-				Shift+Left-Arrow > Deactive shader\n
-				Shift+Up-Arrow > Move shader up\n
-				Shift+Down-Arrow > Move shader down\n
-				Hold Shift > Fine tune sliders\n
-				"/>
+			<UserString key="Caption_Text" value="#{PostProcessing:KeyboardControls}"/>
 		</Widget>
 
         <Widget type="TabItem" skin="" position_real="0 0 1 1" name="TabConfiguration">
-			<Property key="Caption" value="Configuration"/>
+			<Property key="Caption" value="#{PostProcessing:Configuration}"/>
 
 			<Widget type="VBox" position_real="0 0.02 1 0.98" align="Stretch" name="Layout">
 				<Property key="Padding" value="0"/>
diff --git a/files/mygui/openmw_postprocessor_hud.skin.xml b/files/mygui/openmw_postprocessor_hud.skin.xml
index 094330620c..b25b7f1372 100644
--- a/files/mygui/openmw_postprocessor_hud.skin.xml
+++ b/files/mygui/openmw_postprocessor_hud.skin.xml
@@ -16,7 +16,7 @@
                 <Widget type="Button" skin="MW_ArrowLeft" position="0 0 12 12" align="VCenter Left" name="ButtonDecrease"/>
                 <Widget type="Widget" name="Dragger">
                     <Widget type="TextBox" skin="HeaderText" align="Stretch" name="Value">
-                        <Property key="Caption" value="NA"/>
+                        <Property key="Caption" value="#{Interface:NotAvailableShort}"/>
                         <Property key="NeedMouse" value="false"/>
                         <Property key="TextAlign" value="Center"/>
                     </Widget>
@@ -45,7 +45,7 @@
                     <UserString key="HStretch" value="true"/>
                     <UserString key="VStretch" value="true"/>
                     <Property key="TextAlign" value="Center"/>
-                    <Property key="Caption" value="On"/>
+                    <Property key="Caption" value="#{sOn}"/>
                 </Widget>
             </Widget>
 		</Widget>
@@ -59,7 +59,7 @@
                 <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 22 22" name="Reset">
                     <UserString key="HStretch" value="false"/>
                     <UserString key="VStretch" value="false"/>
-                    <Property key="Caption" value="r"/>
+                    <Property key="Caption" value="#{PostProcessing:ShaderResetUniform}"/>
                 </Widget>
                 <Widget type="Widget" skin="BlackBG" position="0 0 225 22" name="Client">
                     <UserString key="HStretch" value="false"/>
diff --git a/files/mygui/openmw_savegame_dialog.layout b/files/mygui/openmw_savegame_dialog.layout
index 22fa69aa5b..8a0a461eb1 100644
--- a/files/mygui/openmw_savegame_dialog.layout
+++ b/files/mygui/openmw_savegame_dialog.layout
@@ -17,7 +17,7 @@
                 <Property key="Spacing" value="8"/>
 
                 <Widget type="ComboBox" skin="MW_ComboBox" position="0 0 200 24" name="SelectCharacter">
-                    <Property key="Caption" value="Select Character"/>
+                    <Property key="Caption" value="#{SavegameMenu:SelectCharacter}"/>
                     <UserString key="HStretch" value="true"/>
                 </Widget>
 
diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index 29c927d38b..dfb291ea60 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -73,9 +73,9 @@
                         <Property key="TextAlign" value="Right"/>
                     </Widget>
                 </Widget>
-                <Widget type="Widget" position="4 184 352 54" align="Left Top HStretch">
-                    <Widget type="TextBox" skin="NormalText" position="0 0 352 16" align="Left Top" name="ActorProcessingText">
-                        <Property key="Caption" value="Actors Processing Range"/>
+                <Widget type="Widget" position="4 184 400 54" align="Left Top HStretch">
+                    <Widget type="TextBox" skin="NormalText" position="0 0 400 16" align="Left Top" name="ActorProcessingText">
+                        <Property key="Caption" value="#{SettingsMenu:ActorsProcessingRange}"/>
                     </Widget>
                     <Widget type="ScrollBar" skin="MW_HScroll" position="0 20 352 14" align="Left Top HStretch">
                         <Property key="Range" value="3584"/>
@@ -87,7 +87,7 @@
                         <UserString key="SettingMin" value="3584"/>
                         <UserString key="SettingMax" value="7168"/>
                         <UserString key="SettingLabelWidget" value="ActorProcessingText"/>
-                        <UserString key="SettingLabelCaption" value="Actors Processing Range (%s)"/>
+                        <UserString key="SettingLabelCaption" value="#{SettingsMenu:ActorsProcessingRange} (%s)"/>
                     </Widget>
                     <Widget type="TextBox" skin="SandText" position="0 38 352 16" align="Left Top">
                         <Property key="Caption" value="#{sLow}"/>
@@ -204,10 +204,10 @@
                     <Property key="Padding" value="0"/>
                     <Property key="Spacing" value="4"/>
                     <Widget type="AutoSizedButton" skin="MW_Button" name="KeyboardButton">
-                        <Property key="Caption" value="Mouse/Keyboard"/>
+                        <Property key="Caption" value="#{SettingsMenu:MouseAndKeyboard}"/>
                     </Widget>
                     <Widget type="AutoSizedButton" skin="MW_Button" name="ControllerButton">
-                        <Property key="Caption" value="Controller"/>
+                        <Property key="Caption" value="#{SettingsMenu:Controller}"/>
                     </Widget>
                 </Widget>
 
@@ -219,14 +219,14 @@
                 <Widget type="AutoSizedButton" skin="MW_Button" position="4 194 137 24" align="Left Bottom" name="ResetControlsButton">
                     <Property key="Caption" value="#{sControlsMenu1}"/>
                 </Widget>
-                <Widget type="HBox" position="4 224 380 24" align="Left Bottom">
+                <Widget type="HBox" position="4 224 600 24" align="Left Bottom">
                     <Widget type="AutoSizedButton" skin="MW_Button">
                         <UserString key="SettingCategory" value="Input"/>
                         <UserString key="SettingName" value="invert x axis"/>
                         <UserString key="SettingType" value="CheckButton"/>
                     </Widget>
                     <Widget type="AutoSizedTextBox" skin="SandText">
-                        <Property key="Caption" value="Invert X Axis "/>
+                        <Property key="Caption" value="#{SettingsMenu:InvertXAxis} "/>
                     </Widget>
                     <Widget type="AutoSizedButton" skin="MW_Button">
                         <UserString key="SettingCategory" value="Input"/>
@@ -238,7 +238,7 @@
                     </Widget>
                 </Widget>
                 <Widget type="TextBox" skin="NormalText" position="4 254 352 18" align="Left Bottom">
-                    <Property key="Caption" value="Camera Sensitivity"/>
+                    <Property key="Caption" value="#{SettingsMenu:CameraSensitivity}"/>
                 </Widget>
                 <Widget type="ScrollBar" skin="MW_HScroll" position="4 278 352 18" align="HStretch Bottom">
                     <Property key="Range" value="10000"/>
@@ -274,26 +274,26 @@
                 <Widget type="TabControl" skin="TabControlInner" position="4 4 352 390" align="Stretch">
                     <Property key="ButtonAutoWidth" value="true"/>
                     <Widget type="TabItem">
-                        <Property key="Caption" value="  Video  "/>
+                        <Property key="Caption" value="  #{sVideo}  "/>
                         <Widget type="ListBox" skin="MW_List" position="0 4 170 215" align="Left Top" name="ResolutionList"/>
                         <Widget type="TextBox" skin="NormalText" position="182 4 170 18" align="Left Top">
-                            <Property key="Caption" value="Window Mode:"/>
+                            <Property key="Caption" value="#{SettingsMenu:WindowMode}"/>
                         </Widget>
-                        <Widget type="HBox" position="182 28 300 24">
+                        <Widget type="HBox" position="182 28 400 24">
                             <Widget type="ComboBox" skin="MW_ComboBox" position="0 0 200 24" align="Left Top" name="WindowModeList">
-                                <Property key="AddItem" value="Fullscreen"/>
-                                <Property key="AddItem" value="Windowed Fullscreen"/>
-                                <Property key="AddItem" value="Windowed"/>
+                                <Property key="AddItem" value="#{SettingsMenu:WindowModeFullscreen}"/>
+                                <Property key="AddItem" value="#{SettingsMenu:WindowModeWindowedFullscreen}"/>
+                                <Property key="AddItem" value="#{SettingsMenu:WindowModeWindowed}"/>
                             </Widget>
                         </Widget>
-                        <Widget type="HBox" position="182 64 300 24">
+                        <Widget type="HBox" position="182 64 400 24">
                             <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top" name="VSyncButton">
                                 <UserString key="SettingCategory" value="Video"/>
                                 <UserString key="SettingName" value="vsync"/>
                                 <UserString key="SettingType" value="CheckButton"/>
                             </Widget>
                             <Widget type="AutoSizedTextBox" skin="SandText" position="28 4 48 16" align="Left Top">
-                                <Property key="Caption" value="VSync"/>
+                                <Property key="Caption" value="#{SettingsMenu:VSync}"/>
                             </Widget>
                         </Widget>
                         <Widget type="HBox" position="182 94 300 24">
@@ -303,7 +303,7 @@
                                 <UserString key="SettingType" value="CheckButton"/>
                             </Widget>
                             <Widget type="AutoSizedTextBox" skin="SandText" position="28 4 48 16" align="Left Top">
-                                <Property key="Caption" value="Window border"/>
+                                <Property key="Caption" value="#{SettingsMenu:WindowBorder}"/>
                             </Widget>
                         </Widget>
                         <Widget type="HBox" position="182 124 300 24">
@@ -313,15 +313,15 @@
                                 <UserString key="SettingType" value="CheckButton"/>
                             </Widget>
                             <Widget type="AutoSizedTextBox" skin="SandText" position="28 4 48 16" align="Left Top">
-                                <Property key="Caption" value="Post Processing"/>
+                                <Property key="Caption" value="#{SettingsMenu:PostProcessing}"/>
                                 <UserString key="ToolTipType" value="Layout"/>
                                 <UserString key="ToolTipLayout" value="TextToolTip"/>
-                                <UserString key="Caption_Text" value="Press F2 to show the config HUD"/>
+                                <UserString key="Caption_Text" value="#{SettingsMenu:PostProcessingTooltip}"/>
                             </Widget>
                         </Widget>
 
                         <Widget type="AutoSizedTextBox" skin="SandText" position="182 154 300 32" align="Left Top">
-                            <Property key="Caption" value="Hint: press F3 to show the current frame rate."/>
+                            <Property key="Caption" value="#{SettingsMenu:FrameRateHint}"/>
                         </Widget>
 
                         <Widget type="TextBox" skin="NormalText" position="0 228 352 18" align="Left Top" name="FovText">
@@ -336,7 +336,7 @@
                             <UserString key="SettingMin" value="30"/>
                             <UserString key="SettingMax" value="110"/>
                             <UserString key="SettingLabelWidget" value="FovText"/>
-                            <UserString key="SettingLabelCaption" value="Field of View (%s)"/>
+                            <UserString key="SettingLabelCaption" value="#{SettingsMenu:FieldOfView} (%s)"/>
                         </Widget>
                         <Widget type="TextBox" skin="SandText" position="0 276 352 18" align="Left Top">
                             <Property key="Caption" value="#{sLow}"/>
@@ -369,20 +369,20 @@
                         </Widget>
                     </Widget>
                     <Widget type="TabItem">
-                        <Property key="Caption" value="  Detail  "/>
+                        <Property key="Caption" value="  #{sDetail_Level}  "/>
 
                         <Widget type="AutoSizedTextBox" skin="NormalText" align="Left Top">
-                            <Property key="Caption" value="Texture Filtering"/>
+                            <Property key="Caption" value="#{SettingsMenu:TextureFiltering}"/>
                             <UserString key="VStretch" value="false"/>
                             <UserString key="HStretch" value="false"/>
                         </Widget>
                         <Widget type="ComboBox" align="Left Top" skin="MW_ComboBox" position="0 28 200 24" name="TextureFilteringButton">
-                            <Property key="AddItem" value="Bilinear"/>
-                            <Property key="AddItem" value="Trilinear"/>
+                            <Property key="AddItem" value="#{SettingsMenu:TextureFilteringBilinear}"/>
+                            <Property key="AddItem" value="#{SettingsMenu:TextureFilteringTrilinear}"/>
                         </Widget>
 
                         <Widget type="AutoSizedTextBox" skin="NormalText" position="0 58 200 18" name="AnisotropyLabel">
-                            <Property key="Caption" value="Anisotropy"/>
+                            <Property key="Caption" value="#{SettingsMenu:Anisotropy}"/>
                         </Widget>
                         <Widget type="ScrollBar" skin="MW_HScroll" position="0 80 352 18" align="HStretch Top">
                             <Property key="Range" value="17"/>
@@ -391,7 +391,7 @@
                             <UserString key="SettingCategory" value="General"/>
                             <UserString key="SettingName" value="anisotropy"/>
                             <UserString key="SettingLabelWidget" value="AnisotropyLabel"/>
-                            <UserString key="SettingLabelCaption" value="Anisotropy (%s)"/>
+                            <UserString key="SettingLabelCaption" value="#{SettingsMenu:Anisotropy} (%s)"/>
                         </Widget>
 
                         <Widget type="AutoSizedTextBox" skin="NormalText" position="0 104 0 18" align="Left Top" name="RenderDistanceLabel">
@@ -432,7 +432,7 @@
 
                     </Widget>
                     <Widget type="TabItem">
-                        <Property key="Caption" value="  Water  "/>
+                        <Property key="Caption" value="  #{SettingsMenu:Water}  "/>
 
                         <Widget type="VBox" position_real="0 0 1 1" align="Stretch">
 
@@ -446,7 +446,7 @@
                                     <UserString key="SettingType" value="CheckButton"/>
                                 </Widget>
                                 <Widget type="AutoSizedTextBox" skin="SandText">
-                                    <Property key="Caption" value="Water shader"/>
+                                    <Property key="Caption" value="#{SettingsMenu:WaterShader}"/>
                                 </Widget>
                             </Widget>
 
@@ -460,14 +460,14 @@
                                     <UserString key="SettingType" value="CheckButton"/>
                                 </Widget>
                                 <Widget type="AutoSizedTextBox" skin="SandText">
-                                    <Property key="Caption" value="Refraction"/>
+                                    <Property key="Caption" value="#{SettingsMenu:Refraction}"/>
                                 </Widget>
                             </Widget>
 
                             <Widget type="Widget" position="0 0 0 18" align="Top Left HStretch">
                                 <UserString key="HStretch" value="true"/>
                                 <Widget type="AutoSizedTextBox" skin="NormalText">
-                                    <Property key="Caption" value="Texture quality"/>
+                                    <Property key="Caption" value="#{SettingsMenu:WaterShaderTextureQuality}"/>
                                 </Widget>
                                 <Widget type="Spacer" />
                             </Widget>
@@ -476,9 +476,9 @@
                                 <UserString key="HStretch" value="true"/>
                                 <UserString key="VStretch" value="false"/>
                                 <Widget type="ComboBox" skin="MW_ComboBox" position="0 0 200 24" align="Left Top" name="WaterTextureSize">
-                                    <Property key="AddItem" value="Low"/>
-                                    <Property key="AddItem" value="Medium"/>
-                                    <Property key="AddItem" value="High"/>
+                                    <Property key="AddItem" value="#{sLow}"/>
+                                    <Property key="AddItem" value="#{sMedium}"/>
+                                    <Property key="AddItem" value="#{sHigh}"/>
                                 </Widget>
                                 <Widget type="Spacer" />
                             </Widget>
@@ -486,7 +486,7 @@
                             <Widget type="Widget" position="0 0 0 18" align="Top Left HStretch">
                                 <UserString key="HStretch" value="true"/>
                                 <Widget type="AutoSizedTextBox" skin="NormalText">
-                                    <Property key="Caption" value="Reflection shader detail"/>
+                                    <Property key="Caption" value="#{SettingsMenu:ReflectionShaderDetail}"/>
                                 </Widget>
                                 <Widget type="Spacer" />
                             </Widget>
@@ -495,12 +495,12 @@
                                 <UserString key="VStretch" value="false"/>
 
                                 <Widget type="ComboBox" skin="MW_ComboBox" position="0 0 200 24" align="Left Top" name="WaterReflectionDetail">
-                                    <Property key="AddItem" value="Sky"/>
-                                    <Property key="AddItem" value="Terrain"/>
-                                    <Property key="AddItem" value="World"/>
-                                    <Property key="AddItem" value="Objects"/>
-                                    <Property key="AddItem" value="Actors"/>
-                                    <Property key="AddItem" value="Groundcover"/>
+                                    <Property key="AddItem" value="#{SettingsMenu:ReflectionShaderDetailSky}"/>
+                                    <Property key="AddItem" value="#{SettingsMenu:ReflectionShaderDetailTerrain}"/>
+                                    <Property key="AddItem" value="#{SettingsMenu:ReflectionShaderDetailWorld}"/>
+                                    <Property key="AddItem" value="#{SettingsMenu:ReflectionShaderDetailObjects}"/>
+                                    <Property key="AddItem" value="#{SettingsMenu:ReflectionShaderDetailActors}"/>
+                                    <Property key="AddItem" value="#{SettingsMenu:ReflectionShaderDetailGroundcover}"/>
                                 </Widget>
                                 <Widget type="Spacer" />
                             </Widget>
@@ -508,7 +508,7 @@
                             <Widget type="Widget" position="0 0 0 18" align="Top Left HStretch">
                                 <UserString key="HStretch" value="true"/>
                                 <Widget type="AutoSizedTextBox" skin="NormalText">
-                                    <Property key="Caption" value="Rain ripple detail"/>
+                                    <Property key="Caption" value="#{SettingsMenu:RainRippleDetail}"/>
                                 </Widget>
                                 <Widget type="Spacer" />
                             </Widget>
@@ -518,9 +518,9 @@
                                 <UserString key="VStretch" value="false"/>
 
                                 <Widget type="ComboBox" skin="MW_ComboBox" position="0 0 200 24" align="Left Top" name="WaterRainRippleDetail">
-                                    <Property key="AddItem" value="Simple"/>
-                                    <Property key="AddItem" value="Sparse"/>
-                                    <Property key="AddItem" value="Dense"/>
+                                    <Property key="AddItem" value="#{SettingsMenu:RainRippleDetailSimple}"/>
+                                    <Property key="AddItem" value="#{SettingsMenu:RainRippleDetailSparse}"/>
+                                    <Property key="AddItem" value="#{SettingsMenu:RainRippleDetailDense}"/>
                                 </Widget>
                                 <Widget type="Spacer" />
                             </Widget>
@@ -529,21 +529,21 @@
 
                     </Widget>
                     <Widget type="TabItem">
-                        <Property key="Caption" value="  Lights  "/>
+                        <Property key="Caption" value="  #{SettingsMenu:Lights}  "/>
                         <!-- Lighting Method -->
-                        <Widget type="TextBox" skin="NormalText" position="0 4 200 18" align="Left Top">
-                            <Property key="Caption" value="Lighting Method"/>
+                        <Widget type="TextBox" skin="NormalText" position="0 4 250 18" align="Left Top">
+                            <Property key="Caption" value="#{SettingsMenu:LightingMethod}"/>
                         </Widget>
-                        <Widget type="ComboBox" skin="MW_ComboBox" position="0 28 200 24" align="Left Top" name="LightingMethodButton">
+                        <Widget type="ComboBox" skin="MW_ComboBox" position="0 28 250 24" align="Left Top" name="LightingMethodButton">
                             <Property key="AddItem" value="legacy"/>
                             <Property key="AddItem" value="shaders compatibility"/>
                             <Property key="AddItem" value="shaders"/>
                         </Widget>
                         <!-- Max Lights -->
-                        <Widget type="TextBox" skin="NormalText" position="208 4 160 18" align="Left Top" name="MaxLightsText">
+                        <Widget type="TextBox" skin="NormalText" position="258 4 350 18" align="Left Top" name="MaxLightsText">
                             <UserString key="ToolTipType" value="Layout"/>
                             <UserString key="ToolTipLayout" value="TextToolTip"/>
-                            <UserString key="Caption_Text" value="Default: 8\nMaximum number of lights per object.\n\nA low number near default will cause light popping similar to what you would see with legacy lighting."/>
+                            <UserString key="Caption_Text" value="#{SettingsMenu:MaxLightsTooltip}"/>
                         </Widget>
                         <Widget type="ScrollBar" position="0 0 0 0">
                             <UserString key="SettingType" value="Slider"/>
@@ -551,9 +551,9 @@
                             <UserString key="SettingName" value="max lights"/>
                             <UserString key="SettingValueType" value="Integer"/>
                             <UserString key="SettingLabelWidget" value="MaxLightsText"/>
-                            <UserString key="SettingLabelCaption" value="Max Lights: (%s)"/>
+                            <UserString key="SettingLabelCaption" value="#{SettingsMenu:MaxLights} (%s)"/>
                         </Widget>
-                        <Widget type="ComboBox" skin="MW_ComboBox" position="208 28 200 24" align="Left Top" name="MaxLights">
+                        <Widget type="ComboBox" skin="MW_ComboBox" position="258 28 250 24" align="Left Top" name="MaxLights">
                             <Property key="AddItem" value="8"/>
                             <Property key="AddItem" value="16"/>
                             <Property key="AddItem" value="24"/>
@@ -561,10 +561,10 @@
                         </Widget>
                         <Widget type="ImageBox" skin="MW_HLine" position="0 54 360 18" align="Top HStretch"/>
                         <!-- Light Fade Start -->
-                        <Widget type="TextBox" skin="NormalText" position="0 78 352 18" align="Left Top" name="MaxLightDistanceText">
+                        <Widget type="TextBox" skin="NormalText" position="0 78 500 18" align="Left Top" name="MaxLightDistanceText">
                             <UserString key="ToolTipType" value="Layout"/>
                             <UserString key="ToolTipLayout" value="TextToolTip"/>
-                            <UserString key="Caption_Text" value="Default: 8192 (units)\nMaximum distance at which lights will appear.\n\nSet this to 0.0 to disable it."/>
+                            <UserString key="Caption_Text" value="#{SettingsMenu:LightsMaximumDistanceTooltip}"/>
                         </Widget>
                         <Widget type="ScrollBar" skin="MW_HScroll" position="0 104 352 18" align="HStretch Top">
                             <Property key="Range" value="8192"/>
@@ -576,13 +576,13 @@
                             <UserString key="SettingName" value="maximum light distance"/>
                             <UserString key="SettingValueType" value="Integer"/>
                             <UserString key="SettingLabelWidget" value="MaxLightDistanceText"/>
-                            <UserString key="SettingLabelCaption" value="Maximum Light Distance (%s)"/>
+                            <UserString key="SettingLabelCaption" value="#{SettingsMenu:LightsMaximumDistance} (%s)"/>
                         </Widget>
                         <!-- Light Fade Multiplier -->
-                        <Widget type="TextBox" skin="NormalText" position="0 128 352 18" align="Left Top" name="LightFadeMultiplierText">
+                        <Widget type="TextBox" skin="NormalText" position="0 128 500 18" align="Left Top" name="LightFadeMultiplierText">
                             <UserString key="ToolTipType" value="Layout"/>
                             <UserString key="ToolTipLayout" value="TextToolTip"/>
-                            <UserString key="Caption_Text" value="Default: 0.85\nFraction of maximum distance at which lights will start to fade.\n\nSet this to a low value for slower transitions or a high value for quicker transitions."/>
+                            <UserString key="Caption_Text" value="#{SettingsMenu:LightsFadeStartMultiplierTooltip}"/>
                         </Widget>
                         <Widget type="ScrollBar" skin="MW_HScroll" position="0 152 352 18" align="HStretch Top">
                             <Property key="Range" value="10000"/>
@@ -594,13 +594,13 @@
                             <UserString key="SettingMin" value="0.0"/>
                             <UserString key="SettingMax" value="1.0"/>
                             <UserString key="SettingLabelWidget" value="LightFadeMultiplierText"/>
-                            <UserString key="SettingLabelCaption" value="Fade Start Multiplier (%s)"/>
+                            <UserString key="SettingLabelCaption" value="#{SettingsMenu:LightsFadeStartMultiplier} (%s)"/>
                         </Widget>
                         <!-- Bounding Sphere Multiplier -->
-                        <Widget type="TextBox" skin="NormalText" position="0 176 352 18" align="Left Top" name="BoundingSphereMultText">
+                        <Widget type="TextBox" skin="NormalText" position="0 176 500 18" align="Left Top" name="BoundingSphereMultText">
                             <UserString key="ToolTipType" value="Layout"/>
                             <UserString key="ToolTipLayout" value="TextToolTip"/>
-                            <UserString key="Caption_Text" value="Default: 1.65\nMultipler for bounding sphere of lights.\nHigher numbers allows for smooth falloff but require an increase in number of max lights.\n\nDoes not effect the illumination or strength of lights."/>
+                            <UserString key="Caption_Text" value="#{SettingsMenu:LightsBoundingSphereMultiplierTooltip}"/>
                         </Widget>
                         <Widget type="ScrollBar" skin="MW_HScroll" position="0 200 352 18" align="HStretch Top">
                             <Property key="Range" value="500000"/>
@@ -612,13 +612,13 @@
                             <UserString key="SettingName" value="light bounds multiplier"/>
                             <UserString key="SettingValueType" value="Float"/>
                             <UserString key="SettingLabelWidget" value="BoundingSphereMultText"/>
-                            <UserString key="SettingLabelCaption" value="Bounding Sphere Multiplier (%s)"/>
+                            <UserString key="SettingLabelCaption" value="#{SettingsMenu:LightsBoundingSphereMultiplier} (%s)"/>
                         </Widget>
                         <!-- Minimum Ambient Brightness -->
-                        <Widget type="TextBox" skin="NormalText" position="0 224 352 18" align="Left Top" name="MinimumBrightnessText">
+                        <Widget type="TextBox" skin="NormalText" position="0 224 500 18" align="Left Top" name="MinimumBrightnessText">
                             <UserString key="ToolTipType" value="Layout"/>
                             <UserString key="ToolTipLayout" value="TextToolTip"/>
-                            <UserString key="Caption_Text" value="Default: 0.08\nMinimum ambient interior brightness.\n\nIncrease this if you feel interiors are too dark."/>
+                            <UserString key="Caption_Text" value="#{SettingsMenu:LightsMinimumInteriorBrightnessTooltip}"/>
                         </Widget>
                         <Widget type="ScrollBar" skin="MW_HScroll" position="0 248 352 18" align="HStretch Top">
                             <Property key="Range" value="10000"/>
@@ -628,16 +628,16 @@
                             <UserString key="SettingName" value="minimum interior brightness"/>
                             <UserString key="SettingValueType" value="Float"/>
                             <UserString key="SettingLabelWidget" value="MinimumBrightnessText"/>
-                            <UserString key="SettingLabelCaption" value="Minimum Interior Brightness (%s)"/>
+                            <UserString key="SettingLabelCaption" value="#{SettingsMenu:LightsMinimumInteriorBrightness} (%s)"/>
                         </Widget>
                         <Widget type="AutoSizedButton" skin="MW_Button" position="0 290 0 0" align="Top Left" name="LightsResetButton">
-                            <Property key="Caption" value="Reset To Defaults"/>
+                            <Property key="Caption" value="#{sControlsMenu1}"/>
                         </Widget>
                     </Widget>
                 </Widget>
             </Widget>
             <Widget type="TabItem">
-                <Property key="Caption" value="  Scripts  "/>
+                <Property key="Caption" value="  #{SettingsMenu:Scripts}  "/>
 
                 <Widget type="HBox" position_real="0 0 1 0.99" align="Stretch">
                     <Property key="Padding" value="0"/>
diff --git a/files/mygui/openmw_text_input.layout b/files/mygui/openmw_text_input.layout
index 85376060f4..9f879bc14a 100644
--- a/files/mygui/openmw_text_input.layout
+++ b/files/mygui/openmw_text_input.layout
@@ -12,7 +12,7 @@
         <!-- Dialog buttons -->
         <Widget type="AutoSizedButton" skin="MW_Button" position="264 60 42 23" name="OKButton">
             <Property key="ExpandDirection" value="Left"/>
-            <Property key="Caption" value="OK"/>
+            <Property key="Caption" value="#{sOk}"/>
         </Widget>
     </Widget>
 </MyGUI>

From 42b9a6daaf19d5959bfeaa87037a61b5f8f76d9e Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Tue, 12 Jul 2022 12:45:11 +0400
Subject: [PATCH 2788/2859] Do not use an invalid iterator

---
 apps/opencs/model/world/infocollection.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/opencs/model/world/infocollection.cpp b/apps/opencs/model/world/infocollection.cpp
index ced7938fc2..729bc31c97 100644
--- a/apps/opencs/model/world/infocollection.cpp
+++ b/apps/opencs/model/world/infocollection.cpp
@@ -319,7 +319,7 @@ void CSMWorld::InfoCollection::removeRows (int index, int count)
                     ++it;
                 }
                 else
-                    iter->second.erase(it);
+                    it = iter->second.erase(it);
             }
             else
                 ++it;

From a5b0ef09127400c2916a9557b0ac95c74d428c65 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Tue, 12 Jul 2022 12:56:53 +0400
Subject: [PATCH 2789/2859] Avoid possible null dereference

---
 apps/opencs/model/world/collection.hpp     | 3 ++-
 apps/opencs/model/world/infocollection.cpp | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/model/world/collection.hpp b/apps/opencs/model/world/collection.hpp
index 25e350f3a3..859866058c 100644
--- a/apps/opencs/model/world/collection.hpp
+++ b/apps/opencs/model/world/collection.hpp
@@ -230,7 +230,8 @@ namespace CSMWorld
             for (int i=0; i<size; ++i)
             {
                 buffer[newOrder[i]] = std::move(mRecords [baseIndex+i]);
-                buffer[newOrder[i]]->setModified (buffer[newOrder[i]]->get());
+                if (buffer[newOrder[i]])
+                    buffer[newOrder[i]]->setModified (buffer[newOrder[i]]->get());
             }
 
             std::move (buffer.begin(), buffer.end(), mRecords.begin()+baseIndex);
diff --git a/apps/opencs/model/world/infocollection.cpp b/apps/opencs/model/world/infocollection.cpp
index 729bc31c97..8ff11009b1 100644
--- a/apps/opencs/model/world/infocollection.cpp
+++ b/apps/opencs/model/world/infocollection.cpp
@@ -58,7 +58,8 @@ namespace CSMWorld
             for (int i = 0; i < size; ++i)
             {
                 buffer[newOrder[i]] = std::move(mRecords[baseIndex+i]);
-                buffer[newOrder[i]]->setModified(buffer[newOrder[i]]->get());
+                if (buffer[newOrder[i]])
+                    buffer[newOrder[i]]->setModified(buffer[newOrder[i]]->get());
             }
 
             std::move(buffer.begin(), buffer.end(), mRecords.begin()+baseIndex);

From 4b257e496ef5aee520425eaec9f14601cb0826d2 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 11 Jul 2022 20:41:07 +0400
Subject: [PATCH 2790/2859] Use static settings map for launcher and editor -
 the Settings::Manager has a static data anyway

---
 apps/launcher/datafilespage.cpp             |  1 +
 apps/launcher/maindialog.cpp                |  6 +--
 apps/launcher/maindialog.hpp                |  2 -
 apps/opencs/editor.cpp                      |  2 +
 apps/opencs/model/prefs/boolsetting.cpp     |  8 +--
 apps/opencs/model/prefs/boolsetting.hpp     |  2 +-
 apps/opencs/model/prefs/coloursetting.cpp   |  8 +--
 apps/opencs/model/prefs/coloursetting.hpp   |  2 +-
 apps/opencs/model/prefs/doublesetting.cpp   |  8 +--
 apps/opencs/model/prefs/doublesetting.hpp   |  2 +-
 apps/opencs/model/prefs/enumsetting.cpp     |  8 +--
 apps/opencs/model/prefs/enumsetting.hpp     |  2 +-
 apps/opencs/model/prefs/intsetting.cpp      |  8 +--
 apps/opencs/model/prefs/intsetting.hpp      |  2 +-
 apps/opencs/model/prefs/modifiersetting.cpp | 10 ++--
 apps/opencs/model/prefs/modifiersetting.hpp |  3 +-
 apps/opencs/model/prefs/setting.cpp         | 20 +++----
 apps/opencs/model/prefs/setting.hpp         | 10 +---
 apps/opencs/model/prefs/shortcutsetting.cpp | 10 ++--
 apps/opencs/model/prefs/shortcutsetting.hpp |  2 +-
 apps/opencs/model/prefs/state.cpp           | 60 ++++++++++-----------
 apps/opencs/model/prefs/state.hpp           |  5 --
 apps/opencs/model/prefs/stringsetting.cpp   |  8 +--
 apps/opencs/model/prefs/stringsetting.hpp   |  2 +-
 24 files changed, 87 insertions(+), 104 deletions(-)

diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index e16202a047..e1b34a8034 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -19,6 +19,7 @@
 #include <components/config/gamesettings.hpp>
 #include <components/config/launchersettings.hpp>
 
+#include <components/settings/settings.hpp>
 #include <components/bsa/compressedbsafile.hpp>
 #include <components/navmeshtool/protocol.hpp>
 #include <components/vfs/bsaarchive.hpp>
diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp
index ab6a3e52a3..69259f8b27 100644
--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@@ -423,14 +423,14 @@ bool Launcher::MainDialog::setupGameData()
 
 bool Launcher::MainDialog::setupGraphicsSettings()
 {
-    mEngineSettings.clear();  // Ensure to clear previous settings in case we had already loaded settings.
+    Settings::Manager::clear();  // Ensure to clear previous settings in case we had already loaded settings.
     try
     {
         boost::program_options::variables_map variables;
         boost::program_options::options_description desc;
         mCfgMgr.addCommonOptions(desc);
         mCfgMgr.readConfiguration(variables, desc, true);
-        mEngineSettings.load(mCfgMgr);
+        Settings::Manager::load(mCfgMgr);
         return true;
     }
     catch (std::exception& e)
@@ -513,7 +513,7 @@ bool Launcher::MainDialog::writeSettings()
     // Graphics settings
     const std::string settingsPath = (mCfgMgr.getUserConfigPath() / "settings.cfg").string();
     try {
-        mEngineSettings.saveUser(settingsPath);
+        Settings::Manager::saveUser(settingsPath);
     }
     catch (std::exception& e) {
         std::string msg = "<br><b>Error writing settings.cfg</b><br><br>" +
diff --git a/apps/launcher/maindialog.hpp b/apps/launcher/maindialog.hpp
index ee81185dd5..ca198cef54 100644
--- a/apps/launcher/maindialog.hpp
+++ b/apps/launcher/maindialog.hpp
@@ -10,7 +10,6 @@
 #include <components/config/gamesettings.hpp>
 #include <components/config/launchersettings.hpp>
 
-#include <components/settings/settings.hpp>
 #endif
 #include "ui_mainwindow.h"
 
@@ -95,7 +94,6 @@ namespace Launcher
         Files::ConfigurationManager mCfgMgr;
 
         Config::GameSettings mGameSettings;
-        Settings::Manager mEngineSettings;
         Config::LauncherSettings mLauncherSettings;
 
     };
diff --git a/apps/opencs/editor.cpp b/apps/opencs/editor.cpp
index 5dfa3fbf4e..b70c9f9ca8 100644
--- a/apps/opencs/editor.cpp
+++ b/apps/opencs/editor.cpp
@@ -12,6 +12,7 @@
 #include <components/fallback/validate.hpp>
 #include <components/misc/rng.hpp>
 #include <components/nifosg/nifloader.hpp>
+#include <components/settings/settings.hpp>
 
 #include "model/doc/document.hpp"
 #include "model/world/data.hpp"
@@ -109,6 +110,7 @@ boost::program_options::variables_map CS::Editor::readConfiguration()
     boost::program_options::notify(variables);
 
     mCfgMgr.readConfiguration(variables, desc, false);
+    Settings::Manager::load(mCfgMgr, true);
     setupLogging(mCfgMgr.getLogPath().string(), "OpenMW-CS");
 
     return variables;
diff --git a/apps/opencs/model/prefs/boolsetting.cpp b/apps/opencs/model/prefs/boolsetting.cpp
index c8a2c7c5e2..2ef141b0d3 100644
--- a/apps/opencs/model/prefs/boolsetting.cpp
+++ b/apps/opencs/model/prefs/boolsetting.cpp
@@ -8,9 +8,9 @@
 #include "category.hpp"
 #include "state.hpp"
 
-CSMPrefs::BoolSetting::BoolSetting (Category *parent, Settings::Manager *values,
+CSMPrefs::BoolSetting::BoolSetting (Category *parent,
   QMutex *mutex, const std::string& key, const std::string& label, bool default_)
-: Setting (parent, values, mutex, key, label),  mDefault (default_), mWidget(nullptr)
+: Setting (parent, mutex, key, label),  mDefault (default_), mWidget(nullptr)
 {}
 
 CSMPrefs::BoolSetting& CSMPrefs::BoolSetting::setTooltip (const std::string& tooltip)
@@ -39,7 +39,7 @@ void CSMPrefs::BoolSetting::updateWidget()
 {
     if (mWidget)
     {
-        mWidget->setCheckState(getValues().getBool(getKey(), getParent()->getKey())
+        mWidget->setCheckState(Settings::Manager::getBool(getKey(), getParent()->getKey())
             ? Qt::Checked
             : Qt::Unchecked);
     }
@@ -49,7 +49,7 @@ void CSMPrefs::BoolSetting::valueChanged (int value)
 {
     {
         QMutexLocker lock (getMutex());
-        getValues().setBool (getKey(), getParent()->getKey(), value);
+        Settings::Manager::setBool (getKey(), getParent()->getKey(), value);
     }
 
     getParent()->getState()->update (*this);
diff --git a/apps/opencs/model/prefs/boolsetting.hpp b/apps/opencs/model/prefs/boolsetting.hpp
index 941cb50372..4bfd7df47a 100644
--- a/apps/opencs/model/prefs/boolsetting.hpp
+++ b/apps/opencs/model/prefs/boolsetting.hpp
@@ -17,7 +17,7 @@ namespace CSMPrefs
 
         public:
 
-            BoolSetting (Category *parent, Settings::Manager *values,
+            BoolSetting (Category *parent,
                 QMutex *mutex, const std::string& key, const std::string& label, bool default_);
 
             BoolSetting& setTooltip (const std::string& tooltip);
diff --git a/apps/opencs/model/prefs/coloursetting.cpp b/apps/opencs/model/prefs/coloursetting.cpp
index 24735a3bac..569a759632 100644
--- a/apps/opencs/model/prefs/coloursetting.cpp
+++ b/apps/opencs/model/prefs/coloursetting.cpp
@@ -11,9 +11,9 @@
 #include "category.hpp"
 #include "state.hpp"
 
-CSMPrefs::ColourSetting::ColourSetting (Category *parent, Settings::Manager *values,
+CSMPrefs::ColourSetting::ColourSetting (Category *parent,
   QMutex *mutex, const std::string& key, const std::string& label, QColor default_)
-: Setting (parent, values, mutex, key, label), mDefault (default_), mWidget(nullptr)
+: Setting (parent, mutex, key, label), mDefault (default_), mWidget(nullptr)
 {}
 
 CSMPrefs::ColourSetting& CSMPrefs::ColourSetting::setTooltip (const std::string& tooltip)
@@ -45,7 +45,7 @@ void CSMPrefs::ColourSetting::updateWidget()
     if (mWidget)
     {
         mWidget->setColor(QString::fromStdString
-            (getValues().getString(getKey(), getParent()->getKey())));
+            (Settings::Manager::getString(getKey(), getParent()->getKey())));
     }
 }
 
@@ -54,7 +54,7 @@ void CSMPrefs::ColourSetting::valueChanged()
     CSVWidget::ColorEditor& widget = dynamic_cast<CSVWidget::ColorEditor&> (*sender());
     {
         QMutexLocker lock (getMutex());
-        getValues().setString (getKey(), getParent()->getKey(), widget.color().name().toUtf8().data());
+        Settings::Manager::setString (getKey(), getParent()->getKey(), widget.color().name().toUtf8().data());
     }
 
     getParent()->getState()->update (*this);
diff --git a/apps/opencs/model/prefs/coloursetting.hpp b/apps/opencs/model/prefs/coloursetting.hpp
index 4a814c0e2e..097eec4313 100644
--- a/apps/opencs/model/prefs/coloursetting.hpp
+++ b/apps/opencs/model/prefs/coloursetting.hpp
@@ -22,7 +22,7 @@ namespace CSMPrefs
 
         public:
 
-            ColourSetting (Category *parent, Settings::Manager *values,
+            ColourSetting (Category *parent,
                 QMutex *mutex, const std::string& key, const std::string& label,
                 QColor default_);
 
diff --git a/apps/opencs/model/prefs/doublesetting.cpp b/apps/opencs/model/prefs/doublesetting.cpp
index 757b67389a..d8253353b5 100644
--- a/apps/opencs/model/prefs/doublesetting.cpp
+++ b/apps/opencs/model/prefs/doublesetting.cpp
@@ -12,9 +12,9 @@
 #include "category.hpp"
 #include "state.hpp"
 
-CSMPrefs::DoubleSetting::DoubleSetting (Category *parent, Settings::Manager *values,
+CSMPrefs::DoubleSetting::DoubleSetting (Category *parent,
   QMutex *mutex, const std::string& key, const std::string& label, double default_)
-: Setting (parent, values, mutex, key, label),
+: Setting (parent, mutex, key, label),
   mPrecision(2), mMin (0), mMax (std::numeric_limits<double>::max()),
   mDefault (default_), mWidget(nullptr)
 {}
@@ -75,7 +75,7 @@ void CSMPrefs::DoubleSetting::updateWidget()
 {
     if (mWidget)
     {
-        mWidget->setValue(getValues().getFloat(getKey(), getParent()->getKey()));
+        mWidget->setValue(Settings::Manager::getFloat(getKey(), getParent()->getKey()));
     }
 }
 
@@ -83,7 +83,7 @@ void CSMPrefs::DoubleSetting::valueChanged (double value)
 {
     {
         QMutexLocker lock (getMutex());
-        getValues().setFloat (getKey(), getParent()->getKey(), value);
+        Settings::Manager::setFloat (getKey(), getParent()->getKey(), value);
     }
 
     getParent()->getState()->update (*this);
diff --git a/apps/opencs/model/prefs/doublesetting.hpp b/apps/opencs/model/prefs/doublesetting.hpp
index 47886e446f..f65a776351 100644
--- a/apps/opencs/model/prefs/doublesetting.hpp
+++ b/apps/opencs/model/prefs/doublesetting.hpp
@@ -20,7 +20,7 @@ namespace CSMPrefs
 
         public:
 
-            DoubleSetting (Category *parent, Settings::Manager *values,
+            DoubleSetting (Category *parent,
                 QMutex *mutex, const std::string& key, const std::string& label,
                 double default_);
 
diff --git a/apps/opencs/model/prefs/enumsetting.cpp b/apps/opencs/model/prefs/enumsetting.cpp
index ec3fca328f..096c9aab38 100644
--- a/apps/opencs/model/prefs/enumsetting.cpp
+++ b/apps/opencs/model/prefs/enumsetting.cpp
@@ -40,9 +40,9 @@ CSMPrefs::EnumValues& CSMPrefs::EnumValues::add (const std::string& value, const
 }
 
 
-CSMPrefs::EnumSetting::EnumSetting (Category *parent, Settings::Manager *values,
+CSMPrefs::EnumSetting::EnumSetting (Category *parent,
   QMutex *mutex, const std::string& key, const std::string& label, const EnumValue& default_)
-: Setting (parent, values, mutex, key, label), mDefault (default_), mWidget(nullptr)
+: Setting (parent, mutex, key, label), mDefault (default_), mWidget(nullptr)
 {}
 
 CSMPrefs::EnumSetting& CSMPrefs::EnumSetting::setTooltip (const std::string& tooltip)
@@ -107,7 +107,7 @@ void CSMPrefs::EnumSetting::updateWidget()
     if (mWidget)
     {
         int index = mWidget->findText(QString::fromStdString
-            (getValues().getString(getKey(), getParent()->getKey())));
+            (Settings::Manager::getString(getKey(), getParent()->getKey())));
 
         mWidget->setCurrentIndex(index);
     }
@@ -117,7 +117,7 @@ void CSMPrefs::EnumSetting::valueChanged (int value)
 {
     {
         QMutexLocker lock (getMutex());
-        getValues().setString (getKey(), getParent()->getKey(), mValues.mValues.at (value).mValue);
+        Settings::Manager::setString (getKey(), getParent()->getKey(), mValues.mValues.at (value).mValue);
     }
 
     getParent()->getState()->update (*this);
diff --git a/apps/opencs/model/prefs/enumsetting.hpp b/apps/opencs/model/prefs/enumsetting.hpp
index 235f6adc3a..d0467b0639 100644
--- a/apps/opencs/model/prefs/enumsetting.hpp
+++ b/apps/opencs/model/prefs/enumsetting.hpp
@@ -41,7 +41,7 @@ namespace CSMPrefs
 
         public:
 
-            EnumSetting (Category *parent, Settings::Manager *values,
+            EnumSetting (Category *parent,
                 QMutex *mutex, const std::string& key, const std::string& label,
                 const EnumValue& default_);
 
diff --git a/apps/opencs/model/prefs/intsetting.cpp b/apps/opencs/model/prefs/intsetting.cpp
index 407ed11f05..b3d4a66334 100644
--- a/apps/opencs/model/prefs/intsetting.cpp
+++ b/apps/opencs/model/prefs/intsetting.cpp
@@ -12,9 +12,9 @@
 #include "category.hpp"
 #include "state.hpp"
 
-CSMPrefs::IntSetting::IntSetting (Category *parent, Settings::Manager *values,
+CSMPrefs::IntSetting::IntSetting (Category *parent,
   QMutex *mutex, const std::string& key, const std::string& label, int default_)
-: Setting (parent, values, mutex, key, label), mMin (0), mMax (std::numeric_limits<int>::max()),
+: Setting (parent, mutex, key, label), mMin (0), mMax (std::numeric_limits<int>::max()),
   mDefault (default_), mWidget(nullptr)
 {}
 
@@ -67,7 +67,7 @@ void CSMPrefs::IntSetting::updateWidget()
 {
     if (mWidget)
     {
-        mWidget->setValue(getValues().getInt(getKey(), getParent()->getKey()));
+        mWidget->setValue(Settings::Manager::getInt(getKey(), getParent()->getKey()));
     }
 }
 
@@ -75,7 +75,7 @@ void CSMPrefs::IntSetting::valueChanged (int value)
 {
     {
         QMutexLocker lock (getMutex());
-        getValues().setInt (getKey(), getParent()->getKey(), value);
+        Settings::Manager::setInt (getKey(), getParent()->getKey(), value);
     }
 
     getParent()->getState()->update (*this);
diff --git a/apps/opencs/model/prefs/intsetting.hpp b/apps/opencs/model/prefs/intsetting.hpp
index f18213b77b..c03e010ad7 100644
--- a/apps/opencs/model/prefs/intsetting.hpp
+++ b/apps/opencs/model/prefs/intsetting.hpp
@@ -19,7 +19,7 @@ namespace CSMPrefs
 
         public:
 
-            IntSetting (Category *parent, Settings::Manager *values,
+            IntSetting (Category *parent,
                 QMutex *mutex, const std::string& key, const std::string& label, int default_);
 
             // defaults to [0, std::numeric_limits<int>::max()]
diff --git a/apps/opencs/model/prefs/modifiersetting.cpp b/apps/opencs/model/prefs/modifiersetting.cpp
index 288926d00b..606cece2bc 100644
--- a/apps/opencs/model/prefs/modifiersetting.cpp
+++ b/apps/opencs/model/prefs/modifiersetting.cpp
@@ -7,14 +7,16 @@
 #include <QPushButton>
 #include <QWidget>
 
+#include <components/settings/settings.hpp>
+
 #include "state.hpp"
 #include "shortcutmanager.hpp"
 
 namespace CSMPrefs
 {
-    ModifierSetting::ModifierSetting(Category* parent, Settings::Manager* values, QMutex* mutex, const std::string& key,
+    ModifierSetting::ModifierSetting(Category* parent, QMutex* mutex, const std::string& key,
         const std::string& label)
-        : Setting(parent, values, mutex, key, label)
+        : Setting(parent, mutex, key, label)
         , mButton(nullptr)
         , mEditorActive(false)
     {
@@ -47,7 +49,7 @@ namespace CSMPrefs
     {
         if (mButton)
         {
-            std::string shortcut = getValues().getString(getKey(), getParent()->getKey());
+            std::string shortcut = Settings::Manager::getString(getKey(), getParent()->getKey());
 
             int modifier;
             State::get().getShortcutManager().convertFromString(shortcut, modifier);
@@ -135,7 +137,7 @@ namespace CSMPrefs
 
         {
             QMutexLocker lock(getMutex());
-            getValues().setString(getKey(), getParent()->getKey(), value);
+            Settings::Manager::setString(getKey(), getParent()->getKey(), value);
         }
 
         getParent()->getState()->update(*this);
diff --git a/apps/opencs/model/prefs/modifiersetting.hpp b/apps/opencs/model/prefs/modifiersetting.hpp
index 977badb8df..d1af9d25c6 100644
--- a/apps/opencs/model/prefs/modifiersetting.hpp
+++ b/apps/opencs/model/prefs/modifiersetting.hpp
@@ -16,8 +16,7 @@ namespace CSMPrefs
 
         public:
 
-            ModifierSetting(Category* parent, Settings::Manager* values, QMutex* mutex, const std::string& key,
-                const std::string& label);
+            ModifierSetting(Category* parent,  QMutex* mutex, const std::string& key, const std::string& label);
 
             std::pair<QWidget*, QWidget*> makeWidgets(QWidget* parent) override;
 
diff --git a/apps/opencs/model/prefs/setting.cpp b/apps/opencs/model/prefs/setting.cpp
index 165062232a..524938bcc7 100644
--- a/apps/opencs/model/prefs/setting.cpp
+++ b/apps/opencs/model/prefs/setting.cpp
@@ -4,23 +4,19 @@
 #include <QColor>
 #include <QMutexLocker>
 
+#include <components/settings/settings.hpp>
+
 #include "category.hpp"
 #include "state.hpp"
 
-Settings::Manager& CSMPrefs::Setting::getValues()
-{
-    return *mValues;
-}
-
 QMutex *CSMPrefs::Setting::getMutex()
 {
     return mMutex;
 }
 
-CSMPrefs::Setting::Setting (Category *parent, Settings::Manager *values, QMutex *mutex,
+CSMPrefs::Setting::Setting (Category *parent, QMutex *mutex,
     const std::string& key, const std::string& label)
-: QObject (parent->getState()), mParent (parent), mValues (values), mMutex (mutex), mKey (key),
-  mLabel (label)
+: QObject (parent->getState()), mParent (parent), mMutex (mutex), mKey (key), mLabel (label)
 {}
 
 CSMPrefs::Setting:: ~Setting() {}
@@ -52,25 +48,25 @@ const std::string& CSMPrefs::Setting::getLabel() const
 int CSMPrefs::Setting::toInt() const
 {
     QMutexLocker lock (mMutex);
-    return mValues->getInt (mKey, mParent->getKey());
+    return Settings::Manager::getInt (mKey, mParent->getKey());
 }
 
 double CSMPrefs::Setting::toDouble() const
 {
     QMutexLocker lock (mMutex);
-    return mValues->getFloat (mKey, mParent->getKey());
+    return Settings::Manager::getFloat (mKey, mParent->getKey());
 }
 
 std::string CSMPrefs::Setting::toString() const
 {
     QMutexLocker lock (mMutex);
-    return mValues->getString (mKey, mParent->getKey());
+    return Settings::Manager::getString (mKey, mParent->getKey());
 }
 
 bool CSMPrefs::Setting::isTrue() const
 {
     QMutexLocker lock (mMutex);
-    return mValues->getBool (mKey, mParent->getKey());
+    return Settings::Manager::getBool (mKey, mParent->getKey());
 }
 
 QColor CSMPrefs::Setting::toColor() const
diff --git a/apps/opencs/model/prefs/setting.hpp b/apps/opencs/model/prefs/setting.hpp
index 7cb2d7acf6..fcf70c26cd 100644
--- a/apps/opencs/model/prefs/setting.hpp
+++ b/apps/opencs/model/prefs/setting.hpp
@@ -10,11 +10,6 @@ class QWidget;
 class QColor;
 class QMutex;
 
-namespace Settings
-{
-    class Manager;
-}
-
 namespace CSMPrefs
 {
     class Category;
@@ -24,20 +19,17 @@ namespace CSMPrefs
             Q_OBJECT
 
             Category *mParent;
-            Settings::Manager *mValues;
             QMutex *mMutex;
             std::string mKey;
             std::string mLabel;
 
         protected:
 
-            Settings::Manager& getValues();
-
             QMutex *getMutex();
 
         public:
 
-            Setting (Category *parent, Settings::Manager *values, QMutex *mutex, const std::string& key, const std::string& label);
+            Setting (Category *parent, QMutex *mutex, const std::string& key, const std::string& label);
 
             virtual ~Setting();
 
diff --git a/apps/opencs/model/prefs/shortcutsetting.cpp b/apps/opencs/model/prefs/shortcutsetting.cpp
index e0cd5bb07b..622c182dce 100644
--- a/apps/opencs/model/prefs/shortcutsetting.cpp
+++ b/apps/opencs/model/prefs/shortcutsetting.cpp
@@ -8,14 +8,16 @@
 #include <QWidget>
 #include <QString>
 
+#include <components/settings/settings.hpp>
+
 #include "state.hpp"
 #include "shortcutmanager.hpp"
 
 namespace CSMPrefs
 {
-    ShortcutSetting::ShortcutSetting(Category* parent, Settings::Manager* values, QMutex* mutex, const std::string& key,
+    ShortcutSetting::ShortcutSetting(Category* parent, QMutex* mutex, const std::string& key,
         const std::string& label)
-        : Setting(parent, values, mutex, key, label)
+        : Setting(parent, mutex, key, label)
         , mButton(nullptr)
         , mEditorActive(false)
         , mEditorPos(0)
@@ -53,7 +55,7 @@ namespace CSMPrefs
     {
         if (mButton)
         {
-            std::string shortcut = getValues().getString(getKey(), getParent()->getKey());
+            std::string shortcut = Settings::Manager::getString(getKey(), getParent()->getKey());
 
             QKeySequence sequence;
             State::get().getShortcutManager().convertFromString(shortcut, sequence);
@@ -179,7 +181,7 @@ namespace CSMPrefs
 
         {
             QMutexLocker lock(getMutex());
-            getValues().setString(getKey(), getParent()->getKey(), value);
+            Settings::Manager::setString(getKey(), getParent()->getKey(), value);
         }
 
         getParent()->getState()->update(*this);
diff --git a/apps/opencs/model/prefs/shortcutsetting.hpp b/apps/opencs/model/prefs/shortcutsetting.hpp
index 52298232e7..cc1394b47e 100644
--- a/apps/opencs/model/prefs/shortcutsetting.hpp
+++ b/apps/opencs/model/prefs/shortcutsetting.hpp
@@ -16,7 +16,7 @@ namespace CSMPrefs
 
         public:
 
-            ShortcutSetting(Category* parent, Settings::Manager* values, QMutex* mutex, const std::string& key,
+            ShortcutSetting(Category* parent, QMutex* mutex, const std::string& key,
                 const std::string& label);
 
             std::pair<QWidget*, QWidget*> makeWidgets(QWidget* parent) override;
diff --git a/apps/opencs/model/prefs/state.cpp b/apps/opencs/model/prefs/state.cpp
index 0acd8680c8..a93684a9f2 100644
--- a/apps/opencs/model/prefs/state.cpp
+++ b/apps/opencs/model/prefs/state.cpp
@@ -5,6 +5,8 @@
 #include <algorithm>
 #include <sstream>
 
+#include <components/settings/settings.hpp>
+
 #include "intsetting.hpp"
 #include "doublesetting.hpp"
 #include "boolsetting.hpp"
@@ -14,11 +16,6 @@
 
 CSMPrefs::State *CSMPrefs::State::sThis = nullptr;
 
-void CSMPrefs::State::load()
-{
-    mSettings.load(mConfigurationManager, true);
-}
-
 void CSMPrefs::State::declare()
 {
     declareCategory ("Windows");
@@ -448,10 +445,10 @@ CSMPrefs::IntSetting& CSMPrefs::State::declareInt (const std::string& key,
 
     setDefault(key, std::to_string(default_));
 
-    default_ = mSettings.getInt (key, mCurrentCategory->second.getKey());
+    default_ = Settings::Manager::getInt (key, mCurrentCategory->second.getKey());
 
     CSMPrefs::IntSetting *setting =
-        new CSMPrefs::IntSetting (&mCurrentCategory->second, &mSettings, &mMutex, key, label,
+        new CSMPrefs::IntSetting (&mCurrentCategory->second, &mMutex, key, label,
         default_);
 
     mCurrentCategory->second.addSetting (setting);
@@ -469,10 +466,10 @@ CSMPrefs::DoubleSetting& CSMPrefs::State::declareDouble (const std::string& key,
     stream << default_;
     setDefault(key, stream.str());
 
-    default_ = mSettings.getFloat (key, mCurrentCategory->second.getKey());
+    default_ = Settings::Manager::getFloat (key, mCurrentCategory->second.getKey());
 
     CSMPrefs::DoubleSetting *setting =
-        new CSMPrefs::DoubleSetting (&mCurrentCategory->second, &mSettings, &mMutex,
+        new CSMPrefs::DoubleSetting (&mCurrentCategory->second, &mMutex,
         key, label, default_);
 
     mCurrentCategory->second.addSetting (setting);
@@ -488,10 +485,10 @@ CSMPrefs::BoolSetting& CSMPrefs::State::declareBool (const std::string& key,
 
     setDefault (key, default_ ? "true" : "false");
 
-    default_ = mSettings.getBool (key, mCurrentCategory->second.getKey());
+    default_ = Settings::Manager::getBool (key, mCurrentCategory->second.getKey());
 
     CSMPrefs::BoolSetting *setting =
-        new CSMPrefs::BoolSetting (&mCurrentCategory->second, &mSettings, &mMutex, key, label,
+        new CSMPrefs::BoolSetting (&mCurrentCategory->second, &mMutex, key, label,
         default_);
 
     mCurrentCategory->second.addSetting (setting);
@@ -507,10 +504,10 @@ CSMPrefs::EnumSetting& CSMPrefs::State::declareEnum (const std::string& key,
 
     setDefault (key, default_.mValue);
 
-    default_.mValue = mSettings.getString (key, mCurrentCategory->second.getKey());
+    default_.mValue = Settings::Manager::getString (key, mCurrentCategory->second.getKey());
 
     CSMPrefs::EnumSetting *setting =
-        new CSMPrefs::EnumSetting (&mCurrentCategory->second, &mSettings, &mMutex, key, label,
+        new CSMPrefs::EnumSetting (&mCurrentCategory->second, &mMutex, key, label,
         default_);
 
     mCurrentCategory->second.addSetting (setting);
@@ -526,10 +523,10 @@ CSMPrefs::ColourSetting& CSMPrefs::State::declareColour (const std::string& key,
 
     setDefault (key, default_.name().toUtf8().data());
 
-    default_.setNamedColor (QString::fromUtf8 (mSettings.getString (key, mCurrentCategory->second.getKey()).c_str()));
+    default_.setNamedColor (QString::fromUtf8 (Settings::Manager::getString (key, mCurrentCategory->second.getKey()).c_str()));
 
     CSMPrefs::ColourSetting *setting =
-        new CSMPrefs::ColourSetting (&mCurrentCategory->second, &mSettings, &mMutex, key, label,
+        new CSMPrefs::ColourSetting (&mCurrentCategory->second, &mMutex, key, label,
         default_);
 
     mCurrentCategory->second.addSetting (setting);
@@ -549,10 +546,10 @@ CSMPrefs::ShortcutSetting& CSMPrefs::State::declareShortcut (const std::string&
     // Setup with actual data
     QKeySequence sequence;
 
-    getShortcutManager().convertFromString(mSettings.getString(key, mCurrentCategory->second.getKey()), sequence);
+    getShortcutManager().convertFromString(Settings::Manager::getString(key, mCurrentCategory->second.getKey()), sequence);
     getShortcutManager().setSequence(key, sequence);
 
-    CSMPrefs::ShortcutSetting *setting = new CSMPrefs::ShortcutSetting (&mCurrentCategory->second, &mSettings, &mMutex,
+    CSMPrefs::ShortcutSetting *setting = new CSMPrefs::ShortcutSetting (&mCurrentCategory->second, &mMutex,
         key, label);
     mCurrentCategory->second.addSetting (setting);
 
@@ -566,10 +563,10 @@ CSMPrefs::StringSetting& CSMPrefs::State::declareString (const std::string& key,
 
     setDefault (key, default_);
 
-    default_ = mSettings.getString (key, mCurrentCategory->second.getKey());
+    default_ = Settings::Manager::getString (key, mCurrentCategory->second.getKey());
 
     CSMPrefs::StringSetting *setting =
-        new CSMPrefs::StringSetting (&mCurrentCategory->second, &mSettings, &mMutex, key, label,
+        new CSMPrefs::StringSetting (&mCurrentCategory->second, &mMutex, key, label,
         default_);
 
     mCurrentCategory->second.addSetting (setting);
@@ -589,10 +586,10 @@ CSMPrefs::ModifierSetting& CSMPrefs::State::declareModifier(const std::string& k
     // Setup with actual data
     int modifier;
 
-    getShortcutManager().convertFromString(mSettings.getString(key, mCurrentCategory->second.getKey()), modifier);
+    getShortcutManager().convertFromString(Settings::Manager::getString(key, mCurrentCategory->second.getKey()), modifier);
     getShortcutManager().setModifier(key, modifier);
 
-    CSMPrefs::ModifierSetting *setting = new CSMPrefs::ModifierSetting (&mCurrentCategory->second, &mSettings, &mMutex,
+    CSMPrefs::ModifierSetting *setting = new CSMPrefs::ModifierSetting (&mCurrentCategory->second, &mMutex,
         key, label);
     mCurrentCategory->second.addSetting (setting);
 
@@ -605,7 +602,7 @@ void CSMPrefs::State::declareSeparator()
         throw std::logic_error ("no category for setting");
 
     CSMPrefs::Setting *setting =
-        new CSMPrefs::Setting (&mCurrentCategory->second, &mSettings, &mMutex, "", "");
+        new CSMPrefs::Setting (&mCurrentCategory->second, &mMutex, "", "");
 
     mCurrentCategory->second.addSetting (setting);
 }
@@ -616,7 +613,7 @@ void CSMPrefs::State::declareSubcategory(const std::string& label)
         throw std::logic_error ("no category for setting");
 
     CSMPrefs::Setting *setting =
-        new CSMPrefs::Setting (&mCurrentCategory->second, &mSettings, &mMutex, "", label);
+        new CSMPrefs::Setting (&mCurrentCategory->second, &mMutex, "", label);
 
     mCurrentCategory->second.addSetting (setting);
 }
@@ -626,10 +623,10 @@ void CSMPrefs::State::setDefault (const std::string& key, const std::string& def
     Settings::CategorySetting fullKey (mCurrentCategory->second.getKey(), key);
 
     Settings::CategorySettingValueMap::iterator iter =
-        mSettings.mDefaultSettings.find (fullKey);
+        Settings::Manager::mDefaultSettings.find (fullKey);
 
-    if (iter==mSettings.mDefaultSettings.end())
-        mSettings.mDefaultSettings.insert (std::make_pair (fullKey, default_));
+    if (iter==Settings::Manager::mDefaultSettings.end())
+        Settings::Manager::mDefaultSettings.insert (std::make_pair (fullKey, default_));
 }
 
 CSMPrefs::State::State (const Files::ConfigurationManager& configurationManager)
@@ -641,7 +638,6 @@ CSMPrefs::State::State (const Files::ConfigurationManager& configurationManager)
 
     sThis = this;
 
-    load();
     declare();
 }
 
@@ -653,7 +649,7 @@ CSMPrefs::State::~State()
 void CSMPrefs::State::save()
 {
     boost::filesystem::path user = mConfigurationManager.getUserConfigPath() / mConfigFile;
-    mSettings.saveUser (user.string());
+    Settings::Manager::saveUser (user.string());
 }
 
 CSMPrefs::State::Iterator CSMPrefs::State::begin()
@@ -696,16 +692,16 @@ CSMPrefs::State& CSMPrefs::State::get()
 
 void CSMPrefs::State::resetCategory(const std::string& category)
 {
-    for (Settings::CategorySettingValueMap::iterator i = mSettings.mUserSettings.begin();
-         i != mSettings.mUserSettings.end(); ++i)
+    for (Settings::CategorySettingValueMap::iterator i = Settings::Manager::mUserSettings.begin();
+         i != Settings::Manager::mUserSettings.end(); ++i)
     {
         // if the category matches
         if (i->first.first == category)
         {
             // mark the setting as changed
-            mSettings.mChangedSettings.insert(std::make_pair(i->first.first, i->first.second));
+            Settings::Manager::mChangedSettings.insert(std::make_pair(i->first.first, i->first.second));
             // reset the value to the default
-            i->second = mSettings.mDefaultSettings[i->first];
+            i->second = Settings::Manager::mDefaultSettings[i->first];
         }
     }
 
diff --git a/apps/opencs/model/prefs/state.hpp b/apps/opencs/model/prefs/state.hpp
index 7c9fcbecda..f464013644 100644
--- a/apps/opencs/model/prefs/state.hpp
+++ b/apps/opencs/model/prefs/state.hpp
@@ -11,8 +11,6 @@
 #include <components/files/configurationmanager.hpp>
 #endif
 
-#include <components/settings/settings.hpp>
-
 #include "category.hpp"
 #include "setting.hpp"
 #include "enumsetting.hpp"
@@ -51,7 +49,6 @@ namespace CSMPrefs
             const std::string mDefaultConfigFile;
             const Files::ConfigurationManager& mConfigurationManager;
             ShortcutManager mShortcutManager;
-            Settings::Manager mSettings;
             Collection mCategories;
             Iterator mCurrentCategory;
             QMutex mMutex;
@@ -62,8 +59,6 @@ namespace CSMPrefs
 
         private:
 
-            void load();
-
             void declare();
 
             void declareCategory (const std::string& key);
diff --git a/apps/opencs/model/prefs/stringsetting.cpp b/apps/opencs/model/prefs/stringsetting.cpp
index 27290b6c72..c062e23465 100644
--- a/apps/opencs/model/prefs/stringsetting.cpp
+++ b/apps/opencs/model/prefs/stringsetting.cpp
@@ -9,9 +9,9 @@
 #include "category.hpp"
 #include "state.hpp"
 
-CSMPrefs::StringSetting::StringSetting (Category *parent, Settings::Manager *values,
+CSMPrefs::StringSetting::StringSetting (Category *parent,
   QMutex *mutex, const std::string& key, const std::string& label, std::string default_)
-: Setting (parent, values, mutex, key, label),  mDefault (default_), mWidget(nullptr)
+: Setting (parent, mutex, key, label),  mDefault (default_), mWidget(nullptr)
 {}
 
 CSMPrefs::StringSetting& CSMPrefs::StringSetting::setTooltip (const std::string& tooltip)
@@ -39,7 +39,7 @@ void CSMPrefs::StringSetting::updateWidget()
 {
     if (mWidget)
     {
-        mWidget->setText(QString::fromStdString(getValues().getString(getKey(), getParent()->getKey())));
+        mWidget->setText(QString::fromStdString(Settings::Manager::getString(getKey(), getParent()->getKey())));
     }
 }
 
@@ -47,7 +47,7 @@ void CSMPrefs::StringSetting::textChanged (const QString& text)
 {
     {
         QMutexLocker lock (getMutex());
-        getValues().setString (getKey(), getParent()->getKey(), text.toStdString());
+        Settings::Manager::setString (getKey(), getParent()->getKey(), text.toStdString());
     }
 
     getParent()->getState()->update (*this);
diff --git a/apps/opencs/model/prefs/stringsetting.hpp b/apps/opencs/model/prefs/stringsetting.hpp
index 36d020f296..d4203bce8f 100644
--- a/apps/opencs/model/prefs/stringsetting.hpp
+++ b/apps/opencs/model/prefs/stringsetting.hpp
@@ -17,7 +17,7 @@ namespace CSMPrefs
 
         public:
 
-            StringSetting (Category *parent, Settings::Manager *values,
+            StringSetting (Category *parent,
                 QMutex *mutex, const std::string& key, const std::string& label, std::string default_);
 
             StringSetting& setTooltip (const std::string& tooltip);

From 8c3c65fe9f0f251846f5892e07dac6e0301e69a0 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 12 Jul 2022 14:53:06 +0200
Subject: [PATCH 2791/2859] Use variant and optional to implement Maybe*Locks

To avoid calling lock and unlock on the mutex. User-defined destructor is no
more needed.
---
 apps/openmw/mwphysics/mtphysics.cpp | 89 ++++++++++++++---------------
 1 file changed, 44 insertions(+), 45 deletions(-)

diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 9bc6f942f0..529316adab 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -1,4 +1,8 @@
 #include <functional>
+#include <variant>
+#include <optional>
+#include <shared_mutex>
+#include <mutex>
 
 #include <BulletCollision/BroadphaseCollision/btDbvtBroadphase.h>
 #include <BulletCollision/CollisionShapes/btCollisionShape.h>
@@ -28,6 +32,15 @@
 
 namespace
 {
+    template <class Mutex>
+    std::optional<std::unique_lock<Mutex>> makeExclusiveLock(Mutex& mutex, int threadCount)
+    {
+        assert(threadCount >= 0);
+        if (threadCount > 0)
+            return std::unique_lock(mutex);
+        return {};
+    }
+
     /// @brief A scoped lock that is either exclusive or inexistent depending on configuration
     template<class Mutex>
     class MaybeExclusiveLock
@@ -35,24 +48,23 @@ namespace
         public:
             /// @param mutex a mutex
             /// @param threadCount decide wether the excluse lock will be taken
-            MaybeExclusiveLock(Mutex& mutex, int threadCount) : mMutex(mutex), mThreadCount(threadCount)
-            {
-                assert(threadCount >= 0);
-                if (mThreadCount > 0)
-                    mMutex.lock();
-            }
-
-            ~MaybeExclusiveLock()
-            {
-                if (mThreadCount > 0)
-                    mMutex.unlock();
-            }
+            explicit MaybeExclusiveLock(Mutex& mutex, int threadCount)
+                : mImpl(makeExclusiveLock(mutex, threadCount))
+            {}
 
         private:
-            Mutex& mMutex;
-            unsigned int mThreadCount;
+            std::optional<std::unique_lock<Mutex>> mImpl;
     };
 
+    template <class Mutex>
+    std::optional<std::shared_lock<Mutex>> makeSharedLock(Mutex& mutex, int threadCount)
+    {
+        assert(threadCount >= 0);
+        if (threadCount > 0)
+            return std::shared_lock(mutex);
+        return {};
+    }
+
     /// @brief A scoped lock that is either shared or inexistent depending on configuration
     template<class Mutex>
     class MaybeSharedLock
@@ -60,24 +72,25 @@ namespace
         public:
             /// @param mutex a shared mutex
             /// @param threadCount decide wether the shared lock will be taken
-            MaybeSharedLock(Mutex& mutex, int threadCount) : mMutex(mutex), mThreadCount(threadCount)
-            {
-                assert(threadCount >= 0);
-                if (mThreadCount > 0)
-                    mMutex.lock_shared();
-            }
-
-            ~MaybeSharedLock()
-            {
-                if (mThreadCount > 0)
-                    mMutex.unlock_shared();
-            }
+            explicit MaybeSharedLock(Mutex& mutex, int threadCount)
+                : mImpl(makeSharedLock(mutex, threadCount))
+            {}
 
         private:
-            Mutex& mMutex;
-            unsigned int mThreadCount;
+            std::optional<std::shared_lock<Mutex>> mImpl;
     };
 
+    template <class Mutex>
+    std::variant<std::monostate, std::unique_lock<Mutex>, std::shared_lock<Mutex>> makeLock(Mutex& mutex, int threadCount)
+    {
+        assert(threadCount >= 0);
+        if (threadCount > 1)
+            return std::shared_lock(mutex);
+        if (threadCount == 1)
+            return std::unique_lock(mutex);
+        return std::monostate {};
+    }
+
     /// @brief A scoped lock that is either shared, exclusive or inexistent depending on configuration
     template<class Mutex>
     class MaybeLock
@@ -85,25 +98,11 @@ namespace
         public:
             /// @param mutex a shared mutex
             /// @param threadCount decide wether the lock will be shared, exclusive or inexistent
-            MaybeLock(Mutex& mutex, int threadCount) : mMutex(mutex), mThreadCount(threadCount)
-            {
-                assert(threadCount >= 0);
-                if (mThreadCount > 1)
-                    mMutex.lock_shared();
-                else if(mThreadCount == 1)
-                    mMutex.lock();
-            }
+            explicit MaybeLock(Mutex& mutex, int threadCount)
+                : mImpl(makeLock(mutex, threadCount)) {}
 
-            ~MaybeLock()
-            {
-                if (mThreadCount > 1)
-                    mMutex.unlock_shared();
-                else if(mThreadCount == 1)
-                    mMutex.unlock();
-            }
         private:
-            Mutex& mMutex;
-            unsigned int mThreadCount;
+            std::variant<std::monostate, std::unique_lock<Mutex>, std::shared_lock<Mutex>> mImpl;
     };
 
     bool isUnderWater(const MWPhysics::ActorFrameData& actorData)

From 22ed6d5c1eac889f2b1b51ca3c254b9b0a22575c Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 12 Jul 2022 14:58:25 +0200
Subject: [PATCH 2792/2859] Use unsigned to define number of threads

---
 apps/openmw/mwphysics/mtphysics.cpp | 25 +++++++++++--------------
 apps/openmw/mwphysics/mtphysics.hpp |  2 +-
 components/misc/barrier.hpp         |  4 +---
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 529316adab..7497fd15f7 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -33,9 +33,8 @@
 namespace
 {
     template <class Mutex>
-    std::optional<std::unique_lock<Mutex>> makeExclusiveLock(Mutex& mutex, int threadCount)
+    std::optional<std::unique_lock<Mutex>> makeExclusiveLock(Mutex& mutex, unsigned threadCount)
     {
-        assert(threadCount >= 0);
         if (threadCount > 0)
             return std::unique_lock(mutex);
         return {};
@@ -48,7 +47,7 @@ namespace
         public:
             /// @param mutex a mutex
             /// @param threadCount decide wether the excluse lock will be taken
-            explicit MaybeExclusiveLock(Mutex& mutex, int threadCount)
+            explicit MaybeExclusiveLock(Mutex& mutex, unsigned threadCount)
                 : mImpl(makeExclusiveLock(mutex, threadCount))
             {}
 
@@ -57,9 +56,8 @@ namespace
     };
 
     template <class Mutex>
-    std::optional<std::shared_lock<Mutex>> makeSharedLock(Mutex& mutex, int threadCount)
+    std::optional<std::shared_lock<Mutex>> makeSharedLock(Mutex& mutex, unsigned threadCount)
     {
-        assert(threadCount >= 0);
         if (threadCount > 0)
             return std::shared_lock(mutex);
         return {};
@@ -72,7 +70,7 @@ namespace
         public:
             /// @param mutex a shared mutex
             /// @param threadCount decide wether the shared lock will be taken
-            explicit MaybeSharedLock(Mutex& mutex, int threadCount)
+            explicit MaybeSharedLock(Mutex& mutex, unsigned threadCount)
                 : mImpl(makeSharedLock(mutex, threadCount))
             {}
 
@@ -81,9 +79,8 @@ namespace
     };
 
     template <class Mutex>
-    std::variant<std::monostate, std::unique_lock<Mutex>, std::shared_lock<Mutex>> makeLock(Mutex& mutex, int threadCount)
+    std::variant<std::monostate, std::unique_lock<Mutex>, std::shared_lock<Mutex>> makeLock(Mutex& mutex, unsigned threadCount)
     {
-        assert(threadCount >= 0);
         if (threadCount > 1)
             return std::shared_lock(mutex);
         if (threadCount == 1)
@@ -98,7 +95,7 @@ namespace
         public:
             /// @param mutex a shared mutex
             /// @param threadCount decide wether the lock will be shared, exclusive or inexistent
-            explicit MaybeLock(Mutex& mutex, int threadCount)
+            explicit MaybeLock(Mutex& mutex, unsigned threadCount)
                 : mImpl(makeLock(mutex, threadCount)) {}
 
         private:
@@ -132,7 +129,7 @@ namespace
         {
             const Impl& mImpl;
             std::shared_mutex& mCollisionWorldMutex;
-            const int mNumJobs;
+            const unsigned mNumThreads;
 
             template <class Ptr, class FrameData>
             void operator()(MWPhysics::SimulationImpl<Ptr, FrameData>& sim) const
@@ -144,7 +141,7 @@ namespace
                 // Locked shared_ptr has to be destructed after releasing mCollisionWorldMutex to avoid
                 // possible deadlock. Ptr destructor also acquires mCollisionWorldMutex.
                 const std::pair arg(std::move(ptr), frameData);
-                const Lock<std::shared_mutex> lock(mCollisionWorldMutex, mNumJobs);
+                const Lock<std::shared_mutex> lock(mCollisionWorldMutex, mNumThreads);
                 mImpl(arg);
             }
         };
@@ -288,7 +285,7 @@ namespace
     namespace Config
     {
         /// @return either the number of thread as configured by the user, or 1 if Bullet doesn't support multithreading and user requested more than 1 background threads
-        int computeNumThreads()
+        unsigned computeNumThreads()
         {
             int wantedThread = Settings::Manager::getInt("async num threads", "Physics");
 
@@ -300,7 +297,7 @@ namespace
                 Log(Debug::Warning) << "Bullet was not compiled with multithreading support, 1 async thread will be used";
                 return 1;
             }
-            return std::max(0, wantedThread);
+            return static_cast<unsigned>(std::max(0, wantedThread));
         }
     }
 }
@@ -335,7 +332,7 @@ namespace MWPhysics
     {
         if (mNumThreads >= 1)
         {
-            for (int i = 0; i < mNumThreads; ++i)
+            for (unsigned i = 0; i < mNumThreads; ++i)
                 mThreads.emplace_back([&] { worker(); } );
         }
         else
diff --git a/apps/openmw/mwphysics/mtphysics.hpp b/apps/openmw/mwphysics/mtphysics.hpp
index 685d4eefab..74556ccd81 100644
--- a/apps/openmw/mwphysics/mtphysics.hpp
+++ b/apps/openmw/mwphysics/mtphysics.hpp
@@ -92,7 +92,7 @@ namespace MWPhysics
             std::unique_ptr<Misc::Barrier> mPostStepBarrier;
             std::unique_ptr<Misc::Barrier> mPostSimBarrier;
 
-            int mNumThreads;
+            unsigned mNumThreads;
             int mNumJobs;
             int mRemainingSteps;
             int mLOSCacheExpiry;
diff --git a/components/misc/barrier.hpp b/components/misc/barrier.hpp
index 277e40814a..9738fbb7fa 100644
--- a/components/misc/barrier.hpp
+++ b/components/misc/barrier.hpp
@@ -1,7 +1,6 @@
 #ifndef OPENMW_BARRIER_H
 #define OPENMW_BARRIER_H
 
-#include <cassert>
 #include <condition_variable>
 #include <mutex>
 
@@ -12,9 +11,8 @@ namespace Misc
     {
         public:
             /// @param count number of threads to wait on
-            explicit Barrier(int count) : mThreadCount(count), mRendezvousCount(0), mGeneration(0)
+            explicit Barrier(unsigned count) : mThreadCount(count), mRendezvousCount(0), mGeneration(0)
             {
-                assert(count >= 0);
             }
 
             /// @brief stop execution of threads until count distinct threads reach this point

From d3da09878d7350eea73cd3de6df67c3134350828 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Tue, 12 Jul 2022 17:41:07 +0400
Subject: [PATCH 2793/2859] Drop line about non-existent UnrefQueue

---
 components/resource/stats.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/resource/stats.cpp b/components/resource/stats.cpp
index d8578a67cc..0ab523ab59 100644
--- a/components/resource/stats.cpp
+++ b/components/resource/stats.cpp
@@ -369,7 +369,6 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase *viewer)
             "FrameNumber",
             "",
             "Compiling",
-            "UnrefQueue",
             "WorkQueue",
             "WorkThread",
             "",

From ed921ad37797543cde963c59905e43e6610e1d82 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Tue, 12 Jul 2022 19:59:18 +0200
Subject: [PATCH 2794/2859] Fix modstat for negative numbers

---
 apps/openmw/mwscript/statsextensions.cpp | 28 ++++++++++++++----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp
index 4be2b9b8f4..385a688afe 100644
--- a/apps/openmw/mwscript/statsextensions.cpp
+++ b/apps/openmw/mwscript/statsextensions.cpp
@@ -43,18 +43,24 @@ namespace
 
     void modStat(MWMechanics::AttributeValue& stat, float amount)
     {
-        float base = stat.getBase();
-        float modifier = stat.getModifier() - stat.getDamage();
-        float modified = base + modifier;
-        if(modified <= 0.f && amount < 0.f)
-            amount = 0.f;
-        else if(amount < 0.f && modified + amount < 0.f)
-            amount = -modified;
-        else if((modifier <= 0.f || base >= 100.f) && amount > 0.f)
+        const float base = stat.getBase();
+        const float modifier = stat.getModifier() - stat.getDamage();
+        const float modified = base + modifier;
+        // Clamp to 100 unless base < 100 and we have a fortification going
+        if((modifier <= 0.f || base >= 100.f) && amount > 0.f)
             amount = std::clamp(100.f - modified, 0.f, amount);
-        stat.setBase(std::min(base + amount, 100.f), true);
-        modifier += base - stat.getBase() + amount;
-        stat.setModifier(modifier);
+        // Clamp the modified value in a way that doesn't properly account for negative numbers
+        float newModified = modified + amount;
+        if(newModified < 0.f)
+        {
+            if(modified >= 0.f)
+                newModified = 0.f;
+            else if(newModified < modified)
+                newModified = modified;
+        }
+        // Calculate damage/fortification based on the clamped base value
+        stat.setBase(std::clamp(base + amount, 0.f, 100.f), true);
+        stat.setModifier(newModified - stat.getBase());
     }
 }
 

From c3e2f84273e7f1591f0fff850a9590ec68cf7753 Mon Sep 17 00:00:00 2001
From: Project579 <star579avatar@gmail.com>
Date: Wed, 13 Jul 2022 00:38:24 +0000
Subject: [PATCH 2795/2859] Fix clang-tidy on CI and introduce .clang-tidy file

---
 .clang-tidy               |  8 ++++++++
 .gitlab-ci.yml            | 23 ++---------------------
 CI/before_script.linux.sh |  2 +-
 3 files changed, 11 insertions(+), 22 deletions(-)
 create mode 100644 .clang-tidy

diff --git a/.clang-tidy b/.clang-tidy
new file mode 100644
index 0000000000..e33d426873
--- /dev/null
+++ b/.clang-tidy
@@ -0,0 +1,8 @@
+---
+Checks: "-*,
+         boost-*,
+         portability-*,
+"
+WarningsAsErrors: ''
+HeaderFilterRegex: ''
+FormatStyle: none
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 03474a7149..58ee618993 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,26 +55,6 @@ variables:
     paths:
       - build/install/
 
-Clang_Tidy:
-  extends: .Ubuntu_Image
-  stage: build
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "schedule"'
-  before_script:
-    - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic clang-tidy clang
-  script:
-    - CI/before_script.linux.sh
-    - cd build
-    - cmake --build . -- -j $(nproc) openmw esmtool bsatool niftest openmw-wizard openmw-launcher openmw-iniimporter openmw-essimporter
-  variables:
-    CC: clang
-    CXX: clang++
-    CI_CLANG_TIDY: 1
-  timeout: 8h
-  artifacts:
-    paths: []
-    expire_in: 1 minute
-
 Coverity:
   extends: .Ubuntu_Image
   stage: build
@@ -261,12 +241,13 @@ Ubuntu_GCC:
 Ubuntu_Clang:
   extends: .Ubuntu
   before_script:
-    - CI/install_debian_deps.sh clang openmw-deps openmw-deps-dynamic
+    - CI/install_debian_deps.sh clang clang-tidy openmw-deps openmw-deps-dynamic
   cache:
     key: Ubuntu_Clang.v2
   variables:
     CC: clang
     CXX: clang++
+    CI_CLANG_TIDY: 1
     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
diff --git a/CI/before_script.linux.sh b/CI/before_script.linux.sh
index cae35dff68..9fce76b7e8 100755
--- a/CI/before_script.linux.sh
+++ b/CI/before_script.linux.sh
@@ -43,7 +43,7 @@ fi
 
 if [[ $CI_CLANG_TIDY ]]; then
 	CMAKE_CONF_OPTS+=(
-	      -DCMAKE_CXX_CLANG_TIDY="clang-tidy;-checks=-*,boost-*,clang-analyzer-*,concurrency-*,performance-*,-header-filter=.*,bugprone-*,misc-definitions-in-headers,misc-misplaced-const,misc-redundant-expression,-bugprone-narrowing-conversions"
+	      -DCMAKE_CXX_CLANG_TIDY="clang-tidy;--warnings-as-errors=*"
 	)
 fi
 

From 0f95a303eff6d2e9165bbe5e22affa8282cc9cf6 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Tue, 12 Jul 2022 22:06:37 +0200
Subject: [PATCH 2796/2859] Use single script to generate Lua doc

---
 docs/source/Dockerfile.luadoc             |  5 ++
 docs/source/README.md                     |  2 +-
 docs/source/conf.py                       |  6 ++-
 docs/source/generate_luadoc.sh            | 64 ++++++++---------------
 docs/source/generate_luadoc_in_docker.sh  | 22 --------
 docs/source/setup_openmw_luadocumentor.sh | 26 +++++++++
 6 files changed, 59 insertions(+), 66 deletions(-)
 delete mode 100755 docs/source/generate_luadoc_in_docker.sh
 create mode 100755 docs/source/setup_openmw_luadocumentor.sh

diff --git a/docs/source/Dockerfile.luadoc b/docs/source/Dockerfile.luadoc
index d449b97ab7..4917a0a738 100644
--- a/docs/source/Dockerfile.luadoc
+++ b/docs/source/Dockerfile.luadoc
@@ -24,3 +24,8 @@ RUN cd /tmp && \
     luarocks pack openmwluadocumentor-0.1.1-1.rockspec && \
     luarocks install openmwluadocumentor-0.1.1-1.src.rock && \
     rm /tmp/openmwluadocumentor-0.1.1-1.rockspec /tmp/openmwluadocumentor-0.1.1-1.src.rock
+
+VOLUME /openmw
+
+ENV DOCS_SOURCE_DIR=/openmw/docs/source
+ENV DOCUMENTOR_PATH=/usr/local/bin/openmwluadocumentor
diff --git a/docs/source/README.md b/docs/source/README.md
index f36a1ad3d0..a01803951e 100644
--- a/docs/source/README.md
+++ b/docs/source/README.md
@@ -14,5 +14,5 @@ docker build -f docs/source/Dockerfile.luadoc -t openmw.luadoc docs/source
 Run following command from OpenMW source directory to generate HTML pages:
 ```bash
 docker run --rm --tty --interactive --user "$(id -u)":"$(id -g)" \
-    --volume "${PWD}":/openmw openmw.luadoc /openmw/docs/source/generate_luadoc_in_docker.sh
+    --volume "${PWD}":/openmw openmw.luadoc /openmw/docs/source/generate_luadoc.sh
 ```
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 7f2affbb75..7fe1262eda 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -151,7 +151,11 @@ def setup(app):
     app.add_stylesheet('figures.css')
     app.add_stylesheet('luadoc.css')
     try:
-        subprocess.call(project_root + '/docs/source/generate_luadoc.sh')
+        # Assume we need to setup openmw-luadocumentor only when running this script in a Docker container because
+        # readthedocs pipeline runs there.
+        if os.path.exists('/.dockerenv'):
+            subprocess.check_call(os.path.join(project_root, 'docs/source/setup_openmw_luadocumentor.sh'))
+        subprocess.check_call(os.path.join(project_root, 'docs/source/generate_luadoc.sh'))
     except Exception as e:
         print('Can\'t generate Lua API documentation:', e)
 
diff --git a/docs/source/generate_luadoc.sh b/docs/source/generate_luadoc.sh
index f71e3110cb..c5dc246752 100755
--- a/docs/source/generate_luadoc.sh
+++ b/docs/source/generate_luadoc.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 
 # How to install openmwluadocumentor:
 
@@ -20,52 +20,32 @@
 # open "Git Bash" in the same directory and run script:
 #   ./generate_luadoc.sh
 
-if [ -f /.dockerenv ]; then
-    # We are inside readthedocs pipeline
-    echo "Install lua 5.1"
-    cd ~
-    curl -R -O https://www.lua.org/ftp/lua-5.1.5.tar.gz
-    tar -zxf lua-5.1.5.tar.gz
-    cd lua-5.1.5/
-    make linux
-    PATH=$PATH:~/lua-5.1.5/src
+if [[ -z "${DOCS_SOURCE_DIR+x}" ]]; then
+    DOCS_SOURCE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+fi
 
-    echo "Install luarocks"
-    cd ~
-    wget https://luarocks.org/releases/luarocks-2.4.2.tar.gz
-    tar zxpf luarocks-2.4.2.tar.gz
-    cd luarocks-2.4.2/
-    ./configure --with-lua-bin=$HOME/lua-5.1.5/src --with-lua-include=$HOME/lua-5.1.5/src --prefix=$HOME/luarocks
-    make build
-    make install
-    PATH=$PATH:~/luarocks/bin
+FILES_DIR="${DOCS_SOURCE_DIR:?}/../../files"
+OUTPUT_DIR="${DOCS_SOURCE_DIR:?}/reference/lua-scripting/generated_html"
 
-    echo "Install openmwluadocumentor"
-    cd ~
-    git clone https://gitlab.com/ptmikheev/openmw-luadocumentor.git
-    cd openmw-luadocumentor/luarocks
-    luarocks --local pack openmwluadocumentor-0.1.1-1.rockspec
-    luarocks --local install openmwluadocumentor-0.1.1-1.src.rock
+if [[ -z "${DOCUMENTOR_PATH+x}" ]]; then
+    DOCUMENTOR_PATH=~/.luarocks/bin/openmwluadocumentor
 fi
 
-DOCS_SOURCE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-FILES_DIR=$DOCS_SOURCE_DIR/../../files
-OUTPUT_DIR=$DOCS_SOURCE_DIR/reference/lua-scripting/generated_html
-DOCUMENTOR_PATH=~/.luarocks/bin/openmwluadocumentor
-
-if [ ! -x $DOCUMENTOR_PATH ]; then
-  # running on Windows?
-  DOCUMENTOR_PATH="$APPDATA/LuaRocks/bin/openmwluadocumentor.bat"
+if [ ! -x "${DOCUMENTOR_PATH:?}" ]; then
+    # running on Windows?
+    echo windows
+    DOCUMENTOR_PATH="${APPDATA:?}/LuaRocks/bin/openmwluadocumentor.bat"
 fi
 
-rm -f $OUTPUT_DIR/*.html
+rm -rf "${OUTPUT_DIR:?}"
+mkdir "${OUTPUT_DIR:?}"
 
-cd $FILES_DIR/lua_api
-$DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR openmw/*lua
+cd "${FILES_DIR:?}/lua_api"
+"${DOCUMENTOR_PATH:?}" -f doc -d "${OUTPUT_DIR:?}" openmw/*lua
 
-cd $FILES_DIR/data
-$DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR openmw_aux/*lua
-$DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR scripts/omw/ai.lua
-$DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR scripts/omw/camera/camera.lua
-$DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR scripts/omw/mwui/init.lua
-$DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR scripts/omw/settings/player.lua
+cd "${FILES_DIR:?}/data"
+"${DOCUMENTOR_PATH:?}" -f doc -d "${OUTPUT_DIR:?}" openmw_aux/*lua
+"${DOCUMENTOR_PATH:?}" -f doc -d "${OUTPUT_DIR:?}" scripts/omw/ai.lua
+"${DOCUMENTOR_PATH:?}" -f doc -d "${OUTPUT_DIR:?}" scripts/omw/camera/camera.lua
+"${DOCUMENTOR_PATH:?}" -f doc -d "${OUTPUT_DIR:?}" scripts/omw/mwui/init.lua
+"${DOCUMENTOR_PATH:?}" -f doc -d "${OUTPUT_DIR:?}" scripts/omw/settings/player.lua
diff --git a/docs/source/generate_luadoc_in_docker.sh b/docs/source/generate_luadoc_in_docker.sh
deleted file mode 100755
index edd33ecb06..0000000000
--- a/docs/source/generate_luadoc_in_docker.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash -e
-
-if ! [[ -f "/.dockerenv" ]]; then
-    echo "Run this script inside Docker container" >&2
-    exit -1
-fi
-
-FILES_DIR=/openmw/files
-OUTPUT_DIR=/openmw/docs/source/reference/lua-scripting/generated_html
-
-rm -rf "${OUTPUT_DIR}"
-mkdir "${OUTPUT_DIR}"
-
-cd "${FILES_DIR}/lua_api"
-openmwluadocumentor -f doc -d "${OUTPUT_DIR}" openmw/*lua
-
-cd "${FILES_DIR}/data"
-openmwluadocumentor -f doc -d "${OUTPUT_DIR}" openmw_aux/*lua
-openmwluadocumentor -f doc -d "${OUTPUT_DIR}" scripts/omw/ai.lua
-openmwluadocumentor -f doc -d "${OUTPUT_DIR}" scripts/omw/camera/camera.lua
-openmwluadocumentor -f doc -d "${OUTPUT_DIR}" scripts/omw/mwui/init.lua
-openmwluadocumentor -f doc -d "${OUTPUT_DIR}" scripts/omw/settings/player.lua
diff --git a/docs/source/setup_openmw_luadocumentor.sh b/docs/source/setup_openmw_luadocumentor.sh
new file mode 100755
index 0000000000..5e7ec045fb
--- /dev/null
+++ b/docs/source/setup_openmw_luadocumentor.sh
@@ -0,0 +1,26 @@
+#!/bin/bash -e
+
+echo "Install lua 5.1"
+cd ~
+curl -R -O https://www.lua.org/ftp/lua-5.1.5.tar.gz
+tar -zxf lua-5.1.5.tar.gz
+cd lua-5.1.5/
+make -j $(nproc) linux
+PATH="${PATH:?}:~/lua-5.1.5/src"
+
+echo "Install luarocks"
+cd ~
+wget https://luarocks.org/releases/luarocks-2.4.2.tar.gz
+tar zxpf luarocks-2.4.2.tar.gz
+cd luarocks-2.4.2/
+./configure --with-lua-bin="${HOME:?}/lua-5.1.5/src" --with-lua-include="${HOME:?}/lua-5.1.5/src" --prefix="${HOME:?}/luarocks"
+make -j $(nproc) build
+make -j $(nproc) install
+PATH="${PATH:?}:~/luarocks/bin"
+
+echo "Install openmwluadocumentor"
+cd ~
+git clone --depth 1 https://gitlab.com/ptmikheev/openmw-luadocumentor.git
+cd openmw-luadocumentor/luarocks
+luarocks --local pack openmwluadocumentor-0.1.1-1.rockspec
+luarocks --local install openmwluadocumentor-0.1.1-1.src.rock

From 1a5a526b15e398c029624fae52044f637fc5d0c8 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Wed, 13 Jul 2022 21:17:11 +0200
Subject: [PATCH 2797/2859] Remove unecessary casts and prevent nullptr
 dereference in getWalkSpeed

---
 apps/openmw/mwclass/npc.cpp | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 1baff60455..dbbb5217ce 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -956,7 +956,7 @@ namespace MWClass
     {
         // TODO: This function is called several times per frame for each NPC.
         // It would be better to calculate it only once per frame for each NPC and save the result in CreatureStats.
-        const MWMechanics::CreatureStats& stats = getCreatureStats(ptr);
+        const MWMechanics::NpcStats& stats = getNpcStats(ptr);
         bool godmode = ptr == MWMechanics::getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState();
         if ((!godmode && stats.isParalyzed()) || stats.getKnockedDown() || stats.isDead())
             return 0.f;
@@ -964,8 +964,7 @@ namespace MWClass
         const MWBase::World *world = MWBase::Environment::get().getWorld();
         const GMST& gmst = getGmst();
 
-        const NpcCustomData *npcdata = static_cast<const NpcCustomData*>(ptr.getRefData().getCustomData());
-        const MWMechanics::MagicEffects &mageffects = npcdata->mNpcStats.getMagicEffects();
+        const MWMechanics::MagicEffects &mageffects = stats.getMagicEffects();
 
         const float normalizedEncumbrance = getNormalizedEncumbrance(ptr);
 
@@ -981,7 +980,7 @@ namespace MWClass
         else if(mageffects.get(ESM::MagicEffect::Levitate).getMagnitude() > 0 &&
                 world->isLevitationEnabled())
         {
-            float flySpeed = 0.01f*(npcdata->mNpcStats.getAttribute(ESM::Attribute::Speed).getModified() +
+            float flySpeed = 0.01f*(stats.getAttribute(ESM::Attribute::Speed).getModified() +
                                     mageffects.get(ESM::MagicEffect::Levitate).getMagnitude());
             flySpeed = gmst.fMinFlySpeed->mValue.getFloat() + flySpeed*(gmst.fMaxFlySpeed->mValue.getFloat() - gmst.fMinFlySpeed->mValue.getFloat());
             flySpeed *= 1.0f - gmst.fEncumberedMoveEffect->mValue.getFloat() * normalizedEncumbrance;
@@ -995,7 +994,7 @@ namespace MWClass
         else
             moveSpeed = getWalkSpeed(ptr);
 
-        if(npcdata->mNpcStats.isWerewolf() && running && npcdata->mNpcStats.getDrawState() == MWMechanics::DrawState_Nothing)
+        if(stats.isWerewolf() && running && stats.getDrawState() == MWMechanics::DrawState_Nothing)
             moveSpeed *= gmst.fWereWolfRunMult->mValue.getFloat();
 
         return moveSpeed;
@@ -1006,14 +1005,13 @@ namespace MWClass
         if(getEncumbrance(ptr) > getCapacity(ptr))
             return 0.f;
 
-        const MWMechanics::CreatureStats& stats = getCreatureStats(ptr);
+        const MWMechanics::NpcStats& stats = getNpcStats(ptr);
         bool godmode = ptr == MWMechanics::getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState();
         if ((!godmode && stats.isParalyzed()) || stats.getKnockedDown() || stats.isDead())
             return 0.f;
 
-        const NpcCustomData *npcdata = static_cast<const NpcCustomData*>(ptr.getRefData().getCustomData());
         const GMST& gmst = getGmst();
-        const MWMechanics::MagicEffects &mageffects = npcdata->mNpcStats.getMagicEffects();
+        const MWMechanics::MagicEffects& mageffects = stats.getMagicEffects();
         const float encumbranceTerm = gmst.fJumpEncumbranceBase->mValue.getFloat() +
                                           gmst.fJumpEncumbranceMultiplier->mValue.getFloat() *
                                           (1.0f - Npc::getNormalizedEncumbrance(ptr));
@@ -1034,7 +1032,7 @@ namespace MWClass
 
         if(stats.getStance(MWMechanics::CreatureStats::Stance_Run))
             x *= gmst.fJumpRunMultiplier->mValue.getFloat();
-        x *= npcdata->mNpcStats.getFatigueTerm();
+        x *= stats.getFatigueTerm();
         x -= -Constants::GravityConst * Constants::UnitsPerMeter;
         x /= 3.0f;
 
@@ -1467,12 +1465,12 @@ namespace MWClass
     float Npc::getWalkSpeed(const MWWorld::Ptr& ptr) const
     {
         const GMST& gmst = getGmst();
-        const NpcCustomData* npcdata = static_cast<const NpcCustomData*>(ptr.getRefData().getCustomData());
+        const MWMechanics::NpcStats& stats = getNpcStats(ptr);
         const float normalizedEncumbrance = getNormalizedEncumbrance(ptr);
         const bool sneaking = MWBase::Environment::get().getMechanicsManager()->isSneaking(ptr);
 
         float walkSpeed = gmst.fMinWalkSpeed->mValue.getFloat()
-                + 0.01f * npcdata->mNpcStats.getAttribute(ESM::Attribute::Speed).getModified()
+                + 0.01f * stats.getAttribute(ESM::Attribute::Speed).getModified()
                 * (gmst.fMaxWalkSpeed->mValue.getFloat() - gmst.fMinWalkSpeed->mValue.getFloat());
         walkSpeed *= 1.0f - gmst.fEncumberedMoveEffect->mValue.getFloat()*normalizedEncumbrance;
         walkSpeed = std::max(0.0f, walkSpeed);
@@ -1493,9 +1491,8 @@ namespace MWClass
     float Npc::getSwimSpeed(const MWWorld::Ptr& ptr) const
     {
         const MWBase::World* world = MWBase::Environment::get().getWorld();
-        const MWMechanics::CreatureStats& stats = getCreatureStats(ptr);
-        const NpcCustomData* npcdata = static_cast<const NpcCustomData*>(ptr.getRefData().getCustomData());
-        const MWMechanics::MagicEffects& mageffects = npcdata->mNpcStats.getMagicEffects();
+        const MWMechanics::NpcStats& stats = getNpcStats(ptr);
+        const MWMechanics::MagicEffects& mageffects = stats.getMagicEffects();
         const bool swimming = world->isSwimming(ptr);
         const bool inair = !world->isOnGround(ptr) && !swimming && !world->isFlying(ptr);
         const bool running = stats.getStance(MWMechanics::CreatureStats::Stance_Run)

From 100e400fed27d568d3cd98ccc9b6ac7b74fc678d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Thu, 14 Jul 2022 16:46:31 +0300
Subject: [PATCH 2798/2859] Dynamically obtain the function pointer to
 IsHungAppWindow

---
 .../crashcatcher/windows_crashmonitor.cpp     | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/components/crashcatcher/windows_crashmonitor.cpp b/components/crashcatcher/windows_crashmonitor.cpp
index e76e8897e1..214557e3a7 100644
--- a/components/crashcatcher/windows_crashmonitor.cpp
+++ b/components/crashcatcher/windows_crashmonitor.cpp
@@ -17,7 +17,29 @@
 namespace Crash
 {
     std::unordered_map<HWINEVENTHOOK, CrashMonitor*> CrashMonitor::smEventHookOwners{};
+    
+    using IsHungAppWindowFn = BOOL(WINAPI*)(HWND hwnd);
+
+    // Obtains the pointer to user32.IsHungAppWindow, this function may be removed in the future.
+    // See: https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-ishungappwindow
+    static IsHungAppWindowFn getIsHungAppWindow() noexcept
+    {
+        static IsHungAppWindowFn isHungAppWindow = nullptr;
+        static bool isHungAppWindowInitialized = false;
+
+        if (isHungAppWindowInitialized)
+            return isHungAppWindow;
 
+        auto user32Handle = LoadLibraryA("user32.dll");
+        if (user32Handle == nullptr)
+            return nullptr;
+
+        isHungAppWindow = reinterpret_cast<IsHungAppWindowFn>(GetProcAddress(user32Handle, "IsHungAppWindow"));
+        isHungAppWindowInitialized = true;
+
+        return isHungAppWindow;
+    }
+    
     CrashMonitor::CrashMonitor(HANDLE shmHandle)
         : mShmHandle(shmHandle)
     {
@@ -123,8 +145,8 @@ namespace Crash
             else
                 return false;
         }
-        if (IsHungAppWindow)
-            return IsHungAppWindow(mAppWindowHandle);
+        if (auto isHungAppWindow = getIsHungAppWindow(); isHungAppWindow != nullptr)
+            return isHungAppWindow(mAppWindowHandle);
         else
         {
             BOOL debuggerPresent;

From 0d625abde0ec5660449de1a5b3767516759f99be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Thu, 14 Jul 2022 16:47:27 +0300
Subject: [PATCH 2799/2859] Declare utf8ToUtf16 static

---
 components/crashcatcher/windows_crashmonitor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/crashcatcher/windows_crashmonitor.cpp b/components/crashcatcher/windows_crashmonitor.cpp
index 214557e3a7..c91f57c6f9 100644
--- a/components/crashcatcher/windows_crashmonitor.cpp
+++ b/components/crashcatcher/windows_crashmonitor.cpp
@@ -225,7 +225,7 @@ namespace Crash
         signalApp();
     }
 
-    std::wstring utf8ToUtf16(const std::string& utf8)
+    static std::wstring utf8ToUtf16(const std::string& utf8)
     {
         const int nLenWide = MultiByteToWideChar(CP_UTF8, 0, utf8.c_str(), utf8.size(), nullptr, 0);
 

From 68887e79a08eeac891ecbbbf87d0c74c5dac1345 Mon Sep 17 00:00:00 2001
From: Igor Fedosov <igorfedosov00@gmail.com>
Date: Thu, 14 Jul 2022 17:02:35 +0300
Subject: [PATCH 2800/2859] Makes key inside Collection::getCollection use
 lowercase

---
 components/files/collections.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/files/collections.cpp b/components/files/collections.cpp
index a933eb682c..6f8935d322 100644
--- a/components/files/collections.cpp
+++ b/components/files/collections.cpp
@@ -20,11 +20,12 @@ namespace Files
 
     const MultiDirCollection& Collections::getCollection(const std::string& extension) const
     {
-        MultiDirCollectionContainer::iterator iter = mCollections.find(extension);
+        std::string ext = Misc::StringUtils::lowerCase(extension);
+        MultiDirCollectionContainer::iterator iter = mCollections.find(ext);
         if (iter==mCollections.end())
         {
             std::pair<MultiDirCollectionContainer::iterator, bool> result =
-                mCollections.insert(std::make_pair(extension, MultiDirCollection(mDirectories, extension, mFoldCase)));
+                mCollections.insert(std::make_pair(ext, MultiDirCollection(mDirectories, ext, mFoldCase)));
 
             iter = result.first;
         }

From 32d50765ab851259d0d70a361faec7ab37d488af Mon Sep 17 00:00:00 2001
From: Matt <3397065-ZehMatt@users.noreply.gitlab.com>
Date: Thu, 14 Jul 2022 16:50:15 +0000
Subject: [PATCH 2801/2859] Apply 1 suggestion(s) to 1 file(s)

---
 components/files/collections.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/files/collections.cpp b/components/files/collections.cpp
index 6f8935d322..0db24f2ab8 100644
--- a/components/files/collections.cpp
+++ b/components/files/collections.cpp
@@ -25,7 +25,7 @@ namespace Files
         if (iter==mCollections.end())
         {
             std::pair<MultiDirCollectionContainer::iterator, bool> result =
-                mCollections.insert(std::make_pair(ext, MultiDirCollection(mDirectories, ext, mFoldCase)));
+                mCollections.emplace(ext, MultiDirCollection(mDirectories, ext, mFoldCase));
 
             iter = result.first;
         }

From 888d009a1e03570832f7cfdcbb7f7a767348e04f Mon Sep 17 00:00:00 2001
From: Matt <3397065-ZehMatt@users.noreply.gitlab.com>
Date: Thu, 14 Jul 2022 16:50:25 +0000
Subject: [PATCH 2802/2859] Apply 1 suggestion(s) to 1 file(s)

---
 components/files/collections.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/files/collections.cpp b/components/files/collections.cpp
index 0db24f2ab8..3668aeadcd 100644
--- a/components/files/collections.cpp
+++ b/components/files/collections.cpp
@@ -21,7 +21,7 @@ namespace Files
     const MultiDirCollection& Collections::getCollection(const std::string& extension) const
     {
         std::string ext = Misc::StringUtils::lowerCase(extension);
-        MultiDirCollectionContainer::iterator iter = mCollections.find(ext);
+        auto iter = mCollections.find(ext);
         if (iter==mCollections.end())
         {
             std::pair<MultiDirCollectionContainer::iterator, bool> result =

From 92e209c62a83f8b48c0ebdc0e6c63d05cd81c737 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <3397065-ZehMatt@users.noreply.gitlab.com>
Date: Thu, 14 Jul 2022 22:02:01 +0300
Subject: [PATCH 2803/2859] Simplify getIsHungAppWindow

---
 .../crashcatcher/windows_crashmonitor.cpp       | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/components/crashcatcher/windows_crashmonitor.cpp b/components/crashcatcher/windows_crashmonitor.cpp
index c91f57c6f9..d2e5737949 100644
--- a/components/crashcatcher/windows_crashmonitor.cpp
+++ b/components/crashcatcher/windows_crashmonitor.cpp
@@ -24,21 +24,14 @@ namespace Crash
     // See: https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-ishungappwindow
     static IsHungAppWindowFn getIsHungAppWindow() noexcept
     {
-        static IsHungAppWindowFn isHungAppWindow = nullptr;
-        static bool isHungAppWindowInitialized = false;
-
-        if (isHungAppWindowInitialized)
-            return isHungAppWindow;
-
         auto user32Handle = LoadLibraryA("user32.dll");
         if (user32Handle == nullptr)
             return nullptr;
 
-        isHungAppWindow = reinterpret_cast<IsHungAppWindowFn>(GetProcAddress(user32Handle, "IsHungAppWindow"));
-        isHungAppWindowInitialized = true;
-
-        return isHungAppWindow;
+        return reinterpret_cast<IsHungAppWindowFn>(GetProcAddress(user32Handle, "IsHungAppWindow"));
     }
+
+    static const IsHungAppWindowFn sIsHungAppWindow = getIsHungAppWindow();
     
     CrashMonitor::CrashMonitor(HANDLE shmHandle)
         : mShmHandle(shmHandle)
@@ -145,8 +138,8 @@ namespace Crash
             else
                 return false;
         }
-        if (auto isHungAppWindow = getIsHungAppWindow(); isHungAppWindow != nullptr)
-            return isHungAppWindow(mAppWindowHandle);
+        if (sIsHungAppWindow != nullptr)
+            return sIsHungAppWindow(mAppWindowHandle);
         else
         {
             BOOL debuggerPresent;

From 6c0281d1452c25e943d765fc24fae6b4802c0eb7 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 15 Jul 2022 14:11:32 +0200
Subject: [PATCH 2804/2859] Remove redundant echo

---
 docs/source/generate_luadoc.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/source/generate_luadoc.sh b/docs/source/generate_luadoc.sh
index c5dc246752..4f0cb4b947 100755
--- a/docs/source/generate_luadoc.sh
+++ b/docs/source/generate_luadoc.sh
@@ -33,7 +33,6 @@ fi
 
 if [ ! -x "${DOCUMENTOR_PATH:?}" ]; then
     # running on Windows?
-    echo windows
     DOCUMENTOR_PATH="${APPDATA:?}/LuaRocks/bin/openmwluadocumentor.bat"
 fi
 

From 6c9940c2a52a6831e1ae656b687e912e33b24bc6 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 15 Jul 2022 20:28:36 +0200
Subject: [PATCH 2805/2859] Remove .o files before install

These files are not required to perform install but take disk space.
---
 .gitlab-ci.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 58ee618993..5ece19cd71 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,6 +38,11 @@ variables:
     - CI/before_script.linux.sh
     - cd build
     - cmake --build . -- -j $(nproc)
+    - df -h
+    - du -sh .
+    - find . | grep '\.o$' | xargs rm -f
+    - df -h
+    - du -sh .
     - cmake --install .
     - if [[ "${BUILD_TESTS_ONLY}" ]]; then ./openmw_test_suite --gtest_output="xml:tests.xml"; fi
     - if [[ "${BUILD_TESTS_ONLY}" && ! "${BUILD_WITH_CODE_COVERAGE}" ]]; then ./openmw_detournavigator_navmeshtilescache_benchmark; fi

From 9398e976004de2edf15f6ef67f0648edcd24bc52 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 16 Jul 2022 12:14:20 +0200
Subject: [PATCH 2806/2859] Avoid manual memory management for VFS archives

---
 apps/niftest/niftest.cpp                | 11 +++++------
 apps/openmw_test_suite/testing_util.hpp |  2 +-
 components/vfs/manager.cpp              | 15 +++++----------
 components/vfs/manager.hpp              |  6 +++---
 components/vfs/registerarchives.cpp     |  6 +++---
 5 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/apps/niftest/niftest.cpp b/apps/niftest/niftest.cpp
index 4a13e56e80..219956cd75 100644
--- a/apps/niftest/niftest.cpp
+++ b/apps/niftest/niftest.cpp
@@ -34,12 +34,11 @@ bool isBSA(const std::string & filename)
 }
 
 /// Check all the nif files in a given VFS::Archive
-/// \note Takes ownership!
 /// \note Can not read a bsa file inside of a bsa file.
-void readVFS(VFS::Archive* anArchive,std::string archivePath = "")
+void readVFS(std::unique_ptr<VFS::Archive>&& anArchive, std::string archivePath = "")
 {
     VFS::Manager myManager(true);
-    myManager.addArchive(anArchive);
+    myManager.addArchive(std::move(anArchive));
     myManager.buildIndex();
 
     for(const auto& name : myManager.getRecursiveDirectoryIterator(""))
@@ -55,7 +54,7 @@ void readVFS(VFS::Archive* anArchive,std::string archivePath = "")
                 if(!archivePath.empty() && !isBSA(archivePath))
                 {
 //                     std::cout << "Reading BSA File: " << name << std::endl;
-                    readVFS(new VFS::BsaArchive(archivePath+name),archivePath+name+"/");
+                    readVFS(std::make_unique<VFS::BsaArchive>(archivePath + name), archivePath + name + "/");
 //                     std::cout << "Done with BSA File: " << name << std::endl;
                 }
             }
@@ -135,12 +134,12 @@ int main(int argc, char **argv)
              else if(isBSA(name))
              {
 //                 std::cout << "Reading BSA File: " << name << std::endl;
-                readVFS(new VFS::BsaArchive(name));
+                readVFS(std::make_unique<VFS::BsaArchive>(name));
              }
              else if(std::filesystem::is_directory(std::filesystem::path(name)))
              {
 //                 std::cout << "Reading All Files in: " << name << std::endl;
-                readVFS(new VFS::FileSystemArchive(name),name);
+                readVFS(std::make_unique<VFS::FileSystemArchive>(name), name);
              }
              else
              {
diff --git a/apps/openmw_test_suite/testing_util.hpp b/apps/openmw_test_suite/testing_util.hpp
index e583552a21..125d2505ed 100644
--- a/apps/openmw_test_suite/testing_util.hpp
+++ b/apps/openmw_test_suite/testing_util.hpp
@@ -64,7 +64,7 @@ namespace TestingOpenMW
     inline std::unique_ptr<VFS::Manager> createTestVFS(std::map<std::string, VFS::File*> files)
     {
         auto vfs = std::make_unique<VFS::Manager>(true);
-        vfs->addArchive(new VFSTestData(std::move(files)));
+        vfs->addArchive(std::make_unique<VFSTestData>(std::move(files)));
         vfs->buildIndex();
         return vfs;
     }
diff --git a/components/vfs/manager.cpp b/components/vfs/manager.cpp
index 8a43eda5ee..bd7418d4b5 100644
--- a/components/vfs/manager.cpp
+++ b/components/vfs/manager.cpp
@@ -36,30 +36,25 @@ namespace VFS
 
     }
 
-    Manager::~Manager()
-    {
-        reset();
-    }
+    Manager::~Manager() {}
 
     void Manager::reset()
     {
         mIndex.clear();
-        for (std::vector<Archive*>::iterator it = mArchives.begin(); it != mArchives.end(); ++it)
-            delete *it;
         mArchives.clear();
     }
 
-    void Manager::addArchive(Archive *archive)
+    void Manager::addArchive(std::unique_ptr<Archive>&& archive)
     {
-        mArchives.push_back(archive);
+        mArchives.push_back(std::move(archive));
     }
 
     void Manager::buildIndex()
     {
         mIndex.clear();
 
-        for (std::vector<Archive*>::const_iterator it = mArchives.begin(); it != mArchives.end(); ++it)
-            (*it)->listResources(mIndex, mStrict ? &strict_normalize_char : &nonstrict_normalize_char);
+        for (const auto& archive : mArchives)
+            archive->listResources(mIndex, mStrict ? &strict_normalize_char : &nonstrict_normalize_char);
     }
 
     Files::IStreamPtr Manager::get(const std::string &name) const
diff --git a/components/vfs/manager.hpp b/components/vfs/manager.hpp
index 98acfb7955..bb1ee6ad39 100644
--- a/components/vfs/manager.hpp
+++ b/components/vfs/manager.hpp
@@ -5,6 +5,7 @@
 
 #include <vector>
 #include <map>
+#include <memory>
 
 namespace VFS
 {
@@ -58,8 +59,7 @@ namespace VFS
         void reset();
 
         /// Register the given archive. All files contained in it will be added to the index on the next buildIndex() call.
-        /// @note Takes ownership of the given pointer.
-        void addArchive(Archive* archive);
+        void addArchive(std::unique_ptr<Archive>&& archive);
 
         /// Build the file index. Should be called when all archives have been registered.
         void buildIndex();
@@ -98,7 +98,7 @@ namespace VFS
     private:
         bool mStrict;
 
-        std::vector<Archive*> mArchives;
+        std::vector<std::unique_ptr<Archive>> mArchives;
 
         std::map<std::string, File*> mIndex;
     };
diff --git a/components/vfs/registerarchives.cpp b/components/vfs/registerarchives.cpp
index ebe2683edd..25ee9e1f62 100644
--- a/components/vfs/registerarchives.cpp
+++ b/components/vfs/registerarchives.cpp
@@ -27,9 +27,9 @@ namespace VFS
                 Bsa::BsaVersion bsaVersion = Bsa::CompressedBSAFile::detectVersion(archivePath);
 
                 if (bsaVersion == Bsa::BSAVER_COMPRESSED)
-                    vfs->addArchive(new CompressedBsaArchive(archivePath));
+                    vfs->addArchive(std::make_unique<CompressedBsaArchive>(archivePath));
                 else
-                    vfs->addArchive(new BsaArchive(archivePath));
+                    vfs->addArchive(std::make_unique<BsaArchive>(archivePath));
             }
             else
             {
@@ -47,7 +47,7 @@ namespace VFS
                 {
                     Log(Debug::Info) << "Adding data directory " << iter->string();
                     // Last data dir has the highest priority
-                    vfs->addArchive(new FileSystemArchive(iter->string()));
+                    vfs->addArchive(std::make_unique<FileSystemArchive>(iter->string()));
                 }
                 else
                     Log(Debug::Info) << "Ignoring duplicate data directory " << iter->string();

From 49f8445f87ee9611b602425ee5b082101b293978 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 16 Jul 2022 16:37:31 +0200
Subject: [PATCH 2807/2859] Move AiSetting out of MWMechanics::CreatureStats

To replace creaturestats.hpp include in mwworld/class.hpp with forward
declaration reducing total size of preprocessed code.
---
 apps/openmw/mwclass/actor.hpp                 |  3 +
 apps/openmw/mwclass/creature.cpp              | 11 ++--
 apps/openmw/mwclass/creature.hpp              |  2 +-
 apps/openmw/mwclass/npc.cpp                   | 11 ++--
 apps/openmw/mwclass/npc.hpp                   |  2 +-
 apps/openmw/mwdialogue/filter.cpp             |  2 +-
 apps/openmw/mwgui/spellbuyingwindow.cpp       |  2 +
 apps/openmw/mwgui/spellcreationdialog.cpp     |  1 +
 apps/openmw/mwgui/travelwindow.cpp            |  1 +
 apps/openmw/mwlua/localscripts.cpp            |  1 +
 apps/openmw/mwlua/objectbindings.cpp          |  2 +
 apps/openmw/mwlua/types/actor.cpp             |  1 +
 apps/openmw/mwmechanics/actors.cpp            |  6 +-
 apps/openmw/mwmechanics/actorutil.cpp         |  3 +
 apps/openmw/mwmechanics/aicombataction.cpp    |  2 +-
 apps/openmw/mwmechanics/aisetting.hpp         | 37 ++---------
 apps/openmw/mwmechanics/creaturestats.cpp     |  5 +-
 apps/openmw/mwmechanics/creaturestats.hpp     |  8 +--
 .../mwmechanics/mechanicsmanagerimp.cpp       | 30 ++++-----
 apps/openmw/mwmechanics/setbaseaisetting.hpp  | 41 ++++++++++++
 apps/openmw/mwmechanics/spelleffects.cpp      | 26 ++++----
 apps/openmw/mwmechanics/weapontype.cpp        |  3 +
 apps/openmw/mwphysics/mtphysics.cpp           |  3 +
 apps/openmw/mwrender/actoranimation.cpp       |  2 +
 apps/openmw/mwscript/aiextensions.cpp         | 64 +++++++++----------
 apps/openmw/mwscript/controlextensions.cpp    |  2 +
 apps/openmw/mwworld/class.cpp                 |  2 +-
 apps/openmw/mwworld/class.hpp                 |  6 +-
 28 files changed, 159 insertions(+), 120 deletions(-)
 create mode 100644 apps/openmw/mwmechanics/setbaseaisetting.hpp

diff --git a/apps/openmw/mwclass/actor.hpp b/apps/openmw/mwclass/actor.hpp
index f2d080a64f..fca610bc41 100644
--- a/apps/openmw/mwclass/actor.hpp
+++ b/apps/openmw/mwclass/actor.hpp
@@ -3,7 +3,10 @@
 
 #include "../mwworld/class.hpp"
 
+#include "../mwmechanics/magiceffects.hpp"
+
 #include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadskil.hpp>
 
 namespace ESM
 {
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 620315d0a3..c26b92993c 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -18,6 +18,7 @@
 #include "../mwmechanics/creaturecustomdataresetter.hpp"
 #include "../mwmechanics/aisetting.hpp"
 #include "../mwmechanics/inventory.hpp"
+#include "../mwmechanics/setbaseaisetting.hpp"
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
@@ -143,10 +144,10 @@ namespace MWClass
 
             data->mCreatureStats.getAiSequence().fill(ref->mBase->mAiPackage);
 
-            data->mCreatureStats.setAiSetting (MWMechanics::CreatureStats::AI_Hello, ref->mBase->mAiData.mHello);
-            data->mCreatureStats.setAiSetting (MWMechanics::CreatureStats::AI_Fight, ref->mBase->mAiData.mFight);
-            data->mCreatureStats.setAiSetting (MWMechanics::CreatureStats::AI_Flee, ref->mBase->mAiData.mFlee);
-            data->mCreatureStats.setAiSetting (MWMechanics::CreatureStats::AI_Alarm, ref->mBase->mAiData.mAlarm);
+            data->mCreatureStats.setAiSetting(MWMechanics::AiSetting::Hello, ref->mBase->mAiData.mHello);
+            data->mCreatureStats.setAiSetting(MWMechanics::AiSetting::Fight, ref->mBase->mAiData.mFight);
+            data->mCreatureStats.setAiSetting(MWMechanics::AiSetting::Flee, ref->mBase->mAiData.mFlee);
+            data->mCreatureStats.setAiSetting(MWMechanics::AiSetting::Alarm, ref->mBase->mAiData.mAlarm);
 
             // Persistent actors with 0 health do not play death animation
             if (data->mCreatureStats.isDead())
@@ -863,7 +864,7 @@ namespace MWClass
         scale *= ref->mBase->mScale;
     }
 
-    void Creature::setBaseAISetting(const std::string& id, MWMechanics::CreatureStats::AiSetting setting, int value) const
+    void Creature::setBaseAISetting(const std::string& id, MWMechanics::AiSetting setting, int value) const
     {
         MWMechanics::setBaseAISetting<ESM::Creature>(id, setting, value);
     }
diff --git a/apps/openmw/mwclass/creature.hpp b/apps/openmw/mwclass/creature.hpp
index bc5d44ad36..a1696d80f0 100644
--- a/apps/openmw/mwclass/creature.hpp
+++ b/apps/openmw/mwclass/creature.hpp
@@ -134,7 +134,7 @@ namespace MWClass
             void adjustScale(const MWWorld::ConstPtr& ptr, osg::Vec3f& scale, bool rendering) const override;
             /// @param rendering Indicates if the scale to adjust is for the rendering mesh, or for the collision mesh
 
-            void setBaseAISetting(const std::string& id, MWMechanics::CreatureStats::AiSetting setting, int value) const override;
+            void setBaseAISetting(const std::string& id, MWMechanics::AiSetting setting, int value) const override;
 
             void modifyBaseInventory(const std::string& actorId, const std::string& itemId, int amount) const override;
 
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index dbbb5217ce..fc4f655246 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -38,6 +38,7 @@
 #include "../mwmechanics/creaturecustomdataresetter.hpp"
 #include "../mwmechanics/inventory.hpp"
 #include "../mwmechanics/aisetting.hpp"
+#include "../mwmechanics/setbaseaisetting.hpp"
 
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontalk.hpp"
@@ -390,10 +391,10 @@ namespace MWClass
 
             data->mNpcStats.getAiSequence().fill(ref->mBase->mAiPackage);
 
-            data->mNpcStats.setAiSetting (MWMechanics::CreatureStats::AI_Hello, ref->mBase->mAiData.mHello);
-            data->mNpcStats.setAiSetting (MWMechanics::CreatureStats::AI_Fight, ref->mBase->mAiData.mFight);
-            data->mNpcStats.setAiSetting (MWMechanics::CreatureStats::AI_Flee, ref->mBase->mAiData.mFlee);
-            data->mNpcStats.setAiSetting (MWMechanics::CreatureStats::AI_Alarm, ref->mBase->mAiData.mAlarm);
+            data->mNpcStats.setAiSetting(MWMechanics::AiSetting::Hello, ref->mBase->mAiData.mHello);
+            data->mNpcStats.setAiSetting(MWMechanics::AiSetting::Fight, ref->mBase->mAiData.mFight);
+            data->mNpcStats.setAiSetting(MWMechanics::AiSetting::Flee, ref->mBase->mAiData.mFlee);
+            data->mNpcStats.setAiSetting(MWMechanics::AiSetting::Alarm, ref->mBase->mAiData.mAlarm);
 
             // spells
             if (!spellsInitialised)
@@ -1452,7 +1453,7 @@ namespace MWClass
         return ref->mBase->getFactionRank();
     }
 
-    void Npc::setBaseAISetting(const std::string& id, MWMechanics::CreatureStats::AiSetting setting, int value) const
+    void Npc::setBaseAISetting(const std::string& id, MWMechanics::AiSetting setting, int value) const
     {
         MWMechanics::setBaseAISetting<ESM::NPC>(id, setting, value);
     }
diff --git a/apps/openmw/mwclass/npc.hpp b/apps/openmw/mwclass/npc.hpp
index d6ae7cbca5..264612944e 100644
--- a/apps/openmw/mwclass/npc.hpp
+++ b/apps/openmw/mwclass/npc.hpp
@@ -162,7 +162,7 @@ namespace MWClass
             std::string getPrimaryFaction(const MWWorld::ConstPtr &ptr) const override;
             int getPrimaryFactionRank(const MWWorld::ConstPtr &ptr) const override;
 
-            void setBaseAISetting(const std::string& id, MWMechanics::CreatureStats::AiSetting setting, int value) const override;
+            void setBaseAISetting(const std::string& id, MWMechanics::AiSetting setting, int value) const override;
 
             void modifyBaseInventory(const std::string& actorId, const std::string& itemId, int amount) const override;
 
diff --git a/apps/openmw/mwdialogue/filter.cpp b/apps/openmw/mwdialogue/filter.cpp
index e90ba79481..b855d75238 100644
--- a/apps/openmw/mwdialogue/filter.cpp
+++ b/apps/openmw/mwdialogue/filter.cpp
@@ -309,7 +309,7 @@ int MWDialogue::Filter::getSelectStructInteger (const SelectWrapper& select) con
         case SelectWrapper::Function_AiSetting:
 
             return mActor.getClass().getCreatureStats (mActor).getAiSetting (
-                        (MWMechanics::CreatureStats::AiSetting)select.getArgument()).getModified(false);
+                        (MWMechanics::AiSetting)select.getArgument()).getModified(false);
 
         case SelectWrapper::Function_PcAttribute:
 
diff --git a/apps/openmw/mwgui/spellbuyingwindow.cpp b/apps/openmw/mwgui/spellbuyingwindow.cpp
index 934936f1ab..9651513533 100644
--- a/apps/openmw/mwgui/spellbuyingwindow.cpp
+++ b/apps/openmw/mwgui/spellbuyingwindow.cpp
@@ -16,6 +16,8 @@
 #include "../mwworld/esmstore.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/spells.hpp"
+#include "../mwmechanics/creaturestats.hpp"
 
 namespace MWGui
 {
diff --git a/apps/openmw/mwgui/spellcreationdialog.cpp b/apps/openmw/mwgui/spellcreationdialog.cpp
index c6ee5b5e66..6a8beb63fd 100644
--- a/apps/openmw/mwgui/spellcreationdialog.cpp
+++ b/apps/openmw/mwgui/spellcreationdialog.cpp
@@ -22,6 +22,7 @@
 
 #include "../mwmechanics/spellutil.hpp"
 #include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/creaturestats.hpp"
 
 #include "tooltips.hpp"
 #include "class.hpp"
diff --git a/apps/openmw/mwgui/travelwindow.cpp b/apps/openmw/mwgui/travelwindow.cpp
index 1cdb22d88f..fcdc5775d1 100644
--- a/apps/openmw/mwgui/travelwindow.cpp
+++ b/apps/openmw/mwgui/travelwindow.cpp
@@ -21,6 +21,7 @@
 #include "../mwworld/esmstore.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/creaturestats.hpp"
 
 namespace MWGui
 {
diff --git a/apps/openmw/mwlua/localscripts.cpp b/apps/openmw/mwlua/localscripts.cpp
index 270379fe6d..4fd9920cb5 100644
--- a/apps/openmw/mwlua/localscripts.cpp
+++ b/apps/openmw/mwlua/localscripts.cpp
@@ -12,6 +12,7 @@
 #include "../mwmechanics/aitravel.hpp"
 #include "../mwmechanics/aiwander.hpp"
 #include "../mwmechanics/aipackage.hpp"
+#include "../mwmechanics/creaturestats.hpp"
 
 #include "luamanagerimp.hpp"
 
diff --git a/apps/openmw/mwlua/objectbindings.cpp b/apps/openmw/mwlua/objectbindings.cpp
index 90ce134f24..14da8b098c 100644
--- a/apps/openmw/mwlua/objectbindings.cpp
+++ b/apps/openmw/mwlua/objectbindings.cpp
@@ -9,6 +9,8 @@
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/player.hpp"
 
+#include "../mwmechanics/creaturestats.hpp"
+
 #include "eventqueue.hpp"
 #include "luamanagerimp.hpp"
 #include "types/types.hpp"
diff --git a/apps/openmw/mwlua/types/actor.cpp b/apps/openmw/mwlua/types/actor.cpp
index 2a272ef862..0e89b22052 100644
--- a/apps/openmw/mwlua/types/actor.cpp
+++ b/apps/openmw/mwlua/types/actor.cpp
@@ -3,6 +3,7 @@
 #include <components/lua/luastate.hpp>
 
 #include <apps/openmw/mwmechanics/drawstate.hpp>
+#include <apps/openmw/mwmechanics/creaturestats.hpp>
 #include <apps/openmw/mwworld/inventorystore.hpp>
 #include <apps/openmw/mwworld/class.hpp>
 
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 99256d1395..a5ab0a6ae6 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -372,7 +372,7 @@ namespace MWMechanics
             return;
 
         const CreatureStats &stats = actor.getClass().getCreatureStats(actor);
-        if (stats.getAiSetting(CreatureStats::AI_Hello).getModified() == 0)
+        if (stats.getAiSetting(AiSetting::Hello).getModified() == 0)
             return;
 
         const MWMechanics::AiSequence& seq = stats.getAiSequence();
@@ -463,7 +463,7 @@ namespace MWMechanics
         static const int iGreetDistanceMultiplier = MWBase::Environment::get().getWorld()->getStore()
             .get<ESM::GameSetting>().find("iGreetDistanceMultiplier")->mValue.getInteger();
 
-        const float helloDistance = static_cast<float>(actorStats.getAiSetting(CreatureStats::AI_Hello).getModified() * iGreetDistanceMultiplier);
+        const float helloDistance = static_cast<float>(actorStats.getAiSetting(AiSetting::Hello).getModified() * iGreetDistanceMultiplier);
         const auto& playerStats = player.getClass().getCreatureStats(player);
 
         int greetingTimer = actorState.getGreetingTimer();
@@ -1089,7 +1089,7 @@ namespace MWMechanics
                 // Reset factors to attack
                 creatureStats.setAttacked(false);
                 creatureStats.setAlarmed(false);
-                creatureStats.setAiSetting(CreatureStats::AI_Fight, ptr.getClass().getBaseFightRating(ptr));
+                creatureStats.setAiSetting(AiSetting::Fight, ptr.getClass().getBaseFightRating(ptr));
 
                 // Update witness crime id
                 npcStats.setCrimeId(-1);
diff --git a/apps/openmw/mwmechanics/actorutil.cpp b/apps/openmw/mwmechanics/actorutil.cpp
index 4e1b7706db..8615af9860 100644
--- a/apps/openmw/mwmechanics/actorutil.cpp
+++ b/apps/openmw/mwmechanics/actorutil.cpp
@@ -6,6 +6,9 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/player.hpp"
 
+#include "../mwmechanics/magiceffects.hpp"
+#include "../mwmechanics/creaturestats.hpp"
+
 #include <components/esm3/loadmgef.hpp>
 
 namespace MWMechanics
diff --git a/apps/openmw/mwmechanics/aicombataction.cpp b/apps/openmw/mwmechanics/aicombataction.cpp
index c4d2bf9bec..c2fdf70a72 100644
--- a/apps/openmw/mwmechanics/aicombataction.cpp
+++ b/apps/openmw/mwmechanics/aicombataction.cpp
@@ -468,7 +468,7 @@ namespace MWMechanics
         const CreatureStats& stats = actor.getClass().getCreatureStats(actor);
         const MWWorld::Store<ESM::GameSetting>& gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
-        int flee = stats.getAiSetting(CreatureStats::AI_Flee).getModified();
+        const int flee = stats.getAiSetting(AiSetting::Flee).getModified();
         if (flee >= 100)
             return flee;
 
diff --git a/apps/openmw/mwmechanics/aisetting.hpp b/apps/openmw/mwmechanics/aisetting.hpp
index d11769ac6f..3a274722fe 100644
--- a/apps/openmw/mwmechanics/aisetting.hpp
+++ b/apps/openmw/mwmechanics/aisetting.hpp
@@ -1,40 +1,15 @@
 #ifndef OPENMW_MWMECHANICS_AISETTING_H
 #define OPENMW_MWMECHANICS_AISETTING_H
 
-#include <string>
-
-#include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
-
-#include "../mwworld/esmstore.hpp"
-
-#include "creaturestats.hpp"
-
 namespace MWMechanics
 {
-    template<class T>
-    void setBaseAISetting(const std::string& id, MWMechanics::CreatureStats::AiSetting setting, int value)
+    enum class AiSetting
     {
-        T copy = *MWBase::Environment::get().getWorld()->getStore().get<T>().find(id);
-        switch (setting)
-        {
-            case MWMechanics::CreatureStats::AiSetting::AI_Hello:
-                copy.mAiData.mHello = value;
-                break;
-            case MWMechanics::CreatureStats::AiSetting::AI_Fight:
-                copy.mAiData.mFight = value;
-                break;
-            case MWMechanics::CreatureStats::AiSetting::AI_Flee:
-                copy.mAiData.mFlee = value;
-                break;
-            case MWMechanics::CreatureStats::AiSetting::AI_Alarm:
-                copy.mAiData.mAlarm = value;
-                break;
-            default:
-                assert(false);
-        }
-        MWBase::Environment::get().getWorld()->createOverrideRecord(copy);
-    }
+        Hello = 0,
+        Fight = 1,
+        Flee = 2,
+        Alarm = 3
+    };
 }
 
 #endif
diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index 2faa6332ec..8369a221db 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -1,6 +1,7 @@
 #include "creaturestats.hpp"
 
 #include <algorithm>
+#include <type_traits>
 
 #include <components/esm3/creaturestats.hpp>
 #include <components/esm3/esmreader.hpp>
@@ -99,7 +100,7 @@ namespace MWMechanics
 
     Stat<int> CreatureStats::getAiSetting (AiSetting index) const
     {
-        return mAiSettings[index];
+        return mAiSettings[static_cast<std::underlying_type_t<AiSetting>>(index)];
     }
 
     const DynamicStat<float> &CreatureStats::getDynamic(int index) const
@@ -212,7 +213,7 @@ namespace MWMechanics
 
     void CreatureStats::setAiSetting (AiSetting index, Stat<int> value)
     {
-        mAiSettings[index] = value;
+        mAiSettings[static_cast<std::underlying_type_t<AiSetting>>(index)] = value;
     }
 
     void CreatureStats::setAiSetting (AiSetting index, int base)
diff --git a/apps/openmw/mwmechanics/creaturestats.hpp b/apps/openmw/mwmechanics/creaturestats.hpp
index 8908ed838c..1e6d378df7 100644
--- a/apps/openmw/mwmechanics/creaturestats.hpp
+++ b/apps/openmw/mwmechanics/creaturestats.hpp
@@ -12,6 +12,7 @@
 #include "activespells.hpp"
 #include "aisequence.hpp"
 #include "drawstate.hpp"
+#include "aisetting.hpp"
 
 #include <components/esm/attr.hpp>
 #include <components/esm3/magiceffects.hpp>
@@ -154,13 +155,6 @@ namespace MWMechanics
 
         void setLevel(int level);
 
-        enum AiSetting
-        {
-            AI_Hello = 0,
-            AI_Fight = 1,
-            AI_Flee = 2,
-            AI_Alarm = 3
-        };
         void setAiSetting (AiSetting index, Stat<int> value);
         void setAiSetting (AiSetting index, int base);
         Stat<int> getAiSetting (AiSetting index) const;
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 95842330f8..5e1462912a 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -678,11 +678,11 @@ namespace MWMechanics
             {
                 float s = floor(r * fPerDieRollMult * fPerTempMult);
 
-                int flee = npcStats.getAiSetting(MWMechanics::CreatureStats::AI_Flee).getBase();
-                int fight = npcStats.getAiSetting(MWMechanics::CreatureStats::AI_Fight).getBase();
-                npcStats.setAiSetting (MWMechanics::CreatureStats::AI_Flee,
+                const int flee = npcStats.getAiSetting(MWMechanics::AiSetting::Flee).getBase();
+                const int fight = npcStats.getAiSetting(MWMechanics::AiSetting::Fight).getBase();
+                npcStats.setAiSetting (MWMechanics::AiSetting::Flee,
                                        std::clamp(flee + int(std::max(iPerMinChange, s)), 0, 100));
-                npcStats.setAiSetting (MWMechanics::CreatureStats::AI_Fight,
+                npcStats.setAiSetting (MWMechanics::AiSetting::Fight,
                                        std::clamp(fight + int(std::min(-iPerMinChange, -s)), 0, 100));
             }
 
@@ -719,11 +719,11 @@ namespace MWMechanics
             if (success)
             {
                 float s = c * fPerDieRollMult * fPerTempMult;
-                int flee = npcStats.getAiSetting (CreatureStats::AI_Flee).getBase();
-                int fight = npcStats.getAiSetting (CreatureStats::AI_Fight).getBase();
-                npcStats.setAiSetting(CreatureStats::AI_Flee,
+                const int flee = npcStats.getAiSetting(AiSetting::Flee).getBase();
+                const int fight = npcStats.getAiSetting(AiSetting::Fight).getBase();
+                npcStats.setAiSetting(AiSetting::Flee,
                                        std::clamp(flee + std::min(-int(iPerMinChange), int(-s)), 0, 100));
-                npcStats.setAiSetting(CreatureStats::AI_Fight,
+                npcStats.setAiSetting(AiSetting::Fight,
                                        std::clamp(fight + std::max(int(iPerMinChange), int(s)), 0, 100));
             }
             x = floor(-c * fPerDieRollMult);
@@ -1297,7 +1297,7 @@ namespace MWMechanics
                 continue;
 
             // Will the witness report the crime?
-            if (actor.getClass().getCreatureStats(actor).getAiSetting(CreatureStats::AI_Alarm).getBase() >= 100)
+            if (actor.getClass().getCreatureStats(actor).getAiSetting(AiSetting::Alarm).getBase() >= 100)
             {
                 reported = true;
 
@@ -1329,7 +1329,7 @@ namespace MWMechanics
             {
                 float dispTerm = (actor == victim) ? dispVictim : disp;
 
-                float alarmTerm = 0.01f * actor.getClass().getCreatureStats(actor).getAiSetting(CreatureStats::AI_Alarm).getBase();
+                float alarmTerm = 0.01f * actor.getClass().getCreatureStats(actor).getAiSetting(AiSetting::Alarm).getBase();
                 if (type == OT_Pickpocket && alarmTerm <= 0)
                     alarmTerm = 1.0;
 
@@ -1341,7 +1341,7 @@ namespace MWMechanics
                 fightTerm += getFightDistanceBias(actor, player);
                 fightTerm *= alarmTerm;
 
-                int observerFightRating = actor.getClass().getCreatureStats(actor).getAiSetting(CreatureStats::AI_Fight).getBase();
+                const int observerFightRating = actor.getClass().getCreatureStats(actor).getAiSetting(AiSetting::Fight).getBase();
                 if (observerFightRating + fightTerm > 100)
                     fightTerm = static_cast<float>(100 - observerFightRating);
                 fightTerm = std::max(0.f, fightTerm);
@@ -1353,7 +1353,7 @@ namespace MWMechanics
                     NpcStats& observerStats = actor.getClass().getNpcStats(actor);
                     // Apply aggression value to the base Fight rating, so that the actor can continue fighting
                     // after a Calm spell wears off
-                    observerStats.setAiSetting(CreatureStats::AI_Fight, observerFightRating + static_cast<int>(fightTerm));
+                    observerStats.setAiSetting(AiSetting::Fight, observerFightRating + static_cast<int>(fightTerm));
 
                     observerStats.setBaseDisposition(observerStats.getBaseDisposition() + static_cast<int>(dispTerm));
 
@@ -1452,7 +1452,7 @@ namespace MWMechanics
                 std::string script = target.getClass().getScript(target);
                 if (!script.empty() && target.getRefData().getLocals().hasVar(script, "onpchitme") && attacker == player)
                 {
-                    int fight = target.getClass().getCreatureStats(target).getAiSetting(CreatureStats::AI_Fight).getModified();
+                    const int fight = target.getClass().getCreatureStats(target).getAiSetting(AiSetting::Fight).getModified();
                     peaceful = (fight == 0);
                 }
 
@@ -1736,7 +1736,7 @@ namespace MWMechanics
         if (ptr.getClass().isNpc())
             disposition = getDerivedDisposition(ptr);
 
-        int fight = ptr.getClass().getCreatureStats(ptr).getAiSetting(CreatureStats::AI_Fight).getModified()
+        int fight = ptr.getClass().getCreatureStats(ptr).getAiSetting(AiSetting::Fight).getModified()
                 + static_cast<int>(getFightDistanceBias(ptr, target) + getFightDispositionBias(static_cast<float>(disposition)));
 
         if (ptr.getClass().isNpc() && target.getClass().isNpc())
@@ -1851,7 +1851,7 @@ namespace MWMechanics
                 if (MWBase::Environment::get().getWorld()->getLOS(neighbor, actor) && awarenessCheck(actor, neighbor))
                 {
                     detected = true;
-                    if (neighbor.getClass().getCreatureStats(neighbor).getAiSetting(MWMechanics::CreatureStats::AI_Alarm).getModified() > 0)
+                    if (neighbor.getClass().getCreatureStats(neighbor).getAiSetting(MWMechanics::AiSetting::Alarm).getModified() > 0)
                     {
                         reported = true;
                         break;
diff --git a/apps/openmw/mwmechanics/setbaseaisetting.hpp b/apps/openmw/mwmechanics/setbaseaisetting.hpp
new file mode 100644
index 0000000000..523161f731
--- /dev/null
+++ b/apps/openmw/mwmechanics/setbaseaisetting.hpp
@@ -0,0 +1,41 @@
+#ifndef OPENMW_MWMECHANICS_SETBASEAISETTING_H
+#define OPENMW_MWMECHANICS_SETBASEAISETTING_H
+
+#include <string>
+
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+
+#include "../mwworld/esmstore.hpp"
+
+#include "aisetting.hpp"
+#include "creaturestats.hpp"
+
+namespace MWMechanics
+{
+    template<class T>
+    void setBaseAISetting(const std::string& id, MWMechanics::AiSetting setting, int value)
+    {
+        T copy = *MWBase::Environment::get().getWorld()->getStore().get<T>().find(id);
+        switch (setting)
+        {
+            case MWMechanics::AiSetting::Hello:
+                copy.mAiData.mHello = value;
+                break;
+            case MWMechanics::AiSetting::Fight:
+                copy.mAiData.mFight = value;
+                break;
+            case MWMechanics::AiSetting::Flee:
+                copy.mAiData.mFlee = value;
+                break;
+            case MWMechanics::AiSetting::Alarm:
+                copy.mAiData.mAlarm = value;
+                break;
+            default:
+                assert(false);
+        }
+        MWBase::Environment::get().getWorld()->createOverrideRecord(copy);
+    }
+}
+
+#endif
diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp
index 8a92dd5b68..a43d19431b 100644
--- a/apps/openmw/mwmechanics/spelleffects.cpp
+++ b/apps/openmw/mwmechanics/spelleffects.cpp
@@ -40,7 +40,7 @@ namespace
         return effect.mMinMagnitude + Misc::Rng::rollDice(effect.mMaxMagnitude - effect.mMinMagnitude + 1, prng);
     }
 
-    void modifyAiSetting(const MWWorld::Ptr& target, const ESM::ActiveEffect& effect, ESM::MagicEffect::Effects creatureEffect, MWMechanics::CreatureStats::AiSetting setting, float magnitude, bool& invalid)
+    void modifyAiSetting(const MWWorld::Ptr& target, const ESM::ActiveEffect& effect, ESM::MagicEffect::Effects creatureEffect, MWMechanics::AiSetting setting, float magnitude, bool& invalid)
     {
         if(target == MWMechanics::getPlayer() || (effect.mEffectId == creatureEffect) == target.getClass().isNpc())
             invalid = true;
@@ -501,18 +501,18 @@ void applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, co
             else
             {
                 auto& creatureStats = target.getClass().getCreatureStats(target);
-                Stat<int> stat = creatureStats.getAiSetting(CreatureStats::AI_Flee);
+                Stat<int> stat = creatureStats.getAiSetting(AiSetting::Flee);
                 stat.setModifier(static_cast<int>(stat.getModifier() + effect.mMagnitude));
-                creatureStats.setAiSetting(CreatureStats::AI_Flee, stat);
+                creatureStats.setAiSetting(AiSetting::Flee, stat);
             }
             break;
         case ESM::MagicEffect::FrenzyCreature:
         case ESM::MagicEffect::FrenzyHumanoid:
-            modifyAiSetting(target, effect, ESM::MagicEffect::FrenzyCreature, CreatureStats::AI_Fight, effect.mMagnitude, invalid);
+            modifyAiSetting(target, effect, ESM::MagicEffect::FrenzyCreature, AiSetting::Fight, effect.mMagnitude, invalid);
             break;
         case ESM::MagicEffect::CalmCreature:
         case ESM::MagicEffect::CalmHumanoid:
-            modifyAiSetting(target, effect, ESM::MagicEffect::CalmCreature, CreatureStats::AI_Fight, -effect.mMagnitude, invalid);
+            modifyAiSetting(target, effect, ESM::MagicEffect::CalmCreature, AiSetting::Fight, -effect.mMagnitude, invalid);
             if(!invalid && effect.mMagnitude > 0)
             {
                 auto& creatureStats = target.getClass().getCreatureStats(target);
@@ -521,11 +521,11 @@ void applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, co
             break;
         case ESM::MagicEffect::DemoralizeCreature:
         case ESM::MagicEffect::DemoralizeHumanoid:
-            modifyAiSetting(target, effect, ESM::MagicEffect::DemoralizeCreature, CreatureStats::AI_Flee, effect.mMagnitude, invalid);
+            modifyAiSetting(target, effect, ESM::MagicEffect::DemoralizeCreature, AiSetting::Flee, effect.mMagnitude, invalid);
             break;
         case ESM::MagicEffect::RallyCreature:
         case ESM::MagicEffect::RallyHumanoid:
-            modifyAiSetting(target, effect, ESM::MagicEffect::RallyCreature, CreatureStats::AI_Flee, -effect.mMagnitude, invalid);
+            modifyAiSetting(target, effect, ESM::MagicEffect::RallyCreature, AiSetting::Flee, -effect.mMagnitude, invalid);
             break;
         case ESM::MagicEffect::SummonScamp:
         case ESM::MagicEffect::SummonClannfear:
@@ -1006,26 +1006,26 @@ void removeMagicEffect(const MWWorld::Ptr& target, ActiveSpells::ActiveSpellPara
         case ESM::MagicEffect::TurnUndead:
             {
                 auto& creatureStats = target.getClass().getCreatureStats(target);
-                Stat<int> stat = creatureStats.getAiSetting(CreatureStats::AI_Flee);
+                Stat<int> stat = creatureStats.getAiSetting(AiSetting::Flee);
                 stat.setModifier(static_cast<int>(stat.getModifier() - effect.mMagnitude));
-                creatureStats.setAiSetting(CreatureStats::AI_Flee, stat);
+                creatureStats.setAiSetting(AiSetting::Flee, stat);
             }
             break;
         case ESM::MagicEffect::FrenzyCreature:
         case ESM::MagicEffect::FrenzyHumanoid:
-            modifyAiSetting(target, effect, ESM::MagicEffect::FrenzyCreature, CreatureStats::AI_Fight, -effect.mMagnitude, invalid);
+            modifyAiSetting(target, effect, ESM::MagicEffect::FrenzyCreature, AiSetting::Fight, -effect.mMagnitude, invalid);
             break;
         case ESM::MagicEffect::CalmCreature:
         case ESM::MagicEffect::CalmHumanoid:
-            modifyAiSetting(target, effect, ESM::MagicEffect::CalmCreature, CreatureStats::AI_Fight, effect.mMagnitude, invalid);
+            modifyAiSetting(target, effect, ESM::MagicEffect::CalmCreature, AiSetting::Fight, effect.mMagnitude, invalid);
             break;
         case ESM::MagicEffect::DemoralizeCreature:
         case ESM::MagicEffect::DemoralizeHumanoid:
-            modifyAiSetting(target, effect, ESM::MagicEffect::DemoralizeCreature, CreatureStats::AI_Flee, -effect.mMagnitude, invalid);
+            modifyAiSetting(target, effect, ESM::MagicEffect::DemoralizeCreature, AiSetting::Flee, -effect.mMagnitude, invalid);
             break;
         case ESM::MagicEffect::RallyCreature:
         case ESM::MagicEffect::RallyHumanoid:
-            modifyAiSetting(target, effect, ESM::MagicEffect::RallyCreature, CreatureStats::AI_Flee, effect.mMagnitude, invalid);
+            modifyAiSetting(target, effect, ESM::MagicEffect::RallyCreature, AiSetting::Flee, effect.mMagnitude, invalid);
             break;
         case ESM::MagicEffect::SummonScamp:
         case ESM::MagicEffect::SummonClannfear:
diff --git a/apps/openmw/mwmechanics/weapontype.cpp b/apps/openmw/mwmechanics/weapontype.cpp
index 30f554f80b..6bf5b70fee 100644
--- a/apps/openmw/mwmechanics/weapontype.cpp
+++ b/apps/openmw/mwmechanics/weapontype.cpp
@@ -1,5 +1,8 @@
 #include "weapontype.hpp"
 
+#include "drawstate.hpp"
+#include "creaturestats.hpp"
+
 #include "../mwworld/class.hpp"
 
 namespace MWMechanics
diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 7497fd15f7..297f40c6a7 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -16,7 +16,10 @@
 
 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/movement.hpp"
+#include "../mwmechanics/creaturestats.hpp"
+
 #include "../mwrender/bulletdebugdraw.hpp"
+
 #include "../mwworld/class.hpp"
 
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwrender/actoranimation.cpp b/apps/openmw/mwrender/actoranimation.cpp
index 373a29bc1a..f370f17e1c 100644
--- a/apps/openmw/mwrender/actoranimation.cpp
+++ b/apps/openmw/mwrender/actoranimation.cpp
@@ -31,6 +31,8 @@
 #include "../mwworld/esmstore.hpp"
 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/weapontype.hpp"
+#include "../mwmechanics/drawstate.hpp"
+#include "../mwmechanics/creaturestats.hpp"
 
 #include "vismask.hpp"
 
diff --git a/apps/openmw/mwscript/aiextensions.cpp b/apps/openmw/mwscript/aiextensions.cpp
index 519af584f0..47cddee083 100644
--- a/apps/openmw/mwscript/aiextensions.cpp
+++ b/apps/openmw/mwscript/aiextensions.cpp
@@ -255,9 +255,9 @@ namespace MWScript
         template<class R>
         class OpGetAiSetting : public Interpreter::Opcode0
         {
-            MWMechanics::CreatureStats::AiSetting mIndex;
+            MWMechanics::AiSetting mIndex;
             public:
-                OpGetAiSetting(MWMechanics::CreatureStats::AiSetting index) : mIndex(index) {}
+                OpGetAiSetting(MWMechanics::AiSetting index) : mIndex(index) {}
 
                 void execute (Interpreter::Runtime& runtime) override
                 {
@@ -272,9 +272,9 @@ namespace MWScript
         template<class R>
         class OpModAiSetting : public Interpreter::Opcode0
         {
-            MWMechanics::CreatureStats::AiSetting mIndex;
+            MWMechanics::AiSetting mIndex;
             public:
-                OpModAiSetting(MWMechanics::CreatureStats::AiSetting index) : mIndex(index) {}
+                OpModAiSetting(MWMechanics::AiSetting index) : mIndex(index) {}
 
                 void execute (Interpreter::Runtime& runtime) override
                 {
@@ -294,9 +294,9 @@ namespace MWScript
         template<class R>
         class OpSetAiSetting : public Interpreter::Opcode0
         {
-            MWMechanics::CreatureStats::AiSetting mIndex;
+            MWMechanics::AiSetting mIndex;
             public:
-                OpSetAiSetting(MWMechanics::CreatureStats::AiSetting index) : mIndex(index) {}
+                OpSetAiSetting(MWMechanics::AiSetting index) : mIndex(index) {}
 
                 void execute (Interpreter::Runtime& runtime) override
                 {
@@ -586,32 +586,32 @@ namespace MWScript
             interpreter.installSegment5<OpStopCombat<ExplicitRef>>(Compiler::Ai::opcodeStopCombatExplicit);
             interpreter.installSegment5<OpToggleAI>(Compiler::Ai::opcodeToggleAI);
 
-            interpreter.installSegment5<OpSetAiSetting<ImplicitRef>>(Compiler::Ai::opcodeSetHello, MWMechanics::CreatureStats::AiSetting::AI_Hello);
-            interpreter.installSegment5<OpSetAiSetting<ExplicitRef>>(Compiler::Ai::opcodeSetHelloExplicit, MWMechanics::CreatureStats::AiSetting::AI_Hello);
-            interpreter.installSegment5<OpSetAiSetting<ImplicitRef>>(Compiler::Ai::opcodeSetFight, MWMechanics::CreatureStats::AiSetting::AI_Fight);
-            interpreter.installSegment5<OpSetAiSetting<ExplicitRef>>(Compiler::Ai::opcodeSetFightExplicit, MWMechanics::CreatureStats::AiSetting::AI_Fight);
-            interpreter.installSegment5<OpSetAiSetting<ImplicitRef>>(Compiler::Ai::opcodeSetFlee, MWMechanics::CreatureStats::AiSetting::AI_Flee);
-            interpreter.installSegment5<OpSetAiSetting<ExplicitRef>>(Compiler::Ai::opcodeSetFleeExplicit, MWMechanics::CreatureStats::AiSetting::AI_Flee);
-            interpreter.installSegment5<OpSetAiSetting<ImplicitRef>>(Compiler::Ai::opcodeSetAlarm, MWMechanics::CreatureStats::AiSetting::AI_Alarm);
-            interpreter.installSegment5<OpSetAiSetting<ExplicitRef>>(Compiler::Ai::opcodeSetAlarmExplicit, MWMechanics::CreatureStats::AiSetting::AI_Alarm);
-
-            interpreter.installSegment5<OpModAiSetting<ImplicitRef>>(Compiler::Ai::opcodeModHello, MWMechanics::CreatureStats::AiSetting::AI_Hello);
-            interpreter.installSegment5<OpModAiSetting<ExplicitRef>>(Compiler::Ai::opcodeModHelloExplicit, MWMechanics::CreatureStats::AiSetting::AI_Hello);
-            interpreter.installSegment5<OpModAiSetting<ImplicitRef>>(Compiler::Ai::opcodeModFight, MWMechanics::CreatureStats::AiSetting::AI_Fight);
-            interpreter.installSegment5<OpModAiSetting<ExplicitRef>>(Compiler::Ai::opcodeModFightExplicit, MWMechanics::CreatureStats::AiSetting::AI_Fight);
-            interpreter.installSegment5<OpModAiSetting<ImplicitRef>>(Compiler::Ai::opcodeModFlee, MWMechanics::CreatureStats::AiSetting::AI_Flee);
-            interpreter.installSegment5<OpModAiSetting<ExplicitRef>>(Compiler::Ai::opcodeModFleeExplicit, MWMechanics::CreatureStats::AiSetting::AI_Flee);
-            interpreter.installSegment5<OpModAiSetting<ImplicitRef>>(Compiler::Ai::opcodeModAlarm, MWMechanics::CreatureStats::AiSetting::AI_Alarm);
-            interpreter.installSegment5<OpModAiSetting<ExplicitRef>>(Compiler::Ai::opcodeModAlarmExplicit, MWMechanics::CreatureStats::AiSetting::AI_Alarm);
-
-            interpreter.installSegment5<OpGetAiSetting<ImplicitRef>>(Compiler::Ai::opcodeGetHello, MWMechanics::CreatureStats::AiSetting::AI_Hello);
-            interpreter.installSegment5<OpGetAiSetting<ExplicitRef>>(Compiler::Ai::opcodeGetHelloExplicit, MWMechanics::CreatureStats::AiSetting::AI_Hello);
-            interpreter.installSegment5<OpGetAiSetting<ImplicitRef>>(Compiler::Ai::opcodeGetFight, MWMechanics::CreatureStats::AiSetting::AI_Fight);
-            interpreter.installSegment5<OpGetAiSetting<ExplicitRef>>(Compiler::Ai::opcodeGetFightExplicit, MWMechanics::CreatureStats::AiSetting::AI_Fight);
-            interpreter.installSegment5<OpGetAiSetting<ImplicitRef>>(Compiler::Ai::opcodeGetFlee, MWMechanics::CreatureStats::AiSetting::AI_Flee);
-            interpreter.installSegment5<OpGetAiSetting<ExplicitRef>>(Compiler::Ai::opcodeGetFleeExplicit, MWMechanics::CreatureStats::AiSetting::AI_Flee);
-            interpreter.installSegment5<OpGetAiSetting<ImplicitRef>>(Compiler::Ai::opcodeGetAlarm, MWMechanics::CreatureStats::AiSetting::AI_Alarm);
-            interpreter.installSegment5<OpGetAiSetting<ExplicitRef>>(Compiler::Ai::opcodeGetAlarmExplicit, MWMechanics::CreatureStats::AiSetting::AI_Alarm);
+            interpreter.installSegment5<OpSetAiSetting<ImplicitRef>>(Compiler::Ai::opcodeSetHello, MWMechanics::AiSetting::Hello);
+            interpreter.installSegment5<OpSetAiSetting<ExplicitRef>>(Compiler::Ai::opcodeSetHelloExplicit, MWMechanics::AiSetting::Hello);
+            interpreter.installSegment5<OpSetAiSetting<ImplicitRef>>(Compiler::Ai::opcodeSetFight, MWMechanics::AiSetting::Fight);
+            interpreter.installSegment5<OpSetAiSetting<ExplicitRef>>(Compiler::Ai::opcodeSetFightExplicit, MWMechanics::AiSetting::Fight);
+            interpreter.installSegment5<OpSetAiSetting<ImplicitRef>>(Compiler::Ai::opcodeSetFlee, MWMechanics::AiSetting::Flee);
+            interpreter.installSegment5<OpSetAiSetting<ExplicitRef>>(Compiler::Ai::opcodeSetFleeExplicit, MWMechanics::AiSetting::Flee);
+            interpreter.installSegment5<OpSetAiSetting<ImplicitRef>>(Compiler::Ai::opcodeSetAlarm, MWMechanics::AiSetting::Alarm);
+            interpreter.installSegment5<OpSetAiSetting<ExplicitRef>>(Compiler::Ai::opcodeSetAlarmExplicit, MWMechanics::AiSetting::Alarm);
+
+            interpreter.installSegment5<OpModAiSetting<ImplicitRef>>(Compiler::Ai::opcodeModHello, MWMechanics::AiSetting::Hello);
+            interpreter.installSegment5<OpModAiSetting<ExplicitRef>>(Compiler::Ai::opcodeModHelloExplicit, MWMechanics::AiSetting::Hello);
+            interpreter.installSegment5<OpModAiSetting<ImplicitRef>>(Compiler::Ai::opcodeModFight, MWMechanics::AiSetting::Fight);
+            interpreter.installSegment5<OpModAiSetting<ExplicitRef>>(Compiler::Ai::opcodeModFightExplicit, MWMechanics::AiSetting::Fight);
+            interpreter.installSegment5<OpModAiSetting<ImplicitRef>>(Compiler::Ai::opcodeModFlee, MWMechanics::AiSetting::Flee);
+            interpreter.installSegment5<OpModAiSetting<ExplicitRef>>(Compiler::Ai::opcodeModFleeExplicit, MWMechanics::AiSetting::Flee);
+            interpreter.installSegment5<OpModAiSetting<ImplicitRef>>(Compiler::Ai::opcodeModAlarm, MWMechanics::AiSetting::Alarm);
+            interpreter.installSegment5<OpModAiSetting<ExplicitRef>>(Compiler::Ai::opcodeModAlarmExplicit, MWMechanics::AiSetting::Alarm);
+
+            interpreter.installSegment5<OpGetAiSetting<ImplicitRef>>(Compiler::Ai::opcodeGetHello, MWMechanics::AiSetting::Hello);
+            interpreter.installSegment5<OpGetAiSetting<ExplicitRef>>(Compiler::Ai::opcodeGetHelloExplicit, MWMechanics::AiSetting::Hello);
+            interpreter.installSegment5<OpGetAiSetting<ImplicitRef>>(Compiler::Ai::opcodeGetFight, MWMechanics::AiSetting::Fight);
+            interpreter.installSegment5<OpGetAiSetting<ExplicitRef>>(Compiler::Ai::opcodeGetFightExplicit, MWMechanics::AiSetting::Fight);
+            interpreter.installSegment5<OpGetAiSetting<ImplicitRef>>(Compiler::Ai::opcodeGetFlee, MWMechanics::AiSetting::Flee);
+            interpreter.installSegment5<OpGetAiSetting<ExplicitRef>>(Compiler::Ai::opcodeGetFleeExplicit, MWMechanics::AiSetting::Flee);
+            interpreter.installSegment5<OpGetAiSetting<ImplicitRef>>(Compiler::Ai::opcodeGetAlarm, MWMechanics::AiSetting::Alarm);
+            interpreter.installSegment5<OpGetAiSetting<ExplicitRef>>(Compiler::Ai::opcodeGetAlarmExplicit, MWMechanics::AiSetting::Alarm);
 
             interpreter.installSegment5<OpFace<ImplicitRef>>(Compiler::Ai::opcodeFace);
             interpreter.installSegment5<OpFace<ExplicitRef>>(Compiler::Ai::opcodeFaceExplicit);
diff --git a/apps/openmw/mwscript/controlextensions.cpp b/apps/openmw/mwscript/controlextensions.cpp
index 74d2067394..d216474c6d 100644
--- a/apps/openmw/mwscript/controlextensions.cpp
+++ b/apps/openmw/mwscript/controlextensions.cpp
@@ -14,6 +14,8 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/ptr.hpp"
 
+#include "../mwmechanics/creaturestats.hpp"
+
 #include "interpretercontext.hpp"
 #include "ref.hpp"
 
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index f9b5c53ebd..d43c4bbba1 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -521,7 +521,7 @@ namespace MWWorld
         return result;
     }
 
-    void Class::setBaseAISetting(const std::string& id, MWMechanics::CreatureStats::AiSetting setting, int value) const
+    void Class::setBaseAISetting(const std::string& id, MWMechanics::AiSetting setting, int value) const
     {
         throw std::runtime_error ("class does not have creature stats");
     }
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index 8b62d21064..f1f4c46df0 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -11,7 +11,8 @@
 
 #include "ptr.hpp"
 #include "doorstate.hpp"
-#include "../mwmechanics/creaturestats.hpp"
+
+#include "../mwmechanics/aisetting.hpp"
 
 namespace ESM
 {
@@ -32,6 +33,7 @@ namespace MWMechanics
 {
     class NpcStats;
     struct Movement;
+    class CreatureStats;
 }
 
 namespace MWGui
@@ -361,7 +363,7 @@ namespace MWWorld
 
             virtual osg::Vec4f getEnchantmentColor(const MWWorld::ConstPtr& item) const;
 
-            virtual void setBaseAISetting(const std::string& id, MWMechanics::CreatureStats::AiSetting setting, int value) const;
+            virtual void setBaseAISetting(const std::string& id, MWMechanics::AiSetting setting, int value) const;
 
             virtual void modifyBaseInventory(const std::string& actorId, const std::string& itemId, int amount) const;
     };

From e11fbc10b1c5b63b7b94901ff7e7a4390c741dd5 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 16 Jul 2022 12:36:10 +0200
Subject: [PATCH 2808/2859] Remove unused member functions from
 MWMechanics::DerivedClassStorage

---
 apps/openmw/mwmechanics/aistate.hpp | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/apps/openmw/mwmechanics/aistate.hpp b/apps/openmw/mwmechanics/aistate.hpp
index 976e21c65c..692f731be3 100644
--- a/apps/openmw/mwmechanics/aistate.hpp
+++ b/apps/openmw/mwmechanics/aistate.hpp
@@ -1,8 +1,6 @@
 #ifndef AISTATE_H
 #define AISTATE_H
 
-#include <typeinfo>
-
 namespace MWMechanics
 {
 
@@ -63,17 +61,7 @@ namespace MWMechanics
                 delete mStorage;
             mStorage = p;
         }
-        
-        bool empty() const
-        {
-            return mStorage == nullptr;
-        }
-        
-        const std::type_info& getType() const
-        {
-            return typeid(mStorage);
-        }
-        
+
         DerivedClassStorage():mStorage(nullptr){}
         ~DerivedClassStorage()
         {

From f5c2e09df9bf92c88bef035466716d85c2fa91d4 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 16 Jul 2022 13:00:03 +0200
Subject: [PATCH 2809/2859] Move AiTemporaryBase to a separate header

---
 apps/openmw/mwmechanics/aicombat.hpp        |  1 +
 apps/openmw/mwmechanics/aifollow.hpp        |  1 +
 apps/openmw/mwmechanics/aistate.hpp         | 15 ++-------------
 apps/openmw/mwmechanics/aitemporarybase.hpp | 19 +++++++++++++++++++
 apps/openmw/mwmechanics/aiwander.hpp        |  2 +-
 5 files changed, 24 insertions(+), 14 deletions(-)
 create mode 100644 apps/openmw/mwmechanics/aitemporarybase.hpp

diff --git a/apps/openmw/mwmechanics/aicombat.hpp b/apps/openmw/mwmechanics/aicombat.hpp
index a51393647c..1d8b8a38b3 100644
--- a/apps/openmw/mwmechanics/aicombat.hpp
+++ b/apps/openmw/mwmechanics/aicombat.hpp
@@ -2,6 +2,7 @@
 #define GAME_MWMECHANICS_AICOMBAT_H
 
 #include "typedaipackage.hpp"
+#include "aitemporarybase.hpp"
 
 #include "../mwworld/cellstore.hpp" // for Doors
 
diff --git a/apps/openmw/mwmechanics/aifollow.hpp b/apps/openmw/mwmechanics/aifollow.hpp
index c57d6da483..c1969a7e27 100644
--- a/apps/openmw/mwmechanics/aifollow.hpp
+++ b/apps/openmw/mwmechanics/aifollow.hpp
@@ -2,6 +2,7 @@
 #define GAME_MWMECHANICS_AIFOLLOW_H
 
 #include "typedaipackage.hpp"
+#include "aitemporarybase.hpp"
 
 #include <string>
 #include <string_view>
diff --git a/apps/openmw/mwmechanics/aistate.hpp b/apps/openmw/mwmechanics/aistate.hpp
index 692f731be3..73a054c59e 100644
--- a/apps/openmw/mwmechanics/aistate.hpp
+++ b/apps/openmw/mwmechanics/aistate.hpp
@@ -1,6 +1,8 @@
 #ifndef AISTATE_H
 #define AISTATE_H
 
+#include "aitemporarybase.hpp"
+
 namespace MWMechanics
 {
 
@@ -70,19 +72,6 @@ namespace MWMechanics
         }
     };
 
-
-    /// \brief base class for the temporary storage of AiPackages.
-    /**
-     * Each AI package with temporary values needs a AiPackageStorage class
-     * which is derived from AiTemporaryBase. The Actor holds a container
-     * AiState where one of these storages can be stored at a time.
-     * The execute(...) member function takes this container as an argument.
-     * */
-    struct AiTemporaryBase
-    {
-        virtual ~AiTemporaryBase(){}
-    };
-    
     /// \brief Container for AI package status.
     typedef DerivedClassStorage<AiTemporaryBase> AiState;
 }
diff --git a/apps/openmw/mwmechanics/aitemporarybase.hpp b/apps/openmw/mwmechanics/aitemporarybase.hpp
new file mode 100644
index 0000000000..8ac8e4b71b
--- /dev/null
+++ b/apps/openmw/mwmechanics/aitemporarybase.hpp
@@ -0,0 +1,19 @@
+#ifndef OPENMW_MWMECHANICS_AISTATE_H
+#define OPENMW_MWMECHANICS_AISTATE_H
+
+namespace MWMechanics
+{
+    /// \brief base class for the temporary storage of AiPackages.
+    /**
+     * Each AI package with temporary values needs a AiPackageStorage class
+     * which is derived from AiTemporaryBase. The Actor holds a container
+     * AiState where one of these storages can be stored at a time.
+     * The execute(...) member function takes this container as an argument.
+     * */
+    struct AiTemporaryBase
+    {
+        virtual ~AiTemporaryBase() = default;
+    };
+}
+
+#endif
diff --git a/apps/openmw/mwmechanics/aiwander.hpp b/apps/openmw/mwmechanics/aiwander.hpp
index 02a1054363..1adb4ed84e 100644
--- a/apps/openmw/mwmechanics/aiwander.hpp
+++ b/apps/openmw/mwmechanics/aiwander.hpp
@@ -7,7 +7,7 @@
 
 #include "pathfinding.hpp"
 #include "obstacle.hpp"
-#include "aistate.hpp"
+#include "aitemporarybase.hpp"
 #include "aitimer.hpp"
 
 namespace ESM

From d2b7253c7f56c170816b9a7df188daf0cc29d38f Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 16 Jul 2022 12:49:01 +0200
Subject: [PATCH 2810/2859] Use forward declarations instead of including
 aistate.hpp

---
 apps/openmw/mwmechanics/aipackage.hpp  |  5 +++--
 apps/openmw/mwmechanics/aisequence.hpp |  4 ----
 apps/openmw/mwmechanics/aistate.hpp    |  4 +---
 apps/openmw/mwmechanics/aistatefwd.hpp | 15 +++++++++++++++
 4 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 apps/openmw/mwmechanics/aistatefwd.hpp

diff --git a/apps/openmw/mwmechanics/aipackage.hpp b/apps/openmw/mwmechanics/aipackage.hpp
index 4e5dfcab6b..684ff3338d 100644
--- a/apps/openmw/mwmechanics/aipackage.hpp
+++ b/apps/openmw/mwmechanics/aipackage.hpp
@@ -4,12 +4,13 @@
 #include <memory>
 
 #include <components/detournavigator/areatype.hpp>
- 
+
 #include "pathfinding.hpp"
 #include "obstacle.hpp"
-#include "aistate.hpp"
 #include "aipackagetypeid.hpp"
 #include "aitimer.hpp"
+#include "aistatefwd.hpp"
+
 #include "../mwworld/ptr.hpp"
 
 namespace ESM
diff --git a/apps/openmw/mwmechanics/aisequence.hpp b/apps/openmw/mwmechanics/aisequence.hpp
index 5c6a43b9b8..e6f5a108c2 100644
--- a/apps/openmw/mwmechanics/aisequence.hpp
+++ b/apps/openmw/mwmechanics/aisequence.hpp
@@ -27,10 +27,6 @@ namespace MWMechanics
 {
     class AiPackage;
     class CharacterController;
-    
-    template< class Base > class DerivedClassStorage;
-    struct AiTemporaryBase;
-    typedef DerivedClassStorage<AiTemporaryBase> AiState;
 
     using AiPackages = std::vector<std::shared_ptr<AiPackage>>;
 
diff --git a/apps/openmw/mwmechanics/aistate.hpp b/apps/openmw/mwmechanics/aistate.hpp
index 73a054c59e..ca90029e47 100644
--- a/apps/openmw/mwmechanics/aistate.hpp
+++ b/apps/openmw/mwmechanics/aistate.hpp
@@ -1,6 +1,7 @@
 #ifndef AISTATE_H
 #define AISTATE_H
 
+#include "aistatefwd.hpp"
 #include "aitemporarybase.hpp"
 
 namespace MWMechanics
@@ -71,9 +72,6 @@ namespace MWMechanics
                 delete mStorage;
         }
     };
-
-    /// \brief Container for AI package status.
-    typedef DerivedClassStorage<AiTemporaryBase> AiState;
 }
 
 #endif // AISTATE_H
diff --git a/apps/openmw/mwmechanics/aistatefwd.hpp b/apps/openmw/mwmechanics/aistatefwd.hpp
new file mode 100644
index 0000000000..83216d1d27
--- /dev/null
+++ b/apps/openmw/mwmechanics/aistatefwd.hpp
@@ -0,0 +1,15 @@
+#ifndef OPENMW_MWMECHANICS_AISTATEFWD_H
+#define OPENMW_MWMECHANICS_AISTATEFWD_H
+
+namespace MWMechanics
+{
+    template <class Base>
+    class DerivedClassStorage;
+
+    struct AiTemporaryBase;
+
+    /// \brief Container for AI package status.
+    using AiState = DerivedClassStorage<AiTemporaryBase>;
+}
+
+#endif

From b8937a493ab057c31e2f44fe0105ba4dc4c69076 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 16 Jul 2022 12:41:06 +0200
Subject: [PATCH 2811/2859] Avoid manual memory management for
 MWMechanics::DerivedClassStorage

---
 apps/openmw/mwmechanics/aisequence.cpp |  6 +--
 apps/openmw/mwmechanics/aistate.hpp    | 51 ++++++++++----------------
 apps/openmw/mwmechanics/aiwander.cpp   |  2 +-
 3 files changed, 23 insertions(+), 36 deletions(-)

diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index fc91ce0c42..a9de4a5152 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -419,9 +419,9 @@ void AiSequence::stack (const AiPackage& package, const MWWorld::Ptr& actor, boo
     // Make sure that temporary storage is empty
     if (cancelOther)
     {
-        mAiState.moveIn(new AiCombatStorage());
-        mAiState.moveIn(new AiFollowStorage());
-        mAiState.moveIn(new AiWanderStorage());
+        mAiState.moveIn(std::make_unique<AiCombatStorage>());
+        mAiState.moveIn(std::make_unique<AiFollowStorage>());
+        mAiState.moveIn(std::make_unique<AiWanderStorage>());
     }
 }
 
diff --git a/apps/openmw/mwmechanics/aistate.hpp b/apps/openmw/mwmechanics/aistate.hpp
index ca90029e47..ca05c44b36 100644
--- a/apps/openmw/mwmechanics/aistate.hpp
+++ b/apps/openmw/mwmechanics/aistate.hpp
@@ -4,6 +4,8 @@
 #include "aistatefwd.hpp"
 #include "aitemporarybase.hpp"
 
+#include <memory>
+
 namespace MWMechanics
 {
 
@@ -14,28 +16,24 @@ namespace MWMechanics
      */
     template< class Base >
     class DerivedClassStorage
-    {              
+    {
     private:
-        Base* mStorage;
-        
-        //if needed you have to provide a clone member function
-        DerivedClassStorage( const DerivedClassStorage& other );
-        DerivedClassStorage& operator=( const DerivedClassStorage& );
-        
+        std::unique_ptr<Base> mStorage;
+
     public:
         /// \brief returns reference to stored object or deletes it and creates a fitting
         template< class Derived >
         Derived& get()
         {
-            Derived* result = dynamic_cast<Derived*>(mStorage);
-            
-            if(!result)
+            Derived* result = dynamic_cast<Derived*>(mStorage.get());
+
+            if (result == nullptr)
             {
-                if(mStorage)
-                    delete mStorage;
-                mStorage = result = new Derived();
+                auto storage = std::make_unique<Derived>();
+                result = storage.get();
+                mStorage = std::move(storage);
             }
-            
+
             //return a reference to the (new allocated) object 
             return *result;
         }
@@ -43,33 +41,22 @@ namespace MWMechanics
         template< class Derived >
         void copy(DerivedClassStorage& destination) const
         {
-            Derived* result = dynamic_cast<Derived*>(mStorage);
+            Derived* result = dynamic_cast<Derived*>(mStorage.get());
             if (result != nullptr)
                 destination.store<Derived>(*result);
         }
-        
+
         template< class Derived >
         void store( const Derived& payload )
         {
-            if(mStorage)
-                delete mStorage;
-            mStorage = new Derived(payload);
-        }
-        
-        /// \brief takes ownership of the passed object
-        template< class Derived >
-        void moveIn( Derived* p )
-        {
-            if(mStorage)
-                delete mStorage;
-            mStorage = p;
+            mStorage = std::make_unique<Derived>(payload);
         }
 
-        DerivedClassStorage():mStorage(nullptr){}
-        ~DerivedClassStorage()
+        /// \brief takes ownership of the passed object
+        template <class Derived>
+        void moveIn(std::unique_ptr<Derived>&& storage)
         {
-            if(mStorage)
-                delete mStorage;
+            mStorage = std::move(storage);
         }
     };
 }
diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index f6c46945b1..777e86955d 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -767,7 +767,7 @@ namespace MWMechanics
 
         ToWorldCoordinates(dest, actor.getCell()->getCell());
 
-        state.moveIn(new AiWanderStorage());
+        state.moveIn(std::make_unique<AiWanderStorage>());
 
         osg::Vec3f pos(static_cast<float>(dest.mX), static_cast<float>(dest.mY), static_cast<float>(dest.mZ));
         MWBase::Environment::get().getWorld()->moveObject(actor, pos);

From 1b70ff775d2f3fc8a1db1e4ff26426464648abee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <3397065-ZehMatt@users.noreply.gitlab.com>
Date: Sat, 16 Jul 2022 20:37:19 +0300
Subject: [PATCH 2812/2859] Move platform specific file code into platform and
 cleanup LowLevelFile

---
 components/CMakeLists.txt                 |   4 +
 components/files/lowlevelfile.cpp         | 327 ++--------------------
 components/files/lowlevelfile.hpp         |  46 +--
 components/platform/file.hpp              |  35 +++
 components/platform/file.posix.cpp        | 105 +++++++
 components/platform/file.stdio.cpp        |  93 ++++++
 components/platform/file.win32.cpp        | 102 +++++++
 components/platform/platform.internal.hpp |  19 ++
 8 files changed, 390 insertions(+), 341 deletions(-)
 create mode 100644 components/platform/file.hpp
 create mode 100644 components/platform/file.posix.cpp
 create mode 100644 components/platform/file.stdio.cpp
 create mode 100644 components/platform/file.win32.cpp
 create mode 100644 components/platform/platform.internal.hpp

diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 9a2295671e..39c20ab127 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -337,6 +337,10 @@ add_component_dir(navmeshtool
 
 add_component_dir(platform
     platform
+    file.posix
+    file.win32
+    file.stdio
+    file
     )
 
 set (ESM_UI ${CMAKE_SOURCE_DIR}/files/ui/contentselector.ui
diff --git a/components/files/lowlevelfile.cpp b/components/files/lowlevelfile.cpp
index 9192630236..de17d67cc2 100644
--- a/components/files/lowlevelfile.cpp
+++ b/components/files/lowlevelfile.cpp
@@ -4,333 +4,50 @@
 #include <sstream>
 #include <cassert>
 
-#if FILE_API == FILE_API_STDIO
-#include <errno.h>
-#include <string.h>
-#endif
+namespace File = Platform::File;
 
-#if FILE_API == FILE_API_POSIX
-#include <sys/types.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-#endif
-
-#if FILE_API == FILE_API_STDIO
-/*
- *
- *  Implementation of LowLevelFile methods using c stdio
- *
- */
-
-LowLevelFile::LowLevelFile ()
-{
-    mHandle = nullptr;
-}
-
-LowLevelFile::~LowLevelFile ()
-{
-    if (mHandle != nullptr)
-        fclose (mHandle);
-}
-
-void LowLevelFile::open (char const * filename)
-{
-    assert (mHandle == nullptr);
-
-    mHandle = fopen (filename, "rb");
-
-    if (mHandle == nullptr)
-    {
-        std::ostringstream os;
-        os << "Failed to open '" << filename << "' for reading: " << strerror(errno);
-        throw std::runtime_error (os.str ());
-    }
-}
-
-void LowLevelFile::close ()
-{
-    assert (mHandle != nullptr);
-
-    fclose (mHandle);
-
-    mHandle = nullptr;
-}
-
-size_t LowLevelFile::size ()
-{
-    assert (mHandle != nullptr);
-
-    long oldPosition = ftell (mHandle);
-    if (oldPosition == -1)
-    {
-        throw std::runtime_error ("An ftell() call failed: " + std::string(strerror(errno)));
-    }
-
-    if (fseek (mHandle, 0, SEEK_END) != 0)
-    {
-        throw std::runtime_error ("An fseek() call failed: " + std::string(strerror(errno)));
-    }
-
-    long size = ftell (mHandle);
-    if (size == -1)
-    {
-        throw std::runtime_error ("An ftell() call failed: " + std::string(strerror(errno)));
-    }
-
-    if (fseek (mHandle, oldPosition, SEEK_SET) != 0)
-    {
-        throw std::runtime_error ("An fseek() call failed: " + std::string(strerror(errno)));
-    }
-
-    return size_t (size);
-}
-
-void LowLevelFile::seek (size_t position)
-{
-    assert (mHandle != nullptr);
-
-    if (fseek (mHandle, position, SEEK_SET) != 0)
-    {
-        throw std::runtime_error ("An fseek() call failed: " + std::string(strerror(errno)));
-    }
-}
-
-size_t LowLevelFile::tell ()
-{
-    assert (mHandle != nullptr);
-
-    long position = ftell (mHandle);
-    if (position == -1)
-    {
-        throw std::runtime_error ("An ftell() call failed: " + std::string(strerror(errno)));
-    }
-
-    return size_t (position);
-}
-
-size_t LowLevelFile::read (void * data, size_t size)
-{
-    assert (mHandle != nullptr);
-
-    int amount = fread (data, 1, size, mHandle);
-
-    if (amount == 0 && ferror (mHandle))
-    {
-        std::ostringstream os;
-        os << "An attempt to read " << size << " bytes failed: " << strerror(errno);
-        throw std::runtime_error (os.str ());
-    }
-
-    return amount;
-}
-
-#elif FILE_API == FILE_API_POSIX
-/*
- *
- *  Implementation of LowLevelFile methods using posix IO calls
- *
- */
-
-LowLevelFile::LowLevelFile ()
-{
-    mHandle = -1;
-}
-
-LowLevelFile::~LowLevelFile ()
-{
-    if (mHandle != -1)
-        ::close (mHandle);
-}
-
-void LowLevelFile::open (char const * filename)
-{
-    assert (mHandle == -1);
-
-#ifdef O_BINARY
-    static const int openFlags = O_RDONLY | O_BINARY;
-#else
-    static const int openFlags = O_RDONLY;
-#endif
-
-    mHandle = ::open (filename, openFlags, 0);
-
-    if (mHandle == -1)
-    {
-        std::ostringstream os;
-        os << "Failed to open '" << filename << "' for reading: " << strerror(errno);
-        throw std::runtime_error (os.str ());
-    }
-}
-
-void LowLevelFile::close ()
+LowLevelFile::~LowLevelFile()
 {
-    assert (mHandle != -1);
-
-    ::close (mHandle);
-
-    mHandle = -1;
+    if (mHandle != File::Handle::Invalid)
+        File::close(mHandle);
 }
 
-size_t LowLevelFile::size ()
+void LowLevelFile::open(char const* filename)
 {
-    assert (mHandle != -1);
-
-    size_t oldPosition = ::lseek (mHandle, 0, SEEK_CUR);
-
-    if (oldPosition == size_t (-1))
-    {
-        throw std::runtime_error ("An lseek() call failed: " + std::string(strerror(errno)));
-    }
-
-    size_t size = ::lseek (mHandle, 0, SEEK_END);
-
-    if (size == size_t (-1))
-    {
-        throw std::runtime_error ("An lseek() call failed: " + std::string(strerror(errno)));
-    }
-
-    if (lseek (mHandle, oldPosition, SEEK_SET) == -1)
-    {
-        throw std::runtime_error ("An lseek() call failed: " + std::string(strerror(errno)));
-    }
-
-    return size;
+    mHandle = File::open(filename);
 }
 
-void LowLevelFile::seek (size_t position)
+void LowLevelFile::close()
 {
-    assert (mHandle != -1);
-
-    if (::lseek (mHandle, position, SEEK_SET) == -1)
-    {
-        throw std::runtime_error ("An lseek() call failed: " + std::string(strerror(errno)));
-    }
+    if (mHandle != File::Handle::Invalid)
+        File::close(mHandle);
+    mHandle = File::Handle::Invalid;
 }
 
-size_t LowLevelFile::tell ()
+size_t LowLevelFile::size()
 {
-    assert (mHandle != -1);
-
-    size_t position = ::lseek (mHandle, 0, SEEK_CUR);
+    assert(mHandle != File::Handle::Invalid);
 
-    if (position == size_t (-1))
-    {
-        throw std::runtime_error("An lseek() call failed: " + std::string(strerror(errno)));
-    }
-
-    return position;
+    return File::size(mHandle);
 }
 
-size_t LowLevelFile::read (void * data, size_t size)
+void LowLevelFile::seek(size_t position)
 {
-    assert (mHandle != -1);
-
-    int amount = ::read (mHandle, data, size);
+    assert(mHandle != File::Handle::Invalid);
 
-    if (amount == -1)
-    {
-        std::ostringstream os;
-        os << "An attempt to read " << size << " bytes failed: " << strerror(errno);
-        throw std::runtime_error (os.str ());
-    }
-
-    return amount;
+    return File::seek(mHandle, position);
 }
 
-#elif FILE_API == FILE_API_WIN32
-
-#include <boost/locale.hpp>
-/*
- *
- *  Implementation of LowLevelFile methods using Win32 API calls
- *
- */
-
-LowLevelFile::LowLevelFile ()
+size_t LowLevelFile::tell()
 {
-    mHandle = INVALID_HANDLE_VALUE;
-}
+    assert(mHandle != File::Handle::Invalid);
 
-LowLevelFile::~LowLevelFile ()
-{
-    if (mHandle != INVALID_HANDLE_VALUE)
-        CloseHandle (mHandle);
+    return File::tell(mHandle);
 }
 
-void LowLevelFile::open (char const * filename)
+size_t LowLevelFile::read(void* data, size_t size)
 {
-    assert (mHandle == INVALID_HANDLE_VALUE);
+    assert(mHandle != File::Handle::Invalid);
 
-    std::wstring wname = boost::locale::conv::utf_to_utf<wchar_t>(filename);
-    HANDLE handle = CreateFileW (wname.c_str(), GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0);
-
-    if (handle == INVALID_HANDLE_VALUE)
-    {
-        std::ostringstream os;
-        os << "Failed to open '" << filename << "' for reading: " << GetLastError();
-        throw std::runtime_error (os.str ());
-    }
-
-    mHandle = handle;
+    return File::read(mHandle, data, size);
 }
-
-void LowLevelFile::close ()
-{
-    assert (mHandle != INVALID_HANDLE_VALUE);
-
-    CloseHandle (mHandle);
-
-    mHandle = INVALID_HANDLE_VALUE;
-}
-
-size_t LowLevelFile::size ()
-{
-    assert (mHandle != INVALID_HANDLE_VALUE);
-
-    BY_HANDLE_FILE_INFORMATION info;
-
-    if (!GetFileInformationByHandle (mHandle, &info))
-        throw std::runtime_error ("A query operation on a file failed.");
-
-    if (info.nFileSizeHigh != 0)
-        throw std::runtime_error ("Files greater that 4GB are not supported.");
-
-    return info.nFileSizeLow;
-}
-
-void LowLevelFile::seek (size_t position)
-{
-    assert (mHandle != INVALID_HANDLE_VALUE);
-
-    if (SetFilePointer (mHandle, static_cast<LONG>(position), nullptr, SEEK_SET) == INVALID_SET_FILE_POINTER)
-        if (GetLastError () != NO_ERROR)
-            throw std::runtime_error ("A seek operation on a file failed.");
-}
-
-size_t LowLevelFile::tell ()
-{
-    assert (mHandle != INVALID_HANDLE_VALUE);
-
-    DWORD value = SetFilePointer (mHandle, 0, nullptr, SEEK_CUR);
-
-    if (value == INVALID_SET_FILE_POINTER && GetLastError () != NO_ERROR)
-        throw std::runtime_error ("A query operation on a file failed.");
-
-    return value;
-}
-
-size_t LowLevelFile::read (void * data, size_t size)
-{
-    assert (mHandle != INVALID_HANDLE_VALUE);
-
-    DWORD read;
-
-    if (!ReadFile (mHandle, data, static_cast<DWORD>(size), &read, nullptr))
-        throw std::runtime_error ("A read operation on a file failed.");
-
-    return read;
-}
-
-#endif
diff --git a/components/files/lowlevelfile.hpp b/components/files/lowlevelfile.hpp
index 47c2e44f15..1bd182d0e4 100644
--- a/components/files/lowlevelfile.hpp
+++ b/components/files/lowlevelfile.hpp
@@ -2,53 +2,27 @@
 #define COMPONENTS_FILES_LOWLEVELFILE_HPP
 
 #include <cstdlib>
+#include <memory>
 
-#define FILE_API_STDIO  0
-#define FILE_API_POSIX  1
-#define FILE_API_WIN32  2
-
-#if defined(__linux) || defined(__unix) || defined(__posix)
-#define FILE_API    FILE_API_POSIX
-#elif defined(_WIN32)
-#define FILE_API    FILE_API_WIN32
-#else
-#define FILE_API    FILE_API_STDIO
-#endif
-
-#if FILE_API == FILE_API_STDIO
-#include <cstdio>
-#elif FILE_API == FILE_API_POSIX
-#elif FILE_API == FILE_API_WIN32
-#include <components/windows.hpp>
-#else
-#error Unsupported File API
-#endif
+#include <components/platform/file.hpp>
 
 class LowLevelFile
 {
 public:
+    ~LowLevelFile();
 
-    LowLevelFile ();
-    ~LowLevelFile ();
-
-    void open (char const * filename);
-    void close ();
+    void open(char const* filename);
+    void close();
 
-    size_t size ();
+    size_t size();
 
-    void seek (size_t Position);
-    size_t tell ();
+    void seek(size_t Position);
+    size_t tell();
 
-    size_t read (void * data, size_t size);
+    size_t read(void* data, size_t size);
 
 private:
-#if FILE_API == FILE_API_STDIO
-    FILE* mHandle;
-#elif FILE_API == FILE_API_POSIX
-    int mHandle;
-#elif FILE_API == FILE_API_WIN32
-    HANDLE mHandle;
-#endif
+    Platform::File::Handle mHandle{ Platform::File::Handle::Invalid };
 };
 
 #endif
diff --git a/components/platform/file.hpp b/components/platform/file.hpp
new file mode 100644
index 0000000000..d0d5eb0399
--- /dev/null
+++ b/components/platform/file.hpp
@@ -0,0 +1,35 @@
+#ifndef OPENMW_COMPONENTS_PLATFORM_FILE_HPP
+#define OPENMW_COMPONENTS_PLATFORM_FILE_HPP
+
+#include <cstdlib>
+#include <string_view>
+
+namespace Platform::File {
+
+    enum class Handle : intptr_t
+    {
+        Invalid = -1
+    };
+
+    enum class SeekType
+    {
+        Begin,
+        Current,
+        End
+    };
+
+    Handle open(const char* filename);
+
+    void close(Handle handle);
+
+    size_t size(Handle handle);
+
+    void seek(Handle handle, size_t Position, SeekType type = SeekType::Begin);
+    size_t tell(Handle handle);
+
+    size_t read(Handle handle, void* data, size_t size);
+
+
+}
+
+#endif // OPENMW_COMPONENTS_PLATFORM_FILE_HPP
diff --git a/components/platform/file.posix.cpp b/components/platform/file.posix.cpp
new file mode 100644
index 0000000000..b6c322de11
--- /dev/null
+++ b/components/platform/file.posix.cpp
@@ -0,0 +1,105 @@
+#include "platform.internal.hpp"
+#include "file.hpp"
+
+#if PLATFORM_TYPE == PLATFORM_TYPE_POSIX
+
+#include <sys/types.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <string.h>
+
+namespace Platform::File {
+
+    static auto getNativeHandle(Handle handle)
+    {
+        return static_cast<int>(handle);
+    }
+
+    static int getNativeSeekType(SeekType seek)
+    {
+        if (seek == SeekType::Begin)
+            return SEEK_SET;
+        if (seek == SeekType::Current)
+            return SEEK_CUR;
+        if (seek == SeekType::End)
+            return SEEK_END;
+        return -1;
+    }
+
+    Handle open(const char* filename)
+    {
+        // Posix
+#ifdef O_BINARY
+        static const int openFlags = O_RDONLY | O_BINARY;
+#else
+        static const int openFlags = O_RDONLY;
+#endif
+
+        auto handle = ::open(filename, openFlags, 0);
+        if (handle == -1)
+        {
+            std::ostringstream os;
+            os << "Failed to open '" << filename << "' for reading: " << strerror(errno);
+            throw std::runtime_error(os.str());
+        }
+        return static_cast<Handle>(handle);
+    }
+
+    void close(Handle handle)
+    {
+        auto nativeHandle = getNativeHandle(handle);
+
+        ::close(nativeHandle);
+    }
+
+    void seek(Handle handle, size_t position, SeekType type /*= SeekType::Begin*/)
+    {
+        const auto nativeHandle = getNativeHandle(handle);
+        const auto nativeSeekType = getNativeSeekType(type);
+
+        if (::lseek(toNativeHandle(mHandle), position, SEEK_SET) == -1)
+        {
+            throw std::runtime_error("An lseek() call failed: " + std::string(strerror(errno)));
+        }
+    }
+
+    size_t size(Handle handle)
+    {
+        auto nativeHandle = getNativeHandle(handle);
+
+        auto oldPos = tell(handle);
+
+        seek(handle, 0, SeekType::End);
+        auto size = tell(handle);
+
+        return static_cast<size_t>(size);
+    }
+
+    size_t tell(Handle handle)
+    {
+        auto nativeHandle = getNativeHandle(handle);
+
+        size_t position = ::lseek(nativeHandle, 0, SEEK_CUR);
+        if (position == size_t(-1))
+        {
+            throw std::runtime_error("An lseek() call failed: " + std::string(strerror(errno)));
+        }
+        return position;
+    }
+
+    size_t read(Handle handle, void* data, size_t size)
+    {
+        auto nativeHandle = getNativeHandle(handle);
+
+        int amount = ::read(toNativeHandle(mHandle), data, size);
+        if (amount == -1)
+        {
+            throw std::runtime_error("An attempt to read " + std::to_string(size) + " bytes failed: " + strerror(errno));
+        }
+        return amount;
+    }
+
+}
+
+#endif
diff --git a/components/platform/file.stdio.cpp b/components/platform/file.stdio.cpp
new file mode 100644
index 0000000000..dd2660cd32
--- /dev/null
+++ b/components/platform/file.stdio.cpp
@@ -0,0 +1,93 @@
+#include "platform.internal.hpp"
+#include "file.hpp"
+
+#if PLATFORM_TYPE == PLATFORM_TYPE_STDIO
+
+#include <errno.h>
+#include <string.h>
+
+namespace Platform::File {
+
+    static auto getNativeHandle(Handle handle)
+    {
+        return reinterpret_cast<FILE*>(static_cast<intptr_t>(handle));
+    }
+
+    static int getNativeSeekType(SeekType seek)
+    {
+        if (seek == SeekType::Begin)
+            return SEEK_SET;
+        if (seek == SeekType::Current)
+            return SEEK_CUR;
+        if (seek == SeekType::End)
+            return SEEK_END;
+        return -1;
+    }
+
+    Handle open(const char* filename)
+    {
+        // Stdio
+        FILE* handle = fopen(filename, "rb");
+        if (handle == nullptr)
+        {
+            std::ostringstream os;
+            os << "Failed to open '" << filename << "' for reading: " << strerror(errno);
+            throw std::runtime_error(os.str());
+        }
+        return static_cast<Handle>(reinterpret_cast<intptr_t>(handle));
+    }
+
+    void close(Handle handle)
+    {
+        auto nativeHandle = getNativeHandle(handle);
+        fclose(nativeHandle);
+    }
+
+    void seek(Handle handle, size_t position, SeekType type /*= SeekType::Begin*/)
+    {
+        const auto nativeHandle = getNativeHandle(handle);
+        const auto nativeSeekType = getNativeSeekType(type);
+        if (fseek(nativeHandle, position, nativeSeekType) != 0)
+        {
+            throw std::runtime_error("An fseek() call failed: " + std::string(strerror(errno)));
+        }
+    }
+
+    size_t size(Handle handle)
+    {
+        auto nativeHandle = getNativeHandle(handle);
+        auto oldPos = tell(handle);
+
+        seek(handle, 0, SeekType::End);
+        auto size = tell(handle);
+
+        return static_cast<size_t>(size);
+    }
+
+    size_t tell(Handle handle)
+    {
+        auto nativeHandle = getNativeHandle(handle);
+
+        long position = ftell(nativeHandle);
+        if (position == -1)
+        {
+            throw std::runtime_error("An ftell() call failed: " + std::string(strerror(errno)));
+        }
+        return static_cast<size_t>(position);
+    }
+
+    size_t read(Handle handle, void* data, size_t size)
+    {
+        auto nativeHandle = getNativeHandle(handle);
+
+        int amount = fread(data, 1, size, nativeHandle);
+        if (amount == 0 && ferror(nativeHandle))
+        {
+            throw std::runtime_error("An attempt to read " + std::to_string(size) + " bytes failed: " + strerror(errno));
+        }
+        return static_cast<size_t>(amount);
+    }
+
+}
+
+#endif
diff --git a/components/platform/file.win32.cpp b/components/platform/file.win32.cpp
new file mode 100644
index 0000000000..59601caa80
--- /dev/null
+++ b/components/platform/file.win32.cpp
@@ -0,0 +1,102 @@
+#include "platform.internal.hpp"
+#include "file.hpp"
+
+#if PLATFORM_TYPE == PLATFORM_TYPE_WIN32
+
+#include <components/windows.hpp>
+#include <string>
+#include <boost/locale.hpp>
+
+namespace Platform::File {
+
+    static auto getNativeHandle(Handle handle)
+    {
+        return reinterpret_cast<HANDLE>(static_cast<intptr_t>(handle));
+    }
+
+    static int getNativeSeekType(SeekType seek)
+    {
+        if (seek == SeekType::Begin)
+            return FILE_BEGIN;
+        if (seek == SeekType::Current)
+            return FILE_CURRENT;
+        if (seek == SeekType::End)
+            return FILE_END;
+        return -1;
+    }
+
+    Handle open(const char* filename)
+    {
+        std::wstring wname = boost::locale::conv::utf_to_utf<wchar_t>(filename);
+        HANDLE handle = CreateFileW(wname.c_str(), GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0);
+        if (handle == INVALID_HANDLE_VALUE)
+        {
+            std::ostringstream os;
+            os << "Failed to open '" << filename << "' for reading: " << GetLastError();
+            throw std::runtime_error(os.str());
+        }
+        return static_cast<Handle>(reinterpret_cast<intptr_t>(handle));
+    }
+
+    void close(Handle handle)
+    {
+        auto nativeHandle = getNativeHandle(handle);
+        CloseHandle(nativeHandle);
+    }
+
+    void seek(Handle handle, size_t position, SeekType type /*= SeekType::Begin*/)
+    {
+        const auto nativeHandle = getNativeHandle(handle);
+        const auto nativeSeekType = getNativeSeekType(type);
+
+        if (SetFilePointer(nativeHandle, static_cast<LONG>(position), nullptr, nativeSeekType) == INVALID_SET_FILE_POINTER)
+        {
+            if (auto errCode = GetLastError(); errCode != ERROR_SUCCESS)
+            {
+                throw std::runtime_error("An fseek() call failed: " + std::to_string(errCode));
+            }
+        }
+    }
+
+    size_t size(Handle handle)
+    {
+        auto nativeHandle = getNativeHandle(handle);
+
+        assert(isValidHandle(mHandle));
+
+        BY_HANDLE_FILE_INFORMATION info;
+
+        if (!GetFileInformationByHandle(nativeHandle, &info))
+            throw std::runtime_error("A query operation on a file failed.");
+
+        if (info.nFileSizeHigh != 0)
+            throw std::runtime_error("Files greater that 4GB are not supported.");
+
+        return info.nFileSizeLow;
+    }
+
+    size_t tell(Handle handle)
+    {
+        auto nativeHandle = getNativeHandle(handle);
+
+        DWORD value = SetFilePointer(nativeHandle, 0, nullptr, SEEK_CUR);
+        if (value == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR)
+            throw std::runtime_error("A query operation on a file failed.");
+
+        return value;
+    }
+
+    size_t read(Handle handle, void* data, size_t size)
+    {
+        auto nativeHandle = getNativeHandle(handle);
+
+        DWORD bytesRead{};
+
+        if (!ReadFile(nativeHandle, data, static_cast<DWORD>(size), &bytesRead, nullptr))
+            throw std::runtime_error("A read operation on a file failed: " + std::to_string(GetLastError()));
+
+        return bytesRead;
+    }
+}
+
+#endif
diff --git a/components/platform/platform.internal.hpp b/components/platform/platform.internal.hpp
new file mode 100644
index 0000000000..255fe7cb7a
--- /dev/null
+++ b/components/platform/platform.internal.hpp
@@ -0,0 +1,19 @@
+#ifndef COMPONENT_PLATFORM_FILE_HPP
+#define COMPONENT_PLATFORM_FILE_HPP
+
+namespace Platform
+{
+#define PLATFORM_TYPE_STDIO 0
+#define PLATFORM_TYPE_WIN32 1
+#define PLATFORM_TYPE_POSIX 2
+    
+#if defined(__linux) || defined(__unix) || defined(__posix)
+#define PLATFORM_TYPE PLATFORM_TYPE_POSIX
+#elif defined(_WIN32)
+#define PLATFORM_TYPE PLATFORM_TYPE_WIN32
+#else
+#define PLATFORM_TYPE PLATFORM_TYPE_STDIO
+#endif
+}
+
+#endif 

From 3d5f898920d7f901a4b297aad06ca9b9cc093fd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <3397065-ZehMatt@users.noreply.gitlab.com>
Date: Sat, 16 Jul 2022 21:00:50 +0300
Subject: [PATCH 2813/2859] Cleanup and fixes

---
 components/platform/file.posix.cpp | 21 ++++++++++-----------
 components/platform/file.stdio.cpp | 22 +++++++++++-----------
 components/platform/file.win32.cpp |  9 ++++-----
 3 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/components/platform/file.posix.cpp b/components/platform/file.posix.cpp
index b6c322de11..dd50083e7a 100644
--- a/components/platform/file.posix.cpp
+++ b/components/platform/file.posix.cpp
@@ -8,6 +8,8 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <string.h>
+#include <stdexcept>
+#include <string>
 
 namespace Platform::File {
 
@@ -29,7 +31,6 @@ namespace Platform::File {
 
     Handle open(const char* filename)
     {
-        // Posix
 #ifdef O_BINARY
         static const int openFlags = O_RDONLY | O_BINARY;
 #else
@@ -39,9 +40,7 @@ namespace Platform::File {
         auto handle = ::open(filename, openFlags, 0);
         if (handle == -1)
         {
-            std::ostringstream os;
-            os << "Failed to open '" << filename << "' for reading: " << strerror(errno);
-            throw std::runtime_error(os.str());
+            throw std::runtime_error(std::string("Failed to open '") + filename + "' for reading: " + strerror(errno));
         }
         return static_cast<Handle>(handle);
     }
@@ -58,7 +57,7 @@ namespace Platform::File {
         const auto nativeHandle = getNativeHandle(handle);
         const auto nativeSeekType = getNativeSeekType(type);
 
-        if (::lseek(toNativeHandle(mHandle), position, SEEK_SET) == -1)
+        if (::lseek(nativeHandle, position, nativeSeekType) == -1)
         {
             throw std::runtime_error("An lseek() call failed: " + std::string(strerror(errno)));
         }
@@ -66,14 +65,14 @@ namespace Platform::File {
 
     size_t size(Handle handle)
     {
-        auto nativeHandle = getNativeHandle(handle);
-
-        auto oldPos = tell(handle);
+        const auto oldPos = tell(handle);
 
         seek(handle, 0, SeekType::End);
-        auto size = tell(handle);
+        const auto fileSize = tell(handle);
+        seek(handle, oldPos, SeekType::Begin);
+
 
-        return static_cast<size_t>(size);
+        return static_cast<size_t>(fileSize);
     }
 
     size_t tell(Handle handle)
@@ -92,7 +91,7 @@ namespace Platform::File {
     {
         auto nativeHandle = getNativeHandle(handle);
 
-        int amount = ::read(toNativeHandle(mHandle), data, size);
+        int amount = ::read(nativeHandle, data, size);
         if (amount == -1)
         {
             throw std::runtime_error("An attempt to read " + std::to_string(size) + " bytes failed: " + strerror(errno));
diff --git a/components/platform/file.stdio.cpp b/components/platform/file.stdio.cpp
index dd2660cd32..ed17bd2040 100644
--- a/components/platform/file.stdio.cpp
+++ b/components/platform/file.stdio.cpp
@@ -5,6 +5,8 @@
 
 #include <errno.h>
 #include <string.h>
+#include <string>
+#include <stdexcept>
 
 namespace Platform::File {
 
@@ -26,13 +28,10 @@ namespace Platform::File {
 
     Handle open(const char* filename)
     {
-        // Stdio
         FILE* handle = fopen(filename, "rb");
         if (handle == nullptr)
         {
-            std::ostringstream os;
-            os << "Failed to open '" << filename << "' for reading: " << strerror(errno);
-            throw std::runtime_error(os.str());
+            throw std::runtime_error(std::string("Failed to open '") + filename + "' for reading: " + strerror(errno));
         }
         return static_cast<Handle>(reinterpret_cast<intptr_t>(handle));
     }
@@ -49,19 +48,20 @@ namespace Platform::File {
         const auto nativeSeekType = getNativeSeekType(type);
         if (fseek(nativeHandle, position, nativeSeekType) != 0)
         {
-            throw std::runtime_error("An fseek() call failed: " + std::string(strerror(errno)));
+            throw std::runtime_error(std::string("An fseek() call failed: ") + strerror(errno));
         }
     }
 
     size_t size(Handle handle)
     {
         auto nativeHandle = getNativeHandle(handle);
-        auto oldPos = tell(handle);
-
+        
+        const auto oldPos = tell(handle);
         seek(handle, 0, SeekType::End);
-        auto size = tell(handle);
+        const auto fileSize = tell(handle);
+        seek(handle, oldPos, SeekType::Begin);
 
-        return static_cast<size_t>(size);
+        return static_cast<size_t>(fileSize);
     }
 
     size_t tell(Handle handle)
@@ -71,7 +71,7 @@ namespace Platform::File {
         long position = ftell(nativeHandle);
         if (position == -1)
         {
-            throw std::runtime_error("An ftell() call failed: " + std::string(strerror(errno)));
+            throw std::runtime_error(std::string("An ftell() call failed: ") + strerror(errno));
         }
         return static_cast<size_t>(position);
     }
@@ -83,7 +83,7 @@ namespace Platform::File {
         int amount = fread(data, 1, size, nativeHandle);
         if (amount == 0 && ferror(nativeHandle))
         {
-            throw std::runtime_error("An attempt to read " + std::to_string(size) + " bytes failed: " + strerror(errno));
+            throw std::runtime_error(std::string("An attempt to read ") + std::to_string(size) + " bytes failed: " + strerror(errno));
         }
         return static_cast<size_t>(amount);
     }
diff --git a/components/platform/file.win32.cpp b/components/platform/file.win32.cpp
index 59601caa80..31fe67ecba 100644
--- a/components/platform/file.win32.cpp
+++ b/components/platform/file.win32.cpp
@@ -5,6 +5,7 @@
 
 #include <components/windows.hpp>
 #include <string>
+#include <stdexcept>
 #include <boost/locale.hpp>
 
 namespace Platform::File {
@@ -31,9 +32,7 @@ namespace Platform::File {
         HANDLE handle = CreateFileW(wname.c_str(), GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0);
         if (handle == INVALID_HANDLE_VALUE)
         {
-            std::ostringstream os;
-            os << "Failed to open '" << filename << "' for reading: " << GetLastError();
-            throw std::runtime_error(os.str());
+            throw std::runtime_error(std::string("Failed to open '") + filename + "' for reading: " + std::to_string(GetLastError()));
         }
         return static_cast<Handle>(reinterpret_cast<intptr_t>(handle));
     }
@@ -53,7 +52,7 @@ namespace Platform::File {
         {
             if (auto errCode = GetLastError(); errCode != ERROR_SUCCESS)
             {
-                throw std::runtime_error("An fseek() call failed: " + std::to_string(errCode));
+                throw std::runtime_error(std::string("An fseek() call failed: ") + std::to_string(errCode));
             }
         }
     }
@@ -93,7 +92,7 @@ namespace Platform::File {
         DWORD bytesRead{};
 
         if (!ReadFile(nativeHandle, data, static_cast<DWORD>(size), &bytesRead, nullptr))
-            throw std::runtime_error("A read operation on a file failed: " + std::to_string(GetLastError()));
+            throw std::runtime_error(std::string("A read operation on a file failed: ") + std::to_string(GetLastError()));
 
         return bytesRead;
     }

From c4bde18a9d4e7bba1c335d1194f1d067e23fa251 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sun, 17 Jul 2022 10:29:02 +0400
Subject: [PATCH 2814/2859] Suppress warnings spam from Qt

---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2450d0016f..7e4be201d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -696,6 +696,7 @@ if (WIN32)
         4100 # Unreferenced formal parameter (-Wunused-parameter)
         4127 # Conditional expression is constant
         4996 # Function was declared deprecated
+        5054 # Deprecated operations between enumerations of different types caused by Qt headers
         )
     
     if( "${MyGUI_VERSION}" VERSION_LESS_EQUAL "3.4.0" )

From 5ee825b5f6ad57acbdff02c556252b3ecd3af483 Mon Sep 17 00:00:00 2001
From: Project579 <star579avatar@gmail.com>
Date: Mon, 11 Jul 2022 22:17:12 +0200
Subject: [PATCH 2815/2859] Enable warnings as errors in MSVC builds.

---
 .gitlab-ci.yml           |  4 ++--
 CI/before_script.msvc.sh | 34 +++++++++++++++++++++++++++-------
 CMakeLists.txt           |  8 ++++++--
 3 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5ece19cd71..86fac636b8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -84,7 +84,7 @@ Coverity:
     CXX: clang++
     CXXFLAGS: -O0
   artifacts:
-    paths: 
+    paths:
       - /builds/OpenMW/openmw/cov-int/build-log.txt
 
 Ubuntu_GCC:
@@ -478,7 +478,7 @@ macOS12_Xcode13:
     - $env:CCACHE_BASEDIR = Get-Location
     - $env:CCACHE_DIR = "$(Get-Location)\ccache"
     - New-Item -Type Directory -Force -Path $env:CCACHE_DIR
-    - sh CI/before_script.msvc.sh -c $config -p Win64 -v 2019 -k -V -b -t -C $multiview
+    - sh CI/before_script.msvc.sh -c $config -p Win64 -v 2019 -k -V -b -t -C $multiview -E
     - cd MSVC2019_64
     - cmake --build . --config $config
     - ccache --show-stats
diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index e4c4c5620d..146f0c4679 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -76,6 +76,8 @@ GOOGLE_INSTALL_ROOT=""
 INSTALL_PREFIX="."
 BUILD_BENCHMARKS=""
 OSG_MULTIVIEW_BUILD=""
+USE_WERROR=""
+USE_CLANG_TIDY=""
 
 ACTIVATE_MSVC=""
 SINGLE_CONFIG=""
@@ -116,7 +118,7 @@ while [ $# -gt 0 ]; do
 
 			n )
 				NMAKE=true ;;
-			
+
 			N )
 				NINJA=true ;;
 
@@ -140,10 +142,16 @@ while [ $# -gt 0 ]; do
 
 			b )
 				BUILD_BENCHMARKS=true ;;
-            
-            M )
-                OSG_MULTIVIEW_BUILD=true ;;
-                
+
+			M )
+				OSG_MULTIVIEW_BUILD=true ;;
+
+			E )
+				USE_WERROR=true ;;
+
+			T )
+				USE_CLANG_TIDY=true ;;
+
 			h )
 				cat <<EOF
 Usage: $0 [-cdehkpuvVi]
@@ -182,8 +190,12 @@ Options:
 		CMake install prefix
 	-b
 		Build benchmarks
-    -M
-        Use a multiview build of OSG
+	-M
+		Use a multiview build of OSG
+	-E
+		Use warnings as errors (/WX)
+	-T
+		Run clang-tidy
 EOF
 				wrappedExit 0
 				;;
@@ -518,6 +530,14 @@ if ! [ -z $USE_CCACHE ]; then
 	add_cmake_opts "-DCMAKE_C_COMPILER_LAUNCHER=ccache  -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
 fi
 
+if ! [ -z "$USE_WERROR" ]; then
+  add_cmake_opts "-DOPENMW_MSVC_WERROR=ON"
+fi
+
+if ! [ -z "$USE_CLANG_TIDY" ]; then
+  add_cmake_opts "-DCMAKE_CXX_CLANG_TIDY=\"clang-tidy --warnings-as-errors=*\""
+fi
+
 ICU_VER="70_1"
 
 OSG_ARCHIVE_NAME="OSGoS 3.6.5"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e4be201d0..c9e69f1d11 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -690,7 +690,7 @@ if (WIN32)
 
     # Play a bit with the warning levels
 
-    set(WARNINGS "/W4")
+    set(WARNINGS /W4)
 
     set(WARNINGS_DISABLE
         4100 # Unreferenced formal parameter (-Wunused-parameter)
@@ -712,9 +712,13 @@ if (WIN32)
     endif()
 
     foreach(d ${WARNINGS_DISABLE})
-        set(WARNINGS "${WARNINGS} /wd${d}")
+        list(APPEND WARNINGS /wd${d})
     endforeach(d)
 
+    if(OPENMW_MSVC_WERROR)
+        list(APPEND WARNINGS /WX)
+    endif()
+
     set_target_properties(components PROPERTIES COMPILE_FLAGS "${WARNINGS}")
     set_target_properties(osg-ffmpeg-videoplayer PROPERTIES COMPILE_FLAGS "${WARNINGS}")
     

From 9e59a7e27131a12175df744131c40792b6cb1ce6 Mon Sep 17 00:00:00 2001
From: Project579 <star579avatar@gmail.com>
Date: Mon, 11 Jul 2022 22:36:45 +0200
Subject: [PATCH 2816/2859] Re-enable Windows tests.

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 86fac636b8..488d3b3148 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -539,7 +539,7 @@ Windows_MSBuild_RelWithDebInfo:
   variables:
     config: "RelWithDebInfo"
     # Gitlab can't successfully execute following binaries due to unknown reason
-    # executables: "openmw_test_suite.exe,openmw_detournavigator_navmeshtilescache_benchmark.exe"
+    executables: "openmw_test_suite.exe,openmw_detournavigator_navmeshtilescache_benchmark.exe"
   # temporarily enabled while we're linking these on the downloads page
   rules:
     # run this for both pushes and schedules so 'latest successful pipeline for branch' always includes it

From 02ef9c953ecaffa6fc1cebbe8b4cdc24b0823b66 Mon Sep 17 00:00:00 2001
From: Project579 <star579avatar@gmail.com>
Date: Sat, 16 Jul 2022 09:30:21 +0200
Subject: [PATCH 2817/2859] MSVC: Fix all warnings at level 4, upgrade Qt5 to
 5.15.2 to also reduce warnings, disabled 5054  warnings due to Qt5's use of
 deprecated operators in C++20 .

---
 .gitlab-ci.yml                          |   8 +-
 CI/before_script.msvc.sh                | 135 +++++++++---------------
 CMakeLists.txt                          |   9 +-
 components/nifosg/controller.hpp        |  11 ++
 components/sceneutil/osgacontroller.hpp |  11 ++
 5 files changed, 82 insertions(+), 92 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 488d3b3148..43fe22e8ea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -376,7 +376,7 @@ macOS12_Xcode13:
     - $env:CCACHE_BASEDIR = Get-Location
     - $env:CCACHE_DIR = "$(Get-Location)\ccache"
     - New-Item -Type Directory -Force -Path $env:CCACHE_DIR
-    - sh CI/before_script.msvc.sh -c $config -p Win64 -v 2019 -k -V -N -b -t -C $multiview
+    - sh CI/before_script.msvc.sh -c $config -p Win64 -v 2019 -k -V -N -b -t -C $multiview -E
     - cd MSVC2019_64_Ninja
     - .\ActivateMSVC.ps1
     - cmake --build . --config $config
@@ -439,8 +439,7 @@ macOS12_Xcode13:
     - .Windows_Ninja_Base
   variables:
     config: "RelWithDebInfo"
-    # Gitlab can't successfully execute following binaries due to unknown reason
-    # executables: "openmw_test_suite.exe,openmw_detournavigator_navmeshtilescache_benchmark.exe"
+    executables: "openmw_test_suite.exe,openmw_detournavigator_navmeshtilescache_benchmark.exe"
 
 .Windows_MSBuild_Base:
   tags:
@@ -478,7 +477,7 @@ macOS12_Xcode13:
     - $env:CCACHE_BASEDIR = Get-Location
     - $env:CCACHE_DIR = "$(Get-Location)\ccache"
     - New-Item -Type Directory -Force -Path $env:CCACHE_DIR
-    - sh CI/before_script.msvc.sh -c $config -p Win64 -v 2019 -k -V -b -t -C $multiview -E
+    - sh CI/before_script.msvc.sh -c $config -p Win64 -v 2019 -k -V -b -t -C $multiview  -E
     - cd MSVC2019_64
     - cmake --build . --config $config
     - ccache --show-stats
@@ -538,7 +537,6 @@ Windows_MSBuild_RelWithDebInfo:
     - .Windows_MSBuild_Base
   variables:
     config: "RelWithDebInfo"
-    # Gitlab can't successfully execute following binaries due to unknown reason
     executables: "openmw_test_suite.exe,openmw_detournavigator_navmeshtilescache_benchmark.exe"
   # temporarily enabled while we're linking these on the downloads page
   rules:
diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 146f0c4679..ff8ec1a11c 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -855,108 +855,77 @@ printf "${OSG_ARCHIVE_NAME}... "
 cd $DEPS
 echo
 # Qt
-if [ -z $APPVEYOR ]; then
-	printf "Qt 5.15.0... "
-else
-	printf "Qt 5.13 AppVeyor... "
-fi
+printf "Qt 5.15.2... "
 {
 	if [ $BITS -eq 64 ]; then
 		SUFFIX="_64"
 	else
 		SUFFIX=""
 	fi
-	if [ -z $APPVEYOR ]; then
-		cd $DEPS_INSTALL
 
-		qt_version="5.15.0"
-		if [ "win${BITS}_msvc${MSVC_REAL_YEAR}${SUFFIX}" == "win64_msvc2017_64" ]; then
-			echo "This combination of options is known not to work. Falling back to Qt 5.14.2."
-			qt_version="5.14.2"
-		fi
+	cd $DEPS_INSTALL
 
-		QT_SDK="$(real_pwd)/Qt/${qt_version}/msvc${MSVC_REAL_YEAR}${SUFFIX}"
+	qt_version="5.15.2"
 
-		if [ -d "Qt/${qt_version}" ]; then
-			printf "Exists. "
-		elif [ -z $SKIP_EXTRACT ]; then
-			if [ $MISSINGPYTHON -ne 0 ]; then
-				echo "Can't be automatically installed without Python."
-				wrappedExit 1
-			fi
+	QT_SDK="$(real_pwd)/Qt/${qt_version}/msvc${MSVC_REAL_YEAR}${SUFFIX}"
 
-			pushd "$DEPS" > /dev/null
-			if ! [ -d 'aqt-venv' ]; then
-				echo "  Creating Virtualenv for aqt..."
-				run_cmd python -m venv aqt-venv
-			fi
-			if [ -d 'aqt-venv/bin' ]; then
-				VENV_BIN_DIR='bin'
-			elif [ -d 'aqt-venv/Scripts' ]; then
-				VENV_BIN_DIR='Scripts'
-			else
-				echo "Error: Failed to create virtualenv in expected location."
-				wrappedExit 1
-			fi
+	if [ -d "Qt/${qt_version}" ]; then
+		printf "Exists. "
+	elif [ -z $SKIP_EXTRACT ]; then
+		if [ $MISSINGPYTHON -ne 0 ]; then
+			echo "Can't be automatically installed without Python."
+			wrappedExit 1
+		fi
 
-			# check version
-			aqt-venv/${VENV_BIN_DIR}/pip list | grep 'aqtinstall\s*1.1.3' || [ $? -ne 0 ]
-			if [ $? -eq 0 ]; then
-				echo "  Installing aqt wheel into virtualenv..."
-				run_cmd "aqt-venv/${VENV_BIN_DIR}/pip" install aqtinstall==1.1.3
-			fi
-			popd > /dev/null
+		pushd "$DEPS" > /dev/null
+		if ! [ -d 'aqt-venv' ]; then
+			echo "  Creating Virtualenv for aqt..."
+			run_cmd python -m venv aqt-venv
+		fi
+		if [ -d 'aqt-venv/bin' ]; then
+			VENV_BIN_DIR='bin'
+		elif [ -d 'aqt-venv/Scripts' ]; then
+			VENV_BIN_DIR='Scripts'
+		else
+			echo "Error: Failed to create virtualenv in expected location."
+			wrappedExit 1
+		fi
 
-			rm -rf Qt
+		# check version
+		aqt-venv/${VENV_BIN_DIR}/pip list | grep 'aqtinstall\s*1.1.3' || [ $? -ne 0 ]
+		if [ $? -eq 0 ]; then
+			echo "  Installing aqt wheel into virtualenv..."
+			run_cmd "aqt-venv/${VENV_BIN_DIR}/pip" install aqtinstall==1.1.3
+		fi
+		popd > /dev/null
 
-			mkdir Qt
-			cd Qt
+		rm -rf Qt
 
-			run_cmd "${DEPS}/aqt-venv/${VENV_BIN_DIR}/aqt" install $qt_version windows desktop "win${BITS}_msvc${MSVC_REAL_YEAR}${SUFFIX}"
+		mkdir Qt
+		cd Qt
 
-			printf "  Cleaning up extraneous data... "
-			rm -rf Qt/{aqtinstall.log,Tools}
+		run_cmd "${DEPS}/aqt-venv/${VENV_BIN_DIR}/aqt" install $qt_version windows desktop "win${BITS}_msvc${MSVC_REAL_YEAR}${SUFFIX}"
 
-			echo Done.
-		fi
+		printf "  Cleaning up extraneous data... "
+		rm -rf Qt/{aqtinstall.log,Tools}
 
-		cd $QT_SDK
-		add_cmake_opts -DQT_QMAKE_EXECUTABLE="${QT_SDK}/bin/qmake.exe" \
-			-DCMAKE_PREFIX_PATH="$QT_SDK"
-		for CONFIGURATION in ${CONFIGURATIONS[@]}; do
-			if [ $CONFIGURATION == "Debug" ]; then
-				DLLSUFFIX="d"
-			else
-				DLLSUFFIX=""
-			fi
-			add_runtime_dlls $CONFIGURATION "$(pwd)/bin/Qt5"{Core,Gui,Network,OpenGL,Widgets}${DLLSUFFIX}.dll
-			add_qt_platform_dlls $CONFIGURATION "$(pwd)/plugins/platforms/qwindows${DLLSUFFIX}.dll"
-			add_qt_style_dlls $CONFIGURATION "$(pwd)/plugins/styles/qwindowsvistastyle${DLLSUFFIX}.dll"
-		done
-		echo Done.
-	else
-		# default to msvc2019 which pre-loads Qt 5.15.2
-		qt_version="5.15.2"
-		if [ "msvc${MSVC_REAL_YEAR}" == "msvc2017" ]; then
-			qt_version="5.13"
-    	fi
-		QT_SDK="C:/Qt/${qt_version}/msvc${MSVC_REAL_YEAR}${SUFFIX}"
-
-		add_cmake_opts -DQT_QMAKE_EXECUTABLE="${QT_SDK}/bin/qmake.exe" \
-			-DCMAKE_PREFIX_PATH="$QT_SDK"
-		for CONFIGURATION in ${CONFIGURATIONS[@]}; do
-			if [ $CONFIGURATION == "Debug" ]; then
-				DLLSUFFIX="d"
-			else
-				DLLSUFFIX=""
-			fi
-			DIR=$(windowsPathAsUnix "${QT_SDK}")
-			add_runtime_dlls $CONFIGURATION "${DIR}/bin/Qt5"{Core,Gui,Network,OpenGL,Widgets}${DLLSUFFIX}.dll
-			add_qt_platform_dlls $CONFIGURATION "${DIR}/plugins/platforms/qwindows${DLLSUFFIX}.dll"
-			add_qt_style_dlls $CONFIGURATION "${DIR}/plugins/styles/qwindowsvistastyle${DLLSUFFIX}.dll"
-		done
 		echo Done.
 	fi
+
+	cd $QT_SDK
+	add_cmake_opts -DQT_QMAKE_EXECUTABLE="${QT_SDK}/bin/qmake.exe" \
+		-DCMAKE_PREFIX_PATH="$QT_SDK"
+	for CONFIGURATION in ${CONFIGURATIONS[@]}; do
+		if [ $CONFIGURATION == "Debug" ]; then
+			DLLSUFFIX="d"
+		else
+			DLLSUFFIX=""
+		fi
+		add_runtime_dlls $CONFIGURATION "$(pwd)/bin/Qt5"{Core,Gui,Network,OpenGL,Widgets}${DLLSUFFIX}.dll
+		add_qt_platform_dlls $CONFIGURATION "$(pwd)/plugins/platforms/qwindows${DLLSUFFIX}.dll"
+		add_qt_style_dlls $CONFIGURATION "$(pwd)/plugins/styles/qwindowsvistastyle${DLLSUFFIX}.dll"
+	done
+	echo Done.
 }
 cd $DEPS
 echo
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9e69f1d11..d1bcfa832e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -690,7 +690,7 @@ if (WIN32)
 
     # Play a bit with the warning levels
 
-    set(WARNINGS /W4)
+    set(WARNINGS "/W4")
 
     set(WARNINGS_DISABLE
         4100 # Unreferenced formal parameter (-Wunused-parameter)
@@ -712,11 +712,11 @@ if (WIN32)
     endif()
 
     foreach(d ${WARNINGS_DISABLE})
-        list(APPEND WARNINGS /wd${d})
+        set(WARNINGS "${WARNINGS} /wd${d}")
     endforeach(d)
 
     if(OPENMW_MSVC_WERROR)
-        list(APPEND WARNINGS /WX)
+        set(WARNINGS "${WARNINGS} /WX")
     endif()
 
     set_target_properties(components PROPERTIES COMPILE_FLAGS "${WARNINGS}")
@@ -771,7 +771,8 @@ if (WIN32)
     endif()
 
     if (BUILD_BULLETOBJECTTOOL)
-        set_target_properties(openmw-bulletobjecttool PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}")
+        set(WARNINGS "${WARNINGS} ${MT_BUILD}")
+        set_target_properties(openmw-bulletobjecttool PROPERTIES COMPILE_FLAGS "${WARNINGS}")
     endif()
   endif(MSVC)
 
diff --git a/components/nifosg/controller.hpp b/components/nifosg/controller.hpp
index 14ad0b9ed0..c79c6a70d1 100644
--- a/components/nifosg/controller.hpp
+++ b/components/nifosg/controller.hpp
@@ -225,6 +225,14 @@ namespace NifOsg
         std::vector<FloatInterpolator> mKeyFrames;
     };
 
+#ifdef _MSC_VER
+#pragma warning( push )
+ /*
+  * Warning C4250: 'NifOsg::KeyframeController': inherits 'osg::Callback::osg::Callback::asCallback' via dominance,
+  * there is no way to solved this if an object must inherit from both osg::Object and osg::Callback
+  */
+#pragma warning( disable : 4250 )
+#endif
     class KeyframeController : public SceneUtil::KeyframeController, public SceneUtil::NodeCallback<KeyframeController, NifOsg::MatrixTransform*>
     {
     public:
@@ -253,6 +261,9 @@ namespace NifOsg
 
         osg::Quat getXYZRotation(float time) const;
     };
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif
 
     class UVController : public SceneUtil::StateSetUpdater, public SceneUtil::Controller
     {
diff --git a/components/sceneutil/osgacontroller.hpp b/components/sceneutil/osgacontroller.hpp
index 893b8b1ebe..e9ffe2676f 100644
--- a/components/sceneutil/osgacontroller.hpp
+++ b/components/sceneutil/osgacontroller.hpp
@@ -35,6 +35,14 @@ namespace SceneUtil
             Resource::Animation* mAnimation;
     };
 
+#ifdef _MSC_VER
+#pragma warning( push )
+/*
+ * Warning C4250: 'SceneUtil::OsgAnimationController': inherits 'osg::Callback::osg::Callback::asCallback' via dominance,
+ * there is no way to solved this if an object must inherit from both osg::Object and osg::Callback
+ */
+#pragma warning( disable : 4250 )
+#endif
     class OsgAnimationController : public SceneUtil::KeyframeController, public SceneUtil::NodeCallback<OsgAnimationController>
     {
     public:
@@ -68,6 +76,9 @@ namespace SceneUtil
         std::vector<osg::ref_ptr<Resource::Animation>> mMergedAnimationTracks; // Used only by osgAnimation-based formats (e.g. dae)
         std::vector<EmulatedAnimation> mEmulatedAnimations;
     };
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif
 }
 
 #endif

From 7a715a7d73b287e94e198c9228c9e9973ca1e5b0 Mon Sep 17 00:00:00 2001
From: Project579 <star579avatar@gmail.com>
Date: Sun, 17 Jul 2022 09:30:07 +0200
Subject: [PATCH 2818/2859] Revert "Re-enable Windows tests."

This reverts commit f8cec04ce74949bf2a86fec3e1bf2c0665419b26.
---
 .gitlab-ci.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 43fe22e8ea..9d816970ba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -439,7 +439,8 @@ macOS12_Xcode13:
     - .Windows_Ninja_Base
   variables:
     config: "RelWithDebInfo"
-    executables: "openmw_test_suite.exe,openmw_detournavigator_navmeshtilescache_benchmark.exe"
+    # 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:
@@ -477,7 +478,7 @@ macOS12_Xcode13:
     - $env:CCACHE_BASEDIR = Get-Location
     - $env:CCACHE_DIR = "$(Get-Location)\ccache"
     - New-Item -Type Directory -Force -Path $env:CCACHE_DIR
-    - sh CI/before_script.msvc.sh -c $config -p Win64 -v 2019 -k -V -b -t -C $multiview  -E
+    - sh CI/before_script.msvc.sh -c $config -p Win64 -v 2019 -k -V -b -t -C $multiview -E
     - cd MSVC2019_64
     - cmake --build . --config $config
     - ccache --show-stats
@@ -537,7 +538,8 @@ Windows_MSBuild_RelWithDebInfo:
     - .Windows_MSBuild_Base
   variables:
     config: "RelWithDebInfo"
-    executables: "openmw_test_suite.exe,openmw_detournavigator_navmeshtilescache_benchmark.exe"
+    # Gitlab can't successfully execute following binaries due to unknown reason
+    # executables: "openmw_test_suite.exe,openmw_detournavigator_navmeshtilescache_benchmark.exe"
   # temporarily enabled while we're linking these on the downloads page
   rules:
     # run this for both pushes and schedules so 'latest successful pipeline for branch' always includes it

From 6c8ed4d19c229d10879d6d22a8c0824ccb7ccaa7 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 16 Jul 2022 18:19:56 +0200
Subject: [PATCH 2819/2859] Move Files::IStreamPtr alias to a separate header

To avoid transitive include of Windows.h all over the engine.
---
 apps/openmw/mwsound/ffmpeg_decoder.hpp     |  2 +-
 components/bsa/bsa_file.cpp                |  7 +++++++
 components/bsa/bsa_file.hpp                |  8 ++------
 components/bsa/compressedbsafile.cpp       |  1 +
 components/esm/reader.hpp                  |  1 -
 components/esm4/reader.cpp                 | 11 +++++++++++
 components/esm4/reader.hpp                 | 13 +++++--------
 components/files/constrainedfilestream.hpp |  5 +----
 components/files/istreamptr.hpp            | 12 ++++++++++++
 components/nif/niffile.hpp                 |  3 ++-
 components/nif/nifstream.hpp               |  3 ++-
 components/vfs/archive.hpp                 |  2 +-
 components/vfs/bsaarchive.cpp              |  1 +
 components/vfs/filesystemarchive.cpp       |  1 +
 components/vfs/filesystemarchive.hpp       |  2 ++
 components/vfs/manager.cpp                 |  1 +
 components/vfs/manager.hpp                 |  3 ++-
 17 files changed, 52 insertions(+), 24 deletions(-)
 create mode 100644 components/files/istreamptr.hpp

diff --git a/apps/openmw/mwsound/ffmpeg_decoder.hpp b/apps/openmw/mwsound/ffmpeg_decoder.hpp
index 0af9a77d98..c51639a972 100644
--- a/apps/openmw/mwsound/ffmpeg_decoder.hpp
+++ b/apps/openmw/mwsound/ffmpeg_decoder.hpp
@@ -24,7 +24,7 @@ extern "C"
     #pragma warning (pop)
 #endif
 
-#include <components/files/constrainedfilestream.hpp>
+#include <components/files/istreamptr.hpp>
 
 #include <string>
 
diff --git a/components/bsa/bsa_file.cpp b/components/bsa/bsa_file.cpp
index 02c70d29cb..9fc6448c2b 100644
--- a/components/bsa/bsa_file.cpp
+++ b/components/bsa/bsa_file.cpp
@@ -23,6 +23,8 @@
 
 #include "bsa_file.hpp"
 
+#include <components/files/constrainedfilestream.hpp>
+
 #include <algorithm>
 #include <cassert>
 #include <cstring>
@@ -256,6 +258,11 @@ void Bsa::BSAFile::close()
     mIsLoaded = false;
 }
 
+Files::IStreamPtr Bsa::BSAFile::getFile(const FileStruct *file)
+{
+    return Files::openConstrainedFileStream(mFilename, file->offset, file->fileSize);
+}
+
 void Bsa::BSAFile::addFile(const std::string& filename, std::istream& file)
 {
     if (!mIsLoaded)
diff --git a/components/bsa/bsa_file.hpp b/components/bsa/bsa_file.hpp
index 66c8234bbd..f6af2e3269 100644
--- a/components/bsa/bsa_file.hpp
+++ b/components/bsa/bsa_file.hpp
@@ -28,8 +28,7 @@
 #include <string>
 #include <vector>
 
-#include <components/files/constrainedfilestream.hpp>
-
+#include <components/files/istreamptr.hpp>
 
 namespace Bsa
 {
@@ -123,10 +122,7 @@ public:
     /** Open a file contained in the archive.
      * @note Thread safe.
     */
-    Files::IStreamPtr getFile(const FileStruct *file)
-    {
-        return Files::openConstrainedFileStream(mFilename, file->offset, file->fileSize);
-    }
+    Files::IStreamPtr getFile(const FileStruct *file);
 
     void addFile(const std::string& filename, std::istream& file);
 
diff --git a/components/bsa/compressedbsafile.cpp b/components/bsa/compressedbsafile.cpp
index ee3a5a0a80..67e172e3db 100644
--- a/components/bsa/compressedbsafile.cpp
+++ b/components/bsa/compressedbsafile.cpp
@@ -47,6 +47,7 @@
 #include <boost/iostreams/device/array.hpp>
 #include <components/bsa/memorystream.hpp>
 #include <components/misc/stringops.hpp>
+#include <components/files/constrainedfilestream.hpp>
 
 namespace Bsa
 {
diff --git a/components/esm/reader.hpp b/components/esm/reader.hpp
index fc3845d87e..a1ddf35641 100644
--- a/components/esm/reader.hpp
+++ b/components/esm/reader.hpp
@@ -3,7 +3,6 @@
 
 #include <vector>
 
-#include <components/files/constrainedfilestream.hpp>
 #include <components/to_utf8/to_utf8.hpp>
 
 #include "common.hpp" // MasterData
diff --git a/components/esm4/reader.cpp b/components/esm4/reader.cpp
index 72421711af..3c0ac470c4 100644
--- a/components/esm4/reader.cpp
+++ b/components/esm4/reader.cpp
@@ -49,6 +49,7 @@
 
 #include <components/bsa/memorystream.hpp>
 #include <components/misc/stringops.hpp>
+#include <components/files/constrainedfilestream.hpp>
 
 #include "formid.hpp"
 
@@ -182,6 +183,16 @@ void Reader::open(Files::IStreamPtr&& stream, const std::string &filename)
     throw std::runtime_error("Unknown file format"); // can't yet use fail() as mCtx is not setup
 }
 
+void Reader::openRaw(const std::string& filename)
+{
+    openRaw(Files::openConstrainedFileStream(filename), filename);
+}
+
+void Reader::open(const std::string& filename)
+{
+    open(Files::openConstrainedFileStream(filename), filename);
+}
+
 void Reader::setRecHeaderSize(const std::size_t size)
 {
     mCtx.recHeaderSize = size;
diff --git a/components/esm4/reader.hpp b/components/esm4/reader.hpp
index aaebeb335a..d4979d034a 100644
--- a/components/esm4/reader.hpp
+++ b/components/esm4/reader.hpp
@@ -26,11 +26,14 @@
 #include <map>
 #include <cstddef>
 #include <memory>
+#include <istream>
 
 #include "common.hpp"
 #include "loadtes4.hpp"
 #include "../esm/reader.hpp"
 
+#include <components/files/istreamptr.hpp>
+
 namespace ESM4 {
     //                                                   bytes read from group, updated by
     //                                                   getRecordHeader() in advance
@@ -129,15 +132,9 @@ namespace ESM4 {
         ~Reader();
 
         // FIXME: should be private but ESMTool uses it
-        void openRaw(const std::string& filename)
-        {
-            openRaw(Files::openConstrainedFileStream(filename), filename);
-        }
+        void openRaw(const std::string& filename);
 
-        void open(const std::string& filename)
-        {
-            open(Files::openConstrainedFileStream(filename), filename);
-        }
+        void open(const std::string& filename);
 
         void close() final;
 
diff --git a/components/files/constrainedfilestream.hpp b/components/files/constrainedfilestream.hpp
index c32c719f22..f00bd3a488 100644
--- a/components/files/constrainedfilestream.hpp
+++ b/components/files/constrainedfilestream.hpp
@@ -3,9 +3,8 @@
 
 #include "constrainedfilestreambuf.hpp"
 #include "streamwithbuffer.hpp"
+#include "istreamptr.hpp"
 
-#include <iosfwd>
-#include <memory>
 #include <limits>
 #include <string>
 
@@ -15,8 +14,6 @@ namespace Files
 /// A file stream constrained to a specific region in the file, specified by the 'start' and 'length' parameters.
 using ConstrainedFileStream = StreamWithBuffer<ConstrainedFileStreamBuf>;
 
-typedef std::unique_ptr<std::istream> IStreamPtr;
-
 IStreamPtr openConstrainedFileStream(const std::string& filename, std::size_t start = 0,
     std::size_t length = std::numeric_limits<std::size_t>::max());
 
diff --git a/components/files/istreamptr.hpp b/components/files/istreamptr.hpp
new file mode 100644
index 0000000000..6dee8b7a60
--- /dev/null
+++ b/components/files/istreamptr.hpp
@@ -0,0 +1,12 @@
+#ifndef OPENMW_COMPONENTS_FILES_ISTREAMPTR_H
+#define OPENMW_COMPONENTS_FILES_ISTREAMPTR_H
+
+#include <iosfwd>
+#include <memory>
+
+namespace Files
+{
+    using IStreamPtr = std::unique_ptr<std::istream>;
+}
+
+#endif
diff --git a/components/nif/niffile.hpp b/components/nif/niffile.hpp
index aa53f516fd..358428e94c 100644
--- a/components/nif/niffile.hpp
+++ b/components/nif/niffile.hpp
@@ -6,9 +6,10 @@
 #include <stdexcept>
 #include <vector>
 #include <atomic>
+#include <limits>
 
 #include <components/debug/debuglog.hpp>
-#include <components/files/constrainedfilestream.hpp>
+#include <components/files/istreamptr.hpp>
 
 #include "record.hpp"
 
diff --git a/components/nif/nifstream.hpp b/components/nif/nifstream.hpp
index 04583131b9..acf1dd4704 100644
--- a/components/nif/nifstream.hpp
+++ b/components/nif/nifstream.hpp
@@ -9,8 +9,9 @@
 #include <vector>
 #include <typeinfo>
 #include <type_traits>
+#include <istream>
 
-#include <components/files/constrainedfilestream.hpp>
+#include <components/files/istreamptr.hpp>
 #include <components/misc/endianness.hpp>
 
 #include <osg/Vec3f>
diff --git a/components/vfs/archive.hpp b/components/vfs/archive.hpp
index faefe30dfe..22df09e06c 100644
--- a/components/vfs/archive.hpp
+++ b/components/vfs/archive.hpp
@@ -3,7 +3,7 @@
 
 #include <map>
 
-#include <components/files/constrainedfilestream.hpp>
+#include <components/files/istreamptr.hpp>
 
 namespace VFS
 {
diff --git a/components/vfs/bsaarchive.cpp b/components/vfs/bsaarchive.cpp
index d4d1a5a38b..c0db4c071c 100644
--- a/components/vfs/bsaarchive.cpp
+++ b/components/vfs/bsaarchive.cpp
@@ -2,6 +2,7 @@
 
 #include <memory>
 #include <algorithm>
+#include <istream>
 
 namespace VFS
 {
diff --git a/components/vfs/filesystemarchive.cpp b/components/vfs/filesystemarchive.cpp
index 8b74fb788a..7b57c93944 100644
--- a/components/vfs/filesystemarchive.cpp
+++ b/components/vfs/filesystemarchive.cpp
@@ -5,6 +5,7 @@
 #include <filesystem>
 
 #include <components/debug/debuglog.hpp>
+#include <components/files/constrainedfilestream.hpp>
 
 namespace VFS
 {
diff --git a/components/vfs/filesystemarchive.hpp b/components/vfs/filesystemarchive.hpp
index fa9b50edc5..2c50e5300b 100644
--- a/components/vfs/filesystemarchive.hpp
+++ b/components/vfs/filesystemarchive.hpp
@@ -3,6 +3,8 @@
 
 #include "archive.hpp"
 
+#include <string>
+
 namespace VFS
 {
 
diff --git a/components/vfs/manager.cpp b/components/vfs/manager.cpp
index bd7418d4b5..4a3ff94cc1 100644
--- a/components/vfs/manager.cpp
+++ b/components/vfs/manager.cpp
@@ -1,6 +1,7 @@
 #include "manager.hpp"
 
 #include <stdexcept>
+#include <istream>
 
 #include <components/misc/stringops.hpp>
 
diff --git a/components/vfs/manager.hpp b/components/vfs/manager.hpp
index bb1ee6ad39..93023f565f 100644
--- a/components/vfs/manager.hpp
+++ b/components/vfs/manager.hpp
@@ -1,11 +1,12 @@
 #ifndef OPENMW_COMPONENTS_RESOURCEMANAGER_H
 #define OPENMW_COMPONENTS_RESOURCEMANAGER_H
 
-#include <components/files/constrainedfilestream.hpp>
+#include <components/files/istreamptr.hpp>
 
 #include <vector>
 #include <map>
 #include <memory>
+#include <string>
 
 namespace VFS
 {

From 38ee6d285d5ce80a9273bda4b0e739f375d3fb90 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 17 Jul 2022 12:19:19 +0200
Subject: [PATCH 2820/2859] Use std::string_view in VFS::Manager

---
 components/vfs/manager.cpp | 22 +++++++++++-----------
 components/vfs/manager.hpp | 12 ++++++------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/components/vfs/manager.cpp b/components/vfs/manager.cpp
index bd7418d4b5..143f765616 100644
--- a/components/vfs/manager.cpp
+++ b/components/vfs/manager.cpp
@@ -57,9 +57,9 @@ namespace VFS
             archive->listResources(mIndex, mStrict ? &strict_normalize_char : &nonstrict_normalize_char);
     }
 
-    Files::IStreamPtr Manager::get(const std::string &name) const
+    Files::IStreamPtr Manager::get(std::string_view name) const
     {
-        std::string normalized = name;
+        std::string normalized(name);
         normalize_path(normalized, mStrict);
 
         return getNormalized(normalized);
@@ -73,24 +73,24 @@ namespace VFS
         return found->second->open();
     }
 
-    bool Manager::exists(const std::string &name) const
+    bool Manager::exists(std::string_view name) const
     {
-        std::string normalized = name;
+        std::string normalized(name);
         normalize_path(normalized, mStrict);
 
         return mIndex.find(normalized) != mIndex.end();
     }
 
-    std::string Manager::normalizeFilename(const std::string& name) const
+    std::string Manager::normalizeFilename(std::string_view name) const
     {
-        std::string result = name;
+        std::string result(name);
         normalize_path(result, mStrict);
         return result;
     }
 
-    std::string Manager::getArchive(const std::string& name) const
+    std::string Manager::getArchive(std::string_view name) const
     {
-        std::string normalized = name;
+        std::string normalized(name);
         normalize_path(normalized, mStrict);
         for(auto it = mArchives.rbegin(); it != mArchives.rend(); ++it)
         {
@@ -100,9 +100,9 @@ namespace VFS
         return {};
     }
 
-    std::string Manager::getAbsoluteFileName(const std::string& name) const
+    std::string Manager::getAbsoluteFileName(std::string_view name) const
     {
-        std::string normalized = name;
+        std::string normalized(name);
         normalize_path(normalized, mStrict);
 
         std::map<std::string, File*>::const_iterator found = mIndex.find(normalized);
@@ -119,7 +119,7 @@ namespace VFS
         }
     }
 
-    Manager::RecursiveDirectoryRange Manager::getRecursiveDirectoryIterator(const std::string& path) const
+    Manager::RecursiveDirectoryRange Manager::getRecursiveDirectoryIterator(std::string_view path) const
     {
         if (path.empty())
             return { mIndex.begin(), mIndex.end() };
diff --git a/components/vfs/manager.hpp b/components/vfs/manager.hpp
index bb1ee6ad39..501b6d7e13 100644
--- a/components/vfs/manager.hpp
+++ b/components/vfs/manager.hpp
@@ -66,34 +66,34 @@ namespace VFS
 
         /// Does a file with this name exist?
         /// @note May be called from any thread once the index has been built.
-        bool exists(const std::string& name) const;
+        bool exists(std::string_view name) const;
 
         /// Normalize the given filename, making slashes/backslashes consistent, and lower-casing if mStrict is false.
         /// @note May be called from any thread once the index has been built.
-        [[nodiscard]] std::string normalizeFilename(const std::string& name) const;
+        [[nodiscard]] std::string normalizeFilename(std::string_view name) const;
 
         /// Retrieve a file by name.
         /// @note Throws an exception if the file can not be found.
         /// @note May be called from any thread once the index has been built.
-        Files::IStreamPtr get(const std::string& name) const;
+        Files::IStreamPtr get(std::string_view name) const;
 
         /// Retrieve a file by name (name is already normalized).
         /// @note Throws an exception if the file can not be found.
         /// @note May be called from any thread once the index has been built.
         Files::IStreamPtr getNormalized(const std::string& normalizedName) const;
 
-        std::string getArchive(const std::string& name) const;
+        std::string getArchive(std::string_view name) const;
 
         /// Recursivly iterate over the elements of the given path
         /// In practice it return all files of the VFS starting with the given path
         /// @note the path is normalized
         /// @note May be called from any thread once the index has been built.
-        RecursiveDirectoryRange getRecursiveDirectoryIterator(const std::string& path) const;
+        RecursiveDirectoryRange getRecursiveDirectoryIterator(std::string_view path) const;
 
         /// Retrieve the absolute path to the file
         /// @note Throws an exception if the file can not be found.
         /// @note May be called from any thread once the index has been built.
-        std::string getAbsoluteFileName(const std::string& name) const;
+        std::string getAbsoluteFileName(std::string_view name) const;
 
     private:
         bool mStrict;

From e4f599575ececfe6c84f5bdf0ba2412405898c13 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 17 Jul 2022 12:12:17 +0200
Subject: [PATCH 2821/2859] Use unique_ptr to manage Bone lifetime

---
 components/sceneutil/skeleton.cpp | 16 +++++-----------
 components/sceneutil/skeleton.hpp |  7 +------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/components/sceneutil/skeleton.cpp b/components/sceneutil/skeleton.cpp
index 9f646ade5c..45ccefe6e5 100644
--- a/components/sceneutil/skeleton.cpp
+++ b/components/sceneutil/skeleton.cpp
@@ -80,15 +80,16 @@ Bone* Skeleton::getBone(const std::string &name)
         {
             if (bone->mChildren[i]->mNode == matrixTransform)
             {
-                child = bone->mChildren[i];
+                child = bone->mChildren[i].get();
                 break;
             }
         }
 
-        if (!child)
+        if (child == nullptr)
         {
-            child = new Bone;
-            bone->mChildren.push_back(child);
+            auto childBone = std::make_unique<Bone>();
+            child = childBone.get();
+            bone->mChildren.push_back(std::move(childBone));
             mNeedToUpdateBoneMatrices = true;
         }
         bone = child;
@@ -165,13 +166,6 @@ Bone::Bone()
 {
 }
 
-Bone::~Bone()
-{
-    for (unsigned int i=0; i<mChildren.size(); ++i)
-        delete mChildren[i];
-    mChildren.clear();
-}
-
 void Bone::update(const osg::Matrixf* parentMatrixInSkeletonSpace)
 {
     if (!mNode)
diff --git a/components/sceneutil/skeleton.hpp b/components/sceneutil/skeleton.hpp
index 10f4640249..7ca4887999 100644
--- a/components/sceneutil/skeleton.hpp
+++ b/components/sceneutil/skeleton.hpp
@@ -15,20 +15,15 @@ namespace SceneUtil
     {
     public:
         Bone();
-        ~Bone();
 
         osg::Matrixf mMatrixInSkeletonSpace;
 
         osg::MatrixTransform* mNode;
 
-        std::vector<Bone*> mChildren;
+        std::vector<std::unique_ptr<Bone>> mChildren;
 
         /// Update the skeleton-space matrix of this bone and all its children.
         void update(const osg::Matrixf* parentMatrixInSkeletonSpace);
-
-    private:
-        Bone(const Bone&);
-        void operator=(const Bone&);
     };
 
     /// @brief Handles the bone matrices for any number of child RigGeometries.

From 0e12d331f9ce4ac7b64a6f8017b9c13da2d35151 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 17 Jul 2022 13:52:24 +0200
Subject: [PATCH 2822/2859] Simplify iteration over Bone::mChildren

---
 components/sceneutil/skeleton.cpp | 32 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/components/sceneutil/skeleton.cpp b/components/sceneutil/skeleton.cpp
index 45ccefe6e5..5c8449a50d 100644
--- a/components/sceneutil/skeleton.cpp
+++ b/components/sceneutil/skeleton.cpp
@@ -5,6 +5,8 @@
 #include <components/debug/debuglog.hpp>
 #include <components/misc/stringops.hpp>
 
+#include <algorithm>
+
 namespace SceneUtil
 {
 
@@ -75,24 +77,16 @@ Bone* Skeleton::getBone(const std::string &name)
     Bone* bone = mRootBone.get();
     for (osg::MatrixTransform* matrixTransform : found->second)
     {
-        Bone* child = nullptr;
-        for (unsigned int i=0; i<bone->mChildren.size(); ++i)
-        {
-            if (bone->mChildren[i]->mNode == matrixTransform)
-            {
-                child = bone->mChildren[i].get();
-                break;
-            }
-        }
+        const auto it = std::find_if(bone->mChildren.begin(), bone->mChildren.end(),
+                                     [&] (const auto& v) { return v->mNode == matrixTransform; });
 
-        if (child == nullptr)
+        if (it == bone->mChildren.end())
         {
-            auto childBone = std::make_unique<Bone>();
-            child = childBone.get();
-            bone->mChildren.push_back(std::move(childBone));
+            bone = bone->mChildren.emplace_back(std::make_unique<Bone>()).get();
             mNeedToUpdateBoneMatrices = true;
         }
-        bone = child;
+        else
+            bone = it->get();
 
         bone->mNode = matrixTransform;
     }
@@ -111,8 +105,8 @@ void Skeleton::updateBoneMatrices(unsigned int traversalNumber)
     {
         if (mRootBone.get())
         {
-            for (unsigned int i=0; i<mRootBone->mChildren.size(); ++i)
-                mRootBone->mChildren[i]->update(nullptr);
+            for (const auto& child : mRootBone->mChildren)
+                child->update(nullptr);
         }
 
         mNeedToUpdateBoneMatrices = false;
@@ -178,10 +172,8 @@ void Bone::update(const osg::Matrixf* parentMatrixInSkeletonSpace)
     else
         mMatrixInSkeletonSpace = mNode->getMatrix();
 
-    for (unsigned int i=0; i<mChildren.size(); ++i)
-    {
-        mChildren[i]->update(&mMatrixInSkeletonSpace);
-    }
+    for (const auto& child : mChildren)
+        child->update(&mMatrixInSkeletonSpace);
 }
 
 }

From c040da36de6ca1ac528eb129e4bc0010d0f90153 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 16 Jul 2022 19:22:54 +0200
Subject: [PATCH 2823/2859] Use std::unique_ptr to manage lifetime for
 InputManager members

---
 apps/openmw/mwinput/inputmanagerimp.cpp | 51 +++++++------------------
 apps/openmw/mwinput/inputmanagerimp.hpp | 26 ++++++-------
 2 files changed, 27 insertions(+), 50 deletions(-)

diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index 3e504acbe5..abc66de70d 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -31,29 +31,21 @@ namespace MWInput
             const std::string& userFile, bool userFileExists, const std::string& userControllerBindingsFile,
             const std::string& controllerBindingsFile, bool grab)
         : mControlsDisabled(false)
+        , mInputWrapper(std::make_unique<SDLUtil::InputWrapper>(window, viewer, grab))
+        , mBindingsManager(std::make_unique<BindingsManager>(userFile, userFileExists))
+        , mControlSwitch(std::make_unique<ControlSwitch>())
+        , mActionManager(std::make_unique<ActionManager>(mBindingsManager.get(), screenCaptureOperation, viewer, screenCaptureHandler))
+        , mKeyboardManager(std::make_unique<KeyboardManager>(mBindingsManager.get()))
+        , mMouseManager(std::make_unique<MouseManager>(mBindingsManager.get(), mInputWrapper.get(), window))
+        , mControllerManager(std::make_unique<ControllerManager>(mBindingsManager.get(), mActionManager.get(), mMouseManager.get(), userControllerBindingsFile, controllerBindingsFile))
+        , mSensorManager(std::make_unique<SensorManager>())
+        , mGyroManager(std::make_unique<GyroManager>())
     {
-        mInputWrapper = new SDLUtil::InputWrapper(window, viewer, grab);
         mInputWrapper->setWindowEventCallback(MWBase::Environment::get().getWindowManager());
-
-        mBindingsManager = new BindingsManager(userFile, userFileExists);
-
-        mControlSwitch = new ControlSwitch();
-
-        mActionManager = new ActionManager(mBindingsManager, screenCaptureOperation, viewer, screenCaptureHandler);
-
-        mKeyboardManager = new KeyboardManager(mBindingsManager);
-        mInputWrapper->setKeyboardEventCallback(mKeyboardManager);
-
-        mMouseManager = new MouseManager(mBindingsManager, mInputWrapper, window);
-        mInputWrapper->setMouseEventCallback(mMouseManager);
-
-        mControllerManager = new ControllerManager(mBindingsManager, mActionManager, mMouseManager, userControllerBindingsFile, controllerBindingsFile);
-        mInputWrapper->setControllerEventCallback(mControllerManager);
-
-        mSensorManager = new SensorManager();
-        mInputWrapper->setSensorEventCallback(mSensorManager);
-
-        mGyroManager = new GyroManager();
+        mInputWrapper->setKeyboardEventCallback(mKeyboardManager.get());
+        mInputWrapper->setMouseEventCallback(mMouseManager.get());
+        mInputWrapper->setControllerEventCallback(mControllerManager.get());
+        mInputWrapper->setSensorEventCallback(mSensorManager.get());
     }
 
     void InputManager::clear()
@@ -62,22 +54,7 @@ namespace MWInput
         mControlSwitch->clear();
     }
 
-    InputManager::~InputManager()
-    {
-        delete mActionManager;
-        delete mControllerManager;
-        delete mKeyboardManager;
-        delete mMouseManager;
-        delete mSensorManager;
-
-        delete mControlSwitch;
-
-        delete mBindingsManager;
-
-        delete mInputWrapper;
-
-        delete mGyroManager;
-    }
+    InputManager::~InputManager() {}
 
     void InputManager::setAttemptJump(bool jumping)
     {
diff --git a/apps/openmw/mwinput/inputmanagerimp.hpp b/apps/openmw/mwinput/inputmanagerimp.hpp
index cf222d3e46..7b3029e11a 100644
--- a/apps/openmw/mwinput/inputmanagerimp.hpp
+++ b/apps/openmw/mwinput/inputmanagerimp.hpp
@@ -1,6 +1,8 @@
 #ifndef MWINPUT_MWINPUTMANAGERIMP_H
 #define MWINPUT_MWINPUTMANAGERIMP_H
 
+#include <memory>
+
 #include <osg/ref_ptr>
 #include <osgViewer/ViewerEventHandlers>
 
@@ -44,7 +46,7 @@ namespace MWInput
     /**
     * @brief Class that provides a high-level API for game input
     */
-    class InputManager : public MWBase::InputManager
+    class InputManager final : public MWBase::InputManager
     {
     public:
         InputManager(
@@ -56,7 +58,7 @@ namespace MWInput
             const std::string& userControllerBindingsFile,
             const std::string& controllerBindingsFile, bool grab);
 
-        virtual ~InputManager();
+        ~InputManager() final;
 
         /// Clear all savegame-specific data
         void clear() override;
@@ -117,19 +119,17 @@ namespace MWInput
         void loadKeyDefaults(bool force = false);
         void loadControllerDefaults(bool force = false);
 
-        SDLUtil::InputWrapper* mInputWrapper;
-
         bool mControlsDisabled;
 
-        ControlSwitch* mControlSwitch;
-
-        ActionManager* mActionManager;
-        BindingsManager* mBindingsManager;
-        ControllerManager* mControllerManager;
-        KeyboardManager* mKeyboardManager;
-        MouseManager* mMouseManager;
-        SensorManager* mSensorManager;
-        GyroManager* mGyroManager;
+        std::unique_ptr<SDLUtil::InputWrapper> mInputWrapper;
+        std::unique_ptr<BindingsManager> mBindingsManager;
+        std::unique_ptr<ControlSwitch> mControlSwitch;
+        std::unique_ptr<ActionManager> mActionManager;
+        std::unique_ptr<KeyboardManager> mKeyboardManager;
+        std::unique_ptr<MouseManager> mMouseManager;
+        std::unique_ptr<ControllerManager> mControllerManager;
+        std::unique_ptr<SensorManager> mSensorManager;
+        std::unique_ptr<GyroManager> mGyroManager;
     };
 }
 #endif

From 03302a8f5bf23c46c1d1d4c14636f539814f3b5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <3397065-ZehMatt@users.noreply.gitlab.com>
Date: Sun, 17 Jul 2022 18:40:27 +0300
Subject: [PATCH 2824/2859] Conditionally build cpp for platform, remove
 obsolete header

---
 components/CMakeLists.txt                 | 17 ++++++++++++++---
 components/platform/file.posix.cpp        |  5 -----
 components/platform/file.stdio.cpp        |  5 -----
 components/platform/file.win32.cpp        |  5 -----
 components/platform/platform.internal.hpp | 19 -------------------
 5 files changed, 14 insertions(+), 37 deletions(-)
 delete mode 100644 components/platform/platform.internal.hpp

diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 39c20ab127..e67ae36a32 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -337,12 +337,23 @@ add_component_dir(navmeshtool
 
 add_component_dir(platform
     platform
-    file.posix
-    file.win32
-    file.stdio
     file
     )
 
+if (WIN32)
+    add_component_dir(platform
+        file.win32
+        )
+elseif (UNIX)
+    add_component_dir(platform
+        file.posix
+        )
+else ()
+    add_component_dir(platform
+        file.stdio
+        )
+endif()
+
 set (ESM_UI ${CMAKE_SOURCE_DIR}/files/ui/contentselector.ui
     )
 
diff --git a/components/platform/file.posix.cpp b/components/platform/file.posix.cpp
index dd50083e7a..efffa0fd76 100644
--- a/components/platform/file.posix.cpp
+++ b/components/platform/file.posix.cpp
@@ -1,8 +1,5 @@
-#include "platform.internal.hpp"
 #include "file.hpp"
 
-#if PLATFORM_TYPE == PLATFORM_TYPE_POSIX
-
 #include <sys/types.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -100,5 +97,3 @@ namespace Platform::File {
     }
 
 }
-
-#endif
diff --git a/components/platform/file.stdio.cpp b/components/platform/file.stdio.cpp
index ed17bd2040..26c2480902 100644
--- a/components/platform/file.stdio.cpp
+++ b/components/platform/file.stdio.cpp
@@ -1,8 +1,5 @@
-#include "platform.internal.hpp"
 #include "file.hpp"
 
-#if PLATFORM_TYPE == PLATFORM_TYPE_STDIO
-
 #include <errno.h>
 #include <string.h>
 #include <string>
@@ -89,5 +86,3 @@ namespace Platform::File {
     }
 
 }
-
-#endif
diff --git a/components/platform/file.win32.cpp b/components/platform/file.win32.cpp
index 31fe67ecba..ad7e11213d 100644
--- a/components/platform/file.win32.cpp
+++ b/components/platform/file.win32.cpp
@@ -1,8 +1,5 @@
-#include "platform.internal.hpp"
 #include "file.hpp"
 
-#if PLATFORM_TYPE == PLATFORM_TYPE_WIN32
-
 #include <components/windows.hpp>
 #include <string>
 #include <stdexcept>
@@ -97,5 +94,3 @@ namespace Platform::File {
         return bytesRead;
     }
 }
-
-#endif
diff --git a/components/platform/platform.internal.hpp b/components/platform/platform.internal.hpp
deleted file mode 100644
index 255fe7cb7a..0000000000
--- a/components/platform/platform.internal.hpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef COMPONENT_PLATFORM_FILE_HPP
-#define COMPONENT_PLATFORM_FILE_HPP
-
-namespace Platform
-{
-#define PLATFORM_TYPE_STDIO 0
-#define PLATFORM_TYPE_WIN32 1
-#define PLATFORM_TYPE_POSIX 2
-    
-#if defined(__linux) || defined(__unix) || defined(__posix)
-#define PLATFORM_TYPE PLATFORM_TYPE_POSIX
-#elif defined(_WIN32)
-#define PLATFORM_TYPE PLATFORM_TYPE_WIN32
-#else
-#define PLATFORM_TYPE PLATFORM_TYPE_STDIO
-#endif
-}
-
-#endif 

From 841fd9618fb973deb97db742e43d8252e70ab870 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <3397065-ZehMatt@users.noreply.gitlab.com>
Date: Sun, 17 Jul 2022 19:36:48 +0300
Subject: [PATCH 2825/2859] Rename DrawState_ to DrawState and use enum class

---
 apps/openmw/mwclass/creature.cpp                |  2 +-
 apps/openmw/mwclass/npc.cpp                     |  2 +-
 apps/openmw/mwgui/quickkeysmenu.cpp             |  8 ++++----
 apps/openmw/mwgui/windowmanagerimp.cpp          |  4 ++--
 apps/openmw/mwinput/actionmanager.cpp           | 16 ++++++++--------
 apps/openmw/mwinput/bindingsmanager.cpp         |  4 ++--
 apps/openmw/mwlua/types/actor.cpp               |  8 ++++----
 apps/openmw/mwmechanics/aiactivate.cpp          |  2 +-
 apps/openmw/mwmechanics/aicombataction.cpp      |  8 ++++----
 apps/openmw/mwmechanics/aiescort.cpp            |  2 +-
 apps/openmw/mwmechanics/aifollow.cpp            |  2 +-
 apps/openmw/mwmechanics/aipursue.cpp            |  2 +-
 apps/openmw/mwmechanics/aitravel.cpp            |  2 +-
 apps/openmw/mwmechanics/aiwander.cpp            |  2 +-
 apps/openmw/mwmechanics/character.cpp           | 10 +++++-----
 apps/openmw/mwmechanics/creaturestats.cpp       | 10 +++++-----
 apps/openmw/mwmechanics/creaturestats.hpp       |  6 +++---
 apps/openmw/mwmechanics/drawstate.hpp           | 10 +++++-----
 apps/openmw/mwmechanics/mechanicsmanagerimp.cpp |  6 +++---
 apps/openmw/mwmechanics/spelleffects.cpp        |  2 +-
 apps/openmw/mwmechanics/spellpriority.cpp       |  6 +++---
 apps/openmw/mwmechanics/weapontype.cpp          |  4 ++--
 apps/openmw/mwrender/actoranimation.cpp         |  2 +-
 apps/openmw/mwscript/miscextensions.cpp         |  4 ++--
 apps/openmw/mwworld/player.cpp                  |  4 ++--
 apps/openmw/mwworld/player.hpp                  |  4 ++--
 apps/openmw/mwworld/worldimp.cpp                |  2 +-
 27 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index c26b92993c..c71e277c15 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -234,7 +234,7 @@ namespace MWClass
         const MWWorld::Store<ESM::GameSetting> &gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
         MWMechanics::CreatureStats &stats = getCreatureStats(ptr);
 
-        if (stats.getDrawState() != MWMechanics::DrawState_Weapon)
+        if (stats.getDrawState() != MWMechanics::DrawState::Weapon)
             return;
 
         // Get the weapon used (if hand-to-hand, weapon = inv.end())
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index fc4f655246..2c98b4dd3c 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -995,7 +995,7 @@ namespace MWClass
         else
             moveSpeed = getWalkSpeed(ptr);
 
-        if(stats.isWerewolf() && running && stats.getDrawState() == MWMechanics::DrawState_Nothing)
+        if(stats.isWerewolf() && running && stats.getDrawState() == MWMechanics::DrawState::Nothing)
             moveSpeed *= gmst.fWereWolfRunMult->mValue.getFloat();
 
         return moveSpeed;
diff --git a/apps/openmw/mwgui/quickkeysmenu.cpp b/apps/openmw/mwgui/quickkeysmenu.cpp
index 793c232e2e..aeadc88177 100644
--- a/apps/openmw/mwgui/quickkeysmenu.cpp
+++ b/apps/openmw/mwgui/quickkeysmenu.cpp
@@ -416,7 +416,7 @@ namespace MWGui
                 // change draw state only if the item is in player's right hand
                 if (rightHand != store.end() && item == *rightHand)
                 {
-                    MWBase::Environment::get().getWorld()->getPlayer().setDrawState(MWMechanics::DrawState_Weapon);
+                    MWBase::Environment::get().getWorld()->getPlayer().setDrawState(MWMechanics::DrawState::Weapon);
                 }
             }
             else if (key->type == Type_MagicItem)
@@ -432,7 +432,7 @@ namespace MWGui
                 }
 
                 store.setSelectedEnchantItem(it);
-                MWBase::Environment::get().getWorld()->getPlayer().setDrawState(MWMechanics::DrawState_Spell);
+                MWBase::Environment::get().getWorld()->getPlayer().setDrawState(MWMechanics::DrawState::Spell);
             }
         }
         else if (key->type == Type_Magic)
@@ -452,12 +452,12 @@ namespace MWGui
             store.setSelectedEnchantItem(store.end());
             MWBase::Environment::get().getWindowManager()
                 ->setSelectedSpell(spellId, int(MWMechanics::getSpellSuccessChance(spellId, player)));
-            MWBase::Environment::get().getWorld()->getPlayer().setDrawState(MWMechanics::DrawState_Spell);
+            MWBase::Environment::get().getWorld()->getPlayer().setDrawState(MWMechanics::DrawState::Spell);
         }
         else if (key->type == Type_HandToHand)
         {
             store.unequipSlot(MWWorld::InventoryStore::Slot_CarriedRight, player);
-            MWBase::Environment::get().getWorld()->getPlayer().setDrawState(MWMechanics::DrawState_Weapon);
+            MWBase::Environment::get().getWorld()->getPlayer().setDrawState(MWMechanics::DrawState::Weapon);
         }
     }
 
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 5442b22df2..6076b416ae 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -1376,8 +1376,8 @@ namespace MWGui
         mHud->unsetSelectedSpell();
 
         MWWorld::Player* player = &MWBase::Environment::get().getWorld()->getPlayer();
-        if (player->getDrawState() == MWMechanics::DrawState_Spell)
-            player->setDrawState(MWMechanics::DrawState_Nothing);
+        if (player->getDrawState() == MWMechanics::DrawState::Spell)
+            player->setDrawState(MWMechanics::DrawState::Nothing);
 
         mSpellWindow->setTitle("#{sNone}");
     }
diff --git a/apps/openmw/mwinput/actionmanager.cpp b/apps/openmw/mwinput/actionmanager.cpp
index 6b5a100722..4674ead688 100644
--- a/apps/openmw/mwinput/actionmanager.cpp
+++ b/apps/openmw/mwinput/actionmanager.cpp
@@ -355,11 +355,11 @@ namespace MWInput
         if (MWBase::Environment::get().getMechanicsManager()->isAttackingOrSpell(player.getPlayer()))
             return;
 
-        MWMechanics::DrawState_ state = player.getDrawState();
-        if (state == MWMechanics::DrawState_Weapon || state == MWMechanics::DrawState_Nothing)
-            player.setDrawState(MWMechanics::DrawState_Spell);
+        MWMechanics::DrawState state = player.getDrawState();
+        if (state == MWMechanics::DrawState::Weapon || state == MWMechanics::DrawState::Nothing)
+            player.setDrawState(MWMechanics::DrawState::Spell);
         else
-            player.setDrawState(MWMechanics::DrawState_Nothing);
+            player.setDrawState(MWMechanics::DrawState::Nothing);
     }
 
     void ActionManager::quickLoad()
@@ -390,11 +390,11 @@ namespace MWInput
         else if (MWBase::Environment::get().getMechanicsManager()->isAttackingOrSpell(player.getPlayer()))
             return;
 
-        MWMechanics::DrawState_ state = player.getDrawState();
-        if (state == MWMechanics::DrawState_Spell || state == MWMechanics::DrawState_Nothing)
-            player.setDrawState(MWMechanics::DrawState_Weapon);
+        MWMechanics::DrawState state = player.getDrawState();
+        if (state == MWMechanics::DrawState::Spell || state == MWMechanics::DrawState::Nothing)
+            player.setDrawState(MWMechanics::DrawState::Weapon);
         else
-            player.setDrawState(MWMechanics::DrawState_Nothing);
+            player.setDrawState(MWMechanics::DrawState::Nothing);
     }
 
     void ActionManager::rest()
diff --git a/apps/openmw/mwinput/bindingsmanager.cpp b/apps/openmw/mwinput/bindingsmanager.cpp
index 4225a8c5d6..b3e3590125 100644
--- a/apps/openmw/mwinput/bindingsmanager.cpp
+++ b/apps/openmw/mwinput/bindingsmanager.cpp
@@ -709,8 +709,8 @@ namespace MWInput
                 else
                 {
                     MWWorld::Player& player = MWBase::Environment::get().getWorld()->getPlayer();
-                    MWMechanics::DrawState_ state = player.getDrawState();
-                    player.setAttackingOrSpell(currentValue != 0 && state != MWMechanics::DrawState_Nothing);
+                    MWMechanics::DrawState state = player.getDrawState();
+                    player.setAttackingOrSpell(currentValue != 0 && state != MWMechanics::DrawState::Nothing);
                 }
             }
             else if (action == A_Jump)
diff --git a/apps/openmw/mwlua/types/actor.cpp b/apps/openmw/mwlua/types/actor.cpp
index 0e89b22052..464d85c76c 100644
--- a/apps/openmw/mwlua/types/actor.cpp
+++ b/apps/openmw/mwlua/types/actor.cpp
@@ -114,10 +114,10 @@ namespace MWLua
 
     void addActorBindings(sol::table actor, const Context& context)
     {
-        actor["STANCE"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, int>({
-            {"Nothing", MWMechanics::DrawState_Nothing},
-            {"Weapon", MWMechanics::DrawState_Weapon},
-            {"Spell", MWMechanics::DrawState_Spell},
+        actor["STANCE"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, MWMechanics::DrawState>({
+            {"Nothing", MWMechanics::DrawState::Nothing},
+            {"Weapon", MWMechanics::DrawState::Weapon},
+            {"Spell", MWMechanics::DrawState::Spell},
         }));
         actor["EQUIPMENT_SLOT"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, int>({
             {"Helmet", MWWorld::InventoryStore::Slot_Helmet},
diff --git a/apps/openmw/mwmechanics/aiactivate.cpp b/apps/openmw/mwmechanics/aiactivate.cpp
index 21287af1f6..ece071c601 100644
--- a/apps/openmw/mwmechanics/aiactivate.cpp
+++ b/apps/openmw/mwmechanics/aiactivate.cpp
@@ -22,7 +22,7 @@ namespace MWMechanics
     {
         const MWWorld::Ptr target = MWBase::Environment::get().getWorld()->searchPtr(mObjectId, false); //The target to follow
 
-        actor.getClass().getCreatureStats(actor).setDrawState(DrawState_Nothing);
+        actor.getClass().getCreatureStats(actor).setDrawState(DrawState::Nothing);
 
         // Stop if the target doesn't exist
         // Really we should be checking whether the target is currently registered with the MechanicsManager
diff --git a/apps/openmw/mwmechanics/aicombataction.cpp b/apps/openmw/mwmechanics/aicombataction.cpp
index c2fdf70a72..48861e19ba 100644
--- a/apps/openmw/mwmechanics/aicombataction.cpp
+++ b/apps/openmw/mwmechanics/aicombataction.cpp
@@ -40,7 +40,7 @@ namespace MWMechanics
     void ActionSpell::prepare(const MWWorld::Ptr &actor)
     {
         actor.getClass().getCreatureStats(actor).getSpells().setSelectedSpell(mSpellId);
-        actor.getClass().getCreatureStats(actor).setDrawState(DrawState_Spell);
+        actor.getClass().getCreatureStats(actor).setDrawState(DrawState::Spell);
         if (actor.getClass().hasInventoryStore(actor))
         {
             MWWorld::InventoryStore& inv = actor.getClass().getInventoryStore(actor);
@@ -64,7 +64,7 @@ namespace MWMechanics
     {
         actor.getClass().getCreatureStats(actor).getSpells().setSelectedSpell(std::string());
         actor.getClass().getInventoryStore(actor).setSelectedEnchantItem(mItem);
-        actor.getClass().getCreatureStats(actor).setDrawState(DrawState_Spell);
+        actor.getClass().getCreatureStats(actor).setDrawState(DrawState::Spell);
     }
 
     float ActionEnchantedItem::getCombatRange(bool& isRanged) const
@@ -106,7 +106,7 @@ namespace MWMechanics
                 equip.execute(actor);
             }
         }
-        actor.getClass().getCreatureStats(actor).setDrawState(DrawState_Weapon);
+        actor.getClass().getCreatureStats(actor).setDrawState(DrawState::Weapon);
     }
 
     float ActionWeapon::getCombatRange(bool& isRanged) const
@@ -324,7 +324,7 @@ namespace MWMechanics
             static const float fHandToHandReach = gmst.find("fHandToHandReach")->mValue.getFloat();
             dist = fHandToHandReach;
         }
-        else if (stats.getDrawState() == MWMechanics::DrawState_Spell)
+        else if (stats.getDrawState() == MWMechanics::DrawState::Spell)
         {
             dist = 1.0f;
             if (!selectedSpellId.empty())
diff --git a/apps/openmw/mwmechanics/aiescort.cpp b/apps/openmw/mwmechanics/aiescort.cpp
index aa58dacd8f..0426035b8d 100644
--- a/apps/openmw/mwmechanics/aiescort.cpp
+++ b/apps/openmw/mwmechanics/aiescort.cpp
@@ -64,7 +64,7 @@ namespace MWMechanics
         if (!mCellId.empty() && mCellId != actor.getCell()->getCell()->getCellId().mWorldspace)
             return false; // Not in the correct cell, pause and rely on the player to go back through a teleport door
 
-        actor.getClass().getCreatureStats(actor).setDrawState(DrawState_Nothing);
+        actor.getClass().getCreatureStats(actor).setDrawState(DrawState::Nothing);
         actor.getClass().getCreatureStats(actor).setMovementFlag(CreatureStats::Flag_Run, false);
 
         const MWWorld::Ptr follower = MWBase::Environment::get().getWorld()->getPtr(mTargetActorRefId, false);
diff --git a/apps/openmw/mwmechanics/aifollow.cpp b/apps/openmw/mwmechanics/aifollow.cpp
index f1ced856f0..9a64a5bee3 100644
--- a/apps/openmw/mwmechanics/aifollow.cpp
+++ b/apps/openmw/mwmechanics/aifollow.cpp
@@ -72,7 +72,7 @@ bool AiFollow::execute (const MWWorld::Ptr& actor, CharacterController& characte
     if (target == MWWorld::Ptr() || !target.getRefData().getCount() || !target.getRefData().isEnabled())
         return false;
 
-    actor.getClass().getCreatureStats(actor).setDrawState(DrawState_Nothing);
+    actor.getClass().getCreatureStats(actor).setDrawState(DrawState::Nothing);
 
     AiFollowStorage& storage = state.get<AiFollowStorage>();
 
diff --git a/apps/openmw/mwmechanics/aipursue.cpp b/apps/openmw/mwmechanics/aipursue.cpp
index e5e1b0297c..6e60a79b3f 100644
--- a/apps/openmw/mwmechanics/aipursue.cpp
+++ b/apps/openmw/mwmechanics/aipursue.cpp
@@ -44,7 +44,7 @@ bool AiPursue::execute (const MWWorld::Ptr& actor, CharacterController& characte
     if (target.getClass().getCreatureStats(target).isDead())
         return true;
 
-    actor.getClass().getCreatureStats(actor).setDrawState(DrawState_Nothing);
+    actor.getClass().getCreatureStats(actor).setDrawState(DrawState::Nothing);
 
     //Set the target destination
     const osg::Vec3f dest = target.getRefData().getPosition().asVec3();
diff --git a/apps/openmw/mwmechanics/aitravel.cpp b/apps/openmw/mwmechanics/aitravel.cpp
index 14b416ac61..71432a5537 100644
--- a/apps/openmw/mwmechanics/aitravel.cpp
+++ b/apps/openmw/mwmechanics/aitravel.cpp
@@ -68,7 +68,7 @@ namespace MWMechanics
         const osg::Vec3f targetPos(mX, mY, mZ);
 
         stats.setMovementFlag(CreatureStats::Flag_Run, false);
-        stats.setDrawState(DrawState_Nothing);
+        stats.setDrawState(DrawState::Nothing);
 
         // Note: we should cancel internal "return after combat" package, if original location is too far away
         if (!isWithinMaxRange(targetPos, actorPos))
diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 777e86955d..a2c97d641a 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -196,7 +196,7 @@ namespace MWMechanics
 
         mRemainingDuration -= ((duration*MWBase::Environment::get().getWorld()->getTimeScaleFactor()) / 3600);
 
-        cStats.setDrawState(DrawState_Nothing);
+        cStats.setDrawState(DrawState::Nothing);
         cStats.setMovementFlag(CreatureStats::Flag_Run, false);
 
         ESM::Position pos = actor.getRefData().getPosition();
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index be46f3c06d..c6f28cca64 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -1104,9 +1104,9 @@ bool CharacterController::updateState(CharacterState idle)
     const MWWorld::Class &cls = mPtr.getClass();
     CreatureStats &stats = cls.getCreatureStats(mPtr);
     int weaptype = ESM::Weapon::None;
-    if(stats.getDrawState() == DrawState_Weapon)
+    if(stats.getDrawState() == DrawState::Weapon)
         weaptype = ESM::Weapon::HandToHand;
-    else if (stats.getDrawState() == DrawState_Spell)
+    else if (stats.getDrawState() == DrawState::Spell)
         weaptype = ESM::Weapon::Spell;
 
     const bool isWerewolf = cls.isNpc() && cls.getNpcStats(mPtr).isWerewolf();
@@ -1118,7 +1118,7 @@ bool CharacterController::updateState(CharacterState idle)
     {
         MWWorld::InventoryStore &inv = cls.getInventoryStore(mPtr);
         MWWorld::ContainerStoreIterator weapon = getActiveWeapon(mPtr, &weaptype);
-        if(stats.getDrawState() == DrawState_Spell)
+        if(stats.getDrawState() == DrawState::Spell)
             weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
 
         if(weapon != inv.end() && mWeaponType != ESM::Weapon::HandToHand && weaptype != ESM::Weapon::HandToHand && weaptype != ESM::Weapon::Spell && weaptype != ESM::Weapon::None)
@@ -1910,7 +1910,7 @@ void CharacterController::update(float duration)
         else if (canMove)
         {
             float targetMovementAngle = vec.y() >= 0 ? std::atan2(-vec.x(), vec.y()) : std::atan2(vec.x(), -vec.y());
-            movementSettings.mIsStrafing = (stats.getDrawState() != MWMechanics::DrawState_Nothing || inwater)
+            movementSettings.mIsStrafing = (stats.getDrawState() != MWMechanics::DrawState::Nothing || inwater)
                                            && std::abs(targetMovementAngle) > osg::DegreesToRadians(60.0f);
             if (movementSettings.mIsStrafing)
                 targetMovementAngle = 0;
@@ -1929,7 +1929,7 @@ void CharacterController::update(float duration)
         }
 
         mAnimation->setLegsYawRadians(stats.getSideMovementAngle());
-        if (stats.getDrawState() == MWMechanics::DrawState_Nothing || inwater)
+        if (stats.getDrawState() == MWMechanics::DrawState::Nothing || inwater)
             mAnimation->setUpperBodyYawRadians(stats.getSideMovementAngle() / 2);
         else
             mAnimation->setUpperBodyYawRadians(stats.getSideMovementAngle() / 4);
diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index 8369a221db..ae4ebbce49 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -19,7 +19,7 @@ namespace MWMechanics
     int CreatureStats::sActorId = 0;
 
     CreatureStats::CreatureStats()
-        : mDrawState (DrawState_Nothing), mDead (false), mDeathAnimationFinished(false), mDied (false), mMurdered(false), mFriendlyHits (0),
+        : mDrawState (DrawState::Nothing), mDead (false), mDeathAnimationFinished(false), mDied (false), mMurdered(false), mFriendlyHits (0),
           mTalkedTo (false), mAlarmed (false), mAttacked (false),
           mKnockdown(false), mKnockdownOneFrame(false), mKnockdownOverOneFrame(false),
           mHitRecovery(false), mBlock(false), mMovementFlags(0),
@@ -499,12 +499,12 @@ namespace MWMechanics
         }
     }
 
-    DrawState_ CreatureStats::getDrawState() const
+    DrawState CreatureStats::getDrawState() const
     {
         return mDrawState;
     }
 
-    void CreatureStats::setDrawState(DrawState_ state)
+    void CreatureStats::setDrawState(DrawState state)
     {
         mDrawState = state;
     }
@@ -542,7 +542,7 @@ namespace MWMechanics
         state.mLastHitObject = mLastHitObject;
         state.mLastHitAttemptObject = mLastHitAttemptObject;
         state.mRecalcDynamicStats = false;
-        state.mDrawState = mDrawState;
+        state.mDrawState = static_cast<int>(mDrawState);
         state.mLevel = mLevel;
         state.mActorId = mActorId;
         state.mDeathAnimation = mDeathAnimation;
@@ -596,7 +596,7 @@ namespace MWMechanics
         mFallHeight = state.mFallHeight;
         mLastHitObject = state.mLastHitObject;
         mLastHitAttemptObject = state.mLastHitAttemptObject;
-        mDrawState = DrawState_(state.mDrawState);
+        mDrawState = DrawState(state.mDrawState);
         mLevel = state.mLevel;
         mActorId = state.mActorId;
         mDeathAnimation = state.mDeathAnimation;
diff --git a/apps/openmw/mwmechanics/creaturestats.hpp b/apps/openmw/mwmechanics/creaturestats.hpp
index 1e6d378df7..a2370015e1 100644
--- a/apps/openmw/mwmechanics/creaturestats.hpp
+++ b/apps/openmw/mwmechanics/creaturestats.hpp
@@ -38,7 +38,7 @@ namespace MWMechanics
     class CreatureStats
     {
         static int sActorId;
-        DrawState_ mDrawState;
+        DrawState mDrawState;
         AttributeValue mAttributes[ESM::Attribute::Length];
         DynamicStat<float> mDynamic[3]; // health, magicka, fatigue
         Spells mSpells;
@@ -98,8 +98,8 @@ namespace MWMechanics
     public:
         CreatureStats();
 
-        DrawState_ getDrawState() const;
-        void setDrawState(DrawState_ state);
+        DrawState getDrawState() const;
+        void setDrawState(DrawState state);
 
         void recalculateMagicka();
 
diff --git a/apps/openmw/mwmechanics/drawstate.hpp b/apps/openmw/mwmechanics/drawstate.hpp
index 7f59d8d782..1373d59ef8 100644
--- a/apps/openmw/mwmechanics/drawstate.hpp
+++ b/apps/openmw/mwmechanics/drawstate.hpp
@@ -3,12 +3,12 @@
 
 namespace MWMechanics
 {
-    /// \note The _ suffix is required to avoid a collision with a Windoze macro. Die, Microsoft! Die!
-    enum DrawState_
+
+    enum class DrawState
     {
-        DrawState_Nothing = 0,
-        DrawState_Weapon = 1,
-        DrawState_Spell = 2
+        Nothing = 0,
+        Weapon = 1,
+        Spell = 2
     };
 }
 
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 5e1462912a..1f953898c8 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -571,7 +571,7 @@ namespace MWMechanics
             x += fDispDiseaseMod;
 
         static const float fDispWeaponDrawn = gmst.find("fDispWeaponDrawn")->mValue.getFloat();
-        if (playerStats.getDrawState() == MWMechanics::DrawState_Weapon)
+        if (playerStats.getDrawState() == MWMechanics::DrawState::Weapon)
             x += fDispWeaponDrawn;
 
         x += ptr.getClass().getCreatureStats(ptr).getMagicEffects().get(ESM::MagicEffect::Charm).getMagnitude();
@@ -1789,8 +1789,8 @@ namespace MWMechanics
         MWWorld::Player* player = &MWBase::Environment::get().getWorld()->getPlayer();
 
         // Werewolfs can not cast spells, so we need to unset the prepared spell if there is one.
-        if (npcStats.getDrawState() == MWMechanics::DrawState_Spell)
-            npcStats.setDrawState(MWMechanics::DrawState_Nothing);
+        if (npcStats.getDrawState() == MWMechanics::DrawState::Spell)
+            npcStats.setDrawState(MWMechanics::DrawState::Nothing);
 
         npcStats.setWerewolf(werewolf);
 
diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp
index a43d19431b..81a3dc0921 100644
--- a/apps/openmw/mwmechanics/spelleffects.cpp
+++ b/apps/openmw/mwmechanics/spelleffects.cpp
@@ -190,7 +190,7 @@ namespace
 
         // change draw state only if the item is in player's right hand
         if (slot == MWWorld::InventoryStore::Slot_CarriedRight)
-            player.setDrawState(MWMechanics::DrawState_Weapon);
+            player.setDrawState(MWMechanics::DrawState::Weapon);
 
         if (prevItem != store.end())
             player.setPreviousItem(itemId, prevItem->getCellRef().getRefId());
diff --git a/apps/openmw/mwmechanics/spellpriority.cpp b/apps/openmw/mwmechanics/spellpriority.cpp
index 0f44ee7d07..245bd4fcdb 100644
--- a/apps/openmw/mwmechanics/spellpriority.cpp
+++ b/apps/openmw/mwmechanics/spellpriority.cpp
@@ -249,7 +249,7 @@ namespace MWMechanics
                     return 0.f;
 
                 // Enemy doesn't attack
-                if (stats.getDrawState() != MWMechanics::DrawState_Weapon)
+                if (stats.getDrawState() != MWMechanics::DrawState::Weapon)
                     return 0.f;
 
                 break;
@@ -270,7 +270,7 @@ namespace MWMechanics
                     return 0.f;
 
                 // Enemy doesn't cast spells
-                if (stats.getDrawState() != MWMechanics::DrawState_Spell)
+                if (stats.getDrawState() != MWMechanics::DrawState::Spell)
                     return 0.f;
 
                 break;
@@ -288,7 +288,7 @@ namespace MWMechanics
                     return 0.f;
 
                 // Enemy doesn't cast spells
-                if (stats.getDrawState() != MWMechanics::DrawState_Spell)
+                if (stats.getDrawState() != MWMechanics::DrawState::Spell)
                     return 0.f;
                 break;
             }
diff --git a/apps/openmw/mwmechanics/weapontype.cpp b/apps/openmw/mwmechanics/weapontype.cpp
index 6bf5b70fee..9e9e06eba7 100644
--- a/apps/openmw/mwmechanics/weapontype.cpp
+++ b/apps/openmw/mwmechanics/weapontype.cpp
@@ -11,13 +11,13 @@ namespace MWMechanics
     {
         MWWorld::InventoryStore &inv = actor.getClass().getInventoryStore(actor);
         CreatureStats &stats = actor.getClass().getCreatureStats(actor);
-        if(stats.getDrawState() == MWMechanics::DrawState_Spell)
+        if(stats.getDrawState() == MWMechanics::DrawState::Spell)
         {
             *weaptype = ESM::Weapon::Spell;
             return inv.end();
         }
 
-        if(stats.getDrawState() == MWMechanics::DrawState_Weapon)
+        if(stats.getDrawState() == MWMechanics::DrawState::Weapon)
         {
             MWWorld::ContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
             if(weapon == inv.end())
diff --git a/apps/openmw/mwrender/actoranimation.cpp b/apps/openmw/mwrender/actoranimation.cpp
index f370f17e1c..9b9c521a51 100644
--- a/apps/openmw/mwrender/actoranimation.cpp
+++ b/apps/openmw/mwrender/actoranimation.cpp
@@ -178,7 +178,7 @@ bool ActorAnimation::updateCarriedLeftVisible(const int weaptype) const
                 const MWWorld::ConstContainerStoreIterator shield = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
                 if (shield != inv.end() && shield->getType() == ESM::Armor::sRecordId && !getSheathedShieldMesh(*shield).empty())
                 {
-                    if(stats.getDrawState() != MWMechanics::DrawState_Weapon)
+                    if(stats.getDrawState() != MWMechanics::DrawState::Weapon)
                         return false;
 
                     if (weapon != inv.end())
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index b84cc6b222..e5b44bccae 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -783,7 +783,7 @@ namespace MWScript
                     MWWorld::Ptr ptr = R()(runtime);
 
                     runtime.push((ptr.getClass().hasInventoryStore(ptr) || ptr.getClass().isBipedal(ptr)) &&
-                                ptr.getClass().getCreatureStats (ptr).getDrawState () == MWMechanics::DrawState_Weapon);
+                                ptr.getClass().getCreatureStats (ptr).getDrawState () == MWMechanics::DrawState::Weapon);
                 }
         };
 
@@ -796,7 +796,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    runtime.push(ptr.getClass().getCreatureStats (ptr).getDrawState () == MWMechanics::DrawState_Spell);
+                    runtime.push(ptr.getClass().getCreatureStats (ptr).getDrawState () == MWMechanics::DrawState::Spell);
                 }
         };
 
diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp
index dd5ad0c0f9..9c5f226bc6 100644
--- a/apps/openmw/mwworld/player.cpp
+++ b/apps/openmw/mwworld/player.cpp
@@ -152,7 +152,7 @@ namespace MWWorld
         return mSign;
     }
 
-    void Player::setDrawState (MWMechanics::DrawState_ state)
+    void Player::setDrawState (MWMechanics::DrawState state)
     {
          MWWorld::Ptr ptr = getPlayer();
          ptr.getClass().getNpcStats(ptr).setDrawState (state);
@@ -229,7 +229,7 @@ namespace MWWorld
         ptr.getClass().getMovementSettings(ptr).mRotation[1] += roll;
     }
 
-    MWMechanics::DrawState_ Player::getDrawState()
+    MWMechanics::DrawState Player::getDrawState()
     {
          MWWorld::Ptr ptr = getPlayer();
          return ptr.getClass().getNpcStats(ptr).getDrawState();
diff --git a/apps/openmw/mwworld/player.hpp b/apps/openmw/mwworld/player.hpp
index 3a3c58cb5d..54d9c08da4 100644
--- a/apps/openmw/mwworld/player.hpp
+++ b/apps/openmw/mwworld/player.hpp
@@ -86,8 +86,8 @@ namespace MWWorld
         void setBirthSign(const std::string &sign);
         const std::string &getBirthSign() const;
 
-        void setDrawState (MWMechanics::DrawState_ state);
-        MWMechanics::DrawState_ getDrawState(); /// \todo constness
+        void setDrawState (MWMechanics::DrawState state);
+        MWMechanics::DrawState getDrawState(); /// \todo constness
 
         /// Activate the object under the crosshair, if any
         void activate();
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 1f5532655d..0cb00341da 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -3619,7 +3619,7 @@ namespace MWWorld
                 mPlayer->setAttackingOrSpell(false);
             }
 
-            mPlayer->setDrawState(MWMechanics::DrawState_Nothing);
+            mPlayer->setDrawState(MWMechanics::DrawState::Nothing);
             mGoToJail = false;
 
             MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_Dialogue);

From 3967509cdd11b3abf3aa1eca69f627492c1a0b2a Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sun, 17 Jul 2022 19:54:59 +0200
Subject: [PATCH 2826/2859] Use meaningful names instead of pretending we don't
 know what snow is

---
 apps/esmtool/record.cpp                         | 4 ++--
 apps/opencs/model/tools/regioncheck.cpp         | 2 +-
 apps/opencs/model/world/nestedcoladapterimp.cpp | 8 ++++----
 apps/openmw/mwworld/weather.cpp                 | 4 ++--
 components/esm3/loadregn.cpp                    | 8 ++++----
 components/esm3/loadregn.hpp                    | 6 +-----
 6 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/apps/esmtool/record.cpp b/apps/esmtool/record.cpp
index f9c3dea5d4..fbda7eee6b 100644
--- a/apps/esmtool/record.cpp
+++ b/apps/esmtool/record.cpp
@@ -1184,8 +1184,8 @@ void Record<ESM::Region>::print()
     std::cout << "    Thunder: " << (int)mData.mData.mThunder << std::endl;
     std::cout << "    Ash: " << (int)mData.mData.mAsh << std::endl;
     std::cout << "    Blight: " << (int)mData.mData.mBlight << std::endl;
-    std::cout << "    UnknownA: " << (int)mData.mData.mA << std::endl;
-    std::cout << "    UnknownB: " << (int)mData.mData.mB << std::endl;
+    std::cout << "    Snow: " << (int)mData.mData.mSnow << std::endl;
+    std::cout << "    Blizzard: " << (int)mData.mData.mBlizzard << std::endl;
     std::cout << "  Map Color: " << mData.mMapColor << std::endl;
     if (!mData.mSleepList.empty())
         std::cout << "  Sleep List: " << mData.mSleepList << std::endl;
diff --git a/apps/opencs/model/tools/regioncheck.cpp b/apps/opencs/model/tools/regioncheck.cpp
index 27a73be93d..127281f5d9 100644
--- a/apps/opencs/model/tools/regioncheck.cpp
+++ b/apps/opencs/model/tools/regioncheck.cpp
@@ -38,7 +38,7 @@ void CSMTools::RegionCheckStage::perform (int stage, CSMDoc::Messages& messages)
     // test that chances add up to 100
     int chances = region.mData.mClear + region.mData.mCloudy + region.mData.mFoggy + region.mData.mOvercast +
         region.mData.mRain + region.mData.mThunder + region.mData.mAsh + region.mData.mBlight +
-        region.mData.mA + region.mData.mB;
+        region.mData.mSnow + region.mData.mBlizzard;
     if (chances != 100)
         messages.add(id, "Weather chances do not add up to 100", "", CSMDoc::Message::Severity_Error);
 
diff --git a/apps/opencs/model/world/nestedcoladapterimp.cpp b/apps/opencs/model/world/nestedcoladapterimp.cpp
index 08a23f4410..131c71d5a0 100644
--- a/apps/opencs/model/world/nestedcoladapterimp.cpp
+++ b/apps/opencs/model/world/nestedcoladapterimp.cpp
@@ -1059,8 +1059,8 @@ namespace CSMWorld
                 case 5: return region.mData.mThunder;
                 case 6: return region.mData.mAsh;
                 case 7: return region.mData.mBlight;
-                case 8: return region.mData.mA; // Snow
-                case 9: return region.mData.mB; // Blizzard
+                case 8: return region.mData.mSnow;
+                case 9: return region.mData.mBlizzard;
                 default: break;
             }
         }
@@ -1086,8 +1086,8 @@ namespace CSMWorld
                 case 5: region.mData.mThunder = chance; break;
                 case 6: region.mData.mAsh = chance; break;
                 case 7: region.mData.mBlight = chance; break;
-                case 8: region.mData.mA = chance; break;
-                case 9: region.mData.mB = chance; break;
+                case 8: region.mData.mSnow = chance; break;
+                case 9: region.mData.mBlizzard = chance; break;
                 default: throw std::runtime_error("index out of range");
             }
 
diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index 062796e914..95b1c69ae1 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -286,8 +286,8 @@ namespace
         mChances.push_back(region.mData.mThunder);
         mChances.push_back(region.mData.mAsh);
         mChances.push_back(region.mData.mBlight);
-        mChances.push_back(region.mData.mA);
-        mChances.push_back(region.mData.mB);
+        mChances.push_back(region.mData.mSnow);
+        mChances.push_back(region.mData.mBlizzard);
     }
 
     RegionWeather::RegionWeather(const ESM::RegionWeatherState& state)
diff --git a/components/esm3/loadregn.cpp b/components/esm3/loadregn.cpp
index 54f722f89a..9de89d1889 100644
--- a/components/esm3/loadregn.cpp
+++ b/components/esm3/loadregn.cpp
@@ -26,15 +26,15 @@ namespace ESM
                 case fourCC("WEAT"):
                 {
                     esm.getSubHeader();
-                    // May include the additional two bytes (but not necessarily)
+                    // Cold weather not included before 1.3
                     if (esm.getSubSize() == sizeof(mData))
                     {
                         esm.getT(mData);
                     }
                     else if (esm.getSubSize() == sizeof(mData) - 2)
                     {
-                        mData.mA = 0;
-                        mData.mB = 0;
+                        mData.mSnow = 0;
+                        mData.mBlizzard = 0;
                         esm.getExact(&mData, sizeof(mData) - 2);
                     }
                     else
@@ -105,7 +105,7 @@ namespace ESM
     {
         mRecordFlags = 0;
         mData.mClear = mData.mCloudy = mData.mFoggy = mData.mOvercast = mData.mRain =
-            mData.mThunder = mData.mAsh = mData.mBlight = mData.mA = mData.mB = 0;
+            mData.mThunder = mData.mAsh = mData.mBlight = mData.mSnow = mData.mBlizzard = 0;
 
         mMapColor = 0;
 
diff --git a/components/esm3/loadregn.hpp b/components/esm3/loadregn.hpp
index e47c30d2d2..555b5e1b8d 100644
--- a/components/esm3/loadregn.hpp
+++ b/components/esm3/loadregn.hpp
@@ -29,11 +29,7 @@ struct Region
     struct WEATstruct
     {
         // These are probabilities that add up to 100
-        unsigned char mClear, mCloudy, mFoggy, mOvercast, mRain, mThunder, mAsh, mBlight,
-        // Unknown weather, probably snow and something. Only
-        // present in file version 1.3.
-        // the engine uses mA as "snow" and mB as "blizard"
-                mA, mB;
+        unsigned char mClear, mCloudy, mFoggy, mOvercast, mRain, mThunder, mAsh, mBlight, mSnow, mBlizzard;
     }; // 10 bytes
 #pragma pack(pop)
 

From dd04bfccfb607487cc06175c28bf52fc6caaa54b Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Thu, 7 Jul 2022 19:34:18 +0400
Subject: [PATCH 2827/2859] Load fonts

---
 CMakeLists.txt                                |   4 -
 README.md                                     |   4 +-
 apps/openmw/engine.cpp                        |   4 +-
 apps/openmw/mwgui/windowmanagerimp.cpp        |   2 +-
 components/fontloader/fontloader.cpp          |  16 +--
 components/myguiplatform/myguidatamanager.cpp |  27 +++++
 components/myguiplatform/myguidatamanager.hpp |  10 ++
 components/myguiplatform/myguiplatform.cpp    |   3 +-
 components/myguiplatform/myguiplatform.hpp    |   4 +-
 components/resource/stats.cpp                 |  20 ++--
 components/resource/stats.hpp                 |   9 +-
 files/data/CMakeLists.txt                     |  10 ++
 files/data/fonts/DejaVuFontLicense.txt        |  99 ++++++++++++++++++
 .../fonts/DejaVuLGCSansMono.omwfont}          |   2 +-
 .../fonts}/DejaVuLGCSansMono.ttf              | Bin
 files/data/fonts/OMWAyembedt.omwfont          |  12 +++
 files/data/fonts/OMWAyembedt.ttf              | Bin 0 -> 25550 bytes
 files/data/fonts/OMWAyembedtFontLicense.txt   |  94 +++++++++++++++++
 files/data/fonts/Pelagiad.omwfont             |  43 ++++++++
 files/data/fonts/Pelagiad.ttf                 | Bin 0 -> 29820 bytes
 files/data/fonts/PelagiadFontLicense.txt      |  94 +++++++++++++++++
 files/mygui/CMakeLists.txt                    |   2 -
 files/mygui/skins.xml                         |   1 -
 23 files changed, 430 insertions(+), 30 deletions(-)
 create mode 100644 files/data/fonts/DejaVuFontLicense.txt
 rename files/{mygui/openmw_font.xml => data/fonts/DejaVuLGCSansMono.omwfont} (89%)
 rename files/{mygui => data/fonts}/DejaVuLGCSansMono.ttf (100%)
 create mode 100644 files/data/fonts/OMWAyembedt.omwfont
 create mode 100644 files/data/fonts/OMWAyembedt.ttf
 create mode 100644 files/data/fonts/OMWAyembedtFontLicense.txt
 create mode 100644 files/data/fonts/Pelagiad.omwfont
 create mode 100644 files/data/fonts/Pelagiad.ttf
 create mode 100644 files/data/fonts/PelagiadFontLicense.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d1bcfa832e..96092a2f61 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -921,7 +921,6 @@ elseif(NOT APPLE)
         INSTALL(FILES "${OpenMW_SOURCE_DIR}/CHANGELOG.md" DESTINATION "." RENAME "CHANGELOG.txt")
         INSTALL(FILES "${OpenMW_SOURCE_DIR}/README.md" DESTINATION "." RENAME "README.txt")
         INSTALL(FILES "${OpenMW_SOURCE_DIR}/LICENSE" DESTINATION "." RENAME "LICENSE.txt")
-        INSTALL(FILES "${OpenMW_SOURCE_DIR}/files/mygui/DejaVuFontLicense.txt" DESTINATION ".")
         INSTALL(FILES "${INSTALL_SOURCE}/defaults.bin" DESTINATION ".")
         INSTALL(FILES "${INSTALL_SOURCE}/gamecontrollerdb.txt" DESTINATION ".")
 
@@ -1023,9 +1022,6 @@ elseif(NOT APPLE)
             INSTALL(PROGRAMS "${INSTALL_SOURCE}/openmw-bulletobjecttool" DESTINATION "${BINDIR}" )
         ENDIF(BUILD_BULLETOBJECTTOOL)
 
-        # Install licenses
-        INSTALL(FILES "files/mygui/DejaVuFontLicense.txt" DESTINATION "${LICDIR}" )
-
         # Install icon and desktop file
         INSTALL(FILES "${OpenMW_BINARY_DIR}/org.openmw.launcher.desktop" DESTINATION "${DATAROOTDIR}/applications" COMPONENT "openmw")
         INSTALL(FILES "${OpenMW_SOURCE_DIR}/files/launcher/images/openmw.png" DESTINATION "${ICONDIR}" COMPONENT "openmw")
diff --git a/README.md b/README.md
index 2f21f8211b..b1ea6cbde3 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,9 @@ OpenMW also comes with OpenMW-CS, a replacement for Bethesda's Construction Set.
 
 
 Font Licenses:
-* DejaVuLGCSansMono.ttf: custom (see [files/mygui/DejaVuFontLicense.txt](https://gitlab.com/OpenMW/openmw/-/raw/master/files/mygui/DejaVuFontLicense.txt) for more information)
+* DejaVuLGCSansMono.ttf: custom (see [files/data/fonts/DejaVuFontLicense.txt](https://gitlab.com/OpenMW/openmw/-/raw/master/files/data/fonts/DejaVuFontLicense.txt) for more information)
+* OMWAyembedt.ttf: SIL Open Font License (see [files/data/fonts/OMWAyembedtFontLicense.txt](https://gitlab.com/OpenMW/openmw/-/raw/master/files/data/fonts/OMWAyembedtFontLicense.txt) for more information)
+* Pelagiad.ttf: SIL Open Font License (see [files/data/fonts/PelagiadFontLicense.txt](https://gitlab.com/OpenMW/openmw/-/raw/master/files/data/fonts/PelagiadFontLicense.txt) for more information)
 
 Current Status
 --------------
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 76c164c90e..4d10b47963 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -1037,13 +1037,13 @@ void OMW::Engine::go()
     }
 
     // Setup profiler
-    osg::ref_ptr<Resource::Profiler> statshandler = new Resource::Profiler(stats.is_open());
+    osg::ref_ptr<Resource::Profiler> statshandler = new Resource::Profiler(stats.is_open(), mVFS.get());
 
     initStatsHandler(*statshandler);
 
     mViewer->addEventHandler(statshandler);
 
-    osg::ref_ptr<Resource::StatsHandler> resourceshandler = new Resource::StatsHandler(stats.is_open());
+    osg::ref_ptr<Resource::StatsHandler> resourceshandler = new Resource::StatsHandler(stats.is_open(), mVFS.get());
     mViewer->addEventHandler(resourceshandler);
 
     if (stats.is_open())
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 5442b22df2..382f489e20 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -195,7 +195,7 @@ namespace MWGui
     {
         mScalingFactor = std::clamp(Settings::Manager::getFloat("scaling factor", "GUI"), 0.5f, 8.f);
         mGuiPlatform = new osgMyGUI::Platform(viewer, guiRoot, resourceSystem->getImageManager(), mScalingFactor);
-        mGuiPlatform->initialise(resourcePath, (std::filesystem::path(logpath) / "MyGUI.log").generic_string());
+        mGuiPlatform->initialise(resourceSystem->getVFS(), resourcePath, (std::filesystem::path(logpath) / "MyGUI.log").generic_string());
 
         mGui = new MyGUI::Gui;
         mGui->initialise("");
diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index 4e370a729a..ab4ca24eee 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -214,16 +214,16 @@ namespace Gui
             return;
         }
 
-        const std::string cfg = dataManager->getDataPath("");
-        const std::string fontFile = mUserDataPath + "/" + "Fonts" + "/" + "openmw_font.xml";
-        if (!std::filesystem::exists(fontFile))
-            return;
+        dataManager->setUseVfs(true);
 
-        dataManager->setResourcePath(mUserDataPath + "/" + "Fonts");
-        MyGUI::ResourceManager::getInstance().load("openmw_font.xml");
-        dataManager->setResourcePath(cfg);
-    }
+        for (const auto& name : mVFS->getRecursiveDirectoryIterator("Fonts/"))
+        {
+            if (Misc::getFileExtension(name) == "omwfont")
+                MyGUI::ResourceManager::getInstance().load(name);
+        }
 
+        dataManager->setUseVfs(false);
+    }
 
     typedef struct
     {
diff --git a/components/myguiplatform/myguidatamanager.cpp b/components/myguiplatform/myguidatamanager.cpp
index b01c5bbcf6..d3edb82ae5 100644
--- a/components/myguiplatform/myguidatamanager.cpp
+++ b/components/myguiplatform/myguidatamanager.cpp
@@ -18,8 +18,25 @@ void DataManager::setResourcePath(const std::string &path)
     mResourcePath = path;
 }
 
+void DataManager::setUseVfs(bool useVfs)
+{
+    mUseVfs = useVfs;
+}
+
 MyGUI::IDataStream *DataManager::getData(const std::string &name) const
 {
+    if (mUseVfs)
+    {
+        // Note: MyGUI is supposed to read/free input steam itself,
+        // so copy data from VFS stream to the string stream and pass it to MyGUI.
+        Files::IStreamPtr streamPtr = mVfs->get(name);
+        std::istream* fileStream = streamPtr.get();
+        std::unique_ptr<std::stringstream> dataStream;
+        dataStream.reset(new std::stringstream);
+        *dataStream << fileStream->rdbuf();
+        return new MyGUI::DataStream(dataStream.release());
+    }
+
     std::string fullpath = getDataPath(name);
     auto stream = std::make_unique<std::ifstream>();
     stream->open(fullpath, std::ios::binary);
@@ -38,10 +55,17 @@ void DataManager::freeData(MyGUI::IDataStream *data)
 
 bool DataManager::isDataExist(const std::string &name) const
 {
+    if (mUseVfs) return mVfs->exists(name);
+
     std::string fullpath = mResourcePath + "/" + name;
     return std::filesystem::exists(fullpath);
 }
 
+void DataManager::setVfs(const VFS::Manager* vfs)
+{
+    mVfs = vfs;
+}
+
 const MyGUI::VectorString &DataManager::getDataListNames(const std::string &pattern) const
 {
     // TODO: pattern matching (unused?)
@@ -53,6 +77,9 @@ const MyGUI::VectorString &DataManager::getDataListNames(const std::string &patt
 
 const std::string &DataManager::getDataPath(const std::string &name) const
 {
+    // FIXME: in theory, we should use the VFS here too, but it does not provide the real path to data files.
+    // In some cases there is no real path at all (when the requested MyGUI file is in BSA archive, for example).
+    // Currently it should not matter since we use this virtual function only to setup fonts for profilers.
     static std::string result;
     result.clear();
     if (!isDataExist(name))
diff --git a/components/myguiplatform/myguidatamanager.hpp b/components/myguiplatform/myguidatamanager.hpp
index e0c4e6c436..a859ce99c1 100644
--- a/components/myguiplatform/myguidatamanager.hpp
+++ b/components/myguiplatform/myguidatamanager.hpp
@@ -5,6 +5,8 @@
 
 #include <string>
 
+#include <components/vfs/manager.hpp>
+
 namespace osgMyGUI
 {
 
@@ -16,6 +18,10 @@ public:
 
     void setResourcePath(const std::string& path);
 
+    void setUseVfs(bool useVfs);
+
+    void setVfs(const VFS::Manager* vfs);
+
     /** Get data stream from specified resource name.
         @param _name Resource name (usually file name).
     */
@@ -44,6 +50,10 @@ public:
 
 private:
     std::string mResourcePath;
+
+    const VFS::Manager* mVfs;
+
+    bool mUseVfs{false};
 };
 
 }
diff --git a/components/myguiplatform/myguiplatform.cpp b/components/myguiplatform/myguiplatform.cpp
index dfb2e6539d..b19bc722a2 100644
--- a/components/myguiplatform/myguiplatform.cpp
+++ b/components/myguiplatform/myguiplatform.cpp
@@ -30,7 +30,7 @@ Platform::~Platform()
     mLogFacility = nullptr;
 }
 
-void Platform::initialise(const std::string &resourcePath, const std::string &_logName)
+void Platform::initialise(const VFS::Manager* vfs, const std::string &resourcePath, const std::string &_logName)
 {
     if (!_logName.empty() && !mLogFacility)
     {
@@ -39,6 +39,7 @@ void Platform::initialise(const std::string &resourcePath, const std::string &_l
     }
 
     mDataManager->setResourcePath(resourcePath);
+    mDataManager->setVfs(vfs);
 
     mRenderManager->initialise();
     mDataManager->initialise();
diff --git a/components/myguiplatform/myguiplatform.hpp b/components/myguiplatform/myguiplatform.hpp
index 5ffbe0be70..a46fedcd75 100644
--- a/components/myguiplatform/myguiplatform.hpp
+++ b/components/myguiplatform/myguiplatform.hpp
@@ -3,6 +3,8 @@
 
 #include <string>
 
+#include <components/vfs/manager.hpp>
+
 namespace osgViewer
 {
     class Viewer;
@@ -34,7 +36,7 @@ namespace osgMyGUI
 
         ~Platform();
 
-        void initialise(const std::string& resourcePath, const std::string& _logName = "MyGUI.log");
+        void initialise(const VFS::Manager* vfs, const std::string& resourcePath, const std::string& _logName = "MyGUI.log");
 
         void shutdown();
 
diff --git a/components/resource/stats.cpp b/components/resource/stats.cpp
index 0ab523ab59..d578259033 100644
--- a/components/resource/stats.cpp
+++ b/components/resource/stats.cpp
@@ -15,6 +15,8 @@
 
 #include <components/myguiplatform/myguidatamanager.hpp>
 
+#include <components/vfs/manager.hpp>
+
 namespace Resource
 {
 
@@ -28,6 +30,8 @@ static bool collectStatFrameRate = false;
 static bool collectStatUpdate = false;
 static bool collectStatEngine = false;
 
+inline static std::string sFontName = "Fonts\\DejaVuLGCSansMono.ttf";
+
 static void setupStatCollection()
 {
     const char* envList = getenv("OPENMW_OSG_STATS_LIST");
@@ -79,7 +83,7 @@ static void setupStatCollection()
     }
 }
 
-StatsHandler::StatsHandler(bool offlineCollect):
+StatsHandler::StatsHandler(bool offlineCollect, VFS::Manager* vfs):
     _key(osgGA::GUIEventAdapter::KEY_F4),
     _initialized(false),
     _statsType(false),
@@ -96,15 +100,19 @@ StatsHandler::StatsHandler(bool offlineCollect):
 
     _resourceStatsChildNum = 0;
 
-    if (osgDB::Registry::instance()->getReaderWriterForExtension("ttf"))
-        _font = osgMyGUI::DataManager::getInstance().getDataPath("DejaVuLGCSansMono.ttf");
+    if (osgDB::Registry::instance()->getReaderWriterForExtension("ttf") && vfs->exists(sFontName))
+    {
+        _font = vfs->getAbsoluteFileName(sFontName);
+    }
 }
 
-Profiler::Profiler(bool offlineCollect):
+Profiler::Profiler(bool offlineCollect, VFS::Manager* vfs):
     _offlineCollect(offlineCollect)
 {
-    if (osgDB::Registry::instance()->getReaderWriterForExtension("ttf"))
-        _font = osgMyGUI::DataManager::getInstance().getDataPath("DejaVuLGCSansMono.ttf");
+    if (osgDB::Registry::instance()->getReaderWriterForExtension("ttf") && vfs->exists(sFontName))
+    {
+        _font = vfs->getAbsoluteFileName(sFontName);
+    }
     else
         _font.clear();
 
diff --git a/components/resource/stats.hpp b/components/resource/stats.hpp
index 560275d701..b61280ceb1 100644
--- a/components/resource/stats.hpp
+++ b/components/resource/stats.hpp
@@ -13,12 +13,17 @@ namespace osg
     class Switch;
 }
 
+namespace VFS
+{
+    class Manager;
+}
+
 namespace Resource
 {
     class Profiler : public osgViewer::StatsHandler
     {
     public:
-        Profiler(bool offlineCollect);
+        Profiler(bool offlineCollect, VFS::Manager* vfs);
         bool handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa) override;
 
     private:
@@ -28,7 +33,7 @@ namespace Resource
     class StatsHandler : public osgGA::GUIEventHandler
     {
     public:
-        StatsHandler(bool offlineCollect);
+        StatsHandler(bool offlineCollect, VFS::Manager* vfs);
 
         void setKey(int key) { _key = key; }
         int getKey() const { return _key; }
diff --git a/files/data/CMakeLists.txt b/files/data/CMakeLists.txt
index f476498494..1fa40b3f54 100644
--- a/files/data/CMakeLists.txt
+++ b/files/data/CMakeLists.txt
@@ -10,6 +10,16 @@ set(BUILTIN_DATA_FILES
     textures/omw_menu_scroll_center_h.dds
     textures/omw_menu_scroll_center_v.dds
 
+    fonts/DejaVuFontLicense.txt
+    fonts/DejaVuLGCSansMono.ttf
+    fonts/DejaVuLGCSansMono.omwfont
+    fonts/OMWAyembedt.ttf
+    fonts/OMWAyembedt.omwfont
+    fonts/OMWAyembedtFontLicense.txt
+    fonts/Pelagiad.ttf
+    fonts/Pelagiad.omwfont
+    fonts/PelagiadFontLicense.txt
+
     l10n/Calendar/en.yaml
     l10n/Calendar/ru.yaml
     l10n/DebugMenu/en.yaml
diff --git a/files/data/fonts/DejaVuFontLicense.txt b/files/data/fonts/DejaVuFontLicense.txt
new file mode 100644
index 0000000000..254e2cc42a
--- /dev/null
+++ b/files/data/fonts/DejaVuFontLicense.txt
@@ -0,0 +1,99 @@
+Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
+Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below)
+
+Bitstream Vera Fonts Copyright
+------------------------------
+
+Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
+a trademark of Bitstream, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of the fonts accompanying this license ("Fonts") and associated
+documentation files (the "Font Software"), to reproduce and distribute the
+Font Software, including without limitation the rights to use, copy, merge,
+publish, distribute, and/or sell copies of the Font Software, and to permit
+persons to whom the Font Software is furnished to do so, subject to the
+following conditions:
+
+The above copyright and trademark notices and this permission notice shall
+be included in all copies of one or more of the Font Software typefaces.
+
+The Font Software may be modified, altered, or added to, and in particular
+the designs of glyphs or characters in the Fonts may be modified and
+additional glyphs or characters may be added to the Fonts, only if the fonts
+are renamed to names not containing either the words "Bitstream" or the word
+"Vera".
+
+This License becomes null and void to the extent applicable to Fonts or Font
+Software that has been modified and is distributed under the "Bitstream
+Vera" names.
+
+The Font Software may be sold as part of a larger software package but no
+copy of one or more of the Font Software typefaces may be sold by itself.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
+TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
+FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING
+ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
+FONT SOFTWARE.
+
+Except as contained in this notice, the names of Gnome, the Gnome
+Foundation, and Bitstream Inc., shall not be used in advertising or
+otherwise to promote the sale, use or other dealings in this Font Software
+without prior written authorization from the Gnome Foundation or Bitstream
+Inc., respectively. For further information, contact: fonts at gnome dot
+org. 
+
+Arev Fonts Copyright
+------------------------------
+
+Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the fonts accompanying this license ("Fonts") and
+associated documentation files (the "Font Software"), to reproduce
+and distribute the modifications to the Bitstream Vera Font Software,
+including without limitation the rights to use, copy, merge, publish,
+distribute, and/or sell copies of the Font Software, and to permit
+persons to whom the Font Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright and trademark notices and this permission notice
+shall be included in all copies of one or more of the Font Software
+typefaces.
+
+The Font Software may be modified, altered, or added to, and in
+particular the designs of glyphs or characters in the Fonts may be
+modified and additional glyphs or characters may be added to the
+Fonts, only if the fonts are renamed to names not containing either
+the words "Tavmjong Bah" or the word "Arev".
+
+This License becomes null and void to the extent applicable to Fonts
+or Font Software that has been modified and is distributed under the 
+"Tavmjong Bah Arev" names.
+
+The Font Software may be sold as part of a larger software package but
+no copy of one or more of the Font Software typefaces may be sold by
+itself.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
+TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
+
+Except as contained in this notice, the name of Tavmjong Bah shall not
+be used in advertising or otherwise to promote the sale, use or other
+dealings in this Font Software without prior written authorization
+from Tavmjong Bah. For further information, contact: tavmjong @ free
+. fr.
+
+$Id: LICENSE 2133 2007-11-28 02:46:28Z lechimp $
diff --git a/files/mygui/openmw_font.xml b/files/data/fonts/DejaVuLGCSansMono.omwfont
similarity index 89%
rename from files/mygui/openmw_font.xml
rename to files/data/fonts/DejaVuLGCSansMono.omwfont
index 6ffe3017e5..6511877656 100644
--- a/files/mygui/openmw_font.xml
+++ b/files/data/fonts/DejaVuLGCSansMono.omwfont
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Resource" version="1.1">
     <Resource type="ResourceTrueTypeFont" name="MonoFont">
-        <Property key="Source" value="DejaVuLGCSansMono.ttf"/>
+        <Property key="Source" value="Fonts/DejaVuLGCSansMono.ttf"/>
         <Property key="Antialias" value="false"/>
         <Property key="TabWidth" value="8"/>
         <Property key="OffsetHeight" value="0"/>
diff --git a/files/mygui/DejaVuLGCSansMono.ttf b/files/data/fonts/DejaVuLGCSansMono.ttf
similarity index 100%
rename from files/mygui/DejaVuLGCSansMono.ttf
rename to files/data/fonts/DejaVuLGCSansMono.ttf
diff --git a/files/data/fonts/OMWAyembedt.omwfont b/files/data/fonts/OMWAyembedt.omwfont
new file mode 100644
index 0000000000..c8ac1c2ecb
--- /dev/null
+++ b/files/data/fonts/OMWAyembedt.omwfont
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MyGUI type="Resource" version="1.1">
+    <Resource type="ResourceTrueTypeFont" name="Daedric">
+        <Property key="Source" value="Fonts/OMWAyembedt.ttf"/>
+        <Property key="Antialias" value="false"/>
+        <Property key="TabWidth" value="8"/>
+        <Property key="OffsetHeight" value="0"/>
+        <Codes>
+            <Code range="32 126"/>
+        </Codes>
+    </Resource>
+</MyGUI>
diff --git a/files/data/fonts/OMWAyembedt.ttf b/files/data/fonts/OMWAyembedt.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..fb889b17fcc290758f65252f0e5a458bf8ca7157
GIT binary patch
literal 25550
zcmdsg2XtKLb>?gH`t*Vs)Q15u0La0h7XlzaR01R#QAkmuM1jDdNB{;J0Hi3(vLtsW
z^4gB<6#ICywxc+9EP1mjj-5@sDc)?(ak88EICh$qIChjc@kw@_x-q%megAtH3`j~|
z?e6h83mTYL{&LHAzkC1xy^%Sd<2Wz(G$(R%<Kv6dZ+h2<KY}ZNgx~VBqhsS-J@*bA
z{}X;wvkT2_?f=++gX4G$=MS%JFYkVF<RdAZKaJn~`tsiH?c1Ehal&_SUtQn2xz_m?
zU$~C*e?|A&jqLKOsxN$*;~J@d*9I=genG_feK@b(*xrBq>GyfQg7YUa-m_b|mF0=E
zgZmtJ61TZ8Y%f2)%e}xoiu2#ZxwW&ro&7-N-%jBC6%6<HyScsnkN??_!g1GL#{F;O
zm$c))@}+-IAKVxJw7-fzasI4*$HYmDtK<Zn@!T?gAv?}kKf5m{@r(R-I1etrOZX++
z`9b!{zs$Arg6<bM8S*<ntcP=A;fMP?PM#92+dbU<;$@Dcw%hQ(FFcQ9%RZz2^jpsE
zaicgxEB+j$X~1<EpS&&AQ?M@mSoq{`f8A-13%u+MOvfZY{T}_nc%tNy6;;y>)9dpG
zf}wCE8Y_t>O3TVCDyyvOWKC^ds=lG|#L0A1rn#lHt-YhOtGnk^Z(slEfx$CF!y`b$
z*@?+>=clG;X6G)<FDx!yyma5?`yaUS;6qm*UOqb8_viR~wid+WVL`HT<?R>ve-S>+
zUEs{maNKjB;iTt2!{2@@Uz3!hk&;Tjy={Q+9`JOvx5X46ugEpYRDDM5?7*e&0Y1am
zXZX&JKE5s1-i9_2w24My5wt=R+~K><S|^93Qe6s^>4GeI@FRK*Azbg_19FF{PoHd*
zB%dd$l!?5MjFyA~EiWq*nzSUwPqy_)Qb}tfE^Iyi*hfET)Ri>(MBSrG9wF#S?brJU
zB7wcLyDh=$cuk<eXz>_cRTKnW4|)6z!SGy<nl3wETiTfvedG_G>%RSh5E4Gh4HWAd
zhOF(?Bz`m^lZH(6lYEja;E9q_xESncZ!4)3Nzu-Z`qXK@<8rcv?~0D7(L__i7pSPX
z|Lt|A(H^S}cyFl@uj%(nf~ojIM*ZM$xv(XML;kV{vsN%5Mr$IESGD`h-qO~Z=J@lU
z^wd}JpGek5Zw$<*-q1VH8ts2?C*<viyfMT{PqDlukfgdT8ibWIVm}W-;1V86z#*L-
zshaAfkB9SOC9!A(M~WPbl0*7i_&3)_B#$WYU7frkg(^E#<JK2+UE&9$K95HgvH?SF
z5?%_0zI&lb^vJr$6yE&SuMP3K>M<nM3K}Z!kz{XL_9&7jE5glN-+WIx!fXp!`9FYd
zM~h|UlRmM6xA71pn83&Yl`U72<n1ODkvSET7^b$(4+E#_U4{7ZzWbUhRLIuy*6MC4
zRMOlzwQ{Lk4c3ahHaJr%cxAm@SAE`!NH9{J5w^~4{qPeb5G(;z{8fV=92<Y(iN%-}
zeW=Cnse5K_dP(uClGv!swuHT6hf&sVs)i;hCo2rty!ZB}1pzicbxaRtZ`c{IfT+L$
zfgXmfc9G#B_23M+0&M^({*_XnE*Z5a{;;}KOIW7{T5@`@^wygbLBA}Cnih!pf3`p6
zYq&7@kz|YTeCU>yi3|?;%lqg1lVRDbhAa4QH(BvujW;Amtl`Fvrf4igIPL;2+F|Ry
zVj07o9WXD+WkXq!6`X<MVk~GOxr6RdcULnItwelEO|r}96V8Qxwc)B<U%&pyA8I~D
z7ZhDH1-&=<$v66ii0@NdYS@4A@hX9bWkgXDg8YB{yjkk^M}nc&59!LYy}puwe(Kye
z|6N7Jf97vIpvdB<1l^+nB@$?u=Nf>GZ$aMPVtEfmfYC^B0yO}j$To1n)g-r#Y8ww3
zo)4TnDupdLUs+#YFYxlLFPMsT1iA%((4*>2t<6@W6ce@zf@DbKP(XrQ+U}LwslMqG
z=SwDpkmk|719NX5U47r6>}6P%Z47*kyZ@NHJ`pn6z6EF<nQZbK08Jip2W~J30402h
z?GC~+dUOwn?QMkqB9h@Rdn&u?CR8IjUe%m@XzXCY7iqbDvbV|zmsllU!!IZS|6aJJ
zR}aRMz5qy6)OkhsD54Y%pE13LX*MKE`JSfBm%Hvad_F^!pZ*VHt3N04h8{}QRriiH
zS0}{gfT8PRNuqx$SP?WW0W_-dvR_l$rpljuXIV(<TkR-weDyZ?>KOjRchCv=Foh(+
zK;(E3(4)|{9aoe5=R}Zbg&#)f8cJ!0Q2>zby3f}J;+mv}J9t${XmuWsX0yudtzUbH
zg7=hB(lU66Bins`zO>u&pCC+8oa(~Ixu#+tg*&>tZ0dk0m3)jM0rX>&N(OiX9paR-
zT7>*KHKLVU$(FCzb;m<`O!N5--J0)jpE?n)p6V`-e<8$oe)u2|5<uO)pl_(|?@|-7
zvFl5xu5R{@kL^rURx`XLfbYM6&8CjYLN-IT=w?FHBpFM04f2Eo0)_*3g2W-(8TUat
zo5U#;kbYJYjb&cBT-HrrLLJUb)Mpw*K~^+T>xg`f1weUQb2nk%d%myB8`~gS@AHM*
zdiZ~{^S*N}vyEdF-zghRKl6iwlP~s&0J7u;L;c%^FFrktIFN%6uU&j@K1?JZ4S00F
z<Q=#3rh5C+{MVshYq5Tm>6syI)<anUm>)}|qz!Z_p;Ce`zpy|?t-W$q@=CJcBu^`Y
z<k?l#{GL+YGuX%1U*C8`W%WPZ_oMHs6%@fEOURm+9;prn_;Y2QX-$&ae~A1Kn+rkk
z^aI5*h3%@tE=sy!U_=^nc&v>j8K+bsW820pvO7ydaDyV(XFM3eE@h|*(kx%?^#)`!
zWd2aPKC`4NS|(XyMq1um?^85|*Ywp9GQDy7Y>YRA%GH=5mIo@r5m_)re^k>9IUM9~
zjBm7wL4h|E&9Ed-*(1}6T0hlaBMM&C7f`)Cuc)SU_TlPhzjGhFq4}0xc<7~mSx~Nx
z`E()SuSg^VGA~7DPehul1%K@s+cze#_Z;kSyryw$0){fXDl3Trc^+aXxXI=r#04t2
z6k}YG=oW^0vc6slnJphZ(e97-G=@x3@F<{kkH?V9<7XmrGVPTlQPO|Z^vfQxsf7<@
zf2Q5z_sOAvX^IhF@{!h9Op<heC>%4AT@_-qeYSG+h2&7RuBu+EYV+2=hW(z4AEMY1
zxC;0&0r?GXrr48qb|sOJ)w&tG5}_7H3L{z@T{iLfc;Jj;#tt^>2{y3x<!ee3HHk<(
z`HlKYy&{otJoZHN#9T*JK=4Epz<b{bN$T!bg8}Wqg_2sss6aK!|9DMVb$7C)y8k=m
zBr$Q+MW1-7aee2UD)EwEkyKskd-lp~enOWt?b2tT?4BG5hV6P3dMfbK-w7YXYO<?X
z&u|xoObKy;<0U9<%iK*crE1hJ?@(`dA(W6Dp<;KJ!k6>A>S;BgoEr_7f(*RAREK}C
zRwy&|u2xM``N~L-<Wc`Bsa_2Wil<I^t3SXeO!JvvdSYgKO!fzx-*JBXyi(35!)u=j
zBB%V#;;!!H)ujVf<5k-?#B1L`+>dgXj>$~LzFn=M#IVad2z-(U;YMv<MG$sVZtzhi
z067fseQc>f>AWpglB`cLJ*fJFT8jL)U8#MK75cdJfvSK{Hp;6eJ+)Tt$KsVW(ol7c
z!72|CxWka@Pe>1(7Ndq`yt}2X9~hjg=4F}p52s{B=@*{&3w|^D`M-=koGH)L^kus|
zfq>Ax-dCCuG-N%bP5#t^q4RHgrC$vARIlKltQK`~>339FRv-RgqpV5}ulu3@KL|g@
zrH^S3eW<dsYZWR558*~R9{;EahxX9jKlFy-nGaUKC2N_%plN7Y-vv=C30--}J3iPk
z)@-P{5Qq+TJ(P*d@n(N&@dH=KQc}#n{-=HMs>VvKDIxh{Nh_sMtni!)dA?x#qiC%b
zMl@44ImA6Cw~K6o5m~wrHBPw=Kw$|-98ePLsz<(@jd-smo@mrFdPtPFdsRt3F&$FP
z`4rYuV`pYFK|@w~-e1@A)D6Mw@t8fAPo7XbQuUj{!gDdd?{u%_uRW(r@sAADhs!z*
zUKhsR@$jkbO2a@M8@<?k<E8UF3Jy=e?+=Q)I)2U|eS){&&cA|Pfw5!uMLgJ&AJP<2
zG9tlN1c)0@D5X-s+w@>BDN3-0u(dkLw`d0MealuXKK`j^-!^J!fytoP+d5qD^CwCJ
z38PG{mZG}(z*|oA?D(N>-^p<GnrM1F!t<)qJrkBpU+2}<(0ql*jJ0{wPYr(d1yPlP
za$K>bXwcZ-`$D=ZmO5>IW8njD6uq*kplTGj)a?%mlFeh|#oE+S^+6;CCv{Vrx7TIJ
ziQujz3lCeFO4I~)Rf+30Nm?t}R7d#Y&-GWAB)hB2YChGGyrW_<%If>;I;R^#@#fj~
z^7!93fZxnO!2F-FWIO`S>m2{BzGF2^!}*C$YhZo5uWS8*?n*{$VkFh`5W`s+aP}4G
za=KWPLwwnk%*rggW+$GqePgdSZEf8GIh9mUHAf?VMWlLWqOO-%HQCBXkU0ZUrK>rV
zPSu5c$er~kO2;P6N=0e)m8l~{q5W%5Ep)v!2o6R4MM4UG<Kmki7+b&4QjY{_8uh2I
zj@<XV<A&*b&>BBo`@7_aO4Nmyg|9*ObH&p05y36qySfSfc1=J5LN&|1DtM5sC^{=t
zo1XbEJvVAs>eZRXnKSi?(zFnWq}%xWj}`1I;Zv0!uO$9PeP`aQx3(_v&s@CqH}~7+
z`I(CI7cM5{Ow&OFs&ZbcJzk}!9!bikq}+Px%!dX(x?=c-uV0*duj`vn3m3%r@%o&W
z|AnPBsHZxaLiQUF5ja?Th!ilySkNH=R{>q1sQ|yFdXeiM38zXTiTYdb_s6RZv#cQ|
z4UCqQb(WRcj_K%rTB=pML&{UacXi3DU3%ro*=MgdRW+yq)GWw)p6PdA?#>QRRaV-I
zslKPK-sX0tkoMAxJnbg(Tm*Rf6Y$oVVvo4I74!3Q4B!_DG!)m6QdVM=5~)6cW|SoC
z6&8xQ4z|9kPh~8*BQU8OyiZb;aH=KVhwT<q_6A2DY!D|VgJtKQc<f9=rPoxosx_Zd
zdb+h-cyGwBsXgAfUg~QQd0qCIM&=Lx^*tq`*JqS>H&mUk@tR(7G&I?!KGSgNk+-d+
zVm43p@Wa9{A75*P?3gAY5wO5GE45_7-pD`>PYJZ{v-1JiD|oT(^t#5U{EcJAdrIO>
z4T3K$nCH{srH)|9Sex)%JaMj6QIkPa*MhaTe*M2i&W9??zskS!Oqm*N)g{GanvN|W
z=U={Ktzk<5&$9hGk=#wCEMzO*u7gC76Xr$>yE;CyS@+GZxYa5|714~SSY{%#N~)03
zcvGs^l)kDeQN%W$6vZ;GG!RVGe%#Zg2xo+lH7kn2x^Rg9-2F>8uPYUyY6IJJis+Tj
zoi#Fk<5K5Rtv4PjGb`0vgtd%K1g}prD!r8#<?2XJS-7E8u=7FY_D}LZ#Q!<he+(x~
zW`+P#2}bSg0E5!@oXAjp*ZsMP(%QfDw<&>eGNPF$N3!Lb+#aaVe?|6Ve?u1pRo1;)
zMN4ap|D5Ra8j<nyaj(gzBKMc147DekPDOW~kt#~~!P2tO#n%3cE9p#~KeJs=m~OlM
z6Z{AG-^a#$Q7%5RH;1|h!3WuGqM=ogQ{TbtcFojQ%hy!+%{g9?d?hJa{g$rs%>msv
zW%^ISMBeXyH)&n_>I#<Ak|N1*uPS5RrdLaX&v*ZqwwxNJ4K~|=&5rH6h24EOEYsm{
z*bdmB-9WM)1o|HK-TpZ}ToaQ`U+rq5LG%S{8cv-XGIZHnD)Mr3UqsMFC924V9`j>S
zTEl;?XYR2pZClmVg5)(yn)f%}cx6yi75~{<Ln?o`zYn`B*m|s#dsA4=q_jvzlT~1>
zDn_*?&t-0Zihm3LRj#Ahp2&i<&j~}qezfn#Q>7C_PCeXrvv=ZX<Bd!V7UUlb8>*m|
zSA8rI4m9<3FQ}%e-1@Vy*OWw2(<9!urz=i9@I<1P|EllSk0gD~twwZYs?pR;EynLv
z$D{rVUGv9V2Tui@ed7k$_$OiGwqn`tw%_J#x7qUA;n&%L-L`rXjgZ@*8$yrwy_IJ@
z6%{kHKY=x)peSBRJ(+msAw%#P&t8!I9?#I_xT1Oap7&^B!|?mex&w2y(Flf5_I&aU
z(dhg6(oqyE&(_*@BiY^n*^aHv!`R-#e6R{!?`$=|`)p4b%Q*)Ih@<+{mo0lfTeL4%
zRvM~L68e>Zw>(g7)(E;!SF2OWZk_+!v$ZuOlGl&~-lND%qw$uO`j(33U|RI*vXMER
zZGV2zv6+1P7x-s|Qf|K3W_9i!8jA}mm63qq(!&JIqTBX2xx27|M%m#myJwPE(pb@<
zX#Nh(S5rFHao<3q_E)TQT=j+G!H@x}x#&wYDc(@2ZVHl5)@0f5Yf*Jo(<;N^KTeJe
zpBUD3Y(B}-!*A<2{|-?oFE3A=?5IhE#Ux60IT*_HnlY~y7i6F8Q&Xp+_dgQxiRtt8
z5#Y8G_OFHgn~U{4+%I!t-Q6ua=99y{vd@OSc(TE_ntnwNgKfc2hS2SOPni)?1l3p1
z%lsRaa#6s3nacNld%U`u|D+bIYi1rX`0$CiVX-*+H2*ICua5IlchSC>&HnDbSjycN
zi#fYu{cTD#URwK!+NQ81h7{dYm7(F(sVd*;)3MO|y<fV1pXntE4+dMyf3CbMuyFI_
z+1ZmFbK9{5AZh2QpX7I7lgT@6g80Sc$9Kf+>I5KQsh<|O&N3fd#USFar?VY)K3oOj
z5j_zP_EN%fTTNGavN9+uDgVbSDs22l>uMSeuder`8x8*qh_y-grB3kC3p+h}K<}&S
zi2VX~QI<EGyPrJ~JVbOwwr%KYn^%{76H{j%J?#VE1`Rw2k@QZ|OS%0Lzr}x(%M|O?
zZSRBGD_>$ET2IwGq<g3aX#pLoutxs!>49kIdEeO?LGtspe;H_#1M!-$ZZ^bfw<5gM
zoc=GDXRa7#;<M`?Z@>dq#cM`~XA($EJ&^`W@uYTa8`mQLd>Hv>u~-&o|BGczTA|YR
zmz{v@LeRD`mFpB*hr*GKaT|O^3oR-csUJ0<`s;*_UB_6ix-xl2)03q^&0o7+q05@6
zC{t~QS5sF4yyW5IlR=fQ3zsQa{FNz+D)~_zcFd*(QxHtQX-J;%bib-qoN6k?9vF5q
zWeq!CUa@l`vHY1~udW#Hy!qCXq996Bt$5H>9Z7{GUaTGW*Te<0teNa@LgyyveC&Bx
zx07cXfFL<o4m(}6Lx0Csm;G#k=#O@~9_|%=TI~~7s_aCiPs3)3DoLs*8fx)NrPY9!
zsN^*h&oGj;Kl{mP$uK0ZiSi|un5zv2RW(%UEp3bnfmB~f`x{GJ5{hobOXhynXGlYM
zU{7n22;_Yq<kh*e$Gk*qJA0jktu5P0$Gm~M0cc?lLTDor5plTsa(1=g;`XoBmWKVI
z#7|dN#zNuqaE7j42~_ph$93M5R1Gm*B?^rh*=s1{1EEq)kCxW**luks4JOjR5Jzy6
z^{;(qh^+snH&@Qg_u!d;7n{Rk`r26kQWs^Xp&xj#u_xp8@hFj?lL@|iBmWI9c}F%Z
z-p4A5p#Vns64)r&pbX_p5cn(#*dCUbk792=Bb#z}d(sm!M$MKoF{~+#wVL^rKqDU4
ze>%ns6JB1Hs`=kGOg^OQ%g<d|zw9>`ccxE!qSzIkdY4yJKYeBa4@88ai?Tv50x;V%
z4m!gv9JBqgy(<zAvfX9(N@iPEU2Sahik6Ib-MjkvhKh@xxbG?Pu@V8hq>>sd>6Xgk
zWp4<Tl!~p1QdNryf-Fc+ilZ6PP~^DwXiX}OV(4_7mn7b7EyrW=H2+mY(AD63UkprW
zej{2_nm*qsnWoS<oeo!6CkC+-&R>18NmOO*4GTthLR7?|ACo;EdE%f_l0}DmHDK;K
z|Hs&8EUHVx&RT^+9HEUZD`$_fXuC?gKGC<ISUDfpOs^J@)2ACIMz!{q`i>e!RrrIl
z>9aK<DO6*Y5AL4rs1SqZ^iQQPL~25U5loa+;I$K;lYx&#aQ|_{zn(oR4`IBpN!91q
z&xNj3DcDjFJQvc~lCJ7SK0jS9h(dd7UyX@}xIAx^pLpng9!nQN;I$JYR+UE*6IXrw
zm$1}sYKog>-HI5x*<9(5)N8yVw69N`yilSl9$gL$)m(ma4-X0w5cDQq6TyaIXE&=)
zjoTmLw}hwf&<kiH!Y4to60r#sfI^`~5lwql#yxkcD*s&3`0yu#p`~A2ZP#S82V3oe
zSl3!%7~!xPR$`t~D*PpF^qO^I!SITnwB<`op$3rnzm`1<Rf29j*zFyRidrBgdW7n$
z%|H00AY<JXmZ+!bRqwm_{_2uIMMnGSf!tLQ!13sa;fC8E;@{1G8GG)7#VC1|y(;L$
z%1KZcQn<~os2uFoq^)-p8uMaPB3Rm(h?G53pKywZ42p;#xG`{MxS_YwJ3Sc-eWo&|
z#&je4(O@Fv50{4OJASz7cuA3&xsbl^2jB!*=fz++auwJL1KSUSPmevDBxYo2CVnAb
z9Hu$j3r>+`uY2rz)7g`HQ7)Cw_MR*QFDB}K2Pw@6cp7RdYimtYlGSu=d$$&oJ#~6i
zKBtPZJp9B14R2{?L}({3Qyp9x8(nEj`S3b~dh){L@P|9_dePaE&P>^diG!l3fqxY>
z@Ll$z02B~Bl{ek?1`QTul&wHSK+@f|qtKcXTcxNJ?M6NHNINRucx}99XiYKrPNZ6Y
zD8-9bx<vJ(0M?NOyuNe3lQBud_GCrFlCIX(p5Y^BetS&URYhuPdRrSF1qxUCOgzZ~
z-}{bLzvc6B?3zp8Z8^w1IjI_L_nqnAf-fSsf0_R!Ve0tPj3fI{$g<UV$D?h49;UJ9
z-?SF7Ydl)HJDX4)cn?T7mGRm0;fh;-TTw0eyg{$w5t`ehO^Gscg;wAAuvjKH`aD;K
z9u*bQ(2Ea#Vy`mpp|=r$`%_yZ?Mr8^3b;Yl(hp61ei2Uz-ule1BM<PLAAGb9K05xc
zgu_RNdrx*vN(GZZJ5TP$Q(@bQtd6W)pQ?#V^=3D!a1;n0vn*oyYNRmUAvkwlZ0q$#
zdLCG68N{m(B~!fa31{k}{O=?E$|v-oqK2`C@ame@cI&TyDj-JGXk%sPpr(s$zOIyZ
zwPJX7^?Z2{GJ9{I<NiDU?c;T(%i%}%n;>tHUYogNw+VHdcc?Bit?*@LRfo0}44n}S
zpP=<r`_9yx!S<9#mHFS(LfsLMoB-DwZMUBDpYq0{ALUam5ye}ph#($Szy=;q36&d)
ze(}X`UG?|>J!goo(1pWy2|xKIyrFlyN4Sige7y4r+_N9_6ED+yf5H~W-M%ecc1Ch;
z<Krs-9aIs&i7BS>dk$A{{QdkDWUf-E;kt!+uAl!OT))uI^$OEmm!NSCLOCb%&*5_r
z*90!X|0AagX?*@TX9`_h1x%&zx3~oE`T4JKD*q2$P^jZl7^e)nSHcQq{I|FWf0+y3
zOGo}$-2b;+hW|~jjeioqKZE06<Qn+*;`c`|e<N4Pe+t*A-4mGa=eb&bh%@;YaQ*}M
zr0Y*}8vhX5KE)aQ$I)+(3-kYpi}L>!_a1|6BHnf-JOAJRxz7DI*23?=dthzCyF^vI
zB7Q^)NmrzoJ!d>Wi^cQ1<u5A(%Ez$w-cY}ywQ29uzH;=RKCXXAf7uu{-e<gQrp+HW
zU-6#se!%-jSiryNkNda$uLK$b&j<b`cro~5s64bA`mJ!t{Rd?Tr`NbE4*m#*^iC^B
zyUzGaKOyerLk#9{&XA3D1($P<@iHs-2IpABI^!AVSVEg$bdEiokNXYhSVj*0J?GdP
z)VM!!j(uEd@Gt27N{Jrb{Ygl4j(IK~`nq$BS~~Py=UC)+!-jJ#aq;jQonsGI9{yqH
zSmt8kpL34A$x!%<&asc{==@WT8_8#v_p__kwVT%2Y%afU4P~s+gSEAtY~H%DxxZm8
z<nsG_*7WAqmbIA6ZS7fYnU+k;)#a_-jpbIWe`9}tx3{_Z+UEYXgOx|K`x%VUyhnYu
z(WP+Iv`?J}W~VP%LpQVA*Rreo)7jO{gYCPF-&z>I*E-t6>b2Tinp&IMT3S1fUcZ>l
z?``IGEC|-pN<G{uMsmA1^PB4%`&PqBqlIqm={wbISkJ67jnAxaFK=#TR&v{ombJLC
zxo3^%cJ^U{wf!5*`K*NtTbnD{ojn-rU}qI3+TX}p3zJjU>~404HJ)M((v~Y!Yo;~B
z26Ot-Fe|y;O|p7+D|aJpE$^(-#pSKNoV9!%A}n9q$};mWTjN6)tmXY)%dzy{N`7;9
ze=oBKLCMy$<5PHHy6N@*F!|@kW~}kqnMG@Aa%5~~VeF{*R+H7%WsPUA<qwwgH(|z>
z?*F3+t-1NJq3PkNF_<N5t>>V(m0PoId50aX1}NBQk@fd;*53Z+_Q4haYu(7@w^na#
zu4b*(>~&aicRLGDVU(5J7R;B+FYj+&&suBbzukQ9k?hL;UfLewV0Rbrv}d#Lu22LJ
zda`S4Hr6r7^2+jRc6)Qh_RQAi&icV7re49|+uH{_oBNwt3`SmqOc?z-$+2v$<+J#}
z)f}N=EsxjiA?Bmj=8kn^V{>K0mS)e|UcL#(TYDQ&YL)qZn+CxNTJA3A_Yr)18=Jcf
z0XbkSzn39EW-ape@)kg|XDe`sM$!bAay0M(;F*T04psrNw6&dE-CQHEkz|+=n&daH
z9Z=Adz*{%1WxzVOvreCw3+FKQPHx}Y%Wc`jfQ#FE*{$nYNI^o_lcgc-$`<CJjypHu
zhWzGrW^_^-_E}lpA#tuDQnpACJL*^I=$IG~tT~rw)7hLu<L$XY=hzpv-dNtZr^;vd
zvUxHWeUSlS<A_Uo6OSF2<cQF=4GQ-m<VNlW@RPTtC7mH~KD(7&E`&G<WBb6`zqy+w
zh&fhg<L0xE9c<>aHvE7e$H(vlt}Vl#E>9G=!&=QjYMN|$cNgYITibxSl>>Ve8<0@t
zV2^AI<2z$waGY%Bk0?m67#$m*oS9sloSj*)lH*7DDhV0ZfE}8FhS|&75wf<qh4~M)
zgvID)fhs59_H4dkukmiO6Npw|pF9NLUd}%XIRTr!gOv?32b3gqGh|@G+(CW?;?sm_
z0AUk&a`=mR!cp0dKd6$NcRg$CF$4D=)q$+UT)wxPU2#CoCbyQ?_8mF~wK|-?w-2Tu
zlR_67eHN);b7y(W<+h_^lL?4Az!Ss;@N$tUDe`x7I~WUi+p~@a(Y@_Qb56U_=cI$9
zbJ|`ngv~ZMhw!_+Y6sPRE)7p_W%q%Cv_<i8a1A81e?S+&zb;wOEt_F-$Qih7<CU@L
z5uu?Fsd(H3@XAeVWn*~<hFJ&B^4rVM5F_F;(WHyOVq*|ut)1)*E4y=jGoRZb8<Vm_
z2m2ej{GBT9ZLWjTzyLH&mW~kA>)^+2I^NH&Z0u~Vz%MuQo8(1I&jM~2;Ds}8Y~*17
zokQAk;9MjVrk@*|pPpP;Kp<EtYh-q2)Cr2YY<_!l&n^&vPmpOA%3<~$P+*#oHmn09
z<kz!yiXaO*Q|GSjBZ$cg%Mf7~Ou+0|G`HOe?88X+Cb$GGLA+UeK%4d)8phS549s!}
zsCBEDr4M!vNgG2U+1z7VAc7K`8{ccdZ|(*O3u~<+OXYU<dM&H9(VEGklyl;vNOaIp
z-bKtNJim#4$Yuv{MgcrT^#$ah!*Ng}xZR}YqzsIe-CBcF+8STI=Up{(M>|X%M~!AD
zvU}$X8(Wl+orIBHM&h+yM-YNDS>{BEfbxK@v-%KpjKa-krG28Yqa447hAfvk#I|ZV
z_9W`t2PHNwBY~nq$v(dCvfakP_VP{>YKv97n4|CT5f#IFFeZf}$UmRk&2LgQvkf5;
z8HMKC*?n}}M@_Mr-CEtVD*@_96JUsIpfOZpjL9KHA${i{tkcJl8M$l|WPN=zdxPai
znjC1&!#nMOM(z%G-rFbWX3KsjPqTCZp5L>wkMF{IoBMV+@1qhzEFB3zC-R74NRpLY
z9{C*HYLni`p+i^}a*_&KAo?9@-l38OnUmtep#qo@$p{9a^hYUzNO~8&KuiP#mj6g;
z%9tIEb{RwMNNgvhk56siVii8)wIgkdV+fTTBG{=OFo|0hZs+#F3E7?1Tpo6#KwCwr
zvA>BEqL|}Rgr<+LWOwawUS4^0CwBv7(>gQwA^jnykH~R1nJGh)VUGyyEah+&)x)c}
z2e#>CwkcB3Aup;Sp+te4Y+j&x)j>6QdJ76~AMDw6)X^jfKcGm0<L)en7zx^)91|Yx
z$lBXE4dUmE;u2i?|GxGrvIGpYNLglPi0Um?@Hk9?$`Oo7h1~(bKu)-x+eAf=#RL_Q
zEN!@~<FfN%?TUEE*rSsRBU3|@(_{12;=~wRk1foOFJ2m&AG0PGux^^YI5|2ticGtJ
z^JLn(G`To2yR>Mb#r)9B;$<ultf869*7?bq(X=&oA68lm3)bwsH90*uH93ZBlQSbz
zOQVxBXRTrMo0+8*-}K}n23?%ByE;Qnj-lVU1zAQWF!Ipw<kaNi<+L?Exi~{(j$_av
zYi?+MadKp7YG~e?TbiGn#lmrDW)#EDOwNqYW0tY$F)S)E(8%oE<@w386N_ndTExY)
zwKzXCIyOBte?CnT&O+sR%Wjf^lo-PryGWfECWfY_Y=az*VNJ|VjiUAN7^EMfm82~W
z6u0e{wnm4hht84)?zq&<(V$=fveenJnX&nyskF5)H#Ra!2Qb~_{MZNtL`#?(%Ht|V
zLQSzSc3}w@(9WF#KA0G@MTg8o_}_>P4O`<GXh`EM&d$RIjwqKV7sk@o(EQ{AIbnQ$
zb{d1j73e`uUxEqI6cA(bl3VE7oq#|q>g^bAbZlq}0|FPo<#F(2?!9?%>ozyS<+&`r
z#=VcftDJ@Hu$%aM7H2u!S;z4ZHkB>BEOx-H;olDK<Z*t3+eDuY94*)__qjbBPvhzq
z{#kg*Acucj_SH6w&|?2y#Y|h=F8VFw^&<<f?QLL`eO&3q>oCojokqQexmNI%^(>Av
zjvUPxi6o+Vww+n-cC865+?fZU-z;Rhgqen*R~9|5;qNN9k2}-$(I)2F#@Y9#MeAL)
z=*9T=m<M<0ZaegEg2qkQyl%l~$E!+q5t8Mh=O#4SL2qU|>SrDHyHlSLwBCi5dGuSi
z?P}qx@GD#+MqsnHb7>sEwr?BIKLaZr_4pZF+lJT3zZs00!x@cCp5DM!^8UCj?>>&m
znrraH4fG&<Sx$>Be6HYp2kjZ&4sg6`>uaI?hTV1nuK`V=&n)zzwns;vDjI?GIc_cT
z5&a&Otax5m8q#7H<GIMsLbn`brcsw|x!jh7TEZV)zwTIJ8Ccq~<t@a*GFprSYZvU6
z`?l|k5xxig$wRv~k~6lK$)YUUnxXT!tvgw^>HG4Jyyx0~4qvpGv2~io=OT`#aBsxE
zx`4m;vOdX9sOz%(W?`v3&_q}ub|EyjaNRiierafNbKE@S9|8*uLnqRNa7;*DhcB4F
zEgY@kii^wF#v?@>^B~2Bi+y4w3!dJG-?w3hE!-i#B^D*WZy^E*Llg&={r5VK2#dRD
zPZ2;d#bhDO62lVus4tDQ2~1MYHC$nBcX21jJ%Xz%xW8v3+Lht}qwd;$X;fFYLSMos
z%Lp$2WHB<`XYA`rvW&5pZE1;*S1^_vGZbw*u;T$fnbvfdaR%wXgX<)9){)HZ$0TI3
zU&noB4~nTZTPD)cZA-Rc+(7r1Z96e*K8jW}KUtTUX$5}^wjrJ(9wQu5E+D^9HX@xV
z|GDFnr(8+c9X95!-F6@2GmfSicG0iE0XfH}#Nfn21!TFgP3U4wL(;e&DCQ`V#q|km
zMHpfdA7EsXiFk_adw^rcVsvF2o}%+L=UPE0rX%wSaS-KMH}AU^-m)#TjBzbnM)D(#
zP>_@?=OTLta}kP&8wtg3{lIkE#&yCmp_AES(TTBwW+X9Lb_MO29`1}gwj?Y!5W<fl
z-Ssp>HsO%`&8$OOQBEOlW;QD1eHx8jvmB4#-5Lx9%{JzbYFF?wwIEB7=Ea%LMGeC*
z*@Ub?(lbv`FY*N0CU4t@+U%eO#X8yfxOH8ByViXzn-J>mv^1NY=DJ&dX2}g`a|2S4
z$MQD5m~CA@GYgaSWL-i9i;bgM+_g+04#)yG?Ra&$qZsQ)<)yJ7g9kTl8x`1(@z332
zf_kvZgfMVa60$q1Op50t3*^v?Z0%~c4Ec7U6?up8kgEr^UBS2oSqcp4YEQKq!!6Bu
zl#6K&Voo>CNw0f(fb2k(_84k_N#xr}cySW>WCj`8!t0ac7>V)w@%k!>`(%eT{1WfD
zI=Ir1p9(pIn1TF9?e6p?TLHK|M=<B{s&WF?DB5YR28=?v?t8O4iz~_n3_q0n$l~O`
zyj}4VJ{jBWVNBv~7ah!#E_Wa0494O)w9lglv%ae#@e45mozvLG_1DpuDE2aA8?ra^
zN)q+L@t7_6V+Jx4KJMiQ7fVN@e9w-E6-aiJsmUj<<|G|)3)$Jl56h#+JwjQ4B&JAU
z^#b#YEBh=)pj81`jk3@2y6s+ayC`t04pvXNbpfkL3RXCdN;l_IwL$rkuuJ+e|5A=3
zxsPX}*MmP-&uPq5ock`?)^pcV_tMk#&)t}jp_A^o{7Y32&EiIU&Spw#L8zw6hVBsZ
zSmcvGui3g%-9tIo?MwBqTdla2h1-kTuo{M<jb>-9U0I83Q&wFaw{&rv*Fph{6^ciS
zJDP_fhAIHYzZ8AUhfFi(E4P|-wQ^DOYRGUomKZpToMYkd4)PB1Bca8`vFq6(+isMf
z@~;_X<O%Zlx;-|_V>CL`CX2i58q3t{IHTyL8QFD;BeDS1sg(aHUT)wXd5^^+)Bb3N
zqiU3xmt=Rn#_&(5KaO#x{cGEaX-})Ld8||>kq2mPMj654QurOQk4KMXiaA>rs>=6l
zJ206Te^PcL&S#!ux|4)%UF6n*Zl-2Ppq-$sjcC_ztokX|I)_n-hX@BQ7N~kBY!YL+
zW4^ZDghVzIt9|I)t#ofXbqO1j?l8}}5*DgGcF$!5){k_*8}m?GLOjb66v<om$Zl_U
zm%wd9`R>k2n`z2cHvfCtGLCRpY_9gMr6~H`HG^wenv3LRYbiS3v-cY;?0!&2o`I%x
zk9oY1KVB^=sT!hOQ_L|m3h_40O!Kj|8Lj8ZMt5T#vL>~rJ)Gm2ht2R>OwH<1H`}`_
zwc=F<lZ$+{=49zMTl3dH=lAY2mK6xo_gZz_3u&yvAxplV^#xh>)m9i(l~c?fjXH)D
zH!{hSF0R-v0^2=c*e%{aWYsa-vn#|0^=52RTvroYE!udadXpp|9Jv-EJh-boRyP;p
z)2;eQPO?sujW5DAjYSOgIQ~*5I$GOpATJO~cF>+IPPw_TGe_8GdlalHX4qrMEZBf5
zf66-acN6VtF6LjdB(=`ob#&q#l9pzqPbM4Tan+6&ceUuw=W4*DpuKLY#@L=%K`XaD
zq8$QOVKB>(yg7_ZvayQMou}B&Y+Xh+B6L!$QhsF?FRrZ^x8|MLX?IwI_8DF)I$uwm
zu-OXOn}<xKO<@gOU?#VoKDxSKD;7d8*^$<2giGRpLUtz45#m^0x_bsJ&UtQ4=c0k4
zAdi0}8>^-YmEMSrk>UtBx)yTr&tij(!E!(C!WF9K9mhBBn$yh}#Z>`ABVpS`2;qUW
zbypECQm7@frJKpg%H&5^E7#NRj#P*3>qR?O3*))gF0LA1OY1_fqpOso^;)6D(cRR7
zx9?mxusu1JgWVN6<5{K&aVXP}MJ{Dx@;$L5A%NEG6!8=*EZQha*{%k8g57bm+-sqo
zjrusymIWrr18i<$+D9=P?U@idSM4gPV0FS$arMVAaCduruXbkaSeWJRmL^}g{NuJ|
zdk?QKdI;MV*I9&{dwY;9Mn0j~DXeapC+=1`QG3RcueAzdBNGb94-6AD%iUIzgaq<7
zMF(TU?`4;QW^ipxyVY!_ViewM#-roA=sLPexL3Yp`!N4M?0elC6AVF%hijP`Zs>4-
zi`5Nxt0|a|DUvAL68rDKCyW_fFI~r7+HEBa5yKQLf0S>I*E+10b$OXaKEChD@;j58
z)>sQzZ%sk!N#sXbk&)CBIHG5M?(?w)9F61pCA6a_OqSh`J#U)Dv&u<(e{U4mlW4Kv
z+)vufbqRNA#93|$pO!PmJlfH-x68OfW7D(j8T;%!+RtD-LhKlKpYu$M)`--S<ReMv
z>}PgkPCM#BS}ft5j?bdiuruEbdeOY}jE`2E<SUYN5!VZ|GR<76Ceen?N0KqSj6eq_
z^AN_SXNfe{Wm`_#*<8fD)QkF&<w(*Y{LbO;JnqsH#wGNkGrGEj&pEVXPaJ7vl8U6I
zJ<=JBF>imK#i%3!ds4}4MJwbv%uOxMLas$y3Yv+uqn2d7Mcg04sMMckJ#SxSl95fw
z%Op!-6hZ~f&Ez2aUv$Q!=clCq6#f+ua;F>?TFs&j%}Qer<CEE*tj3;67OcZOUceto
zJ&IXKUedeZ^P}>T<?r;t-7w%{ipC=EkUgesD=ff%WAF%##I8_(LJ#44#IYb7lcAfe
z>b7MzWcw84zYFjtvpXB_xE7?>CEMNwt1~;3goG2C(cJ?n_?YG-nO%7ZvxFr#5(-wK
zC?iQ|Ch|3%(F_y`gd}>CgYLOe$mVb(eaY_Yj!ONC?dwL1+s^IxY7D__<jzfF7j!3d
zkS&>n<Yi`!*B&>6cST;$y9fC8ne%<j+i%9B`n&yH!x!NMv=Z_Evf#n@-xPd@Q^S9=
z!oYXly!fu0p9|m{iy<z|MYt&b-y%x5IG5l`xib9!HB{jLJE96|RD%F(xLOY1cf@~r
zpaF%&3H%pm(pYF^urQ{VUE1*4Ob1GiF1#wxgKu#6;v2dB_-6C~zJq?oHv5PjJmYp?
zPvXDccOHhChD#{qFTj-xFys;f^AgDMGXC4#58%6g4{{H2SGk9|Wd&d6X~EC`0uYOI
Aw*UYD

literal 0
HcmV?d00001

diff --git a/files/data/fonts/OMWAyembedtFontLicense.txt b/files/data/fonts/OMWAyembedtFontLicense.txt
new file mode 100644
index 0000000000..47986d5463
--- /dev/null
+++ b/files/data/fonts/OMWAyembedtFontLicense.txt
@@ -0,0 +1,94 @@
+Copyright (c) 2014, Georg Duffner (https://github.com/georgd/OpenMW-Fonts),
+with Reserved Font Name "OMWAyembedt.ttf".
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/files/data/fonts/Pelagiad.omwfont b/files/data/fonts/Pelagiad.omwfont
new file mode 100644
index 0000000000..38dc29e09d
--- /dev/null
+++ b/files/data/fonts/Pelagiad.omwfont
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MyGUI type="Resource" version="1.1">
+    <Resource type="ResourceTrueTypeFont" name="Magic Cards">
+        <Property key="Source" value="Fonts/Pelagiad.ttf"/>
+        <Property key="Antialias" value="false"/>
+        <Property key="TabWidth" value="8"/>
+        <Property key="OffsetHeight" value="0"/>
+        <Codes>
+            <Code range="33 126"/>
+            <Code range="161"/>
+            <Code range="173"/>
+            <Code range="180"/>
+            <Code range="191 255"/>
+            <Code range="260 263"/>
+            <Code range="268 271"/>
+            <Code range="280 283"/>
+            <Code range="305"/>
+            <Code range="321 324"/>
+            <Code range="327 328"/>
+            <Code range="339"/>
+            <Code range="344 347"/>
+            <Code range="352 353"/>
+            <Code range="356 357"/>
+            <Code range="366 367"/>
+            <Code range="377 382"/>
+            <Code range="1025"/>
+            <Code range="1040 1103"/>
+            <Code range="1105"/>
+	    <Code range="8208 8212"/>
+            <Code range="8216 8217"/>
+            <Code range="8220 8221"/>
+            <Code range="8228 8230"/>
+            <Code hide="198"/>
+            <Code hide="208"/>
+            <Code hide="215 216"/>
+	    <Code hide="222"/>
+            <Code hide="230"/>
+            <Code hide="240"/>
+            <Code hide="247 248"/>
+            <Code hide="254"/>
+        </Codes>
+    </Resource>
+</MyGUI>
diff --git a/files/data/fonts/Pelagiad.ttf b/files/data/fonts/Pelagiad.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..07653b0530b0468ccc2d92d2d81e8f2796edb549
GIT binary patch
literal 29820
zcmdSCcbr^R-9LWLo!;A>-uuk%?Ck8+-PxMWwrn=ZX0xfJXVWWbkN_bGp@d!}(#6n0
zP(cupFCzMgB9=!{5m6CEeUPF&BIuXQeBbBHYzRp}p5OD=Z})ZQ-Z}TqJ?DHrpY!RT
zdkH0k=*fN}A<G8_#%Jt(M_(jl=W?`q2K)L4NSu1`y$9cYv*t8s&&bg?38Cxoefg@*
zE4H0CWB&jl@&F-{fmOSA21rP_gb)=wFI~H0$F^z}cP2Yq@m;xg)1EcmPv)N^L~{#%
z{@rz}S4<o@|KN{s?hS0kb!bpbNaeVH1m7d;Ht#&U<z~+l`2JnoZo#Ilt5!T~{i2Bb
zZz4oUZ(ecsHoBVp5$A_+ePGLq&8x3`Ymt+XO%pi3d)w9>JFi}%zzny%Oo(hD!O_{D
zCFFOHFLEz4bi7OaQv8gN|1{706WhP=_Mewk|4=PUek>WoS0xcxEB^31$?WQEvRLvy
z&fhKhF>5*TkJ?xZK9>?18OO$cN%>VhBn=2ih*VJ0t8s=1Hww?=>{Ycr{R_!a6<Uc5
zaAJS^iJ+(*)jmhp^iPndi7pVUk6||XBF^xk)5F50I1Ug>caspip3cPwAViJWzd~Ge
z4hafv#7zH0RKnv#CLAIL@&ytk$B2(@bd1>O(?rDe3AzAnf5+ZLy!1QRUjl5pNuK_S
zBn3(u=vUG9Q<9}`lO%lu+xJP9RIqoEM*1SL@P4qTQ;17=kvN3gh)>vw?FNz%4q$&2
zdkMC0k%VL%ecpp@4iSZGaqcoAN|s^&Jhs2!nv2o?F7^*&e=geYB?jRe*ss8K-$2_L
z`0Z0fE$qjbe@dJfvy1$k80i!EjTgB4F)?6#KKc$|fpO4ZV0#c-3%38j_6|{#w~3l6
zt8ZX#B6$z@{44sf;CIj9{CoJ_udqLeel}sh4Sl?g{hhexLR`aOhhzE*_RENZT#c2o
z6xaR&m|<=5YK4}uZzTynmVS(#!Q(WW<Y#C<LK-=I7>w#0hYy2MeLD^t2A`8R2AdN$
z1{?ZUqT(=Ma5!lb9zxqq*cePs*vRXE-RpqO>!6?4tFIl02ZPDU8-vG*8-oXf&uyR+
z^vCedV1IlM8leA;?*{<e`>@A6(YKfN2bj9Z`=C*Vf8bzpFL@txy@{k49RL?fMhgrd
zwSDy;j4l{%*xcDz7(FnY@cr*j_|9O;#&R?844S0>#BbK)JK8~uKA{uaB>WgXezQi8
zj7}M>B~92fnq;)hXfclC|H1}36z<3M*W-E|OZMUWChR{;tilM6FCsqPhWl|GJcquo
z!?qdQ)7SueA&32y*d}3lGmc*)8v1{+{}S-X;Qkxz8BMY|Jb_~d=S65|bofndkE8u3
z*j~W#chIkcSSk9Z>v23A`%BS3!!x5vw%tgY=?$bwIFn4}`~W<G@d~~X;N|BeEqs;a
zK?RI2vCYHz8KE8c#`vFyNNE83KGFleCM7zuk9?loOCBU&B3~gt!fO0AR@gtlWvWy`
z4b)9rXdfM-bLbg#1zk<I(tT1Yoh6+e5ChJDHxPrYAh=85gu8r${3m&l{FeL;v{9u}
zs-+IxWeOdnV{`#sPABLVx(9bL;x5L3Bj5={s@3X0z@?w5K3RRd`dIam>V4IFtM^pz
zuHIF>vwBDMbJd%x*H!mbw^lb-C#uV<i>r&OW7TONJo~}dK6w0<f4%bFEAPJYc5S8@
z&HwICE~wcJ04xTt6aVOO*;42FC!YMsaqX8<Kv)hgqa-S<O%2fkPI_>1BQX&(v4DSB
ziH+EagE+B{+`x?&e9;eB1|b*1BtoJjM&jT_Nzy<XNs2T<E;W-3X#o$<0nY_eBqh>H
z+DMtSlMd2Jx=1%LJB9RuLi$KQ86bmXh)g5HWI7okGssLbi;R-lWQ@##%$rN*k@;i+
zSx6R<Gst4H1hQ}$Sx#1vm6*?FvW09T+sPi#$OYtLauK<NTuKg;%g7bvDsm;b=QZRy
zaxM7`xt<&$H;~Vg8_CV&CUP6Om3)rejytS50V)^PkJpk39Bn1%pK$Kf!^_DnWF1-c
z(G%2)@9W7Xavph%e3j~`o|>o`RLbNgAxHV=={`1+9b^O9NzNp@$ywxVvWuKU&c%g$
z$pLZ@!kfwF)BSP12(X|09|pW0rx|(?{R91nAPQMwn{bQp9pN{^UnNFKhh#!>ljH@^
z^{Dg`>9=J{S%+*$HZI#MyIb}{xm><M{<I>Xm{8oQct<%?dB5@lRav!0^@Qqu^*Z%e
z)GujLnk||av?=X&?L*pEbRpdu-4}GP>&^O%ex81x{ucd1`gaTw!#u;4h94W%#+k-L
z#)plsn?j~8(<P=SO|O^}<^|@1<|oa6v@}>oEuXQxD%!+hai4fZ{EqmR_`X$bHCr>*
zKI=^DV(SL$ZtFqomDZbVHrp24xwcDfM{GxJU$Q-Ad(QTA+pD&}+A4On-DVHjx7qjE
zFSp-dztjG({T+M7p>{YNF-O+X<@l209Y@8fcG{dFXU5s(9C0piu5s>k9&}#myv2F1
z^ItBx%k1*G8eBzJuj_ud)NOVL+!wiD^prjOJTG~(-rIdrU&wd1?@r&Bd{6ol{(b&8
z0zHB61kJ%fFde)%B!t$5ZVTNXdMxzq&`(0Y2}i;Q!!Lwi3I91V5SbadDDr&dh3L%a
z(dhj#b<7-F5L+Hw7uyzlEcR6FJFy?eK8P=lPsDGFznn-Ub|$`(cqUOvjwEkLRvP3D
zJq`OBo@n@c!v~Fv8*ga5z3~f;ucnNt@zh1BD^pLVzMXo$$=u{>+Szn&)00hqO_$S`
zr=Li_-yCWlZN9wuJIz0A{&VwRoBx%OW;~f#CY@=`^kjxI;~7TT0@LYe7V<@cwV(bn
zCCwcVE2QMj?3d-TmpdMo2sk8Pmat|SYkpWEryq1YOj&!*6g0(irf`TF-+KOe;r?Uu
zLIM_%KwQ;dk*9<Uz)L{umVDMKD&(P<8C$-XwZ-@9^x4#rDZ$>dXQm+8zjx2sXMa%H
zKcy6IZ^Mwlql0uWEeVeq<KRR0R4Ya~_Uyjq>Q4oqa1A&}7a^rsyjZfA;$5_qwP#8;
zyUi+B<cjRTE>{#w=re4fCAp&ZpQiCrD4vnvR~CgWS6b9Bp|(NOdTN%p<nj@fNhh8o
zYth>*GOeYUS7;Rzrc0<?t?nG?G`U4%=?vd+UL`zejE@<AEuq%3P?qajRl<LYDzl?w
zrujb<4y(0$R1idaRMshr>OE8<yp+^B{ZG)!2jQ@kPVc0h;IXReqx5;<DIB$f>kWgy
z5sPS#738ISF=zKtQ63J(V{x0+2B=x_EnlkdVud`LU9pg+g?x#9%h^j7fI+UXWi9cr
zg3UZ17Zt@7gOa{mqGlmAVKG^nMT_*RBS`~I#B}r)YdG91^e?=L2F*f@N?jU3BI*?q
z(JTns1I<DUeKqC3QQ306#$J+5>-TiHblVptwp`Vh(ixo&sZ}dF?6Q?nw;>xIy~;E)
zV|UtamODz)V|TqK7xr!!=!{=V+KvdXBvKnPEx?(K$f_?3cMAt0Nt~dy6r=z!S14L)
zh!Q1&A{OC<k;?*s#e6Izw~995)TZYxhK;it0~)2Ud#lkxpYPefc6>0maK5gq$28;3
z-UF-0`U{KC&~<m2X9zx(m&%?#%c<8pm6ca3??jBN)~q}{b7|~6!`!uIZ|elTU@g8c
ziJfnlyT;^cU5%k)1sJNo5q1dYL2i{GnTVN_D{uhFvVj5QAZ5M48yLNb990-9!;C_-
z<+2PLKqsyaht@iJ*NwRn;eFi(oAw&DUegkY3~Kexo<>Vs?7-d22Xo;<^Q`&0d*`P6
z$_Y=IUO2F7*6j9Vt1WcFN{d`=u!{x_Rfvn5qKox{RE#<L69*<1=J$HP-!*-k{@#9S
zY3z2+FSD^zteJDk)xu*~#l*rFT-Z3TtalFxkF{i{T?vH@*Z8VGB)^4zX(GhV#|}Cw
z=5RFw`ET8!?*6GADcj1GK5^y7EAH5|!lL>7BS){T-T%bj=8J_q=A6qi7+{%&d@EPl
zQXNzKyF+fD@!F%0d|qQ&vFVP>H!;DCer?djO2Pzm12#6^BU_bWz_1QN_7&U#D>N2o
zceWSrYiKeg)Vh#J1-;v8k6WlzZ8c~e#*oh8km_SSMqy%(!e&$(<Wh+_oNcxXGDAS4
zGWpw-YN^g-Q_SIgi)4V_0lnCPf!ORN;7)F!j3t!fm^@eq7zmZg=nWcmcb`lpYJ7@E
zlnSZh2D#8ozaKm#wZs$>dYM`#k=!oTJ4Ctk8kqreN>pzke}*RE0zGFrF#ryjK@lt{
zAJ<cS0aaY93h8_e3A10T)<>vH7g1VT<{l}yyKJ$%#j8|O(V(a9MOJg1<A=ON%e2V2
z9p!Mv5J6P5Z0^V`>^Ju>%+NwQs#Ilzu;=+0-XPCID*(=me8FUG&)3*$Q=OYq;;r6B
z-i589XMBdOHbA&&W?b^!Y17mWqf)E6SnV)ah4WOEqm|noTBFkE6fW;D7;Wf7z&!s&
z?-%w$AH+<}a)oHeh#3CE79fie5T^q9gCcc#GhT1H!(C1<S{vWqG<TVhSuy%{v~k1m
zU7tPnTzc`*H%2_!rQf*XPB!*X^*y>5whQo*Q-l~QB>9k>-?CV;@Oy^8ak)ulSWhkE
zMnU#Ko{o8xUPZGE66mLDw;+qD`wYh()=7;4cE5b}ZTc=`PK1ysD3dSFSV++&Fpk1#
zl%az)1NFsHk$z898T`V7XPuk=+@kWVoZ9U)8P7g)=GMf_m*j@SDV_EKjc)XX%g36^
z;U!Mp!rPb6n0lnR3N(hklGT^#H(-NB0n<>dlLi^<tugK}?<?O8S_7O4c|f}q78k44
zbp4&V!tnB?<+*k$m1(s`zblk&hzxs*XCHlx{;}-J{#hR@e0y8FQDJY5%p6O_0_P=t
zZMv6IKm+j5P<@}iCF};5ilNt1K@M@6FJ(({MFG<(@l_l)b<rFs99?5Lq1e?&de^LJ
z(9c)W4|-cmxgFD5Ob)Ln6{Xf8r7Ca+^-5pbRoSQYS#(F_(+dmc9Te5d%Fl${%82BM
z&SBJRIgPzfuMxI^bEDT{ZOJpX7Y-=^Ogmbz<D_5X=!`aSE|w75ztwG0It?CIPbf!e
z%gp?&9i#c}4xL-&?@zQH=pPX1A9grnW@k1K(2K#jO2_8@jaSE$J(ebI16`Q9q<0we
z&Q|}MeigR3n_<?H<zS96C@boNLEnrHi)J}vz~H=pA75%UIy3EVZ9*R#ZH-Nx7~hmj
zuV^cmONm%oIJa2z4p620u5hU1Q17|Z`xkxd<;sgQE*u`&JCEb`Z}g|2cZOTskEsy?
zh~7u7X$nFDqsPA)<j;l>isy^N*8BF(HY>iU=yJr1<Bf-1L2J9#b-hlzc{ryvXwAY-
zg{}}cRtC&kwbbhpEFyJ#B}#8QJx^s4{MOJ=Qyy4NR$r$-7WTmQvciI5Isy7&pp;wK
zlGRhumMv07!ay)n6KYZ?P48dg7Ih=R)DNg9(dr)T*ixvxxZ#R9uEvg@y<guxt-G~>
zzSf_T#a&Hvnkv_Md<|~Z$co-6^uW;2yfgdlv9Zh6FJ6?J>-Iwv;qd-D{UYeh4!e%n
znZ^bT0}jPP4axXsluIx!ARi<8P51h!&OFf2Zg7<IbLTG^TfKfYT`@apnVQp1$u+D>
z^jz4y>W&L8soZ@#ee$A%YaE(c=mt7ovidgp0o?{2&kU%)4IR%+C1`J~UPb;zcN$~F
zXnxPAz*!0TZ(L!izC)j(=K(qd?Ar$+9L~p~)D<HoF7BwWqt*Jr0=MU);uXzZR6gj}
zFQ-axRMpYa7Hv)#rzCS1QJc$ez#Prwa={0GCg*9uC)7azHH-;H*$4E>TANvFF}(Y_
z$|!7I{20AV*tYnR8w909>v-e8uD6wCvbfWzx<RSb2eb~kynMnK!8t9le9k7d>#0I+
z1*VE6sHwnX%n%r)@~-A9iWhlZbf|T|t=y5J>0p{(luPy+W0|Nw5O6lBqh344>8k#k
zhCve^PWyS>gXt9v51{uP7djw9xz!%FfgBiZ42}8n<912JU^0d*4VevYPhcL6Z>b3d
znsK{SsjkJM$82#>SNYs*D5Q`2yDz8-3n_6_e<wT)+E)YnU9iWAEEF>`{9}d3vC2Y>
zkH$d_L@wGH>#tELlL<^0;?j?CZaavVONeYqPpu-o^{Ho{x_kd)`wa~pcBwiu60*!V
zFs)ME&=8BJ_s-1emG&M-W3Xd<c59G^Wrw$EJ3XmI{)gz4`@eJWfx8by^{TXTSO{JE
zpF@UpC}>Q2d(4zdOm2718jIL`KR0OIg(LS@)}5`(`<#HAulk;_AAV>FbZl^~xIzL6
z0}?KoOKC{~Bg8Rdm|@Xu75Vfq_^^V36_g%lE8CtG!_PkzU%z;REua>{(*)@{tFCKg
z`tnGixje9;q|;jT&AC-7ol((Rn0<p^m?B!}8OCQN$9^R1k~MvXwyCJh6j3w$1Y@Df
zlC0UGbt;u6rP2OpS!l~F2@6>8vA!&fFyAz+0Rj$VHTftPuvqkv)Bqzy3>YdP&yda*
zqAAU^i~7Q>qlYX1zygG0Z!klPvphqM{<0%_ZBde27L}NDInfMFMiAP(N|i>HEP9fC
zgQM#UEi%^(i?e^0FtyNBxwY6_YFZq1Io0;Y1*zU+H%4VftInvFDCo~L9-YzXp1yJ*
zKgT4|h69b+iN+Ste4=_6{0i5?<3nT&aIpeoR-7e6HGtw=1GNHUW~9p12Vg?jDv|2d
z3aL<>c&hLG^E$2?Pih@u(R99Ne<&21zIpYSINodR$3;}C9J7T?*`+_dZ&TipQrm*w
z#G3FhO|9IqXYstQ7VRV)9}*S{S7A+KBvHOjtR|3ZsVHX(K#f~+$T1}2L=AA@?((f&
zp}{RfZh!0xXU<Dn%<6(&D0_`!wzWmRcyQ6-?$R5df1**W6x<E@>w^vXm@e3*rr*_g
zMMrq#iCZ3?GmY5}3=VsRt6}pRU_X#3=t#<tB9SYikQ_|qtO+U(l`bKd1<NVPO&n(Q
zwv}zPa=@%8c5Jdp>4ug=7tyow?%^{g`p)0iaqz;l%wW))lJZfFM5;B@vFP1)+FR(L
zM+;-NzO5B?$dCkl?%kAY&FFia`3DoqODc~_q&k5q4@`%9i@pZks13e0#y#cCxCHxT
zbY;rgm`Di$NQ}Y&Fo`0bW2?8;05HL<<XBVyj@Dc$MqksZ)q-DU2-%j7$JA=Iecm;3
zi_hEapaX$5Zlx?NGtE_LLq=^h>S@R<b9$r?8J7ri^Zg^1gmUAsR4c8#r!biHGNV1H
zrBY$M+q}f$(iY=pZPKhC^yv;C$T6KRQT@Gevv4Img#_L+2F;qe0eQ~{R2vu;GEQQ(
zV8qAii;W-D2mt}cYZJ~_IMiN^cmJk&cMkOn2Xh1KyUW(7$rK8&a0tdNquE6Z$7U}c
z_klY|#qO|LE<Iy+-b6Rc&1$bX-LWm-xN-G$zn<Z1EqF|7rPbz0Y6bC<FZEqCb0B3@
zw2vvBDn&r%>dO1sxW(%0k{;nO{G5blAjxf34$XWqUy@lxs1kf|u<WsxAxUEe*d+?N
zmqxk3FMv9^+VL3e>p!c{&=B%TDqq>T`(L_zxzO0z)9Fauv({p!GpWh!YgB!!f2xqK
z_{?fetI5!&?)Zu2HND!AR4Eh?QC9kz#~##Zi#Ys(Ik(;3A{UElHE2St{)1iz*!r2K
zQ!+7GTIY;eD0QO31ZdkCQ810iO+~vzer4H_D77RC!;+A?!P*+rDCx$1TM{vQ=Mq|?
zrCIbxPMP5FYgDR;SDMit`=>^)b{g~nkD#EhR$6S7Rt3-_gU>qJ2s_jb4Ffs^fWUfZ
z@(Zid#I;E#T^2ZsM(NZujLzQaL(Wz0kxsWF)*NUS!WNU@@u)4~;IX4K4+eZ*lZ^2I
zX5aor*aw>eT;I%TncWZT%u6T9g{?M3L%4aN2nnDVF9kxxaGX&)n`*%XR-heB_N!g}
z-nqXP^-7h{c1f!tvTcD`qt)(idMu=LHKts<tTVM9ry(KCbz1e>s8;<m%g_@Vtw(o3
zQ4{*wRZ6*9q;w!9KBZI`BT8+|M5%ewSua)(3Y$S6u!pIIyA9B>-R7m?LM&JZIRi?p
zjuA!;i1nJB_l(6fTA3m_rSe>KV=`vz>F6nC;^~n&{-FV(sp7|Kb_A)}9C~r5(ijHZ
zE%Xl_nXCwusA*m<<1l(nG6gW20f?FNp+b?#Lfk)$wPS|hX4J_U1H*hSn~%j|GfLzF
zRu=RCrUcYTB5!8KO@Z-I_G`19zP@50Khn@(Rw^~_G)<d)E=N-$77RNrT5m|YbTD<9
zsTkDSL|d%2(PP&~#tQ9c8W&l-D#<lbs)25nP%D&vt&WP$%ChDFNGT+dsg%l)b@=t(
z%71_MUh17+`Mb#_*aH%oCgh}&2Kqz{j;o{?wa6>aF@GkbftQ4b5bJ~Yi97#7RudDX
z1!`gokD-~X@Fr#!g5kkn0x=MKZ5;~Zi>Oj*4jDzEa^=|A!`}Y1$C#ojhf5nb55y8W
z1x@!x^>$&OBB@d;jvaA2e3a75DwpczVjM$t3Q`OGZ?#+*mxzt_%F|u+klGFxE91d$
z3*SQKf(B6(5-~D{0H+JsEkx6#jwOs8-Zp*1?FSRyB~N|#se7O?ZK3%Guh@LuE!L4Q
z(kb_S```ojvU`cuH{qwc9FZD0OeuIc?gNfZxK02PX3MF@%vlG(BKT%q{)DYQNsZgn
zi9~AF*y2@{Jz9f)ra@t%gI>L*WwgZ?3iq$Nsw<aG&q#}s`B!N*8vA2Mrwi?=O11X~
zeM@0;TWx0h{-^e;1ERwnja|1oe|AHIO?^H!3I?;uf(f$uj!L}H3$)B~tm&<_`4&H%
zaE+sLQOp)S$cbS^n04{C;f<d=knj%P@qeEEKX;w~#O#1h<Fv<g#;K8lKVmIRq2`+&
zx{`q<dmgmJ`~Ks=cV?)3UU+EJQ+?r5$f0EXfWhf4;SRv51Cb>Xsmr-A^UX}EQj9bh
ztZFI&6zn>z81uuwRm7n1udsxeQO&GN+Ey^D)z0kf*&}A35rC6ZsZ>e(y+%{EH|q=O
zN|BY@i)o!L+C>cwmm7_qZR_dWWQsOUZ*S}^X$@whii%dP-DKIjw>5i)#-DOT^^RSu
zON$-WKw+^U)!1WpTl#C7mjp@bu432W9zGXe^{B8E`b7(qhOk(;4+ahsZVEup;%F9`
zYYS}jxS&*UI}zLko`PbjPIL#4&PmSqr|#W7<?1EDbt$h(uQDrA=9sxDrLis;U2?^8
zx87`#CIT1u*R_h<X4{M5J2q`<54TPoZry*wlw{tn^C+gc%aVXATRwNeXv3Jwq*rU#
z&w0mhk{w;y>GWeA8mjLI_X^+Rx)9S|YrK`gn(-G7e<^p6l(<kgaMjnw*bg0X=6l*&
zyfc;iJKQ0)GSfJhijm#nj!-BvaHd5`#{+qVN*izp3O9XJYZy}LHI{Ti3>ob4s4<mj
zpc1X5GTp5JqX6hQPxzhiCCEBB*-94fxrD+{<GTe3<6?}{StW=-0iHGA-MF;;m`X;+
z%EP&|5Y((}Hc9*9r4GIC`nDP8yhu0c?OJ>GaAnTiWNaE;9}(qBqjpB6+!pZpGr?$v
zIZc_I`<1W)Iw_O_3s=|8Op)Sz69i`!A%8e|0U%;~+`9N2w`QbEt?3Q@BH$Qk&1SWB
zpIg{sG(A@NeZl?YO%7!s;IsMKj@^C3xqJ3{N)DD2BvyYZ`3Cx6vZUseW%rFC&LOYu
z>I7o8LlLUEXv~tc#7_S=y}s3L{_NSd__xHQrWg@tZ+7&zn~hfAym8MV!7TLn>|XRG
zP~rNS_f(z{gm5XURvJx@R9?-0^Om-3I{n<YyO3qT#_*Of2$_PF9%ZbCPm3)x^o>4?
zC8%MwB?r}lF(U=w4_F8(cPZErb&N$fHw81<#<pz0w81lbs%7Nj^&@&uI<nYu*knD!
ztTIk%_I+i|EdirbCL0@?9)3LNwPyeH2ane6uw0X@yrq(Ic&p(fdkQ?ZnUHP@CMYl$
zZ_X#wpk4&TnK@>FGQ(F0#uutFgJ&f2*l@z@3pkvmen+=WG`2b-371wT6KrjERk`mR
znN*iq*1KrREnPaB-e6mPaco^S6$*NSExGAK8Ou#ASt`iPKAo1D19h6)D69nkV~$<k
zu_Q3LD)XgCSdoWL!bK2<1Y(e4eF`Se+@Y^g+B#;`I`p#2?`%Jz9UJ7+`)(-NoN{Ag
zD(wiXRKjIG)4q+Bs$At-HQX}Rq0ooul@|grVWs!WdWjVHa8{or&$2ueLfp`P?eJ5@
z;t~tuMNA6B<r_6^di8t_gs?{4W?TdhyS!6Dla&`FhLlP!Q_yj`(ykO#8R0EH7gzOj
z<nPD{(SeS^`I!<W5g2Oct1r>mZF*tOu+=O)(Q)h?N0U}b=^i>)tFc-5Z;jP&kgwOq
zVgc$c5<nbYvl3z?aRs!#joNmVQe9LpG%3q+X_w3_+-#OrZmWDzp;2kmRPy>?_Y0CV
z%W{A{KsV9b1QFf|jDz7Y2d@LB#*qrDgEW6J76=%ksrG1(R~z-X1XYW~LeCLIv&$i7
z0=+(^*=AEZ6=weu+)oLAhZZsvQA#_81Vw<0OC~ErN~1#6Fn-{|)|jA(tb0?TNh_#S
zA~dU&=pDZ`&}+yykt+t@yM;*)xXKKW+s4#I!j!<Fk?WZJ@xgcbeR?tSDnOCoz|0w<
zU<;uHt-odrpX4_I2MU85u(OX&@uZh(mi(QL+C_)b-epe(I_9>d#^^|+Jv87DB>INj
z1-g9F*)z0krn_6Alro=)%aygp^{&R33}V<zBU)Vo;~?;jzW`bkk+DHcwIyk)twcaA
zRxrgV(;v{Q)#eK%;(^Yo<8yZRuQ+oM>P~OG94HC{8mUyJidUX4T{h9Uf8$cRG<58}
z{S9jeu0SZ3!NXU5lkTS%A|HfA8I{!?6nx3mXH+xJ&@bKZvt$P6uHLY$XO>qbI<$eT
zOB53g?Y_9qvZBM7IRDX!q|<GYYprTmIMUjgNI>W@c>aU_Lf8Vm2fpAUl=~85p>U9L
zA(*un>Wm!WEH*o<A}+t6FYmEie4`E1hStnJl5Cx@CDo$cd#$DW+EIVw!H8{E<=CF#
zWgC%9VAi`mI;X7Cs!j}Mi<lGlBhec%ryz1F>a&VZI=L7p<CEj=8ZLdIT(Zyt4CD)C
zo`w~3^N`WAQq9tc)#T{AJEZC;xkGY;R$=*$E-cCF3p(FMbE4eYd9<y~BME4OM*j@4
zl!C>n`NOP;RW7R9Ib6RB*W-C?#uRYGKeJij{{#y~z+0~1>TRAyj~Qo0){<7MjrdFr
z%8b?7pr$r!SqD=jwR=v>ApJQt8I4WS#on0`YHHF*6u&TgTzNXKq7s|OasFjZHl(&n
z0Ov9KWqKI6Odx-Ul*D$*?hT}3(WhxG_?)#v@ei}+Pzh#22<~?~$eKCSE}OTexqat?
zXJ^_%{R`)9OJD77)671<C*R$!Z@qur`G=Qw8)kU3z0-YJd8DbBUzr{BN24)EZd&uX
zQ$owzf1A%^y<qO@>hI`pg#9c>LB>O>Y`QQ_VU$4CEwN|^8yAZNU>LN?UM$)yYUK)}
z%DFx0DW&_%`iw@r(KY<-VWUz}dDmwZpd`rjp@2|%(e2!|d1`|vsPE&rR#)F5uLup$
z&ta8X*dnbNi3sP)!xAQ0fmss-=mJ+ZVMNlyrt_n;rL`Dzxy|%Gzi~{hcGv>`%2Cq@
zZF8xO2BT3@c~tGT5uy4<b(Fl$?~R$9cy9@Jhd~F4fpwM8Q%zzXu6J>j#%@m01YH%O
z14{>B!ky5MOJR;Kp&h11jnN~i^bU6W0|qUEd<<@4^)K}I@PC44;MfiWUOYyG(SuJh
zrJJkV40CCyAc|Yckp`O2248K~n<ZZf`KBt=T9a*7M?R7kjb<Axu6C(MXEGRs%C_rZ
zr|s}HtqDdQ4c#-kOZEPKPgsBGzSdt2Jpk744@9lvs<1U=?lFxBF_X>a^+}F>MH&K-
znU45|@H^xzBL~pTtbewq`1T=E!$tTLIcLH|z@u<1=lKv!i!uxZ+x4ZsdG@ZEX=luk
z(TWc^tb$4FiNqU9CcWKmN;DMgRyxC-aC=H^ZQjO<#+p0<L*L@o`>ZDaxBJTXwanAo
zsqe|2@&mgAV2*4|Zwpe43DJ+*n7U{d4uU$3g==JJg%INd7z}pm{jEzojI8q;?Y5Sp
zB`IXGqDZH^8@wK$t9#%x=uzK4{^)@J>(M#)pXEg_HQw?ry%TFp#iTU+mE0W6B5=W(
z8KY}DFn^(Y%ZO>|_!lnPuzX<m-u??6v7tk@<e~G1H?BM@Te}ab&ZfVlmtl=GF>eaf
zF`(gaVg;}Yb{LpoPPKM0<+ue*iW5LS_RKo7{L;P|8k4QftRHF^mBh^rgRQMI#xrTh
zuqSAg7}o~G(mIJwDiiGjb!f~=`URy~?^WtMnyj>=JH6qc-biC^*EQ|w?JFkdHJiRh
zKZ|*J8LfjWWEq#X6qrchs|u?Y>=~@<xn!m^JE`j&o*(R-HTU9-x!`j3=vvEkxO3n1
z;7z7-Me*~dZM{qPM@_*>SnG%<IBma8cK~i+R2EDX#GMwv`xxT|(AWwJ$sZi>nncr{
zq}<{xDU8!X?x?ek%6=g>(xlm{FnF|0Dnroa>kgpsfZ^O%{X4vA2e^FzNZDcMaZZcz
za?Zk(jGAwegO{<vITB?qZ}r-&fyGYS4@doCRHthU49)Ra&z`#LVu`koh6>;STB{|t
zH){)ceGaovt@enKk%<}Hx9LQ@Z!!G}=QfOI)_53;CUfRCnI>`1EPG5DJahJ3stN3L
z^$wXWH1kxe!DehL2YwGD#yzh~;)ovifBlvI3i<~8&y?S9QpaG)6_Z|hEGTC0)Lo@4
zSpnbaypql=6B2rhIoM$ccP(_4CBZYAjH16WpP-5mJs{aLB`@k-KDAbDvw6HempOKI
zY_lAepRW7NMb6mpmSKz1jLZ_ghW<#eM{Y1QC3{)|(=W?(aID@!ZI<u0j6{+i<bMUd
z;%rMKU>$WeLF4y1r=2n1x^%TPY%&ElK32nxq54N*H|_=7!Vbt_{c~-Lxunwq!w*;Q
z5h($tAQIUnAgwpk(TKURp)1^KO#5<Xou#=m+z|{|G8T*4S+Y5nLD{!C^%;jN)z_Cl
zP#Q{K66)x2yBoyxw8gWm^VWHNn&93)I2^@fZ?Y%AY2<J8w}35pRW}#J`7A7|8p)wY
zkPWl2VZMSUnNEta@B=0{n2YJ)wAPF>xqoe@J!XyjW6I`qI$<;z404TehS+S&xFspQ
zQ=DQo8q`LQO5eJ5eoQoW9vUeJ8oa^$)CCPDr9vw)tF$F|YqPx967txP41+uZ4)0OG
z`%1`b#sO;mb47$f3%y$ad$3mw4U10W_PH%Kr(16fMh6`6hG=Hq>>gX#RA}g!YP1cS
z#h7SL<iFWGJt$VHI|drPHciXr1M6z*<cIV>=@pDOk{Tuzm>EkYf=U2E!cc-8S4HS{
zjBnev7Xw-v)zDiThIZYtEisZySp6Ai?ooP1*s8sJze%oN>X%ylkDjBntDAGvIZvZR
zQT-w9gMS$P$N<Zl!OWtce33J)ORTw$*m9%^XLn!k)G3aJguBb{$~4a}nf0TF?6lcq
zWsgg1@M@X|=J@(8)_ne^wy?*R7~UXiYC3$px}5Bn$ib@!j3Wy|HFAX|o{FfHM!&(V
z5dIjbv{Yt@Y8gd>Jm4&1Tw@p)?0Fm05V%f&;UU(Wh35ha5EEPo)yoyri_3B*%lzdY
zUza<Pbo5SjVt856vUOxQqEnY<jckbb`{oQZYrF=nOP!dul+l=!{2ungIm|<7sT(6K
ze-VrmQ02Pi%}wQ!Jspb4=zuHUG8XfO!g*;jLC*;WM5}&wOy6rXHV(&Obg~$`4;4kv
z(0>{Y$isV?zVI~Ks>kS2L|m-KwTOamrH`byWeyt$ky-f)eV85BepkywLQI~mXZZ4<
z1sjD$uytT5nd_pe2%f^J>br@gDw`N8uA0@ebeO)Mk!#!;ZFlF~<~Apz&AOcgmz;%Z
zX<^{-#>9n9&W4n*BH+Dleg{<h+E{6vzKOAhk$wLh8!N_-IId(C#@a`&prsztI@2s?
z@rvW;MsaQ}`7Q10A*C;$bZ!=M3wp^4+I~`d5879fLHZvjwKt-Dg4{@LC$*2FeGPKJ
z|50lPmVDLwBo7LoL40QlGB}aY01Nvg@#VVL)&60ak9i(AXPPuvA%sN*ymc%%XgMA%
zES3!Pwv$56nW>3=T~kho0V<4oDz8Nc*Bj=|uf?8C^|;|rjz<#TlTZ6{gK%;*+IBod
zctPb$RE`kgRu(;+b*oZ|pfoK~`hI~26+M$dM#q-<((i!|C~`B(@H=12Jdm|@`AHF8
zOjsUf(O@t~&J?jwSlkt>Sx#px`}m+Qos0}OX=b$sd;Br!G`ZaM@$uh3NTdcHBUTt)
zZF34CW6Lz7k1`tJF<HqNr=PFTo;r;rIsJTiZY}aq%5~a0@!V`qKO1N#@P1-@j?>94
z)OWm{$I>K>7W+tqrg})*VVr|LhB172ZY{Zh+IvVlqtg%1Jp%e>bZX^v`eFNZk~r_D
z7vY@A>v?QL(vJ3(<a+uv+QBgSJP}){_y5fCwE#8a_&ElHwKPCy_7Fr_<*3K_@Z411
z|I@Vjr1l}+&(-t?C$-n+|0<t9?!#l>uOPN@Ir2tgY(y07im4Y&1i=OXORNz9C?Up^
zE<p(p9}*A)_lAN{=sR6!OyAI4n7eq3L+z1I?7#l-q6VdtBI$F@Q}@jM&5T`$2DFqW
zX2KtL#pW}I`p(>QT~OcXS1Ttjec;}vf+7%7X(ZbDM{mFX*l&8Qxtk7-O}k(Xo1+gt
zo-avebKE>iM|()&Ma&0rlaHKROGP>e*nIn>a|0YUH`DA%?H068kf%uHcsut!avZEB
z-=?u1Qf6?*O2N8OReuBj%U+h5U_;Ix_W-lh4hAL((_#Q76PKDyMAxK<Jp7h)>eNiR
z^}1Ejgy0`<&xmx#ioqqBTvTjLPM?t2<gLBshMa3&d{1Aw60)dO8iS}5=$Z{%HVrg(
zc)gb5cuR76ZJzK$35$?Z)wkrI7*#(;_0jgVJ5Oz2U|d6bLtpA4v!6ZXHwnOVC8~ZN
z%uMY;Rw%n8hbQYNhJGeSO{e^Z^}nW6znaqx{A0q^(5bo+pJ7~-$<))k#%fj}`()A|
z`EO8|xx&vqn$Qto70ToFbfZZ(%sHnx&q89lyBIyyAtRM}Qp=jR*rYC1gPr-^Xll|$
zqdV2RrqM@E^4C!2$I-e~i5~8eqn;D}H*4V+JD=&~li7593QUu&`vAG}kBNMgP0C;V
z7zdd;5RlI7h;+H*vQdd;&qrNlCAiA8-42beZ7d%)w#?>y5OS2>Si}EvhUaO=@n36?
zLxx^ft)Jm|e2?BF6oIea4??G0@8|ecpU|%4zLQ0um%a~%@_*-&_>1*Em|x|;(Dxd$
zw$R(YgG=zqa|Gx9BJ?sk`%^lh=9E-Fhx$5pu7UOSCoB4z{0+Cyg)UBiGs(AFp5eb5
ztJ5EBYT*nvj^%l9VYbre9G`3L9McyLl18jgw$^c$&zGI!^Odpre)Kmjye}_#EMM#E
z#NUM2_~z**f5UxeZ@{kqJUp#QW-CPG5crJm!9uCkY{0|8xFRECn-!HPoE?CA>(M!O
zmfkr&uczoSDG^SPSz9(N&o-$Qb{aFt)Tx(~zL?2jb9>|AP|6($#Kk>_!d`>IYE`2U
zqi5qvzfSF^KD|$E$TgnZU~9;=xPzgala5#^A8SIkHJ>l+L}3}m-nWEtu!YBA#M)PY
zx2;8mC0nUDbNu=qT;FR-opODE!C;f-gmyy}_K48U@AE|UH#oC|->24YW7n@m-3@ES
zABz>Q7B1!adZ0{}uSc2qU`eh39`iRMWXw~O0LfZv9>RquC|o?v<D=<(@yySWy+>Po
z!vSRwsT3BIy!?@5z1ELtSvN17nW(4r=^XVuKAWXaD#%1#)Dmnq$WBPy`>0N((|wrV
zC#}uLS6vT1{#^L|d*BhPaV0wzJNKV*4#)H8PviRst+1IR+hTI+F&+mvAkinsmh9b2
zM{P;zNx=Zo>T;N-C_|<kX6X=fJPT5zOAO76#@*d|7%v}&1%AZB0!q=`VAR6e(XqL8
z`ZNs3Jdcm-N^7Z{ZtNjB3oryjg5w{)eXL=&c8-z`=t^(k++ZDd$p4efKpsE*sLU{C
zi1M@acSgzJ*UWN}TNvU#WojUuk?-slr5Pplcq3X*Ppq7Z7z2S1Ce^}EN*EOGa;DRM
zv%;yc*(^$5Zy+N&T*suJDvgl&``-lL>x2CTzovzyB(bT$tUGBYpBUVDA%Ct#(xPgO
zYP~(t_Egjm2we0D;SPF>V{rfjR;J98<E=dMaUl@SUy$c0nGWAdglCLSj`C!H^8~(6
zmjOvz^5>d`teUz#5v{K$(vgbk1A#C8+q6jG4(H;NVO=SGid;#=afBAcaTKsG;n%6f
zN5e+)X(BrGJyz9J`R2z4c7*k{f~QLI-$Zz@SgYp>U#RD7nwU;_O4ep1T3e4brw$Y~
z&@r>%n92r!^`w1Aj~=(Wj^}UQa_lq0*=eUKqYN6uiHO!{JT;y3q(shR`$mEhW74FN
z%0+!FlJZzos*@8tYrf;1JTBG3G7L+f5Rqcq5%&Rp$WaQ&C$5L7Mn5h-1$8LaA+0f$
zLeyd$n8LN8v?`cCO|XjEA}und0W3u-<18f^(a~Y10h#6Cf3TNpw$=#Nl^+%YbVZ7U
z0Om6}nP`vO!JjH=)}1?-VyWqzjBI<u<x~`8yZBU0d_pFza3^1VVbOMc^&Puq((wHh
z*|ieXS1}!`A9HJE*|p#rY-W(a^i;0#se*?;sLe`6TO%KGkZV6>K#|^BUy`Zg+^_QF
zzY8(~M=aKc_!oS822d2J{ltjZD<4L>rk@hsV!w4EpK%BB8IgAx;YM8vi2X=5V+k@m
z0}Y6oKHyluJoA<^9SFfpZX(JRR;oBP!?A-32|*JSx{-QX%XG9kTmxmPL{{kM$&SY3
z$&NB>|4!{3iT=<mk4$i)6c7QkfL1HWymz=F5v@e#{vEf)eoy`cT?5r@7Av<-5kpX5
zXv~dQELkyh4C`~&p!q<gDA6`GOoV%o;-{gR_hmtw67x@*=19$VnNo;kz3=VSsHnLn
zBawFqI}^GS^^?CsK4$AW58_F}F0Kpxiil{3uF7M}?D|g7%@AJ?r;{~y#%}&c35@id
zQ>D)%pE9TM`cni^@_(4+$mUhk&qpAiz)!KxPpb|{d9?47B5S02I+;{?{o?~}wUz8t
z+CE&$8$U4y$N17w$&ZCApygyRTIe&i%!N2uJkQBw_9hqpOp#&4T9QlHF2?+J+<=4U
zu24(!j~!3wgm932F74=@JzCD4!SXnl_Y^zIyOSu7P{?%#vqd(j5EObXt$fxbp}nbc
zxwHN2^Rtx)jPgw3e&z?c{b1ZPuM=*$q?e_AW(x4x1%g^_e%`#Ka-wn#ciRbJ=BH~d
zRgOFAo`q}Vx?9Ah51j=)0diH?PtOFu%`k0-%?$t0FKdYzY-&tJJJF!VWRC|TizO~4
zV!{?dVbzDGO-m;~bJp@X?S<shY{Z}!b+*nk+m+eov`Z&9RK7cN#J058c)7+W>56;L
zl;{)MkR(^$@%b|fCBIIu@flq$@oX}$l6UX1g?rBu-yRCu9AFm`o;!AjWC-hE4zma9
zlHp|jDcEYUz5i|U=DO1{*SY_jj85V9Q<lxK3;#c5c?!r!dYkTpEO9X2!OH$lyLfo`
z`*dN?$4{#_x125*dh2P_<oiz_Am#f1QDG_fp{*r<qnGuNX6C~LRq=C(ox<j3w!uZm
z?dtj9aV(F7{f^1~Aw0k3<8aITfRGCaD@=yI?QFf-K3y^^Z9W}JfBHX9ajmNYCo1B{
z-uxe?y&~7+ABZJy;`#s*qdvxlkTAXHQv{jsK9!m8`J}k>>7@UQ|27uQcs6o%B~yT>
znr?PFStMchD+|EY%Fq6767T#|$KLYq^Lm9FPtjkFE&d<m`U=Q>L|k3?Gi-}6D2}@e
z!$!#`MA)f<85E7D#My;E*X@X*)5qI6?bm$EEI#yg@*dU%WFBv4ev}39bF7*3QU3~Z
zLTffQ`5is0hqN#c73hTj2C>!pI{G}BUH3&Vt)FARV{rmAc~JOa?KfP9_#yp?Fpjyx
zyGS@^N3IIz>Bs>Ae^*R~X7M1DT5#6D>TIyM=y0tjG{K^@t*tKx^tCYUV1JAG%&S?T
z)@awUNUcD4b?DP9Ufa`SQs`K~)~plv-G-2@TXed3(3aWGY>cCzA<XBv-2bTUZ0G3s
z_ldAHbt>_E<5T6v-g^o&ZvHpfvNc_d!G0RXj-t$uS+lkpSU*1C{l=+dUjB(8@Xwz@
z>I*(DC=U9l*-&ZFzy$dUb%F+dSf>qM>xx)yl<Sou;vG9+TkDuL66H*W`I!wcNGv=B
zfHB!{$iPdYz=vv~IVdm8ImNx|Tt(+D4(RA~!?Z>5WGQX(xCKqtH2$Q)WBk!nJ(Y+}
zLt{gopIP5IBBEx*qW2C`lR}7>^g69Rd2y)klI||8-uE{Ro>AvDjoKpSP~-qrTZLt#
zvzBl2yB%UceaXU?>`JL<(<$s2I$s0478Y~CGY&xCPULg{Q&@vztmTp&i3N=P<ioJB
zvJoaB5Mac}krN1O3&lyX-F-(~hGf~Q72MQ1H{IlMNE}lR(T;_pI)3xaL9N{`C_MC0
znbq&prWS}pYE@-AN*6RTFU%fB!`~Lx<2i{67N0B0U<2XqQ43G%Kmtt=b*<d;hc&}e
zKfuH@toWS4_j6PynHw$7#S`OZIh6&qP}!pD3d?OaWF?NbxjM_56@|D-tsNKWwHE&$
zeo&b!SoG6F);3>SW$A3mjNE<cz<4k~<xZ<o&0xXtEnE#)Br$)Mqx6QPh#dPx46B{I
zpoVAIv(;RyEk{;0RzK>pIU>1F^mL_f3~DSvh0P7cZ>-|tc=;P$5CYE_U+D4<;_(>6
zOZ~d$9nGS6)>Y0<yShDGR$0rAp~pq7Tp{3u&cAfnpb`hX)<DQJ;#JsC8D(2#o}zYG
z!<Hw-)E#$dEc&ay7Sa|k(D}qOuM&SG)@$Wn5QiSunylJGMJ;OO^cGDn*Lg=ud{QeH
z%z87cmaEVCmx3S9a)g(|0w^OliaA_ZK#_%jIOQV8A9^j$74XarR@uii3CxZ^_d_8+
z-=ouN8+T>LF9|rJP1E=8_DyRkNn~=PL8VOubd4Kh-C378kX5<U14BVS{l&~q_mJA#
zvZy`dw^~&b18aBLoPMfsv}+ZPk+LS#Hn7CoY7V#+w(j<v-HKsyy5;pHz!msErz0j8
zve4stfVz*<<LIX>MWJ&~tJhV2`AH=z!lkFt@G2djqHu-Jhu2YJKFu5tV)b$1L97c_
zQ&*>VcorENY8o37OhHV*N6oh2(K&d?czRS$SXoRN_4>_9)3c>?dPcHsbbMt}r;{nI
zR)>Qxjy)=2k;|r3yDPntfLg9a)~klz<@5jbH-qEZSjg$z&sRrp9oDb0`bCTlqrq6~
zwYK;Ui-)fpUT25zx%${&mpJiUP0Yj+M9`4Yj*&+ftZdLwX$tv5lotm=1FdT~F_wg1
z_&UAAb+w^6RP1v#*6MI8zh1lc@r@fAW410)(EvaFb`j|TI(g-+F*6?S5n=_nj<?>T
zm9SpxNNV&UJf_A<UscF8`W8M`Ubly_Au`0r%4_HGz2;}H*G%C%dpH2gH>wJ8#MR-e
zup@&P4<v$XhVeSK;0wiWmS`joi<k6X8POiKyJiH&dW{ZCEVFOhkqC{<*-E`D1Jo3B
zwqM`B?Cc?*MypY7sGN5X?p?FHeujH%pvU9M18@p*9jSy8d6wbBb9;)p0$5w!V6@ef
zT59YgY^~LeOBnlQ2*<MfdwFamF~g*8sEqHL<5GdIc?47Job9{E3gM6^9Pqb|?cUzq
z5i<$iE_gN*<_5KMwr9p1p?yjJ51K8M>iowZv5F?MK|Eh=d+4jz#qf9CS06%Up%rz7
z!VJHzQuV}8g2-X{7OOb|tU5TXeAS1ABbW~)N0d9Sn7lTDM{}~|CVc@54(yUuVKDa-
z{T6Ln*=!uuO4Z=kZ}(o>AuV5=R?7;H=v7anrpvBDN!PK8R;HOAwzipvj<Ut$ROhbv
z=ju!XC}H?{S2zoGWvC8-*N<CkRufbn5EhGM7Ylj;kt@cmnZG#4b76~kx{P6mDMRn*
zcg}E8Nq$>-#yP?6Zij5n!E_`2KU@7_xobv6q4y-I)##wlXRKily>|7OBds>bq`PiK
z#aXTIw<Lp@FY@y-UuG(@3A18z{7b<Q<CE;g%35r84wRf6N#I2QDx_JNF;S&j?UhtC
z<!d^qwEQUY+yt51zE3DWroY(c{@RCiZTI9O5o2RfQiFlkp1b18D;<qayGqcrLb&P2
z-j#boKm&)#1Ck9G7cAHs9%^0kIy*=x#=d!JIb#-aHco~WXdVnJb{pMM?_7Z7T-mHt
z&s3<WCJ%9%FJIdsDL<x`g<bg*dJXo{^-+yhZPd1Sj#UJi+%Oyw%bF7g`n(V6bgUNi
z9bu-ho&*@S;Q6bkLn2+6ix0@oE?TfKg&7Ddl6s!EXnV*0%|i)a`^8HV=5k7<wL}~;
zI%GAd&Z6<zXJtnn(}eZ!+4iq$8MZ{7GNaaNk}Ku(`^xTsf0_E&bIIk`&D$2sfL^WD
zHzj+83t=ZW3Bl@n#XEZlX!kWbIkq&$=3&(Pabq*Fr1}rX^%IOM?rXoKJ}z_ADYa&&
z(bya|sOcXal+6gHNB>LXaLbQ9n>m9G3Fu)u#a+TWUQ^1X6n|PmEG`4<17lRMq(;ta
zSo%9tHK28Yn&bJnkFw+o`sbmaNEM<PG((ptv$o*iT?r)J8;r8_p$pFLZ9hDbT~N#`
zj3%jIIlOhXr$}XjWhg4MJD2r{S0&6FTE9H(?9pdh*Bp89menp_=w^##>ebpzz*DHf
z<PVa0fJvP3N<4?=IB(_-WT4MWb8sNm_18iiRPLj2UvWVMUWKQ+`7Bd2Lk^ohQWQhm
z`n9XA*S~yZ{oY&dTuLK)8-01}lFkJOH#U~c3Ijq2f?TBcx%4u>Q(;dX-F?<m`|iHu
z{@a9CZF0f=>XCa6Z@BWa(-w0&I<cm>SbJKG9P1qh7W-!&Pe$eSA`8${&GW`9Juq6f
zGHdLWC&%Zq$R?)K3axbgHjmMGd4qv=MQyrtar??hNf+{=rr2ck_EV))O67)`dZW)g
zGJAH`sa7`(^ftCnZ=|V4EqzJzwKUj{T_Y717Xntt;?n9}4t>;-@@vk>w(i|)G1;}q
zlvNqc2Eo{KxT|<qs;0N_`ZUlX?0&AdyiC6!+>XqBMu%AlaOSDEW2xd9LwxBn=Fb>f
z(L7l&_So!z!GWX+I=pL8;B{jIE6!Xze2A5e35yI0kLXkDy?wd(($Zy{^ZPfh{lBwT
z9((3+ZtcJk^vQfg@6lbTvBDGKSq&?4fRG7QTbzI)n71V4rHoy(EMU04FrF+j8A3bf
zt-g4Ux1nHk?Q3f_cUmk;^@LF!n@OXyR6eTBW;+^vaGmSzfl@zRTI!M*jAB?P-Z>?$
zQ`3$H7)!Oh|5?cUN54^CI#9<Vqav&rrra<spFLlsUb_ymcNJ1s?G6NDYiPja)a$}F
z|LEq<$i|I6G33&j^cP!}2j)%pIbGVI-R$srXuy_j4YoLwO<r3_BX_ttoZqBJg{{aD
zVLgKpa+0xUAVbk{&B_3{Sqw#lTw$Ua>O4KS;lYbHEl<bBidv1-?hg+3u4wI8R4Wo`
z?md5W#e~?_InAfB_^jb%b9UY<n-%qv5%3?L14J(bu90KG=l+^trALu@NbKl?O_(v`
zJRV<&L=~2<!k0gXh@F!*2E<62Q#L2$NfQFCZwfl8*4AqlQ+kzUz%26*_^c*H?<`}?
z=Aov9E$>sCME^)YZt?WvF=)N!e!Etxb82nw+jOq<C2FmmMlQC<1H;O~;C$Uh0Icw|
zHf3!OH>t+Maxt@8u6JCLcI#Ft-Aa9Z{C}t0PzM6*$ig95X9kmoK^>-m8#4$n0cQ2C
zR6G2snafv3Bf<80bJKfl8kyKJ-_zbvw5qy7G^R^hWDa{VVvnFAHrYMcVzM@h9f4L)
z-eGpAH4Pk&yv71>Tv*pfnXiZC4x8ZPe7Dxl;rnNLF`j=8vB;jdgQt!_a|Vdh;H1p%
zVwEe!93sd-GhOAI;!<1t3ywjLxxEd~#hK!nf+xi-oNmH{16L{sJZkIq`9_Uq%^Htx
zy{VDzGlZYeEg6}t_tI3~pwH5Mthy69W=t2TCE9W$l|P}d&KKqT!dbPbZPc|}+B1t*
zO3I0_BV#X$qQPUAJ1)-8>Csot%MM)T3v@1T+f;}1>-5+35RcQt(6-rmMM0_9iCHl+
zf!1iVhQTRVl^M5*Ys5mIlUV7Mc>a}KF4;yMGp(A)XQ)a#Zaq^Ym+8wkvx*){R=%h7
z*hJJ9>3^<xQJTD{`S)r`&?ahVn;=@Bx2n~?eNiOaGkR55e^0Mv?~4GwQF_7HKh{f}
zF<L+q0FD*H8D^63!YuXth~p-^r$eg`cs;^RVSmu-rkgyX-hRo7X;z!bI^_)mo{PIJ
zHqR+qp1wh6uH%x|WC4dP1B~_gHhmhodtT&1eHgLgolNQn_3j3E9oVvVi^JDu%NNYa
z=Dba$<y!oyXHNe7Ky3W>VgLP+@%vW>eT?_k>$cDrJmZ|Mc>OHCBM!y;eoMH8p2zgN
zQ)=TtPpFFnKg6m%K4pGfAI@N~T(65Oxjh#7nAL1i1`TDawdAw}+^Fe6QCzuR6xWnq
zp1;UK$6Bv-Yf`sO@%!$Z8}s?^Lq*&wRuRX>#`Cu5l^7e#*y8n}LI-Nj60otDw-0et
zR$9pE8x(<~7z*5BJ+Oh+xEs)9FDO_!7|aONgXJI=tvCi8=}fge5bjtuWhfc9PLJ>M
z9Zq)Z)%N1hl;s@}pIY7%&X_z4bvpO`4!2IX&;#9hds3rL(LF8eFVGv$@y7)r5;{jC
z*Ilr_We-gmWy!V`XEwKA<8rggwB|Ec)ZokOcQA*=9KOEl1N1@60aha<F!&y0vV1&@
z>0>GgKZx}yF;Lgar{b|7l}<==?U829JflnyJUY=}(#gZDWXh>`eeH<B<T}tee{lWH
zO>*mad4^4Cj5etT3vpXeh35mf%w`|+5ir^FOL`ODHvxJM!aK+B4+XD)4Z3iBC~PV7
z2pzpl<4&MRw`cPVnQ>*rs>-&98dY+`I-}O4(OjOe>F3VN$&~?Jb8xh=xi2PF>1<uA
z9^n1FAv}e7LW`n^VX|jj!2JUm6K8v@U=*AkpFOxFOHw=$7Q(FtrAuoLmcm_IgH4x4
zTrQncIw8rnJ46qat(IonBN+|7?0Y@t=?#WXpQ|Njw)onIC*j}-PnkUAAen@{@HEB*
zzfSbz{#c-O67JlS^RYvv`Q!c1GblMCR8nA~`;>8h6f58BsbQqiEMXWqWxyCB*YjSc
z_tNX}<^#6+q2PhWb9J+U(R7I`cwBJKO*&{IHM9BrsVmB3OXz~YfX|T+c4%lsXNd(P
z&juC_gl13e{r-Dy|CEdq>&J@c$Nr1n%4?08B4XjiViNX%4%vrYK+P%@Ej60N;->$k
z)S-8~`Df*-^!~o(?X#DPzF1(u@5qPH-K~}Ll^&&$9#DA{MrEzrzTWpDDt+bi?m!Q^
zuIqT~FfaBz?&G#bO{qJvx80|?|MjQ6C1^~n{*g`xJ^`r`NQ&9NV8_hl<vv=*0ZK3$
zO2yxvr<PnR?P+MUddhvp(U~*zYbD;kv?X##+n7*qoU25(T+hL~&ueScDs2IkiI4ZM
zLJs$K^XHT?MlV-LYRa}fhqc1l4uoD<c3e@~t<`I-9$Nb>Zdx|5d(KU}9ldnf{DrQ~
zBc`ZAt5s?RI)P**g;scWV&bgq+CyWV>bkNtiT{7#X%iO$N6fFzW`t*6LJuvlnK1>`
z#8yv%pMbf~9`H$35l4eoX|_x?A0D4`@tU+DBy~p>hNiAO4e67#&0{qd3<gQpB2QOi
zM>bpexzcRCRGPUmXmDu;xC~&qM1Jt7Yd8)1>d%8Fc#0CC{5e}86i|R9D2nt>^Gs-V
zj}vRR@V%M5NFShi;{Y)!Ds$KMFkaY1enD@eIo@_`?9Cp=kEW8J3)j#r=KGOnPYc&X
z&s+7it7BJvZGyHOfA%!)QGebz>a{fF%hK%A?7ow2{CWNSd+j;?1|p{mq?!6PwKh4j
zW7%&KRsIZX%(*6m)6iueA_sV^>s7*RWQ00!UB3D{JT1JPK7)4xuvpmZwetWDLGAfN
zm__Yx3OQ6i#xp+1i}hmxe*M4Ik0m5P+0zx+pOh%+min=bnCQ**V>#Ntfz?W-DqM9C
zTkV*l3hq1gV*&mCu6`^bJ>;MDV=3MfwYYvPBO%H%GT43OXnzo}-imjX?7`bg)+1`Z
z4)6L1Kr7#YH<@h2(Fpe2QC+bWpIZ>wV=e3Pc9GTiwgaCNXxWA12^??7@lM=fHTH9G
zj}h!=;oj`p0IDjsV$bgW(K{eoICbl`J=@o>UAHqZZO4j@fsqy4S8m<DB^?-9ziRcC
z9jhk-yS7ZM-X7SwZgpVJw2{E9ZL7Bg2DWb5Ie7tYF^XO`VXSL0x)m4=8C|_;#oF~N
za5RQfYcWW6dON<ZUb}143LH!hi0!xI3O4LAwv%sFYh|yEX@cNtf-{M|Mh1QXHiUt#
z+t;oRlmnC9;V_$P$~R>*Ex6+3Tb(efdFXFDK)9ZRC2;(%8T7&W3J@}H_4Xa>w{8ir
zdu8(39GX7ihK!%`zv{J&o1Xed;d%l!;Sox}|No!guyY5wl1lJiohy+4{UG@sc^0c}
zC1~<$;Qjjm>vzd><VWOr@&iOA*WhhwKgL^?z6b<ggLgE&Kz;@a{R`g3vjL#rh&T0Y
z0#)7)B%I0L*s}wKva|lKo4r^S=irSw=aSFkojd!;emvd&4e|uu%Ot~Fo+@}l6Rat`
z>q$vfR82MH7vxpc%xd}DbquIk_%b!}x9nKRAK+UP@h~wPwd0LWPU@m=yvOfP)I;&~
z6zZn|8pKms!!$ypaKOazl#L{9pm3+qCPc5BX$EhB%F-N^i~@=xOSF}?;o1D{w1XlF
zMZ0Mas#JUFRJ?DhpAO({QA2bZ9flMfp)=@AI*X3d*?1Pq96U;CE}ci`<6Tk<=_0(B
zYB60xm(pc)IeC~o!rlyoH(5Q3w^gkq4=8qRS)a*d`fB?reTpet*KXaidZS`RZ7=Uz
zwPO3$E%FJzQ}ox*uCAZ$ubo|8+s$0DYS+%y@-4O9%v$4?+HS12+g{tvsa>+8wi~ZC
z?&Le!-0kbPtd;FzpYlbu3-<DzdeOwzohw#>S?pBrJ$}eXp3k(@_AQzEe)4;^{ykUU
z=j;1IeP68aOZ9zgecx8!PpR*F>-(woeGOvymj3$pf!aP>?>}4bKU?oVTkk(x?>}4b
zKU?n~kIZ10$Y<;QXY2iE>-}fz{b%d_XY2iE>-}fz{pafa=j#3E>iy^H{pafa=j#3E
z>iy^H{r|tF?j{9c7zo2Kb?Ksak@-AO!T1BB&{}%SUZq#?oAE`u3W0<tfnjEoFo7TV
zfgkvRANYYE_`(;y@P#jY;S1kyb?g4Z7ryX?FMQz(U-;*8ol5H*9#6;X<2H}&GEDd0
zk?pu?uV))vY5LFd-c5h0v~%4*R5i{LpSd(=ojYsgU-^IbtrhOAxo){_-)r*=ETneG

literal 0
HcmV?d00001

diff --git a/files/data/fonts/PelagiadFontLicense.txt b/files/data/fonts/PelagiadFontLicense.txt
new file mode 100644
index 0000000000..2d4aff5cdd
--- /dev/null
+++ b/files/data/fonts/PelagiadFontLicense.txt
@@ -0,0 +1,94 @@
+Copyright (c) 2015, Isak Larborn (isaskar.github.io/Pelagiad|Isaskar@users.noreply.github.com),
+with Reserved Font Name "Pelagiad.ttf".
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/files/mygui/CMakeLists.txt b/files/mygui/CMakeLists.txt
index 924aaecada..4716a7712b 100644
--- a/files/mygui/CMakeLists.txt
+++ b/files/mygui/CMakeLists.txt
@@ -32,7 +32,6 @@ set(MYGUI_FILES
     openmw_dialogue_window.layout
     openmw_dialogue_window.skin.xml
     openmw_edit.skin.xml
-    openmw_font.xml
     openmw_hud_box.skin.xml
     openmw_hud_energybar.skin.xml
     openmw_hud.layout
@@ -93,7 +92,6 @@ set(MYGUI_FILES
     openmw_postprocessor_hud.layout
     openmw_postprocessor_hud.skin.xml
     openmw_jail_screen.layout
-    DejaVuLGCSansMono.ttf
     ../launcher/images/openmw.png
     OpenMWResourcePlugin.xml
     skins.xml
diff --git a/files/mygui/skins.xml b/files/mygui/skins.xml
index 4d3d4c8774..d8d0b4b542 100644
--- a/files/mygui/skins.xml
+++ b/files/mygui/skins.xml
@@ -3,7 +3,6 @@
     <MyGUI type="List">
         <List file="core.skin"/>
         <List file="openmw_resources.xml"/>
-        <List file="openmw_font.xml"/>
         <List file="openmw_text.skin.xml"/>
         <List file="openmw_windows.skin.xml"/>
         <List file="openmw_button.skin.xml"/>

From 4ddba5142ef360b4d8e08649d6cd36c0360f2b97 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Thu, 7 Jul 2022 23:20:22 +0400
Subject: [PATCH 2828/2859] Introduce font mappings

---
 apps/openmw/mwgui/formatting.cpp           |  5 ++-
 apps/openmw/mwgui/formatting.hpp           |  2 +-
 components/fontloader/fontloader.cpp       | 45 ++++++++++++++++------
 components/fontloader/fontloader.hpp       |  4 ++
 files/data/fonts/DejaVuLGCSansMono.omwfont |  2 +-
 files/data/fonts/OMWAyembedt.omwfont       |  2 +-
 files/data/fonts/Pelagiad.omwfont          |  2 +-
 files/mygui/openmw_book.layout             |  4 +-
 files/mygui/openmw_journal.layout          |  4 +-
 files/mygui/openmw_journal.skin.xml        |  4 +-
 files/mygui/openmw_settings.xml            |  2 +-
 files/settings-default.cfg                 |  9 +++++
 12 files changed, 62 insertions(+), 23 deletions(-)

diff --git a/apps/openmw/mwgui/formatting.cpp b/apps/openmw/mwgui/formatting.cpp
index c9a9da6066..64e3847887 100644
--- a/apps/openmw/mwgui/formatting.cpp
+++ b/apps/openmw/mwgui/formatting.cpp
@@ -11,6 +11,7 @@
 #include <components/vfs/manager.hpp>
 #include <components/misc/stringops.hpp>
 #include <components/misc/resourcehelpers.hpp>
+#include <components/fontloader/fontloader.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
@@ -367,7 +368,9 @@ namespace MWGui::Formatting
             if (attr.find("face") != attr.end())
             {
                 std::string face = attr.at("face");
-                mTextStyle.mFont = "Journalbook "+face;
+                std::string name = Gui::FontLoader::getFontForFace(face);
+
+                mTextStyle.mFont = "Journalbook "+name;
             }
             if (attr.find("size") != attr.end())
             {
diff --git a/apps/openmw/mwgui/formatting.hpp b/apps/openmw/mwgui/formatting.hpp
index 12a3d46caa..387acd58c8 100644
--- a/apps/openmw/mwgui/formatting.hpp
+++ b/apps/openmw/mwgui/formatting.hpp
@@ -14,7 +14,7 @@ namespace MWGui
         {
             TextStyle() :
                 mColour(0,0,0)
-                , mFont("Journalbook Magic Cards")
+                , mFont("Journalbook DefaultFont")
                 , mTextSize(16)
             {
             }
diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index ab4ca24eee..d7d16f0aa1 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -304,13 +304,7 @@ namespace Gui
             fail(*bitmapFile, bitmapFilename, "File too small to be a valid bitmap");
         bitmapFile.reset();
 
-        std::string resourceName;
-        if (name.size() >= 5 && Misc::StringUtils::ciEqual(name.substr(0, 5), "magic"))
-            resourceName = "Magic Cards";
-        else if (name.size() >= 7 && Misc::StringUtils::ciEqual(name.substr(0, 7), "century"))
-            resourceName = "Century Gothic";
-        else if (name.size() >= 7 && Misc::StringUtils::ciEqual(name.substr(0, 7), "daedric"))
-            resourceName = "Daedric";
+        std::string resourceName = name;
 
         if (exportToFile)
         {
@@ -346,7 +340,9 @@ namespace Gui
         // We need to emulate loading from XML because the data members are private as of mygui 3.2.0
         MyGUI::xml::Document xmlDocument;
         MyGUI::xml::ElementPtr root = xmlDocument.createRoot("ResourceManualFont");
-        root->addAttribute("name", resourceName);
+
+        const std::string baseName = Misc::StringUtils::lowerCase(std::filesystem::path(mVFS->getAbsoluteFileName(fileName)).stem().string());
+        root->addAttribute("name", getInternalFontName(baseName));
 
         MyGUI::xml::ElementPtr defaultHeight = root->createChild("Property");
         defaultHeight->addAttribute("key", "DefaultHeight");
@@ -506,12 +502,11 @@ namespace Gui
 
         font->deserialization(root, MyGUI::Version(3,2,0));
 
-        // Setup "book" version of font as fallback if we will not use TrueType fonts
         MyGUI::ResourceManualFont* bookFont = static_cast<MyGUI::ResourceManualFont*>(
                     MyGUI::FactoryManager::getInstance().createObject("Resource", "ResourceManualFont"));
         mFonts.push_back(bookFont);
         bookFont->deserialization(root, MyGUI::Version(3,2,0));
-        bookFont->setResourceName("Journalbook " + resourceName);
+        bookFont->setResourceName("Journalbook " + getInternalFontName(baseName));
 
         // Remove automatically registered fonts
         for (std::vector<MyGUI::ResourceManualFont*>::iterator it = mFonts.begin(); it != mFonts.end();)
@@ -564,6 +559,8 @@ namespace Gui
                 MyGUI::xml::ElementPtr sizeNode = resourceNode->createChild("Property");
                 sizeNode->addAttribute("key", "Size");
                 sizeNode->addAttribute("value", std::to_string(mFontHeight));
+
+                resourceNode->setAttribute("name", getInternalFontName(name));
             }
             else if (Misc::StringUtils::ciEqual(type, "ResourceSkin") ||
                      Misc::StringUtils::ciEqual(type, "AutoSizedResourceSkin"))
@@ -611,7 +608,7 @@ namespace Gui
                     resolutionNode->addAttribute("key", "Resolution");
                     resolutionNode->addAttribute("value", std::to_string(resolution));
 
-                    copyFont->setAttribute("name", "Journalbook " + name);
+                    copyFont->setAttribute("name", "Journalbook " + getInternalFontName(name));
                 }
             }
 
@@ -623,4 +620,30 @@ namespace Gui
     {
         return mFontHeight;
     }
+
+    std::string FontLoader::getInternalFontName(const std::string& name)
+    {
+        if (name == Settings::Manager::getString("default font", "GUI"))
+            return "DefaultFont";
+        if (name == Settings::Manager::getString("scroll font", "GUI"))
+            return "ScrollFont";
+        if (name == Settings::Manager::getString("mono font", "GUI"))
+            return "MonoFont";
+
+        return name;
+    }
+
+    std::string FontLoader::getFontForFace(const std::string& face)
+    {
+        const std::string lowerFace = Misc::StringUtils::lowerCase(face);
+
+        if (lowerFace == "magic cards")
+            return "DefaultFont";
+        if (lowerFace == "daedric")
+            return "ScrollFont";
+        if (lowerFace == "century gothic")
+            return "MonoFont";
+
+        return face;
+    }
 }
diff --git a/components/fontloader/fontloader.hpp b/components/fontloader/fontloader.hpp
index ee54e077a5..652f9bdf43 100644
--- a/components/fontloader/fontloader.hpp
+++ b/components/fontloader/fontloader.hpp
@@ -36,6 +36,8 @@ namespace Gui
 
         int getFontHeight();
 
+        static std::string getFontForFace(const std::string& face);
+
     private:
         ToUTF8::FromType mEncoding;
         const VFS::Manager* mVFS;
@@ -46,6 +48,8 @@ namespace Gui
         std::vector<MyGUI::ITexture*> mTextures;
         std::vector<MyGUI::ResourceManualFont*> mFonts;
 
+        std::string getInternalFontName(const std::string& name);
+
         /// @param exportToFile export the converted font (Image and XML with glyph metrics) to files?
         void loadBitmapFont (const std::string& fileName, bool exportToFile);
 
diff --git a/files/data/fonts/DejaVuLGCSansMono.omwfont b/files/data/fonts/DejaVuLGCSansMono.omwfont
index 6511877656..184c8a0d8f 100644
--- a/files/data/fonts/DejaVuLGCSansMono.omwfont
+++ b/files/data/fonts/DejaVuLGCSansMono.omwfont
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Resource" version="1.1">
-    <Resource type="ResourceTrueTypeFont" name="MonoFont">
+    <Resource type="ResourceTrueTypeFont" name="dejavusansmono">
         <Property key="Source" value="Fonts/DejaVuLGCSansMono.ttf"/>
         <Property key="Antialias" value="false"/>
         <Property key="TabWidth" value="8"/>
diff --git a/files/data/fonts/OMWAyembedt.omwfont b/files/data/fonts/OMWAyembedt.omwfont
index c8ac1c2ecb..9af8f655d8 100644
--- a/files/data/fonts/OMWAyembedt.omwfont
+++ b/files/data/fonts/OMWAyembedt.omwfont
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Resource" version="1.1">
-    <Resource type="ResourceTrueTypeFont" name="Daedric">
+    <Resource type="ResourceTrueTypeFont" name="ayembedt">
         <Property key="Source" value="Fonts/OMWAyembedt.ttf"/>
         <Property key="Antialias" value="false"/>
         <Property key="TabWidth" value="8"/>
diff --git a/files/data/fonts/Pelagiad.omwfont b/files/data/fonts/Pelagiad.omwfont
index 38dc29e09d..4b01a9f308 100644
--- a/files/data/fonts/Pelagiad.omwfont
+++ b/files/data/fonts/Pelagiad.omwfont
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Resource" version="1.1">
-    <Resource type="ResourceTrueTypeFont" name="Magic Cards">
+    <Resource type="ResourceTrueTypeFont" name="pelagiad">
         <Property key="Source" value="Fonts/Pelagiad.ttf"/>
         <Property key="Antialias" value="false"/>
         <Property key="TabWidth" value="8"/>
diff --git a/files/mygui/openmw_book.layout b/files/mygui/openmw_book.layout
index e6f0f858c0..c0b19783c4 100644
--- a/files/mygui/openmw_book.layout
+++ b/files/mygui/openmw_book.layout
@@ -32,13 +32,13 @@
             </Widget>
 
             <Widget type="TextBox" skin="NormalText" position="30 358 250 16" name="LeftPageNumber">
-                <Property key="FontName" value="Journalbook Magic Cards"/>
+                <Property key="FontName" value="Journalbook DefaultFont"/>
                 <Property key="TextColour" value="0 0 0"/>
                 <Property key="TextAlign" value="Center"/>
                 <Property key="NeedMouse" value="false"/>
             </Widget>
             <Widget type="TextBox" skin="NormalText" position="310 358 250 16" name="RightPageNumber">
-                <Property key="FontName" value="Journalbook Magic Cards"/>
+                <Property key="FontName" value="Journalbook DefaultFont"/>
                 <Property key="TextColour" value="0 0 0"/>
                 <Property key="TextAlign" value="Center"/>
                 <Property key="NeedMouse" value="false"/>
diff --git a/files/mygui/openmw_journal.layout b/files/mygui/openmw_journal.layout
index 3752897f97..c93fbb3329 100644
--- a/files/mygui/openmw_journal.layout
+++ b/files/mygui/openmw_journal.layout
@@ -25,12 +25,12 @@
       </Widget>
 
       <Widget type="TextBox" skin="NormalText" position="150 350 32 16" name="PageOneNum">
-        <Property key="FontName" value="Journalbook Magic Cards"/>
+        <Property key="FontName" value="Journalbook DefaultFont"/>
         <Property key="TextColour" value="0 0 0"/>
       </Widget>
 
       <Widget type="TextBox" skin="NormalText" position="410 350 32 16" name="PageTwoNum">
-        <Property key="FontName" value="Journalbook Magic Cards"/>
+        <Property key="FontName" value="Journalbook DefaultFont"/>
         <Property key="TextColour" value="0 0 0"/>
       </Widget>
 
diff --git a/files/mygui/openmw_journal.skin.xml b/files/mygui/openmw_journal.skin.xml
index 0702d8c5eb..ddf9497f28 100644
--- a/files/mygui/openmw_journal.skin.xml
+++ b/files/mygui/openmw_journal.skin.xml
@@ -2,7 +2,7 @@
 
 <MyGUI type="Resource" version="1.1">
     <Resource type="ResourceSkin" name="MW_BookClient" size="10 10">
-            <Property key="FontName" value="Journalbook Magic Cards"/>
+            <Property key="FontName" value="Journalbook DefaultFont"/>
             <Property key="TextAlign" value="Left Top"/>
             <Property key="TextColour" value="0 0 0"/>
             <BasisSkin type="EditText" offset="0 0 10 10" align="Stretch"/>
@@ -19,7 +19,7 @@
     </Resource>
 
     <Resource type="ResourceSkin" name="MW_QuestLink" size="5 5">
-        <Property key="FontName" value="Journalbook Magic Cards"/>
+        <Property key="FontName" value="Journalbook DefaultFont"/>
         <Property key="TextAlign" value="Left VCenter"/>
 
         <BasisSkin type="SimpleText" offset="2 0 1 5" align="Stretch">
diff --git a/files/mygui/openmw_settings.xml b/files/mygui/openmw_settings.xml
index 37d2359683..1bd0e25437 100644
--- a/files/mygui/openmw_settings.xml
+++ b/files/mygui/openmw_settings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI>
     <MyGUI type="Font">
-        <Property key="Default" value="Magic Cards"/>
+        <Property key="Default" value="DefaultFont"/>
 
     </MyGUI>
     <MyGUI type="Pointer">
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 2675004907..d42c093f0a 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -234,6 +234,15 @@ color topic specific = 0.45 0.5 0.8 1
 # Default to grey
 color topic exhausted = 0.3 0.3 0.3 1
 
+# Font used by UI and books
+default font = pelagiad
+
+# Font used by magic scrolls
+scroll font = ayembedt
+
+# Font used by console and debug log
+mono font = dejavusansmono
+
 [HUD]
 
 # Displays the crosshair or reticle when not in GUI mode.

From 2630bc21ddfab2e9ce170f4133b1a848707bd29f Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 9 Jul 2022 19:58:40 +0400
Subject: [PATCH 2829/2859] Allow to override MyGUI layout

---
 apps/openmw/engine.cpp                        |  3 +-
 apps/openmw/mwgui/windowmanagerimp.cpp        |  4 +-
 apps/openmw/mwgui/windowmanagerimp.hpp        |  2 +-
 components/fontloader/fontloader.cpp          |  7 +--
 components/fontloader/fontloader.hpp          |  3 +-
 components/myguiplatform/myguidatamanager.cpp | 57 ++++---------------
 components/myguiplatform/myguidatamanager.hpp |  4 --
 7 files changed, 18 insertions(+), 62 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 4d10b47963..2b9206354a 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -521,6 +521,7 @@ void OMW::Engine::setDataDirs (const Files::PathContainer& dataDirs)
 {
     mDataDirs = dataDirs;
     mDataDirs.insert(mDataDirs.begin(), (mResDir / "vfs"));
+    mDataDirs.insert(mDataDirs.begin(), (mResDir / "mygui"));
     mFileCollections = Files::Collections (mDataDirs, !mFSStrict);
 }
 
@@ -825,7 +826,7 @@ void OMW::Engine::prepareEngine()
     mWindowManager = std::make_unique<MWGui::WindowManager>(mWindow, mViewer, guiRoot, mResourceSystem.get(), mWorkQueue.get(),
                 mCfgMgr.getLogPath().string() + std::string("/"), myguiResources,
                 mScriptConsoleMode, mTranslationDataStorage, mEncoding, mExportFonts,
-                Version::getOpenmwVersionDescription(mResDir.string()), mCfgMgr.getUserConfigPath().string(), shadersSupported);
+                Version::getOpenmwVersionDescription(mResDir.string()), shadersSupported);
     mEnvironment.setWindowManager(*mWindowManager);
 
     mInputManager = std::make_unique<MWInput::InputManager>(mWindow, mViewer, mScreenCaptureHandler,
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 382f489e20..5141736204 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -129,7 +129,7 @@ namespace MWGui
     WindowManager::WindowManager(
             SDL_Window* window, osgViewer::Viewer* viewer, osg::Group* guiRoot, Resource::ResourceSystem* resourceSystem, SceneUtil::WorkQueue* workQueue,
             const std::string& logpath, const std::string& resourcePath, bool consoleOnlyScripts, Translation::Storage& translationDataStorage,
-            ToUTF8::FromType encoding, bool exportFonts, const std::string& versionDescription, const std::string& userDataPath, bool useShaders)
+            ToUTF8::FromType encoding, bool exportFonts, const std::string& versionDescription, bool useShaders)
       : mOldUpdateMask(0)
       , mOldCullMask(0)
       , mStore(nullptr)
@@ -205,7 +205,7 @@ namespace MWGui
         MyGUI::LanguageManager::getInstance().eventRequestTag = MyGUI::newDelegate(this, &WindowManager::onRetrieveTag);
 
         // Load fonts
-        mFontLoader = std::make_unique<Gui::FontLoader>(encoding, resourceSystem->getVFS(), userDataPath, mScalingFactor);
+        mFontLoader = std::make_unique<Gui::FontLoader>(encoding, resourceSystem->getVFS(), mScalingFactor);
         mFontLoader->loadBitmapFonts(exportFonts);
 
         //Register own widgets with MyGUI
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index 2367470223..083ecc6992 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -136,7 +136,7 @@ namespace MWGui
 
     WindowManager(SDL_Window* window, osgViewer::Viewer* viewer, osg::Group* guiRoot, Resource::ResourceSystem* resourceSystem, SceneUtil::WorkQueue* workQueue,
                   const std::string& logpath, const std::string& cacheDir, bool consoleOnlyScripts, Translation::Storage& translationDataStorage,
-                  ToUTF8::FromType encoding, bool exportFonts, const std::string& versionDescription, const std::string& localPath, bool useShaders);
+                  ToUTF8::FromType encoding, bool exportFonts, const std::string& versionDescription, bool useShaders);
     virtual ~WindowManager();
 
     /// Set the ESMStore to use for retrieving of GUI-related strings.
diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index d7d16f0aa1..fca8346e19 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -151,9 +151,8 @@ namespace
 namespace Gui
 {
 
-    FontLoader::FontLoader(ToUTF8::FromType encoding, const VFS::Manager* vfs, const std::string& userDataPath, float scalingFactor)
+    FontLoader::FontLoader(ToUTF8::FromType encoding, const VFS::Manager* vfs, float scalingFactor)
         : mVFS(vfs)
-        , mUserDataPath(userDataPath)
         , mFontHeight(std::clamp(Settings::Manager::getInt("font size", "GUI"), 12, 20))
         , mScalingFactor(scalingFactor)
     {
@@ -214,15 +213,11 @@ namespace Gui
             return;
         }
 
-        dataManager->setUseVfs(true);
-
         for (const auto& name : mVFS->getRecursiveDirectoryIterator("Fonts/"))
         {
             if (Misc::getFileExtension(name) == "omwfont")
                 MyGUI::ResourceManager::getInstance().load(name);
         }
-
-        dataManager->setUseVfs(false);
     }
 
     typedef struct
diff --git a/components/fontloader/fontloader.hpp b/components/fontloader/fontloader.hpp
index 652f9bdf43..eb705fdd4a 100644
--- a/components/fontloader/fontloader.hpp
+++ b/components/fontloader/fontloader.hpp
@@ -25,7 +25,7 @@ namespace Gui
     class FontLoader
     {
     public:
-        FontLoader (ToUTF8::FromType encoding, const VFS::Manager* vfs, const std::string& userDataPath, float scalingFactor);
+        FontLoader (ToUTF8::FromType encoding, const VFS::Manager* vfs, float scalingFactor);
         ~FontLoader();
 
         /// @param exportToFile export the converted fonts (Images and XML with glyph metrics) to files?
@@ -41,7 +41,6 @@ namespace Gui
     private:
         ToUTF8::FromType mEncoding;
         const VFS::Manager* mVFS;
-        std::string mUserDataPath;
         int mFontHeight;
         float mScalingFactor;
 
diff --git a/components/myguiplatform/myguidatamanager.cpp b/components/myguiplatform/myguidatamanager.cpp
index d3edb82ae5..c06532a9f4 100644
--- a/components/myguiplatform/myguidatamanager.cpp
+++ b/components/myguiplatform/myguidatamanager.cpp
@@ -18,34 +18,16 @@ void DataManager::setResourcePath(const std::string &path)
     mResourcePath = path;
 }
 
-void DataManager::setUseVfs(bool useVfs)
-{
-    mUseVfs = useVfs;
-}
-
 MyGUI::IDataStream *DataManager::getData(const std::string &name) const
 {
-    if (mUseVfs)
-    {
-        // Note: MyGUI is supposed to read/free input steam itself,
-        // so copy data from VFS stream to the string stream and pass it to MyGUI.
-        Files::IStreamPtr streamPtr = mVfs->get(name);
-        std::istream* fileStream = streamPtr.get();
-        std::unique_ptr<std::stringstream> dataStream;
-        dataStream.reset(new std::stringstream);
-        *dataStream << fileStream->rdbuf();
-        return new MyGUI::DataStream(dataStream.release());
-    }
-
-    std::string fullpath = getDataPath(name);
-    auto stream = std::make_unique<std::ifstream>();
-    stream->open(fullpath, std::ios::binary);
-    if (stream->fail())
-    {
-        Log(Debug::Error) << "DataManager::getData: Failed to open '" << name << "'";
-        return nullptr;
-    }
-    return new MyGUI::DataFileStream(stream.release());
+    // Note: MyGUI is supposed to read/free input steam itself,
+    // so copy data from VFS stream to the string stream and pass it to MyGUI.
+    Files::IStreamPtr streamPtr = mVfs->get(name);
+    std::istream* fileStream = streamPtr.get();
+    std::unique_ptr<std::stringstream> dataStream;
+    dataStream.reset(new std::stringstream);
+    *dataStream << fileStream->rdbuf();
+    return new MyGUI::DataStream(dataStream.release());
 }
 
 void DataManager::freeData(MyGUI::IDataStream *data)
@@ -55,10 +37,7 @@ void DataManager::freeData(MyGUI::IDataStream *data)
 
 bool DataManager::isDataExist(const std::string &name) const
 {
-    if (mUseVfs) return mVfs->exists(name);
-
-    std::string fullpath = mResourcePath + "/" + name;
-    return std::filesystem::exists(fullpath);
+    return mVfs->exists(name);
 }
 
 void DataManager::setVfs(const VFS::Manager* vfs)
@@ -68,26 +47,12 @@ void DataManager::setVfs(const VFS::Manager* vfs)
 
 const MyGUI::VectorString &DataManager::getDataListNames(const std::string &pattern) const
 {
-    // TODO: pattern matching (unused?)
-    static MyGUI::VectorString strings;
-    strings.clear();
-    strings.push_back(getDataPath(pattern));
-    return strings;
+    throw std::runtime_error("DataManager::getDataListNames is not implemented - VFS is used");
 }
 
 const std::string &DataManager::getDataPath(const std::string &name) const
 {
-    // FIXME: in theory, we should use the VFS here too, but it does not provide the real path to data files.
-    // In some cases there is no real path at all (when the requested MyGUI file is in BSA archive, for example).
-    // Currently it should not matter since we use this virtual function only to setup fonts for profilers.
-    static std::string result;
-    result.clear();
-    if (!isDataExist(name))
-    {
-        return result;
-    }
-    result = mResourcePath + "/" + name;
-    return result;
+    throw std::runtime_error("DataManager::getDataPath is not implemented - VFS is used");
 }
 
 }
diff --git a/components/myguiplatform/myguidatamanager.hpp b/components/myguiplatform/myguidatamanager.hpp
index a859ce99c1..47203e1634 100644
--- a/components/myguiplatform/myguidatamanager.hpp
+++ b/components/myguiplatform/myguidatamanager.hpp
@@ -18,8 +18,6 @@ public:
 
     void setResourcePath(const std::string& path);
 
-    void setUseVfs(bool useVfs);
-
     void setVfs(const VFS::Manager* vfs);
 
     /** Get data stream from specified resource name.
@@ -52,8 +50,6 @@ private:
     std::string mResourcePath;
 
     const VFS::Manager* mVfs;
-
-    bool mUseVfs{false};
 };
 
 }

From c47a48e25dc026b0643d265af0b04eff02891b87 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 9 Jul 2022 20:42:18 +0400
Subject: [PATCH 2830/2859] Inject layout files to VFS

---
 apps/openmw/engine.cpp                        |   6 +-
 apps/openmw/mwgui/windowmanagerimp.cpp        |   4 +-
 apps/openmw/mwgui/windowmanagerimp.hpp        |   2 +-
 components/fontloader/fontloader.cpp          |   9 +-
 components/myguiplatform/myguidatamanager.cpp |  16 ++-
 files/CMakeLists.txt                          |   1 -
 files/data/CMakeLists.txt                     |  90 ++++++++++++++++
 files/data/fonts/DejaVuLGCSansMono.omwfont    |   2 +-
 files/data/fonts/OMWAyembedt.omwfont          |   2 +-
 files/data/fonts/Pelagiad.omwfont             |   2 +-
 .../{ => data}/mygui/OpenMWResourcePlugin.xml |   0
 files/{ => data}/mygui/core.skin              |   0
 files/{ => data}/mygui/core.xml               |   0
 files/{ => data}/mygui/core_layouteditor.xml  |   0
 .../mygui/openmw_alchemy_window.layout        |   0
 files/{ => data}/mygui/openmw_book.layout     |   0
 files/{ => data}/mygui/openmw_box.skin.xml    |   0
 files/{ => data}/mygui/openmw_button.skin.xml |   0
 .../mygui/openmw_chargen_birth.layout         |   0
 .../mygui/openmw_chargen_class.layout         |   0
 .../openmw_chargen_class_description.layout   |   0
 .../mygui/openmw_chargen_create_class.layout  |   0
 ...penmw_chargen_generate_class_result.layout |   0
 .../mygui/openmw_chargen_race.layout          |   0
 .../mygui/openmw_chargen_review.layout        |   0
 .../openmw_chargen_select_attribute.layout    |   0
 .../mygui/openmw_chargen_select_skill.layout  |   0
 ...penmw_chargen_select_specialization.layout |   0
 .../mygui/openmw_companion_window.layout      |   0
 .../mygui/openmw_confirmation_dialog.layout   |   0
 files/{ => data}/mygui/openmw_console.layout  |   0
 .../{ => data}/mygui/openmw_console.skin.xml  |   0
 .../mygui/openmw_container_window.layout      |   0
 .../mygui/openmw_count_window.layout          |   0
 .../mygui/openmw_debug_window.layout          |   0
 .../mygui/openmw_debug_window.skin.xml        |   0
 .../mygui/openmw_dialogue_window.layout       |   0
 .../mygui/openmw_dialogue_window.skin.xml     |   0
 files/{ => data}/mygui/openmw_edit.skin.xml   |   0
 .../mygui/openmw_edit_effect.layout           |   0
 .../{ => data}/mygui/openmw_edit_note.layout  |   0
 .../mygui/openmw_enchanting_dialog.layout     |   0
 files/{ => data}/mygui/openmw_hud.layout      |   0
 .../{ => data}/mygui/openmw_hud_box.skin.xml  |   0
 .../mygui/openmw_hud_energybar.skin.xml       |   0
 files/{ => data}/mygui/openmw_infobox.layout  |   0
 .../openmw_interactive_messagebox.layout      |   0
 ...nmw_interactive_messagebox_notransp.layout |   0
 .../mygui/openmw_inventory_window.layout      |   0
 .../mygui/openmw_itemselection_dialog.layout  |   0
 .../mygui/openmw_jail_screen.layout           |   0
 files/{ => data}/mygui/openmw_journal.layout  |   0
 .../{ => data}/mygui/openmw_journal.skin.xml  |   0
 files/{ => data}/mygui/openmw_layers.xml      |   0
 .../mygui/openmw_levelup_dialog.layout        |   0
 files/{ => data}/mygui/openmw_list.skin.xml   |   0
 .../mygui/openmw_loading_screen.layout        |   0
 files/{ => data}/mygui/openmw_lua.xml         |   0
 .../mygui/openmw_magicselection_dialog.layout |   0
 files/{ => data}/mygui/openmw_mainmenu.layout |   0
 .../{ => data}/mygui/openmw_mainmenu.skin.xml |   0
 .../{ => data}/mygui/openmw_map_window.layout |   0
 .../mygui/openmw_map_window.skin.xml          |   0
 .../mygui/openmw_merchantrepair.layout        |   0
 .../{ => data}/mygui/openmw_messagebox.layout |   0
 .../mygui/openmw_persuasion_dialog.layout     |   0
 files/{ => data}/mygui/openmw_pointer.xml     |   0
 .../mygui/openmw_postprocessor_hud.layout     |   0
 .../mygui/openmw_postprocessor_hud.skin.xml   |   0
 .../{ => data}/mygui/openmw_progress.skin.xml |   0
 .../mygui/openmw_quickkeys_menu.layout        |   0
 .../mygui/openmw_quickkeys_menu_assign.layout |   0
 .../mygui/openmw_recharge_dialog.layout       |   0
 files/{ => data}/mygui/openmw_repair.layout   |   0
 files/{ => data}/mygui/openmw_resources.xml   |   0
 .../mygui/openmw_savegame_dialog.layout       |   0
 .../mygui/openmw_screen_fader.layout          |   0
 .../mygui/openmw_screen_fader_hit.layout      |   0
 files/{ => data}/mygui/openmw_scroll.layout   |   0
 files/{ => data}/mygui/openmw_scroll.skin.xml |   0
 files/{ => data}/mygui/openmw_settings.xml    |   0
 .../mygui/openmw_settings_window.layout       |   0
 .../mygui/openmw_spell_buying_window.layout   |   0
 .../mygui/openmw_spell_window.layout          |   0
 .../mygui/openmw_spellcreation_dialog.layout  |   0
 .../mygui/openmw_stats_window.layout          |   0
 files/{ => data}/mygui/openmw_text.skin.xml   |   0
 .../{ => data}/mygui/openmw_text_input.layout |   0
 files/{ => data}/mygui/openmw_tooltips.layout |   0
 .../mygui/openmw_trade_window.layout          |   0
 .../mygui/openmw_trainingwindow.layout        |   0
 .../mygui/openmw_travel_window.layout         |   0
 .../mygui/openmw_wait_dialog.layout           |   0
 .../openmw_wait_dialog_progressbar.layout     |   0
 .../{ => data}/mygui/openmw_windows.skin.xml  |   0
 files/{ => data}/mygui/skins.xml              |   0
 files/mygui/CMakeLists.txt                    | 101 ------------------
 files/mygui/DejaVuFontLicense.txt             |  99 -----------------
 98 files changed, 119 insertions(+), 215 deletions(-)
 rename files/{ => data}/mygui/OpenMWResourcePlugin.xml (100%)
 rename files/{ => data}/mygui/core.skin (100%)
 rename files/{ => data}/mygui/core.xml (100%)
 rename files/{ => data}/mygui/core_layouteditor.xml (100%)
 rename files/{ => data}/mygui/openmw_alchemy_window.layout (100%)
 rename files/{ => data}/mygui/openmw_book.layout (100%)
 rename files/{ => data}/mygui/openmw_box.skin.xml (100%)
 rename files/{ => data}/mygui/openmw_button.skin.xml (100%)
 rename files/{ => data}/mygui/openmw_chargen_birth.layout (100%)
 rename files/{ => data}/mygui/openmw_chargen_class.layout (100%)
 rename files/{ => data}/mygui/openmw_chargen_class_description.layout (100%)
 rename files/{ => data}/mygui/openmw_chargen_create_class.layout (100%)
 rename files/{ => data}/mygui/openmw_chargen_generate_class_result.layout (100%)
 rename files/{ => data}/mygui/openmw_chargen_race.layout (100%)
 rename files/{ => data}/mygui/openmw_chargen_review.layout (100%)
 rename files/{ => data}/mygui/openmw_chargen_select_attribute.layout (100%)
 rename files/{ => data}/mygui/openmw_chargen_select_skill.layout (100%)
 rename files/{ => data}/mygui/openmw_chargen_select_specialization.layout (100%)
 rename files/{ => data}/mygui/openmw_companion_window.layout (100%)
 rename files/{ => data}/mygui/openmw_confirmation_dialog.layout (100%)
 rename files/{ => data}/mygui/openmw_console.layout (100%)
 rename files/{ => data}/mygui/openmw_console.skin.xml (100%)
 rename files/{ => data}/mygui/openmw_container_window.layout (100%)
 rename files/{ => data}/mygui/openmw_count_window.layout (100%)
 rename files/{ => data}/mygui/openmw_debug_window.layout (100%)
 rename files/{ => data}/mygui/openmw_debug_window.skin.xml (100%)
 rename files/{ => data}/mygui/openmw_dialogue_window.layout (100%)
 rename files/{ => data}/mygui/openmw_dialogue_window.skin.xml (100%)
 rename files/{ => data}/mygui/openmw_edit.skin.xml (100%)
 rename files/{ => data}/mygui/openmw_edit_effect.layout (100%)
 rename files/{ => data}/mygui/openmw_edit_note.layout (100%)
 rename files/{ => data}/mygui/openmw_enchanting_dialog.layout (100%)
 rename files/{ => data}/mygui/openmw_hud.layout (100%)
 rename files/{ => data}/mygui/openmw_hud_box.skin.xml (100%)
 rename files/{ => data}/mygui/openmw_hud_energybar.skin.xml (100%)
 rename files/{ => data}/mygui/openmw_infobox.layout (100%)
 rename files/{ => data}/mygui/openmw_interactive_messagebox.layout (100%)
 rename files/{ => data}/mygui/openmw_interactive_messagebox_notransp.layout (100%)
 rename files/{ => data}/mygui/openmw_inventory_window.layout (100%)
 rename files/{ => data}/mygui/openmw_itemselection_dialog.layout (100%)
 rename files/{ => data}/mygui/openmw_jail_screen.layout (100%)
 rename files/{ => data}/mygui/openmw_journal.layout (100%)
 rename files/{ => data}/mygui/openmw_journal.skin.xml (100%)
 rename files/{ => data}/mygui/openmw_layers.xml (100%)
 rename files/{ => data}/mygui/openmw_levelup_dialog.layout (100%)
 rename files/{ => data}/mygui/openmw_list.skin.xml (100%)
 rename files/{ => data}/mygui/openmw_loading_screen.layout (100%)
 rename files/{ => data}/mygui/openmw_lua.xml (100%)
 rename files/{ => data}/mygui/openmw_magicselection_dialog.layout (100%)
 rename files/{ => data}/mygui/openmw_mainmenu.layout (100%)
 rename files/{ => data}/mygui/openmw_mainmenu.skin.xml (100%)
 rename files/{ => data}/mygui/openmw_map_window.layout (100%)
 rename files/{ => data}/mygui/openmw_map_window.skin.xml (100%)
 rename files/{ => data}/mygui/openmw_merchantrepair.layout (100%)
 rename files/{ => data}/mygui/openmw_messagebox.layout (100%)
 rename files/{ => data}/mygui/openmw_persuasion_dialog.layout (100%)
 rename files/{ => data}/mygui/openmw_pointer.xml (100%)
 rename files/{ => data}/mygui/openmw_postprocessor_hud.layout (100%)
 rename files/{ => data}/mygui/openmw_postprocessor_hud.skin.xml (100%)
 rename files/{ => data}/mygui/openmw_progress.skin.xml (100%)
 rename files/{ => data}/mygui/openmw_quickkeys_menu.layout (100%)
 rename files/{ => data}/mygui/openmw_quickkeys_menu_assign.layout (100%)
 rename files/{ => data}/mygui/openmw_recharge_dialog.layout (100%)
 rename files/{ => data}/mygui/openmw_repair.layout (100%)
 rename files/{ => data}/mygui/openmw_resources.xml (100%)
 rename files/{ => data}/mygui/openmw_savegame_dialog.layout (100%)
 rename files/{ => data}/mygui/openmw_screen_fader.layout (100%)
 rename files/{ => data}/mygui/openmw_screen_fader_hit.layout (100%)
 rename files/{ => data}/mygui/openmw_scroll.layout (100%)
 rename files/{ => data}/mygui/openmw_scroll.skin.xml (100%)
 rename files/{ => data}/mygui/openmw_settings.xml (100%)
 rename files/{ => data}/mygui/openmw_settings_window.layout (100%)
 rename files/{ => data}/mygui/openmw_spell_buying_window.layout (100%)
 rename files/{ => data}/mygui/openmw_spell_window.layout (100%)
 rename files/{ => data}/mygui/openmw_spellcreation_dialog.layout (100%)
 rename files/{ => data}/mygui/openmw_stats_window.layout (100%)
 rename files/{ => data}/mygui/openmw_text.skin.xml (100%)
 rename files/{ => data}/mygui/openmw_text_input.layout (100%)
 rename files/{ => data}/mygui/openmw_tooltips.layout (100%)
 rename files/{ => data}/mygui/openmw_trade_window.layout (100%)
 rename files/{ => data}/mygui/openmw_trainingwindow.layout (100%)
 rename files/{ => data}/mygui/openmw_travel_window.layout (100%)
 rename files/{ => data}/mygui/openmw_wait_dialog.layout (100%)
 rename files/{ => data}/mygui/openmw_wait_dialog_progressbar.layout (100%)
 rename files/{ => data}/mygui/openmw_windows.skin.xml (100%)
 rename files/{ => data}/mygui/skins.xml (100%)
 delete mode 100644 files/mygui/CMakeLists.txt
 delete mode 100644 files/mygui/DejaVuFontLicense.txt

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 2b9206354a..467d61bf12 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -521,7 +521,6 @@ void OMW::Engine::setDataDirs (const Files::PathContainer& dataDirs)
 {
     mDataDirs = dataDirs;
     mDataDirs.insert(mDataDirs.begin(), (mResDir / "vfs"));
-    mDataDirs.insert(mDataDirs.begin(), (mResDir / "mygui"));
     mFileCollections = Files::Collections (mDataDirs, !mFSStrict);
 }
 
@@ -701,7 +700,7 @@ void OMW::Engine::createWindow()
 void OMW::Engine::setWindowIcon()
 {
     std::ifstream windowIconStream;
-    std::string windowIcon = (mResDir / "mygui" / "openmw.png").string();
+    std::string windowIcon = (mResDir / "openmw.png").string();
     windowIconStream.open(windowIcon, std::ios_base::in | std::ios_base::binary);
     if (windowIconStream.fail())
         Log(Debug::Error) << "Error: Failed to open " << windowIcon;
@@ -816,7 +815,6 @@ void OMW::Engine::prepareEngine()
         exts->glRenderbufferStorageMultisampleCoverageNV = nullptr;
 #endif
 
-    std::string myguiResources = (mResDir / "mygui").string();
     osg::ref_ptr<osg::Group> guiRoot = new osg::Group;
     guiRoot->setName("GUI Root");
     guiRoot->setNodeMask(MWRender::Mask_GUI);
@@ -824,7 +822,7 @@ void OMW::Engine::prepareEngine()
     rootNode->addChild(guiRoot);
 
     mWindowManager = std::make_unique<MWGui::WindowManager>(mWindow, mViewer, guiRoot, mResourceSystem.get(), mWorkQueue.get(),
-                mCfgMgr.getLogPath().string() + std::string("/"), myguiResources,
+                mCfgMgr.getLogPath().string() + std::string("/"),
                 mScriptConsoleMode, mTranslationDataStorage, mEncoding, mExportFonts,
                 Version::getOpenmwVersionDescription(mResDir.string()), shadersSupported);
     mEnvironment.setWindowManager(*mWindowManager);
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 5141736204..623c46fedc 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -128,7 +128,7 @@ namespace MWGui
 {
     WindowManager::WindowManager(
             SDL_Window* window, osgViewer::Viewer* viewer, osg::Group* guiRoot, Resource::ResourceSystem* resourceSystem, SceneUtil::WorkQueue* workQueue,
-            const std::string& logpath, const std::string& resourcePath, bool consoleOnlyScripts, Translation::Storage& translationDataStorage,
+            const std::string& logpath, bool consoleOnlyScripts, Translation::Storage& translationDataStorage,
             ToUTF8::FromType encoding, bool exportFonts, const std::string& versionDescription, bool useShaders)
       : mOldUpdateMask(0)
       , mOldCullMask(0)
@@ -195,7 +195,7 @@ namespace MWGui
     {
         mScalingFactor = std::clamp(Settings::Manager::getFloat("scaling factor", "GUI"), 0.5f, 8.f);
         mGuiPlatform = new osgMyGUI::Platform(viewer, guiRoot, resourceSystem->getImageManager(), mScalingFactor);
-        mGuiPlatform->initialise(resourceSystem->getVFS(), resourcePath, (std::filesystem::path(logpath) / "MyGUI.log").generic_string());
+        mGuiPlatform->initialise(resourceSystem->getVFS(), "mygui", (std::filesystem::path(logpath) / "MyGUI.log").generic_string());
 
         mGui = new MyGUI::Gui;
         mGui->initialise("");
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index 083ecc6992..a48847de3f 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -135,7 +135,7 @@ namespace MWGui
     typedef std::vector<Faction> FactionList;
 
     WindowManager(SDL_Window* window, osgViewer::Viewer* viewer, osg::Group* guiRoot, Resource::ResourceSystem* resourceSystem, SceneUtil::WorkQueue* workQueue,
-                  const std::string& logpath, const std::string& cacheDir, bool consoleOnlyScripts, Translation::Storage& translationDataStorage,
+                  const std::string& logpath, bool consoleOnlyScripts, Translation::Storage& translationDataStorage,
                   ToUTF8::FromType encoding, bool exportFonts, const std::string& versionDescription, bool useShaders);
     virtual ~WindowManager();
 
diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index fca8346e19..7d90002d95 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -213,11 +213,18 @@ namespace Gui
             return;
         }
 
+        std::string oldDataPath = dataManager->getDataPath("");
+        dataManager->setResourcePath("fonts");
+
         for (const auto& name : mVFS->getRecursiveDirectoryIterator("Fonts/"))
         {
+            std::filesystem::path path = name;
+            std::cout << name << std::endl;
             if (Misc::getFileExtension(name) == "omwfont")
-                MyGUI::ResourceManager::getInstance().load(name);
+                MyGUI::ResourceManager::getInstance().load(path.filename());
         }
+
+        dataManager->setResourcePath(oldDataPath);
     }
 
     typedef struct
diff --git a/components/myguiplatform/myguidatamanager.cpp b/components/myguiplatform/myguidatamanager.cpp
index c06532a9f4..1eefa6b81d 100644
--- a/components/myguiplatform/myguidatamanager.cpp
+++ b/components/myguiplatform/myguidatamanager.cpp
@@ -22,7 +22,7 @@ MyGUI::IDataStream *DataManager::getData(const std::string &name) const
 {
     // Note: MyGUI is supposed to read/free input steam itself,
     // so copy data from VFS stream to the string stream and pass it to MyGUI.
-    Files::IStreamPtr streamPtr = mVfs->get(name);
+    Files::IStreamPtr streamPtr = mVfs->get(mResourcePath + "\\" + name);
     std::istream* fileStream = streamPtr.get();
     std::unique_ptr<std::stringstream> dataStream;
     dataStream.reset(new std::stringstream);
@@ -37,7 +37,7 @@ void DataManager::freeData(MyGUI::IDataStream *data)
 
 bool DataManager::isDataExist(const std::string &name) const
 {
-    return mVfs->exists(name);
+    return mVfs->exists(mResourcePath + "\\" + name);
 }
 
 void DataManager::setVfs(const VFS::Manager* vfs)
@@ -52,7 +52,17 @@ const MyGUI::VectorString &DataManager::getDataListNames(const std::string &patt
 
 const std::string &DataManager::getDataPath(const std::string &name) const
 {
-    throw std::runtime_error("DataManager::getDataPath is not implemented - VFS is used");
+    static std::string result;
+    result.clear();
+
+    if (name.empty())
+        return mResourcePath;
+
+    if (!isDataExist(name))
+        return result;
+
+    result = mResourcePath + "\\" + name;
+    return result;
 }
 
 }
diff --git a/files/CMakeLists.txt b/files/CMakeLists.txt
index a3d5c14e5c..b7b4b4cd23 100644
--- a/files/CMakeLists.txt
+++ b/files/CMakeLists.txt
@@ -1,4 +1,3 @@
-add_subdirectory(mygui)
 add_subdirectory(shaders)
 add_subdirectory(data)
 add_subdirectory(lua_api)
diff --git a/files/data/CMakeLists.txt b/files/data/CMakeLists.txt
index 1fa40b3f54..63df2f53b5 100644
--- a/files/data/CMakeLists.txt
+++ b/files/data/CMakeLists.txt
@@ -69,8 +69,98 @@ set(BUILTIN_DATA_FILES
 
     shaders/main.omwfx
     shaders/displaydepth.omwfx
+
+    mygui/core.skin
+    mygui/core.xml
+    mygui/core_layouteditor.xml
+    mygui/openmw_alchemy_window.layout
+    mygui/openmw_book.layout
+    mygui/openmw_box.skin.xml
+    mygui/openmw_button.skin.xml
+    mygui/openmw_chargen_birth.layout
+    mygui/openmw_chargen_class_description.layout
+    mygui/openmw_chargen_class.layout
+    mygui/openmw_chargen_create_class.layout
+    mygui/openmw_chargen_generate_class_result.layout
+    mygui/openmw_chargen_race.layout
+    mygui/openmw_chargen_review.layout
+    mygui/openmw_chargen_select_attribute.layout
+    mygui/openmw_chargen_select_skill.layout
+    mygui/openmw_chargen_select_specialization.layout
+    mygui/openmw_confirmation_dialog.layout
+    mygui/openmw_console.layout
+    mygui/openmw_console.skin.xml
+    mygui/openmw_container_window.layout
+    mygui/openmw_count_window.layout
+    mygui/openmw_dialogue_window.layout
+    mygui/openmw_dialogue_window.skin.xml
+    mygui/openmw_edit.skin.xml
+    mygui/openmw_hud_box.skin.xml
+    mygui/openmw_hud_energybar.skin.xml
+    mygui/openmw_hud.layout
+    mygui/openmw_infobox.layout
+    mygui/openmw_interactive_messagebox.layout
+    mygui/openmw_interactive_messagebox_notransp.layout
+    mygui/openmw_inventory_window.layout
+    mygui/openmw_journal.layout
+    mygui/openmw_journal.skin.xml
+    mygui/openmw_layers.xml
+    mygui/openmw_lua.xml
+    mygui/openmw_list.skin.xml
+    mygui/openmw_mainmenu.layout
+    mygui/openmw_mainmenu.skin.xml
+    mygui/openmw_map_window.layout
+    mygui/openmw_map_window.skin.xml
+    mygui/openmw_messagebox.layout
+    mygui/openmw_pointer.xml
+    mygui/openmw_progress.skin.xml
+    mygui/openmw_resources.xml
+    mygui/openmw_scroll.layout
+    mygui/openmw_scroll.skin.xml
+    mygui/openmw_settings_window.layout
+    mygui/openmw_settings.xml
+    mygui/openmw_spell_window.layout
+    mygui/openmw_stats_window.layout
+    mygui/openmw_text_input.layout
+    mygui/openmw_text.skin.xml
+    mygui/openmw_tooltips.layout
+    mygui/openmw_trade_window.layout
+    mygui/openmw_spell_buying_window.layout
+    mygui/openmw_windows.skin.xml
+    mygui/openmw_quickkeys_menu.layout
+    mygui/openmw_quickkeys_menu_assign.layout
+    mygui/openmw_itemselection_dialog.layout
+    mygui/openmw_magicselection_dialog.layout
+    mygui/openmw_spell_buying_window.layout
+    mygui/openmw_loading_screen.layout
+    mygui/openmw_levelup_dialog.layout
+    mygui/openmw_wait_dialog.layout
+    mygui/openmw_wait_dialog_progressbar.layout
+    mygui/openmw_spellcreation_dialog.layout
+    mygui/openmw_edit_effect.layout
+    mygui/openmw_enchanting_dialog.layout
+    mygui/openmw_trainingwindow.layout
+    mygui/openmw_travel_window.layout
+    mygui/openmw_persuasion_dialog.layout
+    mygui/openmw_merchantrepair.layout
+    mygui/openmw_repair.layout
+    mygui/openmw_companion_window.layout
+    mygui/openmw_savegame_dialog.layout
+    mygui/openmw_recharge_dialog.layout
+    mygui/openmw_screen_fader.layout
+    mygui/openmw_screen_fader_hit.layout
+    mygui/openmw_edit_note.layout
+    mygui/openmw_debug_window.layout
+    mygui/openmw_debug_window.skin.xml
+    mygui/openmw_postprocessor_hud.layout
+    mygui/openmw_postprocessor_hud.skin.xml
+    mygui/openmw_jail_screen.layout
+    mygui/OpenMWResourcePlugin.xml
+    mygui/skins.xml
 )
 
 foreach (f ${BUILTIN_DATA_FILES})
     copy_resource_file("${CMAKE_CURRENT_SOURCE_DIR}/${f}" "${OPENMW_RESOURCES_ROOT}" "resources/vfs/${f}")
 endforeach (f)
+
+copy_resource_file("../launcher/images/openmw.png" "${OPENMW_RESOURCES_ROOT}" "resources/openmw.png")
diff --git a/files/data/fonts/DejaVuLGCSansMono.omwfont b/files/data/fonts/DejaVuLGCSansMono.omwfont
index 184c8a0d8f..8bd6f50174 100644
--- a/files/data/fonts/DejaVuLGCSansMono.omwfont
+++ b/files/data/fonts/DejaVuLGCSansMono.omwfont
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Resource" version="1.1">
     <Resource type="ResourceTrueTypeFont" name="dejavusansmono">
-        <Property key="Source" value="Fonts/DejaVuLGCSansMono.ttf"/>
+        <Property key="Source" value="DejaVuLGCSansMono.ttf"/>
         <Property key="Antialias" value="false"/>
         <Property key="TabWidth" value="8"/>
         <Property key="OffsetHeight" value="0"/>
diff --git a/files/data/fonts/OMWAyembedt.omwfont b/files/data/fonts/OMWAyembedt.omwfont
index 9af8f655d8..25659da215 100644
--- a/files/data/fonts/OMWAyembedt.omwfont
+++ b/files/data/fonts/OMWAyembedt.omwfont
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Resource" version="1.1">
     <Resource type="ResourceTrueTypeFont" name="ayembedt">
-        <Property key="Source" value="Fonts/OMWAyembedt.ttf"/>
+        <Property key="Source" value="OMWAyembedt.ttf"/>
         <Property key="Antialias" value="false"/>
         <Property key="TabWidth" value="8"/>
         <Property key="OffsetHeight" value="0"/>
diff --git a/files/data/fonts/Pelagiad.omwfont b/files/data/fonts/Pelagiad.omwfont
index 4b01a9f308..e06a233b3a 100644
--- a/files/data/fonts/Pelagiad.omwfont
+++ b/files/data/fonts/Pelagiad.omwfont
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Resource" version="1.1">
     <Resource type="ResourceTrueTypeFont" name="pelagiad">
-        <Property key="Source" value="Fonts/Pelagiad.ttf"/>
+        <Property key="Source" value="Pelagiad.ttf"/>
         <Property key="Antialias" value="false"/>
         <Property key="TabWidth" value="8"/>
         <Property key="OffsetHeight" value="0"/>
diff --git a/files/mygui/OpenMWResourcePlugin.xml b/files/data/mygui/OpenMWResourcePlugin.xml
similarity index 100%
rename from files/mygui/OpenMWResourcePlugin.xml
rename to files/data/mygui/OpenMWResourcePlugin.xml
diff --git a/files/mygui/core.skin b/files/data/mygui/core.skin
similarity index 100%
rename from files/mygui/core.skin
rename to files/data/mygui/core.skin
diff --git a/files/mygui/core.xml b/files/data/mygui/core.xml
similarity index 100%
rename from files/mygui/core.xml
rename to files/data/mygui/core.xml
diff --git a/files/mygui/core_layouteditor.xml b/files/data/mygui/core_layouteditor.xml
similarity index 100%
rename from files/mygui/core_layouteditor.xml
rename to files/data/mygui/core_layouteditor.xml
diff --git a/files/mygui/openmw_alchemy_window.layout b/files/data/mygui/openmw_alchemy_window.layout
similarity index 100%
rename from files/mygui/openmw_alchemy_window.layout
rename to files/data/mygui/openmw_alchemy_window.layout
diff --git a/files/mygui/openmw_book.layout b/files/data/mygui/openmw_book.layout
similarity index 100%
rename from files/mygui/openmw_book.layout
rename to files/data/mygui/openmw_book.layout
diff --git a/files/mygui/openmw_box.skin.xml b/files/data/mygui/openmw_box.skin.xml
similarity index 100%
rename from files/mygui/openmw_box.skin.xml
rename to files/data/mygui/openmw_box.skin.xml
diff --git a/files/mygui/openmw_button.skin.xml b/files/data/mygui/openmw_button.skin.xml
similarity index 100%
rename from files/mygui/openmw_button.skin.xml
rename to files/data/mygui/openmw_button.skin.xml
diff --git a/files/mygui/openmw_chargen_birth.layout b/files/data/mygui/openmw_chargen_birth.layout
similarity index 100%
rename from files/mygui/openmw_chargen_birth.layout
rename to files/data/mygui/openmw_chargen_birth.layout
diff --git a/files/mygui/openmw_chargen_class.layout b/files/data/mygui/openmw_chargen_class.layout
similarity index 100%
rename from files/mygui/openmw_chargen_class.layout
rename to files/data/mygui/openmw_chargen_class.layout
diff --git a/files/mygui/openmw_chargen_class_description.layout b/files/data/mygui/openmw_chargen_class_description.layout
similarity index 100%
rename from files/mygui/openmw_chargen_class_description.layout
rename to files/data/mygui/openmw_chargen_class_description.layout
diff --git a/files/mygui/openmw_chargen_create_class.layout b/files/data/mygui/openmw_chargen_create_class.layout
similarity index 100%
rename from files/mygui/openmw_chargen_create_class.layout
rename to files/data/mygui/openmw_chargen_create_class.layout
diff --git a/files/mygui/openmw_chargen_generate_class_result.layout b/files/data/mygui/openmw_chargen_generate_class_result.layout
similarity index 100%
rename from files/mygui/openmw_chargen_generate_class_result.layout
rename to files/data/mygui/openmw_chargen_generate_class_result.layout
diff --git a/files/mygui/openmw_chargen_race.layout b/files/data/mygui/openmw_chargen_race.layout
similarity index 100%
rename from files/mygui/openmw_chargen_race.layout
rename to files/data/mygui/openmw_chargen_race.layout
diff --git a/files/mygui/openmw_chargen_review.layout b/files/data/mygui/openmw_chargen_review.layout
similarity index 100%
rename from files/mygui/openmw_chargen_review.layout
rename to files/data/mygui/openmw_chargen_review.layout
diff --git a/files/mygui/openmw_chargen_select_attribute.layout b/files/data/mygui/openmw_chargen_select_attribute.layout
similarity index 100%
rename from files/mygui/openmw_chargen_select_attribute.layout
rename to files/data/mygui/openmw_chargen_select_attribute.layout
diff --git a/files/mygui/openmw_chargen_select_skill.layout b/files/data/mygui/openmw_chargen_select_skill.layout
similarity index 100%
rename from files/mygui/openmw_chargen_select_skill.layout
rename to files/data/mygui/openmw_chargen_select_skill.layout
diff --git a/files/mygui/openmw_chargen_select_specialization.layout b/files/data/mygui/openmw_chargen_select_specialization.layout
similarity index 100%
rename from files/mygui/openmw_chargen_select_specialization.layout
rename to files/data/mygui/openmw_chargen_select_specialization.layout
diff --git a/files/mygui/openmw_companion_window.layout b/files/data/mygui/openmw_companion_window.layout
similarity index 100%
rename from files/mygui/openmw_companion_window.layout
rename to files/data/mygui/openmw_companion_window.layout
diff --git a/files/mygui/openmw_confirmation_dialog.layout b/files/data/mygui/openmw_confirmation_dialog.layout
similarity index 100%
rename from files/mygui/openmw_confirmation_dialog.layout
rename to files/data/mygui/openmw_confirmation_dialog.layout
diff --git a/files/mygui/openmw_console.layout b/files/data/mygui/openmw_console.layout
similarity index 100%
rename from files/mygui/openmw_console.layout
rename to files/data/mygui/openmw_console.layout
diff --git a/files/mygui/openmw_console.skin.xml b/files/data/mygui/openmw_console.skin.xml
similarity index 100%
rename from files/mygui/openmw_console.skin.xml
rename to files/data/mygui/openmw_console.skin.xml
diff --git a/files/mygui/openmw_container_window.layout b/files/data/mygui/openmw_container_window.layout
similarity index 100%
rename from files/mygui/openmw_container_window.layout
rename to files/data/mygui/openmw_container_window.layout
diff --git a/files/mygui/openmw_count_window.layout b/files/data/mygui/openmw_count_window.layout
similarity index 100%
rename from files/mygui/openmw_count_window.layout
rename to files/data/mygui/openmw_count_window.layout
diff --git a/files/mygui/openmw_debug_window.layout b/files/data/mygui/openmw_debug_window.layout
similarity index 100%
rename from files/mygui/openmw_debug_window.layout
rename to files/data/mygui/openmw_debug_window.layout
diff --git a/files/mygui/openmw_debug_window.skin.xml b/files/data/mygui/openmw_debug_window.skin.xml
similarity index 100%
rename from files/mygui/openmw_debug_window.skin.xml
rename to files/data/mygui/openmw_debug_window.skin.xml
diff --git a/files/mygui/openmw_dialogue_window.layout b/files/data/mygui/openmw_dialogue_window.layout
similarity index 100%
rename from files/mygui/openmw_dialogue_window.layout
rename to files/data/mygui/openmw_dialogue_window.layout
diff --git a/files/mygui/openmw_dialogue_window.skin.xml b/files/data/mygui/openmw_dialogue_window.skin.xml
similarity index 100%
rename from files/mygui/openmw_dialogue_window.skin.xml
rename to files/data/mygui/openmw_dialogue_window.skin.xml
diff --git a/files/mygui/openmw_edit.skin.xml b/files/data/mygui/openmw_edit.skin.xml
similarity index 100%
rename from files/mygui/openmw_edit.skin.xml
rename to files/data/mygui/openmw_edit.skin.xml
diff --git a/files/mygui/openmw_edit_effect.layout b/files/data/mygui/openmw_edit_effect.layout
similarity index 100%
rename from files/mygui/openmw_edit_effect.layout
rename to files/data/mygui/openmw_edit_effect.layout
diff --git a/files/mygui/openmw_edit_note.layout b/files/data/mygui/openmw_edit_note.layout
similarity index 100%
rename from files/mygui/openmw_edit_note.layout
rename to files/data/mygui/openmw_edit_note.layout
diff --git a/files/mygui/openmw_enchanting_dialog.layout b/files/data/mygui/openmw_enchanting_dialog.layout
similarity index 100%
rename from files/mygui/openmw_enchanting_dialog.layout
rename to files/data/mygui/openmw_enchanting_dialog.layout
diff --git a/files/mygui/openmw_hud.layout b/files/data/mygui/openmw_hud.layout
similarity index 100%
rename from files/mygui/openmw_hud.layout
rename to files/data/mygui/openmw_hud.layout
diff --git a/files/mygui/openmw_hud_box.skin.xml b/files/data/mygui/openmw_hud_box.skin.xml
similarity index 100%
rename from files/mygui/openmw_hud_box.skin.xml
rename to files/data/mygui/openmw_hud_box.skin.xml
diff --git a/files/mygui/openmw_hud_energybar.skin.xml b/files/data/mygui/openmw_hud_energybar.skin.xml
similarity index 100%
rename from files/mygui/openmw_hud_energybar.skin.xml
rename to files/data/mygui/openmw_hud_energybar.skin.xml
diff --git a/files/mygui/openmw_infobox.layout b/files/data/mygui/openmw_infobox.layout
similarity index 100%
rename from files/mygui/openmw_infobox.layout
rename to files/data/mygui/openmw_infobox.layout
diff --git a/files/mygui/openmw_interactive_messagebox.layout b/files/data/mygui/openmw_interactive_messagebox.layout
similarity index 100%
rename from files/mygui/openmw_interactive_messagebox.layout
rename to files/data/mygui/openmw_interactive_messagebox.layout
diff --git a/files/mygui/openmw_interactive_messagebox_notransp.layout b/files/data/mygui/openmw_interactive_messagebox_notransp.layout
similarity index 100%
rename from files/mygui/openmw_interactive_messagebox_notransp.layout
rename to files/data/mygui/openmw_interactive_messagebox_notransp.layout
diff --git a/files/mygui/openmw_inventory_window.layout b/files/data/mygui/openmw_inventory_window.layout
similarity index 100%
rename from files/mygui/openmw_inventory_window.layout
rename to files/data/mygui/openmw_inventory_window.layout
diff --git a/files/mygui/openmw_itemselection_dialog.layout b/files/data/mygui/openmw_itemselection_dialog.layout
similarity index 100%
rename from files/mygui/openmw_itemselection_dialog.layout
rename to files/data/mygui/openmw_itemselection_dialog.layout
diff --git a/files/mygui/openmw_jail_screen.layout b/files/data/mygui/openmw_jail_screen.layout
similarity index 100%
rename from files/mygui/openmw_jail_screen.layout
rename to files/data/mygui/openmw_jail_screen.layout
diff --git a/files/mygui/openmw_journal.layout b/files/data/mygui/openmw_journal.layout
similarity index 100%
rename from files/mygui/openmw_journal.layout
rename to files/data/mygui/openmw_journal.layout
diff --git a/files/mygui/openmw_journal.skin.xml b/files/data/mygui/openmw_journal.skin.xml
similarity index 100%
rename from files/mygui/openmw_journal.skin.xml
rename to files/data/mygui/openmw_journal.skin.xml
diff --git a/files/mygui/openmw_layers.xml b/files/data/mygui/openmw_layers.xml
similarity index 100%
rename from files/mygui/openmw_layers.xml
rename to files/data/mygui/openmw_layers.xml
diff --git a/files/mygui/openmw_levelup_dialog.layout b/files/data/mygui/openmw_levelup_dialog.layout
similarity index 100%
rename from files/mygui/openmw_levelup_dialog.layout
rename to files/data/mygui/openmw_levelup_dialog.layout
diff --git a/files/mygui/openmw_list.skin.xml b/files/data/mygui/openmw_list.skin.xml
similarity index 100%
rename from files/mygui/openmw_list.skin.xml
rename to files/data/mygui/openmw_list.skin.xml
diff --git a/files/mygui/openmw_loading_screen.layout b/files/data/mygui/openmw_loading_screen.layout
similarity index 100%
rename from files/mygui/openmw_loading_screen.layout
rename to files/data/mygui/openmw_loading_screen.layout
diff --git a/files/mygui/openmw_lua.xml b/files/data/mygui/openmw_lua.xml
similarity index 100%
rename from files/mygui/openmw_lua.xml
rename to files/data/mygui/openmw_lua.xml
diff --git a/files/mygui/openmw_magicselection_dialog.layout b/files/data/mygui/openmw_magicselection_dialog.layout
similarity index 100%
rename from files/mygui/openmw_magicselection_dialog.layout
rename to files/data/mygui/openmw_magicselection_dialog.layout
diff --git a/files/mygui/openmw_mainmenu.layout b/files/data/mygui/openmw_mainmenu.layout
similarity index 100%
rename from files/mygui/openmw_mainmenu.layout
rename to files/data/mygui/openmw_mainmenu.layout
diff --git a/files/mygui/openmw_mainmenu.skin.xml b/files/data/mygui/openmw_mainmenu.skin.xml
similarity index 100%
rename from files/mygui/openmw_mainmenu.skin.xml
rename to files/data/mygui/openmw_mainmenu.skin.xml
diff --git a/files/mygui/openmw_map_window.layout b/files/data/mygui/openmw_map_window.layout
similarity index 100%
rename from files/mygui/openmw_map_window.layout
rename to files/data/mygui/openmw_map_window.layout
diff --git a/files/mygui/openmw_map_window.skin.xml b/files/data/mygui/openmw_map_window.skin.xml
similarity index 100%
rename from files/mygui/openmw_map_window.skin.xml
rename to files/data/mygui/openmw_map_window.skin.xml
diff --git a/files/mygui/openmw_merchantrepair.layout b/files/data/mygui/openmw_merchantrepair.layout
similarity index 100%
rename from files/mygui/openmw_merchantrepair.layout
rename to files/data/mygui/openmw_merchantrepair.layout
diff --git a/files/mygui/openmw_messagebox.layout b/files/data/mygui/openmw_messagebox.layout
similarity index 100%
rename from files/mygui/openmw_messagebox.layout
rename to files/data/mygui/openmw_messagebox.layout
diff --git a/files/mygui/openmw_persuasion_dialog.layout b/files/data/mygui/openmw_persuasion_dialog.layout
similarity index 100%
rename from files/mygui/openmw_persuasion_dialog.layout
rename to files/data/mygui/openmw_persuasion_dialog.layout
diff --git a/files/mygui/openmw_pointer.xml b/files/data/mygui/openmw_pointer.xml
similarity index 100%
rename from files/mygui/openmw_pointer.xml
rename to files/data/mygui/openmw_pointer.xml
diff --git a/files/mygui/openmw_postprocessor_hud.layout b/files/data/mygui/openmw_postprocessor_hud.layout
similarity index 100%
rename from files/mygui/openmw_postprocessor_hud.layout
rename to files/data/mygui/openmw_postprocessor_hud.layout
diff --git a/files/mygui/openmw_postprocessor_hud.skin.xml b/files/data/mygui/openmw_postprocessor_hud.skin.xml
similarity index 100%
rename from files/mygui/openmw_postprocessor_hud.skin.xml
rename to files/data/mygui/openmw_postprocessor_hud.skin.xml
diff --git a/files/mygui/openmw_progress.skin.xml b/files/data/mygui/openmw_progress.skin.xml
similarity index 100%
rename from files/mygui/openmw_progress.skin.xml
rename to files/data/mygui/openmw_progress.skin.xml
diff --git a/files/mygui/openmw_quickkeys_menu.layout b/files/data/mygui/openmw_quickkeys_menu.layout
similarity index 100%
rename from files/mygui/openmw_quickkeys_menu.layout
rename to files/data/mygui/openmw_quickkeys_menu.layout
diff --git a/files/mygui/openmw_quickkeys_menu_assign.layout b/files/data/mygui/openmw_quickkeys_menu_assign.layout
similarity index 100%
rename from files/mygui/openmw_quickkeys_menu_assign.layout
rename to files/data/mygui/openmw_quickkeys_menu_assign.layout
diff --git a/files/mygui/openmw_recharge_dialog.layout b/files/data/mygui/openmw_recharge_dialog.layout
similarity index 100%
rename from files/mygui/openmw_recharge_dialog.layout
rename to files/data/mygui/openmw_recharge_dialog.layout
diff --git a/files/mygui/openmw_repair.layout b/files/data/mygui/openmw_repair.layout
similarity index 100%
rename from files/mygui/openmw_repair.layout
rename to files/data/mygui/openmw_repair.layout
diff --git a/files/mygui/openmw_resources.xml b/files/data/mygui/openmw_resources.xml
similarity index 100%
rename from files/mygui/openmw_resources.xml
rename to files/data/mygui/openmw_resources.xml
diff --git a/files/mygui/openmw_savegame_dialog.layout b/files/data/mygui/openmw_savegame_dialog.layout
similarity index 100%
rename from files/mygui/openmw_savegame_dialog.layout
rename to files/data/mygui/openmw_savegame_dialog.layout
diff --git a/files/mygui/openmw_screen_fader.layout b/files/data/mygui/openmw_screen_fader.layout
similarity index 100%
rename from files/mygui/openmw_screen_fader.layout
rename to files/data/mygui/openmw_screen_fader.layout
diff --git a/files/mygui/openmw_screen_fader_hit.layout b/files/data/mygui/openmw_screen_fader_hit.layout
similarity index 100%
rename from files/mygui/openmw_screen_fader_hit.layout
rename to files/data/mygui/openmw_screen_fader_hit.layout
diff --git a/files/mygui/openmw_scroll.layout b/files/data/mygui/openmw_scroll.layout
similarity index 100%
rename from files/mygui/openmw_scroll.layout
rename to files/data/mygui/openmw_scroll.layout
diff --git a/files/mygui/openmw_scroll.skin.xml b/files/data/mygui/openmw_scroll.skin.xml
similarity index 100%
rename from files/mygui/openmw_scroll.skin.xml
rename to files/data/mygui/openmw_scroll.skin.xml
diff --git a/files/mygui/openmw_settings.xml b/files/data/mygui/openmw_settings.xml
similarity index 100%
rename from files/mygui/openmw_settings.xml
rename to files/data/mygui/openmw_settings.xml
diff --git a/files/mygui/openmw_settings_window.layout b/files/data/mygui/openmw_settings_window.layout
similarity index 100%
rename from files/mygui/openmw_settings_window.layout
rename to files/data/mygui/openmw_settings_window.layout
diff --git a/files/mygui/openmw_spell_buying_window.layout b/files/data/mygui/openmw_spell_buying_window.layout
similarity index 100%
rename from files/mygui/openmw_spell_buying_window.layout
rename to files/data/mygui/openmw_spell_buying_window.layout
diff --git a/files/mygui/openmw_spell_window.layout b/files/data/mygui/openmw_spell_window.layout
similarity index 100%
rename from files/mygui/openmw_spell_window.layout
rename to files/data/mygui/openmw_spell_window.layout
diff --git a/files/mygui/openmw_spellcreation_dialog.layout b/files/data/mygui/openmw_spellcreation_dialog.layout
similarity index 100%
rename from files/mygui/openmw_spellcreation_dialog.layout
rename to files/data/mygui/openmw_spellcreation_dialog.layout
diff --git a/files/mygui/openmw_stats_window.layout b/files/data/mygui/openmw_stats_window.layout
similarity index 100%
rename from files/mygui/openmw_stats_window.layout
rename to files/data/mygui/openmw_stats_window.layout
diff --git a/files/mygui/openmw_text.skin.xml b/files/data/mygui/openmw_text.skin.xml
similarity index 100%
rename from files/mygui/openmw_text.skin.xml
rename to files/data/mygui/openmw_text.skin.xml
diff --git a/files/mygui/openmw_text_input.layout b/files/data/mygui/openmw_text_input.layout
similarity index 100%
rename from files/mygui/openmw_text_input.layout
rename to files/data/mygui/openmw_text_input.layout
diff --git a/files/mygui/openmw_tooltips.layout b/files/data/mygui/openmw_tooltips.layout
similarity index 100%
rename from files/mygui/openmw_tooltips.layout
rename to files/data/mygui/openmw_tooltips.layout
diff --git a/files/mygui/openmw_trade_window.layout b/files/data/mygui/openmw_trade_window.layout
similarity index 100%
rename from files/mygui/openmw_trade_window.layout
rename to files/data/mygui/openmw_trade_window.layout
diff --git a/files/mygui/openmw_trainingwindow.layout b/files/data/mygui/openmw_trainingwindow.layout
similarity index 100%
rename from files/mygui/openmw_trainingwindow.layout
rename to files/data/mygui/openmw_trainingwindow.layout
diff --git a/files/mygui/openmw_travel_window.layout b/files/data/mygui/openmw_travel_window.layout
similarity index 100%
rename from files/mygui/openmw_travel_window.layout
rename to files/data/mygui/openmw_travel_window.layout
diff --git a/files/mygui/openmw_wait_dialog.layout b/files/data/mygui/openmw_wait_dialog.layout
similarity index 100%
rename from files/mygui/openmw_wait_dialog.layout
rename to files/data/mygui/openmw_wait_dialog.layout
diff --git a/files/mygui/openmw_wait_dialog_progressbar.layout b/files/data/mygui/openmw_wait_dialog_progressbar.layout
similarity index 100%
rename from files/mygui/openmw_wait_dialog_progressbar.layout
rename to files/data/mygui/openmw_wait_dialog_progressbar.layout
diff --git a/files/mygui/openmw_windows.skin.xml b/files/data/mygui/openmw_windows.skin.xml
similarity index 100%
rename from files/mygui/openmw_windows.skin.xml
rename to files/data/mygui/openmw_windows.skin.xml
diff --git a/files/mygui/skins.xml b/files/data/mygui/skins.xml
similarity index 100%
rename from files/mygui/skins.xml
rename to files/data/mygui/skins.xml
diff --git a/files/mygui/CMakeLists.txt b/files/mygui/CMakeLists.txt
deleted file mode 100644
index 4716a7712b..0000000000
--- a/files/mygui/CMakeLists.txt
+++ /dev/null
@@ -1,101 +0,0 @@
-if (NOT DEFINED OPENMW_RESOURCES_ROOT)
-    return()
-endif()
-
-# Copy resource files into the build directory
-set(SDIR ${CMAKE_CURRENT_SOURCE_DIR})
-set(DDIRRELATIVE resources/mygui)
-
-set(MYGUI_FILES
-    core.skin
-    core.xml
-    core_layouteditor.xml
-    openmw_alchemy_window.layout
-    openmw_book.layout
-    openmw_box.skin.xml
-    openmw_button.skin.xml
-    openmw_chargen_birth.layout
-    openmw_chargen_class_description.layout
-    openmw_chargen_class.layout
-    openmw_chargen_create_class.layout
-    openmw_chargen_generate_class_result.layout
-    openmw_chargen_race.layout
-    openmw_chargen_review.layout
-    openmw_chargen_select_attribute.layout
-    openmw_chargen_select_skill.layout
-    openmw_chargen_select_specialization.layout
-    openmw_confirmation_dialog.layout
-    openmw_console.layout
-    openmw_console.skin.xml
-    openmw_container_window.layout
-    openmw_count_window.layout
-    openmw_dialogue_window.layout
-    openmw_dialogue_window.skin.xml
-    openmw_edit.skin.xml
-    openmw_hud_box.skin.xml
-    openmw_hud_energybar.skin.xml
-    openmw_hud.layout
-    openmw_infobox.layout
-    openmw_interactive_messagebox.layout
-    openmw_interactive_messagebox_notransp.layout
-    openmw_inventory_window.layout
-    openmw_journal.layout
-    openmw_journal.skin.xml
-    openmw_layers.xml
-    openmw_lua.xml
-    openmw_list.skin.xml
-    openmw_mainmenu.layout
-    openmw_mainmenu.skin.xml
-    openmw_map_window.layout
-    openmw_map_window.skin.xml
-    openmw_messagebox.layout
-    openmw_pointer.xml
-    openmw_progress.skin.xml
-    openmw_resources.xml
-    openmw_scroll.layout
-    openmw_scroll.skin.xml
-    openmw_settings_window.layout
-    openmw_settings.xml
-    openmw_spell_window.layout
-    openmw_stats_window.layout
-    openmw_text_input.layout
-    openmw_text.skin.xml
-    openmw_tooltips.layout
-    openmw_trade_window.layout
-    openmw_spell_buying_window.layout
-    openmw_windows.skin.xml
-    openmw_quickkeys_menu.layout
-    openmw_quickkeys_menu_assign.layout
-    openmw_itemselection_dialog.layout
-    openmw_magicselection_dialog.layout
-    openmw_spell_buying_window.layout
-    openmw_loading_screen.layout
-    openmw_levelup_dialog.layout
-    openmw_wait_dialog.layout
-    openmw_wait_dialog_progressbar.layout
-    openmw_spellcreation_dialog.layout
-    openmw_edit_effect.layout
-    openmw_enchanting_dialog.layout
-    openmw_trainingwindow.layout
-    openmw_travel_window.layout
-    openmw_persuasion_dialog.layout
-    openmw_merchantrepair.layout
-    openmw_repair.layout
-    openmw_companion_window.layout
-    openmw_savegame_dialog.layout
-    openmw_recharge_dialog.layout
-    openmw_screen_fader.layout
-    openmw_screen_fader_hit.layout
-    openmw_edit_note.layout
-    openmw_debug_window.layout
-    openmw_debug_window.skin.xml
-    openmw_postprocessor_hud.layout
-    openmw_postprocessor_hud.skin.xml
-    openmw_jail_screen.layout
-    ../launcher/images/openmw.png
-    OpenMWResourcePlugin.xml
-    skins.xml
-)
-
-
-copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_ROOT} ${DDIRRELATIVE} "${MYGUI_FILES}")
diff --git a/files/mygui/DejaVuFontLicense.txt b/files/mygui/DejaVuFontLicense.txt
deleted file mode 100644
index 254e2cc42a..0000000000
--- a/files/mygui/DejaVuFontLicense.txt
+++ /dev/null
@@ -1,99 +0,0 @@
-Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
-Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below)
-
-Bitstream Vera Fonts Copyright
-------------------------------
-
-Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
-a trademark of Bitstream, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of the fonts accompanying this license ("Fonts") and associated
-documentation files (the "Font Software"), to reproduce and distribute the
-Font Software, including without limitation the rights to use, copy, merge,
-publish, distribute, and/or sell copies of the Font Software, and to permit
-persons to whom the Font Software is furnished to do so, subject to the
-following conditions:
-
-The above copyright and trademark notices and this permission notice shall
-be included in all copies of one or more of the Font Software typefaces.
-
-The Font Software may be modified, altered, or added to, and in particular
-the designs of glyphs or characters in the Fonts may be modified and
-additional glyphs or characters may be added to the Fonts, only if the fonts
-are renamed to names not containing either the words "Bitstream" or the word
-"Vera".
-
-This License becomes null and void to the extent applicable to Fonts or Font
-Software that has been modified and is distributed under the "Bitstream
-Vera" names.
-
-The Font Software may be sold as part of a larger software package but no
-copy of one or more of the Font Software typefaces may be sold by itself.
-
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
-TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
-FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING
-ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
-FONT SOFTWARE.
-
-Except as contained in this notice, the names of Gnome, the Gnome
-Foundation, and Bitstream Inc., shall not be used in advertising or
-otherwise to promote the sale, use or other dealings in this Font Software
-without prior written authorization from the Gnome Foundation or Bitstream
-Inc., respectively. For further information, contact: fonts at gnome dot
-org. 
-
-Arev Fonts Copyright
-------------------------------
-
-Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the fonts accompanying this license ("Fonts") and
-associated documentation files (the "Font Software"), to reproduce
-and distribute the modifications to the Bitstream Vera Font Software,
-including without limitation the rights to use, copy, merge, publish,
-distribute, and/or sell copies of the Font Software, and to permit
-persons to whom the Font Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright and trademark notices and this permission notice
-shall be included in all copies of one or more of the Font Software
-typefaces.
-
-The Font Software may be modified, altered, or added to, and in
-particular the designs of glyphs or characters in the Fonts may be
-modified and additional glyphs or characters may be added to the
-Fonts, only if the fonts are renamed to names not containing either
-the words "Tavmjong Bah" or the word "Arev".
-
-This License becomes null and void to the extent applicable to Fonts
-or Font Software that has been modified and is distributed under the 
-"Tavmjong Bah Arev" names.
-
-The Font Software may be sold as part of a larger software package but
-no copy of one or more of the Font Software typefaces may be sold by
-itself.
-
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
-TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
-
-Except as contained in this notice, the name of Tavmjong Bah shall not
-be used in advertising or otherwise to promote the sale, use or other
-dealings in this Font Software without prior written authorization
-from Tavmjong Bah. For further information, contact: tavmjong @ free
-. fr.
-
-$Id: LICENSE 2133 2007-11-28 02:46:28Z lechimp $

From 8fc3635c2c6924caaa0e32adfa6c8615df883e02 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 9 Jul 2022 22:09:37 +0400
Subject: [PATCH 2831/2859] Use case-insensitive font keys, remove debug code

---
 components/fontloader/fontloader.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index 7d90002d95..35d0e8d4fa 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -219,7 +219,6 @@ namespace Gui
         for (const auto& name : mVFS->getRecursiveDirectoryIterator("Fonts/"))
         {
             std::filesystem::path path = name;
-            std::cout << name << std::endl;
             if (Misc::getFileExtension(name) == "omwfont")
                 MyGUI::ResourceManager::getInstance().load(path.filename());
         }
@@ -625,11 +624,13 @@ namespace Gui
 
     std::string FontLoader::getInternalFontName(const std::string& name)
     {
-        if (name == Settings::Manager::getString("default font", "GUI"))
+        const std::string lowerName = Misc::StringUtils::lowerCase(name);
+
+        if (lowerName == Misc::StringUtils::lowerCase(Settings::Manager::getString("default font", "GUI")))
             return "DefaultFont";
-        if (name == Settings::Manager::getString("scroll font", "GUI"))
+        if (lowerName == Misc::StringUtils::lowerCase(Settings::Manager::getString("scroll font", "GUI")))
             return "ScrollFont";
-        if (name == Settings::Manager::getString("mono font", "GUI"))
+        if (lowerName == Misc::StringUtils::lowerCase(Settings::Manager::getString("mono font", "GUI")))
             return "MonoFont";
 
         return name;

From 8513bc96203a5c2ababd79a162289a4b530e1cbb Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 9 Jul 2022 22:53:34 +0400
Subject: [PATCH 2832/2859] Fix build error on MSVC

---
 components/fontloader/fontloader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index 35d0e8d4fa..40cf965f43 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -220,7 +220,7 @@ namespace Gui
         {
             std::filesystem::path path = name;
             if (Misc::getFileExtension(name) == "omwfont")
-                MyGUI::ResourceManager::getInstance().load(path.filename());
+                MyGUI::ResourceManager::getInstance().load(path.filename().string());
         }
 
         dataManager->setResourcePath(oldDataPath);

From db686b25c29c246bfdabb1225f64627e26311b29 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Tue, 12 Jul 2022 17:27:59 +0400
Subject: [PATCH 2833/2859] Use fallback data from openmw.cfg to setup fonts

---
 components/fontloader/fontloader.cpp | 10 ++++++----
 files/openmw.cfg                     |  6 +++---
 files/openmw.cfg.local               |  6 +++---
 files/settings-default.cfg           |  9 ---------
 4 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index 40cf965f43..ffd9d82555 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -17,6 +17,8 @@
 
 #include <components/debug/debuglog.hpp>
 
+#include <components/fallback/fallback.hpp>
+
 #include <components/vfs/manager.hpp>
 
 #include <components/misc/pathhelpers.hpp>
@@ -626,12 +628,12 @@ namespace Gui
     {
         const std::string lowerName = Misc::StringUtils::lowerCase(name);
 
-        if (lowerName == Misc::StringUtils::lowerCase(Settings::Manager::getString("default font", "GUI")))
+        if (lowerName == Misc::StringUtils::lowerCase(Fallback::Map::getString("Fonts_Font_0")))
             return "DefaultFont";
-        if (lowerName == Misc::StringUtils::lowerCase(Settings::Manager::getString("scroll font", "GUI")))
-            return "ScrollFont";
-        if (lowerName == Misc::StringUtils::lowerCase(Settings::Manager::getString("mono font", "GUI")))
+        if (lowerName == Misc::StringUtils::lowerCase(Fallback::Map::getString("Fonts_Font_1")))
             return "MonoFont";
+        if (lowerName == Misc::StringUtils::lowerCase(Fallback::Map::getString("Fonts_Font_2")))
+            return "ScrollFont";
 
         return name;
     }
diff --git a/files/openmw.cfg b/files/openmw.cfg
index b56f2bbca1..00c1435212 100644
--- a/files/openmw.cfg
+++ b/files/openmw.cfg
@@ -71,9 +71,9 @@ fallback=Water_UnderwaterColor,012,030,037
 fallback=Water_UnderwaterColorWeight,0.85
 
 # fonts
-fallback=Fonts_Font_0,magic_cards_regular
-fallback=Fonts_Font_1,century_gothic_font_regular
-fallback=Fonts_Font_2,daedric_font
+fallback=Fonts_Font_0,pelagiad
+fallback=Fonts_Font_1,dejavusansmono
+fallback=Fonts_Font_2,ayembedt
 fallback=FontColor_color_normal,202,165,96
 fallback=FontColor_color_normal_over,223,201,159
 fallback=FontColor_color_normal_pressed,243,237,221
diff --git a/files/openmw.cfg.local b/files/openmw.cfg.local
index 94f17d8aec..44525dc486 100644
--- a/files/openmw.cfg.local
+++ b/files/openmw.cfg.local
@@ -71,9 +71,9 @@ fallback=Water_UnderwaterColor,012,030,037
 fallback=Water_UnderwaterColorWeight,0.85
 
 # fonts
-fallback=Fonts_Font_0,magic_cards_regular
-fallback=Fonts_Font_1,century_gothic_font_regular
-fallback=Fonts_Font_2,daedric_font
+fallback=Fonts_Font_0,pelagiad
+fallback=Fonts_Font_1,dejavusansmono
+fallback=Fonts_Font_2,ayembedt
 fallback=FontColor_color_normal,202,165,96
 fallback=FontColor_color_normal_over,223,201,159
 fallback=FontColor_color_normal_pressed,243,237,221
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index d42c093f0a..2675004907 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -234,15 +234,6 @@ color topic specific = 0.45 0.5 0.8 1
 # Default to grey
 color topic exhausted = 0.3 0.3 0.3 1
 
-# Font used by UI and books
-default font = pelagiad
-
-# Font used by magic scrolls
-scroll font = ayembedt
-
-# Font used by console and debug log
-mono font = dejavusansmono
-
 [HUD]
 
 # Displays the crosshair or reticle when not in GUI mode.

From 6f6b5ba04b8d814b84d853999830e381ab723e35 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sun, 17 Jul 2022 17:54:06 +0400
Subject: [PATCH 2834/2859] Some refactoring

---
 components/fontloader/fontloader.cpp          | 16 ++++++--------
 components/misc/pathhelpers.hpp               | 22 +++++++++++++++++++
 components/myguiplatform/myguidatamanager.cpp |  9 ++++----
 components/resource/stats.cpp                 |  2 +-
 files/CMakeLists.txt                          |  2 ++
 files/data/CMakeLists.txt                     |  2 --
 6 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index ffd9d82555..200309e091 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -1,6 +1,5 @@
 #include "fontloader.hpp"
 
-#include <filesystem>
 #include <stdexcept>
 #include <string_view>
 #include <array>
@@ -199,10 +198,10 @@ namespace Gui
 
     void FontLoader::loadBitmapFonts(bool exportToFile)
     {
-        for (const auto& name : mVFS->getRecursiveDirectoryIterator("Fonts/"))
+        for (const auto& path : mVFS->getRecursiveDirectoryIterator("Fonts/"))
         {
-            if (Misc::getFileExtension(name) == "fnt")
-                loadBitmapFont(name, exportToFile);
+            if (Misc::getFileExtension(path) == "fnt")
+                loadBitmapFont(path, exportToFile);
         }
     }
 
@@ -218,11 +217,10 @@ namespace Gui
         std::string oldDataPath = dataManager->getDataPath("");
         dataManager->setResourcePath("fonts");
 
-        for (const auto& name : mVFS->getRecursiveDirectoryIterator("Fonts/"))
+        for (const auto& path : mVFS->getRecursiveDirectoryIterator("Fonts/"))
         {
-            std::filesystem::path path = name;
-            if (Misc::getFileExtension(name) == "omwfont")
-                MyGUI::ResourceManager::getInstance().load(path.filename().string());
+            if (Misc::getFileExtension(path) == "omwfont")
+                MyGUI::ResourceManager::getInstance().load(std::string(Misc::getFileName(path)));
         }
 
         dataManager->setResourcePath(oldDataPath);
@@ -344,7 +342,7 @@ namespace Gui
         MyGUI::xml::Document xmlDocument;
         MyGUI::xml::ElementPtr root = xmlDocument.createRoot("ResourceManualFont");
 
-        const std::string baseName = Misc::StringUtils::lowerCase(std::filesystem::path(mVFS->getAbsoluteFileName(fileName)).stem().string());
+        std::string baseName(Misc::stemFile(fileName));
         root->addAttribute("name", getInternalFontName(baseName));
 
         MyGUI::xml::ElementPtr defaultHeight = root->createChild("Property");
diff --git a/components/misc/pathhelpers.hpp b/components/misc/pathhelpers.hpp
index 88913a1f7b..ee6ba8e0d5 100644
--- a/components/misc/pathhelpers.hpp
+++ b/components/misc/pathhelpers.hpp
@@ -14,6 +14,28 @@ namespace Misc
         }
         return {};
     }
+
+    inline std::string_view getFileName(std::string_view path)
+    {
+        if (auto namePos = path.find_last_of("/\\"); namePos != std::string::npos)
+        {
+            path.remove_prefix(namePos + 1);
+        }
+
+        return path;
+    }
+
+    inline std::string_view stemFile(std::string_view path)
+    {
+        path = getFileName(path);
+
+        if (auto extPos = path.find_last_of("."); extPos != std::string::npos)
+        {
+            path.remove_suffix(path.size() - extPos);
+        }
+
+        return path;
+    }
 }
 
 #endif
diff --git a/components/myguiplatform/myguidatamanager.cpp b/components/myguiplatform/myguidatamanager.cpp
index 1eefa6b81d..87e20dbe85 100644
--- a/components/myguiplatform/myguidatamanager.cpp
+++ b/components/myguiplatform/myguidatamanager.cpp
@@ -22,10 +22,9 @@ MyGUI::IDataStream *DataManager::getData(const std::string &name) const
 {
     // Note: MyGUI is supposed to read/free input steam itself,
     // so copy data from VFS stream to the string stream and pass it to MyGUI.
-    Files::IStreamPtr streamPtr = mVfs->get(mResourcePath + "\\" + name);
+    Files::IStreamPtr streamPtr = mVfs->get(mResourcePath + "/" + name);
     std::istream* fileStream = streamPtr.get();
-    std::unique_ptr<std::stringstream> dataStream;
-    dataStream.reset(new std::stringstream);
+    auto dataStream = std::make_unique<std::stringstream>();
     *dataStream << fileStream->rdbuf();
     return new MyGUI::DataStream(dataStream.release());
 }
@@ -37,7 +36,7 @@ void DataManager::freeData(MyGUI::IDataStream *data)
 
 bool DataManager::isDataExist(const std::string &name) const
 {
-    return mVfs->exists(mResourcePath + "\\" + name);
+    return mVfs->exists(mResourcePath + "/" + name);
 }
 
 void DataManager::setVfs(const VFS::Manager* vfs)
@@ -61,7 +60,7 @@ const std::string &DataManager::getDataPath(const std::string &name) const
     if (!isDataExist(name))
         return result;
 
-    result = mResourcePath + "\\" + name;
+    result = mResourcePath + "/" + name;
     return result;
 }
 
diff --git a/components/resource/stats.cpp b/components/resource/stats.cpp
index d578259033..84588d4ab9 100644
--- a/components/resource/stats.cpp
+++ b/components/resource/stats.cpp
@@ -30,7 +30,7 @@ static bool collectStatFrameRate = false;
 static bool collectStatUpdate = false;
 static bool collectStatEngine = false;
 
-inline static std::string sFontName = "Fonts\\DejaVuLGCSansMono.ttf";
+static std::string sFontName = "Fonts/DejaVuLGCSansMono.ttf";
 
 static void setupStatCollection()
 {
diff --git a/files/CMakeLists.txt b/files/CMakeLists.txt
index b7b4b4cd23..587c3fa1d3 100644
--- a/files/CMakeLists.txt
+++ b/files/CMakeLists.txt
@@ -1,3 +1,5 @@
 add_subdirectory(shaders)
 add_subdirectory(data)
 add_subdirectory(lua_api)
+
+copy_resource_file("launcher/images/openmw.png" "${OPENMW_RESOURCES_ROOT}" "resources/openmw.png")
diff --git a/files/data/CMakeLists.txt b/files/data/CMakeLists.txt
index 63df2f53b5..1130524e45 100644
--- a/files/data/CMakeLists.txt
+++ b/files/data/CMakeLists.txt
@@ -162,5 +162,3 @@ set(BUILTIN_DATA_FILES
 foreach (f ${BUILTIN_DATA_FILES})
     copy_resource_file("${CMAKE_CURRENT_SOURCE_DIR}/${f}" "${OPENMW_RESOURCES_ROOT}" "resources/vfs/${f}")
 endforeach (f)
-
-copy_resource_file("../launcher/images/openmw.png" "${OPENMW_RESOURCES_ROOT}" "resources/openmw.png")

From 59c4ea014d1c8ce7c69ffffdf7e3466d30767e02 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sun, 17 Jul 2022 18:16:18 +0400
Subject: [PATCH 2835/2859] Rework StatsHandler to support VFS

---
 components/resource/stats.cpp | 21 ++++++++++++---------
 components/resource/stats.hpp |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/components/resource/stats.cpp b/components/resource/stats.cpp
index 84588d4ab9..ba39b638b5 100644
--- a/components/resource/stats.cpp
+++ b/components/resource/stats.cpp
@@ -6,6 +6,7 @@
 
 #include <osg/PolygonMode>
 
+#include <osgText/Font>
 #include <osgText/Text>
 
 #include <osgDB/Registry>
@@ -90,8 +91,8 @@ StatsHandler::StatsHandler(bool offlineCollect, VFS::Manager* vfs):
     _offlineCollect(offlineCollect),
     _statsWidth(1280.0f),
     _statsHeight(1024.0f),
-    _font(""),
-    _characterSize(18.0f)
+    _characterSize(18.0f),
+    _VFS(vfs)
 {
     _camera = new osg::Camera;
     _camera->getOrCreateStateSet()->setGlobalDefaults();
@@ -99,11 +100,6 @@ StatsHandler::StatsHandler(bool offlineCollect, VFS::Manager* vfs):
     _camera->setProjectionResizePolicy(osg::Camera::FIXED);
 
     _resourceStatsChildNum = 0;
-
-    if (osgDB::Registry::instance()->getReaderWriterForExtension("ttf") && vfs->exists(sFontName))
-    {
-        _font = vfs->getAbsoluteFileName(sFontName);
-    }
 }
 
 Profiler::Profiler(bool offlineCollect, VFS::Manager* vfs):
@@ -431,7 +427,6 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase *viewer)
         osg::ref_ptr<osgText::Text> staticText = new osgText::Text;
         group->addChild( staticText.get() );
         staticText->setColor(staticTextColor);
-        staticText->setFont(_font);
         staticText->setCharacterSize(_characterSize);
         staticText->setPosition(pos);
 
@@ -457,11 +452,19 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase *viewer)
         group->addChild( statsText.get() );
 
         statsText->setColor(dynamicTextColor);
-        statsText->setFont(_font);
         statsText->setCharacterSize(_characterSize);
         statsText->setPosition(pos);
         statsText->setText("");
         statsText->setDrawCallback(new ResourceStatsTextDrawCallback(viewer->getViewerStats(), statNames));
+
+        if (osgDB::Registry::instance()->getReaderWriterForExtension("ttf") && _VFS->exists(sFontName))
+        {
+            Files::IStreamPtr streamPtr = _VFS->get(sFontName);
+            osg::ref_ptr<osgText::Font> font = osgText::readRefFontStream(*streamPtr.get());
+
+            staticText->setFont(font);
+            statsText->setFont(font);
+        }
     }
 }
 
diff --git a/components/resource/stats.hpp b/components/resource/stats.hpp
index b61280ceb1..bb6cf09eda 100644
--- a/components/resource/stats.hpp
+++ b/components/resource/stats.hpp
@@ -61,11 +61,11 @@ namespace Resource
         float                               _statsWidth;
         float                               _statsHeight;
 
-        std::string                         _font;
         float                               _characterSize;
 
         int _resourceStatsChildNum;
 
+        VFS::Manager* _VFS;
     };
 
     void CollectStatistics(osgViewer::ViewerBase* viewer);

From d83382d2367eb3f7e5569f003f37ae2520d12383 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sun, 17 Jul 2022 20:53:38 +0400
Subject: [PATCH 2836/2859] Rework Profiler to work with VFS

---
 components/resource/stats.cpp | 64 +++++++++++++++++++++++++++--------
 components/resource/stats.hpp | 11 +++++-
 2 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/components/resource/stats.cpp b/components/resource/stats.cpp
index ba39b638b5..690e41bbaf 100644
--- a/components/resource/stats.cpp
+++ b/components/resource/stats.cpp
@@ -84,6 +84,26 @@ static void setupStatCollection()
     }
 }
 
+class SetFontVisitor : public osg::NodeVisitor
+{
+public:
+    SetFontVisitor(osgText::Font* font)
+        : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+        , mFont(font)
+        {}
+
+    void apply(osg::Drawable& node) override
+    {
+        if (osgText::Text* text = dynamic_cast<osgText::Text*>(&node))
+        {
+            text->setFont(mFont);
+        }
+    }
+
+private:
+    osgText::Font* mFont;
+};
+
 StatsHandler::StatsHandler(bool offlineCollect, VFS::Manager* vfs):
     _key(osgGA::GUIEventAdapter::KEY_F4),
     _initialized(false),
@@ -91,8 +111,7 @@ StatsHandler::StatsHandler(bool offlineCollect, VFS::Manager* vfs):
     _offlineCollect(offlineCollect),
     _statsWidth(1280.0f),
     _statsHeight(1024.0f),
-    _characterSize(18.0f),
-    _VFS(vfs)
+    _characterSize(18.0f)
 {
     _camera = new osg::Camera;
     _camera->getOrCreateStateSet()->setGlobalDefaults();
@@ -100,29 +119,49 @@ StatsHandler::StatsHandler(bool offlineCollect, VFS::Manager* vfs):
     _camera->setProjectionResizePolicy(osg::Camera::FIXED);
 
     _resourceStatsChildNum = 0;
+
+    if (osgDB::Registry::instance()->getReaderWriterForExtension("ttf") && vfs->exists(sFontName))
+    {
+        Files::IStreamPtr streamPtr = vfs->get(sFontName);
+        _textFont = osgText::readRefFontStream(*streamPtr.get());
+    }
 }
 
 Profiler::Profiler(bool offlineCollect, VFS::Manager* vfs):
-    _offlineCollect(offlineCollect)
+    _offlineCollect(offlineCollect),
+    _initFonts(false)
 {
+    _characterSize = 18;
+    _font.clear();
+
     if (osgDB::Registry::instance()->getReaderWriterForExtension("ttf") && vfs->exists(sFontName))
     {
-        _font = vfs->getAbsoluteFileName(sFontName);
+        Files::IStreamPtr streamPtr = vfs->get(sFontName);
+        _textFont = osgText::readRefFontStream(*streamPtr.get());
     }
-    else
-        _font.clear();
-
-    _characterSize = 18;
 
     setKeyEventTogglesOnScreenStats(osgGA::GUIEventAdapter::KEY_F3);
     setupStatCollection();
 }
 
+void Profiler::setUpFonts()
+{
+    if (_textFont != nullptr)
+    {
+        SetFontVisitor visitor(_textFont);
+        _switch->accept(visitor);
+    }
+
+    _initFonts = true;
+}
+
 bool Profiler::handle(const osgGA::GUIEventAdapter &ea, osgGA::GUIActionAdapter &aa)
 {
     osgViewer::ViewerBase* viewer = nullptr;
 
     bool handled = StatsHandler::handle(ea, aa);
+    if (_initialized && !_initFonts)
+        setUpFonts();
 
     auto* view = dynamic_cast<osgViewer::View*>(&aa);
     if (view)
@@ -457,13 +496,10 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase *viewer)
         statsText->setText("");
         statsText->setDrawCallback(new ResourceStatsTextDrawCallback(viewer->getViewerStats(), statNames));
 
-        if (osgDB::Registry::instance()->getReaderWriterForExtension("ttf") && _VFS->exists(sFontName))
+        if (_textFont)
         {
-            Files::IStreamPtr streamPtr = _VFS->get(sFontName);
-            osg::ref_ptr<osgText::Font> font = osgText::readRefFontStream(*streamPtr.get());
-
-            staticText->setFont(font);
-            statsText->setFont(font);
+            staticText->setFont(_textFont);
+            statsText->setFont(_textFont);
         }
     }
 }
diff --git a/components/resource/stats.hpp b/components/resource/stats.hpp
index bb6cf09eda..e51474c6cb 100644
--- a/components/resource/stats.hpp
+++ b/components/resource/stats.hpp
@@ -13,6 +13,11 @@ namespace osg
     class Switch;
 }
 
+namespace osgText
+{
+    class Font;
+}
+
 namespace VFS
 {
     class Manager;
@@ -27,7 +32,11 @@ namespace Resource
         bool handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa) override;
 
     private:
+        void setUpFonts();
+
         bool _offlineCollect;
+        bool _initFonts;
+        osg::ref_ptr<osgText::Font> _textFont;
     };
 
     class StatsHandler : public osgGA::GUIEventHandler
@@ -65,7 +74,7 @@ namespace Resource
 
         int _resourceStatsChildNum;
 
-        VFS::Manager* _VFS;
+        osg::ref_ptr<osgText::Font> _textFont;
     };
 
     void CollectStatistics(osgViewer::ViewerBase* viewer);

From facdc8fc0d49efdf774f45caa080f466df21df0f Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sun, 17 Jul 2022 22:13:27 +0400
Subject: [PATCH 2837/2859] Use string_view

---
 components/resource/stats.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/resource/stats.cpp b/components/resource/stats.cpp
index 690e41bbaf..863429d600 100644
--- a/components/resource/stats.cpp
+++ b/components/resource/stats.cpp
@@ -31,7 +31,7 @@ static bool collectStatFrameRate = false;
 static bool collectStatUpdate = false;
 static bool collectStatEngine = false;
 
-static std::string sFontName = "Fonts/DejaVuLGCSansMono.ttf";
+constexpr std::string_view sFontName = "Fonts/DejaVuLGCSansMono.ttf";
 
 static void setupStatCollection()
 {

From dc0d6fe31d48e5d51c13ded97260a9f9c447ac2a Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sun, 17 Jul 2022 23:59:35 +0400
Subject: [PATCH 2838/2859] Avoid code duplication

---
 components/resource/stats.cpp | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/components/resource/stats.cpp b/components/resource/stats.cpp
index 863429d600..a204bf61f8 100644
--- a/components/resource/stats.cpp
+++ b/components/resource/stats.cpp
@@ -104,6 +104,17 @@ private:
     osgText::Font* mFont;
 };
 
+osg::ref_ptr<osgText::Font> getMonoFont(VFS::Manager* vfs)
+{
+    if (osgDB::Registry::instance()->getReaderWriterForExtension("ttf") && vfs->exists(sFontName))
+    {
+        Files::IStreamPtr streamPtr = vfs->get(sFontName);
+        return osgText::readRefFontStream(*streamPtr.get());
+    }
+
+    return nullptr;
+}
+
 StatsHandler::StatsHandler(bool offlineCollect, VFS::Manager* vfs):
     _key(osgGA::GUIEventAdapter::KEY_F4),
     _initialized(false),
@@ -120,11 +131,7 @@ StatsHandler::StatsHandler(bool offlineCollect, VFS::Manager* vfs):
 
     _resourceStatsChildNum = 0;
 
-    if (osgDB::Registry::instance()->getReaderWriterForExtension("ttf") && vfs->exists(sFontName))
-    {
-        Files::IStreamPtr streamPtr = vfs->get(sFontName);
-        _textFont = osgText::readRefFontStream(*streamPtr.get());
-    }
+    _textFont = getMonoFont(vfs);
 }
 
 Profiler::Profiler(bool offlineCollect, VFS::Manager* vfs):
@@ -134,11 +141,7 @@ Profiler::Profiler(bool offlineCollect, VFS::Manager* vfs):
     _characterSize = 18;
     _font.clear();
 
-    if (osgDB::Registry::instance()->getReaderWriterForExtension("ttf") && vfs->exists(sFontName))
-    {
-        Files::IStreamPtr streamPtr = vfs->get(sFontName);
-        _textFont = osgText::readRefFontStream(*streamPtr.get());
-    }
+    _textFont = getMonoFont(vfs);
 
     setKeyEventTogglesOnScreenStats(osgGA::GUIEventAdapter::KEY_F3);
     setupStatCollection();

From 1f864e31277bd4aecc000ad11388518efcc29478 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 18 Jul 2022 00:04:43 +0400
Subject: [PATCH 2839/2859] Do not override monospace font

---
 components/fontloader/fontloader.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index 200309e091..00c029216f 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -628,8 +628,8 @@ namespace Gui
 
         if (lowerName == Misc::StringUtils::lowerCase(Fallback::Map::getString("Fonts_Font_0")))
             return "DefaultFont";
-        if (lowerName == Misc::StringUtils::lowerCase(Fallback::Map::getString("Fonts_Font_1")))
-            return "MonoFont";
+        if (lowerName == "dejavusansmono")
+            return "MonoFont"; // We need to use a TrueType monospace font to display debug texts properly.
         if (lowerName == Misc::StringUtils::lowerCase(Fallback::Map::getString("Fonts_Font_2")))
             return "ScrollFont";
 
@@ -644,8 +644,6 @@ namespace Gui
             return "DefaultFont";
         if (lowerFace == "daedric")
             return "ScrollFont";
-        if (lowerFace == "century gothic")
-            return "MonoFont";
 
         return face;
     }

From 5bc5c1bb0c8100422251e7596c58388c61a3f28b Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 18 Jul 2022 09:57:20 +0400
Subject: [PATCH 2840/2859] Use our fonts as a fallback

---
 apps/openmw/mwgui/windowmanagerimp.cpp | 9 ++-------
 apps/openmw/mwgui/windowmanagerimp.hpp | 1 -
 components/fontloader/fontloader.cpp   | 8 +++++++-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 623c46fedc..5c780d764e 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -234,7 +234,7 @@ namespace MWGui
         MyGUI::FactoryManager::getInstance().registerFactory<ResourceImageSetPointerFix>("Resource", "ResourceImageSetPointer");
         MyGUI::FactoryManager::getInstance().registerFactory<AutoSizedResourceSkin>("Resource", "AutoSizedResourceSkin");
         MyGUI::ResourceManager::getInstance().load("core.xml");
-        WindowManager::loadUserFonts();
+        mFontLoader->loadTrueTypeFonts();
 
         bool keyboardNav = Settings::Manager::getBool("keyboard navigation", "GUI");
         mKeyboardNavigation = std::make_unique<KeyboardNavigation>();
@@ -290,11 +290,6 @@ namespace MWGui
         mStatsWatcher = std::make_unique<StatsWatcher>();
     }
 
-    void WindowManager::loadUserFonts()
-    {
-        mFontLoader->loadTrueTypeFonts();
-    }
-
     void WindowManager::initUI()
     {
         // Get size info from the Gui object
@@ -1179,7 +1174,7 @@ namespace MWGui
             window->onResChange(x, y);
 
         // We should reload TrueType fonts to fit new resolution
-        loadUserFonts();
+        mFontLoader->loadTrueTypeFonts();
 
         // TODO: check if any windows are now off-screen and move them back if so
     }
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index a48847de3f..090a2b52f9 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -143,7 +143,6 @@ namespace MWGui
     void setStore (const MWWorld::ESMStore& store);
 
     void initUI();
-    void loadUserFonts();
 
     Loading::Listener* getLoadingScreen() override;
 
diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index 00c029216f..b906554cc5 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -628,9 +628,15 @@ namespace Gui
 
         if (lowerName == Misc::StringUtils::lowerCase(Fallback::Map::getString("Fonts_Font_0")))
             return "DefaultFont";
+        if (lowerName == Misc::StringUtils::lowerCase(Fallback::Map::getString("Fonts_Font_2")))
+            return "ScrollFont";
         if (lowerName == "dejavusansmono")
             return "MonoFont"; // We need to use a TrueType monospace font to display debug texts properly.
-        if (lowerName == Misc::StringUtils::lowerCase(Fallback::Map::getString("Fonts_Font_2")))
+
+        // Use our TrueType fonts as a fallback.
+        if (!MyGUI::ResourceManager::getInstance().isExist("DefaultFont") && name == "pelagiad")
+            return "DefaultFont";
+        if (!MyGUI::ResourceManager::getInstance().isExist("ScrollFont") && name == "ayembedt")
             return "ScrollFont";
 
         return name;

From b60d14d43438b3a270921a82fa8508d6f7046fee Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 18 Jul 2022 10:38:55 +0400
Subject: [PATCH 2841/2859] Updated documentation

---
 docs/source/reference/modding/font.rst | 48 +++++++++++++++-----------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/docs/source/reference/modding/font.rst b/docs/source/reference/modding/font.rst
index 3778ac5ed2..d43f37340c 100644
--- a/docs/source/reference/modding/font.rst
+++ b/docs/source/reference/modding/font.rst
@@ -1,30 +1,44 @@
 Fonts
 #####
 
+Default UI font and font used in magic scrolls are defined in ``openmw.cfg``:
+
+			fallback=Fonts_Font_0,pelagiad
+			fallback=Fonts_Font_2,ayembedt
+
+By default, built-in TrueType fonts are used. Font used by console and another debug windows is not configurable (so ``Fonts_Font_1`` is unused).
+
 Morrowind .fnt fonts
 --------------------
 
 Morrowind uses a custom ``.fnt`` file format. It is not compatible with the Windows Font File ``.fnt`` format.
-To our knowledge, the format is undocumented.
+To our knowledge, the format is undocumented. OpenMW can load this format and convert it on the fly into something usable
+(see font loader `source code <https://gitlab.com/OpenMW/openmw/blob/master/components/fontloader/fontloader.cpp>`_).
+
+They can be used instead of TrueType fonts if needed by specifying their ``.fnt`` files names in the ``openmw.cfg``. For example:
 
-OpenMW can load this format and convert it on the fly into something usable 
-(see font loader `source code <https://github.com/OpenMW/openmw/blob/master/components/fontloader/fontloader.cpp#L210>`_). 
-You can use --export-fonts command line option to write the converted font
-(a PNG image and an XML file describing the position of each glyph in the image) to the current directory.
+			fallback=Fonts_Font_0,magic_cards_regular
+			fallback=Fonts_Font_2,daedric_font
+
+In this example OpenMW will search for ``magic_cards_regular.fnt`` and ``daedric_font.fnt`` in the ``Fonts`` folder in data directories.
+If they are not found, built-in TrueType fonts will be used as a fallback.
+Note that an import wizard copies values from ``Morrowind.ini``, so bitmap fonts will be used after import.
+If such behaviour is undesirable, ``Fonts_Font*`` entries should be removed from ``openmw.cfg``.
 
 TrueType fonts
 --------------
 
-Unlike vanilla Morrowind, OpenMW directly supports TrueType (``.ttf``) fonts.
-
-This is the recommended way to install replacement fonts.
+Unlike vanilla Morrowind, OpenMW directly supports TrueType (``.ttf``) fonts. This is the recommended fonts format.
+OpenMW has build-in TrueType fonts: Pelagiad, OMWAyembedt and DejaVuLGCSansMono, which are used by default.
+TrueType fonts are configured via ``openmw.cfg`` too:
 
-	1.	Download `TrueType fonts for OpenMW <https://www.nexusmods.com/morrowind/mods/46854>`_
-	2.	Place the ``Fonts`` folder from archive to the configuration folder. Use :doc:`paths` article to find the folder.
+			fallback=Fonts_Font_0,pelagiad
+			fallback=Fonts_Font_2,ayembedt
 
-Now Fonts folder should include ``openmw_font.xml`` file and three ``.ttf`` files.
+In this example, OpenMW will scan ``Fonts`` folder in data directories for ``.omwfont`` files.
+These files are XML files wich schema used by MyGUI. OpenMW uses files which ``name`` tag matches ``openmw.cfg`` entries:
 
-If desired, you can now delete the ``Data Files/Fonts`` directory.
+			<Resource type="ResourceTrueTypeFont" name="pelagiad">
 
 It is also possible to adjust the font size and resolution via ``settings.cfg`` file::
 
@@ -34,14 +48,6 @@ It is also possible to adjust the font size and resolution via ``settings.cfg``
 
 The ``font size`` setting accepts clamped values in range from 12 to 20 while ``ttf resolution`` setting accepts values from 48 to 960.
 
-Any Resolution or Size properties in the XML file have no effect because the engine settings override them.
+Any Resolution or Size properties in the ``.omwfont`` file have no effect because the engine settings override them.
 
 The engine automatically takes UI scaling factor into account, so don't account for it when tweaking the settings.
-
-Bitmap fonts
-------------
-
-Morrowind ``.fnt`` files are essentially a bitmap font, but using them is discouraged because they don't have Unicode support. 
-MyGUI has its own format for bitmap fonts. An example can be seen by using the --export-fonts command line option (see above), 
-which converts Morrowind ``.fnt`` to a MyGUI bitmap font. 
-This is the recommended format to use if you wish to edit Morrowind's bitmap font or create a new bitmap font.

From 845a812ebf34d97756f74f15656ac767b04b0c8a Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 18 Jul 2022 10:40:03 +0400
Subject: [PATCH 2842/2859] Drop fonts export - users are supposed to use
 TrueType fonts or mods with legacy format

---
 apps/openmw/engine.cpp                 |  8 +-------
 apps/openmw/engine.hpp                 |  3 ---
 apps/openmw/main.cpp                   |  1 -
 apps/openmw/mwgui/windowmanagerimp.cpp |  4 ++--
 apps/openmw/mwgui/windowmanagerimp.hpp |  2 +-
 components/fontloader/fontloader.cpp   | 24 +++---------------------
 components/fontloader/fontloader.hpp   |  6 ++----
 7 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 467d61bf12..c3ace78ac8 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -453,7 +453,6 @@ OMW::Engine::Engine(Files::ConfigurationManager& configurationManager)
   , mScriptConsoleMode (false)
   , mActivationDistanceOverride(-1)
   , mGrab(true)
-  , mExportFonts(false)
   , mRandomSeed(0)
   , mFSStrict (false)
   , mScriptBlacklistUse (true)
@@ -823,7 +822,7 @@ void OMW::Engine::prepareEngine()
 
     mWindowManager = std::make_unique<MWGui::WindowManager>(mWindow, mViewer, guiRoot, mResourceSystem.get(), mWorkQueue.get(),
                 mCfgMgr.getLogPath().string() + std::string("/"),
-                mScriptConsoleMode, mTranslationDataStorage, mEncoding, mExportFonts,
+                mScriptConsoleMode, mTranslationDataStorage, mEncoding,
                 Version::getOpenmwVersionDescription(mResDir.string()), shadersSupported);
     mEnvironment.setWindowManager(*mWindowManager);
 
@@ -1186,11 +1185,6 @@ void OMW::Engine::setScriptBlacklistUse (bool use)
     mScriptBlacklistUse = use;
 }
 
-void OMW::Engine::enableFontExport(bool exportFonts)
-{
-    mExportFonts = exportFonts;
-}
-
 void OMW::Engine::setSaveGameFile(const std::string &savegame)
 {
     mSaveGameFile = savegame;
diff --git a/apps/openmw/engine.hpp b/apps/openmw/engine.hpp
index ba39132b04..329993a93e 100644
--- a/apps/openmw/engine.hpp
+++ b/apps/openmw/engine.hpp
@@ -160,7 +160,6 @@ namespace OMW
             // Grab mouse?
             bool mGrab;
 
-            bool mExportFonts;
             unsigned int mRandomSeed;
 
             Compiler::Extensions mExtensions;
@@ -254,8 +253,6 @@ namespace OMW
 
             void setScriptBlacklistUse (bool use);
 
-            void enableFontExport(bool exportFonts);
-
             /// Set the save game file to load after initialising the engine.
             void setSaveGameFile(const std::string& savegame);
 
diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index 3274451243..f13d1b39b5 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -156,7 +156,6 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     Fallback::Map::init(variables["fallback"].as<FallbackMap>().mMap);
     engine.setSoundUsage(!variables["no-sound"].as<bool>());
     engine.setActivationDistanceOverride (variables["activate-dist"].as<int>());
-    engine.enableFontExport(variables["export-fonts"].as<bool>());
     engine.setRandomSeed(variables["random-seed"].as<unsigned int>());
 
     return true;
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 5c780d764e..3915f3b9c4 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -129,7 +129,7 @@ namespace MWGui
     WindowManager::WindowManager(
             SDL_Window* window, osgViewer::Viewer* viewer, osg::Group* guiRoot, Resource::ResourceSystem* resourceSystem, SceneUtil::WorkQueue* workQueue,
             const std::string& logpath, bool consoleOnlyScripts, Translation::Storage& translationDataStorage,
-            ToUTF8::FromType encoding, bool exportFonts, const std::string& versionDescription, bool useShaders)
+            ToUTF8::FromType encoding, const std::string& versionDescription, bool useShaders)
       : mOldUpdateMask(0)
       , mOldCullMask(0)
       , mStore(nullptr)
@@ -206,7 +206,7 @@ namespace MWGui
 
         // Load fonts
         mFontLoader = std::make_unique<Gui::FontLoader>(encoding, resourceSystem->getVFS(), mScalingFactor);
-        mFontLoader->loadBitmapFonts(exportFonts);
+        mFontLoader->loadBitmapFonts();
 
         //Register own widgets with MyGUI
         MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Widgets::MWSkill>("Widget");
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index 090a2b52f9..6ff99665c2 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -136,7 +136,7 @@ namespace MWGui
 
     WindowManager(SDL_Window* window, osgViewer::Viewer* viewer, osg::Group* guiRoot, Resource::ResourceSystem* resourceSystem, SceneUtil::WorkQueue* workQueue,
                   const std::string& logpath, bool consoleOnlyScripts, Translation::Storage& translationDataStorage,
-                  ToUTF8::FromType encoding, bool exportFonts, const std::string& versionDescription, bool useShaders);
+                  ToUTF8::FromType encoding, const std::string& versionDescription, bool useShaders);
     virtual ~WindowManager();
 
     /// Set the ESMStore to use for retrieving of GUI-related strings.
diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index b906554cc5..ffa1593318 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -196,12 +196,12 @@ namespace Gui
         mFonts.clear();
     }
 
-    void FontLoader::loadBitmapFonts(bool exportToFile)
+    void FontLoader::loadBitmapFonts()
     {
         for (const auto& path : mVFS->getRecursiveDirectoryIterator("Fonts/"))
         {
             if (Misc::getFileExtension(path) == "fnt")
-                loadBitmapFont(path, exportToFile);
+                loadBitmapFont(path);
         }
     }
 
@@ -246,7 +246,7 @@ namespace Gui
         float ascent;
     } GlyphInfo;
 
-    void FontLoader::loadBitmapFont(const std::string &fileName, bool exportToFile)
+    void FontLoader::loadBitmapFont(const std::string &fileName)
     {
         Files::IStreamPtr file = mVFS->get(fileName);
 
@@ -307,17 +307,6 @@ namespace Gui
 
         std::string resourceName = name;
 
-        if (exportToFile)
-        {
-            osg::ref_ptr<osg::Image> image = new osg::Image;
-            image->allocateImage(width, height, 1, GL_RGBA, GL_UNSIGNED_BYTE);
-            assert (image->isDataContiguous());
-            memcpy(image->data(), &textureData[0], textureData.size());
-
-            Log(Debug::Info) << "Writing " << resourceName + ".png";
-            osgDB::writeImageFile(*image, resourceName + ".png");
-        }
-
         // Register the font with MyGUI
         MyGUI::ResourceManualFont* font = static_cast<MyGUI::ResourceManualFont*>(
                     MyGUI::FactoryManager::getInstance().createObject("Resource", "ResourceManualFont"));
@@ -494,13 +483,6 @@ namespace Gui
             cursorCode->addAttribute("size", "0 0");
         }
 
-        if (exportToFile)
-        {
-            Log(Debug::Info) << "Writing " << resourceName + ".xml";
-            xmlDocument.createDeclaration();
-            xmlDocument.save(resourceName + ".xml");
-        }
-
         font->deserialization(root, MyGUI::Version(3,2,0));
 
         MyGUI::ResourceManualFont* bookFont = static_cast<MyGUI::ResourceManualFont*>(
diff --git a/components/fontloader/fontloader.hpp b/components/fontloader/fontloader.hpp
index eb705fdd4a..1f1137614e 100644
--- a/components/fontloader/fontloader.hpp
+++ b/components/fontloader/fontloader.hpp
@@ -28,8 +28,7 @@ namespace Gui
         FontLoader (ToUTF8::FromType encoding, const VFS::Manager* vfs, float scalingFactor);
         ~FontLoader();
 
-        /// @param exportToFile export the converted fonts (Images and XML with glyph metrics) to files?
-        void loadBitmapFonts (bool exportToFile);
+        void loadBitmapFonts ();
         void loadTrueTypeFonts ();
 
         void loadFontFromXml(MyGUI::xml::ElementPtr _node, const std::string& _file, MyGUI::Version _version);
@@ -49,8 +48,7 @@ namespace Gui
 
         std::string getInternalFontName(const std::string& name);
 
-        /// @param exportToFile export the converted font (Image and XML with glyph metrics) to files?
-        void loadBitmapFont (const std::string& fileName, bool exportToFile);
+        void loadBitmapFont (const std::string& fileName);
 
         FontLoader(const FontLoader&);
         void operator=(const FontLoader&);

From dc97b1d1b4824300f00d7b63a3f089749553a38f Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 18 Jul 2022 10:59:52 +0400
Subject: [PATCH 2843/2859] Add changelog entries

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b121947f3..97198823ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -145,6 +145,8 @@
     Feature #4297: Implement APPLIED_ONCE flag for magic effects
     Feature #4414: Handle duration of EXTRA SPELL magic effect
     Feature #4595: Unique object identifier
+    Feature #4974: Overridable MyGUI layout
+    Feature #4975: Built-in TrueType fonts
     Feature #5198: Implement "Magic effect expired" event
     Feature #5454: Clear active spells from actor when he disappears from scene
     Feature #5489: MCP: Telekinesis fix for activators

From ce556ba0ccd2841836dbdacd4a02db758480c95a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <3397065-ZehMatt@users.noreply.gitlab.com>
Date: Mon, 18 Jul 2022 16:38:28 +0300
Subject: [PATCH 2844/2859] Remove obsolete LowLevelFile

---
 components/CMakeLists.txt                     |  2 +-
 components/files/constrainedfilestreambuf.cpp | 20 +++----
 components/files/constrainedfilestreambuf.hpp |  6 +--
 components/files/lowlevelfile.cpp             | 53 -------------------
 components/files/lowlevelfile.hpp             | 28 ----------
 5 files changed, 15 insertions(+), 94 deletions(-)
 delete mode 100644 components/files/lowlevelfile.cpp
 delete mode 100644 components/files/lowlevelfile.hpp

diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index e67ae36a32..8a04f91154 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -214,7 +214,7 @@ IF(NOT WIN32 AND NOT APPLE)
 ENDIF()
 add_component_dir (files
     linuxpath androidpath windowspath macospath fixedpath multidircollection collections configurationmanager
-    lowlevelfile constrainedfilestream memorystream hash configfileparser openfile constrainedfilestreambuf
+    constrainedfilestream memorystream hash configfileparser openfile constrainedfilestreambuf
     )
 
 add_component_dir (compiler
diff --git a/components/files/constrainedfilestreambuf.cpp b/components/files/constrainedfilestreambuf.cpp
index 1263523ebe..5939207193 100644
--- a/components/files/constrainedfilestreambuf.cpp
+++ b/components/files/constrainedfilestreambuf.cpp
@@ -5,14 +5,16 @@
 
 namespace Files
 {
+    namespace File = Platform::File;
+    
     ConstrainedFileStreamBuf::ConstrainedFileStreamBuf(const std::string& fname, std::size_t start, std::size_t length)
         : mOrigin(start)
     {
-        mFile.open(fname.c_str());
-        mSize  = length != std::numeric_limits<std::size_t>::max() ? length : mFile.size () - start;
+        mFile = File::open(fname.c_str());
+        mSize  = length != std::numeric_limits<std::size_t>::max() ? length : File::size(mFile) - start;
 
         if (start != 0)
-            mFile.seek(start);
+            File::seek(mFile, start);
 
         setg(nullptr, nullptr, nullptr);
     }
@@ -21,10 +23,10 @@ namespace Files
     {
         if (gptr() == egptr())
         {
-            const std::size_t toRead = std::min((mOrigin + mSize) - (mFile.tell()), sizeof(mBuffer));
+            const std::size_t toRead = std::min((mOrigin + mSize) - (File::tell(mFile)), sizeof(mBuffer));
             // Read in the next chunk of data, and set the read pointers on success
-            // Failure will throw exception in LowLevelFile
-            const std::size_t got = mFile.read(mBuffer, toRead);
+            // Failure will throw exception.
+            const std::size_t got = File::read(mFile, mBuffer, toRead);
             setg(&mBuffer[0], &mBuffer[0], &mBuffer[0] + got);
         }
         if (gptr() == egptr())
@@ -46,7 +48,7 @@ namespace Files
                 newPos = offset;
                 break;
             case std::ios_base::cur:
-                newPos = (mFile.tell() - mOrigin - (egptr() - gptr())) + offset;
+                newPos = (File::tell(mFile) - mOrigin - (egptr() - gptr())) + offset;
                 break;
             case std::ios_base::end:
                 newPos = mSize + offset;
@@ -58,7 +60,7 @@ namespace Files
         if (newPos > mSize)
             return traits_type::eof();
 
-        mFile.seek(mOrigin + newPos);
+        File::seek(mFile, mOrigin + newPos);
 
         // Clear read pointers so underflow() gets called on the next read attempt.
         setg(nullptr, nullptr, nullptr);
@@ -74,7 +76,7 @@ namespace Files
         if (static_cast<std::size_t>(pos) > mSize)
             return traits_type::eof();
 
-        mFile.seek(mOrigin + pos);
+        File::seek(mFile, mOrigin + pos);
 
         // Clear read pointers so underflow() gets called on the next read attempt.
         setg(nullptr, nullptr, nullptr);
diff --git a/components/files/constrainedfilestreambuf.hpp b/components/files/constrainedfilestreambuf.hpp
index 46be98c905..0808ba6a9c 100644
--- a/components/files/constrainedfilestreambuf.hpp
+++ b/components/files/constrainedfilestreambuf.hpp
@@ -1,7 +1,7 @@
 #ifndef OPENMW_CONSTRAINEDFILESTREAMBUF_H
 #define OPENMW_CONSTRAINEDFILESTREAMBUF_H
 
-#include "lowlevelfile.hpp"
+#include <components/platform/file.hpp>
 
 #include <streambuf>
 
@@ -22,8 +22,8 @@ namespace Files
     private:
         std::size_t mOrigin;
         std::size_t mSize;
-        LowLevelFile mFile;
-        char mBuffer[8192]{0};
+        Platform::File::Handle mFile{ Platform::File::Handle::Invalid };
+        char mBuffer[8192]{ 0 };
     };
 }
 
diff --git a/components/files/lowlevelfile.cpp b/components/files/lowlevelfile.cpp
deleted file mode 100644
index de17d67cc2..0000000000
--- a/components/files/lowlevelfile.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-#include "lowlevelfile.hpp"
-
-#include <stdexcept>
-#include <sstream>
-#include <cassert>
-
-namespace File = Platform::File;
-
-LowLevelFile::~LowLevelFile()
-{
-    if (mHandle != File::Handle::Invalid)
-        File::close(mHandle);
-}
-
-void LowLevelFile::open(char const* filename)
-{
-    mHandle = File::open(filename);
-}
-
-void LowLevelFile::close()
-{
-    if (mHandle != File::Handle::Invalid)
-        File::close(mHandle);
-    mHandle = File::Handle::Invalid;
-}
-
-size_t LowLevelFile::size()
-{
-    assert(mHandle != File::Handle::Invalid);
-
-    return File::size(mHandle);
-}
-
-void LowLevelFile::seek(size_t position)
-{
-    assert(mHandle != File::Handle::Invalid);
-
-    return File::seek(mHandle, position);
-}
-
-size_t LowLevelFile::tell()
-{
-    assert(mHandle != File::Handle::Invalid);
-
-    return File::tell(mHandle);
-}
-
-size_t LowLevelFile::read(void* data, size_t size)
-{
-    assert(mHandle != File::Handle::Invalid);
-
-    return File::read(mHandle, data, size);
-}
diff --git a/components/files/lowlevelfile.hpp b/components/files/lowlevelfile.hpp
deleted file mode 100644
index 1bd182d0e4..0000000000
--- a/components/files/lowlevelfile.hpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef COMPONENTS_FILES_LOWLEVELFILE_HPP
-#define COMPONENTS_FILES_LOWLEVELFILE_HPP
-
-#include <cstdlib>
-#include <memory>
-
-#include <components/platform/file.hpp>
-
-class LowLevelFile
-{
-public:
-    ~LowLevelFile();
-
-    void open(char const* filename);
-    void close();
-
-    size_t size();
-
-    void seek(size_t Position);
-    size_t tell();
-
-    size_t read(void* data, size_t size);
-
-private:
-    Platform::File::Handle mHandle{ Platform::File::Handle::Invalid };
-};
-
-#endif

From ddf43ec42f00069ac3d5d190a63df00b2517446d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <3397065-ZehMatt@users.noreply.gitlab.com>
Date: Mon, 18 Jul 2022 19:11:37 +0300
Subject: [PATCH 2845/2859] Move structs into separate headers, cleanup
 includes, cleanup forwarders

---
 apps/openmw/mwworld/cellpreloader.cpp |  1 +
 components/CMakeLists.txt             |  3 +-
 components/terrain/heightcull.hpp     | 62 +++++++++++++++++++++++++++
 components/terrain/quadtreeworld.cpp  |  1 +
 components/terrain/quadtreeworld.hpp  |  3 +-
 components/terrain/terraingrid.cpp    |  3 ++
 components/terrain/terraingrid.hpp    | 12 ++++++
 components/terrain/view.hpp           | 25 +++++++++++
 components/terrain/viewdata.hpp       |  2 +-
 components/terrain/world.cpp          |  1 +
 components/terrain/world.hpp          | 62 ++-------------------------
 11 files changed, 113 insertions(+), 62 deletions(-)
 create mode 100644 components/terrain/heightcull.hpp
 create mode 100644 components/terrain/view.hpp

diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index cdf1986383..ff7869a393 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -12,6 +12,7 @@
 #include <components/misc/resourcehelpers.hpp>
 #include <components/misc/stringops.hpp>
 #include <components/terrain/world.hpp>
+#include <components/terrain/view.hpp>
 #include <components/esm3/loadcell.hpp>
 #include <components/loadinglistener/reporter.hpp>
 
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 8a04f91154..8dcb1ce64f 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -234,7 +234,8 @@ add_component_dir (translation
     )
 
 add_component_dir (terrain
-    storage world buffercache defs terraingrid material terraindrawable texturemanager chunkmanager compositemaprenderer quadtreeworld quadtreenode viewdata cellborder
+    storage world buffercache defs terraingrid material terraindrawable texturemanager chunkmanager compositemaprenderer
+    quadtreeworld quadtreenode viewdata cellborder view heightcull
     )
 
 add_component_dir (loadinglistener
diff --git a/components/terrain/heightcull.hpp b/components/terrain/heightcull.hpp
new file mode 100644
index 0000000000..d7db5fbccb
--- /dev/null
+++ b/components/terrain/heightcull.hpp
@@ -0,0 +1,62 @@
+#ifndef COMPONENTS_TERRAIN_HEIGHTCULL_H
+#define COMPONENTS_TERRAIN_HEIGHTCULL_H
+
+#include <osg/ref_ptr>
+#include <osg/Referenced>
+
+#include <limits>
+
+#include <components/sceneutil/nodecallback.hpp>
+
+namespace osg
+{
+    class Node;
+    class NodeVisitor;
+}
+
+namespace Terrain
+{
+    class HeightCullCallback : public SceneUtil::NodeCallback<HeightCullCallback>
+    {
+    public:
+        void setLowZ(float z)
+        {
+            mLowZ = z;
+        }
+        float getLowZ() const
+        {
+            return mLowZ;
+        }
+
+        void setHighZ(float highZ)
+        {
+            mHighZ = highZ;
+        }
+        float getHighZ() const
+        {
+            return mHighZ;
+        }
+
+        void setCullMask(unsigned int mask)
+        {
+            mMask = mask;
+        }
+        unsigned int getCullMask() const
+        {
+            return mMask;
+        }
+
+        void operator()(osg::Node* node, osg::NodeVisitor* nv)
+        {
+            if (mLowZ <= mHighZ)
+                traverse(node, nv);
+        }
+    private:
+        float mLowZ{ -std::numeric_limits<float>::max() };
+        float mHighZ{ std::numeric_limits<float>::max() };
+        unsigned int mMask{ ~0u };
+    };
+
+}
+
+#endif
diff --git a/components/terrain/quadtreeworld.cpp b/components/terrain/quadtreeworld.cpp
index 1266e440a3..5f39c4fc28 100644
--- a/components/terrain/quadtreeworld.cpp
+++ b/components/terrain/quadtreeworld.cpp
@@ -18,6 +18,7 @@
 #include "chunkmanager.hpp"
 #include "compositemaprenderer.hpp"
 #include "terraindrawable.hpp"
+#include "heightcull.hpp"
 
 namespace
 {
diff --git a/components/terrain/quadtreeworld.hpp b/components/terrain/quadtreeworld.hpp
index 3748f7df98..36b2042326 100644
--- a/components/terrain/quadtreeworld.hpp
+++ b/components/terrain/quadtreeworld.hpp
@@ -1,7 +1,6 @@
 #ifndef COMPONENTS_TERRAIN_QUADTREEWORLD_H
 #define COMPONENTS_TERRAIN_QUADTREEWORLD_H
 
-#include "world.hpp"
 #include "terraingrid.hpp"
 
 #include <mutex>
@@ -10,6 +9,8 @@
 namespace osg
 {
     class NodeVisitor;
+    class Group;
+    class Stats;
 }
 
 namespace Terrain
diff --git a/components/terrain/terraingrid.cpp b/components/terrain/terraingrid.cpp
index bbd0508ef1..6467b549f1 100644
--- a/components/terrain/terraingrid.cpp
+++ b/components/terrain/terraingrid.cpp
@@ -8,7 +8,10 @@
 #include <components/sceneutil/positionattitudetransform.hpp>
 #include "chunkmanager.hpp"
 #include "compositemaprenderer.hpp"
+#include "view.hpp"
 #include "storage.hpp"
+#include "heightcull.hpp"
+
 namespace Terrain
 {
 
diff --git a/components/terrain/terraingrid.hpp b/components/terrain/terraingrid.hpp
index 3f44b18b08..f09beb0cdc 100644
--- a/components/terrain/terraingrid.hpp
+++ b/components/terrain/terraingrid.hpp
@@ -7,8 +7,20 @@
 
 #include "world.hpp"
 
+namespace osg
+{
+    class Group;
+    class Stats;
+}
+
+namespace Resource
+{
+    class ResourceSystem;
+}
+
 namespace Terrain
 {
+    class Storage;
 
     /// @brief Simple terrain implementation that loads cells in a grid, with no LOD. Only requested cells are loaded.
     class TerrainGrid : public Terrain::World
diff --git a/components/terrain/view.hpp b/components/terrain/view.hpp
new file mode 100644
index 0000000000..1ce0876603
--- /dev/null
+++ b/components/terrain/view.hpp
@@ -0,0 +1,25 @@
+#ifndef COMPONENTS_TERRAIN_VIEW_H
+#define COMPONENTS_TERRAIN_VIEW_H
+
+#include <osg/ref_ptr>
+#include <osg/Referenced>
+#include <osg/Vec3f>
+
+namespace Terrain
+{
+    /**
+     * @brief A View is a collection of rendering objects that are visible from a given camera/intersection.
+     * The base View class is part of the interface for usage in conjunction with preload feature.
+     */
+    class View : public osg::Referenced
+    {
+    public:
+        virtual ~View() {}
+
+        /// Reset internal structure so that the next addition to the view will override the previous frame's contents.
+        virtual void reset() = 0;
+    };
+
+}
+
+#endif
diff --git a/components/terrain/viewdata.hpp b/components/terrain/viewdata.hpp
index d51da011a2..125ee7dfc0 100644
--- a/components/terrain/viewdata.hpp
+++ b/components/terrain/viewdata.hpp
@@ -6,7 +6,7 @@
 
 #include <osg/Node>
 
-#include "world.hpp"
+#include "view.hpp"
 
 namespace Terrain
 {
diff --git a/components/terrain/world.cpp b/components/terrain/world.cpp
index 186687b37d..5798784e83 100644
--- a/components/terrain/world.cpp
+++ b/components/terrain/world.cpp
@@ -10,6 +10,7 @@
 #include "texturemanager.hpp"
 #include "chunkmanager.hpp"
 #include "compositemaprenderer.hpp"
+#include "heightcull.hpp"
 
 namespace Terrain
 {
diff --git a/components/terrain/world.hpp b/components/terrain/world.hpp
index b9fa7c0160..85114c32d2 100644
--- a/components/terrain/world.hpp
+++ b/components/terrain/world.hpp
@@ -5,8 +5,6 @@
 #include <osg/Referenced>
 #include <osg/Vec3f>
 
-#include <atomic>
-#include <limits>
 #include <memory>
 #include <set>
 
@@ -19,8 +17,6 @@ namespace osg
 {
     class Group;
     class Stats;
-    class Node;
-    class Object;
 }
 
 namespace Resource
@@ -40,61 +36,9 @@ namespace Terrain
     class TextureManager;
     class ChunkManager;
     class CompositeMapRenderer;
-
-    class HeightCullCallback : public SceneUtil::NodeCallback<HeightCullCallback>
-    {
-    public:
-        void setLowZ(float z)
-        {
-            mLowZ = z;
-        }
-        float getLowZ() const
-        {
-            return mLowZ;
-        }
-
-        void setHighZ(float highZ)
-        {
-            mHighZ = highZ;
-        }
-        float getHighZ() const
-        {
-            return mHighZ;
-        }
-
-        void setCullMask(unsigned int mask)
-        {
-            mMask = mask;
-        }
-        unsigned int getCullMask() const
-        {
-            return mMask;
-        }
-
-        void operator()(osg::Node* node, osg::NodeVisitor* nv)
-        {
-            if (mLowZ <= mHighZ)
-                traverse(node, nv);
-        }
-    private:
-        float mLowZ{-std::numeric_limits<float>::max()};
-        float mHighZ{std::numeric_limits<float>::max()};
-        unsigned int mMask{~0u};
-    };
-
-    /**
-     * @brief A View is a collection of rendering objects that are visible from a given camera/intersection.
-     * The base View class is part of the interface for usage in conjunction with preload feature.
-     */
-    class View : public osg::Referenced
-    {
-    public:
-        virtual ~View() {}
-
-        /// Reset internal structure so that the next addition to the view will override the previous frame's contents.
-        virtual void reset() = 0;
-    };
-
+    class View;
+    class HeightCullCallback;
+    
     /**
      * @brief The basic interface for a terrain world. How the terrain chunks are paged and displayed
      *  is up to the implementation.

From 764d34362ed6a58576d1bb2dd23d9b0b0d10ce0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <3397065-ZehMatt@users.noreply.gitlab.com>
Date: Mon, 18 Jul 2022 19:36:41 +0300
Subject: [PATCH 2846/2859] Type forward VFS::Manager in luastate.hpp and
 l10n.hpp

---
 components/lua/l10n.cpp     | 1 +
 components/lua/l10n.hpp     | 5 +++++
 components/lua/luastate.cpp | 1 +
 components/lua/luastate.hpp | 7 +++++--
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/components/lua/l10n.cpp b/components/lua/l10n.cpp
index bd9a9be4c5..996b859157 100644
--- a/components/lua/l10n.cpp
+++ b/components/lua/l10n.cpp
@@ -3,6 +3,7 @@
 #include <unicode/errorcode.h>
 
 #include <components/debug/debuglog.hpp>
+#include <components/vfs/manager.hpp>
 
 namespace sol
 {
diff --git a/components/lua/l10n.hpp b/components/lua/l10n.hpp
index d1de193421..51c8ecad9c 100644
--- a/components/lua/l10n.hpp
+++ b/components/lua/l10n.hpp
@@ -5,6 +5,11 @@
 
 #include <components/l10n/messagebundles.hpp>
 
+namespace VFS
+{
+    class Manager;
+}
+
 namespace LuaUtil
 {
 
diff --git a/components/lua/luastate.cpp b/components/lua/luastate.cpp
index b5b0832b98..dbdfde5100 100644
--- a/components/lua/luastate.cpp
+++ b/components/lua/luastate.cpp
@@ -7,6 +7,7 @@
 #include <filesystem>
 
 #include <components/debug/debuglog.hpp>
+#include <components/vfs/manager.hpp>
 
 namespace LuaUtil
 {
diff --git a/components/lua/luastate.hpp b/components/lua/luastate.hpp
index bf947111dc..3bd27f2250 100644
--- a/components/lua/luastate.hpp
+++ b/components/lua/luastate.hpp
@@ -5,10 +5,13 @@
 
 #include <sol/sol.hpp>
 
-#include <components/vfs/manager.hpp>
-
 #include "configuration.hpp"
 
+namespace VFS
+{
+    class Manager;
+}
+
 namespace LuaUtil
 {
 

From c5d85c1854dfcd9e0afbc929af37e019dd16ee5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <3397065-ZehMatt@users.noreply.gitlab.com>
Date: Mon, 18 Jul 2022 19:40:26 +0300
Subject: [PATCH 2847/2859] Revert removal of <atomic>

---
 components/terrain/quadtreeworld.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/terrain/quadtreeworld.hpp b/components/terrain/quadtreeworld.hpp
index 36b2042326..d03ed613d4 100644
--- a/components/terrain/quadtreeworld.hpp
+++ b/components/terrain/quadtreeworld.hpp
@@ -5,6 +5,7 @@
 
 #include <mutex>
 #include <memory>
+#include <atomic>
 
 namespace osg
 {

From 2014ea40b91a4631160d8c8b1055fe7f231c96b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <3397065-ZehMatt@users.noreply.gitlab.com>
Date: Mon, 18 Jul 2022 21:13:41 +0300
Subject: [PATCH 2848/2859] Use ScopedHandle for File::Handle

---
 components/files/constrainedfilestreambuf.hpp |  2 +-
 components/platform/file.hpp                  | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/components/files/constrainedfilestreambuf.hpp b/components/files/constrainedfilestreambuf.hpp
index 0808ba6a9c..bb9d6ca89e 100644
--- a/components/files/constrainedfilestreambuf.hpp
+++ b/components/files/constrainedfilestreambuf.hpp
@@ -22,7 +22,7 @@ namespace Files
     private:
         std::size_t mOrigin;
         std::size_t mSize;
-        Platform::File::Handle mFile{ Platform::File::Handle::Invalid };
+        Platform::File::ScopedHandle mFile;
         char mBuffer[8192]{ 0 };
     };
 }
diff --git a/components/platform/file.hpp b/components/platform/file.hpp
index d0d5eb0399..3456cdc113 100644
--- a/components/platform/file.hpp
+++ b/components/platform/file.hpp
@@ -29,7 +29,17 @@ namespace Platform::File {
 
     size_t read(Handle handle, void* data, size_t size);
 
-
+    class ScopedHandle
+    {
+        Handle mHandle{ Handle::Invalid };
+        
+    public:
+        ScopedHandle() = default;
+        ScopedHandle(Handle handle) : mHandle(handle) {}
+        ~ScopedHandle() { close(mHandle); }
+
+        operator Handle() const { return mHandle; }
+    };
 }
 
 #endif // OPENMW_COMPONENTS_PLATFORM_FILE_HPP

From c197896765f46f622f3dd4e42daab4376c67420d Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 17 Jul 2022 14:24:27 +0200
Subject: [PATCH 2849/2859] Use unique_ptr for Wizard::InstallationPage members

---
 apps/wizard/installationpage.cpp | 33 +++++++++++++++-----------------
 apps/wizard/installationpage.hpp |  6 ++++--
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/apps/wizard/installationpage.cpp b/apps/wizard/installationpage.cpp
index 24e573f1b5..0df0dbb57a 100644
--- a/apps/wizard/installationpage.cpp
+++ b/apps/wizard/installationpage.cpp
@@ -17,38 +17,38 @@ Wizard::InstallationPage::InstallationPage(QWidget *parent, Config::GameSettings
 
     mFinished = false;
 
-    mThread = new QThread();
-    mUnshield = new UnshieldWorker(mGameSettings.value("morrowind-bsa-filesize").toLongLong());
-    mUnshield->moveToThread(mThread);
+    mThread = std::make_unique<QThread>();
+    mUnshield = std::make_unique<UnshieldWorker>(mGameSettings.value("morrowind-bsa-filesize").toLongLong());
+    mUnshield->moveToThread(mThread.get());
 
-    connect(mThread, SIGNAL(started()),
-            mUnshield, SLOT(extract()));
+    connect(mThread.get(), SIGNAL(started()),
+            mUnshield.get(), SLOT(extract()));
 
-    connect(mUnshield, SIGNAL(finished()),
-            mThread, SLOT(quit()));
+    connect(mUnshield.get(), SIGNAL(finished()),
+            mThread.get(), SLOT(quit()));
 
-    connect(mUnshield, SIGNAL(finished()),
+    connect(mUnshield.get(), SIGNAL(finished()),
             this, SLOT(installationFinished()), Qt::QueuedConnection);
 
-    connect(mUnshield, SIGNAL(error(QString, QString)),
+    connect(mUnshield.get(), SIGNAL(error(QString, QString)),
             this, SLOT(installationError(QString, QString)), Qt::QueuedConnection);
 
-    connect(mUnshield, SIGNAL(textChanged(QString)),
+    connect(mUnshield.get(), SIGNAL(textChanged(QString)),
             installProgressLabel, SLOT(setText(QString)), Qt::QueuedConnection);
 
-    connect(mUnshield, SIGNAL(textChanged(QString)),
+    connect(mUnshield.get(), SIGNAL(textChanged(QString)),
             logTextEdit, SLOT(appendPlainText(QString)),  Qt::QueuedConnection);
 
-    connect(mUnshield, SIGNAL(textChanged(QString)),
+    connect(mUnshield.get(), SIGNAL(textChanged(QString)),
             mWizard, SLOT(addLogText(QString)),  Qt::QueuedConnection);
 
-    connect(mUnshield, SIGNAL(progressChanged(int)),
+    connect(mUnshield.get(), SIGNAL(progressChanged(int)),
             installProgressBar, SLOT(setValue(int)),  Qt::QueuedConnection);
 
-    connect(mUnshield, SIGNAL(requestFileDialog(Wizard::Component)),
+    connect(mUnshield.get(), SIGNAL(requestFileDialog(Wizard::Component)),
             this, SLOT(showFileDialog(Wizard::Component)), Qt::QueuedConnection);
 
-    connect(mUnshield, SIGNAL(requestOldVersionDialog()),
+    connect(mUnshield.get(), SIGNAL(requestOldVersionDialog()),
             this, SLOT(showOldVersionDialog())
             , Qt::QueuedConnection);
 }
@@ -60,9 +60,6 @@ Wizard::InstallationPage::~InstallationPage()
         mThread->quit();
         mThread->wait();
     }
-
-    delete mUnshield;
-    delete mThread;
 }
 
 void Wizard::InstallationPage::initializePage()
diff --git a/apps/wizard/installationpage.hpp b/apps/wizard/installationpage.hpp
index 49c92a5f31..d2380956cc 100644
--- a/apps/wizard/installationpage.hpp
+++ b/apps/wizard/installationpage.hpp
@@ -1,6 +1,8 @@
 #ifndef INSTALLATIONPAGE_HPP
 #define INSTALLATIONPAGE_HPP
 
+#include <memory>
+
 #include <QWizardPage>
 
 #include "unshield/unshieldworker.hpp"
@@ -30,8 +32,8 @@ namespace Wizard
         MainWizard *mWizard;
         bool mFinished;
 
-        QThread* mThread;
-        UnshieldWorker *mUnshield;
+        std::unique_ptr<QThread> mThread;
+        std::unique_ptr<UnshieldWorker> mUnshield;
 
         void startInstallation();
 

From 3c8ef8463caa76cc8ba283bccaed41924e1722da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <3397065-ZehMatt@users.noreply.gitlab.com>
Date: Mon, 18 Jul 2022 21:44:03 +0300
Subject: [PATCH 2850/2859] Close only valid handles

---
 components/platform/file.hpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/components/platform/file.hpp b/components/platform/file.hpp
index 3456cdc113..bd22394197 100644
--- a/components/platform/file.hpp
+++ b/components/platform/file.hpp
@@ -36,7 +36,11 @@ namespace Platform::File {
     public:
         ScopedHandle() = default;
         ScopedHandle(Handle handle) : mHandle(handle) {}
-        ~ScopedHandle() { close(mHandle); }
+        ~ScopedHandle() 
+        { 
+            if(mHandle != Handle::Invalid) 
+                close(mHandle); 
+        }
 
         operator Handle() const { return mHandle; }
     };

From 8a724eb7727fa797bce78de6c8af86ba0fe610e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <3397065-ZehMatt@users.noreply.gitlab.com>
Date: Mon, 18 Jul 2022 22:28:35 +0300
Subject: [PATCH 2851/2859] Delete assignment and copy constructor

---
 components/platform/file.hpp | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/components/platform/file.hpp b/components/platform/file.hpp
index bd22394197..ae803edb22 100644
--- a/components/platform/file.hpp
+++ b/components/platform/file.hpp
@@ -34,8 +34,21 @@ namespace Platform::File {
         Handle mHandle{ Handle::Invalid };
         
     public:
-        ScopedHandle() = default;
-        ScopedHandle(Handle handle) : mHandle(handle) {}
+        ScopedHandle() noexcept = default;
+        ScopedHandle(ScopedHandle& other) = delete;
+        ScopedHandle(Handle handle) noexcept : mHandle(handle) {}
+        ScopedHandle(ScopedHandle&& other) noexcept 
+            : mHandle(other.mHandle) 
+        { 
+            other.mHandle = Handle::Invalid; 
+        }
+        ScopedHandle& operator=(const ScopedHandle& other) = delete;
+        ScopedHandle& operator=(ScopedHandle&& other) noexcept
+        {
+            mHandle = other.mHandle;
+            other.mHandle = Handle::Invalid;
+            return *this;
+        }
         ~ScopedHandle() 
         { 
             if(mHandle != Handle::Invalid) 

From 4e9a063de29517a9b96c5b95fb6f6c60ddee6f4c Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 18 Jul 2022 23:33:51 +0400
Subject: [PATCH 2852/2859] Fix MacOS build

---
 files/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/files/CMakeLists.txt b/files/CMakeLists.txt
index 587c3fa1d3..9461879d61 100644
--- a/files/CMakeLists.txt
+++ b/files/CMakeLists.txt
@@ -2,4 +2,8 @@ add_subdirectory(shaders)
 add_subdirectory(data)
 add_subdirectory(lua_api)
 
+if (NOT DEFINED OPENMW_RESOURCES_ROOT)
+    return()
+endif()
+
 copy_resource_file("launcher/images/openmw.png" "${OPENMW_RESOURCES_ROOT}" "resources/openmw.png")

From 4e7fe5a8bd43e127405444cee901fce77cbd3011 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 18 Jul 2022 23:34:12 +0400
Subject: [PATCH 2853/2859] Set VFS only once

---
 apps/openmw/mwgui/windowmanagerimp.cpp        |  4 ++--
 components/myguiplatform/myguidatamanager.cpp | 10 +++++-----
 components/myguiplatform/myguidatamanager.hpp |  4 ++--
 components/myguiplatform/myguiplatform.cpp    |  7 +++----
 components/myguiplatform/myguiplatform.hpp    |  4 ++--
 5 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 6861fff7eb..717e8375b0 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -194,8 +194,8 @@ namespace MWGui
       , mWindowVisible(true)
     {
         mScalingFactor = std::clamp(Settings::Manager::getFloat("scaling factor", "GUI"), 0.5f, 8.f);
-        mGuiPlatform = new osgMyGUI::Platform(viewer, guiRoot, resourceSystem->getImageManager(), mScalingFactor);
-        mGuiPlatform->initialise(resourceSystem->getVFS(), "mygui", (std::filesystem::path(logpath) / "MyGUI.log").generic_string());
+        mGuiPlatform = new osgMyGUI::Platform(viewer, guiRoot, resourceSystem->getImageManager(), resourceSystem->getVFS(), mScalingFactor);
+        mGuiPlatform->initialise("mygui", (std::filesystem::path(logpath) / "MyGUI.log").generic_string());
 
         mGui = new MyGUI::Gui;
         mGui->initialise("");
diff --git a/components/myguiplatform/myguidatamanager.cpp b/components/myguiplatform/myguidatamanager.cpp
index 87e20dbe85..2f8b0f81e0 100644
--- a/components/myguiplatform/myguidatamanager.cpp
+++ b/components/myguiplatform/myguidatamanager.cpp
@@ -18,6 +18,11 @@ void DataManager::setResourcePath(const std::string &path)
     mResourcePath = path;
 }
 
+DataManager::DataManager(const VFS::Manager* vfs)
+    : mVfs(vfs)
+{
+}
+
 MyGUI::IDataStream *DataManager::getData(const std::string &name) const
 {
     // Note: MyGUI is supposed to read/free input steam itself,
@@ -39,11 +44,6 @@ bool DataManager::isDataExist(const std::string &name) const
     return mVfs->exists(mResourcePath + "/" + name);
 }
 
-void DataManager::setVfs(const VFS::Manager* vfs)
-{
-    mVfs = vfs;
-}
-
 const MyGUI::VectorString &DataManager::getDataListNames(const std::string &pattern) const
 {
     throw std::runtime_error("DataManager::getDataListNames is not implemented - VFS is used");
diff --git a/components/myguiplatform/myguidatamanager.hpp b/components/myguiplatform/myguidatamanager.hpp
index 47203e1634..281aedd137 100644
--- a/components/myguiplatform/myguidatamanager.hpp
+++ b/components/myguiplatform/myguidatamanager.hpp
@@ -16,9 +16,9 @@ public:
     void initialise() {}
     void shutdown() {}
 
-    void setResourcePath(const std::string& path);
+    DataManager(const VFS::Manager* vfs);
 
-    void setVfs(const VFS::Manager* vfs);
+    void setResourcePath(const std::string& path);
 
     /** Get data stream from specified resource name.
         @param _name Resource name (usually file name).
diff --git a/components/myguiplatform/myguiplatform.cpp b/components/myguiplatform/myguiplatform.cpp
index b19bc722a2..a2964692a6 100644
--- a/components/myguiplatform/myguiplatform.cpp
+++ b/components/myguiplatform/myguiplatform.cpp
@@ -7,7 +7,7 @@
 namespace osgMyGUI
 {
 
-Platform::Platform(osgViewer::Viewer *viewer, osg::Group *guiRoot, Resource::ImageManager *imageManager, float uiScalingFactor)
+Platform::Platform(osgViewer::Viewer *viewer, osg::Group *guiRoot, Resource::ImageManager *imageManager, const VFS::Manager* vfs, float uiScalingFactor)
     : mRenderManager(nullptr)
     , mDataManager(nullptr)
     , mLogManager(nullptr)
@@ -15,7 +15,7 @@ Platform::Platform(osgViewer::Viewer *viewer, osg::Group *guiRoot, Resource::Ima
 {
     mLogManager = new MyGUI::LogManager();
     mRenderManager = new RenderManager(viewer, guiRoot, imageManager, uiScalingFactor);
-    mDataManager = new DataManager();
+    mDataManager = new DataManager(vfs);
 }
 
 Platform::~Platform()
@@ -30,7 +30,7 @@ Platform::~Platform()
     mLogFacility = nullptr;
 }
 
-void Platform::initialise(const VFS::Manager* vfs, const std::string &resourcePath, const std::string &_logName)
+void Platform::initialise(const std::string &resourcePath, const std::string &_logName)
 {
     if (!_logName.empty() && !mLogFacility)
     {
@@ -39,7 +39,6 @@ void Platform::initialise(const VFS::Manager* vfs, const std::string &resourcePa
     }
 
     mDataManager->setResourcePath(resourcePath);
-    mDataManager->setVfs(vfs);
 
     mRenderManager->initialise();
     mDataManager->initialise();
diff --git a/components/myguiplatform/myguiplatform.hpp b/components/myguiplatform/myguiplatform.hpp
index a46fedcd75..e8d3378e66 100644
--- a/components/myguiplatform/myguiplatform.hpp
+++ b/components/myguiplatform/myguiplatform.hpp
@@ -32,11 +32,11 @@ namespace osgMyGUI
     class Platform
     {
     public:
-        Platform(osgViewer::Viewer* viewer, osg::Group* guiRoot, Resource::ImageManager* imageManager, float uiScalingFactor);
+        Platform(osgViewer::Viewer* viewer, osg::Group* guiRoot, Resource::ImageManager* imageManager, const VFS::Manager* vfs, float uiScalingFactor);
 
         ~Platform();
 
-        void initialise(const VFS::Manager* vfs, const std::string& resourcePath, const std::string& _logName = "MyGUI.log");
+        void initialise(const std::string& resourcePath, const std::string& _logName = "MyGUI.log");
 
         void shutdown();
 

From 8f7ec42c09be00f1c9a3b6fba70a28f9c09bbd71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <3397065-ZehMatt@users.noreply.gitlab.com>
Date: Mon, 18 Jul 2022 23:11:09 +0300
Subject: [PATCH 2854/2859] Close handle if valid for move assignment

---
 components/platform/file.hpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/platform/file.hpp b/components/platform/file.hpp
index ae803edb22..8faf9c67cb 100644
--- a/components/platform/file.hpp
+++ b/components/platform/file.hpp
@@ -45,6 +45,8 @@ namespace Platform::File {
         ScopedHandle& operator=(const ScopedHandle& other) = delete;
         ScopedHandle& operator=(ScopedHandle&& other) noexcept
         {
+            if (mHandle != Handle::Invalid)
+                close(mHandle);
             mHandle = other.mHandle;
             other.mHandle = Handle::Invalid;
             return *this;

From 03b178c2eb369ff3a2474da31099f847dc62afbb Mon Sep 17 00:00:00 2001
From: Joakim Berg <zapp90@gmail.com>
Date: Tue, 19 Jul 2022 06:49:50 +0000
Subject: [PATCH 2855/2859] Swedish i10n translations

---
 files/data/CMakeLists.txt              |  8 +++
 files/data/l10n/Calendar/sv.yaml       |  7 +++
 files/data/l10n/DebugMenu/sv.yaml      |  3 ++
 files/data/l10n/Interface/sv.yaml      |  4 ++
 files/data/l10n/Navigation/sv.yaml     |  1 +
 files/data/l10n/OMWCamera/sv.yaml      | 71 ++++++++++++++++++++++++++
 files/data/l10n/PostProcessing/sv.yaml | 21 ++++++++
 files/data/l10n/SavegameMenu/sv.yaml   |  2 +
 files/data/l10n/SettingsMenu/sv.yaml   | 60 ++++++++++++++++++++++
 9 files changed, 177 insertions(+)
 create mode 100644 files/data/l10n/Calendar/sv.yaml
 create mode 100644 files/data/l10n/DebugMenu/sv.yaml
 create mode 100644 files/data/l10n/Interface/sv.yaml
 create mode 100644 files/data/l10n/Navigation/sv.yaml
 create mode 100644 files/data/l10n/OMWCamera/sv.yaml
 create mode 100644 files/data/l10n/PostProcessing/sv.yaml
 create mode 100644 files/data/l10n/SavegameMenu/sv.yaml
 create mode 100644 files/data/l10n/SettingsMenu/sv.yaml

diff --git a/files/data/CMakeLists.txt b/files/data/CMakeLists.txt
index 1130524e45..8b1dd3a9a3 100644
--- a/files/data/CMakeLists.txt
+++ b/files/data/CMakeLists.txt
@@ -22,20 +22,28 @@ set(BUILTIN_DATA_FILES
 
     l10n/Calendar/en.yaml
     l10n/Calendar/ru.yaml
+    l10n/Calendar/sv.yaml
     l10n/DebugMenu/en.yaml
     l10n/DebugMenu/ru.yaml
+    l10n/DebugMenu/sv.yaml
     l10n/Interface/en.yaml
     l10n/Interface/ru.yaml
+    l10n/Interface/sv.yaml
     l10n/Navigation/en.yaml
     l10n/Navigation/ru.yaml
+    l10n/Navigation/sv.yaml
     l10n/OMWCamera/en.yaml
     l10n/OMWCamera/ru.yaml
+    l10n/OMWCamera/sv.yaml
     l10n/PostProcessing/en.yaml
     l10n/PostProcessing/ru.yaml
+    l10n/PostProcessing/sv.yaml
     l10n/SavegameMenu/en.yaml
     l10n/SavegameMenu/ru.yaml
+    l10n/SavegameMenu/sv.yaml
     l10n/SettingsMenu/en.yaml
     l10n/SettingsMenu/ru.yaml
+    l10n/SettingsMenu/sv.yaml
 
     openmw_aux/util.lua
     openmw_aux/time.lua
diff --git a/files/data/l10n/Calendar/sv.yaml b/files/data/l10n/Calendar/sv.yaml
new file mode 100644
index 0000000000..cbd49bbbc6
--- /dev/null
+++ b/files/data/l10n/Calendar/sv.yaml
@@ -0,0 +1,7 @@
+# source: https://en.uesp.net/wiki/Lore:Calendar
+
+# Sv: Ingen vits att översätta namn på månader och dagar till svenska när inte spelets innehåll finns på svenska. Det lär mest bara förvirra. Därför finns bara dateFormat i denna fil.
+
+# En: No use translating names on months and weekdays to Swedish when the game's content isn't in Swedish. It will probably just confuse people. Therefore, only dateFormat is present in this file.
+
+dateFormat: "dag {day} av {monthInGenitive} år {year}"
diff --git a/files/data/l10n/DebugMenu/sv.yaml b/files/data/l10n/DebugMenu/sv.yaml
new file mode 100644
index 0000000000..07807782de
--- /dev/null
+++ b/files/data/l10n/DebugMenu/sv.yaml
@@ -0,0 +1,3 @@
+DebugWindow: "Felsökning"
+LogViewer: "Loggvisare"
+PhysicsProfiler: "Fysikprofilerare"
diff --git a/files/data/l10n/Interface/sv.yaml b/files/data/l10n/Interface/sv.yaml
new file mode 100644
index 0000000000..bf2c10f160
--- /dev/null
+++ b/files/data/l10n/Interface/sv.yaml
@@ -0,0 +1,4 @@
+No: "Nej"
+NotAvailableShort: "N/A"
+Reset: "Återställ"
+Yes: "Ja"
diff --git a/files/data/l10n/Navigation/sv.yaml b/files/data/l10n/Navigation/sv.yaml
new file mode 100644
index 0000000000..d7c4780f94
--- /dev/null
+++ b/files/data/l10n/Navigation/sv.yaml
@@ -0,0 +1 @@
+BuildingNavigationMesh: "Bygger navigeringsmesh"
diff --git a/files/data/l10n/OMWCamera/sv.yaml b/files/data/l10n/OMWCamera/sv.yaml
new file mode 100644
index 0000000000..fad593c549
--- /dev/null
+++ b/files/data/l10n/OMWCamera/sv.yaml
@@ -0,0 +1,71 @@
+Camera: "OpenMW Kamera"
+settingsPageDescription: "OpenMW Kamerainställningar"
+
+thirdPersonSettings: "Tredjepersonsvy"
+
+viewOverShoulder: "Över-axeln-vy"
+viewOverShoulderDescription: |
+    Styr tredjepersonsvyn.
+      Nej: Kameran är centrerad på spelfigurens huvud. Siktet är gömt.
+      Ja: När vapnet är inaktiverat positioneras kameran bakom spelfigurens axel. Siktet är synligt.
+
+shoulderOffsetX: "Över-axeln-vy horisontell placering"
+shoulderOffsetXDescription: >
+    Horisontell placering för kamera över-axeln-vyn.
+    Använd ett negativt värde för vänster axel.
+
+shoulderOffsetY: "Över-axeln-vy vertikal placering"
+shoulderOffsetYDescription: >
+    Vertikal placering för kamera över-axeln-vyn.
+
+autoSwitchShoulder: "Byt axel automatiskt"
+autoSwitchShoulderDescription: >
+    När det finns hinder som gör att kameran knuffas närmare spelfiguren,
+    gör denna inställning att kameran automatiskt flyttas till axeln längst bort från hindret.
+
+zoomOutWhenMoveCoef: "Zooma ut vid förflyttning, koefficient"
+zoomOutWhenMoveCoefDescription: >
+    Flytta kameran bort från (positivt värde) eller mot (negativt värde) spelfiguren när spelfiguren förflyttar sig.
+    Fungerar endast om "Kamera över-axeln-vy" är aktiverat. Ställ på noll för att avaktivera (förvalt är 20.0).
+
+previewIfStandStill: "Omloppskamera vid stillastående"
+previewIfStandStillDescription: >
+    Gör att spelfiguren inte vänder sig mot kameravinkeln när spelfiguren är inaktiv och har vapnet inaktiverat.
+
+deferredPreviewRotation: "Fördröjd omloppskamerarotation"
+deferredPreviewRotationDescription: |
+    Om aktiverat kommer spelfiguren rotera mjukt mot kameravikeln när omloppskameran avaktiveras.
+    Om inaktiverat kommer kameran rotera istället för spelfiguren.
+
+ignoreNC: "Ignorera 'No Collision'-flaggor"
+ignoreNCDescription: >
+    Hindrar kameran från att tränga igenom objekt som har NC-flaggan (No Collision, ingen kollision) aktiverad i NIF-modellen.
+
+move360: "Kameraoberoende förflyttning"
+move360Description: >
+    Gör rörelseriktningen oberoende av kameravinkeln när spelfigurens vapen är inaktiverat. Till exempel kommer spelfiguren vara vänd mot kameran när spelaren springer bakåt.
+
+move360TurnSpeed: "Kameraoberoende förflyttning, svänghastighet"
+move360TurnSpeedDescription: "Svänghastighet multiplikator (förvalt är 5.0)."
+
+slowViewChange: "Mjukt byte mellan kameravyer"
+slowViewChangeDescription: "Gör övergången från första- till tredjepersonsvy icke-omedelbar."
+
+povAutoSwitch: "Automatiskt byte till förstapersonsvy"
+povAutoSwitchDescription: "Automatiskt byte till förstapersonsvy om det finns ett hinder precis bakom spelfiguren."
+
+
+headBobbingSettings: "Huvudguppande i förstapersonsvy"
+
+headBobbing_enabled: "Aktiverad"
+headBobbing_enabledDescription: "Om aktiverad kommer kameran i förstapersonsvyn att guppa vid rörelser"
+
+headBobbing_step: "Steglängd"
+headBobbing_stepDescription: "Längden på varje steg (förvalt: 90.0)."
+
+headBobbing_height: "Steghöjd"
+headBobbing_heightDescription: "Huvudguppandets amplitud (förvalt: 3.0)."
+
+headBobbing_roll: "Maximal gungvinkel"
+headBobbing_rollDescription: "Maximala vinkeln som kameran gungar, i grader (förvalt: 0.2)."
+
diff --git a/files/data/l10n/PostProcessing/sv.yaml b/files/data/l10n/PostProcessing/sv.yaml
new file mode 100644
index 0000000000..e3c25b72cb
--- /dev/null
+++ b/files/data/l10n/PostProcessing/sv.yaml
@@ -0,0 +1,21 @@
+Abovewater: "Ovan vatten"
+Author: "Skapare" # Author = Författare, but författare sounds very book-author-ish. Skapare, meaning "creator", sounds better in Swedish in this case. Ok?
+Configuration: "Konfiguration"
+Description: "Beskrivning"
+InExteriors: "Exteriörer"
+InInteriors: "Interiörer"
+KeyboardControls: |
+    Tangentbordskontroller:
+
+    Shift+Högerpil > Aktivera shader
+    Shift+Vänsterpil > Avaktivera shader
+    Shift+Pil upp > Flytta shader upp
+    Shift+Pil ner > Flytta shader ner
+PostProcessHUD: "Postprocess HUD"
+ResetShader: "Återställ shader to ursprungligt läge"
+ShaderLocked: "Låst"
+ShaderLockedDescription: "Kan ej aktiveras/inaktiveras eller flyttas. Kontrolleras av externt Lua-skript"
+ShaderResetUniform: "r"
+Underwater: "Under vatten"
+Version: "Version"
+
diff --git a/files/data/l10n/SavegameMenu/sv.yaml b/files/data/l10n/SavegameMenu/sv.yaml
new file mode 100644
index 0000000000..ef23465f6c
--- /dev/null
+++ b/files/data/l10n/SavegameMenu/sv.yaml
@@ -0,0 +1,2 @@
+SelectCharacter: "Välj spelfigur..."
+TimePlayed: "Speltid"
diff --git a/files/data/l10n/SettingsMenu/sv.yaml b/files/data/l10n/SettingsMenu/sv.yaml
new file mode 100644
index 0000000000..7c61e0b6a4
--- /dev/null
+++ b/files/data/l10n/SettingsMenu/sv.yaml
@@ -0,0 +1,60 @@
+ActorsProcessingRange: "Processavstånd för figurer"
+Anisotropy: "Anisotropi"
+CameraSensitivity: "Kamerakänslighet"
+CameraZoomIn: "Zooma in kamera"
+CameraZoomOut: "Zooma ut kamera"
+ChangeRequiresRestart: "Den här ändringen kräver omstart för att ge effekt."
+Controller: "Handkontroll" # Assuming "gamepad" as the word in question
+FieldOfView: "Synfält"
+FrameRateHint: "Tips: tryck på F3 för att visa\naktuell bilduppdateringsfrekvens."
+InvertXAxis: "Invertera X-axeln"
+LightingMethod: "Ljussättningsmetod"
+LightingMethodLegacy: "Gammaldags"
+LightingMethodShaders: "Shader"
+LightingMethodShadersCompatibility: "Shader (kompatibilitet)"
+LightingResetToDefaults: "Återställer till ursprungliga värden, vill du fortsätta? Ändringar till ljussättningsmetod kräver omstart."
+Lights: "Ljus"
+LightsBoundingSphereMultiplier: "Gränssfärsmultiplikator"
+LightsBoundingSphereMultiplierTooltip: "Förvalt: 1.65\nMultiplikator för ljusens gränssfär.\nHögre värden ger mjukare minskning av gränssfären, men kräver högre värde i Max antal ljuskällor.\n\nPåverkar inte ljusstyrkan."
+LightsFadeStartMultiplier: "Blekningsstartmultiplikator"
+LightsFadeStartMultiplierTooltip: "Förvalt: 0.85\nFraktion av det maximala avståndet från vilket ljuskällor börjar blekna.\n\nVälj lågt värde för långsammare övergång eller högre värde för snabbare övergång."
+LightsMaximumDistance: "Maximalt ljusavstånd"
+LightsMaximumDistanceTooltip: "Förvalt: 8192\nMaximala avståndet där ljuskällor syns (mätt i enheter).\n\nVärdet 0 ger oändligt avstånd."
+LightsMinimumInteriorBrightness: "Minsta ljusstyrka i interiörer"
+LightsMinimumInteriorBrightnessTooltip: "Förvalt: 0.08\nMinsta omgivande ljusstyrka i interiörer.\n\nÖka värdet om du anser att interiörer är för mörka."
+MaxLights: "Max antal ljuskällor"
+MaxLightsTooltip: "Förvalt: 8\nMaximalt antal ljuskällor per objekt.\n\nEtt lågt tal nära det förvalda kommer orsaka att ljuskällor poppar upp som vid ljussättningsmetoden Gammaldags."
+MouseAndKeyboard: "Mus/Tangentbord"
+PostProcessing: "Postprocessing"
+PostProcessingTooltip: "Justeras via Postprocessing-gränssnittet, se input bindings."
+RainRippleDetail: "Ringar på vattnet, detaljnivå"
+RainRippleDetailDense: "Tätt"
+RainRippleDetailSimple: "Förenklat"
+RainRippleDetailSparse: "Glest"
+ReflectionShaderDetail: "Reflektionsshader, detaljnivå"
+ReflectionShaderDetailActors: "spelfigurer"
+ReflectionShaderDetailGroundcover: "Marktäckare"
+ReflectionShaderDetailObjects: "Objekt"
+ReflectionShaderDetailSky: "Himmel"
+ReflectionShaderDetailTerrain: "Terräng"
+ReflectionShaderDetailWorld: "Värld"
+Refraction: "Refraktion"
+Screenshot: "Skärmdump"
+Scripts: "Skript"
+TextureFiltering: "Texturfiltrering"
+TextureFilteringBilinear: "Bilinjär"
+TextureFilteringDisabled: "Ingen"
+TextureFilteringOther: "Annan"
+TextureFilteringTrilinear: "Trilinjär"
+ToggleHUD: "Växla till HUD"
+TogglePostProcessorHUD: "Växla till Postprocess-HUD"
+VSync: "VSynk"
+Water: "Vatten"
+WaterShader: "Vattenshader"
+WaterShaderTextureQuality: "Texturkvalitet"
+WindowBorder: "Fönster, ram"
+WindowMode: "Fönsterläge"
+WindowModeFullscreen: "Fullskärm"
+WindowModeWindowed: "Fönster"
+WindowModeWindowedFullscreen: "Fullskärm i fönsterläge"
+

From c6bc264b35777f7d1ebdb6168f6f82c1f3378b71 Mon Sep 17 00:00:00 2001
From: Matt <3397065-ZehMatt@users.noreply.gitlab.com>
Date: Tue, 19 Jul 2022 13:48:57 +0000
Subject: [PATCH 2856/2859] Use correct assertion for the file implementation

---
 components/platform/file.posix.cpp | 3 +++
 components/platform/file.stdio.cpp | 3 +++
 components/platform/file.win32.cpp | 5 +++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/components/platform/file.posix.cpp b/components/platform/file.posix.cpp
index efffa0fd76..f79562dcfd 100644
--- a/components/platform/file.posix.cpp
+++ b/components/platform/file.posix.cpp
@@ -7,11 +7,14 @@
 #include <string.h>
 #include <stdexcept>
 #include <string>
+#include <cassert>
 
 namespace Platform::File {
 
     static auto getNativeHandle(Handle handle)
     {
+        assert(handle != Handle::Invalid);
+
         return static_cast<int>(handle);
     }
 
diff --git a/components/platform/file.stdio.cpp b/components/platform/file.stdio.cpp
index 26c2480902..558fea1154 100644
--- a/components/platform/file.stdio.cpp
+++ b/components/platform/file.stdio.cpp
@@ -4,11 +4,14 @@
 #include <string.h>
 #include <string>
 #include <stdexcept>
+#include <cassert>
 
 namespace Platform::File {
 
     static auto getNativeHandle(Handle handle)
     {
+        assert(handle != Handle::Invalid);
+
         return reinterpret_cast<FILE*>(static_cast<intptr_t>(handle));
     }
 
diff --git a/components/platform/file.win32.cpp b/components/platform/file.win32.cpp
index ad7e11213d..a2ba86a4ef 100644
--- a/components/platform/file.win32.cpp
+++ b/components/platform/file.win32.cpp
@@ -4,11 +4,14 @@
 #include <string>
 #include <stdexcept>
 #include <boost/locale.hpp>
+#include <cassert>
 
 namespace Platform::File {
 
     static auto getNativeHandle(Handle handle)
     {
+        assert(handle != Handle::Invalid);
+
         return reinterpret_cast<HANDLE>(static_cast<intptr_t>(handle));
     }
 
@@ -58,8 +61,6 @@ namespace Platform::File {
     {
         auto nativeHandle = getNativeHandle(handle);
 
-        assert(isValidHandle(mHandle));
-
         BY_HANDLE_FILE_INFORMATION info;
 
         if (!GetFileInformationByHandle(nativeHandle, &info))

From aa807c0c3ca0d2a1d9e206eb844415e9282df21c Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Tue, 19 Jul 2022 22:25:46 +0000
Subject: [PATCH 2857/2859] Revert controversial changes in luadoc generation
 (!2124, !2130)

---
 docs/source/Dockerfile.luadoc             | 31 -----------
 docs/source/README.md                     | 18 -------
 docs/source/conf.py                       |  6 +--
 docs/source/generate_luadoc.sh            | 63 +++++++++++++++--------
 docs/source/setup_openmw_luadocumentor.sh | 26 ----------
 5 files changed, 43 insertions(+), 101 deletions(-)
 delete mode 100644 docs/source/Dockerfile.luadoc
 delete mode 100644 docs/source/README.md
 delete mode 100755 docs/source/setup_openmw_luadocumentor.sh

diff --git a/docs/source/Dockerfile.luadoc b/docs/source/Dockerfile.luadoc
deleted file mode 100644
index 4917a0a738..0000000000
--- a/docs/source/Dockerfile.luadoc
+++ /dev/null
@@ -1,31 +0,0 @@
-FROM ubuntu:22.04
-
-RUN apt update && \
-    apt install -y make gcc libreadline-dev wget unzip git zip && \
-    rm -rf /var/lib/apt/lists/*
-
-ADD https://www.lua.org/ftp/lua-5.1.5.tar.gz /tmp/lua-5.1.5.tar.gz
-RUN tar -zxf /tmp/lua-5.1.5.tar.gz -C /tmp && rm /tmp/lua-5.1.5.tar.gz
-RUN cd /tmp/lua-5.1.5 && \
-    make linux -j $(nproc) && \
-    make install && \
-    rm -r /tmp/lua-5.1.5
-
-ADD https://luarocks.org/releases/luarocks-2.4.2.tar.gz /tmp/luarocks-2.4.2.tar.gz
-RUN tar -zxpf /tmp/luarocks-2.4.2.tar.gz -C /tmp && rm /tmp/luarocks-2.4.2.tar.gz
-RUN cd /tmp/luarocks-2.4.2 && \
-    ./configure && \
-    make build -j $(nproc) && \
-    make install && \
-    rm -r /tmp/luarocks-2.4.2
-
-ADD https://gitlab.com/ptmikheev/openmw-luadocumentor/-/raw/master/luarocks/openmwluadocumentor-0.1.1-1.rockspec /tmp/openmwluadocumentor-0.1.1-1.rockspec
-RUN cd /tmp && \
-    luarocks pack openmwluadocumentor-0.1.1-1.rockspec && \
-    luarocks install openmwluadocumentor-0.1.1-1.src.rock && \
-    rm /tmp/openmwluadocumentor-0.1.1-1.rockspec /tmp/openmwluadocumentor-0.1.1-1.src.rock
-
-VOLUME /openmw
-
-ENV DOCS_SOURCE_DIR=/openmw/docs/source
-ENV DOCUMENTOR_PATH=/usr/local/bin/openmwluadocumentor
diff --git a/docs/source/README.md b/docs/source/README.md
deleted file mode 100644
index a01803951e..0000000000
--- a/docs/source/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Source files for OpenMW documentation
-
-## Generating Lua scripting API reference
-
-### Building Docker image
-
-Run following command from OpenMW source directory to build a new Docker image `openmw.luadoc`:
-```bash
-docker build -f docs/source/Dockerfile.luadoc -t openmw.luadoc docs/source
-```
-
-### Generating HTML
-
-Run following command from OpenMW source directory to generate HTML pages:
-```bash
-docker run --rm --tty --interactive --user "$(id -u)":"$(id -g)" \
-    --volume "${PWD}":/openmw openmw.luadoc /openmw/docs/source/generate_luadoc.sh
-```
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 7fe1262eda..7f2affbb75 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -151,11 +151,7 @@ def setup(app):
     app.add_stylesheet('figures.css')
     app.add_stylesheet('luadoc.css')
     try:
-        # Assume we need to setup openmw-luadocumentor only when running this script in a Docker container because
-        # readthedocs pipeline runs there.
-        if os.path.exists('/.dockerenv'):
-            subprocess.check_call(os.path.join(project_root, 'docs/source/setup_openmw_luadocumentor.sh'))
-        subprocess.check_call(os.path.join(project_root, 'docs/source/generate_luadoc.sh'))
+        subprocess.call(project_root + '/docs/source/generate_luadoc.sh')
     except Exception as e:
         print('Can\'t generate Lua API documentation:', e)
 
diff --git a/docs/source/generate_luadoc.sh b/docs/source/generate_luadoc.sh
index 4f0cb4b947..f71e3110cb 100755
--- a/docs/source/generate_luadoc.sh
+++ b/docs/source/generate_luadoc.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/bin/bash
 
 # How to install openmwluadocumentor:
 
@@ -20,31 +20,52 @@
 # open "Git Bash" in the same directory and run script:
 #   ./generate_luadoc.sh
 
-if [[ -z "${DOCS_SOURCE_DIR+x}" ]]; then
-    DOCS_SOURCE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-fi
+if [ -f /.dockerenv ]; then
+    # We are inside readthedocs pipeline
+    echo "Install lua 5.1"
+    cd ~
+    curl -R -O https://www.lua.org/ftp/lua-5.1.5.tar.gz
+    tar -zxf lua-5.1.5.tar.gz
+    cd lua-5.1.5/
+    make linux
+    PATH=$PATH:~/lua-5.1.5/src
 
-FILES_DIR="${DOCS_SOURCE_DIR:?}/../../files"
-OUTPUT_DIR="${DOCS_SOURCE_DIR:?}/reference/lua-scripting/generated_html"
+    echo "Install luarocks"
+    cd ~
+    wget https://luarocks.org/releases/luarocks-2.4.2.tar.gz
+    tar zxpf luarocks-2.4.2.tar.gz
+    cd luarocks-2.4.2/
+    ./configure --with-lua-bin=$HOME/lua-5.1.5/src --with-lua-include=$HOME/lua-5.1.5/src --prefix=$HOME/luarocks
+    make build
+    make install
+    PATH=$PATH:~/luarocks/bin
 
-if [[ -z "${DOCUMENTOR_PATH+x}" ]]; then
-    DOCUMENTOR_PATH=~/.luarocks/bin/openmwluadocumentor
+    echo "Install openmwluadocumentor"
+    cd ~
+    git clone https://gitlab.com/ptmikheev/openmw-luadocumentor.git
+    cd openmw-luadocumentor/luarocks
+    luarocks --local pack openmwluadocumentor-0.1.1-1.rockspec
+    luarocks --local install openmwluadocumentor-0.1.1-1.src.rock
 fi
 
-if [ ! -x "${DOCUMENTOR_PATH:?}" ]; then
-    # running on Windows?
-    DOCUMENTOR_PATH="${APPDATA:?}/LuaRocks/bin/openmwluadocumentor.bat"
+DOCS_SOURCE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+FILES_DIR=$DOCS_SOURCE_DIR/../../files
+OUTPUT_DIR=$DOCS_SOURCE_DIR/reference/lua-scripting/generated_html
+DOCUMENTOR_PATH=~/.luarocks/bin/openmwluadocumentor
+
+if [ ! -x $DOCUMENTOR_PATH ]; then
+  # running on Windows?
+  DOCUMENTOR_PATH="$APPDATA/LuaRocks/bin/openmwluadocumentor.bat"
 fi
 
-rm -rf "${OUTPUT_DIR:?}"
-mkdir "${OUTPUT_DIR:?}"
+rm -f $OUTPUT_DIR/*.html
 
-cd "${FILES_DIR:?}/lua_api"
-"${DOCUMENTOR_PATH:?}" -f doc -d "${OUTPUT_DIR:?}" openmw/*lua
+cd $FILES_DIR/lua_api
+$DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR openmw/*lua
 
-cd "${FILES_DIR:?}/data"
-"${DOCUMENTOR_PATH:?}" -f doc -d "${OUTPUT_DIR:?}" openmw_aux/*lua
-"${DOCUMENTOR_PATH:?}" -f doc -d "${OUTPUT_DIR:?}" scripts/omw/ai.lua
-"${DOCUMENTOR_PATH:?}" -f doc -d "${OUTPUT_DIR:?}" scripts/omw/camera/camera.lua
-"${DOCUMENTOR_PATH:?}" -f doc -d "${OUTPUT_DIR:?}" scripts/omw/mwui/init.lua
-"${DOCUMENTOR_PATH:?}" -f doc -d "${OUTPUT_DIR:?}" scripts/omw/settings/player.lua
+cd $FILES_DIR/data
+$DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR openmw_aux/*lua
+$DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR scripts/omw/ai.lua
+$DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR scripts/omw/camera/camera.lua
+$DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR scripts/omw/mwui/init.lua
+$DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR scripts/omw/settings/player.lua
diff --git a/docs/source/setup_openmw_luadocumentor.sh b/docs/source/setup_openmw_luadocumentor.sh
deleted file mode 100755
index 5e7ec045fb..0000000000
--- a/docs/source/setup_openmw_luadocumentor.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash -e
-
-echo "Install lua 5.1"
-cd ~
-curl -R -O https://www.lua.org/ftp/lua-5.1.5.tar.gz
-tar -zxf lua-5.1.5.tar.gz
-cd lua-5.1.5/
-make -j $(nproc) linux
-PATH="${PATH:?}:~/lua-5.1.5/src"
-
-echo "Install luarocks"
-cd ~
-wget https://luarocks.org/releases/luarocks-2.4.2.tar.gz
-tar zxpf luarocks-2.4.2.tar.gz
-cd luarocks-2.4.2/
-./configure --with-lua-bin="${HOME:?}/lua-5.1.5/src" --with-lua-include="${HOME:?}/lua-5.1.5/src" --prefix="${HOME:?}/luarocks"
-make -j $(nproc) build
-make -j $(nproc) install
-PATH="${PATH:?}:~/luarocks/bin"
-
-echo "Install openmwluadocumentor"
-cd ~
-git clone --depth 1 https://gitlab.com/ptmikheev/openmw-luadocumentor.git
-cd openmw-luadocumentor/luarocks
-luarocks --local pack openmwluadocumentor-0.1.1-1.rockspec
-luarocks --local install openmwluadocumentor-0.1.1-1.src.rock

From 168a097c8b26e0b60459c3d28d134740c60795cc Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Tue, 19 Jul 2022 23:40:34 +0400
Subject: [PATCH 2858/2859] Improve binding VFS to MyGUI

---
 components/myguiplatform/myguidatamanager.cpp | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/components/myguiplatform/myguidatamanager.cpp b/components/myguiplatform/myguidatamanager.cpp
index 2f8b0f81e0..70af0774f7 100644
--- a/components/myguiplatform/myguidatamanager.cpp
+++ b/components/myguiplatform/myguidatamanager.cpp
@@ -10,6 +10,21 @@
 
 #include <components/debug/debuglog.hpp>
 
+namespace
+{
+    class DataStream final : public MyGUI::DataStream
+    {
+    public:
+        explicit DataStream(std::unique_ptr<std::istream>&& stream)
+            : MyGUI::DataStream(stream.get())
+            , mOwnedStream(std::move(stream))
+        {}
+
+    private:
+        std::unique_ptr<std::istream> mOwnedStream;
+    };
+}
+
 namespace osgMyGUI
 {
 
@@ -25,13 +40,7 @@ DataManager::DataManager(const VFS::Manager* vfs)
 
 MyGUI::IDataStream *DataManager::getData(const std::string &name) const
 {
-    // Note: MyGUI is supposed to read/free input steam itself,
-    // so copy data from VFS stream to the string stream and pass it to MyGUI.
-    Files::IStreamPtr streamPtr = mVfs->get(mResourcePath + "/" + name);
-    std::istream* fileStream = streamPtr.get();
-    auto dataStream = std::make_unique<std::stringstream>();
-    *dataStream << fileStream->rdbuf();
-    return new MyGUI::DataStream(dataStream.release());
+    return new DataStream(mVfs->get(mResourcePath + "/" + name));
 }
 
 void DataManager::freeData(MyGUI::IDataStream *data)

From de58c9dff3a014816773a28fbc310d187a8ddf9a Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Wed, 20 Jul 2022 15:25:37 +0400
Subject: [PATCH 2859/2859] Get rid of obsolete osg::Geode where it is possible

---
 apps/opencs/view/render/cell.cpp       |  1 -
 apps/opencs/view/render/cell.hpp       |  1 -
 apps/opencs/view/render/cellarrow.cpp  |  8 +-------
 apps/opencs/view/render/cellmarker.cpp |  5 +----
 apps/opencs/view/render/cellwater.cpp  | 11 +++++------
 apps/opencs/view/render/cellwater.hpp  |  3 +--
 apps/opencs/view/render/object.cpp     | 25 ++++++++++---------------
 apps/opencs/view/render/object.hpp     |  1 -
 apps/opencs/view/render/pathgrid.cpp   | 20 +++++++++-----------
 apps/opencs/view/render/pathgrid.hpp   |  3 +--
 components/misc/errorMarker.cpp        | 20 ++++++++++----------
 components/sceneutil/optimizer.cpp     |  5 +----
 components/sceneutil/optimizer.hpp     |  6 +++---
 components/terrain/cellborder.cpp      | 18 +++++++++---------
 14 files changed, 51 insertions(+), 76 deletions(-)

diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index 3395e90e11..9ece61a979 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -1,7 +1,6 @@
 #include "cell.hpp"
 
 #include <osg/PositionAttitudeTransform>
-#include <osg/Geode>
 #include <osg/Group>
 
 #include <components/misc/stringops.hpp>
diff --git a/apps/opencs/view/render/cell.hpp b/apps/opencs/view/render/cell.hpp
index 5998a4ee62..12f6f0ccdb 100644
--- a/apps/opencs/view/render/cell.hpp
+++ b/apps/opencs/view/render/cell.hpp
@@ -18,7 +18,6 @@ namespace osg
 {
     class Group;
     class Geometry;
-    class Geode;
 }
 
 namespace CSMWorld
diff --git a/apps/opencs/view/render/cellarrow.cpp b/apps/opencs/view/render/cellarrow.cpp
index 776dbf7890..9ad4932698 100644
--- a/apps/opencs/view/render/cellarrow.cpp
+++ b/apps/opencs/view/render/cellarrow.cpp
@@ -1,14 +1,11 @@
-
 #include "cellarrow.hpp"
 
 #include <osg/Group>
 #include <osg/PositionAttitudeTransform>
-#include <osg/Geode>
 #include <osg/Geometry>
 #include <osg/PrimitiveSet>
 
 #include "../../model/prefs/state.hpp"
-#include "../../model/prefs/shortcutmanager.hpp"
 
 #include <components/misc/constants.hpp>
 
@@ -159,10 +156,7 @@ void CSVRender::CellArrow::buildShape()
 
     geometry->getOrCreateStateSet()->setMode (GL_LIGHTING, osg::StateAttribute::OFF);
 
-    osg::ref_ptr<osg::Geode> geode (new osg::Geode);
-    geode->addDrawable (geometry);
-
-    mBaseNode->addChild (geode);
+    mBaseNode->addChild (geometry);
 }
 
 CSVRender::CellArrow::CellArrow (osg::Group *cellNode, Direction direction,
diff --git a/apps/opencs/view/render/cellmarker.cpp b/apps/opencs/view/render/cellmarker.cpp
index 3de96ab023..ddd4f4caf3 100644
--- a/apps/opencs/view/render/cellmarker.cpp
+++ b/apps/opencs/view/render/cellmarker.cpp
@@ -2,7 +2,6 @@
 
 #include <osg/AutoTransform>
 #include <osg/Material>
-#include <osg/Geode>
 #include <osgText/Text>
 
 #include <components/misc/constants.hpp>
@@ -44,9 +43,7 @@ void CSVRender::CellMarker::buildMarker()
     markerText->setText(coordinatesText);
 
     // Add text to marker node.
-    osg::ref_ptr<osg::Geode> geode (new osg::Geode);
-    geode->addDrawable(markerText);
-    mMarkerNode->addChild(geode);
+    mMarkerNode->addChild(markerText);
 }
 
 void CSVRender::CellMarker::positionMarker()
diff --git a/apps/opencs/view/render/cellwater.cpp b/apps/opencs/view/render/cellwater.cpp
index 9e4dbd9f14..b9391b7697 100644
--- a/apps/opencs/view/render/cellwater.cpp
+++ b/apps/opencs/view/render/cellwater.cpp
@@ -1,6 +1,5 @@
 #include "cellwater.hpp"
 
-#include <osg/Geode>
 #include <osg/Geometry>
 #include <osg/Group>
 #include <osg/PositionAttitudeTransform>
@@ -28,7 +27,7 @@ namespace CSVRender
         , mId(id)
         , mParentNode(cellNode)
         , mWaterTransform(nullptr)
-        , mWaterNode(nullptr)
+        , mWaterGroup(nullptr)
         , mWaterGeometry(nullptr)
         , mDeleted(false)
         , mExterior(false)
@@ -41,8 +40,8 @@ namespace CSVRender
         mWaterTransform->setNodeMask(Mask_Water);
         mParentNode->addChild(mWaterTransform);
 
-        mWaterNode = new osg::Geode();
-        mWaterTransform->addChild(mWaterNode);
+        mWaterGroup = new osg::Group();
+        mWaterTransform->addChild(mWaterGroup);
 
         int cellIndex = mData.getCells().searchId(mId);
         if (cellIndex > -1)
@@ -136,7 +135,7 @@ namespace CSVRender
 
         if (mWaterGeometry)
         {
-            mWaterNode->removeDrawable(mWaterGeometry);
+            mWaterGroup->removeChild(mWaterGeometry);
             mWaterGeometry = nullptr;
         }
 
@@ -177,6 +176,6 @@ namespace CSVRender
         mWaterGeometry->getStateSet()->setTextureAttributeAndModes(0, waterTexture, osg::StateAttribute::ON);
 
 
-        mWaterNode->addDrawable(mWaterGeometry);
+        mWaterGroup->addChild(mWaterGeometry);
     }
 }
diff --git a/apps/opencs/view/render/cellwater.hpp b/apps/opencs/view/render/cellwater.hpp
index 47e5867071..be1786955b 100644
--- a/apps/opencs/view/render/cellwater.hpp
+++ b/apps/opencs/view/render/cellwater.hpp
@@ -12,7 +12,6 @@
 
 namespace osg
 {
-    class Geode;
     class Geometry;
     class Group;
     class PositionAttitudeTransform;
@@ -60,7 +59,7 @@ namespace CSVRender
             osg::Group* mParentNode;
 
             osg::ref_ptr<osg::PositionAttitudeTransform> mWaterTransform;
-            osg::ref_ptr<osg::Geode> mWaterNode;
+            osg::ref_ptr<osg::Group> mWaterGroup;
             osg::ref_ptr<osg::Geometry> mWaterGeometry;
 
             bool mDeleted;
diff --git a/apps/opencs/view/render/object.cpp b/apps/opencs/view/render/object.cpp
index 93c348ecc5..6ab24928e6 100644
--- a/apps/opencs/view/render/object.cpp
+++ b/apps/opencs/view/render/object.cpp
@@ -2,7 +2,6 @@
 
 #include <stdexcept>
 #include <string>
-#include <iostream>
 
 #include <osg/Depth>
 #include <osg/Group>
@@ -10,17 +9,13 @@
 
 #include <osg/ShapeDrawable>
 #include <osg/Shape>
-#include <osg/Geode>
 #include <osg/Geometry>
 #include <osg/PrimitiveSet>
 
 #include <osgFX/Scribe>
 
 #include "../../model/world/data.hpp"
-#include "../../model/world/ref.hpp"
-#include "../../model/world/refidcollection.hpp"
 #include "../../model/world/commands.hpp"
-#include "../../model/world/universalid.hpp"
 #include "../../model/world/commandmacro.hpp"
 #include "../../model/world/cellcoordinates.hpp"
 #include "../../model/prefs/state.hpp"
@@ -43,15 +38,15 @@ const float CSVRender::Object::MarkerHeadLength = 50;
 namespace
 {
 
-    osg::ref_ptr<osg::Geode> createErrorCube()
+    osg::ref_ptr<osg::Group> createErrorCube()
     {
         osg::ref_ptr<osg::Box> shape(new osg::Box(osg::Vec3f(0,0,0), 50.f));
         osg::ref_ptr<osg::ShapeDrawable> shapedrawable(new osg::ShapeDrawable);
         shapedrawable->setShape(shape);
 
-        osg::ref_ptr<osg::Geode> geode (new osg::Geode);
-        geode->addDrawable(shapedrawable);
-        return geode;
+        osg::ref_ptr<osg::Group> group (new osg::Group);
+        group->addChild(shapedrawable);
+        return group;
     }
 
 }
@@ -296,10 +291,10 @@ osg::ref_ptr<osg::Node> CSVRender::Object::makeMoveOrScaleMarker (int axis)
 
     setupCommonMarkerState(geometry);
 
-    osg::ref_ptr<osg::Geode> geode (new osg::Geode);
-    geode->addDrawable (geometry);
+    osg::ref_ptr<osg::Group> group (new osg::Group);
+    group->addChild(geometry);
 
-    return geode;
+    return group;
 }
 
 osg::ref_ptr<osg::Node> CSVRender::Object::makeRotateMarker (int axis)
@@ -382,10 +377,10 @@ osg::ref_ptr<osg::Node> CSVRender::Object::makeRotateMarker (int axis)
 
     setupCommonMarkerState(geometry);
 
-    osg::ref_ptr<osg::Geode> geode = new osg::Geode();
-    geode->addDrawable (geometry);
+    osg::ref_ptr<osg::Group> group = new osg::Group();
+    group->addChild(geometry);
 
-    return geode;
+    return group;
 }
 
 void CSVRender::Object::setupCommonMarkerState(osg::ref_ptr<osg::Geometry> geometry)
diff --git a/apps/opencs/view/render/object.hpp b/apps/opencs/view/render/object.hpp
index 56337cf037..6c477b57d8 100644
--- a/apps/opencs/view/render/object.hpp
+++ b/apps/opencs/view/render/object.hpp
@@ -20,7 +20,6 @@ namespace osg
     class PositionAttitudeTransform;
     class Group;
     class Node;
-    class Geode;
 }
 
 namespace osgFX
diff --git a/apps/opencs/view/render/pathgrid.cpp b/apps/opencs/view/render/pathgrid.cpp
index 6a52c3f8ac..a45a4b427e 100644
--- a/apps/opencs/view/render/pathgrid.cpp
+++ b/apps/opencs/view/render/pathgrid.cpp
@@ -3,7 +3,6 @@
 #include <algorithm>
 
 #include <osg/Array>
-#include <osg/Geode>
 #include <osg/Geometry>
 #include <osg/Group>
 #include <osg/PositionAttitudeTransform>
@@ -11,7 +10,6 @@
 
 #include <components/sceneutil/pathgridutil.hpp>
 
-#include "../../model/world/cell.hpp"
 #include "../../model/world/commands.hpp"
 #include "../../model/world/commandmacro.hpp"
 #include "../../model/world/data.hpp"
@@ -77,8 +75,8 @@ namespace CSVRender
         mBaseNode->setNodeMask(Mask_Pathgrid);
         mParent->addChild(mBaseNode);
 
-        mPathgridGeode = new osg::Geode();
-        mBaseNode->addChild(mPathgridGeode);
+        mPathgridGroup = new osg::Group();
+        mBaseNode->addChild(mPathgridGroup);
 
         recreateGeometry();
 
@@ -222,7 +220,7 @@ namespace CSVRender
         mUseOffset = false;
         mMoveOffset.set(0, 0, 0);
 
-        mPathgridGeode->removeDrawable(mDragGeometry);
+        mPathgridGroup->removeChild(mDragGeometry);
         mDragGeometry = nullptr;
     }
 
@@ -524,7 +522,7 @@ namespace CSVRender
 
             removePathgridGeometry();
             mPathgridGeometry = SceneUtil::createPathgridGeometry(*source);
-            mPathgridGeode->addDrawable(mPathgridGeometry);
+            mPathgridGroup->addChild(mPathgridGeometry);
 
             createSelectedGeometry(*source);
         }
@@ -553,14 +551,14 @@ namespace CSVRender
         removeSelectedGeometry();
 
         mSelectedGeometry = SceneUtil::createPathgridSelectedWireframe(source, mSelected);
-        mPathgridGeode->addDrawable(mSelectedGeometry);
+        mPathgridGroup->addChild(mSelectedGeometry);
     }
 
     void Pathgrid::removePathgridGeometry()
     {
         if (mPathgridGeometry)
         {
-            mPathgridGeode->removeDrawable(mPathgridGeometry);
+            mPathgridGroup->removeChild(mPathgridGeometry);
             mPathgridGeometry = nullptr;
         }
     }
@@ -569,7 +567,7 @@ namespace CSVRender
     {
         if (mSelectedGeometry)
         {
-            mPathgridGeode->removeDrawable(mSelectedGeometry);
+            mPathgridGroup->removeChild(mSelectedGeometry);
             mSelectedGeometry = nullptr;
         }
     }
@@ -577,7 +575,7 @@ namespace CSVRender
     void Pathgrid::createDragGeometry(const osg::Vec3f& start, const osg::Vec3f& end, bool valid)
     {
         if (mDragGeometry)
-            mPathgridGeode->removeDrawable(mDragGeometry);
+            mPathgridGroup->removeChild(mDragGeometry);
 
         mDragGeometry = new osg::Geometry();
 
@@ -605,7 +603,7 @@ namespace CSVRender
         mDragGeometry->addPrimitiveSet(indices);
         mDragGeometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
 
-        mPathgridGeode->addDrawable(mDragGeometry);
+        mPathgridGroup->addChild(mDragGeometry);
     }
 
     const CSMWorld::Pathgrid* Pathgrid::getPathgridSource()
diff --git a/apps/opencs/view/render/pathgrid.hpp b/apps/opencs/view/render/pathgrid.hpp
index fa1b360e78..284b98d0b6 100644
--- a/apps/opencs/view/render/pathgrid.hpp
+++ b/apps/opencs/view/render/pathgrid.hpp
@@ -15,7 +15,6 @@
 
 namespace osg
 {
-    class Geode;
     class Geometry;
     class Group;
     class PositionAttitudeTransform;
@@ -107,7 +106,7 @@ namespace CSVRender
 
             osg::Group* mParent;
             osg::ref_ptr<osg::PositionAttitudeTransform> mBaseNode;
-            osg::ref_ptr<osg::Geode> mPathgridGeode;
+            osg::ref_ptr<osg::Group> mPathgridGroup;
             osg::ref_ptr<osg::Geometry> mPathgridGeometry;
             osg::ref_ptr<osg::Geometry> mSelectedGeometry;
             osg::ref_ptr<osg::Geometry> mDragGeometry;
diff --git a/components/misc/errorMarker.cpp b/components/misc/errorMarker.cpp
index fd2b0b53ac..9fb2f178ee 100644
--- a/components/misc/errorMarker.cpp
+++ b/components/misc/errorMarker.cpp
@@ -9,10 +9,10 @@ namespace Misc
 "osg::Group {"
 "  UniqueID 1 "
 "  Children 5 {"
-"    osg::Geode {"
+"    osg::Group {"
 "      UniqueID 2 "
 "      Name \"Error\" "
-"      Drawables 1 {"
+"      Children 1 {"
 "        osg::Geometry {"
 "          UniqueID 3 "
 "          DataVariance STATIC "
@@ -245,10 +245,10 @@ namespace Misc
 "        }"
 "      }"
 "    }"
-"    osg::Geode {"
+"    osg::Group {"
 "      UniqueID 12 "
 "      Name \"Error\" "
-"      Drawables 1 {"
+"      Children 1 {"
 "        osg::Geometry {"
 "          UniqueID 13 "
 "          DataVariance STATIC "
@@ -476,10 +476,10 @@ namespace Misc
 "        }"
 "      }"
 "    }"
-"    osg::Geode {"
+"    osg::Group {"
 "      UniqueID 20 "
 "      Name \"Error\" "
-"      Drawables 1 {"
+"      Children 1 {"
 "        osg::Geometry {"
 "          UniqueID 21 "
 "          DataVariance STATIC "
@@ -852,10 +852,10 @@ namespace Misc
 "        }"
 "      }"
 "    }"
-"    osg::Geode {"
+"    osg::Group {"
 "      UniqueID 30 "
 "      Name \"Error\" "
-"      Drawables 1 {"
+"      Children 1 {"
 "        osg::Geometry {"
 "          UniqueID 31 "
 "          DataVariance STATIC "
@@ -1221,10 +1221,10 @@ namespace Misc
 "        }"
 "      }"
 "    }"
-"    osg::Geode {"
+"    osg::Group {"
 "      UniqueID 38 "
 "      Name \"Cube\" "
-"      Drawables 1 {"
+"      Children 1 {"
 "        osg::Geometry {"
 "          UniqueID 39 "
 "          DataVariance STATIC "
diff --git a/components/sceneutil/optimizer.cpp b/components/sceneutil/optimizer.cpp
index 1aee434845..9012349804 100644
--- a/components/sceneutil/optimizer.cpp
+++ b/components/sceneutil/optimizer.cpp
@@ -210,7 +210,7 @@ class CollectLowestTransformsVisitor : public BaseOptimizerVisitor
             traverse(node);
         }
 
-        void apply(osg::Geometry& geode) override
+        void apply(osg::Geometry& geometry) override
         {
         }
 
@@ -1615,9 +1615,6 @@ bool Optimizer::MergeGeometryVisitor::mergeGroup(osg::Group& group)
 
     }
 
-//    geode.dirtyBound();
-
-
     return false;
 }
 
diff --git a/components/sceneutil/optimizer.hpp b/components/sceneutil/optimizer.hpp
index 196180f112..946f2e1f55 100644
--- a/components/sceneutil/optimizer.hpp
+++ b/components/sceneutil/optimizer.hpp
@@ -284,10 +284,10 @@ class Optimizer
                 FlattenStaticTransformsVisitor(Optimizer* optimizer=0):
                     BaseOptimizerVisitor(optimizer, FLATTEN_STATIC_TRANSFORMS) {}
 
-                void apply(osg::Node& geode) override;
-                void apply(osg::Geometry& drawable) override;
+                void apply(osg::Node& node) override;
+                void apply(osg::Geometry& geometry) override;
                 void apply(osg::Drawable& drawable) override;
-                void apply(osg::Billboard& geode) override;
+                void apply(osg::Billboard& billboard) override;
                 void apply(osg::Transform& transform) override final;
                 void apply(osg::MatrixTransform& transform) override;
 
diff --git a/components/terrain/cellborder.cpp b/components/terrain/cellborder.cpp
index 342df759a5..fb6593483d 100644
--- a/components/terrain/cellborder.cpp
+++ b/components/terrain/cellborder.cpp
@@ -65,10 +65,10 @@ osg::ref_ptr<osg::Group> CellBorder::createBorderGeometry(float x, float y, floa
 
     border->addPrimitiveSet(new osg::DrawArrays(GL_LINE_STRIP,0,vertices->size()));
 
-    osg::ref_ptr<osg::Group> borderGeode = new osg::Group;
-    borderGeode->addChild(border.get());
+    osg::ref_ptr<osg::Group> borderGroup = new osg::Group;
+    borderGroup->addChild(border.get());
 
-    osg::StateSet *stateSet = borderGeode->getOrCreateStateSet();
+    osg::StateSet *stateSet = borderGroup->getOrCreateStateSet();
     osg::ref_ptr<osg::Material> material (new osg::Material);
     material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
     stateSet->setAttribute(material);
@@ -77,18 +77,18 @@ osg::ref_ptr<osg::Group> CellBorder::createBorderGeometry(float x, float y, floa
     polygonmode->setMode(osg::PolygonMode::FRONT_AND_BACK, osg::PolygonMode::LINE);
     stateSet->setAttributeAndModes(polygonmode,osg::StateAttribute::ON);
 
-    sceneManager->recreateShaders(borderGeode, "debug");
-    borderGeode->setNodeMask(mask);
+    sceneManager->recreateShaders(borderGroup, "debug");
+    borderGroup->setNodeMask(mask);
 
-    return borderGeode;
+    return borderGroup;
 }
 
 void CellBorder::createCellBorderGeometry(int x, int y)
 {
-    auto borderGeode = createBorderGeometry(x, y, 1.f, mWorld->getStorage(), mSceneManager, mBorderMask);
-    mRoot->addChild(borderGeode);
+    auto borderGroup = createBorderGeometry(x, y, 1.f, mWorld->getStorage(), mSceneManager, mBorderMask);
+    mRoot->addChild(borderGroup);
 
-    mCellBorderNodes[std::make_pair(x,y)] = borderGeode;
+    mCellBorderNodes[std::make_pair(x,y)] = borderGroup;
 }
 
 void CellBorder::destroyCellBorderGeometry(int x, int y)